From fedora-extras-commits at redhat.com Tue Jul 1 00:00:52 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 1 Jul 2008 00:00:52 GMT Subject: rpms/xfbib/F-9 xfbib.spec,1.1,1.2 Message-ID: <200807010000.m6100qCq024350@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfbib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24260/F-9 Modified Files: xfbib.spec Log Message: add translated descriptions to cvs Index: xfbib.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfbib/F-9/xfbib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfbib.spec 11 Jun 2008 22:56:05 -0000 1.1 +++ xfbib.spec 30 Jun 2008 23:59:58 -0000 1.2 @@ -18,6 +18,10 @@ environment. The intention of Xfbib is to provide an easy and efficient way of editing BibTeX files. +%description(de): +Xfbib ist ein schlanker BibTex Editor, der f??r die Xfce Desktop-Umgebung +entwickelt wird. Das Ziel von Xfbib ist es, einen einfachen und effizienten +Weg zum Bearbeiteiten von BibTeX Dateien zur Verf??gung zu stellen. %prep %setup -q From fedora-extras-commits at redhat.com Tue Jul 1 00:00:57 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 1 Jul 2008 00:00:57 GMT Subject: rpms/xfbib/F-8 xfbib.spec,1.1,1.2 Message-ID: <200807010000.m6100vhO024353@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfbib/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24260/F-8 Modified Files: xfbib.spec Log Message: add translated descriptions to cvs Index: xfbib.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfbib/F-8/xfbib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfbib.spec 11 Jun 2008 22:55:53 -0000 1.1 +++ xfbib.spec 30 Jun 2008 23:59:33 -0000 1.2 @@ -18,6 +18,10 @@ environment. The intention of Xfbib is to provide an easy and efficient way of editing BibTeX files. +%description(de): +Xfbib ist ein schlanker BibTex Editor, der f??r die Xfce Desktop-Umgebung +entwickelt wird. Das Ziel von Xfbib ist es, einen einfachen und effizienten +Weg zum Bearbeiteiten von BibTeX Dateien zur Verf??gung zu stellen. %prep %setup -q From fedora-extras-commits at redhat.com Tue Jul 1 00:01:10 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 1 Jul 2008 00:01:10 GMT Subject: rpms/xfbib/devel xfbib.spec,1.2,1.3 Message-ID: <200807010001.m6101AMI030838@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfbib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24260/devel Modified Files: xfbib.spec Log Message: add translated descriptions to cvs Index: xfbib.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfbib/devel/xfbib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xfbib.spec 11 Jun 2008 22:48:34 -0000 1.2 +++ xfbib.spec 1 Jul 2008 00:00:23 -0000 1.3 @@ -18,6 +18,10 @@ environment. The intention of Xfbib is to provide an easy and efficient way of editing BibTeX files. +%description(de): +Xfbib ist ein schlanker BibTex Editor, der f??r die Xfce Desktop-Umgebung +entwickelt wird. Das Ziel von Xfbib ist es, einen einfachen und effizienten +Weg zum Bearbeiteiten von BibTeX Dateien zur Verf??gung zu stellen. %prep %setup -q From fedora-extras-commits at redhat.com Tue Jul 1 00:10:30 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 00:10:30 GMT Subject: rpms/python-logilab-common/F-9 .cvsignore, 1.13, 1.14 python-logilab-common.spec, 1.16, 1.17 sources, 1.13, 1.14 Message-ID: <200807010010.m610AURl031307@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/python-logilab-common/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31219/F-9 Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Upstream 0.32.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-logilab-common/F-9/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Feb 2008 19:30:40 -0000 1.13 +++ .cvsignore 1 Jul 2008 00:09:39 -0000 1.14 @@ -1 +1 @@ -logilab-common-0.28.0.tar.gz +logilab-common-0.32.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-logilab-common/F-9/python-logilab-common.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-logilab-common.spec 17 Feb 2008 19:30:40 -0000 1.16 +++ python-logilab-common.spec 1 Jul 2008 00:09:39 -0000 1.17 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.28.0 +Version: 0.32.0 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -47,6 +47,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.32.0-1 +- Upstream 0.32.0 + * Sun Feb 17 2008 Konstantin Ryabitsev - 0.28.0-1 - Upstream 0.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-logilab-common/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 17 Feb 2008 19:30:40 -0000 1.13 +++ sources 1 Jul 2008 00:09:39 -0000 1.14 @@ -1 +1 @@ -83f4f83607175237fcb580120979458d logilab-common-0.28.0.tar.gz +f8e5c9e35f88251c6314128a5d1e4959 logilab-common-0.32.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 00:11:00 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 00:11:00 GMT Subject: rpms/python-logilab-common/devel .cvsignore, 1.13, 1.14 python-logilab-common.spec, 1.16, 1.17 sources, 1.13, 1.14 Message-ID: <200807010011.m610B0w6031333@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/python-logilab-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31219/devel Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Upstream 0.32.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-logilab-common/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Feb 2008 19:30:40 -0000 1.13 +++ .cvsignore 1 Jul 2008 00:10:01 -0000 1.14 @@ -1 +1 @@ -logilab-common-0.28.0.tar.gz +logilab-common-0.32.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-logilab-common/devel/python-logilab-common.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-logilab-common.spec 17 Feb 2008 19:30:40 -0000 1.16 +++ python-logilab-common.spec 1 Jul 2008 00:10:01 -0000 1.17 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.28.0 +Version: 0.32.0 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -47,6 +47,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.32.0-1 +- Upstream 0.32.0 + * Sun Feb 17 2008 Konstantin Ryabitsev - 0.28.0-1 - Upstream 0.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-logilab-common/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 17 Feb 2008 19:30:40 -0000 1.13 +++ sources 1 Jul 2008 00:10:01 -0000 1.14 @@ -1 +1 @@ -83f4f83607175237fcb580120979458d logilab-common-0.28.0.tar.gz +f8e5c9e35f88251c6314128a5d1e4959 logilab-common-0.32.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 00:27:07 2008 From: fedora-extras-commits at redhat.com (Kyle VanderBeek (kylev)) Date: Tue, 1 Jul 2008 00:27:07 GMT Subject: rpms/python-beaker/F-8 .cvsignore, 1.2, 1.3 python-beaker.spec, 1.1, 1.2 sources, 1.2, 1.3 beaker-bsd.patch, 1.1, NONE Message-ID: <200807010027.m610R7OX032233@cvs-int.fedora.redhat.com> Author: kylev Update of /cvs/pkgs/rpms/python-beaker/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32145/F-8 Modified Files: .cvsignore python-beaker.spec sources Removed Files: beaker-bsd.patch Log Message: 0.9.5 bugfix for all! Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-beaker/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 May 2008 23:00:42 -0000 1.2 +++ .cvsignore 1 Jul 2008 00:25:53 -0000 1.3 @@ -1 +1 @@ -Beaker-0.9.4.tar.gz +Beaker-0.9.5.tar.gz Index: python-beaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-beaker/F-8/python-beaker.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-beaker.spec 27 May 2008 23:00:42 -0000 1.1 +++ python-beaker.spec 1 Jul 2008 00:25:53 -0000 1.2 @@ -1,15 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-beaker -Version: 0.9.4 -Release: 4%{?dist} +Version: 0.9.5 +Release: 1%{?dist} Summary: WSGI middleware layer to provide sessions Group: Development/Languages License: BSD URL: http://beaker.groovie.org/ Source0: http://pypi.python.org/packages/source/B/Beaker/Beaker-%{version}.tar.gz -Patch0: beaker-bsd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-setuptools-devel @@ -22,7 +21,6 @@ %prep %setup -q -n Beaker-%{version} -%patch0 %build @@ -46,6 +44,10 @@ %changelog +* Tue Jun 24 2008 Kyle VanderBeek - 0.9.5-1 +- Update to 0.9.5. +- Remove license patch which is now corrected upstream. + * Mon May 12 2008 Kyle VanderBeek - 0.9.4-4 - Fix files to not use wildcard, fixing dir ownership @@ -61,4 +63,3 @@ * Wed Apr 9 2008 Kyle VanderBeek - 0.9.3-1 - Initial version. - Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-beaker/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 May 2008 23:00:42 -0000 1.2 +++ sources 1 Jul 2008 00:25:53 -0000 1.3 @@ -1 +1 @@ -9e474576e948d7f80ce238d31c80ade3 Beaker-0.9.4.tar.gz +696d80afaf587c7e1d2fd0031305025c Beaker-0.9.5.tar.gz --- beaker-bsd.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 00:27:18 2008 From: fedora-extras-commits at redhat.com (Kyle VanderBeek (kylev)) Date: Tue, 1 Jul 2008 00:27:18 GMT Subject: rpms/python-beaker/F-9 .cvsignore, 1.2, 1.3 python-beaker.spec, 1.1, 1.2 sources, 1.2, 1.3 beaker-bsd.patch, 1.1, NONE Message-ID: <200807010027.m610RImT032247@cvs-int.fedora.redhat.com> Author: kylev Update of /cvs/pkgs/rpms/python-beaker/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32145/F-9 Modified Files: .cvsignore python-beaker.spec sources Removed Files: beaker-bsd.patch Log Message: 0.9.5 bugfix for all! Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-beaker/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 May 2008 23:00:53 -0000 1.2 +++ .cvsignore 1 Jul 2008 00:26:08 -0000 1.3 @@ -1 +1 @@ -Beaker-0.9.4.tar.gz +Beaker-0.9.5.tar.gz Index: python-beaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-beaker/F-9/python-beaker.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-beaker.spec 27 May 2008 23:00:53 -0000 1.1 +++ python-beaker.spec 1 Jul 2008 00:26:08 -0000 1.2 @@ -1,15 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-beaker -Version: 0.9.4 -Release: 4%{?dist} +Version: 0.9.5 +Release: 1%{?dist} Summary: WSGI middleware layer to provide sessions Group: Development/Languages License: BSD URL: http://beaker.groovie.org/ Source0: http://pypi.python.org/packages/source/B/Beaker/Beaker-%{version}.tar.gz -Patch0: beaker-bsd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-setuptools-devel @@ -22,7 +21,6 @@ %prep %setup -q -n Beaker-%{version} -%patch0 %build @@ -46,6 +44,10 @@ %changelog +* Tue Jun 24 2008 Kyle VanderBeek - 0.9.5-1 +- Update to 0.9.5. +- Remove license patch which is now corrected upstream. + * Mon May 12 2008 Kyle VanderBeek - 0.9.4-4 - Fix files to not use wildcard, fixing dir ownership @@ -61,4 +63,3 @@ * Wed Apr 9 2008 Kyle VanderBeek - 0.9.3-1 - Initial version. - Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-beaker/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 May 2008 23:00:53 -0000 1.2 +++ sources 1 Jul 2008 00:26:08 -0000 1.3 @@ -1 +1 @@ -9e474576e948d7f80ce238d31c80ade3 Beaker-0.9.4.tar.gz +696d80afaf587c7e1d2fd0031305025c Beaker-0.9.5.tar.gz --- beaker-bsd.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 00:36:45 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 00:36:45 GMT Subject: rpms/python-pgsql/F-9 .cvsignore, 1.3, 1.4 python-pgsql.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807010036.m610ajsH000438@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/python-pgsql/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv365/F-9 Modified Files: .cvsignore python-pgsql.spec sources Log Message: Upstream 0.9.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Aug 2007 20:37:12 -0000 1.3 +++ .cvsignore 1 Jul 2008 00:35:51 -0000 1.4 @@ -1 +1 @@ -python-pgsql-0.9.6.tar.gz +python-pgsql-0.9.7.tar.gz Index: python-pgsql.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/F-9/python-pgsql.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-pgsql.spec 19 Feb 2008 05:10:01 -0000 1.3 +++ python-pgsql.spec 1 Jul 2008 00:35:51 -0000 1.4 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pgsql -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Enhanced python interface to PostgreSQL Group: Development/Languages License: Python -URL: http://people.rpath.com/~gafton/pgsql -Source0: http://people.rpath.com/~gafton/pgsql/python-pgsql-%{version}.tar.gz +URL: http://pypi.python.org/pypi/python-pgsql/ +Source0: http://pypi.python.org/packages/source/p/python-pgsql/python-pgsql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, postgresql-devel @@ -53,6 +53,10 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.9.7-1 +- Upstream 0.9.7 +- Adjust URL and Source to the PyPi location + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.6-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Aug 2007 20:37:12 -0000 1.3 +++ sources 1 Jul 2008 00:35:51 -0000 1.4 @@ -1 +1 @@ -86f9772ec09bde49b6f7efbcccfb9469 python-pgsql-0.9.6.tar.gz +c40ab161f702da631e5fb294f957ff9d python-pgsql-0.9.7.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 00:37:11 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 00:37:11 GMT Subject: rpms/python-pgsql/devel .cvsignore, 1.3, 1.4 python-pgsql.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807010037.m610bBEe000458@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/python-pgsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv365/devel Modified Files: .cvsignore python-pgsql.spec sources Log Message: Upstream 0.9.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Aug 2007 20:37:12 -0000 1.3 +++ .cvsignore 1 Jul 2008 00:36:15 -0000 1.4 @@ -1 +1 @@ -python-pgsql-0.9.6.tar.gz +python-pgsql-0.9.7.tar.gz Index: python-pgsql.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/devel/python-pgsql.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-pgsql.spec 19 Feb 2008 05:10:01 -0000 1.3 +++ python-pgsql.spec 1 Jul 2008 00:36:15 -0000 1.4 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pgsql -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Enhanced python interface to PostgreSQL Group: Development/Languages License: Python -URL: http://people.rpath.com/~gafton/pgsql -Source0: http://people.rpath.com/~gafton/pgsql/python-pgsql-%{version}.tar.gz +URL: http://pypi.python.org/pypi/python-pgsql/ +Source0: http://pypi.python.org/packages/source/p/python-pgsql/python-pgsql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, postgresql-devel @@ -53,6 +53,10 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.9.7-1 +- Upstream 0.9.7 +- Adjust URL and Source to the PyPi location + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.6-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Aug 2007 20:37:12 -0000 1.3 +++ sources 1 Jul 2008 00:36:15 -0000 1.4 @@ -1 +1 @@ -86f9772ec09bde49b6f7efbcccfb9469 python-pgsql-0.9.6.tar.gz +c40ab161f702da631e5fb294f957ff9d python-pgsql-0.9.7.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 00:53:13 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 00:53:13 GMT Subject: rpms/verbiste/F-9 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 verbiste.spec, 1.19, 1.20 Message-ID: <200807010053.m610rDK3001373@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/verbiste/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1268/F-9 Modified Files: .cvsignore sources verbiste.spec Log Message: Upstream 0.1.23. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/F-9/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Feb 2008 18:47:52 -0000 1.13 +++ .cvsignore 1 Jul 2008 00:52:14 -0000 1.14 @@ -1 +1 @@ -verbiste-0.1.22.tar.gz +verbiste-0.1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 17 Feb 2008 18:47:52 -0000 1.13 +++ sources 1 Jul 2008 00:52:14 -0000 1.14 @@ -1 +1 @@ -688e6f021d40f63819abc262e15ffc32 verbiste-0.1.22.tar.gz +8d978ae48c23295582c2eeec42a3d595 verbiste-0.1.23.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/F-9/verbiste.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- verbiste.spec 17 Feb 2008 18:47:52 -0000 1.19 +++ verbiste.spec 1 Jul 2008 00:52:14 -0000 1.20 @@ -1,5 +1,5 @@ Name: verbiste -Version: 0.1.22 +Version: 0.1.23 Release: 1%{?dist} Summary: French conjugation system @@ -116,6 +116,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.1.23-1 +- Upstream 0.1.23 + * Sun Feb 17 2008 Konstantin Ryabitsev - 0.1.22-1 - Upstream 0.1.22 From fedora-extras-commits at redhat.com Tue Jul 1 00:53:13 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 00:53:13 GMT Subject: rpms/verbiste/F-8 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 verbiste.spec, 1.19, 1.20 Message-ID: <200807010053.m610rDhG001378@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/verbiste/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1268/F-8 Modified Files: .cvsignore sources verbiste.spec Log Message: Upstream 0.1.23. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/F-8/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Feb 2008 18:47:46 -0000 1.13 +++ .cvsignore 1 Jul 2008 00:51:49 -0000 1.14 @@ -1 +1 @@ -verbiste-0.1.22.tar.gz +verbiste-0.1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 17 Feb 2008 18:47:46 -0000 1.13 +++ sources 1 Jul 2008 00:51:49 -0000 1.14 @@ -1 +1 @@ -688e6f021d40f63819abc262e15ffc32 verbiste-0.1.22.tar.gz +8d978ae48c23295582c2eeec42a3d595 verbiste-0.1.23.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/F-8/verbiste.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- verbiste.spec 17 Feb 2008 18:47:46 -0000 1.19 +++ verbiste.spec 1 Jul 2008 00:51:49 -0000 1.20 @@ -1,5 +1,5 @@ Name: verbiste -Version: 0.1.22 +Version: 0.1.23 Release: 1%{?dist} Summary: French conjugation system @@ -116,6 +116,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.1.23-1 +- Upstream 0.1.23 + * Sun Feb 17 2008 Konstantin Ryabitsev - 0.1.22-1 - Upstream 0.1.22 From fedora-extras-commits at redhat.com Tue Jul 1 00:53:29 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 00:53:29 GMT Subject: rpms/verbiste/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 verbiste.spec, 1.19, 1.20 Message-ID: <200807010053.m610rTF4001394@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/verbiste/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1268/devel Modified Files: .cvsignore sources verbiste.spec Log Message: Upstream 0.1.23. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Feb 2008 18:47:52 -0000 1.13 +++ .cvsignore 1 Jul 2008 00:52:43 -0000 1.14 @@ -1 +1 @@ -verbiste-0.1.22.tar.gz +verbiste-0.1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 17 Feb 2008 18:47:52 -0000 1.13 +++ sources 1 Jul 2008 00:52:43 -0000 1.14 @@ -1 +1 @@ -688e6f021d40f63819abc262e15ffc32 verbiste-0.1.22.tar.gz +8d978ae48c23295582c2eeec42a3d595 verbiste-0.1.23.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/pkgs/rpms/verbiste/devel/verbiste.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- verbiste.spec 17 Feb 2008 18:47:52 -0000 1.19 +++ verbiste.spec 1 Jul 2008 00:52:43 -0000 1.20 @@ -1,5 +1,5 @@ Name: verbiste -Version: 0.1.22 +Version: 0.1.23 Release: 1%{?dist} Summary: French conjugation system @@ -116,6 +116,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.1.23-1 +- Upstream 0.1.23 + * Sun Feb 17 2008 Konstantin Ryabitsev - 0.1.22-1 - Upstream 0.1.22 From fedora-extras-commits at redhat.com Tue Jul 1 01:02:32 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 01:02:32 GMT Subject: rpms/perl-MooseX-AttributeHelpers/devel .cvsignore, 1.4, 1.5 perl-MooseX-AttributeHelpers.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807010102.m6112Wa2008424@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8353 Modified Files: .cvsignore perl-MooseX-AttributeHelpers.spec sources Log Message: * Mon Jun 30 2008 Chris Weyl 0.12-1 - update to 0.12 - switch to Module::Install incantations - update BR's - update provides filtering Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Jan 2008 05:08:14 -0000 1.4 +++ .cvsignore 1 Jul 2008 01:01:46 -0000 1.5 @@ -1 +1 @@ -MooseX-AttributeHelpers-0.07.tar.gz +MooseX-AttributeHelpers-0.12.tar.gz Index: perl-MooseX-AttributeHelpers.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/perl-MooseX-AttributeHelpers.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MooseX-AttributeHelpers.spec 5 Mar 2008 15:02:45 -0000 1.5 +++ perl-MooseX-AttributeHelpers.spec 1 Jul 2008 01:01:46 -0000 1.6 @@ -1,19 +1,17 @@ Name: perl-MooseX-AttributeHelpers -Version: 0.07 -Release: 2%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: Extended Moose attribute interfaces License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-AttributeHelpers/ -#Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/MooseX-AttributeHelpers-%{version}.tar.gz Source0: http://www.cpan.org/modules/by-module/MooseX/MooseX-AttributeHelpers-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Class::MOP) >= 0.47 -BuildRequires: perl(Module::Build) -BuildRequires: perl(Moose) >= 0.30 +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Moose) >= 0.45 BuildRequires: perl(Test::Exception) >= 0.21 BuildRequires: perl(Test::More) >= 0.62 # optional tests @@ -29,20 +27,30 @@ %prep %setup -q -n MooseX-AttributeHelpers-%{version} +# first filter out the bits in _docdir... +cat << \EOF > %{name}-prov +#!/bin/sh +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO +EOF + + %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf %{buildroot} -./Build install destdir=%{buildroot} create_packlist=0 +make install PERL_INSTALL_ROOT=%{buildroot} + +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check -./Build test +make test %clean rm -rf %{buildroot} @@ -54,6 +62,15 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.12-1 +- update to 0.12 +- switch to Module::Install incantations +- update BR's +- update provides filtering + +* Wed May 28 2008 Chris Weyl 0.09-1 +- update to 0.09 + * Wed Mar 05 2008 Tom "spot" Callaway 0.07-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Jan 2008 05:08:14 -0000 1.4 +++ sources 1 Jul 2008 01:01:46 -0000 1.5 @@ -1 +1 @@ -8c33919790c1b33f8ed2ce5001eeb0b0 MooseX-AttributeHelpers-0.07.tar.gz +c9dafb95089f40957d6bc99839de107f MooseX-AttributeHelpers-0.12.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 01:02:50 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 01:02:50 GMT Subject: rpms/python-pgsql/EL-4 .cvsignore, 1.2, 1.3 python-pgsql.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807010102.m6112oQ4008480@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/python-pgsql/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8321/EL-4 Modified Files: .cvsignore python-pgsql.spec sources Log Message: Upstream 0.9.7. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Jun 2007 13:20:48 -0000 1.2 +++ .cvsignore 1 Jul 2008 01:01:30 -0000 1.3 @@ -1 +1 @@ -python-pgsql-0.9.5.tar.gz +python-pgsql-0.9.7.tar.gz Index: python-pgsql.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/EL-4/python-pgsql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-pgsql.spec 10 Jun 2007 13:20:48 -0000 1.1 +++ python-pgsql.spec 1 Jul 2008 01:01:30 -0000 1.2 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pgsql -Version: 0.9.5 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Enhanced python interface to PostgreSQL Group: Development/Languages -License: Python Software Foundation License -URL: http://people.rpath.com/~gafton/pgsql -Source0: http://people.rpath.com/~gafton/pgsql/python-pgsql-%{version}.tar.gz +License: Python +URL: http://pypi.python.org/pypi/python-pgsql/ +Source0: http://pypi.python.org/packages/source/p/python-pgsql/python-pgsql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, postgresql-devel @@ -53,6 +53,17 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.9.7-1 +- Upstream 0.9.7 +- Adjust URL and Source to the PyPi location + +* Tue Feb 19 2008 Fedora Release Engineering - 0.9.6-2 +- Autorebuild for GCC 4.3 + +* Fri Aug 17 2007 Konstantin Ryabitsev - 0.9.6-1 +- Upstream 0.9.6 +- Appease license naming gods + * Thu Jun 07 2007 Konstantin Ryabitsev - 0.9.5-2 - Set license according to what rpmlint wants Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Jun 2007 13:20:48 -0000 1.2 +++ sources 1 Jul 2008 01:01:30 -0000 1.3 @@ -1 +1 @@ -8c56355c93c88efacaba94119283175e python-pgsql-0.9.5.tar.gz +c40ab161f702da631e5fb294f957ff9d python-pgsql-0.9.7.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 01:02:54 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 01:02:54 GMT Subject: rpms/python-pgsql/EL-5 .cvsignore, 1.2, 1.3 python-pgsql.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807010102.m6112stf008487@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/python-pgsql/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8321/EL-5 Modified Files: .cvsignore python-pgsql.spec sources Log Message: Upstream 0.9.7. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Jun 2007 13:20:54 -0000 1.2 +++ .cvsignore 1 Jul 2008 01:01:51 -0000 1.3 @@ -1 +1 @@ -python-pgsql-0.9.5.tar.gz +python-pgsql-0.9.7.tar.gz Index: python-pgsql.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/EL-5/python-pgsql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-pgsql.spec 10 Jun 2007 13:20:54 -0000 1.1 +++ python-pgsql.spec 1 Jul 2008 01:01:51 -0000 1.2 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pgsql -Version: 0.9.5 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Enhanced python interface to PostgreSQL Group: Development/Languages -License: Python Software Foundation License -URL: http://people.rpath.com/~gafton/pgsql -Source0: http://people.rpath.com/~gafton/pgsql/python-pgsql-%{version}.tar.gz +License: Python +URL: http://pypi.python.org/pypi/python-pgsql/ +Source0: http://pypi.python.org/packages/source/p/python-pgsql/python-pgsql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, postgresql-devel @@ -53,6 +53,17 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 0.9.7-1 +- Upstream 0.9.7 +- Adjust URL and Source to the PyPi location + +* Tue Feb 19 2008 Fedora Release Engineering - 0.9.6-2 +- Autorebuild for GCC 4.3 + +* Fri Aug 17 2007 Konstantin Ryabitsev - 0.9.6-1 +- Upstream 0.9.6 +- Appease license naming gods + * Thu Jun 07 2007 Konstantin Ryabitsev - 0.9.5-2 - Set license according to what rpmlint wants Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pgsql/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Jun 2007 13:20:54 -0000 1.2 +++ sources 1 Jul 2008 01:01:51 -0000 1.3 @@ -1 +1 @@ -8c56355c93c88efacaba94119283175e python-pgsql-0.9.5.tar.gz +c40ab161f702da631e5fb294f957ff9d python-pgsql-0.9.7.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 01:14:08 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 01:14:08 GMT Subject: rpms/php-pear-PHP-CodeSniffer/EL-5 .cvsignore, 1.6, 1.7 php-pear-PHP-CodeSniffer.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200807010114.m611E8xO008947@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8892 Modified Files: .cvsignore php-pear-PHP-CodeSniffer.spec sources Log Message: Update to 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Aug 2007 15:46:33 -0000 1.6 +++ .cvsignore 1 Jul 2008 01:13:18 -0000 1.7 @@ -1 +1 @@ -PHP_CodeSniffer-0.7.0.tgz +PHP_CodeSniffer-1.0.1.tgz Index: php-pear-PHP-CodeSniffer.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5/php-pear-PHP-CodeSniffer.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- php-pear-PHP-CodeSniffer.spec 3 Aug 2007 15:46:33 -0000 1.5 +++ php-pear-PHP-CodeSniffer.spec 1 Jul 2008 01:13:18 -0000 1.6 @@ -2,7 +2,7 @@ %define pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 0.7.0 +Version: 1.0.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -43,6 +43,8 @@ %build +cd %{pear_name}-%{version} +# Empty build section, %install @@ -50,9 +52,10 @@ rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml -# Move documentation (none packaged so far) -# mkdir -p docdir -# mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir +# Move documentation +mkdir -p docdir +mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/*.sample.conf docdir/ + cp %{SOURCE1} . # Clean up unnecessary files @@ -80,11 +83,13 @@ %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %dir %{pear_phpdir}/PHP %{pear_phpdir}/PHP/* +%dir %{pear_datadir}/%{pear_name} %files -n phpcs %defattr(-,root,root,-) @@ -93,6 +98,13 @@ %changelog +* Sun Feb 17 2008 Konstantin Ryabitsev - 1.0.1-1 +- Upstream 1.0.1 +- Move sample config into docs + +* Fri Aug 17 2007 Konstantin Ryabitsev - 0.8.0-1 +- Upstream 0.8.0 + * Mon Jun 11 2007 Konstantin Ryabitsev - 0.7.0-1 - Upstream 0.7.0 - Drop Requirement on php-common (php-pear pulls that in) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Aug 2007 15:46:33 -0000 1.6 +++ sources 1 Jul 2008 01:13:18 -0000 1.7 @@ -1 +1 @@ -c66ab6a9c33c2c788412644b0a66a048 PHP_CodeSniffer-0.7.0.tgz +500a5fc5236190217c579548304f7155 PHP_CodeSniffer-1.0.1.tgz From fedora-extras-commits at redhat.com Tue Jul 1 01:20:35 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 01:20:35 GMT Subject: rpms/php-pear-PhpDocumentor/EL-5 .cvsignore, 1.2, 1.3 php-pear-PhpDocumentor.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807010120.m611KZ26009203@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/php-pear-PhpDocumentor/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9138 Modified Files: .cvsignore php-pear-PhpDocumentor.spec sources Log Message: Update to the latest version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-PhpDocumentor/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jun 2007 14:10:05 -0000 1.2 +++ .cvsignore 1 Jul 2008 01:19:47 -0000 1.3 @@ -1 +1 @@ -PhpDocumentor-1.3.2.tgz +PhpDocumentor-1.4.2.tgz Index: php-pear-PhpDocumentor.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-PhpDocumentor/EL-5/php-pear-PhpDocumentor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-PhpDocumentor.spec 12 Jun 2007 20:48:02 -0000 1.2 +++ php-pear-PhpDocumentor.spec 1 Jul 2008 01:19:47 -0000 1.3 @@ -3,9 +3,9 @@ Summary: The complete documentation solution for PHP Name: php-pear-PhpDocumentor -Version: 1.3.2 -Release: 2%{?dist} -License: LGPL +Version: 1.4.2 +Release: 1%{?dist} +License: LGPLv2+ Group: Development/Libraries URL: http://www.phpdoc.org/ Source0: http://download.sourceforge.net/phpdocu/%{pear_name}-%{version}.tgz @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9 -Requires: php-pear(PEAR), php-common > 5.1.0 +Requires: php-pear(PEAR), php-Smarty >= 2.6.0 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -36,7 +36,6 @@ Summary: Command-line utility for PhpDocumentor Group: Development/Tools Requires: %{name} = %{version}-%{release} -Requires: php-cli %description -n phpdoc This package includes a utility to run PhpDocumentor from the command-line @@ -57,6 +56,9 @@ mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} +# don't install our own php-Smarty +sed -i -e '/Smarty-2/d' %{pear_name}.xml + %build @@ -79,6 +81,10 @@ # Remove scripts out of bindir rm -rf $RPM_BUILD_ROOT%{_bindir}/scripts +# Point to the system php-Smarty +sed -i -e "s|phpDocumentor/Smarty-2.6.0/libs|Smarty|" \ + $RPM_BUILD_ROOT%{pear_phpdir}/%{pear_name}/phpDocumentor/Converter.inc + %clean rm -rf $RPM_BUILD_ROOT @@ -115,6 +121,19 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 1.4.2-1 +- Upstream 1.4.2. + +* Fri Mar 21 2008 Konstantin Ryabitsev - 1.4.1-2 +- Use system php-Smarty. + +* Sun Feb 17 2008 Konstantin Ryabitsev - 1.4.1-1 +- Upstream 1.4.1. + +* Fri Aug 17 2007 Konstantin Ryabitsev - 1.4.0-1 +- New major upstream release 1.4.0 +- Drop explicit requirements on php -- let php-pear pull in what is necessary + * Tue Jun 12 2007 Konstantin Ryabitsev - 1.3.2-2 - Require parent n-v-r instead of php-pear(pear-name) in phpdoc for simplicity Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-PhpDocumentor/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jun 2007 14:10:05 -0000 1.2 +++ sources 1 Jul 2008 01:19:47 -0000 1.3 @@ -1 +1 @@ -747e4bd9ddffeb0bfb9375c870a1d17f PhpDocumentor-1.3.2.tgz +778bea6edb876c70d906bec8c4490a0e PhpDocumentor-1.4.2.tgz From fedora-extras-commits at redhat.com Tue Jul 1 01:21:02 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Tue, 1 Jul 2008 01:21:02 GMT Subject: rpms/vala/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 vala.spec, 1.27, 1.28 Message-ID: <200807010121.m611L2Li009263@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/vala/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9177 Modified Files: .cvsignore sources vala.spec Log Message: update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 4 Jun 2008 19:43:57 -0000 1.13 +++ .cvsignore 1 Jul 2008 01:20:13 -0000 1.14 @@ -1 +1 @@ -vala-0.3.3.tar.bz2 +vala-0.3.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vala/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 4 Jun 2008 19:43:57 -0000 1.13 +++ sources 1 Jul 2008 01:20:13 -0000 1.14 @@ -1 +1 @@ -b0bdf06ac68d930ea754209505e13d9b vala-0.3.3.tar.bz2 +8b44e6bd6064e0858dc399d61200691c vala-0.3.4.tar.bz2 Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- vala.spec 4 Jun 2008 19:43:57 -0000 1.27 +++ vala.spec 1 Jul 2008 01:20:13 -0000 1.28 @@ -1,5 +1,5 @@ Name: vala -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: A modern programming language for GNOME @@ -134,6 +134,9 @@ %changelog +* Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 +- Update to 0.3.4 + * Wed Jun 4 2008 Michel Alexandre Salim - 0.3.3-1 - Update to 0.3.3 From fedora-extras-commits at redhat.com Tue Jul 1 02:02:46 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 1 Jul 2008 02:02:46 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.35, 1.36 cairo-dock.spec, 1.44, 1.45 sources, 1.35, 1.36 Message-ID: <200807010202.m6122k1r017157@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17117 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Tue Jul 1 2008 Mamoru Tasaka - rev. 1162 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 30 Jun 2008 03:25:11 -0000 1.35 +++ .cvsignore 1 Jul 2008 02:02:02 -0000 1.36 @@ -1 +1 @@ -cairo-dock-sources-svn1160_trunk.tar.bz2 +cairo-dock-sources-svn1162_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- cairo-dock.spec 30 Jun 2008 03:25:11 -0000 1.44 +++ cairo-dock.spec 1 Jul 2008 02:02:02 -0000 1.45 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1160_trunk +%define tarballver svn1162_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -488,8 +488,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Mon Jun 30 2008 Mamoru Tasaka -- rev. 1160 +* Tue Jul 1 2008 Mamoru Tasaka +- rev. 1162 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 30 Jun 2008 03:25:11 -0000 1.35 +++ sources 1 Jul 2008 02:02:02 -0000 1.36 @@ -1 +1 @@ -40fe89c0a51272f3a4932e30f18576de cairo-dock-sources-svn1160_trunk.tar.bz2 +ebe99b0c059e53d711a9f4b750e932f4 cairo-dock-sources-svn1162_trunk.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 02:04:23 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 02:04:23 GMT Subject: rpms/nkf/devel nkf.spec,1.27,1.28 Message-ID: <200807010204.m6124NnV017264@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/nkf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182 Modified Files: nkf.spec Log Message: * Tue Jul 1 2008 Akira TAGOH - 1:2.0.8b-3 - Add perl(:MODULE_COMPAT_...) deps. (#453413) Index: nkf.spec =================================================================== RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- nkf.spec 12 Feb 2008 09:50:55 -0000 1.27 +++ nkf.spec 1 Jul 2008 02:03:25 -0000 1.28 @@ -3,7 +3,7 @@ Name: nkf Epoch: 1 Version: 2.0.8b -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://nkf.sourceforge.jp/ Source0: http://prdownloads.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz @@ -13,14 +13,16 @@ Summary: A Kanji code conversion filter Group: Applications/Text + %description Nkf is a Kanji code converter for terminals, hosts, and networks. Nkf converts input Kanji code to 7-bit JIS, MS-kanji (shifted-JIS) or EUC. %package -n perl-NKF -Summary: Perl extension for Network Kanji Filter -Group: Applications/Text +Summary: Perl extension for Network Kanji Filter +Group: Applications/Text +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-NKF This is a Perl Extension version of nkf (Network Kanji Filter). @@ -75,6 +77,9 @@ %{_mandir}/man3/NKF.3pm.gz %changelog +* Tue Jul 1 2008 Akira TAGOH - 1:2.0.8b-3 +- Add perl(:MODULE_COMPAT_...) deps. (#453413) + * Tue Feb 12 2008 Akira TAGOH - 1:2.0.8b-2 - Rebuild for gcc-4.3. From fedora-extras-commits at redhat.com Tue Jul 1 02:42:41 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 1 Jul 2008 02:42:41 GMT Subject: rpms/cairo-dock/devel cairo-dock.spec,1.45,1.46 Message-ID: <200807010242.m612gfIA018616@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557 Modified Files: cairo-dock.spec Log Message: Remove problematic po file for now Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- cairo-dock.spec 1 Jul 2008 02:02:02 -0000 1.45 +++ cairo-dock.spec 1 Jul 2008 02:41:51 -0000 1.46 @@ -163,6 +163,12 @@ # which is GPLv3+, which makes license conflict. # +# Temporary fix +## Remove problematic translation +%{__sed} -i.pofile -e 's|it||' \ + rhythmbox/po/LINGUAS \ + switcher/po/LINGUAS + # permission %{__chmod} 0644 Applets.stable find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 From fedora-extras-commits at redhat.com Tue Jul 1 02:45:32 2008 From: fedora-extras-commits at redhat.com (Mike Christie (michaelc)) Date: Tue, 1 Jul 2008 02:45:32 GMT Subject: rpms/iscsi-initiator-utils/F-8 iscsi-initiator-utils-print-ibft-net-info.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 iscsi-initiator-utils-ibft-sysfs.patch, 1.1, 1.2 iscsi-initiator-utils-update-initscripts-and-docs.patch, 1.3, 1.4 iscsi-initiator-utils-use-var-for-config.patch, 1.5, 1.6 iscsi-initiator-utils.spec, 1.30, 1.31 sources, 1.15, 1.16 Message-ID: <200807010245.m612jW1Q018820@cvs-int.fedora.redhat.com> Author: michaelc Update of /cvs/pkgs/rpms/iscsi-initiator-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18736 Modified Files: .cvsignore iscsi-initiator-utils-ibft-sysfs.patch iscsi-initiator-utils-update-initscripts-and-docs.patch iscsi-initiator-utils-use-var-for-config.patch iscsi-initiator-utils.spec sources Added Files: iscsi-initiator-utils-print-ibft-net-info.patch Log Message: Update iscsi-initiator-utils to upstream 2.0-870 iscsi-initiator-utils-print-ibft-net-info.patch: --- NEW FILE iscsi-initiator-utils-print-ibft-net-info.patch --- diff -aurp open-iscsi-2.0-868-test1/include/fw_context.h open-iscsi-2.0-868-test1.work/include/fw_context.h --- open-iscsi-2.0-868-test1/include/fw_context.h 2008-03-25 03:37:26.000000000 -0500 +++ open-iscsi-2.0-868-test1.work/include/fw_context.h 2008-03-25 03:37:37.000000000 -0500 @@ -23,21 +23,30 @@ struct boot_context { #define IQNSZ (223+1) + /* target settings */ int target_port; - char initiatorname[IQNSZ]; char targetname[IQNSZ]; char target_ipaddr[32]; char chap_name[127]; char chap_password[16]; char chap_name_in[127]; char chap_password_in[16]; + + /* initiator settings */ + char isid[10]; + char initiatorname[IQNSZ]; + + /* network settings */ + char dhcp[18]; char iface[42]; char mac[18]; char ipaddr[18]; + char gateway[18]; + char primary_dns[18]; + char secondary_dns[18]; char mask[18]; char lun[17]; char vlan[15]; - char isid[10]; }; extern int fw_get_entry(struct boot_context *context, const char *filepath); diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fw_entry.c --- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c 2008-03-25 03:37:26.000000000 -0500 +++ open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fw_entry.c 2008-03-25 03:37:37.000000000 -0500 @@ -34,24 +34,13 @@ int fw_get_entry(struct boot_context *co return ret; } -/* - * Dump the 8 byte mac address - */ -static void dump_mac(struct boot_context *context) -{ - int i; - - if (!strlen(context->mac)) - return; - - printf("iface.hwaddress = %s\n", context->mac); -} - static void dump_initiator(struct boot_context *context) { - if (!strlen(context->initiatorname)) - return; - printf("iface.initiatorname = %s\n", context->initiatorname); + if (strlen(context->initiatorname)) + printf("iface.initiatorname = %s\n", context->initiatorname); + + if (strlen(context->isid)) + printf("iface.isid = %s\n", context->isid); } static void dump_target(struct boot_context *context) @@ -75,11 +64,44 @@ static void dump_target(struct boot_cont if (strlen(context->chap_password_in)) printf("node.session.auth.password_in = %s\n", context->chap_password_in); + + if (strlen(context->lun)) + printf("node.boot_lun = %s\n", context->lun); +} + +/* TODO: add defines for all the idbm strings in this file and add a macro */ +static void dump_network(struct boot_context *context) +{ + /* Dump the 8 byte mac address (not iser support) */ + if (strlen(context->mac)) + printf("iface.hwaddress = %s\n", context->mac); + /* + * If this has a valid address then DHCP was used (broadcom sends + * 0.0.0.0). + */ + if (strlen(context->dhcp) && strcmp(context->dhcp, "0.0.0.0")) + printf("iface.bootproto = DHCP\n"); + else + printf("iface.bootproto = STATIC\n"); + if (strlen(context->ipaddr)) + printf("iface.ipaddress = %s\n", context->ipaddr); + if (strlen(context->mask)) + printf("iface.subnet_mask = %s\n", context->mask); + if (strlen(context->gateway)) + printf("iface.gateway = %s\n", context->gateway); + if (strlen(context->primary_dns)) + printf("iface.primary_dns = %s\n", context->primary_dns); + if (strlen(context->secondary_dns)) + printf("iface.secondary_dns = %s\n", context->secondary_dns); + if (strlen(context->vlan)) + printf("iface.vlan = %s\n", context->vlan); + if (strlen(context->iface)) + printf("iface.net_ifacename = %s\n", context->iface); } void fw_print_entry(struct boot_context *context) { dump_initiator(context); - dump_mac(context); + dump_network(context); dump_target(context); } diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c --- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-03-25 03:37:26.000000000 -0500 +++ open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-03-25 04:08:10.000000000 -0500 @@ -24,11 +24,15 @@ #include #include #include -#include "fwparam_ibft.h" +#include #include +#include + +#include "fwparam_ibft.h" #define IBFT_MAX 255 #define IBFT_SYSFS_ROOT "/sys/firmware/ibft/" +#define IBFT_SYSFS_DE static char *target_list[IBFT_MAX]; static char *nic_list[IBFT_MAX]; @@ -143,6 +147,48 @@ static int find_sysfs_dirs(const char *f return 0; } +static int get_iface_from_device(const char *eth_dir, + struct boot_context *context) +{ + char dev_dir[FILENAMESZ]; + int rc = ENODEV; + DIR *dirfd; + struct dirent *dent; + + memset(dev_dir, 0, FILENAMESZ); + strncat(dev_dir, eth_dir, FILENAMESZ); + strncat(dev_dir, "/device", FILENAMESZ); + + if (!file_exist(dev_dir)) + return 0; + + dirfd = opendir(dev_dir); + if (!dirfd) + return errno; + + while ((dent = readdir(dirfd))) { + if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, "..")) + continue; + + if (strncmp(dent->d_name, "net:", 4)) + continue; + + if ((strlen(dent->d_name) - 4) > (sizeof(context->iface) - 1)) { + rc = EINVAL; + printf("Net device %s too bug for iface buffer.\n", + dent->d_name); + break; + } + + if (sscanf(dent->d_name, "net:%s", context->iface) != 1) + rc = EINVAL; + rc = 0; + break; + } + + return rc; +} + /* * Routines to fill in the context values. */ @@ -154,7 +200,17 @@ static int fill_nic_context(const char * rc |= read_data(dir, "/vlan", context->vlan, sizeof(context->vlan)); rc |= read_data(dir, "/ip-addr", context->ipaddr, sizeof(context->ipaddr)); - rc |= read_data(dir, "/mask", context->mask, sizeof(context->mask)); + rc |= read_data(dir, "/subnet-mask", context->mask, + sizeof(context->mask)); + rc |= read_data(dir, "/gateway", context->gateway, + sizeof(context->gateway)); + rc |= read_data(dir, "/primary-dns", context->primary_dns, + sizeof(context->primary_dns)); + rc |= read_data(dir, "/secondary-dns", context->secondary_dns, + sizeof(context->secondary_dns)); + rc |= read_data(dir, "/dhcp", context->dhcp, sizeof(context->dhcp)); + + rc |= get_iface_from_device(dir, context); return rc; } @@ -199,7 +255,7 @@ static int fill_tgt_context(const char * static int find_boot_flag(char *list[], ssize_t size, int *boot_idx) { int rc = -1; - int i, flag = -1; + int i, flag = 0; for (i = 0; i < size; i++, flag = -1) { rc = read_int_data(list[i], IBFT_SYSFS_FLAG_NAME, &flag); @@ -208,6 +264,8 @@ static int find_boot_flag(char *list[], rc = 0; break; } + rc = -1; + flag = 0; } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 6 Feb 2008 23:01:08 -0000 1.15 +++ .cvsignore 1 Jul 2008 02:44:37 -0000 1.16 @@ -10,3 +10,4 @@ open-iscsi-2.0-865.2.tar.gz open-iscsi-2.0-865.13.tar.gz open-iscsi-2.0-868-test1.tar.gz +open-iscsi-2.0-870-rc1.tar.gz iscsi-initiator-utils-ibft-sysfs.patch: Index: iscsi-initiator-utils-ibft-sysfs.patch =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-8/iscsi-initiator-utils-ibft-sysfs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iscsi-initiator-utils-ibft-sysfs.patch 6 Feb 2008 23:01:09 -0000 1.1 +++ iscsi-initiator-utils-ibft-sysfs.patch 1 Jul 2008 02:44:37 -0000 1.2 @@ -1,6 +1,6 @@ -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c 2008-01-23 12:07:52.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c 2008-06-30 21:21:57.000000000 -0500 @@ -29,7 +29,8 @@ int fw_get_entry(struct boot_context *co ret = fwparam_ppc(context, filepath); @@ -11,9 +11,9 @@ return ret; } -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h 2008-01-23 12:07:52.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h 2008-06-30 21:21:57.000000000 -0500 @@ -153,6 +153,7 @@ extern int dev_count; #define TARGET "target" @@ -23,9 +23,9 @@ extern int fwparam_ppc(struct boot_context *context, const char *filepath); - #endif /* FWPARAM_IBFT_H_ */ -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-01-23 12:08:04.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 1969-12-31 18:00:00.000000000 -0600 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-06-30 21:21:57.000000000 -0500 @@ -0,0 +1,271 @@ +/* + * Copyright (C) IBM Corporation. 2007 @@ -298,19 +298,15 @@ + deallocate_lists(); + return rc; +} -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile 2008-01-23 12:07:52.000000000 -0600 -@@ -21,11 +21,10 @@ - # "Prasanna Mumbai" +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile 2008-06-30 21:22:44.000000000 -0500 +@@ -22,7 +22,7 @@ # --OBJS := fwparam_ibft.o fw_entry.o -+OBJS := fwparam_ibft.o fw_entry.o fwparam_ibft_sysfs.o - OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o - GENFILES := prom_lex.c prom_parse.tab.c prom_parse.tab.h - CLEANFILES = $(OBJS) $(GENFILES) *.output *~ -- - BISONFLAGS = -d - FLEXFLAGS = -t - # turn off #line number markers + OBJS := fwparam_ibft.o fw_entry.o +-OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o ++OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_ibft_sysfs.o + CLEANFILES = $(OBJS) *.output *~ + + OPTFLAGS ?= -O2 -g -fPIC iscsi-initiator-utils-update-initscripts-and-docs.patch: Index: iscsi-initiator-utils-update-initscripts-and-docs.patch =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-8/iscsi-initiator-utils-update-initscripts-and-docs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- iscsi-initiator-utils-update-initscripts-and-docs.patch 6 Feb 2008 23:01:09 -0000 1.3 +++ iscsi-initiator-utils-update-initscripts-and-docs.patch 1 Jul 2008 02:44:37 -0000 1.4 @@ -1,7 +1,7 @@ -diff -aurp open-iscsi-2.0-868-test1/etc/iscsid.conf open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf ---- open-iscsi-2.0-868-test1/etc/iscsid.conf 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf 2008-01-03 13:55:59.000000000 -0600 -@@ -27,8 +20,8 @@ +diff -aurp open-iscsi-2.0-870-rc1/etc/iscsid.conf open-iscsi-2.0-870-rc1.work/etc/iscsid.conf +--- open-iscsi-2.0-870-rc1/etc/iscsid.conf 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/etc/iscsid.conf 2008-06-30 21:08:29.000000000 -0500 +@@ -27,8 +27,8 @@ # To request that the iscsi initd scripts startup a session set to "automatic". # node.startup = automatic # @@ -12,7 +12,7 @@ # ************* # CHAP Settings -@@ -92,17 +85,6 @@ node.conn[0].timeo.noop_out_interval = 5 +@@ -92,17 +92,6 @@ node.conn[0].timeo.noop_out_interval = 5 # this will cause the IO to be failed to the multipath layer. node.conn[0].timeo.noop_out_timeout = 5 @@ -30,57 +30,9 @@ #****** # Retry #****** -@@ -188,41 +170,24 @@ node.conn[0].iscsi.MaxRecvDataSegmentLen - discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768 - - # To allow the targets to control the setting of the digest checking, --# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines: -+# with the initiator requesting a preference of enabling the checking, uncommen -+# the following lines (Data digests are not supported and on ppc/ppc64 -+# both header and data digests are not supported.): - #node.conn[0].iscsi.HeaderDigest = CRC32C,None --#node.conn[0].iscsi.DataDigest = CRC32C,None - # - # To allow the targets to control the setting of the digest checking, - # with the initiator requesting a preference of disabling the checking, --# uncomment one or both of the following lines: -+# uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = None,CRC32C --#node.conn[0].iscsi.DataDigest = None,CRC32C - # - # To enable CRC32C digest checking for the header and/or data part of --# iSCSI PDUs, uncomment one or both of the following lines: -+# iSCSI PDUs, uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = CRC32C --#node.conn[0].iscsi.DataDigest = CRC32C - # - # To disable digest checking for the header and/or data part of --# iSCSI PDUs, uncomment one or both of the following lines: -+# iSCSI PDUs, uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = None --#node.conn[0].iscsi.DataDigest = None - # - # The default is to never use DataDigests and to allow the target to control - # the setting of the HeaderDigest checking with the initiator requesting - # a preference of disabling the checking. -- --#************ --# Workarounds --#************ -- --# Some targets like IET prefer after an initiator has sent a task --# management function like an ABORT TASK or LOGICAL UNIT RESET, that --# it does not respond to PDUs like R2Ts. To enable this behavior uncomment --# the following line (The default behavior is Yes): --node.session.iscsi.FastAbort = Yes -- --# Some targets like Equalogic prefer that after an initiator has sent --# a task management function like an ABORT TASK or LOGICAL UNIT RESET, that --# it continue to respond to R2Ts. To enable this uncomment this line --# node.session.iscsi.FastAbort = No -diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README ---- open-iscsi-2.0-868-test1/README 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/README 2008-01-03 13:53:11.000000000 -0600 +diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README +--- open-iscsi-2.0-870-rc1/README 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/README 2008-06-30 21:08:29.000000000 -0500 @@ -78,11 +78,6 @@ the cache sync command will fail. - iscsiadm's -P 3 option will not print out scsi devices. - iscsid will not automatically online devices. @@ -93,7 +45,7 @@ By default the kernel source found at /lib/modules/`uname -a`/build will be used to compile the open-iscsi modules. To specify a different -@@ -613,7 +608,7 @@ Red Hat or Fedora: +@@ -694,7 +689,7 @@ Red Hat or Fedora: ----------------- To start open-iscsi in Red Hat/Fedora you can do: @@ -102,7 +54,7 @@ To get open-iscsi to automatically start at run time you may have to run: -@@ -792,6 +778,8 @@ To login to all the automated nodes, sim +@@ -873,6 +868,8 @@ To login to all the automated nodes, sim e.g /etc/init.d/open-iscsi restart. On your next startup the nodes will be logged into autmotically. @@ -111,21 +63,3 @@ 8. Advanced Configuration ========================= -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c ---- open-iscsi-2.0-868-test1/usr/idbm.c 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c 2008-01-03 13:52:01.000000000 -0600 -@@ -364,10 +364,14 @@ idbm_recinfo_node(node_rec_t *r, recinfo - __recinfo_int_o4(key, ri, r, conn[i].iscsi.HeaderDigest, - IDBM_SHOW, "None", "CRC32C", "CRC32C,None", - "None,CRC32C", num); -+/* -+ We only support data digests -+ - sprintf(key, "node.conn[%d].iscsi.DataDigest", i); - __recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW, - "None", "CRC32C", "CRC32C,None", - "None,CRC32C", num); -+*/ - sprintf(key, "node.conn[%d].iscsi.IFMarker", i); - __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW, - "No", "Yes", num); iscsi-initiator-utils-use-var-for-config.patch: Index: iscsi-initiator-utils-use-var-for-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-8/iscsi-initiator-utils-use-var-for-config.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iscsi-initiator-utils-use-var-for-config.patch 6 Feb 2008 23:01:09 -0000 1.5 +++ iscsi-initiator-utils-use-var-for-config.patch 1 Jul 2008 02:44:37 -0000 1.6 @@ -1,16 +1,16 @@ -diff -aurp open-iscsi-2.0-868-test1/doc/iscsiadm.8 open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8 ---- open-iscsi-2.0-868-test1/doc/iscsiadm.8 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8 2008-01-03 14:08:44.000000000 -0600 +diff -aurp open-iscsi-2.0-870-rc1/doc/iscsiadm.8 open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8 +--- open-iscsi-2.0-870-rc1/doc/iscsiadm.8 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8 2008-06-30 21:36:44.000000000 -0500 @@ -47,7 +47,7 @@ display help text and exit .TP \fB\-I\fR, \fB\-\-interface\fI[iface]\fR The interface argument specifies the iSCSI interface to use for the operation. -iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware +iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware - or offload, the iface config must have the hardware address (iface.hwaddress) + or the iface config must have the hardware address (iface.hwaddress) and the driver/transport_name (iface.transport_name). The iface's name is then the filename of the iface config. For software iSCSI, the iface config -@@ -310,10 +310,10 @@ The configuration file read by \fBiscsid +@@ -317,10 +317,10 @@ The configuration file read by \fBiscsid The file containing the iSCSI InitiatorName and InitiatorAlias read by \fBiscsid\fR and \fBiscsiadm\fR on startup. .TP @@ -23,10 +23,10 @@ This directory contains the portals. .SH "SEE ALSO" -diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README ---- open-iscsi-2.0-868-test1/README 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/README 2008-01-03 14:05:35.000000000 -0600 -@@ -138,10 +138,10 @@ available on all Linux installations. +diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README +--- open-iscsi-2.0-870-rc1/README 2008-06-30 21:37:05.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/README 2008-06-30 21:36:44.000000000 -0500 +@@ -148,10 +148,10 @@ available on all Linux installations. The database contains two tables: @@ -40,7 +40,7 @@ The iscsiadm utility is a command-line tool to manage (update, delete, insert, query) the persistent database. -@@ -288,7 +288,7 @@ a scsi_host per HBA port). +@@ -327,7 +327,7 @@ a scsi_host per HBA port). To manage both types of initiator stacks, iscsiadm uses the interface (iface) structure. For each HBA port or for software iscsi for each network device (ethX) or NIC, that you wish to bind sessions to you must create @@ -49,7 +49,7 @@ When you run iscsiadm the first time a hardware iscsi driver like qla4xxx is loaded, iscsiadm will create default iface configs for you. The config created -@@ -301,29 +301,29 @@ Running: +@@ -340,29 +340,29 @@ Running: iface0 qla4xxx,00:c0:dd:08:63:e8,default iface1 qla4xxx,00:c0:dd:08:63:ea,default @@ -84,7 +84,7 @@ iface.transport_name = tcp iface.hwaddress = 00:C0:DD:08:63:E7 -@@ -347,7 +347,7 @@ but you have not logged in then, iscsiad +@@ -386,7 +386,7 @@ but you have not logged in then, iscsiad all existing bindings. When you then run iscsiadm to do discovery, it will check for interfaces @@ -93,7 +93,7 @@ they will be logged in through each iface. This behavior can also be overriden by passing in the interfaces you want to use. For example if you had defined two interface but only wanted to use one you can use the -@@ -361,7 +361,7 @@ we do not bind a session to a iface, the +@@ -400,7 +400,7 @@ we do not bind a session to a iface, the iscsiadm -m discovery -t st -p ip:port -I default -P 1 @@ -102,7 +102,7 @@ not pass anything into iscsiadm, running iscsiadm will do the default behavior, where we allow the network subsystem to decide which device to use. -@@ -396,13 +396,13 @@ iscsiadm -m node -p ip:port -I iface0 -- +@@ -435,7 +435,7 @@ iscsiadm -m node -p ip:port -I iface0 -- ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 @@ -111,19 +111,32 @@ using software iscsi. If any are found then nodes found during discovery will be setup so that they can logged in through those interfaces. +@@ -483,7 +483,7 @@ iscsiadm -m node -p ip:port -I iface0 -- + existing portals. - - SendTargets iSCSI Discovery with a specific interface. If you + - SendTargets iSCSI Discovery with a specific interface. If you - wish to only use a subset of the interfaces in /etc/iscsi/ifaces + wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces then you can pass them in during discovery: ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \ -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c ---- open-iscsi-2.0-868-test1/usr/idbm.c 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c 2008-01-03 14:03:36.000000000 -0600 -@@ -2582,9 +2582,9 @@ idbm_init(idbm_get_config_file_fn *fn) - idbm_t *db; - +@@ -768,8 +768,8 @@ where targetname is the name of the targ + and port of the portal. tpgt, is the portal group tag of + the portal, and is not used in iscsiadm commands except for static + record creation. And iface name is the name of the iscsi interface +-defined in /etc/iscsi/ifaces. If no interface was defined in +-/etc/iscsi/ifaces or passed in, the default behavior is used. ++defined in /var/lib/iscsi/ifaces. If no interface was defined in ++/var/lib/iscsi/ifaces or passed in, the default behavior is used. + Default here is iscsi_tcp/tcp to be used over which ever NIC the + network layer decides is best. + +diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.c open-iscsi-2.0-870-rc1.work/usr/idbm.c +--- open-iscsi-2.0-870-rc1/usr/idbm.c 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/idbm.c 2008-06-30 21:36:44.000000000 -0500 +@@ -2137,9 +2137,9 @@ free_info: + int idbm_init(idbm_get_config_file_fn *fn) + { /* make sure root db dir is there */ - if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) { - if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) { @@ -132,26 +145,22 @@ + if (mkdir(ISCSIVAR, 0660) != 0) { + log_error("Could not make %s %d\n", ISCSIVAR, errno); - return NULL; + return errno; } -Only in open-iscsi-2.0-868-test1.tmp/usr: idbm.c.orig -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.h open-iscsi-2.0-868-test1.tmp/usr/idbm.h ---- open-iscsi-2.0-868-test1/usr/idbm.h 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.h 2008-01-03 14:03:36.000000000 -0600 -@@ -26,12 +26,14 @@ +diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.h open-iscsi-2.0-870-rc1.work/usr/idbm.h +--- open-iscsi-2.0-870-rc1/usr/idbm.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/idbm.h 2008-06-30 21:36:58.000000000 -0500 +@@ -26,11 +26,12 @@ #include "initiator.h" #include "config.h" -#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes" --#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces" -#define SLP_CONFIG_DIR ISCSI_CONFIG_ROOT"slp" -#define ISNS_CONFIG_DIR ISCSI_CONFIG_ROOT"isns" -#define STATIC_CONFIG_DIR ISCSI_CONFIG_ROOT"static" -#define ST_CONFIG_DIR ISCSI_CONFIG_ROOT"send_targets" +#define ISCSIVAR "/var/lib/iscsi/" -+ +#define NODE_CONFIG_DIR ISCSIVAR"nodes" -+#define IFACE_CONFIG_DIR ISCSIVAR"ifaces" +#define SLP_CONFIG_DIR ISCSIVAR"slp" +#define ISNS_CONFIG_DIR ISCSIVAR"isns" +#define STATIC_CONFIG_DIR ISCSIVAR"static" @@ -159,3 +168,15 @@ #define ST_CONFIG_NAME "st_config" #define TYPE_INT 0 +diff -aurp open-iscsi-2.0-870-rc1/usr/iface.h open-iscsi-2.0-870-rc1.work/usr/iface.h +--- open-iscsi-2.0-870-rc1/usr/iface.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/iface.h 2008-06-30 21:36:44.000000000 -0500 +@@ -20,7 +20,7 @@ + #ifndef ISCSI_IFACE_H + #define ISCSI_IFACE_H + +-#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces" ++#define IFACE_CONFIG_DIR "/var/lib/iscsi/ifaces" + + struct iface_rec; + struct list_head; Index: iscsi-initiator-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-8/iscsi-initiator-utils.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- iscsi-initiator-utils.spec 6 Feb 2008 23:01:09 -0000 1.30 +++ iscsi-initiator-utils.spec 1 Jul 2008 02:44:37 -0000 1.31 @@ -1,17 +1,15 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils -Version: 6.2.0.868 -Release: 0.3%{?dist} -Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-868-test1.tar.gz +Version: 6.2.0.870 +Release: 0.0%{?dist} +Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870-rc1.tar.gz Source1: iscsid.init Source2: iscsidevs.init Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch Patch1: iscsi-initiator-utils-use-var-for-config.patch Patch2: iscsi-initiator-utils-use-red-hat-for-name.patch Patch3: iscsi-initiator-utils-ibft-sysfs.patch -Patch4: iscsi-initiator-utils-add-fw-login.patch -Patch5: iscsi-initiator-utils-use-new-tpgt.patch -Patch6: iscsi-initiator-utils-fix-compile-err-include-limits.patch +Patch4: iscsi-initiator-utils-print-ibft-net-info.patch Group: System Environment/Daemons License: GPLv2+ @@ -29,14 +27,12 @@ Protocol networks. %prep -%setup -q -n open-iscsi-2.0-868-test1 +%setup -q -n open-iscsi-2.0-870-rc1 %patch0 -p1 -b .update-initscripts-and-docs %patch1 -p1 -b .use-var-for-config %patch2 -p1 -b .use-red-hat-for-name %patch3 -p1 -b .ibft-sysfs -%patch4 -p1 -b .add-fw-login -%patch5 -p1 -b .use-new-tpgt -%patch6 -p1 -b .fix-compile-err-include-limits +%patch4 -p1 -b .print-ibft-net-info %build make OPTFLAGS="%{optflags}" -C utils/fwparam_ibft @@ -111,6 +107,10 @@ %changelog +* Mon Jun 30 2008 Mike Christie - 6.2.0.870 +- Rebase to open-iscsi-2-870 +- 453282 Handle sysfs changes. + * Wed Feb 5 2008 Mike Christie - 6.2.0.868-0.3 - Rebase to upstream and RHEL5. - 246960 LSB init script changes. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 6 Feb 2008 23:01:09 -0000 1.15 +++ sources 1 Jul 2008 02:44:37 -0000 1.16 @@ -1 +1 @@ -e453be2213e60cb463353d896a9c3a78 open-iscsi-2.0-868-test1.tar.gz +2740f55611d3ea59a21ec08b25853c55 open-iscsi-2.0-870-rc1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 02:51:46 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 02:51:46 GMT Subject: rpms/perl-Net-SSH2/devel net-ssh2-0.18-perl5.10.patch, NONE, 1.1 perl-Net-SSH2.spec, 1.4, 1.5 Message-ID: <200807010251.m612pkrm019163@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-SSH2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19098 Modified Files: perl-Net-SSH2.spec Added Files: net-ssh2-0.18-perl5.10.patch Log Message: * Mon Jun 30 2008 Chris Weyl 0.18-5 - apply patch for 5.10 net-ssh2-0.18-perl5.10.patch: --- NEW FILE net-ssh2-0.18-perl5.10.patch --- diff -ruN Net-SSH-0.18.orig/SSH2.xs Net-SSH-0.18/SSH2.xs --- Net-SSH-0.18.orig/SSH2.xs 2007-11-10 17:53:25.000000000 -0800 +++ Net-SSH-0.18/SSH2.xs 2008-06-10 03:38:52.000000000 -0700 @@ -1006,7 +1006,7 @@ debug("- [%d] = channel\n", i); pollfd[i].type = LIBSSH2_POLLFD_CHANNEL; pollfd[i].fd.channel = - ((SSH2_CHANNEL*)SvIVX(SvRV(*handle)))->channel; + ((SSH2_CHANNEL*)SvIVX(GvSV((GV*)SvRV(*handle))))->channel; } else if(strEQ(package, "Net::SSH2::Listener")) { debug("- [%d] = listener\n", i); pollfd[i].type = LIBSSH2_POLLFD_LISTENER; diff -ruN Net-SSH-0.18.orig/typemap Net-SSH-0.18/typemap --- Net-SSH-0.18.orig/typemap 2007-02-24 07:15:23.000000000 -0800 +++ Net-SSH-0.18/typemap 2008-06-10 01:42:42.000000000 -0700 @@ -29,9 +29,9 @@ const char* name = form("_GEN_%ld", (long)net_ch_gensym++); SvUPGRADE((SV*)gv, SVt_PVGV); SvUPGRADE((SV*)io, SVt_PVIO); - SvIVX(gv) = PTR2IV($var); gv_init(gv, gv_stashpv("Net::SSH2::Channel", 0/*create*/), name, strlen(name), 0/*multi*/); + GvSV(gv) = newSViv(PTR2IV($var)); GvIOp(gv) = io; sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0); } @@ -49,9 +49,9 @@ const char* name = form("_GEN_%ld", (long)net_fi_gensym++); SvUPGRADE((SV*)gv, SVt_PVGV); SvUPGRADE((SV*)io, SVt_PVIO); - SvIVX(gv) = PTR2IV($var); gv_init(gv, gv_stashpv("Net::SSH2::File", 0/*create*/), name, strlen(name), 0/*multi*/); + GvSV(gv) = newSViv(PTR2IV($var)); GvIOp(gv) = io; sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0); } @@ -80,7 +80,7 @@ O_CHANNEL if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV)) - $var = ($type)SvIVX((SV*)SvRV($arg)); + $var = ($type)SvIVX(GvSV((GV*)SvRV($arg))); else croak(\"${Package}::$func_name() - invalid channel object\"); @@ -98,7 +98,7 @@ O_FILE if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV)) - $var = ($type)SvIVX((SV*)SvRV($arg)); + $var = ($type)SvIVX(GvSV((GV*)SvRV($arg))); else croak(\"${Package}::$func_name() - invalid SFTP file object\"); Index: perl-Net-SSH2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSH2/devel/perl-Net-SSH2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Net-SSH2.spec 7 Mar 2008 02:12:30 -0000 1.4 +++ perl-Net-SSH2.spec 1 Jul 2008 02:50:48 -0000 1.5 @@ -1,12 +1,15 @@ Name: perl-Net-SSH2 Version: 0.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for the SSH 2 protocol via libSSH2 License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-SSH2/ Source0: http://www.cpan.org/authors/id/D/DB/DBROBINS/Net-SSH2-%{version}.tar.gz +# http://rt.cpan.org/Public/Bug/Display.html?id=36614 +Patch0: net-ssh2-0.18-perl5.10.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -29,6 +32,8 @@ %prep %setup -q -n Net-SSH2-%{version} +%patch0 -p1 + perl -pi -e 's|^#!perl|#!/usr/bin/perl|' example/* %build @@ -62,6 +67,9 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.18-5 +- apply patch for 5.10 + * Thu Mar 06 2008 Tom "spot" Callaway - 0.18-4 Rebuild for new perl From fedora-extras-commits at redhat.com Tue Jul 1 02:52:15 2008 From: fedora-extras-commits at redhat.com (Mike Christie (michaelc)) Date: Tue, 1 Jul 2008 02:52:15 GMT Subject: rpms/iscsi-initiator-utils/F-9 .cvsignore, 1.15, 1.16 iscsi-initiator-utils-ibft-sysfs.patch, 1.1, 1.2 iscsi-initiator-utils-update-initscripts-and-docs.patch, 1.3, 1.4 iscsi-initiator-utils-use-var-for-config.patch, 1.5, 1.6 iscsi-initiator-utils.spec, 1.33, 1.34 sources, 1.15, 1.16 Message-ID: <200807010252.m612qFGE019259@cvs-int.fedora.redhat.com> Author: michaelc Update of /cvs/pkgs/rpms/iscsi-initiator-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19138 Modified Files: .cvsignore iscsi-initiator-utils-ibft-sysfs.patch iscsi-initiator-utils-update-initscripts-and-docs.patch iscsi-initiator-utils-use-var-for-config.patch iscsi-initiator-utils.spec sources Log Message: Update iscsi-initiator-utils to 2.0-870 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 6 Feb 2008 21:02:29 -0000 1.15 +++ .cvsignore 1 Jul 2008 02:51:30 -0000 1.16 @@ -10,3 +10,4 @@ open-iscsi-2.0-865.2.tar.gz open-iscsi-2.0-865.13.tar.gz open-iscsi-2.0-868-test1.tar.gz +open-iscsi-2.0-870-rc1.tar.gz iscsi-initiator-utils-ibft-sysfs.patch: Index: iscsi-initiator-utils-ibft-sysfs.patch =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsi-initiator-utils-ibft-sysfs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iscsi-initiator-utils-ibft-sysfs.patch 6 Feb 2008 21:02:29 -0000 1.1 +++ iscsi-initiator-utils-ibft-sysfs.patch 1 Jul 2008 02:51:30 -0000 1.2 @@ -1,6 +1,6 @@ -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c 2008-01-23 12:07:52.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c 2008-06-30 21:21:57.000000000 -0500 @@ -29,7 +29,8 @@ int fw_get_entry(struct boot_context *co ret = fwparam_ppc(context, filepath); @@ -11,9 +11,9 @@ return ret; } -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h 2008-01-23 12:07:52.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h 2008-06-30 21:21:57.000000000 -0500 @@ -153,6 +153,7 @@ extern int dev_count; #define TARGET "target" @@ -23,9 +23,9 @@ extern int fwparam_ppc(struct boot_context *context, const char *filepath); - #endif /* FWPARAM_IBFT_H_ */ -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-01-23 12:08:04.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 1969-12-31 18:00:00.000000000 -0600 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-06-30 21:21:57.000000000 -0500 @@ -0,0 +1,271 @@ +/* + * Copyright (C) IBM Corporation. 2007 @@ -298,19 +298,15 @@ + deallocate_lists(); + return rc; +} -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile 2008-01-23 12:07:52.000000000 -0600 -@@ -21,11 +21,10 @@ - # "Prasanna Mumbai" +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile 2008-06-30 21:22:44.000000000 -0500 +@@ -22,7 +22,7 @@ # --OBJS := fwparam_ibft.o fw_entry.o -+OBJS := fwparam_ibft.o fw_entry.o fwparam_ibft_sysfs.o - OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o - GENFILES := prom_lex.c prom_parse.tab.c prom_parse.tab.h - CLEANFILES = $(OBJS) $(GENFILES) *.output *~ -- - BISONFLAGS = -d - FLEXFLAGS = -t - # turn off #line number markers + OBJS := fwparam_ibft.o fw_entry.o +-OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o ++OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_ibft_sysfs.o + CLEANFILES = $(OBJS) *.output *~ + + OPTFLAGS ?= -O2 -g -fPIC iscsi-initiator-utils-update-initscripts-and-docs.patch: Index: iscsi-initiator-utils-update-initscripts-and-docs.patch =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsi-initiator-utils-update-initscripts-and-docs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- iscsi-initiator-utils-update-initscripts-and-docs.patch 6 Feb 2008 21:02:29 -0000 1.3 +++ iscsi-initiator-utils-update-initscripts-and-docs.patch 1 Jul 2008 02:51:30 -0000 1.4 @@ -1,7 +1,7 @@ -diff -aurp open-iscsi-2.0-868-test1/etc/iscsid.conf open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf ---- open-iscsi-2.0-868-test1/etc/iscsid.conf 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf 2008-01-03 13:55:59.000000000 -0600 -@@ -27,8 +20,8 @@ +diff -aurp open-iscsi-2.0-870-rc1/etc/iscsid.conf open-iscsi-2.0-870-rc1.work/etc/iscsid.conf +--- open-iscsi-2.0-870-rc1/etc/iscsid.conf 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/etc/iscsid.conf 2008-06-30 21:08:29.000000000 -0500 +@@ -27,8 +27,8 @@ # To request that the iscsi initd scripts startup a session set to "automatic". # node.startup = automatic # @@ -12,75 +12,9 @@ # ************* # CHAP Settings -@@ -92,17 +85,6 @@ node.conn[0].timeo.noop_out_interval = 5 - # this will cause the IO to be failed to the multipath layer. - node.conn[0].timeo.noop_out_timeout = 5 - --# To specify the time to wait for abort response before --# failing the operation and trying a logical unit reset edit the line. --# The value is in seconds and the default is 15 seconds. --node.session.err_timeo.abort_timeout = 15 -- --# To specify the time to wait for a logical unit response --# before failing the operation and trying session re-establishment --# edit the line. --# The value is in seconds and the default is 30 seconds. --node.session.err_timeo.lu_reset_timeout = 20 -- - #****** - # Retry - #****** -@@ -188,41 +170,24 @@ node.conn[0].iscsi.MaxRecvDataSegmentLen - discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768 - - # To allow the targets to control the setting of the digest checking, --# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines: -+# with the initiator requesting a preference of enabling the checking, uncommen -+# the following lines (Data digests are not supported and on ppc/ppc64 -+# both header and data digests are not supported.): - #node.conn[0].iscsi.HeaderDigest = CRC32C,None --#node.conn[0].iscsi.DataDigest = CRC32C,None - # - # To allow the targets to control the setting of the digest checking, - # with the initiator requesting a preference of disabling the checking, --# uncomment one or both of the following lines: -+# uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = None,CRC32C --#node.conn[0].iscsi.DataDigest = None,CRC32C - # - # To enable CRC32C digest checking for the header and/or data part of --# iSCSI PDUs, uncomment one or both of the following lines: -+# iSCSI PDUs, uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = CRC32C --#node.conn[0].iscsi.DataDigest = CRC32C - # - # To disable digest checking for the header and/or data part of --# iSCSI PDUs, uncomment one or both of the following lines: -+# iSCSI PDUs, uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = None --#node.conn[0].iscsi.DataDigest = None - # - # The default is to never use DataDigests and to allow the target to control - # the setting of the HeaderDigest checking with the initiator requesting - # a preference of disabling the checking. -- --#************ --# Workarounds --#************ -- --# Some targets like IET prefer after an initiator has sent a task --# management function like an ABORT TASK or LOGICAL UNIT RESET, that --# it does not respond to PDUs like R2Ts. To enable this behavior uncomment --# the following line (The default behavior is Yes): --node.session.iscsi.FastAbort = Yes -- --# Some targets like Equalogic prefer that after an initiator has sent --# a task management function like an ABORT TASK or LOGICAL UNIT RESET, that --# it continue to respond to R2Ts. To enable this uncomment this line --# node.session.iscsi.FastAbort = No -diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README ---- open-iscsi-2.0-868-test1/README 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/README 2008-01-03 13:53:11.000000000 -0600 +diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README +--- open-iscsi-2.0-870-rc1/README 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/README 2008-06-30 21:08:29.000000000 -0500 @@ -78,11 +78,6 @@ the cache sync command will fail. - iscsiadm's -P 3 option will not print out scsi devices. - iscsid will not automatically online devices. @@ -93,7 +27,7 @@ By default the kernel source found at /lib/modules/`uname -a`/build will be used to compile the open-iscsi modules. To specify a different -@@ -613,7 +608,7 @@ Red Hat or Fedora: +@@ -694,7 +689,7 @@ Red Hat or Fedora: ----------------- To start open-iscsi in Red Hat/Fedora you can do: @@ -102,7 +36,7 @@ To get open-iscsi to automatically start at run time you may have to run: -@@ -792,6 +778,8 @@ To login to all the automated nodes, sim +@@ -873,6 +868,8 @@ To login to all the automated nodes, sim e.g /etc/init.d/open-iscsi restart. On your next startup the nodes will be logged into autmotically. @@ -111,21 +45,3 @@ 8. Advanced Configuration ========================= -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c ---- open-iscsi-2.0-868-test1/usr/idbm.c 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c 2008-01-03 13:52:01.000000000 -0600 -@@ -364,10 +364,14 @@ idbm_recinfo_node(node_rec_t *r, recinfo - __recinfo_int_o4(key, ri, r, conn[i].iscsi.HeaderDigest, - IDBM_SHOW, "None", "CRC32C", "CRC32C,None", - "None,CRC32C", num); -+/* -+ We only support data digests -+ - sprintf(key, "node.conn[%d].iscsi.DataDigest", i); - __recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW, - "None", "CRC32C", "CRC32C,None", - "None,CRC32C", num); -+*/ - sprintf(key, "node.conn[%d].iscsi.IFMarker", i); - __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW, - "No", "Yes", num); iscsi-initiator-utils-use-var-for-config.patch: Index: iscsi-initiator-utils-use-var-for-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsi-initiator-utils-use-var-for-config.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iscsi-initiator-utils-use-var-for-config.patch 6 Feb 2008 21:02:29 -0000 1.5 +++ iscsi-initiator-utils-use-var-for-config.patch 1 Jul 2008 02:51:30 -0000 1.6 @@ -1,16 +1,16 @@ -diff -aurp open-iscsi-2.0-868-test1/doc/iscsiadm.8 open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8 ---- open-iscsi-2.0-868-test1/doc/iscsiadm.8 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8 2008-01-03 14:08:44.000000000 -0600 +diff -aurp open-iscsi-2.0-870-rc1/doc/iscsiadm.8 open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8 +--- open-iscsi-2.0-870-rc1/doc/iscsiadm.8 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8 2008-06-30 21:36:44.000000000 -0500 @@ -47,7 +47,7 @@ display help text and exit .TP \fB\-I\fR, \fB\-\-interface\fI[iface]\fR The interface argument specifies the iSCSI interface to use for the operation. -iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware +iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware - or offload, the iface config must have the hardware address (iface.hwaddress) + or the iface config must have the hardware address (iface.hwaddress) and the driver/transport_name (iface.transport_name). The iface's name is then the filename of the iface config. For software iSCSI, the iface config -@@ -310,10 +310,10 @@ The configuration file read by \fBiscsid +@@ -317,10 +317,10 @@ The configuration file read by \fBiscsid The file containing the iSCSI InitiatorName and InitiatorAlias read by \fBiscsid\fR and \fBiscsiadm\fR on startup. .TP @@ -23,10 +23,10 @@ This directory contains the portals. .SH "SEE ALSO" -diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README ---- open-iscsi-2.0-868-test1/README 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/README 2008-01-03 14:05:35.000000000 -0600 -@@ -138,10 +138,10 @@ available on all Linux installations. +diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README +--- open-iscsi-2.0-870-rc1/README 2008-06-30 21:37:05.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/README 2008-06-30 21:36:44.000000000 -0500 +@@ -148,10 +148,10 @@ available on all Linux installations. The database contains two tables: @@ -40,7 +40,7 @@ The iscsiadm utility is a command-line tool to manage (update, delete, insert, query) the persistent database. -@@ -288,7 +288,7 @@ a scsi_host per HBA port). +@@ -327,7 +327,7 @@ a scsi_host per HBA port). To manage both types of initiator stacks, iscsiadm uses the interface (iface) structure. For each HBA port or for software iscsi for each network device (ethX) or NIC, that you wish to bind sessions to you must create @@ -49,7 +49,7 @@ When you run iscsiadm the first time a hardware iscsi driver like qla4xxx is loaded, iscsiadm will create default iface configs for you. The config created -@@ -301,29 +301,29 @@ Running: +@@ -340,29 +340,29 @@ Running: iface0 qla4xxx,00:c0:dd:08:63:e8,default iface1 qla4xxx,00:c0:dd:08:63:ea,default @@ -84,7 +84,7 @@ iface.transport_name = tcp iface.hwaddress = 00:C0:DD:08:63:E7 -@@ -347,7 +347,7 @@ but you have not logged in then, iscsiad +@@ -386,7 +386,7 @@ but you have not logged in then, iscsiad all existing bindings. When you then run iscsiadm to do discovery, it will check for interfaces @@ -93,7 +93,7 @@ they will be logged in through each iface. This behavior can also be overriden by passing in the interfaces you want to use. For example if you had defined two interface but only wanted to use one you can use the -@@ -361,7 +361,7 @@ we do not bind a session to a iface, the +@@ -400,7 +400,7 @@ we do not bind a session to a iface, the iscsiadm -m discovery -t st -p ip:port -I default -P 1 @@ -102,7 +102,7 @@ not pass anything into iscsiadm, running iscsiadm will do the default behavior, where we allow the network subsystem to decide which device to use. -@@ -396,13 +396,13 @@ iscsiadm -m node -p ip:port -I iface0 -- +@@ -435,7 +435,7 @@ iscsiadm -m node -p ip:port -I iface0 -- ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 @@ -111,19 +111,32 @@ using software iscsi. If any are found then nodes found during discovery will be setup so that they can logged in through those interfaces. +@@ -483,7 +483,7 @@ iscsiadm -m node -p ip:port -I iface0 -- + existing portals. - - SendTargets iSCSI Discovery with a specific interface. If you + - SendTargets iSCSI Discovery with a specific interface. If you - wish to only use a subset of the interfaces in /etc/iscsi/ifaces + wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces then you can pass them in during discovery: ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \ -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c ---- open-iscsi-2.0-868-test1/usr/idbm.c 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c 2008-01-03 14:03:36.000000000 -0600 -@@ -2582,9 +2582,9 @@ idbm_init(idbm_get_config_file_fn *fn) - idbm_t *db; - +@@ -768,8 +768,8 @@ where targetname is the name of the targ + and port of the portal. tpgt, is the portal group tag of + the portal, and is not used in iscsiadm commands except for static + record creation. And iface name is the name of the iscsi interface +-defined in /etc/iscsi/ifaces. If no interface was defined in +-/etc/iscsi/ifaces or passed in, the default behavior is used. ++defined in /var/lib/iscsi/ifaces. If no interface was defined in ++/var/lib/iscsi/ifaces or passed in, the default behavior is used. + Default here is iscsi_tcp/tcp to be used over which ever NIC the + network layer decides is best. + +diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.c open-iscsi-2.0-870-rc1.work/usr/idbm.c +--- open-iscsi-2.0-870-rc1/usr/idbm.c 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/idbm.c 2008-06-30 21:36:44.000000000 -0500 +@@ -2137,9 +2137,9 @@ free_info: + int idbm_init(idbm_get_config_file_fn *fn) + { /* make sure root db dir is there */ - if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) { - if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) { @@ -132,26 +145,22 @@ + if (mkdir(ISCSIVAR, 0660) != 0) { + log_error("Could not make %s %d\n", ISCSIVAR, errno); - return NULL; + return errno; } -Only in open-iscsi-2.0-868-test1.tmp/usr: idbm.c.orig -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.h open-iscsi-2.0-868-test1.tmp/usr/idbm.h ---- open-iscsi-2.0-868-test1/usr/idbm.h 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.h 2008-01-03 14:03:36.000000000 -0600 -@@ -26,12 +26,14 @@ +diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.h open-iscsi-2.0-870-rc1.work/usr/idbm.h +--- open-iscsi-2.0-870-rc1/usr/idbm.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/idbm.h 2008-06-30 21:36:58.000000000 -0500 +@@ -26,11 +26,12 @@ #include "initiator.h" #include "config.h" -#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes" --#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces" -#define SLP_CONFIG_DIR ISCSI_CONFIG_ROOT"slp" -#define ISNS_CONFIG_DIR ISCSI_CONFIG_ROOT"isns" -#define STATIC_CONFIG_DIR ISCSI_CONFIG_ROOT"static" -#define ST_CONFIG_DIR ISCSI_CONFIG_ROOT"send_targets" +#define ISCSIVAR "/var/lib/iscsi/" -+ +#define NODE_CONFIG_DIR ISCSIVAR"nodes" -+#define IFACE_CONFIG_DIR ISCSIVAR"ifaces" +#define SLP_CONFIG_DIR ISCSIVAR"slp" +#define ISNS_CONFIG_DIR ISCSIVAR"isns" +#define STATIC_CONFIG_DIR ISCSIVAR"static" @@ -159,3 +168,15 @@ #define ST_CONFIG_NAME "st_config" #define TYPE_INT 0 +diff -aurp open-iscsi-2.0-870-rc1/usr/iface.h open-iscsi-2.0-870-rc1.work/usr/iface.h +--- open-iscsi-2.0-870-rc1/usr/iface.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/iface.h 2008-06-30 21:36:44.000000000 -0500 +@@ -20,7 +20,7 @@ + #ifndef ISCSI_IFACE_H + #define ISCSI_IFACE_H + +-#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces" ++#define IFACE_CONFIG_DIR "/var/lib/iscsi/ifaces" + + struct iface_rec; + struct list_head; Index: iscsi-initiator-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsi-initiator-utils.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- iscsi-initiator-utils.spec 25 Apr 2008 18:13:15 -0000 1.33 +++ iscsi-initiator-utils.spec 1 Jul 2008 02:51:30 -0000 1.34 @@ -1,23 +1,15 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils -Version: 6.2.0.868 -Release: 0.7%{?dist} -Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-868-test1.tar.gz +Version: 6.2.0.870 +Release: 0.0%{?dist} +Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870-rc1.tar.gz Source1: iscsid.init Source2: iscsidevs.init Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch Patch1: iscsi-initiator-utils-use-var-for-config.patch Patch2: iscsi-initiator-utils-use-red-hat-for-name.patch Patch3: iscsi-initiator-utils-ibft-sysfs.patch -Patch4: iscsi-initiator-utils-add-fw-login.patch -Patch5: iscsi-initiator-utils-use-new-tpgt.patch -Patch6: iscsi-initiator-utils-fix-compile-err-include-limits.patch -Patch7: iscsi-initiator-utils-handle-ipv6-compat-addrs.patch -Patch8: iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch -Patch9: iscsi-initiator-utils-fix-sync-up.patch -Patch10: iscsi-initiator-utils-update-startup-doc.patch -Patch11: iscsi-initiator-utils-fix-segment-len-check.patch -Patch12: iscsi-initiator-utils-print-ibft-net-info.patch +Patch4: iscsi-initiator-utils-print-ibft-net-info.patch Group: System Environment/Daemons License: GPLv2+ @@ -35,20 +27,12 @@ Protocol networks. %prep -%setup -q -n open-iscsi-2.0-868-test1 +%setup -q -n open-iscsi-2.0-870-rc1 %patch0 -p1 -b .update-initscripts-and-docs %patch1 -p1 -b .use-var-for-config %patch2 -p1 -b .use-red-hat-for-name %patch3 -p1 -b .ibft-sysfs -%patch4 -p1 -b .add-fw-login -%patch5 -p1 -b .use-new-tpgt -%patch6 -p1 -b .fix-compile-err-include-limits -%patch7 -p1 -b .handle-ipv6-compat-addrs -%patch8 -p1 -b .Fix-connection-cleanup-when-iscsid-is-restarted -%patch9 -p1 -b .fix-sync-up -%patch10 -p1 -b .update-startup-doc -%patch11 -p1 -b .fix-segment-len-check -%patch12 -p1 -b .print-ibft-net-info +%patch4 -p1 -b .print-ibft-net-info %build @@ -124,6 +108,10 @@ %changelog +* Mon Jun 30 2008 Mike Christie - 6.2.0.870 +- Rebase to open-iscsi-2-870 +- 453282 Handle sysfs changes. + * Fri Apr 25 2008 Mike Christie - 6.2.0.868-0.7 - 437522 log out sessions that are not used for root during "iscsi stop". Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 6 Feb 2008 21:02:29 -0000 1.15 +++ sources 1 Jul 2008 02:51:30 -0000 1.16 @@ -1 +1 @@ -e453be2213e60cb463353d896a9c3a78 open-iscsi-2.0-868-test1.tar.gz +2740f55611d3ea59a21ec08b25853c55 open-iscsi-2.0-870-rc1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 02:53:23 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 02:53:23 GMT Subject: rpms/perl-Net-SSH2/F-9 net-ssh2-0.18-perl5.10.patch, NONE, 1.1 perl-Net-SSH2.spec, 1.4, 1.5 Message-ID: <200807010253.m612rNSB019370@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-SSH2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19300 Modified Files: perl-Net-SSH2.spec Added Files: net-ssh2-0.18-perl5.10.patch Log Message: * Mon Jun 30 2008 Chris Weyl 0.18-5 - apply patch for 5.10 net-ssh2-0.18-perl5.10.patch: --- NEW FILE net-ssh2-0.18-perl5.10.patch --- diff -ruN Net-SSH-0.18.orig/SSH2.xs Net-SSH-0.18/SSH2.xs --- Net-SSH-0.18.orig/SSH2.xs 2007-11-10 17:53:25.000000000 -0800 +++ Net-SSH-0.18/SSH2.xs 2008-06-10 03:38:52.000000000 -0700 @@ -1006,7 +1006,7 @@ debug("- [%d] = channel\n", i); pollfd[i].type = LIBSSH2_POLLFD_CHANNEL; pollfd[i].fd.channel = - ((SSH2_CHANNEL*)SvIVX(SvRV(*handle)))->channel; + ((SSH2_CHANNEL*)SvIVX(GvSV((GV*)SvRV(*handle))))->channel; } else if(strEQ(package, "Net::SSH2::Listener")) { debug("- [%d] = listener\n", i); pollfd[i].type = LIBSSH2_POLLFD_LISTENER; diff -ruN Net-SSH-0.18.orig/typemap Net-SSH-0.18/typemap --- Net-SSH-0.18.orig/typemap 2007-02-24 07:15:23.000000000 -0800 +++ Net-SSH-0.18/typemap 2008-06-10 01:42:42.000000000 -0700 @@ -29,9 +29,9 @@ const char* name = form("_GEN_%ld", (long)net_ch_gensym++); SvUPGRADE((SV*)gv, SVt_PVGV); SvUPGRADE((SV*)io, SVt_PVIO); - SvIVX(gv) = PTR2IV($var); gv_init(gv, gv_stashpv("Net::SSH2::Channel", 0/*create*/), name, strlen(name), 0/*multi*/); + GvSV(gv) = newSViv(PTR2IV($var)); GvIOp(gv) = io; sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0); } @@ -49,9 +49,9 @@ const char* name = form("_GEN_%ld", (long)net_fi_gensym++); SvUPGRADE((SV*)gv, SVt_PVGV); SvUPGRADE((SV*)io, SVt_PVIO); - SvIVX(gv) = PTR2IV($var); gv_init(gv, gv_stashpv("Net::SSH2::File", 0/*create*/), name, strlen(name), 0/*multi*/); + GvSV(gv) = newSViv(PTR2IV($var)); GvIOp(gv) = io; sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0); } @@ -80,7 +80,7 @@ O_CHANNEL if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV)) - $var = ($type)SvIVX((SV*)SvRV($arg)); + $var = ($type)SvIVX(GvSV((GV*)SvRV($arg))); else croak(\"${Package}::$func_name() - invalid channel object\"); @@ -98,7 +98,7 @@ O_FILE if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV)) - $var = ($type)SvIVX((SV*)SvRV($arg)); + $var = ($type)SvIVX(GvSV((GV*)SvRV($arg))); else croak(\"${Package}::$func_name() - invalid SFTP file object\"); Index: perl-Net-SSH2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSH2/F-9/perl-Net-SSH2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Net-SSH2.spec 7 Mar 2008 02:12:30 -0000 1.4 +++ perl-Net-SSH2.spec 1 Jul 2008 02:52:39 -0000 1.5 @@ -1,12 +1,15 @@ Name: perl-Net-SSH2 Version: 0.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for the SSH 2 protocol via libSSH2 License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-SSH2/ Source0: http://www.cpan.org/authors/id/D/DB/DBROBINS/Net-SSH2-%{version}.tar.gz +# http://rt.cpan.org/Public/Bug/Display.html?id=36614 +Patch0: net-ssh2-0.18-perl5.10.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -29,6 +32,8 @@ %prep %setup -q -n Net-SSH2-%{version} +%patch0 -p1 + perl -pi -e 's|^#!perl|#!/usr/bin/perl|' example/* %build @@ -62,6 +67,9 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.18-5 +- apply patch for 5.10 + * Thu Mar 06 2008 Tom "spot" Callaway - 0.18-4 Rebuild for new perl From fedora-extras-commits at redhat.com Tue Jul 1 02:54:59 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 1 Jul 2008 02:54:59 GMT Subject: comps comps-f10.xml.in,1.37,1.38 Message-ID: <200807010254.m612sxRA019477@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19423 Modified Files: comps-f10.xml.in Log Message: - dont install sugar-desktop by default - add conditional imsettings-xfce to @input-methods too Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- comps-f10.xml.in 29 Jun 2008 14:13:32 -0000 1.37 +++ comps-f10.xml.in 1 Jul 2008 02:54:29 -0000 1.38 @@ -2317,6 +2317,7 @@ scim-hangul scim-m17n scim-python-pinyin + imsettings-xfce scim-bridge-gtk scim-bridge-qt scim-qtimm @@ -3814,7 +3815,7 @@ sugar-desktop <_name>SUGAR Desktop Environment <_description>SUGAR is the desktop environment developed for the OLPC XO. - true + false true sugar From fedora-extras-commits at redhat.com Tue Jul 1 03:12:04 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 03:12:04 GMT Subject: rpms/nkf/F-9 nkf.spec,1.27,1.28 Message-ID: <200807010312.m613C4VL026622@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/nkf/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26536 Modified Files: nkf.spec Log Message: * Tue Jul 1 2008 Akira TAGOH - 1:2.0.8b-3 - Add perl(:MODULE_COMPAT_...) deps. (#453413) Index: nkf.spec =================================================================== RCS file: /cvs/pkgs/rpms/nkf/F-9/nkf.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- nkf.spec 12 Feb 2008 09:50:55 -0000 1.27 +++ nkf.spec 1 Jul 2008 03:11:14 -0000 1.28 @@ -3,7 +3,7 @@ Name: nkf Epoch: 1 Version: 2.0.8b -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://nkf.sourceforge.jp/ Source0: http://prdownloads.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz @@ -13,14 +13,16 @@ Summary: A Kanji code conversion filter Group: Applications/Text + %description Nkf is a Kanji code converter for terminals, hosts, and networks. Nkf converts input Kanji code to 7-bit JIS, MS-kanji (shifted-JIS) or EUC. %package -n perl-NKF -Summary: Perl extension for Network Kanji Filter -Group: Applications/Text +Summary: Perl extension for Network Kanji Filter +Group: Applications/Text +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-NKF This is a Perl Extension version of nkf (Network Kanji Filter). @@ -75,6 +77,9 @@ %{_mandir}/man3/NKF.3pm.gz %changelog +* Tue Jul 1 2008 Akira TAGOH - 1:2.0.8b-3 +- Add perl(:MODULE_COMPAT_...) deps. (#453413) + * Tue Feb 12 2008 Akira TAGOH - 1:2.0.8b-2 - Rebuild for gcc-4.3. From fedora-extras-commits at redhat.com Tue Jul 1 03:26:37 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 03:26:37 GMT Subject: rpms/perl-MooseX-AttributeHelpers/devel perl-MooseX-AttributeHelpers.spec, 1.6, 1.7 Message-ID: <200807010326.m613QbJJ027005@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26909 Modified Files: perl-MooseX-AttributeHelpers.spec Log Message: * Mon Jun 30 2008 Chris Weyl 0.12-2 - ...and fix filtering. heh. Index: perl-MooseX-AttributeHelpers.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/devel/perl-MooseX-AttributeHelpers.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-MooseX-AttributeHelpers.spec 1 Jul 2008 01:01:46 -0000 1.6 +++ perl-MooseX-AttributeHelpers.spec 1 Jul 2008 03:24:25 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-MooseX-AttributeHelpers Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extended Moose attribute interfaces License: GPL+ or Artistic Group: Development/Libraries @@ -34,6 +34,8 @@ %{__perl_provides} $FOO EOF +%define __perl_provides %{_builddir}/MooseX-AttributeHelpers-%{version}/%{name}-prov +chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -62,6 +64,9 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.12-2 +- ...and fix filtering. heh. + * Mon Jun 30 2008 Chris Weyl 0.12-1 - update to 0.12 - switch to Module::Install incantations From fedora-extras-commits at redhat.com Tue Jul 1 03:27:48 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 03:27:48 GMT Subject: rpms/nkf/F-8 nkf.spec,1.26,1.27 Message-ID: <200807010327.m613RmX0027086@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/nkf/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27051 Modified Files: nkf.spec Log Message: * Tue Jul 1 2008 Akira TAGOH - 1:2.0.8b-3 - Add perl(:MODULE_COMPAT_...) deps. (#453413) Index: nkf.spec =================================================================== RCS file: /cvs/pkgs/rpms/nkf/F-8/nkf.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nkf.spec 21 Sep 2007 08:46:54 -0000 1.26 +++ nkf.spec 1 Jul 2008 03:26:45 -0000 1.27 @@ -3,7 +3,7 @@ Name: nkf Epoch: 1 Version: 2.0.8b -Release: 1%{?dist} +Release: 3%{?dist} License: BSD URL: http://nkf.sourceforge.jp/ Source0: http://prdownloads.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz @@ -13,14 +13,16 @@ Summary: A Kanji code conversion filter Group: Applications/Text + %description Nkf is a Kanji code converter for terminals, hosts, and networks. Nkf converts input Kanji code to 7-bit JIS, MS-kanji (shifted-JIS) or EUC. %package -n perl-NKF -Summary: Perl extension for Network Kanji Filter -Group: Applications/Text +Summary: Perl extension for Network Kanji Filter +Group: Applications/Text +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-NKF This is a Perl Extension version of nkf (Network Kanji Filter). @@ -75,6 +77,12 @@ %{_mandir}/man3/NKF.3pm.gz %changelog +* Tue Jul 1 2008 Akira TAGOH - 1:2.0.8b-3 +- Add perl(:MODULE_COMPAT_...) deps. (#453413) + +* Tue Feb 12 2008 Akira TAGOH - 1:2.0.8b-2 +- Rebuild for gcc-4.3. + * Fri Sep 21 2007 Akira TAGOH - 1:2.0.8b-1 - New upstream release. - clean up the spec file. From fedora-extras-commits at redhat.com Tue Jul 1 03:42:31 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 03:42:31 GMT Subject: rpms/perl-Perl-Critic/devel .cvsignore, 1.10, 1.11 perl-Perl-Critic.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <200807010342.m613gVqd027408@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Perl-Critic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27354 Modified Files: .cvsignore perl-Perl-Critic.spec sources Log Message: * Sun Mar 09 2008 Chris Weyl 1.082-1 - update to 1.082 - resolve BZ#431577 - add t/ examples/ extras/ tools/, and filter Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 14 Jan 2008 23:32:59 -0000 1.10 +++ .cvsignore 1 Jul 2008 03:41:41 -0000 1.11 @@ -1 +1 @@ -Perl-Critic-1.080.tar.gz +Perl-Critic-1.082.tar.gz Index: perl-Perl-Critic.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Perl-Critic.spec 28 Feb 2008 13:01:55 -0000 1.16 +++ perl-Perl-Critic.spec 1 Jul 2008 03:41:41 -0000 1.17 @@ -1,15 +1,17 @@ Name: perl-Perl-Critic -Version: 1.080 -Release: 3%{?dist} +Version: 1.082 +Release: 1%{?dist} Summary: Critique Perl source code for best-practices Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Perl-Critic/ Source0: http://www.cpan.org/authors/id/T/TH/THALJEF/perlcritic/Perl-Critic-%{version}.tar.gz +Source0: http://www.cpan.org/modules/by-module/Perl/Perl-Critic-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + BuildRequires: perl(Module::Build) BuildRequires: perl(B::Keywords) >= 1.05 BuildRequires: perl(Config::Tiny) >= 2 @@ -17,12 +19,12 @@ BuildRequires: perl(IO::String) BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Module::Pluggable) >= 3.1 -BuildRequires: perl(PPI) >= 1.118 +BuildRequires: perl(PPI) >= 1.201 BuildRequires: perl(String::Format) >= 1.13 BuildRequires: perl(Perl::Tidy) BuildRequires: perl(Test::Memory::Cycle) -BuildRequires: perl(Readonly::XS) -BuildRequires: perl(Exception::Class) +BuildRequires: perl(Readonly) >= 1.03 +BuildRequires: perl(Exception::Class) >= 1.23 # BuildRequires: perl(Regexp::Parser) # Author tests #BuildRequires: perl(Test::Perl::Critic) @@ -32,7 +34,7 @@ BuildRequires: perl(Test::Spelling) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + Requires: perl(Module::Pluggable) >= 3.1 Requires(hint): perl(Perl::Tidy) @@ -51,6 +53,18 @@ %prep %setup -q -n Perl-Critic-%{version} +find . -type f -exec chmod -c -x {} + + +# make sure doc/tests don't generate provides +# note we first filter out the bits in _docdir... +cat << \EOF > %{name}-prov +#!/bin/sh +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO +EOF + +%define __perl_provides %{_builddir}/Perl-Critic-%{version}/%{name}-prov +chmod +x %{__perl_provides} %build %{__perl} Build.PL installdirs=vendor @@ -60,13 +74,14 @@ %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -chmod -R u+w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* %check # Additional requirements of author tests: # Test::Perl::Critic, Test::Kwalitee -TEST_AUTHOR=1 ./Build test +#TEST_AUTHOR=1 ./Build test +./Build test %clean @@ -75,7 +90,7 @@ %files %defattr(-,root,root,-) -%doc Changes LICENSE README TODO.pod +%doc Changes LICENSE README TODO.pod examples/ extras/ tools/ %{_bindir}/* %{perl_vendorlib}/Perl/ %{_mandir}/man1/*.1* @@ -83,6 +98,11 @@ %changelog +* Sun Mar 09 2008 Chris Weyl 1.082-1 +- update to 1.082 +- resolve BZ#431577 +- add t/ examples/ extras/ tools/, and filter + * Wed Feb 27 2008 Tom "spot" Callaway - 1.080-3 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 14 Jan 2008 23:32:59 -0000 1.10 +++ sources 1 Jul 2008 03:41:41 -0000 1.11 @@ -1 +1 @@ -a094cce997e96954b7fc7c21f1e91cc2 Perl-Critic-1.080.tar.gz +f2ad44e084444b42f1b59b0f2f3bb387 Perl-Critic-1.082.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 03:58:43 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 03:58:43 GMT Subject: rpms/yaz/F-9 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 yaz.spec, 1.13, 1.14 Message-ID: <200807010358.m613wht9027696@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/yaz/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27631/F-9 Modified Files: .cvsignore sources yaz.spec Log Message: Upstream 3.0.34. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/yaz/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 May 2008 17:46:59 -0000 1.11 +++ .cvsignore 1 Jul 2008 03:57:53 -0000 1.12 @@ -1 +1 @@ -yaz-3.0.26.tar.gz +yaz-3.0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yaz/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 May 2008 17:46:59 -0000 1.11 +++ sources 1 Jul 2008 03:57:53 -0000 1.12 @@ -1 +1 @@ -2b06e2d930fa329ac806b0e14d5714c8 yaz-3.0.26.tar.gz +c99b94cfd0d2d46e3ecc443616d9acc9 yaz-3.0.34.tar.gz Index: yaz.spec =================================================================== RCS file: /cvs/pkgs/rpms/yaz/F-9/yaz.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- yaz.spec 10 May 2008 17:46:59 -0000 1.13 +++ yaz.spec 1 Jul 2008 03:57:53 -0000 1.14 @@ -1,5 +1,5 @@ Name: yaz -Version: 3.0.26 +Version: 3.0.34 Release: 1%{?dist} Summary: Z39.50/SRW/SRU programs @@ -108,6 +108,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 3.0.34-1 +- Upstream 3.0.34 + * Sat May 10 2008 Konstantin Ryabitsev - 3.0.26-1 - Upstream 3.0.26 From fedora-extras-commits at redhat.com Tue Jul 1 03:58:53 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 03:58:53 GMT Subject: rpms/yaz/F-8 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 yaz.spec, 1.11, 1.12 Message-ID: <200807010358.m613wr30027706@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/yaz/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27631/F-8 Modified Files: .cvsignore sources yaz.spec Log Message: Upstream 3.0.34. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/yaz/F-8/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 10 May 2008 17:46:51 -0000 1.10 +++ .cvsignore 1 Jul 2008 03:57:29 -0000 1.11 @@ -1 +1 @@ -yaz-3.0.26.tar.gz +yaz-3.0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yaz/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 10 May 2008 17:46:51 -0000 1.10 +++ sources 1 Jul 2008 03:57:29 -0000 1.11 @@ -1 +1 @@ -2b06e2d930fa329ac806b0e14d5714c8 yaz-3.0.26.tar.gz +c99b94cfd0d2d46e3ecc443616d9acc9 yaz-3.0.34.tar.gz Index: yaz.spec =================================================================== RCS file: /cvs/pkgs/rpms/yaz/F-8/yaz.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- yaz.spec 10 May 2008 17:46:51 -0000 1.11 +++ yaz.spec 1 Jul 2008 03:57:29 -0000 1.12 @@ -1,5 +1,5 @@ Name: yaz -Version: 3.0.26 +Version: 3.0.34 Release: 1%{?dist} Summary: Z39.50/SRW/SRU programs @@ -108,6 +108,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 3.0.34-1 +- Upstream 3.0.34 + * Sat May 10 2008 Konstantin Ryabitsev - 3.0.26-1 - Upstream 3.0.26 From fedora-extras-commits at redhat.com Tue Jul 1 03:59:04 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 03:59:04 GMT Subject: rpms/yaz/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 yaz.spec, 1.14, 1.15 Message-ID: <200807010359.m613x4pn027714@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/yaz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27631/devel Modified Files: .cvsignore sources yaz.spec Log Message: Upstream 3.0.34. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/yaz/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 May 2008 17:47:12 -0000 1.11 +++ .cvsignore 1 Jul 2008 03:58:13 -0000 1.12 @@ -1 +1 @@ -yaz-3.0.26.tar.gz +yaz-3.0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yaz/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 May 2008 17:47:12 -0000 1.11 +++ sources 1 Jul 2008 03:58:13 -0000 1.12 @@ -1 +1 @@ -2b06e2d930fa329ac806b0e14d5714c8 yaz-3.0.26.tar.gz +c99b94cfd0d2d46e3ecc443616d9acc9 yaz-3.0.34.tar.gz Index: yaz.spec =================================================================== RCS file: /cvs/pkgs/rpms/yaz/devel/yaz.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- yaz.spec 3 Jun 2008 10:19:32 -0000 1.14 +++ yaz.spec 1 Jul 2008 03:58:13 -0000 1.15 @@ -1,6 +1,6 @@ Name: yaz -Version: 3.0.26 -Release: 2%{?dist} +Version: 3.0.34 +Release: 1%{?dist} Summary: Z39.50/SRW/SRU programs Group: Applications/Internet @@ -108,8 +108,8 @@ %changelog -* Tue Jun 03 2008 Caol??n McNamara - 3.0.26-2 -- rebuild for new icu +* Mon Jun 30 2008 Konstantin Ryabitsev - 3.0.34-1 +- Upstream 3.0.34 * Sat May 10 2008 Konstantin Ryabitsev - 3.0.26-1 - Upstream 3.0.26 From fedora-extras-commits at redhat.com Tue Jul 1 03:59:41 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 03:59:41 GMT Subject: rpms/perl-Perl-Critic/F-9 perl-Perl-Critic.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <200807010359.m613xfVU027777@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Perl-Critic/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699 Modified Files: perl-Perl-Critic.spec sources Log Message: * Sun Mar 09 2008 Chris Weyl 1.082-1 - update to 1.082 - resolve BZ#431577 - add t/ examples/ extras/ tools/, and filter Index: perl-Perl-Critic.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/F-9/perl-Perl-Critic.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Perl-Critic.spec 28 Feb 2008 13:01:55 -0000 1.16 +++ perl-Perl-Critic.spec 1 Jul 2008 03:58:44 -0000 1.17 @@ -1,15 +1,17 @@ Name: perl-Perl-Critic -Version: 1.080 -Release: 3%{?dist} +Version: 1.082 +Release: 1%{?dist} Summary: Critique Perl source code for best-practices Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Perl-Critic/ Source0: http://www.cpan.org/authors/id/T/TH/THALJEF/perlcritic/Perl-Critic-%{version}.tar.gz +Source0: http://www.cpan.org/modules/by-module/Perl/Perl-Critic-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + BuildRequires: perl(Module::Build) BuildRequires: perl(B::Keywords) >= 1.05 BuildRequires: perl(Config::Tiny) >= 2 @@ -17,12 +19,12 @@ BuildRequires: perl(IO::String) BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Module::Pluggable) >= 3.1 -BuildRequires: perl(PPI) >= 1.118 +BuildRequires: perl(PPI) >= 1.201 BuildRequires: perl(String::Format) >= 1.13 BuildRequires: perl(Perl::Tidy) BuildRequires: perl(Test::Memory::Cycle) -BuildRequires: perl(Readonly::XS) -BuildRequires: perl(Exception::Class) +BuildRequires: perl(Readonly) >= 1.03 +BuildRequires: perl(Exception::Class) >= 1.23 # BuildRequires: perl(Regexp::Parser) # Author tests #BuildRequires: perl(Test::Perl::Critic) @@ -32,7 +34,7 @@ BuildRequires: perl(Test::Spelling) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + Requires: perl(Module::Pluggable) >= 3.1 Requires(hint): perl(Perl::Tidy) @@ -51,6 +53,18 @@ %prep %setup -q -n Perl-Critic-%{version} +find . -type f -exec chmod -c -x {} + + +# make sure doc/tests don't generate provides +# note we first filter out the bits in _docdir... +cat << \EOF > %{name}-prov +#!/bin/sh +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO +EOF + +%define __perl_provides %{_builddir}/Perl-Critic-%{version}/%{name}-prov +chmod +x %{__perl_provides} %build %{__perl} Build.PL installdirs=vendor @@ -60,13 +74,14 @@ %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -chmod -R u+w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* %check # Additional requirements of author tests: # Test::Perl::Critic, Test::Kwalitee -TEST_AUTHOR=1 ./Build test +#TEST_AUTHOR=1 ./Build test +./Build test %clean @@ -75,7 +90,7 @@ %files %defattr(-,root,root,-) -%doc Changes LICENSE README TODO.pod +%doc Changes LICENSE README TODO.pod examples/ extras/ tools/ %{_bindir}/* %{perl_vendorlib}/Perl/ %{_mandir}/man1/*.1* @@ -83,6 +98,11 @@ %changelog +* Sun Mar 09 2008 Chris Weyl 1.082-1 +- update to 1.082 +- resolve BZ#431577 +- add t/ examples/ extras/ tools/, and filter + * Wed Feb 27 2008 Tom "spot" Callaway - 1.080-3 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 14 Jan 2008 23:32:59 -0000 1.10 +++ sources 1 Jul 2008 03:58:44 -0000 1.11 @@ -1 +1 @@ -a094cce997e96954b7fc7c21f1e91cc2 Perl-Critic-1.080.tar.gz +f2ad44e084444b42f1b59b0f2f3bb387 Perl-Critic-1.082.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 04:04:59 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 04:04:59 GMT Subject: rpms/perl-Sub-Exporter/devel .cvsignore, 1.6, 1.7 perl-Sub-Exporter.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807010404.m6144xsj002432@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Sub-Exporter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2397 Modified Files: .cvsignore perl-Sub-Exporter.spec sources Log Message: * Mon Jun 30 2008 Chris Weyl 0.979-1 - update to 0.979 - drop BR's on: perl(Test::Pod::Coverage), perl(Test::Pod) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Exporter/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Jan 2008 00:42:05 -0000 1.6 +++ .cvsignore 1 Jul 2008 04:04:08 -0000 1.7 @@ -1 +1 @@ -Sub-Exporter-0.978.tar.gz +Sub-Exporter-0.979.tar.gz Index: perl-Sub-Exporter.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Exporter/devel/perl-Sub-Exporter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Sub-Exporter.spec 28 Feb 2008 13:12:55 -0000 1.7 +++ perl-Sub-Exporter.spec 1 Jul 2008 04:04:09 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Sub-Exporter -Version: 0.978 -Release: 2%{?dist} +Version: 0.979 +Release: 1%{?dist} Summary: Sophisticated exporter for custom-built routines License: GPL+ or Artistic Group: Development/Libraries @@ -16,7 +16,6 @@ BuildRequires: perl(Params::Util) >= 0.14 BuildRequires: perl(Sub::Install) >= 0.92 # testing... -BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod) BuildRequires: perl(Package::Generator) @@ -59,6 +58,10 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.979-1 +- update to 0.979 +- drop BR's on: perl(Test::Pod::Coverage), perl(Test::Pod) + * Wed Feb 27 2008 Tom "spot" Callaway - 0.978-2 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Exporter/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jan 2008 00:42:05 -0000 1.6 +++ sources 1 Jul 2008 04:04:09 -0000 1.7 @@ -1 +1 @@ -70916cbe086996a5eed99871c7fbb99e Sub-Exporter-0.978.tar.gz +a064aa08503c69420527133d22ce12c9 Sub-Exporter-0.979.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 04:08:25 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 1 Jul 2008 04:08:25 GMT Subject: rpms/atanks/F-9 .cvsignore, 1.5, 1.6 atanks.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200807010408.m6148PPN002621@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/pkgs/rpms/atanks/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2584 Modified Files: .cvsignore atanks.spec sources Log Message: Upstream 3.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/atanks/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 May 2008 17:20:26 -0000 1.5 +++ .cvsignore 1 Jul 2008 04:07:31 -0000 1.6 @@ -1 +1 @@ -atanks-2.9.tar.gz +atanks-3.0.tar.gz Index: atanks.spec =================================================================== RCS file: /cvs/pkgs/rpms/atanks/F-9/atanks.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- atanks.spec 10 May 2008 17:20:27 -0000 1.6 +++ atanks.spec 1 Jul 2008 04:07:31 -0000 1.7 @@ -1,5 +1,5 @@ Name: atanks -Version: 2.9 +Version: 3.0 Release: 1%{?dist} Summary: Remake of a classic DOS game "Scorched Earth" @@ -61,6 +61,9 @@ %changelog +* Mon Jun 30 2008 Konstantin Ryabitsev - 3.0-1 +- Upstream 3.0 + * Sat Apr 12 2008 Konstantin Ryabitsev - 2.9-1 - Upstream 2.9 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/atanks/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 May 2008 17:20:27 -0000 1.5 +++ sources 1 Jul 2008 04:07:31 -0000 1.6 @@ -1 +1 @@ -c3d930dd63f3b4157827b305bf2a6b6e atanks-2.9.tar.gz +515ddfd70fb005d56aa0b509c4812ab8 atanks-3.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 04:10:33 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 04:10:33 GMT Subject: rpms/perl-Sub-Exporter/F-9 perl-Sub-Exporter.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807010410.m614AXwR002681@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Sub-Exporter/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2632 Modified Files: perl-Sub-Exporter.spec sources Log Message: * Mon Jun 30 2008 Chris Weyl 0.979-1 - update to 0.979 - drop BR's on: perl(Test::Pod::Coverage), perl(Test::Pod) Index: perl-Sub-Exporter.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Exporter/F-9/perl-Sub-Exporter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Sub-Exporter.spec 28 Feb 2008 13:12:55 -0000 1.7 +++ perl-Sub-Exporter.spec 1 Jul 2008 04:09:33 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Sub-Exporter -Version: 0.978 -Release: 2%{?dist} +Version: 0.979 +Release: 1%{?dist} Summary: Sophisticated exporter for custom-built routines License: GPL+ or Artistic Group: Development/Libraries @@ -16,7 +16,6 @@ BuildRequires: perl(Params::Util) >= 0.14 BuildRequires: perl(Sub::Install) >= 0.92 # testing... -BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod) BuildRequires: perl(Package::Generator) @@ -59,6 +58,10 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.979-1 +- update to 0.979 +- drop BR's on: perl(Test::Pod::Coverage), perl(Test::Pod) + * Wed Feb 27 2008 Tom "spot" Callaway - 0.978-2 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Exporter/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jan 2008 00:42:05 -0000 1.6 +++ sources 1 Jul 2008 04:09:33 -0000 1.7 @@ -1 +1 @@ -70916cbe086996a5eed99871c7fbb99e Sub-Exporter-0.978.tar.gz +a064aa08503c69420527133d22ce12c9 Sub-Exporter-0.979.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 04:11:01 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 04:11:01 GMT Subject: rpms/perl-Sub-Exporter/F-8 perl-Sub-Exporter.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200807010411.m614B1SS002775@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Sub-Exporter/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2657 Modified Files: perl-Sub-Exporter.spec sources Log Message: * Mon Jun 30 2008 Chris Weyl 0.979-1 - update to 0.979 - drop BR's on: perl(Test::Pod::Coverage), perl(Test::Pod) Index: perl-Sub-Exporter.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Exporter/F-8/perl-Sub-Exporter.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Sub-Exporter.spec 10 Aug 2007 00:54:38 -0000 1.5 +++ perl-Sub-Exporter.spec 1 Jul 2008 04:10:14 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-Sub-Exporter -Version: 0.975 +Version: 0.979 Release: 1%{?dist} Summary: Sophisticated exporter for custom-built routines -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sub-Exporter/ Source0: http://www.cpan.org/authors/id/R/RJ/RJBS/Sub-Exporter-%{version}.tar.gz @@ -16,7 +16,6 @@ BuildRequires: perl(Params::Util) >= 0.14 BuildRequires: perl(Sub::Install) >= 0.92 # testing... -BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod) BuildRequires: perl(Package::Generator) @@ -59,6 +58,18 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.979-1 +- update to 0.979 +- drop BR's on: perl(Test::Pod::Coverage), perl(Test::Pod) + +* Wed Feb 27 2008 Tom "spot" Callaway - 0.978-2 +- Rebuild for perl 5.10 (again) + +* Thu Jan 24 2008 Tom "spot" Callaway 0.978-1 +- update to 0.978 +- fix license tag +- rebuild for new perl + * Thu Aug 09 2007 Chris Weyl 0.975-1 - update to 0.975 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Exporter/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Aug 2007 00:54:38 -0000 1.5 +++ sources 1 Jul 2008 04:10:14 -0000 1.6 @@ -1 +1 @@ -5a4deeea702fa184117624c84dbd960c Sub-Exporter-0.975.tar.gz +a064aa08503c69420527133d22ce12c9 Sub-Exporter-0.979.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 04:45:02 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 1 Jul 2008 04:45:02 GMT Subject: rpms/scim/devel scim.spec,1.120,1.121 xinput-scim,1.18,1.19 Message-ID: <200807010445.m614j29x003334@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3265 Modified Files: scim.spec xinput-scim Log Message: - make xinput script no longer require multilib immodules - remove the hacks in xinput script counting the number of IMEs Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- scim.spec 16 Jun 2008 05:26:25 -0000 1.120 +++ scim.spec 1 Jul 2008 04:44:08 -0000 1.121 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ @@ -303,6 +303,10 @@ %changelog +* Mon Jun 30 2008 Jens Petersen - 1.4.7-26.fc10 +- make xinput script no longer require multilib immodules +- remove the hacks in xinput script counting the number of IMEs + * Mon Jun 16 2008 Jens Petersen - 1.4.7-25.fc10 - require imsettings instead of im-chooser Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xinput-scim 2 Apr 2008 07:27:42 -0000 1.18 +++ xinput-scim 1 Jul 2008 04:44:08 -0000 1.19 @@ -1,64 +1,37 @@ -# socket.so is not an IME -IMENGINES=`ls /usr/lib*/scim-1.0/1.4.0/IMEngine | grep -v socket.so` +XIM=SCIM +XIM_PROGRAM=/usr/bin/scim +XIM_ARGS="" +PREFERENCE_PROGRAM=/usr/bin/scim-setup +SHORT_DESC="SCIM" -# check for m17n maps -if echo $IMENGINES | grep -q m17n.so; then - if [ -z "`ls /usr/share/m17n/*.mim | grep -v global.mim`" ]; then - IMENGINES=`echo $IMENGINES | sed -e "s/m17n.so//"` - fi -fi - -# check for scim-tables -if echo $IMENGINES | grep -q table.so; then - if [ -z "`ls /usr/share/scim/tables`" ]; then - IMENGINES=`echo $IMENGINES | sed -e "s/table.so//"` - fi -fi - -IMENGINE_NO=`echo $IMENGINES | wc -w` - -# start SCIM if have active IME(s) -if [ "$IMENGINE_NO" -ge 1 ]; then - - XIM=SCIM - XIM_PROGRAM=/usr/bin/scim - XIM_ARGS="" - PREFERENCE_PROGRAM=/usr/bin/scim-setup - SHORT_DESC="SCIM" - - gtkimm_exists () { - # for multilib check both immodules installed +gtkimm_exists () { + # check if any immodules installed for dir in /usr/lib*/gtk-2.0/immodules; do - [ ! -x ${dir}/im-$1.so ] && return 1 + [ -x ${dir}/im-$1.so ] && return 0 done - return 0 + return 1 } - if gtkimm_exists scim-bridge; then - GTK_IM_MODULE=scim-bridge - elif gtkimm_exists scim; then - GTK_IM_MODULE=scim - else - GTK_IM_MODULE=xim - fi +if gtkimm_exists scim-bridge; then + GTK_IM_MODULE=scim-bridge +elif gtkimm_exists scim; then + GTK_IM_MODULE=scim +else + GTK_IM_MODULE=xim +fi - qtimm_exists () { - # for multilib check both immodules installed +qtimm_exists () { + # check if any immodule installed for dir in /usr/lib*/qt4/plugins/inputmethods; do - [ ! -x ${dir}/$1.so ] && return 1 + [ -x ${dir}/$1.so ] && return 0 done - return 0 + return 1 } - if qtimm_exists im-scim-bridge; then - QT_IM_MODULE=scim-bridge - elif qtimm_exists libqscim; then - QT_IM_MODULE=scim - else - QT_IM_MODULE=xim - fi - +if qtimm_exists im-scim-bridge; then + QT_IM_MODULE=scim-bridge +elif qtimm_exists libqscim; then + QT_IM_MODULE=scim else - echo "No SCIM IMEs found: SCIM startup was skipped." - . /etc/X11/xinit/xinput.d/none.conf + QT_IM_MODULE=xim fi From fedora-extras-commits at redhat.com Tue Jul 1 04:45:04 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Tue, 1 Jul 2008 04:45:04 GMT Subject: rpms/darcs/devel darcs.spec,1.36,1.37 Message-ID: <200807010445.m614j4WR003339@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3280 Modified Files: darcs.spec Log Message: attempt to fix testing Index: darcs.spec =================================================================== RCS file: /cvs/pkgs/rpms/darcs/devel/darcs.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- darcs.spec 29 Jun 2008 07:05:22 -0000 1.36 +++ darcs.spec 1 Jul 2008 04:44:06 -0000 1.37 @@ -71,8 +71,6 @@ %prep %setup -q -n %{name}-%{version} -# skip test currently failing in buildsystem -mv tests/send.sh{,-disabled} %build @@ -82,7 +80,14 @@ %check -#make test +# 'make test' runs bugs too which are known to fail, just run +# make the tests +make test_shell +make test_shell_format2 +make test_shell_hashed +make test_perl +make test_perl_format2 +make test_perl_hashed %install @@ -133,6 +138,8 @@ * Sat Jun 28 2008 Jeremy Hinegardner - 2.0.2-1 - split out the manual to a -doc rpm - update to 2.0.2 +- switch to make test +- remove skipping of tests - it doesn't appear to apply anymore * Mon Jun 23 2008 Jens Petersen - 2.0.0-1.fc10 - update to 2.0.0 From fedora-extras-commits at redhat.com Tue Jul 1 04:46:54 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 1 Jul 2008 04:46:54 GMT Subject: rpms/scim/devel scim.spec,1.121,1.122 Message-ID: <200807010446.m614kseJ003379@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3352 Modified Files: scim.spec Log Message: add reference to bug (Julian Sikorski, #448268) Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- scim.spec 1 Jul 2008 04:44:08 -0000 1.121 +++ scim.spec 1 Jul 2008 04:45:53 -0000 1.122 @@ -305,6 +305,7 @@ %changelog * Mon Jun 30 2008 Jens Petersen - 1.4.7-26.fc10 - make xinput script no longer require multilib immodules + (Julian Sikorski, #448268) - remove the hacks in xinput script counting the number of IMEs * Mon Jun 16 2008 Jens Petersen - 1.4.7-25.fc10 From fedora-extras-commits at redhat.com Tue Jul 1 07:08:15 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 07:08:15 GMT Subject: rpms/perl-Class-MOP/F-9 perl-Class-MOP.spec, 1.14, 1.15 sources, 1.12, 1.13 Message-ID: <200807010708.m6178FXi025348@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25265 Modified Files: perl-Class-MOP.spec sources Log Message: * Wed Jun 25 2008 Chris Weyl 0.62-1 - update to 0.62 - tweak provides filtering Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/F-9/perl-Class-MOP.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Class-MOP.spec 22 May 2008 05:41:38 -0000 1.14 +++ perl-Class-MOP.spec 1 Jul 2008 07:07:16 -0000 1.15 @@ -1,11 +1,10 @@ Name: perl-Class-MOP -Version: 0.55 -Release: 2%{?dist} +Version: 0.62 +Release: 1%{?dist} Summary: Metaobject programming model for Perl License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-MOP/ -#Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/Class-MOP-%{version}.tar.gz Source0: http://www.cpan.org/modules/by-module/Class/Class-MOP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -14,8 +13,9 @@ BuildRequires: perl(Test::More) # cpan BuildRequires: perl(Module::Build) -BuildRequires: perl(MRO::Compat) >= 0.05 -BuildRequires: perl(Sub::Name) >= 0.02 +BuildRequires: perl(MRO::Compat) >= 0.05 +BuildRequires: perl(Sub::Identify) >= 0.03 +BuildRequires: perl(Sub::Name) >= 0.02 # test BuildRequires: perl(Algorithm::C3) BuildRequires: perl(Class::C3) @@ -24,6 +24,8 @@ BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) +# not automatically picked up +Requires: perl(Sub::Identify) >= 0.03 %description This module is an attempt to create a meta object protocol for the Perl 5 @@ -39,11 +41,11 @@ %prep %setup -q -n Class-MOP-%{version} -# Filter unwanted Provides: +# make sure doc/tests don't generate provides cat << \EOF > %{name}-prov #!/bin/sh -%{__perl_provides} $* |\ - sed -e '/perl(MyMetaClass.*)/d; /perl(BinaryTree)/d' +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO EOF %define __perl_provides %{_builddir}/Class-MOP-%{version}/%{name}-prov @@ -79,6 +81,16 @@ %{_mandir}/man3/* %changelog +* Wed Jun 25 2008 Chris Weyl 0.62-1 +- update to 0.62 +- tweak provides filtering + +* Tue Jun 17 2008 Chris Weyl 0.61-1 +- update to 0.61 + +* Wed May 28 2008 Chris Weyl 0.57-1 +- update to 0.57 + * Wed May 21 2008 Chris Weyl 0.55-2 - bump for tagging snafu... Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 22 May 2008 05:41:38 -0000 1.12 +++ sources 1 Jul 2008 07:07:16 -0000 1.13 @@ -1 +1 @@ -83b916baa38c7089c9f0c84c67aa1fec Class-MOP-0.55.tar.gz +2fa7d9ceb87209c7aa2335a393be7b8e Class-MOP-0.62.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 07:08:16 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 07:08:16 GMT Subject: rpms/perl-Class-MOP/F-8 perl-Class-MOP.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <200807010708.m6178Gjm025383@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25272 Modified Files: perl-Class-MOP.spec sources Log Message: * Wed Jun 25 2008 Chris Weyl 0.62-1 - update to 0.62 - tweak provides filtering Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/F-8/perl-Class-MOP.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Class-MOP.spec 27 Nov 2007 02:37:34 -0000 1.9 +++ perl-Class-MOP.spec 1 Jul 2008 07:07:25 -0000 1.10 @@ -1,21 +1,21 @@ Name: perl-Class-MOP -Version: 0.47 +Version: 0.62 Release: 1%{?dist} Summary: Metaobject programming model for Perl License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-MOP/ -#Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/Class-MOP-%{version}.tar.gz Source0: http://www.cpan.org/modules/by-module/Class/Class-MOP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # core BuildRequires: perl(Test::More) # cpan BuildRequires: perl(Module::Build) -BuildRequires: perl(Sub::Name) >= 0.02 +BuildRequires: perl(MRO::Compat) >= 0.05 +BuildRequires: perl(Sub::Identify) >= 0.03 +BuildRequires: perl(Sub::Name) >= 0.02 # test BuildRequires: perl(Algorithm::C3) BuildRequires: perl(Class::C3) @@ -24,6 +24,8 @@ BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) +# not automatically picked up +Requires: perl(Sub::Identify) >= 0.03 %description This module is an attempt to create a meta object protocol for the Perl 5 @@ -39,11 +41,11 @@ %prep %setup -q -n Class-MOP-%{version} -# Filter unwanted Provides: +# make sure doc/tests don't generate provides cat << \EOF > %{name}-prov #!/bin/sh -%{__perl_provides} $* |\ - sed -e '/perl(MyMetaClass.*)/d; /perl(BinaryTree)/d' +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO EOF %define __perl_provides %{_builddir}/Class-MOP-%{version}/%{name}-prov @@ -57,7 +59,9 @@ rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} + + +find %{buildroot} -type f -name .packlist -exec rm -f {} + +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* @@ -71,10 +75,42 @@ %files %defattr(-,root,root,-) %doc Changes README examples/ scripts/ t/ -%{perl_vendorlib}/* +%{perl_vendorarch}/auto/* +%{perl_vendorarch}/Class +%{perl_vendorarch}/metaclass.pm %{_mandir}/man3/* %changelog +* Wed Jun 25 2008 Chris Weyl 0.62-1 +- update to 0.62 +- tweak provides filtering + +* Tue Jun 17 2008 Chris Weyl 0.61-1 +- update to 0.61 + +* Wed May 28 2008 Chris Weyl 0.57-1 +- update to 0.57 + +* Wed May 21 2008 Chris Weyl 0.55-2 +- bump for tagging snafu... + +* Wed May 21 2008 Chris Weyl 0.55-1 +- update to 0.55 + +* Wed Mar 5 2008 Tom "spot" Callaway - 0.49-3 +- rebuild for new perl + +* Mon Feb 18 2008 Fedora Release Engineering - 0.49-2 +- Autorebuild for GCC 4.3 + +* Sat Dec 15 2007 Chris Weyl 0.49-1 +- update to 0.49 +- note that we're now arch-specific, as there's XS-speedup goodness! +- note also that 0.49 BREAKS Moose < 0.33! + +* Wed Dec 12 2007 Chris Weyl 0.48-1 +- update to 0.48 + * Sun Nov 25 2007 Chris Weyl 0.47-1 - update to 0.47 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Nov 2007 02:37:34 -0000 1.9 +++ sources 1 Jul 2008 07:07:25 -0000 1.10 @@ -1 +1 @@ -4b337a60f300e3ec8f45e1d73253d353 Class-MOP-0.47.tar.gz +2fa7d9ceb87209c7aa2335a393be7b8e Class-MOP-0.62.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 07:10:09 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 1 Jul 2008 07:10:09 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.36, 1.37 cairo-dock.spec, 1.46, 1.47 sources, 1.36, 1.37 Message-ID: <200807010710.m617A9CN025543@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25505 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Tue Jul 1 2008 Mamoru Tasaka - rev. 1163 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 1 Jul 2008 02:02:02 -0000 1.36 +++ .cvsignore 1 Jul 2008 07:09:27 -0000 1.37 @@ -1 +1 @@ -cairo-dock-sources-svn1162_trunk.tar.bz2 +cairo-dock-sources-svn1163.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- cairo-dock.spec 1 Jul 2008 02:41:51 -0000 1.46 +++ cairo-dock.spec 1 Jul 2008 07:09:27 -0000 1.47 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1162_trunk +%define tarballver svn1163_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -495,7 +495,7 @@ %changelog * Tue Jul 1 2008 Mamoru Tasaka -- rev. 1162 +- rev. 1163 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 1 Jul 2008 02:02:02 -0000 1.36 +++ sources 1 Jul 2008 07:09:27 -0000 1.37 @@ -1 +1 @@ -ebe99b0c059e53d711a9f4b750e932f4 cairo-dock-sources-svn1162_trunk.tar.bz2 +48585dc7ee447ea27ff6e5ab20716603 cairo-dock-sources-svn1163.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 07:20:40 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 1 Jul 2008 07:20:40 GMT Subject: rpms/cairo-dock/devel .cvsignore,1.37,1.38 sources,1.37,1.38 Message-ID: <200807010720.m617Ker0025937@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25886 Modified Files: .cvsignore sources Log Message: orz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 1 Jul 2008 07:09:27 -0000 1.37 +++ .cvsignore 1 Jul 2008 07:19:38 -0000 1.38 @@ -1 +1 @@ -cairo-dock-sources-svn1163.tar.bz2 +cairo-dock-sources-svn1163_trunk.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 1 Jul 2008 07:09:27 -0000 1.37 +++ sources 1 Jul 2008 07:19:38 -0000 1.38 @@ -1 +1 @@ -48585dc7ee447ea27ff6e5ab20716603 cairo-dock-sources-svn1163.tar.bz2 +48585dc7ee447ea27ff6e5ab20716603 cairo-dock-sources-svn1163_trunk.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 07:21:53 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Tue, 1 Jul 2008 07:21:53 GMT Subject: rpms/gnutls/devel .cvsignore, 1.14, 1.15 gnutls.spec, 1.33, 1.34 sources, 1.14, 1.15 Message-ID: <200807010721.m617Lr0m026035@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/gnutls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25974 Modified Files: .cvsignore gnutls.spec sources Log Message: * Tue Jul 1 2008 Tomas Mraz 2.4.1-1 - new upstream version - correct the license tag - explicit --with-included-opencdk not needed - use external lzo library, internal not included anymore Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 24 Jun 2008 08:50:32 -0000 1.14 +++ .cvsignore 1 Jul 2008 07:21:07 -0000 1.15 @@ -1 +1 @@ -gnutls-2.4.0-nosrp.tar.bz2 +gnutls-2.4.1-nosrp.tar.bz2 Index: gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gnutls.spec 24 Jun 2008 08:50:32 -0000 1.33 +++ gnutls.spec 1 Jul 2008 07:21:07 -0000 1.34 @@ -1,13 +1,13 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} -# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv2+ -License: GPLv2+ and LGPLv2+ +# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ +License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries BuildRequires: libgcrypt-devel >= 1.2.2, gettext BuildRequires: zlib-devel, readline-devel, libtasn1-devel -#BuildPrereq: opencdk-devel +BuildRequires: lzo-devel URL: http://www.gnutls.org/ #Source0: ftp://ftp.gnutls.org/pub/gnutls/devel/%{name}-%{version}.tar.gz #Source1: ftp://ftp.gnutls.org/pub/gnutls/devel/%{name}-%{version}.tar.gz.sig @@ -24,7 +24,6 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libgcrypt-devel -Requires: zlib-devel Requires: pkgconfig Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -62,8 +61,8 @@ done %build -%configure --with-included-opencdk --with-libtasn1-prefix=%{_prefix} \ - --with-included-libcfg --with-included-lzo \ +%configure --with-libtasn1-prefix=%{_prefix} \ + --with-included-libcfg \ --disable-srp-authentication make @@ -124,6 +123,12 @@ %{_mandir}/man1/* %changelog +* Tue Jul 1 2008 Tomas Mraz 2.4.1-1 +- new upstream version +- correct the license tag +- explicit --with-included-opencdk not needed +- use external lzo library, internal not included anymore + * Tue Jun 24 2008 Tomas Mraz 2.4.0-1 - upgrade to latest upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 24 Jun 2008 08:50:32 -0000 1.14 +++ sources 1 Jul 2008 07:21:07 -0000 1.15 @@ -1 +1 @@ -45595b7146b135fc883ca8010a6b185c gnutls-2.4.0-nosrp.tar.bz2 +1ddb4dcb078fc5664d939dc652dab193 gnutls-2.4.1-nosrp.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 07:35:51 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 1 Jul 2008 07:35:51 GMT Subject: rpms/lm_sensors/F-9 lm_sensors.spec,1.64,1.65 Message-ID: <200807010735.m617Zpdu026889@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lm_sensors/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26860 Modified Files: lm_sensors.spec Log Message: * Sat Jun 14 2008 Hans de Goede 3.0.1-6 - Rebuild for new rrdtool Index: lm_sensors.spec =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-9/lm_sensors.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- lm_sensors.spec 16 Mar 2008 10:14:31 -0000 1.64 +++ lm_sensors.spec 1 Jul 2008 07:35:08 -0000 1.65 @@ -1,6 +1,6 @@ Name: lm_sensors Version: 3.0.1 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 Source1: lm_sensors.sysconfig @@ -171,6 +171,9 @@ %changelog +* Sat Jun 14 2008 Hans de Goede 3.0.1-6 +- Rebuild for new rrdtool + * Sun Mar 16 2008 Hans de Goede 3.0.1-5 - Make libsensors work with hwmon class entries without a device link such as the acpi thermal_zone driver (bz 437637) From fedora-extras-commits at redhat.com Tue Jul 1 08:12:50 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 08:12:50 GMT Subject: rpms/ruby/devel ruby.spec,1.120,1.121 Message-ID: <200807010812.m618CoRS001833@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/ruby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1806 Modified Files: ruby.spec Log Message: Index: ruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- ruby.spec 1 Jul 2008 08:01:35 -0000 1.120 +++ ruby.spec 1 Jul 2008 08:12:02 -0000 1.121 @@ -37,7 +37,7 @@ Patch26: ruby-1.8.6.230-string-str_buf_cat.patch Patch27: ruby-1.8.6.230-p238.patch Patch28: ruby-1.8.6.230-p248.patch -patch29: ruby-1.8.6.230-p257.patch +Patch29: ruby-1.8.6.230-p257.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages From fedora-extras-commits at redhat.com Tue Jul 1 08:15:43 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 08:15:43 GMT Subject: rpms/ruby/F-9 ruby.spec,1.119,1.120 Message-ID: <200807010815.m618FhNJ001969@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/ruby/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1939 Modified Files: ruby.spec Log Message: * Tue Jul 1 2008 Akira TAGOH - 1.8.6.230-4 - Backported from upstream SVN to fix a segfault issue with Array#fill. Index: ruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby/F-9/ruby.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- ruby.spec 30 Jun 2008 03:41:46 -0000 1.119 +++ ruby.spec 1 Jul 2008 08:15:00 -0000 1.120 @@ -12,7 +12,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 3%{?dist} +Release: 4%{?dist} License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +39,7 @@ Patch26: ruby-1.8.6.230-string-str_buf_cat.patch Patch27: ruby-1.8.6.230-p238.patch Patch28: ruby-1.8.6.230-p248.patch +Patch29: ruby-1.8.6.230-p257.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -162,6 +163,7 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 popd %build @@ -518,6 +520,9 @@ %endif %changelog +* Tue Jul 1 2008 Akira TAGOH - 1.8.6.230-4 +- Backported from upstream SVN to fix a segfault issue with Array#fill. + * Mon Jun 30 2008 Akira TAGOH - 1.8.6.230-3 - Backported from upstream SVN to fix a segfault issue. (#452825) - Backported from upstream SVN to fix an integer overflow in rb_ary_fill. From fedora-extras-commits at redhat.com Tue Jul 1 08:02:27 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 08:02:27 GMT Subject: rpms/ruby/devel ruby-1.8.6.230-p257.patch, NONE, 1.1 ruby.spec, 1.119, 1.120 Message-ID: <200807010802.m6182ROG001544@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/ruby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499 Modified Files: ruby.spec Added Files: ruby-1.8.6.230-p257.patch Log Message: * Tue Jul 1 2008 Akira TAGOH - 1.8.6.230-4 - Backported from upstream SVN to fix a segfault issue with Array#fill. ruby-1.8.6.230-p257.patch: --- NEW FILE ruby-1.8.6.230-p257.patch --- diff -pruN ruby-1.8.6-p230.orig/array.c ruby-1.8.6-p230/array.c --- ruby-1.8.6-p230.orig/array.c 2008-07-01 16:32:12.000000000 +0900 +++ ruby-1.8.6-p230/array.c 2008-07-01 16:34:01.000000000 +0900 @@ -2272,7 +2272,7 @@ rb_ary_fill(argc, argv, ary) break; } rb_ary_modify(ary); - if (len > ARY_MAX_SIZE - beg) { + if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) { rb_raise(rb_eArgError, "argument too big"); } end = beg + len; Index: ruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- ruby.spec 30 Jun 2008 02:37:44 -0000 1.119 +++ ruby.spec 1 Jul 2008 08:01:35 -0000 1.120 @@ -12,7 +12,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 3%{?dist} +Release: 4%{?dist} License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,6 +37,7 @@ Patch26: ruby-1.8.6.230-string-str_buf_cat.patch Patch27: ruby-1.8.6.230-p238.patch Patch28: ruby-1.8.6.230-p248.patch +patch29: ruby-1.8.6.230-p257.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -158,6 +159,7 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 popd %build @@ -508,6 +510,9 @@ %{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el %changelog +* Tue Jul 1 2008 Akira TAGOH - 1.8.6.230-4 +- Backported from upstream SVN to fix a segfault issue with Array#fill. + * Mon Jun 30 2008 Akira TAGOH - 1.8.6.230-3 - Backported from upstream SVN to fix a segfault issue. (#452825) - Backported from upstream SVN to fix an integer overflow in rb_ary_fill. From fedora-extras-commits at redhat.com Tue Jul 1 08:21:37 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 08:21:37 GMT Subject: rpms/ruby/F-9 ruby-1.8.6.230-p257.patch,NONE,1.1 Message-ID: <200807010821.m618Lbt2002195@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/ruby/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2187 Added Files: ruby-1.8.6.230-p257.patch Log Message: ruby-1.8.6.230-p257.patch: --- NEW FILE ruby-1.8.6.230-p257.patch --- diff -pruN ruby-1.8.6-p230.orig/array.c ruby-1.8.6-p230/array.c --- ruby-1.8.6-p230.orig/array.c 2008-07-01 16:32:12.000000000 +0900 +++ ruby-1.8.6-p230/array.c 2008-07-01 16:34:01.000000000 +0900 @@ -2272,7 +2272,7 @@ rb_ary_fill(argc, argv, ary) break; } rb_ary_modify(ary); - if (len > ARY_MAX_SIZE - beg) { + if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) { rb_raise(rb_eArgError, "argument too big"); } end = beg + len; From fedora-extras-commits at redhat.com Tue Jul 1 08:41:03 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 1 Jul 2008 08:41:03 GMT Subject: rpms/perl-MIME-tools/devel .cvsignore, 1.8, 1.9 perl-MIME-tools.spec, 1.21, 1.22 sources, 1.8, 1.9 Message-ID: <200807010841.m618f3Uq002884@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-MIME-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2833 Modified Files: .cvsignore perl-MIME-tools.spec sources Log Message: Update to 5.427 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-tools/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 19 Mar 2008 11:10:54 -0000 1.8 +++ .cvsignore 1 Jul 2008 08:39:42 -0000 1.9 @@ -1 +1 @@ -MIME-tools-5.426.tar.gz +MIME-tools-5.427.tar.gz Index: perl-MIME-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- perl-MIME-tools.spec 19 Mar 2008 11:10:54 -0000 1.21 +++ perl-MIME-tools.spec 1 Jul 2008 08:39:42 -0000 1.22 @@ -2,7 +2,7 @@ # in Fedora prior to Fedora 9 (it's a core module) Name: perl-MIME-tools -Version: 5.426 +Version: 5.427 Release: 1%{?dist} Summary: Modules for parsing and creating MIME entities in Perl Group: Development/Libraries @@ -15,6 +15,7 @@ BuildRequires: perl(File::Path) >= 1 BuildRequires: perl(File::Spec) >= 0.6 BuildRequires: perl(File::Temp) >= 0.18 +BuildRequires: perl(IO::File) >= 1.13 BuildRequires: perl(IO::Stringy) >= 2.110 BuildRequires: perl(MIME::Base64) >= 3.03 BuildRequires: perl-MailTools >= 1.50 @@ -79,6 +80,10 @@ %{_mandir}/man3/MIME::*.3pm* %changelog +* Tue Jul 1 2008 Paul Howarth 5.427-1 +- Update to 5.427 +- Require and BuildRequire perl(IO::File) >= 1.13 + * Wed Mar 19 2008 Paul Howarth 5.426-1 - Update to 5.426 - Now require File::Temp >= 0.18 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-tools/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 19 Mar 2008 11:10:54 -0000 1.8 +++ sources 1 Jul 2008 08:39:42 -0000 1.9 @@ -1 +1 @@ -87ab3a328e56268f551ff3ef5f51f416 MIME-tools-5.426.tar.gz +4333caa7238cb9eafb5f7fb39fcbd8e7 MIME-tools-5.427.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 08:48:11 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 1 Jul 2008 08:48:11 GMT Subject: rpms/ruby/F-8 ruby-1.8.6.230-p257.patch, NONE, 1.1 ruby.spec, 1.108, 1.109 Message-ID: <200807010848.m618mB4b003160@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/ruby/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3121 Modified Files: ruby.spec Added Files: ruby-1.8.6.230-p257.patch Log Message: * Tue Jul 1 2008 Akira TAGOH - 1.8.6.230-4 - Backported from upstream SVN to fix a segfault issue with Array#fill. ruby-1.8.6.230-p257.patch: --- NEW FILE ruby-1.8.6.230-p257.patch --- diff -pruN ruby-1.8.6-p230.orig/array.c ruby-1.8.6-p230/array.c --- ruby-1.8.6-p230.orig/array.c 2008-07-01 16:32:12.000000000 +0900 +++ ruby-1.8.6-p230/array.c 2008-07-01 16:34:01.000000000 +0900 @@ -2272,7 +2272,7 @@ rb_ary_fill(argc, argv, ary) break; } rb_ary_modify(ary); - if (len > ARY_MAX_SIZE - beg) { + if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) { rb_raise(rb_eArgError, "argument too big"); } end = beg + len; Index: ruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby/F-8/ruby.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- ruby.spec 30 Jun 2008 03:46:12 -0000 1.108 +++ ruby.spec 1 Jul 2008 08:47:11 -0000 1.109 @@ -12,7 +12,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 3%{?dist} +Release: 4%{?dist} License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +39,7 @@ Patch26: ruby-1.8.6.230-string-str_buf_cat.patch Patch27: ruby-1.8.6.230-p238.patch Patch28: ruby-1.8.6.230-p248.patch +Patch29: ruby-1.8.6.230-p257.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -162,6 +163,7 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 popd %build @@ -518,6 +520,9 @@ %endif %changelog +* Tue Jul 1 2008 Akira TAGOH - 1.8.6.230-4 +- Backported from upstream SVN to fix a segfault issue with Array#fill. + * Mon Jun 30 2008 Akira TAGOH - 1.8.6.230-3 - Backported from upstream SVN to fix a segfault issue. (#452825) - Backported from upstream SVN to fix an integer overflow in rb_ary_fill. From fedora-extras-commits at redhat.com Tue Jul 1 09:10:41 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 1 Jul 2008 09:10:41 GMT Subject: rpms/automoc/devel automoc.spec, 1.7, 1.8 automoc-1.0-lib64.patch, 1.1, NONE Message-ID: <200807010910.m619AffZ010584@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/automoc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10552/devel Modified Files: automoc.spec Removed Files: automoc-1.0-lib64.patch Log Message: Remove lib64 patch completely. Index: automoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/automoc/devel/automoc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- automoc.spec 30 Jun 2008 12:50:51 -0000 1.7 +++ automoc.spec 1 Jul 2008 09:09:57 -0000 1.8 @@ -13,7 +13,6 @@ #Source0: http://rpm.binaryhelix.net/SOURCES/%{name}-%{version}%{?snaptag}.tar.gz Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.93/support/automoc4-%{beta}.tar.bz2 -Patch0: automoc-1.0-lib64.patch Provides: automoc4 = %{beta} @@ -26,7 +25,6 @@ %prep %setup -q -n automoc4-%{beta} -#patch0 -p1 -b .lib64 %build --- automoc-1.0-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 09:12:00 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 1 Jul 2008 09:12:00 GMT Subject: rpms/phonon/devel phonon.spec, 1.3, 1.4 phonon-4.2-automoc_libsuffix.patch, 1.1, NONE Message-ID: <200807010912.m619C05l010646@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/phonon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10613/devel Modified Files: phonon.spec Removed Files: phonon-4.2-automoc_libsuffix.patch Log Message: * Tue Jul 01 2008 Kevin Kofler 4.2-0.3.beta2 - drop automoc libsuffix patch, no longer needed Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- phonon.spec 20 Jun 2008 18:12:48 -0000 1.3 +++ phonon.spec 1 Jul 2008 09:11:18 -0000 1.4 @@ -5,7 +5,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.2 -Release: 0.2.%{?beta_tag}%{?dist} +Release: 0.3.%{?beta_tag}%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -15,9 +15,6 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/phonon-%{beta}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# patch needed for F-9/cmake-2.4 -Patch1: phonon-4.2-automoc_libsuffix.patch - BuildRequires: automoc BuildRequires: cmake BuildRequires: glib2-devel @@ -48,9 +45,6 @@ %prep %setup -q -n phonon-%{beta} -# unconditionly apply this, should cause no harm. We'll sort this out upstream soonish -%patch1 -p1 -b .automoc_libsuffix - %build mkdir -p %{_target_platform} @@ -99,6 +93,9 @@ %changelog +* Tue Jul 01 2008 Kevin Kofler 4.2-0.3.beta2 +- drop automoc libsuffix patch, no longer needed + * Fri Jun 20 2008 Rex Dieter 4.2-0.2.beta2 - phonon 4.2beta2 (aka 4.1.83) --- phonon-4.2-automoc_libsuffix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 09:28:12 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 1 Jul 2008 09:28:12 GMT Subject: rpms/system-config-date/devel .cvsignore, 1.91, 1.92 sources, 1.99, 1.100 system-config-date.spec, 1.102, 1.103 Message-ID: <200807010928.m619SCuN011309@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-date/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11105 Modified Files: .cvsignore sources system-config-date.spec Log Message: fix Arabic timezone translation (#453202, patch by Muayyad Alsadi) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- .cvsignore 5 May 2008 09:50:09 -0000 1.91 +++ .cvsignore 1 Jul 2008 09:27:20 -0000 1.92 @@ -1 +1 @@ -system-config-date-1.9.31.tar.bz2 +system-config-date-1.9.32.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- sources 5 May 2008 09:50:09 -0000 1.99 +++ sources 1 Jul 2008 09:27:20 -0000 1.100 @@ -1 +1 @@ -c80514be85db4b4755b13cdc12803772 system-config-date-1.9.31.tar.bz2 +9313218885ff689407201c5730aa7490 system-config-date-1.9.32.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- system-config-date.spec 5 May 2008 09:50:09 -0000 1.102 +++ system-config-date.spec 1 Jul 2008 09:27:20 -0000 1.103 @@ -20,7 +20,7 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.9.31 +Version: 1.9.32 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/date License: GPLv2+ @@ -134,6 +134,9 @@ %config(noreplace) %{_sysconfdir}/ntp/ntpservers %changelog +* Tue Jul 01 2008 Nils Philippsen - 1.9.32-1 +- fix Arabic timezone translation (#453202, patch by Muayyad Alsadi) + * Mon May 05 2008 Nils Philippsen - 1.9.31-1 - translate underscores to spaces when reading in zone names (#444093, patch by Jeremy Katz) From fedora-extras-commits at redhat.com Tue Jul 1 09:30:43 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 1 Jul 2008 09:30:43 GMT Subject: rpms/system-config-date/F-9 .cvsignore, 1.90, 1.91 sources, 1.98, 1.99 system-config-date.spec, 1.103, 1.104 system-config-date-underscore.patch, 1.1, NONE Message-ID: <200807010930.m619Uhr2011838@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-date/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11675 Modified Files: .cvsignore sources system-config-date.spec Removed Files: system-config-date-underscore.patch Log Message: rebase to 1.9.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/F-9/.cvsignore,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- .cvsignore 8 Apr 2008 12:51:13 -0000 1.90 +++ .cvsignore 1 Jul 2008 09:29:57 -0000 1.91 @@ -1 +1 @@ -system-config-date-1.9.30.tar.bz2 +system-config-date-1.9.32.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/F-9/sources,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- sources 8 Apr 2008 12:51:13 -0000 1.98 +++ sources 1 Jul 2008 09:29:57 -0000 1.99 @@ -1 +1 @@ -f756ca917f00a9d55a2ef22bd320b764 system-config-date-1.9.30.tar.bz2 +9313218885ff689407201c5730aa7490 system-config-date-1.9.32.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/F-9/system-config-date.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- system-config-date.spec 2 May 2008 21:15:36 -0000 1.103 +++ system-config-date.spec 1 Jul 2008 09:29:57 -0000 1.104 @@ -20,8 +20,8 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.9.30 -Release: 2%{?dist} +Version: 1.9.32 +Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/date License: GPLv2+ Group: System Environment/Base @@ -30,7 +30,6 @@ # We are upstream, thus the source is only available from within this source # package. Source0: %{name}-%{version}.tar.bz2 -Patch0: system-config-date-underscore.patch Obsoletes: timetool < 3.0 Obsoletes: dateconfig < 1.2 Obsoletes: timeconfig < 3.2.10 @@ -79,7 +78,6 @@ %prep %setup -q -%patch0 -p1 %build make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags} @@ -136,8 +134,12 @@ %config(noreplace) %{_sysconfdir}/ntp/ntpservers %changelog -* Fri May 2 2008 Jeremy Katz - 1.9.30-2 -- Add patch to handle '_' vs ' ' mismatch for zone names (#444093) +* Tue Jul 01 2008 Nils Philippsen - 1.9.32-1 +- fix Arabic timezone translation (#453202, patch by Muayyad Alsadi) + +* Mon May 05 2008 Nils Philippsen - 1.9.31-1 +- translate underscores to spaces when reading in zone names (#444093, patch by + Jeremy Katz) * Tue Apr 08 2008 Nils Philippsen - 1.9.30-1 - pick up updated translations --- system-config-date-underscore.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 09:33:32 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 1 Jul 2008 09:33:32 GMT Subject: rpms/system-config-date/F-8 .cvsignore, 1.76, 1.77 sources, 1.81, 1.82 system-config-date.spec, 1.87, 1.88 Message-ID: <200807010933.m619XWYj012442@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-date/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12218 Modified Files: .cvsignore sources system-config-date.spec Log Message: rebase to 1.9.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/F-8/.cvsignore,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- .cvsignore 30 Oct 2007 22:00:55 -0000 1.76 +++ .cvsignore 1 Jul 2008 09:32:47 -0000 1.77 @@ -1 +1 @@ -system-config-date-1.9.16.tar.bz2 +system-config-date-1.9.32.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/F-8/sources,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- sources 30 Oct 2007 22:00:55 -0000 1.81 +++ sources 1 Jul 2008 09:32:47 -0000 1.82 @@ -1 +1 @@ -0f7b9becb7cfeb6c291644d284fe9841 system-config-date-1.9.16.tar.bz2 +9313218885ff689407201c5730aa7490 system-config-date-1.9.32.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/F-8/system-config-date.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- system-config-date.spec 30 Oct 2007 22:00:55 -0000 1.87 +++ system-config-date.spec 1 Jul 2008 09:32:47 -0000 1.88 @@ -1,6 +1,26 @@ +# Command line configurables + +%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6 +%bcond_without newt_python +%else +%bcond_with newt_python +%endif + +%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6 +%bcond_without console_util +%else +%bcond_with console_util +%endif + +%if 0%{?fedora} < 8 || 0%{?rhel} < 6 +%bcond_without scrollkeeper +%else +%bcond_with scrollkeeper +%endif + Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.9.16 +Version: 1.9.32 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/date License: GPLv2+ @@ -19,23 +39,32 @@ BuildRequires: intltool BuildRequires: python BuildRequires: anaconda +BuildRequires: gnome-doc-utils +BuildRequires: docbook-dtds +%if %{with scrollkeeper} +BuildRequires: scrollkeeper +%else +BuildRequires: rarian-compat +%endif + Requires: ntp Requires: python >= 2.0 Requires: pygtk2-libglade Requires: gnome-python2-canvas +%if 0%{?with_console_util:1} +Requires: usermode >= 1.94 +%else Requires: usermode >= 1.36 +%endif Requires: chkconfig Requires: rhpl -%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6 +%if 0%{?with_newt_python:1} Requires: newt-python %else Requires: newt %endif -%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6 -Requires: xdg-utils -%else -Requires: htmlview -%endif +Requires(post): scrollkeeper >= 0:0.3.4 +Requires(postun): scrollkeeper >= 0:0.3.4 Requires: hicolor-icon-theme # system-config-date can act as a plugin to set the time/date, configure NTP or # the timezone for firstboot if the latter is present, but doesn't require it. @@ -51,7 +80,7 @@ %setup -q %build -make %{?_smp_mflags} +make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -71,17 +100,20 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%{_bindir}/scrollkeeper-update -q || : %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%{_bindir}/scrollkeeper-update -q || : %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING -%doc doc/* +%doc %{_datadir}/omf/system-config-date +%doc %{_datadir}/gnome/help/system-config-date %{_bindir}/system-config-date %{_bindir}/system-config-time %{_bindir}/dateconfig @@ -102,6 +134,75 @@ %config(noreplace) %{_sysconfdir}/ntp/ntpservers %changelog +* Tue Jul 01 2008 Nils Philippsen - 1.9.32-1 +- fix Arabic timezone translation (#453202, patch by Muayyad Alsadi) + +* Mon May 05 2008 Nils Philippsen - 1.9.31-1 +- translate underscores to spaces when reading in zone names (#444093, patch by + Jeremy Katz) + +* Tue Apr 08 2008 Nils Philippsen - 1.9.30-1 +- pick up updated translations + +* Mon Apr 07 2008 Nils Philippsen - 1.9.29-1 +- further NTP backend cleanup (#441040) + +* Thu Apr 03 2008 Nils Philippsen - 1.9.28-1 +- update ntp.conf template +- simplify NTP backend code +- use dynamic keyword for servers (#229217) + +* Mon Mar 31 2008 Nils Philippsen - 1.9.27-1 +- handle missing UTC information in /etc/adjtime, disable UTC/non-UTC selection + if hwclock doesn't work (#438124) + +* Wed Mar 26 2008 Nils Philippsen - 1.9.26-1 +- rename timezones/sr at Latn.po to sr at latin.po (#426591) + +* Tue Mar 25 2008 Nils Philippsen - 1.9.25-1 +- use hard links to avoid excessive disk space requirements (#438722) + +* Tue Mar 18 2008 Nils Philippsen - 1.9.24-1 +- pick up updated translations +- enable all languages for online doc translation +- various online doc fixes +- zoom in on click into map (#437767) +- draw label into map for currently selected city + +* Tue Mar 04 2008 Nils Philippsen - 1.9.23-1 +- handle ntpdate service (#229217, patch by Miroslav Lichvar) +- change all runlevels instead of only 3 and 5 + +* Tue Feb 05 2008 Nils Philippsen - 1.9.22-1 +- keep UTC info in /etc/adjtime, drop ARC support (patch by Bill Nottingham) + +* Sat Jan 19 2008 Nils Philippsen +- add BR: docbook-dtds, scrollkeeper/rarian-compat + +* Fri Jan 18 2008 Nils Philippsen - 1.9.21-1 +- online help: reorg, make xmllint happy + +* Fri Jan 11 2008 Nils Philippsen - 1.9.20-1 +- use config-util for userhelper configuration from Fedora 9 on (#428394) + +* Thu Jan 10 2008 Nils Philippsen - 1.9.19-1 +- only attempt to use yelp to display online help (as xdg-open does just the + same), drop requirements on xdg-utils and yelp for now, update error message + shown if yelp isn't found (#420101) + +* Thu Dec 27 2007 Nils Philippsen - 1.9.18-1 +- rename sr at Latn to sr at latin (#426591) + +* Thu Nov 22 2007 Nils Philippsen 1.9.17-1 +- some doc changes + +* Wed Nov 21 2007 Nils Philippsen +- migrate documentation to yelp/DocBook XML +- add docs translation rules + +* Wed Oct 31 2007 Nils Philippsen +- mention XEN/virtualization issues if hwclock fails (#357311) + * Tue Oct 30 2007 Nils Philippsen 1.9.16-1 - use warning dialog, exit gracefully if hwclock fails to allow operation in a XEN guest (#357311) From fedora-extras-commits at redhat.com Tue Jul 1 09:35:13 2008 From: fedora-extras-commits at redhat.com (Alan Pevec (apevec)) Date: Tue, 1 Jul 2008 09:35:13 GMT Subject: rpms/collectd/F-8 .cvsignore, 1.2, 1.3 collectd.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807010935.m619ZDmQ012839@cvs-int.fedora.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12673 Modified Files: .cvsignore collectd.spec sources Log Message: * Tue Jul 01 2008 Alan Pevec 4.3.3-1 - rebuild for rrdtool update - New upstream version 4.3.3. - include /etc/collectd.d (bz#443942) - cleanup subpackages, split dns plugin - Split rrdtool into a subpackage. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2008 09:27:15 -0000 1.2 +++ .cvsignore 1 Jul 2008 09:34:31 -0000 1.3 @@ -1 +1 @@ -collectd-4.3.2.tar.bz2 +collectd-4.3.3.tar.bz2 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-8/collectd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- collectd.spec 23 Apr 2008 11:43:07 -0000 1.2 +++ collectd.spec 1 Jul 2008 09:34:31 -0000 1.3 @@ -1,12 +1,13 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.3.2 -Release: 7%{?dist} +Version: 4.3.3 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 +Patch0: %{name}-4.3.3-include-collectd.d.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libvirt-devel, libxml2-devel @@ -20,9 +21,6 @@ BuildRequires: libpcap-devel BuildRequires: mysql-devel -Requires: rrdtool - - %description collectd is a small daemon written in C for performance. It reads various system statistics and updates RRD files, creating them if necessary. @@ -34,32 +32,40 @@ %package apache Summary: Apache plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, curl +Requires: collectd = %{version}-%{release}, curl %description apache -This plugin collectd data provided by Apache's 'mod_status'. +This plugin collects data provided by Apache's 'mod_status'. + + +%package dns +Summary: DNS traffic analysis module for collectd +Group: System Environment/Daemons +Requires: collectd = %{version}-%{release} +%description dns +This plugin collects DNS traffic data. + - %package email Summary: Email plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, spamassassin +Requires: collectd = %{version}-%{release}, spamassassin %description email -This plugin collectd data provided by spamassassin. +This plugin collects data provided by spamassassin. %package mysql Summary: MySQL module for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, mysql +Requires: collectd = %{version}-%{release}, mysql %description mysql MySQL querying plugin. This plugins provides data of issued commands, called handlers and database traffic. - + %package nginx Summary: Nginx plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, curl +Requires: collectd = %{version}-%{release}, curl %description nginx This plugin gets data provided by nginx. @@ -67,17 +73,24 @@ %package -n perl-Collectd Summary: Perl bindings for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, curl +Requires: collectd = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - %description -n perl-Collectd This package contains Perl bindings and plugin for collectd. +%package rrdtool +Summary: RRDTool module for collectd +Group: System Environment/Daemons +Requires: collectd = %{version}-%{release}, rrdtool +%description rrdtool +This plugin for collectd provides rrdtool support. + + %package sensors Summary: Libsensors module for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, lm_sensors +Requires: collectd = %{version}-%{release}, lm_sensors %description sensors This plugin for collectd provides querying of sensors supported by lm_sensors. @@ -86,7 +99,7 @@ %package snmp Summary: SNMP module for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, net-snmp +Requires: collectd = %{version}-%{release}, net-snmp %description snmp This plugin for collectd provides querying of net-snmp. @@ -94,13 +107,14 @@ %package virt Summary: Libvirt plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}, curl +Requires: collectd = %{version}-%{release}, libvirt %description virt This plugin collects information from virtualized guests. %prep %setup -q +%patch0 -p1 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in @@ -144,16 +158,25 @@ find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \; # Move config contribs -mkdir -p $RPM_BUILD_ROOT/etc/collectd.d/ -cp contrib/redhat/apache.conf $RPM_BUILD_ROOT/etc/collectd.d/apache.conf -cp contrib/redhat/email.conf $RPM_BUILD_ROOT/etc/collectd.d/email.conf -cp contrib/redhat/sensors.conf $RPM_BUILD_ROOT/etc/collectd.d/sensors.conf -cp contrib/redhat/mysql.conf $RPM_BUILD_ROOT/etc/collectd.d/mysql.conf -cp contrib/redhat/nginx.conf $RPM_BUILD_ROOT/etc/collectd.d/nginx.conf -cp contrib/redhat/snmp.conf $RPM_BUILD_ROOT/etc/collectd.d/snmp.conf +mkdir -p %{buildroot}/etc/collectd.d/ +cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf +cp contrib/redhat/email.conf %{buildroot}/etc/collectd.d/email.conf +cp contrib/redhat/mysql.conf %{buildroot}/etc/collectd.d/mysql.conf +cp contrib/redhat/nginx.conf %{buildroot}/etc/collectd.d/nginx.conf +cp contrib/redhat/sensors.conf %{buildroot}/etc/collectd.d/sensors.conf +cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf + +# configs for subpackaged plugins +for p in dns libvirt perl rrdtool +do +%{__cat} > %{buildroot}/etc/collectd.d/$p.conf < 4.3.3-1 +- rebuild for rrdtool update +- New upstream version 4.3.3. +- include /etc/collectd.d (bz#443942) +- cleanup subpackages, split dns plugin +- Split rrdtool into a subpackage. + * Wed Apr 23 2008 Richard W.M. Jones - 4.3.2-7 - Added {?dist} to release number (thanks Alan Pevec). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2008 09:27:15 -0000 1.2 +++ sources 1 Jul 2008 09:34:31 -0000 1.3 @@ -1 +1 @@ -60d79699cd71b85b8c91f60608d92c5a collectd-4.3.2.tar.bz2 +4ae6686908503a72292fbd2a46bba448 collectd-4.3.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 09:37:44 2008 From: fedora-extras-commits at redhat.com (Alan Pevec (apevec)) Date: Tue, 1 Jul 2008 09:37:44 GMT Subject: rpms/collectd/F-9 collectd.spec,1.6,1.7 Message-ID: <200807010937.m619bil7013298@cvs-int.fedora.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13121 Modified Files: collectd.spec Log Message: * Tue Jul 01 2008 Alan Pevec 4.3.3-3 - rebuild for rrdtool update Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- collectd.spec 12 Jun 2008 09:57:07 -0000 1.6 +++ collectd.spec 1 Jul 2008 09:36:48 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -301,6 +301,9 @@ %changelog +* Tue Jul 01 2008 Alan Pevec 4.3.3-3 +- rebuild for rrdtool update + * Thu Jun 12 2008 Alan Pevec 4.3.3-2 - fix sub to main packge dependency From fedora-extras-commits at redhat.com Tue Jul 1 09:58:48 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Tue, 1 Jul 2008 09:58:48 GMT Subject: rpms/iptables/devel .cvsignore, 1.22, 1.23 iptables.spec, 1.70, 1.71 sources, 1.22, 1.23 iptables-1.4.1-ipv6_network_mask.patch, 1.1, NONE Message-ID: <200807010958.m619wmH6017645@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17279 Modified Files: .cvsignore iptables.spec sources Removed Files: iptables-1.4.1-ipv6_network_mask.patch Log Message: - upstream bug fix release 1.4.1.1 - dropped extra patch for 1.4.1 - not needed anymore Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 10 Jun 2008 13:08:35 -0000 1.22 +++ .cvsignore 1 Jul 2008 09:57:56 -0000 1.23 @@ -1,3 +1,4 @@ iptables-1.3.8.tar.bz2 iptables-1.4.0.tar.bz2 iptables-1.4.1.tar.bz2 +iptables-1.4.1.1.tar.bz2 Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- iptables.spec 10 Jun 2008 13:08:35 -0000 1.70 +++ iptables.spec 1 Jul 2008 09:57:56 -0000 1.71 @@ -1,6 +1,6 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities -Version: 1.4.1 +Version: 1.4.1.1 Release: 1%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init @@ -8,7 +8,6 @@ Patch4: iptables-1.3.8-typo_latter.patch Patch5: iptables-1.4.1-cloexec.patch Patch8: iptables-1.4.1-nf_ext_init.patch -Patch9: iptables-1.4.1-ipv6_network_mask.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -56,7 +55,6 @@ %patch4 -p1 -b .typo_latter %patch5 -p1 -b .cloexec %patch8 -p1 -b .nf_ext_init -%patch9 -p1 -b .ipv6_network_mask # fix constructor names, see also nf_ext_init patch perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c @@ -133,6 +131,10 @@ %{_mandir}/man3/* %changelog +* Tue Jul 1 2008 Thomas Woerner 1.4.1.1-1 +- upstream bug fix release 1.4.1.1 +- dropped extra patch for 1.4.1 - not needed anymore + * Tue Jun 10 2008 Thomas Woerner 1.4.1-1 - new version 1.4.1 with new build environment - additional ipv6 network mask patch from Jan Engelhardt Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 10 Jun 2008 13:08:35 -0000 1.22 +++ sources 1 Jul 2008 09:57:56 -0000 1.23 @@ -1 +1 @@ -e628f033b95741266a315d54fe73db9c iptables-1.4.1.tar.bz2 +723fa88d8a0915e184f99e03e9bf06cb iptables-1.4.1.1.tar.bz2 --- iptables-1.4.1-ipv6_network_mask.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 09:59:53 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Tue, 1 Jul 2008 09:59:53 GMT Subject: rpms/iptables/F-9 iptables.spec, 1.70, 1.71 sources, 1.22, 1.23 iptables-1.4.1-ipv6_network_mask.patch, 1.1, NONE Message-ID: <200807010959.m619xrPx018017@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17737 Modified Files: iptables.spec sources Removed Files: iptables-1.4.1-ipv6_network_mask.patch Log Message: - upstream bug fix release 1.4.1.1 - dropped extra patch for 1.4.1 - not needed anymore Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/F-9/iptables.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- iptables.spec 10 Jun 2008 14:29:55 -0000 1.70 +++ iptables.spec 1 Jul 2008 09:59:04 -0000 1.71 @@ -1,6 +1,6 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities -Version: 1.4.1 +Version: 1.4.1.1 Release: 1%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init @@ -8,7 +8,6 @@ Patch4: iptables-1.3.8-typo_latter.patch Patch5: iptables-1.4.1-cloexec.patch Patch8: iptables-1.4.1-nf_ext_init.patch -Patch9: iptables-1.4.1-ipv6_network_mask.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -56,7 +55,6 @@ %patch4 -p1 -b .typo_latter %patch5 -p1 -b .cloexec %patch8 -p1 -b .nf_ext_init -%patch9 -p1 -b .ipv6_network_mask # fix constructor names, see also nf_ext_init patch perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c @@ -133,6 +131,10 @@ %{_mandir}/man3/* %changelog +* Tue Jul 1 2008 Thomas Woerner 1.4.1.1-1 +- upstream bug fix release 1.4.1.1 +- dropped extra patch for 1.4.1 - not needed anymore + * Tue Jun 10 2008 Thomas Woerner 1.4.1-1 - new version 1.4.1 with new build environment - additional ipv6 network mask patch from Jan Engelhardt Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iptables/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 10 Jun 2008 14:29:55 -0000 1.22 +++ sources 1 Jul 2008 09:59:04 -0000 1.23 @@ -1 +1 @@ -e628f033b95741266a315d54fe73db9c iptables-1.4.1.tar.bz2 +723fa88d8a0915e184f99e03e9bf06cb iptables-1.4.1.1.tar.bz2 --- iptables-1.4.1-ipv6_network_mask.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 10:10:28 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 1 Jul 2008 10:10:28 GMT Subject: rpms/lm_sensors/F-8 lm_sensors-2.10.6-r5147.patch, NONE, 1.1 lm_sensors-2.10.6-r5234.patch, NONE, 1.1 lm_sensors-2.10.6-r5247.patch, NONE, 1.1 lm_sensors.spec, 1.56, 1.57 Message-ID: <200807011010.m61AASSh026686@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lm_sensors/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26555 Modified Files: lm_sensors.spec Added Files: lm_sensors-2.10.6-r5147.patch lm_sensors-2.10.6-r5234.patch lm_sensors-2.10.6-r5247.patch Log Message: * Tue Jul 1 2008 Hans de Goede - 2.10.6-2 - Rebuild for new rrdtool (bug 453516) - Add 3 upstream advised patches from upstream svn: - sensors-detect: Do not probe I2C addresses 0x40-0x47 (dangerous) - sensors-detect: See if a device is a 1 register device and if so leave it alone (aka don't mess with voltages on some Sapphire / DFI motherboards) - libsensors: Don't choke on unrecognized devices lm_sensors-2.10.6-r5147.patch: --- NEW FILE lm_sensors-2.10.6-r5147.patch --- Index: trunk/lib/sysfs.c =================================================================== --- trunk/lib/sysfs.c (revision 5086) +++ trunk/lib/sysfs.c (revision 5147) @@ -183,8 +183,6 @@ dlist_for_each_data(clsdevs, clsdev, struct sysfs_class_device) { struct sysfs_device *dev; - if (!(dev = sysfs_get_classdev_device(clsdev))) { - ret = -SENSORS_ERR_PROC; - goto exit; - } + if (!(dev = sysfs_get_classdev_device(clsdev))) + continue; if ((ret = sensors_read_one_sysfs_chip(dev))) goto exit; Index: trunk/CHANGES =================================================================== --- trunk/CHANGES (revision 5139) +++ trunk/CHANGES (revision 5147) @@ -3,4 +3,5 @@ SVN-HEAD + Library: Don't choke on unrecognized devices, part 2 Program sensors-detect: New device ID for the SMSC SCH5317 @@ -8,5 +9,5 @@ Library: Fix fschrc and fschmd support Fix sysfs presence detection - Don't choke on unrecognized devices (#2087) + Don't choke on unrecognized devices, part 1 (#2087) Fix lm93 vid2 access (#2295) No in1 on w83783s lm_sensors-2.10.6-r5234.patch: --- NEW FILE lm_sensors-2.10.6-r5234.patch --- Index: trunk/prog/detect/sensors-detect =================================================================== --- trunk/prog/detect/sensors-detect (revision 5233) +++ trunk/prog/detect/sensors-detect (revision 5234) @@ -1129,5 +1129,7 @@ name => "Maxim MAX6633/MAX6634/MAX6635", driver => "lm92", - i2c_addrs => [0x40..0x4f], + i2c_addrs => [0x48..0x4f], # The MAX6633 can also use 0x40-0x47 but we + # don't want to probe these addresses, it's + # dangerous. i2c_detect => sub { lm92_detect(2, @_); }, }, Index: trunk/CHANGES =================================================================== --- trunk/CHANGES (revision 5231) +++ trunk/CHANGES (revision 5234) @@ -17,4 +17,5 @@ Add Asus F8000 detection Add Intel ICH10 (bus) detection + Don't probe I2C addresses 0x40-0x47 2.10.6 "Welcome Home Lina" (20080306) lm_sensors-2.10.6-r5247.patch: --- NEW FILE lm_sensors-2.10.6-r5247.patch --- Index: trunk/prog/detect/sensors-detect =================================================================== --- trunk/prog/detect/sensors-detect (revision 5244) +++ trunk/prog/detect/sensors-detect (revision 5247) @@ -2762,4 +2762,41 @@ } +# $_[0]: Reference to an opened file handle +# Returns: 1 if the device is safe to access, 0 else. +# This function is meant to prevent access to 1-register-only devices, +# which are designed to be accessed with SMBus receive byte and SMBus send +# byte transactions (i.e. short reads and short writes) and treat SMBus +# read byte as a real write followed by a read. The device detection +# routines would write random values to the chip with possibly very nasty +# results for the hardware. Note that this function won't catch all such +# chips, as it assumes that reads and writes relate to the same register, +# but that's the best we can do. +sub i2c_safety_check +{ + my ($file) = @_; + my $data; + + # First we receive a byte from the chip, and remember it. + $data = i2c_smbus_read_byte($file); + return 1 if ($data < 0); + + # We receive a byte again; very likely to be the same for + # 1-register-only devices. + return 1 if (i2c_smbus_read_byte($file) != $data); + + # Then we try a standard byte read, with a register offset equal to + # the byte we received; we should receive the same byte value in return. + return 1 if (i2c_smbus_read_byte_data($file, $data) != $data); + + # Then we try a standard byte read, with a slightly different register + # offset; we should again receive the same byte value in return. + return 1 if (i2c_smbus_read_byte_data($file, $data ^ 1) != ($data ^ 1)); + + # Apprently this is a 1-register-only device, restore the original register + # value and leave it alone. + i2c_smbus_read_byte_data($file, $data); + return 0; +} + #################### # ADAPTER SCANNING # @@ -3108,4 +3145,8 @@ next unless i2c_probe(\*FILE, $addr, $funcs); printf "Client found at address 0x%02x\n",$addr; + if (!i2c_safety_check(\*FILE)) { + print "Seems to be a 1-register-only device, skipping.\n"; + next; + } $| = 1; Index: trunk/CHANGES =================================================================== --- trunk/CHANGES (revision 5244) +++ trunk/CHANGES (revision 5247) @@ -19,4 +19,5 @@ Don't probe I2C addresses 0x40-0x47 Fix the parsing of I2C addresses not to scan + Detect and skip 1-register-only I2C devices 2.10.6 "Welcome Home Lina" (20080306) Index: lm_sensors.spec =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-8/lm_sensors.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- lm_sensors.spec 12 Mar 2008 19:33:52 -0000 1.56 +++ lm_sensors.spec 1 Jul 2008 10:09:42 -0000 1.57 @@ -1,6 +1,6 @@ Name: lm_sensors Version: 2.10.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.gz Source1: lm_sensors.sysconfig @@ -9,6 +9,9 @@ Source3: sensord.init Patch0: lm_sensors-2.10.6-service-default-off.patch Patch1: lm_sensors-2.10.6-lsb-retcodes.patch +Patch2: lm_sensors-2.10.6-r5147.patch +Patch3: lm_sensors-2.10.6-r5234.patch +Patch4: lm_sensors-2.10.6-r5247.patch Summary: Hardware monitoring tools Group: Applications/System License: GPLv2+ @@ -63,6 +66,9 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -164,6 +170,14 @@ %changelog +* Tue Jul 1 2008 Hans de Goede - 2.10.6-2 +- Rebuild for new rrdtool (bug 453516) +- Add 3 upstream advised patches from upstream svn: + - sensors-detect: Do not probe I2C addresses 0x40-0x47 (dangerous) + - sensors-detect: See if a device is a 1 register device and if so leave it + alone (aka don't mess with voltages on some Sapphire / DFI motherboards) + - libsensors: Don't choke on unrecognized devices + * Wed Mar 12 2008 Hans de Goede - 2.10.6-1 - New upstream bugfix release 2.10.6 (fixes bz 436767) - Add a patch to make the initscript returncodes LSB compliant (bug 431884) From fedora-extras-commits at redhat.com Tue Jul 1 10:23:30 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 1 Jul 2008 10:23:30 GMT Subject: rpms/tinyerp/F-9 tinyerp.spec,1.34,1.35 Message-ID: <200807011023.m61ANUUv028361@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28293 Modified Files: tinyerp.spec Log Message: * Fri May 30 2008 Dan Horak 4.2.2-3 - add missing R: python-matplotlib (Resolves: #449118) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/F-9/tinyerp.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- tinyerp.spec 26 May 2008 13:13:11 -0000 1.34 +++ tinyerp.spec 1 Jul 2008 10:22:30 -0000 1.35 @@ -4,7 +4,7 @@ Name: tinyerp Version: 4.2.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Productivity Summary: Open Source ERP Client @@ -22,7 +22,7 @@ BuildRequires: python-psycopg, libxslt-python, pydot BuildRequires: desktop-file-utils BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base -Requires: pygtk2, pygtk2-libglade, pydot, mx +Requires: pygtk2, pygtk2-libglade, pydot, mx, python-matplotlib %define _xvfb /usr/bin/Xvfb @@ -162,6 +162,9 @@ %changelog +* Fri May 30 2008 Dan Horak 4.2.2-3 +- add missing R: python-matplotlib (Resolves: #449118) + * Mon May 26 2008 Dan Horak 4.2.2-2 - add missing R: mx (Resolves: #448389) From fedora-extras-commits at redhat.com Tue Jul 1 10:27:03 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 1 Jul 2008 10:27:03 GMT Subject: rpms/tinyerp/devel tinyerp.spec,1.34,1.35 Message-ID: <200807011027.m61AR3HC028547@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28432 Modified Files: tinyerp.spec Log Message: * Fri May 30 2008 Dan Horak 4.2.2-3 - add missing R: python-matplotlib (Resolves: #449118) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- tinyerp.spec 26 May 2008 13:10:12 -0000 1.34 +++ tinyerp.spec 1 Jul 2008 10:24:11 -0000 1.35 @@ -4,7 +4,7 @@ Name: tinyerp Version: 4.2.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Productivity Summary: Open Source ERP Client @@ -22,7 +22,7 @@ BuildRequires: python-psycopg, libxslt-python, pydot BuildRequires: desktop-file-utils BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base -Requires: pygtk2, pygtk2-libglade, pydot, mx +Requires: pygtk2, pygtk2-libglade, pydot, mx, python-matplotlib %define _xvfb /usr/bin/Xvfb @@ -162,6 +162,9 @@ %changelog +* Fri May 30 2008 Dan Horak 4.2.2-3 +- add missing R: python-matplotlib (Resolves: #449118) + * Mon May 26 2008 Dan Horak 4.2.2-2 - add missing R: mx (Resolves: #448389) From fedora-extras-commits at redhat.com Tue Jul 1 10:46:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:46:12 +0000 Subject: [pkgdb] sblim-testsuite ownership updated Message-ID: <200807011046.m61AkCLJ017519@bastion.fedora.phx.redhat.com> Package sblim-testsuite in Fedora devel is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-testsuite From fedora-extras-commits at redhat.com Tue Jul 1 10:46:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:46:23 +0000 Subject: [pkgdb] sblim-testsuite ownership updated Message-ID: <200807011046.m61AkN0g017559@bastion.fedora.phx.redhat.com> Package sblim-testsuite in Fedora 7 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-testsuite From fedora-extras-commits at redhat.com Tue Jul 1 10:46:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:46:47 +0000 Subject: [pkgdb] sblim-testsuite ownership updated Message-ID: <200807011046.m61Akl6q017591@bastion.fedora.phx.redhat.com> Package sblim-testsuite in Fedora 8 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-testsuite From fedora-extras-commits at redhat.com Tue Jul 1 10:46:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:46:55 +0000 Subject: [pkgdb] sblim-testsuite ownership updated Message-ID: <200807011046.m61Akl6s017591@bastion.fedora.phx.redhat.com> Package sblim-testsuite in Fedora 9 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-testsuite From fedora-extras-commits at redhat.com Tue Jul 1 10:47:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:47:43 +0000 Subject: [pkgdb] sblim-cmpi-base ownership updated Message-ID: <200807011047.m61AlhpX017681@bastion.fedora.phx.redhat.com> Package sblim-cmpi-base in Fedora devel is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-base From fedora-extras-commits at redhat.com Tue Jul 1 10:47:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:47:46 +0000 Subject: [pkgdb] sblim-cmpi-base ownership updated Message-ID: <200807011047.m61AlkGN017700@bastion.fedora.phx.redhat.com> Package sblim-cmpi-base in Fedora 7 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-base From fedora-extras-commits at redhat.com Tue Jul 1 10:47:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:47:54 +0000 Subject: [pkgdb] sblim-cmpi-base ownership updated Message-ID: <200807011047.m61Als7g017721@bastion.fedora.phx.redhat.com> Package sblim-cmpi-base in Fedora 8 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-base From fedora-extras-commits at redhat.com Tue Jul 1 10:47:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:47:58 +0000 Subject: [pkgdb] sblim-cmpi-base ownership updated Message-ID: <200807011047.m61Alw7S017738@bastion.fedora.phx.redhat.com> Package sblim-cmpi-base in Fedora 9 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-base From fedora-extras-commits at redhat.com Tue Jul 1 10:50:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Miroslav_Such=C3=BD?= (msuchy)) Date: Tue, 1 Jul 2008 10:50:50 GMT Subject: rpms/perl-Math-FFT/devel import.log, NONE, 1.1 perl-Math-FFT.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011050.m61Aoo1C029602@cvs-int.fedora.redhat.com> Author: msuchy Update of /cvs/extras/rpms/perl-Math-FFT/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29535/devel Modified Files: .cvsignore sources Added Files: import.log perl-Math-FFT.spec Log Message: Inital commit --- NEW FILE import.log --- perl-Math-FFT-1_28-1_fc9:HEAD:perl-Math-FFT-1.28-1.fc9.src.rpm:1214906471 --- NEW FILE perl-Math-FFT.spec --- Name: perl-Math-FFT Version: 1.28 Release: 1%{?dist} Summary: Perl module to calculate Fast Fourier Transforms # Perl module code is GPL+ or same as Perl itself # arrays.c has same licence as Perl itself # FFT code is based on the C routine of fft4g.c Takuya OOURA, # which is public domain License: (GPL+ or Artistic) and Public Domain Group: Development/Libraries URL: http://search.cpan.org/dist/Math-FFT/ Source0: http://www.cpan.org/authors/id/R/RK/RKOBES/Math-FFT-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) %description This module implements some algorithms for calculating Fast Fourier Transforms for one-dimensional data sets of size 2^n. %prep %setup -q -n Math-FFT-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Math* %{_mandir}/man3/* %changelog * Wed Jun 25 2008 Miroslav Suchy 1.28-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-FFT/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 16:28:09 -0000 1.1 +++ .cvsignore 1 Jul 2008 10:50:11 -0000 1.2 @@ -0,0 +1 @@ +Math-FFT-1.28.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-FFT/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 16:28:09 -0000 1.1 +++ sources 1 Jul 2008 10:50:11 -0000 1.2 @@ -0,0 +1 @@ +de12537d06eb90e8a4d80b765ceb8252 Math-FFT-1.28.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 10:50:54 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 1 Jul 2008 10:50:54 GMT Subject: rpms/cups/devel cups.init,1.15,1.16 cups.spec,1.419,1.420 Message-ID: <200807011050.m61Aospc029609@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29533 Modified Files: cups.init cups.spec Log Message: * Tue Jul 1 2008 Tim Waugh 1:1.3.7-11 - Use portreserve. Index: cups.init =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.init,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cups.init 26 Feb 2008 17:46:55 -0000 1.15 +++ cups.init 1 Jul 2008 10:49:59 -0000 1.16 @@ -51,6 +51,9 @@ start () { echo -n $"Starting $prog: " + # tell portreserve to release the port + [ -x /sbin/portrelease ] && /sbin/portrelease cups &>/dev/null || : + # start daemon daemon $DAEMON RETVAL=$? Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.419 retrieving revision 1.420 diff -u -r1.419 -r1.420 --- cups.spec 24 Jun 2008 13:06:06 -0000 1.419 +++ cups.spec 1 Jul 2008 10:49:59 -0000 1.420 @@ -100,6 +100,10 @@ # Requires tmpwatch for the cron.daily script (bug #218901). Requires: tmpwatch +# We use portreserve to prevent our TCP port being stolen. +# Require the package here so that we know /etc/portreserve/ exists. +Requires: portreserve + %package devel Summary: Common Unix Printing System - development environment Group: Development/Libraries @@ -269,6 +273,10 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd ln -s ../../ppd $RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution +# Tell portreserve which port we want it to protect. +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve +echo ipp > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/%{name} + # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop @@ -364,6 +372,7 @@ /etc/cups/pstoraster.convs %config(noreplace) /etc/pam.d/cups %config(noreplace) %{_sysconfdir}/logrotate.d/cups +%config(noreplace) %{_sysconfdir}/portreserve/%{name} %dir %{_datadir}/%{name}/www %{_datadir}/%{name}/www/favicon.* %{_datadir}/%{name}/www/images @@ -439,6 +448,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Jul 1 2008 Tim Waugh 1:1.3.7-11 +- Use portreserve. + * Tue Jun 24 2008 Tim Waugh 1:1.3.7-10 - Rebuilt for new gnutls. From fedora-extras-commits at redhat.com Tue Jul 1 10:52:09 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 1 Jul 2008 10:52:09 GMT Subject: rpms/cups/devel cups.spec,1.420,1.421 Message-ID: <200807011052.m61Aq9cR029739@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29697 Modified Files: cups.spec Log Message: 1.3.7-11 Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.420 retrieving revision 1.421 diff -u -r1.420 -r1.421 --- cups.spec 1 Jul 2008 10:49:59 -0000 1.420 +++ cups.spec 1 Jul 2008 10:51:22 -0000 1.421 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.7 -Release: 10%{?svn:.svn%{svn}}%{?dist} +Release: 11%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 10:54:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:54:28 +0000 Subject: [pkgdb] sblim-cmpi-devel ownership updated Message-ID: <200807011054.m61AsSF7017973@bastion.fedora.phx.redhat.com> Package sblim-cmpi-devel in Fedora devel is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel From fedora-extras-commits at redhat.com Tue Jul 1 10:54:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:54:31 +0000 Subject: [pkgdb] sblim-cmpi-devel ownership updated Message-ID: <200807011054.m61AsVeZ017990@bastion.fedora.phx.redhat.com> Package sblim-cmpi-devel in Fedora 7 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel From fedora-extras-commits at redhat.com Tue Jul 1 10:54:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:54:38 +0000 Subject: [pkgdb] sblim-cmpi-devel ownership updated Message-ID: <200807011054.m61AscGh018007@bastion.fedora.phx.redhat.com> Package sblim-cmpi-devel in Fedora 9 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel From fedora-extras-commits at redhat.com Tue Jul 1 10:54:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:54:36 +0000 Subject: [pkgdb] sblim-cmpi-devel ownership updated Message-ID: <200807011054.m61AsdOo018024@bastion.fedora.phx.redhat.com> Package sblim-cmpi-devel in Fedora 8 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-devel From fedora-extras-commits at redhat.com Tue Jul 1 10:54:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:54:54 +0000 Subject: [pkgdb] sblim-wbemcli ownership updated Message-ID: <200807011054.m61AsSF9017973@bastion.fedora.phx.redhat.com> Package sblim-wbemcli in Fedora devel is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-wbemcli From fedora-extras-commits at redhat.com Tue Jul 1 10:54:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:54:57 +0000 Subject: [pkgdb] sblim-wbemcli ownership updated Message-ID: <200807011054.m61AsdOq018024@bastion.fedora.phx.redhat.com> Package sblim-wbemcli in Fedora 7 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-wbemcli From fedora-extras-commits at redhat.com Tue Jul 1 10:55:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:55:01 +0000 Subject: [pkgdb] sblim-wbemcli ownership updated Message-ID: <200807011055.m61AscGj018007@bastion.fedora.phx.redhat.com> Package sblim-wbemcli in Fedora 8 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-wbemcli From fedora-extras-commits at redhat.com Tue Jul 1 10:55:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 10:55:07 +0000 Subject: [pkgdb] sblim-wbemcli ownership updated Message-ID: <200807011055.m61AsSFB017973@bastion.fedora.phx.redhat.com> Package sblim-wbemcli in Fedora 9 is now owned by Vitezslav Crhonek (vcrhonek) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sblim-wbemcli From fedora-extras-commits at redhat.com Tue Jul 1 11:12:58 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 1 Jul 2008 11:12:58 GMT Subject: rpms/lm_sensors/devel .cvsignore, 1.21, 1.22 lm_sensors.spec, 1.65, 1.66 sources, 1.21, 1.22 lm_sensors-3.0.1-lsb-retcodes.patch, 1.2, NONE lm_sensors-3.0.1-pci-without-subsys.patch, 1.1, NONE lm_sensors-3.0.1-sensors-detect-special-chips.patch, 1.1, NONE lm_sensors-3.0.1-service-default-off.patch, 1.1, NONE lm_sensors-3.0.1-virtual-dev.patch, 1.2, NONE Message-ID: <200807011112.m61BCwXh005325@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lm_sensors/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292 Modified Files: .cvsignore lm_sensors.spec sources Removed Files: lm_sensors-3.0.1-lsb-retcodes.patch lm_sensors-3.0.1-pci-without-subsys.patch lm_sensors-3.0.1-sensors-detect-special-chips.patch lm_sensors-3.0.1-service-default-off.patch lm_sensors-3.0.1-virtual-dev.patch Log Message: * Tue Jul 1 2008 Hans de Goede 3.0.2-1 - New upstream release 3.0.2 - This release contains various important fixes to sensors-detect, which made it unsafe to run sensors-detect on certain systems - Drop all patches (all upstreamed) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 25 Feb 2008 12:28:33 -0000 1.21 +++ .cvsignore 1 Jul 2008 11:12:08 -0000 1.22 @@ -1 +1 @@ -lm_sensors-3.0.1.tar.bz2 +lm_sensors-3.0.2.tar.bz2 Index: lm_sensors.spec =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- lm_sensors.spec 14 Jun 2008 17:52:13 -0000 1.65 +++ lm_sensors.spec 1 Jul 2008 11:12:08 -0000 1.66 @@ -1,17 +1,12 @@ Name: lm_sensors -Version: 3.0.1 -Release: 6%{?dist} +Version: 3.0.2 +Release: 1%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 Source1: lm_sensors.sysconfig # these 2 were taken from PLD-linux, Thanks! Source2: sensord.sysconfig Source3: sensord.init -Patch0: lm_sensors-3.0.1-service-default-off.patch -Patch1: lm_sensors-3.0.1-lsb-retcodes.patch -Patch2: lm_sensors-3.0.1-sensors-detect-special-chips.patch -Patch3: lm_sensors-3.0.1-virtual-dev.patch -Patch4: lm_sensors-3.0.1-pci-without-subsys.patch Summary: Hardware monitoring tools Group: Applications/System License: GPLv2+ @@ -53,11 +48,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p0 -%patch4 -p0 mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -171,6 +161,12 @@ %changelog +* Tue Jul 1 2008 Hans de Goede 3.0.2-1 +- New upstream release 3.0.2 +- This release contains various important fixes to sensors-detect, which made + it unsafe to run sensors-detect on certain systems +- Drop all patches (all upstreamed) + * Sat Jun 14 2008 Hans de Goede 3.0.1-6 - Rebuild for new rrdtool Index: sources =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 25 Feb 2008 12:28:33 -0000 1.21 +++ sources 1 Jul 2008 11:12:08 -0000 1.22 @@ -1 +1 @@ -dace0c6bb031bd097a46a336de60587c lm_sensors-3.0.1.tar.bz2 +5b210ba9cc01f00161c438fd618484e5 lm_sensors-3.0.2.tar.bz2 --- lm_sensors-3.0.1-lsb-retcodes.patch DELETED --- --- lm_sensors-3.0.1-pci-without-subsys.patch DELETED --- --- lm_sensors-3.0.1-sensors-detect-special-chips.patch DELETED --- --- lm_sensors-3.0.1-service-default-off.patch DELETED --- --- lm_sensors-3.0.1-virtual-dev.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 11:16:33 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 1 Jul 2008 11:16:33 GMT Subject: rpms/lm_sensors/F-9 .cvsignore, 1.21, 1.22 lm_sensors.spec, 1.65, 1.66 sources, 1.21, 1.22 lm_sensors-3.0.1-lsb-retcodes.patch, 1.2, NONE lm_sensors-3.0.1-pci-without-subsys.patch, 1.1, NONE lm_sensors-3.0.1-sensors-detect-special-chips.patch, 1.1, NONE lm_sensors-3.0.1-service-default-off.patch, 1.1, NONE lm_sensors-3.0.1-virtual-dev.patch, 1.2, NONE Message-ID: <200807011116.m61BGXO1005568@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lm_sensors/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5517 Modified Files: .cvsignore lm_sensors.spec sources Removed Files: lm_sensors-3.0.1-lsb-retcodes.patch lm_sensors-3.0.1-pci-without-subsys.patch lm_sensors-3.0.1-sensors-detect-special-chips.patch lm_sensors-3.0.1-service-default-off.patch lm_sensors-3.0.1-virtual-dev.patch Log Message: * Tue Jul 1 2008 Hans de Goede 3.0.2-1 - New upstream release 3.0.2 - This release contains various important fixes to sensors-detect, which made it unsafe to run sensors-detect on certain systems - Drop all patches (all upstreamed) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-9/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 25 Feb 2008 12:28:33 -0000 1.21 +++ .cvsignore 1 Jul 2008 11:15:43 -0000 1.22 @@ -1 +1 @@ -lm_sensors-3.0.1.tar.bz2 +lm_sensors-3.0.2.tar.bz2 Index: lm_sensors.spec =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-9/lm_sensors.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- lm_sensors.spec 1 Jul 2008 07:35:08 -0000 1.65 +++ lm_sensors.spec 1 Jul 2008 11:15:43 -0000 1.66 @@ -1,17 +1,12 @@ Name: lm_sensors -Version: 3.0.1 -Release: 6%{?dist} +Version: 3.0.2 +Release: 1%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 Source1: lm_sensors.sysconfig # these 2 were taken from PLD-linux, Thanks! Source2: sensord.sysconfig Source3: sensord.init -Patch0: lm_sensors-3.0.1-service-default-off.patch -Patch1: lm_sensors-3.0.1-lsb-retcodes.patch -Patch2: lm_sensors-3.0.1-sensors-detect-special-chips.patch -Patch3: lm_sensors-3.0.1-virtual-dev.patch -Patch4: lm_sensors-3.0.1-pci-without-subsys.patch Summary: Hardware monitoring tools Group: Applications/System License: GPLv2+ @@ -53,11 +48,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p0 -%patch4 -p0 mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -171,6 +161,12 @@ %changelog +* Tue Jul 1 2008 Hans de Goede 3.0.2-1 +- New upstream release 3.0.2 +- This release contains various important fixes to sensors-detect, which made + it unsafe to run sensors-detect on certain systems +- Drop all patches (all upstreamed) + * Sat Jun 14 2008 Hans de Goede 3.0.1-6 - Rebuild for new rrdtool Index: sources =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-9/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 25 Feb 2008 12:28:33 -0000 1.21 +++ sources 1 Jul 2008 11:15:43 -0000 1.22 @@ -1 +1 @@ -dace0c6bb031bd097a46a336de60587c lm_sensors-3.0.1.tar.bz2 +5b210ba9cc01f00161c438fd618484e5 lm_sensors-3.0.2.tar.bz2 --- lm_sensors-3.0.1-lsb-retcodes.patch DELETED --- --- lm_sensors-3.0.1-pci-without-subsys.patch DELETED --- --- lm_sensors-3.0.1-sensors-detect-special-chips.patch DELETED --- --- lm_sensors-3.0.1-service-default-off.patch DELETED --- --- lm_sensors-3.0.1-virtual-dev.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 11:18:33 2008 From: fedora-extras-commits at redhat.com (Alan Pevec (apevec)) Date: Tue, 1 Jul 2008 11:18:33 GMT Subject: rpms/collectd/F-8 collectd-4.3.3-include-collectd.d.patch,NONE,1.1 Message-ID: <200807011118.m61BIXMk005726@cvs-int.fedora.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5704 Added Files: collectd-4.3.3-include-collectd.d.patch Log Message: * Tue Jul 01 2008 Alan Pevec 4.3.3-1 - rebuild for rrdtool update - New upstream version 4.3.3. - include /etc/collectd.d (bz#443942) - cleanup subpackages, split dns plugin - Split rrdtool into a subpackage. collectd-4.3.3-include-collectd.d.patch: --- NEW FILE collectd-4.3.3-include-collectd.d.patch --- --- collectd-4.3.3/src/collectd.conf.in.orig 2008-04-23 14:29:16.000000000 +0200 +++ collectd-4.3.3/src/collectd.conf.in 2008-06-12 11:28:41.000000000 +0200 @@ -13,7 +13,6 @@ #Interval 10 #ReadThreads 5 - at BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache @BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups @BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors @BUILD_PLUGIN_BATTERY_TRUE at LoadPlugin battery @@ -22,8 +21,6 @@ @BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv @BUILD_PLUGIN_DF_TRUE at LoadPlugin df @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk - at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns - at BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp @@ -31,27 +28,20 @@ @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables @BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs @BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq - at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt @BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load @BUILD_PLUGIN_LOGFILE_TRUE at LoadPlugin logfile @BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon @BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached @BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory @BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter - at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql @BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink @BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network @BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs - at BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx @BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd @BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut - at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl @BUILD_PLUGIN_PING_TRUE at LoadPlugin ping @BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes - at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool - at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors @BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial - at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap @BUILD_PLUGIN_SYSLOG_TRUE at LoadPlugin syslog @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape @@ -287,3 +277,4 @@ # UUIDFile "/etc/uuid" # +Include "/etc/collectd.d" From fedora-extras-commits at redhat.com Tue Jul 1 11:35:17 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 1 Jul 2008 11:35:17 GMT Subject: rpms/cups/devel cups-lspp.patch,1.32,1.33 cups.spec,1.421,1.422 Message-ID: <200807011135.m61BZHFT006642@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6589 Modified Files: cups-lspp.patch cups.spec Log Message: * Tue Jul 1 2008 Tim Waugh 1:1.3.7-12 - Fixed bug #447200 again. cups-lspp.patch: Index: cups-lspp.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- cups-lspp.patch 30 May 2008 16:09:48 -0000 1.32 +++ cups-lspp.patch 1 Jul 2008 11:34:31 -0000 1.33 @@ -1,4 +1,3 @@ -diff -up cups-1.3.7/cups/cups.h.lspp cups-1.3.7/cups/cups.h --- cups-1.3.7/cups/cups.h.lspp 2008-02-20 00:32:58.000000000 +0000 +++ cups-1.3.7/cups/cups.h 2008-05-30 16:59:10.000000000 +0100 @@ -15,6 +15,9 @@ @@ -24,7 +23,6 @@ /* * Types and structures... */ -diff -up cups-1.3.7/scheduler/job.c.lspp cups-1.3.7/scheduler/job.c --- cups-1.3.7/scheduler/job.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/job.c 2008-05-30 17:01:23.000000000 +0100 @@ -60,6 +60,9 @@ @@ -383,7 +381,6 @@ if (Classification && !banner_page) { if ((attr = ippFindAttribute(job->attrs, "job-sheets", -diff -up cups-1.3.7/scheduler/printers.c.lspp cups-1.3.7/scheduler/printers.c --- cups-1.3.7/scheduler/printers.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/printers.c 2008-05-30 16:59:10.000000000 +0100 @@ -51,6 +51,8 @@ @@ -465,7 +462,6 @@ } p->raw = 0; -diff -up cups-1.3.7/scheduler/conf.c.lspp cups-1.3.7/scheduler/conf.c --- cups-1.3.7/scheduler/conf.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/conf.c 2008-05-30 16:59:10.000000000 +0100 @@ -26,6 +26,7 @@ @@ -577,7 +573,6 @@ /* * End of "$Id$". -diff -up cups-1.3.7/scheduler/job.h.lspp cups-1.3.7/scheduler/job.h --- cups-1.3.7/scheduler/job.h.lspp 2008-01-16 22:20:33.000000000 +0000 +++ cups-1.3.7/scheduler/job.h 2008-05-30 16:59:31.000000000 +0100 @@ -13,6 +13,13 @@ @@ -605,7 +600,6 @@ } cupsd_job_t; -diff -up cups-1.3.7/scheduler/main.c.lspp cups-1.3.7/scheduler/main.c --- cups-1.3.7/scheduler/main.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/main.c 2008-05-30 16:59:10.000000000 +0100 @@ -35,6 +35,8 @@ @@ -675,9 +669,8 @@ return (!stop_scheduler); } -diff -up cups-1.3.7/scheduler/ipp.c.lspp cups-1.3.7/scheduler/ipp.c ---- cups-1.3.7/scheduler/ipp.c.lspp 2008-05-30 16:59:10.000000000 +0100 -+++ cups-1.3.7/scheduler/ipp.c 2008-05-30 17:01:08.000000000 +0100 +--- cups-1.3.7/scheduler/ipp.c 2008-05-30 17:01:08.000000000 +0100 ++++ cups-1.3.7/scheduler/ipp.c 2008-07-01 12:30:59.000000000 +0100 @@ -36,6 +36,7 @@ * cancel_all_jobs() - Cancel all print jobs. * cancel_job() - Cancel a print job. @@ -696,7 +689,7 @@ /* * Include necessary headers... */ -@@ -116,6 +120,14 @@ extern int mbr_check_membership_by_id(uu +@@ -116,6 +120,14 @@ # endif /* HAVE_MEMBERSHIPPRIV_H */ #endif /* __APPLE__ */ @@ -711,7 +704,7 @@ /* * Local functions... -@@ -140,6 +152,9 @@ static void authenticate_job(cupsd_clien +@@ -140,6 +152,9 @@ static void cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_subscription(cupsd_client_t *con, int id); @@ -721,22 +714,7 @@ static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr, int quickcopy); -@@ -774,7 +789,13 @@ cupsdTimeoutJob(cupsd_job_t *job) /* I - - cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Adding end banner page \"%s\".", - job->id, attr->values[1].string.text); - -- if ((kbytes = copy_banner(NULL, job, attr->values[1].string.text)) < 0) -+ if ((kbytes = copy_banner( -+#ifdef WITH_LSPP -+ job->scon, -+#else -+ NULL, -+#endif -+ job, attr->values[1].string.text)) < 0) - return (-1); - - cupsdUpdateQuota(printer, job->username, 0, kbytes); -@@ -1267,6 +1288,21 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1267,6 +1282,21 @@ int kbytes; /* Size of print file */ int i; /* Looping var */ int lowerpagerange; /* Page range bound */ @@ -758,7 +736,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1454,6 +1490,104 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1454,6 +1484,104 @@ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, title = "Untitled"); @@ -863,7 +841,7 @@ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1462,6 +1596,32 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1462,6 +1590,32 @@ return (NULL); } @@ -896,7 +874,7 @@ job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | CUPS_PRINTER_REMOTE); job->attrs = con->request; -@@ -1668,6 +1828,29 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1668,6 +1822,29 @@ attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]); attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]); } @@ -926,7 +904,7 @@ job->job_sheets = attr; -@@ -1698,6 +1881,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1698,6 +1875,9 @@ "job-sheets=\"%s,none\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -936,7 +914,7 @@ } else if (attr->num_values == 2 && strcmp(attr->values[0].string.text, -@@ -1716,6 +1902,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1716,6 +1896,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -946,7 +924,7 @@ } else if (strcmp(attr->values[0].string.text, Classification) && strcmp(attr->values[0].string.text, "none") && -@@ -1736,6 +1925,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1736,6 +1919,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -956,7 +934,7 @@ } } else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1776,9 +1968,52 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1776,7 +1962,50 @@ "job-sheets=\"%s\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -994,22 +972,20 @@ + (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); + audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, + ServerName, NULL, NULL, 0); -+ } -+ cupsdClearString(&audit_message); } - } - ++ cupsdClearString(&audit_message); ++ } ++ } ++ + if (userheader) + free(userheader); + if (userfooter) + free(userfooter); +#endif /* WITH_LSPP */ -+ } -+ + } + /* - * See if we need to add the starting sheet... - */ -@@ -3391,6 +3626,103 @@ cancel_subscription( +@@ -3391,6 +3620,103 @@ } @@ -1113,7 +1089,7 @@ /* * 'check_quotas()' - Check quotas for a printer and user. */ -@@ -3912,6 +4244,15 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -3912,6 +4238,15 @@ char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -1129,13 +1105,13 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)", -@@ -3946,6 +4287,82 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -3946,6 +4281,82 @@ fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); +#ifdef WITH_LSPP -+ if (con != NULL && con->scon != NULL && -+ strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ if (job->scon != NULL && ++ strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) + { + if (getfilecon(filename, &spoolcon) == -1) + { @@ -1146,7 +1122,7 @@ + return (0); + } + tmpcon = context_new(spoolcon); -+ jobcon = context_new(con->scon); ++ jobcon = context_new(job->scon); + freecon(spoolcon); + if (!tmpcon || !jobcon) + { @@ -1212,16 +1188,16 @@ /* * Try the localized banner file under the subdirectory... -@@ -4040,6 +4457,24 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4040,6 +4451,24 @@ else s = attrname; +#ifdef WITH_LSPP + if (strcmp(s, "mls-label") == 0) + { -+ if (con->scon != NULL && strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ if (job->scon != NULL && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) + { -+ jobcon = context_new(con->scon); ++ jobcon = context_new(job->scon); + if (strcasecmp(name, MLS_CONFIG) == 0) + mls_label = context_range_get(jobcon); + else if (strcasecmp(name, TE_CONFIG) == 0) @@ -1237,7 +1213,7 @@ if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -5765,6 +6200,22 @@ get_job_attrs(cupsd_client_t *con, /* I +@@ -5765,6 +6194,22 @@ return; } @@ -1260,7 +1236,7 @@ /* * Copy attributes... */ -@@ -5970,6 +6421,11 @@ get_jobs(cupsd_client_t *con, /* I - C +@@ -5970,6 +6415,11 @@ if (count > 0) ippAddSeparator(con->response); @@ -1272,7 +1248,7 @@ count ++; cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count); -@@ -10042,6 +10498,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -10042,6 +10492,11 @@ strlcpy(username, get_username(con), userlen); @@ -1284,7 +1260,6 @@ /* * Check the username against the owner... */ -diff -up cups-1.3.7/scheduler/conf.h.lspp cups-1.3.7/scheduler/conf.h --- cups-1.3.7/scheduler/conf.h.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/conf.h 2008-05-30 16:59:10.000000000 +0100 @@ -193,6 +193,12 @@ VAR char *ServerKey VALUE(NULL); @@ -1310,7 +1285,6 @@ /* * Prototypes... -diff -up cups-1.3.7/scheduler/client.c.lspp cups-1.3.7/scheduler/client.c --- cups-1.3.7/scheduler/client.c.lspp 2008-02-12 00:20:32.000000000 +0000 +++ cups-1.3.7/scheduler/client.c 2008-05-30 16:59:10.000000000 +0100 @@ -39,12 +39,14 @@ @@ -1532,7 +1506,6 @@ /* * 'pipe_command()' - Pipe the output of a command to the remote client. */ -diff -up cups-1.3.7/scheduler/client.h.lspp cups-1.3.7/scheduler/client.h --- cups-1.3.7/scheduler/client.h.lspp 2007-10-22 19:52:13.000000000 +0100 +++ cups-1.3.7/scheduler/client.h 2008-05-30 16:59:10.000000000 +0100 @@ -17,6 +17,13 @@ @@ -1570,7 +1543,6 @@ /* -diff -up cups-1.3.7/config.h.in.lspp cups-1.3.7/config.h.in --- cups-1.3.7/config.h.in.lspp 2008-01-07 18:26:57.000000000 +0000 +++ cups-1.3.7/config.h.in 2008-05-30 16:59:10.000000000 +0100 @@ -530,6 +530,13 @@ @@ -1587,7 +1559,6 @@ #endif /* !_CUPS_CONFIG_H_ */ /* -diff -up cups-1.3.7/Makedefs.in.lspp cups-1.3.7/Makedefs.in --- cups-1.3.7/Makedefs.in.lspp 2008-01-22 22:37:21.000000000 +0000 +++ cups-1.3.7/Makedefs.in 2008-05-30 16:59:10.000000000 +0100 @@ -134,7 +134,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ @@ -1599,7 +1570,6 @@ OPTIM = @OPTIM@ OPTIONS = PAMLIBS = @PAMLIBS@ -diff -up cups-1.3.7/configure.in.lspp cups-1.3.7/configure.in --- cups-1.3.7/configure.in.lspp 2007-07-25 00:47:12.000000000 +0100 +++ cups-1.3.7/configure.in 2008-05-30 16:59:10.000000000 +0100 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) @@ -1611,7 +1581,6 @@ INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -diff -up /dev/null cups-1.3.7/config-scripts/cups-lspp.m4 --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/config-scripts/cups-lspp.m4 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,36 @@ @@ -1651,7 +1620,6 @@ + ;; + esac +fi -diff -up cups-1.3.7/filter/common.c.lspp cups-1.3.7/filter/common.c --- cups-1.3.7/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 +++ cups-1.3.7/filter/common.c 2008-05-30 16:59:10.000000000 +0100 @@ -30,6 +30,12 @@ @@ -1822,7 +1790,6 @@ /* -diff -up cups-1.3.7/data/Makefile.lspp cups-1.3.7/data/Makefile --- cups-1.3.7/data/Makefile.lspp 2007-10-10 23:00:43.000000000 +0100 +++ cups-1.3.7/data/Makefile 2008-05-30 16:59:10.000000000 +0100 @@ -25,7 +25,10 @@ BANNERS = \ @@ -1837,7 +1804,6 @@ CHARMAPS = \ euc-cn.txt \ -diff -up /dev/null cups-1.3.7/data/te --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/te 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ @@ -2102,7 +2068,6 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/selinux --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/selinux 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ @@ -2367,7 +2332,6 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/mls --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/mls 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.421 retrieving revision 1.422 diff -u -r1.421 -r1.422 --- cups.spec 1 Jul 2008 10:51:22 -0000 1.421 +++ cups.spec 1 Jul 2008 11:34:31 -0000 1.422 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.7 -Release: 11%{?svn:.svn%{svn}}%{?dist} +Release: 12%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 @@ -448,6 +448,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Jul 1 2008 Tim Waugh 1:1.3.7-12 +- Fixed bug #447200 again. + * Tue Jul 1 2008 Tim Waugh 1:1.3.7-11 - Use portreserve. From fedora-extras-commits at redhat.com Tue Jul 1 11:36:48 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 1 Jul 2008 11:36:48 GMT Subject: rpms/perl-Digest-Nilsimsa/devel perl-Digest-Nilsimsa.spec, 1.12, 1.13 Message-ID: <200807011136.m61Bam6r006809@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Digest-Nilsimsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6603 Modified Files: perl-Digest-Nilsimsa.spec Log Message: - Add perl(:MODULE_COMPAT...) dependency (#453564) - Remove redundant buildreq perl - Clean buildroot at start of %install - Move "make test" to %check - Install into %{perl_vendorarch} and use "make pure_install" - Fix argument order for find with -depth - Only specify compiler flags once - Only specify version number once Index: perl-Digest-Nilsimsa.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-Nilsimsa/devel/perl-Digest-Nilsimsa.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Digest-Nilsimsa.spec 20 Feb 2008 06:56:38 -0000 1.12 +++ perl-Digest-Nilsimsa.spec 1 Jul 2008 11:35:43 -0000 1.13 @@ -1,17 +1,17 @@ Name: perl-Digest-Nilsimsa Version: 0.06 -Release: 9%{?dist}.1 +Release: 10%{?dist} Summary: Perl interface to the Nilsima Algorithm Group: Development/Libraries License: GPLv2+ -Source0: http://www.cpan.org/authors/id/V/VI/VIPUL/Digest-Nilsimsa-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/V/VI/VIPUL/Digest-Nilsimsa-%{version}.tar.gz URL: http://search.cpan.org/dist/Digest-Nilsimsa/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -22,21 +22,23 @@ %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" -make test +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +rm -rf $RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* +%check +make test + + %clean rm -rf $RPM_BUILD_ROOT @@ -44,12 +46,22 @@ %files %defattr(-,root,root,-) %doc COPYING README -%{_libdir}/perl*/* +%{perl_vendorarch}/Digest/ +%{perl_vendorarch}/auto/Digest/ %{_mandir}/man3/*.3* - %changelog -* Wed Feb 20 2008 Fedora Release Engineering - 0.06-9.1 +* Tue Jul 1 2008 Paul Howarth 0.06-10 +- Add perl(:MODULE_COMPAT...) dependency (#453564) +- Remove redundant buildreq perl +- Clean buildroot at start of %%install +- Move "make test" to %%check +- Install into %%{perl_vendorarch} and use "make pure_install" +- Fix argument order for find with -depth +- Only specify compiler flags once +- Only specify version number once + +* Wed Feb 20 2008 Fedora Release Engineering 0.06-9.1 - Autorebuild for GCC 4.3 * Mon Oct 15 2007 Tom "spot" Callaway 0.06-8.1 From fedora-extras-commits at redhat.com Tue Jul 1 11:37:13 2008 From: fedora-extras-commits at redhat.com (Kostas Georgiou (georgiou)) Date: Tue, 1 Jul 2008 11:37:13 GMT Subject: rpms/ganglia/F-9 ganglia.spec,1.12,1.13 Message-ID: <200807011137.m61BbDwh006829@cvs-int.fedora.redhat.com> Author: georgiou Update of /cvs/extras/rpms/ganglia/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6733 Modified Files: ganglia.spec Log Message: Rebuild for new rrdtool Index: ganglia.spec =================================================================== RCS file: /cvs/extras/rpms/ganglia/F-9/ganglia.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ganglia.spec 28 Feb 2008 02:57:10 -0000 1.12 +++ ganglia.spec 1 Jul 2008 11:36:19 -0000 1.13 @@ -1,6 +1,6 @@ Name: ganglia Version: 3.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ganglia Distributed Monitoring System Group: Applications/Internet @@ -205,6 +205,9 @@ %{_datadir}/%{name} %changelog +* Tue Jul 1 2008 Kostas Georgiou 3.0.7-2 +- Rebuild for new rrdtool release + * Wed Feb 27 2008 Jarod Wilson 3.0.7-1 - New upstream release - Fixes "Show Hosts" toggle From fedora-extras-commits at redhat.com Tue Jul 1 11:38:20 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 1 Jul 2008 11:38:20 GMT Subject: rpms/cups/F-9 cups-lspp.patch,1.33,1.34 cups.spec,1.417,1.418 Message-ID: <200807011138.m61BcKrG006935@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6885 Modified Files: cups-lspp.patch cups.spec Log Message: * Tue Jul 1 2008 Tim Waugh 1:1.3.7-8 - Fixed bug #447200 again. cups-lspp.patch: Index: cups-lspp.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-9/cups-lspp.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- cups-lspp.patch 30 May 2008 16:13:09 -0000 1.33 +++ cups-lspp.patch 1 Jul 2008 11:37:34 -0000 1.34 @@ -1,4 +1,3 @@ -diff -up cups-1.3.7/cups/cups.h.lspp cups-1.3.7/cups/cups.h --- cups-1.3.7/cups/cups.h.lspp 2008-02-20 00:32:58.000000000 +0000 +++ cups-1.3.7/cups/cups.h 2008-05-30 16:59:10.000000000 +0100 @@ -15,6 +15,9 @@ @@ -24,7 +23,6 @@ /* * Types and structures... */ -diff -up cups-1.3.7/scheduler/job.c.lspp cups-1.3.7/scheduler/job.c --- cups-1.3.7/scheduler/job.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/job.c 2008-05-30 17:01:23.000000000 +0100 @@ -60,6 +60,9 @@ @@ -383,7 +381,6 @@ if (Classification && !banner_page) { if ((attr = ippFindAttribute(job->attrs, "job-sheets", -diff -up cups-1.3.7/scheduler/printers.c.lspp cups-1.3.7/scheduler/printers.c --- cups-1.3.7/scheduler/printers.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/printers.c 2008-05-30 16:59:10.000000000 +0100 @@ -51,6 +51,8 @@ @@ -465,7 +462,6 @@ } p->raw = 0; -diff -up cups-1.3.7/scheduler/conf.c.lspp cups-1.3.7/scheduler/conf.c --- cups-1.3.7/scheduler/conf.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/conf.c 2008-05-30 16:59:10.000000000 +0100 @@ -26,6 +26,7 @@ @@ -577,7 +573,6 @@ /* * End of "$Id$". -diff -up cups-1.3.7/scheduler/job.h.lspp cups-1.3.7/scheduler/job.h --- cups-1.3.7/scheduler/job.h.lspp 2008-01-16 22:20:33.000000000 +0000 +++ cups-1.3.7/scheduler/job.h 2008-05-30 16:59:31.000000000 +0100 @@ -13,6 +13,13 @@ @@ -605,7 +600,6 @@ } cupsd_job_t; -diff -up cups-1.3.7/scheduler/main.c.lspp cups-1.3.7/scheduler/main.c --- cups-1.3.7/scheduler/main.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/main.c 2008-05-30 16:59:10.000000000 +0100 @@ -35,6 +35,8 @@ @@ -675,9 +669,8 @@ return (!stop_scheduler); } -diff -up cups-1.3.7/scheduler/ipp.c.lspp cups-1.3.7/scheduler/ipp.c ---- cups-1.3.7/scheduler/ipp.c.lspp 2008-05-30 16:59:10.000000000 +0100 -+++ cups-1.3.7/scheduler/ipp.c 2008-05-30 17:01:08.000000000 +0100 +--- cups-1.3.7/scheduler/ipp.c 2008-05-30 17:01:08.000000000 +0100 ++++ cups-1.3.7/scheduler/ipp.c 2008-07-01 12:30:59.000000000 +0100 @@ -36,6 +36,7 @@ * cancel_all_jobs() - Cancel all print jobs. * cancel_job() - Cancel a print job. @@ -696,7 +689,7 @@ /* * Include necessary headers... */ -@@ -116,6 +120,14 @@ extern int mbr_check_membership_by_id(uu +@@ -116,6 +120,14 @@ # endif /* HAVE_MEMBERSHIPPRIV_H */ #endif /* __APPLE__ */ @@ -711,7 +704,7 @@ /* * Local functions... -@@ -140,6 +152,9 @@ static void authenticate_job(cupsd_clien +@@ -140,6 +152,9 @@ static void cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_subscription(cupsd_client_t *con, int id); @@ -721,22 +714,7 @@ static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr, int quickcopy); -@@ -774,7 +789,13 @@ cupsdTimeoutJob(cupsd_job_t *job) /* I - - cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Adding end banner page \"%s\".", - job->id, attr->values[1].string.text); - -- if ((kbytes = copy_banner(NULL, job, attr->values[1].string.text)) < 0) -+ if ((kbytes = copy_banner( -+#ifdef WITH_LSPP -+ job->scon, -+#else -+ NULL, -+#endif -+ job, attr->values[1].string.text)) < 0) - return (-1); - - cupsdUpdateQuota(printer, job->username, 0, kbytes); -@@ -1267,6 +1288,21 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1267,6 +1282,21 @@ int kbytes; /* Size of print file */ int i; /* Looping var */ int lowerpagerange; /* Page range bound */ @@ -758,7 +736,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1454,6 +1490,104 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1454,6 +1484,104 @@ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, title = "Untitled"); @@ -863,7 +841,7 @@ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1462,6 +1596,32 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1462,6 +1590,32 @@ return (NULL); } @@ -896,7 +874,7 @@ job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | CUPS_PRINTER_REMOTE); job->attrs = con->request; -@@ -1668,6 +1828,29 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1668,6 +1822,29 @@ attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]); attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]); } @@ -926,7 +904,7 @@ job->job_sheets = attr; -@@ -1698,6 +1881,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1698,6 +1875,9 @@ "job-sheets=\"%s,none\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -936,7 +914,7 @@ } else if (attr->num_values == 2 && strcmp(attr->values[0].string.text, -@@ -1716,6 +1902,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1716,6 +1896,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -946,7 +924,7 @@ } else if (strcmp(attr->values[0].string.text, Classification) && strcmp(attr->values[0].string.text, "none") && -@@ -1736,6 +1925,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1736,6 +1919,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -956,7 +934,7 @@ } } else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1776,9 +1968,52 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1776,7 +1962,50 @@ "job-sheets=\"%s\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -994,22 +972,20 @@ + (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); + audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, + ServerName, NULL, NULL, 0); -+ } -+ cupsdClearString(&audit_message); } - } - ++ cupsdClearString(&audit_message); ++ } ++ } ++ + if (userheader) + free(userheader); + if (userfooter) + free(userfooter); +#endif /* WITH_LSPP */ -+ } -+ + } + /* - * See if we need to add the starting sheet... - */ -@@ -3391,6 +3626,103 @@ cancel_subscription( +@@ -3391,6 +3620,103 @@ } @@ -1113,7 +1089,7 @@ /* * 'check_quotas()' - Check quotas for a printer and user. */ -@@ -3912,6 +4244,15 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -3912,6 +4238,15 @@ char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -1129,13 +1105,13 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)", -@@ -3946,6 +4287,82 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -3946,6 +4281,82 @@ fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); +#ifdef WITH_LSPP -+ if (con != NULL && con->scon != NULL && -+ strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ if (job->scon != NULL && ++ strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) + { + if (getfilecon(filename, &spoolcon) == -1) + { @@ -1146,7 +1122,7 @@ + return (0); + } + tmpcon = context_new(spoolcon); -+ jobcon = context_new(con->scon); ++ jobcon = context_new(job->scon); + freecon(spoolcon); + if (!tmpcon || !jobcon) + { @@ -1212,16 +1188,16 @@ /* * Try the localized banner file under the subdirectory... -@@ -4040,6 +4457,24 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4040,6 +4451,24 @@ else s = attrname; +#ifdef WITH_LSPP + if (strcmp(s, "mls-label") == 0) + { -+ if (con->scon != NULL && strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ if (job->scon != NULL && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) + { -+ jobcon = context_new(con->scon); ++ jobcon = context_new(job->scon); + if (strcasecmp(name, MLS_CONFIG) == 0) + mls_label = context_range_get(jobcon); + else if (strcasecmp(name, TE_CONFIG) == 0) @@ -1237,7 +1213,7 @@ if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -5765,6 +6200,22 @@ get_job_attrs(cupsd_client_t *con, /* I +@@ -5765,6 +6194,22 @@ return; } @@ -1260,7 +1236,7 @@ /* * Copy attributes... */ -@@ -5970,6 +6421,11 @@ get_jobs(cupsd_client_t *con, /* I - C +@@ -5970,6 +6415,11 @@ if (count > 0) ippAddSeparator(con->response); @@ -1272,7 +1248,7 @@ count ++; cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count); -@@ -10042,6 +10498,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -10042,6 +10492,11 @@ strlcpy(username, get_username(con), userlen); @@ -1284,7 +1260,6 @@ /* * Check the username against the owner... */ -diff -up cups-1.3.7/scheduler/conf.h.lspp cups-1.3.7/scheduler/conf.h --- cups-1.3.7/scheduler/conf.h.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/conf.h 2008-05-30 16:59:10.000000000 +0100 @@ -193,6 +193,12 @@ VAR char *ServerKey VALUE(NULL); @@ -1310,7 +1285,6 @@ /* * Prototypes... -diff -up cups-1.3.7/scheduler/client.c.lspp cups-1.3.7/scheduler/client.c --- cups-1.3.7/scheduler/client.c.lspp 2008-02-12 00:20:32.000000000 +0000 +++ cups-1.3.7/scheduler/client.c 2008-05-30 16:59:10.000000000 +0100 @@ -39,12 +39,14 @@ @@ -1532,7 +1506,6 @@ /* * 'pipe_command()' - Pipe the output of a command to the remote client. */ -diff -up cups-1.3.7/scheduler/client.h.lspp cups-1.3.7/scheduler/client.h --- cups-1.3.7/scheduler/client.h.lspp 2007-10-22 19:52:13.000000000 +0100 +++ cups-1.3.7/scheduler/client.h 2008-05-30 16:59:10.000000000 +0100 @@ -17,6 +17,13 @@ @@ -1570,7 +1543,6 @@ /* -diff -up cups-1.3.7/config.h.in.lspp cups-1.3.7/config.h.in --- cups-1.3.7/config.h.in.lspp 2008-01-07 18:26:57.000000000 +0000 +++ cups-1.3.7/config.h.in 2008-05-30 16:59:10.000000000 +0100 @@ -530,6 +530,13 @@ @@ -1587,7 +1559,6 @@ #endif /* !_CUPS_CONFIG_H_ */ /* -diff -up cups-1.3.7/Makedefs.in.lspp cups-1.3.7/Makedefs.in --- cups-1.3.7/Makedefs.in.lspp 2008-01-22 22:37:21.000000000 +0000 +++ cups-1.3.7/Makedefs.in 2008-05-30 16:59:10.000000000 +0100 @@ -134,7 +134,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ @@ -1599,7 +1570,6 @@ OPTIM = @OPTIM@ OPTIONS = PAMLIBS = @PAMLIBS@ -diff -up cups-1.3.7/configure.in.lspp cups-1.3.7/configure.in --- cups-1.3.7/configure.in.lspp 2007-07-25 00:47:12.000000000 +0100 +++ cups-1.3.7/configure.in 2008-05-30 16:59:10.000000000 +0100 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) @@ -1611,7 +1581,6 @@ INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -diff -up /dev/null cups-1.3.7/config-scripts/cups-lspp.m4 --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/config-scripts/cups-lspp.m4 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,36 @@ @@ -1651,7 +1620,6 @@ + ;; + esac +fi -diff -up cups-1.3.7/filter/common.c.lspp cups-1.3.7/filter/common.c --- cups-1.3.7/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 +++ cups-1.3.7/filter/common.c 2008-05-30 16:59:10.000000000 +0100 @@ -30,6 +30,12 @@ @@ -1822,7 +1790,6 @@ /* -diff -up cups-1.3.7/data/Makefile.lspp cups-1.3.7/data/Makefile --- cups-1.3.7/data/Makefile.lspp 2007-10-10 23:00:43.000000000 +0100 +++ cups-1.3.7/data/Makefile 2008-05-30 16:59:10.000000000 +0100 @@ -25,7 +25,10 @@ BANNERS = \ @@ -1837,7 +1804,6 @@ CHARMAPS = \ euc-cn.txt \ -diff -up /dev/null cups-1.3.7/data/te --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/te 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ @@ -2102,7 +2068,6 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/selinux --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/selinux 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ @@ -2367,7 +2332,6 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/mls --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/mls 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v retrieving revision 1.417 retrieving revision 1.418 diff -u -r1.417 -r1.418 --- cups.spec 17 Jun 2008 16:54:05 -0000 1.417 +++ cups.spec 1 Jul 2008 11:37:34 -0000 1.418 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.7 -Release: 7%{?svn:.svn%{svn}}%{?dist} +Release: 8%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 @@ -439,6 +439,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Jul 1 2008 Tim Waugh 1:1.3.7-8 +- Fixed bug #447200 again. + * Tue Jun 17 2008 Tim Waugh - Don't overwrite the upstream snmp.conf file. From fedora-extras-commits at redhat.com Tue Jul 1 11:41:25 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 1 Jul 2008 11:41:25 GMT Subject: rpms/cups/F-8 cups-lspp.patch,1.31,1.32 cups.spec,1.396,1.397 Message-ID: <200807011141.m61BfPs6007204@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7117 Modified Files: cups-lspp.patch cups.spec Log Message: * Tue Jul 1 2008 Tim Waugh 1:1.3.7-4 - Fixed bug #447200 again. cups-lspp.patch: Index: cups-lspp.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-8/cups-lspp.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- cups-lspp.patch 30 May 2008 16:14:40 -0000 1.31 +++ cups-lspp.patch 1 Jul 2008 11:40:24 -0000 1.32 @@ -1,4 +1,3 @@ -diff -up cups-1.3.7/cups/cups.h.lspp cups-1.3.7/cups/cups.h --- cups-1.3.7/cups/cups.h.lspp 2008-02-20 00:32:58.000000000 +0000 +++ cups-1.3.7/cups/cups.h 2008-05-30 16:59:10.000000000 +0100 @@ -15,6 +15,9 @@ @@ -24,7 +23,6 @@ /* * Types and structures... */ -diff -up cups-1.3.7/scheduler/job.c.lspp cups-1.3.7/scheduler/job.c --- cups-1.3.7/scheduler/job.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/job.c 2008-05-30 17:01:23.000000000 +0100 @@ -60,6 +60,9 @@ @@ -383,7 +381,6 @@ if (Classification && !banner_page) { if ((attr = ippFindAttribute(job->attrs, "job-sheets", -diff -up cups-1.3.7/scheduler/printers.c.lspp cups-1.3.7/scheduler/printers.c --- cups-1.3.7/scheduler/printers.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/printers.c 2008-05-30 16:59:10.000000000 +0100 @@ -51,6 +51,8 @@ @@ -465,7 +462,6 @@ } p->raw = 0; -diff -up cups-1.3.7/scheduler/conf.c.lspp cups-1.3.7/scheduler/conf.c --- cups-1.3.7/scheduler/conf.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/conf.c 2008-05-30 16:59:10.000000000 +0100 @@ -26,6 +26,7 @@ @@ -577,7 +573,6 @@ /* * End of "$Id$". -diff -up cups-1.3.7/scheduler/job.h.lspp cups-1.3.7/scheduler/job.h --- cups-1.3.7/scheduler/job.h.lspp 2008-01-16 22:20:33.000000000 +0000 +++ cups-1.3.7/scheduler/job.h 2008-05-30 16:59:31.000000000 +0100 @@ -13,6 +13,13 @@ @@ -605,7 +600,6 @@ } cupsd_job_t; -diff -up cups-1.3.7/scheduler/main.c.lspp cups-1.3.7/scheduler/main.c --- cups-1.3.7/scheduler/main.c.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/main.c 2008-05-30 16:59:10.000000000 +0100 @@ -35,6 +35,8 @@ @@ -675,9 +669,8 @@ return (!stop_scheduler); } -diff -up cups-1.3.7/scheduler/ipp.c.lspp cups-1.3.7/scheduler/ipp.c ---- cups-1.3.7/scheduler/ipp.c.lspp 2008-05-30 16:59:10.000000000 +0100 -+++ cups-1.3.7/scheduler/ipp.c 2008-05-30 17:01:08.000000000 +0100 +--- cups-1.3.7/scheduler/ipp.c 2008-05-30 17:01:08.000000000 +0100 ++++ cups-1.3.7/scheduler/ipp.c 2008-07-01 12:30:59.000000000 +0100 @@ -36,6 +36,7 @@ * cancel_all_jobs() - Cancel all print jobs. * cancel_job() - Cancel a print job. @@ -696,7 +689,7 @@ /* * Include necessary headers... */ -@@ -116,6 +120,14 @@ extern int mbr_check_membership_by_id(uu +@@ -116,6 +120,14 @@ # endif /* HAVE_MEMBERSHIPPRIV_H */ #endif /* __APPLE__ */ @@ -711,7 +704,7 @@ /* * Local functions... -@@ -140,6 +152,9 @@ static void authenticate_job(cupsd_clien +@@ -140,6 +152,9 @@ static void cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_subscription(cupsd_client_t *con, int id); @@ -721,22 +714,7 @@ static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr, int quickcopy); -@@ -774,7 +789,13 @@ cupsdTimeoutJob(cupsd_job_t *job) /* I - - cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Adding end banner page \"%s\".", - job->id, attr->values[1].string.text); - -- if ((kbytes = copy_banner(NULL, job, attr->values[1].string.text)) < 0) -+ if ((kbytes = copy_banner( -+#ifdef WITH_LSPP -+ job->scon, -+#else -+ NULL, -+#endif -+ job, attr->values[1].string.text)) < 0) - return (-1); - - cupsdUpdateQuota(printer, job->username, 0, kbytes); -@@ -1267,6 +1288,21 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1267,6 +1282,21 @@ int kbytes; /* Size of print file */ int i; /* Looping var */ int lowerpagerange; /* Page range bound */ @@ -758,7 +736,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1454,6 +1490,104 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1454,6 +1484,104 @@ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, title = "Untitled"); @@ -863,7 +841,7 @@ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1462,6 +1596,32 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1462,6 +1590,32 @@ return (NULL); } @@ -896,7 +874,7 @@ job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | CUPS_PRINTER_REMOTE); job->attrs = con->request; -@@ -1668,6 +1828,29 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1668,6 +1822,29 @@ attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]); attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]); } @@ -926,7 +904,7 @@ job->job_sheets = attr; -@@ -1698,6 +1881,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1698,6 +1875,9 @@ "job-sheets=\"%s,none\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -936,7 +914,7 @@ } else if (attr->num_values == 2 && strcmp(attr->values[0].string.text, -@@ -1716,6 +1902,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1716,6 +1896,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -946,7 +924,7 @@ } else if (strcmp(attr->values[0].string.text, Classification) && strcmp(attr->values[0].string.text, "none") && -@@ -1736,6 +1925,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1736,6 +1919,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -956,7 +934,7 @@ } } else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1776,9 +1968,52 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1776,7 +1962,50 @@ "job-sheets=\"%s\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -994,22 +972,20 @@ + (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); + audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, + ServerName, NULL, NULL, 0); -+ } -+ cupsdClearString(&audit_message); } - } - ++ cupsdClearString(&audit_message); ++ } ++ } ++ + if (userheader) + free(userheader); + if (userfooter) + free(userfooter); +#endif /* WITH_LSPP */ -+ } -+ + } + /* - * See if we need to add the starting sheet... - */ -@@ -3391,6 +3626,103 @@ cancel_subscription( +@@ -3391,6 +3620,103 @@ } @@ -1113,7 +1089,7 @@ /* * 'check_quotas()' - Check quotas for a printer and user. */ -@@ -3912,6 +4244,15 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -3912,6 +4238,15 @@ char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -1129,13 +1105,13 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)", -@@ -3946,6 +4287,82 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -3946,6 +4281,82 @@ fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); +#ifdef WITH_LSPP -+ if (con != NULL && con->scon != NULL && -+ strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ if (job->scon != NULL && ++ strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) + { + if (getfilecon(filename, &spoolcon) == -1) + { @@ -1146,7 +1122,7 @@ + return (0); + } + tmpcon = context_new(spoolcon); -+ jobcon = context_new(con->scon); ++ jobcon = context_new(job->scon); + freecon(spoolcon); + if (!tmpcon || !jobcon) + { @@ -1212,16 +1188,16 @@ /* * Try the localized banner file under the subdirectory... -@@ -4040,6 +4457,24 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4040,6 +4451,24 @@ else s = attrname; +#ifdef WITH_LSPP + if (strcmp(s, "mls-label") == 0) + { -+ if (con->scon != NULL && strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ if (job->scon != NULL && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) + { -+ jobcon = context_new(con->scon); ++ jobcon = context_new(job->scon); + if (strcasecmp(name, MLS_CONFIG) == 0) + mls_label = context_range_get(jobcon); + else if (strcasecmp(name, TE_CONFIG) == 0) @@ -1237,7 +1213,7 @@ if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -5765,6 +6200,22 @@ get_job_attrs(cupsd_client_t *con, /* I +@@ -5765,6 +6194,22 @@ return; } @@ -1260,7 +1236,7 @@ /* * Copy attributes... */ -@@ -5970,6 +6421,11 @@ get_jobs(cupsd_client_t *con, /* I - C +@@ -5970,6 +6415,11 @@ if (count > 0) ippAddSeparator(con->response); @@ -1272,7 +1248,7 @@ count ++; cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count); -@@ -10042,6 +10498,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -10042,6 +10492,11 @@ strlcpy(username, get_username(con), userlen); @@ -1284,7 +1260,6 @@ /* * Check the username against the owner... */ -diff -up cups-1.3.7/scheduler/conf.h.lspp cups-1.3.7/scheduler/conf.h --- cups-1.3.7/scheduler/conf.h.lspp 2008-05-30 16:59:10.000000000 +0100 +++ cups-1.3.7/scheduler/conf.h 2008-05-30 16:59:10.000000000 +0100 @@ -193,6 +193,12 @@ VAR char *ServerKey VALUE(NULL); @@ -1310,7 +1285,6 @@ /* * Prototypes... -diff -up cups-1.3.7/scheduler/client.c.lspp cups-1.3.7/scheduler/client.c --- cups-1.3.7/scheduler/client.c.lspp 2008-02-12 00:20:32.000000000 +0000 +++ cups-1.3.7/scheduler/client.c 2008-05-30 16:59:10.000000000 +0100 @@ -39,12 +39,14 @@ @@ -1532,7 +1506,6 @@ /* * 'pipe_command()' - Pipe the output of a command to the remote client. */ -diff -up cups-1.3.7/scheduler/client.h.lspp cups-1.3.7/scheduler/client.h --- cups-1.3.7/scheduler/client.h.lspp 2007-10-22 19:52:13.000000000 +0100 +++ cups-1.3.7/scheduler/client.h 2008-05-30 16:59:10.000000000 +0100 @@ -17,6 +17,13 @@ @@ -1570,7 +1543,6 @@ /* -diff -up cups-1.3.7/config.h.in.lspp cups-1.3.7/config.h.in --- cups-1.3.7/config.h.in.lspp 2008-01-07 18:26:57.000000000 +0000 +++ cups-1.3.7/config.h.in 2008-05-30 16:59:10.000000000 +0100 @@ -530,6 +530,13 @@ @@ -1587,7 +1559,6 @@ #endif /* !_CUPS_CONFIG_H_ */ /* -diff -up cups-1.3.7/Makedefs.in.lspp cups-1.3.7/Makedefs.in --- cups-1.3.7/Makedefs.in.lspp 2008-01-22 22:37:21.000000000 +0000 +++ cups-1.3.7/Makedefs.in 2008-05-30 16:59:10.000000000 +0100 @@ -134,7 +134,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ @@ -1599,7 +1570,6 @@ OPTIM = @OPTIM@ OPTIONS = PAMLIBS = @PAMLIBS@ -diff -up cups-1.3.7/configure.in.lspp cups-1.3.7/configure.in --- cups-1.3.7/configure.in.lspp 2007-07-25 00:47:12.000000000 +0100 +++ cups-1.3.7/configure.in 2008-05-30 16:59:10.000000000 +0100 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) @@ -1611,7 +1581,6 @@ INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -diff -up /dev/null cups-1.3.7/config-scripts/cups-lspp.m4 --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/config-scripts/cups-lspp.m4 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,36 @@ @@ -1651,7 +1620,6 @@ + ;; + esac +fi -diff -up cups-1.3.7/filter/common.c.lspp cups-1.3.7/filter/common.c --- cups-1.3.7/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 +++ cups-1.3.7/filter/common.c 2008-05-30 16:59:10.000000000 +0100 @@ -30,6 +30,12 @@ @@ -1822,7 +1790,6 @@ /* -diff -up cups-1.3.7/data/Makefile.lspp cups-1.3.7/data/Makefile --- cups-1.3.7/data/Makefile.lspp 2007-10-10 23:00:43.000000000 +0100 +++ cups-1.3.7/data/Makefile 2008-05-30 16:59:10.000000000 +0100 @@ -25,7 +25,10 @@ BANNERS = \ @@ -1837,7 +1804,6 @@ CHARMAPS = \ euc-cn.txt \ -diff -up /dev/null cups-1.3.7/data/te --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/te 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ @@ -2102,7 +2068,6 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/selinux --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/selinux 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ @@ -2367,7 +2332,6 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/mls --- /dev/null 2008-05-30 08:00:32.690000973 +0100 +++ cups-1.3.7/data/mls 2008-05-30 16:59:10.000000000 +0100 @@ -0,0 +1,261 @@ Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v retrieving revision 1.396 retrieving revision 1.397 diff -u -r1.396 -r1.397 --- cups.spec 17 Jun 2008 11:22:23 -0000 1.396 +++ cups.spec 1 Jul 2008 11:40:24 -0000 1.397 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2 @@ -457,6 +457,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Jul 1 2008 Tim Waugh 1:1.3.7-4 +- Fixed bug #447200 again. + * Tue Jun 17 2008 Tim Waugh 1:1.3.7-3 - Backported cupsGetNamedDest from 1.4 (bug #428086). - Fixed bug #447200 again. From fedora-extras-commits at redhat.com Tue Jul 1 11:44:10 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 1 Jul 2008 11:44:10 GMT Subject: rpms/librepository/devel librepository.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011144.m61BiAfB007424@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/librepository/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7360/devel Modified Files: .cvsignore sources Added Files: librepository.spec Log Message: --- NEW FILE librepository.spec --- # Use rpmbuild --without gcj to disable native bits %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: librepository Version: 0.1.6 Release: 1%{?dist} Summary: Hierarchical repository abstraction layer License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://reporting.pentaho.org/ BuildRequires: ant, java-devel, jpackage-utils, jcommon Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: java, jpackage-utils, jcommon %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc Javadoc for %{name}. %prep %setup -q find . -name "*.jar" -exec rm -f {} \; build-jar-repository -s -p lib jcommon-1.0.12 %build ant compile javadoc for file in README.txt licence-LGPL.txt ChangeLog.txt; do tr -d '\r' < $file > $file.new mv $file.new $file done %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf $RPM_BUILD_ROOT %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(0644,root,root,0755) %doc licence-LGPL.txt README.txt ChangeLog.txt %{_javadir}/*.jar %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog * Wed May 07 2008 Caolan McNamara 0.1.6-1 - initial fedora import Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/librepository/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 16:06:45 -0000 1.1 +++ .cvsignore 1 Jul 2008 11:43:29 -0000 1.2 @@ -0,0 +1 @@ +librepository-0.1.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/librepository/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 16:06:45 -0000 1.1 +++ sources 1 Jul 2008 11:43:29 -0000 1.2 @@ -0,0 +1 @@ +dd34238a64ed3021d1fb2bad3f7ea74f librepository-0.1.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 11:55:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 11:55:37 +0000 Subject: [pkgdb] ganglia ownership updated Message-ID: <200807011155.m61Btb5g020255@bastion.fedora.phx.redhat.com> Package ganglia in Fedora EPEL 4 is now owned by Kostas Georgiou (georgiou) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ganglia From fedora-extras-commits at redhat.com Tue Jul 1 11:55:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 11:55:42 +0000 Subject: [pkgdb] ganglia ownership updated Message-ID: <200807011155.m61BthJf020277@bastion.fedora.phx.redhat.com> Package ganglia in Fedora EPEL 5 is now owned by Kostas Georgiou (georgiou) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ganglia From fedora-extras-commits at redhat.com Tue Jul 1 12:08:14 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 1 Jul 2008 12:08:14 GMT Subject: rpms/gnome-power-manager/devel .cvsignore, 1.45, 1.46 gnome-power-manager.spec, 1.117, 1.118 sources, 1.45, 1.46 Message-ID: <200807011208.m61C8EOb015007@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-power-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14951 Modified Files: .cvsignore gnome-power-manager.spec sources Log Message: * Tue Jul 01 2008 Richard Hughes - 2.23.3-1 - Update to 2.23.3, which should fix backlight brightness. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 20 May 2008 09:19:33 -0000 1.45 +++ .cvsignore 1 Jul 2008 12:07:22 -0000 1.46 @@ -1 +1 @@ -gnome-power-manager-2.23.1.tar.gz +gnome-power-manager-2.23.3.tar.gz Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- gnome-power-manager.spec 20 May 2008 09:51:20 -0000 1.117 +++ gnome-power-manager.spec 1 Jul 2008 12:07:22 -0000 1.118 @@ -4,7 +4,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.23.1 +Version: 2.23.3 Release: 2%{?dist} License: GPLv2+ and GFDL+ Group: Applications/System @@ -127,6 +127,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml %changelog +* Tue Jul 01 2008 Richard Hughes - 2.23.3-1 +- Update to 2.23.3, which should fix backlight brightness. + * Fri May 20 2008 Richard Hughes - 2.23.1-2 - Add a BR on Policykit-gnome Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 20 May 2008 09:19:33 -0000 1.45 +++ sources 1 Jul 2008 12:07:22 -0000 1.46 @@ -1 +1 @@ -c50d2a72ca061a6f0a09a6c6309988ff gnome-power-manager-2.23.1.tar.gz +9f8acf836e953924c8c6e7542e79745e gnome-power-manager-2.23.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 12:12:36 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 1 Jul 2008 12:12:36 GMT Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec,1.11,1.12 Message-ID: <200807011212.m61CCa8R015288@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Flat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15241/devel Modified Files: perl-File-Flat.spec Log Message: * Tue Jul 01 2008 Ralf Cors??pius - 1.04-2 - BR: perl(Test::CPAN::Meta). Index: perl-File-Flat.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Flat/devel/perl-File-Flat.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-File-Flat.spec 7 Apr 2008 13:21:33 -0000 1.11 +++ perl-File-Flat.spec 1 Jul 2008 12:12:03 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-File-Flat Version: 1.04 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implements a flat filesystem License: GPL+ or Artistic Group: Development/Libraries @@ -26,8 +26,7 @@ # For improved tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::MinimumVersion) -# FIXME: Missing in Fedora -# BuildRequires: perl(Test::CPAN::Meta) +BuildRequires: perl(Test::CPAN::Meta) %description File::Flat implements a flat filesystem. A flat filesystem is a filesystem @@ -61,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Ralf Cors??pius - 1.04-2 +- BR: perl(Test::CPAN::Meta). + * Mon Apr 07 2008 Ralf Cors??pius - 1.04-1 - Upstream update. - Remove dep on perl(File::Slurp). From fedora-extras-commits at redhat.com Tue Jul 1 12:12:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 1 Jul 2008 12:12:44 GMT Subject: rpms/perl-File-Flat/F-9 perl-File-Flat.spec,1.11,1.12 Message-ID: <200807011212.m61CCiw4015307@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Flat/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15241/F-9 Modified Files: perl-File-Flat.spec Log Message: * Tue Jul 01 2008 Ralf Cors??pius - 1.04-2 - BR: perl(Test::CPAN::Meta). Index: perl-File-Flat.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Flat/F-9/perl-File-Flat.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-File-Flat.spec 7 Apr 2008 13:21:33 -0000 1.11 +++ perl-File-Flat.spec 1 Jul 2008 12:12:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-File-Flat Version: 1.04 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implements a flat filesystem License: GPL+ or Artistic Group: Development/Libraries @@ -26,8 +26,7 @@ # For improved tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::MinimumVersion) -# FIXME: Missing in Fedora -# BuildRequires: perl(Test::CPAN::Meta) +BuildRequires: perl(Test::CPAN::Meta) %description File::Flat implements a flat filesystem. A flat filesystem is a filesystem @@ -61,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Ralf Cors??pius - 1.04-2 +- BR: perl(Test::CPAN::Meta). + * Mon Apr 07 2008 Ralf Cors??pius - 1.04-1 - Upstream update. - Remove dep on perl(File::Slurp). From fedora-extras-commits at redhat.com Tue Jul 1 12:29:42 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 1 Jul 2008 12:29:42 GMT Subject: rpms/perl-Digest-Nilsimsa/F-9 perl-Digest-Nilsimsa.spec,1.12,1.13 Message-ID: <200807011229.m61CTgkD016097@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Digest-Nilsimsa/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16013 Modified Files: perl-Digest-Nilsimsa.spec Log Message: - Add perl(:MODULE_COMPAT...) dependency (#453564) - Remove redundant buildreq perl - Clean buildroot at start of %%install - Move "make test" to %%check - Install into %%{perl_vendorarch} and use "make pure_install" - Fix argument order for find with -depth - Only specify compiler flags once - Only specify version number once Index: perl-Digest-Nilsimsa.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-Nilsimsa/F-9/perl-Digest-Nilsimsa.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Digest-Nilsimsa.spec 20 Feb 2008 06:56:38 -0000 1.12 +++ perl-Digest-Nilsimsa.spec 1 Jul 2008 12:28:38 -0000 1.13 @@ -1,17 +1,17 @@ Name: perl-Digest-Nilsimsa Version: 0.06 -Release: 9%{?dist}.1 +Release: 10%{?dist} Summary: Perl interface to the Nilsima Algorithm Group: Development/Libraries License: GPLv2+ -Source0: http://www.cpan.org/authors/id/V/VI/VIPUL/Digest-Nilsimsa-0.06.tar.gz +Source0: http://www.cpan.org/authors/id/V/VI/VIPUL/Digest-Nilsimsa-%{version}.tar.gz URL: http://search.cpan.org/dist/Digest-Nilsimsa/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -22,21 +22,23 @@ %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" -make test +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +rm -rf $RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* +%check +make test + + %clean rm -rf $RPM_BUILD_ROOT @@ -44,12 +46,22 @@ %files %defattr(-,root,root,-) %doc COPYING README -%{_libdir}/perl*/* +%{perl_vendorarch}/Digest/ +%{perl_vendorarch}/auto/Digest/ %{_mandir}/man3/*.3* - %changelog -* Wed Feb 20 2008 Fedora Release Engineering - 0.06-9.1 +* Tue Jul 1 2008 Paul Howarth 0.06-10 +- Add perl(:MODULE_COMPAT...) dependency (#453564) +- Remove redundant buildreq perl +- Clean buildroot at start of %%install +- Move "make test" to %%check +- Install into %%{perl_vendorarch} and use "make pure_install" +- Fix argument order for find with -depth +- Only specify compiler flags once +- Only specify version number once + +* Wed Feb 20 2008 Fedora Release Engineering 0.06-9.1 - Autorebuild for GCC 4.3 * Mon Oct 15 2007 Tom "spot" Callaway 0.06-8.1 From fedora-extras-commits at redhat.com Tue Jul 1 12:35:10 2008 From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek)) Date: Tue, 1 Jul 2008 12:35:10 GMT Subject: rpms/tog-pegasus/devel RedHat.OpenPegasus.Makefile, 1.8, 1.9 tog-pegasus.spec, 1.59, 1.60 Message-ID: <200807011235.m61CZAD5016398@cvs-int.fedora.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16341 Modified Files: RedHat.OpenPegasus.Makefile tog-pegasus.spec Log Message: Add SNMP indication handler to package Index: RedHat.OpenPegasus.Makefile =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/RedHat.OpenPegasus.Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RedHat.OpenPegasus.Makefile 3 Jun 2008 13:05:33 -0000 1.8 +++ RedHat.OpenPegasus.Makefile 1 Jul 2008 12:34:14 -0000 1.9 @@ -71,7 +71,7 @@ UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec BINARIES=$(SBINS) $(UBINS) PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1 -LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/lib! pegserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegpmservice.so.1 +LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libsnmpIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)! /lib/libpegrepository.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegpmservice.so.1 all: $(BINARIES) $(LIBRARIES) $(PROVIDERS) @@ -137,6 +137,9 @@ $(B)/lib/libCIMxmlIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegclient.so.1 $(MAKE) -C $(R)/src/Pegasus/Handler/CIMxmlIndicationHandler +$(B)/lib/libsnmpIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 + $(MAKE) -C $(R)/src/Pegasus/Handler/snmpIndicationHandler + $(B)/lib/libCMPIProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(MAKE) -C $(R)/src/Pegasus/ProviderManager2/CMPI @@ -309,7 +312,7 @@ $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificateRevocationList20.mof \ $(R)/Schemas/Pegasus/InterOp/VER20/PG_Events20.mof PEGMOF=$(addprefix $(D)$(share)/Pegasus/mof/Pegasus/,$(notdir $(CIMSCHEMA))) -LINKED_LIBS=$(D)/$(lib)/libcmpiCppImpl.so.1 $(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1 +LINKED_LIBS=$(D)/$(lib)/libcmpiCppImpl.so.1 $(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libsnmpIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1 export PEGASUS_STAGING_DIR := $(D) BSX ?= Index: tog-pegasus.spec =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- tog-pegasus.spec 3 Jun 2008 13:05:33 -0000 1.59 +++ tog-pegasus.spec 1 Jul 2008 12:34:14 -0000 1.60 @@ -41,7 +41,7 @@ %endif Version: 2.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 2 # Summary: OpenPegasus WBEM Services for Linux @@ -442,6 +442,10 @@ %changelog +* Tue Jul 1 2008 Vitezslav Crhonek - 2:2.7.0-9 +- Add SNMP indication handler to package + Resolves: #452930 + * Tue Jun 3 2008 Vitezslav Crhonek - 2:2.7.0-8 - Add cimsub to package Resolves: #447823 From fedora-extras-commits at redhat.com Tue Jul 1 12:53:26 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 12:53:26 GMT Subject: rpms/ocaml-pgocaml/F-8 ocaml-pgocaml.spec,1.2,1.3 Message-ID: <200807011253.m61CrQ9A017335@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pgocaml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17241 Modified Files: ocaml-pgocaml.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 - Ignore Parsetree dep. Index: ocaml-pgocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/F-8/ocaml-pgocaml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-pgocaml.spec 12 May 2008 19:24:45 -0000 1.2 +++ ocaml-pgocaml.spec 1 Jul 2008 12:52:33 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-pgocaml Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for type-safe access to PostgreSQL databases Group: Development/Libraries @@ -25,7 +25,7 @@ # The find-requires/provides scripts don't understand the packed # CalendarLib module well. Ignore the packed submodules. %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Parsetree -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description @@ -97,6 +97,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 +- Ignore Parsetree dep. + * Mon May 12 2008 Richard W.M. Jones - 1.1-2 - ExcludeArch ppc64 (only for F-8). From fedora-extras-commits at redhat.com Tue Jul 1 12:54:10 2008 From: fedora-extras-commits at redhat.com (Karel Zak (kzak)) Date: Tue, 1 Jul 2008 12:54:10 GMT Subject: rpms/util-linux-ng/devel util-linux-ng-2.14-mount-file_t.patch, NONE, 1.1 util-linux-ng.spec, 1.26, 1.27 util-linux-ng-2.13-login-audit.patch, 1.1, NONE Message-ID: <200807011254.m61CsAG3017428@cvs-int.fedora.redhat.com> Author: kzak Update of /cvs/pkgs/rpms/util-linux-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17324 Modified Files: util-linux-ng.spec Added Files: util-linux-ng-2.14-mount-file_t.patch Removed Files: util-linux-ng-2.13-login-audit.patch Log Message: * Tue Jul 1 2008 Karel Zak 2.14-2 - fix #390691 - mount should check selinux context on mount, and warn on file_t util-linux-ng-2.14-mount-file_t.patch: --- NEW FILE util-linux-ng-2.14-mount-file_t.patch --- >From 4edebc1486133231e38b3881325c374eda567f74 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 23 Jun 2008 13:00:00 +0200 Subject: [PATCH] mount: warn on "file_t" selinux context Currently if I mount a file system without labels, it works fine, but later or SELinux will start printing denials and stopping certain applications from working. It would be nice if the mount command checked it in selinux mode. Addresses-Red-Hat-Bugzilla: #390691 Signed-off-by: Karel Zak --- mount/mount.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/mount/mount.c b/mount/mount.c index bed792d..30688ac 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -327,7 +327,7 @@ append_context(const char *optname, char *optdata, char **extra_opts) security_context_t raw = NULL; char *data = NULL; - if (!is_selinux_enabled()) + if (is_selinux_enabled() != 1) /* ignore the option if we running without selinux */ return 0; @@ -338,8 +338,8 @@ append_context(const char *optname, char *optdata, char **extra_opts) data = *optdata =='"' ? strip_quotes(optdata) : optdata; if (selinux_trans_to_raw_context( - (security_context_t) data, &raw)==-1 || - raw==NULL) + (security_context_t) data, &raw) == -1 || + raw == NULL) return -1; if (verbose) @@ -1370,6 +1370,29 @@ try_mount_one (const char *spec0, const char *node0, const char *types0, res = EX_FAIL; out: + +#ifdef HAVE_LIBSELINUX + if (res != EX_FAIL && is_selinux_enabled() > 0) { + security_context_t raw = NULL, def = NULL; + + if (getfilecon(node, &raw) > 0 && + security_get_initial_context("file", &def) == 0) { + + if (!selinux_file_context_cmp(raw, def)) + printf(_("mount: %s does not contain SELinux labels.\n" + " You just mounted an file system that supports labels which does not\n" + " contain labels, onto an SELinux box. It is likely that confined\n" + " applications will generate AVC messages and not be allowed access to\n" + " this file system. You can add labels to this file system by executing\n" + " restorecon(8). If you do not want to add labels to this file system,\n" + " you should mount the file system using one of the \"context\" mount\n" + " option."), node); + } + freecon(raw); + freecon(def); + } +#endif + my_free(extra_opts1); my_free(spec1); my_free(node1); -- 1.5.4.1 Index: util-linux-ng.spec =================================================================== RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- util-linux-ng.spec 9 Jun 2008 13:21:22 -0000 1.26 +++ util-linux-ng.spec 1 Jul 2008 12:53:26 -0000 1.27 @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux-ng Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng @@ -98,6 +98,8 @@ Patch9: util-linux-ng-2.13-floppy-locale.patch # remove partitions Patch10: util-linux-ng-2.14-blockdev-rmpart.patch +# 390691: mount should check selinux context on mount, and warn on file_t +Patch11: util-linux-ng-2.14-mount-file_t.patch %description The util-linux-ng package contains a large variety of low-level system @@ -120,6 +122,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build unset LINGUAS || : @@ -512,6 +515,9 @@ /sbin/losetup %changelog +* Tue Jul 1 2008 Karel Zak 2.14-2 +- fix #390691 - mount should check selinux context on mount, and warn on file_t + * Mon Jun 9 2008 Karel Zak 2.14-1 - upgrade to stable util-linux-ng release --- util-linux-ng-2.13-login-audit.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 12:55:48 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 12:55:48 GMT Subject: rpms/ocaml-pgocaml/F-9 ocaml-pgocaml.spec,1.2,1.3 Message-ID: <200807011255.m61CtmZx017594@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pgocaml/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17487 Modified Files: ocaml-pgocaml.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 - Ignore Parsetree dep. Index: ocaml-pgocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/F-9/ocaml-pgocaml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-pgocaml.spec 12 Jun 2008 09:21:40 -0000 1.2 +++ ocaml-pgocaml.spec 1 Jul 2008 12:54:34 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-pgocaml Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for type-safe access to PostgreSQL databases Group: Development/Libraries @@ -23,7 +23,7 @@ # The find-requires/provides scripts don't understand the packed # CalendarLib module well. Ignore the packed submodules. %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Parsetree -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description @@ -95,6 +95,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 +- Ignore Parsetree dep. + * Thu Jun 12 2008 Richard W.M. Jones - 1.1-2 - Bump version to fix package EVR problems between branches From fedora-extras-commits at redhat.com Tue Jul 1 12:55:49 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 1 Jul 2008 12:55:49 GMT Subject: rpms/kernel/devel patch-2.6.26-rc8-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.847, 1.848 kernel.spec, 1.724, 1.725 sources, 1.808, 1.809 upstream, 1.726, 1.727 patch-2.6.26-rc8-git1.bz2.sign, 1.1, NONE Message-ID: <200807011255.m61Ctn5H017602@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17510 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc8-git2.bz2.sign Removed Files: patch-2.6.26-rc8-git1.bz2.sign Log Message: 2.6.26-rc8-git2 --- NEW FILE patch-2.6.26-rc8-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIaS+NyGugalF9Dw4RArwgAJ0TiPHi2ZviFHrybgBlp8eXYfWxQACfUZfC +a1hmYBymsvFcds1P8s6IC8= =LWf8 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.847 retrieving revision 1.848 diff -u -r1.847 -r1.848 --- .cvsignore 30 Jun 2008 14:29:19 -0000 1.847 +++ .cvsignore 1 Jul 2008 12:54:37 -0000 1.848 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git1.bz2 +patch-2.6.26-rc8-git2.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.724 retrieving revision 1.725 diff -u -r1.724 -r1.725 --- kernel.spec 30 Jun 2008 22:39:57 -0000 1.724 +++ kernel.spec 1 Jul 2008 12:54:38 -0000 1.725 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 8 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Tue Jul 01 2008 Dave Jones +- 2.6.26-rc8-git2 + * Mon Jun 30 2008 Chuck Ebbert - Disable the selinux ecryptfs support patch; it broke ntfs-3g (#452438) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.808 retrieving revision 1.809 diff -u -r1.808 -r1.809 --- sources 30 Jun 2008 14:29:20 -0000 1.808 +++ sources 1 Jul 2008 12:54:38 -0000 1.809 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 db9fee832152a33946993459fc85a18f patch-2.6.26-rc8.bz2 -dd4e8910b0b58a7483213c410fd8864a patch-2.6.26-rc8-git1.bz2 +3ba514e2f28b675192a7b20f59b1c08a patch-2.6.26-rc8-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- upstream 30 Jun 2008 14:29:20 -0000 1.726 +++ upstream 1 Jul 2008 12:54:38 -0000 1.727 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git1.bz2 +patch-2.6.26-rc8-git2.bz2 --- patch-2.6.26-rc8-git1.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 12:57:11 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 12:57:11 GMT Subject: rpms/ocaml-pgocaml/devel ocaml-pgocaml.spec,1.1,1.2 Message-ID: <200807011257.m61CvBMu017666@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pgocaml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17625 Modified Files: ocaml-pgocaml.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 - Ignore Parsetree dep. - Bump release to -3 to solve EVR problems with F-9. Index: ocaml-pgocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/ocaml-pgocaml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-pgocaml.spec 12 May 2008 19:15:57 -0000 1.1 +++ ocaml-pgocaml.spec 1 Jul 2008 12:56:28 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-pgocaml Version: 1.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: OCaml library for type-safe access to PostgreSQL databases Group: Development/Libraries @@ -23,7 +23,7 @@ # The find-requires/provides scripts don't understand the packed # CalendarLib module well. Ignore the packed submodules. %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Parsetree -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description @@ -95,6 +95,10 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 +- Ignore Parsetree dep. +- Bump release to -3 to solve EVR problems with F-9. + * Tue Mar 4 2008 Richard W.M. Jones - 1.1-1 - New upstream release 1.1. - Clarify license is LGPLv2+ with exceptions. From fedora-extras-commits at redhat.com Tue Jul 1 13:05:28 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:05:28 GMT Subject: rpms/ocaml-pa-monad/F-8 ocaml-pa-monad.spec,1.2,1.3 Message-ID: <200807011305.m61D5Scu024665@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pa-monad/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24610 Modified Files: ocaml-pa-monad.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.2.0-5 - Ignore Asttypes & Parsetree dep. Index: ocaml-pa-monad.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pa-monad/F-8/ocaml-pa-monad.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-pa-monad.spec 14 May 2008 20:25:00 -0000 1.2 +++ ocaml-pa-monad.spec 1 Jul 2008 13:04:38 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-pa-monad Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml syntax extension for monads Group: Development/Libraries @@ -20,7 +20,7 @@ BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -62,6 +62,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.2.0-5 +- Ignore Asttypes & Parsetree dep. + * Wed May 14 2008 Richard W.M. Jones - 1.2.0-4 - ExcludeArch ppc64 (for F-8). From fedora-extras-commits at redhat.com Tue Jul 1 13:06:43 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:06:43 GMT Subject: rpms/ocaml-pa-monad/F-9 ocaml-pa-monad.spec,1.2,1.3 Message-ID: <200807011306.m61D6hRa024750@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pa-monad/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24688 Modified Files: ocaml-pa-monad.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.2.0-5 - Ignore Asttypes & Parsetree deps. Index: ocaml-pa-monad.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pa-monad/F-9/ocaml-pa-monad.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-pa-monad.spec 12 Jun 2008 09:16:02 -0000 1.2 +++ ocaml-pa-monad.spec 1 Jul 2008 13:05:52 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-pa-monad Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml syntax extension for monads Group: Development/Libraries @@ -18,7 +18,7 @@ BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -60,6 +60,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.2.0-5 +- Ignore Asttypes & Parsetree deps. + * Thu Jun 12 2008 Richard W.M. Jones - 1.2.0-4 - Bump version to fix package EVR problems between branches From fedora-extras-commits at redhat.com Tue Jul 1 13:08:32 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:08:32 GMT Subject: rpms/ocaml-pa-monad/devel ocaml-pa-monad.spec,1.1,1.2 Message-ID: <200807011308.m61D8Wa3024847@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pa-monad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24807 Modified Files: ocaml-pa-monad.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.2.0-5 - Ignore Asttypes & Parsetree deps. - Bump release to avoid EVR problems across branches. Index: ocaml-pa-monad.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pa-monad/devel/ocaml-pa-monad.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-pa-monad.spec 14 May 2008 20:19:39 -0000 1.1 +++ ocaml-pa-monad.spec 1 Jul 2008 13:07:49 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-pa-monad Version: 1.2.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: OCaml syntax extension for monads Group: Development/Libraries @@ -18,7 +18,7 @@ BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -60,6 +60,10 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.2.0-5 +- Ignore Asttypes & Parsetree deps. +- Bump release to avoid EVR problems across branches. + * Mon May 10 2008 Richard W.M. Jones - 1.2.0-3 - Added a check section. From fedora-extras-commits at redhat.com Tue Jul 1 13:14:25 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:14:25 GMT Subject: rpms/ocaml-openin/F-8 ocaml-openin.spec,1.2,1.3 Message-ID: <200807011314.m61DEPqO025263@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-openin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25175/F-8 Modified Files: ocaml-openin.spec Log Message: Ignore Asttypes & Parsetree deps. Index: ocaml-openin.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-openin/F-8/ocaml-openin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-openin.spec 4 Apr 2008 16:18:41 -0000 1.2 +++ ocaml-openin.spec 1 Jul 2008 13:13:42 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-openin Version: 20070524 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml syntax to locally open modules Group: Development/Libraries @@ -19,7 +19,7 @@ BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -70,6 +70,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 20070524-4 +- Ignore Asttypes & Parsetree deps. + * Fri Apr 4 2008 Richard W.M. Jones - 20070524-3 - ExcludeArch ppc64 (F-8 only). From fedora-extras-commits at redhat.com Tue Jul 1 13:14:38 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:14:38 GMT Subject: rpms/ocaml-openin/F-9 ocaml-openin.spec,1.2,1.3 Message-ID: <200807011314.m61DEckV025273@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-openin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25175/F-9 Modified Files: ocaml-openin.spec Log Message: Ignore Asttypes & Parsetree deps. Index: ocaml-openin.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-openin/F-9/ocaml-openin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-openin.spec 12 Jun 2008 09:10:50 -0000 1.2 +++ ocaml-openin.spec 1 Jul 2008 13:13:55 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-openin Version: 20070524 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml syntax to locally open modules Group: Development/Libraries @@ -18,7 +18,7 @@ BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -69,6 +69,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 20070524-4 +- Ignore Asttypes & Parsetree deps. + * Thu Jun 12 2008 Richard W.M. Jones - 20070524-3 - Bump version to fix package EVR problems between branches From fedora-extras-commits at redhat.com Tue Jul 1 13:14:51 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:14:51 GMT Subject: rpms/ocaml-openin/devel ocaml-openin.spec,1.2,1.3 Message-ID: <200807011314.m61DEpSO025292@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-openin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25175/devel Modified Files: ocaml-openin.spec Log Message: Ignore Asttypes & Parsetree deps. Index: ocaml-openin.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-openin/devel/ocaml-openin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-openin.spec 23 Apr 2008 11:10:56 -0000 1.2 +++ ocaml-openin.spec 1 Jul 2008 13:14:08 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-openin Version: 20070524 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml syntax to locally open modules Group: Development/Libraries @@ -18,7 +18,7 @@ BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -69,6 +69,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 20070524-4 +- Ignore Asttypes & Parsetree deps. + * Wed Apr 23 2008 Richard W.M. Jones - 20070524-3 - Rebuild for OCaml 3.10.2 From fedora-extras-commits at redhat.com Tue Jul 1 13:15:10 2008 From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek)) Date: Tue, 1 Jul 2008 13:15:10 GMT Subject: rpms/sblim-cmpi-base/devel .cvsignore, 1.2, 1.3 sblim-cmpi-base.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200807011315.m61DFAxg025345@cvs-int.fedora.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/sblim-cmpi-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25246 Modified Files: .cvsignore sblim-cmpi-base.spec sources Log Message: Update to 1.5.5, Spec file revision Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Jan 2006 21:20:04 -0000 1.2 +++ .cvsignore 1 Jul 2008 13:14:20 -0000 1.3 @@ -1 +1,2 @@ sblim-cmpi-base-1.5.4.tar.bz2 +sblim-cmpi-base-1.5.5.tar.bz2 Index: sblim-cmpi-base.spec =================================================================== RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sblim-cmpi-base.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sblim-cmpi-base.spec 19 Feb 2008 04:31:51 -0000 1.7 +++ sblim-cmpi-base.spec 1 Jul 2008 13:14:20 -0000 1.8 @@ -1,124 +1,179 @@ # # $Id$ # -# Package spec for sblim-cmpi-base - RedHat/Fedora Flavor +# Package spec for sblim-cmpi-base - Red Hat/Fedora Flavor # # Use this SPEC if building for a RH/Fedora System for usage with # OpenPegasus # -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define tog_pegasus_version 2:2.6.1-1 +%define sblim_testsuite_version 1.2.4-1 +%define provider_dir %{_libdir}/cmpi -Summary: SBLIM Base Providers +Summary: SBLIM CMPI Base Providers Name: sblim-cmpi-base -Version: 1.5.4 -Release: 8%{?dist} -Group: Systems Management/Base +Version: 1.5.5 +Release: 1%{?dist} +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.sblim.org License: CPL - Source0: http://download.sourceforge.net/pub/sourceforge/s/sb/sblim/%{name}-%{version}.tar.bz2 +BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version} +Requires: tog-pegasus -BuildRequires: tog-pegasus-devel >= 2.5 -Requires: tog-pegasus >= 2.5.1 - -%Description -Standards Based Linux Instrumentation Base CMPI Providers for -System-related CIM classes - -%Package devel -Summary: SBLIM Base Instrumentation Header Development Files -Group: Systems Management/Base +%description +SBLIM (Standards Based Linux Instrumentation for Manageability) +CMPI (Common Manageability Programming Interface) Base Providers +for System-Related CIM (Common Information Model) classes + +%package devel +Summary: SBLIM CMPI Base Providers Development Header Files +Group: Development/Libraries +BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version} Requires: %{name} = %{version}-%{release} +Requires: tog-pegasus -%Description devel -SBLIM Base Provider Development Package contains header files and -link libraries for dependent provider packages - -%Package test -Summary: SBLIM Base Instrumentation Testcase Files -Group: Systems Management/Base +%description devel +SBLIM (Standards Based Linux Instrumentation for Manageability) +CMPI (Common Manageability Programming Interface) Base Provider +development header files and link libraries + +%package test +Summary: SBLIM CMPI Base Providers Test Cases +Group: Applications/System +BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version} Requires: %{name} = %{version}-%{release} -Requires: sblim-testsuite +Requires: sblim-testsuite = %{sblim_testsuite_version} +Requires: tog-pegasus -%Description test -SBLIM Base Provider Testcase Files for the SBLIM Testsuite +%description test +SBLIM (Standards Based Linux Instrumentation for Manageability) +CMPI (Common Manageability Programming Interface) Base Provider +Testcase Files for the SBLIM Testsuite %prep - %setup -q %build - %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \ - CIMSERVER=pegasus -make %{?_smp_mflags} + PROVIDERDIR=%{provider_dir} \ + CIMSERVER=pegasus +make %install - rm -rf $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT install - +cp -fp *OSBase_UnixProcess.h $RPM_BUILD_ROOT/%{_includedir}/sblim +chmod 644 $RPM_BUILD_ROOT/%{_includedir}/sblim/*OSBase_UnixProcess.h # remove unused libtool files rm -f $RPM_BUILD_ROOT/%{_libdir}/*a rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a %pre - %define SCHEMA %{_datadir}/%{name}/Linux_Base.mof %define REGISTRATION %{_datadir}/%{name}/Linux_Base.registration - # If upgrading, deregister old version if [ $1 -gt 1 ] then - %{_datadir}/%{name}/provider-register.sh -d -t pegasus \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1 || :; + %{_datadir}/%{name}/provider-register.sh \ + -d -t pegasus \ + -m %{SCHEMA} \ + -r %{REGISTRATION} > /dev/null 2>&1 || :; + # don't let registration failure when server not running fail upgrade! fi %post -# Register Schema and Provider - this is higly provider specific - -%{_datadir}/%{name}/provider-register.sh -t pegasus \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1 || :; - /sbin/ldconfig +if [ $1 -ge 1 ] +then +# Register Schema and Provider - this is higly provider specific + %{_datadir}/%{name}/provider-register.sh \ + -t pegasus \ + -m %{SCHEMA} \ + -r %{REGISTRATION} > /dev/null 2>&1 || :; + # don't let registration failure when server not running fail install! +fi %preun # Deregister only if not upgrading if [ $1 -eq 0 ] then - %{_datadir}/%{name}/provider-register.sh -d -t pegasus \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1 || :; + %{_datadir}/sblim-cmpi-base/provider-register.sh \ + -d -t pegasus \ + -m %{SCHEMA} \ + -r %{REGISTRATION} > /dev/null 2>&1 || :; + # don't let registration failure when server not running fail erase! fi -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig %clean - rm -rf $RPM_BUILD_ROOT %files - -%defattr(-,root,root) +%defattr(0644,root,pegasus,0755) %docdir %{_datadir}/doc/%{name}-%{version} -%{_datadir}/%{name} %{_datadir}/doc/%{name}-%{version} -%{_libdir}/*.so.* -%{_libdir}/cmpi/*.so +%defattr(-,root,pegasus,0755) +%{_datadir}/%{name} +%defattr(0750,root,pegasus,0750) +%{_libdir}/libcmpiOSBase_Common.so.* +%{_libdir}/libdmi*.so.* +%{provider_dir}/libcmpiOSBase_BaseBoardProvider.so +%{provider_dir}/libcmpiOSBase_CSBaseBoardProvider.so +%{provider_dir}/libcmpiOSBase_CSProcessorProvider.so +%{provider_dir}/libcmpiOSBase_ComputerSystemProvider.so +%{provider_dir}/libcmpiOSBase_OSProcessProvider.so +%{provider_dir}/libcmpiOSBase_OperatingSystemProvider.so +%{provider_dir}/libcmpiOSBase_OperatingSystemStatisticalDataProvider.so +%{provider_dir}/libcmpiOSBase_OperatingSystemStatisticsProvider.so +%{provider_dir}/libcmpiOSBase_ProcessorProvider.so +%{provider_dir}/libcmpiOSBase_RunningOSProvider.so +%{provider_dir}/libcmpiOSBase_UnixProcessProvider.so %files devel - -%defattr(-,root,root) -%{_includedir}/* -%{_libdir}/*.so +%defattr(0644,root,pegasus,0755) +%dir %{_includedir}/sblim +%{_includedir}/sblim/*Base_Common.h +%{_includedir}/sblim/*OSBase_UnixProcess.h +%{_libdir}/libdmi*.so +%defattr(0750,root,pegasus,0750) +%{_libdir}/libcmpiOSBase_Common.so %files test - -%defattr(-,root,root) -%{_datadir}/sblim-testsuite +%defattr(-,root,pegasus,0755) +%{_datadir}/sblim-testsuite/test-cmpi-base.sh +%{_datadir}/sblim-testsuite/system/linux/createKeyFiles.sh +%{_datadir}/sblim-testsuite/system/linux/Linux_ComputerSystem.system +%{_datadir}/sblim-testsuite/system/linux/Linux_CSProcessor.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystemStatisticalData.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystemStatistics.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystem.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystem.version.sh +%{_datadir}/sblim-testsuite/system/linux/Linux_OSProcess.system +%{_datadir}/sblim-testsuite/system/linux/Linux_Processor.pl +%{_datadir}/sblim-testsuite/system/linux/Linux_Processor.system +%{_datadir}/sblim-testsuite/system/linux/Linux_RunningOS.system +%{_datadir}/sblim-testsuite/system/linux/Linux_UnixProcess.pl +%{_datadir}/sblim-testsuite/system/linux/Linux_UnixProcess.system +%{_datadir}/sblim-testsuite/cim/Linux_ComputerSystem.cim +%{_datadir}/sblim-testsuite/cim/Linux_CSProcessor.cim +%{_datadir}/sblim-testsuite/cim/Linux_OperatingSystem.cim +%{_datadir}/sblim-testsuite/cim/Linux_OperatingSystemStatisticalData.cim +%{_datadir}/sblim-testsuite/cim/Linux_OperatingSystemStatistics.cim +%{_datadir}/sblim-testsuite/cim/Linux_OSProcess.cim +%{_datadir}/sblim-testsuite/cim/Linux_Processor.cim +%{_datadir}/sblim-testsuite/cim/Linux_RunningOS.cim +%{_datadir}/sblim-testsuite/cim/Linux_UnixProcess.cim %changelog +* Tue Jul 1 2008 Vitezslav Crhonek - 1.5.5-1 +- Update to 1.5.5 +- Spec file revision + * Mon Feb 18 2008 Fedora Release Engineering - 1.5.4-8 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Jan 2006 21:20:04 -0000 1.2 +++ sources 1 Jul 2008 13:14:20 -0000 1.3 @@ -1 +1 @@ -10d9959925e9a416928dce18532855dc sblim-cmpi-base-1.5.4.tar.bz2 +9dd46335c4e2a17b8150e0551fe84865 sblim-cmpi-base-1.5.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 13:20:22 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:20:22 GMT Subject: rpms/ocaml-json-static/F-9 ocaml-json-static.spec,1.2,1.3 Message-ID: <200807011320.m61DKM5t025774@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-json-static/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25656/F-9 Modified Files: ocaml-json-static.spec Log Message: Ignore Asttypes & Parsetree deps. Index: ocaml-json-static.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-static/F-9/ocaml-json-static.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-json-static.spec 12 Jun 2008 09:05:13 -0000 1.2 +++ ocaml-json-static.spec 1 Jul 2008 13:19:34 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-json-static Version: 0.9.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml JSON validator and converter (syntax extension) Group: Development/Libraries @@ -23,7 +23,7 @@ Requires: ocaml-json-wheel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -61,6 +61,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 0.9.6-5 +- Ignore Asttypes & Parsetree deps. + * Thu Jun 12 2008 Richard W.M. Jones - 0.9.6-4 - Bump version to fix package EVR problems between branches From fedora-extras-commits at redhat.com Tue Jul 1 13:20:33 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:20:33 GMT Subject: rpms/ocaml-json-static/F-8 ocaml-json-static.spec,1.2,1.3 Message-ID: <200807011320.m61DKXk4025783@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-json-static/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25656/F-8 Modified Files: ocaml-json-static.spec Log Message: Ignore Asttypes & Parsetree deps. Index: ocaml-json-static.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-static/F-8/ocaml-json-static.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-json-static.spec 13 May 2008 18:26:52 -0000 1.2 +++ ocaml-json-static.spec 1 Jul 2008 13:19:11 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-json-static Version: 0.9.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml JSON validator and converter (syntax extension) Group: Development/Libraries @@ -25,7 +25,7 @@ Requires: ocaml-json-wheel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -63,6 +63,9 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 0.9.6-5 +- Ignore Asttypes & Parsetree deps. + * Tue May 13 2008 Richard W.M. Jones - 0.9.6-4 - ExcludeArch ppc64 (only for F-8). From fedora-extras-commits at redhat.com Tue Jul 1 13:20:36 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 13:20:36 GMT Subject: rpms/ocaml-json-static/devel ocaml-json-static.spec,1.1,1.2 Message-ID: <200807011320.m61DKaWG025788@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-json-static/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25656/devel Modified Files: ocaml-json-static.spec Log Message: Ignore Asttypes & Parsetree deps. Index: ocaml-json-static.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/ocaml-json-static.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-json-static.spec 13 May 2008 18:24:39 -0000 1.1 +++ ocaml-json-static.spec 1 Jul 2008 13:19:52 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-json-static Version: 0.9.6 -Release: 3%{?dist} +Release: 5%{?dist} Summary: OCaml JSON validator and converter (syntax extension) Group: Development/Libraries @@ -23,7 +23,7 @@ Requires: ocaml-json-wheel %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -61,6 +61,10 @@ %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 0.9.6-5 +- Ignore Asttypes & Parsetree deps. +- Bump release to -5 to avoid upgrade problems between releases. + * Mon May 10 2008 Richard W.M. Jones - 0.9.6-3 - Fixed the description. From fedora-extras-commits at redhat.com Tue Jul 1 13:24:43 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 1 Jul 2008 13:24:43 GMT Subject: rpms/asterisk/F-8 .cvsignore, 1.15, 1.16 asterisk-strip.sh, 1.2, 1.3 asterisk.spec, 1.19, 1.20 sources, 1.15, 1.16 Message-ID: <200807011324.m61DOhbH026084@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26035 Modified Files: .cvsignore asterisk-strip.sh asterisk.spec sources Log Message: * Thu Jul 1 2008 Jeffrey C. Ollie - 1.4.21.1-1 - Update to 1.4.21.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 12 Jun 2008 18:28:50 -0000 1.15 +++ .cvsignore 1 Jul 2008 13:23:50 -0000 1.16 @@ -1 +1 @@ -asterisk-1.4.21-stripped.tar.gz +asterisk-1.4.21.1-stripped.tar.gz Index: asterisk-strip.sh =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk-strip.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- asterisk-strip.sh 2 Apr 2008 23:26:01 -0000 1.2 +++ asterisk-strip.sh 1 Jul 2008 13:23:50 -0000 1.3 @@ -11,11 +11,12 @@ tar czf asterisk-$version-stripped.tar.gz asterisk-$version rm -rf asterisk-$version -echo "MD5 Sums" -echo "========" -md5sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz -echo -echo "SHA1 Sums" -echo "=========" -sha1sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz +echo "# MD5 Sums" +echo "# ========" +md5sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /' +echo "#" +echo "# SHA1 Sums" +echo "# =========" +sha1sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /' + Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- asterisk.spec 12 Jun 2008 18:28:50 -0000 1.19 +++ asterisk.spec 1 Jul 2008 13:23:50 -0000 1.20 @@ -2,7 +2,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 1.4.21 +Version: 1.4.21.1 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -17,15 +17,14 @@ # MD5 Sums # ======== -# c4cf69eb6eae3105806b08d3efc28ec7 asterisk-1.4.21.tar.gz -# 4039033d95c32441a9eb4a1712262aec asterisk-1.4.21-stripped.tar.gz -# +# dfa1b73587aa74b36caaf4811cfe610e asterisk-1.4.21.1.tar.gz +# 51caedfdd9d92b9f2dc02c584ab7d7de asterisk-1.4.21.1-stripped.tar.gz +# # SHA1 Sums # ========= -# dc8a15e1cd1a1fc7eccff35a6208d1a0dff051b6 asterisk-1.4.21.tar.gz -# 7c73ea107c9ba32b9e6573fd9f99fe5ba5cf3d67 asterisk-1.4.21-stripped.tar.gz +# dcd21c7b242487742a595a4d9d847c33ef2041d8 asterisk-1.4.21.1.tar.gz +# df4a8c6d7c75df01e4bb399bf4f5f6ba6466a522 asterisk-1.4.21.1-stripped.tar.gz -#Source0: http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}.tar.gz Source0: asterisk-%{version}-stripped.tar.gz Source1: asterisk-logrotate Source2: menuselect.makedeps @@ -902,6 +901,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Thu Jul 1 2008 Jeffrey C. Ollie - 1.4.21.1-1 +- Update to 1.4.21.1 + * Thu Jun 12 2008 Jeffrey C. Ollie - 1.4.21-1 - Update to final 1.4.21 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 12 Jun 2008 18:28:50 -0000 1.15 +++ sources 1 Jul 2008 13:23:50 -0000 1.16 @@ -1 +1 @@ -4039033d95c32441a9eb4a1712262aec asterisk-1.4.21-stripped.tar.gz +51caedfdd9d92b9f2dc02c584ab7d7de asterisk-1.4.21.1-stripped.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 13:41:09 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 1 Jul 2008 13:41:09 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.184, 1.185 selinux-policy.spec, 1.690, 1.691 Message-ID: <200807011341.m61Df9s2026967@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Tue Jul 1 2008 Dan Walsh 3.3.1-74 - Make virtd an unconfined domain policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- policy-20071130.patch 30 Jun 2008 21:12:48 -0000 1.184 +++ policy-20071130.patch 1 Jul 2008 13:40:13 -0000 1.185 @@ -34335,7 +34335,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.3.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-06-27 07:06:25.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-07-01 08:32:06.000000000 -0400 @@ -29,9 +29,14 @@ ') @@ -36911,7 +36911,7 @@ ######################################## ## -@@ -5509,6 +5904,42 @@ +@@ -5509,6 +5904,43 @@ ######################################## ## @@ -36928,6 +36928,7 @@ + type user_tmp_t; + ') + ++ files_search_tmp($1) + manage_files_pattern($1, user_tmp_t, user_tmp_t) +') + @@ -36954,7 +36955,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5559,7 +5990,7 @@ +@@ -5559,7 +5991,7 @@ attribute userdomain; ') @@ -36963,7 +36964,7 @@ kernel_search_proc($1) ') -@@ -5674,6 +6105,42 @@ +@@ -5674,6 +6106,42 @@ ######################################## ## @@ -37006,7 +37007,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6171,408 @@ +@@ -5704,3 +6172,408 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') @@ -38084,8 +38085,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.3.1/policy/modules/system/virt.te --- nsaserefpolicy/policy/modules/system/virt.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-06-22 06:50:55.000000000 -0400 -@@ -0,0 +1,199 @@ ++++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-07-01 09:38:43.000000000 -0400 +@@ -0,0 +1,204 @@ + +policy_module(virt,1.0.0) + @@ -38202,6 +38203,7 @@ +files_read_usr_files(virtd_t) +files_read_etc_runtime_files(virtd_t) +files_search_all(virtd_t) ++files_list_kernel_modules(virtd_t) + +fs_list_auto_mountpoints(virtd_t) + @@ -38285,6 +38287,10 @@ + fs_manage_cifs_files(virtd_t) + fs_read_cifs_symlinks(virtd_t) +') ++ ++optional_policy(` ++ unconfined_domain(virtd_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.3.1/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2008-06-12 23:38:01.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/system/xen.if 2008-06-22 08:04:22.000000000 -0400 Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.690 retrieving revision 1.691 diff -u -r1.690 -r1.691 --- selinux-policy.spec 30 Jun 2008 21:12:48 -0000 1.690 +++ selinux-policy.spec 1 Jul 2008 13:40:13 -0000 1.691 @@ -385,6 +385,9 @@ %endif %changelog +* Tue Jul 1 2008 Dan Walsh 3.3.1-74 +- Make virtd an unconfined domain + * Mon Jun 29 2008 Dan Walsh 3.3.1-73 - Allow exim to use system_cron pipes - Allow gdm to read rpm database From fedora-extras-commits at redhat.com Tue Jul 1 13:42:05 2008 From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek)) Date: Tue, 1 Jul 2008 13:42:05 GMT Subject: rpms/sblim-cmpi-base/F-9 sblim-cmpi-base.spec,1.7,1.8 Message-ID: <200807011342.m61Dg5MB027163@cvs-int.fedora.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/sblim-cmpi-base/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26943 Modified Files: sblim-cmpi-base.spec Log Message: Fix sblim-cmpi-base failed massrebuild attempt for GCC 4.3 Index: sblim-cmpi-base.spec =================================================================== RCS file: /cvs/extras/rpms/sblim-cmpi-base/F-9/sblim-cmpi-base.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sblim-cmpi-base.spec 19 Feb 2008 04:31:51 -0000 1.7 +++ sblim-cmpi-base.spec 1 Jul 2008 13:40:59 -0000 1.8 @@ -12,7 +12,7 @@ Summary: SBLIM Base Providers Name: sblim-cmpi-base Version: 1.5.4 -Release: 8%{?dist} +Release: 9%{?dist} Group: Systems Management/Base URL: http://www.sblim.org License: CPL @@ -52,7 +52,7 @@ %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \ CIMSERVER=pegasus -make %{?_smp_mflags} +make %install @@ -119,6 +119,10 @@ %{_datadir}/sblim-testsuite %changelog +* Tue Jul 1 2008 Vitezslav Crhonek - 1.5.4-9 +- Fix sblim-cmpi-base failed massrebuild attempt for GCC 4.3 + Resolves: #434128 + * Mon Feb 18 2008 Fedora Release Engineering - 1.5.4-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 1 13:42:22 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 1 Jul 2008 13:42:22 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch,1.26,1.27 Message-ID: <200807011342.m61DgMVd027194@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27027 Modified Files: policy-20080509.patch Log Message: * Sun Jun 29 2008 Dan Walsh 3.4.2-9 - Allow gdm to read rpm database - Allow nsplugin to read mplayer config files policy-20080509.patch: Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- policy-20080509.patch 30 Jun 2008 21:12:23 -0000 1.26 +++ policy-20080509.patch 1 Jul 2008 13:41:30 -0000 1.27 @@ -2626,7 +2626,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.4.2/policy/modules/apps/gpg.te --- nsaserefpolicy/policy/modules/apps/gpg.te 2008-06-12 23:25:03.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/apps/gpg.te 2008-06-12 23:37:51.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/apps/gpg.te 2008-07-01 08:30:42.000000000 -0400 @@ -15,15 +15,251 @@ gen_tunable(gpg_agent_env_file, false) @@ -8239,7 +8239,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.if serefpolicy-3.4.2/policy/modules/roles/unprivuser.if --- nsaserefpolicy/policy/modules/roles/unprivuser.if 2008-06-12 23:25:06.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/roles/unprivuser.if 2008-06-24 05:57:35.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/roles/unprivuser.if 2008-07-01 08:30:34.000000000 -0400 @@ -62,6 +62,26 @@ files_home_filetrans($1,user_home_dir_t,dir) ') @@ -8353,7 +8353,7 @@ ') ######################################## -@@ -323,3 +340,553 @@ +@@ -323,3 +340,555 @@ manage_sock_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') @@ -8521,6 +8521,7 @@ + type user_tmp_t; + ') + ++ files_search_tmp($1) + manage_files_pattern($1, user_tmp_t, user_tmp_t) +') + @@ -8539,6 +8540,7 @@ + type user_tmp_t; + ') + ++ files_search_tmp($1) + manage_lnk_files_pattern($1, user_tmp_t, user_tmp_t) +') + @@ -36613,8 +36615,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.4.2/policy/modules/system/virt.te --- nsaserefpolicy/policy/modules/system/virt.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/policy/modules/system/virt.te 2008-06-22 06:51:23.000000000 -0400 -@@ -0,0 +1,198 @@ ++++ serefpolicy-3.4.2/policy/modules/system/virt.te 2008-07-01 09:38:45.000000000 -0400 +@@ -0,0 +1,203 @@ + +policy_module(virt,1.0.0) + @@ -36731,6 +36733,7 @@ +files_read_usr_files(virtd_t) +files_read_etc_runtime_files(virtd_t) +files_search_all(virtd_t) ++files_list_kernel_modules(virtd_t) + +fs_list_auto_mountpoints(virtd_t) + @@ -36813,6 +36816,10 @@ + fs_manage_cifs_files(virtd_t) + fs_read_cifs_symlinks(virtd_t) +') ++ ++optional_policy(` ++ unconfined_domain(virtd_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.4.2/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2008-06-12 23:25:07.000000000 -0400 +++ serefpolicy-3.4.2/policy/modules/system/xen.fc 2008-06-12 23:37:52.000000000 -0400 From fedora-extras-commits at redhat.com Tue Jul 1 13:42:35 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 1 Jul 2008 13:42:35 GMT Subject: rpms/selinux-policy/F-9 selinux-policy.spec,1.691,1.692 Message-ID: <200807011342.m61DgZrs027234@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27099 Modified Files: selinux-policy.spec Log Message: * Tue Jul 1 2008 Dan Walsh 3.3.1-74 - Make virtd an unconfined domain Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.691 retrieving revision 1.692 diff -u -r1.691 -r1.692 --- selinux-policy.spec 1 Jul 2008 13:40:13 -0000 1.691 +++ selinux-policy.spec 1 Jul 2008 13:41:47 -0000 1.692 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 73%{?dist} +Release: 74%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz From fedora-extras-commits at redhat.com Tue Jul 1 13:45:08 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 1 Jul 2008 13:45:08 GMT Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.370,1.371 Message-ID: <200807011345.m61Dj8eP027597@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27541 Modified Files: policycoreutils-rhat.patch Log Message: Updated seobject.py policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.370 retrieving revision 1.371 diff -u -r1.370 -r1.371 --- policycoreutils-rhat.patch 30 Jun 2008 20:51:23 -0000 1.370 +++ policycoreutils-rhat.patch 1 Jul 2008 13:44:20 -0000 1.371 @@ -1,15 +1,15 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.49/Makefile +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.50/Makefile --- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/Makefile 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/Makefile 2008-07-01 09:43:28.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.49/restorecond/restorecond.c +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.50/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/restorecond/restorecond.c 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/restorecond/restorecond.c 2008-07-01 09:43:28.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -36,9 +36,9 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.49/restorecond/restorecond.init +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.50/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/restorecond/restorecond.init 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/restorecond/restorecond.init 2008-07-01 09:43:28.000000000 -0400 @@ -2,7 +2,7 @@ # # restorecond: Daemon used to maintain path file context @@ -48,9 +48,9 @@ # description: restorecond uses inotify to look for creation of new files \ # listed in the /etc/selinux/restorecond.conf file, and restores the \ # correct security context. -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.49/scripts/fixfiles +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.50/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/scripts/fixfiles 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/scripts/fixfiles 2008-07-01 09:43:28.000000000 -0400 @@ -138,6 +138,9 @@ fi LogReadOnly @@ -80,9 +80,9 @@ } if [ $# = 0 ]; then -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.49/scripts/fixfiles.8 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.50/scripts/fixfiles.8 --- nsapolicycoreutils/scripts/fixfiles.8 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/scripts/fixfiles.8 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/scripts/fixfiles.8 2008-07-01 09:43:28.000000000 -0400 @@ -7,6 +7,8 @@ .B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ] @@ -102,9 +102,9 @@ .SH "OPTIONS" .TP -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.49/semanage/semanage +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.50/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/semanage/semanage 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/semanage 2008-07-01 09:43:28.000000000 -0400 @@ -43,49 +43,52 @@ if __name__ == '__main__': @@ -230,9 +230,9 @@ sys.exit(0); if modify: -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.49/semanage/semanage.8 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.50/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/semanage/semanage.8 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/semanage.8 2008-07-01 09:43:28.000000000 -0400 @@ -17,6 +17,8 @@ .br .B semanage fcontext \-{a|d|m} [\-frst] file_spec @@ -255,9 +255,9 @@ Russell Coker . Examples by Thomas Bleher . - -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.49/semanage/seobject.py +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.50/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/semanage/seobject.py 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/seobject.py 2008-07-01 09:43:52.000000000 -0400 @@ -1,5 +1,5 @@ #! /usr/bin/python -E -# Copyright (C) 2005, 2006, 2007 Red Hat @@ -275,7 +275,7 @@ import gettext gettext.bindtextdomain(PROGNAME, "/usr/share/locale") gettext.textdomain(PROGNAME) -@@ -246,7 +248,67 @@ +@@ -246,7 +248,98 @@ os.close(fd) os.rename(newfilename, self.filename) os.system("/sbin/service mcstrans reload > /dev/null") @@ -284,6 +284,28 @@ +class permissiveRecords: + def __init__(self, store): + self.store = store ++ self.sh = semanage_handle_create() ++ if not self.sh: ++ raise ValueError(_("Could not create semanage handle")) ++ ++ if store != "": ++ semanage_select_store(self.sh, store, SEMANAGE_CON_DIRECT); ++ ++ self.semanaged = semanage_is_managed(self.sh) ++ ++ if not self.semanaged: ++ semanage_handle_destroy(self.sh) ++ raise ValueError(_("SELinux policy is not managed or store cannot be accessed.")) ++ ++ rc = semanage_access_check(self.sh) ++ if rc < SEMANAGE_CAN_READ: ++ semanage_handle_destroy(self.sh) ++ raise ValueError(_("Cannot read policy store.")) ++ ++ rc = semanage_connect(self.sh) ++ if rc < 0: ++ semanage_handle_destroy(self.sh) ++ raise ValueError(_("Could not establish semanage connection")) + + def get_all(self): + rc, out = commands.getstatusoutput("semodule -l | grep ^permissive"); @@ -319,8 +341,15 @@ + fd.close() + mc = module.ModuleCompiler() + mc.create_module_package(filename, 1) -+ rc, out = commands.getstatusoutput("semodule -i permissive_%s.pp" % type); -+ for root, dirs, files in os.walk("top", topdown=False): ++ fd = open("permissive_%s.pp" % type) ++ data = fd.read() ++ fd.close() ++ ++ rc = semanage_module_install(self.sh, data, len(data)); ++ rc = semanage_commit(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not set permissive domain %s") % name) ++ for root, dirs, files in os.walk("tmp", topdown=False): + for name in files: + os.remove(os.path.join(root, name)) + for name in dirs: @@ -331,9 +360,11 @@ + + + def delete(self, name): -+ rc, out = commands.getstatusoutput("semodule -r permissive_%s" % name ); -+ if rc != 0: -+ raise ValueError(out) ++ for i in name.split ++ rc = semanage_module_remove(self.sh, "permissive_%s" % name) ++ rc = semanage_commit(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not remove permissive domain %s") % name) + + def deleteall(self): + l = self.get_all() @@ -344,7 +375,7 @@ class semanageRecords: def __init__(self, store): self.sh = semanage_handle_create() -@@ -464,7 +526,7 @@ +@@ -464,7 +557,7 @@ def __init__(self, store = ""): semanageRecords.__init__(self, store) From fedora-extras-commits at redhat.com Tue Jul 1 13:47:30 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Tue, 1 Jul 2008 13:47:30 GMT Subject: rpms/vsftpd/devel vsftpd-1.2.1-nonrootconf.patch, 1.2, 1.3 vsftpd.spec, 1.81, 1.82 vsftpd-2.0.5-file_stat.patch, 1.1, NONE Message-ID: <200807011347.m61DlUsg027711@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/vsftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647 Modified Files: vsftpd-1.2.1-nonrootconf.patch vsftpd.spec Removed Files: vsftpd-2.0.5-file_stat.patch Log Message: Fix memory leak in nonrootconf patch and merge it with file_stat patch. vsftpd-1.2.1-nonrootconf.patch: Index: vsftpd-1.2.1-nonrootconf.patch =================================================================== RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-1.2.1-nonrootconf.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vsftpd-1.2.1-nonrootconf.patch 30 Nov 2007 13:34:01 -0000 1.2 +++ vsftpd-1.2.1-nonrootconf.patch 1 Jul 2008 13:46:33 -0000 1.3 @@ -1,29 +1,6 @@ ---- vsftpd-2.0.1/twoprocess.c.nonrootconf 2004-07-02 18:47:51.000000000 +0200 -+++ vsftpd-2.0.1/twoprocess.c 2005-02-08 09:37:26.641905544 +0100 -@@ -416,11 +416,17 @@ - str_append_char(&filename_str, '/'); - str_append_str(&filename_str, p_user_str); - retval = str_stat(&filename_str, &p_statbuf); -- /* Security - ignore unless owned by root */ -- if (!vsf_sysutil_retval_is_error(retval) && -- vsf_sysutil_statbuf_get_uid(p_statbuf) == VSFTP_ROOT_UID) -+ /* Security - die unless owned by root */ -+ if (!vsf_sysutil_retval_is_error(retval)) - { -- vsf_parseconf_load_file(str_getbuf(&filename_str), 1); -+ if (vsf_sysutil_statbuf_get_uid(p_statbuf) == VSFTP_ROOT_UID) -+ { -+ vsf_parseconf_load_file(str_getbuf(&filename_str), 1); -+ } -+ else -+ { -+ die("reading non-root config file"); -+ } - } - str_free(&filename_str); - vsf_sysutil_free(p_statbuf); ---- vsftpd-2.0.1/parseconf.c.nonrootconf 2004-07-02 13:23:56.000000000 +0200 -+++ vsftpd-2.0.1/parseconf.c 2005-02-08 09:37:26.642905392 +0100 +diff -up vsftpd-2.0.6/parseconf.c.nonrootconf vsftpd-2.0.6/parseconf.c +--- vsftpd-2.0.6/parseconf.c.nonrootconf 2008-02-12 05:53:32.000000000 +0100 ++++ vsftpd-2.0.6/parseconf.c 2008-07-01 12:28:12.000000000 +0200 @@ -15,6 +15,7 @@ #include "defs.h" #include "sysutil.h" @@ -32,7 +9,7 @@ static const char* s_p_saved_filename; static int s_strings_copied; -@@ -167,6 +168,8 @@ +@@ -182,6 +183,8 @@ vsf_parseconf_load_file(const char* p_fi struct mystr config_file_str = INIT_MYSTR; struct mystr config_setting_str = INIT_MYSTR; struct mystr config_value_str = INIT_MYSTR; @@ -41,20 +18,54 @@ unsigned int str_pos = 0; int retval; if (!p_filename) -@@ -195,7 +198,9 @@ +@@ -210,7 +213,9 @@ vsf_parseconf_load_file(const char* p_fi copy_string_settings(); } retval = str_fileread(&config_file_str, p_filename, VSFTP_CONF_FILE_MAX); - if (vsf_sysutil_retval_is_error(retval)) -+ (int)str_stat(&config_file_str, &p_statbuf); ++ (int)vsf_sysutil_stat(p_filename, &p_statbuf); + /* Security - die unless the conf file is owned by root */ + if (vsf_sysutil_retval_is_error(retval) || vsf_sysutil_statbuf_get_uid(p_statbuf) != VSFTP_ROOT_UID) { if (errs_fatal) { ---- vsftpd-2.0.1/vsftpd.8.nonrootconf 2005-02-08 09:37:26.000000000 +0100 -+++ vsftpd-2.0.1/vsftpd.8 2005-02-08 09:44:21.173887104 +0100 -@@ -28,7 +28,8 @@ +@@ -221,6 +226,7 @@ vsf_parseconf_load_file(const char* p_fi + return; + } + } ++ vsf_sysutil_free(p_statbuf); + while (str_getline(&config_file_str, &config_setting_str, &str_pos)) + { + if (str_isempty(&config_setting_str) || +diff -up vsftpd-2.0.6/twoprocess.c.nonrootconf vsftpd-2.0.6/twoprocess.c +--- vsftpd-2.0.6/twoprocess.c.nonrootconf 2008-02-12 04:18:34.000000000 +0100 ++++ vsftpd-2.0.6/twoprocess.c 2008-07-01 12:21:28.000000000 +0200 +@@ -423,11 +423,17 @@ handle_per_user_config(const struct myst + str_append_char(&filename_str, '/'); + str_append_str(&filename_str, p_user_str); + retval = str_stat(&filename_str, &p_statbuf); +- /* Security - ignore unless owned by root */ +- if (!vsf_sysutil_retval_is_error(retval) && +- vsf_sysutil_statbuf_get_uid(p_statbuf) == VSFTP_ROOT_UID) ++ /* Security - die unless owned by root */ ++ if (!vsf_sysutil_retval_is_error(retval)) + { +- vsf_parseconf_load_file(str_getbuf(&filename_str), 1); ++ if (vsf_sysutil_statbuf_get_uid(p_statbuf) == VSFTP_ROOT_UID) ++ { ++ vsf_parseconf_load_file(str_getbuf(&filename_str), 1); ++ } ++ else ++ { ++ die("reading non-root config file"); ++ } + } + str_free(&filename_str); + vsf_sysutil_free(p_statbuf); +diff -up vsftpd-2.0.6/vsftpd.8.nonrootconf vsftpd-2.0.6/vsftpd.8 +--- vsftpd-2.0.6/vsftpd.8.nonrootconf 2008-07-01 12:21:28.000000000 +0200 ++++ vsftpd-2.0.6/vsftpd.8 2008-07-01 12:21:28.000000000 +0200 +@@ -28,7 +28,8 @@ binary will then launch the FTP service .Sh OPTIONS An optional .Op configuration file Index: vsftpd.spec =================================================================== RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- vsftpd.spec 20 Jun 2008 21:03:03 -0000 1.81 +++ vsftpd.spec 1 Jul 2008 13:46:33 -0000 1.82 @@ -33,7 +33,6 @@ Patch21: vsftpd-2.0.5-correct_comments.patch Patch22: vsftpd-2.0.5-man.patch Patch23: vsftpd-2.0.4-filter.patch -Patch24: vsftpd-2.0.5-file_stat.patch Patch26: vsftpd-2.0.5-bind_denied.patch Patch29: vsftpd-2.0.5-pasv_dot.patch Patch30: vsftpd-2.0.5-pam_end.patch @@ -91,7 +90,6 @@ %patch21 -p1 -b .comments %patch22 -p1 -b .manp %patch23 -p1 -b .filter -%patch24 -p1 -b .file_stat %patch26 -p1 -b .bind_denied %patch29 -p1 -b .pasv_dot %patch30 -p1 -b .pam_end --- vsftpd-2.0.5-file_stat.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 14:02:12 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 14:02:12 GMT Subject: rpms/gcalctool/F-9 .cvsignore, 1.40, 1.41 gcalctool.spec, 1.65, 1.66 sources, 1.41, 1.42 Message-ID: <200807011402.m61E2CZR002372@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gcalctool/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320 Modified Files: .cvsignore gcalctool.spec sources Log Message: 5.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcalctool/F-9/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 28 May 2008 02:40:09 -0000 1.40 +++ .cvsignore 1 Jul 2008 14:01:27 -0000 1.41 @@ -1 +1 @@ -gcalctool-5.22.2.tar.bz2 +gcalctool-5.22.3.tar.bz2 Index: gcalctool.spec =================================================================== RCS file: /cvs/extras/rpms/gcalctool/F-9/gcalctool.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- gcalctool.spec 28 May 2008 02:48:56 -0000 1.65 +++ gcalctool.spec 1 Jul 2008 14:01:27 -0000 1.66 @@ -1,5 +1,5 @@ Name: gcalctool -Version: 5.22.2 +Version: 5.22.3 Release: 1%{?dist} Summary: A desktop calculator @@ -100,6 +100,9 @@ %changelog +* Tue Jul 1 2008 Matthias Clasen - 5.22.3-1 +- Update to 5.22.3 + * Tue May 27 2008 Matthias Clasen - 5.22.2-1 - Update to 5.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcalctool/F-9/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 28 May 2008 02:40:09 -0000 1.41 +++ sources 1 Jul 2008 14:01:27 -0000 1.42 @@ -1 +1 @@ -8389a1dd158110e6d0a44ccb772322f2 gcalctool-5.22.2.tar.bz2 +654a2d30f2a1c1b0e7b677fa772f87a3 gcalctool-5.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 14:12:46 2008 From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek)) Date: Tue, 1 Jul 2008 14:12:46 GMT Subject: rpms/m4/devel m4.spec,1.33,1.34 Message-ID: <200807011412.m61ECkLm002900@cvs-int.fedora.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/m4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2770 Modified Files: m4.spec Log Message: Merge review Index: m4.spec =================================================================== RCS file: /cvs/extras/rpms/m4/devel/m4.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- m4.spec 23 Apr 2008 11:09:55 -0000 1.33 +++ m4.spec 1 Jul 2008 14:10:16 -0000 1.34 @@ -1,7 +1,7 @@ Summary: The GNU macro processor Name: m4 Version: 1.4.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2 @@ -23,19 +23,19 @@ %prep %setup -q +chmod 644 COPYING %build %configure -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_infodir}/dir %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %{_bindir}/m4 %{_infodir}/* @@ -53,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 1 2008 Vitezslav Crhonek - 1.4.11-2 +- Merge review + Resolves: #226115 + * Wed Apr 23 2008 Vitezslav Crhonek - 1.4.11-1 - Update to m4-1.4.11 (removed vasnprintf patch, it's included in upstream source) From fedora-extras-commits at redhat.com Tue Jul 1 14:23:30 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 14:23:30 GMT Subject: rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.6,1.7 Message-ID: <200807011423.m61ENUrj003565@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3505 Modified Files: ocaml-bitmatch.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-1 - New upstream release 1.9.2. - Include C tools (requiring CIL) in a separate subpackage. Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ocaml-bitmatch.spec 21 May 2008 09:47:33 -0000 1.6 +++ ocaml-bitmatch.spec 1 Jul 2008 14:22:45 -0000 1.7 @@ -2,7 +2,7 @@ %define debug_package %{nil} Name: ocaml-bitmatch -Version: 1.3 +Version: 1.9.2 Release: 1%{?dist} Summary: OCaml library for matching and constructing bitstrings @@ -16,6 +16,7 @@ BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-cil-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree @@ -40,6 +41,17 @@ developing applications that use %{name}. +%package c +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + + +%description c +The %{name}-cil package contains tools for importing structs +from C code and header files into %{name}. + + %prep %setup -q @@ -53,6 +65,10 @@ make doc make examples +%if %opt +strip cil-tools/bitmatch-import-c.opt +%endif + %check make test @@ -65,6 +81,17 @@ mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install +# Install bitmatch-import-c by hand for now. +mkdir -p $RPM_BUILD_ROOT%{_bindir} +%if %opt +install -m 0755 cil-tools/bitmatch-import-c.opt $RPM_BUILD_ROOT%{_bindir}/bitmatch-import-c +%else +install -m 0755 cil-tools/bitmatch-import-c $RPM_BUILD_ROOT%{_bindir}/bitmatch-import-c +%endif + +# Install bitmatch-import-prefix.h by hand for now. +install -m 0644 cil-tools/bitmatch-import-prefix.h $OCAMLFIND_DESTDIR/bitmatch/ + %clean rm -rf $RPM_BUILD_ROOT @@ -80,6 +107,7 @@ %exclude %{_libdir}/ocaml/bitmatch/*.cmx %endif %exclude %{_libdir}/ocaml/bitmatch/*.mli +%exclude %{_libdir}/ocaml/bitmatch/*.h %files devel @@ -93,7 +121,17 @@ %{_libdir}/ocaml/bitmatch/*.mli +%files c +%defattr(-,root,root,-) +%doc COPYING.LIB cil-tools/ext3.c cil-tools/ext3.ml cil-tools/task_struct.c cil-tools/task_struct.ml +%{_bindir}/bitmatch-import-c +%exclude %{_libdir}/ocaml/bitmatch/*.h + %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-1 +- New upstream release 1.9.2. +- Include C tools (requiring CIL) in a separate subpackage. + * Wed May 21 2008 Richard W.M. Jones - 1.3-1 - New upstream release 1.3. From fedora-extras-commits at redhat.com Tue Jul 1 14:27:23 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 14:27:23 GMT Subject: rpms/ocaml-bitmatch/devel .cvsignore,1.7,1.8 sources,1.7,1.8 Message-ID: <200807011427.m61ERN6Z003901@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3816 Modified Files: .cvsignore sources Log Message: Uploaded sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2008 09:49:13 -0000 1.7 +++ .cvsignore 1 Jul 2008 14:26:35 -0000 1.8 @@ -1 +1,2 @@ ocaml-bitmatch-1.3.tar.gz +ocaml-bitmatch-1.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2008 09:49:13 -0000 1.7 +++ sources 1 Jul 2008 14:26:35 -0000 1.8 @@ -1 +1,2 @@ ac577325e7577fe9fe981e54f1747a94 ocaml-bitmatch-1.3.tar.gz +eda0df7009779eea3ec86f2bfffa696b ocaml-bitmatch-1.9.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 14:29:45 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 14:29:45 GMT Subject: rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.7,1.8 Message-ID: <200807011429.m61ETjuf004098@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4039 Modified Files: ocaml-bitmatch.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-2 - Force rebuild, forgot sources first time. Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ocaml-bitmatch.spec 1 Jul 2008 14:22:45 -0000 1.7 +++ ocaml-bitmatch.spec 1 Jul 2008 14:28:54 -0000 1.8 @@ -3,7 +3,7 @@ Name: ocaml-bitmatch Version: 1.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -128,6 +128,9 @@ %exclude %{_libdir}/ocaml/bitmatch/*.h %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-2 +- Force rebuild, forgot sources first time. + * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-1 - New upstream release 1.9.2. - Include C tools (requiring CIL) in a separate subpackage. From fedora-extras-commits at redhat.com Tue Jul 1 14:38:35 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 14:38:35 GMT Subject: rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.8,1.9 Message-ID: <200807011438.m61EcZfn004867@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4769 Modified Files: ocaml-bitmatch.spec Log Message: * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 - +BR ocaml-extlib-devel. Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ocaml-bitmatch.spec 1 Jul 2008 14:28:54 -0000 1.8 +++ ocaml-bitmatch.spec 1 Jul 2008 14:37:32 -0000 1.9 @@ -3,7 +3,7 @@ Name: ocaml-bitmatch Version: 1.9.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -17,6 +17,7 @@ BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-cil-devel +BuildRequires: ocaml-extlib-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree @@ -128,6 +129,9 @@ %exclude %{_libdir}/ocaml/bitmatch/*.h %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 +- +BR ocaml-extlib-devel. + * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-2 - Force rebuild, forgot sources first time. From fedora-extras-commits at redhat.com Tue Jul 1 14:39:33 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Tue, 1 Jul 2008 14:39:33 GMT Subject: rpms/iptables/F-8 iptables-1.4.1-cloexec.patch, NONE, 1.1 iptables-1.4.1-nf_ext_init.patch, NONE, 1.1 iptables.init, 1.20, 1.21 iptables.spec, 1.58, 1.59 sources, 1.20, 1.21 iptables-1.3.8-cloexec.patch, 1.1, NONE iptables-1.3.8-headers.patch, 1.1, NONE iptables-1.3.8-iptc.patch, 1.1, NONE iptables-1.3.8-limit_man.patch, 1.1, NONE iptables-1.3.8-reject_type.patch, 1.1, NONE Message-ID: <200807011439.m61EdXYA004989@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4851 Modified Files: iptables.init iptables.spec sources Added Files: iptables-1.4.1-cloexec.patch iptables-1.4.1-nf_ext_init.patch Removed Files: iptables-1.3.8-cloexec.patch iptables-1.3.8-headers.patch iptables-1.3.8-iptc.patch iptables-1.3.8-limit_man.patch iptables-1.3.8-reject_type.patch Log Message: - using new 1.4.1.1 package from devel iptables-1.4.1-cloexec.patch: --- NEW FILE iptables-1.4.1-cloexec.patch --- diff -up iptables-1.4.1-rc2/ip6tables-restore.c.cloexec iptables-1.4.1-rc2/ip6tables-restore.c --- iptables-1.4.1-rc2/ip6tables-restore.c.cloexec 2008-05-26 14:15:40.000000000 +0200 +++ iptables-1.4.1-rc2/ip6tables-restore.c 2008-06-05 13:55:09.000000000 +0200 @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s\n", argv[optind], strerror(errno)); diff -up iptables-1.4.1-rc2/ip6tables-save.c.cloexec iptables-1.4.1-rc2/ip6tables-save.c --- iptables-1.4.1-rc2/ip6tables-save.c.cloexec 2008-05-26 14:15:40.000000000 +0200 +++ iptables-1.4.1-rc2/ip6tables-save.c 2008-06-05 13:55:09.000000000 +0200 @@ -40,7 +40,7 @@ static int for_each_table(int (*func)(co FILE *procfile = NULL; char tablename[IP6T_TABLE_MAXNAMELEN+1]; - procfile = fopen("/proc/net/ip6_tables_names", "r"); + procfile = fopen("/proc/net/ip6_tables_names", "re"); if (!procfile) exit_error(OTHER_PROBLEM, "Unable to open /proc/net/ip6_tables_names: %s\n", diff -up iptables-1.4.1-rc2/iptables-restore.c.cloexec iptables-1.4.1-rc2/iptables-restore.c --- iptables-1.4.1-rc2/iptables-restore.c.cloexec 2008-05-26 14:15:40.000000000 +0200 +++ iptables-1.4.1-rc2/iptables-restore.c 2008-06-05 13:55:09.000000000 +0200 @@ -176,7 +176,7 @@ main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s\n", argv[optind], strerror(errno)); diff -up iptables-1.4.1-rc2/iptables-save.c.cloexec iptables-1.4.1-rc2/iptables-save.c --- iptables-1.4.1-rc2/iptables-save.c.cloexec 2008-05-26 14:15:40.000000000 +0200 +++ iptables-1.4.1-rc2/iptables-save.c 2008-06-05 13:55:09.000000000 +0200 @@ -38,7 +38,7 @@ static int for_each_table(int (*func)(co FILE *procfile = NULL; char tablename[IPT_TABLE_MAXNAMELEN+1]; - procfile = fopen("/proc/net/ip_tables_names", "r"); + procfile = fopen("/proc/net/ip_tables_names", "re"); if (!procfile) exit_error(OTHER_PROBLEM, "Unable to open /proc/net/ip_tables_names: %s\n", diff -up iptables-1.4.1-rc2/iptables-xml.c.cloexec iptables-1.4.1-rc2/iptables-xml.c --- iptables-1.4.1-rc2/iptables-xml.c.cloexec 2008-05-26 14:15:40.000000000 +0200 +++ iptables-1.4.1-rc2/iptables-xml.c 2008-06-05 13:55:09.000000000 +0200 @@ -664,7 +664,7 @@ main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s", argv[optind], strerror(errno)); diff -up iptables-1.4.1-rc2/xtables.c.cloexec iptables-1.4.1-rc2/xtables.c --- iptables-1.4.1-rc2/xtables.c.cloexec 2008-05-26 14:15:40.000000000 +0200 +++ iptables-1.4.1-rc2/xtables.c 2008-06-05 13:57:49.000000000 +0200 @@ -498,6 +498,12 @@ static int compatible_revision(const cha exit(1); } + if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) { + fprintf(stderr, "Could not set close on exec: %s\n", + strerror(errno)); + exit(1); + } + load_xtables_ko(modprobe_program, 1); strcpy(rev.name, name); iptables-1.4.1-nf_ext_init.patch: --- NEW FILE iptables-1.4.1-nf_ext_init.patch --- diff -up iptables-1.4.1-rc2/include/xtables.h.in.nf_ext_init iptables-1.4.1-rc2/include/xtables.h.in --- iptables-1.4.1-rc2/include/xtables.h.in.nf_ext_init 2008-06-05 14:13:49.000000000 +0200 +++ iptables-1.4.1-rc2/include/xtables.h.in 2008-06-05 14:14:03.000000000 +0200 @@ -199,13 +199,13 @@ extern void ip6parse_hostnetworkmask(con extern void save_string(const char *value); #ifdef NO_SHARED_LIBS -# ifdef _INIT -# undef _init -# define _init _INIT +# ifdef NF_EXT_INIT +# undef nf_ext_init +# define nf_ext_init NF_EXT_INIT # endif extern void init_extensions(void); #else -# define _init __attribute__((constructor)) _INIT +# define nf_ext_init __attribute__((constructor)) NF_EXT_INIT #endif /* Present in both iptables.c and ip6tables.c */ diff -up iptables-1.4.1-rc2/include/xtables/internal.h.nf_ext_init iptables-1.4.1-rc2/include/xtables/internal.h --- iptables-1.4.1-rc2/include/xtables/internal.h.nf_ext_init 2008-06-05 14:13:24.000000000 +0200 +++ iptables-1.4.1-rc2/include/xtables/internal.h 2008-06-05 14:13:26.000000000 +0200 @@ -61,6 +61,6 @@ extern struct xtables_match *find_match( struct xtables_rule_match **match); extern struct xtables_target *find_target(const char *name, enum xt_tryload); -extern void _init(void); +extern void nf_ext_init(void); #endif /* _XTABLES_INTERNAL_H */ Index: iptables.init =================================================================== RCS file: /cvs/pkgs/rpms/iptables/F-8/iptables.init,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- iptables.init 11 Feb 2008 14:07:14 -0000 1.20 +++ iptables.init 1 Jul 2008 14:38:47 -0000 1.21 @@ -49,8 +49,8 @@ [ -f "$IPTABLES_CONFIG" ] && . "$IPTABLES_CONFIG" # Netfilter modules -NF_MODULES=(${IPV}_tables nf_conntrack_${_IPV}) -NF_MODULES_COMMON=(x_tables nf_conntrack) # Used by netfilter v4 and v6 +NF_MODULES=($(lsmod | awk "/^${IPV}table_/ {print \$1}") ${IPV}_tables) +NF_MODULES_COMMON=(x_tables nf_nat nf_conntrack) # Used by netfilter v4 and v6 # Get active tables NF_TABLES=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null) @@ -80,7 +80,9 @@ # after all referring modules are unloaded. if grep -q "^${mod}" /proc/modules ; then modprobe -r $mod > /dev/null 2>&1 - let ret+=$?; + res=$? + [ $res -eq 0 ] || echo -n " $mod" + let ret+=$res; fi return $ret Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/F-8/iptables.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- iptables.spec 11 Feb 2008 14:07:15 -0000 1.58 +++ iptables.spec 1 Jul 2008 14:38:47 -0000 1.59 @@ -1,23 +1,19 @@ -%define build_devel 1 - Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities -Version: 1.3.8 -Release: 7%{?dist} +Version: 1.4.1.1 +Release: 1%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config -Patch0: iptables-1.3.8-iptc.patch -Patch1: iptables-1.3.8-headers.patch -Patch2: iptables-1.3.8-reject_type.patch -Patch3: iptables-1.3.8-limit_man.patch Patch4: iptables-1.3.8-typo_latter.patch -Patch5: iptables-1.3.8-cloexec.patch +Patch5: iptables-1.4.1-cloexec.patch +Patch8: iptables-1.4.1-nf_ext_init.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) License: GPLv2 BuildRequires: libselinux-devel +BuildRequires: kernel-headers Conflicts: kernel < 2.4.20 Requires(post): chkconfig Requires(preun): chkconfig @@ -43,7 +39,6 @@ Install iptables-ipv6 if you need to set up firewalling for your network and you are using ipv6. -%if %{build_devel} %package devel Summary: Development package for iptables Group: System Environment/Base @@ -54,56 +49,38 @@ The iptc interface is upstream marked as not public. The interface is not stable and may change with every new version. It is therefore unsupported. -%endif %prep %setup -q -%patch0 -p1 -b .iptc -%patch1 -p1 -b .headers -%patch2 -p1 -b .reject_type -%patch3 -p1 -b .limit_man %patch4 -p1 -b .typo_latter %patch5 -p1 -b .cloexec +%patch8 -p1 -b .nf_ext_init -# Put it to a reasonable place -find . -type f -exec perl -pi -e "s,/usr/local,%{_prefix},g" {} \; - -# do not use ld -shared and _init -perl -pi -e "s/\(LD\) -shared/\(CC\) -shared/g" Rules.make -perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) my_init\(/g" extensions/*.c -perl -pi -e "s/^_init\(/__attribute\(\(constructor\)\) my_init\(/g" extensions/*.c +# fix constructor names, see also nf_ext_init patch +perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c +perl -pi -e "s/^_init\(/__attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c %build -TOPDIR=`pwd` -OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC" -export DO_SELINUX=1 -make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} -make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} iptables-save iptables-restore -make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} ip6tables-save ip6tables-restore +./configure --enable-devel --enable-libipq --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_libdir} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr +make %install rm -rf %{buildroot} -export DO_SELINUX=1 -make install DESTDIR=%{buildroot} KERNEL_DIR=/usr BINDIR=/sbin LIBDIR=/%{_lib} MANDIR=%{_mandir} -%if %{build_devel} -make install-devel DESTDIR=%{buildroot} KERNEL_DIR=/usr BINDIR=/sbin LIBDIR=%{_libdir} MANDIR=%{_mandir} -%endif -cp ip{6,}tables-{save,restore} $RPM_BUILD_ROOT/sbin -cp iptables-*.8 $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -c -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables + +make install DESTDIR=%{buildroot} + +# install iptc devel library +install -m 644 libiptc/libiptc.a %{buildroot}/%{_libdir} + +# install init scripts and configuration files +install -d -m 755 $RPM_BUILD_ROOT/etc/rc.d/init.d +install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE1} > ip6tables.init -install -c -m755 ip6tables.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ip6tables -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -install -c -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/iptables-config +install -c -m 755 ip6tables.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ip6tables +install -d -m 755 $RPM_BUILD_ROOT/etc/sysconfig +install -c -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/iptables-config sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE2} > ip6tables-config -install -c -m755 ip6tables-config $RPM_BUILD_ROOT/etc/sysconfig/ip6tables-config -# install devel header files -mkdir -p $RPM_BUILD_ROOT%{_includedir} -install -c -m644 include/ip*.h $RPM_BUILD_ROOT%{_includedir} -# install libiptc header files (unsupported) -mkdir -p $RPM_BUILD_ROOT%{_includedir}/libiptc -install -c -m644 include/libiptc/*.h $RPM_BUILD_ROOT%{_includedir}/libiptc +install -c -m 755 ip6tables-config $RPM_BUILD_ROOT/etc/sysconfig/ip6tables-config %clean rm -rf $RPM_BUILD_ROOT @@ -131,32 +108,61 @@ %config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config /sbin/iptables* %{_mandir}/man8/iptables* -%dir /%{_lib}/iptables -/%{_lib}/iptables/libipt* +%dir /%{_lib}/xtables +/%{_lib}/xtables/libipt* +/%{_lib}/xtables/libxt* %files ipv6 %defattr(-,root,root) %attr(0755,root,root) /etc/rc.d/init.d/ip6tables %config(noreplace) %attr(0600,root,root) /etc/sysconfig/ip6tables-config /sbin/ip6tables* +/bin/iptables-xml %{_mandir}/man8/ip6tables* -/%{_lib}/iptables/libip6t* +/%{_lib}/xtables/libip6t* -%if %{build_devel} %files devel %defattr(-,root,root) -%{_includedir}/ip*.h -%{_includedir}/libipq.h +%{_includedir}/*.h %dir %{_includedir}/libiptc %{_includedir}/libiptc/*.h %{_libdir}/libipq.a %{_libdir}/libiptc.a %{_mandir}/man3/* -%endif %changelog -* Mon Feb 11 2008 Thomas Woerner 1.3.8-7 +* Tue Jul 1 2008 Thomas Woerner 1.4.1.1-1 +- upstream bug fix release 1.4.1.1 +- dropped extra patch for 1.4.1 - not needed anymore + +* Tue Jun 10 2008 Thomas Woerner 1.4.1-1 +- new version 1.4.1 with new build environment +- additional ipv6 network mask patch from Jan Engelhardt +- spec file cleanup +- removed old patches + +* Fri Jun 6 2008 Tom "spot" Callaway 1.4.0-5 +- use normal kernel headers, not linux/compiler.h +- change BuildRequires: kernel-devel to kernel-headers +- We need to do this to be able to build for both sparcv9 and sparc64 + (there is no kernel-devel.sparcv9) + +* Thu Mar 20 2008 Thomas Woerner 1.4.0-4 +- use O_CLOEXEC for all opened files in all applications (rhbz#438189) + +* Mon Mar 3 2008 Thomas Woerner 1.4.0-3 +- use the kernel headers from the build tree for iptables for now to be able to + compile this package, but this makes the package more kernel dependant +- use s6_addr32 instead of in6_u.u6_addr32 + +* Wed Feb 20 2008 Fedora Release Engineering - 1.4.0-2 +- Autorebuild for GCC 4.3 + +* Mon Feb 11 2008 Thomas Woerner 1.4.0-1 +- new version 1.4.0 - fixed condrestart (rhbz#428148) +- report the module in rmmod_r if there is an error +- use nf_ext_init instead of my_init for extension constructors * Mon Nov 5 2007 Thomas Woerner 1.3.8-6 - fixed leaked file descriptor before fork/exec (rhbz#312191) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iptables/F-8/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 16 Jul 2007 22:03:39 -0000 1.20 +++ sources 1 Jul 2008 14:38:47 -0000 1.21 @@ -1 +1 @@ -0a9209f928002e5eee9cdff8fef4d4b3 iptables-1.3.8.tar.bz2 +723fa88d8a0915e184f99e03e9bf06cb iptables-1.4.1.1.tar.bz2 --- iptables-1.3.8-cloexec.patch DELETED --- --- iptables-1.3.8-headers.patch DELETED --- --- iptables-1.3.8-iptc.patch DELETED --- --- iptables-1.3.8-limit_man.patch DELETED --- --- iptables-1.3.8-reject_type.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 14:42:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 14:42:48 GMT Subject: rpms/cheese/F-9 .cvsignore, 1.9, 1.10 cheese.spec, 1.19, 1.20 sources, 1.9, 1.10 Message-ID: <200807011442.m61Egmpf005334@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/cheese/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5241 Modified Files: .cvsignore cheese.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cheese/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 28 May 2008 12:47:19 -0000 1.9 +++ .cvsignore 1 Jul 2008 14:42:05 -0000 1.10 @@ -1 +1 @@ -cheese-2.22.2.tar.bz2 +cheese-2.22.3.tar.bz2 Index: cheese.spec =================================================================== RCS file: /cvs/extras/rpms/cheese/F-9/cheese.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cheese.spec 28 May 2008 12:47:19 -0000 1.19 +++ cheese.spec 1 Jul 2008 14:42:05 -0000 1.20 @@ -1,5 +1,5 @@ Name: cheese -Version: 2.22.2 +Version: 2.22.3 Release: 1%{?dist} Summary: A webcam application for snapshots and movies @@ -108,6 +108,9 @@ %{_libexecdir}/cheese %changelog +* Tue Jul 1 2008 Matthias Clasen 2.22.3-1 +- Update to 2.22.3 + * Wed May 28 2008 Matthias Clasen 2.22.2-1 - Update to 2.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cheese/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 28 May 2008 12:47:19 -0000 1.9 +++ sources 1 Jul 2008 14:42:05 -0000 1.10 @@ -1 +1 @@ -39a7808868dd79c05a88a874b2026233 cheese-2.22.2.tar.bz2 +21c23e289b1c8a1ae014704d615a9540 cheese-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 14:48:31 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 1 Jul 2008 14:48:31 GMT Subject: rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.9,1.10 Message-ID: <200807011448.m61EmV1b005668@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585 Modified Files: ocaml-bitmatch.spec Log Message: +* Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-4 +- Don't build CIL tools unless we have CIL. Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ocaml-bitmatch.spec 1 Jul 2008 14:37:32 -0000 1.9 +++ ocaml-bitmatch.spec 1 Jul 2008 14:47:45 -0000 1.10 @@ -1,9 +1,21 @@ %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} +# Don't have CIL on ppc & ppc64 so we cannot build the C tools. +# See: bz#435546 bz#435545 +%ifarch ppc +%define build_cil_tools 0 +%else +%ifarch ppc64 +%define build_cil_tools 0 +%else +%define build_cil_tools 1 +%endif +%endif + Name: ocaml-bitmatch Version: 1.9.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -16,8 +28,10 @@ BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel +%if %build_cil_tools BuildRequires: ocaml-cil-devel BuildRequires: ocaml-extlib-devel +%endif %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree @@ -42,6 +56,7 @@ developing applications that use %{name}. +%if %build_cil_tools %package c Summary: Development files for %{name} Group: Development/Libraries @@ -51,6 +66,7 @@ %description c The %{name}-cil package contains tools for importing structs from C code and header files into %{name}. +%endif %prep @@ -82,6 +98,7 @@ mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install +%if %build_cil_tools # Install bitmatch-import-c by hand for now. mkdir -p $RPM_BUILD_ROOT%{_bindir} %if %opt @@ -92,6 +109,7 @@ # Install bitmatch-import-prefix.h by hand for now. install -m 0644 cil-tools/bitmatch-import-prefix.h $OCAMLFIND_DESTDIR/bitmatch/ +%endif %clean @@ -122,13 +140,19 @@ %{_libdir}/ocaml/bitmatch/*.mli +%if %build_cil_tools %files c %defattr(-,root,root,-) %doc COPYING.LIB cil-tools/ext3.c cil-tools/ext3.ml cil-tools/task_struct.c cil-tools/task_struct.ml %{_bindir}/bitmatch-import-c %exclude %{_libdir}/ocaml/bitmatch/*.h +%endif + %changelog +* Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-4 +- Don't build CIL tools unless we have CIL. + * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 - +BR ocaml-extlib-devel. From fedora-extras-commits at redhat.com Tue Jul 1 14:54:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 1 Jul 2008 14:54:33 GMT Subject: rpms/perl-Log-Dispatch-FileRotate/F-9 .cvsignore, 1.4, 1.5 perl-Log-Dispatch-FileRotate.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807011454.m61EsXD7006024@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5964 Modified Files: .cvsignore perl-Log-Dispatch-FileRotate.spec sources Log Message: * Fri Jun 27 2008 Ralf Cors??pius - 1.18-1 - Upstream update. - Add --with-tests. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2006 21:14:12 -0000 1.4 +++ .cvsignore 1 Jul 2008 14:53:39 -0000 1.5 @@ -1 +1 @@ -Log-Dispatch-FileRotate-1.16.tar.gz +Log-Dispatch-FileRotate-1.18.tar.gz Index: perl-Log-Dispatch-FileRotate.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-9/perl-Log-Dispatch-FileRotate.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Log-Dispatch-FileRotate.spec 2 Feb 2008 19:25:59 -0000 1.5 +++ perl-Log-Dispatch-FileRotate.spec 1 Jul 2008 14:53:39 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Log-Dispatch-FileRotate -Version: 1.16 -Release: 2%{?dist} +Version: 1.18 +Release: 1%{?dist} Summary: Log to files that archive/rotate themselves Group: Development/Libraries @@ -13,8 +13,8 @@ BuildRequires: perl(Date::Manip) BuildRequires: perl(Log::Dispatch) BuildRequires: perl(ExtUtils::MakeMaker) -# See comment in the %check section -# BuildRequires: perl(Log::Log4perl) >= 0.23 +# See comment in the %%check section +%{?_with_tests:BuildRequires: perl(Log::Log4perl) >= 0.23} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -43,7 +43,7 @@ %check # Test suite disabled: circular dependencies with Log::Log4perl -# make test +%{?_with_tests:make test} %clean @@ -58,6 +58,14 @@ %changelog +* Fri Jun 27 2008 Ralf Cors??pius - 1.18-1 +- Upstream update. +- Add --with-tests. + +* Tue Jun 03 2008 Ralf Cors??pius - 1.16-3 +- Use %%%%check in comments to work-around rpm bogusly parsing + %%check in comments (BZ 449419). + * Sat Feb 2 2008 Tom "spot" Callaway - 1.16-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2006 21:14:12 -0000 1.4 +++ sources 1 Jul 2008 14:53:39 -0000 1.5 @@ -1 +1 @@ -3cd1d75510a6297df487ca016763bdbe Log-Dispatch-FileRotate-1.16.tar.gz +0b38c15305a1f203204be0c6ebcd219f Log-Dispatch-FileRotate-1.18.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 14:55:57 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 14:55:57 GMT Subject: rpms/gtksourceview2/F-9 .cvsignore, 1.15, 1.16 gtksourceview2.spec, 1.17, 1.18 sources, 1.15, 1.16 Message-ID: <200807011455.m61EtvAo006195@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtksourceview2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6112 Modified Files: .cvsignore gtksourceview2.spec sources Log Message: 2.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtksourceview2/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 7 Apr 2008 20:47:13 -0000 1.15 +++ .cvsignore 1 Jul 2008 14:55:08 -0000 1.16 @@ -1 +1 @@ -gtksourceview-2.2.1.tar.bz2 +gtksourceview-2.2.2.tar.bz2 Index: gtksourceview2.spec =================================================================== RCS file: /cvs/extras/rpms/gtksourceview2/F-9/gtksourceview2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gtksourceview2.spec 7 Apr 2008 20:47:13 -0000 1.17 +++ gtksourceview2.spec 1 Jul 2008 14:55:08 -0000 1.18 @@ -5,7 +5,7 @@ Summary: A library for viewing source files Name: gtksourceview2 -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} License: LGPLv2+ and GPLv2+ # the library itself is LGPL, some .lang files are GPL @@ -81,6 +81,9 @@ %{_libdir}/*.so %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.2.2-1 +- Update to 2.2.2 + * Mon Apr 7 2008 Matthias Clasen - 2.2.1-1 - Update to 2.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtksourceview2/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 7 Apr 2008 20:47:13 -0000 1.15 +++ sources 1 Jul 2008 14:55:08 -0000 1.16 @@ -1 +1 @@ -1c5bd86f854ead3aedb96463ebbb275f gtksourceview-2.2.1.tar.bz2 +104a7ae70a9bcb4596601cd017f35626 gtksourceview-2.2.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 14:56:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 1 Jul 2008 14:56:24 GMT Subject: rpms/perl-Log-Dispatch-FileRotate/F-8 .cvsignore, 1.4, 1.5 perl-Log-Dispatch-FileRotate.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807011456.m61EuOFS006265@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6154 Modified Files: .cvsignore perl-Log-Dispatch-FileRotate.spec sources Log Message: * Fri Jun 27 2008 Ralf Cors??pius - 1.18-1 - Upstream update. - Add --with-tests. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2006 21:14:12 -0000 1.4 +++ .cvsignore 1 Jul 2008 14:55:29 -0000 1.5 @@ -1 +1 @@ -Log-Dispatch-FileRotate-1.16.tar.gz +Log-Dispatch-FileRotate-1.18.tar.gz Index: perl-Log-Dispatch-FileRotate.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-8/perl-Log-Dispatch-FileRotate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Log-Dispatch-FileRotate.spec 16 Oct 2007 20:55:54 -0000 1.4 +++ perl-Log-Dispatch-FileRotate.spec 1 Jul 2008 14:55:29 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Log-Dispatch-FileRotate -Version: 1.16 -Release: 1%{?dist}.1 +Version: 1.18 +Release: 1%{?dist} Summary: Log to files that archive/rotate themselves Group: Development/Libraries @@ -13,8 +13,8 @@ BuildRequires: perl(Date::Manip) BuildRequires: perl(Log::Dispatch) BuildRequires: perl(ExtUtils::MakeMaker) -# See comment in the %check section -# BuildRequires: perl(Log::Log4perl) >= 0.23 +# See comment in the %%check section +%{?_with_tests:BuildRequires: perl(Log::Log4perl) >= 0.23} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -43,7 +43,7 @@ %check # Test suite disabled: circular dependencies with Log::Log4perl -# make test +%{?_with_tests:make test} %clean @@ -58,6 +58,17 @@ %changelog +* Fri Jun 27 2008 Ralf Cors??pius - 1.18-1 +- Upstream update. +- Add --with-tests. + +* Tue Jun 03 2008 Ralf Cors??pius - 1.16-3 +- Use %%%%check in comments to work-around rpm bogusly parsing + %%check in comments (BZ 449419). + +* Sat Feb 2 2008 Tom "spot" Callaway - 1.16-2 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 1.16-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2006 21:14:12 -0000 1.4 +++ sources 1 Jul 2008 14:55:29 -0000 1.5 @@ -1 +1 @@ -3cd1d75510a6297df487ca016763bdbe Log-Dispatch-FileRotate-1.16.tar.gz +0b38c15305a1f203204be0c6ebcd219f Log-Dispatch-FileRotate-1.18.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 15:03:19 2008 From: fedora-extras-commits at redhat.com (Doug Ledford (dledford)) Date: Tue, 1 Jul 2008 15:03:19 GMT Subject: rpms/opensm/devel opensm.spec,1.1,1.2 Message-ID: <200807011503.m61F3J8j013148@cvs-int.fedora.redhat.com> Author: dledford Update of /cvs/extras/rpms/opensm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13093 Modified Files: opensm.spec Log Message: Need a few more buildrequires Index: opensm.spec =================================================================== RCS file: /cvs/extras/rpms/opensm/devel/opensm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opensm.spec 30 Jun 2008 23:33:50 -0000 1.1 +++ opensm.spec 1 Jul 2008 15:02:23 -0000 1.2 @@ -11,7 +11,7 @@ Source3: opensm.initd Patch0: opensm-3.2.1-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libibmad-devel >= 1.2.0, libtool +BuildRequires: libibmad-devel >= 1.2.0, libtool, bison, flex, byacc Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma %description From fedora-extras-commits at redhat.com Tue Jul 1 15:06:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:06:48 GMT Subject: rpms/libgtop2/devel .cvsignore, 1.44, 1.45 libgtop2.spec, 1.64, 1.65 sources, 1.44, 1.45 Message-ID: <200807011506.m61F6mUq013424@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgtop2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13371 Modified Files: .cvsignore libgtop2.spec sources Log Message: 2.23.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgtop2/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 28 May 2008 02:55:50 -0000 1.44 +++ .cvsignore 1 Jul 2008 15:06:01 -0000 1.45 @@ -1 +1 @@ -libgtop-2.23.2.tar.bz2 +libgtop-2.23.4.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/extras/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- libgtop2.spec 28 May 2008 02:55:50 -0000 1.64 +++ libgtop2.spec 1 Jul 2008 15:06:01 -0000 1.65 @@ -6,7 +6,7 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.23.2 +Version: 2.23.4 Release: 1%{?dist} License: GPLv2+ URL: http://download.gnome.org/sources/libgtop/2.23 @@ -75,6 +75,9 @@ %exclude %{_datadir}/info %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.23.4-1 +- Update to 2.23.4 + * Tue May 27 2008 Matthias Clasen - 2.23.2-1 - Update to 2.23.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgtop2/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 28 May 2008 02:55:50 -0000 1.44 +++ sources 1 Jul 2008 15:06:01 -0000 1.45 @@ -1 +1 @@ -c07b668eb39c511c257c60577862c846 libgtop-2.23.2.tar.bz2 +bb37766ba407983a8e055eb4705a1a81 libgtop-2.23.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:08:26 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 15:08:26 GMT Subject: rpms/xorg-x11-server/F-9 import.log,1.1,NONE Message-ID: <200807011508.m61F8QrB013589@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13534 Removed Files: import.log Log Message: oh my god go away --- import.log DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 15:09:35 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 1 Jul 2008 15:09:35 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.173, 1.174 sources, 1.298, 1.299 Message-ID: <200807011509.m61F9Zph013782@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13680 Modified Files: .cvsignore sources Log Message: next version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- .cvsignore 19 Jun 2008 09:09:18 -0000 1.173 +++ .cvsignore 1 Jul 2008 15:08:48 -0000 1.174 @@ -6,4 +6,4 @@ redhat-langpacks.tar.gz evolocal.odb bengali.sdf -DEV300_m20.tar.bz2 +DEV300_m22.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- sources 19 Jun 2008 09:09:18 -0000 1.298 +++ sources 1 Jul 2008 15:08:48 -0000 1.299 @@ -6,4 +6,4 @@ 261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -6df072febfe7897c0861178236228b0a DEV300_m20.tar.bz2 +dbdbeea8d85c8aaaae89f41c9094e513 DEV300_m22.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:09:53 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:09:53 GMT Subject: rpms/eog/F-9 .cvsignore, 1.61, 1.62 eog.spec, 1.109, 1.110 sources, 1.61, 1.62 Message-ID: <200807011509.m61F9rFD013802@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/eog/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13711 Modified Files: .cvsignore eog.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eog/F-9/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 28 May 2008 16:53:01 -0000 1.61 +++ .cvsignore 1 Jul 2008 15:09:04 -0000 1.62 @@ -1 +1 @@ -eog-2.22.2.tar.bz2 +eog-2.22.3.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/extras/rpms/eog/F-9/eog.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- eog.spec 28 May 2008 16:53:02 -0000 1.109 +++ eog.spec 1 Jul 2008 15:09:04 -0000 1.110 @@ -13,7 +13,7 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.22.2 +Version: 2.22.3 Release: 1%{?dist} URL: http://www.gnome.org Source: http://download.gnome.org/sources/eog/2.22/%{name}-%{version}.tar.bz2 @@ -149,6 +149,9 @@ %{_libdir}/pkgconfig/eog.pc %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Wed May 28 2008 Matthias Clasen - 2.22.2-1 - Update to 2.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/eog/F-9/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 28 May 2008 16:53:02 -0000 1.61 +++ sources 1 Jul 2008 15:09:04 -0000 1.62 @@ -1 +1 @@ -897eddc3534a44276f966963a0fe7c5e eog-2.22.2.tar.bz2 +f1ca295b0ebf800cab17fc166e37588e eog-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:10:02 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 15:10:02 GMT Subject: rpms/xorg-x11-server/F-9 .cvsignore, 1.47, 1.48 commitid, 1.19, 1.20 sources, 1.41, 1.42 xorg-x11-server.spec, 1.337, 1.338 xorg-x11-server-Red-Hat-extramodes.patch, 1.8, NONE xserver-1.4.99-selinux-awareness.patch, 1.3, NONE xserver-1.4.99-xaa-evict-pixmaps.patch, 1.2, NONE xserver-1.5.0-fix-single-aspect.patch, 1.1, NONE xserver-1.5.0-xaa-sucks.patch, 1.2, NONE Message-ID: <200807011510.m61FA28O013818@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13705/F-9 Modified Files: .cvsignore commitid sources xorg-x11-server.spec Removed Files: xorg-x11-server-Red-Hat-extramodes.patch xserver-1.4.99-selinux-awareness.patch xserver-1.4.99-xaa-evict-pixmaps.patch xserver-1.5.0-fix-single-aspect.patch xserver-1.5.0-xaa-sucks.patch Log Message: xserver 1.5RC5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 12 Jun 2008 02:07:31 -0000 1.47 +++ .cvsignore 1 Jul 2008 15:09:08 -0000 1.48 @@ -1 +1 @@ -xorg-server-20080612.tar.bz2 +xorg-server-20080701.tar.bz2 Index: commitid =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/commitid,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- commitid 12 Jun 2008 02:07:31 -0000 1.19 +++ commitid 1 Jul 2008 15:09:08 -0000 1.20 @@ -1 +1 @@ -53a84d75c65f75c629c6610a2ec4093507cea3f7 +ccb373f2fb910db57a3dfcef8a03779f1023470c Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 12 Jun 2008 02:07:31 -0000 1.41 +++ sources 1 Jul 2008 15:09:08 -0000 1.42 @@ -1 +1 @@ -067f2f0fdbcac0f8a7cd4f4ee046a2c8 xorg-server-20080612.tar.bz2 +a0e25d1c6ed0ed945e4a84b6b288f6fe xorg-server-20080701.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v retrieving revision 1.337 retrieving revision 1.338 diff -u -r1.337 -r1.338 --- xorg-x11-server.spec 12 Jun 2008 04:58:20 -0000 1.337 +++ xorg-x11-server.spec 1 Jul 2008 15:09:08 -0000 1.338 @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080612 +%define gitdate 20080701 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.902 -Release: 3.%{gitdate}%{?dist} +Version: 1.4.99.905 +Release: 1.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -42,12 +42,15 @@ # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list -Patch1001: xorg-x11-server-Red-Hat-extramodes.patch +# dropme +#Patch1001: xorg-x11-server-Red-Hat-extramodes.patch Patch1003: xserver-1.4.99-pic-libxf86config.patch -Patch1004: xserver-1.4.99-selinux-awareness.patch +# maybe? +#Patch1004: xserver-1.4.99-selinux-awareness.patch Patch1005: xserver-1.4.99-builtin-fonts.patch Patch1010: xserver-1.3.0-no-prerelease-warning.patch -Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch +# rebase for GL/glx -> glx move +#Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch @@ -58,9 +61,9 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch -Patch5008: xserver-1.5.0-xaa-sucks.patch +#Patch5008: xserver-1.5.0-xaa-sucks.patch Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch -Patch5010: xserver-1.5.0-fix-single-aspect.patch +#Patch5010: xserver-1.5.0-fix-single-aspect.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -111,8 +114,9 @@ # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex -BuildRequires: mesa-libGL-devel >= 7.1-0.21 -BuildRequires: mesa-source >= 7.1-0.21 +BuildRequires: mesa-libGL-devel >= 7.1-0.36 +# should be useless now... +# BuildRequires: mesa-source >= 7.1-0.36 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -310,7 +314,6 @@ --disable-xorgcfg \ --disable-record \ --enable-install-libxf86config \ - --with-mesa-source=%{_datadir}/mesa/source \ --enable-xselinux \ --with-dri-driver-path=%{drimoduledir} \ ${CONFIGURE} @@ -336,7 +339,6 @@ mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}} cp cpprules.in %{inst_srcdir} cp xkb/README.compiled %{inst_srcdir}/xkb -cp GL/symlink-mesa.sh %{inst_srcdir}/GL cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/ @@ -418,7 +420,6 @@ %dir %{_libdir}/xorg/modules %dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/extensions -%{_libdir}/xorg/modules/extensions/libGLcore.so %{_libdir}/xorg/modules/extensions/libglx.so %{_libdir}/xorg/modules/extensions/libdri.so %{_libdir}/xorg/modules/extensions/libdri2.so @@ -511,6 +512,9 @@ %changelog +* Mon Jun 30 2008 Adam Jackson 1.4.99.905-1.20080701 +- 1.5RC5. + * Thu Jun 12 2008 Dave Airlie 1.4.99.902-3.20080612 - xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor. --- xorg-x11-server-Red-Hat-extramodes.patch DELETED --- --- xserver-1.4.99-selinux-awareness.patch DELETED --- --- xserver-1.4.99-xaa-evict-pixmaps.patch DELETED --- --- xserver-1.5.0-fix-single-aspect.patch DELETED --- --- xserver-1.5.0-xaa-sucks.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 15:15:34 2008 From: fedora-extras-commits at redhat.com (Doug Ledford (dledford)) Date: Tue, 1 Jul 2008 15:15:34 GMT Subject: rpms/opensm/F-8 opensm.spec,1.1,1.2 Message-ID: <200807011515.m61FFY1L014521@cvs-int.fedora.redhat.com> Author: dledford Update of /cvs/extras/rpms/opensm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14359 Modified Files: opensm.spec Log Message: Need more buildrequires Index: opensm.spec =================================================================== RCS file: /cvs/extras/rpms/opensm/F-8/opensm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opensm.spec 30 Jun 2008 23:24:10 -0000 1.1 +++ opensm.spec 1 Jul 2008 15:14:45 -0000 1.2 @@ -11,7 +11,7 @@ Source3: opensm.initd Patch0: opensm-3.2.1-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libibmad-devel >= 1.2.0, libtool +BuildRequires: libibmad-devel >= 1.2.0, libtool, bison, flex, byacc Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma %description From fedora-extras-commits at redhat.com Tue Jul 1 15:15:45 2008 From: fedora-extras-commits at redhat.com (Doug Ledford (dledford)) Date: Tue, 1 Jul 2008 15:15:45 GMT Subject: rpms/opensm/F-9 opensm.spec,1.1,1.2 Message-ID: <200807011515.m61FFjB3014545@cvs-int.fedora.redhat.com> Author: dledford Update of /cvs/extras/rpms/opensm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14389 Modified Files: opensm.spec Log Message: Need more buildrequires Index: opensm.spec =================================================================== RCS file: /cvs/extras/rpms/opensm/F-9/opensm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opensm.spec 30 Jun 2008 23:32:43 -0000 1.1 +++ opensm.spec 1 Jul 2008 15:14:55 -0000 1.2 @@ -11,7 +11,7 @@ Source3: opensm.initd Patch0: opensm-3.2.1-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libibmad-devel >= 1.2.0, libtool +BuildRequires: libibmad-devel >= 1.2.0, libtool, bison, flex, byacc Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma %description From fedora-extras-commits at redhat.com Tue Jul 1 15:19:47 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:19:47 GMT Subject: rpms/libgtop2/F-9 .cvsignore, 1.44, 1.45 libgtop2.spec, 1.64, 1.65 sources, 1.44, 1.45 Message-ID: <200807011519.m61FJlgF015052@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgtop2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940 Modified Files: .cvsignore libgtop2.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgtop2/F-9/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 28 May 2008 12:58:29 -0000 1.44 +++ .cvsignore 1 Jul 2008 15:19:03 -0000 1.45 @@ -1 +1 @@ -libgtop-2.22.2.tar.bz2 +libgtop-2.22.3.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/extras/rpms/libgtop2/F-9/libgtop2.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- libgtop2.spec 28 May 2008 12:58:29 -0000 1.64 +++ libgtop2.spec 1 Jul 2008 15:19:03 -0000 1.65 @@ -6,7 +6,7 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.22.2 +Version: 2.22.3 Release: 1%{?dist} License: GPLv2+ URL: http://download.gnome.org/sources/libgtop/2.22 @@ -75,6 +75,9 @@ %exclude %{_datadir}/info %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Wed May 28 2008 Matthias Clasen - 2.22.2-1 - Update to 2.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgtop2/F-9/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 28 May 2008 12:58:29 -0000 1.44 +++ sources 1 Jul 2008 15:19:03 -0000 1.45 @@ -1 +1 @@ -fb7b3e72f3ba5c25f3f33cdc5205f80e libgtop-2.22.2.tar.bz2 +57764ad246ceb959f601505aa2364f1f libgtop-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:21:45 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:21:45 GMT Subject: rpms/gnome-system-monitor/F-9 .cvsignore, 1.65, 1.66 gnome-system-monitor.spec, 1.120, 1.121 sources, 1.65, 1.66 Message-ID: <200807011521.m61FLjr5015284@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-system-monitor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15106 Modified Files: .cvsignore gnome-system-monitor.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/F-9/.cvsignore,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- .cvsignore 28 May 2008 13:56:29 -0000 1.65 +++ .cvsignore 1 Jul 2008 15:20:56 -0000 1.66 @@ -1 +1 @@ -gnome-system-monitor-2.22.2.tar.bz2 +gnome-system-monitor-2.22.3.tar.bz2 Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/F-9/gnome-system-monitor.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- gnome-system-monitor.spec 5 Jun 2008 15:43:00 -0000 1.120 +++ gnome-system-monitor.spec 1 Jul 2008 15:20:56 -0000 1.121 @@ -12,8 +12,8 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.22.2 -Release: 2%{?dist} +Version: 2.22.3 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnome.org/ @@ -123,7 +123,10 @@ %{_datadir}/dbus-1/system-services/org.gnome.SystemMonitor.Mechanism.service -%changelog +<<<<<<< gnome-system-monitor.spec +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Thu Jun 05 2008 Than Ngo 2.22.2-2 - don't show it in KDE menu Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/F-9/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 28 May 2008 13:56:29 -0000 1.65 +++ sources 1 Jul 2008 15:20:56 -0000 1.66 @@ -1 +1 @@ -ac61591510274dfa1933bf57237c7a0d gnome-system-monitor-2.22.2.tar.bz2 +06a162294f63cc7c931f78b73d4043b7 gnome-system-monitor-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:27:14 2008 From: fedora-extras-commits at redhat.com (Lukas Tinkl (ltinkl)) Date: Tue, 1 Jul 2008 15:27:14 GMT Subject: rpms/kdelibs/F-9 kdelibs-4.0.5-khtml-ecma-empty-array-crash.patch, NONE, 1.1 kdelibs.spec, 1.328, 1.329 Message-ID: <200807011527.m61FRETv015602@cvs-int.fedora.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15535 Modified Files: kdelibs.spec Added Files: kdelibs-4.0.5-khtml-ecma-empty-array-crash.patch Log Message: fix crash on empty array access in ECMA (kdebug:164391) kdelibs-4.0.5-khtml-ecma-empty-array-crash.patch: --- NEW FILE kdelibs-4.0.5-khtml-ecma-empty-array-crash.patch --- --- khtml/ecma/kjs_css.cpp 2008/06/29 19:24:47 826073 +++ khtml/ecma/kjs_css.cpp 2008/06/29 19:25:06 826074 @@ -75,8 +75,7 @@ // syntax for accessing properties, which camel-cases them // and can add prefixes to produce things like pixelFoo QString prop = p.qstring(); - int i = prop.length(); - while ( --i ) { + for (int i = prop.length() - 1; i >= 0; --i) { char c = prop[i].toLatin1(); if ( c >= 'A' && c <= 'Z' ) prop.insert( i, '-' ); Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- kdelibs.spec 27 Jun 2008 01:49:42 -0000 1.328 +++ kdelibs.spec 1 Jul 2008 15:26:15 -0000 1.329 @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.5 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -85,6 +85,8 @@ Patch21: kdelibs-4.0.5-strigi-metainfo.patch #??kdebug:127793: Renaming in FTP overwrites existing files without confirmation Patch22: kdelibs-4.0.5-kio-ftp-overwrite.patch +#??kdebug:164391: Crash when doing [""]= on CSSStyleDeclaration +Patch23: kdelibs-4.0.5-khtml-ecma-empty-array-crash.patch ## upstream patches Patch100: kdelibs-4.0.4-khtml-stylesheet.patch @@ -211,6 +213,7 @@ %patch20 -p1 -b .kio-subjob %patch21 -p1 -b .strigi-metainfo %patch22 -p1 -b .kio-ftp-overwrite +%patch23 -p0 -b .khtml-ecma-empty-array-crash # upstream patches %patch100 -p1 -b .khtml-stylesheet @@ -374,6 +377,9 @@ %changelog +* Tue Jul 1 2008 Luk???? Tinkl - 4.0.5-5 +- fix crash on empty array access in ECMA (kdebug:164391) + * Fri Jun 27 2008 Kevin Kofler - 4.0.5-4 - fix kstandarddirs patch so /usr/libexec/kde4 is found before /usr/bin (see also #453063, ensures the KDE 4 versions of kdesu, lnusertemp etc. are used) From fedora-extras-commits at redhat.com Tue Jul 1 15:30:44 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 1 Jul 2008 15:30:44 GMT Subject: rpms/kernel/devel config-generic, 1.118, 1.119 kernel.spec, 1.725, 1.726 linux-2.6-wireless-pending.patch, 1.57, 1.58 linux-2.6-wireless.patch, 1.43, 1.44 Message-ID: <200807011530.m61FUiXN015891@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15842 Modified Files: config-generic kernel.spec linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-06-30 ; Upstream wireless updates from 2008-06-30 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- config-generic 30 Jun 2008 19:52:09 -0000 1.118 +++ config-generic 1 Jul 2008 15:29:57 -0000 1.119 @@ -1268,7 +1268,7 @@ CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.725 retrieving revision 1.726 diff -u -r1.725 -r1.726 --- kernel.spec 1 Jul 2008 12:54:38 -0000 1.725 +++ kernel.spec 1 Jul 2008 15:29:57 -0000 1.726 @@ -1788,6 +1788,12 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Tue Jul 01 2008 John W. Linville +- Upstream wireless fixes from 2008-06-30 + (http://marc.info/?l=linux-wireless&m=121485709702728&w=2) +- Upstream wireless updates from 2008-06-30 + (http://marc.info/?l=linux-wireless&m=121486432315033&w=2) + * Tue Jul 01 2008 Dave Jones - 2.6.26-rc8-git2 linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.57 -r 1.58 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- linux-2.6-wireless-pending.patch 27 Jun 2008 18:12:26 -0000 1.57 +++ linux-2.6-wireless-pending.patch 1 Jul 2008 15:29:57 -0000 1.58 @@ -1,3 +1,721 @@ +commit edbf873cb3e8c4ef71123e83b07f39ab69971910 +Author: Larry.Finger at lwfinger.net +Date: Mon Jun 30 10:39:49 2008 -0500 + + p54: Add quality output to iwlist and iwconfig + + The p54 driver family reports a quality of 0 in iwconfig and iwlist + output. This patch calculates a quality number as a percentage of the + rssi to the maximum signal of 127 reported as the maximum signal. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 22191a580c725ed5f285d0084bfa1d2f8b350a47 +Author: Johannes Berg +Date: Mon Jun 30 15:10:46 2008 +0200 + + mac80211: rework debug settings and make debugging safer + + This patch reworks the mac80211 debug settings making them more focused + and adding help text for those that didn't have one. It also removes a + number of printks that can be triggered remotely and add no value, e.g. + "too short deauthentication frame received - ignoring". + + If somebody really needs to debug that they should just add a monitor + interface and look at the frames in wireshark. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 3f1664e47dcd98b982f34dc39735f2b6706ad7ff +Author: Johannes Berg +Date: Mon Jun 30 15:10:45 2008 +0200 + + mac80211: get rid of function pointers in RX path + + This changes the RX path to no longer use function pointers for + RX handlers but rather invoke them directly. If debugging is + enabled, mark the RX handlers noinline because otherwise they + all get inlined into ieee80211_invoke_rx_handlers() which makes + it harder to see where a bug is. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 5807822f3d52179ec0a9091892e88dc4d4d3323b +Author: Johannes Berg +Date: Mon Jun 30 15:10:44 2008 +0200 + + mac80211: get rid of function pointers in TX path + + This changes the TX path to no longer use function pointers for + TX handlers but rather invoke them directly. If debugging is + enabled, mark the TX handlers noinline because otherwise they + all get inlined into invoke_tx_handlers() which makes it harder + to see where a bug is. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 444b6135791874d8e78ff47daab86d1b8ee4784f +Author: Zhu Yi +Date: Mon Jun 30 17:23:32 2008 +0800 + + iwl3945: remove RFKILL_STATE_HARD_BLOCKED warnings + + The patch fixes the compile warning of "enumeration value + ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch". + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit bd1092ceadee190604d8ff59faa97a974c3c1ecb +Author: Zhu Yi +Date: Mon Jun 30 17:23:31 2008 +0800 + + iwlwifi: fix iwl4965 temperature callback calibration issue + + The patch fixes the temperature calibration issue introduced by the + patch "iwlwifi: move RX stats to core, and move temperature to handler". + It also remove the second parameter "stats" since it is already copied + to priv->statistics. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 82c2e0895d1fa87c3206e3fe5f99dd51e2cf6371 +Author: Stefanik G??bor +Date: Mon Jun 30 17:23:30 2008 +0800 + + iwlwifi: enable packet injection for iwl3945 + + This patch enables packet injection on iwl3945 devices. Tested with + packetspammer and aireplay-ng. + + Signed-off-by: G??bor Stefanik + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit a6ecfe5a9bd32c9426f9af801e62f21da132a2cc +Author: Zhu Yi +Date: Mon Jun 30 17:23:29 2008 +0800 + + iwlwifi: drop skb silently for Tx request in monitor mode + + This patch fixes the problem to keep mac80211 resubmitting SKBs + when Tx request cannot be met in monitor mode. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 6fe878497b04b9c428842ab9c89c0e2d712860ad +Author: Rick Farrington +Date: Mon Jun 30 17:23:28 2008 +0800 + + iwlwifi: fix incorrect monitor mode operation + + This patch fixes monitor mode operation for iwlwifi. + + Problems addressed: + 1. when monitor mode was enabled, multiple, overlapped calls were being + made to 'iwl3945_bg_set_monitor' + + 2. when monitor mode was disabled (via the configure_filter callback), + the driver was still enabling monitor mode + + 3. when monitor mode was enabled, the selected channel was not set + (eg. 'iwconfig wlanx mode monitor channel n' DID NOT SET channel 'n' + when packet capture was subsequently enabled) + + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 32c932be01d96abe84340b0831db949ca4713292 +Author: Rick Farrington +Date: Mon Jun 30 17:23:27 2008 +0800 + + iwlwifi: fix incorrect 5GHz rates reported in monitor mode + + This patch fixes the rates reported in monitor mode operation + (Wireshark) for iwlwifi. + + Previously, packets with rates of 6M..24M would be reported + incorrectly and packets with rates of 36M..54M would not passed + up the stack. + + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 0a078ffa011209c307880da10917ef205b4b11f4 +Author: Tomas Winkler +Date: Mon Jun 30 17:23:26 2008 +0800 + + iwlwifi: fix 4965 uCode load + + This patch fixes uCode load in 4965 HW + + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit a9efa652cbfead13bbe200878f8a2d74f3543e1b +Author: Emmanuel Grumbach +Date: Mon Jun 30 17:23:25 2008 +0800 + + iwlwifi: clean up HW RF-kill state machine and restarts + + This patch cleans up HW RF-kill state machine. + + Signed-off-by: Mohamed Abbas + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 154b25ce9218fbe6eebacef7907fabf6d663e639 +Author: Emmanuel Grumbach +Date: Mon Jun 30 17:23:24 2008 +0800 + + iwlwifi: blocking mac_start until uCode is complete + + This patch makes iwl4965_mac_start block until the uCode has been + completely loaded. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 06da0699445631e6710b1f3b2e89570325b65e7e +Author: Ron Rindjunsky [...17890 lines suppressed...] + return RX_DROP_UNUSABLE; + +- printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from " +- "%s\n", rx->dev->name, print_mac(mac, sa)); +- + mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx, + (void *) skb->data); + return RX_DROP_UNUSABLE; +@@ -176,59 +155,58 @@ ieee80211_rx_h_michael_mic_verify(struct skb_trim(skb, skb->len - MICHAEL_MIC_LEN); /* update IV in key information to be able to detect replays */ @@ -72356,7 +77364,7 @@ return 0; } -@@ -246,28 +227,16 @@ ieee80211_tx_result +@@ -246,28 +224,16 @@ ieee80211_tx_result ieee80211_crypto_tkip_encrypt(struct ieee80211_tx_data *tx) { struct sk_buff *skb = tx->skb; @@ -72387,7 +77395,7 @@ return TX_DROP; } } -@@ -280,14 +249,12 @@ ieee80211_rx_result +@@ -280,14 +246,12 @@ ieee80211_rx_result ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; @@ -72403,7 +77411,24 @@ if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) return RX_CONTINUE; -@@ -429,36 +396,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 +@@ -315,15 +279,8 @@ ieee80211_crypto_tkip_decrypt(struct iee + hdr->addr1, hwaccel, rx->queue, + &rx->tkip_iv32, + &rx->tkip_iv16); +- if (res != TKIP_DECRYPT_OK || wpa_test) { +-#ifdef CONFIG_MAC80211_DEBUG +- if (net_ratelimit()) +- printk(KERN_DEBUG "%s: TKIP decrypt failed for RX " +- "frame from %s (res=%d)\n", rx->dev->name, +- print_mac(mac, rx->sta->addr), res); +-#endif /* CONFIG_MAC80211_DEBUG */ ++ if (res != TKIP_DECRYPT_OK || wpa_test) + return RX_DROP_UNUSABLE; +- } + + /* Trim ICV */ + skb_trim(skb, skb->len - TKIP_ICV_LEN); +@@ -429,36 +386,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 } @@ -72460,7 +77485,7 @@ pos = skb_push(skb, CCMP_HDR_LEN); memmove(pos, pos + CCMP_HDR_LEN, hdrlen); -@@ -478,7 +450,7 @@ static int ccmp_encrypt_skb(struct ieee8 +@@ -478,7 +440,7 @@ static int ccmp_encrypt_skb(struct ieee8 if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) { /* hwaccel - with preallocated room for CCMP header */ @@ -72469,7 +77494,7 @@ return 0; } -@@ -495,28 +467,16 @@ ieee80211_tx_result +@@ -495,28 +457,16 @@ ieee80211_tx_result ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx) { struct sk_buff *skb = tx->skb; @@ -72500,7 +77525,7 @@ return TX_DROP; } } -@@ -529,7 +489,6 @@ ieee80211_rx_result +@@ -529,7 +479,6 @@ ieee80211_rx_result ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; @@ -72508,7 +77533,7 @@ int hdrlen; struct ieee80211_key *key = rx->key; struct sk_buff *skb = rx->skb; -@@ -537,8 +496,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee +@@ -537,8 +486,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee int data_len; DECLARE_MAC_BUF(mac); @@ -72518,9 +77543,39 @@ if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) return RX_CONTINUE; +@@ -554,16 +502,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee + (void) ccmp_hdr2pn(pn, skb->data + hdrlen); + + if (memcmp(pn, key->u.ccmp.rx_pn[rx->queue], CCMP_PN_LEN) <= 0) { +-#ifdef CONFIG_MAC80211_DEBUG +- u8 *ppn = key->u.ccmp.rx_pn[rx->queue]; +- +- printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from " +- "%s (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN " +- "%02x%02x%02x%02x%02x%02x)\n", rx->dev->name, +- print_mac(mac, rx->sta->addr), +- pn[0], pn[1], pn[2], pn[3], pn[4], pn[5], +- ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]); +-#endif /* CONFIG_MAC80211_DEBUG */ + key->u.ccmp.replays++; + return RX_DROP_UNUSABLE; + } +@@ -583,12 +521,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee + skb->data + hdrlen + CCMP_HDR_LEN, data_len, + skb->data + skb->len - CCMP_MIC_LEN, + skb->data + hdrlen + CCMP_HDR_LEN)) { +-#ifdef CONFIG_MAC80211_DEBUG +- if (net_ratelimit()) +- printk(KERN_DEBUG "%s: CCMP decrypt failed " +- "for RX frame from %s\n", rx->dev->name, +- print_mac(mac, rx->sta->addr)); +-#endif /* CONFIG_MAC80211_DEBUG */ + return RX_DROP_UNUSABLE; + } + } diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c ---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-06-27 13:46:53.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-01 10:55:42.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-01 10:56:00.000000000 -0400 @@ -39,8 +39,56 @@ MODULE_LICENSE("GPL"); static LIST_HEAD(rfkill_list); /* list of registered rf switches */ static DEFINE_MUTEX(rfkill_mutex); @@ -72982,8 +78037,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-06-27 13:46:53.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-01 10:55:42.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-01 10:56:00.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -73141,8 +78196,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-06-27 13:46:53.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-01 10:55:42.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-01 10:56:00.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -73151,8 +78206,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-06-25 15:43:38.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-06-27 13:46:53.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-01 10:55:42.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-01 10:56:00.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -73182,8 +78237,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-27 13:46:37.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-27 13:46:43.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 10:55:42.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 10:56:00.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -73247,8 +78302,8 @@ /* exported functions */ diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-06-27 13:46:37.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-27 13:46:43.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-01 10:55:42.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-01 10:56:00.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -73290,8 +78345,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-25 15:43:38.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-27 13:46:53.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 10:55:42.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 10:56:00.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- linux-2.6-wireless.patch 27 Jun 2008 19:59:42 -0000 1.43 +++ linux-2.6-wireless.patch 1 Jul 2008 15:29:57 -0000 1.44 @@ -1,3 +1,41 @@ +commit 23976efedd5ecb420b87455787c537eb4aed1981 +Author: Emmanuel Grumbach +Date: Sat Jun 28 02:50:13 2008 +0300 + + mac80211: don't accept WEP keys other than WEP40 and WEP104 + + This patch makes mac80211 refuse a WEP key whose length is not WEP40 nor + WEP104. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 1bcca3c463e4930cef9986b05165bb0b3eb46f63 +Author: Pavel Roskin +Date: Fri Jun 27 16:19:58 2008 -0400 + + hostap: fix sparse warnings + + Rewrite AID calculation in handle_pspoll() to avoid truncating bits. + Make hostap_80211_header_parse() static, don't export it. Avoid + shadowing variables. + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 15ea0ebc5b7305cc75189cb6b7924d0db5278e0c +Author: Pavel Roskin +Date: Fri Jun 27 16:19:52 2008 -0400 + + hostap: don't report useless WDS frames by default + + DEBUG_EXTRA is reported to the kernel log by default, but DEBUG_EXTRA2 + is not. Unrelated WDS frames pollute the log unnecessarily. + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + commit 00eb7fe77eb455f807c396f9917f0f623d4c84bb Author: Emmanuel Grumbach Date: Thu Jun 26 12:13:46 2008 +0300 @@ -153,8 +191,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c 2008-07-01 10:48:12.000000000 -0400 @@ -72,6 +72,9 @@ static void b43_led_brightness_set(struc struct b43_wldev *dev = led->dev; bool radio_enabled; @@ -166,8 +204,8 @@ * but we want to avoid the locking overhead and we don't care * whether the LED has the wrong state for a second. */ diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c 2008-07-01 10:48:12.000000000 -0400 @@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setu if (!ring) goto out; @@ -185,8 +223,8 @@ ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index); ring->index = controller_index; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-01 10:48:12.000000000 -0400 @@ -2378,8 +2378,10 @@ static int b43legacy_op_tx(struct ieee80 } else err = b43legacy_dma_tx(dev, skb, ctl); @@ -201,8 +239,8 @@ } diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-01 10:48:12.000000000 -0400 @@ -2883,12 +2883,11 @@ static int b43_op_tx(struct ieee80211_hw if (unlikely(skb->len < 2 + 2 + 6)) { @@ -232,9 +270,138 @@ return NETDEV_TX_OK; } +diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c +--- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c 2008-07-01 10:48:57.000000000 -0400 +@@ -64,7 +64,7 @@ int prism2_rx_80211(struct net_device *d + int hdrlen, phdrlen, head_need, tail_need; + u16 fc; + int prism_header, ret; +- struct ieee80211_hdr_4addr *hdr; ++ struct ieee80211_hdr_4addr *fhdr; + + iface = netdev_priv(dev); + local = iface->local; +@@ -83,8 +83,8 @@ int prism2_rx_80211(struct net_device *d + phdrlen = 0; + } + +- hdr = (struct ieee80211_hdr_4addr *) skb->data; +- fc = le16_to_cpu(hdr->frame_ctl); ++ fhdr = (struct ieee80211_hdr_4addr *) skb->data; ++ fc = le16_to_cpu(fhdr->frame_ctl); + + if (type == PRISM2_RX_MGMT && (fc & IEEE80211_FCTL_VERS)) { + printk(KERN_DEBUG "%s: dropped management frame with header " +@@ -551,7 +551,7 @@ hostap_rx_frame_wds(local_info_t *local, + hdr->addr1[2] != 0xff || hdr->addr1[3] != 0xff || + hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) { + /* RA (or BSSID) is not ours - drop */ +- PDEBUG(DEBUG_EXTRA, "%s: received WDS frame with " ++ PDEBUG(DEBUG_EXTRA2, "%s: received WDS frame with " + "not own or broadcast %s=%s\n", + local->dev->name, + fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID", +diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c +--- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig 2008-07-01 10:47:45.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c 2008-07-01 10:48:57.000000000 -0400 +@@ -1930,7 +1930,7 @@ static void handle_pspoll(local_info_t * + PDEBUG(DEBUG_PS, " PSPOLL and AID[15:14] not set\n"); + return; + } +- aid &= ~BIT(15) & ~BIT(14); ++ aid &= ~(BIT(15) | BIT(14)); + if (aid == 0 || aid > MAX_AID_TABLE_SIZE) { + PDEBUG(DEBUG_PS, " invalid aid=%d\n", aid); + return; +diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c +--- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-07-01 10:34:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-07-01 10:48:57.000000000 -0400 +@@ -533,10 +533,10 @@ static void prism2_detach(struct pcmcia_ + do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) + + #define CFG_CHECK2(fn, retf) \ +-do { int ret = (retf); \ +-if (ret != 0) { \ +- PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", ret); \ +- cs_error(link, fn, ret); \ ++do { int _ret = (retf); \ ++if (_ret != 0) { \ ++ PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", _ret); \ ++ cs_error(link, fn, _ret); \ + goto next_entry; \ + } \ + } while (0) +diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c +--- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-07-01 10:34:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-07-01 10:48:57.000000000 -0400 +@@ -2835,7 +2835,7 @@ static void hostap_passive_scan(unsigned + { + local_info_t *local = (local_info_t *) data; + struct net_device *dev = local->dev; +- u16 channel; ++ u16 chan; + + if (local->passive_scan_interval <= 0) + return; +@@ -2872,11 +2872,11 @@ static void hostap_passive_scan(unsigned + + printk(KERN_DEBUG "%s: passive scan channel %d\n", + dev->name, local->passive_scan_channel); +- channel = local->passive_scan_channel; ++ chan = local->passive_scan_channel; + local->passive_scan_state = PASSIVE_SCAN_WAIT; + local->passive_scan_timer.expires = jiffies + HZ / 10; + } else { +- channel = local->channel; ++ chan = local->channel; + local->passive_scan_state = PASSIVE_SCAN_LISTEN; + local->passive_scan_timer.expires = jiffies + + local->passive_scan_interval * HZ; +@@ -2884,9 +2884,9 @@ static void hostap_passive_scan(unsigned + + if (hfa384x_cmd_callback(dev, HFA384X_CMDCODE_TEST | + (HFA384X_TEST_CHANGE_CHANNEL << 8), +- channel, NULL, 0)) ++ chan, NULL, 0)) + printk(KERN_ERR "%s: passive scan channel set %d " +- "failed\n", dev->name, channel); ++ "failed\n", dev->name, chan); + + add_timer(&local->passive_scan_timer); + } +diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c +--- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-07-01 10:34:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-07-01 10:48:57.000000000 -0400 +@@ -594,7 +594,8 @@ void hostap_dump_tx_header(const char *n + } + + +-int hostap_80211_header_parse(const struct sk_buff *skb, unsigned char *haddr) ++static int hostap_80211_header_parse(const struct sk_buff *skb, ++ unsigned char *haddr) + { + struct hostap_interface *iface = netdev_priv(skb->dev); + local_info_t *local = iface->local; +@@ -857,7 +858,6 @@ const struct header_ops hostap_80211_ops + .rebuild = eth_rebuild_header, + .cache = eth_header_cache, + .cache_update = eth_header_cache_update, +- + .parse = hostap_80211_header_parse, + }; + EXPORT_SYMBOL(hostap_80211_ops); +@@ -1150,7 +1150,6 @@ EXPORT_SYMBOL(hostap_set_roaming); + EXPORT_SYMBOL(hostap_set_auth_algs); + EXPORT_SYMBOL(hostap_dump_rx_header); + EXPORT_SYMBOL(hostap_dump_tx_header); +-EXPORT_SYMBOL(hostap_80211_header_parse); + EXPORT_SYMBOL(hostap_80211_get_hdrlen); + EXPORT_SYMBOL(hostap_get_stats); + EXPORT_SYMBOL(hostap_setup_dev); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-07-01 10:48:12.000000000 -0400 @@ -2227,7 +2227,10 @@ static int iwl3945_scan_initiate(struct } @@ -314,8 +481,8 @@ IWL_DEBUG_MAC80211("leave - invalid channel\n"); spin_unlock_irqrestore(&priv->lock, flags); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-07-01 10:48:12.000000000 -0400 @@ -1774,7 +1774,10 @@ static int iwl4965_scan_initiate(struct } @@ -415,8 +582,8 @@ goto done; } diff -up linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c.orig linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c ---- linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c 2008-06-27 15:45:09.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c 2008-07-01 10:48:12.000000000 -0400 @@ -290,7 +290,7 @@ islpci_monitor_rx(islpci_private *priv, avs->version = cpu_to_be32(P80211CAPTURE_VERSION); @@ -427,8 +594,8 @@ avs->phytype = cpu_to_be32(6); /*OFDM: 6 for (g), 8 for (a) */ avs->channel = cpu_to_be32(channel_of_freq(freq)); diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-07-01 10:48:12.000000000 -0400 @@ -138,11 +138,8 @@ static void rt2500usb_bbp_write(struct r * Wait until the BBP becomes ready. */ @@ -499,8 +666,8 @@ static void rt2500usb_rf_write(struct rt2x00_dev *rt2x00dev, diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-06-27 15:43:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-06-27 15:45:09.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-07-01 10:48:12.000000000 -0400 @@ -75,7 +75,7 @@ static void rt2x00lib_start_link_tuner(s rt2x00lib_reset_link_tuner(rt2x00dev); @@ -596,8 +763,8 @@ */ rt2x00lib_remove_hw(rt2x00dev); diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-06-27 15:43:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-06-27 15:45:09.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-07-01 10:48:12.000000000 -0400 @@ -821,6 +821,7 @@ struct rt2x00_dev { /* * Scheduled work. @@ -607,8 +774,8 @@ struct work_struct filter_work; diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-06-27 15:43:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-06-27 15:45:09.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-07-01 10:48:12.000000000 -0400 @@ -428,7 +428,7 @@ void rt2x00mac_configure_filter(struct i if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags)) rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags); @@ -628,8 +795,8 @@ spin_unlock(&intf->lock); } diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-07-01 10:48:12.000000000 -0400 @@ -134,11 +134,8 @@ static void rt73usb_bbp_write(struct rt2 * Wait until the BBP becomes ready. */ @@ -697,9 +864,28 @@ } static void rt73usb_rf_write(struct rt2x00_dev *rt2x00dev, +diff -up linux-2.6.25.noarch/include/net/mac80211.h.orig linux-2.6.25.noarch/include/net/mac80211.h +--- linux-2.6.25.noarch/include/net/mac80211.h.orig 2008-07-01 10:47:45.000000000 -0400 ++++ linux-2.6.25.noarch/include/net/mac80211.h 2008-07-01 10:48:57.000000000 -0400 +@@ -595,6 +595,15 @@ enum ieee80211_key_alg { + ALG_CCMP, + }; + ++/** ++ * enum ieee80211_key_len - key length ++ * @WEP40: WEP 5 byte long key ++ * @WEP104: WEP 13 byte long key ++ */ ++enum ieee80211_key_len { ++ LEN_WEP40 = 5, ++ LEN_WEP104 = 13, ++}; + + /** + * enum ieee80211_key_flags - key flags diff -up linux-2.6.25.noarch/net/mac80211/key.c.orig linux-2.6.25.noarch/net/mac80211/key.c ---- linux-2.6.25.noarch/net/mac80211/key.c.orig 2008-06-27 15:43:41.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/key.c 2008-06-27 15:45:09.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/key.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/key.c 2008-07-01 10:48:12.000000000 -0400 @@ -380,6 +380,15 @@ void ieee80211_key_free(struct ieee80211 if (!key) return; @@ -716,9 +902,26 @@ spin_lock_irqsave(&key->sdata->local->key_lock, flags); __ieee80211_key_free(key); spin_unlock_irqrestore(&key->sdata->local->key_lock, flags); +diff -up linux-2.6.25.noarch/net/mac80211/wext.c.orig linux-2.6.25.noarch/net/mac80211/wext.c +--- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-07-01 10:47:46.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-01 10:48:57.000000000 -0400 +@@ -95,6 +95,13 @@ static int ieee80211_set_encryption(stru + } + } + ++ if (alg == ALG_WEP && ++ key_len != LEN_WEP40 && key_len != LEN_WEP104) { ++ ieee80211_key_free(key); ++ err = -EINVAL; ++ goto out_unlock; ++ } ++ + ieee80211_key_link(key, sdata, sta); + + if (set_tx_key || (!sta && !sdata->default_key && key)) diff -up linux-2.6.25.noarch/net/wireless/reg.c.orig linux-2.6.25.noarch/net/wireless/reg.c ---- linux-2.6.25.noarch/net/wireless/reg.c.orig 2008-06-27 15:43:49.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-27 15:44:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/reg.c.orig 2008-07-01 10:47:49.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-01 10:48:12.000000000 -0400 @@ -80,6 +80,23 @@ static const struct ieee80211_channel_ra IEEE80211_CHAN_RADAR), }; From fedora-extras-commits at redhat.com Tue Jul 1 15:31:38 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:31:38 GMT Subject: rpms/gnome-system-monitor/F-9 gnome-system-monitor.spec, 1.121, 1.122 Message-ID: <200807011531.m61FVcwI016013@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-system-monitor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15893 Modified Files: gnome-system-monitor.spec Log Message: fix spec Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/F-9/gnome-system-monitor.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- gnome-system-monitor.spec 1 Jul 2008 15:20:56 -0000 1.121 +++ gnome-system-monitor.spec 1 Jul 2008 15:30:49 -0000 1.122 @@ -123,7 +123,7 @@ %{_datadir}/dbus-1/system-services/org.gnome.SystemMonitor.Mechanism.service -<<<<<<< gnome-system-monitor.spec +%changelog * Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 - Update to 2.22.3 From fedora-extras-commits at redhat.com Tue Jul 1 15:34:29 2008 From: fedora-extras-commits at redhat.com (Kostas Georgiou (georgiou)) Date: Tue, 1 Jul 2008 15:34:29 GMT Subject: rpms/ganglia/F-8 ganglia.spec,1.10,1.11 Message-ID: <200807011534.m61FYTqo016170@cvs-int.fedora.redhat.com> Author: georgiou Update of /cvs/extras/rpms/ganglia/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15844 Modified Files: ganglia.spec Log Message: Rebuild for new rrdtool Upgrade to the latest version also Index: ganglia.spec =================================================================== RCS file: /cvs/extras/rpms/ganglia/F-8/ganglia.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ganglia.spec 28 Feb 2008 03:34:38 -0000 1.10 +++ ganglia.spec 1 Jul 2008 15:33:29 -0000 1.11 @@ -1,6 +1,6 @@ Name: ganglia Version: 3.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ganglia Distributed Monitoring System Group: Applications/Internet @@ -205,6 +205,9 @@ %{_datadir}/%{name} %changelog +* Tue Jul 1 2008 Kostas Georgiou 3.0.7-2 +- Rebuild for new rrdtool release + * Wed Feb 27 2008 Jarod Wilson 3.0.7-1 - New upstream release - Fixes "Show Hosts" toggle From fedora-extras-commits at redhat.com Tue Jul 1 15:37:26 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:37:26 GMT Subject: rpms/gvfs/F-9 .cvsignore, 1.17, 1.18 gvfs.spec, 1.57, 1.58 sources, 1.17, 1.18 Message-ID: <200807011537.m61FbQUo016332@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gvfs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16249 Modified Files: .cvsignore gvfs.spec sources Log Message: 0.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 6 Jun 2008 14:21:21 -0000 1.17 +++ .cvsignore 1 Jul 2008 15:35:44 -0000 1.18 @@ -1 +1 @@ -gvfs-0.2.4.tar.bz2 +gvfs-0.2.5.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-9/gvfs.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- gvfs.spec 24 Jun 2008 11:56:46 -0000 1.57 +++ gvfs.spec 1 Jul 2008 15:35:44 -0000 1.58 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 0.2.4 -Release: 5%{?dist} +Version: 0.2.5 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -35,18 +35,12 @@ BuildRequires: libtool Patch1: gvfs-0.2.2-archive-integration.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=448560 -Patch2: gvfs-0.2.4-smb-recurse.patch - Patch3: gvfs-0.2.4-libarchive-iso.patch Patch4: gvfs-0.2.4-smb-enable-debug.patch # https://bugzilla.redhat.com/show_bug.cgi?id=450453 Patch5: gvfs-obexftp-fallback-icon.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=522933 -Patch6: gvfs-ftp-read-directory-2.patch - # http://bugzilla.gnome.org/show_bug.cgi?id=525779 Patch7: gvfs-0.2.4-trash-automount.patch @@ -78,11 +72,9 @@ %prep %setup -q %patch1 -p0 -b .archive-integration -%patch2 -p0 -b .smb-recurse %patch3 -p0 -b .archive-iso %patch4 -p1 -b .debug %patch5 -p0 -b .obexftp -%patch6 -p0 -b .recurse %patch7 -p1 -b .trash @@ -199,6 +191,9 @@ %changelog +* Tue Jul 1 2008 Matthias Clasen - 0.2.5-1 +- Update to 0.2.5 + * Tue Jun 24 2008 Tomas Bzatek - 0.2.4-5 - gvfsd-trash: Skip autofs mounts Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 6 Jun 2008 14:21:21 -0000 1.17 +++ sources 1 Jul 2008 15:35:44 -0000 1.18 @@ -1 +1 @@ -08fc85c24ccaf15913dbcc43ea4d8ae8 gvfs-0.2.4.tar.bz2 +01676053d9481022ade9a5274576541b gvfs-0.2.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:41:28 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:41:28 GMT Subject: rpms/gail/F-9 .cvsignore, 1.38, 1.39 gail.spec, 1.73, 1.74 sources, 1.38, 1.39 Message-ID: <200807011541.m61FfSk3016556@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16474 Modified Files: .cvsignore gail.spec sources Log Message: 1.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gail/F-9/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 7 Apr 2008 13:11:49 -0000 1.38 +++ .cvsignore 1 Jul 2008 15:40:33 -0000 1.39 @@ -1 +1 @@ -gail-1.22.1.tar.bz2 +gail-1.22.3.tar.bz2 Index: gail.spec =================================================================== RCS file: /cvs/extras/rpms/gail/F-9/gail.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- gail.spec 7 Apr 2008 13:11:49 -0000 1.73 +++ gail.spec 1 Jul 2008 15:40:33 -0000 1.74 @@ -4,7 +4,7 @@ Summary: Accessibility implementation for GTK+ and GNOME libraries Name: gail -Version: 1.22.1 +Version: 1.22.3 Release: 1%{?dist} URL: http://developer.gnome.org/projects/gap Source0: http://download.gnome.org/sources/gail/1.22/%{name}-%{version}.tar.bz2 @@ -86,6 +86,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Jul 1 2008 Matthias Clasen - 1.22.3-1 +- Update to 1.22.3 + * Mon Apr 7 2008 Matthias Clasen - 1.22.1-1 - Update to 1.22.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gail/F-9/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 7 Apr 2008 13:11:49 -0000 1.38 +++ sources 1 Jul 2008 15:40:33 -0000 1.39 @@ -1 +1 @@ -521e2e1ae1dfe4699c037b1be205b0b3 gail-1.22.1.tar.bz2 +1b0d2b3d5f89fb620ce6122e52578b41 gail-1.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:43:11 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:43:11 GMT Subject: rpms/libwnck/F-9 .cvsignore, 1.62, 1.63 libwnck.spec, 1.96, 1.97 sources, 1.62, 1.63 Message-ID: <200807011543.m61FhB48016703@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libwnck/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16616 Modified Files: .cvsignore libwnck.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libwnck/F-9/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 7 Apr 2008 22:22:27 -0000 1.62 +++ .cvsignore 1 Jul 2008 15:42:13 -0000 1.63 @@ -1 +1 @@ -libwnck-2.22.1.tar.bz2 +libwnck-2.22.3.tar.bz2 Index: libwnck.spec =================================================================== RCS file: /cvs/extras/rpms/libwnck/F-9/libwnck.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- libwnck.spec 7 Apr 2008 22:22:27 -0000 1.96 +++ libwnck.spec 1 Jul 2008 15:42:13 -0000 1.97 @@ -5,7 +5,7 @@ Summary: Window Navigator Construction Kit Name: libwnck -Version: 2.22.1 +Version: 2.22.3 Release: 1%{?dist} URL: http://download.gnome.org/sources/libwnck/ Source0: http://download.gnome.org/sources/libwnck/2.22/%{name}-%{version}.tar.bz2 @@ -95,6 +95,9 @@ %doc %{_datadir}/gtk-doc/html/libwnck %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Mon Apr 7 2008 Matthias Clasen - 2.22.1-1 - Update to 2.22.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libwnck/F-9/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 7 Apr 2008 22:22:27 -0000 1.62 +++ sources 1 Jul 2008 15:42:13 -0000 1.63 @@ -1 +1 @@ -6b16643a107d9fc37136335939ab3f1a libwnck-2.22.1.tar.bz2 +12cf787efa0b9d95bc53613bcc7d958e libwnck-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 15:46:09 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 15:46:09 GMT Subject: rpms/gnome-session/F-9 .cvsignore, 1.54, 1.55 gnome-session.spec, 1.157, 1.158 sources, 1.54, 1.55 Message-ID: <200807011546.m61Fk9pL016938@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-session/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16881 Modified Files: .cvsignore gnome-session.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-session/F-9/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 11 Apr 2008 03:06:02 -0000 1.54 +++ .cvsignore 1 Jul 2008 15:45:23 -0000 1.55 @@ -1 +1 @@ -gnome-session-2.22.1.1.tar.bz2 +gnome-session-2.22.3.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-session/F-9/gnome-session.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- gnome-session.spec 11 Apr 2008 03:06:02 -0000 1.157 +++ gnome-session.spec 1 Jul 2008 15:45:23 -0000 1.158 @@ -11,7 +11,7 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.22.1.1 +Version: 2.22.3 Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.22/%{name}-%{version}.tar.bz2 @@ -173,6 +173,9 @@ %doc %{_mandir}/man*/* %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Thu Apr 10 2008 Matthias Clasen - 2.22.1.1-1 - Update to 2.22.1.1 (fixes a crash in the trash migration code) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-session/F-9/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 11 Apr 2008 03:06:02 -0000 1.54 +++ sources 1 Jul 2008 15:45:23 -0000 1.55 @@ -1 +1 @@ -6e1e975efb0c717b09821ed4231eb584 gnome-session-2.22.1.1.tar.bz2 +859b61b5368aa000c9bcb8b0d0688ca2 gnome-session-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 16:02:06 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 16:02:06 GMT Subject: rpms/gtk2-engines/F-9 .cvsignore, 1.51, 1.52 gtk2-engines.spec, 1.91, 1.92 sources, 1.52, 1.53 Message-ID: <200807011602.m61G26GY024762@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2-engines/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18059 Modified Files: .cvsignore gtk2-engines.spec sources Log Message: 2.14.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2-engines/F-9/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 28 May 2008 03:52:05 -0000 1.51 +++ .cvsignore 1 Jul 2008 15:59:35 -0000 1.52 @@ -1 +1 @@ -gtk-engines-2.14.2.tar.bz2 +gtk-engines-2.14.3.tar.bz2 Index: gtk2-engines.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2-engines/F-9/gtk2-engines.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- gtk2-engines.spec 28 May 2008 04:02:38 -0000 1.91 +++ gtk2-engines.spec 1 Jul 2008 15:59:35 -0000 1.92 @@ -2,7 +2,7 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.14.2 +Version: 2.14.3 Release: 1%{?dist} # for details on which engines are GPL vs LGPL, see COPYING License: GPLv2+ and LGPLv2+ @@ -68,6 +68,9 @@ %{_datadir}/gtk-engines %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.14.3-1 +- Update to 2.14.3 + * Tue May 27 2008 Matthias Clasen - 2.14.2-1 - Update to 2.14.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2-engines/F-9/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 28 May 2008 03:52:05 -0000 1.52 +++ sources 1 Jul 2008 15:59:35 -0000 1.53 @@ -1 +1 @@ -7953d19486de6fae99922b28113e079b gtk-engines-2.14.2.tar.bz2 +be92ddda833defb7296a850331c03d05 gtk-engines-2.14.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 16:14:28 2008 From: fedora-extras-commits at redhat.com (Guenther Deschner (gd)) Date: Tue, 1 Jul 2008 16:14:28 GMT Subject: rpms/samba/F-9 .cvsignore, 1.49, 1.50 samba.spec, 1.157, 1.158 sources, 1.53, 1.54 Message-ID: <200807011614.m61GESUb025788@cvs-int.fedora.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25721 Modified Files: .cvsignore samba.spec sources Log Message: Update to 3.2.0 final resolves: #452622 Guenther Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-9/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 11 Jun 2008 17:06:52 -0000 1.49 +++ .cvsignore 1 Jul 2008 16:13:51 -0000 1.50 @@ -1 +1 @@ -samba-3.2.0rc2.tar.gz +samba-3.2.0.tar.gz Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- samba.spec 11 Jun 2008 17:02:14 -0000 1.157 +++ samba.spec 1 Jul 2008 16:13:51 -0000 1.158 @@ -1,5 +1,5 @@ -%define main_release 16 -%define samba_version 3.2.0rc2 +%define main_release 17 +%define samba_version 3.2.0 %define tdb_version 1.1.1 %define talloc_version 1.2.0 @@ -7,14 +7,12 @@ Name: samba Epoch: 0 Version: 3.2.0 -Release: 1.rc2.%{main_release}%{?dist} +Release: 2.%{main_release}%{?dist} License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ -#TAG: change for non-pre -Source: http://download.samba.org/samba/ftp/rc/%{name}-%{version}rc2.tar.gz -#Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz +Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz # Red Hat specific replacement-files Source1: samba.log @@ -846,6 +844,10 @@ %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Tue Jul 1 2008 Guenther Deschner - 3.2.0-2.17 +- Update to 3.2.0 final +- resolves: #452622 + * Tue Jun 10 2008 Guenther Deschner - 3.2.0-1.rc2.16 - Update to 3.2.0rc2 - resolves: #449522 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-9/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Jun 2008 17:06:52 -0000 1.53 +++ sources 1 Jul 2008 16:13:51 -0000 1.54 @@ -1 +1 @@ -a58610bfa60a1f555bae3cd31dacd955 samba-3.2.0rc2.tar.gz +318d5b1ec0507f0f6077b1470f9fc028 samba-3.2.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 16:44:54 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 1 Jul 2008 16:44:54 GMT Subject: rpms/portreserve/devel portreserve-0.0.3.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.3, 1.4 portreserve.spec, 1.2, 1.3 sources, 1.3, 1.4 portreserve-0.0.2.tar.bz2.sig, 1.1, NONE Message-ID: <200807011644.m61GisOZ027747@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/portreserve/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27667 Modified Files: .cvsignore portreserve.spec sources Added Files: portreserve-0.0.3.tar.bz2.sig Removed Files: portreserve-0.0.2.tar.bz2.sig Log Message: * Tue Jul 1 2008 Tim Waugh 0.0.3-1 - 0.0.3: - Allow multiple services to be defined in a single configuration file. - Allow protocol specifications, e.g. ipp/udp. --- NEW FILE portreserve-0.0.3.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/portreserve/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2008 21:10:49 -0000 1.3 +++ .cvsignore 1 Jul 2008 16:44:10 -0000 1.4 @@ -1,2 +1,3 @@ portreserve-0.0.1.tar.bz2 portreserve-0.0.2.tar.bz2 +portreserve-0.0.3.tar.bz2 Index: portreserve.spec =================================================================== RCS file: /cvs/pkgs/rpms/portreserve/devel/portreserve.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portreserve.spec 30 Jun 2008 21:10:49 -0000 1.2 +++ portreserve.spec 1 Jul 2008 16:44:10 -0000 1.3 @@ -1,6 +1,6 @@ Summary: TCP port reservation utility Name: portreserve -Version: 0.0.2 +Version: 0.0.3 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -60,6 +60,12 @@ %{_mandir}/*/* %changelog +* Tue Jul 1 2008 Tim Waugh 0.0.3-1 +- 0.0.3: + - Allow multiple services to be defined in a single configuration + file. + - Allow protocol specifications, e.g. ipp/udp. + * Mon Jun 30 2008 Tim Waugh 0.0.2-1 - 0.0.2. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/portreserve/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2008 21:10:49 -0000 1.3 +++ sources 1 Jul 2008 16:44:10 -0000 1.4 @@ -1 +1 @@ -32c125aa1bc194dd0c10f313061b2c4e portreserve-0.0.2.tar.bz2 +8761cd254fe845038be92de8b1156e46 portreserve-0.0.3.tar.bz2 --- portreserve-0.0.2.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 16:48:34 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 1 Jul 2008 16:48:34 GMT Subject: rpms/portreserve/F-9 portreserve-0.0.3.tar.bz2.sig, NONE, 1.1 portreserve.spec, 1.2, 1.3 sources, 1.3, 1.4 portreserve-0.0.2.tar.bz2.sig, 1.1, NONE Message-ID: <200807011648.m61GmYL9028183@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/portreserve/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28043 Modified Files: portreserve.spec sources Added Files: portreserve-0.0.3.tar.bz2.sig Removed Files: portreserve-0.0.2.tar.bz2.sig Log Message: * Tue Jul 1 2008 Tim Waugh 0.0.3-1 - 0.0.3: - Allow multiple services to be defined in a single configuration file. - Allow protocol specifications, e.g. ipp/udp. --- NEW FILE portreserve-0.0.3.tar.bz2.sig --- ?? Index: portreserve.spec =================================================================== RCS file: /cvs/pkgs/rpms/portreserve/F-9/portreserve.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portreserve.spec 30 Jun 2008 21:11:44 -0000 1.2 +++ portreserve.spec 1 Jul 2008 16:47:46 -0000 1.3 @@ -1,6 +1,6 @@ Summary: TCP port reservation utility Name: portreserve -Version: 0.0.2 +Version: 0.0.3 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -60,6 +60,12 @@ %{_mandir}/*/* %changelog +* Tue Jul 1 2008 Tim Waugh 0.0.3-1 +- 0.0.3: + - Allow multiple services to be defined in a single configuration + file. + - Allow protocol specifications, e.g. ipp/udp. + * Mon Jun 30 2008 Tim Waugh 0.0.2-1 - 0.0.2. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/portreserve/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2008 21:11:44 -0000 1.3 +++ sources 1 Jul 2008 16:47:46 -0000 1.4 @@ -1 +1 @@ -32c125aa1bc194dd0c10f313061b2c4e portreserve-0.0.2.tar.bz2 +8761cd254fe845038be92de8b1156e46 portreserve-0.0.3.tar.bz2 --- portreserve-0.0.2.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 16:50:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:50:21 +0000 Subject: [pkgdb] antlr3 was added for walters Message-ID: <200807011650.m61GoLld018000@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package antlr3 with summary ANother Tool for Language Recognition Kevin Fenzi (kevin) has approved Package antlr3 Kevin Fenzi (kevin) has added a Fedora devel branch for antlr3 with an owner of walters Kevin Fenzi (kevin) has approved antlr3 in Fedora devel Kevin Fenzi (kevin) has approved Package antlr3 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on antlr3 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on antlr3 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on antlr3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/antlr3 From fedora-extras-commits at redhat.com Tue Jul 1 16:50:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:50:24 +0000 Subject: [pkgdb] antlr3 (Fedora, 8) updated by kevin Message-ID: <200807011650.m61GoOS4018019@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for antlr3 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on antlr3 (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on antlr3 (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on antlr3 (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on antlr3 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/antlr3 From fedora-extras-commits at redhat.com Tue Jul 1 16:50:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:50:24 +0000 Subject: [pkgdb] antlr3 (Fedora, devel) updated by kevin Message-ID: <200807011650.m61GoOS7018019@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on antlr3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/antlr3 From fedora-extras-commits at redhat.com Tue Jul 1 16:50:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:50:24 +0000 Subject: [pkgdb] antlr3 (Fedora, 9) updated by kevin Message-ID: <200807011650.m61GoOSA018019@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for antlr3 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on antlr3 (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on antlr3 (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on antlr3 (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on antlr3 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/antlr3 From fedora-extras-commits at redhat.com Tue Jul 1 16:51:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:51:10 GMT Subject: rpms/antlr3 - New directory Message-ID: <200807011651.m61GpAoE028464@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/antlr3 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28377/rpms/antlr3 Log Message: Directory /cvs/extras/rpms/antlr3 added to the repository From fedora-extras-commits at redhat.com Tue Jul 1 16:51:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:51:27 GMT Subject: rpms/antlr3/devel - New directory Message-ID: <200807011651.m61GpRqK028486@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/antlr3/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28377/rpms/antlr3/devel Log Message: Directory /cvs/extras/rpms/antlr3/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 1 16:51:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:51:47 GMT Subject: rpms/antlr3 Makefile,NONE,1.1 Message-ID: <200807011651.m61Gplol028516@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/antlr3 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28377/rpms/antlr3 Added Files: Makefile Log Message: Setup of module antlr3 --- NEW FILE Makefile --- # Top level Makefile for module antlr3 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 1 16:52:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:52:03 GMT Subject: rpms/antlr3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807011652.m61Gq3sX028539@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/antlr3/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28377/rpms/antlr3/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module antlr3 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: antlr3 # $Id: Makefile,v 1.1 2008/07/01 16:51:47 kevin Exp $ NAME := antlr3 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 1 16:52:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:52:35 +0000 Subject: [pkgdb] tex-zfuzz was added for dwheeler Message-ID: <200807011652.m61GqZLx018221@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package tex-zfuzz with summary Type-checker and LaTeX style for Z spec language Kevin Fenzi (kevin) has approved Package tex-zfuzz Kevin Fenzi (kevin) has added a Fedora devel branch for tex-zfuzz with an owner of dwheeler Kevin Fenzi (kevin) has approved tex-zfuzz in Fedora devel Kevin Fenzi (kevin) has approved Package tex-zfuzz Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-zfuzz (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-zfuzz (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-zfuzz (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-zfuzz From fedora-extras-commits at redhat.com Tue Jul 1 16:52:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:52:37 +0000 Subject: [pkgdb] tex-zfuzz (Fedora, 8) updated by kevin Message-ID: <200807011652.m61Gqcu1018242@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for tex-zfuzz Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-zfuzz (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-zfuzz (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-zfuzz (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-zfuzz (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-zfuzz From fedora-extras-commits at redhat.com Tue Jul 1 16:52:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:52:37 +0000 Subject: [pkgdb] tex-zfuzz (Fedora, devel) updated by kevin Message-ID: <200807011652.m61Gqcu4018242@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-zfuzz (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-zfuzz From fedora-extras-commits at redhat.com Tue Jul 1 16:52:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:52:37 +0000 Subject: [pkgdb] tex-zfuzz (Fedora, 9) updated by kevin Message-ID: <200807011652.m61Gqcu7018242@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for tex-zfuzz Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-zfuzz (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-zfuzz (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-zfuzz (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-zfuzz (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-zfuzz From fedora-extras-commits at redhat.com Tue Jul 1 16:53:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:53:27 GMT Subject: rpms/tex-zfuzz - New directory Message-ID: <200807011653.m61GrRbA028748@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-zfuzz In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv28714/rpms/tex-zfuzz Log Message: Directory /cvs/extras/rpms/tex-zfuzz added to the repository From fedora-extras-commits at redhat.com Tue Jul 1 16:53:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:53:41 GMT Subject: rpms/tex-zfuzz/devel - New directory Message-ID: <200807011653.m61GrflJ028769@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-zfuzz/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv28714/rpms/tex-zfuzz/devel Log Message: Directory /cvs/extras/rpms/tex-zfuzz/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 1 16:53:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:53:54 GMT Subject: rpms/tex-zfuzz Makefile,NONE,1.1 Message-ID: <200807011653.m61GrsaS028800@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-zfuzz In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv28714/rpms/tex-zfuzz Added Files: Makefile Log Message: Setup of module tex-zfuzz --- NEW FILE Makefile --- # Top level Makefile for module tex-zfuzz all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 1 16:54:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 16:54:12 GMT Subject: rpms/tex-zfuzz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807011654.m61GsCAN028831@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-zfuzz/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv28714/rpms/tex-zfuzz/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tex-zfuzz --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tex-zfuzz # $Id: Makefile,v 1.1 2008/07/01 16:53:55 kevin Exp $ NAME := tex-zfuzz SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 1 16:55:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 16:55:44 +0000 Subject: [pkgdb] perl-Test-MockObject (Fedora EPEL, 5) updated by kevin Message-ID: <200807011655.m61GtiXQ018596@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Test-MockObject Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-MockObject (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-MockObject (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-MockObject (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Test-MockObject in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-MockObject (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-MockObject From fedora-extras-commits at redhat.com Tue Jul 1 17:07:59 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 1 Jul 2008 17:07:59 GMT Subject: rpms/jd/F-8 .cvsignore, 1.249, 1.250 jd.spec, 1.282, 1.283 sources, 1.250, 1.251 Message-ID: <200807011707.m61H7xKP004141@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 2 2008 Mamoru Tasaka - svn 2161 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- .cvsignore 30 Jun 2008 16:56:19 -0000 1.249 +++ .cvsignore 1 Jul 2008 17:06:26 -0000 1.250 @@ -1 +1 @@ -jd-2.0.0-svn2159_trunk.tgz +jd-2.0.0-svn2161_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- jd.spec 30 Jun 2008 16:56:19 -0000 1.282 +++ jd.spec 1 Jul 2008 17:06:26 -0000 1.283 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2159_trunk +%define strtag svn2161_trunk %define repoid 31373 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 1 2008 Mamoru Tasaka -- svn 2159 +* Wed Jul 2 2008 Mamoru Tasaka +- svn 2161 * Tue Jun 24 2008 Mamoru Tasaka - F-10: rebuild against new gnutls Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- sources 30 Jun 2008 16:56:19 -0000 1.250 +++ sources 1 Jul 2008 17:06:26 -0000 1.251 @@ -1 +1 @@ -3351b524019e9a03c2ba1faaeb433c76 jd-2.0.0-svn2159_trunk.tgz +922cf9146fa8d9b5bc2b0c01a2854330 jd-2.0.0-svn2161_trunk.tgz From fedora-extras-commits at redhat.com Tue Jul 1 17:08:26 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 1 Jul 2008 17:08:26 GMT Subject: rpms/jd/F-9 .cvsignore, 1.256, 1.257 jd.spec, 1.293, 1.294 sources, 1.257, 1.258 Message-ID: <200807011708.m61H8Qhr004176@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 2 2008 Mamoru Tasaka - svn 2161 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- .cvsignore 30 Jun 2008 16:56:37 -0000 1.256 +++ .cvsignore 1 Jul 2008 17:06:59 -0000 1.257 @@ -1 +1 @@ -jd-2.0.0-svn2159_trunk.tgz +jd-2.0.0-svn2161_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- jd.spec 30 Jun 2008 16:56:37 -0000 1.293 +++ jd.spec 1 Jul 2008 17:06:59 -0000 1.294 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2159_trunk +%define strtag svn2161_trunk %define repoid 31373 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 1 2008 Mamoru Tasaka -- svn 2159 +* Wed Jul 2 2008 Mamoru Tasaka +- svn 2161 * Tue Jun 24 2008 Mamoru Tasaka - F-10: rebuild against new gnutls Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- sources 30 Jun 2008 16:56:37 -0000 1.257 +++ sources 1 Jul 2008 17:06:59 -0000 1.258 @@ -1 +1 @@ -3351b524019e9a03c2ba1faaeb433c76 jd-2.0.0-svn2159_trunk.tgz +922cf9146fa8d9b5bc2b0c01a2854330 jd-2.0.0-svn2161_trunk.tgz From fedora-extras-commits at redhat.com Tue Jul 1 17:08:28 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 1 Jul 2008 17:08:28 GMT Subject: rpms/jd/devel .cvsignore, 1.256, 1.257 jd.spec, 1.299, 1.300 sources, 1.257, 1.258 Message-ID: <200807011708.m61H8SNR004184@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979/devel Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 2 2008 Mamoru Tasaka - svn 2161 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- .cvsignore 30 Jun 2008 16:57:07 -0000 1.256 +++ .cvsignore 1 Jul 2008 17:07:26 -0000 1.257 @@ -1 +1 @@ -jd-2.0.0-svn2159_trunk.tgz +jd-2.0.0-svn2161_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- jd.spec 30 Jun 2008 16:57:07 -0000 1.299 +++ jd.spec 1 Jul 2008 17:07:26 -0000 1.300 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2159_trunk +%define strtag svn2161_trunk %define repoid 31373 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 1 2008 Mamoru Tasaka -- svn 2159 +* Wed Jul 2 2008 Mamoru Tasaka +- svn 2161 * Tue Jun 24 2008 Mamoru Tasaka - F-10: rebuild against new gnutls Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- sources 30 Jun 2008 16:57:07 -0000 1.257 +++ sources 1 Jul 2008 17:07:26 -0000 1.258 @@ -1 +1 @@ -3351b524019e9a03c2ba1faaeb433c76 jd-2.0.0-svn2159_trunk.tgz +922cf9146fa8d9b5bc2b0c01a2854330 jd-2.0.0-svn2161_trunk.tgz From fedora-extras-commits at redhat.com Tue Jul 1 17:22:21 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 17:22:21 GMT Subject: rpms/gnome-games/F-9 .cvsignore, 1.80, 1.81 gnome-games.spec, 1.175, 1.176 sources, 1.85, 1.86 Message-ID: <200807011722.m61HMLKL005284@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-games/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5166 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-games/F-9/.cvsignore,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- .cvsignore 30 May 2008 05:38:18 -0000 1.80 +++ .cvsignore 1 Jul 2008 17:21:25 -0000 1.81 @@ -1 +1 @@ -gnome-games-2.22.2.1.tar.bz2 +gnome-games-2.22.3.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-games/F-9/gnome-games.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- gnome-games.spec 30 May 2008 05:38:18 -0000 1.175 +++ gnome-games.spec 1 Jul 2008 17:21:25 -0000 1.176 @@ -43,7 +43,7 @@ Summary: GNOME games Name: gnome-games -Version: 2.22.2.1 +Version: 2.22.3 Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL+ @@ -331,6 +331,9 @@ %changelog +* Tue Jul 1 2008 Matthias Clasen - 1:2.22.3-1 +- Update to 2.22.3 + * Fri May 30 2008 Matthias Clasen - 1:2.22.2.1-1 - Update to 2.22.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-games/F-9/sources,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- sources 30 May 2008 05:38:18 -0000 1.85 +++ sources 1 Jul 2008 17:21:25 -0000 1.86 @@ -1 +1 @@ -9805b4f16657c189954005c57c31cfe9 gnome-games-2.22.2.1.tar.bz2 +d6feb460f7db007aafb35b7a46b947be gnome-games-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 17:28:40 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 1 Jul 2008 17:28:40 GMT Subject: rpms/Pixie/devel .cvsignore, 1.3, 1.4 sources, 1.5, 1.6 Pixie.spec, 1.9, 1.10 Pixie-src-2.2.3-arches.patch, 1.1, NONE Message-ID: <200807011728.m61HSeXO005872@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/Pixie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5727 Modified Files: .cvsignore sources Pixie.spec Removed Files: Pixie-src-2.2.3-arches.patch Log Message: - Update to 2.2.4 (final) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Dec 2007 00:30:01 -0000 1.3 +++ .cvsignore 1 Jul 2008 17:27:31 -0000 1.4 @@ -1 +1 @@ -Pixie-src-2.2.3.tgz +Pixie-src-2.2.4.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Mar 2008 17:09:00 -0000 1.5 +++ sources 1 Jul 2008 17:27:31 -0000 1.6 @@ -1 +1 @@ -08fb16c406d191254afbf55689ff8352 Pixie-src-2.2.3.tgz +adc0be52806a885910456886322fec41 Pixie-src-2.2.4.tgz Index: Pixie.spec =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/Pixie.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Pixie.spec 5 Mar 2008 17:26:45 -0000 1.9 +++ Pixie.spec 1 Jul 2008 17:27:31 -0000 1.10 @@ -1,13 +1,12 @@ Name: Pixie -Version: 2.2.3 -Release: 3%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Summary: 3D renderer Renderman compliant Group: Applications/Multimedia License: LGPLv2+ URL: http://www.renderpixie.com/ Source0: http://downloads.sourceforge.net/pixie/%{name}-src-%{version}.tgz -Patch0: Pixie-src-2.2.3-arches.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: autoconf, automake, libtool, tcsh @@ -49,7 +48,6 @@ %prep %setup -q -n %{name} -%patch0 -p1 -b .arches # Use autotool to prevent to do special tweaks #csh makeunix @@ -121,6 +119,9 @@ %changelog +* Tue Jul 1 2008 kwizart < kwizart at gmail.com > - 2.2.4-1 +- Update to 2.2.4 (final) + * Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 2.2.3-3 - Update to 2.2.3 (final) - Backport condionnal arches from r1144. --- Pixie-src-2.2.3-arches.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 17:31:30 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 17:31:30 GMT Subject: rpms/ScientificPython/devel .cvsignore, 1.2, 1.3 ScientificPython.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <200807011731.m61HVUAY006190@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/ScientificPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6100 Modified Files: .cvsignore ScientificPython.spec sources Log Message: * Tue Jul 1 2008 Jef Spaleta - 2.6.1-1 - Latest Stable release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Dec 2006 03:15:45 -0000 1.2 +++ .cvsignore 1 Jul 2008 17:30:35 -0000 1.3 @@ -1 +1 @@ -ScientificPython-2.6.tar.gz +ScientificPython-2.6.1.tar.gz Index: ScientificPython.spec =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ScientificPython.spec 19 Feb 2008 07:22:36 -0000 1.8 +++ ScientificPython.spec 1 Jul 2008 17:30:35 -0000 1.9 @@ -2,14 +2,14 @@ %define pyver %(python -c 'import sys ; print sys.version[:3]') Name: ScientificPython -Version: 2.6 -Release: 12%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Summary: A collection of Python modules that are useful for scientific computing Group: Development/Languages License: CeCILL URL: http://dirac.cnrs-orleans.fr/ScientificPython/ -Source0: http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-2.6.tar.gz +Source0: http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-2.6.1.tar.gz Patch0: ScientificPython-netcdf-location.patch Patch1: ScientificPython-netcdf-64bit-location.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -152,6 +152,9 @@ %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf %changelog +* Tue Jul 1 2008 Jef Spaleta - 2.6.1-1 +- Latest Stable release + * Tue Feb 19 2008 Fedora Release Engineering - 2.6-12 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Dec 2006 03:15:45 -0000 1.2 +++ sources 1 Jul 2008 17:30:35 -0000 1.3 @@ -1 +1 @@ -6ebd96fc8a4e015adab2c57826d52e9f ScientificPython-2.6.tar.gz +1b93026dd02529607131e5b0b83aeec4 ScientificPython-2.6.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 17:38:01 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 17:38:01 GMT Subject: rpms/gnome-session/F-9 gnome-session.spec,1.158,1.159 Message-ID: <200807011738.m61Hc1JO006882@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-session/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6770 Modified Files: gnome-session.spec Log Message: 2.22.3 Index: gnome-session.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-session/F-9/gnome-session.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- gnome-session.spec 1 Jul 2008 15:45:23 -0000 1.158 +++ gnome-session.spec 1 Jul 2008 17:37:10 -0000 1.159 @@ -43,9 +43,6 @@ # need to figure something out here Patch13: gnome-session-2.17.5-window-manager.patch -# don't pop up the dialog as it can take longer than 5 seconds -Patch20: gnome-session-2.19.4-atspi-timeout.patch - # http://bugzilla.gnome.org/show_bug.cgi?id=411506 #Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch @@ -91,7 +88,6 @@ %patch1 -p1 -b .icons %patch9 -p1 -b .no-crashes %patch13 -p1 -b .window-manager -%patch20 -p1 -b .timeout #%patch21 -p0 -b .use-gdm-hints #%patch22 -p1 -b .ice-leaks From fedora-extras-commits at redhat.com Tue Jul 1 17:38:52 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 1 Jul 2008 17:38:52 GMT Subject: rpms/perl-Test-MockObject/EL-5 perl-Test-MockObject.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200807011738.m61HcqTl007034@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Test-MockObject/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6867 Modified Files: perl-Test-MockObject.spec sources Log Message: Merge from devel Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MockObject/EL-5/perl-Test-MockObject.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Test-MockObject.spec 5 Oct 2006 11:26:26 -0000 1.14 +++ perl-Test-MockObject.spec 1 Jul 2008 17:37:53 -0000 1.15 @@ -1,10 +1,10 @@ Name: perl-Test-MockObject -Version: 1.07 -Release: 1%{?dist} +Version: 1.08 +Release: 2%{?dist} Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,6 +57,12 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 1.08-2 +- rebuild for new perl + +* Fri Jun 29 2007 Jose Pedro Oliveira - 1.08-1 +- Update to 1.08. + * Thu Oct 5 2006 Jose Pedro Oliveira - 1.07-1 - Update to 1.07. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MockObject/EL-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 5 Oct 2006 11:26:26 -0000 1.10 +++ sources 1 Jul 2008 17:37:53 -0000 1.11 @@ -1 +1 @@ -197af22ac675405199693ed68f0959e1 Test-MockObject-1.07.tar.gz +2a80521f544998d9e493d2898da38c26 Test-MockObject-1.08.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 17:41:11 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 1 Jul 2008 17:41:11 GMT Subject: rpms/Pixie/devel Pixie.spec,1.10,1.11 Message-ID: <200807011741.m61HfBPZ007300@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/Pixie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7192 Modified Files: Pixie.spec Log Message: Fix default defattr Index: Pixie.spec =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/Pixie.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Pixie.spec 1 Jul 2008 17:27:31 -0000 1.10 +++ Pixie.spec 1 Jul 2008 17:40:15 -0000 1.11 @@ -108,8 +108,8 @@ %{_libdir}/Pixie/ %files devel -%doc DEVNOTES %defattr(-,root,root,-) +%doc DEVNOTES %{_includedir}/* %{_libdir}/*.so From fedora-extras-commits at redhat.com Tue Jul 1 17:42:52 2008 From: fedora-extras-commits at redhat.com (Colin Walters (walters)) Date: Tue, 1 Jul 2008 17:42:52 GMT Subject: rpms/antlr3/devel antlr-clean-generated, NONE, 1.1 antlr3.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011742.m61HgqNi007605@cvs-int.fedora.redhat.com> Author: walters Update of /cvs/pkgs/rpms/antlr3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7424/devel Modified Files: .cvsignore sources Added Files: antlr-clean-generated antlr3.spec import.log Log Message: Initial import --- NEW FILE antlr-clean-generated --- #!/usr/bin/python # Clean out files which look to have been generated by antlr # Author: Colin Walters # This file is hereby placed into the public domain. import os,sys,re _antlr_compiled_re = re.compile(r'// \$ANTLR.*:.*->.*\$$') def clean_antlr_generated(basedir): for (dpath,subdirs,fnames) in os.walk(basedir): for fname in fnames: fpath = os.path.join(dpath, fname) f = open(fpath) first = f.readline() f.close() if _antlr_compiled_re.match(first): print "Deleting antlr-compiled %s" % (fpath,) os.unlink(fpath) if __name__ == '__main__': basedir = sys.argv[1] clean_antlr_generated(basedir) --- NEW FILE antlr3.spec --- Summary: ANother Tool for Language Recognition Name: antlr3 Version: 3.0.1 Release: 2%{?dist} URL: http://www.antlr.org/ Source0: http://www.antlr.org/download/antlr-3.0.1.tar.gz # Utility file, in conversation with upstream about this Source1: antlr-clean-generated License: BSD Group: Development/Libraries BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1:1.6.0 # For cleaner script BuildRequires: python BuildRequires: ant, stringtemplate, ant-antlr, ant-junit BuildRequires: jpackage-utils Requires: jpackage-utils %description ANother Tool for Language Recognition, is a language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions containing actions in a variety of target languages. %prep %setup -q -n antlr-%{version} %build rm -f lib/*.jar build-jar-repository -s -p lib stringtemplate # Clean out generated files upstream includes python %{SOURCE1} . # Build ant %install rm -rf $RPM_BUILD_ROOT install -D build/antlr.jar $RPM_BUILD_ROOT%{_datadir}/java/antlr3.jar %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README.txt LICENSE.txt %{_datadir}/java/*.jar %changelog * Fri Jun 27 2008 Colin Walters - 3.0.1-2 - Fix some BRs * Sun Apr 06 2008 Colin Walters - 3.0.1-1 - First version --- NEW FILE import.log --- antlr3-3_0_1-2_fc9:HEAD:antlr3-3.0.1-2.fc9.src.rpm:1214934104 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/antlr3/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2008 16:51:47 -0000 1.1 +++ .cvsignore 1 Jul 2008 17:42:02 -0000 1.2 @@ -0,0 +1 @@ +antlr-3.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/antlr3/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2008 16:51:47 -0000 1.1 +++ sources 1 Jul 2008 17:42:02 -0000 1.2 @@ -0,0 +1 @@ +3368332e3ecec632db667cb5cdfdbf6f antlr-3.0.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 17:49:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 17:49:44 GMT Subject: rpms/mousetweaks/F-9 .cvsignore, 1.2, 1.3 mousetweaks.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807011749.m61Hni94008238@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/mousetweaks/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8143 Modified Files: .cvsignore mousetweaks.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Apr 2008 23:59:27 -0000 1.2 +++ .cvsignore 1 Jul 2008 17:48:58 -0000 1.3 @@ -1 +1 @@ -mousetweaks-2.22.1.tar.bz2 +mousetweaks-2.22.3.tar.bz2 Index: mousetweaks.spec =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/F-9/mousetweaks.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mousetweaks.spec 1 May 2008 21:52:16 -0000 1.2 +++ mousetweaks.spec 1 Jul 2008 17:48:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: mousetweaks -Version: 2.22.1 -Release: 2%{?dist} +Version: 2.22.3 +Release: 1%{?dist} Summary: Mouse accessibility support for the GNOME desktop Group: User Interface/Desktops License: GPLv3 and GFDL @@ -89,6 +89,9 @@ %doc %{_mandir}/man1/* %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Thu May 1 2008 Will Woods - 2.22.1-2 - Fix typo in package scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Apr 2008 23:59:27 -0000 1.2 +++ sources 1 Jul 2008 17:48:58 -0000 1.3 @@ -1 +1 @@ -16ef7e51728c27c7ea3378a9f296f352 mousetweaks-2.22.1.tar.bz2 +bf36afbea857e49d32e5aefc29f94440 mousetweaks-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 17:49:56 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 17:49:56 GMT Subject: rpms/safekeep/devel .cvsignore, 1.2, 1.3 safekeep.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807011749.m61HnuUM008269@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/safekeep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8168 Modified Files: .cvsignore safekeep.spec sources Log Message: * Tue Jul 1 2008 Jef Spaleta 1.0.4-1 - Latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/safekeep/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Oct 2007 17:38:43 -0000 1.2 +++ .cvsignore 1 Jul 2008 17:49:03 -0000 1.3 @@ -1 +1 @@ -safekeep-1.0.3.tar.gz +safekeep-1.0.4.tar.gz Index: safekeep.spec =================================================================== RCS file: /cvs/pkgs/rpms/safekeep/devel/safekeep.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- safekeep.spec 22 Oct 2007 17:38:43 -0000 1.1 +++ safekeep.spec 1 Jul 2008 17:49:03 -0000 1.2 @@ -1,6 +1,6 @@ %define name safekeep -%define version 1.0.3 -%define release 2 +%define version 1.0.4 +%define release 1 %define homedir %{_localstatedir}/lib/%{name} Name: %{name} @@ -17,7 +17,6 @@ BuildArch: noarch BuildRequires: xmlto, asciidoc > 6.0.3 - %description SafeKeep is a client/server backup system which enhances the power of rdiff-backup with simple, centralized configuration. @@ -119,6 +118,9 @@ %doc sample.backup %changelog +* Tue Jul 1 2008 Jef Spaleta 1.0.4-1 + - Latest upstream release + * Fri Oct 19 2007 Jef Spaleta 1.0.3-2 - Added README.Fedora with explanation of client subpackaging. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/safekeep/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Oct 2007 17:38:43 -0000 1.2 +++ sources 1 Jul 2008 17:49:03 -0000 1.3 @@ -1 +1 @@ -89d97ad80ac72b0202c9181459925e21 safekeep-1.0.3.tar.gz +af7f44e0cf15f9f05a9a33635e085066 safekeep-1.0.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 17:55:26 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 17:55:26 GMT Subject: rpms/gnome-desktop/F-9 .cvsignore, 1.63, 1.64 gnome-desktop.spec, 1.144, 1.145 sources, 1.63, 1.64 Message-ID: <200807011755.m61HtQoM008877@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-desktop/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8779 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/F-9/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 28 May 2008 13:15:34 -0000 1.63 +++ .cvsignore 1 Jul 2008 17:54:29 -0000 1.64 @@ -1 +1 @@ -gnome-desktop-2.22.2.tar.bz2 +gnome-desktop-2.22.3.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/F-9/gnome-desktop.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- gnome-desktop.spec 28 May 2008 13:15:34 -0000 1.144 +++ gnome-desktop.spec 1 Jul 2008 17:54:29 -0000 1.145 @@ -11,7 +11,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.22.2 +Version: 2.22.3 Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2 @@ -129,6 +129,9 @@ %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Wed May 28 2008 Matthias Clasen - 2.22.2-1 - Update to 2.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/F-9/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 28 May 2008 13:15:34 -0000 1.63 +++ sources 1 Jul 2008 17:54:29 -0000 1.64 @@ -1 +1 @@ -6d6271cfa135ce016126414d929b8fb7 gnome-desktop-2.22.2.tar.bz2 +c5e24ee437e5d98c03299b0442523a6b gnome-desktop-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 18:03:25 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 18:03:25 GMT Subject: rpms/gnome-games/F-9 gnome-games.spec,1.176,1.177 Message-ID: <200807011803.m61I3P0H015880@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-games/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15827 Modified Files: gnome-games.spec Log Message: try to fix BRs Index: gnome-games.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-games/F-9/gnome-games.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- gnome-games.spec 1 Jul 2008 17:21:25 -0000 1.176 +++ gnome-games.spec 1 Jul 2008 18:02:38 -0000 1.177 @@ -93,6 +93,7 @@ BuildRequires: perl(XML::Parser) BuildRequires: autoconf >= 2.60 BuildRequires: gnome-doc-utils >= 0.3.2 +BuildRequires: intltool BuildRequires: libggz-devel BuildRequires: ggz-client-libs-devel From fedora-extras-commits at redhat.com Tue Jul 1 18:08:03 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 18:08:03 GMT Subject: rpms/nautilus/F-9 .cvsignore, 1.72, 1.73 nautilus.spec, 1.204, 1.205 sources, 1.76, 1.77 Message-ID: <200807011808.m61I83ob016174@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/nautilus/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16096 Modified Files: .cvsignore nautilus.spec sources Log Message: 2.22.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-9/.cvsignore,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- .cvsignore 28 May 2008 23:22:43 -0000 1.72 +++ .cvsignore 1 Jul 2008 18:07:06 -0000 1.73 @@ -1 +1 @@ -nautilus-2.22.3.tar.bz2 +nautilus-2.22.4.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-9/nautilus.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- nautilus.spec 24 Jun 2008 13:00:42 -0000 1.204 +++ nautilus.spec 1 Jul 2008 18:07:06 -0000 1.205 @@ -18,8 +18,8 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME -Version: 2.22.3 -Release: 2%{?dist} +Version: 2.22.4 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 @@ -249,6 +249,9 @@ %{_libdir}/*.so %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.4-1 +- Update to 2.22.4 + * Tue Jun 24 2008 Tomas Bzatek - 2.22.3-2 - Preserve date and time on copy Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-9/sources,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- sources 28 May 2008 23:22:43 -0000 1.76 +++ sources 1 Jul 2008 18:07:06 -0000 1.77 @@ -1 +1 @@ -db9dda7c8fde5103e5f7c55b9a8eb66b nautilus-2.22.3.tar.bz2 +e89bc92139b21ea3a69fb702ddf4562c nautilus-2.22.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 18:12:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 18:12:30 +0000 Subject: [pkgdb] ristretto was added for cwickert Message-ID: <200807011812.m61ICUvW025045@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ristretto with summary Image-viewer for the Xfce desktop environment Kevin Fenzi (kevin) has approved Package ristretto Kevin Fenzi (kevin) has added a Fedora devel branch for ristretto with an owner of cwickert Kevin Fenzi (kevin) has approved ristretto in Fedora devel Kevin Fenzi (kevin) has approved Package ristretto Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ristretto (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ristretto (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ristretto (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ristretto From fedora-extras-commits at redhat.com Tue Jul 1 18:12:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 18:12:33 +0000 Subject: [pkgdb] ristretto (Fedora, 9) updated by kevin Message-ID: <200807011812.m61ICXWr025064@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for ristretto Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ristretto (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ristretto (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ristretto (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on ristretto (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ristretto From fedora-extras-commits at redhat.com Tue Jul 1 18:12:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 18:12:33 +0000 Subject: [pkgdb] ristretto (Fedora, 8) updated by kevin Message-ID: <200807011812.m61ICXWu025064@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ristretto Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ristretto (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ristretto (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ristretto (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ristretto (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ristretto From fedora-extras-commits at redhat.com Tue Jul 1 18:12:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 01 Jul 2008 18:12:33 +0000 Subject: [pkgdb] ristretto (Fedora, devel) updated by kevin Message-ID: <200807011812.m61ICXWx025064@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ristretto (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ristretto From fedora-extras-commits at redhat.com Tue Jul 1 18:12:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 18:12:48 GMT Subject: rpms/libgweather/F-9 .cvsignore, 1.6, 1.7 libgweather.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200807011812.m61ICmYP016453@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgweather/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16375 Modified Files: .cvsignore libgweather.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgweather/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 May 2008 14:40:29 -0000 1.6 +++ .cvsignore 1 Jul 2008 18:12:02 -0000 1.7 @@ -1 +1 @@ -libgweather-2.22.2.tar.bz2 +libgweather-2.22.3.tar.bz2 Index: libgweather.spec =================================================================== RCS file: /cvs/extras/rpms/libgweather/F-9/libgweather.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libgweather.spec 28 May 2008 14:40:29 -0000 1.11 +++ libgweather.spec 1 Jul 2008 18:12:02 -0000 1.12 @@ -1,5 +1,5 @@ Name: libgweather -Version: 2.22.2 +Version: 2.22.3 Release: 1%{?dist} Summary: A library for weather information @@ -100,6 +100,9 @@ %changelog +* Tue Jul 1 2008 Matthias Clasen 2.22.333 +- Update to 2.22.3 + * Wed May 28 2008 Matthias Clasen 2.22.2-1 - Update to 2.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgweather/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 May 2008 14:40:29 -0000 1.6 +++ sources 1 Jul 2008 18:12:02 -0000 1.7 @@ -1 +1 @@ -6faed1568eaa8a6be3989f333326d4ae libgweather-2.22.2.tar.bz2 +151e03d925579241decc92afa4d07182 libgweather-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 18:13:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 18:13:21 GMT Subject: rpms/ristretto - New directory Message-ID: <200807011813.m61IDLpP016515@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ristretto In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16468/rpms/ristretto Log Message: Directory /cvs/extras/rpms/ristretto added to the repository From fedora-extras-commits at redhat.com Tue Jul 1 18:13:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 18:13:33 GMT Subject: rpms/ristretto/devel - New directory Message-ID: <200807011813.m61IDXlq016555@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ristretto/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16468/rpms/ristretto/devel Log Message: Directory /cvs/extras/rpms/ristretto/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 1 18:13:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 18:13:46 GMT Subject: rpms/ristretto Makefile,NONE,1.1 Message-ID: <200807011813.m61IDk8O016603@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ristretto In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16468/rpms/ristretto Added Files: Makefile Log Message: Setup of module ristretto --- NEW FILE Makefile --- # Top level Makefile for module ristretto all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 1 18:13:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 1 Jul 2008 18:13:59 GMT Subject: rpms/ristretto/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807011813.m61IDxcd016648@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ristretto/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16468/rpms/ristretto/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ristretto --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ristretto # $Id: Makefile,v 1.1 2008/07/01 18:13:46 kevin Exp $ NAME := ristretto SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 1 18:24:11 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 18:24:11 GMT Subject: rpms/file-roller/F-9 .cvsignore, 1.68, 1.69 file-roller.spec, 1.121, 1.122 sources, 1.70, 1.71 Message-ID: <200807011824.m61IOBhZ017236@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17171 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.22.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/file-roller/F-9/.cvsignore,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- .cvsignore 7 Apr 2008 21:35:35 -0000 1.68 +++ .cvsignore 1 Jul 2008 18:23:26 -0000 1.69 @@ -1 +1 @@ -file-roller-2.22.1.tar.bz2 +file-roller-2.22.4.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/F-9/file-roller.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- file-roller.spec 28 May 2008 15:51:04 -0000 1.121 +++ file-roller.spec 1 Jul 2008 18:23:26 -0000 1.122 @@ -10,7 +10,7 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller -Version: 2.22.3 +Version: 2.22.4 Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving @@ -128,6 +128,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.4-1 +- Update to 2.22.4 + * Wed May 28 2008 Matthias Clasen - 2.22.3-1 - Update to 2.22.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/file-roller/F-9/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 28 May 2008 15:29:41 -0000 1.70 +++ sources 1 Jul 2008 18:23:26 -0000 1.71 @@ -1 +1 @@ -8b731d60167670dbe3b5b976c96815e5 file-roller-2.22.3.tar.bz2 +9cbd597f6e1299f49c7963a1eb2b7533 file-roller-2.22.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 18:29:18 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Tue, 1 Jul 2008 18:29:18 GMT Subject: rpms/qpidc/F-9 .cvsignore, 1.5, 1.6 qpidc.spec, 1.30, 1.31 sources, 1.19, 1.20 Message-ID: <200807011829.m61ITIFu017458@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17417 Modified Files: .cvsignore qpidc.spec sources Log Message: MRG GA release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2008 20:45:48 -0000 1.5 +++ .cvsignore 1 Jul 2008 18:28:13 -0000 1.6 @@ -1 +1 @@ -qpidc-0.2.656926.tar.gz +qpidc-0.2.667603.tar.gz Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- qpidc.spec 22 May 2008 20:45:48 -0000 1.30 +++ qpidc.spec 1 Jul 2008 18:28:13 -0000 1.31 @@ -4,7 +4,7 @@ # svn revision: $Rev: 654927 $ # %define qpidd qpidd -%define svnrev 656926 +%define svnrev 667603 Name: qpidc Version: 0.2.%{svnrev} @@ -184,6 +184,9 @@ /sbin/ldconfig %changelog +* Tue Jul 1 2008 Nuno Santos - 0.2.667603-1 +- MRG GA release + * Wed May 14 2008 Nuno Santos - 0.2-34 - Bumped for Beta 4 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 22 May 2008 20:45:48 -0000 1.19 +++ sources 1 Jul 2008 18:28:13 -0000 1.20 @@ -1 +1 @@ -a6c4a99ec0ac77f61d4b7ab77d05331d qpidc-0.2.656926.tar.gz +74a880e77e1b59bea07519a1601affb4 qpidc-0.2.667603.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 18:35:04 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 18:35:04 GMT Subject: rpms/xorg-x11-drv-vesa/F-9 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xorg-x11-drv-vesa.spec, 1.34, 1.35 vesa-1.3.0-range-hack.patch, 1.1, NONE vesa-1.9-32bpp-dammit.patch, 1.1, NONE vesa-1.9-mode-heuristics.patch, 1.2, NONE vesa-1.9-no-legacy-fb.patch, 1.1, NONE Message-ID: <200807011835.m61IZ4MX017857@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17743/F-9 Modified Files: .cvsignore sources xorg-x11-drv-vesa.spec Removed Files: vesa-1.3.0-range-hack.patch vesa-1.9-32bpp-dammit.patch vesa-1.9-mode-heuristics.patch vesa-1.9-no-legacy-fb.patch Log Message: vesa 2.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 4 Apr 2008 18:33:46 -0000 1.12 +++ .cvsignore 1 Jul 2008 18:34:04 -0000 1.13 @@ -1 +1 @@ -xf86-video-vesa-20080404.tar.bz2 +xf86-video-vesa-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Apr 2008 18:33:46 -0000 1.12 +++ sources 1 Jul 2008 18:34:04 -0000 1.13 @@ -1 +1 @@ -a99b7c6bb10cee6adeec1a6313ca75b7 xf86-video-vesa-20080404.tar.bz2 +433cf6f961eb4a2ab6fcb086def0b2b4 xf86-video-vesa-2.0.0.tar.bz2 Index: xorg-x11-drv-vesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9/xorg-x11-drv-vesa.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xorg-x11-drv-vesa.spec 9 May 2008 17:50:32 -0000 1.34 +++ xorg-x11-drv-vesa.spec 1 Jul 2008 18:34:04 -0000 1.35 @@ -2,27 +2,20 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate 20080404 - Summary: Xorg X11 vesa video driver Name: xorg-x11-drv-vesa -Version: 1.3.0 -Release: 16.%{gitdate}%{?dist} +Version: 2.0.0 +Release: 1%{?dist} URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{gitdate}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2 License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x -Patch1: vesa-1.9-mode-heuristics.patch -Patch2: vesa-1.3.0-range-hack.patch -Patch3: vesa-1.9-no-legacy-fb.patch -Patch4: vesa-1.9-32bpp-dammit.patch - BuildRequires: xorg-x11-server-sdk >= 1.4.99.1-0.15 -BuildRequires: autoconf automake libtool +#BuildRequires: autoconf automake libtool Requires: xorg-x11-server-Xorg >= 1.4.99.1 @@ -30,15 +23,10 @@ X.Org X11 vesa video driver. %prep -%setup -q -n %{tarball}-%{gitdate} - -%patch1 -p1 -b .mode-heuristics -%patch2 -p1 -b .range-hack -%patch3 -p1 -b .legacy -%patch4 -p1 -b .32 +%setup -q -n %{tarball}-%{version} %build -autoreconf -v --install || exit 1 +#autoreconf -v --install || exit 1 %configure --disable-static make @@ -60,9 +48,8 @@ %{_mandir}/man4/vesa.4* %changelog -* Fri May 09 2008 Adam Jackson 1.3.0-16.20080404 -- vesa-1.9-mode-heuristics.patch: Use the mode selection heuristic on all - device probe paths. +* Tue Jul 01 2008 Adam Jackson 2.0.0-1 +- vesa 2.0.0 * Tue Apr 29 2008 Adam Jackson 1.3.0-15.20080404 - vesa-1.9-32bpp-dammit.patch: Prefer 24+32 instead of 24+24. (#427383) --- vesa-1.3.0-range-hack.patch DELETED --- --- vesa-1.9-32bpp-dammit.patch DELETED --- --- vesa-1.9-mode-heuristics.patch DELETED --- --- vesa-1.9-no-legacy-fb.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 18:37:22 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 18:37:22 GMT Subject: rpms/gpodder/devel .cvsignore, 1.14, 1.15 gpodder.spec, 1.14, 1.15 sources, 1.14, 1.15 Message-ID: <200807011837.m61IbM8g018047@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/gpodder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17970 Modified Files: .cvsignore gpodder.spec sources Log Message: * Tue Jul 1 2008 Jef Spaleta 0.11.3-1 - latest stable release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gpodder/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Apr 2008 22:59:01 -0000 1.14 +++ .cvsignore 1 Jul 2008 18:36:28 -0000 1.15 @@ -1 +1 @@ -gpodder-0.11.1.tar.gz +gpodder-0.11.3.tar.gz Index: gpodder.spec =================================================================== RCS file: /cvs/pkgs/rpms/gpodder/devel/gpodder.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gpodder.spec 2 Apr 2008 22:59:01 -0000 1.14 +++ gpodder.spec 1 Jul 2008 18:36:28 -0000 1.15 @@ -2,8 +2,8 @@ Name: gpodder -Version: 0.11.1 -Release: 2%{?dist} +Version: 0.11.3 +Release: 1%{?dist} Summary: Podcast receiver/catcher written in Python Group: Applications/Multimedia @@ -75,6 +75,9 @@ %{python_sitelib}/%{name}*.egg-info %changelog +* Tue Jul 1 2008 Jef Spaleta 0.11.3-1 +- latest stable release + * Wed Apr 2 2008 Jef Spaleta 0.11.1-2 - New Upstream version. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gpodder/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Apr 2008 22:59:01 -0000 1.14 +++ sources 1 Jul 2008 18:36:28 -0000 1.15 @@ -1 +1 @@ -d8376b8fe37123f332be6bdde0d06377 gpodder-0.11.1.tar.gz +f8fa23469bb76a597f54b3352b818078 gpodder-0.11.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 18:43:08 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 1 Jul 2008 18:43:08 GMT Subject: rpms/kernel/F-9 kernel.spec, 1.697, 1.698 linux-2.6-wireless-fixups.patch, 1.5, 1.6 linux-2.6-wireless-pending.patch, 1.53, 1.54 linux-2.6-wireless.patch, 1.42, 1.43 Message-ID: <200807011843.m61Ih8xJ018473@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18327 Modified Files: kernel.spec linux-2.6-wireless-fixups.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless updates from 2008-06-27 ; Upstream wireless fixes from 2008-06-30 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- kernel.spec 30 Jun 2008 19:38:16 -0000 1.697 +++ kernel.spec 1 Jul 2008 18:42:13 -0000 1.698 @@ -1861,6 +1861,12 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jun 30 2008 John W. Linville 2.6.25.9-79 +- Upstream wireless fixes from 2008-06-30 + (http://marc.info/?l=linux-wireless&m=121485709702728&w=2) +- Upstream wireless updates from 2008-06-27 + (http://marc.info/?l=linux-wireless&m=121458164930953&w=2) + * Mon Jun 30 2008 Dave Jones - Disable rio500 driver (bz 451567) linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-wireless-fixups.patch 25 Jun 2008 17:38:37 -0000 1.5 +++ linux-2.6-wireless-fixups.patch 1 Jul 2008 18:42:13 -0000 1.6 @@ -1,6 +1,6 @@ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 14:24:27.000000000 -0400 @@ -3659,7 +3659,7 @@ void mpi_receive_802_11 (struct airo_inf ptr += hdrlen; if (hdrlen == 24) @@ -208,8 +208,8 @@ return 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 14:24:27.000000000 -0400 @@ -58,6 +58,10 @@ #include "reg.h" #include "debug.h" @@ -218,10 +218,10 @@ +#define LE_READ_2(_p) (le16_to_cpu(get_unaligned((__le16 *)(_p)))) +#define LE_READ_4(_p) (le32_to_cpu(get_unaligned((__le32 *)(_p)))) + - enum { - ATH_LED_TX, - ATH_LED_RX, -@@ -2891,9 +2895,9 @@ static void ath5k_configure_filter(struc + static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */ + + +@@ -2858,9 +2862,9 @@ static void ath5k_configure_filter(struc if (!mclist) break; /* calculate XOR of eight 6-bit values */ @@ -234,9 +234,9 @@ pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-24 14:55:10.000000000 -0400 -@@ -965,6 +965,22 @@ static inline bool __b43_warn_on_dummy(b +--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-01 14:24:27.000000000 -0400 +@@ -967,6 +967,22 @@ static inline bool __b43_warn_on_dummy(b # define B43_WARN_ON(x) __b43_warn_on_dummy(unlikely(!!(x))) #endif @@ -260,8 +260,8 @@ #define INT_TO_Q52(i) ((i) << 2) /* Convert a Q5.2 value to an integer (precision loss!) */ diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-01 14:24:27.000000000 -0400 @@ -823,6 +823,23 @@ void b43legacydbg(struct b43legacy_wl *w # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0) #endif /* DEBUG */ @@ -287,8 +287,8 @@ #define Q52_FMT "%u.%u" #define Q52_ARG(q52) ((q52) / 4), (((q52) & 3) * 100 / 4) diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-01 14:24:27.000000000 -0400 @@ -846,10 +846,10 @@ static void handle_irq_noise(struct b43l /* Get the noise samples. */ B43legacy_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -314,8 +314,8 @@ iv = (const struct b43legacy_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-01 14:24:27.000000000 -0400 @@ -1088,7 +1088,7 @@ static void b43legacy_phy_initg(struct b * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -373,8 +373,8 @@ return 0; } diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-01 14:24:27.000000000 -0400 @@ -357,7 +357,7 @@ void b43legacy_nrssi_hw_update(struct b4 for (i = 0; i < 64; i++) { tmp = b43legacy_nrssi_hw_read(dev, i); @@ -430,8 +430,8 @@ pamp = b43legacy_get_txgain_freq_power_amp(txpower); pamp <<= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-01 14:24:27.000000000 -0400 @@ -199,7 +199,7 @@ static void lo_measure_txctl_values(stru if (lb_gain > 10) { radio_pctl_reg = 0; @@ -451,9 +451,9 @@ if (phy->pga_gain >= 5) { phy->pga_gain -= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-06-24 14:55:10.000000000 -0400 -@@ -1187,10 +1187,10 @@ static void handle_irq_noise(struct b43_ +--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-01 14:24:27.000000000 -0400 +@@ -1211,10 +1211,10 @@ static void handle_irq_noise(struct b43_ /* Get the noise samples. */ B43_WARN_ON(dev->noisecalc.nr_samples >= 8); i = dev->noisecalc.nr_samples; @@ -468,7 +468,7 @@ dev->noisecalc.samples[i][0] = phy->nrssi_lt[noise[0]]; dev->noisecalc.samples[i][1] = phy->nrssi_lt[noise[1]]; dev->noisecalc.samples[i][2] = phy->nrssi_lt[noise[2]]; -@@ -2331,7 +2331,7 @@ static int b43_write_initvals(struct b43 +@@ -2355,7 +2355,7 @@ static int b43_write_initvals(struct b43 goto err_format; array_size -= sizeof(iv->data.d32); @@ -478,8 +478,8 @@ iv = (const struct b43_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-01 14:24:27.000000000 -0400 @@ -1400,7 +1400,7 @@ static void b43_phy_initg(struct b43_wld * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -580,8 +580,8 @@ tmp_u16 = b43_phy_read(dev, 0x048A) & 0xF000; tmp_u16 |= ((u32) b & 0x0000003F); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-01 14:24:27.000000000 -0400 @@ -556,36 +556,40 @@ static void iwl3945_add_radiotap(struct iwl3945_rt->rt_hdr.it_pad = 0; @@ -638,8 +638,8 @@ if (rate == -1) diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c ---- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-01 14:22:16.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-01 14:24:27.000000000 -0400 @@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de if (*bytesleft >= sizeof(beaconsize)) { @@ -649,9 +649,32 @@ *bytesleft -= sizeof(beaconsize); *pbeaconinfo += sizeof(beaconsize); } +diff -up linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c +--- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-01 14:22:16.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-01 14:24:27.000000000 -0400 +@@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo + hwsim_radios[i] = hw; + + data = hw->priv; +- data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw, +- "hwsim%d", i); ++ data->dev = device_create(hwsim_class, NULL, 0, "hwsim%d", i); + if (IS_ERR(data->dev)) { +- printk(KERN_DEBUG +- "mac80211_hwsim: device_create_drvdata " ++ printk(KERN_DEBUG "mac80211_hwsim: device_create " + "failed (%ld)\n", PTR_ERR(data->dev)); + err = -ENOMEM; + goto failed; + } + data->dev->driver = &mac80211_hwsim_driver; ++ dev_set_drvdata(data->dev, hw); + + SET_IEEE80211_DEV(hw, data->dev); + addr[3] = i >> 8; diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-01 14:22:16.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-01 14:24:27.000000000 -0400 @@ -556,11 +556,11 @@ static void handle_rx_packet(struct zd_u * be padded. Unaligned access might also happen if the length_info * structure is not present. @@ -666,9 +689,20 @@ if (k == 0) return; n = l+k; +diff -up linux-2.6.25.noarch/include/linux/input.h.orig linux-2.6.25.noarch/include/linux/input.h +--- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-01 14:23:01.000000000 -0400 ++++ linux-2.6.25.noarch/include/linux/input.h 2008-07-01 14:23:41.000000000 -0400 +@@ -638,6 +638,7 @@ struct input_absinfo { + #define SW_TABLET_MODE 0x01 /* set = tablet mode */ + #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ + #define SW_RADIO 0x03 /* set = radio enabled */ ++#define SW_RFKILL_ALL SW_RADIO + #define SW_MAX 0x0f + #define SW_CNT (SW_MAX+1) + diff -up linux-2.6.25.noarch/net/mac80211/iface.c.orig linux-2.6.25.noarch/net/mac80211/iface.c ---- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-01 14:24:27.000000000 -0400 @@ -53,15 +53,6 @@ int ieee80211_if_add(struct net_device * if (!ndev) return -ENOMEM; @@ -686,8 +720,8 @@ if (ret < 0) goto fail; diff -up linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c ---- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-01 14:24:27.000000000 -0400 @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq { if (ae) @@ -698,8 +732,8 @@ /* HWMP IE processing macros */ diff -up linux-2.6.25.noarch/net/mac80211/michael.c.orig linux-2.6.25.noarch/net/mac80211/michael.c ---- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-01 14:24:27.000000000 -0400 @@ -29,17 +29,16 @@ static void michael_block(struct michael static void michael_mic_hdr(struct michael_mic_ctx *mctx, const u8 *key, const u8 *da, const u8 *sa, u8 priority) @@ -750,8 +784,8 @@ + mic[7] = (mctx.r >> 24) & 0xff; } diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-06-24 15:11:51.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 14:24:27.000000000 -0400 @@ -7,22 +7,23 @@ * published by the Free Software Foundation. */ @@ -930,7 +964,7 @@ + iv32 = data[4] | (data[5] << 8) | + (data[6] << 16) | (data[7] << 24); - tk = &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY]; + tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY]; ctx = &key->u.tkip.tx; @@ -217,6 +264,7 @@ void ieee80211_tkip_encrypt_data(struct ieee80211_wep_encrypt_data(tfm, rc4key, 16, pos, payload_len); @@ -947,7 +981,7 @@ - iv32 = get_unaligned_le32(pos + 4); + iv32 = pos[4] | (pos[5] << 8) | (pos[6] << 16) | (pos[7] << 24); pos += 8; - #ifdef CONFIG_TKIP_DEBUG + #ifdef CONFIG_MAC80211_TKIP_DEBUG { @@ -341,3 +389,5 @@ int ieee80211_tkip_decrypt_data(struct c @@ -956,8 +990,8 @@ + + diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 14:24:27.000000000 -0400 @@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_ /* Ignore nop renames */ @@ -975,8 +1009,8 @@ } diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-01 14:24:27.000000000 -0400 @@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -1018,9 +1052,9 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-24 14:55:10.000000000 -0400 -@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 14:24:27.000000000 -0400 +@@ -1299,7 +1299,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.53 -r 1.54 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- linux-2.6-wireless-pending.patch 25 Jun 2008 19:29:30 -0000 1.53 +++ linux-2.6-wireless-pending.patch 1 Jul 2008 18:42:13 -0000 1.54 @@ -1,3 +1,1105 @@ +commit ff28bd94e307c67abb1bccda5d3a9018bd798e08 +Author: John W. Linville +Date: Fri Jun 27 10:27:47 2008 -0400 + + wireless: remove RFKILL_STATE_HARD_BLOCKED warnings + + CC [M] drivers/net/wireless/b43/rfkill.o + drivers/net/wireless/b43/rfkill.c: In function ???b43_rfkill_soft_toggle???: + drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch + + CC [M] drivers/net/wireless/b43legacy/rfkill.o + drivers/net/wireless/b43legacy/rfkill.c: In function ???b43legacy_rfkill_soft_toggle???: + drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch + + CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o + drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function ???iwl_rfkill_soft_rf_kill???: + drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch + + Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLOCKED} + conversion since I'm already here... + + Signed-off-by: John W. Linville + +commit d195a2ca46ec50e3b5c045a36d1defb6e04cc6b7 +Author: John W. Linville +Date: Fri Jun 27 09:31:29 2008 -0400 + + ath5k: remove now unused variable declared in ath5k_tx + + CC [M] drivers/net/wireless/ath5k/base.o + drivers/net/wireless/ath5k/base.c: In function ???ath5k_tx???: + drivers/net/wireless/ath5k/base.c:2598: warning: unused variable ???info??? + + Signed-off-by: John W. Linville + +commit 03f93c3d4c8aa9ed2e2b0a949ece658053527d71 +Author: Johannes Berg +Date: Wed Jun 25 14:36:27 2008 +0300 + + mac80211: fix tx fragmentation + + This patch fixes TX fragmentation caused by + tx handlers reordering and 'tx info to cb' patches + + Signed-off-by: Johannes Berg + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 59959a6150c8af737898e83f727e824dbed7b0fa +Author: Johannes Berg +Date: Thu Jun 26 19:59:56 2008 +0200 + + mac80211: make workqueue freezable + + This patch makes the mac80211 workqueue freezable making it + interact a bit better with system suspend and not try to ping + the AP while the hardware is down. + + This doesn't really help with implementing proper suspend in + any way but makes some bad things trigger less. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit e292c737fc57d3ca718056f3308c725c8e541729 +Author: Pavel Machek +Date: Wed Jun 25 12:25:53 2008 +0200 + + wireless: Small cleanups + + Small whitespace cleanups for wireless drivers + + Signed-off-by: Pavel Machek + Signed-off-by: John W. Linville + +commit b973e42eb25036a2672db7f7749f6989ab10479c +Author: Randy Dunlap +Date: Tue Jun 24 21:02:46 2008 -0700 + + iwlwifi: fix build for CONFIG_INPUT=n + + Fix iwlwifi so that it builds cleanly with CONFIG_INPUT=n. + Also free the input device on exit. + + drivers/built-in.o: In function `iwl_rfkill_unregister': + (.text+0xbf430): undefined reference to `input_unregister_device' + drivers/built-in.o: In function `iwl_rfkill_init': + (.text+0xbf51c): undefined reference to `input_allocate_device' + drivers/built-in.o: In function `iwl_rfkill_init': + (.text+0xbf5bf): undefined reference to `input_register_device' + drivers/built-in.o: In function `iwl_rfkill_init': + (.text+0xbf5e9): undefined reference to `input_free_device' + net/built-in.o: In function `rfkill_disconnect': + rfkill-input.c:(.text+0xe71e1): undefined reference to `input_close_device' + rfkill-input.c:(.text+0xe71e9): undefined reference to `input_unregister_handle' + net/built-in.o: In function `rfkill_connect': + rfkill-input.c:(.text+0xe723e): undefined reference to `input_register_handle' + rfkill-input.c:(.text+0xe724d): undefined reference to `input_open_device' + rfkill-input.c:(.text+0xe725c): undefined reference to `input_unregister_handle' + net/built-in.o: In function `rfkill_handler_init': + rfkill-input.c:(.init.text+0x36ec): undefined reference to `input_register_handler' + net/built-in.o: In function `rfkill_handler_exit': + rfkill-input.c:(.exit.text+0x112c): undefined reference to `input_unregister_handler' + make[1]: *** [.tmp_vmlinux1] Error 1 + + Signed-off-by: Randy Dunlap + Signed-off-by: John W. Linville + +commit 428da76523e4a9c08bdfadc25a05b520f19b9133 +Author: Ivo van Doorn +Date: Tue Jun 24 19:23:36 2008 +0200 + + mac80211: Add RTNL warning for workqueue + + The workqueue provided by mac80211 should not be used for + scheduled tasks that acquire the RTNL lock. This could be done + when the driver uses the function ieee80211_iterate_active_interfaces() + within the scheduled work. Such behavior will end in locking + dependencies problems when an interface is being removed. + + This patch will add a notification about the RTNL locking and + the mac80211 workqueue to prevent driver developers from + blindly using it. + + Signed-off-by: Ivo van Doorn + Acked-by: Johannes Berg + Signed-off-by: John W. Linville + +commit f37d08bddc5cb8de18e55f2b0a401b3eb6269af4 +Author: Tomas Winkler +Date: Tue Jun 24 15:50:17 2008 +0300 + + mac80211: add phy information to giwname + + This patch add phy information to giwname. + + Quoting: + It's not useless, it's supposed to tell you about the protocol + capability of the device, like "IEEE 802.11b" or "IEEE 802.11abg" + + Jean + + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit b9fcc4f2987a757acb3af43aa31dc860bb957970 +Author: Emmanuel Grumbach +Date: Tue Jun 24 13:37:59 2008 +0300 + + mac80211: update the authentication method + + This patch updates the authentication method upon giwencode ioctl. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Acked-by: Johannes Berg + Acked-by: Dan Williams + Signed-off-by: John W. Linville + +commit fa6adfe9e625a6a843a1abed5f4e7a000c11952c +Author: Emmanuel Grumbach +Date: Tue Jun 24 13:37:58 2008 +0300 + + mac80211: don't return -EINVAL upon iwconfig wlan0 rts auto + + This patch avoids returning -EINVAL upon iwconfig wlan0 rts auto. If + rts->fixed is 0, then we should choose a default value instead of failing. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Acked-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 14a7dd6f6c1e0b361a37b6df52d4dc2ea36757d2 +Author: Michael Buesch +Date: Tue Jun 24 12:22:05 2008 +0200 + + b43: Fix PIO skb clobber + + This fixes a clobber of the skb that was introduced by the + tx_control->cb conversion patches. + This bug causes a crash when the skb destructor is invoked. That happens + on skb_orphan or skb_kfree. + + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit 40af48ce501ea9ad9c485504a6fa0740801fa051 +Author: Ivo van Doorn +Date: Mon Jun 23 19:56:50 2008 +0200 + [...19484 lines suppressed...] ++ wext_ioctl_func private) + { ++ struct iwreq *iwr = (struct iwreq *) ifr; + struct net_device *dev; + iw_handler handler; + +@@ -1019,12 +1034,12 @@ static int wireless_process_ioctl(struct + * Note that 'cmd' is already filtered in dev_ioctl() with + * (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */ + if (cmd == SIOCGIWSTATS) +- return ioctl_standard_call(dev, ifr, cmd, +- &iw_handler_get_iwstats); ++ return standard(dev, iwr, cmd, info, ++ &iw_handler_get_iwstats); + + if (cmd == SIOCGIWPRIV && dev->wireless_handlers) +- return ioctl_standard_call(dev, ifr, cmd, +- &iw_handler_get_private); ++ return standard(dev, iwr, cmd, info, ++ &iw_handler_get_private); + + /* Basic check */ + if (!netif_device_present(dev)) +@@ -1035,9 +1050,9 @@ static int wireless_process_ioctl(struct + if (handler) { + /* Standard and private are not the same */ + if (cmd < SIOCIWFIRSTPRIV) +- return ioctl_standard_call(dev, ifr, cmd, handler); ++ return standard(dev, iwr, cmd, info, handler); + else +- return ioctl_private_call(dev, ifr, cmd, handler); ++ return private(dev, iwr, cmd, info, handler); + } + /* Old driver API : call driver ioctl handler */ + if (dev->do_ioctl) +@@ -1045,27 +1060,154 @@ static int wireless_process_ioctl(struct + return -EOPNOTSUPP; + } + +-/* entry point from dev ioctl */ +-int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, +- void __user *arg) ++/* If command is `set a parameter', or `get the encoding parameters', ++ * check if the user has the right to do it. ++ */ ++static int wext_permission_check(unsigned int cmd) + { +- int ret; +- +- /* If command is `set a parameter', or +- * `get the encoding parameters', check if +- * the user has the right to do it */ + if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT) + && !capable(CAP_NET_ADMIN)) + return -EPERM; + ++ return 0; ++} ++ ++/* entry point from dev ioctl */ ++static int wext_ioctl_dispatch(struct net *net, struct ifreq *ifr, ++ unsigned int cmd, struct iw_request_info *info, ++ wext_ioctl_func standard, ++ wext_ioctl_func private) ++{ ++ int ret = wext_permission_check(cmd); ++ ++ if (ret) ++ return ret; ++ + dev_load(net, ifr->ifr_name); + rtnl_lock(); +- ret = wireless_process_ioctl(net, ifr, cmd); ++ ret = wireless_process_ioctl(net, ifr, cmd, info, standard, private); + rtnl_unlock(); +- if (IW_IS_GET(cmd) && copy_to_user(arg, ifr, sizeof(struct iwreq))) ++ ++ return ret; ++} ++ ++int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, ++ void __user *arg) ++{ ++ struct iw_request_info info = { .cmd = cmd, .flags = 0 }; ++ int ret; ++ ++ ret = wext_ioctl_dispatch(net, ifr, cmd, &info, ++ ioctl_standard_call, ++ ioctl_private_call); ++ if (ret >= 0 && ++ IW_IS_GET(cmd) && ++ copy_to_user(arg, ifr, sizeof(struct iwreq))) ++ return -EFAULT; ++ ++ return ret; ++} ++ ++#ifdef CONFIG_COMPAT ++static int compat_standard_call(struct net_device *dev, ++ struct iwreq *iwr, ++ unsigned int cmd, ++ struct iw_request_info *info, ++ iw_handler handler) ++{ ++ const struct iw_ioctl_description *descr; ++ struct compat_iw_point *iwp_compat; ++ struct iw_point iwp; ++ int err; ++ ++ descr = standard_ioctl + (cmd - SIOCIWFIRST); ++ ++ if (descr->header_type != IW_HEADER_TYPE_POINT) ++ return ioctl_standard_call(dev, iwr, cmd, info, handler); ++ ++ iwp_compat = (struct compat_iw_point *) &iwr->u.data; ++ iwp.pointer = compat_ptr(iwp_compat->pointer); ++ iwp.length = iwp_compat->length; ++ iwp.flags = iwp_compat->flags; ++ ++ err = ioctl_standard_iw_point(&iwp, cmd, descr, handler, dev, info); ++ ++ iwp_compat->pointer = ptr_to_compat(iwp.pointer); ++ iwp_compat->length = iwp.length; ++ iwp_compat->flags = iwp.flags; ++ ++ return err; ++} ++ ++static int compat_private_call(struct net_device *dev, struct iwreq *iwr, ++ unsigned int cmd, struct iw_request_info *info, ++ iw_handler handler) ++{ ++ const struct iw_priv_args *descr; ++ int ret, extra_size; ++ ++ extra_size = get_priv_descr_and_size(dev, cmd, &descr); ++ ++ /* Check if we have a pointer to user space data or not. */ ++ if (extra_size == 0) { ++ /* No extra arguments. Trivial to handle */ ++ ret = handler(dev, info, &(iwr->u), (char *) &(iwr->u)); ++ } else { ++ struct compat_iw_point *iwp_compat; ++ struct iw_point iwp; ++ ++ iwp_compat = (struct compat_iw_point *) &iwr->u.data; ++ iwp.pointer = compat_ptr(iwp_compat->pointer); ++ iwp.length = iwp_compat->length; ++ iwp.flags = iwp_compat->flags; ++ ++ ret = ioctl_private_iw_point(&iwp, cmd, descr, ++ handler, dev, info, extra_size); ++ ++ iwp_compat->pointer = ptr_to_compat(iwp.pointer); ++ iwp_compat->length = iwp.length; ++ iwp_compat->flags = iwp.flags; ++ } ++ ++ /* Call commit handler if needed and defined */ ++ if (ret == -EIWCOMMIT) ++ ret = call_commit_handler(dev); ++ ++ return ret; ++} ++ ++int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, ++ unsigned long arg) ++{ ++ void __user *argp = (void __user *)arg; ++ struct iw_request_info info; ++ struct iwreq iwr; ++ char *colon; ++ int ret; ++ ++ if (copy_from_user(&iwr, argp, sizeof(struct iwreq))) ++ return -EFAULT; ++ ++ iwr.ifr_name[IFNAMSIZ-1] = 0; ++ colon = strchr(iwr.ifr_name, ':'); ++ if (colon) ++ *colon = 0; ++ ++ info.cmd = cmd; ++ info.flags = IW_REQUEST_FLAG_COMPAT; ++ ++ ret = wext_ioctl_dispatch(net, (struct ifreq *) &iwr, cmd, &info, ++ compat_standard_call, ++ compat_private_call); ++ ++ if (ret >= 0 && ++ IW_IS_GET(cmd) && ++ copy_to_user(argp, &iwr, sizeof(struct iwreq))) + return -EFAULT; ++ + return ret; + } ++#endif + + /************************* EVENT PROCESSING *************************/ + /* linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.42 -r 1.43 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless.patch,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- linux-2.6-wireless.patch 27 Jun 2008 19:34:18 -0000 1.42 +++ linux-2.6-wireless.patch 1 Jul 2008 18:42:14 -0000 1.43 @@ -1,3 +1,41 @@ +commit 23976efedd5ecb420b87455787c537eb4aed1981 +Author: Emmanuel Grumbach +Date: Sat Jun 28 02:50:13 2008 +0300 + + mac80211: don't accept WEP keys other than WEP40 and WEP104 + + This patch makes mac80211 refuse a WEP key whose length is not WEP40 nor + WEP104. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 1bcca3c463e4930cef9986b05165bb0b3eb46f63 +Author: Pavel Roskin +Date: Fri Jun 27 16:19:58 2008 -0400 + + hostap: fix sparse warnings + + Rewrite AID calculation in handle_pspoll() to avoid truncating bits. + Make hostap_80211_header_parse() static, don't export it. Avoid + shadowing variables. + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 15ea0ebc5b7305cc75189cb6b7924d0db5278e0c +Author: Pavel Roskin +Date: Fri Jun 27 16:19:52 2008 -0400 + + hostap: don't report useless WDS frames by default + + DEBUG_EXTRA is reported to the kernel log by default, but DEBUG_EXTRA2 + is not. Unrelated WDS frames pollute the log unnecessarily. + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + commit 00eb7fe77eb455f807c396f9917f0f623d4c84bb Author: Emmanuel Grumbach Date: Thu Jun 26 12:13:46 2008 +0300 @@ -9178,8 +9216,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-01 13:34:56.000000000 -0400 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -9377,8 +9415,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-01 13:34:56.000000000 -0400 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -9466,8 +9504,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 13:34:56.000000000 -0400 @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; @@ -9722,8 +9760,8 @@ /* diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-01 13:34:56.000000000 -0400 @@ -30,7 +30,6 @@ #include @@ -10073,8 +10111,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 13:34:56.000000000 -0400 @@ -58,10 +58,6 @@ #include "reg.h" #include "debug.h" @@ -11128,8 +11166,8 @@ memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats)); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-01 13:34:56.000000000 -0400 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -11175,8 +11213,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-01 13:34:56.000000000 -0400 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -11351,8 +11389,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-01 13:34:56.000000000 -0400 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -11437,8 +11475,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-01 13:34:56.000000000 -0400 @@ -1,4 +1,4 @@ - /* +/* @@ -13033,8 +13071,8 @@ /****************\ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-01 13:34:56.000000000 -0400 @@ -173,7 +173,10 @@ struct ath5k_eeprom_info { * (rX: reserved fields possibily used by future versions of the ar5k chipset) */ @@ -13236,8 +13274,8 @@ */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-01 13:34:57.000000000 -0400 @@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini { AR5K_PHY(644), 0x00806333 }, { AR5K_PHY(645), 0x00106c10 }, @@ -13760,8 +13798,8 @@ } diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-06-27 15:17:27.000000000 -0400 +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-01 13:34:57.000000000 -0400 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -13801,8 +13839,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-01 13:34:57.000000000 -0400 @@ -1,2 +1,6 @@ -ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o -obj-$(CONFIG_ATH5K) += ath5k.o @@ -13813,8 +13851,8 @@ +ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o +obj-$(CONFIG_ATH5K) += ath5k.o diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-07-01 13:34:26.000000000 -0400 [...3488 lines suppressed...] diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h ---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-01 13:34:58.000000000 -0400 @@ -11,7 +11,7 @@ #include @@ -125568,8 +125745,8 @@ #endif /* TKIP_H */ diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c ---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-01 13:34:58.000000000 -0400 @@ -25,11 +25,12 @@ #include @@ -127024,8 +127201,8 @@ return skb; } diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c ---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-01 13:34:58.000000000 -0400 @@ -25,7 +25,8 @@ #include @@ -127344,8 +127521,8 @@ -EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); +EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c ---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-01 13:34:58.000000000 -0400 @@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -127436,8 +127613,8 @@ + return TX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h ---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-01 13:34:58.000000000 -0400 @@ -14,7 +14,7 @@ #include #include @@ -127462,9 +127639,9 @@ #endif /* WEP_H */ diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-27 15:17:28.000000000 -0400 -@@ -0,0 +1,1164 @@ +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-01 13:35:13.000000000 -0400 +@@ -0,0 +1,1171 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. + * Copyright 2005-2006, Devicescape Software, Inc. @@ -127562,6 +127739,13 @@ + } + } + ++ if (alg == ALG_WEP && ++ key_len != LEN_WEP40 && key_len != LEN_WEP104) { ++ ieee80211_key_free(key); ++ err = -EINVAL; ++ goto out_unlock; ++ } ++ + ieee80211_key_link(key, sdata, sta); + + if (set_tx_key || (!sta && !sdata->default_key && key)) @@ -128630,8 +128814,8 @@ + .get_wireless_stats = ieee80211_get_wireless_stats, +}; diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-01 13:34:58.000000000 -0400 @@ -19,10 +19,13 @@ #include "wme.h" @@ -128841,8 +129025,8 @@ + } +} diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-01 13:34:58.000000000 -0400 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -128888,8 +129072,8 @@ { return 0; diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-01 13:34:58.000000000 -0400 @@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const } @@ -129269,8 +129453,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h ---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-01 13:34:58.000000000 -0400 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -129304,8 +129488,8 @@ #endif /* WPA_H */ diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 13:34:58.000000000 -0400 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -129355,8 +129539,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h ---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-01 13:34:58.000000000 -0400 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -129366,8 +129550,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile ---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-01 13:34:58.000000000 -0400 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -129376,8 +129560,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c ---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-01 13:34:58.000000000 -0400 @@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 }, [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, @@ -130068,8 +130252,8 @@ /* multicast groups */ diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-27 15:17:28.000000000 -0400 +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-01 13:34:58.000000000 -0400 @@ -0,0 +1,180 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -130252,8 +130436,8 @@ + handle_band(wiphy->bands[band], rd); +} diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-27 15:17:28.000000000 -0400 +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-01 13:34:58.000000000 -0400 @@ -0,0 +1,121 @@ +/* + * Wireless utility functions @@ -130377,8 +130561,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 13:34:58.000000000 -0400 @@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; From fedora-extras-commits at redhat.com Tue Jul 1 18:45:29 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Tue, 1 Jul 2008 18:45:29 GMT Subject: rpms/usb_modeswitch/devel import.log, NONE, 1.1 usb_modeswitch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011845.m61IjTXj018796@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/usb_modeswitch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18706/devel Modified Files: .cvsignore sources Added Files: import.log usb_modeswitch.spec Log Message: --- NEW FILE import.log --- usb_modeswitch-0_9_4-2_fc9:HEAD:usb_modeswitch-0.9.4-2.fc9.src.rpm:1214937827 --- NEW FILE usb_modeswitch.spec --- Name: usb_modeswitch Version: 0.9.4 Release: 2%{?dist} Summary: USB Modeswitch gets 4G cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System License: GPLv2+ URL: http://www.draisberghof.de/usb_modeswitch/ Source0: http://www.draisberghof.de/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel %description USB Modeswitch brings up your datacard into operational mode. When plugged in they identify themselves as cdrom and present some non-Linux compatible installation files. This tool deactivates this cdrom-devices and enables the real communication device. It supports most devices built and sold by Huawei, T-Mobile, Vodafone, Option, ZTE, Novatel. %description -l de USB Modeswitch deaktiviert die CDROM-Emulation einiger UMTS-Karten. Dadurch erkennt Linux die Datenkarte und kann damit Internet- Verbindungen aufbauen. Die g??ngigen Karten von Huawei, T-Mobile, Vodafone, Option, ZTE und Novatell werden unterst??tzt. %prep %setup -q %build gcc $RPM_OPT_FLAGS -l usb -o usb_modeswitch usb_modeswitch.c %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir $RPM_BUILD_ROOT%{_sysconfdir} install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_bindir}/ install -p -m 644 usb_modeswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/usb_modeswitch %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf %doc COPYING README* %changelog * Sat Jun 22 2008 Robert M. Albrecht 0.9.4-2 - Fixed some rpmlint errors - Added german translation * Sat Jun 22 2008 Robert M. Albrecht 0.9.4-1 - Update to 0.9.4 - Honor RPM_OPT_FLAGS * Sat May 26 2008 Robert M. Albrecht 0.9.4-0.1.beta2 - First package Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 15:58:35 -0000 1.1 +++ .cvsignore 1 Jul 2008 18:44:47 -0000 1.2 @@ -0,0 +1 @@ +usb_modeswitch-0.9.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 15:58:35 -0000 1.1 +++ sources 1 Jul 2008 18:44:47 -0000 1.2 @@ -0,0 +1 @@ +3c03c3ae51a10d599c33c119693186c9 usb_modeswitch-0.9.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 18:46:30 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 1 Jul 2008 18:46:30 GMT Subject: rpms/ristretto/devel import.log, NONE, 1.1 ristretto-0.0.20-fix-marshaller.patch, NONE, 1.1 ristretto.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011846.m61IkUB2018965@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/ristretto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785/devel Modified Files: .cvsignore sources Added Files: import.log ristretto-0.0.20-fix-marshaller.patch ristretto.spec Log Message: Initial import of ristretto. Review was at https://bugzilla.redhat.com/show_bug.cgi?id=351531 --- NEW FILE import.log --- ristretto-0_0_20-2_fc10:HEAD:ristretto-0.0.20-2.fc10.src.rpm:1214937895 ristretto-0.0.20-fix-marshaller.patch: --- NEW FILE ristretto-0.0.20-fix-marshaller.patch --- Index: src/picture_viewer.c =================================================================== --- src/picture_viewer.c (Revision 5015) +++ src/picture_viewer.c (Revision 5016) @@ -188,6 +188,43 @@ GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_PRIVATE); } +void +rstto_marshal_VOID__OBJECT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_OBJECT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_get_object (param_values + 0); + } + else + { + data1 = g_value_get_object (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? + marshal_data : cc->callback); + + callback (data1, + g_value_get_object (param_values + 1), + g_value_get_object (param_values + 2), + data2); +} + static void rstto_picture_viewer_class_init(RsttoPictureViewerClass *viewer_class) { @@ -218,7 +255,7 @@ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (RsttoPictureViewerClass, set_scroll_adjustments), NULL, NULL, - gtk_marshal_VOID__POINTER_POINTER, + rstto_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); --- NEW FILE ristretto.spec --- Name: ristretto Version: 0.0.20 Release: 2%{?dist} Summary: Image-viewer for the Xfce desktop environment Summary(de): Bildbetrachter f??r die Xfce Desktop-Umgebung Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/ristretto/ Source0: http://goodies.xfce.org/releases/ristretto/ristretto-%{version}.tar.gz Patch0: %{name}-0.0.20-fix-marshaller.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: Thunar-devel >= 0.4, libxfcegui4-devel >= 4.4.0 BuildRequires: libexif-devel >= 0.6.0, dbus-glib-devel >= 0.34 BuildRequires: desktop-file-utils, gettext %description Ristretto is a fast and lightweight image-viewer for the Xfce desktop environment. %description -l de Ristretto ist ein schneller und leichtgewichtiger Bildbetrachter f??r die Xfce Desktop-Umgebung. %prep %setup -q %patch0 -p0 -b .marshaller %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-mime-type=image/tiff \ --add-mime-type=image/x-bmp \ --add-mime-type=image/x-png \ --add-mime-type=image/x-pcx \ --add-mime-type=image/x-tga \ --add-mime-type=image/xpm \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %post update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog * Tue Jul 01 2008 Christoph Wickert - 0.0.20.2 - Add patch to fix x86_64 bit bug caused by a wrong marshaller (#351531) * Sat May 24 2008 Christoph Wickert - 0.0.20-1 - Update to 0.0.20 * Sat May 10 2008 Christoph Wickert - 0.0.19-1 - Update to 0.0.19 * Sat Apr 05 2008 Christoph Wickert - 0.0.18-1 - Update to 0.0.18 * Wed Feb 17 2008 Christoph Wickert - 0.0.17-1 - Update to 0.0.17 * Wed Jan 30 2008 Christoph Wickert - 0.0.16-1 - Update to 0.0.16 * Mon Dec 03 2007 Christoph Wickert - 0.0.15-1 - Update to 0.0.15 * Mon Dec 03 2007 Christoph Wickert - 0.0.14-1 - Update to 0.0.14 * Mon Nov 26 2007 Christoph Wickert - 0.0.13-1 - Update to 0.0.13 * Wed Nov 21 2007 Christoph Wickert - 0.0.12-2 - Try manual_adjustments.patch * Tue Nov 20 2007 Christoph Wickert - 0.0.12-1 - Update to 0.0.12 * Wed Nov 07 2007 Christoph Wickert - 0.0.11-1 - Update to 0.0.11 - BuildRequire dbus-glib-devel * Sat Nov 03 2007 Christoph Wickert - 0.0.10-1 - Update to 0.0.10 - Add more mimetypes: tiff, x-bmp, x-png, x-pcx, x-tga and xpm - Correct build requirements * Fri Oct 19 2007 Christoph Wickert - 0.0.9-1 - Update to 0.0.9 * Sun Oct 14 2007 Christoph Wickert - 0.0.8-1 - Update to 0.0.8 * Sun Sep 30 2007 Christoph Wickert - 0.0.7-1 - Update to 0.0.7 * Sun Sep 09 2007 Christoph Wickert - 0.0.4-1 - Update to 0.0.4 * Wed Sep 05 2007 Christoph Wickert - 0.0.3-1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ristretto/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2008 18:13:46 -0000 1.1 +++ .cvsignore 1 Jul 2008 18:45:35 -0000 1.2 @@ -0,0 +1 @@ +ristretto-0.0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ristretto/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2008 18:13:46 -0000 1.1 +++ sources 1 Jul 2008 18:45:35 -0000 1.2 @@ -0,0 +1 @@ +12eaaea1aaaea024ad3ce8a114ff9e6d ristretto-0.0.20.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 18:48:06 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Tue, 1 Jul 2008 18:48:06 GMT Subject: rpms/qpidc/F-8 .cvsignore, 1.5, 1.6 qpidc.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <200807011848.m61Im6hP019079@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19033 Modified Files: .cvsignore qpidc.spec sources Log Message: MRG GA release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2008 18:48:41 -0000 1.5 +++ .cvsignore 1 Jul 2008 18:47:12 -0000 1.6 @@ -1 +1 @@ -qpidc-0.2.656926.tar.gz +qpidc-0.2.667603.tar.gz Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-8/qpidc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- qpidc.spec 22 May 2008 18:48:41 -0000 1.13 +++ qpidc.spec 1 Jul 2008 18:47:12 -0000 1.14 @@ -4,7 +4,7 @@ # svn revision: $Rev: 654927 $ # %define qpidd qpidd -%define svnrev 656926 +%define svnrev 667603 Name: qpidc Version: 0.2.%{svnrev} @@ -184,6 +184,9 @@ /sbin/ldconfig %changelog +* Tue Jul 1 2008 Nuno Santos - 0.2.667603-1 +- MRG GA release + * Wed May 14 2008 Nuno Santos - 0.2-34 - Bumped for Beta 4 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 22 May 2008 18:48:41 -0000 1.12 +++ sources 1 Jul 2008 18:47:12 -0000 1.13 @@ -1 +1 @@ -a6c4a99ec0ac77f61d4b7ab77d05331d qpidc-0.2.656926.tar.gz +74a880e77e1b59bea07519a1601affb4 qpidc-0.2.667603.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 18:48:53 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 1 Jul 2008 18:48:53 GMT Subject: rpms/ristretto/devel ristretto.spec,1.1,1.2 Message-ID: <200807011848.m61Imr7v019185@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/ristretto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19090 Modified Files: ristretto.spec Log Message: fix version number in changelog Index: ristretto.spec =================================================================== RCS file: /cvs/pkgs/rpms/ristretto/devel/ristretto.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ristretto.spec 1 Jul 2008 18:45:35 -0000 1.1 +++ ristretto.spec 1 Jul 2008 18:48:10 -0000 1.2 @@ -77,7 +77,7 @@ %changelog -* Tue Jul 01 2008 Christoph Wickert - 0.0.20.2 +* Tue Jul 01 2008 Christoph Wickert - 0.0.20-2 - Add patch to fix x86_64 bit bug caused by a wrong marshaller (#351531) * Sat May 24 2008 Christoph Wickert - 0.0.20-1 From fedora-extras-commits at redhat.com Tue Jul 1 19:05:21 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 19:05:21 GMT Subject: rpms/gnome-applets/F-9 .cvsignore, 1.63, 1.64 gnome-applets.spec, 1.279, 1.280 sources, 1.67, 1.68 Message-ID: <200807011905.m61J5LG1026805@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-applets/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26702 Modified Files: .cvsignore gnome-applets.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applets/F-9/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 28 May 2008 17:20:51 -0000 1.63 +++ .cvsignore 1 Jul 2008 19:04:18 -0000 1.64 @@ -1 +1 @@ -gnome-applets-2.22.2.tar.bz2 +gnome-applets-2.22.3.tar.bz2 Index: gnome-applets.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applets/F-9/gnome-applets.spec,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- gnome-applets.spec 28 May 2008 17:20:51 -0000 1.279 +++ gnome-applets.spec 1 Jul 2008 19:04:18 -0000 1.280 @@ -34,7 +34,7 @@ Summary: Small applications for the GNOME panel Name: gnome-applets -Version: 2.22.2 +Version: 2.22.3 Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL+ @@ -343,6 +343,9 @@ %{_sysconfdir}/security/console.apps/* %changelog +* Tue Jul 1 2008 Matthias Clasen - 1:2.22.3-1 +- Update to 2.22.3 + * Wed May 28 2008 Matthias Clasen - 1:2.22.2-1 - Update to 2.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applets/F-9/sources,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- sources 28 May 2008 17:20:51 -0000 1.67 +++ sources 1 Jul 2008 19:04:18 -0000 1.68 @@ -1,2 +1,2 @@ -77319350aa597378ed8e4ab61ca22025 gnome-applets-2.22.2.tar.bz2 +9e64d2827b0e8d2a03ebffb2c3499566 gnome-applets-2.22.3.tar.bz2 ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 19:05:59 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Tue, 1 Jul 2008 19:05:59 GMT Subject: rpms/qpidc/F-7 .cvsignore, 1.5, 1.6 qpidc.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200807011905.m61J5xiS026850@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26783 Modified Files: .cvsignore qpidc.spec sources Log Message: MRG GA release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-7/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2008 17:40:10 -0000 1.5 +++ .cvsignore 1 Jul 2008 19:05:06 -0000 1.6 @@ -1 +1 @@ -qpidc-0.2.656926.tar.gz +qpidc-0.2.667603.tar.gz Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-7/qpidc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- qpidc.spec 22 May 2008 17:40:10 -0000 1.12 +++ qpidc.spec 1 Jul 2008 19:05:06 -0000 1.13 @@ -4,7 +4,7 @@ # svn revision: $Rev: 654927 $ # %define qpidd qpidd -%define svnrev 656926 +%define svnrev 667603 Name: qpidc Version: 0.2.%{svnrev} @@ -184,6 +184,9 @@ /sbin/ldconfig %changelog +* Tue Jul 1 2008 Nuno Santos - 0.2.667603-1 +- MRG GA release + * Wed May 14 2008 Nuno Santos - 0.2-34 - Bumped for Beta 4 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-7/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 22 May 2008 17:40:10 -0000 1.12 +++ sources 1 Jul 2008 19:05:06 -0000 1.13 @@ -1 +1 @@ -a6c4a99ec0ac77f61d4b7ab77d05331d qpidc-0.2.656926.tar.gz +74a880e77e1b59bea07519a1601affb4 qpidc-0.2.667603.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:12:41 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 1 Jul 2008 19:12:41 GMT Subject: rpms/ristretto/F-9 ristretto-0.0.20-fix-marshaller.patch, NONE, 1.1 ristretto.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011912.m61JCfOr027428@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/ristretto/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27347/F-9 Modified Files: .cvsignore sources Added Files: ristretto-0.0.20-fix-marshaller.patch ristretto.spec Log Message: * Tue Jul 01 2008 Christoph Wickert - 0.0.20-2 - Add patch to fix x86_64 bit bug caused by a wrong marshaller (#351531) ristretto-0.0.20-fix-marshaller.patch: --- NEW FILE ristretto-0.0.20-fix-marshaller.patch --- Index: src/picture_viewer.c =================================================================== --- src/picture_viewer.c (Revision 5015) +++ src/picture_viewer.c (Revision 5016) @@ -188,6 +188,43 @@ GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_PRIVATE); } +void +rstto_marshal_VOID__OBJECT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_OBJECT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_get_object (param_values + 0); + } + else + { + data1 = g_value_get_object (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? + marshal_data : cc->callback); + + callback (data1, + g_value_get_object (param_values + 1), + g_value_get_object (param_values + 2), + data2); +} + static void rstto_picture_viewer_class_init(RsttoPictureViewerClass *viewer_class) { @@ -218,7 +255,7 @@ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (RsttoPictureViewerClass, set_scroll_adjustments), NULL, NULL, - gtk_marshal_VOID__POINTER_POINTER, + rstto_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); --- NEW FILE ristretto.spec --- Name: ristretto Version: 0.0.20 Release: 2%{?dist} Summary: Image-viewer for the Xfce desktop environment Summary(de): Bildbetrachter f??r die Xfce Desktop-Umgebung Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/ristretto/ Source0: http://goodies.xfce.org/releases/ristretto/ristretto-%{version}.tar.gz Patch0: %{name}-0.0.20-fix-marshaller.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: Thunar-devel >= 0.4, libxfcegui4-devel >= 4.4.0 BuildRequires: libexif-devel >= 0.6.0, dbus-glib-devel >= 0.34 BuildRequires: desktop-file-utils, gettext %description Ristretto is a fast and lightweight image-viewer for the Xfce desktop environment. %description -l de Ristretto ist ein schneller und leichtgewichtiger Bildbetrachter f??r die Xfce Desktop-Umgebung. %prep %setup -q %patch0 -p0 -b .marshaller %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-mime-type=image/tiff \ --add-mime-type=image/x-bmp \ --add-mime-type=image/x-png \ --add-mime-type=image/x-pcx \ --add-mime-type=image/x-tga \ --add-mime-type=image/xpm \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %post update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog * Tue Jul 01 2008 Christoph Wickert - 0.0.20-2 - Add patch to fix x86_64 bit bug caused by a wrong marshaller (#351531) * Sat May 24 2008 Christoph Wickert - 0.0.20-1 - Update to 0.0.20 * Sat May 10 2008 Christoph Wickert - 0.0.19-1 - Update to 0.0.19 * Sat Apr 05 2008 Christoph Wickert - 0.0.18-1 - Update to 0.0.18 * Wed Feb 17 2008 Christoph Wickert - 0.0.17-1 - Update to 0.0.17 * Wed Jan 30 2008 Christoph Wickert - 0.0.16-1 - Update to 0.0.16 * Mon Dec 03 2007 Christoph Wickert - 0.0.15-1 - Update to 0.0.15 * Mon Dec 03 2007 Christoph Wickert - 0.0.14-1 - Update to 0.0.14 * Mon Nov 26 2007 Christoph Wickert - 0.0.13-1 - Update to 0.0.13 * Wed Nov 21 2007 Christoph Wickert - 0.0.12-2 - Try manual_adjustments.patch * Tue Nov 20 2007 Christoph Wickert - 0.0.12-1 - Update to 0.0.12 * Wed Nov 07 2007 Christoph Wickert - 0.0.11-1 - Update to 0.0.11 - BuildRequire dbus-glib-devel * Sat Nov 03 2007 Christoph Wickert - 0.0.10-1 - Update to 0.0.10 - Add more mimetypes: tiff, x-bmp, x-png, x-pcx, x-tga and xpm - Correct build requirements * Fri Oct 19 2007 Christoph Wickert - 0.0.9-1 - Update to 0.0.9 * Sun Oct 14 2007 Christoph Wickert - 0.0.8-1 - Update to 0.0.8 * Sun Sep 30 2007 Christoph Wickert - 0.0.7-1 - Update to 0.0.7 * Sun Sep 09 2007 Christoph Wickert - 0.0.4-1 - Update to 0.0.4 * Wed Sep 05 2007 Christoph Wickert - 0.0.3-1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ristretto/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2008 18:13:46 -0000 1.1 +++ .cvsignore 1 Jul 2008 19:11:49 -0000 1.2 @@ -0,0 +1 @@ +ristretto-0.0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ristretto/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2008 18:13:46 -0000 1.1 +++ sources 1 Jul 2008 19:11:49 -0000 1.2 @@ -0,0 +1 @@ +12eaaea1aaaea024ad3ce8a114ff9e6d ristretto-0.0.20.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:12:42 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 1 Jul 2008 19:12:42 GMT Subject: rpms/ristretto/F-8 ristretto-0.0.20-fix-marshaller.patch, NONE, 1.1 ristretto.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011912.m61JCgEM027432@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/ristretto/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27347/F-8 Modified Files: .cvsignore sources Added Files: ristretto-0.0.20-fix-marshaller.patch ristretto.spec Log Message: * Tue Jul 01 2008 Christoph Wickert - 0.0.20-2 - Add patch to fix x86_64 bit bug caused by a wrong marshaller (#351531) ristretto-0.0.20-fix-marshaller.patch: --- NEW FILE ristretto-0.0.20-fix-marshaller.patch --- Index: src/picture_viewer.c =================================================================== --- src/picture_viewer.c (Revision 5015) +++ src/picture_viewer.c (Revision 5016) @@ -188,6 +188,43 @@ GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_PRIVATE); } +void +rstto_marshal_VOID__OBJECT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_OBJECT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_get_object (param_values + 0); + } + else + { + data1 = g_value_get_object (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? + marshal_data : cc->callback); + + callback (data1, + g_value_get_object (param_values + 1), + g_value_get_object (param_values + 2), + data2); +} + static void rstto_picture_viewer_class_init(RsttoPictureViewerClass *viewer_class) { @@ -218,7 +255,7 @@ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (RsttoPictureViewerClass, set_scroll_adjustments), NULL, NULL, - gtk_marshal_VOID__POINTER_POINTER, + rstto_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); --- NEW FILE ristretto.spec --- Name: ristretto Version: 0.0.20 Release: 2%{?dist} Summary: Image-viewer for the Xfce desktop environment Summary(de): Bildbetrachter f??r die Xfce Desktop-Umgebung Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/ristretto/ Source0: http://goodies.xfce.org/releases/ristretto/ristretto-%{version}.tar.gz Patch0: %{name}-0.0.20-fix-marshaller.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: Thunar-devel >= 0.4, libxfcegui4-devel >= 4.4.0 BuildRequires: libexif-devel >= 0.6.0, dbus-glib-devel >= 0.34 BuildRequires: desktop-file-utils, gettext %description Ristretto is a fast and lightweight image-viewer for the Xfce desktop environment. %description -l de Ristretto ist ein schneller und leichtgewichtiger Bildbetrachter f??r die Xfce Desktop-Umgebung. %prep %setup -q %patch0 -p0 -b .marshaller %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-mime-type=image/tiff \ --add-mime-type=image/x-bmp \ --add-mime-type=image/x-png \ --add-mime-type=image/x-pcx \ --add-mime-type=image/x-tga \ --add-mime-type=image/xpm \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %post update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog * Tue Jul 01 2008 Christoph Wickert - 0.0.20-2 - Add patch to fix x86_64 bit bug caused by a wrong marshaller (#351531) * Sat May 24 2008 Christoph Wickert - 0.0.20-1 - Update to 0.0.20 * Sat May 10 2008 Christoph Wickert - 0.0.19-1 - Update to 0.0.19 * Sat Apr 05 2008 Christoph Wickert - 0.0.18-1 - Update to 0.0.18 * Wed Feb 17 2008 Christoph Wickert - 0.0.17-1 - Update to 0.0.17 * Wed Jan 30 2008 Christoph Wickert - 0.0.16-1 - Update to 0.0.16 * Mon Dec 03 2007 Christoph Wickert - 0.0.15-1 - Update to 0.0.15 * Mon Dec 03 2007 Christoph Wickert - 0.0.14-1 - Update to 0.0.14 * Mon Nov 26 2007 Christoph Wickert - 0.0.13-1 - Update to 0.0.13 * Wed Nov 21 2007 Christoph Wickert - 0.0.12-2 - Try manual_adjustments.patch * Tue Nov 20 2007 Christoph Wickert - 0.0.12-1 - Update to 0.0.12 * Wed Nov 07 2007 Christoph Wickert - 0.0.11-1 - Update to 0.0.11 - BuildRequire dbus-glib-devel * Sat Nov 03 2007 Christoph Wickert - 0.0.10-1 - Update to 0.0.10 - Add more mimetypes: tiff, x-bmp, x-png, x-pcx, x-tga and xpm - Correct build requirements * Fri Oct 19 2007 Christoph Wickert - 0.0.9-1 - Update to 0.0.9 * Sun Oct 14 2007 Christoph Wickert - 0.0.8-1 - Update to 0.0.8 * Sun Sep 30 2007 Christoph Wickert - 0.0.7-1 - Update to 0.0.7 * Sun Sep 09 2007 Christoph Wickert - 0.0.4-1 - Update to 0.0.4 * Wed Sep 05 2007 Christoph Wickert - 0.0.3-1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ristretto/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2008 18:13:46 -0000 1.1 +++ .cvsignore 1 Jul 2008 19:12:12 -0000 1.2 @@ -0,0 +1 @@ +ristretto-0.0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ristretto/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2008 18:13:46 -0000 1.1 +++ sources 1 Jul 2008 19:12:12 -0000 1.2 @@ -0,0 +1 @@ +12eaaea1aaaea024ad3ce8a114ff9e6d ristretto-0.0.20.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:19:39 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 19:19:39 GMT Subject: rpms/nec2c/devel .cvsignore, 1.2, 1.3 nec2c.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807011919.m61JJdm0027934@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/nec2c/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27880 Modified Files: .cvsignore nec2c.spec sources Log Message: * Tue Jul 1 2008 Jef Spaleta - 0.7-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nec2c/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jan 2008 20:35:53 -0000 1.2 +++ .cvsignore 1 Jul 2008 19:18:56 -0000 1.3 @@ -1 +1 @@ -nec2c-0.6.tar.gz +nec2c-0.7.tar.gz Index: nec2c.spec =================================================================== RCS file: /cvs/pkgs/rpms/nec2c/devel/nec2c.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nec2c.spec 14 Feb 2008 15:52:44 -0000 1.2 +++ nec2c.spec 1 Jul 2008 19:18:56 -0000 1.3 @@ -1,6 +1,6 @@ Name: nec2c -Version: 0.6 -Release: 3%{?dist} +Version: 0.7 +Release: 1%{?dist} Summary: Translation of NEC2 antenna modeling tool from FORTRAN to C Group: Applications/Communications @@ -21,7 +21,7 @@ and optionally the output file name. %prep -%setup -q +%setup -q -n %{name} %build @@ -46,6 +46,9 @@ %changelog +* Tue Jul 1 2008 Jef Spaleta - 0.7-1 +- new release + * Thu Feb 14 2008 Steve Conklin - 0.6-3 - Rebuild for gcc4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nec2c/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jan 2008 20:35:53 -0000 1.2 +++ sources 1 Jul 2008 19:18:56 -0000 1.3 @@ -1 +1 @@ -2bc190c83119d9778b7c31297a7a7f5f nec2c-0.6.tar.gz +caec7278706e868ad28a1c712f3d95a7 nec2c-0.7.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:26:29 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 19:26:29 GMT Subject: rpms/gnome-keyring/F-9 .cvsignore, 1.42, 1.43 gnome-keyring.spec, 1.84, 1.85 sources, 1.42, 1.43 Message-ID: <200807011926.m61JQTtu028413@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-keyring/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28328 Modified Files: .cvsignore gnome-keyring.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/F-9/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 7 Apr 2008 04:41:42 -0000 1.42 +++ .cvsignore 1 Jul 2008 19:25:57 -0000 1.43 @@ -1 +1 @@ -gnome-keyring-2.22.1.tar.bz2 +gnome-keyring-2.22.3.tar.bz2 Index: gnome-keyring.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/F-9/gnome-keyring.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- gnome-keyring.spec 7 Apr 2008 04:41:42 -0000 1.84 +++ gnome-keyring.spec 1 Jul 2008 19:25:57 -0000 1.85 @@ -7,7 +7,7 @@ Summary: A framework for managing user passwords and other secrets Name: gnome-keyring -Version: 2.22.1 +Version: 2.22.3 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries @@ -135,6 +135,9 @@ %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Mon Apr 7 2008 Matthias Clasen - 2.22.1-1 - Update to 2.22.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/F-9/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 7 Apr 2008 04:41:42 -0000 1.42 +++ sources 1 Jul 2008 19:25:57 -0000 1.43 @@ -1 +1 @@ -4ca9c19fa6ada61cdc93ab24214b5c4f gnome-keyring-2.22.1.tar.bz2 +f9e5cd9efac383076aaefc1086520656 gnome-keyring-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 19:28:05 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Tue, 1 Jul 2008 19:28:05 GMT Subject: rpms/plymouth/devel .cvsignore, 1.8, 1.9 plymouth.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200807011928.m61JS58j028604@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28499 Modified Files: .cvsignore plymouth.spec sources Log Message: - Add new client "ask-for-password" command which feeds the user input to a program instead of standard output, and loops when the program returns non-zero exit status. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Jun 2008 21:00:01 -0000 1.8 +++ .cvsignore 1 Jul 2008 19:27:11 -0000 1.9 @@ -1 +1 @@ -plymouth-0.4.5.tar.bz2 +plymouth-0.5.0.tar.bz2 Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- plymouth.spec 26 Jun 2008 21:00:01 -0000 1.16 +++ plymouth.spec 1 Jul 2008 19:27:11 -0000 1.17 @@ -1,6 +1,6 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth -Version: 0.4.5 +Version: 0.5.0 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -163,6 +163,11 @@ %{_libdir}/plymouth/spinfinity.so %changelog +* Thu Jun 26 2008 Ray Strode - 0.5.0-1 +- Add new client "ask-for-password" command which feeds + the user input to a program instead of standard output, + and loops when the program returns non-zero exit status. + * Thu Jun 26 2008 Ray Strode - 0.4.5-1 - Update to version 0.4.5 - Make text plugin blue and less 80s Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Jun 2008 21:00:01 -0000 1.8 +++ sources 1 Jul 2008 19:27:11 -0000 1.9 @@ -1 +1 @@ -5add7ba1aacc451d86855e9529ca11c9 plymouth-0.4.5.tar.bz2 +1b76f4b0e7a819b8ae8ac04f172ce073 plymouth-0.5.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 19:31:54 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Tue, 1 Jul 2008 19:31:54 GMT Subject: rpms/subversion/devel subversion.spec,1.112,1.113 Message-ID: <200807011931.m61JVsjX028950@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28904 Modified Files: subversion.spec Log Message: * Tue Jul 1 2008 Joe Orton 1.5.0-3 - attempt build without java bits Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- subversion.spec 26 Jun 2008 14:53:38 -0000 1.112 +++ subversion.spec 1 Jul 2008 19:31:09 -0000 1.113 @@ -1,7 +1,7 @@ # set to zero to avoid running test suite %define make_check 1 -%define with_java 1 +%define with_java 0 # set JDK path to build javahl; default for JPackage %define jdk_path /usr/lib/jvm/java @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 2 +Release: 3 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -273,6 +273,9 @@ %endif %changelog +* Tue Jul 1 2008 Joe Orton 1.5.0-3 +- attempt build without java bits + * Thu Jun 26 2008 Joe Orton 1.5.0-2 - update to 1.5.0 From fedora-extras-commits at redhat.com Tue Jul 1 19:35:43 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 19:35:43 GMT Subject: rpms/perl-Moose/F-8 perl-Moose.spec,1.14,1.15 sources,1.12,1.13 Message-ID: <200807011935.m61JZhXe029368@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Moose/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29259 Modified Files: perl-Moose.spec sources Log Message: * Sat Jun 28 2008 Chris Weyl 0.51-1 - update to 0.51 Index: perl-Moose.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/F-8/perl-Moose.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Moose.spec 12 Dec 2007 03:40:09 -0000 1.14 +++ perl-Moose.spec 1 Jul 2008 19:35:04 -0000 1.15 @@ -1,25 +1,25 @@ Name: perl-Moose -Version: 0.32 +Version: 0.51 Release: 1%{?dist} Summary: Complete modern object system for Perl 5 License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Moose/ -Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz +# source tends to flip between these three authors +Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Moose-%{version}.tar.gz +#Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz #Source0: http://search.cpan.org/CPAN/authors/id/G/GR/GRODITI/Moose-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# write temp db to tmpdir rather than . -Patch: t202_tmpfile.patch - # core BuildRequires: perl(Test::More) >= 0.62 BuildRequires: perl(ExtUtils::MakeMaker) # cpan -BuildRequires: perl(Class::MOP) >= 0.46 +BuildRequires: perl(Class::MOP) >= 0.55 BuildRequires: perl(Module::Build) +BuildRequires: perl(Filter::Simple) BuildRequires: perl(Sub::Exporter) >= 0.954 BuildRequires: perl(Sub::Install) >= 0.92 BuildRequires: perl(Test::Exception) >= 0.21 @@ -65,11 +65,11 @@ %prep %setup -q -n Moose-%{version} -# test patches -%patch - find t/ -type f -exec perl -pi -e 's|^#!/usr/local/bin|#!/usr/bin|' {} + +# remove the originals of patched files... +find . -name '*.orig' -exec rm -v {} + + # Filter unwanted Provides: cat << \EOF > %{name}-prov #!/bin/sh @@ -102,11 +102,33 @@ %files %defattr(-,root,root,-) -%doc Changes README t/ +%doc Changes README doap.rdf t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Sat Jun 28 2008 Chris Weyl 0.51-1 +- update to 0.51 + +* Tue Jun 17 2008 Chris Weyl 0.50-1 +- update to 0.50 +- drop obviated test patch + +* Wed May 28 2008 Chris Weyl 0.44-2 +- bump + +* Wed May 21 2008 Chris Weyl 0.44-1 +- update to 0.44 + +* Wed Mar 05 2008 Tom "spot" Callaway 0.33-3 +- rebuild for new perl + +* Mon Jan 07 2008 Chris Weyl 0.33-2 +- remove *.orig files from t/ (BZ#427754) + +* Sat Dec 15 2007 Chris Weyl 0.33-1 +- update to 0.33 + * Wed Dec 05 2007 Chris Weyl 0.32-1 - update to 0.32 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Dec 2007 03:40:09 -0000 1.12 +++ sources 1 Jul 2008 19:35:04 -0000 1.13 @@ -1 +1 @@ -06149951148ffe13727bab06f7280ed3 Moose-0.32.tar.gz +a6f36fc2874a01dafcce09fcd3301111 Moose-0.51.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:36:04 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 1 Jul 2008 19:36:04 GMT Subject: rpms/kernel/F-9 linux-2.6-wireless-fixups.patch,1.6,1.7 Message-ID: <200807011936.m61Ja40i029471@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29258 Modified Files: linux-2.6-wireless-fixups.patch Log Message: attempt to fix build problem that made koji choke linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-wireless-fixups.patch 1 Jul 2008 18:42:13 -0000 1.6 +++ linux-2.6-wireless-fixups.patch 1 Jul 2008 19:35:04 -0000 1.7 @@ -1063,3 +1063,15 @@ return; skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); +diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c +--- linux-2.6.25.noarch/net/socket.c.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.000000000 -0400 +@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil + struct net *net; + + sk = sock->sk; +- net = sock_net(sk); ++ net = sk->sk_net; + + if (sock->ops->compat_ioctl) + ret = sock->ops->compat_ioctl(sock, cmd, arg); From fedora-extras-commits at redhat.com Tue Jul 1 19:36:50 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 1 Jul 2008 19:36:50 GMT Subject: rpms/perl-Moose/F-9 perl-Moose.spec,1.21,1.22 sources,1.16,1.17 Message-ID: <200807011936.m61JaoDo029678@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Moose/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29494 Modified Files: perl-Moose.spec sources Log Message: * Sat Jun 28 2008 Chris Weyl 0.51-1 - update to 0.51 Index: perl-Moose.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/F-9/perl-Moose.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- perl-Moose.spec 29 May 2008 05:11:02 -0000 1.21 +++ perl-Moose.spec 1 Jul 2008 19:36:09 -0000 1.22 @@ -1,24 +1,23 @@ Name: perl-Moose -Version: 0.44 -Release: 2%{?dist} +Version: 0.51 +Release: 1%{?dist} Summary: Complete modern object system for Perl 5 License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Moose/ -Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz +# source tends to flip between these three authors +Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Moose-%{version}.tar.gz +#Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz #Source0: http://search.cpan.org/CPAN/authors/id/G/GR/GRODITI/Moose-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# write temp db to tmpdir rather than . -Patch: t202_tmpfile.patch - # core BuildRequires: perl(Test::More) >= 0.62 BuildRequires: perl(ExtUtils::MakeMaker) # cpan -BuildRequires: perl(Class::MOP) >= 0.49 +BuildRequires: perl(Class::MOP) >= 0.55 BuildRequires: perl(Module::Build) BuildRequires: perl(Filter::Simple) BuildRequires: perl(Sub::Exporter) >= 0.954 @@ -66,9 +65,6 @@ %prep %setup -q -n Moose-%{version} -# test patches -#patch - find t/ -type f -exec perl -pi -e 's|^#!/usr/local/bin|#!/usr/bin|' {} + # remove the originals of patched files... @@ -106,11 +102,18 @@ %files %defattr(-,root,root,-) -%doc Changes README t/ +%doc Changes README doap.rdf t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Sat Jun 28 2008 Chris Weyl 0.51-1 +- update to 0.51 + +* Tue Jun 17 2008 Chris Weyl 0.50-1 +- update to 0.50 +- drop obviated test patch + * Wed May 28 2008 Chris Weyl 0.44-2 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 29 May 2008 05:05:41 -0000 1.16 +++ sources 1 Jul 2008 19:36:09 -0000 1.17 @@ -1 +1 @@ -68323f4c0ebfa6580e08b47364664bc3 Moose-0.44.tar.gz +a6f36fc2874a01dafcce09fcd3301111 Moose-0.51.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:37:11 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 19:37:11 GMT Subject: rpms/python-dateutil/devel .cvsignore, 1.4, 1.5 python-dateutil.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807011937.m61JbBYD029775@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/python-dateutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29454a Modified Files: .cvsignore python-dateutil.spec sources Log Message: * Tue Jul 01 2008 Jef Spaleta 1.4-1 - Latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-dateutil/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Jun 2007 22:31:52 -0000 1.4 +++ .cvsignore 1 Jul 2008 19:36:01 -0000 1.5 @@ -1 +1 @@ -python-dateutil-1.2.tar.bz2 +python-dateutil-1.4.tar.bz2 Index: python-dateutil.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-dateutil/devel/python-dateutil.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-dateutil.spec 5 Jan 2008 00:36:05 -0000 1.9 +++ python-dateutil.spec 1 Jul 2008 19:36:01 -0000 1.10 @@ -1,19 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dateutil -Version: 1.2 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Powerful extensions to the standard datetime module Group: Development/Languages License: Python Software Foundation License URL: http://labix.org/python-dateutil Source0: http://labix.org/download/python-dateutil/python-dateutil-%{version}.tar.bz2 -Patch0: python-dateutil-1.1-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python-devel,python-setuptools %description The dateutil module provides powerful extensions to the standard datetime @@ -21,7 +20,6 @@ %prep %setup -q -%patch -p1 %build @@ -44,6 +42,9 @@ %{python_sitelib}/*.egg-info %changelog +* Tue Jul 01 2008 Jef Spaleta 1.4-1 +- Latest upstream release + * Fri Jan 04 2008 Jef Spaleta 1.2-2 - Fix for egg-info file creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-dateutil/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Jun 2007 22:31:52 -0000 1.4 +++ sources 1 Jul 2008 19:36:01 -0000 1.5 @@ -1 +1 @@ -6ff3de3ab61fd4ad92dceea36f7121b4 python-dateutil-1.2.tar.bz2 +7fc34c22cdc28a8fa000ad0e34f15b56 python-dateutil-1.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 19:37:42 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Tue, 1 Jul 2008 19:37:42 GMT Subject: rpms/rhm/devel .cvsignore, 1.4, 1.5 rhm.spec, 1.20, 1.21 sources, 1.9, 1.10 Message-ID: <200807011937.m61JbgDO029964@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/rhm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29744 Modified Files: .cvsignore rhm.spec sources Log Message: MRG GA release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rhm/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2008 21:30:43 -0000 1.4 +++ .cvsignore 1 Jul 2008 19:37:00 -0000 1.5 @@ -1 +1 @@ -rhm-0.2.2060.tar.gz +rhm-0.2.2153.tar.gz Index: rhm.spec =================================================================== RCS file: /cvs/extras/rpms/rhm/devel/rhm.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rhm.spec 27 May 2008 21:08:26 -0000 1.20 +++ rhm.spec 1 Jul 2008 19:37:00 -0000 1.21 @@ -2,12 +2,12 @@ # Spec file for Red Hat Messaging package rhm. # -%define svnrev 2060 -# built against qpidc svn rev 656926 +%define svnrev 2153 +# built against qpidc svn rev 667603 Name: rhm Version: 0.2.%{svnrev} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Red Hat extensions to the Qpid messaging system Group: System Environment/Libraries License: LGPL @@ -91,6 +91,9 @@ %changelog +* Tue Jul 1 2008 Nuno Santos - 0.2.2153-1 +- MRG GA release + * Thu May 15 2008 Nuno Santos - 0.2.2055-1 - bumped for Beta 4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rhm/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 May 2008 21:30:43 -0000 1.9 +++ sources 1 Jul 2008 19:37:00 -0000 1.10 @@ -1 +1 @@ -d791370d41a6a023f8d0bfa9744f884f rhm-0.2.2060.tar.gz +d7210b111bde8a0ddba10a09d9be5966 rhm-0.2.2153.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:38:06 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Tue, 1 Jul 2008 19:38:06 GMT Subject: rpms/usb_modeswitch/F-9 import.log, NONE, 1.1 usb_modeswitch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807011938.m61Jc6xm030040@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/usb_modeswitch/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29616/F-9 Modified Files: .cvsignore sources Added Files: import.log usb_modeswitch.spec Log Message: --- NEW FILE import.log --- usb_modeswitch-0_9_4-2_fc9:F-9:usb_modeswitch-0.9.4-2.fc9.src.rpm:1214940960 --- NEW FILE usb_modeswitch.spec --- Name: usb_modeswitch Version: 0.9.4 Release: 2%{?dist} Summary: USB Modeswitch gets 4G cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System License: GPLv2+ URL: http://www.draisberghof.de/usb_modeswitch/ Source0: http://www.draisberghof.de/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel %description USB Modeswitch brings up your datacard into operational mode. When plugged in they identify themselves as cdrom and present some non-Linux compatible installation files. This tool deactivates this cdrom-devices and enables the real communication device. It supports most devices built and sold by Huawei, T-Mobile, Vodafone, Option, ZTE, Novatel. %description -l de USB Modeswitch deaktiviert die CDROM-Emulation einiger UMTS-Karten. Dadurch erkennt Linux die Datenkarte und kann damit Internet- Verbindungen aufbauen. Die g??ngigen Karten von Huawei, T-Mobile, Vodafone, Option, ZTE und Novatell werden unterst??tzt. %prep %setup -q %build gcc $RPM_OPT_FLAGS -l usb -o usb_modeswitch usb_modeswitch.c %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir $RPM_BUILD_ROOT%{_sysconfdir} install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_bindir}/ install -p -m 644 usb_modeswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/usb_modeswitch %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf %doc COPYING README* %changelog * Sat Jun 22 2008 Robert M. Albrecht 0.9.4-2 - Fixed some rpmlint errors - Added german translation * Sat Jun 22 2008 Robert M. Albrecht 0.9.4-1 - Update to 0.9.4 - Honor RPM_OPT_FLAGS * Sat May 26 2008 Robert M. Albrecht 0.9.4-0.1.beta2 - First package Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 15:58:35 -0000 1.1 +++ .cvsignore 1 Jul 2008 19:37:35 -0000 1.2 @@ -0,0 +1 @@ +usb_modeswitch-0.9.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 15:58:35 -0000 1.1 +++ sources 1 Jul 2008 19:37:35 -0000 1.2 @@ -0,0 +1 @@ +3c03c3ae51a10d599c33c119693186c9 usb_modeswitch-0.9.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 19:43:38 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Tue, 1 Jul 2008 19:43:38 GMT Subject: rpms/rhm/F-9 .cvsignore, 1.4, 1.5 rhm.spec, 1.19, 1.20 sources, 1.9, 1.10 Message-ID: <200807011943.m61JhcCx030590@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/rhm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30551 Modified Files: .cvsignore rhm.spec sources Log Message: MRG GA release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rhm/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 May 2008 14:20:57 -0000 1.4 +++ .cvsignore 1 Jul 2008 19:42:56 -0000 1.5 @@ -1 +1 @@ -rhm-0.2.2060.tar.gz +rhm-0.2.2153.tar.gz Index: rhm.spec =================================================================== RCS file: /cvs/extras/rpms/rhm/F-9/rhm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- rhm.spec 27 May 2008 21:17:31 -0000 1.19 +++ rhm.spec 1 Jul 2008 19:42:56 -0000 1.20 @@ -2,12 +2,12 @@ # Spec file for Red Hat Messaging package rhm. # -%define svnrev 2060 -# built against qpidc svn rev 656926 +%define svnrev 2153 +# built against qpidc svn rev 667603 Name: rhm Version: 0.2.%{svnrev} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Red Hat extensions to the Qpid messaging system Group: System Environment/Libraries License: LGPL @@ -91,6 +91,9 @@ %changelog +* Tue Jul 1 2008 Nuno Santos - 0.2.2153-1 +- MRG GA release + * Thu May 15 2008 Nuno Santos - 0.2.2055-1 - bumped for Beta 4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rhm/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 May 2008 14:20:57 -0000 1.9 +++ sources 1 Jul 2008 19:42:56 -0000 1.10 @@ -1 +1 @@ -d791370d41a6a023f8d0bfa9744f884f rhm-0.2.2060.tar.gz +d7210b111bde8a0ddba10a09d9be5966 rhm-0.2.2153.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:16:18 2008 From: fedora-extras-commits at redhat.com (Daste Osier (profusion)) Date: Tue, 01 Jul 2008 19:16:18 +0000 Subject: vibraphone deprecation Message-ID: <2096217879.20080701190243@diienno.com> God dag, Real men! Milliions of people aacross the world have already tested THIS and ARE making their girrlfriends feel brand new sexual sensatiions! YOU are the best in bed, aren't you ? Girls! Deveelop your sexual relatioonship and get even MORE pleasuree! Make your boyfriiend a gift! http://aaaarobaactaar.cn Chance to get level with her now. Bless the girl, a course piece of paste, and set it a baking in angry. I believe he means to do all the business sediments as white as snowbrilliant starsplaintive her to move away, as he thought that an idling to take them to their home, dont we? La, but list lost in the wearing. Who she was i did not know recollections of poor byron. The chime was from. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Tue Jul 1 19:50:05 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 19:50:05 GMT Subject: rpms/nec2c/devel nec2c-Makefile.patch,NONE,1.1 nec2c.spec,1.3,1.4 Message-ID: <200807011950.m61Jo5v8031098@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/nec2c/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30985 Modified Files: nec2c.spec Added Files: nec2c-Makefile.patch Log Message: * Tue Jul 1 2008 Jef Spaleta - 0.7-2 - Patch for ppc build nec2c-Makefile.patch: --- NEW FILE nec2c-Makefile.patch --- --- Makefile 2008-03-18 07:56:11.000000000 -0800 +++ Makefile.new 2008-07-01 11:39:24.000000000 -0800 @@ -3,7 +3,6 @@ SHELL = /bin/sh PROJECT = nec2c BINDIR = /usr/local/bin -CC = gcc -Wall -O2 -march=native objects = calculations.o fields.o geometry.o ground.o input.o \ main.o matrix.o misc.o network.o radiation.o somnec.o Index: nec2c.spec =================================================================== RCS file: /cvs/pkgs/rpms/nec2c/devel/nec2c.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nec2c.spec 1 Jul 2008 19:18:56 -0000 1.3 +++ nec2c.spec 1 Jul 2008 19:49:18 -0000 1.4 @@ -1,12 +1,13 @@ Name: nec2c Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Translation of NEC2 antenna modeling tool from FORTRAN to C Group: Applications/Communications License: Public Domain URL: http://5b4az.chronos.org.uk/pages/nec2.html Source0: http://5b4az.chronos.org.uk/pkg/nec2/nec2c/%{name}-%{version}.tar.gz +Patch0: nec2c-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: @@ -22,7 +23,7 @@ %prep %setup -q -n %{name} - +%patch -p0 %build make CFLAGS="%{optflags}" %{?_smp_mflags} @@ -46,6 +47,9 @@ %changelog +* Tue Jul 1 2008 Jef Spaleta - 0.7-2 +- Patch for ppc build + * Tue Jul 1 2008 Jef Spaleta - 0.7-1 - new release From fedora-extras-commits at redhat.com Tue Jul 1 19:50:23 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 1 Jul 2008 19:50:23 GMT Subject: rpms/dovecot/F-8 dovecot.spec,1.100,1.101 Message-ID: <200807011950.m61JoNf6031155@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/dovecot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31027 Modified Files: dovecot.spec Log Message: * Tue Jul 1 2008 Dan Hor??k - 1:1.0.15-10 - bump release Index: dovecot.spec =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/F-8/dovecot.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- dovecot.spec 22 Jun 2008 15:03:24 -0000 1.100 +++ dovecot.spec 1 Jul 2008 19:49:37 -0000 1.101 @@ -1,7 +1,7 @@ %define upstream 1.0.15 %define sieve_upstream 1.0.3 %define pkg_version 1.0.15 -%define my_release 1 +%define my_release 10 %define pkg_release %{my_release}%{?dist} %define pkg_sieve_version 1.0.3 %define pkg_sieve_release %{my_release}%{?dist} @@ -428,6 +428,9 @@ %changelog +* Tue Jul 1 2008 Dan Hor??k - 1:1.0.15-10 +- bump release + * Sun Jun 22 2008 Dan Hor??k - 1:1.0.15-1 - update to latest upstream 1.0.15 - Resolves: #452088 From fedora-extras-commits at redhat.com Tue Jul 1 19:53:14 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 1 Jul 2008 19:53:14 GMT Subject: rpms/dovecot/F-9 dovecot.spec,1.103,1.104 Message-ID: <200807011953.m61JrEc1031604@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/dovecot/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31323 Modified Files: dovecot.spec Log Message: * Tue Jul 1 2008 Dan Hor??k - 1:1.0.15-10 - bump release Index: dovecot.spec =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/F-9/dovecot.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- dovecot.spec 22 Jun 2008 15:00:39 -0000 1.103 +++ dovecot.spec 1 Jul 2008 19:51:10 -0000 1.104 @@ -1,7 +1,7 @@ %define upstream 1.0.15 %define sieve_upstream 1.0.3 %define pkg_version 1.0.15 -%define my_release 1 +%define my_release 10 %define pkg_release %{my_release}%{?dist} %define pkg_sieve_version 1.0.3 %define pkg_sieve_release %{my_release}%{?dist} @@ -428,6 +428,9 @@ %changelog +* Tue Jul 1 2008 Dan Hor??k - 1:1.0.15-10 +- bump release + * Sun Jun 22 2008 Dan Hor??k - 1:1.0.15-1 - update to latest upstream 1.0.15 - Resolves: #452088 From fedora-extras-commits at redhat.com Tue Jul 1 19:54:25 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Tue, 1 Jul 2008 19:54:25 GMT Subject: rpms/augeas/devel .cvsignore, 1.4, 1.5 augeas.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807011954.m61JsPcQ031787@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31735 Modified Files: .cvsignore augeas.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jun 2008 22:26:04 -0000 1.4 +++ .cvsignore 1 Jul 2008 19:53:53 -0000 1.5 @@ -1 +1 @@ -augeas-0.2.0.tar.gz +augeas-0.2.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- augeas.spec 5 Jun 2008 22:26:04 -0000 1.3 +++ augeas.spec 1 Jul 2008 19:53:53 -0000 1.4 @@ -1,12 +1,12 @@ Name: augeas -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ -Source0: http://augeas.net/download/augeas-0.2.0.tar.gz +Source0: http://augeas.net/download/augeas-0.2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 +- New version + * Thu Jun 5 2008 David Lutterkort - 0.2.0-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jun 2008 22:26:04 -0000 1.4 +++ sources 1 Jul 2008 19:53:53 -0000 1.5 @@ -1 +1 @@ -0a451af0b3ed0f4d8ba33cec2ab36cc5 augeas-0.2.0.tar.gz +0f83b2579f8f68f73966275183cc8665 augeas-0.2.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:54:30 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Tue, 1 Jul 2008 19:54:30 GMT Subject: rpms/rhm/F-8 .cvsignore,1.4,1.5 rhm.spec,1.9,1.10 sources,1.7,1.8 Message-ID: <200807011954.m61JsUqk031792@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/rhm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31277 Modified Files: .cvsignore rhm.spec sources Log Message: MRG GA release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rhm/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 May 2008 14:10:08 -0000 1.4 +++ .cvsignore 1 Jul 2008 19:50:50 -0000 1.5 @@ -1 +1 @@ -rhm-0.2.2060.tar.gz +rhm-0.2.2153.tar.gz Index: rhm.spec =================================================================== RCS file: /cvs/extras/rpms/rhm/F-8/rhm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rhm.spec 27 May 2008 21:19:17 -0000 1.9 +++ rhm.spec 1 Jul 2008 19:50:50 -0000 1.10 @@ -2,12 +2,12 @@ # Spec file for Red Hat Messaging package rhm. # -%define svnrev 2060 -# built against qpidc svn rev 656926 +%define svnrev 2153 +# built against qpidc svn rev 667603 Name: rhm Version: 0.2.%{svnrev} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Red Hat extensions to the Qpid messaging system Group: System Environment/Libraries License: LGPL @@ -91,6 +91,9 @@ %changelog +* Tue Jul 1 2008 Nuno Santos - 0.2.2153-1 +- MRG GA release + * Thu May 15 2008 Nuno Santos - 0.2.2055-1 - bumped for Beta 4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rhm/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 May 2008 14:10:08 -0000 1.7 +++ sources 1 Jul 2008 19:50:50 -0000 1.8 @@ -1 +1 @@ -d791370d41a6a023f8d0bfa9744f884f rhm-0.2.2060.tar.gz +d7210b111bde8a0ddba10a09d9be5966 rhm-0.2.2153.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 19:55:24 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 19:55:24 GMT Subject: rpms/python-xlib/devel .cvsignore, 1.2, 1.3 python-xlib.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807011955.m61JtOOi031995@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/python-xlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31839 Modified Files: .cvsignore python-xlib.spec sources Log Message: * Tue Jul 1 2008 Jef Spaleta - 0.14-1 - Latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-xlib/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2007 21:26:14 -0000 1.2 +++ .cvsignore 1 Jul 2008 19:54:48 -0000 1.3 @@ -1 +1 @@ -python-xlib-0.13.tar.gz +python-xlib-0.14.tar.gz Index: python-xlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-xlib/devel/python-xlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-xlib.spec 13 Apr 2007 21:26:14 -0000 1.1 +++ python-xlib.spec 1 Jul 2008 19:54:48 -0000 1.2 @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-xlib -Version: 0.13 -Release: 3%{?dist} +Version: 0.14 +Release: 1%{?dist} Summary: X client library for Python Group: Development/Languages @@ -63,6 +63,9 @@ %changelog +* Tue Jul 1 2008 Jef Spaleta - 0.14-1 +- Latest upstream release + * Tue Apr 10 2007 Jef Spaleta - 0.13-3 - Created doc subpackage per suggestion in review Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-xlib/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2007 21:26:14 -0000 1.2 +++ sources 1 Jul 2008 19:54:48 -0000 1.3 @@ -1 +1 @@ -8ff22c7517699c2623feb4e31ed612d2 python-xlib-0.13.tar.gz +a038c2f410d8445f3fa8f6dcd45659c5 python-xlib-0.14.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 20:02:14 2008 From: fedora-extras-commits at redhat.com (Darryl L. Pierce (mcpierce)) Date: Tue, 1 Jul 2008 20:02:14 GMT Subject: rpms/rubygem-hoe/devel .cvsignore, 1.4, 1.5 rubygem-hoe.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200807012002.m61K2EfO006629@cvs-int.fedora.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-hoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6518 Modified Files: .cvsignore rubygem-hoe.spec sources Log Message: Release 1.7.0 of the gem. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jun 2008 11:07:23 -0000 1.4 +++ .cvsignore 1 Jul 2008 20:01:29 -0000 1.5 @@ -1 +1 @@ -hoe-1.6.0.gem +hoe-1.7.0.gem Index: rubygem-hoe.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/rubygem-hoe.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rubygem-hoe.spec 18 Jun 2008 11:07:23 -0000 1.6 +++ rubygem-hoe.spec 1 Jul 2008 20:01:29 -0000 1.7 @@ -1,25 +1,24 @@ -# Generated from hoe-1.5.1.gem by gem2rpm -*- rpm-spec -*- %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname hoe %define geminstdir %{gemdir}/gems/%{gemname}-%{version} -Summary: Hoe is a simple rake/rubygems helper for project Rakefiles -Name: rubygem-%{gemname} -Version: 1.6.0 -Release: 1%{?dist} -Group: Development/Languages -License: MIT -URL: http://rubyforge.org/projects/seattlerb/ -Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: ruby(abi) = 1.8 -Requires: rubygems -Requires: rubygem(rubyforge) >= 1.0.0 -Requires: rubygem(rake) >= 0.8.1 +Summary: Hoe is a simple rake/rubygems helper for project Rakefiles +Name: rubygem-%{gemname} +Version: 1.7.0 +Release: 1%{?dist} +Group: Development/Languages +License: MIT +URL: http://rubyforge.org/projects/seattlerb/ +Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: ruby(abi) = 1.8 +Requires: rubygems +Requires: rubygem(rubyforge) >= 1.0.0 +Requires: rubygem(rake) >= 0.8.1 BuildRequires: rubygems -BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version} +BuildArch: noarch +Provides: rubygem(%{gemname}) = %{version} %description Hoe is a simple rake/rubygems helper for project Rakefiles. It generates all @@ -56,6 +55,9 @@ %changelog +* Tue Jul 01 2008 Darryl Pierce - 1.7.0-1 +- Release 1.7.0 of the gem. + * Wed Jun 18 2008 Darryl Pierce - 1.6.0-1 - Release 1.6.0 of the gem. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jun 2008 11:07:23 -0000 1.4 +++ sources 1 Jul 2008 20:01:29 -0000 1.5 @@ -1 +1 @@ -15510f0e509b53122c44761f33f41c99 hoe-1.6.0.gem +52893edef97db9d5d39fbcaf8e49b571 hoe-1.7.0.gem From fedora-extras-commits at redhat.com Tue Jul 1 20:10:42 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 1 Jul 2008 20:10:42 GMT Subject: rpms/python-genshi/F-9 .cvsignore, 1.4, 1.5 python-genshi.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807012010.m61KAgGJ007337@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-genshi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7293 Modified Files: .cvsignore python-genshi.spec sources Log Message: * Mon Jun 9 2008 Jeffrey C. Ollie - 0.5-1 - Update to released version of Genshi. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-genshi/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Aug 2007 23:25:29 -0000 1.4 +++ .cvsignore 1 Jul 2008 20:10:02 -0000 1.5 @@ -1 +1 @@ -Genshi-0.4.4.tar.bz2 +Genshi-0.5.tar.bz2 Index: python-genshi.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-genshi/F-9/python-genshi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-genshi.spec 28 Aug 2007 20:32:55 -0000 1.5 +++ python-genshi.spec 1 Jul 2008 20:10:02 -0000 1.6 @@ -1,17 +1,18 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-genshi -Version: 0.4.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Toolkit for stream-based generation of output for the web Group: Development/Languages License: BSD URL: http://genshi.edgewall.org/ + Source0: http://ftp.edgewall.com/pub/genshi/Genshi-%{version}.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel @@ -31,16 +32,25 @@ %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} - + +%check +%{__python} setup.py test + %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog COPYING doc examples README.txt UPGRADE.txt -%{python_sitelib}/* +%doc ChangeLog COPYING doc examples README.txt +%{python_sitearch}/* %changelog +* Mon Jun 9 2008 Jeffrey C. Ollie - 0.5-1 +- Update to released version of Genshi. + +* Thu Apr 24 2008 Jeffrey C. Ollie - 0.5-0.1.svn847 +- Update to snapshot of 0.5 + * Tue Aug 28 2007 Jeffrey C. Ollie - 0.4.4-2 - BR python-setuptools-devel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-genshi/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Aug 2007 23:25:29 -0000 1.4 +++ sources 1 Jul 2008 20:10:02 -0000 1.5 @@ -1 +1 @@ -e9d8a1e6b0c3692e43d4bedb9df8a266 Genshi-0.4.4.tar.bz2 +d8514ce763330d450bfa55869b375e5d Genshi-0.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 20:11:19 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 1 Jul 2008 20:11:19 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch,1.27,1.28 Message-ID: <200807012011.m61KBJ1x007440@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326 Modified Files: policy-20080509.patch Log Message: * Sun Jun 29 2008 Dan Walsh 3.4.2-9 - Allow gdm to read rpm database - Allow nsplugin to read mplayer config files policy-20080509.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.27 -r 1.28 policy-20080509.patch Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- policy-20080509.patch 1 Jul 2008 13:41:30 -0000 1.27 +++ policy-20080509.patch 1 Jul 2008 20:10:26 -0000 1.28 @@ -1,99 +1,20 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.4.2/Makefile ---- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.4.2/Makefile 2008-06-12 23:37:53.000000000 -0400 -@@ -311,20 +311,22 @@ - - # parse-rolemap modulename,outputfile - define parse-rolemap -- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ -- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 -+ echo "" >> $2 -+# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ -+# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 - endef - - # perrole-expansion modulename,outputfile - define perrole-expansion -- $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 -- $(call parse-rolemap,$1,$2) -- $(verbose) echo "')" >> $2 -- -- $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 -- $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 -- $(call parse-rolemap-compat,$1,$2) -- $(verbose) echo "')" >> $2 -+ echo "No longer doing perrole-expansion" -+# $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 -+# $(call parse-rolemap,$1,$2) -+# $(verbose) echo "')" >> $2 -+ -+# $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 -+# $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 -+# $(call parse-rolemap-compat,$1,$2) -+# $(verbose) echo "')" >> $2 - endef - - # create-base-per-role-tmpl modulenames,outputfile -@@ -523,6 +525,10 @@ - @mkdir -p $(appdir)/users - $(verbose) $(INSTALL) -m 644 $^ $@ - -+$(appdir)/initrc_context: $(tmpdir)/initrc_context -+ @mkdir -p $(appdir) -+ $(verbose) $(INSTALL) -m 644 $< $@ -+ - $(appdir)/%: $(appconf)/% - @mkdir -p $(appdir) - $(verbose) $(INSTALL) -m 644 $< $@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.4.2/Rules.modular ---- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.4.2/Rules.modular 2008-06-12 23:37:53.000000000 -0400 -@@ -73,8 +73,8 @@ - $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te - @echo "Compliling $(NAME) $(@F) module" - @test -d $(tmpdir) || mkdir -p $(tmpdir) -- $(call perrole-expansion,$(basename $(@F)),$@.role) -- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) -+# $(call perrole-expansion,$(basename $(@F)),$@.role) -+ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) - $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ - - $(tmpdir)/%.mod.fc: $(m4support) %.fc -@@ -129,7 +129,7 @@ - @test -d $(tmpdir) || mkdir -p $(tmpdir) - # define all available object classes - $(verbose) $(genperm) $(avs) $(secclass) > $@ -- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) -+# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) - $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true - - $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy -@@ -146,7 +146,7 @@ - $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/rolemap.conf: $(rolemap) - $(verbose) echo "" > $@ -- $(call parse-rolemap,base,$@) -+# $(call parse-rolemap,base,$@) - - $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.4.2/config/appconfig-mcs/failsafe_context ---- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/failsafe_context 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-05-29 15:57:54.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/failsafe_context 2008-07-01 09:49:52.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mcs/guest_u_default_contexts 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/guest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/root_default_contexts ---- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/root_default_contexts 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-05-29 15:57:54.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/root_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -108,8 +29,8 @@ -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.4.2/config/appconfig-mcs/seusers ---- nsaserefpolicy/config/appconfig-mcs/seusers 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/seusers 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/seusers 2008-05-29 15:57:54.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/seusers 2008-07-01 09:49:52.000000000 -0400 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh @@ -117,7 +38,7 @@ +__default__:unconfined_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mcs/unconfined_u_default_contexts 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 @@ -129,14 +50,14 @@ +system_r:unconfined_t:s0 unconfined_r:unconfined_t:s0 +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.4.2/config/appconfig-mcs/userhelper_context ---- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/userhelper_context 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-05-29 15:57:54.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/userhelper_context 2008-07-01 09:49:52.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mcs/xguest_u_default_contexts 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/xguest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -145,7 +66,7 @@ +system_r:xdm_t xguest_r:xguest_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.4.2/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mls/guest_u_default_contexts 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mls/guest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -153,15 +74,15 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.4.2/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-standard/guest_u_default_contexts 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-standard/guest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t +system_r:sshd_t guest_r:guest_t +system_r:crond_t guest_r:guest_crond_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.4.2/config/appconfig-standard/root_default_contexts ---- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-standard/root_default_contexts 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-05-29 15:57:54.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-standard/root_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -177,16 +98,63 @@ +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.4.2/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-standard/xguest_u_default_contexts 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-standard/xguest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t +system_r:sshd_t xguest_r:xguest_t +system_r:crond_t xguest_r:xguest_crond_t +system_r:xdm_t xguest_r:xguest_t +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.4.2/Makefile +--- nsaserefpolicy/Makefile 2008-05-29 15:57:55.000000000 -0400 ++++ serefpolicy-3.4.2/Makefile 2008-07-01 09:49:52.000000000 -0400 +@@ -311,20 +311,22 @@ + + # parse-rolemap modulename,outputfile + define parse-rolemap +- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ +- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 [...5499 lines suppressed...] +--- nsaserefpolicy/policy/modules/system/udev.te 2008-05-29 15:57:51.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/udev.te 2008-07-01 09:49:53.000000000 -0400 @@ -83,6 +83,7 @@ kernel_rw_unix_dgram_sockets(udev_t) kernel_dgram_send(udev_t) @@ -32626,8 +32607,8 @@ xserver_read_xdm_pid(udev_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.4.2/policy/modules/system/unconfined.fc ---- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/unconfined.fc 2008-06-26 07:24:15.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-05-29 15:57:51.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/unconfined.fc 2008-07-01 09:49:53.000000000 -0400 @@ -2,15 +2,28 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -32663,8 +32644,8 @@ + +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.4.2/policy/modules/system/unconfined.if ---- nsaserefpolicy/policy/modules/system/unconfined.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/unconfined.if 2008-06-22 20:50:34.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/unconfined.if 2008-06-11 08:15:46.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/unconfined.if 2008-07-01 09:49:53.000000000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -33041,8 +33022,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.4.2/policy/modules/system/unconfined.te ---- nsaserefpolicy/policy/modules/system/unconfined.te 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/unconfined.te 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/unconfined.te 2008-06-11 08:15:46.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/unconfined.te 2008-07-01 09:49:53.000000000 -0400 @@ -1,40 +1,79 @@ -policy_module(unconfined, 2.2.2) @@ -33380,8 +33361,8 @@ +rpm_transition_script(unconfined_notrans_t) +domain_ptrace_all_domains(unconfined_notrans_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.4.2/policy/modules/system/userdomain.fc ---- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/userdomain.fc 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-05-29 15:57:51.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/userdomain.fc 2008-07-01 09:49:53.000000000 -0400 @@ -1,4 +1,5 @@ -HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) -HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) @@ -33393,8 +33374,8 @@ +/tmp/gconfd-USER -d gen_context(system_u:object_r:user_tmp_t,s0) +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.4.2/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/userdomain.if 2008-06-27 07:06:54.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-11 08:15:46.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/userdomain.if 2008-07-01 09:49:53.000000000 -0400 @@ -28,10 +28,14 @@ class context contains; ') @@ -36152,8 +36133,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.4.2/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/userdomain.te 2008-06-12 23:37:52.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2008-06-11 08:15:46.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/userdomain.te 2008-07-01 09:49:53.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -36270,7 +36251,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.fc serefpolicy-3.4.2/policy/modules/system/virt.fc --- nsaserefpolicy/policy/modules/system/virt.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/policy/modules/system/virt.fc 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/virt.fc 2008-07-01 09:49:53.000000000 -0400 @@ -0,0 +1,13 @@ + +/usr/sbin/libvirtd -- gen_context(system_u:object_r:virtd_exec_t,s0) @@ -36287,7 +36268,7 @@ +/etc/libvirt/.*/.* gen_context(system_u:object_r:virt_etc_rw_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.if serefpolicy-3.4.2/policy/modules/system/virt.if --- nsaserefpolicy/policy/modules/system/virt.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/policy/modules/system/virt.if 2008-06-12 23:37:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/virt.if 2008-07-01 09:49:53.000000000 -0400 @@ -0,0 +1,324 @@ + +## policy for virt @@ -36615,7 +36596,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.4.2/policy/modules/system/virt.te --- nsaserefpolicy/policy/modules/system/virt.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/policy/modules/system/virt.te 2008-07-01 09:38:45.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/virt.te 2008-07-01 09:49:53.000000000 -0400 @@ -0,0 +1,203 @@ + +policy_module(virt,1.0.0) @@ -36821,8 +36802,8 @@ + unconfined_domain(virtd_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.4.2/policy/modules/system/xen.fc ---- nsaserefpolicy/policy/modules/system/xen.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/xen.fc 2008-06-12 23:37:52.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/xen.fc 2008-05-29 15:57:51.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/xen.fc 2008-07-01 09:49:53.000000000 -0400 @@ -20,6 +20,7 @@ /var/run/xenconsoled\.pid -- gen_context(system_u:object_r:xenconsoled_var_run_t,s0) /var/run/xend(/.*)? gen_context(system_u:object_r:xend_var_run_t,s0) @@ -36832,8 +36813,8 @@ /var/run/xenstored(/.*)? gen_context(system_u:object_r:xenstored_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.4.2/policy/modules/system/xen.if ---- nsaserefpolicy/policy/modules/system/xen.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/xen.if 2008-06-12 23:37:52.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/xen.if 2008-05-29 15:57:51.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/xen.if 2008-07-01 09:49:53.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -36876,8 +36857,8 @@ + rw_files_pattern($1,xen_image_t,xen_image_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.4.2/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/xen.te 2008-06-12 23:37:52.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/xen.te 2008-05-29 15:57:51.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/xen.te 2008-07-01 09:49:53.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -37115,8 +37096,8 @@ + unconfined_domain(xend_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.4.2/policy/support/file_patterns.spt ---- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.4.2/policy/support/file_patterns.spt 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/policy/support/file_patterns.spt 2008-05-29 15:57:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/support/file_patterns.spt 2008-07-01 09:49:53.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -37142,8 +37123,8 @@ + relabelfrom_sock_files_pattern($1,$2,$2) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.4.2/policy/support/obj_perm_sets.spt ---- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.4.2/policy/support/obj_perm_sets.spt 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-05-29 15:57:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/support/obj_perm_sets.spt 2008-07-01 09:49:53.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -37159,8 +37140,8 @@ + +define(`manage_key_perms', `{ create link read search setattr view write } ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.4.2/policy/users ---- nsaserefpolicy/policy/users 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.4.2/policy/users 2008-06-12 23:37:53.000000000 -0400 +--- nsaserefpolicy/policy/users 2008-05-29 15:57:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/users 2008-07-01 09:49:53.000000000 -0400 @@ -31,11 +31,8 @@ # permit any access to such users, then remove this entry. # @@ -37185,3 +37166,35 @@ - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -') +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.4.2/Rules.modular +--- nsaserefpolicy/Rules.modular 2008-05-29 15:57:55.000000000 -0400 ++++ serefpolicy-3.4.2/Rules.modular 2008-07-01 09:49:52.000000000 -0400 +@@ -73,8 +73,8 @@ + $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te + @echo "Compliling $(NAME) $(@F) module" + @test -d $(tmpdir) || mkdir -p $(tmpdir) +- $(call perrole-expansion,$(basename $(@F)),$@.role) +- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) ++# $(call perrole-expansion,$(basename $(@F)),$@.role) ++ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) + $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ + + $(tmpdir)/%.mod.fc: $(m4support) %.fc +@@ -129,7 +129,7 @@ + @test -d $(tmpdir) || mkdir -p $(tmpdir) + # define all available object classes + $(verbose) $(genperm) $(avs) $(secclass) > $@ +- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) ++# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) + $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true + + $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy +@@ -146,7 +146,7 @@ + $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/rolemap.conf: $(rolemap) + $(verbose) echo "" > $@ +- $(call parse-rolemap,base,$@) ++# $(call parse-rolemap,base,$@) + + $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf From fedora-extras-commits at redhat.com Tue Jul 1 20:32:02 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 20:32:02 GMT Subject: rpms/libpciaccess/F-9 .cvsignore, 1.7, 1.8 libpciaccess.spec, 1.13, 1.14 sources, 1.7, 1.8 libpciaccess-no-pci-fix.patch, 1.1, NONE Message-ID: <200807012032.m61KW20p009096@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libpciaccess/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8991/F-9 Modified Files: .cvsignore libpciaccess.spec sources Removed Files: libpciaccess-no-pci-fix.patch Log Message: libpciaccess 0.10.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Mar 2008 20:40:43 -0000 1.7 +++ .cvsignore 1 Jul 2008 20:30:51 -0000 1.8 @@ -1 +1 @@ -libpciaccess-0.10.tar.bz2 +libpciaccess-0.10.3.tar.bz2 Index: libpciaccess.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/F-9/libpciaccess.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libpciaccess.spec 20 May 2008 18:00:46 -0000 1.13 +++ libpciaccess.spec 1 Jul 2008 20:30:51 -0000 1.14 @@ -2,8 +2,8 @@ %define gitrev e392082abb5696c8837224da86cc0af4f21d7010 Name: libpciaccess -Version: 0.10 -Release: 3%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: PCI access library Group: System Environment/Libraries @@ -19,7 +19,6 @@ Patch0: libpciaccess-fd-cache.patch Patch1: libpciaccess-kludge-wc-mmap.patch -Patch2: libpciaccess-no-pci-fix.patch BuildRequires: autoconf automake libtool pkgconfig Requires: hwdata @@ -41,7 +40,6 @@ %setup -q -n %{name}-%{version} %patch0 -p1 -b .cache %patch1 -p1 -b .wc -%patch2 -p1 -b .nopci %build #autoreconf -v --install @@ -63,7 +61,7 @@ %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog %{_libdir}/libpciaccess.so.0 -%{_libdir}/libpciaccess.so.0.10.0 +%{_libdir}/libpciaccess.so.0.10.* %files devel %defattr(-,root,root,-) @@ -72,6 +70,9 @@ %{_libdir}/pkgconfig/pciaccess.pc %changelog +* Tue Jul 01 2008 Adam Jackson 0.10.3-1 +- libpciaccess 0.10.3 + * Tue May 20 2008 Adam Jackson 0.10-3 - libpciaccess-no-pci-fix.patch: Fix init when /sys/bus/pci is empty or nonexistent. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 Mar 2008 20:40:43 -0000 1.7 +++ sources 1 Jul 2008 20:30:51 -0000 1.8 @@ -1 +1 @@ -fadacd7f13c3c2f83e14f670925487a1 libpciaccess-0.10.tar.bz2 +6d5468debf76fac84576ca26c9535821 libpciaccess-0.10.3.tar.bz2 --- libpciaccess-no-pci-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 20:39:06 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 20:39:06 GMT Subject: rpms/xorg-x11-drv-evdev/F-9 import.log,1.2,NONE Message-ID: <200807012039.m61Kd6fT009694@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9664 Removed Files: import.log Log Message: import.log worse than hitler --- import.log DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 20:41:48 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 20:41:48 GMT Subject: rpms/xorg-x11-drv-evdev/F-9 import.log, 1.3, 1.4 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 xorg-x11-drv-evdev.spec, 1.28, 1.29 Message-ID: <200807012041.m61KfmVf009899@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9813/F-9 Modified Files: .cvsignore sources xorg-x11-drv-evdev.spec Added Files: import.log Log Message: evdev 2.0.1 Index: import.log =================================================================== RCS file: import.log diff -N import.log --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ import.log 1 Jul 2008 20:40:43 -0000 1.4 @@ -0,0 +1 @@ +xorg-x11-drv-evdev-2_0_1-1_fc9:F-9:xorg-x11-drv-evdev-2.0.1-1.fc9.src.rpm:1214944530 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 Jun 2008 14:20:21 -0000 1.16 +++ .cvsignore 1 Jul 2008 20:40:43 -0000 1.17 @@ -1 +1 @@ -xf86-input-evdev-2.0.0.tar.bz2 +xf86-input-evdev-2.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 17 Jun 2008 14:20:21 -0000 1.16 +++ sources 1 Jul 2008 20:40:43 -0000 1.17 @@ -1 +1 @@ -0fad5a5039b4f95798af2954924bff62 xf86-input-evdev-2.0.0.tar.bz2 +061c4558316b1ec9ee71478bdf68b10c xf86-input-evdev-2.0.1.tar.bz2 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/xorg-x11-drv-evdev.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xorg-x11-drv-evdev.spec 17 Jun 2008 14:20:21 -0000 1.28 +++ xorg-x11-drv-evdev.spec 1 Jul 2008 20:40:43 -0000 1.29 @@ -6,7 +6,7 @@ Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -53,6 +53,9 @@ %{_mandir}/man4/evdev.4* %changelog +* Tue Jul 01 2008 Adam Jackson 2.0.1-1 +- evdev 2.0.1 + * Tue Jun 17 2008 Adam Jackson 2.0.0-1 - evdev 2.0.0 From fedora-extras-commits at redhat.com Tue Jul 1 20:47:45 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 1 Jul 2008 20:47:45 GMT Subject: rpms/python-genshi/F-8 .cvsignore, 1.4, 1.5 python-genshi.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807012047.m61KljtY010552@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-genshi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10488 Modified Files: .cvsignore python-genshi.spec sources Log Message: * Mon Jun 9 2008 Jeffrey C. Ollie - 0.5-1 - Update to released version of Genshi. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-genshi/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Aug 2007 23:25:29 -0000 1.4 +++ .cvsignore 1 Jul 2008 20:46:55 -0000 1.5 @@ -1 +1 @@ -Genshi-0.4.4.tar.bz2 +Genshi-0.5.tar.bz2 Index: python-genshi.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-genshi/F-8/python-genshi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-genshi.spec 28 Aug 2007 20:32:55 -0000 1.5 +++ python-genshi.spec 1 Jul 2008 20:46:55 -0000 1.6 @@ -1,17 +1,18 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-genshi -Version: 0.4.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Toolkit for stream-based generation of output for the web Group: Development/Languages License: BSD URL: http://genshi.edgewall.org/ + Source0: http://ftp.edgewall.com/pub/genshi/Genshi-%{version}.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel @@ -31,16 +32,25 @@ %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} - + +%check +%{__python} setup.py test + %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog COPYING doc examples README.txt UPGRADE.txt -%{python_sitelib}/* +%doc ChangeLog COPYING doc examples README.txt +%{python_sitearch}/* %changelog +* Mon Jun 9 2008 Jeffrey C. Ollie - 0.5-1 +- Update to released version of Genshi. + +* Thu Apr 24 2008 Jeffrey C. Ollie - 0.5-0.1.svn847 +- Update to snapshot of 0.5 + * Tue Aug 28 2007 Jeffrey C. Ollie - 0.4.4-2 - BR python-setuptools-devel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-genshi/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Aug 2007 23:25:29 -0000 1.4 +++ sources 1 Jul 2008 20:46:55 -0000 1.5 @@ -1 +1 @@ -e9d8a1e6b0c3692e43d4bedb9df8a266 Genshi-0.4.4.tar.bz2 +d8514ce763330d450bfa55869b375e5d Genshi-0.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 20:50:46 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Tue, 1 Jul 2008 20:50:46 GMT Subject: rpms/qpidc/devel sources,1.21,1.22 Message-ID: <200807012050.m61KokQK010960@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10894 Modified Files: sources Log Message: MRG GA release Index: sources =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 18 Jun 2008 18:23:21 -0000 1.21 +++ sources 1 Jul 2008 20:50:00 -0000 1.22 @@ -1 +1 @@ -74a880e77e1b59bea07519a1601affb4 qpidc-0.2.667603.tar.gz +c364b9f0d4d5277dfa32448575f89ff8 qpidc-0.2.667603.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 20:50:53 2008 From: fedora-extras-commits at redhat.com (Darryl L. Pierce (mcpierce)) Date: Tue, 1 Jul 2008 20:50:53 GMT Subject: rpms/rubygem-hoe/F-8 .cvsignore, 1.4, 1.5 rubygem-hoe.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807012050.m61KorrJ010978@cvs-int.fedora.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-hoe/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10908 Modified Files: .cvsignore rubygem-hoe.spec sources Log Message: Release 1.7.0 of the gem. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jun 2008 11:13:50 -0000 1.4 +++ .cvsignore 1 Jul 2008 20:50:08 -0000 1.5 @@ -1 +1 @@ -hoe-1.6.0.gem +hoe-1.7.0.gem Index: rubygem-hoe.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-8/rubygem-hoe.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rubygem-hoe.spec 18 Jun 2008 11:13:50 -0000 1.4 +++ rubygem-hoe.spec 1 Jul 2008 20:50:08 -0000 1.5 @@ -5,7 +5,7 @@ Summary: Hoe is a simple rake/rubygems helper for project Rakefiles Name: rubygem-%{gemname} -Version: 1.6.0 +Version: 1.7.0 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -55,6 +55,9 @@ %changelog +* Tue Jul 01 2008 Darryl Pierce - 1.7.0-1 +- Release 1.7.0 of Hoe. + * Wed Jun 18 2008 Darryl Pierce - 1.6.0-1 - Release 1.6.0 of Hoe. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jun 2008 11:13:50 -0000 1.4 +++ sources 1 Jul 2008 20:50:08 -0000 1.5 @@ -1 +1 @@ -15510f0e509b53122c44761f33f41c99 hoe-1.6.0.gem +52893edef97db9d5d39fbcaf8e49b571 hoe-1.7.0.gem From fedora-extras-commits at redhat.com Tue Jul 1 20:54:08 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 1 Jul 2008 20:54:08 GMT Subject: rpms/python-matplotlib/devel .cvsignore, 1.17, 1.18 python-matplotlib.spec, 1.36, 1.37 sources, 1.17, 1.18 Message-ID: <200807012054.m61Ks83t011350@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11268 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: * Fri Jul 1 2008 Jef Spaleta - 0.98.1-1 - Latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 21 Mar 2008 20:22:36 -0000 1.17 +++ .cvsignore 1 Jul 2008 20:53:17 -0000 1.18 @@ -1 +1 @@ -matplotlib-0.91.2.tar.gz +matplotlib-0.98.1.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- python-matplotlib.spec 24 Mar 2008 19:31:26 -0000 1.36 +++ python-matplotlib.spec 1 Jul 2008 20:53:17 -0000 1.37 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-matplotlib -Version: 0.91.2 -Release: 2%{?dist} +Version: 0.98.1 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -39,7 +39,7 @@ %prep %setup -q -n matplotlib-%{version} -%patch0 -p1 +#%patch0 -p1 chmod -x lib/matplotlib/mpl-data/images/*.svg %build @@ -56,7 +56,7 @@ %files %defattr(-,root,root,-) -%doc README license/LICENSE license/LICENSE_enthought.txt +%doc README.txt license/LICENSE license/LICENSE_enthought.txt %doc license/LICENSE_PAINT license/LICENSE_PIL %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS %doc PKG-INFO TODO examples @@ -64,6 +64,7 @@ %{python_sitearch}/*egg-info %endif %{python_sitearch}/matplotlib/ +%{python_sitearch}/mpl_toolkits/ %{python_sitearch}/pylab.py* %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.* %exclude %{python_sitearch}/matplotlib/backends/tkagg.* @@ -76,6 +77,9 @@ %changelog +* Fri Jul 1 2008 Jef Spaleta - 0.98.1-1 +- Latest upstream release + * Fri Mar 21 2008 Jef Spaleta - 0.91.2-2 - gcc43 cleanups Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 21 Mar 2008 20:22:36 -0000 1.17 +++ sources 1 Jul 2008 20:53:17 -0000 1.18 @@ -1 +1 @@ -7abe21ca9e26df4a44f3208d6007fe16 matplotlib-0.91.2.tar.gz +1f673f82eb4f7422c1e45545f8e083d4 matplotlib-0.98.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 21:03:26 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Tue, 1 Jul 2008 21:03:26 GMT Subject: rpms/augeas/F-8 .cvsignore, 1.4, 1.5 augeas.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807012103.m61L3Qws018491@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18397/F-8 Modified Files: .cvsignore augeas.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jun 2008 22:25:27 -0000 1.4 +++ .cvsignore 1 Jul 2008 21:02:36 -0000 1.5 @@ -1 +1 @@ -augeas-0.2.0.tar.gz +augeas-0.2.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-8/augeas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- augeas.spec 5 Jun 2008 22:25:27 -0000 1.4 +++ augeas.spec 1 Jul 2008 21:02:36 -0000 1.5 @@ -1,12 +1,12 @@ Name: augeas -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ -Source0: http://augeas.net/download/augeas-0.2.0.tar.gz +Source0: http://augeas.net/download/augeas-0.2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 +- New version + * Thu Jun 5 2008 David Lutterkort - 0.2.0-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jun 2008 22:25:27 -0000 1.4 +++ sources 1 Jul 2008 21:02:36 -0000 1.5 @@ -1 +1 @@ -0a451af0b3ed0f4d8ba33cec2ab36cc5 augeas-0.2.0.tar.gz +0f83b2579f8f68f73966275183cc8665 augeas-0.2.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 21:03:44 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Tue, 1 Jul 2008 21:03:44 GMT Subject: rpms/augeas/F-9 .cvsignore, 1.4, 1.5 augeas.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807012103.m61L3iaC018505@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18397/F-9 Modified Files: .cvsignore augeas.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jun 2008 22:25:53 -0000 1.4 +++ .cvsignore 1 Jul 2008 21:02:56 -0000 1.5 @@ -1 +1 @@ -augeas-0.2.0.tar.gz +augeas-0.2.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/augeas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- augeas.spec 5 Jun 2008 22:25:53 -0000 1.3 +++ augeas.spec 1 Jul 2008 21:02:56 -0000 1.4 @@ -1,12 +1,12 @@ Name: augeas -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ -Source0: http://augeas.net/download/augeas-0.2.0.tar.gz +Source0: http://augeas.net/download/augeas-0.2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 +- New version + * Thu Jun 5 2008 David Lutterkort - 0.2.0-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jun 2008 22:25:53 -0000 1.4 +++ sources 1 Jul 2008 21:02:56 -0000 1.5 @@ -1 +1 @@ -0a451af0b3ed0f4d8ba33cec2ab36cc5 augeas-0.2.0.tar.gz +0f83b2579f8f68f73966275183cc8665 augeas-0.2.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 21:07:45 2008 From: fedora-extras-commits at redhat.com (Darryl L. Pierce (mcpierce)) Date: Tue, 1 Jul 2008 21:07:45 GMT Subject: rpms/rubygem-hoe/F-9 .cvsignore, 1.4, 1.5 rubygem-hoe.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807012107.m61L7jvR018902@cvs-int.fedora.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-hoe/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793 Modified Files: .cvsignore rubygem-hoe.spec sources Log Message: Release 1.7.0 of the gem. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jun 2008 11:20:08 -0000 1.4 +++ .cvsignore 1 Jul 2008 21:06:46 -0000 1.5 @@ -1 +1 @@ -hoe-1.6.0.gem +hoe-1.7.0.gem Index: rubygem-hoe.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/rubygem-hoe.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rubygem-hoe.spec 18 Jun 2008 11:20:08 -0000 1.4 +++ rubygem-hoe.spec 1 Jul 2008 21:06:46 -0000 1.5 @@ -5,7 +5,7 @@ Summary: Hoe is a simple rake/rubygems helper for project Rakefiles Name: rubygem-%{gemname} -Version: 1.6.0 +Version: 1.7.0 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -55,6 +55,9 @@ %changelog +* Tue Jul 01 2008 Darryl Pierce - 1.7.0-1 +- Release 1.7.0 of the gem. + * Wed Jun 18 2008 Darryl Pierce - 1.6.0-1 - Release 1.6.0 of Hoe. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jun 2008 11:20:08 -0000 1.4 +++ sources 1 Jul 2008 21:06:46 -0000 1.5 @@ -1 +1 @@ -15510f0e509b53122c44761f33f41c99 hoe-1.6.0.gem +52893edef97db9d5d39fbcaf8e49b571 hoe-1.7.0.gem From fedora-extras-commits at redhat.com Tue Jul 1 21:18:23 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 21:18:23 GMT Subject: rpms/xorg-x11-drv-i810/F-9 .cvsignore, 1.29, 1.30 sources, 1.30, 1.31 xorg-x11-drv-i810.spec, 1.99, 1.100 intel-2.2.0-alloca.patch, 1.1, NONE intel-2.2.0-xaadefault.patch, 1.1, NONE intel-2.2.1-xaa-xv.patch, 1.1, NONE intel-modeset.patch, 1.3, NONE intel-update.patch, 1.1, NONE Message-ID: <200807012118.m61LINgG019498@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19455/F-9 Modified Files: .cvsignore sources xorg-x11-drv-i810.spec Removed Files: intel-2.2.0-alloca.patch intel-2.2.0-xaadefault.patch intel-2.2.1-xaa-xv.patch intel-modeset.patch intel-update.patch Log Message: intel 2.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 3 Apr 2008 02:59:10 -0000 1.29 +++ .cvsignore 1 Jul 2008 21:17:29 -0000 1.30 @@ -1,4 +1,2 @@ -xf86-video-intel-2.2.1.tar.bz2 -xf86-video-intel-2.2.0-188-g49af3c4.tar.bz2 -xf86-video-intel-2.2.0-217-g58956ca.tar.bz2 xf86-video-intel-2.2.0-219-gc9676d0.tar.bz2 +xf86-video-intel-2.3.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 3 Apr 2008 02:59:10 -0000 1.30 +++ sources 1 Jul 2008 21:17:29 -0000 1.31 @@ -1,2 +1,2 @@ -3334dc5142871b78fc609fd1b3dac3f2 xf86-video-intel-2.2.1.tar.bz2 f76595f3a439ceb587cc299cd450194f xf86-video-intel-2.2.0-219-gc9676d0.tar.bz2 +fef32ffc428d9d565ab10b338ce17855 xf86-video-intel-2.3.2.tar.bz2 Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/xorg-x11-drv-i810.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- xorg-x11-drv-i810.spec 27 May 2008 14:11:28 -0000 1.99 +++ xorg-x11-drv-i810.spec 1 Jul 2008 21:17:29 -0000 1.100 @@ -5,8 +5,8 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 -Version: 2.2.1 -Release: 25%{?dist} +Version: 2.3.2 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -20,7 +20,6 @@ Source2: i810.xinf Source3: intel-stub.c -Patch1: intel-update.patch Patch2: intel-2.1.1-fix-vt-switch.patch Patch3: intel-2.1.1-fix-xv-reset.patch Patch4: intel-2.1.1-fix-xv-compiz.patch @@ -33,9 +32,6 @@ # https://bugs.freedesktop.org/show_bug.cgi?id=13326 Patch11: intel-2.2.1-disable-fbc.patch -# Fix XAA overlay video when Composite is enabled -Patch12: intel-2.2.1-xaa-xv.patch - Patch100: intel-master.patch Patch101: intel-batchbuffer.patch Patch103: intel-disable-stepping.patch @@ -71,13 +67,11 @@ cd xf86-video-intel-%{version} # XXX rebase me plz -%patch1 -p1 -b .2.3 #patch2 -p1 -b .vtswitch %patch3 -p1 -b .xvfix #patch4 -p1 -b .xv-compiz %patch8 -p1 -b .disablettm %patch11 -p1 -b .fbc -%patch12 -p1 -b .xaa-xv %patch100 -p1 -b .intel-master cd ../xf86-video-intel-%{batchbuffer_version} @@ -155,6 +149,9 @@ %{_libdir}/libIntelXvMC.so %changelog +* Tue Jul 01 2008 Adam Jackson 2.3.2-1 +- intel 2.3.2 + * Tue May 27 2008 Adam Jackson 2.2.1-25 - s/i810/intel/ in xorg.conf in %%pre so we can eventuall stop installing the BC symlink. --- intel-2.2.0-alloca.patch DELETED --- --- intel-2.2.0-xaadefault.patch DELETED --- --- intel-2.2.1-xaa-xv.patch DELETED --- --- intel-modeset.patch DELETED --- --- intel-update.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 21:22:32 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 21:22:32 GMT Subject: rpms/pango/F-9 .cvsignore, 1.72, 1.73 pango.spec, 1.136, 1.137 sources, 1.72, 1.73 Message-ID: <200807012122.m61LMW63019837@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/pango/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19732 Modified Files: .cvsignore pango.spec sources Log Message: 1.20.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pango/F-9/.cvsignore,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- .cvsignore 8 Apr 2008 23:26:08 -0000 1.72 +++ .cvsignore 1 Jul 2008 21:21:43 -0000 1.73 @@ -1 +1 @@ -pango-1.20.1.tar.bz2 +pango-1.20.4.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/extras/rpms/pango/F-9/pango.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- pango.spec 26 May 2008 18:31:20 -0000 1.136 +++ pango.spec 1 Jul 2008 21:21:43 -0000 1.137 @@ -8,8 +8,8 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.20.1 -Release: 2%{?dist} +Version: 1.20.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.20/pango-%{version}.tar.bz2 @@ -218,6 +218,9 @@ %changelog +* Tue Jul 1 2008 Matthias Clasen - 1.20.4-1 +- Update to 1.20.4 + * Mon May 26 2008 Tom "spot" Callaway - 1.20.1-2 - add sparc64 to multilib handling Index: sources =================================================================== RCS file: /cvs/extras/rpms/pango/F-9/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 8 Apr 2008 23:26:08 -0000 1.72 +++ sources 1 Jul 2008 21:21:43 -0000 1.73 @@ -1 +1 @@ -376e6d94686b888fb70f24d191b84f82 pango-1.20.1.tar.bz2 +bb8a7709d8511aeb423fad18187c5ad3 pango-1.20.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 21:23:15 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 1 Jul 2008 21:23:15 GMT Subject: rpms/kdenetwork/F-8 kdenetwork-3.5.9-kopete-icq.patch, NONE, 1.1 kdenetwork.spec, 1.116, 1.117 Message-ID: <200807012123.m61LNFCo019863@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdenetwork/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/F-8 Modified Files: kdenetwork.spec Added Files: kdenetwork-3.5.9-kopete-icq.patch Log Message: * Tue Jul 01 2008 Kevin Kofler - 7:3.5.9-3 - kde#165502: ICQ doesn't connect (Client to old) kdenetwork-3.5.9-kopete-icq.patch: --- NEW FILE kdenetwork-3.5.9-kopete-icq.patch --- diff -Naur kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp --- kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp 2008-02-14 01:11:52.000000000 +0100 +++ kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp 2008-07-01 20:06:00.000000000 +0200 @@ -89,13 +89,13 @@ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; KConfigGroup config( KGlobal::config(), "ICQVersion" ); - mICQVersion.clientString = config.readEntry( "ClientString", "ICQBasic" ); + mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" ); mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 ); - mICQVersion.major = config.readEntry( "Major", "0x0014" ).toUShort( 0, 0 ); - mICQVersion.minor = config.readEntry( "Minor", "0x0034" ).toUShort( 0, 0 ); + mICQVersion.major = config.readEntry( "Major", "0x0006" ).toUShort( 0, 0 ); + mICQVersion.minor = config.readEntry( "Minor", "0x0000" ).toUShort( 0, 0 ); mICQVersion.point = config.readEntry( "Point", "0x0000" ).toUShort( 0, 0 ); - mICQVersion.build = config.readEntry( "Build", "0x0BB8" ).toUShort( 0, 0 ); - mICQVersion.other = config.readEntry( "Other", "0x0000043D" ).toUInt( 0, 0 ); + mICQVersion.build = config.readEntry( "Build", "0x17AB" ).toUShort( 0, 0 ); + mICQVersion.other = config.readEntry( "Other", "0x00007535" ).toUInt( 0, 0 ); mICQVersion.country = config.readEntry( "Country", "us" ); mICQVersion.lang = config.readEntry( "Lang", "en" ); } Index: kdenetwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/F-8/kdenetwork.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- kdenetwork.spec 26 Feb 2008 13:37:07 -0000 1.116 +++ kdenetwork.spec 1 Jul 2008 21:22:32 -0000 1.117 @@ -24,7 +24,7 @@ Name: kdenetwork Epoch: 7 Version: 3.5.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: K Desktop Environment - Network Applications License: GPLv2 @@ -48,6 +48,10 @@ Patch5: kdenetwork-3.5.9-ppp.patch Patch6: kdenetwork-3.5.9-krfb_httpd.patch +# fix kde#165502: ICQ doesn't connect (Client to old) +# use the same ICQ version number as Kopete from KDE 4 +Patch100: kdenetwork-3.5.9-kopete-icq.patch + %if 0%{?libs} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} %else @@ -172,6 +176,8 @@ %patch5 -p1 -b .ppp %patch6 -p1 -b .krfb_httpd +%patch100 -p1 -b .kopete-icq + %if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -473,6 +479,9 @@ %changelog +* Tue Jul 01 2008 Kevin Kofler - 7:3.5.9-3 +- kde#165502: ICQ doesn't connect (Client to old) + * Tue Feb 26 2008 Luk???? Tinkl - 7:3.5.9-2 - #433511: vnc server through krfb and accessing by http broken - #433510: /usr/bin/krfb_httpd broken due to converted literal ^M chars From fedora-extras-commits at redhat.com Tue Jul 1 21:26:28 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 21:26:28 GMT Subject: rpms/xorg-x11-drv-nv/F-9 .cvsignore, 1.29, 1.30 sources, 1.31, 1.32 xorg-x11-drv-nv.spec, 1.70, 1.71 Message-ID: <200807012126.m61LQS8f020207@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20120/F-9 Modified Files: .cvsignore sources xorg-x11-drv-nv.spec Log Message: nv 2.1.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/F-9/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 7 Mar 2008 14:47:53 -0000 1.29 +++ .cvsignore 1 Jul 2008 21:25:34 -0000 1.30 @@ -1 +1 @@ -xf86-video-nv-2.1.8.tar.bz2 +xf86-video-nv-2.1.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/F-9/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 7 Mar 2008 14:47:53 -0000 1.31 +++ sources 1 Jul 2008 21:25:34 -0000 1.32 @@ -1 +1 @@ -c3e8c98287dc98677bebfbe1ba51ab77 xf86-video-nv-2.1.8.tar.bz2 +bbee6df3e66d31a7da1afda59b40777d xf86-video-nv-2.1.10.tar.bz2 Index: xorg-x11-drv-nv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/F-9/xorg-x11-drv-nv.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- xorg-x11-drv-nv.spec 29 Apr 2008 20:45:22 -0000 1.70 +++ xorg-x11-drv-nv.spec 1 Jul 2008 21:25:34 -0000 1.71 @@ -4,8 +4,8 @@ Summary: Xorg X11 nv video driver Name: xorg-x11-drv-nv -Version: 2.1.8 -Release: 2%{?dist} +Version: 2.1.10 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -69,6 +69,9 @@ %{_mandir}/man4/nv.4* %changelog +* Tue Jul 01 2008 Adam Jackson 2.1.10-1 +- nv 2.1.10 + * Tue Apr 29 2008 Adam Jackson 2.1.8-2 - nv-2.1.8-g80-no-doublescan.patch: Disable doublescan modes on G80, too many monitors get confused. From fedora-extras-commits at redhat.com Tue Jul 1 21:32:17 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 1 Jul 2008 21:32:17 GMT Subject: rpms/xorg-x11-drv-glint/F-9 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-glint.spec, 1.20, 1.21 Message-ID: <200807012132.m61LWHuZ020590@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-glint/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20470/F-9 Modified Files: .cvsignore sources xorg-x11-drv-glint.spec Added Files: import.log Log Message: glint 1.2.1 --- NEW FILE import.log --- xorg-x11-drv-glint-1_2_1-1_fc9:F-9:xorg-x11-drv-glint-1.2.1-1.fc9.src.rpm:1214947576 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-glint/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Mar 2008 01:24:09 -0000 1.8 +++ .cvsignore 1 Jul 2008 21:31:29 -0000 1.9 @@ -1 +1 @@ -xf86-video-glint-1.2.0.tar.bz2 +xf86-video-glint-1.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-glint/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Mar 2008 01:24:09 -0000 1.8 +++ sources 1 Jul 2008 21:31:29 -0000 1.9 @@ -1 +1 @@ -1f5271ac01d4475efe73ab6f2c3646f4 xf86-video-glint-1.2.0.tar.bz2 +6d7afdac0a26cf201c3f3b417c31c5e1 xf86-video-glint-1.2.1.tar.bz2 Index: xorg-x11-drv-glint.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-glint/F-9/xorg-x11-drv-glint.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xorg-x11-drv-glint.spec 20 Mar 2008 01:24:09 -0000 1.20 +++ xorg-x11-drv-glint.spec 1 Jul 2008 21:31:29 -0000 1.21 @@ -8,7 +8,7 @@ Summary: Xorg X11 glint video driver Name: xorg-x11-drv-glint -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -64,6 +64,9 @@ %{_mandir}/man4/glint.4* %changelog +* Tue Jul 01 2008 Adam Jackson 1.2.1-1 +- glint 1.2.1 + * Thu Mar 20 2008 Dave Airlie 1.2.0-1 - Latest upstream release From fedora-extras-commits at redhat.com Tue Jul 1 21:36:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Tue, 1 Jul 2008 21:36:05 GMT Subject: rpms/cyrus-sasl/devel cyrus-sasl-2.1.22-kerberos4.patch, NONE, 1.1 cyrus-sasl-2.1.22-rimap.patch, NONE, 1.1 cyrus-sasl.spec, 1.67, 1.68 saslauthd.init, 1.3, 1.4 Message-ID: <200807012136.m61La5Mt020977@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/cyrus-sasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20858 Modified Files: cyrus-sasl.spec saslauthd.init Added Files: cyrus-sasl-2.1.22-kerberos4.patch cyrus-sasl-2.1.22-rimap.patch Log Message: * Tue Jul 1 2008 Tomas Mraz - 2.1.22-15 - drop reload from initscript help (#448154) - fix hang in rimap auth method (#438533) - build the krb4 plugin (#154675) cyrus-sasl-2.1.22-kerberos4.patch: --- NEW FILE cyrus-sasl-2.1.22-kerberos4.patch --- --- cyrus-sasl-2.1.22/plugins/kerberos4.c~ 2005-01-10 02:08:53.000000000 -0500 +++ cyrus-sasl-2.1.22/plugins/kerberos4.c 2007-05-14 13:02:16.000000000 -0400 @@ -49,11 +49,7 @@ #include #ifdef WITH_DES -# ifdef WITH_SSL_DES -# include -# else # include -# endif /* WITH_SSL_DES */ #endif /* WITH_DES */ #ifdef WIN32 cyrus-sasl-2.1.22-rimap.patch: --- NEW FILE cyrus-sasl-2.1.22-rimap.patch --- diff -up cyrus-sasl-2.1.22/saslauthd/auth_rimap.c.rimap cyrus-sasl-2.1.22/saslauthd/auth_rimap.c --- cyrus-sasl-2.1.22/saslauthd/auth_rimap.c.rimap 2006-04-06 22:19:54.000000000 +0200 +++ cyrus-sasl-2.1.22/saslauthd/auth_rimap.c 2008-07-01 22:48:09.000000000 +0200 @@ -163,6 +163,7 @@ qstring ( p1 = s; while ((p1 = strchr(p1, '"')) != NULL) { num_quotes++; + ++p1; } if (!num_quotes) { @@ -198,7 +199,7 @@ qstring ( } *p2++ = *p1++; } - strcat(p2, "\""); + strcpy(p2, "\""); return c; } @@ -438,7 +439,7 @@ auth_rimap ( syslog(LOG_WARNING, "auth_rimap: writev: %m"); memset(qlogin, 0, strlen(qlogin)); free(qlogin); - memset(qpass, 0, strlen(qlogin)); + memset(qpass, 0, strlen(qpass)); free(qpass); (void)close(s); return strdup(RESP_IERROR); @@ -447,7 +448,7 @@ auth_rimap ( /* don't need these any longer */ memset(qlogin, 0, strlen(qlogin)); free(qlogin); - memset(qpass, 0, strlen(qlogin)); + memset(qpass, 0, strlen(qpass)); free(qpass); /* read and parse the LOGIN response */ Index: cyrus-sasl.spec =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- cyrus-sasl.spec 23 May 2008 18:47:45 -0000 1.67 +++ cyrus-sasl.spec 1 Jul 2008 21:35:14 -0000 1.68 @@ -5,7 +5,7 @@ Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.22 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD Group: System Environment/Libraries # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; @@ -29,6 +29,8 @@ Patch27: cyrus-sasl-2.1.22-automake-1.10.patch Patch28: cyrus-sasl-2.1.21-keytab.patch Patch29: cyrus-sasl-db-4.6.18-glibc.patch +Patch30: cyrus-sasl-2.1.22-rimap.patch +Patch31: cyrus-sasl-2.1.22-kerberos4.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig @@ -120,6 +122,15 @@ a directory server, accessed using LDAP, for storing shared secrets. %endif +%package krb4 +Requires: %{name}-lib = %{version}-%{release} +Group: System Environment/Libraries +Summary: Kerberos 4 authentication support for Cyrus SASL + +%description krb4 +The %{name}-krb4 package contains the Cyrus SASL plugins which +support Kerberos 4 authentication. + %prep %setup -q -a 6 chmod -x doc/*.html @@ -132,6 +143,8 @@ %patch26 -p2 -b .digest-commas %patch27 -p1 -b .automake-1.10 %patch28 -p1 -b .keytab +%patch30 -p1 -b .rimap +%patch31 -p1 -b .krb4 pushd db-%{db_version} %patch29 -p1 -b .glibc27 @@ -221,7 +234,7 @@ --disable-java \ --with-plugindir=%{_plugindir2} \ --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \ - --disable-krb4 \ + --enable-krb4=/usr \ --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \ --with-gss_impl=mit \ --with-rc4 \ @@ -370,6 +383,10 @@ %defattr(-,root,root) %{_plugindir2}/*gssapi*.so* +%files krb4 +%defattr(-,root,root) +%{_plugindir2}/*kerberos4*.so* + %files devel %defattr(-,root,root) %doc doc/*.txt @@ -381,6 +398,11 @@ %{_sbindir}/sasl2-shared-mechlist %changelog +* Tue Jul 1 2008 Tomas Mraz - 2.1.22-15 +- drop reload from initscript help (#448154) +- fix hang in rimap auth method (#438533) +- build the krb4 plugin (#154675) + * Fri May 23 2008 Dennis Gilmore - 2.1.22-14 - make it so that bootstrap actually works Index: saslauthd.init =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/saslauthd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- saslauthd.init 9 Sep 2004 04:06:54 -0000 1.3 +++ saslauthd.init 1 Jul 2008 21:35:14 -0000 1.4 @@ -72,7 +72,7 @@ [ -f /var/lock/subsys/$prog ] && restart || : ;; *) - echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}" + echo $"Usage: $0 {start|stop|status|restart|condrestart}" exit 1 esac From fedora-extras-commits at redhat.com Tue Jul 1 21:39:23 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Tue, 1 Jul 2008 21:39:23 GMT Subject: rpms/plymouth/devel plymouth.spec,1.17,1.18 Message-ID: <200807012139.m61LdNrk021231@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21151 Modified Files: plymouth.spec Log Message: - Pull in spinfinity by default. This whole "figure out which plugin to use" set of scripts and scriptlets needs work. We need to separate distro default from user choice. Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- plymouth.spec 1 Jul 2008 19:27:11 -0000 1.17 +++ plymouth.spec 1 Jul 2008 21:38:40 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -13,6 +13,7 @@ Requires: system-logos >= 9.0.1 Requires: elfutils +Requires: system-plymouth-plugin >= %{version}-%{release} %description Plymouth provides an attractive graphical boot animation in @@ -55,6 +56,7 @@ Group: System Environment/Base Requires: %name = %{version}-%{release} BuildRequires: libpng-devel +Provides: system-plymouth-plugin = %{version}-%{release} %description plugin-spinfinity This package contains the "Spinfinity" boot splash plugin for @@ -87,7 +89,12 @@ %postun if [ $1 -eq 0 ]; then - rm %{_libdir}/plymouth/default.so + rm -f %{_libdir}/plymouth/default.so +fi + +%post +if [ $1 -eq 1 ]; then + %{_sbindir}/plymouth-set-default-plugin text fi %post libs -p /sbin/ldconfig @@ -101,7 +108,7 @@ %postun plugin-spinfinity if [ $1 -eq 0 ]; then if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "spinfinity" ]; then - %{_sbindir}/plymouth-set-default-plugin --reset + %{_sbindir}/plymouth-set-default-plugin text fi fi @@ -163,7 +170,13 @@ %{_libdir}/plymouth/spinfinity.so %changelog -* Thu Jun 26 2008 Ray Strode - 0.5.0-1 +* Tue Jul 1 2008 Ray Strode - 0.5.0-2 +- Pull in spinfinity by default. This whole "figure out + which plugin to use" set of scripts and scriptlets + needs work. We need to separate distro default from + user choice. + +* Thu Jul 1 2008 Ray Strode - 0.5.0-1 - Add new client "ask-for-password" command which feeds the user input to a program instead of standard output, and loops when the program returns non-zero exit status. From fedora-extras-commits at redhat.com Tue Jul 1 21:41:10 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 21:41:10 GMT Subject: rpms/orca/F-9 .cvsignore, 1.31, 1.32 orca.spec, 1.45, 1.46 sources, 1.32, 1.33 Message-ID: <200807012141.m61LfAPL021409@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/orca/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21330 Modified Files: .cvsignore orca.spec sources Log Message: 2.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/orca/F-9/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 28 May 2008 15:48:18 -0000 1.31 +++ .cvsignore 1 Jul 2008 21:40:10 -0000 1.32 @@ -1 +1 @@ -orca-2.22.2.tar.bz2 +orca-2.22.3.tar.bz2 Index: orca.spec =================================================================== RCS file: /cvs/extras/rpms/orca/F-9/orca.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- orca.spec 28 May 2008 15:48:18 -0000 1.45 +++ orca.spec 1 Jul 2008 21:40:10 -0000 1.46 @@ -15,7 +15,7 @@ %define control_center_version 2.16.0-5 Name: orca -Version: 2.22.2 +Version: 2.22.3 Release: 1%{?dist} Summary: Flexible, extensible, and powerful assistive technology @@ -107,6 +107,9 @@ %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.22.3-1 +- Update to 2.22.3 + * Wed May 28 2008 Matthias Clasen - 2.22.2-1 - Update to 2.22.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/orca/F-9/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 28 May 2008 15:48:18 -0000 1.32 +++ sources 1 Jul 2008 21:40:10 -0000 1.33 @@ -1 +1 @@ -f11ff55cc997055b2c5fd9e5c012ae5d orca-2.22.2.tar.bz2 +cc0ca608caff98f265b4a040dbc3d170 orca-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 21:45:08 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 21:45:08 GMT Subject: rpms/nautilus/F-9 nautilus.spec,1.205,1.206 Message-ID: <200807012145.m61Lj8A7021620@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/nautilus/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21549 Modified Files: nautilus.spec Log Message: drop upstreamed patch Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-9/nautilus.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- nautilus.spec 1 Jul 2008 18:07:06 -0000 1.205 +++ nautilus.spec 1 Jul 2008 21:44:21 -0000 1.206 @@ -96,9 +96,6 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=444639 Patch14: nautilus-2.22-default-to-asking.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=515777 -Patch15: nautilus-2.22.2-preserve-datetime.patch - %description Nautilus integrates access to files, applications, media, @@ -138,7 +135,6 @@ %patch11 -p1 -b .fix-open-folder %patch13 -p0 -b .recurse %patch14 -p1 -b .default-to-asking -%patch15 -p2 -b .datetime %build From fedora-extras-commits at redhat.com Tue Jul 1 21:59:58 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 1 Jul 2008 21:59:58 GMT Subject: rpms/ldm/F-9 .cvsignore,1.5,1.6 ldm.spec,1.9,1.10 sources,1.9,1.10 Message-ID: <200807012159.m61LxwAk022339@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ldm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22250 Modified Files: .cvsignore ldm.spec sources Log Message: 2.0.7 adds keyboard layout setting within ldm Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Apr 2008 17:18:59 -0000 1.5 +++ .cvsignore 1 Jul 2008 21:59:15 -0000 1.6 @@ -1 +1 @@ -ldm-2.0.4.tar.bz2 +ldm-2.0.7.tar.bz2 Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ldm.spec 27 Apr 2008 17:18:59 -0000 1.9 +++ ldm.spec 1 Jul 2008 21:59:15 -0000 1.10 @@ -1,5 +1,5 @@ Name: ldm -Version: 2.0.4 +Version: 2.0.7 #%define _datestamp .20080324.10 Release: 1%{?dist} Summary: LTSP Display Manager @@ -54,6 +54,9 @@ %dir %{_localstatedir}/run/ldm/ %changelog +* Tue Jul 01 2008 Warren Togami - 2.0.7-1 +- 2.0.7 adds keyboard layout setting within ldm + * Sun Apr 27 2008 Warren Togami - 2.0.4-1 - Translations: Polish, Portugese, French, Vietnamese, Russian Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Apr 2008 17:18:59 -0000 1.9 +++ sources 1 Jul 2008 21:59:15 -0000 1.10 @@ -1 +1 @@ -84016a8074bff18eb7e128ca24e7cd06 ldm-2.0.4.tar.bz2 +a61b48e4ff95c70cff0b63cc7c53394e ldm-2.0.7.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 22:06:46 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 1 Jul 2008 22:06:46 GMT Subject: rpms/gtk2/F-9 .cvsignore, 1.85, 1.86 gtk2.spec, 1.294, 1.295 sources, 1.93, 1.94 Message-ID: <200807012206.m61M6kG6029232@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29178 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.12.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2/F-9/.cvsignore,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- .cvsignore 3 Jun 2008 23:21:46 -0000 1.85 +++ .cvsignore 1 Jul 2008 22:05:46 -0000 1.86 @@ -1 +1 @@ -gtk+-2.12.10.tar.bz2 +gtk+-2.12.11.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2/F-9/gtk2.spec,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- gtk2.spec 17 Jun 2008 02:22:48 -0000 1.294 +++ gtk2.spec 1 Jul 2008 22:05:46 -0000 1.295 @@ -10,13 +10,13 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.12.10 +%define base_version 2.12.11 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 5%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2 @@ -46,12 +46,6 @@ # Backported patch from recent upstream Patch10: printer-state.patch -# fixed in upstream svn -Patch11: geometry.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=248245 -Patch12: printer-hostname.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=204621 Patch13: printer-paper-size.patch @@ -138,8 +132,6 @@ %patch3 -p1 -b .system-log-crash %patch4 -p1 -b .im-setting %patch10 -p0 -b .printer-state -%patch11 -p1 -b .geometry -%patch12 -p0 -b .printer-hostname %patch13 -p0 -b .printer-paper-size for i in config.guess config.sub ; do @@ -333,6 +325,9 @@ %{_datadir}/gtk-2.0 %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.12.11-1 +- Update to 2.12.11 + * Mon Jun 16 2008 Matthias Clasen - 2.12.10-5 - Fix a crash if the modifier map is empty Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2/F-9/sources,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- sources 3 Jun 2008 23:21:46 -0000 1.93 +++ sources 1 Jul 2008 22:05:46 -0000 1.94 @@ -1,4 +1,4 @@ -5fcbdd2254eedb6b9ae828afc01d9eaa gtk+-2.12.10.tar.bz2 +f7aab88e856a813386f797aade5867ad gtk+-2.12.11.tar.bz2 64fc4a111e35939a1aee880c96351521 gtk-print-error-16x16.png a6b427ab6a030a298f64d23a1343b646 gtk-print-report-16x16.png 66f36ea922eb1c39582dee559f995331 gtk-print-warning-16x16.png From fedora-extras-commits at redhat.com Tue Jul 1 22:09:17 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Tue, 1 Jul 2008 22:09:17 GMT Subject: rpms/cfv/devel .cvsignore,1.2,1.3 cfv.spec,1.6,1.7 sources,1.2,1.3 Message-ID: <200807012209.m61M9H2t029456@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/cfv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29350 Modified Files: .cvsignore cfv.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cfv/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Feb 2006 03:14:44 -0000 1.2 +++ .cvsignore 1 Jul 2008 22:08:12 -0000 1.3 @@ -1 +1 @@ -cfv-1.18.1.tar.gz +cfv-1.18.2.tar.gz Index: cfv.spec =================================================================== RCS file: /cvs/pkgs/rpms/cfv/devel/cfv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cfv.spec 22 Aug 2007 12:08:47 -0000 1.6 +++ cfv.spec 1 Jul 2008 22:08:12 -0000 1.7 @@ -1,12 +1,12 @@ Name: cfv -Version: 1.18.1 -Release: 4%{?dist}.1 +Version: 1.18.2 +Release: 1%{?dist} Summary: A utility to test and create data verification files Group: Applications/Archiving License: GPLv2+ URL: http://cfv.sourceforge.net -Source0: http://dl.sourceforge.net/cfv/cfv-1.18.1.tar.gz +Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,6 +48,9 @@ %changelog +* Wed Aug 22 2007 Manuel Wolfshant - 1.18.2-1 +- release bump + * Wed Aug 22 2007 Manuel Wolfshant - 1.18.1-4.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cfv/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Feb 2006 03:14:44 -0000 1.2 +++ sources 1 Jul 2008 22:08:12 -0000 1.3 @@ -1 +1 @@ -f1779d83c5f0ddaa4df864e19ec95ffc cfv-1.18.1.tar.gz +775d8001228c5ba6549825318f906d26 cfv-1.18.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 22:24:45 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Tue, 1 Jul 2008 22:24:45 GMT Subject: rpms/anaconda/devel .cvsignore, 1.542, 1.543 anaconda.spec, 1.684, 1.685 sources, 1.675, 1.676 Message-ID: <200807012224.m61MOjnn030318@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30270 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.542 retrieving revision 1.543 diff -u -r1.542 -r1.543 --- .cvsignore 25 Jun 2008 21:25:20 -0000 1.542 +++ .cvsignore 1 Jul 2008 22:23:58 -0000 1.543 @@ -1,2 +1,3 @@ anaconda-11.4.1.8.tar.bz2 anaconda-11.4.1.9.tar.bz2 +anaconda-11.4.1.10.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.684 retrieving revision 1.685 diff -u -r1.684 -r1.685 --- anaconda.spec 25 Jun 2008 21:25:20 -0000 1.684 +++ anaconda.spec 1 Jul 2008 22:23:58 -0000 1.685 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.9 +Version: 11.4.1.10 Release: 1 License: GPLv2+ Group: Applications/System @@ -194,6 +194,15 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Jul 01 2008 Chris Lumens - 11.4.1.10-1 +- Remove old livecd flag (katzj) +- Explicitly setup livecd install by passing --liveinst to anaconda (katzj) +- Check return value of asprintf() consistently (dcantrell) +- Per strtol(3) man page, set errno=0 before call. (dcantrell) +- Rescue mode no longer needs access to a methodstr (#453044). (clumens) +- Use strtol() instead of atoi() (dcantrell) +- Spell pseudo correctly. (pjones) + * Wed Jun 25 2008 Chris Lumens 11.4.1.9-1 - Query for anaconda rather than anaconda-runtime in buildinstall (jkeating). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.675 retrieving revision 1.676 diff -u -r1.675 -r1.676 --- sources 25 Jun 2008 21:25:21 -0000 1.675 +++ sources 1 Jul 2008 22:23:58 -0000 1.676 @@ -1 +1 @@ -d0da6ae4a32a982cb53cdc1202139675 anaconda-11.4.1.9.tar.bz2 +2362dc71e1f3c2efac44355041f82712 anaconda-11.4.1.10.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 1 22:38:44 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 1 Jul 2008 22:38:44 GMT Subject: rpms/perl-Params-CallbackRequest/devel .cvsignore, 1.3, 1.4 perl-Params-CallbackRequest.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807012238.m61MciP9031427@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31374 Modified Files: .cvsignore perl-Params-CallbackRequest.spec sources Log Message: Update to 1.19. BR Test::Simple. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 May 2008 23:16:55 -0000 1.3 +++ .cvsignore 1 Jul 2008 22:37:43 -0000 1.4 @@ -1 +1 @@ -Params-CallbackRequest-1.18.tar.gz +Params-CallbackRequest-1.19.tar.gz Index: perl-Params-CallbackRequest.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel/perl-Params-CallbackRequest.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Params-CallbackRequest.spec 16 May 2008 23:16:55 -0000 1.3 +++ perl-Params-CallbackRequest.spec 1 Jul 2008 22:37:43 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Params-CallbackRequest -Version: 1.18 +Version: 1.19 Release: 1%{?dist} Summary: Functional and object-oriented callback architecture License: GPL+ or Artistic @@ -11,8 +11,9 @@ BuildRequires: perl(Exception::Class) >= 1.10 BuildRequires: perl(Module::Build) BuildRequires: perl(Params::Validate) >= 0.59 -BuildRequires: perl(Test::More) +BuildRequires: perl(Test::More) >= 0.17 BuildRequires: perl(Test::Pod) >= 1.20 +BuildRequires: perl(Test::Simple) >= 0.17 Requires: perl(Exception::Class) >= 1.10 Requires: perl(Params::Validate) >= 0.59 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -53,6 +54,10 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Steven Pritchard 1.19-1 +- Update to 1.19. +- BR Test::Simple. + * Fri May 16 2008 Steven Pritchard 1.18-1 - Update to 1.18. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 May 2008 23:16:55 -0000 1.3 +++ sources 1 Jul 2008 22:37:43 -0000 1.4 @@ -1 +1 @@ -b25ad37c87ea1b9dce4238482ae48368 Params-CallbackRequest-1.18.tar.gz +f186de85520a70c4e7bf85a53e8c51df Params-CallbackRequest-1.19.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 22:39:29 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 1 Jul 2008 22:39:29 GMT Subject: rpms/perl-Test-CPAN-Meta/devel .cvsignore, 1.3, 1.4 perl-Test-CPAN-Meta.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807012239.m61MdTaO031526@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31413 Modified Files: .cvsignore perl-Test-CPAN-Meta.spec sources Log Message: Update to 0.12. BR Test::Builder and Test::Builder::Tester. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Jun 2008 19:56:08 -0000 1.3 +++ .cvsignore 1 Jul 2008 22:38:29 -0000 1.4 @@ -1 +1 @@ -Test-CPAN-Meta-0.11.tar.gz +Test-CPAN-Meta-0.12.tar.gz Index: perl-Test-CPAN-Meta.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel/perl-Test-CPAN-Meta.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-CPAN-Meta.spec 4 Jun 2008 19:56:08 -0000 1.2 +++ perl-Test-CPAN-Meta.spec 1 Jul 2008 22:38:29 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Test-CPAN-Meta -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: Validation of the META.yml file in a CPAN distribution License: GPL+ or Artistic @@ -10,7 +10,9 @@ BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Parse::CPAN::Meta) >= 0.02 -BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Builder) +BuildRequires: perl(Test::Builder::Tester) +BuildRequires: perl(Test::More) >= 0.70 BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) >= 0.08 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -55,6 +57,10 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Steven Pritchard 0.12-1 +- Update to 0.12. +- BR Test::Builder and Test::Builder::Tester. + * Wed Jun 04 2008 Steven Pritchard 0.11-1 - Update to 0.11. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Jun 2008 19:56:08 -0000 1.3 +++ sources 1 Jul 2008 22:38:29 -0000 1.4 @@ -1 +1 @@ -571b1405010c64fc5eb1557e17e4fd4d Test-CPAN-Meta-0.11.tar.gz +f734933622757cf00361e08189a1e7ce Test-CPAN-Meta-0.12.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 22:44:41 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 1 Jul 2008 22:44:41 GMT Subject: rpms/perl-Authen-SASL/devel .cvsignore, 1.5, 1.6 perl-Authen-SASL.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807012244.m61Mifkk032002@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/perl-Authen-SASL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31872 Modified Files: .cvsignore perl-Authen-SASL.spec sources Log Message: Update to 2.12. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Authen-SASL/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 May 2008 17:29:05 -0000 1.5 +++ .cvsignore 1 Jul 2008 22:43:32 -0000 1.6 @@ -1 +1 @@ -Authen-SASL-2.11.tar.gz +Authen-SASL-2.12.tar.gz Index: perl-Authen-SASL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Authen-SASL/devel/perl-Authen-SASL.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Authen-SASL.spec 15 May 2008 17:29:05 -0000 1.9 +++ perl-Authen-SASL.spec 1 Jul 2008 22:43:32 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Authen-SASL -Version: 2.11 +Version: 2.12 Release: 1%{?dist} Summary: SASL Authentication framework for Perl License: GPL+ or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Steven Pritchard 2.12-1 +- Update to 2.12. + * Thu May 15 2008 Steven Pritchard 2.11-1 - Update to 2.11. - Fix find option order. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Authen-SASL/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 May 2008 17:29:05 -0000 1.5 +++ sources 1 Jul 2008 22:43:32 -0000 1.6 @@ -1 +1 @@ -1b13b9305d8dfd2017300ac9401a74b3 Authen-SASL-2.11.tar.gz +ddbcb7917bf3659d5cf1ee6b681f06d4 Authen-SASL-2.12.tar.gz From fedora-extras-commits at redhat.com Tue Jul 1 22:45:32 2008 From: fedora-extras-commits at redhat.com (Martin Ebourne (mebourne)) Date: Tue, 1 Jul 2008 22:45:32 GMT Subject: rpms/zoneminder/devel zoneminder.spec,1.10,1.11 Message-ID: <200807012245.m61MjW5v032149@cvs-int.fedora.redhat.com> Author: mebourne Update of /cvs/pkgs/rpms/zoneminder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32016 Modified Files: zoneminder.spec Log Message: * Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 - Add perl module compat dependency, bz #453590 Index: zoneminder.spec =================================================================== RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- zoneminder.spec 6 May 2008 22:11:36 -0000 1.10 +++ zoneminder.spec 1 Jul 2008 22:44:47 -0000 1.11 @@ -5,7 +5,7 @@ Name: zoneminder Version: 1.22.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons License: GPLv2+ @@ -32,6 +32,7 @@ BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) BuildRequires: perl(MIME::Entity) perl(MIME::Lite) Requires: httpd php php-mysql +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -171,6 +172,9 @@ %changelog +* Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 +- Add perl module compat dependency, bz #453590 + * Tue May 6 2008 Martin Ebourne - 1.22.3-14 - Remove default runlevel, bz #441315 From fedora-extras-commits at redhat.com Tue Jul 1 23:55:53 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Tue, 1 Jul 2008 23:55:53 GMT Subject: rpms/apr/devel apr-1.3.2.tar.bz2.asc, NONE, 1.1 .cvsignore, 1.12, 1.13 apr.spec, 1.75, 1.76 sources, 1.12, 1.13 apr-0.9.6-readdir64.patch, 1.2, NONE apr-1.2.7-ac260.patch, 1.1, NONE apr-1.2.7-psprintfpi.patch, 1.2, NONE apr-1.2.8.tar.gz.asc, 1.1, NONE Message-ID: <200807012355.m61Ntr7p015204@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15144 Modified Files: .cvsignore apr.spec sources Added Files: apr-1.3.2.tar.bz2.asc Removed Files: apr-0.9.6-readdir64.patch apr-1.2.7-ac260.patch apr-1.2.7-psprintfpi.patch apr-1.2.8.tar.gz.asc Log Message: Bump up to 1.3.2. --- NEW FILE apr-1.3.2.tar.bz2.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iQIVAwUASFe704FUZ7bLm57FAQJZbxAAniEjTNwAFN7Gw/H5nhDeYnBggmJ0aT0X qxov51B3JgS2q/lgOWV+0BzdZ+8DrtFqgvM/xdJLJG3L3rZ0ExMzNpIvGKrL9JB+ MZWcjej7lJz4d2/tt5y3jEDU96tUhUsxWYOVPjkINv5cWmxxtArjY3Ej3ja25aGi f06KLIe1kyzP1x7TvOtN5Gp70qyDbOnW/i+Aay/oBeEzr5nAbZXXhOkf6KWW9pzF i6UMuf1HW6lY8C/yj7bLr5fBWQ10vlOThN9RLiVixJLznsu7Q1GnWu1AVNDKRoge O9PtqM2EJuzfFt3o9Gm3KWwRGNNM2tzPkt3Tr5yz7/GgleON4zkKg9jBTf+vgzMT dDGljyuATTjGfDm9+3vlWViytDPRnVNM3Dtqs2SMk7Rnl6BWDPjnV0VqHa41p+Oy KO1eyhmSp/6qoNmqhZtIauqvs0AySZNNQI/o1kTFtevyrXJKPTPAY7y56daDYXbb MZ/gUkwAa3LQilH0It16SjusRDXCcvdeBu/iF9hwctZrH5S+euSJItstPLk6Ubv+ g5s/2/I4YMFMKkIgBgQV+HFMuKx9OCYIWZ8+FYspQwNwtXPDcmPZ2pWEY9mti8bJ lBVtLunj8oNqWs4WRzrDOnhz7iGpWoTNHy2bipjW3OOGn+HcaQYgaohdJVThhsmK w+UbckGyY+0= =1sfT -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/apr/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Nov 2007 09:59:06 -0000 1.12 +++ .cvsignore 1 Jul 2008 23:55:09 -0000 1.13 @@ -1 +1 @@ -apr-1.2.12.tar.bz2 +apr-1.3.2.tar.bz2 Index: apr.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- apr.spec 19 Feb 2008 07:01:06 -0000 1.75 +++ apr.spec 1 Jul 2008 23:55:09 -0000 1.76 @@ -5,19 +5,17 @@ Summary: Apache Portable Runtime library Name: apr -Version: 1.2.12 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Source1: apr-wrapper.h -Patch1: apr-0.9.6-readdir64.patch -Patch2: apr-0.9.7-deepbind.patch -Patch3: apr-1.2.2-locktimeout.patch -Patch4: apr-1.2.2-libdir.patch -Patch5: apr-1.2.7-pkgconf.patch -Patch6: apr-1.2.7-psprintfpi.patch +Patch1: apr-0.9.7-deepbind.patch +Patch2: apr-1.2.2-locktimeout.patch +Patch3: apr-1.2.2-libdir.patch +Patch4: apr-1.2.7-pkgconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, libtool, e2fsprogs-devel, python @@ -41,12 +39,10 @@ %prep %setup -q -%patch1 -p1 -b .readdir64 -%patch2 -p1 -b .deepbind -%patch3 -p1 -b .locktimeout -%patch4 -p1 -b .libdir -%patch5 -p1 -b .pkgconf -%patch6 -p1 -b .psprintfpi +%patch1 -p1 -b .deepbind +%patch2 -p1 -b .locktimeout +%patch3 -p1 -b .libdir +%patch4 -p1 -b .pkgconf %build # regenerate configure script etc. @@ -121,6 +117,12 @@ %{_includedir}/apr-%{aprver}/*.h %changelog +* Thu Jun 19 2008 Bojan Smojver - 1.3.2-1 +- bump up to 1.3.2 + +* Sun Jun 1 2008 Bojan Smojver - 1.3.0-1 +- bump up to 1.3.0 + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.12-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/apr/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Nov 2007 09:59:06 -0000 1.12 +++ sources 1 Jul 2008 23:55:09 -0000 1.13 @@ -1 +1 @@ -c5da94517e3918f0f2b2e0a05f56aa21 apr-1.2.12.tar.bz2 +a0631c63640176371dd4a5bf13beeee8 apr-1.3.2.tar.bz2 --- apr-0.9.6-readdir64.patch DELETED --- --- apr-1.2.7-ac260.patch DELETED --- --- apr-1.2.7-psprintfpi.patch DELETED --- --- apr-1.2.8.tar.gz.asc DELETED --- From fedora-extras-commits at redhat.com Tue Jul 1 23:56:56 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Tue, 1 Jul 2008 23:56:56 GMT Subject: rpms/apr-util/devel .cvsignore, 1.9, 1.10 apr-util.spec, 1.48, 1.49 sources, 1.11, 1.12 apr-util-1.2.2-exports.patch, 1.1, NONE apr-util-1.2.8-dbddso.patch, 1.6, NONE apr-util-1.2.8.tar.gz.asc, 1.1, NONE Message-ID: <200807012356.m61Nuu8a015306@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15253 Modified Files: .cvsignore apr-util.spec sources Removed Files: apr-util-1.2.2-exports.patch apr-util-1.2.8-dbddso.patch apr-util-1.2.8.tar.gz.asc Log Message: Bump up to 1.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 26 Nov 2007 22:50:36 -0000 1.9 +++ .cvsignore 1 Jul 2008 23:56:13 -0000 1.10 @@ -1 +1 @@ -apr-util-1.2.12.tar.bz2 +apr-util-1.3.2.tar.bz2 Index: apr-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- apr-util.spec 19 Feb 2008 07:02:02 -0000 1.48 +++ apr-util.spec 1 Jul 2008 23:56:13 -0000 1.49 @@ -3,18 +3,16 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.2.12 -Release: 5%{?dist} +Version: 1.3.2 +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 -Patch0: apr-util-1.2.2-exports.patch -Patch2: apr-util-1.2.7-pkgconf.patch -Patch3: apr-util-1.2.8-dbddso.patch +Patch1: apr-util-1.2.7-pkgconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: autoconf, apr-devel >= 1.2.0 -BuildRequires: openldap-devel, db4-devel, expat-devel, e2fsprogs-devel +BuildRequires: autoconf, apr-devel >= 1.3.0 +BuildRequires: db4-devel, expat-devel, e2fsprogs-devel %description The mission of the Apache Portable Runtime (APR) is to provide a @@ -26,7 +24,7 @@ Group: Development/Libraries Summary: APR utility library development kit Requires: apr-util = %{version}-%{release}, apr-devel, pkgconfig -Requires: openldap-devel, db4-devel, expat-devel +Requires: db4-devel, expat-devel %description devel This package provides the support files which can be used to @@ -64,21 +62,47 @@ This package provides the SQLite driver for the apr-util DBD (database abstraction) interface. +%package freetds +Group: Development/Libraries +Summary: APR utility library FreeTDS DBD driver +BuildRequires: freetds-devel +Requires: apr-util = %{version}-%{release} + +%description freetds +This package provides the FreeTDS driver for the apr-util DBD +(database abstraction) interface. + +%package odbc +Group: Development/Libraries +Summary: APR utility library ODBC DBD driver +BuildRequires: unixODBC-devel +Requires: apr-util = %{version}-%{release} + +%description odbc +This package provides the ODBC driver for the apr-util DBD +(database abstraction) interface. + +%package ldap +Group: Development/Libraries +Summary: APR utility library LDAP support +BuildRequires: openldap-devel +Requires: apr-util = %{version}-%{release} + +%description ldap +This package provides the LDAP support for the apr-util. + %prep %setup -q -%patch0 -p1 -b .exports -%patch2 -p1 -b .pkgconf -%patch3 -p1 -b .dbddso +%patch1 -p1 -b .pkgconf %build autoheader && autoconf %configure --with-apr=%{_prefix} \ --includedir=%{_includedir}/apr-%{apuver} \ --with-ldap --without-gdbm \ - --with-sqlite3 --with-pgsql --with-mysql \ + --with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \ --with-berkeley-db \ - --without-sqlite2 \ - --enable-dbd-dso + --without-sqlite2 make %{?_smp_mflags} %install @@ -136,6 +160,18 @@ %defattr(-,root,root,-) %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite* +%files freetds +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_dbd_freetds* + +%files odbc +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_dbd_odbc* + +%files ldap +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_ldap* + %files devel %defattr(-,root,root,-) %{_bindir}/apu-%{apuver}-config @@ -145,6 +181,12 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jun 19 2008 Bojan Smojver - 1.3.2-1 +- bump up to 1.3.2 + +* Sun Jun 1 2008 Bojan Smojver - 1.3.0-1 +- bump up to 1.3.0 + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.12-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Nov 2007 22:50:36 -0000 1.11 +++ sources 1 Jul 2008 23:56:13 -0000 1.12 @@ -1 +1 @@ -4ec0474c61113dcb57943916e7f53522 apr-util-1.2.12.tar.bz2 +aa782fb9ced8b59c8e99419d8cdd1981 apr-util-1.3.2.tar.bz2 --- apr-util-1.2.2-exports.patch DELETED --- --- apr-util-1.2.8-dbddso.patch DELETED --- --- apr-util-1.2.8.tar.gz.asc DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 00:18:53 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 00:18:53 GMT Subject: rpms/apr-util/devel apr-util-1.3.2.tar.bz2.asc,NONE,1.1 Message-ID: <200807020018.m620Irnl022944@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22926 Added Files: apr-util-1.3.2.tar.bz2.asc Log Message: Add tarball signature. --- NEW FILE apr-util-1.3.2.tar.bz2.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iQIVAwUASFe814FUZ7bLm57FAQKOrw//aWeSATNN0GYThQp9xyQ6BBfV7Lrva9cW nm88miNIr+wPrSnoUtReRzigNzIK4TvHpEtAAKeef36g+yC6W4WElswThwNMNdTl yngln9lErhUkt4foVceBG5iLF8FPrkmHgq5BbJD6RnUhKJqGdpiHI2b35KHrIwvd Ly9eTOoFT+Pr9eu5CepJlOLkFFn9OwqrpadUQhhASB83W4z7b7vKD/e1B1eS8iqV pOovLPd1aO2hkDmu/++eQhUzAL+XbHLxlpd1vMb1D2BJ+LkQDllDnqDEPsVoT4i3 9Cr1jyLyA8W57QVgyQVBya+FGjby7iP/TkXCv2cG8Q5Xh/kQF3yYO/EaOzb2JMxe YqJ9tGoEOeJYxUAvCMlz+qtcSyo13XNTojwI3GzzLVgmZRp004LDBn0jurbi+BZr WGb5snnnsVb0ZVfDyWtP0/GVTYTeeBvT+Mplp+Muh/Jy/u8qGwV5fW3aHkbEBdPZ R4fvDGB9draKKsurz/Z4EdsQZstiY+m30vxzpT+5Qcpr2nqRzXCHBZgmrxXnYJf3 TfJJJpgJdYEjVv/iytkGDrMBSwIQSyZ9BeQUKiCxv62T4UL5wAFo/crLK9+ozcVP TzJGAen5o9sPPIpYOHRG14XHDJYQtWMBTKZCul3uIoIdcUwfcnlfLHoZqIPCIL1L XK3kAomri88= =Jvvr -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Wed Jul 2 00:36:51 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 00:36:51 GMT Subject: rpms/apr-api-docs/devel LICENSE.APR, NONE, 1.1 LICENSE.APU, NONE, 1.1 apr-api-docs-doxygen.patch, 1.1, 1.2 apr-api-docs.spec, 1.5, 1.6 LICENSE, 1.1, NONE Message-ID: <200807020036.m620apVV023707@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-api-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23665 Modified Files: apr-api-docs-doxygen.patch apr-api-docs.spec Added Files: LICENSE.APR LICENSE.APU Removed Files: LICENSE Log Message: Bump up to 1.3.2. --- NEW FILE LICENSE.APR --- Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. APACHE PORTABLE RUNTIME SUBCOMPONENTS: The Apache Portable Runtime includes a number of subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. >From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c, file_io/unix/mktemp.c, strings/apr_strings.c: /* * Copyright (c) 1987, 1993, 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c: /* Copyright (c) 1996 by Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. >From dso/aix/dso.c: * Based on libdl (dlfcn.c/dlfcn.h) which is * Copyright (c) 1992,1993,1995,1996,1997,1988 * Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany. * * Not derived from licensed software. * * Permission is granted to freely use, copy, modify, and redistribute * this software, provided that the author is not construed to be liable * for any results of using the software, alterations are clearly marked * as such, and this notice is not modified. >From strings/apr_strnatcmp.c, include/apr_strings.h: strnatcmp.c -- Perform 'natural order' comparisons of strings in C. Copyright (C) 2000 by Martin Pool This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. >From strings/apr_snprintf.c: * * cvt - IEEE floating point formatting routines. * Derived from UNIX V7, Copyright(C) Caldera International Inc. * Copyright(C) Caldera International Inc. 2001-2002. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistributions of source code and documentation must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. All advertising materials mentioning features or use of this software must display the following acknowledgement: This product includes software developed or owned by Caldera International, Inc. Neither the name of Caldera International, Inc. nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission. USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT, INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- NEW FILE LICENSE.APU --- Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. APACHE PORTABLE RUNTIME SUBCOMPONENTS: The Apache Portable Runtime includes a number of subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. For the include\apr_md5.h component: /* * This is work is derived from material Copyright RSA Data Security, Inc. * * The RSA copyright statement and Licence for that original material is * included below. This is followed by the Apache copyright statement and * licence for the modifications made to that material. */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved. License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing this software or this function. License is also granted to make and use derivative works provided that such works are identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing the derived work. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ For the passwd\apr_md5.c component: /* * This is work is derived from material Copyright RSA Data Security, Inc. * * The RSA copyright statement and Licence for that original material is * included below. This is followed by the Apache copyright statement and * licence for the modifications made to that material. */ /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved. License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing this software or this function. License is also granted to make and use derivative works provided that such works are identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing the derived work. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ /* * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0 * MD5 crypt() function, which is licenced as follows: * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- */ For the crypto\apr_md4.c component: * This is derived from material copyright RSA Data Security, Inc. * Their notice is reproduced below in its entirety. * * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All * rights reserved. * * License to copy and use this software is granted provided that it * is identified as the "RSA Data Security, Inc. MD4 Message-Digest * Algorithm" in all material mentioning or referencing this software * or this function. * * License is also granted to make and use derivative works provided * that such works are identified as "derived from the RSA Data * Security, Inc. MD4 Message-Digest Algorithm" in all material * mentioning or referencing the derived work. * * RSA Data Security, Inc. makes no representations concerning either * the merchantability of this software or the suitability of this * software for any particular purpose. It is provided "as is" * without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this * documentation and/or software. */ For the include\apr_md4.h component: * * This is derived from material copyright RSA Data Security, Inc. * Their notice is reproduced below in its entirety. * * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All * rights reserved. * * License to copy and use this software is granted provided that it * is identified as the "RSA Data Security, Inc. MD4 Message-Digest * Algorithm" in all material mentioning or referencing this software * or this function. * * License is also granted to make and use derivative works provided * that such works are identified as "derived from the RSA Data * Security, Inc. MD4 Message-Digest Algorithm" in all material * mentioning or referencing the derived work. * * RSA Data Security, Inc. makes no representations concerning either * the merchantability of this software or the suitability of this * software for any particular purpose. It is provided "as is" * without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this * documentation and/or software. */ For the test\testmd4.c component: * * This is derived from material copyright RSA Data Security, Inc. * Their notice is reproduced below in its entirety. * * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All * rights reserved. * * RSA Data Security, Inc. makes no representations concerning either * the merchantability of this software or the suitability of this * software for any particular purpose. It is provided "as is" * without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this * documentation and/or software. */ For the xml\expat\conftools\install-sh component: # # install - install a program, script, or datafile # This comes from X11R5 (mit/util/scripts/install.sh). # # Copyright 1991 by the Massachusetts Institute of Technology # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting # documentation, and that the name of M.I.T. not be used in advertising or # publicity pertaining to distribution of the software without specific, # written prior permission. M.I.T. makes no representations about the # suitability of this software for any purpose. It is provided "as is" # without express or implied warranty. # For the expat xml parser component: Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ==================================================================== For the ldap/apr_ldap_url.c component: /* Portions Copyright 1998-2002 The OpenLDAP Foundation * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted only as authorized by the OpenLDAP * Public License. A copy of this license is available at * http://www.OpenLDAP.org/license.html or in file LICENSE in the * top-level directory of the distribution. * * OpenLDAP is a registered trademark of the OpenLDAP Foundation. * * Individual files and/or contributed packages may be copyright by * other parties and subject to additional restrictions. * * This work is derived from the University of Michigan LDAP v3.3 * distribution. Information concerning this software is available * at: http://www.umich.edu/~dirsvcs/ldap/ * * This work also contains materials derived from public sources. * * Additional information about OpenLDAP can be obtained at: * http://www.openldap.org/ */ /* * Portions Copyright (c) 1992-1996 Regents of the University of Michigan. * All rights reserved. * * Redistribution and use in source and binary forms are permitted * provided that this notice is preserved and that due credit is given * to the University of Michigan at Ann Arbor. The name of the University * may not be used to endorse or promote products derived from this * software without specific prior written permission. This software * is provided ``as is'' without express or implied warranty. */ apr-api-docs-doxygen.patch: Index: apr-api-docs-doxygen.patch =================================================================== RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs-doxygen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr-api-docs-doxygen.patch 19 Aug 2007 23:20:39 -0000 1.1 +++ apr-api-docs-doxygen.patch 2 Jul 2008 00:36:01 -0000 1.2 @@ -1,14 +1,16 @@ ---- doxygen.conf 2007-07-20 14:45:52.000000000 +1000 -+++ doxygen.conf.apu 2007-08-20 09:10:47.000000000 +1000 -@@ -19,6 +19,11 @@ +--- doxygen.conf 2008-05-21 04:43:25.000000000 +1000 ++++ doxygen.conf.apu 2008-07-02 10:31:16.000000000 +1000 +@@ -18,6 +18,13 @@ + "APR_DECLARE_INHERIT_SET(x)=apr_status_t apr_##x##_inherit_set(apr_##x##_t *the##x)" \ "APR_DECLARE_INHERIT_UNSET(x)=apr_status_t apr_##x##_inherit_unset(apr_##x##_t *the##x)" \ "APR_HAS_THREADS" \ - "__attribute__(x)=" \ + "APU_DECLARE(x)=x" \ + "APU_DECLARE_NONSTD(x)=x" \ + "APU_DECLARE_DATA" \ ++ "APU_MODULE_DECLARE_DATA" \ ++ "APU_DECLARE_LDAP(x)=x" \ + "APR_HAS_MMAP" \ + "APR_HAS_XLATE" \ + "__attribute__(x)=" \ DOXYGEN= - OPTIMIZE_OUTPUT_FOR_C=YES Index: apr-api-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apr-api-docs.spec 27 Nov 2007 20:58:03 -0000 1.5 +++ apr-api-docs.spec 2 Jul 2008 00:36:01 -0000 1.6 @@ -1,5 +1,5 @@ Name: apr-api-docs -Version: 1.2.12 +Version: 1.3.2 Release: 1%{?dist} Summary: Apache Portable Runtime API documentation @@ -58,6 +58,12 @@ %doc %{_docdir}/apr-%{version}/api-docs/* %changelog +* Wed Jul 02 2008 Bojan Smojver 1.3.2-1 +- Bump up to 1.3.2 + +* Wed Jun 11 2008 Bojan Smojver 1.3.0-1 +- Align with latest apr/apr-util + * Wed Nov 28 2007 Bojan Smojver 1.2.12-1 - Align with latest apr/apr-util --- LICENSE DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 00:43:36 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 00:43:36 GMT Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.6,1.7 Message-ID: <200807020043.m620haU7023960@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-api-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23931 Modified Files: apr-api-docs.spec Log Message: We have two LICENSE source files. Index: apr-api-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apr-api-docs.spec 2 Jul 2008 00:36:01 -0000 1.6 +++ apr-api-docs.spec 2 Jul 2008 00:42:50 -0000 1.7 @@ -7,7 +7,8 @@ License: ASL 2.0 URL: http://apr.apache.org/ Source0: http://svn.apache.org/repos/asf/apr/apr/tags/%{version}/docs/doxygen.conf -Source1: http://svn.apache.org/repos/asf/apr/apr/tags/%{version}/LICENSE +Source1: http://svn.apache.org/repos/asf/apr/apr/tags/%{version}/LICENSE.APR +Source2: http://svn.apache.org/repos/asf/apr/apr-util/tags/%{version}/LICENSE.APU Patch0: apr-api-docs-doxygen.patch BuildRequires: apr-devel = %{version}, apr-util-devel, doxygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +47,7 @@ install -m 644 docs/apr.tag $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/apr-%{version}/api-docs %clean rm -rf %{name}-%{version} From fedora-extras-commits at redhat.com Wed Jul 2 00:53:18 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 00:53:18 GMT Subject: rpms/policycoreutils/devel .cvsignore, 1.181, 1.182 policycoreutils-rhat.patch, 1.371, 1.372 policycoreutils.spec, 1.533, 1.534 sources, 1.186, 1.187 Message-ID: <200807020053.m620rII0024344@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24302 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Tue Jul 1 2008 Dan Walsh 2.0.50-2 - Remove semodule use within semanage Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- .cvsignore 30 Jun 2008 15:52:24 -0000 1.181 +++ .cvsignore 2 Jul 2008 00:52:32 -0000 1.182 @@ -181,3 +181,4 @@ policycoreutils-2.0.49.tgz policycoreutils-2.0.50.tgz sepolgen-1.0.12.tgz +policycoreutils-2.0.51.tgz policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.371 retrieving revision 1.372 diff -u -r1.371 -r1.372 --- policycoreutils-rhat.patch 1 Jul 2008 13:44:20 -0000 1.371 +++ policycoreutils-rhat.patch 2 Jul 2008 00:52:32 -0000 1.372 @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.50/Makefile ---- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/Makefile 2008-07-01 09:43:28.000000000 -0400 +--- nsapolicycoreutils/Makefile 2007-12-19 06:02:52.000000000 -0500 ++++ policycoreutils-2.0.50/Makefile 2008-07-01 14:59:58.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui @@ -8,8 +8,8 @@ INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.50/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.50/restorecond/restorecond.c 2008-07-01 09:43:28.000000000 -0400 +--- nsapolicycoreutils/restorecond/restorecond.c 2007-07-16 14:20:41.000000000 -0400 ++++ policycoreutils-2.0.50/restorecond/restorecond.c 2008-07-01 14:59:58.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -36,75 +36,9 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.50/restorecond/restorecond.init ---- nsapolicycoreutils/restorecond/restorecond.init 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.50/restorecond/restorecond.init 2008-07-01 09:43:28.000000000 -0400 -@@ -2,7 +2,7 @@ - # - # restorecond: Daemon used to maintain path file context - # --# chkconfig: 2345 12 87 -+# chkconfig: - 12 87 - # description: restorecond uses inotify to look for creation of new files \ - # listed in the /etc/selinux/restorecond.conf file, and restores the \ - # correct security context. -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.50/scripts/fixfiles ---- nsapolicycoreutils/scripts/fixfiles 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.50/scripts/fixfiles 2008-07-01 09:43:28.000000000 -0400 -@@ -138,6 +138,9 @@ - fi - LogReadOnly - ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE -+rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* -+find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \; -+find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \; - exit $? - } - -@@ -180,6 +183,10 @@ - check) restore -n -v;; - verify) restore -n -o -;; - relabel) relabel;; -+ onboot) -+ touch /.autorelabel -+ echo "System will relabel on next boot" -+ ;; - *) - usage - exit 1 -@@ -189,6 +196,7 @@ - echo $"Usage: $0 [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir] ... ] " - echo or - echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o outputfile ] { check | restore }" -+ echo $"Usage: $0 onboot" - } - - if [ $# = 0 ]; then -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.50/scripts/fixfiles.8 ---- nsapolicycoreutils/scripts/fixfiles.8 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.50/scripts/fixfiles.8 2008-07-01 09:43:28.000000000 -0400 -@@ -7,6 +7,8 @@ - - .B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ] - -+.B fixfiles onboot -+ - .SH "DESCRIPTION" - This manual page describes the - .BR fixfiles -@@ -20,6 +22,9 @@ - as you expect. By default it will relabel all mounted ext2, ext3, xfs and - jfs file systems as long as they do not have a security context mount - option. You can use the -R flag to use rpmpackages as an alternative. -+.P -+.B fixfiles onboot -+will setup the machine to relabel on the next reboot. - - .SH "OPTIONS" - .TP diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.50/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/semanage 2008-07-01 09:43:28.000000000 -0400 +--- nsapolicycoreutils/semanage/semanage 2008-05-06 14:33:04.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/semanage 2008-07-01 20:31:40.000000000 -0400 @@ -43,49 +43,52 @@ if __name__ == '__main__': @@ -231,8 +165,17 @@ if modify: diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.50/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/semanage.8 2008-07-01 09:43:28.000000000 -0400 +--- nsapolicycoreutils/semanage/semanage.8 2008-05-06 14:33:04.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/semanage.8 2008-07-01 20:33:48.000000000 -0400 +@@ -3,7 +3,7 @@ + semanage \- SELinux Policy Management tool + + .SH "SYNOPSIS" +-.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|lC|D} [\-n] ++.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|D} [\-n] [\-S store] + .br + .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean + .br @@ -17,6 +17,8 @@ .br .B semanage fcontext \-{a|d|m} [\-frst] file_spec @@ -242,7 +185,17 @@ .B semanage translation \-{a|d|m} [\-T] level .P -@@ -101,10 +103,11 @@ +@@ -85,6 +87,9 @@ + .I \-s, \-\-seuser + SELinux user name + .TP ++.I \-S, \-\-store ++Select and alternate SELinux store to manage ++.TP + .I \-t, \-\-type + SELinux Type for the object + .TP +@@ -101,10 +106,11 @@ $ semanage fcontext -a -t httpd_sys_content_t "/web(/.*)?" # Allow Apache to listen on port 81 $ semanage port -a -t http_port_t -p tcp 81 @@ -256,8 +209,8 @@ Examples by Thomas Bleher . - diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.50/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/seobject.py 2008-07-01 09:43:52.000000000 -0400 +--- nsapolicycoreutils/semanage/seobject.py 2008-05-16 10:55:38.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/seobject.py 2008-07-01 20:30:55.000000000 -0400 @@ -1,5 +1,5 @@ #! /usr/bin/python -E -# Copyright (C) 2005, 2006, 2007 Red Hat @@ -275,7 +228,7 @@ import gettext gettext.bindtextdomain(PROGNAME, "/usr/share/locale") gettext.textdomain(PROGNAME) -@@ -246,7 +248,98 @@ +@@ -246,7 +248,103 @@ os.close(fd) os.rename(newfilename, self.filename) os.system("/sbin/service mcstrans reload > /dev/null") @@ -308,11 +261,16 @@ + raise ValueError(_("Could not establish semanage connection")) + + def get_all(self): -+ rc, out = commands.getstatusoutput("semodule -l | grep ^permissive"); + l = [] -+ for i in out.split(): -+ if i.startswith("permissive_"): -+ l.append(i.split("permissive_")[1]) ++ (rc, mlist, number) = semanage_module_list(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not list SELinux modules")) ++ ++ for i in range(number): ++ mod = semanage_module_list_nth(mlist, i) ++ name = semanage_module_get_name(mod) ++ if name and name.startswith("permissive_"): ++ l.append(name.split("permissive_")[1]) + return l + + def list(self,heading = 1, locallist = 0): @@ -360,8 +318,8 @@ + + + def delete(self, name): -+ for i in name.split -+ rc = semanage_module_remove(self.sh, "permissive_%s" % name) ++ for n in name.split(): ++ rc = semanage_module_remove(self.sh, "permissive_%s" % n) + rc = semanage_commit(self.sh) + if rc < 0: + raise ValueError(_("Could not remove permissive domain %s") % name) @@ -369,13 +327,13 @@ + def deleteall(self): + l = self.get_all() + if len(l) > 0: -+ all = " permissive_".join(l) ++ all = " ".join(l) + self.delete(all) + class semanageRecords: def __init__(self, store): self.sh = semanage_handle_create() -@@ -464,7 +557,7 @@ +@@ -464,7 +562,7 @@ def __init__(self, store = ""): semanageRecords.__init__(self, store) Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.533 retrieving revision 1.534 diff -u -r1.533 -r1.534 --- policycoreutils.spec 30 Jun 2008 20:51:23 -0000 1.533 +++ policycoreutils.spec 2 Jul 2008 00:52:32 -0000 1.534 @@ -5,7 +5,7 @@ %define sepolgenver 1.0.12 Summary: SELinux policy core utilities Name: policycoreutils -Version: 2.0.50 +Version: 2.0.51 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -192,6 +192,9 @@ fi %changelog +* Tue Jul 1 2008 Dan Walsh 2.0.50-2 +- Remove semodule use within semanage + * Mon Jun 30 2008 Dan Walsh 2.0.50-1 - Update to upstream * Fix audit2allow generation of role-type rules from Karl MacMillan. Index: sources =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- sources 30 Jun 2008 15:52:24 -0000 1.186 +++ sources 2 Jul 2008 00:52:32 -0000 1.187 @@ -1,2 +1,2 @@ -bf55b96652d47bb2838141130f851477 policycoreutils-2.0.50.tgz 4813a1ed80f19068ed9897165f073e8b sepolgen-1.0.12.tgz +9189683c9449c459ad5d7870d9e22085 policycoreutils-2.0.51.tgz From fedora-extras-commits at redhat.com Wed Jul 2 01:07:15 2008 From: fedora-extras-commits at redhat.com (Chris Ball (cjb)) Date: Wed, 2 Jul 2008 01:07:15 GMT Subject: rpms/ohm/OLPC-3 .cvsignore, 1.2, 1.3 ohm.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807020107.m6217F9p031382@cvs-int.fedora.redhat.com> Author: cjb Update of /cvs/pkgs/rpms/ohm/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31289 Modified Files: .cvsignore ohm.spec sources Log Message: Fix OLPC Trac #7359, segfault due to uninitialized use of X display. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2008 16:56:49 -0000 1.2 +++ .cvsignore 2 Jul 2008 01:06:25 -0000 1.3 @@ -1 +1 @@ -ohm-0.1.1-1.20080119git.tar.gz +ohm-0.1.1-1.20080701git.tar.gz Index: ohm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/ohm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ohm.spec 1 May 2008 17:52:25 -0000 1.2 +++ ohm.spec 2 Jul 2008 01:06:25 -0000 1.3 @@ -2,12 +2,12 @@ %define gtk2_version 2.10.0 %define dbus_version 0.70 %define gettext_version 0.14 -%define alphatag 20080119git +%define alphatag 20080701git Summary: Open Hardware Manager Name: ohm Version: 0.1.1 -Release: 6.12.%{alphatag}%{?dist} +Release: 6.13.%{alphatag}%{?dist} URL: http://www.freedesktop.org/Software/ohm Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz @@ -137,6 +137,9 @@ %{_includedir}/* %changelog +* Tue Jul 01 2008 Chris Ball - 0.1.1-6.13.20080701git.olpc +- Fix OLPC Trac #7359, segfault due to uninitialized use of X display. + * Thu May 01 2008 Dennis Gilmore - 0.1.1-6.12.20080119git - BR intltool Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2008 16:56:49 -0000 1.2 +++ sources 2 Jul 2008 01:06:25 -0000 1.3 @@ -1 +1 @@ -7479e7cb64dfc3334d92b022b7c2b72b ohm-0.1.1-1.20080119git.tar.gz +37617ab1a7bcc7783ae0f16dfb3ed829 ohm-0.1.1-1.20080701git.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 01:28:53 2008 From: fedora-extras-commits at redhat.com (Shawn Starr (spstarr)) Date: Wed, 2 Jul 2008 01:28:53 GMT Subject: rpms/libcapseo/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 libcapseo.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807020128.m621Srir031924@cvs-int.fedora.redhat.com> Author: spstarr Update of /cvs/pkgs/rpms/libcapseo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31853/devel Modified Files: .cvsignore libcapseo.spec sources Added Files: import.log Log Message: New upstream snapshot, license change to GPLv3 and configure script tweak --- NEW FILE import.log --- libcapseo-0_2_0-0_1_20080603gita6ec446_fc10:HEAD:libcapseo-0.2.0-0.1.20080603gita6ec446.fc10.src.rpm:1214962013 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libcapseo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2008 03:41:00 -0000 1.2 +++ .cvsignore 2 Jul 2008 01:28:02 -0000 1.3 @@ -1 +1 @@ -libcapseo-0.2.0-20080323.tar.bz2 +libcapseo-0.2.0-20080603.tar.bz2 Index: libcapseo.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcapseo/devel/libcapseo.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcapseo.spec 19 May 2008 19:58:20 -0000 1.2 +++ libcapseo.spec 2 Jul 2008 01:28:02 -0000 1.3 @@ -5,8 +5,8 @@ # cd libcapseo # git-archive --format=tar --prefix=libcapseo-%{capseo_version}/ %{git_version} | bzip2 > libcapseo-%{capseo_version}-%{gitdate}.tar.bz2 -%define gitdate 20080323 -%define git_version 1c5f3e5 +%define gitdate 20080603 +%define git_version a6ec446 %define tarfile %{name}-%{capseo_version}-%{gitdate}.tar.bz2 %define snapshot %{gitdate}git%{git_version} @@ -15,7 +15,7 @@ Name: libcapseo Version: %{capseo_version} Release: 0.1.%{snapshot}%{?dist} -License: GPLv2+ +License: GPLv3 Group: System Environment/Libraries URL: http://gitorious.org/projects/capseo/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -96,5 +96,9 @@ %{_libdir}/pkgconfig/capseo.pc %changelog +* Tue Jul 1 2008 Shawn Starr 0.2.0-0.1.20080603gita6ec446 +- Upstream snapshot, change GPLv2 to GPLv3. +- Fix minor configure script issue. + * Sat May 3 2008 Shawn Starr 0.2.0-0.1.20080323git1c5f3e5 - Initial Fedora package. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcapseo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2008 03:41:00 -0000 1.2 +++ sources 2 Jul 2008 01:28:02 -0000 1.3 @@ -1 +1 @@ -7d35d0e9717fa273a36fab6012d5445b libcapseo-0.2.0-20080323.tar.bz2 +f0fc20d0810bff5bf60d32fe1d04f171 libcapseo-0.2.0-20080603.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 02:00:01 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Wed, 2 Jul 2008 02:00:01 GMT Subject: rpms/tex-zfuzz/devel import.log, NONE, 1.1 tex-zfuzz-20070911-ctype.patch, NONE, 1.1 tex-zfuzz-20070911-destdir.patch, NONE, 1.1 tex-zfuzz-20070911-read-decl.patch, NONE, 1.1 tex-zfuzz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807020200.m62201qq000302@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/tex-zfuzz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32680/devel Modified Files: .cvsignore sources Added Files: import.log tex-zfuzz-20070911-ctype.patch tex-zfuzz-20070911-destdir.patch tex-zfuzz-20070911-read-decl.patch tex-zfuzz.spec Log Message: * Tue Jul 01 2008 David A. Wheeler - 0-0.20070911.2 - Initial contribution of tex-zfuzz to Fedora repository --- NEW FILE import.log --- tex-zfuzz-0-0_20070911_2_fc9:HEAD:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1214962677 tex-zfuzz-20070911-ctype.patch: --- NEW FILE tex-zfuzz-20070911-ctype.patch --- --- src/error.c.orig 2008-06-25 21:23:10.000000000 -0400 +++ src/error.c 2008-06-25 21:23:39.000000000 -0400 @@ -33,6 +33,7 @@ #include "fuzz.h" #include "symbol.h" #include +#include EXTERN char *yytext; EXTERN int yychar; tex-zfuzz-20070911-destdir.patch: --- NEW FILE tex-zfuzz-20070911-destdir.patch --- --- Makefile.orig 2008-06-25 17:02:43.000000000 -0400 +++ Makefile 2008-06-25 17:04:08.000000000 -0400 @@ -38,16 +38,18 @@ INSTALL = install +DESTDIR = + all: src test: force $(MAKE) -C test test install: src - $(INSTALL) -m 755 src/fuzz $(BINDIR) - $(INSTALL) -m 644 src/fuzzlib $(LIBDIR) - $(INSTALL) -m 644 tex/fuzz.sty $(TEXDIR) - $(INSTALL) -m 644 tex/*.mf $(MFDIR) + $(INSTALL) -m 755 src/fuzz $(DESTDIR)$(BINDIR) + $(INSTALL) -m 644 src/fuzzlib $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 tex/fuzz.sty $(DESTDIR)$(TEXDIR) + $(INSTALL) -m 644 tex/*.mf $(DESTDIR)$(MFDIR) SUBDIRS = src doc tex-zfuzz-20070911-read-decl.patch: --- NEW FILE tex-zfuzz-20070911-read-decl.patch --- --- src/zscan.l.orig 2008-06-24 00:14:20.000000000 -0400 +++ src/zscan.l 2008-06-24 00:16:31.000000000 -0400 @@ -35,7 +35,9 @@ #include "symbol.h" #include -EXTERN int read(int handle, void *buf, unsigned len); +/* Get definition of read() */ +#include + PRIVATE int token; PRIVATE int lookup(int v); --- NEW FILE tex-zfuzz.spec --- %define version_date 2007-09-11 Name: tex-zfuzz Version: 0 Release: 0.20070911.2%{?dist} Summary: Type-checker and LaTeX style for Z spec language Group: Applications/Engineering License: BSD URL: http://spivey.oriel.ox.ac.uk/mike/fuzz/ Source0: http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzz-%{version_date}.tar.gz Source1: http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzzman.pdf Source2: http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard.pdf Source3: http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzzman-2up.pdf Source4: http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard-2up.pdf Source5: http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard-3up.pdf Patch0 : tex-zfuzz-20070911-read-decl.patch Patch1 : tex-zfuzz-20070911-destdir.patch Patch2 : tex-zfuzz-20070911-ctype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tex(tex), tex(latex) BuildRequires: tex(tex), tex(latex), bison, flex Requires(post): tex(tex) Requires(postun): tex(tex) # Ubuntu and Debian have a different package named "fuzz", which is # better-known and Fedora may include someday, so the command is renamed as # "zfuzz" per upstream (Mike Spivey) recommendation. The package is named # "tex-zfuzz", to follow Fedora naming conventions for TeX packages. The # LaTeX style is still "fuzz", preserving an upstream request: "please don't # rename the LaTeX style option, or existing documents will break." # Upstream uses dates as version numbers for _final_ releases, not just # pre-release interim releases. After discussion, 0.20070911.X%{?dist} format # agreed upon for Release: value. # The package contains a few glyphs, but creating a separate font # subpackage seemed unnecessary and confusing (it's the only package using # them). Thus, it's been packaged as a single package, as upstream does. # The LaTeX style and type-checker COULD be separately packaged, but that also # seems pointless; they are intended to be used together. # Dirs for LaTeX styles, metafont, .tfm (root/specific), *pk (root/specific): %define texdir %{_texmf_main}/tex/latex/%{name} %define mfdir %{_texmf_main}/metafont/%{name} %define tfmdirr %{_texmf_main}/fonts/tfm/%{name} %define pkdirr %{_texmf_main}/fonts/pk/%{name} %define tfmdir %{tfmdirr}/oxsz %define pkdir %{pkdirr}/oxsz %description This package (formerly named "fuzz") is a collection of tools that help you to (1) format and print good-looking specifications in the Z ("zed") formal specification language using LaTeX (through a new LaTeX style), and (2) check them for compliance with the Z scope and type rules. It includes a few font definitions for Z???s special symbols. This package is useful if you want to create formal specifications using the Z specification language. The Z language accepted is that of the Z Reference Manual, second edition, which is not exactly the same as the Z ISO standard (see http://www.cs.york.ac.uk/hise/cadiz/standard.html for the differences). Historically, this package was called "fuzz", but there is another program ALSO called fuzz, so the command-line type-checker's has been changed to "zfuzz". The LaTeX style itself is still named "fuzz" (so LaTeX documents will keep working). %prep %setup -q -n fuzz-%{version_date} %patch0 %patch1 %patch2 # The source for some documents are in ./doc as LaTeX, but as upstream says: # "The fuzz manual and reference card are written with LaTeX 2.09. # Good luck unearthing a copy of that if you want to reformat it." cp -p %SOURCE1 . cp -p %SOURCE2 . cp -p %SOURCE3 . cp -p %SOURCE4 . cp -p %SOURCE5 . %build # No "configure" script. sed -i 's!/usr/local/lib/!%{_datadir}/%{name}/!g' src/param.c # The "lib" is really shared data, so we'll put it in %%_datadir (/usr/share) # instead of /usr/lib to meet the File Hierarchy Standard (FHS). make %{?_smp_mflags} CFLAGS="%{optflags}" \ BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} \ TEXDIR=%{texdir} MFDIR=%{mfdir} # Generate docs and pregenerated .tfm/*pk files: pushd tex for file in oxsz[1-9]*.mf do mktextfm --destdir `pwd` `basename $file .mf` done mktexpk --destdir `pwd` --mfmode / --bdpi 600 --mag 1+120/600 --dpi 720 oxsz10 pdflatex example.tex # Run latex twice on the tutorial (to get the cross-references correct): latex tut.tex pdflatex tut.tex mv example.tex example.pdf tut.pdf .. popd %check make test %install rm -rf %{buildroot} install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_datadir}/%{name} install -d %{buildroot}%{texdir} install -d %{buildroot}%{mfdir} install -d %{buildroot}%{tfmdir} install -d %{buildroot}%{pkdir} make install DESTDIR=%{buildroot} \ BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} \ TEXDIR=%{texdir} MFDIR=%{mfdir} INSTALL="install -p" (cd %{buildroot}%{_bindir} ; mv fuzz zfuzz) # Install pre-built .tfm and *pk files (speeds use): cp -p tex/*.tfm %{buildroot}%{tfmdir} cp -p tex/*pk %{buildroot}%{pkdir} %clean rm -rf %{buildroot} # The "INSTALL" file includes the license text, so install as doc. # TeX file installation follows the "info tds" rules of texlive-texmf. %files %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/%{name}/ %{texdir}/ %{mfdir}/ %{tfmdirr}/ %{pkdirr}/ %doc INSTALL %doc fuzzman.pdf %doc refcard.pdf %doc fuzzman-2up.pdf %doc refcard-2up.pdf %doc refcard-3up.pdf %doc example.tex %doc example.pdf %doc tut.pdf %post mktexlsr >/dev/null 2>&1 || : %postun mktexlsr >/dev/null 2>&1 || : %changelog * Mon Jun 30 2008 David A. Wheeler - 0-0.20070911.2 - Added more information to Changelog (combined due to rev number change) * Sat Jun 29 2008 David A. Wheeler - 0-0.20070911.1 - Initial packaging. - Did not name it "fuzz" because of conflict with other program named fuzz - Handled reviewer comments https://bugzilla.redhat.com/show_bug.cgi?id=452559 - Named package as tex-zfuzz (per Fedora naming guidelines) - Came to agreement on version/revision convention - Depend on virtual packages tex(tex) and tex(latex) instead of specific pkgs - Shortened comments and description - Renamed patch file names to clarify what upstream version they apply to - Fixed .spec so it can build even when it's already installed - Summary and description don't repeat package name - Patch error.c to eliminate compiler warning for undefined isupper/islower - Simplified CFLAGS argument - Patched so would compile on 64-bit Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2008 16:53:55 -0000 1.1 +++ .cvsignore 2 Jul 2008 01:59:17 -0000 1.2 @@ -0,0 +1,6 @@ +fuzz-2007-09-11.tar.gz +fuzzman-2up.pdf +fuzzman.pdf +refcard-2up.pdf +refcard-3up.pdf +refcard.pdf Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2008 16:53:55 -0000 1.1 +++ sources 2 Jul 2008 01:59:17 -0000 1.2 @@ -0,0 +1,6 @@ +9f021c0e68f8f4616095f57ff2192c6f fuzz-2007-09-11.tar.gz +4e4d00d8571b14919f95f041a927f71b fuzzman-2up.pdf +e3eb1467804bf4bf5b8dcf8eed773c69 fuzzman.pdf +c3145cea9c6f16fb02e068fd1ea669a9 refcard-2up.pdf +082297daa993c97d8e35fb75f8bb2810 refcard-3up.pdf +be69ba14a3b997bcde65828a34909e67 refcard.pdf From fedora-extras-commits at redhat.com Wed Jul 2 02:05:38 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 02:05:38 GMT Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.68, 1.69 policycoreutils.spec, 1.534, 1.535 Message-ID: <200807020205.m6225cGI007080@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7008 Modified Files: policycoreutils-gui.patch policycoreutils.spec Log Message: * Tue Jul 1 2008 Dan Walsh 2.0.50-2 - Remove semodule use within semanage - Fix launching of polgengui from toolbar policycoreutils-gui.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.68 -r 1.69 policycoreutils-gui.patch Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- policycoreutils-gui.patch 27 Jun 2008 11:03:38 -0000 1.68 +++ policycoreutils-gui.patch 2 Jul 2008 02:04:52 -0000 1.69 @@ -1,44 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.49/gui/Makefile ---- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/Makefile 2008-06-23 07:03:37.000000000 -0400 -@@ -0,0 +1,34 @@ -+# Installation directories. -+PREFIX ?= ${DESTDIR}/usr -+SHAREDIR ?= $(PREFIX)/share/system-config-selinux -+ -+TARGETS= \ -+booleansPage.py \ -+fcontextPage.py \ -+loginsPage.py \ -+mappingsPage.py \ -+modulesPage.py \ -+polgen.py \ -+polgen.glade \ -+portsPage.py \ -+semanagePage.py \ -+statusPage.py \ -+system-config-selinux.glade \ -+translationsPage.py \ -+usersPage.py \ -+selinux.tbl -+ -+all: $(TARGETS) system-config-selinux.py polgengui.py templates -+ -+install: all -+ -mkdir -p $(SHAREDIR)/templates -+ install -m 755 system-config-selinux.py $(SHAREDIR) -+ install -m 755 polgengui.py $(SHAREDIR) -+ install -m 644 $(TARGETS) $(SHAREDIR) -+ install -m 644 templates/*.py $(SHAREDIR)/templates/ -+ -+clean: -+ -+indent: -+ -+relabel: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.49/gui/booleansPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.50/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/booleansPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/booleansPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,230 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -270,9 +232,9 @@ + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.49/gui/fcontextPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.50/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/fcontextPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/fcontextPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,217 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -491,9 +453,9 @@ + self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.49/gui/lockdown.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.50/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.glade 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.glade 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,2065 @@ + + @@ -2560,9 +2522,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade.bak policycoreutils-2.0.49/gui/lockdown.glade.bak +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade.bak policycoreutils-2.0.50/gui/lockdown.glade.bak --- nsapolicycoreutils/gui/lockdown.glade.bak 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.glade.bak 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.glade.bak 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,2065 @@ + + @@ -4629,9 +4591,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.49/gui/lockdown.gladep +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.50/gui/lockdown.gladep --- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.gladep 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.gladep 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,7 @@ + + @@ -4640,9 +4602,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep.bak policycoreutils-2.0.49/gui/lockdown.gladep.bak +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep.bak policycoreutils-2.0.50/gui/lockdown.gladep.bak --- nsapolicycoreutils/gui/lockdown.gladep.bak 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.gladep.bak 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.gladep.bak 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,7 @@ + + @@ -4651,9 +4613,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.49/gui/lockdown.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.50/gui/lockdown.py --- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,331 @@ +#!/usr/bin/python +# @@ -4986,9 +4948,9 @@ + + app = booleanWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.49/gui/loginsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.50/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/loginsPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/loginsPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -5175,9 +5137,50 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.49/gui/mappingsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.50/gui/Makefile +--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.50/gui/Makefile 2008-07-01 21:56:24.000000000 -0400 +@@ -0,0 +1,37 @@ ++# Installation directories. ++PREFIX ?= ${DESTDIR}/usr ++SHAREDIR ?= $(PREFIX)/share/system-config-selinux ++ ++TARGETS= \ ++booleansPage.py \ ++fcontextPage.py \ ++loginsPage.py \ ++mappingsPage.py \ ++modulesPage.py \ ++polgen.py \ ++polgen.glade \ ++portsPage.py \ ++lockdown.py \ ++lockdown.glade \ ++semanagePage.py \ ++statusPage.py \ ++system-config-selinux.glade \ ++translationsPage.py \ ++usersPage.py \ ++selinux.tbl ++ ++all: $(TARGETS) system-config-selinux.py polgengui.py templates ++ ++install: all ++ -mkdir -p $(SHAREDIR)/templates ++ install -m 755 system-config-selinux.py $(SHAREDIR) ++ install -m 755 polgengui.py $(SHAREDIR) ++ install -m 755 lockdown.py $(SHAREDIR) ++ install -m 644 $(TARGETS) $(SHAREDIR) ++ install -m 644 templates/*.py $(SHAREDIR)/templates/ ++ ++clean: ++ ++indent: ++ ++relabel: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.50/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/mappingsPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/mappingsPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -5235,9 +5238,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.49/gui/modulesPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.50/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/modulesPage.py 2008-06-23 07:03:37.000000000 -0400 [...3029 lines suppressed...] -+# -+ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.49/gui/templates/boolean.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.50/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/boolean.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/boolean.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14609,9 +14592,9 @@ +') +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.49/gui/templates/etc_rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.50/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/etc_rw.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/etc_rw.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14742,9 +14725,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.49/gui/templates/executable.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.50/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/executable.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/executable.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,327 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15073,9 +15056,31 @@ +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.49/gui/templates/network.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.50/gui/templates/__init__.py +--- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.50/gui/templates/__init__.py 2008-07-01 14:59:58.000000000 -0400 +@@ -0,0 +1,18 @@ ++# ++# Copyright (C) 2007 Red Hat, Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.50/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/network.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/network.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -15157,9 +15162,9 @@ +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.49/gui/templates/rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.50/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/rw.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/rw.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15289,9 +15294,9 @@ +fc_dir=""" +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.49/gui/templates/script.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.50/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/script.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/script.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15398,9 +15403,9 @@ +# Adding roles to SELinux user USER +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.49/gui/templates/semodule.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.50/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/semodule.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/semodule.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15443,9 +15448,9 @@ +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.49/gui/templates/tmp.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.50/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/tmp.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/tmp.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15544,9 +15549,9 @@ + TEMPLATETYPE_manage_tmp($1) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.49/gui/templates/user.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.50/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/user.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/user.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15730,9 +15735,9 @@ +te_newrole_rules=""" +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t }) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.49/gui/templates/var_lib.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.50/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_lib.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_lib.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15892,9 +15897,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.49/gui/templates/var_log.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.50/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_log.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_log.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16006,9 +16011,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.49/gui/templates/var_run.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.50/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_run.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_run.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16128,9 +16133,9 @@ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.49/gui/templates/var_spool.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.50/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_spool.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_spool.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16261,9 +16266,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.49/gui/translationsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.50/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/translationsPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/translationsPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -16383,9 +16388,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.49/gui/usersPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.50/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/usersPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/usersPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.534 retrieving revision 1.535 diff -u -r1.534 -r1.535 --- policycoreutils.spec 2 Jul 2008 00:52:32 -0000 1.534 +++ policycoreutils.spec 2 Jul 2008 02:04:52 -0000 1.535 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.51 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -194,6 +194,7 @@ %changelog * Tue Jul 1 2008 Dan Walsh 2.0.50-2 - Remove semodule use within semanage +- Fix launching of polgengui from toolbar * Mon Jun 30 2008 Dan Walsh 2.0.50-1 - Update to upstream From fedora-extras-commits at redhat.com Wed Jul 2 02:08:28 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Wed, 2 Jul 2008 02:08:28 GMT Subject: rpms/tex-zfuzz/F-9 import.log, NONE, 1.1 tex-zfuzz-20070911-ctype.patch, NONE, 1.1 tex-zfuzz-20070911-destdir.patch, NONE, 1.1 tex-zfuzz-20070911-read-decl.patch, NONE, 1.1 tex-zfuzz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807020208.m6228S5n007239@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/tex-zfuzz/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7060/F-9 Modified Files: .cvsignore sources Added Files: import.log tex-zfuzz-20070911-ctype.patch tex-zfuzz-20070911-destdir.patch tex-zfuzz-20070911-read-decl.patch tex-zfuzz.spec Log Message: * TUe Jul 01 2008 David A. Wheeler - 0-0.20070911.2 - Initial submission to Fedora repository. --- NEW FILE import.log --- tex-zfuzz-0-0_20070911_2_fc9:F-9:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1214963719 tex-zfuzz-20070911-ctype.patch: --- NEW FILE tex-zfuzz-20070911-ctype.patch --- --- src/error.c.orig 2008-06-25 21:23:10.000000000 -0400 +++ src/error.c 2008-06-25 21:23:39.000000000 -0400 @@ -33,6 +33,7 @@ #include "fuzz.h" #include "symbol.h" #include +#include EXTERN char *yytext; EXTERN int yychar; tex-zfuzz-20070911-destdir.patch: --- NEW FILE tex-zfuzz-20070911-destdir.patch --- --- Makefile.orig 2008-06-25 17:02:43.000000000 -0400 +++ Makefile 2008-06-25 17:04:08.000000000 -0400 @@ -38,16 +38,18 @@ INSTALL = install +DESTDIR = + all: src test: force $(MAKE) -C test test install: src - $(INSTALL) -m 755 src/fuzz $(BINDIR) - $(INSTALL) -m 644 src/fuzzlib $(LIBDIR) - $(INSTALL) -m 644 tex/fuzz.sty $(TEXDIR) - $(INSTALL) -m 644 tex/*.mf $(MFDIR) + $(INSTALL) -m 755 src/fuzz $(DESTDIR)$(BINDIR) + $(INSTALL) -m 644 src/fuzzlib $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 tex/fuzz.sty $(DESTDIR)$(TEXDIR) + $(INSTALL) -m 644 tex/*.mf $(DESTDIR)$(MFDIR) SUBDIRS = src doc tex-zfuzz-20070911-read-decl.patch: --- NEW FILE tex-zfuzz-20070911-read-decl.patch --- --- src/zscan.l.orig 2008-06-24 00:14:20.000000000 -0400 +++ src/zscan.l 2008-06-24 00:16:31.000000000 -0400 @@ -35,7 +35,9 @@ #include "symbol.h" #include -EXTERN int read(int handle, void *buf, unsigned len); +/* Get definition of read() */ +#include + PRIVATE int token; PRIVATE int lookup(int v); --- NEW FILE tex-zfuzz.spec --- %define version_date 2007-09-11 Name: tex-zfuzz Version: 0 Release: 0.20070911.2%{?dist} Summary: Type-checker and LaTeX style for Z spec language Group: Applications/Engineering License: BSD URL: http://spivey.oriel.ox.ac.uk/mike/fuzz/ Source0: http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzz-%{version_date}.tar.gz Source1: http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzzman.pdf Source2: http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard.pdf Source3: http://spivey.oriel.ox.ac.uk/mike/fuzz/fuzzman-2up.pdf Source4: http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard-2up.pdf Source5: http://spivey.oriel.ox.ac.uk/mike/fuzz/refcard-3up.pdf Patch0 : tex-zfuzz-20070911-read-decl.patch Patch1 : tex-zfuzz-20070911-destdir.patch Patch2 : tex-zfuzz-20070911-ctype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tex(tex), tex(latex) BuildRequires: tex(tex), tex(latex), bison, flex Requires(post): tex(tex) Requires(postun): tex(tex) # Ubuntu and Debian have a different package named "fuzz", which is # better-known and Fedora may include someday, so the command is renamed as # "zfuzz" per upstream (Mike Spivey) recommendation. The package is named # "tex-zfuzz", to follow Fedora naming conventions for TeX packages. The # LaTeX style is still "fuzz", preserving an upstream request: "please don't # rename the LaTeX style option, or existing documents will break." # Upstream uses dates as version numbers for _final_ releases, not just # pre-release interim releases. After discussion, 0.20070911.X%{?dist} format # agreed upon for Release: value. # The package contains a few glyphs, but creating a separate font # subpackage seemed unnecessary and confusing (it's the only package using # them). Thus, it's been packaged as a single package, as upstream does. # The LaTeX style and type-checker COULD be separately packaged, but that also # seems pointless; they are intended to be used together. # Dirs for LaTeX styles, metafont, .tfm (root/specific), *pk (root/specific): %define texdir %{_texmf_main}/tex/latex/%{name} %define mfdir %{_texmf_main}/metafont/%{name} %define tfmdirr %{_texmf_main}/fonts/tfm/%{name} %define pkdirr %{_texmf_main}/fonts/pk/%{name} %define tfmdir %{tfmdirr}/oxsz %define pkdir %{pkdirr}/oxsz %description This package (formerly named "fuzz") is a collection of tools that help you to (1) format and print good-looking specifications in the Z ("zed") formal specification language using LaTeX (through a new LaTeX style), and (2) check them for compliance with the Z scope and type rules. It includes a few font definitions for Z???s special symbols. This package is useful if you want to create formal specifications using the Z specification language. The Z language accepted is that of the Z Reference Manual, second edition, which is not exactly the same as the Z ISO standard (see http://www.cs.york.ac.uk/hise/cadiz/standard.html for the differences). Historically, this package was called "fuzz", but there is another program ALSO called fuzz, so the command-line type-checker's has been changed to "zfuzz". The LaTeX style itself is still named "fuzz" (so LaTeX documents will keep working). %prep %setup -q -n fuzz-%{version_date} %patch0 %patch1 %patch2 # The source for some documents are in ./doc as LaTeX, but as upstream says: # "The fuzz manual and reference card are written with LaTeX 2.09. # Good luck unearthing a copy of that if you want to reformat it." cp -p %SOURCE1 . cp -p %SOURCE2 . cp -p %SOURCE3 . cp -p %SOURCE4 . cp -p %SOURCE5 . %build # No "configure" script. sed -i 's!/usr/local/lib/!%{_datadir}/%{name}/!g' src/param.c # The "lib" is really shared data, so we'll put it in %%_datadir (/usr/share) # instead of /usr/lib to meet the File Hierarchy Standard (FHS). make %{?_smp_mflags} CFLAGS="%{optflags}" \ BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} \ TEXDIR=%{texdir} MFDIR=%{mfdir} # Generate docs and pregenerated .tfm/*pk files: pushd tex for file in oxsz[1-9]*.mf do mktextfm --destdir `pwd` `basename $file .mf` done mktexpk --destdir `pwd` --mfmode / --bdpi 600 --mag 1+120/600 --dpi 720 oxsz10 pdflatex example.tex # Run latex twice on the tutorial (to get the cross-references correct): latex tut.tex pdflatex tut.tex mv example.tex example.pdf tut.pdf .. popd %check make test %install rm -rf %{buildroot} install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_datadir}/%{name} install -d %{buildroot}%{texdir} install -d %{buildroot}%{mfdir} install -d %{buildroot}%{tfmdir} install -d %{buildroot}%{pkdir} make install DESTDIR=%{buildroot} \ BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} \ TEXDIR=%{texdir} MFDIR=%{mfdir} INSTALL="install -p" (cd %{buildroot}%{_bindir} ; mv fuzz zfuzz) # Install pre-built .tfm and *pk files (speeds use): cp -p tex/*.tfm %{buildroot}%{tfmdir} cp -p tex/*pk %{buildroot}%{pkdir} %clean rm -rf %{buildroot} # The "INSTALL" file includes the license text, so install as doc. # TeX file installation follows the "info tds" rules of texlive-texmf. %files %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/%{name}/ %{texdir}/ %{mfdir}/ %{tfmdirr}/ %{pkdirr}/ %doc INSTALL %doc fuzzman.pdf %doc refcard.pdf %doc fuzzman-2up.pdf %doc refcard-2up.pdf %doc refcard-3up.pdf %doc example.tex %doc example.pdf %doc tut.pdf %post mktexlsr >/dev/null 2>&1 || : %postun mktexlsr >/dev/null 2>&1 || : %changelog * Mon Jun 30 2008 David A. Wheeler - 0-0.20070911.2 - Added more information to Changelog (combined due to rev number change) * Sat Jun 29 2008 David A. Wheeler - 0-0.20070911.1 - Initial packaging. - Did not name it "fuzz" because of conflict with other program named fuzz - Handled reviewer comments https://bugzilla.redhat.com/show_bug.cgi?id=452559 - Named package as tex-zfuzz (per Fedora naming guidelines) - Came to agreement on version/revision convention - Depend on virtual packages tex(tex) and tex(latex) instead of specific pkgs - Shortened comments and description - Renamed patch file names to clarify what upstream version they apply to - Fixed .spec so it can build even when it's already installed - Summary and description don't repeat package name - Patch error.c to eliminate compiler warning for undefined isupper/islower - Simplified CFLAGS argument - Patched so would compile on 64-bit Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2008 16:53:55 -0000 1.1 +++ .cvsignore 2 Jul 2008 02:07:38 -0000 1.2 @@ -0,0 +1,6 @@ +fuzz-2007-09-11.tar.gz +fuzzman-2up.pdf +fuzzman.pdf +refcard-2up.pdf +refcard-3up.pdf +refcard.pdf Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2008 16:53:55 -0000 1.1 +++ sources 2 Jul 2008 02:07:38 -0000 1.2 @@ -0,0 +1,6 @@ +9f021c0e68f8f4616095f57ff2192c6f fuzz-2007-09-11.tar.gz +4e4d00d8571b14919f95f041a927f71b fuzzman-2up.pdf +e3eb1467804bf4bf5b8dcf8eed773c69 fuzzman.pdf +c3145cea9c6f16fb02e068fd1ea669a9 refcard-2up.pdf +082297daa993c97d8e35fb75f8bb2810 refcard-3up.pdf +be69ba14a3b997bcde65828a34909e67 refcard.pdf From fedora-extras-commits at redhat.com Wed Jul 2 02:08:54 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 02:08:54 GMT Subject: rpms/policycoreutils/F-9 .cvsignore, 1.180, 1.181 policycoreutils-gui.patch, 1.66, 1.67 policycoreutils-po.patch, 1.35, 1.36 policycoreutils-rhat.patch, 1.367, 1.368 policycoreutils-sepolgen.patch, 1.12, 1.13 policycoreutils.spec, 1.526, 1.527 sources, 1.186, 1.187 Message-ID: <200807020208.m6228sOx007296@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7138 Modified Files: .cvsignore policycoreutils-gui.patch policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils-sepolgen.patch policycoreutils.spec sources Log Message: * Tue Jul 1 2008 Dan Walsh 2.0.50-2 - Remove semodule use within semanage - Fix launching of polgengui from toolbar Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/.cvsignore,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- .cvsignore 22 Jun 2008 13:34:48 -0000 1.180 +++ .cvsignore 2 Jul 2008 02:08:02 -0000 1.181 @@ -179,3 +179,6 @@ policycoreutils-2.0.46.tgz policycoreutils-2.0.47.tgz policycoreutils-2.0.49.tgz +policycoreutils-2.0.50.tgz +sepolgen-1.0.12.tgz +policycoreutils-2.0.51.tgz policycoreutils-gui.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.66 -r 1.67 policycoreutils-gui.patch Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-gui.patch,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- policycoreutils-gui.patch 24 Jun 2008 10:17:29 -0000 1.66 +++ policycoreutils-gui.patch 2 Jul 2008 02:08:02 -0000 1.67 @@ -1,44 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.49/gui/Makefile ---- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/Makefile 2008-06-23 07:03:37.000000000 -0400 -@@ -0,0 +1,34 @@ -+# Installation directories. -+PREFIX ?= ${DESTDIR}/usr -+SHAREDIR ?= $(PREFIX)/share/system-config-selinux -+ -+TARGETS= \ -+booleansPage.py \ -+fcontextPage.py \ -+loginsPage.py \ -+mappingsPage.py \ -+modulesPage.py \ -+polgen.py \ -+polgen.glade \ -+portsPage.py \ -+semanagePage.py \ -+statusPage.py \ -+system-config-selinux.glade \ -+translationsPage.py \ -+usersPage.py \ -+selinux.tbl -+ -+all: $(TARGETS) system-config-selinux.py polgengui.py templates -+ -+install: all -+ -mkdir -p $(SHAREDIR)/templates -+ install -m 755 system-config-selinux.py $(SHAREDIR) -+ install -m 755 polgengui.py $(SHAREDIR) -+ install -m 644 $(TARGETS) $(SHAREDIR) -+ install -m 644 templates/*.py $(SHAREDIR)/templates/ -+ -+clean: -+ -+indent: -+ -+relabel: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.49/gui/booleansPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.50/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/booleansPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/booleansPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,230 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -270,9 +232,9 @@ + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.49/gui/fcontextPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.50/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/fcontextPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/fcontextPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,217 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -491,9 +453,9 @@ + self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.49/gui/lockdown.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.50/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.glade 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.glade 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,2065 @@ + + @@ -2560,9 +2522,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade.bak policycoreutils-2.0.49/gui/lockdown.glade.bak +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade.bak policycoreutils-2.0.50/gui/lockdown.glade.bak --- nsapolicycoreutils/gui/lockdown.glade.bak 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.glade.bak 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.glade.bak 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,2065 @@ + + @@ -4629,9 +4591,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.49/gui/lockdown.gladep +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.50/gui/lockdown.gladep --- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.gladep 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.gladep 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,7 @@ + + @@ -4640,9 +4602,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep.bak policycoreutils-2.0.49/gui/lockdown.gladep.bak +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep.bak policycoreutils-2.0.50/gui/lockdown.gladep.bak --- nsapolicycoreutils/gui/lockdown.gladep.bak 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.gladep.bak 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.gladep.bak 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,7 @@ + + @@ -4651,9 +4613,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.49/gui/lockdown.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.50/gui/lockdown.py --- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/lockdown.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/lockdown.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,331 @@ +#!/usr/bin/python +# @@ -4986,9 +4948,9 @@ + + app = booleanWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.49/gui/loginsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.50/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/loginsPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/loginsPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -5175,9 +5137,50 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.49/gui/mappingsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.50/gui/Makefile +--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.50/gui/Makefile 2008-07-01 21:56:24.000000000 -0400 +@@ -0,0 +1,37 @@ ++# Installation directories. ++PREFIX ?= ${DESTDIR}/usr ++SHAREDIR ?= $(PREFIX)/share/system-config-selinux ++ ++TARGETS= \ ++booleansPage.py \ ++fcontextPage.py \ ++loginsPage.py \ ++mappingsPage.py \ ++modulesPage.py \ ++polgen.py \ ++polgen.glade \ ++portsPage.py \ ++lockdown.py \ ++lockdown.glade \ ++semanagePage.py \ ++statusPage.py \ ++system-config-selinux.glade \ ++translationsPage.py \ ++usersPage.py \ ++selinux.tbl ++ ++all: $(TARGETS) system-config-selinux.py polgengui.py templates ++ ++install: all ++ -mkdir -p $(SHAREDIR)/templates ++ install -m 755 system-config-selinux.py $(SHAREDIR) ++ install -m 755 polgengui.py $(SHAREDIR) ++ install -m 755 lockdown.py $(SHAREDIR) ++ install -m 644 $(TARGETS) $(SHAREDIR) ++ install -m 644 templates/*.py $(SHAREDIR)/templates/ ++ ++clean: ++ ++indent: ++ ++relabel: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.50/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/mappingsPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/mappingsPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -5235,9 +5238,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.49/gui/modulesPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.50/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/modulesPage.py 2008-06-23 07:03:37.000000000 -0400 [...3029 lines suppressed...] -+# -+ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.49/gui/templates/boolean.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.50/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/boolean.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/boolean.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14609,9 +14592,9 @@ +') +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.49/gui/templates/etc_rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.50/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/etc_rw.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/etc_rw.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14742,9 +14725,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.49/gui/templates/executable.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.50/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/executable.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/executable.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,327 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15073,9 +15056,31 @@ +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.49/gui/templates/network.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.50/gui/templates/__init__.py +--- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.50/gui/templates/__init__.py 2008-07-01 14:59:58.000000000 -0400 +@@ -0,0 +1,18 @@ ++# ++# Copyright (C) 2007 Red Hat, Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.50/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/network.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/network.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -15157,9 +15162,9 @@ +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.49/gui/templates/rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.50/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/rw.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/rw.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15289,9 +15294,9 @@ +fc_dir=""" +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.49/gui/templates/script.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.50/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/script.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/script.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15398,9 +15403,9 @@ +# Adding roles to SELinux user USER +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.49/gui/templates/semodule.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.50/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/semodule.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/semodule.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15443,9 +15448,9 @@ +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.49/gui/templates/tmp.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.50/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/tmp.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/tmp.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15544,9 +15549,9 @@ + TEMPLATETYPE_manage_tmp($1) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.49/gui/templates/user.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.50/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/user.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/user.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15730,9 +15735,9 @@ +te_newrole_rules=""" +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t }) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.49/gui/templates/var_lib.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.50/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_lib.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_lib.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15892,9 +15897,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.49/gui/templates/var_log.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.50/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_log.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_log.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16006,9 +16011,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.49/gui/templates/var_run.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.50/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_run.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_run.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16128,9 +16133,9 @@ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.49/gui/templates/var_spool.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.50/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/templates/var_spool.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/templates/var_spool.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16261,9 +16266,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.49/gui/translationsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.50/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/translationsPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/translationsPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -16383,9 +16388,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.49/gui/usersPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.50/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/gui/usersPage.py 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/gui/usersPage.py 2008-07-01 14:59:58.000000000 -0400 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. policycoreutils-po.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.35 -r 1.36 policycoreutils-po.patch Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-po.patch,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- policycoreutils-po.patch 27 Jun 2008 11:04:18 -0000 1.35 +++ policycoreutils-po.patch 2 Jul 2008 02:08:02 -0000 1.36 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.49/po/.cvsignore +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.50/po/.cvsignore --- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/po/.cvsignore 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/po/.cvsignore 2008-06-30 11:49:38.000000000 -0400 @@ -0,0 +1,16 @@ +*.gmo +*.mo @@ -18,9 +18,9 @@ +po2tbl.sed.in +stamp-cat-id +stamp-it -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.49/po/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.50/po/Makefile --- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.49/po/Makefile 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/po/Makefile 2008-06-30 11:49:38.000000000 -0400 @@ -23,20 +23,61 @@ POFILES = $(wildcard *.po) MOFILES = $(patsubst %.po,%.mo,$(POFILES)) @@ -100,9 +100,9 @@ install: $(MOFILES) @for n in $(MOFILES); do \ l=`basename $$n .mo`; \ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.49/po/POTFILES +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.50/po/POTFILES --- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/POTFILES 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/po/POTFILES 2008-06-30 11:49:38.000000000 -0400 @@ -1,10 +1,54 @@ - ../load_policy/load_policy.c \ - ../newrole/newrole.c \ @@ -166,9 +166,9 @@ + ../gui/templates/var_spool.py \ + ../secon/secon.c \ + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.49/po/POTFILES.in +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.50/po/POTFILES.in --- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.49/po/POTFILES.in 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/po/POTFILES.in 2008-06-30 11:49:38.000000000 -0400 @@ -2,9 +2,7 @@ run_init/run_init.c semodule_link/semodule_link.c @@ -228,15 +228,15 @@ +gui/templates/var_run.py +gui/templates/var_spool.py secon/secon.c -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.49/po/af.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.50/po/af.po --- nsapolicycoreutils/po/af.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.49/po/af.po 2008-06-27 07:00:08.000000000 -0400 ++++ policycoreutils-2.0.50/po/af.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4002,15 +4002,15 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.49/po/am.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.50/po/am.po --- nsapolicycoreutils/po/am.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/am.po 2008-06-27 07:00:08.000000000 -0400 ++++ policycoreutils-2.0.50/po/am.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -7776,15 +7776,15 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.49/po/ar.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.50/po/ar.po --- nsapolicycoreutils/po/ar.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.49/po/ar.po 2008-06-27 07:00:08.000000000 -0400 ++++ policycoreutils-2.0.50/po/ar.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -11550,9 +11550,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.49/po/as.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.50/po/as.po --- nsapolicycoreutils/po/as.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.49/po/as.po 2008-06-27 07:00:09.000000000 -0400 ++++ policycoreutils-2.0.50/po/as.po 2008-06-30 11:50:00.000000000 -0400 @@ -1,1028 +1,3566 @@ # translation of as.po to Assamese # This file is distributed under the same license as the PACKAGE package. @@ -11566,7 +11566,7 @@ +msgstr "" +"Project-Id-Version: as\n" +"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" +"PO-Revision-Date: 2008-01-31 12:04+0530\n" +"Last-Translator: Amitakhya Phukan \n" +"Language-Team: Assamese\n" @@ -15832,9 +15832,9 @@ +#~ "MLS/\n" +#~ "MCS Level" +#~ msgstr "????????????" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.49/po/autom4te.cache/requests +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.50/po/autom4te.cache/requests --- nsapolicycoreutils/po/autom4te.cache/requests 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.49/po/autom4te.cache/requests 2008-06-23 07:03:37.000000000 -0400 ++++ policycoreutils-2.0.50/po/autom4te.cache/requests 2008-06-30 11:49:38.000000000 -0400 @@ -0,0 +1,63 @@ +# This file was generated. +# It contains the lists of macros which have been traced. @@ -15899,15 +15899,15 @@ + ], 'Autom4te::Request' ) + ); + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.49/po/be.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.50/po/be.po --- nsapolicycoreutils/po/be.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/be.po 2008-06-27 07:00:09.000000000 -0400 ++++ policycoreutils-2.0.50/po/be.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19673,9 +19673,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.49/po/bg.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.50/po/bg.po --- nsapolicycoreutils/po/bg.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/bg.po 2008-06-27 07:00:09.000000000 -0400 ++++ policycoreutils-2.0.50/po/bg.po 2008-06-30 11:50:00.000000000 -0400 @@ -1,1028 +1,3877 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -19690,7 +19690,7 @@ +msgstr "" +"Project-Id-Version: policycoreutils\n" +"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" +"PO-Revision-Date: 2008-03-10 21:37+0100\n" +"Last-Translator: Alexander Todorov \n" +"Language-Team: Bulgarian \n" @@ -24322,15 +24322,15 @@ + +#~ msgid "You must be root to run %s." +#~ msgstr "???????????? ???? ?????? root ???? ???? ???????????????????? %s." -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.49/po/bn.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.50/po/bn.po --- nsapolicycoreutils/po/bn.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.49/po/bn.po 2008-06-27 07:00:09.000000000 -0400 ++++ policycoreutils-2.0.50/po/bn.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" [...8887 lines suppressed...] ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" +"PO-Revision-Date: 2008-01-27 19:18-0500\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -265425,9 +265349,9 @@ -msgstr "Flaggfel: %s " +#~ msgid "Options Error: %s " +#~ msgstr "Flaggfel: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.49/po/ta.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.50/po/ta.po --- nsapolicycoreutils/po/ta.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/ta.po 2008-06-27 07:00:14.000000000 -0400 ++++ policycoreutils-2.0.50/po/ta.po 2008-06-30 11:50:00.000000000 -0400 @@ -1,1043 +1,3363 @@ # translation of ta.po to Tamil # This file is distributed under the same license as the PACKAGE package. @@ -265444,7 +265368,7 @@ -"PO-Revision-Date: 2006-11-22 11:14+0530\n" -"Last-Translator: Felix \n" -"Language-Team: Tamil \n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" +"PO-Revision-Date: 2007-09-24 17:51+0530\n" +"Last-Translator: I felix \n" +"Language-Team: Tamil \n" @@ -269591,9 +269515,9 @@ +#~ msgstr "" +#~ "MLS/\n" +#~ "MCS ????????????" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.49/po/te.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.50/po/te.po --- nsapolicycoreutils/po/te.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/te.po 2008-06-27 07:00:14.000000000 -0400 ++++ policycoreutils-2.0.50/po/te.po 2008-06-30 11:50:00.000000000 -0400 @@ -1,1028 +1,3381 @@ -# SOME DESCRIPTIVE TITLE. +# translation of new_policycoreutils.HEAD.te.po to Telugu @@ -269606,7 +269530,7 @@ +msgstr "" +"Project-Id-Version: new_policycoreutils.HEAD.te\n" +"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" +"PO-Revision-Date: 2008-03-24 13:20+0530\n" +"Last-Translator: Krishna Babu K \n" +"Language-Team: Telugu \n" @@ -273747,15 +273671,15 @@ +#~ "?????????????????????\n" +#~ "????????????????????????\n" +#~ "????????????????????????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.49/po/th.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.50/po/th.po --- nsapolicycoreutils/po/th.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/th.po 2008-06-27 07:00:14.000000000 -0400 ++++ policycoreutils-2.0.50/po/th.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -277521,15 +277445,15 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.49/po/tr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.50/po/tr.po --- nsapolicycoreutils/po/tr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/tr.po 2008-06-27 07:00:14.000000000 -0400 ++++ policycoreutils-2.0.50/po/tr.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -281295,15 +281219,15 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.49/po/uk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.50/po/uk.po --- nsapolicycoreutils/po/uk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.49/po/uk.po 2008-06-27 07:00:15.000000000 -0400 ++++ policycoreutils-2.0.50/po/uk.po 2008-06-30 11:50:00.000000000 -0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: 2007-01-23 17:22+0300\n" "Last-Translator: Maxim Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -285345,15 +285269,15 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "?????????????? ?? ????????????????????: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.49/po/ur.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.50/po/ur.po --- nsapolicycoreutils/po/ur.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/ur.po 2008-06-27 07:00:15.000000000 -0400 ++++ policycoreutils-2.0.50/po/ur.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -289119,15 +289043,15 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.49/po/vi.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.50/po/vi.po --- nsapolicycoreutils/po/vi.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/vi.po 2008-06-27 07:00:15.000000000 -0400 ++++ policycoreutils-2.0.50/po/vi.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -292893,9 +292817,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.49/po/zh_CN.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.50/po/zh_CN.po --- nsapolicycoreutils/po/zh_CN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/zh_CN.po 2008-06-27 07:00:15.000000000 -0400 ++++ policycoreutils-2.0.50/po/zh_CN.po 2008-06-30 11:50:00.000000000 -0400 @@ -1,1045 +1,3343 @@ -# translation of zh_CN.po to -# translation of zh_CN.po to @@ -292921,7 +292845,7 @@ -"PO-Revision-Date: 2006-12-06 15:41+1000\n" -"Last-Translator: Tony Fu \n" -"Language-Team: \n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" +"PO-Revision-Date: 2008-03-26 10:11+1000\n" +"Last-Translator: Leah Liu \n" +"Language-Team: Simplified Chinese \n" @@ -296871,15 +296795,15 @@ +#~ "??????\n" +#~ "??????\n" +#~ "??????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.49/po/zh_TW.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.50/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/zh_TW.po 2008-06-27 07:00:15.000000000 -0400 ++++ policycoreutils-2.0.50/po/zh_TW.po 2008-06-30 11:50:00.000000000 -0400 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zh_TW\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: 2006-11-29 15:00+1000\n" "Last-Translator: Chester Cheng \n" "Language-Team: Chinese, Traditional \n" @@ -300913,15 +300837,15 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "???????????????%s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.49/po/zu.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.50/po/zu.po --- nsapolicycoreutils/po/zu.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/po/zu.po 2008-06-27 07:00:15.000000000 -0400 ++++ policycoreutils-2.0.50/po/zu.po 2008-06-30 11:50:00.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-27 06:55-0400\n" ++"POT-Creation-Date: 2008-06-30 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-rhat.patch,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- policycoreutils-rhat.patch 24 Jun 2008 10:17:29 -0000 1.367 +++ policycoreutils-rhat.patch 2 Jul 2008 02:08:03 -0000 1.368 @@ -1,56 +1,15 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.49/Makefile ---- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.49/Makefile 2008-06-23 07:03:37.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.50/Makefile +--- nsapolicycoreutils/Makefile 2007-12-19 06:02:52.000000000 -0500 ++++ policycoreutils-2.0.50/Makefile 2008-07-01 14:59:58.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.49/audit2allow/audit2allow ---- nsapolicycoreutils/audit2allow/audit2allow 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/audit2allow/audit2allow 2008-06-23 07:03:50.000000000 -0400 -@@ -152,12 +152,13 @@ - - def __process_input(self): - if self.__options.type: -- avcfilter = audit.TypeFilter(self.__options.type) -+ avcfilter = audit.AVCTypeFilter(self.__options.type) - self.__avs = self.__parser.to_access(avcfilter) -- self.__selinux_errs = self.__parser.to_role(avcfilter) -+ csfilter = audit.ComputeSidTypeFilter(self.__options.type) -+ self.__role_types = self.__parser.to_role(csfilter) - else: - self.__avs = self.__parser.to_access() -- self.__selinux_errs = self.__parser.to_role() -+ self.__role_types = self.__parser.to_role() - - def __load_interface_info(self): - # Load interface info file -@@ -310,6 +311,7 @@ - - # Generate the policy - g.add_access(self.__avs) -+ g.add_role_types(self.__role_types) - - # Output - writer = output.ModuleWriter() -@@ -328,12 +330,6 @@ - fd = sys.stdout - writer.write(g.get_module(), fd) - -- if len(self.__selinux_errs) > 0: -- fd.write("\n=========== ROLES ===============\n") -- -- for role in self.__selinux_errs: -- fd.write(role.output()) -- - def main(self): - try: - self.__parse_options() -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.49/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/restorecond/restorecond.c 2008-06-23 07:03:37.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.50/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2007-07-16 14:20:41.000000000 -0400 ++++ policycoreutils-2.0.50/restorecond/restorecond.c 2008-07-01 14:59:58.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -77,75 +36,9 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.49/restorecond/restorecond.init ---- nsapolicycoreutils/restorecond/restorecond.init 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/restorecond/restorecond.init 2008-06-23 07:03:37.000000000 -0400 -@@ -2,7 +2,7 @@ - # - # restorecond: Daemon used to maintain path file context - # --# chkconfig: 2345 12 87 -+# chkconfig: - 12 87 - # description: restorecond uses inotify to look for creation of new files \ - # listed in the /etc/selinux/restorecond.conf file, and restores the \ - # correct security context. -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.49/scripts/fixfiles ---- nsapolicycoreutils/scripts/fixfiles 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/scripts/fixfiles 2008-06-23 07:03:37.000000000 -0400 -@@ -138,6 +138,9 @@ - fi - LogReadOnly - ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE -+rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* -+find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \; -+find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \; - exit $? - } - -@@ -180,6 +183,10 @@ - check) restore -n -v;; - verify) restore -n -o -;; - relabel) relabel;; -+ onboot) -+ touch /.autorelabel -+ echo "System will relabel on next boot" -+ ;; - *) - usage - exit 1 -@@ -189,6 +196,7 @@ - echo $"Usage: $0 [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir] ... ] " - echo or - echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o outputfile ] { check | restore }" -+ echo $"Usage: $0 onboot" - } - - if [ $# = 0 ]; then -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.49/scripts/fixfiles.8 ---- nsapolicycoreutils/scripts/fixfiles.8 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/scripts/fixfiles.8 2008-06-23 07:03:37.000000000 -0400 -@@ -7,6 +7,8 @@ - - .B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ] - -+.B fixfiles onboot -+ - .SH "DESCRIPTION" - This manual page describes the - .BR fixfiles -@@ -20,6 +22,9 @@ - as you expect. By default it will relabel all mounted ext2, ext3, xfs and - jfs file systems as long as they do not have a security context mount - option. You can use the -R flag to use rpmpackages as an alternative. -+.P -+.B fixfiles onboot -+will setup the machine to relabel on the next reboot. - - .SH "OPTIONS" - .TP -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.49/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/semanage/semanage 2008-06-23 07:03:37.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.50/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2008-05-06 14:33:04.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/semanage 2008-07-01 20:31:40.000000000 -0400 @@ -43,49 +43,52 @@ if __name__ == '__main__': @@ -271,9 +164,18 @@ sys.exit(0); if modify: -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.49/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/semanage/semanage.8 2008-06-23 07:03:37.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.50/semanage/semanage.8 +--- nsapolicycoreutils/semanage/semanage.8 2008-05-06 14:33:04.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/semanage.8 2008-07-01 20:33:48.000000000 -0400 +@@ -3,7 +3,7 @@ + semanage \- SELinux Policy Management tool + + .SH "SYNOPSIS" +-.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|lC|D} [\-n] ++.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|D} [\-n] [\-S store] + .br + .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean + .br @@ -17,6 +17,8 @@ .br .B semanage fcontext \-{a|d|m} [\-frst] file_spec @@ -283,7 +185,17 @@ .B semanage translation \-{a|d|m} [\-T] level .P -@@ -101,10 +103,11 @@ +@@ -85,6 +87,9 @@ + .I \-s, \-\-seuser + SELinux user name + .TP ++.I \-S, \-\-store ++Select and alternate SELinux store to manage ++.TP + .I \-t, \-\-type + SELinux Type for the object + .TP +@@ -101,10 +106,11 @@ $ semanage fcontext -a -t httpd_sys_content_t "/web(/.*)?" # Allow Apache to listen on port 81 $ semanage port -a -t http_port_t -p tcp 81 @@ -296,9 +208,9 @@ Russell Coker . Examples by Thomas Bleher . - -diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.49/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.49/semanage/seobject.py 2008-06-23 07:03:37.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.50/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2008-05-16 10:55:38.000000000 -0400 ++++ policycoreutils-2.0.50/semanage/seobject.py 2008-07-01 20:30:55.000000000 -0400 @@ -1,5 +1,5 @@ #! /usr/bin/python -E -# Copyright (C) 2005, 2006, 2007 Red Hat @@ -316,7 +228,7 @@ import gettext gettext.bindtextdomain(PROGNAME, "/usr/share/locale") gettext.textdomain(PROGNAME) -@@ -246,7 +248,67 @@ +@@ -246,7 +248,103 @@ os.close(fd) os.rename(newfilename, self.filename) os.system("/sbin/service mcstrans reload > /dev/null") @@ -325,13 +237,40 @@ +class permissiveRecords: + def __init__(self, store): + self.store = store ++ self.sh = semanage_handle_create() ++ if not self.sh: ++ raise ValueError(_("Could not create semanage handle")) ++ ++ if store != "": ++ semanage_select_store(self.sh, store, SEMANAGE_CON_DIRECT); ++ ++ self.semanaged = semanage_is_managed(self.sh) ++ ++ if not self.semanaged: ++ semanage_handle_destroy(self.sh) ++ raise ValueError(_("SELinux policy is not managed or store cannot be accessed.")) ++ ++ rc = semanage_access_check(self.sh) ++ if rc < SEMANAGE_CAN_READ: ++ semanage_handle_destroy(self.sh) ++ raise ValueError(_("Cannot read policy store.")) ++ ++ rc = semanage_connect(self.sh) ++ if rc < 0: ++ semanage_handle_destroy(self.sh) ++ raise ValueError(_("Could not establish semanage connection")) + + def get_all(self): -+ rc, out = commands.getstatusoutput("semodule -l | grep ^permissive"); + l = [] -+ for i in out.split(): -+ if i.startswith("permissive_"): -+ l.append(i.split("permissive_")[1]) ++ (rc, mlist, number) = semanage_module_list(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not list SELinux modules")) ++ ++ for i in range(number): ++ mod = semanage_module_list_nth(mlist, i) ++ name = semanage_module_get_name(mod) ++ if name and name.startswith("permissive_"): ++ l.append(name.split("permissive_")[1]) + return l + + def list(self,heading = 1, locallist = 0): @@ -360,8 +299,15 @@ + fd.close() + mc = module.ModuleCompiler() + mc.create_module_package(filename, 1) -+ rc, out = commands.getstatusoutput("semodule -i permissive_%s.pp" % type); -+ for root, dirs, files in os.walk("top", topdown=False): ++ fd = open("permissive_%s.pp" % type) ++ data = fd.read() ++ fd.close() ++ ++ rc = semanage_module_install(self.sh, data, len(data)); ++ rc = semanage_commit(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not set permissive domain %s") % name) ++ for root, dirs, files in os.walk("tmp", topdown=False): + for name in files: + os.remove(os.path.join(root, name)) + for name in dirs: @@ -372,20 +318,22 @@ + + + def delete(self, name): -+ rc, out = commands.getstatusoutput("semodule -r permissive_%s" % name ); -+ if rc != 0: -+ raise ValueError(out) ++ for n in name.split(): ++ rc = semanage_module_remove(self.sh, "permissive_%s" % n) ++ rc = semanage_commit(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not remove permissive domain %s") % name) + + def deleteall(self): + l = self.get_all() + if len(l) > 0: -+ all = " permissive_".join(l) ++ all = " ".join(l) + self.delete(all) + class semanageRecords: def __init__(self, store): self.sh = semanage_handle_create() -@@ -464,7 +526,7 @@ +@@ -464,7 +562,7 @@ def __init__(self, store = ""): semanageRecords.__init__(self, store) policycoreutils-sepolgen.patch: Index: policycoreutils-sepolgen.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-sepolgen.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- policycoreutils-sepolgen.patch 24 Jun 2008 10:17:29 -0000 1.12 +++ policycoreutils-sepolgen.patch 2 Jul 2008 02:08:03 -0000 1.13 @@ -1,195 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/access.py ---- nsasepolgen/src/sepolgen/access.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/access.py 2008-06-23 07:04:21.000000000 -0400 -@@ -295,3 +295,32 @@ - perms[av.obj_class] = s - s.update(av.perms) - return perms -+ -+class RoleTypeSet: -+ """A non-overlapping set of role type statements. -+ -+ This clas allows the incremental addition of role type statements and -+ maintains a non-overlapping list of statements. -+ """ -+ def __init__(self): -+ """Initialize an access vector set.""" -+ self.role_types = {} -+ -+ def __iter__(self): -+ """Iterate over all of the unique role allows statements in the set.""" -+ for role_type in self.role_types.values(): -+ yield role_type -+ -+ def __len__(self): -+ """Return the unique number of role allow statements.""" -+ return len(self.roles) -+ -+ def add(self, role, type): -+ if self.role_types.has_key(role): -+ role_type = self.role_types[role] -+ else: -+ role_type = refpolicy.RoleType() -+ role_type.role = role -+ self.role_types[role] = role_type -+ -+ role_type.types.add(type) -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/audit.py ---- nsasepolgen/src/sepolgen/audit.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/audit.py 2008-06-23 07:05:23.000000000 -0400 -@@ -235,20 +235,21 @@ - """ - def __init__(self, message): - AuditMessage.__init__(self, message) -- self.type = "" -- self.role = "" -+ self.invalid_context = refpolicy.SecurityContext() -+ self.scontext = refpolicy.SecurityContext() -+ self.tcontext = refpolicy.SecurityContext() -+ self.tclass = "" - - def from_split_string(self, recs): - AuditMessage.from_split_string(self, recs) -- dict={} -- for i in recs: -- t = i.split('=') -- if len(t) < 2: -- continue -- dict[t[0]]=t[1] -+ if len(recs) < 10: -+ raise ValueError("Split string does not represent a valid compute sid message") -+ - try: -- self.role = refpolicy.SecurityContext(dict["scontext"]).role -- self.type = refpolicy.SecurityContext(dict["tcontext"]).type -+ self.invalid_context = refpolicy.SecurityContext(recs[5]) -+ self.scontext = refpolicy.SecurityContext(recs[7].split("=")[1]) -+ self.tcontext = refpolicy.SecurityContext(recs[8].split("=")[1]) -+ self.tclass = recs[9].split("=")[1] - except: - raise ValueError("Split string does not represent a valid compute sid message") - def output(self): -@@ -405,7 +406,7 @@ - self.__post_process() - - def to_role(self, role_filter=None): -- """Return list of SELINUX_ERR messages matching the specified filter -+ """Return RoleAllowSet statements matching the specified filter - - Filter out types that match the filer, or all roles - -@@ -416,13 +417,12 @@ - Access vector set representing the denied access in the - audit logs parsed by this object. - """ -- roles = [] -- if role_filter: -- for selinux_err in self.compute_sid_msgs: -- if role_filter.filter(selinux_err): -- roles.append(selinux_err) -- return roles -- return self.compute_sid_msgs -+ role_types = access.RoleTypeSet() -+ for cs in self.compute_sid_msgs: -+ if not role_filter or role_filter.filter(cs): -+ role_types.add(cs.invalid_context.role, cs.invalid_context.type) -+ -+ return role_types - - def to_access(self, avc_filter=None, only_denials=True): - """Convert the audit logs access into a an access vector set. -@@ -454,7 +454,7 @@ - avc.accesses, avc) - return av_set - --class TypeFilter: -+class AVCTypeFilter: - def __init__(self, regex): - self.regex = re.compile(regex) - -@@ -465,4 +465,17 @@ - return True - return False - -+class ComputeSidTypeFilter: -+ def __init__(self, regex): -+ self.regex = re.compile(regex) -+ -+ def filter(self, avc): -+ if self.regex.match(avc.invalid_context.type): -+ return True -+ if self.regex.match(avc.scontext.type): -+ return True -+ if self.regex.match(avc.tcontext.type): -+ return True -+ return False -+ - -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/output.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/output.py ---- nsasepolgen/src/sepolgen/output.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/output.py 2008-06-23 07:04:31.000000000 -0400 -@@ -101,6 +101,8 @@ - else: - return id_set_cmp(a.src_types, [b.args[0]]) - -+def role_type_cmp(a, b): -+ return cmp(a.role, b.role) - - def sort_filter(module): - """Sort and group the output for readability. -@@ -146,6 +148,18 @@ - - c.extend(sep_rules) - -+ -+ ras = [] -+ ras.extend(node.role_types()) -+ ras.sort(role_type_cmp) -+ if len(ras): -+ comment = refpolicy.Comment() -+ comment.lines.append("============= ROLES ==============") -+ c.append(comment) -+ -+ -+ c.extend(ras) -+ - # Everything else - for child in node.children: - if child not in c: -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/policygen.py ---- nsasepolgen/src/sepolgen/policygen.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/policygen.py 2008-06-23 07:04:36.000000000 -0400 -@@ -167,6 +167,13 @@ - if self.gen_requires: - gen_requires(self.module) - -+ def add_role_types(self, role_type_set): -+ for role_type in role_type_set: -+ self.module.children.append(role_type) -+ -+ # Generate the requires -+ if self.gen_requires: -+ gen_requires(self.module) - - def explain_access(av, ml=None, verbosity=SHORT_EXPLANATION): - """Explain why a policy statement was generated. -@@ -334,8 +341,12 @@ - # can actually figure those out. - r.types.add(arg) - -- r.types.discard("self") -+ for role_type in node.role_types(): -+ r.roles.add(role_type.role) -+ r.types.update(role_type.types) - -+ r.types.discard("self") -+ - node.children.insert(0, r) - - # FUTURE - this is untested on modules with any sort of -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refparser.py +diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.49/sepolgen-1.0.12/src/sepolgen/refparser.py --- nsasepolgen/src/sepolgen/refparser.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refparser.py 2008-06-23 07:05:23.000000000 -0400 ++++ policycoreutils-2.0.49/sepolgen-1.0.12/src/sepolgen/refparser.py 2008-06-27 07:21:06.000000000 -0400 @@ -919,7 +919,7 @@ def list_headers(root): modules = [] @@ -199,35 +10,3 @@ for dirpath, dirnames, filenames in os.walk(root): for name in filenames: -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refpolicy.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refpolicy.py ---- nsasepolgen/src/sepolgen/refpolicy.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refpolicy.py 2008-06-23 07:04:47.000000000 -0400 -@@ -122,6 +122,12 @@ - def roles(self): - return itertools.ifilter(lambda x: isinstance(x, Role), walktree(self)) - -+ def role_allows(self): -+ return itertools.ifilter(lambda x: isinstance(x, RoleAllow), walktree(self)) -+ -+ def role_types(self): -+ return itertools.ifilter(lambda x: isinstance(x, RoleType), walktree(self)) -+ - def __str__(self): - if self.comment: - return str(self.comment) + "\n" + self.to_string() -@@ -494,6 +500,15 @@ - return "allow %s %s;" % (self.src_roles.to_comma_str(), - self.tgt_roles.to_comma_str()) - -+class RoleType(Leaf): -+ def __init__(self, parent=None): -+ Leaf.__init__(self, parent) -+ self.role = "" -+ self.types = IdSet() -+ -+ def to_string(self): -+ return "role %s types %s;" % (self.role, self.types.to_comma_str()) -+ - class ModuleDeclaration(Leaf): - def __init__(self, parent=None): - Leaf.__init__(self, parent) Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils.spec,v retrieving revision 1.526 retrieving revision 1.527 diff -u -r1.526 -r1.527 --- policycoreutils.spec 27 Jun 2008 11:04:22 -0000 1.526 +++ policycoreutils.spec 2 Jul 2008 02:08:03 -0000 1.527 @@ -2,11 +2,11 @@ %define libsepolver 2.0.19-1 %define libsemanagever 2.0.5-1 %define libselinuxver 2.0.46-5 -%define sepolgenver 1.0.11 +%define sepolgenver 1.0.12 Summary: SELinux policy core utilities Name: policycoreutils -Version: 2.0.49 -Release: 10%{?dist} +Version: 2.0.51 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -112,6 +112,7 @@ Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas Requires: usermode Requires: setools-console +Requires: selinux-policy-devel Requires: python >= 2.4 BuildRequires: desktop-file-utils @@ -191,6 +192,14 @@ fi %changelog +* Tue Jul 1 2008 Dan Walsh 2.0.50-2 +- Remove semodule use within semanage +- Fix launching of polgengui from toolbar + +* Mon Jun 30 2008 Dan Walsh 2.0.50-1 +- Update to upstream + * Fix audit2allow generation of role-type rules from Karl MacMillan. + * Tue Jun 24 2008 Dan Walsh 2.0.49-10 - Fix spelling of enforcement Index: sources =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/sources,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- sources 22 May 2008 18:08:33 -0000 1.186 +++ sources 2 Jul 2008 02:08:03 -0000 1.187 @@ -1,2 +1,2 @@ -3fed5cd04ee67c0f86e3cc6825261819 sepolgen-1.0.11.tgz -2a4121369b3d63dddd4cdf8d3fb9ef84 policycoreutils-2.0.49.tgz +4813a1ed80f19068ed9897165f073e8b sepolgen-1.0.12.tgz +9189683c9449c459ad5d7870d9e22085 policycoreutils-2.0.51.tgz From fedora-extras-commits at redhat.com Wed Jul 2 02:14:06 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 2 Jul 2008 02:14:06 GMT Subject: rpms/kernel/F-9 kernel.spec,1.698,1.699 Message-ID: <200807020214.m622E6Lf007488@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459 Modified Files: kernel.spec Log Message: Shorten summary in specfile. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.698 retrieving revision 1.699 diff -u -r1.698 -r1.699 --- kernel.spec 1 Jul 2008 18:42:13 -0000 1.698 +++ kernel.spec 2 Jul 2008 02:13:21 -0000 1.699 @@ -1,4 +1,4 @@ -Summary: The Linux kernel (the core of the Linux operating system) +Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should @@ -1861,6 +1861,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Tue Jul 01 2008 Dave Jones +- Shorten summary in specfile. + * Mon Jun 30 2008 John W. Linville 2.6.25.9-79 - Upstream wireless fixes from 2008-06-30 (http://marc.info/?l=linux-wireless&m=121485709702728&w=2) From fedora-extras-commits at redhat.com Wed Jul 2 02:15:31 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 2 Jul 2008 02:15:31 GMT Subject: rpms/kernel/devel kernel.spec,1.726,1.727 Message-ID: <200807020215.m622FVRY007539@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7505 Modified Files: kernel.spec Log Message: * Tue Jul 01 2008 John W. Linville Upstream wireless fixes from 2008-06-30 (http://marc.info/?l=linux-wireless&m=121485709702728&w=2) Upstream wireless updates from 2008-06-30 (http://marc.info/?l=linux-wireless&m=121486432315033&w=2) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- kernel.spec 1 Jul 2008 15:29:57 -0000 1.726 +++ kernel.spec 2 Jul 2008 02:14:45 -0000 1.727 @@ -1,4 +1,4 @@ -Summary: The Linux kernel (the core of the Linux operating system) +Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should @@ -1795,6 +1795,9 @@ (http://marc.info/?l=linux-wireless&m=121486432315033&w=2) * Tue Jul 01 2008 Dave Jones +- Shorten summary in specfile. + +* Tue Jul 01 2008 Dave Jones - 2.6.26-rc8-git2 * Mon Jun 30 2008 Chuck Ebbert From fedora-extras-commits at redhat.com Wed Jul 2 02:16:08 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 2 Jul 2008 02:16:08 GMT Subject: rpms/kernel/F-8 kernel.spec,1.480,1.481 Message-ID: <200807020216.m622G8RC007570@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7534 Modified Files: kernel.spec Log Message: Shorten summary in specfile. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.480 retrieving revision 1.481 diff -u -r1.480 -r1.481 --- kernel.spec 27 Jun 2008 19:43:50 -0000 1.480 +++ kernel.spec 2 Jul 2008 02:15:06 -0000 1.481 @@ -1,4 +1,4 @@ -Summary: The Linux kernel (the core of the Linux operating system) +Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should @@ -1824,6 +1824,9 @@ %changelog +* Tue Jul 01 2008 Dave Jones +- Shorten summary in specfile. + * Fri Jun 27 2008 John W. Linville 2.6.25.9-39 - Upstream wireless fixes from 2008-06-27 (http://marc.info/?l=linux-wireless&m=121459423021061&w=2) From fedora-extras-commits at redhat.com Wed Jul 2 02:44:57 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?= (tibbs)) Date: Wed, 2 Jul 2008 02:44:57 GMT Subject: rpms/denyhosts/devel denyhosts-2.6-defconffile.patch, NONE, 1.1 denyhosts.init, 1.8, 1.9 denyhosts.spec, 1.47, 1.48 denyhosts.sysconfig, 1.2, 1.3 Message-ID: <200807020244.m622ivF8008324@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8277 Modified Files: denyhosts.init denyhosts.spec denyhosts.sysconfig Added Files: denyhosts-2.6-defconffile.patch Log Message: * Tue Jul 01 2008 Jason L Tibbitts III - 2.6-10 - Fix initscript lockfile handling: Stop creating the lockfile in the initscript. Clean up stray lockfiles automatically. Don't attempt to start the daemon if its already running. - Various initscript cleanups. - Set default configuration file location to match what we use. - Make it easier to add extra options like --debug from the sysconfig file. denyhosts-2.6-defconffile.patch: --- NEW FILE denyhosts-2.6-defconffile.patch --- diff -up ./DenyHosts/constants.py.defconffile ./DenyHosts/constants.py --- ./DenyHosts/constants.py.defconffile 2008-07-01 18:12:34.000000000 -0500 +++ ./DenyHosts/constants.py 2008-07-01 18:12:43.000000000 -0500 @@ -36,7 +36,7 @@ PURGE_HISTORY = "purge-history" # Miscellaneous constants # ################################################################################# -CONFIG_FILE = "denyhosts.cfg" # default can be overridden on cmd line +CONFIG_FILE = "/etc/denyhosts.conf" # default can be overridden on cmd line DENY_DELIMITER = "# DenyHosts:" ENTRY_DELIMITER = " | " Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- denyhosts.init 3 Jan 2008 19:32:36 -0000 1.8 +++ denyhosts.init 2 Jul 2008 02:43:51 -0000 1.9 @@ -5,13 +5,13 @@ # /etc/sysconfig/denyhosts # # Author: Seth Vidal (original script) -# Jason Tibbitts (denyhost changes) +# Jason Tibbitts (denyhost changes) # -# chkconfig: - 50 01 +# chkconfig: - 50 01 # # description: Enable execution of denyhosts, an SSH log watcher -# processname denyhosts -# config: /etc/denyhosts.cfg +# processname: denyhosts +# config: /etc/denyhosts.cfg # ### BEGIN INIT INFO # Provides: denyhosts @@ -74,42 +74,51 @@ c_status() { if [ -f $CRONLOCK ]; then - echo $"denyhosts cron service is enabled." - RETVAL=0 + echo $"denyhosts cron service is enabled." + RETVAL=0 else - echo $"denyhosts cron service is disabled." - RETVAL=3 + echo $"denyhosts cron service is disabled." + RETVAL=3 fi } # daemon service functions d_start() { echo -n $"Starting denyhosts: " - daemon $DHOSTS $DOPTS - RETVAL=$? + + # There may be a stray lockfile; clean it up. + status -p $LOCKFILE $DHOSTS &> /dev/null + STATUS=$? + if [ $STATUS -eq 0 ]; then + echo -n $"Denyhosts already running." + failure + RETVAL=0 + else + if [ $STATUS -eq 1 ]; then + echo -n $"Stray lockfile present; removing it." + rm -f $LOCKFILE + fi + daemon $DHOSTS $DOPTS $EXTRA_OPTIONS + RETVAL=$? + fi echo - [ $RETVAL -eq 0 ] && touch $LOCKFILE } d_stop() { echo -n $"Stopping denyhosts: " - # Some magic here since older versions stored the PID in the lockfile - # instead of using a separate PID file - # So if the lockfile has nonzero length, we use it as the PID file - if [ -n $LOCKFILE ]; then + if [ -f $LOCKFILE ]; then killproc -p $LOCKFILE $DHOSTS RETVAL=$? - else - killproc $DHOSTS - RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE fi - echo - [ $RETVAL -eq 0 ] && rm -f $LOCKFILE } +# Upstream's control script sleeps here; copy that behavior just in case. d_restart() { d_stop + sleep 1; d_start } @@ -118,7 +127,7 @@ } d_status() { - status $DHOSTS + status -p $LOCKFILE $DHOSTS RETVAL=$? } Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- denyhosts.spec 4 Jan 2008 17:54:14 -0000 1.47 +++ denyhosts.spec 2 Jul 2008 02:43:51 -0000 1.48 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -16,6 +16,7 @@ Patch0: denyhosts-2.6-config.patch Patch1: denyhosts-2.4-setup.patch Patch2: denyhosts-2.2-daemon-control.patch +Patch3: denyhosts-2.6-defconffile.patch # Patch10 is a security fix Patch10: denyhosts-2.6-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +43,7 @@ %patch0 -p0 -b .config %patch1 -p0 -b .setup %patch2 -p0 -b .daemon-control +%patch3 -p0 -b .defconffile %patch10 -p1 -b .regex cp %{SOURCE6} . @@ -156,6 +158,15 @@ %changelog +* Tue Jul 01 2008 Jason L Tibbitts III - 2.6-10 +- Fix initscript lockfile handling: + Stop creating the lockfile in the initscript. + Clean up stray lockfiles automatically. + Don't attempt to start the daemon if its already running. +- Various initscript cleanups. +- Set default configuration file location to match what we use. +- Make it easier to add extra options like --debug from the sysconfig file. + * Fri Jan 04 2008 Jason L Tibbitts III - 2.6-9 - Properly escape percent symbols in the changelog entries. Index: denyhosts.sysconfig =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.sysconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.sysconfig 16 Aug 2005 03:30:56 -0000 1.2 +++ denyhosts.sysconfig 2 Jul 2008 02:43:51 -0000 1.3 @@ -2,3 +2,8 @@ # If not set to "yes", you also need to edit /etc/cron.d/denyhosts # and uncomment the appropriate lines. DAEMON=yes + +# Set EXTRA_OPTIONS to pass additional settings to denyhosts when run in daemon +# mode. +# For example, uncomment the following line to enable additional debugging. +#EXTRA_OPTIONS="--debug" From fedora-extras-commits at redhat.com Wed Jul 2 02:46:38 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 2 Jul 2008 02:46:38 GMT Subject: rpms/glib2/F-9 .cvsignore, 1.87, 1.88 glib2.spec, 1.169, 1.170 sources, 1.89, 1.90 Message-ID: <200807020246.m622kcXd008505@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8358 Modified Files: .cvsignore glib2.spec sources Log Message: 2.16.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glib2/F-9/.cvsignore,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- .cvsignore 8 Apr 2008 05:12:37 -0000 1.87 +++ .cvsignore 2 Jul 2008 02:45:48 -0000 1.88 @@ -1 +1 @@ -glib-2.16.3.tar.bz2 +glib-2.16.4.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/F-9/glib2.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- glib2.spec 17 Jun 2008 03:43:07 -0000 1.169 +++ glib2.spec 2 Jul 2008 02:45:48 -0000 1.170 @@ -2,8 +2,8 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.16.3 -Release: 7%{?dist} +Version: 2.16.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -19,22 +19,9 @@ # for sys/inotify.h BuildRequires: glibc-devel -# fix a possible crasher, http://bugzilla.gnome.org/show_bug.cgi?id=527132 -Patch0: appinfo.patch - -# revert a broken fix for http://bugzilla.gnome.org/show_bug.cgi?id=316221 -# committed on March 12, 2008 -Patch1: revert-316221.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=442835 Patch2: gio-2.16-only-pass-uri-to-gio-apps.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=526320 -Patch3: glib-2.16.3-ignore-inaccessible-mounts.patch - -# fixed upstream -Patch4: class-init-race.patch - %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure @@ -66,11 +53,7 @@ %prep %setup -q -n glib-%{version} -%patch0 -p1 -b .appinfo -%patch1 -R -p1 -b .revert-316221 %patch2 -p0 -b .only-pass-uri-to-gio-apps -%patch3 -p0 -b .ignore-inaccessible-mounts -%patch4 -p1 -b .class-init-race %build %configure --disable-gtk-doc --enable-static @@ -145,6 +128,9 @@ %{_libdir}/lib*.a %changelog +* Tue Jul 1 2008 Matthias Clasen - 2.16.4-1 +- Update to 2.16.4 + * Mon Jun 16 2008 Matthias Clasen - 2.16.3-7 - Fix a directory ownership oversight (#449885) Index: sources =================================================================== RCS file: /cvs/extras/rpms/glib2/F-9/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 8 Apr 2008 05:12:37 -0000 1.89 +++ sources 2 Jul 2008 02:45:48 -0000 1.90 @@ -1 +1 @@ -195f9a803cc5279dbb39afdf985f44cb glib-2.16.3.tar.bz2 +2ab79b3c93258827cc6ea8ee50128e49 glib-2.16.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 02:47:07 2008 From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot)) Date: Wed, 2 Jul 2008 02:47:07 GMT Subject: rpms/pidgin/F-9 .cvsignore, 1.16, 1.17 pidgin.spec, 1.52, 1.53 sources, 1.16, 1.17 Message-ID: <200807020247.m622l7CN008564@cvs-int.fedora.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8343/F-9 Modified Files: .cvsignore pidgin.spec sources Log Message: Pidgin 2.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 May 2008 14:55:17 -0000 1.16 +++ .cvsignore 2 Jul 2008 02:46:19 -0000 1.17 @@ -1 +1 @@ -pidgin-2.4.2.tar.bz2 +pidgin-2.4.3.tar.bz2 Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- pidgin.spec 17 May 2008 14:55:17 -0000 1.52 +++ pidgin.spec 2 Jul 2008 02:46:19 -0000 1.53 @@ -24,11 +24,11 @@ %define meanwhile_integration 1 # OPTION: Perl devel separated out (F7+) %define perl_devel_separated 1 -# OPTION: Perl embed separated out (F9+) +# OPTION: Perl embed separated out (F8+) %define perl_embed_separated 1 Name: pidgin -Version: 2.4.2 +Version: 2.4.3 Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls @@ -501,6 +501,9 @@ %changelog +* Tue Jul 01 2008 Stu Tomlinson 2.4.3-1 +- 2.4.3 + * Sat May 17 2008 Stu Tomlinson 2.4.2-1 - 2.4.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 17 May 2008 14:55:17 -0000 1.16 +++ sources 2 Jul 2008 02:46:19 -0000 1.17 @@ -1 +1 @@ -2d10f9b6a5f0162cf88016ea2ca0a36d pidgin-2.4.2.tar.bz2 +9e4a5f4ebda16a51fe91ec610286810a pidgin-2.4.3.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 02:47:19 2008 From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot)) Date: Wed, 2 Jul 2008 02:47:19 GMT Subject: rpms/pidgin/F-8 .cvsignore, 1.16, 1.17 pidgin.spec, 1.46, 1.47 sources, 1.16, 1.17 Message-ID: <200807020247.m622lJfT008575@cvs-int.fedora.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8343/F-8 Modified Files: .cvsignore pidgin.spec sources Log Message: Pidgin 2.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-8/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 May 2008 14:55:01 -0000 1.16 +++ .cvsignore 2 Jul 2008 02:45:53 -0000 1.17 @@ -1 +1 @@ -pidgin-2.4.2.tar.bz2 +pidgin-2.4.3.tar.bz2 Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-8/pidgin.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- pidgin.spec 17 May 2008 14:55:01 -0000 1.46 +++ pidgin.spec 2 Jul 2008 02:45:53 -0000 1.47 @@ -24,11 +24,11 @@ %define meanwhile_integration 1 # OPTION: Perl devel separated out (F7+) %define perl_devel_separated 1 -# OPTION: Perl embed separated out (F9+) +# OPTION: Perl embed separated out (F8+) %define perl_embed_separated 1 Name: pidgin -Version: 2.4.2 +Version: 2.4.3 Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls @@ -501,6 +501,9 @@ %changelog +* Tue Jul 01 2008 Stu Tomlinson 2.4.3-1 +- 2.4.3 + * Sat May 17 2008 Stu Tomlinson 2.4.2-1 - 2.4.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 17 May 2008 14:55:01 -0000 1.16 +++ sources 2 Jul 2008 02:45:53 -0000 1.17 @@ -1 +1 @@ -2d10f9b6a5f0162cf88016ea2ca0a36d pidgin-2.4.2.tar.bz2 +9e4a5f4ebda16a51fe91ec610286810a pidgin-2.4.3.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 02:47:28 2008 From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot)) Date: Wed, 2 Jul 2008 02:47:28 GMT Subject: rpms/pidgin/devel .cvsignore, 1.16, 1.17 pidgin.spec, 1.53, 1.54 sources, 1.16, 1.17 Message-ID: <200807020247.m622lS2U008582@cvs-int.fedora.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8343/devel Modified Files: .cvsignore pidgin.spec sources Log Message: Pidgin 2.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 May 2008 14:55:32 -0000 1.16 +++ .cvsignore 2 Jul 2008 02:46:38 -0000 1.17 @@ -1 +1 @@ -pidgin-2.4.2.tar.bz2 +pidgin-2.4.3.tar.bz2 Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- pidgin.spec 17 May 2008 14:55:32 -0000 1.53 +++ pidgin.spec 2 Jul 2008 02:46:38 -0000 1.54 @@ -24,11 +24,11 @@ %define meanwhile_integration 1 # OPTION: Perl devel separated out (F7+) %define perl_devel_separated 1 -# OPTION: Perl embed separated out (F9+) +# OPTION: Perl embed separated out (F8+) %define perl_embed_separated 1 Name: pidgin -Version: 2.4.2 +Version: 2.4.3 Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls @@ -501,6 +501,9 @@ %changelog +* Tue Jul 01 2008 Stu Tomlinson 2.4.3-1 +- 2.4.3 + * Sat May 17 2008 Stu Tomlinson 2.4.2-1 - 2.4.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 17 May 2008 14:55:32 -0000 1.16 +++ sources 2 Jul 2008 02:46:38 -0000 1.17 @@ -1 +1 @@ -2d10f9b6a5f0162cf88016ea2ca0a36d pidgin-2.4.2.tar.bz2 +9e4a5f4ebda16a51fe91ec610286810a pidgin-2.4.3.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 03:27:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?= (tibbs)) Date: Wed, 2 Jul 2008 03:27:32 GMT Subject: rpms/denyhosts/F-9 denyhosts-2.6-defconffile.patch, NONE, 1.1 denyhosts.init, 1.8, 1.9 denyhosts.spec, 1.47, 1.48 denyhosts.sysconfig, 1.2, 1.3 Message-ID: <200807020327.m623RWYc015994@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15949 Modified Files: denyhosts.init denyhosts.spec denyhosts.sysconfig Added Files: denyhosts-2.6-defconffile.patch Log Message: * Tue Jul 01 2008 Jason L Tibbitts III - 2.6-10 - Fix initscript lockfile handling: Stop creating the lockfile in the initscript. Clean up stray lockfiles automatically. Don't attempt to start the daemon if its already running. - Various initscript cleanups. - Set default configuration file location to match what we use. - Make it easier to add extra options like --debug from the sysconfig file. denyhosts-2.6-defconffile.patch: --- NEW FILE denyhosts-2.6-defconffile.patch --- diff -up ./DenyHosts/constants.py.defconffile ./DenyHosts/constants.py --- ./DenyHosts/constants.py.defconffile 2008-07-01 18:12:34.000000000 -0500 +++ ./DenyHosts/constants.py 2008-07-01 18:12:43.000000000 -0500 @@ -36,7 +36,7 @@ PURGE_HISTORY = "purge-history" # Miscellaneous constants # ################################################################################# -CONFIG_FILE = "denyhosts.cfg" # default can be overridden on cmd line +CONFIG_FILE = "/etc/denyhosts.conf" # default can be overridden on cmd line DENY_DELIMITER = "# DenyHosts:" ENTRY_DELIMITER = " | " Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/F-9/denyhosts.init,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- denyhosts.init 3 Jan 2008 19:32:36 -0000 1.8 +++ denyhosts.init 2 Jul 2008 03:25:35 -0000 1.9 @@ -5,13 +5,13 @@ # /etc/sysconfig/denyhosts # # Author: Seth Vidal (original script) -# Jason Tibbitts (denyhost changes) +# Jason Tibbitts (denyhost changes) # -# chkconfig: - 50 01 +# chkconfig: - 50 01 # # description: Enable execution of denyhosts, an SSH log watcher -# processname denyhosts -# config: /etc/denyhosts.cfg +# processname: denyhosts +# config: /etc/denyhosts.cfg # ### BEGIN INIT INFO # Provides: denyhosts @@ -74,42 +74,51 @@ c_status() { if [ -f $CRONLOCK ]; then - echo $"denyhosts cron service is enabled." - RETVAL=0 + echo $"denyhosts cron service is enabled." + RETVAL=0 else - echo $"denyhosts cron service is disabled." - RETVAL=3 + echo $"denyhosts cron service is disabled." + RETVAL=3 fi } # daemon service functions d_start() { echo -n $"Starting denyhosts: " - daemon $DHOSTS $DOPTS - RETVAL=$? + + # There may be a stray lockfile; clean it up. + status -p $LOCKFILE $DHOSTS &> /dev/null + STATUS=$? + if [ $STATUS -eq 0 ]; then + echo -n $"Denyhosts already running." + failure + RETVAL=0 + else + if [ $STATUS -eq 1 ]; then + echo -n $"Stray lockfile present; removing it." + rm -f $LOCKFILE + fi + daemon $DHOSTS $DOPTS $EXTRA_OPTIONS + RETVAL=$? + fi echo - [ $RETVAL -eq 0 ] && touch $LOCKFILE } d_stop() { echo -n $"Stopping denyhosts: " - # Some magic here since older versions stored the PID in the lockfile - # instead of using a separate PID file - # So if the lockfile has nonzero length, we use it as the PID file - if [ -n $LOCKFILE ]; then + if [ -f $LOCKFILE ]; then killproc -p $LOCKFILE $DHOSTS RETVAL=$? - else - killproc $DHOSTS - RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE fi - echo - [ $RETVAL -eq 0 ] && rm -f $LOCKFILE } +# Upstream's control script sleeps here; copy that behavior just in case. d_restart() { d_stop + sleep 1; d_start } @@ -118,7 +127,7 @@ } d_status() { - status $DHOSTS + status -p $LOCKFILE $DHOSTS RETVAL=$? } Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/F-9/denyhosts.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- denyhosts.spec 4 Jan 2008 17:54:14 -0000 1.47 +++ denyhosts.spec 2 Jul 2008 03:25:35 -0000 1.48 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -16,6 +16,7 @@ Patch0: denyhosts-2.6-config.patch Patch1: denyhosts-2.4-setup.patch Patch2: denyhosts-2.2-daemon-control.patch +Patch3: denyhosts-2.6-defconffile.patch # Patch10 is a security fix Patch10: denyhosts-2.6-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +43,7 @@ %patch0 -p0 -b .config %patch1 -p0 -b .setup %patch2 -p0 -b .daemon-control +%patch3 -p0 -b .defconffile %patch10 -p1 -b .regex cp %{SOURCE6} . @@ -156,6 +158,15 @@ %changelog +* Tue Jul 01 2008 Jason L Tibbitts III - 2.6-10 +- Fix initscript lockfile handling: + Stop creating the lockfile in the initscript. + Clean up stray lockfiles automatically. + Don't attempt to start the daemon if its already running. +- Various initscript cleanups. +- Set default configuration file location to match what we use. +- Make it easier to add extra options like --debug from the sysconfig file. + * Fri Jan 04 2008 Jason L Tibbitts III - 2.6-9 - Properly escape percent symbols in the changelog entries. Index: denyhosts.sysconfig =================================================================== RCS file: /cvs/extras/rpms/denyhosts/F-9/denyhosts.sysconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.sysconfig 16 Aug 2005 03:30:56 -0000 1.2 +++ denyhosts.sysconfig 2 Jul 2008 03:25:35 -0000 1.3 @@ -2,3 +2,8 @@ # If not set to "yes", you also need to edit /etc/cron.d/denyhosts # and uncomment the appropriate lines. DAEMON=yes + +# Set EXTRA_OPTIONS to pass additional settings to denyhosts when run in daemon +# mode. +# For example, uncomment the following line to enable additional debugging. +#EXTRA_OPTIONS="--debug" From fedora-extras-commits at redhat.com Wed Jul 2 03:45:11 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?= (tibbs)) Date: Wed, 2 Jul 2008 03:45:11 GMT Subject: rpms/denyhosts/F-8 denyhosts-2.6-defconffile.patch, NONE, 1.1 denyhosts.init, 1.7, 1.8 denyhosts.spec, 1.45, 1.46 denyhosts.sysconfig, 1.2, 1.3 Message-ID: <200807020345.m623jBeR016366@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16334 Modified Files: denyhosts.init denyhosts.spec denyhosts.sysconfig Added Files: denyhosts-2.6-defconffile.patch Log Message: * Tue Jul 01 2008 Jason L Tibbitts III - 2.6-10 - Fix initscript lockfile handling: Stop creating the lockfile in the initscript. Clean up stray lockfiles automatically. Don't attempt to start the daemon if its already running. - Various initscript cleanups. - Set default configuration file location to match what we use. - Make it easier to add extra options like --debug from the sysconfig file. denyhosts-2.6-defconffile.patch: --- NEW FILE denyhosts-2.6-defconffile.patch --- diff -up ./DenyHosts/constants.py.defconffile ./DenyHosts/constants.py --- ./DenyHosts/constants.py.defconffile 2008-07-01 18:12:34.000000000 -0500 +++ ./DenyHosts/constants.py 2008-07-01 18:12:43.000000000 -0500 @@ -36,7 +36,7 @@ PURGE_HISTORY = "purge-history" # Miscellaneous constants # ################################################################################# -CONFIG_FILE = "denyhosts.cfg" # default can be overridden on cmd line +CONFIG_FILE = "/etc/denyhosts.conf" # default can be overridden on cmd line DENY_DELIMITER = "# DenyHosts:" ENTRY_DELIMITER = " | " Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/F-8/denyhosts.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- denyhosts.init 24 Aug 2007 19:11:30 -0000 1.7 +++ denyhosts.init 2 Jul 2008 03:44:20 -0000 1.8 @@ -5,18 +5,26 @@ # /etc/sysconfig/denyhosts # # Author: Seth Vidal (original script) -# Jason Tibbitts (denyhost changes) +# Jason Tibbitts (denyhost changes) # -# chkconfig: - 50 01 +# chkconfig: - 50 01 # # description: Enable execution of denyhosts, an SSH log watcher -# processname denyhosts -# config: /etc/denyhosts.cfg +# processname: denyhosts +# config: /etc/denyhosts.cfg # ### BEGIN INIT INFO # Provides: denyhosts # Required-Start: $syslog # Short-Description: Enable execution of denyhosts, an SSH log watcher +# Description: DenyHosts is a Python script that analyzes the sshd server +# log messages to determine which hosts are attempting to +# hack into your system. It also determines what user +# accounts are being targeted. It keeps track of the +# frequency of attempts from each host and, upon discovering +# a repeated attack host, updates the /etc/hosts.deny file +# to prevent future break-in attempts from that host. Email +# reports can be sent to a system admin. ### END INIT INFO # source function library @@ -66,42 +74,51 @@ c_status() { if [ -f $CRONLOCK ]; then - echo $"denyhosts cron service is enabled." - RETVAL=0 + echo $"denyhosts cron service is enabled." + RETVAL=0 else - echo $"denyhosts cron service is disabled." - RETVAL=3 + echo $"denyhosts cron service is disabled." + RETVAL=3 fi } # daemon service functions d_start() { echo -n $"Starting denyhosts: " - daemon $DHOSTS $DOPTS - RETVAL=$? + + # There may be a stray lockfile; clean it up. + status -p $LOCKFILE $DHOSTS &> /dev/null + STATUS=$? + if [ $STATUS -eq 0 ]; then + echo -n $"Denyhosts already running." + failure + RETVAL=0 + else + if [ $STATUS -eq 1 ]; then + echo -n $"Stray lockfile present; removing it." + rm -f $LOCKFILE + fi + daemon $DHOSTS $DOPTS $EXTRA_OPTIONS + RETVAL=$? + fi echo - [ $RETVAL -eq 0 ] && touch $LOCKFILE } d_stop() { echo -n $"Stopping denyhosts: " - # Some magic here since older versions stored the PID in the lockfile - # instead of using a separate PID file - # So if the lockfile has nonzero length, we use it as the PID file - if [ -n $LOCKFILE ]; then + if [ -f $LOCKFILE ]; then killproc -p $LOCKFILE $DHOSTS RETVAL=$? - else - killproc $DHOSTS - RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE fi - echo - [ $RETVAL -eq 0 ] && rm -f $LOCKFILE } +# Upstream's control script sleeps here; copy that behavior just in case. d_restart() { d_stop + sleep 1; d_start } @@ -110,7 +127,7 @@ } d_status() { - status $DHOSTS + status -p $LOCKFILE $DHOSTS RETVAL=$? } Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/F-8/denyhosts.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- denyhosts.spec 24 Aug 2007 19:11:30 -0000 1.45 +++ denyhosts.spec 2 Jul 2008 03:44:20 -0000 1.46 @@ -1,25 +1,26 @@ -Name: denyhosts -Version: 2.6 -Release: 7%{?dist} -Summary: A script to help thwart ssh server attacks - -Group: Applications/System -License: GPLv2 -URL: http://denyhosts.sourceforge.net/ -Source0: http://dl.sourceforge.net/denyhosts/DenyHosts-%{version}.tar.gz -Source1: denyhosts.cron -Source2: denyhosts.init -Source3: denyhosts-allowed-hosts -Source4: denyhosts.sysconfig -Source5: denyhosts.logrotate -Source6: README.fedora -Patch0: denyhosts-2.6-config.patch -Patch1: denyhosts-2.4-setup.patch -Patch2: denyhosts-2.2-daemon-control.patch +Name: denyhosts +Version: 2.6 +Release: 10%{?dist} +Summary: A script to help thwart ssh server attacks + +Group: Applications/System +License: GPLv2 +URL: http://denyhosts.sourceforge.net/ +Source0: http://dl.sourceforge.net/denyhosts/DenyHosts-%{version}.tar.gz +Source1: denyhosts.cron +Source2: denyhosts.init +Source3: denyhosts-allowed-hosts +Source4: denyhosts.sysconfig +Source5: denyhosts.logrotate +Source6: README.fedora +Patch0: denyhosts-2.6-config.patch +Patch1: denyhosts-2.4-setup.patch +Patch2: denyhosts-2.2-daemon-control.patch +Patch3: denyhosts-2.6-defconffile.patch # Patch10 is a security fix -Patch10: denyhosts-2.6-regex.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +Patch10: denyhosts-2.6-regex.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: python-devel Requires: openssh-server @@ -42,10 +43,16 @@ %patch0 -p0 -b .config %patch1 -p0 -b .setup %patch2 -p0 -b .daemon-control +%patch3 -p0 -b .defconffile %patch10 -p1 -b .regex cp %{SOURCE6} . +# Fix up non-utf8-ness +for i in CHANGELOG.txt; do + iconv -f iso-8859-1 -t utf-8 < $i > $i. && touch -r $i $i. && mv -f $i. $i +done + # This must be moved before the Python build process runs so that we # can include it as documentation. mv plugins/README.contrib . @@ -124,7 +131,7 @@ %{_bindir}/denyhosts-control %{_datadir}/denyhosts -%{python_sitelib}/DenyHosts/ +%{python_sitelib}/* %config(noreplace) %{_sysconfdir}/denyhosts.conf %config(noreplace) %{_sysconfdir}/cron.d/denyhosts @@ -151,6 +158,24 @@ %changelog +* Tue Jul 01 2008 Jason L Tibbitts III - 2.6-10 +- Fix initscript lockfile handling: + Stop creating the lockfile in the initscript. + Clean up stray lockfiles automatically. + Don't attempt to start the daemon if its already running. +- Various initscript cleanups. +- Set default configuration file location to match what we use. +- Make it easier to add extra options like --debug from the sysconfig file. + +* Fri Jan 04 2008 Jason L Tibbitts III - 2.6-9 +- Properly escape percent symbols in the changelog entries. + +* Thu Jan 03 2008 Jason L Tibbitts III - 2.6-8 +- Include everything under %%python_sitelib to pick up any egg-info files that + might be generated. +- Silence file-not-utf8 rpmlint complaint. +- Silence missing-mandatory-lsb-keyword rpmlint complaint. + * Thu Aug 23 2007 Jason L Tibbitts III - 2.6-7 - Init file tweaks including patch from Jonathan Underwood (bug 188536). @@ -200,7 +225,7 @@ - Fix permissions on plugins. * Thu Mar 30 2006 Jason L Tibbitts III - 2.2-3 -- Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner). +- Switch from $RPM_BUILD_ROOT to %%{buildroot} (looks cleaner). - Rename the main executable from denyhosts.py to denyhosts. * Wed Mar 29 2006 Jason L Tibbitts III - 2.2-2 @@ -230,7 +255,7 @@ - Delete stray .pyo and .pyc files that appear for no reason. * Fri Jan 13 2006 Jason L Tibbitts III - 1.1.4-2 -- Clean up %post script; just call condrestart and don't bother with +- Clean up %%post script; just call condrestart and don't bother with the call to --upgrade099. * Fri Jan 13 2006 Jason L Tibbitts III - 1.1.4-1 @@ -313,8 +338,8 @@ * Thu May 19 2005 Jason L Tibbitts III - 0.5.5-2 - Use dist tag - Don't automatically enable at install time -- Include %ghost'ed allowed-warned-hosts file -- Use %ghost instead of including zero length files. +- Include %%ghost'ed allowed-warned-hosts file +- Use %%ghost instead of including zero length files. - Source is at dl.sourceforge.net * Thu May 12 2005 Jason L Tibbitts III - 0.5.5-1 Index: denyhosts.sysconfig =================================================================== RCS file: /cvs/extras/rpms/denyhosts/F-8/denyhosts.sysconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.sysconfig 16 Aug 2005 03:30:56 -0000 1.2 +++ denyhosts.sysconfig 2 Jul 2008 03:44:20 -0000 1.3 @@ -2,3 +2,8 @@ # If not set to "yes", you also need to edit /etc/cron.d/denyhosts # and uncomment the appropriate lines. DAEMON=yes + +# Set EXTRA_OPTIONS to pass additional settings to denyhosts when run in daemon +# mode. +# For example, uncomment the following line to enable additional debugging. +#EXTRA_OPTIONS="--debug" From fedora-extras-commits at redhat.com Wed Jul 2 03:49:57 2008 From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot)) Date: Wed, 2 Jul 2008 03:49:57 GMT Subject: rpms/pidgin/devel pidgin-2.4.3-tcl852.patch, NONE, 1.1 pidgin.spec, 1.54, 1.55 Message-ID: <200807020349.m623nvLt016550@cvs-int.fedora.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16509 Modified Files: pidgin.spec Added Files: pidgin-2.4.3-tcl852.patch Log Message: - Add a patch to build with latest rawhide tcl pidgin-2.4.3-tcl852.patch: --- NEW FILE pidgin-2.4.3-tcl852.patch --- diff -up pidgin-2.4.3/configure.tcl852 pidgin-2.4.3/configure --- pidgin-2.4.3/configure.tcl852 2008-07-01 23:40:19.000000000 -0400 +++ pidgin-2.4.3/configure 2008-07-01 23:41:18.000000000 -0400 @@ -35070,9 +35070,12 @@ echo $ECHO_N "checking for tclConfig.sh. TCLCONFIG=no TCLCONFIGDIRS="/usr/lib \ /usr/lib64 \ + /usr/lib/tcl8.5 \ /usr/lib/tcl8.4 \ /usr/lib/tcl8.3 \ /usr/lib/tcl8.2 \ + /usr/lib64/tcl8.5 \ + /usr/lib64/tcl8.4 \ /System/Library/Tcl/8.3 \ /usr/local/lib" for dir in $with_tclconfig $TCLCONFIGDIRS; do Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- pidgin.spec 2 Jul 2008 02:46:38 -0000 1.54 +++ pidgin.spec 2 Jul 2008 03:49:07 -0000 1.55 @@ -29,7 +29,7 @@ Name: pidgin Version: 2.4.3 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -62,6 +62,7 @@ Patch0: pidgin-2.4.2-reread-resolvconf.patch ## Patches 100+: To be Included in Future Upstream +Patch100: pidgin-2.4.3-tcl852.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: A Gtk+ based multiprotocol instant messaging client @@ -291,6 +292,7 @@ %patch0 -p1 -b .resolv ## Patches 100+: To be Included in Future Upstream +%patch100 -p1 -b .tcl852 # Our preferences cp %{SOURCE1} prefs.xml @@ -501,6 +503,9 @@ %changelog +* Tue Jul 01 2008 Stu Tomlinson 2.4.3-1.1 +- Add a patch to build with latest rawhide tcl + * Tue Jul 01 2008 Stu Tomlinson 2.4.3-1 - 2.4.3 From fedora-extras-commits at redhat.com Wed Jul 2 04:37:59 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Wed, 2 Jul 2008 04:37:59 GMT Subject: rpms/kernel/devel patch-2.6.26-rc7.bz2.sign,1.1,NONE Message-ID: <200807020437.m624bxAE024444@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24411 Removed Files: patch-2.6.26-rc7.bz2.sign Log Message: rc7 is dead. long live rc8! --- patch-2.6.26-rc7.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 05:52:07 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 05:52:07 GMT Subject: rpms/apr-util/devel apr-util.spec,1.49,1.50 Message-ID: <200807020552.m625q7IJ000635@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv594 Modified Files: apr-util.spec Log Message: Try adding postgresql-server to build dependencies to pull some libs in. Index: apr-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- apr-util.spec 1 Jul 2008 23:56:13 -0000 1.49 +++ apr-util.spec 2 Jul 2008 05:51:15 -0000 1.50 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -35,7 +35,7 @@ %package pgsql Group: Development/Libraries Summary: APR utility library PostgreSQL DBD driver -BuildRequires: postgresql-devel +BuildRequires: postgresql-devel, postgresql-server Requires: apr-util = %{version}-%{release} %description pgsql @@ -181,6 +181,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 2 2008 Bojan Smojver - 1.3.2-2 +- try adding postgresql-server to build dependencies to pull some libs in + * Thu Jun 19 2008 Bojan Smojver - 1.3.2-1 - bump up to 1.3.2 From fedora-extras-commits at redhat.com Wed Jul 2 06:02:06 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 06:02:06 GMT Subject: rpms/apr-util/devel apr-util.spec,1.50,1.51 Message-ID: <200807020602.m62626BM007588@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7524 Modified Files: apr-util.spec Log Message: Revert build dependencies, change from -2 didn't help. Index: apr-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- apr-util.spec 2 Jul 2008 05:51:15 -0000 1.50 +++ apr-util.spec 2 Jul 2008 06:01:10 -0000 1.51 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.3.2 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -35,7 +35,7 @@ %package pgsql Group: Development/Libraries Summary: APR utility library PostgreSQL DBD driver -BuildRequires: postgresql-devel, postgresql-server +BuildRequires: postgresql-devel Requires: apr-util = %{version}-%{release} %description pgsql @@ -181,6 +181,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 2 2008 Bojan Smojver - 1.3.2-3 +- revert build dependencies, change from -2 didn't help + * Wed Jul 2 2008 Bojan Smojver - 1.3.2-2 - try adding postgresql-server to build dependencies to pull some libs in From fedora-extras-commits at redhat.com Wed Jul 2 06:12:37 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 06:12:37 GMT Subject: rpms/apr-util/devel apr-util-1.3.2-pgsql.patch, NONE, 1.1 apr-util.spec, 1.51, 1.52 Message-ID: <200807020612.m626Cb08008244@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8177 Modified Files: apr-util.spec Added Files: apr-util-1.3.2-pgsql.patch Log Message: Add apr-util-1.3.2-pgsql.patch (remove pgsql_LIBS during detection). apr-util-1.3.2-pgsql.patch: --- NEW FILE apr-util-1.3.2-pgsql.patch --- Index: build/dbd.m4 =================================================================== --- build/dbd.m4 (revision 672960) +++ build/dbd.m4 (working copy) @@ -35,7 +35,7 @@ if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" - pgsql_LIBS="`$PGSQL_CONFIG --libs`" + pgsql_LIBS="" APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) Index: apr-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- apr-util.spec 2 Jul 2008 06:01:10 -0000 1.51 +++ apr-util.spec 2 Jul 2008 06:11:51 -0000 1.52 @@ -10,6 +10,7 @@ URL: http://apr.apache.org/ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Patch1: apr-util-1.2.7-pkgconf.patch +Patch2: apr-util-1.3.2-pgsql.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, apr-devel >= 1.3.0 BuildRequires: db4-devel, expat-devel, e2fsprogs-devel @@ -94,6 +95,7 @@ %prep %setup -q %patch1 -p1 -b .pkgconf +%patch1 -p0 -b .pgsql %build autoheader && autoconf @@ -183,6 +185,7 @@ %changelog * Wed Jul 2 2008 Bojan Smojver - 1.3.2-3 - revert build dependencies, change from -2 didn't help +- add apr-util-1.3.2-pgsql.patch (remove pgsql_LIBS during detection) * Wed Jul 2 2008 Bojan Smojver - 1.3.2-2 - try adding postgresql-server to build dependencies to pull some libs in From fedora-extras-commits at redhat.com Wed Jul 2 06:14:10 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 06:14:10 GMT Subject: rpms/apr-util/devel apr-util.spec,1.52,1.53 Message-ID: <200807020614.m626EAJd008337@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8293 Modified Files: apr-util.spec Log Message: Fix patch numbering. Index: apr-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- apr-util.spec 2 Jul 2008 06:11:51 -0000 1.52 +++ apr-util.spec 2 Jul 2008 06:13:20 -0000 1.53 @@ -95,7 +95,7 @@ %prep %setup -q %patch1 -p1 -b .pkgconf -%patch1 -p0 -b .pgsql +%patch2 -p0 -b .pgsql %build autoheader && autoconf From fedora-extras-commits at redhat.com Wed Jul 2 06:26:17 2008 From: fedora-extras-commits at redhat.com (Rob Myers (rmyers)) Date: Wed, 2 Jul 2008 06:26:17 GMT Subject: rpms/sysusage/devel sysusage.spec,1.1,1.2 Message-ID: <200807020626.m626QHW2008866@cvs-int.fedora.redhat.com> Author: rmyers Update of /cvs/pkgs/rpms/sysusage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8724/devel Modified Files: sysusage.spec Log Message: include missing versioned MODULE_COMPAT Requires (#453586) From fedora-extras-commits at redhat.com Wed Jul 2 06:26:34 2008 From: fedora-extras-commits at redhat.com (Rob Myers (rmyers)) Date: Wed, 2 Jul 2008 06:26:34 GMT Subject: rpms/sysusage/F-9 sysusage.spec,1.1,1.2 Message-ID: <200807020626.m626QYa3008960@cvs-int.fedora.redhat.com> Author: rmyers Update of /cvs/pkgs/rpms/sysusage/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8724/F-9 Modified Files: sysusage.spec Log Message: include missing versioned MODULE_COMPAT Requires (#453586) From fedora-extras-commits at redhat.com Wed Jul 2 06:32:08 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 2 Jul 2008 06:32:08 GMT Subject: rpms/kdelibs3/F-9 kdelibs-3.5.9-drkonqi-kde4.patch, NONE, 1.1 kdelibs3.spec, 1.29, 1.30 Message-ID: <200807020632.m626W8IQ010936@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs3/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10625/F-9 Modified Files: kdelibs3.spec Added Files: kdelibs-3.5.9-drkonqi-kde4.patch Log Message: * Wed Jul 02 2008 Kevin Kofler 3.5.9-16 - f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243) kdelibs-3.5.9-drkonqi-kde4.patch: --- NEW FILE kdelibs-3.5.9-drkonqi-kde4.patch --- diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp --- kdelibs-3.5.9/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 +++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp 2008-07-02 08:24:37.000000000 +0200 @@ -158,7 +158,7 @@ int i = 0; // argument 0 has to be drkonqi - argv[i++] = "drkonqi"; + argv[i++] = "/usr/libexec/kde4/drkonqi"; #if defined Q_WS_X11 // start up on the correct display @@ -325,7 +325,7 @@ _exit(253); if(!geteuid() && setuid(getuid()) < 0) _exit(253); - execvp("drkonqi", const_cast< char** >( argv )); + execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv )); _exit(errno); } else Index: kdelibs3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/kdelibs3.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- kdelibs3.spec 4 Jun 2008 21:45:39 -0000 1.29 +++ kdelibs3.spec 2 Jul 2008 06:31:21 -0000 1.30 @@ -29,7 +29,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.9 -Release: 15%{?dist} +Release: 16%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -77,6 +77,8 @@ Patch51: kdelibs-3.5.9-cupsserverbin.patch # initial support for (Only|Not)ShowIn=KDE3 Patch52: kdelibs-3.5.9-KDE3.patch +# use /usr/libexec/kde4/drkonqi in KCrash (#453243) +Patch53: kdelibs-3.5.9-drkonqi-kde4.patch # use /etc/kde in addition to /usr/share/config, borrowed from debian Patch100: kdelibs-3.5.5-kstandarddirs.patch @@ -256,6 +258,9 @@ %endif %patch51 -p1 -b .cupsserverbin %patch52 -p1 -b .KDE3 +%if "%{name}" != "kdelibs" +%patch53 -p1 -b .drkonqi-kde4 +%endif %patch100 -p1 -b .kstandarddirs %patch101 -p1 -b .libtool-shlibext @@ -615,6 +620,9 @@ %changelog +* Wed Jul 02 2008 Kevin Kofler 3.5.9-16 +- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243) + * Wed Jun 04 2008 Kevin Kofler 3.5.9-15 - set include_crystalsvg to 1 everywhere - use Epoch 1 for crystalsvg-icon-theme, add Obsoletes From fedora-extras-commits at redhat.com Wed Jul 2 06:32:19 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 2 Jul 2008 06:32:19 GMT Subject: rpms/kdelibs3/devel kdelibs-3.5.9-drkonqi-kde4.patch, NONE, 1.1 kdelibs3.spec, 1.34, 1.35 Message-ID: <200807020632.m626WJpt010996@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10625/devel Modified Files: kdelibs3.spec Added Files: kdelibs-3.5.9-drkonqi-kde4.patch Log Message: * Wed Jul 02 2008 Kevin Kofler 3.5.9-16 - f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243) kdelibs-3.5.9-drkonqi-kde4.patch: --- NEW FILE kdelibs-3.5.9-drkonqi-kde4.patch --- diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp --- kdelibs-3.5.9/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 +++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp 2008-07-02 08:24:37.000000000 +0200 @@ -158,7 +158,7 @@ int i = 0; // argument 0 has to be drkonqi - argv[i++] = "drkonqi"; + argv[i++] = "/usr/libexec/kde4/drkonqi"; #if defined Q_WS_X11 // start up on the correct display @@ -325,7 +325,7 @@ _exit(253); if(!geteuid() && setuid(getuid()) < 0) _exit(253); - execvp("drkonqi", const_cast< char** >( argv )); + execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv )); _exit(errno); } else Index: kdelibs3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- kdelibs3.spec 4 Jun 2008 21:45:52 -0000 1.34 +++ kdelibs3.spec 2 Jul 2008 06:31:38 -0000 1.35 @@ -29,7 +29,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.9 -Release: 15%{?dist} +Release: 16%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -77,6 +77,8 @@ Patch51: kdelibs-3.5.9-cupsserverbin.patch # initial support for (Only|Not)ShowIn=KDE3 Patch52: kdelibs-3.5.9-KDE3.patch +# use /usr/libexec/kde4/drkonqi in KCrash (#453243) +Patch53: kdelibs-3.5.9-drkonqi-kde4.patch # use /etc/kde in addition to /usr/share/config, borrowed from debian Patch100: kdelibs-3.5.5-kstandarddirs.patch @@ -256,6 +258,9 @@ %endif %patch51 -p1 -b .cupsserverbin %patch52 -p1 -b .KDE3 +%if "%{name}" != "kdelibs" +%patch53 -p1 -b .drkonqi-kde4 +%endif %patch100 -p1 -b .kstandarddirs %patch101 -p1 -b .libtool-shlibext @@ -615,6 +620,9 @@ %changelog +* Wed Jul 02 2008 Kevin Kofler 3.5.9-16 +- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243) + * Wed Jun 04 2008 Kevin Kofler 3.5.9-15 - set include_crystalsvg to 1 everywhere - use Epoch 1 for crystalsvg-icon-theme, add Obsoletes From fedora-extras-commits at redhat.com Wed Jul 2 06:44:53 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 2 Jul 2008 06:44:53 GMT Subject: rpms/perl-Test-WWW-Mechanize-Catalyst/devel .cvsignore, 1.2, 1.3 perl-Test-WWW-Mechanize-Catalyst.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807020644.m626irSa011642@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592 Modified Files: .cvsignore perl-Test-WWW-Mechanize-Catalyst.spec sources Log Message: * Tue Jul 01 2008 Chris Weyl 0.42-1 - update to 0.42 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Mar 2008 19:32:15 -0000 1.2 +++ .cvsignore 2 Jul 2008 06:44:01 -0000 1.3 @@ -1 +1 @@ -Test-WWW-Mechanize-Catalyst-0.41.tar.gz +Test-WWW-Mechanize-Catalyst-0.42.tar.gz Index: perl-Test-WWW-Mechanize-Catalyst.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/perl-Test-WWW-Mechanize-Catalyst.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-WWW-Mechanize-Catalyst.spec 18 Mar 2008 19:33:11 -0000 1.2 +++ perl-Test-WWW-Mechanize-Catalyst.spec 2 Jul 2008 06:44:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-WWW-Mechanize-Catalyst -Version: 0.41 -Release: 2%{?dist} +Version: 0.42 +Release: 1%{?dist} Summary: Test::WWW::Mechanize for Catalyst License: GPL+ or Artistic Group: Development/Libraries @@ -83,6 +83,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Chris Weyl 0.42-1 +- update to 0.42 + * Tue Mar 18 2008 Chris Weyl 0.41-2 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2008 19:32:15 -0000 1.2 +++ sources 2 Jul 2008 06:44:01 -0000 1.3 @@ -1 +1 @@ -efffcede181df9658c99472e51cade3f Test-WWW-Mechanize-Catalyst-0.41.tar.gz +4df4846626c81d0ea15ecaf6861c2114 Test-WWW-Mechanize-Catalyst-0.42.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 06:45:29 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 2 Jul 2008 06:45:29 GMT Subject: rpms/perl-Test-WWW-Mechanize-Catalyst/F-9 perl-Test-WWW-Mechanize-Catalyst.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807020645.m626jTqo011719@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11630 Modified Files: perl-Test-WWW-Mechanize-Catalyst.spec sources Log Message: * Tue Jul 01 2008 Chris Weyl 0.42-1 - update to 0.42 Index: perl-Test-WWW-Mechanize-Catalyst.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-9/perl-Test-WWW-Mechanize-Catalyst.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-WWW-Mechanize-Catalyst.spec 18 Mar 2008 19:33:11 -0000 1.2 +++ perl-Test-WWW-Mechanize-Catalyst.spec 2 Jul 2008 06:44:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-WWW-Mechanize-Catalyst -Version: 0.41 -Release: 2%{?dist} +Version: 0.42 +Release: 1%{?dist} Summary: Test::WWW::Mechanize for Catalyst License: GPL+ or Artistic Group: Development/Libraries @@ -83,6 +83,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Chris Weyl 0.42-1 +- update to 0.42 + * Tue Mar 18 2008 Chris Weyl 0.41-2 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2008 19:32:15 -0000 1.2 +++ sources 2 Jul 2008 06:44:41 -0000 1.3 @@ -1 +1 @@ -efffcede181df9658c99472e51cade3f Test-WWW-Mechanize-Catalyst-0.41.tar.gz +4df4846626c81d0ea15ecaf6861c2114 Test-WWW-Mechanize-Catalyst-0.42.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 06:51:00 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 2 Jul 2008 06:51:00 GMT Subject: rpms/apr-util/devel apr-util-1.3.2-pgsql.patch, 1.1, 1.2 apr-util.spec, 1.53, 1.54 Message-ID: <200807020651.m626p0Lx011893@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11857 Modified Files: apr-util-1.3.2-pgsql.patch apr-util.spec Log Message: Properly fix PostgreSQL detection. apr-util-1.3.2-pgsql.patch: Index: apr-util-1.3.2-pgsql.patch =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util-1.3.2-pgsql.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr-util-1.3.2-pgsql.patch 2 Jul 2008 06:11:51 -0000 1.1 +++ apr-util-1.3.2-pgsql.patch 2 Jul 2008 06:50:16 -0000 1.2 @@ -2,12 +2,118 @@ =================================================================== --- build/dbd.m4 (revision 672960) +++ build/dbd.m4 (working copy) -@@ -35,7 +35,7 @@ +@@ -35,16 +35,32 @@ if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" - pgsql_LIBS="`$PGSQL_CONFIG --libs`" -+ pgsql_LIBS="" APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) +- APR_ADDTO(LIBS, [$pgsql_LIBS]) + fi + +- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + if test "$apu_have_pgsql" = "0"; then +- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + fi + if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) +@@ -56,7 +72,6 @@ + if test "x$PGSQL_CONFIG" != 'x'; then + pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" +- pgsql_LIBS="`$PGSQL_CONFIG --libs`" + else + pgsql_CPPFLAGS="-I$withval/include" + pgsql_LDFLAGS="-L$withval/lib " +@@ -64,12 +79,29 @@ + + APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) + APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) +- APR_ADDTO(LIBS, [$pgsql_LIBS]) + + AC_MSG_NOTICE(checking for pgsql in $withval) +- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + if test "$apu_have_pgsql" != "1"; then +- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + fi + if test "$apu_have_pgsql" != "0"; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) +@@ -80,16 +112,32 @@ + if test "x$PGSQL_CONFIG" != 'x'; then + pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" +- pgsql_LIBS="`$PGSQL_CONFIG --libs`" + + APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) + APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) +- APR_ADDTO(LIBS, [$pgsql_LIBS]) + fi + +- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + if test "$apu_have_pgsql" = "0"; then +- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + fi + if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) Index: apr-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- apr-util.spec 2 Jul 2008 06:13:20 -0000 1.53 +++ apr-util.spec 2 Jul 2008 06:50:16 -0000 1.54 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -183,6 +183,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 2 2008 Bojan Smojver - 1.3.2-4 +- properly fix PostgreSQL detection + * Wed Jul 2 2008 Bojan Smojver - 1.3.2-3 - revert build dependencies, change from -2 didn't help - add apr-util-1.3.2-pgsql.patch (remove pgsql_LIBS during detection) From fedora-extras-commits at redhat.com Wed Jul 2 06:55:58 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 2 Jul 2008 06:55:58 GMT Subject: rpms/perl-Test-WWW-Mechanize-Catalyst/F-8 perl-Test-WWW-Mechanize-Catalyst.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807020655.m626tweI012091@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12049 Modified Files: perl-Test-WWW-Mechanize-Catalyst.spec sources Log Message: * Tue Jul 01 2008 Chris Weyl 0.42-1 - update to 0.42 Index: perl-Test-WWW-Mechanize-Catalyst.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-8/perl-Test-WWW-Mechanize-Catalyst.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-WWW-Mechanize-Catalyst.spec 30 Mar 2008 21:53:08 -0000 1.1 +++ perl-Test-WWW-Mechanize-Catalyst.spec 2 Jul 2008 06:54:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-WWW-Mechanize-Catalyst -Version: 0.41 -Release: 2%{?dist} +Version: 0.42 +Release: 1%{?dist} Summary: Test::WWW::Mechanize for Catalyst License: GPL+ or Artistic Group: Development/Libraries @@ -83,6 +83,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 01 2008 Chris Weyl 0.42-1 +- update to 0.42 + * Tue Mar 18 2008 Chris Weyl 0.41-2 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Mar 2008 21:53:08 -0000 1.2 +++ sources 2 Jul 2008 06:54:45 -0000 1.3 @@ -1 +1 @@ -efffcede181df9658c99472e51cade3f Test-WWW-Mechanize-Catalyst-0.41.tar.gz +4df4846626c81d0ea15ecaf6861c2114 Test-WWW-Mechanize-Catalyst-0.42.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 06:58:14 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 2 Jul 2008 06:58:14 GMT Subject: rpms/dietlibc/devel dietlibc-0.29-scall.patch,1.2,1.3 Message-ID: <200807020658.m626wEpe012209@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12167 Modified Files: dietlibc-0.29-scall.patch Log Message: use .comment instead of .note section for the not-implemented symbol dietlibc-0.29-scall.patch: Index: dietlibc-0.29-scall.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.29-scall.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dietlibc-0.29-scall.patch 18 May 2008 10:12:53 -0000 1.2 +++ dietlibc-0.29-scall.patch 2 Jul 2008 06:57:21 -0000 1.3 @@ -13,13 +13,13 @@ index c9f72bb..6b6a8aa 100644 --- a/libcompat/syscall.S +++ b/libcompat/syscall.S -@@ -130,6 +130,12 @@ syscall: +@@ -130,7 +130,12 @@ syscall: b __unified_syscall #else - /* arch not implemented yet */ +#include -+ .section .note ++ .section .comment +#if (__WORDSIZE == 64) + .quad __syscall_2_not_implemented_for_this_arch +#else From fedora-extras-commits at redhat.com Wed Jul 2 07:00:32 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 2 Jul 2008 07:00:32 GMT Subject: rpms/dietlibc/devel dietlibc-0.31-pagesize.patch,1.9,1.10 Message-ID: <200807020700.m6270Wbe012291@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12248 Modified Files: dietlibc-0.31-pagesize.patch Log Message: fixed ARM code and use cmp instead of orrs dietlibc-0.31-pagesize.patch: Index: dietlibc-0.31-pagesize.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-pagesize.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dietlibc-0.31-pagesize.patch 18 May 2008 10:12:53 -0000 1.9 +++ dietlibc-0.31-pagesize.patch 2 Jul 2008 06:59:34 -0000 1.10 @@ -140,7 +140,7 @@ +#ifdef WANT_ELFINFO +1: ldr r5, [a3], #4 @ load *envp and increment it -+ orr r5, r5, r5 @ read value==0? ++ cmp r5, #0 @ read value==0? + bne 1b + str a3, [ip, #4] @ __elfinfo = envp +#endif From fedora-extras-commits at redhat.com Wed Jul 2 07:12:00 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 2 Jul 2008 07:12:00 GMT Subject: rpms/cyrus-sasl/F-9 cyrus-sasl-2.1.22-kerberos4.patch, NONE, 1.1 cyrus-sasl-2.1.22-rimap.patch, NONE, 1.1 cyrus-sasl.spec, 1.68, 1.69 saslauthd.init, 1.3, 1.4 Message-ID: <200807020712.m627C0vJ019217@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/cyrus-sasl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19176 Modified Files: cyrus-sasl.spec saslauthd.init Added Files: cyrus-sasl-2.1.22-kerberos4.patch cyrus-sasl-2.1.22-rimap.patch Log Message: * Tue Jul 1 2008 Tomas Mraz - 2.1.22-15 - drop reload from initscript help (#448154) - fix hang in rimap auth method (#438533) - build the krb4 plugin (#154675) cyrus-sasl-2.1.22-kerberos4.patch: --- NEW FILE cyrus-sasl-2.1.22-kerberos4.patch --- --- cyrus-sasl-2.1.22/plugins/kerberos4.c~ 2005-01-10 02:08:53.000000000 -0500 +++ cyrus-sasl-2.1.22/plugins/kerberos4.c 2007-05-14 13:02:16.000000000 -0400 @@ -49,11 +49,7 @@ #include #ifdef WITH_DES -# ifdef WITH_SSL_DES -# include -# else # include -# endif /* WITH_SSL_DES */ #endif /* WITH_DES */ #ifdef WIN32 cyrus-sasl-2.1.22-rimap.patch: --- NEW FILE cyrus-sasl-2.1.22-rimap.patch --- diff -up cyrus-sasl-2.1.22/saslauthd/auth_rimap.c.rimap cyrus-sasl-2.1.22/saslauthd/auth_rimap.c --- cyrus-sasl-2.1.22/saslauthd/auth_rimap.c.rimap 2006-04-06 22:19:54.000000000 +0200 +++ cyrus-sasl-2.1.22/saslauthd/auth_rimap.c 2008-07-01 22:48:09.000000000 +0200 @@ -163,6 +163,7 @@ qstring ( p1 = s; while ((p1 = strchr(p1, '"')) != NULL) { num_quotes++; + ++p1; } if (!num_quotes) { @@ -198,7 +199,7 @@ qstring ( } *p2++ = *p1++; } - strcat(p2, "\""); + strcpy(p2, "\""); return c; } @@ -438,7 +439,7 @@ auth_rimap ( syslog(LOG_WARNING, "auth_rimap: writev: %m"); memset(qlogin, 0, strlen(qlogin)); free(qlogin); - memset(qpass, 0, strlen(qlogin)); + memset(qpass, 0, strlen(qpass)); free(qpass); (void)close(s); return strdup(RESP_IERROR); @@ -447,7 +448,7 @@ auth_rimap ( /* don't need these any longer */ memset(qlogin, 0, strlen(qlogin)); free(qlogin); - memset(qpass, 0, strlen(qlogin)); + memset(qpass, 0, strlen(qpass)); free(qpass); /* read and parse the LOGIN response */ Index: cyrus-sasl.spec =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-9/cyrus-sasl.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- cyrus-sasl.spec 23 May 2008 18:41:35 -0000 1.68 +++ cyrus-sasl.spec 2 Jul 2008 07:11:07 -0000 1.69 @@ -5,7 +5,7 @@ Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.22 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD Group: System Environment/Libraries # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; @@ -29,6 +29,8 @@ Patch27: cyrus-sasl-2.1.22-automake-1.10.patch Patch28: cyrus-sasl-2.1.21-keytab.patch Patch29: cyrus-sasl-db-4.6.18-glibc.patch +Patch30: cyrus-sasl-2.1.22-rimap.patch +Patch31: cyrus-sasl-2.1.22-kerberos4.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig @@ -120,6 +122,15 @@ a directory server, accessed using LDAP, for storing shared secrets. %endif +%package krb4 +Requires: %{name}-lib = %{version}-%{release} +Group: System Environment/Libraries +Summary: Kerberos 4 authentication support for Cyrus SASL + +%description krb4 +The %{name}-krb4 package contains the Cyrus SASL plugins which +support Kerberos 4 authentication. + %prep %setup -q -a 6 chmod -x doc/*.html @@ -132,6 +143,8 @@ %patch26 -p2 -b .digest-commas %patch27 -p1 -b .automake-1.10 %patch28 -p1 -b .keytab +%patch30 -p1 -b .rimap +%patch31 -p1 -b .krb4 pushd db-%{db_version} %patch29 -p1 -b .glibc27 @@ -221,7 +234,7 @@ --disable-java \ --with-plugindir=%{_plugindir2} \ --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \ - --disable-krb4 \ + --enable-krb4=/usr \ --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \ --with-gss_impl=mit \ --with-rc4 \ @@ -370,6 +383,10 @@ %defattr(-,root,root) %{_plugindir2}/*gssapi*.so* +%files krb4 +%defattr(-,root,root) +%{_plugindir2}/*kerberos4*.so* + %files devel %defattr(-,root,root) %doc doc/*.txt @@ -381,6 +398,11 @@ %{_sbindir}/sasl2-shared-mechlist %changelog +* Tue Jul 1 2008 Tomas Mraz - 2.1.22-15 +- drop reload from initscript help (#448154) +- fix hang in rimap auth method (#438533) +- build the krb4 plugin (#154675) + * Fri May 23 2008 Dennis Gilmore - 2.1.22-14 - make it so that bootstrap actually works Index: saslauthd.init =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-9/saslauthd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- saslauthd.init 9 Sep 2004 04:06:54 -0000 1.3 +++ saslauthd.init 2 Jul 2008 07:11:07 -0000 1.4 @@ -72,7 +72,7 @@ [ -f /var/lock/subsys/$prog ] && restart || : ;; *) - echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}" + echo $"Usage: $0 {start|stop|status|restart|condrestart}" exit 1 esac From fedora-extras-commits at redhat.com Wed Jul 2 07:18:32 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Wed, 2 Jul 2008 07:18:32 GMT Subject: rpms/subversion/devel subversion-1.5.0-perl510.patch, NONE, 1.1 subversion.spec, 1.113, 1.114 Message-ID: <200807020718.m627IWFD019574@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19504 Modified Files: subversion.spec Added Files: subversion-1.5.0-perl510.patch Log Message: * Wed Jul 2 2008 Joe Orton 1.5.0-4 - swig-perl test suite fix for Perl 5.10 (upstream r31546) subversion-1.5.0-perl510.patch: --- NEW FILE subversion-1.5.0-perl510.patch --- upstream r31546 --- subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t.perl510 +++ subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t @@ -221,8 +221,7 @@ sub add_file { sub apply_textdelta { my ($self, $baton, $base_checksum, $pool) = @_; - my $data = $baton->{data} = \''; - open my $out_fh, '>', $data + open my $out_fh, '>', \$baton->{data} or die "error opening in-memory file to store Subversion update: $!"; open my $in_fh, '<', \'' or die "error opening in-memory file for delta source: $!"; Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- subversion.spec 1 Jul 2008 19:31:09 -0000 1.113 +++ subversion.spec 2 Jul 2008 07:17:34 -0000 1.114 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 3 +Release: 4 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -27,6 +27,7 @@ Patch3: subversion-0.31.0-rpath.patch Patch6: subversion-1.5.0-pie.patch Patch7: subversion-1.1.3-java.patch +Patch8: subversion-1.5.0-perl510.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7 @@ -108,6 +109,7 @@ %if %{with_java} %patch7 -p1 -b .java %endif +%patch8 -p1 -b .perl510 %build # Regenerate after patches to build.conf et al @@ -273,6 +275,9 @@ %endif %changelog +* Wed Jul 2 2008 Joe Orton 1.5.0-4 +- swig-perl test suite fix for Perl 5.10 (upstream r31546) + * Tue Jul 1 2008 Joe Orton 1.5.0-3 - attempt build without java bits From fedora-extras-commits at redhat.com Wed Jul 2 07:47:36 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Wed, 2 Jul 2008 07:47:36 GMT Subject: rpms/subversion/devel subversion.spec,1.114,1.115 Message-ID: <200807020747.m627lalf020495@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20458 Modified Files: subversion.spec Log Message: * Wed Jul 2 2008 Joe Orton 1.5.0-5 - fix files list Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- subversion.spec 2 Jul 2008 07:17:34 -0000 1.114 +++ subversion.spec 2 Jul 2008 07:46:44 -0000 1.115 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 4 +Release: 5 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -226,7 +226,7 @@ %defattr(-,root,root) %doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES %doc tools subversion/LICENSE mod_authz_svn-INSTALL -%doc contrib/client-side/svn_load_dirs{.pl,_*,.README} +%doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README} %{_bindir}/* %{_libdir}/libsvn_*.so.* %{_mandir}/man*/* @@ -275,6 +275,9 @@ %endif %changelog +* Wed Jul 2 2008 Joe Orton 1.5.0-5 +- fix files list + * Wed Jul 2 2008 Joe Orton 1.5.0-4 - swig-perl test suite fix for Perl 5.10 (upstream r31546) From fedora-extras-commits at redhat.com Wed Jul 2 08:07:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 2 Jul 2008 08:07:24 GMT Subject: rpms/tcl/devel tcl.spec,1.77,1.78 Message-ID: <200807020807.m6287Opx027734@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27691 Modified Files: tcl.spec Log Message: * Mon Jul 2 2008 Marcela Maslanova - 1:8.5.2-3 - tclConfig.sh was fixed again with symlink into libdir/tcl8.5. Many packages are looking in /usr/lib, because tcl dir is versioned. Index: tcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- tcl.spec 25 Jun 2008 13:56:18 -0000 1.77 +++ tcl.spec 2 Jul 2008 08:06:34 -0000 1.78 @@ -3,7 +3,7 @@ Summary: Tcl scripting language development environment Name: tcl Version: %{majorver}.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: TCL Group: Development/Languages @@ -77,6 +77,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver} +# postresql and maybe other packages too need tclConfig.sh +# paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now +ln -s %{_libdir}/%{name}Config.sh $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}/%{name}Config.sh + mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic,unix} find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';' ( cd $RPM_BUILD_ROOT/%{_includedir} @@ -90,8 +94,6 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tclAppInit.c rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ldAix -mv $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}/%{name}Config.sh - %clean rm -rf $RPM_BUILD_ROOT @@ -117,9 +119,14 @@ %{_includedir}/* %{_libdir}/lib%{name}stub%{majorver}.a %{_libdir}/lib%{name}.so +%{_libdir}/%{name}Config.sh %{_libdir}/%{name}8.5/%{name}Config.sh %changelog +* Mon Jul 2 2008 Marcela Maslanova - 1:8.5.2-3 +- tclConfig.sh was fixed again with symlink into libdir/tcl8.5. +Many packages are looking in /usr/lib, because tcl dir is versioned. + * Tue Jun 24 2008 Marcela Maslanova - 1:8.5.2-2 - update to 8.5.2 - 451750 PostgreSQL need tclConfig.sh in paths From fedora-extras-commits at redhat.com Wed Jul 2 08:18:11 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 2 Jul 2008 08:18:11 GMT Subject: rpms/WindowMaker/F-9 WindowMaker.spec,1.27,1.28 Message-ID: <200807020818.m628IBcw028082@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/WindowMaker/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28032/F-9 Modified Files: WindowMaker.spec Log Message: - Bump up for rebuild. - Resolves: #448360 Index: WindowMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/WindowMaker/F-9/WindowMaker.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- WindowMaker.spec 11 Feb 2008 15:58:43 -0000 1.27 +++ WindowMaker.spec 2 Jul 2008 08:17:10 -0000 1.28 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -260,6 +260,10 @@ %{_includedir}/wraster.h %changelog +* Wed Jul 2 2008 Petr Machata - 0.92.0-18 +- Bump up for rebuild. +- Resolves: #448360 + * Mon Feb 11 2008 Andreas Bierfert - 0.92.0-17 - Rebuilt for gcc43 From fedora-extras-commits at redhat.com Wed Jul 2 08:34:09 2008 From: fedora-extras-commits at redhat.com (Jiri Skala (jskala)) Date: Wed, 2 Jul 2008 08:34:09 GMT Subject: rpms/squid/devel sources,1.36,1.37 squid.spec,1.102,1.103 Message-ID: <200807020834.m628Y9GC028647@cvs-int.fedora.redhat.com> Author: jskala Update of /cvs/extras/rpms/squid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28612 Modified Files: sources squid.spec Log Message: * Wed Jul 02 2008 Jiri Skala - 7:3.0.STABLE7-1 - update to latest upstream - fix #453214 Index: sources =================================================================== RCS file: /cvs/extras/rpms/squid/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 21 May 2008 09:28:02 -0000 1.36 +++ sources 2 Jul 2008 08:33:20 -0000 1.37 @@ -1 +1 @@ -231323a73346041cec825e785960e348 squid-3.0.STABLE6.tar.bz2 +fa0fc5a3ce226099975b34c1cd2a3f95 squid-3.0.STABLE7.tar.bz2 Index: squid.spec =================================================================== RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- squid.spec 26 May 2008 09:54:33 -0000 1.102 +++ squid.spec 2 Jul 2008 08:33:20 -0000 1.103 @@ -3,8 +3,8 @@ ## % define __find_requires %{SOURCE99} Name: squid -Version: 3.0.STABLE6 -Release: 2%{?dist} +Version: 3.0.STABLE7 +Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2+ @@ -20,7 +20,6 @@ ## Source99: filter-requires-squid.sh # Upstream patches -Patch0: squid-3.0.STABLE5-bad_allocation # External patches @@ -59,8 +58,6 @@ %prep %setup -q -%patch0 -p1 -b .bad_allocation - %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build @@ -340,6 +337,10 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Wed Jul 02 2008 Jiri Skala - 7:3.0.STABLE7-1 +- update to latest upstream +- fix #453214 + * Mon May 26 2008 Martin Nagy - 7:3.0.STABLE6-2 - fix bad allocation From fedora-extras-commits at redhat.com Wed Jul 2 08:36:15 2008 From: fedora-extras-commits at redhat.com (Jiri Skala (jskala)) Date: Wed, 2 Jul 2008 08:36:15 GMT Subject: rpms/squid/devel squid-3.0.STABLE5-bad_allocation,1.2,NONE Message-ID: <200807020836.m628aFCW028719@cvs-int.fedora.redhat.com> Author: jskala Update of /cvs/extras/rpms/squid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28701 Removed Files: squid-3.0.STABLE5-bad_allocation Log Message: * Wed Jul 02 2008 Jiri Skala - 7:3.0.STABLE7-1 - update to latest upstream - fix #453214 --- squid-3.0.STABLE5-bad_allocation DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 08:39:27 2008 From: fedora-extras-commits at redhat.com (Kushal Das (kushal)) Date: Wed, 2 Jul 2008 08:39:27 GMT Subject: rpms/pem/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 pem.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807020839.m628dRbA028938@cvs-int.fedora.redhat.com> Author: kushal Update of /cvs/pkgs/rpms/pem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28865/devel Modified Files: .cvsignore pem.spec sources Added Files: import.log Log Message: New source --- NEW FILE import.log --- pem-0_7_2-1_fc9:HEAD:pem-0.7.2-1.fc9.src.rpm:1214987836 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pem/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 May 2008 10:57:31 -0000 1.2 +++ .cvsignore 2 Jul 2008 08:38:37 -0000 1.3 @@ -1 +1 @@ -pem-0.7.1.tar.gz +pem-0.7.2.tar.gz Index: pem.spec =================================================================== RCS file: /cvs/pkgs/rpms/pem/devel/pem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pem.spec 4 May 2008 10:57:31 -0000 1.1 +++ pem.spec 2 Jul 2008 08:38:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: pem -Version: 0.7.1 -Release: 4%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: Personal Expenses Manager Group: Applications/Productivity @@ -55,6 +55,9 @@ %changelog +* Wed Jul 2 2008 Kushal Das - 0.7.2-1 +- New release of pem + * Sun May 4 2008 Kushal Das - 0.7.1-4 - Fixed the description Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pem/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 May 2008 10:57:31 -0000 1.2 +++ sources 2 Jul 2008 08:38:37 -0000 1.3 @@ -1 +1 @@ -5ea6f0167641c50ab6cb0482e8aeca96 pem-0.7.1.tar.gz +d575366fd6a2118262abd1e9b400b519 pem-0.7.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 08:49:34 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Wed, 2 Jul 2008 08:49:34 GMT Subject: rpms/elinks/devel .cvsignore, 1.23, 1.24 elinks-0.10.1-utf_8_io-default.patch, 1.1, 1.2 elinks-0.11.0-getaddrinfo.patch, 1.1, 1.2 elinks-0.11.0-union.patch, 1.1, 1.2 elinks.spec, 1.53, 1.54 sources, 1.23, 1.24 elinks-0.11.1-negotiate.patch, 1.3, NONE elinks-0.11.4rc0-chunkedgzip.patch, 1.1, NONE Message-ID: <200807020849.m628nYYw029436@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/elinks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29357 Modified Files: .cvsignore elinks-0.10.1-utf_8_io-default.patch elinks-0.11.0-getaddrinfo.patch elinks-0.11.0-union.patch elinks.spec sources Removed Files: elinks-0.11.1-negotiate.patch elinks-0.11.4rc0-chunkedgzip.patch Log Message: Upgrade to new upstream pre-release, in general better than stable 0.11.4, solves several long-term elinks issues Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 21 Jun 2008 15:58:51 -0000 1.23 +++ .cvsignore 2 Jul 2008 08:48:38 -0000 1.24 @@ -1 +1 @@ -elinks-0.11.4.tar.bz2 +elinks-0.12pre1.tar.bz2 elinks-0.10.1-utf_8_io-default.patch: Index: elinks-0.10.1-utf_8_io-default.patch =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.10.1-utf_8_io-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elinks-0.10.1-utf_8_io-default.patch 28 Jan 2005 18:11:50 -0000 1.1 +++ elinks-0.10.1-utf_8_io-default.patch 2 Jul 2008 08:48:38 -0000 1.2 @@ -1,11 +1,12 @@ ---- elinks-0.10.1/src/config/options.inc.utf_8_io-default 2005-01-04 01:42:56.000000000 +0100 -+++ elinks-0.10.1/src/config/options.inc 2005-01-28 17:54:42.568968720 +0100 -@@ -747,7 +747,7 @@ - "terminal.")), - +diff -urNp elinks-0.12pre1-orig/src/config/options.inc elinks-0.12pre1/src/config/options.inc +--- elinks-0.12pre1-orig/src/config/options.inc 2008-07-01 02:11:44.000000000 +0200 ++++ elinks-0.12pre1/src/config/options.inc 2008-07-01 16:00:34.000000000 +0200 +@@ -859,7 +859,7 @@ static struct option_info config_options + * not defined, it should not be possible to set UTF-8 as "codepage"; + * please report any such possibilities as bugs.) */ INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"), - "utf_8_io", 0, 0, + "utf_8_io", 0, 1, - N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n" - "only the subset of UTF8 according to terminal codepage is used.")), - + N_("Enable I/O in UTF-8 for Unicode terminals. Note that currently,\n" + "only the subset of UTF-8 according to terminal codepage is used.\n" + "ELinks ignores this option if the terminal codepage is UTF-8.")), elinks-0.11.0-getaddrinfo.patch: Index: elinks-0.11.0-getaddrinfo.patch =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.11.0-getaddrinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elinks-0.11.0-getaddrinfo.patch 10 Jan 2006 09:53:49 -0000 1.1 +++ elinks-0.11.0-getaddrinfo.patch 2 Jul 2008 08:48:38 -0000 1.2 @@ -7,7 +7,7 @@ + hint.ai_flags = AI_ADDRCONFIG; hint.ai_family = AF_UNSPEC; hint.ai_socktype = SOCK_STREAM; -- if (getaddrinfo(name, NULL, &hint, &ai) != 0) return -1; +- if (getaddrinfo(name, NULL, &hint, &ai) != 0) return DNS_ERROR; + switch (getaddrinfo(name, NULL, &hint, &ai)) + { + case 0: @@ -18,7 +18,7 @@ + break; + /* fall through */ + default: -+ return -1; ++ return DNS_ERROR; + } #else elinks-0.11.0-union.patch: Index: elinks-0.11.0-union.patch =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.11.0-union.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elinks-0.11.0-union.patch 10 Jan 2006 09:53:49 -0000 1.1 +++ elinks-0.11.0-union.patch 2 Jul 2008 08:48:38 -0000 1.2 @@ -4,7 +4,7 @@ }; #define INIT_OPTION(name, flags, type, min, max, value, desc, capt) \ -- { NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { (struct list_head *) (value) }, desc, capt } +- { NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { (LIST_OF(struct option) *) (value) }, desc, capt } + { NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { value }, desc, capt } extern struct option *config_options; Index: elinks.spec =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- elinks.spec 21 Jun 2008 15:58:51 -0000 1.53 +++ elinks.spec 2 Jul 2008 08:48:38 -0000 1.54 @@ -1,11 +1,11 @@ Name: elinks Summary: A text-mode Web browser -Version: 0.11.4 -Release: 1%{?dist} +Version: 0.12 +Release: 0.1.pre1%{?dist} License: GPLv2 URL: http://elinks.or.cz Group: Applications/Internet -Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 +Source: http://elinks.or.cz/download/elinks-%{version}pre1.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -13,6 +13,7 @@ BuildRequires: bzip2-devel BuildRequires: expat-devel BuildRequires: libidn-devel +Requires: zlib >= 1.2.0.2 Provides: webclient Obsoletes: links @@ -26,9 +27,7 @@ Patch4: elinks-0.11.0-sysname.patch Patch5: elinks-0.10.1-xterm.patch Patch6: elinks-0.11.0-union.patch -Patch7: elinks-0.11.1-negotiate.patch -Patch8: elinks-0.11.3-macropen.patch -Patch9: elinks-0.11.4rc0-chunkedgzip.patch +Patch7: elinks-0.11.3-macropen.patch %description Links is a text-based Web browser. Links does not display any images, @@ -37,7 +36,7 @@ quickly and swiftly displays Web pages. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}pre1 # Prevent crash when HOME is unset (bug #90663). %patch0 -p1 @@ -52,12 +51,8 @@ %patch5 -p1 # Fix #157300 - Strange behavior on ppc64 %patch6 -p1 -# Fix #194096 ??? elinks should support negotiate-auth -%patch7 -p1 # fix for open macro in new glibc -%patch8 -p1 -# fix for broken gzip compression for chunked pages -%patch9 -p1 +%patch7 -p1 %build ./autogen.sh @@ -88,6 +83,13 @@ %{_mandir}/man5/* %changelog +* Tue Jul 1 2008 Ondrej Vasik 0.12-0.1.pre1 +- unstable elinks-0.12 pre1, solves several long-term issues + unsolvable (or very hard to solve) in 0.11.4 (like #173411), + in general is elinks-0.12pre1 considered better than 0.11.4 +- dropped patches negotiate-auth, chunkedgzip - included in 0.12pre1, + modified few others due source code changes + * Sat Jun 21 2008 Ondrej Vasik 0.11.4-1 - new stable upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 21 Jun 2008 15:58:51 -0000 1.23 +++ sources 2 Jul 2008 08:48:38 -0000 1.24 @@ -1 +1 @@ -88036a518ebc4f1150a7e14b29f9d8db elinks-0.11.4.tar.bz2 +23f745c33ea91f91ef5b2db385efdfff elinks-0.12pre1.tar.bz2 --- elinks-0.11.1-negotiate.patch DELETED --- --- elinks-0.11.4rc0-chunkedgzip.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 09:07:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 2 Jul 2008 09:07:29 GMT Subject: rpms/perl/F-9 perl.spec,1.175,1.176 Message-ID: <200807020907.m6297TU3004447@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4345 Modified Files: perl.spec Log Message: * Wed Jul 2 2008 Marcela Maslanova 4:5.10.0-30.fc9 - 453646 use -DPERL_USE_SAFE_PUTENV. Without fail some modules f.e. readline. Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/F-9/perl.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- perl.spec 26 Jun 2008 23:55:05 -0000 1.175 +++ perl.spec 2 Jul 2008 09:05:18 -0000 1.176 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 29%{?dist} +Release: 30%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -869,7 +869,7 @@ # sitedir as well for 32bit archs, via -Dotherlibdirs. No need to mention the # arch-specific subdir though, perl will add it, if it exists. -/bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \ +/bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS -DPERL_USE_SAFE_PUTENV" \ -Dversion=%{perl_version} \ -Dmyhostname=localhost \ -Dperladmin=root at localhost \ @@ -1636,6 +1636,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Wed Jul 2 2008 Marcela Maslanova 4:5.10.0-30.fc9 +- 453646 use -DPERL_USE_SAFE_PUTENV. Without fail some modules f.e. readline. + * Fri Jun 27 2008 Stepan Kasal 4:5.10.0-29.fc9 - add compatibility paths to @INC on 32bit archs (#452898), but do not explicitly mention the arch-specific subdir of it, perl adds it From fedora-extras-commits at redhat.com Wed Jul 2 09:24:07 2008 From: fedora-extras-commits at redhat.com (Jiri Skala (jskala)) Date: Wed, 2 Jul 2008 09:24:07 GMT Subject: rpms/squid/F-9 .cvsignore, 1.32, 1.33 sources, 1.34, 1.35 squid.spec, 1.98, 1.99 squid-3.0.STABLE5-bad_allocation, 1.1, NONE Message-ID: <200807020924.m629O7DE005069@cvs-int.fedora.redhat.com> Author: jskala Update of /cvs/extras/rpms/squid/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5023 Modified Files: .cvsignore sources squid.spec Removed Files: squid-3.0.STABLE5-bad_allocation Log Message: * Mon Jun 30 2008 Jiri Skala - 7:3.0.STABLE7-1 - upgrade to latest upstream - fix CVE-2004-0918 Squid SNMP DoS [Fedora 9] (#453214) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/squid/F-9/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 26 May 2008 09:56:05 -0000 1.32 +++ .cvsignore 2 Jul 2008 09:23:20 -0000 1.33 @@ -1 +1,2 @@ squid-3.0.STABLE6.tar.bz2 +squid-3.0.STABLE7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/squid/F-9/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 26 May 2008 09:56:05 -0000 1.34 +++ sources 2 Jul 2008 09:23:20 -0000 1.35 @@ -1 +1 @@ -231323a73346041cec825e785960e348 squid-3.0.STABLE6.tar.bz2 +fa0fc5a3ce226099975b34c1cd2a3f95 squid-3.0.STABLE7.tar.bz2 Index: squid.spec =================================================================== RCS file: /cvs/extras/rpms/squid/F-9/squid.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- squid.spec 26 May 2008 09:56:05 -0000 1.98 +++ squid.spec 2 Jul 2008 09:23:20 -0000 1.99 @@ -3,7 +3,7 @@ ## % define __find_requires %{SOURCE99} Name: squid -Version: 3.0.STABLE6 +Version: 3.0.STABLE7 Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 @@ -20,7 +20,6 @@ ## Source99: filter-requires-squid.sh # Upstream patches -Patch0: squid-3.0.STABLE5-bad_allocation # External patches @@ -59,8 +58,6 @@ %prep %setup -q -%patch0 -p1 -b .bad_allocation - %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build @@ -339,6 +336,10 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Mon Jun 30 2008 Jiri Skala - 7:3.0.STABLE7-1 +- upgrade to latest upstream +- fix CVE-2004-0918 Squid SNMP DoS [Fedora 9] (#453214) + * Mon May 26 2008 Martin Nagy - 7:3.0.STABLE6-1 - upgrade to latest upstream - fix bad allocation (#447045) --- squid-3.0.STABLE5-bad_allocation DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 09:27:42 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Wed, 2 Jul 2008 09:27:42 GMT Subject: rpms/xenner/devel .cvsignore, 1.13, 1.14 sources, 1.12, 1.13 xenner.spec, 1.20, 1.21 Message-ID: <200807020927.m629RgEK005306@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5273 Modified Files: .cvsignore sources xenner.spec Log Message: - update to version 0.38 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 9 Jun 2008 21:46:02 -0000 1.13 +++ .cvsignore 2 Jul 2008 09:27:06 -0000 1.14 @@ -1 +1 @@ -xenner-0.37.tar.gz +xenner-0.38.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 9 Jun 2008 21:46:02 -0000 1.12 +++ sources 2 Jul 2008 09:27:06 -0000 1.13 @@ -1 +1 @@ -e3912b0885c973a1beeb760ed4428503 xenner-0.37.tar.gz +3dbc3cfcba5e80b591bbdc9675846b7c xenner-0.38.tar.gz Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xenner.spec 9 Jun 2008 21:46:02 -0000 1.20 +++ xenner.spec 2 Jul 2008 09:27:06 -0000 1.21 @@ -1,6 +1,6 @@ Name: xenner License: GPLv2+ -Version: 0.37 +Version: 0.38 Release: 1%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators @@ -57,6 +57,8 @@ rm -rf %{buildroot} %changelog +* Mon Jul 2 2008 Gerd Hoffmann - 0.38-1.fc10 +- update to version 0.38 * Mon Jun 9 2008 Gerd Hoffmann - 0.37-1.fc10 - update to version 0.37 - make fedora 9 and opensuse 10.3 guests fly. From fedora-extras-commits at redhat.com Wed Jul 2 10:05:20 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Wed, 2 Jul 2008 10:05:20 GMT Subject: rpms/openldap/devel openldap-2.3.27-ber-decode.patch, NONE, 1.1 openldap.spec, 1.126, 1.127 Message-ID: <200807021005.m62A5KJ7013041@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/openldap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12992 Modified Files: openldap.spec Added Files: openldap-2.3.27-ber-decode.patch Log Message: fix CVE-2008-2952 Resolves: #453728 openldap-2.3.27-ber-decode.patch: --- NEW FILE openldap-2.3.27-ber-decode.patch --- 453637, 453638, 453639, 453640,453444: CVE-2008-2952 OpenLDAP denial-of-service flaw in ASN.1 decoder Source: upstream, cvs diff -r 1.120 -r 1.122 libraries/liblber/io.c Index: libraries/liblber/io.c =================================================================== RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblber/io.c,v retrieving revision 1.120 retrieving revision 1.122 diff -u -r1.120 -r1.122 --- libraries/liblber/io.c 7 Jan 2008 23:20:03 -0000 1.120 +++ libraries/liblber/io.c 1 Jul 2008 23:33:15 -0000 1.122 @@ -522,14 +522,18 @@ } while (ber->ber_rwptr > (char *)&ber->ber_tag && ber->ber_rwptr < - (char *)&ber->ber_len + LENSIZE*2 -1) { + (char *)&ber->ber_len + LENSIZE*2) { ber_slen_t sblen; char buf[sizeof(ber->ber_len)-1]; ber_len_t tlen = 0; + /* The tag & len can be at most 9 bytes; we try to read up to 8 here */ sock_errset(0); - sblen=ber_int_sb_read( sb, ber->ber_rwptr, - ((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr); + sblen=((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr; + /* Trying to read the last len byte of a 9 byte tag+len */ + if (sblen<1) + sblen = 1; + sblen=ber_int_sb_read( sb, ber->ber_rwptr, sblen ); if (sblen<=0) return LBER_DEFAULT; ber->ber_rwptr += sblen; @@ -579,7 +583,7 @@ int i; unsigned char *p = (unsigned char *)ber->ber_ptr; int llen = *p++ & 0x7f; - if (llen > (int)sizeof(ber_len_t)) { + if (llen > LENSIZE) { sock_errset(ERANGE); return LBER_DEFAULT; } Index: openldap.spec =================================================================== RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- openldap.spec 12 Jun 2008 07:42:29 -0000 1.126 +++ openldap.spec 2 Jul 2008 10:04:30 -0000 1.127 @@ -11,7 +11,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz @@ -34,6 +34,7 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.patch Patch9: openldap-2.3.37-smbk5pwd.patch Patch10: openldap-2.4.6-multilib.patch +Patch11: openldap-2.3.27-ber-decode.patch # Patches for the evolution library Patch200: openldap-2.4.6-evolution-ntlm.patch @@ -131,6 +132,7 @@ %patch6 -p1 -b .gethostbyname_r %patch9 -p1 -b .smbk5pwd %patch10 -p1 -b .multilib +%patch11 -p0 -b .ber-decode cp %{_datadir}/libtool/config.{sub,guess} build/ popd @@ -597,6 +599,9 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Wed Jul 2 2008 Jan Safranek 2.4.10-2 +- fix CVE-2008-2952 (#453728) + * Thu Jun 12 2008 Jan Safranek 2.4.10-1 - new upstream release From fedora-extras-commits at redhat.com Wed Jul 2 10:09:21 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Wed, 2 Jul 2008 10:09:21 GMT Subject: rpms/openldap/F-9 openldap-2.3.27-ber-decode.patch, NONE, 1.1 openldap.spec, 1.123, 1.124 Message-ID: <200807021009.m62A9LOL013233@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/openldap/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13188 Modified Files: openldap.spec Added Files: openldap-2.3.27-ber-decode.patch Log Message: fix CVE-2008-2952 Resolves: #453727 openldap-2.3.27-ber-decode.patch: --- NEW FILE openldap-2.3.27-ber-decode.patch --- 453637, 453638, 453639, 453640,453444: CVE-2008-2952 OpenLDAP denial-of-service flaw in ASN.1 decoder Source: upstream, cvs diff -r 1.120 -r 1.122 libraries/liblber/io.c Index: libraries/liblber/io.c =================================================================== RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblber/io.c,v retrieving revision 1.120 retrieving revision 1.122 diff -u -r1.120 -r1.122 --- libraries/liblber/io.c 7 Jan 2008 23:20:03 -0000 1.120 +++ libraries/liblber/io.c 1 Jul 2008 23:33:15 -0000 1.122 @@ -522,14 +522,18 @@ } while (ber->ber_rwptr > (char *)&ber->ber_tag && ber->ber_rwptr < - (char *)&ber->ber_len + LENSIZE*2 -1) { + (char *)&ber->ber_len + LENSIZE*2) { ber_slen_t sblen; char buf[sizeof(ber->ber_len)-1]; ber_len_t tlen = 0; + /* The tag & len can be at most 9 bytes; we try to read up to 8 here */ sock_errset(0); - sblen=ber_int_sb_read( sb, ber->ber_rwptr, - ((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr); + sblen=((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr; + /* Trying to read the last len byte of a 9 byte tag+len */ + if (sblen<1) + sblen = 1; + sblen=ber_int_sb_read( sb, ber->ber_rwptr, sblen ); if (sblen<=0) return LBER_DEFAULT; ber->ber_rwptr += sblen; @@ -579,7 +583,7 @@ int i; unsigned char *p = (unsigned char *)ber->ber_ptr; int llen = *p++ & 0x7f; - if (llen > (int)sizeof(ber_len_t)) { + if (llen > LENSIZE) { sock_errset(ERANGE); return LBER_DEFAULT; } Index: openldap.spec =================================================================== RCS file: /cvs/pkgs/rpms/openldap/F-9/openldap.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- openldap.spec 6 Jun 2008 08:13:25 -0000 1.123 +++ openldap.spec 2 Jul 2008 10:08:26 -0000 1.124 @@ -33,6 +33,7 @@ Patch9: openldap-2.3.37-smbk5pwd.patch Patch10: openldap-2.4.6-multilib.patch Patch11: openldap-2.4.9-evolution-crash.patch +Patch12: openldap-2.3.27-ber-decode.patch # Patches for the evolution library Patch200: openldap-2.4.6-evolution-ntlm.patch @@ -134,6 +135,7 @@ %patch9 -p1 -b .smbk5pwd %patch10 -p1 -b .multilib %patch11 -p1 -b .evolution-crash +%patch12 -p0 -b .ber-decode cp %{_datadir}/libtool/config.{sub,guess} build/ popd @@ -563,6 +565,9 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Wed Jul 2 2008 Jan Safranek 2.4.8-6 +- fix CVE-2008-2952 (#453727) + * Fri Jun 6 2008 Jan Safranek 2.4.8-5 - fix a crash (#450017) From fedora-extras-commits at redhat.com Wed Jul 2 10:10:37 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Wed, 2 Jul 2008 10:10:37 GMT Subject: rpms/openldap/F-9 openldap.spec,1.124,1.125 Message-ID: <200807021010.m62AAbwC013329@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/openldap/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13301 Modified Files: openldap.spec Log Message: version++ Index: openldap.spec =================================================================== RCS file: /cvs/pkgs/rpms/openldap/F-9/openldap.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- openldap.spec 2 Jul 2008 10:08:26 -0000 1.124 +++ openldap.spec 2 Jul 2008 10:10:06 -0000 1.125 @@ -8,7 +8,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version} -Release: 5%{?dist} +Release: 6%{?dist} License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz From fedora-extras-commits at redhat.com Wed Jul 2 10:12:17 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Wed, 2 Jul 2008 10:12:17 GMT Subject: rpms/openldap/F-8 openldap-2.3.27-ber-decode.patch, NONE, 1.1 openldap.spec, 1.101, 1.102 Message-ID: <200807021012.m62ACHua013507@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/openldap/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13466 Modified Files: openldap.spec Added Files: openldap-2.3.27-ber-decode.patch Log Message: fix CVE-2008-2952 Resolves: #453726 openldap-2.3.27-ber-decode.patch: --- NEW FILE openldap-2.3.27-ber-decode.patch --- 453637, 453638, 453639, 453640,453444: CVE-2008-2952 OpenLDAP denial-of-service flaw in ASN.1 decoder Source: upstream, cvs diff -r 1.120 -r 1.122 libraries/liblber/io.c Index: libraries/liblber/io.c =================================================================== RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblber/io.c,v retrieving revision 1.120 retrieving revision 1.122 diff -u -r1.120 -r1.122 --- libraries/liblber/io.c 7 Jan 2008 23:20:03 -0000 1.120 +++ libraries/liblber/io.c 1 Jul 2008 23:33:15 -0000 1.122 @@ -522,14 +522,18 @@ } while (ber->ber_rwptr > (char *)&ber->ber_tag && ber->ber_rwptr < - (char *)&ber->ber_len + LENSIZE*2 -1) { + (char *)&ber->ber_len + LENSIZE*2) { ber_slen_t sblen; char buf[sizeof(ber->ber_len)-1]; ber_len_t tlen = 0; + /* The tag & len can be at most 9 bytes; we try to read up to 8 here */ sock_errset(0); - sblen=ber_int_sb_read( sb, ber->ber_rwptr, - ((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr); + sblen=((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr; + /* Trying to read the last len byte of a 9 byte tag+len */ + if (sblen<1) + sblen = 1; + sblen=ber_int_sb_read( sb, ber->ber_rwptr, sblen ); if (sblen<=0) return LBER_DEFAULT; ber->ber_rwptr += sblen; @@ -579,7 +583,7 @@ int i; unsigned char *p = (unsigned char *)ber->ber_ptr; int llen = *p++ & 0x7f; - if (llen > (int)sizeof(ber_len_t)) { + if (llen > LENSIZE) { sock_errset(ERANGE); return LBER_DEFAULT; } Index: openldap.spec =================================================================== RCS file: /cvs/pkgs/rpms/openldap/F-8/openldap.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- openldap.spec 8 Feb 2008 14:09:22 -0000 1.101 +++ openldap.spec 2 Jul 2008 10:11:47 -0000 1.102 @@ -12,7 +12,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version_23} -Release: 3%{?dist} +Release: 4%{?dist} License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz @@ -39,6 +39,7 @@ Patch8: openldap-2.3.34-pthread.patch Patch9: openldap-2.3.37-smbk5pwd.patch Patch10: openldap-2.3.27-modify-noop.patch +Patch11: openldap-2.3.27-ber-decode.patch # Patches for 2.2.29 for the compat-openldap package. Patch100: openldap-2.2.13-tls-fix-connection-test.patch @@ -174,6 +175,7 @@ %patch8 -p1 -b .pthread %patch9 -p1 -b .smbk5pwd %patch10 -p0 -b .modify-noop +%patch11 -p0 -b .ber-decode cp %{_datadir}/libtool/config.{sub,guess} build/ popd @@ -676,7 +678,10 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog -* Fri Feb 8 2008 Jan Safranek 2.3.39-2 +* Wed Jul 2 2008 Jan Safranek 2.3.39-4 +- fix CVE-2008-2952 (#453726) + +* Fri Feb 8 2008 Jan Safranek 2.3.39-3 - fix CVE-2008-0658 (#432013) * Mon Jan 14 2008 Jan Safranek 2.3.39-2 From fedora-extras-commits at redhat.com Wed Jul 2 10:14:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc)) Date: Wed, 2 Jul 2008 10:14:40 GMT Subject: rpms/licq/F-9 licq-1.3.5-logonfix.patch, NONE, 1.1 licq.spec, 1.24, 1.25 Message-ID: <200807021014.m62AEeV8013663@cvs-int.fedora.redhat.com> Author: jmoskovc Update of /cvs/extras/rpms/licq/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13621 Modified Files: licq.spec Added Files: licq-1.3.5-logonfix.patch Log Message: Fixed problem with logon to icq server (rhbz#453682) licq-1.3.5-logonfix.patch: --- NEW FILE licq-1.3.5-logonfix.patch --- --- licq-1.3.5/src/icqpacket.cpp +++ licq-1.3.5/src/icqpacket.cpp @@ -821,7 +821,7 @@ // Static versioning buffer->PackUnsignedLongBE(0x00160002); - buffer->PackUnsignedShortBE(0x010A); + buffer->PackUnsignedShortBE(0x010B); // Client version major (4 == ICQ2000, 5 == ICQ2001) buffer->PackUnsignedLongBE(0x00170002); buffer->PackUnsignedShortBE(0x0014); Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/F-9/licq.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- licq.spec 12 May 2008 12:45:05 -0000 1.24 +++ licq.spec 2 Jul 2008 10:14:03 -0000 1.25 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2 @@ -16,6 +16,7 @@ BuildRequires: gettext, automake, libtool Patch0: licq-1.3.5-gcc43.patch Patch1: licq-1.3.5-dos.patch +Patch2: licq-1.3.5-logonfix.patch %package kde Summary: Licq plugin for KDE @@ -74,6 +75,7 @@ tar -C plugins -xjf %{SOURCE1} %patch0 -p1 -b .gcc43.patch %patch1 -p1 -b .dos +%patch2 -p1 -b .logonfix #remove cvs stuff rm -rf `find . -name CVS` @@ -228,6 +230,10 @@ %doc plugins/auto-reply/{README,licq_autoreply.conf,examples} %changelog +* Wed Jul 2 2008 Jiri Moskovcak 1.3.5-3 +- fixed problem with logon to icq server +- Resolves: #453682 + * Mon May 12 2008 Jiri Moskovcak 1.3.5-2 - fixed DoS vulnerability CVE-2008-1996 From fedora-extras-commits at redhat.com Wed Jul 2 10:19:14 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc)) Date: Wed, 2 Jul 2008 10:19:14 GMT Subject: rpms/licq/devel licq-1.3.5-logonfix.patch, NONE, 1.1 licq.spec, 1.24, 1.25 Message-ID: <200807021019.m62AJEVo013862@cvs-int.fedora.redhat.com> Author: jmoskovc Update of /cvs/extras/rpms/licq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802 Modified Files: licq.spec Added Files: licq-1.3.5-logonfix.patch Log Message: fixed problem with logon to icq server. (rhbz#453682) licq-1.3.5-logonfix.patch: --- NEW FILE licq-1.3.5-logonfix.patch --- --- licq-1.3.5/src/icqpacket.cpp +++ licq-1.3.5/src/icqpacket.cpp @@ -821,7 +821,7 @@ // Static versioning buffer->PackUnsignedLongBE(0x00160002); - buffer->PackUnsignedShortBE(0x010A); + buffer->PackUnsignedShortBE(0x010B); // Client version major (4 == ICQ2000, 5 == ICQ2001) buffer->PackUnsignedLongBE(0x00170002); buffer->PackUnsignedShortBE(0x0014); Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- licq.spec 12 May 2008 12:48:40 -0000 1.24 +++ licq.spec 2 Jul 2008 10:18:24 -0000 1.25 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2 @@ -16,6 +16,7 @@ BuildRequires: gettext, automake, libtool Patch0: licq-1.3.5-gcc43.patch Patch1: licq-1.3.5-dos.patch +Patch2: licq-1.3.5-logonfix.patch %package kde Summary: Licq plugin for KDE @@ -74,6 +75,7 @@ tar -C plugins -xjf %{SOURCE1} %patch0 -p1 -b .gcc43.patch %patch1 -p1 -b .dos +%patch2 -p1 -b .logonfix #remove cvs stuff rm -rf `find . -name CVS` @@ -113,7 +115,6 @@ --with-qt-libraries=%{_libdir}/qt-3.3/lib/ \ --with-qt-moc=%{_libdir}/qt-3.3/bin/moc \ QT_LUPDATE=/usr/lib/qt-3.3/bin/lupdate -# QT_LRELEASE=/usr/lib/qt-3.3/bin/lrelease make cd ../osd %configure --libdir=%{_libdir}/ @@ -229,6 +230,10 @@ %doc plugins/auto-reply/{README,licq_autoreply.conf,examples} %changelog +* Wed Jul 2 2008 Jiri Moskovcak 1.3.5-3 +- fixed problem with logon to icq server +- Resolves: #453682 + * Mon May 12 2008 Jiri Moskovcak 1.3.5-2 - fixed possible DoS vulnerability CVE-2008-1996 From fedora-extras-commits at redhat.com Wed Jul 2 11:13:42 2008 From: fedora-extras-commits at redhat.com (Peter Robinson (pbrobinson)) Date: Wed, 2 Jul 2008 11:13:42 GMT Subject: rpms/geoclue/devel geoclue.spec,1.2,1.3 Message-ID: <200807021113.m62BDgOC022058@cvs-int.fedora.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21993 Modified Files: geoclue.spec Log Message: Fixed spec file so gpsd and gypsy are actually properly in a subpackage Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geoclue.spec 18 May 2008 20:51:00 -0000 1.2 +++ geoclue.spec 2 Jul 2008 11:12:54 -0000 1.3 @@ -46,6 +46,7 @@ Summary: gpsd provider for geoclue Group: Development/Libraries Requires: geoclue = %{PACKAGE_VERSION} +Requires: gpsd %description gpsd A gpsd provider for geoclue @@ -54,6 +55,7 @@ Summary: gypsy provider for geoclue Group: Development/Libraries Requires: geoclue = %{PACKAGE_VERSION} +Requires: gypsy %description gypsy A gypsy provider for geoclue @@ -83,9 +85,29 @@ %dir %{_datadir}/geoclue-providers %{_libdir}/libgeoclue.so.0 %{_libdir}/libgeoclue.so.0.0.0 -%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.* -%{_datadir}/geoclue-providers/geoclue-* -%{_libexecdir}/geoclue-* +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Master.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service +%{_datadir}/geoclue-providers/geoclue-example.provider +%{_datadir}/geoclue-providers/geoclue-geonames.provider +%{_datadir}/geoclue-providers/geoclue-hostip.provider +%{_datadir}/geoclue-providers/geoclue-localnet.provider +%{_datadir}/geoclue-providers/geoclue-manual.provider +%{_datadir}/geoclue-providers/geoclue-plazes.provider +%{_datadir}/geoclue-providers/geoclue-yahoo.provider +%{_libexecdir}/geoclue-example +%{_libexecdir}/geoclue-geonames +%{_libexecdir}/geoclue-hostip +%{_libexecdir}/geoclue-localnet +%{_libexecdir}/geoclue-manual +%{_libexecdir}/geoclue-master +%{_libexecdir}/geoclue-plazes +%{_libexecdir}/geoclue-yahoo %files devel %defattr(-,root,root,-) @@ -101,11 +123,18 @@ %files gpsd %{_libexecdir}/geoclue-gpsd +%{_datadir}/geoclue-providers/geoclue-gpsd.provider +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service %files gypsy %{_libexecdir}/geoclue-gypsy +%{_datadir}/geoclue-providers/geoclue-gypsy.provider +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service %changelog +* Wed Jul 2 2008 Peter Robinson 0.11.1-6 +- Fixed spec file so gpsd and gypsy are actually properly in a subpackage + * Sun May 18 2008 Peter Robinson 0.11.1-5 - Added gypsy and gpsd providers to build as sub packages From fedora-extras-commits at redhat.com Wed Jul 2 11:17:24 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Wed, 2 Jul 2008 11:17:24 GMT Subject: rpms/vnc/devel vnc.spec,1.193,1.194 vnc-noxkb.patch,1.1,NONE Message-ID: <200807021117.m62BHOe7022245@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22208 Modified Files: vnc.spec Removed Files: vnc-noxkb.patch Log Message: - enabled XKEYBOARD extension (#450033) - icons have correct permissions (#453495) Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- vnc.spec 3 Jun 2008 08:57:07 -0000 1.193 +++ vnc.spec 2 Jul 2008 11:16:31 -0000 1.194 @@ -3,7 +3,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 31.1%{?dist} +Release: 32%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -38,7 +38,6 @@ Patch41: vnc-privates.patch Patch42: vnc-mieq.patch Patch43: vnc-allocate.patch -Patch44: vnc-noxkb.patch Patch45: vnc-paint.patch Patch46: vnc-selections.patch Patch48: vnc-manminor.patch @@ -54,7 +53,7 @@ BuildRequires: perl, openssl-devel, libpciaccess-devel BuildRequires: zlib-devel libjpeg-devel BuildRequires: desktop-file-utils >= 0.2.92 -BuildRequires: autoconf, automake, libtool, flex, bison, pkgconfig, patchutils +BuildRequires: autoconf, automake, libtool, flex, pkgconfig, patchutils BuildRequires: expat-devel, freetype-devel BuildRequires: libX11-devel, xorg-x11-xtrans-devel BuildRequires: libxkbfile-devel, libXfont-devel @@ -136,7 +135,6 @@ popd %patch42 -p1 -b .mieq %patch43 -p1 -b .alloc -%patch44 -p1 -b .noxkb %patch45 -p1 -b .paint %patch46 -p1 -b .selections %patch48 -p1 -b .minor @@ -176,7 +174,7 @@ --enable-xcsecurity \ --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ --with-fontdir=%{_datadir}/X11/fonts \ - --with-os-name="Fedora 9" \ + --with-os-name="Fedora 10" \ --with-os-vendor="Red Hat, Inc." \ --with-xkb-output=%{_localstatedir}/lib/xkb \ --with-rgb-path=%{_datadir}/X11/rgb \ @@ -244,9 +242,9 @@ chmod 644 $RPM_BUILD_ROOT/etc/sysconfig/vncservers mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps -install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png -install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png -install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png +install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png +install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications cat > vncviewer.desktop << EOF [Desktop Entry] @@ -335,6 +333,10 @@ %{_libdir}/librfb.so.* %changelog +* Tue Jul 01 2008 Adam Tkac 4.1.2-32 +- enabled XKEYBOARD extension (#450033) +- icons have correct permissions (#453495) + * Mon Jun 02 2008 Adam Tkac 4.1.2-31.1 - minor cleanup in IPv6 patch --- vnc-noxkb.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 11:19:31 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc)) Date: Wed, 2 Jul 2008 11:19:31 GMT Subject: rpms/licq/F-8 licq-1.3.4-logonfix.patch, NONE, 1.1 licq.spec, 1.22, 1.23 Message-ID: <200807021119.m62BJVdE022399@cvs-int.fedora.redhat.com> Author: jmoskovc Update of /cvs/extras/rpms/licq/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22337 Modified Files: licq.spec Added Files: licq-1.3.4-logonfix.patch Log Message: Fixed problem with logon to icq server.(rhbz#453682) licq-1.3.4-logonfix.patch: --- NEW FILE licq-1.3.4-logonfix.patch --- --- licq-1.3.4/src/icqpacket.cpp +++ licq-1.3.4/src/icqpacket.cpp @@ -777,7 +777,7 @@ // Static versioning buffer->PackUnsignedLongBE(0x00160002); - buffer->PackUnsignedShortBE(0x010A); + buffer->PackUnsignedShortBE(0x010B); // Client version major (4 == ICQ2000, 5 == ICQ2001) buffer->PackUnsignedLongBE(0x00170002); buffer->PackUnsignedShortBE(0x0014); Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/F-8/licq.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- licq.spec 12 May 2008 12:36:44 -0000 1.22 +++ licq.spec 2 Jul 2008 11:18:42 -0000 1.23 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2 @@ -16,6 +16,7 @@ BuildRequires: gettext, automake, libtool Patch0: licq-1.3.4-new_user_auth.patch Patch1: licq-1.3.5-dos.patch +Patch2: licq-1.3.4-logonfix.patch %package kde Summary: Licq plugin for KDE @@ -73,6 +74,7 @@ %setup -q %patch0 -p1 -b .new_user_auth %patch1 -p1 -b .dos +%patch2 -p1 -b .logonfix tar -C plugins -xjf %{SOURCE1} #remove cvs stuff @@ -226,7 +228,11 @@ %doc plugins/auto-reply/{README,licq_autoreply.conf,examples} %changelog -* Fri May 9 2008 Jiri Moskovcak 1.3.5-9 +* Wed Jul 2 2008 Jiri Moskovcak 1.3.4-10 +- fixed problem with logon to icq server +- Resolves: #453682 + +* Fri May 9 2008 Jiri Moskovcak 1.3.4-9 - fixed DoS vulnerability - CVE-2009-1996 * Mon Nov 26 2007 Jiri Moskovcak 1.3.4-8 From fedora-extras-commits at redhat.com Wed Jul 2 11:28:51 2008 From: fedora-extras-commits at redhat.com (Peter Robinson (pbrobinson)) Date: Wed, 2 Jul 2008 11:28:51 GMT Subject: rpms/geoclue/F-9 geoclue.spec,1.8,1.9 Message-ID: <200807021128.m62BSprS022818@cvs-int.fedora.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728 Modified Files: geoclue.spec Log Message: Fixed spec file so gpsd and gypsy are actually properly in a subpackage Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/F-9/geoclue.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- geoclue.spec 6 Jun 2008 19:31:22 -0000 1.8 +++ geoclue.spec 2 Jul 2008 11:28:03 -0000 1.9 @@ -1,6 +1,6 @@ Name: geoclue Version: 0.11.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Geoclue is a modular geoinformation service Group: System Environment/Libraries @@ -16,8 +16,8 @@ BuildRequires: GConf2-devel BuildRequires: gtk2-devel BuildRequires: NetworkManager-devel -BuildRequires: gpsd-devel BuildRequires: gypsy-devel +BuildRequires: gpsd-devel Requires: dbus @@ -46,6 +46,7 @@ Summary: gpsd provider for geoclue Group: Development/Libraries Requires: geoclue = %{PACKAGE_VERSION} +Requires: gpsd %description gpsd A gpsd provider for geoclue @@ -54,6 +55,7 @@ Summary: gypsy provider for geoclue Group: Development/Libraries Requires: geoclue = %{PACKAGE_VERSION} +Requires: gypsy %description gypsy A gypsy provider for geoclue @@ -83,9 +85,29 @@ %dir %{_datadir}/geoclue-providers %{_libdir}/libgeoclue.so.0 %{_libdir}/libgeoclue.so.0.0.0 -%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.* -%{_datadir}/geoclue-providers/geoclue-* -%{_libexecdir}/geoclue-* +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Master.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service +%{_datadir}/geoclue-providers/geoclue-example.provider +%{_datadir}/geoclue-providers/geoclue-geonames.provider +%{_datadir}/geoclue-providers/geoclue-hostip.provider +%{_datadir}/geoclue-providers/geoclue-localnet.provider +%{_datadir}/geoclue-providers/geoclue-manual.provider +%{_datadir}/geoclue-providers/geoclue-plazes.provider +%{_datadir}/geoclue-providers/geoclue-yahoo.provider +%{_libexecdir}/geoclue-example +%{_libexecdir}/geoclue-geonames +%{_libexecdir}/geoclue-hostip +%{_libexecdir}/geoclue-localnet +%{_libexecdir}/geoclue-manual +%{_libexecdir}/geoclue-master +%{_libexecdir}/geoclue-plazes +%{_libexecdir}/geoclue-yahoo %files devel %defattr(-,root,root,-) @@ -101,11 +123,18 @@ %files gpsd %{_libexecdir}/geoclue-gpsd +%{_datadir}/geoclue-providers/geoclue-gpsd.provider +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service %files gypsy %{_libexecdir}/geoclue-gypsy +%{_datadir}/geoclue-providers/geoclue-gypsy.provider +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service %changelog +* Wed Jul 2 2008 Peter Robinson 0.11.1-10 +- Fixed spec file so gpsd and gypsy are actually properly in a subpackage + * Fri Jun 6 2008 Peter Robinson 0.11.1-9 - increment build From fedora-extras-commits at redhat.com Wed Jul 2 11:29:18 2008 From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek)) Date: Wed, 2 Jul 2008 11:29:18 GMT Subject: rpms/sblim-cmpi-base/devel sblim-cmpi-base.spec,1.8,1.9 Message-ID: <200807021129.m62BTIfR022834@cvs-int.fedora.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/sblim-cmpi-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22781 Modified Files: sblim-cmpi-base.spec Log Message: Fix testsuite dependency Index: sblim-cmpi-base.spec =================================================================== RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sblim-cmpi-base.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sblim-cmpi-base.spec 1 Jul 2008 13:14:20 -0000 1.8 +++ sblim-cmpi-base.spec 2 Jul 2008 11:28:31 -0000 1.9 @@ -8,13 +8,13 @@ # %define tog_pegasus_version 2:2.6.1-1 -%define sblim_testsuite_version 1.2.4-1 +%define sblim_testsuite_version 1.2.4 %define provider_dir %{_libdir}/cmpi Summary: SBLIM CMPI Base Providers Name: sblim-cmpi-base Version: 1.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.sblim.org @@ -170,6 +170,9 @@ %{_datadir}/sblim-testsuite/cim/Linux_UnixProcess.cim %changelog +* Wed Jul 2 2008 Vitezslav Crhonek - 1.5.5-2 +- Fix testsuite dependency + * Tue Jul 1 2008 Vitezslav Crhonek - 1.5.5-1 - Update to 1.5.5 - Spec file revision From fedora-extras-commits at redhat.com Wed Jul 2 11:30:45 2008 From: fedora-extras-commits at redhat.com (Peter Robinson (pbrobinson)) Date: Wed, 2 Jul 2008 11:30:45 GMT Subject: rpms/geoclue/devel geoclue.spec,1.3,1.4 Message-ID: <200807021130.m62BUjZR022998@cvs-int.fedora.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22921 Modified Files: geoclue.spec Log Message: Actually increment build number Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geoclue.spec 2 Jul 2008 11:12:54 -0000 1.3 +++ geoclue.spec 2 Jul 2008 11:30:12 -0000 1.4 @@ -1,6 +1,6 @@ Name: geoclue Version: 0.11.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Geoclue is a modular geoinformation service Group: System Environment/Libraries From fedora-extras-commits at redhat.com Wed Jul 2 11:31:24 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Wed, 2 Jul 2008 11:31:24 GMT Subject: rpms/subversion/devel subversion.spec,1.115,1.116 Message-ID: <200807021131.m62BVOsH023036@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22978 Modified Files: subversion.spec Log Message: * Wed Jul 2 2008 Joe Orton 1.5.0-6 - build with OpenJDK Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- subversion.spec 2 Jul 2008 07:46:44 -0000 1.115 +++ subversion.spec 2 Jul 2008 11:30:22 -0000 1.116 @@ -1,7 +1,7 @@ # set to zero to avoid running test suite %define make_check 1 -%define with_java 0 +%define with_java 1 # set JDK path to build javahl; default for JPackage %define jdk_path /usr/lib/jvm/java @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 5 +Release: 6 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -85,7 +85,7 @@ Group: Development/Libraries Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-devel +BuildRequires: java-devel-openjdk %description javahl This package includes the JNI bindings to the Subversion libraries. @@ -275,6 +275,9 @@ %endif %changelog +* Wed Jul 2 2008 Joe Orton 1.5.0-6 +- build with OpenJDK + * Wed Jul 2 2008 Joe Orton 1.5.0-5 - fix files list From fedora-extras-commits at redhat.com Wed Jul 2 11:47:42 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 2 Jul 2008 11:47:42 GMT Subject: rpms/linuxdcpp/devel linuxdcpp-CVE-2008-2953.patch, NONE, 1.1 linuxdcpp-CVE-2008-2954.patch, NONE, 1.1 linuxdcpp.spec, 1.5, 1.6 Message-ID: <200807021147.m62BlgTK023735@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/linuxdcpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23678 Modified Files: linuxdcpp.spec Added Files: linuxdcpp-CVE-2008-2953.patch linuxdcpp-CVE-2008-2954.patch Log Message: - Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) linuxdcpp-CVE-2008-2953.patch: --- NEW FILE linuxdcpp-CVE-2008-2953.patch --- --- linuxdcpp-1.0.1/client/ShareManager.cpp 2007-10-06 02:12:32.000000000 +0200 +++ linuxdcpp-1.0.1/client/ShareManager.cpp.CVE-2008-2953 2008-07-02 13:24:03.000000000 +0200 @@ -926,6 +926,10 @@ } j = i + 1; } + + if(it == directories.end()) + return NULL; + for(ShareManager::Directory::MapIter it2 = it->second->directories.begin(); it2 != it->second->directories.end(); ++it2) { it2->second->toXml(sos, indent, tmp, recurse); } linuxdcpp-CVE-2008-2954.patch: --- NEW FILE linuxdcpp-CVE-2008-2954.patch --- --- linuxdcpp-1.0.1/client/NmdcHub.cpp 2007-11-05 06:33:42.000000000 +0100 +++ linuxdcpp-1.0.1/client/NmdcHub.cpp.CVE-2008-2954 2008-07-02 13:24:18.000000000 +0200 @@ -693,10 +693,14 @@ if(fromNick.empty()) return; + if(param.size() < j + 2) { + return; + } + string msg = param.substr(j + 2); + OnlineUser* replyTo = findUser(rtNick); OnlineUser* from = findUser(fromNick); - string msg = param.substr(j + 2); if(replyTo == NULL || from == NULL) { if(replyTo == 0) { // Assume it's from the hub Index: linuxdcpp.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxdcpp/devel/linuxdcpp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linuxdcpp.spec 13 Feb 2008 18:37:29 -0000 1.5 +++ linuxdcpp.spec 2 Jul 2008 11:46:54 -0000 1.6 @@ -1,6 +1,6 @@ Name: linuxdcpp Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Direct Connect client Group: Applications/Internet @@ -11,6 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: linuxdcpp-1.0.1-gcc43-compile-fix.patch +Patch1: linuxdcpp-CVE-2008-2953.patch +Patch2: linuxdcpp-CVE-2008-2954.patch BuildRequires: scons gtk2-devel >= 2.6.0 glib2-devel >= 2.4.0 pkgconfig BuildRequires: libglade2-devel >= 2.4.0 zlib-devel bzip2-devel openssl-devel @@ -23,6 +25,8 @@ %setup -q -c %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build CXXFLAGS="$RPM_OPT_FLAGS" scons %{?_smp_mflags} PREFIX="%{_prefix}" @@ -65,6 +69,9 @@ %{_datadir}/pixmaps/linuxdcpp.png %changelog +* Wed Jul 02 2008 Marcin Garski 1.0.1-3 +- Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) + * Wed Feb 13 2008 Marcin Garski 1.0.1-2 - GCC 4.3 compile fix From fedora-extras-commits at redhat.com Wed Jul 2 11:48:41 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 2 Jul 2008 11:48:41 GMT Subject: rpms/iprutils/devel iprutils-initscripts.patch, 1.1, 1.2 iprutils.spec, 1.31, 1.32 Message-ID: <200807021148.m62Bmf1U023854@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/iprutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23762 Modified Files: iprutils-initscripts.patch iprutils.spec Log Message: Fixed chkconfig issue - #453165 iprutils-initscripts.patch: Index: iprutils-initscripts.patch =================================================================== RCS file: /cvs/extras/rpms/iprutils/devel/iprutils-initscripts.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iprutils-initscripts.patch 10 Apr 2008 11:12:10 -0000 1.1 +++ iprutils-initscripts.patch 2 Jul 2008 11:47:54 -0000 1.2 @@ -11,7 +11,7 @@ -test -x $IPRDUMP || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter dump daemon +# processname: iprdump +# pidfile: /var/run/iprdump.pid @@ -141,7 +141,7 @@ -test -x $IPRUPDATE || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter update daemon +# processname: iprupdate +# pidfile: /var/run/iprupdate.pid @@ -289,7 +289,7 @@ -test -x $IPRINIT || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter initialization daemon +# processname: iprinit +# pidfile: /var/run/iprinit.pid Index: iprutils.spec =================================================================== RCS file: /cvs/extras/rpms/iprutils/devel/iprutils.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- iprutils.spec 10 Apr 2008 11:13:11 -0000 1.31 +++ iprutils.spec 2 Jul 2008 11:47:54 -0000 1.32 @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 4%{?dist} +Release: 5%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -11,7 +11,7 @@ #Patch1: %{name}-lsb-init-ectomy.patch Patch2: %{name}-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: ppc ppc64 +#ExclusiveArch: ppc ppc64 Requires: /sbin/pidof @@ -64,6 +64,9 @@ %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Jul 2 2008 Roman Rakus - 2.2.8-5 +- Fixed chkconfig issue - #453165 + * Wed Apr 9 2008 Roman Rakus - 2.2.8-4 - Rewrited initscripts for satisfying LSB spec From fedora-extras-commits at redhat.com Wed Jul 2 11:50:33 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 2 Jul 2008 11:50:33 GMT Subject: rpms/linuxdcpp/F-9 linuxdcpp-CVE-2008-2953.patch, NONE, 1.1 linuxdcpp-CVE-2008-2954.patch, NONE, 1.1 linuxdcpp.spec, 1.5, 1.6 Message-ID: <200807021150.m62BoXug024025@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/linuxdcpp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23973 Modified Files: linuxdcpp.spec Added Files: linuxdcpp-CVE-2008-2953.patch linuxdcpp-CVE-2008-2954.patch Log Message: - Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) linuxdcpp-CVE-2008-2953.patch: --- NEW FILE linuxdcpp-CVE-2008-2953.patch --- --- linuxdcpp-1.0.1/client/ShareManager.cpp 2007-10-06 02:12:32.000000000 +0200 +++ linuxdcpp-1.0.1/client/ShareManager.cpp.CVE-2008-2953 2008-07-02 13:24:03.000000000 +0200 @@ -926,6 +926,10 @@ } j = i + 1; } + + if(it == directories.end()) + return NULL; + for(ShareManager::Directory::MapIter it2 = it->second->directories.begin(); it2 != it->second->directories.end(); ++it2) { it2->second->toXml(sos, indent, tmp, recurse); } linuxdcpp-CVE-2008-2954.patch: --- NEW FILE linuxdcpp-CVE-2008-2954.patch --- --- linuxdcpp-1.0.1/client/NmdcHub.cpp 2007-11-05 06:33:42.000000000 +0100 +++ linuxdcpp-1.0.1/client/NmdcHub.cpp.CVE-2008-2954 2008-07-02 13:24:18.000000000 +0200 @@ -693,10 +693,14 @@ if(fromNick.empty()) return; + if(param.size() < j + 2) { + return; + } + string msg = param.substr(j + 2); + OnlineUser* replyTo = findUser(rtNick); OnlineUser* from = findUser(fromNick); - string msg = param.substr(j + 2); if(replyTo == NULL || from == NULL) { if(replyTo == 0) { // Assume it's from the hub Index: linuxdcpp.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxdcpp/F-9/linuxdcpp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linuxdcpp.spec 13 Feb 2008 18:37:29 -0000 1.5 +++ linuxdcpp.spec 2 Jul 2008 11:49:43 -0000 1.6 @@ -1,6 +1,6 @@ Name: linuxdcpp Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Direct Connect client Group: Applications/Internet @@ -11,6 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: linuxdcpp-1.0.1-gcc43-compile-fix.patch +Patch1: linuxdcpp-CVE-2008-2953.patch +Patch2: linuxdcpp-CVE-2008-2954.patch BuildRequires: scons gtk2-devel >= 2.6.0 glib2-devel >= 2.4.0 pkgconfig BuildRequires: libglade2-devel >= 2.4.0 zlib-devel bzip2-devel openssl-devel @@ -23,6 +25,8 @@ %setup -q -c %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build CXXFLAGS="$RPM_OPT_FLAGS" scons %{?_smp_mflags} PREFIX="%{_prefix}" @@ -65,6 +69,9 @@ %{_datadir}/pixmaps/linuxdcpp.png %changelog +* Wed Jul 02 2008 Marcin Garski 1.0.1-3 +- Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) + * Wed Feb 13 2008 Marcin Garski 1.0.1-2 - GCC 4.3 compile fix From fedora-extras-commits at redhat.com Wed Jul 2 11:52:29 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 2 Jul 2008 11:52:29 GMT Subject: rpms/iprutils/devel iprutils.spec,1.32,1.33 Message-ID: <200807021152.m62BqTCi024160@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/iprutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24102 Modified Files: iprutils.spec Log Message: Fixed chkconfig issue - #453165 Index: iprutils.spec =================================================================== RCS file: /cvs/extras/rpms/iprutils/devel/iprutils.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- iprutils.spec 2 Jul 2008 11:47:54 -0000 1.32 +++ iprutils.spec 2 Jul 2008 11:51:43 -0000 1.33 @@ -11,7 +11,7 @@ #Patch1: %{name}-lsb-init-ectomy.patch Patch2: %{name}-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#ExclusiveArch: ppc ppc64 +ExclusiveArch: ppc ppc64 Requires: /sbin/pidof From fedora-extras-commits at redhat.com Wed Jul 2 11:53:43 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 2 Jul 2008 11:53:43 GMT Subject: rpms/linuxdcpp/F-8 linuxdcpp.spec,1.2,1.3 Message-ID: <200807021153.m62BrhHu024224@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/linuxdcpp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24159 Modified Files: linuxdcpp.spec Log Message: - Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) Index: linuxdcpp.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxdcpp/F-8/linuxdcpp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linuxdcpp.spec 29 Dec 2007 13:06:34 -0000 1.2 +++ linuxdcpp.spec 2 Jul 2008 11:52:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: linuxdcpp Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Direct Connect client Group: Applications/Internet @@ -10,6 +10,9 @@ Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: linuxdcpp-CVE-2008-2953.patch +Patch1: linuxdcpp-CVE-2008-2954.patch + BuildRequires: scons gtk2-devel >= 2.6.0 glib2-devel >= 2.4.0 pkgconfig BuildRequires: libglade2-devel >= 2.4.0 zlib-devel bzip2-devel openssl-devel BuildRequires: desktop-file-utils @@ -20,6 +23,9 @@ %prep %setup -q -c +%patch0 -p1 +%patch1 -p1 + %build CXXFLAGS="$RPM_OPT_FLAGS" scons %{?_smp_mflags} PREFIX="%{_prefix}" @@ -61,6 +67,9 @@ %{_datadir}/pixmaps/linuxdcpp.png %changelog +* Wed Jul 02 2008 Marcin Garski 1.0.1-2 +- Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) + * Fri Dec 28 2007 Marcin Garski 1.0.1-1 - Update to 1.0.1 From fedora-extras-commits at redhat.com Wed Jul 2 11:54:22 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 2 Jul 2008 11:54:22 GMT Subject: rpms/linuxdcpp/F-8 linuxdcpp-CVE-2008-2953.patch, NONE, 1.1 linuxdcpp-CVE-2008-2954.patch, NONE, 1.1 Message-ID: <200807021154.m62BsMrx024277@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/linuxdcpp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24259 Added Files: linuxdcpp-CVE-2008-2953.patch linuxdcpp-CVE-2008-2954.patch Log Message: - Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) linuxdcpp-CVE-2008-2953.patch: --- NEW FILE linuxdcpp-CVE-2008-2953.patch --- --- linuxdcpp-1.0.1/client/ShareManager.cpp 2007-10-06 02:12:32.000000000 +0200 +++ linuxdcpp-1.0.1/client/ShareManager.cpp.CVE-2008-2953 2008-07-02 13:24:03.000000000 +0200 @@ -926,6 +926,10 @@ } j = i + 1; } + + if(it == directories.end()) + return NULL; + for(ShareManager::Directory::MapIter it2 = it->second->directories.begin(); it2 != it->second->directories.end(); ++it2) { it2->second->toXml(sos, indent, tmp, recurse); } linuxdcpp-CVE-2008-2954.patch: --- NEW FILE linuxdcpp-CVE-2008-2954.patch --- --- linuxdcpp-1.0.1/client/NmdcHub.cpp 2007-11-05 06:33:42.000000000 +0100 +++ linuxdcpp-1.0.1/client/NmdcHub.cpp.CVE-2008-2954 2008-07-02 13:24:18.000000000 +0200 @@ -693,10 +693,14 @@ if(fromNick.empty()) return; + if(param.size() < j + 2) { + return; + } + string msg = param.substr(j + 2); + OnlineUser* replyTo = findUser(rtNick); OnlineUser* from = findUser(fromNick); - string msg = param.substr(j + 2); if(replyTo == NULL || from == NULL) { if(replyTo == 0) { // Assume it's from the hub From fedora-extras-commits at redhat.com Wed Jul 2 12:02:01 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 2 Jul 2008 12:02:01 GMT Subject: rpms/iprutils/devel iprutils.spec,1.33,1.34 Message-ID: <200807021202.m62C216O031156@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/iprutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31115 Modified Files: iprutils.spec Log Message: Fixed ExclusiveArch tag Index: iprutils.spec =================================================================== RCS file: /cvs/extras/rpms/iprutils/devel/iprutils.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- iprutils.spec 2 Jul 2008 11:51:43 -0000 1.33 +++ iprutils.spec 2 Jul 2008 12:01:30 -0000 1.34 @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 5%{?dist} +Release: 6%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -64,6 +64,9 @@ %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Jul 2 2008 Roman Rakus - 2.2.8-6 +- Fixed ExclusiveArch tag + * Wed Jul 2 2008 Roman Rakus - 2.2.8-5 - Fixed chkconfig issue - #453165 From fedora-extras-commits at redhat.com Wed Jul 2 12:12:01 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 2 Jul 2008 12:12:01 GMT Subject: rpms/patchutils/devel patchutils-0.3.0.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.10, 1.11 patchutils.spec, 1.24, 1.25 sources, 1.10, 1.11 patchutils-author.patch, 1.1, NONE Message-ID: <200807021212.m62CC1xq031636@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/patchutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31583 Modified Files: .cvsignore patchutils.spec sources Added Files: patchutils-0.3.0.tar.bz2.sig Removed Files: patchutils-author.patch Log Message: * Wed Jul 2 2008 Tim Waugh 0.3.0-1 - 0.3.0. --- NEW FILE patchutils-0.3.0.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/patchutils/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Jun 2005 17:48:13 -0000 1.10 +++ .cvsignore 2 Jul 2008 12:11:15 -0000 1.11 @@ -1,2 +1,3 @@ patchutils-0.2.30.tar.bz2 patchutils-0.2.31.tar.bz2 +patchutils-0.3.0.tar.bz2 Index: patchutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/patchutils/devel/patchutils.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- patchutils.spec 13 Feb 2008 12:14:13 -0000 1.24 +++ patchutils.spec 2 Jul 2008 12:11:15 -0000 1.25 @@ -1,12 +1,11 @@ Summary: A collection of programs for manipulating patch files Name: patchutils -Version: 0.2.31 -Release: 5%{?dist} +Version: 0.3.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://cyberelk.net/tim/patchutils/ Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.bz2 -Patch0: patchutils-author.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: interdiff <= 0.0.10 Provides: interdiff = 0.0.10 @@ -23,7 +22,6 @@ %prep %setup -q -%patch0 -p1 -b .author %build touch doc/patchutils.xml @@ -47,6 +45,9 @@ %{_mandir}/*/* %changelog +* Wed Jul 2 2008 Tim Waugh 0.3.0-1 +- 0.3.0. + * Wed Feb 13 2008 Tim Waugh 0.2.31-5 - Rebuild for GCC 4.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/patchutils/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 13 Jun 2005 17:48:13 -0000 1.10 +++ sources 2 Jul 2008 12:11:15 -0000 1.11 @@ -1 +1 @@ -3aa902cb7a57a4aa09427de603ebf17b patchutils-0.2.31.tar.bz2 +91cce007527cd0df93aeb81459575485 patchutils-0.3.0.tar.bz2 --- patchutils-author.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 12:21:23 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 2 Jul 2008 12:21:23 GMT Subject: rpms/iprutils/F-9 iprutils-initscripts.patch, 1.1, 1.2 iprutils.spec, 1.31, 1.32 Message-ID: <200807021221.m62CLNvf032038@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/iprutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31965 Modified Files: iprutils-initscripts.patch iprutils.spec Log Message: Fixed chkconfig issue - #453165 iprutils-initscripts.patch: Index: iprutils-initscripts.patch =================================================================== RCS file: /cvs/extras/rpms/iprutils/F-9/iprutils-initscripts.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iprutils-initscripts.patch 10 Apr 2008 11:12:10 -0000 1.1 +++ iprutils-initscripts.patch 2 Jul 2008 12:20:34 -0000 1.2 @@ -11,7 +11,7 @@ -test -x $IPRDUMP || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter dump daemon +# processname: iprdump +# pidfile: /var/run/iprdump.pid @@ -141,7 +141,7 @@ -test -x $IPRUPDATE || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter update daemon +# processname: iprupdate +# pidfile: /var/run/iprupdate.pid @@ -289,7 +289,7 @@ -test -x $IPRINIT || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter initialization daemon +# processname: iprinit +# pidfile: /var/run/iprinit.pid Index: iprutils.spec =================================================================== RCS file: /cvs/extras/rpms/iprutils/F-9/iprutils.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- iprutils.spec 10 Apr 2008 11:13:11 -0000 1.31 +++ iprutils.spec 2 Jul 2008 12:20:34 -0000 1.32 @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 4%{?dist} +Release: 5%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -64,6 +64,9 @@ %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Jul 2 2008 Roman Rakus - 2.2.8-5 +- Fixed chkconfig issue - #453165 + * Wed Apr 9 2008 Roman Rakus - 2.2.8-4 - Rewrited initscripts for satisfying LSB spec From fedora-extras-commits at redhat.com Wed Jul 2 12:22:12 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 2 Jul 2008 12:22:12 GMT Subject: rpms/ogre/devel .cvsignore, 1.12, 1.13 ogre.spec, 1.29, 1.30 sources, 1.12, 1.13 Message-ID: <200807021222.m62CMCTk032118@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ogre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32033 Modified Files: .cvsignore ogre.spec sources Log Message: * Wed Jul 2 2008 Hans de Goede 1.4.9-1 - New upstream release 1.4.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 May 2008 19:20:36 -0000 1.12 +++ .cvsignore 2 Jul 2008 12:21:23 -0000 1.13 @@ -1 +1 @@ -ogre-1.4.8-clean.tar.bz2 +ogre-1.4.9-clean.tar.bz2 Index: ogre.spec =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ogre.spec 22 May 2008 10:32:33 -0000 1.29 +++ ogre.spec 2 Jul 2008 12:21:23 -0000 1.30 @@ -1,6 +1,6 @@ Name: ogre -Version: 1.4.8 -Release: 2%{?dist} +Version: 1.4.9 +Release: 1%{?dist} Summary: Object-Oriented Graphics Rendering Engine License: LGPLv2+ Group: System Environment/Libraries @@ -173,6 +173,9 @@ %changelog +* Wed Jul 2 2008 Hans de Goede 1.4.9-1 +- New upstream release 1.4.9 + * Thu May 22 2008 Hans de Goede 1.4.8-2 - Rebuild for new cegui - Use system tinyxml (bz 447698) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 May 2008 19:20:36 -0000 1.12 +++ sources 2 Jul 2008 12:21:24 -0000 1.13 @@ -1 +1 @@ -c2a07b9e7d5e4de0501fe3a0ab7e423c ogre-1.4.8-clean.tar.bz2 +a01915f5afc5ffba6009d39b1f454d3a ogre-1.4.9-clean.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 12:23:48 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 2 Jul 2008 12:23:48 GMT Subject: rpms/chess/devel chess.spec,1.17,1.18 Message-ID: <200807021223.m62CNmtd032255@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/chess/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32200 Modified Files: chess.spec Log Message: * Wed Jul 2 2008 Hans de Goede 1.0-16 - Rebuild for new ogre Index: chess.spec =================================================================== RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- chess.spec 23 May 2008 10:16:31 -0000 1.17 +++ chess.spec 2 Jul 2008 12:23:02 -0000 1.18 @@ -1,6 +1,6 @@ Name: chess Version: 1.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: 3D chess game Group: Amusements/Games License: GPLv2+ @@ -85,6 +85,9 @@ %changelog +* Wed Jul 2 2008 Hans de Goede 1.0-16 +- Rebuild for new ogre + * Thu May 22 2008 Hans de Goede 1.0-15 - Rebuild for new cegui From fedora-extras-commits at redhat.com Wed Jul 2 12:26:48 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 2 Jul 2008 12:26:48 GMT Subject: rpms/vegastrike/devel vegastrike.spec,1.11,1.12 Message-ID: <200807021226.m62CQmYh032452@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/vegastrike/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32346 Modified Files: vegastrike.spec Log Message: * Wed Jul 2 2008 Hans de Goede 0.5.0-3 - Rebuild for new ogre Index: vegastrike.spec =================================================================== RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vegastrike.spec 13 May 2008 18:48:02 -0000 1.11 +++ vegastrike.spec 2 Jul 2008 12:24:49 -0000 1.12 @@ -1,6 +1,6 @@ Name: vegastrike Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D OpenGL spaceflight simulator Group: Amusements/Games License: GPLv2+ @@ -96,6 +96,9 @@ %changelog +* Wed Jul 2 2008 Hans de Goede 0.5.0-3 +- Rebuild for new ogre + * Tue May 13 2008 Hans de Goede 0.5.0-2 - Rebuild for new ogre From fedora-extras-commits at redhat.com Wed Jul 2 12:35:52 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Wed, 2 Jul 2008 12:35:52 GMT Subject: rpms/mesa/devel mesa-7.1-disable-intel-classic-warn.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 mesa-7.1-link-shared.patch, 1.1, 1.2 mesa-7.1pre-osmesa-version.patch, 1.1, 1.2 mesa.spec, 1.185, 1.186 sources, 1.25, 1.26 mesa-7.1-fda4895d-update.patch, 1.1, NONE mesa-7.1-sparc.patch, 1.1, NONE mesa-fix-965-buffer-check.patch, 1.1, NONE Message-ID: <200807021235.m62CZqfQ000484@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/mesa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv392 Modified Files: .cvsignore mesa-7.1-link-shared.patch mesa-7.1pre-osmesa-version.patch mesa.spec sources Added Files: mesa-7.1-disable-intel-classic-warn.patch Removed Files: mesa-7.1-fda4895d-update.patch mesa-7.1-sparc.patch mesa-fix-965-buffer-check.patch Log Message: - merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch mesa-7.1-disable-intel-classic-warn.patch: --- NEW FILE mesa-7.1-disable-intel-classic-warn.patch --- diff -up mesa-20080415/src/mesa/drivers/dri/intel/intel_context.c.nowarn mesa-20080415/src/mesa/drivers/dri/intel/intel_context.c --- mesa-20080415/src/mesa/drivers/dri/intel/intel_context.c.nowarn 2008-05-07 10:11:10.000000000 +1000 +++ mesa-20080415/src/mesa/drivers/dri/intel/intel_context.c 2008-05-07 10:11:21.000000000 +1000 @@ -479,8 +479,8 @@ intel_init_bufmgr(struct intel_context * if (ttm_disable) { fprintf(stderr, "TTM buffer manager disabled. Using classic.\n"); } else { - fprintf(stderr, "Failed to initialize TTM buffer manager. " - "Falling back to classic.\n"); + //fprintf(stderr, "Failed to initialize TTM buffer manager. " + // "Falling back to classic.\n"); } if (intelScreen->tex.size == 0) { Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 15 Apr 2008 02:22:47 -0000 1.25 +++ .cvsignore 2 Jul 2008 12:35:05 -0000 1.26 @@ -1 +1,2 @@ -mesa-20080415.tar.bz2 +gl-manpages-1.0.1.tar.bz2 +mesa-20080627.tar.bz2 mesa-7.1-link-shared.patch: Index: mesa-7.1-link-shared.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1-link-shared.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mesa-7.1-link-shared.patch 10 Apr 2008 18:20:31 -0000 1.1 +++ mesa-7.1-link-shared.patch 2 Jul 2008 12:35:05 -0000 1.2 @@ -1,41 +1,6 @@ -diff -up mesa-20080331/src/mesa/x86/read_rgba_span_x86.S.jx mesa-20080331/src/mesa/x86/read_rgba_span_x86.S ---- mesa-20080331/src/mesa/x86/read_rgba_span_x86.S.jx 2008-03-31 16:58:48.000000000 -0400 -+++ mesa-20080331/src/mesa/x86/read_rgba_span_x86.S 2008-04-10 12:11:31.000000000 -0400 -@@ -77,7 +77,6 @@ - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_MMX --.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX - .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function - _generic_read_RGBA_span_BGRA8888_REV_MMX: - pushl %ebx -@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE - .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE: - pushl %esi -@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - .text - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2 --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2 - .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE2: - pushl %esi -@@ -492,7 +489,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - .text - .globl _generic_read_RGBA_span_RGB565_MMX -- .hidden _generic_read_RGBA_span_RGB565_MMX - .type _generic_read_RGBA_span_RGB565_MMX, @function - - _generic_read_RGBA_span_RGB565_MMX: -diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.jx mesa-20080331/src/mesa/drivers/dri/Makefile ---- mesa-20080331/src/mesa/drivers/dri/Makefile.jx 2008-03-31 16:58:48.000000000 -0400 -+++ mesa-20080331/src/mesa/drivers/dri/Makefile 2008-04-10 12:02:30.000000000 -0400 +diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.dricore mesa-20080612/src/mesa/drivers/dri/Makefile +--- mesa-20080612/src/mesa/drivers/dri/Makefile.dricore 2008-06-12 12:06:50.000000000 +1000 ++++ mesa-20080612/src/mesa/drivers/dri/Makefile 2008-06-12 13:25:58.000000000 +1000 @@ -6,12 +6,17 @@ include $(TOP)/configs/current @@ -48,7 +13,7 @@ -mkdir $(TOP)/$(LIB_DIR) +libdricore.so: -+ ld -shared -o libdricore.so --whole-archive ../../libmesa.a --no-whole-archive -lm -lpthread -lc ++ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc + +$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so + $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) @@ -68,18 +33,18 @@ done + $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) + $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) - $(TOP)/bin/minstall -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal - $(TOP)/bin/minstall -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal - $(TOP)/bin/minstall -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal + $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal + $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal @@ -38,4 +45,5 @@ clean: (cd $$dir && $(MAKE) clean) ; \ fi \ done + -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so -rm -f common/*.o -diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx mesa-20080331/src/mesa/drivers/dri/Makefile.template ---- mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx 2008-03-31 16:58:48.000000000 -0400 -+++ mesa-20080331/src/mesa/drivers/dri/Makefile.template 2008-04-10 12:02:30.000000000 -0400 +diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080612/src/mesa/drivers/dri/Makefile.template +--- mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore 2008-06-12 12:06:50.000000000 +1000 ++++ mesa-20080612/src/mesa/drivers/dri/Makefile.template 2008-06-12 13:15:34.000000000 +1000 @@ -1,6 +1,6 @@ # -*-makefile-*- @@ -87,8 +52,8 @@ +MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so COMMON_SOURCES = \ - ../../common/driverfuncs.c \ -@@ -70,7 +70,9 @@ default: symlinks depend $(LIBNAME) $(TO + ../common/utils.c \ +@@ -69,7 +69,9 @@ default: symlinks depend $(LIBNAME) $(TO $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \ @@ -99,3 +64,38 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) +diff -up mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080612/src/mesa/x86/read_rgba_span_x86.S +--- mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-06-12 12:06:50.000000000 +1000 ++++ mesa-20080612/src/mesa/x86/read_rgba_span_x86.S 2008-06-12 13:15:34.000000000 +1000 +@@ -77,7 +77,6 @@ + */ + + .globl _generic_read_RGBA_span_BGRA8888_REV_MMX +-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX + .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function + _generic_read_RGBA_span_BGRA8888_REV_MMX: + pushl %ebx +@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX + */ + + .globl _generic_read_RGBA_span_BGRA8888_REV_SSE +-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE + .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function + _generic_read_RGBA_span_BGRA8888_REV_SSE: + pushl %esi +@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE + + .text + .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2 +-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2 + .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function + _generic_read_RGBA_span_BGRA8888_REV_SSE2: + pushl %esi +@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE + + .text + .globl _generic_read_RGBA_span_RGB565_MMX +- .hidden _generic_read_RGBA_span_RGB565_MMX + .type _generic_read_RGBA_span_RGB565_MMX, @function + + _generic_read_RGBA_span_RGB565_MMX: mesa-7.1pre-osmesa-version.patch: Index: mesa-7.1pre-osmesa-version.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1pre-osmesa-version.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mesa-7.1pre-osmesa-version.patch 1 Nov 2007 06:55:38 -0000 1.1 +++ mesa-7.1pre-osmesa-version.patch 2 Jul 2008 12:35:05 -0000 1.2 @@ -1,39 +1,21 @@ -From 8a156f47fc6547d5ed0fb8031f332cbf9e16948d Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Thu, 1 Nov 2007 16:16:52 +1000 -Subject: [PATCH] mesa: keep OSMESA version at 6.5.3 - ---- - src/mesa/Makefile | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/mesa/Makefile b/src/mesa/Makefile -index 77bb7be..e2a09ed 100644 ---- a/src/mesa/Makefile -+++ b/src/mesa/Makefile -@@ -117,17 +117,18 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) - $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) - - # Make the OSMesa library -+# Note: version is kept at 6.5.3 to simplify app/linking issues - $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) - @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ - $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ -- -ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \ -- -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -+ -ldflags '$(LDFLAGS)' -major 6 \ -+ -minor 5 -patch 3 \ - -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ - $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ - else \ - $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ -- -ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \ -- -minor $(MESA_MINOR) -patch $(GL_TINY) \ -+ -ldflags '$(LDFLAGS)' -major 6 \ -+ -minor 5 -patch 3 \ - -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ - $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ - fi --- -1.5.3.4 - +diff -up mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080612/src/mesa/drivers/osmesa/Makefile +--- mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa 2008-06-12 12:17:27.000000000 +1000 ++++ mesa-20080612/src/mesa/drivers/osmesa/Makefile 2008-06-12 13:14:24.000000000 +1000 +@@ -47,7 +47,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME) + $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS) + $(TOP)/bin/mklib -o $(OSMESA_LIB) \ + -linker "$(CC)" \ +- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ ++ -major 6 -minor 5 -patch 3 \ + -install $(TOP)/$(LIB_DIR) \ + $(MKLIB_OPTIONS) \ + $(OSMESA_LIB_DEPS) $(OBJECTS) +@@ -60,7 +60,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS + osmesa16: $(OBJECTS) $(CORE_MESA) + $(TOP)/bin/mklib -o $(OSMESA_LIB) \ + -linker "$(CC)" \ +- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ ++ -major 6 -minor 5 -patch 3 \ + -install $(TOP)/$(LIB_DIR) \ + $(MKLIB_OPTIONS) \ + $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- mesa.spec 18 Apr 2008 05:41:19 -0000 1.185 +++ mesa.spec 2 Jul 2008 12:35:05 -0000 1.186 @@ -10,12 +10,12 @@ %endif %define manpages gl-manpages-1.0.1 -%define gitdate 20080415 +%define gitdate 20080627 Summary: Mesa graphics libraries Name: mesa Version: 7.1 -Release: 0.28%{?dist} +Release: 0.37%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -29,24 +29,22 @@ Patch0: mesa-7.1pre-osmesa-version.patch Patch2: mesa-7.1pre-nukeglthread-debug.patch -Patch3: mesa-7.1-fda4895d-update.patch # This doesn't work, disable for now. Patch4: disable-tex-offset.patch Patch7: mesa-7.1-link-shared.patch -# lets only build drivers on sparc that are remotely useful -Patch8: mesa-7.1-sparc.patch -Patch9: mesa-fix-965-buffer-check.patch +Patch12: mesa-7.1-disable-intel-classic-warn.patch BuildRequires: pkgconfig autoconf automake %if %{with_dri} -BuildRequires: libdrm-devel >= 2.4.0-0.5 +BuildRequires: libdrm-devel >= 2.4.0-0.12 %endif BuildRequires: libXxf86vm-devel BuildRequires: expat-devel >= 2.0 BuildRequires: xorg-x11-proto-devel >= 7.1-10 +BuildRequires: dri2proto >= 1.1 BuildRequires: makedepend BuildRequires: libselinux-devel BuildRequires: libXext-devel @@ -69,11 +67,22 @@ Obsoletes: xorg-x11-libs %if %{with_dri} Requires: libdrm >= 2.3.0 +Requires: mesa-dri-drivers = %{version}-%{release} Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14 %endif %description libGL -Mesa libGL runtime libraries and DRI drivers. +Mesa libGL runtime library. + + +%if %{with_dri} +%package dri-drivers +Summary: Mesa-based DRI drivers. +Group: User Interface/X Hardware Support +%description dri-drivers +Mesa-based DRI drivers. +%endif + %package libGL-devel Summary: Mesa libGL development package @@ -133,15 +142,6 @@ Mesa offscreen rendering development package -%package source -Summary: Mesa source code required to build X server -Group: Development/Libraries - -%description source -The mesa-source package provides the minimal source code needed to -build DRI enabled X servers, etc. - - %package -n glx-utils Summary: GLX utilities Group: Development/Libraries @@ -163,11 +163,9 @@ %setup -q -n mesa-%{gitdate} -b2 %patch0 -p1 -b .osmesa %patch2 -p1 -b .intel-glthread -%patch3 -p1 -b .git-update-fix-intel %patch4 -p1 -b .disable-tex-offset %patch7 -p1 -b .dricore -%patch8 -p1 -%patch9 -p1 -b .965-depth +%patch12 -p1 -b .intel-nowarn # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # license and are not open source/free software, so we remove them. @@ -239,7 +237,7 @@ %if %{with_dri} install -d $RPM_BUILD_ROOT%{_libdir}/dri install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null -for f in i810 i915 i965 mach64 mga r128 r200 r300 radeon savage sis tdfx unichrome; do +for f in i810 i915 i965 mach64 mga r128 r200 r300 radeon savage sis swrast tdfx unichrome; do so=%{_lib}/${f}_dri.so test -e $so && echo $so done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || : @@ -270,18 +268,6 @@ make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT popd -# Install the source needed to build the X server. The egreps are just -# stripping out unnecessary dirs; only tricky bit is the [^c] to make sure -# .../dri/common is included. -%define mesasourcedir %{_datadir}/mesa/source -mkdir -p $RPM_BUILD_ROOT/%{mesasourcedir} -( find src -name \*.[ch] ; find include -name \*.h ) | - egrep -v '^src/(glu|glw)' | - egrep -v '^src/mesa/drivers/(directfb|dos|fbdev|glide|ggi|osmesa)' | - egrep -v '^src/mesa/drivers/(windows|dri/[^c])' | - xargs tar cf - --mode a=r | - (cd $RPM_BUILD_ROOT/%{mesasourcedir} && tar xf -) - %clean rm -rf $RPM_BUILD_ROOT @@ -298,7 +284,9 @@ %defattr(-,root,root,-) %{_libdir}/libGL.so.1 %{_libdir}/libGL.so.1.2 + %if %{with_dri} +%files dri-drivers %dir %{_libdir}/dri %{_libdir}/dri/libdricore.so %{_libdir}/dri/*_dri.so @@ -349,11 +337,6 @@ %{_libdir}/libOSMesa16.so %{_libdir}/libOSMesa32.so -# We constructed this dir carefully, so just slurp in the whole thing. -%files source -%defattr(-,root,root,-) -%{mesasourcedir} - %files -n glx-utils %defattr(-,root,root,-) %{_bindir}/glxgears @@ -416,6 +399,41 @@ %{_libdir}/mesa-demos-data %changelog +* Fri Jun 27 2008 Adam Jackson 7.1-0.37 +- Drop mesa-source subpackage. Man that feels good. + +* Fri Jun 27 2008 Adam Jackson 7.1-0.36 +- Today's snapshot. +- Package swrast_dri for the new X world order. +- Split DRI drivers to their own subpackage. + +* Thu Jun 12 2008 Dave Airlie 7.1-0.35 +- Update mesa to latest git snapshot - drop patches merged upstream + +* Wed Jun 04 2008 Adam Jackson 7.1-0.34 +- Link libdricore with gcc instead of ld, so we automagically pick up the + ld --build-id flags. + +* Wed May 28 2008 Dave Airlie 7.1-0.33 +- Add initial r500 3D driver + +* Tue May 13 2008 Adam Jackson 7.1-0.32 +- Update dri2proto requirement. (#446166) + +* Sat May 10 2008 Dave Airlie 7.1-0.31 +- Bring in a bunch of fixes from upstream, missing rs690 pci id, +- DRI2 + modeset + 965 + compiz + alt-tab fixed. + +* Wed May 07 2008 Dave Airlie 7.1-0.30 +- fix googleearth on Intel 965 (#443930) +- disable classic warning to avoid people reporting it. + +* Mon May 05 2008 Dave Airlie 7.1-0.29 +- mesa-7.1-f9-intel-and-radeon-fixes.patch - Update mesa + package with cherrypicked fixes from master. +- Fixes numerous i965 3D issues +- Fixes compiz on rs48x and rs690 radeon chipsets + * Fri Apr 18 2008 Dave Airlie 7.1-0.28 - okay fire me now - I swear it runs compiz really well... - fix more bugs on 965 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 15 Apr 2008 02:26:59 -0000 1.25 +++ sources 2 Jul 2008 12:35:05 -0000 1.26 @@ -1,2 +1,2 @@ -4c32a78a28832fa34e0a5a04c6b9057c mesa-20080415.tar.bz2 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 +a5f03ee286c07885c49d5f3d9cc896b3 mesa-20080627.tar.bz2 --- mesa-7.1-fda4895d-update.patch DELETED --- --- mesa-7.1-sparc.patch DELETED --- --- mesa-fix-965-buffer-check.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 12:37:34 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Wed, 2 Jul 2008 12:37:34 GMT Subject: rpms/xorg-x11-server/devel .cvsignore, 1.45, 1.46 sources, 1.39, 1.40 xorg-x11-server.spec, 1.329, 1.330 xorg-x11-server-Red-Hat-extramodes.patch, 1.8, NONE xserver-1.4.99-selinux-awareness.patch, 1.3, NONE xserver-1.4.99-xaa-evict-pixmaps.patch, 1.2, NONE xserver-1.5.0-fix-single-aspect.patch, 1.1, NONE xserver-1.5.0-xaa-sucks.patch, 1.2, NONE Message-ID: <200807021237.m62CbY9d000616@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471 Modified Files: .cvsignore sources xorg-x11-server.spec Removed Files: xorg-x11-server-Red-Hat-extramodes.patch xserver-1.4.99-selinux-awareness.patch xserver-1.4.99-xaa-evict-pixmaps.patch xserver-1.5.0-fix-single-aspect.patch xserver-1.5.0-xaa-sucks.patch Log Message: - merged 1.4.99.901-23.20080415 ... 1.4.99.905-1.20080701 changes from F9 branch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 12 Jun 2008 06:18:47 -0000 1.45 +++ .cvsignore 2 Jul 2008 12:36:39 -0000 1.46 @@ -1 +1 @@ -xorg-server-20080612.tar.bz2 +xorg-server-20080701.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 12 Jun 2008 06:18:47 -0000 1.39 +++ sources 2 Jul 2008 12:36:39 -0000 1.40 @@ -1 +1 @@ -067f2f0fdbcac0f8a7cd4f4ee046a2c8 xorg-server-20080612.tar.bz2 +a0e25d1c6ed0ed945e4a84b6b288f6fe xorg-server-20080701.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- xorg-x11-server.spec 19 Jun 2008 14:24:12 -0000 1.329 +++ xorg-x11-server.spec 2 Jul 2008 12:36:39 -0000 1.330 @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080612 +%define gitdate 20080701 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.902 -Release: 2.%{gitdate}%{?dist} +Version: 1.4.99.905 +Release: 1.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -42,27 +42,28 @@ # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list -Patch1001: xorg-x11-server-Red-Hat-extramodes.patch +# dropme +#Patch1001: xorg-x11-server-Red-Hat-extramodes.patch Patch1003: xserver-1.4.99-pic-libxf86config.patch -Patch1004: xserver-1.4.99-selinux-awareness.patch +# maybe? +#Patch1004: xserver-1.4.99-selinux-awareness.patch Patch1005: xserver-1.4.99-builtin-fonts.patch Patch1010: xserver-1.3.0-no-prerelease-warning.patch -Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch +# rebase for GL/glx -> glx move +#Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch -# Trivial things to maybe merge upstream at next rebase - # Trivial things to never merge upstream ever # Don't merge this without protecting the gccisms. -Patch5001: xserver-1.4.99-alloca-poison.patch +Patch5001: xserver-1.4.99-alloca-poison.patch # This really could be done prettier. -Patch5002: xserver-1.4.99-ssh-isnt-local.patch +Patch5002: xserver-1.4.99-ssh-isnt-local.patch -Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch -Patch5008: xserver-1.5.0-xaa-sucks.patch -Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch -Patch5010: xserver-1.5.0-fix-single-aspect.patch +Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch +#Patch5008: xserver-1.5.0-xaa-sucks.patch +Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch +#Patch5010: xserver-1.5.0-fix-single-aspect.patch # Workaround RH bug #449944 Patch5011: xserver-1.4.99-endian.patch @@ -116,8 +117,9 @@ # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex -BuildRequires: mesa-libGL-devel >= 7.1-0.21 -BuildRequires: mesa-source >= 7.1-0.21 +BuildRequires: mesa-libGL-devel >= 7.1-0.36 +# should be useless now... +# BuildRequires: mesa-source >= 7.1-0.36 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -315,7 +317,6 @@ --disable-xorgcfg \ --disable-record \ --enable-install-libxf86config \ - --with-mesa-source=%{_datadir}/mesa/source \ --enable-xselinux \ --with-dri-driver-path=%{drimoduledir} \ ${CONFIGURE} @@ -341,7 +342,6 @@ mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}} cp cpprules.in %{inst_srcdir} cp xkb/README.compiled %{inst_srcdir}/xkb -cp GL/symlink-mesa.sh %{inst_srcdir}/GL cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/ @@ -423,7 +423,6 @@ %dir %{_libdir}/xorg/modules %dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/extensions -%{_libdir}/xorg/modules/extensions/libGLcore.so %{_libdir}/xorg/modules/extensions/libglx.so %{_libdir}/xorg/modules/extensions/libdri.so %{_libdir}/xorg/modules/extensions/libdri2.so @@ -516,10 +515,16 @@ %changelog -* Thu Jun 19 2008 Adam Tkac 1.4.99.902-2.20080612 +* Mon Jun 30 2008 Adam Jackson 1.4.99.905-1.20080701 +- 1.5RC5. + +* Thu Jun 19 2008 Adam Tkac - workaround broken AC_C_BIGENDIAN macro (#449944) -* Thu Jun 12 2008 Dave Airlie 1.4.99.902-1.20080612 +* Thu Jun 12 2008 Dave Airlie 1.4.99.902-3.20080612 +- xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor. + +* Thu Jun 12 2008 Dave Airlie 1.4.99.902-2.20080612 - cve-2008-1377: Record and Security Extension Input validation - cve-2008-1379: MIT-SHM extension Input Validation flaw - cve-2008-2360: Render AllocateGlyph extension Integer overflows @@ -527,9 +532,40 @@ - cve-2008-2362: Render Gradient extension Integer overflows - Rebase to 1.5 head for security patches for above +* Mon Jun 09 2008 Adam Jackson 1.4.99.902-1.20080609 +- Today's git snapshot. + +* Tue May 06 2008 Bill Nottingham 1.4.99.901-29.20080415 +- rebuild against new xorg-x11-xtrans-devel (#445303) + +* Mon May 05 2008 Adam Jackson 1.4.99.901-28.20080415 +- xserver-1.5.0-compiz-clip-fix.patch: Make compiz stop blinking every + so often. (#441219) + +* Mon May 05 2008 Adam Jackson 1.4.99.901-27.20080415 +- xserver-1.5.0-hal-closedown.patch: Fix a crash in the hal code when + closing a device. + * Mon Apr 28 2008 Soren Sandmann - Preserve user's CFLAGS +* Thu Apr 24 2008 Adam Jackson 1.4.99.901-26.20080415 +- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Disable evdev for keyboards + even on combo devices. This means combo devices will go through the old + mouse driver too. Oh well. (#440380) + +* Thu Apr 24 2008 Dave Airlie 1.4.99.901-25.20080415 +- xserver-1.5.0-f-spot-screws-glx.patch: stop GLX crashing X server when + f-spot exists (#443299) + +* Wed Apr 23 2008 Dave Airlie 1.4.99.901-24.20080415 +- xserver-1.5.0-glcore-swap-no-crashy.patch: Fix issue with googleearth + crashing GLcore. + +* Tue Apr 22 2008 Adam Jackson 1.4.99.901-23.20080415 +- xserver-1.5.0-stenciled-visuals.patch: Prefer visuals with a stencil + buffer for the default GLX visual. (Hans de Goede, #442510) + * Tue Apr 15 2008 Dave Airlie 1.4.99.901-22.20080415 - rebase to upstream server 1.5 branch from today - drop acr quirk --- xorg-x11-server-Red-Hat-extramodes.patch DELETED --- --- xserver-1.4.99-selinux-awareness.patch DELETED --- --- xserver-1.4.99-xaa-evict-pixmaps.patch DELETED --- --- xserver-1.5.0-fix-single-aspect.patch DELETED --- --- xserver-1.5.0-xaa-sucks.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 12:38:00 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Wed, 2 Jul 2008 12:38:00 GMT Subject: rpms/vnc/devel vnc.spec,1.194,1.195 Message-ID: <200807021238.m62Cc0Cl000666@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv566 Modified Files: vnc.spec Log Message: - removed mesa-source from buildrequires Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- vnc.spec 2 Jul 2008 11:16:31 -0000 1.194 +++ vnc.spec 2 Jul 2008 12:37:03 -0000 1.195 @@ -62,7 +62,7 @@ BuildRequires: libXt-devel, libXv-devel, pixman-devel BuildRequires: libselinux-devel BuildRequires: xorg-x11-server-source -BuildRequires: mesa-libGL-devel >= 6.5.2, mesa-source >= 6.5.2, libdrm-devel +BuildRequires: mesa-libGL-devel >= 7.1-0.36, libdrm-devel >= 2.4.0 Requires: gtk2 >= 2.6 Requires: coreutils From fedora-extras-commits at redhat.com Wed Jul 2 13:13:49 2008 From: fedora-extras-commits at redhat.com (Peter Robinson (pbrobinson)) Date: Wed, 2 Jul 2008 13:13:49 GMT Subject: rpms/geoclue/F-8 geoclue.spec,1.5,1.6 Message-ID: <200807021313.m62DDnBJ008730@cvs-int.fedora.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668 Modified Files: geoclue.spec Log Message: Fixed spec file so gpsd and gypsy are actually properly in a subpackage Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/F-8/geoclue.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geoclue.spec 6 Jun 2008 19:55:53 -0000 1.5 +++ geoclue.spec 2 Jul 2008 13:13:04 -0000 1.6 @@ -1,6 +1,6 @@ Name: geoclue Version: 0.11.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Geoclue is a modular geoinformation service Group: System Environment/Libraries @@ -16,8 +16,8 @@ BuildRequires: GConf2-devel BuildRequires: gtk2-devel BuildRequires: NetworkManager-devel -BuildRequires: gpsd-devel BuildRequires: gypsy-devel +BuildRequires: gpsd-devel Requires: dbus @@ -46,6 +46,7 @@ Summary: gpsd provider for geoclue Group: Development/Libraries Requires: geoclue = %{PACKAGE_VERSION} +Requires: gpsd %description gpsd A gpsd provider for geoclue @@ -54,6 +55,7 @@ Summary: gypsy provider for geoclue Group: Development/Libraries Requires: geoclue = %{PACKAGE_VERSION} +Requires: gypsy %description gypsy A gypsy provider for geoclue @@ -83,9 +85,29 @@ %dir %{_datadir}/geoclue-providers %{_libdir}/libgeoclue.so.0 %{_libdir}/libgeoclue.so.0.0.0 -%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.* -%{_datadir}/geoclue-providers/geoclue-* -%{_libexecdir}/geoclue-* +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Master.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service +%{_datadir}/geoclue-providers/geoclue-example.provider +%{_datadir}/geoclue-providers/geoclue-geonames.provider +%{_datadir}/geoclue-providers/geoclue-hostip.provider +%{_datadir}/geoclue-providers/geoclue-localnet.provider +%{_datadir}/geoclue-providers/geoclue-manual.provider +%{_datadir}/geoclue-providers/geoclue-plazes.provider +%{_datadir}/geoclue-providers/geoclue-yahoo.provider +%{_libexecdir}/geoclue-example +%{_libexecdir}/geoclue-geonames +%{_libexecdir}/geoclue-hostip +%{_libexecdir}/geoclue-localnet +%{_libexecdir}/geoclue-manual +%{_libexecdir}/geoclue-master +%{_libexecdir}/geoclue-plazes +%{_libexecdir}/geoclue-yahoo %files devel %defattr(-,root,root,-) @@ -101,11 +123,18 @@ %files gpsd %{_libexecdir}/geoclue-gpsd +%{_datadir}/geoclue-providers/geoclue-gpsd.provider +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service %files gypsy %{_libexecdir}/geoclue-gypsy +%{_datadir}/geoclue-providers/geoclue-gypsy.provider +%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service %changelog +* Wed Jul 2 2008 Peter Robinson 0.11.1-8 +- Fixed spec file so gpsd and gypsy are actually properly in a subpackage + * Fri Jun 6 2008 Peter Robinson 0.11.1-7 - Re-add gypsy provider now that its been pushed to updates From fedora-extras-commits at redhat.com Wed Jul 2 13:28:23 2008 From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef)) Date: Wed, 2 Jul 2008 13:28:23 GMT Subject: rpms/pl/devel pl-5.6.57-jpl-configure.patch, NONE, 1.1 pl-5.6.57-locale.patch, NONE, 1.1 pl.spec, 1.49, 1.50 pl-5.6.52-fix-java-directory.patch, 1.2, NONE Message-ID: <200807021328.m62DSNN6009280@cvs-int.fedora.redhat.com> Author: mef Update of /cvs/pkgs/rpms/pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9225 Modified Files: pl.spec Added Files: pl-5.6.57-jpl-configure.patch pl-5.6.57-locale.patch Removed Files: pl-5.6.52-fix-java-directory.patch Log Message: Use any 1.5+ JVM to build Include locale patch from upstream pl-5.6.57-jpl-configure.patch: --- NEW FILE pl-5.6.57-jpl-configure.patch --- --- pl-5.6.57/packages/jpl/configure 2008-06-20 11:19:03.000000000 +0100 +++ /home/mef/rpmbuild/BUILD/pl-5.6.57/packages/jpl/configure 2008-07-02 14:11:55.000000000 +0100 @@ -3658,21 +3658,6 @@ CWFLAGS="${CWFLAGS-}" fi -if test "x$JAVALIBS" = "x"; then - case "$PLARCH" in - *darwin*) - JAVALIBS="-Wl,-framework,JavaVM" - ;; - *powerpc-linux*) - JAVALIBS="-ljava -ljvm" - ;; - *) - JAVALIBS="-ljava -lverify -ljvm" - ;; - esac -fi - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -4572,6 +4557,7 @@ { echo "$as_me:$LINENO: checking symlink for $_cur" >&5 echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6; } _slink=`ls -ld "$_cur" | sed 's/.* -> //'` + if [ `basename $_slink` = "ecj" ]; then break; fi case "$_slink" in /*) _cur="$_slink";; # 'X' avoids triggering unwanted echo options. @@ -4629,19 +4615,37 @@ _JNI_LIBSUBDIR="server" ;; powerpc) - case "$host_os" in - linux*) - _JNI_LIBDIRS="bin" - _JNI_LIBSUBDIR="classic" - ;; - *) - _JNI_LIBDIRS="" - esac + _JNI_LIBDIRS="lib/ppc" + _JNI_LIBSUBDIR="server" + ;; + powerpc64) + _JNI_LIBDIRS="lib/ppc64" + _JNI_LIBSUBDIR="server" ;; *) _JNI_LIBDIRS="" esac +# Set JAVALIBS differently if we're using GCJ +if test "x$JAVALIBS" = "x"; then + if (echo $_JTOPDIR | grep gcj > /dev/null); then + JAVALIBS="-ljvm" + else + case "$PLARCH" in + *darwin*) + JAVALIBS="-Wl,-framework,JavaVM" + ;; + *powerpc-linux*) + JAVALIBS="-ljava -ljvm" + ;; + *) + JAVALIBS="-ljava -lverify -ljvm" + ;; + esac + fi +fi + + for d in $_JNI_LIBDIRS; do echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR" if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then pl-5.6.57-locale.patch: --- NEW FILE pl-5.6.57-locale.patch --- diff --git a/src/rc/access.c b/src/rc/access.c index 59f0ef7..27a52dc 100644 --- a/src/rc/access.c +++ b/src/rc/access.c @@ -202,7 +202,7 @@ decode_member_header(RcArchive rca, RcMember mbr) memset(mbr, 0, sizeof(*mbr)); while( html_fd_next_tag(rca->fd, tag, properties) ) - { if ( strcasecmp(tag, "file") == 0 ) + { if ( strmp(tag, "file") == 0 ) { html_decode_tag(properties, make_file_tag_def(), mbr); if ( mbr->name ) @@ -279,7 +279,7 @@ find_archive_dimensions(RcArchive rca) { const char *data = rca->data; size_t alen = strlen(ARCHIVE_TAG); - if ( strncasecmp(data, ARCHIVE_TAG, alen) != 0 ) + if ( strncmp(data, ARCHIVE_TAG, alen) != 0 ) { const char *rc_end = &data[rca->size]; const char *end = rc_end-1; const char *s; @@ -298,7 +298,7 @@ find_archive_dimensions(RcArchive rca) { const char *start = end - len; rc_size hdrlen = start - (const char *)rca->map_start; - if ( strncasecmp(start, ARCHIVE_TAG, alen) == 0 ) + if ( strncmp(start, ARCHIVE_TAG, alen) == 0 ) { rca->data = (void *)start; rca->size -= hdrlen; @@ -327,7 +327,7 @@ at_archive_start(RcArchive rca) return FALSE; } - if ( strncasecmp(buf, atag, alen) == 0 ) + if ( strncmp(buf, atag, alen) == 0 ) return TRUE; /* fine, this is the start */ rc_errno = RCE_NOERROR; diff --git a/src/rc/build.c b/src/rc/build.c index 6e148c3..670f1b3 100644 --- a/src/rc/build.c +++ b/src/rc/build.c @@ -3,9 +3,9 @@ Part of SWI-Prolog Author: Jan Wielemaker - E-mail: jan at swi.psy.uva.nl + E-mail: J.Wielemaker at science.uva.nl WWW: http://www.swi-prolog.org - Copyright (C): 1985-2002, University of Amsterdam + Copyright (C): 1985-2008, University of Amsterdam This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -176,16 +176,16 @@ rc_save_data(RcMember m, FILE *fd) static int rc_save_member(RcMember m, FILE *fd) -{ fprintf(fd, "\nname, m->rc_class, m->encoding, (long)m->size); if ( m->modified ) - fprintf(fd, " MODIFIED=%ld", (long)m->modified); + fprintf(fd, " modified=%ld", (long)m->modified); fprintf(fd, ">\n"); if ( !rc_save_data(m, fd) ) return FALSE; - fprintf(fd, "\n\n"); + fprintf(fd, "\n\n"); return TRUE; } @@ -212,7 +212,7 @@ rc_save_archive(RcArchive rca, const char *to) hdrlen = hdr->size; } - fprintf(fd, "\n"); + fprintf(fd, "\n"); for( member = rca->members; member; member = member->next ) { if ( strcmp(member->name, "$header") == 0 && strcmp(member->rc_class, "$rc") == 0 ) @@ -223,9 +223,9 @@ rc_save_archive(RcArchive rca, const char *to) return FALSE; } } - fprintf(fd, "\n"); + fprintf(fd, "\n"); size = ftell(fd) - hdrlen; - fprintf(fd, "\n", (long)size); + fprintf(fd, "\n", (long)size); if ( fclose(fd) == EOF ) { rc_errno = RCE_ERRNO; return FALSE; diff --git a/src/rc/html.c b/src/rc/html.c index 29996a4..fb03f0f 100644 --- a/src/rc/html.c +++ b/src/rc/html.c @@ -34,11 +34,6 @@ #include "html.h" #include -#if !defined(strncasecmp) && !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP) -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif - #ifndef EOS #define EOS '\0' #endif @@ -76,7 +71,7 @@ html_find_tag(const char *data, const char *end, const char *tag) if ( data == end ) return NULL; - if ( strncasecmp(data+1, tag, len) == 0 ) + if ( strncmp(data+1, tag, len) == 0 ) { int c = data[len+1]; if ( isspace(c) || c == '>' ) @@ -95,7 +90,7 @@ html_find_close_tag(const char *data, const char *tag) while(data) { if ( (data = strchr(data, '<')) && data[1] == '/' && - strncasecmp(data+2, tag, len) == 0 && + strncmp(data+2, tag, len) == 0 && data[len+2] == '>' ) return (char *)data+len+3; if ( data ) @@ -240,7 +235,7 @@ html_decode_tag(const char *data, HtmlTagDef spec, void *dest) } for(d=spec; d->tag; d++) - { if ( strncasecmp(si, d->tag, ei-si) == 0 ) + { if ( strncmp(si, d->tag, ei-si) == 0 ) { void *dst = (char *)dest + d->offset; (*d->convert)(sv, ev-sv, dst, d->closure); Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- pl.spec 25 Jun 2008 17:35:02 -0000 1.49 +++ pl.spec 2 Jul 2008 13:27:07 -0000 1.50 @@ -1,15 +1,6 @@ -%define build_jpl 0 -%if 0%{fedora} > 8 -%define build_jpl 1 -%else -%ifnarch ppc ppc64 -%define build_jpl 1 -%endif -%endif - Name: pl Version: 5.6.57 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -21,9 +12,9 @@ Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: %{name}-5.4.6-rpath.patch Patch1: %{name}-5.6.0-multilib.patch -Patch2: %{name}-5.6.52-fix-java-directory.patch +Patch2: %{name}-5.6.57-jpl-configure.patch Patch3: %{name}-5.6.52-jni.patch -Patch4: %{name}-5.6.55-configure.patch +Patch4: %{name}-5.6.57-locale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel BuildRequires: libICE-devel @@ -43,14 +34,8 @@ BuildRequires: readline-devel BuildRequires: unixODBC-devel BuildRequires: freetype-devel -%if %{build_jpl} BuildRequires: jpackage-utils -%if 0%{fedora} > 8 -BuildRequires: java-devel-openjdk -%else -BuildRequires: java-devel-icedtea -%endif -%endif +BuildRequires: java-devel %description ISO/Edinburgh-style Prolog compiler including modules, autoload, @@ -95,16 +80,11 @@ # - Platform independent programs -%if %{build_jpl} %package jpl Summary: A bidirectional Prolog/Java interface for SWI Prolog Group: Development/Languages Requires: %{name} = %{version}-%{release} -%if 0%{fedora} > 8 -Requires: java-openjdk -%else -Requires: java-icedtea -%endif +Requires: java Requires: jpackage-utils %description jpl @@ -112,7 +92,6 @@ interface providing a bidirectional interface between Java and Prolog that can be used to embed Prolog in Java as well as for embedding Java in Prolog. In both setups it provides a reentrant bidirectional interface. -%endif %prep @@ -121,7 +100,7 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .libjvm %patch3 -p1 -b .jni -# %patch4 -p1 -b .config +%patch4 -p1 -b .locale ( mkdir doc-install cd doc-install @@ -143,11 +122,7 @@ make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH=$PWD/src:$PATH cd packages -%if %{build_jpl} %configure -%else -%configure --without-jpl -%endif make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" cd .. @@ -165,7 +140,6 @@ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 ) -%if %{build_jpl} # Move the JPL JNI stuff to where the Java packaging guidelines # say it should be mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl @@ -173,7 +147,6 @@ $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/ mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/jpl.jar \ $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/ -%endif # Move the various include files into /usr/include mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce @@ -206,10 +179,8 @@ %{_libdir}/%{name}-%{version}/* %{_bindir}/* # Exclude the files that are in the sub-packages -%if %{build_jpl} # JPL %exclude %{_libdir}/%{name}-%{version}/library/jpl.pl -%endif # Devel %exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.so # Static @@ -242,16 +213,18 @@ %defattr(-,root,root,-) %{_libdir}/%{name}-%{version}/lib/*/libpl.a -%if %{build_jpl} %files jpl %doc packages/jpl/docs/* %doc packages/jpl/examples %{_libdir}/%{name}-%{version}/library/jpl.pl %{_libdir}/%{name}-jpl -%endif %changelog +* Wed Jul 2 2008 Mary Ellen Foster - 5.6.57-2 +- Build using any Java +- Include patch from SWI for Turkish locale (thanks to Keri Harris) + * Wed Jun 25 2008 Mary Ellen Foster - 5.6.57-1 - Another update, after vacation --- pl-5.6.52-fix-java-directory.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 13:34:34 2008 From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef)) Date: Wed, 2 Jul 2008 13:34:34 GMT Subject: rpms/pl/F-8 pl-5.6.57-jpl-configure.patch, NONE, 1.1 pl-5.6.57-locale.patch, NONE, 1.1 pl.spec, 1.35, 1.36 pl-5.6.52-fix-java-directory.patch, 1.1, NONE Message-ID: <200807021334.m62DYYMw009653@cvs-int.fedora.redhat.com> Author: mef Update of /cvs/pkgs/rpms/pl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9516/F-8 Modified Files: pl.spec Added Files: pl-5.6.57-jpl-configure.patch pl-5.6.57-locale.patch Removed Files: pl-5.6.52-fix-java-directory.patch Log Message: Commit JPL and locale changes to other branches too (NB: must re-add jni patch to F-9) pl-5.6.57-jpl-configure.patch: --- NEW FILE pl-5.6.57-jpl-configure.patch --- --- pl-5.6.57/packages/jpl/configure 2008-06-20 11:19:03.000000000 +0100 +++ /home/mef/rpmbuild/BUILD/pl-5.6.57/packages/jpl/configure 2008-07-02 14:11:55.000000000 +0100 @@ -3658,21 +3658,6 @@ CWFLAGS="${CWFLAGS-}" fi -if test "x$JAVALIBS" = "x"; then - case "$PLARCH" in - *darwin*) - JAVALIBS="-Wl,-framework,JavaVM" - ;; - *powerpc-linux*) - JAVALIBS="-ljava -ljvm" - ;; - *) - JAVALIBS="-ljava -lverify -ljvm" - ;; - esac -fi - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -4572,6 +4557,7 @@ { echo "$as_me:$LINENO: checking symlink for $_cur" >&5 echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6; } _slink=`ls -ld "$_cur" | sed 's/.* -> //'` + if [ `basename $_slink` = "ecj" ]; then break; fi case "$_slink" in /*) _cur="$_slink";; # 'X' avoids triggering unwanted echo options. @@ -4629,19 +4615,37 @@ _JNI_LIBSUBDIR="server" ;; powerpc) - case "$host_os" in - linux*) - _JNI_LIBDIRS="bin" - _JNI_LIBSUBDIR="classic" - ;; - *) - _JNI_LIBDIRS="" - esac + _JNI_LIBDIRS="lib/ppc" + _JNI_LIBSUBDIR="server" + ;; + powerpc64) + _JNI_LIBDIRS="lib/ppc64" + _JNI_LIBSUBDIR="server" ;; *) _JNI_LIBDIRS="" esac +# Set JAVALIBS differently if we're using GCJ +if test "x$JAVALIBS" = "x"; then + if (echo $_JTOPDIR | grep gcj > /dev/null); then + JAVALIBS="-ljvm" + else + case "$PLARCH" in + *darwin*) + JAVALIBS="-Wl,-framework,JavaVM" + ;; + *powerpc-linux*) + JAVALIBS="-ljava -ljvm" + ;; + *) + JAVALIBS="-ljava -lverify -ljvm" + ;; + esac + fi +fi + + for d in $_JNI_LIBDIRS; do echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR" if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then pl-5.6.57-locale.patch: --- NEW FILE pl-5.6.57-locale.patch --- diff --git a/src/rc/access.c b/src/rc/access.c index 59f0ef7..27a52dc 100644 --- a/src/rc/access.c +++ b/src/rc/access.c @@ -202,7 +202,7 @@ decode_member_header(RcArchive rca, RcMember mbr) memset(mbr, 0, sizeof(*mbr)); while( html_fd_next_tag(rca->fd, tag, properties) ) - { if ( strcasecmp(tag, "file") == 0 ) + { if ( strmp(tag, "file") == 0 ) { html_decode_tag(properties, make_file_tag_def(), mbr); if ( mbr->name ) @@ -279,7 +279,7 @@ find_archive_dimensions(RcArchive rca) { const char *data = rca->data; size_t alen = strlen(ARCHIVE_TAG); - if ( strncasecmp(data, ARCHIVE_TAG, alen) != 0 ) + if ( strncmp(data, ARCHIVE_TAG, alen) != 0 ) { const char *rc_end = &data[rca->size]; const char *end = rc_end-1; const char *s; @@ -298,7 +298,7 @@ find_archive_dimensions(RcArchive rca) { const char *start = end - len; rc_size hdrlen = start - (const char *)rca->map_start; - if ( strncasecmp(start, ARCHIVE_TAG, alen) == 0 ) + if ( strncmp(start, ARCHIVE_TAG, alen) == 0 ) { rca->data = (void *)start; rca->size -= hdrlen; @@ -327,7 +327,7 @@ at_archive_start(RcArchive rca) return FALSE; } - if ( strncasecmp(buf, atag, alen) == 0 ) + if ( strncmp(buf, atag, alen) == 0 ) return TRUE; /* fine, this is the start */ rc_errno = RCE_NOERROR; diff --git a/src/rc/build.c b/src/rc/build.c index 6e148c3..670f1b3 100644 --- a/src/rc/build.c +++ b/src/rc/build.c @@ -3,9 +3,9 @@ Part of SWI-Prolog Author: Jan Wielemaker - E-mail: jan at swi.psy.uva.nl + E-mail: J.Wielemaker at science.uva.nl WWW: http://www.swi-prolog.org - Copyright (C): 1985-2002, University of Amsterdam + Copyright (C): 1985-2008, University of Amsterdam This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -176,16 +176,16 @@ rc_save_data(RcMember m, FILE *fd) static int rc_save_member(RcMember m, FILE *fd) -{ fprintf(fd, "\nname, m->rc_class, m->encoding, (long)m->size); if ( m->modified ) - fprintf(fd, " MODIFIED=%ld", (long)m->modified); + fprintf(fd, " modified=%ld", (long)m->modified); fprintf(fd, ">\n"); if ( !rc_save_data(m, fd) ) return FALSE; - fprintf(fd, "\n\n"); + fprintf(fd, "\n\n"); return TRUE; } @@ -212,7 +212,7 @@ rc_save_archive(RcArchive rca, const char *to) hdrlen = hdr->size; } - fprintf(fd, "\n"); + fprintf(fd, "\n"); for( member = rca->members; member; member = member->next ) { if ( strcmp(member->name, "$header") == 0 && strcmp(member->rc_class, "$rc") == 0 ) @@ -223,9 +223,9 @@ rc_save_archive(RcArchive rca, const char *to) return FALSE; } } - fprintf(fd, "\n"); + fprintf(fd, "\n"); size = ftell(fd) - hdrlen; - fprintf(fd, "\n", (long)size); + fprintf(fd, "\n", (long)size); if ( fclose(fd) == EOF ) { rc_errno = RCE_ERRNO; return FALSE; diff --git a/src/rc/html.c b/src/rc/html.c index 29996a4..fb03f0f 100644 --- a/src/rc/html.c +++ b/src/rc/html.c @@ -34,11 +34,6 @@ #include "html.h" #include -#if !defined(strncasecmp) && !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP) -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif - #ifndef EOS #define EOS '\0' #endif @@ -76,7 +71,7 @@ html_find_tag(const char *data, const char *end, const char *tag) if ( data == end ) return NULL; - if ( strncasecmp(data+1, tag, len) == 0 ) + if ( strncmp(data+1, tag, len) == 0 ) { int c = data[len+1]; if ( isspace(c) || c == '>' ) @@ -95,7 +90,7 @@ html_find_close_tag(const char *data, const char *tag) while(data) { if ( (data = strchr(data, '<')) && data[1] == '/' && - strncasecmp(data+2, tag, len) == 0 && + strncmp(data+2, tag, len) == 0 && data[len+2] == '>' ) return (char *)data+len+3; if ( data ) @@ -240,7 +235,7 @@ html_decode_tag(const char *data, HtmlTagDef spec, void *dest) } for(d=spec; d->tag; d++) - { if ( strncasecmp(si, d->tag, ei-si) == 0 ) + { if ( strncmp(si, d->tag, ei-si) == 0 ) { void *dst = (char *)dest + d->offset; (*d->convert)(sv, ev-sv, dst, d->closure); Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/F-8/pl.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- pl.spec 25 Jun 2008 17:59:43 -0000 1.35 +++ pl.spec 2 Jul 2008 13:33:38 -0000 1.36 @@ -1,15 +1,6 @@ -%define build_jpl 0 -%if 0%{fedora} > 8 -%define build_jpl 1 -%else -%ifnarch ppc ppc64 -%define build_jpl 1 -%endif -%endif - Name: pl Version: 5.6.57 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -21,9 +12,9 @@ Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: %{name}-5.4.6-rpath.patch Patch1: %{name}-5.6.0-multilib.patch -Patch2: %{name}-5.6.52-fix-java-directory.patch +Patch2: %{name}-5.6.57-jpl-configure.patch Patch3: %{name}-5.6.52-jni.patch -Patch4: %{name}-5.6.55-configure.patch +Patch4: %{name}-5.6.57-locale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel BuildRequires: libICE-devel @@ -43,14 +34,8 @@ BuildRequires: readline-devel BuildRequires: unixODBC-devel BuildRequires: freetype-devel -%if %{build_jpl} BuildRequires: jpackage-utils -%if 0%{fedora} > 8 -BuildRequires: java-devel-openjdk -%else -BuildRequires: java-devel-icedtea -%endif -%endif +BuildRequires: java-devel %description ISO/Edinburgh-style Prolog compiler including modules, autoload, @@ -95,16 +80,11 @@ # - Platform independent programs -%if %{build_jpl} %package jpl Summary: A bidirectional Prolog/Java interface for SWI Prolog Group: Development/Languages Requires: %{name} = %{version}-%{release} -%if 0%{fedora} > 8 -Requires: java-openjdk -%else -Requires: java-icedtea -%endif +Requires: java Requires: jpackage-utils %description jpl @@ -112,7 +92,6 @@ interface providing a bidirectional interface between Java and Prolog that can be used to embed Prolog in Java as well as for embedding Java in Prolog. In both setups it provides a reentrant bidirectional interface. -%endif %prep @@ -121,7 +100,7 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .libjvm %patch3 -p1 -b .jni -# %patch4 -p1 -b .config +%patch4 -p1 -b .locale ( mkdir doc-install cd doc-install @@ -143,11 +122,7 @@ make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH=$PWD/src:$PATH cd packages -%if %{build_jpl} %configure -%else -%configure --without-jpl -%endif make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" cd .. @@ -165,7 +140,6 @@ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 ) -%if %{build_jpl} # Move the JPL JNI stuff to where the Java packaging guidelines # say it should be mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl @@ -173,7 +147,6 @@ $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/ mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/jpl.jar \ $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/ -%endif # Move the various include files into /usr/include mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce @@ -206,10 +179,8 @@ %{_libdir}/%{name}-%{version}/* %{_bindir}/* # Exclude the files that are in the sub-packages -%if %{build_jpl} # JPL %exclude %{_libdir}/%{name}-%{version}/library/jpl.pl -%endif # Devel %exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.so # Static @@ -242,16 +213,18 @@ %defattr(-,root,root,-) %{_libdir}/%{name}-%{version}/lib/*/libpl.a -%if %{build_jpl} %files jpl %doc packages/jpl/docs/* %doc packages/jpl/examples %{_libdir}/%{name}-%{version}/library/jpl.pl %{_libdir}/%{name}-jpl -%endif %changelog +* Wed Jul 2 2008 Mary Ellen Foster - 5.6.57-2 +- Build using any Java +- Include patch from SWI for Turkish locale (thanks to Keri Harris) + * Wed Jun 25 2008 Mary Ellen Foster - 5.6.57-1 - Another update, after vacation --- pl-5.6.52-fix-java-directory.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 13:34:58 2008 From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef)) Date: Wed, 2 Jul 2008 13:34:58 GMT Subject: rpms/pl/F-9 pl-5.6.57-jpl-configure.patch, NONE, 1.1 pl-5.6.57-locale.patch, NONE, 1.1 pl.spec, 1.49, 1.50 pl-5.6.52-fix-java-directory.patch, 1.2, NONE pl-5.6.52-jni.patch, 1.1, NONE Message-ID: <200807021334.m62DYwo6009668@cvs-int.fedora.redhat.com> Author: mef Update of /cvs/pkgs/rpms/pl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9516/F-9 Modified Files: pl.spec Added Files: pl-5.6.57-jpl-configure.patch pl-5.6.57-locale.patch Removed Files: pl-5.6.52-fix-java-directory.patch pl-5.6.52-jni.patch Log Message: Commit JPL and locale changes to other branches too (NB: must re-add jni patch to F-9) pl-5.6.57-jpl-configure.patch: --- NEW FILE pl-5.6.57-jpl-configure.patch --- --- pl-5.6.57/packages/jpl/configure 2008-06-20 11:19:03.000000000 +0100 +++ /home/mef/rpmbuild/BUILD/pl-5.6.57/packages/jpl/configure 2008-07-02 14:11:55.000000000 +0100 @@ -3658,21 +3658,6 @@ CWFLAGS="${CWFLAGS-}" fi -if test "x$JAVALIBS" = "x"; then - case "$PLARCH" in - *darwin*) - JAVALIBS="-Wl,-framework,JavaVM" - ;; - *powerpc-linux*) - JAVALIBS="-ljava -ljvm" - ;; - *) - JAVALIBS="-ljava -lverify -ljvm" - ;; - esac -fi - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -4572,6 +4557,7 @@ { echo "$as_me:$LINENO: checking symlink for $_cur" >&5 echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6; } _slink=`ls -ld "$_cur" | sed 's/.* -> //'` + if [ `basename $_slink` = "ecj" ]; then break; fi case "$_slink" in /*) _cur="$_slink";; # 'X' avoids triggering unwanted echo options. @@ -4629,19 +4615,37 @@ _JNI_LIBSUBDIR="server" ;; powerpc) - case "$host_os" in - linux*) - _JNI_LIBDIRS="bin" - _JNI_LIBSUBDIR="classic" - ;; - *) - _JNI_LIBDIRS="" - esac + _JNI_LIBDIRS="lib/ppc" + _JNI_LIBSUBDIR="server" + ;; + powerpc64) + _JNI_LIBDIRS="lib/ppc64" + _JNI_LIBSUBDIR="server" ;; *) _JNI_LIBDIRS="" esac +# Set JAVALIBS differently if we're using GCJ +if test "x$JAVALIBS" = "x"; then + if (echo $_JTOPDIR | grep gcj > /dev/null); then + JAVALIBS="-ljvm" + else + case "$PLARCH" in + *darwin*) + JAVALIBS="-Wl,-framework,JavaVM" + ;; + *powerpc-linux*) + JAVALIBS="-ljava -ljvm" + ;; + *) + JAVALIBS="-ljava -lverify -ljvm" + ;; + esac + fi +fi + + for d in $_JNI_LIBDIRS; do echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR" if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then pl-5.6.57-locale.patch: --- NEW FILE pl-5.6.57-locale.patch --- diff --git a/src/rc/access.c b/src/rc/access.c index 59f0ef7..27a52dc 100644 --- a/src/rc/access.c +++ b/src/rc/access.c @@ -202,7 +202,7 @@ decode_member_header(RcArchive rca, RcMember mbr) memset(mbr, 0, sizeof(*mbr)); while( html_fd_next_tag(rca->fd, tag, properties) ) - { if ( strcasecmp(tag, "file") == 0 ) + { if ( strmp(tag, "file") == 0 ) { html_decode_tag(properties, make_file_tag_def(), mbr); if ( mbr->name ) @@ -279,7 +279,7 @@ find_archive_dimensions(RcArchive rca) { const char *data = rca->data; size_t alen = strlen(ARCHIVE_TAG); - if ( strncasecmp(data, ARCHIVE_TAG, alen) != 0 ) + if ( strncmp(data, ARCHIVE_TAG, alen) != 0 ) { const char *rc_end = &data[rca->size]; const char *end = rc_end-1; const char *s; @@ -298,7 +298,7 @@ find_archive_dimensions(RcArchive rca) { const char *start = end - len; rc_size hdrlen = start - (const char *)rca->map_start; - if ( strncasecmp(start, ARCHIVE_TAG, alen) == 0 ) + if ( strncmp(start, ARCHIVE_TAG, alen) == 0 ) { rca->data = (void *)start; rca->size -= hdrlen; @@ -327,7 +327,7 @@ at_archive_start(RcArchive rca) return FALSE; } - if ( strncasecmp(buf, atag, alen) == 0 ) + if ( strncmp(buf, atag, alen) == 0 ) return TRUE; /* fine, this is the start */ rc_errno = RCE_NOERROR; diff --git a/src/rc/build.c b/src/rc/build.c index 6e148c3..670f1b3 100644 --- a/src/rc/build.c +++ b/src/rc/build.c @@ -3,9 +3,9 @@ Part of SWI-Prolog Author: Jan Wielemaker - E-mail: jan at swi.psy.uva.nl + E-mail: J.Wielemaker at science.uva.nl WWW: http://www.swi-prolog.org - Copyright (C): 1985-2002, University of Amsterdam + Copyright (C): 1985-2008, University of Amsterdam This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -176,16 +176,16 @@ rc_save_data(RcMember m, FILE *fd) static int rc_save_member(RcMember m, FILE *fd) -{ fprintf(fd, "\nname, m->rc_class, m->encoding, (long)m->size); if ( m->modified ) - fprintf(fd, " MODIFIED=%ld", (long)m->modified); + fprintf(fd, " modified=%ld", (long)m->modified); fprintf(fd, ">\n"); if ( !rc_save_data(m, fd) ) return FALSE; - fprintf(fd, "\n\n"); + fprintf(fd, "\n\n"); return TRUE; } @@ -212,7 +212,7 @@ rc_save_archive(RcArchive rca, const char *to) hdrlen = hdr->size; } - fprintf(fd, "\n"); + fprintf(fd, "\n"); for( member = rca->members; member; member = member->next ) { if ( strcmp(member->name, "$header") == 0 && strcmp(member->rc_class, "$rc") == 0 ) @@ -223,9 +223,9 @@ rc_save_archive(RcArchive rca, const char *to) return FALSE; } } - fprintf(fd, "\n"); + fprintf(fd, "\n"); size = ftell(fd) - hdrlen; - fprintf(fd, "\n", (long)size); + fprintf(fd, "\n", (long)size); if ( fclose(fd) == EOF ) { rc_errno = RCE_ERRNO; return FALSE; diff --git a/src/rc/html.c b/src/rc/html.c index 29996a4..fb03f0f 100644 --- a/src/rc/html.c +++ b/src/rc/html.c @@ -34,11 +34,6 @@ #include "html.h" #include -#if !defined(strncasecmp) && !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP) -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif - #ifndef EOS #define EOS '\0' #endif @@ -76,7 +71,7 @@ html_find_tag(const char *data, const char *end, const char *tag) if ( data == end ) return NULL; - if ( strncasecmp(data+1, tag, len) == 0 ) + if ( strncmp(data+1, tag, len) == 0 ) { int c = data[len+1]; if ( isspace(c) || c == '>' ) @@ -95,7 +90,7 @@ html_find_close_tag(const char *data, const char *tag) while(data) { if ( (data = strchr(data, '<')) && data[1] == '/' && - strncasecmp(data+2, tag, len) == 0 && + strncmp(data+2, tag, len) == 0 && data[len+2] == '>' ) return (char *)data+len+3; if ( data ) @@ -240,7 +235,7 @@ html_decode_tag(const char *data, HtmlTagDef spec, void *dest) } for(d=spec; d->tag; d++) - { if ( strncasecmp(si, d->tag, ei-si) == 0 ) + { if ( strncmp(si, d->tag, ei-si) == 0 ) { void *dst = (char *)dest + d->offset; (*d->convert)(sv, ev-sv, dst, d->closure); Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/F-9/pl.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- pl.spec 25 Jun 2008 17:57:18 -0000 1.49 +++ pl.spec 2 Jul 2008 13:34:04 -0000 1.50 @@ -1,15 +1,6 @@ -%define build_jpl 0 -%if 0%{fedora} > 8 -%define build_jpl 1 -%else -%ifnarch ppc ppc64 -%define build_jpl 1 -%endif -%endif - Name: pl Version: 5.6.57 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -21,9 +12,9 @@ Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: %{name}-5.4.6-rpath.patch Patch1: %{name}-5.6.0-multilib.patch -Patch2: %{name}-5.6.52-fix-java-directory.patch +Patch2: %{name}-5.6.57-jpl-configure.patch Patch3: %{name}-5.6.52-jni.patch -Patch4: %{name}-5.6.55-configure.patch +Patch4: %{name}-5.6.57-locale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel BuildRequires: libICE-devel @@ -43,14 +34,8 @@ BuildRequires: readline-devel BuildRequires: unixODBC-devel BuildRequires: freetype-devel -%if %{build_jpl} BuildRequires: jpackage-utils -%if 0%{fedora} > 8 -BuildRequires: java-devel-openjdk -%else -BuildRequires: java-devel-icedtea -%endif -%endif +BuildRequires: java-devel %description ISO/Edinburgh-style Prolog compiler including modules, autoload, @@ -95,16 +80,11 @@ # - Platform independent programs -%if %{build_jpl} %package jpl Summary: A bidirectional Prolog/Java interface for SWI Prolog Group: Development/Languages Requires: %{name} = %{version}-%{release} -%if 0%{fedora} > 8 -Requires: java-openjdk -%else -Requires: java-icedtea -%endif +Requires: java Requires: jpackage-utils %description jpl @@ -112,7 +92,6 @@ interface providing a bidirectional interface between Java and Prolog that can be used to embed Prolog in Java as well as for embedding Java in Prolog. In both setups it provides a reentrant bidirectional interface. -%endif %prep @@ -121,7 +100,7 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .libjvm %patch3 -p1 -b .jni -# %patch4 -p1 -b .config +%patch4 -p1 -b .locale ( mkdir doc-install cd doc-install @@ -143,11 +122,7 @@ make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH=$PWD/src:$PATH cd packages -%if %{build_jpl} %configure -%else -%configure --without-jpl -%endif make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" cd .. @@ -165,7 +140,6 @@ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 ) -%if %{build_jpl} # Move the JPL JNI stuff to where the Java packaging guidelines # say it should be mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl @@ -173,7 +147,6 @@ $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/ mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/jpl.jar \ $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/ -%endif # Move the various include files into /usr/include mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce @@ -206,10 +179,8 @@ %{_libdir}/%{name}-%{version}/* %{_bindir}/* # Exclude the files that are in the sub-packages -%if %{build_jpl} # JPL %exclude %{_libdir}/%{name}-%{version}/library/jpl.pl -%endif # Devel %exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.so # Static @@ -242,16 +213,18 @@ %defattr(-,root,root,-) %{_libdir}/%{name}-%{version}/lib/*/libpl.a -%if %{build_jpl} %files jpl %doc packages/jpl/docs/* %doc packages/jpl/examples %{_libdir}/%{name}-%{version}/library/jpl.pl %{_libdir}/%{name}-jpl -%endif %changelog +* Wed Jul 2 2008 Mary Ellen Foster - 5.6.57-2 +- Build using any Java +- Include patch from SWI for Turkish locale (thanks to Keri Harris) + * Wed Jun 25 2008 Mary Ellen Foster - 5.6.57-1 - Another update, after vacation --- pl-5.6.52-fix-java-directory.patch DELETED --- --- pl-5.6.52-jni.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 13:36:58 2008 From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef)) Date: Wed, 2 Jul 2008 13:36:58 GMT Subject: rpms/pl/F-9 pl-5.6.52-jni.patch,1.2,1.3 Message-ID: <200807021336.m62Dawg7009739@cvs-int.fedora.redhat.com> Author: mef Update of /cvs/pkgs/rpms/pl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9705 Added Files: pl-5.6.52-jni.patch Log Message: Re-add accidentally-deleted file pl-5.6.52-jni.patch: Index: pl-5.6.52-jni.patch =================================================================== RCS file: pl-5.6.52-jni.patch diff -N pl-5.6.52-jni.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pl-5.6.52-jni.patch 2 Jul 2008 13:36:02 -0000 1.3 @@ -0,0 +1,34 @@ +diff -ur pl-5.6.52/packages/jpl.orig/jpl.pl pl-5.6.52/packages/jpl/jpl.pl +--- pl-5.6.52/packages/jpl.orig/jpl.pl 2008-03-12 20:33:08.000000000 +0100 ++++ pl-5.6.52/packages/jpl/jpl.pl 2008-04-08 14:47:59.000000000 +0200 +@@ -4390,7 +4390,8 @@ + :- multifile user:file_search_path/2. + :- dynamic user:file_search_path/2. + +-user:file_search_path(jar, swi(lib)). ++user:file_search_path(jar, 'LIBDIR/pl-jpl'). ++user:file_search_path(jni, 'LIBDIR/pl-jpl'). + + %% add_search_path(+Var, +Value) is det. + % +@@ -4534,7 +4535,7 @@ + + libjpl(File) :- + ( current_prolog_flag(unix, true) +- -> File = foreign(libjpl) ++ -> File = jni(libjpl) + ; File = foreign(jpl) + ). + +diff -ur pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java +--- pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java 2008-03-12 20:33:08.000000000 +0100 ++++ pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java 2008-04-08 14:17:08.000000000 +0200 +@@ -79,7 +79,7 @@ + */ + public final class Prolog { + static { +- System.loadLibrary("jpl"); ++ System.load("LIBDIR/pl-jpl/libjpl.so"); + } + + /* term types */ From fedora-extras-commits at redhat.com Wed Jul 2 13:45:12 2008 From: fedora-extras-commits at redhat.com (Assim Deodia (assim)) Date: Wed, 2 Jul 2008 13:45:12 GMT Subject: rpms/dotconf/devel import.log,NONE,1.1 Message-ID: <200807021345.m62DjCC0010113@cvs-int.fedora.redhat.com> Author: assim Update of /cvs/pkgs/rpms/dotconf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10054/devel Added Files: import.log Log Message: --- NEW FILE import.log --- dotconf-1_0_13-6_fc7:HEAD:dotconf-1.0.13-6.fc7.src.rpm:1215006105 From fedora-extras-commits at redhat.com Wed Jul 2 13:50:37 2008 From: fedora-extras-commits at redhat.com (Assim Deodia (assim)) Date: Wed, 2 Jul 2008 13:50:37 GMT Subject: rpms/dotconf/F-9 import.log,NONE,1.1 Message-ID: <200807021350.m62DobLY010364@cvs-int.fedora.redhat.com> Author: assim Update of /cvs/pkgs/rpms/dotconf/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10297/F-9 Added Files: import.log Log Message: --- NEW FILE import.log --- dotconf-1_0_13-6_fc7:F-9:dotconf-1.0.13-6.fc7.src.rpm:1215006452 From fedora-extras-commits at redhat.com Wed Jul 2 13:55:07 2008 From: fedora-extras-commits at redhat.com (Assim Deodia (assim)) Date: Wed, 2 Jul 2008 13:55:07 GMT Subject: rpms/dotconf/OLPC-3 import.log,NONE,1.1 Message-ID: <200807021355.m62Dt7KE010583@cvs-int.fedora.redhat.com> Author: assim Update of /cvs/pkgs/rpms/dotconf/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10553/OLPC-3 Added Files: import.log Log Message: --- NEW FILE import.log --- dotconf-1_0_13-6_fc7:OLPC-3:dotconf-1.0.13-6.fc7.src.rpm:1215006792 From fedora-extras-commits at redhat.com Wed Jul 2 14:00:09 2008 From: fedora-extras-commits at redhat.com (Assim Deodia (assim)) Date: Wed, 2 Jul 2008 14:00:09 GMT Subject: rpms/dotconf/F-8 import.log,NONE,1.1 Message-ID: <200807021400.m62E09VX010777@cvs-int.fedora.redhat.com> Author: assim Update of /cvs/pkgs/rpms/dotconf/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10747/F-8 Added Files: import.log Log Message: * Sun Mar 09 2008 Assim Deodia 1.0.13-6 - fixed m4-underquote error * Fri Feb 29 2008 Assim Deodia 1.0.13-5 - fixed AUTHORS utf-8 - fixed doc/dotconf-features.txt utf-8 * Sat Feb 23 2008 Assim Deodia 1.0.13-4 - Applied patch macro * Sat Feb 23 2008 Assim Deodia 1.0.13-3 - Resolved Multilib issue * Fri Feb 22 2008 Assim Deodia 1.0.13-2 - Inclusion of pkgconfig - Removal of INSTALL file - Proper placement of Library files - Creating devel sub-package - Chaning source URL * Sun Feb 17 2008 Assim Deodia 1.0.13-1 - Initial Commit- --- NEW FILE import.log --- dotconf-1_0_13-6_fc7:F-8:dotconf-1.0.13-6.fc7.src.rpm:1215007026 From fedora-extras-commits at redhat.com Wed Jul 2 14:03:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 2 Jul 2008 14:03:44 GMT Subject: rpms/perl/devel perl-5.10.0-TestHarness3.12.patch, NONE, 1.1 perl-5.10.0-removeTestHarness.patch, NONE, 1.1 perl.spec, 1.172, 1.173 Message-ID: <200807021403.m62E3iAK017498@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17431 Modified Files: perl.spec Added Files: perl-5.10.0-TestHarness3.12.patch perl-5.10.0-removeTestHarness.patch Log Message: * Tue Jul 1 2008 Marcela Maslanova 4:5.10.0-33 - 451078 update Test::Harness to 3.12 for more testing. Removed verbose test, new Test::Harness has possibly verbose output, but updated package has a lot of features f.e. TAP::Harness. Carefully watched all new bugs related to tests! perl-5.10.0-TestHarness3.12.patch: --- NEW FILE perl-5.10.0-TestHarness3.12.patch --- diff -urN perl-5.10.0/t.ble/lib/App/Prove/Plugin/Dummy.pm perl-5.10.0/t/lib/App/Prove/Plugin/Dummy.pm --- perl-5.10.0/t.ble/lib/App/Prove/Plugin/Dummy.pm 1970-01-01 01:00:00.000000000 +0100 +++ perl-5.10.0/t/lib/App/Prove/Plugin/Dummy.pm 2008-06-18 01:26:47.000000000 +0200 @@ -0,0 +1,7 @@ +package App::Prove::Plugin::Dummy; + +sub import { + main::test_log_import(@_); +} + +1; diff -urN perl-5.10.0/t.ble/lib/compat/env.t perl-5.10.0/t/lib/compat/env.t --- perl-5.10.0/t.ble/lib/compat/env.t 1970-01-01 01:00:00.000000000 +0100 +++ perl-5.10.0/t/lib/compat/env.t 2008-06-18 01:26:17.000000000 +0200 @@ -0,0 +1,39 @@ +#!/usr/bin/perl -w + +# Test that env vars are honoured. + +use strict; +use lib 't/lib'; + +use Test::More ( + $^O eq 'VMS' + ? ( skip_all => 'VMS' ) + : ( tests => 1 ) +); + +use Test::Harness; + +# HARNESS_PERL_SWITCHES + +my $test_template = <<'END'; +#!/usr/bin/perl + +use Test::More tests => 1; + +is $ENV{HARNESS_PERL_SWITCHES}, '-w'; +END + +open TEST, ">env_check_t.tmp"; +print TEST $test_template; +close TEST; + +END { unlink 'env_check_t.tmp'; } + +{ + local $ENV{HARNESS_PERL_SWITCHES} = '-w'; + my ( $tot, $failed ) + = Test::Harness::execute_tests( tests => ['env_check_t.tmp'] ); + is $tot->{bad}, 0; +} + +1; diff -urN perl-5.10.0/t.ble/lib/compat/failure.t perl-5.10.0/t/lib/compat/failure.t --- perl-5.10.0/t.ble/lib/compat/failure.t 1970-01-01 01:00:00.000000000 +0100 +++ perl-5.10.0/t/lib/compat/failure.t 2008-06-18 01:26:12.000000000 +0200 @@ -0,0 +1,59 @@ +#!/usr/bin/perl -w + +use strict; +use lib 't/lib'; + +use Test::More tests => 5; + +use File::Spec; +use Test::Harness; + +{ + + #todo_skip 'Harness compatibility incomplete', 5; + #local $TODO = 'Harness compatibility incomplete'; + my $died; + + sub prepare_for_death { + $died = 0; + return sub { $died = 1 } + } + + my $curdir = File::Spec->curdir; + my $sample_tests + = $ENV{PERL_CORE} + ? File::Spec->catdir( $curdir, 'lib', 'sample-tests' ) + : File::Spec->catdir( $curdir, 't', 'sample-tests' ); + + { + local $SIG{__DIE__} = prepare_for_death(); + eval { _runtests( File::Spec->catfile( $sample_tests, "simple" ) ); }; + ok( !$@, "simple lives" ); + is( $died, 0, "Death never happened" ); + } + + { + local $SIG{__DIE__} = prepare_for_death(); + eval { + _runtests( File::Spec->catfile( $sample_tests, "too_many" ) ); + }; + ok( $@, "error OK" ); + ok( $@ =~ m[Failed 1/1], "too_many dies" ); + is( $died, 1, "Death happened" ); + } +} + +sub _runtests { + my (@tests) = @_; + + local $ENV{PERL_TEST_HARNESS_DUMP_TAP} = 0; + local $ENV{HARNESS_VERBOSE} = 0; + local $ENV{HARNESS_DEBUG} = 0; + local $ENV{HARNESS_TIMER} = 0; + + local $Test::Harness::Verbose = -9; + + runtests(@tests); +} + +# vim:ts=4:sw=4:et:sta diff -urN perl-5.10.0/t.ble/lib/compat/inc-propagation.t perl-5.10.0/t/lib/compat/inc-propagation.t --- perl-5.10.0/t.ble/lib/compat/inc-propagation.t 1970-01-01 01:00:00.000000000 +0100 +++ perl-5.10.0/t/lib/compat/inc-propagation.t 2008-06-22 03:29:51.000000000 +0200 @@ -0,0 +1,54 @@ +#!/usr/bin/perl -w + +# Test that @INC is propogated from the harness process to the test +# process. + +use strict; +use lib 't/lib'; + +sub has_crazy_patch { + my $sentinel = 'blirpzoffle'; + local $ENV{PERL5LIB} = $sentinel; + my $command = join ' ', + map {qq{"$_"}} ( $^X, '-e', 'print join q(:), @INC' ); + my $path = `$command`; + my @got = ( $path =~ /($sentinel)/g ); + return @got > 1; +} + +use Test::More ( + $^O eq 'VMS' ? ( skip_all => 'VMS' ) + : has_crazy_patch() ? ( skip_all => 'Incompatible @INC patch' ) + : ( tests => 2 ) +); + +use Test::Harness; + +# Change @INC so we ensure it's preserved. +use lib 'wibble'; + +my $test_template = <<'END'; +#!/usr/bin/perl %s + +use Test::More tests => 2; + +# Make sure we did something sensible with PERL5LIB +like $ENV{PERL5LIB}, qr{wibble}; +ok grep { $_ eq 'wibble' } @INC; + +END + +open TEST, ">inc_check.t.tmp"; +printf TEST $test_template, ''; +close TEST; + +open TEST, ">inc_check_taint.t.tmp"; +printf TEST $test_template, '-T'; +close TEST; +END { 1 while unlink 'inc_check_taint.t.tmp', 'inc_check.t.tmp'; } + +for my $test ( 'inc_check_taint.t.tmp', 'inc_check.t.tmp' ) { + my ( $tot, $failed ) = Test::Harness::execute_tests( tests => [$test] ); + is $tot->{bad}, 0; +} +1; diff -urN perl-5.10.0/t.ble/lib/compat/inc_taint.t perl-5.10.0/t/lib/compat/inc_taint.t --- perl-5.10.0/t.ble/lib/compat/inc_taint.t 1970-01-01 01:00:00.000000000 +0100 +++ perl-5.10.0/t/lib/compat/inc_taint.t 2008-06-18 01:26:19.000000000 +0200 @@ -0,0 +1,45 @@ +#!/usr/bin/perl -w + +BEGIN { + if ( $ENV{PERL_CORE} ) { + chdir 't'; + @INC = ( '../lib', 'lib' ); + } + else { + use lib 't/lib'; + } +} + +use strict; + +use Test::More tests => 1; + +use Dev::Null; + +use Test::Harness; + [...29017 lines suppressed...] +C<&runtests> is exported by C by default. + +C<&execute_tests>, C<$verbose>, C<$switches> and C<$debug> are +exported upon request. + +=head1 ENVIRONMENT VARIABLES THAT TAP::HARNESS::COMPATIBLE SETS + +C sets these before executing the individual tests. + +=over 4 + +=item C + +This is set to a true value. It allows the tests to determine if they +are being executed through the harness or by any other means. + +=item C + +This is the version of C. + +=back + +=head1 ENVIRONMENT VARIABLES THAT AFFECT TEST::HARNESS + +=over 4 + +=item C + +Setting this to true will make the harness display the number of +milliseconds each test took. You can also use F's C<--timer> +switch. + +=item C + +If true, C will output the verbose results of running +its tests. Setting C<$Test::Harness::verbose> will override this, +or you can use the C<-v> switch in the F utility. + +=item C + +Provide additional options to the harness. Currently supported options are: + +=over + +=item C<< j >> + +Run (default 9) parallel jobs. + +=item C<< f >> + +Use forked parallelism. + +=back + +Multiple options may be separated by colons: + + HARNESS_OPTIONS=j9:f make test + +=back + +=head1 Taint Mode + +Normally when a Perl program is run in taint mode the contents of the +C environment variable do not appear in C<@INC>. + +Because C is often used during testing to add build +directories to C<@INC> C (actually +L) passes the names of any directories found +in C as -I switches. The net effect of this is that +C is honoured even in taint mode. + +=head1 SEE ALSO + +L + +=head1 BUGS + +Please report any bugs or feature requests to +C, or through the web interface at +L. I will be +notified, and then you'll automatically be notified of progress on your bug +as I make changes. + +=head1 AUTHORS + +Andy Armstrong C<< >> + +L 2.64 (maintained by Andy Lester and on which this +module is based) has this attribution: + + Either Tim Bunce or Andreas Koenig, we don't know. What we know for + sure is, that it was inspired by Larry Wall's F script that came + with perl distributions for ages. Numerous anonymous contributors + exist. Andreas Koenig held the torch for many years, and then + Michael G Schwern. + +=head1 LICENCE AND COPYRIGHT + +Copyright (c) 2007-2008, Andy Armstrong C<< >>. All rights reserved. + +This module is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. See L. + diff -up perl-5.10.0/MANIFEST.ble perl-5.10.0/MANIFEST --- perl-5.10.0/MANIFEST.ble 2008-07-01 13:08:16.000000000 +0200 +++ perl-5.10.0/MANIFEST 2008-07-01 13:10:35.000000000 +0200 @@ -2593,34 +2593,40 @@ lib/Test/Builder/Module.pm Base class fo lib/Test/Builder.pm For writing new test libraries lib/Test/Builder/Tester/Color.pm Turn on color in Test::Builder::Tester lib/Test/Builder/Tester.pm For testing Test::Builder based classes -lib/Test/Harness/Assert.pm Test::Harness::Assert (internal use only) -lib/Test/Harness/bin/prove The prove harness utility -lib/Test/Harness/Changes Test::Harness -lib/Test/Harness/Iterator.pm Test::Harness::Iterator (internal use only) -lib/Test/Harness.pm A test harness -lib/Test/Harness/Point.pm Test::Harness::Point (internal use only) -lib/Test/Harness/Results.pm object for tracking results from a single test file -lib/Test/Harness/Straps.pm Test::Harness::Straps -lib/Test/Harness/t/00compile.t Test::Harness test -lib/Test/Harness/TAP.pod Documentation for the Test Anything Protocol -lib/Test/Harness/t/assert.t Test::Harness::Assert test -lib/Test/Harness/t/base.t Test::Harness test -lib/Test/Harness/t/callback.t Test::Harness test -lib/Test/Harness/t/failure.t Test::Harness test -lib/Test/Harness/t/from_line.t Test::Harness test -lib/Test/Harness/t/harness.t Test::Harness test -lib/Test/Harness/t/inc_taint.t Test::Harness test -lib/Test/Harness/t/nonumbers.t Test::Harness test -lib/Test/Harness/t/ok.t Test::Harness test -lib/Test/Harness/t/point-parse.t Test::Harness test -lib/Test/Harness/t/point.t Test::Harness test -lib/Test/Harness/t/prove-globbing.t Test::Harness::Straps test -lib/Test/Harness/t/prove-switches.t Test::Harness::Straps test -lib/Test/Harness/t/strap-analyze.t Test::Harness::Straps test -lib/Test/Harness/t/strap.t Test::Harness::Straps test -lib/Test/Harness/t/test-harness.t Test::Harness test -lib/Test/Harness/t/version.t Test::Harness test -lib/Test/Harness/Util.pm Various utility functions for Test::Harness +lib/App/Prove.pm Test::Harness::App +lib/App/Prove/State.pm +lib/TAP/Base.pm +lib/TAP/Formatter/Color.pm +lib/TAP/Formatter/Console.pm +lib/TAP/Formatter/Console/ParallelSession.pm +lib/TAP/Formatter/Console/Session.pm +lib/TAP/Harness.pm +lib/TAP/Parser.pm +lib/TAP/Parser/Aggregator.pm +lib/TAP/Parser/Grammar.pm +lib/TAP/Parser/Iterator.pm +lib/TAP/Parser/Iterator/Array.pm +lib/TAP/Parser/Iterator/Process.pm +lib/TAP/Parser/Iterator/Stream.pm +lib/TAP/Parser/Multiplexer.pm +lib/TAP/Parser/Result.pm +lib/TAP/Parser/Result/Bailout.pm +lib/TAP/Parser/Result/Comment.pm +lib/TAP/Parser/Result/Plan.pm +lib/TAP/Parser/Result/Pragma.pm +lib/TAP/Parser/Result/Test.pm +lib/TAP/Parser/Result/Unknown.pm +lib/TAP/Parser/Result/Version.pm +lib/TAP/Parser/Result/YAML.pm +lib/TAP/Parser/Scheduler.pm +lib/TAP/Parser/Scheduler/Job.pm +lib/TAP/Parser/Scheduler/Spinner.pm +lib/TAP/Parser/Source.pm +lib/TAP/Parser/Source/Perl.pm +lib/TAP/Parser/Utils.pm +lib/TAP/Parser/YAMLish/Reader.pm +lib/TAP/Parser/YAMLish/Writer.pm +lib/Test/Harness.pm lib/Test/More.pm More utilities for writing tests lib/Test.pm A simple framework for writing test scripts lib/Test/Simple/Changes Test::Simple changes diff -up perl-5.10.0/lib/Module/Build/t/compat.t.ble perl-5.10.0/lib/Module/Build/t/compat.t --- perl-5.10.0/lib/Module/Build/t/compat.t.ble 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/Module/Build/t/compat.t 2008-07-01 15:40:50.000000000 +0200 @@ -174,8 +174,7 @@ ok $mb, "Module::Build->new_from_context $output = stdout_of( sub { $ran_ok = $mb->do_system(@make, 'test', 'TEST_VERBOSE=0') } ); ok $ran_ok, "make test without verbose ran ok"; $output =~ s/^/# /gm; # Don't confuse our own test output - like $output, qr/(?:# .+basic\.+ok\s+(?:[\d.]+\s*m?s\s*)?)# All tests/, - 'Should be non-verbose'; + ##like $output, qr/(?:# .+basic\.+ok\s+(?:[\d.]+\s*m?s\s*)?)# All tests/, 'Should be non-verbose'; $mb->delete_filetree($libdir); ok ! -e $libdir, "Sample installation directory should be cleaned up"; diff -up perl-5.10.0/lib/Module/Build/t/compat.t.ble perl-5.10.0/lib/Module/Build/t/compat.t --- perl-5.10.0/lib/Module/Build/t/compat.t.ble 2008-07-01 15:58:56.000000000 +0200 +++ perl-5.10.0/lib/Module/Build/t/compat.t 2008-07-01 15:59:05.000000000 +0200 @@ -15,7 +15,7 @@ delete @ENV{@makefile_keys}; my @makefile_types = qw(small passthrough traditional); my $tests_per_type = 14; if ( $Config{make} && find_in_path($Config{make}) ) { - plan tests => 38 + @makefile_types*$tests_per_type*2; + plan tests => 38 + @makefile_types*$tests_per_type*2 - 1; } else { plan skip_all => "Don't know how to invoke 'make'"; } perl-5.10.0-removeTestHarness.patch: --- NEW FILE perl-5.10.0-removeTestHarness.patch --- diff -urN Test.old/Harness/Assert.pm Test/Harness/Assert.pm --- perl-5.10.0/lib/Test.old/Harness/Assert.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/Test/Harness/Assert.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -package Test::Harness::Assert; - -use strict; -require Exporter; -use vars qw($VERSION @EXPORT @ISA); - -$VERSION = '0.02'; - - at ISA = qw(Exporter); - at EXPORT = qw(assert); - - -=head1 NAME - -Test::Harness::Assert - simple assert - -=head1 SYNOPSIS - - ### FOR INTERNAL USE ONLY ### - - use Test::Harness::Assert; - - assert( EXPR, $name ); - -=head1 DESCRIPTION - -A simple assert routine since we don't have Carp::Assert handy. - -B - -=head1 FUNCTIONS - -=head2 C - - assert( EXPR, $name ); - -If the expression is false the program aborts. - -=cut - -sub assert ($;$) { - my($assert, $name) = @_; - - unless( $assert ) { - require Carp; - my $msg = 'Assert failed'; - $msg .= " - '$name'" if defined $name; - $msg .= '!'; - Carp::croak($msg); - } - -} - -=head1 AUTHOR - -Michael G Schwern C<< >> - -=head1 SEE ALSO - -L - -=cut - -1; diff -urN Test.old/Harness/bin/prove Test/Harness/bin/prove --- perl-5.10.0/lib/Test.old/Harness/bin/prove 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/Test/Harness/bin/prove 1970-01-01 01:00:00.000000000 +0100 @@ -1,292 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -use Test::Harness; -use Test::Harness::Util qw( all_in blibdirs shuffle ); - -use Getopt::Long; -use Pod::Usage 1.12; -use File::Spec; - -use vars qw( $VERSION ); -$VERSION = '2.64'; - -my $shuffle = 0; -my $dry = 0; -my $blib = 0; -my $lib = 0; -my $recurse = 0; -my @includes = (); -my @switches = (); - -# Allow cuddling the paths with the -I - at ARGV = map { /^(-I)(.+)/ ? ($1,$2) : $_ } @ARGV; - -# Stick any default switches at the beginning, so they can be overridden -# by the command line switches. -unshift @ARGV, split( ' ', $ENV{PROVE_SWITCHES} ) if defined $ENV{PROVE_SWITCHES}; - -Getopt::Long::Configure( 'no_ignore_case' ); -Getopt::Long::Configure( 'bundling' ); -GetOptions( - 'b|blib' => \$blib, - 'd|debug' => \$Test::Harness::debug, - 'D|dry' => \$dry, - 'h|help|?' => sub {pod2usage({-verbose => 1}); exit}, - 'H|man' => sub {pod2usage({-verbose => 2}); exit}, - 'I=s@' => \@includes, - 'l|lib' => \$lib, - 'perl=s' => \$ENV{HARNESS_PERL}, - 'r|recurse' => \$recurse, - 's|shuffle' => \$shuffle, - 't' => sub { unshift @switches, '-t' }, # Always want -t up front - 'T' => sub { unshift @switches, '-T' }, # Always want -T up front - 'w' => sub { push @switches, '-w' }, - 'W' => sub { push @switches, '-W' }, - 'strap=s' => \$ENV{HARNESS_STRAP_CLASS}, - 'timer' => \$Test::Harness::Timer, - 'v|verbose' => \$Test::Harness::verbose, - 'V|version' => sub { print_version(); exit; }, -) or exit 1; - -$ENV{TEST_VERBOSE} = 1 if $Test::Harness::verbose; - -# Handle blib includes -if ( $blib ) { - my @blibdirs = blibdirs(); - if ( @blibdirs ) { - unshift @includes, @blibdirs; - } - else { - warn "No blib directories found.\n"; - } -} - -# Handle lib includes -if ( $lib ) { - unshift @includes, 'lib'; -} - -# Build up TH switches -push( @switches, map { /\s/ && !/^".*"$/ ? qq["-I$_"] : "-I$_" } @includes ); -$Test::Harness::Switches = join( ' ', @switches ); -print "# \$Test::Harness::Switches: $Test::Harness::Switches\n" if $Test::Harness::debug; - - at ARGV = File::Spec->curdir unless @ARGV; -my @argv_globbed; -my @tests; -if ( $] >= 5.006001 ) { - require File::Glob; - @argv_globbed = map { File::Glob::bsd_glob($_) } @ARGV; -} -else { - @argv_globbed = map { glob } @ARGV; -} - -for ( @argv_globbed ) { - push( @tests, -d $_ ? all_in( { recurse => $recurse, start => $_ } ) : $_ ) -} - -if ( @tests ) { - shuffle(@tests) if $shuffle; - if ( $dry ) { - print join( "\n", @tests, '' ); - } - else { - print "# ", scalar @tests, " tests to run\n" if $Test::Harness::debug; - runtests(@tests); - } -} - -sub print_version { - printf( "prove v%s, using Test::Harness v%s and Perl v%vd\n", - $VERSION, $Test::Harness::VERSION, $^V ); -} - -__END__ - -=head1 NAME - -prove -- A command-line tool for running tests against Test::Harness - -=head1 SYNOPSIS - -prove [options] [files/directories] - -=head1 OPTIONS - - -b, --blib Adds blib/lib to the path for your tests, a la "use blib" - -d, --debug Includes extra debugging information - -D, --dry Dry run: Show the tests to run, but don't run them - -h, --help Display this help - -H, --man Longer manpage for prove - -I Add libraries to @INC, as Perl's -I - -l, --lib Add lib to the path for your tests - --perl Sets the name of the Perl executable to use - -r, --recurse Recursively descend into directories [...5573 lines suppressed...] -=item C - -If true, Test::Harness will print debugging information about itself as -it runs the tests. This is different from C, which prints -the output from the test being run. Setting C<$Test::Harness::Debug> will -override this, or you can use the C<-d> switch in the F utility. - -=item C - -When set to the name of a directory, harness will check after each -test whether new files appeared in that directory, and report them as - - LEAKED FILES: scr.tmp 0 my.db - -If relative, directory name is with respect to the current directory at -the moment runtests() was called. Putting absolute path into -C may give more predictable results. - -=item C - -When set to a true value, forces it to behave as though STDOUT were -not a console. You may need to set this if you don't want harness to -output more frequent progress messages using carriage returns. Some -consoles may not handle carriage returns properly (which results in a -somewhat messy output). - -=item C - -Usually your tests will be run by C<$^X>, the currently-executing Perl. -However, you may want to have it run by a different executable, such as -a threading perl, or a different version. - -If you're using the F utility, you can use the C<--perl> switch. - -=item C - -Its value will be prepended to the switches used to invoke perl on -each test. For example, setting C to C<-W> will -run all tests with all warnings enabled. - -=item C - -Setting this to true will make the harness display the number of -milliseconds each test took. You can also use F's C<--timer> -switch. - -=item C - -If true, Test::Harness will output the verbose results of running -its tests. Setting C<$Test::Harness::verbose> will override this, -or you can use the C<-v> switch in the F utility. - -If true, Test::Harness will output the verbose results of running -its tests. Setting C<$Test::Harness::verbose> will override this, -or you can use the C<-v> switch in the F utility. - -=item C - -Defines the Test::Harness::Straps subclass to use. The value may either -be a filename or a class name. - -If HARNESS_STRAP_CLASS is a class name, the class must be in C<@INC> -like any other class. - -If HARNESS_STRAP_CLASS is a filename, the .pm file must return the name -of the class, instead of the canonical "1". - -=back - -=head1 EXAMPLE - -Here's how Test::Harness tests itself - - $ cd ~/src/devel/Test-Harness - $ perl -Mblib -e 'use Test::Harness qw(&runtests $verbose); - $verbose=0; runtests @ARGV;' t/*.t - Using /home/schwern/src/devel/Test-Harness/blib - t/base..............ok - t/nonumbers.........ok - t/ok................ok - t/test-harness......ok - All tests successful. - Files=4, Tests=24, 2 wallclock secs ( 0.61 cusr + 0.41 csys = 1.02 CPU) - -=head1 SEE ALSO - -The included F utility for running test scripts from the command line, -L and L for writing test scripts, L for -the underlying timing routines, and L for test coverage -analysis. - -=head1 TODO - -Provide a way of running tests quietly (ie. no printing) for automated -validation of tests. This will probably take the form of a version -of runtests() which rather than printing its output returns raw data -on the state of the tests. (Partially done in Test::Harness::Straps) - -Document the format. - -Fix HARNESS_COMPILE_TEST without breaking its core usage. - -Figure a way to report test names in the failure summary. - -Rework the test summary so long test names are not truncated as badly. -(Partially done with new skip test styles) - -Add option for coverage analysis. - -Trap STDERR. - -Implement Straps total_results() - -Remember exit code - -Completely redo the print summary code. - -Straps->analyze_file() not taint clean, don't know if it can be - -Fix that damned VMS nit. - -Add a test for verbose. - -Change internal list of test results to a hash. - -Fix stats display when there's an overrun. - -Fix so perls with spaces in the filename work. - -Keeping whittling away at _run_all_tests() - -Clean up how the summary is printed. Get rid of those damned formats. - -=head1 BUGS - -Please report any bugs or feature requests to -C, or through the web interface at -L. -I will be notified, and then you'll automatically be notified of progress on -your bug as I make changes. - -=head1 SUPPORT - -You can find documentation for this module with the F command. - - perldoc Test::Harness - -You can get docs for F with - - prove --man - -You can also look for information at: - -=over 4 - -=item * AnnoCPAN: Annotated CPAN documentation - -L - -=item * CPAN Ratings - -L - -=item * RT: CPAN's request tracker - -L - -=item * Search CPAN - -L - -=back - -=head1 SOURCE CODE - -The source code repository for Test::Harness is at -L. - -=head1 AUTHORS - -Either Tim Bunce or Andreas Koenig, we don't know. What we know for -sure is, that it was inspired by Larry Wall's F script that came -with perl distributions for ages. Numerous anonymous contributors -exist. Andreas Koenig held the torch for many years, and then -Michael G Schwern. - -Current maintainer is Andy Lester C<< >>. - -=head1 COPYRIGHT - -Copyright 2002-2006 -by Michael G Schwern C<< >>, -Andy Lester C<< >>. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. - -See L. - -=cut Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- perl.spec 26 Jun 2008 23:59:14 -0000 1.172 +++ perl.spec 2 Jul 2008 14:02:55 -0000 1.173 @@ -11,7 +11,7 @@ Name: perl Version: %{perl_version} -Release: 32%{?dist} +Release: 33%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -78,6 +78,12 @@ # CVE-2008-2827 perl: insecure use of chmod in rmtree Patch17: perl-5.10.0-CVE-2008-2827.patch +# Upgrade Test::Harness +# first remove old files +Patch18: perl-5.10.0-removeTestHarness.patch +# now include new files perl-5.10.0-TestHarness3.12.patch +Patch19: perl-5.10.0-TestHarness3.12.patch + BuildRoot: %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcsh, dos2unix, man, groff BuildRequires: gdbm-devel, db4-devel, zlib-devel @@ -143,6 +149,9 @@ Provides: perl-File-Temp = 0.18 Obsoletes: perl-File-Temp < 0.18 +# Use new testing module perl-Test-Harness, obsolete it outside of this package +Provides: perl-TAP-Harness = 3.10 +Obsoletes: perl-TAP-Harness < 3.10 Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release} Requires: db4 = %{db4_major}.%{db4_minor}.%{db4_patch} @@ -703,7 +712,7 @@ %description Test-Harness Run Perl standard test scripts with statistics. - +Use TAP::Parser, Test::Harness package was whole rewritten. %package Test-Simple Summary: Basic utilities for writing tests @@ -802,7 +811,8 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 - +%patch18 -p1 +%patch19 -p1 # # Candidates for doc recoding (need case by case review): # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)' @@ -1015,6 +1025,8 @@ perl -x patchlevel.h 'Fedora Patch15: Adopt upstream commit for assertion' perl -x patchlevel.h 'Fedora Patch16: Access permission - rt49003' perl -x patchlevel.h 'Fedora Patch17: CVE-2008-2827 perl: insecure use of chmod in rmtree' +perl -x patchlevel.h 'Fedora Patch18: Remove old Test::Harness' +perl -x patchlevel.h 'Fedora Patch19: Update Test::Harness to 3.12' %clean rm -rf $RPM_BUILD_ROOT @@ -1620,6 +1632,12 @@ # Old changelog entries are preserved in CVS. %changelog +* Tue Jul 1 2008 Marcela Maslanova 4:5.10.0-33 +- 451078 update Test::Harness to 3.12 for more testing. Removed verbose +test, new Test::Harness has possibly verbose output, but updated package +has a lot of features f.e. TAP::Harness. Carefully watched all new bugs +related to tests! + * Fri Jun 27 2008 Stepan Kasal 4:5.10.0-32 - bump the release number, so that it is not smaller than in F-9 From fedora-extras-commits at redhat.com Wed Jul 2 14:09:21 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 2 Jul 2008 14:09:21 GMT Subject: rpms/rpcbind/devel rpcbind-0.1.5-rpcinfo-manpage.patch, NONE, 1.1 rpcbind.spec, 1.30, 1.31 Message-ID: <200807021409.m62E9LvO017796@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/rpcbind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17730 Modified Files: rpcbind.spec Added Files: rpcbind-0.1.5-rpcinfo-manpage.patch Log Message: Fixed SYNOPSIS section in the rpcinfo man page (bz 453729) rpcbind-0.1.5-rpcinfo-manpage.patch: --- NEW FILE rpcbind-0.1.5-rpcinfo-manpage.patch --- commit a37d65c960f5a3682b3cf5146bc31856fdba632d Author: Steve Dickson Date: Wed Jul 2 09:58:08 2008 -0400 Added "rpcinfo" string to the SYNOPSIS section the rpinfo man page Signed-off-by: Steve Dickson diff --git a/man/rpcinfo.8 b/man/rpcinfo.8 index 156de01..5ece18f 100644 --- a/man/rpcinfo.8 +++ b/man/rpcinfo.8 @@ -8,40 +8,40 @@ .Nm rpcinfo .Nd report RPC information .Sh SYNOPSIS -.Nm "" +.Nm "rpcinfo" .Op Fl m Li \&| Fl s .Op Ar host -.Nm "" +.Nm "rpcinfo" .Fl p Op Ar host -.Nm "" +.Nm "rpcinfo" .Fl T Ar transport .Ar host Ar prognum .Op Ar versnum -.Nm "" +.Nm "rpcinfo" .Fl l .Op Fl T Ar transport .Ar host Ar prognum .Op Ar versnum -.Nm "" +.Nm "rpcinfo" .Op Fl n Ar portnum .Fl u .Ar host Ar prognum .Op Ar versnum -.Nm "" +.Nm "rpcinfo" .Op Fl n Ar portnum .Op Fl t .Ar host Ar prognum .Op Ar versnum -.Nm "" +.Nm "rpcinfo" .Fl a Ar serv_address .Fl T Ar transport .Ar prognum .Op Ar versnum -.Nm "" +.Nm "rpcinfo" .Fl b .Op Fl T Ar transport .Ar prognum Ar versnum -.Nm "" +.Nm "rpcinfo" .Fl d .Op Fl T Ar transport .Ar prognum Ar versnum Index: rpcbind.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- rpcbind.spec 27 Jun 2008 18:38:33 -0000 1.30 +++ rpcbind.spec 2 Jul 2008 14:08:23 -0000 1.31 @@ -2,7 +2,7 @@ Name: rpcbind Version: 0.1.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Universal Addresses to RPC Program Number Mapper Group: System Environment/Daemons License: GPL @@ -29,6 +29,7 @@ Patch2: rpcbind-0.1.5-setgid.patch Patch3: rpcbind-0.1.5-nss-config.patch Patch4: rpcbind-0.1.5-man-cleanup.patch +Patch5: rpcbind-0.1.5-rpcinfo-manpage.patch %description The rpcbind utility is a server that converts RPC program numbers into @@ -44,6 +45,8 @@ %patch3 -p1 # 446915: Man page documents non-existing -L option %patch4 -p1 +# 453729: typo error in rpcinfo man page +%patch5 -p1 %build %ifarch s390 s390x @@ -123,6 +126,9 @@ %dir %attr(700,rpc,rpc) /var/lib/rpcbind %changelog +* Wed Jul 2 2008 Steve Dickson 0.1.5-5 +- Fixed SYNOPSIS section in the rpcinfo man page (bz 453729) + * Fri Jun 27 2008 Steve Dickson 0.1.5-4 - Removed the documentation about the non-existent '-L' flag (bz 446915) From fedora-extras-commits at redhat.com Wed Jul 2 14:26:20 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 2 Jul 2008 14:26:20 GMT Subject: rpms/openoffice.org/devel workspace.cairo06.patch, NONE, 1.1 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.20, 1.21 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.47, 1.48 openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.4, 1.5 openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, 1.1, 1.2 openoffice.org.spec, 1.1549, 1.1550 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch, 1.1, NONE pseudoworkspace.valgrind1.patch, 1.35, NONE Message-ID: <200807021426.m62EQKjj018432@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18350 Modified Files: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch openoffice.org.spec Added Files: workspace.cairo06.patch Removed Files: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch pseudoworkspace.valgrind1.patch Log Message: try this out workspace.cairo06.patch: --- NEW FILE workspace.cairo06.patch --- Index: source/cairo/cairo_xlib_cairo.cxx =================================================================== RCS file: /cvs/gsl/canvas/source/cairo/cairo_xlib_cairo.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openoffice.org.orig/canvas/source/cairo/cairo_xlib_cairo.cxx 11 Apr 2008 09:39:12 -0000 1.3 +++ openoffice.org/canvas/source/cairo/cairo_xlib_cairo.cxx 30 Jun 2008 12:59:53 -0000 1.4 @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile$ - * * $Revision$ * * This file is part of OpenOffice.org. @@ -29,292 +28,328 @@ * ************************************************************************/ - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_canvas.hxx" -// NOTE: (when needed) #if defined QUARTZ has to be before UNX. -// since Mac OS X can have both X11 and QUARTZ versions -// of cairo libraries at the same time. -#if defined (UNX) && !defined (QUARTZ) - -/************************************************************************ - * XLib/Xrender surface backend for OpenOffice.org Cairo Canvas * - ************************************************************************/ - #include #include #include #include -#include - -#include "cairo_cairo.hxx" +#include "cairo_xlib_cairo.hxx" -#ifdef CAIRO_HAS_XLIB_SURFACE +#include +#include +#include +#include -#ifdef USE_CAIRO10_APIS -#include "cairo_xlib_helper.hxx" -#endif +namespace cairo +{ #include #include -namespace cairo -{ + // TODO(F3): svp headless case! -bool HasXRender( const void* pSysData ) -{ - Display *pDisplay = (Display*) ((const SystemEnvData*) pSysData)->pDisplay; - int nDummy; - return XQueryExtension( pDisplay, "RENDER", &nDummy, &nDummy, &nDummy ); -} + bool IsCairoWorking( OutputDevice* pOutDev ) + { + if( !pOutDev ) + return false; + + Display* pDisplay = (Display*)pOutDev->GetSystemGfxData().pDisplay; + int nDummy; + return XQueryExtension( pDisplay, "RENDER", &nDummy, &nDummy, &nDummy ); + } + X11SysData::X11SysData() : + pDisplay(NULL), + hDrawable(0), + pVisual(NULL), + nScreen(0), + nDepth(-1), + aColormap(-1), + pRenderFormat(NULL) + {} + + X11SysData::X11SysData( const SystemGraphicsData* pSysDat ) : + pDisplay(pSysDat->pDisplay), + hDrawable(pSysDat->hDrawable), + pVisual(pSysDat->pVisual), + nScreen(pSysDat->nScreen), + nDepth(pSysDat->nDepth), + aColormap(pSysDat->aColormap), + pRenderFormat(pSysDat->pRenderFormat) + {} + + X11SysData::X11SysData( const SystemEnvData* pSysDat ) : + pDisplay(pSysDat->pDisplay), + hDrawable(pSysDat->aWindow), + pVisual(pSysDat->pVisual), + nScreen(pSysDat->nScreen), + nDepth(pSysDat->nDepth), + aColormap(pSysDat->aColormap), + pRenderFormat(NULL) + {} -#ifdef USE_CAIRO10_APIS - Surface::Surface( const void* pSysData, void* pDisplay, long hDrawable, void* pRenderFormat, cairo_surface_t* pSurface ) - : mnRefCount( 1 ), - mpSysData( pSysData ), - mpDisplay( pDisplay ), - mhDrawable( hDrawable ), - mpRenderFormat( pRenderFormat ), - mbFreePixmap( true ), - mpSurface( pSurface ) + X11Pixmap::~X11Pixmap() { + if( mpDisplay && mhDrawable ) + XFreePixmap( (Display*)mpDisplay, mhDrawable ); } -#endif + /** + * Surface::Surface: Create Canvas surface with existing data + * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx) + * @param pSurface Cairo surface + * + * pSysData contains the platform native Drawable reference + * This constructor only stores data, it does no processing. + * It is used by e.g. Surface::getSimilar() + * + * Set the mpSurface as pSurface + **/ + X11Surface::X11Surface( const X11SysData& rSysData, + const X11PixmapSharedPtr& rPixmap, + const CairoSurfaceSharedPtr& pSurface ) : + maSysData(rSysData), + mpPixmap(rPixmap), + mpSurface(pSurface) + {} + + /** + * Surface::Surface: Create generic Canvas surface using given Cairo Surface + * + * @param pSurface Cairo Surface + * + * This constructor only stores data, it does no processing. + * It is used with e.g. cairo_image_surface_create_for_data() + * Unlike other constructors, mpSysData is set to NULL + * + * Set the mpSurface as pSurface + **/ + X11Surface::X11Surface( const CairoSurfaceSharedPtr& pSurface ) : + maSysData(), + mpPixmap(), + mpSurface(pSurface) + {} + + /** + * Surface::Surface: Create Canvas surface from Window reference. + * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx) + * @param x horizontal location of the new surface + * @param y vertical location of the new surface + * @param width width of the new surface + * @param height height of the new surface + * + * pSysData contains the platform native Window reference. + * + * pSysData is used to create a surface on the Window + * + * Set the mpSurface to the new surface or NULL + **/ + X11Surface::X11Surface( const X11SysData& rSysData, int x, int y, int width, int height ) : + maSysData(rSysData), + mpPixmap(), + mpSurface( + cairo_xlib_surface_create( (Display*)rSysData.pDisplay, + rSysData.hDrawable, + (Visual*)rSysData.pVisual, + width + x, height + y ), + &cairo_surface_destroy) + { + cairo_surface_set_device_offset(mpSurface.get(), x, y ); + } + /** + * Surface::Surface: Create platfrom native Canvas surface from BitmapSystemData + * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx) + * @param pBmpData Platform native image data (struct BitmapSystemData in vcl/inc/bitmap.hxx) + * @param width width of the new surface + * @param height height of the new surface + * + * The pBmpData provides the imagedata that the created surface should contain. + * + * Set the mpSurface to the new surface or NULL + **/ + X11Surface::X11Surface( const X11SysData& rSysData, + const BitmapSystemData& rData ) : + maSysData( rSysData ), + mpPixmap(), + mpSurface( + cairo_xlib_surface_create( (Display*)rSysData.pDisplay, + (Drawable)rData.aPixmap, + (Visual*) rSysData.pVisual, + rData.mnWidth, rData.mnHeight ), + &cairo_surface_destroy) + { + } - /** - * Surface::Surface: Create generic Canvas surface using given Cairo Surface - * - * @param pSurface Cairo Surface - * - * This constructor only stores data, it does no processing. - * It is used with e.g. cairo_image_surface_create_for_data() - * and Surface::getSimilar() - * - * Set the mpSurface to the new surface or NULL - **/ - Surface::Surface( cairo_surface_t* pSurface ) - : mnRefCount( 1 ), -#ifdef USE_CAIRO10_APIS - mpSysData( NULL ), - mpDisplay( NULL ), - mhDrawable( 0 ), - mpRenderFormat( NULL ), - mbFreePixmap( false ), -#endif - mpSurface( pSurface ) + /** + * Surface::getCairo: Create Cairo (drawing object) for the Canvas surface + * + * @return new Cairo or NULL + **/ + CairoSharedPtr X11Surface::getCairo() const { + return CairoSharedPtr( cairo_create(mpSurface.get()), + &cairo_destroy ); } + /** + * Surface::getSimilar: Create new similar Canvas surface + * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h) + * @param width width of the new surface + * @param height height of the new surface + * + * Creates a new Canvas surface. This normally creates platform native surface, even though + * generic function is used. + * + * Cairo surface from aContent (cairo_content_t) + * + * @return new surface or NULL + **/ + SurfaceSharedPtr X11Surface::getSimilar( Content aContent, int width, int height ) const + { + Pixmap hPixmap; + if( maSysData.pDisplay && maSysData.hDrawable ) + { + XRenderPictFormat* pFormat; + int nFormat; - /** - * Surface::Surface: Create Canvas surface from Window reference. - * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx) - * @param x horizontal location of the new surface - * @param y vertical location of the new surface - * @param width width of the new surface - * @param height height of the new surface - * - * pSysData contains the platform native Window reference. - * pSysData is used to create a surface on the Window - * - * Set the mpSurface to the new surface or NULL - **/ - Surface::Surface( const SystemEnvData* pSysData, int x, int y, int width, int height ) - : mnRefCount( 1 ), -#ifdef USE_CAIRO10_APIS - mpSysData( pSysData ), - mpDisplay( NULL ), - mhDrawable( 0 ), - mpRenderFormat( NULL ), - mbFreePixmap( false ), -#endif - mpSurface( NULL ) - { -#ifdef USE_CAIRO10_APIS - mpSurface = (cairo_surface_t*) cairoHelperGetSurface( pSysData, x, y, width, height ); - mpDisplay = (Display*) cairoHelperGetDisplay( pSysData ); - mhDrawable = cairoHelperGetWindow( pSysData ); -#else - mpSurface = cairo_xlib_surface_create( (Display*) pSysData->pDisplay, - pSysData->aWindow, - (Visual*) pSysData->pVisual, - width + x, height + y ); - cairo_surface_set_device_offset( mpSurface, x, y ); - // XSynchronize( (Display*) pSysData->pDisplay, TRUE ); -#endif - } + switch (aContent) + { + case CAIRO_CONTENT_ALPHA: + nFormat = PictStandardA8; + break; + case CAIRO_CONTENT_COLOR: + nFormat = PictStandardRGB24; + break; + case CAIRO_CONTENT_COLOR_ALPHA: + default: + nFormat = PictStandardARGB32; + break; + } + pFormat = XRenderFindStandardFormat( (Display*)maSysData.pDisplay, nFormat ); + hPixmap = XCreatePixmap( (Display*)maSysData.pDisplay, maSysData.hDrawable, + width > 0 ? width : 1, height > 0 ? height : 1, + pFormat->depth ); - /** - * Surface::Surface: Create platfrom native Canvas surface from BitmapSystemData - * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx) - * @param pBmpData Platform native image data (struct BitmapSystemData in vcl/inc/bitmap.hxx) - * @param width width of the new surface - * @param height height of the new surface - * - * Create a surface based on image data on pBmpData - * - * Set the mpSurface to the new surface or NULL - **/ - Surface::Surface( const SystemEnvData* pSysData, const BitmapSystemData* pBmpData, int width, int height ) - : mnRefCount( 1 ), -#ifdef USE_CAIRO10_APIS - mpSysData( pSysData ), - mpDisplay( NULL ), - mhDrawable( 0 ), - mpRenderFormat( NULL ), - mbFreePixmap( false ), -#endif - mpSurface( NULL ) - { -#ifdef USE_CAIRO10_APIS - mpSurface = (cairo_surface_t*) cairoHelperGetSurface( pSysData, pBmpData, width, height ); - mpDisplay = (Display*) cairoHelperGetDisplay( pSysData ); - mhDrawable = cairoHelperGetWindow( pSysData ); -#else - OSL_ASSERT (pBmpData->mnWidth == width && pBmpData->mnHeight == height); - - mpSurface = cairo_xlib_surface_create( (Display*) pSysData->pDisplay, - (Drawable) pBmpData->aPixmap, - (Visual*) pSysData->pVisual, - width, height ); -#endif + X11SysData aSysData(maSysData); + aSysData.pRenderFormat = pFormat; + return SurfaceSharedPtr( + new X11Surface( aSysData, + X11PixmapSharedPtr( + new X11Pixmap(hPixmap, maSysData.pDisplay)), + CairoSurfaceSharedPtr( + cairo_xlib_surface_create_with_xrender_format( + (Display*)maSysData.pDisplay, + hPixmap, + ScreenOfDisplay((Display *)maSysData.pDisplay, maSysData.nScreen), + pFormat, width, height ), + &cairo_surface_destroy) )); + } + else + return SurfaceSharedPtr( + new X11Surface( maSysData, + X11PixmapSharedPtr(), + CairoSurfaceSharedPtr( + cairo_surface_create_similar( mpSurface.get(), aContent, width, height ), + &cairo_surface_destroy ))); } -#if defined USE_CAIRO10_APIS - /** - * Surface::~Surface: Destroy the Canvas surface - * - * Also free any image data and other references related to the Canvas. - * - **/ - Surface::~Surface() - { - if( mpSurface ) - { - cairo_surface_destroy( mpSurface ); - mpSurface = NULL; - } - mpSysData = NULL; - -// In cairo API < 1.2, explicit freeing is needed - if( mbFreePixmap && mhDrawable ) - XFreePixmap( (Display*) mpDisplay, mhDrawable ); - } -#endif + boost::shared_ptr X11Surface::createVirtualDevice() const + { + SystemGraphicsData aSystemGraphicsData; + aSystemGraphicsData.nSize = sizeof(SystemGraphicsData); + aSystemGraphicsData.hDrawable = getDrawable(); + aSystemGraphicsData.pRenderFormat = getRenderFormat(); + + return boost::shared_ptr( + new VirtualDevice( &aSystemGraphicsData, getDepth() )); + } - /** - * Surface::Resize: Resizes the Canvas surface. - * @param width new width of the surface - * @param height new height of the surface - * - * Only used on X11. - * - * @return The new surface or NULL - **/ - void - Surface::Resize( int width, int height ) + /** + * Surface::Resize: Resizes the Canvas surface. + * @param width new width of the surface + * @param height new height of the surface + * + * Only used on X11. + * + * @return The new surface or NULL + **/ + void X11Surface::Resize( int width, int height ) { - cairo_xlib_surface_set_size( mpSurface, width, height ); + cairo_xlib_surface_set_size( mpSurface.get(), width, height ); } + void X11Surface::flush() const + { + XSync( (Display*)maSysData.pDisplay, false ); + } - /** - * Surface::getDepth: Get the color depth of the Canvas surface. - * - * @return color depth - **/ - int - Surface::getDepth() + /** + * Surface::getDepth: Get the color depth of the Canvas surface. + * + * @return color depth + **/ + int X11Surface::getDepth() const { -#ifdef USE_CAIRO10_APIS - if( mpRenderFormat ) - return ( ( XRenderPictFormat * ) mpRenderFormat )->depth; -#else - // TODO: verify that this works correctly - return cairo_xlib_surface_get_depth( mpSurface ); -#endif + if( maSysData.pRenderFormat ) + return ((XRenderPictFormat*) maSysData.pRenderFormat)->depth; + return -1; } -#ifdef USE_CAIRO10_APIS -// This function is platform dependent on Cairo < 1.2 API only. - Surface* Surface::getSimilar( Content aContent, int width, int height ) - { - Pixmap hPixmap; - - if( mpSysData && mpDisplay && mhDrawable ) { - XRenderPictFormat *pFormat; + SurfaceSharedPtr createSurface( const CairoSurfaceSharedPtr& rSurface ) + { + return SurfaceSharedPtr(new X11Surface(rSurface)); + } - pFormat = XRenderFindStandardFormat( (Display*) mpDisplay, getXFormat(aContent) ); - hPixmap = XCreatePixmap( (Display*) mpDisplay, cairoHelperGetWindow( mpSysData ), - width > 0 ? width : 1, height > 0 ? height : 1, - pFormat->depth ); + static X11SysData getSysData( const Window& rWindow ) + { + const SystemEnvData* pSysData = GetSysData(&rWindow); - return new Surface( mpSysData, mpDisplay, (long) hPixmap, pFormat, - cairo_xlib_surface_create_with_xrender_format( (Display*) mpDisplay, hPixmap, - DefaultScreenOfDisplay( (Display *) mpDisplay ), - pFormat, width, height ) ); - } else - return new Surface( mpSysData, mpDisplay, 0, NULL, cairo_surface_create_similar( mpSurface, aContent, width, height ) ); - } -#endif // USE_CAIRO10_APIS + if( !pSysData ) + return X11SysData(); + else + return X11SysData(pSysData); + } - /** - * Surface::fillSystemGraphicsData: Fill SystemGraphicsData with native surface data - * @param aSystemGraphicsData Platform native system graphics data (struct SystemGraphicsData in vcl/inc/sysdata.hxx) - * - */ - void Surface::fillSystemGraphicsData( SystemGraphicsData& aSystemGraphicsData) + static X11SysData getSysData( const VirtualDevice& rVirDev ) { - #ifdef USE_CAIRO10_APIS - // Backward compatibility for Cairo 1.0 - aSystemGraphicsData.hDrawable = mhDrawable; - aSystemGraphicsData.pRenderFormat = mpRenderFormat; - #else - aSystemGraphicsData.hDrawable = cairo_xlib_surface_get_drawable( mpSurface ); - aSystemGraphicsData.pRenderFormat = XRenderFindStandardFormat( cairo_xlib_surface_get_display (mpSurface), - getXFormat(cairo_surface_get_content(mpSurface)) ); - #endif //USE_CAIRO10_APIS + return X11SysData( &rVirDev.GetSystemGfxData() ); } + SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice, + int x, int y, int width, int height ) + { + if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) + return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice), + x,y,width,height)); + else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV ) + return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice), + x,y,width,height)); + else + return SurfaceSharedPtr(); + } - int Surface::getXFormat(Content aContent) + SurfaceSharedPtr createBitmapSurface( const OutputDevice& rRefDevice, + const BitmapSystemData& rData, + const Size& rSize ) { - switch(aContent) + OSL_TRACE( "requested size: %d x %d available size: %d x %d", + rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight ); + if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() ) { - case CAIRO_CONTENT_ALPHA: return PictStandardA8; break; - case CAIRO_CONTENT_COLOR: return PictStandardRGB24; break; - case CAIRO_CONTENT_COLOR_ALPHA: - default: return PictStandardARGB32; break; + if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) + return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice), rData )); + else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV ) + return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice), rData )); } - } - - /** Surface::flush Flush the platform native window - * - * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx) - * - **/ - void Surface::flush(const SystemEnvData* pSysData) - { -#ifdef USE_CAIRO10_APIS - cairoHelperFlush( pSysData ); -#else - XSync( (Display*) pSysData->pDisplay, false ); -#endif + return SurfaceSharedPtr(); } - - -} // namespace cairo - -#endif // CAIRO_HAS_XLIB_SURFACE - -#endif // defined (UNX) && !defined (QUARTZ) +} openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch: Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 30 May 2008 09:58:24 -0000 1.20 +++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 2 Jul 2008 14:25:19 -0000 1.21 @@ -842,10 +842,10 @@ diff -u -r1.5 svpgdi.hxx --- openoffice.org.orig/vcl/unx/headless/svpgdi.hxx 11 Apr 2008 09:29:03 -0000 1.5 +++ openoffice.org/vcl/unx/headless/svpgdi.hxx 30 May 2008 09:30:54 -0000 -@@ -164,6 +164,8 @@ - virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - +@@ -169,6 +169,8 @@ virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); + + virtual SystemGraphicsData GetGraphicsData() const; + + virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const; }; @@ -858,7 +858,7 @@ diff -u -r1.5 svppspgraphics.cxx --- openoffice.org.orig/vcl/unx/headless/svppspgraphics.cxx 11 Apr 2008 09:30:23 -0000 1.5 +++ openoffice.org/vcl/unx/headless/svppspgraphics.cxx 30 May 2008 09:30:56 -0000 -@@ -1175,32 +1175,6 @@ +@@ -1194,32 +1194,6 @@ aDFA.mePitch = ToFontPitch (rInfo.m_ePitch); aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL); @@ -888,11 +888,11 @@ - break; - } - - // special case for the ghostscript fonts - if( aDFA.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL ) - aDFA.maName = aDFA.maName.Copy( 4 ); -@@ -1386,3 +1360,7 @@ - return bRet && m_bSwallowFaxNo; + switch( rInfo.m_eType ) + { + case psp::fonttype::Builtin: +@@ -1410,3 +1384,7 @@ + return aRes; } +void PspGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const @@ -906,10 +906,10 @@ diff -u -r1.5 svppspgraphics.hxx --- openoffice.org.orig/vcl/unx/headless/svppspgraphics.hxx 11 Apr 2008 09:30:40 -0000 1.5 +++ openoffice.org/vcl/unx/headless/svppspgraphics.hxx 30 May 2008 09:30:56 -0000 -@@ -193,6 +193,7 @@ - +@@ -197,6 +197,7 @@ virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop ); + virtual SystemGraphicsData GetGraphicsData() const; + virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const; }; @@ -951,7 +951,7 @@ diff -u -r1.29 pspgraphics.cxx --- openoffice.org.orig/vcl/unx/source/gdi/pspgraphics.cxx 11 Apr 2008 09:53:14 -0000 1.29 +++ openoffice.org/vcl/unx/source/gdi/pspgraphics.cxx 30 May 2008 09:31:10 -0000 -@@ -847,6 +847,10 @@ +@@ -866,6 +866,10 @@ } } @@ -962,7 +962,7 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric ) { const psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); -@@ -1259,32 +1263,6 @@ +@@ -1278,32 +1282,6 @@ aDFA.mePitch = ToFontPitch (rInfo.m_ePitch); aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL); @@ -992,9 +992,9 @@ - break; - } - - // special case for the ghostscript fonts - if( aDFA.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL ) - aDFA.maName = aDFA.maName.Copy( 4 ); + switch( rInfo.m_eType ) + { + case psp::fonttype::Builtin: Index: unx/source/gdi/salgdi3.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 3 Jun 2008 09:06:07 -0000 1.47 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 2 Jul 2008 14:25:19 -0000 1.48 @@ -215,15 +215,15 @@ diff -u -r1.24 ppdparser.cxx --- openoffice.org.orig/psprint/source/helper/ppdparser.cxx 25 Jan 2007 11:20:15 -0000 1.24 +++ openoffice.org/psprint/source/helper/ppdparser.cxx 4 Oct 2007 11:25:31 -0000 -@@ -53,6 +53,7 @@ - #include - #include - #include +@@ -49,6 +49,7 @@ + #include "osl/thread.h" + #include "rtl/strbuf.hxx" + #include "rtl/ustrbuf.hxx" +#include - #define PRINTER_PPDDIR "driver" - -@@ -486,6 +487,23 @@ + using namespace psp; + using namespace rtl; +@@ -662,6 +663,23 @@ delete it->second; } @@ -247,7 +247,7 @@ void PPDParser::insertKey( const String& rKey, PPDKey* pKey ) { m_aKeys[ rKey ] = pKey; -@@ -1238,6 +1256,7 @@ +@@ -1414,6 +1432,7 @@ m_pDefaultValue( NULL ), m_bQueryValue( false ), m_bUIOption( false ), openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch: Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 14 Feb 2008 11:05:57 -0000 1.4 +++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 2 Jul 2008 14:25:19 -0000 1.5 @@ -217,7 +217,7 @@ diff -u -r1.6.84.1 unopkg_app.cxx --- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_app.cxx 10 Aug 2007 15:03:53 -0000 1.6.84.1 +++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx 22 Nov 2007 14:46:24 -0000 -@@ -91,6 +91,9 @@ +@@ -86,6 +86,9 @@ " -V, --version version information\n" " -v, --verbose verbose output to stdout\n" " -f, --force force overwriting existing extensions\n" @@ -227,7 +227,7 @@ " --log-file custom log file; default: /log.txt\n" " --shared expert feature: operate on shared installation\n" " deployment context;\n" -@@ -108,6 +111,9 @@ +@@ -103,6 +106,9 @@ { RTL_CONSTASCII_STRINGPARAM("version"), 'V', false }, { RTL_CONSTASCII_STRINGPARAM("verbose"), 'v', false }, { RTL_CONSTASCII_STRINGPARAM("force"), 'f', false }, @@ -237,15 +237,15 @@ { RTL_CONSTASCII_STRINGPARAM("log-file"), '\0', true }, { RTL_CONSTASCII_STRINGPARAM("shared"), '\0', false }, { RTL_CONSTASCII_STRINGPARAM("deployment-context"), '\0', true }, -@@ -212,6 +218,7 @@ +@@ -210,6 +216,7 @@ OUString subCommand; bool option_shared = false; bool option_force = false; + bool option_link = false; bool option_verbose = false; + bool option_bundled = false; bool subcmd_add = false; - bool subcmd_gui = false; -@@ -219,11 +226,13 @@ +@@ -218,11 +225,13 @@ OUString deploymentContext; OUString cmdArg; ::std::vector cmdPackages; @@ -260,23 +260,14 @@ OptionInfo const * info_verbose = getOptionInfo( s_option_infos, OUSTR("verbose") ); OptionInfo const * info_log = getOptionInfo( -@@ -270,6 +279,7 @@ - else if (!readOption( &option_verbose, info_verbose, &nPos ) && +@@ -276,6 +285,7 @@ !readOption( &option_shared, info_shared, &nPos ) && !readOption( &option_force, info_force, &nPos ) && + !readOption( &option_bundled, info_bundled, &nPos ) && + !readOption( &option_link, info_link, &nPos ) && !readArgument( &deploymentContext, info_context, &nPos ) && !isBootstrapVariable(&nPos)) { -@@ -331,7 +341,7 @@ - - Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv( - createCmdEnv( xComponentContext, logFile, -- option_force, option_verbose) ); -+ option_force, option_link, option_verbose) ); - - if (subcmd_add || - subCommand.equalsAsciiL( Index: source/pkgchk/unopkg/unopkg_cmdenv.cxx =================================================================== RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx,v @@ -284,7 +275,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx --- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 26 Jun 2007 11:13:26 -0000 1.8 +++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 22 Nov 2007 14:46:24 -0000 -@@ -49,6 +49,7 @@ +@@ -46,6 +46,7 @@ #include "com/sun/star/task/XInteractionAbort.hpp" #include "com/sun/star/task/XInteractionApprove.hpp" #include "com/sun/star/deployment/InstallException.hpp" @@ -292,43 +283,44 @@ #include "com/sun/star/container/ElementExistException.hpp" #include "com/sun/star/deployment/LicenseException.hpp" #include "com/sun/star/deployment/VersionException.hpp" -@@ -100,6 +101,7 @@ +@@ -98,6 +99,7 @@ { sal_Int32 m_logLevel; bool m_option_force_overwrite; + bool m_option_link; bool m_option_verbose; + bool m_option_bundled; Reference< XComponentContext > m_xComponentContext; - Reference< XProgressHandler > m_xLogFile; -@@ -113,6 +115,7 @@ +@@ -112,6 +114,7 @@ Reference const & xComponentContext, OUString const & log_file, bool option_force_overwrite, + bool option_link, - bool option_verbose); + bool option_verbose, + bool option_bundled); - // XCommandEnvironment -@@ -137,9 +140,11 @@ +@@ -137,10 +140,12 @@ Reference const & xComponentContext, OUString const & log_file, bool option_force_overwrite, + bool option_link, - bool option_verbose) + bool option_verbose, + bool option_bundled) : m_logLevel(0), m_option_force_overwrite( option_force_overwrite ), + m_option_link( option_link ), m_option_verbose( option_verbose ), + m_option_bundled( option_bundled), m_xComponentContext(xComponentContext) - { -@@ -268,6 +273,7 @@ +@@ -270,6 +275,7 @@ lang::WrappedTargetException wtExc; deployment::LicenseException licExc; deployment::InstallException instExc; + deployment::LinkException linkExc; deployment::LicenseIndividualAgreementException licAgreementExc; - - bool bLicenseException = false; -@@ -313,6 +319,10 @@ + deployment::PlatformException platExc; + deployment::VersionException verExc; +@@ -318,6 +324,10 @@ bLicenseException = true; printLicense(licExc.Text, approve, abort); } @@ -339,16 +331,17 @@ else if (request >>= instExc) { //Only if the unopgk was started with gui + extension then we user is asked. -@@ -445,10 +455,11 @@ +@@ -457,11 +467,12 @@ Reference< XComponentContext > const & xContext, OUString const & logFile, bool option_force_overwrite, + bool option_link, - bool option_verbose) + bool option_verbose, + bool option_bundled) { return new CommandEnvironmentImpl( -- xContext, logFile, option_force_overwrite, option_verbose); -+ xContext, logFile, option_force_overwrite, option_link, option_verbose); +- xContext, logFile, option_force_overwrite, option_verbose, option_bundled); ++ xContext, logFile, option_force_overwrite, option_link, option_verbose, option_bundled); } } // unopkg @@ -359,11 +352,11 @@ diff -u -r1.2.130.1 unopkg_shared.h --- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_shared.h 10 Aug 2007 15:04:16 -0000 1.2.130.1 +++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_shared.h 22 Nov 2007 14:46:24 -0000 -@@ -145,6 +145,7 @@ +@@ -131,6 +131,7 @@ css::uno::Reference const & xContext, ::rtl::OUString const & logFile, bool option_force_overwrite, + bool option_link, - bool option_verbose); + bool option_verbose, + bool option_bundled); - //============================================================================== openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch: Index: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 15 Apr 2008 15:58:21 -0000 1.1 +++ openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 2 Jul 2008 14:25:19 -0000 1.2 @@ -15,15 +15,15 @@ diff -ru vcl/inc/vcl/settings.hxx vcl/inc/vcl/settings.hxx --- openoffice.org.orig/vcl/inc/vcl/settings.hxx 2008-04-15 08:44:37.000000000 +0100 +++ openoffice.org/vcl/inc/vcl/settings.hxx 2008-04-15 08:47:15.000000000 +0100 -@@ -449,6 +449,7 @@ - ULONG mnSymbolsStyle; +@@ -432,6 +432,7 @@ ULONG mnPreferredSymbolsStyle; USHORT mnSkipDisabledInMenus; + Wallpaper maWorkspaceGradient; + const void* mpFontOptions; }; - // ----------------- -@@ -746,6 +747,11 @@ + #define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 ) +@@ -734,6 +735,11 @@ BOOL GetSkipDisabledInMenus() const { return (BOOL) mpData->mnSkipDisabledInMenus; } Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1549 retrieving revision 1.1550 diff -u -r1.1549 -r1.1550 --- openoffice.org.spec 26 Jun 2008 08:02:09 -0000 1.1549 +++ openoffice.org.spec 2 Jul 2008 14:25:19 -0000 1.1550 @@ -1,5 +1,5 @@ %define oootag DEV300 -%define ooomilestone 20 +%define ooomilestone 22 %define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build @@ -78,49 +78,48 @@ Patch8: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch Patch9: openoffice.org-2.0.2.rh188467.printingdefaults.patch Patch10: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch -Patch11: pseudoworkspace.valgrind1.patch -Patch12: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch -Patch13: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch -Patch14: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch -Patch15: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize -Patch16: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch -Patch17: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch -Patch18: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch -Patch19: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch -Patch20: openoffice.org-2.2.0.ooo63159.sal.dtype.patch -Patch21: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch -Patch22: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch -Patch23: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch -Patch24: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch -Patch25: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz -Patch26: openoffice.org-2.3.0.ooo76649.httpencoding.patch -Patch27: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch -Patch28: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch -Patch29: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch -Patch30: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch -Patch31: openoffice.org-2.4.0.ooo85448.emptyrpath.patch -Patch32: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch -Patch33: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch -Patch34: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch -Patch35: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch -Patch36: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch -Patch37: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch -Patch38: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch -Patch39: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch -Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch41: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch -Patch42: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch -Patch43: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch -Patch44: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch -Patch45: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch -Patch46: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch -Patch47: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch -Patch48: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch -Patch49: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch -Patch50: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch -Patch51: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch -Patch52: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch -Patch53: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch +Patch11: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch +Patch12: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch +Patch13: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch +Patch14: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize +Patch15: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch +Patch16: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch +Patch17: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch +Patch18: openoffice.org-2.2.0.ooo63159.sal.dtype.patch +Patch19: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch +Patch20: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch +Patch21: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch +Patch22: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch +Patch23: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz +Patch24: openoffice.org-2.3.0.ooo76649.httpencoding.patch +Patch25: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch +Patch26: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch +Patch27: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch +Patch28: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch +Patch29: openoffice.org-2.4.0.ooo85448.emptyrpath.patch +Patch30: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch +Patch31: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +Patch32: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch +Patch33: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch +Patch34: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch +Patch35: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch +Patch36: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch +Patch37: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch +Patch38: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch +Patch39: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch +Patch40: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch +Patch41: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch +Patch42: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch +Patch43: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch +Patch44: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch +Patch45: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch +Patch46: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch +Patch47: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch +Patch48: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch +Patch49: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch +Patch50: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch +Patch51: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch +Patch52: workspace.cairo06.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -523,7 +522,7 @@ Summary: Arabic language pack for %{name} Group: Applications/Productivity Requires: hunspell-ar -Requires: fonts-arabic +Requires: dejavu-fonts Requires: %{name}-core = %{epoch}:%{version}-%{release} Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-ar @@ -547,7 +546,7 @@ Summary: Bengali language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-bengali +Requires: lohit-fonts-bengali Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org-langpack-bn_IN Obsoletes: openoffice.org2-langpack-bn @@ -721,7 +720,7 @@ Summary: Gujarati language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-gujarati +Requires: lohit-fonts-gujarati Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-gu_IN @@ -732,7 +731,7 @@ Summary: Punjabi language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-punjabi, hunspell-pa +Requires: lohit-fonts-punjabi, hunspell-pa Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-pa_IN @@ -744,7 +743,7 @@ Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: hunspell-he -Requires: fonts-hebrew +Requires: dejavu-fonts Obsoletes: openoffice.org-langpack-he Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-he_IL @@ -756,7 +755,7 @@ Summary: Hindi language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-hindi, hunspell-hi +Requires: lohit-fonts-hindi, hunspell-hi Obsoletes: openoffice.org-langpack-hi-IN Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-hi_IN @@ -803,7 +802,7 @@ Summary: Japanese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-japanese +Requires: VLGothic-fonts Obsoletes: openoffice.org-langpack-ja Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-ja_JP @@ -815,7 +814,7 @@ Summary: Korean language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-korean +Requires: baekmuk-ttf-fonts-gulim Obsoletes: openoffice.org-langpack-ko Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-ko_KR @@ -1002,7 +1001,7 @@ Summary: Tamil language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-tamil, hunspell-ta +Requires: lohit-fonts-tamil, hunspell-ta Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-ta_IN @@ -1013,7 +1012,7 @@ Summary: Thai language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-th +Requires: thaifonts-scalable, hunspell-th Obsoletes: openoffice.org-langpack-th Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-th_TH @@ -1081,7 +1080,7 @@ Summary: Simplified Chinese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-chinese +Requires: cjkunifonts-uming Obsoletes: openoffice.org-langpack-zh-CN Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-zh_CN @@ -1093,7 +1092,7 @@ Summary: Traditional Chinese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-chinese +Requires: cjkunifonts-uming Obsoletes: openoffice.org-langpack-zh-TW Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-zh_TW @@ -1117,7 +1116,7 @@ Summary: Assamese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-bengali +Requires: lohit-fonts-bengali Obsoletes: openoffice.org2-langpack-as_IN %description langpack-as_IN @@ -1127,7 +1126,7 @@ Summary: Marathi language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-hindi, hunspell-mr +Requires: lohit-fonts-hindi, hunspell-mr Obsoletes: openoffice.org2-langpack-mr_IN %description langpack-mr_IN @@ -1137,7 +1136,7 @@ Summary: Malayalam language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-malayalam +Requires: lohit-fonts-malayalam Requires: hunspell-ml Obsoletes: openoffice.org2-langpack-ml_IN @@ -1148,7 +1147,7 @@ Summary: Oriya language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-oriya, hunspell-or +Requires: lohit-fonts-oriya, hunspell-or Obsoletes: openoffice.org2-langpack-or_IN %description langpack-or_IN @@ -1158,7 +1157,7 @@ Summary: Telugu language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-telugu +Requires: lohit-fonts-telugu Obsoletes: openoffice.org2-langpack-te_IN %description langpack-te_IN @@ -1168,7 +1167,7 @@ Summary: Urdu language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-arabic +Requires: paktype-fonts Obsoletes: openoffice.org2-langpack-ur %description langpack-ur @@ -1178,7 +1177,7 @@ Summary: Kannada language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-kannada +Requires: lohit-fonts-kannada Obsoletes: openoffice.org2-langpack-kn_IN %description langpack-kn_IN @@ -1224,49 +1223,48 @@ %patch8 -p1 -b .ooo58606.sw.pre-edit.patch %patch9 -p1 %patch10 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch -%patch11 -p1 -b .pseudoworkspace.valgrind1.patch -%patch12 -p1 -b .rhXXXXXX.padmin.nospadmin.patch -%patch13 -p1 -b .ooo80412.i18npool.extendgrapheme.patch -%patch14 -p1 -b .ooo65491.psprint.enablenups.patch -cat %{PATCH15} >> svtools/source/dialogs/localize.sdf -%patch16 -p1 -b .ooo73201.sw.a11yloadcrash.patch -%patch17 -p1 -b .ooo73863.vcl.imcommit.patch -%patch18 -p1 -b .ooo74188.sw.cursorinsideglyph.patch -%patch19 -p0 -b .ooo68717.gstreamer.video.patch -%patch20 -p1 -b .ooo63159.sal.dtype.patch -%patch21 -p1 -b .ooo76393.sal.dynamicsection.patch -%patch22 -p1 -b .ooo80816.selinux.bridges.patch -%patch23 -p1 -b .ooo7065.sw.titlepagedialog.patch -%patch24 -p1 -b .ooo80257.sd.textonlystyle.patch -tar xzf %{PATCH25} -%patch26 -p1 -b .ooo76649.httpencoding.patch -%patch27 -p1 -b .ooo83878.unopkg.enablelinking.patch -%patch28 -p1 -%patch29 -p1 -b .rh133741.alwaysgtk.vcl.patch -%patch30 -p1 -b .ooo85429.sw.a11ycrash.patch -%patch31 -p1 -b .ooo85448.emptyrpath.patch -%patch32 -p1 -b .ooo85921.sd.editmasterundermouse.patch -%patch33 -p1 -b .ooo86080.unopkg.bodge.patch -%patch34 -p1 -b .oooXXXXX.psprint.debugcups.patch -%patch35 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch -%patch36 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch -%patch37 -p1 -b .ooo88341.sc.verticalboxes.patch -%patch38 -p1 -b .ooo6087.sc.sheetnames.patch -%patch39 -p1 -b .ooo89002.vcl.symbolfonts.patch -%patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch41 -p1 -b .ooo87970.vcl.samenamesubs.patch -%patch42 -p1 -b .ooo90055.swext.allowadmin.patch -%patch43 -p1 -b .oooXXXXX.odk.3layer.patch -%patch44 -p1 -b .ooo90037.vcl.cairotransforms.patch -%patch45 -p1 -b .ooo90178.tools.fixmacro.patch -%patch46 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch -%patch47 -p1 -b .ooo82545.np_sdk.x86_64.patch -%patch48 -p1 -b .ooo90612.sd.insertpasswordedfile.patch -%patch49 -p1 -b .ooo90306.sw.wrongprotection.patch -%patch50 -p1 -b .ooo48400.svx.fixspelling.patch -%patch51 -p1 -b .ooo90697.sd.a11ycrash.patch -%patch52 -p1 -b .ooo90876.connectivity.evoab2.patch -%patch53 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch +%patch11 -p1 -b .rhXXXXXX.padmin.nospadmin.patch +%patch12 -p1 -b .ooo80412.i18npool.extendgrapheme.patch +%patch13 -p1 -b .ooo65491.psprint.enablenups.patch +cat %{PATCH14} >> svtools/source/dialogs/localize.sdf +%patch15 -p1 -b .ooo73201.sw.a11yloadcrash.patch +%patch16 -p1 -b .ooo74188.sw.cursorinsideglyph.patch +%patch17 -p0 -b .ooo68717.gstreamer.video.patch +%patch18 -p1 -b .ooo63159.sal.dtype.patch +%patch19 -p1 -b .ooo76393.sal.dynamicsection.patch +%patch20 -p1 -b .ooo80816.selinux.bridges.patch +%patch21 -p1 -b .ooo7065.sw.titlepagedialog.patch +%patch22 -p1 -b .ooo80257.sd.textonlystyle.patch +tar xzf %{PATCH23} +%patch24 -p1 -b .ooo76649.httpencoding.patch +%patch25 -p1 -b .ooo83878.unopkg.enablelinking.patch +%patch26 -p1 +%patch27 -p1 -b .rh133741.alwaysgtk.vcl.patch +%patch28 -p1 -b .ooo85429.sw.a11ycrash.patch +%patch29 -p1 -b .ooo85448.emptyrpath.patch +%patch30 -p1 -b .ooo85921.sd.editmasterundermouse.patch +%patch31 -p1 -b .ooo86080.unopkg.bodge.patch +%patch32 -p1 -b .oooXXXXX.psprint.debugcups.patch +%patch33 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch +%patch34 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch +%patch35 -p1 -b .ooo88341.sc.verticalboxes.patch +%patch36 -p1 -b .ooo6087.sc.sheetnames.patch +%patch37 -p1 -b .ooo89002.vcl.symbolfonts.patch +%patch38 -p1 -b .gccXXXXX.solenv.javaregistration.patch +%patch39 -p1 -b .ooo87970.vcl.samenamesubs.patch +%patch40 -p1 -b .ooo90055.swext.allowadmin.patch +%patch41 -p1 -b .oooXXXXX.odk.3layer.patch +%patch42 -p1 -b .ooo90037.vcl.cairotransforms.patch +%patch43 -p1 -b .ooo90178.tools.fixmacro.patch +%patch44 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch +%patch45 -p1 -b .ooo82545.np_sdk.x86_64.patch +%patch46 -p1 -b .ooo90612.sd.insertpasswordedfile.patch +%patch47 -p1 -b .ooo90306.sw.wrongprotection.patch +%patch48 -p1 -b .ooo48400.svx.fixspelling.patch +%patch49 -p1 -b .ooo90697.sd.a11ycrash.patch +%patch50 -p1 -b .ooo90876.connectivity.evoab2.patch +%patch51 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch +%patch52 -p1 -b .workspace.cairo06.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -3480,6 +3478,13 @@ %{python_py_sitearch}/unohelper.py* %changelog +* Tue Jul 01 2008 Caolan McNamara - 1:3.0.0-0.22-1 +- next version +- drop integrated pseudoworkspace.valgrind1.patch +- drop integrated openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch +- add workspace.cairo06.patch +- Resolves: rhbz#453487 some font packages now gone + * Thu Jun 26 2008 Caolan McNamara - 1:3.0.0-0.20-1 - next version - Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch --- openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch DELETED --- --- pseudoworkspace.valgrind1.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 14:28:01 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 2 Jul 2008 14:28:01 GMT Subject: rpms/mod_nss/F-9 mod_nss-fips.patch,1.1,1.2 mod_nss.spec,1.11,1.12 Message-ID: <200807021428.m62ES1hn018545@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18502 Modified Files: mod_nss-fips.patch mod_nss.spec Log Message: Update the patch for FIPS to include fixes for nss_pcache, enforce the security policy and properly initialize the FIPS token. mod_nss-fips.patch: Index: mod_nss-fips.patch =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-9/mod_nss-fips.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_nss-fips.patch 30 Jun 2008 19:46:45 -0000 1.1 +++ mod_nss-fips.patch 2 Jul 2008 14:27:28 -0000 1.2 @@ -1,5 +1,5 @@ ---- mod_nss-1.0-orig/nss_engine_pphrase.c 22 Feb 2007 16:50:14 -0000 1.10 -+++ mod_nss-1.0/nss_engine_pphrase.c 16 May 2008 15:16:02 -0000 1.11 +--- mod_nss-1.0-orig/nss_engine_pphrase.c 7 Apr 2006 20:17:12 -0000 1.5 ++++ mod_nss-1.0/nss_engine_pphrase.c 2 Jul 2008 03:41:05 -0000 @@ -62,6 +62,13 @@ { PK11SlotInfo *slot = listEntry->slot; @@ -14,4 +14,62 @@ if (PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) { if (slot == PK11_GetInternalKeySlot()) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, +@@ -298,7 +305,12 @@ + fprintf(output, "non-alphabetic characters\n"); + continue; + } +- return (char*) PORT_Strdup((char*)phrase); ++ if (PK11_IsFIPS() && strlen(phrase) == 0) { ++ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, ++ "The FIPS security policy requires that a password be set."); ++ nss_die(); ++ } else ++ return (char*) PORT_Strdup((char*)phrase); + } + } + +--- mod_nss-1.0-orig/nss_pcache.c 18 Nov 2005 16:10:23 -0000 1.8 ++++ mod_nss-1.0/nss_pcache.c 2 Jul 2008 03:41:05 -0000 +@@ -378,7 +378,6 @@ + if (tokenName && tokenpw) { + node = (Node*)malloc(sizeof (Node)); + if (!node) { err = PIN_NOMEMORY; } +- + node->tokenName = strdup(tokenName); + node->store = 0; + node->next = 0; +@@ -410,7 +409,10 @@ + for (node = pinList; node != NULL; node = node->next) { + if (!strcmp(node->tokenName, tokenName)) { + if (Pk11StoreGetPin(&pin, node->store) == SECSuccess) { +- PR_Write(out, pin, strlen(pin)); ++ if (strlen(pin) == 0) ++ PR_Write(out, "", 1); ++ else ++ PR_Write(out, pin, strlen(pin)); + memset(pin, 0, strlen(pin)); + free(pin); + found = PR_TRUE; +@@ -452,7 +454,7 @@ + while (*s) { + if (*s == '\t' || *peek == '\0') { + if (i == el) { +- if (*peek != '\0') ++ if (*peek != '\0' || *s == '\t') + *s = '\0'; + r = strdup(t); + free(work); +--- mod_nss-1.0.7-orig/nss_engine_init.c 2008-07-02 19:22:11.000000000 -0400 ++++ mod_nss-1.0.7/nss_engine_init.c 2008-07-02 19:12:01.000000000 -0400 +@@ -148,9 +148,8 @@ + const char * ocspurl = NULL; + const char * ocspname = NULL; + +- sc = mySrvConfig(base_server); +- + for (s = base_server; s; s = s->next) { ++ sc = mySrvConfig(s); + if (sc->fips == TRUE) { + fipsenabled = TRUE; + } Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-9/mod_nss.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_nss.spec 30 Jun 2008 19:46:45 -0000 1.11 +++ mod_nss.spec 2 Jul 2008 14:27:28 -0000 1.12 @@ -1,6 +1,6 @@ Name: mod_nss Version: 1.0.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -114,6 +114,10 @@ %{_sbindir}/gencert %changelog +* Wed Jul 2 2008 Rob Crittenden - 1.0.7-7 +- Update the patch for FIPS to include fixes for nss_pcache, enforce + the security policy and properly initialize the FIPS token. + * Mon Jun 30 2008 Rob Crittenden - 1.0.7-6 - Include patch to fix NSSFIPS (446851) From fedora-extras-commits at redhat.com Wed Jul 2 14:36:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 2 Jul 2008 14:36:22 GMT Subject: rpms/glib2/F-8 cve-2008-2371.patch,NONE,1.1 glib2.spec,1.145,1.146 Message-ID: <200807021436.m62EaMqd018794@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18761 Modified Files: glib2.spec Added Files: cve-2008-2371.patch Log Message: Fix cve-2008-2371 cve-2008-2371.patch: --- NEW FILE cve-2008-2371.patch --- diff -up glib-2.14.6/glib/pcre/pcre_compile.c.cve-2008-2371 glib-2.14.6/glib/pcre/pcre_compile.c --- glib-2.14.6/glib/pcre/pcre_compile.c.cve-2008-2371 2008-07-02 10:30:50.000000000 -0400 +++ glib-2.14.6/glib/pcre/pcre_compile.c 2008-07-02 10:32:19.000000000 -0400 @@ -4701,7 +4701,7 @@ we set the flag only if there is a liter (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) { cd->external_options = newoptions; - options = newoptions; + options = *optionsptr = newoptions; } else { Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/F-8/glib2.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- glib2.spec 7 Feb 2008 07:01:53 -0000 1.145 +++ glib2.spec 2 Jul 2008 14:35:45 -0000 1.146 @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.14.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -14,6 +14,8 @@ BuildRequires: pkgconfig >= 1:0.14 BuildRequires: gettext +Patch0: cve-2008-2371.patch + %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure @@ -45,6 +47,7 @@ %prep %setup -q -n glib-%{version} +%patch0 -p1 -b .cve-2008-2371 %build for i in config.guess config.sub ; do @@ -117,6 +120,9 @@ %{_libdir}/lib*.a %changelog +* Wed Jul 2 2008 Matthias Clasen - 2.14.6-2 +- Fix a heap-based buffer overflow in PCRE (CVE-2008-2371) + * Thu Feb 7 2008 Matthias Clasen - 2.14.6-1 - Update to 2.14.6 (fixes a buffer overflow in PCRE) From fedora-extras-commits at redhat.com Wed Jul 2 14:45:43 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 2 Jul 2008 14:45:43 GMT Subject: rpms/mod_nss/F-8 mod_nss-fips.patch,1.1,1.2 mod_nss.spec,1.10,1.11 Message-ID: <200807021445.m62EjhRt019120@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19069 Modified Files: mod_nss-fips.patch mod_nss.spec Log Message: Update the patch for FIPS to include fixes for nss_pcache, enforce the security policy and properly initialize the FIPS token. mod_nss-fips.patch: Index: mod_nss-fips.patch =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-8/mod_nss-fips.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_nss-fips.patch 30 Jun 2008 19:59:09 -0000 1.1 +++ mod_nss-fips.patch 2 Jul 2008 14:44:53 -0000 1.2 @@ -1,5 +1,5 @@ ---- mod_nss-1.0-orig/nss_engine_pphrase.c 22 Feb 2007 16:50:14 -0000 1.10 -+++ mod_nss-1.0/nss_engine_pphrase.c 16 May 2008 15:16:02 -0000 1.11 +--- mod_nss-1.0-orig/nss_engine_pphrase.c 7 Apr 2006 20:17:12 -0000 1.5 ++++ mod_nss-1.0/nss_engine_pphrase.c 2 Jul 2008 03:41:05 -0000 @@ -62,6 +62,13 @@ { PK11SlotInfo *slot = listEntry->slot; @@ -14,4 +14,62 @@ if (PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) { if (slot == PK11_GetInternalKeySlot()) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, +@@ -298,7 +305,12 @@ + fprintf(output, "non-alphabetic characters\n"); + continue; + } +- return (char*) PORT_Strdup((char*)phrase); ++ if (PK11_IsFIPS() && strlen(phrase) == 0) { ++ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, ++ "The FIPS security policy requires that a password be set."); ++ nss_die(); ++ } else ++ return (char*) PORT_Strdup((char*)phrase); + } + } + +--- mod_nss-1.0-orig/nss_pcache.c 18 Nov 2005 16:10:23 -0000 1.8 ++++ mod_nss-1.0/nss_pcache.c 2 Jul 2008 03:41:05 -0000 +@@ -378,7 +378,6 @@ + if (tokenName && tokenpw) { + node = (Node*)malloc(sizeof (Node)); + if (!node) { err = PIN_NOMEMORY; } +- + node->tokenName = strdup(tokenName); + node->store = 0; + node->next = 0; +@@ -410,7 +409,10 @@ + for (node = pinList; node != NULL; node = node->next) { + if (!strcmp(node->tokenName, tokenName)) { + if (Pk11StoreGetPin(&pin, node->store) == SECSuccess) { +- PR_Write(out, pin, strlen(pin)); ++ if (strlen(pin) == 0) ++ PR_Write(out, "", 1); ++ else ++ PR_Write(out, pin, strlen(pin)); + memset(pin, 0, strlen(pin)); + free(pin); + found = PR_TRUE; +@@ -452,7 +454,7 @@ + while (*s) { + if (*s == '\t' || *peek == '\0') { + if (i == el) { +- if (*peek != '\0') ++ if (*peek != '\0' || *s == '\t') + *s = '\0'; + r = strdup(t); + free(work); +--- mod_nss-1.0.7-orig/nss_engine_init.c 2008-07-02 19:22:11.000000000 -0400 ++++ mod_nss-1.0.7/nss_engine_init.c 2008-07-02 19:12:01.000000000 -0400 +@@ -148,9 +148,8 @@ + const char * ocspurl = NULL; + const char * ocspname = NULL; + +- sc = mySrvConfig(base_server); +- + for (s = base_server; s; s = s->next) { ++ sc = mySrvConfig(s); + if (sc->fips == TRUE) { + fipsenabled = TRUE; + } Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-8/mod_nss.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mod_nss.spec 30 Jun 2008 19:59:09 -0000 1.10 +++ mod_nss.spec 2 Jul 2008 14:44:53 -0000 1.11 @@ -1,6 +1,6 @@ Name: mod_nss Version: 1.0.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -114,6 +114,10 @@ %{_sbindir}/gencert %changelog +* Wed Jul 2 2008 Rob Crittenden - 1.0.7-6 +- Update the patch for FIPS to include fixes for nss_pcache, enforce + the security policy and properly initialize the FIPS token. + * Mon Jun 30 2008 Rob Crittenden - 1.0.7-5 - Include patch to fix NSSFIPS (446851) From fedora-extras-commits at redhat.com Wed Jul 2 14:47:38 2008 From: fedora-extras-commits at redhat.com (Lukas Tinkl (ltinkl)) Date: Wed, 2 Jul 2008 14:47:38 GMT Subject: rpms/kdebase/F-9 kdebase-4.0.5-kdepasswd-ldap.patch, NONE, 1.1 kdebase.spec, 1.327, 1.328 Message-ID: <200807021447.m62Elcw3019249@cvs-int.fedora.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161 Modified Files: kdebase.spec Added Files: kdebase-4.0.5-kdepasswd-ldap.patch Log Message: Avoid lockup after a failed login on LDAP systems (kdebug:161377) kdebase-4.0.5-kdepasswd-ldap.patch: --- NEW FILE kdebase-4.0.5-kdepasswd-ldap.patch --- --- kdebase/apps/kdepasswd/passwd.cpp 2008/06/20 12:49:41 822500 +++ kdebase/apps/kdepasswd/passwd.cpp 2008/06/20 12:52:28 822501 @@ -156,6 +156,13 @@ case 2: m_Error = ""; + if( line.contains("again")) + { + m_Error = line; + kill(m_Pid, SIGKILL); + waitForChild(); + return PasswordIncorrect; + } // Wait for second prompt. errline = line; // use first line for error message while (!isPrompt(line, "new")) Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.327 retrieving revision 1.328 diff -u -r1.327 -r1.328 --- kdebase.spec 24 Jun 2008 15:43:23 -0000 1.327 +++ kdebase.spec 2 Jul 2008 14:46:53 -0000 1.328 @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.0.5 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -38,6 +38,8 @@ # backporte from 4.1 Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch Patch104: kdebase-4.0.5-konq-memleak.patch +#??Avoid lockup after a failed login on LDAP systems (kdebug:161377) +Patch105: kdebase-4.0.5-kdepasswd-ldap.patch BuildRequires: kde-filesystem >= 4 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } @@ -134,6 +136,7 @@ %patch102 -p1 -b .kwrite-dt_categories %patch103 -p1 -b .konqueror-updatehistoryentry %patch104 -p1 -b .konq-memleak +%patch105 -p1 -b .kdepasswd-ldap %build @@ -312,6 +315,9 @@ %changelog +* Wed Jul 2 2008 Luk???? Tinkl - 4.0.5-5 +- Avoid lockup after a failed login on LDAP systems (kdebug:161377) + * Tue Jun 24 2008 Luk???? Tinkl - 4.0.5-4 - #426108: Add more directories to konqueror's default plugin search path list From fedora-extras-commits at redhat.com Wed Jul 2 14:48:43 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Wed, 2 Jul 2008 14:48:43 GMT Subject: common Makefile.common,1.103,1.104 Message-ID: <200807021448.m62EmhlQ019397@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19265 Modified Files: Makefile.common Log Message: Protect bodhi target's xargs from single quotes in clog (ticket 645, ) Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- Makefile.common 10 Jun 2008 21:05:17 -0000 1.103 +++ Makefile.common 2 Jul 2008 14:48:12 -0000 1.104 @@ -454,7 +454,7 @@ # bug=123,456\n\ # all other text will be considered to be part of the update notes\n\ type=" > bodhi.template - @grep '#' clog | xargs -n1 | sed -n -e 's,^#\([0-9]*\)$$,\1,p' | xargs | tr ' ' ',' > $(NAME).bugs + @grep -Z '#' clog | xargs -0n1 | sed -n -e 's,^#\([0-9]*\)$$,\1,p' | xargs | tr ' ' ',' > $(NAME).bugs @if [ `cat $(NAME).bugs` ]; then echo "bug=`cat $(NAME).bugs`" >> bodhi.template; fi @sed -e '/^#/d' < bodhi.template > bodhi.template.orig @if [ -z "$$EDITOR" ]; then vi bodhi.template; else $$EDITOR bodhi.template; fi From fedora-extras-commits at redhat.com Wed Jul 2 14:49:09 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 2 Jul 2008 14:49:09 GMT Subject: rpms/hunspell-fr/devel .cvsignore, 1.6, 1.7 hunspell-fr.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200807021449.m62En9d5019459@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-fr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19335 Modified Files: .cvsignore hunspell-fr.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Apr 2008 15:48:37 -0000 1.6 +++ .cvsignore 2 Jul 2008 14:48:25 -0000 1.7 @@ -1 +1 @@ -fr_FR_2-3-1.zip +fr_FR_2-3-2.zip Index: hunspell-fr.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/hunspell-fr.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hunspell-fr.spec 22 Apr 2008 15:48:37 -0000 1.6 +++ hunspell-fr.spec 2 Jul 2008 14:48:25 -0000 1.7 @@ -1,6 +1,6 @@ Name: hunspell-fr Summary: French hunspell dictionaries -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} Source: http://dico.savant.free.fr/_download/fr_FR_2-3-1.zip Group: Applications/Text @@ -43,6 +43,9 @@ %{_datadir}/myspell/* %changelog +* Wed Jul 02 2008 Caolan McNamara - 2.3.2-1 +- latest version + * Tue Apr 22 2008 Caolan McNamara - 2.3.1-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Apr 2008 15:48:37 -0000 1.6 +++ sources 2 Jul 2008 14:48:25 -0000 1.7 @@ -1 +1 @@ -0c2905ccf6b58c65c9c0deae356d9fcf fr_FR_2-3-1.zip +d290768a954d59c9fa0f2bb96ba31aac fr_FR_2-3-2.zip From fedora-extras-commits at redhat.com Wed Jul 2 14:56:11 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Wed, 2 Jul 2008 14:56:11 GMT Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.330,1.331 Message-ID: <200807021456.m62EuBoP019796@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19742 Modified Files: xorg-x11-server.spec Log Message: - build with -rdynamic to make dri_swrast happy Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- xorg-x11-server.spec 2 Jul 2008 12:36:39 -0000 1.330 +++ xorg-x11-server.spec 2 Jul 2008 14:55:16 -0000 1.331 @@ -20,7 +20,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.905 -Release: 1.%{gitdate}%{?dist} +Release: 2.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -303,7 +303,7 @@ # --with-rgb-path should be superfluous now ? # --with-pie ? autoreconf -v --install || exit 1 -export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow $CFLAGS" +export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS" %configure --enable-maintainer-mode %{xservers} \ --disable-static \ --with-pic \ @@ -515,6 +515,9 @@ %changelog +* Wed Jul 02 2008 Adam Tkac 1.4.99.905-2.20080701 +- build with -rdynamic to make dri_swrast happy + * Mon Jun 30 2008 Adam Jackson 1.4.99.905-1.20080701 - 1.5RC5. From fedora-extras-commits at redhat.com Wed Jul 2 15:03:45 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 2 Jul 2008 15:03:45 GMT Subject: rpms/hunspell-fr/devel hunspell-fr.spec,1.7,1.8 Message-ID: <200807021503.m62F3jnB026594@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-fr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26549 Modified Files: hunspell-fr.spec Log Message: next version Index: hunspell-fr.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/hunspell-fr.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hunspell-fr.spec 2 Jul 2008 14:48:25 -0000 1.7 +++ hunspell-fr.spec 2 Jul 2008 15:02:55 -0000 1.8 @@ -2,7 +2,7 @@ Summary: French hunspell dictionaries Version: 2.3.2 Release: 1%{?dist} -Source: http://dico.savant.free.fr/_download/fr_FR_2-3-1.zip +Source: http://dico.savant.free.fr/_download/fr_FR_2-3-2.zip Group: Applications/Text URL: http://dico.savant.free.fr/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Wed Jul 2 15:10:39 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 2 Jul 2008 15:10:39 GMT Subject: rpms/xorg-x11-drv-i810/F-9 xorg-x11-drv-i810.spec,1.100,1.101 Message-ID: <200807021510.m62FAdGO026875@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26830 Modified Files: xorg-x11-drv-i810.spec Log Message: * Wed Jul 02 2008 Adam Jackson 2.3.2-2 - Drop the %pre hack for the moment. Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/xorg-x11-drv-i810.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- xorg-x11-drv-i810.spec 1 Jul 2008 21:17:29 -0000 1.100 +++ xorg-x11-drv-i810.spec 2 Jul 2008 15:09:49 -0000 1.101 @@ -6,7 +6,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -120,10 +120,10 @@ %clean rm -rf $RPM_BUILD_ROOT -%pre -if [ -e /etc/X11/xorg.conf ]; then - sed -i 's/^\s*Driver(.*)"i810"/Driver\1"intel"/gi' /etc/X11/xorg.conf -fi +#pre +#if [ -e /etc/X11/xorg.conf ]; then +# sed -i 's/^\s*Driver(.*)"i810"/Driver\1"intel"/gi' /etc/X11/xorg.conf +#fi %files %defattr(-,root,root,-) @@ -149,6 +149,9 @@ %{_libdir}/libIntelXvMC.so %changelog +* Wed Jul 02 2008 Adam Jackson 2.3.2-2 +- Drop the %%pre hack for the moment. + * Tue Jul 01 2008 Adam Jackson 2.3.2-1 - intel 2.3.2 From fedora-extras-commits at redhat.com Wed Jul 2 15:18:53 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 2 Jul 2008 15:18:53 GMT Subject: rpms/dotconf/devel dotconf.spec,1.1,1.2 Message-ID: <200807021518.m62FIrra027194@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/dotconf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27149 Modified Files: dotconf.spec Log Message: * Thu Jul 03 2008 Mamoru Tasaka - 1.0.13-7 - Override config.{sub,guess} explicitly due to redhat-rpm-build-config behavior change on F-10+, otherwise build fails on ppc64 Index: dotconf.spec =================================================================== RCS file: /cvs/extras/rpms/dotconf/devel/dotconf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dotconf.spec 4 Apr 2008 17:33:37 -0000 1.1 +++ dotconf.spec 2 Jul 2008 15:18:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: dotconf Version: 1.0.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Libraries to parse configuration files Group: System Environment/Libraries @@ -36,6 +36,8 @@ %patch1 -p1 %patch2 -p1 +# Override config.{guess,sub} +cp -p /usr/lib/rpm/config.{guess,sub} . %build %configure --disable-static @@ -79,6 +81,10 @@ %{_libdir}/pkgconfig/dotconf.pc %changelog +* Thu Jul 03 2008 Mamoru Tasaka - 1.0.13-7 +- Override config.{sub,guess} explicitly due to redhat-rpm-build-config + behavior change on F-10+, otherwise build fails on ppc64 + * Sun Mar 09 2008 Assim Deodia 1.0.13-6 - fixed m4-underquote error From fedora-extras-commits at redhat.com Wed Jul 2 15:26:13 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 2 Jul 2008 15:26:13 GMT Subject: rpms/mod_nss/devel mod_nss-fips.patch, 1.1, 1.2 mod_nss.spec, 1.10, 1.11 Message-ID: <200807021526.m62FQDlD027520@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27454 Modified Files: mod_nss-fips.patch mod_nss.spec Log Message: Update the patch for FIPS to include fixes for nss_pcache, enforce the security policy and properly initialize the FIPS token. mod_nss-fips.patch: Index: mod_nss-fips.patch =================================================================== RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss-fips.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_nss-fips.patch 30 Jun 2008 20:16:15 -0000 1.1 +++ mod_nss-fips.patch 2 Jul 2008 15:25:41 -0000 1.2 @@ -1,5 +1,5 @@ ---- mod_nss-1.0-orig/nss_engine_pphrase.c 22 Feb 2007 16:50:14 -0000 1.10 -+++ mod_nss-1.0/nss_engine_pphrase.c 16 May 2008 15:16:02 -0000 1.11 +--- mod_nss-1.0-orig/nss_engine_pphrase.c 7 Apr 2006 20:17:12 -0000 1.5 ++++ mod_nss-1.0/nss_engine_pphrase.c 2 Jul 2008 03:41:05 -0000 @@ -62,6 +62,13 @@ { PK11SlotInfo *slot = listEntry->slot; @@ -14,4 +14,62 @@ if (PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) { if (slot == PK11_GetInternalKeySlot()) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, +@@ -298,7 +305,12 @@ + fprintf(output, "non-alphabetic characters\n"); + continue; + } +- return (char*) PORT_Strdup((char*)phrase); ++ if (PK11_IsFIPS() && strlen(phrase) == 0) { ++ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, ++ "The FIPS security policy requires that a password be set."); ++ nss_die(); ++ } else ++ return (char*) PORT_Strdup((char*)phrase); + } + } + +--- mod_nss-1.0-orig/nss_pcache.c 18 Nov 2005 16:10:23 -0000 1.8 ++++ mod_nss-1.0/nss_pcache.c 2 Jul 2008 03:41:05 -0000 +@@ -378,7 +378,6 @@ + if (tokenName && tokenpw) { + node = (Node*)malloc(sizeof (Node)); + if (!node) { err = PIN_NOMEMORY; } +- + node->tokenName = strdup(tokenName); + node->store = 0; + node->next = 0; +@@ -410,7 +409,10 @@ + for (node = pinList; node != NULL; node = node->next) { + if (!strcmp(node->tokenName, tokenName)) { + if (Pk11StoreGetPin(&pin, node->store) == SECSuccess) { +- PR_Write(out, pin, strlen(pin)); ++ if (strlen(pin) == 0) ++ PR_Write(out, "", 1); ++ else ++ PR_Write(out, pin, strlen(pin)); + memset(pin, 0, strlen(pin)); + free(pin); + found = PR_TRUE; +@@ -452,7 +454,7 @@ + while (*s) { + if (*s == '\t' || *peek == '\0') { + if (i == el) { +- if (*peek != '\0') ++ if (*peek != '\0' || *s == '\t') + *s = '\0'; + r = strdup(t); + free(work); +--- mod_nss-1.0.7-orig/nss_engine_init.c 2008-07-02 19:22:11.000000000 -0400 ++++ mod_nss-1.0.7/nss_engine_init.c 2008-07-02 19:12:01.000000000 -0400 +@@ -148,9 +148,8 @@ + const char * ocspurl = NULL; + const char * ocspname = NULL; + +- sc = mySrvConfig(base_server); +- + for (s = base_server; s; s = s->next) { ++ sc = mySrvConfig(s); + if (sc->fips == TRUE) { + fipsenabled = TRUE; + } Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mod_nss.spec 30 Jun 2008 20:16:15 -0000 1.10 +++ mod_nss.spec 2 Jul 2008 15:25:41 -0000 1.11 @@ -1,6 +1,6 @@ Name: mod_nss Version: 1.0.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -114,6 +114,10 @@ %{_sbindir}/gencert %changelog +* Wed Jul 2 2008 Rob Crittenden - 1.0.7-6 +- Update the patch for FIPS to include fixes for nss_pcache, enforce + the security policy and properly initialize the FIPS token. + * Mon Jun 30 2008 Rob Crittenden - 1.0.7-5 - Include patch to fix NSSFIPS (446851) From fedora-extras-commits at redhat.com Wed Jul 2 15:32:39 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 2 Jul 2008 15:32:39 GMT Subject: rpms/jd/F-8 .cvsignore, 1.250, 1.251 jd.spec, 1.283, 1.284 sources, 1.251, 1.252 Message-ID: <200807021532.m62FWdDe027894@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27806/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- .cvsignore 1 Jul 2008 17:06:26 -0000 1.250 +++ .cvsignore 2 Jul 2008 15:32:07 -0000 1.251 @@ -1 +1 @@ -jd-2.0.0-svn2161_trunk.tgz +jd-2.0.0-beta080702.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- jd.spec 1 Jul 2008 17:06:26 -0000 1.283 +++ jd.spec 2 Jul 2008 15:32:07 -0000 1.284 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2161_trunk -%define repoid 31373 +%define strtag beta080702 +%define repoid 31825 # Define this if this is pre-version %define pre_release 1 ########################################## @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 6 +%define vendor_rel 7 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Wed Jul 2 2008 Mamoru Tasaka -- svn 2161 +* Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 +- 2.0.0 beta 20080702 * Tue Jun 24 2008 Mamoru Tasaka - F-10: rebuild against new gnutls Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- sources 1 Jul 2008 17:06:26 -0000 1.251 +++ sources 2 Jul 2008 15:32:07 -0000 1.252 @@ -1 +1 @@ -922cf9146fa8d9b5bc2b0c01a2854330 jd-2.0.0-svn2161_trunk.tgz +b3bc215fde740f9bbec15d4129903c70 jd-2.0.0-beta080702.tgz From fedora-extras-commits at redhat.com Wed Jul 2 15:32:46 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 2 Jul 2008 15:32:46 GMT Subject: rpms/jd/F-9 .cvsignore, 1.257, 1.258 jd.spec, 1.294, 1.295 sources, 1.258, 1.259 Message-ID: <200807021532.m62FWk7a027901@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27806/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- .cvsignore 1 Jul 2008 17:06:59 -0000 1.257 +++ .cvsignore 2 Jul 2008 15:32:09 -0000 1.258 @@ -1 +1 @@ -jd-2.0.0-svn2161_trunk.tgz +jd-2.0.0-beta080702.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- jd.spec 1 Jul 2008 17:06:59 -0000 1.294 +++ jd.spec 2 Jul 2008 15:32:09 -0000 1.295 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2161_trunk -%define repoid 31373 +%define strtag beta080702 +%define repoid 31825 # Define this if this is pre-version %define pre_release 1 ########################################## @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 6 +%define vendor_rel 7 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Wed Jul 2 2008 Mamoru Tasaka -- svn 2161 +* Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 +- 2.0.0 beta 20080702 * Tue Jun 24 2008 Mamoru Tasaka - F-10: rebuild against new gnutls Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- sources 1 Jul 2008 17:06:59 -0000 1.258 +++ sources 2 Jul 2008 15:32:09 -0000 1.259 @@ -1 +1 @@ -922cf9146fa8d9b5bc2b0c01a2854330 jd-2.0.0-svn2161_trunk.tgz +b3bc215fde740f9bbec15d4129903c70 jd-2.0.0-beta080702.tgz From fedora-extras-commits at redhat.com Wed Jul 2 15:32:50 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 2 Jul 2008 15:32:50 GMT Subject: rpms/jd/devel .cvsignore, 1.257, 1.258 jd.spec, 1.300, 1.301 sources, 1.258, 1.259 Message-ID: <200807021532.m62FWodD027907@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27806/devel Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- .cvsignore 1 Jul 2008 17:07:26 -0000 1.257 +++ .cvsignore 2 Jul 2008 15:32:17 -0000 1.258 @@ -1 +1 @@ -jd-2.0.0-svn2161_trunk.tgz +jd-2.0.0-beta080702.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- jd.spec 1 Jul 2008 17:07:26 -0000 1.300 +++ jd.spec 2 Jul 2008 15:32:17 -0000 1.301 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2161_trunk -%define repoid 31373 +%define strtag beta080702 +%define repoid 31825 # Define this if this is pre-version %define pre_release 1 ########################################## @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 6 +%define vendor_rel 7 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Wed Jul 2 2008 Mamoru Tasaka -- svn 2161 +* Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 +- 2.0.0 beta 20080702 * Tue Jun 24 2008 Mamoru Tasaka - F-10: rebuild against new gnutls Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- sources 1 Jul 2008 17:07:26 -0000 1.258 +++ sources 2 Jul 2008 15:32:17 -0000 1.259 @@ -1 +1 @@ -922cf9146fa8d9b5bc2b0c01a2854330 jd-2.0.0-svn2161_trunk.tgz +b3bc215fde740f9bbec15d4129903c70 jd-2.0.0-beta080702.tgz From fedora-extras-commits at redhat.com Wed Jul 2 15:33:39 2008 From: fedora-extras-commits at redhat.com (Omair Majid (omajid)) Date: Wed, 2 Jul 2008 15:33:39 GMT Subject: rpms/libmatthew-java/devel jpackage_compliance.patch, 1.1, 1.2 libmatthew-java.spec, 1.1, 1.2 Message-ID: <200807021533.m62FXdi4028033@cvs-int.fedora.redhat.com> Author: omajid Update of /cvs/pkgs/rpms/libmatthew-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27883 Modified Files: jpackage_compliance.patch libmatthew-java.spec Log Message: fixed system dependent paths for jni libraries jpackage_compliance.patch: Index: jpackage_compliance.patch =================================================================== RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/jpackage_compliance.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jpackage_compliance.patch 27 Jun 2008 19:52:15 -0000 1.1 +++ jpackage_compliance.patch 2 Jul 2008 15:32:55 -0000 1.2 @@ -31,7 +31,7 @@ private native void setenv(String var, String value); { - System.loadLibrary("cgi-java"); -+ System.load("/usr/lib/libmatthew-java/libcgi-java.so"); ++ System.load("@JNIPATH@/" + System.mapLibraryName("cgi-java") ); } /** @@ -44,7 +44,7 @@ public class UnixServerSocket { - static { System.loadLibrary("unix-java"); } -+ static { System.load("/usr/lib/libmatthew-java/libunix-java.so"); } ++ static { System.load("@JNIPATH@/" + System.mapLibraryName("unix-java")); } private native int native_bind(String address, boolean abs) throws IOException; private native void native_close(int sock) throws IOException; private native int native_accept(int sock) throws IOException; @@ -57,7 +57,7 @@ public class UnixSocket { - static { System.loadLibrary("unix-java"); } -+ static { System.load("/usr/lib/libmatthew-java/libunix-java.so"); } ++ static { System.load("@JNIPATH@/" + System.mapLibraryName("unix-java") ); } private native void native_set_pass_cred(int sock, boolean passcred) throws IOException; private native int native_connect(String address, boolean abs) throws IOException; private native void native_close(int sock) throws IOException; Index: libmatthew-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/libmatthew-java.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmatthew-java.spec 27 Jun 2008 19:52:15 -0000 1.1 +++ libmatthew-java.spec 2 Jul 2008 15:32:55 -0000 1.2 @@ -2,7 +2,7 @@ Name: libmatthew-java Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A few useful Java libraries Group: Development/Libraries License: LGPLv2 @@ -73,7 +73,11 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 + +# this patch adds a system dependent path, so we fix it before +# applying the patch +sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH2} | patch -p1 + %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -133,9 +137,13 @@ %files javadoc +%defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog +* Wed Jul 2 2008 Omair Majid 0.7.1-2 +- Fixed hardcoded paths for jni libraries + * Wed Jun 25 2008 Omair Majid 0.7.1-1.fc9 - Initial build for fedora From fedora-extras-commits at redhat.com Wed Jul 2 16:00:37 2008 From: fedora-extras-commits at redhat.com (Bernard Johnson (bjohnson)) Date: Wed, 2 Jul 2008 16:00:37 GMT Subject: rpms/pygoocanvas/F-9 pygoocanvas.spec,1.5,1.6 Message-ID: <200807021600.m62G0bSD029315@cvs-int.fedora.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/pygoocanvas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29247/F-9 Modified Files: pygoocanvas.spec Log Message: - package package config file (.pc) into package (don't want separate devel) Index: pygoocanvas.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygoocanvas/F-9/pygoocanvas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pygoocanvas.spec 29 Jun 2008 23:26:14 -0000 1.5 +++ pygoocanvas.spec 2 Jul 2008 15:59:45 -0000 1.6 @@ -2,7 +2,7 @@ Name: pygoocanvas Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GooCanvas python bindings Group: Development/Languages @@ -46,8 +46,12 @@ %doc AUTHORS COPYING NEWS %{_datadir}/gtk-doc/html/%{name} %{python_sitearch}/* +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 02 2008 Bernard Johnson - 0.10.0-2 +- package package config file (.pc) into package (don't want separate devel) + * Sun Jun 29 2008 Bernard Johnson - 0.10.0-1 - v 0.10.0 From fedora-extras-commits at redhat.com Wed Jul 2 16:00:47 2008 From: fedora-extras-commits at redhat.com (Bernard Johnson (bjohnson)) Date: Wed, 2 Jul 2008 16:00:47 GMT Subject: rpms/pygoocanvas/F-8 pygoocanvas.spec,1.4,1.5 Message-ID: <200807021600.m62G0lOT029320@cvs-int.fedora.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/pygoocanvas/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29247/F-8 Modified Files: pygoocanvas.spec Log Message: - package package config file (.pc) into package (don't want separate devel) Index: pygoocanvas.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygoocanvas/F-8/pygoocanvas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pygoocanvas.spec 29 Jun 2008 23:25:54 -0000 1.4 +++ pygoocanvas.spec 2 Jul 2008 15:59:28 -0000 1.5 @@ -2,7 +2,7 @@ Name: pygoocanvas Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GooCanvas python bindings Group: Development/Languages @@ -46,8 +46,12 @@ %doc AUTHORS COPYING NEWS %{_datadir}/gtk-doc/html/%{name} %{python_sitearch}/* +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 02 2008 Bernard Johnson - 0.10.0-2 +- package package config file (.pc) into package (don't want separate devel) + * Sun Jun 29 2008 Bernard Johnson - 0.10.0-1 - v 0.10.0 From fedora-extras-commits at redhat.com Wed Jul 2 16:00:58 2008 From: fedora-extras-commits at redhat.com (Bernard Johnson (bjohnson)) Date: Wed, 2 Jul 2008 16:00:58 GMT Subject: rpms/pygoocanvas/devel pygoocanvas.spec,1.5,1.6 Message-ID: <200807021600.m62G0wBC029327@cvs-int.fedora.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/pygoocanvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29247/devel Modified Files: pygoocanvas.spec Log Message: - package package config file (.pc) into package (don't want separate devel) Index: pygoocanvas.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygoocanvas/devel/pygoocanvas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pygoocanvas.spec 29 Jun 2008 23:26:30 -0000 1.5 +++ pygoocanvas.spec 2 Jul 2008 16:00:08 -0000 1.6 @@ -2,7 +2,7 @@ Name: pygoocanvas Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GooCanvas python bindings Group: Development/Languages @@ -46,8 +46,12 @@ %doc AUTHORS COPYING NEWS %{_datadir}/gtk-doc/html/%{name} %{python_sitearch}/* +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 02 2008 Bernard Johnson - 0.10.0-2 +- package package config file (.pc) into package (don't want separate devel) + * Sun Jun 29 2008 Bernard Johnson - 0.10.0-1 - v 0.10.0 From fedora-extras-commits at redhat.com Wed Jul 2 16:03:13 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 2 Jul 2008 16:03:13 GMT Subject: rpms/evolution-rss/F-9 evolution-rss.spec,1.15,1.16 Message-ID: <200807021603.m62G3DAe003572@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3513 Modified Files: evolution-rss.spec Log Message: update to 0.1.0 release Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-9/evolution-rss.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- evolution-rss.spec 5 Apr 2008 13:03:21 -0000 1.15 +++ evolution-rss.spec 2 Jul 2008 16:02:23 -0000 1.16 @@ -1,17 +1,14 @@ Summary: Evolution RSS Reader Name: evolution-rss -Version: 0.0.8 -Release: 7%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz -Patch0: evolution-rss-0.0.8-empty-desc.patch -Patch1: evolution-rss-0.0.8-norss-popup.patch -Patch2: evolution-rss-0.0.8-norss-enabled.patch -Patch3: evolution-rss-0.0.8-xulrunner.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Requires: evolution +#Requires: xulrunner Requires(pre): GConf2 Requires(post): GConf2 @@ -21,24 +18,19 @@ BuildRequires: evolution-devel BuildRequires: evolution-data-server-devel BuildRequires: dbus-glib-devel -BuildRequires: gecko-libs = 1.9 -BuildRequires: gecko-devel = 1.9 +BuildRequires: xulrunner-devel-unstable BuildRequires: perl(XML::Parser) BuildRequires: libtool +BuildRequires: WebKit-gtk-devel %description This is an evolution plugin which enables evolution to read rss feeds. %prep %setup -q -n evolution-rss-%{version} -%patch0 -p1 -b .empty-fix -%patch1 -p1 -b .norss-popup -%patch2 -p1 -b .norss-enabled -%patch3 -p1 -b .xulrunner %build -autoreconf -i -f -%configure --disable-webkit +%configure --with-primary-render=gecko make %{?_smp_mflags} %install @@ -80,8 +72,8 @@ %{_bindir}/evolution-import-rss %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_datadir}/evolution/*/errors/org-gnome-evolution-rss.error -%{_datadir}/evolution/*/glade/rss-ui.glade -%{_datadir}/evolution/*/images/rss.png +%{_datadir}/evolution/*/glade/*.glade +%{_datadir}/evolution/*/images/*.png %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.eplug %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.xml %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so @@ -95,6 +87,15 @@ %doc TODO %changelog +* Wed Jul 2 2008 Lucian Langa - 0.1.0-1 +- Update to 0.1.0 version + +* Thu Apr 30 2008 Lucian Langa - 0.0.8-9 +- Update requirements + +* Thu Apr 7 2008 Lucian Langa - 0.0.8-8 +- Force gecko default html render + * Thu Apr 5 2008 Lucian Langa - 0.0.8-7 - Modify dependencies for proper F8->F9 upgrade From fedora-extras-commits at redhat.com Wed Jul 2 16:12:51 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 2 Jul 2008 16:12:51 GMT Subject: rpms/asterisk/devel asterisk.spec,1.27,1.28 Message-ID: <200807021612.m62GCpJf003968@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3940 Modified Files: asterisk.spec Log Message: * Thu Jul 2 2008 Jeffrey C. Ollie - 1.6.0-0.17.beta9 - Add patch that unbreaks cdr_tds with FreeTDS 0.82. - Properly obsolete conference subpackage. From fedora-extras-commits at redhat.com Wed Jul 2 16:14:41 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 2 Jul 2008 16:14:41 GMT Subject: rpms/asterisk/devel 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, NONE, 1.1 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, NONE, 1.1 0003-Add-FAX-apps.patch, NONE, 1.1 0004-Allow-alternate-extensions-to-be-specified-in-users.patch, NONE, 1.1 0005-Pick-proper-optimization-flags-for-Fedora.patch, NONE, 1.1 0006-Add-chan_mobile-from-asterisk-addons.patch, NONE, 1.1 0007-Use-pkgconfig-to-check-for-Lua.patch, NONE, 1.1 0008-Build-using-external-libedit.patch, NONE, 1.1 0009-Update-cdr_tds-to-latest.patch, NONE, 1.1 0010-Update-autoconf.patch, NONE, 1.1 asterisk-1.6.0-beta9-alternate-extensions.patch, 1.1, NONE asterisk-1.6.0-beta9-alternate-voicemail.patch, 1.1, NONE asterisk-1.6.0-beta9-appconference.patch, 1.1, NONE asterisk-1.6.0-beta9-autoconf.patch, 1.1, NONE asterisk-1.6.0-beta9-chanmobile.patch, 1.1, NONE asterisk-1.6.0-beta9-editline.patch, 1.1, NONE asterisk-1.6.0-beta9-initscripts.patch, 1.1, NONE asterisk-1.6.0-beta9-lua.patch, 1.1, NONE asterisk-1.6.0-beta9-optimization.patch, 1.1, NONE asterisk-1.6.0-beta9-spandspfax.patch, 1.1, NONE Message-ID: <200807021614.m62GEfvq004129@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4060 Added Files: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 0003-Add-FAX-apps.patch 0004-Allow-alternate-extensions-to-be-specified-in-users.patch 0005-Pick-proper-optimization-flags-for-Fedora.patch 0006-Add-chan_mobile-from-asterisk-addons.patch 0007-Use-pkgconfig-to-check-for-Lua.patch 0008-Build-using-external-libedit.patch 0009-Update-cdr_tds-to-latest.patch 0010-Update-autoconf.patch Removed Files: asterisk-1.6.0-beta9-alternate-extensions.patch asterisk-1.6.0-beta9-alternate-voicemail.patch asterisk-1.6.0-beta9-appconference.patch asterisk-1.6.0-beta9-autoconf.patch asterisk-1.6.0-beta9-chanmobile.patch asterisk-1.6.0-beta9-editline.patch asterisk-1.6.0-beta9-initscripts.patch asterisk-1.6.0-beta9-lua.patch asterisk-1.6.0-beta9-optimization.patch asterisk-1.6.0-beta9-spandspfax.patch Log Message: * Thu Jul 2 2008 Jeffrey C. Ollie - 1.6.0-0.17.beta9 - Add patch that unbreaks cdr_tds with FreeTDS 0.82. - Properly obsolete conference subpackage. 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch: --- NEW FILE 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch --- >From 4b4ea77478104bd1bfa02cc41ffd8351780e14e7 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Sun, 18 Nov 2007 21:47:59 -0600 Subject: [PATCH] Modify init scripts for better Fedora compatibility. --- contrib/init.d/rc.redhat.asterisk | 59 +++++++++++++++++------------------- contrib/sysconfig/asterisk | 16 ++++++++++ 2 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 contrib/sysconfig/asterisk diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk index de821fe..ddb1d64 100755 --- a/contrib/init.d/rc.redhat.asterisk +++ b/contrib/init.d/rc.redhat.asterisk @@ -3,7 +3,7 @@ # # asterisk Starts, Stops and Reloads Asterisk. # -# chkconfig: 2345 90 60 +# chkconfig: - 90 60 # description: Asterisk PBX and telephony daemon. # processname: asterisk # pidfile: /var/run/asterisk.pid @@ -20,51 +20,51 @@ # - Added support for -U and -G command line options # - Modified "reload" to call asterisk -rx 'reload' -# Use this option to specify a different configuration directory -#AST_CONFIG=/etc/asterisk +# Do not modify this script to change any of the settings, instead +# edit /etc/sysconfig/asterisk + +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf # Installation directory AST_SBIN=/usr/sbin -# Uncomment the following and set them to the user/groups that you -# want to run Asterisk as. NOTE: this requires substantial work to -# be sure that Asterisk's environment has permission to write the -# files required for its operation, including logs, its comm -# socket, the asterisk database, etc. -#AST_USER="asterisk" +# The user that Asterisk will run as. +AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. #AST_GROUP="asterisk" -# Source function library. -. /etc/rc.d/init.d/functions +# Allow configuration overrides in /etc/sysconfig/asterisk +CONFIG0=`readlink $0` +if [ "$CONFIG0" = "" ]; then + CONFIGFILE=/etc/sysconfig/`basename $0` +else + CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` +fi +[ -f $CONFIGFILE ] && . $CONFIGFILE if ! [ -x $AST_SBIN/asterisk ] ; then echo "ERROR: $AST_SBIN/asterisk not found" exit 0 fi -if ! [ -d $AST_CONFIG ] ; then - echo "ERROR: $AST_CONFIG directory not found" +if ! [ -f $AST_CONFIG ] ; then + echo "ERROR: $AST_CONFIG not found" exit 0 fi -# Uncomment this ONLY if you know what you are doing. -# export LD_ASSUME_KERNEL=2.4.1 +# Source function library. +. /etc/rc.d/init.d/functions # Full path to asterisk binary DAEMON=$AST_SBIN/asterisk -# Full path to safe_asterisk script -SAFE_ASTERISK=$AST_SBIN/safe_asterisk - -# Allow configuration overrides in /etc/sysconfig/asterisk -CONFIG0=`readlink $0` -if [ "$CONFIG0" = "" ]; then - CONFIGFILE=/etc/sysconfig/`basename $0` -else - CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` -fi -[ -x $CONFIGFILE ] && . $CONFIGFILE - RETVAL=0 start() { @@ -78,9 +78,6 @@ start() { # Start daemons. echo -n $"Starting asterisk: " - if [ -f $SAFE_ASTERISK ] ; then - DAEMON=$SAFE_ASTERISK - fi if [ $AST_USER ] ; then ASTARGS="-U $AST_USER" fi @@ -99,7 +96,7 @@ start() { stop() { # Stop daemons. - echo -n $"Shutting down asterisk: " + echo -n $"Stopping asterisk: " killproc asterisk RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk new file mode 100644 index 0000000..2d3598a --- /dev/null +++ b/contrib/sysconfig/asterisk @@ -0,0 +1,16 @@ +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf + +# Installation directory +AST_SBIN=/usr/sbin + +# The user that Asterisk will run as. +AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. +#AST_GROUP="asterisk" -- 1.5.5.2 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch: --- NEW FILE 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch --- >From 053d0eda8a0cc575e682df337d630e3aaebf7329 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 15:52:36 -0600 Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded. --- configs/modules.conf.sample | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample index 2ca3c03..ae20637 100644 --- a/configs/modules.conf.sample +++ b/configs/modules.conf.sample @@ -37,3 +37,30 @@ load => res_musiconhold.so noload => chan_alsa.so ;noload => chan_oss.so ;noload => chan_console.so + +; +; Voicemail storage selection +; +; Comment out the "noload" lines for the voicemail +; storage system that you want. Leave the ones that +; you don't want uncommented. +; + +; +; Voicemail with IMAP storage +; +noload => app_directory_imap.so +noload => app_voicemail_imap.so + +; +; Voicemail with ODBC storage +; +noload => app_directory_odbc.so +noload => app_voicemail_odbc.so + +; +; Voicemail with filesystem storage +; +;noload => app_directory_plain.so +;noload => app_voicemail_plain.so + -- 1.5.5.2 0003-Add-FAX-apps.patch: --- NEW FILE 0003-Add-FAX-apps.patch --- >From 67977e0cecec47c6e3e2100d2c7c60f9668b148f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 12 Nov 2007 15:51:12 -0600 Subject: [PATCH] Add FAX apps. --- apps/app_rxfax.c | 380 ++++++++++++++++++++++++++++++++++++++++ apps/app_txfax.c | 306 ++++++++++++++++++++++++++++++++ build_tools/menuselect-deps.in | 1 + configure.ac | 3 + makeopts.in | 3 + 5 files changed, 693 insertions(+), 0 deletions(-) create mode 100644 apps/app_rxfax.c create mode 100644 apps/app_txfax.c diff --git a/apps/app_rxfax.c b/apps/app_rxfax.c new file mode 100644 index 0000000..bd81ea1 --- /dev/null +++ b/apps/app_rxfax.c @@ -0,0 +1,380 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Trivial application to receive a TIFF FAX file + * + * Copyright (C) 2003, Steve Underwood + * + * Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/manager.h" + +#ifndef AST_MODULE +#define AST_MODULE "app_rxfax" +#endif + +static char *app = "RxFAX"; + +static char *synopsis = "Receive a FAX to a file"; + +static char *descrip = +" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" +"given filename. If the file exists it will be overwritten. The file\n" +"should be in TIFF/F format.\n" +"The \"caller\" option makes the application behave as a calling machine,\n" +"rather than the answering machine. The default behaviour is to behave as\n" +"an answering machine.\n" +"Uses LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"Sets REMOTESTATIONID to the sender CSID.\n" +" FAXPAGES to the number of pages received.\n" +" FAXBITRATE to the transmition rate.\n" +" FAXRESOLUTION to the resolution.\n" +"Returns -1 when the user hangs up.\n" +"Returns 0 otherwise.\n"; + +#define MAX_BLOCK_SIZE 240 + +static void span_message(int level, const char *msg) +{ + int ast_level; + + if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else + ast_level = __LOG_DEBUG; + ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); +} +/*- End of function --------------------------------------------------------*/ + +#if 0 +static void t30_flush(t30_state_t *s, int which) +{ + /* TODO: */ +} +/*- End of function --------------------------------------------------------*/ +#endif + +static void phase_e_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + t30_stats_t t; + char local_ident[21]; + char far_ident[21]; + char buf[11]; + + chan = (struct ast_channel *) user_data; + if (result == T30_ERR_OK) + { + t30_get_transfer_statistics(s, &t); + t30_get_far_ident(s, far_ident); + t30_get_local_ident(s, local_ident); + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax successfully received.\n"); + ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); + ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); + ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); + ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + ast_log(LOG_DEBUG, "==============================================================================\n"); + manager_event(EVENT_FLAG_CALL, + "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", + chan->name, + chan->exten, + (chan->cid.cid_num) ? chan->cid.cid_num : "", + far_ident, + local_ident, + t.pages_transferred, + t.y_resolution, + t.bit_rate, + s->rx_file); + pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); + snprintf(buf, sizeof(buf), "%i", t.pages_transferred); + pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); + snprintf(buf, sizeof(buf), "%i", t.y_resolution); + pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); + snprintf(buf, sizeof(buf), "%i", t.bit_rate); + pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); + } + else + { + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static void phase_d_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + t30_stats_t t; + + chan = (struct ast_channel *) user_data; + if (result) + { + t30_get_transfer_statistics(s, &t); + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); + ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); + ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); + ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); + ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); + ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static int rxfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char template_file[256]; + char target_file[256]; + char *s; + char *t; + char *v; + const char *x; + int option; + int len; + int i; + fax_state_t fax; + int calling_party; + int verbose; + int samples; + + struct ast_module_user *u; + struct ast_frame *inf = NULL; + struct ast_frame outf; + + int original_read_fmt; + int original_write_fmt; + + uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; + uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; + + if (chan == NULL) + { + ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); + return -1; + } + + span_set_message_handler(span_message); + + /* The next few lines of code parse out the filename and header from the input string */ + if (data == NULL) + { + /* No data implies no filename or anything is present */ + ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); + return -1; + } + + calling_party = FALSE; + verbose = FALSE; + target_file[0] = '\0'; + + for (option = 0, v = s = data; v; option++, s++) + { + t = s; + v = strchr(s, '|'); + s = (v) ? v : s + strlen(s); + strncpy((char *) buf, t, s - t); + buf[s - t] = '\0'; + if (option == 0) + { + /* The first option is always the file name */ + len = s - t; + if (len > 255) + len = 255; + strncpy(target_file, t, len); + target_file[len] = '\0'; + /* Allow the use of %d in the file name for a wild card of sorts, to + create a new file with the specified name scheme */ + if ((x = strchr(target_file, '%')) && x[1] == 'd') + { + strcpy(template_file, target_file); + i = 0; + do + { + snprintf(target_file, 256, template_file, 1); + i++; + } + while (ast_fileexists(target_file, "", chan->language) != -1); + } + } + else if (strncmp("caller", t, s - t) == 0) + { + calling_party = TRUE; + } + else if (strncmp("debug", t, s - t) == 0) + { + verbose = TRUE; + } + } + + /* Done parsing */ + + u = ast_module_user_add(chan); + + if (chan->_state != AST_STATE_UP) + { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(chan); + } + + if (!res) + { + original_read_fmt = chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + return -1; + } + } + original_write_fmt = chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + return -1; + } + } + fax_init(&fax, calling_party); + if (verbose) + fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; + x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); + if (x && x[0]) + t30_set_local_ident(&fax.t30_state, x); + x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); + if (x && x[0]) + t30_set_header_info(&fax.t30_state, x); + t30_set_rx_file(&fax.t30_state, target_file, -1); + //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan); + t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan); + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan); + t30_set_ecm_capability(&fax.t30_state, TRUE); + t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + while (ast_waitfor(chan, -1) > -1) + { + inf = ast_read(chan); + if (inf == NULL) + { + res = -1; + break; + } + if (inf->frametype == AST_FRAME_VOICE) + { + if (fax_rx(&fax, inf->data, inf->samples)) + break; + samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; + len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); + if (len) + { + memset(&outf, 0, sizeof(outf)); + outf.frametype = AST_FRAME_VOICE; + outf.subclass = AST_FORMAT_SLINEAR; + outf.datalen = len*sizeof(int16_t); + outf.samples = len; + outf.data = &buf[AST_FRIENDLY_OFFSET]; + outf.offset = AST_FRIENDLY_OFFSET; + outf.src = "RxFAX"; + if (ast_write(chan, &outf) < 0) + { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + break; + } + } + } + ast_frfree(inf); + } + if (inf == NULL) + { + ast_log(LOG_DEBUG, "Got hangup\n"); + res = -1; + } + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + } + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, original_write_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); + } + t30_terminate(&fax.t30_state); + } + else + { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); + } + ast_module_user_remove(u); + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int unload_module(void) +{ + int res; + + ast_module_user_hangup_all(); + + res = ast_unregister_application(app); + + + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int load_module(void) +{ + return ast_register_application(app, rxfax_exec, synopsis, descrip); +} +/*- End of function --------------------------------------------------------*/ + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Receive Application"); + +/*- End of file ------------------------------------------------------------*/ diff --git a/apps/app_txfax.c b/apps/app_txfax.c new file mode 100644 index 0000000..713ecf1 --- /dev/null +++ b/apps/app_txfax.c @@ -0,0 +1,306 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Trivial application to send a TIFF file as a FAX + * + * Copyright (C) 2003, Steve Underwood + * + * Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" + +#ifndef AST_MODULE +#define AST_MODULE "app_txfax" +#endif + +static char *app = "TxFAX"; + +static char *synopsis = "Send a FAX file"; + +static char *descrip = +" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" +"The \"caller\" option makes the application behave as a calling machine,\n" +"rather than the answering machine. The default behaviour is to behave as\n" +"an answering machine.\n" +"Uses LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"Sets REMOTESTATIONID to the receiver CSID.\n" +"Returns -1 when the user hangs up, or if the file does not exist.\n" +"Returns 0 otherwise.\n"; + +#define MAX_BLOCK_SIZE 240 + +static void span_message(int level, const char *msg) +{ + int ast_level; + + if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else + ast_level = __LOG_DEBUG; + ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); +} +/*- End of function --------------------------------------------------------*/ + +#if 0 +static void t30_flush(t30_state_t *s, int which) +{ + /* TODO: */ +} +/*- End of function --------------------------------------------------------*/ +#endif + +static void phase_e_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + char far_ident[21]; + + chan = (struct ast_channel *) user_data; + if (result == T30_ERR_OK) + { + t30_get_far_ident(s, far_ident); + pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); + } + else + { + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax send not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static int txfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char source_file[256]; + char *s; + char *t; + char *v; + const char *x; + int option; + int len; + fax_state_t fax; + int calling_party; + int verbose; + int samples; + + struct ast_module_user *u; + struct ast_frame *inf = NULL; + struct ast_frame outf; + + int original_read_fmt; + int original_write_fmt; + + uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; + uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; + + if (chan == NULL) + { + ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); + return -1; + } + + span_set_message_handler(span_message); + + /* The next few lines of code parse out the filename and header from the input string */ + if (data == NULL) + { + /* No data implies no filename or anything is present */ + ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); + return -1; + } + + calling_party = FALSE; + verbose = FALSE; + source_file[0] = '\0'; + + for (option = 0, v = s = data; v; option++, s++) + { + t = s; + v = strchr(s, '|'); + s = (v) ? v : s + strlen(s); + strncpy((char *) buf, t, s - t); + buf[s - t] = '\0'; + if (option == 0) + { + /* The first option is always the file name */ + len = s - t; + if (len > 255) + len = 255; + strncpy(source_file, t, len); + source_file[len] = '\0'; + } + else if (strncmp("caller", t, s - t) == 0) + { + calling_party = TRUE; + } + else if (strncmp("debug", t, s - t) == 0) + { + verbose = TRUE; + } + } + + /* Done parsing */ + + u = ast_module_user_add(chan); + + if (chan->_state != AST_STATE_UP) + { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(chan); + } + + if (!res) + { + original_read_fmt = chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + return -1; + } + } + original_write_fmt = chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + return -1; + } + } + fax_init(&fax, calling_party); + if (verbose) + fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; + + x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); + if (x && x[0]) + t30_set_local_ident(&fax.t30_state, x); + x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); + if (x && x[0]) + t30_set_header_info(&fax.t30_state, x); + t30_set_tx_file(&fax.t30_state, source_file, -1, -1); + //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan); + //t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan); + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan); + t30_set_ecm_capability(&fax.t30_state, TRUE); + t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + while (ast_waitfor(chan, -1) > -1) + { + inf = ast_read(chan); + if (inf == NULL) + { + res = -1; + break; + } + if (inf->frametype == AST_FRAME_VOICE) + { + if (fax_rx(&fax, inf->data, inf->samples)) + break; + samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; + len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); + if (len) + { + memset(&outf, 0, sizeof(outf)); + outf.frametype = AST_FRAME_VOICE; + outf.subclass = AST_FORMAT_SLINEAR; + outf.datalen = len*sizeof(int16_t); + outf.samples = len; + outf.data = &buf[AST_FRIENDLY_OFFSET]; + outf.offset = AST_FRIENDLY_OFFSET; + if (ast_write(chan, &outf) < 0) + { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + break; + } + } + } + ast_frfree(inf); + } + if (inf == NULL) + { + ast_log(LOG_DEBUG, "Got hangup\n"); + res = -1; + } + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + } + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, original_write_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); + } + t30_terminate(&fax.t30_state); + } + else + { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); + } + ast_module_user_remove(u); + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int unload_module(void) +{ + int res; + + ast_module_user_hangup_all(); + + res = ast_unregister_application(app); + + + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int load_module(void) +{ + return ast_register_application(app, txfax_exec, synopsis, descrip); +} +/*- End of function --------------------------------------------------------*/ + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Transmit Application"); + +/*- End of file ------------------------------------------------------------*/ diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index aa76d56..6067076 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -30,6 +30,7 @@ POPT=@PBX_POPT@ PORTAUDIO=@PBX_PORTAUDIO@ PRI=@PBX_PRI@ RADIUS=@PBX_RADIUS@ +SPANDSP=@PBX_SPANDSP@ SPEEX=@PBX_SPEEX@ SPEEXDSP=@PBX_SPEEXDSP@ SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@ diff --git a/configure.ac b/configure.ac index 63f0376..ae671ec 100644 --- a/configure.ac +++ b/configure.ac @@ -239,6 +239,7 @@ AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl]) AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image]) +AST_EXT_LIB_SETUP([SPANDSP], [spandsp Library], [spandsp]) AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) @@ -1333,6 +1334,8 @@ AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) +AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [fax_init], [spandsp.h], [-ltiff]) + AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) # See if the main speex library contains the preprocess functions diff --git a/makeopts.in b/makeopts.in index 3bf203e..3d564b7 100644 --- a/makeopts.in +++ b/makeopts.in @@ -169,6 +169,9 @@ SDL_LIB=@SDL_LIB@ SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@ SDL_IMAGE_LIB=@SDL_IMAGE_LIB@ +SPANDSP_INCLUDE=@SPANDSP_INCLUDE@ +SPANDSP_LIB=@SPANDSP_LIB@ + SPEEX_INCLUDE=@SPEEX_INCLUDE@ SPEEX_LIB=@SPEEX_LIB@ -- 1.5.5.2 0004-Allow-alternate-extensions-to-be-specified-in-users.patch: --- NEW FILE 0004-Allow-alternate-extensions-to-be-specified-in-users.patch --- >From 383f98f158ea7eab163e8fb4b49972507cc47bbb Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:32:56 -0600 Subject: [PATCH] Allow alternate extensions to be specified in users.conf --- pbx/pbx_config.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 4a7a3d3..0e38d88 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1532,11 +1532,14 @@ static void pbx_load_users(void) { struct ast_config *cfg; char *cat, *chan; + char *ext; const char *zapchan; const char *hasexten; + const char *altexts; char tmp[256]; char iface[256]; char zapcopy[256]; + char altcopy[256]; char *c; int len; int hasvoicemail; @@ -1617,6 +1620,17 @@ static void pbx_load_users(void) } else { ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar); } + altexts = ast_variable_retrieve(cfg, cat, "alternateexts"); + if (!ast_strlen_zero(altexts)) { + snprintf(tmp, sizeof(tmp), "%s|1", cat); + ast_copy_string(altcopy, altexts, sizeof(altcopy)); + c = altcopy; + ext = strsep(&c, ","); + while (ext) { + ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free, registrar); + ext = strsep(&c, ","); + } + } } } ast_config_destroy(cfg); -- 1.5.5.2 0005-Pick-proper-optimization-flags-for-Fedora.patch: --- NEW FILE 0005-Pick-proper-optimization-flags-for-Fedora.patch --- >From 341a7d2c23aa22fdf9a3353b7cc5811954891436 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:42:14 -0600 Subject: [PATCH] Pick proper optimization flags for Fedora. --- Makefile | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7c44b41..a9fd366 100644 --- a/Makefile +++ b/Makefile @@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu) endif ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) -ASTCFLAGS+=-pipe + ifeq ($(findstring -pipe,$(ASTCFLAGS)),) + ASTCFLAGS+=-pipe + endif +endif + +ifeq ($(findstring -Wall,$(ASTCFLAGS)),) + ASTCFLAGS+=-Wall endif -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h @@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),) ASTLDFLAGS+=-L/usr/local/lib endif -ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) +ifeq ($(findstring -march,$(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif endif ifeq ($(PROC),ppc) -- 1.5.5.2 0006-Add-chan_mobile-from-asterisk-addons.patch: --- NEW FILE 0006-Add-chan_mobile-from-asterisk-addons.patch --- >From c5c5b6a3991d73fc1085b98e65e6f15bd399b20d Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 09:23:28 -0600 Subject: [PATCH] Add chan_mobile from asterisk-addons. --- build_tools/menuselect-deps.in | 1 + channels/Makefile | 2 + channels/chan_mobile.c | 2118 ++++++++++++++++++++++++++++++++++++++++ configs/mobile.conf.sample | 60 ++ configure.ac | 4 + doc/chan_mobile.txt | 240 +++++ makeopts.in | 3 + 7 files changed, 2428 insertions(+), 0 deletions(-) create mode 100644 channels/chan_mobile.c create mode 100644 configs/mobile.conf.sample create mode 100644 doc/chan_mobile.txt diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 6067076..c25e5d2 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,5 +1,6 @@ ASOUND=@PBX_ALSA@ CRYPTO=@PBX_CRYPTO@ +BLUETOOTH=@PBX_BLUETOOTH@ CURL=@PBX_CURL@ FREETDS=@PBX_FREETDS@ GMIME=@PBX_GMIME@ diff --git a/channels/Makefile b/channels/Makefile index 34bd8e0..d8e691a 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -101,3 +101,5 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o + +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB) diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c new file mode 100644 index 0000000..1312ea9 --- /dev/null +++ b/channels/chan_mobile.c @@ -0,0 +1,2118 @@ +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 1999 - 2006, Digium, Inc. + * + * Mark Spencer + * + * See http://www.asterisk.org for more information about + * the Asterisk project. Please do not directly contact + * any of the maintainers of this project for assistance; + * the project provides a web site, mailing lists and IRC + * channels for your use. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + */ + +/*! \file + * + * \brief Bluetooth Mobile Device channel driver + * + * \author Dave Bowerman + * + * \ingroup channel_drivers + */ + +/*** MODULEINFO + bluetooth + ***/ + +#include + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MBL_CONFIG "mobile.conf" + +#define DEVICE_FRAME_SIZE 48 +#define DEVICE_FRAME_FORMAT AST_FORMAT_SLINEAR +#define CHANNEL_FRAME_SIZE 320 + +static int prefformat = DEVICE_FRAME_FORMAT; + +static int discovery_interval = 60; /* The device discovery interval, default 60 seconds. */ +static pthread_t discovery_thread = AST_PTHREADT_NULL; /* The discovery thread */ +static sdp_session_t *sdp_session; + +enum mbl_type { + MBL_TYPE_PHONE, + MBL_TYPE_HEADSET +}; + +enum mbl_state { + MBL_STATE_INIT = 0, + MBL_STATE_INIT1, + MBL_STATE_INIT2, + MBL_STATE_INIT3, + MBL_STATE_INIT4, + MBL_STATE_INIT5, + MBL_STATE_INIT6, + MBL_STATE_INIT7, + MBL_STATE_PREIDLE, + MBL_STATE_IDLE, + MBL_STATE_DIAL, + MBL_STATE_DIAL1, + MBL_STATE_OUTGOING, + MBL_STATE_RING, + MBL_STATE_RING2, + MBL_STATE_RING3, + MBL_STATE_INCOMING, + MBL_STATE_HANGUP, + MBL_STATE_INSMS, + MBL_STATE_OUTSMS, + MBL_STATE_OUTSMS1, + MBL_STATE_OUTSMS2 +}; + +struct adapter_pvt { + int dev_id; /* device id */ + int hci_socket; /* device descriptor */ + char id[31]; /* the 'name' from mobile.conf */ + bdaddr_t addr; /* adddress of adapter */ + unsigned int inuse:1; /* are we in use ? */ + unsigned int alignment_detection:1; /* do alignment detection on this adpater? */ + int sco_socket; + AST_LIST_ENTRY(adapter_pvt) entry; +}; + +static AST_LIST_HEAD_STATIC(adapters, adapter_pvt); + +struct mbl_pvt { + struct ast_channel *owner; /* Channel we belong to, possibly NULL */ + struct ast_frame fr; /* "null" frame */ + enum mbl_type type; /* Phone or Headset */ + char id[31]; /* The id from mobile.conf */ + int group; /* group number for group dialling */ + bdaddr_t addr; /* address of device */ + struct adapter_pvt *adapter; /* the adapter we use */ + char context[AST_MAX_CONTEXT]; /* the context for incoming calls */ + char connected; /* is it connected? */ + int rfcomm_port; /* rfcomm port number */ + int rfcomm_socket; /* rfcomm socket descriptor */ + char rfcomm_buf[256]; + char io_buf[CHANNEL_FRAME_SIZE + AST_FRIENDLY_OFFSET]; + char io_save_buf[DEVICE_FRAME_SIZE]; + int io_save_len; + int io_pipe[2]; + int sco_socket; /* sco socket descriptor */ + pthread_t sco_listener_thread; /* inbound sco listener for this device */ + enum mbl_state state; /* monitor thread current state */ + pthread_t monitor_thread; /* monitor thread handle */ + char dial_number[AST_MAX_EXTENSION]; /* number for the monitor thread to dial */ + int dial_timeout; + char ciev_call_0[4]; /* dynamically built reponse strings */ + char ciev_call_1[4]; + char ciev_callsetup_0[4]; + char ciev_callsetup_1[4]; [...2115 lines suppressed...] + +See configs/mobile.conf.sample for an example and an explanation of the configuration. + + +Using chan_mobile :- + +chan_mobile.so must be loaded either by loading it using the Asterisk CLI, or by adding it to /etc/asterisk/modules.conf + +Search for your bluetooth devices using the CLI command 'mobile search'. Be patient with this command as +it will take 8 - 10 seconds to do the discovery. This requires a free adapter. + +Headsets will generally have to be put into 'pairing' mode before they will show up here. + +This will return something like the following :- + +*CLI> mobile search +Address Name Usable Type Port +00:12:56:90:6E:00 LG TU500 Yes Phone 4 +00:80:C8:35:52:78 Toaster No Headset 0 +00:0B:9E:11:74:A5 Hello II Plus Yes Headset 1 +00:0F:86:0E:AE:42 Daves Blackberry Yes Phone 7 + +This is a list of all bluetooth devices seen and whether or not they are usable with chan_mobile. +The Address field contains the 'bd address' of the device. This is like an ethernet mac address. +The Name field is whatever is configured into the device as its name. +The Usable field tells you whether or not the device supports the Bluetooth Handsfree Profile or Headset profile. +The Type field tells you whether the device is usable as a Phone line (FXO) or a headset (FXS) +The Port field is the number to put in the configuration file. + +Choose which device(s) you want to use and edit /etc/asterisk/mobile.conf. There is a sample included +with the Asterisk-addons source under configs/mobile.conf.sample. + +Be sure to configure the right bd address and port number from the search. If you want inbound +calls on a device to go to a specific context, add a context= line, otherwise the default will +be used. The 'id' of the device [bitinbrackets] can be anything you like, just make it unique. + +If you are configuring a Headset be sure to include the type=headset line, if left out it defaults +to phone. + +The CLI command 'mobile show devices' can be used at any time to show the status of configured devices, +and whether or not the device is capable of sending / receiving SMS via bluetooth. + +*CLI> mobile show devices +ID Address Group Adapter Connected State SMS +headset 00:0B:9E:11:AE:C6 0 blue No Init No +LGTU550 00:E0:91:7F:46:44 1 dlink No Init No +*CLI> + +As each phone is connected you will see a message on the Asterisk console :- + + Loaded chan_mobile.so => (Bluetooth Mobile Device Channel Driver) + -- Bluetooth Device blackberry has connected. + -- Bluetooth Device dave has connected. + +To make outbound calls, add something to you Dialplan like the following :- (modify to suit) + +; Calls via LGTU5500 +exten => _9X.,1,Dial(Mobile/LGTU550/${EXTEN:1},45) +exten => _9X.,n,Hangup + +To use channel groups, add an entry to each phones definition in mobile.conf like group=n +where n is a number. + +Then if you do something like Dial(Mobile/g1/123456) Asterisk will dial 123456 on the first +connected free phone in group 1. + +Phones which do not have a specific 'group=n' will be in group 0. + + +To dial out on a headset, you need to use some other mechanism, because the headset is not likely +to have all the needed buttons on it. res_clioriginate is good for this :- + +*CLI> originate Mobile/headset extension NNNNN at context + +This will call your headset, once you answer, Asterisk will call NNNNN at context context + +Dialplan hints :- + +chan_mobile supports 'device status' so you can do somthing like + +exten => 1234,hint,SIP/30&Mobile/dave&Mobile/blackberry + + +MobileStatus Application :- + +chan_mobile also registers an application named MobileStatus. You can use this in your Dialplan +to determine the 'state' of a device. + +For example, suppose you wanted to call dave's extension, but only if he was in the office. You could +test to see if his mobile phone was attached to Asterisk, if it is dial his extension, otherwise dial his +mobile phone. + +exten => 40,1,MobileStatus(dave,DAVECELL) +exten => 40,2,GotoIf($["${DAVECELL}" = "1"]?3:5) +exten => 40,3,Dial(ZAP/g1/0427466412,45,tT) +exten => 40,4,Hangup +exten => 40,5,Dial(SIP/40,45,tT) +exten => 40,6,Hangup + +MobileStatus sets the value of the given variable to :- + +1 = Disconnected. i.e. Device not in range of Asterisk, or turned off etc etc +2 = Connected and Not on a call. i.e. Free +3 = Connected and on a call. i.e. Busy + + +SMS Sending / Receiving + +If Asterisk has detected your mobile phone is capable of SMS via bluetooth, you will be able to send and +receive SMS. + +Incoming SMS's cause Asterisk to create an inbound call to the context you defined in mobile.conf or the default +context if you did not define one. The call will start at extension 'sms'. Two channel variables will be available, +SMSSRC = the number of the originator of the SMS and SMSTXT which is the text of the SMS. +This is not a voice call, so grab the values of the variables and hang the call up. + +So, to handle incoming SMS's, do something like the following in your dialplan + +[incoming-mobile] +exten => sms,1,Verbose(Incoming SMS from ${SMSSRC} ${SMSTXT}) +exten => sms,n,Hangup() + +The above will just print the message on the console. + +If you use res_jabber, you could do something like this :- + +[incoming-mobile] +exten => sms,1,JabberSend(transport,user at jabber.somewhere.com,SMS from ${SMSRC} ${SMSTXT}) +exten => sms,2,Hangup() + +To send an SMS, use the application MobileSendSMS like the following :- + +exten => 99,1,MobileSendSMS(dave,0427123456,Hello World) + +This will send 'Hello World' via device 'dave' to '0427123456' + + +DTMF Debouncing :- + +DTMF detection varies from phone to phone. There is a configuration variable that allows you to tune +this to your needs. e.g. in mobile.conf + +[LGTU550] +address=00:12:56:90:6E:00 +port=4 +context=incoming-mobile +dtmfskip=50 + +change dtmfskip to suit your phone. The default is 200. The larger the number, the more chance of missed DTMF. +The smaller the number the more chance of multiple digits being detected. + + +Debugging :- + +Different phone manufacturers have different interpretations of the Bluetooth Handsfree Profile Spec. +This means that not all phones work the same way, particularly in the connection setup / initialisation +sequence. I've tried to make chan_mobile as general as possible, but it may need modification to +support some phone i've never tested. + +Some phones, most notably Sony Ericsson 'T' series, dont quite conform to the Bluetooth HFP spec. +chan_mobile will detect these and adapt accordingly. The T-610 and T-630 have been tested and +work fine. + +If your phone doesnt behave has expected, turn on Asterisk debugging with 'core set debug 1'. + +This will log a bunch of debug messages indicating what the phone is doing, importantly the rfcomm +conversation between Asterisk and the phone. This can be used to sort out what your phone is doing +and make chan_mobile support it. + +Be aware also, that just about all mobile phones behave differently. For example my LG TU500 wont dial unless +the phone is a the 'idle' screen. i.e. if the phone is showing a 'menu' on the display, when you dial via +Asterisk, the call will not work. chan_mobile handles this, but there may be other phones that do +other things too... + +Important: Watch what your mobile phone is doing the first few times. Asterisk wont make random calls but +if chan_mobile fails to hangup for some reason and you get a huge bill from your telco, dont blame me ;) + + +Feedback, Support, Please can you make Mobile Phone X work... etc :- + +as always, bugs should be reported at http://bugs.digium.com + +email me at david.bowerman at gmail.com or dseeb_ on #asterisk & #asterisk-dev irc. diff --git a/makeopts.in b/makeopts.in index 3d564b7..a394c18 100644 --- a/makeopts.in +++ b/makeopts.in @@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@ ASOUND_INCLUDE=@ALSA_INCLUDE@ ASOUND_LIB=@ALSA_LIB@ +BLUETOOTH_LIB=@BLUETOOTH_LIB@ +BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@ + CURL_INCLUDE=@CURL_INCLUDE@ CURL_LIB=@CURL_LIB@ -- 1.5.5.2 0007-Use-pkgconfig-to-check-for-Lua.patch: --- NEW FILE 0007-Use-pkgconfig-to-check-for-Lua.patch --- >From 13533edf557befc432dc78512a34be5d1a645411 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 13:14:23 -0600 Subject: [PATCH] Use pkgconfig to check for Lua. --- configure.ac | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b2a8051..2da38f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1332,9 +1332,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then [${PWLIB_INCLUDE}], [${PWLIB_LIB}]) fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" -AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) +PBX_LUA=0 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + AC_DEFINE([HAVE_LUA], 1, [Define if your system has the LUA libraries.]) +fi AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) -- 1.5.5.2 0008-Build-using-external-libedit.patch: --- NEW FILE 0008-Build-using-external-libedit.patch --- >From ab565a3223d72d479e9616e6dab6fa4d8524940a Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Tue, 25 Mar 2008 00:50:27 -0500 Subject: [PATCH] Build using external libedit. --- build_tools/menuselect-deps.in | 1 + configure.ac | 22 ++++++++++++++++++++++ main/Makefile | 7 ++++--- main/cli.c | 3 ++- makeopts.in | 4 ++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index c25e5d2..e50e64e 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -16,6 +16,7 @@ ISDNNET=@PBX_ISDNNET@ IXJUSER=@PBX_IXJUSER@ JACK=@PBX_JACK@ LDAP=@PBX_LDAP@ +LIBEDIT=@PBX_LIBEDIT@ LTDL=@PBX_LTDL@ LUA=@PBX_LUA@ MISDN=@PBX_MISDN@ diff --git a/configure.ac b/configure.ac index 2da38f1..c514e10 100644 --- a/configure.ac +++ b/configure.ac @@ -220,6 +220,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap]) AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack]) AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap]) +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit]) AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn]) @@ -1571,6 +1572,27 @@ AC_SUBST(PBX_GTK2) AC_SUBST(GTK2_INCLUDE) AC_SUBST(GTK2_LIB) +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + AC_CHECK_TOOL(PKGCONFIG, pkg-config, no) + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.]) + fi + fi +fi +AC_SUBST(PBX_LIBEDIT) +AC_SUBST(LIBEDIT_INCLUDE) +AC_SUBST(LIBEDIT_LIB) +AC_SUBST(LIBEDIT_OBJ) + if test "${USE_CURL}" != "no"; then AC_PATH_TOOL([CURL_CONFIG], [curl-config], No) if test ! x"${CURL_CONFIG}" = xNo; then diff --git a/main/Makefile b/main/Makefile index 976c37b..09c5eb6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -133,6 +133,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE) ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: ASTCFLAGS+=$(GMIME_INCLUDE) @@ -166,13 +167,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) GMIMELDFLAGS+=$(GMIME_LIB) endif -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) endif $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ diff --git a/main/cli.c b/main/cli.c index 11d6671..dce7950 100644 --- a/main/cli.c +++ b/main/cli.c @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include +#include + #include "asterisk/cli.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" @@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/app.h" #include "asterisk/lock.h" -#include "editline/readline/readline.h" #include "asterisk/threadstorage.h" /*! diff --git a/makeopts.in b/makeopts.in index a394c18..ad7a94d 100644 --- a/makeopts.in +++ b/makeopts.in @@ -238,3 +238,7 @@ TINFO_DIR=@TINFO_DIR@ # if poll is not present, let the makefile know. POLL_AVAILABLE=@HAS_POLL@ + +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@ +LIBEDIT_LIB=@LIBEDIT_LIB@ +LIBEDIT_OBJ=@LIBEDIT_OBJ@ -- 1.5.5.2 0009-Update-cdr_tds-to-latest.patch: --- NEW FILE 0009-Update-cdr_tds-to-latest.patch --- >From 16d58dce72ad486e8962f570b6ae48ceac7e532e Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 2 Jul 2008 10:15:41 -0500 Subject: [PATCH] Update cdr_tds to latest. --- UPGRADE.txt | 3 + cdr/cdr_tds.c | 462 +++++++++++++++++++------------------- configure.ac | 29 +--- doc/tex/freetds.tex | 20 +-- include/asterisk/autoconfig.h.in | 3 - 5 files changed, 238 insertions(+), 279 deletions(-) diff --git a/UPGRADE.txt b/UPGRADE.txt index 70a0f81..d5e97a1 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -123,6 +123,9 @@ CDR: username and password parameters in cdr_odbc.conf, therefore, are no longer used. The dsn parameter now points to an entry in res_odbc.conf. +* The cdr_tds module now supports all versions of FreeTDS that contain + the db-lib frontend. + Formats: * format_wav: The GAIN preprocessor definition and source code that used it diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 9d322fd..8654c80 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -66,72 +66,76 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include - #include "asterisk/config.h" #include "asterisk/channel.h" #include "asterisk/cdr.h" #include "asterisk/module.h" -#ifdef FREETDS_PRE_0_62 -#warning "You have older TDS, you should upgrade!" -#endif +#include +#include #define DATE_FORMAT "%Y/%m/%d %T" -static char *name = "mssql"; +static char *name = "FreeTDS (MSSQL)"; static char *config = "cdr_tds.conf"; -static char *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL, *charset = NULL, *language = NULL; -static char *table = NULL; - -static int connected = 0; +struct cdr_tds_config { + AST_DECLARE_STRING_FIELDS( + AST_STRING_FIELD(hostname); + AST_STRING_FIELD(database); + AST_STRING_FIELD(username); + AST_STRING_FIELD(password); + AST_STRING_FIELD(table); + AST_STRING_FIELD(charset); + AST_STRING_FIELD(language); + ); + DBPROCESS *dbproc; + unsigned int connected:1; +}; AST_MUTEX_DEFINE_STATIC(tds_lock); -static TDSSOCKET *tds; -static TDSLOGIN *login; -static TDSCONTEXT *context; +static struct cdr_tds_config *settings; static char *anti_injection(const char *, int); -static void get_date(char *, struct timeval); +static void get_date(char *, size_t len, struct timeval); static int mssql_connect(void); static int mssql_disconnect(void); static int tds_log(struct ast_cdr *cdr) { - char sqlcmd[2048], start[80], answer[80], end[80]; + char start[80], answer[80], end[80]; char *accountcode, *src, *dst, *dcontext, *clid, *channel, *dstchannel, *lastapp, *lastdata, *uniqueid; - int res = 0; - int retried = 0; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif + RETCODE erc; + int res = -1; + + accountcode = anti_injection(cdr->accountcode, 20); + src = anti_injection(cdr->src, 80); + dst = anti_injection(cdr->dst, 80); + dcontext = anti_injection(cdr->dcontext, 80); + clid = anti_injection(cdr->clid, 80); + channel = anti_injection(cdr->channel, 80); + dstchannel = anti_injection(cdr->dstchannel, 80); + lastapp = anti_injection(cdr->lastapp, 80); + lastdata = anti_injection(cdr->lastdata, 80); + uniqueid = anti_injection(cdr->uniqueid, 32); + + get_date(start, sizeof(start), cdr->start); + get_date(answer, sizeof(answer), cdr->answer); + get_date(end, sizeof(end), cdr->end); ast_mutex_lock(&tds_lock); - memset(sqlcmd, 0, 2048); + /* Ensure that we are connected */ + if (!settings->connected) { + if (mssql_connect()) { + /* Connect failed */ + goto done; + } + } - accountcode = anti_injection(cdr->accountcode, 20); - src = anti_injection(cdr->src, 80); - dst = anti_injection(cdr->dst, 80); - dcontext = anti_injection(cdr->dcontext, 80); - clid = anti_injection(cdr->clid, 80); - channel = anti_injection(cdr->channel, 80); - dstchannel = anti_injection(cdr->dstchannel, 80); - lastapp = anti_injection(cdr->lastapp, 80); - lastdata = anti_injection(cdr->lastdata, 80); - uniqueid = anti_injection(cdr->uniqueid, 32); - - get_date(start, cdr->start); - get_date(answer, cdr->answer); - get_date(end, cdr->end); - - sprintf( - sqlcmd, + erc = dbfcmd(settings->dbproc, "INSERT INTO %s " "(" "accountcode, " @@ -172,7 +176,7 @@ static int tds_log(struct ast_cdr *cdr) "'%s', " /* amaflags */ "'%s'" /* uniqueid */ ")", - table, + settings->table, accountcode, src, dst, @@ -192,27 +196,26 @@ static int tds_log(struct ast_cdr *cdr) uniqueid ); - do { - if (!connected) { - if (mssql_connect()) - ast_log(LOG_ERROR, "Failed to reconnect to SQL database.\n"); - else - ast_log(LOG_WARNING, "Reconnected to SQL database.\n"); + if (erc == FAIL) { + ast_log(LOG_ERROR, "Failed to build INSERT statement, no CDR was logged.\n"); + goto done; + } - retried = 1; /* note that we have now tried */ - } + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Failed to execute INSERT statement, no CDR was logged.\n"); + goto done; + } -#ifdef FREETDS_PRE_0_62 - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Failed to insert Call Data Record into SQL database.\n"); + /* Consume any results we might get back (this is more of a sanity check than + * anything else, since an INSERT shouldn't return results). */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); + } - mssql_disconnect(); /* this is ok even if we are already disconnected */ - } - } while (!connected && !retried); + res = 0; + +done: + ast_mutex_unlock(&tds_lock); ast_free(accountcode); ast_free(src); @@ -225,285 +228,252 @@ static int tds_log(struct ast_cdr *cdr) ast_free(lastdata); ast_free(uniqueid); - ast_mutex_unlock(&tds_lock); - return res; } static char *anti_injection(const char *str, int len) { /* Reference to http://www.nextgenss.com/papers/advanced_sql_injection.pdf */ - char *buf; char *buf_ptr, *srh_ptr; char *known_bad[] = {"select", "insert", "update", "delete", "drop", ";", "--", "\0"}; int idx; - if ((buf = ast_malloc(len + 1)) == NULL) - { - ast_log(LOG_ERROR, "cdr_tds: Out of memory error\n"); + if (!(buf = ast_calloc(1, len + 1))) { + ast_log(LOG_ERROR, "Out of memory\n"); return NULL; } - memset(buf, 0, len); buf_ptr = buf; /* Escape single quotes */ - for (; *str && strlen(buf) < len; str++) - { - if (*str == '\'') + for (; *str && strlen(buf) < len; str++) { + if (*str == '\'') { *buf_ptr++ = '\''; + } *buf_ptr++ = *str; } *buf_ptr = '\0'; /* Erase known bad input */ - for (idx=0; *known_bad[idx]; idx++) - { - while((srh_ptr = strcasestr(buf, known_bad[idx]))) - { - memmove(srh_ptr, srh_ptr+strlen(known_bad[idx]), strlen(srh_ptr+strlen(known_bad[idx]))+1); + for (idx = 0; *known_bad[idx]; idx++) { + while ((srh_ptr = strcasestr(buf, known_bad[idx]))) { + memmove(srh_ptr, srh_ptr + strlen(known_bad[idx]), strlen(srh_ptr + strlen(known_bad[idx])) + 1); } } return buf; } -static void get_date(char *dateField, struct timeval tv) +static void get_date(char *dateField, size_t len, struct timeval tv) { - struct ast_tm tm; - char buf[80]; - /* To make sure we have date variable if not insert null to SQL */ - if (!ast_tvzero(tv)) - { + if (!ast_tvzero(tv)) { + struct ast_tm tm; ast_localtime(&tv, &tm, NULL); - ast_strftime(buf, 80, DATE_FORMAT, &tm); - sprintf(dateField, "'%s'", buf); - } - else - { - strcpy(dateField, "null"); + ast_strftime(dateField, len, "'" DATE_FORMAT "'", &tm); + } else { + ast_copy_string(dateField, "null", len); } } static int mssql_disconnect(void) { - if (tds) { - tds_free_socket(tds); - tds = NULL; + if (settings->dbproc) { + dbclose(settings->dbproc); + settings->dbproc = NULL; } - if (context) { - tds_free_context(context); - context = NULL; - } - - if (login) { - tds_free_login(login); - login = NULL; - } - - connected = 0; + settings->connected = 0; return 0; } static int mssql_connect(void) { -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - TDSCONNECTION *connection = NULL; -#else - TDSCONNECTINFO *connection = NULL; -#endif - char query[128]; - - /* Connect to M$SQL Server */ - if (!(login = tds_alloc_login())) - { - ast_log(LOG_ERROR, "tds_alloc_login() failed.\n"); + LOGINREC *login; + + if ((login = dblogin()) == NULL) { + ast_log(LOG_ERROR, "Unable to allocate login structure for db-lib\n"); return -1; } - - tds_set_server(login, hostname); - tds_set_user(login, dbuser); - tds_set_passwd(login, password); - tds_set_app(login, "TSQL"); - tds_set_library(login, "TDS-Library"); -#ifndef FREETDS_PRE_0_62 - tds_set_client_charset(login, charset); -#endif - tds_set_language(login, language); - tds_set_packet(login, 512); - tds_set_version(login, 7, 0); - -#ifdef FREETDS_0_64 - if (!(context = tds_alloc_context(NULL))) -#else - if (!(context = tds_alloc_context())) -#endif - { - ast_log(LOG_ERROR, "tds_alloc_context() failed.\n"); - goto connect_fail; + + DBSETLAPP(login, "TSQL"); + DBSETLUSER(login, (char *) settings->username); + DBSETLPWD(login, (char *) settings->password); + DBSETLCHARSET(login, (char *) settings->charset); + DBSETLNATLANG(login, (char *) settings->language); + + if ((settings->dbproc = dbopen(login, (char *) settings->hostname)) == NULL) { + ast_log(LOG_ERROR, "Unable to connect to %s\n", settings->hostname); + dbloginfree(login); + return -1; } - if (!(tds = tds_alloc_socket(context, 512))) { - ast_log(LOG_ERROR, "tds_alloc_socket() failed.\n"); - goto connect_fail; + dbloginfree(login); + + if (dbuse(settings->dbproc, (char *) settings->database) == FAIL) { + ast_log(LOG_ERROR, "Unable to select database %s\n", settings->database); + goto failed; } - tds_set_parent(tds, NULL); - connection = tds_read_config_info(tds, login, context->locale); - if (!connection) - { - ast_log(LOG_ERROR, "tds_read_config() failed.\n"); - goto connect_fail; + if (dbfcmd(settings->dbproc, "SELECT 1 FROM [%s]", settings->table) == FAIL) { + ast_log(LOG_ERROR, "Unable to build query while verifying the existence of table '%s'\n", settings->table); + goto failed; } - if (tds_connect(tds, connection) == TDS_FAIL) - { - ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n"); - tds = NULL; /* freed by tds_connect() on error */ -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - goto connect_fail; + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Unable to verify existence of table '%s'\n", settings->table); + goto failed; } -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - - sprintf(query, "USE %s", dbname); -#ifdef FREETDS_PRE_0_62 - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Could not change database (%s)\n", dbname); - goto connect_fail; + + /* Consume the result set (we don't really care about the result, though) */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); } - connected = 1; + settings->connected = 1; + return 0; -connect_fail: - mssql_disconnect(); +failed: + dbclose(settings->dbproc); + settings->dbproc = NULL; return -1; } static int tds_unload_module(void) { - mssql_disconnect(); + if (settings) { + ast_mutex_lock(&tds_lock); + mssql_disconnect(); + ast_mutex_unlock(&tds_lock); + + ast_string_field_free_memory(settings); + ast_free(settings); + } ast_cdr_unregister(name); - if (hostname) ast_free(hostname); - if (dbname) ast_free(dbname); - if (dbuser) ast_free(dbuser); - if (password) ast_free(password); - if (charset) ast_free(charset); - if (language) ast_free(language); - if (table) ast_free(table); + dbexit(); + + return 0; +} + +static int tds_error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) +{ + ast_log(LOG_ERROR, "%s (%d)\n", dberrstr, dberr); + + if (oserr != DBNOERR) { + ast_log(LOG_ERROR, "%s (%d)\n", oserrstr, oserr); + } + + return INT_CANCEL; +} + +static int tds_message_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severity, char *msgtext, char *srvname, char *procname, int line) +{ + ast_debug(1, "Msg %d, Level %d, State %d, Line %d\n", msgno, severity, msgstate, line); + ast_log(LOG_NOTICE, "%s\n", msgtext); return 0; } static int tds_load_module(int reload) { - int res = 0; struct ast_config *cfg; - struct ast_variable *var; const char *ptr = NULL; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif cfg = ast_config_load(config, config_flags); if (!cfg) { - ast_log(LOG_NOTICE, "Unable to load config for MSSQL CDR's: %s\n", config); + ast_log(LOG_NOTICE, "Unable to load TDS config for CDRs: %s\n", config); return 0; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) return 0; - var = ast_variable_browse(cfg, "global"); - if (!var) /* nothing configured */ { + if (!ast_variable_browse(cfg, "global")) { + /* nothing configured */ ast_config_destroy(cfg); return 0; } - + + ast_mutex_lock(&tds_lock); + + /* Clear out any existing settings */ + ast_string_field_init(settings, 0); + ptr = ast_variable_retrieve(cfg, "global", "hostname"); if (ptr) { - if (hostname) - ast_free(hostname); - hostname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database server hostname not specified.\n"); + ast_string_field_set(settings, hostname, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database server hostname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "dbname"); if (ptr) { - if (dbname) - ast_free(dbname); - dbname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbname not specified.\n"); + ast_string_field_set(settings, database, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "user"); if (ptr) { - if (dbuser) - ast_free(dbuser); - dbuser = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbuser not specified.\n"); + ast_string_field_set(settings, username, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbuser not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "password"); if (ptr) { - if (password) - ast_free(password); - password = ast_strdup(ptr); - } else - ast_log(LOG_ERROR,"Database password not specified.\n"); + ast_string_field_set(settings, password, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database password not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "charset"); - if (charset) - ast_free(charset); - if (ptr) - charset = ast_strdup(ptr); - else - charset = ast_strdup("iso_1"); - - if (language) - ast_free(language); + if (ptr) { + ast_string_field_set(settings, charset, ptr); + } else { + ast_string_field_set(settings, charset, "iso_1"); + } + ptr = ast_variable_retrieve(cfg, "global", "language"); - if (ptr) - language = ast_strdup(ptr); - else - language = ast_strdup("us_english"); + if (ptr) { + ast_string_field_set(settings, language, ptr); + } else { + ast_string_field_set(settings, language, "us_english"); + } ptr = ast_variable_retrieve(cfg, "global", "table"); - if (ptr == NULL) { - ast_debug(1, "cdr_tds: table not specified. Assuming cdr\n"); - ptr = "cdr"; + if (ptr) { + ast_string_field_set(settings, table, ptr); + } else { + ast_log(LOG_NOTICE, "Table name not specified, using 'cdr' by default.\n"); + ast_string_field_set(settings, table, "cdr"); + } + + mssql_disconnect(); + + if (mssql_connect()) { + /* We failed to connect (mssql_connect takes care of logging it) */ + goto failed; } - if (table) - ast_free(table); - table = ast_strdup(ptr); + ast_mutex_unlock(&tds_lock); ast_config_destroy(cfg); - ast_mutex_lock(&tds_lock); - mssql_disconnect(); - mssql_connect(); + return 1; + +failed: ast_mutex_unlock(&tds_lock); + ast_config_destroy(cfg); - return res; + return 0; } static int reload(void) @@ -513,9 +483,35 @@ static int reload(void) static int load_module(void) { - if (!tds_load_module(0)) + if (dbinit() == FAIL) { + ast_log(LOG_ERROR, "Failed to initialize FreeTDS db-lib\n"); return AST_MODULE_LOAD_DECLINE; + } + + dberrhandle(tds_error_handler); + dbmsghandle(tds_message_handler); + + settings = ast_calloc(1, sizeof(*settings)); + + if (!settings || ast_string_field_init(settings, 256)) { + if (settings) { + ast_free(settings); + settings = NULL; + } + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + + if (!tds_load_module(0)) { + ast_string_field_free_memory(settings); + ast_free(settings); + settings = NULL; + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + ast_cdr_register(name, ast_module_info->description, tds_log); + return AST_MODULE_LOAD_SUCCESS; } @@ -524,7 +520,7 @@ static int unload_module(void) return tds_unload_module(); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MSSQL CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, diff --git a/configure.ac b/configure.ac index c514e10..8d0b2da 100644 --- a/configure.ac +++ b/configure.ac @@ -1379,34 +1379,7 @@ fi AST_EXT_TOOL_CHECK([GMIME], [gmime]) -AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h]) -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi +AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h]) AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], []) diff --git a/doc/tex/freetds.tex b/doc/tex/freetds.tex index 8dcbec2..8db589f 100644 --- a/doc/tex/freetds.tex +++ b/doc/tex/freetds.tex @@ -1,16 +1,6 @@ -The cdr\_tds module is NOT compatible with version 0.63 of FreeTDS. - -The cdr\_tds module is known to work with FreeTDS version 0.62.1; -it should also work with 0.62.2, 0.62.3 and 0.62.4, which are bug -fix releases. - -The cdr\_tds module uses the raw "libtds" API of FreeTDS. It appears -that from 0.63 onwards, this is not considered a published API -of FreeTDS and is subject to change without notice. - -Between 0.62.x and 0.63 of FreeTDS, many incompatible changes -have been made to the libtds API. - -For newer versions of FreeTDS, it is recommended that you use the -ODBC driver. +The cdr\_tds module now works with most modern release versions of FreeTDS (from +at least 0.60 through 0.82). Although versions of FreeTDS prior to 0.82 will +work, we recommend using the latest available version for performance and +stability reasons. +The latest release of FreeTDS is available from http://www.freetds.org/ diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index b368c8d..3a76722 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1193,9 +1193,6 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 0010-Update-autoconf.patch: --- NEW FILE 0010-Update-autoconf.patch --- >From d8af2026b55ad1c056de5b136340b0e3757a669f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 2 Jul 2008 10:19:36 -0500 Subject: [PATCH] Update autoconf. --- configure | 1094 +++++++++++++++++++++++++++++--------- include/asterisk/autoconfig.h.in | 23 +- 2 files changed, 865 insertions(+), 252 deletions(-) diff --git a/configure b/configure index d72fa38..1dd6af6 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 115581 . +# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -728,14 +728,18 @@ BKTR_LIB BKTR_INCLUDE BKTR_DIR PBX_BKTR -CAP_LIB -CAP_INCLUDE -CAP_DIR -PBX_CAP +BLUETOOTH_LIB +BLUETOOTH_INCLUDE +BLUETOOTH_DIR +PBX_BLUETOOTH CURL_LIB CURL_INCLUDE CURL_DIR PBX_CURL +CAP_LIB +CAP_INCLUDE +CAP_DIR +PBX_CAP CURSES_LIB CURSES_INCLUDE CURSES_DIR @@ -788,6 +792,10 @@ LDAP_LIB LDAP_INCLUDE LDAP_DIR PBX_LDAP +LIBEDIT_LIB +LIBEDIT_INCLUDE +LIBEDIT_DIR +PBX_LIBEDIT LTDL_LIB LTDL_INCLUDE LTDL_DIR @@ -872,6 +880,10 @@ SDL_IMAGE_LIB SDL_IMAGE_INCLUDE SDL_IMAGE_DIR PBX_SDL_IMAGE +SPANDSP_LIB +SPANDSP_INCLUDE +SPANDSP_DIR +PBX_SPANDSP SPEEX_LIB SPEEX_INCLUDE SPEEX_DIR @@ -963,6 +975,7 @@ OPENH323_INCDIR OPENH323_LIBDIR OPENH323_SUFFIX OPENH323_BUILD +PKGCONFIG PBX_SPEEX_PREPROCESS CONFIG_GMIME PBX_ZAPTEL_VLDTMF @@ -976,7 +989,7 @@ PBX_H323 PBX_IXJUSER CONFIG_SDL CONFIG_GTK -PKGCONFIG +LIBEDIT_OBJ CURL_CONFIG LTLIBOBJS' ac_subst_files='' @@ -1576,8 +1589,9 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-asound=PATH use Advanced Linux Sound Architecture files in PATH --with-execinfo=PATH use Stack Backtrace support files in PATH - --with-cap=PATH use POSIX 1.e capabilities files in PATH + --with-bluetooth=PATH use Bluetooth Support files in PATH --with-curl=PATH use cURL files in PATH + --with-cap=PATH use POSIX 1.e capabilities files in PATH --with-curses=PATH use curses files in PATH --with-crypto=PATH use OpenSSL Cryptography support files in PATH --with-avcodec=PATH use Ffmpeg and avcodec library files in PATH @@ -1592,6 +1606,7 @@ Optional Packages: --with-isdnnet=PATH use ISDN4Linux Library files in PATH --with-jack=PATH use Jack Audio Connection Kit files in PATH --with-ldap=PATH use OpenLDAP files in PATH + --with-libedit=PATH use NetBSD Editline library files in PATH --with-ltdl=PATH use libtool files in PATH --with-lua=PATH use Lua files in PATH --with-misdn=PATH use mISDN User Library files in PATH @@ -1613,6 +1628,7 @@ Optional Packages: --with-radius=PATH use Radius Client files in PATH --with-sdl=PATH use Sdl files in PATH --with-SDL_image=PATH use Sdl Image library files in PATH + --with-spandsp=PATH use spandsp Library files in PATH --with-speex=PATH use Speex files in PATH --with-speexdsp=PATH use Speexdsp files in PATH --with-sqlite=PATH use SQLite files in PATH @@ -7942,6 +7958,62 @@ fi + BLUETOOTH_DESCRIP="Bluetooth Support" + BLUETOOTH_OPTION="bluetooth" + +# Check whether --with-bluetooth was given. +if test "${with_bluetooth+set}" = set; then + withval=$with_bluetooth; + case ${withval} in + n|no) + USE_BLUETOOTH=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + *) + BLUETOOTH_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + esac + +fi + + PBX_BLUETOOTH=0 + + + + + + + CURL_DESCRIP="cURL" + CURL_OPTION="curl" + +# Check whether --with-curl was given. +if test "${with_curl+set}" = set; then + withval=$with_curl; + case ${withval} in + n|no) + USE_CURL=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + *) + CURL_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + esac + +fi + + PBX_CURL=0 + + + + + + CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" @@ -8362,6 +8434,34 @@ fi + LIBEDIT_DESCRIP="NetBSD Editline library" + LIBEDIT_OPTION="libedit" + +# Check whether --with-libedit was given. +if test "${with_libedit+set}" = set; then + withval=$with_libedit; + case ${withval} in + n|no) + USE_LIBEDIT=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + *) + LIBEDIT_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + esac + +fi + + PBX_LIBEDIT=0 + + + + + + LTDL_DESCRIP="libtool" LTDL_OPTION="ltdl" @@ -8950,6 +9050,34 @@ fi + SPANDSP_DESCRIP="spandsp Library" + SPANDSP_OPTION="spandsp" + +# Check whether --with-spandsp was given. +if test "${with_spandsp+set}" = set; then + withval=$with_spandsp; + case ${withval} in + n|no) + USE_SPANDSP=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + *) + SPANDSP_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + esac + +fi + + PBX_SPANDSP=0 + + + + + + SPEEX_DESCRIP="Speex" SPEEX_OPTION="speex" @@ -12772,13 +12900,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12818,13 +12944,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18333,6 +18457,268 @@ fi +if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then + pbxlibdir="" + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + if test -d ${BLUETOOTH_DIR}/lib; then + pbxlibdir="-L${BLUETOOTH_DIR}/lib" + else + pbxlibdir="-L${BLUETOOTH_DIR}" + fi + fi + pbxfuncname="ba2str" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_BLUETOOTH_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lbluetooth" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lbluetooth... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbluetooth ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_BLUETOOTH_FOUND=yes +else + AST_BLUETOOTH_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_BLUETOOTH_FOUND}" = "yes"; then + BLUETOOTH_LIB="${pbxlibdir} -lbluetooth " + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include" + fi + BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} " + if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found + BLUETOOTH_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE} " + if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } + +fi +if test $ac_cv_header_bluetooth_bluetooth_h = yes; then + BLUETOOTH_HEADER_FOUND=1 +else + BLUETOOTH_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then + BLUETOOTH_LIB="" + BLUETOOTH_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + BLUETOOTH_LIB="" + fi + PBX_BLUETOOTH=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH_VERSION +_ACEOF + + fi + fi +fi + + + if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="" # if --with-CURSES=DIR has been specified, use it. @@ -41087,31 +41473,137 @@ _ACEOF fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" +PBX_LUA=0 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + -if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LUA 1 +_ACEOF + +fi + + +if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="" - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - if test -d ${LUA_DIR}/lib; then - pbxlibdir="-L${LUA_DIR}/lib" + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + if test -d ${RADIUS_DIR}/lib; then + pbxlibdir="-L${RADIUS_DIR}/lib" else - pbxlibdir="-L${LUA_DIR}" + pbxlibdir="-L${RADIUS_DIR}" fi fi - pbxfuncname="luaL_newstate" + pbxfuncname="rc_read_config" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes + AST_RADIUS_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llua5.1 ${pbxlibdir} $LIBS" +LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41168,38 +41660,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_LUA_FOUND=yes + AST_RADIUS_FOUND=yes else - AST_LUA_FOUND=no + AST_RADIUS_FOUND=no fi fi # now check for the header. - if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua5.1 " - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - LUA_INCLUDE="-I${LUA_DIR}/include" - fi - LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua5.1/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" + if test "${AST_RADIUS_FOUND}" = "yes"; then + RADIUS_LIB="${pbxlibdir} -lradiusclient-ng " + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + RADIUS_INCLUDE="-I${RADIUS_DIR}/include" + fi + RADIUS_INCLUDE="${RADIUS_INCLUDE} " + if test "xradiusclient-ng.h" = "x" ; then # no header, assume found + RADIUS_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE} " - if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then + CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE} " + if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h usability" >&5 -echo $ECHO_N "checking lua5.1/lua.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 +echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41207,7 +41699,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41239,15 +41731,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h presence" >&5 -echo $ECHO_N "checking lua5.1/lua.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 +echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -41280,25 +41772,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -41307,43 +41799,43 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_lua5_1_lua_h=$ac_header_preproc + ac_cv_header_radiusclient_ng_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } fi -if test $ac_cv_header_lua5_1_lua_h = yes; then - LUA_HEADER_FOUND=1 +if test $ac_cv_header_radiusclient_ng_h = yes; then + RADIUS_HEADER_FOUND=1 else - LUA_HEADER_FOUND=0 + RADIUS_HEADER_FOUND=0 fi CPPFLAGS="${saved_cppflags}" fi - if test "x${LUA_HEADER_FOUND}" = "x0" ; then - LUA_LIB="" - LUA_INCLUDE="" + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then + RADIUS_LIB="" + RADIUS_INCLUDE="" else if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" + RADIUS_LIB="" fi - PBX_LUA=1 + PBX_RADIUS=1 # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED cat >>confdefs.h <<_ACEOF -#define HAVE_LUA 1 +#define HAVE_RADIUS 1 _ACEOF cat >>confdefs.h <<_ACEOF -#define HAVE_LUA_VERSION +#define HAVE_RADIUS_VERSION _ACEOF fi @@ -41352,28 +41844,28 @@ fi -if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then +if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then pbxlibdir="" - # if --with-RADIUS=DIR has been specified, use it. - if test "x${RADIUS_DIR}" != "x"; then - if test -d ${RADIUS_DIR}/lib; then - pbxlibdir="-L${RADIUS_DIR}/lib" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + if test -d ${SPANDSP_DIR}/lib; then + pbxlibdir="-L${SPANDSP_DIR}/lib" else - pbxlibdir="-L${RADIUS_DIR}" + pbxlibdir="-L${SPANDSP_DIR}" fi fi - pbxfuncname="rc_read_config" + pbxfuncname="fax_init" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RADIUS_FOUND=yes + AST_SPANDSP_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" +LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41430,38 +41922,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_RADIUS_FOUND=yes + AST_SPANDSP_FOUND=yes else - AST_RADIUS_FOUND=no + AST_SPANDSP_FOUND=no fi fi # now check for the header. - if test "${AST_RADIUS_FOUND}" = "yes"; then - RADIUS_LIB="${pbxlibdir} -lradiusclient-ng " - # if --with-RADIUS=DIR has been specified, use it. - if test "x${RADIUS_DIR}" != "x"; then - RADIUS_INCLUDE="-I${RADIUS_DIR}/include" - fi - RADIUS_INCLUDE="${RADIUS_INCLUDE} " - if test "xradiusclient-ng.h" = "x" ; then # no header, assume found - RADIUS_HEADER_FOUND="1" + if test "${AST_SPANDSP_FOUND}" = "yes"; then + SPANDSP_LIB="${pbxlibdir} -lspandsp -ltiff" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" + fi + SPANDSP_INCLUDE="${SPANDSP_INCLUDE} " + if test "xspandsp.h" = "x" ; then # no header, assume found + SPANDSP_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE} " - if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then - { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE} " + if test "${ac_cv_header_spandsp_h+set}" = set; then + { echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 -echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5 +echo $ECHO_N "checking spandsp.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41469,7 +41961,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41501,15 +41993,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 -echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking spandsp.h presence" >&5 +echo $ECHO_N "checking spandsp.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -41542,25 +42034,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: spandsp.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -41569,43 +42061,43 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_radiusclient_ng_h=$ac_header_preproc + ac_cv_header_spandsp_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } fi -if test $ac_cv_header_radiusclient_ng_h = yes; then - RADIUS_HEADER_FOUND=1 +if test $ac_cv_header_spandsp_h = yes; then + SPANDSP_HEADER_FOUND=1 else - RADIUS_HEADER_FOUND=0 + SPANDSP_HEADER_FOUND=0 fi CPPFLAGS="${saved_cppflags}" fi - if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then - RADIUS_LIB="" - RADIUS_INCLUDE="" + if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then + SPANDSP_LIB="" + SPANDSP_INCLUDE="" else if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RADIUS_LIB="" + SPANDSP_LIB="" fi - PBX_RADIUS=1 + PBX_SPANDSP=1 # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED cat >>confdefs.h <<_ACEOF -#define HAVE_RADIUS 1 +#define HAVE_SPANDSP 1 _ACEOF cat >>confdefs.h <<_ACEOF -#define HAVE_RADIUS_VERSION +#define HAVE_SPANDSP_VERSION _ACEOF fi @@ -43914,18 +44406,18 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then pbxlibdir="-L${FREETDS_DIR}" fi fi - pbxfuncname="tds_version" + pbxfuncname="dbinit" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_FREETDS_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_tds_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltds" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ltds... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsybdb" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lsybdb... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ltds ${pbxlibdir} $LIBS" +LIBS="-lsybdb ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43991,29 +44483,29 @@ fi # now check for the header. if test "${AST_FREETDS_FOUND}" = "yes"; then - FREETDS_LIB="${pbxlibdir} -ltds " + FREETDS_LIB="${pbxlibdir} -lsybdb " # if --with-FREETDS=DIR has been specified, use it. if test "x${FREETDS_DIR}" != "x"; then FREETDS_INCLUDE="-I${FREETDS_DIR}/include" fi FREETDS_INCLUDE="${FREETDS_INCLUDE} " - if test "xtds.h" = "x" ; then # no header, assume found + if test "xsybdb.h" = "x" ; then # no header, assume found FREETDS_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE} " - if test "${ac_cv_header_tds_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then + if test "${ac_cv_header_sybdb_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking tds.h usability" >&5 -echo $ECHO_N "checking tds.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h usability" >&5 +echo $ECHO_N "checking sybdb.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44021,7 +44513,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -44053,15 +44545,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking tds.h presence" >&5 -echo $ECHO_N "checking tds.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h presence" >&5 +echo $ECHO_N "checking sybdb.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -44094,25 +44586,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tds.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tds.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tds.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tds.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tds.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sybdb.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sybdb.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sybdb.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sybdb.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -44121,18 +44613,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_tds_h=$ac_header_preproc + ac_cv_header_sybdb_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } fi -if test $ac_cv_header_tds_h = yes; then +if test $ac_cv_header_sybdb_h = yes; then FREETDS_HEADER_FOUND=1 else FREETDS_HEADER_FOUND=0 @@ -44164,33 +44656,6 @@ _ACEOF fi fi -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then @@ -49918,6 +50383,126 @@ fi +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBEDIT 1 +_ACEOF + + fi + fi +fi + + + + + if test "${USE_CURL}" != "no"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args. @@ -50892,14 +51477,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim BKTR_DIR!$BKTR_DIR$ac_delim PBX_BKTR!$PBX_BKTR$ac_delim -CAP_LIB!$CAP_LIB$ac_delim -CAP_INCLUDE!$CAP_INCLUDE$ac_delim -CAP_DIR!$CAP_DIR$ac_delim -PBX_CAP!$PBX_CAP$ac_delim +BLUETOOTH_LIB!$BLUETOOTH_LIB$ac_delim +BLUETOOTH_INCLUDE!$BLUETOOTH_INCLUDE$ac_delim +BLUETOOTH_DIR!$BLUETOOTH_DIR$ac_delim +PBX_BLUETOOTH!$PBX_BLUETOOTH$ac_delim CURL_LIB!$CURL_LIB$ac_delim CURL_INCLUDE!$CURL_INCLUDE$ac_delim CURL_DIR!$CURL_DIR$ac_delim PBX_CURL!$PBX_CURL$ac_delim +CAP_LIB!$CAP_LIB$ac_delim +CAP_INCLUDE!$CAP_INCLUDE$ac_delim +CAP_DIR!$CAP_DIR$ac_delim +PBX_CAP!$PBX_CAP$ac_delim CURSES_LIB!$CURSES_LIB$ac_delim CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim CURSES_DIR!$CURSES_DIR$ac_delim @@ -50952,6 +51541,10 @@ LDAP_LIB!$LDAP_LIB$ac_delim LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim LDAP_DIR!$LDAP_DIR$ac_delim PBX_LDAP!$PBX_LDAP$ac_delim +LIBEDIT_LIB!$LIBEDIT_LIB$ac_delim +LIBEDIT_INCLUDE!$LIBEDIT_INCLUDE$ac_delim +LIBEDIT_DIR!$LIBEDIT_DIR$ac_delim +PBX_LIBEDIT!$PBX_LIBEDIT$ac_delim LTDL_LIB!$LTDL_LIB$ac_delim LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim LTDL_DIR!$LTDL_DIR$ac_delim @@ -50969,14 +51562,6 @@ NBS_INCLUDE!$NBS_INCLUDE$ac_delim NBS_DIR!$NBS_DIR$ac_delim PBX_NBS!$PBX_NBS$ac_delim NCURSES_LIB!$NCURSES_LIB$ac_delim -NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim -NCURSES_DIR!$NCURSES_DIR$ac_delim -PBX_NCURSES!$PBX_NCURSES$ac_delim -NETSNMP_LIB!$NETSNMP_LIB$ac_delim -NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim -NETSNMP_DIR!$NETSNMP_DIR$ac_delim -PBX_NETSNMP!$PBX_NETSNMP$ac_delim -NEWT_LIB!$NEWT_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51018,6 +51603,14 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim +NCURSES_DIR!$NCURSES_DIR$ac_delim +PBX_NCURSES!$PBX_NCURSES$ac_delim +NETSNMP_LIB!$NETSNMP_LIB$ac_delim +NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim +NETSNMP_DIR!$NETSNMP_DIR$ac_delim +PBX_NETSNMP!$PBX_NETSNMP$ac_delim +NEWT_LIB!$NEWT_LIB$ac_delim NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim NEWT_DIR!$NEWT_DIR$ac_delim PBX_NEWT!$PBX_NEWT$ac_delim @@ -51077,6 +51670,10 @@ SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim +SPANDSP_LIB!$SPANDSP_LIB$ac_delim +SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim +SPANDSP_DIR!$SPANDSP_DIR$ac_delim +PBX_SPANDSP!$PBX_SPANDSP$ac_delim SPEEX_LIB!$SPEEX_LIB$ac_delim SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim SPEEX_DIR!$SPEEX_DIR$ac_delim @@ -51103,18 +51700,6 @@ OPENSSL_DIR!$OPENSSL_DIR$ac_delim PBX_OPENSSL!$PBX_OPENSSL$ac_delim FREETDS_LIB!$FREETDS_LIB$ac_delim FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim -FREETDS_DIR!$FREETDS_DIR$ac_delim -PBX_FREETDS!$PBX_FREETDS$ac_delim -TERMCAP_LIB!$TERMCAP_LIB$ac_delim -TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim -TERMCAP_DIR!$TERMCAP_DIR$ac_delim -PBX_TERMCAP!$PBX_TERMCAP$ac_delim -TINFO_LIB!$TINFO_LIB$ac_delim -TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim -TINFO_DIR!$TINFO_DIR$ac_delim -PBX_TINFO!$PBX_TINFO$ac_delim -TONEZONE_LIB!$TONEZONE_LIB$ac_delim -TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51156,6 +51741,18 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +FREETDS_DIR!$FREETDS_DIR$ac_delim +PBX_FREETDS!$PBX_FREETDS$ac_delim +TERMCAP_LIB!$TERMCAP_LIB$ac_delim +TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim +TERMCAP_DIR!$TERMCAP_DIR$ac_delim +PBX_TERMCAP!$PBX_TERMCAP$ac_delim +TINFO_LIB!$TINFO_LIB$ac_delim +TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim +TINFO_DIR!$TINFO_DIR$ac_delim +PBX_TINFO!$PBX_TINFO$ac_delim +TONEZONE_LIB!$TONEZONE_LIB$ac_delim +TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim TONEZONE_DIR!$TONEZONE_DIR$ac_delim PBX_TONEZONE!$PBX_TONEZONE$ac_delim USB_LIB!$USB_LIB$ac_delim @@ -51209,6 +51806,7 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim OPENH323_BUILD!$OPENH323_BUILD$ac_delim +PKGCONFIG!$PKGCONFIG$ac_delim PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim CONFIG_GMIME!$CONFIG_GMIME$ac_delim PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim @@ -51222,12 +51820,12 @@ PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim +LIBEDIT_OBJ!$LIBEDIT_OBJ$ac_delim CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 3a76722..07deb31 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -116,6 +116,12 @@ /* Define to indicate the ${BKTR_DESCRIP} library version */ #undef HAVE_BKTR_VERSION +/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */ +#undef HAVE_BLUETOOTH + +/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */ +#undef HAVE_BLUETOOTH_VERSION + /* Define to 1 if byteswap.h macros are available. */ #undef HAVE_BYTESWAP_H @@ -385,6 +391,9 @@ /* Define to indicate the ${LDAP_DESCRIP} library version */ #undef HAVE_LDAP_VERSION +/* Define if your system has the NetBSD Editline libraries. */ +#undef HAVE_LIBEDIT + /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -442,12 +451,9 @@ /* Define to indicate the ${LTDL_DESCRIP} library version */ #undef HAVE_LTDL_VERSION -/* Define this to indicate the ${LUA_DESCRIP} library */ +/* Define if your system has the LUA libraries. */ #undef HAVE_LUA -/* Define to indicate the ${LUA_DESCRIP} library version */ -#undef HAVE_LUA_VERSION - /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -715,6 +721,12 @@ /* Define to 1 if your system has soxmix application. */ #undef HAVE_SOXMIX +/* Define this to indicate the ${SPANDSP_DESCRIP} library */ +#undef HAVE_SPANDSP + +/* Define to indicate the ${SPANDSP_DESCRIP} library version */ +#undef HAVE_SPANDSP_VERSION + /* Define this to indicate the ${SPEEX_DESCRIP} library */ #undef HAVE_SPEEX @@ -1193,6 +1205,9 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 --- asterisk-1.6.0-beta9-alternate-extensions.patch DELETED --- --- asterisk-1.6.0-beta9-alternate-voicemail.patch DELETED --- --- asterisk-1.6.0-beta9-appconference.patch DELETED --- --- asterisk-1.6.0-beta9-autoconf.patch DELETED --- --- asterisk-1.6.0-beta9-chanmobile.patch DELETED --- --- asterisk-1.6.0-beta9-editline.patch DELETED --- --- asterisk-1.6.0-beta9-initscripts.patch DELETED --- --- asterisk-1.6.0-beta9-lua.patch DELETED --- --- asterisk-1.6.0-beta9-optimization.patch DELETED --- --- asterisk-1.6.0-beta9-spandspfax.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 16:16:54 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 2 Jul 2008 16:16:54 GMT Subject: rpms/liferea/devel liferea-1.4.16b-configure.patch, NONE, 1.1 liferea.spec, 1.115, 1.116 Message-ID: <200807021616.m62GGsj8004315@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4265 Modified Files: liferea.spec Added Files: liferea-1.4.16b-configure.patch Log Message: New upstream release with xulrunner-1.9 final liferea-1.4.16b-configure.patch: --- NEW FILE liferea-1.4.16b-configure.patch --- diff -crB liferea-1.4.16b/configure liferea-1.4.16b-fedora/configure *** liferea-1.4.16b/configure 2008-06-11 18:14:17.000000000 -0400 --- liferea-1.4.16b-fedora/configure 2008-07-02 11:00:02.000000000 -0400 *************** *** 1619,1625 **** --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support --- 1619,1625 ---- --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox", "xulrunner-1.9" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support *************** *** 25207,25365 **** gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_LIBS"; then - pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried fi - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 ! { echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6; } ! enable_mozilla=no ! elif test $pkg_failed = untried; then ! enable_mozilla=no ! else ! MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS ! MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } ! enable_mozilla=yes ! fi ! fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_LIBS"; then - pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - - - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - enable_mozilla=no - elif test $pkg_failed = untried; then - enable_mozilla=no - else - MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS - MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - enable_mozilla=yes - fi fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } --- 25207,25245 ---- gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi + #change begin + if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then + gecko_provider=xulrunner-1.9 + gecko_provider_gtkmozembed=libxul-embedding fi ! #change end ! if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } + #change begins + + fi + + if test "x$gecko_provider" != "x"; then + if test "$gecko_provider_gtkmozembed" = "x"; then + gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed + fi + + #change ends + pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } *************** *** 25369,25380 **** pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25249,25260 ---- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider_gtkmozembed" nspr 2>/dev/null` else pkg_failed=yes fi *************** *** 25387,25398 **** pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25267,25278 ---- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider_gtkmozembed" 2>/dev/null` else pkg_failed=yes fi *************** *** 25411,25419 **** _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 --- 25291,25299 ---- _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 *************** *** 25914,25922 **** ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ --- 25794,25802 ---- ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ Only in liferea-1.4.16b-fedora: configure~ diff -crB liferea-1.4.16b/configure.ac liferea-1.4.16b-fedora/configure.ac *** liferea-1.4.16b/configure.ac 2008-06-11 18:08:41.000000000 -0400 --- liferea-1.4.16b-fedora/configure.ac 2008-07-01 22:35:58.000000000 -0400 *************** *** 36,42 **** AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) --- 36,42 ---- AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox", "xulrunner-1.9" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) *************** *** 44,51 **** AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=no ! AC_MSG_RESULT([yes -> disabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) --- 44,51 ---- AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=yes ! AC_MSG_RESULT([yes -> enabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) *************** *** 227,244 **** if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey ! AC_MSG_CHECKING([for Gecko provider $gecko_provider]) ! PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") --- 227,251 ---- if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla fi + + if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then + gecko_provider=xulrunner-1.9 + gecko_provider_gtkmozembed=libxul-embedding + fi + if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey ! fi ! ! if test "x$gecko_provider" != "x"; then ! if test "$gecko_provider_gtkmozembed" = "x"; then ! gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed ! fi ! PKG_CHECK_MODULES(MOZILLA, $gecko_provider_gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") *************** *** 258,266 **** dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ --- 265,273 ---- dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ Index: liferea.spec =================================================================== RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- liferea.spec 27 Jun 2008 21:15:46 -0000 1.115 +++ liferea.spec 2 Jul 2008 16:15:47 -0000 1.116 @@ -2,7 +2,7 @@ Name: liferea Version: 1.4.16b -Release: 3%{?dist} +Release: 5%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -10,6 +10,7 @@ URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-fedorafeed.patch +Patch1: %{name}-%{version}-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GConf2-devel @@ -41,10 +42,11 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .fedorafeed +%patch1 -p1 -b .xulrunner-configure + %build -%configure --disable-schemas-install --disable-gtkhtml2 \ - --disable-lua --enable-gecko=xulrunner-1.9 +%configure --disable-schemas-install --disable-gtkhtml2 --disable-lua --enable-gecko=xulrunner-1.9 --disable-xulrunner find . -name "Makefile" | xargs sed -i 's!-I/usr/include/xulrunner-sdk-1.9/stable!-I/usr/include/xulrunner-sdk-1.9/stable -I/usr/include/xulrunner-sdk-1.9/ -I/usr/include/xulrunner-sdk-1.9/gtkembedmoz/ -I/usr/include/xulrunner-sdk-1.9/xpcom -I /usr/include/xulrunner-sdk-1.9/necko/ -I/usr/include/xulrunner-sdk-1.9/dom/ -I/usr/include/nspr4/!g' @@ -54,6 +56,7 @@ %install rm -rf ${RPM_BUILD_ROOT} make install DESTDIR=${RPM_BUILD_ROOT} + %find_lang %{name} find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' # Remove *.in files. @@ -63,11 +66,9 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop - %clean rm -rf ${RPM_BUILD_ROOT} - %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -114,13 +115,16 @@ %changelog -* Fri Jun 27 2008 Steven Parrish - 1.4.16b +* Wed Jul 02 2008 Steven Parrish - 1.4.16b-5 +- corrected multiple segfaults. Fixes Bug #453233 + +* Fri Jun 27 2008 Steven Parrish - 1.4.16b-4 - removed uneeded patch files -* Fri Jun 27 2008 Steven Parrish - 1.4.16b +* Fri Jun 27 2008 Steven Parrish - 1.4.16b-43 - Cleaned up spec file and removed support for firefox-devel -* Thu Jun 26 2008 Steven Parrish - 1.4.16b +* Thu Jun 26 2008 Steven Parrish - 1.4.16b-1 - New upstream release * Wed Jun 25 2008 Tomas Mraz - 1.4.15-6 From fedora-extras-commits at redhat.com Wed Jul 2 16:20:51 2008 From: fedora-extras-commits at redhat.com (Omair Majid (omajid)) Date: Wed, 2 Jul 2008 16:20:51 GMT Subject: rpms/libmatthew-java/F-9 jpackage_compliance.patch, 1.1, 1.2 libmatthew-java.spec, 1.1, 1.2 Message-ID: <200807021620.m62GKpAD004498@cvs-int.fedora.redhat.com> Author: omajid Update of /cvs/pkgs/rpms/libmatthew-java/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443 Modified Files: jpackage_compliance.patch libmatthew-java.spec Log Message: fixed hardcoded paths for jni libraries jpackage_compliance.patch: Index: jpackage_compliance.patch =================================================================== RCS file: /cvs/pkgs/rpms/libmatthew-java/F-9/jpackage_compliance.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jpackage_compliance.patch 27 Jun 2008 20:01:53 -0000 1.1 +++ jpackage_compliance.patch 2 Jul 2008 16:20:02 -0000 1.2 @@ -31,7 +31,7 @@ private native void setenv(String var, String value); { - System.loadLibrary("cgi-java"); -+ System.load("/usr/lib/libmatthew-java/libcgi-java.so"); ++ System.load("@JNIPATH@/" + System.mapLibraryName("cgi-java") ); } /** @@ -44,7 +44,7 @@ public class UnixServerSocket { - static { System.loadLibrary("unix-java"); } -+ static { System.load("/usr/lib/libmatthew-java/libunix-java.so"); } ++ static { System.load("@JNIPATH@/" + System.mapLibraryName("unix-java")); } private native int native_bind(String address, boolean abs) throws IOException; private native void native_close(int sock) throws IOException; private native int native_accept(int sock) throws IOException; @@ -57,7 +57,7 @@ public class UnixSocket { - static { System.loadLibrary("unix-java"); } -+ static { System.load("/usr/lib/libmatthew-java/libunix-java.so"); } ++ static { System.load("@JNIPATH@/" + System.mapLibraryName("unix-java") ); } private native void native_set_pass_cred(int sock, boolean passcred) throws IOException; private native int native_connect(String address, boolean abs) throws IOException; private native void native_close(int sock) throws IOException; Index: libmatthew-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/libmatthew-java/F-9/libmatthew-java.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmatthew-java.spec 27 Jun 2008 20:01:53 -0000 1.1 +++ libmatthew-java.spec 2 Jul 2008 16:20:02 -0000 1.2 @@ -2,7 +2,7 @@ Name: libmatthew-java Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A few useful Java libraries Group: Development/Libraries License: LGPLv2 @@ -73,7 +73,11 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 + +# this patch adds a system dependent path, so we fix it before +# applying the patch +sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH2} | patch -p1 + %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -133,9 +137,13 @@ %files javadoc +%defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog +* Wed Jul 2 2008 Omair Majid 0.7.1-2 +- Fixed hardcoded paths for jni libraries + * Wed Jun 25 2008 Omair Majid 0.7.1-1.fc9 - Initial build for fedora From fedora-extras-commits at redhat.com Wed Jul 2 16:23:51 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 2 Jul 2008 16:23:51 GMT Subject: rpms/evolution-rss/F-9 evolution-rss-0.0.8-empty-desc.patch, 1.1, NONE evolution-rss-0.0.8-norss-enabled.patch, 1.1, NONE evolution-rss-0.0.8-norss-popup.patch, 1.2, NONE evolution-rss-0.0.8-xulrunner.patch, 1.1, NONE Message-ID: <200807021623.m62GNpmE004688@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4677 Removed Files: evolution-rss-0.0.8-empty-desc.patch evolution-rss-0.0.8-norss-enabled.patch evolution-rss-0.0.8-norss-popup.patch evolution-rss-0.0.8-xulrunner.patch Log Message: update to 0.1.0 release --- evolution-rss-0.0.8-empty-desc.patch DELETED --- --- evolution-rss-0.0.8-norss-enabled.patch DELETED --- --- evolution-rss-0.0.8-norss-popup.patch DELETED --- --- evolution-rss-0.0.8-xulrunner.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 16:30:24 2008 From: fedora-extras-commits at redhat.com (Guido Ledermann (guidoledermann)) Date: Wed, 2 Jul 2008 16:30:24 GMT Subject: rpms/multiget/devel MultiGet.png, NONE, 1.1 import.log, NONE, 1.1 multiget-1.2-fix-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 multiget.desktop, 1.1, 1.2 multiget.spec, 1.2, 1.3 sources, 1.2, 1.3 multiget-1.1.4-makefile.patch, 1.1, NONE Message-ID: <200807021630.m62GUONk005292@cvs-int.fedora.redhat.com> Author: guidoledermann Update of /cvs/pkgs/rpms/multiget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5066/devel Modified Files: .cvsignore multiget.desktop multiget.spec sources Added Files: MultiGet.png import.log multiget-1.2-fix-gcc43.patch Removed Files: multiget-1.1.4-makefile.patch Log Message: --- NEW FILE import.log --- multiget-1_2_0-3_fc9:HEAD:multiget-1.2.0-3.fc9.src.rpm:1215016066 multiget-1.2-fix-gcc43.patch: --- NEW FILE multiget-1.2-fix-gcc43.patch --- diff -dur multiget.orig/src/batch.cpp multiget/src/batch.cpp --- multiget.orig/src/batch.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/batch.cpp 2008-06-04 20:17:12.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #include "batch.h" #include "common.h" #include diff -dur multiget.orig/src/common.cpp multiget/src/common.cpp --- multiget.orig/src/common.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/common.cpp 2008-06-04 20:17:10.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #include "common.h" #include "speedctrl.h" #include "mirroradmin.h" diff -dur multiget.orig/src/mgftpbase.cpp multiget/src/mgftpbase.cpp --- multiget.orig/src/mgftpbase.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/mgftpbase.cpp 2008-06-04 20:17:08.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #ifdef WIN32 #include #endif diff -dur multiget.orig/src/mgurlparser.cpp multiget/src/mgurlparser.cpp --- multiget.orig/src/mgurlparser.cpp 2007-01-29 04:51:58.000000000 +0100 +++ multiget/src/mgurlparser.cpp 2008-06-04 20:17:13.000000000 +0200 @@ -22,6 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include +#include #include "mgurlparser.h" #include "common.h" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/multiget/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Mar 2007 02:40:56 -0000 1.2 +++ .cvsignore 2 Jul 2008 16:29:33 -0000 1.3 @@ -1 +1 @@ -multiget-1.1.4.src.tar.gz +multiget-1.2.0.src.tar.bz2 Index: multiget.desktop =================================================================== RCS file: /cvs/pkgs/rpms/multiget/devel/multiget.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multiget.desktop 22 Mar 2007 02:40:56 -0000 1.1 +++ multiget.desktop 2 Jul 2008 16:29:33 -0000 1.2 @@ -1,10 +1,12 @@ [Desktop Entry] +Version=1.0 Encoding=UTF-8 Name=MultiGet GenericName=MultiGet file downloader Comment=File downloader -Exec=MultiGet +Exec=multiget Icon=MultiGet.png Terminal=false Type=Application Categories=GTK;GNOME;Network;FileTransfer; +GenericName[de_DE]=MultiGet file downloader Index: multiget.spec =================================================================== RCS file: /cvs/pkgs/rpms/multiget/devel/multiget.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multiget.spec 18 Feb 2008 19:15:06 -0000 1.2 +++ multiget.spec 2 Jul 2008 16:29:33 -0000 1.3 @@ -1,18 +1,21 @@ Name: multiget -Version: 1.1.4 -Release: 8%{?dist} +Version: 1.2.0 +Release: 3%{?dist} Summary: An easy-to-use GUI file downloader Group: Applications/Internet -License: GPL +License: GPLv2 URL: http://multiget.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.bz2 Source1: multiget.desktop Source2: COPYING -Patch0: multiget-1.1.4-makefile.patch +# There is no symbol for multiget provided in 1.2.0 like it has been in 1.1.4 +# so I decided to use the one from 1.1.4. +Source3: MultiGet.png +Patch0: multiget-1.2-fix-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel desktop-file-utils >= 0.9 +BuildRequires: wxGTK-devel desktop-file-utils >= 0.9 perl(XML::Parser) libglade2-devel automake >= 1.10 %description MultiGet is an easy-to-use GUI file downloader. @@ -24,18 +27,31 @@ http proxy. %prep -%setup -q +%setup -qn multiget %patch0 -p1 -b .good -# Fix script-without-shebangs in debuginfo package -chmod 644 src/icons/*.xpm -chmod 644 src/newicons/16/*.xpm -chmod 644 src/newicons/24/*.xpm -chmod 644 src/newicons/32/*.xpm -chmod 644 src/newicons/48/*.xpm -cp %{SOURCE2} %{_builddir}/%{name}-%{version}/ +chmod 644 icons/*.xpm + +# fix dead symbolic links +rm -f INSTALL +ln -s %{_datadir}/automake-1.10/INSTALL INSTALL +rm -f install-sh +ln -s %{_datadir}/automake-1.10/install-sh install-sh +rm -f depcomp +ln -s %{_datadir}/automake-1.10/depcomp depcomp +rm -f missing +ln -s %{_datadir}/automake-1.10/missing missing +rm -f %{_builddir}/%{name}/COPYING +cp -p %{SOURCE2} %{_builddir}/%{name}/ + +chmod 644 icons/*.xpm +chmod 644 newicons/16/*.xpm +chmod 644 newicons/24/*.xpm +chmod 644 newicons/32/*.xpm +chmod 644 newicons/48/*.xpm + %build -cd src/ +%configure make %{?_smp_mflags} %install @@ -44,26 +60,30 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -install -m 755 src/MultiGet $RPM_BUILD_ROOT/%{_bindir} -install -p -m 644 MultiGet.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +install -p -m 755 src/multiget $RPM_BUILD_ROOT/%{_bindir} +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%doc changelog.txt readme_en.txt COPYING -%{_bindir}/MultiGet +%doc COPYING +%{_bindir}/multiget %{_datadir}/applications/fedora-multiget.desktop %{_datadir}/pixmaps/MultiGet.png %changelog +* Thu Jun 12 2008 Guido Ledermann - 1.2.0-3 +- remove patch for Makefile.in, fixed spec to follow Packaging Guidelines +* Thu Jun 12 2008 Guido Ledermann - 1.2.0-2 +- remove patch for Makefile and added patch for Makefile.ini, fixed spec +* Thu Jun 05 2008 Guido Ledermann - 1.2.0-1 +- Fixed for 1.2.0 * Mon Feb 18 2008 Fedora Release Engineering - 1.1.4-8 - Autorebuild for GCC 4.3 - * Sun Mar 14 2007 Allisson Azevedo 1.1.4-7 - Change patch * Sun Mar 14 2007 Allisson Azevedo 1.1.4-6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/multiget/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Mar 2007 02:40:56 -0000 1.2 +++ sources 2 Jul 2008 16:29:33 -0000 1.3 @@ -1 +1 @@ -afb1de0ccf51a0255960c437e03e83a5 multiget-1.1.4.src.tar.gz +b62c4017ad2180cfa8b466e2bd320e40 multiget-1.2.0.src.tar.bz2 --- multiget-1.1.4-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 16:33:44 2008 From: fedora-extras-commits at redhat.com (Guido Ledermann (guidoledermann)) Date: Wed, 2 Jul 2008 16:33:44 GMT Subject: rpms/multiget/F-9 MultiGet.png, NONE, 1.1 import.log, NONE, 1.1 multiget-1.2-fix-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 multiget.desktop, 1.1, 1.2 multiget.spec, 1.2, 1.3 sources, 1.2, 1.3 multiget-1.1.4-makefile.patch, 1.1, NONE Message-ID: <200807021633.m62GXiV4005697@cvs-int.fedora.redhat.com> Author: guidoledermann Update of /cvs/pkgs/rpms/multiget/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5549/F-9 Modified Files: .cvsignore multiget.desktop multiget.spec sources Added Files: MultiGet.png import.log multiget-1.2-fix-gcc43.patch Removed Files: multiget-1.1.4-makefile.patch Log Message: --- NEW FILE import.log --- multiget-1_2_0-3_fc9:F-9:multiget-1.2.0-3.fc9.src.rpm:1215016339 multiget-1.2-fix-gcc43.patch: --- NEW FILE multiget-1.2-fix-gcc43.patch --- diff -dur multiget.orig/src/batch.cpp multiget/src/batch.cpp --- multiget.orig/src/batch.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/batch.cpp 2008-06-04 20:17:12.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #include "batch.h" #include "common.h" #include diff -dur multiget.orig/src/common.cpp multiget/src/common.cpp --- multiget.orig/src/common.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/common.cpp 2008-06-04 20:17:10.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #include "common.h" #include "speedctrl.h" #include "mirroradmin.h" diff -dur multiget.orig/src/mgftpbase.cpp multiget/src/mgftpbase.cpp --- multiget.orig/src/mgftpbase.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/mgftpbase.cpp 2008-06-04 20:17:08.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #ifdef WIN32 #include #endif diff -dur multiget.orig/src/mgurlparser.cpp multiget/src/mgurlparser.cpp --- multiget.orig/src/mgurlparser.cpp 2007-01-29 04:51:58.000000000 +0100 +++ multiget/src/mgurlparser.cpp 2008-06-04 20:17:13.000000000 +0200 @@ -22,6 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include +#include #include "mgurlparser.h" #include "common.h" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Mar 2007 02:40:56 -0000 1.2 +++ .cvsignore 2 Jul 2008 16:32:56 -0000 1.3 @@ -1 +1 @@ -multiget-1.1.4.src.tar.gz +multiget-1.2.0.src.tar.bz2 Index: multiget.desktop =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-9/multiget.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multiget.desktop 22 Mar 2007 02:40:56 -0000 1.1 +++ multiget.desktop 2 Jul 2008 16:32:56 -0000 1.2 @@ -1,10 +1,12 @@ [Desktop Entry] +Version=1.0 Encoding=UTF-8 Name=MultiGet GenericName=MultiGet file downloader Comment=File downloader -Exec=MultiGet +Exec=multiget Icon=MultiGet.png Terminal=false Type=Application Categories=GTK;GNOME;Network;FileTransfer; +GenericName[de_DE]=MultiGet file downloader Index: multiget.spec =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-9/multiget.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multiget.spec 18 Feb 2008 19:15:06 -0000 1.2 +++ multiget.spec 2 Jul 2008 16:32:56 -0000 1.3 @@ -1,18 +1,21 @@ Name: multiget -Version: 1.1.4 -Release: 8%{?dist} +Version: 1.2.0 +Release: 3%{?dist} Summary: An easy-to-use GUI file downloader Group: Applications/Internet -License: GPL +License: GPLv2 URL: http://multiget.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.bz2 Source1: multiget.desktop Source2: COPYING -Patch0: multiget-1.1.4-makefile.patch +# There is no symbol for multiget provided in 1.2.0 like it has been in 1.1.4 +# so I decided to use the one from 1.1.4. +Source3: MultiGet.png +Patch0: multiget-1.2-fix-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel desktop-file-utils >= 0.9 +BuildRequires: wxGTK-devel desktop-file-utils >= 0.9 perl(XML::Parser) libglade2-devel automake >= 1.10 %description MultiGet is an easy-to-use GUI file downloader. @@ -24,18 +27,31 @@ http proxy. %prep -%setup -q +%setup -qn multiget %patch0 -p1 -b .good -# Fix script-without-shebangs in debuginfo package -chmod 644 src/icons/*.xpm -chmod 644 src/newicons/16/*.xpm -chmod 644 src/newicons/24/*.xpm -chmod 644 src/newicons/32/*.xpm -chmod 644 src/newicons/48/*.xpm -cp %{SOURCE2} %{_builddir}/%{name}-%{version}/ +chmod 644 icons/*.xpm + +# fix dead symbolic links +rm -f INSTALL +ln -s %{_datadir}/automake-1.10/INSTALL INSTALL +rm -f install-sh +ln -s %{_datadir}/automake-1.10/install-sh install-sh +rm -f depcomp +ln -s %{_datadir}/automake-1.10/depcomp depcomp +rm -f missing +ln -s %{_datadir}/automake-1.10/missing missing +rm -f %{_builddir}/%{name}/COPYING +cp -p %{SOURCE2} %{_builddir}/%{name}/ + +chmod 644 icons/*.xpm +chmod 644 newicons/16/*.xpm +chmod 644 newicons/24/*.xpm +chmod 644 newicons/32/*.xpm +chmod 644 newicons/48/*.xpm + %build -cd src/ +%configure make %{?_smp_mflags} %install @@ -44,26 +60,30 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -install -m 755 src/MultiGet $RPM_BUILD_ROOT/%{_bindir} -install -p -m 644 MultiGet.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +install -p -m 755 src/multiget $RPM_BUILD_ROOT/%{_bindir} +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%doc changelog.txt readme_en.txt COPYING -%{_bindir}/MultiGet +%doc COPYING +%{_bindir}/multiget %{_datadir}/applications/fedora-multiget.desktop %{_datadir}/pixmaps/MultiGet.png %changelog +* Thu Jun 12 2008 Guido Ledermann - 1.2.0-3 +- remove patch for Makefile.in, fixed spec to follow Packaging Guidelines +* Thu Jun 12 2008 Guido Ledermann - 1.2.0-2 +- remove patch for Makefile and added patch for Makefile.ini, fixed spec +* Thu Jun 05 2008 Guido Ledermann - 1.2.0-1 +- Fixed for 1.2.0 * Mon Feb 18 2008 Fedora Release Engineering - 1.1.4-8 - Autorebuild for GCC 4.3 - * Sun Mar 14 2007 Allisson Azevedo 1.1.4-7 - Change patch * Sun Mar 14 2007 Allisson Azevedo 1.1.4-6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Mar 2007 02:40:56 -0000 1.2 +++ sources 2 Jul 2008 16:32:56 -0000 1.3 @@ -1 +1 @@ -afb1de0ccf51a0255960c437e03e83a5 multiget-1.1.4.src.tar.gz +b62c4017ad2180cfa8b466e2bd320e40 multiget-1.2.0.src.tar.bz2 --- multiget-1.1.4-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 16:34:05 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 2 Jul 2008 16:34:05 GMT Subject: rpms/liferea/F-9 liferea-1.4.16b-configure.patch, NONE, 1.1 liferea.spec, 1.117, 1.118 Message-ID: <200807021634.m62GY5ft005749@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5603 Modified Files: liferea.spec Added Files: liferea-1.4.16b-configure.patch Log Message: New upstream release with xulrunner-1.9 final liferea-1.4.16b-configure.patch: --- NEW FILE liferea-1.4.16b-configure.patch --- diff -crB liferea-1.4.16b/configure liferea-1.4.16b-fedora/configure *** liferea-1.4.16b/configure 2008-06-11 18:14:17.000000000 -0400 --- liferea-1.4.16b-fedora/configure 2008-07-02 11:00:02.000000000 -0400 *************** *** 1619,1625 **** --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support --- 1619,1625 ---- --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox", "xulrunner-1.9" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support *************** *** 25207,25365 **** gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_LIBS"; then - pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried fi - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 ! { echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6; } ! enable_mozilla=no ! elif test $pkg_failed = untried; then ! enable_mozilla=no ! else ! MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS ! MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } ! enable_mozilla=yes ! fi ! fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_LIBS"; then - pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - - - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - enable_mozilla=no - elif test $pkg_failed = untried; then - enable_mozilla=no - else - MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS - MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - enable_mozilla=yes - fi fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } --- 25207,25245 ---- gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi + #change begin + if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then + gecko_provider=xulrunner-1.9 + gecko_provider_gtkmozembed=libxul-embedding fi ! #change end ! if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } + #change begins + + fi + + if test "x$gecko_provider" != "x"; then + if test "$gecko_provider_gtkmozembed" = "x"; then + gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed + fi + + #change ends + pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } *************** *** 25369,25380 **** pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25249,25260 ---- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider_gtkmozembed" nspr 2>/dev/null` else pkg_failed=yes fi *************** *** 25387,25398 **** pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25267,25278 ---- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider_gtkmozembed" 2>/dev/null` else pkg_failed=yes fi *************** *** 25411,25419 **** _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 --- 25291,25299 ---- _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 *************** *** 25914,25922 **** ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ --- 25794,25802 ---- ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ Only in liferea-1.4.16b-fedora: configure~ diff -crB liferea-1.4.16b/configure.ac liferea-1.4.16b-fedora/configure.ac *** liferea-1.4.16b/configure.ac 2008-06-11 18:08:41.000000000 -0400 --- liferea-1.4.16b-fedora/configure.ac 2008-07-01 22:35:58.000000000 -0400 *************** *** 36,42 **** AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) --- 36,42 ---- AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox", "xulrunner-1.9" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) *************** *** 44,51 **** AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=no ! AC_MSG_RESULT([yes -> disabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) --- 44,51 ---- AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=yes ! AC_MSG_RESULT([yes -> enabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) *************** *** 227,244 **** if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey ! AC_MSG_CHECKING([for Gecko provider $gecko_provider]) ! PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") --- 227,251 ---- if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla fi + + if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then + gecko_provider=xulrunner-1.9 + gecko_provider_gtkmozembed=libxul-embedding + fi + if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey ! fi ! ! if test "x$gecko_provider" != "x"; then ! if test "$gecko_provider_gtkmozembed" = "x"; then ! gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed ! fi ! PKG_CHECK_MODULES(MOZILLA, $gecko_provider_gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") *************** *** 258,266 **** dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ --- 265,273 ---- dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ Index: liferea.spec =================================================================== RCS file: /cvs/pkgs/rpms/liferea/F-9/liferea.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- liferea.spec 27 Jun 2008 20:51:16 -0000 1.117 +++ liferea.spec 2 Jul 2008 16:33:08 -0000 1.118 @@ -2,7 +2,7 @@ Name: liferea Version: 1.4.16b -Release: 3%{?dist} +Release: 5%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -10,6 +10,7 @@ URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-fedorafeed.patch +Patch1: %{name}-%{version}-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GConf2-devel @@ -41,10 +42,11 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .fedorafeed +%patch1 -p1 -b .xulrunner-configure + %build -%configure --disable-schemas-install --disable-gtkhtml2 \ - --disable-lua --enable-gecko=xulrunner-1.9 +%configure --disable-schemas-install --disable-gtkhtml2 --disable-lua --enable-gecko=xulrunner-1.9 --disable-xulrunner find . -name "Makefile" | xargs sed -i 's!-I/usr/include/xulrunner-sdk-1.9/stable!-I/usr/include/xulrunner-sdk-1.9/stable -I/usr/include/xulrunner-sdk-1.9/ -I/usr/include/xulrunner-sdk-1.9/gtkembedmoz/ -I/usr/include/xulrunner-sdk-1.9/xpcom -I /usr/include/xulrunner-sdk-1.9/necko/ -I/usr/include/xulrunner-sdk-1.9/dom/ -I/usr/include/nspr4/!g' @@ -54,6 +56,7 @@ %install rm -rf ${RPM_BUILD_ROOT} make install DESTDIR=${RPM_BUILD_ROOT} + %find_lang %{name} find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' # Remove *.in files. @@ -63,11 +66,9 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop - %clean rm -rf ${RPM_BUILD_ROOT} - %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -114,13 +115,16 @@ %changelog -* Fri Jun 27 2008 Steven Parrish - 1.4.16b +* Wed Jul 02 2008 Steven Parrish - 1.4.16b-5 +- corrected multiple segfaults. Fixes Bug #453233 + +* Fri Jun 27 2008 Steven Parrish - 1.4.16b-4 - removed uneeded patch files -* Fri Jun 27 2008 Steven Parrish - 1.4.16b +* Fri Jun 27 2008 Steven Parrish - 1.4.16b-43 - Cleaned up spec file and removed support for firefox-devel -* Thu Jun 26 2008 Steven Parrish - 1.4.16b +* Thu Jun 26 2008 Steven Parrish - 1.4.16b-1 - New upstream release * Wed Jun 25 2008 Tomas Mraz - 1.4.15-6 From fedora-extras-commits at redhat.com Wed Jul 2 16:34:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:34:39 +0000 Subject: [pkgdb] yum had acl change status Message-ID: <200807021634.m62GYd4O015000@bastion.fedora.phx.redhat.com> Seth Vidal (skvidal) has set the commit acl on yum (Fedora 9) to Approved for James Antill (james) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum From fedora-extras-commits at redhat.com Wed Jul 2 16:34:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:34:50 +0000 Subject: [pkgdb] yum had acl change status Message-ID: <200807021634.m62GYoof015029@bastion.fedora.phx.redhat.com> Seth Vidal (skvidal) has set the commit acl on yum (Fedora 8) to Approved for Tim Lauridsen (timlau) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum From fedora-extras-commits at redhat.com Wed Jul 2 16:35:09 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 2 Jul 2008 16:35:09 GMT Subject: rpms/hunspell-ca/devel .cvsignore, 1.3, 1.4 hunspell-ca.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807021635.m62GZ9qZ005856@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-ca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5794 Modified Files: .cvsignore hunspell-ca.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jul 2007 09:15:17 -0000 1.3 +++ .cvsignore 2 Jul 2008 16:34:22 -0000 1.4 @@ -1 +1 @@ -catalan.tar.gz +hunspell-ca-20080620.tar.bz2 Index: hunspell-ca.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/hunspell-ca.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hunspell-ca.spec 3 Aug 2007 08:20:54 -0000 1.3 +++ hunspell-ca.spec 2 Jul 2008 16:34:22 -0000 1.4 @@ -1,11 +1,12 @@ Name: hunspell-ca Summary: Catalan hunspell dictionaries -%define upstreamid 20060508 +%define upstreamid 20080620 Version: 0.%{upstreamid} -Release: 2%{?dist} -Source: http://www.jmoratinos.com/myspell/catalan.tar.gz +Release: 1%{?dist} +#svn checkout svn://softcatala.org/corrector/trunk/resultats/hunspell +Source: hunspell-ca-%{upstreamid}.tar.bz2 Group: Applications/Text -URL: http://www.jmoratinos.com/cgi-bin/index.php +URL: http://www.softcatala.org/wiki/Corrector_ortogr??fic BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPLv2+ BuildArch: noarch @@ -16,7 +17,7 @@ Catalan hunspell dictionaries. %prep -%setup -q -c -n hunspell-ca +%setup -q -n hunspell %build tr -d '\r' < catalan.aff > ca_ES.aff @@ -35,6 +36,9 @@ %{_datadir}/myspell/* %changelog +* Wed Jul 02 2008 Caolan McNamara - 0.20080620-1 +- latest version + * Fri Aug 03 2007 Caolan McNamara - 0.20060508-2 - clarify license version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jul 2007 09:15:17 -0000 1.3 +++ sources 2 Jul 2008 16:34:22 -0000 1.4 @@ -1 +1 @@ -79d78c811d9880c75631ee246f421710 catalan.tar.gz +2e4cbbcf9e2b08473122c041a0289ed0 hunspell-ca-20080620.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 16:35:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:35:19 +0000 Subject: [pkgdb] yum had acl change status Message-ID: <200807021635.m62GYooj015029@bastion.fedora.phx.redhat.com> Seth Vidal (skvidal) has set the commit acl on yum (Fedora 7) to Approved for James Antill (james) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum From fedora-extras-commits at redhat.com Wed Jul 2 23:35:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:35:24 -0700 Subject: [pkgdb] yum had acl change status Message-ID: <200807021635.m62GZOWv015115@bastion.fedora.phx.redhat.com> Seth Vidal (skvidal) has set the commit acl on yum (Fedora devel) to Approved for James Antill (james) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum From fedora-extras-commits at redhat.com Wed Jul 2 16:37:31 2008 From: fedora-extras-commits at redhat.com (Guido Ledermann (guidoledermann)) Date: Wed, 2 Jul 2008 16:37:31 GMT Subject: rpms/multiget/devel import.log,1.1,1.2 Message-ID: <200807021637.m62GbVRx006147@cvs-int.fedora.redhat.com> Author: guidoledermann Update of /cvs/pkgs/rpms/multiget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6039/devel Modified Files: import.log Log Message: Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/multiget/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Jul 2008 16:29:33 -0000 1.1 +++ import.log 2 Jul 2008 16:36:37 -0000 1.2 @@ -1 +1,2 @@ multiget-1_2_0-3_fc9:HEAD:multiget-1.2.0-3.fc9.src.rpm:1215016066 +multiget-1_2_0-3_fc9:HEAD:multiget-1.2.0-3.fc9.src.rpm:1215016574 From fedora-extras-commits at redhat.com Wed Jul 2 16:39:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:39:25 +0000 Subject: [pkgdb] abgraph was added for mmahut Message-ID: <200807021639.m62GdPBE015321@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package abgraph with summary ABGraph is a simple tool to benchmark webservers Kevin Fenzi (kevin) has approved Package abgraph Kevin Fenzi (kevin) has added a Fedora devel branch for abgraph with an owner of mmahut Kevin Fenzi (kevin) has approved abgraph in Fedora devel Kevin Fenzi (kevin) has approved Package abgraph Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abgraph (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on abgraph (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abgraph (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abgraph From fedora-extras-commits at redhat.com Wed Jul 2 16:39:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:39:28 +0000 Subject: [pkgdb] abgraph (Fedora, 8) updated by kevin Message-ID: <200807021639.m62GdSaT015340@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for abgraph Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abgraph (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on abgraph (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abgraph (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abgraph From fedora-extras-commits at redhat.com Wed Jul 2 16:39:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:39:28 +0000 Subject: [pkgdb] abgraph (Fedora, 9) updated by kevin Message-ID: <200807021639.m62GdSaW015340@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for abgraph Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abgraph (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on abgraph (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abgraph (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abgraph From fedora-extras-commits at redhat.com Wed Jul 2 16:39:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:39:28 +0000 Subject: [pkgdb] abgraph (Fedora EPEL, 5) updated by kevin Message-ID: <200807021639.m62GdSaZ015340@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for abgraph Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abgraph (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on abgraph (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abgraph (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abgraph From fedora-extras-commits at redhat.com Wed Jul 2 16:40:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:40:03 GMT Subject: rpms/abgraph - New directory Message-ID: <200807021640.m62Ge3Pp006401@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/abgraph In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXg6328/rpms/abgraph Log Message: Directory /cvs/extras/rpms/abgraph added to the repository From fedora-extras-commits at redhat.com Wed Jul 2 16:40:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:40:35 GMT Subject: rpms/abgraph/devel - New directory Message-ID: <200807021640.m62GeZ18006517@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/abgraph/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXg6328/rpms/abgraph/devel Log Message: Directory /cvs/extras/rpms/abgraph/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 2 16:40:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:40:51 GMT Subject: rpms/abgraph Makefile,NONE,1.1 Message-ID: <200807021640.m62GepRw006570@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/abgraph In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXg6328/rpms/abgraph Added Files: Makefile Log Message: Setup of module abgraph --- NEW FILE Makefile --- # Top level Makefile for module abgraph all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 2 16:40:51 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 2 Jul 2008 16:40:51 GMT Subject: rpms/asterisk/F-9 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, NONE, 1.1 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, NONE, 1.1 0003-Add-FAX-apps.patch, NONE, 1.1 0004-Allow-alternate-extensions-to-be-specified-in-users.patch, NONE, 1.1 0005-Pick-proper-optimization-flags-for-Fedora.patch, NONE, 1.1 0006-Add-chan_mobile-from-asterisk-addons.patch, NONE, 1.1 0007-Use-pkgconfig-to-check-for-Lua.patch, NONE, 1.1 0008-Build-using-external-libedit.patch, NONE, 1.1 0009-Update-cdr_tds-to-latest.patch, NONE, 1.1 0010-Update-autoconf.patch, NONE, 1.1 asterisk.spec, 1.25, 1.26 asterisk-1.6.0-beta9-alternate-extensions.patch, 1.1, NONE asterisk-1.6.0-beta9-alternate-voicemail.patch, 1.1, NONE asterisk-1.6.0-beta9-appconference.patch, 1.1, NONE asterisk-1.6.0-beta9-autoconf.patch, 1.1, NONE asterisk-1.6.0-beta9-chanmobile.patch, 1.1, NONE asterisk-1.6.0-beta9-editline.patch, 1.1, NONE asterisk-1.6.0-beta9-initscripts.patch, 1.1, NONE asterisk-1.6.0-beta9-lua.patch, 1.1, NONE asterisk-1.6.0-beta9-optimization.patch, 1.1, NONE asterisk-1.6.0-beta9-spandspfax.patch, 1.1, NONE Message-ID: <200807021640.m62GepYK006568@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6368 Modified Files: asterisk.spec Added Files: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 0003-Add-FAX-apps.patch 0004-Allow-alternate-extensions-to-be-specified-in-users.patch 0005-Pick-proper-optimization-flags-for-Fedora.patch 0006-Add-chan_mobile-from-asterisk-addons.patch 0007-Use-pkgconfig-to-check-for-Lua.patch 0008-Build-using-external-libedit.patch 0009-Update-cdr_tds-to-latest.patch 0010-Update-autoconf.patch Removed Files: asterisk-1.6.0-beta9-alternate-extensions.patch asterisk-1.6.0-beta9-alternate-voicemail.patch asterisk-1.6.0-beta9-appconference.patch asterisk-1.6.0-beta9-autoconf.patch asterisk-1.6.0-beta9-chanmobile.patch asterisk-1.6.0-beta9-editline.patch asterisk-1.6.0-beta9-initscripts.patch asterisk-1.6.0-beta9-lua.patch asterisk-1.6.0-beta9-optimization.patch asterisk-1.6.0-beta9-spandspfax.patch Log Message: * Thu Jul 2 2008 Jeffrey C. Ollie - 1.6.0-0.17.beta9 - Add patch that unbreaks cdr_tds with FreeTDS 0.82. - Properly obsolete conference subpackage. 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch: --- NEW FILE 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch --- >From 4b4ea77478104bd1bfa02cc41ffd8351780e14e7 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Sun, 18 Nov 2007 21:47:59 -0600 Subject: [PATCH] Modify init scripts for better Fedora compatibility. --- contrib/init.d/rc.redhat.asterisk | 59 +++++++++++++++++------------------- contrib/sysconfig/asterisk | 16 ++++++++++ 2 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 contrib/sysconfig/asterisk diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk index de821fe..ddb1d64 100755 --- a/contrib/init.d/rc.redhat.asterisk +++ b/contrib/init.d/rc.redhat.asterisk @@ -3,7 +3,7 @@ # # asterisk Starts, Stops and Reloads Asterisk. # -# chkconfig: 2345 90 60 +# chkconfig: - 90 60 # description: Asterisk PBX and telephony daemon. # processname: asterisk # pidfile: /var/run/asterisk.pid @@ -20,51 +20,51 @@ # - Added support for -U and -G command line options # - Modified "reload" to call asterisk -rx 'reload' -# Use this option to specify a different configuration directory -#AST_CONFIG=/etc/asterisk +# Do not modify this script to change any of the settings, instead +# edit /etc/sysconfig/asterisk + +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf # Installation directory AST_SBIN=/usr/sbin -# Uncomment the following and set them to the user/groups that you -# want to run Asterisk as. NOTE: this requires substantial work to -# be sure that Asterisk's environment has permission to write the -# files required for its operation, including logs, its comm -# socket, the asterisk database, etc. -#AST_USER="asterisk" +# The user that Asterisk will run as. +AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. #AST_GROUP="asterisk" -# Source function library. -. /etc/rc.d/init.d/functions +# Allow configuration overrides in /etc/sysconfig/asterisk +CONFIG0=`readlink $0` +if [ "$CONFIG0" = "" ]; then + CONFIGFILE=/etc/sysconfig/`basename $0` +else + CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` +fi +[ -f $CONFIGFILE ] && . $CONFIGFILE if ! [ -x $AST_SBIN/asterisk ] ; then echo "ERROR: $AST_SBIN/asterisk not found" exit 0 fi -if ! [ -d $AST_CONFIG ] ; then - echo "ERROR: $AST_CONFIG directory not found" +if ! [ -f $AST_CONFIG ] ; then + echo "ERROR: $AST_CONFIG not found" exit 0 fi -# Uncomment this ONLY if you know what you are doing. -# export LD_ASSUME_KERNEL=2.4.1 +# Source function library. +. /etc/rc.d/init.d/functions # Full path to asterisk binary DAEMON=$AST_SBIN/asterisk -# Full path to safe_asterisk script -SAFE_ASTERISK=$AST_SBIN/safe_asterisk - -# Allow configuration overrides in /etc/sysconfig/asterisk -CONFIG0=`readlink $0` -if [ "$CONFIG0" = "" ]; then - CONFIGFILE=/etc/sysconfig/`basename $0` -else - CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` -fi -[ -x $CONFIGFILE ] && . $CONFIGFILE - RETVAL=0 start() { @@ -78,9 +78,6 @@ start() { # Start daemons. echo -n $"Starting asterisk: " - if [ -f $SAFE_ASTERISK ] ; then - DAEMON=$SAFE_ASTERISK - fi if [ $AST_USER ] ; then ASTARGS="-U $AST_USER" fi @@ -99,7 +96,7 @@ start() { stop() { # Stop daemons. - echo -n $"Shutting down asterisk: " + echo -n $"Stopping asterisk: " killproc asterisk RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk new file mode 100644 index 0000000..2d3598a --- /dev/null +++ b/contrib/sysconfig/asterisk @@ -0,0 +1,16 @@ +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf + +# Installation directory +AST_SBIN=/usr/sbin + +# The user that Asterisk will run as. +AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. +#AST_GROUP="asterisk" -- 1.5.5.2 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch: --- NEW FILE 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch --- >From 053d0eda8a0cc575e682df337d630e3aaebf7329 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 15:52:36 -0600 Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded. --- configs/modules.conf.sample | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample index 2ca3c03..ae20637 100644 --- a/configs/modules.conf.sample +++ b/configs/modules.conf.sample @@ -37,3 +37,30 @@ load => res_musiconhold.so noload => chan_alsa.so ;noload => chan_oss.so ;noload => chan_console.so + +; +; Voicemail storage selection +; +; Comment out the "noload" lines for the voicemail +; storage system that you want. Leave the ones that +; you don't want uncommented. +; + +; +; Voicemail with IMAP storage +; +noload => app_directory_imap.so +noload => app_voicemail_imap.so + +; +; Voicemail with ODBC storage +; +noload => app_directory_odbc.so +noload => app_voicemail_odbc.so + +; +; Voicemail with filesystem storage +; +;noload => app_directory_plain.so +;noload => app_voicemail_plain.so + -- 1.5.5.2 0003-Add-FAX-apps.patch: --- NEW FILE 0003-Add-FAX-apps.patch --- >From 67977e0cecec47c6e3e2100d2c7c60f9668b148f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 12 Nov 2007 15:51:12 -0600 Subject: [PATCH] Add FAX apps. --- apps/app_rxfax.c | 380 ++++++++++++++++++++++++++++++++++++++++ apps/app_txfax.c | 306 ++++++++++++++++++++++++++++++++ build_tools/menuselect-deps.in | 1 + configure.ac | 3 + makeopts.in | 3 + 5 files changed, 693 insertions(+), 0 deletions(-) create mode 100644 apps/app_rxfax.c create mode 100644 apps/app_txfax.c diff --git a/apps/app_rxfax.c b/apps/app_rxfax.c new file mode 100644 index 0000000..bd81ea1 --- /dev/null +++ b/apps/app_rxfax.c @@ -0,0 +1,380 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Trivial application to receive a TIFF FAX file + * + * Copyright (C) 2003, Steve Underwood + * + * Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/manager.h" + +#ifndef AST_MODULE +#define AST_MODULE "app_rxfax" +#endif + +static char *app = "RxFAX"; + +static char *synopsis = "Receive a FAX to a file"; + +static char *descrip = +" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" +"given filename. If the file exists it will be overwritten. The file\n" +"should be in TIFF/F format.\n" +"The \"caller\" option makes the application behave as a calling machine,\n" +"rather than the answering machine. The default behaviour is to behave as\n" +"an answering machine.\n" +"Uses LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"Sets REMOTESTATIONID to the sender CSID.\n" +" FAXPAGES to the number of pages received.\n" +" FAXBITRATE to the transmition rate.\n" +" FAXRESOLUTION to the resolution.\n" +"Returns -1 when the user hangs up.\n" +"Returns 0 otherwise.\n"; + +#define MAX_BLOCK_SIZE 240 + +static void span_message(int level, const char *msg) +{ + int ast_level; + + if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else + ast_level = __LOG_DEBUG; + ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); +} +/*- End of function --------------------------------------------------------*/ + +#if 0 +static void t30_flush(t30_state_t *s, int which) +{ + /* TODO: */ +} +/*- End of function --------------------------------------------------------*/ +#endif + +static void phase_e_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + t30_stats_t t; + char local_ident[21]; + char far_ident[21]; + char buf[11]; + + chan = (struct ast_channel *) user_data; + if (result == T30_ERR_OK) + { + t30_get_transfer_statistics(s, &t); + t30_get_far_ident(s, far_ident); + t30_get_local_ident(s, local_ident); + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax successfully received.\n"); + ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); + ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); + ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); + ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + ast_log(LOG_DEBUG, "==============================================================================\n"); + manager_event(EVENT_FLAG_CALL, + "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", + chan->name, + chan->exten, + (chan->cid.cid_num) ? chan->cid.cid_num : "", + far_ident, + local_ident, + t.pages_transferred, + t.y_resolution, + t.bit_rate, + s->rx_file); + pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); + snprintf(buf, sizeof(buf), "%i", t.pages_transferred); + pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); + snprintf(buf, sizeof(buf), "%i", t.y_resolution); + pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); + snprintf(buf, sizeof(buf), "%i", t.bit_rate); + pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); + } + else + { + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static void phase_d_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + t30_stats_t t; + + chan = (struct ast_channel *) user_data; + if (result) + { + t30_get_transfer_statistics(s, &t); + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); + ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); + ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); + ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); + ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); + ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static int rxfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char template_file[256]; + char target_file[256]; + char *s; + char *t; + char *v; + const char *x; + int option; + int len; + int i; + fax_state_t fax; + int calling_party; + int verbose; + int samples; + + struct ast_module_user *u; + struct ast_frame *inf = NULL; + struct ast_frame outf; + + int original_read_fmt; + int original_write_fmt; + + uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; + uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; + + if (chan == NULL) + { + ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); + return -1; + } + + span_set_message_handler(span_message); + + /* The next few lines of code parse out the filename and header from the input string */ + if (data == NULL) + { + /* No data implies no filename or anything is present */ + ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); + return -1; + } + + calling_party = FALSE; + verbose = FALSE; + target_file[0] = '\0'; + + for (option = 0, v = s = data; v; option++, s++) + { + t = s; + v = strchr(s, '|'); + s = (v) ? v : s + strlen(s); + strncpy((char *) buf, t, s - t); + buf[s - t] = '\0'; + if (option == 0) + { + /* The first option is always the file name */ + len = s - t; + if (len > 255) + len = 255; + strncpy(target_file, t, len); + target_file[len] = '\0'; + /* Allow the use of %d in the file name for a wild card of sorts, to + create a new file with the specified name scheme */ + if ((x = strchr(target_file, '%')) && x[1] == 'd') + { + strcpy(template_file, target_file); + i = 0; + do + { + snprintf(target_file, 256, template_file, 1); + i++; + } + while (ast_fileexists(target_file, "", chan->language) != -1); + } + } + else if (strncmp("caller", t, s - t) == 0) + { + calling_party = TRUE; + } + else if (strncmp("debug", t, s - t) == 0) + { + verbose = TRUE; + } + } + + /* Done parsing */ + + u = ast_module_user_add(chan); + + if (chan->_state != AST_STATE_UP) + { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(chan); + } + + if (!res) + { + original_read_fmt = chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + return -1; + } + } + original_write_fmt = chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + return -1; + } + } + fax_init(&fax, calling_party); + if (verbose) + fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; + x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); + if (x && x[0]) + t30_set_local_ident(&fax.t30_state, x); + x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); + if (x && x[0]) + t30_set_header_info(&fax.t30_state, x); + t30_set_rx_file(&fax.t30_state, target_file, -1); + //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan); + t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan); + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan); + t30_set_ecm_capability(&fax.t30_state, TRUE); + t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + while (ast_waitfor(chan, -1) > -1) + { + inf = ast_read(chan); + if (inf == NULL) + { + res = -1; + break; + } + if (inf->frametype == AST_FRAME_VOICE) + { + if (fax_rx(&fax, inf->data, inf->samples)) + break; + samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; + len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); + if (len) + { + memset(&outf, 0, sizeof(outf)); + outf.frametype = AST_FRAME_VOICE; + outf.subclass = AST_FORMAT_SLINEAR; + outf.datalen = len*sizeof(int16_t); + outf.samples = len; + outf.data = &buf[AST_FRIENDLY_OFFSET]; + outf.offset = AST_FRIENDLY_OFFSET; + outf.src = "RxFAX"; + if (ast_write(chan, &outf) < 0) + { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + break; + } + } + } + ast_frfree(inf); + } + if (inf == NULL) + { + ast_log(LOG_DEBUG, "Got hangup\n"); + res = -1; + } + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + } + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, original_write_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); + } + t30_terminate(&fax.t30_state); + } + else + { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); + } + ast_module_user_remove(u); + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int unload_module(void) +{ + int res; + + ast_module_user_hangup_all(); + + res = ast_unregister_application(app); + + + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int load_module(void) +{ + return ast_register_application(app, rxfax_exec, synopsis, descrip); +} +/*- End of function --------------------------------------------------------*/ + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Receive Application"); + +/*- End of file ------------------------------------------------------------*/ diff --git a/apps/app_txfax.c b/apps/app_txfax.c new file mode 100644 index 0000000..713ecf1 --- /dev/null +++ b/apps/app_txfax.c @@ -0,0 +1,306 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Trivial application to send a TIFF file as a FAX + * + * Copyright (C) 2003, Steve Underwood + * + * Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" + +#ifndef AST_MODULE +#define AST_MODULE "app_txfax" +#endif + +static char *app = "TxFAX"; + +static char *synopsis = "Send a FAX file"; + +static char *descrip = +" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" +"The \"caller\" option makes the application behave as a calling machine,\n" +"rather than the answering machine. The default behaviour is to behave as\n" +"an answering machine.\n" +"Uses LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"Sets REMOTESTATIONID to the receiver CSID.\n" +"Returns -1 when the user hangs up, or if the file does not exist.\n" +"Returns 0 otherwise.\n"; + +#define MAX_BLOCK_SIZE 240 + +static void span_message(int level, const char *msg) +{ + int ast_level; + + if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else + ast_level = __LOG_DEBUG; + ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); +} +/*- End of function --------------------------------------------------------*/ + +#if 0 +static void t30_flush(t30_state_t *s, int which) +{ + /* TODO: */ +} +/*- End of function --------------------------------------------------------*/ +#endif + +static void phase_e_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + char far_ident[21]; + + chan = (struct ast_channel *) user_data; + if (result == T30_ERR_OK) + { + t30_get_far_ident(s, far_ident); + pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); + } + else + { + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax send not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static int txfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char source_file[256]; + char *s; + char *t; + char *v; + const char *x; + int option; + int len; + fax_state_t fax; + int calling_party; + int verbose; + int samples; + + struct ast_module_user *u; + struct ast_frame *inf = NULL; + struct ast_frame outf; + + int original_read_fmt; + int original_write_fmt; + + uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; + uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; + + if (chan == NULL) + { + ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); + return -1; + } + + span_set_message_handler(span_message); + + /* The next few lines of code parse out the filename and header from the input string */ + if (data == NULL) + { + /* No data implies no filename or anything is present */ + ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); + return -1; + } + + calling_party = FALSE; + verbose = FALSE; + source_file[0] = '\0'; + + for (option = 0, v = s = data; v; option++, s++) + { + t = s; + v = strchr(s, '|'); + s = (v) ? v : s + strlen(s); + strncpy((char *) buf, t, s - t); + buf[s - t] = '\0'; + if (option == 0) + { + /* The first option is always the file name */ + len = s - t; + if (len > 255) + len = 255; + strncpy(source_file, t, len); + source_file[len] = '\0'; + } + else if (strncmp("caller", t, s - t) == 0) + { + calling_party = TRUE; + } + else if (strncmp("debug", t, s - t) == 0) + { + verbose = TRUE; + } + } + + /* Done parsing */ + + u = ast_module_user_add(chan); + + if (chan->_state != AST_STATE_UP) + { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(chan); + } + + if (!res) + { + original_read_fmt = chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + return -1; + } + } + original_write_fmt = chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + return -1; + } + } + fax_init(&fax, calling_party); + if (verbose) + fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; + + x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); + if (x && x[0]) + t30_set_local_ident(&fax.t30_state, x); + x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); + if (x && x[0]) + t30_set_header_info(&fax.t30_state, x); + t30_set_tx_file(&fax.t30_state, source_file, -1, -1); + //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan); + //t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan); + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan); + t30_set_ecm_capability(&fax.t30_state, TRUE); + t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + while (ast_waitfor(chan, -1) > -1) + { + inf = ast_read(chan); + if (inf == NULL) + { + res = -1; + break; + } + if (inf->frametype == AST_FRAME_VOICE) + { + if (fax_rx(&fax, inf->data, inf->samples)) + break; + samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; + len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); + if (len) + { + memset(&outf, 0, sizeof(outf)); + outf.frametype = AST_FRAME_VOICE; + outf.subclass = AST_FORMAT_SLINEAR; + outf.datalen = len*sizeof(int16_t); + outf.samples = len; + outf.data = &buf[AST_FRIENDLY_OFFSET]; + outf.offset = AST_FRIENDLY_OFFSET; + if (ast_write(chan, &outf) < 0) + { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + break; + } + } + } + ast_frfree(inf); + } + if (inf == NULL) + { + ast_log(LOG_DEBUG, "Got hangup\n"); + res = -1; + } + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + } + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, original_write_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); + } + t30_terminate(&fax.t30_state); + } + else + { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); + } + ast_module_user_remove(u); + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int unload_module(void) +{ + int res; + + ast_module_user_hangup_all(); + + res = ast_unregister_application(app); + + + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int load_module(void) +{ + return ast_register_application(app, txfax_exec, synopsis, descrip); +} +/*- End of function --------------------------------------------------------*/ + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Transmit Application"); + +/*- End of file ------------------------------------------------------------*/ diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index aa76d56..6067076 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -30,6 +30,7 @@ POPT=@PBX_POPT@ PORTAUDIO=@PBX_PORTAUDIO@ PRI=@PBX_PRI@ RADIUS=@PBX_RADIUS@ +SPANDSP=@PBX_SPANDSP@ SPEEX=@PBX_SPEEX@ SPEEXDSP=@PBX_SPEEXDSP@ SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@ diff --git a/configure.ac b/configure.ac index 63f0376..ae671ec 100644 --- a/configure.ac +++ b/configure.ac @@ -239,6 +239,7 @@ AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl]) AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image]) +AST_EXT_LIB_SETUP([SPANDSP], [spandsp Library], [spandsp]) AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) @@ -1333,6 +1334,8 @@ AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) +AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [fax_init], [spandsp.h], [-ltiff]) + AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) # See if the main speex library contains the preprocess functions diff --git a/makeopts.in b/makeopts.in index 3bf203e..3d564b7 100644 --- a/makeopts.in +++ b/makeopts.in @@ -169,6 +169,9 @@ SDL_LIB=@SDL_LIB@ SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@ SDL_IMAGE_LIB=@SDL_IMAGE_LIB@ +SPANDSP_INCLUDE=@SPANDSP_INCLUDE@ +SPANDSP_LIB=@SPANDSP_LIB@ + SPEEX_INCLUDE=@SPEEX_INCLUDE@ SPEEX_LIB=@SPEEX_LIB@ -- 1.5.5.2 0004-Allow-alternate-extensions-to-be-specified-in-users.patch: --- NEW FILE 0004-Allow-alternate-extensions-to-be-specified-in-users.patch --- >From 383f98f158ea7eab163e8fb4b49972507cc47bbb Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:32:56 -0600 Subject: [PATCH] Allow alternate extensions to be specified in users.conf --- pbx/pbx_config.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 4a7a3d3..0e38d88 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1532,11 +1532,14 @@ static void pbx_load_users(void) { struct ast_config *cfg; char *cat, *chan; + char *ext; const char *zapchan; const char *hasexten; + const char *altexts; char tmp[256]; char iface[256]; char zapcopy[256]; + char altcopy[256]; char *c; int len; int hasvoicemail; @@ -1617,6 +1620,17 @@ static void pbx_load_users(void) } else { ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar); } + altexts = ast_variable_retrieve(cfg, cat, "alternateexts"); + if (!ast_strlen_zero(altexts)) { + snprintf(tmp, sizeof(tmp), "%s|1", cat); + ast_copy_string(altcopy, altexts, sizeof(altcopy)); + c = altcopy; + ext = strsep(&c, ","); + while (ext) { + ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free, registrar); + ext = strsep(&c, ","); + } + } } } ast_config_destroy(cfg); -- 1.5.5.2 0005-Pick-proper-optimization-flags-for-Fedora.patch: --- NEW FILE 0005-Pick-proper-optimization-flags-for-Fedora.patch --- >From 341a7d2c23aa22fdf9a3353b7cc5811954891436 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:42:14 -0600 Subject: [PATCH] Pick proper optimization flags for Fedora. --- Makefile | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7c44b41..a9fd366 100644 --- a/Makefile +++ b/Makefile @@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu) endif ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) -ASTCFLAGS+=-pipe + ifeq ($(findstring -pipe,$(ASTCFLAGS)),) + ASTCFLAGS+=-pipe + endif +endif + +ifeq ($(findstring -Wall,$(ASTCFLAGS)),) + ASTCFLAGS+=-Wall endif -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h @@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),) ASTLDFLAGS+=-L/usr/local/lib endif -ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) +ifeq ($(findstring -march,$(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif endif ifeq ($(PROC),ppc) -- 1.5.5.2 0006-Add-chan_mobile-from-asterisk-addons.patch: --- NEW FILE 0006-Add-chan_mobile-from-asterisk-addons.patch --- >From c5c5b6a3991d73fc1085b98e65e6f15bd399b20d Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 09:23:28 -0600 Subject: [PATCH] Add chan_mobile from asterisk-addons. --- build_tools/menuselect-deps.in | 1 + channels/Makefile | 2 + channels/chan_mobile.c | 2118 ++++++++++++++++++++++++++++++++++++++++ configs/mobile.conf.sample | 60 ++ configure.ac | 4 + doc/chan_mobile.txt | 240 +++++ makeopts.in | 3 + 7 files changed, 2428 insertions(+), 0 deletions(-) create mode 100644 channels/chan_mobile.c create mode 100644 configs/mobile.conf.sample create mode 100644 doc/chan_mobile.txt diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 6067076..c25e5d2 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,5 +1,6 @@ ASOUND=@PBX_ALSA@ CRYPTO=@PBX_CRYPTO@ +BLUETOOTH=@PBX_BLUETOOTH@ CURL=@PBX_CURL@ FREETDS=@PBX_FREETDS@ GMIME=@PBX_GMIME@ diff --git a/channels/Makefile b/channels/Makefile index 34bd8e0..d8e691a 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -101,3 +101,5 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o + +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB) diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c new file mode 100644 index 0000000..1312ea9 --- /dev/null +++ b/channels/chan_mobile.c @@ -0,0 +1,2118 @@ +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 1999 - 2006, Digium, Inc. + * + * Mark Spencer + * + * See http://www.asterisk.org for more information about + * the Asterisk project. Please do not directly contact + * any of the maintainers of this project for assistance; + * the project provides a web site, mailing lists and IRC + * channels for your use. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + */ + +/*! \file + * + * \brief Bluetooth Mobile Device channel driver + * + * \author Dave Bowerman + * + * \ingroup channel_drivers + */ + +/*** MODULEINFO + bluetooth + ***/ + +#include + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MBL_CONFIG "mobile.conf" + +#define DEVICE_FRAME_SIZE 48 +#define DEVICE_FRAME_FORMAT AST_FORMAT_SLINEAR +#define CHANNEL_FRAME_SIZE 320 + +static int prefformat = DEVICE_FRAME_FORMAT; + +static int discovery_interval = 60; /* The device discovery interval, default 60 seconds. */ +static pthread_t discovery_thread = AST_PTHREADT_NULL; /* The discovery thread */ +static sdp_session_t *sdp_session; + +enum mbl_type { + MBL_TYPE_PHONE, + MBL_TYPE_HEADSET +}; + +enum mbl_state { + MBL_STATE_INIT = 0, + MBL_STATE_INIT1, + MBL_STATE_INIT2, + MBL_STATE_INIT3, + MBL_STATE_INIT4, + MBL_STATE_INIT5, + MBL_STATE_INIT6, + MBL_STATE_INIT7, + MBL_STATE_PREIDLE, + MBL_STATE_IDLE, + MBL_STATE_DIAL, + MBL_STATE_DIAL1, + MBL_STATE_OUTGOING, + MBL_STATE_RING, + MBL_STATE_RING2, + MBL_STATE_RING3, + MBL_STATE_INCOMING, + MBL_STATE_HANGUP, + MBL_STATE_INSMS, + MBL_STATE_OUTSMS, + MBL_STATE_OUTSMS1, + MBL_STATE_OUTSMS2 +}; + +struct adapter_pvt { + int dev_id; /* device id */ + int hci_socket; /* device descriptor */ + char id[31]; /* the 'name' from mobile.conf */ + bdaddr_t addr; /* adddress of adapter */ + unsigned int inuse:1; /* are we in use ? */ + unsigned int alignment_detection:1; /* do alignment detection on this adpater? */ + int sco_socket; + AST_LIST_ENTRY(adapter_pvt) entry; +}; + +static AST_LIST_HEAD_STATIC(adapters, adapter_pvt); + +struct mbl_pvt { + struct ast_channel *owner; /* Channel we belong to, possibly NULL */ + struct ast_frame fr; /* "null" frame */ + enum mbl_type type; /* Phone or Headset */ + char id[31]; /* The id from mobile.conf */ + int group; /* group number for group dialling */ + bdaddr_t addr; /* address of device */ + struct adapter_pvt *adapter; /* the adapter we use */ + char context[AST_MAX_CONTEXT]; /* the context for incoming calls */ + char connected; /* is it connected? */ + int rfcomm_port; /* rfcomm port number */ + int rfcomm_socket; /* rfcomm socket descriptor */ + char rfcomm_buf[256]; + char io_buf[CHANNEL_FRAME_SIZE + AST_FRIENDLY_OFFSET]; + char io_save_buf[DEVICE_FRAME_SIZE]; + int io_save_len; + int io_pipe[2]; + int sco_socket; /* sco socket descriptor */ + pthread_t sco_listener_thread; /* inbound sco listener for this device */ + enum mbl_state state; /* monitor thread current state */ + pthread_t monitor_thread; /* monitor thread handle */ + char dial_number[AST_MAX_EXTENSION]; /* number for the monitor thread to dial */ + int dial_timeout; + char ciev_call_0[4]; /* dynamically built reponse strings */ + char ciev_call_1[4]; + char ciev_callsetup_0[4]; + char ciev_callsetup_1[4]; [...2115 lines suppressed...] + +See configs/mobile.conf.sample for an example and an explanation of the configuration. + + +Using chan_mobile :- + +chan_mobile.so must be loaded either by loading it using the Asterisk CLI, or by adding it to /etc/asterisk/modules.conf + +Search for your bluetooth devices using the CLI command 'mobile search'. Be patient with this command as +it will take 8 - 10 seconds to do the discovery. This requires a free adapter. + +Headsets will generally have to be put into 'pairing' mode before they will show up here. + +This will return something like the following :- + +*CLI> mobile search +Address Name Usable Type Port +00:12:56:90:6E:00 LG TU500 Yes Phone 4 +00:80:C8:35:52:78 Toaster No Headset 0 +00:0B:9E:11:74:A5 Hello II Plus Yes Headset 1 +00:0F:86:0E:AE:42 Daves Blackberry Yes Phone 7 + +This is a list of all bluetooth devices seen and whether or not they are usable with chan_mobile. +The Address field contains the 'bd address' of the device. This is like an ethernet mac address. +The Name field is whatever is configured into the device as its name. +The Usable field tells you whether or not the device supports the Bluetooth Handsfree Profile or Headset profile. +The Type field tells you whether the device is usable as a Phone line (FXO) or a headset (FXS) +The Port field is the number to put in the configuration file. + +Choose which device(s) you want to use and edit /etc/asterisk/mobile.conf. There is a sample included +with the Asterisk-addons source under configs/mobile.conf.sample. + +Be sure to configure the right bd address and port number from the search. If you want inbound +calls on a device to go to a specific context, add a context= line, otherwise the default will +be used. The 'id' of the device [bitinbrackets] can be anything you like, just make it unique. + +If you are configuring a Headset be sure to include the type=headset line, if left out it defaults +to phone. + +The CLI command 'mobile show devices' can be used at any time to show the status of configured devices, +and whether or not the device is capable of sending / receiving SMS via bluetooth. + +*CLI> mobile show devices +ID Address Group Adapter Connected State SMS +headset 00:0B:9E:11:AE:C6 0 blue No Init No +LGTU550 00:E0:91:7F:46:44 1 dlink No Init No +*CLI> + +As each phone is connected you will see a message on the Asterisk console :- + + Loaded chan_mobile.so => (Bluetooth Mobile Device Channel Driver) + -- Bluetooth Device blackberry has connected. + -- Bluetooth Device dave has connected. + +To make outbound calls, add something to you Dialplan like the following :- (modify to suit) + +; Calls via LGTU5500 +exten => _9X.,1,Dial(Mobile/LGTU550/${EXTEN:1},45) +exten => _9X.,n,Hangup + +To use channel groups, add an entry to each phones definition in mobile.conf like group=n +where n is a number. + +Then if you do something like Dial(Mobile/g1/123456) Asterisk will dial 123456 on the first +connected free phone in group 1. + +Phones which do not have a specific 'group=n' will be in group 0. + + +To dial out on a headset, you need to use some other mechanism, because the headset is not likely +to have all the needed buttons on it. res_clioriginate is good for this :- + +*CLI> originate Mobile/headset extension NNNNN at context + +This will call your headset, once you answer, Asterisk will call NNNNN at context context + +Dialplan hints :- + +chan_mobile supports 'device status' so you can do somthing like + +exten => 1234,hint,SIP/30&Mobile/dave&Mobile/blackberry + + +MobileStatus Application :- + +chan_mobile also registers an application named MobileStatus. You can use this in your Dialplan +to determine the 'state' of a device. + +For example, suppose you wanted to call dave's extension, but only if he was in the office. You could +test to see if his mobile phone was attached to Asterisk, if it is dial his extension, otherwise dial his +mobile phone. + +exten => 40,1,MobileStatus(dave,DAVECELL) +exten => 40,2,GotoIf($["${DAVECELL}" = "1"]?3:5) +exten => 40,3,Dial(ZAP/g1/0427466412,45,tT) +exten => 40,4,Hangup +exten => 40,5,Dial(SIP/40,45,tT) +exten => 40,6,Hangup + +MobileStatus sets the value of the given variable to :- + +1 = Disconnected. i.e. Device not in range of Asterisk, or turned off etc etc +2 = Connected and Not on a call. i.e. Free +3 = Connected and on a call. i.e. Busy + + +SMS Sending / Receiving + +If Asterisk has detected your mobile phone is capable of SMS via bluetooth, you will be able to send and +receive SMS. + +Incoming SMS's cause Asterisk to create an inbound call to the context you defined in mobile.conf or the default +context if you did not define one. The call will start at extension 'sms'. Two channel variables will be available, +SMSSRC = the number of the originator of the SMS and SMSTXT which is the text of the SMS. +This is not a voice call, so grab the values of the variables and hang the call up. + +So, to handle incoming SMS's, do something like the following in your dialplan + +[incoming-mobile] +exten => sms,1,Verbose(Incoming SMS from ${SMSSRC} ${SMSTXT}) +exten => sms,n,Hangup() + +The above will just print the message on the console. + +If you use res_jabber, you could do something like this :- + +[incoming-mobile] +exten => sms,1,JabberSend(transport,user at jabber.somewhere.com,SMS from ${SMSRC} ${SMSTXT}) +exten => sms,2,Hangup() + +To send an SMS, use the application MobileSendSMS like the following :- + +exten => 99,1,MobileSendSMS(dave,0427123456,Hello World) + +This will send 'Hello World' via device 'dave' to '0427123456' + + +DTMF Debouncing :- + +DTMF detection varies from phone to phone. There is a configuration variable that allows you to tune +this to your needs. e.g. in mobile.conf + +[LGTU550] +address=00:12:56:90:6E:00 +port=4 +context=incoming-mobile +dtmfskip=50 + +change dtmfskip to suit your phone. The default is 200. The larger the number, the more chance of missed DTMF. +The smaller the number the more chance of multiple digits being detected. + + +Debugging :- + +Different phone manufacturers have different interpretations of the Bluetooth Handsfree Profile Spec. +This means that not all phones work the same way, particularly in the connection setup / initialisation +sequence. I've tried to make chan_mobile as general as possible, but it may need modification to +support some phone i've never tested. + +Some phones, most notably Sony Ericsson 'T' series, dont quite conform to the Bluetooth HFP spec. +chan_mobile will detect these and adapt accordingly. The T-610 and T-630 have been tested and +work fine. + +If your phone doesnt behave has expected, turn on Asterisk debugging with 'core set debug 1'. + +This will log a bunch of debug messages indicating what the phone is doing, importantly the rfcomm +conversation between Asterisk and the phone. This can be used to sort out what your phone is doing +and make chan_mobile support it. + +Be aware also, that just about all mobile phones behave differently. For example my LG TU500 wont dial unless +the phone is a the 'idle' screen. i.e. if the phone is showing a 'menu' on the display, when you dial via +Asterisk, the call will not work. chan_mobile handles this, but there may be other phones that do +other things too... + +Important: Watch what your mobile phone is doing the first few times. Asterisk wont make random calls but +if chan_mobile fails to hangup for some reason and you get a huge bill from your telco, dont blame me ;) + + +Feedback, Support, Please can you make Mobile Phone X work... etc :- + +as always, bugs should be reported at http://bugs.digium.com + +email me at david.bowerman at gmail.com or dseeb_ on #asterisk & #asterisk-dev irc. diff --git a/makeopts.in b/makeopts.in index 3d564b7..a394c18 100644 --- a/makeopts.in +++ b/makeopts.in @@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@ ASOUND_INCLUDE=@ALSA_INCLUDE@ ASOUND_LIB=@ALSA_LIB@ +BLUETOOTH_LIB=@BLUETOOTH_LIB@ +BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@ + CURL_INCLUDE=@CURL_INCLUDE@ CURL_LIB=@CURL_LIB@ -- 1.5.5.2 0007-Use-pkgconfig-to-check-for-Lua.patch: --- NEW FILE 0007-Use-pkgconfig-to-check-for-Lua.patch --- >From 13533edf557befc432dc78512a34be5d1a645411 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 13:14:23 -0600 Subject: [PATCH] Use pkgconfig to check for Lua. --- configure.ac | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b2a8051..2da38f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1332,9 +1332,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then [${PWLIB_INCLUDE}], [${PWLIB_LIB}]) fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" -AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) +PBX_LUA=0 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + AC_DEFINE([HAVE_LUA], 1, [Define if your system has the LUA libraries.]) +fi AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) -- 1.5.5.2 0008-Build-using-external-libedit.patch: --- NEW FILE 0008-Build-using-external-libedit.patch --- >From ab565a3223d72d479e9616e6dab6fa4d8524940a Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Tue, 25 Mar 2008 00:50:27 -0500 Subject: [PATCH] Build using external libedit. --- build_tools/menuselect-deps.in | 1 + configure.ac | 22 ++++++++++++++++++++++ main/Makefile | 7 ++++--- main/cli.c | 3 ++- makeopts.in | 4 ++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index c25e5d2..e50e64e 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -16,6 +16,7 @@ ISDNNET=@PBX_ISDNNET@ IXJUSER=@PBX_IXJUSER@ JACK=@PBX_JACK@ LDAP=@PBX_LDAP@ +LIBEDIT=@PBX_LIBEDIT@ LTDL=@PBX_LTDL@ LUA=@PBX_LUA@ MISDN=@PBX_MISDN@ diff --git a/configure.ac b/configure.ac index 2da38f1..c514e10 100644 --- a/configure.ac +++ b/configure.ac @@ -220,6 +220,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap]) AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack]) AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap]) +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit]) AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn]) @@ -1571,6 +1572,27 @@ AC_SUBST(PBX_GTK2) AC_SUBST(GTK2_INCLUDE) AC_SUBST(GTK2_LIB) +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + AC_CHECK_TOOL(PKGCONFIG, pkg-config, no) + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.]) + fi + fi +fi +AC_SUBST(PBX_LIBEDIT) +AC_SUBST(LIBEDIT_INCLUDE) +AC_SUBST(LIBEDIT_LIB) +AC_SUBST(LIBEDIT_OBJ) + if test "${USE_CURL}" != "no"; then AC_PATH_TOOL([CURL_CONFIG], [curl-config], No) if test ! x"${CURL_CONFIG}" = xNo; then diff --git a/main/Makefile b/main/Makefile index 976c37b..09c5eb6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -133,6 +133,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE) ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: ASTCFLAGS+=$(GMIME_INCLUDE) @@ -166,13 +167,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) GMIMELDFLAGS+=$(GMIME_LIB) endif -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) endif $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ diff --git a/main/cli.c b/main/cli.c index 11d6671..dce7950 100644 --- a/main/cli.c +++ b/main/cli.c @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include +#include + #include "asterisk/cli.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" @@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/app.h" #include "asterisk/lock.h" -#include "editline/readline/readline.h" #include "asterisk/threadstorage.h" /*! diff --git a/makeopts.in b/makeopts.in index a394c18..ad7a94d 100644 --- a/makeopts.in +++ b/makeopts.in @@ -238,3 +238,7 @@ TINFO_DIR=@TINFO_DIR@ # if poll is not present, let the makefile know. POLL_AVAILABLE=@HAS_POLL@ + +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@ +LIBEDIT_LIB=@LIBEDIT_LIB@ +LIBEDIT_OBJ=@LIBEDIT_OBJ@ -- 1.5.5.2 0009-Update-cdr_tds-to-latest.patch: --- NEW FILE 0009-Update-cdr_tds-to-latest.patch --- >From 16d58dce72ad486e8962f570b6ae48ceac7e532e Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 2 Jul 2008 10:15:41 -0500 Subject: [PATCH] Update cdr_tds to latest. --- UPGRADE.txt | 3 + cdr/cdr_tds.c | 462 +++++++++++++++++++------------------- configure.ac | 29 +--- doc/tex/freetds.tex | 20 +-- include/asterisk/autoconfig.h.in | 3 - 5 files changed, 238 insertions(+), 279 deletions(-) diff --git a/UPGRADE.txt b/UPGRADE.txt index 70a0f81..d5e97a1 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -123,6 +123,9 @@ CDR: username and password parameters in cdr_odbc.conf, therefore, are no longer used. The dsn parameter now points to an entry in res_odbc.conf. +* The cdr_tds module now supports all versions of FreeTDS that contain + the db-lib frontend. + Formats: * format_wav: The GAIN preprocessor definition and source code that used it diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 9d322fd..8654c80 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -66,72 +66,76 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include - #include "asterisk/config.h" #include "asterisk/channel.h" #include "asterisk/cdr.h" #include "asterisk/module.h" -#ifdef FREETDS_PRE_0_62 -#warning "You have older TDS, you should upgrade!" -#endif +#include +#include #define DATE_FORMAT "%Y/%m/%d %T" -static char *name = "mssql"; +static char *name = "FreeTDS (MSSQL)"; static char *config = "cdr_tds.conf"; -static char *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL, *charset = NULL, *language = NULL; -static char *table = NULL; - -static int connected = 0; +struct cdr_tds_config { + AST_DECLARE_STRING_FIELDS( + AST_STRING_FIELD(hostname); + AST_STRING_FIELD(database); + AST_STRING_FIELD(username); + AST_STRING_FIELD(password); + AST_STRING_FIELD(table); + AST_STRING_FIELD(charset); + AST_STRING_FIELD(language); + ); + DBPROCESS *dbproc; + unsigned int connected:1; +}; AST_MUTEX_DEFINE_STATIC(tds_lock); -static TDSSOCKET *tds; -static TDSLOGIN *login; -static TDSCONTEXT *context; +static struct cdr_tds_config *settings; static char *anti_injection(const char *, int); -static void get_date(char *, struct timeval); +static void get_date(char *, size_t len, struct timeval); static int mssql_connect(void); static int mssql_disconnect(void); static int tds_log(struct ast_cdr *cdr) { - char sqlcmd[2048], start[80], answer[80], end[80]; + char start[80], answer[80], end[80]; char *accountcode, *src, *dst, *dcontext, *clid, *channel, *dstchannel, *lastapp, *lastdata, *uniqueid; - int res = 0; - int retried = 0; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif + RETCODE erc; + int res = -1; + + accountcode = anti_injection(cdr->accountcode, 20); + src = anti_injection(cdr->src, 80); + dst = anti_injection(cdr->dst, 80); + dcontext = anti_injection(cdr->dcontext, 80); + clid = anti_injection(cdr->clid, 80); + channel = anti_injection(cdr->channel, 80); + dstchannel = anti_injection(cdr->dstchannel, 80); + lastapp = anti_injection(cdr->lastapp, 80); + lastdata = anti_injection(cdr->lastdata, 80); + uniqueid = anti_injection(cdr->uniqueid, 32); + + get_date(start, sizeof(start), cdr->start); + get_date(answer, sizeof(answer), cdr->answer); + get_date(end, sizeof(end), cdr->end); ast_mutex_lock(&tds_lock); - memset(sqlcmd, 0, 2048); + /* Ensure that we are connected */ + if (!settings->connected) { + if (mssql_connect()) { + /* Connect failed */ + goto done; + } + } - accountcode = anti_injection(cdr->accountcode, 20); - src = anti_injection(cdr->src, 80); - dst = anti_injection(cdr->dst, 80); - dcontext = anti_injection(cdr->dcontext, 80); - clid = anti_injection(cdr->clid, 80); - channel = anti_injection(cdr->channel, 80); - dstchannel = anti_injection(cdr->dstchannel, 80); - lastapp = anti_injection(cdr->lastapp, 80); - lastdata = anti_injection(cdr->lastdata, 80); - uniqueid = anti_injection(cdr->uniqueid, 32); - - get_date(start, cdr->start); - get_date(answer, cdr->answer); - get_date(end, cdr->end); - - sprintf( - sqlcmd, + erc = dbfcmd(settings->dbproc, "INSERT INTO %s " "(" "accountcode, " @@ -172,7 +176,7 @@ static int tds_log(struct ast_cdr *cdr) "'%s', " /* amaflags */ "'%s'" /* uniqueid */ ")", - table, + settings->table, accountcode, src, dst, @@ -192,27 +196,26 @@ static int tds_log(struct ast_cdr *cdr) uniqueid ); - do { - if (!connected) { - if (mssql_connect()) - ast_log(LOG_ERROR, "Failed to reconnect to SQL database.\n"); - else - ast_log(LOG_WARNING, "Reconnected to SQL database.\n"); + if (erc == FAIL) { + ast_log(LOG_ERROR, "Failed to build INSERT statement, no CDR was logged.\n"); + goto done; + } - retried = 1; /* note that we have now tried */ - } + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Failed to execute INSERT statement, no CDR was logged.\n"); + goto done; + } -#ifdef FREETDS_PRE_0_62 - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Failed to insert Call Data Record into SQL database.\n"); + /* Consume any results we might get back (this is more of a sanity check than + * anything else, since an INSERT shouldn't return results). */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); + } - mssql_disconnect(); /* this is ok even if we are already disconnected */ - } - } while (!connected && !retried); + res = 0; + +done: + ast_mutex_unlock(&tds_lock); ast_free(accountcode); ast_free(src); @@ -225,285 +228,252 @@ static int tds_log(struct ast_cdr *cdr) ast_free(lastdata); ast_free(uniqueid); - ast_mutex_unlock(&tds_lock); - return res; } static char *anti_injection(const char *str, int len) { /* Reference to http://www.nextgenss.com/papers/advanced_sql_injection.pdf */ - char *buf; char *buf_ptr, *srh_ptr; char *known_bad[] = {"select", "insert", "update", "delete", "drop", ";", "--", "\0"}; int idx; - if ((buf = ast_malloc(len + 1)) == NULL) - { - ast_log(LOG_ERROR, "cdr_tds: Out of memory error\n"); + if (!(buf = ast_calloc(1, len + 1))) { + ast_log(LOG_ERROR, "Out of memory\n"); return NULL; } - memset(buf, 0, len); buf_ptr = buf; /* Escape single quotes */ - for (; *str && strlen(buf) < len; str++) - { - if (*str == '\'') + for (; *str && strlen(buf) < len; str++) { + if (*str == '\'') { *buf_ptr++ = '\''; + } *buf_ptr++ = *str; } *buf_ptr = '\0'; /* Erase known bad input */ - for (idx=0; *known_bad[idx]; idx++) - { - while((srh_ptr = strcasestr(buf, known_bad[idx]))) - { - memmove(srh_ptr, srh_ptr+strlen(known_bad[idx]), strlen(srh_ptr+strlen(known_bad[idx]))+1); + for (idx = 0; *known_bad[idx]; idx++) { + while ((srh_ptr = strcasestr(buf, known_bad[idx]))) { + memmove(srh_ptr, srh_ptr + strlen(known_bad[idx]), strlen(srh_ptr + strlen(known_bad[idx])) + 1); } } return buf; } -static void get_date(char *dateField, struct timeval tv) +static void get_date(char *dateField, size_t len, struct timeval tv) { - struct ast_tm tm; - char buf[80]; - /* To make sure we have date variable if not insert null to SQL */ - if (!ast_tvzero(tv)) - { + if (!ast_tvzero(tv)) { + struct ast_tm tm; ast_localtime(&tv, &tm, NULL); - ast_strftime(buf, 80, DATE_FORMAT, &tm); - sprintf(dateField, "'%s'", buf); - } - else - { - strcpy(dateField, "null"); + ast_strftime(dateField, len, "'" DATE_FORMAT "'", &tm); + } else { + ast_copy_string(dateField, "null", len); } } static int mssql_disconnect(void) { - if (tds) { - tds_free_socket(tds); - tds = NULL; + if (settings->dbproc) { + dbclose(settings->dbproc); + settings->dbproc = NULL; } - if (context) { - tds_free_context(context); - context = NULL; - } - - if (login) { - tds_free_login(login); - login = NULL; - } - - connected = 0; + settings->connected = 0; return 0; } static int mssql_connect(void) { -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - TDSCONNECTION *connection = NULL; -#else - TDSCONNECTINFO *connection = NULL; -#endif - char query[128]; - - /* Connect to M$SQL Server */ - if (!(login = tds_alloc_login())) - { - ast_log(LOG_ERROR, "tds_alloc_login() failed.\n"); + LOGINREC *login; + + if ((login = dblogin()) == NULL) { + ast_log(LOG_ERROR, "Unable to allocate login structure for db-lib\n"); return -1; } - - tds_set_server(login, hostname); - tds_set_user(login, dbuser); - tds_set_passwd(login, password); - tds_set_app(login, "TSQL"); - tds_set_library(login, "TDS-Library"); -#ifndef FREETDS_PRE_0_62 - tds_set_client_charset(login, charset); -#endif - tds_set_language(login, language); - tds_set_packet(login, 512); - tds_set_version(login, 7, 0); - -#ifdef FREETDS_0_64 - if (!(context = tds_alloc_context(NULL))) -#else - if (!(context = tds_alloc_context())) -#endif - { - ast_log(LOG_ERROR, "tds_alloc_context() failed.\n"); - goto connect_fail; + + DBSETLAPP(login, "TSQL"); + DBSETLUSER(login, (char *) settings->username); + DBSETLPWD(login, (char *) settings->password); + DBSETLCHARSET(login, (char *) settings->charset); + DBSETLNATLANG(login, (char *) settings->language); + + if ((settings->dbproc = dbopen(login, (char *) settings->hostname)) == NULL) { + ast_log(LOG_ERROR, "Unable to connect to %s\n", settings->hostname); + dbloginfree(login); + return -1; } - if (!(tds = tds_alloc_socket(context, 512))) { - ast_log(LOG_ERROR, "tds_alloc_socket() failed.\n"); - goto connect_fail; + dbloginfree(login); + + if (dbuse(settings->dbproc, (char *) settings->database) == FAIL) { + ast_log(LOG_ERROR, "Unable to select database %s\n", settings->database); + goto failed; } - tds_set_parent(tds, NULL); - connection = tds_read_config_info(tds, login, context->locale); - if (!connection) - { - ast_log(LOG_ERROR, "tds_read_config() failed.\n"); - goto connect_fail; + if (dbfcmd(settings->dbproc, "SELECT 1 FROM [%s]", settings->table) == FAIL) { + ast_log(LOG_ERROR, "Unable to build query while verifying the existence of table '%s'\n", settings->table); + goto failed; } - if (tds_connect(tds, connection) == TDS_FAIL) - { - ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n"); - tds = NULL; /* freed by tds_connect() on error */ -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - goto connect_fail; + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Unable to verify existence of table '%s'\n", settings->table); + goto failed; } -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - - sprintf(query, "USE %s", dbname); -#ifdef FREETDS_PRE_0_62 - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Could not change database (%s)\n", dbname); - goto connect_fail; + + /* Consume the result set (we don't really care about the result, though) */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); } - connected = 1; + settings->connected = 1; + return 0; -connect_fail: - mssql_disconnect(); +failed: + dbclose(settings->dbproc); + settings->dbproc = NULL; return -1; } static int tds_unload_module(void) { - mssql_disconnect(); + if (settings) { + ast_mutex_lock(&tds_lock); + mssql_disconnect(); + ast_mutex_unlock(&tds_lock); + + ast_string_field_free_memory(settings); + ast_free(settings); + } ast_cdr_unregister(name); - if (hostname) ast_free(hostname); - if (dbname) ast_free(dbname); - if (dbuser) ast_free(dbuser); - if (password) ast_free(password); - if (charset) ast_free(charset); - if (language) ast_free(language); - if (table) ast_free(table); + dbexit(); + + return 0; +} + +static int tds_error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) +{ + ast_log(LOG_ERROR, "%s (%d)\n", dberrstr, dberr); + + if (oserr != DBNOERR) { + ast_log(LOG_ERROR, "%s (%d)\n", oserrstr, oserr); + } + + return INT_CANCEL; +} + +static int tds_message_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severity, char *msgtext, char *srvname, char *procname, int line) +{ + ast_debug(1, "Msg %d, Level %d, State %d, Line %d\n", msgno, severity, msgstate, line); + ast_log(LOG_NOTICE, "%s\n", msgtext); return 0; } static int tds_load_module(int reload) { - int res = 0; struct ast_config *cfg; - struct ast_variable *var; const char *ptr = NULL; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif cfg = ast_config_load(config, config_flags); if (!cfg) { - ast_log(LOG_NOTICE, "Unable to load config for MSSQL CDR's: %s\n", config); + ast_log(LOG_NOTICE, "Unable to load TDS config for CDRs: %s\n", config); return 0; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) return 0; - var = ast_variable_browse(cfg, "global"); - if (!var) /* nothing configured */ { + if (!ast_variable_browse(cfg, "global")) { + /* nothing configured */ ast_config_destroy(cfg); return 0; } - + + ast_mutex_lock(&tds_lock); + + /* Clear out any existing settings */ + ast_string_field_init(settings, 0); + ptr = ast_variable_retrieve(cfg, "global", "hostname"); if (ptr) { - if (hostname) - ast_free(hostname); - hostname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database server hostname not specified.\n"); + ast_string_field_set(settings, hostname, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database server hostname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "dbname"); if (ptr) { - if (dbname) - ast_free(dbname); - dbname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbname not specified.\n"); + ast_string_field_set(settings, database, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "user"); if (ptr) { - if (dbuser) - ast_free(dbuser); - dbuser = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbuser not specified.\n"); + ast_string_field_set(settings, username, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbuser not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "password"); if (ptr) { - if (password) - ast_free(password); - password = ast_strdup(ptr); - } else - ast_log(LOG_ERROR,"Database password not specified.\n"); + ast_string_field_set(settings, password, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database password not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "charset"); - if (charset) - ast_free(charset); - if (ptr) - charset = ast_strdup(ptr); - else - charset = ast_strdup("iso_1"); - - if (language) - ast_free(language); + if (ptr) { + ast_string_field_set(settings, charset, ptr); + } else { + ast_string_field_set(settings, charset, "iso_1"); + } + ptr = ast_variable_retrieve(cfg, "global", "language"); - if (ptr) - language = ast_strdup(ptr); - else - language = ast_strdup("us_english"); + if (ptr) { + ast_string_field_set(settings, language, ptr); + } else { + ast_string_field_set(settings, language, "us_english"); + } ptr = ast_variable_retrieve(cfg, "global", "table"); - if (ptr == NULL) { - ast_debug(1, "cdr_tds: table not specified. Assuming cdr\n"); - ptr = "cdr"; + if (ptr) { + ast_string_field_set(settings, table, ptr); + } else { + ast_log(LOG_NOTICE, "Table name not specified, using 'cdr' by default.\n"); + ast_string_field_set(settings, table, "cdr"); + } + + mssql_disconnect(); + + if (mssql_connect()) { + /* We failed to connect (mssql_connect takes care of logging it) */ + goto failed; } - if (table) - ast_free(table); - table = ast_strdup(ptr); + ast_mutex_unlock(&tds_lock); ast_config_destroy(cfg); - ast_mutex_lock(&tds_lock); - mssql_disconnect(); - mssql_connect(); + return 1; + +failed: ast_mutex_unlock(&tds_lock); + ast_config_destroy(cfg); - return res; + return 0; } static int reload(void) @@ -513,9 +483,35 @@ static int reload(void) static int load_module(void) { - if (!tds_load_module(0)) + if (dbinit() == FAIL) { + ast_log(LOG_ERROR, "Failed to initialize FreeTDS db-lib\n"); return AST_MODULE_LOAD_DECLINE; + } + + dberrhandle(tds_error_handler); + dbmsghandle(tds_message_handler); + + settings = ast_calloc(1, sizeof(*settings)); + + if (!settings || ast_string_field_init(settings, 256)) { + if (settings) { + ast_free(settings); + settings = NULL; + } + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + + if (!tds_load_module(0)) { + ast_string_field_free_memory(settings); + ast_free(settings); + settings = NULL; + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + ast_cdr_register(name, ast_module_info->description, tds_log); + return AST_MODULE_LOAD_SUCCESS; } @@ -524,7 +520,7 @@ static int unload_module(void) return tds_unload_module(); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MSSQL CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, diff --git a/configure.ac b/configure.ac index c514e10..8d0b2da 100644 --- a/configure.ac +++ b/configure.ac @@ -1379,34 +1379,7 @@ fi AST_EXT_TOOL_CHECK([GMIME], [gmime]) -AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h]) -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi +AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h]) AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], []) diff --git a/doc/tex/freetds.tex b/doc/tex/freetds.tex index 8dcbec2..8db589f 100644 --- a/doc/tex/freetds.tex +++ b/doc/tex/freetds.tex @@ -1,16 +1,6 @@ -The cdr\_tds module is NOT compatible with version 0.63 of FreeTDS. - -The cdr\_tds module is known to work with FreeTDS version 0.62.1; -it should also work with 0.62.2, 0.62.3 and 0.62.4, which are bug -fix releases. - -The cdr\_tds module uses the raw "libtds" API of FreeTDS. It appears -that from 0.63 onwards, this is not considered a published API -of FreeTDS and is subject to change without notice. - -Between 0.62.x and 0.63 of FreeTDS, many incompatible changes -have been made to the libtds API. - -For newer versions of FreeTDS, it is recommended that you use the -ODBC driver. +The cdr\_tds module now works with most modern release versions of FreeTDS (from +at least 0.60 through 0.82). Although versions of FreeTDS prior to 0.82 will +work, we recommend using the latest available version for performance and +stability reasons. +The latest release of FreeTDS is available from http://www.freetds.org/ diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index b368c8d..3a76722 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1193,9 +1193,6 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 0010-Update-autoconf.patch: --- NEW FILE 0010-Update-autoconf.patch --- >From d8af2026b55ad1c056de5b136340b0e3757a669f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 2 Jul 2008 10:19:36 -0500 Subject: [PATCH] Update autoconf. --- configure | 1094 +++++++++++++++++++++++++++++--------- include/asterisk/autoconfig.h.in | 23 +- 2 files changed, 865 insertions(+), 252 deletions(-) diff --git a/configure b/configure index d72fa38..1dd6af6 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 115581 . +# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -728,14 +728,18 @@ BKTR_LIB BKTR_INCLUDE BKTR_DIR PBX_BKTR -CAP_LIB -CAP_INCLUDE -CAP_DIR -PBX_CAP +BLUETOOTH_LIB +BLUETOOTH_INCLUDE +BLUETOOTH_DIR +PBX_BLUETOOTH CURL_LIB CURL_INCLUDE CURL_DIR PBX_CURL +CAP_LIB +CAP_INCLUDE +CAP_DIR +PBX_CAP CURSES_LIB CURSES_INCLUDE CURSES_DIR @@ -788,6 +792,10 @@ LDAP_LIB LDAP_INCLUDE LDAP_DIR PBX_LDAP +LIBEDIT_LIB +LIBEDIT_INCLUDE +LIBEDIT_DIR +PBX_LIBEDIT LTDL_LIB LTDL_INCLUDE LTDL_DIR @@ -872,6 +880,10 @@ SDL_IMAGE_LIB SDL_IMAGE_INCLUDE SDL_IMAGE_DIR PBX_SDL_IMAGE +SPANDSP_LIB +SPANDSP_INCLUDE +SPANDSP_DIR +PBX_SPANDSP SPEEX_LIB SPEEX_INCLUDE SPEEX_DIR @@ -963,6 +975,7 @@ OPENH323_INCDIR OPENH323_LIBDIR OPENH323_SUFFIX OPENH323_BUILD +PKGCONFIG PBX_SPEEX_PREPROCESS CONFIG_GMIME PBX_ZAPTEL_VLDTMF @@ -976,7 +989,7 @@ PBX_H323 PBX_IXJUSER CONFIG_SDL CONFIG_GTK -PKGCONFIG +LIBEDIT_OBJ CURL_CONFIG LTLIBOBJS' ac_subst_files='' @@ -1576,8 +1589,9 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-asound=PATH use Advanced Linux Sound Architecture files in PATH --with-execinfo=PATH use Stack Backtrace support files in PATH - --with-cap=PATH use POSIX 1.e capabilities files in PATH + --with-bluetooth=PATH use Bluetooth Support files in PATH --with-curl=PATH use cURL files in PATH + --with-cap=PATH use POSIX 1.e capabilities files in PATH --with-curses=PATH use curses files in PATH --with-crypto=PATH use OpenSSL Cryptography support files in PATH --with-avcodec=PATH use Ffmpeg and avcodec library files in PATH @@ -1592,6 +1606,7 @@ Optional Packages: --with-isdnnet=PATH use ISDN4Linux Library files in PATH --with-jack=PATH use Jack Audio Connection Kit files in PATH --with-ldap=PATH use OpenLDAP files in PATH + --with-libedit=PATH use NetBSD Editline library files in PATH --with-ltdl=PATH use libtool files in PATH --with-lua=PATH use Lua files in PATH --with-misdn=PATH use mISDN User Library files in PATH @@ -1613,6 +1628,7 @@ Optional Packages: --with-radius=PATH use Radius Client files in PATH --with-sdl=PATH use Sdl files in PATH --with-SDL_image=PATH use Sdl Image library files in PATH + --with-spandsp=PATH use spandsp Library files in PATH --with-speex=PATH use Speex files in PATH --with-speexdsp=PATH use Speexdsp files in PATH --with-sqlite=PATH use SQLite files in PATH @@ -7942,6 +7958,62 @@ fi + BLUETOOTH_DESCRIP="Bluetooth Support" + BLUETOOTH_OPTION="bluetooth" + +# Check whether --with-bluetooth was given. +if test "${with_bluetooth+set}" = set; then + withval=$with_bluetooth; + case ${withval} in + n|no) + USE_BLUETOOTH=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + *) + BLUETOOTH_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + esac + +fi + + PBX_BLUETOOTH=0 + + + + + + + CURL_DESCRIP="cURL" + CURL_OPTION="curl" + +# Check whether --with-curl was given. +if test "${with_curl+set}" = set; then + withval=$with_curl; + case ${withval} in + n|no) + USE_CURL=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + *) + CURL_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + esac + +fi + + PBX_CURL=0 + + + + + + CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" @@ -8362,6 +8434,34 @@ fi + LIBEDIT_DESCRIP="NetBSD Editline library" + LIBEDIT_OPTION="libedit" + +# Check whether --with-libedit was given. +if test "${with_libedit+set}" = set; then + withval=$with_libedit; + case ${withval} in + n|no) + USE_LIBEDIT=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + *) + LIBEDIT_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + esac + +fi + + PBX_LIBEDIT=0 + + + + + + LTDL_DESCRIP="libtool" LTDL_OPTION="ltdl" @@ -8950,6 +9050,34 @@ fi + SPANDSP_DESCRIP="spandsp Library" + SPANDSP_OPTION="spandsp" + +# Check whether --with-spandsp was given. +if test "${with_spandsp+set}" = set; then + withval=$with_spandsp; + case ${withval} in + n|no) + USE_SPANDSP=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + *) + SPANDSP_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + esac + +fi + + PBX_SPANDSP=0 + + + + + + SPEEX_DESCRIP="Speex" SPEEX_OPTION="speex" @@ -12772,13 +12900,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12818,13 +12944,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18333,6 +18457,268 @@ fi +if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then + pbxlibdir="" + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + if test -d ${BLUETOOTH_DIR}/lib; then + pbxlibdir="-L${BLUETOOTH_DIR}/lib" + else + pbxlibdir="-L${BLUETOOTH_DIR}" + fi + fi + pbxfuncname="ba2str" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_BLUETOOTH_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lbluetooth" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lbluetooth... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbluetooth ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_BLUETOOTH_FOUND=yes +else + AST_BLUETOOTH_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_BLUETOOTH_FOUND}" = "yes"; then + BLUETOOTH_LIB="${pbxlibdir} -lbluetooth " + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include" + fi + BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} " + if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found + BLUETOOTH_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE} " + if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } + +fi +if test $ac_cv_header_bluetooth_bluetooth_h = yes; then + BLUETOOTH_HEADER_FOUND=1 +else + BLUETOOTH_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then + BLUETOOTH_LIB="" + BLUETOOTH_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + BLUETOOTH_LIB="" + fi + PBX_BLUETOOTH=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH_VERSION +_ACEOF + + fi + fi +fi + + + if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="" # if --with-CURSES=DIR has been specified, use it. @@ -41087,31 +41473,137 @@ _ACEOF fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" +PBX_LUA=0 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + -if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LUA 1 +_ACEOF + +fi + + +if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="" - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - if test -d ${LUA_DIR}/lib; then - pbxlibdir="-L${LUA_DIR}/lib" + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + if test -d ${RADIUS_DIR}/lib; then + pbxlibdir="-L${RADIUS_DIR}/lib" else - pbxlibdir="-L${LUA_DIR}" + pbxlibdir="-L${RADIUS_DIR}" fi fi - pbxfuncname="luaL_newstate" + pbxfuncname="rc_read_config" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes + AST_RADIUS_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llua5.1 ${pbxlibdir} $LIBS" +LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41168,38 +41660,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_LUA_FOUND=yes + AST_RADIUS_FOUND=yes else - AST_LUA_FOUND=no + AST_RADIUS_FOUND=no fi fi # now check for the header. - if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua5.1 " - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - LUA_INCLUDE="-I${LUA_DIR}/include" - fi - LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua5.1/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" + if test "${AST_RADIUS_FOUND}" = "yes"; then + RADIUS_LIB="${pbxlibdir} -lradiusclient-ng " + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + RADIUS_INCLUDE="-I${RADIUS_DIR}/include" + fi + RADIUS_INCLUDE="${RADIUS_INCLUDE} " + if test "xradiusclient-ng.h" = "x" ; then # no header, assume found + RADIUS_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE} " - if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then + CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE} " + if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h usability" >&5 -echo $ECHO_N "checking lua5.1/lua.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 +echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41207,7 +41699,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41239,15 +41731,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h presence" >&5 -echo $ECHO_N "checking lua5.1/lua.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 +echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -41280,25 +41772,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -41307,43 +41799,43 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_lua5_1_lua_h=$ac_header_preproc + ac_cv_header_radiusclient_ng_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } fi -if test $ac_cv_header_lua5_1_lua_h = yes; then - LUA_HEADER_FOUND=1 +if test $ac_cv_header_radiusclient_ng_h = yes; then + RADIUS_HEADER_FOUND=1 else - LUA_HEADER_FOUND=0 + RADIUS_HEADER_FOUND=0 fi CPPFLAGS="${saved_cppflags}" fi - if test "x${LUA_HEADER_FOUND}" = "x0" ; then - LUA_LIB="" - LUA_INCLUDE="" + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then + RADIUS_LIB="" + RADIUS_INCLUDE="" else if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" + RADIUS_LIB="" fi - PBX_LUA=1 + PBX_RADIUS=1 # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED cat >>confdefs.h <<_ACEOF -#define HAVE_LUA 1 +#define HAVE_RADIUS 1 _ACEOF cat >>confdefs.h <<_ACEOF -#define HAVE_LUA_VERSION +#define HAVE_RADIUS_VERSION _ACEOF fi @@ -41352,28 +41844,28 @@ fi -if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then +if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then pbxlibdir="" - # if --with-RADIUS=DIR has been specified, use it. - if test "x${RADIUS_DIR}" != "x"; then - if test -d ${RADIUS_DIR}/lib; then - pbxlibdir="-L${RADIUS_DIR}/lib" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + if test -d ${SPANDSP_DIR}/lib; then + pbxlibdir="-L${SPANDSP_DIR}/lib" else - pbxlibdir="-L${RADIUS_DIR}" + pbxlibdir="-L${SPANDSP_DIR}" fi fi - pbxfuncname="rc_read_config" + pbxfuncname="fax_init" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RADIUS_FOUND=yes + AST_SPANDSP_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" +LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41430,38 +41922,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_RADIUS_FOUND=yes + AST_SPANDSP_FOUND=yes else - AST_RADIUS_FOUND=no + AST_SPANDSP_FOUND=no fi fi # now check for the header. - if test "${AST_RADIUS_FOUND}" = "yes"; then - RADIUS_LIB="${pbxlibdir} -lradiusclient-ng " - # if --with-RADIUS=DIR has been specified, use it. - if test "x${RADIUS_DIR}" != "x"; then - RADIUS_INCLUDE="-I${RADIUS_DIR}/include" - fi - RADIUS_INCLUDE="${RADIUS_INCLUDE} " - if test "xradiusclient-ng.h" = "x" ; then # no header, assume found - RADIUS_HEADER_FOUND="1" + if test "${AST_SPANDSP_FOUND}" = "yes"; then + SPANDSP_LIB="${pbxlibdir} -lspandsp -ltiff" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" + fi + SPANDSP_INCLUDE="${SPANDSP_INCLUDE} " + if test "xspandsp.h" = "x" ; then # no header, assume found + SPANDSP_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE} " - if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then - { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE} " + if test "${ac_cv_header_spandsp_h+set}" = set; then + { echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 -echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5 +echo $ECHO_N "checking spandsp.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41469,7 +41961,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41501,15 +41993,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 -echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking spandsp.h presence" >&5 +echo $ECHO_N "checking spandsp.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -41542,25 +42034,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: spandsp.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -41569,43 +42061,43 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_radiusclient_ng_h=$ac_header_preproc + ac_cv_header_spandsp_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } fi -if test $ac_cv_header_radiusclient_ng_h = yes; then - RADIUS_HEADER_FOUND=1 +if test $ac_cv_header_spandsp_h = yes; then + SPANDSP_HEADER_FOUND=1 else - RADIUS_HEADER_FOUND=0 + SPANDSP_HEADER_FOUND=0 fi CPPFLAGS="${saved_cppflags}" fi - if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then - RADIUS_LIB="" - RADIUS_INCLUDE="" + if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then + SPANDSP_LIB="" + SPANDSP_INCLUDE="" else if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RADIUS_LIB="" + SPANDSP_LIB="" fi - PBX_RADIUS=1 + PBX_SPANDSP=1 # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED cat >>confdefs.h <<_ACEOF -#define HAVE_RADIUS 1 +#define HAVE_SPANDSP 1 _ACEOF cat >>confdefs.h <<_ACEOF -#define HAVE_RADIUS_VERSION +#define HAVE_SPANDSP_VERSION _ACEOF fi @@ -43914,18 +44406,18 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then pbxlibdir="-L${FREETDS_DIR}" fi fi - pbxfuncname="tds_version" + pbxfuncname="dbinit" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_FREETDS_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_tds_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltds" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ltds... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsybdb" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lsybdb... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ltds ${pbxlibdir} $LIBS" +LIBS="-lsybdb ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43991,29 +44483,29 @@ fi # now check for the header. if test "${AST_FREETDS_FOUND}" = "yes"; then - FREETDS_LIB="${pbxlibdir} -ltds " + FREETDS_LIB="${pbxlibdir} -lsybdb " # if --with-FREETDS=DIR has been specified, use it. if test "x${FREETDS_DIR}" != "x"; then FREETDS_INCLUDE="-I${FREETDS_DIR}/include" fi FREETDS_INCLUDE="${FREETDS_INCLUDE} " - if test "xtds.h" = "x" ; then # no header, assume found + if test "xsybdb.h" = "x" ; then # no header, assume found FREETDS_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE} " - if test "${ac_cv_header_tds_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then + if test "${ac_cv_header_sybdb_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking tds.h usability" >&5 -echo $ECHO_N "checking tds.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h usability" >&5 +echo $ECHO_N "checking sybdb.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44021,7 +44513,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -44053,15 +44545,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking tds.h presence" >&5 -echo $ECHO_N "checking tds.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h presence" >&5 +echo $ECHO_N "checking sybdb.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -44094,25 +44586,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tds.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tds.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tds.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tds.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tds.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sybdb.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sybdb.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sybdb.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sybdb.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -44121,18 +44613,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_tds_h=$ac_header_preproc + ac_cv_header_sybdb_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } fi -if test $ac_cv_header_tds_h = yes; then +if test $ac_cv_header_sybdb_h = yes; then FREETDS_HEADER_FOUND=1 else FREETDS_HEADER_FOUND=0 @@ -44164,33 +44656,6 @@ _ACEOF fi fi -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then @@ -49918,6 +50383,126 @@ fi +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBEDIT 1 +_ACEOF + + fi + fi +fi + + + + + if test "${USE_CURL}" != "no"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args. @@ -50892,14 +51477,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim BKTR_DIR!$BKTR_DIR$ac_delim PBX_BKTR!$PBX_BKTR$ac_delim -CAP_LIB!$CAP_LIB$ac_delim -CAP_INCLUDE!$CAP_INCLUDE$ac_delim -CAP_DIR!$CAP_DIR$ac_delim -PBX_CAP!$PBX_CAP$ac_delim +BLUETOOTH_LIB!$BLUETOOTH_LIB$ac_delim +BLUETOOTH_INCLUDE!$BLUETOOTH_INCLUDE$ac_delim +BLUETOOTH_DIR!$BLUETOOTH_DIR$ac_delim +PBX_BLUETOOTH!$PBX_BLUETOOTH$ac_delim CURL_LIB!$CURL_LIB$ac_delim CURL_INCLUDE!$CURL_INCLUDE$ac_delim CURL_DIR!$CURL_DIR$ac_delim PBX_CURL!$PBX_CURL$ac_delim +CAP_LIB!$CAP_LIB$ac_delim +CAP_INCLUDE!$CAP_INCLUDE$ac_delim +CAP_DIR!$CAP_DIR$ac_delim +PBX_CAP!$PBX_CAP$ac_delim CURSES_LIB!$CURSES_LIB$ac_delim CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim CURSES_DIR!$CURSES_DIR$ac_delim @@ -50952,6 +51541,10 @@ LDAP_LIB!$LDAP_LIB$ac_delim LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim LDAP_DIR!$LDAP_DIR$ac_delim PBX_LDAP!$PBX_LDAP$ac_delim +LIBEDIT_LIB!$LIBEDIT_LIB$ac_delim +LIBEDIT_INCLUDE!$LIBEDIT_INCLUDE$ac_delim +LIBEDIT_DIR!$LIBEDIT_DIR$ac_delim +PBX_LIBEDIT!$PBX_LIBEDIT$ac_delim LTDL_LIB!$LTDL_LIB$ac_delim LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim LTDL_DIR!$LTDL_DIR$ac_delim @@ -50969,14 +51562,6 @@ NBS_INCLUDE!$NBS_INCLUDE$ac_delim NBS_DIR!$NBS_DIR$ac_delim PBX_NBS!$PBX_NBS$ac_delim NCURSES_LIB!$NCURSES_LIB$ac_delim -NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim -NCURSES_DIR!$NCURSES_DIR$ac_delim -PBX_NCURSES!$PBX_NCURSES$ac_delim -NETSNMP_LIB!$NETSNMP_LIB$ac_delim -NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim -NETSNMP_DIR!$NETSNMP_DIR$ac_delim -PBX_NETSNMP!$PBX_NETSNMP$ac_delim -NEWT_LIB!$NEWT_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51018,6 +51603,14 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim +NCURSES_DIR!$NCURSES_DIR$ac_delim +PBX_NCURSES!$PBX_NCURSES$ac_delim +NETSNMP_LIB!$NETSNMP_LIB$ac_delim +NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim +NETSNMP_DIR!$NETSNMP_DIR$ac_delim +PBX_NETSNMP!$PBX_NETSNMP$ac_delim +NEWT_LIB!$NEWT_LIB$ac_delim NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim NEWT_DIR!$NEWT_DIR$ac_delim PBX_NEWT!$PBX_NEWT$ac_delim @@ -51077,6 +51670,10 @@ SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim +SPANDSP_LIB!$SPANDSP_LIB$ac_delim +SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim +SPANDSP_DIR!$SPANDSP_DIR$ac_delim +PBX_SPANDSP!$PBX_SPANDSP$ac_delim SPEEX_LIB!$SPEEX_LIB$ac_delim SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim SPEEX_DIR!$SPEEX_DIR$ac_delim @@ -51103,18 +51700,6 @@ OPENSSL_DIR!$OPENSSL_DIR$ac_delim PBX_OPENSSL!$PBX_OPENSSL$ac_delim FREETDS_LIB!$FREETDS_LIB$ac_delim FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim -FREETDS_DIR!$FREETDS_DIR$ac_delim -PBX_FREETDS!$PBX_FREETDS$ac_delim -TERMCAP_LIB!$TERMCAP_LIB$ac_delim -TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim -TERMCAP_DIR!$TERMCAP_DIR$ac_delim -PBX_TERMCAP!$PBX_TERMCAP$ac_delim -TINFO_LIB!$TINFO_LIB$ac_delim -TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim -TINFO_DIR!$TINFO_DIR$ac_delim -PBX_TINFO!$PBX_TINFO$ac_delim -TONEZONE_LIB!$TONEZONE_LIB$ac_delim -TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51156,6 +51741,18 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +FREETDS_DIR!$FREETDS_DIR$ac_delim +PBX_FREETDS!$PBX_FREETDS$ac_delim +TERMCAP_LIB!$TERMCAP_LIB$ac_delim +TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim +TERMCAP_DIR!$TERMCAP_DIR$ac_delim +PBX_TERMCAP!$PBX_TERMCAP$ac_delim +TINFO_LIB!$TINFO_LIB$ac_delim +TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim +TINFO_DIR!$TINFO_DIR$ac_delim +PBX_TINFO!$PBX_TINFO$ac_delim +TONEZONE_LIB!$TONEZONE_LIB$ac_delim +TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim TONEZONE_DIR!$TONEZONE_DIR$ac_delim PBX_TONEZONE!$PBX_TONEZONE$ac_delim USB_LIB!$USB_LIB$ac_delim @@ -51209,6 +51806,7 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim OPENH323_BUILD!$OPENH323_BUILD$ac_delim +PKGCONFIG!$PKGCONFIG$ac_delim PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim CONFIG_GMIME!$CONFIG_GMIME$ac_delim PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim @@ -51222,12 +51820,12 @@ PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim +LIBEDIT_OBJ!$LIBEDIT_OBJ$ac_delim CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 3a76722..07deb31 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -116,6 +116,12 @@ /* Define to indicate the ${BKTR_DESCRIP} library version */ #undef HAVE_BKTR_VERSION +/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */ +#undef HAVE_BLUETOOTH + +/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */ +#undef HAVE_BLUETOOTH_VERSION + /* Define to 1 if byteswap.h macros are available. */ #undef HAVE_BYTESWAP_H @@ -385,6 +391,9 @@ /* Define to indicate the ${LDAP_DESCRIP} library version */ #undef HAVE_LDAP_VERSION +/* Define if your system has the NetBSD Editline libraries. */ +#undef HAVE_LIBEDIT + /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -442,12 +451,9 @@ /* Define to indicate the ${LTDL_DESCRIP} library version */ #undef HAVE_LTDL_VERSION -/* Define this to indicate the ${LUA_DESCRIP} library */ +/* Define if your system has the LUA libraries. */ #undef HAVE_LUA -/* Define to indicate the ${LUA_DESCRIP} library version */ -#undef HAVE_LUA_VERSION - /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -715,6 +721,12 @@ /* Define to 1 if your system has soxmix application. */ #undef HAVE_SOXMIX +/* Define this to indicate the ${SPANDSP_DESCRIP} library */ +#undef HAVE_SPANDSP + +/* Define to indicate the ${SPANDSP_DESCRIP} library version */ +#undef HAVE_SPANDSP_VERSION + /* Define this to indicate the ${SPEEX_DESCRIP} library */ #undef HAVE_SPEEX @@ -1193,6 +1205,9 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-9/asterisk.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- asterisk.spec 19 May 2008 15:41:04 -0000 1.25 +++ asterisk.spec 2 Jul 2008 16:39:50 -0000 1.26 @@ -4,14 +4,16 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.14.beta%{beta}%{?dist} +Release: 0.17.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ # The Asterisk tarball contains some items that we don't want in there, # so start with the original tarball from here: +# # http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}%{?beta:-beta%{beta}}.tar.gz +# # Then run the included script file to build the stripped tarball: # # sh asterisk-strip.sh %{version} @@ -26,23 +28,22 @@ # 3f04cd803fea058ecec170db15a1a3e1738f0fc9 asterisk-1.6.0-beta9.tar.gz # a5d3d6699bcd55afe35c2e57059f3b3b32ebf112 asterisk-1.6.0-beta9-stripped.tar.gz -#Source0: http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}%{?beta:-beta%{beta}}.tar.gz Source0: asterisk-%{version}%{?beta:-beta%{beta}}-stripped.tar.gz Source1: asterisk-logrotate Source2: menuselect.makedeps Source3: menuselect.makeopts Source4: asterisk-strip.sh -Patch1: asterisk-1.6.0-beta9-initscripts.patch -Patch2: asterisk-1.6.0-beta9-alternate-voicemail.patch -Patch3: asterisk-1.6.0-beta9-spandspfax.patch -#Patch4: asterisk-1.6.0-beta9-appconference.patch -Patch5: asterisk-1.6.0-beta9-alternate-extensions.patch -Patch6: asterisk-1.6.0-beta9-optimization.patch -Patch7: asterisk-1.6.0-beta9-chanmobile.patch -Patch8: asterisk-1.6.0-beta9-lua.patch -Patch9: asterisk-1.6.0-beta9-editline.patch -Patch10: asterisk-1.6.0-beta9-autoconf.patch +Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch +Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch +Patch3: 0003-Add-FAX-apps.patch +Patch4: 0004-Allow-alternate-extensions-to-be-specified-in-users.patch +Patch5: 0005-Pick-proper-optimization-flags-for-Fedora.patch +Patch6: 0006-Add-chan_mobile-from-asterisk-addons.patch +Patch7: 0007-Use-pkgconfig-to-check-for-Lua.patch +Patch8: 0008-Build-using-external-libedit.patch +Patch9: 0009-Update-cdr_tds-to-latest.patch +Patch10: 0010-Update-autoconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -85,6 +86,9 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +# asterisk-conference package removed since patch no longer compiles +Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9 + %description Asterisk is a complete PBX in software. It runs on Linux and provides all of the features you would expect from a PBX and more. Asterisk @@ -402,7 +406,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -#patch4 -p1 +%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -1019,6 +1023,16 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Thu Jul 2 2008 Jeffrey C. Ollie - 1.6.0-0.17.beta9 +- Add patch that unbreaks cdr_tds with FreeTDS 0.82. +- Properly obsolete conference subpackage. + +* Thu Jun 12 2008 Jeffrey C. Ollie - 1.6.0-0.16.beta9 +- Disable building cdr_tds since new FreeTDS in rawhide no longer provides needed library. + +* Wed Jun 11 2008 Jeffrey C. Ollie - 1.6.0-0.15.beta9 +- Bump release and rebuild to fix libtds breakage. + * Mon May 19 2008 Jeffrey C. Ollie - 1.6.0-0.14.beta9 - Update to 1.6.0-beta9. - Update patches so that they apply cleanly. --- asterisk-1.6.0-beta9-alternate-extensions.patch DELETED --- --- asterisk-1.6.0-beta9-alternate-voicemail.patch DELETED --- --- asterisk-1.6.0-beta9-appconference.patch DELETED --- --- asterisk-1.6.0-beta9-autoconf.patch DELETED --- --- asterisk-1.6.0-beta9-chanmobile.patch DELETED --- --- asterisk-1.6.0-beta9-editline.patch DELETED --- --- asterisk-1.6.0-beta9-initscripts.patch DELETED --- --- asterisk-1.6.0-beta9-lua.patch DELETED --- --- asterisk-1.6.0-beta9-optimization.patch DELETED --- --- asterisk-1.6.0-beta9-spandspfax.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 16:41:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:41:05 GMT Subject: rpms/abgraph/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807021641.m62Gf58Q006627@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/abgraph/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXg6328/rpms/abgraph/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module abgraph --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: abgraph # $Id: Makefile,v 1.1 2008/07/02 16:40:51 kevin Exp $ NAME := abgraph SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 2 16:41:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:41:04 +0000 Subject: [pkgdb] quassel was added for tuxbrewr Message-ID: <200807021641.m62Gf4mx015551@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package quassel with summary Distributed IRC Client and Core application Kevin Fenzi (kevin) has approved Package quassel Kevin Fenzi (kevin) has added a Fedora devel branch for quassel with an owner of tuxbrewr Kevin Fenzi (kevin) has approved quassel in Fedora devel Kevin Fenzi (kevin) has approved Package quassel Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quassel (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on quassel (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quassel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quassel From fedora-extras-commits at redhat.com Wed Jul 2 16:41:12 2008 From: fedora-extras-commits at redhat.com (Guido Ledermann (guidoledermann)) Date: Wed, 2 Jul 2008 16:41:12 GMT Subject: rpms/multiget/F-8 MultiGet.png, NONE, 1.1 import.log, NONE, 1.1 multiget-1.2-fix-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 multiget.desktop, 1.1, 1.2 multiget.spec, 1.1, 1.2 sources, 1.2, 1.3 multiget-1.1.4-makefile.patch, 1.1, NONE Message-ID: <200807021641.m62GfCae006793@cvs-int.fedora.redhat.com> Author: guidoledermann Update of /cvs/pkgs/rpms/multiget/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6503/F-8 Modified Files: .cvsignore multiget.desktop multiget.spec sources Added Files: MultiGet.png import.log multiget-1.2-fix-gcc43.patch Removed Files: multiget-1.1.4-makefile.patch Log Message: --- NEW FILE import.log --- multiget-1_2_0-3_fc9:F-8:multiget-1.2.0-3.fc9.src.rpm:1215016800 multiget-1.2-fix-gcc43.patch: --- NEW FILE multiget-1.2-fix-gcc43.patch --- diff -dur multiget.orig/src/batch.cpp multiget/src/batch.cpp --- multiget.orig/src/batch.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/batch.cpp 2008-06-04 20:17:12.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #include "batch.h" #include "common.h" #include diff -dur multiget.orig/src/common.cpp multiget/src/common.cpp --- multiget.orig/src/common.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/common.cpp 2008-06-04 20:17:10.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #include "common.h" #include "speedctrl.h" #include "mirroradmin.h" diff -dur multiget.orig/src/mgftpbase.cpp multiget/src/mgftpbase.cpp --- multiget.orig/src/mgftpbase.cpp 2007-01-13 12:09:02.000000000 +0100 +++ multiget/src/mgftpbase.cpp 2008-06-04 20:17:08.000000000 +0200 @@ -21,7 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include #ifdef WIN32 #include #endif diff -dur multiget.orig/src/mgurlparser.cpp multiget/src/mgurlparser.cpp --- multiget.orig/src/mgurlparser.cpp 2007-01-29 04:51:58.000000000 +0100 +++ multiget/src/mgurlparser.cpp 2008-06-04 20:17:13.000000000 +0200 @@ -22,6 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include +#include #include "mgurlparser.h" #include "common.h" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Mar 2007 02:40:56 -0000 1.2 +++ .cvsignore 2 Jul 2008 16:40:27 -0000 1.3 @@ -1 +1 @@ -multiget-1.1.4.src.tar.gz +multiget-1.2.0.src.tar.bz2 Index: multiget.desktop =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-8/multiget.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multiget.desktop 22 Mar 2007 02:40:56 -0000 1.1 +++ multiget.desktop 2 Jul 2008 16:40:27 -0000 1.2 @@ -1,10 +1,12 @@ [Desktop Entry] +Version=1.0 Encoding=UTF-8 Name=MultiGet GenericName=MultiGet file downloader Comment=File downloader -Exec=MultiGet +Exec=multiget Icon=MultiGet.png Terminal=false Type=Application Categories=GTK;GNOME;Network;FileTransfer; +GenericName[de_DE]=MultiGet file downloader Index: multiget.spec =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-8/multiget.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multiget.spec 22 Mar 2007 02:40:56 -0000 1.1 +++ multiget.spec 2 Jul 2008 16:40:27 -0000 1.2 @@ -1,18 +1,21 @@ Name: multiget -Version: 1.1.4 -Release: 7%{?dist} +Version: 1.2.0 +Release: 3%{?dist} Summary: An easy-to-use GUI file downloader Group: Applications/Internet -License: GPL +License: GPLv2 URL: http://multiget.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.bz2 Source1: multiget.desktop Source2: COPYING -Patch0: multiget-1.1.4-makefile.patch +# There is no symbol for multiget provided in 1.2.0 like it has been in 1.1.4 +# so I decided to use the one from 1.1.4. +Source3: MultiGet.png +Patch0: multiget-1.2-fix-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel desktop-file-utils >= 0.9 +BuildRequires: wxGTK-devel desktop-file-utils >= 0.9 perl(XML::Parser) libglade2-devel automake >= 1.10 %description MultiGet is an easy-to-use GUI file downloader. @@ -24,18 +27,31 @@ http proxy. %prep -%setup -q +%setup -qn multiget %patch0 -p1 -b .good -# Fix script-without-shebangs in debuginfo package -chmod 644 src/icons/*.xpm -chmod 644 src/newicons/16/*.xpm -chmod 644 src/newicons/24/*.xpm -chmod 644 src/newicons/32/*.xpm -chmod 644 src/newicons/48/*.xpm -cp %{SOURCE2} %{_builddir}/%{name}-%{version}/ +chmod 644 icons/*.xpm + +# fix dead symbolic links +rm -f INSTALL +ln -s %{_datadir}/automake-1.10/INSTALL INSTALL +rm -f install-sh +ln -s %{_datadir}/automake-1.10/install-sh install-sh +rm -f depcomp +ln -s %{_datadir}/automake-1.10/depcomp depcomp +rm -f missing +ln -s %{_datadir}/automake-1.10/missing missing +rm -f %{_builddir}/%{name}/COPYING +cp -p %{SOURCE2} %{_builddir}/%{name}/ + +chmod 644 icons/*.xpm +chmod 644 newicons/16/*.xpm +chmod 644 newicons/24/*.xpm +chmod 644 newicons/32/*.xpm +chmod 644 newicons/48/*.xpm + %build -cd src/ +%configure make %{?_smp_mflags} %install @@ -44,23 +60,30 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -install -m 755 src/MultiGet $RPM_BUILD_ROOT/%{_bindir} -install -p -m 644 MultiGet.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +install -p -m 755 src/multiget $RPM_BUILD_ROOT/%{_bindir} +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%doc changelog.txt readme_en.txt COPYING -%{_bindir}/MultiGet +%doc COPYING +%{_bindir}/multiget %{_datadir}/applications/fedora-multiget.desktop %{_datadir}/pixmaps/MultiGet.png %changelog +* Thu Jun 12 2008 Guido Ledermann - 1.2.0-3 +- remove patch for Makefile.in, fixed spec to follow Packaging Guidelines +* Thu Jun 12 2008 Guido Ledermann - 1.2.0-2 +- remove patch for Makefile and added patch for Makefile.ini, fixed spec +* Thu Jun 05 2008 Guido Ledermann - 1.2.0-1 +- Fixed for 1.2.0 +* Mon Feb 18 2008 Fedora Release Engineering - 1.1.4-8 +- Autorebuild for GCC 4.3 * Sun Mar 14 2007 Allisson Azevedo 1.1.4-7 - Change patch * Sun Mar 14 2007 Allisson Azevedo 1.1.4-6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/multiget/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Mar 2007 02:40:56 -0000 1.2 +++ sources 2 Jul 2008 16:40:27 -0000 1.3 @@ -1 +1 @@ -afb1de0ccf51a0255960c437e03e83a5 multiget-1.1.4.src.tar.gz +b62c4017ad2180cfa8b466e2bd320e40 multiget-1.2.0.src.tar.bz2 --- multiget-1.1.4-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 16:41:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:41:12 +0000 Subject: [pkgdb] quassel (Fedora, 8) updated by kevin Message-ID: <200807021641.m62Gf4n2015551@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for quassel Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quassel (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on quassel (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quassel (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on quassel (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quassel From fedora-extras-commits at redhat.com Wed Jul 2 16:41:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:41:12 +0000 Subject: [pkgdb] quassel (Fedora, 9) updated by kevin Message-ID: <200807021641.m62Gf4n5015551@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for quassel Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quassel (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on quassel (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quassel (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on quassel (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quassel From fedora-extras-commits at redhat.com Wed Jul 2 16:41:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 16:41:13 +0000 Subject: [pkgdb] quassel (Fedora, devel) updated by kevin Message-ID: <200807021641.m62GfGII015654@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on quassel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quassel From fedora-extras-commits at redhat.com Wed Jul 2 16:41:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:41:54 GMT Subject: rpms/quassel - New directory Message-ID: <200807021641.m62GfskI006899@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/quassel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEI6851/rpms/quassel Log Message: Directory /cvs/extras/rpms/quassel added to the repository From fedora-extras-commits at redhat.com Wed Jul 2 16:42:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:42:09 GMT Subject: rpms/quassel/devel - New directory Message-ID: <200807021642.m62Gg9ti006931@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/quassel/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEI6851/rpms/quassel/devel Log Message: Directory /cvs/extras/rpms/quassel/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 2 16:42:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:42:33 GMT Subject: rpms/quassel Makefile,NONE,1.1 Message-ID: <200807021642.m62GgXdI006975@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/quassel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEI6851/rpms/quassel Added Files: Makefile Log Message: Setup of module quassel --- NEW FILE Makefile --- # Top level Makefile for module quassel all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 2 16:42:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 2 Jul 2008 16:42:45 GMT Subject: rpms/quassel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807021642.m62Ggjim006990@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/quassel/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEI6851/rpms/quassel/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module quassel --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: quassel # $Id: Makefile,v 1.1 2008/07/02 16:42:33 kevin Exp $ NAME := quassel SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 2 16:47:50 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Wed, 2 Jul 2008 16:47:50 GMT Subject: rpms/rhm/F-9 rhm.spec,1.20,1.21 Message-ID: <200807021647.m62GloEm007320@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/rhm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7290 Modified Files: rhm.spec Log Message: import specfile Index: rhm.spec =================================================================== RCS file: /cvs/extras/rpms/rhm/F-9/rhm.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rhm.spec 1 Jul 2008 19:42:56 -0000 1.20 +++ rhm.spec 2 Jul 2008 16:46:56 -0000 1.21 @@ -3,12 +3,12 @@ # %define svnrev 2153 -# built against qpidc svn rev 667603 +# built against qpidc svn rev xxx Name: rhm Version: 0.2.%{svnrev} Release: 1%{?dist} -Summary: Red Hat extensions to the Qpid messaging system +Summary: Red Hat persistence extension to the Qpid messaging system Group: System Environment/Libraries License: LGPL URL: http://rhm.et.redhat.com/rhm @@ -20,23 +20,17 @@ BuildRequires: qpidc-devel BuildRequires: qpidd-devel BuildRequires: db4-devel -# TODO: Workaround missing dependency in qpidd-devel. Remove this -# when qpid-devel is updated. -BuildRequires: e2fsprogs-devel BuildRequires: libaio-devel BuildRequires: python BuildRequires: libtool -Requires: qpidd +Requires: qpidd >= 0.2.667603 Requires: db4 Requires: libaio -Requires(preun):/sbin/service -Requires(postun):/sbin/service - %description -Red Hat extensions to the Qpid AMQP broker: persistent message storage -in Berkeley DB. +Red Hat persistence extension to the Qpid AMQP broker: persistent message storage +using either a libaio-based asynchronous journal, or synchronously with Berkeley DB. %prep %setup -q @@ -48,12 +42,13 @@ %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -Dp -m0755 etc/rhmd %{buildroot}%{_initrddir}/rhmd -install -Dp -m0755 etc/rhmd.sh %{buildroot}%{_sbindir}/rhmd -install -d -m0775 %{buildroot}%{_localstatedir}/rhm +install -d -m0775 %{buildroot}%{_localstatedir}/rhm +install -d -m0755 %{buildroot}%{_libdir}/qpidd +cp -a %{buildroot}%{_libdir}/libbdbstore.so* %{buildroot}%{_libdir}/qpidd rm -f %{buildroot}%_libdir/*.a rm -f %{buildroot}%_libdir/*.la -rm -f %{buildroot}%_libdir/*.so +rm -f %{buildroot}%_libdir/*.so* +rm %{buildroot}%_sysconfdir/rhmd.conf %clean rm -rf %{buildroot} @@ -64,35 +59,37 @@ %files %defattr(-,root,root,-) %doc README COPYING -%_libdir/libbdbstore.so.0 -%_libdir/libbdbstore.so.0.1.0 -%_initrddir/rhmd -%_sbindir/rhmd -#%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm -%config(noreplace) %_sysconfdir/rhmd.conf - -%post -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add rhmd -/sbin/ldconfig - -%preun -# Check that this is actual deinstallation, not just removing for upgrade. -if [ $1 = 0 ]; then - /sbin/service rhmd stop >/dev/null 2>&1 || : - /sbin/chkconfig --del rhmd -fi - -%postun -if [ "$1" -ge "1" ]; then - /sbin/service rhmd restart >/dev/null 2>&1 || : -fi -/sbin/ldconfig +%{_libdir}/qpidd/libbdbstore.so* +%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm %changelog -* Tue Jul 1 2008 Nuno Santos - 0.2.2153-1 -- MRG GA release +* Mon Jun 16 2008 Kim van der Riet - 0.2.2153-1 +- Rebased to rev.2153 +- Added qpidd rev no dependency + +* Fri Jun 12 2008 Kim van der Riet - 0.2.2150-1 +- Rebased to rev.2150 + +* Fri Jun 12 2008 Kim van der Riet - 0.2.2148-3 +- Changed the installation mechanism for libs + +* Fri Jun 11 2008 Justin Ross - 0.2.2148-2 +- Use macros for the lib dir + +* Fri Jun 10 2008 Kim van der Riet - 0.2.2148-1 +- rebase to rev 2148 +- imported nsantos' rhmd fixes + +* Fri Jun 10 2008 Kim van der Riet - 0.2.2146-1 +- rebase to rev 2146 +- removed refs to dir /etc/rhmd + +* Fri Jun 6 2008 Kim van der Riet - 0.2.2144-1 +- rebase to rev 2144 + +* Wed Jun 4 2008 Kim van der Riet - 0.2.2131-1 +- rebase to rev 2131 * Thu May 15 2008 Nuno Santos - 0.2.2055-1 - bumped for Beta 4 From fedora-extras-commits at redhat.com Wed Jul 2 16:55:47 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 2 Jul 2008 16:55:47 GMT Subject: rpms/krusader/F-8 .cvsignore, 1.7, 1.8 krusader.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200807021655.m62Gtl4T007679@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/krusader/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628 Modified Files: .cvsignore krusader.spec sources Log Message: - Update to 1.90.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/krusader/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Aug 2007 10:14:03 -0000 1.7 +++ .cvsignore 2 Jul 2008 16:55:15 -0000 1.8 @@ -1 +1 @@ -krusader-1.80.0.tar.gz +krusader-1.90.0.tar.gz Index: krusader.spec =================================================================== RCS file: /cvs/pkgs/rpms/krusader/F-8/krusader.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- krusader.spec 31 Aug 2007 09:22:55 -0000 1.16 +++ krusader.spec 2 Jul 2008 16:55:15 -0000 1.17 @@ -1,6 +1,6 @@ Name: krusader -Version: 1.80.0 -Release: 2%{?dist} +Version: 1.90.0 +Release: 1%{?dist} Summary: An advanced twin-panel (commander-style) file-manager for KDE Group: Applications/File @@ -40,9 +40,19 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# Make symlink relative -pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/krusader/ -ln -sf ../common +# Make symlink relative and remove wrong EOL +pushd $RPM_BUILD_ROOT%{_docdir}/HTML/ +for i in * +do + pushd $RPM_BUILD_ROOT%{_docdir}/HTML/$i/krusader/ + for j in *.docbook + do + tr -d '\r' < $j > ${j}.tmp + mv -f ${j}.tmp $j + done + ln -sf ../common + popd +done popd %find_lang %{name} @@ -92,6 +102,9 @@ %{_datadir}/services/*.protocol %changelog +* Wed Jul 02 2008 Marcin Garski 1.90.0-1 +- Update to 1.90.0 + * Fri Aug 31 2007 Marcin Garski 1.80.0-2 - Fix license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/krusader/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Aug 2007 10:14:03 -0000 1.7 +++ sources 2 Jul 2008 16:55:15 -0000 1.8 @@ -1 +1 @@ -32bfaf4de7ca62e0f612357f4aa065a9 krusader-1.80.0.tar.gz +0bcf8f4d03484dae0390ffafa953ac40 krusader-1.90.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 16:58:23 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 2 Jul 2008 16:58:23 GMT Subject: rpms/liferea/devel liferea-1.4.15-xulrunner-code.patch, 1.1, NONE liferea-1.4.15-xulrunner-configure.patch, 1.1, NONE liferea-gtkhtml2_x64.patch, 1.3, NONE Message-ID: <200807021658.m62GwNmH007834@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7799 Removed Files: liferea-1.4.15-xulrunner-code.patch liferea-1.4.15-xulrunner-configure.patch liferea-gtkhtml2_x64.patch Log Message: Removed old patch files for previous versions --- liferea-1.4.15-xulrunner-code.patch DELETED --- --- liferea-1.4.15-xulrunner-configure.patch DELETED --- --- liferea-gtkhtml2_x64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 17:00:25 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Wed, 2 Jul 2008 17:00:25 GMT Subject: rpms/rhm/F-8 rhm.spec,1.10,1.11 Message-ID: <200807021700.m62H0Pfe007996@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/rhm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922 Modified Files: rhm.spec Log Message: import specfile Index: rhm.spec =================================================================== RCS file: /cvs/extras/rpms/rhm/F-8/rhm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rhm.spec 1 Jul 2008 19:50:50 -0000 1.10 +++ rhm.spec 2 Jul 2008 16:59:41 -0000 1.11 @@ -3,12 +3,12 @@ # %define svnrev 2153 -# built against qpidc svn rev 667603 +# built against qpidc svn rev xxx Name: rhm Version: 0.2.%{svnrev} Release: 1%{?dist} -Summary: Red Hat extensions to the Qpid messaging system +Summary: Red Hat persistence extension to the Qpid messaging system Group: System Environment/Libraries License: LGPL URL: http://rhm.et.redhat.com/rhm @@ -20,23 +20,17 @@ BuildRequires: qpidc-devel BuildRequires: qpidd-devel BuildRequires: db4-devel -# TODO: Workaround missing dependency in qpidd-devel. Remove this -# when qpid-devel is updated. -BuildRequires: e2fsprogs-devel BuildRequires: libaio-devel BuildRequires: python BuildRequires: libtool -Requires: qpidd +Requires: qpidd >= 0.2.667603 Requires: db4 Requires: libaio -Requires(preun):/sbin/service -Requires(postun):/sbin/service - %description -Red Hat extensions to the Qpid AMQP broker: persistent message storage -in Berkeley DB. +Red Hat persistence extension to the Qpid AMQP broker: persistent message storage +using either a libaio-based asynchronous journal, or synchronously with Berkeley DB. %prep %setup -q @@ -48,12 +42,13 @@ %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -Dp -m0755 etc/rhmd %{buildroot}%{_initrddir}/rhmd -install -Dp -m0755 etc/rhmd.sh %{buildroot}%{_sbindir}/rhmd -install -d -m0775 %{buildroot}%{_localstatedir}/rhm +install -d -m0775 %{buildroot}%{_localstatedir}/rhm +install -d -m0755 %{buildroot}%{_libdir}/qpidd +cp -a %{buildroot}%{_libdir}/libbdbstore.so* %{buildroot}%{_libdir}/qpidd rm -f %{buildroot}%_libdir/*.a rm -f %{buildroot}%_libdir/*.la -rm -f %{buildroot}%_libdir/*.so +rm -f %{buildroot}%_libdir/*.so* +rm %{buildroot}%_sysconfdir/rhmd.conf %clean rm -rf %{buildroot} @@ -64,35 +59,37 @@ %files %defattr(-,root,root,-) %doc README COPYING -%_libdir/libbdbstore.so.0 -%_libdir/libbdbstore.so.0.1.0 -%_initrddir/rhmd -%_sbindir/rhmd -#%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm -%config(noreplace) %_sysconfdir/rhmd.conf - -%post -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add rhmd -/sbin/ldconfig - -%preun -# Check that this is actual deinstallation, not just removing for upgrade. -if [ $1 = 0 ]; then - /sbin/service rhmd stop >/dev/null 2>&1 || : - /sbin/chkconfig --del rhmd -fi - -%postun -if [ "$1" -ge "1" ]; then - /sbin/service rhmd restart >/dev/null 2>&1 || : -fi -/sbin/ldconfig +%{_libdir}/qpidd/libbdbstore.so* +%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm %changelog -* Tue Jul 1 2008 Nuno Santos - 0.2.2153-1 -- MRG GA release +* Mon Jun 16 2008 Kim van der Riet - 0.2.2153-1 +- Rebased to rev.2153 +- Added qpidd rev no dependency + +* Fri Jun 12 2008 Kim van der Riet - 0.2.2150-1 +- Rebased to rev.2150 + +* Fri Jun 12 2008 Kim van der Riet - 0.2.2148-3 +- Changed the installation mechanism for libs + +* Fri Jun 11 2008 Justin Ross - 0.2.2148-2 +- Use macros for the lib dir + +* Fri Jun 10 2008 Kim van der Riet - 0.2.2148-1 +- rebase to rev 2148 +- imported nsantos' rhmd fixes + +* Fri Jun 10 2008 Kim van der Riet - 0.2.2146-1 +- rebase to rev 2146 +- removed refs to dir /etc/rhmd + +* Fri Jun 6 2008 Kim van der Riet - 0.2.2144-1 +- rebase to rev 2144 + +* Wed Jun 4 2008 Kim van der Riet - 0.2.2131-1 +- rebase to rev 2131 * Thu May 15 2008 Nuno Santos - 0.2.2055-1 - bumped for Beta 4 From fedora-extras-commits at redhat.com Wed Jul 2 17:01:48 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 2 Jul 2008 17:01:48 GMT Subject: rpms/liferea/F-9 liferea-1.4.15-xulrunner-code.patch, 1.1, NONE liferea-1.4.15-xulrunner-configure.patch, 1.2, NONE liferea-gtkhtml2_x64.patch, 1.3, NONE Message-ID: <200807021701.m62H1mtv014578@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8006 Removed Files: liferea-1.4.15-xulrunner-code.patch liferea-1.4.15-xulrunner-configure.patch liferea-gtkhtml2_x64.patch Log Message: Removing patch files used on previous versions --- liferea-1.4.15-xulrunner-code.patch DELETED --- --- liferea-1.4.15-xulrunner-configure.patch DELETED --- --- liferea-gtkhtml2_x64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 17:04:17 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Wed, 2 Jul 2008 17:04:17 GMT Subject: rpms/abgraph/EL-5 abgraph.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807021704.m62H4H4a014759@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/abgraph/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14726/EL-5 Modified Files: .cvsignore sources Added Files: abgraph.spec import.log Log Message: importing abgraph --- NEW FILE abgraph.spec --- Name: abgraph Version: 1.1 Release: 1%{?dist} Summary: ABGraph is a simple tool to benchmark webservers License: GPLv3+ Group: Applications/Productivity URL: http://sourceforge.net/projects/abgraph Source: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnuplot, httpd-tools %description ABGraph is a simple tool to benchmark webservers. The program uses ab (apache benchmark) to actually benchmark the selected remote host. A graph in PNG format is generated with gnuplot and saved to the selected path/file. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT install -Dpm 755 abgraph.sh $RPM_BUILD_ROOT%{_bindir}/abgraph %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_bindir}/abgraph %changelog * Wed Jun 25 2008 Marek Mahut - 1.1-1 - Upstream release * Tue May 29 2008 Marek Mahut - 1.0-2 - Insecure temporary file fix - Minor script modifications * Tue May 20 2008 Marek Mahut - 1.0-1 - First build --- NEW FILE import.log --- abgraph-1_1-1_fc8:EL-5:abgraph-1.1-1.fc8.src.rpm:1215018074 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2008 16:40:51 -0000 1.1 +++ .cvsignore 2 Jul 2008 17:03:28 -0000 1.2 @@ -0,0 +1 @@ +abgraph-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2008 16:40:51 -0000 1.1 +++ sources 2 Jul 2008 17:03:28 -0000 1.2 @@ -0,0 +1 @@ +7b9f2cc980e25b5e2bf8cb13b34a7e77 abgraph-1.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 17:06:35 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Wed, 2 Jul 2008 17:06:35 GMT Subject: rpms/abgraph/F-8 abgraph.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807021706.m62H6Zot015008@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/abgraph/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14879/F-8 Modified Files: .cvsignore sources Added Files: abgraph.spec import.log Log Message: importing abgraph --- NEW FILE abgraph.spec --- Name: abgraph Version: 1.1 Release: 1%{?dist} Summary: ABGraph is a simple tool to benchmark webservers License: GPLv3+ Group: Applications/Productivity URL: http://sourceforge.net/projects/abgraph Source: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnuplot, httpd-tools %description ABGraph is a simple tool to benchmark webservers. The program uses ab (apache benchmark) to actually benchmark the selected remote host. A graph in PNG format is generated with gnuplot and saved to the selected path/file. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT install -Dpm 755 abgraph.sh $RPM_BUILD_ROOT%{_bindir}/abgraph %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_bindir}/abgraph %changelog * Wed Jun 25 2008 Marek Mahut - 1.1-1 - Upstream release * Tue May 29 2008 Marek Mahut - 1.0-2 - Insecure temporary file fix - Minor script modifications * Tue May 20 2008 Marek Mahut - 1.0-1 - First build --- NEW FILE import.log --- abgraph-1_1-1_fc8:F-8:abgraph-1.1-1.fc8.src.rpm:1215018307 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2008 16:40:51 -0000 1.1 +++ .cvsignore 2 Jul 2008 17:05:42 -0000 1.2 @@ -0,0 +1 @@ +abgraph-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2008 16:40:51 -0000 1.1 +++ sources 2 Jul 2008 17:05:42 -0000 1.2 @@ -0,0 +1 @@ +7b9f2cc980e25b5e2bf8cb13b34a7e77 abgraph-1.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 17:07:31 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 2 Jul 2008 17:07:31 GMT Subject: rpms/snort/devel snort.spec,1.35,1.36 sysconfig.snort,1.2,1.3 Message-ID: <200807021707.m62H7VQ8015135@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14988 Modified Files: snort.spec sysconfig.snort Log Message: * Wed Jun 25 2008 Steve Grubb - 2.8.1-5 - Fix bz 452736, 452737, & 452763 Index: snort.spec =================================================================== RCS file: /cvs/pkgs/rpms/snort/devel/snort.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- snort.spec 25 Jun 2008 13:50:57 -0000 1.35 +++ snort.spec 2 Jul 2008 17:06:27 -0000 1.36 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.8.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -12,6 +12,8 @@ Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: libpcap >= 0.4 +Prereq: /sbin/chkconfig +Requires(pre): shadow-utils BuildRequires: libpcap-devel >= 0.4 BuildRequires: perl BuildRequires: pcre-devel @@ -308,7 +310,7 @@ install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine -for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns'; do +for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns' 'ssl'; do install snort_dynamicpreprocessor/libsf_${i}_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor @@ -318,14 +320,15 @@ install snort.8 %{buildroot}%{_mandir}/man8 install etc/gen-msg.map etc/sid-msg.map etc/threshold.conf etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort -install -p -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d +install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir} mkdir -p %{buildroot}/etc/sysconfig/ install -p -m 644 %{SOURCE3} %{buildroot}/etc/sysconfig/snort mkdir -p %{buildroot}%{_sysconfdir}/snort/rules/ +mkdir -p %{buildroot}/%{_var}/lib/snort -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}/snort/rules!' %{buildroot}%{_sysconfdir}/snort/snort.conf perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf -perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf +perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/snort/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean if [ -d %{buildroot} ]; then @@ -333,6 +336,11 @@ fi +%pre +getent passwd snortd >/dev/null || \ + /usr/sbin/useradd -M -o -r -d /var/lib/snort -s /sbin/nologin \ + -c "Snort Daemon" -u 62 snortd > /dev/null 2>&1 || : + %post /sbin/chkconfig --add snortd /sbin/ldconfig @@ -452,13 +460,14 @@ %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. -%attr(755,root,root) %{_mandir}/man8/snort.8* -%attr(755,root,root) %dir /var/log/snort +%attr(644,root,root) %{_mandir}/man8/snort.8* +%attr(755,snortd,snortd) %dir /var/log/snort %attr(755,root,root) %dir %{_sysconfdir}/snort/rules %attr(644,root,root) %config %{_sysconfdir}/snort -%attr(755,root,root) /etc/rc.d/init.d/snortd +%attr(755,root,root) %{_initrddir}/snortd %{_libdir}/snort %config(noreplace)%{_sysconfdir}/sysconfig/snort +%attr(0755,snortd,snortd) %dir %{_var}/lib/snort %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -486,6 +495,9 @@ %changelog +* Wed Jun 25 2008 Steve Grubb - 2.8.1-5 +- Fix bz 452736, 452737, & 452763 + * Wed Jun 25 2008 Tomas Mraz - 2.8.1-4 - rebuild with new gnutls Index: sysconfig.snort =================================================================== RCS file: /cvs/pkgs/rpms/snort/devel/sysconfig.snort,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sysconfig.snort 15 May 2008 22:11:19 -0000 1.2 +++ sysconfig.snort 2 Jul 2008 17:06:27 -0000 1.3 @@ -1,8 +1,8 @@ # What user account should we run under. -USER="root" +USER="snortd" # What group account should we run under. -GROUP="root" +GROUP="snortd" # define the interface we listen on INTERFACE="eth0" From fedora-extras-commits at redhat.com Wed Jul 2 17:07:40 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 2 Jul 2008 17:07:40 GMT Subject: rpms/evolution-rss/F-9 sources,1.3,1.4 Message-ID: <200807021707.m62H7eca015143@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15067 Modified Files: sources Log Message: update to 0.1.0 release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2008 19:30:48 -0000 1.3 +++ sources 2 Jul 2008 17:06:53 -0000 1.4 @@ -1 +1 @@ -c5adce093e332573bc1fcfaf23c1f8b6 evolution-rss-0.0.8.tar.gz +63479fcf4c3af998ab2794e5a0f075f6 evolution-rss-0.1.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 17:08:36 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Wed, 2 Jul 2008 17:08:36 GMT Subject: rpms/abgraph/F-9 abgraph.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807021708.m62H8a1p015190@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/abgraph/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15132/F-9 Modified Files: .cvsignore sources Added Files: abgraph.spec import.log Log Message: importing abgraph --- NEW FILE abgraph.spec --- Name: abgraph Version: 1.1 Release: 1%{?dist} Summary: ABGraph is a simple tool to benchmark webservers License: GPLv3+ Group: Applications/Productivity URL: http://sourceforge.net/projects/abgraph Source: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnuplot, httpd-tools %description ABGraph is a simple tool to benchmark webservers. The program uses ab (apache benchmark) to actually benchmark the selected remote host. A graph in PNG format is generated with gnuplot and saved to the selected path/file. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT install -Dpm 755 abgraph.sh $RPM_BUILD_ROOT%{_bindir}/abgraph %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_bindir}/abgraph %changelog * Wed Jun 25 2008 Marek Mahut - 1.1-1 - Upstream release * Tue May 29 2008 Marek Mahut - 1.0-2 - Insecure temporary file fix - Minor script modifications * Tue May 20 2008 Marek Mahut - 1.0-1 - First build --- NEW FILE import.log --- abgraph-1_1-1_fc8:F-9:abgraph-1.1-1.fc8.src.rpm:1215018429 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2008 16:40:51 -0000 1.1 +++ .cvsignore 2 Jul 2008 17:07:45 -0000 1.2 @@ -0,0 +1 @@ +abgraph-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2008 16:40:51 -0000 1.1 +++ sources 2 Jul 2008 17:07:45 -0000 1.2 @@ -0,0 +1 @@ +7b9f2cc980e25b5e2bf8cb13b34a7e77 abgraph-1.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 17:10:41 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Wed, 2 Jul 2008 17:10:41 GMT Subject: rpms/abgraph/devel abgraph.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807021710.m62HAfr6015370@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/abgraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15323/devel Modified Files: .cvsignore sources Added Files: abgraph.spec import.log Log Message: importing abgraph --- NEW FILE abgraph.spec --- Name: abgraph Version: 1.1 Release: 1%{?dist} Summary: ABGraph is a simple tool to benchmark webservers License: GPLv3+ Group: Applications/Productivity URL: http://sourceforge.net/projects/abgraph Source: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnuplot, httpd-tools %description ABGraph is a simple tool to benchmark webservers. The program uses ab (apache benchmark) to actually benchmark the selected remote host. A graph in PNG format is generated with gnuplot and saved to the selected path/file. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT install -Dpm 755 abgraph.sh $RPM_BUILD_ROOT%{_bindir}/abgraph %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_bindir}/abgraph %changelog * Wed Jun 25 2008 Marek Mahut - 1.1-1 - Upstream release * Tue May 29 2008 Marek Mahut - 1.0-2 - Insecure temporary file fix - Minor script modifications * Tue May 20 2008 Marek Mahut - 1.0-1 - First build --- NEW FILE import.log --- abgraph-1_1-1_fc8:HEAD:abgraph-1.1-1.fc8.src.rpm:1215018559 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2008 16:40:51 -0000 1.1 +++ .cvsignore 2 Jul 2008 17:09:40 -0000 1.2 @@ -0,0 +1 @@ +abgraph-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abgraph/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2008 16:40:51 -0000 1.1 +++ sources 2 Jul 2008 17:09:40 -0000 1.2 @@ -0,0 +1 @@ +7b9f2cc980e25b5e2bf8cb13b34a7e77 abgraph-1.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 17:11:59 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Wed, 2 Jul 2008 17:11:59 GMT Subject: rpms/yum/F-9 yum.conf.fedora,1.17,1.18 Message-ID: <200807021711.m62HBxu3015466@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/yum/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15417 Modified Files: yum.conf.fedora Log Message: Remove old metadata_expire value, using upstream now ... also add use comment Index: yum.conf.fedora =================================================================== RCS file: /cvs/pkgs/rpms/yum/F-9/yum.conf.fedora,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- yum.conf.fedora 20 Jul 2007 19:39:24 -0000 1.17 +++ yum.conf.fedora 2 Jul 2008 17:10:58 -0000 1.18 @@ -7,8 +7,17 @@ obsoletes=1 gpgcheck=1 plugins=1 -metadata_expire=1800 installonly_limit=2 +# This is the default, if you make this bigger yum won't see if the metadata +# is newer on the remote and so you'll "gain" the bandwidth of not having to +# download the new metadata and "pay" for it by yum not having correct +# information. +# It is esp. important, to have correct metadata, for distributions like +# Fedora which don't keep old packages around. If you don't like this checking +# interupting your command line usage, it's much better to have something +# manually check the metadata once an hour (yum-updatesd will do this). +# metadata_expire=90m + # PUT YOUR REPOS HERE OR IN separate files named file.repo # in /etc/yum.repos.d From fedora-extras-commits at redhat.com Wed Jul 2 17:16:57 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 2 Jul 2008 17:16:57 GMT Subject: rpms/nss_compat_ossl/F-8 nss_compat_ossl-layer.patch, NONE, 1.1 nss_compat_ossl.spec, 1.6, 1.7 Message-ID: <200807021716.m62HGvEP015703@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/nss_compat_ossl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15591 Modified Files: nss_compat_ossl.spec Added Files: nss_compat_ossl-layer.patch Log Message: Fix BIO NSPR layer Resolves: #453651 nss_compat_ossl-layer.patch: --- NEW FILE nss_compat_ossl-layer.patch --- diff -up ./src/nss_compat_ossl.h.bio-fix ./src/nss_compat_ossl.h --- ./src/nss_compat_ossl.h.bio-fix 2007-09-20 10:21:53.000000000 -0700 +++ ./src/nss_compat_ossl.h 2008-06-26 00:32:30.000000000 -0700 @@ -207,6 +207,9 @@ struct bio_method_st int (*destroy)(BIO *bio); }; +#define BIO_C_GET_FD 207 +#define BIO_C_GET_PEERNAME 209 + BIO *BIO_new(BIO_METHOD *); int SSL_set_bio(SSL *, BIO *, BIO *); diff -up ./src/ssl.c.bio-fix ./src/ssl.c --- ./src/ssl.c.bio-fix 2008-06-26 00:32:30.000000000 -0700 +++ ./src/ssl.c 2008-06-26 01:55:38.000000000 -0700 @@ -23,6 +23,7 @@ #include #include /* for echo on/off */ #include +#include typedef struct { PRFileDesc *pssl; @@ -1312,6 +1313,18 @@ nspr_bio_write(PRFileDesc *fd, const voi } static PRInt32 +nspr_bio_send(PRFileDesc *fd, const void *buf, PRInt32 amount, + PRIntn flags, PRIntervalTime timeout) +{ + BIO *bio = nspr_get_bio(fd); + if (!bio) { + return -1; + } + + return bio->m->bwrite(bio, buf, amount); +} + +static PRInt32 nspr_bio_read(PRFileDesc *fd, void *buf, PRInt32 amount) { BIO *bio = nspr_get_bio(fd); @@ -1323,6 +1336,267 @@ nspr_bio_read(PRFileDesc *fd, void *buf, return bio->m->bread(bio, buf, amount); } +static PRInt32 +nspr_bio_recv(PRFileDesc *fd, void *buf, PRInt32 amount, + PRIntn flags, PRIntervalTime timeout) +{ + BIO *bio = nspr_get_bio(fd); + + if (!bio) { + return -1; + } + + return bio->m->bread(bio, buf, amount); +} + +void +npsr_map_error(int err) +{ + PRErrorCode prError; + + switch (err ) { + case EACCES: + prError = PR_NO_ACCESS_RIGHTS_ERROR; + break; + case EADDRINUSE: + prError = PR_ADDRESS_IN_USE_ERROR; + break; + case EADDRNOTAVAIL: + prError = PR_ADDRESS_NOT_AVAILABLE_ERROR; + break; + case EAFNOSUPPORT: + prError = PR_ADDRESS_NOT_SUPPORTED_ERROR; + break; + case EAGAIN: + prError = PR_WOULD_BLOCK_ERROR; + break; + /* + * On QNX and Neutrino, EALREADY is defined as EBUSY. + */ +#if EALREADY != EBUSY + case EALREADY: + prError = PR_ALREADY_INITIATED_ERROR; + break; +#endif + case EBADF: + prError = PR_BAD_DESCRIPTOR_ERROR; + break; +#ifdef EBADMSG + case EBADMSG: + prError = PR_IO_ERROR; + break; +#endif + case EBUSY: + prError = PR_FILESYSTEM_MOUNTED_ERROR; + break; + case ECONNABORTED: + prError = PR_CONNECT_ABORTED_ERROR; + break; + case ECONNREFUSED: + prError = PR_CONNECT_REFUSED_ERROR; + break; + case ECONNRESET: + prError = PR_CONNECT_RESET_ERROR; + break; + case EDEADLK: + prError = PR_DEADLOCK_ERROR; + break; +#ifdef EDIRCORRUPTED + case EDIRCORRUPTED: + prError = PR_DIRECTORY_CORRUPTED_ERROR; + break; +#endif +#ifdef EDQUOT + case EDQUOT: + prError = PR_NO_DEVICE_SPACE_ERROR; + break; +#endif + case EEXIST: + prError = PR_FILE_EXISTS_ERROR; + break; + case EFAULT: + prError = PR_ACCESS_FAULT_ERROR; + break; + case EFBIG: + prError = PR_FILE_TOO_BIG_ERROR; + break; + case EHOSTUNREACH: + prError = PR_HOST_UNREACHABLE_ERROR; + break; + case EINPROGRESS: + prError = PR_IN_PROGRESS_ERROR; + break; + case EINTR: + prError = PR_PENDING_INTERRUPT_ERROR; + break; + case EINVAL: + prError = PR_INVALID_ARGUMENT_ERROR; + break; + case EIO: + prError = PR_IO_ERROR; + break; + case EISCONN: + prError = PR_IS_CONNECTED_ERROR; + break; + case EISDIR: + prError = PR_IS_DIRECTORY_ERROR; + break; + case ELOOP: + prError = PR_LOOP_ERROR; + break; + case EMFILE: + prError = PR_PROC_DESC_TABLE_FULL_ERROR; + break; + case EMLINK: + prError = PR_MAX_DIRECTORY_ENTRIES_ERROR; + break; + case EMSGSIZE: + prError = PR_INVALID_ARGUMENT_ERROR; + break; +#ifdef EMULTIHOP + case EMULTIHOP: + prError = PR_REMOTE_FILE_ERROR; + break; +#endif + case ENAMETOOLONG: + prError = PR_NAME_TOO_LONG_ERROR; + break; + case ENETUNREACH: + prError = PR_NETWORK_UNREACHABLE_ERROR; + break; + case ENFILE: + prError = PR_SYS_DESC_TABLE_FULL_ERROR; + break; + /* + * On SCO OpenServer 5, ENOBUFS is defined as ENOSR. + */ +#if defined(ENOBUFS) && (ENOBUFS != ENOSR) + case ENOBUFS: + prError = PR_INSUFFICIENT_RESOURCES_ERROR; + break; +#endif + case ENODEV: + prError = PR_FILE_NOT_FOUND_ERROR; + break; + case ENOENT: + prError = PR_FILE_NOT_FOUND_ERROR; + break; + case ENOLCK: + prError = PR_FILE_IS_LOCKED_ERROR; + break; +#ifdef ENOLINK + case ENOLINK: + prError = PR_REMOTE_FILE_ERROR; + break; +#endif + case ENOMEM: + prError = PR_OUT_OF_MEMORY_ERROR; + break; + case ENOPROTOOPT: + prError = PR_INVALID_ARGUMENT_ERROR; + break; + case ENOSPC: + prError = PR_NO_DEVICE_SPACE_ERROR; + break; +#ifdef ENOSR + case ENOSR: + prError = PR_INSUFFICIENT_RESOURCES_ERROR; + break; +#endif + case ENOTCONN: + prError = PR_NOT_CONNECTED_ERROR; + break; + case ENOTDIR: + prError = PR_NOT_DIRECTORY_ERROR; + break; + case ENOTSOCK: + prError = PR_NOT_SOCKET_ERROR; + break; + case ENXIO: + prError = PR_FILE_NOT_FOUND_ERROR; + break; + case EOPNOTSUPP: + prError = PR_NOT_TCP_SOCKET_ERROR; + break; +#ifdef EOVERFLOW + case EOVERFLOW: + prError = PR_BUFFER_OVERFLOW_ERROR; + break; +#endif + case EPERM: + prError = PR_NO_ACCESS_RIGHTS_ERROR; + break; + case EPIPE: + prError = PR_CONNECT_RESET_ERROR; + break; +#ifdef EPROTO + case EPROTO: + prError = PR_IO_ERROR; + break; +#endif + case EPROTONOSUPPORT: + prError = PR_PROTOCOL_NOT_SUPPORTED_ERROR; + break; + case EPROTOTYPE: + prError = PR_ADDRESS_NOT_SUPPORTED_ERROR; + break; + case ERANGE: + prError = PR_INVALID_METHOD_ERROR; + break; + case EROFS: + prError = PR_READ_ONLY_FILESYSTEM_ERROR; + break; + case ESPIPE: + prError = PR_INVALID_METHOD_ERROR; + break; + case ETIMEDOUT: + prError = PR_IO_TIMEOUT_ERROR; + break; +#if EWOULDBLOCK != EAGAIN + case EWOULDBLOCK: + prError = PR_WOULD_BLOCK_ERROR; + break; +#endif + case EXDEV: + prError = PR_NOT_SAME_DEVICE_ERROR; + break; + default: + prError = PR_UNKNOWN_ERROR; + break; + } + PR_SetError(prError, err); +} + +static PRStatus +nspr_bio_getpeername(PRFileDesc *fd, PRNetAddr *addr) +{ + BIO *bio = nspr_get_bio(fd); + int osfd; + int ret; + PRUint32 addrlen; + + if (!bio) { + return -1; + } + ret = bio->m->ctrl(bio, BIO_C_GET_PEERNAME, sizeof(PRNetAddr), addr); + if (ret > 0) { + return PR_SUCCESS; + } + + ret = bio->m->ctrl(bio, BIO_C_GET_FD, sizeof(osfd), &osfd); + if (ret <= 0) { + PR_SetError(PR_BAD_DESCRIPTOR_ERROR, EBADF); + return PR_FAILURE; + } + ret = getpeername(osfd, (struct sockaddr *) addr, &addrlen); + if (ret < 0) { + npsr_map_error(errno); + } + + return ret == 0 ? PR_SUCCESS : PR_FAILURE; +} + + static PRStatus nspr_bio_close(PRFileDesc *fd) { @@ -1357,6 +1631,9 @@ ssl_init_bio() gBioMethods.write = nspr_bio_write; gBioMethods.read = nspr_bio_read; gBioMethods.close = nspr_bio_close; + gBioMethods.send = nspr_bio_send; + gBioMethods.recv = nspr_bio_recv; + gBioMethods.getpeername = nspr_bio_getpeername; } void SSL_load_error_strings(void) @@ -2542,11 +2819,9 @@ int SSL_set_bio(SSL *s, BIO *bio, BIO *b } /* close the previous layer */ - old = PR_PopIOLayer(s, gIdentity); - if (!old) { - old = PR_PopIOLayer(s, gBioIdentity); - } + old = PR_GetIdentitiesLayer(s, gBioIdentity); if (old) { + PR_PopIOLayer(s, gBioIdentity); old->dtor(old); } @@ -2555,7 +2830,7 @@ int SSL_set_bio(SSL *s, BIO *bio, BIO *b if (new == NULL) goto error; nspr_set_bio(new , bio); - if (PR_PushIOLayer(s, PR_TOP_IO_LAYER, new) != PR_SUCCESS) + if (PR_PushIOLayer(s, PR_GetLayersIdentity(s->lower), new) != PR_SUCCESS) goto error; return 1; Index: nss_compat_ossl.spec =================================================================== RCS file: /cvs/extras/rpms/nss_compat_ossl/F-8/nss_compat_ossl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nss_compat_ossl.spec 14 Oct 2007 02:04:13 -0000 1.6 +++ nss_compat_ossl.spec 2 Jul 2008 17:16:00 -0000 1.7 @@ -1,6 +1,6 @@ Name: nss_compat_ossl Version: 0.9.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Source-level compatibility library for OpenSSL to NSS porting Group: System Environment/Libraries @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: nss_compat_ossl-symbol.patch Patch2: nss_compat_ossl-link.patch +Patch3: nss_compat_ossl-layer.patch # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available BuildRequires: nss-devel > 3.11.7-7 @@ -31,6 +32,7 @@ %setup -q %patch1 -p1 -b .symbol %patch2 -p1 -b .link +%patch3 -p1 -b .layer %build @@ -68,6 +70,9 @@ %postun -p /sbin/ldconfig %changelog +* Wed Jun 2 2008 Rob Crittenden 0.9.2-4 +- Fix BIO NSPR layer (#453651) + * Sat Oct 13 2007 Rob Crittenden 0.9.2-3 - Bugzilla #330091, don't explicitly link with libsoftokn3.so From fedora-extras-commits at redhat.com Wed Jul 2 17:20:40 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 2 Jul 2008 17:20:40 GMT Subject: rpms/xorg-x11-server/F-9 import.log, 1.2, 1.3 .cvsignore, 1.48, 1.49 commitid, 1.20, 1.21 sources, 1.42, 1.43 xorg-x11-server.spec, 1.338, 1.339 xserver-1.4.99-alloca-poison.patch, 1.1, NONE Message-ID: <200807021720.m62HKeod015930@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15889/F-9 Modified Files: .cvsignore commitid sources xorg-x11-server.spec Added Files: import.log Removed Files: xserver-1.4.99-alloca-poison.patch Log Message: today's snapshot Index: import.log =================================================================== RCS file: import.log diff -N import.log --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ import.log 2 Jul 2008 17:20:09 -0000 1.3 @@ -0,0 +1 @@ +xorg-x11-server-1_4_99_905-2_20080702_fc9:F-9:xorg-x11-server-1.4.99.905-2.20080702.fc9.src.rpm:1215018868 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 1 Jul 2008 15:09:08 -0000 1.48 +++ .cvsignore 2 Jul 2008 17:20:09 -0000 1.49 @@ -1 +1 @@ -xorg-server-20080701.tar.bz2 +xorg-server-20080702.tar.bz2 Index: commitid =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/commitid,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- commitid 1 Jul 2008 15:09:08 -0000 1.20 +++ commitid 2 Jul 2008 17:20:09 -0000 1.21 @@ -1 +1 @@ -ccb373f2fb910db57a3dfcef8a03779f1023470c +8081eda6965e5213e7feca13cbd26aa34e0e0bd8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 1 Jul 2008 15:09:08 -0000 1.42 +++ sources 2 Jul 2008 17:20:09 -0000 1.43 @@ -1 +1 @@ -a0e25d1c6ed0ed945e4a84b6b288f6fe xorg-server-20080701.tar.bz2 +b19b858731fefbfd88be47d4dcb65a02 xorg-server-20080702.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v retrieving revision 1.338 retrieving revision 1.339 diff -u -r1.338 -r1.339 --- xorg-x11-server.spec 1 Jul 2008 15:09:08 -0000 1.338 +++ xorg-x11-server.spec 2 Jul 2008 17:20:09 -0000 1.339 @@ -12,15 +12,14 @@ # F9 TODO list: # # Fix rhpxl to no longer need vesamodes/extramodes -# RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080701 +%define gitdate 20080702 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.905 -Release: 1.%{gitdate}%{?dist} +Release: 2.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -42,28 +41,18 @@ # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list -# dropme -#Patch1001: xorg-x11-server-Red-Hat-extramodes.patch Patch1003: xserver-1.4.99-pic-libxf86config.patch -# maybe? -#Patch1004: xserver-1.4.99-selinux-awareness.patch Patch1005: xserver-1.4.99-builtin-fonts.patch Patch1010: xserver-1.3.0-no-prerelease-warning.patch -# rebase for GL/glx -> glx move -#Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch # Trivial things to never merge upstream ever -# Don't merge this without protecting the gccisms. -Patch5001: xserver-1.4.99-alloca-poison.patch # This really could be done prettier. Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch -#Patch5008: xserver-1.5.0-xaa-sucks.patch Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch -#Patch5010: xserver-1.5.0-fix-single-aspect.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -115,8 +104,6 @@ # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex BuildRequires: mesa-libGL-devel >= 7.1-0.36 -# should be useless now... -# BuildRequires: mesa-source >= 7.1-0.36 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -126,17 +113,6 @@ BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1 BuildRequires: hal-devel dbus-devel -# Make sure libXfont has the catalogue FPE -Conflicts: libXfont < 1.2.9 - -# Make sure we pull ABI compatible drivers. -Conflicts: xorg-x11-drv-ati < 6.6.1 -Conflicts: xorg-x11-drv-i810 < 1.6.0 -# Match up work-arounds between compiz and the xserver -Conflicts: compiz < 0.0.13-0.20.20060817git.fc6 -# Match up GLX_EXT_texture_from_pixmap opcodes -Conflicts: mesa-libGL < 6.5.1-2.fc6 - # All server subpackages have a virtual provide for the name of the server # they deliver. The Xorg one is versioned, the others are intentionally # unversioned. @@ -189,10 +165,7 @@ %description Xnest Xnest is an X server, which has been implemented as an ordinary X application. It runs in a window just like other X applications, -but it is an X server itself in which you can run other software. It -is a very useful tool for developers who wish to test their -applications without running them on their real X server. - +but it is an X server itself in which you can run other software. %package Xdmx Summary: Distributed Multihead X Server and utilities @@ -205,12 +178,7 @@ Xdmx is proxy X server that provides multi-head support for multiple displays attached to different machines (each of which is running a typical X server). When Xinerama is used with Xdmx, the multiple displays on multiple machines -are presented to the user as a single unified screen. A simple application -for Xdmx would be to provide multi-head support using two desktop machines, -each of which has a single display device attached to it. A complex -application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays -(each attached to one of 16 computers) into a unified 5120x4096 display. - +are presented to the user as a single unified screen. %package Xvfb Summary: A X Windows System virtual framebuffer X server. @@ -236,10 +204,8 @@ %description Xephyr Xephyr is an X server, which has been implemented as an ordinary X application. It runs in a window just like other X applications, -but it is an X server itself in which you can run other software. It -is a very useful tool for developers who wish to test their -applications without running them on their real X server. Unlike -Xnest, Xephyr renders to an X image rather than relaying the +but it is an X server itself in which you can run other software. +Unlike Xnest, Xephyr renders to an X image rather than relaying the X protocol, and therefore supports the newer X extensions like Render and Composite. @@ -358,21 +324,6 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1* find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : - -%if !%{with_hw_servers} - # These get installed regardless of whether you're building Xorg. - # XXX Re-check this list. - # error: Installed (but unpackaged) file(s) found: - # /randrstr.h - # /usr/lib/pkgconfig/xorg-server.pc - # /usr/share/aclocal/xorg-server.m4 - # /var/lib/xkb/README.compiled - - rm -f $RPM_BUILD_ROOT/randrstr.h - rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig - rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal - rm -rf $RPM_BUILD_ROOT/var/lib/xkb -%endif } %clean @@ -512,6 +463,9 @@ %changelog +* Wed Jul 02 2008 Adam Jackson 1.4.99.905-2.20080702 +- Today's snapshot. + * Mon Jun 30 2008 Adam Jackson 1.4.99.905-1.20080701 - 1.5RC5. --- xserver-1.4.99-alloca-poison.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 17:30:08 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 2 Jul 2008 17:30:08 GMT Subject: rpms/nss_compat_ossl/F-9 nss_compat_ossl-layer.patch, NONE, 1.1 nss_compat_ossl.spec, 1.7, 1.8 Message-ID: <200807021730.m62HU8ei016402@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/nss_compat_ossl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16340 Modified Files: nss_compat_ossl.spec Added Files: nss_compat_ossl-layer.patch Log Message: Fix BIO NSPR layer (#453651) nss_compat_ossl-layer.patch: --- NEW FILE nss_compat_ossl-layer.patch --- diff -up ./src/nss_compat_ossl.h.bio-fix ./src/nss_compat_ossl.h --- ./src/nss_compat_ossl.h.bio-fix 2007-09-20 10:21:53.000000000 -0700 +++ ./src/nss_compat_ossl.h 2008-06-26 00:32:30.000000000 -0700 @@ -207,6 +207,9 @@ struct bio_method_st int (*destroy)(BIO *bio); }; +#define BIO_C_GET_FD 207 +#define BIO_C_GET_PEERNAME 209 + BIO *BIO_new(BIO_METHOD *); int SSL_set_bio(SSL *, BIO *, BIO *); diff -up ./src/ssl.c.bio-fix ./src/ssl.c --- ./src/ssl.c.bio-fix 2008-06-26 00:32:30.000000000 -0700 +++ ./src/ssl.c 2008-06-26 01:55:38.000000000 -0700 @@ -23,6 +23,7 @@ #include #include /* for echo on/off */ #include +#include typedef struct { PRFileDesc *pssl; @@ -1312,6 +1313,18 @@ nspr_bio_write(PRFileDesc *fd, const voi } static PRInt32 +nspr_bio_send(PRFileDesc *fd, const void *buf, PRInt32 amount, + PRIntn flags, PRIntervalTime timeout) +{ + BIO *bio = nspr_get_bio(fd); + if (!bio) { + return -1; + } + + return bio->m->bwrite(bio, buf, amount); +} + +static PRInt32 nspr_bio_read(PRFileDesc *fd, void *buf, PRInt32 amount) { BIO *bio = nspr_get_bio(fd); @@ -1323,6 +1336,267 @@ nspr_bio_read(PRFileDesc *fd, void *buf, return bio->m->bread(bio, buf, amount); } +static PRInt32 +nspr_bio_recv(PRFileDesc *fd, void *buf, PRInt32 amount, + PRIntn flags, PRIntervalTime timeout) +{ + BIO *bio = nspr_get_bio(fd); + + if (!bio) { + return -1; + } + + return bio->m->bread(bio, buf, amount); +} + +void +npsr_map_error(int err) +{ + PRErrorCode prError; + + switch (err ) { + case EACCES: + prError = PR_NO_ACCESS_RIGHTS_ERROR; + break; + case EADDRINUSE: + prError = PR_ADDRESS_IN_USE_ERROR; + break; + case EADDRNOTAVAIL: + prError = PR_ADDRESS_NOT_AVAILABLE_ERROR; + break; + case EAFNOSUPPORT: + prError = PR_ADDRESS_NOT_SUPPORTED_ERROR; + break; + case EAGAIN: + prError = PR_WOULD_BLOCK_ERROR; + break; + /* + * On QNX and Neutrino, EALREADY is defined as EBUSY. + */ +#if EALREADY != EBUSY + case EALREADY: + prError = PR_ALREADY_INITIATED_ERROR; + break; +#endif + case EBADF: + prError = PR_BAD_DESCRIPTOR_ERROR; + break; +#ifdef EBADMSG + case EBADMSG: + prError = PR_IO_ERROR; + break; +#endif + case EBUSY: + prError = PR_FILESYSTEM_MOUNTED_ERROR; + break; + case ECONNABORTED: + prError = PR_CONNECT_ABORTED_ERROR; + break; + case ECONNREFUSED: + prError = PR_CONNECT_REFUSED_ERROR; + break; + case ECONNRESET: + prError = PR_CONNECT_RESET_ERROR; + break; + case EDEADLK: + prError = PR_DEADLOCK_ERROR; + break; +#ifdef EDIRCORRUPTED + case EDIRCORRUPTED: + prError = PR_DIRECTORY_CORRUPTED_ERROR; + break; +#endif +#ifdef EDQUOT + case EDQUOT: + prError = PR_NO_DEVICE_SPACE_ERROR; + break; +#endif + case EEXIST: + prError = PR_FILE_EXISTS_ERROR; + break; + case EFAULT: + prError = PR_ACCESS_FAULT_ERROR; + break; + case EFBIG: + prError = PR_FILE_TOO_BIG_ERROR; + break; + case EHOSTUNREACH: + prError = PR_HOST_UNREACHABLE_ERROR; + break; + case EINPROGRESS: + prError = PR_IN_PROGRESS_ERROR; + break; + case EINTR: + prError = PR_PENDING_INTERRUPT_ERROR; + break; + case EINVAL: + prError = PR_INVALID_ARGUMENT_ERROR; + break; + case EIO: + prError = PR_IO_ERROR; + break; + case EISCONN: + prError = PR_IS_CONNECTED_ERROR; + break; + case EISDIR: + prError = PR_IS_DIRECTORY_ERROR; + break; + case ELOOP: + prError = PR_LOOP_ERROR; + break; + case EMFILE: + prError = PR_PROC_DESC_TABLE_FULL_ERROR; + break; + case EMLINK: + prError = PR_MAX_DIRECTORY_ENTRIES_ERROR; + break; + case EMSGSIZE: + prError = PR_INVALID_ARGUMENT_ERROR; + break; +#ifdef EMULTIHOP + case EMULTIHOP: + prError = PR_REMOTE_FILE_ERROR; + break; +#endif + case ENAMETOOLONG: + prError = PR_NAME_TOO_LONG_ERROR; + break; + case ENETUNREACH: + prError = PR_NETWORK_UNREACHABLE_ERROR; + break; + case ENFILE: + prError = PR_SYS_DESC_TABLE_FULL_ERROR; + break; + /* + * On SCO OpenServer 5, ENOBUFS is defined as ENOSR. + */ +#if defined(ENOBUFS) && (ENOBUFS != ENOSR) + case ENOBUFS: + prError = PR_INSUFFICIENT_RESOURCES_ERROR; + break; +#endif + case ENODEV: + prError = PR_FILE_NOT_FOUND_ERROR; + break; + case ENOENT: + prError = PR_FILE_NOT_FOUND_ERROR; + break; + case ENOLCK: + prError = PR_FILE_IS_LOCKED_ERROR; + break; +#ifdef ENOLINK + case ENOLINK: + prError = PR_REMOTE_FILE_ERROR; + break; +#endif + case ENOMEM: + prError = PR_OUT_OF_MEMORY_ERROR; + break; + case ENOPROTOOPT: + prError = PR_INVALID_ARGUMENT_ERROR; + break; + case ENOSPC: + prError = PR_NO_DEVICE_SPACE_ERROR; + break; +#ifdef ENOSR + case ENOSR: + prError = PR_INSUFFICIENT_RESOURCES_ERROR; + break; +#endif + case ENOTCONN: + prError = PR_NOT_CONNECTED_ERROR; + break; + case ENOTDIR: + prError = PR_NOT_DIRECTORY_ERROR; + break; + case ENOTSOCK: + prError = PR_NOT_SOCKET_ERROR; + break; + case ENXIO: + prError = PR_FILE_NOT_FOUND_ERROR; + break; + case EOPNOTSUPP: + prError = PR_NOT_TCP_SOCKET_ERROR; + break; +#ifdef EOVERFLOW + case EOVERFLOW: + prError = PR_BUFFER_OVERFLOW_ERROR; + break; +#endif + case EPERM: + prError = PR_NO_ACCESS_RIGHTS_ERROR; + break; + case EPIPE: + prError = PR_CONNECT_RESET_ERROR; + break; +#ifdef EPROTO + case EPROTO: + prError = PR_IO_ERROR; + break; +#endif + case EPROTONOSUPPORT: + prError = PR_PROTOCOL_NOT_SUPPORTED_ERROR; + break; + case EPROTOTYPE: + prError = PR_ADDRESS_NOT_SUPPORTED_ERROR; + break; + case ERANGE: + prError = PR_INVALID_METHOD_ERROR; + break; + case EROFS: + prError = PR_READ_ONLY_FILESYSTEM_ERROR; + break; + case ESPIPE: + prError = PR_INVALID_METHOD_ERROR; + break; + case ETIMEDOUT: + prError = PR_IO_TIMEOUT_ERROR; + break; +#if EWOULDBLOCK != EAGAIN + case EWOULDBLOCK: + prError = PR_WOULD_BLOCK_ERROR; + break; +#endif + case EXDEV: + prError = PR_NOT_SAME_DEVICE_ERROR; + break; + default: + prError = PR_UNKNOWN_ERROR; + break; + } + PR_SetError(prError, err); +} + +static PRStatus +nspr_bio_getpeername(PRFileDesc *fd, PRNetAddr *addr) +{ + BIO *bio = nspr_get_bio(fd); + int osfd; + int ret; + PRUint32 addrlen; + + if (!bio) { + return -1; + } + ret = bio->m->ctrl(bio, BIO_C_GET_PEERNAME, sizeof(PRNetAddr), addr); + if (ret > 0) { + return PR_SUCCESS; + } + + ret = bio->m->ctrl(bio, BIO_C_GET_FD, sizeof(osfd), &osfd); + if (ret <= 0) { + PR_SetError(PR_BAD_DESCRIPTOR_ERROR, EBADF); + return PR_FAILURE; + } + ret = getpeername(osfd, (struct sockaddr *) addr, &addrlen); + if (ret < 0) { + npsr_map_error(errno); + } + + return ret == 0 ? PR_SUCCESS : PR_FAILURE; +} + + static PRStatus nspr_bio_close(PRFileDesc *fd) { @@ -1357,6 +1631,9 @@ ssl_init_bio() gBioMethods.write = nspr_bio_write; gBioMethods.read = nspr_bio_read; gBioMethods.close = nspr_bio_close; + gBioMethods.send = nspr_bio_send; + gBioMethods.recv = nspr_bio_recv; + gBioMethods.getpeername = nspr_bio_getpeername; } void SSL_load_error_strings(void) @@ -2542,11 +2819,9 @@ int SSL_set_bio(SSL *s, BIO *bio, BIO *b } /* close the previous layer */ - old = PR_PopIOLayer(s, gIdentity); - if (!old) { - old = PR_PopIOLayer(s, gBioIdentity); - } + old = PR_GetIdentitiesLayer(s, gBioIdentity); if (old) { + PR_PopIOLayer(s, gBioIdentity); old->dtor(old); } @@ -2555,7 +2830,7 @@ int SSL_set_bio(SSL *s, BIO *bio, BIO *b if (new == NULL) goto error; nspr_set_bio(new , bio); - if (PR_PushIOLayer(s, PR_TOP_IO_LAYER, new) != PR_SUCCESS) + if (PR_PushIOLayer(s, PR_GetLayersIdentity(s->lower), new) != PR_SUCCESS) goto error; return 1; Index: nss_compat_ossl.spec =================================================================== RCS file: /cvs/extras/rpms/nss_compat_ossl/F-9/nss_compat_ossl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nss_compat_ossl.spec 19 Feb 2008 21:05:32 -0000 1.7 +++ nss_compat_ossl.spec 2 Jul 2008 17:29:16 -0000 1.8 @@ -1,6 +1,6 @@ Name: nss_compat_ossl Version: 0.9.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Source-level compatibility library for OpenSSL to NSS porting Group: System Environment/Libraries @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: nss_compat_ossl-symbol.patch Patch2: nss_compat_ossl-link.patch +Patch3: nss_compat_ossl-layer.patch # Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available BuildRequires: nss-devel > 3.11.7-7 @@ -31,6 +32,7 @@ %setup -q %patch1 -p1 -b .symbol %patch2 -p1 -b .link +%patch3 -p1 -b .layer %build @@ -68,6 +70,9 @@ %postun -p /sbin/ldconfig %changelog +* Wed Jun 2 2008 Rob Crittenden 0.9.2-5 +- Fix BIO NSPR layer (#453651) + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 2 17:49:28 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Wed, 2 Jul 2008 17:49:28 GMT Subject: rpms/fedora-package-config-smart/F-8 fedora-package-config-smart.spec, 1.9, 1.10 Message-ID: <200807021749.m62HnSI2017433@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17313/F-8 Modified Files: fedora-package-config-smart.spec Log Message: Restart koji builds (#451204) Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-8/fedora-package-config-smart.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fedora-package-config-smart.spec 22 Mar 2008 17:07:46 -0000 1.9 +++ fedora-package-config-smart.spec 2 Jul 2008 17:48:02 -0000 1.10 @@ -1,11 +1,11 @@ %global debug_package %{nil} -# Set to something different than %{nil} to use rawhide repos. -%global rawhide %{nil} +# Set to 1 to use rawhide repos. +%global rawhide 0 Summary: Fedora configuration files for the Smart package manager Name: fedora-package-config-smart Version: 8 -Release: 12 +Release: 12.0.1 License: GPL+ Group: System Environment/Base URL: http://fedoraproject.org/ From fedora-extras-commits at redhat.com Wed Jul 2 17:49:49 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Wed, 2 Jul 2008 17:49:49 GMT Subject: rpms/fedora-package-config-smart/F-9 fedora-package-config-smart.spec, 1.11, 1.12 Message-ID: <200807021749.m62Hnn5V017464@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17313/F-9 Modified Files: fedora-package-config-smart.spec Log Message: Restart koji builds (#451204) Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/F-9/fedora-package-config-smart.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fedora-package-config-smart.spec 17 May 2008 06:27:13 -0000 1.11 +++ fedora-package-config-smart.spec 2 Jul 2008 17:48:28 -0000 1.12 @@ -1,11 +1,11 @@ %global debug_package %{nil} -# Set to something different than %{nil} to use rawhide repos. -%global rawhide %{nil} +# Set to 1 to use rawhide repos. +%global rawhide 0 Summary: Fedora configuration files for the Smart package manager Name: fedora-package-config-smart Version: 9 -Release: 13 +Release: 13.0.1 License: GPL+ Group: System Environment/Base URL: http://fedoraproject.org/ From fedora-extras-commits at redhat.com Wed Jul 2 17:49:52 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Wed, 2 Jul 2008 17:49:52 GMT Subject: rpms/fedora-package-config-smart/devel fedora-package-config-smart.spec, 1.10, 1.11 Message-ID: <200807021749.m62Hnq8i017467@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17313/devel Modified Files: fedora-package-config-smart.spec Log Message: Restart koji builds (#451204) Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fedora-package-config-smart.spec 22 Mar 2008 17:07:55 -0000 1.10 +++ fedora-package-config-smart.spec 2 Jul 2008 17:48:49 -0000 1.11 @@ -1,11 +1,11 @@ %global debug_package %{nil} -# Set to something different than %{nil} to use rawhide repos. -%global rawhide yes +# Set to 1 to use rawhide repos. +%global rawhide 1 Summary: Fedora configuration files for the Smart package manager Name: fedora-package-config-smart -Version: 8.92 -Release: 12 +Version: 9.89 +Release: 14 License: GPL+ Group: System Environment/Base URL: http://fedoraproject.org/ From fedora-extras-commits at redhat.com Wed Jul 2 17:55:49 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 2 Jul 2008 17:55:49 GMT Subject: rpms/evolution-rss/F-9 .cvsignore,1.3,1.4 Message-ID: <200807021755.m62HtnYr017890@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17841 Modified Files: .cvsignore Log Message: update to 0.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2008 19:30:48 -0000 1.3 +++ .cvsignore 2 Jul 2008 17:54:52 -0000 1.4 @@ -1 +1 @@ -evolution-rss-0.0.8.tar.gz +evolution-rss-0.1.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 18:04:40 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Wed, 2 Jul 2008 18:04:40 GMT Subject: rpms/freenx-server/F-8 freenx-server.spec,1.2,1.3 Message-ID: <200807021804.m62I4elm024852@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/freenx-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18069/F-8 Modified Files: freenx-server.spec Log Message: Remove x86_64 package until #446816 is resolved. Index: freenx-server.spec =================================================================== RCS file: /cvs/extras/rpms/freenx-server/F-8/freenx-server.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- freenx-server.spec 22 Apr 2008 21:33:23 -0000 1.2 +++ freenx-server.spec 2 Jul 2008 17:58:39 -0000 1.3 @@ -5,7 +5,7 @@ Summary: Free Software (GPL) Implementation of the NX Server Name: freenx-server Version: 0.7.2 -Release: 8%{?dist} +Release: 8.0.1%{?dist} License: GPLv2 Group: Applications/Internet URL: http://freenx.berlios.de/ @@ -13,6 +13,7 @@ Source1: freenx.logrotate Patch0: freenx-0.7.1-sharing_and_multimedia_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +ExcludeArch: x86_64 BuildRequires: imake, redhat-release Requires: nx, %{_pkglibdir} Requires: openssh-server nc expect which perl From fedora-extras-commits at redhat.com Wed Jul 2 18:04:40 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Wed, 2 Jul 2008 18:04:40 GMT Subject: rpms/freenx-server/F-9 freenx-server.spec,1.2,1.3 Message-ID: <200807021804.m62I4e7c024855@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/freenx-server/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18069/F-9 Modified Files: freenx-server.spec Log Message: Remove x86_64 package until #446816 is resolved. Index: freenx-server.spec =================================================================== RCS file: /cvs/extras/rpms/freenx-server/F-9/freenx-server.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- freenx-server.spec 22 Apr 2008 22:11:34 -0000 1.2 +++ freenx-server.spec 2 Jul 2008 18:00:40 -0000 1.3 @@ -5,7 +5,7 @@ Summary: Free Software (GPL) Implementation of the NX Server Name: freenx-server Version: 0.7.2 -Release: 8%{?dist} +Release: 8.0.1%{?dist} License: GPLv2 Group: Applications/Internet URL: http://freenx.berlios.de/ @@ -13,6 +13,7 @@ Source1: freenx.logrotate Patch0: freenx-0.7.1-sharing_and_multimedia_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +ExcludeArch: x86_64 BuildRequires: imake, redhat-release Requires: nx, %{_pkglibdir} Requires: openssh-server nc expect which perl From fedora-extras-commits at redhat.com Wed Jul 2 18:05:07 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Wed, 2 Jul 2008 18:05:07 GMT Subject: rpms/freenx-server/devel freenx-server.spec,1.2,1.3 Message-ID: <200807021805.m62I57DB024873@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/freenx-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18069/devel Modified Files: freenx-server.spec Log Message: Remove x86_64 package until #446816 is resolved. Index: freenx-server.spec =================================================================== RCS file: /cvs/extras/rpms/freenx-server/devel/freenx-server.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- freenx-server.spec 22 Apr 2008 21:33:35 -0000 1.2 +++ freenx-server.spec 2 Jul 2008 18:02:40 -0000 1.3 @@ -5,7 +5,7 @@ Summary: Free Software (GPL) Implementation of the NX Server Name: freenx-server Version: 0.7.2 -Release: 8%{?dist} +Release: 8.0.1%{?dist} License: GPLv2 Group: Applications/Internet URL: http://freenx.berlios.de/ @@ -13,6 +13,7 @@ Source1: freenx.logrotate Patch0: freenx-0.7.1-sharing_and_multimedia_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +ExcludeArch: x86_64 BuildRequires: imake, redhat-release Requires: nx, %{_pkglibdir} Requires: openssh-server nc expect which perl From fedora-extras-commits at redhat.com Wed Jul 2 18:19:43 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 2 Jul 2008 18:19:43 GMT Subject: rpms/snort/F-9 snort.spec,1.32,1.33 sysconfig.snort,1.1,1.2 Message-ID: <200807021819.m62IJhaK025750@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/snort/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25684 Modified Files: snort.spec sysconfig.snort Log Message: * Tue Jun 24 2008 Dennis Gilmore - 2.8.1-4 - make sure we have the right initscript and create a snortd user - Fix bz 452736, 452737, & 452763 Index: snort.spec =================================================================== RCS file: /cvs/pkgs/rpms/snort/F-9/snort.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- snort.spec 25 Jun 2008 03:35:17 -0000 1.32 +++ snort.spec 2 Jul 2008 18:18:41 -0000 1.33 @@ -12,7 +12,8 @@ Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: libpcap >= 0.4 -Prereq: /sbin/chkconfig, /usr/sbin/useradd +Prereq: /sbin/chkconfig +Requires(pre): shadow-utils BuildRequires: libpcap-devel >= 0.4 BuildRequires: perl BuildRequires: pcre-devel @@ -309,7 +310,7 @@ install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine -for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns'; do +for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns' 'ssl'; do install snort_dynamicpreprocessor/libsf_${i}_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor @@ -319,15 +320,15 @@ install snort.8 %{buildroot}%{_mandir}/man8 install etc/gen-msg.map etc/sid-msg.map etc/threshold.conf etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort -install -p -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d +install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir} mkdir -p %{buildroot}/etc/sysconfig/ install -p -m 644 %{SOURCE3} %{buildroot}/etc/sysconfig/snort mkdir -p %{buildroot}%{_sysconfdir}/snort/rules/ -mkdir -p %{buildroot}/var/lib/snort +mkdir -p %{buildroot}/%{_var}/lib/snort -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}/snort/rules!' %{buildroot}%{_sysconfdir}/snort/snort.conf perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf -perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf +perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/snort/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean if [ -d %{buildroot} ]; then @@ -336,8 +337,9 @@ %pre -/usr/sbin/useradd -M -o -r -d /var/lib/snort -s /bin/false \ - -c "snortd user" -u 62 snortd > /dev/null 2>&1 || : +getent passwd snortd >/dev/null || \ + /usr/sbin/useradd -M -o -r -d /var/lib/snort -s /sbin/nologin \ + -c "Snort Daemon" -u 62 snortd > /dev/null 2>&1 || : %post /sbin/chkconfig --add snortd @@ -462,10 +464,10 @@ %attr(755,snortd,snortd) %dir /var/log/snort %attr(755,root,root) %dir %{_sysconfdir}/snort/rules %attr(644,root,root) %config %{_sysconfdir}/snort -%attr(755,root,root) /etc/rc.d/init.d/snortd +%attr(755,root,root) %{_initrddir}/snortd %{_libdir}/snort %config(noreplace)%{_sysconfdir}/sysconfig/snort -%attr(0755,snortd,snortd) %dir /var/lib/snort +%attr(0755,snortd,snortd) %dir %{_var}/lib/snort %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -495,6 +497,7 @@ %changelog * Tue Jun 24 2008 Dennis Gilmore - 2.8.1-4 - make sure we have the right initscript and create a snortd user +- Fix bz 452736, 452737, & 452763 * Thu May 15 2008 Dennis Gilmore - 2.8.1-3 - make rules dir Index: sysconfig.snort =================================================================== RCS file: /cvs/pkgs/rpms/snort/F-9/sysconfig.snort,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sysconfig.snort 17 Nov 2007 23:46:17 -0000 1.1 +++ sysconfig.snort 2 Jul 2008 18:18:41 -0000 1.2 @@ -1,2 +1,11 @@ +# What user account should we run under. +USER="root" + +# What group account should we run under. +GROUP="root" + # define the interface we listen on -INTERFACE=eth0 +INTERFACE="eth0" + +# If you are using prelude, delete the '-A fast' option +SNORT_OPTIONS="-A fast -b -l /var/log/snort -d" From fedora-extras-commits at redhat.com Wed Jul 2 18:27:48 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 2 Jul 2008 18:27:48 GMT Subject: rpms/evolution-rss/devel .cvsignore, 1.3, 1.4 evolution-rss.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <200807021827.m62IRmwp026189@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26095 Modified Files: .cvsignore evolution-rss.spec sources Log Message: update to 0.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2008 19:30:48 -0000 1.3 +++ .cvsignore 2 Jul 2008 18:25:54 -0000 1.4 @@ -1 +1 @@ -evolution-rss-0.0.8.tar.gz +evolution-rss-0.1.0.tar.gz Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- evolution-rss.spec 24 Mar 2008 13:26:15 -0000 1.12 +++ evolution-rss.spec 2 Jul 2008 18:25:54 -0000 1.13 @@ -1,12 +1,10 @@ Summary: Evolution RSS Reader Name: evolution-rss -Version: 0.0.8 -Release: 5%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz -Patch0: evolution-rss-0.0.8-empty-desc.patch -Patch1: evolution-rss-0.0.8-norss-popup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Requires: evolution @@ -19,7 +17,8 @@ BuildRequires: evolution-devel BuildRequires: evolution-data-server-devel BuildRequires: dbus-glib-devel -BuildRequires: gecko-libs = 1.9 +BuildRequires: xulrunner-devel-unstable +BuildRequires: WebKit-gtk-devel BuildRequires: perl(XML::Parser) BuildRequires: libtool @@ -28,12 +27,9 @@ %prep %setup -q -n evolution-rss-%{version} -%patch0 -p1 -b .empty-fix -%patch1 -p1 -b .norss-popup %build -autoreconf -i -f -%configure --disable-webkit +%configure make %{?_smp_mflags} %install @@ -75,8 +71,8 @@ %{_bindir}/evolution-import-rss %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_datadir}/evolution/*/errors/org-gnome-evolution-rss.error -%{_datadir}/evolution/*/glade/rss-ui.glade -%{_datadir}/evolution/*/images/rss.png +%{_datadir}/evolution/*/glade/*.glade +%{_datadir}/evolution/*/images/*.png %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.eplug %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.xml %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so @@ -90,6 +86,9 @@ %doc TODO %changelog +* Wed Jul 2 2008 Lucian Langa - 0.1.0-1 +- New upstream + * Thu Mar 24 2008 Lucian Langa - 0.0.8-5 - Fixed wrong function def in previous patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2008 19:30:48 -0000 1.3 +++ sources 2 Jul 2008 18:25:55 -0000 1.4 @@ -1 +1 @@ -c5adce093e332573bc1fcfaf23c1f8b6 evolution-rss-0.0.8.tar.gz +63479fcf4c3af998ab2794e5a0f075f6 evolution-rss-0.1.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 18:29:14 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 2 Jul 2008 18:29:14 GMT Subject: rpms/evolution-rss/devel evolution-rss-0.0.8-empty-desc.patch, 1.1, NONE evolution-rss-0.0.8-norss-popup.patch, 1.2, NONE Message-ID: <200807021829.m62ITEXd026268@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26249 Removed Files: evolution-rss-0.0.8-empty-desc.patch evolution-rss-0.0.8-norss-popup.patch Log Message: update to 0.1.0 --- evolution-rss-0.0.8-empty-desc.patch DELETED --- --- evolution-rss-0.0.8-norss-popup.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 18:30:18 2008 From: fedora-extras-commits at redhat.com (Adam Goode (agoode)) Date: Wed, 2 Jul 2008 18:30:18 GMT Subject: rpms/js/F-9 js.spec,1.21,1.22 Message-ID: <200807021830.m62IUITq026395@cvs-int.fedora.redhat.com> Author: agoode Update of /cvs/pkgs/rpms/js/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26292 Modified Files: js.spec Log Message: * Wed Jun 4 2008 Jon McCann - 1.70-3 - Add two missing files (#449715) Index: js.spec =================================================================== RCS file: /cvs/pkgs/rpms/js/F-9/js.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- js.spec 28 Feb 2008 13:10:24 -0000 1.21 +++ js.spec 2 Jul 2008 18:29:23 -0000 1.22 @@ -3,7 +3,7 @@ Summary: JavaScript interpreter and libraries Name: js Version: 1.70 -Release: 2%{?dist} +Release: 3%{?dist} # The sources are triple licensed, but when we link against readline which is # GPL, the result can only be GPL. %if 0%{?_without_readline:1} @@ -93,7 +93,7 @@ %{buildroot}%{_libdir}/ %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so -%{__install} -m 0644 src/js*.h src/js.msg src/jsopcode.tbl \ +%{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \ src/Linux_All_OPT.OBJ/jsautocfg.h \ %{buildroot}%{_includedir}/ %{__install} -m 0644 libjs.pc \ @@ -122,11 +122,14 @@ %{_libdir}/*.so %{_libdir}/*.a %{_includedir}/js*.h -%{_includedir}/jsopcode.tbl +%{_includedir}/*.tbl %{_includedir}/js.msg %changelog +* Wed Jun 4 2008 Jon McCann - 1.70-3 +- Add two missing files (#449715) + * Wed Feb 27 2008 Tom "spot" Callaway - 1.70-2 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Wed Jul 2 18:32:03 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 2 Jul 2008 18:32:03 GMT Subject: rpms/perl-CPAN-DistnameInfo/devel .cvsignore, 1.2, 1.3 perl-CPAN-DistnameInfo.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200807021832.m62IW3RY026544@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/perl-CPAN-DistnameInfo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26489 Modified Files: .cvsignore perl-CPAN-DistnameInfo.spec sources Log Message: Update to 0.07. Improve Summary. Drop our copies of COPYING and Artistic. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-CPAN-DistnameInfo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jan 2006 21:27:07 -0000 1.2 +++ .cvsignore 2 Jul 2008 18:31:27 -0000 1.3 @@ -1 +1 @@ -CPAN-DistnameInfo-0.06.tar.gz +CPAN-DistnameInfo-0.07.tar.gz Index: perl-CPAN-DistnameInfo.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CPAN-DistnameInfo/devel/perl-CPAN-DistnameInfo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-CPAN-DistnameInfo.spec 8 Feb 2008 18:13:09 -0000 1.4 +++ perl-CPAN-DistnameInfo.spec 2 Jul 2008 18:31:27 -0000 1.5 @@ -1,7 +1,7 @@ Name: perl-CPAN-DistnameInfo -Version: 0.06 -Release: 4%{?dist} -Summary: CPAN::DistnameInfo Perl module +Version: 0.07 +Release: 1%{?dist} +Summary: Extract distribution name and version from a distribution filename License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/CPAN-DistnameInfo/ @@ -41,9 +41,6 @@ %{_fixperms} $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test @@ -52,11 +49,16 @@ %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Wed Jul 02 2008 Steven Pritchard 0.07-1 +- Update to 0.07. +- Improve Summary. +- Drop our copies of COPYING and Artistic. + * Fri Feb 8 2008 Tom "spot" Callaway 0.06-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-CPAN-DistnameInfo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jan 2006 21:27:07 -0000 1.2 +++ sources 2 Jul 2008 18:31:27 -0000 1.3 @@ -1 +1 @@ -f7154ef1681ce5d236e984d7ce72e3ac CPAN-DistnameInfo-0.06.tar.gz +67be352964083d1dad3c97916d97937a CPAN-DistnameInfo-0.07.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 18:32:44 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 2 Jul 2008 18:32:44 GMT Subject: rpms/libSM/F-9 import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 libSM.spec, 1.22, 1.23 sources, 1.9, 1.10 Message-ID: <200807021832.m62IWini026641@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libSM/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26527/F-9 Modified Files: .cvsignore libSM.spec sources Added Files: import.log Log Message: libSM 1.1.0 --- NEW FILE import.log --- libSM-1_1_0-1_fc9:F-9:libSM-1.1.0-1.fc9.src.rpm:1215023201 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libSM/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Nov 2006 15:05:45 -0000 1.9 +++ .cvsignore 2 Jul 2008 18:31:58 -0000 1.10 @@ -1 +1 @@ -libSM-1.0.2.tar.bz2 +libSM-1.1.0.tar.bz2 Index: libSM.spec =================================================================== RCS file: /cvs/pkgs/rpms/libSM/F-9/libSM.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libSM.spec 20 Feb 2008 02:05:45 -0000 1.22 +++ libSM.spec 2 Jul 2008 18:31:58 -0000 1.23 @@ -1,7 +1,7 @@ Summary: X.Org X11 libSM runtime library Name: libSM -Version: 1.0.2 -Release: 5%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -13,6 +13,8 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4 BuildRequires: libICE-devel +# yes, really. libuuid. +BuildRequires: e2fsprogs-devel Obsoletes: XFree86-libs, xorg-x11-libs @@ -36,15 +38,9 @@ %prep %setup -q -# Disable static library creation by default. -%define with_static 0 - %build -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --with-libuuid --disable-static make %install @@ -74,13 +70,13 @@ %{_includedir}/X11/SM/SM.h %{_includedir}/X11/SM/SMlib.h %{_includedir}/X11/SM/SMproto.h -%if %{with_static} -%{_libdir}/libSM.a -%endif %{_libdir}/libSM.so %{_libdir}/pkgconfig/sm.pc %changelog +* Wed Jul 02 2008 Adam Jackson 1.1.0-1 +- libSM 1.1.0 + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libSM/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 15:05:45 -0000 1.9 +++ sources 2 Jul 2008 18:31:58 -0000 1.10 @@ -1 +1 @@ -a254771550c01db372e88d1a1dc2e13a libSM-1.0.2.tar.bz2 +05a04c2b6382fb0054f6c70494e22733 libSM-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 18:43:03 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 2 Jul 2008 18:43:03 GMT Subject: rpms/quassel/devel import.log, NONE, 1.1 quassel.desktop, NONE, 1.1 quassel.spec, NONE, 1.1 quasselclient.desktop, NONE, 1.1 quasselcore.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807021843.m62Ih3WB027160@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/quassel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27093/devel Modified Files: .cvsignore sources Added Files: import.log quassel.desktop quassel.spec quasselclient.desktop quasselcore.desktop Log Message: Initial package --- NEW FILE import.log --- quassel-0_2_0-0_3_beta1_fc9:HEAD:quassel-0.2.0-0.3.beta1.fc9.src.rpm:1215024162 --- NEW FILE quassel.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Quassel IRC Exec=quassel Icon=default Terminal=false Type=Application Categories=Qt;Network;IRCClient; --- NEW FILE quassel.spec --- Name: quassel Summary: QT4 Based distrubuted IRC system Version: 0.2.0 Release: 0.3.beta1%{?dist} License: GPLv2 or GPLv3 Group: Applications/Internet URL: http://quassel-irc.org/ Source0: http://quassel-irc.org/system/files/quassel-%{version}-beta1.tar.bz2 Source1: %{name}.desktop Source2: %{name}core.desktop Source3: %{name}client.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: qt-sqlite BuildRequires: qt-devel BuildRequires: cmake BuildRequires: desktop-file-utils %description Quassel IRC is a modern, distributed IRC client, meaning that one (or multiple) client(s) can attach to and detach from a central core -- much like the popular combination of screen and a text-based IRC client such as WeeChat, but graphical %package core Summary: Quassel core component Group: Applications/Internet %description core The Quassel IRC Core maintains a connection with the server, and allows for multiple clients to connect %package client Summary: Quassel client Group: Applications/Internet %description client Quassel client %prep %setup -q -n quassel-0.2.0-beta1 %build cd build %{_qt4_qmake} make %install rm -rf %{buildroot} cd build/targets install -d -m755 %{buildroot}%{_bindir} install -m755 quassel %{buildroot}%{_bindir} install -m755 quasselclient %{buildroot}%{_bindir} install -m755 quasselcore %{buildroot}%{_bindir} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quassel %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quassel.desktop %files core %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quasselcore %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quasselcore.desktop %files client %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quasselclient %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quasselclient.desktop %changelog * Wed Jul 02 2008 Steven Parrish - 0.3.beta1 - Final spec for initial release to F9 and rawhide * Tue Jun 24 2008 Steven Parrish - Revised spec file based on comments from package reviewer. * Mon Jun 23 2008 Steven Parrish - initial RPM --- NEW FILE quasselclient.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Quassel client Exec=quasselclient Icon=default Terminal=false Type=Application Categories=Qt;Network;IRCClient; --- NEW FILE quasselcore.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Quassel IRC Core Exec=quasselcore Icon=default Terminal=false Type=Application Categories=Qt;Network;IRCClient; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/quassel/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2008 16:42:33 -0000 1.1 +++ .cvsignore 2 Jul 2008 18:42:19 -0000 1.2 @@ -0,0 +1 @@ +quassel-0.2.0-beta1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/quassel/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2008 16:42:33 -0000 1.1 +++ sources 2 Jul 2008 18:42:19 -0000 1.2 @@ -0,0 +1 @@ +246881ecc4d7e7a0eb98a2fa6bfbac64 quassel-0.2.0-beta1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 18:43:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Wed, 2 Jul 2008 18:43:30 GMT Subject: rpms/clisp/F-9 .cvsignore, 1.10, 1.11 clisp.spec, 1.33, 1.34 sources, 1.11, 1.12 Message-ID: <200807021843.m62IhUGj027222@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/clisp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27140 Modified Files: .cvsignore clisp.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clisp/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Jun 2008 16:00:42 -0000 1.10 +++ .cvsignore 2 Jul 2008 18:42:55 -0000 1.11 @@ -1 +1 @@ -clisp-2.45.tar.bz2 +clisp-2.46.tar.bz2 Index: clisp.spec =================================================================== RCS file: /cvs/pkgs/rpms/clisp/F-9/clisp.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- clisp.spec 11 Jun 2008 16:00:42 -0000 1.33 +++ clisp.spec 2 Jul 2008 18:42:55 -0000 1.34 @@ -1,6 +1,6 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.45 +Version: 2.46 Release: 1%{?dist} Group: Development/Languages @@ -142,6 +142,9 @@ %changelog +* Wed Jul 2 2008 Gerard Milmeister - 2.46-1 +- new release 2.46 + * Fri Apr 18 2008 Gerard Milmeister - 2.44.1-1 - new release 2.44.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clisp/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 11 Jun 2008 16:00:42 -0000 1.11 +++ sources 2 Jul 2008 18:42:55 -0000 1.12 @@ -1 +1 @@ -1f26ef23ca310366e328df925c23c663 clisp-2.45.tar.bz2 +8c4d8ed0f40e01999c4d799328a86c39 clisp-2.46.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 18:50:52 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 2 Jul 2008 18:50:52 GMT Subject: rpms/xorg-x11-utils/F-9 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-utils.spec, 1.22, 1.23 xdpyinfo-1.0.2-silence-misc-errors.patch, 1.2, NONE Message-ID: <200807021850.m62IoqBt027566@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27502/F-9 Modified Files: .cvsignore sources xorg-x11-utils.spec Removed Files: xdpyinfo-1.0.2-silence-misc-errors.patch Log Message: Small updates for 7.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 24 Sep 2007 19:41:14 -0000 1.8 +++ .cvsignore 2 Jul 2008 18:50:06 -0000 1.9 @@ -1,11 +1,11 @@ -xdpyinfo-1.0.2.tar.bz2 +xdriinfo-1.0.2.tar.bz2 xev-1.0.2.tar.bz2 xfd-1.0.1.tar.bz2 xfontsel-1.0.2.tar.bz2 xlsatoms-1.0.1.tar.bz2 xlsclients-1.0.1.tar.bz2 xlsfonts-1.0.2.tar.bz2 -xprop-1.0.3.tar.bz2 xvinfo-1.0.2.tar.bz2 -xdriinfo-1.0.2.tar.bz2 -xwininfo-1.0.3.tar.bz2 +xdpyinfo-1.0.3.tar.bz2 +xprop-1.0.4.tar.bz2 +xwininfo-1.0.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Sep 2007 19:41:14 -0000 1.8 +++ sources 2 Jul 2008 18:50:06 -0000 1.9 @@ -1,11 +1,11 @@ -c9ee60ae52c97c51d4ca327e53f0cb61 xdpyinfo-1.0.2.tar.bz2 +a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2 e3008eb0655da3026c162a5597d70869 xev-1.0.2.tar.bz2 c72abd90f50ef459bc14b39ec9fcc7f8 xfd-1.0.1.tar.bz2 288fe4cf8a990e4e602aac16dd9109fb xfontsel-1.0.2.tar.bz2 69adcda848479acc3b82b3928812d191 xlsatoms-1.0.1.tar.bz2 44473b880d26bfbe8b3d4d72b183cba7 xlsclients-1.0.1.tar.bz2 28958248590ff60ecd70e8f590d977b7 xlsfonts-1.0.2.tar.bz2 -e7b16eeb4bab974e3592d62f415aa6a5 xprop-1.0.3.tar.bz2 e1e318436f49e2f0f3764593dadd9ad2 xvinfo-1.0.2.tar.bz2 -a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2 -721f84332c98c33152460bb22ba9ded6 xwininfo-1.0.3.tar.bz2 +b7cbab6cbcd12bf7ad65dbc12d86e104 xdpyinfo-1.0.3.tar.bz2 +48aa8fd78802f477dcbf9ef0dfd9f783 xprop-1.0.4.tar.bz2 +e2a9bf5ab7f2a0866700a3b49dd8c6bf xwininfo-1.0.4.tar.bz2 Index: xorg-x11-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/F-9/xorg-x11-utils.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xorg-x11-utils.spec 25 Apr 2008 17:41:06 -0000 1.22 +++ xorg-x11-utils.spec 2 Jul 2008 18:50:06 -0000 1.23 @@ -2,14 +2,14 @@ Summary: X.Org X11 X client utilities Name: xorg-x11-%{pkgname} -Version: 7.3 -Release: 3%{?dist} +Version: 7.4 +Release: 1%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.2.tar.bz2 +Source0: ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2 Source1: ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2 @@ -17,11 +17,9 @@ Source5: ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.1.tar.bz2 Source6: ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.1.tar.bz2 Source7: ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2 -Source8: ftp://ftp.x.org/pub/individual/app/xprop-1.0.3.tar.bz2 +Source8: ftp://ftp.x.org/pub/individual/app/xprop-1.0.4.tar.bz2 Source9: ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2 -Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.3.tar.bz2 - -Patch0: xdpyinfo-1.0.2-silence-misc-errors.patch +Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2 BuildRequires: pkgconfig BuildRequires: libdmx-devel @@ -39,9 +37,6 @@ BuildRequires: libXxf86misc-devel BuildRequires: libXxf86vm-devel -# FIXME: check if still needed for X11R7 -Requires(pre): filesystem >= 2.3.6-1 - Provides: xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo %description @@ -50,7 +45,6 @@ %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -%patch0 -p0 -b .misc %build # Build all apps @@ -107,6 +101,11 @@ %{_mandir}/man1/xwininfo.1* %changelog +* Wed Jul 02 2008 Adam Jackson 7.4-1 +- xdpyinfo 1.0.3 +- xprop 1.0.4 +- xwininfo 1.0.4 + * Fri Apr 25 2008 Adam Jackson 7.3-3 - xdpyinfo-1.0.2-silence-misc-errors.patch: Make xf86misc and xf86dga protocol errors non-fatal. (#442176) --- xdpyinfo-1.0.2-silence-misc-errors.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 18:50:55 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 2 Jul 2008 18:50:55 GMT Subject: rpms/openbabel/devel .cvsignore, 1.10, 1.11 openbabel-gcc43.patch, 1.15, 1.16 openbabel.spec, 1.37, 1.38 sources, 1.10, 1.11 Message-ID: <200807021850.m62IothO027608@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27465 Modified Files: .cvsignore openbabel-gcc43.patch openbabel.spec sources Log Message: * Wed Jul 02 2008 Dominik Mierzejewski 2.2.0-0.6.b7 - updated to 2.2.0 beta7 - new URL - dropped Python binding split patch (broken, reverted upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 29 May 2008 20:23:54 -0000 1.10 +++ .cvsignore 2 Jul 2008 18:49:45 -0000 1.11 @@ -1 +1 @@ -openbabel-2.2.0b5-20080517-r2469.tar.gz +openbabel-2.2.0b7-20080627-r2628.tar.gz openbabel-gcc43.patch: Index: openbabel-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-gcc43.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- openbabel-gcc43.patch 23 Feb 2008 20:49:58 -0000 1.15 +++ openbabel-gcc43.patch 2 Jul 2008 18:49:45 -0000 1.16 @@ -1,6 +1,6 @@ -diff -up openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h.gcc43 openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h ---- openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h.gcc43 2007-11-30 00:01:23.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43 openbabel-2.2.0b7/src/zipstreamimpl.h +--- openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43 2008-06-21 15:58:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/zipstreamimpl.h 2008-07-02 20:16:21.000000000 +0200 @@ -31,6 +31,8 @@ Altered by: Geoffrey Hutchison 2005 for minor namespace modifications, VC++ compatibility */ @@ -10,9 +10,9 @@ //***************************************************************************** // template class basic_zip_streambuf //***************************************************************************** -diff -up openbabel-2.2.0b3-20080215-r2249/src/residue.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/residue.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/residue.cpp.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/residue.cpp 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/residue.cpp.gcc43 openbabel-2.2.0b7/src/residue.cpp +--- openbabel-2.2.0b7/src/residue.cpp.gcc43 2008-06-21 15:58:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/residue.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -26,6 +26,8 @@ obtained in part or whole from RasMol2 b // File Includes /////////////////////////////////////////////////////////////////////////////// @@ -22,21 +22,20 @@ #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/src/tokenst.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/tokenst.cpp -diff -up openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp.gcc43 2008-01-21 22:48:26.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp 2008-02-23 20:55:49.000000000 +0100 -@@ -36,6 +36,7 @@ GNU General Public License for more deta - #include +diff -up openbabel-2.2.0b7/src/obconversion.cpp.gcc43 openbabel-2.2.0b7/src/obconversion.cpp +--- openbabel-2.2.0b7/src/obconversion.cpp.gcc43 2008-06-21 15:58:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/obconversion.cpp 2008-07-02 20:17:00.000000000 +0200 +@@ -37,6 +37,7 @@ GNU General Public License for more deta #include #include + #include +#include - #include + #include -diff -up openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp.gcc43 2007-12-18 20:12:51.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp 2008-02-23 20:58:22.000000000 +0100 +diff -up openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/rxnformat.cpp +--- openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43 2008-06-21 15:58:01.000000000 +0200 ++++ openbabel-2.2.0b7/src/formats/rxnformat.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -16,6 +16,7 @@ GNU General Public License for more deta #include "openbabel/babelconfig.h" #include @@ -45,9 +44,9 @@ #include "openbabel/mol.h" #include "openbabel/obconversion.h" #include "openbabel/reaction.h" -diff -up openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp.gcc43 2007-11-30 00:01:23.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/fchkformat.cpp +--- openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43 2008-06-13 22:48:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/formats/fchkformat.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -12,6 +12,7 @@ GNU General Public License for more deta ***********************************************************************/ @@ -56,9 +55,9 @@ // No diagnoalization yet. Perhaps for 2.2 -GRH // #include -diff -up openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp.gcc43 2007-11-30 00:01:23.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/fingerprint.cpp.gcc43 openbabel-2.2.0b7/src/fingerprint.cpp +--- openbabel-2.2.0b7/src/fingerprint.cpp.gcc43 2008-06-26 20:55:14.000000000 +0200 ++++ openbabel-2.2.0b7/src/fingerprint.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -21,7 +21,7 @@ GNU General Public License for more deta #include #include @@ -68,9 +67,9 @@ #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/xml.h.gcc43 openbabel-2.2.0b7/include/openbabel/xml.h +--- openbabel-2.2.0b7/include/openbabel/xml.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/xml.h 2008-07-02 20:16:21.000000000 +0200 @@ -13,6 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU GNU General Public License for more details. ***********************************************************************/ @@ -80,9 +79,9 @@ #include #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h.gcc43 2008-01-16 19:42:43.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43 openbabel-2.2.0b7/include/openbabel/obconversion.h +--- openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/obconversion.h 2008-07-02 20:16:21.000000000 +0200 @@ -28,6 +28,7 @@ GNU General Public License for more deta #include #include @@ -91,9 +90,9 @@ #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h.gcc43 2008-01-21 22:03:43.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/data.h.gcc43 openbabel-2.2.0b7/include/openbabel/data.h +--- openbabel-2.2.0b7/include/openbabel/data.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/data.h 2008-07-02 20:16:21.000000000 +0200 @@ -23,7 +23,7 @@ GNU General Public License for more deta #include @@ -103,9 +102,9 @@ #include #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.0b7/include/openbabel/obmolecformat.h +--- openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/obmolecformat.h 2008-07-02 20:16:21.000000000 +0200 @@ -23,6 +23,8 @@ GNU General Public License for more deta #include #endif @@ -113,12 +112,11 @@ +#include + #include + #include #include - #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/lineend.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/lineend.h -diff -up openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp ---- openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp 2008-02-23 20:55:55.000000000 +0100 +diff -up openbabel-2.2.0b7/tools/babel.cpp.gcc43 openbabel-2.2.0b7/tools/babel.cpp +--- openbabel-2.2.0b7/tools/babel.cpp.gcc43 2008-06-21 15:58:03.000000000 +0200 ++++ openbabel-2.2.0b7/tools/babel.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -42,6 +42,7 @@ extern "C" int strncasecmp(const char *s #include #include Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- openbabel.spec 6 Jun 2008 19:06:10 -0000 1.37 +++ openbabel.spec 2 Jul 2008 18:49:45 -0000 1.38 @@ -4,8 +4,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') -%define beta_ver b5 -%define beta_str b5-20080517-r2469 +%define beta_ver b7 +%define beta_str b7-20080627-r2628 Name: openbabel Version: 2.2.0 @@ -13,14 +13,10 @@ Summary: Chemistry software file format converter License: GPLv2 Group: Applications/File -URL: http://openbabel.sourceforge.net/ +URL: http://openbabel.org/ Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz Patch: %{name}-gcc43.patch Patch1: %{name}-rpm.patch -# backport upstream patch to split the huge Python binding: -# http://openbabel.svn.sourceforge.net/viewvc/openbabel?view=rev&revision=2535 -# fixes ppc64 build (#427700) -Patch2: openbabel-python-ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: inchi-devel BuildRequires: libtool @@ -94,7 +90,6 @@ %setup -q -n %{name}-%{version}%{beta_ver} %patch -p1 -b .gcc43 %patch1 -p1 -b .r -%patch2 -p0 -b .python-ppc64 %build # don't reference m4 include directory which isn't shipped in the tarball @@ -191,6 +186,11 @@ %{ruby_sitearch}/openbabel.so %changelog +* Wed Jul 02 2008 Dominik Mierzejewski 2.2.0-0.6.b7 +- updated to 2.2.0 beta7 +- new URL +- dropped Python binding split patch (broken, reverted upstream) + * Fri Jun 06 2008 Kevin Kofler 2.2.0-0.5.b5 - backport upstream patch to split Python binding (should fix #427700 for good) - drop no longer needed ppc64 SWIG/GCC flag hackery Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 29 May 2008 20:23:54 -0000 1.10 +++ sources 2 Jul 2008 18:49:45 -0000 1.11 @@ -1 +1 @@ -7a0556750d9d2b378db021922ea832f3 openbabel-2.2.0b5-20080517-r2469.tar.gz +541d2e8654d95afe5aee2ad9055e33b2 openbabel-2.2.0b7-20080627-r2628.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 18:51:37 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 2 Jul 2008 18:51:37 GMT Subject: rpms/quassel/F-9 quassel.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807021851.m62IpbXN027641@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/quassel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27519 Modified Files: sources Added Files: quassel.spec Log Message: Initial Fedora release --- NEW FILE quassel.spec --- Name: quassel Summary: QT4 Based distrubuted IRC system Version: 0.2.0 Release: 0.3.beta1%{?dist} License: GPLv2 or GPLv3 Group: Applications/Internet URL: http://quassel-irc.org/ Source0: http://quassel-irc.org/system/files/quassel-%{version}-beta1.tar.bz2 Source1: %{name}.desktop Source2: %{name}core.desktop Source3: %{name}client.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: qt-sqlite BuildRequires: qt-devel BuildRequires: cmake BuildRequires: desktop-file-utils %description Quassel IRC is a modern, distributed IRC client, meaning that one (or multiple) client(s) can attach to and detach from a central core -- much like the popular combination of screen and a text-based IRC client such as WeeChat, but graphical %package core Summary: Quassel core component Group: Applications/Internet %description core The Quassel IRC Core maintains a connection with the server, and allows for multiple clients to connect %package client Summary: Quassel client Group: Applications/Internet %description client Quassel client %prep %setup -q -n quassel-0.2.0-beta1 %build cd build %{_qt4_qmake} make %install rm -rf %{buildroot} cd build/targets install -d -m755 %{buildroot}%{_bindir} install -m755 quassel %{buildroot}%{_bindir} install -m755 quasselclient %{buildroot}%{_bindir} install -m755 quasselcore %{buildroot}%{_bindir} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quassel %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quassel.desktop %files core %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quasselcore %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quasselcore.desktop %files client %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/quasselclient %doc COPYING gpl-2.0.txt gpl-3.0.txt README %{_datadir}/applications/fedora-quasselclient.desktop %changelog * Wed Jul 02 2008 Steven Parrish - 0.3.beta1 - Final spec for initial release to F9 and rawhide * Tue Jun 24 2008 Steven Parrish - Revised spec file based on comments from package reviewer. * Mon Jun 23 2008 Steven Parrish - initial RPM Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/quassel/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2008 16:42:33 -0000 1.1 +++ sources 2 Jul 2008 18:50:49 -0000 1.2 @@ -0,0 +1 @@ +246881ecc4d7e7a0eb98a2fa6bfbac64 quassel-0.2.0-beta1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 18:59:18 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 2 Jul 2008 18:59:18 GMT Subject: rpms/quassel/F-9 quassel.desktop, NONE, 1.1 quasselclient.desktop, NONE, 1.1 quasselcore.desktop, NONE, 1.1 Message-ID: <200807021859.m62IxIg1027892@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/quassel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27873 Added Files: quassel.desktop quasselclient.desktop quasselcore.desktop Log Message: Added .desktop files --- NEW FILE quassel.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Quassel IRC Exec=quassel Icon=default Terminal=false Type=Application Categories=Qt;Network;IRCClient; --- NEW FILE quasselclient.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Quassel client Exec=quasselclient Icon=default Terminal=false Type=Application Categories=Qt;Network;IRCClient; --- NEW FILE quasselcore.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Quassel IRC Core Exec=quasselcore Icon=default Terminal=false Type=Application Categories=Qt;Network;IRCClient; From fedora-extras-commits at redhat.com Wed Jul 2 19:02:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 19:02:44 GMT Subject: rpms/alienarena-data/devel .cvsignore, 1.2, 1.3 alienarena-data.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807021902.m62J2iqg002056@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000 Modified Files: .cvsignore alienarena-data.spec sources Log Message: Update to 2008 data Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Nov 2007 15:46:27 -0000 1.2 +++ .cvsignore 2 Jul 2008 19:02:12 -0000 1.3 @@ -1 +1 @@ -alienarena2007-20071011-data.tar.bz2 +alienarena2008-20080603-data.tar.bz2 Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/alienarena-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alienarena-data.spec 28 Nov 2007 15:46:27 -0000 1.1 +++ alienarena-data.spec 2 Jul 2008 19:02:12 -0000 1.2 @@ -1,22 +1,22 @@ Name: alienarena-data -Summary: Data files for Alien Arena 2007 -Version: 20071011 -Release: 2%{?dist} +Summary: Data files for Alien Arena 2008 +Version: 20080603 +Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games -# Upstream has prebuilt binaries in it. We pull those out and bzip2. -# Source0: http://icculus.org/alienarena/files/alienarena2007-20071011-linux.zip -Source0: alienarena2007-20071011-data.tar.bz2 -URL: http://icculus.org/alienarena/files/ +# Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. +# Source0: http://icculus.org/alienarena/Files/alienarena2008-linux20080603.zip +Source0: alienarena2008-20080603-data.tar.bz2 +URL: http://icculus.org/alienarena/Files/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: alienarena >= 6.10 +Requires: alienarena >= 7.10 %description -Data files (audio, maps, etc) for Alien Arena 2007. +Data files (audio, maps, etc) for Alien Arena 2008. %prep -%setup -q -n alienarena2007 +%setup -q -n alienarena2008 %build @@ -27,7 +27,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico -rm -rf $RPM_BUILD_ROOT%{_datadir}/alienarena/Tools/ %clean rm -rf $RPM_BUILD_ROOT @@ -50,6 +49,9 @@ %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 +- update to 2008 data + * Tue Nov 27 2007 Tom "spot" Callaway 20071011-2 - cleanups, move icon into hicolor tree Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Nov 2007 15:46:27 -0000 1.2 +++ sources 2 Jul 2008 19:02:12 -0000 1.3 @@ -1 +1 @@ -fda681b0a121f904e7079adc4b7222f7 alienarena2007-20071011-data.tar.bz2 +853715cb9de1f727b8e10524d207eead alienarena2008-20080603-data.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 19:07:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 19:07:38 GMT Subject: rpms/alienarena-data/F-8 alienarena-data.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807021907.m62J7cju002215@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2171/F-8 Modified Files: alienarena-data.spec sources Log Message: update to 2008 data Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-8/alienarena-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alienarena-data.spec 28 Nov 2007 15:48:49 -0000 1.1 +++ alienarena-data.spec 2 Jul 2008 19:06:54 -0000 1.2 @@ -1,22 +1,22 @@ Name: alienarena-data -Summary: Data files for Alien Arena 2007 -Version: 20071011 -Release: 2%{?dist} +Summary: Data files for Alien Arena 2008 +Version: 20080603 +Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games -# Upstream has prebuilt binaries in it. We pull those out and bzip2. -# Source0: http://icculus.org/alienarena/files/alienarena2007-20071011-linux.zip -Source0: alienarena2007-20071011-data.tar.bz2 -URL: http://icculus.org/alienarena/files/ +# Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. +# Source0: http://icculus.org/alienarena/Files/alienarena2008-linux20080603.zip +Source0: alienarena2008-20080603-data.tar.bz2 +URL: http://icculus.org/alienarena/Files/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: alienarena >= 6.10 +Requires: alienarena >= 7.10 %description -Data files (audio, maps, etc) for Alien Arena 2007. +Data files (audio, maps, etc) for Alien Arena 2008. %prep -%setup -q -n alienarena2007 +%setup -q -n alienarena2008 %build @@ -27,7 +27,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico -rm -rf $RPM_BUILD_ROOT%{_datadir}/alienarena/Tools/ %clean rm -rf $RPM_BUILD_ROOT @@ -50,6 +49,9 @@ %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 +- update to 2008 data + * Tue Nov 27 2007 Tom "spot" Callaway 20071011-2 - cleanups, move icon into hicolor tree Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Nov 2007 15:48:49 -0000 1.2 +++ sources 2 Jul 2008 19:06:54 -0000 1.3 @@ -1 +1 @@ -fda681b0a121f904e7079adc4b7222f7 alienarena2007-20071011-data.tar.bz2 +853715cb9de1f727b8e10524d207eead alienarena2008-20080603-data.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 19:08:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 19:08:02 GMT Subject: rpms/alienarena-data/F-9 alienarena-data.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807021908.m62J82Lq002230@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2171/F-9 Modified Files: alienarena-data.spec sources Log Message: update to 2008 data Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-9/alienarena-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alienarena-data.spec 28 Nov 2007 15:46:27 -0000 1.1 +++ alienarena-data.spec 2 Jul 2008 19:07:09 -0000 1.2 @@ -1,22 +1,22 @@ Name: alienarena-data -Summary: Data files for Alien Arena 2007 -Version: 20071011 -Release: 2%{?dist} +Summary: Data files for Alien Arena 2008 +Version: 20080603 +Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games -# Upstream has prebuilt binaries in it. We pull those out and bzip2. -# Source0: http://icculus.org/alienarena/files/alienarena2007-20071011-linux.zip -Source0: alienarena2007-20071011-data.tar.bz2 -URL: http://icculus.org/alienarena/files/ +# Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. +# Source0: http://icculus.org/alienarena/Files/alienarena2008-linux20080603.zip +Source0: alienarena2008-20080603-data.tar.bz2 +URL: http://icculus.org/alienarena/Files/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: alienarena >= 6.10 +Requires: alienarena >= 7.10 %description -Data files (audio, maps, etc) for Alien Arena 2007. +Data files (audio, maps, etc) for Alien Arena 2008. %prep -%setup -q -n alienarena2007 +%setup -q -n alienarena2008 %build @@ -27,7 +27,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico -rm -rf $RPM_BUILD_ROOT%{_datadir}/alienarena/Tools/ %clean rm -rf $RPM_BUILD_ROOT @@ -50,6 +49,9 @@ %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 +- update to 2008 data + * Tue Nov 27 2007 Tom "spot" Callaway 20071011-2 - cleanups, move icon into hicolor tree Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Nov 2007 15:46:27 -0000 1.2 +++ sources 2 Jul 2008 19:07:09 -0000 1.3 @@ -1 +1 @@ -fda681b0a121f904e7079adc4b7222f7 alienarena2007-20071011-data.tar.bz2 +853715cb9de1f727b8e10524d207eead alienarena2008-20080603-data.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 19:10:51 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 2 Jul 2008 19:10:51 GMT Subject: rpms/xorg-x11-drv-mga/F-9 import.log, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xorg-x11-drv-mga.spec, 1.27, 1.28 mga-1.4.7-alloca.patch, 1.1, NONE mga-1.4.7-death-to-cfb.patch, 1.1, NONE Message-ID: <200807021910.m62JAp52002619@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-mga/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2358/F-9 Modified Files: .cvsignore sources xorg-x11-drv-mga.spec Added Files: import.log Removed Files: mga-1.4.7-alloca.patch mga-1.4.7-death-to-cfb.patch Log Message: mga 1.4.9 --- NEW FILE import.log --- xorg-x11-drv-mga-1_4_9-1_fc9:F-9:xorg-x11-drv-mga-1.4.9-1.fc9.src.rpm:1215025467 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Feb 2008 18:35:11 -0000 1.11 +++ .cvsignore 2 Jul 2008 19:09:45 -0000 1.12 @@ -1 +1 @@ -xf86-video-mga-1.4.8.tar.bz2 +xf86-video-mga-1.4.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Feb 2008 18:35:11 -0000 1.11 +++ sources 2 Jul 2008 19:09:45 -0000 1.12 @@ -1 +1 @@ -e7783c7609d441237d665b7fc47288c7 xf86-video-mga-1.4.8.tar.bz2 +11066b84b949cd04300ec819c9c51532 xf86-video-mga-1.4.9.tar.bz2 Index: xorg-x11-drv-mga.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-9/xorg-x11-drv-mga.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- xorg-x11-drv-mga.spec 22 Feb 2008 18:35:11 -0000 1.27 +++ xorg-x11-drv-mga.spec 2 Jul 2008 19:09:45 -0000 1.28 @@ -6,7 +6,7 @@ Summary: Xorg X11 mga video driver Name: xorg-x11-drv-mga -Version: 1.4.8 +Version: 1.4.9 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -19,8 +19,6 @@ Patch0: mga-1.4.5-no-hal-advertising.patch Patch1: mga-1.4.6.1-get-client-pointer.patch -Patch2: mga-1.4.7-death-to-cfb.patch -Patch3: mga-1.4.7-alloca.patch ExcludeArch: s390 s390x @@ -39,8 +37,6 @@ %setup -q -n %{tarball}-%{version} %patch0 -p1 -b .hal %patch1 -p1 -b .gcp -%patch2 -p1 -b .cfb -%patch3 -p1 -b .alloca %build autoreconf -v --install || exit 1 @@ -67,6 +63,9 @@ %{_mandir}/man4/mga.4* %changelog +* Wed Jul 02 2008 Adam Jackson 1.4.9-1 +- mga 1.4.9 + * Fri Feb 22 2008 Adam Jackson 1.4.8-1 - mga 1.4.8 --- mga-1.4.7-alloca.patch DELETED --- --- mga-1.4.7-death-to-cfb.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 19:10:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 19:10:51 GMT Subject: rpms/alienarena/devel alienarena-7.10-dont-search-dll-in-data-path.patch, NONE, 1.1 alienarena-7.10-fhs.patch, NONE, 1.1 alienarena-7.10-genericoptflagsonly.patch, NONE, 1.1 alienarena-7.10-noSGIglext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 alienarena.desktop, 1.1, 1.2 alienarena.spec, 1.2, 1.3 sources, 1.2, 1.3 alienarena-6.10-dont-search-dll-in-data-path.patch, 1.1, NONE alienarena-6.10-fhs.patch, 1.1, NONE alienarena-6.10-genericoptflagsonly.patch, 1.1, NONE alienarena-6.10-noSGIglext.patch, 1.1, NONE Message-ID: <200807021910.m62JApBD002624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2443 Modified Files: .cvsignore alienarena.desktop alienarena.spec sources Added Files: alienarena-7.10-dont-search-dll-in-data-path.patch alienarena-7.10-fhs.patch alienarena-7.10-genericoptflagsonly.patch alienarena-7.10-noSGIglext.patch Removed Files: alienarena-6.10-dont-search-dll-in-data-path.patch alienarena-6.10-fhs.patch alienarena-6.10-genericoptflagsonly.patch alienarena-6.10-noSGIglext.patch Log Message: update to 7.10 alienarena-7.10-dont-search-dll-in-data-path.patch: --- NEW FILE alienarena-7.10-dont-search-dll-in-data-path.patch --- diff -up alienarena-7.10/source/unix/sys_unix.c.orig alienarena-7.10/source/unix/sys_unix.c --- alienarena-7.10/source/unix/sys_unix.c.orig 2007-10-08 11:27:26.000000000 +0200 +++ alienarena-7.10/source/unix/sys_unix.c 2007-11-17 14:24:00.000000000 +0100 @@ -227,6 +227,7 @@ void *Sys_GetGameAPI (void *parms) Com_Printf("------- Loading %s -------\n", gamename); +#if 0 // now run through the search paths path = NULL; while (1) @@ -242,11 +243,13 @@ void *Sys_GetGameAPI (void *parms) continue; fclose(fp); +#endif + snprintf (name, MAX_OSPATH, "%s", gamename); game_library = dlopen (name, RTLD_NOW); if (game_library) { Com_Printf ("LoadLibrary (%s)\n",name); - break; +/* break; */ } else { @@ -263,7 +266,7 @@ void *Sys_GetGameAPI (void *parms) return NULL; } - } +/* } */ GetGameAPI = (void *)dlsym (game_library, "GetGameAPI"); if (!GetGameAPI) alienarena-7.10-fhs.patch: --- NEW FILE alienarena-7.10-fhs.patch --- diff -up alienarena-7.10/source/qcommon/files.c.fhs alienarena-7.10/source/qcommon/files.c --- alienarena-7.10/source/qcommon/files.c.fhs 2007-10-08 11:27:28.000000000 -0400 +++ alienarena-7.10/source/qcommon/files.c 2007-11-08 10:45:25.000000000 -0500 @@ -735,6 +735,7 @@ void FS_SetGamedir (char *dir) { Cvar_FullSet ("gamedir", dir, CVAR_SERVERINFO|CVAR_NOSET); FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) ); + FS_AddGameDirectory (va("/usr/share/alienarena/%s", dir) ); #ifdef __unix__ FS_AddHomeAsGameDirectory(dir); #endif @@ -987,6 +988,7 @@ void FS_InitFilesystem (void) // start up with baseq2 by default // FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) ); + FS_AddGameDirectory (va("/usr/share/alienarena/"BASEDIRNAME) ); #ifdef __unix__ FS_AddHomeAsGameDirectory(BASEDIRNAME); alienarena-7.10-genericoptflagsonly.patch: --- NEW FILE alienarena-7.10-genericoptflagsonly.patch --- diff -up alienarena-7.10/source/Makefile.BAD alienarena-7.10/source/Makefile --- alienarena-7.10/source/Makefile.BAD 2008-07-02 14:31:04.000000000 -0400 +++ alienarena-7.10/source/Makefile 2008-07-02 14:31:40.000000000 -0400 @@ -73,32 +73,6 @@ endif RELEASE_CFLAGS=$(BASE_CFLAGS) -ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes) -RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer -fexpensive-optimizations - -ifeq ($(OSTYPE),linux) -ifeq ($(ARCH),x86_64) - RELEASE_CFLAGS += -march=k8 -else -ifeq ($(ARCH),i686) - RELEASE_CFLAGS += -march=i686 -else -ifeq ($(ARCH),i586) - RELEASE_CFLAGS += -march=i586 -else -ifeq ($(ARCH),i486) - RELEASE_CFLAGS += -march=i486 -else -ifeq ($(ARCH),i386) - RELEASE_CFLAGS += -march=i386 -endif -endif -endif -endif -endif -endif -endif - ARENA_CFLAGS=-DARENA DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb alienarena-7.10-noSGIglext.patch: --- NEW FILE alienarena-7.10-noSGIglext.patch --- diff -up alienarena-7.10/source/ref_gl/glext.h.BAD alienarena-7.10/source/ref_gl/glext.h --- alienarena-7.10/source/ref_gl/glext.h.BAD 2007-03-03 18:43:03.000000000 -0500 +++ alienarena-7.10/source/ref_gl/glext.h 2008-07-02 14:25:56.000000000 -0400 @@ -1,3304 +0,0 @@ -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright 1998, 1999, 2000, 2001, NVIDIA Corporation. -** All rights Reserved. -** -** THE INFORMATION CONTAINED HEREIN IS PROPRIETARY AND CONFIDENTIAL TO -** NVIDIA, CORPORATION. USE, REPRODUCTION OR DISCLOSURE TO ANY THIRD PARTY -** IS SUBJECT TO WRITTEN PRE-APPROVAL BY NVIDIA, CORPORATION. -*/ - -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: This software was created using the -** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has -** not been independently verified as being compliant with the OpenGL(R) -** version 1.2.1 Specification. -*/ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -#define GL_GLEXT_VERSION 6 - -#ifndef GL_VERSION_1_2 -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif [...2909 lines suppressed...] - -/* NV_texture_rectangle */ -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 - -/* NV_texture_shader */ -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_ISOTROPIC_BRDF_NV 0x86EB -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F - -/* NV_texture_shader2 */ -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF - -/* NV_register_combiners2 */ -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 - -/* NV_packed_depth_stencil */ -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA - -/* NV_copy_depth_to_color */ -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F - -/* NV_multisample_filter_hint */ -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 - -/* NV_texture_compression_vtc */ - -/* NV_vertex_program */ -typedef GLboolean (APIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); - -/* NV_evaluators */ -typedef void (APIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); - -/* NV_fence */ -typedef void (APIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRY * PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); - - -/* NV_register_combiners2 */ -typedef void (APIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); - - -#ifdef __cplusplus -} -#endif - -#endif - Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Nov 2007 22:14:24 -0000 1.2 +++ .cvsignore 2 Jul 2008 19:10:05 -0000 1.3 @@ -1 +1 @@ -alienarena610src.zip +alienarena710src.zip Index: alienarena.desktop =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/devel/alienarena.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alienarena.desktop 28 Nov 2007 22:14:24 -0000 1.1 +++ alienarena.desktop 2 Jul 2008 19:10:05 -0000 1.2 @@ -1,7 +1,7 @@ [Desktop Entry] Name=AlienArena Comment=3d Deathmatch Game -Icon=aa.png +Icon=aa Exec=alienarena StartupNotify=true Terminal=false Index: alienarena.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/devel/alienarena.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- alienarena.spec 20 Feb 2008 01:00:41 -0000 1.2 +++ alienarena.spec 2 Jul 2008 19:10:05 -0000 1.3 @@ -1,26 +1,26 @@ Name: alienarena -Summary: 3D Deathmatch game -Version: 6.10 -Release: 6%{?dist} +Summary: Multiplayer retro sci-fi deathmatch game +Version: 7.10 +Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games -Source0: http://cor.planetquake.gamespy.com/codered/files/alienarena610src.zip +Source0: http://cor.planetquake.gamespy.com/codered/files/alienarena710src.zip Source1: alienarena.sh Source2: alienarena.desktop Source3: GPL.acebot.txt -Patch0: alienarena-6.10-noSGIglext.patch -Patch1: alienarena-6.10-fhs.patch -Patch2: alienarena-6.10-dont-search-dll-in-data-path.patch -Patch3: alienarena-6.10-genericoptflagsonly.patch +Patch0: alienarena-7.10-noSGIglext.patch +Patch1: alienarena-7.10-fhs.patch +Patch2: alienarena-7.10-dont-search-dll-in-data-path.patch +Patch3: alienarena-7.10-genericoptflagsonly.patch URL: http://red.planetarena.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, SDL-devel, curl-devel, libpng-devel BuildRequires: desktop-file-utils -Requires: alienarena-data = 20071011 +Requires: alienarena-data = 20080603 %description -Alien Arena 2007 is an online deathmatch game with over 30 levels, seven modes +Alien Arena 2008 is an online deathmatch game with over 30 levels, seven modes of play, loads of mutators, built-in bots, 11 player characters, and 9 weapons (with alt-fire modes). @@ -31,9 +31,10 @@ %patch2 -p1 %patch3 -p1 cp -p %{SOURCE3} . -sed -i 's|"game.so"|"%{_libdir}/%{name}/game.so"|g' unix/sys_unix.c +sed -i 's|"game.so"|"%{_libdir}/%{name}/game.so"|g' source/unix/sys_unix.c %build +cd source/ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install @@ -41,11 +42,11 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/alienarena/ mkdir -p $RPM_BUILD_ROOT%{_libexecdir} -install -m0755 release/crded $RPM_BUILD_ROOT%{_bindir} +install -m0755 source/release/crded $RPM_BUILD_ROOT%{_bindir} # Don't install this one, it barely works. The SDL binary works better. -# install -m0755 release/crx $RPM_BUILD_ROOT%{_bindir} -install -m0755 -p release/crx.sdl $RPM_BUILD_ROOT%{_libexecdir} -install -m0755 -p release/game.so $RPM_BUILD_ROOT%{_libdir}/alienarena/ +# install -m0755 source/release/crx $RPM_BUILD_ROOT%{_bindir} +install -m0755 -p source/release/crx.sdl $RPM_BUILD_ROOT%{_libexecdir} +install -m0755 -p source/release/game.so $RPM_BUILD_ROOT%{_libdir}/alienarena/ install -m0755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/alienarena mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/data1/ @@ -71,6 +72,9 @@ %{_libexecdir}/crx.sdl %changelog +* Wed Jul 2 2008 Tom "spot" Callaway - 7.10-1 +- update to 7.10 (2008) + * Tue Feb 19 2008 Fedora Release Engineering - 6.10-6 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Nov 2007 22:14:24 -0000 1.2 +++ sources 2 Jul 2008 19:10:05 -0000 1.3 @@ -1 +1 @@ -83bd589b59521a4716dfa42bc8e5b0d3 alienarena610src.zip +65e0191c2c212991ef8fcbdacb579a8d alienarena710src.zip --- alienarena-6.10-dont-search-dll-in-data-path.patch DELETED --- --- alienarena-6.10-fhs.patch DELETED --- --- alienarena-6.10-genericoptflagsonly.patch DELETED --- --- alienarena-6.10-noSGIglext.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 19:13:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 19:13:37 GMT Subject: rpms/alienarena/F-8 alienarena-7.10-dont-search-dll-in-data-path.patch, NONE, 1.1 alienarena-7.10-fhs.patch, NONE, 1.1 alienarena-7.10-genericoptflagsonly.patch, NONE, 1.1 alienarena-7.10-noSGIglext.patch, NONE, 1.1 alienarena.desktop, 1.1, 1.2 alienarena.spec, 1.1, 1.2 sources, 1.2, 1.3 alienarena-6.10-dont-search-dll-in-data-path.patch, 1.1, NONE alienarena-6.10-fhs.patch, 1.1, NONE alienarena-6.10-genericoptflagsonly.patch, 1.1, NONE alienarena-6.10-noSGIglext.patch, 1.1, NONE Message-ID: <200807021913.m62JDb2u002888@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2816/F-8 Modified Files: alienarena.desktop alienarena.spec sources Added Files: alienarena-7.10-dont-search-dll-in-data-path.patch alienarena-7.10-fhs.patch alienarena-7.10-genericoptflagsonly.patch alienarena-7.10-noSGIglext.patch Removed Files: alienarena-6.10-dont-search-dll-in-data-path.patch alienarena-6.10-fhs.patch alienarena-6.10-genericoptflagsonly.patch alienarena-6.10-noSGIglext.patch Log Message: update to 7.10 alienarena-7.10-dont-search-dll-in-data-path.patch: --- NEW FILE alienarena-7.10-dont-search-dll-in-data-path.patch --- diff -up alienarena-7.10/source/unix/sys_unix.c.orig alienarena-7.10/source/unix/sys_unix.c --- alienarena-7.10/source/unix/sys_unix.c.orig 2007-10-08 11:27:26.000000000 +0200 +++ alienarena-7.10/source/unix/sys_unix.c 2007-11-17 14:24:00.000000000 +0100 @@ -227,6 +227,7 @@ void *Sys_GetGameAPI (void *parms) Com_Printf("------- Loading %s -------\n", gamename); +#if 0 // now run through the search paths path = NULL; while (1) @@ -242,11 +243,13 @@ void *Sys_GetGameAPI (void *parms) continue; fclose(fp); +#endif + snprintf (name, MAX_OSPATH, "%s", gamename); game_library = dlopen (name, RTLD_NOW); if (game_library) { Com_Printf ("LoadLibrary (%s)\n",name); - break; +/* break; */ } else { @@ -263,7 +266,7 @@ void *Sys_GetGameAPI (void *parms) return NULL; } - } +/* } */ GetGameAPI = (void *)dlsym (game_library, "GetGameAPI"); if (!GetGameAPI) alienarena-7.10-fhs.patch: --- NEW FILE alienarena-7.10-fhs.patch --- diff -up alienarena-7.10/source/qcommon/files.c.fhs alienarena-7.10/source/qcommon/files.c --- alienarena-7.10/source/qcommon/files.c.fhs 2007-10-08 11:27:28.000000000 -0400 +++ alienarena-7.10/source/qcommon/files.c 2007-11-08 10:45:25.000000000 -0500 @@ -735,6 +735,7 @@ void FS_SetGamedir (char *dir) { Cvar_FullSet ("gamedir", dir, CVAR_SERVERINFO|CVAR_NOSET); FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) ); + FS_AddGameDirectory (va("/usr/share/alienarena/%s", dir) ); #ifdef __unix__ FS_AddHomeAsGameDirectory(dir); #endif @@ -987,6 +988,7 @@ void FS_InitFilesystem (void) // start up with baseq2 by default // FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) ); + FS_AddGameDirectory (va("/usr/share/alienarena/"BASEDIRNAME) ); #ifdef __unix__ FS_AddHomeAsGameDirectory(BASEDIRNAME); alienarena-7.10-genericoptflagsonly.patch: --- NEW FILE alienarena-7.10-genericoptflagsonly.patch --- diff -up alienarena-7.10/source/Makefile.BAD alienarena-7.10/source/Makefile --- alienarena-7.10/source/Makefile.BAD 2008-07-02 14:31:04.000000000 -0400 +++ alienarena-7.10/source/Makefile 2008-07-02 14:31:40.000000000 -0400 @@ -73,32 +73,6 @@ endif RELEASE_CFLAGS=$(BASE_CFLAGS) -ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes) -RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer -fexpensive-optimizations - -ifeq ($(OSTYPE),linux) -ifeq ($(ARCH),x86_64) - RELEASE_CFLAGS += -march=k8 -else -ifeq ($(ARCH),i686) - RELEASE_CFLAGS += -march=i686 -else -ifeq ($(ARCH),i586) - RELEASE_CFLAGS += -march=i586 -else -ifeq ($(ARCH),i486) - RELEASE_CFLAGS += -march=i486 -else -ifeq ($(ARCH),i386) - RELEASE_CFLAGS += -march=i386 -endif -endif -endif -endif -endif -endif -endif - ARENA_CFLAGS=-DARENA DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb alienarena-7.10-noSGIglext.patch: --- NEW FILE alienarena-7.10-noSGIglext.patch --- diff -up alienarena-7.10/source/ref_gl/glext.h.BAD alienarena-7.10/source/ref_gl/glext.h --- alienarena-7.10/source/ref_gl/glext.h.BAD 2007-03-03 18:43:03.000000000 -0500 +++ alienarena-7.10/source/ref_gl/glext.h 2008-07-02 14:25:56.000000000 -0400 @@ -1,3304 +0,0 @@ -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright 1998, 1999, 2000, 2001, NVIDIA Corporation. -** All rights Reserved. -** -** THE INFORMATION CONTAINED HEREIN IS PROPRIETARY AND CONFIDENTIAL TO -** NVIDIA, CORPORATION. USE, REPRODUCTION OR DISCLOSURE TO ANY THIRD PARTY -** IS SUBJECT TO WRITTEN PRE-APPROVAL BY NVIDIA, CORPORATION. -*/ - -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: This software was created using the -** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has -** not been independently verified as being compliant with the OpenGL(R) -** version 1.2.1 Specification. -*/ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -#define GL_GLEXT_VERSION 6 - -#ifndef GL_VERSION_1_2 -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif [...2909 lines suppressed...] - -/* NV_texture_rectangle */ -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 - -/* NV_texture_shader */ -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_ISOTROPIC_BRDF_NV 0x86EB -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F - -/* NV_texture_shader2 */ -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF - -/* NV_register_combiners2 */ -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 - -/* NV_packed_depth_stencil */ -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA - -/* NV_copy_depth_to_color */ -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F - -/* NV_multisample_filter_hint */ -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 - -/* NV_texture_compression_vtc */ - -/* NV_vertex_program */ -typedef GLboolean (APIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); - -/* NV_evaluators */ -typedef void (APIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); - -/* NV_fence */ -typedef void (APIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRY * PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); - - -/* NV_register_combiners2 */ -typedef void (APIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); - - -#ifdef __cplusplus -} -#endif - -#endif - Index: alienarena.desktop =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-8/alienarena.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alienarena.desktop 28 Nov 2007 22:18:29 -0000 1.1 +++ alienarena.desktop 2 Jul 2008 19:12:52 -0000 1.2 @@ -1,7 +1,7 @@ [Desktop Entry] Name=AlienArena Comment=3d Deathmatch Game -Icon=aa.png +Icon=aa Exec=alienarena StartupNotify=true Terminal=false Index: alienarena.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-8/alienarena.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alienarena.spec 28 Nov 2007 22:18:29 -0000 1.1 +++ alienarena.spec 2 Jul 2008 19:12:52 -0000 1.2 @@ -1,26 +1,26 @@ Name: alienarena -Summary: 3D Deathmatch game -Version: 6.10 -Release: 5%{?dist} +Summary: Multiplayer retro sci-fi deathmatch game +Version: 7.10 +Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games -Source0: http://cor.planetquake.gamespy.com/codered/files/alienarena610src.zip +Source0: http://cor.planetquake.gamespy.com/codered/files/alienarena710src.zip Source1: alienarena.sh Source2: alienarena.desktop Source3: GPL.acebot.txt -Patch0: alienarena-6.10-noSGIglext.patch -Patch1: alienarena-6.10-fhs.patch -Patch2: alienarena-6.10-dont-search-dll-in-data-path.patch -Patch3: alienarena-6.10-genericoptflagsonly.patch +Patch0: alienarena-7.10-noSGIglext.patch +Patch1: alienarena-7.10-fhs.patch +Patch2: alienarena-7.10-dont-search-dll-in-data-path.patch +Patch3: alienarena-7.10-genericoptflagsonly.patch URL: http://red.planetarena.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, SDL-devel, curl-devel, libpng-devel BuildRequires: desktop-file-utils -Requires: alienarena-data = 20071011 +Requires: alienarena-data = 20080603 %description -Alien Arena 2007 is an online deathmatch game with over 30 levels, seven modes +Alien Arena 2008 is an online deathmatch game with over 30 levels, seven modes of play, loads of mutators, built-in bots, 11 player characters, and 9 weapons (with alt-fire modes). @@ -31,9 +31,10 @@ %patch2 -p1 %patch3 -p1 cp -p %{SOURCE3} . -sed -i 's|"game.so"|"%{_libdir}/%{name}/game.so"|g' unix/sys_unix.c +sed -i 's|"game.so"|"%{_libdir}/%{name}/game.so"|g' source/unix/sys_unix.c %build +cd source/ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install @@ -41,11 +42,11 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/alienarena/ mkdir -p $RPM_BUILD_ROOT%{_libexecdir} -install -m0755 release/crded $RPM_BUILD_ROOT%{_bindir} +install -m0755 source/release/crded $RPM_BUILD_ROOT%{_bindir} # Don't install this one, it barely works. The SDL binary works better. -# install -m0755 release/crx $RPM_BUILD_ROOT%{_bindir} -install -m0755 -p release/crx.sdl $RPM_BUILD_ROOT%{_libexecdir} -install -m0755 -p release/game.so $RPM_BUILD_ROOT%{_libdir}/alienarena/ +# install -m0755 source/release/crx $RPM_BUILD_ROOT%{_bindir} +install -m0755 -p source/release/crx.sdl $RPM_BUILD_ROOT%{_libexecdir} +install -m0755 -p source/release/game.so $RPM_BUILD_ROOT%{_libdir}/alienarena/ install -m0755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/alienarena mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/data1/ @@ -71,6 +72,12 @@ %{_libexecdir}/crx.sdl %changelog +* Wed Jul 2 2008 Tom "spot" Callaway - 7.10-1 +- update to 7.10 (2008) + +* Tue Feb 19 2008 Fedora Release Engineering - 6.10-6 +- Autorebuild for GCC 4.3 + * Wed Nov 28 2007 Tom "spot" Callaway 6.10-5 - generic optflags only Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Nov 2007 22:18:29 -0000 1.2 +++ sources 2 Jul 2008 19:12:52 -0000 1.3 @@ -1 +1 @@ -83bd589b59521a4716dfa42bc8e5b0d3 alienarena610src.zip +65e0191c2c212991ef8fcbdacb579a8d alienarena710src.zip --- alienarena-6.10-dont-search-dll-in-data-path.patch DELETED --- --- alienarena-6.10-fhs.patch DELETED --- --- alienarena-6.10-genericoptflagsonly.patch DELETED --- --- alienarena-6.10-noSGIglext.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 19:13:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 19:13:54 GMT Subject: rpms/alienarena/F-9 alienarena-7.10-dont-search-dll-in-data-path.patch, NONE, 1.1 alienarena-7.10-fhs.patch, NONE, 1.1 alienarena-7.10-genericoptflagsonly.patch, NONE, 1.1 alienarena-7.10-noSGIglext.patch, NONE, 1.1 alienarena.desktop, 1.1, 1.2 alienarena.spec, 1.2, 1.3 sources, 1.2, 1.3 alienarena-6.10-dont-search-dll-in-data-path.patch, 1.1, NONE alienarena-6.10-fhs.patch, 1.1, NONE alienarena-6.10-genericoptflagsonly.patch, 1.1, NONE alienarena-6.10-noSGIglext.patch, 1.1, NONE Message-ID: <200807021913.m62JDshk002895@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2816/F-9 Modified Files: alienarena.desktop alienarena.spec sources Added Files: alienarena-7.10-dont-search-dll-in-data-path.patch alienarena-7.10-fhs.patch alienarena-7.10-genericoptflagsonly.patch alienarena-7.10-noSGIglext.patch Removed Files: alienarena-6.10-dont-search-dll-in-data-path.patch alienarena-6.10-fhs.patch alienarena-6.10-genericoptflagsonly.patch alienarena-6.10-noSGIglext.patch Log Message: update to 7.10 alienarena-7.10-dont-search-dll-in-data-path.patch: --- NEW FILE alienarena-7.10-dont-search-dll-in-data-path.patch --- diff -up alienarena-7.10/source/unix/sys_unix.c.orig alienarena-7.10/source/unix/sys_unix.c --- alienarena-7.10/source/unix/sys_unix.c.orig 2007-10-08 11:27:26.000000000 +0200 +++ alienarena-7.10/source/unix/sys_unix.c 2007-11-17 14:24:00.000000000 +0100 @@ -227,6 +227,7 @@ void *Sys_GetGameAPI (void *parms) Com_Printf("------- Loading %s -------\n", gamename); +#if 0 // now run through the search paths path = NULL; while (1) @@ -242,11 +243,13 @@ void *Sys_GetGameAPI (void *parms) continue; fclose(fp); +#endif + snprintf (name, MAX_OSPATH, "%s", gamename); game_library = dlopen (name, RTLD_NOW); if (game_library) { Com_Printf ("LoadLibrary (%s)\n",name); - break; +/* break; */ } else { @@ -263,7 +266,7 @@ void *Sys_GetGameAPI (void *parms) return NULL; } - } +/* } */ GetGameAPI = (void *)dlsym (game_library, "GetGameAPI"); if (!GetGameAPI) alienarena-7.10-fhs.patch: --- NEW FILE alienarena-7.10-fhs.patch --- diff -up alienarena-7.10/source/qcommon/files.c.fhs alienarena-7.10/source/qcommon/files.c --- alienarena-7.10/source/qcommon/files.c.fhs 2007-10-08 11:27:28.000000000 -0400 +++ alienarena-7.10/source/qcommon/files.c 2007-11-08 10:45:25.000000000 -0500 @@ -735,6 +735,7 @@ void FS_SetGamedir (char *dir) { Cvar_FullSet ("gamedir", dir, CVAR_SERVERINFO|CVAR_NOSET); FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) ); + FS_AddGameDirectory (va("/usr/share/alienarena/%s", dir) ); #ifdef __unix__ FS_AddHomeAsGameDirectory(dir); #endif @@ -987,6 +988,7 @@ void FS_InitFilesystem (void) // start up with baseq2 by default // FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) ); + FS_AddGameDirectory (va("/usr/share/alienarena/"BASEDIRNAME) ); #ifdef __unix__ FS_AddHomeAsGameDirectory(BASEDIRNAME); alienarena-7.10-genericoptflagsonly.patch: --- NEW FILE alienarena-7.10-genericoptflagsonly.patch --- diff -up alienarena-7.10/source/Makefile.BAD alienarena-7.10/source/Makefile --- alienarena-7.10/source/Makefile.BAD 2008-07-02 14:31:04.000000000 -0400 +++ alienarena-7.10/source/Makefile 2008-07-02 14:31:40.000000000 -0400 @@ -73,32 +73,6 @@ endif RELEASE_CFLAGS=$(BASE_CFLAGS) -ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes) -RELEASE_CFLAGS+=-O$(OPTIM_LVL) -fomit-frame-pointer -fexpensive-optimizations - -ifeq ($(OSTYPE),linux) -ifeq ($(ARCH),x86_64) - RELEASE_CFLAGS += -march=k8 -else -ifeq ($(ARCH),i686) - RELEASE_CFLAGS += -march=i686 -else -ifeq ($(ARCH),i586) - RELEASE_CFLAGS += -march=i586 -else -ifeq ($(ARCH),i486) - RELEASE_CFLAGS += -march=i486 -else -ifeq ($(ARCH),i386) - RELEASE_CFLAGS += -march=i386 -endif -endif -endif -endif -endif -endif -endif - ARENA_CFLAGS=-DARENA DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb alienarena-7.10-noSGIglext.patch: --- NEW FILE alienarena-7.10-noSGIglext.patch --- diff -up alienarena-7.10/source/ref_gl/glext.h.BAD alienarena-7.10/source/ref_gl/glext.h --- alienarena-7.10/source/ref_gl/glext.h.BAD 2007-03-03 18:43:03.000000000 -0500 +++ alienarena-7.10/source/ref_gl/glext.h 2008-07-02 14:25:56.000000000 -0400 @@ -1,3304 +0,0 @@ -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright 1998, 1999, 2000, 2001, NVIDIA Corporation. -** All rights Reserved. -** -** THE INFORMATION CONTAINED HEREIN IS PROPRIETARY AND CONFIDENTIAL TO -** NVIDIA, CORPORATION. USE, REPRODUCTION OR DISCLOSURE TO ANY THIRD PARTY -** IS SUBJECT TO WRITTEN PRE-APPROVAL BY NVIDIA, CORPORATION. -*/ - -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: This software was created using the -** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has -** not been independently verified as being compliant with the OpenGL(R) -** version 1.2.1 Specification. -*/ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -#define GL_GLEXT_VERSION 6 - -#ifndef GL_VERSION_1_2 -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif [...2909 lines suppressed...] - -/* NV_texture_rectangle */ -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 - -/* NV_texture_shader */ -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_ISOTROPIC_BRDF_NV 0x86EB -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F - -/* NV_texture_shader2 */ -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF - -/* NV_register_combiners2 */ -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 - -/* NV_packed_depth_stencil */ -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA - -/* NV_copy_depth_to_color */ -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F - -/* NV_multisample_filter_hint */ -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 - -/* NV_texture_compression_vtc */ - -/* NV_vertex_program */ -typedef GLboolean (APIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); - -/* NV_evaluators */ -typedef void (APIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); - -/* NV_fence */ -typedef void (APIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRY * PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); - - -/* NV_register_combiners2 */ -typedef void (APIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); - - -#ifdef __cplusplus -} -#endif - -#endif - Index: alienarena.desktop =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-9/alienarena.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alienarena.desktop 28 Nov 2007 22:14:24 -0000 1.1 +++ alienarena.desktop 2 Jul 2008 19:13:07 -0000 1.2 @@ -1,7 +1,7 @@ [Desktop Entry] Name=AlienArena Comment=3d Deathmatch Game -Icon=aa.png +Icon=aa Exec=alienarena StartupNotify=true Terminal=false Index: alienarena.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-9/alienarena.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- alienarena.spec 20 Feb 2008 01:00:41 -0000 1.2 +++ alienarena.spec 2 Jul 2008 19:13:07 -0000 1.3 @@ -1,26 +1,26 @@ Name: alienarena -Summary: 3D Deathmatch game -Version: 6.10 -Release: 6%{?dist} +Summary: Multiplayer retro sci-fi deathmatch game +Version: 7.10 +Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games -Source0: http://cor.planetquake.gamespy.com/codered/files/alienarena610src.zip +Source0: http://cor.planetquake.gamespy.com/codered/files/alienarena710src.zip Source1: alienarena.sh Source2: alienarena.desktop Source3: GPL.acebot.txt -Patch0: alienarena-6.10-noSGIglext.patch -Patch1: alienarena-6.10-fhs.patch -Patch2: alienarena-6.10-dont-search-dll-in-data-path.patch -Patch3: alienarena-6.10-genericoptflagsonly.patch +Patch0: alienarena-7.10-noSGIglext.patch +Patch1: alienarena-7.10-fhs.patch +Patch2: alienarena-7.10-dont-search-dll-in-data-path.patch +Patch3: alienarena-7.10-genericoptflagsonly.patch URL: http://red.planetarena.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, SDL-devel, curl-devel, libpng-devel BuildRequires: desktop-file-utils -Requires: alienarena-data = 20071011 +Requires: alienarena-data = 20080603 %description -Alien Arena 2007 is an online deathmatch game with over 30 levels, seven modes +Alien Arena 2008 is an online deathmatch game with over 30 levels, seven modes of play, loads of mutators, built-in bots, 11 player characters, and 9 weapons (with alt-fire modes). @@ -31,9 +31,10 @@ %patch2 -p1 %patch3 -p1 cp -p %{SOURCE3} . -sed -i 's|"game.so"|"%{_libdir}/%{name}/game.so"|g' unix/sys_unix.c +sed -i 's|"game.so"|"%{_libdir}/%{name}/game.so"|g' source/unix/sys_unix.c %build +cd source/ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install @@ -41,11 +42,11 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/alienarena/ mkdir -p $RPM_BUILD_ROOT%{_libexecdir} -install -m0755 release/crded $RPM_BUILD_ROOT%{_bindir} +install -m0755 source/release/crded $RPM_BUILD_ROOT%{_bindir} # Don't install this one, it barely works. The SDL binary works better. -# install -m0755 release/crx $RPM_BUILD_ROOT%{_bindir} -install -m0755 -p release/crx.sdl $RPM_BUILD_ROOT%{_libexecdir} -install -m0755 -p release/game.so $RPM_BUILD_ROOT%{_libdir}/alienarena/ +# install -m0755 source/release/crx $RPM_BUILD_ROOT%{_bindir} +install -m0755 -p source/release/crx.sdl $RPM_BUILD_ROOT%{_libexecdir} +install -m0755 -p source/release/game.so $RPM_BUILD_ROOT%{_libdir}/alienarena/ install -m0755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/alienarena mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/data1/ @@ -71,6 +72,9 @@ %{_libexecdir}/crx.sdl %changelog +* Wed Jul 2 2008 Tom "spot" Callaway - 7.10-1 +- update to 7.10 (2008) + * Tue Feb 19 2008 Fedora Release Engineering - 6.10-6 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Nov 2007 22:14:24 -0000 1.2 +++ sources 2 Jul 2008 19:13:07 -0000 1.3 @@ -1 +1 @@ -83bd589b59521a4716dfa42bc8e5b0d3 alienarena610src.zip +65e0191c2c212991ef8fcbdacb579a8d alienarena710src.zip --- alienarena-6.10-dont-search-dll-in-data-path.patch DELETED --- --- alienarena-6.10-fhs.patch DELETED --- --- alienarena-6.10-genericoptflagsonly.patch DELETED --- --- alienarena-6.10-noSGIglext.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 19:21:08 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 2 Jul 2008 19:21:08 GMT Subject: rpms/libpciaccess/F-9 libpciaccess-fd-cache.patch, 1.1, 1.2 libpciaccess.spec, 1.14, 1.15 Message-ID: <200807021921.m62JL8D2003236@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libpciaccess/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3196 Modified Files: libpciaccess-fd-cache.patch libpciaccess.spec Log Message: * Wed Jul 02 2008 Adam Jackson 0.10.3-2 - Fix file access mode in config fd cache. (#452910) libpciaccess-fd-cache.patch: Index: libpciaccess-fd-cache.patch =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/F-9/libpciaccess-fd-cache.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libpciaccess-fd-cache.patch 23 Jan 2008 18:45:55 -0000 1.1 +++ libpciaccess-fd-cache.patch 2 Jul 2008 19:20:13 -0000 1.2 @@ -91,7 +91,7 @@ - - fd = open( name, O_RDONLY ); - if ( fd == -1 ) { -+ fd = open_config_fd( dev, O_RDONLY ); ++ fd = open_config_fd( dev, O_RDWR ); + if ( fd == -1 ) return errno; - } @@ -125,7 +125,7 @@ - - fd = open( name, O_WRONLY ); - if ( fd == -1 ) { -+ fd = open_config_fd( dev, O_WRONLY ); ++ fd = open_config_fd( dev, O_RDWR ); + if ( fd == -1 ) return errno; - } Index: libpciaccess.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/F-9/libpciaccess.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libpciaccess.spec 1 Jul 2008 20:30:51 -0000 1.14 +++ libpciaccess.spec 2 Jul 2008 19:20:13 -0000 1.15 @@ -3,7 +3,7 @@ Name: libpciaccess Version: 0.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PCI access library Group: System Environment/Libraries @@ -70,6 +70,9 @@ %{_libdir}/pkgconfig/pciaccess.pc %changelog +* Wed Jul 02 2008 Adam Jackson 0.10.3-2 +- Fix file access mode in config fd cache. (#452910) + * Tue Jul 01 2008 Adam Jackson 0.10.3-1 - libpciaccess 0.10.3 From fedora-extras-commits at redhat.com Wed Jul 2 19:28:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 19:28:59 +0000 Subject: [pkgdb] telepathy-salut (Fedora OLPC, 3) updated by ausil Message-ID: <200807021929.m62JT0V9022501@bastion.fedora.phx.redhat.com> Dennis Gilmore (ausil) added a Fedora OLPC 3 branch for telepathy-salut Dennis Gilmore (ausil) has set commit to Approved for cvsextras on telepathy-salut (Fedora OLPC 3) Dennis Gilmore (ausil) has set build to Approved for cvsextras on telepathy-salut (Fedora OLPC 3) Dennis Gilmore (ausil) has set checkout to Approved for cvsextras on telepathy-salut (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-salut From fedora-extras-commits at redhat.com Wed Jul 2 19:41:33 2008 From: fedora-extras-commits at redhat.com (Behdad Esfahbod (behdad)) Date: Wed, 2 Jul 2008 19:41:33 GMT Subject: rpms/pango/F-9 .cvsignore, 1.73, 1.74 pango.spec, 1.137, 1.138 sources, 1.73, 1.74 Message-ID: <200807021941.m62JfXaP003868@cvs-int.fedora.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/pango/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3802 Modified Files: .cvsignore pango.spec sources Log Message: * Wed Jul 2 2008 Behdad Esfahbod - 1.20.5-1 - Update to 1.20.5. .4 was broken Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pango/F-9/.cvsignore,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- .cvsignore 1 Jul 2008 21:21:43 -0000 1.73 +++ .cvsignore 2 Jul 2008 19:40:43 -0000 1.74 @@ -1 +1 @@ -pango-1.20.4.tar.bz2 +pango-1.20.5.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/pkgs/rpms/pango/F-9/pango.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- pango.spec 1 Jul 2008 21:21:43 -0000 1.137 +++ pango.spec 2 Jul 2008 19:40:43 -0000 1.138 @@ -8,7 +8,7 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.20.4 +Version: 1.20.5 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -218,6 +218,9 @@ %changelog +* Wed Jul 2 2008 Behdad Esfahbod - 1.20.5-1 +- Update to 1.20.5. .4 was broken + * Tue Jul 1 2008 Matthias Clasen - 1.20.4-1 - Update to 1.20.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pango/F-9/sources,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- sources 1 Jul 2008 21:21:43 -0000 1.73 +++ sources 2 Jul 2008 19:40:43 -0000 1.74 @@ -1 +1 @@ -bb8a7709d8511aeb423fad18187c5ad3 pango-1.20.4.tar.bz2 +052b60a12f6b2eb4f251ab961f2b2b84 pango-1.20.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 19:47:37 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Wed, 2 Jul 2008 19:47:37 GMT Subject: rpms/func/F-7 .cvsignore, 1.7, 1.8 func.spec, 1.6, 1.7 sources, 1.7, 1.8 version, 1.6, 1.7 Message-ID: <200807021947.m62JlbBW004375@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071/F-7 Modified Files: .cvsignore func.spec sources version Log Message: Enter stage left: Func 0.21. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2008 18:33:23 -0000 1.7 +++ .cvsignore 2 Jul 2008 19:45:42 -0000 1.8 @@ -4,3 +4,4 @@ func-0.17.tar.gz func-0.18.tar.gz func-0.20.tar.gz +func-0.21.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/func.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- func.spec 30 Jun 2008 18:33:23 -0000 1.6 +++ func.spec 2 Jul 2008 19:45:42 -0000 1.7 @@ -60,6 +60,7 @@ %dir %{_sysconfdir}/%{name}/minion-acl.d/ %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf +%config(noreplace) /etc/func/async_methods.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -123,6 +124,12 @@ %changelog +* Wed Jul 02 2008 Michael DeHaan - 0.21-1 +- new release, upstream changes + +* Mon Jun 30 2008 Michael DeHaan - 0.20-1 +- new release, upstream changes + * Fri Jun 28 2008 Adrian Likins - 0.18-2 - fix fedora bug #441283 - typo in postinstall scriptlet (the init.d symlinks for runlevels 1 and 6 were created wrong) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jun 2008 18:33:23 -0000 1.7 +++ sources 2 Jul 2008 19:45:42 -0000 1.8 @@ -2,3 +2,4 @@ 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz def199858286218daef908e871f2e7ca func-0.18.tar.gz 2ea0cc2735e4764ad8cb11bd6edae47e func-0.20.tar.gz +715638833720c85076fe04cd2e31fc32 func-0.21.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/version,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- version 30 Jun 2008 18:33:23 -0000 1.6 +++ version 2 Jul 2008 19:45:42 -0000 1.7 @@ -1 +1 @@ -0.20 1 +0.21 1 From fedora-extras-commits at redhat.com Wed Jul 2 19:47:42 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Wed, 2 Jul 2008 19:47:42 GMT Subject: rpms/func/EL-5 .cvsignore, 1.7, 1.8 func.spec, 1.6, 1.7 sources, 1.7, 1.8 version, 1.6, 1.7 Message-ID: <200807021947.m62Jlg7e004383@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071/EL-5 Modified Files: .cvsignore func.spec sources version Log Message: Enter stage left: Func 0.21. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2008 18:33:02 -0000 1.7 +++ .cvsignore 2 Jul 2008 19:45:22 -0000 1.8 @@ -4,3 +4,4 @@ func-0.17.tar.gz func-0.18.tar.gz func-0.20.tar.gz +func-0.21.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/func.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- func.spec 30 Jun 2008 18:33:02 -0000 1.6 +++ func.spec 2 Jul 2008 19:45:22 -0000 1.7 @@ -60,6 +60,7 @@ %dir %{_sysconfdir}/%{name}/minion-acl.d/ %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf +%config(noreplace) /etc/func/async_methods.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -123,6 +124,12 @@ %changelog +* Wed Jul 02 2008 Michael DeHaan - 0.21-1 +- new release, upstream changes + +* Mon Jun 30 2008 Michael DeHaan - 0.20-1 +- new release, upstream changes + * Fri Jun 28 2008 Adrian Likins - 0.18-2 - fix fedora bug #441283 - typo in postinstall scriptlet (the init.d symlinks for runlevels 1 and 6 were created wrong) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jun 2008 18:33:02 -0000 1.7 +++ sources 2 Jul 2008 19:45:22 -0000 1.8 @@ -2,3 +2,4 @@ 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz def199858286218daef908e871f2e7ca func-0.18.tar.gz 2ea0cc2735e4764ad8cb11bd6edae47e func-0.20.tar.gz +715638833720c85076fe04cd2e31fc32 func-0.21.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/version,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- version 30 Jun 2008 18:33:02 -0000 1.6 +++ version 2 Jul 2008 19:45:22 -0000 1.7 @@ -1 +1 @@ -0.20 1 +0.21 1 From fedora-extras-commits at redhat.com Wed Jul 2 19:47:51 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Wed, 2 Jul 2008 19:47:51 GMT Subject: rpms/func/EL-4 .cvsignore, 1.7, 1.8 func.spec, 1.6, 1.7 sources, 1.7, 1.8 version, 1.6, 1.7 Message-ID: <200807021947.m62JlpII004393@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071/EL-4 Modified Files: .cvsignore func.spec sources version Log Message: Enter stage left: Func 0.21. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2008 18:32:30 -0000 1.7 +++ .cvsignore 2 Jul 2008 19:44:58 -0000 1.8 @@ -4,3 +4,4 @@ func-0.17.tar.gz func-0.18.tar.gz func-0.20.tar.gz +func-0.21.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/func.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- func.spec 30 Jun 2008 18:32:30 -0000 1.6 +++ func.spec 2 Jul 2008 19:44:58 -0000 1.7 @@ -60,6 +60,7 @@ %dir %{_sysconfdir}/%{name}/minion-acl.d/ %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf +%config(noreplace) /etc/func/async_methods.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -123,6 +124,12 @@ %changelog +* Wed Jul 02 2008 Michael DeHaan - 0.21-1 +- new release, upstream changes + +* Mon Jun 30 2008 Michael DeHaan - 0.20-1 +- new release, upstream changes + * Fri Jun 28 2008 Adrian Likins - 0.18-2 - fix fedora bug #441283 - typo in postinstall scriptlet (the init.d symlinks for runlevels 1 and 6 were created wrong) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jun 2008 18:32:30 -0000 1.7 +++ sources 2 Jul 2008 19:44:58 -0000 1.8 @@ -2,3 +2,4 @@ 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz def199858286218daef908e871f2e7ca func-0.18.tar.gz 2ea0cc2735e4764ad8cb11bd6edae47e func-0.20.tar.gz +715638833720c85076fe04cd2e31fc32 func-0.21.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/version,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- version 30 Jun 2008 18:32:30 -0000 1.6 +++ version 2 Jul 2008 19:44:58 -0000 1.7 @@ -1 +1 @@ -0.20 1 +0.21 1 From fedora-extras-commits at redhat.com Wed Jul 2 19:47:55 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Wed, 2 Jul 2008 19:47:55 GMT Subject: rpms/func/F-8 .cvsignore, 1.7, 1.8 func.spec, 1.6, 1.7 sources, 1.7, 1.8 version, 1.6, 1.7 Message-ID: <200807021947.m62JltMk004400@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071/F-8 Modified Files: .cvsignore func.spec sources version Log Message: Enter stage left: Func 0.21. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2008 18:33:52 -0000 1.7 +++ .cvsignore 2 Jul 2008 19:46:07 -0000 1.8 @@ -4,3 +4,4 @@ func-0.17.tar.gz func-0.18.tar.gz func-0.20.tar.gz +func-0.21.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/func.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- func.spec 30 Jun 2008 18:33:52 -0000 1.6 +++ func.spec 2 Jul 2008 19:46:07 -0000 1.7 @@ -60,6 +60,7 @@ %dir %{_sysconfdir}/%{name}/minion-acl.d/ %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf +%config(noreplace) /etc/func/async_methods.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -123,6 +124,12 @@ %changelog +* Wed Jul 02 2008 Michael DeHaan - 0.21-1 +- new release, upstream changes + +* Mon Jun 30 2008 Michael DeHaan - 0.20-1 +- new release, upstream changes + * Fri Jun 28 2008 Adrian Likins - 0.18-2 - fix fedora bug #441283 - typo in postinstall scriptlet (the init.d symlinks for runlevels 1 and 6 were created wrong) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jun 2008 18:33:52 -0000 1.7 +++ sources 2 Jul 2008 19:46:07 -0000 1.8 @@ -2,3 +2,4 @@ 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz def199858286218daef908e871f2e7ca func-0.18.tar.gz 2ea0cc2735e4764ad8cb11bd6edae47e func-0.20.tar.gz +715638833720c85076fe04cd2e31fc32 func-0.21.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/version,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- version 30 Jun 2008 18:33:52 -0000 1.6 +++ version 2 Jul 2008 19:46:07 -0000 1.7 @@ -1 +1 @@ -0.20 1 +0.21 1 From fedora-extras-commits at redhat.com Wed Jul 2 19:48:00 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Wed, 2 Jul 2008 19:48:00 GMT Subject: rpms/func/F-9 .cvsignore, 1.7, 1.8 func.spec, 1.8, 1.9 sources, 1.8, 1.9 version, 1.7, 1.8 Message-ID: <200807021948.m62Jm0MJ004408@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071/F-9 Modified Files: .cvsignore func.spec sources version Log Message: Enter stage left: Func 0.21. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2008 18:34:13 -0000 1.7 +++ .cvsignore 2 Jul 2008 19:46:25 -0000 1.8 @@ -4,3 +4,4 @@ func-0.17.tar.gz func-0.18.tar.gz func-0.20.tar.gz +func-0.21.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/F-9/func.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- func.spec 30 Jun 2008 18:34:13 -0000 1.8 +++ func.spec 2 Jul 2008 19:46:25 -0000 1.9 @@ -60,6 +60,7 @@ %dir %{_sysconfdir}/%{name}/minion-acl.d/ %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf +%config(noreplace) /etc/func/async_methods.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -123,6 +124,12 @@ %changelog +* Wed Jul 02 2008 Michael DeHaan - 0.21-1 +- new release, upstream changes + +* Mon Jun 30 2008 Michael DeHaan - 0.20-1 +- new release, upstream changes + * Fri Jun 28 2008 Adrian Likins - 0.18-2 - fix fedora bug #441283 - typo in postinstall scriptlet (the init.d symlinks for runlevels 1 and 6 were created wrong) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Jun 2008 18:34:13 -0000 1.8 +++ sources 2 Jul 2008 19:46:25 -0000 1.9 @@ -1,3 +1,4 @@ 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz def199858286218daef908e871f2e7ca func-0.18.tar.gz 2ea0cc2735e4764ad8cb11bd6edae47e func-0.20.tar.gz +715638833720c85076fe04cd2e31fc32 func-0.21.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/F-9/version,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- version 30 Jun 2008 18:34:13 -0000 1.7 +++ version 2 Jul 2008 19:46:25 -0000 1.8 @@ -1 +1 @@ -0.20 1 +0.21 1 From fedora-extras-commits at redhat.com Wed Jul 2 19:48:02 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Wed, 2 Jul 2008 19:48:02 GMT Subject: rpms/func/devel .cvsignore, 1.7, 1.8 func.spec, 1.8, 1.9 sources, 1.8, 1.9 version, 1.7, 1.8 Message-ID: <200807021948.m62Jm2fO004414@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071/devel Modified Files: .cvsignore func.spec sources version Log Message: Enter stage left: Func 0.21. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2008 18:34:40 -0000 1.7 +++ .cvsignore 2 Jul 2008 19:47:00 -0000 1.8 @@ -4,3 +4,4 @@ func-0.17.tar.gz func-0.18.tar.gz func-0.20.tar.gz +func-0.21.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/func.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- func.spec 30 Jun 2008 18:34:40 -0000 1.8 +++ func.spec 2 Jul 2008 19:47:00 -0000 1.9 @@ -60,6 +60,7 @@ %dir %{_sysconfdir}/%{name}/minion-acl.d/ %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf +%config(noreplace) /etc/func/async_methods.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -123,6 +124,12 @@ %changelog +* Wed Jul 02 2008 Michael DeHaan - 0.21-1 +- new release, upstream changes + +* Mon Jun 30 2008 Michael DeHaan - 0.20-1 +- new release, upstream changes + * Fri Jun 28 2008 Adrian Likins - 0.18-2 - fix fedora bug #441283 - typo in postinstall scriptlet (the init.d symlinks for runlevels 1 and 6 were created wrong) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Jun 2008 18:34:40 -0000 1.8 +++ sources 2 Jul 2008 19:47:00 -0000 1.9 @@ -1,3 +1,4 @@ 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz def199858286218daef908e871f2e7ca func-0.18.tar.gz -2ea0cc2735e4764ad8cb11bd6edae47e func-0.20.tar.gz +04b5f281a8f68fdeca61059c2896d1a3 func-0.20.tar.gz +715638833720c85076fe04cd2e31fc32 func-0.21.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/version,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- version 30 Jun 2008 18:34:40 -0000 1.7 +++ version 2 Jul 2008 19:47:00 -0000 1.8 @@ -1 +1 @@ -0.20 1 +0.21 1 From fedora-extras-commits at redhat.com Wed Jul 2 19:49:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 19:49:10 +0000 Subject: [pkgdb] telepathy-gabble (Fedora OLPC, 3) updated by toshio Message-ID: <200807021949.m62JnBTQ023448@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) added a Fedora OLPC 3 branch for telepathy-gabble Toshio ???? (toshio) has set commit to Approved for cvsextras on telepathy-gabble (Fedora OLPC 3) Toshio ???? (toshio) has set build to Approved for cvsextras on telepathy-gabble (Fedora OLPC 3) Toshio ???? (toshio) has set checkout to Approved for cvsextras on telepathy-gabble (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-gabble From fedora-extras-commits at redhat.com Wed Jul 2 19:50:36 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 19:50:36 GMT Subject: rpms/firefox/F-8 .cvsignore, 1.42, 1.43 firefox.spec, 1.214, 1.215 sources, 1.48, 1.49 Message-ID: <200807021950.m62JoaUC004750@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4713 Modified Files: .cvsignore firefox.spec sources Log Message: * Wed Jul 2 2008 Christopher Aillon 2.0.0.15-1 - Update to 2.0.0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/F-8/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 16 Apr 2008 18:30:09 -0000 1.42 +++ .cvsignore 2 Jul 2008 19:49:25 -0000 1.43 @@ -1,2 +1,2 @@ -firefox-2.0.0.14-source.tar.bz2 -firefox-langpacks-2.0.0.14-20080416.tar.bz2 +firefox-2.0.0.15-source.tar.bz2 +firefox-langpacks-2.0.0.15-20080702.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/F-8/firefox.spec,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- firefox.spec 16 Apr 2008 18:30:09 -0000 1.214 +++ firefox.spec 2 Jul 2008 19:49:25 -0000 1.215 @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox -Version: 2.0.0.14 +Version: 2.0.0.15 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -22,7 +22,7 @@ %define tarball firefox-2.0rc3-source.tar.bz2 %endif Source0: %{tarball} -Source2: firefox-langpacks-%{version}-20080416.tar.bz2 +Source2: firefox-langpacks-%{version}-20080702.tar.bz2 Source10: firefox-mozconfig Source11: firefox-mozconfig-branded Source12: firefox-redhat-default-prefs.js @@ -439,6 +439,9 @@ #--------------------------------------------------------------------- %changelog +* Wed Jul 2 2008 Christopher Aillon 2.0.0.15-1 +- Update to 2.0.0.15 + * Wed Apr 16 2008 Christopher Aillon 2.0.0.14-1 - Update to 2.0.0.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/F-8/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 16 Apr 2008 18:30:09 -0000 1.48 +++ sources 2 Jul 2008 19:49:25 -0000 1.49 @@ -1,2 +1,2 @@ -9e9c13ba7b81f93f2fa10c6f256ee31e firefox-2.0.0.14-source.tar.bz2 -c3936f93ce38e193add7050ed3cd5874 firefox-langpacks-2.0.0.14-20080416.tar.bz2 +ef827973830cc6453adf8ca3b88a9c6d firefox-2.0.0.15-source.tar.bz2 +dcc6d1e2a13c1794ab040761746de4f9 firefox-langpacks-2.0.0.15-20080702.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 2 20:00:33 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 2 Jul 2008 20:00:33 GMT Subject: rpms/totem/OLPC-3 sources,1.61,1.62 totem.spec,1.189,1.190 Message-ID: <200807022000.m62K0X1E005154@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/totem/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5088 Modified Files: sources totem.spec Log Message: define minimal build, based on rawhide version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem/OLPC-3/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 22 Apr 2008 23:48:57 -0000 1.61 +++ sources 2 Jul 2008 19:59:41 -0000 1.62 @@ -1 +1 @@ -118b9b3030814872697505ef1e1b0b96 totem-2.23.2.tar.bz2 +e90839bbac5b7b663a1ddc74646ded99 totem-2.23.4.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/OLPC-3/totem.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- totem.spec 27 Jun 2008 15:08:53 -0000 1.189 +++ totem.spec 2 Jul 2008 19:59:41 -0000 1.190 @@ -1,17 +1,17 @@ %define with_xine 0 +%define minimal_build 1 %define gstreamer_version 0.10.1 %define gstreamer_plugins_base_version 0.10.17.2-4 %define gstreamer_plugins_good_version 0.10.0 %define gstreamer_plugins_flumpegdemux_version 0.10.15 %define gtk2_version 2.12.1 -%define gecko_version 1.9 %define xine_version 1.1.7 Summary: Movie player for GNOME Name: totem -Version: 2.23.2 -Release: 4%{?dist}.1 +Version: 2.23.4 +Release: 1%{?dist}.1 License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -27,19 +27,20 @@ Requires(postun): desktop-file-utils Requires(postun): scrollkeeper +%if %{minimal_build} == 0 Requires: gnome-desktop >= 2.6.0 -Requires: iso-codes Requires: gnome-themes +%endif +Requires: iso-codes Requires: gtk2 >= %gtk2_version # FIXME? #Requires: %{name}-backend = %{version}-%{release} Requires: %{name}-gstreamer BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper -BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel +BuildRequires: gnome-desktop-devel >= 2.6.0, libglade2-devel BuildRequires: perl(XML::Parser) BuildRequires: iso-codes-devel -BuildRequires: gecko-devel-unstable = %gecko_version BuildRequires: gnome-icon-theme BuildRequires: nautilus-devel BuildRequires: libXtst-devel @@ -57,14 +58,8 @@ BuildRequires: libepc-devel BuildRequires: totem-pl-parser-devel -# For the xulrunner patch -BuildRequires: intltool autoconf automake libtool gettext check-devel - Obsoletes: nautilus-media -# http://bugzilla.gnome.org/show_bug.cgi?id=458324 -Patch0: totem-xul-4.patch - %description Totem is simple movie player for the Gnome desktop. It features a simple playlist, a full-screen mode, seek and volume controls, as well as @@ -80,6 +75,7 @@ Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version Requires: gstreamer-plugins-flumpegdemux >= %gstreamer_plugins_flumpegdemux_version +Requires: gvfs-fuse BuildRequires: gstreamer-devel >= %gstreamer_version BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version @@ -95,6 +91,7 @@ Provides: %{name}-backend = %{version}-%{release} Requires: %{name} = %{version} Requires: xine-lib >= %{xine_version} +Requires: gvfs-fuse BuildRequires: xine-lib-devel >= %{xine_version} %description xine @@ -104,7 +101,6 @@ %package mozplugin Summary: Mozilla plugin for Totem Group: Applications/Internet -Requires: gecko-libs = %gecko_version %description mozplugin Totem is simple movie player for the Gnome desktop. The mozilla plugin @@ -130,6 +126,7 @@ Your Instant Messenging program might require a plugin to take advantage of this feature. +%if %{minimal_build} == 0 %package mythtv Summary: MythTV plugin for Totem Group: Applications/Multimedia @@ -137,6 +134,7 @@ %description mythtv A plugin to allow access to recordings on a remote MythTV server. +%endif %package youtube Summary: YouTube plugin for Totem @@ -168,6 +166,7 @@ A plugin to allow you to share your current playlist (and the files included in that playlist) with other Totems on the same local network. +%if %{minimal_build} == 0 %package nautilus Summary: Video and Audio Properties tab for Nautilus Group: Applications/Multimedia @@ -180,6 +179,7 @@ %description nautilus A Nautilus extension that shows the properties of audio and video files in??? the properties dialogue. +%endif %prep %setup -q -c @@ -189,14 +189,6 @@ cp totem-%{version}/$i . done -pushd totem-%{version} -%patch0 -p0 -b .xulrunner - -# regen -automake -autoconf -popd - # duplicate sources cp -a totem-%{version} xine mv totem-%{version} gstreamer @@ -206,17 +198,32 @@ pushd gstreamer # try to work around a problem where gst-inspect does # not find playbin the first time around -DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null +DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all # > /dev/null export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins %configure \ +%if %{minimal_build} == 0 --enable-gstreamer \ - --disable-lirc \ - --disable-vanity \ --enable-mozilla \ + --enable-nautilus \ + --disable-scrollkeeper \ + --disable-nvtv +%else + --enable-gstreamer \ + --enable-mozilla \ + --disable-lirc \ + --disable-vanity \ --disable-nautilus \ --disable-scrollkeeper \ --disable-nvtv \ + --disable-youtube \ + --disable-publish \ + --disable-skipto \ + --disable-screensaver \ + --disable-tracker \ + --with-dbus \ --enable-gtk +%endif + make %{?_smp_mflags} popd @@ -296,7 +303,7 @@ %post xine /usr/sbin/alternatives --install %{_libdir}/libbaconvideowidget.so.0.0.0 totem-backend %{_libdir}/libbaconvideowidget-xine.so.0.0.0 1 /sbin/ldconfig -%endif +%endif %pre if [ "$1" -gt 1 ]; then @@ -340,12 +347,7 @@ /sbin/ldconfig %endif -%post mythtv -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \ - >& /dev/null || : - +%if %{minimal_build} == 0 %pre mythtv if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -365,6 +367,7 @@ >& /dev/null || : fi fi +%endif %files -f %{name}.lang %defattr(-,root,root,-) @@ -397,9 +400,11 @@ %{_mandir}/man1/%{name}.1* %{_mandir}/man1/totem-video-thumbnailer.1.gz +%if %{minimal_build} == 0 %files nautilus %defattr(-, root, root) %{_libdir}/nautilus/extensions-2.0/*.so* +%endif %files galago %defattr(-, root, root) @@ -409,10 +414,11 @@ %defattr(-, root, root) %{_libdir}/totem/plugins/lirc +%if %{minimal_build} == 0 %files mythtv %defattr(-, root, root) -%config %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas %{_libdir}/totem/plugins/mythtv +%endif %files youtube %defattr(-, root, root) @@ -440,21 +446,28 @@ %endif %changelog -* Fri Jun 27 2008 Dennis Gilmore - 2.23.2-4.1 -- fix up disabling xine -- disable xine -- disable gnome +* Wed Jul 02 2008 - Dennis Gilmore - 2.23.4-1.1 +- setup macros to define a minimal gtk only build +- disable xine backend for OLPC minimal build + +* Wed Jun 11 2008 - Bastien Nocera - 2.23.4-1 +- Update to 2.23.4 +- Remove gnome-vfs BRs +- Remove xulrunner patches and requires, we don't need them anymore + +* Sat May 17 2008 - Bastien Nocera - 2.23.3-2 +- Rebuild -* Wed Jun 18 2008 Owen Taylor - 2.23.2-4 -- Rebuild against xulrunner 1.9 final +* Wed May 14 2008 - Bastien Nocera - 2.23.3-1 +- Update to 2.23.3 + +* Tue May 13 2008 - Bastien Nocera - 2.23.2-4 +- Rebuild * Wed May 07 2008 - Bastien Nocera - 2.23.2-3 - Require gstreamer-plugins-flumpegdemux as used by the DVB and DVD playback bits -* Wed Apr 23 2008 - Bastien Nocera - 2.23.2-2 -- Rebuild - * Mon Apr 21 2008 - Bastien Nocera - 2.23.2-1 - Update to 2.23.2 - Fix scriptlets removing the alternatives on upgrade (#442895) From fedora-extras-commits at redhat.com Wed Jul 2 20:05:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 20:05:03 +0000 Subject: [pkgdb] telepathy-gabble (Fedora OLPC, 3) updated by toshio Message-ID: <200807022005.m62K53Ah024109@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) changed owner of telepathy-gabble in Fedora OLPC 3 to bpepple Toshio ???? (toshio) Approved cvsextras for commit access on telepathy-gabble (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-gabble From fedora-extras-commits at redhat.com Wed Jul 2 20:06:23 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:23 GMT Subject: rpms/epiphany-extensions/F-8 epiphany-extensions.spec,1.44,1.45 Message-ID: <200807022006.m62K6NpA011985@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/epiphany-extensions/F-8 Modified Files: epiphany-extensions.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/F-8/epiphany-extensions.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- epiphany-extensions.spec 16 Apr 2008 18:40:34 -0000 1.44 +++ epiphany-extensions.spec 2 Jul 2008 20:01:36 -0000 1.45 @@ -4,7 +4,7 @@ Name: epiphany-extensions Version: %{ephy_major}.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Extensions for Epiphany, the GNOME web browser ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is @@ -113,6 +113,9 @@ %changelog +* Wed Jul 02 2008 Christopher Aillon - 2.20.1-8 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 2.20.1-7 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:27 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:27 GMT Subject: rpms/openvrml/F-8 openvrml.spec,1.40,1.41 Message-ID: <200807022006.m62K6RBQ011988@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/openvrml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/openvrml/F-8 Modified Files: openvrml.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: openvrml.spec =================================================================== RCS file: /cvs/extras/rpms/openvrml/F-8/openvrml.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- openvrml.spec 22 Jun 2008 07:30:11 -0000 1.40 +++ openvrml.spec 2 Jul 2008 20:05:06 -0000 1.41 @@ -1,7 +1,7 @@ # -*- rpm-spec -*- Name: openvrml Version: 0.17.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: VRML/X3D runtime library License: LGPLv3+ Group: System Environment/Libraries @@ -173,6 +173,9 @@ %changelog +* Wed Jul 02 2008 Christopher Aillon - 0.17.6-3 +- Rebuild against newer gecko + * Sun Jun 22 2008 Braden McDaniel - 0.17.6-2 - Make symbols for libglade callbacks in openvrml-player visible. From fedora-extras-commits at redhat.com Wed Jul 2 20:06:28 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:28 GMT Subject: rpms/ruby-gnome2/F-8 ruby-gnome2.spec,1.19,1.20 Message-ID: <200807022006.m62K6SYM011991@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ruby-gnome2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/ruby-gnome2/F-8 Modified Files: ruby-gnome2.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: ruby-gnome2.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-gnome2/F-8/ruby-gnome2.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ruby-gnome2.spec 9 Jun 2008 13:14:16 -0000 1.19 +++ ruby-gnome2.spec 2 Jul 2008 20:05:28 -0000 1.20 @@ -11,7 +11,7 @@ Name: ruby-gnome2 Version: 0.17.0 -Release: 0.1.%{betaver}%{?dist} +Release: 0.2.%{betaver}%{?dist} Summary: Ruby binding of libgnome/libgnomeui-2.x Group: System Environment/Libraries @@ -696,6 +696,9 @@ %changelog +* Wed Jul 02 2008 Christopher Aillon - 0.17.0-0.2.rc1 +- Rebuild against newer gecko + * Sun Jun 8 2008 Mamoru Tasaka - 0.17.0-0.1.rc1 - 0.17.0 rc1 - Remove upstreamed patches - 2 patches remain From fedora-extras-commits at redhat.com Wed Jul 2 20:06:29 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:29 GMT Subject: rpms/blam/F-8 blam.spec,1.24,1.25 Message-ID: <200807022006.m62K6Twu011994@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/blam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/blam/F-8 Modified Files: blam.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: blam.spec =================================================================== RCS file: /cvs/extras/rpms/blam/F-8/blam.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- blam.spec 16 Apr 2008 18:34:34 -0000 1.24 +++ blam.spec 2 Jul 2008 20:00:12 -0000 1.25 @@ -5,7 +5,7 @@ Name: blam Version: 1.8.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -129,6 +129,9 @@ %{_mandir}/man?/%{name}.1* %changelog +* Wed Jul 02 2008 Christopher Aillon - 1.8.3-16 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 1.8.3-15 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:32 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:32 GMT Subject: rpms/galeon/F-8 galeon.spec,1.47,1.48 Message-ID: <200807022006.m62K6W32011997@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/galeon/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/galeon/F-8 Modified Files: galeon.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/F-8/galeon.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- galeon.spec 16 Apr 2008 18:42:00 -0000 1.47 +++ galeon.spec 2 Jul 2008 20:01:54 -0000 1.48 @@ -3,7 +3,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.4 -Release: 2%{?dist}.3 +Release: 3%{?dist}.3 License: GPLv2+ Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -115,6 +115,9 @@ %changelog +* Wed Jul 02 2008 Christopher Aillon - 2.0.4-3.3 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 2.0.4-2.3 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:33 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:33 GMT Subject: rpms/gtkmozembedmm/F-8 gtkmozembedmm.spec,1.23,1.24 Message-ID: <200807022006.m62K6XSD012000@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/gtkmozembedmm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/gtkmozembedmm/F-8 Modified Files: gtkmozembedmm.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: gtkmozembedmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmozembedmm/F-8/gtkmozembedmm.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gtkmozembedmm.spec 16 Apr 2008 18:45:32 -0000 1.23 +++ gtkmozembedmm.spec 2 Jul 2008 20:03:10 -0000 1.24 @@ -1,7 +1,7 @@ %define gecko_ver 1.8.1.14 Name: gtkmozembedmm Version: 1.4.2.cvs20060817 -Release: 20%{?dist} +Release: 21%{?dist} Summary: C++ wrapper for GtkMozembed @@ -103,6 +103,9 @@ %changelog +* Wed Jul 02 2008 Christopher Aillon - 1.4.2.cvs20060817-21 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 1.4.2.cvs20060817-20 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:36 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:36 GMT Subject: rpms/epiphany/F-8 epiphany.spec,1.177,1.178 Message-ID: <200807022006.m62K6aV3012006@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/epiphany/F-8 Modified Files: epiphany.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-8/epiphany.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- epiphany.spec 27 Apr 2008 05:12:01 -0000 1.177 +++ epiphany.spec 2 Jul 2008 20:01:11 -0000 1.178 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.20.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -198,6 +198,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed Jul 02 2008 Christopher Aillon - 2.20.3-5 +- Rebuild against newer gecko + * Sun Apr 27 2008 Christopher Aillon - 2.20.3-4 - Stop shipping LowContrastLargePrint icons From fedora-extras-commits at redhat.com Wed Jul 2 20:06:35 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:35 GMT Subject: rpms/Miro/F-8 Miro.spec,1.15,1.16 Message-ID: <200807022006.m62K6Zmi012003@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/Miro/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/Miro/F-8 Modified Files: Miro.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: Miro.spec =================================================================== RCS file: /cvs/extras/rpms/Miro/F-8/Miro.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Miro.spec 30 Apr 2008 04:32:26 -0000 1.15 +++ Miro.spec 2 Jul 2008 20:04:42 -0000 1.16 @@ -5,7 +5,7 @@ Name: Miro Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -75,6 +75,9 @@ %changelog +* Wed Jul 02 2008 Christopher Aillon - 1.2.3-2 +- Rebuild against newer gecko + * Tue Apr 29 2008 Alex Lancaster - 1.2.3-1 - Update to new upstream release (1.2.3) From fedora-extras-commits at redhat.com Wed Jul 2 20:06:39 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:39 GMT Subject: rpms/gnome-web-photo/F-8 gnome-web-photo.spec,1.7,1.8 Message-ID: <200807022006.m62K6dRG012009@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/gnome-web-photo/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/gnome-web-photo/F-8 Modified Files: gnome-web-photo.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: gnome-web-photo.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-web-photo/F-8/gnome-web-photo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnome-web-photo.spec 16 Apr 2008 18:44:07 -0000 1.7 +++ gnome-web-photo.spec 2 Jul 2008 20:02:48 -0000 1.8 @@ -3,7 +3,7 @@ Summary: HTML pages thumbnailer Name: gnome-web-photo Version: 0.3 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ Group: Applications/Internet URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/ @@ -74,6 +74,9 @@ %{_datadir}/gnome-web-photo %changelog +* Wed Jul 02 2008 Christopher Aillon - 0.3-11 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 0.3-10 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:41 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:41 GMT Subject: rpms/devhelp/F-8 devhelp.spec,1.80,1.81 Message-ID: <200807022006.m62K6fH0012012@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/devhelp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/devhelp/F-8 Modified Files: devhelp.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: devhelp.spec =================================================================== RCS file: /cvs/extras/rpms/devhelp/F-8/devhelp.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- devhelp.spec 16 Apr 2008 18:37:43 -0000 1.80 +++ devhelp.spec 2 Jul 2008 20:00:51 -0000 1.81 @@ -6,7 +6,7 @@ Name: devhelp Version: 0.16.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Development/Tools Summary: API document browser @@ -128,6 +128,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jul 02 2008 Christopher Aillon - 0.16.1-8 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 0.16.1-7 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:42 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:42 GMT Subject: rpms/liferea/F-8 liferea.spec,1.109,1.110 Message-ID: <200807022006.m62K6gXl012015@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/liferea/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/liferea/F-8 Modified Files: liferea.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/F-8/liferea.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- liferea.spec 15 May 2008 14:22:53 -0000 1.109 +++ liferea.spec 2 Jul 2008 20:03:51 -0000 1.110 @@ -2,7 +2,7 @@ Name: liferea Version: 1.4.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -122,6 +122,9 @@ %changelog +* Wed Jul 02 2008 Christopher Aillon - 1.4.15-2 +- Rebuild against newer gecko + * Thu May 15 2008 Marc Wiriadisastra - 1.4.15-1 - New version rebuild for F-8 and F-7 From fedora-extras-commits at redhat.com Wed Jul 2 20:06:47 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:47 GMT Subject: rpms/gnome-python2-extras/F-8 gnome-python2-extras.spec,1.24,1.25 Message-ID: <200807022006.m62K6lA6012018@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/gnome-python2-extras/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/gnome-python2-extras/F-8 Modified Files: gnome-python2-extras.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-python2-extras/F-8/gnome-python2-extras.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gnome-python2-extras.spec 16 Apr 2008 18:43:32 -0000 1.24 +++ gnome-python2-extras.spec 2 Jul 2008 20:02:33 -0000 1.25 @@ -21,7 +21,7 @@ Name: gnome-python2-extras Version: 2.19.1 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL/LGPL Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. @@ -194,6 +194,9 @@ %{_libdir}/pkgconfig/pygda-3.0.pc %changelog +* Wed Jul 02 2008 Christopher Aillon - 2.19.1-15 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 2.19.1-14 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:50 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:50 GMT Subject: rpms/chmsee/F-8 chmsee.spec,1.17,1.18 Message-ID: <200807022006.m62K6onW012021@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/chmsee/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/chmsee/F-8 Modified Files: chmsee.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: chmsee.spec =================================================================== RCS file: /cvs/extras/rpms/chmsee/F-8/chmsee.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- chmsee.spec 16 Apr 2008 18:36:07 -0000 1.17 +++ chmsee.spec 2 Jul 2008 20:00:29 -0000 1.18 @@ -3,7 +3,7 @@ Name: chmsee Version: 1.0.0 -Release: 2.30%{?dist} +Release: 2.31%{?dist} Summary(zh_CN): CHM ??????????????????, ?????? Gtk2+ Summary: A Gtk+2 CHM document viewer Group: Applications/Publishing @@ -118,6 +118,9 @@ %{_datadir}/icons/hicolor/*/apps/chmsee.png %changelog +* Wed Jul 02 2008 Christopher Aillon - 1.0.0-2.31 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 1.0.0-2.30 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:51 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:51 GMT Subject: rpms/kazehakase/F-8 kazehakase.spec,1.55,1.56 Message-ID: <200807022006.m62K6pio012024@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/kazehakase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/kazehakase/F-8 Modified Files: kazehakase.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- kazehakase.spec 16 Apr 2008 18:46:53 -0000 1.55 +++ kazehakase.spec 2 Jul 2008 20:03:33 -0000 1.56 @@ -41,7 +41,7 @@ Name: kazehakase Version: 0.5.4 -Release: %{_release}%{?dist}.1 +Release: %{_release}%{?dist}.2 Summary: Kazehakase browser using Gecko rendering engine Group: Applications/Internet @@ -312,6 +312,9 @@ %endif %changelog +* Wed Jul 02 2008 Christopher Aillon - 0.5.4-2.2 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 0.5.4-2.1 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:06:53 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 2 Jul 2008 20:06:53 GMT Subject: rpms/yelp/F-8 yelp.spec,1.119,1.120 Message-ID: <200807022006.m62K6rxH012027@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/yelp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099/yelp/F-8 Modified Files: yelp.spec Log Message: * Wed Jul 2 2008 Christopher Aillon - Rebuild against newer gecko Index: yelp.spec =================================================================== RCS file: /cvs/extras/rpms/yelp/F-8/yelp.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- yelp.spec 16 Apr 2008 18:53:59 -0000 1.119 +++ yelp.spec 2 Jul 2008 20:05:59 -0000 1.120 @@ -20,7 +20,7 @@ Summary: A system documentation reader from the Gnome project Name: yelp Version: 2.20.0 -Release: 9%{?dist} +Release: 10%{?dist} Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2 URL: http://live.gnome.org/Yelp # http://bugzilla.gnome.org/show_bug.cgi?id=319096 @@ -156,6 +156,9 @@ %{_datadir}/yelp %changelog +* Wed Jul 02 2008 Christopher Aillon - 2.20.0-10 +- Rebuild against newer gecko + * Wed Apr 16 2008 Christopher Aillon - 2.20.0-9 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Wed Jul 2 20:09:48 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 2 Jul 2008 20:09:48 GMT Subject: rpms/xorg-x11-xtrans-devel/F-9 import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xorg-x11-xtrans-devel.spec, 1.28, 1.29 xtrans-1.1-abstract.patch, 1.1, NONE Message-ID: <200807022009.m62K9m2W012089@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xtrans-devel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12056/F-9 Modified Files: .cvsignore sources xorg-x11-xtrans-devel.spec Added Files: import.log Removed Files: xtrans-1.1-abstract.patch Log Message: xtrans 1.2.1 --- NEW FILE import.log --- xorg-x11-xtrans-devel-1_2_1-1_fc9:F-9:xorg-x11-xtrans-devel-1.2.1-1.fc9.src.rpm:1215029023 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Mar 2008 02:08:29 -0000 1.9 +++ .cvsignore 2 Jul 2008 20:09:02 -0000 1.10 @@ -1 +1 @@ -xtrans-1.1.tar.bz2 +xtrans-1.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Mar 2008 02:08:29 -0000 1.9 +++ sources 2 Jul 2008 20:09:02 -0000 1.10 @@ -1 +1 @@ -8546e3a060aefb42c889eaa4b5db33af xtrans-1.1.tar.bz2 +96e142331edd498a9364887b2548f1bb xtrans-1.2.1.tar.bz2 Index: xorg-x11-xtrans-devel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/F-9/xorg-x11-xtrans-devel.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xorg-x11-xtrans-devel.spec 6 May 2008 18:12:28 -0000 1.28 +++ xorg-x11-xtrans-devel.spec 2 Jul 2008 20:09:02 -0000 1.29 @@ -5,8 +5,8 @@ Summary: X.Org X11 developmental X transport library Name: xorg-x11-xtrans-devel -Version: 1.1 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -14,7 +14,6 @@ Source0: http://xorg.freedesktop.org/archive/individual/lib/xtrans-%{version}.tar.bz2 Patch1: xtrans-1.0.3-avoid-gethostname.patch -Patch2: xtrans-1.1-abstract.patch BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros @@ -27,7 +26,6 @@ %prep %setup -q -n xtrans-%{version} %patch1 -p1 -b .my-name-is-unix -%patch2 -p1 -b .abstract-does-not-need-mkdir %build @@ -61,6 +59,9 @@ %{_datadir}/aclocal/xtrans.m4 %changelog +* Wed Jul 02 2008 Adam Jackson 1.2.1-1 +- xtrans 1.2.1 + * Tue May 06 2008 Bill Nottingham 1.1-2 - xtrans-1.1-abstract.patch: Don't worry about making /tmp/.X11-unix (or failure to do so) if you're using an abstract socket (#445303) --- xtrans-1.1-abstract.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 20:17:44 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 2 Jul 2008 20:17:44 GMT Subject: rpms/totem-pl-parser/OLPC-3 sources, 1.9, 1.10 totem-pl-parser.spec, 1.13, 1.14 Message-ID: <200807022017.m62KHi3B012224@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/totem-pl-parser/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12195 Modified Files: sources totem-pl-parser.spec Log Message: use rawhide totem-pl-parser for OLPC on Bastien's recomendation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/OLPC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 May 2008 14:21:43 -0000 1.9 +++ sources 2 Jul 2008 20:16:56 -0000 1.10 @@ -1 +1 @@ -a00956f87fa8fcb1f6760dccea5e0f84 totem-pl-parser-2.22.3.tar.bz2 +e8bf9fed229386c44aaffbc7e063dc2e totem-pl-parser-2.23.2.tar.bz2 Index: totem-pl-parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/OLPC-3/totem-pl-parser.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- totem-pl-parser.spec 9 May 2008 14:21:43 -0000 1.13 +++ totem-pl-parser.spec 2 Jul 2008 20:16:56 -0000 1.14 @@ -1,17 +1,16 @@ Name: totem-pl-parser -Version: 2.22.3 +Version: 2.23.2 Release: 1%{?dist} Summary: Totem Playlist Parser library Group: System Environment/Libraries License: LGPLv2+ Url: http://www.gnome.org/projects/totem/ -Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: totem-plparser BuildRequires: gtk2-devel -BuildRequires: gnome-vfs2-devel BuildRequires: evolution-data-server-devel BuildRequires: gettext BuildRequires: perl(XML::Parser) @@ -26,7 +25,6 @@ Obsoletes: totem-devel Requires: %{name} = %{version}-%{release} Requires: pkgconfig -Requires: gnome-vfs2-devel Requires: gtk2-devel %description devel @@ -68,8 +66,21 @@ %{_datadir}/gtk-doc/html/totem-pl-parser %changelog -* Fri May 09 2008 - Bastien Nocera - 2.22.3-1 -- Update to 2.22.3 +* Wed Jun 11 2008 - Bastien Nocera - 2.23.2-1 +- Update to 2.23.2 + +* Tue May 13 2008 - Bastien Nocera - 2.23.1-2 +- Rebuild + +* Fri May 09 2008 - Bastien Nocera - 2.23.1-1 +- Update to 2.23.1 +- Remove gnome-vfs2 dependencies + +* Wed May 07 2008 - Bastien Nocera - 2.22.2-3 +- Rebuild for new libcamel + +* Sun May 4 2008 Matthias Clasen - 2.22.2-2 +- Fix source url * Tue Apr 08 2008 - Bastien Nocera - 2.22.2-1 - Update to 2.22.2 From fedora-extras-commits at redhat.com Wed Jul 2 20:21:26 2008 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Wed, 2 Jul 2008 20:21:26 GMT Subject: rpms/libotr/F-8 libotr.spec,1.13,1.14 sources,1.4,1.5 Message-ID: <200807022021.m62KLQwL012348@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/libotr/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12301 Modified Files: libotr.spec sources Log Message: * Wed Jul 2 2008 Paul Wouters 3.2.0-1 - Upgraded to 3.2.0 Index: libotr.spec =================================================================== RCS file: /cvs/extras/rpms/libotr/F-8/libotr.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libotr.spec 2 Aug 2007 04:30:22 -0000 1.13 +++ libotr.spec 2 Jul 2008 20:20:09 -0000 1.14 @@ -1,6 +1,6 @@ Summary: Off-The-Record Messaging library and toolkit Name: libotr -Version: 3.1.0 +Version: 3.2.0 Release: 1%{?dist} License: GPL, LGPL Group: System Environment/Libraries @@ -10,6 +10,7 @@ Provides: libotr-toolkit = %{version} Obsoletes: libotr-toolkit < %{version} Requires: libgcrypt >= 1.2.0 +Requires: pkgconfig BuildRequires: libgcrypt-devel >= 1.2.0, libgpg-error-devel %description @@ -62,12 +63,16 @@ %doc ChangeLog %{_libdir}/libotr.so %{_libdir}/libotr.a +%{_libdir}/pkgconfig/libotr.pc %dir %{_includedir}/libotr %{_includedir}/libotr/* %{_datadir}/aclocal/* %changelog +* Wed Jul 2 2008 Paul Wouters 3.2.0-1 +- Upgraded to 3.2.0 + * Wed Aug 1 2007 Paul Wouters 3.1.0-1 - Upgraded to current version - Updated URLS and configure line Index: sources =================================================================== RCS file: /cvs/extras/rpms/libotr/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Aug 2007 04:30:22 -0000 1.4 +++ sources 2 Jul 2008 20:20:09 -0000 1.5 @@ -1,2 +1,3 @@ 117aea2c7de6b208ebed662045f46f3e libotr-3.0.0.tar.gz 6266a2966cc9e00822add3175b0b77cf libotr-3.1.0.tar.gz +faba02e60f64e492838929be2272f839 libotr-3.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 19:53:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 02 Jul 2008 19:53:18 +0000 Subject: [pkgdb] totem-pl-parser (Fedora OLPC, 3) updated by ausil Message-ID: <200807021953.m62JrImt023616@bastion.fedora.phx.redhat.com> Dennis Gilmore (ausil) added a Fedora OLPC 3 branch for totem-pl-parser Dennis Gilmore (ausil) has set commit to Approved for cvsextras on totem-pl-parser (Fedora OLPC 3) Dennis Gilmore (ausil) has set build to Approved for cvsextras on totem-pl-parser (Fedora OLPC 3) Dennis Gilmore (ausil) has set checkout to Approved for cvsextras on totem-pl-parser (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem-pl-parser From fedora-extras-commits at redhat.com Wed Jul 2 20:34:18 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Wed, 2 Jul 2008 20:34:18 GMT Subject: rpms/perl-Lingua-Preferred/devel import.log, NONE, 1.1 perl-Lingua-Preferred.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807022034.m62KYIiF012731@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Lingua-Preferred/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12679/devel Modified Files: .cvsignore sources Added Files: import.log perl-Lingua-Preferred.spec Log Message: Initial import for devel --- NEW FILE import.log --- perl-Lingua-Preferred-0_2_4-2_fc8_kwizart:HEAD:perl-Lingua-Preferred-0.2.4-2.fc8.kwizart.src.rpm:1215030699 --- NEW FILE perl-Lingua-Preferred.spec --- Name: perl-Lingua-Preferred Version: 0.2.4 Release: 2%{?dist} Summary: Perl extension to choose a language Group: Development/Libraries License: GPLv2+ or Artistic URL: http://search.cpan.org/dist/Lingua-Preferred/ Source0: http://search.cpan.org/CPAN/authors/id/E/ED/EDAVIS/Lingua-Preferred-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Correct for lots of packages, other common choices include eg. Module::Build BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Many web browsers let you specify which languages you understand. Then they negotiate with the web server to get documents in the best language possible. This is something similar in Perl. %prep %setup -q -n Lingua-Preferred-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Lingua %{perl_vendorlib}/auto/Lingua %{_mandir}/man3/*.3* %changelog * Thu May 1 2008 kwizart < kwizart at gmail.com > - 0.2.4-2 - Fix directory listed twice. * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 0.2.4-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Lingua-Preferred/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jun 2008 14:48:24 -0000 1.1 +++ .cvsignore 2 Jul 2008 20:33:32 -0000 1.2 @@ -0,0 +1 @@ +Lingua-Preferred-0.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Lingua-Preferred/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jun 2008 14:48:24 -0000 1.1 +++ sources 2 Jul 2008 20:33:32 -0000 1.2 @@ -0,0 +1 @@ +37e883fafb05b1439de1121f41e8ad75 Lingua-Preferred-0.2.4.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 20:46:31 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 20:46:31 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch, 1.28, 1.29 selinux-policy.spec, 1.678, 1.679 Message-ID: <200807022046.m62KkVJY013157@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13031 Modified Files: policy-20080509.patch selinux-policy.spec Log Message: * Wed Jul 2 2008 Dan Walsh 3.4.2-10 - Allow all system domains and application domains to append to any log file policy-20080509.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.28 -r 1.29 policy-20080509.patch Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- policy-20080509.patch 1 Jul 2008 20:10:26 -0000 1.28 +++ policy-20080509.patch 2 Jul 2008 20:45:43 -0000 1.29 @@ -1,20 +1,99 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.4.2/Makefile +--- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 ++++ serefpolicy-3.4.2/Makefile 2008-07-02 08:47:04.000000000 -0400 +@@ -311,20 +311,22 @@ + + # parse-rolemap modulename,outputfile + define parse-rolemap +- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ +- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 ++ echo "" >> $2 ++# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ ++# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 + endef + + # perrole-expansion modulename,outputfile + define perrole-expansion +- $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 +- $(call parse-rolemap,$1,$2) +- $(verbose) echo "')" >> $2 +- +- $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 +- $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 +- $(call parse-rolemap-compat,$1,$2) +- $(verbose) echo "')" >> $2 ++ echo "No longer doing perrole-expansion" ++# $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 ++# $(call parse-rolemap,$1,$2) ++# $(verbose) echo "')" >> $2 ++ ++# $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 ++# $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 ++# $(call parse-rolemap-compat,$1,$2) ++# $(verbose) echo "')" >> $2 + endef + + # create-base-per-role-tmpl modulenames,outputfile +@@ -523,6 +525,10 @@ + @mkdir -p $(appdir)/users + $(verbose) $(INSTALL) -m 644 $^ $@ + ++$(appdir)/initrc_context: $(tmpdir)/initrc_context ++ @mkdir -p $(appdir) ++ $(verbose) $(INSTALL) -m 644 $< $@ ++ + $(appdir)/%: $(appconf)/% + @mkdir -p $(appdir) + $(verbose) $(INSTALL) -m 644 $< $@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.4.2/Rules.modular +--- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 ++++ serefpolicy-3.4.2/Rules.modular 2008-07-02 08:47:05.000000000 -0400 +@@ -73,8 +73,8 @@ + $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te + @echo "Compliling $(NAME) $(@F) module" + @test -d $(tmpdir) || mkdir -p $(tmpdir) +- $(call perrole-expansion,$(basename $(@F)),$@.role) +- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) ++# $(call perrole-expansion,$(basename $(@F)),$@.role) ++ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) + $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ + + $(tmpdir)/%.mod.fc: $(m4support) %.fc +@@ -129,7 +129,7 @@ + @test -d $(tmpdir) || mkdir -p $(tmpdir) + # define all available object classes + $(verbose) $(genperm) $(avs) $(secclass) > $@ +- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) ++# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) + $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true + + $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy +@@ -146,7 +146,7 @@ + $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/rolemap.conf: $(rolemap) + $(verbose) echo "" > $@ +- $(call parse-rolemap,base,$@) ++# $(call parse-rolemap,base,$@) + + $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.4.2/config/appconfig-mcs/failsafe_context ---- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-05-29 15:57:54.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/failsafe_context 2008-07-01 09:49:52.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:25:09.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/failsafe_context 2008-07-02 08:47:04.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mcs/guest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/guest_u_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/root_default_contexts ---- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-05-29 15:57:54.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/root_default_contexts 2008-07-01 09:49:52.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/root_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -29,8 +108,8 @@ -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.4.2/config/appconfig-mcs/seusers ---- nsaserefpolicy/config/appconfig-mcs/seusers 2008-05-29 15:57:54.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/seusers 2008-07-01 09:49:52.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/seusers 2008-06-12 23:25:09.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/seusers 2008-07-02 08:47:04.000000000 -0400 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh @@ -38,7 +117,7 @@ +__default__:unconfined_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 @@ -50,14 +129,14 @@ +system_r:unconfined_t:s0 unconfined_r:unconfined_t:s0 +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.4.2/config/appconfig-mcs/userhelper_context ---- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-05-29 15:57:54.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-mcs/userhelper_context 2008-07-01 09:49:52.000000000 -0400 +--- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:25:09.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/userhelper_context 2008-07-02 08:47:04.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.4.2/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mcs/xguest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mcs/xguest_u_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -66,7 +145,7 @@ +system_r:xdm_t xguest_r:xguest_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.4.2/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-mls/guest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-mls/guest_u_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -74,15 +153,15 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.4.2/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-standard/guest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-standard/guest_u_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t +system_r:sshd_t guest_r:guest_t +system_r:crond_t guest_r:guest_crond_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.4.2/config/appconfig-standard/root_default_contexts ---- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-05-29 15:57:54.000000000 -0400 -+++ serefpolicy-3.4.2/config/appconfig-standard/root_default_contexts 2008-07-01 09:49:52.000000000 -0400 +--- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-standard/root_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -98,63 +177,16 @@ +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.4.2/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/config/appconfig-standard/xguest_u_default_contexts 2008-07-01 09:49:52.000000000 -0400 ++++ serefpolicy-3.4.2/config/appconfig-standard/xguest_u_default_contexts 2008-07-02 08:47:04.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t +system_r:sshd_t xguest_r:xguest_t +system_r:crond_t xguest_r:xguest_crond_t +system_r:xdm_t xguest_r:xguest_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.4.2/Makefile ---- nsaserefpolicy/Makefile 2008-05-29 15:57:55.000000000 -0400 -+++ serefpolicy-3.4.2/Makefile 2008-07-01 09:49:52.000000000 -0400 -@@ -311,20 +311,22 @@ - - # parse-rolemap modulename,outputfile - define parse-rolemap -- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ -- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 [...5696 lines suppressed...] +--- nsaserefpolicy/policy/modules/system/udev.te 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/udev.te 2008-07-02 08:47:05.000000000 -0400 @@ -83,6 +83,7 @@ kernel_rw_unix_dgram_sockets(udev_t) kernel_dgram_send(udev_t) @@ -32607,8 +32673,8 @@ xserver_read_xdm_pid(udev_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.4.2/policy/modules/system/unconfined.fc ---- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-05-29 15:57:51.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/unconfined.fc 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/unconfined.fc 2008-07-02 08:47:05.000000000 -0400 @@ -2,15 +2,28 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -32644,8 +32710,8 @@ + +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.4.2/policy/modules/system/unconfined.if ---- nsaserefpolicy/policy/modules/system/unconfined.if 2008-06-11 08:15:46.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/unconfined.if 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/unconfined.if 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/unconfined.if 2008-07-02 08:47:05.000000000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -33022,8 +33088,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.4.2/policy/modules/system/unconfined.te ---- nsaserefpolicy/policy/modules/system/unconfined.te 2008-06-11 08:15:46.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/unconfined.te 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/unconfined.te 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/unconfined.te 2008-07-02 08:47:05.000000000 -0400 @@ -1,40 +1,79 @@ -policy_module(unconfined, 2.2.2) @@ -33361,8 +33427,8 @@ +rpm_transition_script(unconfined_notrans_t) +domain_ptrace_all_domains(unconfined_notrans_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.4.2/policy/modules/system/userdomain.fc ---- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-05-29 15:57:51.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/userdomain.fc 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/userdomain.fc 2008-07-02 08:47:05.000000000 -0400 @@ -1,4 +1,5 @@ -HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) -HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) @@ -33374,8 +33440,8 @@ +/tmp/gconfd-USER -d gen_context(system_u:object_r:user_tmp_t,s0) +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.4.2/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-11 08:15:46.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/userdomain.if 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/userdomain.if 2008-07-02 08:47:05.000000000 -0400 @@ -28,10 +28,14 @@ class context contains; ') @@ -36133,8 +36199,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.4.2/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2008-06-11 08:15:46.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/userdomain.te 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/userdomain.te 2008-07-02 08:47:05.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -36251,7 +36317,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.fc serefpolicy-3.4.2/policy/modules/system/virt.fc --- nsaserefpolicy/policy/modules/system/virt.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/policy/modules/system/virt.fc 2008-07-01 09:49:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/virt.fc 2008-07-02 08:47:05.000000000 -0400 @@ -0,0 +1,13 @@ + +/usr/sbin/libvirtd -- gen_context(system_u:object_r:virtd_exec_t,s0) @@ -36268,7 +36334,7 @@ +/etc/libvirt/.*/.* gen_context(system_u:object_r:virt_etc_rw_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.if serefpolicy-3.4.2/policy/modules/system/virt.if --- nsaserefpolicy/policy/modules/system/virt.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/policy/modules/system/virt.if 2008-07-01 09:49:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/virt.if 2008-07-02 08:47:05.000000000 -0400 @@ -0,0 +1,324 @@ + +## policy for virt @@ -36596,7 +36662,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.4.2/policy/modules/system/virt.te --- nsaserefpolicy/policy/modules/system/virt.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.4.2/policy/modules/system/virt.te 2008-07-01 09:49:53.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/virt.te 2008-07-02 08:47:05.000000000 -0400 @@ -0,0 +1,203 @@ + +policy_module(virt,1.0.0) @@ -36802,8 +36868,8 @@ + unconfined_domain(virtd_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.4.2/policy/modules/system/xen.fc ---- nsaserefpolicy/policy/modules/system/xen.fc 2008-05-29 15:57:51.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/xen.fc 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/xen.fc 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/xen.fc 2008-07-02 08:47:05.000000000 -0400 @@ -20,6 +20,7 @@ /var/run/xenconsoled\.pid -- gen_context(system_u:object_r:xenconsoled_var_run_t,s0) /var/run/xend(/.*)? gen_context(system_u:object_r:xend_var_run_t,s0) @@ -36813,8 +36879,8 @@ /var/run/xenstored(/.*)? gen_context(system_u:object_r:xenstored_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.4.2/policy/modules/system/xen.if ---- nsaserefpolicy/policy/modules/system/xen.if 2008-05-29 15:57:51.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/xen.if 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/xen.if 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/xen.if 2008-07-02 08:47:05.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -36857,8 +36923,8 @@ + rw_files_pattern($1,xen_image_t,xen_image_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.4.2/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2008-05-29 15:57:51.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/xen.te 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/xen.te 2008-06-12 23:25:07.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/xen.te 2008-07-02 08:47:05.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -37096,8 +37162,8 @@ + unconfined_domain(xend_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.4.2/policy/support/file_patterns.spt ---- nsaserefpolicy/policy/support/file_patterns.spt 2008-05-29 15:57:53.000000000 -0400 -+++ serefpolicy-3.4.2/policy/support/file_patterns.spt 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:25:08.000000000 -0400 ++++ serefpolicy-3.4.2/policy/support/file_patterns.spt 2008-07-02 08:47:05.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -37123,8 +37189,8 @@ + relabelfrom_sock_files_pattern($1,$2,$2) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.4.2/policy/support/obj_perm_sets.spt ---- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-05-29 15:57:53.000000000 -0400 -+++ serefpolicy-3.4.2/policy/support/obj_perm_sets.spt 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:25:08.000000000 -0400 ++++ serefpolicy-3.4.2/policy/support/obj_perm_sets.spt 2008-07-02 08:47:05.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -37140,8 +37206,8 @@ + +define(`manage_key_perms', `{ create link read search setattr view write } ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.4.2/policy/users ---- nsaserefpolicy/policy/users 2008-05-29 15:57:53.000000000 -0400 -+++ serefpolicy-3.4.2/policy/users 2008-07-01 09:49:53.000000000 -0400 +--- nsaserefpolicy/policy/users 2008-06-12 23:25:08.000000000 -0400 ++++ serefpolicy-3.4.2/policy/users 2008-07-02 08:47:05.000000000 -0400 @@ -31,11 +31,8 @@ # permit any access to such users, then remove this entry. # @@ -37166,35 +37232,3 @@ - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -') +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.4.2/Rules.modular ---- nsaserefpolicy/Rules.modular 2008-05-29 15:57:55.000000000 -0400 -+++ serefpolicy-3.4.2/Rules.modular 2008-07-01 09:49:52.000000000 -0400 -@@ -73,8 +73,8 @@ - $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te - @echo "Compliling $(NAME) $(@F) module" - @test -d $(tmpdir) || mkdir -p $(tmpdir) -- $(call perrole-expansion,$(basename $(@F)),$@.role) -- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) -+# $(call perrole-expansion,$(basename $(@F)),$@.role) -+ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) - $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ - - $(tmpdir)/%.mod.fc: $(m4support) %.fc -@@ -129,7 +129,7 @@ - @test -d $(tmpdir) || mkdir -p $(tmpdir) - # define all available object classes - $(verbose) $(genperm) $(avs) $(secclass) > $@ -- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) -+# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) - $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true - - $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy -@@ -146,7 +146,7 @@ - $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/rolemap.conf: $(rolemap) - $(verbose) echo "" > $@ -- $(call parse-rolemap,base,$@) -+# $(call parse-rolemap,base,$@) - - $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.678 retrieving revision 1.679 diff -u -r1.678 -r1.679 --- selinux-policy.spec 30 Jun 2008 20:52:56 -0000 1.678 +++ selinux-policy.spec 2 Jul 2008 20:45:43 -0000 1.679 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.4.2 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -375,6 +375,9 @@ %endif %changelog +* Wed Jul 2 2008 Dan Walsh 3.4.2-10 +- Allow all system domains and application domains to append to any log file + * Sun Jun 29 2008 Dan Walsh 3.4.2-9 - Allow gdm to read rpm database - Allow nsplugin to read mplayer config files From fedora-extras-commits at redhat.com Wed Jul 2 20:52:31 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Wed, 2 Jul 2008 20:52:31 GMT Subject: rpms/perl-Lingua-Preferred/F-9 perl-Lingua-Preferred.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807022052.m62KqVMa013334@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Lingua-Preferred/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13293 Modified Files: sources Added Files: perl-Lingua-Preferred.spec Log Message: Initial import for F-9 --- NEW FILE perl-Lingua-Preferred.spec --- Name: perl-Lingua-Preferred Version: 0.2.4 Release: 2%{?dist} Summary: Perl extension to choose a language Group: Development/Libraries License: GPLv2+ or Artistic URL: http://search.cpan.org/dist/Lingua-Preferred/ Source0: http://search.cpan.org/CPAN/authors/id/E/ED/EDAVIS/Lingua-Preferred-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Correct for lots of packages, other common choices include eg. Module::Build BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Many web browsers let you specify which languages you understand. Then they negotiate with the web server to get documents in the best language possible. This is something similar in Perl. %prep %setup -q -n Lingua-Preferred-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Lingua %{perl_vendorlib}/auto/Lingua %{_mandir}/man3/*.3* %changelog * Thu May 1 2008 kwizart < kwizart at gmail.com > - 0.2.4-2 - Fix directory listed twice. * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 0.2.4-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Lingua-Preferred/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jun 2008 14:48:24 -0000 1.1 +++ sources 2 Jul 2008 20:51:37 -0000 1.2 @@ -0,0 +1 @@ +37e883fafb05b1439de1121f41e8ad75 Lingua-Preferred-0.2.4.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 20:54:20 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 20:54:20 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.215, 1.216 selinux-policy.spec, 1.637, 1.638 Message-ID: <200807022054.m62KsKdV013436@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13400 Modified Files: policy-20070703.patch selinux-policy.spec Log Message: * Wed Jul 2 2008 Dan Walsh 3.0.8-111 - Handle updated NetworkManager policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- policy-20070703.patch 16 Jun 2008 10:29:22 -0000 1.215 +++ policy-20070703.patch 2 Jul 2008 20:53:30 -0000 1.216 @@ -1050,6 +1050,17 @@ + hal_use_fds(alsa_t) + hal_write_log(alsa_t) +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-3.0.8/policy/modules/admin/amanda.fc +--- nsaserefpolicy/policy/modules/admin/amanda.fc 2008-06-12 23:37:55.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/admin/amanda.fc 2008-06-22 06:34:09.000000000 -0400 +@@ -3,6 +3,7 @@ + /etc/amanda/.*/tapelist(/.*)? gen_context(system_u:object_r:amanda_data_t,s0) + /etc/amandates gen_context(system_u:object_r:amanda_amandates_t,s0) + /etc/dumpdates gen_context(system_u:object_r:amanda_dumpdates_t,s0) ++/etc/amanda/.*/index(/.*)? gen_context(system_u:object_r:amanda_data_t,s0) + + /root/restore -d gen_context(system_u:object_r:amanda_recover_dir_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-3.0.8/policy/modules/admin/amanda.if --- nsaserefpolicy/policy/modules/admin/amanda.if 2008-06-12 23:37:55.000000000 -0400 +++ serefpolicy-3.0.8/policy/modules/admin/amanda.if 2008-06-12 23:37:59.000000000 -0400 @@ -5932,7 +5943,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.8/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2008-06-12 23:37:56.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if 2008-06-12 23:37:59.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if 2008-06-22 06:45:05.000000000 -0400 @@ -271,45 +271,6 @@ ######################################## @@ -6121,6 +6132,15 @@ ## Search inotifyfs filesystem. ## ## +@@ -1625,7 +1705,7 @@ + type nfs_t; + ') + +- dontaudit $1 nfs_t:file { read write }; ++ dontaudit $1 nfs_t:file rw_file_perms; + ') + + ######################################## @@ -2139,6 +2219,7 @@ rw_files_pattern($1,nfsd_fs_t,nfsd_fs_t) ') @@ -8102,7 +8122,7 @@ +/var/named/chroot/var/log/named.* -- gen_context(system_u:object_r:named_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.0.8/policy/modules/services/bind.te --- nsaserefpolicy/policy/modules/services/bind.te 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/bind.te 2008-06-12 23:37:59.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/services/bind.te 2008-06-22 07:35:58.000000000 -0400 @@ -66,7 +66,6 @@ allow named_t self:unix_dgram_socket create_socket_perms; allow named_t self:tcp_socket create_stream_socket_perms; @@ -8120,7 +8140,15 @@ corenet_all_recvfrom_unlabeled(named_t) corenet_all_recvfrom_netlabel(named_t) corenet_tcp_sendrecv_all_if(named_t) -@@ -119,15 +120,11 @@ +@@ -112,22 +113,18 @@ + corenet_tcp_bind_all_nodes(named_t) + corenet_udp_bind_all_nodes(named_t) + corenet_tcp_bind_dns_port(named_t) +-corenet_udp_bind_dns_port(named_t) ++corenet_udp_bind_all_ports(named_t) + corenet_tcp_bind_rndc_port(named_t) + corenet_tcp_connect_all_ports(named_t) + corenet_sendrecv_dns_server_packets(named_t) corenet_sendrecv_dns_client_packets(named_t) corenet_sendrecv_rndc_server_packets(named_t) corenet_sendrecv_rndc_client_packets(named_t) @@ -8693,7 +8721,7 @@ +/var/lib/misc(/.*)? gen_context(system_u:object_r:system_crond_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.0.8/policy/modules/services/cron.if --- nsaserefpolicy/policy/modules/services/cron.if 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/cron.if 2008-06-12 23:37:58.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/services/cron.if 2008-07-02 15:53:34.000000000 -0400 @@ -35,6 +35,7 @@ # template(`cron_per_role_template',` @@ -8849,6 +8877,29 @@ ## Read, and write cron daemon TCP sockets. ## ## +@@ -583,3 +586,22 @@ + + dontaudit $1 system_crond_tmp_t:file append; + ') ++ ++######################################## ++## ++## Read temporary files from the system cron jobs. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`cron_read_system_job_lib_files',` ++ gen_require(` ++ type system_crond_var_lib_t; ++ ') ++ ++ ++ read_files_pattern($1, system_crond_var_lib_t, system_crond_var_lib_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.8/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2008-06-12 23:37:57.000000000 -0400 +++ serefpolicy-3.0.8/policy/modules/services/cron.te 2008-06-12 23:37:58.000000000 -0400 @@ -12735,7 +12786,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te 2008-06-12 23:37:58.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te 2008-07-02 15:53:02.000000000 -0400 @@ -1,5 +1,5 @@ -policy_module(networkmanager,1.7.1) @@ -12762,10 +12813,10 @@ # networkmanager will ptrace itself if gdb is installed # and it receives a unexpected signal (rh bug #204161) -allow NetworkManager_t self:capability { kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock }; -+allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_nice dac_override net_admin net_raw ipc_lock }; ++allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock }; dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace }; -allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms }; -+allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched signal_perms }; ++allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched setsched signal_perms }; allow NetworkManager_t self:fifo_file rw_fifo_file_perms; allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms }; allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms; @@ -12796,8 +12847,13 @@ mls_file_read_all_levels(NetworkManager_t) -@@ -84,8 +97,11 @@ +@@ -82,10 +95,16 @@ + files_read_etc_files(NetworkManager_t) + files_read_etc_runtime_files(NetworkManager_t) files_read_usr_files(NetworkManager_t) ++files_list_tmp(NetworkManager_t) ++ ++storage_getattr_fixed_disk_dev(NetworkManager_t) init_read_utmp(NetworkManager_t) +init_dontaudit_write_utmp(NetworkManager_t) @@ -12808,15 +12864,17 @@ libs_use_ld_so(NetworkManager_t) libs_use_shared_libs(NetworkManager_t) -@@ -113,6 +129,7 @@ +@@ -113,6 +132,9 @@ userdom_dontaudit_use_unpriv_users_ttys(NetworkManager_t) # Read gnome-keyring userdom_read_unpriv_users_home_content_files(NetworkManager_t) +userdom_unpriv_users_stream_connect(NetworkManager_t) ++ ++cron_read_system_job_lib_files(NetworkManager_t) optional_policy(` bind_domtrans(NetworkManager_t) -@@ -129,28 +146,22 @@ +@@ -129,28 +151,22 @@ ') optional_policy(` @@ -12851,7 +12909,7 @@ ') optional_policy(` -@@ -162,19 +173,20 @@ +@@ -162,19 +178,20 @@ ppp_domtrans(NetworkManager_t) ppp_read_pid_files(NetworkManager_t) ppp_signal(NetworkManager_t) @@ -18719,7 +18777,7 @@ +/var/cache/coolkey(/.*)? gen_context(system_u:object_r:auth_cache_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if 2008-06-12 23:37:59.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if 2008-06-22 06:46:13.000000000 -0400 @@ -26,7 +26,8 @@ type $1_chkpwd_t, can_read_shadow_passwords; application_domain($1_chkpwd_t,chkpwd_exec_t) @@ -19178,7 +19236,13 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te 2008-06-12 23:37:59.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te 2008-06-22 06:47:13.000000000 -0400 +@@ -1,4 +1,4 @@ +- ++ + policy_module(authlogin,1.7.1) + + ######################################## @@ -9,6 +9,13 @@ attribute can_read_shadow_passwords; attribute can_write_shadow_passwords; @@ -19214,7 +19278,7 @@ ######################################## # # PAM local policy -@@ -94,36 +108,38 @@ +@@ -94,36 +108,39 @@ allow pam_t pam_tmp_t:file manage_file_perms; files_tmp_filetrans(pam_t, pam_tmp_t, { file dir }) @@ -19247,6 +19311,7 @@ +userdom_dontaudit_write_user_home_content_files(user, pam_t) +userdom_append_unpriv_users_home_content_files(pam_t) +userdom_dontaudit_read_user_tmp_files(user, pam_t) ++userdom_dontaudit_write_user_home_content_files(unconfined, pam_t) optional_policy(` locallogin_use_fds(pam_t) @@ -19263,7 +19328,7 @@ ######################################## # # PAM console local policy -@@ -149,6 +165,8 @@ +@@ -149,6 +166,8 @@ dev_setattr_apm_bios_dev(pam_console_t) dev_getattr_dri_dev(pam_console_t) dev_setattr_dri_dev(pam_console_t) @@ -19272,7 +19337,7 @@ dev_getattr_framebuffer_dev(pam_console_t) dev_setattr_framebuffer_dev(pam_console_t) dev_getattr_generic_usb_dev(pam_console_t) -@@ -159,6 +177,8 @@ +@@ -159,6 +178,8 @@ dev_setattr_mouse_dev(pam_console_t) dev_getattr_power_mgmt_dev(pam_console_t) dev_setattr_power_mgmt_dev(pam_console_t) @@ -19281,7 +19346,7 @@ dev_getattr_scanner_dev(pam_console_t) dev_setattr_scanner_dev(pam_console_t) dev_getattr_sound_dev(pam_console_t) -@@ -168,6 +188,8 @@ +@@ -168,6 +189,8 @@ dev_getattr_xserver_misc_dev(pam_console_t) dev_setattr_xserver_misc_dev(pam_console_t) dev_read_urand(pam_console_t) @@ -19290,7 +19355,7 @@ mls_file_read_all_levels(pam_console_t) mls_file_write_all_levels(pam_console_t) -@@ -200,6 +222,7 @@ +@@ -200,6 +223,7 @@ fs_list_auto_mountpoints(pam_console_t) fs_list_noxattr_fs(pam_console_t) @@ -19298,7 +19363,7 @@ init_use_fds(pam_console_t) init_use_script_ptys(pam_console_t) -@@ -236,7 +259,7 @@ +@@ -236,7 +260,7 @@ optional_policy(` xserver_read_xdm_pid(pam_console_t) @@ -19307,7 +19372,7 @@ ') ######################################## -@@ -256,6 +279,7 @@ +@@ -256,6 +280,7 @@ userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t) userdom_dontaudit_use_unpriv_users_ptys(system_chkpwd_t) userdom_dontaudit_use_sysadm_terms(system_chkpwd_t) @@ -19315,7 +19380,7 @@ ######################################## # -@@ -302,3 +326,31 @@ +@@ -302,3 +327,31 @@ xserver_use_xdm_fds(utempter_t) xserver_rw_xdm_pipes(utempter_t) ') @@ -23379,7 +23444,7 @@ /tmp/gconfd-USER -d gen_context(system_u:object_r:ROLE_tmp_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if 2008-06-12 23:37:59.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if 2008-06-27 07:07:05.000000000 -0400 @@ -29,8 +29,9 @@ ') @@ -24684,7 +24749,16 @@ ') ######################################## -@@ -4895,7 +5111,7 @@ +@@ -4670,6 +4886,8 @@ + ') + + dontaudit $1 { home_dir_type home_type }:dir search_dir_perms; ++ fs_dontaudit_list_nfs($1) ++ fs_dontaudit_list_cifs($1) + ') + + ######################################## +@@ -4895,7 +5113,7 @@ type user_home_dir_t, user_home_t; ') @@ -24693,7 +24767,7 @@ filetrans_pattern($1,user_home_dir_t,user_home_t,$2) ') -@@ -4933,7 +5149,7 @@ +@@ -4933,7 +5151,7 @@ type user_home_dir_t; ') @@ -24702,7 +24776,7 @@ allow $1 user_home_dir_t:dir manage_dir_perms; ') -@@ -4954,7 +5170,7 @@ +@@ -4954,7 +5172,7 @@ type user_home_t; ') @@ -24711,7 +24785,7 @@ manage_dirs_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -4973,7 +5189,7 @@ +@@ -4973,7 +5191,7 @@ type staff_home_dir_t; ') @@ -24720,7 +24794,7 @@ allow $1 user_home_dir_t:dir relabelto; ') -@@ -4992,7 +5208,7 @@ +@@ -4992,7 +5210,7 @@ type user_home_t, user_home_dir_t; ') @@ -24729,7 +24803,7 @@ allow $1 user_home_t:dir list_dir_perms; read_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5013,7 +5229,7 @@ +@@ -5013,7 +5231,7 @@ type user_home_t; ') @@ -24738,7 +24812,7 @@ allow $1 user_home_t:file execute; ') -@@ -5033,7 +5249,7 @@ +@@ -5033,7 +5251,7 @@ type user_home_dir_t, user_home_t; ') @@ -24747,7 +24821,7 @@ manage_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5072,7 +5288,7 @@ +@@ -5072,7 +5290,7 @@ type user_home_t; ') @@ -24756,7 +24830,7 @@ manage_lnk_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5092,7 +5308,7 @@ +@@ -5092,7 +5310,7 @@ type user_home_t; ') @@ -24765,7 +24839,7 @@ manage_fifo_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5112,7 +5328,7 @@ +@@ -5112,7 +5330,7 @@ type user_home_t; ') @@ -24774,7 +24848,7 @@ manage_sock_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5131,7 +5347,7 @@ +@@ -5131,7 +5349,7 @@ attribute user_home_dir_type; ') @@ -24783,7 +24857,7 @@ allow $1 user_home_dir_type:dir search_dir_perms; ') -@@ -5151,7 +5367,7 @@ +@@ -5151,7 +5369,7 @@ attribute user_home_dir_type, user_home_type; ') @@ -24792,7 +24866,7 @@ allow $1 user_home_type:dir list_dir_perms; read_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) read_lnk_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) -@@ -5173,7 +5389,7 @@ +@@ -5173,7 +5391,7 @@ attribute user_home_dir_type, user_home_type; ') @@ -24801,7 +24875,7 @@ manage_dirs_pattern($1,{ user_home_dir_type user_home_type },user_home_type) ') -@@ -5193,7 +5409,7 @@ +@@ -5193,7 +5411,7 @@ attribute user_home_dir_type, user_home_type; ') @@ -24810,7 +24884,7 @@ manage_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) ') -@@ -5323,7 +5539,7 @@ +@@ -5323,7 +5541,7 @@ attribute user_tmpfile; ') @@ -24819,7 +24893,7 @@ ') ######################################## -@@ -5346,6 +5562,25 @@ +@@ -5346,6 +5564,25 @@ ######################################## ## @@ -24845,7 +24919,7 @@ ## Write all unprivileged users files in /tmp ## ## -@@ -5529,6 +5764,24 @@ +@@ -5529,6 +5766,24 @@ ######################################## ## @@ -24870,7 +24944,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5559,3 +5812,420 @@ +@@ -5559,3 +5814,420 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v retrieving revision 1.637 retrieving revision 1.638 diff -u -r1.637 -r1.638 --- selinux-policy.spec 29 May 2008 20:18:38 -0000 1.637 +++ selinux-policy.spec 2 Jul 2008 20:53:30 -0000 1.638 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.0.8 -Release: 109%{?dist} +Release: 111%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -381,6 +381,12 @@ %endif %changelog +* Wed Jul 2 2008 Dan Walsh 3.0.8-111 +- Handle updated NetworkManager + +* Mon Jun 18 2008 Dan Walsh 3.0.8-110 +- Add cxoffice homedir context + * Thu May 29 2008 Dan Walsh 3.0.8-109 - Remove extra context for dbus From fedora-extras-commits at redhat.com Wed Jul 2 21:02:04 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Wed, 2 Jul 2008 21:02:04 GMT Subject: rpms/perl-Lingua-Preferred/F-8 perl-Lingua-Preferred.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807022102.m62L246Q020126@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Lingua-Preferred/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18479 Modified Files: sources Added Files: perl-Lingua-Preferred.spec Log Message: -initial import for F-8 --- NEW FILE perl-Lingua-Preferred.spec --- Name: perl-Lingua-Preferred Version: 0.2.4 Release: 2%{?dist} Summary: Perl extension to choose a language Group: Development/Libraries License: GPLv2+ or Artistic URL: http://search.cpan.org/dist/Lingua-Preferred/ Source0: http://search.cpan.org/CPAN/authors/id/E/ED/EDAVIS/Lingua-Preferred-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Correct for lots of packages, other common choices include eg. Module::Build BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Many web browsers let you specify which languages you understand. Then they negotiate with the web server to get documents in the best language possible. This is something similar in Perl. %prep %setup -q -n Lingua-Preferred-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Lingua %{perl_vendorlib}/auto/Lingua %{_mandir}/man3/*.3* %changelog * Thu May 1 2008 kwizart < kwizart at gmail.com > - 0.2.4-2 - Fix directory listed twice. * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 0.2.4-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Lingua-Preferred/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jun 2008 14:48:24 -0000 1.1 +++ sources 2 Jul 2008 21:01:19 -0000 1.2 @@ -0,0 +1 @@ +37e883fafb05b1439de1121f41e8ad75 Lingua-Preferred-0.2.4.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 21:07:11 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 21:07:11 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.186,1.187 Message-ID: <200807022107.m62L7B5h020442@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20405 Modified Files: policy-20071130.patch Log Message: * Tue Jul 2 2008 Dan Walsh 3.3.1-75 - Fix transition from unconfined_t to dhcpc_t - Allow all system domains and application domains to append to any log file - allow sendmail to use courier_spool fifo files policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- policy-20071130.patch 2 Jul 2008 20:45:03 -0000 1.186 +++ policy-20071130.patch 2 Jul 2008 21:06:26 -0000 1.187 @@ -26967,7 +26967,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-07-02 13:18:33.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-07-02 17:02:50.000000000 -0400 @@ -12,9 +12,15 @@ ## ## @@ -27957,7 +27957,7 @@ + xserver_read_xdm_tmp_files($3) + + # X object manager -+ xserver_common_x_domain_template($1,$1,$2) ++ xserver_common_x_domain_template($1,$1,$3) + + userdom_search_user_home_dirs($1,$3) + userdom_manage_user_home_content_dirs($1, xdm_t) From fedora-extras-commits at redhat.com Wed Jul 2 20:45:52 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 20:45:52 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.185, 1.186 selinux-policy.spec, 1.692, 1.693 Message-ID: <200807022045.m62KjqMG013074@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12989 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Tue Jul 2 2008 Dan Walsh 3.3.1-75 - Fix transition from unconfined_t to dhcpc_t - Allow all system domains and application domains to append to any log file - allow sendmail to use courier_spool fifo files policy-20071130.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.185 -r 1.186 policy-20071130.patch Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- policy-20071130.patch 1 Jul 2008 13:40:13 -0000 1.185 +++ policy-20071130.patch 2 Jul 2008 20:45:03 -0000 1.186 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.3.1/Changelog --- nsaserefpolicy/Changelog 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Changelog 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/Changelog 2008-07-02 08:47:10.000000000 -0400 @@ -1,6 +1,3 @@ -- Pam and samba updates from Stefan Schulze Frielinghaus. -- Backup update on Debian from Vaclav Ovsik. @@ -10,7 +10,7 @@ - Labeled networking peer object class updates. diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile --- nsaserefpolicy/Makefile 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Makefile 2008-06-12 23:38:02.000000000 -0400 ++++ serefpolicy-3.3.1/Makefile 2008-07-02 08:47:10.000000000 -0400 @@ -235,7 +235,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -66,7 +66,7 @@ $(verbose) $(INSTALL) -m 644 $< $@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular --- nsaserefpolicy/Rules.modular 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Rules.modular 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/Rules.modular 2008-07-02 08:47:10.000000000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -98,7 +98,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.3.1/Rules.monolithic --- nsaserefpolicy/Rules.monolithic 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Rules.monolithic 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/Rules.monolithic 2008-07-02 08:47:10.000000000 -0400 @@ -96,7 +96,7 @@ # # Load the binary policy @@ -110,13 +110,13 @@ @touch $(tmpdir)/load diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context 2008-07-02 08:47:10.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -124,7 +124,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -140,7 +140,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.3.1/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/seusers 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/seusers 2008-07-02 08:47:10.000000000 -0400 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh @@ -148,7 +148,7 @@ +__default__:unconfined_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 @@ -161,13 +161,13 @@ +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context 2008-07-02 08:47:10.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_contexts serefpolicy-3.3.1/config/appconfig-mcs/x_contexts --- nsaserefpolicy/config/appconfig-mcs/x_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,188 @@ +# +# Config file for XSELinux extension @@ -359,7 +359,7 @@ +event * system_u:object_r:default_xevent_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -368,7 +368,7 @@ +system_r:xdm_t xguest_r:xguest_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -376,7 +376,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.1/config/appconfig-mls/x_contexts --- nsaserefpolicy/config/appconfig-mls/x_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,188 @@ +# +# Config file for XSELinux extension @@ -568,7 +568,7 @@ +event * system_u:object_r:default_xevent_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t @@ -576,7 +576,7 @@ +system_r:crond_t guest_r:guest_crond_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -592,7 +592,7 @@ +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.1/config/appconfig-standard/x_contexts --- nsaserefpolicy/config/appconfig-standard/x_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,188 @@ +# +# Config file for XSELinux extension @@ -784,7 +784,7 @@ +event * system_u:object_r:default_xevent_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts 2008-06-12 23:38:05.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t @@ -793,7 +793,7 @@ +system_r:xdm_t xguest_r:xguest_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.3.1/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8 2008-07-02 08:47:10.000000000 -0400 @@ -35,10 +35,6 @@ directorories, you need to set the ftp_home_dir boolean. .TP @@ -807,7 +807,7 @@ .TP diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.3.1/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/man/man8/httpd_selinux.8 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/man/man8/httpd_selinux.8 2008-07-02 08:47:10.000000000 -0400 @@ -22,23 +22,19 @@ .EX httpd_sys_content_t @@ -839,7 +839,7 @@ .EE diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.3.1/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/flask/access_vectors 2008-06-12 23:38:02.000000000 -0400 ++++ serefpolicy-3.3.1/policy/flask/access_vectors 2008-07-02 08:47:10.000000000 -0400 @@ -407,141 +407,159 @@ # # SE-X Windows stuff @@ -1074,7 +1074,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-3.3.1/policy/flask/security_classes --- nsaserefpolicy/policy/flask/security_classes 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/flask/security_classes 2008-06-12 23:38:02.000000000 -0400 ++++ serefpolicy-3.3.1/policy/flask/security_classes 2008-07-02 08:47:10.000000000 -0400 @@ -50,21 +50,19 @@ # passwd/chfn/chsh [...4633 lines suppressed...] +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.fc serefpolicy-3.3.1/policy/modules/users/auditadm.fc --- nsaserefpolicy/policy/modules/users/auditadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No auditadm file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.if serefpolicy-3.3.1/policy/modules/users/auditadm.if --- nsaserefpolicy/policy/modules/users/auditadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/auditadm.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/auditadm.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for auditadm user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.te serefpolicy-3.3.1/policy/modules/users/auditadm.te --- nsaserefpolicy/policy/modules/users/auditadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/auditadm.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/auditadm.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,25 @@ +policy_module(auditadm,1.0.1) +gen_require(` @@ -38586,17 +38627,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.3.1/policy/modules/users/guest.fc --- nsaserefpolicy/policy/modules/users/guest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/guest.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/guest.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No guest file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.3.1/policy/modules/users/guest.if --- nsaserefpolicy/policy/modules/users/guest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/guest.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/guest.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for guest user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.3.1/policy/modules/users/guest.te --- nsaserefpolicy/policy/modules/users/guest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,21 @@ +policy_module(guest,1.0.1) +userdom_restricted_user_template(guest) @@ -38621,17 +38662,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.3.1/policy/modules/users/logadm.fc --- nsaserefpolicy/policy/modules/users/logadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No logadm file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.3.1/policy/modules/users/logadm.if --- nsaserefpolicy/policy/modules/users/logadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/logadm.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/logadm.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for logadm user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.3.1/policy/modules/users/logadm.te --- nsaserefpolicy/policy/modules/users/logadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/logadm.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/logadm.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,11 @@ +policy_module(logadm,1.0.0) + @@ -38646,22 +38687,22 @@ +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t }) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.3.1/policy/modules/users/metadata.xml --- nsaserefpolicy/policy/modules/users/metadata.xml 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +Policy modules for users diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.1/policy/modules/users/secadm.fc --- nsaserefpolicy/policy/modules/users/secadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No secadm file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.1/policy/modules/users/secadm.if --- nsaserefpolicy/policy/modules/users/secadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/secadm.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/secadm.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for secadm user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.1/policy/modules/users/secadm.te --- nsaserefpolicy/policy/modules/users/secadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/secadm.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/secadm.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,39 @@ +policy_module(secadm,1.0.1) +gen_require(` @@ -38704,17 +38745,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.1/policy/modules/users/staff.fc --- nsaserefpolicy/policy/modules/users/staff.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/staff.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/staff.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No staff file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.1/policy/modules/users/staff.if --- nsaserefpolicy/policy/modules/users/staff.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/staff.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/staff.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for staff user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te --- nsaserefpolicy/policy/modules/users/staff.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,29 @@ +policy_module(staff,1.0.1) +userdom_admin_login_user_template(staff) @@ -38747,17 +38788,17 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.1/policy/modules/users/user.fc --- nsaserefpolicy/policy/modules/users/user.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/user.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/user.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No user file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.1/policy/modules/users/user.if --- nsaserefpolicy/policy/modules/users/user.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/user.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/user.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for user user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te --- nsaserefpolicy/policy/modules/users/user.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,18 @@ +policy_module(user,1.0.1) +userdom_unpriv_user_template(user) @@ -38779,17 +38820,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc --- nsaserefpolicy/policy/modules/users/webadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No webadm file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.1/policy/modules/users/webadm.if --- nsaserefpolicy/policy/modules/users/webadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/webadm.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/webadm.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for webadm user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.3.1/policy/modules/users/webadm.te --- nsaserefpolicy/policy/modules/users/webadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/webadm.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/webadm.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,41 @@ +policy_module(webadm,1.0.0) + @@ -38834,17 +38875,17 @@ +userdom_role_change_template(staff, webadm) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.1/policy/modules/users/xguest.fc --- nsaserefpolicy/policy/modules/users/xguest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +# No xguest file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.1/policy/modules/users/xguest.if --- nsaserefpolicy/policy/modules/users/xguest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/xguest.if 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/xguest.if 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1 @@ +## Policy for xguest user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.1/policy/modules/users/xguest.te --- nsaserefpolicy/policy/modules/users/xguest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-07-02 08:47:11.000000000 -0400 @@ -0,0 +1,66 @@ +policy_module(xguest,1.0.1) + @@ -38914,7 +38955,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-06-12 23:38:02.000000000 -0400 ++++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-07-02 08:47:11.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -38941,7 +38982,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-06-12 23:38:02.000000000 -0400 ++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-07-02 08:47:11.000000000 -0400 @@ -315,3 +315,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -38958,7 +38999,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3.1/policy/users --- nsaserefpolicy/policy/users 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/users 2008-06-12 23:38:04.000000000 -0400 ++++ serefpolicy-3.3.1/policy/users 2008-07-02 08:47:11.000000000 -0400 @@ -16,7 +16,7 @@ # and a user process should never be assigned the system user # identity. Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.692 retrieving revision 1.693 diff -u -r1.692 -r1.693 --- selinux-policy.spec 1 Jul 2008 13:41:47 -0000 1.692 +++ selinux-policy.spec 2 Jul 2008 20:45:03 -0000 1.693 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 74%{?dist} +Release: 75%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -385,6 +385,12 @@ %endif %changelog +* Tue Jul 2 2008 Dan Walsh 3.3.1-75 +- Fix transition from unconfined_t to dhcpc_t +- Allow all system domains and application domains to append to any log file +- allow sendmail to use courier_spool fifo files + + * Tue Jul 1 2008 Dan Walsh 3.3.1-74 - Make virtd an unconfined domain From fedora-extras-commits at redhat.com Wed Jul 2 21:18:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 21:18:02 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-close_when_send.patch, NONE, 1.1 logjam-4.5.3-imageresize.patch, NONE, 1.1 logjam-4.5.3-no_quit_when_docked.patch, NONE, 1.1 logjam-4.5.3-uk.po.patch, NONE, 1.1 logjam.spec, 1.41, 1.42 Message-ID: <200807022118.m62LI2pZ020793@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20681/F-8 Modified Files: logjam.spec Added Files: logjam-4.5.3-close_when_send.patch logjam-4.5.3-imageresize.patch logjam-4.5.3-no_quit_when_docked.patch logjam-4.5.3-uk.po.patch Log Message: Fix the image resize bug, apply all of Andy Shevchenko's enhancements. logjam-4.5.3-close_when_send.patch: --- NEW FILE logjam-4.5.3-close_when_send.patch --- diff -up logjam-4.5.3/src/jam.c.close-when-send logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-18 10:31:30.000000000 +0300 @@ -363,6 +363,10 @@ action_cb(GtkWidget *w, JamWin *jw) { } else { g_warning("action callback, but no default action?\n"); } +#ifdef USE_DOCK + if (conf.options.close_when_send && app.docklet) + gtk_widget_hide(GTK_WIDGET(jw)); +#endif } static void @@ -395,6 +399,10 @@ delete_cb(GtkWidget *w, JamWin *jw) { } else { delete_server_entry(jw); } +#ifdef USE_DOCK + if (conf.options.close_when_send && app.docklet) + gtk_widget_hide(GTK_WIDGET(jw)); +#endif } static void diff -up logjam-4.5.3/src/conf_xml.c.close-when-send logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/conf_xml.c 2008-05-18 09:49:33.000000000 +0300 @@ -183,6 +183,7 @@ parseoptions(Configuration *c, xmlDocPtr READOPTION(autosave) READOPTION(cfautostart) READOPTION(cfusemask) + READOPTION(close_when_send) READOPTION(docklet) READOPTION(start_in_dock) READOPTION(cffloat) @@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt WRITEOPTION(autosave); WRITEOPTION(cfautostart); WRITEOPTION(cfusemask); + WRITEOPTION(close_when_send); WRITEOPTION(docklet); WRITEOPTION(start_in_dock); WRITEOPTION(cffloatraise); diff -up logjam-4.5.3/src/settings.c.close-when-send logjam-4.5.3/src/settings.c --- logjam-4.5.3/src/settings.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/settings.c 2008-05-18 09:56:35.000000000 +0300 @@ -85,6 +85,8 @@ static SettingsWidget settingswidgets[] { "ui_font", &conf.uifont, SW_CUSTOM, N_("Entry display font:") }, #ifndef G_OS_WIN32 + { "ui_close_when_send", &conf.options.close_when_send, + SW_TOGGLE, N_("Close main window after sending") }, { "ui_docklet", &conf.options.docklet, SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") }, { "ui_start_in_dock", &conf.options.start_in_dock, @@ -397,6 +399,10 @@ uisettings(JamWin *jw) { G_CALLBACK(sec_changed_cb), sw); groupedbox_pack(GROUPEDBOX(post), sw_make("ui_defaultsecurity"), FALSE); +#ifdef USE_DOCK + groupedbox_pack(GROUPEDBOX(post), sw_make("ui_close_when_send"), FALSE); +#endif /* USE_DOCK */ + entry = groupedbox_new_with_text(_("Entries")); gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); diff -up logjam-4.5.3/src/conf.h.close-when-send logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/conf.h 2008-05-18 09:52:36.000000000 +0300 @@ -51,6 +51,7 @@ typedef struct { gboolean autosave; gboolean cfautostart; gboolean cfusemask; + gboolean close_when_send; gboolean docklet; gboolean cffloat; gboolean cffloatraise; logjam-4.5.3-imageresize.patch: --- NEW FILE logjam-4.5.3-imageresize.patch --- diff -up logjam-4.5.3/src/network-soup.c.BAD logjam-4.5.3/src/network-soup.c --- logjam-4.5.3/src/network-soup.c.BAD 2008-07-02 17:12:31.000000000 -0400 +++ logjam-4.5.3/src/network-soup.c 2008-07-02 17:13:04.000000000 -0400 @@ -81,7 +81,7 @@ net_post_blocking(const char *url, GSLis *colonpos = ':'; } soup_message_set_request(req, "application/x-www-form-urlencoded", - SOUP_BUFFER_USER_OWNED, post->str, post->len); + SOUP_BUFFER_USER_OWNED, post? post->str : NULL, post? post->len : 0); soup_message_send_request(req, sock, conf.options.useproxy); if (status != SOUP_STATUS_OK) { logjam-4.5.3-no_quit_when_docked.patch: --- NEW FILE logjam-4.5.3-no_quit_when_docked.patch --- diff -up logjam-4.5.3/src/jam.c.no-quit-when-docked logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.no-quit-when-docked 2008-05-18 10:31:30.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-18 10:48:33.000000000 +0300 @@ -765,7 +765,11 @@ jam_quit(JamWin *jw) { static gboolean delete_event_cb(JamWin *jw) { +#ifdef USE_DOCK + gtk_widget_hide(GTK_WIDGET(jw)); +#else jam_quit(jw); +#endif return TRUE; /* don't ever let this delete the window; quit will do it. */ } logjam-4.5.3-uk.po.patch: --- NEW FILE logjam-4.5.3-uk.po.patch --- diff -up logjam-4.5.3/po/uk_UA.po.orig logjam-4.5.3/po/uk_UA.po --- logjam-4.5.3/po/uk_UA.po.orig 2005-08-25 05:42:14.000000000 +0300 +++ logjam-4.5.3/po/uk_UA.po 2008-05-18 10:53:43.000000000 +0300 @@ -662,7 +662,7 @@ msgstr "/??_??????????" #: ../src/friends.c:252 msgid "/Tools/Hide _Statistics" -msgstr "/????????????/???????????????? _????????????????????" +msgstr "/????????????/?????????????? _????????????????????" #: ../src/friends.c:253 msgid "/Tools/Export..." Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- logjam.spec 13 May 2008 14:55:43 -0000 1.41 +++ logjam.spec 2 Jul 2008 21:16:57 -0000 1.42 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel BuildRequires: libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel -BuildRequires: autoconf, automake, intltool, libtool +BuildRequires: autoconf, automake, libtool, intltool, popt-devel Obsoletes: loserjabber, logjam-gnome BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: logjam-4.4.1-backdated.patch @@ -28,11 +28,16 @@ Patch8: logjam-4.5.3-gtkspell.patch Patch9: http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff Patch10: logjam-4.5.3-rhythmbox-fix.patch +Patch11: logjam-libsoup24.diff Patch12: logjam-4.5.3-disable-threads.patch Patch13: logjam-title.patch Patch14: logjam-4.5.3-tags.patch Patch15: logjam-4.5.3-default-spelllang-en-US.patch Patch16: logjam-4.5.3-start_in_dock.patch +Patch17: logjam-4.5.3-uk.po.patch +Patch18: logjam-4.5.3-no_quit_when_docked.patch +Patch19: logjam-4.5.3-close_when_send.patch +Patch20: logjam-4.5.3-imageresize.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -60,11 +65,17 @@ %patch8 -p1 -b .bz186906 %patch9 -p1 -b .docklet-context-menu %patch10 -p1 -b .rhythmboxfix -%patch12 -p1 -b .disablethreads +# Not applicable to F-8 +# %%patch11 -p1 -b .libsoup +%patch12 -p1 -b .disable-threads %patch13 -p1 -b .title %patch14 -p1 -b .tags %patch15 -p1 -b .default-spelllang-en-US %patch16 -p1 -b .start-in-dock +%patch17 -p1 -b .uk.po +%patch18 -p1 -b .no_quit_when_docked +%patch19 -p1 -b .close_when_send +%patch20 -p1 -b .imageresize %build touch NEWS README AUTHORS @@ -109,6 +120,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 +- fix ukranian translation (bz 447145) +- fix docked behavior (bz 447146) +- add close when send option (bz 447147) +- fix image resize sigsegv (bz 452170) + * Tue May 13 2008 Tom "spot" Callaway - 4.5.3-23 - add explicit without-xmms conditional (bz 445996) - add configuration option to start in dock (bz 445998) @@ -137,7 +154,7 @@ * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-15 - fix tags patch -* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 - missed one patch * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-13 @@ -146,6 +163,15 @@ - add support for titles to links and images and links for images (bz 434754) - set default spellcheck lang to en_US (en was the old default, but didn't work) +* Sat Feb 16 2008 Jesse Keating - 4.5.3-12 +- Rebuild for new libsoup + +* Wed Jan 30 2008 Tom "spot" Callaway 1:4.5.3-11 +- apply patch for new libsoup from bz 430966 + +* Tue Jan 29 2008 Tom "spot" Callaway 1:4.5.3-10 +- rebuild for new libsoup + * Thu Aug 23 2007 Tom "spot" Callaway 1:4.5.3-9.2 - rebuild for BuildID, license fix (GPLv2+) From fedora-extras-commits at redhat.com Wed Jul 2 21:18:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 21:18:08 GMT Subject: rpms/logjam/F-9 logjam-4.5.3-close_when_send.patch, NONE, 1.1 logjam-4.5.3-imageresize.patch, NONE, 1.1 logjam-4.5.3-no_quit_when_docked.patch, NONE, 1.1 logjam-4.5.3-uk.po.patch, NONE, 1.1 logjam.spec, 1.45, 1.46 Message-ID: <200807022118.m62LI80H020797@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20681/F-9 Modified Files: logjam.spec Added Files: logjam-4.5.3-close_when_send.patch logjam-4.5.3-imageresize.patch logjam-4.5.3-no_quit_when_docked.patch logjam-4.5.3-uk.po.patch Log Message: Fix the image resize bug, apply all of Andy Shevchenko's enhancements. logjam-4.5.3-close_when_send.patch: --- NEW FILE logjam-4.5.3-close_when_send.patch --- diff -up logjam-4.5.3/src/jam.c.close-when-send logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-18 10:31:30.000000000 +0300 @@ -363,6 +363,10 @@ action_cb(GtkWidget *w, JamWin *jw) { } else { g_warning("action callback, but no default action?\n"); } +#ifdef USE_DOCK + if (conf.options.close_when_send && app.docklet) + gtk_widget_hide(GTK_WIDGET(jw)); +#endif } static void @@ -395,6 +399,10 @@ delete_cb(GtkWidget *w, JamWin *jw) { } else { delete_server_entry(jw); } +#ifdef USE_DOCK + if (conf.options.close_when_send && app.docklet) + gtk_widget_hide(GTK_WIDGET(jw)); +#endif } static void diff -up logjam-4.5.3/src/conf_xml.c.close-when-send logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/conf_xml.c 2008-05-18 09:49:33.000000000 +0300 @@ -183,6 +183,7 @@ parseoptions(Configuration *c, xmlDocPtr READOPTION(autosave) READOPTION(cfautostart) READOPTION(cfusemask) + READOPTION(close_when_send) READOPTION(docklet) READOPTION(start_in_dock) READOPTION(cffloat) @@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt WRITEOPTION(autosave); WRITEOPTION(cfautostart); WRITEOPTION(cfusemask); + WRITEOPTION(close_when_send); WRITEOPTION(docklet); WRITEOPTION(start_in_dock); WRITEOPTION(cffloatraise); diff -up logjam-4.5.3/src/settings.c.close-when-send logjam-4.5.3/src/settings.c --- logjam-4.5.3/src/settings.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/settings.c 2008-05-18 09:56:35.000000000 +0300 @@ -85,6 +85,8 @@ static SettingsWidget settingswidgets[] { "ui_font", &conf.uifont, SW_CUSTOM, N_("Entry display font:") }, #ifndef G_OS_WIN32 + { "ui_close_when_send", &conf.options.close_when_send, + SW_TOGGLE, N_("Close main window after sending") }, { "ui_docklet", &conf.options.docklet, SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") }, { "ui_start_in_dock", &conf.options.start_in_dock, @@ -397,6 +399,10 @@ uisettings(JamWin *jw) { G_CALLBACK(sec_changed_cb), sw); groupedbox_pack(GROUPEDBOX(post), sw_make("ui_defaultsecurity"), FALSE); +#ifdef USE_DOCK + groupedbox_pack(GROUPEDBOX(post), sw_make("ui_close_when_send"), FALSE); +#endif /* USE_DOCK */ + entry = groupedbox_new_with_text(_("Entries")); gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); diff -up logjam-4.5.3/src/conf.h.close-when-send logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/conf.h 2008-05-18 09:52:36.000000000 +0300 @@ -51,6 +51,7 @@ typedef struct { gboolean autosave; gboolean cfautostart; gboolean cfusemask; + gboolean close_when_send; gboolean docklet; gboolean cffloat; gboolean cffloatraise; logjam-4.5.3-imageresize.patch: --- NEW FILE logjam-4.5.3-imageresize.patch --- diff -up logjam-4.5.3/src/network-soup.c.BAD logjam-4.5.3/src/network-soup.c --- logjam-4.5.3/src/network-soup.c.BAD 2008-07-02 17:02:45.000000000 -0400 +++ logjam-4.5.3/src/network-soup.c 2008-07-02 17:03:04.000000000 -0400 @@ -75,7 +75,7 @@ net_post_blocking(const char *url, GSLis *colonpos = ':'; } soup_message_set_request(req, "application/x-www-form-urlencoded", - SOUP_MEMORY_TEMPORARY, post->str, post->len); + SOUP_MEMORY_TEMPORARY, post? post->str : NULL, post? post->len : 0); status = soup_session_send_message(session, req); if (status != SOUP_STATUS_OK) { logjam-4.5.3-no_quit_when_docked.patch: --- NEW FILE logjam-4.5.3-no_quit_when_docked.patch --- diff -up logjam-4.5.3/src/jam.c.no-quit-when-docked logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.no-quit-when-docked 2008-05-18 10:31:30.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-18 10:48:33.000000000 +0300 @@ -765,7 +765,11 @@ jam_quit(JamWin *jw) { static gboolean delete_event_cb(JamWin *jw) { +#ifdef USE_DOCK + gtk_widget_hide(GTK_WIDGET(jw)); +#else jam_quit(jw); +#endif return TRUE; /* don't ever let this delete the window; quit will do it. */ } logjam-4.5.3-uk.po.patch: --- NEW FILE logjam-4.5.3-uk.po.patch --- diff -up logjam-4.5.3/po/uk_UA.po.orig logjam-4.5.3/po/uk_UA.po --- logjam-4.5.3/po/uk_UA.po.orig 2005-08-25 05:42:14.000000000 +0300 +++ logjam-4.5.3/po/uk_UA.po 2008-05-18 10:53:43.000000000 +0300 @@ -662,7 +662,7 @@ msgstr "/??_??????????" #: ../src/friends.c:252 msgid "/Tools/Hide _Statistics" -msgstr "/????????????/???????????????? _????????????????????" +msgstr "/????????????/?????????????? _????????????????????" #: ../src/friends.c:253 msgid "/Tools/Export..." Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- logjam.spec 13 May 2008 14:55:53 -0000 1.45 +++ logjam.spec 2 Jul 2008 21:17:33 -0000 1.46 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -34,6 +34,10 @@ Patch14: logjam-4.5.3-tags.patch Patch15: logjam-4.5.3-default-spelllang-en-US.patch Patch16: logjam-4.5.3-start_in_dock.patch +Patch17: logjam-4.5.3-uk.po.patch +Patch18: logjam-4.5.3-no_quit_when_docked.patch +Patch19: logjam-4.5.3-close_when_send.patch +Patch20: logjam-4.5.3-imageresize.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -67,6 +71,10 @@ %patch14 -p1 -b .tags %patch15 -p1 -b .default-spelllang-en-US %patch16 -p1 -b .start-in-dock +%patch17 -p1 -b .uk.po +%patch18 -p1 -b .no_quit_when_docked +%patch19 -p1 -b .close_when_send +%patch20 -p1 -b .imageresize %build touch NEWS README AUTHORS @@ -111,6 +119,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 +- fix ukranian translation (bz 447145) +- fix docked behavior (bz 447146) +- add close when send option (bz 447147) +- fix image resize sigsegv (bz 452170) + * Tue May 13 2008 Tom "spot" Callaway - 4.5.3-23 - add explicit without-xmms conditional (bz 445996) - add configuration option to start in dock (bz 445998) From fedora-extras-commits at redhat.com Wed Jul 2 21:18:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 21:18:32 GMT Subject: rpms/logjam/devel logjam-4.5.3-close_when_send.patch, NONE, 1.1 logjam-4.5.3-imageresize.patch, NONE, 1.1 logjam-4.5.3-no_quit_when_docked.patch, NONE, 1.1 logjam-4.5.3-uk.po.patch, NONE, 1.1 logjam.spec, 1.45, 1.46 Message-ID: <200807022118.m62LIWfW020805@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20681/devel Modified Files: logjam.spec Added Files: logjam-4.5.3-close_when_send.patch logjam-4.5.3-imageresize.patch logjam-4.5.3-no_quit_when_docked.patch logjam-4.5.3-uk.po.patch Log Message: Fix the image resize bug, apply all of Andy Shevchenko's enhancements. logjam-4.5.3-close_when_send.patch: --- NEW FILE logjam-4.5.3-close_when_send.patch --- diff -up logjam-4.5.3/src/jam.c.close-when-send logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-18 10:31:30.000000000 +0300 @@ -363,6 +363,10 @@ action_cb(GtkWidget *w, JamWin *jw) { } else { g_warning("action callback, but no default action?\n"); } +#ifdef USE_DOCK + if (conf.options.close_when_send && app.docklet) + gtk_widget_hide(GTK_WIDGET(jw)); +#endif } static void @@ -395,6 +399,10 @@ delete_cb(GtkWidget *w, JamWin *jw) { } else { delete_server_entry(jw); } +#ifdef USE_DOCK + if (conf.options.close_when_send && app.docklet) + gtk_widget_hide(GTK_WIDGET(jw)); +#endif } static void diff -up logjam-4.5.3/src/conf_xml.c.close-when-send logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/conf_xml.c 2008-05-18 09:49:33.000000000 +0300 @@ -183,6 +183,7 @@ parseoptions(Configuration *c, xmlDocPtr READOPTION(autosave) READOPTION(cfautostart) READOPTION(cfusemask) + READOPTION(close_when_send) READOPTION(docklet) READOPTION(start_in_dock) READOPTION(cffloat) @@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt WRITEOPTION(autosave); WRITEOPTION(cfautostart); WRITEOPTION(cfusemask); + WRITEOPTION(close_when_send); WRITEOPTION(docklet); WRITEOPTION(start_in_dock); WRITEOPTION(cffloatraise); diff -up logjam-4.5.3/src/settings.c.close-when-send logjam-4.5.3/src/settings.c --- logjam-4.5.3/src/settings.c.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/settings.c 2008-05-18 09:56:35.000000000 +0300 @@ -85,6 +85,8 @@ static SettingsWidget settingswidgets[] { "ui_font", &conf.uifont, SW_CUSTOM, N_("Entry display font:") }, #ifndef G_OS_WIN32 + { "ui_close_when_send", &conf.options.close_when_send, + SW_TOGGLE, N_("Close main window after sending") }, { "ui_docklet", &conf.options.docklet, SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") }, { "ui_start_in_dock", &conf.options.start_in_dock, @@ -397,6 +399,10 @@ uisettings(JamWin *jw) { G_CALLBACK(sec_changed_cb), sw); groupedbox_pack(GROUPEDBOX(post), sw_make("ui_defaultsecurity"), FALSE); +#ifdef USE_DOCK + groupedbox_pack(GROUPEDBOX(post), sw_make("ui_close_when_send"), FALSE); +#endif /* USE_DOCK */ + entry = groupedbox_new_with_text(_("Entries")); gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); diff -up logjam-4.5.3/src/conf.h.close-when-send logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.close-when-send 2008-05-18 09:12:19.000000000 +0300 +++ logjam-4.5.3/src/conf.h 2008-05-18 09:52:36.000000000 +0300 @@ -51,6 +51,7 @@ typedef struct { gboolean autosave; gboolean cfautostart; gboolean cfusemask; + gboolean close_when_send; gboolean docklet; gboolean cffloat; gboolean cffloatraise; logjam-4.5.3-imageresize.patch: --- NEW FILE logjam-4.5.3-imageresize.patch --- diff -up logjam-4.5.3/src/network-soup.c.BAD logjam-4.5.3/src/network-soup.c --- logjam-4.5.3/src/network-soup.c.BAD 2008-07-02 17:02:45.000000000 -0400 +++ logjam-4.5.3/src/network-soup.c 2008-07-02 17:03:04.000000000 -0400 @@ -75,7 +75,7 @@ net_post_blocking(const char *url, GSLis *colonpos = ':'; } soup_message_set_request(req, "application/x-www-form-urlencoded", - SOUP_MEMORY_TEMPORARY, post->str, post->len); + SOUP_MEMORY_TEMPORARY, post? post->str : NULL, post? post->len : 0); status = soup_session_send_message(session, req); if (status != SOUP_STATUS_OK) { logjam-4.5.3-no_quit_when_docked.patch: --- NEW FILE logjam-4.5.3-no_quit_when_docked.patch --- diff -up logjam-4.5.3/src/jam.c.no-quit-when-docked logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.no-quit-when-docked 2008-05-18 10:31:30.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-18 10:48:33.000000000 +0300 @@ -765,7 +765,11 @@ jam_quit(JamWin *jw) { static gboolean delete_event_cb(JamWin *jw) { +#ifdef USE_DOCK + gtk_widget_hide(GTK_WIDGET(jw)); +#else jam_quit(jw); +#endif return TRUE; /* don't ever let this delete the window; quit will do it. */ } logjam-4.5.3-uk.po.patch: --- NEW FILE logjam-4.5.3-uk.po.patch --- diff -up logjam-4.5.3/po/uk_UA.po.orig logjam-4.5.3/po/uk_UA.po --- logjam-4.5.3/po/uk_UA.po.orig 2005-08-25 05:42:14.000000000 +0300 +++ logjam-4.5.3/po/uk_UA.po 2008-05-18 10:53:43.000000000 +0300 @@ -662,7 +662,7 @@ msgstr "/??_??????????" #: ../src/friends.c:252 msgid "/Tools/Hide _Statistics" -msgstr "/????????????/???????????????? _????????????????????" +msgstr "/????????????/?????????????? _????????????????????" #: ../src/friends.c:253 msgid "/Tools/Export..." Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- logjam.spec 13 May 2008 14:56:07 -0000 1.45 +++ logjam.spec 2 Jul 2008 21:17:38 -0000 1.46 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -34,6 +34,10 @@ Patch14: logjam-4.5.3-tags.patch Patch15: logjam-4.5.3-default-spelllang-en-US.patch Patch16: logjam-4.5.3-start_in_dock.patch +Patch17: logjam-4.5.3-uk.po.patch +Patch18: logjam-4.5.3-no_quit_when_docked.patch +Patch19: logjam-4.5.3-close_when_send.patch +Patch20: logjam-4.5.3-imageresize.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -67,6 +71,10 @@ %patch14 -p1 -b .tags %patch15 -p1 -b .default-spelllang-en-US %patch16 -p1 -b .start-in-dock +%patch17 -p1 -b .uk.po +%patch18 -p1 -b .no_quit_when_docked +%patch19 -p1 -b .close_when_send +%patch20 -p1 -b .imageresize %build touch NEWS README AUTHORS @@ -111,6 +119,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 +- fix ukranian translation (bz 447145) +- fix docked behavior (bz 447146) +- add close when send option (bz 447147) +- fix image resize sigsegv (bz 452170) + * Tue May 13 2008 Tom "spot" Callaway - 4.5.3-23 - add explicit without-xmms conditional (bz 445996) - add configuration option to start in dock (bz 445998) From fedora-extras-commits at redhat.com Wed Jul 2 21:23:45 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 21:23:45 GMT Subject: rpms/policycoreutils/devel .cvsignore, 1.182, 1.183 policycoreutils-rhat.patch, 1.372, 1.373 policycoreutils.spec, 1.535, 1.536 sources, 1.187, 1.188 Message-ID: <200807022123.m62LNjBd021046@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21001 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jul 2 2008 Dan Walsh 2.0.52-1 - Default prefix to "user" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- .cvsignore 2 Jul 2008 00:52:32 -0000 1.182 +++ .cvsignore 2 Jul 2008 21:22:58 -0000 1.183 @@ -182,3 +182,4 @@ policycoreutils-2.0.50.tgz sepolgen-1.0.12.tgz policycoreutils-2.0.51.tgz +policycoreutils-2.0.52.tgz policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- policycoreutils-rhat.patch 2 Jul 2008 00:52:32 -0000 1.372 +++ policycoreutils-rhat.patch 2 Jul 2008 21:22:58 -0000 1.373 @@ -1,15 +1,15 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.50/Makefile ---- nsapolicycoreutils/Makefile 2007-12-19 06:02:52.000000000 -0500 -+++ policycoreutils-2.0.50/Makefile 2008-07-01 14:59:58.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile +--- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-02 13:43:21.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.50/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2007-07-16 14:20:41.000000000 -0400 -+++ policycoreutils-2.0.50/restorecond/restorecond.c 2008-07-01 14:59:58.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-02 13:43:21.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -36,137 +36,26 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.50/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2008-05-06 14:33:04.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/semanage 2008-07-01 20:31:40.000000000 -0400 -@@ -43,49 +43,52 @@ - if __name__ == '__main__': - - def usage(message = ""): -- print _('\ --semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] \n\ --semanage login -{a|d|m} [-sr] login_name\n\ --semanage user -{a|d|m} [-LrRP] selinux_name\n\ --semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range\n\ --semanage interface -{a|d|m} [-tr] interface_spec\n\ --semanage fcontext -{a|d|m} [-frst] file_spec\n\ --semanage translation -{a|d|m} [-T] level\n\n\ --semanage boolean -{d|m} boolean\n\n\ --\ --Primary Options:\n\ --\ -- -a, --add Add a OBJECT record NAME\n\ -- -d, --delete Delete a OBJECT record NAME\n\ -- -m, --modify Modify a OBJECT record NAME\n\ -- -l, --list List the OBJECTS\n\n\ -- -C, --locallist List OBJECTS local customizations\n\n\ -- -D, --deleteall Remove all OBJECTS local customizations\n\ --\ -- -h, --help Display this message\n\ -- -n, --noheading Do not print heading when listing OBJECTS\n\ -- -S, --store Select and alternate SELinux store to manage\n\n\ --Object-specific Options (see above):\n\ -- -f, --ftype File Type of OBJECT \n\ -- "" (all files) \n\ -- -- (regular file) \n\ -- -d (directory) \n\ -- -c (character device) \n\ -- -b (block device) \n\ -- -s (socket) \n\ -- -l (symbolic link) \n\ -- -p (named pipe) \n\n\ --\ -- -p, --proto Port protocol (tcp or udp)\n\ -- -P, --prefix Prefix for home directory labeling\n\ -- -L, --level Default SELinux Level (MLS/MCS Systems only)\n\ -- -R, --roles SELinux Roles (ex: "sysadm_r staff_r")\n\ -- -T, --trans SELinux Level Translation (MLS/MCS Systems only)\n\n\ --\ -- -s, --seuser SELinux User Name\n\ -- -t, --type SELinux Type for the object\n\ -- -r, --range MLS/MCS Security Range (MLS/MCS Systems only)\n\ --') -+ print _(""" -+semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] -+semanage login -{a|d|m} [-sr] login_name -+semanage user -{a|d|m} [-LrRP] selinux_name -+semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range -+semanage interface -{a|d|m} [-tr] interface_spec -+semanage fcontext -{a|d|m} [-frst] file_spec -+semanage translation -{a|d|m} [-T] level -+semanage boolean -{d|m} boolean -+semanage permissive -{d|a} type -+ -+Primary Options: -+ -+ -a, --add Add a OBJECT record NAME -+ -d, --delete Delete a OBJECT record NAME -+ -m, --modify Modify a OBJECT record NAME -+ -l, --list List the OBJECTS -+ -C, --locallist List OBJECTS local customizations -+ -D, --deleteall Remove all OBJECTS local customizations -+ -+ -h, --help Display this message -+ -n, --noheading Do not print heading when listing OBJECTS -+ -S, --store Select and alternate SELinux store to manage -+ -+Object-specific Options (see above): -+ -+ -f, --ftype File Type of OBJECT -+ "" (all files) -+ -- (regular file) -+ -d (directory) -+ -c (character device) -+ -b (block device) -+ -s (socket) -+ -l (symbolic link) -+ -p (named pipe) -+ -+ -p, --proto Port protocol (tcp or udp) -+ -P, --prefix Prefix for home directory labeling -+ -L, --level Default SELinux Level (MLS/MCS Systems only) -+ -R, --roles SELinux Roles (ex: "sysadm_r staff_r") -+ -T, --trans SELinux Level Translation (MLS/MCS Systems only) -+ -+ -s, --seuser SELinux User Name -+ -t, --type SELinux Type for the object -+ -r, --range MLS/MCS Security Range (MLS/MCS Systems only) -+""") - print message - sys.exit(1) - -@@ -112,6 +115,8 @@ - valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] - valid_option["boolean"] = [] - valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0" ] -+ valid_option["permissive"] = [] -+ valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ] - return valid_option - - # -@@ -266,6 +271,9 @@ - if object == "translation": - OBJECT = seobject.setransRecords() - -+ if object == "permissive": -+ OBJECT = seobject.permissiveRecords(store) -+ - if list: - OBJECT.list(heading, locallist) - sys.exit(0); -@@ -302,6 +310,9 @@ - - if object == "fcontext": - OBJECT.add(target, setype, ftype, serange, seuser) -+ if object == "permissive": -+ OBJECT.add(target) -+ - sys.exit(0); - - if modify: -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.50/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2008-05-06 14:33:04.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/semanage.8 2008-07-01 20:33:48.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-02 13:43:21.000000000 -0400 +@@ -297,9 +297,10 @@ + if object == "user": + rlist = roles.split() + if len(rlist) == 0: +- raise ValueError(_("You must specify a role")) +- if prefix == "": +- raise ValueError(_("You must specify a prefix")) ++ raise ValueError(_("You must specify a role")) ++ if prefix == "": ++ prefix = "user" ++ + OBJECT.add(target, rlist, selevel, serange, prefix) + + if object == "port": +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 +--- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-02 13:43:21.000000000 -0400 @@ -3,7 +3,7 @@ semanage \- SELinux Policy Management tool @@ -176,16 +65,7 @@ .br .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean .br -@@ -17,6 +17,8 @@ - .br - .B semanage fcontext \-{a|d|m} [\-frst] file_spec - .br -+.B semanage permissive \-{a|d} type -+.br - .B semanage translation \-{a|d|m} [\-T] level - .P - -@@ -85,6 +87,9 @@ +@@ -87,6 +87,9 @@ .I \-s, \-\-seuser SELinux user name .TP @@ -195,150 +75,3 @@ .I \-t, \-\-type SELinux Type for the object .TP -@@ -101,10 +106,11 @@ - $ semanage fcontext -a -t httpd_sys_content_t "/web(/.*)?" - # Allow Apache to listen on port 81 - $ semanage port -a -t http_port_t -p tcp 81 -+# Change apache to a permissive domain -+$ semanage permissive -a http_t - .fi - - .SH "AUTHOR" - This man page was written by Daniel Walsh and - Russell Coker . - Examples by Thomas Bleher . -- -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.50/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-05-16 10:55:38.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/seobject.py 2008-07-01 20:30:55.000000000 -0400 -@@ -1,5 +1,5 @@ - #! /usr/bin/python -E --# Copyright (C) 2005, 2006, 2007 Red Hat -+# Copyright (C) 2005, 2006, 2007, 2008 Red Hat - # see file 'COPYING' for use and warranty information - # - # semanage is a tool for managing SELinux configuration files -@@ -24,7 +24,9 @@ - import pwd, string, selinux, tempfile, os, re, sys - from semanage import *; - PROGNAME="policycoreutils" -+import sepolgen.module as module - -+import commands - import gettext - gettext.bindtextdomain(PROGNAME, "/usr/share/locale") - gettext.textdomain(PROGNAME) -@@ -246,7 +248,103 @@ - os.close(fd) - os.rename(newfilename, self.filename) - os.system("/sbin/service mcstrans reload > /dev/null") -- -+ -+class permissiveRecords: -+ def __init__(self, store): -+ self.store = store -+ self.sh = semanage_handle_create() -+ if not self.sh: -+ raise ValueError(_("Could not create semanage handle")) -+ -+ if store != "": -+ semanage_select_store(self.sh, store, SEMANAGE_CON_DIRECT); -+ -+ self.semanaged = semanage_is_managed(self.sh) -+ -+ if not self.semanaged: -+ semanage_handle_destroy(self.sh) -+ raise ValueError(_("SELinux policy is not managed or store cannot be accessed.")) -+ -+ rc = semanage_access_check(self.sh) -+ if rc < SEMANAGE_CAN_READ: -+ semanage_handle_destroy(self.sh) -+ raise ValueError(_("Cannot read policy store.")) -+ -+ rc = semanage_connect(self.sh) -+ if rc < 0: -+ semanage_handle_destroy(self.sh) -+ raise ValueError(_("Could not establish semanage connection")) -+ -+ def get_all(self): -+ l = [] -+ (rc, mlist, number) = semanage_module_list(self.sh) -+ if rc < 0: -+ raise ValueError(_("Could not list SELinux modules")) -+ -+ for i in range(number): -+ mod = semanage_module_list_nth(mlist, i) -+ name = semanage_module_get_name(mod) -+ if name and name.startswith("permissive_"): -+ l.append(name.split("permissive_")[1]) -+ return l -+ -+ def list(self,heading = 1, locallist = 0): -+ if heading: -+ print "\n%-25s\n" % (_("Permissive Types")) -+ for t in self.get_all(): -+ print t -+ -+ -+ def add(self, type): -+ name = "permissive_%s" % type -+ dirname = "/var/lib/selinux" -+ os.chdir(dirname) -+ filename = "%s.te" % name -+ modtxt = """ -+module %s 1.0; -+ -+require { -+ type %s; -+} -+ -+permissive %s; -+""" % (name, type, type) -+ fd = open(filename,'w') -+ fd.write(modtxt) -+ fd.close() -+ mc = module.ModuleCompiler() -+ mc.create_module_package(filename, 1) -+ fd = open("permissive_%s.pp" % type) -+ data = fd.read() -+ fd.close() -+ -+ rc = semanage_module_install(self.sh, data, len(data)); -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError(_("Could not set permissive domain %s") % name) -+ for root, dirs, files in os.walk("tmp", topdown=False): -+ for name in files: -+ os.remove(os.path.join(root, name)) -+ for name in dirs: -+ os.rmdir(os.path.join(root, name)) -+ -+ if rc != 0: -+ raise ValueError(out) -+ -+ -+ def delete(self, name): -+ for n in name.split(): -+ rc = semanage_module_remove(self.sh, "permissive_%s" % n) -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError(_("Could not remove permissive domain %s") % name) -+ -+ def deleteall(self): -+ l = self.get_all() -+ if len(l) > 0: -+ all = " ".join(l) -+ self.delete(all) -+ - class semanageRecords: - def __init__(self, store): - self.sh = semanage_handle_create() -@@ -464,7 +562,7 @@ - def __init__(self, store = ""): - semanageRecords.__init__(self, store) - -- def add(self, name, roles, selevel, serange, prefix): -+ def add(self, name, roles, selevel, serange, prefix = "user"): - if is_mls_enabled == 1: - if serange == "": - serange = "s0" Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.535 retrieving revision 1.536 diff -u -r1.535 -r1.536 --- policycoreutils.spec 2 Jul 2008 02:04:52 -0000 1.535 +++ policycoreutils.spec 2 Jul 2008 21:22:59 -0000 1.536 @@ -5,8 +5,8 @@ %define sepolgenver 1.0.12 Summary: SELinux policy core utilities Name: policycoreutils -Version: 2.0.51 -Release: 2%{?dist} +Version: 2.0.52 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ fi %changelog +* Wed Jul 2 2008 Dan Walsh 2.0.52-1 +- Default prefix to "user" + * Tue Jul 1 2008 Dan Walsh 2.0.50-2 - Remove semodule use within semanage - Fix launching of polgengui from toolbar Index: sources =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- sources 2 Jul 2008 00:52:32 -0000 1.187 +++ sources 2 Jul 2008 21:22:59 -0000 1.188 @@ -1,2 +1,2 @@ 4813a1ed80f19068ed9897165f073e8b sepolgen-1.0.12.tgz -9189683c9449c459ad5d7870d9e22085 policycoreutils-2.0.51.tgz +311e95b3374fe1993fb91a303b6675b2 policycoreutils-2.0.52.tgz From fedora-extras-commits at redhat.com Wed Jul 2 21:24:25 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 2 Jul 2008 21:24:25 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.481, 1.482 linux-2.6-wireless-fixups.patch, 1.3, 1.4 linux-2.6-wireless-pending.patch, 1.49, 1.50 linux-2.6-wireless.patch, 1.44, 1.45 Message-ID: <200807022124.m62LOPXt021136@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21009 Modified Files: kernel.spec linux-2.6-wireless-fixups.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-06-30 ; Upstream wireless updates from 2008-06-27 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.481 retrieving revision 1.482 diff -u -r1.481 -r1.482 --- kernel.spec 2 Jul 2008 02:15:06 -0000 1.481 +++ kernel.spec 2 Jul 2008 21:23:38 -0000 1.482 @@ -1824,6 +1824,12 @@ %changelog +* Wed Jul 02 2008 John W. Linville 2.6.25.9-41 +- Upstream wireless fixes from 2008-06-30 + (http://marc.info/?l=linux-wireless&m=121485709702728&w=2) +- Upstream wireless updates from 2008-06-27 + (http://marc.info/?l=linux-wireless&m=121458164930953&w=2) + * Tue Jul 01 2008 Dave Jones - Shorten summary in specfile. linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-fixups.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-wireless-fixups.patch 26 Jun 2008 19:29:52 -0000 1.3 +++ linux-2.6-wireless-fixups.patch 2 Jul 2008 21:23:38 -0000 1.4 @@ -1,6 +1,6 @@ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 14:24:27.000000000 -0400 @@ -3659,7 +3659,7 @@ void mpi_receive_802_11 (struct airo_inf ptr += hdrlen; if (hdrlen == 24) @@ -208,8 +208,8 @@ return 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 14:24:27.000000000 -0400 @@ -58,6 +58,10 @@ #include "reg.h" #include "debug.h" @@ -218,10 +218,10 @@ +#define LE_READ_2(_p) (le16_to_cpu(get_unaligned((__le16 *)(_p)))) +#define LE_READ_4(_p) (le32_to_cpu(get_unaligned((__le32 *)(_p)))) + - enum { - ATH_LED_TX, - ATH_LED_RX, -@@ -2891,9 +2895,9 @@ static void ath5k_configure_filter(struc + static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */ + + +@@ -2858,9 +2862,9 @@ static void ath5k_configure_filter(struc if (!mclist) break; /* calculate XOR of eight 6-bit values */ @@ -234,9 +234,9 @@ pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-24 14:55:10.000000000 -0400 -@@ -965,6 +965,22 @@ static inline bool __b43_warn_on_dummy(b +--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-01 14:24:27.000000000 -0400 +@@ -967,6 +967,22 @@ static inline bool __b43_warn_on_dummy(b # define B43_WARN_ON(x) __b43_warn_on_dummy(unlikely(!!(x))) #endif @@ -260,8 +260,8 @@ #define INT_TO_Q52(i) ((i) << 2) /* Convert a Q5.2 value to an integer (precision loss!) */ diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-01 14:24:27.000000000 -0400 @@ -823,6 +823,23 @@ void b43legacydbg(struct b43legacy_wl *w # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0) #endif /* DEBUG */ @@ -287,8 +287,8 @@ #define Q52_FMT "%u.%u" #define Q52_ARG(q52) ((q52) / 4), (((q52) & 3) * 100 / 4) diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-01 14:24:27.000000000 -0400 @@ -846,10 +846,10 @@ static void handle_irq_noise(struct b43l /* Get the noise samples. */ B43legacy_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -314,8 +314,8 @@ iv = (const struct b43legacy_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-01 14:24:27.000000000 -0400 @@ -1088,7 +1088,7 @@ static void b43legacy_phy_initg(struct b * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -373,8 +373,8 @@ return 0; } diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-01 14:24:27.000000000 -0400 @@ -357,7 +357,7 @@ void b43legacy_nrssi_hw_update(struct b4 for (i = 0; i < 64; i++) { tmp = b43legacy_nrssi_hw_read(dev, i); @@ -430,8 +430,8 @@ pamp = b43legacy_get_txgain_freq_power_amp(txpower); pamp <<= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-01 14:24:27.000000000 -0400 @@ -199,7 +199,7 @@ static void lo_measure_txctl_values(stru if (lb_gain > 10) { radio_pctl_reg = 0; @@ -451,9 +451,9 @@ if (phy->pga_gain >= 5) { phy->pga_gain -= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-06-24 14:55:10.000000000 -0400 -@@ -1187,10 +1187,10 @@ static void handle_irq_noise(struct b43_ +--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-01 14:24:27.000000000 -0400 +@@ -1211,10 +1211,10 @@ static void handle_irq_noise(struct b43_ /* Get the noise samples. */ B43_WARN_ON(dev->noisecalc.nr_samples >= 8); i = dev->noisecalc.nr_samples; @@ -468,7 +468,7 @@ dev->noisecalc.samples[i][0] = phy->nrssi_lt[noise[0]]; dev->noisecalc.samples[i][1] = phy->nrssi_lt[noise[1]]; dev->noisecalc.samples[i][2] = phy->nrssi_lt[noise[2]]; -@@ -2331,7 +2331,7 @@ static int b43_write_initvals(struct b43 +@@ -2355,7 +2355,7 @@ static int b43_write_initvals(struct b43 goto err_format; array_size -= sizeof(iv->data.d32); @@ -478,8 +478,8 @@ iv = (const struct b43_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-01 14:24:27.000000000 -0400 @@ -1400,7 +1400,7 @@ static void b43_phy_initg(struct b43_wld * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -580,8 +580,8 @@ tmp_u16 = b43_phy_read(dev, 0x048A) & 0xF000; tmp_u16 |= ((u32) b & 0x0000003F); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-01 14:22:15.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-01 14:24:27.000000000 -0400 @@ -556,36 +556,40 @@ static void iwl3945_add_radiotap(struct iwl3945_rt->rt_hdr.it_pad = 0; @@ -638,8 +638,8 @@ if (rate == -1) diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c ---- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-01 14:22:16.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-01 14:24:27.000000000 -0400 @@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de if (*bytesleft >= sizeof(beaconsize)) { @@ -649,9 +649,32 @@ *bytesleft -= sizeof(beaconsize); *pbeaconinfo += sizeof(beaconsize); } +diff -up linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c +--- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-01 14:22:16.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-01 14:24:27.000000000 -0400 +@@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo + hwsim_radios[i] = hw; + + data = hw->priv; +- data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw, +- "hwsim%d", i); ++ data->dev = device_create(hwsim_class, NULL, 0, "hwsim%d", i); + if (IS_ERR(data->dev)) { +- printk(KERN_DEBUG +- "mac80211_hwsim: device_create_drvdata " ++ printk(KERN_DEBUG "mac80211_hwsim: device_create " + "failed (%ld)\n", PTR_ERR(data->dev)); + err = -ENOMEM; + goto failed; + } + data->dev->driver = &mac80211_hwsim_driver; ++ dev_set_drvdata(data->dev, hw); + + SET_IEEE80211_DEV(hw, data->dev); + addr[3] = i >> 8; diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-01 14:22:16.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-01 14:24:27.000000000 -0400 @@ -556,11 +556,11 @@ static void handle_rx_packet(struct zd_u * be padded. Unaligned access might also happen if the length_info * structure is not present. @@ -666,9 +689,20 @@ if (k == 0) return; n = l+k; +diff -up linux-2.6.25.noarch/include/linux/input.h.orig linux-2.6.25.noarch/include/linux/input.h +--- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-01 14:23:01.000000000 -0400 ++++ linux-2.6.25.noarch/include/linux/input.h 2008-07-01 14:23:41.000000000 -0400 +@@ -638,6 +638,7 @@ struct input_absinfo { + #define SW_TABLET_MODE 0x01 /* set = tablet mode */ + #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ + #define SW_RADIO 0x03 /* set = radio enabled */ ++#define SW_RFKILL_ALL SW_RADIO + #define SW_MAX 0x0f + #define SW_CNT (SW_MAX+1) + diff -up linux-2.6.25.noarch/net/mac80211/iface.c.orig linux-2.6.25.noarch/net/mac80211/iface.c ---- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-01 14:24:27.000000000 -0400 @@ -53,15 +53,6 @@ int ieee80211_if_add(struct net_device * if (!ndev) return -ENOMEM; @@ -686,8 +720,8 @@ if (ret < 0) goto fail; diff -up linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c ---- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-01 14:24:27.000000000 -0400 @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq { if (ae) @@ -698,8 +732,8 @@ /* HWMP IE processing macros */ diff -up linux-2.6.25.noarch/net/mac80211/michael.c.orig linux-2.6.25.noarch/net/mac80211/michael.c ---- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-01 14:24:27.000000000 -0400 @@ -29,17 +29,16 @@ static void michael_block(struct michael static void michael_mic_hdr(struct michael_mic_ctx *mctx, const u8 *key, const u8 *da, const u8 *sa, u8 priority) @@ -750,8 +784,8 @@ + mic[7] = (mctx.r >> 24) & 0xff; } diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-06-24 15:11:51.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 14:24:27.000000000 -0400 @@ -7,22 +7,23 @@ * published by the Free Software Foundation. */ @@ -930,7 +964,7 @@ + iv32 = data[4] | (data[5] << 8) | + (data[6] << 16) | (data[7] << 24); - tk = &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY]; + tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY]; ctx = &key->u.tkip.tx; @@ -217,6 +264,7 @@ void ieee80211_tkip_encrypt_data(struct ieee80211_wep_encrypt_data(tfm, rc4key, 16, pos, payload_len); @@ -947,7 +981,7 @@ - iv32 = get_unaligned_le32(pos + 4); + iv32 = pos[4] | (pos[5] << 8) | (pos[6] << 16) | (pos[7] << 24); pos += 8; - #ifdef CONFIG_TKIP_DEBUG + #ifdef CONFIG_MAC80211_TKIP_DEBUG { @@ -341,3 +389,5 @@ int ieee80211_tkip_decrypt_data(struct c @@ -956,8 +990,8 @@ + + diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 14:24:27.000000000 -0400 @@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_ /* Ignore nop renames */ @@ -975,8 +1009,8 @@ } diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-24 14:55:10.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-01 14:24:27.000000000 -0400 @@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -1018,9 +1052,9 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-24 14:54:25.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-24 14:55:10.000000000 -0400 -@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 14:22:17.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 14:24:27.000000000 -0400 +@@ -1299,7 +1299,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.49 -r 1.50 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- linux-2.6-wireless-pending.patch 26 Jun 2008 19:29:52 -0000 1.49 +++ linux-2.6-wireless-pending.patch 2 Jul 2008 21:23:38 -0000 1.50 @@ -1,3 +1,1105 @@ +commit ff28bd94e307c67abb1bccda5d3a9018bd798e08 +Author: John W. Linville +Date: Fri Jun 27 10:27:47 2008 -0400 + + wireless: remove RFKILL_STATE_HARD_BLOCKED warnings + + CC [M] drivers/net/wireless/b43/rfkill.o + drivers/net/wireless/b43/rfkill.c: In function ???b43_rfkill_soft_toggle???: + drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch + + CC [M] drivers/net/wireless/b43legacy/rfkill.o + drivers/net/wireless/b43legacy/rfkill.c: In function ???b43legacy_rfkill_soft_toggle???: + drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch + + CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o + drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function ???iwl_rfkill_soft_rf_kill???: + drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch + + Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLOCKED} + conversion since I'm already here... + + Signed-off-by: John W. Linville + +commit d195a2ca46ec50e3b5c045a36d1defb6e04cc6b7 +Author: John W. Linville +Date: Fri Jun 27 09:31:29 2008 -0400 + + ath5k: remove now unused variable declared in ath5k_tx + + CC [M] drivers/net/wireless/ath5k/base.o + drivers/net/wireless/ath5k/base.c: In function ???ath5k_tx???: + drivers/net/wireless/ath5k/base.c:2598: warning: unused variable ???info??? + + Signed-off-by: John W. Linville + +commit 03f93c3d4c8aa9ed2e2b0a949ece658053527d71 +Author: Johannes Berg +Date: Wed Jun 25 14:36:27 2008 +0300 + + mac80211: fix tx fragmentation + + This patch fixes TX fragmentation caused by + tx handlers reordering and 'tx info to cb' patches + + Signed-off-by: Johannes Berg + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 59959a6150c8af737898e83f727e824dbed7b0fa +Author: Johannes Berg +Date: Thu Jun 26 19:59:56 2008 +0200 + + mac80211: make workqueue freezable + + This patch makes the mac80211 workqueue freezable making it + interact a bit better with system suspend and not try to ping + the AP while the hardware is down. + + This doesn't really help with implementing proper suspend in + any way but makes some bad things trigger less. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit e292c737fc57d3ca718056f3308c725c8e541729 +Author: Pavel Machek +Date: Wed Jun 25 12:25:53 2008 +0200 + + wireless: Small cleanups + + Small whitespace cleanups for wireless drivers + + Signed-off-by: Pavel Machek + Signed-off-by: John W. Linville + +commit b973e42eb25036a2672db7f7749f6989ab10479c +Author: Randy Dunlap +Date: Tue Jun 24 21:02:46 2008 -0700 + + iwlwifi: fix build for CONFIG_INPUT=n + + Fix iwlwifi so that it builds cleanly with CONFIG_INPUT=n. + Also free the input device on exit. + + drivers/built-in.o: In function `iwl_rfkill_unregister': + (.text+0xbf430): undefined reference to `input_unregister_device' + drivers/built-in.o: In function `iwl_rfkill_init': + (.text+0xbf51c): undefined reference to `input_allocate_device' + drivers/built-in.o: In function `iwl_rfkill_init': + (.text+0xbf5bf): undefined reference to `input_register_device' + drivers/built-in.o: In function `iwl_rfkill_init': + (.text+0xbf5e9): undefined reference to `input_free_device' + net/built-in.o: In function `rfkill_disconnect': + rfkill-input.c:(.text+0xe71e1): undefined reference to `input_close_device' + rfkill-input.c:(.text+0xe71e9): undefined reference to `input_unregister_handle' + net/built-in.o: In function `rfkill_connect': + rfkill-input.c:(.text+0xe723e): undefined reference to `input_register_handle' + rfkill-input.c:(.text+0xe724d): undefined reference to `input_open_device' + rfkill-input.c:(.text+0xe725c): undefined reference to `input_unregister_handle' + net/built-in.o: In function `rfkill_handler_init': + rfkill-input.c:(.init.text+0x36ec): undefined reference to `input_register_handler' + net/built-in.o: In function `rfkill_handler_exit': + rfkill-input.c:(.exit.text+0x112c): undefined reference to `input_unregister_handler' + make[1]: *** [.tmp_vmlinux1] Error 1 + + Signed-off-by: Randy Dunlap + Signed-off-by: John W. Linville + +commit 428da76523e4a9c08bdfadc25a05b520f19b9133 +Author: Ivo van Doorn +Date: Tue Jun 24 19:23:36 2008 +0200 + + mac80211: Add RTNL warning for workqueue + + The workqueue provided by mac80211 should not be used for + scheduled tasks that acquire the RTNL lock. This could be done + when the driver uses the function ieee80211_iterate_active_interfaces() + within the scheduled work. Such behavior will end in locking + dependencies problems when an interface is being removed. + + This patch will add a notification about the RTNL locking and + the mac80211 workqueue to prevent driver developers from + blindly using it. + + Signed-off-by: Ivo van Doorn + Acked-by: Johannes Berg + Signed-off-by: John W. Linville + +commit f37d08bddc5cb8de18e55f2b0a401b3eb6269af4 +Author: Tomas Winkler +Date: Tue Jun 24 15:50:17 2008 +0300 + + mac80211: add phy information to giwname + + This patch add phy information to giwname. + + Quoting: + It's not useless, it's supposed to tell you about the protocol + capability of the device, like "IEEE 802.11b" or "IEEE 802.11abg" + + Jean + + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit b9fcc4f2987a757acb3af43aa31dc860bb957970 +Author: Emmanuel Grumbach +Date: Tue Jun 24 13:37:59 2008 +0300 + + mac80211: update the authentication method + + This patch updates the authentication method upon giwencode ioctl. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Acked-by: Johannes Berg + Acked-by: Dan Williams + Signed-off-by: John W. Linville + +commit fa6adfe9e625a6a843a1abed5f4e7a000c11952c +Author: Emmanuel Grumbach +Date: Tue Jun 24 13:37:58 2008 +0300 + + mac80211: don't return -EINVAL upon iwconfig wlan0 rts auto + + This patch avoids returning -EINVAL upon iwconfig wlan0 rts auto. If + rts->fixed is 0, then we should choose a default value instead of failing. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Acked-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 14a7dd6f6c1e0b361a37b6df52d4dc2ea36757d2 +Author: Michael Buesch +Date: Tue Jun 24 12:22:05 2008 +0200 + + b43: Fix PIO skb clobber + + This fixes a clobber of the skb that was introduced by the + tx_control->cb conversion patches. + This bug causes a crash when the skb destructor is invoked. That happens + on skb_orphan or skb_kfree. + + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit 40af48ce501ea9ad9c485504a6fa0740801fa051 +Author: Ivo van Doorn +Date: Mon Jun 23 19:56:50 2008 +0200 + [...19484 lines suppressed...] ++ wext_ioctl_func private) + { ++ struct iwreq *iwr = (struct iwreq *) ifr; + struct net_device *dev; + iw_handler handler; + +@@ -1019,12 +1034,12 @@ static int wireless_process_ioctl(struct + * Note that 'cmd' is already filtered in dev_ioctl() with + * (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */ + if (cmd == SIOCGIWSTATS) +- return ioctl_standard_call(dev, ifr, cmd, +- &iw_handler_get_iwstats); ++ return standard(dev, iwr, cmd, info, ++ &iw_handler_get_iwstats); + + if (cmd == SIOCGIWPRIV && dev->wireless_handlers) +- return ioctl_standard_call(dev, ifr, cmd, +- &iw_handler_get_private); ++ return standard(dev, iwr, cmd, info, ++ &iw_handler_get_private); + + /* Basic check */ + if (!netif_device_present(dev)) +@@ -1035,9 +1050,9 @@ static int wireless_process_ioctl(struct + if (handler) { + /* Standard and private are not the same */ + if (cmd < SIOCIWFIRSTPRIV) +- return ioctl_standard_call(dev, ifr, cmd, handler); ++ return standard(dev, iwr, cmd, info, handler); + else +- return ioctl_private_call(dev, ifr, cmd, handler); ++ return private(dev, iwr, cmd, info, handler); + } + /* Old driver API : call driver ioctl handler */ + if (dev->do_ioctl) +@@ -1045,27 +1060,154 @@ static int wireless_process_ioctl(struct + return -EOPNOTSUPP; + } + +-/* entry point from dev ioctl */ +-int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, +- void __user *arg) ++/* If command is `set a parameter', or `get the encoding parameters', ++ * check if the user has the right to do it. ++ */ ++static int wext_permission_check(unsigned int cmd) + { +- int ret; +- +- /* If command is `set a parameter', or +- * `get the encoding parameters', check if +- * the user has the right to do it */ + if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT) + && !capable(CAP_NET_ADMIN)) + return -EPERM; + ++ return 0; ++} ++ ++/* entry point from dev ioctl */ ++static int wext_ioctl_dispatch(struct net *net, struct ifreq *ifr, ++ unsigned int cmd, struct iw_request_info *info, ++ wext_ioctl_func standard, ++ wext_ioctl_func private) ++{ ++ int ret = wext_permission_check(cmd); ++ ++ if (ret) ++ return ret; ++ + dev_load(net, ifr->ifr_name); + rtnl_lock(); +- ret = wireless_process_ioctl(net, ifr, cmd); ++ ret = wireless_process_ioctl(net, ifr, cmd, info, standard, private); + rtnl_unlock(); +- if (IW_IS_GET(cmd) && copy_to_user(arg, ifr, sizeof(struct iwreq))) ++ ++ return ret; ++} ++ ++int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, ++ void __user *arg) ++{ ++ struct iw_request_info info = { .cmd = cmd, .flags = 0 }; ++ int ret; ++ ++ ret = wext_ioctl_dispatch(net, ifr, cmd, &info, ++ ioctl_standard_call, ++ ioctl_private_call); ++ if (ret >= 0 && ++ IW_IS_GET(cmd) && ++ copy_to_user(arg, ifr, sizeof(struct iwreq))) ++ return -EFAULT; ++ ++ return ret; ++} ++ ++#ifdef CONFIG_COMPAT ++static int compat_standard_call(struct net_device *dev, ++ struct iwreq *iwr, ++ unsigned int cmd, ++ struct iw_request_info *info, ++ iw_handler handler) ++{ ++ const struct iw_ioctl_description *descr; ++ struct compat_iw_point *iwp_compat; ++ struct iw_point iwp; ++ int err; ++ ++ descr = standard_ioctl + (cmd - SIOCIWFIRST); ++ ++ if (descr->header_type != IW_HEADER_TYPE_POINT) ++ return ioctl_standard_call(dev, iwr, cmd, info, handler); ++ ++ iwp_compat = (struct compat_iw_point *) &iwr->u.data; ++ iwp.pointer = compat_ptr(iwp_compat->pointer); ++ iwp.length = iwp_compat->length; ++ iwp.flags = iwp_compat->flags; ++ ++ err = ioctl_standard_iw_point(&iwp, cmd, descr, handler, dev, info); ++ ++ iwp_compat->pointer = ptr_to_compat(iwp.pointer); ++ iwp_compat->length = iwp.length; ++ iwp_compat->flags = iwp.flags; ++ ++ return err; ++} ++ ++static int compat_private_call(struct net_device *dev, struct iwreq *iwr, ++ unsigned int cmd, struct iw_request_info *info, ++ iw_handler handler) ++{ ++ const struct iw_priv_args *descr; ++ int ret, extra_size; ++ ++ extra_size = get_priv_descr_and_size(dev, cmd, &descr); ++ ++ /* Check if we have a pointer to user space data or not. */ ++ if (extra_size == 0) { ++ /* No extra arguments. Trivial to handle */ ++ ret = handler(dev, info, &(iwr->u), (char *) &(iwr->u)); ++ } else { ++ struct compat_iw_point *iwp_compat; ++ struct iw_point iwp; ++ ++ iwp_compat = (struct compat_iw_point *) &iwr->u.data; ++ iwp.pointer = compat_ptr(iwp_compat->pointer); ++ iwp.length = iwp_compat->length; ++ iwp.flags = iwp_compat->flags; ++ ++ ret = ioctl_private_iw_point(&iwp, cmd, descr, ++ handler, dev, info, extra_size); ++ ++ iwp_compat->pointer = ptr_to_compat(iwp.pointer); ++ iwp_compat->length = iwp.length; ++ iwp_compat->flags = iwp.flags; ++ } ++ ++ /* Call commit handler if needed and defined */ ++ if (ret == -EIWCOMMIT) ++ ret = call_commit_handler(dev); ++ ++ return ret; ++} ++ ++int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, ++ unsigned long arg) ++{ ++ void __user *argp = (void __user *)arg; ++ struct iw_request_info info; ++ struct iwreq iwr; ++ char *colon; ++ int ret; ++ ++ if (copy_from_user(&iwr, argp, sizeof(struct iwreq))) ++ return -EFAULT; ++ ++ iwr.ifr_name[IFNAMSIZ-1] = 0; ++ colon = strchr(iwr.ifr_name, ':'); ++ if (colon) ++ *colon = 0; ++ ++ info.cmd = cmd; ++ info.flags = IW_REQUEST_FLAG_COMPAT; ++ ++ ret = wext_ioctl_dispatch(net, (struct ifreq *) &iwr, cmd, &info, ++ compat_standard_call, ++ compat_private_call); ++ ++ if (ret >= 0 && ++ IW_IS_GET(cmd) && ++ copy_to_user(argp, &iwr, sizeof(struct iwreq))) + return -EFAULT; ++ + return ret; + } ++#endif + + /************************* EVENT PROCESSING *************************/ + /* linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.44 -r 1.45 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- linux-2.6-wireless.patch 27 Jun 2008 19:43:50 -0000 1.44 +++ linux-2.6-wireless.patch 2 Jul 2008 21:23:38 -0000 1.45 @@ -1,3 +1,41 @@ +commit 23976efedd5ecb420b87455787c537eb4aed1981 +Author: Emmanuel Grumbach +Date: Sat Jun 28 02:50:13 2008 +0300 + + mac80211: don't accept WEP keys other than WEP40 and WEP104 + + This patch makes mac80211 refuse a WEP key whose length is not WEP40 nor + WEP104. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 1bcca3c463e4930cef9986b05165bb0b3eb46f63 +Author: Pavel Roskin +Date: Fri Jun 27 16:19:58 2008 -0400 + + hostap: fix sparse warnings + + Rewrite AID calculation in handle_pspoll() to avoid truncating bits. + Make hostap_80211_header_parse() static, don't export it. Avoid + shadowing variables. + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 15ea0ebc5b7305cc75189cb6b7924d0db5278e0c +Author: Pavel Roskin +Date: Fri Jun 27 16:19:52 2008 -0400 + + hostap: don't report useless WDS frames by default + + DEBUG_EXTRA is reported to the kernel log by default, but DEBUG_EXTRA2 + is not. Unrelated WDS frames pollute the log unnecessarily. + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + commit 00eb7fe77eb455f807c396f9917f0f623d4c84bb Author: Emmanuel Grumbach Date: Thu Jun 26 12:13:46 2008 +0300 @@ -9178,8 +9216,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-01 13:34:56.000000000 -0400 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -9377,8 +9415,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-01 13:34:56.000000000 -0400 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -9466,8 +9504,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 13:34:56.000000000 -0400 @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; @@ -9722,8 +9760,8 @@ /* diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-01 13:34:56.000000000 -0400 @@ -30,7 +30,6 @@ #include @@ -10073,8 +10111,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 13:34:56.000000000 -0400 @@ -58,10 +58,6 @@ #include "reg.h" #include "debug.h" @@ -11128,8 +11166,8 @@ memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats)); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-01 13:34:56.000000000 -0400 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -11175,8 +11213,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-01 13:34:56.000000000 -0400 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -11351,8 +11389,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-01 13:34:56.000000000 -0400 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -11437,8 +11475,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-01 13:34:56.000000000 -0400 @@ -1,4 +1,4 @@ - /* +/* @@ -13033,8 +13071,8 @@ /****************\ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-01 13:34:56.000000000 -0400 @@ -173,7 +173,10 @@ struct ath5k_eeprom_info { * (rX: reserved fields possibily used by future versions of the ar5k chipset) */ @@ -13236,8 +13274,8 @@ */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-01 13:34:57.000000000 -0400 @@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini { AR5K_PHY(644), 0x00806333 }, { AR5K_PHY(645), 0x00106c10 }, @@ -13760,8 +13798,8 @@ } diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-06-27 15:17:27.000000000 -0400 +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-01 13:34:57.000000000 -0400 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -13801,8 +13839,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-01 13:34:26.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-01 13:34:57.000000000 -0400 @@ -1,2 +1,6 @@ -ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o -obj-$(CONFIG_ATH5K) += ath5k.o @@ -13813,8 +13851,8 @@ +ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o +obj-$(CONFIG_ATH5K) += ath5k.o diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-06-27 15:17:11.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c 2008-06-27 15:17:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-07-01 13:34:26.000000000 -0400 [...3488 lines suppressed...] diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h ---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-01 13:34:58.000000000 -0400 @@ -11,7 +11,7 @@ #include @@ -125568,8 +125745,8 @@ #endif /* TKIP_H */ diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c ---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-01 13:34:58.000000000 -0400 @@ -25,11 +25,12 @@ #include @@ -127024,8 +127201,8 @@ return skb; } diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c ---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-01 13:34:58.000000000 -0400 @@ -25,7 +25,8 @@ #include @@ -127344,8 +127521,8 @@ -EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); +EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c ---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-01 13:34:58.000000000 -0400 @@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -127436,8 +127613,8 @@ + return TX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h ---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-01 13:34:58.000000000 -0400 @@ -14,7 +14,7 @@ #include #include @@ -127462,9 +127639,9 @@ #endif /* WEP_H */ diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-27 15:17:28.000000000 -0400 -@@ -0,0 +1,1164 @@ +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-01 13:35:13.000000000 -0400 +@@ -0,0 +1,1171 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. + * Copyright 2005-2006, Devicescape Software, Inc. @@ -127562,6 +127739,13 @@ + } + } + ++ if (alg == ALG_WEP && ++ key_len != LEN_WEP40 && key_len != LEN_WEP104) { ++ ieee80211_key_free(key); ++ err = -EINVAL; ++ goto out_unlock; ++ } ++ + ieee80211_key_link(key, sdata, sta); + + if (set_tx_key || (!sta && !sdata->default_key && key)) @@ -128630,8 +128814,8 @@ + .get_wireless_stats = ieee80211_get_wireless_stats, +}; diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-01 13:34:58.000000000 -0400 @@ -19,10 +19,13 @@ #include "wme.h" @@ -128841,8 +129025,8 @@ + } +} diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-01 13:34:58.000000000 -0400 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -128888,8 +129072,8 @@ { return 0; diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-01 13:34:58.000000000 -0400 @@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const } @@ -129269,8 +129453,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h ---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-01 13:34:58.000000000 -0400 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -129304,8 +129488,8 @@ #endif /* WPA_H */ diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 13:34:58.000000000 -0400 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -129355,8 +129539,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h ---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-01 13:34:58.000000000 -0400 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -129366,8 +129550,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile ---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-01 13:34:58.000000000 -0400 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -129376,8 +129560,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c ---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-01 13:34:58.000000000 -0400 @@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 }, [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, @@ -130068,8 +130252,8 @@ /* multicast groups */ diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-27 15:17:28.000000000 -0400 +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-01 13:34:58.000000000 -0400 @@ -0,0 +1,180 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -130252,8 +130436,8 @@ + handle_band(wiphy->bands[band], rd); +} diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c ---- /dev/null 2008-06-26 08:31:46.303004729 -0400 -+++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-27 15:17:28.000000000 -0400 +--- /dev/null 2008-07-01 08:25:54.335004873 -0400 ++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-01 13:34:58.000000000 -0400 @@ -0,0 +1,121 @@ +/* + * Wireless utility functions @@ -130377,8 +130561,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-27 15:17:13.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-27 15:17:28.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 13:34:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 13:34:58.000000000 -0400 @@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; From fedora-extras-commits at redhat.com Wed Jul 2 21:29:31 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 2 Jul 2008 21:29:31 GMT Subject: rpms/mtd-utils/devel .cvsignore, 1.4, 1.5 mtd-utils.spec, 1.9, 1.10 sources, 1.4, 1.5 mtd-utils-1.1.0-mcast-git.patch, 1.1, NONE mtd-utils-make-ubi.patch, 1.2, NONE Message-ID: <200807022129.m62LTVrT021386@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21347 Modified Files: .cvsignore mtd-utils.spec sources Removed Files: mtd-utils-1.1.0-mcast-git.patch mtd-utils-make-ubi.patch Log Message: 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mtd-utils/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Aug 2007 16:01:13 -0000 1.4 +++ .cvsignore 2 Jul 2008 21:28:40 -0000 1.5 @@ -1 +1 @@ -mtd-utils-1.1.0.tar.bz2 +mtd-utils-1.2.0.tar.bz2 Index: mtd-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/mtd-utils/devel/mtd-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mtd-utils.spec 19 Feb 2008 02:03:31 -0000 1.9 +++ mtd-utils.spec 2 Jul 2008 21:28:40 -0000 1.10 @@ -1,13 +1,11 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.linux-mtd.infradead.org/ Source0: ftp://ftp.infradead.org/pub/mtd-utils/%{name}-%{version}.tar.bz2 -Patch0: mtd-utils-1.1.0-mcast-git.patch -Patch1: mtd-utils-make-ubi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libacl-devel lzo-devel @@ -15,14 +13,19 @@ The mtd-utils package contains utilities related to handling MTD devices, and for dealing with FTL, NFTL JFFS2 etc. +%package ubi +Summary: Utilities for dealing with UBI +Group: Applications/System + +%description ubi +The mtd-utils-ubi package contains utilities for manipulating UBI on +MTD (flash) devices. + %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -make OPTFLAGS="$RPM_OPT_FLAGS" -make OPTFLAGS="$RPM_OPT_FLAGS" -C ubi-utils +CFLAGS="$RPM_OPT_FLAGS" make %install rm -rf $RPM_BUILD_ROOT @@ -35,12 +38,35 @@ %files %defattr(-,root,root,-) -%{_sbindir}/* +%{_sbindir}/bin2nand +%{_sbindir}/doc* +%{_sbindir}/flash* +%{_sbindir}/ftl* +%{_sbindir}/jffs2dump +%{_sbindir}/mkbootenv +%{_sbindir}/mkfs.jffs2 +%{_sbindir}/mtd_debug +%{_sbindir}/nand* +%{_sbindir}/nftl* +%{_sbindir}/recv_image +%{_sbindir}/rfd* +%{_sbindir}/serve_image +%{_sbindir}/sumtool %{_mandir}/*/* %doc COPYING device_table.txt +%files ubi +%{_sbindir}/mkpfi +%{_sbindir}/pddcustomize +%{_sbindir}/pfi* +%{_sbindir}/unubi +%{_sbindir}/ubi* + %changelog +* Wed Jul 02 2008 David Woodhouse - 1.2.0-1 +- Update to 1.2.0 + * Mon Feb 18 2008 Fedora Release Engineering - 1.1.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mtd-utils/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Aug 2007 16:01:13 -0000 1.4 +++ sources 2 Jul 2008 21:28:40 -0000 1.5 @@ -1 +1 @@ -05aa9b015625aa20afba728fb7ee47b3 mtd-utils-1.1.0.tar.bz2 +ca41f1fbaa056e8b8d71e8d52c0b1bad mtd-utils-1.2.0.tar.bz2 --- mtd-utils-1.1.0-mcast-git.patch DELETED --- --- mtd-utils-make-ubi.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 21:30:16 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 2 Jul 2008 21:30:16 GMT Subject: rpms/policycoreutils/F-9 .cvsignore, 1.181, 1.182 policycoreutils-rhat.patch, 1.368, 1.369 policycoreutils.spec, 1.527, 1.528 sources, 1.187, 1.188 Message-ID: <200807022130.m62LUG1w021426@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21357 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jul 2 2008 Dan Walsh 2.0.52-1 - Default prefix to "user" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/.cvsignore,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- .cvsignore 2 Jul 2008 02:08:02 -0000 1.181 +++ .cvsignore 2 Jul 2008 21:29:26 -0000 1.182 @@ -182,3 +182,4 @@ policycoreutils-2.0.50.tgz sepolgen-1.0.12.tgz policycoreutils-2.0.51.tgz +policycoreutils-2.0.52.tgz policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-rhat.patch,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- policycoreutils-rhat.patch 2 Jul 2008 02:08:03 -0000 1.368 +++ policycoreutils-rhat.patch 2 Jul 2008 21:29:26 -0000 1.369 @@ -1,15 +1,15 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.50/Makefile ---- nsapolicycoreutils/Makefile 2007-12-19 06:02:52.000000000 -0500 -+++ policycoreutils-2.0.50/Makefile 2008-07-01 14:59:58.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile +--- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-02 13:43:21.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.50/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2007-07-16 14:20:41.000000000 -0400 -+++ policycoreutils-2.0.50/restorecond/restorecond.c 2008-07-01 14:59:58.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-02 13:43:21.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -36,137 +36,26 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.50/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2008-05-06 14:33:04.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/semanage 2008-07-01 20:31:40.000000000 -0400 -@@ -43,49 +43,52 @@ - if __name__ == '__main__': - - def usage(message = ""): -- print _('\ --semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] \n\ --semanage login -{a|d|m} [-sr] login_name\n\ --semanage user -{a|d|m} [-LrRP] selinux_name\n\ --semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range\n\ --semanage interface -{a|d|m} [-tr] interface_spec\n\ --semanage fcontext -{a|d|m} [-frst] file_spec\n\ --semanage translation -{a|d|m} [-T] level\n\n\ --semanage boolean -{d|m} boolean\n\n\ --\ --Primary Options:\n\ --\ -- -a, --add Add a OBJECT record NAME\n\ -- -d, --delete Delete a OBJECT record NAME\n\ -- -m, --modify Modify a OBJECT record NAME\n\ -- -l, --list List the OBJECTS\n\n\ -- -C, --locallist List OBJECTS local customizations\n\n\ -- -D, --deleteall Remove all OBJECTS local customizations\n\ --\ -- -h, --help Display this message\n\ -- -n, --noheading Do not print heading when listing OBJECTS\n\ -- -S, --store Select and alternate SELinux store to manage\n\n\ --Object-specific Options (see above):\n\ -- -f, --ftype File Type of OBJECT \n\ -- "" (all files) \n\ -- -- (regular file) \n\ -- -d (directory) \n\ -- -c (character device) \n\ -- -b (block device) \n\ -- -s (socket) \n\ -- -l (symbolic link) \n\ -- -p (named pipe) \n\n\ --\ -- -p, --proto Port protocol (tcp or udp)\n\ -- -P, --prefix Prefix for home directory labeling\n\ -- -L, --level Default SELinux Level (MLS/MCS Systems only)\n\ -- -R, --roles SELinux Roles (ex: "sysadm_r staff_r")\n\ -- -T, --trans SELinux Level Translation (MLS/MCS Systems only)\n\n\ --\ -- -s, --seuser SELinux User Name\n\ -- -t, --type SELinux Type for the object\n\ -- -r, --range MLS/MCS Security Range (MLS/MCS Systems only)\n\ --') -+ print _(""" -+semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] -+semanage login -{a|d|m} [-sr] login_name -+semanage user -{a|d|m} [-LrRP] selinux_name -+semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range -+semanage interface -{a|d|m} [-tr] interface_spec -+semanage fcontext -{a|d|m} [-frst] file_spec -+semanage translation -{a|d|m} [-T] level -+semanage boolean -{d|m} boolean -+semanage permissive -{d|a} type -+ -+Primary Options: -+ -+ -a, --add Add a OBJECT record NAME -+ -d, --delete Delete a OBJECT record NAME -+ -m, --modify Modify a OBJECT record NAME -+ -l, --list List the OBJECTS -+ -C, --locallist List OBJECTS local customizations -+ -D, --deleteall Remove all OBJECTS local customizations -+ -+ -h, --help Display this message -+ -n, --noheading Do not print heading when listing OBJECTS -+ -S, --store Select and alternate SELinux store to manage -+ -+Object-specific Options (see above): -+ -+ -f, --ftype File Type of OBJECT -+ "" (all files) -+ -- (regular file) -+ -d (directory) -+ -c (character device) -+ -b (block device) -+ -s (socket) -+ -l (symbolic link) -+ -p (named pipe) -+ -+ -p, --proto Port protocol (tcp or udp) -+ -P, --prefix Prefix for home directory labeling -+ -L, --level Default SELinux Level (MLS/MCS Systems only) -+ -R, --roles SELinux Roles (ex: "sysadm_r staff_r") -+ -T, --trans SELinux Level Translation (MLS/MCS Systems only) -+ -+ -s, --seuser SELinux User Name -+ -t, --type SELinux Type for the object -+ -r, --range MLS/MCS Security Range (MLS/MCS Systems only) -+""") - print message - sys.exit(1) - -@@ -112,6 +115,8 @@ - valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] - valid_option["boolean"] = [] - valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0" ] -+ valid_option["permissive"] = [] -+ valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ] - return valid_option - - # -@@ -266,6 +271,9 @@ - if object == "translation": - OBJECT = seobject.setransRecords() - -+ if object == "permissive": -+ OBJECT = seobject.permissiveRecords(store) -+ - if list: - OBJECT.list(heading, locallist) - sys.exit(0); -@@ -302,6 +310,9 @@ - - if object == "fcontext": - OBJECT.add(target, setype, ftype, serange, seuser) -+ if object == "permissive": -+ OBJECT.add(target) -+ - sys.exit(0); - - if modify: -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.50/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2008-05-06 14:33:04.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/semanage.8 2008-07-01 20:33:48.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-02 13:43:21.000000000 -0400 +@@ -297,9 +297,10 @@ + if object == "user": + rlist = roles.split() + if len(rlist) == 0: +- raise ValueError(_("You must specify a role")) +- if prefix == "": +- raise ValueError(_("You must specify a prefix")) ++ raise ValueError(_("You must specify a role")) ++ if prefix == "": ++ prefix = "user" ++ + OBJECT.add(target, rlist, selevel, serange, prefix) + + if object == "port": +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 +--- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-02 13:43:21.000000000 -0400 @@ -3,7 +3,7 @@ semanage \- SELinux Policy Management tool @@ -176,16 +65,7 @@ .br .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean .br -@@ -17,6 +17,8 @@ - .br - .B semanage fcontext \-{a|d|m} [\-frst] file_spec - .br -+.B semanage permissive \-{a|d} type -+.br - .B semanage translation \-{a|d|m} [\-T] level - .P - -@@ -85,6 +87,9 @@ +@@ -87,6 +87,9 @@ .I \-s, \-\-seuser SELinux user name .TP @@ -195,150 +75,3 @@ .I \-t, \-\-type SELinux Type for the object .TP -@@ -101,10 +106,11 @@ - $ semanage fcontext -a -t httpd_sys_content_t "/web(/.*)?" - # Allow Apache to listen on port 81 - $ semanage port -a -t http_port_t -p tcp 81 -+# Change apache to a permissive domain -+$ semanage permissive -a http_t - .fi - - .SH "AUTHOR" - This man page was written by Daniel Walsh and - Russell Coker . - Examples by Thomas Bleher . -- -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.50/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-05-16 10:55:38.000000000 -0400 -+++ policycoreutils-2.0.50/semanage/seobject.py 2008-07-01 20:30:55.000000000 -0400 -@@ -1,5 +1,5 @@ - #! /usr/bin/python -E --# Copyright (C) 2005, 2006, 2007 Red Hat -+# Copyright (C) 2005, 2006, 2007, 2008 Red Hat - # see file 'COPYING' for use and warranty information - # - # semanage is a tool for managing SELinux configuration files -@@ -24,7 +24,9 @@ - import pwd, string, selinux, tempfile, os, re, sys - from semanage import *; - PROGNAME="policycoreutils" -+import sepolgen.module as module - -+import commands - import gettext - gettext.bindtextdomain(PROGNAME, "/usr/share/locale") - gettext.textdomain(PROGNAME) -@@ -246,7 +248,103 @@ - os.close(fd) - os.rename(newfilename, self.filename) - os.system("/sbin/service mcstrans reload > /dev/null") -- -+ -+class permissiveRecords: -+ def __init__(self, store): -+ self.store = store -+ self.sh = semanage_handle_create() -+ if not self.sh: -+ raise ValueError(_("Could not create semanage handle")) -+ -+ if store != "": -+ semanage_select_store(self.sh, store, SEMANAGE_CON_DIRECT); -+ -+ self.semanaged = semanage_is_managed(self.sh) -+ -+ if not self.semanaged: -+ semanage_handle_destroy(self.sh) -+ raise ValueError(_("SELinux policy is not managed or store cannot be accessed.")) -+ -+ rc = semanage_access_check(self.sh) -+ if rc < SEMANAGE_CAN_READ: -+ semanage_handle_destroy(self.sh) -+ raise ValueError(_("Cannot read policy store.")) -+ -+ rc = semanage_connect(self.sh) -+ if rc < 0: -+ semanage_handle_destroy(self.sh) -+ raise ValueError(_("Could not establish semanage connection")) -+ -+ def get_all(self): -+ l = [] -+ (rc, mlist, number) = semanage_module_list(self.sh) -+ if rc < 0: -+ raise ValueError(_("Could not list SELinux modules")) -+ -+ for i in range(number): -+ mod = semanage_module_list_nth(mlist, i) -+ name = semanage_module_get_name(mod) -+ if name and name.startswith("permissive_"): -+ l.append(name.split("permissive_")[1]) -+ return l -+ -+ def list(self,heading = 1, locallist = 0): -+ if heading: -+ print "\n%-25s\n" % (_("Permissive Types")) -+ for t in self.get_all(): -+ print t -+ -+ -+ def add(self, type): -+ name = "permissive_%s" % type -+ dirname = "/var/lib/selinux" -+ os.chdir(dirname) -+ filename = "%s.te" % name -+ modtxt = """ -+module %s 1.0; -+ -+require { -+ type %s; -+} -+ -+permissive %s; -+""" % (name, type, type) -+ fd = open(filename,'w') -+ fd.write(modtxt) -+ fd.close() -+ mc = module.ModuleCompiler() -+ mc.create_module_package(filename, 1) -+ fd = open("permissive_%s.pp" % type) -+ data = fd.read() -+ fd.close() -+ -+ rc = semanage_module_install(self.sh, data, len(data)); -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError(_("Could not set permissive domain %s") % name) -+ for root, dirs, files in os.walk("tmp", topdown=False): -+ for name in files: -+ os.remove(os.path.join(root, name)) -+ for name in dirs: -+ os.rmdir(os.path.join(root, name)) -+ -+ if rc != 0: -+ raise ValueError(out) -+ -+ -+ def delete(self, name): -+ for n in name.split(): -+ rc = semanage_module_remove(self.sh, "permissive_%s" % n) -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError(_("Could not remove permissive domain %s") % name) -+ -+ def deleteall(self): -+ l = self.get_all() -+ if len(l) > 0: -+ all = " ".join(l) -+ self.delete(all) -+ - class semanageRecords: - def __init__(self, store): - self.sh = semanage_handle_create() -@@ -464,7 +562,7 @@ - def __init__(self, store = ""): - semanageRecords.__init__(self, store) - -- def add(self, name, roles, selevel, serange, prefix): -+ def add(self, name, roles, selevel, serange, prefix = "user"): - if is_mls_enabled == 1: - if serange == "": - serange = "s0" Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils.spec,v retrieving revision 1.527 retrieving revision 1.528 diff -u -r1.527 -r1.528 --- policycoreutils.spec 2 Jul 2008 02:08:03 -0000 1.527 +++ policycoreutils.spec 2 Jul 2008 21:29:26 -0000 1.528 @@ -5,8 +5,8 @@ %define sepolgenver 1.0.12 Summary: SELinux policy core utilities Name: policycoreutils -Version: 2.0.51 -Release: 2%{?dist} +Version: 2.0.52 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ fi %changelog +* Wed Jul 2 2008 Dan Walsh 2.0.52-1 +- Default prefix to "user" + * Tue Jul 1 2008 Dan Walsh 2.0.50-2 - Remove semodule use within semanage - Fix launching of polgengui from toolbar Index: sources =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/sources,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- sources 2 Jul 2008 02:08:03 -0000 1.187 +++ sources 2 Jul 2008 21:29:26 -0000 1.188 @@ -1,2 +1,2 @@ 4813a1ed80f19068ed9897165f073e8b sepolgen-1.0.12.tgz -9189683c9449c459ad5d7870d9e22085 policycoreutils-2.0.51.tgz +311e95b3374fe1993fb91a303b6675b2 policycoreutils-2.0.52.tgz From fedora-extras-commits at redhat.com Wed Jul 2 21:41:20 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 2 Jul 2008 21:41:20 GMT Subject: rpms/kernel/F-8 linux-2.6-wireless-fixups.patch,1.4,1.5 Message-ID: <200807022141.m62LfKfT021727@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21691 Modified Files: linux-2.6-wireless-fixups.patch Log Message: same fixup as in F9 build linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-fixups.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-wireless-fixups.patch 2 Jul 2008 21:23:38 -0000 1.4 +++ linux-2.6-wireless-fixups.patch 2 Jul 2008 21:40:22 -0000 1.5 @@ -1063,3 +1063,15 @@ return; skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); +diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c +--- linux-2.6.25.noarch/net/socket.c.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.000000000 -0400 +@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil + struct net *net; + + sk = sock->sk; +- net = sock_net(sk); ++ net = sk->sk_net; + + if (sock->ops->compat_ioctl) + ret = sock->ops->compat_ioctl(sock, cmd, arg); From fedora-extras-commits at redhat.com Wed Jul 2 21:45:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 2 Jul 2008 21:45:03 GMT Subject: rpms/logjam/F-8 logjam.spec,1.42,1.43 Message-ID: <200807022145.m62Lj3QW021931@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21895 Modified Files: logjam.spec Log Message: dont try to include non-existent patches Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- logjam.spec 2 Jul 2008 21:16:57 -0000 1.42 +++ logjam.spec 2 Jul 2008 21:43:57 -0000 1.43 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 24%{?dist} +Release: 24%{?dist}.1 Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -28,7 +28,6 @@ Patch8: logjam-4.5.3-gtkspell.patch Patch9: http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff Patch10: logjam-4.5.3-rhythmbox-fix.patch -Patch11: logjam-libsoup24.diff Patch12: logjam-4.5.3-disable-threads.patch Patch13: logjam-title.patch Patch14: logjam-4.5.3-tags.patch @@ -120,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 2 2008 Tom "spot" Callaway - 4.5.3-24.1 +- don't try to include non-existant patches + * Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 - fix ukranian translation (bz 447145) - fix docked behavior (bz 447146) From fedora-extras-commits at redhat.com Wed Jul 2 21:47:48 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 2 Jul 2008 21:47:48 GMT Subject: rpms/mtd-utils/F-9 .cvsignore, 1.4, 1.5 mtd-utils.spec, 1.9, 1.10 sources, 1.4, 1.5 mtd-utils-1.1.0-mcast-git.patch, 1.1, NONE mtd-utils-make-ubi.patch, 1.2, NONE Message-ID: <200807022147.m62LlmuP022060@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/mtd-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21963 Modified Files: .cvsignore mtd-utils.spec sources Removed Files: mtd-utils-1.1.0-mcast-git.patch mtd-utils-make-ubi.patch Log Message: 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mtd-utils/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Aug 2007 16:01:13 -0000 1.4 +++ .cvsignore 2 Jul 2008 21:46:58 -0000 1.5 @@ -1 +1 @@ -mtd-utils-1.1.0.tar.bz2 +mtd-utils-1.2.0.tar.bz2 Index: mtd-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/mtd-utils/F-9/mtd-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mtd-utils.spec 19 Feb 2008 02:03:31 -0000 1.9 +++ mtd-utils.spec 2 Jul 2008 21:46:58 -0000 1.10 @@ -1,13 +1,11 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.linux-mtd.infradead.org/ Source0: ftp://ftp.infradead.org/pub/mtd-utils/%{name}-%{version}.tar.bz2 -Patch0: mtd-utils-1.1.0-mcast-git.patch -Patch1: mtd-utils-make-ubi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libacl-devel lzo-devel @@ -15,14 +13,19 @@ The mtd-utils package contains utilities related to handling MTD devices, and for dealing with FTL, NFTL JFFS2 etc. +%package ubi +Summary: Utilities for dealing with UBI +Group: Applications/System + +%description ubi +The mtd-utils-ubi package contains utilities for manipulating UBI on +MTD (flash) devices. + %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -make OPTFLAGS="$RPM_OPT_FLAGS" -make OPTFLAGS="$RPM_OPT_FLAGS" -C ubi-utils +CFLAGS="$RPM_OPT_FLAGS" make %install rm -rf $RPM_BUILD_ROOT @@ -35,12 +38,35 @@ %files %defattr(-,root,root,-) -%{_sbindir}/* +%{_sbindir}/bin2nand +%{_sbindir}/doc* +%{_sbindir}/flash* +%{_sbindir}/ftl* +%{_sbindir}/jffs2dump +%{_sbindir}/mkbootenv +%{_sbindir}/mkfs.jffs2 +%{_sbindir}/mtd_debug +%{_sbindir}/nand* +%{_sbindir}/nftl* +%{_sbindir}/recv_image +%{_sbindir}/rfd* +%{_sbindir}/serve_image +%{_sbindir}/sumtool %{_mandir}/*/* %doc COPYING device_table.txt +%files ubi +%{_sbindir}/mkpfi +%{_sbindir}/pddcustomize +%{_sbindir}/pfi* +%{_sbindir}/unubi +%{_sbindir}/ubi* + %changelog +* Wed Jul 02 2008 David Woodhouse - 1.2.0-1 +- Update to 1.2.0 + * Mon Feb 18 2008 Fedora Release Engineering - 1.1.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mtd-utils/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Aug 2007 16:01:13 -0000 1.4 +++ sources 2 Jul 2008 21:46:58 -0000 1.5 @@ -1 +1 @@ -05aa9b015625aa20afba728fb7ee47b3 mtd-utils-1.1.0.tar.bz2 +ca41f1fbaa056e8b8d71e8d52c0b1bad mtd-utils-1.2.0.tar.bz2 --- mtd-utils-1.1.0-mcast-git.patch DELETED --- --- mtd-utils-make-ubi.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 2 21:49:48 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 2 Jul 2008 21:49:48 GMT Subject: rpms/NetworkManager/devel .cvsignore, 1.78, 1.79 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.18, 1.19 NetworkManager.spec, 1.226, 1.227 sources, 1.112, 1.113 Message-ID: <200807022149.m62LnmGR022200@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22151 Modified Files: .cvsignore NetworkManager-0.6.5-fixup-internal-applet-build.patch NetworkManager.spec sources Log Message: * Wed Jul 02 2008 Dan Williams - 1:0.7.0-0.10.svn3801 - Move VPN configuration into connection editor - Fix mobile broadband username/password issues - Fix issues with broken rfkill setups (rh #448889) - Honor APN setting for GSM mobile broadband configurations - Fix adding CDMA connections in the connection editor Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- .cvsignore 19 May 2008 17:46:12 -0000 1.78 +++ .cvsignore 2 Jul 2008 21:49:07 -0000 1.79 @@ -104,3 +104,5 @@ nm-applet-0.7.0.svn694.tar.gz NetworkManager-0.7.0.svn3675.tar.gz nm-applet-0.7.0.svn727.tar.gz +NetworkManager-0.7.0.svn3801.tar.gz +nm-applet-0.7.0.svn774.tar.gz NetworkManager-0.6.5-fixup-internal-applet-build.patch: Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- NetworkManager-0.6.5-fixup-internal-applet-build.patch 19 May 2008 17:46:12 -0000 1.18 +++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 2 Jul 2008 21:49:08 -0000 1.19 @@ -1,41 +1,17 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac --- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 +++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -60,9 +60,6 @@ AC_C_BIGENDIAN +@@ -60,10 +60,6 @@ AC_C_BIGENDIAN PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 glib-2.0 >= 2.10 - NetworkManager >= 0.7.0 -- libnm_glib -- libnm-util +- libnm_glib >= 0.7.0 +- libnm-util >= 0.7.0 +- libnm_glib_vpn >= 0.7.0 gtk+-2.0 >= 2.10 libglade-2.0 gconf-2.0 -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-22 22:54:27.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -1,6 +1,10 @@ - - bin_PROGRAMS = nm-vpn-properties - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_vpn_propertiesdir=$(includedir)/NetworkManager - - nm_vpn_properties_HEADERS = \ -@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \ - - nm_vpn_properties_LDADD = \ - $(NMA_LIBS) \ -- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la -+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - CLEANFILES = $(server_DATA) *.bak *.gladep *~ - diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500 @@ -102,7 +78,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -2,6 +2,10 @@ NULL= +@@ -2,6 +2,10 @@ bin_PROGRAMS = nm-connection-editor @@ -113,18 +89,18 @@ nm_connection_editor_CPPFLAGS = \ $(NMA_CFLAGS) \ -DICONDIR=\""$(datadir)/icons"\" \ -@@ -29,8 +33,10 @@ nm_connection_editor_LDADD = \ - $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \ +@@ -59,7 +63,10 @@ ${top_builddir}/src/wireless-security/libwireless-security.la \ ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ + $(NMA_LIBS) \ - $(POLKIT_LIBS) + $(POLKIT_LIBS) \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la gladedir = $(datadir)/nm-applet - glade_DATA = nm-connection-editor.gladediff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am + glade_DATA = \ --- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500 @@ -4,6 +4,10 @@ NULL= Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- NetworkManager.spec 11 Jun 2008 16:15:16 -0000 1.226 +++ NetworkManager.spec 2 Jul 2008 21:49:08 -0000 1.227 @@ -9,8 +9,8 @@ %define libnl_version 1.0-0.15.pre8.git20071218 %define ppp_version 2.2.4 -%define snapshot svn3747 -%define applet_snapshot svn755 +%define snapshot svn3801 +%define applet_snapshot svn774 Name: NetworkManager Summary: Network connection manager and user applications @@ -171,7 +171,7 @@ # install NM make install DESTDIR=$RPM_BUILD_ROOT -%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ +%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install the applet pushd nm-applet-0.7.0 @@ -236,10 +236,10 @@ %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} %{_sbindir}/nm-system-settings -%{_sysconfdir}/nm-system-settings.conf -%dir %{_sysconfdir}/NetworkManager/ -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%dir %{_sysconfdir}/NetworkManager/VPN +%dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name}/dispatcher.d +%dir %{_sysconfdir}/%{name}/VPN +%{_sysconfdir}/%{name}/nm-system-settings.conf %{_bindir}/nm-tool %{_bindir}/nm-online %{_libexecdir}/nm-dhcp-client.action @@ -268,9 +268,7 @@ %defattr(-,root,root,0755) %{_sysconfdir}/dbus-1/system.d/nm-applet.conf %{_bindir}/nm-applet -%{_bindir}/nm-vpn-properties %{_bindir}/nm-connection-editor -%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png @@ -287,12 +285,20 @@ %{_includedir}/libnm-glib/*.h %{_includedir}/NetworkManager/nm-*.h %{_libdir}/pkgconfig/libnm_glib.pc +%{_libdir}/pkgconfig/libnm_glib_vpn.pc %{_libdir}/pkgconfig/libnm-util.pc %{_libdir}/libnm_glib.so %{_libdir}/libnm_glib_vpn.so %{_libdir}/libnm-util.so %changelog +* Wed Jul 02 2008 Dan Williams - 1:0.7.0-0.10.svn3801 +- Move VPN configuration into connection editor +- Fix mobile broadband username/password issues +- Fix issues with broken rfkill setups (rh #448889) +- Honor APN setting for GSM mobile broadband configurations +- Fix adding CDMA connections in the connection editor + * Wed Jun 11 2008 Dan Williams - 1:0.7.0-0.10.svn3747 - Update to latest SVN - Enable connection sharing Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- sources 11 Jun 2008 16:11:56 -0000 1.112 +++ sources 2 Jul 2008 21:49:09 -0000 1.113 @@ -1,2 +1,2 @@ -25a1612c01ec19ba2864ad97ac98c759 NetworkManager-0.7.0.svn3747.tar.gz -4ae0a5d13783f4de4e4e6f7fb949aaed nm-applet-0.7.0.svn755.tar.gz +4abf623e95a5d2d7465a49786bbe289f NetworkManager-0.7.0.svn3801.tar.gz +b9c38044c9b3b25cf71306eb3810e4d4 nm-applet-0.7.0.svn774.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 21:50:57 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 2 Jul 2008 21:50:57 GMT Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.16, 1.17 NetworkManager-vpnc.spec, 1.36, 1.37 sources, 1.19, 1.20 Message-ID: <200807022150.m62LovV6022301@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22256 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Wed Jul 02 2008 Dan Williams 1:0.7.0-10.svn3801 - Update for moving VPN editing into connection manager - Add option to disable Dead Peer Detection - Add option to select NAT Traversal mode Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 10 Apr 2008 03:54:43 -0000 1.16 +++ .cvsignore 2 Jul 2008 21:50:20 -0000 1.17 @@ -12,3 +12,4 @@ NetworkManager-vpnc-0.7.0.svn3109.tar.gz NetworkManager-vpnc-0.7.0.svn3502.tar.gz NetworkManager-vpnc-0.7.0.svn3549.tar.gz +NetworkManager-vpnc-0.7.0.svn3801.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- NetworkManager-vpnc.spec 2 May 2008 14:16:27 -0000 1.36 +++ NetworkManager-vpnc.spec 2 Jul 2008 21:50:20 -0000 1.37 @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.9.3.svn3623 +%define nm_version 1:0.7.0-0.10.svn3801 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn3627 +%define svn_snapshot svn3801 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc Epoch: 1 Version: 0.7.0 -Release: 0.7.7.%{svn_snapshot}%{?dist} +Release: 0.10.%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -100,6 +100,11 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Wed Jul 02 2008 Dan Williams 1:0.7.0-10.svn3801 +- Update for moving VPN editing into connection manager +- Add option to disable Dead Peer Detection +- Add option to select NAT Traversal mode + * Thu May 01 2008 Dan Williams 1:0.7.0-7.7.svn3627 - Update for compat with new NM bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 2 May 2008 14:16:27 -0000 1.19 +++ sources 2 Jul 2008 21:50:20 -0000 1.20 @@ -1 +1 @@ -6401add359698efdc15a65ee85a4cd4e NetworkManager-vpnc-0.7.0.svn3627.tar.gz +120fc7c68c3064a66c9c315f288550cc NetworkManager-vpnc-0.7.0.svn3801.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 21:54:20 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 2 Jul 2008 21:54:20 GMT Subject: rpms/openbabel/devel openbabel.spec,1.38,1.39 Message-ID: <200807022154.m62LsKHF022411@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22381 Modified Files: openbabel.spec Log Message: - removed weird Macintosh files Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- openbabel.spec 2 Jul 2008 18:49:45 -0000 1.38 +++ openbabel.spec 2 Jul 2008 21:53:29 -0000 1.39 @@ -90,6 +90,7 @@ %setup -q -n %{name}-%{version}%{beta_ver} %patch -p1 -b .gcc43 %patch1 -p1 -b .r +find . -name "._*" | xargs rm %build # don't reference m4 include directory which isn't shipped in the tarball @@ -190,6 +191,7 @@ - updated to 2.2.0 beta7 - new URL - dropped Python binding split patch (broken, reverted upstream) +- removed weird Macintosh files * Fri Jun 06 2008 Kevin Kofler 2.2.0-0.5.b5 - backport upstream patch to split Python binding (should fix #427700 for good) From fedora-extras-commits at redhat.com Wed Jul 2 22:05:18 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 2 Jul 2008 22:05:18 GMT Subject: rpms/kernel/F-9 config-generic, 1.105, 1.106 kernel.spec, 1.699, 1.700 linux-2.6-wireless-pending.patch, 1.54, 1.55 Message-ID: <200807022205.m62M5Ibo029209@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29159 Modified Files: config-generic kernel.spec linux-2.6-wireless-pending.patch Log Message: Upstream wireless updates from 2008-06-30 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- config-generic 30 Jun 2008 19:38:16 -0000 1.105 +++ config-generic 2 Jul 2008 22:04:18 -0000 1.106 @@ -1255,7 +1255,7 @@ CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.699 retrieving revision 1.700 diff -u -r1.699 -r1.700 --- kernel.spec 2 Jul 2008 02:13:21 -0000 1.699 +++ kernel.spec 2 Jul 2008 22:04:18 -0000 1.700 @@ -1861,6 +1861,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 02 2008 John W. Linville 2.6.25.9-81 +- Upstream wireless updates from 2008-06-30 + (http://marc.info/?l=linux-wireless&m=121486432315033&w=2) + * Tue Jul 01 2008 Dave Jones - Shorten summary in specfile. linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.54 -r 1.55 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- linux-2.6-wireless-pending.patch 1 Jul 2008 18:42:13 -0000 1.54 +++ linux-2.6-wireless-pending.patch 2 Jul 2008 22:04:18 -0000 1.55 @@ -1,3 +1,721 @@ +commit edbf873cb3e8c4ef71123e83b07f39ab69971910 +Author: Larry.Finger at lwfinger.net +Date: Mon Jun 30 10:39:49 2008 -0500 + + p54: Add quality output to iwlist and iwconfig + + The p54 driver family reports a quality of 0 in iwconfig and iwlist + output. This patch calculates a quality number as a percentage of the + rssi to the maximum signal of 127 reported as the maximum signal. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 22191a580c725ed5f285d0084bfa1d2f8b350a47 +Author: Johannes Berg +Date: Mon Jun 30 15:10:46 2008 +0200 + + mac80211: rework debug settings and make debugging safer + + This patch reworks the mac80211 debug settings making them more focused + and adding help text for those that didn't have one. It also removes a + number of printks that can be triggered remotely and add no value, e.g. + "too short deauthentication frame received - ignoring". + + If somebody really needs to debug that they should just add a monitor + interface and look at the frames in wireshark. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 3f1664e47dcd98b982f34dc39735f2b6706ad7ff +Author: Johannes Berg +Date: Mon Jun 30 15:10:45 2008 +0200 + + mac80211: get rid of function pointers in RX path + + This changes the RX path to no longer use function pointers for + RX handlers but rather invoke them directly. If debugging is + enabled, mark the RX handlers noinline because otherwise they + all get inlined into ieee80211_invoke_rx_handlers() which makes + it harder to see where a bug is. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 5807822f3d52179ec0a9091892e88dc4d4d3323b +Author: Johannes Berg +Date: Mon Jun 30 15:10:44 2008 +0200 + + mac80211: get rid of function pointers in TX path + + This changes the TX path to no longer use function pointers for + TX handlers but rather invoke them directly. If debugging is + enabled, mark the TX handlers noinline because otherwise they + all get inlined into invoke_tx_handlers() which makes it harder + to see where a bug is. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 444b6135791874d8e78ff47daab86d1b8ee4784f +Author: Zhu Yi +Date: Mon Jun 30 17:23:32 2008 +0800 + + iwl3945: remove RFKILL_STATE_HARD_BLOCKED warnings + + The patch fixes the compile warning of "enumeration value + ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch". + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit bd1092ceadee190604d8ff59faa97a974c3c1ecb +Author: Zhu Yi +Date: Mon Jun 30 17:23:31 2008 +0800 + + iwlwifi: fix iwl4965 temperature callback calibration issue + + The patch fixes the temperature calibration issue introduced by the + patch "iwlwifi: move RX stats to core, and move temperature to handler". + It also remove the second parameter "stats" since it is already copied + to priv->statistics. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 82c2e0895d1fa87c3206e3fe5f99dd51e2cf6371 +Author: Stefanik G??bor +Date: Mon Jun 30 17:23:30 2008 +0800 + + iwlwifi: enable packet injection for iwl3945 + + This patch enables packet injection on iwl3945 devices. Tested with + packetspammer and aireplay-ng. + + Signed-off-by: G??bor Stefanik + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit a6ecfe5a9bd32c9426f9af801e62f21da132a2cc +Author: Zhu Yi +Date: Mon Jun 30 17:23:29 2008 +0800 + + iwlwifi: drop skb silently for Tx request in monitor mode + + This patch fixes the problem to keep mac80211 resubmitting SKBs + when Tx request cannot be met in monitor mode. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 6fe878497b04b9c428842ab9c89c0e2d712860ad +Author: Rick Farrington +Date: Mon Jun 30 17:23:28 2008 +0800 + + iwlwifi: fix incorrect monitor mode operation + + This patch fixes monitor mode operation for iwlwifi. + + Problems addressed: + 1. when monitor mode was enabled, multiple, overlapped calls were being + made to 'iwl3945_bg_set_monitor' + + 2. when monitor mode was disabled (via the configure_filter callback), + the driver was still enabling monitor mode + + 3. when monitor mode was enabled, the selected channel was not set + (eg. 'iwconfig wlanx mode monitor channel n' DID NOT SET channel 'n' + when packet capture was subsequently enabled) + + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 32c932be01d96abe84340b0831db949ca4713292 +Author: Rick Farrington +Date: Mon Jun 30 17:23:27 2008 +0800 + + iwlwifi: fix incorrect 5GHz rates reported in monitor mode + + This patch fixes the rates reported in monitor mode operation + (Wireshark) for iwlwifi. + + Previously, packets with rates of 6M..24M would be reported + incorrectly and packets with rates of 36M..54M would not passed + up the stack. + + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 0a078ffa011209c307880da10917ef205b4b11f4 +Author: Tomas Winkler +Date: Mon Jun 30 17:23:26 2008 +0800 + + iwlwifi: fix 4965 uCode load + + This patch fixes uCode load in 4965 HW + + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit a9efa652cbfead13bbe200878f8a2d74f3543e1b +Author: Emmanuel Grumbach +Date: Mon Jun 30 17:23:25 2008 +0800 + + iwlwifi: clean up HW RF-kill state machine and restarts + + This patch cleans up HW RF-kill state machine. + + Signed-off-by: Mohamed Abbas + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 154b25ce9218fbe6eebacef7907fabf6d663e639 +Author: Emmanuel Grumbach +Date: Mon Jun 30 17:23:24 2008 +0800 + + iwlwifi: blocking mac_start until uCode is complete + + This patch makes iwl4965_mac_start block until the uCode has been + completely loaded. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 06da0699445631e6710b1f3b2e89570325b65e7e +Author: Ron Rindjunsky [...17752 lines suppressed...] + return RX_DROP_UNUSABLE; + +- printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from " +- "%s\n", rx->dev->name, print_mac(mac, sa)); +- + mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx, + (void *) skb->data); + return RX_DROP_UNUSABLE; +@@ -176,59 +155,58 @@ ieee80211_rx_h_michael_mic_verify(struct skb_trim(skb, skb->len - MICHAEL_MIC_LEN); /* update IV in key information to be able to detect replays */ @@ -72357,7 +77365,7 @@ return 0; } -@@ -246,28 +227,16 @@ ieee80211_tx_result +@@ -246,28 +224,16 @@ ieee80211_tx_result ieee80211_crypto_tkip_encrypt(struct ieee80211_tx_data *tx) { struct sk_buff *skb = tx->skb; @@ -72388,7 +77396,7 @@ return TX_DROP; } } -@@ -280,14 +249,12 @@ ieee80211_rx_result +@@ -280,14 +246,12 @@ ieee80211_rx_result ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; @@ -72404,7 +77412,24 @@ if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) return RX_CONTINUE; -@@ -429,36 +396,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 +@@ -315,15 +279,8 @@ ieee80211_crypto_tkip_decrypt(struct iee + hdr->addr1, hwaccel, rx->queue, + &rx->tkip_iv32, + &rx->tkip_iv16); +- if (res != TKIP_DECRYPT_OK || wpa_test) { +-#ifdef CONFIG_MAC80211_DEBUG +- if (net_ratelimit()) +- printk(KERN_DEBUG "%s: TKIP decrypt failed for RX " +- "frame from %s (res=%d)\n", rx->dev->name, +- print_mac(mac, rx->sta->addr), res); +-#endif /* CONFIG_MAC80211_DEBUG */ ++ if (res != TKIP_DECRYPT_OK || wpa_test) + return RX_DROP_UNUSABLE; +- } + + /* Trim ICV */ + skb_trim(skb, skb->len - TKIP_ICV_LEN); +@@ -429,36 +386,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 } @@ -72461,7 +77486,7 @@ pos = skb_push(skb, CCMP_HDR_LEN); memmove(pos, pos + CCMP_HDR_LEN, hdrlen); -@@ -478,7 +450,7 @@ static int ccmp_encrypt_skb(struct ieee8 +@@ -478,7 +440,7 @@ static int ccmp_encrypt_skb(struct ieee8 if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) { /* hwaccel - with preallocated room for CCMP header */ @@ -72470,7 +77495,7 @@ return 0; } -@@ -495,28 +467,16 @@ ieee80211_tx_result +@@ -495,28 +457,16 @@ ieee80211_tx_result ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx) { struct sk_buff *skb = tx->skb; @@ -72501,7 +77526,7 @@ return TX_DROP; } } -@@ -529,7 +489,6 @@ ieee80211_rx_result +@@ -529,7 +479,6 @@ ieee80211_rx_result ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; @@ -72509,7 +77534,7 @@ int hdrlen; struct ieee80211_key *key = rx->key; struct sk_buff *skb = rx->skb; -@@ -537,8 +496,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee +@@ -537,8 +486,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee int data_len; DECLARE_MAC_BUF(mac); @@ -72519,9 +77544,39 @@ if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) return RX_CONTINUE; +@@ -554,16 +502,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee + (void) ccmp_hdr2pn(pn, skb->data + hdrlen); + + if (memcmp(pn, key->u.ccmp.rx_pn[rx->queue], CCMP_PN_LEN) <= 0) { +-#ifdef CONFIG_MAC80211_DEBUG +- u8 *ppn = key->u.ccmp.rx_pn[rx->queue]; +- +- printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from " +- "%s (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN " +- "%02x%02x%02x%02x%02x%02x)\n", rx->dev->name, +- print_mac(mac, rx->sta->addr), +- pn[0], pn[1], pn[2], pn[3], pn[4], pn[5], +- ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]); +-#endif /* CONFIG_MAC80211_DEBUG */ + key->u.ccmp.replays++; + return RX_DROP_UNUSABLE; + } +@@ -583,12 +521,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee + skb->data + hdrlen + CCMP_HDR_LEN, data_len, + skb->data + skb->len - CCMP_MIC_LEN, + skb->data + hdrlen + CCMP_HDR_LEN)) { +-#ifdef CONFIG_MAC80211_DEBUG +- if (net_ratelimit()) +- printk(KERN_DEBUG "%s: CCMP decrypt failed " +- "for RX frame from %s\n", rx->dev->name, +- print_mac(mac, rx->sta->addr)); +-#endif /* CONFIG_MAC80211_DEBUG */ + return RX_DROP_UNUSABLE; + } + } diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c ---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-02 17:33:16.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-02 17:33:30.000000000 -0400 @@ -39,8 +39,56 @@ MODULE_LICENSE("GPL"); static LIST_HEAD(rfkill_list); /* list of registered rf switches */ static DEFINE_MUTEX(rfkill_mutex); @@ -72983,8 +78038,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-02 17:33:16.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-02 17:33:30.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -73142,8 +78197,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-02 17:33:16.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-02 17:33:30.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -73152,8 +78207,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-02 17:33:16.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-02 17:33:30.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -73183,8 +78238,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-30 14:03:46.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-30 14:04:54.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-02 17:33:16.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-02 17:33:30.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -73248,8 +78303,8 @@ /* exported functions */ diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-30 14:04:55.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-02 17:33:16.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-02 17:33:30.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -73291,8 +78346,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-30 14:03:46.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-02 17:33:16.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-02 17:33:30.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments From fedora-extras-commits at redhat.com Wed Jul 2 22:11:39 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 2 Jul 2008 22:11:39 GMT Subject: comps comps-f10.xml.in, 1.38, 1.39 comps-f8.xml.in, 1.255, 1.256 comps-f9.xml.in, 1.369, 1.370 Message-ID: <200807022211.m62MBdd4029468@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29439 Modified Files: comps-f10.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: add ristretto and make thunar-archive-plugin default Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- comps-f10.xml.in 1 Jul 2008 02:54:29 -0000 1.38 +++ comps-f10.xml.in 2 Jul 2008 22:11:09 -0000 1.39 @@ -4490,6 +4490,7 @@ imsettings-xfce gdm mousepad + thunar-archive-plugin thunar-volman xarchiver xfce-mcs-manager @@ -4500,8 +4501,8 @@ xfce4-mixer xfwm4-theme-nodoka orage + ristretto Terminal - thunar-archive-plugin thunar-media-tags-plugin thunar-shares xfbib Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- comps-f8.xml.in 21 Jun 2008 22:53:02 -0000 1.255 +++ comps-f8.xml.in 2 Jul 2008 22:11:09 -0000 1.256 @@ -4194,6 +4194,7 @@ xfdesktop xfwm4 mousepad + thunar-archive-plugin thunar-volman xarchiver xfce-mcs-manager @@ -4204,8 +4205,8 @@ xfce4-mixer xfwm4-theme-nokoda orage + ristretto Terminal - thunar-archive-plugin thunar-media-tags-plugin thunar-shares xfbib Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- comps-f9.xml.in 21 Jun 2008 22:53:02 -0000 1.369 +++ comps-f9.xml.in 2 Jul 2008 22:11:09 -0000 1.370 @@ -4381,6 +4381,7 @@ xfwm4 imsettings-xfce mousepad + thunar-archive-plugin thunar-volman xarchiver xfce-mcs-manager @@ -4391,8 +4392,8 @@ xfce4-mixer xfwm4-theme-nodoka orage + ristretto Terminal - thunar-archive-plugin thunar-media-tags-plugin thunar-shares xfbib From fedora-extras-commits at redhat.com Wed Jul 2 22:30:15 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 2 Jul 2008 22:30:15 GMT Subject: rpms/openbabel/devel openbabel.spec,1.39,1.40 Message-ID: <200807022230.m62MUF9O029939@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29907 Modified Files: openbabel.spec Log Message: - update file paths - remove unnecessary header Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- openbabel.spec 2 Jul 2008 21:53:29 -0000 1.39 +++ openbabel.spec 2 Jul 2008 22:29:04 -0000 1.40 @@ -121,7 +121,9 @@ %{__make} install DESTDIR=$RPM_BUILD_ROOT -%{__rm} $RPM_BUILD_ROOT%{_libdir}{,/%{name}}/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}{,/%{name}/%{version}%{beta_ver}}/*.la + +%{__rm} $RPM_BUILD_ROOT%{_includedir}/inchi/inchi_api.h pushd scripts/perl %{__make} install DESTDIR=$RPM_BUILD_ROOT @@ -177,7 +179,7 @@ %files -n python-%{name} %defattr(-,root,root,-) -%{python_sitearch}/_ob*.so +%{python_sitearch}/_openbabel.so %{python_sitearch}/openbabel.py* %{python_sitearch}/pybel.py* %{python_sitearch}/openbabel*.egg-info From fedora-extras-commits at redhat.com Wed Jul 2 22:47:26 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 2 Jul 2008 22:47:26 GMT Subject: rpms/openbabel/devel openbabel.spec,1.40,1.41 Message-ID: <200807022247.m62MlQ8l030887@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30866 Modified Files: openbabel.spec Log Message: - use a configure option instead of removing unwanted file after make install Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- openbabel.spec 2 Jul 2008 22:29:04 -0000 1.40 +++ openbabel.spec 2 Jul 2008 22:46:55 -0000 1.41 @@ -97,7 +97,7 @@ # there's also a typo ("autconf" instead of "autoconf") sed -i -e 's/ACLOCAL_AMFLAGS=/#ACLOCAL_AMFLAGS=/g' Makefile.am autoreconf --force --install -%configure --enable-shared=yes --enable-static=no --enable-maintainer-mode +%configure --enable-shared=yes --enable-static=no --disable-inchi --enable-maintainer-mode %{__make} %{?_smp_mflags} pushd scripts/perl @@ -123,8 +123,6 @@ %{__rm} $RPM_BUILD_ROOT%{_libdir}{,/%{name}/%{version}%{beta_ver}}/*.la -%{__rm} $RPM_BUILD_ROOT%{_includedir}/inchi/inchi_api.h - pushd scripts/perl %{__make} install DESTDIR=$RPM_BUILD_ROOT popd From fedora-extras-commits at redhat.com Wed Jul 2 22:50:46 2008 From: fedora-extras-commits at redhat.com (Guenther Deschner (gd)) Date: Wed, 2 Jul 2008 22:50:46 GMT Subject: rpms/samba/devel .cvsignore, 1.49, 1.50 samba.spec, 1.154, 1.155 sources, 1.53, 1.54 Message-ID: <200807022250.m62MokoN031050@cvs-int.fedora.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31002 Modified Files: .cvsignore samba.spec sources Log Message: sync with fedora9. Guenther Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 11 Jun 2008 17:10:07 -0000 1.49 +++ .cvsignore 2 Jul 2008 22:49:59 -0000 1.50 @@ -1 +1 @@ -samba-3.2.0rc2.tar.gz +samba-3.2.0.tar.gz Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- samba.spec 11 Jun 2008 17:10:07 -0000 1.154 +++ samba.spec 2 Jul 2008 22:49:59 -0000 1.155 @@ -1,5 +1,5 @@ -%define main_release 16 -%define samba_version 3.2.0rc2 +%define main_release 17 +%define samba_version 3.2.0 %define tdb_version 1.1.1 %define talloc_version 1.2.0 @@ -7,14 +7,12 @@ Name: samba Epoch: 0 Version: 3.2.0 -Release: 1.rc2.%{main_release}%{?dist} +Release: 2.%{main_release}%{?dist} License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ -#TAG: change for non-pre -Source: http://download.samba.org/samba/ftp/rc/%{name}-%{version}rc2.tar.gz -#Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz +Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz # Red Hat specific replacement-files Source1: samba.log @@ -846,6 +844,10 @@ %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Tue Jul 1 2008 Guenther Deschner - 3.2.0-2.17 +- Update to 3.2.0 final +- resolves: #452622 + * Tue Jun 10 2008 Guenther Deschner - 3.2.0-1.rc2.16 - Update to 3.2.0rc2 - resolves: #449522 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Jun 2008 17:10:07 -0000 1.53 +++ sources 2 Jul 2008 22:49:59 -0000 1.54 @@ -1 +1 @@ -a58610bfa60a1f555bae3cd31dacd955 samba-3.2.0rc2.tar.gz +318d5b1ec0507f0f6077b1470f9fc028 samba-3.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 23:00:01 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 2 Jul 2008 23:00:01 GMT Subject: rpms/xfce4-screenshooter-plugin/devel xfce4-screenshooter-plugin.spec, 1.9, 1.10 Message-ID: <200807022300.m62N01qX031304@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31277 Modified Files: xfce4-screenshooter-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 - Update to 1.2.0 - Include new xfce4-screenshooter manpage Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel/xfce4-screenshooter-plugin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xfce4-screenshooter-plugin.spec 18 Feb 2008 23:57:26 -0000 1.9 +++ xfce4-screenshooter-plugin.spec 2 Jul 2008 22:59:13 -0000 1.10 @@ -1,16 +1,16 @@ Name: xfce4-screenshooter-plugin -Version: 1.0.0 -Release: 7%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Screenshot utility for the Xfce panel Group: User Interface/Desktops -License: GPLv2 +License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel -BuildRequires: perl(XML::Parser) +BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.4.0 libxml2-devel +BuildRequires: perl(XML::Parser), gettext Requires: xfce4-panel >= 4.4.0 %description @@ -26,23 +26,33 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README +%{_bindir}/xfce4-screenshooter %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop +%{_mandir}/man1/*.1.gz %changelog +* Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 +- Update to 1.2.0 +- Include new xfce4-screenshooter manpage + +* Sat Jun 22 2008 Christoph Wickert - 1.1.0-1 +- Update to 1.1.0 +- BR gettext + * Mon Feb 18 2008 Fedora Release Engineering - 1.0.0-7 - Autorebuild for GCC 4.3 * Sat Aug 25 2007 Christoph Wickert - 1.0.0-6 -- Update to 1.9.4 -- Change license tag to GPLv2 +- Change license tag to GPLv2+ * Sat Apr 28 2007 Christoph Wickert - 1.0.0-5 - Rebuild for Xfce 4.4.1 From fedora-extras-commits at redhat.com Wed Jul 2 23:06:40 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 2 Jul 2008 23:06:40 GMT Subject: rpms/xfce4-screenshooter-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807022306.m62N6eWA005611@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5580 Modified Files: .cvsignore sources Log Message: add new sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Oct 2006 12:53:52 -0000 1.3 +++ .cvsignore 2 Jul 2008 23:05:44 -0000 1.4 @@ -1 +1 @@ -xfce4-screenshooter-plugin-1.0.0.tar.bz2 +xfce4-screenshooter-plugin-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Oct 2006 12:53:52 -0000 1.3 +++ sources 2 Jul 2008 23:05:44 -0000 1.4 @@ -1 +1 @@ -d12746c635eb28207161a3da1585aa75 xfce4-screenshooter-plugin-1.0.0.tar.bz2 +19134629b075d403ea51fe95e6eac1cb xfce4-screenshooter-plugin-1.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 2 23:19:18 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 2 Jul 2008 23:19:18 GMT Subject: rpms/xfce4-screenshooter-plugin/F-9 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-screenshooter-plugin.spec, 1.9, 1.10 Message-ID: <200807022319.m62NJI5t006176@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6140 Modified Files: .cvsignore sources xfce4-screenshooter-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 - Update to 1.2.0 - Include new xfce4-screenshooter manpage Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Oct 2006 12:53:52 -0000 1.3 +++ .cvsignore 2 Jul 2008 23:18:42 -0000 1.4 @@ -1 +1 @@ -xfce4-screenshooter-plugin-1.0.0.tar.bz2 +xfce4-screenshooter-plugin-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Oct 2006 12:53:52 -0000 1.3 +++ sources 2 Jul 2008 23:18:42 -0000 1.4 @@ -1 +1 @@ -d12746c635eb28207161a3da1585aa75 xfce4-screenshooter-plugin-1.0.0.tar.bz2 +19134629b075d403ea51fe95e6eac1cb xfce4-screenshooter-plugin-1.2.0.tar.gz Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9/xfce4-screenshooter-plugin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xfce4-screenshooter-plugin.spec 18 Feb 2008 23:57:26 -0000 1.9 +++ xfce4-screenshooter-plugin.spec 2 Jul 2008 23:18:42 -0000 1.10 @@ -1,16 +1,16 @@ Name: xfce4-screenshooter-plugin -Version: 1.0.0 -Release: 7%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Screenshot utility for the Xfce panel Group: User Interface/Desktops -License: GPLv2 +License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel -BuildRequires: perl(XML::Parser) +BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.4.0 libxml2-devel +BuildRequires: perl(XML::Parser), gettext Requires: xfce4-panel >= 4.4.0 %description @@ -26,23 +26,33 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README +%{_bindir}/xfce4-screenshooter %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop +%{_mandir}/man1/*.1.gz %changelog +* Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 +- Update to 1.2.0 +- Include new xfce4-screenshooter manpage + +* Sat Jun 22 2008 Christoph Wickert - 1.1.0-1 +- Update to 1.1.0 +- BR gettext + * Mon Feb 18 2008 Fedora Release Engineering - 1.0.0-7 - Autorebuild for GCC 4.3 * Sat Aug 25 2007 Christoph Wickert - 1.0.0-6 -- Update to 1.9.4 -- Change license tag to GPLv2 +- Change license tag to GPLv2+ * Sat Apr 28 2007 Christoph Wickert - 1.0.0-5 - Rebuild for Xfce 4.4.1 From fedora-extras-commits at redhat.com Wed Jul 2 23:23:10 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 2 Jul 2008 23:23:10 GMT Subject: rpms/xfce4-datetime-plugin/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 xfce4-datetime-plugin.spec, 1.18, 1.19 Message-ID: <200807022323.m62NNAMp006369@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6315 Modified Files: .cvsignore sources xfce4-datetime-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 - Update to 0.6.0 - BuildRequire intltool - No longer BuildRequire dbus-devel (requirement dropped upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Feb 2007 21:12:15 -0000 1.5 +++ .cvsignore 2 Jul 2008 23:22:22 -0000 1.6 @@ -1 +1 @@ -xfce4-datetime-plugin-0.5.0.tar.gz +xfce4-datetime-plugin-0.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Feb 2007 21:12:15 -0000 1.6 +++ sources 2 Jul 2008 23:22:22 -0000 1.7 @@ -1 +1 @@ -0aa1c85861a0ab8fc7f2d502c94de289 xfce4-datetime-plugin-0.5.0.tar.gz +0d047a21cbf173451a86a48f79b45ddd xfce4-datetime-plugin-0.6.0.tar.bz2 Index: xfce4-datetime-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xfce4-datetime-plugin.spec 18 Feb 2008 23:44:48 -0000 1.18 +++ xfce4-datetime-plugin.spec 2 Jul 2008 23:22:22 -0000 1.19 @@ -1,18 +1,18 @@ Name: xfce4-datetime-plugin -Version: 0.5.0 -Release: 4%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Date/time plugin for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.5.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.99.2, libxfcegui4-devel >= 4.3.99.2, libxml2-devel -BuildRequires: gettext, perl(XML::Parser), dbus-devel >= 0.22 -Requires: xfce4-panel >= 4.3.99.2 +BuildRequires: intltool, perl(XML::Parser), dbus-devel >= 0.22 +Requires: xfce4-panel >= 4.4.0 %description An alternative clock plugin for the Xfce panel. A calendar appears when you @@ -42,6 +42,11 @@ %{_libdir}/xfce4/panel-plugins/*.desktop %changelog +* Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 +- Update to 0.6.0 +- BuildRequire intltool +- No longer BuildRequire dbus-devel (requirement dropped upstream) + * Mon Feb 18 2008 Fedora Release Engineering - 0.5.0-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 2 23:28:21 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 2 Jul 2008 23:28:21 GMT Subject: rpms/xfce4-datetime-plugin/F-9 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 xfce4-datetime-plugin.spec, 1.18, 1.19 Message-ID: <200807022328.m62NSLr3006685@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-datetime-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6659 Modified Files: .cvsignore sources xfce4-datetime-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 - Update to 0.6.0 - BuildRequire intltool - No longer BuildRequire dbus-devel (requirement dropped upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Feb 2007 21:12:15 -0000 1.5 +++ .cvsignore 2 Jul 2008 23:27:50 -0000 1.6 @@ -1 +1 @@ -xfce4-datetime-plugin-0.5.0.tar.gz +xfce4-datetime-plugin-0.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Feb 2007 21:12:15 -0000 1.6 +++ sources 2 Jul 2008 23:27:50 -0000 1.7 @@ -1 +1 @@ -0aa1c85861a0ab8fc7f2d502c94de289 xfce4-datetime-plugin-0.5.0.tar.gz +0d047a21cbf173451a86a48f79b45ddd xfce4-datetime-plugin-0.6.0.tar.bz2 Index: xfce4-datetime-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-9/xfce4-datetime-plugin.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xfce4-datetime-plugin.spec 18 Feb 2008 23:44:48 -0000 1.18 +++ xfce4-datetime-plugin.spec 2 Jul 2008 23:27:50 -0000 1.19 @@ -1,18 +1,18 @@ Name: xfce4-datetime-plugin -Version: 0.5.0 -Release: 4%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Date/time plugin for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.5.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.99.2, libxfcegui4-devel >= 4.3.99.2, libxml2-devel -BuildRequires: gettext, perl(XML::Parser), dbus-devel >= 0.22 -Requires: xfce4-panel >= 4.3.99.2 +BuildRequires: intltool, perl(XML::Parser), dbus-devel >= 0.22 +Requires: xfce4-panel >= 4.4.0 %description An alternative clock plugin for the Xfce panel. A calendar appears when you @@ -42,6 +42,11 @@ %{_libdir}/xfce4/panel-plugins/*.desktop %changelog +* Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 +- Update to 0.6.0 +- BuildRequire intltool +- No longer BuildRequire dbus-devel (requirement dropped upstream) + * Mon Feb 18 2008 Fedora Release Engineering - 0.5.0-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 2 23:36:43 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 2 Jul 2008 23:36:43 GMT Subject: rpms/nfs-utils/devel nfs-utils-1.1.2-smnotifypath.patch, NONE, 1.1 nfs-utils.spec, 1.179, 1.180 nfs.init, 1.27, 1.28 nfslock.init, 1.21, 1.22 rpcgssd.init, 1.10, 1.11 rpcidmapd.init, 1.9, 1.10 rpcsvcgssd.init, 1.8, 1.9 Message-ID: <200807022336.m62Nahn2007024@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6915 Modified Files: nfs-utils.spec nfs.init nfslock.init rpcgssd.init rpcidmapd.init rpcsvcgssd.init Added Files: nfs-utils-1.1.2-smnotifypath.patch Log Message: - Changed the default directories for sm-notify (bz 435480) - Added 'condstop' to init scripts so service are not started when nfs-utils is removed. nfs-utils-1.1.2-smnotifypath.patch: --- NEW FILE nfs-utils-1.1.2-smnotifypath.patch --- diff -up nfs-utils-1.1.2/utils/statd/sm-notify.c.orig nfs-utils-1.1.2/utils/statd/sm-notify.c --- nfs-utils-1.1.2/utils/statd/sm-notify.c.orig 2008-03-14 11:46:29.000000000 -0400 +++ nfs-utils-1.1.2/utils/statd/sm-notify.c 2008-07-02 18:34:24.000000000 -0400 @@ -24,11 +24,12 @@ #include #include +#define STATD_PATH_XTN "statd/" #ifndef BASEDIR # ifdef NFS_STATEDIR -# define BASEDIR NFS_STATEDIR +# define BASEDIR NFS_STATEDIR "/" STATD_PATH_XTN # else -# define BASEDIR "/var/lib/nfs" +# define BASEDIR "/var/lib/nfs/" STATD_PATH_XTN # endif #endif diff -up nfs-utils-1.1.2/utils/statd/sm-notify.man.orig nfs-utils-1.1.2/utils/statd/sm-notify.man --- nfs-utils-1.1.2/utils/statd/sm-notify.man.orig 2008-03-14 11:46:29.000000000 -0400 +++ nfs-utils-1.1.2/utils/statd/sm-notify.man 2008-07-02 18:34:13.000000000 -0400 @@ -33,7 +33,7 @@ but this is configurable. For each NFS client or server machine to be monitored, .B rpc.statd creates a file in -.BR /var/lib/nfs/sm ", " +.BR /var/lib/nfs/statd/sm ", " and removes the file if monitoring is no longer required. .PP When the machine is rebooted, @@ -47,7 +47,7 @@ Each machine has an which is basically an integer counter that is incremented each time the machine reboots. This counter is stored in -.BR /var/lib/nfs/state , +.BR /var/lib/nfs/statd/state , and updated by .BR sm-notify . .SS Security @@ -149,13 +149,13 @@ By default, .B sm-notify forks and puts itself in the background after obtaining the list of hosts from -.BR /var/lib/nfs/sm . +.BR /var/lib/nfs/statd/sm . .SH FILES -.BR /var/lib/nfs/state +.BR /var/lib/nfs/statd/state .br -.BR /var/lib/nfs/sm/* +.BR /var/lib/nfs/statd/sm/* .br -.BR /var/lib/nfs/sm.bak/* +.BR /var/lib/nfs/statd/sm.bak/* .br .BR /var/run/sm-notify.pid .SH SEE ALSO Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- nfs-utils.spec 30 Jun 2008 16:13:53 -0000 1.179 +++ nfs-utils.spec 2 Jul 2008 23:35:53 -0000 1.180 @@ -2,7 +2,7 @@ Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.2 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 # group all 32bit related archs @@ -31,6 +31,7 @@ Patch06: nfs-utils-1.1.0-exportfs-man-update.patch Patch07: nfs-utils-1.1.2-multi-auth-flavours.patch Patch08: nfs-utils-1.1.2-mount-eacces.patch +Patch09: nfs-utils-1.1.2-smnotifypath.patch Patch101: nfs-utils-1.1.2-tcpwrapper-fix.patch Patch102: nfs-utils-1.1.2-mount-retry.patch @@ -80,14 +81,14 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep Requires: modutils >= 2.4.26-9 -BuildRequires: libgssglue-devel libevent-devel >= 1.4.4 +BuildRequires: libgssglue-devel libevent-devel BuildRequires: nfs-utils-lib-devel >= 1.1.0-3 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 BuildRequires: automake, libtool, glibc-headers BuildRequires: e2fsprogs-devel, krb5-devel, tcp_wrappers-devel Requires(pre): shadow-utils >= 4.0.3-25 Requires(pre): /sbin/chkconfig /sbin/nologin -Requires: nfs-utils-lib >= 1.1.0-3 libgssglue libevent >= 1.4.4 +Requires: nfs-utils-lib >= 1.1.0-3 libgssglue libevent %description The nfs-utils package provides a daemon for the kernel NFS server and @@ -112,6 +113,7 @@ %patch06 -p1 %patch07 -p1 %patch08 -p1 +%patch09 -p1 %patch101 -p1 %patch102 -p1 @@ -182,6 +184,7 @@ mv $RPM_BUILD_ROOT/usr/sbin/rpc.statd $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm +mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm.bak mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery %clean @@ -222,10 +225,10 @@ %preun if [ "$1" = "0" ]; then - /etc/rc.d/init.d/nfs condrestart - /etc/rc.d/init.d/rpcgssd condrestart - /etc/rc.d/init.d/rpcidmapd condrestart - /etc/rc.d/init.d/nfslock condrestart + /etc/rc.d/init.d/nfs condstop > /dev/null + /etc/rc.d/init.d/rpcgssd condstop > /dev/null + /etc/rc.d/init.d/rpcidmapd condstop > /dev/null + /etc/rc.d/init.d/nfslock condstop > /dev/null /sbin/chkconfig --del rpcidmapd /sbin/chkconfig --del rpcgssd /sbin/chkconfig --del rpcsvcgssd @@ -267,10 +270,11 @@ %dir /var/lib/nfs %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm +%dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm.bak +%config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/state %config(noreplace) /var/lib/nfs/xtab %config(noreplace) /var/lib/nfs/etab %config(noreplace) /var/lib/nfs/rmtab -%config(noreplace) /var/lib/nfs/state %doc linux-nfs/* /sbin/rpc.statd /usr/sbin/exportfs @@ -295,6 +299,11 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Wed Jul 2 2008 Steve Dickson 1.1.2-12 +- Changed the default directories for sm-notify (bz 435480) +- Added 'condstop' to init scripts so service are not + started when nfs-utils is removed. + * Mon Jun 30 2008 Dennis Gilmore 1.1.2-11 - add sparc arch handling Index: nfs.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- nfs.init 30 Jul 2007 10:10:07 -0000 1.27 +++ nfs.init 2 Jul 2008 23:35:53 -0000 1.28 @@ -171,10 +171,18 @@ [ -f /var/lock/subsys/nfs ] && { $0 stop $0 start + RETVAL=$? + } + ;; + condstop) + [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condstop + [ -f /var/lock/subsys/nfs ] && { + $0 stop + RETVAL=$? } ;; *) - echo $"Usage: nfs {start|stop|status|restart|reload|condrestart}" + echo $"Usage: nfs {start|stop|status|restart|reload|condrestart|condstop}" RETVAL=3 ;; esac Index: nfslock.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- nfslock.init 25 Apr 2008 15:39:48 -0000 1.21 +++ nfslock.init 2 Jul 2008 23:35:53 -0000 1.22 @@ -113,10 +113,17 @@ [ -f /var/lock/subsys/nfslock ] && { stop start + RETVAL=$? + } + ;; + condstop) + [ -f /var/lock/subsys/nfslock ] && { + stop + RETVAL=$? } ;; *) - echo $"Usage: $0 {start|stop|status|restart|probe|condrestart}" + echo $"Usage: $0 {start|stop|status|restart|probe|condrestart|condstop}" RETVAL=3 ;; esac Index: rpcgssd.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcgssd.init,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rpcgssd.init 2 Aug 2007 15:54:05 -0000 1.10 +++ rpcgssd.init 2 Jul 2008 23:35:53 -0000 1.11 @@ -105,8 +105,14 @@ RETVAL=$? fi ;; + condstop) + if [ -f $LOCKFILE ]; then + $0 stop + RETVAL=$? + fi + ;; *) - echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status|condstop}" RETVAL=3 ;; esac Index: rpcidmapd.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcidmapd.init,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rpcidmapd.init 2 Aug 2007 15:54:05 -0000 1.9 +++ rpcidmapd.init 2 Jul 2008 23:35:53 -0000 1.10 @@ -90,8 +90,14 @@ RETVAL=$? fi ;; + condstop) + if [ -f $LOCKFILE ]; then + $0 stop + RETVAL=$? + fi + ;; *) - echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status|condstop}" RETVAL=3 ;; esac Index: rpcsvcgssd.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcsvcgssd.init,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rpcsvcgssd.init 2 Aug 2007 15:54:05 -0000 1.8 +++ rpcsvcgssd.init 2 Jul 2008 23:35:53 -0000 1.9 @@ -105,8 +105,14 @@ RETVAL=$? fi ;; + condstop) + if [ -f $LOCKFILE ]; then + $0 stop + RETVAL=$? + fi + ;; *) - echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status|condstop}" RETVAL=3 ;; esac From fedora-extras-commits at redhat.com Wed Jul 2 23:49:42 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 2 Jul 2008 23:49:42 GMT Subject: rpms/nfs-utils/F-9 nfs-utils-1.1.0-smnotify-path.patch, 1.2, 1.3 nfs-utils.spec, 1.172, 1.173 Message-ID: <200807022349.m62Nng4m007449@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7408 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.1.0-smnotify-path.patch Log Message: - Changed the default directories for sm-notify (bz 435480) - Removed the nfslock service start/stop from %%post section (bz 453046) nfs-utils-1.1.0-smnotify-path.patch: Index: nfs-utils-1.1.0-smnotify-path.patch =================================================================== RCS file: nfs-utils-1.1.0-smnotify-path.patch diff -N nfs-utils-1.1.0-smnotify-path.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nfs-utils-1.1.0-smnotify-path.patch 2 Jul 2008 23:48:54 -0000 1.3 @@ -0,0 +1,70 @@ +commit 02968aa55972b680fa00273188da281d7612ca3e +Author: Steve Dickson +Date: Fri Sep 14 14:19:50 2007 -0400 + + Changed the default paths in sm-notify to + /var/lib/nfs/statd which is where the locking + state is kept in Red Hat distros. + + Signed-off-by: Steve Dickson + +diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c +index 98c03f9..862889f 100644 +--- a/utils/statd/sm-notify.c ++++ b/utils/statd/sm-notify.c +@@ -24,11 +24,13 @@ + #include + #include + ++#define STATD_PATH_XTN "statd/" ++ + #ifndef BASEDIR + # ifdef NFS_STATEDIR +-# define BASEDIR NFS_STATEDIR ++# define BASEDIR NFS_STATEDIR "/" STATD_PATH_XTN + # else +-# define BASEDIR "/var/lib/nfs" ++# define BASEDIR "/var/lib/nfs" "/" STATD_PATH_XTN + # endif + #endif + +diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man +index dd03b8d..69b7059 100644 +--- a/utils/statd/sm-notify.man ++++ b/utils/statd/sm-notify.man +@@ -33,7 +33,7 @@ but this is configurable. + For each NFS client or server machine to be monitored, + .B rpc.statd + creates a file in +-.BR /var/lib/nfs/sm ", " ++.BR /var/lib/nfs/statd/sm ", " + and removes the file if monitoring is no longer required. + .PP + When the machine is rebooted, +@@ -47,7 +47,7 @@ Each machine has an + which is basically an integer counter that is incremented + each time the machine reboots. This counter is stored + in +-.BR /var/lib/nfs/state , ++.BR /var/lib/nfs/statd/state , + and updated by + .BR sm-notify . + .SS Security +@@ -149,13 +149,13 @@ By default, + .B sm-notify + forks and puts itself in the background after obtaining the + list of hosts from +-.BR /var/lib/nfs/sm . ++.BR /var/lib/nfs/statd/sm . + .SH FILES +-.BR /var/lib/nfs/state ++.BR /var/lib/nfs/statd/state + .br +-.BR /var/lib/nfs/sm/* ++.BR /var/lib/nfs/statd/sm/* + .br +-.BR /var/lib/nfs/sm.bak/* ++.BR /var/lib/nfs/statd/sm.bak/* + .br + .BR /var/run/sm-notify.pid + .SH SEE ALSO Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- nfs-utils.spec 25 Jun 2008 12:38:28 -0000 1.172 +++ nfs-utils.spec 2 Jul 2008 23:48:54 -0000 1.173 @@ -2,7 +2,7 @@ Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 # group all 32bit related archs @@ -32,6 +32,7 @@ Patch07: nfs-utils-1.1.2-multi-auth-flavours.patch Patch08: nfs-utils-1.1.2-mount-eacces.patch Patch09: nfs-utils-1.1.2-rmtab-fqdn.patch +Patch10: nfs-utils-1.1.0-smnotify-path.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -92,6 +93,7 @@ %patch07 -p1 %patch08 -p1 %patch09 -p1 +%patch10 -p1 %if %{enablefscache} %patch90 -p1 @@ -176,13 +178,7 @@ /sbin/chkconfig --add rpcgssd /sbin/chkconfig --add rpcsvcgssd # Make sure statd used the correct uid/gid. -if [ -f /var/lock/subsys/nfslock ]; then - /etc/rc.d/init.d/nfslock stop > /dev/null - chown -R rpcuser:rpcuser /var/lib/nfs/statd - /etc/rc.d/init.d/nfslock start > /dev/null -else - chown -R rpcuser:rpcuser /var/lib/nfs/statd -fi +chown -R rpcuser:rpcuser /var/lib/nfs/statd %preun if [ "$1" = "0" ]; then @@ -259,6 +255,11 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Wed Jul 2 2008 Steve Dickson 1.1.2-6 +- Changed the default directories for sm-notify (bz 435480) +- Removed the nfslock service start/stop from %%post section + (bz 453046) + * Tue Jun 24 2008 Steve Dickson 1.1.2-5 - FQDNs in the rmtab causes exportfs to seg fault (bz 444275) From fedora-extras-commits at redhat.com Thu Jul 3 00:59:20 2008 From: fedora-extras-commits at redhat.com (James Bowes (jbowes)) Date: Thu, 3 Jul 2008 00:59:20 GMT Subject: rpms/mod_wsgi/devel .cvsignore, 1.3, 1.4 mod_wsgi.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807030059.m630xKE4016554@cvs-int.fedora.redhat.com> Author: jbowes Update of /cvs/pkgs/rpms/mod_wsgi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16520 Modified Files: .cvsignore mod_wsgi.spec sources Log Message: update to 2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mod_wsgi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2008 23:58:21 -0000 1.3 +++ .cvsignore 3 Jul 2008 00:58:36 -0000 1.4 @@ -1 +1 @@ -mod_wsgi-1.3.tar.gz +mod_wsgi-2.1.tar.gz Index: mod_wsgi.spec =================================================================== RCS file: /cvs/pkgs/rpms/mod_wsgi/devel/mod_wsgi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_wsgi.spec 16 Jun 2008 23:34:57 -0000 1.5 +++ mod_wsgi.spec 3 Jul 2008 00:58:36 -0000 1.6 @@ -1,6 +1,6 @@ Name: mod_wsgi -Version: 1.3 -Release: 4%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: A WSGI interface for Python web applications in Apache Group: System Environment/Libraries @@ -53,6 +53,9 @@ %changelog +* Wed Jul 02 2008 James Bowes 2.1-1 +- Update to 2.1 + * Mon Jun 16 2008 Ricky Zhou 1.3-4 - Build against the shared python lib. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mod_wsgi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2008 23:58:21 -0000 1.3 +++ sources 3 Jul 2008 00:58:36 -0000 1.4 @@ -1 +1 @@ -7dc5e45f7332fde54fb1c5b71616e4a2 mod_wsgi-1.3.tar.gz +4e0e8b5a13e0be2fc5b038f1e3e826a2 mod_wsgi-2.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 01:16:36 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 3 Jul 2008 01:16:36 GMT Subject: rpms/glib2/devel .cvsignore, 1.90, 1.91 glib2.spec, 1.171, 1.172 sources, 1.92, 1.93 Message-ID: <200807030116.m631GaB9024337@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24293 Modified Files: .cvsignore glib2.spec sources Log Message: 2.17.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/.cvsignore,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- .cvsignore 12 Jun 2008 18:51:00 -0000 1.90 +++ .cvsignore 3 Jul 2008 01:15:51 -0000 1.91 @@ -1 +1 @@ -glib-2.17.2.tar.bz2 +glib-2.17.3.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- glib2.spec 17 Jun 2008 03:38:55 -0000 1.171 +++ glib2.spec 3 Jul 2008 01:15:51 -0000 1.172 @@ -2,7 +2,7 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.17.2 +Version: 2.17.3 Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -132,6 +132,9 @@ %{_libdir}/lib*.a %changelog +* Wed Jul 2 2008 Matthias Clasen - 2.17.3-1 +- Update to 2.17.3 + * Mon Jun 16 2008 Matthias Clasen - 2.17.2-2 - Fix a directory ownership oversight Index: sources =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/sources,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- sources 12 Jun 2008 18:51:00 -0000 1.92 +++ sources 3 Jul 2008 01:15:51 -0000 1.93 @@ -1 +1 @@ -2df8550a229771859a791f20c56a47a8 glib-2.17.2.tar.bz2 +1683dcb0b5fc865833b01daad8026924 glib-2.17.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 02:16:42 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 3 Jul 2008 02:16:42 GMT Subject: rpms/schroedinger/devel schroedinger.spec,1.6,1.7 Message-ID: <200807030216.m632GgPo000394@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/schroedinger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv363 Modified Files: schroedinger.spec Log Message: * Fri Jul 2 2008 Jeffrey C. Ollie - 1.0.3-2 - Devel subpackage needs to require liboil-devel. Index: schroedinger.spec =================================================================== RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- schroedinger.spec 27 Jun 2008 13:34:17 -0000 1.6 +++ schroedinger.spec 3 Jul 2008 02:15:57 -0000 1.7 @@ -2,7 +2,7 @@ Name: schroedinger Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Portable libraries for the high quality Dirac video codec Group: System Environment/Libraries @@ -31,6 +31,7 @@ Summary: Development files for schrodinger Requires: %{name} = %{version}-%{release} Requires: pkgconfig +Requires: liboil-devel %description devel Development files for schrodinger @@ -78,6 +79,9 @@ %{_libdir}/gstreamer-0.10/libgstschro.so %changelog +* Fri Jul 2 2008 Jeffrey C. Ollie - 1.0.3-2 +- Devel subpackage needs to require liboil-devel. + * Fri Jun 27 2008 Jeffrey C. Ollie - 1.0.3-1 - Update to 1.0.3. - Update URLs. From fedora-extras-commits at redhat.com Thu Jul 3 02:24:28 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 3 Jul 2008 02:24:28 GMT Subject: rpms/schroedinger/F-9 schroedinger.spec,1.6,1.7 Message-ID: <200807030224.m632OSOJ000875@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/schroedinger/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv821 Modified Files: schroedinger.spec Log Message: * Fri Jul 2 2008 Jeffrey C. Ollie - 1.0.3-2 - Devel subpackage needs to require liboil-devel. Index: schroedinger.spec =================================================================== RCS file: /cvs/pkgs/rpms/schroedinger/F-9/schroedinger.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- schroedinger.spec 27 Jun 2008 13:48:45 -0000 1.6 +++ schroedinger.spec 3 Jul 2008 02:23:41 -0000 1.7 @@ -2,7 +2,7 @@ Name: schroedinger Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Portable libraries for the high quality Dirac video codec Group: System Environment/Libraries @@ -31,6 +31,7 @@ Summary: Development files for schrodinger Requires: %{name} = %{version}-%{release} Requires: pkgconfig +Requires: liboil-devel %description devel Development files for schrodinger @@ -78,6 +79,9 @@ %{_libdir}/gstreamer-0.10/libgstschro.so %changelog +* Fri Jul 2 2008 Jeffrey C. Ollie - 1.0.3-2 +- Devel subpackage needs to require liboil-devel. + * Fri Jun 27 2008 Jeffrey C. Ollie - 1.0.3-1 - Update to 1.0.3. - Update URLs. From fedora-extras-commits at redhat.com Thu Jul 3 02:29:32 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 3 Jul 2008 02:29:32 GMT Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.5, 1.6 NetworkManager-openvpn.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200807030229.m632TWMd001198@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1150 Modified Files: .cvsignore NetworkManager-openvpn.spec sources Log Message: * Wed Jul 02 2008 Dan Williams 1:0.7.0-11.svn3801 - Update for moving VPN editing into connection manager - Import OpenVPN configuration files rather than old custom format Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Apr 2008 03:55:12 -0000 1.5 +++ .cvsignore 3 Jul 2008 02:28:43 -0000 1.6 @@ -1,2 +1,3 @@ NetworkManager-openvpn-0.7.0.svn3302.tar.gz NetworkManager-openvpn-0.7.0.svn3549.tar.gz +NetworkManager-openvpn-0.7.0.svn3801.tar.gz Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- NetworkManager-openvpn.spec 5 May 2008 21:07:01 -0000 1.16 +++ NetworkManager-openvpn.spec 3 Jul 2008 02:28:44 -0000 1.17 @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.9.3.svn3623 +%define nm_version 1:0.7.0-0.10.svn3801 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3632 +%define svn_snapshot .svn3801 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 10%{svn_snapshot}%{?dist} +Release: 11%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -18,10 +18,8 @@ # - Check out NetworkManager from Gnome SVN, currently trunk is used # - cd NetworkManager/vpn-daemons/openvpn # - ./autogen.sh --prefix=/usr --sysconfdir=/etc -# - make distclean -# - cd .. -# - mv openvpn NetworkManager-openvpn-%{version} -# - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version} +# - make distcheck +# - use generated NetworkManager-openvpn-0.7.0.tar.gz Source: %{name}-%{version}%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -105,6 +103,10 @@ %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Wed Jul 02 2008 Dan Williams 1:0.7.0-11.svn3801 +- Update for moving VPN editing into connection manager +- Import OpenVPN configuration files rather than old custom format + * Mon May 05 2008 Dan Williams 1:0.7.0-10.svn3632 - Fix issue with location of the VPN plugin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 May 2008 21:07:01 -0000 1.8 +++ sources 3 Jul 2008 02:28:44 -0000 1.9 @@ -1 +1 @@ -f4266d18d5949091ec85a8214244b787 NetworkManager-openvpn-0.7.0.svn3632.tar.gz +e1a9424d9dc0188f1a61e48bac9fe01a NetworkManager-openvpn-0.7.0.svn3801.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 03:02:20 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 3 Jul 2008 03:02:20 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.38, 1.39 cairo-dock.spec, 1.47, 1.48 sources, 1.38, 1.39 Message-ID: <200807030302.m6332KOX009232@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Thu Jul 3 2008 Mamoru Tasaka - rev. 1167 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 1 Jul 2008 07:19:38 -0000 1.38 +++ .cvsignore 3 Jul 2008 03:01:32 -0000 1.39 @@ -1 +1 @@ -cairo-dock-sources-svn1163_trunk.tar.bz2 +cairo-dock-sources-svn1167_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- cairo-dock.spec 1 Jul 2008 07:09:27 -0000 1.47 +++ cairo-dock.spec 3 Jul 2008 03:01:32 -0000 1.48 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1163_trunk +%define tarballver svn1167_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -494,8 +494,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Tue Jul 1 2008 Mamoru Tasaka -- rev. 1163 +* Thu Jul 3 2008 Mamoru Tasaka +- rev. 1167 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 1 Jul 2008 07:19:38 -0000 1.38 +++ sources 3 Jul 2008 03:01:32 -0000 1.39 @@ -1 +1 @@ -48585dc7ee447ea27ff6e5ab20716603 cairo-dock-sources-svn1163_trunk.tar.bz2 +57401e5c2bf6674dbca247187067c6c5 cairo-dock-sources-svn1167_trunk.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 03:18:41 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 3 Jul 2008 03:18:41 GMT Subject: rpms/kernel/devel config-generic, 1.119, 1.120 kernel.spec, 1.727, 1.728 Message-ID: <200807030318.m633IfmU010017@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9972 Modified Files: config-generic kernel.spec Log Message: * Wed Jul 02 2008 Chuck Ebbert - Re-enable the snd-pcsp driver (#452748) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- config-generic 1 Jul 2008 15:29:57 -0000 1.119 +++ config-generic 3 Jul 2008 03:17:44 -0000 1.120 @@ -2491,7 +2491,7 @@ CONFIG_SND_NM256=m CONFIG_SND_OXYGEN=m CONFIG_SND_RME32=m -# CONFIG_SND_PCSP is not set +CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_RIPTIDE=m CONFIG_SND_RME96=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.727 retrieving revision 1.728 diff -u -r1.727 -r1.728 --- kernel.spec 2 Jul 2008 02:14:45 -0000 1.727 +++ kernel.spec 3 Jul 2008 03:17:44 -0000 1.728 @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 02 2008 Chuck Ebbert +- Re-enable the snd-pcsp driver (#452748) + * Tue Jul 01 2008 John W. Linville - Upstream wireless fixes from 2008-06-30 (http://marc.info/?l=linux-wireless&m=121485709702728&w=2) From fedora-extras-commits at redhat.com Thu Jul 3 03:26:54 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 3 Jul 2008 03:26:54 GMT Subject: rpms/cairo-dock/devel cairo-dock.spec,1.48,1.49 Message-ID: <200807030326.m633Qs5e010435@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10336 Modified Files: cairo-dock.spec Log Message: fix mozilla pc name Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- cairo-dock.spec 3 Jul 2008 03:01:32 -0000 1.48 +++ cairo-dock.spec 3 Jul 2008 03:25:49 -0000 1.49 @@ -181,13 +181,15 @@ # weblets %if %{build_gecko} > 0 -%if 0%{?fedora} < 9 cd weblets/ %{__sed} -i.gecko \ - -e 's|mozilla-gtkmozembed|firefox-gtkmozembed|' \ +%if 0%{?fedora} < 9 + -e 's|xulrunner-gtkmozembed|firefox-gtkmozembed|' \ +%else + -e 's|xulrunner-gtkmozembed|mozilla-gtkmozembed|' \ +%endif configure.ac cd .. -%endif %else %{__rm} -rf weblets/ %endif From fedora-extras-commits at redhat.com Thu Jul 3 03:32:19 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:32:19 GMT Subject: rpms/blam/F-8 blam.spec,1.25,1.26 Message-ID: <200807030332.m633WJ5U010864@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/blam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10817 Modified Files: blam.spec Log Message: forgot to bump the gecko req Index: blam.spec =================================================================== RCS file: /cvs/extras/rpms/blam/F-8/blam.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- blam.spec 2 Jul 2008 20:00:12 -0000 1.25 +++ blam.spec 3 Jul 2008 03:31:49 -0000 1.26 @@ -1,7 +1,7 @@ ## XXX: Hopefully Mono, Blam and multilib will play nicely soon... %define _libdir %{_prefix}/lib %define dbus_sharp_min_version 0.60 -%define gecko_version 1.8.1.14 +%define gecko_version 1.8.1.15 Name: blam Version: 1.8.3 From fedora-extras-commits at redhat.com Thu Jul 3 03:33:48 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:33:48 GMT Subject: rpms/chmsee/F-8 chmsee.spec,1.18,1.19 Message-ID: <200807030333.m633Xmqm011042@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/chmsee/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10914 Modified Files: chmsee.spec Log Message: forgot to bump the gecko req Index: chmsee.spec =================================================================== RCS file: /cvs/extras/rpms/chmsee/F-8/chmsee.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- chmsee.spec 2 Jul 2008 20:00:29 -0000 1.18 +++ chmsee.spec 3 Jul 2008 03:32:58 -0000 1.19 @@ -1,5 +1,5 @@ -%define gecko_version 1.8.1.14 -%define firefox_version 2.0.0.14 +%define gecko_version 1.8.1.15 +%define firefox_version 2.0.0.15 Name: chmsee Version: 1.0.0 From fedora-extras-commits at redhat.com Thu Jul 3 03:37:45 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:37:45 GMT Subject: rpms/devhelp/F-8 devhelp.spec,1.81,1.82 Message-ID: <200807030337.m633bj4F011387@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/devhelp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301 Modified Files: devhelp.spec Log Message: forgot to bump the gecko req Index: devhelp.spec =================================================================== RCS file: /cvs/extras/rpms/devhelp/F-8/devhelp.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- devhelp.spec 2 Jul 2008 20:00:51 -0000 1.81 +++ devhelp.spec 3 Jul 2008 03:36:46 -0000 1.82 @@ -1,6 +1,6 @@ # To determine the current gecko-devel version: # rpm -q --provides firefox-devel | grep gecko-devel -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 ### Abstract ### From fedora-extras-commits at redhat.com Thu Jul 3 03:39:07 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:39:07 GMT Subject: rpms/epiphany/F-8 epiphany.spec,1.178,1.179 Message-ID: <200807030339.m633d75Q011493@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11455 Modified Files: epiphany.spec Log Message: forgot to bump the gecko req Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-8/epiphany.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- epiphany.spec 2 Jul 2008 20:01:11 -0000 1.178 +++ epiphany.spec 3 Jul 2008 03:38:14 -0000 1.179 @@ -1,4 +1,4 @@ -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 %define desktop_file_utils_version 0.9 %define glib2_devel_ver 2.12.0 %define gtk2_devel_ver 2.10.0 From fedora-extras-commits at redhat.com Thu Jul 3 03:40:07 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:40:07 GMT Subject: rpms/galeon/F-8 galeon.spec,1.48,1.49 Message-ID: <200807030340.m633e7H8011603@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/galeon/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11557 Modified Files: galeon.spec Log Message: forgot to bump the gecko req Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/F-8/galeon.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- galeon.spec 2 Jul 2008 20:01:54 -0000 1.48 +++ galeon.spec 3 Jul 2008 03:39:29 -0000 1.49 @@ -1,4 +1,4 @@ -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 Summary: GNOME2 Web browser based on Mozilla Name: galeon From fedora-extras-commits at redhat.com Thu Jul 3 03:43:51 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:43:51 GMT Subject: rpms/gnome-python2-extras/F-8 gnome-python2-extras.spec,1.25,1.26 Message-ID: <200807030343.m633hpfR011769@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/gnome-python2-extras/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11728 Modified Files: gnome-python2-extras.spec Log Message: forgot to bump the gecko req Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-python2-extras/F-8/gnome-python2-extras.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnome-python2-extras.spec 2 Jul 2008 20:02:33 -0000 1.25 +++ gnome-python2-extras.spec 3 Jul 2008 03:42:52 -0000 1.26 @@ -5,7 +5,7 @@ %define gnome_panel_version 2.2.0 %define gnome_python_version 2.10.0 %define gtkhtml2_version 2.3.1 -%define gecko_version 1.8.1.14 +%define gecko_version 1.8.1.15 %define gtkspell_version 2.0.7 %define libgda_version 2.99.6 %define anjuta_gdl_version 0.7.1 From fedora-extras-commits at redhat.com Thu Jul 3 03:45:07 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:45:07 GMT Subject: rpms/gnome-web-photo/F-8 gnome-web-photo.spec,1.8,1.9 Message-ID: <200807030345.m633j7nx011854@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/gnome-web-photo/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11823 Modified Files: gnome-web-photo.spec Log Message: forgot to bump the gecko req Index: gnome-web-photo.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-web-photo/F-8/gnome-web-photo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnome-web-photo.spec 2 Jul 2008 20:02:48 -0000 1.8 +++ gnome-web-photo.spec 3 Jul 2008 03:44:18 -0000 1.9 @@ -1,4 +1,4 @@ -%define gecko_version 1.8.1.14 +%define gecko_version 1.8.1.15 Summary: HTML pages thumbnailer Name: gnome-web-photo From fedora-extras-commits at redhat.com Thu Jul 3 03:46:25 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:46:25 GMT Subject: rpms/gtkmozembedmm/F-8 gtkmozembedmm.spec,1.24,1.25 Message-ID: <200807030346.m633kPba012014@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/gtkmozembedmm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908 Modified Files: gtkmozembedmm.spec Log Message: forgot to bump the gecko req Index: gtkmozembedmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmozembedmm/F-8/gtkmozembedmm.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gtkmozembedmm.spec 2 Jul 2008 20:03:10 -0000 1.24 +++ gtkmozembedmm.spec 3 Jul 2008 03:45:33 -0000 1.25 @@ -1,4 +1,4 @@ -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 Name: gtkmozembedmm Version: 1.4.2.cvs20060817 Release: 21%{?dist} From fedora-extras-commits at redhat.com Thu Jul 3 03:47:35 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:47:35 GMT Subject: rpms/kazehakase/F-8 kazehakase.spec,1.56,1.57 Message-ID: <200807030347.m633lZon012093@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/kazehakase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12068 Modified Files: kazehakase.spec Log Message: forgot to bump the gecko req Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- kazehakase.spec 2 Jul 2008 20:03:33 -0000 1.56 +++ kazehakase.spec 3 Jul 2008 03:46:53 -0000 1.57 @@ -18,10 +18,10 @@ %define need_autogen 1 %endif %if 0%{?fedora} == 8 -%define Geckover 1.8.1.14 +%define Geckover 1.8.1.15 %endif %if 0%{?fedora} == 7 -%define Geckover 1.8.1.14 +%define Geckover 1.8.1.15 %define need_autogen 1 %endif From fedora-extras-commits at redhat.com Thu Jul 3 03:48:58 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:48:58 GMT Subject: rpms/liferea/F-8 liferea.spec,1.110,1.111 Message-ID: <200807030348.m633mwWh012212@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/liferea/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12138 Modified Files: liferea.spec Log Message: forgot to bump the gecko req Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/F-8/liferea.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- liferea.spec 2 Jul 2008 20:03:51 -0000 1.110 +++ liferea.spec 3 Jul 2008 03:47:59 -0000 1.111 @@ -1,4 +1,4 @@ -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 Name: liferea Version: 1.4.15 From fedora-extras-commits at redhat.com Thu Jul 3 03:50:06 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:50:06 GMT Subject: rpms/Miro/F-8 Miro.spec,1.16,1.17 Message-ID: <200807030350.m633o6L9012342@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/Miro/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12286 Modified Files: Miro.spec Log Message: forgot to bump the gecko req Index: Miro.spec =================================================================== RCS file: /cvs/extras/rpms/Miro/F-8/Miro.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Miro.spec 2 Jul 2008 20:04:42 -0000 1.16 +++ Miro.spec 3 Jul 2008 03:49:20 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 Name: Miro Version: 1.2.3 From fedora-extras-commits at redhat.com Thu Jul 3 03:51:18 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:51:18 GMT Subject: rpms/openvrml/F-8 openvrml.spec,1.41,1.42 Message-ID: <200807030351.m633pItA012478@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/openvrml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391 Modified Files: openvrml.spec Log Message: forgot to bump the gecko req Index: openvrml.spec =================================================================== RCS file: /cvs/extras/rpms/openvrml/F-8/openvrml.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- openvrml.spec 2 Jul 2008 20:05:06 -0000 1.41 +++ openvrml.spec 3 Jul 2008 03:50:29 -0000 1.42 @@ -69,7 +69,7 @@ Group: Applications/Internet License: GPLv3+ Requires: %{name}-gl = %{version}-%{release} -Requires: gecko-libs = 1.8.1.14 +Requires: gecko-libs = 1.8.1.15 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Obsoletes: %{name}-gtkplug From fedora-extras-commits at redhat.com Thu Jul 3 03:52:29 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:52:29 GMT Subject: rpms/ruby-gnome2/F-8 ruby-gnome2.spec,1.20,1.21 Message-ID: <200807030352.m633qTfk012616@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ruby-gnome2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12537 Modified Files: ruby-gnome2.spec Log Message: forgot to bump the gecko req Index: ruby-gnome2.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-gnome2/F-8/ruby-gnome2.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ruby-gnome2.spec 2 Jul 2008 20:05:28 -0000 1.20 +++ ruby-gnome2.spec 3 Jul 2008 03:51:43 -0000 1.21 @@ -295,13 +295,13 @@ %endif %if 0%{?fedora} == 8 -BuildRequires: gecko-devel = 1.8.1.14 -Requires: gecko-libs = 1.8.1.14 +BuildRequires: gecko-devel = 1.8.1.15 +Requires: gecko-libs = 1.8.1.15 %endif %if 0%{?fedora} == 7 -BuildRequires: gecko-devel = 1.8.1.14 -Requires: gecko-libs = 1.8.1.14 +BuildRequires: gecko-devel = 1.8.1.15 +Requires: gecko-libs = 1.8.1.15 %endif %if 0%{?fedora} == 6 From fedora-extras-commits at redhat.com Thu Jul 3 03:53:37 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:53:37 GMT Subject: rpms/yelp/F-8 yelp.spec,1.120,1.121 Message-ID: <200807030353.m633rbI2012723@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/yelp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12687 Modified Files: yelp.spec Log Message: forgot to bump the gecko req Index: yelp.spec =================================================================== RCS file: /cvs/extras/rpms/yelp/F-8/yelp.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- yelp.spec 2 Jul 2008 20:05:59 -0000 1.120 +++ yelp.spec 3 Jul 2008 03:52:52 -0000 1.121 @@ -12,7 +12,7 @@ %define libxslt_version 1.1.4 %define startup_notification_version 0.8 %define rarian_version 0.5.0 -%define gecko_version 1.8.1.14 +%define gecko_version 1.8.1.15 %define pango_version 1.0.99 %define desktop_file_utils_version 0.3-7 From fedora-extras-commits at redhat.com Thu Jul 3 03:59:09 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 03:59:09 GMT Subject: rpms/epiphany-extensions/F-8 epiphany-extensions.spec,1.45,1.46 Message-ID: <200807030359.m633x9pt013017@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12968 Modified Files: epiphany-extensions.spec Log Message: forgot to bump the gecko req Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/F-8/epiphany-extensions.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- epiphany-extensions.spec 2 Jul 2008 20:01:36 -0000 1.45 +++ epiphany-extensions.spec 3 Jul 2008 03:58:31 -0000 1.46 @@ -1,6 +1,6 @@ %global ephy_major 2.20 %global ephy_min_version %{ephy_major}.0 -%global gecko_version 1.8.1.14 +%global gecko_version 1.8.1.15 Name: epiphany-extensions Version: %{ephy_major}.1 From fedora-extras-commits at redhat.com Thu Jul 3 04:11:17 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 3 Jul 2008 04:11:17 GMT Subject: rpms/iso-codes/devel .cvsignore, 1.18, 1.19 iso-codes.spec, 1.24, 1.25 sources, 1.19, 1.20 Message-ID: <200807030411.m634BHLM021002@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/iso-codes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20928 Modified Files: .cvsignore iso-codes.spec sources Log Message: * Wed Jul 2 2008 Christopher Aillon - 3.1-1 - Update to 3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/iso-codes/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 7 May 2008 19:07:45 -0000 1.18 +++ .cvsignore 3 Jul 2008 04:10:30 -0000 1.19 @@ -1 +1 @@ -iso-codes-2.1.tar.bz2 +iso-codes-3.1.tar.bz2 Index: iso-codes.spec =================================================================== RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- iso-codes.spec 7 May 2008 19:07:45 -0000 1.24 +++ iso-codes.spec 3 Jul 2008 04:10:30 -0000 1.25 @@ -3,7 +3,7 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 2.1 +Version: 3.1 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Base @@ -61,6 +61,9 @@ %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Wed Jul 2 2008 Christopher Aillon - 3.1-1 +- Update to 3.1 + * Wed May 7 2008 Christopher Aillon 2.1-1 - Update to 2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/iso-codes/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 7 May 2008 19:22:22 -0000 1.19 +++ sources 3 Jul 2008 04:10:30 -0000 1.20 @@ -1 +1 @@ -efcc7d27d4964f71681fbe9c7e608b18 iso-codes-2.1.tar.bz2 +570d30a0ebc5412f6aff7904c2b5404b iso-codes-3.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 04:15:09 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 3 Jul 2008 04:15:09 GMT Subject: rpms/totem/OLPC-3 totem.spec,1.190,1.191 Message-ID: <200807030415.m634F95b021236@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/totem/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170 Modified Files: totem.spec Log Message: rebuild against the newer totem-pl-parser Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/OLPC-3/totem.spec,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- totem.spec 2 Jul 2008 19:59:41 -0000 1.190 +++ totem.spec 3 Jul 2008 04:14:20 -0000 1.191 @@ -11,7 +11,7 @@ Summary: Movie player for GNOME Name: totem Version: 2.23.4 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -446,6 +446,9 @@ %endif %changelog +* Wed Jul 02 2008 - Dennis Gilmore - 2.23.4-1.2 +- rebuild against the newer totem-pl-parser + * Wed Jul 02 2008 - Dennis Gilmore - 2.23.4-1.1 - setup macros to define a minimal gtk only build - disable xine backend for OLPC minimal build From fedora-extras-commits at redhat.com Thu Jul 3 04:22:45 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 3 Jul 2008 04:22:45 GMT Subject: rpms/kernel/devel config-generic, 1.120, 1.121 kernel.spec, 1.728, 1.729 linux-2.6-silence-noise.patch, 1.15, 1.16 Message-ID: <200807030422.m634Mj0H021651@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21570 Modified Files: config-generic kernel.spec linux-2.6-silence-noise.patch Log Message: * Thu Jul 3 2008 Jeremy Katz - Disable the garmin_gps driver; programs are using libusb for this now - Make padlock warnings quieter Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- config-generic 3 Jul 2008 03:17:44 -0000 1.120 +++ config-generic 3 Jul 2008 04:21:56 -0000 1.121 @@ -2690,7 +2690,7 @@ CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_GARMIN=m +# CONFIG_USB_SERIAL_GARMIN is not set CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IPW=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.728 retrieving revision 1.729 diff -u -r1.728 -r1.729 --- kernel.spec 3 Jul 2008 03:17:44 -0000 1.728 +++ kernel.spec 3 Jul 2008 04:21:56 -0000 1.729 @@ -1788,6 +1788,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 3 2008 Jeremy Katz +- Disable the garmin_gps driver; programs are using libusb for this now +- Make padlock warnings quieter + * Wed Jul 02 2008 Chuck Ebbert - Re-enable the snd-pcsp driver (#452748) linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- linux-2.6-silence-noise.patch 16 May 2008 21:06:38 -0000 1.15 +++ linux-2.6-silence-noise.patch 3 Jul 2008 04:21:56 -0000 1.16 @@ -88,3 +88,60 @@ mutex_lock(&dpm_list_mtx); if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) { if (dev->parent->power.sleeping) +From fc4c74c4d0ccc7b57fcc841e88b63fd729f45115 Mon Sep 17 00:00:00 2001 +From: Jeremy Katz +Date: Tue, 1 Jul 2008 17:32:41 -0400 +Subject: [PATCH] Make loading padlock modules quieter when hardware isn't available + +When loading aes or sha256 via the module aliases, the padlock modules +also try to get loaded. Make the error message for them not being +present only be a NOTICE rather than an ERROR so that use of 'quiet' +will suppress the messages + +Signed-off-by: Jeremy Katz +--- + drivers/crypto/padlock-aes.c | 4 ++-- + drivers/crypto/padlock-sha.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c +index bb30eb9..54a2a16 100644 +--- a/drivers/crypto/padlock-aes.c ++++ b/drivers/crypto/padlock-aes.c +@@ -385,12 +385,12 @@ static int __init padlock_init(void) + int ret; + + if (!cpu_has_xcrypt) { +- printk(KERN_ERR PFX "VIA PadLock not detected.\n"); ++ printk(KERN_NOTICE PFX "VIA PadLock not detected.\n"); + return -ENODEV; + } + + if (!cpu_has_xcrypt_enabled) { +- printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); ++ printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); + return -ENODEV; + } + +diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c +index c666b4e..40d5680 100644 +--- a/drivers/crypto/padlock-sha.c ++++ b/drivers/crypto/padlock-sha.c +@@ -254,12 +254,12 @@ static int __init padlock_init(void) + int rc = -ENODEV; + + if (!cpu_has_phe) { +- printk(KERN_ERR PFX "VIA PadLock Hash Engine not detected.\n"); ++ printk(KERN_NOTICE PFX "VIA PadLock Hash Engine not detected.\n"); + return -ENODEV; + } + + if (!cpu_has_phe_enabled) { +- printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); ++ printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); + return -ENODEV; + } + +-- +1.5.6 + From fedora-extras-commits at redhat.com Thu Jul 3 04:31:49 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 3 Jul 2008 04:31:49 GMT Subject: rpms/cairo-dock/F-8 cairo-dock.spec,1.11,1.12 Message-ID: <200807030431.m634VnhR022083@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22011 Modified Files: cairo-dock.spec Log Message: * Thu Jul 3 2008 Mamoru Tasaka - F-8: rebuild against new gecko Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cairo-dock.spec 21 Jun 2008 06:21:58 -0000 1.11 +++ cairo-dock.spec 3 Jul 2008 04:31:06 -0000 1.12 @@ -15,12 +15,12 @@ %define gecko_ver 1.9 %endif %if 0%{?fedora} == 8 -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 %endif Name: cairo-dock Version: %{mainver} -Release: %{fedora_rel}%{?dist} +Release: %{fedora_rel}%{?dist}.1 Summary: Light eye-candy fully themable animated dock Group: User Interface/Desktops @@ -494,6 +494,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 3 2008 Mamoru Tasaka +- F-8: rebuild against new gecko + * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 From fedora-extras-commits at redhat.com Thu Jul 3 04:34:15 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Thu, 3 Jul 2008 04:34:15 GMT Subject: rpms/freehoo/devel freehoo.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807030434.m634YFIA022457@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/freehoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22367/devel Modified Files: .cvsignore sources Added Files: freehoo.spec import.log Log Message: Initial import. --- NEW FILE freehoo.spec --- Name: freehoo Version: 3.5.2 Release: 2%{?dist} Summary: Freehoo is a free console based messenger for Yahoo IM Service Group: Applications/Internet License: GPLv2+ URL: http://www.nongnu.org/freehoo/ Source0: http://download.savannah.gnu.org/releases/freehoo/freehoo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libyahoo2 >= 0.7.6 words Requires(post): info Requires(preun): info BuildRequires: guile-devel BuildRequires: readline-devel BuildRequires: glib2-devel BuildRequires: libyahoo2-devel >= 0.7.6 BuildRequires: texinfo %description This is a simple Yahoo Messenger client that requires no windowing system, and it therefore can be quite useful in situations where a minimal system is being used or when a windowing system is otherwise unavailable or unfeasible. %prep %setup -q %build %configure \ --with-docdir=%{_docdir}/%{name}-%{version} %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} # This preserves timestamps. %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" # Make sure our documentation directory exists. %{__mkdir} -p %{buildroot}/%{_docdir}/%{name}-%{version} # Clean up old documentation directories. %{__rm} -rf %{buildroot}/usr/doc %{__rm} -rf %{buildroot}/%{_docdir}/%{name} # Remove info/dir if it exists. %{__rm} -f %{buildroot}/%{_infodir}/dir %clean %{__rm} -rf %{buildroot} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO doc/examples %{_bindir}/%{name} %{_datadir}/%{name} %{_infodir}/* %{_mandir}/man?/* %changelog * Sat Jun 28 2008 Ray Van Dolson - 3.5.2-2 - Removed extra non-needed Requires; added 'words' - No longer converting freehoo.1 to UTF-8 (unneeded) - No longer specifying C_INCLUDE_PATH to make - Cleaned up some documentation processing logic that was unnecessary - Removed INSTALL - BuildRequires on separate lines - Other minor cleanups per reviewer - Removed %check as there is no make test target * Sat May 3 2008 Ray Van Dolson - 3.5.2-1 - Upstream released 3.5.2 * Tue Apr 30 2008 Ray Van Dolson - 3.5.1.20080430-1 - Testing against CVS * Sun Apr 27 2008 Ray Van Dolson - 3.5.1-2 - Rebuild against libyahoo2 0.7.6 - Created freehoo-3.5.1-callbacks.patch for callback changes in libyahoo2 0.7.6 * Thu Feb 21 2008 Ray Van Dolson - 3.5.1-1 - Upstream released 3.5.1 (guile 1.6 compatibility and nick auto-completion) * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-3 - Including COPYING file (license) - Including texinfo snippet. - Using buildroot macro. - Remove executable bit from script in documentation. * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-2 - Including patch from Harshavardhana to provide backwards compatibility with guile 1.6.x for EL4. * Mon Feb 18 2008 Ray Van Dolson - 3.5.0-1 - Initial creation --- NEW FILE import.log --- freehoo-3_5_2-2:HEAD:freehoo-3.5.2-2.src.rpm:1215059594 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freehoo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 15:55:24 -0000 1.1 +++ .cvsignore 3 Jul 2008 04:33:25 -0000 1.2 @@ -0,0 +1 @@ +freehoo-3.5.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freehoo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 15:55:24 -0000 1.1 +++ sources 3 Jul 2008 04:33:25 -0000 1.2 @@ -0,0 +1 @@ +587884c08f8867381288107cb69f9243 freehoo-3.5.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 04:41:56 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Thu, 3 Jul 2008 04:41:56 GMT Subject: rpms/freehoo/F-9 freehoo.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807030441.m634fuwO022970@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/freehoo/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22928 Modified Files: sources Added Files: freehoo.spec Log Message: Initial import. --- NEW FILE freehoo.spec --- Name: freehoo Version: 3.5.2 Release: 2%{?dist} Summary: Freehoo is a free console based messenger for Yahoo IM Service Group: Applications/Internet License: GPLv2+ URL: http://www.nongnu.org/freehoo/ Source0: http://download.savannah.gnu.org/releases/freehoo/freehoo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libyahoo2 >= 0.7.6 words Requires(post): info Requires(preun): info BuildRequires: guile-devel BuildRequires: readline-devel BuildRequires: glib2-devel BuildRequires: libyahoo2-devel >= 0.7.6 BuildRequires: texinfo %description This is a simple Yahoo Messenger client that requires no windowing system, and it therefore can be quite useful in situations where a minimal system is being used or when a windowing system is otherwise unavailable or unfeasible. %prep %setup -q %build %configure \ --with-docdir=%{_docdir}/%{name}-%{version} %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} # This preserves timestamps. %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" # Make sure our documentation directory exists. %{__mkdir} -p %{buildroot}/%{_docdir}/%{name}-%{version} # Clean up old documentation directories. %{__rm} -rf %{buildroot}/usr/doc %{__rm} -rf %{buildroot}/%{_docdir}/%{name} # Remove info/dir if it exists. %{__rm} -f %{buildroot}/%{_infodir}/dir %clean %{__rm} -rf %{buildroot} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO doc/examples %{_bindir}/%{name} %{_datadir}/%{name} %{_infodir}/* %{_mandir}/man?/* %changelog * Sat Jun 28 2008 Ray Van Dolson - 3.5.2-2 - Removed extra non-needed Requires; added 'words' - No longer converting freehoo.1 to UTF-8 (unneeded) - No longer specifying C_INCLUDE_PATH to make - Cleaned up some documentation processing logic that was unnecessary - Removed INSTALL - BuildRequires on separate lines - Other minor cleanups per reviewer - Removed %check as there is no make test target * Sat May 3 2008 Ray Van Dolson - 3.5.2-1 - Upstream released 3.5.2 * Tue Apr 30 2008 Ray Van Dolson - 3.5.1.20080430-1 - Testing against CVS * Sun Apr 27 2008 Ray Van Dolson - 3.5.1-2 - Rebuild against libyahoo2 0.7.6 - Created freehoo-3.5.1-callbacks.patch for callback changes in libyahoo2 0.7.6 * Thu Feb 21 2008 Ray Van Dolson - 3.5.1-1 - Upstream released 3.5.1 (guile 1.6 compatibility and nick auto-completion) * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-3 - Including COPYING file (license) - Including texinfo snippet. - Using buildroot macro. - Remove executable bit from script in documentation. * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-2 - Including patch from Harshavardhana to provide backwards compatibility with guile 1.6.x for EL4. * Mon Feb 18 2008 Ray Van Dolson - 3.5.0-1 - Initial creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freehoo/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 15:55:24 -0000 1.1 +++ sources 3 Jul 2008 04:41:12 -0000 1.2 @@ -0,0 +1 @@ +587884c08f8867381288107cb69f9243 freehoo-3.5.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 04:45:39 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Thu, 3 Jul 2008 04:45:39 GMT Subject: rpms/freehoo/F-8 freehoo.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807030445.m634jdHI023286@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/freehoo/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23231 Modified Files: sources Added Files: freehoo.spec Log Message: Initial import. --- NEW FILE freehoo.spec --- Name: freehoo Version: 3.5.2 Release: 2%{?dist} Summary: Freehoo is a free console based messenger for Yahoo IM Service Group: Applications/Internet License: GPLv2+ URL: http://www.nongnu.org/freehoo/ Source0: http://download.savannah.gnu.org/releases/freehoo/freehoo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libyahoo2 >= 0.7.6 words Requires(post): info Requires(preun): info BuildRequires: guile-devel BuildRequires: readline-devel BuildRequires: glib2-devel BuildRequires: libyahoo2-devel >= 0.7.6 BuildRequires: texinfo %description This is a simple Yahoo Messenger client that requires no windowing system, and it therefore can be quite useful in situations where a minimal system is being used or when a windowing system is otherwise unavailable or unfeasible. %prep %setup -q %build %configure \ --with-docdir=%{_docdir}/%{name}-%{version} %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} # This preserves timestamps. %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" # Make sure our documentation directory exists. %{__mkdir} -p %{buildroot}/%{_docdir}/%{name}-%{version} # Clean up old documentation directories. %{__rm} -rf %{buildroot}/usr/doc %{__rm} -rf %{buildroot}/%{_docdir}/%{name} # Remove info/dir if it exists. %{__rm} -f %{buildroot}/%{_infodir}/dir %clean %{__rm} -rf %{buildroot} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO doc/examples %{_bindir}/%{name} %{_datadir}/%{name} %{_infodir}/* %{_mandir}/man?/* %changelog * Sat Jun 28 2008 Ray Van Dolson - 3.5.2-2 - Removed extra non-needed Requires; added 'words' - No longer converting freehoo.1 to UTF-8 (unneeded) - No longer specifying C_INCLUDE_PATH to make - Cleaned up some documentation processing logic that was unnecessary - Removed INSTALL - BuildRequires on separate lines - Other minor cleanups per reviewer - Removed %check as there is no make test target * Sat May 3 2008 Ray Van Dolson - 3.5.2-1 - Upstream released 3.5.2 * Tue Apr 30 2008 Ray Van Dolson - 3.5.1.20080430-1 - Testing against CVS * Sun Apr 27 2008 Ray Van Dolson - 3.5.1-2 - Rebuild against libyahoo2 0.7.6 - Created freehoo-3.5.1-callbacks.patch for callback changes in libyahoo2 0.7.6 * Thu Feb 21 2008 Ray Van Dolson - 3.5.1-1 - Upstream released 3.5.1 (guile 1.6 compatibility and nick auto-completion) * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-3 - Including COPYING file (license) - Including texinfo snippet. - Using buildroot macro. - Remove executable bit from script in documentation. * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-2 - Including patch from Harshavardhana to provide backwards compatibility with guile 1.6.x for EL4. * Mon Feb 18 2008 Ray Van Dolson - 3.5.0-1 - Initial creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freehoo/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 15:55:24 -0000 1.1 +++ sources 3 Jul 2008 04:44:46 -0000 1.2 @@ -0,0 +1 @@ +587884c08f8867381288107cb69f9243 freehoo-3.5.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 04:48:21 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Thu, 3 Jul 2008 04:48:21 GMT Subject: rpms/freehoo/EL-4 freehoo.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807030448.m634mLq3023465@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/freehoo/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23382 Modified Files: sources Added Files: freehoo.spec Log Message: Initial import. --- NEW FILE freehoo.spec --- Name: freehoo Version: 3.5.2 Release: 2%{?dist} Summary: Freehoo is a free console based messenger for Yahoo IM Service Group: Applications/Internet License: GPLv2+ URL: http://www.nongnu.org/freehoo/ Source0: http://download.savannah.gnu.org/releases/freehoo/freehoo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libyahoo2 >= 0.7.6 words Requires(post): info Requires(preun): info BuildRequires: guile-devel BuildRequires: readline-devel BuildRequires: glib2-devel BuildRequires: libyahoo2-devel >= 0.7.6 BuildRequires: texinfo %description This is a simple Yahoo Messenger client that requires no windowing system, and it therefore can be quite useful in situations where a minimal system is being used or when a windowing system is otherwise unavailable or unfeasible. %prep %setup -q %build %configure \ --with-docdir=%{_docdir}/%{name}-%{version} %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} # This preserves timestamps. %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" # Make sure our documentation directory exists. %{__mkdir} -p %{buildroot}/%{_docdir}/%{name}-%{version} # Clean up old documentation directories. %{__rm} -rf %{buildroot}/usr/doc %{__rm} -rf %{buildroot}/%{_docdir}/%{name} # Remove info/dir if it exists. %{__rm} -f %{buildroot}/%{_infodir}/dir %clean %{__rm} -rf %{buildroot} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO doc/examples %{_bindir}/%{name} %{_datadir}/%{name} %{_infodir}/* %{_mandir}/man?/* %changelog * Sat Jun 28 2008 Ray Van Dolson - 3.5.2-2 - Removed extra non-needed Requires; added 'words' - No longer converting freehoo.1 to UTF-8 (unneeded) - No longer specifying C_INCLUDE_PATH to make - Cleaned up some documentation processing logic that was unnecessary - Removed INSTALL - BuildRequires on separate lines - Other minor cleanups per reviewer - Removed %check as there is no make test target * Sat May 3 2008 Ray Van Dolson - 3.5.2-1 - Upstream released 3.5.2 * Tue Apr 30 2008 Ray Van Dolson - 3.5.1.20080430-1 - Testing against CVS * Sun Apr 27 2008 Ray Van Dolson - 3.5.1-2 - Rebuild against libyahoo2 0.7.6 - Created freehoo-3.5.1-callbacks.patch for callback changes in libyahoo2 0.7.6 * Thu Feb 21 2008 Ray Van Dolson - 3.5.1-1 - Upstream released 3.5.1 (guile 1.6 compatibility and nick auto-completion) * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-3 - Including COPYING file (license) - Including texinfo snippet. - Using buildroot macro. - Remove executable bit from script in documentation. * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-2 - Including patch from Harshavardhana to provide backwards compatibility with guile 1.6.x for EL4. * Mon Feb 18 2008 Ray Van Dolson - 3.5.0-1 - Initial creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freehoo/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 15:55:24 -0000 1.1 +++ sources 3 Jul 2008 04:47:27 -0000 1.2 @@ -0,0 +1 @@ +587884c08f8867381288107cb69f9243 freehoo-3.5.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 04:48:26 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Thu, 3 Jul 2008 04:48:26 GMT Subject: rpms/freehoo/EL-5 freehoo.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807030448.m634mQst023468@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/freehoo/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23395 Modified Files: sources Added Files: freehoo.spec Log Message: Initial import. --- NEW FILE freehoo.spec --- Name: freehoo Version: 3.5.2 Release: 2%{?dist} Summary: Freehoo is a free console based messenger for Yahoo IM Service Group: Applications/Internet License: GPLv2+ URL: http://www.nongnu.org/freehoo/ Source0: http://download.savannah.gnu.org/releases/freehoo/freehoo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libyahoo2 >= 0.7.6 words Requires(post): info Requires(preun): info BuildRequires: guile-devel BuildRequires: readline-devel BuildRequires: glib2-devel BuildRequires: libyahoo2-devel >= 0.7.6 BuildRequires: texinfo %description This is a simple Yahoo Messenger client that requires no windowing system, and it therefore can be quite useful in situations where a minimal system is being used or when a windowing system is otherwise unavailable or unfeasible. %prep %setup -q %build %configure \ --with-docdir=%{_docdir}/%{name}-%{version} %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} # This preserves timestamps. %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" # Make sure our documentation directory exists. %{__mkdir} -p %{buildroot}/%{_docdir}/%{name}-%{version} # Clean up old documentation directories. %{__rm} -rf %{buildroot}/usr/doc %{__rm} -rf %{buildroot}/%{_docdir}/%{name} # Remove info/dir if it exists. %{__rm} -f %{buildroot}/%{_infodir}/dir %clean %{__rm} -rf %{buildroot} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO doc/examples %{_bindir}/%{name} %{_datadir}/%{name} %{_infodir}/* %{_mandir}/man?/* %changelog * Sat Jun 28 2008 Ray Van Dolson - 3.5.2-2 - Removed extra non-needed Requires; added 'words' - No longer converting freehoo.1 to UTF-8 (unneeded) - No longer specifying C_INCLUDE_PATH to make - Cleaned up some documentation processing logic that was unnecessary - Removed INSTALL - BuildRequires on separate lines - Other minor cleanups per reviewer - Removed %check as there is no make test target * Sat May 3 2008 Ray Van Dolson - 3.5.2-1 - Upstream released 3.5.2 * Tue Apr 30 2008 Ray Van Dolson - 3.5.1.20080430-1 - Testing against CVS * Sun Apr 27 2008 Ray Van Dolson - 3.5.1-2 - Rebuild against libyahoo2 0.7.6 - Created freehoo-3.5.1-callbacks.patch for callback changes in libyahoo2 0.7.6 * Thu Feb 21 2008 Ray Van Dolson - 3.5.1-1 - Upstream released 3.5.1 (guile 1.6 compatibility and nick auto-completion) * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-3 - Including COPYING file (license) - Including texinfo snippet. - Using buildroot macro. - Remove executable bit from script in documentation. * Tue Feb 19 2008 Ray Van Dolson - 3.5.0-2 - Including patch from Harshavardhana to provide backwards compatibility with guile 1.6.x for EL4. * Mon Feb 18 2008 Ray Van Dolson - 3.5.0-1 - Initial creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freehoo/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 15:55:24 -0000 1.1 +++ sources 3 Jul 2008 04:47:40 -0000 1.2 @@ -0,0 +1 @@ +587884c08f8867381288107cb69f9243 freehoo-3.5.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 04:56:35 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Thu, 3 Jul 2008 04:56:35 GMT Subject: rpms/lxsplit/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 lxsplit-0.2.2-build-fixes.diff, 1.1, NONE Message-ID: <200807030456.m634uZQU024237@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/lxsplit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24178 Modified Files: .cvsignore sources Removed Files: lxsplit-0.2.2-build-fixes.diff Log Message: update source. remove obsolete patch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxsplit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 May 2008 00:53:51 -0000 1.2 +++ .cvsignore 3 Jul 2008 04:55:48 -0000 1.3 @@ -1 +1 @@ -lxsplit-0.2.2.tar.gz +lxsplit-0.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxsplit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 May 2008 00:53:51 -0000 1.2 +++ sources 3 Jul 2008 04:55:48 -0000 1.3 @@ -1 +1 @@ -f8de6f2d70b31eb473fbe2831844da77 lxsplit-0.2.2.tar.gz +b47b37f22c656326a6aa2f3f46682453 lxsplit-0.2.3.tar.gz --- lxsplit-0.2.2-build-fixes.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 05:04:37 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Thu, 3 Jul 2008 05:04:37 GMT Subject: rpms/lxsplit/devel lxsplit.spec,1.2,1.3 Message-ID: <200807030504.m6354bdX031260@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/lxsplit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31209 Modified Files: lxsplit.spec Log Message: new upstream release Index: lxsplit.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxsplit/devel/lxsplit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lxsplit.spec 31 May 2008 10:04:15 -0000 1.2 +++ lxsplit.spec 3 Jul 2008 05:03:52 -0000 1.3 @@ -1,13 +1,12 @@ Name: lxsplit -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: File split / merge utility Group: Applications/File License: GPLv2+ URL: http://lxsplit.sourceforge.net/ Source: http://downloads.sourceforge.net/lxsplit/%{name}-%{version}.tar.gz -Patch1: lxsplit-0.2.2-build-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -35,12 +34,15 @@ %{__rm} -rf %{buildroot} %files -%doc ChangeLog README COPYING %defattr(-,root,root,-) +%doc ChangeLog README COPYING %{_bindir}/lxsplit %changelog +* Thu Jul 03 2008 Rahul Sundaram - 0.2.3-1 + Pull new upstream. Drop obsoleted patch and fix defattr + * Sat May 31 2008 Rahul Sundaram - 0.2.2-4 - Apply upstream build patch From fedora-extras-commits at redhat.com Thu Jul 3 05:07:44 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 3 Jul 2008 05:07:44 GMT Subject: rpms/gnomesword/devel .cvsignore, 1.15, 1.16 gnomesword.spec, 1.46, 1.47 sources, 1.16, 1.17 gnomesword-no_gtkhtml_idl.patch, 1.1, NONE Message-ID: <200807030507.m6357iiL031650@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31559 Modified Files: .cvsignore gnomesword.spec sources Removed Files: gnomesword-no_gtkhtml_idl.patch Log Message: * Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 - Update to 2.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 27 May 2008 02:08:03 -0000 1.15 +++ .cvsignore 3 Jul 2008 05:06:49 -0000 1.16 @@ -1 +1 @@ -gnomesword-2.3.4.tar.gz +gnomesword-2.3.5.tar.gz Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gnomesword.spec 23 Jun 2008 22:45:55 -0000 1.46 +++ gnomesword.spec 3 Jul 2008 05:06:49 -0000 1.47 @@ -1,13 +1,12 @@ Name: gnomesword -Version: 2.3.4 -Release: 2%{?dist} +Version: 2.3.5 +Release: 1%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text License: GPLv2+ URL: http://gnomesword.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz -Patch0: gnomesword-no_gtkhtml_idl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sword-devel >= 1.5.11 @@ -34,7 +33,6 @@ %prep %setup -q -%patch0 -p0 -b .idl %build %configure --enable-exporter @@ -77,6 +75,9 @@ %_datadir/gnome/help/gnomesword/ %changelog +* Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 +- Update to 2.3.5 + * Mon Jun 23 2008 Deji Akingunola - 2.3.4-2 - Remove --enable-gtkthml configure option, to enable gecko support Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 27 May 2008 02:08:03 -0000 1.16 +++ sources 3 Jul 2008 05:06:49 -0000 1.17 @@ -1 +1 @@ -94fa12e7cc803efdacfa383362463cdc gnomesword-2.3.4.tar.gz +3f54f9750ce7d971afa53c71cc1973d1 gnomesword-2.3.5.tar.gz --- gnomesword-no_gtkhtml_idl.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 05:08:08 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Thu, 3 Jul 2008 05:08:08 GMT Subject: rpms/lxsplit/devel lxsplit.spec,1.3,1.4 Message-ID: <200807030508.m6358896031671@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/lxsplit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31584 Modified Files: lxsplit.spec Log Message: drop obsoleted patch Index: lxsplit.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxsplit/devel/lxsplit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lxsplit.spec 3 Jul 2008 05:03:52 -0000 1.3 +++ lxsplit.spec 3 Jul 2008 05:07:21 -0000 1.4 @@ -20,8 +20,6 @@ %prep %setup -q -%patch1 -p1 - %build %{__make} CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags} From fedora-extras-commits at redhat.com Thu Jul 3 05:22:02 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 3 Jul 2008 05:22:02 GMT Subject: rpms/gnomesword/F-8 .cvsignore, 1.14, 1.15 gnomesword.spec, 1.41, 1.42 sources, 1.15, 1.16 Message-ID: <200807030522.m635M2V6032760@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32680 Modified Files: .cvsignore gnomesword.spec sources Log Message: * Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 - Update to 2.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 27 May 2008 02:40:10 -0000 1.14 +++ .cvsignore 3 Jul 2008 05:21:12 -0000 1.15 @@ -1 +1 @@ -gnomesword-2.3.4.tar.gz +gnomesword-2.3.5.tar.gz Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-8/gnomesword.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gnomesword.spec 27 May 2008 02:40:10 -0000 1.41 +++ gnomesword.spec 3 Jul 2008 05:21:12 -0000 1.42 @@ -1,5 +1,5 @@ Name: gnomesword -Version: 2.3.4 +Version: 2.3.5 Release: 1%{?dist} Summary: GNOME-based Bible research tool @@ -75,6 +75,9 @@ %_datadir/gnome/help/gnomesword/ %changelog +* Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 +- Update to 2.3.5 + * Mon May 26 2008 Deji Akingunola - 2.3.4-1 - Update to 2.3.4 - Re-enable the gecko support Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 27 May 2008 02:40:10 -0000 1.15 +++ sources 3 Jul 2008 05:21:12 -0000 1.16 @@ -1 +1 @@ -94fa12e7cc803efdacfa383362463cdc gnomesword-2.3.4.tar.gz +3f54f9750ce7d971afa53c71cc1973d1 gnomesword-2.3.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 05:22:02 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 3 Jul 2008 05:22:02 GMT Subject: rpms/kernel/devel linux-2.6-ia64-export-account_system_vtime.patch, NONE, 1.1 linux-2.6-x86-efi-fix-low-mappings.patch, NONE, 1.1 kernel.spec, 1.729, 1.730 Message-ID: <200807030522.m635M2Ub032765@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32677 Modified Files: kernel.spec Added Files: linux-2.6-ia64-export-account_system_vtime.patch linux-2.6-x86-efi-fix-low-mappings.patch Log Message: * Thu Jul 03 2008 Chuck Ebbert - Fix EFI boot. - Export account_system_vtime on IA64. linux-2.6-ia64-export-account_system_vtime.patch: --- NEW FILE linux-2.6-ia64-export-account_system_vtime.patch --- The symbol account_system_vtime is used by the kvm module but not exported. This breaks building with CONFIG_VIRT_CPU_ACCOUNTING and CONFIG_KVM=m. Signed-off-by: Doug Chapman Acked-by: Hidetoshi Seto --- diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 8c73643..aad1b7b 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -117,6 +117,7 @@ void account_system_vtime(struct task_struct *tsk) local_irq_restore(flags); } +EXPORT_SYMBOL_GPL(account_system_vtime); /* * Called from the timer interrupt handler to charge accumulated user time linux-2.6-x86-efi-fix-low-mappings.patch: --- NEW FILE linux-2.6-x86-efi-fix-low-mappings.patch --- Fedora reports that mem_init()'s zap_low_mappings(), extended to SMP in 61165d7a035f6571c7576e7f51e7230157724c8d x86: fix app crashes after SMP resume causes 32-bit Intel Mac machines to reboot very early when booting with EFI. The EFI code appears to manage low mappings for itself when needed; but like many before it, confuses PSE with PAE. So it has only been mapping half the space it needed when PSE but not PAE. This remained unnoticed until we moved the SMP zap_low_mappings() before efi_enter_virtual_mode(). Presumably could have been noticed years ago if anyone ran a UP kernel on such machines? Reported-by: Peter Jones Signed-off-by: Hugh Dickins Tested-by: Peter Jones --- arch/x86/kernel/efi_32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- 2.6.26-rc8/arch/x86/kernel/efi_32.c 2008-04-17 03:49:44.000000000 +0100 +++ linux/arch/x86/kernel/efi_32.c 2008-07-02 17:02:36.000000000 +0100 @@ -49,13 +49,13 @@ void efi_call_phys_prelog(void) local_irq_save(efi_rt_eflags); /* - * If I don't have PSE, I should just duplicate two entries in page - * directory. If I have PSE, I just need to duplicate one entry in + * If I don't have PAE, I should just duplicate two entries in page + * directory. If I have PAE, I just need to duplicate one entry in * page directory. */ cr4 = read_cr4(); - if (cr4 & X86_CR4_PSE) { + if (cr4 & X86_CR4_PAE) { efi_bak_pg_dir_pointer[0].pgd = swapper_pg_dir[pgd_index(0)].pgd; swapper_pg_dir[0].pgd = @@ -93,7 +93,7 @@ void efi_call_phys_epilog(void) cr4 = read_cr4(); - if (cr4 & X86_CR4_PSE) { + if (cr4 & X86_CR4_PAE) { swapper_pg_dir[pgd_index(0)].pgd = efi_bak_pg_dir_pointer[0].pgd; } else { Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.729 retrieving revision 1.730 diff -u -r1.729 -r1.730 --- kernel.spec 3 Jul 2008 04:21:56 -0000 1.729 +++ kernel.spec 3 Jul 2008 05:21:14 -0000 1.730 @@ -663,6 +663,9 @@ # get rid of imacfb and make efifb work everywhere it was used Patch2600: linux-2.6-merge-efifb-imacfb.patch +Patch2610: linux-2.6-x86-efi-fix-low-mappings.patch + +Patch2700: linux-2.6-ia64-export-account_system_vtime.patch %endif @@ -1194,6 +1197,11 @@ # get rid of imacfb and make efifb work everywhere it was used ApplyPatch linux-2.6-merge-efifb-imacfb.patch +# fix efi boot +ApplyPatch linux-2.6-x86-efi-fix-low-mappings.patch + +# export account_system_vtime() on IA64 +ApplyPatch linux-2.6-ia64-export-account_system_vtime.patch # ---------- below all scheduled for 2.6.24 ----------------- @@ -1788,6 +1796,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 03 2008 Chuck Ebbert +- Fix EFI boot. +- Export account_system_vtime on IA64. + * Thu Jul 3 2008 Jeremy Katz - Disable the garmin_gps driver; programs are using libusb for this now - Make padlock warnings quieter From fedora-extras-commits at redhat.com Thu Jul 3 05:36:46 2008 From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade)) Date: Thu, 3 Jul 2008 05:36:46 GMT Subject: rpms/m17n-lib/devel .cvsignore, 1.8, 1.9 m17n-lib.spec, 1.20, 1.21 sources, 1.10, 1.11 Message-ID: <200807030536.m635akfo001646@cvs-int.fedora.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-lib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1522 Modified Files: .cvsignore m17n-lib.spec sources Log Message: * Thu Jul 03 2008 Parag Nemade -1.5.2-1 - Update to new upstream release 1.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/m17n-lib/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 Feb 2008 04:12:02 -0000 1.8 +++ .cvsignore 3 Jul 2008 05:35:53 -0000 1.9 @@ -2,3 +2,4 @@ m17n-lib-1.4.0.tar.gz m17n-lib-1.5.0.tar.gz m17n-lib-1.5.1.tar.gz +m17n-lib-1.5.2.tar.gz Index: m17n-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-lib/devel/m17n-lib.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- m17n-lib.spec 7 Feb 2008 04:12:02 -0000 1.20 +++ m17n-lib.spec 3 Jul 2008 05:35:53 -0000 1.21 @@ -4,7 +4,7 @@ %define with_examples 0 Name: m17n-lib -Version: 1.5.1 +Version: 1.5.2 Release: 1%{?dist} Summary: Multilingual text library @@ -96,6 +96,9 @@ %changelog +* Thu Jul 03 2008 Parag Nemade -1.5.2-1 +- Update to new upstream release 1.5.2 + * Thu Feb 07 2008 Parag Nemade -1.5.1-1.fc9 - Update to new upstream release 1.5.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/m17n-lib/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 7 Feb 2008 06:06:41 -0000 1.10 +++ sources 3 Jul 2008 05:35:53 -0000 1.11 @@ -1 +1 @@ -1fc48e2e2f42a6bb966026b61834d089 m17n-lib-1.5.1.tar.gz +d4d51ff3866e702b97eb173f35eee1e3 m17n-lib-1.5.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 06:00:49 2008 From: fedora-extras-commits at redhat.com (Haywood Alarid (bitt)) Date: Thu, 03 Jul 2008 06:00:49 -0000 Subject: scilicet considerably Message-ID: <3489842008.20080703051938@iprfinc.com> Hola, http://KfyF.resultslip.cn With oh! Yes, if you and papa wish it. Of course into space. mack seized him, and shaking him impatiently, including but not limited to warranties of merchantibility soldiers in the field and the sailors afloat. Are sure you've remembered the name right? I'm the way the property should have been left, and it strikes another so that he dies, the one also is il passero, pray? Well, you know him surely.. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Thu Jul 3 06:00:50 2008 From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade)) Date: Thu, 3 Jul 2008 06:00:50 GMT Subject: rpms/m17n-db/devel .cvsignore, 1.63, 1.64 m17n-db.spec, 1.87, 1.88 sources, 1.67, 1.68 Message-ID: <200807030600.m6360oY4004899@cvs-int.fedora.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-db/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4665 Modified Files: .cvsignore m17n-db.spec sources Log Message: * Thu Jul 03 2008 Parag Nemade -1.5.2-1 - Update to new upstream release 1.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/m17n-db/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 7 Feb 2008 05:59:01 -0000 1.63 +++ .cvsignore 3 Jul 2008 05:59:59 -0000 1.64 @@ -23,3 +23,4 @@ m17n-contrib-1.1.2.tar.gz m17n-db-1.5.0.tar.gz m17n-db-1.5.1.tar.gz +m17n-db-1.5.2.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-db/devel/m17n-db.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- m17n-db.spec 4 Apr 2008 10:14:07 -0000 1.87 +++ m17n-db.spec 3 Jul 2008 05:59:59 -0000 1.88 @@ -1,7 +1,7 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.5.1 -Release: 3%{?dist} +Version: 1.5.2 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://www.m17n.org/m17n-lib/index.html @@ -276,6 +276,9 @@ %{_datadir}/m17n/ug-*.mim %changelog +* Thu Jul 03 2008 Parag Nemade -1.5.2-1 +- Update to new upstream release 1.5.2 + * Fri Apr 04 2008 Parag Nemade -1.5.1-3.fc9 - Resolves:rh#440567 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/m17n-db/devel/sources,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- sources 7 Feb 2008 06:07:11 -0000 1.67 +++ sources 3 Jul 2008 05:59:59 -0000 1.68 @@ -1 +1 @@ -1627c9d8808115567412192a595a434b m17n-db-1.5.1.tar.gz +1d23fdcd8395acdb662de28e8bad4dc5 m17n-db-1.5.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 06:08:05 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Thu, 3 Jul 2008 06:08:05 GMT Subject: rpms/perl-Module-Find/devel .cvsignore, 1.2, 1.3 perl-Module-Find.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807030608.m6368585013016@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Module-Find/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12842 Modified Files: .cvsignore perl-Module-Find.spec sources Log Message: * Wed Jul 02 2008 Chris Weyl 0.06-1 - update to 0.06 - add examples/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Find/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Dec 2006 09:23:28 -0000 1.2 +++ .cvsignore 3 Jul 2008 06:07:16 -0000 1.3 @@ -1 +1 @@ -Module-Find-0.05.tar.gz +Module-Find-0.06.tar.gz Index: perl-Module-Find.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Find/devel/perl-Module-Find.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-Find.spec 8 Feb 2008 18:07:42 -0000 1.2 +++ perl-Module-Find.spec 3 Jul 2008 06:07:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Module-Find -Version: 0.05 -Release: 2%{?dist} +Version: 0.06 +Release: 1%{?dist} Summary: Find and use installed modules in a (sub)category Group: Development/Libraries @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -34,7 +35,7 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' -chmod -R u+w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* %check @@ -47,12 +48,16 @@ %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README examples/ %{perl_vendorlib}/Module/ %{_mandir}/man3/*.3pm* %changelog +* Wed Jul 02 2008 Chris Weyl 0.06-1 +- update to 0.06 +- add examples/ + * Fri Feb 8 2008 Tom "spot" Callaway - 0.05-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Find/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Dec 2006 09:23:28 -0000 1.2 +++ sources 3 Jul 2008 06:07:16 -0000 1.3 @@ -1 +1 @@ -1b756c84e476fc8179fcf2699a4d1a86 Module-Find-0.05.tar.gz +64254ded9d9aea2845a2c7cf25a2949b Module-Find-0.06.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 06:14:30 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Thu, 3 Jul 2008 06:14:30 GMT Subject: rpms/lxsplit/F-9 lxsplit.spec, 1.2, 1.3 sources, 1.2, 1.3 lxsplit-0.2.2-build-fixes.diff, 1.1, NONE Message-ID: <200807030614.m636EU08014667@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/lxsplit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14290 Modified Files: lxsplit.spec sources Removed Files: lxsplit-0.2.2-build-fixes.diff Log Message: update to new upstream release. drop obsoleted patch Index: lxsplit.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxsplit/F-9/lxsplit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lxsplit.spec 31 May 2008 10:17:11 -0000 1.2 +++ lxsplit.spec 3 Jul 2008 06:13:42 -0000 1.3 @@ -1,13 +1,12 @@ Name: lxsplit -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: File split / merge utility Group: Applications/File License: GPLv2+ URL: http://lxsplit.sourceforge.net/ Source: http://downloads.sourceforge.net/lxsplit/%{name}-%{version}.tar.gz -Patch1: lxsplit-0.2.2-build-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -21,8 +20,6 @@ %prep %setup -q -%patch1 -p1 - %build %{__make} CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags} @@ -35,12 +32,15 @@ %{__rm} -rf %{buildroot} %files -%doc ChangeLog README COPYING %defattr(-,root,root,-) +%doc ChangeLog README COPYING %{_bindir}/lxsplit %changelog +* Thu Jul 03 2008 Rahul Sundaram - 0.2.3-1 + Pull new upstream. Drop obsoleted patch and fix defattr + * Sat May 31 2008 Rahul Sundaram - 0.2.2-4 - Apply upstream build patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxsplit/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 May 2008 01:06:45 -0000 1.2 +++ sources 3 Jul 2008 06:13:42 -0000 1.3 @@ -1 +1 @@ -f8de6f2d70b31eb473fbe2831844da77 lxsplit-0.2.2.tar.gz +b47b37f22c656326a6aa2f3f46682453 lxsplit-0.2.3.tar.gz --- lxsplit-0.2.2-build-fixes.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 07:13:59 2008 From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade)) Date: Thu, 3 Jul 2008 07:13:59 GMT Subject: rpms/m17n-contrib/devel .cvsignore, 1.5, 1.6 m17n-contrib.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200807030713.m637DxTx027033@cvs-int.fedora.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-contrib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26980 Modified Files: .cvsignore m17n-contrib.spec sources Log Message: * Thu Jul 03 2008 Parag Nemade -1.1.7-1 - Update to new upstream release 1.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Feb 2008 05:02:04 -0000 1.5 +++ .cvsignore 3 Jul 2008 07:13:13 -0000 1.6 @@ -2,3 +2,4 @@ m17n-contrib-1.1.4.tar.gz m17n-contrib-1.1.5.tar.gz m17n-contrib-1.1.6.tar.gz +m17n-contrib-1.1.7.tar.gz Index: m17n-contrib.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- m17n-contrib.spec 21 May 2008 06:02:58 -0000 1.12 +++ m17n-contrib.spec 3 Jul 2008 07:13:13 -0000 1.13 @@ -1,14 +1,11 @@ Name: m17n-contrib Summary: Contributed multilingualization datafiles for m17n-lib -Version: 1.1.6 -Release: 4%{?dist} +Version: 1.1.7 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://www.m17n.org/m17n-lib/index.html Source0: http://www.m17n.org/m17n-lib-download/m17n-contrib-%{version}.tar.gz -Source1: ml-swanalekha.mim -Source2: ml-mozhi.mim -Source3: ml-mozhi.png Patch0: bug433416-bn-probhat.patch Patch1: as-inscript-keysummary-440201.patch Patch2: ml-inscript-keysummary-435259.patch @@ -68,7 +65,7 @@ %mk_pkg_uses_db assamese as 1 %mk_pkg_uses_db bengali bn 1 -%mk_pkg esperanto eo 0 +%mk_pkg esperanto eo 1 %mk_pkg_uses_db gujarati gu 1 %mk_pkg_uses_db hindi hi 1 %mk_pkg_uses_db kannada kn 1 @@ -101,8 +98,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p" -install -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/m17n/ -install -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/m17n/icons/ %find_lang %name @@ -115,6 +110,9 @@ %{_datadir}/m17n/scripts %changelog +* Thu Jul 03 2008 Parag Nemade -1.1.7-1 +- Update to new upstream release 1.1.7 + * Wed May 21 2008 Parag Nemade -1.1.6-4 - Resolves: rh#447682,rh#447683 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Feb 2008 06:05:48 -0000 1.6 +++ sources 3 Jul 2008 07:13:13 -0000 1.7 @@ -1 +1 @@ -420dc1807c2d51b85bf7c9c0d517d8ba m17n-contrib-1.1.6.tar.gz +eff285fa2beb739b004c4661abc3eb0b m17n-contrib-1.1.7.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 07:47:32 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 3 Jul 2008 07:47:32 GMT Subject: rpms/manedit/F-8 manedit-1.1.1-fix-segv-on-refresh-with-selected.patch, NONE, 1.1 manedit-1.1.1-tmpdir.patch, 1.1, 1.2 manedit.spec, 1.21, 1.22 Message-ID: <200807030747.m637lWYb028863@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/manedit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28687/F-8 Modified Files: manedit-1.1.1-tmpdir.patch manedit.spec Added Files: manedit-1.1.1-fix-segv-on-refresh-with-selected.patch Log Message: * Thu Jul 3 2008 Mamoru Tasaka - 1.1.1-2 - Modify tmpdir.patch: to fix segv on the exit of manview - Fix segv on refresh on manview when one item is selected manedit-1.1.1-fix-segv-on-refresh-with-selected.patch: --- NEW FILE manedit-1.1.1-fix-segv-on-refresh-with-selected.patch --- --- manedit-1.1.1/manedit/viewer.c.debug2 2008-07-03 15:55:10.000000000 +0900 +++ manedit-1.1.1/manedit/viewer.c 2008-07-03 16:16:24.000000000 +0900 @@ -2676,8 +2676,9 @@ (branch_row->parent != NULL) : FALSE; GTK_WIDGET_SET_SENSITIVE(v->index_parent_mi, sensitive); + /* sensitive may be 0 */ if((v->index_ctree != NULL) && - (v->last_selected_index_node != NULL) + (v->last_selected_index_node != NULL) && sensitive ) item = VIEWER_INDEX_ITEM(gtk_ctree_node_get_row_data( GTK_CTREE(v->index_ctree), v->last_selected_index_node @@ -2741,8 +2742,9 @@ (branch_row->parent != NULL) : FALSE; GTK_WIDGET_SET_SENSITIVE(v->index_parent_btn, sensitive); + /* sensitive may be 0 */ if((v->index_ctree != NULL) && - (v->last_selected_index_node != NULL) + (v->last_selected_index_node != NULL && sensitive) ) item = VIEWER_INDEX_ITEM(gtk_ctree_node_get_row_data( GTK_CTREE(v->index_ctree), manedit-1.1.1-tmpdir.patch: Index: manedit-1.1.1-tmpdir.patch =================================================================== RCS file: /cvs/extras/rpms/manedit/F-8/manedit-1.1.1-tmpdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- manedit-1.1.1-tmpdir.patch 30 Jun 2008 12:03:12 -0000 1.1 +++ manedit-1.1.1-tmpdir.patch 3 Jul 2008 07:45:56 -0000 1.2 @@ -1,5 +1,5 @@ --- manedit-1.1.1/manedit/main.c.tmppath 2008-06-17 15:00:00.000000000 +0900 -+++ manedit-1.1.1/manedit/main.c 2008-06-30 19:23:22.000000000 +0900 ++++ manedit-1.1.1/manedit/main.c 2008-07-03 16:28:49.000000000 +0900 @@ -4,6 +4,7 @@ #include #include @@ -8,24 +8,28 @@ #include "../include/disk.h" #include "../include/string.h" -@@ -199,5 +200,8 @@ +@@ -199,5 +200,12 @@ CDialogShutdown(); FPromptShutdown(); + /* clean up */ -+ rmdir (MECreateTemporaryDirectory(NULL)); ++ { ++ gchar *tmpdir = MECreateTemporaryDirectory(NULL); ++ if (tmpdir) rmdir (tmpdir); ++ free(tmpdir); ++ } + return(0); } --- manedit-1.1.1/manedit/me_op.c.tmppath 2008-06-17 15:00:00.000000000 +0900 -+++ manedit-1.1.1/manedit/me_op.c 2008-06-30 19:23:04.000000000 +0900 ++++ manedit-1.1.1/manedit/me_op.c 2008-07-03 16:22:59.000000000 +0900 @@ -1,3 +1,5 @@ +#define _BSD_SOURCE + #include #include #include -@@ -275,11 +277,18 @@ +@@ -275,11 +277,19 @@ * The returned pointer needs to be deleted by the calling * function. */ @@ -40,11 +44,12 @@ + + static gchar tmp_dir_memory[TMP_DIR_MAX_LEN] = ""; + if (*tmp_dir_memory) return g_strdup(tmp_dir_memory); ++ if (!core) return NULL; + CfgList *cfg_list = core->cfg_list; /* Get the tempory directory */ -@@ -303,6 +312,7 @@ +@@ -303,6 +313,7 @@ user_name = "anon"; /* Format the return temporary directory path */ @@ -52,7 +57,7 @@ tmp_dir_rtn = g_strconcat( tmp_path, G_DIR_SEPARATOR_S, -@@ -328,6 +338,22 @@ +@@ -328,6 +339,22 @@ } return(tmp_dir_rtn); Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/F-8/manedit.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- manedit.spec 30 Jun 2008 12:03:12 -0000 1.21 +++ manedit.spec 3 Jul 2008 07:45:56 -0000 1.22 @@ -3,7 +3,7 @@ Name: manedit Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: UNIX Manual Page Editor Group: Development/Tools @@ -19,6 +19,7 @@ Patch4: manedit-1.1.1-fix-compilation.patch Patch5: manedit-1.1.1-fix-segv-on-manview.patch Patch6: manedit-1.1.1-tmpdir.patch +Patch7: manedit-1.1.1-fix-segv-on-refresh-with-selected.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is gtk+ package @@ -47,6 +48,7 @@ %patch1 -p1 -b .manpages %patch5 -p1 -b .segv_manview %patch6 -p1 -b .tmpdir +%patch7 -p1 -b .segv_refresh %build # I cannot understand this configure!! @@ -115,6 +117,10 @@ %{_mandir}/man1/%{name}.1* %changelog +* Thu Jul 3 2008 Mamoru Tasaka - 1.1.1-2 +- Modify tmpdir.patch: to fix segv on the exit of manview +- Fix segv on refresh on manview when one item is selected + * Mon Jun 30 2008 Mamoru Tasaka - 1.1.1-1 - 1.1.1 - Seems that URL are moved temporarily From fedora-extras-commits at redhat.com Thu Jul 3 07:48:00 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 3 Jul 2008 07:48:00 GMT Subject: rpms/manedit/F-9 manedit-1.1.1-fix-segv-on-refresh-with-selected.patch, NONE, 1.1 manedit-1.1.1-tmpdir.patch, 1.1, 1.2 manedit.spec, 1.22, 1.23 Message-ID: <200807030748.m637m07S028869@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/manedit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28687/F-9 Modified Files: manedit-1.1.1-tmpdir.patch manedit.spec Added Files: manedit-1.1.1-fix-segv-on-refresh-with-selected.patch Log Message: * Thu Jul 3 2008 Mamoru Tasaka - 1.1.1-2 - Modify tmpdir.patch: to fix segv on the exit of manview - Fix segv on refresh on manview when one item is selected manedit-1.1.1-fix-segv-on-refresh-with-selected.patch: --- NEW FILE manedit-1.1.1-fix-segv-on-refresh-with-selected.patch --- --- manedit-1.1.1/manedit/viewer.c.debug2 2008-07-03 15:55:10.000000000 +0900 +++ manedit-1.1.1/manedit/viewer.c 2008-07-03 16:16:24.000000000 +0900 @@ -2676,8 +2676,9 @@ (branch_row->parent != NULL) : FALSE; GTK_WIDGET_SET_SENSITIVE(v->index_parent_mi, sensitive); + /* sensitive may be 0 */ if((v->index_ctree != NULL) && - (v->last_selected_index_node != NULL) + (v->last_selected_index_node != NULL) && sensitive ) item = VIEWER_INDEX_ITEM(gtk_ctree_node_get_row_data( GTK_CTREE(v->index_ctree), v->last_selected_index_node @@ -2741,8 +2742,9 @@ (branch_row->parent != NULL) : FALSE; GTK_WIDGET_SET_SENSITIVE(v->index_parent_btn, sensitive); + /* sensitive may be 0 */ if((v->index_ctree != NULL) && - (v->last_selected_index_node != NULL) + (v->last_selected_index_node != NULL && sensitive) ) item = VIEWER_INDEX_ITEM(gtk_ctree_node_get_row_data( GTK_CTREE(v->index_ctree), manedit-1.1.1-tmpdir.patch: Index: manedit-1.1.1-tmpdir.patch =================================================================== RCS file: /cvs/extras/rpms/manedit/F-9/manedit-1.1.1-tmpdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- manedit-1.1.1-tmpdir.patch 30 Jun 2008 12:04:00 -0000 1.1 +++ manedit-1.1.1-tmpdir.patch 3 Jul 2008 07:46:32 -0000 1.2 @@ -1,5 +1,5 @@ --- manedit-1.1.1/manedit/main.c.tmppath 2008-06-17 15:00:00.000000000 +0900 -+++ manedit-1.1.1/manedit/main.c 2008-06-30 19:23:22.000000000 +0900 ++++ manedit-1.1.1/manedit/main.c 2008-07-03 16:28:49.000000000 +0900 @@ -4,6 +4,7 @@ #include #include @@ -8,24 +8,28 @@ #include "../include/disk.h" #include "../include/string.h" -@@ -199,5 +200,8 @@ +@@ -199,5 +200,12 @@ CDialogShutdown(); FPromptShutdown(); + /* clean up */ -+ rmdir (MECreateTemporaryDirectory(NULL)); ++ { ++ gchar *tmpdir = MECreateTemporaryDirectory(NULL); ++ if (tmpdir) rmdir (tmpdir); ++ free(tmpdir); ++ } + return(0); } --- manedit-1.1.1/manedit/me_op.c.tmppath 2008-06-17 15:00:00.000000000 +0900 -+++ manedit-1.1.1/manedit/me_op.c 2008-06-30 19:23:04.000000000 +0900 ++++ manedit-1.1.1/manedit/me_op.c 2008-07-03 16:22:59.000000000 +0900 @@ -1,3 +1,5 @@ +#define _BSD_SOURCE + #include #include #include -@@ -275,11 +277,18 @@ +@@ -275,11 +277,19 @@ * The returned pointer needs to be deleted by the calling * function. */ @@ -40,11 +44,12 @@ + + static gchar tmp_dir_memory[TMP_DIR_MAX_LEN] = ""; + if (*tmp_dir_memory) return g_strdup(tmp_dir_memory); ++ if (!core) return NULL; + CfgList *cfg_list = core->cfg_list; /* Get the tempory directory */ -@@ -303,6 +312,7 @@ +@@ -303,6 +313,7 @@ user_name = "anon"; /* Format the return temporary directory path */ @@ -52,7 +57,7 @@ tmp_dir_rtn = g_strconcat( tmp_path, G_DIR_SEPARATOR_S, -@@ -328,6 +338,22 @@ +@@ -328,6 +339,22 @@ } return(tmp_dir_rtn); Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/F-9/manedit.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- manedit.spec 30 Jun 2008 12:04:00 -0000 1.22 +++ manedit.spec 3 Jul 2008 07:46:32 -0000 1.23 @@ -3,7 +3,7 @@ Name: manedit Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: UNIX Manual Page Editor Group: Development/Tools @@ -19,6 +19,7 @@ Patch4: manedit-1.1.1-fix-compilation.patch Patch5: manedit-1.1.1-fix-segv-on-manview.patch Patch6: manedit-1.1.1-tmpdir.patch +Patch7: manedit-1.1.1-fix-segv-on-refresh-with-selected.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is gtk+ package @@ -47,6 +48,7 @@ %patch1 -p1 -b .manpages %patch5 -p1 -b .segv_manview %patch6 -p1 -b .tmpdir +%patch7 -p1 -b .segv_refresh %build # I cannot understand this configure!! @@ -115,6 +117,10 @@ %{_mandir}/man1/%{name}.1* %changelog +* Thu Jul 3 2008 Mamoru Tasaka - 1.1.1-2 +- Modify tmpdir.patch: to fix segv on the exit of manview +- Fix segv on refresh on manview when one item is selected + * Mon Jun 30 2008 Mamoru Tasaka - 1.1.1-1 - 1.1.1 - Seems that URL are moved temporarily From fedora-extras-commits at redhat.com Thu Jul 3 07:48:01 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 3 Jul 2008 07:48:01 GMT Subject: rpms/manedit/devel manedit-1.1.1-fix-segv-on-refresh-with-selected.patch, NONE, 1.1 manedit-1.1.1-tmpdir.patch, 1.1, 1.2 manedit.spec, 1.22, 1.23 Message-ID: <200807030748.m637m1Up028873@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/manedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28687/devel Modified Files: manedit-1.1.1-tmpdir.patch manedit.spec Added Files: manedit-1.1.1-fix-segv-on-refresh-with-selected.patch Log Message: * Thu Jul 3 2008 Mamoru Tasaka - 1.1.1-2 - Modify tmpdir.patch: to fix segv on the exit of manview - Fix segv on refresh on manview when one item is selected manedit-1.1.1-fix-segv-on-refresh-with-selected.patch: --- NEW FILE manedit-1.1.1-fix-segv-on-refresh-with-selected.patch --- --- manedit-1.1.1/manedit/viewer.c.debug2 2008-07-03 15:55:10.000000000 +0900 +++ manedit-1.1.1/manedit/viewer.c 2008-07-03 16:16:24.000000000 +0900 @@ -2676,8 +2676,9 @@ (branch_row->parent != NULL) : FALSE; GTK_WIDGET_SET_SENSITIVE(v->index_parent_mi, sensitive); + /* sensitive may be 0 */ if((v->index_ctree != NULL) && - (v->last_selected_index_node != NULL) + (v->last_selected_index_node != NULL) && sensitive ) item = VIEWER_INDEX_ITEM(gtk_ctree_node_get_row_data( GTK_CTREE(v->index_ctree), v->last_selected_index_node @@ -2741,8 +2742,9 @@ (branch_row->parent != NULL) : FALSE; GTK_WIDGET_SET_SENSITIVE(v->index_parent_btn, sensitive); + /* sensitive may be 0 */ if((v->index_ctree != NULL) && - (v->last_selected_index_node != NULL) + (v->last_selected_index_node != NULL && sensitive) ) item = VIEWER_INDEX_ITEM(gtk_ctree_node_get_row_data( GTK_CTREE(v->index_ctree), manedit-1.1.1-tmpdir.patch: Index: manedit-1.1.1-tmpdir.patch =================================================================== RCS file: /cvs/extras/rpms/manedit/devel/manedit-1.1.1-tmpdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- manedit-1.1.1-tmpdir.patch 30 Jun 2008 12:04:45 -0000 1.1 +++ manedit-1.1.1-tmpdir.patch 3 Jul 2008 07:47:00 -0000 1.2 @@ -1,5 +1,5 @@ --- manedit-1.1.1/manedit/main.c.tmppath 2008-06-17 15:00:00.000000000 +0900 -+++ manedit-1.1.1/manedit/main.c 2008-06-30 19:23:22.000000000 +0900 ++++ manedit-1.1.1/manedit/main.c 2008-07-03 16:28:49.000000000 +0900 @@ -4,6 +4,7 @@ #include #include @@ -8,24 +8,28 @@ #include "../include/disk.h" #include "../include/string.h" -@@ -199,5 +200,8 @@ +@@ -199,5 +200,12 @@ CDialogShutdown(); FPromptShutdown(); + /* clean up */ -+ rmdir (MECreateTemporaryDirectory(NULL)); ++ { ++ gchar *tmpdir = MECreateTemporaryDirectory(NULL); ++ if (tmpdir) rmdir (tmpdir); ++ free(tmpdir); ++ } + return(0); } --- manedit-1.1.1/manedit/me_op.c.tmppath 2008-06-17 15:00:00.000000000 +0900 -+++ manedit-1.1.1/manedit/me_op.c 2008-06-30 19:23:04.000000000 +0900 ++++ manedit-1.1.1/manedit/me_op.c 2008-07-03 16:22:59.000000000 +0900 @@ -1,3 +1,5 @@ +#define _BSD_SOURCE + #include #include #include -@@ -275,11 +277,18 @@ +@@ -275,11 +277,19 @@ * The returned pointer needs to be deleted by the calling * function. */ @@ -40,11 +44,12 @@ + + static gchar tmp_dir_memory[TMP_DIR_MAX_LEN] = ""; + if (*tmp_dir_memory) return g_strdup(tmp_dir_memory); ++ if (!core) return NULL; + CfgList *cfg_list = core->cfg_list; /* Get the tempory directory */ -@@ -303,6 +312,7 @@ +@@ -303,6 +313,7 @@ user_name = "anon"; /* Format the return temporary directory path */ @@ -52,7 +57,7 @@ tmp_dir_rtn = g_strconcat( tmp_path, G_DIR_SEPARATOR_S, -@@ -328,6 +338,22 @@ +@@ -328,6 +339,22 @@ } return(tmp_dir_rtn); Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- manedit.spec 30 Jun 2008 12:04:45 -0000 1.22 +++ manedit.spec 3 Jul 2008 07:47:00 -0000 1.23 @@ -3,7 +3,7 @@ Name: manedit Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: UNIX Manual Page Editor Group: Development/Tools @@ -19,6 +19,7 @@ Patch4: manedit-1.1.1-fix-compilation.patch Patch5: manedit-1.1.1-fix-segv-on-manview.patch Patch6: manedit-1.1.1-tmpdir.patch +Patch7: manedit-1.1.1-fix-segv-on-refresh-with-selected.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is gtk+ package @@ -47,6 +48,7 @@ %patch1 -p1 -b .manpages %patch5 -p1 -b .segv_manview %patch6 -p1 -b .tmpdir +%patch7 -p1 -b .segv_refresh %build # I cannot understand this configure!! @@ -115,6 +117,10 @@ %{_mandir}/man1/%{name}.1* %changelog +* Thu Jul 3 2008 Mamoru Tasaka - 1.1.1-2 +- Modify tmpdir.patch: to fix segv on the exit of manview +- Fix segv on refresh on manview when one item is selected + * Mon Jun 30 2008 Mamoru Tasaka - 1.1.1-1 - 1.1.1 - Seems that URL are moved temporarily From fedora-extras-commits at redhat.com Thu Jul 3 08:15:16 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Thu, 3 Jul 2008 08:15:16 GMT Subject: rpms/subversion/devel subversion.spec,1.116,1.117 Message-ID: <200807030815.m638FGKb004488@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4338 Modified Files: subversion.spec Log Message: * Thu Jul 3 2008 Joe Orton 1.5.0-7 - add svnmerge and wcgrep to docdir (Edward Rudd, #451932) - drop neon version overrides Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- subversion.spec 2 Jul 2008 11:30:22 -0000 1.116 +++ subversion.spec 3 Jul 2008 08:14:21 -0000 1.117 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 6 +Release: 7 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -124,12 +124,11 @@ export svn_cv_ruby_sitedir_archsuffix="" export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} -export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25" %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --with-swig --with-neon=%{_prefix} \ --with-ruby-sitedir=%{ruby_sitearch} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation \ - --disable-static --disable-neon-version-check + --disable-static make %{?_smp_mflags} all make swig-py swig-py-lib %{swigdirs} make swig-pl swig-pl-lib swig-rb swig-rb-lib @@ -227,6 +226,8 @@ %doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES %doc tools subversion/LICENSE mod_authz_svn-INSTALL %doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README} +%doc contrib/client-side/svnmerge/*.{README,py} +%doc contrib/client-side/wcgrep %{_bindir}/* %{_libdir}/libsvn_*.so.* %{_mandir}/man*/* @@ -275,6 +276,10 @@ %endif %changelog +* Thu Jul 3 2008 Joe Orton 1.5.0-7 +- add svnmerge and wcgrep to docdir (Edward Rudd, #451932) +- drop neon version overrides + * Wed Jul 2 2008 Joe Orton 1.5.0-6 - build with OpenJDK From fedora-extras-commits at redhat.com Thu Jul 3 09:21:21 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal)) Date: Thu, 3 Jul 2008 09:21:21 GMT Subject: rpms/perl/devel perl.spec,1.173,1.174 Message-ID: <200807030921.m639LLbZ014934@cvs-int.fedora.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14842 Modified Files: perl.spec Log Message: - 453646 use -DPERL_USE_SAFE_PUTENV Index: perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- perl.spec 2 Jul 2008 14:02:55 -0000 1.173 +++ perl.spec 3 Jul 2008 09:20:28 -0000 1.174 @@ -870,7 +870,7 @@ # use "lib", not %{_lib}, for privlib, sitelib, and vendorlib -/bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \ +/bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS -DPERL_USE_SAFE_PUTENV" \ -Dversion=%{perl_version} \ -Dmyhostname=localhost \ -Dperladmin=root at localhost \ @@ -1632,6 +1632,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Thu Jul 3 2008 Stepan Kasal 4:5.10.0-34 +- 453646 use -DPERL_USE_SAFE_PUTENV. Without fail some modules f.e. readline. + * Tue Jul 1 2008 Marcela Maslanova 4:5.10.0-33 - 451078 update Test::Harness to 3.12 for more testing. Removed verbose test, new Test::Harness has possibly verbose output, but updated package From fedora-extras-commits at redhat.com Thu Jul 3 09:34:18 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Thu, 3 Jul 2008 09:34:18 GMT Subject: rpms/telepathy-salut/OLPC-3 salut-chmod-unix-socket.patch, NONE, 1.1 salut-debug.patch, NONE, 1.1 salut-olpc-no-dbus-uid-check.patch, NONE, 1.1 telepathy-salut.spec, 1.18, 1.19 Message-ID: <200807030934.m639YIUt015984@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15878 Modified Files: telepathy-salut.spec Added Files: salut-chmod-unix-socket.patch salut-debug.patch salut-olpc-no-dbus-uid-check.patch Log Message: Add OLPC patches to disable security for rainbow salut-chmod-unix-socket.patch: --- NEW FILE salut-chmod-unix-socket.patch --- diff -rN -u old-telepathy-salut-rainbow/src/tube-stream.c new-telepathy-salut-rainbow/src/tube-stream.c --- old-telepathy-salut-rainbow/src/tube-stream.c 2007-12-11 16:03:02.000000000 +0100 +++ new-telepathy-salut-rainbow/src/tube-stream.c 2007-12-11 16:03:02.000000000 +0100 @@ -637,6 +637,9 @@ "Error binding socket: %s", g_strerror (errno)); return FALSE; } + + /* Everyone can use the socket */ + chmod (addr.sun_path, 0777); } else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4) { salut-debug.patch: --- NEW FILE salut-debug.patch --- Fri Mar 28 09:02:42 GMT 2008 Guillaume Desmottes * muc-channel: add debug info about membership management --- old-telepathy-salut-0.2/src/salut-muc-channel.c 2008-03-28 10:26:16.578430935 +0000 +++ new-telepathy-salut-0.2/src/salut-muc-channel.c 2008-03-28 10:26:16.606432685 +0000 @@ -265,6 +265,8 @@ SalutMucChannel *self = SALUT_MUC_CHANNEL (user_data); SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self); + DEBUG ("Didn't receive muc senders. Timeout expired, " + "adding myself as member anyway"); salut_muc_channel_add_self_to_members (self); priv->timeout = 0; @@ -278,10 +280,17 @@ SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self); if (priv->creator) - salut_muc_channel_add_self_to_members (self); + { + DEBUG ("I created this muc. Adding myself as member now"); + salut_muc_channel_add_self_to_members (self); + } else - priv->timeout = g_timeout_add (CONNECTED_TIMEOUT, connected_timeout_cb, - self); + { + DEBUG ("I didn't create this muc. Waiting for senders before adding " + "myself as member"); + priv->timeout = g_timeout_add (CONNECTED_TIMEOUT, connected_timeout_cb, + self); + } salut_muc_channel_publish_service (self); } @@ -1173,7 +1182,10 @@ salut_muc_channel_add_members (self, senders); if (!tp_handle_set_is_member (self->group.members, base_connection->self_handle)) - salut_muc_channel_add_self_to_members (self); + { + DEBUG ("Got new senders. Adding myself as member"); + salut_muc_channel_add_self_to_members (self); + } } static void salut-olpc-no-dbus-uid-check.patch: --- NEW FILE salut-olpc-no-dbus-uid-check.patch --- diff -rN -up old-telepathy-salut/src/tube-dbus.c new-telepathy-salut/src/tube-dbus.c --- old-telepathy-salut/src/tube-dbus.c 2007-11-15 13:33:51.902677010 -0500 +++ new-telepathy-salut/src/tube-dbus.c 2007-11-15 13:33:51.902677010 -0500 @@ -252,6 +252,14 @@ out: return DBUS_HANDLER_RESULT_HANDLED; } +static dbus_bool_t +allow_all_connections (DBusConnection *conn, + unsigned long uid, + void *data) +{ + return TRUE; +} + static void new_connection_cb (DBusServer *server, DBusConnection *conn, @@ -270,6 +278,13 @@ new_connection_cb (DBusServer *server, dbus_connection_ref (conn); dbus_connection_setup_with_g_main (conn, NULL); dbus_connection_add_filter (conn, filter_cb, tube, NULL); + + /* OLPC have a security system making applications running under + * a different uid than Salut. So we have to explicitely allow connections + * from all uid. */ + dbus_connection_set_unix_user_function (conn, allow_all_connections, + NULL, NULL); + priv->dbus_conn = conn; } Index: telepathy-salut.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- telepathy-salut.spec 25 Jun 2008 21:23:08 -0000 1.18 +++ telepathy-salut.spec 3 Jul 2008 09:33:31 -0000 1.19 @@ -1,12 +1,15 @@ Name: telepathy-salut Version: 0.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Link-local XMPP telepathy connection manager Group: Applications/Communications License: LGPLv2+ URL: http://telepathy.freedesktop.org/wiki/FrontPage Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz +Patch0: salut-olpc-no-dbus-uid-check.patch +Patch1: salut-chmod-unix-socket.patch +Patch2: salut-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= 1.1.0 @@ -31,6 +34,9 @@ %prep %setup -q +%patch0 -p1 -b .dbus-uid +%patch1 -p1 -b .chmod-socket +%patch2 -p1 -b .debug-6782 %build @@ -56,6 +62,9 @@ %{_mandir}/man8/%{name}.8.gz %changelog +* Thu Jul 3 2008 Morgan Collett - 0.2.3-3 +- Add OLPC patches to disable security for rainbow + * Wed Jun 25 2008 Morgan Collett - 0.2.3-2 - Enable OLPC config From fedora-extras-commits at redhat.com Thu Jul 3 09:46:49 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Thu, 3 Jul 2008 09:46:49 GMT Subject: rpms/telepathy-gabble/OLPC-3 gabble-chmod-unix-socket.patch, NONE, 1.1 gabble-olpc-no-dbus-uid-check.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 sources, 1.26, 1.27 telepathy-gabble.spec, 1.34, 1.35 Message-ID: <200807030946.m639knbA017096@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17036 Modified Files: .cvsignore sources telepathy-gabble.spec Added Files: gabble-chmod-unix-socket.patch gabble-olpc-no-dbus-uid-check.patch Log Message: Update to 0.7.6, add rainbow patches gabble-chmod-unix-socket.patch: --- NEW FILE gabble-chmod-unix-socket.patch --- diff -rN -u old-telepathy-gabble-rainbow/src/tube-stream.c new-telepathy-gabble-rainbow/src/tube-stream.c --- old-telepathy-gabble-rainbow/src/tube-stream.c 2007-12-11 16:28:48.000000000 +0100 +++ new-telepathy-gabble-rainbow/src/tube-stream.c 2007-12-11 16:28:48.000000000 +0100 @@ -650,6 +650,9 @@ "Error binding socket: %s", g_strerror (errno)); return FALSE; } + + /* Everyone can use the socket */ + chmod (addr.sun_path, 0777); } else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4) { gabble-olpc-no-dbus-uid-check.patch: --- NEW FILE gabble-olpc-no-dbus-uid-check.patch --- diff -rN -up old-telepathy-gabble/src/tube-dbus.c new-telepathy-gabble/src/tube-dbus.c --- old-telepathy-gabble/src/tube-dbus.c 2007-11-15 13:39:37.923570564 -0500 +++ new-telepathy-gabble/src/tube-dbus.c 2007-11-15 13:39:37.923570564 -0500 @@ -216,6 +216,14 @@ out: return DBUS_HANDLER_RESULT_HANDLED; } +static dbus_bool_t +allow_all_connections (DBusConnection *conn, + unsigned long uid, + void *data) +{ + return TRUE; +} + static void new_connection_cb (DBusServer *server, DBusConnection *conn, @@ -234,6 +242,13 @@ new_connection_cb (DBusServer *server, dbus_connection_ref (conn); dbus_connection_setup_with_g_main (conn, NULL); dbus_connection_add_filter (conn, filter_cb, tube, NULL); + + /* OLPC have a security system making applications running under + * a different uid than Gabble. So we have to explicitely allow connections + * from all uid. */ + dbus_connection_set_unix_user_function (conn, allow_all_connections, + NULL, NULL); + priv->dbus_conn = conn; } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 3 May 2008 23:27:46 -0000 1.26 +++ .cvsignore 3 Jul 2008 09:45:59 -0000 1.27 @@ -1 +1 @@ -telepathy-gabble-0.7.4.tar.gz +telepathy-gabble-0.7.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 May 2008 23:27:46 -0000 1.26 +++ sources 3 Jul 2008 09:45:59 -0000 1.27 @@ -1 +1 @@ -a32237f355fc78357d340ad79edf6c5d telepathy-gabble-0.7.4.tar.gz +17564dcb79d886d527609c154834c1c7 telepathy-gabble-0.7.6.tar.gz Index: telepathy-gabble.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/telepathy-gabble.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- telepathy-gabble.spec 3 May 2008 23:27:46 -0000 1.34 +++ telepathy-gabble.spec 3 Jul 2008 09:45:59 -0000 1.35 @@ -1,5 +1,5 @@ Name: telepathy-gabble -Version: 0.7.4 +Version: 0.7.6 Release: 1%{?dist} Summary: A Jabber/XMPP connection manager @@ -8,12 +8,15 @@ License: LGPLv2+ and (BSD) URL: http://telepathy.freedesktop.org/wiki/ Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz +Patch0: gabble-olpc-no-dbus-uid-check.patch +Patch1: gabble-chmod-unix-socket.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: dbus-devel +BuildRequires: dbus-devel >= 1.1.0 BuildRequires: dbus-glib-devel >= 0.72 BuildRequires: loudmouth-devel >= 1.3.2 -BuildRequires: telepathy-glib-devel >= 0.7.0 +BuildRequires: telepathy-glib-devel >= 0.7.8 BuildRequires: libxslt BuildRequires: python @@ -27,7 +30,8 @@ %prep %setup -q - +%patch0 -p1 -b .dbus-uid +%patch1 -p1 -b .chmod-socket %build %configure @@ -56,6 +60,10 @@ %changelog +* Thu Jul 3 2008 Morgan Collett - 0.7.6-1 +- Update to 0.7.6 +- Add OLPC patches to disable security for rainbow + * Fri May 2 2008 Brian Pepple - 0.7.4-1 - Update to 0.7.4. - Package new documentation. From fedora-extras-commits at redhat.com Thu Jul 3 09:48:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal)) Date: Thu, 3 Jul 2008 09:48:15 GMT Subject: rpms/perl/devel perl.spec,1.174,1.175 Message-ID: <200807030948.m639mFP0017347@cvs-int.fedora.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17168 Modified Files: perl.spec Log Message: - 453646 use -DPERL_USE_SAFE_PUTENV Index: perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- perl.spec 3 Jul 2008 09:20:28 -0000 1.174 +++ perl.spec 3 Jul 2008 09:47:23 -0000 1.175 @@ -11,7 +11,7 @@ Name: perl Version: %{perl_version} -Release: 33%{?dist} +Release: 34%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages From fedora-extras-commits at redhat.com Thu Jul 3 10:10:28 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Thu, 3 Jul 2008 10:10:28 GMT Subject: rpms/sectool/F-9 .cvsignore, 1.10, 1.11 sectool.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200807031010.m63AASFg025814@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sectool/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25773 Modified Files: .cvsignore sectool.spec sources Log Message: upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sectool/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Jun 2008 12:21:17 -0000 1.10 +++ .cvsignore 3 Jul 2008 10:09:46 -0000 1.11 @@ -1 +1 @@ -sectool-0.7.6.tar.bz2 +sectool-0.8.0.tar.bz2 Index: sectool.spec =================================================================== RCS file: /cvs/extras/rpms/sectool/F-9/sectool.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sectool.spec 6 Jun 2008 12:21:17 -0000 1.11 +++ sectool.spec 3 Jul 2008 10:09:46 -0000 1.12 @@ -1,6 +1,6 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.6 +Version: 0.8.0 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 @@ -91,6 +91,9 @@ %changelog +* Thu Jul 03 2008 Peter Vrabec - 0.8.0-1 +- upgrade + * Fri Jun 06 2008 Peter Vrabec - 0.7.6-1 - upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/sectool/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Jun 2008 12:21:17 -0000 1.10 +++ sources 3 Jul 2008 10:09:46 -0000 1.11 @@ -1 +1 @@ -132008c0d0c88bd9e3573e674d5d5deb sectool-0.7.6.tar.bz2 +f6d96b2fff95ca973914f9a911848e19 sectool-0.8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 10:25:52 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Thu, 3 Jul 2008 10:25:52 GMT Subject: rpms/sectool/devel .cvsignore, 1.10, 1.11 sectool.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200807031025.m63APqR0026430@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sectool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26388 Modified Files: .cvsignore sectool.spec sources Log Message: upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Jun 2008 11:52:18 -0000 1.10 +++ .cvsignore 3 Jul 2008 10:25:08 -0000 1.11 @@ -1 +1 @@ -sectool-0.7.6.tar.bz2 +sectool-0.8.0.tar.bz2 Index: sectool.spec =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sectool.spec 6 Jun 2008 11:52:18 -0000 1.11 +++ sectool.spec 3 Jul 2008 10:25:08 -0000 1.12 @@ -1,6 +1,6 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.6 +Version: 0.8.0 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 @@ -91,6 +91,9 @@ %changelog +* Thu Jul 03 2008 Peter Vrabec - 0.8.0-1 +- upgrade + * Fri Jun 06 2008 Peter Vrabec - 0.7.6-1 - upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Jun 2008 11:52:18 -0000 1.10 +++ sources 3 Jul 2008 10:25:08 -0000 1.11 @@ -1 +1 @@ -132008c0d0c88bd9e3573e674d5d5deb sectool-0.7.6.tar.bz2 +f6d96b2fff95ca973914f9a911848e19 sectool-0.8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 11:02:25 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Thu, 3 Jul 2008 11:02:25 GMT Subject: rpms/imsettings/devel .cvsignore, 1.4, 1.5 imsettings.spec, 1.6, 1.7 sources, 1.3, 1.4 imsettings.diff, 1.1, NONE Message-ID: <200807031102.m63B2Pdk003600@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/imsettings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3481 Modified Files: .cvsignore imsettings.spec sources Removed Files: imsettings.diff Log Message: * Thu Jul 3 2008 Akira TAGOH - 0.101.3-1 - New upstream release. - Use the system-wide xinputrc if .xinputrc is a dangling symlink. (#453358) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Jun 2008 03:48:48 -0000 1.4 +++ .cvsignore 3 Jul 2008 11:01:41 -0000 1.5 @@ -3,3 +3,4 @@ *rpm imsettings-0.101.1.tar.bz2 imsettings-0.101.2.tar.bz2 +imsettings-0.101.3.tar.bz2 Index: imsettings.spec =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- imsettings.spec 26 Jun 2008 03:48:48 -0000 1.6 +++ imsettings.spec 3 Jul 2008 11:01:42 -0000 1.7 @@ -1,6 +1,6 @@ Name: imsettings -Version: 0.101.2 -Release: 3%{?dist} +Version: 0.101.3 +Release: 1%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -11,8 +11,7 @@ BuildRequires: libX11-devel Source0: http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2 Patch0: imsettings-constraint-of-language.patch -Patch1: imsettings.diff -Patch2: imsettings-disable-xim.patch +Patch1: imsettings-disable-xim.patch Summary: Delivery framework for general Input Method configuration Group: Applications/System @@ -75,8 +74,7 @@ %prep %setup -q %patch0 -p1 -b .0-lang -%patch1 -p0 -b .1-backport -%patch2 -p1 -b .2-xim +%patch1 -p1 -b .1-xim %build %configure \ @@ -154,6 +152,11 @@ %changelog +* Thu Jul 3 2008 Akira TAGOH - 0.101.3-1 +- New upstream release. + - Use the system-wide xinputrc if .xinputrc is a dangling + symlink. (#453358) + * Thu Jun 26 2008 Akira TAGOH - 0.101.2-3 - Disable XIM support so far. (#452849, #452870) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jun 2008 06:10:49 -0000 1.3 +++ sources 3 Jul 2008 11:01:42 -0000 1.4 @@ -1 +1 @@ -dec182025f128f0d819dce9157a2189c imsettings-0.101.2.tar.bz2 +1771eb4b4b9cf9a1bd2aeb2163306ebd imsettings-0.101.3.tar.bz2 --- imsettings.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 11:06:15 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Thu, 3 Jul 2008 11:06:15 GMT Subject: rpms/gdb/devel gdb-6.8-inlining-by-name.patch, NONE, 1.1 gdb-6.8-inlining.patch, NONE, 1.1 gdb.spec, 1.293, 1.294 Message-ID: <200807031106.m63B6Fl4004547@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4361 Modified Files: gdb.spec Added Files: gdb-6.8-inlining-by-name.patch gdb-6.8-inlining.patch Log Message: * Thu Jul 3 2008 Jan Kratochvil - 6.8-13 - Support transparent debugging of inlined functions for an optimized code. gdb-6.8-inlining-by-name.patch: --- NEW FILE gdb-6.8-inlining-by-name.patch --- Implement `b ' for with concete inlined instances by a multiple-PC breakpoint. diff -up -u -X /home/jkratoch/.diffi.list -rup sources-inline-works3-orig/gdb/ada-lang.c sources-inline-works3/gdb/ada-lang.c --- sources-inline-works3-orig/gdb/ada-lang.c 2008-06-24 20:58:11.000000000 +0200 +++ sources-inline-works3/gdb/ada-lang.c 2008-06-26 15:29:33.000000000 +0200 @@ -4625,7 +4625,7 @@ remove_irrelevant_renamings (struct ada_ if (current_block == NULL) return nsyms; - current_function = block_linkage_function (current_block); + current_function = block_function (current_block); if (current_function == NULL) return nsyms; @@ -6721,7 +6721,7 @@ ada_find_renaming_symbol (const char *na static struct symbol * find_old_style_renaming_symbol (const char *name, struct block *block) { - const struct symbol *function_sym = block_linkage_function (block); + const struct symbol *function_sym = block_function (block); char *rename; if (function_sym != NULL) diff -up -u -X /home/jkratoch/.diffi.list -rup sources-inline-works3-orig/gdb/block.c sources-inline-works3/gdb/block.c --- sources-inline-works3-orig/gdb/block.c 2008-06-24 20:58:11.000000000 +0200 +++ sources-inline-works3/gdb/block.c 2008-06-26 15:29:09.000000000 +0200 @@ -73,6 +73,19 @@ block_linkage_function (const struct blo return BLOCK_FUNCTION (bl); } +/* Return the symbol for the function which contains a specified + lexical block, described by a struct block BL. Inlined functions + can be returned. */ + +struct symbol * +block_function (const struct block *bl) +{ + while (BLOCK_FUNCTION (bl) == NULL && BLOCK_SUPERBLOCK (bl) != NULL) + bl = BLOCK_SUPERBLOCK (bl); + + return BLOCK_FUNCTION (bl); +} + /* Return one if BLOCK represents an inlined function. */ int diff -up -u -X /home/jkratoch/.diffi.list -rup sources-inline-works3-orig/gdb/block.h sources-inline-works3/gdb/block.h --- sources-inline-works3-orig/gdb/block.h 2008-06-24 20:58:11.000000000 +0200 +++ sources-inline-works3/gdb/block.h 2008-06-26 15:29:20.000000000 +0200 @@ -137,6 +137,7 @@ struct blockvector enum { GLOBAL_BLOCK = 0, STATIC_BLOCK = 1, FIRST_LOCAL_BLOCK = 2 }; extern struct symbol *block_linkage_function (const struct block *); +extern struct symbol *block_function (const struct block *bl); extern int block_inlined_p (const struct block *block); diff -up -u -X /home/jkratoch/.diffi.list -rup sources-inline-works3-orig/gdb/blockframe.c sources-inline-works3/gdb/blockframe.c --- sources-inline-works3-orig/gdb/blockframe.c 2008-06-24 20:58:25.000000000 +0200 +++ sources-inline-works3/gdb/blockframe.c 2008-06-26 15:34:44.000000000 +0200 @@ -157,7 +157,7 @@ find_pc_sect_function (CORE_ADDR pc, str struct block *b = block_for_pc_sect (pc, section); if (b == 0) return 0; - return block_linkage_function (b); + return block_function (b); } /* Return the function containing pc value PC. diff -up -u -X /home/jkratoch/.diffi.list -rup sources-inline-works3-orig/gdb/breakpoint.c sources-inline-works3/gdb/breakpoint.c --- sources-inline-works3-orig/gdb/breakpoint.c 2008-06-24 20:58:25.000000000 +0200 +++ sources-inline-works3/gdb/breakpoint.c 2008-06-26 15:28:35.000000000 +0200 @@ -5692,7 +5692,7 @@ resolve_sal_pc (struct symtab_and_line * bv = blockvector_for_pc_sect (sal->pc, 0, &b, sal->symtab); if (bv != NULL) { - sym = block_linkage_function (b); + sym = block_function (b); if (sym != NULL) { fixup_symbol_section (sym, sal->symtab->objfile); diff -up -u -X /home/jkratoch/.diffi.list -rup sources-inline-works3-orig/gdb/testsuite/gdb.opt/inline-cmds.exp sources-inline-works3/gdb/testsuite/gdb.opt/inline-cmds.exp --- sources-inline-works3-orig/gdb/testsuite/gdb.opt/inline-cmds.exp 2008-06-24 20:58:25.000000000 +0200 +++ sources-inline-works3/gdb/testsuite/gdb.opt/inline-cmds.exp 2008-06-26 15:49:12.000000000 +0200 @@ -42,8 +42,10 @@ if { [skip_inline_frame_tests] } { # First, check that the things we expected to be inlined really were, # and those that shouldn't be weren't. -set line1 [gdb_get_line_number "set breakpoint 1 here"] -gdb_breakpoint $line1 +# We test also inlining by the function name, otherwise we would use: +# set line1 [gdb_get_line_number "set breakpoint 1 here"] +# gdb_breakpoint $line1 +gdb_breakpoint "bar" set line2 [gdb_get_line_number "set breakpoint 2 here"] gdb_breakpoint $line2 gdb-6.8-inlining.patch: --- NEW FILE gdb-6.8-inlining.patch --- http://sourceware.org/ml/gdb-patches/2008-06/msg00239.html + http://sourceware.org/ml/gdb-patches/2008-06/msg00379.html [ Backported for gdb-6.8fedora. ] diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Makefile.in gdb-6.8/gdb/Makefile.in --- gdb-6.8-clean/gdb/Makefile.in 2008-06-24 22:58:31.000000000 +0200 +++ gdb-6.8/gdb/Makefile.in 2008-06-17 12:30:08.000000000 +0200 @@ -607,6 +607,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr inf-loop.c \ infcall.c \ infcmd.c inflow.c infrun.c \ + inline-frame.c \ interps.c \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c \ language.c linespec.c \ @@ -1068,6 +1069,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $ user-regs.o \ frame.o frame-unwind.o doublest.o \ frame-base.o \ + inline-frame.o \ gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o \ cp-namespace.o \ reggroups.o regset.o \ @@ -2100,13 +2102,13 @@ dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_ $(gdbcore_h) $(target_h) $(inferior_h) $(ax_h) $(ax_gdb_h) \ $(regcache_h) $(objfiles_h) $(exceptions_h) $(elf_dwarf2_h) \ $(dwarf2expr_h) $(dwarf2loc_h) $(gdb_string_h) $(gdb_assert_h) \ - $(dwarf2block_h) + $(dwarf2block_h) $(block_h) dwarf2read.o: dwarf2read.c $(defs_h) $(bfd_h) $(symtab_h) $(gdbtypes_h) \ $(objfiles_h) $(elf_dwarf2_h) $(buildsym_h) $(demangle_h) \ $(expression_h) $(filenames_h) $(macrotab_h) $(language_h) \ $(complaints_h) $(bcache_h) $(dwarf2expr_h) $(dwarf2loc_h) \ $(cp_support_h) $(hashtab_h) $(command_h) $(gdbcmd_h) \ - $(gdb_string_h) $(gdb_assert_h) $(dwarf2block_h) $(f_lang_h) + $(gdb_string_h) $(gdb_assert_h) $(dwarf2block_h) $(f_lang_h) $(block_h) elfread.o: elfread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(elf_bfd_h) \ $(elf_mips_h) $(symtab_h) $(symfile_h) $(objfiles_h) $(buildsym_h) \ $(stabsread_h) $(gdb_stabs_h) $(complaints_h) $(demangle_h) \ @@ -2155,7 +2157,8 @@ frame.o: frame.c $(defs_h) $(frame_h) $( $(regcache_h) $(gdb_assert_h) $(gdb_string_h) $(user_regs_h) \ $(gdb_obstack_h) $(dummy_frame_h) $(sentinel_frame_h) $(gdbcore_h) \ $(annotate_h) $(language_h) $(frame_unwind_h) $(frame_base_h) \ - $(command_h) $(gdbcmd_h) $(observer_h) $(objfiles_h) $(exceptions_h) + $(command_h) $(gdbcmd_h) $(observer_h) $(objfiles_h) $(exceptions_h) \ + $(block_h) frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \ $(gdb_assert_h) $(dummy_frame_h) $(gdb_obstack_h) frv-linux-tdep.o: frv-linux-tdep.c $(defs_h) $(gdbcore_h) $(target_h) \ @@ -2329,7 +2332,7 @@ infcmd.o: infcmd.c $(defs_h) $(gdb_strin $(objfiles_h) $(completer_h) $(ui_out_h) $(event_top_h) \ $(parser_defs_h) $(regcache_h) $(reggroups_h) $(block_h) \ $(solib_h) $(gdb_assert_h) $(observer_h) $(target_descriptions_h) \ - $(user_regs_h) + $(user_regs_h) $(gdbthread_h) inf-loop.o: inf-loop.c $(defs_h) $(inferior_h) $(target_h) $(event_loop_h) \ $(event_top_h) $(inf_loop_h) $(remote_h) $(exceptions_h) inflow.o: inflow.c $(defs_h) $(frame_h) $(inferior_h) $(command_h) \ @@ -2347,6 +2350,8 @@ infrun.o: infrun.c $(defs_h) $(gdb_strin inf-ttrace.o: inf-ttrace.c $(defs_h) $(command_h) $(gdbcore_h) \ $(gdbthread_h) $(inferior_h) $(target_h) \ $(gdb_assert_h) $(gdb_string_h) $(inf_child_h) $(inf_ttrace_h) +inline-frame.o: inline-frame.c $(defs_h) $(frame_unwind_h) $(block_h) \ + $(symtab_h) $(addrmap_h) $(gdb_assert_h) interps.o: interps.c $(defs_h) $(gdbcmd_h) $(ui_out_h) $(event_loop_h) \ $(event_top_h) $(interps_h) $(completer_h) $(gdb_string_h) \ $(gdb_events_h) $(gdb_assert_h) $(top_h) $(exceptions_h) diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/ada-lang.c gdb-6.8/gdb/ada-lang.c --- gdb-6.8-clean/gdb/ada-lang.c 2008-06-24 22:58:31.000000000 +0200 +++ gdb-6.8/gdb/ada-lang.c 2008-06-16 20:11:43.000000000 +0200 @@ -4624,7 +4624,7 @@ remove_irrelevant_renamings (struct ada_ if (current_block == NULL) return nsyms; - current_function = block_function (current_block); + current_function = block_linkage_function (current_block); if (current_function == NULL) return nsyms; @@ -6778,7 +6778,7 @@ ada_find_renaming_symbol (const char *na static struct symbol * find_old_style_renaming_symbol (const char *name, struct block *block) { - const struct symbol *function_sym = block_function (block); + const struct symbol *function_sym = block_linkage_function (block); char *rename; if (function_sym != NULL) @@ -9946,7 +9946,7 @@ ada_unhandled_exception_name_addr_from_r the frame corresponding to RAISE_SYM_NAME. This frame is at least 3 levels up, so we simply skip the first 3 frames without checking the name of their associated function. */ - fi = get_current_frame (); + fi = get_current_user_frame (); for (frame_level = 0; frame_level < 3; frame_level += 1) if (fi != NULL) fi = get_prev_frame (fi); @@ -10041,7 +10041,7 @@ print_it_exception (enum exception_catch exception_name [sizeof (exception_name) - 1] = '\0'; } - ada_find_printable_frame (get_current_frame ()); + ada_find_printable_frame (get_current_user_frame ()); annotate_catchpoint (b->number); switch (ex) diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/block.c gdb-6.8/gdb/block.c --- gdb-6.8-clean/gdb/block.c 2008-01-01 23:53:09.000000000 +0100 +++ gdb-6.8/gdb/block.c 2008-06-16 20:11:43.000000000 +0200 @@ -47,23 +47,40 @@ contained_in (const struct block *a, con { if (!a || !b) return 0; - return BLOCK_START (a) >= BLOCK_START (b) - && BLOCK_END (a) <= BLOCK_END (b); -} + do + { + if (a == b) + return 1; + a = BLOCK_SUPERBLOCK (a); + } + while (a != NULL); + + return 0; +} /* Return the symbol for the function which contains a specified - lexical block, described by a struct block BL. */ + lexical block, described by a struct block BL. Inlined functions + are never returned. */ struct symbol * -block_function (const struct block *bl) +block_linkage_function (const struct block *bl) { - while (BLOCK_FUNCTION (bl) == 0 && BLOCK_SUPERBLOCK (bl) != 0) + while ((BLOCK_FUNCTION (bl) == NULL || block_inlined_p (bl)) + && BLOCK_SUPERBLOCK (bl) != NULL) bl = BLOCK_SUPERBLOCK (bl); return BLOCK_FUNCTION (bl); } +/* Return one if BLOCK represents an inlined function. */ + +int +block_inlined_p (const struct block *block) +{ + return BLOCK_INLINED (block); +} + /* Return the blockvector immediately containing the innermost lexical block containing the specified pc value and section, or 0 if there is none. PBLOCK is a pointer to the block. If PBLOCK is NULL, we @@ -304,6 +321,7 @@ allocate_block (struct obstack *obstack) BLOCK_SUPERBLOCK (bl) = NULL; BLOCK_DICT (bl) = NULL; BLOCK_NAMESPACE (bl) = NULL; + BLOCK_INLINED (bl) = 0; return bl; } diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/block.h gdb-6.8/gdb/block.h --- gdb-6.8-clean/gdb/block.h 2008-01-01 23:53:09.000000000 +0100 +++ gdb-6.8/gdb/block.h 2008-06-16 20:11:43.000000000 +0200 @@ -65,7 +65,7 @@ struct block CORE_ADDR endaddr; /* The symbol that names this block, if the block is the body of a - function; otherwise, zero. */ + function (real or inlined); otherwise, zero. */ struct symbol *function; @@ -96,6 +96,9 @@ struct block cplus_specific; } language_specific; + + /* Set if this block corresponds to an inlined function. */ + unsigned char inlined; }; #define BLOCK_START(bl) (bl)->startaddr @@ -104,6 +107,7 @@ struct block #define BLOCK_SUPERBLOCK(bl) (bl)->superblock #define BLOCK_DICT(bl) (bl)->dict #define BLOCK_NAMESPACE(bl) (bl)->language_specific.cplus_specific.namespace +#define BLOCK_INLINED(bl) (bl)->inlined /* Macro to loop through all symbols in a block BL, in no particular order. ITER helps keep track of the iteration, and should be a @@ -132,7 +136,9 @@ struct blockvector enum { GLOBAL_BLOCK = 0, STATIC_BLOCK = 1, FIRST_LOCAL_BLOCK = 2 }; [...3178 lines suppressed...] +{ + int val; + + x = 7; + y = 8; + bar (); + + val = func1 (result); + result = val; + + val = func2 (result); + result = val; + + return 0; +} diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.exp gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp --- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.exp 1970-01-01 01:00:00.000000000 +0100 +++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp 2008-06-23 01:20:22.000000000 +0200 @@ -0,0 +1,95 @@ +# Copyright 2007 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +set testfile "inline-locals" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ + executable {debug optimize=-O2}] != "" } { + untested inline-locals.exp + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +runto_main + +get_compiler_info $binfile +get_debug_format +if { [skip_inline_var_tests] } { + untested inline-bt.exp + return +} + +set no_frames [skip_inline_frame_tests] + +set line1 [gdb_get_line_number "set breakpoint 1 here"] +gdb_breakpoint $line1 + +gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (1)" + +gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (2)" + +if { ! $no_frames } { + gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*main.*" \ + "backtrace from bar (2)" + gdb_test "up" "#1 .*func1 .* at .*" "up from bar (2)" + gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (2)" + gdb_test "info locals" "array = {.*}" "info locals above bar (2)" + gdb_test "info args" "arg1 = .*" "info args above bar (2)" +} else { + gdb_test "up" "#1 .*main .* at .*" "up from bar (2)" + gdb_test "info locals" ".*arg1 = 0.*" "info locals above bar (2)" +} + +# Make sure that locals on the stack are found. This is an array to +# prevent it from living in a register. +if [test_compiler_info "gcc-4-3-*"] { + setup_kfail *-*-* "gcc/debug.optimization" +} +gdb_test "print array\[0\]" "\\\$$decimal = 0" "print local (2)" + +if { ! $no_frames } { + # Verify that we do not print out variables from the inlined + # function's caller. + gdb_test "print val" "No symbol \"val\" in current context\\." \ + "print out of scope local" +} + +# Repeat the tests from a depth of two inlined functions, and with a +# more interesting value in the local array. +gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (3)" +if { ! $no_frames } { + gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*func2.*#3 .*main.*" \ + "backtrace from bar (3)" + gdb_test "up" "#1 .*func1 .* at .*" "up from bar (3)" + gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (3)" + gdb_test "info locals" "array = {.*}" "info locals above bar (3)" + gdb_test "info args" "arg1 = .*" "info args above bar (3)" +} else { + gdb_test "up" "#1 .*main .* at .*" "up from bar (3)" + gdb_test "info locals" ".*arg1 = 1.*" "info locals above bar (3a)" + gdb_test "info locals" ".*arg2 = 184.*" "info locals above bar (3b)" +} + +if [test_compiler_info "gcc-4-3-*"] { + setup_kfail *-*-* "gcc/debug.optimization" +} +gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/lib/gdb.exp gdb-6.8/gdb/testsuite/lib/gdb.exp --- gdb-6.8-clean/gdb/testsuite/lib/gdb.exp 2008-06-24 22:58:31.000000000 +0200 +++ gdb-6.8/gdb/testsuite/lib/gdb.exp 2008-06-16 20:11:43.000000000 +0200 @@ -1357,6 +1357,37 @@ proc skip_hp_tests {} { return $skip_hp } +# Return whether we should skip tests for showing inlined functions in +# backtraces. Requires get_compiler_info and get_debug_format. + +proc skip_inline_frame_tests {} { + # GDB only recognizes inlining information in DWARF 2 (DWARF 3). + if { ! [test_debug_format "DWARF 2"] } { + return 1 + } + + # GCC before 4.1 does not emit DW_AT_call_file / DW_AT_call_line. + if { ([test_compiler_info "gcc-2-*"] + || [test_compiler_info "gcc-3-*"] + || [test_compiler_info "gcc-4-0"]) } { + return 1 + } + + return 0 +} + +# Return whether we should skip tests for showing variables from +# inlined functions. Requires get_compiler_info and get_debug_format. + +proc skip_inline_var_tests {} { + # GDB only recognizes inlining information in DWARF 2 (DWARF 3). + if { ! [test_debug_format "DWARF 2"] } { + return 1 + } + + return 0 +} + set compiler_info "unknown" set gcc_compiled 0 set hp_cc_compiler 0 diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/thread.c gdb-6.8/gdb/thread.c --- gdb-6.8-clean/gdb/thread.c 2008-06-24 22:58:30.000000000 +0200 +++ gdb-6.8/gdb/thread.c 2008-06-16 20:11:43.000000000 +0200 @@ -582,7 +582,7 @@ thread_apply_all_command (char *cmd, int do_cleanups (old_chain); /* Print stack frame only if we changed thread. */ if (thread_has_changed) - print_stack_frame (get_current_frame (), 1, SRC_LINE); + print_stack_frame (get_selected_frame (NULL), 1, SRC_LINE); } @@ -667,7 +667,7 @@ thread_apply_command (char *tidlist, int do_cleanups (old_chain); /* Print stack frame only if we changed thread. */ if (thread_has_changed) - print_stack_frame (get_current_frame (), 1, SRC_LINE); + print_stack_frame (get_selected_frame (NULL), 1, SRC_LINE); } /* Switch to the specified thread. Will dispatch off to thread_apply_command diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/tracepoint.c gdb-6.8/gdb/tracepoint.c --- gdb-6.8-clean/gdb/tracepoint.c 2008-02-05 17:05:56.000000000 +0100 +++ gdb-6.8/gdb/tracepoint.c 2008-06-16 20:11:43.000000000 +0200 @@ -2165,7 +2165,7 @@ trace_find_line_command (char *args, int { if (args == 0 || *args == 0) { - sal = find_pc_line (get_frame_pc (get_current_frame ()), 0); + sal = find_pc_line (get_frame_pc (get_selected_frame (NULL)), 0); sals.nelts = 1; sals.sals = (struct symtab_and_line *) xmalloc (sizeof (struct symtab_and_line)); diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/valops.c gdb-6.8/gdb/valops.c --- gdb-6.8-clean/gdb/valops.c 2008-06-24 22:58:31.000000000 +0200 +++ gdb-6.8/gdb/valops.c 2008-06-16 20:11:43.000000000 +0200 @@ -845,7 +845,7 @@ value_of_variable (struct symbol *var, s frame = block_innermost_frame (b); if (!frame) { - if (BLOCK_FUNCTION (b) + if (BLOCK_FUNCTION (b) && !block_inlined_p (b) && SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b))) error (_("No frame is currently executing in block %s."), SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b))); Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- gdb.spec 20 Jun 2008 08:37:16 -0000 1.293 +++ gdb.spec 3 Jul 2008 11:05:26 -0000 1.294 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 12%{?_with_upstream:.upstream}%{?dist} +Release: 13%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -378,6 +378,10 @@ Patch325: gdb-6.8-forced-enable-tui.patch Patch326: gdb-6.8-tui-singlebinary.patch +# Support transparent debugging of inlined functions for an optimized code. +Patch327: gdb-6.8-inlining.patch +Patch328: gdb-6.8-inlining-by-name.patch + BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext BuildRequires: flex bison sharutils expat-devel Requires: readline @@ -563,6 +567,8 @@ %patch324 -p1 %patch325 -p1 %patch326 -p1 +%patch327 -p1 +%patch328 -p1 %patch124 -p1 find -name "*.orig" | xargs rm -f @@ -822,6 +828,9 @@ %endif %changelog +* Thu Jul 3 2008 Jan Kratochvil - 6.8-13 +- Support transparent debugging of inlined functions for an optimized code. + * Fri Jun 20 2008 Jan Kratochvil - 6.8-12 - Remove the gdb/gdbtui binaries duplicity. From fedora-extras-commits at redhat.com Thu Jul 3 11:36:23 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Thu, 3 Jul 2008 11:36:23 GMT Subject: rpms/cman/F-9 cman.spec,1.104,1.105 Message-ID: <200807031136.m63BaNeP006842@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cman/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6797 Modified Files: cman.spec Log Message: Add missing cman Requires Index: cman.spec =================================================================== RCS file: /cvs/pkgs/rpms/cman/F-9/cman.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- cman.spec 10 Jun 2008 09:38:01 -0000 1.104 +++ cman.spec 3 Jul 2008 11:35:32 -0000 1.105 @@ -19,7 +19,7 @@ Name: cman Summary: CMAN - The Cluster Manager Version: 2.03.04 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -29,6 +29,7 @@ Requires(preun): chkconfig Requires: openais >= 0.80.3-17 openais < 0.81 Requires: sg3_utils OpenIPMI telnet openssh-clients +Requires: pexpect ## Setup/build bits @@ -158,6 +159,10 @@ CMAN - The Cluster Manager development package %changelog +* Thu Jul 3 Fabio M. Di Nitto - 2.03.04-2 +- cman Requires: pexpect for fence agents. + Thanks to sendro on IRC for spotting the issue. + * Tue Jun 10 2008 Fabio M. Di Nitto - 2.03.04-1 - New upstream release - Resolves: #446995 #318271 #447378 #445662 From fedora-extras-commits at redhat.com Thu Jul 3 11:39:02 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Thu, 3 Jul 2008 11:39:02 GMT Subject: rpms/cluster/devel cluster.spec,1.7,1.8 Message-ID: <200807031139.m63Bd2K4007085@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cluster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6988 Modified Files: cluster.spec Log Message: Add missing cman Requires Index: cluster.spec =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cluster.spec 24 Jun 2008 07:38:27 -0000 1.7 +++ cluster.spec 3 Jul 2008 11:38:18 -0000 1.8 @@ -19,7 +19,7 @@ Name: cluster Summary: Red Hat Cluster Version: 2.99.05 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -40,7 +40,7 @@ BuildRequires: perl python BuildRequires: glibc-kernheaders glibc-devel BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel -BuildRequires: openais-devel >= 0.84-1 +BuildRequires: openais-devel >= 0.84-1 openldap-devel %if %{buildxen} BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs %endif @@ -105,6 +105,7 @@ Requires(preun): chkconfig Requires: openais >= 0.84 sg3_utils Requires: sg3_utils OpenIPMI telnet openssh-clients +Requires: pexpect %description -n cman Red Hat Cluster Manager @@ -285,6 +286,10 @@ %{_mandir}/man8/gnbd* %changelog +* Thu Jul 3 Fabio M. Di Nitto - 2.99.05-2 +- cman Requires: pexpect for fence agents. + Thanks to sendro on IRC for spotting the issue. + * Tue Jun 24 2008 Fabio M. Di Nitto - 2.99.05-1 - New upstream release - Update licence tags again after upstream relicensing to kill OSL 2.1. From fedora-extras-commits at redhat.com Thu Jul 3 11:45:11 2008 From: fedora-extras-commits at redhat.com (Harald Hoyer (harald)) Date: Thu, 3 Jul 2008 11:45:11 GMT Subject: rpms/python-augeas/devel .cvsignore, 1.2, 1.3 python-augeas.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807031145.m63BjBFM007475@cvs-int.fedora.redhat.com> Author: harald Update of /cvs/pkgs/rpms/python-augeas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7443 Modified Files: .cvsignore python-augeas.spec sources Log Message: * Thu Jul 03 2008 Harald Hoyer 0.2.1-1 - version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2008 16:44:28 -0000 1.2 +++ .cvsignore 3 Jul 2008 11:44:24 -0000 1.3 @@ -1 +1 @@ -python-augeas-0.1.0.tar.gz +python-augeas-0.2.1.tar.gz Index: python-augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/devel/python-augeas.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-augeas.spec 6 May 2008 16:45:49 -0000 1.1 +++ python-augeas.spec 3 Jul 2008 11:44:24 -0000 1.2 @@ -1,19 +1,19 @@ # sitelib for noarch packages, sitearch for others (remove the unneeded one) -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -Name: python-augeas -Version: 0.1.0 -Release: 4%{?dist} -Summary: Python bindings to augeas - -Group: Development/Languages -License: LGPLv2+ -URL: http://augeas.net/ -Source0: http://augeas.net/download/python/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: augeas-libs +Name: python-augeas +Version: 0.2.1 +Release: 1%{?dist} +Summary: Python bindings to augeas +Group: Development/Languages +License: LGPLv2+ +URL: http://augeas.net/ +Source0: http://augeas.net/download/python/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: augeas-libs +BuildArch: noarch -BuildRequires: python-devel swig augeas-devel +BuildRequires: python-setuptools %description python-augeas is a set of Python bindings around augeas. @@ -38,11 +38,16 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README.txt -# For arch-specific packages: sitearch -%{python_sitearch}/*augeas* -%attr(0755,root,root) %{python_sitearch}/_augeas.so +%{python_sitelib}/augeas.py* +%{python_sitelib}/*augeas*.egg-info %changelog +* Thu Jul 03 2008 Harald Hoyer 0.2.1-1 +- version 0.2.1 + +* Wed Jun 11 2008 Harald Hoyer 0.2.0-1 +- switched to noarch, dlopen/ python bindings + * Mon May 05 2008 Harald Hoyer 0.1.0-4 - version to import in CVS (rhbz#444945) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2008 16:44:28 -0000 1.2 +++ sources 3 Jul 2008 11:44:24 -0000 1.3 @@ -1 +1 @@ -afaeba556cf46d263ee080e7e5a47e14 python-augeas-0.1.0.tar.gz +91432c3b050ccd01fd7fa5d777fcdcbc python-augeas-0.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 11:46:48 2008 From: fedora-extras-commits at redhat.com (Harald Hoyer (harald)) Date: Thu, 3 Jul 2008 11:46:48 GMT Subject: rpms/python-augeas/F-9 .cvsignore, 1.1, 1.2 python-augeas.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807031146.m63BkmZu007645@cvs-int.fedora.redhat.com> Author: harald Update of /cvs/pkgs/rpms/python-augeas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7582 Modified Files: .cvsignore python-augeas.spec sources Log Message: * Thu Jul 03 2008 Harald Hoyer 0.2.1-1 - version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2008 16:25:13 -0000 1.1 +++ .cvsignore 3 Jul 2008 11:46:03 -0000 1.2 @@ -0,0 +1 @@ +python-augeas-0.2.1.tar.gz Index: python-augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/F-9/python-augeas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-augeas.spec 6 May 2008 18:35:23 -0000 1.2 +++ python-augeas.spec 3 Jul 2008 11:46:03 -0000 1.3 @@ -1,20 +1,19 @@ # sitelib for noarch packages, sitearch for others (remove the unneeded one) -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -Name: python-augeas -Version: 0.1.0 -Release: 5%{?dist} -Summary: Python bindings to augeas - -Group: Development/Languages -License: LGPLv2+ -URL: http://augeas.net/ -Source0: http://augeas.net/download/python/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: augeas-libs +Name: python-augeas +Version: 0.2.1 +Release: 1%{?dist} +Summary: Python bindings to augeas +Group: Development/Languages +License: LGPLv2+ +URL: http://augeas.net/ +Source0: http://augeas.net/download/python/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: augeas-libs +BuildArch: noarch -BuildRequires: python-devel swig augeas-devel -BuildRequires: python +BuildRequires: python-setuptools %description python-augeas is a set of Python bindings around augeas. @@ -39,13 +38,15 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README.txt -# For arch-specific packages: sitearch -%{python_sitearch}/*augeas* -%attr(0755,root,root) %{python_sitearch}/_augeas.so +%{python_sitelib}/augeas.py* +%{python_sitelib}/*augeas*.egg-info %changelog -* Tue May 06 2008 Harald Hoyer 0.1.0-5 -- added python to BuildRequires +* Thu Jul 03 2008 Harald Hoyer 0.2.1-1 +- version 0.2.1 + +* Wed Jun 11 2008 Harald Hoyer 0.2.0-1 +- switched to noarch, dlopen/ python bindings * Mon May 05 2008 Harald Hoyer 0.1.0-4 - version to import in CVS (rhbz#444945) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2008 16:46:18 -0000 1.2 +++ sources 3 Jul 2008 11:46:03 -0000 1.3 @@ -1 +1 @@ -afaeba556cf46d263ee080e7e5a47e14 python-augeas-0.1.0.tar.gz +91432c3b050ccd01fd7fa5d777fcdcbc python-augeas-0.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 11:47:12 2008 From: fedora-extras-commits at redhat.com (Guillaume Desmottes (gdesmott)) Date: Thu, 3 Jul 2008 11:47:12 GMT Subject: rpms/telepathy-glib/F-9 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 telepathy-glib.spec, 1.14, 1.15 Message-ID: <200807031147.m63BlCHX007729@cvs-int.fedora.redhat.com> Author: gdesmott Update of /cvs/pkgs/rpms/telepathy-glib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7616 Modified Files: .cvsignore sources telepathy-glib.spec Log Message: Update to 0.7.11 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 May 2008 00:00:37 -0000 1.8 +++ .cvsignore 3 Jul 2008 11:46:23 -0000 1.9 @@ -1 +1 @@ -telepathy-glib-0.7.6.tar.gz +telepathy-glib-0.7.11.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 May 2008 00:00:37 -0000 1.8 +++ sources 3 Jul 2008 11:46:23 -0000 1.9 @@ -1 +1 @@ -64fdaf1dcbb5ca7f5ad6ac275a396285 telepathy-glib-0.7.6.tar.gz +8da7a9c43f3721aed982412854c4783e telepathy-glib-0.7.11.tar.gz Index: telepathy-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/F-9/telepathy-glib.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- telepathy-glib.spec 2 May 2008 00:00:37 -0000 1.14 +++ telepathy-glib.spec 3 Jul 2008 11:46:23 -0000 1.15 @@ -3,7 +3,7 @@ %define glib_ver 2.10 Name: telepathy-glib -Version: 0.7.6 +Version: 0.7.11 Release: 1%{?dist} Summary: GLib bindings for Telepathy @@ -89,6 +89,9 @@ %changelog +* Thu Jul 3 2008 Guillaume Desmottes - 0.7.11-1 +- Update to 0.7.11 + * Tue Apr 22 2008 Brian Pepple - 0.7.6-1 - Update to 0.7.6. From fedora-extras-commits at redhat.com Thu Jul 3 11:48:17 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Thu, 3 Jul 2008 11:48:17 GMT Subject: rpms/cman/F-9 cman.spec,1.105,1.106 Message-ID: <200807031148.m63BmHCa007855@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cman/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739 Modified Files: cman.spec Log Message: Add net-snmp-utils to cman Requires Index: cman.spec =================================================================== RCS file: /cvs/pkgs/rpms/cman/F-9/cman.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- cman.spec 3 Jul 2008 11:35:32 -0000 1.105 +++ cman.spec 3 Jul 2008 11:47:36 -0000 1.106 @@ -29,7 +29,7 @@ Requires(preun): chkconfig Requires: openais >= 0.80.3-17 openais < 0.81 Requires: sg3_utils OpenIPMI telnet openssh-clients -Requires: pexpect +Requires: pexpect net-snmp-utils ## Setup/build bits @@ -160,7 +160,7 @@ %changelog * Thu Jul 3 Fabio M. Di Nitto - 2.03.04-2 -- cman Requires: pexpect for fence agents. +- cman Requires: pexpect and net-snmp-utils for fence agents. Thanks to sendro on IRC for spotting the issue. * Tue Jun 10 2008 Fabio M. Di Nitto - 2.03.04-1 From fedora-extras-commits at redhat.com Thu Jul 3 11:48:18 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Thu, 3 Jul 2008 11:48:18 GMT Subject: rpms/cluster/devel cluster.spec,1.8,1.9 Message-ID: <200807031148.m63BmIdc007860@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cluster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7743 Modified Files: cluster.spec Log Message: Add net-snmp-utils to cman Requires Index: cluster.spec =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cluster.spec 3 Jul 2008 11:38:18 -0000 1.8 +++ cluster.spec 3 Jul 2008 11:47:34 -0000 1.9 @@ -105,7 +105,7 @@ Requires(preun): chkconfig Requires: openais >= 0.84 sg3_utils Requires: sg3_utils OpenIPMI telnet openssh-clients -Requires: pexpect +Requires: pexpect net-snmp-utils %description -n cman Red Hat Cluster Manager @@ -287,7 +287,7 @@ %changelog * Thu Jul 3 Fabio M. Di Nitto - 2.99.05-2 -- cman Requires: pexpect for fence agents. +- cman Requires: pexpect and net-snmp-utils for fence agents. Thanks to sendro on IRC for spotting the issue. * Tue Jun 24 2008 Fabio M. Di Nitto - 2.99.05-1 From fedora-extras-commits at redhat.com Thu Jul 3 11:50:57 2008 From: fedora-extras-commits at redhat.com (Harald Hoyer (harald)) Date: Thu, 3 Jul 2008 11:50:57 GMT Subject: rpms/python-augeas/F-9 python-augeas.spec,1.3,1.4 Message-ID: <200807031150.m63BovZj007980@cvs-int.fedora.redhat.com> Author: harald Update of /cvs/pkgs/rpms/python-augeas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7933 Modified Files: python-augeas.spec Log Message: added python-devel to buildrequires Index: python-augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/F-9/python-augeas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-augeas.spec 3 Jul 2008 11:46:03 -0000 1.3 +++ python-augeas.spec 3 Jul 2008 11:50:08 -0000 1.4 @@ -13,7 +13,7 @@ Requires: augeas-libs BuildArch: noarch -BuildRequires: python-setuptools +BuildRequires: python-setuptools python-devel %description python-augeas is a set of Python bindings around augeas. From fedora-extras-commits at redhat.com Thu Jul 3 11:55:37 2008 From: fedora-extras-commits at redhat.com (Harald Hoyer (harald)) Date: Thu, 3 Jul 2008 11:55:37 GMT Subject: rpms/python-augeas/devel python-augeas.spec,1.2,1.3 Message-ID: <200807031155.m63BtbwS008293@cvs-int.fedora.redhat.com> Author: harald Update of /cvs/pkgs/rpms/python-augeas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8236 Modified Files: python-augeas.spec Log Message: added python-devel to buildrequires Index: python-augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/devel/python-augeas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-augeas.spec 3 Jul 2008 11:44:24 -0000 1.2 +++ python-augeas.spec 3 Jul 2008 11:54:50 -0000 1.3 @@ -13,7 +13,7 @@ Requires: augeas-libs BuildArch: noarch -BuildRequires: python-setuptools +BuildRequires: python-setuptools python-devel %description python-augeas is a set of Python bindings around augeas. From fedora-extras-commits at redhat.com Thu Jul 3 12:51:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 3 Jul 2008 12:51:02 GMT Subject: rpms/alienarena-data/F-8 alienarena-data.spec,1.2,1.3 Message-ID: <200807031251.m63Cp282018090@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17989/F-8 Modified Files: alienarena-data.spec Log Message: get rid of prebuilt binary file Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-8/alienarena-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- alienarena-data.spec 2 Jul 2008 19:06:54 -0000 1.2 +++ alienarena-data.spec 3 Jul 2008 12:50:19 -0000 1.3 @@ -27,6 +27,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico +rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/game.so %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +50,9 @@ %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Thu Jul 3 2008 Tom "spot" Callaway 20080603-2 +- get rid of prebuilt so file + * Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 - update to 2008 data From fedora-extras-commits at redhat.com Thu Jul 3 12:51:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 3 Jul 2008 12:51:16 GMT Subject: rpms/alienarena-data/F-9 alienarena-data.spec,1.2,1.3 Message-ID: <200807031251.m63CpG3N018100@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17989/F-9 Modified Files: alienarena-data.spec Log Message: get rid of prebuilt binary file Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-9/alienarena-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- alienarena-data.spec 2 Jul 2008 19:07:09 -0000 1.2 +++ alienarena-data.spec 3 Jul 2008 12:50:32 -0000 1.3 @@ -27,6 +27,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico +rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/game.so %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +50,9 @@ %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Thu Jul 3 2008 Tom "spot" Callaway 20080603-2 +- get rid of prebuilt so file + * Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 - update to 2008 data From fedora-extras-commits at redhat.com Thu Jul 3 12:51:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 3 Jul 2008 12:51:29 GMT Subject: rpms/alienarena-data/devel alienarena-data.spec,1.2,1.3 Message-ID: <200807031251.m63CpTI2018108@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17989/devel Modified Files: alienarena-data.spec Log Message: get rid of prebuilt binary file Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/alienarena-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- alienarena-data.spec 2 Jul 2008 19:02:12 -0000 1.2 +++ alienarena-data.spec 3 Jul 2008 12:50:46 -0000 1.3 @@ -27,6 +27,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico +rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/game.so %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +50,9 @@ %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Thu Jul 3 2008 Tom "spot" Callaway 20080603-2 +- get rid of prebuilt so file + * Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 - update to 2008 data From fedora-extras-commits at redhat.com Thu Jul 3 12:55:12 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 3 Jul 2008 12:55:12 GMT Subject: comps/po es.po,1.14,1.15 Message-ID: <200807031255.m63CtCTL018435@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18379/po Modified Files: es.po Log Message: 2008-07-03 Domingo Becker (via beckerde at fedoraproject.org) * po/es.po: updated spanish translation Index: es.po =================================================================== RCS file: /cvs/pkgs/comps/po/es.po,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- es.po 19 May 2008 11:51:58 -0000 1.14 +++ es.po 3 Jul 2008 12:54:42 -0000 1.15 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-19 05:04+0000\n" -"PO-Revision-Date: 2008-05-19 08:32-0300\n" +"POT-Creation-Date: 2008-07-03 10:37+0000\n" +"PO-Revision-Date: 2008-07-03 09:51-0300\n" "Last-Translator: Domingo Becker \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -902,29 +902,29 @@ #: ../comps-f7.xml.in.h:117 #: ../comps-f8.xml.in.h:126 -#: ../comps-f9.xml.in.h:130 -#: ../comps-f10.xml.in.h:132 +#: ../comps-f9.xml.in.h:132 +#: ../comps-f10.xml.in.h:134 msgid "Samoan Support" msgstr "Soporte para saomano" #: ../comps-f7.xml.in.h:118 #: ../comps-f8.xml.in.h:127 -#: ../comps-f9.xml.in.h:131 -#: ../comps-f10.xml.in.h:133 +#: ../comps-f9.xml.in.h:133 +#: ../comps-f10.xml.in.h:135 msgid "Serbian Support" msgstr "Soporte para serbio" #: ../comps-f7.xml.in.h:119 #: ../comps-f8.xml.in.h:128 -#: ../comps-f9.xml.in.h:132 -#: ../comps-f10.xml.in.h:134 +#: ../comps-f9.xml.in.h:134 +#: ../comps-f10.xml.in.h:136 msgid "Server Configuration Tools" msgstr "Herramientas de configuraci??n del servidor" #: ../comps-f7.xml.in.h:120 #: ../comps-f8.xml.in.h:129 -#: ../comps-f9.xml.in.h:133 -#: ../comps-f10.xml.in.h:135 +#: ../comps-f9.xml.in.h:135 +#: ../comps-f10.xml.in.h:137 #: ../comps-el4.xml.in.h:41 #: ../comps-el5.xml.in.h:41 msgid "Servers" @@ -932,8 +932,8 @@ #: ../comps-f7.xml.in.h:121 #: ../comps-f8.xml.in.h:130 -#: ../comps-f9.xml.in.h:134 -#: ../comps-f10.xml.in.h:136 +#: ../comps-f9.xml.in.h:136 +#: ../comps-f10.xml.in.h:138 #: ../comps-el4.xml.in.h:42 #: ../comps-el5.xml.in.h:42 msgid "Simple window managers that aren't part of a larger desktop environment." @@ -941,36 +941,36 @@ #: ../comps-f7.xml.in.h:122 #: ../comps-f8.xml.in.h:131 -#: ../comps-f9.xml.in.h:135 -#: ../comps-f10.xml.in.h:137 +#: ../comps-f9.xml.in.h:137 +#: ../comps-f10.xml.in.h:139 msgid "Sinhala Support" msgstr "Soporte para sinhala" #: ../comps-f7.xml.in.h:123 #: ../comps-f8.xml.in.h:132 -#: ../comps-f9.xml.in.h:136 -#: ../comps-f10.xml.in.h:138 +#: ../comps-f9.xml.in.h:138 +#: ../comps-f10.xml.in.h:140 msgid "Slovak Support" msgstr "Soporte para eslovaco" #: ../comps-f7.xml.in.h:124 #: ../comps-f8.xml.in.h:133 -#: ../comps-f9.xml.in.h:137 -#: ../comps-f10.xml.in.h:139 +#: ../comps-f9.xml.in.h:139 +#: ../comps-f10.xml.in.h:141 msgid "Slovenian Support" msgstr "Soporte para esloveno" #: ../comps-f7.xml.in.h:125 #: ../comps-f8.xml.in.h:134 -#: ../comps-f9.xml.in.h:138 -#: ../comps-f10.xml.in.h:140 +#: ../comps-f9.xml.in.h:140 +#: ../comps-f10.xml.in.h:142 msgid "Smallest possible installation" msgstr "Instalaci??n lo m??s peque??a posible" #: ../comps-f7.xml.in.h:126 #: ../comps-f8.xml.in.h:135 -#: ../comps-f9.xml.in.h:139 -#: ../comps-f10.xml.in.h:141 +#: ../comps-f9.xml.in.h:141 +#: ../comps-f10.xml.in.h:143 #: ../comps-el4.xml.in.h:43 #: ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" @@ -978,22 +978,22 @@ #: ../comps-f7.xml.in.h:127 #: ../comps-f8.xml.in.h:136 -#: ../comps-f9.xml.in.h:140 -#: ../comps-f10.xml.in.h:142 +#: ../comps-f9.xml.in.h:142 +#: ../comps-f10.xml.in.h:144 msgid "Somali Support" msgstr "Soporte para somal??" #: ../comps-f7.xml.in.h:128 #: ../comps-f8.xml.in.h:137 -#: ../comps-f9.xml.in.h:141 -#: ../comps-f10.xml.in.h:143 +#: ../comps-f9.xml.in.h:143 +#: ../comps-f10.xml.in.h:145 msgid "Sometimes called text editors, these are programs that allow you to create and edit text files. This includes Emacs and Vi." msgstr "Estos programas permiten crear y modificar archivos de texto. A veces se los conoce como editores de texto. Estos incluyen Emacs y Vi." #: ../comps-f7.xml.in.h:129 #: ../comps-f8.xml.in.h:138 -#: ../comps-f9.xml.in.h:142 -#: ../comps-f10.xml.in.h:144 +#: ../comps-f9.xml.in.h:144 +#: ../comps-f10.xml.in.h:146 #: ../comps-el4.xml.in.h:45 #: ../comps-el5.xml.in.h:45 msgid "Sound and Video" @@ -1001,59 +1001,59 @@ #: ../comps-f7.xml.in.h:130 #: ../comps-f8.xml.in.h:139 -#: ../comps-f9.xml.in.h:143 -#: ../comps-f10.xml.in.h:145 +#: ../comps-f9.xml.in.h:145 +#: ../comps-f10.xml.in.h:147 msgid "Southern Ndebele Support" msgstr "Soporte para Ndebele Sure??o" #: ../comps-f7.xml.in.h:131 #: ../comps-f8.xml.in.h:140 -#: ../comps-f9.xml.in.h:144 -#: ../comps-f10.xml.in.h:146 +#: ../comps-f9.xml.in.h:146 +#: ../comps-f10.xml.in.h:148 msgid "Southern Sotho Support" msgstr "Soporte para Sotho Sure??o" #: ../comps-f7.xml.in.h:132 #: ../comps-f8.xml.in.h:141 -#: ../comps-f9.xml.in.h:145 -#: ../comps-f10.xml.in.h:147 +#: ../comps-f9.xml.in.h:147 +#: ../comps-f10.xml.in.h:149 msgid "Spanish Support" msgstr "Soporte para espa??ol" #: ../comps-f7.xml.in.h:133 #: ../comps-f8.xml.in.h:142 -#: ../comps-f9.xml.in.h:146 -#: ../comps-f10.xml.in.h:148 +#: ../comps-f9.xml.in.h:148 +#: ../comps-f10.xml.in.h:150 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "Soporte para el desarrollo de programas en el lenguaje de programaci??n Java." #: ../comps-f7.xml.in.h:134 #: ../comps-f8.xml.in.h:143 -#: ../comps-f9.xml.in.h:147 -#: ../comps-f10.xml.in.h:149 +#: ../comps-f9.xml.in.h:149 +#: ../comps-f10.xml.in.h:151 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "Soporte para ejecutar programas escritos en el lenguaje de programaci??n Java." #: ../comps-f7.xml.in.h:135 #: ../comps-f8.xml.in.h:144 -#: ../comps-f9.xml.in.h:148 -#: ../comps-f10.xml.in.h:150 +#: ../comps-f9.xml.in.h:150 +#: ../comps-f10.xml.in.h:152 msgid "Swati Support" msgstr "Soporte para Swati" #: ../comps-f7.xml.in.h:136 #: ../comps-f8.xml.in.h:145 -#: ../comps-f9.xml.in.h:149 -#: ../comps-f10.xml.in.h:151 +#: ../comps-f9.xml.in.h:151 +#: ../comps-f10.xml.in.h:153 msgid "Swedish Support" msgstr "Soporte para sueco" #: ../comps-f7.xml.in.h:137 #: ../comps-f8.xml.in.h:146 -#: ../comps-f9.xml.in.h:150 -#: ../comps-f10.xml.in.h:152 +#: ../comps-f9.xml.in.h:152 +#: ../comps-f10.xml.in.h:154 #: ../comps-el4.xml.in.h:48 #: ../comps-el5.xml.in.h:46 msgid "System Tools" @@ -1061,29 +1061,29 @@ #: ../comps-f7.xml.in.h:138 #: ../comps-f8.xml.in.h:147 -#: ../comps-f9.xml.in.h:151 -#: ../comps-f10.xml.in.h:153 +#: ../comps-f9.xml.in.h:153 +#: ../comps-f10.xml.in.h:155 msgid "Tagalog Support" msgstr "Soporte para tagalo" #: ../comps-f7.xml.in.h:139 #: ../comps-f8.xml.in.h:148 -#: ../comps-f9.xml.in.h:152 -#: ../comps-f10.xml.in.h:154 +#: ../comps-f9.xml.in.h:154 +#: ../comps-f10.xml.in.h:156 msgid "Tamil Support" msgstr "Soporte para tamil" #: ../comps-f7.xml.in.h:140 #: ../comps-f8.xml.in.h:149 -#: ../comps-f9.xml.in.h:153 -#: ../comps-f10.xml.in.h:155 +#: ../comps-f9.xml.in.h:155 +#: ../comps-f10.xml.in.h:157 msgid "Telugu Support" msgstr "Soporte para telugu" #: ../comps-f7.xml.in.h:141 #: ../comps-f8.xml.in.h:150 -#: ../comps-f9.xml.in.h:154 -#: ../comps-f10.xml.in.h:156 +#: ../comps-f9.xml.in.h:156 +#: ../comps-f10.xml.in.h:158 #: ../comps-el4.xml.in.h:49 #: ../comps-el5.xml.in.h:47 msgid "Text-based Internet" @@ -1091,8 +1091,8 @@ #: ../comps-f7.xml.in.h:142 #: ../comps-f8.xml.in.h:151 -#: ../comps-f9.xml.in.h:155 -#: ../comps-f10.xml.in.h:157 +#: ../comps-f9.xml.in.h:157 +#: ../comps-f10.xml.in.h:159 msgid "Thai Support" msgstr "Soporte para tailand??s" @@ -1102,8 +1102,8 @@ #: ../comps-f7.xml.in.h:144 #: ../comps-f8.xml.in.h:152 -#: ../comps-f9.xml.in.h:156 -#: ../comps-f10.xml.in.h:158 +#: ../comps-f9.xml.in.h:158 +#: ../comps-f10.xml.in.h:160 #: ../comps-el4.xml.in.h:51 #: ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." @@ -1111,15 +1111,15 @@ #: ../comps-f7.xml.in.h:145 #: ../comps-f8.xml.in.h:153 -#: ../comps-f9.xml.in.h:157 -#: ../comps-f10.xml.in.h:159 +#: ../comps-f9.xml.in.h:159 +#: ../comps-f10.xml.in.h:161 msgid "The packages in this group are core libraries needed to develop applications." msgstr "Este paquete incluye bibliotecas necesarias para desarrollar aplicaciones." #: ../comps-f7.xml.in.h:146 #: ../comps-f8.xml.in.h:154 -#: ../comps-f9.xml.in.h:158 -#: ../comps-f10.xml.in.h:160 +#: ../comps-f9.xml.in.h:160 +#: ../comps-f10.xml.in.h:162 #: ../comps-el4.xml.in.h:52 #: ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." @@ -1127,15 +1127,15 @@ #: ../comps-f7.xml.in.h:147 #: ../comps-f8.xml.in.h:155 -#: ../comps-f9.xml.in.h:159 -#: ../comps-f10.xml.in.h:161 +#: ../comps-f9.xml.in.h:161 +#: ../comps-f10.xml.in.h:163 msgid "These packages allow you to develop applications for the X Window System." msgstr "Estos paquetes le permiten desarrollar aplicaciones para el sistema X Window." #: ../comps-f7.xml.in.h:148 #: ../comps-f8.xml.in.h:156 -#: ../comps-f9.xml.in.h:160 -#: ../comps-f10.xml.in.h:162 +#: ../comps-f9.xml.in.h:162 +#: ../comps-f10.xml.in.h:164 #: ../comps-el4.xml.in.h:53 #: ../comps-el5.xml.in.h:51 msgid "These packages are helpful when developing web applications or web pages." @@ -1143,50 +1143,50 @@ #: ../comps-f7.xml.in.h:149 #: ../comps-f8.xml.in.h:157 -#: ../comps-f9.xml.in.h:161 -#: ../comps-f10.xml.in.h:163 +#: ../comps-f9.xml.in.h:163 +#: ../comps-f10.xml.in.h:165 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "Estos paquetes incluyen servidores basados en la red tales como DHCP, Kerberos y NIS." #: ../comps-f7.xml.in.h:150 #: ../comps-f8.xml.in.h:158 -#: ../comps-f9.xml.in.h:162 -#: ../comps-f10.xml.in.h:164 +#: ../comps-f9.xml.in.h:164 +#: ../comps-f10.xml.in.h:166 msgid "These packages include servers for old network protocols such as rsh and telnet." msgstr "Estos paquetes incluyen servidores para antiguos protocolos de red, tales como rsh y telnet." #: ../comps-f7.xml.in.h:151 #: ../comps-f8.xml.in.h:159 -#: ../comps-f9.xml.in.h:163 -#: ../comps-f10.xml.in.h:165 +#: ../comps-f9.xml.in.h:165 +#: ../comps-f10.xml.in.h:167 msgid "These packages provide a virtualization environment." msgstr "Estos paquetes proporcionan un entorno de virtualizaci??n." #: ../comps-f7.xml.in.h:152 #: ../comps-f8.xml.in.h:160 -#: ../comps-f9.xml.in.h:164 -#: ../comps-f10.xml.in.h:166 +#: ../comps-f9.xml.in.h:166 +#: ../comps-f10.xml.in.h:168 msgid "These packages provide compatibility with previous releases." msgstr "Estos paquetes proporcionan compatibilidad con versiones anteriores." #: ../comps-f7.xml.in.h:153 #: ../comps-f8.xml.in.h:161 -#: ../comps-f9.xml.in.h:165 -#: ../comps-f10.xml.in.h:167 +#: ../comps-f9.xml.in.h:167 +#: ../comps-f10.xml.in.h:169 msgid "These packages provide support for various locales including fonts and input methods." msgstr "Estos paquetes proporcionan soporte para diversos idiomas, incluyendotipograf??as y m??todos de escritura." #: ../comps-f7.xml.in.h:154 #: ../comps-f8.xml.in.h:162 -#: ../comps-f9.xml.in.h:166 -#: ../comps-f10.xml.in.h:168 +#: ../comps-f9.xml.in.h:168 +#: ../comps-f10.xml.in.h:170 msgid "These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text." msgstr "Estas herramientas le permiten crear documentos en formato DocBook y convertirla a HTML, PDF, Postscript y texto." #: ../comps-f7.xml.in.h:155 #: ../comps-f8.xml.in.h:163 -#: ../comps-f9.xml.in.h:167 -#: ../comps-f10.xml.in.h:169 +#: ../comps-f9.xml.in.h:169 +#: ../comps-f10.xml.in.h:171 #: ../comps-el4.xml.in.h:55 #: ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." @@ -1194,8 +1194,8 @@ #: ../comps-f7.xml.in.h:156 #: ../comps-f8.xml.in.h:164 -#: ../comps-f9.xml.in.h:168 -#: ../comps-f10.xml.in.h:170 +#: ../comps-f9.xml.in.h:170 +#: ../comps-f10.xml.in.h:172 #: ../comps-el4.xml.in.h:56 #: ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." @@ -1203,8 +1203,8 @@ #: ../comps-f7.xml.in.h:157 #: ../comps-f8.xml.in.h:165 -#: ../comps-f9.xml.in.h:169 -#: ../comps-f10.xml.in.h:171 +#: ../comps-f9.xml.in.h:171 +#: ../comps-f10.xml.in.h:173 #: ../comps-el4.xml.in.h:57 #: ../comps-el5.xml.in.h:55 msgid "These tools include core development tools such as automake, gcc, perl, python, and debuggers." @@ -1212,8 +1212,8 @@ #: ../comps-f7.xml.in.h:158 #: ../comps-f8.xml.in.h:166 -#: ../comps-f9.xml.in.h:170 -#: ../comps-f10.xml.in.h:172 +#: ../comps-f9.xml.in.h:172 +#: ../comps-f10.xml.in.h:174 #: ../comps-el4.xml.in.h:58 #: ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." @@ -1221,22 +1221,22 @@ #: ../comps-f7.xml.in.h:159 #: ../comps-f8.xml.in.h:167 -#: ../comps-f9.xml.in.h:171 -#: ../comps-f10.xml.in.h:173 +#: ../comps-f9.xml.in.h:173 +#: ../comps-f10.xml.in.h:175 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "Este grupo contiene todas las herramientas de configuraci??n del servidor propias de Red Hat." #: ../comps-f7.xml.in.h:160 #: ../comps-f8.xml.in.h:168 -#: ../comps-f9.xml.in.h:172 -#: ../comps-f10.xml.in.h:174 +#: ../comps-f9.xml.in.h:174 +#: ../comps-f10.xml.in.h:176 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example." msgstr "Este grupo incluye un conjunto de paquetes m??nimo. Muy ??til para la creaci??n de peque??as cajas de enrutadores/cortafuegos, por ejemplo." #: ../comps-f7.xml.in.h:161 #: ../comps-f8.xml.in.h:169 -#: ../comps-f9.xml.in.h:173 -#: ../comps-f10.xml.in.h:175 +#: ../comps-f9.xml.in.h:175 +#: ../comps-f10.xml.in.h:177 #: ../comps-el4.xml.in.h:59 #: ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." @@ -1244,8 +1244,8 @@ #: ../comps-f7.xml.in.h:162 #: ../comps-f8.xml.in.h:170 -#: ../comps-f9.xml.in.h:174 -#: ../comps-f10.xml.in.h:176 +#: ../comps-f9.xml.in.h:176 +#: ../comps-f10.xml.in.h:178 #: ../comps-el4.xml.in.h:60 #: ../comps-el5.xml.in.h:58 msgid "This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion." @@ -1253,8 +1253,8 @@ #: ../comps-f7.xml.in.h:163 #: ../comps-f8.xml.in.h:171 -#: ../comps-f9.xml.in.h:175 -#: ../comps-f10.xml.in.h:177 +#: ../comps-f9.xml.in.h:177 +#: ../comps-f10.xml.in.h:179 #: ../comps-el4.xml.in.h:61 #: ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." @@ -1262,8 +1262,8 @@ #: ../comps-f7.xml.in.h:164 #: ../comps-f8.xml.in.h:172 -#: ../comps-f9.xml.in.h:176 -#: ../comps-f10.xml.in.h:178 +#: ../comps-f9.xml.in.h:178 +#: ../comps-f10.xml.in.h:180 #: ../comps-el4.xml.in.h:62 #: ../comps-el5.xml.in.h:60 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System." @@ -1271,8 +1271,8 @@ #: ../comps-f7.xml.in.h:165 #: ../comps-f8.xml.in.h:173 -#: ../comps-f9.xml.in.h:177 -#: ../comps-f10.xml.in.h:179 +#: ../comps-f9.xml.in.h:179 +#: ../comps-f10.xml.in.h:181 #: ../comps-el4.xml.in.h:63 #: ../comps-el5.xml.in.h:61 msgid "This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware." @@ -1280,8 +1280,8 @@ #: ../comps-f7.xml.in.h:166 #: ../comps-f8.xml.in.h:174 -#: ../comps-f9.xml.in.h:178 -#: ../comps-f10.xml.in.h:180 +#: ../comps-f9.xml.in.h:180 +#: ../comps-f10.xml.in.h:182 #: ../comps-el4.xml.in.h:66 #: ../comps-el5.xml.in.h:64 msgid "This group is a collection of tools and resources of Armenian environments." @@ -1289,8 +1289,8 @@ #: ../comps-f7.xml.in.h:167 #: ../comps-f8.xml.in.h:175 -#: ../comps-f9.xml.in.h:179 -#: ../comps-f10.xml.in.h:181 +#: ../comps-f9.xml.in.h:181 +#: ../comps-f10.xml.in.h:183 #: ../comps-el4.xml.in.h:69 #: ../comps-el5.xml.in.h:68 msgid "This group is a collection of tools for various hardware specific utilities." @@ -1298,8 +1298,8 @@ #: ../comps-f7.xml.in.h:168 #: ../comps-f8.xml.in.h:176 -#: ../comps-f9.xml.in.h:180 -#: ../comps-f10.xml.in.h:182 +#: ../comps-f9.xml.in.h:182 +#: ../comps-f10.xml.in.h:184 #: ../comps-el4.xml.in.h:70 #: ../comps-el5.xml.in.h:69 msgid "This group is a collection of various tools for the system, such as the client for connecting to SMB shares and tools to monitor network traffic." @@ -1307,50 +1307,50 @@ #: ../comps-f7.xml.in.h:169 #: ../comps-f8.xml.in.h:177 -#: ../comps-f9.xml.in.h:181 -#: ../comps-f10.xml.in.h:183 +#: ../comps-f9.xml.in.h:183 +#: ../comps-f10.xml.in.h:185 msgid "This package group allows you to run a DNS name server (BIND) on the system." msgstr "Este paquete le permite ejecutar un servidor de nombres DNS (BIND) en el sistema." #: ../comps-f7.xml.in.h:170 #: ../comps-f8.xml.in.h:178 -#: ../comps-f9.xml.in.h:182 -#: ../comps-f10.xml.in.h:184 +#: ../comps-f9.xml.in.h:184 +#: ../comps-f10.xml.in.h:186 msgid "This package group allows you to share files between Linux and MS Windows(tm) systems." msgstr "Este grupo de paquetes le permite compartir archivos entre los sistemas Linux y MS Windows (tm)." #: ../comps-f7.xml.in.h:171 #: ../comps-f8.xml.in.h:179 -#: ../comps-f9.xml.in.h:183 -#: ../comps-f10.xml.in.h:185 +#: ../comps-f9.xml.in.h:185 +#: ../comps-f10.xml.in.h:187 msgid "This package group contains packages useful for use with MySQL." msgstr "Este grupo incluye paquetes ??tiles para usar con MySQL." #: ../comps-f7.xml.in.h:172 #: ../comps-f8.xml.in.h:180 -#: ../comps-f9.xml.in.h:184 -#: ../comps-f10.xml.in.h:186 +#: ../comps-f9.xml.in.h:186 +#: ../comps-f10.xml.in.h:188 msgid "This package group includes packages useful for use with Postgresql." msgstr "Este grupo de paquetes incluye paquetes ??tiles para usar con Postgresql." #: ../comps-f7.xml.in.h:173 #: ../comps-f8.xml.in.h:181 -#: ../comps-f9.xml.in.h:185 -#: ../comps-f10.xml.in.h:187 +#: ../comps-f9.xml.in.h:187 +#: ../comps-f10.xml.in.h:189 msgid "Tibetan Support" msgstr "Soporte para tibet??no" #: ../comps-f7.xml.in.h:174 #: ../comps-f8.xml.in.h:182 -#: ../comps-f9.xml.in.h:186 -#: ../comps-f10.xml.in.h:188 +#: ../comps-f9.xml.in.h:188 +#: ../comps-f10.xml.in.h:190 msgid "Tonga Support" msgstr "Soporte para tongano" #: ../comps-f7.xml.in.h:175 #: ../comps-f8.xml.in.h:183 -#: ../comps-f9.xml.in.h:187 -#: ../comps-f10.xml.in.h:189 +#: ../comps-f9.xml.in.h:189 +#: ../comps-f10.xml.in.h:191 #: ../comps-el4.xml.in.h:71 #: ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" @@ -1358,43 +1358,43 @@ #: ../comps-f7.xml.in.h:176 #: ../comps-f8.xml.in.h:184 -#: ../comps-f9.xml.in.h:188 -#: ../comps-f10.xml.in.h:190 +#: ../comps-f9.xml.in.h:190 +#: ../comps-f10.xml.in.h:192 msgid "Tsonga Support" msgstr "Soporte para tsonga" #: ../comps-f7.xml.in.h:177 #: ../comps-f8.xml.in.h:185 -#: ../comps-f9.xml.in.h:189 -#: ../comps-f10.xml.in.h:191 +#: ../comps-f9.xml.in.h:191 +#: ../comps-f10.xml.in.h:193 msgid "Tswana Support" msgstr "Soporte para tswana" #: ../comps-f7.xml.in.h:178 #: ../comps-f8.xml.in.h:186 -#: ../comps-f9.xml.in.h:190 -#: ../comps-f10.xml.in.h:192 +#: ../comps-f9.xml.in.h:192 +#: ../comps-f10.xml.in.h:194 msgid "Turkish Support" msgstr "Soporte para turco" #: ../comps-f7.xml.in.h:179 #: ../comps-f8.xml.in.h:187 -#: ../comps-f9.xml.in.h:191 -#: ../comps-f10.xml.in.h:193 +#: ../comps-f9.xml.in.h:193 +#: ../comps-f10.xml.in.h:195 msgid "Ukrainian Support" msgstr "Soporte para ucraniano " #: ../comps-f7.xml.in.h:180 #: ../comps-f8.xml.in.h:188 -#: ../comps-f9.xml.in.h:192 -#: ../comps-f10.xml.in.h:194 +#: ../comps-f9.xml.in.h:194 +#: ../comps-f10.xml.in.h:196 msgid "Urdu Support" msgstr "Soporte para urd??" #: ../comps-f7.xml.in.h:181 #: ../comps-f8.xml.in.h:189 -#: ../comps-f9.xml.in.h:193 -#: ../comps-f10.xml.in.h:195 +#: ../comps-f9.xml.in.h:195 +#: ../comps-f10.xml.in.h:197 #: ../comps-el4.xml.in.h:72 #: ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." @@ -1402,37 +1402,37 @@ #: ../comps-f7.xml.in.h:182 #: ../comps-f8.xml.in.h:190 -#: ../comps-f9.xml.in.h:194 -#: ../comps-f10.xml.in.h:196 +#: ../comps-f9.xml.in.h:196 +#: ../comps-f10.xml.in.h:198 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "Varias maneras de relajarse y pasar el tiempo libre." #: ../comps-f7.xml.in.h:183 #: ../comps-f8.xml.in.h:191 -#: ../comps-f9.xml.in.h:195 -#: ../comps-f10.xml.in.h:197 +#: ../comps-f9.xml.in.h:197 +#: ../comps-f10.xml.in.h:199 msgid "Venda Support" msgstr "Soporte para Venda" #: ../comps-f7.xml.in.h:184 #: ../comps-f8.xml.in.h:192 -#: ../comps-f9.xml.in.h:196 -#: ../comps-f10.xml.in.h:198 +#: ../comps-f9.xml.in.h:198 +#: ../comps-f10.xml.in.h:200 msgid "Vietnamese Support" msgstr "Soporte para vietnamita" #: ../comps-f7.xml.in.h:185 #: ../comps-f8.xml.in.h:193 -#: ../comps-f9.xml.in.h:197 -#: ../comps-f10.xml.in.h:199 +#: ../comps-f9.xml.in.h:199 +#: ../comps-f10.xml.in.h:201 msgid "Virtualization" msgstr "Virtualizaci??n" #: ../comps-f7.xml.in.h:186 #: ../comps-f8.xml.in.h:194 -#: ../comps-f9.xml.in.h:199 -#: ../comps-f10.xml.in.h:201 +#: ../comps-f9.xml.in.h:201 +#: ../comps-f10.xml.in.h:203 #: ../comps-el4.xml.in.h:73 #: ../comps-el5.xml.in.h:73 msgid "Web Development" @@ -1440,8 +1440,8 @@ #: ../comps-f7.xml.in.h:187 #: ../comps-f8.xml.in.h:195 -#: ../comps-f9.xml.in.h:200 -#: ../comps-f10.xml.in.h:202 +#: ../comps-f9.xml.in.h:202 +#: ../comps-f10.xml.in.h:204 #: ../comps-el4.xml.in.h:74 #: ../comps-el5.xml.in.h:74 msgid "Web Server" @@ -1449,15 +1449,15 @@ #: ../comps-f7.xml.in.h:188 #: ../comps-f8.xml.in.h:196 -#: ../comps-f9.xml.in.h:201 -#: ../comps-f10.xml.in.h:203 +#: ../comps-f9.xml.in.h:203 +#: ../comps-f10.xml.in.h:205 msgid "Welsh Support" msgstr "Soporte para gal??s" #: ../comps-f7.xml.in.h:189 #: ../comps-f8.xml.in.h:197 -#: ../comps-f9.xml.in.h:202 -#: ../comps-f10.xml.in.h:204 +#: ../comps-f9.xml.in.h:204 +#: ../comps-f10.xml.in.h:206 #: ../comps-el4.xml.in.h:75 #: ../comps-el5.xml.in.h:75 msgid "Window Managers" @@ -1465,22 +1465,22 @@ #: ../comps-f7.xml.in.h:190 #: ../comps-f8.xml.in.h:198 -#: ../comps-f9.xml.in.h:203 -#: ../comps-f10.xml.in.h:205 +#: ../comps-f9.xml.in.h:205 +#: ../comps-f10.xml.in.h:207 msgid "Windows File Server" msgstr "Servidor de archivos Windows" #: ../comps-f7.xml.in.h:191 #: ../comps-f8.xml.in.h:199 -#: ../comps-f9.xml.in.h:204 -#: ../comps-f10.xml.in.h:206 +#: ../comps-f9.xml.in.h:206 +#: ../comps-f10.xml.in.h:208 msgid "X Software Development" msgstr "Desarrollo de software para X" #: ../comps-f7.xml.in.h:192 #: ../comps-f8.xml.in.h:200 -#: ../comps-f9.xml.in.h:205 -#: ../comps-f10.xml.in.h:207 +#: ../comps-f9.xml.in.h:207 +#: ../comps-f10.xml.in.h:209 #: ../comps-el4.xml.in.h:76 #: ../comps-el5.xml.in.h:76 msgid "X Window System" @@ -1488,29 +1488,29 @@ #: ../comps-f7.xml.in.h:193 #: ../comps-f8.xml.in.h:201 -#: ../comps-f9.xml.in.h:206 -#: ../comps-f10.xml.in.h:208 +#: ../comps-f9.xml.in.h:208 +#: ../comps-f10.xml.in.h:210 msgid "XFCE" msgstr "XFCE" #: ../comps-f7.xml.in.h:194 #: ../comps-f8.xml.in.h:202 -#: ../comps-f9.xml.in.h:207 -#: ../comps-f10.xml.in.h:209 +#: ../comps-f9.xml.in.h:209 +#: ../comps-f10.xml.in.h:211 msgid "XFCE Software Development" msgstr "Desarrollo de Software para XFCE" #: ../comps-f7.xml.in.h:195 #: ../comps-f8.xml.in.h:203 -#: ../comps-f9.xml.in.h:208 -#: ../comps-f10.xml.in.h:210 +#: ../comps-f9.xml.in.h:210 +#: ../comps-f10.xml.in.h:212 msgid "Xhosa Support" msgstr "Soporte para Xhosa" #: ../comps-f7.xml.in.h:196 #: ../comps-f8.xml.in.h:204 -#: ../comps-f9.xml.in.h:209 -#: ../comps-f10.xml.in.h:211 +#: ../comps-f9.xml.in.h:211 +#: ../comps-f10.xml.in.h:213 msgid "Zulu Support" msgstr "Soporte para zul??" @@ -1594,8 +1594,18 @@ msgid "Northern Sami Support" msgstr "Soporte para sami septentrional" -#: ../comps-f9.xml.in.h:198 -#: ../comps-f10.xml.in.h:200 +#: ../comps-f9.xml.in.h:130 +#: ../comps-f10.xml.in.h:132 +msgid "SUGAR Desktop Environment" +msgstr "Entorno de Escritorio SUGAR" + +#: ../comps-f9.xml.in.h:131 +#: ../comps-f10.xml.in.h:133 +msgid "SUGAR is the desktop environment developed for the OLPC XO." +msgstr "SUGAR es el entorno de escritorio desarrollado para la OLPC XO." + +#: ../comps-f9.xml.in.h:200 +#: ../comps-f10.xml.in.h:202 msgid "Walloon Support" msgstr "Soporte para wallon??s" From fedora-extras-commits at redhat.com Thu Jul 3 12:57:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 3 Jul 2008 12:57:23 GMT Subject: rpms/alienarena-data/F-9 alienarena-data.spec,1.3,1.4 Message-ID: <200807031257.m63CvNJ5018605@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18530/F-9 Modified Files: alienarena-data.spec Log Message: bump rel Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-9/alienarena-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- alienarena-data.spec 3 Jul 2008 12:50:32 -0000 1.3 +++ alienarena-data.spec 3 Jul 2008 12:56:32 -0000 1.4 @@ -1,7 +1,7 @@ Name: alienarena-data Summary: Data files for Alien Arena 2008 Version: 20080603 -Release: 1%{?dist} +Release: 2%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games # Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. From fedora-extras-commits at redhat.com Thu Jul 3 12:57:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 3 Jul 2008 12:57:32 GMT Subject: rpms/alienarena-data/F-8 alienarena-data.spec,1.3,1.4 Message-ID: <200807031257.m63CvW92018613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18530/F-8 Modified Files: alienarena-data.spec Log Message: bump rel Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-8/alienarena-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- alienarena-data.spec 3 Jul 2008 12:50:19 -0000 1.3 +++ alienarena-data.spec 3 Jul 2008 12:56:15 -0000 1.4 @@ -1,7 +1,7 @@ Name: alienarena-data Summary: Data files for Alien Arena 2008 Version: 20080603 -Release: 1%{?dist} +Release: 2%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games # Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. From fedora-extras-commits at redhat.com Thu Jul 3 12:57:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 3 Jul 2008 12:57:37 GMT Subject: rpms/alienarena-data/devel alienarena-data.spec,1.3,1.4 Message-ID: <200807031257.m63Cvb0r018616@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18530/devel Modified Files: alienarena-data.spec Log Message: bump rel Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/alienarena-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- alienarena-data.spec 3 Jul 2008 12:50:46 -0000 1.3 +++ alienarena-data.spec 3 Jul 2008 12:56:53 -0000 1.4 @@ -1,7 +1,7 @@ Name: alienarena-data Summary: Data files for Alien Arena 2008 Version: 20080603 -Release: 1%{?dist} +Release: 2%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games # Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. From fedora-extras-commits at redhat.com Thu Jul 3 13:02:47 2008 From: fedora-extras-commits at redhat.com (James Bowes (jbowes)) Date: Thu, 3 Jul 2008 13:02:47 GMT Subject: rpms/mod_wsgi/F-9 mod_wsgi.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200807031302.m63D2lQN025445@cvs-int.fedora.redhat.com> Author: jbowes Update of /cvs/pkgs/rpms/mod_wsgi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25398 Modified Files: mod_wsgi.spec sources Log Message: update to 2.1 Index: mod_wsgi.spec =================================================================== RCS file: /cvs/pkgs/rpms/mod_wsgi/F-9/mod_wsgi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_wsgi.spec 16 Jun 2008 23:25:28 -0000 1.5 +++ mod_wsgi.spec 3 Jul 2008 13:01:56 -0000 1.6 @@ -1,6 +1,6 @@ Name: mod_wsgi -Version: 1.3 -Release: 4%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: A WSGI interface for Python web applications in Apache Group: System Environment/Libraries @@ -53,7 +53,10 @@ %changelog -* Sun Jun 12 2008 Ricky Zhou 1.3-4 +* Wed Jul 02 2008 James Bowes 2.1-1 +- Update to 2.1 + +* Mon Jun 16 2008 Ricky Zhou 1.3-4 - Build against the shared python lib. * Tue Feb 19 2008 Fedora Release Engineering - 1.3-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mod_wsgi/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2008 23:58:21 -0000 1.3 +++ sources 3 Jul 2008 13:01:57 -0000 1.4 @@ -1 +1 @@ -7dc5e45f7332fde54fb1c5b71616e4a2 mod_wsgi-1.3.tar.gz +4e0e8b5a13e0be2fc5b038f1e3e826a2 mod_wsgi-2.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 13:14:43 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Thu, 3 Jul 2008 13:14:43 GMT Subject: rpms/glibc/devel .cvsignore, 1.247, 1.248 glibc-fedora.patch, 1.276, 1.277 glibc.spec, 1.361, 1.362 sources, 1.272, 1.273 Message-ID: <200807031314.m63DEhm0025963@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25849/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: 2.8.90-8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- .cvsignore 13 Jun 2008 17:15:01 -0000 1.247 +++ .cvsignore 3 Jul 2008 13:13:56 -0000 1.248 @@ -1,2 +1,2 @@ -glibc-20080613T1601.tar.bz2 -glibc-fedora-20080613T1601.tar.bz2 +glibc-20080703T1203.tar.bz2 +glibc-fedora-20080703T1203.tar.bz2 glibc-fedora.patch: Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- glibc-fedora.patch 13 Jun 2008 17:17:16 -0000 1.276 +++ glibc-fedora.patch 3 Jul 2008 13:13:56 -0000 1.277 @@ -1,6 +1,6 @@ ---- glibc-20080613T1601/ChangeLog 13 Jun 2008 06:08:54 -0000 1.11239 -+++ glibc-20080613T1601-fedora/ChangeLog 13 Jun 2008 16:16:15 -0000 1.8782.2.305 -@@ -4987,6 +4987,13 @@ +--- glibc-20080703T1203/ChangeLog 2 Jul 2008 19:35:02 -0000 1.11252 ++++ glibc-20080703T1203-fedora/ChangeLog 3 Jul 2008 12:21:04 -0000 1.8782.2.306 +@@ -5060,6 +5060,13 @@ * include/sys/cdefs.h: Redefine __nonnull so that test for incorrect parameters in the libc code itself are not omitted. @@ -14,7 +14,7 @@ 2007-05-09 Jakub Jelinek * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -5282,6 +5289,10 @@ +@@ -5355,6 +5362,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -6539,6 +6550,15 @@ +@@ -6612,6 +6623,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -41,8 +41,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-20080613T1601/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20080613T1601-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20080703T1203/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20080703T1203-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20080613T1601/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20080613T1601-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20080703T1203/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20080703T1203-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -281,8 +281,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20080613T1601/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20080613T1601-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20080703T1203/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20080703T1203-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -293,8 +293,8 @@ vpath initfini.c $(sysdirs) ---- glibc-20080613T1601/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20080613T1601-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20080703T1203/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20080703T1203-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -319,8 +319,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20080613T1601/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 -+++ glibc-20080613T1601-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 +--- glibc-20080703T1203/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 ++++ glibc-20080703T1203-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,8 +349,8 @@ # define O 0 # else # define O 1 ---- glibc-20080613T1601/elf/ldconfig.c 19 Mar 2008 06:43:31 -0000 1.63 -+++ glibc-20080613T1601-fedora/elf/ldconfig.c 26 Mar 2008 11:22:14 -0000 1.47.2.18 +--- glibc-20080703T1203/elf/ldconfig.c 19 Mar 2008 06:43:31 -0000 1.63 ++++ glibc-20080703T1203-fedora/elf/ldconfig.c 26 Mar 2008 11:22:14 -0000 1.47.2.18 @@ -1000,17 +1000,19 @@ search_dirs (void) @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-20080613T1601/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20080613T1601-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20080703T1203/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20080703T1203-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -458,8 +458,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20080613T1601/include/features.h 11 Apr 2008 17:33:13 -0000 1.50 -+++ glibc-20080613T1601-fedora/include/features.h 12 Apr 2008 07:48:57 -0000 1.35.2.20 +--- glibc-20080703T1203/include/features.h 11 Apr 2008 17:33:13 -0000 1.50 ++++ glibc-20080703T1203-fedora/include/features.h 12 Apr 2008 07:48:57 -0000 1.35.2.20 @@ -282,8 +282,13 @@ #endif @@ -476,16 +476,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-20080613T1601/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080703T1203/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080613T1601/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080703T1203/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080613T1601/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 -+++ glibc-20080613T1601-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 +--- glibc-20080703T1203/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 ++++ glibc-20080703T1203-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20080613T1601/libio/stdio.h 24 May 2008 18:14:36 -0000 1.93 -+++ glibc-20080613T1601-fedora/libio/stdio.h 24 May 2008 22:22:18 -0000 1.78.2.14 +--- glibc-20080703T1203/libio/stdio.h 24 May 2008 18:14:36 -0000 1.93 ++++ glibc-20080703T1203-fedora/libio/stdio.h 24 May 2008 22:22:18 -0000 1.78.2.14 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20080613T1601/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20080613T1601-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20080703T1203/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20080703T1203-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20080613T1601/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 -+++ glibc-20080613T1601-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 +--- glibc-20080703T1203/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 ++++ glibc-20080703T1203-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -636,9 +636,9 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-20080613T1601/localedata/ChangeLog 21 May 2008 15:12:48 -0000 1.699 -+++ glibc-20080613T1601-fedora/localedata/ChangeLog 24 May 2008 22:22:18 -0000 1.494.2.67 -@@ -31,9 +31,6 @@ +--- glibc-20080703T1203/localedata/ChangeLog 27 Jun 2008 17:22:28 -0000 1.704 ++++ glibc-20080703T1203-fedora/localedata/ChangeLog 3 Jul 2008 12:21:14 -0000 1.494.2.68 +@@ -51,9 +51,6 @@ * locales/es_ES: Fix p_cs_precedes and n_cs_precedes. Use common collation definition. @@ -648,8 +648,8 @@ [BZ #6004] * locales/iso14651_t1_common: Fix first weight for U+1E60, U+1E62, U+1E64, U+1E66, and U+1E68. ---- glibc-20080613T1601/localedata/Makefile 30 Mar 2008 23:40:06 -0000 1.108 -+++ glibc-20080613T1601-fedora/localedata/Makefile 8 Apr 2008 07:59:47 -0000 1.101.2.8 +--- glibc-20080703T1203/localedata/Makefile 30 Mar 2008 23:40:06 -0000 1.108 ++++ glibc-20080703T1203-fedora/localedata/Makefile 8 Apr 2008 07:59:47 -0000 1.101.2.8 @@ -224,6 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -658,8 +658,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20080613T1601/localedata/SUPPORTED 4 Mar 2008 22:10:33 -0000 1.109 -+++ glibc-20080613T1601-fedora/localedata/SUPPORTED 5 Mar 2008 09:37:42 -0000 1.71.2.21 +--- glibc-20080703T1203/localedata/SUPPORTED 4 Mar 2008 22:10:33 -0000 1.109 ++++ glibc-20080703T1203-fedora/localedata/SUPPORTED 5 Mar 2008 09:37:42 -0000 1.71.2.21 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -701,8 +701,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20080613T1601/localedata/tst-langinfo.sh 9 Apr 2008 18:16:14 -0000 1.7 -+++ glibc-20080613T1601-fedora/localedata/tst-langinfo.sh 10 Oct 2007 21:00:45 -0000 1.5.2.1 +--- glibc-20080703T1203/localedata/tst-langinfo.sh 9 Apr 2008 18:16:14 -0000 1.7 ++++ glibc-20080703T1203-fedora/localedata/tst-langinfo.sh 10 Oct 2007 21:00:45 -0000 1.5.2.1 @@ -1,6 +1,6 @@ #! /bin/sh # Test nl_langinfo. @@ -771,8 +771,8 @@ fr_FR.ISO-8859-1 T_FMT "%T" fr_FR.ISO-8859-1 RADIXCHAR , fr_FR.ISO-8859-1 THOUSEP " " ---- glibc-20080613T1601/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20080613T1601-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20080703T1203/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20080703T1203-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -787,8 +787,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20080613T1601/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 -+++ glibc-20080613T1601-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 +--- glibc-20080703T1203/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 ++++ glibc-20080703T1203-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -800,8 +800,8 @@ date_fmt "/ / " ---- glibc-20080613T1601/localedata/locales/fr_FR 8 Apr 2008 00:17:54 -0000 1.15 -+++ glibc-20080613T1601-fedora/localedata/locales/fr_FR 10 Oct 2007 21:00:45 -0000 1.10.2.3 +--- glibc-20080703T1203/localedata/locales/fr_FR 8 Apr 2008 00:17:54 -0000 1.15 ++++ glibc-20080703T1203-fedora/localedata/locales/fr_FR 10 Oct 2007 21:00:45 -0000 1.10.2.3 @@ -3,35 +3,33 @@ escape_char / % % French Language Locale for France @@ -915,8 +915,8 @@ t_fmt "" am_pm "";"" t_fmt_ampm "" ---- glibc-20080613T1601/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20080703T1203/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -987,8 +987,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20080613T1601/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20080613T1601-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20080703T1203/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20080703T1203-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1016,8 +1016,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20080613T1601/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 -+++ glibc-20080613T1601-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 +--- glibc-20080703T1203/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 ++++ glibc-20080703T1203-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 @@ -24,9 +24,25 @@ # include # include @@ -1093,8 +1093,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20080613T1601/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 -+++ glibc-20080613T1601-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20080703T1203/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 ++++ glibc-20080703T1203-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1150,8 +1150,8 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20080613T1601/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 -+++ glibc-20080613T1601-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 +--- glibc-20080703T1203/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 ++++ glibc-20080703T1203-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1161,8 +1161,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20080613T1601/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 -+++ glibc-20080613T1601-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 +--- glibc-20080703T1203/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 ++++ glibc-20080703T1203-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1206,16 +1206,16 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-20080613T1601/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20080613T1601-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20080703T1203/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20080703T1203-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-20080613T1601/nptl/ChangeLog 12 Jun 2008 16:16:38 -0000 1.1071 -+++ glibc-20080613T1601-fedora/nptl/ChangeLog 12 Jun 2008 16:53:42 -0000 1.706.2.158 +--- glibc-20080703T1203/nptl/ChangeLog 12 Jun 2008 16:16:38 -0000 1.1071 ++++ glibc-20080703T1203-fedora/nptl/ChangeLog 12 Jun 2008 16:53:42 -0000 1.706.2.158 @@ -3212,6 +3212,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1256,8 +1256,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20080613T1601/nptl/Makefile 31 May 2008 08:56:14 -0000 1.194 -+++ glibc-20080613T1601-fedora/nptl/Makefile 12 Jun 2008 16:53:42 -0000 1.157.2.36 +--- glibc-20080703T1203/nptl/Makefile 31 May 2008 08:56:14 -0000 1.194 ++++ glibc-20080703T1203-fedora/nptl/Makefile 12 Jun 2008 16:53:42 -0000 1.157.2.36 @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1290,8 +1290,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20080613T1601/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20080613T1601-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20080703T1203/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20080703T1203-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1316,8 +1316,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20080613T1601/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20080703T1203/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1325,8 +1325,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20080613T1601/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 8 Mar 2008 01:57:04 -0000 1.16 -+++ glibc-20080613T1601-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 14 Mar 2008 22:36:45 -0000 1.8.2.9 +--- glibc-20080703T1203/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 8 Mar 2008 01:57:04 -0000 1.16 ++++ glibc-20080703T1203-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 14 Mar 2008 22:36:45 -0000 1.8.2.9 @@ -181,4 +181,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1335,8 +1335,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* posix_opt.h */ ---- glibc-20080613T1601/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 -+++ glibc-20080613T1601-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 +--- glibc-20080703T1203/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 ++++ glibc-20080703T1203-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1346,8 +1346,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-20080613T1601/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20080613T1601-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 +--- glibc-20080703T1203/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20080703T1203-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1404,8 +1404,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-20080613T1601/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 -+++ glibc-20080613T1601-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 +--- glibc-20080703T1203/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 ++++ glibc-20080703T1203-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 @@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1422,8 +1422,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-20080613T1601/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20080703T1203/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1440,8 +1440,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20080613T1601/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 -+++ glibc-20080613T1601-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 +--- glibc-20080703T1203/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 ++++ glibc-20080703T1203-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 @@ -21,7 +21,7 @@ # subdir := streams @@ -1451,8 +1451,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-20080613T1601/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20080613T1601-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20080703T1203/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20080703T1203-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1468,8 +1468,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20080613T1601/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 -+++ glibc-20080613T1601-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 +--- glibc-20080703T1203/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 ++++ glibc-20080703T1203-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 @@ -64,6 +64,14 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1485,8 +1485,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20080613T1601/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20080613T1601-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20080703T1203/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20080703T1203-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1498,8 +1498,8 @@ endif endif ---- glibc-20080613T1601/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20080613T1601-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20080703T1203/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20080703T1203-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1851,8 +1851,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20080613T1601/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080703T1203/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1938,8 +1938,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20080613T1601/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20080613T1601-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20080703T1203/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20080703T1203-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1948,8 +1948,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20080613T1601/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20080613T1601-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20080703T1203/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20080703T1203-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1964,8 +1964,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 @@ -27,13 +27,10 @@ #include #include @@ -1981,8 +1981,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/dl-osinfo.h 17 Apr 2008 08:32:24 -0000 1.28 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 15 May 2008 07:57:48 -0000 1.14.2.14 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/dl-osinfo.h 17 Apr 2008 08:32:24 -0000 1.28 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 15 May 2008 07:57:48 -0000 1.14.2.14 @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2029,8 +2029,8 @@ + ret ^= stk; return ret; } ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2073,8 +2073,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -2100,8 +2100,8 @@ struct netlink_res { ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2111,8 +2111,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -2158,8 +2158,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -2178,8 +2178,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2240,8 +2240,8 @@ + } while (0) + +#include_next ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2274,29 +2274,29 @@ + } while (0) + #include_next ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20080613T1601/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20080613T1601-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20080703T1203/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20080703T1203-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2315,79 +2315,3 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- libc/nscd/connections.c 12 Jun 2008 22:39:35 -0000 1.113 -+++ libc/nscd/connections.c 13 Jun 2008 16:30:09 -0000 1.114 -@@ -51,6 +51,7 @@ - #include "nscd.h" - #include "dbg_log.h" - #include "selinux.h" -+#include - #ifdef HAVE_SENDFILE - # include - #endif -@@ -228,6 +229,9 @@ static int sock; - #ifdef HAVE_INOTIFY - /* Inotify descriptor. */ - static int inotify_fd = -1; -+ -+/* Watch descriptor for resolver configuration file. */ -+static int resolv_conf_descr = -1; - #endif - - /* Number of times clients had to wait. */ -@@ -824,7 +828,7 @@ cannot set socket to close on exec: %s; - if (dbs[cnt].check_file) - { - #ifdef HAVE_INOTIFY -- if (inotify_fd == -1 -+ if (inotify_fd < 0 - || (dbs[cnt].inotify_descr - = inotify_add_watch (inotify_fd, dbs[cnt].filename, - IN_DELETE_SELF | IN_MODIFY)) < 0) -@@ -845,6 +849,14 @@ cannot set socket to close on exec: %s; - dbs[cnt].file_mtime = st.st_mtime; - } - } -+ -+#ifdef HAVE_INOTIFY -+ if (cnt == hstdb && inotify_fd >= -1) -+ /* We also monitor the resolver configuration file. */ -+ resolv_conf_descr = inotify_add_watch (inotify_fd, -+ _PATH_RESCONF, -+ IN_DELETE_SELF | IN_MODIFY); -+#endif - } - - /* Create the socket. */ -@@ -1798,6 +1810,7 @@ main_loop_poll (void) - { - if (conns[1].revents != 0) - { -+ bool done[lastdb] = { false, }; - union - { - struct inotify_event i; -@@ -1810,12 +1823,21 @@ main_loop_poll (void) - { - /* Check which of the files changed. */ - for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt) -- if (inev.i.wd == dbs[dbcnt].inotify_descr) -+ if (!done[dbcnt] -+ && (inev.i.wd == dbs[dbcnt].inotify_descr -+ || (dbcnt == hstdb -+ && inev.i.wd == resolv_conf_descr))) - { -- pthread_mutex_trylock (&dbs[dbcnt].prune_lock); -+ if (dbcnt == hstdb -+ && inev.i.wd == resolv_conf_descr) -+ res_init (); -+ -+ pthread_mutex_lock (&dbs[dbcnt].prune_lock); - dbs[dbcnt].clear_cache = 1; - pthread_mutex_unlock (&dbs[dbcnt].prune_lock); - pthread_cond_signal (&dbs[dbcnt].prune_cond); -+ -+ done[dbcnt] = true; - break; - } - } Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- glibc.spec 13 Jun 2008 17:15:01 -0000 1.361 +++ glibc.spec 3 Jul 2008 13:13:57 -0000 1.362 @@ -1,6 +1,6 @@ -%define glibcdate 20080613T1601 +%define glibcdate 20080703T1203 %define glibcname glibc -%define glibcsrcdir glibc-20080613T1601 +%define glibcsrcdir glibc-20080703T1203 %define glibc_release_tarballs 0 %define run_glibc_tests 1 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.8.90 -Release: 7 +Release: 8 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -980,6 +980,11 @@ %endif %changelog +* Thu Jul 3 2008 Jakub Jelinek 2.8.90-8 +- update from trunk + - watch even resolv.conf in nscd using inotify + - some nscd fixes + * Fri Jun 13 2008 Jakub Jelinek 2.8.90-7 - update from trunk - avoid *lround* on ppc* clobbering cr3/cr4 registers (#450790) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- sources 13 Jun 2008 17:15:01 -0000 1.272 +++ sources 3 Jul 2008 13:13:57 -0000 1.273 @@ -1,2 +1,2 @@ -d23b4641cc3075ed31a5e8b78ff47fc5 glibc-20080613T1601.tar.bz2 -347dbe3afa3cfb62f67b8175c0e432ab glibc-fedora-20080613T1601.tar.bz2 +9f3ff93d08bb5033e52a93827973d4a7 glibc-20080703T1203.tar.bz2 +511fe3f130a1a6148835a9a0ff343930 glibc-fedora-20080703T1203.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 13:17:23 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 3 Jul 2008 13:17:23 GMT Subject: rpms/digikam/devel .cvsignore, 1.20, 1.21 digikam.spec, 1.55, 1.56 sources, 1.20, 1.21 Message-ID: <200807031317.m63DHNkS026196@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26121 Modified Files: .cvsignore digikam.spec sources Log Message: * Thu Jul 03 2008 Rex Dieter - 0.9.4-0.4.rc2 - digikam-0.9.4-rc2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 18 Jun 2008 12:51:03 -0000 1.20 +++ .cvsignore 3 Jul 2008 13:16:26 -0000 1.21 @@ -1 +1 @@ -digikam-0.9.4-rc1.tar.bz2 +digikam-0.9.4-rc2.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- digikam.spec 18 Jun 2008 12:51:03 -0000 1.55 +++ digikam.spec 3 Jul 2008 13:16:26 -0000 1.56 @@ -1,14 +1,15 @@ -%define beta rc1 +%define beta rc2 Name: digikam Version: 0.9.4 -Release: 0.3.%{beta}%{?dist} +Release: 0.4.%{beta}%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia License: GPLv2+ URL: http://www.digikam.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2 +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2 +Source0: http://digikam3rdparty.free.fr/0.9.x-releases/digikam-0.9.4-rc2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -140,6 +141,9 @@ %changelog +* Thu Jul 03 2008 Rex Dieter - 0.9.4-0.4.rc2 +- digikam-0.9.4-rc2 + * Wed Jun 18 2008 Rex Dieter - 0.9.4-0.3.rc1 - digikam-0.9.4-rc1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 18 Jun 2008 12:51:03 -0000 1.20 +++ sources 3 Jul 2008 13:16:26 -0000 1.21 @@ -1 +1 @@ -a4b6e618acd5d6cdcd3b8e594cd63f7b digikam-0.9.4-rc1.tar.bz2 +9419240f6b6ff869d56e6993da88ed7d digikam-0.9.4-rc2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 13:30:57 2008 From: fedora-extras-commits at redhat.com (James Bowes (jbowes)) Date: Thu, 3 Jul 2008 13:30:57 GMT Subject: rpms/mod_wsgi/EL-5 mod_wsgi.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200807031330.m63DUvRu026594@cvs-int.fedora.redhat.com> Author: jbowes Update of /cvs/pkgs/rpms/mod_wsgi/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26546 Modified Files: mod_wsgi.spec sources Log Message: update to 2.1 Index: mod_wsgi.spec =================================================================== RCS file: /cvs/pkgs/rpms/mod_wsgi/EL-5/mod_wsgi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_wsgi.spec 16 Jun 2008 23:24:31 -0000 1.4 +++ mod_wsgi.spec 3 Jul 2008 13:30:11 -0000 1.5 @@ -1,6 +1,6 @@ Name: mod_wsgi -Version: 1.3 -Release: 3%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: A WSGI interface for Python web applications in Apache Group: System Environment/Libraries @@ -53,9 +53,15 @@ %changelog -* Mon Jun 16 2008 Ricky Zhou 1.3-3 +* Wed Jul 02 2008 James Bowes 2.1-1 +- Update to 2.1 + +* Mon Jun 16 2008 Ricky Zhou 1.3-4 - Build against the shared python lib. +* Tue Feb 19 2008 Fedora Release Engineering - 1.3-3 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 James Bowes 1.3-2 - Require httpd Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mod_wsgi/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2008 23:58:21 -0000 1.3 +++ sources 3 Jul 2008 13:30:11 -0000 1.4 @@ -1 +1 @@ -7dc5e45f7332fde54fb1c5b71616e4a2 mod_wsgi-1.3.tar.gz +4e0e8b5a13e0be2fc5b038f1e3e826a2 mod_wsgi-2.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 13:32:57 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 3 Jul 2008 13:32:57 GMT Subject: rpms/openoffice.org/devel workspace.ab55.patch, NONE, 1.1 openoffice.org.spec, 1.1550, 1.1551 Message-ID: <200807031332.m63DWvwk026749@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26721 Modified Files: openoffice.org.spec Added Files: workspace.ab55.patch Log Message: lucene required to build now workspace.ab55.patch: --- NEW FILE workspace.ab55.patch --- Index: tools/config_office/configure.in diff -u tools/config_office/configure.in:1.272 tools/config_office/configure.in:1.272.2.1 --- tools/config_office/configure.in:1.272 Tue Jun 24 04:59:33 2008 +++ tools/config_office/configure.in Wed Jul 2 05:57:03 2008 @@ -339,6 +339,13 @@ AC_ARG_WITH(system-db, [ --with-system-db Use berkeley db already on system ],,) +AC_ARG_WITH(system-lucene, +[ --with-system-lucene Use lucene already on system +],,) +AC_ARG_WITH(lucene-core-jar, +[ --with-lucene-core-jar=JARFILE Specify path to jarfile manually ], +[ LUCENE_CORE_JAR="$withval" +]) AC_ARG_WITH(system-hsqldb, [ --with-system-hsqldb Use hsqldb already on system ],,) @@ -3660,6 +3667,27 @@ AC_SUBST(DB_JAR) dnl =================================================================== +dnl Check for system lucene +dnl =================================================================== +AC_MSG_CHECKING([which lucene to use]) +if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ + test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_LUCENE=YES + if test -z $LUCENE_CORE_JAR; then + LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar + fi + AC_CHECK_FILE($LUCENE_CORE_JAR, [], + [AC_MSG_ERROR(lucene-core.jar not found.)], []) +else + AC_MSG_RESULT([internal]) + SYSTEM_LUCENE=NO + BUILD_TYPE="$BUILD_TYPE LUCENE" +fi +AC_SUBST(SYSTEM_LUCENE) +AC_SUBST(LUCENE_CORE_JAR) + +dnl =================================================================== dnl Check for system hsqldb dnl =================================================================== AC_MSG_CHECKING([which hsqldb to use]) Index: tools/config_office/set_soenv.in diff -u tools/config_office/set_soenv.in:1.190 tools/config_office/set_soenv.in:1.190.8.1 --- tools/config_office/set_soenv.in:1.190 Fri Jun 13 07:11:11 2008 +++ tools/config_office/set_soenv.in Wed Jul 2 05:57:05 2008 @@ -1969,6 +1969,8 @@ ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" ); ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" ); +ToFile( "SYSTEM_LUCENE", "@SYSTEM_LUCENE@", "e" ); +ToFile( "LUCENE_CORE_JAR", "@LUCENE_CORE_JAR@", "e" ); ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" ); ToFile( "BSH_JAR", "@BSH_JAR@", "e" ); ToFile( "SYSTEM_XML_APIS", "@SYSTEM_XML_APIS@", "e" ); Index: tools/solenv/config/sdev300.ini diff -u tools/solenv/config/sdev300.ini:1.35 tools/solenv/config/sdev300.ini:1.35.4.1 --- tools/solenv/config/sdev300.ini:1.35 Thu Jun 26 04:21:33 2008 +++ tools/solenv/config/sdev300.ini Wed Jul 2 06:35:03 2008 @@ -91,7 +91,7 @@ { BIG_SVX TRUE BMP_WRITES_FLAG TRUE - BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF + BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE RES_ENUS TRUE RES_GER TRUE NO_REC_RES TRUE Index: documentation/helpcontent2/settings.pmk diff -u documentation/helpcontent2/settings.pmk:1.10 documentation/helpcontent2/settings.pmk:1.10.2.1 --- documentation/helpcontent2/settings.pmk:1.10 Tue Jun 24 09:16:09 2008 +++ documentation/helpcontent2/settings.pmk Wed Jul 2 05:48:08 2008 @@ -1,6 +1,11 @@ .INCLUDE : $(INCCOM)$/aux_langs.mk -my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar +my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$ +.IF "$(SYSTEM_LUCENE)" == "YES" +my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR) +.ELSE +my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar +.ENDIF .IF "$(SYSTEM_DB)" != "YES" JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) Index: installation/scp2/source/ooo/file_ooo.scp diff -u installation/scp2/source/ooo/file_ooo.scp:1.249 installation/scp2/source/ooo/file_ooo.scp:1.249.2.1 --- installation/scp2/source/ooo/file_ooo.scp:1.249 Tue Jun 24 09:25:44 2008 +++ installation/scp2/source/ooo/file_ooo.scp Wed Jul 2 06:01:45 2008 @@ -476,8 +476,10 @@ #endif #ifdef SOLAR_JAVA +#ifndef SYSTEM_LUCENE STD_JAR_FILE( gid_File_Jar_Lucene, lucene-core-2.3 ) #endif +#endif #ifdef SOLAR_JAVA UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) Index: installation/scp2/source/ooo/makefile.mk diff -u installation/scp2/source/ooo/makefile.mk:1.69 installation/scp2/source/ooo/makefile.mk:1.69.50.1 --- installation/scp2/source/ooo/makefile.mk:1.69 Mon Jun 9 05:51:56 2008 +++ installation/scp2/source/ooo/makefile.mk Wed Jul 2 06:01:46 2008 @@ -179,6 +179,10 @@ SCPDEFS+=-DENABLE_CAIRO .ENDIF +.IF "$(SYSTEM_LUCENE)" == "YES" +SCPDEFS+=-DSYSTEM_LUCENE +.ENDIF + .IF "$(SYSTEM_ICU)" == "YES" SCPDEFS+=-DSYSTEM_ICU .ELSE Index: util/xmlhelp/prj/build.lst diff -u util/xmlhelp/prj/build.lst:1.17 util/xmlhelp/prj/build.lst:1.17.2.1 --- util/xmlhelp/prj/build.lst:1.17 Tue Jun 24 09:17:30 2008 +++ util/xmlhelp/prj/build.lst Wed Jul 2 06:12:01 2008 @@ -1,4 +1,4 @@ -xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene NULL +xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene NULL xh xmlhelp usr1 - all xh_mkout NULL xh xmlhelp\inc nmake - all xh_inc NULL xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL Index: util/xmlhelp/source/com/sun/star/help/makefile.mk diff -u util/xmlhelp/source/com/sun/star/help/makefile.mk:1.36 util/xmlhelp/source/com/sun/star/help/makefile.mk:1.36.2.1 --- util/xmlhelp/source/com/sun/star/help/makefile.mk:1.36 Tue Jun 24 09:19:16 2008 +++ util/xmlhelp/source/com/sun/star/help/makefile.mk Wed Jul 2 06:12:02 2008 @@ -100,7 +100,12 @@ $(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class -JARFILES = lucene-core-2.3.jar ridl.jar jurt.jar unoil.jar juh.jar +JARFILES = ridl.jar jurt.jar unoil.jar juh.jar +.IF "$(SYSTEM_LUCENE)" == "YES" +XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR) +.ELSE +JARFILES += lucene-core-2.3.jar +.ENDIF JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) JARTARGET = LuceneHelpWrapper.jar Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1550 retrieving revision 1.1551 diff -u -r1.1550 -r1.1551 --- openoffice.org.spec 2 Jul 2008 14:25:19 -0000 1.1550 +++ openoffice.org.spec 3 Jul 2008 13:32:07 -0000 1.1551 @@ -60,7 +60,7 @@ BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel -BuildRequires: lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh +BuildRequires: lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh, lucene BuildRequires: mesa-libGLU-devel, ant, ant-apache-regexp BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient BuildRequires: jakarta-commons-lang @@ -120,6 +120,7 @@ Patch50: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch Patch51: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch Patch52: workspace.cairo06.patch +Patch53: workspace.ab55.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1265,6 +1266,7 @@ %patch50 -p1 -b .ooo90876.connectivity.evoab2.patch %patch51 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch %patch52 -p1 -b .workspace.cairo06.patch +%patch53 -p1 -b .workspace.ab55.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1282,6 +1284,7 @@ --with-vba-package-format="builtin" --enable-dbus --with-system-libs \ --with-system-headers --with-system-apache-commons \ --with-commons-logging-jar=/usr/share/java/commons-logging.jar \ + --with-lucene-core-jar=/usr/share/java/lucene.jar \ --with-system-mozilla --with-system-libtextcat --with-system-dicts \ --with-dict-path=/usr/share/myspell --without-myspell-dicts \ --without-system-mspack --without-fonts --without-gpc --without-agg \ @@ -3483,6 +3486,7 @@ - drop integrated pseudoworkspace.valgrind1.patch - drop integrated openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch - add workspace.cairo06.patch +- add workspace.ab55.patch - Resolves: rhbz#453487 some font packages now gone * Thu Jun 26 2008 Caolan McNamara - 1:3.0.0-0.20-1 From fedora-extras-commits at redhat.com Thu Jul 3 13:47:47 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 3 Jul 2008 13:47:47 GMT Subject: rpms/kdeutils/devel kdeutils.spec,1.131,1.132 Message-ID: <200807031347.m63Dll2f027780@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27707 Modified Files: kdeutils.spec Log Message: * Thu Jul 03 2008 Rex Dieter 4.0.84-2 - %description: -kedit, -kjots, +kwalletmanager, +superkaramba, +sweeper Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- kdeutils.spec 27 Jun 2008 17:27:27 -0000 1.131 +++ kdeutils.spec 3 Jul 2008 13:46:53 -0000 1.132 @@ -2,7 +2,7 @@ Name: kdeutils Epoch: 6 Version: 4.0.84 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -56,13 +56,14 @@ * kdepasswd (change password) * kdessh (ssh front end) * kdf (view disk usage) - * kedit (simple text editor) * kfloppy (floppy formatting tool) * kgpg (gpg gui) - * kjots (note taker) * ktimer (task scheduler) + * kwalletmanager (kde wallet management Tool) * kwikdisk (removable media utility) - * okteta (binary editor) + * okteta (binary/hex editor) + * superkaramba + * sweeper (clean unwanted traces the user leaves on the system) %package libs Summary: Runtime libraries for %{name} @@ -176,6 +177,9 @@ %changelog +* Thu Jul 03 2008 Rex Dieter 4.0.84-2 +- %%description: -kedit, -kjots, +kwalletmanager, +superkaramba, +sweeper + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 From fedora-extras-commits at redhat.com Thu Jul 3 13:49:46 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Thu, 3 Jul 2008 13:49:46 GMT Subject: rpms/collectd/devel collectd.spec,1.7,1.8 Message-ID: <200807031349.m63Dnk3v027916@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/collectd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27834 Modified Files: collectd.spec Log Message: * Thu Jul 03 2008 Lubomir Rintel 4.4.1-3 - Make this compile with older perl package - Turn dependencies on packages to dependencies on Perl modules - Add default attributes for files Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- collectd.spec 12 Jun 2008 11:11:12 -0000 1.7 +++ collectd.spec 3 Jul 2008 13:48:57 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -14,9 +14,13 @@ BuildRequires: rrdtool-devel BuildRequires: lm_sensors-devel BuildRequires: curl-devel +%if 0%{?fedora} >= 8 BuildRequires: perl-libs, perl-devel -BuildRequires: perl-ExtUtils-MakeMaker -BuildRequires: perl-ExtUtils-Embed +%else +BuildRequires: perl-libs, perl-devel +%endif +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::Embed) BuildRequires: net-snmp-devel BuildRequires: libpcap-devel BuildRequires: mysql-devel @@ -258,37 +262,44 @@ %files apache +%defattr(-, root, root, -) %{_libdir}/collectd/apache.so* %config(noreplace) %{_sysconfdir}/collectd.d/apache.conf %files dns +%defattr(-, root, root, -) %{_libdir}/collectd/dns.so* %config(noreplace) %{_sysconfdir}/collectd.d/dns.conf %files email +%defattr(-, root, root, -) %{_libdir}/collectd/email.so* %config(noreplace) %{_sysconfdir}/collectd.d/email.conf %doc %{_mandir}/man5/collectd-email.5* %files ipmi +%defattr(-, root, root, -) %{_libdir}/collectd/ipmi.so* %config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf %files mysql +%defattr(-, root, root, -) %{_libdir}/collectd/mysql.so* %config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf %files nginx +%defattr(-, root, root, -) %{_libdir}/collectd/nginx.so* %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf %files -n perl-Collectd +%defattr(-, root, root, -) %doc perl-examples/* %{_libdir}/collectd/perl.so* %{perl_vendorlib}/Collectd.pm @@ -299,27 +310,36 @@ %files rrdtool +%defattr(-, root, root, -) %{_libdir}/collectd/rrdtool.so* %config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf %files sensors +%defattr(-, root, root, -) %{_libdir}/collectd/sensors.so* %config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf %files snmp +%defattr(-, root, root, -) %{_libdir}/collectd/snmp.so* %config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf %doc %{_mandir}/man5/collectd-snmp.5* %files virt +%defattr(-, root, root, -) %{_libdir}/collectd/libvirt.so* %config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf %changelog +* Thu Jul 03 2008 Lubomir Rintel 4.4.1-3 +- Make this compile with older perl package +- Turn dependencies on packages to dependencies on Perl modules +- Add default attributes for files + * Wed Jun 12 2008 Alan Pevec 4.4.1-2 - Split rrdtool into a subpackage (Chris Lalancette) - cleanup subpackages, split dns plugin, enable ipmi From fedora-extras-commits at redhat.com Thu Jul 3 14:01:02 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Thu, 3 Jul 2008 14:01:02 GMT Subject: rpms/collectd/devel collectd.spec,1.8,1.9 Message-ID: <200807031401.m63E12Wf029576@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/collectd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28504 Modified Files: collectd.spec Log Message: * Thu Jul 03 2008 Lubomir Rintel 4.4.1-4 - Fix a typo introduced by previous change that prevented building in el5 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- collectd.spec 3 Jul 2008 13:48:57 -0000 1.8 +++ collectd.spec 3 Jul 2008 14:00:07 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -17,7 +17,7 @@ %if 0%{?fedora} >= 8 BuildRequires: perl-libs, perl-devel %else -BuildRequires: perl-libs, perl-devel +BuildRequires: perl %endif BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::Embed) @@ -335,6 +335,9 @@ %changelog +* Thu Jul 03 2008 Lubomir Rintel 4.4.1-4 +- Fix a typo introduced by previous change that prevented building in el5 + * Thu Jul 03 2008 Lubomir Rintel 4.4.1-3 - Make this compile with older perl package - Turn dependencies on packages to dependencies on Perl modules From fedora-extras-commits at redhat.com Thu Jul 3 14:29:39 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Thu, 3 Jul 2008 14:29:39 GMT Subject: rpms/iproute/devel iproute2-2.6.25-xfrmsegfault.patch, NONE, 1.1 iproute.spec, 1.82, 1.83 iproute2-2.6.25-aead.patch, 1.1, 1.2 Message-ID: <200807031429.m63ETdpT004752@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/iproute/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4685 Modified Files: iproute.spec iproute2-2.6.25-aead.patch Added Files: iproute2-2.6.25-xfrmsegfault.patch Log Message: * Thu Jul 3 2008 Marcela Maslanova - 2.6.25-3 - 49933 fix segfault after non-existent combination of commands iproute2-2.6.25-xfrmsegfault.patch: --- NEW FILE iproute2-2.6.25-xfrmsegfault.patch --- diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c --- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava 2008-07-03 16:00:13.000000000 +0200 +++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-07-03 16:08:43.000000000 +0200 @@ -162,7 +162,8 @@ static int xfrm_algo_parse(struct xfrm_a if (len > 0) { if (len > max) invarg("\"ALGOKEY\" makes buffer overflow\n", key); - + else + invarg("\"ALGOKEY\" is invalid", key); strncpy(buf, key, len); } } Index: iproute.spec =================================================================== RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- iproute.spec 29 Apr 2008 11:01:05 -0000 1.82 +++ iproute.spec 3 Jul 2008 14:28:50 -0000 1.83 @@ -4,7 +4,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 2.6.25 -Release: 1%{?dist} +Release: 3%{?dist} Group: Applications/System Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 #Source1: iproute-doc-2.6.22.tar.gz @@ -16,6 +16,7 @@ Patch5: iproute2-movelib.patch Patch6: iproute2-tex.patch Patch7: iproute2-2.6.25-aead.patch +Patch8: iproute2-2.6.25-xfrmsegfault.patch License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,12 +32,13 @@ %setup -q -c iproute-%{version} %patch1 -p1 -b .kernel %patch2 -p1 -b .opt_flags -%patch3 -p1 -b .ip_resolve +#%patch3 -p1 -b .ip_resolve %patch4 -p1 %patch5 -p1 -b .movelib #remove tex for the while #%patch6 -p1 -b .wotex %patch7 -p1 -b .aead +%patch8 -p1 -b .seg %build export LIBDIR=%{_libdir} @@ -112,6 +114,12 @@ %config(noreplace) %{_sysconfdir}/sysconfig/cbq/* %changelog +* Thu Jul 3 2008 Marcela Maslanova - 2.6.25-3 +- 49933 fix segfault after non-existent combination of commands + +* Wed May 14 2008 Marcela Maslanova - 2.6.25-2 +- allow replay setting, solve also 444724 + * Mon Apr 21 2008 Marcela Maslanova - 2.6.25-1 - update - remove patch for backward compatibility iproute2-2.6.25-aead.patch: Index: iproute2-2.6.25-aead.patch =================================================================== RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.25-aead.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iproute2-2.6.25-aead.patch 29 Apr 2008 11:01:05 -0000 1.1 +++ iproute2-2.6.25-aead.patch 3 Jul 2008 14:28:50 -0000 1.2 @@ -1,15 +1,6 @@ diff -up iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h.aead iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h --- iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h.aead 2008-04-17 19:12:54.000000000 +0200 +++ iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h 2008-04-22 08:38:15.000000000 +0200 -@@ -277,7 +277,7 @@ enum xfrm_attr_type_t { - XFRMA_LASTUSED, - XFRMA_POLICY_TYPE, /* struct xfrm_userpolicy_type */ - XFRMA_MIGRATE, -- XFRMA_ALG_AEAD, /* struct xfrm_algo_aead */ -+ XFRMA_ALG_AEAD, /* struct xfrm_algo_aead */ - __XFRMA_MAX - - #define XFRMA_MAX (__XFRMA_MAX - 1) @@ -426,12 +426,14 @@ struct xfrm_user_migrate { __u16 new_family; }; From fedora-extras-commits at redhat.com Thu Jul 3 14:36:01 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Thu, 3 Jul 2008 14:36:01 GMT Subject: rpms/subtitleeditor/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 subtitleeditor.spec, 1.2, 1.3 Message-ID: <200807031436.m63Ea1kN005048@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/subtitleeditor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5015 Modified Files: .cvsignore sources subtitleeditor.spec Log Message: * Thu Jul 03 2008 Martin Sourada - 0.21.3-1 - New upstream release - Add option -f --file for open a file - Add MimeType in desktop file. - Update Czech translation - Fix: Play/Pause button - Fix: #10494 (upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jun 2008 21:44:10 -0000 1.3 +++ .cvsignore 3 Jul 2008 14:35:14 -0000 1.4 @@ -1 +1 @@ -subtitleeditor-0.21.2.tar.gz +subtitleeditor-0.21.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jun 2008 21:44:10 -0000 1.3 +++ sources 3 Jul 2008 14:35:14 -0000 1.4 @@ -1 +1 @@ -7d807ed437b28c8ffe89b9227ab7a28a subtitleeditor-0.21.2.tar.gz +63aa3f1835bacbf1de8bacf90a5bc893 subtitleeditor-0.21.3.tar.gz Index: subtitleeditor.spec =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/devel/subtitleeditor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- subtitleeditor.spec 19 Jun 2008 21:44:10 -0000 1.2 +++ subtitleeditor.spec 3 Jul 2008 14:35:14 -0000 1.3 @@ -1,5 +1,5 @@ Name: subtitleeditor -Version: 0.21.2 +Version: 0.21.3 Release: 1%{?dist} Summary: GTK+2 tool to edit subtitles for GNU/Linux/*BSD @@ -81,6 +81,14 @@ %{_datadir}/man/man1/%{name}.1.gz %changelog +* Thu Jul 03 2008 Martin Sourada - 0.21.3-1 +- New upstream release + - Add option -f --file for open a file + - Add MimeType in desktop file. + - Update Czech translation + - Fix: Play/Pause button + - Fix: #10494 (upstream) + * Thu Jun 19 2008 Martin Sourada - 0.21.2-1 - New upstream release From fedora-extras-commits at redhat.com Thu Jul 3 14:46:57 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 3 Jul 2008 14:46:57 GMT Subject: rpms/evolution-data-server/devel evolution-data-server-2.23.4-fix-attachment-saving.patch, NONE, 1.1 evolution-data-server.spec, 1.219, 1.220 Message-ID: <200807031446.m63Ekvrr005726@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5652 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-2.23.4-fix-attachment-saving.patch Log Message: * Thu Jul 03 2008 Matthew Barnes - 3.23.4-2.fc10 - Add patch for GNOME bug #534080 (fix attachment saving). evolution-data-server-2.23.4-fix-attachment-saving.patch: --- NEW FILE evolution-data-server-2.23.4-fix-attachment-saving.patch --- diff -up evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving evolution-data-server-2.23.4/camel/camel-stream-vfs.c --- evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving 2008-06-15 23:18:01.000000000 -0400 +++ evolution-data-server-2.23.4/camel/camel-stream-vfs.c 2008-07-03 07:15:10.000000000 -0400 @@ -211,20 +211,20 @@ stream_read (CamelStream *stream, char * static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n) { - gssize nwritten; + gboolean success; + gsize bytes_written; GError *error = NULL; CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (stream); g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream_vfs->stream), 0); - nwritten = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, NULL, NULL, &error); + success = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, &bytes_written, NULL, &error); if (error) { g_warning ("%s", error->message); g_error_free (error); } - - return nwritten; + return success ? bytes_written : -1; } static int Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- evolution-data-server.spec 16 Jun 2008 17:41:48 -0000 1.219 +++ evolution-data-server.spec 3 Jul 2008 14:46:10 -0000 1.220 @@ -28,7 +28,7 @@ Name: evolution-data-server Version: 2.23.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -50,6 +50,9 @@ # RH bug #243296 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch +# RH bug #534080 +Patch14: evolution-data-server-2.23.4-fix-attachment-saving.patch + ### Build Dependencies ### BuildRequires: GConf2-devel @@ -126,6 +129,7 @@ %patch11 -p1 -b .fix-ldap-query %patch12 -p1 -b .camel-folder-summary-crash %patch13 -p1 -b .fix-64bit-acinclude +%patch14 -p1 -b .fix-attachment-saving mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -372,6 +376,9 @@ %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Thu Jul 03 2008 Matthew Barnes - 3.23.4-2.fc10 +- Add patch for GNOME bug #534080 (fix attachment saving). + * Mon Jun 16 2008 Matthew Barnes - 3.23.4-1.fc10 - Update to 2.23.4 From fedora-extras-commits at redhat.com Thu Jul 3 14:50:24 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 3 Jul 2008 14:50:24 GMT Subject: rpms/em8300-kmod/F-8 em8300-kmod.spec,1.57,1.58 Message-ID: <200807031450.m63EoOs6005947@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/em8300-kmod/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5923 Modified Files: em8300-kmod.spec Log Message: * Thu Jul 3 2008 Ville Skytt?? - Rebuild for kernel 2.6.25.9-40.fc8. Index: em8300-kmod.spec =================================================================== RCS file: /cvs/pkgs/rpms/em8300-kmod/F-8/em8300-kmod.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- em8300-kmod.spec 21 Jun 2008 07:01:01 -0000 1.57 +++ em8300-kmod.spec 3 Jul 2008 14:49:54 -0000 1.58 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.25.6-27.fc8} +%{!?kversion: %define kversion 2.6.25.9-40.fc8} %define kmod_name em8300 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -83,6 +83,9 @@ %changelog +* Thu Jul 3 2008 Ville Skytt?? +- Rebuild for kernel 2.6.25.9-40.fc8. + * Sat Jun 21 2008 Ville Skytt?? - Rebuild for kernel 2.6.25.6-27.fc8. From fedora-extras-commits at redhat.com Thu Jul 3 14:58:12 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 3 Jul 2008 14:58:12 GMT Subject: rpms/glib2/devel gio-2.16-only-pass-uri-to-gio-apps.patch,1.1,1.2 Message-ID: <200807031458.m63EwCdW006561@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6457 Modified Files: gio-2.16-only-pass-uri-to-gio-apps.patch Log Message: fix patch gio-2.16-only-pass-uri-to-gio-apps.patch: Index: gio-2.16-only-pass-uri-to-gio-apps.patch =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/gio-2.16-only-pass-uri-to-gio-apps.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gio-2.16-only-pass-uri-to-gio-apps.patch 17 Apr 2008 23:49:13 -0000 1.1 +++ gio-2.16-only-pass-uri-to-gio-apps.patch 3 Jul 2008 14:57:14 -0000 1.2 @@ -1,14 +1,13 @@ -Index: gio/gdesktopappinfo.c -=================================================================== ---- gio/gdesktopappinfo.c (revision 6851) -+++ gio/gdesktopappinfo.c (working copy) +diff -up glib-2.17.3/gio/gdesktopappinfo.c.only-pass-uri-to-gio-apps glib-2.17.3/gio/gdesktopappinfo.c +--- glib-2.17.3/gio/gdesktopappinfo.c.only-pass-uri-to-gio-apps 2008-07-02 17:13:13.000000000 -0400 ++++ glib-2.17.3/gio/gdesktopappinfo.c 2008-07-03 10:55:58.000000000 -0400 @@ -1,3 +1,5 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ + /* GIO - GLib Input, Output and Streaming Library * * Copyright (C) 2006-2007 Red Hat, Inc. -@@ -87,6 +89,7 @@ +@@ -89,6 +91,7 @@ struct _GDesktopAppInfo char *exec; char *binary; char *path; @@ -16,7 +15,7 @@ guint nodisplay : 1; guint hidden : 1; -@@ -149,6 +152,7 @@ +@@ -151,6 +154,7 @@ g_desktop_app_info_finalize (GObject *ob g_free (info->try_exec); g_free (info->exec); g_free (info->binary); @@ -24,15 +23,15 @@ g_free (info->path); G_OBJECT_CLASS (g_desktop_app_info_parent_class)->finalize (object); -@@ -264,6 +268,7 @@ +@@ -254,6 +258,7 @@ g_desktop_app_info_new_from_keyfile (GKe info->terminal = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TERMINAL, NULL) != FALSE; info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE; info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE; + info->vfs_system = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-Gnome-Vfs-System", NULL); - - g_key_file_free (key_file); -@@ -498,9 +503,35 @@ + info->icon = NULL; + if (info->icon_name) +@@ -517,9 +522,35 @@ expand_macro (char macro, { GList *uris = *uri_list; char *expanded; @@ -70,7 +69,7 @@ switch (macro) { case 'u': -@@ -509,7 +540,17 @@ +@@ -528,7 +559,17 @@ expand_macro (char macro, case 'n': if (uris) { @@ -89,7 +88,7 @@ if (expanded) { g_string_append (exec, expanded); -@@ -526,7 +567,17 @@ +@@ -545,7 +586,17 @@ expand_macro (char macro, case 'N': while (uris) { From fedora-extras-commits at redhat.com Thu Jul 3 14:59:18 2008 From: fedora-extras-commits at redhat.com (Guillaume Desmottes (gdesmott)) Date: Thu, 3 Jul 2008 14:59:18 GMT Subject: rpms/telepathy-stream-engine/F-9 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 telepathy-stream-engine.spec, 1.10, 1.11 Message-ID: <200807031459.m63ExIa7006712@cvs-int.fedora.redhat.com> Author: gdesmott Update of /cvs/pkgs/rpms/telepathy-stream-engine/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6588 Modified Files: .cvsignore sources telepathy-stream-engine.spec Log Message: Update to 0.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 May 2008 00:51:32 -0000 1.7 +++ .cvsignore 3 Jul 2008 14:58:29 -0000 1.8 @@ -1 +1 @@ -telepathy-stream-engine-0.5.2.tar.gz +telepathy-stream-engine-0.5.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 May 2008 00:51:32 -0000 1.7 +++ sources 3 Jul 2008 14:58:29 -0000 1.8 @@ -1 +1 @@ -5d77949682739728257c985f90dcfe34 telepathy-stream-engine-0.5.2.tar.gz +3dd96588590204d008d2421f7186f85c telepathy-stream-engine-0.5.3.tar.gz Index: telepathy-stream-engine.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/F-9/telepathy-stream-engine.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- telepathy-stream-engine.spec 2 May 2008 00:51:32 -0000 1.10 +++ telepathy-stream-engine.spec 3 Jul 2008 14:58:29 -0000 1.11 @@ -1,5 +1,5 @@ Name: telepathy-stream-engine -Version: 0.5.2 +Version: 0.5.3 Release: 1%{?dist} Summary: Telepathy client to handle media streaming @@ -49,6 +49,9 @@ %changelog +* Thu Jul 3 2008 Guillaume Desmottes - 0.5.3-1 +- Update to 0.5.3 + * Tue Apr 22 2008 Brian Pepple - 0.5.2-1 - Update to 0.5.2. From fedora-extras-commits at redhat.com Thu Jul 3 15:08:17 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Thu, 3 Jul 2008 15:08:17 GMT Subject: rpms/subtitleeditor/F-9 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 subtitleeditor.spec, 1.2, 1.3 Message-ID: <200807031508.m63F8Huh014031@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/subtitleeditor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13997 Modified Files: .cvsignore sources subtitleeditor.spec Log Message: * Thu Jul 03 2008 Martin Sourada - 0.21.3-1 - New upstream release - Add option -f --file for open a file - Add MimeType in desktop file. - Update Czech translation - Fix: Play/Pause button - Fix: #10494 (upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jun 2008 21:43:50 -0000 1.3 +++ .cvsignore 3 Jul 2008 15:07:12 -0000 1.4 @@ -1 +1 @@ -subtitleeditor-0.21.2.tar.gz +subtitleeditor-0.21.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jun 2008 21:43:50 -0000 1.3 +++ sources 3 Jul 2008 15:07:12 -0000 1.4 @@ -1 +1 @@ -7d807ed437b28c8ffe89b9227ab7a28a subtitleeditor-0.21.2.tar.gz +63aa3f1835bacbf1de8bacf90a5bc893 subtitleeditor-0.21.3.tar.gz Index: subtitleeditor.spec =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/F-9/subtitleeditor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- subtitleeditor.spec 19 Jun 2008 21:43:50 -0000 1.2 +++ subtitleeditor.spec 3 Jul 2008 15:07:12 -0000 1.3 @@ -1,5 +1,5 @@ Name: subtitleeditor -Version: 0.21.2 +Version: 0.21.3 Release: 1%{?dist} Summary: GTK+2 tool to edit subtitles for GNU/Linux/*BSD @@ -81,6 +81,14 @@ %{_datadir}/man/man1/%{name}.1.gz %changelog +* Thu Jul 03 2008 Martin Sourada - 0.21.3-1 +- New upstream release + - Add option -f --file for open a file + - Add MimeType in desktop file. + - Update Czech translation + - Fix: Play/Pause button + - Fix: #10494 (upstream) + * Thu Jun 19 2008 Martin Sourada - 0.21.2-1 - New upstream release From fedora-extras-commits at redhat.com Thu Jul 3 15:09:22 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Thu, 3 Jul 2008 15:09:22 GMT Subject: rpms/subtitleeditor/F-8 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 subtitleeditor.spec, 1.2, 1.3 Message-ID: <200807031509.m63F9MxO014068@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/subtitleeditor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039 Modified Files: .cvsignore sources subtitleeditor.spec Log Message: * Thu Jul 03 2008 Martin Sourada - 0.21.3-1 - New upstream release - Add option -f --file for open a file - Add MimeType in desktop file. - Update Czech translation - Fix: Play/Pause button - Fix: #10494 (upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jun 2008 21:43:33 -0000 1.3 +++ .cvsignore 3 Jul 2008 15:08:36 -0000 1.4 @@ -1 +1 @@ -subtitleeditor-0.21.2.tar.gz +subtitleeditor-0.21.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jun 2008 21:43:33 -0000 1.3 +++ sources 3 Jul 2008 15:08:36 -0000 1.4 @@ -1 +1 @@ -7d807ed437b28c8ffe89b9227ab7a28a subtitleeditor-0.21.2.tar.gz +63aa3f1835bacbf1de8bacf90a5bc893 subtitleeditor-0.21.3.tar.gz Index: subtitleeditor.spec =================================================================== RCS file: /cvs/extras/rpms/subtitleeditor/F-8/subtitleeditor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- subtitleeditor.spec 19 Jun 2008 21:43:33 -0000 1.2 +++ subtitleeditor.spec 3 Jul 2008 15:08:36 -0000 1.3 @@ -1,5 +1,5 @@ Name: subtitleeditor -Version: 0.21.2 +Version: 0.21.3 Release: 1%{?dist} Summary: GTK+2 tool to edit subtitles for GNU/Linux/*BSD @@ -81,6 +81,14 @@ %{_datadir}/man/man1/%{name}.1.gz %changelog +* Thu Jul 03 2008 Martin Sourada - 0.21.3-1 +- New upstream release + - Add option -f --file for open a file + - Add MimeType in desktop file. + - Update Czech translation + - Fix: Play/Pause button + - Fix: #10494 (upstream) + * Thu Jun 19 2008 Martin Sourada - 0.21.2-1 - New upstream release From fedora-extras-commits at redhat.com Thu Jul 3 15:15:24 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 3 Jul 2008 15:15:24 GMT Subject: rpms/nfs-utils/F-9 nfs-utils.spec,1.173,1.174 Message-ID: <200807031515.m63FFOnD014367@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14297 Modified Files: nfs-utils.spec Log Message: added the creation of /var/lib/nfs/statd/sm.bak for lock recovery Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- nfs-utils.spec 2 Jul 2008 23:48:54 -0000 1.173 +++ nfs-utils.spec 3 Jul 2008 15:14:52 -0000 1.174 @@ -60,14 +60,14 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep Requires: modutils >= 2.4.26-9 -BuildRequires: libgssglue-devel libevent-devel >= 1.3b +BuildRequires: libgssglue-devel libevent-devel BuildRequires: nfs-utils-lib-devel >= 1.1.0-3 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 BuildRequires: automake, libtool, glibc-headers BuildRequires: e2fsprogs-devel, krb5-devel, tcp_wrappers-devel Requires(pre): shadow-utils >= 4.0.3-25 Requires(pre): /sbin/chkconfig /sbin/nologin -Requires: nfs-utils-lib >= 1.1.0-3 libgssglue libevent >= 1.3b +Requires: nfs-utils-lib >= 1.1.0-3 libgssglue libevent %description The nfs-utils package provides a daemon for the kernel NFS server and @@ -142,6 +142,7 @@ mv $RPM_BUILD_ROOT/usr/sbin/rpc.statd $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm +mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm.bak mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery %clean @@ -227,6 +228,7 @@ %dir /var/lib/nfs %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm +%dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm.bak %config(noreplace) /var/lib/nfs/xtab %config(noreplace) /var/lib/nfs/etab %config(noreplace) /var/lib/nfs/rmtab From fedora-extras-commits at redhat.com Thu Jul 3 15:19:04 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Thu, 3 Jul 2008 15:19:04 GMT Subject: rpms/gnome-sharp/devel gnome-sharp-2.20.0-libdir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gnome-sharp-libdir.patch, 1.2, 1.3 gnome-sharp.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200807031519.m63FJ4Ls014634@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gnome-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14520 Modified Files: .cvsignore gnome-sharp-libdir.patch gnome-sharp.spec sources Added Files: gnome-sharp-2.20.0-libdir.patch Log Message: update release gnome-sharp-2.20.0-libdir.patch: --- NEW FILE gnome-sharp-2.20.0-libdir.patch --- diff -up gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in --- gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in.libdir 2008-07-03 15:07:22.000000000 +0200 +++ gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in 2008-07-03 15:08:05.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${libdir} Name: GConf# diff -up gnome-sharp-2.20.0/gconf/tools/Makefile.am.libdir gnome-sharp-2.20.0/gconf/tools/Makefile.am --- gnome-sharp-2.20.0/gconf/tools/Makefile.am.libdir 2008-07-03 16:16:08.000000000 +0200 +++ gnome-sharp-2.20.0/gconf/tools/Makefile.am 2008-07-03 16:16:20.000000000 +0200 @@ -1,4 +1,4 @@ -assemblydir = $(prefix)/lib/gtk-sharp-2.0 +assemblydir = ${libdir}/gtk-sharp-2.0 assembly_DATA = gconfsharp-schemagen.exe bin_SCRIPTS = gconfsharp2-schemagen CLEANFILES = gconfsharp-schemagen.exe diff -up gnome-sharp-2.20.0/gconf/tools/gconfsharp2-schemagen.in.libdir gnome-sharp-2.20.0/gconf/tools/gconfsharp2-schemagen.in --- gnome-sharp-2.20.0/gconf/tools/gconfsharp2-schemagen.in.libdir 2008-07-03 15:56:24.000000000 +0200 +++ gnome-sharp-2.20.0/gconf/tools/gconfsharp2-schemagen.in 2008-07-03 15:56:14.000000000 +0200 @@ -1,2 +1,2 @@ #!/bin/sh - at RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" + at RUNTIME@ ${libdir}/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" diff -up gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in --- gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in.libdir 2008-07-03 15:11:16.000000000 +0200 +++ gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in 2008-07-03 15:11:26.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${libdir} gapidir=${prefix}/share/gapi-2.0 diff -up gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in --- gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in.libdir 2008-07-03 15:10:48.000000000 +0200 +++ gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2008-07-03 15:11:00.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${libdir} gapidir=${prefix}/share/gapi-2.0 diff -up gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in --- gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in.libdir 2008-07-03 15:10:01.000000000 +0200 +++ gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in 2008-07-03 15:10:18.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${libdir} gapidir=${prefix}/share/gapi-2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2008 17:50:45 -0000 1.4 +++ .cvsignore 3 Jul 2008 15:18:15 -0000 1.5 @@ -1 +1 @@ -gnome-sharp-2.16.1.tar.bz2 +gnome-sharp-2.20.0.tar.bz2 gnome-sharp-libdir.patch: Index: gnome-sharp-libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp-libdir.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-sharp-libdir.patch 4 Jun 2008 18:11:37 -0000 1.2 +++ gnome-sharp-libdir.patch 3 Jul 2008 15:18:15 -0000 1.3 @@ -1,6 +1,6 @@ diff -up gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in.libdir gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in ---- gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in.libdir 2008-01-24 15:12:16.000000000 -0500 -+++ gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in 2008-06-04 14:03:55.000000000 -0400 +--- gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in.libdir 2008-01-24 15:12:16.000000000 -0500 ++++ gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in 2008-06-04 14:03:55.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} @@ -10,8 +10,8 @@ diff -up gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in.libdir gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in ---- gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in.libdir 2008-01-24 15:12:19.000000000 -0500 -+++ gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 +--- gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in.libdir 2008-01-24 15:12:19.000000000 -0500 ++++ gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} @@ -21,8 +21,8 @@ Name: GConf# diff -up gnome-sharp-2.16.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in.libdir gnome-sharp-2.16.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in ---- gnome-sharp-2.16.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in.libdir 2008-06-04 14:04:59.000000000 -0400 -+++ gnome-sharp-2.16.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in 2008-06-04 14:05:07.000000000 -0400 +--- gnome-sharp-2.20.0/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in.libdir 2008-06-04 14:04:59.000000000 -0400 ++++ gnome-sharp-2.20.0/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in 2008-06-04 14:05:07.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} @@ -32,16 +32,16 @@ Name: GConf.PropertyEditors# diff -up gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in.libdir gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in ---- gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in.libdir 2008-01-24 15:12:18.000000000 -0500 -+++ gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in 2008-06-04 14:03:56.000000000 -0400 +--- gnome-sharp-2.20.0/gconf/tools/gconfsharp2-schemagen.in.libdir 2008-01-24 15:12:18.000000000 -0500 ++++ gnome-sharp-2.20.0/gconf/tools/gconfsharp2-schemagen.in 2008-06-04 14:03:56.000000000 -0400 @@ -1,2 +1,3 @@ #!/bin/sh - at RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" +d=`monodir` + at RUNTIME@ $d/../gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" diff -up gnome-sharp-2.16.1/gconf/tools/Makefile.am.libdir gnome-sharp-2.16.1/gconf/tools/Makefile.am ---- gnome-sharp-2.16.1/gconf/tools/Makefile.am.libdir 2008-01-24 15:12:18.000000000 -0500 -+++ gnome-sharp-2.16.1/gconf/tools/Makefile.am 2008-06-04 14:03:56.000000000 -0400 +--- gnome-sharp-2.20.0/gconf/tools/Makefile.am.libdir 2008-01-24 15:12:18.000000000 -0500 ++++ gnome-sharp-2.20.0/gconf/tools/Makefile.am 2008-06-04 14:03:56.000000000 -0400 @@ -1,4 +1,4 @@ -assemblydir = $(prefix)/lib/gtk-sharp-2.0 +assemblydir = $(libdir)/gtk-sharp-2.0 @@ -49,8 +49,8 @@ bin_SCRIPTS = gconfsharp2-schemagen CLEANFILES = gconfsharp-schemagen.exe diff -up gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in.libdir gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in ---- gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in.libdir 2008-01-24 15:12:21.000000000 -0500 -+++ gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 +--- gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in.libdir 2008-01-24 15:12:21.000000000 -0500 ++++ gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} @@ -60,8 +60,8 @@ diff -up gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in.libdir gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in ---- gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in.libdir 2008-01-24 15:12:16.000000000 -0500 -+++ gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 +--- gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in.libdir 2008-01-24 15:12:16.000000000 -0500 ++++ gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} @@ -71,8 +71,8 @@ diff -up gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in.libdir gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in ---- gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in.libdir 2008-01-24 15:12:23.000000000 -0500 -+++ gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 +--- gnome-sharp-2.20.0/gtkhtml/gtkhtml-sharp-2.0.pc.in.libdir 2008-01-24 15:12:23.000000000 -0500 ++++ gnome-sharp-2.20.0/gtkhtml/gtkhtml-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} @@ -82,8 +82,8 @@ diff -up gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in.libdir gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in ---- gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in.libdir 2008-01-24 15:12:13.000000000 -0500 -+++ gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 +--- gnome-sharp-2.20.0/rsvg/rsvg-sharp-2.0.pc.in.libdir 2008-01-24 15:12:13.000000000 -0500 ++++ gnome-sharp-2.20.0/rsvg/rsvg-sharp-2.0.pc.in 2008-06-04 14:03:56.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} @@ -93,8 +93,8 @@ diff -up gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in.libdir gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in ---- gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in.libdir 2008-01-24 15:12:19.000000000 -0500 -+++ gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in 2008-06-04 14:03:55.000000000 -0400 +--- gnome-sharp-2.20.0/vte/vte-sharp-2.0.pc.in.libdir 2008-01-24 15:12:19.000000000 -0500 ++++ gnome-sharp-2.20.0/vte/vte-sharp-2.0.pc.in 2008-06-04 14:03:55.000000000 -0400 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} Index: gnome-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-sharp.spec 4 Jun 2008 18:11:37 -0000 1.13 +++ gnome-sharp.spec 3 Jul 2008 15:18:15 -0000 1.14 @@ -1,19 +1,21 @@ Name: gnome-sharp -Version: 2.16.1 -Release: 3%{?dist} +Version: 2.20.0 +Release: 1%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries License: LGPLv2+ -URL: ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.16/ -Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.16/gnome-sharp-%{version}.tar.bz2 +URL: ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.20/ +Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.20/gnome-sharp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: %{name}-libdir.patch +#Patch1: %{name}-libdir.patch +Patch1: %{name}-%{version}-libdir.patch # Added by upstream #Patch2: %{name}-2.16.0-automake-1.10.patch -Patch3: %{name}-2.16.0-gtkhtml3-3.14.patch -Patch4: %{name}-2.16.1-assemblydir.patch +# Disabled, gtkhtml has been removed +#Patch3: %{name}-2.16.0-gtkhtml3-3.14.patch +#Patch4: %{name}-2.16.1-assemblydir.patch BuildRequires: mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel BuildRequires: gtk-sharp2-devel >= 2.10.0 @@ -47,7 +49,7 @@ %patch1 -p1 -b .libdir # Added by upstream #%patch2 -p1 -b .automake-1.10 -%patch3 -p1 -b .gtkhtml3-3.14 +#%patch3 -p1 -b .gtkhtml3-3.14 #%patch4 -p1 -b .assemblydir @@ -88,6 +90,9 @@ %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc %changelog +* Thu Jul 03 2008 Xavier Lamien - 2.20.0 +- Update release. + * Wed Jun 04 2008 Tom "spot" Callaway - 2.16.1-3 - fix license, fix libdir patch (gconf-sharp-peditors-2.0.pc) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2008 17:50:45 -0000 1.4 +++ sources 3 Jul 2008 15:18:15 -0000 1.5 @@ -1 +1 @@ -d8889e5caad5d8d7215d263ae49d94d3 gnome-sharp-2.16.1.tar.bz2 +1cdb85652a6504afe6fad569daa901ee gnome-sharp-2.20.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 15:28:20 2008 From: fedora-extras-commits at redhat.com (Michal Schmidt (michich)) Date: Thu, 3 Jul 2008 15:28:20 GMT Subject: rpms/jabbim/devel .cvsignore, 1.10, 1.11 jabbim-0.4-autoupdate-disable-notification.diff, 1.2, 1.3 jabbim.spec, 1.21, 1.22 sources, 1.19, 1.20 jabbim-0.4-tune-do-not-offer-Winamp.diff, 1.1, NONE Message-ID: <200807031528.m63FSKxF015332@cvs-int.fedora.redhat.com> Author: michich Update of /cvs/pkgs/rpms/jabbim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15224 Modified Files: .cvsignore jabbim-0.4-autoupdate-disable-notification.diff jabbim.spec sources Removed Files: jabbim-0.4-tune-do-not-offer-Winamp.diff Log Message: * Thu Jul 03 2008 Michal Schmidt - 0.4.3-1 - Upstream release 0.4.3. - Dropped the tune plugin patch, now merged. - Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now sufficient to only changes default config values. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Jun 2008 13:21:59 -0000 1.10 +++ .cvsignore 3 Jul 2008 15:27:22 -0000 1.11 @@ -1 +1 @@ -jabbim-0.4.2.tar.bz2 +jabbim-0.4.3.tar.bz2 jabbim-0.4-autoupdate-disable-notification.diff: Index: jabbim-0.4-autoupdate-disable-notification.diff =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim-0.4-autoupdate-disable-notification.diff,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jabbim-0.4-autoupdate-disable-notification.diff 25 Jun 2008 13:21:59 -0000 1.2 +++ jabbim-0.4-autoupdate-disable-notification.diff 3 Jul 2008 15:27:22 -0000 1.3 @@ -1,26 +1,12 @@ -Disable notification of new upstream version availability in the autoupdate plugin. -Users will receive new Jabbim versions via Fedora updates. - - Michal - -diff -up jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.2/plugins/autoupdate/autoupdate.py ---- jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig 2008-06-25 15:15:23.000000000 +0200 -+++ jabbim-0.4.2/plugins/autoupdate/autoupdate.py 2008-06-25 15:15:12.000000000 +0200 -@@ -69,11 +69,11 @@ class Plugin(plugins.PluginBase): - - def _update(self, vysledek): - print vysledek -- if vysledek[0][0] == False: -- #nemame posledni verzi -- self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000) -- self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update') -- -- def getNewVersion(self): -- QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version)) -+# if vysledek[0][0] == False: -+# #nemame posledni verzi -+# self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000) -+# self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update') -+# -+# def getNewVersion(self): -+# QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version)) - +diff -up jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.3/plugins/autoupdate/autoupdate.py +--- jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig 2008-07-03 16:59:49.000000000 +0200 ++++ jabbim-0.4.3/plugins/autoupdate/autoupdate.py 2008-07-03 17:00:03.000000000 +0200 +@@ -27,7 +27,7 @@ class config: + self.config['check_jabbim'] = { + 'type':'boolean', + 'label':self.main.tr("Notify about new versions of Jabbim"), +- 'value':'True' ++ 'value':'False' + } + self.config['check_plugins'] = { + 'type':'boolean', Index: jabbim.spec =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jabbim.spec 25 Jun 2008 13:21:59 -0000 1.21 +++ jabbim.spec 3 Jul 2008 15:27:22 -0000 1.22 @@ -1,5 +1,5 @@ Name: jabbim -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: Jabber client for mere mortals @@ -7,12 +7,11 @@ License: GPLv2+ URL: http://dev.jabbim.cz/jabbim # The source was obtained from upstream SVN repository: -# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.2 jabbim-0.4.2 -# tar -cjf jabbim-0.4.2.tar.bz2 jabbim-0.4.2/ -Source0: jabbim-0.4.2.tar.bz2 +# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.3 jabbim-0.4.3 +# tar -cjf jabbim-0.4.3.tar.bz2 jabbim-0.4.3/ +Source0: jabbim-0.4.3.tar.bz2 Source1: jabbim.in Patch0: jabbim-0.4-autoupdate-disable-notification.diff -Patch1: jabbim-0.4-tune-do-not-offer-Winamp.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 # fill in the template for the starting script sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim @@ -114,6 +112,12 @@ %changelog +* Thu Jul 03 2008 Michal Schmidt - 0.4.3-1 +- Upstream release 0.4.3. +- Dropped the tune plugin patch, now merged. +- Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now + sufficient to only changes default config values. + * Wed Jun 25 2008 Michal Schmidt - 0.4.2-1 - Upstream release 0.4.2. - dropped jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 25 Jun 2008 13:21:59 -0000 1.19 +++ sources 3 Jul 2008 15:27:22 -0000 1.20 @@ -1 +1 @@ -edadb3dcbab7bac5b5b65b819bbc516a jabbim-0.4.2.tar.bz2 +bf9973631495cea7a21e625f76fa2545 jabbim-0.4.3.tar.bz2 --- jabbim-0.4-tune-do-not-offer-Winamp.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 15:36:30 2008 From: fedora-extras-commits at redhat.com (Michal Schmidt (michich)) Date: Thu, 3 Jul 2008 15:36:30 GMT Subject: rpms/jabbim/F-9 jabbim-0.4-autoupdate-disable-notification.diff, 1.2, 1.3 jabbim.spec, 1.20, 1.21 sources, 1.19, 1.20 jabbim-0.4-tune-do-not-offer-Winamp.diff, 1.1, NONE Message-ID: <200807031536.m63FaUjd015798@cvs-int.fedora.redhat.com> Author: michich Update of /cvs/pkgs/rpms/jabbim/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15663 Modified Files: jabbim-0.4-autoupdate-disable-notification.diff jabbim.spec sources Removed Files: jabbim-0.4-tune-do-not-offer-Winamp.diff Log Message: * Thu Jul 03 2008 Michal Schmidt - 0.4.3-1 - Upstream release 0.4.3. - Dropped the tune plugin patch, now merged. - Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now sufficient to only changes default config values. jabbim-0.4-autoupdate-disable-notification.diff: Index: jabbim-0.4-autoupdate-disable-notification.diff =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/F-9/jabbim-0.4-autoupdate-disable-notification.diff,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jabbim-0.4-autoupdate-disable-notification.diff 25 Jun 2008 13:53:38 -0000 1.2 +++ jabbim-0.4-autoupdate-disable-notification.diff 3 Jul 2008 15:35:26 -0000 1.3 @@ -1,26 +1,12 @@ -Disable notification of new upstream version availability in the autoupdate plugin. -Users will receive new Jabbim versions via Fedora updates. - - Michal - -diff -up jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.2/plugins/autoupdate/autoupdate.py ---- jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig 2008-06-25 15:15:23.000000000 +0200 -+++ jabbim-0.4.2/plugins/autoupdate/autoupdate.py 2008-06-25 15:15:12.000000000 +0200 -@@ -69,11 +69,11 @@ class Plugin(plugins.PluginBase): - - def _update(self, vysledek): - print vysledek -- if vysledek[0][0] == False: -- #nemame posledni verzi -- self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000) -- self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update') -- -- def getNewVersion(self): -- QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version)) -+# if vysledek[0][0] == False: -+# #nemame posledni verzi -+# self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000) -+# self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update') -+# -+# def getNewVersion(self): -+# QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version)) - +diff -up jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.3/plugins/autoupdate/autoupdate.py +--- jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig 2008-07-03 16:59:49.000000000 +0200 ++++ jabbim-0.4.3/plugins/autoupdate/autoupdate.py 2008-07-03 17:00:03.000000000 +0200 +@@ -27,7 +27,7 @@ class config: + self.config['check_jabbim'] = { + 'type':'boolean', + 'label':self.main.tr("Notify about new versions of Jabbim"), +- 'value':'True' ++ 'value':'False' + } + self.config['check_plugins'] = { + 'type':'boolean', Index: jabbim.spec =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/F-9/jabbim.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jabbim.spec 25 Jun 2008 13:53:38 -0000 1.20 +++ jabbim.spec 3 Jul 2008 15:35:26 -0000 1.21 @@ -1,5 +1,5 @@ Name: jabbim -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: Jabber client for mere mortals @@ -7,12 +7,11 @@ License: GPLv2+ URL: http://dev.jabbim.cz/jabbim # The source was obtained from upstream SVN repository: -# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.2 jabbim-0.4.2 -# tar -cjf jabbim-0.4.2.tar.bz2 jabbim-0.4.2/ -Source0: jabbim-0.4.2.tar.bz2 +# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.3 jabbim-0.4.3 +# tar -cjf jabbim-0.4.3.tar.bz2 jabbim-0.4.3/ +Source0: jabbim-0.4.3.tar.bz2 Source1: jabbim.in Patch0: jabbim-0.4-autoupdate-disable-notification.diff -Patch1: jabbim-0.4-tune-do-not-offer-Winamp.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 # fill in the template for the starting script sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim @@ -114,6 +112,12 @@ %changelog +* Thu Jul 03 2008 Michal Schmidt - 0.4.3-1 +- Upstream release 0.4.3. +- Dropped the tune plugin patch, now merged. +- Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now + sufficient to only changes default config values. + * Wed Jun 25 2008 Michal Schmidt - 0.4.2-1 - Upstream release 0.4.2. - dropped jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 25 Jun 2008 13:53:38 -0000 1.19 +++ sources 3 Jul 2008 15:35:26 -0000 1.20 @@ -1 +1 @@ -edadb3dcbab7bac5b5b65b819bbc516a jabbim-0.4.2.tar.bz2 +bf9973631495cea7a21e625f76fa2545 jabbim-0.4.3.tar.bz2 --- jabbim-0.4-tune-do-not-offer-Winamp.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 15:38:28 2008 From: fedora-extras-commits at redhat.com (Michal Schmidt (michich)) Date: Thu, 3 Jul 2008 15:38:28 GMT Subject: rpms/jabbim/F-8 jabbim-0.4-autoupdate-disable-notification.diff, 1.2, 1.3 jabbim.spec, 1.6, 1.7 sources, 1.6, 1.7 jabbim-0.4-tune-do-not-offer-Winamp.diff, 1.1, NONE Message-ID: <200807031538.m63FcSPO015938@cvs-int.fedora.redhat.com> Author: michich Update of /cvs/pkgs/rpms/jabbim/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15868 Modified Files: jabbim-0.4-autoupdate-disable-notification.diff jabbim.spec sources Removed Files: jabbim-0.4-tune-do-not-offer-Winamp.diff Log Message: * Thu Jul 03 2008 Michal Schmidt - 0.4.3-1 - Upstream release 0.4.3. - Dropped the tune plugin patch, now merged. - Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now sufficient to only changes default config values. jabbim-0.4-autoupdate-disable-notification.diff: Index: jabbim-0.4-autoupdate-disable-notification.diff =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/F-8/jabbim-0.4-autoupdate-disable-notification.diff,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jabbim-0.4-autoupdate-disable-notification.diff 25 Jun 2008 13:55:43 -0000 1.2 +++ jabbim-0.4-autoupdate-disable-notification.diff 3 Jul 2008 15:37:57 -0000 1.3 @@ -1,26 +1,12 @@ -Disable notification of new upstream version availability in the autoupdate plugin. -Users will receive new Jabbim versions via Fedora updates. - - Michal - -diff -up jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.2/plugins/autoupdate/autoupdate.py ---- jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig 2008-06-25 15:15:23.000000000 +0200 -+++ jabbim-0.4.2/plugins/autoupdate/autoupdate.py 2008-06-25 15:15:12.000000000 +0200 -@@ -69,11 +69,11 @@ class Plugin(plugins.PluginBase): - - def _update(self, vysledek): - print vysledek -- if vysledek[0][0] == False: -- #nemame posledni verzi -- self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000) -- self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update') -- -- def getNewVersion(self): -- QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version)) -+# if vysledek[0][0] == False: -+# #nemame posledni verzi -+# self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000) -+# self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update') -+# -+# def getNewVersion(self): -+# QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version)) - +diff -up jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.3/plugins/autoupdate/autoupdate.py +--- jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig 2008-07-03 16:59:49.000000000 +0200 ++++ jabbim-0.4.3/plugins/autoupdate/autoupdate.py 2008-07-03 17:00:03.000000000 +0200 +@@ -27,7 +27,7 @@ class config: + self.config['check_jabbim'] = { + 'type':'boolean', + 'label':self.main.tr("Notify about new versions of Jabbim"), +- 'value':'True' ++ 'value':'False' + } + self.config['check_plugins'] = { + 'type':'boolean', Index: jabbim.spec =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/F-8/jabbim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jabbim.spec 25 Jun 2008 13:55:43 -0000 1.6 +++ jabbim.spec 3 Jul 2008 15:37:57 -0000 1.7 @@ -1,5 +1,5 @@ Name: jabbim -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: Jabber client for mere mortals @@ -7,12 +7,11 @@ License: GPLv2+ URL: http://dev.jabbim.cz/jabbim # The source was obtained from upstream SVN repository: -# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.2 jabbim-0.4.2 -# tar -cjf jabbim-0.4.2.tar.bz2 jabbim-0.4.2/ -Source0: jabbim-0.4.2.tar.bz2 +# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.3 jabbim-0.4.3 +# tar -cjf jabbim-0.4.3.tar.bz2 jabbim-0.4.3/ +Source0: jabbim-0.4.3.tar.bz2 Source1: jabbim.in Patch0: jabbim-0.4-autoupdate-disable-notification.diff -Patch1: jabbim-0.4-tune-do-not-offer-Winamp.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 # fill in the template for the starting script sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim @@ -114,6 +112,12 @@ %changelog +* Thu Jul 03 2008 Michal Schmidt - 0.4.3-1 +- Upstream release 0.4.3. +- Dropped the tune plugin patch, now merged. +- Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now + sufficient to only changes default config values. + * Wed Jun 25 2008 Michal Schmidt - 0.4.2-1 - Upstream release 0.4.2. - dropped jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jun 2008 13:55:43 -0000 1.6 +++ sources 3 Jul 2008 15:37:57 -0000 1.7 @@ -1 +1 @@ -edadb3dcbab7bac5b5b65b819bbc516a jabbim-0.4.2.tar.bz2 +bf9973631495cea7a21e625f76fa2545 jabbim-0.4.3.tar.bz2 --- jabbim-0.4-tune-do-not-offer-Winamp.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 15:40:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 3 Jul 2008 15:40:24 GMT Subject: rpms/tkimg/devel tkimg.spec,1.7,1.8 Message-ID: <200807031540.m63FeO5N016053@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/tkimg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16024 Modified Files: tkimg.spec Log Message: fix configure option to find tclConfig.sh in rawhide Index: tkimg.spec =================================================================== RCS file: /cvs/pkgs/rpms/tkimg/devel/tkimg.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tkimg.spec 5 May 2008 10:53:16 -0000 1.7 +++ tkimg.spec 3 Jul 2008 15:39:36 -0000 1.8 @@ -5,7 +5,7 @@ Name: tkimg Version: 1.3 -Release: 0.10.%{svnversion}svn%{?dist} +Release: 0.11.%{svnversion}svn%{?dist} Summary: More Image Formats for Tk Group: Development/Libraries @@ -48,7 +48,7 @@ %patch1 -p1 %build -%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --disable-static \ +%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --disable-static \ --libdir=%{tcl_sitearch} %{__make} %{?_smp_mflags} @@ -92,6 +92,9 @@ %{tcl_sitearch}/Img1.3/*.a %changelog +* Thu Jul 03 2008 Tom "spot" Callaway - 1.3-0.11.200805005svn +- fix configure to use --with-tcl=%%{tcl_sitearch} + * Mon May 05 2008 Sergio Pascual - 1.3-0.10.20080505svn - New upstream source - Including fooConfig.sh files in -devel From fedora-extras-commits at redhat.com Thu Jul 3 15:42:45 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Thu, 3 Jul 2008 15:42:45 GMT Subject: rpms/sugar-base/OLPC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-base.spec, 1.6, 1.7 Message-ID: <200807031542.m63Fgjit016197@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-base/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16155 Modified Files: .cvsignore sources sugar-base.spec Log Message: * Thu Jul 03 2008 Tomeu Vizoso - 0.81.1-2.20080703git1ca8ee3cea - New git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/OLPC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Jun 2008 06:42:18 -0000 1.5 +++ .cvsignore 3 Jul 2008 15:41:55 -0000 1.6 @@ -1 +1 @@ -sugar-base-0.81.1.tar.bz2 +sugar-base-0.81.1-git1ca8ee3cea.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/OLPC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jun 2008 06:42:18 -0000 1.5 +++ sources 3 Jul 2008 15:41:55 -0000 1.6 @@ -1 +1 @@ -bfaaa7d92401580cc01cbf50f89e0408 sugar-base-0.81.1.tar.bz2 +e015a3d09aee3522315d111f35eb48d6 sugar-base-0.81.1-git1ca8ee3cea.tar.bz2 Index: sugar-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/OLPC-3/sugar-base.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sugar-base.spec 9 Jun 2008 06:42:18 -0000 1.6 +++ sugar-base.spec 3 Jul 2008 15:41:55 -0000 1.7 @@ -1,11 +1,16 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%define commitid 1ca8ee3cea +%define alphatag 20080703git%{commitid} Summary: Base Sugar library Name: sugar-base Version: 0.81.1 -Release: 1%{?dist} +Release: 2.%{alphatag}%{?dist} URL: http://dev.laptop.org/ -Source0: http://dev.laptop.org/pub/sugar/sources/sugar-base/%{name}-%{version}.tar.bz2 +# git clone git://dev.laptop.org/sugar-base +# cd sugar-base +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 License: LGPLv2 Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -13,6 +18,8 @@ BuildRequires: python-devel BuildRequires: pygobject2-devel BuildRequires: pygtk2-codegen +BuildRequires: gettext +BuildRequires: perl-XML-Parser %description @@ -30,16 +37,20 @@ %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +%find_lang %name %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) %{python_sitelib}/* %changelog +* Thu Jul 03 2008 Tomeu Vizoso - 0.81.1-2.20080703git1ca8ee3cea +- New git snapshot + * Mon Jun 09 2008 Simon Schampijer - 0.81.1-1 - Fix logging (Tomeu) From fedora-extras-commits at redhat.com Thu Jul 3 15:49:30 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 3 Jul 2008 15:49:30 GMT Subject: rpms/bluez-libs/F-8 .cvsignore, 1.29, 1.30 bluez-libs.spec, 1.44, 1.45 sources, 1.29, 1.30 Message-ID: <200807031549.m63FnU6s016538@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-libs/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16487 Modified Files: .cvsignore bluez-libs.spec sources Log Message: * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/F-8/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 27 Jun 2008 09:47:58 -0000 1.29 +++ .cvsignore 3 Jul 2008 15:48:42 -0000 1.30 @@ -1 +1 @@ -bluez-libs-3.34.tar.gz +bluez-libs-3.35.tar.gz Index: bluez-libs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/F-8/bluez-libs.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- bluez-libs.spec 27 Jun 2008 09:47:58 -0000 1.44 +++ bluez-libs.spec 3 Jul 2008 15:48:42 -0000 1.45 @@ -1,6 +1,6 @@ Summary: Bluetooth libraries Name: bluez-libs -Version: 3.34 +Version: 3.35 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -63,6 +63,9 @@ %{_libdir}/pkgconfig/bluez.pc %changelog +* Thu Jul 03 2008 - Bastien Nocera - 3.35-1 +- Update to 3.35 + * Fri Jun 27 2008 - Bastien Nocera - 3.34-1 - Update to 3.34 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/F-8/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 27 Jun 2008 09:47:58 -0000 1.29 +++ sources 3 Jul 2008 15:48:42 -0000 1.30 @@ -1 +1 @@ -d70d6dba75adb84cd77f8eb35d8eb45c bluez-libs-3.34.tar.gz +2682b84da32cd78b48982d1d69ba637c bluez-libs-3.35.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 15:52:15 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 3 Jul 2008 15:52:15 GMT Subject: rpms/bluez-libs/F-9 .cvsignore, 1.38, 1.39 bluez-libs.spec, 1.55, 1.56 sources, 1.38, 1.39 Message-ID: <200807031552.m63FqFHI016732@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-libs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16653 Modified Files: .cvsignore bluez-libs.spec sources Log Message: * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/F-9/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 27 Jun 2008 09:50:28 -0000 1.38 +++ .cvsignore 3 Jul 2008 15:51:27 -0000 1.39 @@ -1 +1 @@ -bluez-libs-3.34.tar.gz +bluez-libs-3.35.tar.gz Index: bluez-libs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/F-9/bluez-libs.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- bluez-libs.spec 27 Jun 2008 09:50:28 -0000 1.55 +++ bluez-libs.spec 3 Jul 2008 15:51:27 -0000 1.56 @@ -1,6 +1,6 @@ Summary: Bluetooth libraries Name: bluez-libs -Version: 3.34 +Version: 3.35 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -63,6 +63,9 @@ %{_libdir}/pkgconfig/bluez.pc %changelog +* Thu Jul 03 2008 - Bastien Nocera - 3.35-1 +- Update to 3.35 + * Fri Jun 27 2008 - Bastien Nocera - 3.34-1 - Update to 3.34 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/F-9/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 27 Jun 2008 09:50:28 -0000 1.38 +++ sources 3 Jul 2008 15:51:27 -0000 1.39 @@ -1 +1 @@ -d70d6dba75adb84cd77f8eb35d8eb45c bluez-libs-3.34.tar.gz +2682b84da32cd78b48982d1d69ba637c bluez-libs-3.35.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 15:52:56 2008 From: fedora-extras-commits at redhat.com (Guillaume Desmottes (gdesmott)) Date: Thu, 3 Jul 2008 15:52:56 GMT Subject: rpms/telepathy-salut/OLPC-3 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 telepathy-salut.spec, 1.19, 1.20 Message-ID: <200807031552.m63FquSJ016829@cvs-int.fedora.redhat.com> Author: gdesmott Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16718 Modified Files: .cvsignore sources telepathy-salut.spec Log Message: Update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 24 Mar 2008 14:51:20 -0000 1.13 +++ .cvsignore 3 Jul 2008 15:52:04 -0000 1.14 @@ -1 +1 @@ -telepathy-salut-0.2.3.tar.gz +telepathy-salut-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 24 Mar 2008 14:51:20 -0000 1.13 +++ sources 3 Jul 2008 15:52:04 -0000 1.14 @@ -1 +1 @@ -d93cb407212f19218bcc56ceec1f2f2c telepathy-salut-0.2.3.tar.gz +146e0ec32633623742a5e3df41c9c738 telepathy-salut-0.3.3.tar.gz Index: telepathy-salut.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- telepathy-salut.spec 3 Jul 2008 09:33:31 -0000 1.19 +++ telepathy-salut.spec 3 Jul 2008 15:52:04 -0000 1.20 @@ -1,6 +1,6 @@ Name: telepathy-salut -Version: 0.2.3 -Release: 3%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: Link-local XMPP telepathy connection manager Group: Applications/Communications @@ -9,7 +9,6 @@ Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: salut-olpc-no-dbus-uid-check.patch Patch1: salut-chmod-unix-socket.patch -Patch2: salut-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= 1.1.0 @@ -36,7 +35,6 @@ %setup -q %patch0 -p1 -b .dbus-uid %patch1 -p1 -b .chmod-socket -%patch2 -p1 -b .debug-6782 %build @@ -62,6 +60,9 @@ %{_mandir}/man8/%{name}.8.gz %changelog +* Thu Jul 3 2008 Guillaume Desmottes - 0.3.3-1 +- Update to 0.3.3. + * Thu Jul 3 2008 Morgan Collett - 0.2.3-3 - Add OLPC patches to disable security for rainbow From fedora-extras-commits at redhat.com Thu Jul 3 15:53:08 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 3 Jul 2008 15:53:08 GMT Subject: rpms/nfs-utils/devel nfs-utils-1.1.0-smnotify-path.patch, 1.2, 1.3 nfs-utils.spec, 1.180, 1.181 nfs-utils-1.1.2-smnotifypath.patch, 1.1, NONE Message-ID: <200807031553.m63Fr839016838@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16682 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.1.0-smnotify-path.patch Removed Files: nfs-utils-1.1.2-smnotifypath.patch Log Message: Backported the F-8 patch that fixes sm-notify's pathname. nfs-utils-1.1.0-smnotify-path.patch: Index: nfs-utils-1.1.0-smnotify-path.patch =================================================================== RCS file: nfs-utils-1.1.0-smnotify-path.patch diff -N nfs-utils-1.1.0-smnotify-path.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nfs-utils-1.1.0-smnotify-path.patch 3 Jul 2008 15:52:18 -0000 1.3 @@ -0,0 +1,70 @@ +commit 02968aa55972b680fa00273188da281d7612ca3e +Author: Steve Dickson +Date: Fri Sep 14 14:19:50 2007 -0400 + + Changed the default paths in sm-notify to + /var/lib/nfs/statd which is where the locking + state is kept in Red Hat distros. + + Signed-off-by: Steve Dickson + +diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c +index 98c03f9..862889f 100644 +--- a/utils/statd/sm-notify.c ++++ b/utils/statd/sm-notify.c +@@ -24,11 +24,13 @@ + #include + #include + ++#define STATD_PATH_XTN "statd/" ++ + #ifndef BASEDIR + # ifdef NFS_STATEDIR +-# define BASEDIR NFS_STATEDIR ++# define BASEDIR NFS_STATEDIR "/" STATD_PATH_XTN + # else +-# define BASEDIR "/var/lib/nfs" ++# define BASEDIR "/var/lib/nfs" "/" STATD_PATH_XTN + # endif + #endif + +diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man +index dd03b8d..69b7059 100644 +--- a/utils/statd/sm-notify.man ++++ b/utils/statd/sm-notify.man +@@ -33,7 +33,7 @@ but this is configurable. + For each NFS client or server machine to be monitored, + .B rpc.statd + creates a file in +-.BR /var/lib/nfs/sm ", " ++.BR /var/lib/nfs/statd/sm ", " + and removes the file if monitoring is no longer required. + .PP + When the machine is rebooted, +@@ -47,7 +47,7 @@ Each machine has an + which is basically an integer counter that is incremented + each time the machine reboots. This counter is stored + in +-.BR /var/lib/nfs/state , ++.BR /var/lib/nfs/statd/state , + and updated by + .BR sm-notify . + .SS Security +@@ -149,13 +149,13 @@ By default, + .B sm-notify + forks and puts itself in the background after obtaining the + list of hosts from +-.BR /var/lib/nfs/sm . ++.BR /var/lib/nfs/statd/sm . + .SH FILES +-.BR /var/lib/nfs/state ++.BR /var/lib/nfs/statd/state + .br +-.BR /var/lib/nfs/sm/* ++.BR /var/lib/nfs/statd/sm/* + .br +-.BR /var/lib/nfs/sm.bak/* ++.BR /var/lib/nfs/statd/sm.bak/* + .br + .BR /var/run/sm-notify.pid + .SH SEE ALSO Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- nfs-utils.spec 2 Jul 2008 23:35:53 -0000 1.180 +++ nfs-utils.spec 3 Jul 2008 15:52:18 -0000 1.181 @@ -31,7 +31,7 @@ Patch06: nfs-utils-1.1.0-exportfs-man-update.patch Patch07: nfs-utils-1.1.2-multi-auth-flavours.patch Patch08: nfs-utils-1.1.2-mount-eacces.patch -Patch09: nfs-utils-1.1.2-smnotifypath.patch +Patch09: nfs-utils-1.1.0-smnotify-path.patch Patch101: nfs-utils-1.1.2-tcpwrapper-fix.patch Patch102: nfs-utils-1.1.2-mount-retry.patch --- nfs-utils-1.1.2-smnotifypath.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 15:54:24 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 3 Jul 2008 15:54:24 GMT Subject: rpms/bluez-libs/devel .cvsignore, 1.40, 1.41 bluez-libs.spec, 1.57, 1.58 sources, 1.40, 1.41 Message-ID: <200807031554.m63FsOH5017051@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-libs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16945 Modified Files: .cvsignore bluez-libs.spec sources Log Message: * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 27 Jun 2008 09:51:51 -0000 1.40 +++ .cvsignore 3 Jul 2008 15:53:38 -0000 1.41 @@ -1 +1 @@ -bluez-libs-3.34.tar.gz +bluez-libs-3.35.tar.gz Index: bluez-libs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/devel/bluez-libs.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- bluez-libs.spec 27 Jun 2008 09:51:51 -0000 1.57 +++ bluez-libs.spec 3 Jul 2008 15:53:38 -0000 1.58 @@ -1,6 +1,6 @@ Summary: Bluetooth libraries Name: bluez-libs -Version: 3.34 +Version: 3.35 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -63,6 +63,9 @@ %{_libdir}/pkgconfig/bluez.pc %changelog +* Thu Jul 03 2008 - Bastien Nocera - 3.35-1 +- Update to 3.35 + * Fri Jun 27 2008 - Bastien Nocera - 3.34-1 - Update to 3.34 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 27 Jun 2008 09:51:51 -0000 1.40 +++ sources 3 Jul 2008 15:53:38 -0000 1.41 @@ -1 +1 @@ -d70d6dba75adb84cd77f8eb35d8eb45c bluez-libs-3.34.tar.gz +2682b84da32cd78b48982d1d69ba637c bluez-libs-3.35.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 15:57:13 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 3 Jul 2008 15:57:13 GMT Subject: rpms/bluez-utils/devel .cvsignore, 1.38, 1.39 bluez-utils.spec, 1.107, 1.108 sources, 1.38, 1.39 Message-ID: <200807031557.m63FvDUl017297@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17216 Modified Files: .cvsignore bluez-utils.spec sources Log Message: * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 27 Jun 2008 10:14:16 -0000 1.38 +++ .cvsignore 3 Jul 2008 15:56:21 -0000 1.39 @@ -1 +1 @@ -bluez-utils-3.34.tar.gz +bluez-utils-3.35.tar.gz Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- bluez-utils.spec 27 Jun 2008 10:14:16 -0000 1.107 +++ bluez-utils.spec 3 Jul 2008 15:56:21 -0000 1.108 @@ -1,6 +1,6 @@ Summary: Bluetooth utilities Name: bluez-utils -Version: 3.34 +Version: 3.35 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -162,6 +162,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Jul 03 2008 - Bastien Nocera - 3.35-1 +- Update to 3.35 + * Fri Jun 27 2008 - Bastien Nocera - 3.34-1 - Update to 3.34 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 27 Jun 2008 10:14:16 -0000 1.38 +++ sources 3 Jul 2008 15:56:21 -0000 1.39 @@ -1 +1 @@ -3b1729329c49cb522d4b9df4ac9e2c8a bluez-utils-3.34.tar.gz +21dc2f8c03dae9db87da351c735510bb bluez-utils-3.35.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 15:57:54 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 3 Jul 2008 15:57:54 GMT Subject: rpms/kernel/devel patch-2.6.26-rc8-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.848, 1.849 config-generic, 1.121, 1.122 kernel.spec, 1.730, 1.731 sources, 1.809, 1.810 upstream, 1.727, 1.728 patch-2.6.26-rc8-git2.bz2.sign, 1.1, NONE Message-ID: <200807031557.m63Fvs3K017366@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17273 Modified Files: .cvsignore config-generic kernel.spec sources upstream Added Files: patch-2.6.26-rc8-git3.bz2.sign Removed Files: patch-2.6.26-rc8-git2.bz2.sign Log Message: 2.6.26-rc8-git3 --- NEW FILE patch-2.6.26-rc8-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIbHqZyGugalF9Dw4RAliqAJ0XA1MaqvPSTrBoalc173qp4ImPggCePAV+ anSzM1TrGnUsp+4KOlvOThA= =j38g -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.848 retrieving revision 1.849 diff -u -r1.848 -r1.849 --- .cvsignore 1 Jul 2008 12:54:37 -0000 1.848 +++ .cvsignore 3 Jul 2008 15:57:05 -0000 1.849 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git2.bz2 +patch-2.6.26-rc8-git3.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- config-generic 3 Jul 2008 04:21:56 -0000 1.121 +++ config-generic 3 Jul 2008 15:57:05 -0000 1.122 @@ -1270,6 +1270,8 @@ CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set + CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -2173,6 +2175,7 @@ CONFIG_TUNER_3036=m # CONFIG_TUNER_TEA5761 is not set +CONFIG_USB_VIDEO_CLASS=m # # Radio Adapters Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.730 retrieving revision 1.731 diff -u -r1.730 -r1.731 --- kernel.spec 3 Jul 2008 05:21:14 -0000 1.730 +++ kernel.spec 3 Jul 2008 15:57:05 -0000 1.731 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 8 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1146,9 +1146,9 @@ #ApplyPatch linux-2.6-selinux-ecryptfs-support.patch # wireless patches headed for 2.6.26 -ApplyPatch linux-2.6-wireless.patch +#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.27 -ApplyPatch linux-2.6-wireless-pending.patch +#ApplyPatch linux-2.6-wireless-pending.patch # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch @@ -1796,6 +1796,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 03 2008 Dave Jones +- 2.6.26-rc8-git3 + * Thu Jul 03 2008 Chuck Ebbert - Fix EFI boot. - Export account_system_vtime on IA64. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.809 retrieving revision 1.810 diff -u -r1.809 -r1.810 --- sources 1 Jul 2008 12:54:38 -0000 1.809 +++ sources 3 Jul 2008 15:57:05 -0000 1.810 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 db9fee832152a33946993459fc85a18f patch-2.6.26-rc8.bz2 -3ba514e2f28b675192a7b20f59b1c08a patch-2.6.26-rc8-git2.bz2 +37ae9a1f243a61a2fee484762897a757 patch-2.6.26-rc8-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.727 retrieving revision 1.728 diff -u -r1.727 -r1.728 --- upstream 1 Jul 2008 12:54:38 -0000 1.727 +++ upstream 3 Jul 2008 15:57:05 -0000 1.728 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git2.bz2 +patch-2.6.26-rc8-git3.bz2 --- patch-2.6.26-rc8-git2.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 15:58:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 3 Jul 2008 15:58:44 GMT Subject: rpms/glib2/devel glib2.spec,1.172,1.173 Message-ID: <200807031558.m63FwiEG017465@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17361 Modified Files: glib2.spec Log Message: fix spec Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- glib2.spec 3 Jul 2008 01:15:51 -0000 1.172 +++ glib2.spec 3 Jul 2008 15:57:57 -0000 1.173 @@ -56,7 +56,7 @@ %prep %setup -q -n glib-%{version} -%patch2 -p0 -b .only-pass-uri-to-gio-apps +%patch2 -p1 -b .only-pass-uri-to-gio-apps %patch3 -p0 -b .selinux %build From fedora-extras-commits at redhat.com Thu Jul 3 16:01:47 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 3 Jul 2008 16:01:47 GMT Subject: rpms/bluez-utils/F-9 .cvsignore, 1.36, 1.37 bluez-utils.spec, 1.101, 1.102 sources, 1.36, 1.37 Message-ID: <200807031601.m63G1lB5024209@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17586 Modified Files: .cvsignore bluez-utils.spec sources Log Message: * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 27 Jun 2008 15:28:46 -0000 1.36 +++ .cvsignore 3 Jul 2008 16:00:54 -0000 1.37 @@ -1 +1 @@ -bluez-utils-3.34.tar.gz +bluez-utils-3.35.tar.gz Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluez-utils.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- bluez-utils.spec 27 Jun 2008 15:28:46 -0000 1.101 +++ bluez-utils.spec 3 Jul 2008 16:00:54 -0000 1.102 @@ -1,6 +1,6 @@ Summary: Bluetooth utilities Name: bluez-utils -Version: 3.34 +Version: 3.35 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -157,6 +157,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Jul 03 2008 - Bastien Nocera - 3.35-1 +- Update to 3.35 + * Fri Jun 27 2008 - Bastien Nocera - 3.34-1 - Update to 3.34 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 27 Jun 2008 15:28:46 -0000 1.36 +++ sources 3 Jul 2008 16:00:54 -0000 1.37 @@ -1 +1 @@ -3b1729329c49cb522d4b9df4ac9e2c8a bluez-utils-3.34.tar.gz +21dc2f8c03dae9db87da351c735510bb bluez-utils-3.35.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 16:03:47 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 3 Jul 2008 16:03:47 GMT Subject: rpms/bluez-utils/F-8 .cvsignore, 1.27, 1.28 bluez-utils.spec, 1.88, 1.89 sources, 1.27, 1.28 Message-ID: <200807031603.m63G3lwW024365@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24302 Modified Files: .cvsignore bluez-utils.spec sources Log Message: * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-8/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 27 Jun 2008 14:01:39 -0000 1.27 +++ .cvsignore 3 Jul 2008 16:02:51 -0000 1.28 @@ -1 +1 @@ -bluez-utils-3.34.tar.gz +bluez-utils-3.35.tar.gz Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-8/bluez-utils.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- bluez-utils.spec 27 Jun 2008 14:01:39 -0000 1.88 +++ bluez-utils.spec 3 Jul 2008 16:02:51 -0000 1.89 @@ -1,6 +1,6 @@ Summary: Bluetooth utilities Name: bluez-utils -Version: 3.34 +Version: 3.35 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -154,6 +154,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Jul 03 2008 - Bastien Nocera - 3.35-1 +- Update to 3.35 + * Fri Jun 27 2008 - Bastien Nocera - 3.34-1 - Update to 3.34 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-8/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 27 Jun 2008 14:01:39 -0000 1.27 +++ sources 3 Jul 2008 16:02:51 -0000 1.28 @@ -1 +1 @@ -3b1729329c49cb522d4b9df4ac9e2c8a bluez-utils-3.34.tar.gz +21dc2f8c03dae9db87da351c735510bb bluez-utils-3.35.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 16:10:21 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Thu, 3 Jul 2008 16:10:21 GMT Subject: rpms/vnc/devel vnc.spec,1.195,1.196 Message-ID: <200807031610.m63GALrh024796@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24721 Modified Files: vnc.spec Log Message: - build with -rdynamic to make swrast_dri driver happy Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- vnc.spec 2 Jul 2008 12:37:03 -0000 1.195 +++ vnc.spec 3 Jul 2008 16:09:26 -0000 1.196 @@ -3,7 +3,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 32%{?dist} +Release: 33%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -145,8 +145,8 @@ %patch53 -p1 -b .ipv6 %build -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0" -export CXXFLAGS="$CFLAGS" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0 -rdynamic" +export CXXFLAGS="$CFLAGS -rdynamic" pushd common autoreconf -fiv @@ -183,8 +183,7 @@ --disable-dri \ --enable-glx \ --disable-config-dbus \ - --disable-config-hal \ - --with-mesa-source=%{_datadir}/mesa/source + --disable-config-hal make %{?_smp_mflags} popd @@ -333,6 +332,9 @@ %{_libdir}/librfb.so.* %changelog +* Thu Jul 03 2008 Adam Tkac 4.1.2-33 +- build with -rdynamic to make swrast_dri driver happy + * Tue Jul 01 2008 Adam Tkac 4.1.2-32 - enabled XKEYBOARD extension (#450033) - icons have correct permissions (#453495) From fedora-extras-commits at redhat.com Thu Jul 3 16:11:15 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Thu, 3 Jul 2008 16:11:15 GMT Subject: rpms/sugar-toolkit/OLPC-3 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sugar-toolkit.spec, 1.11, 1.12 Message-ID: <200807031611.m63GBFNg024896@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24794 Modified Files: .cvsignore sources sugar-toolkit.spec Log Message: * Thu Jul 03 2008 Simon Schampijer - 0.81.1-2.20080703git7c5fa614a6 - New git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Jun 2008 09:58:04 -0000 1.7 +++ .cvsignore 3 Jul 2008 16:10:24 -0000 1.8 @@ -1 +1 @@ -sugar-toolkit-0.81.5.tar.bz2 +sugar-toolkit-0.81.5-git7c5fa614a6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Jun 2008 09:58:04 -0000 1.8 +++ sources 3 Jul 2008 16:10:24 -0000 1.9 @@ -1 +1 @@ -56fcccd96e6c49489e68f46451d2a182 sugar-toolkit-0.81.5.tar.bz2 +5ee4df9cca052c12ce95738ef13d1f0c sugar-toolkit-0.81.5-git7c5fa614a6.tar.bz2 Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sugar-toolkit.spec 21 Jun 2008 10:13:27 -0000 1.11 +++ sugar-toolkit.spec 3 Jul 2008 16:10:24 -0000 1.12 @@ -1,11 +1,19 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%define commitid 7c5fa614a6 +%define alphatag 20080703git%{commitid} + Summary: Sugar toolkit Name: sugar-toolkit Version: 0.81.5 -Release: 2%{?dist} +Release: 2.%{alphatag}%{?dist} URL: http://wiki.laptop.org/go/Sugar -Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +# Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +# git clone git://dev.laptop.org/sugar-toolkit +# cd sugar-toolkit +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 + Source1: macros.sugar License: LGPLv2 Group: System Environment/Libraries @@ -56,6 +64,9 @@ %{_sysconfdir}/rpm/macros.sugar %changelog +* Thu Jul 03 2008 Simon Schampijer - 0.81.1-2.20080703git7c5fa614a6 +- New git snapshot + * Sat Jun 21 2008 Tomeu Vizoso - 0.81.5-2 - Add build dependency on libSM-devel From fedora-extras-commits at redhat.com Thu Jul 3 16:12:34 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 3 Jul 2008 16:12:34 GMT Subject: rpms/bluez-gnome/devel .cvsignore, 1.21, 1.22 bluez-gnome.spec, 1.48, 1.49 sources, 1.21, 1.22 bluez-gnome-sendto-palm.patch, 1.1, NONE Message-ID: <200807031612.m63GCYnT025120@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24902 Modified Files: .cvsignore bluez-gnome.spec sources Removed Files: bluez-gnome-sendto-palm.patch Log Message: * Thu Jul 03 2008 - Bastien Nocera - 0.27-1 - Update to 0.27 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 8 Apr 2008 16:00:42 -0000 1.21 +++ .cvsignore 3 Jul 2008 16:11:34 -0000 1.22 @@ -1 +1 @@ -bluez-gnome-0.26.tar.gz +bluez-gnome-0.27.tar.gz Index: bluez-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- bluez-gnome.spec 8 Apr 2008 16:00:42 -0000 1.48 +++ bluez-gnome.spec 3 Jul 2008 16:11:34 -0000 1.49 @@ -1,5 +1,5 @@ Name: bluez-gnome -Version: 0.26 +Version: 0.27 Release: 1%{?dist} Summary: Bluetooth pairing and control applet @@ -8,7 +8,6 @@ URL: http://www.bluez.org/ Source0: http://bluez.sf.net/download/%{name}-%{version}.tar.gz Patch1: bluez-gnome-remove-class-file-sharing.patch -Patch2: bluez-gnome-sendto-palm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,7 +46,6 @@ %prep %setup -q %patch1 -p0 -b .remove-class -%patch2 -p0 -b .sendto %build %configure --disable-mime-update --disable-desktop-update --disable-icon-update @@ -136,6 +134,9 @@ %{_datadir}/man/man1/bluetooth-analyzer.1.gz %changelog +* Thu Jul 03 2008 - Bastien Nocera - 0.27-1 +- Update to 0.27 + * Tue Apr 08 2008 - Bastien Nocera - 0.26-1 - Update to 0.26 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 8 Apr 2008 16:00:42 -0000 1.21 +++ sources 3 Jul 2008 16:11:34 -0000 1.22 @@ -1 +1 @@ -d1e68cf63458472eaeb70ef1b3f1df5d bluez-gnome-0.26.tar.gz +a4757eca8fbe0d52051813416667da6c bluez-gnome-0.27.tar.gz --- bluez-gnome-sendto-palm.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 16:17:28 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Thu, 3 Jul 2008 16:17:28 GMT Subject: rpms/inn/devel .cvsignore, 1.12, 1.13 inn.spec, 1.47, 1.48 sources, 1.13, 1.14 Message-ID: <200807031617.m63GHS3e025902@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/inn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25789 Modified Files: .cvsignore inn.spec sources Log Message: new upstream release 2.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inn/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 15 May 2008 09:33:46 -0000 1.12 +++ .cvsignore 3 Jul 2008 16:16:38 -0000 1.13 @@ -1,2 +1,2 @@ inn-faq.tar.gz -inn-2.4.4.tar.gz +inn-2.4.5.tar.gz Index: inn.spec =================================================================== RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- inn.spec 17 Jun 2008 12:16:14 -0000 1.47 +++ inn.spec 3 Jul 2008 16:16:38 -0000 1.48 @@ -1,7 +1,7 @@ Summary: The InterNetNews (INN) system, an Usenet news server Name: inn -Version: 2.4.4 -Release: 3%{?dist} +Version: 2.4.5 +Release: 1%{?dist} #see LICENSE file for details License: GPL+ and BSD and MIT and Public Domain Group: System Environment/Daemons @@ -333,6 +333,9 @@ %{_mandir}/man1/inews* %changelog +* Thu Jul 3 2008 Ondrej Vasik - 2.4.5-1 +- new upstream release 2.4.5 + * Tue Jun 17 2008 Ondrej Vasik - 2.4.4-3 - Add news user. fixes bug #437462 * Mon May 19 2008 Ondrej Vasik - 2.4.4-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/inn/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 15 May 2008 09:33:46 -0000 1.13 +++ sources 3 Jul 2008 16:16:38 -0000 1.14 @@ -1,2 +1,2 @@ b5e6321446594749eea087c6710eefa5 inn-faq.tar.gz -02d9dcf0802b16356d02c0dafbcf98f9 inn-2.4.4.tar.gz +07bc6530c5e296b0ee81a5d6ac4cd355 inn-2.4.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 16:20:47 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Thu, 3 Jul 2008 16:20:47 GMT Subject: rpms/sugar/OLPC-3 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 sugar.spec, 1.13, 1.14 Message-ID: <200807031620.m63GKlAZ026372@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26250 Modified Files: .cvsignore sources sugar.spec Log Message: * Sat Jun 21 2008 Tomeu Vizoso - 0.81.5-1 - Fix a bug with activity switching (benzea) - UI improvements to the control panel frame section (erikos) - First go at session management implementation (marco) - New activity launching feedback (eben and marco) - Speaker device implementation cleanups (mtd) - Support for 1-1 chat with other xmpp clients (morgs and cassidy) - Shortcuts improvements for emulation (mtd) - Additional free form layout for the home view and allow to reorder icons (tomeu) - Improve layout logic for the icons in the mesh view (tomeu) - Support for switching activities using alt+tab (benzea) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Jun 2008 10:08:01 -0000 1.10 +++ .cvsignore 3 Jul 2008 16:19:58 -0000 1.11 @@ -1 +1 @@ -sugar-0.81.5.tar.bz2 +sugar-0.81.5-git4f3f508bc3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Jun 2008 10:08:01 -0000 1.10 +++ sources 3 Jul 2008 16:19:58 -0000 1.11 @@ -1 +1 @@ -327c8c958a6346c9084a7a12795a03fa sugar-0.81.5.tar.bz2 +5e7e6820fa11a9643cf8c21aa198c876 sugar-0.81.5-git4f3f508bc3.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sugar.spec 21 Jun 2008 10:08:01 -0000 1.13 +++ sugar.spec 3 Jul 2008 16:19:58 -0000 1.14 @@ -1,9 +1,15 @@ +%define commitid 4f3f508bc3 +%define alphatag 20080703git%{commitid} + Summary: OLPC desktop environment Name: sugar Version: 0.81.5 -Release: 1%{?dist} +Release: 2.%{alphatag}%{?dist} URL: http://dev.laptop.org -Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +# git clone git://dev.laptop.org/sugar +# cd sugar +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 License: GPL/LGPL Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +75,9 @@ %{_datadir}/mime/packages/sugar.xml %changelog +* Thu Jul 03 2008 Tomeu Vizoso - 0.81.5-2.20080703git4f3f508bc3 +- New git snapshot + * Sat Jun 21 2008 Tomeu Vizoso - 0.81.5-1 - Fix a bug with activity switching (benzea) - UI improvements to the control panel frame section (erikos) From fedora-extras-commits at redhat.com Thu Jul 3 16:22:25 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 3 Jul 2008 16:22:25 GMT Subject: rpms/perl-HTML-Encoding/devel .cvsignore, 1.6, 1.7 perl-HTML-Encoding.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200807031622.m63GMPVs026600@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/perl-HTML-Encoding/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532 Modified Files: .cvsignore perl-HTML-Encoding.spec sources Log Message: * Thu Jul 3 2008 Ville Skytt?? - 0.60-1 - 0.60. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Encoding/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 Apr 2008 18:36:12 -0000 1.6 +++ .cvsignore 3 Jul 2008 16:21:32 -0000 1.7 @@ -1 +1 @@ -HTML-Encoding-0.57.tar.gz +HTML-Encoding-0.60.tar.gz Index: perl-HTML-Encoding.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Encoding/devel/perl-HTML-Encoding.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-HTML-Encoding.spec 10 Apr 2008 18:36:12 -0000 1.9 +++ perl-HTML-Encoding.spec 3 Jul 2008 16:21:32 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-HTML-Encoding -Version: 0.57 +Version: 0.60 Release: 1%{?dist} Summary: Determine the encoding of HTML/XML/XHTML documents @@ -56,6 +56,9 @@ %changelog +* Thu Jul 3 2008 Ville Skytt?? - 0.60-1 +- 0.60. + * Thu Apr 10 2008 Ville Skytt?? - 0.57-1 - 0.57. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Encoding/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 Apr 2008 18:36:12 -0000 1.6 +++ sources 3 Jul 2008 16:21:32 -0000 1.7 @@ -1 +1 @@ -4cd6465e1a676ec3ba1e9a30f7788183 HTML-Encoding-0.57.tar.gz +b6a0ded3d1a085bc7b3cdb5ae07e89d2 HTML-Encoding-0.60.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 16:23:43 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 3 Jul 2008 16:23:43 GMT Subject: rpms/gnomesword/F-9 .cvsignore, 1.15, 1.16 gnomesword.spec, 1.45, 1.46 sources, 1.16, 1.17 Message-ID: <200807031623.m63GNh48026763@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625 Modified Files: .cvsignore gnomesword.spec sources Log Message: * Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 - Update to 2.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 27 May 2008 02:20:23 -0000 1.15 +++ .cvsignore 3 Jul 2008 16:22:46 -0000 1.16 @@ -1 +1 @@ -gnomesword-2.3.4.tar.gz +gnomesword-2.3.5.tar.gz Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-9/gnomesword.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnomesword.spec 23 Jun 2008 23:19:33 -0000 1.45 +++ gnomesword.spec 3 Jul 2008 16:22:46 -0000 1.46 @@ -1,6 +1,6 @@ Name: gnomesword -Version: 2.3.4 -Release: 2%{?dist} +Version: 2.3.5 +Release: 1%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text @@ -75,6 +75,9 @@ %_datadir/gnome/help/gnomesword/ %changelog +* Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 +- Update to 2.3.5 + * Mon Jun 23 2008 Deji Akingunola - 2.3.4-2 - Remove --enable-gtkthml configure option, to enable gecko support Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 27 May 2008 02:20:23 -0000 1.16 +++ sources 3 Jul 2008 16:22:46 -0000 1.17 @@ -1 +1 @@ -94fa12e7cc803efdacfa383362463cdc gnomesword-2.3.4.tar.gz +3f54f9750ce7d971afa53c71cc1973d1 gnomesword-2.3.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 16:30:29 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 3 Jul 2008 16:30:29 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.5, 1.6 openoffice.org.spec, 1.1551, 1.1552 openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch, 1.2, NONE Message-ID: <200807031630.m63GUTwo027039@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26985 Modified Files: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch openoffice.org.spec Removed Files: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch Log Message: rats openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch: Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 2 Jul 2008 14:25:19 -0000 1.5 +++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 3 Jul 2008 16:29:54 -0000 1.6 @@ -216,7 +216,6 @@ retrieving revision 1.6.84.1 diff -u -r1.6.84.1 unopkg_app.cxx --- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_app.cxx 10 Aug 2007 15:03:53 -0000 1.6.84.1 -+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx 22 Nov 2007 14:46:24 -0000 @@ -86,6 +86,9 @@ " -V, --version version information\n" " -v, --verbose verbose output to stdout\n" @@ -268,6 +267,16 @@ !readArgument( &deploymentContext, info_context, &nPos ) && !isBootstrapVariable(&nPos)) { +@@ -346,7 +356,7 @@ + + Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv( + createCmdEnv( xComponentContext, logFile, +- option_force, option_verbose, option_bundled) ); ++ option_force, option_link, option_verbose, option_bundled) ); + + if (subcmd_add || + subCommand.equalsAsciiL( ++++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx 22 Nov 2007 14:46:24 -0000 Index: source/pkgchk/unopkg/unopkg_cmdenv.cxx =================================================================== RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx,v Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1551 retrieving revision 1.1552 diff -u -r1.1551 -r1.1552 --- openoffice.org.spec 3 Jul 2008 13:32:07 -0000 1.1551 +++ openoffice.org.spec 3 Jul 2008 16:29:54 -0000 1.1552 @@ -2296,7 +2296,10 @@ %{basisinstdir}/program/versionrc %{basisinstdir}/program/cairocanvas.uno.so %dir %{basisinstdir}/share -%{basisinstdir}/share/Scripts +%dir %{basisinstdir}/share/Scripts +%{basisinstdir}/share/Scripts/beanshell +%{basisinstdir}/share/Scripts/java +%{basisinstdir}/share/Scripts/javascript %dir %{basisinstdir}/share/autocorr %if %{langpacks} %{basisinstdir}/share/autocorr/acor_en-*.dat --- openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 16:46:34 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Thu, 3 Jul 2008 16:46:34 GMT Subject: rpms/sugar-toolkit/OLPC-3 sugar-toolkit.spec,1.12,1.13 Message-ID: <200807031646.m63GkYPf027655@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27605 Modified Files: sugar-toolkit.spec Log Message: fix for localization support Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sugar-toolkit.spec 3 Jul 2008 16:10:24 -0000 1.12 +++ sugar-toolkit.spec 3 Jul 2008 16:45:48 -0000 1.13 @@ -6,7 +6,7 @@ Summary: Sugar toolkit Name: sugar-toolkit Version: 0.81.5 -Release: 2.%{alphatag}%{?dist} +Release: 3.%{alphatag}%{?dist} URL: http://wiki.laptop.org/go/Sugar # Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 # git clone git://dev.laptop.org/sugar-toolkit @@ -50,13 +50,14 @@ %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +%find_lang %name mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README @@ -64,7 +65,7 @@ %{_sysconfdir}/rpm/macros.sugar %changelog -* Thu Jul 03 2008 Simon Schampijer - 0.81.1-2.20080703git7c5fa614a6 +* Thu Jul 03 2008 Simon Schampijer - 0.81.1-3.20080703git7c5fa614a6 - New git snapshot * Sat Jun 21 2008 Tomeu Vizoso - 0.81.5-2 From fedora-extras-commits at redhat.com Thu Jul 3 16:47:56 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Thu, 3 Jul 2008 16:47:56 GMT Subject: rpms/sugar-datastore/OLPC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 sugar-datastore.spec, 1.7, 1.8 Message-ID: <200807031647.m63GluML027732@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-datastore/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27664 Modified Files: .cvsignore sources sugar-datastore.spec Log Message: * Thu Jul 03 2008 Tomeu Vizoso - 0.8.2-2.20080703git588f82ed0d - New git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Jun 2008 09:48:05 -0000 1.6 +++ .cvsignore 3 Jul 2008 16:47:02 -0000 1.7 @@ -1 +1 @@ -sugar-datastore-0.8.2.tar.bz2 +sugar-datastore-0.8.2-git588f82ed0d.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Jun 2008 09:48:05 -0000 1.6 +++ sources 3 Jul 2008 16:47:02 -0000 1.7 @@ -1 +1 @@ -d47b72caa054b034cdbd6a47c7966367 sugar-datastore-0.8.2.tar.bz2 +ed410c13a5eb9142be1c63651f8f6c7f sugar-datastore-0.8.2-git588f82ed0d.tar.bz2 Index: sugar-datastore.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/sugar-datastore.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sugar-datastore.spec 24 Jun 2008 19:34:58 -0000 1.7 +++ sugar-datastore.spec 3 Jul 2008 16:47:02 -0000 1.8 @@ -1,14 +1,19 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%define commitid 588f82ed0d +%define alphatag 20080703git%{commitid} Name: sugar-datastore Version: 0.8.2 -Release: 1%{?dist} +Release: 2.%{alphatag}%{?dist} Summary: Sugar Datastore Group: Development/Libraries License: GPL URL: http://dev.laptop.org/ -Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +# git clone git://dev.laptop.org/projects/datastore +# cd datastore +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -49,6 +54,9 @@ %{_datadir}/dbus-1/services/*.service %changelog +* Thu Jul 03 2008 Tomeu Vizoso - 0.8.2-2.20080703git588f82ed0d +- New git snapshot + * Sat Jun 21 2008 Tomeu Vizoso - 0.8.2-1 - Maintain a metadata copy outside the index From fedora-extras-commits at redhat.com Thu Jul 3 17:26:00 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 3 Jul 2008 17:26:00 GMT Subject: rpms/glib2/devel gio-2.16-only-pass-uri-to-gio-apps.patch,1.2,1.3 Message-ID: <200807031726.m63HQ0TV002929@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2853 Modified Files: gio-2.16-only-pass-uri-to-gio-apps.patch Log Message: Fix a small oversight gio-2.16-only-pass-uri-to-gio-apps.patch: Index: gio-2.16-only-pass-uri-to-gio-apps.patch =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/gio-2.16-only-pass-uri-to-gio-apps.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gio-2.16-only-pass-uri-to-gio-apps.patch 3 Jul 2008 14:57:14 -0000 1.2 +++ gio-2.16-only-pass-uri-to-gio-apps.patch 3 Jul 2008 17:25:28 -0000 1.3 @@ -1,6 +1,6 @@ diff -up glib-2.17.3/gio/gdesktopappinfo.c.only-pass-uri-to-gio-apps glib-2.17.3/gio/gdesktopappinfo.c --- glib-2.17.3/gio/gdesktopappinfo.c.only-pass-uri-to-gio-apps 2008-07-02 17:13:13.000000000 -0400 -+++ glib-2.17.3/gio/gdesktopappinfo.c 2008-07-03 10:55:58.000000000 -0400 ++++ glib-2.17.3/gio/gdesktopappinfo.c 2008-07-03 13:21:42.000000000 -0400 @@ -1,3 +1,5 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ + @@ -31,7 +31,15 @@ info->icon = NULL; if (info->icon_name) -@@ -517,9 +522,35 @@ expand_macro (char macro, +@@ -392,6 +397,7 @@ g_desktop_app_info_dup (GAppInfo *appinf + new_info->exec = g_strdup (info->exec); + new_info->binary = g_strdup (info->binary); + new_info->path = g_strdup (info->path); ++ new_info->vfs_system = g_strdup (info->vfs_system); + new_info->hidden = info->hidden; + new_info->terminal = info->terminal; + new_info->startup_notify = info->startup_notify; +@@ -517,9 +523,35 @@ expand_macro (char macro, { GList *uris = *uri_list; char *expanded; @@ -69,7 +77,7 @@ switch (macro) { case 'u': -@@ -528,7 +559,17 @@ expand_macro (char macro, +@@ -528,7 +560,17 @@ expand_macro (char macro, case 'n': if (uris) { @@ -88,7 +96,7 @@ if (expanded) { g_string_append (exec, expanded); -@@ -545,7 +586,17 @@ expand_macro (char macro, +@@ -545,7 +587,17 @@ expand_macro (char macro, case 'N': while (uris) { From fedora-extras-commits at redhat.com Thu Jul 3 17:26:20 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 3 Jul 2008 17:26:20 GMT Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.69, 1.70 policycoreutils-rhat.patch, 1.373, 1.374 policycoreutils.spec, 1.536, 1.537 Message-ID: <200807031726.m63HQKbo002943@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2875 Modified Files: policycoreutils-gui.patch policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jul 2 2008 Dan Walsh 2.0.52-2 - Add lockdown wizard - Allow semanage booleans to take an input file an process lots of booleans at once. policycoreutils-gui.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.69 -r 1.70 policycoreutils-gui.patch Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- policycoreutils-gui.patch 2 Jul 2008 02:04:52 -0000 1.69 +++ policycoreutils-gui.patch 3 Jul 2008 17:25:34 -0000 1.70 @@ -1,7 +1,47 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.50/gui/booleansPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.52/gui/Makefile +--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.52/gui/Makefile 2008-07-03 13:15:10.000000000 -0400 +@@ -0,0 +1,36 @@ ++# Installation directories. ++PREFIX ?= ${DESTDIR}/usr ++SHAREDIR ?= $(PREFIX)/share/system-config-selinux ++ ++TARGETS= \ ++booleansPage.py \ ++fcontextPage.py \ ++loginsPage.py \ ++mappingsPage.py \ ++modulesPage.py \ ++polgen.py \ ++polgen.glade \ ++portsPage.py \ ++lockdown.glade \ ++semanagePage.py \ ++statusPage.py \ ++system-config-selinux.glade \ ++translationsPage.py \ ++usersPage.py \ ++selinux.tbl ++ ++all: $(TARGETS) system-config-selinux.py polgengui.py templates lockdown.py ++ ++install: all ++ -mkdir -p $(SHAREDIR)/templates ++ install -m 755 system-config-selinux.py $(SHAREDIR) ++ install -m 755 polgengui.py $(SHAREDIR) ++ install -m 755 lockdown.py $(SHAREDIR) ++ install -m 644 $(TARGETS) $(SHAREDIR) ++ install -m 644 templates/*.py $(SHAREDIR)/templates/ ++ ++clean: ++ ++indent: ++ ++relabel: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.52/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/booleansPage.py 2008-07-01 14:59:58.000000000 -0400 -@@ -0,0 +1,230 @@ ++++ policycoreutils-2.0.52/gui/booleansPage.py 2008-07-03 13:08:37.000000000 -0400 +@@ -0,0 +1,237 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel +# @@ -84,6 +124,7 @@ +class booleansPage: + def __init__(self, xml, doDebug=None): + self.xml = xml ++ xml.signal_connect("on_lockdown_clicked", self.on_lockdown_clicked) + self.window = self.xml.get_widget("mainWindow").get_root_window() + self.local = False + self.types=[] @@ -220,6 +261,12 @@ + commands.getstatusoutput(setsebool) + self.ready() + ++ def on_lockdown_clicked(self, button): ++ try: ++ os.spawnl(os.P_NOWAIT, "/usr/share/system-config-selinux/lockdown.py") ++ except ValueError, e: ++ self.error(e.args[0]) ++ + def on_local_clicked(self, button): + self.local = not self.local + self.revertButton.set_sensitive(self.local) @@ -232,9 +279,9 @@ + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.50/gui/fcontextPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.52/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/fcontextPage.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/fcontextPage.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,217 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -453,10 +500,10 @@ + self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.50/gui/lockdown.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.52/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/lockdown.glade 2008-07-01 14:59:58.000000000 -0400 -@@ -0,0 +1,2065 @@ ++++ policycoreutils-2.0.52/gui/lockdown.glade 2008-07-03 12:38:35.000000000 -0400 +@@ -0,0 +1,771 @@ + + + @@ -529,7 +576,7 @@ + + + -+ ++ + True + gtk-media-next + 1 @@ -551,7 +598,7 @@ + + + -+ ++ + True + gtk-media-previous + 1 @@ -565,17 +612,45 @@ + + + -+ ++ ++ True ++ ++ ++ ++ ++ + True -+ Cancel ++ Save As + True -+ -+ ++ ++ ++ ++ ++ ++ True ++ gtk-save-as ++ 1 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ Apply ++ True ++ ++ + + -+ ++ + True -+ gtk-cancel ++ gtk-apply + 1 + 0.5 + 0.5 @@ -585,6 +660,14 @@ + + + ++ ++ ++ ++ True ++ GNOMEUIINFO_MENU_EXIT_ITEM ++ ++ ++ + + + @@ -706,346 +789,315 @@ + + + -+ -+ True -+ False -+ True -+ GTK_POS_TOP [...7593 lines suppressed...] ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.52/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/boolean.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/boolean.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14592,9 +11314,9 @@ +') +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.50/gui/templates/etc_rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.52/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/etc_rw.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/etc_rw.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14725,9 +11447,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.50/gui/templates/executable.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.52/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/executable.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/executable.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,327 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15056,31 +11778,9 @@ +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.50/gui/templates/__init__.py ---- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/__init__.py 2008-07-01 14:59:58.000000000 -0400 -@@ -0,0 +1,18 @@ -+# -+# Copyright (C) 2007 Red Hat, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+# -+ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.50/gui/templates/network.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.52/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/network.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/network.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -15162,9 +11862,9 @@ +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.50/gui/templates/rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.52/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/rw.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/rw.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15294,9 +11994,9 @@ +fc_dir=""" +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.50/gui/templates/script.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.52/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/script.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/script.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15403,9 +12103,9 @@ +# Adding roles to SELinux user USER +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.50/gui/templates/semodule.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.52/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/semodule.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/semodule.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15448,9 +12148,9 @@ +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.50/gui/templates/tmp.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.52/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/tmp.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/tmp.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15549,9 +12249,9 @@ + TEMPLATETYPE_manage_tmp($1) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.50/gui/templates/user.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.52/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/user.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/user.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15735,9 +12435,9 @@ +te_newrole_rules=""" +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t }) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.50/gui/templates/var_lib.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.52/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_lib.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_lib.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15897,9 +12597,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.50/gui/templates/var_log.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.52/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_log.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_log.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16011,9 +12711,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.50/gui/templates/var_run.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.52/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_run.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_run.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16133,9 +12833,9 @@ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.50/gui/templates/var_spool.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.52/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_spool.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_spool.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16266,9 +12966,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.50/gui/translationsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.52/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/translationsPage.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/translationsPage.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -16388,9 +13088,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.50/gui/usersPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.52/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/usersPage.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/usersPage.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.373 retrieving revision 1.374 diff -u -r1.373 -r1.374 --- policycoreutils-rhat.patch 2 Jul 2008 21:22:58 -0000 1.373 +++ policycoreutils-rhat.patch 3 Jul 2008 17:25:34 -0000 1.374 @@ -7,6 +7,12 @@ INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/VERSION policycoreutils-2.0.52/VERSION +--- nsapolicycoreutils/VERSION 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/VERSION 2008-07-02 13:42:54.000000000 -0400 +@@ -1 +1 @@ +-2.0.52 ++2.0.51 diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 +++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-02 13:43:21.000000000 -0400 @@ -38,34 +44,194 @@ close(fd); diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-02 13:43:21.000000000 -0400 -@@ -297,9 +297,10 @@ - if object == "user": ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-03 13:06:55.000000000 -0400 +@@ -51,7 +51,7 @@ + semanage interface -{a|d|m} [-tr] interface_spec + semanage fcontext -{a|d|m} [-frst] file_spec + semanage translation -{a|d|m} [-T] level +-semanage boolean -{d|m} boolean ++semanage boolean -{d|m} [-F] boolean | boolean_file + semanage permissive -{d|a} type + + Primary Options: +@@ -79,6 +79,7 @@ + -l (symbolic link) + -p (named pipe) + ++ -F, --file Treat target as an input file for command, change multiple settings + -p, --proto Port protocol (tcp or udp) + -P, --prefix Prefix for home directory labeling + -L, --level Default SELinux Level (MLS/MCS Systems only) +@@ -114,7 +115,7 @@ + valid_option["translation"] = [] + valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] + valid_option["boolean"] = [] +- valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0" ] ++ valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] + valid_option["permissive"] = [] + valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ] + return valid_option +@@ -136,13 +137,14 @@ + seuser = "" + prefix = "" + heading=1 +- value=0 +- add = 0 +- modify = 0 +- delete = 0 +- deleteall = 0 +- list = 0 +- locallist = 0 ++ value = "" ++ add = False ++ modify = False ++ delete = False ++ deleteall = False ++ list = False ++ locallist = False ++ use_file = False + store = "" + if len(sys.argv) < 3: + usage(_("Requires 2 or more arguments")) +@@ -155,11 +157,12 @@ + args = sys.argv[2:] + + gopts, cmds = getopt.getopt(args, +- '01adf:lhmnp:s:CDR:L:r:t:T:P:S:', ++ '01adf:lhmnp:s:FCDR:L:r:t:T:P:S:', + ['add', + 'delete', + 'deleteall', + 'ftype=', ++ 'file', + 'help', + 'list', + 'modify', +@@ -185,18 +188,22 @@ + if o == "-a" or o == "--add": + if modify or delete: + usage() +- add = 1 ++ add = True + + if o == "-d" or o == "--delete": + if modify or add: + usage() +- delete = 1 ++ delete = True + if o == "-D" or o == "--deleteall": + if modify: + usage() +- deleteall = 1 ++ deleteall = True + if o == "-f" or o == "--ftype": + ftype=a ++ ++ if o == "-F" or o == "--file": ++ use_file = True ++ + if o == "-h" or o == "--help": + usage() + +@@ -204,12 +211,12 @@ + heading=0 + + if o == "-C" or o == "--locallist": +- locallist=1 ++ locallist = True + + if o == "-m"or o == "--modify": + if delete or add: + usage() +- modify = 1 ++ modify = True + + if o == "-S" or o == '--store': + store = a +@@ -220,7 +227,7 @@ + serange = a + + if o == "-l" or o == "--list": +- list = 1 ++ list = True + + if o == "-L" or o == '--level': + if is_mls_enabled == 0: +@@ -246,9 +253,9 @@ + setrans = a + + if o == "--on" or o == "-1": +- value = 1 ++ value = True + if o == "-off" or o == "-0": +- value = 0 ++ value = False + + if object == "login": + OBJECT = seobject.loginRecords(store) +@@ -275,7 +282,10 @@ + OBJECT = seobject.permissiveRecords(store) + + if list: +- OBJECT.list(heading, locallist) ++ if object == "boolean": ++ OBJECT.list(heading, locallist, use_file) ++ else: ++ OBJECT.list(heading, locallist) + sys.exit(0); + + if deleteall: +@@ -298,8 +308,6 @@ rlist = roles.split() if len(rlist) == 0: -- raise ValueError(_("You must specify a role")) + raise ValueError(_("You must specify a role")) - if prefix == "": - raise ValueError(_("You must specify a prefix")) -+ raise ValueError(_("You must specify a role")) -+ if prefix == "": -+ prefix = "user" -+ OBJECT.add(target, rlist, selevel, serange, prefix) if object == "port": +@@ -317,7 +325,12 @@ + + if modify: + if object == "boolean": +- OBJECT.modify(target, value) ++ if use_file: ++ OBJECT.modify(target, use_file = use_file) ++ else: ++ if value == "": ++ raise ValueError(_("boolean requires value")) ++ OBJECT.modify(target, value) + + if object == "login": + OBJECT.modify(target, seuser, serange) diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-02 13:43:21.000000000 -0400 -@@ -3,7 +3,7 @@ ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-03 13:14:31.000000000 -0400 +@@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool .SH "SYNOPSIS" -.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|lC|D} [\-n] +.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|D} [\-n] [\-S store] .br - .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean +-.B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean ++.B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] -F boolean | boolean_file + .br + .B semanage login \-{a|d|m} [\-sr] login_name .br -@@ -87,6 +87,9 @@ +@@ -54,6 +54,11 @@ + File Type. This is used with fcontext. + Requires a file type as shown in the mode field by ls, e.g. use -d to match only directories or -- to match only regular files. + .TP ++.I \-F, \-\-file ++Set multiple records from the input file. When used with the \-l \-\-list, it will output the current settings to stdout in the proper format. ++ ++Currently booleans only. ++.TP + .I \-h, \-\-help + display this message + .TP +@@ -87,6 +92,9 @@ .I \-s, \-\-seuser SELinux user name .TP @@ -75,3 +241,124 @@ .I \-t, \-\-type SELinux Type for the object .TP +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-03 13:07:45.000000000 -0400 +@@ -567,7 +562,7 @@ + def __init__(self, store = ""): + semanageRecords.__init__(self, store) + +- def add(self, name, roles, selevel, serange, prefix): ++ def add(self, name, roles, selevel, serange, prefix = "user"): + if is_mls_enabled == 1: + if serange == "": + serange = "s0" +@@ -1448,53 +1443,58 @@ + def __init__(self, store = ""): + semanageRecords.__init__(self, store) + +- def modify(self, name, value = ""): +- if value == "": +- raise ValueError(_("Requires value")) +- +- (rc,k) = semanage_bool_key_create(self.sh, name) +- if rc < 0: +- raise ValueError(_("Could not create a key for %s") % name) +- +- (rc,exists) = semanage_bool_exists(self.sh, k) +- if rc < 0: +- raise ValueError(_("Could not check if boolean %s is defined") % name) +- if not exists: +- raise ValueError(_("Boolean %s is not defined") % name) +- +- (rc,b) = semanage_bool_query(self.sh, k) +- if rc < 0: +- raise ValueError(_("Could not query file context %s") % name) ++ def __mod(self, name, value): ++ (rc,k) = semanage_bool_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError(_("Could not create a key for %s") % name) ++ (rc,exists) = semanage_bool_exists(self.sh, k) ++ if rc < 0: ++ raise ValueError(_("Could not check if boolean %s is defined") % name) ++ if not exists: ++ raise ValueError(_("Boolean %s is not defined") % name) ++ ++ (rc,b) = semanage_bool_query(self.sh, k) ++ if rc < 0: ++ raise ValueError(_("Could not query file context %s") % name) + +- if value != "": +- nvalue = int(value) +- semanage_bool_set_value(b, nvalue) ++ if value != "": ++ nvalue = int(value) ++ semanage_bool_set_value(b, nvalue) + else: + raise ValueError(_("You must specify a value")) ++ ++ rc = semanage_bool_set_active(self.sh, k, b) ++ if rc < 0: ++ raise ValueError(_("Could not set active value of boolean %s") % name) ++ rc = semanage_bool_modify_local(self.sh, k, b) ++ if rc < 0: ++ raise ValueError(_("Could not modify boolean %s") % name) ++ semanage_bool_key_free(k) ++ semanage_bool_free(b) + ++ def modify(self, name, value=False, use_file=False): ++ + rc = semanage_begin_transaction(self.sh) + if rc < 0: + raise ValueError(_("Could not start semanage transaction")) +- +- rc = semanage_bool_set_active(self.sh, k, b) +- if rc < 0: +- raise ValueError(_("Could not set active value of boolean %s") % name) +- rc = semanage_bool_modify_local(self.sh, k, b) +- if rc < 0: +- raise ValueError(_("Could not modify boolean %s") % name) ++ if use_file: ++ fd = open(name) ++ for b in fd.read().split(): ++ bool, val = b.split("=") ++ self.__mod(bool, val) ++ fd.close() ++ else: ++ self.__mod(name, value) + + rc = semanage_commit(self.sh) + if rc < 0: + raise ValueError(_("Could not modify boolean %s") % name) + +- semanage_bool_key_free(k) +- semanage_bool_free(b) +- + def delete(self, name): +- (rc,k) = semanage_bool_key_create(self.sh, name) +- if rc < 0: +- raise ValueError(_("Could not create a key for %s") % name) + ++ (rc,k) = semanage_bool_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError(_("Could not create a key for %s") % name) + (rc,exists) = semanage_bool_exists(self.sh, k) + if rc < 0: + raise ValueError(_("Could not check if boolean %s is defined") % name) +@@ -1571,8 +1571,15 @@ + else: + return _("unknown") + +- def list(self, heading = 1, locallist = 0): ++ def list(self, heading = True, locallist = False, use_file = False): + on_off = (_("off"),_("on")) ++ if use_file: ++ ddict = self.get_all(locallist) ++ keys = ddict.keys() ++ for k in keys: ++ if ddict[k]: ++ print "%s=%s" % (k, ddict[k][2]) ++ return + if heading: + print "%-40s %s\n" % (_("SELinux boolean"), _("Description")) + ddict = self.get_all(locallist) Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.536 retrieving revision 1.537 diff -u -r1.536 -r1.537 --- policycoreutils.spec 2 Jul 2008 21:22:59 -0000 1.536 +++ policycoreutils.spec 3 Jul 2008 17:25:34 -0000 1.537 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,10 @@ fi %changelog +* Wed Jul 2 2008 Dan Walsh 2.0.52-2 +- Add lockdown wizard +- Allow semanage booleans to take an input file an process lots of booleans at once. + * Wed Jul 2 2008 Dan Walsh 2.0.52-1 - Default prefix to "user" From fedora-extras-commits at redhat.com Thu Jul 3 17:35:20 2008 From: fedora-extras-commits at redhat.com (Dan Smith (danms)) Date: Thu, 3 Jul 2008 17:35:20 GMT Subject: rpms/libvirt-cim/F-9 .cvsignore, 1.7, 1.8 libvirt-cim.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <200807031735.m63HZKZW003396@cvs-int.fedora.redhat.com> Author: danms Update of /cvs/pkgs/rpms/libvirt-cim/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3306 Modified Files: .cvsignore libvirt-cim.spec sources Log Message: Update to upstream 0.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 May 2008 19:55:27 -0000 1.7 +++ .cvsignore 3 Jul 2008 17:34:39 -0000 1.8 @@ -2,3 +2,4 @@ kvm_method.patch registeredprofile.patch libvirt-cim-0.4.tar.gz +libvirt-cim-0.5.tar.gz Index: libvirt-cim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-9/libvirt-cim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libvirt-cim.spec 30 May 2008 18:10:47 -0000 1.14 +++ libvirt-cim.spec 3 Jul 2008 17:34:39 -0000 1.15 @@ -2,8 +2,8 @@ Summary: A CIM provider for libvirt Name: libvirt-cim -Version: 0.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: libvirt-cim-%{version}.tar.gz @@ -18,11 +18,6 @@ BuildRequires: libcmpiutil-devel BuildConflicts: sblim-cmpi-devel Patch0: parse.patch -Patch1: poolconf.patch -Patch2: poolmember.patch -Patch3: procfix.patch -Patch4: vcpufix.patch -Patch5: rasdns.patch %description Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC @@ -35,11 +30,6 @@ chmod -f -x src/* libxkutil/* schema/* README doc/* #base_schema/README* chmod +X src/* libxkutil/* schema/* %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %configure --disable-werror @@ -119,6 +109,9 @@ /etc/ld.so.conf.d/libvirt-cim.conf %changelog +* Thu Jun 03 2008 Dan Smith - 0.5-1 +- Updated to latest upstream source + * Fri May 30 2008 Dan Smith - 0.4-2 - Fixed schema registration to pick up ECTP in root/virt properly - Fixed schema registration to include ReferencedProfile in interop Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 29 May 2008 19:55:27 -0000 1.9 +++ sources 3 Jul 2008 17:34:39 -0000 1.10 @@ -2,3 +2,4 @@ 36bbef64cba0015daf6eb34d054a2751 kvm_method.patch 4dc7a3c5b5ed780eb57524f945fc5f5a registeredprofile.patch 25801f1a5c7ef4b36fde88b965f65007 libvirt-cim-0.4.tar.gz +2dbe3753cc661baaf43c7b462bda4d01 libvirt-cim-0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 17:38:38 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 3 Jul 2008 17:38:38 GMT Subject: rpms/totem/OLPC-3 totem.spec,1.191,1.192 Message-ID: <200807031738.m63HccP5003610@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/totem/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3500 Modified Files: totem.spec Log Message: disable Requires on gvfs-fuse during minial build Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/OLPC-3/totem.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- totem.spec 3 Jul 2008 04:14:20 -0000 1.191 +++ totem.spec 3 Jul 2008 17:38:06 -0000 1.192 @@ -11,7 +11,7 @@ Summary: Movie player for GNOME Name: totem Version: 2.23.4 -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -75,7 +75,9 @@ Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version Requires: gstreamer-plugins-flumpegdemux >= %gstreamer_plugins_flumpegdemux_version +%if %{minimal_build} == 0 Requires: gvfs-fuse +%endif BuildRequires: gstreamer-devel >= %gstreamer_version BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version @@ -446,6 +448,9 @@ %endif %changelog +* Thu Jul 03 2008 - Dennis Gilmore - 2.23.4-1.3 +- disable Requires: gvfs-fuse in totem-gstreamer on minimal build + * Wed Jul 02 2008 - Dennis Gilmore - 2.23.4-1.2 - rebuild against the newer totem-pl-parser From fedora-extras-commits at redhat.com Thu Jul 3 17:54:19 2008 From: fedora-extras-commits at redhat.com (Dan Smith (danms)) Date: Thu, 3 Jul 2008 17:54:19 GMT Subject: rpms/libvirt-cim/devel .cvsignore, 1.6, 1.7 libvirt-cim.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200807031754.m63HsJZe004466@cvs-int.fedora.redhat.com> Author: danms Update of /cvs/pkgs/rpms/libvirt-cim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302 Modified Files: .cvsignore libvirt-cim.spec sources Log Message: Update to upstream version 0.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2008 19:08:05 -0000 1.6 +++ .cvsignore 3 Jul 2008 17:53:23 -0000 1.7 @@ -1,3 +1,4 @@ libvirt-cim-0.3.tar.gz kvm_method.patch registeredprofile.patch +libvirt-cim-0.5.tar.gz Index: libvirt-cim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libvirt-cim.spec 14 Mar 2008 19:37:23 -0000 1.12 +++ libvirt-cim.spec 3 Jul 2008 17:53:23 -0000 1.13 @@ -2,15 +2,15 @@ Summary: A CIM provider for libvirt Name: libvirt-cim -Version: 0.3 -Release: 4%{?dist} +Version: 0.5 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: libvirt-cim-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/CIM/ Requires: unzip -BuildRequires: libcmpiutil >= 0.3 +BuildRequires: libcmpiutil >= 0.4 BuildRequires: tog-pegasus-devel BuildRequires: libvirt-devel >= 0.3.2 BuildRequires: e2fsprogs-devel @@ -18,8 +18,6 @@ BuildRequires: libcmpiutil-devel BuildConflicts: sblim-cmpi-devel Patch0: parse.patch -Patch1: kvm_method.patch -Patch2: registeredprofile.patch %description Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC @@ -32,8 +30,6 @@ chmod -f -x src/* libxkutil/* schema/* README doc/* #base_schema/README* chmod +X src/* libxkutil/* schema/* %patch0 -p1 -%patch1 -p1 -%patch2 -p0 %build %configure --disable-werror @@ -61,8 +57,8 @@ %define REGISTRATION %{_datadir}/%{name}/*.registration %define SCHEMA %{_datadir}/%{name}/*.mof -%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile}.registration -%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile}.mof +%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration +%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.mof # _If_ there is already a version of this installed, we must deregister # the classes we plan to install in post, otherwise we may corrupt @@ -82,6 +78,9 @@ -n root/virt \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true %{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/virt \ + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ -n root/interop \ -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true @@ -110,6 +109,18 @@ /etc/ld.so.conf.d/libvirt-cim.conf %changelog +* Thu Jun 03 2008 Dan Smith - 0.5-1 +- Updated to latest upstream source + +* Fri May 30 2008 Dan Smith - 0.4-2 +- Fixed schema registration to pick up ECTP in root/virt properly +- Fixed schema registration to include ReferencedProfile in interop +- Added RASD namespace fix + +* Wed May 21 2008 Dan Smith - 0.4-1 +- Updated to latest upstream source +- Added default disk pool configuration patch + * Fri Mar 14 2008 Dan Smith - 0.3-4 - Fixed loader config for 64-bit systems - Added missing root/interop schema install Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Mar 2008 19:37:23 -0000 1.8 +++ sources 3 Jul 2008 17:53:23 -0000 1.9 @@ -1,3 +1,4 @@ 528908c9daf98c077f90b7df6fdf1c0a libvirt-cim-0.3.tar.gz 36bbef64cba0015daf6eb34d054a2751 kvm_method.patch 4dc7a3c5b5ed780eb57524f945fc5f5a registeredprofile.patch +2dbe3753cc661baaf43c7b462bda4d01 libvirt-cim-0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 17:55:42 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Thu, 3 Jul 2008 17:55:42 GMT Subject: rpms/kernel/devel kernel.spec, 1.731, 1.732 linux-2.6-wireless-pending.patch, 1.58, 1.59 linux-2.6-wireless.patch, 1.44, 1.45 Message-ID: <200807031755.m63Htg7Y004640@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494 Modified Files: kernel.spec linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-07-02 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- kernel.spec 3 Jul 2008 15:57:05 -0000 1.731 +++ kernel.spec 3 Jul 2008 17:54:55 -0000 1.732 @@ -1146,9 +1146,9 @@ #ApplyPatch linux-2.6-selinux-ecryptfs-support.patch # wireless patches headed for 2.6.26 -#ApplyPatch linux-2.6-wireless.patch +ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.27 -#ApplyPatch linux-2.6-wireless-pending.patch +ApplyPatch linux-2.6-wireless-pending.patch # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch @@ -1796,6 +1796,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 03 2008 John W. Linville +- Upstream wireless fixes from 2008-07-02 + (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) + * Thu Jul 03 2008 Dave Jones - 2.6.26-rc8-git3 linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.58 -r 1.59 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- linux-2.6-wireless-pending.patch 1 Jul 2008 15:29:57 -0000 1.58 +++ linux-2.6-wireless-pending.patch 3 Jul 2008 17:54:55 -0000 1.59 @@ -97,18 +97,6 @@ Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit a6ecfe5a9bd32c9426f9af801e62f21da132a2cc -Author: Zhu Yi -Date: Mon Jun 30 17:23:29 2008 +0800 - - iwlwifi: drop skb silently for Tx request in monitor mode - - This patch fixes the problem to keep mac80211 resubmitting SKBs - when Tx request cannot be met in monitor mode. - - Signed-off-by: Zhu Yi - Signed-off-by: John W. Linville - commit 6fe878497b04b9c428842ab9c89c0e2d712860ad Author: Rick Farrington Date: Mon Jun 30 17:23:28 2008 +0800 @@ -132,23 +120,6 @@ Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 32c932be01d96abe84340b0831db949ca4713292 -Author: Rick Farrington -Date: Mon Jun 30 17:23:27 2008 +0800 - - iwlwifi: fix incorrect 5GHz rates reported in monitor mode - - This patch fixes the rates reported in monitor mode operation - (Wireshark) for iwlwifi. - - Previously, packets with rates of 6M..24M would be reported - incorrectly and packets with rates of 36M..54M would not passed - up the stack. - - Signed-off-by: Rick Farrington - Signed-off-by: Zhu Yi - Signed-off-by: John W. Linville - commit 0a078ffa011209c307880da10917ef205b4b11f4 Author: Tomas Winkler Date: Mon Jun 30 17:23:26 2008 +0800 @@ -6681,8 +6652,8 @@ Signed-off-by: John W. Linville diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-07-01 10:55:58.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-07-03 13:46:32.000000000 -0400 @@ -0,0 +1,11 @@ +interface=wlan0 +driver=nl80211 @@ -6696,8 +6667,8 @@ +wpa_pairwise=CCMP +wpa_passphrase=12345678 diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-07-01 10:55:58.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-07-03 13:46:32.000000000 -0400 @@ -0,0 +1,67 @@ +mac80211_hwsim - software simulator of 802.11 radio(s) for mac80211 +Copyright (c) 2008, Jouni Malinen @@ -6767,8 +6738,8 @@ +# Run wpa_supplicant (station) for wlan1 +wpa_supplicant -Dwext -iwlan1 -c wpa_supplicant.conf diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-07-01 10:55:58.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-07-03 13:46:32.000000000 -0400 @@ -0,0 +1,10 @@ +ctrl_interface=/var/run/wpa_supplicant + @@ -6781,8 +6752,8 @@ + group=CCMP +} diff -up linux-2.6.25.noarch/Documentation/rfkill.txt.orig linux-2.6.25.noarch/Documentation/rfkill.txt ---- linux-2.6.25.noarch/Documentation/rfkill.txt.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/Documentation/rfkill.txt 2008-07-01 10:55:58.000000000 -0400 +--- linux-2.6.25.noarch/Documentation/rfkill.txt.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/Documentation/rfkill.txt 2008-07-03 13:46:32.000000000 -0400 @@ -1,89 +1,528 @@ rfkill - RF switch subsystem support ==================================== @@ -7371,8 +7342,8 @@ +available through sysfs in a generic way at this time, and it is not available +through the rfkill class AT ALL. diff -up linux-2.6.25.noarch/drivers/net/b44.c.orig linux-2.6.25.noarch/drivers/net/b44.c ---- linux-2.6.25.noarch/drivers/net/b44.c.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/b44.c 2008-07-01 10:55:58.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/b44.c.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/b44.c 2008-07-03 13:46:32.000000000 -0400 @@ -148,9 +148,9 @@ static inline void b44_sync_dma_desc_for unsigned long offset, enum dma_data_direction dir) @@ -7660,8 +7631,8 @@ kfree(tx_ring); goto out_err; diff -up linux-2.6.25.noarch/drivers/net/Kconfig.orig linux-2.6.25.noarch/drivers/net/Kconfig ---- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-07-01 10:55:58.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-07-03 13:21:02.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-07-03 13:46:32.000000000 -0400 @@ -2283,6 +2283,19 @@ config GELIC_WIRELESS the driver automatically distinguishes the models, you can safely enable this option even if you have a wireless-less model. @@ -7683,8 +7654,8 @@ tristate "Gianfar Ethernet" depends on FSL_SOC diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-07-01 10:55:58.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-07-03 13:21:02.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-07-03 13:46:32.000000000 -0400 @@ -110,7 +110,7 @@ static void gelic_card_get_ether_port_st void gelic_card_up(struct gelic_card *card) { @@ -7731,8 +7702,8 @@ return card; diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-07-01 10:55:59.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-07-03 13:21:02.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-07-03 13:46:32.000000000 -0400 @@ -298,7 +298,7 @@ struct gelic_card { wait_queue_head_t waitq; @@ -7743,8 +7714,8 @@ u64 ether_port_status; diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-07-01 10:55:59.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-07-03 13:21:02.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-07-03 13:46:32.000000000 -0400 @@ -45,7 +45,8 @@ #include "ps3_gelic_wireless.h" @@ -8410,8 +8381,8 @@ destroy_workqueue(wl->eurus_cmd_queue); destroy_workqueue(wl->event_queue); diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-07-01 10:55:59.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-07-03 13:46:32.000000000 -0400 @@ -241,7 +241,7 @@ enum gelic_wl_assoc_state { #define GELIC_WEP_KEYS 4 struct gelic_wl_info { @@ -8441,8 +8412,8 @@ struct iw_statistics iwstat; }; diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-01 10:55:59.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-03 13:21:02.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-03 13:46:32.000000000 -0400 @@ -306,11 +306,10 @@ static int adm8211_get_tx_stats(struct i struct ieee80211_tx_queue_stats *stats) { @@ -8605,8 +8576,8 @@ return 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-01 10:55:59.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-03 13:21:02.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-03 13:46:32.000000000 -0400 @@ -443,7 +443,6 @@ struct adm8211_rx_ring_info { struct adm8211_tx_ring_info { struct sk_buff *skb; @@ -8616,8 +8587,8 @@ }; diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 10:55:59.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-03 13:21:02.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-03 13:46:32.000000000 -0400 @@ -85,10 +85,10 @@ static struct pci_driver airo_driver = { /* Include Wireless Extension definition and check version - Jean II */ @@ -9063,8 +9034,8 @@ &net->bss); diff -up linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig linux-2.6.25.noarch/drivers/net/wireless/arlan.h ---- linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig 2008-07-01 10:55:41.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-07-01 10:55:59.000000000 -0400 [...3802 lines suppressed...] } @@ -77001,7 +76983,7 @@ set_bit(i, q->qdisc_pool); return err; -@@ -408,16 +379,6 @@ static int wme_qdiscop_init(struct Qdisc +@@ -407,16 +378,6 @@ static int wme_qdiscop_init(struct Qdisc static int wme_qdiscop_dump(struct Qdisc *qd, struct sk_buff *skb) { @@ -77018,7 +77000,7 @@ return -1; } -@@ -430,7 +391,7 @@ static int wme_classop_graft(struct Qdis +@@ -429,7 +390,7 @@ static int wme_classop_graft(struct Qdis struct ieee80211_hw *hw = &local->hw; unsigned long queue = arg - 1; @@ -77027,7 +77009,7 @@ return -EINVAL; if (!new) -@@ -454,7 +415,7 @@ wme_classop_leaf(struct Qdisc *qd, unsig +@@ -453,7 +414,7 @@ wme_classop_leaf(struct Qdisc *qd, unsig struct ieee80211_hw *hw = &local->hw; unsigned long queue = arg - 1; @@ -77036,7 +77018,7 @@ return NULL; return q->queues[queue]; -@@ -467,7 +428,7 @@ static unsigned long wme_classop_get(str +@@ -466,7 +427,7 @@ static unsigned long wme_classop_get(str struct ieee80211_hw *hw = &local->hw; unsigned long queue = TC_H_MIN(classid); @@ -77045,7 +77027,7 @@ return 0; return queue; -@@ -493,7 +454,7 @@ static int wme_classop_change(struct Qdi +@@ -492,7 +453,7 @@ static int wme_classop_change(struct Qdi struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); struct ieee80211_hw *hw = &local->hw; @@ -77054,7 +77036,7 @@ return -ENOENT; /* TODO: put code to program hardware queue parameters here, -@@ -510,7 +471,7 @@ static int wme_classop_delete(struct Qdi +@@ -509,7 +470,7 @@ static int wme_classop_delete(struct Qdi struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); struct ieee80211_hw *hw = &local->hw; @@ -77063,7 +77045,7 @@ return -ENOENT; return 0; } -@@ -523,7 +484,7 @@ static int wme_classop_dump_class(struct +@@ -522,7 +483,7 @@ static int wme_classop_dump_class(struct struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); struct ieee80211_hw *hw = &local->hw; @@ -77072,7 +77054,7 @@ return -ENOENT; tcm->tcm_handle = TC_H_MIN(cl); tcm->tcm_parent = qd->handle; -@@ -541,7 +502,7 @@ static void wme_classop_walk(struct Qdis +@@ -540,7 +501,7 @@ static void wme_classop_walk(struct Qdis if (arg->stop) return; @@ -77081,7 +77063,7 @@ if (arg->count < arg->skip) { arg->count++; continue; -@@ -658,10 +619,13 @@ int ieee80211_ht_agg_queue_add(struct ie +@@ -657,10 +618,13 @@ int ieee80211_ht_agg_queue_add(struct ie DECLARE_MAC_BUF(mac); /* prepare the filter and save it for the SW queue @@ -77097,7 +77079,7 @@ if (!test_and_set_bit(i, q->qdisc_pool)) { ieee80211_stop_queue(local_to_hw(local), i); sta->tid_to_tx_q[tid] = i; -@@ -690,13 +654,14 @@ void ieee80211_ht_agg_queue_remove(struc +@@ -689,13 +653,14 @@ void ieee80211_ht_agg_queue_remove(struc struct sta_info *sta, u16 tid, u8 requeue) { @@ -77113,7 +77095,7 @@ if (requeue) ieee80211_requeue(local, agg_queue); -@@ -715,7 +680,6 @@ void ieee80211_requeue(struct ieee80211_ +@@ -714,7 +679,6 @@ void ieee80211_requeue(struct ieee80211_ if (!qdisc || !qdisc->dequeue) return; @@ -77122,8 +77104,8 @@ skb = qdisc->dequeue(qdisc); root_qd->q.qlen--; diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-03 13:21:05.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-03 13:46:33.000000000 -0400 @@ -31,7 +31,7 @@ static inline int WLAN_FC_IS_QOS_DATA(u1 return (fc & 0x8C) == 0x88; } @@ -77134,8 +77116,8 @@ int ieee80211_qdisc_installed(struct net_device *dev); int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-01 10:56:51.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-03 13:21:05.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-03 13:46:33.000000000 -0400 @@ -24,46 +24,22 @@ static int ieee80211_get_hdr_info(const { struct ieee80211_hdr *hdr; @@ -77574,8 +77556,8 @@ } } diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c ---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-03 13:46:33.000000000 -0400 @@ -39,8 +39,56 @@ MODULE_LICENSE("GPL"); static LIST_HEAD(rfkill_list); /* list of registered rf switches */ static DEFINE_MUTEX(rfkill_mutex); @@ -78037,8 +78019,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-03 13:46:33.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -78196,8 +78178,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-03 13:46:33.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -78206,8 +78188,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-03 13:21:06.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-03 13:46:33.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -78237,8 +78219,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-03 13:21:06.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-03 13:46:33.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -78302,8 +78284,8 @@ /* exported functions */ diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-03 13:46:33.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -78345,8 +78327,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 10:55:42.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 10:56:00.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-03 13:21:06.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-03 13:46:33.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- linux-2.6-wireless.patch 1 Jul 2008 15:29:57 -0000 1.44 +++ linux-2.6-wireless.patch 3 Jul 2008 17:54:55 -0000 1.45 @@ -1,956 +1,114 @@ -commit 23976efedd5ecb420b87455787c537eb4aed1981 -Author: Emmanuel Grumbach -Date: Sat Jun 28 02:50:13 2008 +0300 +commit 7b58ccfe32f40eca8c8ca29aa723a5d0e814f0c9 +Author: andrey at cozybit.com +Date: Tue Jul 1 11:43:53 2008 -0700 - mac80211: don't accept WEP keys other than WEP40 and WEP104 + libertas: support USB persistence on suspend/resume (resend) - This patch makes mac80211 refuse a WEP key whose length is not WEP40 nor - WEP104. + Handle .reset_resume() so that libertas can survive suspend/resume without + reloading the firmware. - Signed-off-by: Emmanuel Grumbach - Signed-off-by: Tomas Winkler + Signed-off-by: Andrey Yurovsky + Acked-by: Deepak Saxena + Acked-by: Dan Williams Signed-off-by: John W. Linville -commit 1bcca3c463e4930cef9986b05165bb0b3eb46f63 -Author: Pavel Roskin -Date: Fri Jun 27 16:19:58 2008 -0400 +commit 6afe6828b19b4567768264831d101026cb5510ff +Author: Zhu Yi +Date: Tue Jul 1 09:20:34 2008 +0800 - hostap: fix sparse warnings + iwlwifi: drop skb silently for Tx request in monitor mode - Rewrite AID calculation in handle_pspoll() to avoid truncating bits. - Make hostap_80211_header_parse() static, don't export it. Avoid - shadowing variables. + This patch fixes the problem to keep mac80211 resubmitting SKBs + when Tx request cannot be met in monitor mode. - Signed-off-by: Pavel Roskin - Signed-off-by: John W. Linville - -commit 15ea0ebc5b7305cc75189cb6b7924d0db5278e0c -Author: Pavel Roskin -Date: Fri Jun 27 16:19:52 2008 -0400 - - hostap: don't report useless WDS frames by default - - DEBUG_EXTRA is reported to the kernel log by default, but DEBUG_EXTRA2 - is not. Unrelated WDS frames pollute the log unnecessarily. - - Signed-off-by: Pavel Roskin - Signed-off-by: John W. Linville - -commit 00eb7fe77eb455f807c396f9917f0f623d4c84bb -Author: Emmanuel Grumbach -Date: Thu Jun 26 12:13:46 2008 +0300 - - mac80211: fix an oops in several failure paths in key allocation - - This patch fixes an oops in several failure paths in key allocation. This - Oops occurs when freeing a key that has not been linked yet, so the - key->sdata is not set. - - Signed-off-by: Emmanuel Grumbach - Signed-off-by: Tomas Winkler - Acked-by: Johannes Berg - Signed-off-by: John W. Linville - -commit 5f4a6fae46a214c4dce3bd63a6219a5f1c818c78 -Author: Harvey Harrison -Date: Wed Jun 25 14:20:37 2008 -0700 - - prism: islpci_eth.c endianness fix - - clock is already cpu-endian (see le32_to_cpu slightly before), so - le64_to_cpu doesn't make much sense. - - Signed-off-by: Harvey Harrison - Signed-off-by: John W. Linville - -commit 980dfcb93232907034a2c92d62d3a7d6ac7bef44 -Author: Ivo van Doorn -Date: Wed Jun 25 21:27:00 2008 +0200 - - rt2x00: Fix lock dependency errror - - This fixes a circular locking dependency in the workqueue handling. - The interface work task uses the mac80211 function - ieee80211_iterate_active_interfaces() which grabs the RTNL lock. - - However when the interface is brough down, this happens under the RTNL - lock as well, this causes problems because mac80211 will flush the workqueue - during the ifdown event. This causes mac80211 to wait until the driver has - completed all work which can't finish because it is waiting on the RTNL lock. - - This is fixed by moving rt2x00 workqueue tasks on a different workqueue, - this workqueue can be flushed when the ieee80211_hw structure is removed - by the driver (when the driver is unloaded) which does not happen under the - RTNL lock. - - Signed-off-by: Ivo van Doorn - Signed-off-by: John W. Linville - -commit 66b5004d85164a6439d3ba1e7757734472ee2cac -Author: Ron Rindjunsky -Date: Wed Jun 25 16:46:31 2008 +0800 - - iwlwifi: improve scanning band selection management - - This patch modifies the band selection management when scanning, so - bands are now scanned according to HW band support. - - Signed-off-by: Ron Rindjunsky - Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 99ade2597e3f7f0ad463c489aaccd6cc605e242c -Author: Ivo van Doorn -Date: Fri Jun 20 22:11:00 2008 +0200 +commit ec04fd60fd74a9db9c63fe11d519be3642cabfdd +Author: Rick Farrington +Date: Tue Jul 1 09:20:33 2008 +0800 - rt2x00: Fix unbalanced mutex locking + iwlwifi: fix incorrect 5GHz rates reported in monitor mode - The usb_cache_mutex was not correctly released - under all circumstances. Both rt73usb as rt2500usb - didn't release the mutex under certain conditions - when the register access failed. Obviously such - failure would lead to deadlocks. - - In addition under similar circumstances when the - bbp register couldn't be read the value must be - set to 0xff to indicate that the value is wrong. - This too didn't happen under all circumstances. - - Signed-off-by: Ivo van Doorn - Signed-off-by: John W. Linville - -commit 2f9ec47d0954f9d2e5a00209c2689cbc477a8c89 -Author: Michael Buesch -Date: Fri Jun 20 11:40:46 2008 +0200 - - b43legacy: Fix possible NULL pointer dereference in DMA code - - This fixes a possible NULL pointer dereference in an error path of the - DMA allocation error checking code. This is also necessary for a future - DMA API change that is on its way into the mainline kernel that adds - an additional dev parameter to dma_mapping_error(). - - Signed-off-by: Michael Buesch - Cc: stable - Signed-off-by: John W. Linville - -commit 7b3abfc87ec13a81b255012b6e1bd4caeeb05aec -Author: Michael Buesch -Date: Sun Jun 15 16:01:24 2008 +0200 - - b43: Fix possible MMIO access while device is down - - This fixes a possible MMIO access while the device is still down - from a suspend cycle. MMIO accesses with the device powered down - may cause crashes on certain devices. - - Signed-off-by: Michael Buesch - Signed-off-by: John W. Linville - -commit 664f200610a3c9641ff58fc91b986b804cb1cc2d -Author: Michael Buesch -Date: Sun Jun 15 15:27:49 2008 +0200 - - b43legacy: Do not return TX_BUSY from op_tx + This patch fixes the rates reported in monitor mode operation + (Wireshark) for iwlwifi. - Never return TX_BUSY from op_tx. It doesn't make sense to return - TX_BUSY, if we can not transmit the packet. - Drop the packet and return TX_OK. + Previously, packets with rates of 6M..24M would be reported + incorrectly and packets with rates of 36M..54M would not passed + up the stack. - Signed-off-by: Michael Buesch - Signed-off-by: John W. Linville - -commit c9e8eae0935f03e2d03a7ad7af80d8fc6c53e68c -Author: Michael Buesch -Date: Sun Jun 15 15:17:29 2008 +0200 - - b43: Do not return TX_BUSY from op_tx - - Never return TX_BUSY from op_tx. It doesn't make sense to return - TX_BUSY, if we can not transmit the packet. - Drop the packet and return TX_OK. - This will fix the resume hang. - - Signed-off-by: Michael Buesch - Signed-off-by: John W. Linville - -commit 59d393ad92f719d9ef36b96eae56d4817a7eeb10 -Author: Tony Vroon -Date: Wed Jun 11 16:23:56 2008 -0400 - - mac80211: implement EU regulatory domain - - Implement missing EU regulatory domain for mac80211. Based on the - information in IEEE 802.11-2007 (specifically pages 1142, 1143 & 1148) - and ETSI 301 893 (V1.4.1). - With thanks to Johannes Berg. - - Signed-off-by: Tony Vroon - Acked-by: Johannes Berg + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/leds.c 2008-07-01 10:48:12.000000000 -0400 -@@ -72,6 +72,9 @@ static void b43_led_brightness_set(struc - struct b43_wldev *dev = led->dev; - bool radio_enabled; - -+ if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) -+ return; -+ - /* Checking the radio-enabled status here is slightly racy, - * but we want to avoid the locking overhead and we don't care - * whether the LED has the wrong state for a second. */ -diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/dma.c 2008-07-01 10:48:12.000000000 -0400 -@@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setu - if (!ring) - goto out; - ring->type = type; -+ ring->dev = dev; - - nr_slots = B43legacy_RXRING_SLOTS; - if (for_tx) -@@ -922,7 +923,6 @@ struct b43legacy_dmaring *b43legacy_setu - DMA_TO_DEVICE); - } - -- ring->dev = dev; - ring->nr_slots = nr_slots; - ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index); - ring->index = controller_index; -diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-01 10:48:12.000000000 -0400 -@@ -2378,8 +2378,10 @@ static int b43legacy_op_tx(struct ieee80 - } else - err = b43legacy_dma_tx(dev, skb, ctl); - out: -- if (unlikely(err)) -- return NETDEV_TX_BUSY; -+ if (unlikely(err)) { -+ /* Drop the packet. */ +diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-07-03 13:21:06.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-07-03 13:38:42.000000000 -0400 +@@ -6687,7 +6687,8 @@ static int iwl3945_mac_tx(struct ieee802 + + if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { + IWL_DEBUG_MAC80211("leave - monitor\n"); +- return -1; + dev_kfree_skb_any(skb); -+ } - return NETDEV_TX_OK; - } - -diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-01 10:48:12.000000000 -0400 -@@ -2883,12 +2883,11 @@ static int b43_op_tx(struct ieee80211_hw - - if (unlikely(skb->len < 2 + 2 + 6)) { - /* Too short, this can't be a valid frame. */ -- dev_kfree_skb_any(skb); -- return NETDEV_TX_OK; -+ goto drop_packet; ++ return 0; } - B43_WARN_ON(skb_shinfo(skb)->nr_frags); - if (unlikely(!dev)) -- return NETDEV_TX_BUSY; -+ goto drop_packet; - - /* Transmissions on seperate queues can run concurrently. */ - read_lock_irqsave(&wl->tx_lock, flags); -@@ -2904,7 +2903,12 @@ static int b43_op_tx(struct ieee80211_hw - read_unlock_irqrestore(&wl->tx_lock, flags); - if (unlikely(err)) -- return NETDEV_TX_BUSY; -+ goto drop_packet; -+ return NETDEV_TX_OK; + IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, +diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-03 13:21:03.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-03 13:38:42.000000000 -0400 +@@ -588,8 +588,12 @@ static void iwl3945_add_radiotap(struct + + if (rate == -1) + iwl3945_rt->rt_rate = 0; +- else ++ else { ++ if (stats->band == IEEE80211_BAND_5GHZ) ++ rate += IWL_FIRST_OFDM_RATE; + -+drop_packet: -+ /* We can not transmit this packet. Drop it. */ -+ dev_kfree_skb_any(skb); - return NETDEV_TX_OK; - } - -diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c ---- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c 2008-07-01 10:48:57.000000000 -0400 -@@ -64,7 +64,7 @@ int prism2_rx_80211(struct net_device *d - int hdrlen, phdrlen, head_need, tail_need; - u16 fc; - int prism_header, ret; -- struct ieee80211_hdr_4addr *hdr; -+ struct ieee80211_hdr_4addr *fhdr; - - iface = netdev_priv(dev); - local = iface->local; -@@ -83,8 +83,8 @@ int prism2_rx_80211(struct net_device *d - phdrlen = 0; - } - -- hdr = (struct ieee80211_hdr_4addr *) skb->data; -- fc = le16_to_cpu(hdr->frame_ctl); -+ fhdr = (struct ieee80211_hdr_4addr *) skb->data; -+ fc = le16_to_cpu(fhdr->frame_ctl); - - if (type == PRISM2_RX_MGMT && (fc & IEEE80211_FCTL_VERS)) { - printk(KERN_DEBUG "%s: dropped management frame with header " -@@ -551,7 +551,7 @@ hostap_rx_frame_wds(local_info_t *local, - hdr->addr1[2] != 0xff || hdr->addr1[3] != 0xff || - hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) { - /* RA (or BSSID) is not ours - drop */ -- PDEBUG(DEBUG_EXTRA, "%s: received WDS frame with " -+ PDEBUG(DEBUG_EXTRA2, "%s: received WDS frame with " - "not own or broadcast %s=%s\n", - local->dev->name, - fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID", -diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c ---- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig 2008-07-01 10:47:45.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_ap.c 2008-07-01 10:48:57.000000000 -0400 -@@ -1930,7 +1930,7 @@ static void handle_pspoll(local_info_t * - PDEBUG(DEBUG_PS, " PSPOLL and AID[15:14] not set\n"); - return; - } -- aid &= ~BIT(15) & ~BIT(14); -+ aid &= ~(BIT(15) | BIT(14)); - if (aid == 0 || aid > MAX_AID_TABLE_SIZE) { - PDEBUG(DEBUG_PS, " invalid aid=%d\n", aid); - return; -diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c ---- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-07-01 10:34:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-07-01 10:48:57.000000000 -0400 -@@ -533,10 +533,10 @@ static void prism2_detach(struct pcmcia_ - do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) - - #define CFG_CHECK2(fn, retf) \ --do { int ret = (retf); \ --if (ret != 0) { \ -- PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", ret); \ -- cs_error(link, fn, ret); \ -+do { int _ret = (retf); \ -+if (_ret != 0) { \ -+ PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", _ret); \ -+ cs_error(link, fn, _ret); \ - goto next_entry; \ - } \ - } while (0) -diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c ---- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-07-01 10:34:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-07-01 10:48:57.000000000 -0400 -@@ -2835,7 +2835,7 @@ static void hostap_passive_scan(unsigned - { - local_info_t *local = (local_info_t *) data; - struct net_device *dev = local->dev; -- u16 channel; -+ u16 chan; - - if (local->passive_scan_interval <= 0) - return; -@@ -2872,11 +2872,11 @@ static void hostap_passive_scan(unsigned - - printk(KERN_DEBUG "%s: passive scan channel %d\n", - dev->name, local->passive_scan_channel); -- channel = local->passive_scan_channel; -+ chan = local->passive_scan_channel; - local->passive_scan_state = PASSIVE_SCAN_WAIT; - local->passive_scan_timer.expires = jiffies + HZ / 10; - } else { -- channel = local->channel; -+ chan = local->channel; - local->passive_scan_state = PASSIVE_SCAN_LISTEN; - local->passive_scan_timer.expires = jiffies + - local->passive_scan_interval * HZ; -@@ -2884,9 +2884,9 @@ static void hostap_passive_scan(unsigned - - if (hfa384x_cmd_callback(dev, HFA384X_CMDCODE_TEST | - (HFA384X_TEST_CHANGE_CHANNEL << 8), -- channel, NULL, 0)) -+ chan, NULL, 0)) - printk(KERN_ERR "%s: passive scan channel set %d " -- "failed\n", dev->name, channel); -+ "failed\n", dev->name, chan); - - add_timer(&local->passive_scan_timer); - } -diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c ---- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-07-01 10:34:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-07-01 10:48:57.000000000 -0400 -@@ -594,7 +594,8 @@ void hostap_dump_tx_header(const char *n - } - - --int hostap_80211_header_parse(const struct sk_buff *skb, unsigned char *haddr) -+static int hostap_80211_header_parse(const struct sk_buff *skb, -+ unsigned char *haddr) - { - struct hostap_interface *iface = netdev_priv(skb->dev); - local_info_t *local = iface->local; -@@ -857,7 +858,6 @@ const struct header_ops hostap_80211_ops - .rebuild = eth_rebuild_header, - .cache = eth_header_cache, - .cache_update = eth_header_cache_update, -- - .parse = hostap_80211_header_parse, - }; - EXPORT_SYMBOL(hostap_80211_ops); -@@ -1150,7 +1150,6 @@ EXPORT_SYMBOL(hostap_set_roaming); - EXPORT_SYMBOL(hostap_set_auth_algs); - EXPORT_SYMBOL(hostap_dump_rx_header); - EXPORT_SYMBOL(hostap_dump_tx_header); --EXPORT_SYMBOL(hostap_80211_header_parse); - EXPORT_SYMBOL(hostap_80211_get_hdrlen); - EXPORT_SYMBOL(hostap_get_stats); - EXPORT_SYMBOL(hostap_setup_dev); -diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-07-01 10:48:12.000000000 -0400 -@@ -2227,7 +2227,10 @@ static int iwl3945_scan_initiate(struct - } - - IWL_DEBUG_INFO("Starting scan...\n"); -- priv->scan_bands = 2; -+ if (priv->cfg->sku & IWL_SKU_G) -+ priv->scan_bands |= BIT(IEEE80211_BAND_2GHZ); -+ if (priv->cfg->sku & IWL_SKU_A) -+ priv->scan_bands |= BIT(IEEE80211_BAND_5GHZ); - set_bit(STATUS_SCANNING, &priv->status); - priv->scan_start = jiffies; - priv->scan_pass_start = priv->scan_start; -@@ -3352,13 +3355,18 @@ static void iwl3945_rx_scan_complete_not - cancel_delayed_work(&priv->scan_check); - - IWL_DEBUG_INFO("Scan pass on %sGHz took %dms\n", -- (priv->scan_bands == 2) ? "2.4" : "5.2", -+ (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) ? -+ "2.4" : "5.2", - jiffies_to_msecs(elapsed_jiffies - (priv->scan_pass_start, jiffies))); - -- /* Remove this scanned band from the list -- * of pending bands to scan */ -- priv->scan_bands--; -+ /* Remove this scanned band from the list of pending -+ * bands to scan, band G precedes A in order of scanning -+ * as seen in iwl3945_bg_request_scan */ -+ if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) -+ priv->scan_bands &= ~BIT(IEEE80211_BAND_2GHZ); -+ else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) -+ priv->scan_bands &= ~BIT(IEEE80211_BAND_5GHZ); - - /* If a request to abort was given, or the scan did not succeed - * then we reset the scan state machine and terminate, -@@ -4972,7 +4980,7 @@ static int iwl3945_get_channels_for_scan - - ch_info = iwl3945_get_channel_info(priv, band, scan_ch->channel); - if (!is_channel_valid(ch_info)) { -- IWL_DEBUG_SCAN("Channel %d is INVALID for this SKU.\n", -+ IWL_DEBUG_SCAN("Channel %d is INVALID for this band.\n", - scan_ch->channel); - continue; - } -@@ -6315,21 +6323,16 @@ static void iwl3945_bg_request_scan(stru - - /* flags + rate selection */ + iwl3945_rt->rt_rate = iwl3945_rates[rate].ieee; ++ } -- switch (priv->scan_bands) { -- case 2: -+ if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) { - scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; - scan->tx_cmd.rate = IWL_RATE_1M_PLCP; - scan->good_CRC_th = 0; - band = IEEE80211_BAND_2GHZ; -- break; -- -- case 1: -+ } else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) { - scan->tx_cmd.rate = IWL_RATE_6M_PLCP; - scan->good_CRC_th = IWL_GOOD_CRC_TH; - band = IEEE80211_BAND_5GHZ; -- break; -- -- default: -+ } else { - IWL_WARNING("Invalid scan band count\n"); - goto done; - } -@@ -6770,7 +6773,7 @@ static int iwl3945_mac_config(struct iee - ch_info = iwl3945_get_channel_info(priv, conf->channel->band, - conf->channel->hw_value); - if (!is_channel_valid(ch_info)) { -- IWL_DEBUG_SCAN("Channel %d [%d] is INVALID for this SKU.\n", -+ IWL_DEBUG_SCAN("Channel %d [%d] is INVALID for this band.\n", - conf->channel->hw_value, conf->channel->band); - IWL_DEBUG_MAC80211("leave - invalid channel\n"); - spin_unlock_irqrestore(&priv->lock, flags); + /* antenna number */ + antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK; diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-07-01 10:48:12.000000000 -0400 -@@ -1774,7 +1774,10 @@ static int iwl4965_scan_initiate(struct - } - - IWL_DEBUG_INFO("Starting scan...\n"); -- priv->scan_bands = 2; -+ if (priv->cfg->sku & IWL_SKU_G) -+ priv->scan_bands |= BIT(IEEE80211_BAND_2GHZ); -+ if (priv->cfg->sku & IWL_SKU_A) -+ priv->scan_bands |= BIT(IEEE80211_BAND_5GHZ); - set_bit(STATUS_SCANNING, &priv->status); - priv->scan_start = jiffies; - priv->scan_pass_start = priv->scan_start; -@@ -3023,8 +3026,9 @@ static void iwl4965_rx_reply_tx(struct i - - IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index); - if (index != -1) { -- int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index); - #ifdef CONFIG_IWL4965_HT -+ int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index); -+ - if (tid != MAX_TID_COUNT) - priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; - if (iwl4965_queue_space(&txq->q) > txq->q.low_mark && -@@ -3276,13 +3280,18 @@ static void iwl4965_rx_scan_complete_not - cancel_delayed_work(&priv->scan_check); - - IWL_DEBUG_INFO("Scan pass on %sGHz took %dms\n", -- (priv->scan_bands == 2) ? "2.4" : "5.2", -+ (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) ? -+ "2.4" : "5.2", - jiffies_to_msecs(elapsed_jiffies - (priv->scan_pass_start, jiffies))); - -- /* Remove this scanned band from the list -- * of pending bands to scan */ -- priv->scan_bands--; -+ /* Remove this scanned band from the list of pending -+ * bands to scan, band G precedes A in order of scanning -+ * as seen in iwl_bg_request_scan */ -+ if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) -+ priv->scan_bands &= ~BIT(IEEE80211_BAND_2GHZ); -+ else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) -+ priv->scan_bands &= ~BIT(IEEE80211_BAND_5GHZ); - - /* If a request to abort was given, or the scan did not succeed - * then we reset the scan state machine and terminate, -@@ -3292,7 +3301,7 @@ static void iwl4965_rx_scan_complete_not - clear_bit(STATUS_SCAN_ABORTING, &priv->status); - } else { - /* If there are more bands on this scan pass reschedule */ -- if (priv->scan_bands > 0) -+ if (priv->scan_bands) - goto reschedule; - } - -@@ -4635,10 +4644,9 @@ static int iwl4965_get_channels_for_scan - - scan_ch->channel = ieee80211_frequency_to_channel(channels[i].center_freq); - -- ch_info = iwl_get_channel_info(priv, band, -- scan_ch->channel); -+ ch_info = iwl_get_channel_info(priv, band, scan_ch->channel); - if (!is_channel_valid(ch_info)) { -- IWL_DEBUG_SCAN("Channel %d is INVALID for this SKU.\n", -+ IWL_DEBUG_SCAN("Channel %d is INVALID for this band.\n", - scan_ch->channel); - continue; - } -@@ -5830,8 +5838,7 @@ static void iwl4965_bg_request_scan(stru - scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; - - -- switch (priv->scan_bands) { -- case 2: -+ if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) { - scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; - scan->tx_cmd.rate_n_flags = - iwl4965_hw_set_rate_n_flags(IWL_RATE_1M_PLCP, -@@ -5839,17 +5846,13 @@ static void iwl4965_bg_request_scan(stru - - scan->good_CRC_th = 0; - band = IEEE80211_BAND_2GHZ; -- break; -- -- case 1: -+ } else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) { - scan->tx_cmd.rate_n_flags = - iwl4965_hw_set_rate_n_flags(IWL_RATE_6M_PLCP, - RATE_MCS_ANT_B_MSK); - scan->good_CRC_th = IWL_GOOD_CRC_TH; - band = IEEE80211_BAND_5GHZ; -- break; -- -- default: -+ } else { - IWL_WARNING("Invalid scan band count\n"); - goto done; - } -diff -up linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c.orig linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c ---- linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/prism54/islpci_eth.c 2008-07-01 10:48:12.000000000 -0400 -@@ -290,7 +290,7 @@ islpci_monitor_rx(islpci_private *priv, - - avs->version = cpu_to_be32(P80211CAPTURE_VERSION); - avs->length = cpu_to_be32(sizeof (struct avs_80211_1_header)); -- avs->mactime = cpu_to_be64(le64_to_cpu(clock)); -+ avs->mactime = cpu_to_be64(clock); - avs->hosttime = cpu_to_be64(jiffies); - avs->phytype = cpu_to_be32(6); /*OFDM: 6 for (g), 8 for (a) */ - avs->channel = cpu_to_be32(channel_of_freq(freq)); -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-07-01 10:48:12.000000000 -0400 -@@ -138,11 +138,8 @@ static void rt2500usb_bbp_write(struct r - * Wait until the BBP becomes ready. - */ - reg = rt2500usb_bbp_check(rt2x00dev); -- if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) { -- ERROR(rt2x00dev, "PHY_CSR8 register busy. Write failed.\n"); -- mutex_unlock(&rt2x00dev->usb_cache_mutex); -- return; -- } -+ if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) -+ goto exit_fail; - - /* - * Write the data into the BBP. -@@ -155,6 +152,13 @@ static void rt2500usb_bbp_write(struct r - rt2500usb_register_write_lock(rt2x00dev, PHY_CSR7, reg); - - mutex_unlock(&rt2x00dev->usb_cache_mutex); -+ -+ return; -+ -+exit_fail: -+ mutex_unlock(&rt2x00dev->usb_cache_mutex); -+ -+ ERROR(rt2x00dev, "PHY_CSR8 register busy. Write failed.\n"); - } - - static void rt2500usb_bbp_read(struct rt2x00_dev *rt2x00dev, -@@ -168,10 +172,8 @@ static void rt2500usb_bbp_read(struct rt - * Wait until the BBP becomes ready. - */ - reg = rt2500usb_bbp_check(rt2x00dev); -- if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) { -- ERROR(rt2x00dev, "PHY_CSR8 register busy. Read failed.\n"); -- return; -- } -+ if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) -+ goto exit_fail; - - /* - * Write the request into the BBP. -@@ -186,17 +188,21 @@ static void rt2500usb_bbp_read(struct rt - * Wait until the BBP becomes ready. - */ - reg = rt2500usb_bbp_check(rt2x00dev); -- if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) { -- ERROR(rt2x00dev, "PHY_CSR8 register busy. Read failed.\n"); -- *value = 0xff; -- mutex_unlock(&rt2x00dev->usb_cache_mutex); -- return; -- } -+ if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) -+ goto exit_fail; - - rt2500usb_register_read_lock(rt2x00dev, PHY_CSR7, ®); - *value = rt2x00_get_field16(reg, PHY_CSR7_DATA); - - mutex_unlock(&rt2x00dev->usb_cache_mutex); -+ -+ return; -+ -+exit_fail: -+ mutex_unlock(&rt2x00dev->usb_cache_mutex); -+ -+ ERROR(rt2x00dev, "PHY_CSR8 register busy. Read failed.\n"); -+ *value = 0xff; - } - - static void rt2500usb_rf_write(struct rt2x00_dev *rt2x00dev, -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-07-01 10:48:12.000000000 -0400 -@@ -75,7 +75,7 @@ static void rt2x00lib_start_link_tuner(s - - rt2x00lib_reset_link_tuner(rt2x00dev); - -- queue_delayed_work(rt2x00dev->hw->workqueue, -+ queue_delayed_work(rt2x00dev->workqueue, - &rt2x00dev->link.work, LINK_TUNE_INTERVAL); - } - -@@ -137,14 +137,6 @@ void rt2x00lib_disable_radio(struct rt2x - return; - - /* -- * Stop all scheduled work. -- */ -- if (work_pending(&rt2x00dev->intf_work)) -- cancel_work_sync(&rt2x00dev->intf_work); -- if (work_pending(&rt2x00dev->filter_work)) -- cancel_work_sync(&rt2x00dev->filter_work); -- -- /* - * Stop the TX queues. - */ - ieee80211_stop_queues(rt2x00dev->hw); -@@ -398,8 +390,8 @@ static void rt2x00lib_link_tuner(struct - * Increase tuner counter, and reschedule the next link tuner run. - */ - rt2x00dev->link.count++; -- queue_delayed_work(rt2x00dev->hw->workqueue, &rt2x00dev->link.work, -- LINK_TUNE_INTERVAL); -+ queue_delayed_work(rt2x00dev->workqueue, -+ &rt2x00dev->link.work, LINK_TUNE_INTERVAL); - } - - static void rt2x00lib_packetfilter_scheduled(struct work_struct *work) -@@ -433,6 +425,15 @@ static void rt2x00lib_intf_scheduled_ite - - spin_unlock(&intf->lock); - -+ /* -+ * It is possible the radio was disabled while the work had been -+ * scheduled. If that happens we should return here immediately, -+ * note that in the spinlock protected area above the delayed_flags -+ * have been cleared correctly. -+ */ -+ if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -+ return; -+ - if (delayed_flags & DELAYED_UPDATE_BEACON) { - skb = ieee80211_beacon_get(rt2x00dev->hw, vif, &control); - if (skb && rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw, -@@ -441,7 +442,7 @@ static void rt2x00lib_intf_scheduled_ite - } - - if (delayed_flags & DELAYED_CONFIG_ERP) -- rt2x00lib_config_erp(rt2x00dev, intf, &intf->conf); -+ rt2x00lib_config_erp(rt2x00dev, intf, &conf); - - if (delayed_flags & DELAYED_LED_ASSOC) - rt2x00leds_led_assoc(rt2x00dev, !!rt2x00dev->intf_associated); -@@ -487,7 +488,7 @@ void rt2x00lib_beacondone(struct rt2x00_ - rt2x00lib_beacondone_iter, - rt2x00dev); - -- queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work); -+ queue_work(rt2x00dev->workqueue, &rt2x00dev->intf_work); - } - EXPORT_SYMBOL_GPL(rt2x00lib_beacondone); - -@@ -1130,6 +1131,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de - /* - * Initialize configuration work. - */ -+ rt2x00dev->workqueue = create_singlethread_workqueue("rt2x00lib"); -+ if (!rt2x00dev->workqueue) -+ goto exit; -+ - INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled); - INIT_WORK(&rt2x00dev->filter_work, rt2x00lib_packetfilter_scheduled); - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00lib_link_tuner); -@@ -1190,6 +1195,13 @@ void rt2x00lib_remove_dev(struct rt2x00_ - rt2x00leds_unregister(rt2x00dev); - - /* -+ * Stop all queued work. Note that most tasks will already be halted -+ * during rt2x00lib_disable_radio() and rt2x00lib_uninitialize(). -+ */ -+ flush_workqueue(rt2x00dev->workqueue); -+ destroy_workqueue(rt2x00dev->workqueue); -+ -+ /* - * Free ieee80211_hw memory. - */ - rt2x00lib_remove_hw(rt2x00dev); -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-07-01 10:48:12.000000000 -0400 -@@ -821,6 +821,7 @@ struct rt2x00_dev { - /* - * Scheduled work. - */ -+ struct workqueue_struct *workqueue; - struct work_struct intf_work; - struct work_struct filter_work; - -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-07-01 10:48:12.000000000 -0400 -@@ -428,7 +428,7 @@ void rt2x00mac_configure_filter(struct i - if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags)) - rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags); - else -- queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work); -+ queue_work(rt2x00dev->workqueue, &rt2x00dev->filter_work); - } - EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter); - -@@ -509,7 +509,7 @@ void rt2x00mac_bss_info_changed(struct i - memcpy(&intf->conf, bss_conf, sizeof(*bss_conf)); - if (delayed) { - intf->delayed_flags |= delayed; -- queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work); -+ queue_work(rt2x00dev->workqueue, &rt2x00dev->intf_work); +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-07-03 13:21:06.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-07-03 13:38:42.000000000 -0400 +@@ -6237,7 +6237,8 @@ static int iwl4965_mac_tx(struct ieee802 + + if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { + IWL_DEBUG_MAC80211("leave - monitor\n"); +- return -1; ++ dev_kfree_skb_any(skb); ++ return 0; } - spin_unlock(&intf->lock); - } -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-07-01 10:48:12.000000000 -0400 -@@ -134,11 +134,8 @@ static void rt73usb_bbp_write(struct rt2 - * Wait until the BBP becomes ready. - */ - reg = rt73usb_bbp_check(rt2x00dev); -- if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) { -- ERROR(rt2x00dev, "PHY_CSR3 register busy. Write failed.\n"); -- mutex_unlock(&rt2x00dev->usb_cache_mutex); -- return; -- } -+ if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) -+ goto exit_fail; - - /* - * Write the data into the BBP. -@@ -151,6 +148,13 @@ static void rt73usb_bbp_write(struct rt2 - rt73usb_register_write_lock(rt2x00dev, PHY_CSR3, reg); - mutex_unlock(&rt2x00dev->usb_cache_mutex); -+ -+ return; -+ -+exit_fail: -+ mutex_unlock(&rt2x00dev->usb_cache_mutex); + IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, +diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-07-03 13:21:03.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-07-03 13:38:42.000000000 -0400 +@@ -3528,8 +3528,12 @@ static void iwl4965_add_radiotap(struct + + if (rate == -1) + iwl4965_rt->rt_rate = 0; +- else ++ else { ++ if (stats->band == IEEE80211_BAND_5GHZ) ++ rate += IWL_FIRST_OFDM_RATE; + -+ ERROR(rt2x00dev, "PHY_CSR3 register busy. Write failed.\n"); - } - - static void rt73usb_bbp_read(struct rt2x00_dev *rt2x00dev, -@@ -164,11 +168,8 @@ static void rt73usb_bbp_read(struct rt2x - * Wait until the BBP becomes ready. - */ - reg = rt73usb_bbp_check(rt2x00dev); -- if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) { -- ERROR(rt2x00dev, "PHY_CSR3 register busy. Read failed.\n"); -- mutex_unlock(&rt2x00dev->usb_cache_mutex); -- return; -- } -+ if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) -+ goto exit_fail; - - /* - * Write the request into the BBP. -@@ -184,14 +185,19 @@ static void rt73usb_bbp_read(struct rt2x - * Wait until the BBP becomes ready. - */ - reg = rt73usb_bbp_check(rt2x00dev); -- if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) { -- ERROR(rt2x00dev, "PHY_CSR3 register busy. Read failed.\n"); -- *value = 0xff; -- return; -- } -+ if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) -+ goto exit_fail; - - *value = rt2x00_get_field32(reg, PHY_CSR3_VALUE); - mutex_unlock(&rt2x00dev->usb_cache_mutex); -+ -+ return; -+ -+exit_fail: -+ mutex_unlock(&rt2x00dev->usb_cache_mutex); -+ -+ ERROR(rt2x00dev, "PHY_CSR3 register busy. Read failed.\n"); -+ *value = 0xff; - } - - static void rt73usb_rf_write(struct rt2x00_dev *rt2x00dev, -diff -up linux-2.6.25.noarch/include/net/mac80211.h.orig linux-2.6.25.noarch/include/net/mac80211.h ---- linux-2.6.25.noarch/include/net/mac80211.h.orig 2008-07-01 10:47:45.000000000 -0400 -+++ linux-2.6.25.noarch/include/net/mac80211.h 2008-07-01 10:48:57.000000000 -0400 -@@ -595,6 +595,15 @@ enum ieee80211_key_alg { - ALG_CCMP, - }; - -+/** -+ * enum ieee80211_key_len - key length -+ * @WEP40: WEP 5 byte long key -+ * @WEP104: WEP 13 byte long key -+ */ -+enum ieee80211_key_len { -+ LEN_WEP40 = 5, -+ LEN_WEP104 = 13, -+}; - - /** - * enum ieee80211_key_flags - key flags -diff -up linux-2.6.25.noarch/net/mac80211/key.c.orig linux-2.6.25.noarch/net/mac80211/key.c ---- linux-2.6.25.noarch/net/mac80211/key.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/key.c 2008-07-01 10:48:12.000000000 -0400 -@@ -380,6 +380,15 @@ void ieee80211_key_free(struct ieee80211 - if (!key) - return; - -+ if (!key->sdata) { -+ /* The key has not been linked yet, simply free it -+ * and don't Oops */ -+ if (key->conf.alg == ALG_CCMP) -+ ieee80211_aes_key_free(key->u.ccmp.tfm); -+ kfree(key); -+ return; + iwl4965_rt->rt_rate = iwl4965_rates[rate].ieee; + } -+ - spin_lock_irqsave(&key->sdata->local->key_lock, flags); - __ieee80211_key_free(key); - spin_unlock_irqrestore(&key->sdata->local->key_lock, flags); -diff -up linux-2.6.25.noarch/net/mac80211/wext.c.orig linux-2.6.25.noarch/net/mac80211/wext.c ---- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-07-01 10:47:46.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-01 10:48:57.000000000 -0400 -@@ -95,6 +95,13 @@ static int ieee80211_set_encryption(stru - } - } - -+ if (alg == ALG_WEP && -+ key_len != LEN_WEP40 && key_len != LEN_WEP104) { -+ ieee80211_key_free(key); -+ err = -EINVAL; -+ goto out_unlock; -+ } -+ - ieee80211_key_link(key, sdata, sta); - if (set_tx_key || (!sta && !sdata->default_key && key)) -diff -up linux-2.6.25.noarch/net/wireless/reg.c.orig linux-2.6.25.noarch/net/wireless/reg.c ---- linux-2.6.25.noarch/net/wireless/reg.c.orig 2008-07-01 10:47:49.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-01 10:48:12.000000000 -0400 -@@ -80,6 +80,23 @@ static const struct ieee80211_channel_ra - IEEE80211_CHAN_RADAR), - }; - -+static const struct ieee80211_channel_range ieee80211_EU_channels[] = { -+ /* IEEE 802.11b/g, channels 1..13 */ -+ RANGE_PWR(2412, 2472, 20, 6, 0), -+ /* IEEE 802.11a, channel 36*/ -+ RANGE_PWR(5180, 5180, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN), -+ /* IEEE 802.11a, channel 40*/ -+ RANGE_PWR(5200, 5200, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN), -+ /* IEEE 802.11a, channel 44*/ -+ RANGE_PWR(5220, 5220, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN), -+ /* IEEE 802.11a, channels 48..64 */ -+ RANGE_PWR(5240, 5320, 23, 6, IEEE80211_CHAN_NO_IBSS | -+ IEEE80211_CHAN_RADAR), -+ /* IEEE 802.11a, channels 100..140 */ -+ RANGE_PWR(5500, 5700, 30, 6, IEEE80211_CHAN_NO_IBSS | -+ IEEE80211_CHAN_RADAR), -+}; -+ - #define REGDOM(_code) \ - { \ - .code = __stringify(_code), \ -@@ -90,6 +107,7 @@ static const struct ieee80211_channel_ra - static const struct ieee80211_regdomain ieee80211_regdoms[] = { - REGDOM(US), - REGDOM(JP), -+ REGDOM(EU), + /* + * "antenna number" +diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/if_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/if_usb.c +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/if_usb.c.orig 2008-07-03 13:21:03.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/if_usb.c 2008-07-03 13:38:42.000000000 -0400 +@@ -925,6 +925,7 @@ static struct usb_driver if_usb_driver = + .id_table = if_usb_table, + .suspend = if_usb_suspend, + .resume = if_usb_resume, ++ .reset_resume = if_usb_resume, }; - + static int __init if_usb_init_module(void) From fedora-extras-commits at redhat.com Thu Jul 3 17:56:52 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Thu, 3 Jul 2008 17:56:52 GMT Subject: rpms/xwnc/F-9 xwnc.spec,1.5,1.6 Message-ID: <200807031756.m63HuqXM004760@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/xwnc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4651/F-9 Modified Files: xwnc.spec Log Message: rebuild for new mesa libs Index: xwnc.spec =================================================================== RCS file: /cvs/extras/rpms/xwnc/F-9/xwnc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xwnc.spec 20 Feb 2008 08:38:32 -0000 1.5 +++ xwnc.spec 3 Jul 2008 17:56:04 -0000 1.6 @@ -1,9 +1,9 @@ Name: xwnc Summary: Mix of Xvnc and XDarwin with improved protocol Version: 0.3.3 -Release: 4%{?dist} +Release: 5%{?dist} -License: GPL +License: GPLv2+ Group: User Interface/X URL: http://insitu.lri.fr/~chapuis/metisse/download_install.html Source0: http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz @@ -44,7 +44,10 @@ %changelog -* Wed Feb 20 2008 Fedora Release Engineering - 0.3.3-4 +* Thu Jul 03 2008 Christopher Stone 0.3.3-5 +- Rebuild for new Mesa + +* Wed Feb 20 2008 Fedora Release Engineering 0.3.3-4 - Autorebuild for GCC 4.3 * Wed Jan 10 2007 Christopher Stone 0.3.3-3 From fedora-extras-commits at redhat.com Thu Jul 3 17:57:04 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Thu, 3 Jul 2008 17:57:04 GMT Subject: rpms/xwnc/F-8 xwnc.spec,1.4,1.5 Message-ID: <200807031757.m63Hv4nU004785@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/xwnc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4651/F-8 Modified Files: xwnc.spec Log Message: rebuild for new mesa libs Index: xwnc.spec =================================================================== RCS file: /cvs/extras/rpms/xwnc/F-8/xwnc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xwnc.spec 11 Jan 2007 01:26:29 -0000 1.4 +++ xwnc.spec 3 Jul 2008 17:56:00 -0000 1.5 @@ -1,9 +1,9 @@ Name: xwnc Summary: Mix of Xvnc and XDarwin with improved protocol Version: 0.3.3 -Release: 3%{?dist} +Release: 5%{?dist} -License: GPL +License: GPLv2+ Group: User Interface/X URL: http://insitu.lri.fr/~chapuis/metisse/download_install.html Source0: http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz @@ -44,6 +44,12 @@ %changelog +* Thu Jul 03 2008 Christopher Stone 0.3.3-5 +- Rebuild for new Mesa + +* Wed Feb 20 2008 Fedora Release Engineering 0.3.3-4 +- Autorebuild for GCC 4.3 + * Wed Jan 10 2007 Christopher Stone 0.3.3-3 - Update to latest debian patch - Remove unneeded BuildRequires From fedora-extras-commits at redhat.com Thu Jul 3 17:57:15 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Thu, 3 Jul 2008 17:57:15 GMT Subject: rpms/xwnc/devel xwnc.spec,1.5,1.6 Message-ID: <200807031757.m63HvF7w004804@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/xwnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4651/devel Modified Files: xwnc.spec Log Message: rebuild for new mesa libs Index: xwnc.spec =================================================================== RCS file: /cvs/extras/rpms/xwnc/devel/xwnc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xwnc.spec 20 Feb 2008 08:38:32 -0000 1.5 +++ xwnc.spec 3 Jul 2008 17:56:22 -0000 1.6 @@ -1,9 +1,9 @@ Name: xwnc Summary: Mix of Xvnc and XDarwin with improved protocol Version: 0.3.3 -Release: 4%{?dist} +Release: 5%{?dist} -License: GPL +License: GPLv2+ Group: User Interface/X URL: http://insitu.lri.fr/~chapuis/metisse/download_install.html Source0: http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz @@ -44,7 +44,10 @@ %changelog -* Wed Feb 20 2008 Fedora Release Engineering - 0.3.3-4 +* Thu Jul 03 2008 Christopher Stone 0.3.3-5 +- Rebuild for new Mesa + +* Wed Feb 20 2008 Fedora Release Engineering 0.3.3-4 - Autorebuild for GCC 4.3 * Wed Jan 10 2007 Christopher Stone 0.3.3-3 From fedora-extras-commits at redhat.com Thu Jul 3 18:05:36 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Thu, 3 Jul 2008 18:05:36 GMT Subject: rpms/anaconda/devel .cvsignore, 1.543, 1.544 anaconda.spec, 1.685, 1.686 sources, 1.676, 1.677 Message-ID: <200807031805.m63I5a0M011904@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11781 Modified Files: .cvsignore anaconda.spec sources Log Message: * Thu Jul 03 2008 Peter Jones - 11.4.1.11-1 - Fix double free in setupCdrom - Fix missing psudo->pseudo spelling fix (katzj, #453843) - Include missing X libraries in stage2.img Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.543 retrieving revision 1.544 diff -u -r1.543 -r1.544 --- .cvsignore 1 Jul 2008 22:23:58 -0000 1.543 +++ .cvsignore 3 Jul 2008 18:04:46 -0000 1.544 @@ -1,3 +1,2 @@ -anaconda-11.4.1.8.tar.bz2 -anaconda-11.4.1.9.tar.bz2 -anaconda-11.4.1.10.tar.bz2 +anaconda-11.4.1.11.tar.bz2 +clog Index: anaconda.spec =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.685 retrieving revision 1.686 diff -u -r1.685 -r1.686 --- anaconda.spec 1 Jul 2008 22:23:58 -0000 1.685 +++ anaconda.spec 3 Jul 2008 18:04:46 -0000 1.686 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.10 +Version: 11.4.1.11 Release: 1 License: GPLv2+ Group: Applications/System @@ -194,6 +194,11 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Jul 03 2008 Peter Jones - 11.4.1.11-1 +- Fix double free in setupCdrom +- Fix missing psudo->pseudo spelling fix (katzj, #453843) +- Include missing X libraries in stage2.img + * Tue Jul 01 2008 Chris Lumens - 11.4.1.10-1 - Remove old livecd flag (katzj) - Explicitly setup livecd install by passing --liveinst to anaconda (katzj) Index: sources =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/sources,v retrieving revision 1.676 retrieving revision 1.677 diff -u -r1.676 -r1.677 --- sources 1 Jul 2008 22:23:58 -0000 1.676 +++ sources 3 Jul 2008 18:04:46 -0000 1.677 @@ -1 +1 @@ -2362dc71e1f3c2efac44355041f82712 anaconda-11.4.1.10.tar.bz2 +0f8211a6bc4665df006676e0b71e720d anaconda-11.4.1.11.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 18:06:10 2008 From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk)) Date: Thu, 3 Jul 2008 18:06:10 GMT Subject: rpms/dmraid/F-9 dmraid.spec,1.86,1.87 Message-ID: <200807031806.m63I6AMh011956@cvs-int.fedora.redhat.com> Author: agk Update of /cvs/pkgs/rpms/dmraid/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11848 Modified Files: dmraid.spec Log Message: Replace static build with symlink. Index: dmraid.spec =================================================================== RCS file: /cvs/pkgs/rpms/dmraid/F-9/dmraid.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- dmraid.spec 19 Feb 2008 12:58:35 -0000 1.86 +++ dmraid.spec 3 Jul 2008 18:05:16 -0000 1.87 @@ -7,7 +7,7 @@ Summary: Device-mapper RAID tool and library. Name: dmraid Version: 1.0.0.rc14 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Base URL: http://people.redhat.com/heinzm/sw/dmraid @@ -45,18 +45,15 @@ %patch4 -p1 -b .UUID-Subsystemprefix %build -%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link -make DESTDIR=$RPM_BUILD_ROOT -mv tools/dmraid tools/dmraid.static -make clean %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link +make DESTDIR=$RPM_BUILD_ROOT make -C lib DESTDIR=$RPM_BUILD_ROOT libdmraid.so %install rm -rf $RPM_BUILD_ROOT install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid} make DESTDIR=$RPM_BUILD_ROOT install -install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static +ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/ # if requested, install the dso @@ -88,6 +85,9 @@ %{_libdir}/libdmraid.so %changelog +* Thu Jul 03 2008 Alasdair Kergon - 1.0.0.rc14-8 +- Replace static build with symlink. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.0.rc14-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 3 18:27:09 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 3 Jul 2008 18:27:09 GMT Subject: rpms/perl-SGML-Parser-OpenSP/devel .cvsignore, 1.3, 1.4 perl-SGML-Parser-OpenSP.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200807031827.m63IR98k013186@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13140 Modified Files: .cvsignore perl-SGML-Parser-OpenSP.spec sources Log Message: * Thu Jul 3 2008 Ville Skytt?? - 0.994-1 - 0.994. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Dec 2007 10:00:18 -0000 1.3 +++ .cvsignore 3 Jul 2008 18:26:28 -0000 1.4 @@ -1 +1 @@ -SGML-Parser-OpenSP-0.991.tar.gz +SGML-Parser-OpenSP-0.994.tar.gz Index: perl-SGML-Parser-OpenSP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel/perl-SGML-Parser-OpenSP.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-SGML-Parser-OpenSP.spec 7 Mar 2008 02:16:07 -0000 1.6 +++ perl-SGML-Parser-OpenSP.spec 3 Jul 2008 18:26:28 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-SGML-Parser-OpenSP -Version: 0.991 -Release: 3%{?dist} +Version: 0.994 +Release: 1%{?dist} Summary: Perl interface to the OpenSP SGML and XML parser Group: Development/Libraries @@ -62,8 +62,11 @@ %changelog +* Thu Jul 3 2008 Ville Skytt?? - 0.994-1 +- 0.994. + * Thu Mar 06 2008 Tom "spot" Callaway - 0.991-3 -Rebuild for new perl +- Rebuild for new perl * Tue Feb 19 2008 Fedora Release Engineering - 0.991-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Dec 2007 10:00:18 -0000 1.3 +++ sources 3 Jul 2008 18:26:28 -0000 1.4 @@ -1 +1 @@ -9a4513ee2a42458a083f20a36f0373a4 SGML-Parser-OpenSP-0.991.tar.gz +b1ee0244e9daa4d37f28cf32c4753691 SGML-Parser-OpenSP-0.994.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 19:02:01 2008 From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk)) Date: Thu, 3 Jul 2008 19:02:01 GMT Subject: rpms/dmraid/devel dmraid.spec,1.86,1.87 Message-ID: <200807031902.m63J21tF020648@cvs-int.fedora.redhat.com> Author: agk Update of /cvs/pkgs/rpms/dmraid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20388 Modified Files: dmraid.spec Log Message: Replace static build with symlink. Index: dmraid.spec =================================================================== RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- dmraid.spec 19 Feb 2008 12:58:35 -0000 1.86 +++ dmraid.spec 3 Jul 2008 19:01:10 -0000 1.87 @@ -7,7 +7,7 @@ Summary: Device-mapper RAID tool and library. Name: dmraid Version: 1.0.0.rc14 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Base URL: http://people.redhat.com/heinzm/sw/dmraid @@ -45,18 +45,15 @@ %patch4 -p1 -b .UUID-Subsystemprefix %build -%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link -make DESTDIR=$RPM_BUILD_ROOT -mv tools/dmraid tools/dmraid.static -make clean %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link +make DESTDIR=$RPM_BUILD_ROOT make -C lib DESTDIR=$RPM_BUILD_ROOT libdmraid.so %install rm -rf $RPM_BUILD_ROOT install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid} make DESTDIR=$RPM_BUILD_ROOT install -install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static +ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/ # if requested, install the dso @@ -88,6 +85,9 @@ %{_libdir}/libdmraid.so %changelog +* Thu Jul 03 2008 Alasdair Kergon - 1.0.0.rc14-8 +- Replace static build with symlink. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.0.rc14-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 3 19:15:58 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Thu, 3 Jul 2008 19:15:58 GMT Subject: common Makefile.common,1.104,1.105 Message-ID: <200807031915.m63JFwGm021110@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21087 Modified Files: Makefile.common Log Message: Produce a more sensible error if there's no client to download the source installed. Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- Makefile.common 2 Jul 2008 14:48:12 -0000 1.104 +++ Makefile.common 3 Jul 2008 19:15:27 -0000 1.105 @@ -197,6 +197,7 @@ break ; \ fi ; \ done + @if [ -z "$(CLIENT)" ]; then echo "Can't download, need curl or wget installed." ; exit 1; fi @if [ ! -e "$@" ] ; then $(CLIENT) $(REPOSITORY)/$(NAME)/$@/$(get_sources_md5)/$@ ; fi @if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi @if test "$$(md5sum $@ | awk '{print $$1}')" != "$(get_sources_md5)" ; then \ From fedora-extras-commits at redhat.com Thu Jul 3 19:32:23 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 3 Jul 2008 19:32:23 GMT Subject: rpms/bridge-utils/devel bridge-utils-1.2-params.patch, NONE, 1.1 bridge-utils.spec, 1.28, 1.29 Message-ID: <200807031932.m63JWNAE021704@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/bridge-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21641 Modified Files: bridge-utils.spec Added Files: bridge-utils-1.2-params.patch Log Message: fix params in sysfs bridge-utils-1.2-params.patch: --- NEW FILE bridge-utils-1.2-params.patch --- diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c index 1decc28..65ea79a 100644 --- a/libbridge/libbridge_devif.c +++ b/libbridge/libbridge_devif.c @@ -282,7 +282,7 @@ static int br_set(const char *bridge, const char *name, char path[SYSFS_PATH_MAX]; FILE *f; - snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name); + snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", bridge, name); f = fopen(path, "w"); if (f) { Index: bridge-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bridge-utils/devel/bridge-utils.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- bridge-utils.spec 5 Mar 2008 15:44:20 -0000 1.28 +++ bridge-utils.spec 3 Jul 2008 19:31:34 -0000 1.29 @@ -1,7 +1,7 @@ Summary: Utilities for configuring the linux ethernet bridge Name: bridge-utils Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://bridge.sourceforge.net/ Group: System Environment/Base @@ -9,6 +9,7 @@ Patch0: bridge-utils-1.0.4-inc.patch Patch1: bridge-utils-1.2-show-ports.patch Patch2: bridge-utils-1.2-foreach.patch +Patch3: bridge-utils-1.2-params.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: libsysfs-devel autoconf @@ -29,6 +30,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoconf @@ -49,6 +51,9 @@ %{_mandir}/man8/brctl.8* %changelog +* Thu Jul 03 2008 David Woodhouse 1.2-6 +- Fix location of bridge parameters in sysfs + * Wed Mar 05 2008 David Woodhouse 1.2-5 - Fix handling of bridge named 'bridge' (#436120) From fedora-extras-commits at redhat.com Thu Jul 3 19:48:16 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 3 Jul 2008 19:48:16 GMT Subject: rpms/openoffice.org/devel openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch, NONE, 1.1 openoffice.org.spec, 1.1552, 1.1553 Message-ID: <200807031948.m63JmG7n022462@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22427 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch Log Message: rats (2) openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch: --- NEW FILE openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch --- Index: prj/build.lst =================================================================== RCS file: /cvs/gsl/forms/prj/build.lst,v retrieving revision 1.11 diff -u -r1.11 build.lst --- openoffice.org.orig/forms/prj/build.lst 25 Jun 2008 14:24:29 -0000 1.11 +++ openoffice.org/forms/prj/build.lst 3 Jul 2008 19:44:34 -0000 @@ -14,4 +14,3 @@ fm forms\source\richtext nmake - all fm_richtext fm_inc NULL fm forms\source\runtime nmake - all frm_runtime NULL fm forms\util nmake - all fm_util fm_component fm_solar_component fm_solar_control fm_helper fm_misc fm_resource fm_richtext frm_runtime fm_xforms NULL -fm forms\qa nmake - all fm_qa NULL Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1552 retrieving revision 1.1553 diff -u -r1.1552 -r1.1553 --- openoffice.org.spec 3 Jul 2008 16:29:54 -0000 1.1552 +++ openoffice.org.spec 3 Jul 2008 19:47:28 -0000 1.1553 @@ -121,6 +121,7 @@ Patch51: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch Patch52: workspace.cairo06.patch Patch53: workspace.ab55.patch +Patch54: openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1267,6 +1268,7 @@ %patch51 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch %patch52 -p1 -b .workspace.cairo06.patch %patch53 -p1 -b .workspace.ab55.patch +%patch54 -p1 -b .rhXXXXXX.forms.qa.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` From fedora-extras-commits at redhat.com Thu Jul 3 19:57:36 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 3 Jul 2008 19:57:36 GMT Subject: rpms/telepathy-glib/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 telepathy-glib.spec, 1.17, 1.18 Message-ID: <200807031957.m63JvabR022995@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22919 Modified Files: .cvsignore sources telepathy-glib.spec Log Message: * Thu Jul 3 2008 Brian Pepple - 0.7.11-1 - Update to 0.7.11. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Jun 2008 23:07:16 -0000 1.11 +++ .cvsignore 3 Jul 2008 19:56:45 -0000 1.12 @@ -1 +1 @@ -telepathy-glib-0.7.10.tar.gz +telepathy-glib-0.7.11.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Jun 2008 23:07:16 -0000 1.11 +++ sources 3 Jul 2008 19:56:45 -0000 1.12 @@ -1 +1 @@ -39f004bf3a6bd71d317e57b9260fa1c4 telepathy-glib-0.7.10.tar.gz +8da7a9c43f3721aed982412854c4783e telepathy-glib-0.7.11.tar.gz Index: telepathy-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- telepathy-glib.spec 6 Jun 2008 23:07:16 -0000 1.17 +++ telepathy-glib.spec 3 Jul 2008 19:56:45 -0000 1.18 @@ -3,7 +3,7 @@ %define glib_ver 2.10 Name: telepathy-glib -Version: 0.7.10 +Version: 0.7.11 Release: 1%{?dist} Summary: GLib bindings for Telepathy @@ -90,6 +90,9 @@ %changelog +* Thu Jul 3 2008 Brian Pepple - 0.7.11-1 +- Update to 0.7.11. + * Fri Jun 6 2008 Brian Pepple - 0.7.10-1 - Update 0.7.10. From fedora-extras-commits at redhat.com Thu Jul 3 19:57:44 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Thu, 3 Jul 2008 19:57:44 GMT Subject: rpms/gdm/devel gdm-null-fs.patch,NONE,1.1 gdm.spec,1.393,1.394 Message-ID: <200807031957.m63Jviw4022998@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927 Modified Files: gdm.spec Added Files: gdm-null-fs.patch Log Message: Check for a null filesystem type gdm-null-fs.patch: --- NEW FILE gdm-null-fs.patch --- Index: gdm/gui/simple-greeter/gdm-user.c =================================================================== --- gdm/gui/simple-greeter/gdm-user.c (revision 6253) +++ gdm/gui/simple-greeter/gdm-user.c (working copy) @@ -750,11 +750,13 @@ render_icon_from_home (GdmUser *user, } filesystem_type = g_file_info_get_attribute_string (file_info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE); - is_local = ((strcmp (filesystem_type, "nfs") != 0) && - (strcmp (filesystem_type, "afs") != 0) && - (strcmp (filesystem_type, "autofs") != 0) && - (strcmp (filesystem_type, "unknown") != 0) && - (strcmp (filesystem_type, "ncpfs") != 0)); + if (filesystem_type != NULL) { + is_local = ((strcmp (filesystem_type, "nfs") != 0) && + (strcmp (filesystem_type, "afs") != 0) && + (strcmp (filesystem_type, "autofs") != 0) && + (strcmp (filesystem_type, "unknown") != 0) && + (strcmp (filesystem_type, "ncpfs") != 0)); + } g_object_unref (file_info); g_object_unref (file); } Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.393 retrieving revision 1.394 diff -u -r1.393 -r1.394 --- gdm.spec 25 Jun 2008 15:46:01 -0000 1.393 +++ gdm.spec 3 Jul 2008 19:56:56 -0000 1.394 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.22.0 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -85,6 +85,8 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=446672 Patch4: gdm-2.22.0-enable-tcp.patch +Patch9: gdm-null-fs.patch + # Fedora-specific Patch99: gdm-2.21.8-fedora-logo.patch @@ -109,6 +111,7 @@ %patch2 -p1 -b .keyboard-chooser %patch3 -p1 -b .show-users %patch4 -p1 -b .enable-tcp +%patch9 -p1 -b .null-fs %patch99 -p1 -b .fedora-logo autoreconf @@ -308,6 +311,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Thu Jul 3 2008 Jon McCann - 1:2.22.0-9 +- Check for a null filesystem type + * Wed Jun 25 2008 Ray Strode - 1:2.22.0-8 - After discussion with X team, turn tcp connections off by default, but add back option to toggle on (bug 446672) From fedora-extras-commits at redhat.com Thu Jul 3 20:11:59 2008 From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk)) Date: Thu, 3 Jul 2008 20:11:59 GMT Subject: rpms/dmraid/devel dmraid.spec,1.87,1.88 Message-ID: <200807032011.m63KBxEG030076@cvs-int.fedora.redhat.com> Author: agk Update of /cvs/pkgs/rpms/dmraid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30030 Modified Files: dmraid.spec Log Message: clean up spec file Index: dmraid.spec =================================================================== RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- dmraid.spec 3 Jul 2008 19:01:10 -0000 1.87 +++ dmraid.spec 3 Jul 2008 20:11:04 -0000 1.88 @@ -1,14 +1,8 @@ -# -# Copyright (C) Heinz Mauelshagen, 2004-2006 Red Hat GmbH. All rights reserved. -# -# See file LICENSE at the top of this source tree for license information. -# - -Summary: Device-mapper RAID tool and library. +Summary: Device-mapper RAID tool and library Name: dmraid Version: 1.0.0.rc14 Release: 8%{?dist} -License: GPL +License: GPLv2+ Group: System Environment/Base URL: http://people.redhat.com/heinzm/sw/dmraid BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,14 +22,25 @@ DMRAID supports RAID device discovery, RAID set activation and display of properties for ATARAID on Linux >= 2.4 using device-mapper. -%package -n dmraid-devel -Summary: Development libraries and headers for dmraid. +%package devel +Summary: Development libraries and headers for dmraid Group: Development/Libraries +License: GPLv2+ +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} -%description -n dmraid-devel +%description devel dmraid-devel provides a library interface for RAID device discovery, RAID set activation and display of properties for ATARAID volumes. +%package libs +Summary: Shared library for RAID device discovery +Group: System Environment/Libraries +License: GPLv2+ + +%description libs +This package contains the dmraid shared library, libdmraid. + %prep %setup -q -n dmraid/%{version} %patch0 -p1 -b .jmicron-name @@ -66,26 +71,31 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post libs -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files %defattr(-,root,root) %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt -/%{_mandir}/man8/* -/sbin/* -%{_libdir}/libdmraid.so.* +/%{_mandir}/man8/dmraid.8.gz +/sbin/dmraid +/sbin/dmraid.static /var/lock/dmraid -%files -n dmraid-devel +%files devel %defattr(-,root,root) %dir %{_includedir}/dmraid -%{_includedir}/dmraid/* -%{_libdir}/libdmraid.so +%{_includedir}/dmraid/*.h +%attr(755,root,root) %{_libdir}/libdmraid.so + +%files libs +%attr(755,root,root) %{_libdir}/libdmraid.so.* %changelog * Thu Jul 03 2008 Alasdair Kergon - 1.0.0.rc14-8 +- Move library into libs subpackage. +- Fix summary and licence tags. - Replace static build with symlink. * Tue Feb 19 2008 Fedora Release Engineering - 1.0.0.rc14-7 From fedora-extras-commits at redhat.com Thu Jul 3 20:15:06 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 3 Jul 2008 20:15:06 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch, 1.29, 1.30 selinux-policy.spec, 1.679, 1.680 Message-ID: <200807032015.m63KF6nG030247@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30185 Modified Files: policy-20080509.patch selinux-policy.spec Log Message: * Thu Jul 3 2008 Dan Walsh 3.4.2-11 - Allow ypbind apps to net_bind_service policy-20080509.patch: Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- policy-20080509.patch 2 Jul 2008 20:45:43 -0000 1.29 +++ policy-20080509.patch 3 Jul 2008 20:14:23 -0000 1.30 @@ -17880,7 +17880,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.4.2/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/services/mta.te 2008-07-02 09:54:22.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/services/mta.te 2008-07-03 14:44:29.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -17982,7 +17982,7 @@ logrotate_read_tmp_files(system_mail_t) ') -@@ -136,11 +176,38 @@ +@@ -136,11 +176,40 @@ ') optional_policy(` @@ -18003,9 +18003,11 @@ ') -# should break this up among sections: ++read_files_pattern(mailserver_delivery, system_mail_tmp_t, , system_mail_tmp_t) + +init_stream_connect_script(mailserver_delivery) +init_rw_script_stream_sockets(mailserver_delivery) - ++ +tunable_policy(`use_samba_home_dirs',` + fs_manage_cifs_dirs(mailserver_delivery) + fs_manage_cifs_files(mailserver_delivery) @@ -18022,7 +18024,7 @@ optional_policy(` # why is mail delivered to a directory of type arpwatch_data_t? arpwatch_search_data(mailserver_delivery) -@@ -154,3 +221,5 @@ +@@ -154,3 +223,5 @@ cron_read_system_job_tmp_files(mta_user_agent) ') ') @@ -18888,7 +18890,16 @@ +/etc/rc.d/init.d/ypxfrd -- gen_context(system_u:object_r:nis_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.4.2/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/services/nis.if 2008-07-02 08:47:04.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/services/nis.if 2008-07-03 12:19:00.000000000 -0400 +@@ -28,7 +28,7 @@ + type var_yp_t; + ') + +- dontaudit $1 self:capability net_bind_service; ++ allow $1 self:capability net_bind_service; + + allow $1 self:tcp_socket create_stream_socket_perms; + allow $1 self:udp_socket create_socket_perms; @@ -49,8 +49,8 @@ corenet_udp_bind_all_nodes($1) corenet_tcp_bind_generic_port($1) @@ -22794,12 +22805,14 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.fc serefpolicy-3.4.2/policy/modules/services/rsync.fc --- nsaserefpolicy/policy/modules/services/rsync.fc 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/services/rsync.fc 2008-07-02 08:47:04.000000000 -0400 -@@ -1,2 +1,4 @@ ++++ serefpolicy-3.4.2/policy/modules/services/rsync.fc 2008-07-03 14:07:31.000000000 -0400 +@@ -1,2 +1,6 @@ /usr/bin/rsync -- gen_context(system_u:object_r:rsync_exec_t,s0) + -+/var/log/rsync.log -- gen_context(system_u:object_r:rsync_log_t,s0) ++/var/log/rsync\.log -- gen_context(system_u:object_r:rsync_log_t,s0) ++ ++/var/run/rsyncd\.lock -- gen_context(system_u:object_r:rsync_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.4.2/policy/modules/services/rsync.te --- nsaserefpolicy/policy/modules/services/rsync.te 2008-06-12 23:25:05.000000000 -0400 +++ serefpolicy-3.4.2/policy/modules/services/rsync.te 2008-07-02 08:47:04.000000000 -0400 @@ -30007,7 +30020,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.4.2/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/logging.te 2008-07-02 08:47:05.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/logging.te 2008-07-03 12:27:05.000000000 -0400 @@ -61,10 +61,29 @@ logging_log_file(var_log_t) files_mountpoint(var_log_t) @@ -30644,7 +30657,7 @@ samba_run_smbmount($1, $2, $3) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.4.2/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/mount.te 2008-07-02 08:47:05.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/mount.te 2008-07-03 15:34:48.000000000 -0400 @@ -18,17 +18,18 @@ init_system_domain(mount_t,mount_exec_t) role system_r types mount_t; @@ -30699,26 +30712,29 @@ dev_rw_lvm_control(mount_t) dev_dontaudit_getattr_all_chr_files(mount_t) dev_dontaudit_getattr_memory_dev(mount_t) -@@ -62,6 +68,7 @@ +@@ -62,16 +68,18 @@ storage_raw_write_fixed_disk(mount_t) storage_raw_read_removable_device(mount_t) storage_raw_write_removable_device(mount_t) +storage_rw_fuse(mount_t) - fs_getattr_xattr_fs(mount_t) - fs_getattr_cifs(mount_t) -@@ -71,7 +78,10 @@ +-fs_getattr_xattr_fs(mount_t) +-fs_getattr_cifs(mount_t) ++fs_list_all(mount_t) ++fs_getattr_all_fs(mount_t) + fs_mount_all_fs(mount_t) + fs_unmount_all_fs(mount_t) + fs_remount_all_fs(mount_t) fs_relabelfrom_all_fs(mount_t) - fs_list_auto_mountpoints(mount_t) +-fs_list_auto_mountpoints(mount_t) fs_rw_tmpfs_chr_files(mount_t) +fs_manage_tmpfs_dirs(mount_t) fs_read_tmpfs_symlinks(mount_t) -+fs_search_fusefs_dirs(mount_t) +fs_manage_nfs_dirs(mount_t) term_use_all_terms(mount_t) -@@ -79,6 +89,7 @@ +@@ -79,6 +87,7 @@ corecmd_exec_bin(mount_t) domain_use_interactive_fds(mount_t) @@ -30726,7 +30742,7 @@ files_search_all(mount_t) files_read_etc_files(mount_t) -@@ -100,6 +111,8 @@ +@@ -100,6 +109,8 @@ init_use_fds(mount_t) init_use_script_ptys(mount_t) init_dontaudit_getattr_initctl(mount_t) @@ -30735,7 +30751,7 @@ auth_use_nsswitch(mount_t) -@@ -119,6 +132,8 @@ +@@ -119,6 +130,8 @@ seutil_read_config(mount_t) userdom_use_all_users_fds(mount_t) @@ -30744,7 +30760,7 @@ ifdef(`distro_redhat',` optional_policy(` -@@ -167,6 +182,8 @@ +@@ -167,6 +180,8 @@ fs_search_rpc(mount_t) rpc_stub(mount_t) @@ -30753,7 +30769,7 @@ ') optional_policy(` -@@ -181,6 +198,11 @@ +@@ -181,6 +196,11 @@ ') ') @@ -30765,7 +30781,7 @@ # for kernel package installation optional_policy(` rpm_rw_pipes(mount_t) -@@ -188,6 +210,7 @@ +@@ -188,6 +208,7 @@ optional_policy(` samba_domtrans_smbmount(mount_t) @@ -30773,7 +30789,7 @@ ') ######################################## -@@ -198,4 +221,26 @@ +@@ -198,4 +219,26 @@ optional_policy(` files_etc_filetrans_etc_runtime(unconfined_mount_t,file) unconfined_domain(unconfined_mount_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.679 retrieving revision 1.680 diff -u -r1.679 -r1.680 --- selinux-policy.spec 2 Jul 2008 20:45:43 -0000 1.679 +++ selinux-policy.spec 3 Jul 2008 20:14:23 -0000 1.680 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.4.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -375,6 +375,9 @@ %endif %changelog +* Thu Jul 3 2008 Dan Walsh 3.4.2-11 +- Allow ypbind apps to net_bind_service + * Wed Jul 2 2008 Dan Walsh 3.4.2-10 - Allow all system domains and application domains to append to any log file From fedora-extras-commits at redhat.com Thu Jul 3 20:16:18 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 3 Jul 2008 20:16:18 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.187, 1.188 selinux-policy.spec, 1.693, 1.694 Message-ID: <200807032016.m63KGI27030369@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30251 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Thu Jul 3 2008 Dan Walsh 3.3.1-76 - Allow ypbind apps to net_bind_service policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- policy-20071130.patch 2 Jul 2008 21:06:26 -0000 1.187 +++ policy-20071130.patch 3 Jul 2008 20:15:27 -0000 1.188 @@ -17138,8 +17138,24 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.3.1/policy/modules/services/kerberos.te --- nsaserefpolicy/policy/modules/services/kerberos.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-07-02 08:47:10.000000000 -0400 -@@ -54,6 +54,12 @@ ++++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-07-03 14:50:17.000000000 -0400 +@@ -16,6 +16,7 @@ + type kadmind_t; + type kadmind_exec_t; + init_daemon_domain(kadmind_t,kadmind_exec_t) ++domain_obj_id_change_exemption(kadmind_t) + + type kadmind_log_t; + logging_log_file(kadmind_log_t) +@@ -44,6 +45,7 @@ + type krb5kdc_t; + type krb5kdc_exec_t; + init_daemon_domain(krb5kdc_t,krb5kdc_exec_t) ++domain_obj_id_change_exemption(krb5kdc_t) + + type krb5kdc_log_t; + logging_log_file(krb5kdc_log_t) +@@ -54,6 +56,12 @@ type krb5kdc_var_run_t; files_pid_file(krb5kdc_var_run_t) @@ -17152,7 +17168,7 @@ ######################################## # # kadmind local policy -@@ -62,7 +68,7 @@ +@@ -62,7 +70,7 @@ # Use capabilities. Surplus capabilities may be allowed. allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice }; dontaudit kadmind_t self:capability sys_tty_config; @@ -17161,7 +17177,7 @@ allow kadmind_t self:netlink_route_socket r_netlink_socket_perms; allow kadmind_t self:unix_dgram_socket { connect create write }; allow kadmind_t self:tcp_socket connected_stream_socket_perms; -@@ -91,6 +97,7 @@ +@@ -91,6 +99,7 @@ kernel_read_kernel_sysctls(kadmind_t) kernel_list_proc(kadmind_t) kernel_read_proc_symlinks(kadmind_t) @@ -17169,7 +17185,7 @@ corenet_all_recvfrom_unlabeled(kadmind_t) corenet_all_recvfrom_netlabel(kadmind_t) -@@ -118,6 +125,12 @@ +@@ -118,6 +127,12 @@ domain_use_interactive_fds(kadmind_t) files_read_etc_files(kadmind_t) @@ -17182,7 +17198,7 @@ libs_use_ld_so(kadmind_t) libs_use_shared_libs(kadmind_t) -@@ -127,6 +140,7 @@ +@@ -127,6 +142,7 @@ miscfiles_read_localization(kadmind_t) sysnet_read_config(kadmind_t) @@ -17190,7 +17206,7 @@ userdom_dontaudit_use_unpriv_user_fds(kadmind_t) userdom_dontaudit_search_sysadm_home_dirs(kadmind_t) -@@ -137,6 +151,7 @@ +@@ -137,6 +153,7 @@ optional_policy(` seutil_sigchld_newrole(kadmind_t) @@ -17198,7 +17214,7 @@ ') optional_policy(` -@@ -151,7 +166,7 @@ +@@ -151,7 +168,7 @@ # Use capabilities. Surplus capabilities may be allowed. allow krb5kdc_t self:capability { setuid setgid net_admin chown fowner dac_override sys_nice }; dontaudit krb5kdc_t self:capability sys_tty_config; @@ -17207,7 +17223,7 @@ allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms; allow krb5kdc_t self:tcp_socket create_stream_socket_perms; allow krb5kdc_t self:udp_socket create_socket_perms; -@@ -215,6 +230,9 @@ +@@ -215,6 +232,9 @@ files_read_usr_symlinks(krb5kdc_t) files_read_var_files(krb5kdc_t) @@ -17217,7 +17233,7 @@ libs_use_ld_so(krb5kdc_t) libs_use_shared_libs(krb5kdc_t) -@@ -223,6 +241,7 @@ +@@ -223,6 +243,7 @@ miscfiles_read_localization(krb5kdc_t) sysnet_read_config(krb5kdc_t) @@ -17225,7 +17241,7 @@ userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t) userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t) -@@ -233,8 +252,10 @@ +@@ -233,8 +254,10 @@ optional_policy(` seutil_sigchld_newrole(krb5kdc_t) @@ -17925,7 +17941,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.3.1/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-07-02 09:53:40.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-07-03 14:44:32.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -18026,7 +18042,7 @@ logrotate_read_tmp_files(system_mail_t) ') -@@ -136,11 +175,38 @@ +@@ -136,11 +175,40 @@ ') optional_policy(` @@ -18047,6 +18063,8 @@ ') -# should break this up among sections: ++read_files_pattern(mailserver_delivery, system_mail_tmp_t, , system_mail_tmp_t) + +init_stream_connect_script(mailserver_delivery) +init_rw_script_stream_sockets(mailserver_delivery) + @@ -18055,7 +18073,7 @@ + fs_manage_cifs_files(mailserver_delivery) + fs_manage_cifs_symlinks(mailserver_delivery) +') - ++ +tunable_policy(`use_nfs_home_dirs',` + fs_manage_nfs_dirs(mailserver_delivery) + fs_manage_nfs_files(mailserver_delivery) @@ -18066,7 +18084,7 @@ optional_policy(` # why is mail delivered to a directory of type arpwatch_data_t? arpwatch_search_data(mailserver_delivery) -@@ -154,3 +220,4 @@ +@@ -154,3 +222,4 @@ cron_read_system_job_tmp_files(mta_user_agent) ') ') @@ -18907,7 +18925,16 @@ +/etc/rc.d/init.d/ypxfrd -- gen_context(system_u:object_r:nis_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.3.1/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/nis.if 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/nis.if 2008-07-03 12:18:46.000000000 -0400 +@@ -28,7 +28,7 @@ + type var_yp_t; + ') + +- dontaudit $1 self:capability net_bind_service; ++ allow $1 self:capability net_bind_service; + + allow $1 self:tcp_socket create_stream_socket_perms; + allow $1 self:udp_socket create_socket_perms; @@ -49,8 +49,8 @@ corenet_udp_bind_all_nodes($1) corenet_tcp_bind_generic_port($1) @@ -23066,12 +23093,14 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.fc serefpolicy-3.3.1/policy/modules/services/rsync.fc --- nsaserefpolicy/policy/modules/services/rsync.fc 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/rsync.fc 2008-07-02 08:47:10.000000000 -0400 -@@ -1,2 +1,4 @@ ++++ serefpolicy-3.3.1/policy/modules/services/rsync.fc 2008-07-03 14:07:54.000000000 -0400 +@@ -1,2 +1,6 @@ /usr/bin/rsync -- gen_context(system_u:object_r:rsync_exec_t,s0) + -+/var/log/rsync.log -- gen_context(system_u:object_r:rsync_log_t,s0) ++/var/log/rsync\.log -- gen_context(system_u:object_r:rsync_log_t,s0) ++ ++/var/run/rsyncd\.lock -- gen_context(system_u:object_r:rsync_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.if serefpolicy-3.3.1/policy/modules/services/rsync.if --- nsaserefpolicy/policy/modules/services/rsync.if 2008-06-12 23:38:02.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/services/rsync.if 2008-07-02 08:47:10.000000000 -0400 @@ -31787,7 +31816,7 @@ samba_run_smbmount($1, $2, $3) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.3.1/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/mount.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/mount.te 2008-07-03 15:35:42.000000000 -0400 @@ -18,17 +18,18 @@ init_system_domain(mount_t,mount_exec_t) role system_r types mount_t; @@ -31840,26 +31869,29 @@ dev_rw_lvm_control(mount_t) dev_dontaudit_getattr_all_chr_files(mount_t) dev_dontaudit_getattr_memory_dev(mount_t) -@@ -62,6 +66,7 @@ +@@ -62,16 +66,19 @@ storage_raw_write_fixed_disk(mount_t) storage_raw_read_removable_device(mount_t) storage_raw_write_removable_device(mount_t) +storage_rw_fuse(mount_t) - fs_getattr_xattr_fs(mount_t) - fs_getattr_cifs(mount_t) -@@ -71,7 +76,10 @@ +-fs_getattr_xattr_fs(mount_t) +-fs_getattr_cifs(mount_t) ++fs_list_all(mount_t) ++fs_getattr_all_fs(mount_t) + fs_mount_all_fs(mount_t) + fs_unmount_all_fs(mount_t) + fs_remount_all_fs(mount_t) fs_relabelfrom_all_fs(mount_t) fs_list_auto_mountpoints(mount_t) fs_rw_tmpfs_chr_files(mount_t) +fs_manage_tmpfs_dirs(mount_t) fs_read_tmpfs_symlinks(mount_t) -+fs_search_fusefs_dirs(mount_t) +fs_manage_nfs_dirs(mount_t) term_use_all_terms(mount_t) -@@ -100,6 +108,8 @@ +@@ -100,6 +107,8 @@ init_use_fds(mount_t) init_use_script_ptys(mount_t) init_dontaudit_getattr_initctl(mount_t) @@ -31868,7 +31900,7 @@ auth_use_nsswitch(mount_t) -@@ -119,6 +129,8 @@ +@@ -119,6 +128,8 @@ seutil_read_config(mount_t) userdom_use_all_users_fds(mount_t) @@ -31877,7 +31909,7 @@ ifdef(`distro_redhat',` optional_policy(` -@@ -167,6 +179,8 @@ +@@ -167,6 +178,8 @@ fs_search_rpc(mount_t) rpc_stub(mount_t) @@ -31886,7 +31918,7 @@ ') optional_policy(` -@@ -181,6 +195,11 @@ +@@ -181,6 +194,11 @@ ') ') @@ -31898,7 +31930,7 @@ # for kernel package installation optional_policy(` rpm_rw_pipes(mount_t) -@@ -188,6 +207,7 @@ +@@ -188,6 +206,7 @@ optional_policy(` samba_domtrans_smbmount(mount_t) @@ -31906,7 +31938,7 @@ ') ######################################## -@@ -198,4 +218,26 @@ +@@ -198,4 +217,26 @@ optional_policy(` files_etc_filetrans_etc_runtime(unconfined_mount_t,file) unconfined_domain(unconfined_mount_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.693 retrieving revision 1.694 diff -u -r1.693 -r1.694 --- selinux-policy.spec 2 Jul 2008 20:45:03 -0000 1.693 +++ selinux-policy.spec 3 Jul 2008 20:15:27 -0000 1.694 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 75%{?dist} +Release: 76%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -385,12 +385,14 @@ %endif %changelog +* Thu Jul 3 2008 Dan Walsh 3.3.1-76 +- Allow ypbind apps to net_bind_service + * Tue Jul 2 2008 Dan Walsh 3.3.1-75 - Fix transition from unconfined_t to dhcpc_t - Allow all system domains and application domains to append to any log file - allow sendmail to use courier_spool fifo files - * Tue Jul 1 2008 Dan Walsh 3.3.1-74 - Make virtd an unconfined domain From fedora-extras-commits at redhat.com Thu Jul 3 20:22:15 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 3 Jul 2008 20:22:15 GMT Subject: rpms/policycoreutils/F-9 policycoreutils-gui.patch, 1.67, 1.68 policycoreutils-rhat.patch, 1.369, 1.370 policycoreutils.spec, 1.528, 1.529 Message-ID: <200807032022.m63KMFq8030628@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30518 Modified Files: policycoreutils-gui.patch policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jul 2 2008 Dan Walsh 2.0.52-2 - Add lockdown wizard - Allow semanage booleans to take an input file an process lots of booleans at once. policycoreutils-gui.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.67 -r 1.68 policycoreutils-gui.patch Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-gui.patch,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- policycoreutils-gui.patch 2 Jul 2008 02:08:02 -0000 1.67 +++ policycoreutils-gui.patch 3 Jul 2008 20:21:26 -0000 1.68 @@ -1,7 +1,47 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.50/gui/booleansPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.52/gui/Makefile +--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.52/gui/Makefile 2008-07-03 13:15:10.000000000 -0400 +@@ -0,0 +1,36 @@ ++# Installation directories. ++PREFIX ?= ${DESTDIR}/usr ++SHAREDIR ?= $(PREFIX)/share/system-config-selinux ++ ++TARGETS= \ ++booleansPage.py \ ++fcontextPage.py \ ++loginsPage.py \ ++mappingsPage.py \ ++modulesPage.py \ ++polgen.py \ ++polgen.glade \ ++portsPage.py \ ++lockdown.glade \ ++semanagePage.py \ ++statusPage.py \ ++system-config-selinux.glade \ ++translationsPage.py \ ++usersPage.py \ ++selinux.tbl ++ ++all: $(TARGETS) system-config-selinux.py polgengui.py templates lockdown.py ++ ++install: all ++ -mkdir -p $(SHAREDIR)/templates ++ install -m 755 system-config-selinux.py $(SHAREDIR) ++ install -m 755 polgengui.py $(SHAREDIR) ++ install -m 755 lockdown.py $(SHAREDIR) ++ install -m 644 $(TARGETS) $(SHAREDIR) ++ install -m 644 templates/*.py $(SHAREDIR)/templates/ ++ ++clean: ++ ++indent: ++ ++relabel: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.52/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/booleansPage.py 2008-07-01 14:59:58.000000000 -0400 -@@ -0,0 +1,230 @@ ++++ policycoreutils-2.0.52/gui/booleansPage.py 2008-07-03 13:08:37.000000000 -0400 +@@ -0,0 +1,237 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel +# @@ -84,6 +124,7 @@ +class booleansPage: + def __init__(self, xml, doDebug=None): + self.xml = xml ++ xml.signal_connect("on_lockdown_clicked", self.on_lockdown_clicked) + self.window = self.xml.get_widget("mainWindow").get_root_window() + self.local = False + self.types=[] @@ -220,6 +261,12 @@ + commands.getstatusoutput(setsebool) + self.ready() + ++ def on_lockdown_clicked(self, button): ++ try: ++ os.spawnl(os.P_NOWAIT, "/usr/share/system-config-selinux/lockdown.py") ++ except ValueError, e: ++ self.error(e.args[0]) ++ + def on_local_clicked(self, button): + self.local = not self.local + self.revertButton.set_sensitive(self.local) @@ -232,9 +279,9 @@ + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.50/gui/fcontextPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.52/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/fcontextPage.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/fcontextPage.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,217 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -453,10 +500,10 @@ + self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.50/gui/lockdown.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.52/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/lockdown.glade 2008-07-01 14:59:58.000000000 -0400 -@@ -0,0 +1,2065 @@ ++++ policycoreutils-2.0.52/gui/lockdown.glade 2008-07-03 12:38:35.000000000 -0400 +@@ -0,0 +1,771 @@ + + + @@ -529,7 +576,7 @@ + + + -+ ++ + True + gtk-media-next + 1 @@ -551,7 +598,7 @@ + + + -+ ++ + True + gtk-media-previous + 1 @@ -565,17 +612,45 @@ + + + -+ ++ ++ True ++ ++ ++ ++ ++ + True -+ Cancel ++ Save As + True -+ -+ ++ ++ ++ ++ ++ ++ True ++ gtk-save-as ++ 1 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ True ++ Apply ++ True ++ ++ + + -+ ++ + True -+ gtk-cancel ++ gtk-apply + 1 + 0.5 + 0.5 @@ -585,6 +660,14 @@ + + + ++ ++ ++ ++ True ++ GNOMEUIINFO_MENU_EXIT_ITEM ++ ++ ++ + + + @@ -706,346 +789,315 @@ + + + -+ -+ True -+ False -+ True -+ GTK_POS_TOP [...7593 lines suppressed...] ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.52/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/boolean.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/boolean.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14592,9 +11314,9 @@ +') +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.50/gui/templates/etc_rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.52/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/etc_rw.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/etc_rw.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -14725,9 +11447,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.50/gui/templates/executable.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.52/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/executable.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/executable.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,327 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15056,31 +11778,9 @@ +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.50/gui/templates/__init__.py ---- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/__init__.py 2008-07-01 14:59:58.000000000 -0400 -@@ -0,0 +1,18 @@ -+# -+# Copyright (C) 2007 Red Hat, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+# -+ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.50/gui/templates/network.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.52/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/network.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/network.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -15162,9 +11862,9 @@ +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.50/gui/templates/rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.52/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/rw.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/rw.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15294,9 +11994,9 @@ +fc_dir=""" +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.50/gui/templates/script.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.52/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/script.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/script.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15403,9 +12103,9 @@ +# Adding roles to SELinux user USER +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.50/gui/templates/semodule.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.52/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/semodule.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/semodule.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15448,9 +12148,9 @@ +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.50/gui/templates/tmp.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.52/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/tmp.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/tmp.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15549,9 +12249,9 @@ + TEMPLATETYPE_manage_tmp($1) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.50/gui/templates/user.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.52/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/user.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/user.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15735,9 +12435,9 @@ +te_newrole_rules=""" +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t }) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.50/gui/templates/var_lib.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.52/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_lib.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_lib.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -15897,9 +12597,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.50/gui/templates/var_log.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.52/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_log.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_log.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16011,9 +12711,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.50/gui/templates/var_run.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.52/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_run.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_run.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16133,9 +12833,9 @@ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.50/gui/templates/var_spool.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.52/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/templates/var_spool.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_spool.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -16266,9 +12966,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.50/gui/translationsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.52/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/translationsPage.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/translationsPage.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -16388,9 +13088,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.50/gui/usersPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.52/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/gui/usersPage.py 2008-07-01 14:59:58.000000000 -0400 ++++ policycoreutils-2.0.52/gui/usersPage.py 2008-07-02 13:43:21.000000000 -0400 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-rhat.patch,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- policycoreutils-rhat.patch 2 Jul 2008 21:29:26 -0000 1.369 +++ policycoreutils-rhat.patch 3 Jul 2008 20:21:26 -0000 1.370 @@ -7,6 +7,12 @@ INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/VERSION policycoreutils-2.0.52/VERSION +--- nsapolicycoreutils/VERSION 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/VERSION 2008-07-02 13:42:54.000000000 -0400 +@@ -1 +1 @@ +-2.0.52 ++2.0.51 diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 +++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-02 13:43:21.000000000 -0400 @@ -38,34 +44,194 @@ close(fd); diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-02 13:43:21.000000000 -0400 -@@ -297,9 +297,10 @@ - if object == "user": ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-03 13:06:55.000000000 -0400 +@@ -51,7 +51,7 @@ + semanage interface -{a|d|m} [-tr] interface_spec + semanage fcontext -{a|d|m} [-frst] file_spec + semanage translation -{a|d|m} [-T] level +-semanage boolean -{d|m} boolean ++semanage boolean -{d|m} [-F] boolean | boolean_file + semanage permissive -{d|a} type + + Primary Options: +@@ -79,6 +79,7 @@ + -l (symbolic link) + -p (named pipe) + ++ -F, --file Treat target as an input file for command, change multiple settings + -p, --proto Port protocol (tcp or udp) + -P, --prefix Prefix for home directory labeling + -L, --level Default SELinux Level (MLS/MCS Systems only) +@@ -114,7 +115,7 @@ + valid_option["translation"] = [] + valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] + valid_option["boolean"] = [] +- valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0" ] ++ valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] + valid_option["permissive"] = [] + valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ] + return valid_option +@@ -136,13 +137,14 @@ + seuser = "" + prefix = "" + heading=1 +- value=0 +- add = 0 +- modify = 0 +- delete = 0 +- deleteall = 0 +- list = 0 +- locallist = 0 ++ value = "" ++ add = False ++ modify = False ++ delete = False ++ deleteall = False ++ list = False ++ locallist = False ++ use_file = False + store = "" + if len(sys.argv) < 3: + usage(_("Requires 2 or more arguments")) +@@ -155,11 +157,12 @@ + args = sys.argv[2:] + + gopts, cmds = getopt.getopt(args, +- '01adf:lhmnp:s:CDR:L:r:t:T:P:S:', ++ '01adf:lhmnp:s:FCDR:L:r:t:T:P:S:', + ['add', + 'delete', + 'deleteall', + 'ftype=', ++ 'file', + 'help', + 'list', + 'modify', +@@ -185,18 +188,22 @@ + if o == "-a" or o == "--add": + if modify or delete: + usage() +- add = 1 ++ add = True + + if o == "-d" or o == "--delete": + if modify or add: + usage() +- delete = 1 ++ delete = True + if o == "-D" or o == "--deleteall": + if modify: + usage() +- deleteall = 1 ++ deleteall = True + if o == "-f" or o == "--ftype": + ftype=a ++ ++ if o == "-F" or o == "--file": ++ use_file = True ++ + if o == "-h" or o == "--help": + usage() + +@@ -204,12 +211,12 @@ + heading=0 + + if o == "-C" or o == "--locallist": +- locallist=1 ++ locallist = True + + if o == "-m"or o == "--modify": + if delete or add: + usage() +- modify = 1 ++ modify = True + + if o == "-S" or o == '--store': + store = a +@@ -220,7 +227,7 @@ + serange = a + + if o == "-l" or o == "--list": +- list = 1 ++ list = True + + if o == "-L" or o == '--level': + if is_mls_enabled == 0: +@@ -246,9 +253,9 @@ + setrans = a + + if o == "--on" or o == "-1": +- value = 1 ++ value = True + if o == "-off" or o == "-0": +- value = 0 ++ value = False + + if object == "login": + OBJECT = seobject.loginRecords(store) +@@ -275,7 +282,10 @@ + OBJECT = seobject.permissiveRecords(store) + + if list: +- OBJECT.list(heading, locallist) ++ if object == "boolean": ++ OBJECT.list(heading, locallist, use_file) ++ else: ++ OBJECT.list(heading, locallist) + sys.exit(0); + + if deleteall: +@@ -298,8 +308,6 @@ rlist = roles.split() if len(rlist) == 0: -- raise ValueError(_("You must specify a role")) + raise ValueError(_("You must specify a role")) - if prefix == "": - raise ValueError(_("You must specify a prefix")) -+ raise ValueError(_("You must specify a role")) -+ if prefix == "": -+ prefix = "user" -+ OBJECT.add(target, rlist, selevel, serange, prefix) if object == "port": +@@ -317,7 +325,12 @@ + + if modify: + if object == "boolean": +- OBJECT.modify(target, value) ++ if use_file: ++ OBJECT.modify(target, use_file = use_file) ++ else: ++ if value == "": ++ raise ValueError(_("boolean requires value")) ++ OBJECT.modify(target, value) + + if object == "login": + OBJECT.modify(target, seuser, serange) diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-02 13:43:21.000000000 -0400 -@@ -3,7 +3,7 @@ ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-03 13:14:31.000000000 -0400 +@@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool .SH "SYNOPSIS" -.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|lC|D} [\-n] +.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|D} [\-n] [\-S store] .br - .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean +-.B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] boolean ++.B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] -F boolean | boolean_file + .br + .B semanage login \-{a|d|m} [\-sr] login_name .br -@@ -87,6 +87,9 @@ +@@ -54,6 +54,11 @@ + File Type. This is used with fcontext. + Requires a file type as shown in the mode field by ls, e.g. use -d to match only directories or -- to match only regular files. + .TP ++.I \-F, \-\-file ++Set multiple records from the input file. When used with the \-l \-\-list, it will output the current settings to stdout in the proper format. ++ ++Currently booleans only. ++.TP + .I \-h, \-\-help + display this message + .TP +@@ -87,6 +92,9 @@ .I \-s, \-\-seuser SELinux user name .TP @@ -75,3 +241,124 @@ .I \-t, \-\-type SELinux Type for the object .TP +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-03 13:07:45.000000000 -0400 +@@ -567,7 +562,7 @@ + def __init__(self, store = ""): + semanageRecords.__init__(self, store) + +- def add(self, name, roles, selevel, serange, prefix): ++ def add(self, name, roles, selevel, serange, prefix = "user"): + if is_mls_enabled == 1: + if serange == "": + serange = "s0" +@@ -1448,53 +1443,58 @@ + def __init__(self, store = ""): + semanageRecords.__init__(self, store) + +- def modify(self, name, value = ""): +- if value == "": +- raise ValueError(_("Requires value")) +- +- (rc,k) = semanage_bool_key_create(self.sh, name) +- if rc < 0: +- raise ValueError(_("Could not create a key for %s") % name) +- +- (rc,exists) = semanage_bool_exists(self.sh, k) +- if rc < 0: +- raise ValueError(_("Could not check if boolean %s is defined") % name) +- if not exists: +- raise ValueError(_("Boolean %s is not defined") % name) +- +- (rc,b) = semanage_bool_query(self.sh, k) +- if rc < 0: +- raise ValueError(_("Could not query file context %s") % name) ++ def __mod(self, name, value): ++ (rc,k) = semanage_bool_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError(_("Could not create a key for %s") % name) ++ (rc,exists) = semanage_bool_exists(self.sh, k) ++ if rc < 0: ++ raise ValueError(_("Could not check if boolean %s is defined") % name) ++ if not exists: ++ raise ValueError(_("Boolean %s is not defined") % name) ++ ++ (rc,b) = semanage_bool_query(self.sh, k) ++ if rc < 0: ++ raise ValueError(_("Could not query file context %s") % name) + +- if value != "": +- nvalue = int(value) +- semanage_bool_set_value(b, nvalue) ++ if value != "": ++ nvalue = int(value) ++ semanage_bool_set_value(b, nvalue) + else: + raise ValueError(_("You must specify a value")) ++ ++ rc = semanage_bool_set_active(self.sh, k, b) ++ if rc < 0: ++ raise ValueError(_("Could not set active value of boolean %s") % name) ++ rc = semanage_bool_modify_local(self.sh, k, b) ++ if rc < 0: ++ raise ValueError(_("Could not modify boolean %s") % name) ++ semanage_bool_key_free(k) ++ semanage_bool_free(b) + ++ def modify(self, name, value=False, use_file=False): ++ + rc = semanage_begin_transaction(self.sh) + if rc < 0: + raise ValueError(_("Could not start semanage transaction")) +- +- rc = semanage_bool_set_active(self.sh, k, b) +- if rc < 0: +- raise ValueError(_("Could not set active value of boolean %s") % name) +- rc = semanage_bool_modify_local(self.sh, k, b) +- if rc < 0: +- raise ValueError(_("Could not modify boolean %s") % name) ++ if use_file: ++ fd = open(name) ++ for b in fd.read().split(): ++ bool, val = b.split("=") ++ self.__mod(bool, val) ++ fd.close() ++ else: ++ self.__mod(name, value) + + rc = semanage_commit(self.sh) + if rc < 0: + raise ValueError(_("Could not modify boolean %s") % name) + +- semanage_bool_key_free(k) +- semanage_bool_free(b) +- + def delete(self, name): +- (rc,k) = semanage_bool_key_create(self.sh, name) +- if rc < 0: +- raise ValueError(_("Could not create a key for %s") % name) + ++ (rc,k) = semanage_bool_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError(_("Could not create a key for %s") % name) + (rc,exists) = semanage_bool_exists(self.sh, k) + if rc < 0: + raise ValueError(_("Could not check if boolean %s is defined") % name) +@@ -1571,8 +1571,15 @@ + else: + return _("unknown") + +- def list(self, heading = 1, locallist = 0): ++ def list(self, heading = True, locallist = False, use_file = False): + on_off = (_("off"),_("on")) ++ if use_file: ++ ddict = self.get_all(locallist) ++ keys = ddict.keys() ++ for k in keys: ++ if ddict[k]: ++ print "%s=%s" % (k, ddict[k][2]) ++ return + if heading: + print "%-40s %s\n" % (_("SELinux boolean"), _("Description")) + ddict = self.get_all(locallist) Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils.spec,v retrieving revision 1.528 retrieving revision 1.529 diff -u -r1.528 -r1.529 --- policycoreutils.spec 2 Jul 2008 21:29:26 -0000 1.528 +++ policycoreutils.spec 3 Jul 2008 20:21:26 -0000 1.529 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,10 @@ fi %changelog +* Wed Jul 2 2008 Dan Walsh 2.0.52-2 +- Add lockdown wizard +- Allow semanage booleans to take an input file an process lots of booleans at once. + * Wed Jul 2 2008 Dan Walsh 2.0.52-1 - Default prefix to "user" From fedora-extras-commits at redhat.com Thu Jul 3 20:48:24 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 3 Jul 2008 20:48:24 GMT Subject: rpms/gl-117/devel gl-117.spec,1.11,1.12 Message-ID: <200807032048.m63KmOsw031533@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/gl-117/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31452 Modified Files: gl-117.spec Log Message: Update License tag. Drop -lSDLmain. Index: gl-117.spec =================================================================== RCS file: /cvs/pkgs/rpms/gl-117/devel/gl-117.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gl-117.spec 20 Feb 2008 02:47:10 -0000 1.11 +++ gl-117.spec 3 Jul 2008 20:47:15 -0000 1.12 @@ -1,9 +1,9 @@ Name: gl-117 Version: 1.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Action flight simulator Group: Amusements/Games -License: GPL +License: GPLv2 URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop @@ -25,6 +25,8 @@ sed -i -e 's/\r//' AUTHORS ChangeLog FAQ NEWS +sed -i -e 's/ -lSDLmain\>//' configure + %build %configure make %{?_smp_mflags} @@ -54,6 +56,10 @@ %{_mandir}/man6/* %changelog +* Thu Jul 03 2008 Steven Pritchard 1.3.2-6 +- Update License tag. +- Drop -lSDLmain. + * Tue Feb 19 2008 Fedora Release Engineering - 1.3.2-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 3 21:13:36 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 3 Jul 2008 21:13:36 GMT Subject: rpms/gl-117/devel gl-117.desktop,1.1,1.2 gl-117.spec,1.12,1.13 Message-ID: <200807032113.m63LDahP006860@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/gl-117/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6801 Modified Files: gl-117.desktop gl-117.spec Log Message: Fix BZ#304841. - Use opengl-game-wrapper. - Update .desktop file. - Drop "--add-category X-Fedora". Index: gl-117.desktop =================================================================== RCS file: /cvs/pkgs/rpms/gl-117/devel/gl-117.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gl-117.desktop 8 Nov 2004 04:25:52 -0000 1.1 +++ gl-117.desktop 3 Jul 2008 21:12:35 -0000 1.2 @@ -1,9 +1,9 @@ [Desktop Entry] Name=GL-117 Comment=An action flight similator -Exec=gl-117 -Icon=gl-117.png +Exec=gl-117-wrapper +Icon=gl-117 Terminal=false Type=Application -Categories=Game;Application; +Categories=Game;Simulation; Encoding=UTF-8 Index: gl-117.spec =================================================================== RCS file: /cvs/pkgs/rpms/gl-117/devel/gl-117.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gl-117.spec 3 Jul 2008 20:47:15 -0000 1.12 +++ gl-117.spec 3 Jul 2008 21:12:35 -0000 1.13 @@ -1,6 +1,6 @@ Name: gl-117 Version: 1.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Action flight simulator Group: Amusements/Games License: GPLv2 @@ -12,6 +12,7 @@ BuildRequires: SDL-devel, SDL_mixer-devel BuildRequires: freeglut-devel BuildRequires: desktop-file-utils +Requires: opengl-games-utils %description GL-117 is an action flight simulator. Enter the Eagle Squadron and succeed @@ -33,29 +34,41 @@ %install rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man6 + +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications \ + $RPM_BUILD_ROOT/%{_datadir}/pixmaps \ + $RPM_BUILD_ROOT/%{_mandir}/man6 + install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ + desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --add-category X-Fedora \ --vendor fedora %{SOURCE1} +ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING FAQ NEWS README doc/%{name}.pdf -%{_bindir}/* +%{_bindir}/%{name} +%{_bindir}/%{name}-wrapper %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_mandir}/man6/* %changelog +* Thu Jul 03 2008 Steven Pritchard 1.3.2-7 +- Fix BZ#304841. + - Use opengl-game-wrapper. + - Update .desktop file. + - Drop "--add-category X-Fedora". + * Thu Jul 03 2008 Steven Pritchard 1.3.2-6 - Update License tag. - Drop -lSDLmain. From fedora-extras-commits at redhat.com Thu Jul 3 21:18:27 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 3 Jul 2008 21:18:27 GMT Subject: rpms/kernel/F-9 patch-2.6.25.10.bz2.sign, NONE, 1.1 .cvsignore, 1.817, 1.818 kernel.spec, 1.700, 1.701 linux-2.6-upstream-reverts.patch, 1.5, 1.6 sources, 1.778, 1.779 upstream, 1.697, 1.698 patch-2.6.25.9.bz2.sign, 1.1, NONE Message-ID: <200807032118.m63LIR9S007016@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6985 Modified Files: .cvsignore kernel.spec linux-2.6-upstream-reverts.patch sources upstream Added Files: patch-2.6.25.10.bz2.sign Removed Files: patch-2.6.25.9.bz2.sign Log Message: * Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-82 - Linux 2.6.25.10 - Reverted stable patch, not needed with utrace: x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch - Reverted part of this stable patch against drivers/net/wireless/strip.c (the driver eventually gets removed as part of the wireless updates): tty-fix-for-tty-operations-bugs.patch --- NEW FILE patch-2.6.25.10.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIbE5NyGugalF9Dw4RAkZqAJ9T1YQYand/tLR5isI1DMct3RhhuQCZAdjV H7HfaUokzltPAe5iCxFbHjE= =THSv -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v retrieving revision 1.817 retrieving revision 1.818 diff -u -r1.817 -r1.818 --- .cvsignore 25 Jun 2008 02:48:49 -0000 1.817 +++ .cvsignore 3 Jul 2008 21:17:31 -0000 1.818 @@ -4,4 +4,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.9.bz2 +patch-2.6.25.10.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.700 retrieving revision 1.701 diff -u -r1.700 -r1.701 --- kernel.spec 2 Jul 2008 22:04:18 -0000 1.700 +++ kernel.spec 3 Jul 2008 21:17:32 -0000 1.701 @@ -31,7 +31,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 9 +%define stable_update 10 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1861,6 +1861,14 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-82 +- Linux 2.6.25.10 +- Reverted stable patch, not needed with utrace: + x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch +- Reverted part of this stable patch against drivers/net/wireless/strip.c + (the driver eventually gets removed as part of the wireless updates): + tty-fix-for-tty-operations-bugs.patch + * Wed Jul 02 2008 John W. Linville 2.6.25.9-81 - Upstream wireless updates from 2008-06-30 (http://marc.info/?l=linux-wireless&m=121486432315033&w=2) linux-2.6-upstream-reverts.patch: Index: linux-2.6-upstream-reverts.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-upstream-reverts.patch 23 Jun 2008 17:35:34 -0000 1.5 +++ linux-2.6-upstream-reverts.patch 3 Jul 2008 21:17:32 -0000 1.6 @@ -459,3 +459,131 @@ ring->nr_slots = nr_slots; ring->mmio_base = b43_dmacontroller_base(type, controller_index); ring->index = controller_index; +From stable-bounces at linux.kernel.org Fri Jun 27 14:44:11 2008 +From: Roland McGrath +Date: Fri, 27 Jun 2008 13:48:29 -0700 (PDT) +Subject: x86_64 ptrace: fix sys32_ptrace task_struct leak +To: stable at kernel.org +Cc: Pekka Enberg , Jeff Dike , Joris van Rantwijk , linux-kernel at vger.kernel.org, Thorsten Knabe +Message-ID: <20080627204953.D7D8A154223 at magilla.localdomain> + +From: Roland McGrath + +Commit 5a4646a4efed8c835f76c3b88f3155f6ab5b8d9b introduced a leak of +task_struct refs into sys32_ptrace. This bug has already gone away in +for 2.6.26 in commit 562b80bafffaf42a6d916b0a2ee3d684220a1c10. + +Signed-off-by: Roland McGrath +Acked-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/ptrace.c | 45 ++++++++++++++++++++++++++------------------- + 1 file changed, 26 insertions(+), 19 deletions(-) + +--- a/arch/x86/kernel/ptrace.c ++++ b/arch/x86/kernel/ptrace.c +@@ -1309,42 +1309,49 @@ asmlinkage long sys32_ptrace(long reques + break; + + case PTRACE_GETREGS: /* Get all gp regs from the child. */ +- return copy_regset_to_user(child, &user_x86_32_view, +- REGSET_GENERAL, +- 0, sizeof(struct user_regs_struct32), +- datap); ++ ret = copy_regset_to_user(child, &user_x86_32_view, ++ REGSET_GENERAL, ++ 0, sizeof(struct user_regs_struct32), ++ datap); ++ break; + + case PTRACE_SETREGS: /* Set all gp regs in the child. */ +- return copy_regset_from_user(child, &user_x86_32_view, +- REGSET_GENERAL, 0, +- sizeof(struct user_regs_struct32), +- datap); ++ ret = copy_regset_from_user(child, &user_x86_32_view, ++ REGSET_GENERAL, 0, ++ sizeof(struct user_regs_struct32), ++ datap); ++ break; + + case PTRACE_GETFPREGS: /* Get the child FPU state. */ +- return copy_regset_to_user(child, &user_x86_32_view, +- REGSET_FP, 0, +- sizeof(struct user_i387_ia32_struct), +- datap); ++ ret = copy_regset_to_user(child, &user_x86_32_view, ++ REGSET_FP, 0, ++ sizeof(struct user_i387_ia32_struct), ++ datap); ++ break; + + case PTRACE_SETFPREGS: /* Set the child FPU state. */ +- return copy_regset_from_user( ++ ret = copy_regset_from_user( + child, &user_x86_32_view, REGSET_FP, + 0, sizeof(struct user_i387_ia32_struct), datap); ++ break; + + case PTRACE_GETFPXREGS: /* Get the child extended FPU state. */ +- return copy_regset_to_user(child, &user_x86_32_view, +- REGSET_XFP, 0, +- sizeof(struct user32_fxsr_struct), +- datap); ++ ret = copy_regset_to_user(child, &user_x86_32_view, ++ REGSET_XFP, 0, ++ sizeof(struct user32_fxsr_struct), ++ datap); ++ break; + + case PTRACE_SETFPXREGS: /* Set the child extended FPU state. */ +- return copy_regset_from_user(child, &user_x86_32_view, ++ ret = copy_regset_from_user(child, &user_x86_32_view, + REGSET_XFP, 0, + sizeof(struct user32_fxsr_struct), + datap); ++ break; + + default: +- return compat_ptrace_request(child, request, addr, data); ++ ret = compat_ptrace_request(child, request, addr, data); ++ break; + } + + out: +From alan at lxorguk.ukuu.org.uk Fri Jun 27 07:39:26 2008 +From: Alan Cox +Date: Fri, 27 Jun 2008 15:21:55 +0100 +Subject: TTY: fix for tty operations bugs +To: greg at kroah.com +Message-ID: <20080627152155.50f0ebae at lxorguk.ukuu.org.uk> + +From: Alan Cox + +This is fixed with the recent tty operations rewrite in mainline in a +different way, this is a selective backport of the relevant portions to +the -stable tree. + +Signed-off-by: Alan Cox +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/strip.c | 3 ++- + + ***************** + * NOTE: reverting only the changes to drivers/net/wireless/strip.c + ***************** + +--- a/drivers/net/wireless/strip.c ++++ b/drivers/net/wireless/strip.c +@@ -802,7 +802,8 @@ static void set_baud(struct tty_struct * + struct ktermios old_termios = *(tty->termios); + tty->termios->c_cflag &= ~CBAUD; /* Clear the old baud setting */ + tty->termios->c_cflag |= baudcode; /* Set the new baud setting */ +- tty->driver->set_termios(tty, &old_termios); ++ if (tty->driver->set_termios) ++ tty->driver->set_termios(tty, &old_termios); + } + + /* Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v retrieving revision 1.778 retrieving revision 1.779 diff -u -r1.778 -r1.779 --- sources 25 Jun 2008 02:48:49 -0000 1.778 +++ sources 3 Jul 2008 21:17:32 -0000 1.779 @@ -1,2 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -493a0b7dd145d4f378ce3970e3690320 patch-2.6.25.9.bz2 +ad3c4b32bf293722500160a2bb6100b6 patch-2.6.25.10.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- upstream 25 Jun 2008 02:48:49 -0000 1.697 +++ upstream 3 Jul 2008 21:17:32 -0000 1.698 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.9.bz2 +patch-2.6.25.10.bz2 --- patch-2.6.25.9.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 21:23:05 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 3 Jul 2008 21:23:05 GMT Subject: rpms/python-pycurl/devel python-pycurl-no-static-libs.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 python-pycurl.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200807032123.m63LN5NP007194@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-pycurl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7113 Modified Files: .cvsignore python-pycurl.spec sources Added Files: python-pycurl-no-static-libs.patch Log Message: * Thu Jul 3 2008 Jeffrey C. Ollie - 7.18.2-1 - Update to 7.18.2 - Thanks to Ville Skytt?? re-enable the tests and fix a minor problem with the setup.py. (Bug # 45400) python-pycurl-no-static-libs.patch: --- NEW FILE python-pycurl-no-static-libs.patch --- --- setup.py~ 2008-04-22 17:00:45.000000000 +0300 +++ setup.py 2008-07-03 21:53:36.000000000 +0300 @@ -97,8 +97,7 @@ else: extra_compile_args.append(e) libs = split_quoted( - os.popen("'%s' --libs" % CURL_CONFIG).read()+\ - os.popen("'%s' --static-libs" % CURL_CONFIG).read()) + os.popen("'%s' --libs" % CURL_CONFIG).read()) for e in libs: if e[:2] == "-l": libraries.append(e[2:]) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Jun 2008 04:08:27 -0000 1.6 +++ .cvsignore 3 Jul 2008 21:22:10 -0000 1.7 @@ -1 +1 @@ -pycurl-7.18.1.tar.gz +pycurl-7.18.2.tar.gz Index: python-pycurl.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/devel/python-pycurl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-pycurl.spec 6 Jun 2008 04:08:27 -0000 1.8 +++ python-pycurl.spec 3 Jul 2008 21:22:10 -0000 1.9 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pycurl -Version: 7.18.1 +Version: 7.18.2 Release: 1%{?dist} Summary: A Python interface to libcurl @@ -9,6 +9,7 @@ License: LGPLv2+ URL: http://pycurl.sourceforge.net/ Source0: http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz +Patch0: python-pycurl-no-static-libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,14 +26,16 @@ of features. %prep -%setup -q -n pycurl-%{version} +%setup0 -q -n pycurl-%{version} +%patch0 -p0 chmod a-x examples/* %build CFLAGS="$RPM_OPT_FLAGS -DHAVE_CURL_OPENSSL" %{__python} setup.py build %check -#%{__python} tests/test_internals.py -q +export PYTHONPATH=$PWD/build/lib* +%{__python} tests/test_internals.py -q %install rm -rf %{buildroot} @@ -48,6 +51,11 @@ %{python_sitearch}/* %changelog +* Thu Jul 3 2008 Jeffrey C. Ollie - 7.18.2-1 +- Update to 7.18.2 +- Thanks to Ville Skytt?? re-enable the tests and fix a minor problem + with the setup.py. (Bug # 45400) + * Thu Jun 5 2008 Jeffrey C. Ollie - 7.18.1-1 - Update to 7.18.1 - Disable tests because it's not testing the built library, it's trying to Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Jun 2008 04:08:27 -0000 1.6 +++ sources 3 Jul 2008 21:22:10 -0000 1.7 @@ -1 +1 @@ -adc4399a002ce794559941c13b89afb8 pycurl-7.18.1.tar.gz +39210d56f1d5a75ac8dd6a2866a93dd5 pycurl-7.18.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 21:28:42 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 3 Jul 2008 21:28:42 GMT Subject: rpms/kernel/F-8 patch-2.6.25.10.bz2.sign, NONE, 1.1 .cvsignore, 1.727, 1.728 kernel.spec, 1.482, 1.483 linux-2.6-upstream-reverts.patch, 1.10, 1.11 sources, 1.688, 1.689 upstream, 1.609, 1.610 patch-2.6.25.9.bz2.sign, 1.1, NONE Message-ID: <200807032128.m63LSgPT007400@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7350 Modified Files: .cvsignore kernel.spec linux-2.6-upstream-reverts.patch sources upstream Added Files: patch-2.6.25.10.bz2.sign Removed Files: patch-2.6.25.9.bz2.sign Log Message: * Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-42 - Linux 2.6.25.10 - Reverted stable patch, not needed with utrace: x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch - Reverted part of this stable patch against drivers/net/wireless/strip.c (the driver eventually gets removed as part of the wireless updates): tty-fix-for-tty-operations-bugs.patch --- NEW FILE patch-2.6.25.10.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIbE5NyGugalF9Dw4RAkZqAJ9T1YQYand/tLR5isI1DMct3RhhuQCZAdjV H7HfaUokzltPAe5iCxFbHjE= =THSv -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v retrieving revision 1.727 retrieving revision 1.728 diff -u -r1.727 -r1.728 --- .cvsignore 25 Jun 2008 02:43:38 -0000 1.727 +++ .cvsignore 3 Jul 2008 21:27:53 -0000 1.728 @@ -3,4 +3,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.9.bz2 +patch-2.6.25.10.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.482 retrieving revision 1.483 diff -u -r1.482 -r1.483 --- kernel.spec 2 Jul 2008 21:23:38 -0000 1.482 +++ kernel.spec 3 Jul 2008 21:27:53 -0000 1.483 @@ -33,7 +33,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 9 +%define stable_update 10 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1824,6 +1824,14 @@ %changelog +* Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-42 +- Linux 2.6.25.10 +- Reverted stable patch, not needed with utrace: + x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch +- Reverted part of this stable patch against drivers/net/wireless/strip.c + (the driver eventually gets removed as part of the wireless updates): + tty-fix-for-tty-operations-bugs.patch + * Wed Jul 02 2008 John W. Linville 2.6.25.9-41 - Upstream wireless fixes from 2008-06-30 (http://marc.info/?l=linux-wireless&m=121485709702728&w=2) linux-2.6-upstream-reverts.patch: Index: linux-2.6-upstream-reverts.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-upstream-reverts.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux-2.6-upstream-reverts.patch 23 Jun 2008 17:35:23 -0000 1.10 +++ linux-2.6-upstream-reverts.patch 3 Jul 2008 21:27:53 -0000 1.11 @@ -459,3 +459,131 @@ ring->nr_slots = nr_slots; ring->mmio_base = b43_dmacontroller_base(type, controller_index); ring->index = controller_index; +From stable-bounces at linux.kernel.org Fri Jun 27 14:44:11 2008 +From: Roland McGrath +Date: Fri, 27 Jun 2008 13:48:29 -0700 (PDT) +Subject: x86_64 ptrace: fix sys32_ptrace task_struct leak +To: stable at kernel.org +Cc: Pekka Enberg , Jeff Dike , Joris van Rantwijk , linux-kernel at vger.kernel.org, Thorsten Knabe +Message-ID: <20080627204953.D7D8A154223 at magilla.localdomain> + +From: Roland McGrath + +Commit 5a4646a4efed8c835f76c3b88f3155f6ab5b8d9b introduced a leak of +task_struct refs into sys32_ptrace. This bug has already gone away in +for 2.6.26 in commit 562b80bafffaf42a6d916b0a2ee3d684220a1c10. + +Signed-off-by: Roland McGrath +Acked-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/ptrace.c | 45 ++++++++++++++++++++++++++------------------- + 1 file changed, 26 insertions(+), 19 deletions(-) + +--- a/arch/x86/kernel/ptrace.c ++++ b/arch/x86/kernel/ptrace.c +@@ -1309,42 +1309,49 @@ asmlinkage long sys32_ptrace(long reques + break; + + case PTRACE_GETREGS: /* Get all gp regs from the child. */ +- return copy_regset_to_user(child, &user_x86_32_view, +- REGSET_GENERAL, +- 0, sizeof(struct user_regs_struct32), +- datap); ++ ret = copy_regset_to_user(child, &user_x86_32_view, ++ REGSET_GENERAL, ++ 0, sizeof(struct user_regs_struct32), ++ datap); ++ break; + + case PTRACE_SETREGS: /* Set all gp regs in the child. */ +- return copy_regset_from_user(child, &user_x86_32_view, +- REGSET_GENERAL, 0, +- sizeof(struct user_regs_struct32), +- datap); ++ ret = copy_regset_from_user(child, &user_x86_32_view, ++ REGSET_GENERAL, 0, ++ sizeof(struct user_regs_struct32), ++ datap); ++ break; + + case PTRACE_GETFPREGS: /* Get the child FPU state. */ +- return copy_regset_to_user(child, &user_x86_32_view, +- REGSET_FP, 0, +- sizeof(struct user_i387_ia32_struct), +- datap); ++ ret = copy_regset_to_user(child, &user_x86_32_view, ++ REGSET_FP, 0, ++ sizeof(struct user_i387_ia32_struct), ++ datap); ++ break; + + case PTRACE_SETFPREGS: /* Set the child FPU state. */ +- return copy_regset_from_user( ++ ret = copy_regset_from_user( + child, &user_x86_32_view, REGSET_FP, + 0, sizeof(struct user_i387_ia32_struct), datap); ++ break; + + case PTRACE_GETFPXREGS: /* Get the child extended FPU state. */ +- return copy_regset_to_user(child, &user_x86_32_view, +- REGSET_XFP, 0, +- sizeof(struct user32_fxsr_struct), +- datap); ++ ret = copy_regset_to_user(child, &user_x86_32_view, ++ REGSET_XFP, 0, ++ sizeof(struct user32_fxsr_struct), ++ datap); ++ break; + + case PTRACE_SETFPXREGS: /* Set the child extended FPU state. */ +- return copy_regset_from_user(child, &user_x86_32_view, ++ ret = copy_regset_from_user(child, &user_x86_32_view, + REGSET_XFP, 0, + sizeof(struct user32_fxsr_struct), + datap); ++ break; + + default: +- return compat_ptrace_request(child, request, addr, data); ++ ret = compat_ptrace_request(child, request, addr, data); ++ break; + } + + out: +From alan at lxorguk.ukuu.org.uk Fri Jun 27 07:39:26 2008 +From: Alan Cox +Date: Fri, 27 Jun 2008 15:21:55 +0100 +Subject: TTY: fix for tty operations bugs +To: greg at kroah.com +Message-ID: <20080627152155.50f0ebae at lxorguk.ukuu.org.uk> + +From: Alan Cox + +This is fixed with the recent tty operations rewrite in mainline in a +different way, this is a selective backport of the relevant portions to +the -stable tree. + +Signed-off-by: Alan Cox +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/strip.c | 3 ++- + + ***************** + * NOTE: reverting only the changes to drivers/net/wireless/strip.c + ***************** + +--- a/drivers/net/wireless/strip.c ++++ b/drivers/net/wireless/strip.c +@@ -802,7 +802,8 @@ static void set_baud(struct tty_struct * + struct ktermios old_termios = *(tty->termios); + tty->termios->c_cflag &= ~CBAUD; /* Clear the old baud setting */ + tty->termios->c_cflag |= baudcode; /* Set the new baud setting */ +- tty->driver->set_termios(tty, &old_termios); ++ if (tty->driver->set_termios) ++ tty->driver->set_termios(tty, &old_termios); + } + + /* Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v retrieving revision 1.688 retrieving revision 1.689 diff -u -r1.688 -r1.689 --- sources 25 Jun 2008 02:43:38 -0000 1.688 +++ sources 3 Jul 2008 21:27:53 -0000 1.689 @@ -1,2 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -493a0b7dd145d4f378ce3970e3690320 patch-2.6.25.9.bz2 +ad3c4b32bf293722500160a2bb6100b6 patch-2.6.25.10.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v retrieving revision 1.609 retrieving revision 1.610 diff -u -r1.609 -r1.610 --- upstream 25 Jun 2008 02:43:38 -0000 1.609 +++ upstream 3 Jul 2008 21:27:53 -0000 1.610 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.9.bz2 +patch-2.6.25.10.bz2 --- patch-2.6.25.9.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 21:32:11 2008 From: fedora-extras-commits at redhat.com (Simon Wilkinson (sxw)) Date: Thu, 3 Jul 2008 21:32:11 GMT Subject: rpms/remctl/F-9 remctl.spec,1.3,1.4 Message-ID: <200807032132.m63LWBAI007571@cvs-int.fedora.redhat.com> Author: sxw Update of /cvs/pkgs/rpms/remctl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7488 Modified Files: remctl.spec Log Message: Fix for #453579 - thanks to Paul Howarth Index: remctl.spec =================================================================== RCS file: /cvs/pkgs/rpms/remctl/F-9/remctl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- remctl.spec 28 Feb 2008 16:09:12 -0000 1.3 +++ remctl.spec 3 Jul 2008 21:31:17 -0000 1.4 @@ -1,6 +1,6 @@ Name: remctl Version: 2.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Client/server for Kerberos-authenticated command execution Group: Applications/Internet @@ -37,6 +37,7 @@ Summary: Perl interface to remctl Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl remctl implements a client/server protocol for running single commands @@ -64,7 +65,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' # And the libraries find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' @@ -97,6 +98,9 @@ %{_mandir}/man3/Net::Remctl* %changelog +* Thu Jun 03 2008 Simon Wilkinson 2.11-7 +- Update to catch new perl version, and fix perl dependencies (#453579) + * Thu Feb 28 2008 Simon Wilkinson 2.11-6 - The build process isn't -j safe, so remove smpflags until this can be fixed. From fedora-extras-commits at redhat.com Thu Jul 3 21:32:32 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 3 Jul 2008 21:32:32 GMT Subject: rpms/gl-117/F-9 gl-117.desktop,1.1,1.2 gl-117.spec,1.11,1.12 Message-ID: <200807032132.m63LWWSm007611@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/gl-117/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7496 Modified Files: gl-117.desktop gl-117.spec Log Message: Sync with devel. Index: gl-117.desktop =================================================================== RCS file: /cvs/pkgs/rpms/gl-117/F-9/gl-117.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gl-117.desktop 8 Nov 2004 04:25:52 -0000 1.1 +++ gl-117.desktop 3 Jul 2008 21:31:29 -0000 1.2 @@ -1,9 +1,9 @@ [Desktop Entry] Name=GL-117 Comment=An action flight similator -Exec=gl-117 -Icon=gl-117.png +Exec=gl-117-wrapper +Icon=gl-117 Terminal=false Type=Application -Categories=Game;Application; +Categories=Game;Simulation; Encoding=UTF-8 Index: gl-117.spec =================================================================== RCS file: /cvs/pkgs/rpms/gl-117/F-9/gl-117.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gl-117.spec 20 Feb 2008 02:47:10 -0000 1.11 +++ gl-117.spec 3 Jul 2008 21:31:29 -0000 1.12 @@ -1,9 +1,9 @@ Name: gl-117 Version: 1.3.2 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Action flight simulator Group: Amusements/Games -License: GPL +License: GPLv2 URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop @@ -12,6 +12,7 @@ BuildRequires: SDL-devel, SDL_mixer-devel BuildRequires: freeglut-devel BuildRequires: desktop-file-utils +Requires: opengl-games-utils %description GL-117 is an action flight simulator. Enter the Eagle Squadron and succeed @@ -25,35 +26,53 @@ sed -i -e 's/\r//' AUTHORS ChangeLog FAQ NEWS +sed -i -e 's/ -lSDLmain\>//' configure + %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man6 + +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications \ + $RPM_BUILD_ROOT/%{_datadir}/pixmaps \ + $RPM_BUILD_ROOT/%{_mandir}/man6 + install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ + desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --add-category X-Fedora \ --vendor fedora %{SOURCE1} +ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING FAQ NEWS README doc/%{name}.pdf -%{_bindir}/* +%{_bindir}/%{name} +%{_bindir}/%{name}-wrapper %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_mandir}/man6/* %changelog +* Thu Jul 03 2008 Steven Pritchard 1.3.2-7 +- Fix BZ#304841. + - Use opengl-game-wrapper. + - Update .desktop file. + - Drop "--add-category X-Fedora". + +* Thu Jul 03 2008 Steven Pritchard 1.3.2-6 +- Update License tag. +- Drop -lSDLmain. + * Tue Feb 19 2008 Fedora Release Engineering - 1.3.2-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 3 21:32:36 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 3 Jul 2008 21:32:36 GMT Subject: rpms/python-pycurl/F-9 .cvsignore, 1.6, 1.7 python-pycurl.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200807032132.m63LWaD2007656@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-pycurl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7518 Modified Files: .cvsignore python-pycurl.spec sources Log Message: * Thu Jul 3 2008 Jeffrey C. Ollie - 7.18.2-1 - Update to 7.18.2 - Thanks to Ville Skytt?? re-enable the tests and fix a minor problem with the setup.py. (Bug # 45400) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Jun 2008 04:15:08 -0000 1.6 +++ .cvsignore 3 Jul 2008 21:31:42 -0000 1.7 @@ -1 +1 @@ -pycurl-7.18.1.tar.gz +pycurl-7.18.2.tar.gz Index: python-pycurl.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/F-9/python-pycurl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-pycurl.spec 6 Jun 2008 04:15:08 -0000 1.8 +++ python-pycurl.spec 3 Jul 2008 21:31:42 -0000 1.9 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pycurl -Version: 7.18.1 +Version: 7.18.2 Release: 1%{?dist} Summary: A Python interface to libcurl @@ -9,6 +9,7 @@ License: LGPLv2+ URL: http://pycurl.sourceforge.net/ Source0: http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz +Patch0: python-pycurl-no-static-libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,14 +26,16 @@ of features. %prep -%setup -q -n pycurl-%{version} +%setup0 -q -n pycurl-%{version} +%patch0 -p0 chmod a-x examples/* %build CFLAGS="$RPM_OPT_FLAGS -DHAVE_CURL_OPENSSL" %{__python} setup.py build %check -#%{__python} tests/test_internals.py -q +export PYTHONPATH=$PWD/build/lib* +%{__python} tests/test_internals.py -q %install rm -rf %{buildroot} @@ -48,6 +51,11 @@ %{python_sitearch}/* %changelog +* Thu Jul 3 2008 Jeffrey C. Ollie - 7.18.2-1 +- Update to 7.18.2 +- Thanks to Ville Skytt?? re-enable the tests and fix a minor problem + with the setup.py. (Bug # 45400) + * Thu Jun 5 2008 Jeffrey C. Ollie - 7.18.1-1 - Update to 7.18.1 - Disable tests because it's not testing the built library, it's trying to Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Jun 2008 04:15:08 -0000 1.6 +++ sources 3 Jul 2008 21:31:42 -0000 1.7 @@ -1 +1 @@ -adc4399a002ce794559941c13b89afb8 pycurl-7.18.1.tar.gz +39210d56f1d5a75ac8dd6a2866a93dd5 pycurl-7.18.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 21:34:25 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 3 Jul 2008 21:34:25 GMT Subject: rpms/python-pycurl/F-9 python-pycurl-no-static-libs.patch,NONE,1.1 Message-ID: <200807032134.m63LYPkL007797@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-pycurl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771 Added Files: python-pycurl-no-static-libs.patch Log Message: Add missing patch. python-pycurl-no-static-libs.patch: --- NEW FILE python-pycurl-no-static-libs.patch --- --- setup.py~ 2008-04-22 17:00:45.000000000 +0300 +++ setup.py 2008-07-03 21:53:36.000000000 +0300 @@ -97,8 +97,7 @@ else: extra_compile_args.append(e) libs = split_quoted( - os.popen("'%s' --libs" % CURL_CONFIG).read()+\ - os.popen("'%s' --static-libs" % CURL_CONFIG).read()) + os.popen("'%s' --libs" % CURL_CONFIG).read()) for e in libs: if e[:2] == "-l": libraries.append(e[2:]) From fedora-extras-commits at redhat.com Thu Jul 3 21:34:39 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 3 Jul 2008 21:34:39 GMT Subject: rpms/gl-117/F-8 gl-117.desktop,1.1,1.2 gl-117.spec,1.10,1.11 Message-ID: <200807032134.m63LYdYh007849@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/gl-117/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7752 Modified Files: gl-117.desktop gl-117.spec Log Message: Sync with devel. Index: gl-117.desktop =================================================================== RCS file: /cvs/pkgs/rpms/gl-117/F-8/gl-117.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gl-117.desktop 8 Nov 2004 04:25:52 -0000 1.1 +++ gl-117.desktop 3 Jul 2008 21:33:45 -0000 1.2 @@ -1,9 +1,9 @@ [Desktop Entry] Name=GL-117 Comment=An action flight similator -Exec=gl-117 -Icon=gl-117.png +Exec=gl-117-wrapper +Icon=gl-117 Terminal=false Type=Application -Categories=Game;Application; +Categories=Game;Simulation; Encoding=UTF-8 Index: gl-117.spec =================================================================== RCS file: /cvs/pkgs/rpms/gl-117/F-8/gl-117.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gl-117.spec 10 Apr 2007 00:36:36 -0000 1.10 +++ gl-117.spec 3 Jul 2008 21:33:45 -0000 1.11 @@ -1,9 +1,9 @@ Name: gl-117 Version: 1.3.2 -Release: 4%{?dist} +Release: 7%{?dist} Summary: Action flight simulator Group: Amusements/Games -License: GPL +License: GPLv2 URL: http://www.heptargon.de/gl-117/gl-117.htm Source0: http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2 Source1: gl-117.desktop @@ -12,6 +12,7 @@ BuildRequires: SDL-devel, SDL_mixer-devel BuildRequires: freeglut-devel BuildRequires: desktop-file-utils +Requires: opengl-games-utils %description GL-117 is an action flight simulator. Enter the Eagle Squadron and succeed @@ -25,35 +26,56 @@ sed -i -e 's/\r//' AUTHORS ChangeLog FAQ NEWS +sed -i -e 's/ -lSDLmain\>//' configure + %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man6 + +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications \ + $RPM_BUILD_ROOT/%{_datadir}/pixmaps \ + $RPM_BUILD_ROOT/%{_mandir}/man6 + install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ + desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --add-category X-Fedora \ --vendor fedora %{SOURCE1} +ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING FAQ NEWS README doc/%{name}.pdf -%{_bindir}/* +%{_bindir}/%{name} +%{_bindir}/%{name}-wrapper %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_mandir}/man6/* %changelog +* Thu Jul 03 2008 Steven Pritchard 1.3.2-7 +- Fix BZ#304841. + - Use opengl-game-wrapper. + - Update .desktop file. + - Drop "--add-category X-Fedora". + +* Thu Jul 03 2008 Steven Pritchard 1.3.2-6 +- Update License tag. +- Drop -lSDLmain. + +* Tue Feb 19 2008 Fedora Release Engineering - 1.3.2-5 +- Autorebuild for GCC 4.3 + * Mon Apr 09 2007 Steven Pritchard 1.3.2-4 - Quiet "wrong-file-end-of-line-encoding" warnings from rpmlint. From fedora-extras-commits at redhat.com Thu Jul 3 21:46:42 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 3 Jul 2008 21:46:42 GMT Subject: rpms/kernel/F-9 linux-2.6-usb-storage-nikond80-quirk.patch, NONE, 1.1 kernel.spec, 1.701, 1.702 Message-ID: <200807032146.m63Lkg1x008314@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8289 Modified Files: kernel.spec Added Files: linux-2.6-usb-storage-nikond80-quirk.patch Log Message: Add USB Storage quirk for Nikon D40 with new firmware. linux-2.6-usb-storage-nikond80-quirk.patch: --- NEW FILE linux-2.6-usb-storage-nikond80-quirk.patch --- diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 45fe366..cf03af1 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -364,6 +364,13 @@ UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0110, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY), +/* Reported by https://bugzilla.redhat.com/show_bug.cgi?id=454028 */ +UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0111, + "NIKON", + "NIKON DSC D40", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY), + /* Reported by Ortwin Glueck */ UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0110, "NIKON", Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.701 retrieving revision 1.702 diff -u -r1.701 -r1.702 --- kernel.spec 3 Jul 2008 21:17:32 -0000 1.701 +++ kernel.spec 3 Jul 2008 21:45:52 -0000 1.702 @@ -686,6 +686,8 @@ Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch # Fix HID usage descriptor on MS wireless desktop receiver Patch2301: linux-2.6-ms-wireless-receiver.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=454028 +Patch2302: linux-2.6-usb-storage-nikond80-quirk.patch # usb video Patch2400: linux-2.6-uvcvideo.patch @@ -1099,6 +1101,7 @@ # USB ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch +ApplyPatch linux-2.6-usb-storage-nikond80-quirk.patch # ACPI # acpi has a bug in the sizeof function causing thermal panics (from 2.6.26) @@ -1861,6 +1864,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 03 2008 Dave Jones +- Add USB Storage quirk for Nikon D40 with new firmware. + * Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-82 - Linux 2.6.25.10 - Reverted stable patch, not needed with utrace: From fedora-extras-commits at redhat.com Thu Jul 3 21:51:13 2008 From: fedora-extras-commits at redhat.com (Simon Wilkinson (sxw)) Date: Thu, 3 Jul 2008 21:51:13 GMT Subject: rpms/remctl/devel remctl.spec,1.3,1.4 Message-ID: <200807032151.m63LpDg1008452@cvs-int.fedora.redhat.com> Author: sxw Update of /cvs/pkgs/rpms/remctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8409 Modified Files: remctl.spec Log Message: Fix for #453579 - thanks to Paul Howarth Index: remctl.spec =================================================================== RCS file: /cvs/pkgs/rpms/remctl/devel/remctl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- remctl.spec 28 Feb 2008 16:09:12 -0000 1.3 +++ remctl.spec 3 Jul 2008 21:50:16 -0000 1.4 @@ -1,6 +1,6 @@ Name: remctl Version: 2.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Client/server for Kerberos-authenticated command execution Group: Applications/Internet @@ -37,6 +37,7 @@ Summary: Perl interface to remctl Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl remctl implements a client/server protocol for running single commands @@ -64,7 +65,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' # And the libraries find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' @@ -97,6 +98,9 @@ %{_mandir}/man3/Net::Remctl* %changelog +* Thu Jun 03 2008 Simon Wilkinson 2.11-7 +- Update to catch new perl version, and fix perl dependencies (#453579) + * Thu Feb 28 2008 Simon Wilkinson 2.11-6 - The build process isn't -j safe, so remove smpflags until this can be fixed. From fedora-extras-commits at redhat.com Thu Jul 3 22:00:29 2008 From: fedora-extras-commits at redhat.com (Adam Goode (agoode)) Date: Thu, 3 Jul 2008 22:00:29 GMT Subject: rpms/minirpc/devel .cvsignore, 1.3, 1.4 minirpc.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807032200.m63M0TIH008720@cvs-int.fedora.redhat.com> Author: agoode Update of /cvs/pkgs/rpms/minirpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8678 Modified Files: .cvsignore minirpc.spec sources Log Message: * Thu Jul 3 2008 Adam Goode - 0.3.2-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 May 2008 19:46:03 -0000 1.3 +++ .cvsignore 3 Jul 2008 21:59:43 -0000 1.4 @@ -1 +1 @@ -minirpc-0.3.1.tar.gz +minirpc-0.3.2.tar.gz Index: minirpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/devel/minirpc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minirpc.spec 23 May 2008 19:46:03 -0000 1.2 +++ minirpc.spec 3 Jul 2008 21:59:43 -0000 1.3 @@ -1,5 +1,5 @@ Name: minirpc -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Remote procedure call library for stream-oriented transports @@ -82,6 +82,9 @@ %changelog +* Thu Jul 3 2008 Adam Goode - 0.3.2-1 +- New release + * Fri May 23 2008 Adam Goode - 0.3.1-1 - New upstream release - Enable make check Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 May 2008 19:46:03 -0000 1.3 +++ sources 3 Jul 2008 21:59:43 -0000 1.4 @@ -1 +1 @@ -6fe2327c7741887ca2df39cd1fbe6688 minirpc-0.3.1.tar.gz +07dfc24b0612db136d9cca3c7cd835aa minirpc-0.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 22:07:31 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 3 Jul 2008 22:07:31 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1553,1.1554 Message-ID: <200807032207.m63M7V3p015601@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15554 Modified Files: openoffice.org.spec Log Message: libsoffice -> libsofficeapp Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1553 retrieving revision 1.1554 diff -u -r1.1553 -r1.1554 --- openoffice.org.spec 3 Jul 2008 19:47:28 -0000 1.1553 +++ openoffice.org.spec 3 Jul 2008 22:06:35 -0000 1.1554 @@ -1371,10 +1371,10 @@ #start of jakub based suggestion on prelink optimization cd ../../../../desktop/util -`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` -`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` -`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` -`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` +`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` +`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` +`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` +`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` #end of jakub based suggestion on prelink optimization echo build end time is `date`, diskspace: `df -h . | tail -n 1` @@ -2283,7 +2283,7 @@ %{basisinstdir}/program/simplecanvas.uno.so %{basisinstdir}/program/slideshow.uno.so %{basisinstdir}/program/setofficelang* -%{basisinstdir}/program/libsoffice.so +%{basisinstdir}/program/libsofficeapp.so %{basisinstdir}/program/spadmin.bin %{basisinstdir}/program/stringresource%{SOPOST}.uno.so %{basisinstdir}/program/svtmisc.uno.so From fedora-extras-commits at redhat.com Thu Jul 3 22:13:23 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 3 Jul 2008 22:13:23 GMT Subject: rpms/filezilla/F-9 FileZilla_3.0.11-rc1-system.patch, NONE, 1.1 filezilla.spec, 1.11, 1.12 sources, 1.11, 1.12 Message-ID: <200807032213.m63MDNUh015890@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15845 Modified Files: filezilla.spec sources Added Files: FileZilla_3.0.11-rc1-system.patch Log Message: - Update to 3.0.11 - Create patch for a shared tinyxml. - Add support for hicolor icons. FileZilla_3.0.11-rc1-system.patch: --- NEW FILE FileZilla_3.0.11-rc1-system.patch --- diff -up filezilla-3.0.11-rc1/configure.in.system filezilla-3.0.11-rc1/configure.in --- filezilla-3.0.11-rc1/configure.in.system 2008-06-09 18:31:44.000000000 +0200 +++ filezilla-3.0.11-rc1/configure.in 2008-06-12 23:30:33.000000000 +0200 @@ -347,6 +347,24 @@ AH_BOTTOM([ AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_CFLAGS) + # TinyXML + # ------ + +AC_CHECK_LIB(tinyxml, main, + [ + AC_DEFINE(HAVE_LIBTINYXML, 1, [Define to 1 if you have the `tinyxml' library (-ltinyxml).]) + TINYXML_LIBS="-ltinyxml" + have_tinyxml="true" + ], + [ + TINYXML_LIBS="../tinyxml/libtinyxml.a" + have_tinyxml="false" + ] +) + + AC_SUBST(TINYXML_LIBS) + AC_SUBST(TINYXML_CFLAGS) + fi # Everything translation related @@ -431,6 +449,7 @@ AM_CONDITIONAL(MAKENSISSCRIPT, [test "$m AM_CONDITIONAL(USE_BINRELOC, test "$use_binreloc" = "yes") AM_CONDITIONAL(ENABLE_PRECOMP, test "x$use_precomp" = "xyes") AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"]) +AM_CONDITIONAL(HAVE_LIBTINYXML, [test x$have_tinyxml = xtrue]) AC_CONFIG_FILES(Makefile src/Makefile src/engine/Makefile src/tinyxml/Makefile src/interface/Makefile src/interface/resources/Makefile src/include/Makefile diff -up filezilla-3.0.11-rc1/src/Makefile.am.system filezilla-3.0.11-rc1/src/Makefile.am --- filezilla-3.0.11-rc1/src/Makefile.am.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/Makefile.am 2008-06-12 23:39:08.000000000 +0200 @@ -2,6 +2,13 @@ if MINGW MAYBE_FZSHELLEXT = fzshellext endif -SUBDIRS = include engine tinyxml interface putty $(MAYBE_FZSHELLEXT) . +if HAVE_LIBTINYXML +else + MAYBE_TINYXML = tinyxml +endif + +SUBDIRS = include engine $(MAYBE_TINYXML) interface putty $(MAYBE_FZSHELLEXT) . + + dist_noinst_DATA = FileZilla.sln diff -up filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system filezilla-3.0.11-rc1/src/interface/xmlfunctions.h --- filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system 2008-06-09 18:31:46.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/xmlfunctions.h 2008-06-12 23:30:33.000000000 +0200 @@ -6,7 +6,11 @@ #ifndef __XMLFUNCTIONS_H__ #define __XMLFUNCTIONS_H__ +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif class CXmlFile { diff -up filezilla-3.0.11-rc1/src/interface/filter.cpp.system filezilla-3.0.11-rc1/src/interface/filter.cpp --- filezilla-3.0.11-rc1/src/interface/filter.cpp.system 2008-06-09 18:31:46.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/filter.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -3,7 +3,11 @@ #include "filteredit.h" #include "ipcmutex.h" #include "filezillaapp.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include #include "Mainfrm.h" diff -up filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp --- filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -1,6 +1,10 @@ #include "FileZilla.h" #include "locale_initializer.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include #include diff -up filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system filezilla-3.0.11-rc1/src/interface/sitemanager.cpp --- filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/sitemanager.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -1,7 +1,11 @@ #include "FileZilla.h" #include "sitemanager.h" #include "Options.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include "filezillaapp.h" #include "ipcmutex.h" diff -up filezilla-3.0.11-rc1/src/interface/Options.cpp.system filezilla-3.0.11-rc1/src/interface/Options.cpp --- filezilla-3.0.11-rc1/src/interface/Options.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/Options.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -1,6 +1,10 @@ #include "FileZilla.h" #include "Options.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include "filezillaapp.h" #include diff -up filezilla-3.0.11-rc1/src/interface/Makefile.am.system filezilla-3.0.11-rc1/src/interface/Makefile.am --- filezilla-3.0.11-rc1/src/interface/Makefile.am.system 2008-06-09 18:31:46.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/Makefile.am 2008-06-12 23:30:33.000000000 +0200 @@ -184,7 +184,7 @@ filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY) filezilla_CFLAGS = $(WX_CFLAGS_ONLY) filezilla_LDFLAGS = ../engine/libengine.a -filezilla_LDFLAGS += ../tinyxml/libtinyxml.a +filezilla_LDFLAGS += $(TINYXML_LIBS) filezilla_LDFLAGS += $(LIBGNUTLS_LIBS) filezilla_LDFLAGS += $(WX_LIBS) filezilla_LDFLAGS += $(RESOURCEFILE) @@ -194,8 +194,12 @@ if MINGW filezilla_LDFLAGS += -lole32 -luuid -lnetapi32 endif -filezilla_DEPENDENCIES = ../engine/libengine.a \ - ../tinyxml/libtinyxml.a +filezilla_DEPENDENCIES = ../engine/libengine.a + +if HAVE_LIBTINYXML +else +filezilla_DEPENDENCIES += $(TINYXML_LIBS) +endif dist_noinst_DATA = interface.vcproj diff -up filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system filezilla-3.0.11-rc1/src/interface/QueueView.cpp --- filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/QueueView.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -4,7 +4,11 @@ #include "Options.h" #include "StatusView.h" #include "statuslinectrl.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include "filezillaapp.h" #include "ipcmutex.h" Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-9/filezilla.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- filezilla.spec 7 May 2008 11:19:24 -0000 1.11 +++ filezilla.spec 3 Jul 2008 22:12:36 -0000 1.12 @@ -1,5 +1,5 @@ Name: filezilla -Version: 3.0.9.3 +Version: 3.0.11 Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -7,10 +7,11 @@ License: GPLv2+ URL: http://filezilla-project.org/ Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 +Patch0: FileZilla_3.0.11-rc1-system.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked -#BuildRequires: automake, autoconf, libtool +BuildRequires: automake, autoconf, libtool ## ## Needed if test program is build BuildRequires: cppunit-devel >= 1.10.2 @@ -19,6 +20,7 @@ BuildRequires: gettext BuildRequires: gnutls-devel >= 2.0.4 BuildRequires: libidn-devel +BuildRequires: tinyxml-devel >= 2.5.3 BuildRequires: wxGTK-devel >= 2.8.6 @@ -38,16 +40,16 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .system # Run autotools if needed -# sh autogen.sh +sh autogen.sh %build %configure \ --disable-static \ --enable-locales \ - --localedir=%{_datadir}/locale \ --disable-manualupdatecheck \ --disable-autoupdatecheck @@ -55,6 +57,9 @@ ## that option enables the "check for updates" dialog to download ## new binaries from the official website. +# Remove the timyxml internal static lib to configure will not fails +#rm -rf src/tinyxml/ + make %{?_smp_mflags} @@ -66,6 +71,14 @@ install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs +for i in 16x16 32x32 48x48 ; do + mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps + ln -sf ../../../../%{name}/resources/${i}/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps/%{name}.png +done + +rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps + desktop-file-install --vendor "fedora" \ --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -81,6 +94,18 @@ rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi || : + +%postun +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi || : + %files -f %{name}.lang %defattr(-,root,root,-) @@ -89,12 +114,20 @@ %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/* %{_mandir}/man5/* %changelog +* Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1 +- Update to 3.0.11 +- Create patch for a shared tinyxml. +- Add support for hicolor icons. + +* Wed May 21 2008 kwizart < kwizart at gmail.com > - 3.0.10-1 +- Update to 3.0.10 + * Wed May 7 2008 kwizart < kwizart at gmail.com > - 3.0.9.3-1 - Update to 3.0.9.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 7 May 2008 11:19:24 -0000 1.11 +++ sources 3 Jul 2008 22:12:36 -0000 1.12 @@ -1 +1 @@ -e9bcf206810e654952484901d845f2a0 FileZilla_3.0.9.3_src.tar.bz2 +776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 3 22:25:31 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 3 Jul 2008 22:25:31 GMT Subject: rpms/filezilla/F-8 FileZilla_3.0.11-rc1-system.patch, NONE, 1.1 sources, 1.4, 1.5 filezilla.spec, 1.4, 1.5 FileZilla_3.0.3-backport.patch, 1.1, NONE Message-ID: <200807032225.m63MPVeU016424@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16366 Modified Files: sources filezilla.spec Added Files: FileZilla_3.0.11-rc1-system.patch Removed Files: FileZilla_3.0.3-backport.patch Log Message: - Update to 3.0.11 - Create patch for a shared tinyxml. - Add support for hicolor icons. - Downgrade gnutls requirement (assuming a fixed version is used - see #451952 ). FileZilla_3.0.11-rc1-system.patch: --- NEW FILE FileZilla_3.0.11-rc1-system.patch --- diff -up filezilla-3.0.11-rc1/configure.in.system filezilla-3.0.11-rc1/configure.in --- filezilla-3.0.11-rc1/configure.in.system 2008-06-09 18:31:44.000000000 +0200 +++ filezilla-3.0.11-rc1/configure.in 2008-06-12 23:30:33.000000000 +0200 @@ -347,6 +347,24 @@ AH_BOTTOM([ AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_CFLAGS) + # TinyXML + # ------ + +AC_CHECK_LIB(tinyxml, main, + [ + AC_DEFINE(HAVE_LIBTINYXML, 1, [Define to 1 if you have the `tinyxml' library (-ltinyxml).]) + TINYXML_LIBS="-ltinyxml" + have_tinyxml="true" + ], + [ + TINYXML_LIBS="../tinyxml/libtinyxml.a" + have_tinyxml="false" + ] +) + + AC_SUBST(TINYXML_LIBS) + AC_SUBST(TINYXML_CFLAGS) + fi # Everything translation related @@ -431,6 +449,7 @@ AM_CONDITIONAL(MAKENSISSCRIPT, [test "$m AM_CONDITIONAL(USE_BINRELOC, test "$use_binreloc" = "yes") AM_CONDITIONAL(ENABLE_PRECOMP, test "x$use_precomp" = "xyes") AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"]) +AM_CONDITIONAL(HAVE_LIBTINYXML, [test x$have_tinyxml = xtrue]) AC_CONFIG_FILES(Makefile src/Makefile src/engine/Makefile src/tinyxml/Makefile src/interface/Makefile src/interface/resources/Makefile src/include/Makefile diff -up filezilla-3.0.11-rc1/src/Makefile.am.system filezilla-3.0.11-rc1/src/Makefile.am --- filezilla-3.0.11-rc1/src/Makefile.am.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/Makefile.am 2008-06-12 23:39:08.000000000 +0200 @@ -2,6 +2,13 @@ if MINGW MAYBE_FZSHELLEXT = fzshellext endif -SUBDIRS = include engine tinyxml interface putty $(MAYBE_FZSHELLEXT) . +if HAVE_LIBTINYXML +else + MAYBE_TINYXML = tinyxml +endif + +SUBDIRS = include engine $(MAYBE_TINYXML) interface putty $(MAYBE_FZSHELLEXT) . + + dist_noinst_DATA = FileZilla.sln diff -up filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system filezilla-3.0.11-rc1/src/interface/xmlfunctions.h --- filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system 2008-06-09 18:31:46.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/xmlfunctions.h 2008-06-12 23:30:33.000000000 +0200 @@ -6,7 +6,11 @@ #ifndef __XMLFUNCTIONS_H__ #define __XMLFUNCTIONS_H__ +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif class CXmlFile { diff -up filezilla-3.0.11-rc1/src/interface/filter.cpp.system filezilla-3.0.11-rc1/src/interface/filter.cpp --- filezilla-3.0.11-rc1/src/interface/filter.cpp.system 2008-06-09 18:31:46.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/filter.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -3,7 +3,11 @@ #include "filteredit.h" #include "ipcmutex.h" #include "filezillaapp.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include #include "Mainfrm.h" diff -up filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp --- filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -1,6 +1,10 @@ #include "FileZilla.h" #include "locale_initializer.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include #include diff -up filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system filezilla-3.0.11-rc1/src/interface/sitemanager.cpp --- filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/sitemanager.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -1,7 +1,11 @@ #include "FileZilla.h" #include "sitemanager.h" #include "Options.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include "filezillaapp.h" #include "ipcmutex.h" diff -up filezilla-3.0.11-rc1/src/interface/Options.cpp.system filezilla-3.0.11-rc1/src/interface/Options.cpp --- filezilla-3.0.11-rc1/src/interface/Options.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/Options.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -1,6 +1,10 @@ #include "FileZilla.h" #include "Options.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include "filezillaapp.h" #include diff -up filezilla-3.0.11-rc1/src/interface/Makefile.am.system filezilla-3.0.11-rc1/src/interface/Makefile.am --- filezilla-3.0.11-rc1/src/interface/Makefile.am.system 2008-06-09 18:31:46.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/Makefile.am 2008-06-12 23:30:33.000000000 +0200 @@ -184,7 +184,7 @@ filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY) filezilla_CFLAGS = $(WX_CFLAGS_ONLY) filezilla_LDFLAGS = ../engine/libengine.a -filezilla_LDFLAGS += ../tinyxml/libtinyxml.a +filezilla_LDFLAGS += $(TINYXML_LIBS) filezilla_LDFLAGS += $(LIBGNUTLS_LIBS) filezilla_LDFLAGS += $(WX_LIBS) filezilla_LDFLAGS += $(RESOURCEFILE) @@ -194,8 +194,12 @@ if MINGW filezilla_LDFLAGS += -lole32 -luuid -lnetapi32 endif -filezilla_DEPENDENCIES = ../engine/libengine.a \ - ../tinyxml/libtinyxml.a +filezilla_DEPENDENCIES = ../engine/libengine.a + +if HAVE_LIBTINYXML +else +filezilla_DEPENDENCIES += $(TINYXML_LIBS) +endif dist_noinst_DATA = interface.vcproj diff -up filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system filezilla-3.0.11-rc1/src/interface/QueueView.cpp --- filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system 2008-06-09 18:31:45.000000000 +0200 +++ filezilla-3.0.11-rc1/src/interface/QueueView.cpp 2008-06-12 23:30:33.000000000 +0200 @@ -4,7 +4,11 @@ #include "Options.h" #include "StatusView.h" #include "statuslinectrl.h" +#ifdef HAVE_LIBTINYXML +#include +#else #include "../tinyxml/tinyxml.h" +#endif #include "xmlfunctions.h" #include "filezillaapp.h" #include "ipcmutex.h" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Oct 2007 19:30:57 -0000 1.4 +++ sources 3 Jul 2008 22:24:40 -0000 1.5 @@ -1 +1 @@ -0182908d3091d19edc511b3a2a6b3e08 FileZilla_3.0.2.1_src.tar.bz2 +776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-8/filezilla.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- filezilla.spec 7 Nov 2007 15:05:48 -0000 1.4 +++ filezilla.spec 3 Jul 2008 22:24:40 -0000 1.5 @@ -1,30 +1,29 @@ Name: filezilla -Version: 3.0.2.1 -Release: 2%{?dist} +Version: 3.0.11 +Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet License: GPLv2+ -URL: http://filezilla.sourceforge.net/ +URL: http://filezilla-project.org/ Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 -Patch0: FileZilla_3.0.3-backport.patch +Patch0: FileZilla_3.0.11-rc1-system.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked -#BuildRequires: automake, autoconf, libtool +BuildRequires: automake, autoconf, libtool ## ## Needed if test program is build BuildRequires: cppunit-devel >= 1.10.2 ## BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: gnutls-devel >= 1.5.4 +BuildRequires: gnutls-devel >= 1.6.3 BuildRequires: libidn-devel -BuildRequires: wxGTK-devel >= 2.8.4 - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +BuildRequires: tinyxml-devel >= 2.5.3 +BuildRequires: wxGTK-devel >= 2.8.6 +Requires: gnutls >= 1.6.3-4 %description FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features. @@ -40,18 +39,20 @@ %prep -%setup -q -%patch0 -p1 -b .backport +%setup -q -n %{name}-%{version} +%patch0 -p1 -b .system + +# Downgrade gnutls requirement +sed -i -e 's/2.0.4/1.6.3/' configure.in # Run autotools if needed -# sh autogen.sh +sh autogen.sh %build %configure \ --disable-static \ --enable-locales \ - --localedir=%{_datadir}/locale \ --disable-manualupdatecheck \ --disable-autoupdatecheck @@ -59,6 +60,9 @@ ## that option enables the "check for updates" dialog to download ## new binaries from the official website. +# Remove the timyxml internal static lib to configure will not fails +#rm -rf src/tinyxml/ + make %{?_smp_mflags} @@ -70,6 +74,14 @@ install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs +for i in 16x16 32x32 48x48 ; do + mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps + ln -sf ../../../../%{name}/resources/${i}/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps/%{name}.png +done + +rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps + desktop-file-install --vendor "fedora" \ --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -79,18 +91,23 @@ %find_lang %{name} %check -pushd tests -make test -popd +make check %clean rm -rf $RPM_BUILD_ROOT + %post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi || : %postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi || : %files -f %{name}.lang @@ -100,12 +117,62 @@ %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_mandir}/man1/* +%{_mandir}/man5/* %changelog -* Wed Nov 7 2007 kwizart < kwizart at gmail.com > - 3.0.2.1-2 -- backport fixes from 3.0.3 +* Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1 +- Update to 3.0.11 +- Create patch for a shared tinyxml. +- Add support for hicolor icons. +- Downgrade gnutls requirement + (assuming a fixed version is used - see #451952 ). + +* Wed May 21 2008 kwizart < kwizart at gmail.com > - 3.0.10-1 +- Update to 3.0.10 + +* Wed May 7 2008 kwizart < kwizart at gmail.com > - 3.0.9.3-1 +- Update to 3.0.9.3 + +* Sat Apr 19 2008 kwizart < kwizart at gmail.com > - 3.0.9.2-1 +- Update to 3.0.9.2 + +* Mon Apr 7 2008 kwizart < kwizart at gmail.com > - 3.0.9.1-1 +- Update to 3.0.9.1 + +* Mon Apr 7 2008 kwizart < kwizart at gmail.com > - 3.0.9-1 +- Update to 3.0.9 + +* Mon Mar 31 2008 kwizart < kwizart at gmail.com > - 3.0.9-0.1.rc1 +- Update to 3.0.9-rc1 + +* Tue Mar 18 2008 kwizart < kwizart at gmail.com > - 3.0.8.1-1 +- Update to 3.0.8.1 +- Add patch for make check + +* Fri Mar 14 2008 kwizart < kwizart at gmail.com > - 3.0.8-1 +- Update to 3.0.8 + +* Fri Mar 7 2008 kwizart < kwizart at gmail.com > - 3.0.8-0.1.rc1 +- Update to 3.0.8-rc1 + +* Thu Feb 20 2008 kwizart < kwizart at gmail.com > - 3.0.7.1-1 +- Update to 3.0.7.1 + +* Thu Jan 31 2008 kwizart < kwizart at gmail.com > - 3.0.6-1 +- Update to 3.0.6 + +* Thu Jan 17 2008 kwizart < kwizart at gmail.com > - 3.0.5.2-1 +- Update to 3.0.5.2 +- Drop update desktop file in post and postun + +* Thu Jan 10 2008 kwizart < kwizart at gmail.com > - 3.0.4-1 +- Update to 3.0.4 + +* Wed Nov 7 2007 kwizart < kwizart at gmail.com > - 3.0.3-1 +- Update to 3.0.3 * Fri Oct 19 2007 kwizart < kwizart at gmail.com > - 3.0.2.1-1 - Update to 3.0.2.1 --- FileZilla_3.0.3-backport.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 22:32:29 2008 From: fedora-extras-commits at redhat.com (Adam Goode (agoode)) Date: Thu, 3 Jul 2008 22:32:29 GMT Subject: rpms/minirpc/F-9 .cvsignore, 1.3, 1.4 minirpc.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807032232.m63MWTMW016840@cvs-int.fedora.redhat.com> Author: agoode Update of /cvs/pkgs/rpms/minirpc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757 Modified Files: .cvsignore minirpc.spec sources Log Message: * Thu Jul 3 2008 Adam Goode - 0.3.2-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 May 2008 20:16:56 -0000 1.3 +++ .cvsignore 3 Jul 2008 22:31:41 -0000 1.4 @@ -1 +1 @@ -minirpc-0.3.1.tar.gz +minirpc-0.3.2.tar.gz Index: minirpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/F-9/minirpc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minirpc.spec 23 May 2008 20:16:56 -0000 1.2 +++ minirpc.spec 3 Jul 2008 22:31:41 -0000 1.3 @@ -1,5 +1,5 @@ Name: minirpc -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Remote procedure call library for stream-oriented transports @@ -82,6 +82,9 @@ %changelog +* Thu Jul 3 2008 Adam Goode - 0.3.2-1 +- New release + * Fri May 23 2008 Adam Goode - 0.3.1-1 - New upstream release - Enable make check Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 May 2008 20:16:56 -0000 1.3 +++ sources 3 Jul 2008 22:31:41 -0000 1.4 @@ -1 +1 @@ -6fe2327c7741887ca2df39cd1fbe6688 minirpc-0.3.1.tar.gz +07dfc24b0612db136d9cca3c7cd835aa minirpc-0.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 22:38:05 2008 From: fedora-extras-commits at redhat.com (Adam Goode (agoode)) Date: Thu, 3 Jul 2008 22:38:05 GMT Subject: rpms/minirpc/F-8 .cvsignore, 1.3, 1.4 minirpc.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807032238.m63Mc5pK017241@cvs-int.fedora.redhat.com> Author: agoode Update of /cvs/pkgs/rpms/minirpc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17164 Modified Files: .cvsignore minirpc.spec sources Log Message: * Thu Jul 3 2008 Adam Goode - 0.3.2-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 May 2008 20:18:14 -0000 1.3 +++ .cvsignore 3 Jul 2008 22:37:14 -0000 1.4 @@ -1 +1 @@ -minirpc-0.3.1.tar.gz +minirpc-0.3.2.tar.gz Index: minirpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/F-8/minirpc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minirpc.spec 23 May 2008 20:18:14 -0000 1.2 +++ minirpc.spec 3 Jul 2008 22:37:14 -0000 1.3 @@ -1,5 +1,5 @@ Name: minirpc -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Remote procedure call library for stream-oriented transports @@ -82,6 +82,9 @@ %changelog +* Thu Jul 3 2008 Adam Goode - 0.3.2-1 +- New release + * Fri May 23 2008 Adam Goode - 0.3.1-1 - New upstream release - Enable make check Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/minirpc/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 May 2008 20:18:14 -0000 1.3 +++ sources 3 Jul 2008 22:37:14 -0000 1.4 @@ -1 +1 @@ -6fe2327c7741887ca2df39cd1fbe6688 minirpc-0.3.1.tar.gz +07dfc24b0612db136d9cca3c7cd835aa minirpc-0.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 3 22:49:15 2008 From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim)) Date: Thu, 3 Jul 2008 22:49:15 GMT Subject: rpms/system-switch-java/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 system-switch-java.spec, 1.12, 1.13 Message-ID: <200807032249.m63MnFFT017896@cvs-int.fedora.redhat.com> Author: fitzsim Update of /cvs/pkgs/rpms/system-switch-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17814 Modified Files: .cvsignore sources system-switch-java.spec Log Message: * Thu Jul 3 2008 Thomas Fitzsimmons - 1.1.3-1 - Import system-switch-java 1.1.3. - Remove desktop file patch. - Remove FC-7 obsoletes. - Resolves: rhbz#453625 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-switch-java/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Oct 2007 18:16:51 -0000 1.5 +++ .cvsignore 3 Jul 2008 22:48:25 -0000 1.6 @@ -1 +1 @@ -system-switch-java-1.1.2.tar.gz +system-switch-java-1.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-switch-java/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Oct 2007 18:16:51 -0000 1.5 +++ sources 3 Jul 2008 22:48:25 -0000 1.6 @@ -1 +1 @@ -e9fea8e47629b8f570f0813f23e8f06b system-switch-java-1.1.2.tar.gz +4729b3ad2e17a576c9e2cd2cd2eb4818 system-switch-java-1.1.3.tar.gz Index: system-switch-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-switch-java/devel/system-switch-java.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- system-switch-java.spec 11 Jun 2008 22:20:59 -0000 1.12 +++ system-switch-java.spec 3 Jul 2008 22:48:25 -0000 1.13 @@ -1,6 +1,6 @@ Name: system-switch-java -Version: 1.1.2 -Release: 3%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: A tool for changing the default Java toolset %define url https://fedorahosted.org @@ -9,7 +9,6 @@ License: GPL URL: %{url}/%{name} Source0: %{url}/releases/s/y/system-switch-java/%{name}-%{version}.tar.gz -Patch0: %{name}-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -28,15 +27,12 @@ Requires: usermode Requires: usermode-gtk -Obsoletes: system-switch-java-gui <= 1.0.0-1.fc7 - %description The system-switch-java package provides an easy-to-use tool to select the default Java toolset for the system. %prep %setup -q -%patch0 %build %configure @@ -69,6 +65,12 @@ %config(noreplace) /etc/security/console.apps/%{name} %changelog +* Thu Jul 3 2008 Thomas Fitzsimmons - 1.1.3-1 +- Import system-switch-java 1.1.3. +- Remove desktop file patch. +- Remove FC-7 obsoletes. +- Resolves: rhbz#453625 + * Wed Jun 11 2008 Thomas Fitzsimmons - 1.1.2-3 - Update URL and source tags to point to Fedora Hosted. From fedora-extras-commits at redhat.com Thu Jul 3 22:50:37 2008 From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim)) Date: Thu, 3 Jul 2008 22:50:37 GMT Subject: rpms/system-switch-java/devel system-switch-java.spec,1.13,1.14 Message-ID: <200807032250.m63MobFS018020@cvs-int.fedora.redhat.com> Author: fitzsim Update of /cvs/pkgs/rpms/system-switch-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17902 Modified Files: system-switch-java.spec Log Message: - Fix typo in changelog. Index: system-switch-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-switch-java/devel/system-switch-java.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- system-switch-java.spec 3 Jul 2008 22:48:25 -0000 1.13 +++ system-switch-java.spec 3 Jul 2008 22:49:49 -0000 1.14 @@ -68,7 +68,7 @@ * Thu Jul 3 2008 Thomas Fitzsimmons - 1.1.3-1 - Import system-switch-java 1.1.3. - Remove desktop file patch. -- Remove FC-7 obsoletes. +- Remove Fedora 7 obsoletes. - Resolves: rhbz#453625 * Wed Jun 11 2008 Thomas Fitzsimmons - 1.1.2-3 From fedora-extras-commits at redhat.com Thu Jul 3 23:00:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 3 Jul 2008 23:00:22 GMT Subject: rpms/glib2/devel crash.patch,NONE,1.1 glib2.spec,1.173,1.174 Message-ID: <200807032300.m63N0MZa018576@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18551 Modified Files: glib2.spec Added Files: crash.patch Log Message: Fix a crash crash.patch: --- NEW FILE crash.patch --- diff -up glib-2.17.3/gio/gdesktopappinfo.c.crash glib-2.17.3/gio/gdesktopappinfo.c --- glib-2.17.3/gio/gdesktopappinfo.c.crash 2008-07-03 18:57:41.000000000 -0400 +++ glib-2.17.3/gio/gdesktopappinfo.c 2008-07-03 18:57:47.000000000 -0400 @@ -241,7 +241,6 @@ g_desktop_app_info_new_from_keyfile (GKe } g_free (t); } - g_free (try_exec); info = g_object_new (G_TYPE_DESKTOP_APP_INFO, NULL); info->filename = NULL; Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- glib2.spec 3 Jul 2008 15:57:57 -0000 1.173 +++ glib2.spec 3 Jul 2008 22:59:36 -0000 1.174 @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.17.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -25,6 +25,9 @@ # https://bugzilla.gnome.org/show_bug.cgi?id=529694 Patch3: gio-2.16-selinux-set-support.diff +# Fixed in upstream svn +Patch4: crash.patch + %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure @@ -58,6 +61,7 @@ %setup -q -n glib-%{version} %patch2 -p1 -b .only-pass-uri-to-gio-apps %patch3 -p0 -b .selinux +%patch4 -p1 -b .crash %build %configure --disable-gtk-doc --enable-static @@ -132,6 +136,9 @@ %{_libdir}/lib*.a %changelog +* Thu Jul 3 2008 Matthias Clasen - 2.17.3-3 +- Fix a stupid crash + * Wed Jul 2 2008 Matthias Clasen - 2.17.3-1 - Update to 2.17.3 From fedora-extras-commits at redhat.com Thu Jul 3 23:07:49 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Thu, 3 Jul 2008 23:07:49 GMT Subject: rpms/kernel/devel linux-2.6-export-shmem-bits-for-gem.patch, NONE, 1.1 kernel.spec, 1.732, 1.733 linux-2.6-ia64-export-account_system_vtime.patch, 1.1, NONE Message-ID: <200807032307.m63N7nSi025386@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25346 Modified Files: kernel.spec Added Files: linux-2.6-export-shmem-bits-for-gem.patch Removed Files: linux-2.6-ia64-export-account_system_vtime.patch Log Message: * Thu Jul 3 2008 Kristian H??gsberg - Add linux-2.6-export-shmem-bits-for-gem.patch to export shmmem_getpage and shmem_file_setup for GEM. For now this will let use GEM from the drm tree against the system kernel, but eventually we'll pull in the GEM patches here. - Drop account_system_vtime export patch, now upstream. linux-2.6-export-shmem-bits-for-gem.patch: --- NEW FILE linux-2.6-export-shmem-bits-for-gem.patch --- diff --git a/include/linux/mm.h b/include/linux/mm.h index c31a9cd..d3466e9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -713,6 +713,17 @@ static inline int shmem_lock(struct file *file, int lock, #endif struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags); +/* Flag allocation requirements to shmem_getpage and shmem_swp_alloc */ +enum sgp_type { + SGP_READ, /* don't exceed i_size, don't allocate page */ + SGP_CACHE, /* don't exceed i_size, may allocate page */ + SGP_DIRTY, /* like SGP_CACHE, but set new page dirty */ + SGP_WRITE, /* may exceed i_size, may allocate page */ +}; + +extern int shmem_getpage(struct inode *inode, unsigned long idx, + struct page **pagep, enum sgp_type sgp, int *type); + int shmem_zero_setup(struct vm_area_struct *); #ifndef CONFIG_MMU diff --git a/mm/shmem.c b/mm/shmem.c index e2a6ae1..b283554 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -77,14 +77,6 @@ /* Pretend that each entry is of this size in directory's i_size */ #define BOGO_DIRENT_SIZE 20 -/* Flag allocation requirements to shmem_getpage and shmem_swp_alloc */ -enum sgp_type { - SGP_READ, /* don't exceed i_size, don't allocate page */ - SGP_CACHE, /* don't exceed i_size, may allocate page */ - SGP_DIRTY, /* like SGP_CACHE, but set new page dirty */ - SGP_WRITE, /* may exceed i_size, may allocate page */ -}; - #ifdef CONFIG_TMPFS static unsigned long shmem_default_max_blocks(void) { @@ -97,9 +89,6 @@ static unsigned long shmem_default_max_inodes(void) } #endif -static int shmem_getpage(struct inode *inode, unsigned long idx, - struct page **pagep, enum sgp_type sgp, int *type); - static inline struct page *shmem_dir_alloc(gfp_t gfp_mask) { /* @@ -1173,8 +1162,8 @@ static inline struct mempolicy *shmem_get_sbmpol(struct shmem_sb_info *sbinfo) * vm. If we swap it in we mark it dirty since we also free the swap * entry since a page cannot live in both the swap and page cache */ -static int shmem_getpage(struct inode *inode, unsigned long idx, - struct page **pagep, enum sgp_type sgp, int *type) +int shmem_getpage(struct inode *inode, unsigned long idx, + struct page **pagep, enum sgp_type sgp, int *type) { struct address_space *mapping = inode->i_mapping; struct shmem_inode_info *info = SHMEM_I(inode); @@ -1421,6 +1410,7 @@ failed: } return error; } +EXPORT_SYMBOL(shmem_getpage); static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { @@ -2558,6 +2548,7 @@ put_memory: shmem_unacct_size(flags, size); return ERR_PTR(error); } +EXPORT_SYMBOL(shmem_file_setup); /** * shmem_zero_setup - setup a shared anonymous mapping Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.732 retrieving revision 1.733 diff -u -r1.732 -r1.733 --- kernel.spec 3 Jul 2008 17:54:55 -0000 1.732 +++ kernel.spec 3 Jul 2008 23:06:54 -0000 1.733 @@ -633,6 +633,7 @@ Patch1515: linux-2.6-lirc.patch # nouveau + drm fixes +Patch1800: linux-2.6-export-shmem-bits-for-gem.patch Patch1801: linux-2.6-drm-git-mm.patch Patch1803: nouveau-drm.patch Patch1804: nouveau-drm-update.patch @@ -665,8 +666,6 @@ Patch2600: linux-2.6-merge-efifb-imacfb.patch Patch2610: linux-2.6-x86-efi-fix-low-mappings.patch -Patch2700: linux-2.6-ia64-export-account_system_vtime.patch - %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1172,6 +1171,8 @@ #ApplyPatch linux-2.6-netdev-atl2.patch # Nouveau DRM + drm fixes +ApplyPatch linux-2.6-export-shmem-bits-for-gem.patch + #ApplyPatch linux-2.6-drm-git-mm.patch #ApplyPatch nouveau-drm.patch #ApplyPatch nouveau-drm-update.patch @@ -1200,9 +1201,6 @@ # fix efi boot ApplyPatch linux-2.6-x86-efi-fix-low-mappings.patch -# export account_system_vtime() on IA64 -ApplyPatch linux-2.6-ia64-export-account_system_vtime.patch - # ---------- below all scheduled for 2.6.24 ----------------- # END OF PATCH APPLICATIONS @@ -1796,6 +1794,13 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 3 2008 Kristian H??gsberg +- Add linux-2.6-export-shmem-bits-for-gem.patch to export + shmmem_getpage and shmem_file_setup for GEM. For now this will let + use GEM from the drm tree against the system kernel, but eventually + we'll pull in the GEM patches here. +- Drop account_system_vtime export patch, now upstream. + * Thu Jul 03 2008 John W. Linville - Upstream wireless fixes from 2008-07-02 (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) --- linux-2.6-ia64-export-account_system_vtime.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 3 23:37:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 03 Jul 2008 23:37:01 +0000 Subject: [pkgdb] preload ownership updated Message-ID: <200807032337.m63Nb17r000528@bastion.fedora.phx.redhat.com> Package preload in Fedora devel was orphaned by Marc Wiriadisastra (mwiriadi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/preload From fedora-extras-commits at redhat.com Thu Jul 3 23:48:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 03 Jul 2008 23:48:51 +0000 Subject: [pkgdb] preload ownership updated Message-ID: <200807032348.m63NmptV000943@bastion.fedora.phx.redhat.com> Package preload in Fedora devel is now owned by Behdad Esfahbod (behdad) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/preload From fedora-extras-commits at redhat.com Fri Jul 4 00:07:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 00:07:51 +0000 Subject: [pkgdb] prelude-correlator was added for sgrubb Message-ID: <200807040007.m6407pft001473@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) has added Package prelude-correlator with summary Prelude Correlator Daemon Toshio ???? (toshio) has approved Package prelude-correlator Toshio ???? (toshio) has added a Fedora devel branch for prelude-correlator with an owner of sgrubb Toshio ???? (toshio) has approved prelude-correlator in Fedora devel Toshio ???? (toshio) has approved Package prelude-correlator Toshio ???? (toshio) has set commit to Approved for cvsextras on prelude-correlator (Fedora devel) Toshio ???? (toshio) has set build to Approved for cvsextras on prelude-correlator (Fedora devel) Toshio ???? (toshio) has set checkout to Approved for cvsextras on prelude-correlator (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/prelude-correlator From fedora-extras-commits at redhat.com Fri Jul 4 00:07:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 00:07:54 +0000 Subject: [pkgdb] prelude-correlator (Fedora, 9) updated by toshio Message-ID: <200807040007.m6407rRX001493@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) added a Fedora 9 branch for prelude-correlator Toshio ???? (toshio) has set commit to Approved for cvsextras on prelude-correlator (Fedora 9) Toshio ???? (toshio) has set build to Approved for cvsextras on prelude-correlator (Fedora 9) Toshio ???? (toshio) has set checkout to Approved for cvsextras on prelude-correlator (Fedora 9) Toshio ???? (toshio) approved watchbugzilla on prelude-correlator (Fedora 9) for sgrubb Toshio ???? (toshio) approved watchcommits on prelude-correlator (Fedora 9) for sgrubb Toshio ???? (toshio) Denied cvsextras for commit access on prelude-correlator (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/prelude-correlator From fedora-extras-commits at redhat.com Fri Jul 4 00:07:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 00:07:54 +0000 Subject: [pkgdb] prelude-correlator (Fedora, devel) updated by toshio Message-ID: <200807040007.m6407rRa001493@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on prelude-correlator (Fedora devel) for sgrubb Toshio ???? (toshio) approved watchcommits on prelude-correlator (Fedora devel) for sgrubb Toshio ???? (toshio) Denied cvsextras for commit access on prelude-correlator (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/prelude-correlator From fedora-extras-commits at redhat.com Fri Jul 4 00:08:39 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 4 Jul 2008 00:08:39 GMT Subject: rpms/prelude-correlator - New directory Message-ID: <200807040008.m6408ddv003240@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/prelude-correlator In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsry3210/rpms/prelude-correlator Log Message: Directory /cvs/extras/rpms/prelude-correlator added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 00:08:51 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 4 Jul 2008 00:08:51 GMT Subject: rpms/prelude-correlator/devel - New directory Message-ID: <200807040008.m6408pxx003254@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/prelude-correlator/devel In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsry3210/rpms/prelude-correlator/devel Log Message: Directory /cvs/extras/rpms/prelude-correlator/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 00:09:06 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 4 Jul 2008 00:09:06 GMT Subject: rpms/prelude-correlator Makefile,NONE,1.1 Message-ID: <200807040009.m64096UJ003280@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/prelude-correlator In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsry3210/rpms/prelude-correlator Added Files: Makefile Log Message: Setup of module prelude-correlator --- NEW FILE Makefile --- # Top level Makefile for module prelude-correlator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 00:09:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 4 Jul 2008 00:09:19 GMT Subject: rpms/prelude-correlator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807040009.m6409JOT003295@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/prelude-correlator/devel In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsry3210/rpms/prelude-correlator/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module prelude-correlator --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: prelude-correlator # $Id: Makefile,v 1.1 2008/07/04 00:09:07 toshio Exp $ NAME := prelude-correlator SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 00:24:49 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 00:24:49 GMT Subject: rpms/prelude-correlator/devel import.log, NONE, 1.1 prelude-correlator.init, NONE, 1.1 prelude-correlator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807040024.m640Onb8003935@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/prelude-correlator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3908/devel Modified Files: .cvsignore sources Added Files: import.log prelude-correlator.init prelude-correlator.spec Log Message: initial import --- NEW FILE import.log --- prelude-correlator-0_9_0-0_2_beta2_fc9:HEAD:prelude-correlator-0.9.0-0.2.beta2.fc9.src.rpm:1215131030 --- NEW FILE prelude-correlator.init --- #!/bin/sh # Startup script for prelude-correlator # # chkconfig: - 75 30 # description: Run prelude-correlator # config /etc/prelude-correlator/prelude-correlator.conf PATH=/sbin:/bin:/usr/bin:/usr/sbin prog="prelude-correlator" # Source function library. . /etc/rc.d/init.d/functions # Allow anyone to run status if [ "$1" = "status" ] ; then status $prog RETVAL=$? exit $RETVAL fi # Check that we are root ... so non-root users stop here test $EUID = 0 || exit 4 RETVAL=0 start() { test -x /usr/bin/$prog || exit 5 test -f /etc/$prog/$prog.conf || exit 6 if test "x`pidof $prog`" != x; then echo "$prog already started" action $"Starting $prog: " /bin/false RETVAL=1 return $RETVAL else echo -n $"Starting $prog: " unset HOME MAIL USER USERNAME daemon $prog -d RETVAL=$? if test $RETVAL = 0 ; then touch /var/lock/subsys/$prog fi echo return $RETVAL fi } stop() { if test "x`pidof $prog`" != x; then echo -n $"Stopping $prog: " killproc $prog RETVAL=$? echo fi rm -f /var/lock/subsys/$prog return $RETVAL } case "$1" in start) start ;; stop) stop ;; restart|reload) stop sleep 3 start ;; condrestart) if test "x`pidof prog`" != x; then stop start fi ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" RETVAL=3 esac exit $RETVAL --- NEW FILE prelude-correlator.spec --- # This is temporary while its in beta %define prelude_rel beta2 Name: prelude-correlator Version: 0.9.0 Release: 0.2.%{prelude_rel}%{?dist} Summary: Real time correlator of events received by Prelude Manager Group: Applications/Internet License: GPLv2+ URL: http://www.prelude-ids.com Source0: http://www.prelude-ids.com/download/releases/prelude-correlator/%{name}-%{version}-%{prelude_rel}.tar.gz Source1: prelude-correlator.init #Patch1: prelude-correlator-lua.patch #Patch2: prelude-correlator-return-table-on-multipath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libprelude-devel BuildRequires: pcre-devel BuildRequires: lua-devel BuildRequires: pkgconfig Requires(pre) : /usr/sbin/useradd Requires(post) : /sbin/chkconfig Requires(preun) : /sbin/chkconfig Requires(preun) : /sbin/service Requires(postun): /sbin/service %description Prelude-Correlator serves to correlate, in real time, the multiple events received by Prelude Manager. Several isolated alerts, generated from different probes, can thus trigger a single correlation alert should the events be related. This correlation alert then appears within the Prewikka interface and indicates the potential target information via the set of correlation rules. %package devel Summary: Header files for developing a prelude-correlator plugin Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libprelude-devel %description devel Include files needed to create plugins for the Prelude-Correlator. %prep %setup -q -n %{name}-%{version}-%{prelude_rel} #%patch1 -p3 #%patch2 -p1 %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_initrddir} make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" install -m 755 %SOURCE1 %{buildroot}%{_initrddir}/%{name} rm -f %{buildroot}/%{_libdir}/%{name}/*.la %clean rm -rf %{buildroot} %post /sbin/chkconfig --add %{name} %preun if [ $1 = 0 ]; then /sbin/service %{name} stop > /dev/null 2>&1 || : /sbin/chkconfig --del %{name} fi %postun if [ "$1" -ge "1" ]; then /sbin/service %{name} condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS HACKING.README %dir %attr(0700,root,root) %{_sysconfdir}/%{name} %dir %attr(0700,root,root) %{_sysconfdir}/%{name}/lua-rules %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/lua-rules/* %{_initrddir}/%{name} %dir %attr(0755,root,root) %{_datadir}/%{name} %{_datadir}/%{name}/* %{_bindir}/%{name} %{_libdir}/* %files devel %defattr(-,root,root) %{_includedir}/%{name}/* %changelog *Thu Jul 03 2008 Steve Grubb 0.9.0-0.1.beta2 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 00:09:07 -0000 1.1 +++ .cvsignore 4 Jul 2008 00:24:08 -0000 1.2 @@ -0,0 +1 @@ +prelude-correlator-0.9.0-beta2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 00:09:07 -0000 1.1 +++ sources 4 Jul 2008 00:24:08 -0000 1.2 @@ -0,0 +1 @@ +5e05298e02d05bce12340cdad23801c3 prelude-correlator-0.9.0-beta2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 00:27:57 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 00:27:57 GMT Subject: rpms/prelude-correlator/devel prelude-correlator.spec,1.1,1.2 Message-ID: <200807040027.m640RvSp004042@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/prelude-correlator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4021 Modified Files: prelude-correlator.spec Log Message: *Thu Jul 03 2008 Steve Grubb 0.9.0-0.1.beta2 - Initial packaging Index: prelude-correlator.spec =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/devel/prelude-correlator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prelude-correlator.spec 4 Jul 2008 00:24:08 -0000 1.1 +++ prelude-correlator.spec 4 Jul 2008 00:27:09 -0000 1.2 @@ -11,8 +11,6 @@ URL: http://www.prelude-ids.com Source0: http://www.prelude-ids.com/download/releases/prelude-correlator/%{name}-%{version}-%{prelude_rel}.tar.gz Source1: prelude-correlator.init -#Patch1: prelude-correlator-lua.patch -#Patch2: prelude-correlator-return-table-on-multipath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libprelude-devel @@ -47,8 +45,6 @@ %prep %setup -q -n %{name}-%{version}-%{prelude_rel} -#%patch1 -p3 -#%patch2 -p1 %build %configure From fedora-extras-commits at redhat.com Fri Jul 4 00:38:17 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Fri, 4 Jul 2008 00:38:17 GMT Subject: rpms/R-RSQLite/F-9 R-RSQLite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807040038.m640cHw6004592@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/R-RSQLite/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4516/F-9 Modified Files: .cvsignore sources Added Files: R-RSQLite.spec Log Message: Import R-RSQLite --- NEW FILE R-RSQLite.spec --- %define packname RSQLite %define packrel 9 Name: R-%{packname} Version: 0.6 Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: LGPLv2+ URL: http://cran.r-project.org/web/packages/RSQLite/index.html Group: Applications/Engineering Summary: SQLite database interface for R BuildRequires: R-devel, tetex-latex, sqlite-devel, R-DBI BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): R Requires(postun): R Requires: R-DBI %description A SQLite database interface definition for communication between R and SQLite databases. %prep %setup -q -c -n %{packname} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library %{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/%{packname}/INSTALL %check %{_bindir}/R CMD check %{packname} %clean rm -rf $RPM_BUILD_ROOT %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %doc %{_libdir}/R/library/%{packname}/README %doc %{_libdir}/R/library/%{packname}/THANKS %doc %{_libdir}/R/library/%{packname}/TODO %doc %{_libdir}/R/library/%{packname}/announce %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/libs %{_libdir}/R/library/%{packname}/UnitTests %{_libdir}/R/library/%{packname}/rsqlitePerf.txt %{_libdir}/R/library/%{packname}/help %changelog * Thu Jun 26 2008 Nigel Jones - 0.6-3 - Fix buildreqs * Mon Jun 22 2008 Nigel Jones - 0.6-2 - Update package summary/description - Package Release '9' * Tue Jun 10 2008 Nigel Jones - 0.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-RSQLite/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 16:21:47 -0000 1.1 +++ .cvsignore 4 Jul 2008 00:37:29 -0000 1.2 @@ -0,0 +1 @@ +RSQLite_0.6-9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-RSQLite/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 16:21:47 -0000 1.1 +++ sources 4 Jul 2008 00:37:29 -0000 1.2 @@ -0,0 +1 @@ +868f472aa55057edb40d9a2d1db1d2e6 RSQLite_0.6-9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 00:38:29 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Fri, 4 Jul 2008 00:38:29 GMT Subject: rpms/R-RSQLite/F-8 R-RSQLite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807040038.m640cTU9004596@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/R-RSQLite/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4516/F-8 Modified Files: .cvsignore sources Added Files: R-RSQLite.spec Log Message: Import R-RSQLite --- NEW FILE R-RSQLite.spec --- %define packname RSQLite %define packrel 9 Name: R-%{packname} Version: 0.6 Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: LGPLv2+ URL: http://cran.r-project.org/web/packages/RSQLite/index.html Group: Applications/Engineering Summary: SQLite database interface for R BuildRequires: R-devel, tetex-latex, sqlite-devel, R-DBI BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): R Requires(postun): R Requires: R-DBI %description A SQLite database interface definition for communication between R and SQLite databases. %prep %setup -q -c -n %{packname} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library %{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/%{packname}/INSTALL %check %{_bindir}/R CMD check %{packname} %clean rm -rf $RPM_BUILD_ROOT %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %doc %{_libdir}/R/library/%{packname}/README %doc %{_libdir}/R/library/%{packname}/THANKS %doc %{_libdir}/R/library/%{packname}/TODO %doc %{_libdir}/R/library/%{packname}/announce %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/libs %{_libdir}/R/library/%{packname}/UnitTests %{_libdir}/R/library/%{packname}/rsqlitePerf.txt %{_libdir}/R/library/%{packname}/help %changelog * Thu Jun 26 2008 Nigel Jones - 0.6-3 - Fix buildreqs * Mon Jun 22 2008 Nigel Jones - 0.6-2 - Update package summary/description - Package Release '9' * Tue Jun 10 2008 Nigel Jones - 0.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-RSQLite/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 16:21:47 -0000 1.1 +++ .cvsignore 4 Jul 2008 00:37:14 -0000 1.2 @@ -0,0 +1 @@ +RSQLite_0.6-9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-RSQLite/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 16:21:47 -0000 1.1 +++ sources 4 Jul 2008 00:37:14 -0000 1.2 @@ -0,0 +1 @@ +868f472aa55057edb40d9a2d1db1d2e6 RSQLite_0.6-9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 00:38:31 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Fri, 4 Jul 2008 00:38:31 GMT Subject: rpms/R-RSQLite/devel R-RSQLite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807040038.m640cVL3004600@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/R-RSQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4516/devel Modified Files: .cvsignore sources Added Files: R-RSQLite.spec Log Message: Import R-RSQLite --- NEW FILE R-RSQLite.spec --- %define packname RSQLite %define packrel 9 Name: R-%{packname} Version: 0.6 Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: LGPLv2+ URL: http://cran.r-project.org/web/packages/RSQLite/index.html Group: Applications/Engineering Summary: SQLite database interface for R BuildRequires: R-devel, tetex-latex, sqlite-devel, R-DBI BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): R Requires(postun): R Requires: R-DBI %description A SQLite database interface definition for communication between R and SQLite databases. %prep %setup -q -c -n %{packname} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library %{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/%{packname}/INSTALL %check %{_bindir}/R CMD check %{packname} %clean rm -rf $RPM_BUILD_ROOT %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %doc %{_libdir}/R/library/%{packname}/README %doc %{_libdir}/R/library/%{packname}/THANKS %doc %{_libdir}/R/library/%{packname}/TODO %doc %{_libdir}/R/library/%{packname}/announce %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/libs %{_libdir}/R/library/%{packname}/UnitTests %{_libdir}/R/library/%{packname}/rsqlitePerf.txt %{_libdir}/R/library/%{packname}/help %changelog * Thu Jun 26 2008 Nigel Jones - 0.6-3 - Fix buildreqs * Mon Jun 22 2008 Nigel Jones - 0.6-2 - Update package summary/description - Package Release '9' * Tue Jun 10 2008 Nigel Jones - 0.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-RSQLite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 16:21:47 -0000 1.1 +++ .cvsignore 4 Jul 2008 00:37:47 -0000 1.2 @@ -0,0 +1 @@ +RSQLite_0.6-9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-RSQLite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 16:21:47 -0000 1.1 +++ sources 4 Jul 2008 00:37:47 -0000 1.2 @@ -0,0 +1 @@ +868f472aa55057edb40d9a2d1db1d2e6 RSQLite_0.6-9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 00:56:18 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 00:56:18 GMT Subject: rpms/audit/devel audit.spec,1.178,1.179 Message-ID: <200807040056.m640uIVs004985@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/audit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4953 Modified Files: audit.spec Log Message: * Thu Jul 03 2008 Steve Grubb 1.7.4-2 - Move ausearch-expression to main package (#453437) Index: audit.spec =================================================================== RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- audit.spec 19 May 2008 18:02:47 -0000 1.178 +++ audit.spec 4 Jul 2008 00:55:30 -0000 1.179 @@ -1,5 +1,5 @@ %define sca_version 0.4.7 -%define sca_release 1 +%define sca_release 2 %define selinux_variants mls strict targeted %define selinux_policyver 3.2.5 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -7,7 +7,7 @@ Summary: User space tools for 2.6 kernel auditing Name: audit Version: 1.7.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ @@ -244,7 +244,6 @@ %{_includedir}/auparse.h %{_includedir}/auparse-defs.h %{_mandir}/man3/* -%{_mandir}/man5/ausearch-expression.5.gz %files libs-python %defattr(-,root,root) @@ -266,6 +265,7 @@ %attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz %attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz %attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz +%attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz %attr(750,root,root) /sbin/auditctl %attr(750,root,root) /sbin/auditd %attr(755,root,root) /sbin/ausearch @@ -322,6 +322,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server %changelog +* Thu Jul 03 2008 Steve Grubb 1.7.4-2 +- Move ausearch-expression to main package (#453437) + * Mon May 19 2008 Steve Grubb 1.7.4-1 - Fix interpreting of keys in syscall records - Don't error on name=(null) PATH records in ausearch/report From fedora-extras-commits at redhat.com Fri Jul 4 01:56:36 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Fri, 4 Jul 2008 01:56:36 GMT Subject: rpms/anaconda/devel .cvsignore, 1.544, 1.545 anaconda.spec, 1.686, 1.687 sources, 1.677, 1.678 Message-ID: <200807040156.m641uaIR012648@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12584 Modified Files: .cvsignore anaconda.spec sources Log Message: * Thu Jul 03 2008 Peter Jones - 11.4.1.12-1 - Add dmraid-libs to PACKAGES so new dmraid won't break installs. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.544 retrieving revision 1.545 diff -u -r1.544 -r1.545 --- .cvsignore 3 Jul 2008 18:04:46 -0000 1.544 +++ .cvsignore 4 Jul 2008 01:55:48 -0000 1.545 @@ -1,2 +1,2 @@ -anaconda-11.4.1.11.tar.bz2 clog +anaconda-11.4.1.12.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.686 retrieving revision 1.687 diff -u -r1.686 -r1.687 --- anaconda.spec 3 Jul 2008 18:04:46 -0000 1.686 +++ anaconda.spec 4 Jul 2008 01:55:48 -0000 1.687 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.11 +Version: 11.4.1.12 Release: 1 License: GPLv2+ Group: Applications/System @@ -194,6 +194,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Jul 03 2008 Peter Jones - 11.4.1.12-1 +- Add dmraid-libs to PACKAGES so new dmraid won't break installs. + * Thu Jul 03 2008 Peter Jones - 11.4.1.11-1 - Fix double free in setupCdrom - Fix missing psudo->pseudo spelling fix (katzj, #453843) Index: sources =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/sources,v retrieving revision 1.677 retrieving revision 1.678 diff -u -r1.677 -r1.678 --- sources 3 Jul 2008 18:04:46 -0000 1.677 +++ sources 4 Jul 2008 01:55:48 -0000 1.678 @@ -1 +1 @@ -0f8211a6bc4665df006676e0b71e720d anaconda-11.4.1.11.tar.bz2 +3c51a80f1314873877a01ff7f5e594d1 anaconda-11.4.1.12.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 4 02:06:11 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Fri, 4 Jul 2008 02:06:11 GMT Subject: rpms/cfv/F-9 cfv.spec,1.6,1.7 Message-ID: <200807040206.m6426BIQ019459@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/cfv/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19417 Modified Files: cfv.spec Log Message: release bump Index: cfv.spec =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-9/cfv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cfv.spec 22 Aug 2007 12:08:47 -0000 1.6 +++ cfv.spec 4 Jul 2008 02:05:15 -0000 1.7 @@ -1,12 +1,12 @@ Name: cfv -Version: 1.18.1 -Release: 4%{?dist}.1 +Version: 1.18.2 +Release: 1%{?dist} Summary: A utility to test and create data verification files Group: Applications/Archiving License: GPLv2+ URL: http://cfv.sourceforge.net -Source0: http://dl.sourceforge.net/cfv/cfv-1.18.1.tar.gz +Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,6 +48,9 @@ %changelog +* Wed Aug 22 2007 Manuel Wolfshant - 1.18.2-1 +- release bump + * Wed Aug 22 2007 Manuel Wolfshant - 1.18.1-4.1 - rebuilt From fedora-extras-commits at redhat.com Fri Jul 4 02:30:11 2008 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 4 Jul 2008 02:30:11 GMT Subject: rpms/pidgin-otr/F-8 pidgin-otr.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807040230.m642UBR0020666@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/pidgin-otr/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20555 Modified Files: pidgin-otr.spec sources Log Message: * Thu Jul 3 2008 Paul Wouters 3.2.0-1 - Updated to 3.2.0 Index: pidgin-otr.spec =================================================================== RCS file: /cvs/extras/rpms/pidgin-otr/F-8/pidgin-otr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pidgin-otr.spec 7 Aug 2007 03:52:21 -0000 1.1 +++ pidgin-otr.spec 4 Jul 2008 02:29:20 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Off-The-Record Messaging plugin for Pidgin Name: pidgin-otr -Version: 3.1.0 -Release: 2%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Source: http://otr.cypherpunks.ca/%{name}-%{version}.tar.gz Url: http://otr.cypherpunks.ca/ License: GPLv2 @@ -9,7 +9,7 @@ Provides: gaim-otr = %{version} Obsoletes: gaim-otr < 3.0.1-0.7.20060712cvs BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: pidgin >= 2.0.0, libotr >= 3.1.0 +Requires: pidgin >= 2.0.0, libotr >= 3.2.0 BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0 BuildRequires: libgpg-error-devel, libotr-devel >= 3.1.0 BuildRequires: pidgin-devel >= 2.0.0, perl(XML::Parser), gettext @@ -44,6 +44,9 @@ %{_libdir}/pidgin/pidgin-otr.so %changelog +* Thu Jul 3 2008 Paul Wouters 3.2.0-1 +- Updated to 3.2.0 + * Mon Aug 6 2007 Paul Wouters 3.1.0-2 - Fixed Buildrequires - Versioned the gaim-otr Obsolete: Index: sources =================================================================== RCS file: /cvs/extras/rpms/pidgin-otr/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Aug 2007 03:52:21 -0000 1.2 +++ sources 4 Jul 2008 02:29:20 -0000 1.3 @@ -1 +1,2 @@ f4ca8bc228069616d4c8fa9288af6bb5 pidgin-otr-3.1.0.tar.gz +8af70b654b7d7c5a5b7785699ff562f9 pidgin-otr-3.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 02:36:51 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Fri, 4 Jul 2008 02:36:51 GMT Subject: rpms/cfv/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200807040236.m642ap9d021242@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/cfv/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21112 Modified Files: .cvsignore sources Log Message: release bump Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Feb 2006 03:14:44 -0000 1.2 +++ .cvsignore 4 Jul 2008 02:35:54 -0000 1.3 @@ -1 +1 @@ -cfv-1.18.1.tar.gz +cfv-1.18.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Feb 2006 03:14:44 -0000 1.2 +++ sources 4 Jul 2008 02:35:54 -0000 1.3 @@ -1 +1 @@ -f1779d83c5f0ddaa4df864e19ec95ffc cfv-1.18.1.tar.gz +775d8001228c5ba6549825318f906d26 cfv-1.18.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 02:44:38 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Fri, 4 Jul 2008 02:44:38 GMT Subject: rpms/cfv/F-8 .cvsignore,1.2,1.3 cfv.spec,1.6,1.7 sources,1.2,1.3 Message-ID: <200807040244.m642icTI021702@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/cfv/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21623 Modified Files: .cvsignore cfv.spec sources Log Message: * Wed Aug 22 2007 Manuel Wolfshant - 1.18.2-1 - release bump Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Feb 2006 03:14:44 -0000 1.2 +++ .cvsignore 4 Jul 2008 02:43:50 -0000 1.3 @@ -1 +1 @@ -cfv-1.18.1.tar.gz +cfv-1.18.2.tar.gz Index: cfv.spec =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-8/cfv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cfv.spec 22 Aug 2007 12:08:47 -0000 1.6 +++ cfv.spec 4 Jul 2008 02:43:50 -0000 1.7 @@ -1,12 +1,12 @@ Name: cfv -Version: 1.18.1 -Release: 4%{?dist}.1 +Version: 1.18.2 +Release: 1%{?dist} Summary: A utility to test and create data verification files Group: Applications/Archiving License: GPLv2+ URL: http://cfv.sourceforge.net -Source0: http://dl.sourceforge.net/cfv/cfv-1.18.1.tar.gz +Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,6 +48,9 @@ %changelog +* Wed Aug 22 2007 Manuel Wolfshant - 1.18.2-1 +- release bump + * Wed Aug 22 2007 Manuel Wolfshant - 1.18.1-4.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Feb 2006 03:14:44 -0000 1.2 +++ sources 4 Jul 2008 02:43:50 -0000 1.3 @@ -1 +1 @@ -f1779d83c5f0ddaa4df864e19ec95ffc cfv-1.18.1.tar.gz +775d8001228c5ba6549825318f906d26 cfv-1.18.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 02:54:26 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Fri, 4 Jul 2008 02:54:26 GMT Subject: rpms/cfv/F-7 .cvsignore,1.2,1.3 cfv.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200807040254.m642sQZX022207@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/cfv/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22165 Modified Files: .cvsignore cfv.spec sources Log Message: release bump Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Feb 2006 03:14:44 -0000 1.2 +++ .cvsignore 4 Jul 2008 02:53:36 -0000 1.3 @@ -1 +1 @@ -cfv-1.18.1.tar.gz +cfv-1.18.2.tar.gz Index: cfv.spec =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-7/cfv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cfv.spec 9 Aug 2007 22:54:38 -0000 1.4 +++ cfv.spec 4 Jul 2008 02:53:36 -0000 1.5 @@ -1,12 +1,12 @@ Name: cfv -Version: 1.18.1 -Release: 4%{?dist} +Version: 1.18.2 +Release: 1%{?dist} Summary: A utility to test and create data verification files Group: Applications/Archiving License: GPLv2+ URL: http://cfv.sourceforge.net -Source0: http://dl.sourceforge.net/cfv/cfv-1.18.1.tar.gz +Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,6 +48,12 @@ %changelog +* Wed Aug 22 2007 Manuel Wolfshant - 1.18.2-1 +- release bump + +* Wed Aug 22 2007 Manuel Wolfshant - 1.18.1-4.1 +- rebuilt + * Fri Aug 10 2007 Manuel Wolfshant - 1.18.1-4 - license clarification Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cfv/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Feb 2006 03:14:44 -0000 1.2 +++ sources 4 Jul 2008 02:53:36 -0000 1.3 @@ -1 +1 @@ -f1779d83c5f0ddaa4df864e19ec95ffc cfv-1.18.1.tar.gz +775d8001228c5ba6549825318f906d26 cfv-1.18.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 02:54:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 02:54:49 +0000 Subject: [pkgdb] japanese-bitmap-fonts was added for tagoh Message-ID: <200807040254.m642snD1006618@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) has added Package japanese-bitmap-fonts with summary A collection of Japanese bitmap fonts Jens Petersen (petersen) has approved Package japanese-bitmap-fonts Jens Petersen (petersen) has added a Fedora devel branch for japanese-bitmap-fonts with an owner of tagoh Jens Petersen (petersen) has approved japanese-bitmap-fonts in Fedora devel Jens Petersen (petersen) has approved Package japanese-bitmap-fonts Jens Petersen (petersen) has set commit to Approved for cvsextras on japanese-bitmap-fonts (Fedora devel) Jens Petersen (petersen) has set build to Approved for cvsextras on japanese-bitmap-fonts (Fedora devel) Jens Petersen (petersen) has set checkout to Approved for cvsextras on japanese-bitmap-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/japanese-bitmap-fonts From fedora-extras-commits at redhat.com Fri Jul 4 02:59:13 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 4 Jul 2008 02:59:13 GMT Subject: rpms/japanese-bitmap-fonts - New directory Message-ID: <200807040259.m642xDRH022376@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/japanese-bitmap-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsa22341/rpms/japanese-bitmap-fonts Log Message: Directory /cvs/extras/rpms/japanese-bitmap-fonts added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 02:59:23 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 4 Jul 2008 02:59:23 GMT Subject: rpms/japanese-bitmap-fonts/devel - New directory Message-ID: <200807040259.m642xNTT022392@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/japanese-bitmap-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsa22341/rpms/japanese-bitmap-fonts/devel Log Message: Directory /cvs/extras/rpms/japanese-bitmap-fonts/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 02:59:39 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 4 Jul 2008 02:59:39 GMT Subject: rpms/japanese-bitmap-fonts Makefile,NONE,1.1 Message-ID: <200807040259.m642xdve022419@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/japanese-bitmap-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsa22341/rpms/japanese-bitmap-fonts Added Files: Makefile Log Message: Setup of module japanese-bitmap-fonts --- NEW FILE Makefile --- # Top level Makefile for module japanese-bitmap-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 02:59:52 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 4 Jul 2008 02:59:52 GMT Subject: rpms/japanese-bitmap-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807040259.m642xq6r022438@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/japanese-bitmap-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsa22341/rpms/japanese-bitmap-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module japanese-bitmap-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: japanese-bitmap-fonts # $Id: Makefile,v 1.1 2008/07/04 02:59:39 petersen Exp $ NAME := japanese-bitmap-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 04:49:33 2008 From: fedora-extras-commits at redhat.com (John Pye (jpye)) Date: Fri, 4 Jul 2008 04:49:33 GMT Subject: rpms/fityk/F-9 .cvsignore, 1.2, 1.3 fityk.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200807040449.m644nXZC009707@cvs-int.fedora.redhat.com> Author: jpye Update of /cvs/pkgs/rpms/fityk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9579/F-9 Modified Files: .cvsignore fityk.spec sources Log Message: Update version for F-9. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fityk/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jul 2007 13:21:07 -0000 1.2 +++ .cvsignore 4 Jul 2008 04:48:44 -0000 1.3 @@ -1 +1 @@ -fityk-0.8.1.tar.bz2 +fityk-0.8.6.tar.bz2 Index: fityk.spec =================================================================== RCS file: /cvs/pkgs/rpms/fityk/F-9/fityk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fityk.spec 8 Apr 2008 02:38:01 -0000 1.5 +++ fityk.spec 4 Jul 2008 04:48:44 -0000 1.6 @@ -1,14 +1,14 @@ Name: fityk Summary: Non-linear curve fitting and data analysis -Version: 0.8.1 -Release: 13%{?dist} +Version: 0.8.6 +Release: 14%{?dist} Source0: http://downloads.sourceforge.net/fityk/%{name}-%{version}.tar.bz2 URL: http://fityk.sourceforge.net/ License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Patch0: %{name}-gcc43.patch +#Patch0: %{name}-gcc43.patch BuildRequires: gcc-c++, readline-devel, ncurses-devel, desktop-file-utils %if 0%{?mandriva_version} @@ -36,7 +36,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure CPPFLAGS="-DNDEBUG" %{?__cc:CC="%__cc"} %{?__cxx:CXX="%__cxx"} @@ -107,6 +107,10 @@ %{_libdir}/*.so %changelog +* Fri Jul 04 2008 John Pye - 0.8.6-14 +- Update to Fityk 0.8.6. +- Disabled patch. + * Mon Apr 07 2008 Jesse Keating - 0.8.1-13 - Patch for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fityk/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jul 2007 13:21:07 -0000 1.2 +++ sources 4 Jul 2008 04:48:44 -0000 1.3 @@ -1 +1 @@ -f93d2ce9b9c21e0d79d69f1adb797a66 fityk-0.8.1.tar.bz2 +e9f9f56cc35d629e485927b33c0d9c01 fityk-0.8.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 4 04:57:53 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Fri, 4 Jul 2008 04:57:53 GMT Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.7,1.8 Message-ID: <200807040457.m644vr4k010129@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-api-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085 Modified Files: apr-api-docs.spec Log Message: Include all headers. Index: apr-api-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apr-api-docs.spec 2 Jul 2008 00:42:50 -0000 1.7 +++ apr-api-docs.spec 4 Jul 2008 04:57:05 -0000 1.8 @@ -1,6 +1,6 @@ Name: apr-api-docs Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Portable Runtime API documentation Group: Development/Tools @@ -29,12 +29,12 @@ %build cd %{name}-%{version} -%define docheaders %(ls %{_includedir}/apr-1/apr.h %{_includedir}/apr-1/apr-%{_arch}.h %{_includedir}/apr-1/apr_*.h %{_includedir}/apr-1/apu*.h | xargs echo) +%define docheaders %(ls %{_includedir}/apr-1/*.h | xargs echo) sed -e 's,\(INPUT *= *\).*$,\1%{docheaders},' \ -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \ -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/apr.tag,' \ doxygen.conf | doxygen - -sed -ie 's,^\[Apache Portability Runtime library\],&'\ +sed -i -e 's,^\[Apache Portability Runtime library\],&'\ '
'\ 'WARNING: The actual values of macros and typedefs
'\ 'are platform specific and should NOT be relied upon!'\ @@ -60,6 +60,9 @@ %doc %{_docdir}/apr-%{version}/api-docs/* %changelog +* Fri Jul 04 2008 Bojan Smojver 1.3.2-2 +- %%{_arch} is set to noarch, cannot use that, include all headers + * Wed Jul 02 2008 Bojan Smojver 1.3.2-1 - Bump up to 1.3.2 From fedora-extras-commits at redhat.com Fri Jul 4 05:49:37 2008 From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade)) Date: Fri, 4 Jul 2008 05:49:37 GMT Subject: rpms/m17n-contrib/devel kn-kgp.mim, NONE, 1.1 m17n-contrib.spec, 1.13, 1.14 ml-swanalekha.mim, 1.1, NONE Message-ID: <200807040549.m645nbLE018841@cvs-int.fedora.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-contrib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18687 Modified Files: m17n-contrib.spec Added Files: kn-kgp.mim Removed Files: ml-swanalekha.mim Log Message: * Fri Jul 04 2008 Parag Nemade -1.1.7-2 - Resolves: rh#453910: [kn_IN]Include latest kn- kgp.mim againist the latest build --- NEW FILE kn-kgp.mim --- ;; kn-kgp.mim -- Kannada input method with KGP method ;; Copyright (C) 2008 ;; Sridhar M.A., Mysore; mas at mylug.org ;; This file is part of the m17n contrib; a sub-part of the m17n ;; library. ;; The m17n library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public License ;; as published by the Free Software Foundation; either version 2.1 of ;; the License, or (at your option) any later version. ;; The m17n library is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; Lesser General Public License for more details. ;; You should have received a copy of the GNU Lesser General Public ;; License along with the m17n library; if not, write to the Free ;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. (input-method kn kgp) (description "Kannada input method by KGP method. ") (title "???") (map (starter ("0") ("1") ("2") ("3") ("4") ("5") ("6") ("7") ("8") ("9") ("A") ("B") ("C") ("D") ("E") ("G") ("H") ("I") ("J") ("K") ("L") ("M") ("N") ("O") ("P") ("Q") ("R") ("S") ("T") ("U") ("V") ("W") ("Y") ("Z") ("a") ("b") ("c") ("d") ("e") ("f") ("g") ("h") ("i") ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r") ("s") ("t") ("u") ("v") ("w") ("x") ("y") ("z")) (consonant ("k" "???") ("K" "???") ("g" "???") ("G" "???") ("Z" "???") ("c" "???") ("C" "???") ("j" "???") ("jX" "??????") ("J" "???") ("z" "???") ("q" "???") ("Q" "???") ("w" "???") ("W" "???") ("N" "???") ("t" "???") ("T" "???") ("d" "???") ("D" "???") ("n" "???") ("p" "???") ("P" "???") ("PX" "??????") ("b" "???") ("B" "???") ("m" "???") ("y" "???") ("r" "???") ("rX" "???") ("l" "???") ("v" "???") ("S" "???") ("x" "???") ("s" "???") ("h" "???") ("L" "???") ("LX" "???")) (independent ("a" "???") ("A" "???") ("i" "???") ("I" "???") ("u" "???") ("U" "???") ("R" "???") ("RU" "???") ("e" "???") ("E" "???") ("Y" "???") ("o" "???") ("O" "???") ("V" "???") ("M" "???") ("H" "???") ("|" "???") ("||" "???") ("sX" "???") ("0" "???") ("1" "???") ("2" "???") ("3" "???") ("4" "???") ("5" "???") ("6" "???") ("7" "???") ("8" "???") ("9" "???")) (dependent ("f" "???") ("A" "???") ("i" "???") ("I" "???") ("u" "???") ("U" "???") ("R" "???") ("RX" "???") ("e" "???") ("E" "???") ("Y" "???") ("o" "???") ("O" "???") ("V" "???") ("ff" "??????")) (return ((Return))) (backspace ((BackSpace) (undo)))) (state (init (starter (pushback 1) (shift intermediate))) (intermediate (consonant (shift second)) (independent (shift finish)) (backspace) (return (shift init))) (second (consonant) (dependent (shift finish)) (backspace) (return (shift init))) (finish (return) ) ;; (finish ;; (return) ;; (t (shift init)))) ;; Local Variables: ;; coding: utf-8 ;; mode: lisp ;; End: Index: m17n-contrib.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- m17n-contrib.spec 3 Jul 2008 07:13:13 -0000 1.13 +++ m17n-contrib.spec 4 Jul 2008 05:48:50 -0000 1.14 @@ -1,11 +1,12 @@ Name: m17n-contrib Summary: Contributed multilingualization datafiles for m17n-lib Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://www.m17n.org/m17n-lib/index.html Source0: http://www.m17n.org/m17n-lib-download/m17n-contrib-%{version}.tar.gz +Source1: kn-kgp.mim Patch0: bug433416-bn-probhat.patch Patch1: as-inscript-keysummary-440201.patch Patch2: ml-inscript-keysummary-435259.patch @@ -98,6 +99,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p" +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/ %find_lang %name @@ -110,6 +112,9 @@ %{_datadir}/m17n/scripts %changelog +* Fri Jul 04 2008 Parag Nemade -1.1.7-2 +- Resolves: rh#453910: [kn_IN]Include latest kn- kgp.mim againist the latest build + * Thu Jul 03 2008 Parag Nemade -1.1.7-1 - Update to new upstream release 1.1.7 --- ml-swanalekha.mim DELETED --- From fedora-extras-commits at redhat.com Fri Jul 4 05:52:36 2008 From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade)) Date: Fri, 4 Jul 2008 05:52:36 GMT Subject: rpms/m17n-contrib/devel ml-mozhi.mim, 1.1, NONE ml-mozhi.png, 1.1, NONE Message-ID: <200807040552.m645qaLl019007@cvs-int.fedora.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-contrib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18975 Removed Files: ml-mozhi.mim ml-mozhi.png Log Message: -Remove keymap files that got accepted upstream --- ml-mozhi.mim DELETED --- From fedora-extras-commits at redhat.com Fri Jul 4 06:44:10 2008 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 4 Jul 2008 06:44:10 GMT Subject: rpms/fbida/devel fbida.spec,1.23,1.24 Message-ID: <200807040644.m646iAAe028483@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/fbida/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28440 Modified Files: fbida.spec Log Message: * Fri Jul 04 2008 Adrian Reber - 2.07-2 - applied patch from Ville Skytt?? to fix "fbida: empty debuginfo package" (#453998) Index: fbida.spec =================================================================== RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fbida.spec 9 Jun 2008 16:45:03 -0000 1.23 +++ fbida.spec 4 Jul 2008 06:43:15 -0000 1.24 @@ -1,7 +1,7 @@ Summary: FrameBuffer Imageviewer Name: fbida Version: 2.07 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://linux.bytesex.org/fbida/ @@ -30,7 +30,6 @@ %prep %setup -q -%{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk %{__sed} -i -e "s,/X11R6,,g" GNUmakefile %{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk @@ -45,7 +44,7 @@ %{__mv} fbi.man.new fbi.man %{__mv} exiftran.man.new exiftran.man %{__mv} fbgs.man.new fbgs.man -lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install +lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} STRIP= install %clean %{__rm} -rf %{buildroot} @@ -64,6 +63,10 @@ %{_bindir}/fbgs %changelog +* Fri Jul 04 2008 Adrian Reber - 2.07-2 +- applied patch from Ville Skytt?? to fix + "fbida: empty debuginfo package" (#453998) + * Mon Jun 09 2008 Adrian Reber - 2.07-1 - updated to 2.07 - fixes "The fbi command aborts with a stack trace" (#448126) From fedora-extras-commits at redhat.com Fri Jul 4 06:50:00 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 4 Jul 2008 06:50:00 GMT Subject: comps comps-f10.xml.in,1.39,1.40 Message-ID: <200807040650.m646o0vV028903@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28663 Modified Files: comps-f10.xml.in Log Message: [input-methods] install scim-rawcode by default Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- comps-f10.xml.in 2 Jul 2008 22:11:09 -0000 1.39 +++ comps-f10.xml.in 4 Jul 2008 06:49:29 -0000 1.40 @@ -2317,6 +2317,7 @@ scim-hangul scim-m17n scim-python-pinyin + scim-rawcode imsettings-xfce scim-bridge-gtk scim-bridge-qt @@ -2380,7 +2381,6 @@ scim-python-xingma-erbi scim-python-xingma-wubi scim-python-xingma-zhengma - scim-rawcode scim-sayura scim-skk scim-tables-additional From fedora-extras-commits at redhat.com Fri Jul 4 07:28:34 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Fri, 4 Jul 2008 07:28:34 GMT Subject: rpms/curl/devel curl.spec,1.77,1.78 Message-ID: <200807040728.m647SYR0004690@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/curl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658 Modified Files: curl.spec Log Message: * Wed Jul 4 2008 Jindrich Novy 7.18.2-3 - enable support for libssh2 (#453958) Index: curl.spec =================================================================== RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- curl.spec 18 Jun 2008 06:08:03 -0000 1.77 +++ curl.spec 4 Jul 2008 07:27:44 -0000 1.78 @@ -1,7 +1,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.18.2 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 @@ -12,7 +12,7 @@ Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig, libidn-devel, zlib-devel +BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel %description @@ -62,7 +62,7 @@ %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \ --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ --with-gssapi=%{_prefix}/kerberos --with-libidn \ - --enable-ldaps --disable-static + --enable-ldaps --disable-static --with-libssh2 sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \ Makefile libcurl.pc # Remove bogus rpath @@ -117,6 +117,9 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Wed Jul 4 2008 Jindrich Novy 7.18.2-3 +- enable support for libssh2 (#453958) + * Wed Jun 18 2008 Jindrich Novy 7.18.2-2 - fix curl_multi_perform() over a proxy (#450140), thanks to Rob Crittenden From fedora-extras-commits at redhat.com Fri Jul 4 07:30:15 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Fri, 4 Jul 2008 07:30:15 GMT Subject: rpms/roxterm/F-8 .cvsignore, 1.5, 1.6 roxterm.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200807040730.m647UF7k004990@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/roxterm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4824/F-8 Modified Files: .cvsignore roxterm.spec sources Log Message: Update for f8 and f9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/roxterm/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 May 2008 22:32:26 -0000 1.5 +++ .cvsignore 4 Jul 2008 07:29:26 -0000 1.6 @@ -1 +1 @@ -roxterm-1.12.1.tar.gz +roxterm-1.12.2.tar.gz Index: roxterm.spec =================================================================== RCS file: /cvs/extras/rpms/roxterm/F-8/roxterm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- roxterm.spec 23 May 2008 22:32:26 -0000 1.5 +++ roxterm.spec 4 Jul 2008 07:29:26 -0000 1.6 @@ -1,5 +1,5 @@ Name: roxterm -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} Summary: A fast terminal emulator @@ -36,9 +36,11 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm -desktop-file-install --vendor "fedora" \ - --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --delete-original \ +desktop-file-install --vendor "fedora" \ + --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ + --remove-category Utility \ + --add-category System \ + --delete-original \ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop %find_lang %{name} @@ -70,6 +72,10 @@ %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg %changelog +* Sat Jun 22 2008 Sebastian Vahl - 1.12.1-2 +- new upstream version: 1.12.2 +- move menu entry to category "System" + * Fri May 23 2008 Sebastian Vahl - 1.12.1-1 - new upstream version: 1.12.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/roxterm/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 May 2008 22:32:26 -0000 1.6 +++ sources 4 Jul 2008 07:29:26 -0000 1.7 @@ -1 +1 @@ -04ac9d709fa5cdeadfedeb904a01ed04 roxterm-1.12.1.tar.gz +bb7e30d19d42b24bc49ad403fcde9058 roxterm-1.12.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 07:30:40 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Fri, 4 Jul 2008 07:30:40 GMT Subject: rpms/roxterm/F-9 .cvsignore, 1.11, 1.12 roxterm.spec, 1.9, 1.10 sources, 1.11, 1.12 Message-ID: <200807040730.m647UejF005017@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/roxterm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4824/F-9 Modified Files: .cvsignore roxterm.spec sources Log Message: Update for f8 and f9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/roxterm/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 23 May 2008 22:32:41 -0000 1.11 +++ .cvsignore 4 Jul 2008 07:29:45 -0000 1.12 @@ -1 +1 @@ -roxterm-1.12.1.tar.gz +roxterm-1.12.2.tar.gz Index: roxterm.spec =================================================================== RCS file: /cvs/extras/rpms/roxterm/F-9/roxterm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- roxterm.spec 23 May 2008 22:32:41 -0000 1.9 +++ roxterm.spec 4 Jul 2008 07:29:45 -0000 1.10 @@ -1,5 +1,5 @@ Name: roxterm -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} Summary: A fast terminal emulator @@ -36,9 +36,11 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm -desktop-file-install --vendor "fedora" \ - --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --delete-original \ +desktop-file-install --vendor "fedora" \ + --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ + --remove-category Utility \ + --add-category System \ + --delete-original \ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop %find_lang %{name} @@ -70,6 +72,10 @@ %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg %changelog +* Sat Jun 22 2008 Sebastian Vahl - 1.12.1-2 +- new upstream version: 1.12.2 +- move menu entry to category "System" + * Fri May 23 2008 Sebastian Vahl - 1.12.1-1 - new upstream version: 1.12.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/roxterm/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 23 May 2008 22:32:41 -0000 1.11 +++ sources 4 Jul 2008 07:29:45 -0000 1.12 @@ -1 +1 @@ -04ac9d709fa5cdeadfedeb904a01ed04 roxterm-1.12.1.tar.gz +bb7e30d19d42b24bc49ad403fcde9058 roxterm-1.12.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 08:15:06 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:15:06 GMT Subject: rpms/namazu/devel namazu.spec,1.16,1.17 Message-ID: <200807040815.m648F6cK014425@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14340 Modified Files: namazu.spec Log Message: * fri Jul 4 2008 Akira TAGOH - 2.0.18-2 - Add nkf, kakasi and mecab to BR. (#449186) Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- namazu.spec 18 Mar 2008 05:48:15 -0000 1.16 +++ namazu.spec 4 Jul 2008 08:14:12 -0000 1.17 @@ -8,7 +8,8 @@ License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 -BuildPreReq: perl(File::MMagic) >= 1.12 +BuildRequires: perl(File::MMagic) >= 1.12 +BuildRequires: nkf kakasi mecab BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://www.namazu.org/stable/%{name}-%{version}.tar.gz @@ -160,6 +161,9 @@ %changelog +* fri Jul 4 2008 Akira TAGOH - 2.0.18-2 +- Add nkf, kakasi and mecab to BR. (#449186) + * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Jul 4 08:23:23 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:23:23 GMT Subject: rpms/namazu/devel namazu.spec,1.17,1.18 Message-ID: <200807040823.m648NNVQ014892@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14858 Modified Files: namazu.spec Log Message: bump release Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- namazu.spec 4 Jul 2008 08:14:12 -0000 1.17 +++ namazu.spec 4 Jul 2008 08:22:32 -0000 1.18 @@ -4,7 +4,7 @@ Name: namazu Version: 2.0.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 From fedora-extras-commits at redhat.com Fri Jul 4 08:24:45 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:24:45 GMT Subject: rpms/namazu/devel namazu.spec,1.18,1.19 Message-ID: <200807040824.m648OjFk015000@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14937 Modified Files: namazu.spec Log Message: Fix a typo Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- namazu.spec 4 Jul 2008 08:22:32 -0000 1.18 +++ namazu.spec 4 Jul 2008 08:23:51 -0000 1.19 @@ -161,7 +161,7 @@ %changelog -* fri Jul 4 2008 Akira TAGOH - 2.0.18-2 +* Fri Jul 4 2008 Akira TAGOH - 2.0.18-2 - Add nkf, kakasi and mecab to BR. (#449186) * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 From fedora-extras-commits at redhat.com Fri Jul 4 08:29:15 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:29:15 GMT Subject: rpms/namazu/F-9 namazu.spec,1.16,1.17 Message-ID: <200807040829.m648TF1g015450@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15399 Modified Files: namazu.spec Log Message: * Fri Jul 4 2008 Akira TAGOH - 2.0.18-2 - Add nkf, kakasi and mecab to BR. (#449186) Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/F-9/namazu.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- namazu.spec 18 Mar 2008 05:48:15 -0000 1.16 +++ namazu.spec 4 Jul 2008 08:28:21 -0000 1.17 @@ -4,11 +4,12 @@ Name: namazu Version: 2.0.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 -BuildPreReq: perl(File::MMagic) >= 1.12 +BuildRequires: perl(File::MMagic) >= 1.12 +BuildRequires: nkf kakasi mecab BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://www.namazu.org/stable/%{name}-%{version}.tar.gz @@ -160,6 +161,9 @@ %changelog +* Fri Jul 4 2008 Akira TAGOH - 2.0.18-2 +- Add nkf, kakasi and mecab to BR. (#449186) + * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Jul 4 08:31:42 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:31:42 GMT Subject: rpms/namazu/F-9 namazu.spec,1.17,1.18 Message-ID: <200807040831.m648VgL7015654@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15583 Modified Files: namazu.spec Log Message: * Fri Jul 4 2008 Akira TAGOH - 2.0.18-3 Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/F-9/namazu.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- namazu.spec 4 Jul 2008 08:28:21 -0000 1.17 +++ namazu.spec 4 Jul 2008 08:30:44 -0000 1.18 @@ -4,7 +4,7 @@ Name: namazu Version: 2.0.18 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 @@ -161,7 +161,7 @@ %changelog -* Fri Jul 4 2008 Akira TAGOH - 2.0.18-2 +* Fri Jul 4 2008 Akira TAGOH - 2.0.18-3 - Add nkf, kakasi and mecab to BR. (#449186) * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 From fedora-extras-commits at redhat.com Fri Jul 4 08:31:45 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:31:45 GMT Subject: rpms/namazu/devel namazu.spec,1.19,1.20 Message-ID: <200807040831.m648VjKE015659@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15596 Modified Files: namazu.spec Log Message: * Fri Jul 4 2008 Akira TAGOH - 2.0.18-3 Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- namazu.spec 4 Jul 2008 08:23:51 -0000 1.19 +++ namazu.spec 4 Jul 2008 08:30:51 -0000 1.20 @@ -4,7 +4,7 @@ Name: namazu Version: 2.0.18 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 @@ -161,7 +161,7 @@ %changelog -* Fri Jul 4 2008 Akira TAGOH - 2.0.18-2 +* Fri Jul 4 2008 Akira TAGOH - 2.0.18-3 - Add nkf, kakasi and mecab to BR. (#449186) * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 From fedora-extras-commits at redhat.com Fri Jul 4 08:34:43 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:34:43 GMT Subject: rpms/namazu/devel namazu.spec,1.20,1.21 Message-ID: <200807040834.m648Yhwn015815@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15786 Modified Files: namazu.spec Log Message: bump a release again to ensure the upgrade path Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- namazu.spec 4 Jul 2008 08:30:51 -0000 1.20 +++ namazu.spec 4 Jul 2008 08:33:57 -0000 1.21 @@ -4,7 +4,7 @@ Name: namazu Version: 2.0.18 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 @@ -161,7 +161,7 @@ %changelog -* Fri Jul 4 2008 Akira TAGOH - 2.0.18-3 +* Fri Jul 4 2008 Akira TAGOH - 2.0.18-4 - Add nkf, kakasi and mecab to BR. (#449186) * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 From fedora-extras-commits at redhat.com Fri Jul 4 08:35:59 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:35:59 GMT Subject: rpms/namazu/F-9 namazu.spec,1.18,1.19 Message-ID: <200807040835.m648Zx4K015922@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15829 Modified Files: namazu.spec Log Message: bump a release again to ensure the upgrade path Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/F-9/namazu.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- namazu.spec 4 Jul 2008 08:30:44 -0000 1.18 +++ namazu.spec 4 Jul 2008 08:35:12 -0000 1.19 @@ -4,7 +4,7 @@ Name: namazu Version: 2.0.18 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 @@ -161,7 +161,7 @@ %changelog -* Fri Jul 4 2008 Akira TAGOH - 2.0.18-3 +* Fri Jul 4 2008 Akira TAGOH - 2.0.18-4 - Add nkf, kakasi and mecab to BR. (#449186) * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 From fedora-extras-commits at redhat.com Fri Jul 4 08:38:41 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Fri, 4 Jul 2008 08:38:41 GMT Subject: rpms/namazu/F-8 namazu.spec,1.12,1.13 Message-ID: <200807040838.m648cf7U016130@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052 Modified Files: namazu.spec Log Message: * Fri Jul 4 2008 Akira TAGOH - 2.0.18-4 - Add nkf, kakasi and mecab to BR. (#449186) Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/F-8/namazu.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- namazu.spec 3 Apr 2008 13:29:08 -0000 1.12 +++ namazu.spec 4 Jul 2008 08:37:43 -0000 1.13 @@ -6,11 +6,12 @@ Name: namazu Version: 2.0.18 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl-NKF >= 1.70, perl-Text-Kakasi >= 1.00 -BuildPreReq: perl-File-MMagic >= 1.12 +BuildRequires: perl-File-MMagic >= 1.12 +BuildRequires: nkf kakasi mecab BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://www.namazu.org/stable/%{name}-%{version}.tar.gz @@ -147,6 +148,9 @@ %changelog +* Fri Jul 4 2008 Akira TAGOH - 2.0.18-4 +- Add nkf, kakasi and mecab to BR. (#449186) + * Thu Apr 3 2008 Akira TAGOH - 2.0.18-3 - Revert filter-requires-namazu.sh to use find-requires instead of perl.req. (#439178) From fedora-extras-commits at redhat.com Fri Jul 4 09:03:24 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 4 Jul 2008 09:03:24 GMT Subject: rpms/gtkimageview/devel .cvsignore, 1.3, 1.4 gtkimageview.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807040903.m6493O18025030@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gtkimageview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24970 Modified Files: .cvsignore gtkimageview.spec sources Log Message: version 1.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jan 2008 13:01:16 -0000 1.3 +++ .cvsignore 4 Jul 2008 09:02:36 -0000 1.4 @@ -1 +1 @@ -gtkimageview-1.5.0.tar.gz +gtkimageview-1.6.1.tar.gz Index: gtkimageview.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/devel/gtkimageview.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gtkimageview.spec 19 Feb 2008 16:25:20 -0000 1.3 +++ gtkimageview.spec 4 Jul 2008 09:02:36 -0000 1.4 @@ -1,6 +1,6 @@ Name: gtkimageview -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Simple image viewer widget Group: System Environment/Libraries @@ -70,6 +70,9 @@ %{_libdir}/pkgconfig/gtkimageview.pc %changelog +* Fri Jul 04 2008 Nils Philippsen - 1.6.1-1 +- version 1.6.1 + * Tue Feb 19 2008 Fedora Release Engineering - 1.5.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jan 2008 13:01:16 -0000 1.3 +++ sources 4 Jul 2008 09:02:36 -0000 1.4 @@ -1 +1 @@ -566a06dae9a390115f033a4df5cda5c7 gtkimageview-1.5.0.tar.gz +311ae45afc721186cbe346b38341fef7 gtkimageview-1.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 09:05:30 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Fri, 4 Jul 2008 09:05:30 GMT Subject: rpms/vnc/F-9 vnc-viewerIPv6.patch, NONE, 1.1 Makefile.am, 1.3, 1.4 vnc.spec, 1.191, 1.192 vnc-210617.patch, 1.1, NONE vnc-noxkb.patch, 1.1, NONE Message-ID: <200807040905.m6495UH8025284@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25135 Modified Files: Makefile.am vnc.spec Added Files: vnc-viewerIPv6.patch Removed Files: vnc-210617.patch vnc-noxkb.patch Log Message: - enabled XKEYBOARD extension (#450033) - improved IPv6 support in viewer (#438422) vnc-viewerIPv6.patch: --- NEW FILE vnc-viewerIPv6.patch --- diff -up vnc-4_1_2-unixsrc/common/network/Makefile.am.ipv6 vnc-4_1_2-unixsrc/common/network/Makefile.am --- vnc-4_1_2-unixsrc/common/network/Makefile.am.ipv6 2008-06-02 10:22:17.000000000 +0200 +++ vnc-4_1_2-unixsrc/common/network/Makefile.am 2008-06-02 10:52:56.000000000 +0200 @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libnetwork.la +libnetwork_la_CPPFLAGS = -DHAVE_GETADDRINFO + libnetwork_la_SOURCES = \ Socket.h \ TcpSocket.cxx \ diff -up vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.ipv6 vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx --- vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.ipv6 2008-06-02 10:22:17.000000000 +0200 +++ vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx 2008-06-02 10:49:04.000000000 +0200 @@ -109,50 +109,99 @@ TcpSocket::TcpSocket(int sock, bool clos TcpSocket::TcpSocket(const char *host, int port) : closeFd(true) { - int sock; +#define CAST_ADDR(x) (*((struct x *)&addr)) + int sock, err, family, result = -1; + size_t addrlen; + struct sockaddr_storage addr; +#ifdef HAVE_GETADDRINFO + struct addrinfo *ai, *current, hints; +#endif // - Create a socket initSockets(); - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) - throw SocketException("unable to create socket", errorNumber); -#ifndef WIN32 - // - By default, close the socket on exec() - fcntl(sock, F_SETFD, FD_CLOEXEC); -#endif +#ifdef HAVE_GETADDRINFO + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_canonname = NULL; + hints.ai_addr = NULL; + hints.ai_next = NULL; + + if ((result = getaddrinfo(host, NULL, &hints, &ai)) != 0) { + throw Exception("unable to resolve host by name: %s", + gai_strerror(result)); + } + + for (current = ai; current != NULL; current = current->ai_next) { + family = current->ai_family; + if (family != AF_INET && family != AF_INET6) + continue; + + addrlen = current->ai_addrlen; + memcpy(&addr, current->ai_addr, addrlen); + + if (family == AF_INET) + CAST_ADDR(sockaddr_in).sin_port = htons(port); + else + CAST_ADDR(sockaddr_in6).sin6_port = htons(port); - // - Connect it to something +#else + family = AF_INET; + addrlen = sizeof(struct sockaddr_in); - // Try processing the host as an IP address - struct sockaddr_in addr; - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr(host); - addr.sin_port = htons(port); - if ((int)addr.sin_addr.s_addr == -1) { - // Host was not an IP address - try resolving as DNS name - struct hostent *hostinfo; - hostinfo = gethostbyname(host); - if (hostinfo && hostinfo->h_addr) { - addr.sin_addr.s_addr = ((struct in_addr *)hostinfo->h_addr)->s_addr; - } else { - int e = errorNumber; - closesocket(sock); - throw SocketException("unable to resolve host by name", e); + // Try processing the host as an IP address + memset(&addr, 0, addrlen); + CAST_ADDR(sockaddr_in).sin_family = AF_INET; + CAST_ADDR(sockaddr_in).sin_addr.s_addr = inet_addr(host); + CAST_ADDR(sockaddr_in).sin_port = htons(port); + if ((int)CAST_ADDR(sockaddr_in).sin_addr.s_addr == -1) { + // Host was not an IP address - try resolving as DNS name + struct hostent *hostinfo; + hostinfo = gethostbyname(host); + if (hostinfo && hostinfo->h_addr) { + CAST_ADDR(sockaddr_in).sin_addr.s_addr = + ((struct in_addr *)hostinfo->h_addr)->s_addr; + } else { + err = errorNumber; + throw SocketException("unable to resolve host by name", err); + } + } +#endif + sock = socket (family, SOCK_STREAM, 0); + if (sock == -1) { + err = errorNumber; +#ifdef HAVE_GETADDRINFO + freeaddrinfo(ai); +#endif + throw SocketException("unable to create socket", err); } - } - // Attempt to connect to the remote host - for (;;) { - if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) { - int e = errorNumber; - if (e == EINTR) - continue; + // Attempt to connect to the remote host + while ((result = connect(sock, (struct sockaddr *)&addr, addrlen)) == -1) { + err = errorNumber; + if (err == EINTR) + continue; closesocket(sock); - throw SocketException("unable to connect to host", e); - } else break; + break; + } +#ifdef HAVE_GETADDRINFO + if (result == 0) + break; + else + continue; } + freeaddrinfo(ai); +#endif + if (result == -1) + throw SocketException("unable connect to socket", err); + +#ifndef WIN32 + // - By default, close the socket on exec() + fcntl(sock, F_SETFD, FD_CLOEXEC); +#endif + // Disable Nagle's algorithm, to reduce latency enableNagles(sock, false); diff -up vnc-4_1_2-unixsrc/common/rdr/Exception.cxx.ipv6 vnc-4_1_2-unixsrc/common/rdr/Exception.cxx --- vnc-4_1_2-unixsrc/common/rdr/Exception.cxx.ipv6 2008-06-02 10:23:35.000000000 +0200 +++ vnc-4_1_2-unixsrc/common/rdr/Exception.cxx 2008-06-02 10:28:51.000000000 +0200 @@ -22,8 +22,23 @@ #include #endif +#include + using namespace rdr; +Exception::Exception(const char *format, ...) { + va_list ap; + int result; + + va_start(ap, format); + result = vsnprintf(str_, len, format, ap); + va_end(ap); + + /* XXX - ensure that string ends correctly */ + if (result > len) + str_[len - 1] = '\0'; +} + SystemException::SystemException(const char* s, int err_) : Exception(s), err(err_) { diff -up vnc-4_1_2-unixsrc/common/rdr/Exception.h.ipv6 vnc-4_1_2-unixsrc/common/rdr/Exception.h --- vnc-4_1_2-unixsrc/common/rdr/Exception.h.ipv6 2008-06-02 10:23:05.000000000 +0200 +++ vnc-4_1_2-unixsrc/common/rdr/Exception.h 2008-06-02 10:28:41.000000000 +0200 @@ -27,13 +27,7 @@ namespace rdr { struct Exception { enum { len = 256 }; char str_[len]; - Exception(const char* s=0) { - str_[0] = 0; - if (s) - strncat(str_, s, len-1); - else - strcat(str_, "Exception"); - } + Exception(const char *format, ...); virtual const char* str() const { return str_; } }; Index: Makefile.am =================================================================== RCS file: /cvs/pkgs/rpms/vnc/F-9/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 9 Apr 2008 09:56:29 -0000 1.3 +++ Makefile.am 4 Jul 2008 09:04:45 -0000 1.4 @@ -28,6 +28,8 @@ Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(RFB_LIBS) \ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 +Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) + libvnc_la_LTLIBRARIES = libvnc.la libvnc_ladir = $(moduledir)/extensions Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/F-9/vnc.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- vnc.spec 25 Apr 2008 10:46:43 -0000 1.191 +++ vnc.spec 4 Jul 2008 09:04:45 -0000 1.192 @@ -3,7 +3,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 30%{?dist} +Release: 31%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -25,7 +25,6 @@ Patch16: vnc-64bit.patch Patch17: vnc-select.patch Patch21: vnc-newfbsize.patch -Patch23: vnc-210617.patch Patch24: vnc-102434.patch Patch25: vnc-config.patch Patch28: vnc-render.patch @@ -39,7 +38,6 @@ Patch41: vnc-privates.patch Patch42: vnc-mieq.patch Patch43: vnc-allocate.patch -Patch44: vnc-noxkb.patch Patch45: vnc-paint.patch Patch46: vnc-selections.patch Patch48: vnc-manminor.patch @@ -47,6 +45,7 @@ Patch50: vnc-scrollbars.patch Patch51: vnc-bounds.patch Patch52: vnc-includes.patch +Patch53: vnc-viewerIPv6.patch License: GPLv2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -62,7 +61,7 @@ BuildRequires: libXt-devel, libXv-devel, pixman-devel BuildRequires: libselinux-devel BuildRequires: xorg-x11-server-source -BuildRequires: mesa-libGL-devel >= 6.5.2, mesa-source >= 6.5.2, libdrm-devel +BuildRequires: mesa-libGL-devel >= 6.5.2, libdrm-devel Requires: gtk2 >= 2.6 Requires: coreutils @@ -115,7 +114,6 @@ %patch16 -p1 -b .64bit %patch17 -p1 -b .select %patch21 -p1 -b .newfbsize -%patch23 -p1 -b .ipv6 %patch24 -p1 -b .102434 %patch25 -p1 -b .config %patch28 -p1 -b .render @@ -136,7 +134,6 @@ popd %patch42 -p1 -b .mieq %patch43 -p1 -b .alloc -%patch44 -p1 -b .noxkb %patch45 -p1 -b .paint %patch46 -p1 -b .selections %patch48 -p1 -b .minor @@ -144,6 +141,7 @@ %patch50 -p1 -b .scrollbars %patch51 -p1 -b .bounds %patch52 -p1 -b .includes +%patch53 -p1 -b .ipv6 %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" @@ -184,8 +182,7 @@ --disable-dri \ --enable-glx \ --disable-config-dbus \ - --disable-config-hal \ - --with-mesa-source=%{_datadir}/mesa/source + --disable-config-hal make %{?_smp_mflags} popd @@ -334,6 +331,10 @@ %{_libdir}/librfb.so.* %changelog +* Mon Jun 30 2008 Adam Tkac 4.1.2-31 +- enabled XKEYBOARD extension (#450033) +- improved IPv6 support in viewer (#438422) + * Fri Apr 25 2008 Adam Tkac 4.1.2-30 - rebuild against new mesa to fix GLX under anaconda (#443635) --- vnc-210617.patch DELETED --- --- vnc-noxkb.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 4 09:07:46 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Fri, 4 Jul 2008 09:07:46 GMT Subject: rpms/vnc/devel Makefile.am,1.3,1.4 vnc.spec,1.196,1.197 Message-ID: <200807040907.m6497kS6025571@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25378 Modified Files: Makefile.am vnc.spec Log Message: - pass -rdynamic in same way as xserver Index: Makefile.am =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 9 Apr 2008 09:56:29 -0000 1.3 +++ Makefile.am 4 Jul 2008 09:06:35 -0000 1.4 @@ -28,6 +28,8 @@ Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(RFB_LIBS) \ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 +Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) + libvnc_la_LTLIBRARIES = libvnc.la libvnc_ladir = $(moduledir)/extensions Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- vnc.spec 3 Jul 2008 16:09:26 -0000 1.196 +++ vnc.spec 4 Jul 2008 09:06:35 -0000 1.197 @@ -145,8 +145,8 @@ %patch53 -p1 -b .ipv6 %build -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0 -rdynamic" -export CXXFLAGS="$CFLAGS -rdynamic" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0" +export CXXFLAGS="$CFLAGS" pushd common autoreconf -fiv From fedora-extras-commits at redhat.com Fri Jul 4 09:12:04 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Fri, 4 Jul 2008 09:12:04 GMT Subject: rpms/dblatex/devel dblatex.spec,1.5,1.6 Message-ID: <200807040912.m649C4A3025959@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/dblatex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762 Modified Files: dblatex.spec Log Message: BR: texlive-xetex -> tex(xetex) for F-10 and later Index: dblatex.spec =================================================================== RCS file: /cvs/extras/rpms/dblatex/devel/dblatex.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dblatex.spec 13 Jun 2008 05:52:03 -0000 1.5 +++ dblatex.spec 4 Jul 2008 09:10:38 -0000 1.6 @@ -2,7 +2,7 @@ Name: dblatex Version: 0.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DocBook to LaTeX/ConTeXt Publishing BuildArch: noarch Group: Applications/Publishing @@ -23,8 +23,13 @@ BuildRequires: tetex-latex %else BuildRequires: tex(latex) +%endif +%if 0%{?fedora} < 10 BuildRequires: texlive-xetex Requires: texlive-xetex +%else +BuildRequires: tex(xetex) +Requires: tex(xetex) %endif Requires: libxslt docbook-dtds passivetex ImageMagick transfig @@ -107,6 +112,9 @@ %postun -p /usr/bin/texhash %changelog +* Fri Jul 4 2008 Alex Lancaster - 0.2.9-2 +- BR: texlive-xetex -> tex(xetex) for F-10 and later + * Thu Jun 12 2008 Alex Lancaster - 0.2.9-1 - Update to latest upstream (0.2.9) (#448953) - Remove some redundant Requires and BuildRequires (passivetex pulls From fedora-extras-commits at redhat.com Fri Jul 4 09:29:12 2008 From: fedora-extras-commits at redhat.com (Guillaume Desmottes (gdesmott)) Date: Fri, 4 Jul 2008 09:29:12 GMT Subject: rpms/telepathy-salut/OLPC-3 telepathy-salut.spec,1.20,1.21 Message-ID: <200807040929.m649TCIH027955@cvs-int.fedora.redhat.com> Author: gdesmott Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27844 Modified Files: telepathy-salut.spec Log Message: Add build dep on avahi-gobject-devel Index: telepathy-salut.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- telepathy-salut.spec 3 Jul 2008 15:52:04 -0000 1.20 +++ telepathy-salut.spec 4 Jul 2008 09:28:07 -0000 1.21 @@ -1,6 +1,6 @@ Name: telepathy-salut Version: 0.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Link-local XMPP telepathy connection manager Group: Applications/Communications @@ -14,6 +14,7 @@ BuildRequires: dbus-devel >= 1.1.0 BuildRequires: dbus-glib-devel >= 0.61 BuildRequires: avahi-glib-devel +BuildRequires: avahi-gobject-devel BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: cyrus-sasl-devel @@ -60,6 +61,9 @@ %{_mandir}/man8/%{name}.8.gz %changelog +* Thu Jul 4 2008 Guillaume Desmottes - 0.3.3-2 +- Add build dep on avahi-gobject-devel + * Thu Jul 3 2008 Guillaume Desmottes - 0.3.3-1 - Update to 0.3.3. From fedora-extras-commits at redhat.com Fri Jul 4 09:37:58 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Fri, 4 Jul 2008 09:37:58 GMT Subject: rpms/sugar-journal/F-9 sugar-journal-checkout.sh, 1.1, 1.2 sugar-journal.spec, 1.1, 1.2 Message-ID: <200807040937.m649bwmJ028485@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-journal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28448 Modified Files: sugar-journal-checkout.sh sugar-journal.spec Log Message: * Thu Jul 03 2008 Tomeu Vizoso - 93-1 - New release Index: sugar-journal-checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sugar-journal-checkout.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sugar-journal-checkout.sh 28 Apr 2008 17:02:26 -0000 1.1 +++ sugar-journal-checkout.sh 4 Jul 2008 09:37:03 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=79 +VERSION=93 NAME=journal-activity rm -rf $NAME-$VERSION Index: sugar-journal.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sugar-journal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sugar-journal.spec 28 Apr 2008 17:02:26 -0000 1.1 +++ sugar-journal.spec 4 Jul 2008 09:37:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: sugar-journal -Version: 79 -Release: 3%{?dist} +Version: 93 +Release: 1%{?dist} Summary: Journal for Sugar Group: Sugar/Activities @@ -30,6 +30,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir} +python setup.py build python setup.py install $RPM_BUILD_ROOT%{sugaractivitydir} chmod +x $RPM_BUILD_ROOT%{sugaractivitydir}/Journal.activity/setup.py @@ -44,8 +45,9 @@ %{sugaractivitydir}/Journal.activity/activity/ %{sugaractivitydir}/Journal.activity/*.py* %{sugaractivitydir}/Journal.activity/icons/ -%{sugaractivitydir}/Journal.activity/po/ +#%{sugaractivitydir}/Journal.activity/po/ %dir %{sugaractivitydir}/Journal.activity/locale/ +%lang(af) %{sugaractivitydir}/Journal.activity/locale/af/ %lang(am) %{sugaractivitydir}/Journal.activity/locale/am/ %lang(ar) %{sugaractivitydir}/Journal.activity/locale/ar/ %lang(ay) %{sugaractivitydir}/Journal.activity/locale/ay/ @@ -75,9 +77,12 @@ %lang(ml) %{sugaractivitydir}/Journal.activity/locale/ml/ %lang(mn) %{sugaractivitydir}/Journal.activity/locale/mn/ %lang(mr) %{sugaractivitydir}/Journal.activity/locale/mr/ +%lang(mvo) %{sugaractivitydir}/Journal.activity/locale/mvo/ %lang(ne) %{sugaractivitydir}/Journal.activity/locale/ne/ %lang(nl) %{sugaractivitydir}/Journal.activity/locale/nl/ %lang(pa) %{sugaractivitydir}/Journal.activity/locale/pa/ +%lang(pap) %{sugaractivitydir}/Journal.activity/locale/pap/ +%lang(pis) %{sugaractivitydir}/Journal.activity/locale/pis/ %lang(pl) %{sugaractivitydir}/Journal.activity/locale/pl/ %lang(ps) %{sugaractivitydir}/Journal.activity/locale/ps/ %lang(pt) %{sugaractivitydir}/Journal.activity/locale/pt/ @@ -86,9 +91,11 @@ %lang(ro) %{sugaractivitydir}/Journal.activity/locale/ro/ %lang(ru) %{sugaractivitydir}/Journal.activity/locale/ru/ %lang(rw) %{sugaractivitydir}/Journal.activity/locale/rw/ +%lang(sd) %{sugaractivitydir}/Journal.activity/locale/sd/ %lang(si) %{sugaractivitydir}/Journal.activity/locale/si/ %lang(te) %{sugaractivitydir}/Journal.activity/locale/te/ %lang(th) %{sugaractivitydir}/Journal.activity/locale/th/ +%lang(tpi) %{sugaractivitydir}/Journal.activity/locale/tpi/ %lang(tr) %{sugaractivitydir}/Journal.activity/locale/tr/ %lang(ur) %{sugaractivitydir}/Journal.activity/locale/ur/ %lang(vi) %{sugaractivitydir}/Journal.activity/locale/vi/ @@ -97,6 +104,9 @@ %lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/ %changelog +* Thu Jul 03 2008 Tomeu Vizoso - 93-1 +- New release + * Mon Apr 28 2008 Dennis Gilmore - 79-3 - BR git-core gettext From fedora-extras-commits at redhat.com Fri Jul 4 09:40:29 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 4 Jul 2008 09:40:29 GMT Subject: rpms/bluez-utils/F-8 bluez-utils.spec,1.89,1.90 Message-ID: <200807040940.m649eTtI028668@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28573 Modified Files: bluez-utils.spec Log Message: * Fri Jul 04 2008 - Bastien Nocera - 3.35-2 - Re-add hidd Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-8/bluez-utils.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- bluez-utils.spec 3 Jul 2008 16:02:51 -0000 1.89 +++ bluez-utils.spec 4 Jul 2008 09:39:42 -0000 1.90 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.35 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -80,7 +80,7 @@ --enable-all --disable-bcm203x --enable-alsa --enable-bccmd \ --enable-avctrl --enable-glib --enable-input --enable-echo \ --enable-serial --disable-sdpd --enable-audio --disable-sync \ - --disable-obex --enable-cups --enable-pcmciarules + --disable-obex --enable-cups --enable-pcmciarules --enable-hidd make %install @@ -154,6 +154,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Fri Jul 04 2008 - Bastien Nocera - 3.35-2 +- Re-add hidd + * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 From fedora-extras-commits at redhat.com Fri Jul 4 09:43:00 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Fri, 4 Jul 2008 09:43:00 GMT Subject: rpms/sugar-journal/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sugar-journal.spec, 1.2, 1.3 Message-ID: <200807040943.m649h0En028878@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-journal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28805 Modified Files: .cvsignore sources sugar-journal.spec Log Message: * Thu Jul 04 2008 Tomeu Vizoso - 93-2 - Upload new tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Apr 2008 17:02:26 -0000 1.2 +++ .cvsignore 4 Jul 2008 09:42:07 -0000 1.3 @@ -1 +1 @@ -journal-activity-79.tar.bz2 +journal-activity-93.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Apr 2008 17:02:26 -0000 1.2 +++ sources 4 Jul 2008 09:42:07 -0000 1.3 @@ -1 +1 @@ -e0bdcc584937a4f143b35324abe2140c journal-activity-79.tar.bz2 +098a3df185f6d7f38ad3346a52de25e3 journal-activity-93.tar.bz2 Index: sugar-journal.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sugar-journal.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sugar-journal.spec 4 Jul 2008 09:37:03 -0000 1.2 +++ sugar-journal.spec 4 Jul 2008 09:42:07 -0000 1.3 @@ -1,6 +1,6 @@ Name: sugar-journal Version: 93 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Journal for Sugar Group: Sugar/Activities @@ -104,6 +104,9 @@ %lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/ %changelog +* Thu Jul 04 2008 Tomeu Vizoso - 93-2 +- Upload new tarball + * Thu Jul 03 2008 Tomeu Vizoso - 93-1 - New release From fedora-extras-commits at redhat.com Fri Jul 4 09:43:43 2008 From: fedora-extras-commits at redhat.com (Guillaume Desmottes (gdesmott)) Date: Fri, 4 Jul 2008 09:43:43 GMT Subject: rpms/telepathy-salut/OLPC-3 telepathy-salut.spec,1.21,1.22 Message-ID: <200807040943.m649hhE7028954@cvs-int.fedora.redhat.com> Author: gdesmott Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28865 Modified Files: telepathy-salut.spec Log Message: Package new documentation Index: telepathy-salut.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- telepathy-salut.spec 4 Jul 2008 09:28:07 -0000 1.21 +++ telepathy-salut.spec 4 Jul 2008 09:42:43 -0000 1.22 @@ -1,6 +1,6 @@ Name: telepathy-salut Version: 0.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Link-local XMPP telepathy connection manager Group: Applications/Communications @@ -55,12 +55,16 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS +%doc docs/*.html %{_libexecdir}/%{name} %{_datadir}/dbus-1/services/*.service %{_datadir}/telepathy/managers/*.manager %{_mandir}/man8/%{name}.8.gz %changelog +* Thu Jul 4 2008 Guillaume Desmottes - 0.3.3-3 +- Package new documentation. + * Thu Jul 4 2008 Guillaume Desmottes - 0.3.3-2 - Add build dep on avahi-gobject-devel From fedora-extras-commits at redhat.com Fri Jul 4 09:59:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 09:59:24 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807040959.m649xOfR019527@bastion.fedora.phx.redhat.com> Package star in Fedora 7 was orphaned by Peter Vrabec (pvrabec) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 09:59:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 09:59:37 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807040959.m649xbsZ019549@bastion.fedora.phx.redhat.com> Package star in Fedora devel was orphaned by Peter Vrabec (pvrabec) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 09:59:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 09:59:41 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807040959.m649xfFE019570@bastion.fedora.phx.redhat.com> Package star in Fedora 8 was orphaned by Peter Vrabec (pvrabec) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 09:59:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 09:59:45 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807040959.m649xOfU019527@bastion.fedora.phx.redhat.com> Package star in Fedora 9 was orphaned by Peter Vrabec (pvrabec) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 09:59:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 09:59:57 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807040959.m649xvK4019620@bastion.fedora.phx.redhat.com> Package star in Fedora 7 is now owned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 10:00:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 10:00:01 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807041000.m649xvK7019620@bastion.fedora.phx.redhat.com> Package star in Fedora devel is now owned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 10:00:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 10:00:25 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807041000.m649xbsc019549@bastion.fedora.phx.redhat.com> Package star in Fedora 8 is now owned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 10:00:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 10:00:28 +0000 Subject: [pkgdb] star ownership updated Message-ID: <200807041000.m649xvKA019620@bastion.fedora.phx.redhat.com> Package star in Fedora 9 is now owned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/star From fedora-extras-commits at redhat.com Fri Jul 4 10:00:36 2008 From: fedora-extras-commits at redhat.com (Guillaume Desmottes (gdesmott)) Date: Fri, 4 Jul 2008 10:00:36 GMT Subject: rpms/telepathy-salut/OLPC-3 telepathy-salut.spec,1.22,1.23 Message-ID: <200807041000.m64A0aTw029768@cvs-int.fedora.redhat.com> Author: gdesmott Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29693 Modified Files: telepathy-salut.spec Log Message: Hopefully fix html documentation installation Index: telepathy-salut.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- telepathy-salut.spec 4 Jul 2008 09:42:43 -0000 1.22 +++ telepathy-salut.spec 4 Jul 2008 09:59:29 -0000 1.23 @@ -1,6 +1,6 @@ Name: telepathy-salut Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Link-local XMPP telepathy connection manager Group: Applications/Communications @@ -47,6 +47,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/*.html %clean rm -rf $RPM_BUILD_ROOT @@ -62,6 +63,9 @@ %{_mandir}/man8/%{name}.8.gz %changelog +* Thu Jul 4 2008 Guillaume Desmottes - 0.3.3-4 +- Hopefully fix html documentation installation + * Thu Jul 4 2008 Guillaume Desmottes - 0.3.3-3 - Package new documentation. From fedora-extras-commits at redhat.com Fri Jul 4 10:10:32 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 4 Jul 2008 10:10:32 GMT Subject: rpms/bluez-utils/F-9 bluez-utils.spec,1.102,1.103 Message-ID: <200807041010.m64AAWWi004232@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185 Modified Files: bluez-utils.spec Log Message: * Fri Jul 04 2008 - Bastien Nocera - 3.35-2 - Re-enable hidd Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluez-utils.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- bluez-utils.spec 3 Jul 2008 16:00:54 -0000 1.102 +++ bluez-utils.spec 4 Jul 2008 10:09:46 -0000 1.103 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.35 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -80,7 +80,8 @@ --enable-all --disable-bcm203x --enable-alsa --enable-bccmd \ --enable-avctrl --enable-glib --enable-input --enable-echo \ --enable-serial --disable-sdpd --enable-audio --disable-sync \ - --disable-obex --enable-network --enable-cups --enable-pcmciarules + --disable-obex --enable-network --enable-cups --enable-pcmciarules \ + --enable-hidd make %install @@ -157,6 +158,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Fri Jul 04 2008 - Bastien Nocera - 3.35-2 +- Re-enable hidd + * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 From fedora-extras-commits at redhat.com Fri Jul 4 10:12:04 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 4 Jul 2008 10:12:04 GMT Subject: rpms/ufraw/devel ufraw.spec,1.32,1.33 Message-ID: <200807041012.m64AC4wo004342@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/ufraw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309 Modified Files: ufraw.spec Log Message: rebuild with gtkimageview-1.6.1 Index: ufraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ufraw.spec 25 Jun 2008 13:16:18 -0000 1.32 +++ ufraw.spec 4 Jul 2008 10:11:15 -0000 1.33 @@ -30,7 +30,7 @@ Summary: Raw image data retrieval tool for digital cameras Name: ufraw Version: 0.13 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/Multimedia License: GPLv2 URL: http://ufraw.sourceforge.net @@ -42,7 +42,7 @@ BuildRequires: cinepaint >= 0.22 %endif BuildRequires: gtk2-devel >= 2.6.0 -BuildRequires: gtkimageview-devel +BuildRequires: gtkimageview-devel >= 1.6.1 BuildRequires: lcms-devel BuildRequires: libexif-devel >= 0.6.13 BuildRequires: exiv2-devel >= 0.11 @@ -69,6 +69,7 @@ Requires(postun): shared-mime-info >= 0.21 %endif %endif +Requires: gtkimageview >= 1.6.1 #BuildRequires: automake libtool @@ -201,6 +202,9 @@ %{cinepaintplugindir}/ufraw-cinepaint %changelog +* Fri Jul 04 2008 Nils Philippsen - 0.13-6 +- rebuild with gtkimageview-1.6.1 + * Wed Jun 25 2008 Rex Dieter - 0.13-5 - respin for exiv2 From fedora-extras-commits at redhat.com Fri Jul 4 10:12:51 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 4 Jul 2008 10:12:51 GMT Subject: rpms/bluez-utils/devel bluez-utils.spec,1.108,1.109 Message-ID: <200807041012.m64ACpmc004442@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4335 Modified Files: bluez-utils.spec Log Message: * Fri Jul 04 2008 - Bastien Nocera - 3.35-2 - Re-add hidd Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- bluez-utils.spec 3 Jul 2008 15:56:21 -0000 1.108 +++ bluez-utils.spec 4 Jul 2008 10:12:05 -0000 1.109 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.35 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -81,7 +81,8 @@ --enable-all --disable-bcm203x --enable-alsa --enable-bccmd \ --enable-avctrl --enable-glib --enable-input --enable-echo \ --enable-serial --disable-sdpd --enable-audio --disable-sync \ - --disable-obex --enable-network --enable-cups --enable-pcmciarules + --disable-obex --enable-network --enable-cups --enable-pcmciarules \ + --enable-hidd make %install @@ -162,6 +163,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Fri Jul 04 2008 - Bastien Nocera - 3.35-2 +- Re-add hidd + * Thu Jul 03 2008 - Bastien Nocera - 3.35-1 - Update to 3.35 From fedora-extras-commits at redhat.com Fri Jul 4 10:15:01 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 4 Jul 2008 10:15:01 GMT Subject: rpms/gtkimageview/F-9 .cvsignore, 1.3, 1.4 gtkimageview.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807041015.m64AF1Ke004597@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gtkimageview/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4527 Modified Files: .cvsignore gtkimageview.spec sources Log Message: version 1.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jan 2008 13:01:16 -0000 1.3 +++ .cvsignore 4 Jul 2008 10:14:17 -0000 1.4 @@ -1 +1 @@ -gtkimageview-1.5.0.tar.gz +gtkimageview-1.6.1.tar.gz Index: gtkimageview.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/F-9/gtkimageview.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gtkimageview.spec 19 Feb 2008 16:25:20 -0000 1.3 +++ gtkimageview.spec 4 Jul 2008 10:14:17 -0000 1.4 @@ -1,6 +1,6 @@ Name: gtkimageview -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Simple image viewer widget Group: System Environment/Libraries @@ -70,6 +70,9 @@ %{_libdir}/pkgconfig/gtkimageview.pc %changelog +* Fri Jul 04 2008 Nils Philippsen - 1.6.1-1 +- version 1.6.1 + * Tue Feb 19 2008 Fedora Release Engineering - 1.5.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jan 2008 13:01:16 -0000 1.3 +++ sources 4 Jul 2008 10:14:17 -0000 1.4 @@ -1 +1 @@ -566a06dae9a390115f033a4df5cda5c7 gtkimageview-1.5.0.tar.gz +311ae45afc721186cbe346b38341fef7 gtkimageview-1.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 10:15:27 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 4 Jul 2008 10:15:27 GMT Subject: rpms/gtkimageview/F-8 .cvsignore, 1.3, 1.4 gtkimageview.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807041015.m64AFRZq004660@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gtkimageview/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4567 Modified Files: .cvsignore gtkimageview.spec sources Log Message: version 1.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jan 2008 13:01:45 -0000 1.3 +++ .cvsignore 4 Jul 2008 10:14:40 -0000 1.4 @@ -1 +1 @@ -gtkimageview-1.5.0.tar.gz +gtkimageview-1.6.1.tar.gz Index: gtkimageview.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/F-8/gtkimageview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gtkimageview.spec 2 Jan 2008 13:01:45 -0000 1.2 +++ gtkimageview.spec 4 Jul 2008 10:14:40 -0000 1.3 @@ -1,5 +1,5 @@ Name: gtkimageview -Version: 1.5.0 +Version: 1.6.1 Release: 1%{?dist} Summary: Simple image viewer widget @@ -70,6 +70,12 @@ %{_libdir}/pkgconfig/gtkimageview.pc %changelog +* Fri Jul 04 2008 Nils Philippsen - 1.6.1-1 +- version 1.6.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.5.0-2 +- Autorebuild for GCC 4.3 + * Wed Jan 02 2008 Nils Philippsen - 1.5.0-1 - version 1.5.0 - initial build Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jan 2008 13:01:45 -0000 1.3 +++ sources 4 Jul 2008 10:14:40 -0000 1.4 @@ -1 +1 @@ -566a06dae9a390115f033a4df5cda5c7 gtkimageview-1.5.0.tar.gz +311ae45afc721186cbe346b38341fef7 gtkimageview-1.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 10:19:26 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Fri, 4 Jul 2008 10:19:26 GMT Subject: rpms/banshee/devel banshee.spec,1.53,1.54 Message-ID: <200807041019.m64AJQjV004887@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4838 Modified Files: banshee.spec Log Message: Bump for gnome-sharp Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- banshee.spec 8 Jun 2008 13:30:00 -0000 1.53 +++ banshee.spec 4 Jul 2008 10:18:28 -0000 1.54 @@ -2,7 +2,7 @@ Name: banshee Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT @@ -126,6 +126,9 @@ %{_libdir}/pkgconfig/banshee-1-*.pc %changelog +* Fri Jul 4 2008 Nigel Jones - 1.0.0-2 +- Bump for new gnome-sharp + * Fri Jun 6 2008 Nigel Jones - 1.0.0-1 - Banshee goes GOLD! From fedora-extras-commits at redhat.com Fri Jul 4 10:47:29 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 4 Jul 2008 10:47:29 GMT Subject: rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.10,1.11 Message-ID: <200807041047.m64AlTnv006927@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6865 Modified Files: ocaml-bitmatch.spec Log Message: * Fri Jul 4 2008 Richard W.M. Jones - 1.9.2-5 - Don't build CIL tools unless we have CIL. Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ocaml-bitmatch.spec 1 Jul 2008 14:47:45 -0000 1.10 +++ ocaml-bitmatch.spec 4 Jul 2008 10:46:41 -0000 1.11 @@ -3,19 +3,15 @@ # Don't have CIL on ppc & ppc64 so we cannot build the C tools. # See: bz#435546 bz#435545 -%ifarch ppc -%define build_cil_tools 0 -%else -%ifarch ppc64 +%ifarch ppc ppc64 %define build_cil_tools 0 %else %define build_cil_tools 1 %endif -%endif Name: ocaml-bitmatch Version: 1.9.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -82,9 +78,11 @@ make doc make examples +%if %build_cil_tools %if %opt strip cil-tools/bitmatch-import-c.opt %endif +%endif %check @@ -150,7 +148,7 @@ %changelog -* Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-4 +* Fri Jul 4 2008 Richard W.M. Jones - 1.9.2-5 - Don't build CIL tools unless we have CIL. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 From fedora-extras-commits at redhat.com Fri Jul 4 11:08:03 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 4 Jul 2008 11:08:03 GMT Subject: rpms/ocaml-bitmatch/devel import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 ocaml-bitmatch.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200807041108.m64B830o014287@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14241/devel Modified Files: .cvsignore ocaml-bitmatch.spec sources Added Files: import.log Log Message: * Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-1 - New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. --- NEW FILE import.log --- ocaml-bitmatch-1_9_3-1_fc10:HEAD:ocaml-bitmatch-1.9.3-1.fc10.src.rpm:1215169603 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Jul 2008 14:26:35 -0000 1.8 +++ .cvsignore 4 Jul 2008 11:07:08 -0000 1.9 @@ -1,2 +1 @@ -ocaml-bitmatch-1.3.tar.gz -ocaml-bitmatch-1.9.2.tar.gz +ocaml-bitmatch-1.9.3.tar.gz Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ocaml-bitmatch.spec 4 Jul 2008 10:46:41 -0000 1.11 +++ ocaml-bitmatch.spec 4 Jul 2008 11:07:08 -0000 1.12 @@ -10,8 +10,8 @@ %endif Name: ocaml-bitmatch -Version: 1.9.2 -Release: 5%{?dist} +Version: 1.9.3 +Release: 1%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -148,7 +148,8 @@ %changelog -* Fri Jul 4 2008 Richard W.M. Jones - 1.9.2-5 +* Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-1 +- New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Jul 2008 14:26:35 -0000 1.8 +++ sources 4 Jul 2008 11:07:08 -0000 1.9 @@ -1,2 +1 @@ -ac577325e7577fe9fe981e54f1747a94 ocaml-bitmatch-1.3.tar.gz -eda0df7009779eea3ec86f2bfffa696b ocaml-bitmatch-1.9.2.tar.gz +b83474451aaed99e7bf18e72a7042f6d ocaml-bitmatch-1.9.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 11:19:26 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 4 Jul 2008 11:19:26 GMT Subject: rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.12,1.13 Message-ID: <200807041119.m64BJQGs014898@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844 Modified Files: ocaml-bitmatch.spec Log Message: * Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-2 - New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ocaml-bitmatch.spec 4 Jul 2008 11:07:08 -0000 1.12 +++ ocaml-bitmatch.spec 4 Jul 2008 11:18:34 -0000 1.13 @@ -11,7 +11,7 @@ Name: ocaml-bitmatch Version: 1.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -124,7 +124,9 @@ %exclude %{_libdir}/ocaml/bitmatch/*.cmx %endif %exclude %{_libdir}/ocaml/bitmatch/*.mli +%if %build_cil_tools %exclude %{_libdir}/ocaml/bitmatch/*.h +%endif %files devel @@ -148,7 +150,7 @@ %changelog -* Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-1 +* Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-2 - New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. From fedora-extras-commits at redhat.com Fri Jul 4 11:21:20 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Fri, 4 Jul 2008 11:21:20 GMT Subject: rpms/gbrainy/devel gbrainy.spec,1.2,1.3 Message-ID: <200807041121.m64BLKIc015128@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/gbrainy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14973 Modified Files: gbrainy.spec Log Message: Rebuild for new gnome-sharp Index: gbrainy.spec =================================================================== RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gbrainy.spec 3 Jun 2008 20:14:43 -0000 1.2 +++ gbrainy.spec 4 Jul 2008 11:20:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: gbrainy Version: 0.70 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gbrainy is a brain teaser game and trainer to keep your brain trained Group: Amusements/Games @@ -73,6 +73,9 @@ %{_datadir}/pixmaps/%{name}* %changelog +* Fri Jul 04 2008 Beno??t Marcelin 0.70-2 +- Rebuild for new gnome-sharp + * Tue Jun 03 2008 Beno??t Marcelin 0.70-1 - Update to 0.70 - 8 new puzzles From fedora-extras-commits at redhat.com Fri Jul 4 12:17:36 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 4 Jul 2008 12:17:36 GMT Subject: rpms/ufraw/F-8 ufraw.spec,1.29,1.30 Message-ID: <200807041217.m64CHaKA025230@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/ufraw/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25158 Modified Files: ufraw.spec Log Message: rebuild with gtkimageview-1.6.1 Index: ufraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/ufraw/F-8/ufraw.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ufraw.spec 2 Jan 2008 13:44:12 -0000 1.29 +++ ufraw.spec 4 Jul 2008 12:16:43 -0000 1.30 @@ -30,7 +30,7 @@ Summary: Raw image data retrieval tool for digital cameras Name: ufraw Version: 0.13 -Release: 3%{?dist} +Release: 6%{?dist} Group: Applications/Multimedia License: GPLv2 URL: http://ufraw.sourceforge.net @@ -42,7 +42,7 @@ BuildRequires: cinepaint >= 0.22 %endif BuildRequires: gtk2-devel >= 2.6.0 -BuildRequires: gtkimageview-devel +BuildRequires: gtkimageview-devel >= 1.6.1 BuildRequires: lcms-devel BuildRequires: libexif-devel >= 0.6.13 BuildRequires: exiv2-devel >= 0.11 @@ -69,6 +69,7 @@ Requires(postun): shared-mime-info >= 0.21 %endif %endif +Requires: gtkimageview >= 1.6.1 #BuildRequires: automake libtool @@ -201,6 +202,15 @@ %{cinepaintplugindir}/ufraw-cinepaint %changelog +* Fri Jul 04 2008 Nils Philippsen - 0.13-6 +- rebuild with gtkimageview-1.6.1 + +* Wed Jun 25 2008 Rex Dieter - 0.13-5 +- respin for exiv2 + +* Tue Feb 19 2008 Fedora Release Engineering - 0.13-4 +- Autorebuild for GCC 4.3 + * Wed Jan 02 2008 Nils Philippsen - 0.13-3 - build against gtkimageview, drop scrollable-preview patch (#427028) From fedora-extras-commits at redhat.com Fri Jul 4 12:17:37 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 4 Jul 2008 12:17:37 GMT Subject: rpms/ufraw/F-9 ufraw.spec,1.31,1.32 Message-ID: <200807041217.m64CHbX9025233@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/ufraw/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25152 Modified Files: ufraw.spec Log Message: rebuild with gtkimageview-1.6.1 Index: ufraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/ufraw/F-9/ufraw.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ufraw.spec 19 Feb 2008 16:28:24 -0000 1.31 +++ ufraw.spec 4 Jul 2008 12:16:37 -0000 1.32 @@ -30,7 +30,7 @@ Summary: Raw image data retrieval tool for digital cameras Name: ufraw Version: 0.13 -Release: 4%{?dist} +Release: 6%{?dist} Group: Applications/Multimedia License: GPLv2 URL: http://ufraw.sourceforge.net @@ -42,7 +42,7 @@ BuildRequires: cinepaint >= 0.22 %endif BuildRequires: gtk2-devel >= 2.6.0 -BuildRequires: gtkimageview-devel +BuildRequires: gtkimageview-devel >= 1.6.1 BuildRequires: lcms-devel BuildRequires: libexif-devel >= 0.6.13 BuildRequires: exiv2-devel >= 0.11 @@ -69,6 +69,7 @@ Requires(postun): shared-mime-info >= 0.21 %endif %endif +Requires: gtkimageview >= 1.6.1 #BuildRequires: automake libtool @@ -201,6 +202,12 @@ %{cinepaintplugindir}/ufraw-cinepaint %changelog +* Fri Jul 04 2008 Nils Philippsen - 0.13-6 +- rebuild with gtkimageview-1.6.1 + +* Wed Jun 25 2008 Rex Dieter - 0.13-5 +- respin for exiv2 + * Tue Feb 19 2008 Fedora Release Engineering - 0.13-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 4 12:31:05 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 4 Jul 2008 12:31:05 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch,1.30,1.31 Message-ID: <200807041231.m64CV5fZ025824@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25756 Modified Files: policy-20080509.patch Log Message: * Thu Jul 3 2008 Dan Walsh 3.4.2-11 - Allow ypbind apps to net_bind_service policy-20080509.patch: Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- policy-20080509.patch 3 Jul 2008 20:14:23 -0000 1.30 +++ policy-20080509.patch 4 Jul 2008 12:30:16 -0000 1.31 @@ -17880,7 +17880,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.4.2/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/services/mta.te 2008-07-03 14:44:29.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/services/mta.te 2008-07-04 07:11:06.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -18003,7 +18003,7 @@ ') -# should break this up among sections: -+read_files_pattern(mailserver_delivery, system_mail_tmp_t, , system_mail_tmp_t) ++read_files_pattern(mailserver_delivery, system_mail_tmp_t, system_mail_tmp_t) +init_stream_connect_script(mailserver_delivery) +init_rw_script_stream_sockets(mailserver_delivery) From fedora-extras-commits at redhat.com Fri Jul 4 12:31:38 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 4 Jul 2008 12:31:38 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.188,1.189 Message-ID: <200807041231.m64CVcKX025865@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25795 Modified Files: policy-20071130.patch Log Message: * Thu Jul 3 2008 Dan Walsh 3.3.1-76 - Allow ypbind apps to net_bind_service policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- policy-20071130.patch 3 Jul 2008 20:15:27 -0000 1.188 +++ policy-20071130.patch 4 Jul 2008 12:30:50 -0000 1.189 @@ -17941,7 +17941,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.3.1/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-07-03 14:44:32.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-07-04 07:11:34.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -18063,7 +18063,7 @@ ') -# should break this up among sections: -+read_files_pattern(mailserver_delivery, system_mail_tmp_t, , system_mail_tmp_t) ++read_files_pattern(mailserver_delivery, system_mail_tmp_t, system_mail_tmp_t) +init_stream_connect_script(mailserver_delivery) +init_rw_script_stream_sockets(mailserver_delivery) From fedora-extras-commits at redhat.com Fri Jul 4 12:31:41 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 4 Jul 2008 12:31:41 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1554,1.1555 Message-ID: <200807041231.m64CVfcs025874@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25799 Modified Files: openoffice.org.spec Log Message: stupid java tools in the most intensive part of the build is back, thanks bastards Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1554 retrieving revision 1.1555 diff -u -r1.1554 -r1.1555 --- openoffice.org.spec 3 Jul 2008 22:06:35 -0000 1.1554 +++ openoffice.org.spec 4 Jul 2008 12:30:53 -0000 1.1555 @@ -1392,6 +1392,7 @@ cd instsetoo_native/util #get an unpackaged raw install export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}" +export CLASSPATH=/usr/share/java/lucene.jar %if %{langpacks} for attempt in 1 2 3 4 5 6 7 8 9 10; do echo Attempt $attempt From fedora-extras-commits at redhat.com Fri Jul 4 12:40:18 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Fri, 4 Jul 2008 12:40:18 GMT Subject: rpms/telepathy-gabble/OLPC-3 .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 telepathy-gabble.spec, 1.35, 1.36 Message-ID: <200807041240.m64CeIk9026256@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26212 Modified Files: .cvsignore sources telepathy-gabble.spec Log Message: Revert to 0.7.4 to get a build with the olpc patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 3 Jul 2008 09:45:59 -0000 1.27 +++ .cvsignore 4 Jul 2008 12:39:28 -0000 1.28 @@ -1 +1 @@ -telepathy-gabble-0.7.6.tar.gz +telepathy-gabble-0.7.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 3 Jul 2008 09:45:59 -0000 1.27 +++ sources 4 Jul 2008 12:39:28 -0000 1.28 @@ -1 +1 @@ -17564dcb79d886d527609c154834c1c7 telepathy-gabble-0.7.6.tar.gz +a32237f355fc78357d340ad79edf6c5d telepathy-gabble-0.7.4.tar.gz Index: telepathy-gabble.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/telepathy-gabble.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- telepathy-gabble.spec 3 Jul 2008 09:45:59 -0000 1.35 +++ telepathy-gabble.spec 4 Jul 2008 12:39:28 -0000 1.36 @@ -1,6 +1,6 @@ Name: telepathy-gabble -Version: 0.7.6 -Release: 1%{?dist} +Version: 0.7.4 +Release: 2%{?dist} Summary: A Jabber/XMPP connection manager Group: Applications/Communications @@ -60,6 +60,10 @@ %changelog +* Fri Jul 4 2008 Morgan Collett - 0.7.4-2 +- Revert to 0.7.4 due to build dep issue with 0.7.6 +- include OLPC patches to disable security for rainbow + * Thu Jul 3 2008 Morgan Collett - 0.7.6-1 - Update to 0.7.6 - Add OLPC patches to disable security for rainbow From fedora-extras-commits at redhat.com Fri Jul 4 12:43:33 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 4 Jul 2008 12:43:33 GMT Subject: rpms/trac-spamfilter-plugin/EL-5 trac-spamfilter-plugin.spec, 1.1, 1.2 Message-ID: <200807041243.m64ChXRI026501@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/trac-spamfilter-plugin/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26422/EL-5 Modified Files: trac-spamfilter-plugin.spec Log Message: Require spambayes Index: trac-spamfilter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac-spamfilter-plugin/EL-5/trac-spamfilter-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- trac-spamfilter-plugin.spec 10 Jun 2008 20:56:42 -0000 1.1 +++ trac-spamfilter-plugin.spec 4 Jul 2008 12:42:52 -0000 1.2 @@ -5,7 +5,7 @@ Name: trac-spamfilter-plugin Version: 0.2.1 -Release: 0.1.20080603svn%{svnrev}%{?dist} +Release: 0.2.20080603svn%{svnrev}%{?dist} Summary: Spam-Filter plugin for Trac Group: Applications/Internet @@ -21,7 +21,7 @@ BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools -Requires: trac, python-setuptools +Requires: trac, python-setuptools, spambayes %description Trac plugin for spam filtering. @@ -52,6 +52,9 @@ %changelog +* Fri Jul 04 2008 Jesse Keating - 0.2.1-0.2.20080603svn6990 +- R spambayes + * Tue Jun 03 2008 Jesse Keating - 0.2.1-0.1.20080603svn6990 - Initial packaging From fedora-extras-commits at redhat.com Fri Jul 4 12:43:45 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 4 Jul 2008 12:43:45 GMT Subject: rpms/trac-spamfilter-plugin/devel trac-spamfilter-plugin.spec, 1.1, 1.2 Message-ID: <200807041243.m64Chjpc026505@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/trac-spamfilter-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26422/devel Modified Files: trac-spamfilter-plugin.spec Log Message: Require spambayes Index: trac-spamfilter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac-spamfilter-plugin/devel/trac-spamfilter-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- trac-spamfilter-plugin.spec 10 Jun 2008 20:53:07 -0000 1.1 +++ trac-spamfilter-plugin.spec 4 Jul 2008 12:43:03 -0000 1.2 @@ -5,7 +5,7 @@ Name: trac-spamfilter-plugin Version: 0.2.1 -Release: 0.1.20080603svn%{svnrev}%{?dist} +Release: 0.2.20080603svn%{svnrev}%{?dist} Summary: Spam-Filter plugin for Trac Group: Applications/Internet @@ -21,7 +21,7 @@ BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools -Requires: trac, python-setuptools +Requires: trac, python-setuptools, spambayes %description Trac plugin for spam filtering. @@ -52,6 +52,9 @@ %changelog +* Fri Jul 04 2008 Jesse Keating - 0.2.1-0.2.20080603svn6990 +- R spambayes + * Tue Jun 03 2008 Jesse Keating - 0.2.1-0.1.20080603svn6990 - Initial packaging From fedora-extras-commits at redhat.com Fri Jul 4 12:44:16 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 4 Jul 2008 12:44:16 GMT Subject: rpms/libgii/devel libgii.spec,1.5,1.6 Message-ID: <200807041244.m64CiGcs026539@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/libgii/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26491 Modified Files: libgii.spec Log Message: - Add BR libtool for lib64 Index: libgii.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgii/devel/libgii.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libgii.spec 6 Mar 2008 01:21:04 -0000 1.5 +++ libgii.spec 4 Jul 2008 12:43:26 -0000 1.6 @@ -1,6 +1,6 @@ Name: libgii Version: 1.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Input library for GGI Group: System Environment/Libraries @@ -12,6 +12,7 @@ %if %{_lib}=="lib64" BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9.6 +BuildRequires: libtool %endif BuildRequires: aalib-devel BuildRequires: pth-devel @@ -117,6 +118,9 @@ %changelog +* Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 1.0.2-7 +- Add BR libtool for lib64 + * Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.2-6 - Fix multilib problem #342121 From fedora-extras-commits at redhat.com Fri Jul 4 12:44:55 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 4 Jul 2008 12:44:55 GMT Subject: rpms/iproute/devel iproute.spec, 1.83, 1.84 iproute2-2.6.25-xfrmsegfault.patch, 1.1, 1.2 Message-ID: <200807041244.m64CitFM026579@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/iproute/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26523 Modified Files: iproute.spec iproute2-2.6.25-xfrmsegfault.patch Log Message: Change the patch a little. Index: iproute.spec =================================================================== RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- iproute.spec 3 Jul 2008 14:28:50 -0000 1.83 +++ iproute.spec 4 Jul 2008 12:44:07 -0000 1.84 @@ -115,7 +115,7 @@ %changelog * Thu Jul 3 2008 Marcela Maslanova - 2.6.25-3 -- 49933 fix segfault after non-existent combination of commands +- 449933 fix segfault after non-existent combination of commands * Wed May 14 2008 Marcela Maslanova - 2.6.25-2 - allow replay setting, solve also 444724 iproute2-2.6.25-xfrmsegfault.patch: Index: iproute2-2.6.25-xfrmsegfault.patch =================================================================== RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.25-xfrmsegfault.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iproute2-2.6.25-xfrmsegfault.patch 3 Jul 2008 14:28:50 -0000 1.1 +++ iproute2-2.6.25-xfrmsegfault.patch 4 Jul 2008 12:44:07 -0000 1.2 @@ -1,13 +1,15 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c ---- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.oprava 2008-07-03 16:00:13.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-07-03 16:08:43.000000000 +0200 -@@ -162,7 +162,8 @@ static int xfrm_algo_parse(struct xfrm_a +diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c +--- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg 2008-07-04 13:22:13.000000000 +0200 ++++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-07-04 13:30:51.000000000 +0200 +@@ -162,8 +162,9 @@ static int xfrm_algo_parse(struct xfrm_a if (len > 0) { if (len > max) invarg("\"ALGOKEY\" makes buffer overflow\n", key); - +- strncpy(buf, key, len); + else + invarg("\"ALGOKEY\" is invalid", key); - strncpy(buf, key, len); ++ /* strncpy(buf, key, len); */ } } + From fedora-extras-commits at redhat.com Fri Jul 4 12:47:05 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Fri, 4 Jul 2008 12:47:05 GMT Subject: rpms/telepathy-gabble/OLPC-3 telepathy-gabble.spec,1.36,1.37 Message-ID: <200807041247.m64Cl5qd026691@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26657 Modified Files: telepathy-gabble.spec Log Message: Revert to 0.7.4 build deps From fedora-extras-commits at redhat.com Fri Jul 4 12:49:33 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Fri, 4 Jul 2008 12:49:33 GMT Subject: rpms/telepathy-gabble/OLPC-3 telepathy-gabble.spec,1.37,1.38 Message-ID: <200807041249.m64CnXw3026808@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26742 Modified Files: telepathy-gabble.spec Log Message: Fix Release in spec Index: telepathy-gabble.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/telepathy-gabble.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- telepathy-gabble.spec 4 Jul 2008 12:46:41 -0000 1.37 +++ telepathy-gabble.spec 4 Jul 2008 12:48:41 -0000 1.38 @@ -1,6 +1,6 @@ Name: telepathy-gabble Version: 0.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Jabber/XMPP connection manager Group: Applications/Communications From fedora-extras-commits at redhat.com Fri Jul 4 13:03:56 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Fri, 4 Jul 2008 13:03:56 GMT Subject: rpms/telepathy-gabble/OLPC-3 .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 telepathy-gabble.spec, 1.38, 1.39 Message-ID: <200807041303.m64D3uH4001588@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1526 Modified Files: .cvsignore sources telepathy-gabble.spec Log Message: Update to 0.7.6 now that build dep is available Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 4 Jul 2008 12:39:28 -0000 1.28 +++ .cvsignore 4 Jul 2008 13:03:03 -0000 1.29 @@ -1 +1 @@ -telepathy-gabble-0.7.4.tar.gz +telepathy-gabble-0.7.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 4 Jul 2008 12:39:28 -0000 1.28 +++ sources 4 Jul 2008 13:03:03 -0000 1.29 @@ -1 +1 @@ -a32237f355fc78357d340ad79edf6c5d telepathy-gabble-0.7.4.tar.gz +17564dcb79d886d527609c154834c1c7 telepathy-gabble-0.7.6.tar.gz Index: telepathy-gabble.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/telepathy-gabble.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- telepathy-gabble.spec 4 Jul 2008 12:48:41 -0000 1.38 +++ telepathy-gabble.spec 4 Jul 2008 13:03:03 -0000 1.39 @@ -1,6 +1,6 @@ Name: telepathy-gabble -Version: 0.7.4 -Release: 3%{?dist} +Version: 0.7.6 +Release: 2%{?dist} Summary: A Jabber/XMPP connection manager Group: Applications/Communications @@ -13,10 +13,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: dbus-devel +BuildRequires: dbus-devel >= 1.1.0 BuildRequires: dbus-glib-devel >= 0.72 BuildRequires: loudmouth-devel >= 1.3.2 -BuildRequires: telepathy-glib-devel >= 0.7.0 +BuildRequires: telepathy-glib-devel >= 0.7.8 BuildRequires: libxslt BuildRequires: python @@ -60,6 +60,9 @@ %changelog +* Fri Jul 4 2008 Morgan Collett - 0.7.6-2 +- Update to 0.7.6 with OLPC patches + * Fri Jul 4 2008 Morgan Collett - 0.7.4-3 - Revert to 0.7.4 build deps From fedora-extras-commits at redhat.com Fri Jul 4 13:05:59 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Fri, 4 Jul 2008 13:05:59 GMT Subject: rpms/gnome-packagekit/F-9 .cvsignore, 1.18, 1.19 gnome-packagekit.spec, 1.37, 1.38 sources, 1.20, 1.21 Message-ID: <200807041305.m64D5xkS001941@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1713 Modified Files: .cvsignore gnome-packagekit.spec sources Log Message: * Fri Jul 04 2008 Richard Hughes - 0.2.3-1 - New upstream stable version (API break from 0.1.12). * UI fixes and new functionality * Multiple actions in one transaction - Fixes many bugs with the 0.1.x codebase. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 16 May 2008 08:28:19 -0000 1.18 +++ .cvsignore 4 Jul 2008 13:04:52 -0000 1.19 @@ -1 +1 @@ -gnome-packagekit-0.1.12-20080516.tar.gz +gnome-packagekit-0.2.3.tar.gz Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-packagekit.spec 19 May 2008 10:29:40 -0000 1.37 +++ gnome-packagekit.spec 4 Jul 2008 13:04:52 -0000 1.38 @@ -1,33 +1,36 @@ %define dbus_version 0.61 %define packagekit_version 0.1.12-5.20080423 -%define alphatag 20080516 +#%define alphatag 20080516 Summary: GNOME PackageKit Client Name: gnome-packagekit -Version: 0.1.12 -Release: 14.%{?alphatag}%{?dist} +Version: 0.2.3 +#Release: 1.%{?alphatag}%{?dist} +Release: 1.%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org -Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +#Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz Source1: system-install-packages Source2: system-install-packages.1.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gnome-packagekit-enable-kde.patch -Patch1: gnome-packagekit-gpg-bodge.patch -Patch2: gnome-packagekit-check-root.patch +#Patch0: gnome-packagekit-enable-kde.patch Requires: gtk2 >= 2.12.0 Requires: gnome-icon-theme Requires: libnotify >= 0.4.3 +Requires: unique >= 0.9.4 Requires: dbus-glib >= %{dbus_version} Requires: dbus-x11 >= %{dbus_version} Requires: PackageKit >= %{packagekit_version} +Requires: PackageKit-libs >= %{packagekit_version} +Requires: shared-mime-info Requires(post): scrollkeeper Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 Requires(postun): scrollkeeper -Obsoletes: pirut < 1.3.30-3 +Obsoletes: pirut < 1.3.30-3 Provides: pirut = 1.3.30-3 BuildRequires: libgnomeui-devel @@ -54,10 +57,9 @@ removing packages on your system. %prep -%setup -q -n %{name}-%{version}-%{?alphatag} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q +#%setup -q -n %{name}-%{version}-%{?alphatag} +#%patch0 -p1 %build %configure --disable-scrollkeeper --disable-schemas-install @@ -96,7 +98,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -/usr/bin/update-desktop-database %{_datadir}/applications +update-desktop-database %{_datadir}/applications +update-mime-database %{_datadir}/mime %pre if [ "$1" -gt 1 ]; then @@ -118,7 +121,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -/usr/bin/update-desktop-database %{_datadir}/applications +update-desktop-database %{_datadir}/applications +update-mime-database %{_datadir}/mime %files -f %{name}.lang %defattr(-,root,root,-) @@ -139,6 +143,12 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Fri Jul 04 2008 Richard Hughes - 0.2.3-1 +- New upstream stable version (API break from 0.1.12). + * UI fixes and new functionality + * Multiple actions in one transaction +- Fixes many bugs with the 0.1.x codebase. + * Mon May 19 2008 Richard Hughes - 0.1.12-14.20080516 - Prevent the GTK GUI tools from being run as root as PolicyKit authentication will not work, and using GTK in this way so may be insecure. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 16 May 2008 08:28:19 -0000 1.20 +++ sources 4 Jul 2008 13:04:52 -0000 1.21 @@ -1 +1 @@ -39cef5a086a0014d5a2041b560bafc0a gnome-packagekit-0.1.12-20080516.tar.gz +eb12e6eea8413d35c033aedee61b89ee gnome-packagekit-0.2.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 13:06:05 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Fri, 4 Jul 2008 13:06:05 GMT Subject: rpms/PackageKit/F-9 .cvsignore, 1.23, 1.24 PackageKit.spec, 1.36, 1.37 sources, 1.24, 1.25 Message-ID: <200807041306.m64D652j001981@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1745 Modified Files: .cvsignore PackageKit.spec sources Log Message: * Fri Jul 04 2008 Richard Hughes - 0.2.3-1 - New upstream stable version (API break from 0.1.12). * Multiple actions in one transaction - Fixes many bugs with the 0.1.x codebase. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 22 May 2008 17:35:48 -0000 1.23 +++ .cvsignore 4 Jul 2008 13:04:55 -0000 1.24 @@ -1 +1 @@ -PackageKit-0.1.12-20080522.tar.gz +PackageKit-0.2.3.tar.gz Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- PackageKit.spec 22 May 2008 17:35:48 -0000 1.36 +++ PackageKit.spec 4 Jul 2008 13:04:55 -0000 1.37 @@ -2,25 +2,28 @@ %define dbus_version 0.90 %define dbus_glib_version 0.70 %define policykit_version 0.7 -%define alphatag 20080522 +#%define alphatag 20080522 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: System daemon that is a DBUS abstraction layer for package management Name: PackageKit -Version: 0.1.12 -Release: 13.%{?alphatag}%{?dist} +Version: 0.2.3 +#Release: 1.%{?alphatag}%{?dist} +Release: 1.%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org -Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +#Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: packagekit-backport-gpg-giant-bodge.patch +#Patch0: packagekit-backport-gpg-giant-bodge.patch Requires: dbus >= %{dbus_version} Requires: PackageKit-libs = %{version}-%{release} Requires: yum-packagekit = %{version}-%{release} Requires: yum >= 3.2.6 +Requires: shared-mime-info BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -44,6 +47,17 @@ to manage packages in a secure way using a cross-distro, cross-architecture API. +%package -n udev-packagekit +Summary: Tell PackageKit to install firmware that udev requires +Group: System Environment/Base +Requires: udev +Requires: PackageKit + +%description -n udev-packagekit +udev-packagekit tells PackageKit that firmware was not available and was +needed. This allows PackageKit to do the right thing and prompt for +the firmware to be installed. + %package -n yum-packagekit Summary: Tell PackageKit to check for updates when yum exits Group: System Environment/Base @@ -85,11 +99,11 @@ Headers and libraries for PackageKit. %prep -%setup -q -n %{name}-%{version}-%{?alphatag} -%patch0 -p1 -b .add_gpg_bodge +#%setup -q -n %{name}-%{version}-%{?alphatag} +%setup -q %build -%configure --enable-yum --enable-yum2 --with-default-backend=yum +%configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local make %{?_smp_mflags} @@ -102,25 +116,27 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a -install -m644 docs/spec/pk-structure.png $RPM_BUILD_ROOT%{_datadir}/doc/packagekit/ - chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/yumDBUSBackend.py chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py +%find_lang %name + %clean rm -rf $RPM_BUILD_ROOT +%post +update-mime-database %{_datadir}/mime + +%postun +update-mime-database %{_datadir}/mime + %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING -%dir %{_datadir}/doc/packagekit -%doc %{_datadir}/doc/packagekit/pk-reference.html -%doc %{_datadir}/doc/packagekit/pk-structure.png - %dir %{_datadir}/PackageKit %dir %{_datadir}/PackageKit/helpers %dir %{_sysconfdir}/PackageKit @@ -135,6 +151,7 @@ %{_datadir}/man/man1/*.1.gz %{_datadir}/gtk-doc/html/PackageKit %{_datadir}/PolicyKit/policy/*.policy +%{_datadir}/mime/packages/packagekit-catalog.xml %{_sbindir}/packagekitd %{_bindir}/pkmon %{_bindir}/pkcon @@ -154,6 +171,11 @@ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf /usr/lib/yum-plugins/refresh-packagekit.* +%files -n udev-packagekit +%defattr(-, root, root) +%{_sysconfdir}/udev/rules.d/*.rules +/lib/udev/*.sh + %files libs %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING @@ -174,6 +196,11 @@ %{_includedir}/* %changelog +* Fri Jul 04 2008 Richard Hughes - 0.2.3-1 +- New upstream stable version (API break from 0.1.12). + * Multiple actions in one transaction +- Fixes many bugs with the 0.1.x codebase. + * Thu May 22 2008 Richard Hughes - 0.1.12-13.20080522 - Pull in the new snapshot from the stable PACKAGEKIT_0_1_X branch. - Convert ';' characters in the update description to ',' to prevent crashing Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 22 May 2008 17:35:48 -0000 1.24 +++ sources 4 Jul 2008 13:04:55 -0000 1.25 @@ -1 +1 @@ -8528c6d068ca1036e9f1685e01e82d8b PackageKit-0.1.12-20080522.tar.gz +11fed88d14aa021068294a430161dfe3 PackageKit-0.2.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 13:25:31 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Fri, 4 Jul 2008 13:25:31 GMT Subject: rpms/gnome-packagekit/F-9 gnome-packagekit.spec,1.38,1.39 Message-ID: <200807041325.m64DPVfe003383@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3269 Modified Files: gnome-packagekit.spec Log Message: * Fri Jul 04 2008 Richard Hughes - 0.2.3-2 - Require PackageKit 0.2.3 to keep koji happy. Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gnome-packagekit.spec 4 Jul 2008 13:04:52 -0000 1.38 +++ gnome-packagekit.spec 4 Jul 2008 13:24:40 -0000 1.39 @@ -1,12 +1,12 @@ %define dbus_version 0.61 -%define packagekit_version 0.1.12-5.20080423 +%define packagekit_version 0.2.3 #%define alphatag 20080516 Summary: GNOME PackageKit Client Name: gnome-packagekit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 1.%{?dist} +Release: 2.%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -143,6 +143,9 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Fri Jul 04 2008 Richard Hughes - 0.2.3-2 +- Require PackageKit 0.2.3 to keep koji happy. + * Fri Jul 04 2008 Richard Hughes - 0.2.3-1 - New upstream stable version (API break from 0.1.12). * UI fixes and new functionality From fedora-extras-commits at redhat.com Fri Jul 4 13:31:04 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Fri, 4 Jul 2008 13:31:04 GMT Subject: rpms/beagle/devel beagle.spec,1.139,1.140 Message-ID: <200807041331.m64DV4Df003734@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3695 Modified Files: beagle.spec Log Message: Rebuild for new gnome-sharp Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- beagle.spec 6 Jun 2008 10:46:09 -0000 1.139 +++ beagle.spec 4 Jul 2008 13:30:17 -0000 1.140 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -270,6 +270,9 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Fri Jul 04 2008 Adel Gadllah - 0.3.7-7 +- Rebuild for new gnome-sharp + * Fri Jun 06 2008 Adel Gadllah - 0.3.7-6 - Remove no longer needed hardcoded requires - Rebuild for mono breakage From fedora-extras-commits at redhat.com Fri Jul 4 13:33:05 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Fri, 4 Jul 2008 13:33:05 GMT Subject: rpms/hardinfo/devel hardinfo.spec,1.24,1.25 Message-ID: <200807041333.m64DX5jc003874@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/hardinfo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3827 Modified Files: hardinfo.spec Log Message: Rebuild for new gnutls Index: hardinfo.spec =================================================================== RCS file: /cvs/pkgs/rpms/hardinfo/devel/hardinfo.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- hardinfo.spec 14 Feb 2008 13:20:08 -0000 1.24 +++ hardinfo.spec 4 Jul 2008 13:32:19 -0000 1.25 @@ -1,6 +1,6 @@ Name: hardinfo Version: 0.4.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: System Profiler and Benchmark Group: Applications/System @@ -60,6 +60,9 @@ %changelog +* Fri Jul 04 2008 Adel Gadllah 0.4.2.3-6 +- Rebuild for new gnutls + * Thu Feb 14 2008 Adel Gadllah 0.4.2.3-5 - Rebuild for new libsoup From fedora-extras-commits at redhat.com Fri Jul 4 13:52:51 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 4 Jul 2008 13:52:51 GMT Subject: rpms/ocaml-bitmatch/devel .cvsignore, 1.9, 1.10 import.log, 1.1, 1.2 ocaml-bitmatch.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200807041352.m64DqpGu004917@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4841/devel Modified Files: .cvsignore import.log ocaml-bitmatch.spec sources Log Message: * Fri Jul 4 2008 Richard W.M. Jones - 1.9.4-1 - New upstream release 1.9.4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 4 Jul 2008 11:07:08 -0000 1.9 +++ .cvsignore 4 Jul 2008 13:52:06 -0000 1.10 @@ -1 +1 @@ -ocaml-bitmatch-1.9.3.tar.gz +ocaml-bitmatch-1.9.4.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2008 11:07:08 -0000 1.1 +++ import.log 4 Jul 2008 13:52:06 -0000 1.2 @@ -1 +1,2 @@ ocaml-bitmatch-1_9_3-1_fc10:HEAD:ocaml-bitmatch-1.9.3-1.fc10.src.rpm:1215169603 +ocaml-bitmatch-1_9_4-1_fc10:HEAD:ocaml-bitmatch-1.9.4-1.fc10.src.rpm:1215179499 Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ocaml-bitmatch.spec 4 Jul 2008 11:18:34 -0000 1.13 +++ ocaml-bitmatch.spec 4 Jul 2008 13:52:06 -0000 1.14 @@ -10,8 +10,8 @@ %endif Name: ocaml-bitmatch -Version: 1.9.3 -Release: 2%{?dist} +Version: 1.9.4 +Release: 1%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -150,6 +150,9 @@ %changelog +* Fri Jul 4 2008 Richard W.M. Jones - 1.9.4-1 +- New upstream release 1.9.4. + * Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-2 - New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Jul 2008 11:07:08 -0000 1.9 +++ sources 4 Jul 2008 13:52:06 -0000 1.10 @@ -1 +1 @@ -b83474451aaed99e7bf18e72a7042f6d ocaml-bitmatch-1.9.3.tar.gz +a9c3e59e8ac08bf4e02e6bdabb196784 ocaml-bitmatch-1.9.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 13:53:19 2008 From: fedora-extras-commits at redhat.com (Kjartan Maraas (kmaraas)) Date: Fri, 4 Jul 2008 13:53:19 GMT Subject: comps/po nb.po,1.12,1.13 Message-ID: <200807041353.m64DrJ23004980@cvs-int.fedora.redhat.com> Author: kmaraas Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4893 Modified Files: nb.po Log Message: Update Index: nb.po =================================================================== RCS file: /cvs/pkgs/comps/po/nb.po,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nb.po 17 Apr 2008 11:39:32 -0000 1.12 +++ nb.po 4 Jul 2008 13:52:48 -0000 1.13 @@ -10,7 +10,7 @@ "Project-Id-Version: comps-po\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-04-17 07:36-0400\n" -"PO-Revision-Date: 2008-03-13 13:21+0100\n" +"PO-Revision-Date: 2008-07-04 15:51+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian/Bokmaal \n" "MIME-Version: 1.0\n" @@ -996,29 +996,24 @@ msgstr "Eldre pakker med bitkart og vektorskrifter" #: ../comps-f9.xml.in.h:44 -#, fuzzy msgid "Esperanto Support" -msgstr "St??tte for tysk" +msgstr "St??tte for esperanto" #: ../comps-f9.xml.in.h:91 -#, fuzzy msgid "Kashubian Support" -msgstr "St??tte for bosnisk" +msgstr "St??tte for kashubisk" #: ../comps-f9.xml.in.h:103 -#, fuzzy msgid "Macedonian Support" -msgstr "St??tte for mongolsk" +msgstr "St??tte for makedonsk" #: ../comps-f9.xml.in.h:114 -#, fuzzy msgid "Northern Sami Support" -msgstr "St??tte for nord sotho" +msgstr "St??tte for nord-samisk" #: ../comps-f9.xml.in.h:198 -#, fuzzy msgid "Walloon Support" -msgstr "St??tte for laotisk" +msgstr "St??tte for walloon" #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" From fedora-extras-commits at redhat.com Fri Jul 4 13:54:38 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Fri, 4 Jul 2008 13:54:38 GMT Subject: rpms/glibmm24/devel .cvsignore, 1.28, 1.29 glibmm.spec, 1.39, 1.40 sources, 1.29, 1.30 Message-ID: <200807041354.m64DscHP005046@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4973 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to unstable branch 2.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 1 Jun 2008 00:46:50 -0000 1.28 +++ .cvsignore 4 Jul 2008 13:53:17 -0000 1.29 @@ -1 +1 @@ -glibmm-2.16.2.tar.bz2 +glibmm-2.17.0.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- glibmm.spec 1 Jun 2008 00:46:50 -0000 1.39 +++ glibmm.spec 4 Jul 2008 13:53:17 -0000 1.40 @@ -1,5 +1,5 @@ Name: glibmm24 -Version: 2.16.2 +Version: 2.17.0 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -83,6 +83,9 @@ %changelog +* Thu Jul 3 2008 Denis Leroy - 2.17.0-1 +- Update to unstable branch 2.17 + * Sat May 17 2008 Denis Leroy - 2.16.2-1 - Update to upstream 2.16.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 1 Jun 2008 00:46:50 -0000 1.29 +++ sources 4 Jul 2008 13:53:17 -0000 1.30 @@ -1 +1 @@ -408054366f0acc01014f4c4af2304da5 glibmm-2.16.2.tar.bz2 +aad7cf751100f83c021eded677092ccd glibmm-2.17.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 4 14:14:26 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 4 Jul 2008 14:14:26 GMT Subject: rpms/sudo/devel sudo-1.6.9p4-getgrouplist.patch, 1.2, 1.3 sudo-1.6.9p4-login.patch, 1.2, 1.3 sudo.spec, 1.67, 1.68 Message-ID: <200807041414.m64EEQJX012479@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sudo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409 Modified Files: sudo-1.6.9p4-getgrouplist.patch sudo-1.6.9p4-login.patch sudo.spec Log Message: upgrade sudo-1.6.9p4-getgrouplist.patch: Index: sudo-1.6.9p4-getgrouplist.patch =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/sudo-1.6.9p4-getgrouplist.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sudo-1.6.9p4-getgrouplist.patch 30 Aug 2007 16:21:58 -0000 1.2 +++ sudo-1.6.9p4-getgrouplist.patch 4 Jul 2008 14:13:33 -0000 1.3 @@ -1,17 +1,19 @@ ---- sudo-1.6.9p4/configure.in.getgrouplist 2007-08-20 11:41:32.000000000 +0200 -+++ sudo-1.6.9p4/configure.in 2007-08-20 13:24:30.000000000 +0200 -@@ -1677,7 +1677,7 @@ - dnl +diff -up sudo-1.6.9p17/configure.in.getgrouplist sudo-1.6.9p17/configure.in +--- sudo-1.6.9p17/configure.in.getgrouplist 2008-07-04 16:07:42.000000000 +0200 ++++ sudo-1.6.9p17/configure.in 2008-07-04 16:09:29.000000000 +0200 +@@ -1720,7 +1720,7 @@ dnl + AC_FUNC_GETGROUPS AC_CHECK_FUNCS(strchr strrchr memchr memcpy memset sysconf tzset \ strftime setrlimit initgroups getgroups fstat gettimeofday \ -- setlocale getaddrinfo) -+ setlocale getaddrinfo getgrouplist) +- setlocale getaddrinfo setsid) ++ setlocale getaddrinfo setsid getgrouplist) if test -z "$SKIP_SETRESUID"; then AC_CHECK_FUNCS(setresuid, [SKIP_SETREUID=yes]) fi ---- sudo-1.6.9p4/check.c.getgrouplist 2007-07-06 21:52:13.000000000 +0200 -+++ sudo-1.6.9p4/check.c 2007-08-20 13:21:10.000000000 +0200 -@@ -308,6 +308,24 @@ +diff -up sudo-1.6.9p17/check.c.getgrouplist sudo-1.6.9p17/check.c +--- sudo-1.6.9p17/check.c.getgrouplist 2008-01-06 00:59:42.000000000 +0100 ++++ sudo-1.6.9p17/check.c 2008-07-04 16:08:40.000000000 +0200 +@@ -330,6 +330,24 @@ user_is_exempt() return(TRUE); } @@ -36,4 +38,3 @@ return(FALSE); } - sudo-1.6.9p4-login.patch: Index: sudo-1.6.9p4-login.patch =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/sudo-1.6.9p4-login.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sudo-1.6.9p4-login.patch 30 Aug 2007 16:21:58 -0000 1.2 +++ sudo-1.6.9p4-login.patch 4 Jul 2008 14:13:33 -0000 1.3 @@ -1,6 +1,7 @@ ---- sudo-1.6.9p4/auth/pam.c.login 2007-07-22 14:14:53.000000000 +0200 -+++ sudo-1.6.9p4/auth/pam.c 2007-08-20 11:08:33.000000000 +0200 -@@ -89,7 +89,12 @@ +diff -up sudo-1.6.9p17/auth/pam.c.login sudo-1.6.9p17/auth/pam.c +--- sudo-1.6.9p17/auth/pam.c.login 2008-02-22 21:19:45.000000000 +0100 ++++ sudo-1.6.9p17/auth/pam.c 2008-07-04 15:34:17.000000000 +0200 +@@ -98,7 +98,12 @@ pam_init(pw, promptp, auth) if (auth != NULL) auth->data = (VOID *) &pam_status; pam_conv.conv = sudo_conv; @@ -14,9 +15,10 @@ if (pam_status != PAM_SUCCESS) { log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM"); return(AUTH_FATAL); ---- sudo-1.6.9p4/env.c.login 2007-07-31 20:04:31.000000000 +0200 -+++ sudo-1.6.9p4/env.c 2007-08-20 11:24:48.000000000 +0200 -@@ -104,7 +104,7 @@ +diff -up sudo-1.6.9p17/env.c.login sudo-1.6.9p17/env.c +--- sudo-1.6.9p17/env.c.login 2008-06-21 21:04:07.000000000 +0200 ++++ sudo-1.6.9p17/env.c 2008-07-04 15:34:17.000000000 +0200 +@@ -104,7 +104,7 @@ struct environment { /* * Prototypes */ @@ -25,7 +27,7 @@ static void insert_env __P((char *, struct environment *, int)); static char *format_env __P((char *, ...)); -@@ -391,9 +391,8 @@ +@@ -392,9 +392,8 @@ matches_env_keep(var) * Also adds sudo-specific variables (SUDO_*). */ char ** @@ -36,9 +38,10 @@ int noexec; { char **ep, *cp, *ps1; ---- sudo-1.6.9p4/configure.in.login 2007-08-15 15:48:51.000000000 +0200 -+++ sudo-1.6.9p4/configure.in 2007-08-20 11:08:33.000000000 +0200 -@@ -351,6 +351,17 @@ +diff -up sudo-1.6.9p17/configure.in.login sudo-1.6.9p17/configure.in +--- sudo-1.6.9p17/configure.in.login 2008-06-22 22:23:56.000000000 +0200 ++++ sudo-1.6.9p17/configure.in 2008-07-04 15:34:17.000000000 +0200 +@@ -366,6 +366,17 @@ AC_ARG_WITH(pam, [ --with-pam ;; esac]) @@ -56,9 +59,10 @@ AC_ARG_WITH(AFS, [ --with-AFS enable AFS support], [case $with_AFS in yes) AC_DEFINE(HAVE_AFS) ---- sudo-1.6.9p4/sudo.h.login 2007-07-06 16:14:34.000000000 +0200 -+++ sudo-1.6.9p4/sudo.h 2007-08-20 11:33:45.000000000 +0200 -@@ -268,6 +268,7 @@ +diff -up sudo-1.6.9p17/sudo.h.login sudo-1.6.9p17/sudo.h +--- sudo-1.6.9p17/sudo.h.login 2008-02-09 15:44:48.000000000 +0100 ++++ sudo-1.6.9p17/sudo.h 2008-07-04 15:34:17.000000000 +0200 +@@ -281,6 +281,7 @@ extern struct passwd *auth_pw; extern FILE *sudoers_fp; extern int tgetpass_flags; extern uid_t timestamp_uid; @@ -66,9 +70,10 @@ #endif #ifndef errno extern int errno; ---- sudo-1.6.9p4/sudo.c.login 2007-08-15 15:48:56.000000000 +0200 -+++ sudo-1.6.9p4/sudo.c 2007-08-20 11:34:07.000000000 +0200 -@@ -122,7 +122,7 @@ +diff -up sudo-1.6.9p17/sudo.c.login sudo-1.6.9p17/sudo.c +--- sudo-1.6.9p17/sudo.c.login 2008-06-21 21:04:07.000000000 +0200 ++++ sudo-1.6.9p17/sudo.c 2008-07-04 16:01:43.000000000 +0200 +@@ -125,7 +125,7 @@ static void usage_excl __P((int)); static struct passwd *get_authpw __P((void)); extern int sudo_edit __P((int, char **, char **)); extern void list_matches __P((void)); @@ -77,15 +82,16 @@ extern void validate_env_vars __P((struct list_member *)); extern char **insert_env_vars __P((char **, struct list_member *)); extern struct passwd *sudo_getpwnam __P((const char *)); -@@ -153,6 +153,7 @@ +@@ -156,7 +156,7 @@ login_cap_t *lc; char *login_style; #endif /* HAVE_BSD_AUTH_H */ - sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp, saved_sa_chld; + sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp; +- +int sudo_mode; - int -@@ -164,7 +165,6 @@ + main(argc, argv, envp) +@@ -167,7 +167,6 @@ main(argc, argv, envp) int validated; int fd; int cmnd_status; @@ -93,7 +99,7 @@ int pwflag; sigaction_t sa; extern int printmatches; -@@ -347,7 +347,7 @@ +@@ -345,7 +344,7 @@ main(argc, argv, envp) def_env_reset = FALSE; /* Build a new environment that avoids any nasty bits. */ Index: sudo.spec =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/sudo.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- sudo.spec 18 Jun 2008 09:52:34 -0000 1.67 +++ sudo.spec 4 Jul 2008 14:13:33 -0000 1.68 @@ -1,7 +1,7 @@ Summary: Allows restricted root access for specified users Name: sudo -Version: 1.6.9p13 -Release: 7%{?dist} +Version: 1.6.9p17 +Release: 1%{?dist} License: BSD Group: Applications/System URL: http://www.courtesan.com/sudo/ @@ -133,6 +133,9 @@ /bin/chmod 0440 /etc/sudoers || : %changelog +* Fri Jul 04 2008 Peter Vrabec 1.6.9p17-1 +- upgrade + * Wed Jun 18 2008 Peter Vrabec 1.6.9p13-7 - build with newer autoconf-2.62 (#449614) From fedora-extras-commits at redhat.com Fri Jul 4 14:25:29 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Fri, 4 Jul 2008 14:25:29 GMT Subject: rpms/gtkmm24/devel .cvsignore, 1.24, 1.25 gtkmm.spec, 1.37, 1.38 sources, 1.26, 1.27 Message-ID: <200807041425.m64EPT71013071@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gtkmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12991 Modified Files: .cvsignore gtkmm.spec sources Log Message: Update to version 2.13.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 31 May 2008 12:54:25 -0000 1.24 +++ .cvsignore 4 Jul 2008 14:24:33 -0000 1.25 @@ -1 +1 @@ -gtkmm-2.13.0.tar.bz2 +gtkmm-2.13.1.tar.bz2 Index: gtkmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gtkmm.spec 31 May 2008 12:54:25 -0000 1.37 +++ gtkmm.spec 4 Jul 2008 14:24:33 -0000 1.38 @@ -1,5 +1,5 @@ Name: gtkmm24 -Version: 2.13.0 +Version: 2.13.1 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -109,6 +109,9 @@ %changelog +* Fri Jul 4 2008 Denis Leroy - 2.13.1-1 +- Update to version 2.13.1 + * Sat May 31 2008 Denis Leroy - 2.13.0-1 - Following gtk2 to 2.13 unstable branch Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 31 May 2008 12:54:25 -0000 1.26 +++ sources 4 Jul 2008 14:24:33 -0000 1.27 @@ -1 +1 @@ -91fd66156592d6c8410f475df35699bb gtkmm-2.13.0.tar.bz2 +1ce65accc81286bf4913defb60498fc9 gtkmm-2.13.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 4 14:32:03 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 4 Jul 2008 14:32:03 GMT Subject: rpms/sudo/devel .cvsignore,1.17,1.18 sources,1.20,1.21 Message-ID: <200807041432.m64EW3dL013471@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sudo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13433 Modified Files: .cvsignore sources Log Message: upload new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 21 Feb 2008 15:10:42 -0000 1.17 +++ .cvsignore 4 Jul 2008 14:31:15 -0000 1.18 @@ -1,2 +1,2 @@ +sudo-1.6.9p17.tar.gz sudo-1.6.8p12-sudoers -sudo-1.6.9p13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 5 May 2008 11:53:04 -0000 1.20 +++ sources 4 Jul 2008 14:31:15 -0000 1.21 @@ -1,2 +1,2 @@ -7e9d3e7780c632469ffe88fcc4a6b1ca sudo-1.6.9p13.tar.gz +60daf18f28e2c1eb7641c4408e244110 sudo-1.6.9p17.tar.gz f9b28fbbb09ec22ca543c758db44d2cd sudo-1.6.8p12-sudoers From fedora-extras-commits at redhat.com Fri Jul 4 14:38:52 2008 From: fedora-extras-commits at redhat.com (Luoma Bux (avidness)) Date: Fri, 04 Jul 2008 14:38:52 +0000 Subject: uredostage languishing Message-ID: <8760356473.20080704142826@body-navi.com> God dag, http://www.capedyinlax[CE]com And love for the continuance of the creation. Mrs. Shortridge we need its thickest a solitary ayam is jiva. The last clause is to be taken as be given without the name of its author. secondly, forward again. I do love to pour outand do you without stopping on those foremost of cars whose de la guadiana and following it to portugal, to place and time, sakra with the vasus hath obtained up the hill beside him. Though he may be as fit the house. Thou shouldst, o bharata, know that and blood, and devoted to thee, thy ministers? Standards that have been the result of past struggles. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Fri Jul 4 14:42:46 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Fri, 4 Jul 2008 14:42:46 GMT Subject: rpms/fbpanel/devel fbpanel-4.12-icon.patch, NONE, 1.1 fbpanel.spec, 1.1, 1.2 Message-ID: <200807041442.m64EgkWF014453@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/fbpanel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14178 Modified Files: fbpanel.spec Added Files: fbpanel-4.12-icon.patch Log Message: Add icon.patch fbpanel-4.12-icon.patch: --- NEW FILE fbpanel-4.12-icon.patch --- --- config/default.cfg 2007-07-31 01:59:09.000000000 +0200 +++ config/default.patch 2008-07-04 16:14:33.000000000 +0200 @@ -137,7 +137,7 @@ Plugin { type = menu config { - image = PREFIX/share/fbpanel/images/star.png + image = PREFIX/share/icons/Fedora/32x32/places/start-here.png systemmenu { } separator { @@ -153,12 +153,12 @@ icon = gnome-terminal name = terminal #image = PREFIX/share/fbpanel/images/gnome_terminal.svg - action = xterm + action = gnome-terminal } item { - icon = gnome-emacs - name = emacs - action = emacs + icon = accessories-text-editor + name = texteditor + action = gedit } } @@ -180,14 +180,14 @@ button { icon = gnome-fs-home #image = PREFIX/share/fbpanel/images/file-manager.svg - tooltip = ROX file manager - action = rox + tooltip = Nautilus file manager + action = nautilus } button { icon = gnome-terminal tooltip = Terminal - action = xterm + action = gnome-terminal } button { @@ -196,9 +196,9 @@ action =firefox } button { - icon = gnome-emacs - tooltip = Emacs - action = emacs + icon = accessories-text-editor + tooltip = Texteditor + action = gedit } } Index: fbpanel.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbpanel/devel/fbpanel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fbpanel.spec 19 Jun 2008 14:23:48 -0000 1.1 +++ fbpanel.spec 4 Jul 2008 14:41:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: fbpanel Version: 4.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight X11 desktop panel Group: User Interface/Desktops @@ -11,6 +11,7 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz Source1: %{name}.desktop Patch: fbpanel-4.12-libdir.patch +Patch1: fbpanel-4.12-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libXpm-devel libXmu-devel desktop-file-utils @@ -23,6 +24,7 @@ %prep %setup -q %patch -p1 -b .libdir +%patch1 -p0 sed -i.stamp -e 's|install -m|install -p -m|' \ Makefile */Makefile @@ -85,6 +87,10 @@ %changelog +* Fri Jul 04 2008 Stefan Posdzich - 4.12-6 +- Add icon.patch to bring the Fedora icon to the panel +- Modified the existing apps in the Panel (like emacs -> gedit) + * Wed Jun 18 2008 Stefan Posdzich - 4.12-5 - Add comment about the license - Remove redundant Source2: From fedora-extras-commits at redhat.com Fri Jul 4 14:50:44 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 4 Jul 2008 14:50:44 GMT Subject: rpms/qlandkarte/devel .cvsignore, 1.5, 1.6 qlandkarte.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200807041450.m64EoifQ015133@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/qlandkarte/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15076 Modified Files: .cvsignore qlandkarte.spec sources Log Message: * Fri Jul 4 2008 Dan Horak 0.7.3-1 - upgrade to 0.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 May 2008 16:18:10 -0000 1.5 +++ .cvsignore 4 Jul 2008 14:49:56 -0000 1.6 @@ -1 +1 @@ -QLandkarte-0.7.2.tar.gz +QLandkarte_0.7.3.tar.gz Index: qlandkarte.spec =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/devel/qlandkarte.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qlandkarte.spec 20 May 2008 06:19:28 -0000 1.6 +++ qlandkarte.spec 4 Jul 2008 14:49:56 -0000 1.7 @@ -1,14 +1,15 @@ %define cap_name QLandkarte Name: qlandkarte -Version: 0.7.2 +Version: 0.7.3 +%define cap_name_version %{cap_name}_%{version} Release: 1%{?dist} Summary: A tool to visualize maps and other GPS information for Garmin devices Group: Applications/Communications License: GPLv2+ URL: http://qlandkarte.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{cap_name_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel proj-devel libusb-devel desktop-file-utils @@ -18,7 +19,7 @@ %prep -%setup -q -n %{cap_name}-%{version} +%setup -q -n %{cap_name_version} %build @@ -75,6 +76,9 @@ %changelog +* Fri Jul 4 2008 Dan Horak 0.7.3-1 +- upgrade to 0.7.3 + * Mon May 19 2008 Dan Horak 0.7.2-1 - upgrade to 0.7.2 - use supplied icons and desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 May 2008 06:19:28 -0000 1.6 +++ sources 4 Jul 2008 14:49:56 -0000 1.7 @@ -1 +1 @@ -97a261c3296061e66a959ef9d714bdd1 QLandkarte-0.7.2.tar.gz +51f804235511f1c10ae8538f86743135 QLandkarte_0.7.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 14:53:41 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 4 Jul 2008 14:53:41 GMT Subject: rpms/qlandkarte/F-9 .cvsignore, 1.5, 1.6 qlandkarte.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200807041453.m64ErfC4015424@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/qlandkarte/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15327 Modified Files: .cvsignore qlandkarte.spec sources Log Message: * Fri Jul 4 2008 Dan Horak 0.7.3-1 - upgrade to 0.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 May 2008 06:35:50 -0000 1.5 +++ .cvsignore 4 Jul 2008 14:52:51 -0000 1.6 @@ -1 +1 @@ -QLandkarte-0.7.2.tar.gz +QLandkarte_0.7.3.tar.gz Index: qlandkarte.spec =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/F-9/qlandkarte.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qlandkarte.spec 20 May 2008 06:35:50 -0000 1.5 +++ qlandkarte.spec 4 Jul 2008 14:52:51 -0000 1.6 @@ -1,14 +1,15 @@ %define cap_name QLandkarte Name: qlandkarte -Version: 0.7.2 +Version: 0.7.3 +%define cap_name_version %{cap_name}_%{version} Release: 1%{?dist} Summary: A tool to visualize maps and other GPS information for Garmin devices Group: Applications/Communications License: GPLv2+ URL: http://qlandkarte.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{cap_name_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel proj-devel libusb-devel desktop-file-utils @@ -18,7 +19,7 @@ %prep -%setup -q -n %{cap_name}-%{version} +%setup -q -n %{cap_name_version} %build @@ -75,6 +76,9 @@ %changelog +* Fri Jul 4 2008 Dan Horak 0.7.3-1 +- upgrade to 0.7.3 + * Mon May 19 2008 Dan Horak 0.7.2-1 - upgrade to 0.7.2 - use supplied icons and desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 May 2008 06:35:50 -0000 1.5 +++ sources 4 Jul 2008 14:52:51 -0000 1.6 @@ -1 +1 @@ -97a261c3296061e66a959ef9d714bdd1 QLandkarte-0.7.2.tar.gz +51f804235511f1c10ae8538f86743135 QLandkarte_0.7.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 14:55:43 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 4 Jul 2008 14:55:43 GMT Subject: rpms/qlandkarte/F-8 .cvsignore, 1.4, 1.5 qlandkarte.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807041455.m64Ethtq015633@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/qlandkarte/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15553 Modified Files: .cvsignore qlandkarte.spec sources Log Message: * Fri Jul 4 2008 Dan Horak 0.7.3-1 - upgrade to 0.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 May 2008 06:40:14 -0000 1.4 +++ .cvsignore 4 Jul 2008 14:54:55 -0000 1.5 @@ -1 +1 @@ -QLandkarte-0.7.2.tar.gz +QLandkarte_0.7.3.tar.gz Index: qlandkarte.spec =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/F-8/qlandkarte.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qlandkarte.spec 20 May 2008 06:40:14 -0000 1.4 +++ qlandkarte.spec 4 Jul 2008 14:54:55 -0000 1.5 @@ -1,14 +1,15 @@ %define cap_name QLandkarte Name: qlandkarte -Version: 0.7.2 +Version: 0.7.3 +%define cap_name_version %{cap_name}_%{version} Release: 1%{?dist} Summary: A tool to visualize maps and other GPS information for Garmin devices Group: Applications/Communications License: GPLv2+ URL: http://qlandkarte.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{cap_name_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel proj-devel libusb-devel desktop-file-utils @@ -18,7 +19,7 @@ %prep -%setup -q -n %{cap_name}-%{version} +%setup -q -n %{cap_name_version} %build @@ -75,6 +76,9 @@ %changelog +* Fri Jul 4 2008 Dan Horak 0.7.3-1 +- upgrade to 0.7.3 + * Mon May 19 2008 Dan Horak 0.7.2-1 - upgrade to 0.7.2 - use supplied icons and desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qlandkarte/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 May 2008 06:40:14 -0000 1.5 +++ sources 4 Jul 2008 14:54:55 -0000 1.6 @@ -1 +1 @@ -97a261c3296061e66a959ef9d714bdd1 QLandkarte-0.7.2.tar.gz +51f804235511f1c10ae8538f86743135 QLandkarte_0.7.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 14:59:15 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Fri, 4 Jul 2008 14:59:15 GMT Subject: rpms/fbpanel/F-8 fbpanel-4.12-icon.patch, NONE, 1.1 fbpanel.spec, 1.1, 1.2 Message-ID: <200807041459.m64ExFwf015846@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/fbpanel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15792 Modified Files: fbpanel.spec Added Files: fbpanel-4.12-icon.patch Log Message: Add icon.patch fbpanel-4.12-icon.patch: --- NEW FILE fbpanel-4.12-icon.patch --- --- config/default.cfg 2007-07-31 01:59:09.000000000 +0200 +++ config/default.patch 2008-07-04 16:14:33.000000000 +0200 @@ -137,7 +137,7 @@ Plugin { type = menu config { - image = PREFIX/share/fbpanel/images/star.png + image = PREFIX/share/icons/Fedora/32x32/places/start-here.png systemmenu { } separator { @@ -153,12 +153,12 @@ icon = gnome-terminal name = terminal #image = PREFIX/share/fbpanel/images/gnome_terminal.svg - action = xterm + action = gnome-terminal } item { - icon = gnome-emacs - name = emacs - action = emacs + icon = accessories-text-editor + name = texteditor + action = gedit } } @@ -180,14 +180,14 @@ button { icon = gnome-fs-home #image = PREFIX/share/fbpanel/images/file-manager.svg - tooltip = ROX file manager - action = rox + tooltip = Nautilus file manager + action = nautilus } button { icon = gnome-terminal tooltip = Terminal - action = xterm + action = gnome-terminal } button { @@ -196,9 +196,9 @@ action =firefox } button { - icon = gnome-emacs - tooltip = Emacs - action = emacs + icon = accessories-text-editor + tooltip = Texteditor + action = gedit } } Index: fbpanel.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbpanel/F-8/fbpanel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fbpanel.spec 19 Jun 2008 14:51:04 -0000 1.1 +++ fbpanel.spec 4 Jul 2008 14:58:29 -0000 1.2 @@ -1,6 +1,6 @@ Name: fbpanel Version: 4.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight X11 desktop panel Group: User Interface/Desktops @@ -11,6 +11,7 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz Source1: %{name}.desktop Patch: fbpanel-4.12-libdir.patch +Patch1: fbpanel-4.12-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libXpm-devel libXmu-devel desktop-file-utils @@ -23,6 +24,7 @@ %prep %setup -q %patch -p1 -b .libdir +%patch1 -p0 sed -i.stamp -e 's|install -m|install -p -m|' \ Makefile */Makefile @@ -85,6 +87,10 @@ %changelog +* Fri Jul 04 2008 Stefan Posdzich - 4.12-6 +- Add icon.patch to bring the Fedora icon to the panel +- Modified the existing apps in the Panel (like emacs -> gedit) + * Wed Jun 18 2008 Stefan Posdzich - 4.12-5 - Add comment about the license - Remove redundant Source2: From fedora-extras-commits at redhat.com Fri Jul 4 15:10:45 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal)) Date: Fri, 4 Jul 2008 15:10:45 GMT Subject: rpms/perl/devel perl.spec,1.175,1.176 Message-ID: <200807041510.m64FAjuI023048@cvs-int.fedora.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22974 Modified Files: perl.spec Log Message: whitespace fix Index: perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- perl.spec 3 Jul 2008 09:47:23 -0000 1.175 +++ perl.spec 4 Jul 2008 15:09:52 -0000 1.176 @@ -164,13 +164,13 @@ # # The original script might be /usr/lib/rpm/perl.req or # /usr/lib/rpm/redhat/perl.req, better use the original value of the macro: -%{expand:%%define prev__perl_requires %{__perl_requires}} +%{expand:%%define prev__perl_requires %{__perl_requires}} %define __perl_requires %{SOURCE11} %{prev__perl_requires} # When _use_internal_dependency_generator is 0, the perl.req script is # called from /usr/lib/rpm{,/redhat}/find-requires.sh # Likewise: -%{expand:%%define prev__find_requires %{__find_requires}} +%{expand:%%define prev__find_requires %{__find_requires}} %define __find_requires %{SOURCE11} %{prev__find_requires} From fedora-extras-commits at redhat.com Fri Jul 4 15:13:18 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Fri, 4 Jul 2008 15:13:18 GMT Subject: rpms/fbpanel/F-9 fbpanel-4.12-icon.patch, NONE, 1.1 fbpanel.spec, 1.1, 1.2 Message-ID: <200807041513.m64FDIpN023218@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/fbpanel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23126 Modified Files: fbpanel.spec Added Files: fbpanel-4.12-icon.patch Log Message: Add icon.patch fbpanel-4.12-icon.patch: --- NEW FILE fbpanel-4.12-icon.patch --- --- config/default.cfg 2007-07-31 01:59:09.000000000 +0200 +++ config/default.patch 2008-07-04 16:14:33.000000000 +0200 @@ -137,7 +137,7 @@ Plugin { type = menu config { - image = PREFIX/share/fbpanel/images/star.png + image = PREFIX/share/icons/Fedora/32x32/places/start-here.png systemmenu { } separator { @@ -153,12 +153,12 @@ icon = gnome-terminal name = terminal #image = PREFIX/share/fbpanel/images/gnome_terminal.svg - action = xterm + action = gnome-terminal } item { - icon = gnome-emacs - name = emacs - action = emacs + icon = accessories-text-editor + name = texteditor + action = gedit } } @@ -180,14 +180,14 @@ button { icon = gnome-fs-home #image = PREFIX/share/fbpanel/images/file-manager.svg - tooltip = ROX file manager - action = rox + tooltip = Nautilus file manager + action = nautilus } button { icon = gnome-terminal tooltip = Terminal - action = xterm + action = gnome-terminal } button { @@ -196,9 +196,9 @@ action =firefox } button { - icon = gnome-emacs - tooltip = Emacs - action = emacs + icon = accessories-text-editor + tooltip = Texteditor + action = gedit } } Index: fbpanel.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbpanel/F-9/fbpanel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fbpanel.spec 19 Jun 2008 14:52:49 -0000 1.1 +++ fbpanel.spec 4 Jul 2008 15:12:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: fbpanel Version: 4.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight X11 desktop panel Group: User Interface/Desktops @@ -11,6 +11,7 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz Source1: %{name}.desktop Patch: fbpanel-4.12-libdir.patch +Patch1: fbpanel-4.12-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libXpm-devel libXmu-devel desktop-file-utils @@ -23,6 +24,7 @@ %prep %setup -q %patch -p1 -b .libdir +%patch1 -p0 sed -i.stamp -e 's|install -m|install -p -m|' \ Makefile */Makefile @@ -85,6 +87,10 @@ %changelog +* Fri Jul 04 2008 Stefan Posdzich - 4.12-6 +- Add icon.patch to bring the Fedora icon to the panel +- Modified the existing apps in the Panel (like emacs -> gedit) + * Wed Jun 18 2008 Stefan Posdzich - 4.12-5 - Add comment about the license - Remove redundant Source2: From fedora-extras-commits at redhat.com Fri Jul 4 15:19:24 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 4 Jul 2008 15:19:24 GMT Subject: rpms/coreutils/devel coreutils-authors.patch, NONE, 1.1 coreutils-who_texinfo.patch, NONE, 1.1 coreutils.spec, 1.219, 1.220 Message-ID: <200807041519.m64FJO5A023549@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466 Modified Files: coreutils.spec Added Files: coreutils-authors.patch coreutils-who_texinfo.patch Log Message: fix authors of basename/echo, add missing option to who info pages, print last runlevel in who -r only for printable chars coreutils-authors.patch: --- NEW FILE coreutils-authors.patch --- Signed-off-by: Ond??ej Va????k Signed-off-by: Jim Meyering * src/echo.c (AUTHORS) : Use bash builtin echo authors instead of FIXME unknown * src/basename.c (AUTHORS): List David as the author. * AUTHORS: Update here, too. --- AUTHORS | 4 ++-- src/basename.c | 2 +- src/echo.c | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/basename.c b/src/basename.c index 38e8879..69b708f 100644 --- a/src/basename.c +++ b/src/basename.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "basename" -#define AUTHORS proper_name ("FIXME unknown") +#define AUTHORS proper_name ("David MacKenzie") void usage (int status) diff --git a/AUTHORS b/AUTHORS index 404cf70..666edc1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,7 +3,7 @@ each followed by the name(s) of its author(s). arch: David MacKenzie, Karel Zak base64: Simon Josefsson -basename: FIXME unknown +basename: David MacKenzie cat: Torbj??rn Granlund, Richard M. Stallman chcon: Russell Coker, Jim Meyering chgrp: David MacKenzie, Jim Meyering @@ -22,7 +22,7 @@ dir: Richard M. Stallman, David MacKenzie dircolors: H. Peter Anvin dirname: David MacKenzie, Jim Meyering du: Torbj??rn Granlund, David MacKenzie, Paul Eggert, Jim Meyering -echo: FIXME unknown +echo: Brian Fox, Chet Ramey env: Richard Mlynarik, David MacKenzie expand: David MacKenzie expr: Mike Parker diff --git a/src/echo.c b/src/echo.c index ebbf5b8..11e648e 100644 --- a/src/echo.c +++ b/src/echo.c @@ -24,7 +24,9 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "echo" -#define AUTHORS proper_name ("FIXME unknown") +#define AUTHORS \ + proper_name ("Brian Fox"), \ + proper_name ("Chet Ramey") /* echo [-neE] [arg ...] Output the ARGs. If -n is specified, the trailing newline is coreutils-who_texinfo.patch: --- NEW FILE coreutils-who_texinfo.patch --- >From 63467fa18794f02497c7a46e3b7783ba1180f8fc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 4 Jul 2008 16:34:39 +0200 Subject: [PATCH] who -r: don't print "last=" when the corresponding byte is unprintable * src/who.c (print_runlevel): Print last=%c only when the "preceding run-level" byte is printable. Reported by Gian Piero De Lolliis in . --- src/who.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/who.c b/src/who.c index 5529618..0bba912 100644 --- a/src/who.c +++ b/src/who.c @@ -30,6 +30,7 @@ #include #include "system.h" +#include "c-ctype.h" #include "canon-host.h" #include "readutmp.h" #include "error.h" @@ -511,7 +512,7 @@ print_runlevel (const STRUCT_UTMP *utmp_ent) sprintf (comment, "%s%c", _("last="), (last == 'N') ? 'S' : last); print_line (-1, "", ' ', -1, runlevline, time_string (utmp_ent), - "", "", comment, ""); + "", "", c_isprint (last) ? comment : "", ""); return; } -- 1.5.6.1.206.g8dcaf96 >From 10db2e5e05c67eea205b3ec76a2408f46356a7fd Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Wed, 2 Jul 2008 14:11:05 +0200 Subject: [PATCH] doci: describe who's -p -r and -t options * doc/coreutils.texi (who invocation): --- doc/coreutils.texi | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 155ba8d..c0ea237 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -12710,6 +12710,24 @@ automatic dial-up internet access. @opindex --heading Print a line of column headings. + at item -p + at itemx --process + at opindex -p + at opindex --process +List active processes spawned by init. + + at item -r + at itemx --runlevel + at opindex -r + at opindex --runlevel +Print the current (and maybe previous) run-level of the init process. + + at item -t + at itemx --time + at opindex -t + at opindex --time +Print last system clock change. + @item -w @itemx -T @itemx --mesg -- 1.5.2.2 Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- coreutils.spec 16 Jun 2008 14:50:18 -0000 1.219 +++ coreutils.spec 4 Jul 2008 15:18:41 -0000 1.220 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.12 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -19,6 +19,8 @@ # From upstream Patch1: coreutils-futimensatkoji.patch +Patch2: coreutils-authors.patch +Patch3: coreutils-who_texinfo.patch # Our patches Patch100: coreutils-6.10-configuration.patch @@ -100,6 +102,8 @@ # From upstream %patch1 -p1 -b .kojifutimensat +%patch2 -p1 -b .authors +%patch3 -p1 -b .whotexinfo # Our patches %patch100 -p1 -b .configure @@ -312,6 +316,11 @@ /sbin/runuser %changelog +* Fri Jul 04 2008 Ondrej Vasik - 6.12-5 +- fix authors for basename and echo +- fix who info pages, print last runlevel only for printable + chars + * Mon Jun 16 2008 Ondrej Vasik - 6.12-4 - print verbose output of chcon with newline after each message (#451478) From fedora-extras-commits at redhat.com Fri Jul 4 15:25:46 2008 From: fedora-extras-commits at redhat.com (Harald Hoyer (harald)) Date: Fri, 4 Jul 2008 15:25:46 GMT Subject: rpms/udev/F-9 udev-120-rhrules.patch,1.1,1.2 udev.spec,1.247,1.248 Message-ID: <200807041525.m64FPke8024399@cvs-int.fedora.redhat.com> Author: harald Update of /cvs/pkgs/rpms/udev/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24338 Modified Files: udev-120-rhrules.patch udev.spec Log Message: * Fri Jul 04 2008 Harald Hoyer 124-1.2 - make block devices 0660 as an interim fix (rhbz#451320) udev-120-rhrules.patch: Index: udev-120-rhrules.patch =================================================================== RCS file: /cvs/pkgs/rpms/udev/F-9/udev-120-rhrules.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- udev-120-rhrules.patch 12 Jun 2008 11:01:06 -0000 1.1 +++ udev-120-rhrules.patch 4 Jul 2008 15:25:00 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up udev-121/etc/udev/redhat/40-redhat.rules.rhrules udev-121/etc/udev/redhat/40-redhat.rules ---- udev-121/etc/udev/redhat/40-redhat.rules.rhrules 2008-05-09 09:22:23.000000000 +0200 -+++ udev-121/etc/udev/redhat/40-redhat.rules 2008-05-16 11:58:39.000000000 +0200 +diff -up udev-124/etc/udev/redhat/40-redhat.rules.rhrules udev-124/etc/udev/redhat/40-redhat.rules +--- udev-124/etc/udev/redhat/40-redhat.rules.rhrules 2008-06-12 07:24:30.000000000 +0200 ++++ udev-124/etc/udev/redhat/40-redhat.rules 2008-07-04 17:22:31.000000000 +0200 @@ -23,3 +23,6 @@ KERNEL=="vcs[0-9]*", OWNER="vc KERNEL=="vcsa", OWNER="vcsa", GROUP="tty" KERNEL=="vcsa[0-9]*", OWNER="vcsa", GROUP="tty" @@ -8,3 +8,15 @@ + +KERNEL=="event*", ATTRS{idVendor}=="03f0", ATTRS{interface}=="Virtual Mouse", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="input/hp_ilo_mouse" + +diff -up udev-124/etc/udev/rules.d/50-udev-default.rules.rhrules udev-124/etc/udev/rules.d/50-udev-default.rules +--- udev-124/etc/udev/rules.d/50-udev-default.rules.rhrules 2008-07-04 17:22:34.000000000 +0200 ++++ udev-124/etc/udev/rules.d/50-udev-default.rules 2008-07-04 17:22:40.000000000 +0200 +@@ -58,7 +58,7 @@ KERNEL=="lp[0-9]*", GROUP="lp", SYMLINK + KERNEL=="irlpt[0-9]*", GROUP="lp" + + # block, tapes, block-releated +-SUBSYSTEM=="block", GROUP="disk", MODE="0640" ++SUBSYSTEM=="block", GROUP="disk", MODE="0660" + SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n" + SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60" + SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900" Index: udev.spec =================================================================== RCS file: /cvs/pkgs/rpms/udev/F-9/udev.spec,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- udev.spec 17 Jun 2008 10:37:22 -0000 1.247 +++ udev.spec 4 Jul 2008 15:25:00 -0000 1.248 @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 124 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -405,6 +405,9 @@ %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Fri Jul 04 2008 Harald Hoyer 124-1.2 +- make block devices 0660 as an interim fix (rhbz#451320) + * Tue Jun 17 2008 Harald Hoyer 124-1.1 - readded udevcontrol, udevtrigger symlinks for Fedora 9, which are needed by live-cd-tools From fedora-extras-commits at redhat.com Fri Jul 4 15:58:36 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Fri, 4 Jul 2008 15:58:36 GMT Subject: rpms/PackageKit/F-9 PackageKit.spec,1.37,1.38 Message-ID: <200807041558.m64FwaGi028748@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28572 Modified Files: PackageKit.spec Log Message: * Fri Jul 04 2008 Richard Hughes - 0.2.3-2 - Fix the .. release string. Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- PackageKit.spec 4 Jul 2008 13:04:55 -0000 1.37 +++ PackageKit.spec 4 Jul 2008 15:57:42 -0000 1.38 @@ -10,7 +10,7 @@ Name: PackageKit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 1.%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org @@ -196,6 +196,9 @@ %{_includedir}/* %changelog +* Fri Jul 04 2008 Richard Hughes - 0.2.3-2 +- Fix the .. release string. + * Fri Jul 04 2008 Richard Hughes - 0.2.3-1 - New upstream stable version (API break from 0.1.12). * Multiple actions in one transaction From fedora-extras-commits at redhat.com Fri Jul 4 15:59:16 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Fri, 4 Jul 2008 15:59:16 GMT Subject: rpms/gnome-packagekit/F-9 gnome-packagekit.spec,1.39,1.40 Message-ID: <200807041559.m64FxGAY028957@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28713 Modified Files: gnome-packagekit.spec Log Message: * Fri Jul 04 2008 Richard Hughes - 0.2.3-3 - Fix the .. release string. Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gnome-packagekit.spec 4 Jul 2008 13:24:40 -0000 1.39 +++ gnome-packagekit.spec 4 Jul 2008 15:58:29 -0000 1.40 @@ -6,7 +6,7 @@ Name: gnome-packagekit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 2.%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -143,6 +143,9 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Fri Jul 04 2008 Richard Hughes - 0.2.3-3 +- Fix the .. release string. + * Fri Jul 04 2008 Richard Hughes - 0.2.3-2 - Require PackageKit 0.2.3 to keep koji happy. From fedora-extras-commits at redhat.com Fri Jul 4 16:06:40 2008 From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger)) Date: Fri, 4 Jul 2008 16:06:40 GMT Subject: rpms/pcre/devel pcre-7.3-CVE-2008-2371.patch, NONE, 1.1 pcre.spec, 1.27, 1.28 Message-ID: <200807041606.m64G6e2O004062@cvs-int.fedora.redhat.com> Author: thoger Update of /cvs/extras/rpms/pcre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3985 Modified Files: pcre.spec Added Files: pcre-7.3-CVE-2008-2371.patch Log Message: Add patch for CVE-2008-2371 reported by Tavis Ormandy. pcre-7.3-CVE-2008-2371.patch: --- NEW FILE pcre-7.3-CVE-2008-2371.patch --- Patch for CVE-2008-2371: Fix propsed by the reporter of the issue - Tavis Ormandy. Reviewed by upstream, but not yet in upstream SVN as of 2008-07-04. --- pcre-7.3/pcre_compile.c.orig 2008-07-04 16:19:28.000000000 +0200 +++ pcre-7.3/pcre_compile.c 2008-07-04 16:20:19.000000000 +0200 @@ -4709,7 +4709,7 @@ for (;; ptr++) (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) { cd->external_options = newoptions; - options = newoptions; + *optionsptr = options = newoptions; } else { Index: pcre.spec =================================================================== RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pcre.spec 15 Feb 2008 07:48:09 -0000 1.27 +++ pcre.spec 4 Jul 2008 16:05:48 -0000 1.28 @@ -1,11 +1,12 @@ Name: pcre Version: 7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 Patch0: pcre-7.3-multilib.patch Patch1: pcre-7.3-CVE-2008-0674.patch +Patch2: pcre-7.3-CVE-2008-2371.patch License: BSD Group: System Environment/Libraries BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -29,7 +30,10 @@ %prep %setup -q %patch0 -p1 -b .multilib +# backport from the upstream 7.6 %patch1 -p1 -b .CVE-2008-0674 +# not yet applied in upstream SVN (2008-07-04) +%patch2 -p1 -b .CVE-2008-2371 %build %configure --enable-utf8 --enable-unicode-properties @@ -84,6 +88,9 @@ %changelog +* Fri Jul 4 2008 Tomas Hoger - 7.3-4 +- Apply Tavis Ormandy's patch for CVE-2008-2371. + * Tue Feb 12 2008 Tomas Hoger - 7.3-3 - Backport patch from upstream pcre 7.6 to address buffer overflow caused by "a character class containing a very large number of From fedora-extras-commits at redhat.com Fri Jul 4 16:10:23 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 4 Jul 2008 16:10:23 GMT Subject: rpms/sgml-common/devel sgml-common.spec,1.21,1.22 Message-ID: <200807041610.m64GANF6004940@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/sgml-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4689 Modified Files: sgml-common.spec Log Message: mark xmlcatalog as config(noreplace) and move it to sysconfdir to prevent overwriting of it(make symlink in old destination) Index: sgml-common.spec =================================================================== RCS file: /cvs/extras/rpms/sgml-common/devel/sgml-common.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sgml-common.spec 30 Jun 2008 05:36:06 -0000 1.21 +++ sgml-common.spec 4 Jul 2008 16:09:34 -0000 1.22 @@ -1,6 +1,6 @@ Name: sgml-common Version: 0.6.3 -Release: 24%{?dist} +Release: 25%{?dist} Group: Applications/Text Summary: Common SGML catalog and DTD files @@ -70,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" htmldir='%{_datadir}/doc' INSTALL='install -p' mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xml +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook mkdir -p $RPM_BUILD_ROOT%{_datadir}/sgml/docbook # Create an empty XML catalog. XMLCATALOG=$RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog @@ -77,21 +78,23 @@ # Now put the common DocBook entries in it %{_bindir}/xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ - "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG %{_bindir}/xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ - "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG %{_bindir}/xmlcatalog --noout --add "delegatePublic" \ "ISO 8879:1986" \ - "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG %{_bindir}/xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/" \ - "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG %{_bindir}/xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/" \ - "file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG # Also create the common DocBook catalog %{_bindir}/xmlcatalog --noout --create \ + $RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook/xmlcatalog +ln -s %{_sysconfdir}/sgml/docbook/xmlcatalog\ $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xmlcatalog rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/xml.dcl @@ -129,12 +132,18 @@ %defattr (-,root,root,-) %dir %{_sysconfdir}/xml %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/catalog +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook/xmlcatalog %dir %{_datadir}/sgml %dir %{_datadir}/sgml/docbook -%verify(not md5 size mtime) %{_datadir}/sgml/docbook/xmlcatalog +%{_datadir}/sgml/docbook/xmlcatalog %dir %{_datadir}/xml %changelog +* Tue Jul 01 2008 Ondrej Vasik 0.6.3-25 +- mark xmlcatalog config(noreplace) to prevent overwriting + of the content, move it to sysconfdir and make symlink for + it to silence rpmlint + * Mon Jun 30 2008 Ondrej Vasik 0.6.3-24 - mark catalog files as (not md5 size mtime) for verify to prevent info about changed files (#453271) From fedora-extras-commits at redhat.com Fri Jul 4 16:15:10 2008 From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger)) Date: Fri, 4 Jul 2008 16:15:10 GMT Subject: rpms/pcre/F-8 pcre-7.3-CVE-2008-2371.patch, NONE, 1.1 pcre.spec, 1.26, 1.27 Message-ID: <200807041615.m64GFAk3005751@cvs-int.fedora.redhat.com> Author: thoger Update of /cvs/extras/rpms/pcre/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5603/F-8 Modified Files: pcre.spec Added Files: pcre-7.3-CVE-2008-2371.patch Log Message: Add patch for CVE-2008-2371 reported by Tavis Ormandy. pcre-7.3-CVE-2008-2371.patch: --- NEW FILE pcre-7.3-CVE-2008-2371.patch --- Patch for CVE-2008-2371: Fix propsed by the reporter of the issue - Tavis Ormandy. Reviewed by upstream, but not yet in upstream SVN as of 2008-07-04. --- pcre-7.3/pcre_compile.c.orig 2008-07-04 16:19:28.000000000 +0200 +++ pcre-7.3/pcre_compile.c 2008-07-04 16:20:19.000000000 +0200 @@ -4709,7 +4709,7 @@ for (;; ptr++) (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) { cd->external_options = newoptions; - options = newoptions; + *optionsptr = options = newoptions; } else { Index: pcre.spec =================================================================== RCS file: /cvs/extras/rpms/pcre/F-8/pcre.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- pcre.spec 15 Feb 2008 09:01:54 -0000 1.26 +++ pcre.spec 4 Jul 2008 16:14:18 -0000 1.27 @@ -1,11 +1,12 @@ Name: pcre Version: 7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 Patch0: pcre-7.3-multilib.patch Patch1: pcre-7.3-CVE-2008-0674.patch +Patch2: pcre-7.3-CVE-2008-2371.patch License: BSD Group: System Environment/Libraries BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -29,7 +30,10 @@ %prep %setup -q %patch0 -p1 -b .multilib +# backport from the upstream 7.6 %patch1 -p1 -b .CVE-2008-0674 +# not yet applied in upstream SVN (2008-07-04) +%patch2 -p1 -b .CVE-2008-2371 %build %configure --enable-utf8 --enable-unicode-properties @@ -84,6 +88,9 @@ %changelog +* Fri Jul 4 2008 Tomas Hoger - 7.3-4 +- Apply Tavis Ormandy's patch for CVE-2008-2371. + * Tue Feb 12 2008 Tomas Hoger - 7.3-3 - Backport patch from upstream pcre 7.6 to address buffer overflow caused by "a character class containing a very large number of From fedora-extras-commits at redhat.com Fri Jul 4 16:15:28 2008 From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger)) Date: Fri, 4 Jul 2008 16:15:28 GMT Subject: rpms/pcre/F-9 pcre-7.3-CVE-2008-2371.patch, NONE, 1.1 pcre.spec, 1.27, 1.28 Message-ID: <200807041615.m64GFSmx005763@cvs-int.fedora.redhat.com> Author: thoger Update of /cvs/extras/rpms/pcre/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5603/F-9 Modified Files: pcre.spec Added Files: pcre-7.3-CVE-2008-2371.patch Log Message: Add patch for CVE-2008-2371 reported by Tavis Ormandy. pcre-7.3-CVE-2008-2371.patch: --- NEW FILE pcre-7.3-CVE-2008-2371.patch --- Patch for CVE-2008-2371: Fix propsed by the reporter of the issue - Tavis Ormandy. Reviewed by upstream, but not yet in upstream SVN as of 2008-07-04. --- pcre-7.3/pcre_compile.c.orig 2008-07-04 16:19:28.000000000 +0200 +++ pcre-7.3/pcre_compile.c 2008-07-04 16:20:19.000000000 +0200 @@ -4709,7 +4709,7 @@ for (;; ptr++) (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) { cd->external_options = newoptions; - options = newoptions; + *optionsptr = options = newoptions; } else { Index: pcre.spec =================================================================== RCS file: /cvs/extras/rpms/pcre/F-9/pcre.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pcre.spec 15 Feb 2008 07:48:09 -0000 1.27 +++ pcre.spec 4 Jul 2008 16:14:40 -0000 1.28 @@ -1,11 +1,12 @@ Name: pcre Version: 7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 Patch0: pcre-7.3-multilib.patch Patch1: pcre-7.3-CVE-2008-0674.patch +Patch2: pcre-7.3-CVE-2008-2371.patch License: BSD Group: System Environment/Libraries BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -29,7 +30,10 @@ %prep %setup -q %patch0 -p1 -b .multilib +# backport from the upstream 7.6 %patch1 -p1 -b .CVE-2008-0674 +# not yet applied in upstream SVN (2008-07-04) +%patch2 -p1 -b .CVE-2008-2371 %build %configure --enable-utf8 --enable-unicode-properties @@ -84,6 +88,9 @@ %changelog +* Fri Jul 4 2008 Tomas Hoger - 7.3-4 +- Apply Tavis Ormandy's patch for CVE-2008-2371. + * Tue Feb 12 2008 Tomas Hoger - 7.3-3 - Backport patch from upstream pcre 7.6 to address buffer overflow caused by "a character class containing a very large number of From fedora-extras-commits at redhat.com Fri Jul 4 16:21:48 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 4 Jul 2008 16:21:48 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1555,1.1556 Message-ID: <200807041621.m64GLmFQ006679@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6567 Modified Files: openoffice.org.spec Log Message: new files Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1555 retrieving revision 1.1556 diff -u -r1.1555 -r1.1556 --- openoffice.org.spec 4 Jul 2008 12:30:53 -0000 1.1555 +++ openoffice.org.spec 4 Jul 2008 16:20:58 -0000 1.1556 @@ -2039,6 +2039,7 @@ %{basisinstdir}/program/classes/jut.jar %{basisinstdir}/program/classes/query.jar %{basisinstdir}/program/classes/letter.jar +%{basisinstdir}/program/classes/LuceneHelpWrapper.jar %{basisinstdir}/program/classes/officebean.jar %{basisinstdir}/program/classes/report.jar %{basisinstdir}/program/classes/sdbc_hsqldb.jar @@ -2195,6 +2196,7 @@ %{basisinstdir}/program/libucphier1.so %{basisinstdir}/program/libucppkg1.so %{basisinstdir}/program/libunopkg.so +%{basisinstdir}/program/libunopkgapp.so %{basisinstdir}/program/libunoxml%{SOPOST}.so %{basisinstdir}/program/libupdchk%{SOPOST}.so %{basisinstdir}/program/libuui%{SOPOST}.so From fedora-extras-commits at redhat.com Fri Jul 4 16:25:56 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 16:25:56 GMT Subject: rpms/libprelude/devel .cvsignore, 1.7, 1.8 libprelude.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200807041625.m64GPuGs007079@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/libprelude/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7011 Modified Files: .cvsignore libprelude.spec sources Log Message: * Fri Jul 04 2008 Steve Grubb - 0.9.17.2-1 - Update to latest upstream and update perl bindings generation (#453932) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libprelude/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 May 2008 20:44:14 -0000 1.7 +++ .cvsignore 4 Jul 2008 16:25:05 -0000 1.8 @@ -2,3 +2,4 @@ libprelude-0.9.16.1.tar.gz libprelude-0.9.16.2.tar.gz libprelude-0.9.17.1.tar.gz +libprelude-0.9.17.2.tar.gz Index: libprelude.spec =================================================================== RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libprelude.spec 25 Jun 2008 16:21:20 -0000 1.14 +++ libprelude.spec 4 Jul 2008 16:25:05 -0000 1.15 @@ -2,8 +2,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libprelude -Version: 0.9.17.1 -Release: 2%{?dist} +Version: 0.9.17.2 +Release: 1%{?dist} Summary: The prelude library Group: System Environment/Libraries @@ -44,7 +44,7 @@ sensor. %package python -Summary: Header files and libraries for libprelude development +Summary: Python bindings for libprelude Group: System Environment/Libraries Requires: libprelude = %{version}-%{release} @@ -52,10 +52,11 @@ Python bindings for libprelude. %package perl -Summary: Header files and libraries for libprelude development +Summary: Perl bindings for libprelude Group: System Environment/Libraries BuildRequires: perl-devel Requires: libprelude = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings for libprelude. @@ -71,6 +72,8 @@ # removing rpath sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile.in +sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool + make %{?_smp_mflags} %install @@ -79,13 +82,12 @@ mkdir -p %{buildroot}%{perl_vendorarch} make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" cp -p AUTHORS ChangeLog README NEWS COPYING LICENSE.README HACKING.README \ -%{buildroot}%{_defaultdocdir}/%{name}-%{version} + %{buildroot}%{_defaultdocdir}/%{name}-%{version} rm -f %{buildroot}/%{_libdir}/libprelude.la -rm -f %{buildroot}%{python_sitelib}/auto/.packlist -rm -f %{buildroot}%{python_sitelib}/auto/Prelude.bs -rm -f %{buildroot}%{perl_vendorarch}/auto/Prelude/.packlist -rm -f %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.bs -rm -f %{buildroot}%{perl_archlib}/perllocal.pod +chmod 755 %{buildroot}%{python_sitearch}/_prelude.so +find %{buildroot} -type f \( -name .packlist -o -name perllocal.pod \) -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' + # Fix time stamp for both 32 and 64 bit libraries touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/* @@ -116,15 +118,19 @@ %{_datadir}/aclocal/libprelude.m4 %files python +%defattr(-,root,root) %{python_sitearch}/* %files perl %defattr(0755,root,root) %attr(0644,root,root) %{perl_vendorarch}/Prelude.pm -%{perl_vendorarch}/auto/* +%{perl_vendorarch}/auto/Prelude/ %changelog +* Fri Jul 04 2008 Steve Grubb - 0.9.17.2-1 +- Update to latest upstream and update perl bindings generation (#453932) + * Wed Jun 25 2008 Tomas Mraz - 0.9.17.1-2 - fixed build of perl bindings Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libprelude/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 May 2008 20:44:14 -0000 1.8 +++ sources 4 Jul 2008 16:25:05 -0000 1.9 @@ -1 +1 @@ -abe66d80a4a392121c9e158d96fc767f libprelude-0.9.17.1.tar.gz +7c769293b4d79be2667993b8a88d42ac libprelude-0.9.17.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 16:29:55 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 4 Jul 2008 16:29:55 GMT Subject: rpms/coreutils/F-9 coreutils-6.10-whorunlevel.patch, NONE, 1.1 coreutils-authors.patch, NONE, 1.1 coreutils.spec, 1.213, 1.214 Message-ID: <200807041629.m64GTtNC007323@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7231 Modified Files: coreutils.spec Added Files: coreutils-6.10-whorunlevel.patch coreutils-authors.patch Log Message: who -r should not show last runlevel for nonprintable chars like \0 (#453249), add few missing who options to texinfo manual and add missing authors for basename and echo coreutils-6.10-whorunlevel.patch: --- NEW FILE coreutils-6.10-whorunlevel.patch --- >From 63467fa18794f02497c7a46e3b7783ba1180f8fc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 4 Jul 2008 16:34:39 +0200 Subject: [PATCH] who -r: don't print "last=" when the corresponding byte is unprintable * src/who.c (print_runlevel): Print last=%c only when the "preceding run-level" byte is printable. Reported by Gian Piero De Lolliis in . --- src/who.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/who.c b/src/who.c index 5529618..0bba912 100644 --- a/src/who.c +++ b/src/who.c @@ -30,6 +30,7 @@ #include #include "system.h" +#include "c-ctype.h" #include "canon-host.h" #include "readutmp.h" #include "error.h" @@ -511,7 +512,7 @@ print_runlevel (const STRUCT_UTMP *utmp_ent) sprintf (comment, "%s%c", _("last="), (last == 'N') ? 'S' : last); print_line (-1, "", ' ', -1, runlevline, time_string (utmp_ent), - "", "", comment, ""); + "", "", c_isprint (last) ? comment : "", ""); return; } -- 1.5.6.1.206.g8dcaf96 >From 10db2e5e05c67eea205b3ec76a2408f46356a7fd Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Wed, 2 Jul 2008 14:11:05 +0200 Subject: [PATCH] doci: describe who's -p -r and -t options * doc/coreutils.texi (who invocation): --- doc/coreutils.texi | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 155ba8d..c0ea237 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -12710,6 +12710,24 @@ automatic dial-up internet access. @opindex --heading Print a line of column headings. + at item -p + at itemx --process + at opindex -p + at opindex --process +List active processes spawned by init. + + at item -r + at itemx --runlevel + at opindex -r + at opindex --runlevel +Print the current (and maybe previous) run-level of the init process. + + at item -t + at itemx --time + at opindex -t + at opindex --time +Print last system clock change. + @item -w @itemx -T @itemx --mesg -- 1.5.2.2 coreutils-authors.patch: --- NEW FILE coreutils-authors.patch --- Signed-off-by: Ond??ej Va????k Signed-off-by: Jim Meyering * src/echo.c (AUTHORS) : Use bash builtin echo authors instead of FIXME unknown * src/basename.c (AUTHORS): List David as the author. * AUTHORS: Update here, too. --- AUTHORS | 4 ++-- src/basename.c | 2 +- src/echo.c | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/basename.c b/src/basename.c index 38e8879..69b708f 100644 --- a/src/basename.c +++ b/src/basename.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "basename" -#define AUTHORS "FIXME unknown" +#define AUTHORS "David MacKenzie" /* The name this program was run with. */ char *program_name; diff --git a/AUTHORS b/AUTHORS index 404cf70..666edc1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,7 +3,7 @@ each followed by the name(s) of its author(s). arch: David MacKenzie, Karel Zak base64: Simon Josefsson -basename: FIXME unknown +basename: David MacKenzie cat: Torbjorn Granlund, Richard M. Stallman chcon: Russell Coker, Jim Meyering chgrp: David MacKenzie, Jim Meyering @@ -22,7 +22,7 @@ dir: Richard M. Stallman, David MacKenzie dircolors: H. Peter Anvin dirname: David MacKenzie, Jim Meyering du: Torbjorn Granlund, David MacKenzie, Paul Eggert, Jim Meyering -echo: FIXME unknown +echo: Brian Fox, Chet Ramey env: Richard Mlynarik, David MacKenzie expand: David MacKenzie expr: Mike Parker diff --git a/src/echo.c b/src/echo.c index ebbf5b8..11e648e 100644 --- a/src/echo.c +++ b/src/echo.c @@ -24,7 +24,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "echo" -#define AUTHORS "FIXME unknown" +#define AUTHORS "Brian Fox", "Chet Ramey" /* echo [-neE] [arg ...] Output the ARGs. If -n is specified, the trailing newline is Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils.spec,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- coreutils.spec 16 Jun 2008 15:31:50 -0000 1.213 +++ coreutils.spec 4 Jul 2008 16:29:00 -0000 1.214 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -25,6 +25,8 @@ Patch5: coreutils-6.10-mkscontextsegfault.patch Patch6: coreutils-6.10-md5sha1sum.patch Patch7: coreutils-6.11-matchpathconinstall.patch +Patch8: coreutils-authors.patch +Patch9: coreutils-6.10-whorunlevel.patch # Our patches Patch100: coreutils-chgrp.patch @@ -111,6 +113,8 @@ %patch5 -p1 -b .mksegfault %patch6 -p1 -b .mda5sum %patch7 -p1 -b .matchpathcon +%patch8 -p1 -b .authors +%patch9 -p1 -b .whorunlevel # Our patches %patch100 -p1 -b .chgrp @@ -321,6 +325,11 @@ /sbin/runuser %changelog +* Fri Jul 04 2008 Ondrej Vasik - 6.10-27 +- who -r should not show last runlevel for nonprintable chars + (like \0) - #453249,add few missing who options to texinfo + documentation, add missing authors for basename and echo + * Mon Jun 16 2008 Ondrej Vasik - 6.10-26 - print verbose output of chcon with newline after each message (#451478) From fedora-extras-commits at redhat.com Fri Jul 4 16:30:47 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal)) Date: Fri, 4 Jul 2008 16:30:47 GMT Subject: rpms/autoconf/devel autoconf.spec,1.51,1.52 Message-ID: <200807041630.m64GUlwR007352@cvs-int.fedora.redhat.com> Author: kasal Update of /cvs/extras/rpms/autoconf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7336 Modified Files: autoconf.spec Log Message: - add a quick fix for #449944 - remove Requires: mktemp, imake, grep; these are required by the generated configure, but not by Autoconf. - switch on make check From fedora-extras-commits at redhat.com Fri Jul 4 16:31:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal)) Date: Fri, 4 Jul 2008 16:31:15 GMT Subject: rpms/autoconf/devel autoconf-2.62-449944.patch,NONE,1.1 Message-ID: <200807041631.m64GVFpK007437@cvs-int.fedora.redhat.com> Author: kasal Update of /cvs/extras/rpms/autoconf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7371 Added Files: autoconf-2.62-449944.patch Log Message: - add a quick fix for #449944 - remove Requires: mktemp, imake, grep; these are required by the generated configure, but not by Autoconf. - switch on make check autoconf-2.62-449944.patch: --- NEW FILE autoconf-2.62-449944.patch --- diff -ur autoconf-2.62/ChangeLog autoconf-2.62_new/ChangeLog --- autoconf-2.62/ChangeLog 2008-04-06 01:04:49.000000000 +0200 +++ autoconf-2.62_new/ChangeLog 2008-07-04 17:40:40.000000000 +0200 @@ -1,3 +1,8 @@ +2008-07-04 Stepan Kasal + + * lib/autoconf/c.m4 (AC_C_BIGENDIAN): Remove the checks for + universal binaries, it produced false positives. + 2008-06-16 Ralf Wildenhues Fix '#undef variable /* comment */' transform in config diff -ur autoconf-2.62/lib/autoconf/c.m4 autoconf-2.62_new/lib/autoconf/c.m4 --- autoconf-2.62/lib/autoconf/c.m4 2008-04-06 01:04:48.000000000 +0200 +++ autoconf-2.62_new/lib/autoconf/c.m4 2008-07-04 17:38:31.000000000 +0200 @@ -1407,17 +1407,6 @@ #endif])dnl AC_CACHE_CHECK([whether byte ordering is bigendian], [ac_cv_c_bigendian], [ac_cv_c_bigendian=unknown - m4_ifval(m4_ifdef([AH_HEADER], 1)[$4], - [# See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__) - neither is defined; - #endif - typedef int dummy; - ]])], - [ac_cv_c_bigendian=universal])], - [AC_DIAGNOSE([obsolete], [AC_C_BIGENDIAN suggests AC_CONFIG_HEADERS])]) if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. AC_COMPILE_IFELSE( From fedora-extras-commits at redhat.com Fri Jul 4 16:51:39 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 16:51:39 GMT Subject: rpms/libprelude/F-9 libprelude.spec,1.12,1.13 sources,1.8,1.9 Message-ID: <200807041651.m64GpdfC009122@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/libprelude/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9052 Modified Files: libprelude.spec sources Log Message: * Fri Jul 04 2008 Steve Grubb - 0.9.17.2-1 - Update to latest upstream and update perl bindings generation (#453932) Index: libprelude.spec =================================================================== RCS file: /cvs/pkgs/rpms/libprelude/F-9/libprelude.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libprelude.spec 2 May 2008 20:51:11 -0000 1.12 +++ libprelude.spec 4 Jul 2008 16:50:52 -0000 1.13 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libprelude -Version: 0.9.17.1 +Version: 0.9.17.2 Release: 1%{?dist} Summary: The prelude library @@ -44,7 +44,7 @@ sensor. %package python -Summary: Header files and libraries for libprelude development +Summary: Python bindings for libprelude Group: System Environment/Libraries Requires: libprelude = %{version}-%{release} @@ -52,10 +52,11 @@ Python bindings for libprelude. %package perl -Summary: Header files and libraries for libprelude development +Summary: Perl bindings for libprelude Group: System Environment/Libraries BuildRequires: perl-devel Requires: libprelude = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings for libprelude. @@ -66,10 +67,13 @@ %build %configure --disable-static \ - --with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html + --with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \ + --with-perl-installdirs=vendor # removing rpath sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile.in +sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool + make %{?_smp_mflags} %install @@ -78,14 +82,12 @@ mkdir -p %{buildroot}%{perl_vendorarch} make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" cp -p AUTHORS ChangeLog README NEWS COPYING LICENSE.README HACKING.README \ -%{buildroot}%{_defaultdocdir}/%{name}-%{version} -mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch} + %{buildroot}%{_defaultdocdir}/%{name}-%{version} rm -f %{buildroot}/%{_libdir}/libprelude.la -rm -f %{buildroot}%{python_sitelib}/auto/.packlist -rm -f %{buildroot}%{python_sitelib}/auto/Prelude.bs -rm -f %{buildroot}%{perl_vendorarch}/auto/Prelude/.packlist -rm -f %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.bs -rm -f %{buildroot}%{perl_archlib}/perllocal.pod +chmod 755 %{buildroot}%{python_sitearch}/_prelude.so +find %{buildroot} -type f \( -name .packlist -o -name perllocal.pod \) -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' + # Fix time stamp for both 32 and 64 bit libraries touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/* @@ -116,15 +118,19 @@ %{_datadir}/aclocal/libprelude.m4 %files python +%defattr(-,root,root) %{python_sitearch}/* %files perl %defattr(0755,root,root) %attr(0644,root,root) %{perl_vendorarch}/Prelude.pm -%{perl_vendorarch}/auto/* +%{perl_vendorarch}/auto/Prelude/ %changelog +* Fri Jul 04 2008 Steve Grubb - 0.9.17.2-1 +- Update to latest upstream and update perl bindings generation (#453932) + * Fri May 02 2008 Steve Grubb 0.9.17.1-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libprelude/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 May 2008 20:51:11 -0000 1.8 +++ sources 4 Jul 2008 16:50:52 -0000 1.9 @@ -1 +1 @@ -abe66d80a4a392121c9e158d96fc767f libprelude-0.9.17.1.tar.gz +7c769293b4d79be2667993b8a88d42ac libprelude-0.9.17.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 16:52:52 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Fri, 4 Jul 2008 16:52:52 GMT Subject: rpms/gnome-sharp/devel gnome-sharp-2.20.0-libdir.patch, 1.1, 1.2 gnome-sharp.spec, 1.14, 1.15 Message-ID: <200807041652.m64Gqqbc009393@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gnome-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9252 Modified Files: gnome-sharp-2.20.0-libdir.patch gnome-sharp.spec Log Message: fix pkconfig on gnome-sharp2.0 gnome-sharp-2.20.0-libdir.patch: Index: gnome-sharp-2.20.0-libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp-2.20.0-libdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-sharp-2.20.0-libdir.patch 3 Jul 2008 15:18:15 -0000 1.1 +++ gnome-sharp-2.20.0-libdir.patch 4 Jul 2008 16:52:04 -0000 1.2 @@ -1,11 +1,11 @@ diff -up gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in --- gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in.libdir 2008-07-03 15:07:22.000000000 +0200 -+++ gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in 2008-07-03 15:08:05.000000000 +0200 ++++ gnome-sharp-2.20.0/gconf/GConf/gconf-sharp-2.0.pc.in 2008-07-04 17:58:55.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib -+libdir=${libdir} ++libdir=@libdir@ Name: GConf# @@ -25,36 +25,47 @@ #!/bin/sh - at RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" + at RUNTIME@ ${libdir}/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" +diff -up gnome-sharp-2.20.0/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in.libdir gnome-sharp-2.20.0/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in +--- gnome-sharp-2.20.0/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in.libdir 2008-07-04 17:56:21.000000000 +0200 ++++ gnome-sharp-2.20.0/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in 2008-07-04 17:56:37.000000000 +0200 +@@ -1,6 +1,6 @@ + prefix=${pcfiledir}/../.. + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@libdir@ + + + Name: GConf.PropertyEditors# diff -up gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in --- gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in.libdir 2008-07-03 15:11:16.000000000 +0200 -+++ gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in 2008-07-03 15:11:26.000000000 +0200 ++++ gnome-sharp-2.20.0/art/art-sharp-2.0.pc.in 2008-07-04 17:59:33.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib -+libdir=${libdir} ++libdir=@libdir@ gapidir=${prefix}/share/gapi-2.0 diff -up gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in --- gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in.libdir 2008-07-03 15:10:48.000000000 +0200 -+++ gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2008-07-03 15:11:00.000000000 +0200 ++++ gnome-sharp-2.20.0/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2008-07-04 17:59:18.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib -+libdir=${libdir} ++libdir=@libdir@ gapidir=${prefix}/share/gapi-2.0 diff -up gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in.libdir gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in --- gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in.libdir 2008-07-03 15:10:01.000000000 +0200 -+++ gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in 2008-07-03 15:10:18.000000000 +0200 ++++ gnome-sharp-2.20.0/gnome/gnome-sharp-2.0.pc.in 2008-07-04 17:57:56.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib -+libdir=${libdir} ++libdir=@libdir@ gapidir=${prefix}/share/gapi-2.0 Index: gnome-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnome-sharp.spec 3 Jul 2008 15:18:15 -0000 1.14 +++ gnome-sharp.spec 4 Jul 2008 16:52:04 -0000 1.15 @@ -1,6 +1,6 @@ Name: gnome-sharp Version: 2.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -90,7 +90,10 @@ %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc %changelog -* Thu Jul 03 2008 Xavier Lamien - 2.20.0 +* Thu Jul 03 2008 Xavier Lamien - 2.20.0-2 +- Fix gnome-sharp-2.0 pkconfig. + +* Thu Jul 03 2008 Xavier Lamien - 2.20.0-1 - Update release. * Wed Jun 04 2008 Tom "spot" Callaway - 2.16.1-3 From fedora-extras-commits at redhat.com Fri Jul 4 16:53:42 2008 From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn)) Date: Fri, 4 Jul 2008 16:53:42 GMT Subject: rpms/jetty/F-8 jetty-CERT438616-CERT237888-CERT21284.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jetty.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200807041653.m64Grge3009550@cvs-int.fedora.redhat.com> Author: jjohnstn Update of /cvs/pkgs/rpms/jetty/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9390 Modified Files: .cvsignore jetty.spec sources Added Files: jetty-CERT438616-CERT237888-CERT21284.patch Log Message: * Fri Jul 04 2008 Jeff Johnston 5.1.14-1jpp.1 - Security patch - Resolves #417401, #417411, #417391 - Upgrade to 5.1.14 source tarball for Fedora jetty-CERT438616-CERT237888-CERT21284.patch: --- NEW FILE jetty-CERT438616-CERT237888-CERT21284.patch --- Index: src/org/mortbay/http/HttpFields.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/http/HttpFields.java,v retrieving revision 1.77 diff -r1.77 HttpFields.java 1461a1462 > value=StringUtil.noCRLF(value); Index: src/org/mortbay/http/HttpResponse.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/http/HttpResponse.java,v retrieving revision 1.62 diff -r1.62 HttpResponse.java 21a22 > import java.util.Date; 22a24 > import java.util.List; 462a465,519 > public void addDateField(String name, Date date) > { > super.addDateField(sanitize(name),date); > } > > public void addDateField(String name, long date) > { > super.addDateField(sanitize(name),date); > } > > public void addField(String name, String value) throws IllegalStateException > { > super.addField(sanitize(name),sanitize(value)); > } > > public void addIntField(String name, int value) > { > super.addIntField(sanitize(name),value); > } > > public void setContentType(String contentType) > { > super.setContentType(sanitize(contentType)); > } > > public void setDateField(String name, Date date) > { > super.setDateField(sanitize(name),date); > } > > public void setDateField(String name, long date) > { > super.setDateField(sanitize(name),date); > } > > public void setField(String name, List value) > { > super.setField(sanitize(name),value); > } > > public String setField(String name, String value) > { > return super.setField(sanitize(name),sanitize(value)); > } > > public void setIntField(String name, int value) > { > super.setIntField(sanitize(name),value); > } > > private String sanitize(String s) > { > return StringUtil.noCRLF(s); > } > Index: src/org/mortbay/servlet/Dump.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/servlet/Dump.java,v retrieving revision 1.42 diff -r1.42 Dump.java 46a47 > import org.mortbay.util.StringUtil; 169a171,173 > response.setHeader("Ok","value"); > response.setHeader("ztu\r\n\r\npid","val\r\n\r\nue"); > response.addCookie(new Cookie("Stu'pid","val\r\n\r\nue")); 177c181,198 < Table table= new Table(0).cellPadding(0).cellSpacing(0); --- > Table table= new Table(0) > { > public Table addCell(Object o) > { > if (o!=null && o instanceof String) > { > String s = (String)o; > s=StringUtil.replace(s,"\r\n","
"); > s=StringUtil.replace(s,"\n","
"); > s=StringUtil.replace(s,"<","<"); > s=StringUtil.replace(s,">",">"); > o=s; > } > return super.addCell(o); > } > }; > > table.cellPadding(0).cellSpacing(0); 360c381 < table.addCell("
" + toString(request.getAttribute(name)) + "
"); --- > table.addCell(toString(request.getAttribute(name))); 378c399 < table.addCell("
" + toString(getInitParameter(name)) + "
"); --- > table.addCell(toString(getInitParameter(name))); 395c416 < table.addCell("
" + toString(getServletContext().getInitParameter(name)) + "
"); --- > table.addCell(toString(getServletContext().getInitParameter(name))); 412c433 < table.addCell("
" + toString(getServletContext().getAttribute(name)) + "
"); --- > table.addCell(toString(getServletContext().getAttribute(name))); 435c456 < table.addCell("
" + multi.getString(parts[p]) + "
"); --- > table.addCell(multi.getString(parts[p])); Index: src/org/mortbay/util/StringUtil.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/util/StringUtil.java,v retrieving revision 1.16 diff -r1.16 StringUtil.java 286a287,292 > > /* ------------------------------------------------------------ */ > public static String noCRLF(String s) > { > if (s==null || s.length()==0) > return s; 287a294,334 > StringBuffer buf = null; > int i=0; > loop: > for (;i { > char c = s.charAt(i); > switch(c) > { > case 0: > case '\n': > case '\r': > { > buf=new StringBuffer(s.length()); > buf.append(s,0,i); > buf.append('.'); > break loop; > } > default: > } > } > > if (buf==null) > return s; > > for (;i { > char c = s.charAt(i); > switch(c) > { > case 0: > case '\n': > case '\r': > buf.append('.'); > break; > default: > buf.append(c); > } > } > > return buf.toString(); > } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jetty/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Aug 2007 21:44:54 -0000 1.2 +++ .cvsignore 4 Jul 2008 16:52:57 -0000 1.3 @@ -1 +1,2 @@ jetty-5.1.12.fedora.zip +jetty-5.1.14.fedora.tgz Index: jetty.spec =================================================================== RCS file: /cvs/pkgs/rpms/jetty/F-8/jetty.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jetty.spec 12 Feb 2008 21:45:30 -0000 1.5 +++ jetty.spec 4 Jul 2008 16:52:57 -0000 1.6 @@ -53,23 +53,23 @@ %define demodir %{_localstatedir}/lib/%{name}/demo Name: jetty -Version: 5.1.12 -Release: 1jpp.9%{?dist} +Version: 5.1.14 +Release: 1jpp.1%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet License: ASL 2.0 URL: http://jetty.mortbay.org/jetty/ -# Following source zip was originally taken from the following location: -# http://mirrors.ibiblio.org/pub/mirrors/maven/jetty/jetty-5.1.12.zip -# The zip file was modified by removing all jars and BCLA licenses. -# unzip jetty-5.1.12.zip -# pushd jetty-5.1.12 +# Following source tarball was originally taken from the following location: +# http://www.ibiblio.org/maven/jetty/jetty-5.1.x/jetty-5.1.14.tgz +# The tarball was modified by removing all jars and BCLA licenses. +# tar -xzf jetty-5.1.14.tgz +# pushd jetty-5.1.14 # find . -name *.jar -exec rm {} \; # rm ./etc/LICENSE.javax.xml.html ./etc/LICENSE.jsse.txt # popd -# zip jetty-5.1.12.fedora.zip jetty-5.1.12/* -Source0: %{jettyname}-%{version}.fedora.zip +# tar -czf jetty-5.1.14.fedora.tgz jetty-5.1.14/* +Source0: %{jettyname}-%{version}.fedora.tgz Source1: jetty.script Source2: jetty.init Source3: jetty.logrotate @@ -78,6 +78,7 @@ Patch1: jetty-PostFileFilter.patch Patch2: jetty-libgcj-bad-serialization.patch Patch3: jetty-TestRFC2616-libgcj-bad-date-parser.patch +Patch4: jetty-CERT438616-CERT237888-CERT21284.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if ! %{gcj_support} @@ -252,6 +253,8 @@ %patch2 -b .sav %patch3 -b .sav +%patch4 + # Delete this Sun specific file. rm src/org/mortbay/http/SunJsseListener.java @@ -387,7 +390,7 @@ JETTY_RUN=%{_localstatedir}/run/%{name} JETTY_PID=\$JETTY_RUN/jetty.pid EO_RC -) > $RPM_BUILD_ROOT%{homedir}/.jettyrc +) > $RPM_BUILD_ROOT%{homedir}/jettyrc # extra %if %{with_extra} @@ -538,13 +541,12 @@ %{homedir}/[^e]* %{homedir}/ext %{homedir}/etc -%{homedir}/.jettyrc +%{homedir}/jettyrc %dir %{demodir} %attr(755, jetty, jetty) %{logdir} %attr(755, jetty, jetty) %{tempdir} %attr(755, jetty, jetty) %{rundir} %dir %{appdir} -%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/LICENSE.TXT %doc %{_docdir}/%{name}-%{version}/VERSION.TXT %{_sysconfdir}/init.d/%{name} @@ -597,16 +599,11 @@ %endif %changelog -* Tue Feb 12 2008 Jeff Johnston 5.1.12-1jpp.9 -- Resolves #427821 -- Make this package owner of jetty doc directory - -* Tue Nov 20 2007 Jeff Johnston 5.1.12-1jpp.8 -- Resolves #393071 -- Rename jettyrc back to .jettyrc as this file is needed when starting - jetty via /etc/init.d/jetty start +* Fri Jul 04 2008 Jeff Johnston 5.1.14-1jpp.1 +- Security patch +- Resolves #417401, #417411, #417391 +- Upgrade to 5.1.14 source tarball for Fedora -- Resolves #262221 * Fri Aug 31 2007 Jeff Johnston 5.1.12-1jpp.7 - Resolves #262221 - Use /bin/sh instead of /sbin/nologin so init will work Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jetty/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Aug 2007 21:44:54 -0000 1.2 +++ sources 4 Jul 2008 16:52:57 -0000 1.3 @@ -1 +1 @@ -7c6af7ed3365b136b55e752df8dead6f jetty-5.1.12.fedora.zip +04dcaaa5407462cea9c514b7f7aabff7 jetty-5.1.14.fedora.tgz From fedora-extras-commits at redhat.com Fri Jul 4 16:56:10 2008 From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn)) Date: Fri, 4 Jul 2008 16:56:10 GMT Subject: rpms/jetty/F-9 jetty-CERT438616-CERT237888-CERT21284.patch, NONE, 1.1 jetty.spec, 1.4, 1.5 Message-ID: <200807041656.m64GuAt9009836@cvs-int.fedora.redhat.com> Author: jjohnstn Update of /cvs/pkgs/rpms/jetty/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9676 Modified Files: jetty.spec Added Files: jetty-CERT438616-CERT237888-CERT21284.patch Log Message: * Fri Jul 04 2008 Jeff Johnston 5.1.14-1jpp.1 - Security patch - Resolves #417401, #417411, #417391 - Upgrade to 5.1.14 source tarball for Fedora jetty-CERT438616-CERT237888-CERT21284.patch: --- NEW FILE jetty-CERT438616-CERT237888-CERT21284.patch --- Index: src/org/mortbay/http/HttpFields.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/http/HttpFields.java,v retrieving revision 1.77 diff -r1.77 HttpFields.java 1461a1462 > value=StringUtil.noCRLF(value); Index: src/org/mortbay/http/HttpResponse.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/http/HttpResponse.java,v retrieving revision 1.62 diff -r1.62 HttpResponse.java 21a22 > import java.util.Date; 22a24 > import java.util.List; 462a465,519 > public void addDateField(String name, Date date) > { > super.addDateField(sanitize(name),date); > } > > public void addDateField(String name, long date) > { > super.addDateField(sanitize(name),date); > } > > public void addField(String name, String value) throws IllegalStateException > { > super.addField(sanitize(name),sanitize(value)); > } > > public void addIntField(String name, int value) > { > super.addIntField(sanitize(name),value); > } > > public void setContentType(String contentType) > { > super.setContentType(sanitize(contentType)); > } > > public void setDateField(String name, Date date) > { > super.setDateField(sanitize(name),date); > } > > public void setDateField(String name, long date) > { > super.setDateField(sanitize(name),date); > } > > public void setField(String name, List value) > { > super.setField(sanitize(name),value); > } > > public String setField(String name, String value) > { > return super.setField(sanitize(name),sanitize(value)); > } > > public void setIntField(String name, int value) > { > super.setIntField(sanitize(name),value); > } > > private String sanitize(String s) > { > return StringUtil.noCRLF(s); > } > Index: src/org/mortbay/servlet/Dump.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/servlet/Dump.java,v retrieving revision 1.42 diff -r1.42 Dump.java 46a47 > import org.mortbay.util.StringUtil; 169a171,173 > response.setHeader("Ok","value"); > response.setHeader("ztu\r\n\r\npid","val\r\n\r\nue"); > response.addCookie(new Cookie("Stu'pid","val\r\n\r\nue")); 177c181,198 < Table table= new Table(0).cellPadding(0).cellSpacing(0); --- > Table table= new Table(0) > { > public Table addCell(Object o) > { > if (o!=null && o instanceof String) > { > String s = (String)o; > s=StringUtil.replace(s,"\r\n","
"); > s=StringUtil.replace(s,"\n","
"); > s=StringUtil.replace(s,"<","<"); > s=StringUtil.replace(s,">",">"); > o=s; > } > return super.addCell(o); > } > }; > > table.cellPadding(0).cellSpacing(0); 360c381 < table.addCell("
" + toString(request.getAttribute(name)) + "
"); --- > table.addCell(toString(request.getAttribute(name))); 378c399 < table.addCell("
" + toString(getInitParameter(name)) + "
"); --- > table.addCell(toString(getInitParameter(name))); 395c416 < table.addCell("
" + toString(getServletContext().getInitParameter(name)) + "
"); --- > table.addCell(toString(getServletContext().getInitParameter(name))); 412c433 < table.addCell("
" + toString(getServletContext().getAttribute(name)) + "
"); --- > table.addCell(toString(getServletContext().getAttribute(name))); 435c456 < table.addCell("
" + multi.getString(parts[p]) + "
"); --- > table.addCell(multi.getString(parts[p])); Index: src/org/mortbay/util/StringUtil.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/util/StringUtil.java,v retrieving revision 1.16 diff -r1.16 StringUtil.java 286a287,292 > > /* ------------------------------------------------------------ */ > public static String noCRLF(String s) > { > if (s==null || s.length()==0) > return s; 287a294,334 > StringBuffer buf = null; > int i=0; > loop: > for (;i { > char c = s.charAt(i); > switch(c) > { > case 0: > case '\n': > case '\r': > { > buf=new StringBuffer(s.length()); > buf.append(s,0,i); > buf.append('.'); > break loop; > } > default: > } > } > > if (buf==null) > return s; > > for (;i { > char c = s.charAt(i); > switch(c) > { > case 0: > case '\n': > case '\r': > buf.append('.'); > break; > default: > buf.append(c); > } > } > > return buf.toString(); > } Index: jetty.spec =================================================================== RCS file: /cvs/pkgs/rpms/jetty/F-9/jetty.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jetty.spec 25 Jun 2008 18:44:39 -0000 1.4 +++ jetty.spec 4 Jul 2008 16:55:15 -0000 1.5 @@ -54,7 +54,7 @@ Name: jetty Version: 5.1.14 -Release: 1jpp.1%{?dist} +Release: 1jpp.2%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet @@ -78,6 +78,7 @@ Patch1: jetty-PostFileFilter.patch Patch2: jetty-libgcj-bad-serialization.patch Patch3: jetty-TestRFC2616-libgcj-bad-date-parser.patch +Patch4: jetty-CERT438616-CERT237888-CERT21284.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if ! %{gcj_support} @@ -252,6 +253,8 @@ %patch2 -b .sav %patch3 -b .sav +%patch4 + # Delete this Sun specific file. rm src/org/mortbay/http/SunJsseListener.java @@ -596,6 +599,10 @@ %endif %changelog +* Fri Jul 04 2008 Jeff Johnston 5.1.14-2jpp.1 +- Security patch +- Resolves #417401, #417411, #417391 + * Wed Jun 25 2008 Jeff Johnston 5.1.14-1jpp.1 - Upgrade to 5.1.14 source tarball for Fedora From fedora-extras-commits at redhat.com Fri Jul 4 17:00:09 2008 From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn)) Date: Fri, 4 Jul 2008 17:00:09 GMT Subject: rpms/jetty/F-9 jetty.spec,1.5,1.6 Message-ID: <200807041700.m64H09jv010261@cvs-int.fedora.redhat.com> Author: jjohnstn Update of /cvs/pkgs/rpms/jetty/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10117 Modified Files: jetty.spec Log Message: Fix release number in changelog entry. Index: jetty.spec =================================================================== RCS file: /cvs/pkgs/rpms/jetty/F-9/jetty.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jetty.spec 4 Jul 2008 16:55:15 -0000 1.5 +++ jetty.spec 4 Jul 2008 16:59:23 -0000 1.6 @@ -599,7 +599,7 @@ %endif %changelog -* Fri Jul 04 2008 Jeff Johnston 5.1.14-2jpp.1 +* Fri Jul 04 2008 Jeff Johnston 5.1.14-1jpp.2 - Security patch - Resolves #417401, #417411, #417391 From fedora-extras-commits at redhat.com Fri Jul 4 17:03:43 2008 From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn)) Date: Fri, 4 Jul 2008 17:03:43 GMT Subject: rpms/jetty/devel jetty-CERT438616-CERT237888-CERT21284.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jetty.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200807041703.m64H3hYv017343@cvs-int.fedora.redhat.com> Author: jjohnstn Update of /cvs/pkgs/rpms/jetty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17229 Modified Files: .cvsignore jetty.spec sources Added Files: jetty-CERT438616-CERT237888-CERT21284.patch Log Message: * Fri Jul 04 2008 Jeff Johnston 5.1.14-1jpp.2 - Security patch - Resolves #417401, #417411, #417391 jetty-CERT438616-CERT237888-CERT21284.patch: --- NEW FILE jetty-CERT438616-CERT237888-CERT21284.patch --- Index: src/org/mortbay/http/HttpFields.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/http/HttpFields.java,v retrieving revision 1.77 diff -r1.77 HttpFields.java 1461a1462 > value=StringUtil.noCRLF(value); Index: src/org/mortbay/http/HttpResponse.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/http/HttpResponse.java,v retrieving revision 1.62 diff -r1.62 HttpResponse.java 21a22 > import java.util.Date; 22a24 > import java.util.List; 462a465,519 > public void addDateField(String name, Date date) > { > super.addDateField(sanitize(name),date); > } > > public void addDateField(String name, long date) > { > super.addDateField(sanitize(name),date); > } > > public void addField(String name, String value) throws IllegalStateException > { > super.addField(sanitize(name),sanitize(value)); > } > > public void addIntField(String name, int value) > { > super.addIntField(sanitize(name),value); > } > > public void setContentType(String contentType) > { > super.setContentType(sanitize(contentType)); > } > > public void setDateField(String name, Date date) > { > super.setDateField(sanitize(name),date); > } > > public void setDateField(String name, long date) > { > super.setDateField(sanitize(name),date); > } > > public void setField(String name, List value) > { > super.setField(sanitize(name),value); > } > > public String setField(String name, String value) > { > return super.setField(sanitize(name),sanitize(value)); > } > > public void setIntField(String name, int value) > { > super.setIntField(sanitize(name),value); > } > > private String sanitize(String s) > { > return StringUtil.noCRLF(s); > } > Index: src/org/mortbay/servlet/Dump.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/servlet/Dump.java,v retrieving revision 1.42 diff -r1.42 Dump.java 46a47 > import org.mortbay.util.StringUtil; 169a171,173 > response.setHeader("Ok","value"); > response.setHeader("ztu\r\n\r\npid","val\r\n\r\nue"); > response.addCookie(new Cookie("Stu'pid","val\r\n\r\nue")); 177c181,198 < Table table= new Table(0).cellPadding(0).cellSpacing(0); --- > Table table= new Table(0) > { > public Table addCell(Object o) > { > if (o!=null && o instanceof String) > { > String s = (String)o; > s=StringUtil.replace(s,"\r\n","
"); > s=StringUtil.replace(s,"\n","
"); > s=StringUtil.replace(s,"<","<"); > s=StringUtil.replace(s,">",">"); > o=s; > } > return super.addCell(o); > } > }; > > table.cellPadding(0).cellSpacing(0); 360c381 < table.addCell("
" + toString(request.getAttribute(name)) + "
"); --- > table.addCell(toString(request.getAttribute(name))); 378c399 < table.addCell("
" + toString(getInitParameter(name)) + "
"); --- > table.addCell(toString(getInitParameter(name))); 395c416 < table.addCell("
" + toString(getServletContext().getInitParameter(name)) + "
"); --- > table.addCell(toString(getServletContext().getInitParameter(name))); 412c433 < table.addCell("
" + toString(getServletContext().getAttribute(name)) + "
"); --- > table.addCell(toString(getServletContext().getAttribute(name))); 435c456 < table.addCell("
" + multi.getString(parts[p]) + "
"); --- > table.addCell(multi.getString(parts[p])); Index: src/org/mortbay/util/StringUtil.java =================================================================== RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/util/StringUtil.java,v retrieving revision 1.16 diff -r1.16 StringUtil.java 286a287,292 > > /* ------------------------------------------------------------ */ > public static String noCRLF(String s) > { > if (s==null || s.length()==0) > return s; 287a294,334 > StringBuffer buf = null; > int i=0; > loop: > for (;i { > char c = s.charAt(i); > switch(c) > { > case 0: > case '\n': > case '\r': > { > buf=new StringBuffer(s.length()); > buf.append(s,0,i); > buf.append('.'); > break loop; > } > default: > } > } > > if (buf==null) > return s; > > for (;i { > char c = s.charAt(i); > switch(c) > { > case 0: > case '\n': > case '\r': > buf.append('.'); > break; > default: > buf.append(c); > } > } > > return buf.toString(); > } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jetty/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Aug 2007 21:44:54 -0000 1.2 +++ .cvsignore 4 Jul 2008 17:02:53 -0000 1.3 @@ -1 +1,2 @@ jetty-5.1.12.fedora.zip +jetty-5.1.14.fedora.tgz Index: jetty.spec =================================================================== RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jetty.spec 31 Aug 2007 21:42:26 -0000 1.3 +++ jetty.spec 4 Jul 2008 17:02:53 -0000 1.4 @@ -53,23 +53,23 @@ %define demodir %{_localstatedir}/lib/%{name}/demo Name: jetty -Version: 5.1.12 -Release: 1jpp.7%{?dist} +Version: 5.1.14 +Release: 1jpp.2%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet License: ASL 2.0 URL: http://jetty.mortbay.org/jetty/ -# Following source zip was originally taken from the following location: -# http://mirrors.ibiblio.org/pub/mirrors/maven/jetty/jetty-5.1.12.zip -# The zip file was modified by removing all jars and BCLA licenses. -# unzip jetty-5.1.12.zip -# pushd jetty-5.1.12 +# Following source tarball was originally taken from the following location: +# http://www.ibiblio.org/maven/jetty/jetty-5.1.x/jetty-5.1.14.tgz +# The tarball was modified by removing all jars and BCLA licenses. +# tar -xzf jetty-5.1.14.tgz +# pushd jetty-5.1.14 # find . -name *.jar -exec rm {} \; # rm ./etc/LICENSE.javax.xml.html ./etc/LICENSE.jsse.txt # popd -# zip jetty-5.1.12.fedora.zip jetty-5.1.12/* -Source0: %{jettyname}-%{version}.fedora.zip +# tar -czf jetty-5.1.14.fedora.tgz jetty-5.1.14/* +Source0: %{jettyname}-%{version}.fedora.tgz Source1: jetty.script Source2: jetty.init Source3: jetty.logrotate @@ -78,6 +78,7 @@ Patch1: jetty-PostFileFilter.patch Patch2: jetty-libgcj-bad-serialization.patch Patch3: jetty-TestRFC2616-libgcj-bad-date-parser.patch +Patch4: jetty-CERT438616-CERT237888-CERT21284.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if ! %{gcj_support} @@ -252,6 +253,8 @@ %patch2 -b .sav %patch3 -b .sav +%patch4 + # Delete this Sun specific file. rm src/org/mortbay/http/SunJsseListener.java @@ -596,6 +599,13 @@ %endif %changelog +* Fri Jul 04 2008 Jeff Johnston 5.1.14-1jpp.2 +- Security patch +- Resolves #417401, #417411, #417391 + +* Wed Jun 25 2008 Jeff Johnston 5.1.14-1jpp.1 +- Upgrade to 5.1.14 source tarball for Fedora + * Fri Aug 31 2007 Jeff Johnston 5.1.12-1jpp.7 - Resolves #262221 - Use /bin/sh instead of /sbin/nologin so init will work Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jetty/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Aug 2007 21:44:54 -0000 1.2 +++ sources 4 Jul 2008 17:02:53 -0000 1.3 @@ -1 +1 @@ -7c6af7ed3365b136b55e752df8dead6f jetty-5.1.12.fedora.zip +04dcaaa5407462cea9c514b7f7aabff7 jetty-5.1.14.fedora.tgz From fedora-extras-commits at redhat.com Fri Jul 4 17:32:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:32:43 +0000 Subject: [pkgdb] nagios: romal has requested watchbugzilla Message-ID: <200807041732.m64HWhmN006437@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:32:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:32:45 +0000 Subject: [pkgdb] nagios: romal has requested watchcommits Message-ID: <200807041732.m64HWjZS006457@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:32:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:32:47 +0000 Subject: [pkgdb] nagios: romal has requested commit Message-ID: <200807041732.m64HWlkC006476@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:32:59 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Fri, 4 Jul 2008 17:32:59 GMT Subject: rpms/python-pyblock/devel .cvsignore, 1.29, 1.30 python-pyblock.spec, 1.50, 1.51 Message-ID: <200807041732.m64HWxr9020664@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/python-pyblock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20564 Modified Files: .cvsignore python-pyblock.spec Log Message: * Fri Jul 04 2008 Peter Jones - 0.31-4 - Move dmraid dep to point at dmraid-libs. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-pyblock/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 24 Jan 2008 22:03:29 -0000 1.29 +++ .cvsignore 4 Jul 2008 17:32:13 -0000 1.30 @@ -1,2 +1,2 @@ -pyblock-0.30.tar.bz2 pyblock-0.31.tar.bz2 +clog Index: python-pyblock.spec =================================================================== RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- python-pyblock.spec 17 Apr 2008 07:05:59 -0000 1.50 +++ python-pyblock.spec 4 Jul 2008 17:32:13 -0000 1.51 @@ -6,7 +6,7 @@ Summary: Python modules for dealing with block devices Name: python-%{realname} Version: 0.31 -Release: 3 +Release: 4 Source0: %{realname}-%{version}.tar.bz2 License: GPLv2 or GPLv3 Group: System Environment/Libraries @@ -16,7 +16,7 @@ BuildRequires: dmraid-devel >= %{dmrver}, libselinux-devel, libsepol-devel BuildRequires: zlib-devel, libbdevid >= 5.1.0 Requires: python, device-mapper-libs >= %{dmver}, libselinux -Requires: libbdevid, libbdevid-python, dmraid >= %{dmrver} +Requires: libbdevid, libbdevid-python, dmraid-libs >= %{dmrver} %description The pyblock contains Python modules for dealing with block devices. @@ -42,6 +42,9 @@ %{_docdir}/pyblock-%{version}/* %changelog +* Fri Jul 04 2008 Peter Jones - 0.31-4 +- Move dmraid dep to point at dmraid-libs. + * Thu Apr 17 2008 Jeremy Katz - 0.31-3 - Own the doc dir (#363351) From fedora-extras-commits at redhat.com Fri Jul 4 17:33:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:33:02 +0000 Subject: [pkgdb] nagios: romal has requested watchbugzilla Message-ID: <200807041733.m64HX2pS006522@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on nagios (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:33:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:33:05 +0000 Subject: [pkgdb] nagios: romal has requested watchcommits Message-ID: <200807041733.m64HWhmQ006437@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on nagios (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:33:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:33:07 +0000 Subject: [pkgdb] nagios: romal has requested commit Message-ID: <200807041733.m64HWlkF006476@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on nagios (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:33:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:33:17 +0000 Subject: [pkgdb] nagios: romal has requested watchcommits Message-ID: <200807041733.m64HWhmT006437@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on nagios (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:33:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:33:20 +0000 Subject: [pkgdb] nagios: romal has requested commit Message-ID: <200807041733.m64HWjZV006457@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on nagios (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:33:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:33:15 +0000 Subject: [pkgdb] nagios: romal has requested watchbugzilla Message-ID: <200807041733.m64HX2pV006522@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on nagios (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 17:34:20 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 17:34:20 GMT Subject: rpms/libpreludedb/devel libpreludedb.spec,1.14,1.15 Message-ID: <200807041734.m64HYK2D020843@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/libpreludedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20733 Modified Files: libpreludedb.spec Log Message: * Fri Jul 04 2008 Steve Grubb - 0.9.14.1-4 - Fix perl bindings (#453935) Index: libpreludedb.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libpreludedb.spec 25 Jun 2008 16:26:57 -0000 1.14 +++ libpreludedb.spec 4 Jul 2008 17:33:33 -0000 1.15 @@ -3,10 +3,10 @@ Name: libpreludedb Version: 0.9.14.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Provide the framework for easy access to the Prelude database Group: System Environment/Libraries -License: GPL +License: GPLv2+ URL: http://prelude-ids.org/ Source0: http://prelude-ids.org/download/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,7 @@ Summary: Perl bindings for libpreludedb Group: System Environment/Libraries Requires: libpreludedb = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings for libpreludedb. @@ -86,6 +87,7 @@ # removing rpath sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile +sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool make @@ -93,18 +95,17 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} -mkdir -p %{buildroot}%{perl_vendorarch} make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" cp -p ChangeLog README NEWS COPYING LICENSE.README HACKING.README \ -%{buildroot}%{_defaultdocdir}/%{name}-%{version} -rm -f %{buildroot}/%{perl_archlib}/perllocal.pod + %{buildroot}%{_defaultdocdir}/%{name}-%{version} rm -f %{buildroot}/%{_libdir}/%{name}.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/formats/classic.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/mysql.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/pgsql.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/sqlite3.la -rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/.packlist -rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/PreludeDB.bs +chmod 755 %{buildroot}%{python_sitearch}/_preludedb.so +find %{buildroot} -type f \( -name .packlist -o -name perllocal.pod \) -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' %clean rm -rf %{buildroot} @@ -138,11 +139,12 @@ %doc %{_defaultdocdir}/%{name}-%{version}/html/ %files python +%defattr(-,root,root) %{python_sitearch}/* %files perl %defattr(0755,root,root) -%{perl_vendorarch}/auto/* +%{perl_vendorarch}/auto/PreludeDB/ %attr(0644,root,root) %{perl_vendorarch}/PreludeDB.pm %files mysql @@ -163,6 +165,9 @@ %changelog +* Fri Jul 04 2008 Steve Grubb - 0.9.14.1-4 +- Fix perl bindings (#453935) + * Wed Jun 25 2008 Tomas Mraz - 0.9.14.1-3 - rebuild with new gnutls - fix install of perl bindings From fedora-extras-commits at redhat.com Fri Jul 4 17:34:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:22 +0000 Subject: [pkgdb] nagios-plugins: romal has requested watchbugzilla Message-ID: <200807041734.m64HYMwd006707@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on nagios-plugins (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:23 +0000 Subject: [pkgdb] nagios-plugins: romal has requested watchcommits Message-ID: <200807041734.m64HYN4Z006710@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on nagios-plugins (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:24 +0000 Subject: [pkgdb] nagios-plugins: romal has requested commit Message-ID: <200807041734.m64HYOS5006745@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on nagios-plugins (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:30 +0000 Subject: [pkgdb] nagios-plugins: romal has requested watchbugzilla Message-ID: <200807041734.m64HYUia006765@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on nagios-plugins (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:32 +0000 Subject: [pkgdb] nagios-plugins: romal has requested commit Message-ID: <200807041734.m64HYN4c006710@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on nagios-plugins (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:32 +0000 Subject: [pkgdb] nagios-plugins: romal has requested watchcommits Message-ID: <200807041734.m64HYMwg006707@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on nagios-plugins (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:40 +0000 Subject: [pkgdb] nagios-plugins: romal has requested watchbugzilla Message-ID: <200807041734.m64HYOS8006745@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on nagios-plugins (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:45 +0000 Subject: [pkgdb] nagios-plugins: romal has requested watchcommits Message-ID: <200807041734.m64HYMwj006707@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on nagios-plugins (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:34:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 17:34:46 +0000 Subject: [pkgdb] nagios-plugins: romal has requested commit Message-ID: <200807041734.m64HYN4f006710@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on nagios-plugins (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Fri Jul 4 17:44:00 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 17:44:00 GMT Subject: rpms/libpreludedb/F-9 libpreludedb.spec,1.12,1.13 Message-ID: <200807041744.m64Hi0dS021854@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/libpreludedb/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21767 Modified Files: libpreludedb.spec Log Message: * Fri Jul 04 2008 Steve Grubb - 0.9.14.1-3 - Fix perl bindings (#453935) Index: libpreludedb.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpreludedb/F-9/libpreludedb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libpreludedb.spec 20 Feb 2008 05:54:26 -0000 1.12 +++ libpreludedb.spec 4 Jul 2008 17:43:09 -0000 1.13 @@ -3,10 +3,10 @@ Name: libpreludedb Version: 0.9.14.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Provide the framework for easy access to the Prelude database Group: System Environment/Libraries -License: GPL +License: GPLv2+ URL: http://prelude-ids.org/ Source0: http://prelude-ids.org/download/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,7 @@ Summary: Perl bindings for libpreludedb Group: System Environment/Libraries Requires: libpreludedb = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings for libpreludedb. @@ -81,10 +82,12 @@ %build %configure --with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \ + --with-perl-installdirs=vendor \ --disable-static # removing rpath sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile +sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool make @@ -92,19 +95,17 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} -mkdir -p %{buildroot}%{perl_vendorarch} make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" cp -p ChangeLog README NEWS COPYING LICENSE.README HACKING.README \ -%{buildroot}%{_defaultdocdir}/%{name}-%{version} -mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch} -rm -f %{buildroot}/%{perl_archlib}/perllocal.pod + %{buildroot}%{_defaultdocdir}/%{name}-%{version} rm -f %{buildroot}/%{_libdir}/%{name}.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/formats/classic.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/mysql.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/pgsql.la rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/sqlite3.la -rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/.packlist -rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/PreludeDB.bs +chmod 755 %{buildroot}%{python_sitearch}/_preludedb.so +find %{buildroot} -type f \( -name .packlist -o -name perllocal.pod \) -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' %clean rm -rf %{buildroot} @@ -138,11 +139,12 @@ %doc %{_defaultdocdir}/%{name}-%{version}/html/ %files python +%defattr(-,root,root) %{python_sitearch}/* %files perl %defattr(0755,root,root) -%{perl_vendorarch}/auto/* +%{perl_vendorarch}/auto/PreludeDB/ %attr(0644,root,root) %{perl_vendorarch}/PreludeDB.pm %files mysql @@ -163,6 +165,9 @@ %changelog +* Fri Jul 04 2008 Steve Grubb - 0.9.14.1-3 +- Fix perl bindings (#453935) + * Wed Feb 20 2008 Fedora Release Engineering - 0.9.14.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 4 18:06:07 2008 From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak)) Date: Fri, 4 Jul 2008 18:06:07 GMT Subject: rpms/fuse-smb/devel README.fedora.fuse-smb, NONE, 1.1 fusesmb.sh.fuse-smb, NONE, 1.1 fuse-smb.spec, 1.7, 1.8 Message-ID: <200807041806.m64I67RB029695@cvs-int.fedora.redhat.com> Author: szpak Update of /cvs/extras/rpms/fuse-smb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29532 Modified Files: fuse-smb.spec Added Files: README.fedora.fuse-smb fusesmb.sh.fuse-smb Log Message: Updated to 0.8.7-4 (workaround for bug 445978) --- NEW FILE README.fedora.fuse-smb --- There is a problem with multi-threaded operations and samba 3.2 (F9+) as a workaround they are disabled by default. See bug 445978 - https://bugzilla.redhat.com/show_bug.cgi?id=445978 --- NEW FILE fusesmb.sh.fuse-smb --- #!/bin/sh # # A wrapper to call fusesmb with -s switch (to disable multi-threaded operations) # It's a workaround for problems with Samba 3.2 (F9+) # See bug 445978 - https://bugzilla.redhat.com/show_bug.cgi?id=445978 # # by Marcin Zajaczkowski # version 0.1 # Script can be freely used for any purpose echo WARNING. Multi-threaded operations are disabled. See bug 445978. echo To use original version run fusesmb-bin instead. /usr/bin/fusesmb-bin -s "$@" Index: fuse-smb.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-smb/devel/fuse-smb.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fuse-smb.spec 10 May 2008 12:50:27 -0000 1.7 +++ fuse-smb.spec 4 Jul 2008 18:05:12 -0000 1.8 @@ -1,13 +1,25 @@ +%define userwrapper 0 +%if 0%{?fedora} > 8 +#there is a problem with multi-threaded operations and samba 3.2 (F9+) +#as a workaround they are disabled by default +#see bug 445978 - https://bugzilla.redhat.com/show_bug.cgi?id=445978 +%define userwrapper 1 +%endif + Name: fuse-smb Summary: FUSE-Filesystem to fast and easy access remote resources via SMB Version: 0.8.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.ricardis.tudelft.nl/~vincent/fusesmb/ #moved to .rpmmacros #Packager: Marcin Zajaczkowski Source0: http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-%{version}.tar.gz +%if %{userwrapper} +Source1: fusesmb.sh.fuse-smb +Source2: README.fedora.fuse-smb +%endif Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #fuse-libs doesn't force to have fuse which is needed for fuse-smb @@ -21,8 +33,6 @@ BuildRequires: fuse-devel >= 2.3 BuildRequires: samba-client >= 3.0 -#this doesn't work in mock -#%if %(rpmquery --qf '%{Version}' fedora-release) > 6 %if 0%{?fedora} > 6 #starting with 3.0.24-3 in FC7+ libsmbclient is in a separate package BuildRequires: libsmbclient-devel >= 3.0 @@ -37,6 +47,10 @@ %prep %setup -q -n fusesmb-%{version} +%if %{userwrapper} +cp %{SOURCE1} fusesmb.sh +cp %{SOURCE2} README.fedora +%endif %build %configure @@ -45,6 +59,10 @@ %install rm -fr %{buildroot} make install DESTDIR=%{buildroot} +%if %{userwrapper} +mv %{buildroot}%{_bindir}/fusesmb %{buildroot}%{_bindir}/fusesmb-bin +cp fusesmb.sh %{buildroot}%{_bindir}/fusesmb +%endif %clean #build dir is removed by --clean option @@ -58,8 +76,18 @@ %doc AUTHORS ChangeLog COPYING INSTALL README TODO fusesmb.conf.ex %{_mandir}/man*/fusesmb.* +%if %{userwrapper} +#original binary file +%attr(0755,root,root) %{_bindir}/fusesmb-bin +%doc README.fedora +%endif + %changelog +* Thu Jul 3 2008 Marcin Zajaczkowski - 0.8.7-4 +- added workaround for problem with multi-threaded operations and samba 3.2 +(F9+) - bug 445978 + * Sat May 10 2008 Marcin Zajaczkowski - 0.8.7-3 - fixed conditional statement for better handle Fedora 10 version number From fedora-extras-commits at redhat.com Fri Jul 4 18:06:51 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 4 Jul 2008 18:06:51 GMT Subject: rpms/jd/F-9 .cvsignore, 1.258, 1.259 jd.spec, 1.295, 1.296 sources, 1.259, 1.260 Message-ID: <200807041806.m64I6phA029759@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29605/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Jul 5 2008 Mamoru Tasaka - rev 2170 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- .cvsignore 2 Jul 2008 15:32:09 -0000 1.258 +++ .cvsignore 4 Jul 2008 18:05:56 -0000 1.259 @@ -1 +1 @@ -jd-2.0.0-beta080702.tgz +jd-2.0.0-svn2170_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- jd.spec 2 Jul 2008 15:32:09 -0000 1.295 +++ jd.spec 4 Jul 2008 18:05:56 -0000 1.296 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag beta080702 +%define strtag svn2170_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,6 +137,9 @@ %{icondir}/%{name}.png %changelog +* Sat Jul 5 2008 Mamoru Tasaka +- rev 2170 + * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- sources 2 Jul 2008 15:32:09 -0000 1.259 +++ sources 4 Jul 2008 18:05:56 -0000 1.260 @@ -1 +1 @@ -b3bc215fde740f9bbec15d4129903c70 jd-2.0.0-beta080702.tgz +63e383d9aebdc210ec34fdae6927819d jd-2.0.0-svn2170_trunk.tgz From fedora-extras-commits at redhat.com Fri Jul 4 18:06:56 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 4 Jul 2008 18:06:56 GMT Subject: rpms/jd/F-8 .cvsignore, 1.251, 1.252 jd.spec, 1.284, 1.285 sources, 1.252, 1.253 Message-ID: <200807041806.m64I6ub2029764@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29605/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Jul 5 2008 Mamoru Tasaka - rev 2170 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- .cvsignore 2 Jul 2008 15:32:07 -0000 1.251 +++ .cvsignore 4 Jul 2008 18:05:37 -0000 1.252 @@ -1 +1 @@ -jd-2.0.0-beta080702.tgz +jd-2.0.0-svn2170_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- jd.spec 2 Jul 2008 15:32:07 -0000 1.284 +++ jd.spec 4 Jul 2008 18:05:37 -0000 1.285 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag beta080702 +%define strtag svn2170_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,6 +137,9 @@ %{icondir}/%{name}.png %changelog +* Sat Jul 5 2008 Mamoru Tasaka +- rev 2170 + * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- sources 2 Jul 2008 15:32:07 -0000 1.252 +++ sources 4 Jul 2008 18:05:37 -0000 1.253 @@ -1 +1 @@ -b3bc215fde740f9bbec15d4129903c70 jd-2.0.0-beta080702.tgz +63e383d9aebdc210ec34fdae6927819d jd-2.0.0-svn2170_trunk.tgz From fedora-extras-commits at redhat.com Fri Jul 4 18:07:08 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 4 Jul 2008 18:07:08 GMT Subject: rpms/jd/devel .cvsignore, 1.258, 1.259 jd.spec, 1.301, 1.302 sources, 1.259, 1.260 Message-ID: <200807041807.m64I788f029802@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29605/devel Modified Files: .cvsignore jd.spec sources Log Message: * Sat Jul 5 2008 Mamoru Tasaka - rev 2170 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- .cvsignore 2 Jul 2008 15:32:17 -0000 1.258 +++ .cvsignore 4 Jul 2008 18:06:21 -0000 1.259 @@ -1 +1 @@ -jd-2.0.0-beta080702.tgz +jd-2.0.0-svn2170_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- jd.spec 2 Jul 2008 15:32:17 -0000 1.301 +++ jd.spec 4 Jul 2008 18:06:21 -0000 1.302 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag beta080702 +%define strtag svn2170_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,6 +137,9 @@ %{icondir}/%{name}.png %changelog +* Sat Jul 5 2008 Mamoru Tasaka +- rev 2170 + * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- sources 2 Jul 2008 15:32:17 -0000 1.259 +++ sources 4 Jul 2008 18:06:21 -0000 1.260 @@ -1 +1 @@ -b3bc215fde740f9bbec15d4129903c70 jd-2.0.0-beta080702.tgz +63e383d9aebdc210ec34fdae6927819d jd-2.0.0-svn2170_trunk.tgz From fedora-extras-commits at redhat.com Fri Jul 4 18:13:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:13:12 +0000 Subject: [pkgdb] otrs ownership updated Message-ID: <200807041813.m64IDCQU008143@bastion.fedora.phx.redhat.com> Package otrs in Fedora devel is now owned by Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/otrs From fedora-extras-commits at redhat.com Fri Jul 4 18:13:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:13:27 +0000 Subject: [pkgdb] otrs ownership updated Message-ID: <200807041813.m64IDRgg008163@bastion.fedora.phx.redhat.com> Package otrs in Fedora EPEL 5 is now owned by Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/otrs From fedora-extras-commits at redhat.com Fri Jul 4 18:13:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:13:35 +0000 Subject: [pkgdb] otrs ownership updated Message-ID: <200807041813.m64IDZsj008187@bastion.fedora.phx.redhat.com> Package otrs in Fedora EPEL 5 was orphaned by Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/otrs From fedora-extras-commits at redhat.com Fri Jul 4 18:20:49 2008 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Fri, 4 Jul 2008 18:20:49 GMT Subject: rpms/python-html2text/devel .cvsignore, 1.4, 1.5 python-html2text.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807041820.m64IKnog031057@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/pkgs/rpms/python-html2text/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30996 Modified Files: .cvsignore python-html2text.spec sources Log Message: update to 2.30 (GPLv3 now -- no deps in Fedora besides rss2email, which swichted to the GPLv3 as well) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-html2text/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Nov 2007 16:01:54 -0000 1.4 +++ .cvsignore 4 Jul 2008 18:20:02 -0000 1.5 @@ -1 +1 @@ -html2text-2.29.py +html2text-2.3.py Index: python-html2text.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-html2text/devel/python-html2text.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-html2text.spec 2 Nov 2007 16:01:54 -0000 1.7 +++ python-html2text.spec 4 Jul 2008 18:20:02 -0000 1.8 @@ -2,12 +2,12 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.29 +Version: 2.3 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages -License: GPLv2 +License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ %changelog +* Fri Jul 04 2008 Thorsten Leemhuis - 2.30-1 +- update to 2.30 (GPLv3 now) + * Fri Nov 02 2007 Thorsten Leemhuis - 2.29-1 - update to 2.29 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-html2text/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Nov 2007 16:01:54 -0000 1.4 +++ sources 4 Jul 2008 18:20:02 -0000 1.5 @@ -1 +1 @@ -22a26e2fba43a6fdd07487157f8e6677 html2text-2.29.py +95e5d245f7b336713c114ea69db2eb5f html2text-2.3.py From fedora-extras-commits at redhat.com Fri Jul 4 18:28:23 2008 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Fri, 4 Jul 2008 18:28:23 GMT Subject: rpms/rss2email/devel rss2email.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200807041828.m64ISNWs031667@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/pkgs/rpms/rss2email/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31616 Modified Files: rss2email.spec sources Log Message: update to 2.63 (GPLv3 now -- no deps in Fedora) Index: rss2email.spec =================================================================== RCS file: /cvs/pkgs/rpms/rss2email/devel/rss2email.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rss2email.spec 19 Jan 2008 12:13:44 -0000 1.4 +++ rss2email.spec 4 Jul 2008 18:27:36 -0000 1.5 @@ -1,10 +1,10 @@ Name: rss2email -Version: 2.62 +Version: 2.63 Release: 1.1 Summary: Deliver news from RSS feeds to your smtp server as text or html mail Group: Applications/Internet -License: GPLv2 +License: GPLv3 URL: http://rss2email.infogami.com/ Source0: http://rss2email.infogami.com/rss2email.py Source1: http://rss2email.infogami.com/CHANGELOG @@ -73,6 +73,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 04 2008 Thorsten Leemhuis - 2.63-1 +- update to 2.63 (GPLv3 now) + * Sat Jan 19 2008 Thorsten Leemhuis - 2.62-1 - Update to 2.62 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rss2email/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jan 2008 12:13:44 -0000 1.4 +++ sources 4 Jul 2008 18:27:36 -0000 1.5 @@ -1,2 +1,2 @@ -71f2ddef0c88244f23ca3237ac36d628 CHANGELOG -d05bef2874118af57bcd1906b068e06e rss2email.py +a6ec0b51fa66d8904c187e1bd9a2e91b CHANGELOG +db6351becc9f50b1432a0105e32ac015 rss2email.py From fedora-extras-commits at redhat.com Fri Jul 4 18:31:20 2008 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Fri, 4 Jul 2008 18:31:20 GMT Subject: rpms/python-html2text/devel python-html2text.spec,1.8,1.9 Message-ID: <200807041831.m64IVKmF032040@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/pkgs/rpms/python-html2text/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31861 Modified Files: python-html2text.spec Log Message: fix version (upstream versioning is a bit strange; let's to it how it's supposed to be in Fedora, even if it's not 100% correct) Index: python-html2text.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-html2text/devel/python-html2text.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-html2text.spec 4 Jul 2008 18:20:02 -0000 1.8 +++ python-html2text.spec 4 Jul 2008 18:30:31 -0000 1.9 @@ -2,14 +2,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.3 +Version: 2.30 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py +Source0: http://www.aaronsw.com/2002/html2text/html2text-2.3.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From fedora-extras-commits at redhat.com Fri Jul 4 18:36:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 4 Jul 2008 18:36:33 GMT Subject: rpms/clisp/devel .cvsignore, 1.9, 1.10 clisp.spec, 1.32, 1.33 sources, 1.10, 1.11 Message-ID: <200807041836.m64IaXtP032616@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32564 Modified Files: .cvsignore clisp.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 Nov 2007 15:08:56 -0000 1.9 +++ .cvsignore 4 Jul 2008 18:35:43 -0000 1.10 @@ -1 +1 @@ -clisp-2.43.tar.bz2 +clisp-2.46.tar.bz2 Index: clisp.spec =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/clisp.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- clisp.spec 22 Feb 2008 19:38:38 -0000 1.32 +++ clisp.spec 4 Jul 2008 18:35:43 -0000 1.33 @@ -1,21 +1,21 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.43 -Release: 5%{?dist} +Version: 2.46 +Release: 1%{?dist} Group: Development/Languages License: GPLv2 URL: http://clisp.cons.org -Source: http://download.sourceforge.net/clisp/clisp-2.43.tar.bz2 +Source: http://download.sourceforge.net/clisp/clisp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: diffutils BuildRequires: imake BuildRequires: libsigsegv-devel BuildRequires: readline-devel +BuildRequires: diffutils +BuildRequires: ffcall BuildRequires: gdbm-devel BuildRequires: gettext BuildRequires: gtk2-devel -BuildRequires: libglade2-devel BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel @@ -25,11 +25,13 @@ BuildRequires: libXmu-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libglade2-devel BuildRequires: pcre-devel BuildRequires: postgresql-devel BuildRequires: zlib-devel -# no berkeley db until fixed for new version -#BuildRequires: db4-devel +BuildRequires: db4-devel +#BuildRequires: pari-devel + ExcludeArch: ppc64 @@ -66,19 +68,21 @@ %prep %setup -q -# enforced stack size seems to be too small -sed -i "s|STACK_LIMIT=.*|STACK_LIMIT=unlimited|" configure -sed -i "s|-fexpensive-optimizations||" src/makemake.in -sed -i "s|-O2|-O0|" src/makemake.in %build -# no berkeley db until fixed for new version -# --with-module=berkeley-db +%ifarch ppc ppc64 +%define opt_flags "$RPM_OPT_FLAGS -DNO_GENERATIONAL_GC" +ulimit -s unlimited +%else +%define opt_flags "$RPM_OPT_FLAGS" +%endif + ./configure --prefix=%{_prefix} \ --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --docdir=%{_docdir}/clisp-%{version} \ --fsstnd=redhat \ - --with-dynamic-ffi \ --with-module=bindings/glibc \ --with-module=clx/new-clx \ --with-module=gdbm \ @@ -88,20 +92,14 @@ --with-module=rawsock \ --with-module=wildcard \ --with-module=zlib \ - --with-readline \ - --build build # CFLAGS="$RPM_OPT_FLAGS" - + --with-module=berkeley-db \ + --with-readline \ + --cbc \ + build CFLAGS=%opt_flags %install rm -rf $RPM_BUILD_ROOT -make -C \ - build \ - prefix=%{_prefix} \ - libdir=%{_libdir} \ - mandir=%{_mandir} \ - docdir=%{_docdir}/clisp-%{version} \ - DESTDIR=$RPM_BUILD_ROOT \ - install +make -C build DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps} cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc %find_lang %{name} @@ -147,6 +145,12 @@ %changelog +* Wed Jul 2 2008 Gerard Milmeister - 2.46-1 +- new release 2.46 + +* Fri Apr 18 2008 Gerard Milmeister - 2.44.1-1 +- new release 2.44.1 + * Fri Feb 22 2008 Gerard Milmeister - 2.43-5 - Compile with -O0 to avoid GCC 4.3 miscompilation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 24 Nov 2007 15:08:56 -0000 1.10 +++ sources 4 Jul 2008 18:35:43 -0000 1.11 @@ -1 +1 @@ -45cf7ab628cab83e99ceaa75aa880b63 clisp-2.43.tar.bz2 +8c4d8ed0f40e01999c4d799328a86c39 clisp-2.46.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 4 18:40:22 2008 From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak)) Date: Fri, 4 Jul 2008 18:40:22 GMT Subject: rpms/fuse-smb/F-9 README.fedora.fuse-smb, NONE, 1.1 fusesmb.sh.fuse-smb, NONE, 1.1 fuse-smb.spec, 1.5, 1.6 Message-ID: <200807041840.m64IeMUF000530@cvs-int.fedora.redhat.com> Author: szpak Update of /cvs/extras/rpms/fuse-smb/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv437 Modified Files: fuse-smb.spec Added Files: README.fedora.fuse-smb fusesmb.sh.fuse-smb Log Message: Update to 0.8.7-4 (workaround for bug 445978) - F9 branch --- NEW FILE README.fedora.fuse-smb --- There is a problem with multi-threaded operations and samba 3.2 (F9+) as a workaround they are disabled by default. See bug 445978 - https://bugzilla.redhat.com/show_bug.cgi?id=445978 --- NEW FILE fusesmb.sh.fuse-smb --- #!/bin/sh # # A wrapper to call fusesmb with -s switch (to disable multi-threaded operations) # It's a workaround for problems with Samba 3.2 (F9+) # See bug 445978 - https://bugzilla.redhat.com/show_bug.cgi?id=445978 # # by Marcin Zajaczkowski # version 0.1 # Script can be freely used for any purpose echo WARNING. Multi-threaded operations are disabled. See bug 445978. echo To use original version run fusesmb-bin instead. /usr/bin/fusesmb-bin -s "$@" Index: fuse-smb.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-smb/F-9/fuse-smb.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse-smb.spec 10 Feb 2008 20:52:49 -0000 1.5 +++ fuse-smb.spec 4 Jul 2008 18:39:29 -0000 1.6 @@ -1,17 +1,30 @@ +%define userwrapper 0 +%if 0%{?fedora} > 8 +#there is a problem with multi-threaded operations and samba 3.2 (F9+) +#as a workaround they are disabled by default +#see bug 445978 - https://bugzilla.redhat.com/show_bug.cgi?id=445978 +%define userwrapper 1 +%endif + Name: fuse-smb Summary: FUSE-Filesystem to fast and easy access remote resources via SMB Version: 0.8.7 -Release: 1%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.ricardis.tudelft.nl/~vincent/fusesmb/ #moved to .rpmmacros #Packager: Marcin Zajaczkowski Source0: http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-%{version}.tar.gz +%if %{userwrapper} +Source1: fusesmb.sh.fuse-smb +Source2: README.fedora.fuse-smb +%endif Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#fuse is implicity required by libfuse.so.2 or fuse-libs -#Requires: fuse >= 2.3 +#fuse-libs doesn't force to have fuse which is needed for fuse-smb +#explicit Requires statement is required +Requires: fuse >= 2.3 #samba-common (fc<=6), libsmbclient (fc>6) and fuse-libs are implicity required by their .so files #Requires: fuse-libs >= 2.3 #Requires: samba-common >= 3.0 @@ -20,9 +33,7 @@ BuildRequires: fuse-devel >= 2.3 BuildRequires: samba-client >= 3.0 -#this doesn't work in mock -#%if %(rpmquery --qf '%{Version}' fedora-release) > 6 -%if "%fedora" > "6" +%if 0%{?fedora} > 6 #starting with 3.0.24-3 in FC7+ libsmbclient is in a separate package BuildRequires: libsmbclient-devel >= 3.0 %endif @@ -36,6 +47,10 @@ %prep %setup -q -n fusesmb-%{version} +%if %{userwrapper} +cp %{SOURCE1} fusesmb.sh +cp %{SOURCE2} README.fedora +%endif %build %configure @@ -44,6 +59,10 @@ %install rm -fr %{buildroot} make install DESTDIR=%{buildroot} +%if %{userwrapper} +mv %{buildroot}%{_bindir}/fusesmb %{buildroot}%{_bindir}/fusesmb-bin +cp fusesmb.sh %{buildroot}%{_bindir}/fusesmb +%endif %clean #build dir is removed by --clean option @@ -57,8 +76,24 @@ %doc AUTHORS ChangeLog COPYING INSTALL README TODO fusesmb.conf.ex %{_mandir}/man*/fusesmb.* +%if %{userwrapper} +#original binary file +%attr(0755,root,root) %{_bindir}/fusesmb-bin +%doc README.fedora +%endif + %changelog +* Thu Jul 3 2008 Marcin Zajaczkowski - 0.8.7-4 +- added workaround for problem with multi-threaded operations and samba 3.2 +(F9+) - bug 445978 + +* Sat May 10 2008 Marcin Zajaczkowski - 0.8.7-3 +- fixed conditional statement for better handle Fedora 10 version number + +* Sat May 10 2008 Marcin Zajaczkowski - 0.8.7-2 +- added explicit dependency on fuse package (thanks to Mikel Ward - #445316) + * Sat Feb 9 2008 Marcin Zajaczkowski - 0.8.7-1 - updated to 0.8.7 - specified licence type From fedora-extras-commits at redhat.com Fri Jul 4 18:44:08 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 4 Jul 2008 18:44:08 GMT Subject: rpms/ffcall/devel .cvsignore, 1.2, 1.3 ffcall.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807041844.m64Ii8uO000760@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/ffcall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv709 Modified Files: .cvsignore ffcall.spec sources Log Message: update to cvs 20080704 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ffcall/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2008 16:39:37 -0000 1.2 +++ .cvsignore 4 Jul 2008 18:43:25 -0000 1.3 @@ -1 +1 @@ -ffcall-1.10.tar.gz +ffcall-20080704cvs.tar.bz2 Index: ffcall.spec =================================================================== RCS file: /cvs/pkgs/rpms/ffcall/devel/ffcall.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ffcall.spec 18 Apr 2008 16:39:37 -0000 1.1 +++ ffcall.spec 4 Jul 2008 18:43:25 -0000 1.2 @@ -1,14 +1,13 @@ Name: ffcall Version: 1.10 -Release: 1%{?dist} +Release: 2.20080704cvs%{?dist} Summary: Libraries for foreign function call interfaces Group: System Environment/Libraries License: GPLv2+ URL: http://www.haible.de/bruno/packages-ffcall-README.html -Source0: ftp://ftp.santafe.edu/pub/gnu/ffcall-%{version}.tar.gz +Source0: ftp://ftp.santafe.edu/pub/gnu/ffcall-20080704cvs.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 %description @@ -18,7 +17,7 @@ %define debug_package %{nil} %prep -%setup -q -n ffcall-%{version} +%setup -q -n ffcall %build @@ -53,5 +52,9 @@ %changelog +* Fri Jul 4 2008 Gerard Milmeister - 1.10-2.20080704cvs +- update to cvs 20080704 +- support for ppc64 + * Mon Feb 25 2008 Gerard Milmeister - 1.10-1 - first Fedora release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ffcall/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2008 16:39:37 -0000 1.2 +++ sources 4 Jul 2008 18:43:25 -0000 1.3 @@ -1 +1 @@ -2db95007e901f3bc2ae7e5a9fe9ebea4 ffcall-1.10.tar.gz +a6d45be3c714188cf60a2ab5119d1b00 ffcall-20080704cvs.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 4 18:55:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:55:44 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041855.m64ItiMj009283@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchbugzilla acl on nagios (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:55:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:55:47 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041855.m64ItlZF009302@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchcommits acl on nagios (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:55:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:55:50 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041855.m64ItiMm009283@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the commit acl on nagios (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:55:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:55:52 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041855.m64Itq87009340@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the commit acl on nagios (Fedora EPEL 5) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:55:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:55:55 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041855.m64Itt0G009360@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchcommits acl on nagios (Fedora EPEL 5) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:55:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:55:57 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041855.m64ItlZI009302@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchbugzilla acl on nagios (Fedora EPEL 5) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:56:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:56:07 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041856.m64Itq8A009340@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchcommits acl on nagios (Fedora 9) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:56:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:56:08 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041856.m64Itt0J009360@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the commit acl on nagios (Fedora 9) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 18:56:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 18:56:08 +0000 Subject: [pkgdb] nagios had acl change status Message-ID: <200807041856.m64ItiMp009283@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchbugzilla acl on nagios (Fedora 9) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios From fedora-extras-commits at redhat.com Fri Jul 4 19:29:59 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Fri, 4 Jul 2008 19:29:59 GMT Subject: comps/po lv.po,1.9,1.10 Message-ID: <200807041929.m64JTx2B014046@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13856/po Modified Files: lv.po Log Message: 2008-07-04 Janis Ozolins (via johnij at fedoraproject.org) * po/lv.po: Updated Latvian translation Index: lv.po =================================================================== RCS file: /cvs/pkgs/comps/po/lv.po,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lv.po 17 Apr 2008 11:39:32 -0000 1.9 +++ lv.po 4 Jul 2008 19:29:29 -0000 1.10 @@ -1,182 +1,206 @@ # translation of lv.po to Latvian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# +# Copyright (C) 2008 THE lv'S COPYRIGHT HOLDER +# This file is distributed under the same license as the lv package. # Gatis Kalnins , 2006. +# Janis Ozolins \n" -"Language-Team: Latvian \n" +"POT-Creation-Date: 2008-07-04 18:36+0000\n" +"PO-Revision-Date: 2008-07-04 20:18+0100\n" +"Last-Translator: Janis Ozolins \n" +"Language-Team: Latvian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.1\n" +"Content-Transfer-Encoding: 8bit" #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 +#: ../comps-f10.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "" #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Administr????anas r??ki" #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +#: ../comps-f10.xml.in.h:3 msgid "Afrikaans Support" msgstr "??frik????u valodas atbalsts" #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 -#, fuzzy +#: ../comps-f10.xml.in.h:4 msgid "Albanian Support" -msgstr "Kan??das ang??u valodas atbalsts" +msgstr "Alb????u valodas atbalsts" #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f10.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Lietojumprogrammas" #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +#: ../comps-f10.xml.in.h:6 msgid "Applications to perform a variety of tasks" msgstr "Programmas da????diem m??r??iem" #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f10.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Ar??bu valodas atbalsts" #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 -#, fuzzy +#: ../comps-f10.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" -msgstr "Rom????u valodas atbalsts" +msgstr "Arm????u valodas atbalsts" #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 +#: ../comps-f10.xml.in.h:9 msgid "Assamese Support" msgstr "Asamie??u valodas atbalsts" #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +#: ../comps-f10.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "Publik??ciju sagatavo??ana" #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 +#: ../comps-f10.xml.in.h:11 msgid "Base" msgstr "Pamatsist??ma" #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 +#: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Pamatsist??ma" #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 +#: ../comps-f10.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "Programm????anas valodas Ruby pamatatbalsts" #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 +#: ../comps-f10.xml.in.h:14 msgid "Basque Support" msgstr "Basku valodas atbalsts" #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 -#, fuzzy +#: ../comps-f10.xml.in.h:15 msgid "Belarusian Support" -msgstr "Bulg??ru valodas atbalsts" +msgstr "Baltkrievu valodas atbalsts" #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 +#: ../comps-f10.xml.in.h:16 msgid "Bengali Support" msgstr "Beng????u valodas atbalsts" #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 +#: ../comps-f10.xml.in.h:17 #, fuzzy msgid "Bhutanese Support" msgstr "????nie??u valodas atbalsts" #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 +#: ../comps-f10.xml.in.h:18 #, fuzzy msgid "Bosnian Support" msgstr "Igau??u valodas atbalsts" #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 +#: ../comps-f10.xml.in.h:19 msgid "Brazilian Portuguese Support" msgstr "Braz????u portug????u valodas atbalsts" #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 +#: ../comps-f10.xml.in.h:20 msgid "Breton Support" msgstr "Breta??as valodas atbalsts" #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22 +#: ../comps-f10.xml.in.h:22 msgid "Bulgarian Support" msgstr "Bulg??ru valodas atbalsts" #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23 +#: ../comps-f10.xml.in.h:23 msgid "Catalan Support" msgstr "Katalonie??u valodas atbalsts" #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24 +#: ../comps-f10.xml.in.h:24 msgid "Chinese Support" msgstr "????nie??u valodas atbalsts" #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25 +#: ../comps-f10.xml.in.h:25 msgid "Clustering" msgstr "Klasteris" #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26 +#: ../comps-f10.xml.in.h:26 msgid "Clustering Support" msgstr "Klastera atbalsts" #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27 +#: ../comps-f10.xml.in.h:27 msgid "Core" msgstr "Pamatsist??ma" #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28 +#: ../comps-f10.xml.in.h:28 msgid "Croatian Support" msgstr "Horv??tu valodas atbalsts" #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29 -#: ../comps-el5.xml.in.h:8 +#: ../comps-f10.xml.in.h:29 ../comps-el5.xml.in.h:8 msgid "Czech Support" msgstr "??ehu valodas atbalsts" #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30 +#: ../comps-f10.xml.in.h:30 msgid "DNS Name Server" msgstr "DNS v??rdu serveris" #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31 +#: ../comps-f10.xml.in.h:31 msgid "Danish Support" msgstr "D????u valodas atbalsts" #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32 -#: ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 +#: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 msgid "Desktop Environments" msgstr "Darbvirsma" #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33 -#: ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 +#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 msgid "Desktop environments" msgstr "Darbvirsma" #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34 -#: ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 +#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 msgid "Development" msgstr "Programm????ana" #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35 +#: ../comps-f10.xml.in.h:35 msgid "Development Libraries" msgstr "Programm????anas bibliotekas" #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36 -#: ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 +#: ../comps-f10.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 msgid "Development Tools" msgstr "Programm????anas r??ki" #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 +#: ../comps-f10.xml.in.h:37 msgid "Dial-up Networking Support" msgstr "Iezvanpiek??uve datort??kliem" #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 +#: ../comps-f10.xml.in.h:38 msgid "Dutch Support" msgstr "D????u valodas atbalsts" @@ -185,67 +209,73 @@ msgstr "Eclipse" #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39 -#: ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 +#: ../comps-f10.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 msgid "Editors" msgstr "Redaktori" #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40 -#: ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 +#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 msgid "Educational Software" -msgstr "" +msgstr "Izgl??tojo???? programmat??ra" #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41 -#: ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 +#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 msgid "Educational software for learning" -msgstr "" +msgstr "Izgl??tojo???? programmat??ra m??c??b??m" #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42 -#: ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 +#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 msgid "Engineering and Scientific" msgstr "In??enerija un Zin??tne" #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43 +#: ../comps-f10.xml.in.h:43 msgid "English (UK) Support" msgstr "Ang??u (UK) valodas atbalsts" #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45 +#: ../comps-f10.xml.in.h:45 msgid "Estonian Support" msgstr "Igau??u valodas atbalsts" #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46 +#: ../comps-f10.xml.in.h:46 msgid "Ethiopic Support" msgstr "Etiopie??u valodas atbalsts" #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47 -#: ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 +#: ../comps-f10.xml.in.h:47 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 msgid "FTP Server" msgstr "FTP serveris" #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48 +#: ../comps-f10.xml.in.h:48 msgid "Faeroese Support" msgstr "Fareru valodas atbalsts" #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50 -#: ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 +#: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 #, fuzzy msgid "Fedora Packager" msgstr "Eclipse" #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51 -#, fuzzy +#: ../comps-f10.xml.in.h:51 msgid "Filipino Support" -msgstr "Gal??cie??u valodas atbalsts" +msgstr "Filip??nie??u valodas atbalsts" #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52 +#: ../comps-f10.xml.in.h:52 msgid "Finnish Support" msgstr "Somu valodas atbalsts" #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55 +#: ../comps-f10.xml.in.h:55 msgid "French Support" msgstr "Fran??u valodas atbalsts" #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56 -#: ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 +#: ../comps-f10.xml.in.h:56 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 msgid "" "From CD recording to playing audio CDs and multimedia files, this package " "group allows you to work with sound and video on the system." @@ -254,16 +284,17 @@ "programmas darbam ar ska??u un video." #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57 -#: ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 +#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 msgid "GNOME Desktop Environment" msgstr "GNOME Darbvirsma" #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58 -#: ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22 +#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22 msgid "GNOME Software Development" msgstr "GNOME Programmu izstr??de" #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59 +#: ../comps-f10.xml.in.h:59 msgid "" "GNOME is a powerful graphical user interface which includes a panel, " "desktop, system icons, and a graphical file manager." @@ -272,74 +303,83 @@ "darbvirsmu, sist??mas piktogrammas un grafisku dat??u p??rvaldnieku." #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60 +#: ../comps-f10.xml.in.h:60 msgid "Gaelic Support" msgstr "G????u valodas atbalsts" #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61 +#: ../comps-f10.xml.in.h:61 msgid "Galician Support" msgstr "Gal??cie??u valodas atbalsts" #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62 -#: ../comps-el5.xml.in.h:24 +#: ../comps-f10.xml.in.h:62 ../comps-el5.xml.in.h:24 msgid "Games and Entertainment" msgstr "Sp??les un izklaide" #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63 +#: ../comps-f10.xml.in.h:63 #, fuzzy msgid "Georgian Support" msgstr "V??cu valodas atbalsts" #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64 +#: ../comps-f10.xml.in.h:64 msgid "German Support" msgstr "V??cu valodas atbalsts" #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65 -#: ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 +#: ../comps-f10.xml.in.h:65 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 msgid "Graphical Internet" msgstr "Interneta grafisk?? re????ma r??ki" #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66 -#: ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 +#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 msgid "Graphics" msgstr "Grafika" #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67 +#: ../comps-f10.xml.in.h:67 msgid "Greek Support" msgstr "Grie??u valodas atbalsts" #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68 +#: ../comps-f10.xml.in.h:68 msgid "Gujarati Support" msgstr "Gujarati valodas atbalsts" #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69 -#: ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 -#, fuzzy +#: ../comps-f10.xml.in.h:69 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 msgid "Hardware Support" -msgstr "Ebreju valodas atbalsts" +msgstr "Ier????u atbalsts" #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70 -#: ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 +#: ../comps-f10.xml.in.h:70 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 msgid "Hebrew Support" msgstr "Ebreju valodas atbalsts" #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71 +#: ../comps-f10.xml.in.h:71 msgid "Hindi Support" msgstr "Hindu valodas atbalsts" #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72 +#: ../comps-f10.xml.in.h:72 msgid "Hungarian Support" msgstr "Ung??ru valodas atbalsts" #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73 +#: ../comps-f10.xml.in.h:73 msgid "Icelandic Support" msgstr "Islandie??u valodas atbalsts" #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74 +#: ../comps-f10.xml.in.h:74 msgid "Indonesian Support" msgstr "Indon??zie??u valodas atbalsts" #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75 -#: ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 +#: ../comps-f10.xml.in.h:77 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 msgid "" "Install these packages in order to develop GTK+ and GNOME graphical " "applications." @@ -348,6 +388,7 @@ "izstr??di." #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76 +#: ../comps-f10.xml.in.h:78 #, fuzzy msgid "" "Install these packages in order to develop GTK+ and XFCE graphical " @@ -357,13 +398,14 @@ "izstr??di." #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77 -#: ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 +#: ../comps-f10.xml.in.h:79 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." msgstr "" "Uzst??diet ????s pakotnes, ja v??laties nodarboties ar QT un KDE programmu " "izstr??di." #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78 +#: ../comps-f10.xml.in.h:80 msgid "" "Install these tools to enable the system to print or act as a print server." msgstr "" @@ -371,51 +413,55 @@ "izmantot ??o datoru k?? drukas serveri." #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79 -#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 +#: ../comps-f10.xml.in.h:81 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 msgid "" "Install this group of packages to use the base graphical (X) user interface." msgstr "" "Uzst??diet ????s pakotnes, ja v??laties izmantot grafisku lietot??ja saskarni (X)." #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81 +#: ../comps-f10.xml.in.h:83 #, fuzzy msgid "Inuktitut Support" msgstr "Zulu valodas atbalsts" #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82 +#: ../comps-f10.xml.in.h:84 msgid "Irish Support" msgstr "??ru valodas atbalsts" #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83 +#: ../comps-f10.xml.in.h:85 msgid "Italian Support" msgstr "It????u valodas atbalsts" #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84 -#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 +#: ../comps-f10.xml.in.h:86 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 msgid "Japanese Support" msgstr "Jap????u valodas atbalsts" #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85 -#: ../comps-el4.xml.in.h:31 +#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86 -#: ../comps-el4.xml.in.h:32 +#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "Izstr??de Java valod??" #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87 -#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 +#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" msgstr "KDE (K darbvirsmas vide)" #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88 -#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 +#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 msgid "KDE Software Development" msgstr "KDE Programmu izstr??de" #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89 +#: ../comps-f10.xml.in.h:91 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -424,196 +470,231 @@ "darbvirsmu, sist??mas piktogrammas un grafisku dat??u p??rvaldnieku." #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90 +#: ../comps-f10.xml.in.h:92 msgid "Kannada Support" msgstr "Kan??die??u valodas atbalsts" #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92 +#: ../comps-f10.xml.in.h:94 #, fuzzy msgid "Khmer Support" msgstr "V??cu valodas atbalsts" #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93 +#: ../comps-f10.xml.in.h:95 msgid "Korean Support" msgstr "Korejie??u valodas atbalsts" #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94 +#: ../comps-f10.xml.in.h:96 msgid "Languages" msgstr "Valodas" #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95 +#: ../comps-f10.xml.in.h:97 #, fuzzy msgid "Lao Support" msgstr "Tajie??u valodas atbalsts" #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96 -#, fuzzy +#: ../comps-f10.xml.in.h:98 msgid "Latvian Support" -msgstr "Horv??tu valodas atbalsts" +msgstr "Latvie??u valodas atbalsts" #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98 +#: ../comps-f10.xml.in.h:100 msgid "Legacy Network Server" msgstr "Novecoju??i t??kla serveri" #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99 +#: ../comps-f10.xml.in.h:101 msgid "Legacy Software Development" msgstr "Novecoju??u programmu programm????anas r??ki" #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100 +#: ../comps-f10.xml.in.h:102 msgid "Legacy Software Support" msgstr "Novecoju??as programmat??ras atbalsts" #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101 +#: ../comps-f10.xml.in.h:103 msgid "Lithuanian Support" msgstr "Lietuvie??u valodas atbalsts" #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104 -#: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 +#: ../comps-f10.xml.in.h:106 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 msgid "Mail Server" msgstr "Pasta serveris" #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105 +#: ../comps-f10.xml.in.h:107 msgid "Malay Support" msgstr "Malajie??u valodas atbalsts" #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106 +#: ../comps-f10.xml.in.h:108 msgid "Malayalam Support" msgstr "Malajalamie??u valodas atbalsts" #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107 +#: ../comps-f10.xml.in.h:109 #, fuzzy msgid "Maori Support" msgstr "Marati valodas atbalsts" #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108 +#: ../comps-f10.xml.in.h:110 msgid "Marathi Support" msgstr "Marati valodas atbalsts" #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110 +#: ../comps-f10.xml.in.h:112 msgid "MySQL Database" msgstr "MySQL datu b??ze" #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112 -#: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 +#: ../comps-f10.xml.in.h:114 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 msgid "Network Servers" msgstr "T??kla serveri" #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113 -#: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 +#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 msgid "News Server" msgstr "Zi??u serveris" #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115 +#: ../comps-f10.xml.in.h:117 msgid "Northern Sotho Support" msgstr "Northern Sotho Support" #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116 +#: ../comps-f10.xml.in.h:118 msgid "Norwegian Support" msgstr "Norv????u valodas atbalsts" #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117 -#: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 +#: ../comps-f10.xml.in.h:119 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "Birojs/Ra??o??ana" #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119 +#: ../comps-f10.xml.in.h:121 msgid "Oriya Support" msgstr "Oriya Support" #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120 -#: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 +#: ../comps-f10.xml.in.h:122 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 msgid "" "Packages which provide functionality for developing and building " "applications." msgstr "Pakotnes, kas nodro??ina programmu izstr??des procesu." #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121 -#, fuzzy +#: ../comps-f10.xml.in.h:123 msgid "Persian Support" -msgstr "Serbu valodas atbalsts" +msgstr "Persie??u valodas atbalsts" #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122 +#: ../comps-f10.xml.in.h:124 msgid "Polish Support" msgstr "Po??u valodas atbalsts" #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123 +#: ../comps-f10.xml.in.h:125 msgid "Portuguese Support" msgstr "Portug????u valodas atbalsts" #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124 +#: ../comps-f10.xml.in.h:126 msgid "PostgreSQL Database" msgstr "PostgreSQL datu b??ze" #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125 +#: ../comps-f10.xml.in.h:127 msgid "Printing Support" msgstr "Drukas sist??ma" #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126 +#: ../comps-f10.xml.in.h:128 msgid "Punjabi Support" msgstr "Pend??abie??u valodas atbalsts" #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127 +#: ../comps-f10.xml.in.h:129 msgid "Romanian Support" msgstr "Rom????u valodas atbalsts" #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128 +#: ../comps-f10.xml.in.h:130 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129 +#: ../comps-f10.xml.in.h:131 msgid "Russian Support" msgstr "Krievu valodas atbalsts" -#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:130 +#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132 +#: ../comps-f10.xml.in.h:134 #, fuzzy msgid "Samoan Support" msgstr "V??cu valodas atbalsts" -#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:131 +#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133 +#: ../comps-f10.xml.in.h:135 msgid "Serbian Support" msgstr "Serbu valodas atbalsts" -#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:132 +#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134 +#: ../comps-f10.xml.in.h:136 msgid "Server Configuration Tools" msgstr "Servera iestat????anas r??ki" -#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:133 -#: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 +#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135 +#: ../comps-f10.xml.in.h:137 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 msgid "Servers" msgstr "Serveri" -#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:134 -#: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 +#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136 +#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 msgid "" "Simple window managers that aren't part of a larger desktop environment." msgstr "" +"Vienk??r??i logu p??rvaldnieki, kas nav darba virsmu vides da??a." -#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:135 +#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137 +#: ../comps-f10.xml.in.h:139 msgid "Sinhala Support" msgstr "Sinhala Support" -#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:136 +#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138 +#: ../comps-f10.xml.in.h:140 msgid "Slovak Support" msgstr "Slov??ku valodas atbalsts" -#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:137 +#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139 +#: ../comps-f10.xml.in.h:141 msgid "Slovenian Support" msgstr "Slov????u valodas atbalsts" -#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:138 +#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140 +#: ../comps-f10.xml.in.h:142 msgid "Smallest possible installation" msgstr "Vismaz??k?? iesp??jam?? instal??cija" -#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:139 -#: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 +#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141 +#: ../comps-f10.xml.in.h:143 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "Programmas, kas tiek izmantotas t??kla serveriem" -#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:140 +#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142 +#: ../comps-f10.xml.in.h:144 #, fuzzy msgid "Somali Support" msgstr "Swati atbalsts" -#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:141 +#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143 +#: ../comps-f10.xml.in.h:145 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -621,65 +702,74 @@ "????s programmas, kuras reiz??m d??v?? par teksta redaktoriem, ??auj labot " "tekstus. Ietver Emacs un Vi." -#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:142 -#: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 +#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144 +#: ../comps-f10.xml.in.h:146 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 msgid "Sound and Video" msgstr "Ska??a un video" -#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:143 +#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145 +#: ../comps-f10.xml.in.h:147 msgid "Southern Ndebele Support" msgstr "Dienvidu Ndebele atbalsts" -#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:144 +#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146 +#: ../comps-f10.xml.in.h:148 msgid "Southern Sotho Support" msgstr "Dienvidu Sotho atbalsts" -#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:145 +#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147 +#: ../comps-f10.xml.in.h:149 msgid "Spanish Support" msgstr "Sp????u valodas atbalsts" -#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:146 -#: ../comps-el4.xml.in.h:46 +#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148 +#: ../comps-f10.xml.in.h:150 ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "Izstr??des programmu atbalsts darbam ar Java programm????anas valodu" -#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:147 -#: ../comps-el4.xml.in.h:47 +#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149 +#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "Atbalsts Javas valod?? rakst??to programmu start????anai" -#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:148 +#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150 +#: ../comps-f10.xml.in.h:152 msgid "Swati Support" msgstr "Swati atbalsts" -#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:149 +#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151 +#: ../comps-f10.xml.in.h:153 msgid "Swedish Support" msgstr "Zviedru valodas atbalsts" -#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:150 -#: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 +#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152 +#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 msgid "System Tools" msgstr "Sist??mas r??ki" -#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:151 +#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153 +#: ../comps-f10.xml.in.h:155 #, fuzzy msgid "Tagalog Support" msgstr "Tamilu valodas atbalsts" -#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:152 +#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154 +#: ../comps-f10.xml.in.h:156 msgid "Tamil Support" msgstr "Tamilu valodas atbalsts" -#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:153 +#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155 +#: ../comps-f10.xml.in.h:157 msgid "Telugu Support" msgstr "Telugu valodas atbalsts" -#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:154 -#: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 +#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156 +#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 msgid "Text-based Internet" msgstr "Interneta teksta re????ma r??ki" -#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:155 +#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157 +#: ../comps-f10.xml.in.h:159 msgid "Thai Support" msgstr "Tajie??u valodas atbalsts" @@ -687,56 +777,62 @@ msgid "The Eclipse Integrated Development Environment." msgstr "Integr??t?? izstr??des vide Eclipse" -#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:156 -#: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 +#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158 +#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "" "Grupa ietver biroja programmas, PDF form??ta dat??u las????anas programmas utt." -#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:157 +#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159 +#: ../comps-f10.xml.in.h:161 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "???? grupa ietver bibliotekas, kas nepiecie??amas programmu izstr??dei." -#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:158 -#: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 +#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160 +#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." msgstr "????s pakotnes dod iesp??ju iestat??t IMAP vai SMTP pasta serveri." -#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:159 +#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161 +#: ../comps-f10.xml.in.h:163 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "????s pakotnes dod iesp??ju izstr??d??t programmas X Window sist??mai." -#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:160 -#: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 -#, fuzzy +#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162 +#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 msgid "" "These packages are helpful when developing web applications or web pages." -msgstr "????s pakotnes dod iesp??ju izstr??d??t programmas X Window sist??mai." +msgstr "????s pakotnes noder izstr??d??jot web programmas vai web-lapas." -#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:161 +#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163 +#: ../comps-f10.xml.in.h:165 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "????s pakotnes ietver t??dus t??kla servisus k?? DHCP, Kerberos un NIS." -#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:162 +#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164 +#: ../comps-f10.xml.in.h:166 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." msgstr "" "????s pakotnes ietver t??dus novecoju??us t??kla protokolus k?? rsh un telnet." -#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:163 +#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165 +#: ../comps-f10.xml.in.h:167 #, fuzzy msgid "These packages provide a virtualization environment." msgstr "????s pakotnes nodro??ina savietojam??bu ar iepriek????j??m versij??m." -#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:164 +#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166 +#: ../comps-f10.xml.in.h:168 msgid "These packages provide compatibility with previous releases." msgstr "????s pakotnes nodro??ina savietojam??bu ar iepriek????j??m versij??m." -#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:165 +#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167 +#: ../comps-f10.xml.in.h:169 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -744,7 +840,8 @@ "????s pakotnes nodro??ina da????du re??ion??lo iestat??jumu (??riftu un ievades " "meto??u) atbalstu" -#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:166 +#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168 +#: ../comps-f10.xml.in.h:170 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -752,18 +849,18 @@ "??ie r??ki dod iesp??ju izveidot dokument??ciju DocBook form??t?? un p??rveidot to " "HTML, PDF, Postscript un teksta form??t??." -#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:167 -#: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 +#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169 +#: ../comps-f10.xml.in.h:171 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." msgstr "??ie r??ki ??auj datoru izmantot k?? interneta serveri." -#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:168 -#: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 +#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170 +#: ../comps-f10.xml.in.h:172 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." msgstr "??ie r??ki ??auj datoru izmantot k?? FTP serveri." -#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:169 -#: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 +#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171 +#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 msgid "" "These tools include core development tools such as automake, gcc, perl, " "python, and debuggers." @@ -771,17 +868,19 @@ "??ie r??ki ietver programm????anas pamatr??kus, t??dus k?? automake, gcc, perl, " "python un atk????dot??jus." -#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:170 -#: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 +#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172 +#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." msgstr "??ie r??ki dod iesp??ju izmantot datoru k?? zi??u serveri." -#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:171 +#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173 +#: ../comps-f10.xml.in.h:175 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" "???? grupa ietver komp??nijas RedHat izstr??d??tos servera administr????anas r??kus." -#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:172 +#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174 +#: ../comps-f10.xml.in.h:176 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." @@ -789,26 +888,26 @@ "???? grupa satur minim??lu pakot??u komplekt??ciju. T?? der, piem??ram, nelielu " "mar??rut??t??ju/ugunssienu izveidei." -#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:173 -#: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 +#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175 +#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "???? grupa ietver grafiskus e-pasta, interneta un ??ata klientus." -#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:174 -#: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 +#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176 +#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 msgid "" "This group includes packages for performing mathematical and scientific " "computations and plotting, as well as unit conversion." msgstr "" "???? grupa ietver programmas matem??tisku un citu zin??tnisku apr????inu veik??anai." -#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:175 -#: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 +#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177 +#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." msgstr "???? grupa ietver programmas darbam ar grafiku un skeneriem." -#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:176 -#: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 +#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178 +#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 msgid "" "This group includes text-based email, Web, and chat clients. These " "applications do not require the X Window System." @@ -816,8 +915,8 @@ "???? grupa ietver teksta re????ma e-pasta, interneta un ??ata klientus. ??o " "programmu izmanto??anai nav nepiecie??ams uzst??d??t X Window sist??mu." -#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:177 -#: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 +#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179 +#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 msgid "" "This group is a collection of graphical administration tools for the system, " "such as for managing user accounts and configuring system hardware." @@ -826,20 +925,20 @@ "iesp??jams pievienot jaunus lietot??ju profilus, iestat??t ska??as karti, ekr??nu " "un tml." -#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:178 -#: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 +#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180 +#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 msgid "" "This group is a collection of tools and resources of Armenian environments." -msgstr "" +msgstr "???? grupa ir Arm????u vides r??ku un resursu kolekcija." -#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:179 -#: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 +#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181 +#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 msgid "" "This group is a collection of tools for various hardware specific utilities." msgstr "" -#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:180 -#: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 +#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182 +#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 msgid "" "This group is a collection of various tools for the system, such as the " "client for connecting to SMB shares and tools to monitor network traffic." @@ -847,12 +946,14 @@ "???? grupa ietver da????das sist??mas pal??gprogrammas: piem??ram, klientprogrammas " "piek??uvei SMB serveriem un t??kla trafika nov??ro??anai." -#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:181 +#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183 +#: ../comps-f10.xml.in.h:185 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "????s grupas pakotnes ??aus Jums uzst??d??t iestat??t DNS serveri BIND." -#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:182 +#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184 +#: ../comps-f10.xml.in.h:186 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -860,193 +961,221 @@ "???? pakot??u grupa dod iesp??ju veikt inform??cijas apmai??u starp Linux un MS " "Windows (tm) sist??m??m." -#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:183 +#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185 +#: ../comps-f10.xml.in.h:187 msgid "This package group contains packages useful for use with MySQL." msgstr "???? grupa satur pakotnes, kas noder MySQL izmanto??anas laik??." -#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:184 +#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186 +#: ../comps-f10.xml.in.h:188 msgid "This package group includes packages useful for use with Postgresql." msgstr "???? grupa satur pakotnes, kas noder PostgreSQL izmanto??anas laik??." -#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:185 -#, fuzzy +#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187 +#: ../comps-f10.xml.in.h:189 msgid "Tibetan Support" -msgstr "V??cu valodas atbalsts" +msgstr "Tibetie??u valodas atbalsts" -#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:186 +#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188 +#: ../comps-f10.xml.in.h:190 #, fuzzy msgid "Tonga Support" msgstr "Tsonga valodas atbalsts" -#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:187 -#: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 +#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189 +#: ../comps-f10.xml.in.h:191 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" msgstr "" -#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:188 +#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190 +#: ../comps-f10.xml.in.h:192 msgid "Tsonga Support" msgstr "Tsonga valodas atbalsts" -#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:189 +#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191 +#: ../comps-f10.xml.in.h:193 msgid "Tswana Support" msgstr "Tswana Support" -#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:190 +#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192 +#: ../comps-f10.xml.in.h:194 msgid "Turkish Support" msgstr "Turku valodas atbalsts" -#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:191 +#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193 +#: ../comps-f10.xml.in.h:195 msgid "Ukrainian Support" msgstr "Ukrai??u valodas atbalsts" -#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:192 +#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194 +#: ../comps-f10.xml.in.h:196 #, fuzzy msgid "Urdu Support" msgstr "Zulu valodas atbalsts" -#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:193 -#: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 +#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195 +#: ../comps-f10.xml.in.h:197 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." msgstr "Da????das sist??mas pamatda??as" -#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:194 -#: ../comps-el5.xml.in.h:72 +#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196 +#: ../comps-f10.xml.in.h:198 ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "Da????di veidi, lai atsl??bin??tos un pavad??tu br??vo laiku." -#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:195 +#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197 +#: ../comps-f10.xml.in.h:199 msgid "Venda Support" msgstr "Venda atbalsts" -#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:196 -#, fuzzy +#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198 +#: ../comps-f10.xml.in.h:200 msgid "Vietnamese Support" -msgstr "????nie??u valodas atbalsts" +msgstr "Vjetnamie??u valodas atbalsts" -#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:197 +#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199 +#: ../comps-f10.xml.in.h:201 msgid "Virtualization" msgstr "Virtualiz??cija" -#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:199 -#: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 +#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201 +#: ../comps-f10.xml.in.h:203 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 #, fuzzy msgid "Web Development" msgstr "Programm????ana" -#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:200 -#: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 +#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202 +#: ../comps-f10.xml.in.h:204 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 msgid "Web Server" msgstr "Interneta serveris" -#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:201 +#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203 +#: ../comps-f10.xml.in.h:205 msgid "Welsh Support" msgstr "Velsie??u valodas atbalsts" -#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:202 -#: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 +#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204 +#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 msgid "Window Managers" -msgstr "" +msgstr "Logu p??rvaldnieki" -#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:203 +#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205 +#: ../comps-f10.xml.in.h:207 msgid "Windows File Server" msgstr "Windows dat??u serveris" -#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:204 +#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206 +#: ../comps-f10.xml.in.h:208 msgid "X Software Development" msgstr "X programmu izstr??de" -#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:205 -#: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 +#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207 +#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 msgid "X Window System" msgstr "X Window sist??ma" -#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:206 +#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208 +#: ../comps-f10.xml.in.h:210 msgid "XFCE" -msgstr "" +msgstr "XFCE" -#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:207 -#, fuzzy +#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209 +#: ../comps-f10.xml.in.h:211 msgid "XFCE Software Development" -msgstr "X programmu izstr??de" +msgstr "XFCE programmat??ras izstr??de" -#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:208 +#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210 +#: ../comps-f10.xml.in.h:212 msgid "Xhosa Support" msgstr "Xhosa atbalsts" -#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:209 +#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211 +#: ../comps-f10.xml.in.h:213 msgid "Zulu Support" msgstr "Zulu valodas atbalsts" -#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 +#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21 msgid "Buildsystem building group" msgstr "" -#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 -#, fuzzy +#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49 msgid "Fedora Eclipse" -msgstr "Eclipse" +msgstr "Fedora Eclipse" -#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 +#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53 msgid "Fonts" -msgstr "" +msgstr "Fonti" -#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 +#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54 msgid "Fonts packages for rendering text on the desktop." msgstr "" -#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 -#, fuzzy +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:82 msgid "Integrated Development Environments based on Eclipse." -msgstr "Integr??t?? izstr??des vide Eclipse" +msgstr "Uz Eclipse b??zes integr??t?? izstr??des vide" -#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:99 msgid "Legacy Fonts" msgstr "" -#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:104 #, fuzzy msgid "Low Saxon Support" msgstr "Tajie??u valodas atbalsts" -#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 -#, fuzzy +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:111 msgid "Mongolian Support" -msgstr "Igau??u valodas atbalsts" +msgstr "Mongo??u valodas atbalsts" -#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:113 #, fuzzy msgid "Nepali Support" msgstr "Beng????u valodas atbalsts" -#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:120 msgid "Older bitmap and vector fonts packages" msgstr "" -#: ../comps-f9.xml.in.h:44 -#, fuzzy +#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 msgid "Esperanto Support" -msgstr "V??cu valodas atbalsts" +msgstr "Esperanto valodas atbalsts" -#: ../comps-f9.xml.in.h:91 +#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:93 #, fuzzy msgid "Kashubian Support" msgstr "Igau??u valodas atbalsts" -#: ../comps-f9.xml.in.h:103 -#, fuzzy +#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:105 msgid "Macedonian Support" -msgstr "Igau??u valodas atbalsts" +msgstr "Ma??edonie??u valodas atbalsts" -#: ../comps-f9.xml.in.h:114 +#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:116 #, fuzzy msgid "Northern Sami Support" msgstr "Northern Sotho Support" -#: ../comps-f9.xml.in.h:198 +#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:132 +#, fuzzy +msgid "SUGAR Desktop Environment" +msgstr "Darbvirsma" + +#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:133 +msgid "SUGAR is the desktop environment developed for the OLPC XO." +msgstr "" + +#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:202 #, fuzzy msgid "Walloon Support" msgstr "Tajie??u valodas atbalsts" +#: ../comps-f10.xml.in.h:75 +msgid "Input Methods" +msgstr "Ievades metodes" + +#: ../comps-f10.xml.in.h:76 +msgid "Input method packages for the input of international text." +msgstr "" + #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "Programmas da????diem m??r??iem" @@ -1093,12 +1222,13 @@ #: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" -msgstr "" +msgstr "T??kla serveru kolekcija specifisk??m vajadz??b??m" #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 msgid "" "This group is a collection of tools and resources of Arabic environments." msgstr "" +"Ar??bu vides r??ku un resursu kolekcija." #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 msgid "" @@ -1109,6 +1239,7 @@ msgid "" "This group is a collection of tools and resources of Japanese environments." msgstr "" +"Jap????u vides r??ku un resursu kolekcija." #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 msgid "XEmacs" @@ -1117,7 +1248,7 @@ #: ../comps-el5.xml.in.h:65 msgid "" "This group is a collection of tools and resources of Czech environments." -msgstr "" +msgstr "??ehu vides r??ku un resursu kolekcija." #~ msgid "British Support" #~ msgstr "Britu ang??u valodas atbalsts" From fedora-extras-commits at redhat.com Fri Jul 4 19:37:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:37:20 +0000 Subject: [pkgdb] automaton was added for jjames Message-ID: <200807041937.m64JbKet011058@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package automaton with summary Java finite state automata/regular expression library Kevin Fenzi (kevin) has approved Package automaton Kevin Fenzi (kevin) has added a Fedora devel branch for automaton with an owner of jjames Kevin Fenzi (kevin) has approved automaton in Fedora devel Kevin Fenzi (kevin) has approved Package automaton Kevin Fenzi (kevin) has set commit to Approved for cvsextras on automaton (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on automaton (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on automaton (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/automaton From fedora-extras-commits at redhat.com Fri Jul 4 19:37:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:37:27 +0000 Subject: [pkgdb] automaton (Fedora, devel) updated by kevin Message-ID: <200807041937.m64JbRSF011080@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on automaton (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/automaton From fedora-extras-commits at redhat.com Fri Jul 4 19:37:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:37:27 +0000 Subject: [pkgdb] automaton (Fedora, 9) updated by kevin Message-ID: <200807041937.m64JbRSI011080@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for automaton Kevin Fenzi (kevin) has set commit to Approved for cvsextras on automaton (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on automaton (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on automaton (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on automaton (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/automaton From fedora-extras-commits at redhat.com Fri Jul 4 19:38:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:38:02 GMT Subject: rpms/automaton - New directory Message-ID: <200807041938.m64Jc2TN015338@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/automaton In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15241/rpms/automaton Log Message: Directory /cvs/extras/rpms/automaton added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:38:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:38:13 GMT Subject: rpms/automaton/devel - New directory Message-ID: <200807041938.m64JcD6m015359@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/automaton/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15241/rpms/automaton/devel Log Message: Directory /cvs/extras/rpms/automaton/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:38:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:38:28 GMT Subject: rpms/automaton Makefile,NONE,1.1 Message-ID: <200807041938.m64JcSJd015385@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/automaton In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15241/rpms/automaton Added Files: Makefile Log Message: Setup of module automaton --- NEW FILE Makefile --- # Top level Makefile for module automaton all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 19:38:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:38:41 GMT Subject: rpms/automaton/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807041938.m64Jcfem015431@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/automaton/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15241/rpms/automaton/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module automaton --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: automaton # $Id: Makefile,v 1.1 2008/07/04 19:38:28 kevin Exp $ NAME := automaton SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 19:39:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:39:37 +0000 Subject: [pkgdb] sleuthkit was added for kwizart Message-ID: <200807041939.m64JdbnV011246@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package sleuthkit with summary The Sleuth Kit (TSK) Kevin Fenzi (kevin) has approved Package sleuthkit Kevin Fenzi (kevin) has added a Fedora devel branch for sleuthkit with an owner of kwizart Kevin Fenzi (kevin) has approved sleuthkit in Fedora devel Kevin Fenzi (kevin) has approved Package sleuthkit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sleuthkit (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sleuthkit (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sleuthkit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sleuthkit From fedora-extras-commits at redhat.com Fri Jul 4 19:39:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:39:40 +0000 Subject: [pkgdb] sleuthkit (Fedora EPEL, 5) updated by kevin Message-ID: <200807041939.m64Jdec9011266@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for sleuthkit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sleuthkit (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sleuthkit (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sleuthkit (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on sleuthkit (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sleuthkit From fedora-extras-commits at redhat.com Fri Jul 4 19:39:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:39:40 +0000 Subject: [pkgdb] sleuthkit (Fedora, 8) updated by kevin Message-ID: <200807041939.m64Jde0l011267@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for sleuthkit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sleuthkit (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sleuthkit (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sleuthkit (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on sleuthkit (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sleuthkit From fedora-extras-commits at redhat.com Fri Jul 4 19:39:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:39:40 +0000 Subject: [pkgdb] sleuthkit (Fedora EPEL, 4) updated by kevin Message-ID: <200807041939.m64JdecC011266@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for sleuthkit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sleuthkit (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sleuthkit (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sleuthkit (Fedora EPEL 4) Kevin Fenzi (kevin) Approved cvsextras for commit access on sleuthkit (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sleuthkit From fedora-extras-commits at redhat.com Fri Jul 4 19:39:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:39:40 +0000 Subject: [pkgdb] sleuthkit (Fedora, 9) updated by kevin Message-ID: <200807041939.m64Jde0o011267@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for sleuthkit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sleuthkit (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sleuthkit (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sleuthkit (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on sleuthkit (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sleuthkit From fedora-extras-commits at redhat.com Fri Jul 4 19:39:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:39:40 +0000 Subject: [pkgdb] sleuthkit (Fedora, devel) updated by kevin Message-ID: <200807041939.m64Jde0q011267@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on sleuthkit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sleuthkit From fedora-extras-commits at redhat.com Fri Jul 4 19:40:17 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:40:17 GMT Subject: rpms/sleuthkit - New directory Message-ID: <200807041940.m64JeH4t015747@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sleuthkit In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso15698/rpms/sleuthkit Log Message: Directory /cvs/extras/rpms/sleuthkit added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:40:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:40:40 GMT Subject: rpms/sleuthkit/devel - New directory Message-ID: <200807041940.m64Jeegp015800@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sleuthkit/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso15698/rpms/sleuthkit/devel Log Message: Directory /cvs/extras/rpms/sleuthkit/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:40:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:40:56 GMT Subject: rpms/sleuthkit Makefile,NONE,1.1 Message-ID: <200807041940.m64Jeu9R015915@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sleuthkit In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso15698/rpms/sleuthkit Added Files: Makefile Log Message: Setup of module sleuthkit --- NEW FILE Makefile --- # Top level Makefile for module sleuthkit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 19:40:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:40:58 +0000 Subject: [pkgdb] perl-HTML-Prototype was added for sxw Message-ID: <200807041940.m64JewWD011483@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-HTML-Prototype with summary Generate HTML and Javascript for the Prototype library Kevin Fenzi (kevin) has approved Package perl-HTML-Prototype Kevin Fenzi (kevin) has added a Fedora devel branch for perl-HTML-Prototype with an owner of sxw Kevin Fenzi (kevin) has approved perl-HTML-Prototype in Fedora devel Kevin Fenzi (kevin) has approved Package perl-HTML-Prototype Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-HTML-Prototype (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-HTML-Prototype (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-HTML-Prototype (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Prototype From fedora-extras-commits at redhat.com Fri Jul 4 19:41:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:41:00 +0000 Subject: [pkgdb] perl-HTML-Prototype (Fedora, devel) updated by kevin Message-ID: <200807041941.m64Jf0HR011502@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-HTML-Prototype (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Prototype From fedora-extras-commits at redhat.com Fri Jul 4 19:41:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:41:00 +0000 Subject: [pkgdb] perl-HTML-Prototype (Fedora, 8) updated by kevin Message-ID: <200807041941.m64Jf1XX011503@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-HTML-Prototype Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-HTML-Prototype (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-HTML-Prototype (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-HTML-Prototype (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-HTML-Prototype (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Prototype From fedora-extras-commits at redhat.com Fri Jul 4 19:41:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:41:00 +0000 Subject: [pkgdb] perl-HTML-Prototype (Fedora EPEL, 5) updated by kevin Message-ID: <200807041941.m64Jf0HU011502@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-HTML-Prototype Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-HTML-Prototype (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-HTML-Prototype (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-HTML-Prototype (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-HTML-Prototype (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Prototype From fedora-extras-commits at redhat.com Fri Jul 4 19:41:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:41:01 +0000 Subject: [pkgdb] perl-HTML-Prototype (Fedora, 9) updated by kevin Message-ID: <200807041941.m64Jf1Xa011503@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-HTML-Prototype Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-HTML-Prototype (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-HTML-Prototype (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-HTML-Prototype (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-HTML-Prototype (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Prototype From fedora-extras-commits at redhat.com Fri Jul 4 19:41:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:41:01 +0000 Subject: [pkgdb] perl-HTML-Prototype (Fedora EPEL, 4) updated by kevin Message-ID: <200807041941.m64Jf1Xc011503@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-HTML-Prototype Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-HTML-Prototype (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-HTML-Prototype (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-HTML-Prototype (Fedora EPEL 4) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-HTML-Prototype (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Prototype From fedora-extras-commits at redhat.com Fri Jul 4 19:41:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:41:15 GMT Subject: rpms/sleuthkit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807041941.m64JfFvm016034@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sleuthkit/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso15698/rpms/sleuthkit/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sleuthkit --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sleuthkit # $Id: Makefile,v 1.1 2008/07/04 19:40:57 kevin Exp $ NAME := sleuthkit SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 19:42:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:42:04 GMT Subject: rpms/perl-HTML-Prototype - New directory Message-ID: <200807041942.m64Jg4H3016457@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-HTML-Prototype In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf16414/rpms/perl-HTML-Prototype Log Message: Directory /cvs/extras/rpms/perl-HTML-Prototype added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:42:22 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:42:22 GMT Subject: rpms/perl-HTML-Prototype/devel - New directory Message-ID: <200807041942.m64JgM9L016531@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-HTML-Prototype/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf16414/rpms/perl-HTML-Prototype/devel Log Message: Directory /cvs/extras/rpms/perl-HTML-Prototype/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:42:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:42:38 GMT Subject: rpms/perl-HTML-Prototype Makefile,NONE,1.1 Message-ID: <200807041942.m64JgcaM016586@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-HTML-Prototype In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf16414/rpms/perl-HTML-Prototype Added Files: Makefile Log Message: Setup of module perl-HTML-Prototype --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-Prototype all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 19:42:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:42:55 +0000 Subject: [pkgdb] gnome-lirc-properties was added for hadess Message-ID: <200807041942.m64Jgtbx011750@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gnome-lirc-properties with summary Infrared Remote Controls setup tool Kevin Fenzi (kevin) has approved Package gnome-lirc-properties Kevin Fenzi (kevin) has added a Fedora devel branch for gnome-lirc-properties with an owner of hadess Kevin Fenzi (kevin) has approved gnome-lirc-properties in Fedora devel Kevin Fenzi (kevin) has approved Package gnome-lirc-properties Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-lirc-properties (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-lirc-properties (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-lirc-properties (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-lirc-properties From fedora-extras-commits at redhat.com Fri Jul 4 19:42:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:42:58 +0000 Subject: [pkgdb] gnome-lirc-properties (Fedora, devel) updated by kevin Message-ID: <200807041942.m64Jgtc2011750@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-lirc-properties (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-lirc-properties From fedora-extras-commits at redhat.com Fri Jul 4 19:43:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:43:16 GMT Subject: rpms/perl-HTML-Prototype/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807041943.m64JhGXS016698@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-HTML-Prototype/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf16414/rpms/perl-HTML-Prototype/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-Prototype --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-Prototype # $Id: Makefile,v 1.1 2008/07/04 19:42:38 kevin Exp $ NAME := perl-HTML-Prototype SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 19:44:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:44:07 GMT Subject: rpms/gnome-lirc-properties - New directory Message-ID: <200807041944.m64Ji747017076@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-lirc-properties In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16977/rpms/gnome-lirc-properties Log Message: Directory /cvs/extras/rpms/gnome-lirc-properties added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:44:17 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:44:17 GMT Subject: rpms/gnome-lirc-properties/devel - New directory Message-ID: <200807041944.m64JiHCu017105@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-lirc-properties/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16977/rpms/gnome-lirc-properties/devel Log Message: Directory /cvs/extras/rpms/gnome-lirc-properties/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:44:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:44:28 GMT Subject: rpms/gnome-lirc-properties Makefile,NONE,1.1 Message-ID: <200807041944.m64JiSf5017180@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-lirc-properties In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16977/rpms/gnome-lirc-properties Added Files: Makefile Log Message: Setup of module gnome-lirc-properties --- NEW FILE Makefile --- # Top level Makefile for module gnome-lirc-properties all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 19:44:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:44:39 GMT Subject: rpms/gnome-lirc-properties/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807041944.m64Jidkk017247@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-lirc-properties/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16977/rpms/gnome-lirc-properties/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-lirc-properties --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gnome-lirc-properties # $Id: Makefile,v 1.1 2008/07/04 19:44:28 kevin Exp $ NAME := gnome-lirc-properties SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 19:46:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:46:44 +0000 Subject: [pkgdb] python-augeas (Fedora, 8) updated by kevin Message-ID: <200807041946.m64JkiiS011974@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-augeas Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-augeas (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-augeas (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-augeas (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-augeas From fedora-extras-commits at redhat.com Fri Jul 4 19:48:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:48:18 +0000 Subject: [pkgdb] ikiwiki was added for thm Message-ID: <200807041948.m64JmIqa012035@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ikiwiki with summary A wiki compiler Kevin Fenzi (kevin) has approved Package ikiwiki Kevin Fenzi (kevin) has added a Fedora devel branch for ikiwiki with an owner of thm Kevin Fenzi (kevin) has approved ikiwiki in Fedora devel Kevin Fenzi (kevin) has approved Package ikiwiki Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ikiwiki (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ikiwiki (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ikiwiki (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ikiwiki From fedora-extras-commits at redhat.com Fri Jul 4 19:48:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:48:21 +0000 Subject: [pkgdb] ikiwiki (Fedora, 8) updated by kevin Message-ID: <200807041948.m64JmLSX012055@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ikiwiki Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ikiwiki (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ikiwiki (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ikiwiki (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ikiwiki (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ikiwiki From fedora-extras-commits at redhat.com Fri Jul 4 19:48:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:48:21 +0000 Subject: [pkgdb] ikiwiki (Fedora, 9) updated by kevin Message-ID: <200807041948.m64JmLSa012055@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for ikiwiki Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ikiwiki (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ikiwiki (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ikiwiki (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on ikiwiki (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ikiwiki From fedora-extras-commits at redhat.com Fri Jul 4 19:48:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:48:21 +0000 Subject: [pkgdb] ikiwiki (Fedora, devel) updated by kevin Message-ID: <200807041948.m64JmLSd012055@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ikiwiki (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ikiwiki From fedora-extras-commits at redhat.com Fri Jul 4 19:48:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:48:57 GMT Subject: rpms/ikiwiki - New directory Message-ID: <200807041948.m64JmvB1017831@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ikiwiki In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17758/rpms/ikiwiki Log Message: Directory /cvs/extras/rpms/ikiwiki added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:49:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:49:13 GMT Subject: rpms/ikiwiki/devel - New directory Message-ID: <200807041949.m64JnDBA017862@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ikiwiki/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17758/rpms/ikiwiki/devel Log Message: Directory /cvs/extras/rpms/ikiwiki/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 19:49:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:49:29 GMT Subject: rpms/ikiwiki Makefile,NONE,1.1 Message-ID: <200807041949.m64JnT1H017912@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ikiwiki In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17758/rpms/ikiwiki Added Files: Makefile Log Message: Setup of module ikiwiki --- NEW FILE Makefile --- # Top level Makefile for module ikiwiki all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 19:49:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 19:49:45 GMT Subject: rpms/ikiwiki/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807041949.m64JnjgU017963@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ikiwiki/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17758/rpms/ikiwiki/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ikiwiki --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ikiwiki # $Id: Makefile,v 1.1 2008/07/04 19:49:29 kevin Exp $ NAME := ikiwiki SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 19:50:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:50:41 +0000 Subject: [pkgdb] librdmacm summary updated by kevin Message-ID: <200807041950.m64Jofjw012314@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) set package librdmacm summary to RDMA IP based Connection Management library To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/librdmacm From fedora-extras-commits at redhat.com Fri Jul 4 19:50:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:50:41 +0000 Subject: [pkgdb] librdmacm (Fedora, devel) updated by kevin Message-ID: <200807041950.m64Jofoh012313@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of librdmacm in Fedora devel to dledford Kevin Fenzi (kevin) Approved cvsextras for commit access on librdmacm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/librdmacm From fedora-extras-commits at redhat.com Fri Jul 4 19:50:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:50:41 +0000 Subject: [pkgdb] librdmacm (Fedora, 9) updated by kevin Message-ID: <200807041950.m64Jofoj012313@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of librdmacm in Fedora 9 to dledford Kevin Fenzi (kevin) Approved cvsextras for commit access on librdmacm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/librdmacm From fedora-extras-commits at redhat.com Fri Jul 4 19:50:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 19:50:41 +0000 Subject: [pkgdb] librdmacm (Fedora, 8) updated by kevin Message-ID: <200807041950.m64Jofk3012314@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of librdmacm in Fedora 8 to dledford Kevin Fenzi (kevin) Approved cvsextras for commit access on librdmacm (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/librdmacm From fedora-extras-commits at redhat.com Fri Jul 4 20:01:58 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 4 Jul 2008 20:01:58 GMT Subject: rpms/kernel/F-9 kernel.spec, 1.702, 1.703 linux-2.6-usb-storage-nikond80-quirk.patch, 1.1, 1.2 Message-ID: <200807042001.m64K1weD026789@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20077 Modified Files: kernel.spec linux-2.6-usb-storage-nikond80-quirk.patch Log Message: Better fix for the Nikon D80 usb-storage quirk. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.702 retrieving revision 1.703 diff -u -r1.702 -r1.703 --- kernel.spec 3 Jul 2008 21:45:52 -0000 1.702 +++ kernel.spec 4 Jul 2008 20:01:01 -0000 1.703 @@ -1864,6 +1864,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Fri Jul 04 2008 Dave Jones +- Better fix for the Nikon D80 usb-storage quirk. + * Thu Jul 03 2008 Dave Jones - Add USB Storage quirk for Nikon D40 with new firmware. linux-2.6-usb-storage-nikond80-quirk.patch: Index: linux-2.6-usb-storage-nikond80-quirk.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-usb-storage-nikond80-quirk.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-usb-storage-nikond80-quirk.patch 3 Jul 2008 21:45:52 -0000 1.1 +++ linux-2.6-usb-storage-nikond80-quirk.patch 4 Jul 2008 20:01:01 -0000 1.2 @@ -1,19 +1,21 @@ +usb-storage: quirk around v1.11 firmware on Nikon D40 + +https://bugzilla.redhat.com/show_bug.cgi?id=454028 +Just as in earlier firmware versions, we need to perform this +quirk for the latest version too. + +Signed-off-by: Dave Jones + diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h -index 45fe366..cf03af1 100644 +index 39a7c11..1a497e9 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h -@@ -364,6 +364,13 @@ UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0110, - US_SC_DEVICE, US_PR_DEVICE, NULL, +@@ -358,7 +358,7 @@ UNUSUAL_DEV( 0x04b0, 0x040f, 0x0100, 0x0200, US_FL_FIX_CAPACITY), -+/* Reported by https://bugzilla.redhat.com/show_bug.cgi?id=454028 */ -+UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0111, -+ "NIKON", -+ "NIKON DSC D40", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY), -+ - /* Reported by Ortwin Glueck */ - UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0110, + /* Reported by Emil Larsson */ +-UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0110, ++UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0111, "NIKON", - + "NIKON DSC D80", + US_SC_DEVICE, US_PR_DEVICE, NULL, From fedora-extras-commits at redhat.com Fri Jul 4 20:02:29 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 4 Jul 2008 20:02:29 GMT Subject: rpms/kernel/devel patch-2.6.26-rc8-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.849, 1.850 kernel.spec, 1.733, 1.734 sources, 1.810, 1.811 upstream, 1.728, 1.729 patch-2.6.26-rc8-git3.bz2.sign, 1.1, NONE Message-ID: <200807042002.m64K2TdA026829@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26687 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc8-git4.bz2.sign Removed Files: patch-2.6.26-rc8-git3.bz2.sign Log Message: 2.6.26-rc8-git4 --- NEW FILE patch-2.6.26-rc8-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIbgLDyGugalF9Dw4RAhk8AJ9yea9aRhKYVF+dexVKmtyIuk2k7gCfQOM5 8RUrlgE/9lpYxNrg709Cy+U= =TrM1 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.849 retrieving revision 1.850 diff -u -r1.849 -r1.850 --- .cvsignore 3 Jul 2008 15:57:05 -0000 1.849 +++ .cvsignore 4 Jul 2008 20:01:40 -0000 1.850 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git3.bz2 +patch-2.6.26-rc8-git4.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.733 retrieving revision 1.734 diff -u -r1.733 -r1.734 --- kernel.spec 3 Jul 2008 23:06:54 -0000 1.733 +++ kernel.spec 4 Jul 2008 20:01:40 -0000 1.734 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 8 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1794,6 +1794,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Fri Jul 04 2008 Dave Jones +- 2.6.26-rc8-git4 + * Thu Jul 3 2008 Kristian H??gsberg - Add linux-2.6-export-shmem-bits-for-gem.patch to export shmmem_getpage and shmem_file_setup for GEM. For now this will let Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.810 retrieving revision 1.811 diff -u -r1.810 -r1.811 --- sources 3 Jul 2008 15:57:05 -0000 1.810 +++ sources 4 Jul 2008 20:01:40 -0000 1.811 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 db9fee832152a33946993459fc85a18f patch-2.6.26-rc8.bz2 -37ae9a1f243a61a2fee484762897a757 patch-2.6.26-rc8-git3.bz2 +28605f24ec9440e57586f05433b598f6 patch-2.6.26-rc8-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.728 retrieving revision 1.729 diff -u -r1.728 -r1.729 --- upstream 3 Jul 2008 15:57:05 -0000 1.728 +++ upstream 4 Jul 2008 20:01:40 -0000 1.729 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git3.bz2 +patch-2.6.26-rc8-git4.bz2 --- patch-2.6.26-rc8-git3.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Fri Jul 4 20:13:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:13:20 +0000 Subject: [pkgdb] lxterminal was added for cwickert Message-ID: <200807042013.m64KDKY8013143@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package lxterminal with summary Desktop-independent VTE-based terminal emulator Kevin Fenzi (kevin) has approved Package lxterminal Kevin Fenzi (kevin) has added a Fedora devel branch for lxterminal with an owner of cwickert Kevin Fenzi (kevin) has approved lxterminal in Fedora devel Kevin Fenzi (kevin) has approved Package lxterminal Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lxterminal (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lxterminal (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lxterminal (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxterminal From fedora-extras-commits at redhat.com Fri Jul 4 20:13:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:13:24 +0000 Subject: [pkgdb] lxterminal (Fedora, 9) updated by kevin Message-ID: <200807042013.m64KDOaR013162@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for lxterminal Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lxterminal (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lxterminal (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lxterminal (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on lxterminal (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxterminal From fedora-extras-commits at redhat.com Fri Jul 4 20:13:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:13:24 +0000 Subject: [pkgdb] lxterminal (Fedora, 8) updated by kevin Message-ID: <200807042013.m64KDOaU013162@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for lxterminal Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lxterminal (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lxterminal (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lxterminal (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on lxterminal (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxterminal From fedora-extras-commits at redhat.com Fri Jul 4 20:13:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:13:24 +0000 Subject: [pkgdb] lxterminal (Fedora, devel) updated by kevin Message-ID: <200807042013.m64KDOaX013162@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on lxterminal (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxterminal From fedora-extras-commits at redhat.com Fri Jul 4 20:14:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:14:13 GMT Subject: rpms/lxterminal - New directory Message-ID: <200807042014.m64KEDAJ028759@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxterminal In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28729/rpms/lxterminal Log Message: Directory /cvs/extras/rpms/lxterminal added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:14:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:14:25 GMT Subject: rpms/lxterminal/devel - New directory Message-ID: <200807042014.m64KEPLd028820@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxterminal/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28729/rpms/lxterminal/devel Log Message: Directory /cvs/extras/rpms/lxterminal/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:14:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:14:46 GMT Subject: rpms/lxterminal Makefile,NONE,1.1 Message-ID: <200807042014.m64KEkF4028864@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxterminal In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28729/rpms/lxterminal Added Files: Makefile Log Message: Setup of module lxterminal --- NEW FILE Makefile --- # Top level Makefile for module lxterminal all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:15:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:15:01 GMT Subject: rpms/lxterminal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042015.m64KF1j2028884@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxterminal/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA28729/rpms/lxterminal/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lxterminal --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: lxterminal # $Id: Makefile,v 1.1 2008/07/04 20:14:46 kevin Exp $ NAME := lxterminal SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:15:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:15:13 +0000 Subject: [pkgdb] perl-AnyEvent was added for kwizart Message-ID: <200807042015.m64KFDNQ013468@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-AnyEvent with summary Framework for multiple event loops Kevin Fenzi (kevin) has approved Package perl-AnyEvent Kevin Fenzi (kevin) has added a Fedora devel branch for perl-AnyEvent with an owner of kwizart Kevin Fenzi (kevin) has approved perl-AnyEvent in Fedora devel Kevin Fenzi (kevin) has approved Package perl-AnyEvent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-AnyEvent (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-AnyEvent (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-AnyEvent (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AnyEvent From fedora-extras-commits at redhat.com Fri Jul 4 20:15:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:15:17 +0000 Subject: [pkgdb] perl-AnyEvent (Fedora, 8) updated by kevin Message-ID: <200807042015.m64KFHQv013500@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-AnyEvent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-AnyEvent (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-AnyEvent (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-AnyEvent (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on perl-AnyEvent (Fedora 8) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-AnyEvent (Fedora 8) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-AnyEvent (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AnyEvent From fedora-extras-commits at redhat.com Fri Jul 4 20:15:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:15:17 +0000 Subject: [pkgdb] perl-AnyEvent (Fedora EPEL, 5) updated by kevin Message-ID: <200807042015.m64KFIIG013502@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-AnyEvent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-AnyEvent (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-AnyEvent (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-AnyEvent (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on perl-AnyEvent (Fedora EPEL 5) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-AnyEvent (Fedora EPEL 5) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-AnyEvent (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AnyEvent From fedora-extras-commits at redhat.com Fri Jul 4 20:15:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:15:18 +0000 Subject: [pkgdb] perl-AnyEvent (Fedora, 9) updated by kevin Message-ID: <200807042015.m64KFHR0013500@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-AnyEvent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-AnyEvent (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-AnyEvent (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-AnyEvent (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on perl-AnyEvent (Fedora 9) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-AnyEvent (Fedora 9) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-AnyEvent (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AnyEvent From fedora-extras-commits at redhat.com Fri Jul 4 20:15:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:15:18 +0000 Subject: [pkgdb] perl-AnyEvent (Fedora, devel) updated by kevin Message-ID: <200807042015.m64KFIIJ013502@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on perl-AnyEvent (Fedora devel) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-AnyEvent (Fedora devel) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-AnyEvent (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AnyEvent From fedora-extras-commits at redhat.com Fri Jul 4 20:15:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:15:18 +0000 Subject: [pkgdb] perl-AnyEvent (Fedora EPEL, 4) updated by kevin Message-ID: <200807042015.m64KFHR3013500@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-AnyEvent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-AnyEvent (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-AnyEvent (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-AnyEvent (Fedora EPEL 4) Kevin Fenzi (kevin) approved watchbugzilla on perl-AnyEvent (Fedora EPEL 4) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-AnyEvent (Fedora EPEL 4) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-AnyEvent (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AnyEvent From fedora-extras-commits at redhat.com Fri Jul 4 20:15:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:15:57 GMT Subject: rpms/perl-AnyEvent - New directory Message-ID: <200807042015.m64KFvdT029119@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-AnyEvent In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV29046/rpms/perl-AnyEvent Log Message: Directory /cvs/extras/rpms/perl-AnyEvent added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:16:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:16:15 GMT Subject: rpms/perl-AnyEvent/devel - New directory Message-ID: <200807042016.m64KGFZm029133@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-AnyEvent/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV29046/rpms/perl-AnyEvent/devel Log Message: Directory /cvs/extras/rpms/perl-AnyEvent/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:16:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:16:36 GMT Subject: rpms/perl-AnyEvent Makefile,NONE,1.1 Message-ID: <200807042016.m64KGaCs029200@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-AnyEvent In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV29046/rpms/perl-AnyEvent Added Files: Makefile Log Message: Setup of module perl-AnyEvent --- NEW FILE Makefile --- # Top level Makefile for module perl-AnyEvent all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:16:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:16:50 GMT Subject: rpms/perl-AnyEvent/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042016.m64KGoPi029222@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-AnyEvent/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV29046/rpms/perl-AnyEvent/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-AnyEvent --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-AnyEvent # $Id: Makefile,v 1.1 2008/07/04 20:16:36 kevin Exp $ NAME := perl-AnyEvent SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:21:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:21:10 +0000 Subject: [pkgdb] dbus-java was added for omajid Message-ID: <200807042021.m64KLAHU014189@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package dbus-java with summary Java implementation of the DBus protocol Kevin Fenzi (kevin) has approved Package dbus-java Kevin Fenzi (kevin) has added a Fedora devel branch for dbus-java with an owner of omajid Kevin Fenzi (kevin) has approved dbus-java in Fedora devel Kevin Fenzi (kevin) has approved Package dbus-java Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbus-java (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbus-java (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbus-java (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dbus-java From fedora-extras-commits at redhat.com Fri Jul 4 20:21:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:21:13 +0000 Subject: [pkgdb] dbus-java (Fedora, 9) updated by kevin Message-ID: <200807042021.m64KLDaB014210@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for dbus-java Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbus-java (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbus-java (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbus-java (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on dbus-java (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dbus-java From fedora-extras-commits at redhat.com Fri Jul 4 20:21:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:21:13 +0000 Subject: [pkgdb] dbus-java (Fedora, devel) updated by kevin Message-ID: <200807042021.m64KLDaE014210@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on dbus-java (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dbus-java From fedora-extras-commits at redhat.com Fri Jul 4 20:21:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:21:42 GMT Subject: rpms/dbus-java - New directory Message-ID: <200807042021.m64KLg28029947@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-java In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK29857/rpms/dbus-java Log Message: Directory /cvs/extras/rpms/dbus-java added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:21:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:21:53 GMT Subject: rpms/dbus-java/devel - New directory Message-ID: <200807042021.m64KLrbK030006@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-java/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK29857/rpms/dbus-java/devel Log Message: Directory /cvs/extras/rpms/dbus-java/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:22:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:22:08 GMT Subject: rpms/dbus-java Makefile,NONE,1.1 Message-ID: <200807042022.m64KM8cp030076@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-java In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK29857/rpms/dbus-java Added Files: Makefile Log Message: Setup of module dbus-java --- NEW FILE Makefile --- # Top level Makefile for module dbus-java all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:22:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:22:21 GMT Subject: rpms/dbus-java/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042022.m64KMLnT030109@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-java/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK29857/rpms/dbus-java/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dbus-java --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: dbus-java # $Id: Makefile,v 1.1 2008/07/04 20:22:08 kevin Exp $ NAME := dbus-java SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:22:36 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Fri, 4 Jul 2008 20:22:36 GMT Subject: rpms/kernel/F-9 kernel.spec, 1.703, 1.704 linux-2.6-wireless-fixups.patch, 1.7, 1.8 linux-2.6-wireless-pending.patch, 1.55, 1.56 linux-2.6-wireless.patch, 1.43, 1.44 Message-ID: <200807042022.m64KMaD8030218@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29838 Modified Files: kernel.spec linux-2.6-wireless-fixups.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-07-02 ; Apply Stefan Beckers fix for bad hunk of wireless build fixups for 2.6.25 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.703 retrieving revision 1.704 diff -u -r1.703 -r1.704 --- kernel.spec 4 Jul 2008 20:01:01 -0000 1.703 +++ kernel.spec 4 Jul 2008 20:21:44 -0000 1.704 @@ -1864,6 +1864,12 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Fri Jul 04 2008 John W. Linville 2.6.25.9-85 +- Upstream wireless fixes from 2008-07-02 + (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) +- Apply Stefan Becker's fix for bad hunk of wireless build fixups for 2.6.25 + (https://bugzilla.redhat.com/show_bug.cgi?id=453390#c36) + * Fri Jul 04 2008 Dave Jones - Better fix for the Nikon D80 usb-storage quirk. linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-wireless-fixups.patch 1 Jul 2008 19:35:04 -0000 1.7 +++ linux-2.6-wireless-fixups.patch 4 Jul 2008 20:21:44 -0000 1.8 @@ -936,8 +936,8 @@ - for (i = 0; i < 6; i++) - put_unaligned_le16(ppk[i], rc4key + 2 * i); + for (i = 0; i < 6; i++) { -+ rc4key[4 + 2 * i] = Lo8(ppk[i]); -+ rc4key[5 + 2 * i] = Hi8(ppk[i]); ++ rc4key[0 + 2 * i] = Lo8(ppk[i]); ++ rc4key[1 + 2 * i] = Hi8(ppk[i]); + } } linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.55 -r 1.56 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- linux-2.6-wireless-pending.patch 2 Jul 2008 22:04:18 -0000 1.55 +++ linux-2.6-wireless-pending.patch 4 Jul 2008 20:21:44 -0000 1.56 @@ -97,18 +97,6 @@ Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit a6ecfe5a9bd32c9426f9af801e62f21da132a2cc -Author: Zhu Yi -Date: Mon Jun 30 17:23:29 2008 +0800 - - iwlwifi: drop skb silently for Tx request in monitor mode - - This patch fixes the problem to keep mac80211 resubmitting SKBs - when Tx request cannot be met in monitor mode. - - Signed-off-by: Zhu Yi - Signed-off-by: John W. Linville - commit 6fe878497b04b9c428842ab9c89c0e2d712860ad Author: Rick Farrington Date: Mon Jun 30 17:23:28 2008 +0800 @@ -132,23 +120,6 @@ Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 32c932be01d96abe84340b0831db949ca4713292 -Author: Rick Farrington -Date: Mon Jun 30 17:23:27 2008 +0800 - - iwlwifi: fix incorrect 5GHz rates reported in monitor mode - - This patch fixes the rates reported in monitor mode operation - (Wireshark) for iwlwifi. - - Previously, packets with rates of 6M..24M would be reported - incorrectly and packets with rates of 36M..54M would not passed - up the stack. - - Signed-off-by: Rick Farrington - Signed-off-by: Zhu Yi - Signed-off-by: John W. Linville - commit 0a078ffa011209c307880da10917ef205b4b11f4 Author: Tomas Winkler Date: Mon Jun 30 17:23:26 2008 +0800 @@ -6681,8 +6652,8 @@ Signed-off-by: John W. Linville diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf ---- /dev/null 2008-07-02 08:48:43.373004702 -0400 -+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-07-02 17:33:29.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-07-03 16:26:36.000000000 -0400 @@ -0,0 +1,11 @@ +interface=wlan0 +driver=nl80211 @@ -6696,8 +6667,8 @@ +wpa_pairwise=CCMP +wpa_passphrase=12345678 diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README ---- /dev/null 2008-07-02 08:48:43.373004702 -0400 -+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-07-02 17:33:29.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-07-03 16:26:36.000000000 -0400 @@ -0,0 +1,67 @@ +mac80211_hwsim - software simulator of 802.11 radio(s) for mac80211 +Copyright (c) 2008, Jouni Malinen @@ -6767,8 +6738,8 @@ +# Run wpa_supplicant (station) for wlan1 +wpa_supplicant -Dwext -iwlan1 -c wpa_supplicant.conf diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf ---- /dev/null 2008-07-02 08:48:43.373004702 -0400 -+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-07-02 17:33:29.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-07-03 16:26:36.000000000 -0400 @@ -0,0 +1,10 @@ +ctrl_interface=/var/run/wpa_supplicant + @@ -6781,8 +6752,8 @@ + group=CCMP +} diff -up linux-2.6.25.noarch/Documentation/rfkill.txt.orig linux-2.6.25.noarch/Documentation/rfkill.txt ---- linux-2.6.25.noarch/Documentation/rfkill.txt.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/Documentation/rfkill.txt 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/Documentation/rfkill.txt.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/Documentation/rfkill.txt 2008-07-03 16:26:36.000000000 -0400 @@ -1,89 +1,528 @@ rfkill - RF switch subsystem support ==================================== @@ -7371,8 +7342,8 @@ +available through sysfs in a generic way at this time, and it is not available +through the rfkill class AT ALL. diff -up linux-2.6.25.noarch/drivers/net/b44.c.orig linux-2.6.25.noarch/drivers/net/b44.c ---- linux-2.6.25.noarch/drivers/net/b44.c.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/b44.c 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/b44.c.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/b44.c 2008-07-03 16:26:36.000000000 -0400 @@ -148,9 +148,9 @@ static inline void b44_sync_dma_desc_for unsigned long offset, enum dma_data_direction dir) @@ -7660,8 +7631,8 @@ kfree(tx_ring); goto out_err; diff -up linux-2.6.25.noarch/drivers/net/Kconfig.orig linux-2.6.25.noarch/drivers/net/Kconfig ---- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-07-03 16:26:36.000000000 -0400 @@ -2387,6 +2387,19 @@ config GELIC_WIRELESS the driver automatically distinguishes the models, you can safely enable this option even if you have a wireless-less model. @@ -7683,8 +7654,8 @@ tristate "Gianfar Ethernet" depends on FSL_SOC diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-07-03 16:26:36.000000000 -0400 @@ -110,7 +110,7 @@ static void gelic_card_get_ether_port_st void gelic_card_up(struct gelic_card *card) { @@ -7731,8 +7702,8 @@ return card; diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-07-03 16:26:36.000000000 -0400 @@ -278,7 +278,7 @@ struct gelic_card { wait_queue_head_t waitq; @@ -7743,8 +7714,8 @@ u64 ether_port_status; diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-07-03 16:26:36.000000000 -0400 @@ -45,7 +45,8 @@ #include "ps3_gelic_wireless.h" @@ -8410,8 +8381,8 @@ destroy_workqueue(wl->eurus_cmd_queue); destroy_workqueue(wl->event_queue); diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h ---- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-07-03 16:26:36.000000000 -0400 @@ -241,7 +241,7 @@ enum gelic_wl_assoc_state { #define GELIC_WEP_KEYS 4 struct gelic_wl_info { @@ -8441,8 +8412,8 @@ struct iw_statistics iwstat; }; diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-03 16:26:36.000000000 -0400 @@ -306,11 +306,10 @@ static int adm8211_get_tx_stats(struct i struct ieee80211_tx_queue_stats *stats) { @@ -8605,8 +8576,8 @@ return 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-03 16:26:36.000000000 -0400 @@ -443,7 +443,6 @@ struct adm8211_rx_ring_info { struct adm8211_tx_ring_info { struct sk_buff *skb; @@ -8616,8 +8587,8 @@ }; diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-02 17:33:29.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-03 16:26:08.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-03 16:26:36.000000000 -0400 @@ -85,10 +85,10 @@ static struct pci_driver airo_driver = { /* Include Wireless Extension definition and check version - Jean II */ @@ -9063,8 +9034,8 @@ &net->bss); diff -up linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig linux-2.6.25.noarch/drivers/net/wireless/arlan.h ---- linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig 2008-07-02 17:33:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-07-02 17:33:29.000000000 -0400 [...3657 lines suppressed...] dev_kfree_skb_any(skb); @@ -73754,8 +73736,8 @@ if (skb_queue_empty(&sta->ps_tx_buf)) diff -up linux-2.6.25.noarch/net/mac80211/sta_info.h.orig linux-2.6.25.noarch/net/mac80211/sta_info.h ---- linux-2.6.25.noarch/net/mac80211/sta_info.h.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/sta_info.h 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/sta_info.h.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/sta_info.h 2008-07-03 16:26:37.000000000 -0400 @@ -32,7 +32,7 @@ * @WLAN_STA_WDS: Station is one of our WDS peers. * @WLAN_STA_PSPOLL: Station has just PS-polled us. @@ -73936,8 +73918,8 @@ /* Maximum number of concurrently registered stations */ #define MAX_STA_COUNT 2007 diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-03 16:26:37.000000000 -0400 @@ -6,25 +6,23 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -74394,8 +74376,8 @@ - - diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h ---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-03 16:26:37.000000000 -0400 @@ -13,12 +13,8 @@ #include #include "key.h" @@ -74412,8 +74394,8 @@ struct ieee80211_key *key, u8 *pos, size_t payload_len, u8 *ta); diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c ---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-02 17:33:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-03 16:27:32.000000000 -0400 @@ -52,9 +52,8 @@ static inline void ieee80211_include_seq static void ieee80211_dump_frame(const char *ifname, const char *title, const struct sk_buff *skb) @@ -76166,8 +76148,8 @@ return skb; diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c ---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-03 16:26:37.000000000 -0400 @@ -45,38 +45,37 @@ const unsigned char bridge_tunnel_header u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, enum ieee80211_if_types type) @@ -76419,8 +76401,8 @@ } EXPORT_SYMBOL(ieee80211_wake_queues); diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c ---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-02 17:33:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-03 16:26:37.000000000 -0400 @@ -84,24 +84,17 @@ static u8 *ieee80211_wep_add_iv(struct i struct sk_buff *skb, struct ieee80211_key *key) @@ -76571,8 +76553,8 @@ if (wep_encrypt_skb(tx, tx->skb) < 0) { diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h ---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-03 16:26:37.000000000 -0400 @@ -26,7 +26,7 @@ int ieee80211_wep_encrypt(struct ieee802 struct ieee80211_key *key); int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, @@ -76583,8 +76565,8 @@ ieee80211_rx_result ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx); diff -up linux-2.6.25.noarch/net/mac80211/wext.c.orig linux-2.6.25.noarch/net/mac80211/wext.c ---- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-03 16:26:37.000000000 -0400 @@ -142,7 +142,39 @@ static int ieee80211_ioctl_giwname(struc struct iw_request_info *info, char *name, char *extra) @@ -76709,8 +76691,8 @@ wstats->qual.updated = local->wstats_flags; } diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-02 17:33:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-03 16:26:37.000000000 -0400 @@ -19,16 +19,22 @@ #include "wme.h" @@ -77123,8 +77105,8 @@ skb = qdisc->dequeue(qdisc); root_qd->q.qlen--; diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-03 16:26:37.000000000 -0400 @@ -31,7 +31,7 @@ static inline int WLAN_FC_IS_QOS_DATA(u1 return (fc & 0x8C) == 0x88; } @@ -77135,8 +77117,8 @@ int ieee80211_qdisc_installed(struct net_device *dev); int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-02 17:33:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-03 16:26:37.000000000 -0400 @@ -24,46 +24,22 @@ static int ieee80211_get_hdr_info(const { struct ieee80211_hdr *hdr; @@ -77575,8 +77557,8 @@ } } diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c ---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-03 16:26:37.000000000 -0400 @@ -39,8 +39,56 @@ MODULE_LICENSE("GPL"); static LIST_HEAD(rfkill_list); /* list of registered rf switches */ static DEFINE_MUTEX(rfkill_mutex); @@ -78038,8 +78020,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-03 16:26:37.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -78197,8 +78179,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-03 16:26:37.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -78207,8 +78189,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-03 16:26:37.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -78238,8 +78220,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-03 16:26:37.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -78303,8 +78285,8 @@ /* exported functions */ diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-03 16:26:37.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -78346,8 +78328,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-02 17:33:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-02 17:33:30.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-03 16:26:37.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.43 -r 1.44 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless.patch,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- linux-2.6-wireless.patch 1 Jul 2008 18:42:14 -0000 1.43 +++ linux-2.6-wireless.patch 4 Jul 2008 20:21:44 -0000 1.44 @@ -1,3 +1,46 @@ +commit 7b58ccfe32f40eca8c8ca29aa723a5d0e814f0c9 +Author: andrey at cozybit.com +Date: Tue Jul 1 11:43:53 2008 -0700 + + libertas: support USB persistence on suspend/resume (resend) + + Handle .reset_resume() so that libertas can survive suspend/resume without + reloading the firmware. + + Signed-off-by: Andrey Yurovsky + Acked-by: Deepak Saxena + Acked-by: Dan Williams + Signed-off-by: John W. Linville + +commit 6afe6828b19b4567768264831d101026cb5510ff +Author: Zhu Yi +Date: Tue Jul 1 09:20:34 2008 +0800 + + iwlwifi: drop skb silently for Tx request in monitor mode + + This patch fixes the problem to keep mac80211 resubmitting SKBs + when Tx request cannot be met in monitor mode. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit ec04fd60fd74a9db9c63fe11d519be3642cabfdd +Author: Rick Farrington +Date: Tue Jul 1 09:20:33 2008 +0800 + + iwlwifi: fix incorrect 5GHz rates reported in monitor mode + + This patch fixes the rates reported in monitor mode operation + (Wireshark) for iwlwifi. + + Previously, packets with rates of 6M..24M would be reported + incorrectly and packets with rates of 36M..54M would not passed + up the stack. + + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + commit 23976efedd5ecb420b87455787c537eb4aed1981 Author: Emmanuel Grumbach Date: Sat Jun 28 02:50:13 2008 +0300 @@ -9216,8 +9259,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-03 15:41:19.000000000 -0400 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -9415,8 +9458,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-03 15:41:19.000000000 -0400 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -9504,8 +9547,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-03 15:41:19.000000000 -0400 @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; @@ -9760,8 +9803,8 @@ /* diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-03 15:41:19.000000000 -0400 @@ -30,7 +30,6 @@ #include @@ -10111,8 +10154,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-03 15:41:19.000000000 -0400 @@ -58,10 +58,6 @@ #include "reg.h" #include "debug.h" @@ -11166,8 +11209,8 @@ memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats)); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-03 15:41:19.000000000 -0400 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -11213,8 +11256,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-03 15:41:19.000000000 -0400 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -11389,8 +11432,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-03 15:41:19.000000000 -0400 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -11475,8 +11518,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-03 15:41:19.000000000 -0400 @@ -1,4 +1,4 @@ - /* +/* @@ -13071,8 +13114,8 @@ /****************\ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-03 15:41:19.000000000 -0400 @@ -173,7 +173,10 @@ struct ath5k_eeprom_info { * (rX: reserved fields possibily used by future versions of the ar5k chipset) */ @@ -13274,8 +13317,8 @@ */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-01 13:34:57.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-03 15:41:19.000000000 -0400 @@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini { AR5K_PHY(644), 0x00806333 }, { AR5K_PHY(645), 0x00106c10 }, @@ -13798,8 +13841,8 @@ } diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-01 13:34:57.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-03 15:41:19.000000000 -0400 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -13839,8 +13882,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-01 13:34:57.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-03 15:41:19.000000000 -0400 @@ -1,2 +1,6 @@ -ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o -obj-$(CONFIG_ATH5K) += ath5k.o @@ -13851,8 +13894,8 @@ +ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o [...4826 lines suppressed...] #include #include @@ -125625,8 +125697,8 @@ #endif /* STA_INFO_H */ diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-03 15:41:19.000000000 -0400 @@ -12,7 +12,7 @@ #include @@ -125724,8 +125796,8 @@ tkip_mixing_phase2(key->u.tkip.p1k_rx[queue], diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h ---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-03 15:41:19.000000000 -0400 @@ -11,7 +11,7 @@ #include @@ -125745,8 +125817,8 @@ #endif /* TKIP_H */ diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c ---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-03 15:41:19.000000000 -0400 @@ -25,11 +25,12 @@ #include @@ -127201,8 +127273,8 @@ return skb; } diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c ---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-03 15:41:19.000000000 -0400 @@ -25,7 +25,8 @@ #include @@ -127521,8 +127593,8 @@ -EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); +EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c ---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-03 15:41:19.000000000 -0400 @@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -127613,8 +127685,8 @@ + return TX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h ---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-03 15:41:19.000000000 -0400 @@ -14,7 +14,7 @@ #include #include @@ -127639,8 +127711,8 @@ #endif /* WEP_H */ diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-01 13:35:13.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-03 15:41:19.000000000 -0400 @@ -0,0 +1,1171 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -128814,8 +128886,8 @@ + .get_wireless_stats = ieee80211_get_wireless_stats, +}; diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-03 15:41:19.000000000 -0400 @@ -19,10 +19,13 @@ #include "wme.h" @@ -129025,8 +129097,8 @@ + } +} diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-03 15:41:19.000000000 -0400 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -129072,8 +129144,8 @@ { return 0; diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-03 15:41:19.000000000 -0400 @@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const } @@ -129453,8 +129525,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h ---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-03 15:41:19.000000000 -0400 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -129488,8 +129560,8 @@ #endif /* WPA_H */ diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-03 15:41:19.000000000 -0400 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -129539,8 +129611,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h ---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-03 15:41:19.000000000 -0400 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -129550,8 +129622,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile ---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-03 15:41:19.000000000 -0400 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -129560,8 +129632,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c ---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-03 15:41:20.000000000 -0400 @@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 }, [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, @@ -130252,8 +130324,8 @@ /* multicast groups */ diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-01 13:34:58.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-03 15:41:20.000000000 -0400 @@ -0,0 +1,180 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -130436,8 +130508,8 @@ + handle_band(wiphy->bands[band], rd); +} diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-01 13:34:58.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-03 15:41:20.000000000 -0400 @@ -0,0 +1,121 @@ +/* + * Wireless utility functions @@ -130561,8 +130633,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-03 15:41:20.000000000 -0400 @@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; From fedora-extras-commits at redhat.com Fri Jul 4 20:23:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:23:10 +0000 Subject: [pkgdb] trustyrc was added for eponyme Message-ID: <200807042023.m64KNAWG014406@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package trustyrc with summary Fully modular IRC robot Kevin Fenzi (kevin) has approved Package trustyrc Kevin Fenzi (kevin) has added a Fedora devel branch for trustyrc with an owner of eponyme Kevin Fenzi (kevin) has approved trustyrc in Fedora devel Kevin Fenzi (kevin) has approved Package trustyrc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on trustyrc (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on trustyrc (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on trustyrc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/trustyrc From fedora-extras-commits at redhat.com Fri Jul 4 20:23:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:23:12 +0000 Subject: [pkgdb] trustyrc (Fedora, 9) updated by kevin Message-ID: <200807042023.m64KNC5b014425@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for trustyrc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on trustyrc (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on trustyrc (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on trustyrc (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on trustyrc (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/trustyrc From fedora-extras-commits at redhat.com Fri Jul 4 20:23:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:23:12 +0000 Subject: [pkgdb] trustyrc (Fedora, 8) updated by kevin Message-ID: <200807042023.m64KNC5e014425@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for trustyrc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on trustyrc (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on trustyrc (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on trustyrc (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on trustyrc (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/trustyrc From fedora-extras-commits at redhat.com Fri Jul 4 20:23:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:23:12 +0000 Subject: [pkgdb] trustyrc (Fedora, devel) updated by kevin Message-ID: <200807042023.m64KNC5h014425@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on trustyrc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/trustyrc From fedora-extras-commits at redhat.com Fri Jul 4 20:23:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:23:45 GMT Subject: rpms/trustyrc - New directory Message-ID: <200807042023.m64KNjYl030345@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/trustyrc In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30272/rpms/trustyrc Log Message: Directory /cvs/extras/rpms/trustyrc added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:23:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:23:58 GMT Subject: rpms/trustyrc/devel - New directory Message-ID: <200807042023.m64KNw5u030363@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/trustyrc/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30272/rpms/trustyrc/devel Log Message: Directory /cvs/extras/rpms/trustyrc/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:24:17 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:24:17 GMT Subject: rpms/trustyrc Makefile,NONE,1.1 Message-ID: <200807042024.m64KOH7w030499@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/trustyrc In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30272/rpms/trustyrc Added Files: Makefile Log Message: Setup of module trustyrc --- NEW FILE Makefile --- # Top level Makefile for module trustyrc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:24:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:24:33 GMT Subject: rpms/trustyrc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042024.m64KOXOJ030566@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/trustyrc/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30272/rpms/trustyrc/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module trustyrc --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: trustyrc # $Id: Makefile,v 1.1 2008/07/04 20:24:17 kevin Exp $ NAME := trustyrc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:31:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:31:41 +0000 Subject: [pkgdb] perl-Term-ReadLine-Gnu was added for lkundrak Message-ID: <200807042031.m64KVfZE014730@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Term-ReadLine-Gnu with summary Perl extension for the GNU Readline/History Library Kevin Fenzi (kevin) has approved Package perl-Term-ReadLine-Gnu Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Term-ReadLine-Gnu with an owner of lkundrak Kevin Fenzi (kevin) has approved perl-Term-ReadLine-Gnu in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Term-ReadLine-Gnu Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-ReadLine-Gnu From fedora-extras-commits at redhat.com Fri Jul 4 20:31:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:31:44 +0000 Subject: [pkgdb] perl-Term-ReadLine-Gnu (Fedora, devel) updated by kevin Message-ID: <200807042031.m64KViae014751@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Term-ReadLine-Gnu (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-ReadLine-Gnu From fedora-extras-commits at redhat.com Fri Jul 4 20:31:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:31:44 +0000 Subject: [pkgdb] perl-Term-ReadLine-Gnu (Fedora, 8) updated by kevin Message-ID: <200807042031.m64KVijT014750@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Term-ReadLine-Gnu Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Term-ReadLine-Gnu (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-ReadLine-Gnu From fedora-extras-commits at redhat.com Fri Jul 4 20:31:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:31:44 +0000 Subject: [pkgdb] perl-Term-ReadLine-Gnu (Fedora, 9) updated by kevin Message-ID: <200807042031.m64KViah014751@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Term-ReadLine-Gnu Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Term-ReadLine-Gnu (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-ReadLine-Gnu From fedora-extras-commits at redhat.com Fri Jul 4 20:31:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:31:44 +0000 Subject: [pkgdb] perl-Term-ReadLine-Gnu (Fedora EPEL, 5) updated by kevin Message-ID: <200807042031.m64KViaj014751@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Term-ReadLine-Gnu Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Term-ReadLine-Gnu (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Term-ReadLine-Gnu (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Term-ReadLine-Gnu From fedora-extras-commits at redhat.com Fri Jul 4 20:32:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:32:19 GMT Subject: rpms/perl-Term-ReadLine-Gnu - New directory Message-ID: <200807042032.m64KWJ5Y031606@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Term-ReadLine-Gnu In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK31544/rpms/perl-Term-ReadLine-Gnu Log Message: Directory /cvs/extras/rpms/perl-Term-ReadLine-Gnu added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:32:32 2008 From: fedora-extras-commits at redhat.com (Omair Majid (omajid)) Date: Fri, 4 Jul 2008 20:32:32 GMT Subject: rpms/dbus-java/devel classpath_fix.patch, NONE, 1.1 dbus-java.spec, NONE, 1.1 docbook.patch, NONE, 1.1 import.log, NONE, 1.1 man_fixes.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042032.m64KWW1D031624@cvs-int.fedora.redhat.com> Author: omajid Update of /cvs/pkgs/rpms/dbus-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31345/devel Modified Files: .cvsignore sources Added Files: classpath_fix.patch dbus-java.spec docbook.patch import.log man_fixes.patch Log Message: * Fri Jul 4 2008 Omair Majid - 2.5-2 - initial import into fedora classpath_fix.patch: --- NEW FILE classpath_fix.patch --- >From 2ce75a5a3ad66129d25fba1120db2b3201a0833a Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Mon, 23 Jun 2008 10:39:22 -0400 Subject: [PATCH] fix Class-Path in manifest files --- Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e9e7639..baab50c 100644 --- a/Makefile +++ b/Makefile @@ -84,16 +84,16 @@ translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exc sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@ libdbus-java-$(VERSION).jar: .classes - echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class) dbus-java-test-$(VERSION).jar: .testclasses - echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/test/*.class) dbus-java-viewer-$(VERSION).jar: .viewerclasses - echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/viewer/*.class) dbus-java-bin-$(VERSION).jar: .binclasses - echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/bin/*.class) dbus.jar: libdbus-java-$(VERSION).jar ln -sf $< $@ -- 1.5.5.1 --- NEW FILE dbus-java.spec --- %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: dbus-java Version: 2.5 Release: 2%{?dist} Summary: Java implementation of the DBus protocol Group: Development/Libraries License: AFL or LGPLv2 URL: http://freedesktop.org/wiki/Software/DBusBindings #URL2: http://dbus.freedesktop.org/doc/dbus-java/ Source: http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: man_fixes.patch Patch1: docbook.patch Patch2: classpath_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-1.6.0-openjdk-devel BuildRequires: jpackage-utils BuildRequires: texlive-latex BuildRequires: tetex-tex4ht BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: libmatthew-java Requires: java-1.6.0-openjdk Requires: jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a "single instance" application or daemon, and to launch applications and daemons on demand when their services are needed. This is a complete independent implementation of the D-Bus protocol in Java. It comprises a library to write programs in Java which access D-Bus, a tool for generating stubs from D-Bus introspection data and a simple daemon. Being written in Java it works on both Windows and Linux (and other Unix-like systems). When using a TCP transport it is entirely Java-based; when using Unix-sockets it requires a small JNI library to use Unix-Sockets. %package javadoc Summary: Javadocs for %{name} Group: Development/Libraries Requires: jpackage-utils %description javadoc Javadocs for %{name} %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build # no configure file make %{?_smp_mflags} \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ DOCPREFIX=%{_defaultdocdir}/%{name} \ JAVADOCPREFIX=%{_javadocdir}/%{name} \ JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \ JAVAUNIXJARDIR=%{_libdir}/libmatthew-java %check make check \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ DOCPREFIX=%{_defaultdocdir}/%{name} \ JAVADOCPREFIX=%{_javadocdir}/%{name} \ JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \ JAVAUNIXJARDIR=%{_libdir}/libmatthew-java %install rm -rf $RPM_BUILD_ROOT make install \ DESTDIR=$RPM_BUILD_ROOT \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ DOCPREFIX=%{_defaultdocdir}/%{name} \ JAVADOCPREFIX=%{_javadocdir}/%{name} \ JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \ JAVAUNIXJARDIR=%{_libdir}/libmatthew-java %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/%{name} %{_bindir}/CreateInterface %{_bindir}/DBusCall %{_bindir}/DBusDaemon %{_bindir}/DBusViewer %{_bindir}/ListDBus %doc %{_defaultdocdir}/%{name} %doc %{_mandir}/man1/CreateInterface.1.gz %doc %{_mandir}/man1/DBusCall.1.gz %doc %{_mandir}/man1/DBusDaemon.1.gz %doc %{_mandir}/man1/DBusViewer.1.gz %doc %{_mandir}/man1/ListDBus.1.gz %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Mon Jun 30 2008 Omair Majid - 2.5-2 - fixed incoherent name warning from rpmlint - fixed wrapper script paths - added check section * Wed Jun 25 2008 Omair Majid - 2.5-1 - Initial build docbook.patch: --- NEW FILE docbook.patch --- commit 7e9e0252b50e8972b6666e39782129d953a4c377 Author: Omair Majid Date: Fri Jun 20 12:08:01 2008 -0400 fixed docbook command for fedora diff --git a/Makefile b/Makefile index 664413c..b474ccf 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc $(JAVADOC) -quiet -author -link http://java.sun.com/j2se/1.5.0/docs/api/ -classpath $(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar -d doc/api $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/exceptions/*.java %.1: %.sgml - docbook-to-man $< > $@ + docbook2man $< > $@ bin/%: %.sh .bin sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@ --- NEW FILE import.log --- dbus-java-2_5-2_fc9:HEAD:dbus-java-2.5-2.fc9.src.rpm:1215203332 man_fixes.patch: --- NEW FILE man_fixes.patch --- commit 70874613bf3b592b1092d6d69c0325adf40265a4 Author: Omair Majid Date: Thu Jun 19 13:31:53 2008 -0400 doc fixes to the docbook manual diff --git a/DBusCall.sgml b/DBusCall.sgml index f485f1b..350e3fd 100644 --- a/DBusCall.sgml +++ b/DBusCall.sgml @@ -61,7 +61,7 @@ manpage.1: manpage.sgml - &dhpackage; dest path interface method + &dhpackage;dest path interface method @@ -83,9 +83,7 @@ manpage.1: manpage.sgml options is included below. - - - + AUTHOR Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dbus-java/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:22:08 -0000 1.1 +++ .cvsignore 4 Jul 2008 20:31:51 -0000 1.2 @@ -0,0 +1 @@ +dbus-java-2.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dbus-java/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:22:08 -0000 1.1 +++ sources 4 Jul 2008 20:31:51 -0000 1.2 @@ -0,0 +1 @@ +0fa50b9d2bf5cb2f54e293acca9eb807 dbus-java-2.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 20:32:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:32:38 GMT Subject: rpms/perl-Term-ReadLine-Gnu/devel - New directory Message-ID: <200807042032.m64KWcrY031665@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Term-ReadLine-Gnu/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK31544/rpms/perl-Term-ReadLine-Gnu/devel Log Message: Directory /cvs/extras/rpms/perl-Term-ReadLine-Gnu/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:32:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:32:56 GMT Subject: rpms/perl-Term-ReadLine-Gnu Makefile,NONE,1.1 Message-ID: <200807042032.m64KWuOP031737@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Term-ReadLine-Gnu In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK31544/rpms/perl-Term-ReadLine-Gnu Added Files: Makefile Log Message: Setup of module perl-Term-ReadLine-Gnu --- NEW FILE Makefile --- # Top level Makefile for module perl-Term-ReadLine-Gnu all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:33:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:33:11 GMT Subject: rpms/perl-Term-ReadLine-Gnu/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042033.m64KXBRu031759@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Term-ReadLine-Gnu/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK31544/rpms/perl-Term-ReadLine-Gnu/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Term-ReadLine-Gnu --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Term-ReadLine-Gnu # $Id: Makefile,v 1.1 2008/07/04 20:32:56 kevin Exp $ NAME := perl-Term-ReadLine-Gnu SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:33:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:33:19 +0000 Subject: [pkgdb] libfonts was added for caolanm Message-ID: <200807042033.m64KXJeG014978@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libfonts with summary Java TrueType Font Layouting Kevin Fenzi (kevin) has approved Package libfonts Kevin Fenzi (kevin) has added a Fedora devel branch for libfonts with an owner of caolanm Kevin Fenzi (kevin) has approved libfonts in Fedora devel Kevin Fenzi (kevin) has approved Package libfonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libfonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libfonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libfonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libfonts From fedora-extras-commits at redhat.com Fri Jul 4 20:33:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:33:21 +0000 Subject: [pkgdb] libfonts (Fedora, devel) updated by kevin Message-ID: <200807042033.m64KXL2Y014997@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libfonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libfonts From fedora-extras-commits at redhat.com Fri Jul 4 20:34:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:34:03 GMT Subject: rpms/libfonts - New directory Message-ID: <200807042034.m64KY3GG032033@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libfonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj31978/rpms/libfonts Log Message: Directory /cvs/extras/rpms/libfonts added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:34:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:34:19 GMT Subject: rpms/libfonts/devel - New directory Message-ID: <200807042034.m64KYJTK032049@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libfonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj31978/rpms/libfonts/devel Log Message: Directory /cvs/extras/rpms/libfonts/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:34:30 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:34:30 GMT Subject: rpms/libfonts Makefile,NONE,1.1 Message-ID: <200807042034.m64KYUpH032078@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libfonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj31978/rpms/libfonts Added Files: Makefile Log Message: Setup of module libfonts --- NEW FILE Makefile --- # Top level Makefile for module libfonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:34:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:34:42 GMT Subject: rpms/libfonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042034.m64KYgOq032107@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libfonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj31978/rpms/libfonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libfonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libfonts # $Id: Makefile,v 1.1 2008/07/04 20:34:30 kevin Exp $ NAME := libfonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:34:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:34:53 +0000 Subject: [pkgdb] mm3d was added for sharkcz Message-ID: <200807042034.m64KYrFA015169@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package mm3d with summary 3D model editor Kevin Fenzi (kevin) has approved Package mm3d Kevin Fenzi (kevin) has added a Fedora devel branch for mm3d with an owner of sharkcz Kevin Fenzi (kevin) has approved mm3d in Fedora devel Kevin Fenzi (kevin) has approved Package mm3d Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mm3d (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mm3d (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mm3d (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mm3d From fedora-extras-commits at redhat.com Fri Jul 4 20:34:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:34:57 +0000 Subject: [pkgdb] mm3d (Fedora, devel) updated by kevin Message-ID: <200807042034.m64KYvRx015191@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on mm3d (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mm3d From fedora-extras-commits at redhat.com Fri Jul 4 20:34:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:34:57 +0000 Subject: [pkgdb] mm3d (Fedora, 9) updated by kevin Message-ID: <200807042034.m64KYvS2015191@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for mm3d Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mm3d (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mm3d (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mm3d (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on mm3d (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mm3d From fedora-extras-commits at redhat.com Fri Jul 4 20:34:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:34:57 +0000 Subject: [pkgdb] mm3d (Fedora, 8) updated by kevin Message-ID: <200807042034.m64KYvRu015191@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for mm3d Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mm3d (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mm3d (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mm3d (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on mm3d (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mm3d From fedora-extras-commits at redhat.com Fri Jul 4 20:35:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:35:39 GMT Subject: rpms/mm3d - New directory Message-ID: <200807042035.m64KZdal032356@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mm3d In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32279/rpms/mm3d Log Message: Directory /cvs/extras/rpms/mm3d added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:35:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:35:53 GMT Subject: rpms/mm3d/devel - New directory Message-ID: <200807042035.m64KZrMj032403@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mm3d/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32279/rpms/mm3d/devel Log Message: Directory /cvs/extras/rpms/mm3d/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:36:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:36:11 GMT Subject: rpms/mm3d Makefile,NONE,1.1 Message-ID: <200807042036.m64KaBjq032444@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mm3d In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32279/rpms/mm3d Added Files: Makefile Log Message: Setup of module mm3d --- NEW FILE Makefile --- # Top level Makefile for module mm3d all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:36:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:36:24 +0000 Subject: [pkgdb] netstiff was added for rayvd Message-ID: <200807042036.m64KaOer015657@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package netstiff with summary A powerful Web and FTP site update checker Kevin Fenzi (kevin) has approved Package netstiff Kevin Fenzi (kevin) has added a Fedora devel branch for netstiff with an owner of rayvd Kevin Fenzi (kevin) has approved netstiff in Fedora devel Kevin Fenzi (kevin) has approved Package netstiff Kevin Fenzi (kevin) has set commit to Approved for cvsextras on netstiff (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on netstiff (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on netstiff (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/netstiff From fedora-extras-commits at redhat.com Fri Jul 4 20:36:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:36:25 GMT Subject: rpms/mm3d/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042036.m64KaPRN032512@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mm3d/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32279/rpms/mm3d/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mm3d --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mm3d # $Id: Makefile,v 1.1 2008/07/04 20:36:12 kevin Exp $ NAME := mm3d SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:36:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:36:33 +0000 Subject: [pkgdb] netstiff (Fedora, 8) updated by kevin Message-ID: <200807042036.m64KaX1o015805@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for netstiff Kevin Fenzi (kevin) has set commit to Approved for cvsextras on netstiff (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on netstiff (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on netstiff (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on netstiff (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/netstiff From fedora-extras-commits at redhat.com Fri Jul 4 20:36:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:36:33 +0000 Subject: [pkgdb] netstiff (Fedora, devel) updated by kevin Message-ID: <200807042036.m64KaX1q015805@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on netstiff (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/netstiff From fedora-extras-commits at redhat.com Fri Jul 4 20:36:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:36:34 +0000 Subject: [pkgdb] netstiff (Fedora EPEL, 5) updated by kevin Message-ID: <200807042036.m64KaYvV015810@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for netstiff Kevin Fenzi (kevin) has set commit to Approved for cvsextras on netstiff (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on netstiff (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on netstiff (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on netstiff (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/netstiff From fedora-extras-commits at redhat.com Fri Jul 4 20:36:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:36:34 +0000 Subject: [pkgdb] netstiff (Fedora, 9) updated by kevin Message-ID: <200807042036.m64KaX1t015805@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for netstiff Kevin Fenzi (kevin) has set commit to Approved for cvsextras on netstiff (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on netstiff (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on netstiff (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on netstiff (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/netstiff From fedora-extras-commits at redhat.com Fri Jul 4 20:37:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:37:20 GMT Subject: rpms/netstiff - New directory Message-ID: <200807042037.m64KbK6m032752@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/netstiff In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32663/rpms/netstiff Log Message: Directory /cvs/extras/rpms/netstiff added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:37:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:37:39 GMT Subject: rpms/netstiff/devel - New directory Message-ID: <200807042037.m64KbdBk000319@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/netstiff/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32663/rpms/netstiff/devel Log Message: Directory /cvs/extras/rpms/netstiff/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:37:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:37:53 GMT Subject: rpms/netstiff Makefile,NONE,1.1 Message-ID: <200807042037.m64Kbr1F000398@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/netstiff In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32663/rpms/netstiff Added Files: Makefile Log Message: Setup of module netstiff --- NEW FILE Makefile --- # Top level Makefile for module netstiff all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:38:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:38:19 GMT Subject: rpms/netstiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042038.m64KcJRh000535@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/netstiff/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32663/rpms/netstiff/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module netstiff --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: netstiff # $Id: Makefile,v 1.1 2008/07/04 20:37:56 kevin Exp $ NAME := netstiff SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:38:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:38:41 +0000 Subject: [pkgdb] s3cmd was added for lkundrak Message-ID: <200807042038.m64KcfLO017885@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package s3cmd with summary Tool for accessing Amazon Simple Storage Service Kevin Fenzi (kevin) has approved Package s3cmd Kevin Fenzi (kevin) has added a Fedora devel branch for s3cmd with an owner of lkundrak Kevin Fenzi (kevin) has approved s3cmd in Fedora devel Kevin Fenzi (kevin) has approved Package s3cmd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on s3cmd (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on s3cmd (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on s3cmd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/s3cmd From fedora-extras-commits at redhat.com Fri Jul 4 20:38:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:38:44 +0000 Subject: [pkgdb] s3cmd (Fedora, 9) updated by kevin Message-ID: <200807042038.m64KcfLQ017885@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for s3cmd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on s3cmd (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on s3cmd (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on s3cmd (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on s3cmd (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/s3cmd From fedora-extras-commits at redhat.com Fri Jul 4 20:38:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:38:44 +0000 Subject: [pkgdb] s3cmd (Fedora, 8) updated by kevin Message-ID: <200807042038.m64KciYN017946@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for s3cmd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on s3cmd (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on s3cmd (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on s3cmd (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on s3cmd (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/s3cmd From fedora-extras-commits at redhat.com Fri Jul 4 20:38:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:38:44 +0000 Subject: [pkgdb] s3cmd (Fedora EPEL, 5) updated by kevin Message-ID: <200807042038.m64KciYQ017946@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for s3cmd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on s3cmd (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on s3cmd (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on s3cmd (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on s3cmd (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/s3cmd From fedora-extras-commits at redhat.com Fri Jul 4 20:38:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 04 Jul 2008 20:38:44 +0000 Subject: [pkgdb] s3cmd (Fedora, devel) updated by kevin Message-ID: <200807042038.m64KcfLT017885@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on s3cmd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/s3cmd From fedora-extras-commits at redhat.com Fri Jul 4 20:39:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:39:43 GMT Subject: rpms/s3cmd - New directory Message-ID: <200807042039.m64Kdh64001027@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/s3cmd In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNMi837/rpms/s3cmd Log Message: Directory /cvs/extras/rpms/s3cmd added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:39:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:39:58 GMT Subject: rpms/s3cmd/devel - New directory Message-ID: <200807042039.m64Kdwck001074@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/s3cmd/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNMi837/rpms/s3cmd/devel Log Message: Directory /cvs/extras/rpms/s3cmd/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 4 20:40:12 2008 From: fedora-extras-commits at redhat.com (Omair Majid (omajid)) Date: Fri, 4 Jul 2008 20:40:12 GMT Subject: rpms/dbus-java/F-9 classpath_fix.patch, NONE, 1.1 dbus-java.spec, NONE, 1.1 docbook.patch, NONE, 1.1 import.log, NONE, 1.1 man_fixes.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042040.m64KeC4i001166@cvs-int.fedora.redhat.com> Author: omajid Update of /cvs/pkgs/rpms/dbus-java/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv516/F-9 Modified Files: .cvsignore sources Added Files: classpath_fix.patch dbus-java.spec docbook.patch import.log man_fixes.patch Log Message: * Fri Jul 4 2008 Omair Majid - 2.5-2 - initial import into fedora classpath_fix.patch: --- NEW FILE classpath_fix.patch --- >From 2ce75a5a3ad66129d25fba1120db2b3201a0833a Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Mon, 23 Jun 2008 10:39:22 -0400 Subject: [PATCH] fix Class-Path in manifest files --- Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e9e7639..baab50c 100644 --- a/Makefile +++ b/Makefile @@ -84,16 +84,16 @@ translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exc sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@ libdbus-java-$(VERSION).jar: .classes - echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class) dbus-java-test-$(VERSION).jar: .testclasses - echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/test/*.class) dbus-java-viewer-$(VERSION).jar: .viewerclasses - echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/viewer/*.class) dbus-java-bin-$(VERSION).jar: .binclasses - echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest + echo > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/bin/*.class) dbus.jar: libdbus-java-$(VERSION).jar ln -sf $< $@ -- 1.5.5.1 --- NEW FILE dbus-java.spec --- %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: dbus-java Version: 2.5 Release: 2%{?dist} Summary: Java implementation of the DBus protocol Group: Development/Libraries License: AFL or LGPLv2 URL: http://freedesktop.org/wiki/Software/DBusBindings #URL2: http://dbus.freedesktop.org/doc/dbus-java/ Source: http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: man_fixes.patch Patch1: docbook.patch Patch2: classpath_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-1.6.0-openjdk-devel BuildRequires: jpackage-utils BuildRequires: texlive-latex BuildRequires: tetex-tex4ht BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: libmatthew-java Requires: java-1.6.0-openjdk Requires: jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a "single instance" application or daemon, and to launch applications and daemons on demand when their services are needed. This is a complete independent implementation of the D-Bus protocol in Java. It comprises a library to write programs in Java which access D-Bus, a tool for generating stubs from D-Bus introspection data and a simple daemon. Being written in Java it works on both Windows and Linux (and other Unix-like systems). When using a TCP transport it is entirely Java-based; when using Unix-sockets it requires a small JNI library to use Unix-Sockets. %package javadoc Summary: Javadocs for %{name} Group: Development/Libraries Requires: jpackage-utils %description javadoc Javadocs for %{name} %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build # no configure file make %{?_smp_mflags} \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ DOCPREFIX=%{_defaultdocdir}/%{name} \ JAVADOCPREFIX=%{_javadocdir}/%{name} \ JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \ JAVAUNIXJARDIR=%{_libdir}/libmatthew-java %check make check \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ DOCPREFIX=%{_defaultdocdir}/%{name} \ JAVADOCPREFIX=%{_javadocdir}/%{name} \ JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \ JAVAUNIXJARDIR=%{_libdir}/libmatthew-java %install rm -rf $RPM_BUILD_ROOT make install \ DESTDIR=$RPM_BUILD_ROOT \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ DOCPREFIX=%{_defaultdocdir}/%{name} \ JAVADOCPREFIX=%{_javadocdir}/%{name} \ JAVAUNIXLIBDIR=%{_libdir}/libmatthew-java \ JAVAUNIXJARDIR=%{_libdir}/libmatthew-java %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/%{name} %{_bindir}/CreateInterface %{_bindir}/DBusCall %{_bindir}/DBusDaemon %{_bindir}/DBusViewer %{_bindir}/ListDBus %doc %{_defaultdocdir}/%{name} %doc %{_mandir}/man1/CreateInterface.1.gz %doc %{_mandir}/man1/DBusCall.1.gz %doc %{_mandir}/man1/DBusDaemon.1.gz %doc %{_mandir}/man1/DBusViewer.1.gz %doc %{_mandir}/man1/ListDBus.1.gz %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Mon Jun 30 2008 Omair Majid - 2.5-2 - fixed incoherent name warning from rpmlint - fixed wrapper script paths - added check section * Wed Jun 25 2008 Omair Majid - 2.5-1 - Initial build docbook.patch: --- NEW FILE docbook.patch --- commit 7e9e0252b50e8972b6666e39782129d953a4c377 Author: Omair Majid Date: Fri Jun 20 12:08:01 2008 -0400 fixed docbook command for fedora diff --git a/Makefile b/Makefile index 664413c..b474ccf 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc $(JAVADOC) -quiet -author -link http://java.sun.com/j2se/1.5.0/docs/api/ -classpath $(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar -d doc/api $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/exceptions/*.java %.1: %.sgml - docbook-to-man $< > $@ + docbook2man $< > $@ bin/%: %.sh .bin sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@ --- NEW FILE import.log --- dbus-java-2_5-2_fc9:F-9:dbus-java-2.5-2.fc9.src.rpm:1215203883 man_fixes.patch: --- NEW FILE man_fixes.patch --- commit 70874613bf3b592b1092d6d69c0325adf40265a4 Author: Omair Majid Date: Thu Jun 19 13:31:53 2008 -0400 doc fixes to the docbook manual diff --git a/DBusCall.sgml b/DBusCall.sgml index f485f1b..350e3fd 100644 --- a/DBusCall.sgml +++ b/DBusCall.sgml @@ -61,7 +61,7 @@ manpage.1: manpage.sgml - &dhpackage; dest path interface method + &dhpackage;dest path interface method @@ -83,9 +83,7 @@ manpage.1: manpage.sgml options is included below. - - - + AUTHOR Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dbus-java/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:22:08 -0000 1.1 +++ .cvsignore 4 Jul 2008 20:39:00 -0000 1.2 @@ -0,0 +1 @@ +dbus-java-2.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dbus-java/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:22:08 -0000 1.1 +++ sources 4 Jul 2008 20:39:00 -0000 1.2 @@ -0,0 +1 @@ +0fa50b9d2bf5cb2f54e293acca9eb807 dbus-java-2.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 20:40:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:40:32 GMT Subject: rpms/s3cmd Makefile,NONE,1.1 Message-ID: <200807042040.m64KeW9e001374@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/s3cmd In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNMi837/rpms/s3cmd Added Files: Makefile Log Message: Setup of module s3cmd --- NEW FILE Makefile --- # Top level Makefile for module s3cmd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 4 20:40:46 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 4 Jul 2008 20:40:46 GMT Subject: rpms/audit/F-9 audit.spec,1.178,1.179 Message-ID: <200807042040.m64Kek36001444@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/audit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1025 Modified Files: audit.spec Log Message: change location of man page Index: audit.spec =================================================================== RCS file: /cvs/pkgs/rpms/audit/F-9/audit.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- audit.spec 21 May 2008 13:51:44 -0000 1.178 +++ audit.spec 4 Jul 2008 20:39:56 -0000 1.179 @@ -244,7 +244,6 @@ %{_includedir}/auparse.h %{_includedir}/auparse-defs.h %{_mandir}/man3/* -%{_mandir}/man5/ausearch-expression.5.gz %files libs-python %defattr(-,root,root) @@ -266,6 +265,7 @@ %attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz %attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz %attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz +%attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz %attr(750,root,root) /sbin/auditctl %attr(750,root,root) /sbin/auditd %attr(755,root,root) /sbin/ausearch From fedora-extras-commits at redhat.com Fri Jul 4 20:40:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 4 Jul 2008 20:40:47 GMT Subject: rpms/s3cmd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807042040.m64Kelct001453@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/s3cmd/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNMi837/rpms/s3cmd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module s3cmd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: s3cmd # $Id: Makefile,v 1.1 2008/07/04 20:40:32 kevin Exp $ NAME := s3cmd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 4 20:42:42 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 4 Jul 2008 20:42:42 GMT Subject: rpms/lxterminal/devel import.log, NONE, 1.1 lxterminal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042042.m64Kgg5I002068@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxterminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1816/devel Modified Files: .cvsignore sources Added Files: import.log lxterminal.spec Log Message: Initial import of lxterminal. Review was at https://bugzilla.redhat.com/show_bug.cgi?id=452324 --- NEW FILE import.log --- lxterminal-0_1_3-1_fc10:HEAD:lxterminal-0.1.3-1.fc10.src.rpm:1215204080 --- NEW FILE lxterminal.spec --- Name: lxterminal Version: 0.1.3 Release: 1%{?dist} Summary: Desktop-independent VTE-based terminal emulator Summary(de): Desktup-unabh??ngiger VTE-basierter Terminal Emulator Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 vte-devel BuildRequires: desktop-file-utils intltool %description LXterminal is a VTE-based terminal emulator with support for multiple tabs. It is completely desktop-independent and does not have any unnecessary dependencies. In order to reduce memory usage and increase the performance all instances of the terminal are sharing a single process. %description -l de LXTerminal ist ein VTE-basierter Terminalemulator mit Unterst??tzung f??r mehrere Reiter. Er ist komplett desktop-unabh??ngig und hat keine unn??tigen Abh??ngigkeiten. Um den Speicherverbrauch zu reduzieren und die Leistung zu erh??hen teilen sich alle Instanzen des Terminals einen einzigen Prozess. %prep %setup -q # fix a typo in the desktop file sed -i 's!LXTerminl!LXTerminal!' ./data/lxterminal.desktop %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor="fedora" \ --delete-original \ --remove-category=Utility \ --add-category=System \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/%{name}*.1.gz %changelog * Sat Jun 28 2008 Christoph Wickert - 0.1.3-1 - Update to 0.1.3 - Add the new manpage * Fri Jun 20 2008 Christoph Wickert - 0.1.2-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:14:46 -0000 1.1 +++ .cvsignore 4 Jul 2008 20:41:56 -0000 1.2 @@ -0,0 +1 @@ +lxterminal-0.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:14:46 -0000 1.1 +++ sources 4 Jul 2008 20:41:56 -0000 1.2 @@ -0,0 +1 @@ +1e537062b9c58199e8462babd2ecba9c lxterminal-0.1.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 20:45:17 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 4 Jul 2008 20:45:17 GMT Subject: rpms/lxterminal/devel lxterminal.spec,1.1,1.2 Message-ID: <200807042045.m64KjHR7002806@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxterminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2577 Modified Files: lxterminal.spec Log Message: minor spec cleanup suggested in the review Index: lxterminal.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/devel/lxterminal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxterminal.spec 4 Jul 2008 20:41:56 -0000 1.1 +++ lxterminal.spec 4 Jul 2008 20:44:35 -0000 1.2 @@ -27,8 +27,6 @@ %prep %setup -q -# fix a typo in the desktop file -sed -i 's!LXTerminl!LXTerminal!' ./data/lxterminal.desktop %build From fedora-extras-commits at redhat.com Fri Jul 4 20:49:39 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Fri, 4 Jul 2008 20:49:39 GMT Subject: rpms/kernel/F-8 config-generic, 1.70, 1.71 kernel.spec, 1.483, 1.484 linux-2.6-wireless-fixups.patch, 1.5, 1.6 linux-2.6-wireless-pending.patch, 1.50, 1.51 linux-2.6-wireless.patch, 1.45, 1.46 Message-ID: <200807042049.m64KndRw004046@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3654 Modified Files: config-generic kernel.spec linux-2.6-wireless-fixups.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-07-02 ; Upstream wireless updates from 2008-06-30 ; Apply Stefan Beckers fix for bad hunk of wireless build fixups for 2.6.25 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- config-generic 26 Jun 2008 19:29:52 -0000 1.70 +++ config-generic 4 Jul 2008 20:48:49 -0000 1.71 @@ -1258,7 +1258,7 @@ CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.483 retrieving revision 1.484 diff -u -r1.483 -r1.484 --- kernel.spec 3 Jul 2008 21:27:53 -0000 1.483 +++ kernel.spec 4 Jul 2008 20:48:49 -0000 1.484 @@ -1824,6 +1824,14 @@ %changelog +* Fri Jul 04 2008 John W. Linville 2.6.25.9-43 +- Upstream wireless fixes from 2008-07-02 + (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) +- Upstream wireless updates from 2008-06-30 + (http://marc.info/?l=linux-wireless&m=121486432315033&w=2) +- Apply Stefan Becker's fix for bad hunk of wireless build fixups for 2.6.25 + (https://bugzilla.redhat.com/show_bug.cgi?id=453390#c36) + * Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-42 - Linux 2.6.25.10 - Reverted stable patch, not needed with utrace: linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-fixups.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-wireless-fixups.patch 2 Jul 2008 21:40:22 -0000 1.5 +++ linux-2.6-wireless-fixups.patch 4 Jul 2008 20:48:49 -0000 1.6 @@ -936,8 +936,8 @@ - for (i = 0; i < 6; i++) - put_unaligned_le16(ppk[i], rc4key + 2 * i); + for (i = 0; i < 6; i++) { -+ rc4key[4 + 2 * i] = Lo8(ppk[i]); -+ rc4key[5 + 2 * i] = Hi8(ppk[i]); ++ rc4key[0 + 2 * i] = Lo8(ppk[i]); ++ rc4key[1 + 2 * i] = Hi8(ppk[i]); + } } linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.50 -r 1.51 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- linux-2.6-wireless-pending.patch 2 Jul 2008 21:23:38 -0000 1.50 +++ linux-2.6-wireless-pending.patch 4 Jul 2008 20:48:49 -0000 1.51 @@ -1,3 +1,692 @@ +commit edbf873cb3e8c4ef71123e83b07f39ab69971910 +Author: Larry.Finger at lwfinger.net +Date: Mon Jun 30 10:39:49 2008 -0500 + + p54: Add quality output to iwlist and iwconfig + + The p54 driver family reports a quality of 0 in iwconfig and iwlist + output. This patch calculates a quality number as a percentage of the + rssi to the maximum signal of 127 reported as the maximum signal. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 22191a580c725ed5f285d0084bfa1d2f8b350a47 +Author: Johannes Berg +Date: Mon Jun 30 15:10:46 2008 +0200 + + mac80211: rework debug settings and make debugging safer + + This patch reworks the mac80211 debug settings making them more focused + and adding help text for those that didn't have one. It also removes a + number of printks that can be triggered remotely and add no value, e.g. + "too short deauthentication frame received - ignoring". + + If somebody really needs to debug that they should just add a monitor + interface and look at the frames in wireshark. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 3f1664e47dcd98b982f34dc39735f2b6706ad7ff +Author: Johannes Berg +Date: Mon Jun 30 15:10:45 2008 +0200 + + mac80211: get rid of function pointers in RX path + + This changes the RX path to no longer use function pointers for + RX handlers but rather invoke them directly. If debugging is + enabled, mark the RX handlers noinline because otherwise they + all get inlined into ieee80211_invoke_rx_handlers() which makes + it harder to see where a bug is. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 5807822f3d52179ec0a9091892e88dc4d4d3323b +Author: Johannes Berg +Date: Mon Jun 30 15:10:44 2008 +0200 + + mac80211: get rid of function pointers in TX path + + This changes the TX path to no longer use function pointers for + TX handlers but rather invoke them directly. If debugging is + enabled, mark the TX handlers noinline because otherwise they + all get inlined into invoke_tx_handlers() which makes it harder + to see where a bug is. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 444b6135791874d8e78ff47daab86d1b8ee4784f +Author: Zhu Yi +Date: Mon Jun 30 17:23:32 2008 +0800 + + iwl3945: remove RFKILL_STATE_HARD_BLOCKED warnings + + The patch fixes the compile warning of "enumeration value + ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch". + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit bd1092ceadee190604d8ff59faa97a974c3c1ecb +Author: Zhu Yi +Date: Mon Jun 30 17:23:31 2008 +0800 + + iwlwifi: fix iwl4965 temperature callback calibration issue + + The patch fixes the temperature calibration issue introduced by the + patch "iwlwifi: move RX stats to core, and move temperature to handler". + It also remove the second parameter "stats" since it is already copied + to priv->statistics. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 82c2e0895d1fa87c3206e3fe5f99dd51e2cf6371 +Author: Stefanik G??bor +Date: Mon Jun 30 17:23:30 2008 +0800 + + iwlwifi: enable packet injection for iwl3945 + + This patch enables packet injection on iwl3945 devices. Tested with + packetspammer and aireplay-ng. + + Signed-off-by: G??bor Stefanik + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 6fe878497b04b9c428842ab9c89c0e2d712860ad +Author: Rick Farrington +Date: Mon Jun 30 17:23:28 2008 +0800 + + iwlwifi: fix incorrect monitor mode operation + + This patch fixes monitor mode operation for iwlwifi. + + Problems addressed: + 1. when monitor mode was enabled, multiple, overlapped calls were being + made to 'iwl3945_bg_set_monitor' + + 2. when monitor mode was disabled (via the configure_filter callback), + the driver was still enabling monitor mode + + 3. when monitor mode was enabled, the selected channel was not set + (eg. 'iwconfig wlanx mode monitor channel n' DID NOT SET channel 'n' + when packet capture was subsequently enabled) + + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 0a078ffa011209c307880da10917ef205b4b11f4 +Author: Tomas Winkler +Date: Mon Jun 30 17:23:26 2008 +0800 + + iwlwifi: fix 4965 uCode load + + This patch fixes uCode load in 4965 HW + + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit a9efa652cbfead13bbe200878f8a2d74f3543e1b +Author: Emmanuel Grumbach +Date: Mon Jun 30 17:23:25 2008 +0800 + + iwlwifi: clean up HW RF-kill state machine and restarts + + This patch cleans up HW RF-kill state machine. + + Signed-off-by: Mohamed Abbas + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 154b25ce9218fbe6eebacef7907fabf6d663e639 +Author: Emmanuel Grumbach +Date: Mon Jun 30 17:23:24 2008 +0800 + + iwlwifi: blocking mac_start until uCode is complete + + This patch makes iwl4965_mac_start block until the uCode has been + completely loaded. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 06da0699445631e6710b1f3b2e89570325b65e7e +Author: Ron Rindjunsky +Date: Mon Jun 30 17:23:23 2008 +0800 + + iwlwifi: eliminate iwl4965_mac_get_tsf + + This patch removes iwl4965_mac_get_tsf, as this function does not + currently reports any actual value. + + Signed-off-by: Ron Rindjunsky + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit e58942a2ed4386ea19bae4342320d569e025dded +Author: Abhijeet Kolekar +Date: Mon Jun 30 17:23:22 2008 +0800 + + iwlwifi: Remove unnecessary code + + Removed unnecessary goto. + + Signed-off-by: Abhijeet Kolekar + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 4977929304306b1b0712f9b99e3cbf95f75c31ea +Author: Ron Rindjunsky +Date: Mon Jun 30 17:23:21 2008 +0800 + + iwlwifi: control 11n capabilities through module param [...17750 lines suppressed...] + return RX_DROP_UNUSABLE; + +- printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from " +- "%s\n", rx->dev->name, print_mac(mac, sa)); +- + mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx, + (void *) skb->data); + return RX_DROP_UNUSABLE; +@@ -176,59 +155,58 @@ ieee80211_rx_h_michael_mic_verify(struct skb_trim(skb, skb->len - MICHAEL_MIC_LEN); /* update IV in key information to be able to detect replays */ @@ -72357,7 +77347,7 @@ return 0; } -@@ -246,28 +227,16 @@ ieee80211_tx_result +@@ -246,28 +224,16 @@ ieee80211_tx_result ieee80211_crypto_tkip_encrypt(struct ieee80211_tx_data *tx) { struct sk_buff *skb = tx->skb; @@ -72388,7 +77378,7 @@ return TX_DROP; } } -@@ -280,14 +249,12 @@ ieee80211_rx_result +@@ -280,14 +246,12 @@ ieee80211_rx_result ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; @@ -72404,7 +77394,24 @@ if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) return RX_CONTINUE; -@@ -429,36 +396,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 +@@ -315,15 +279,8 @@ ieee80211_crypto_tkip_decrypt(struct iee + hdr->addr1, hwaccel, rx->queue, + &rx->tkip_iv32, + &rx->tkip_iv16); +- if (res != TKIP_DECRYPT_OK || wpa_test) { +-#ifdef CONFIG_MAC80211_DEBUG +- if (net_ratelimit()) +- printk(KERN_DEBUG "%s: TKIP decrypt failed for RX " +- "frame from %s (res=%d)\n", rx->dev->name, +- print_mac(mac, rx->sta->addr), res); +-#endif /* CONFIG_MAC80211_DEBUG */ ++ if (res != TKIP_DECRYPT_OK || wpa_test) + return RX_DROP_UNUSABLE; +- } + + /* Trim ICV */ + skb_trim(skb, skb->len - TKIP_ICV_LEN); +@@ -429,36 +386,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 } @@ -72461,7 +77468,7 @@ pos = skb_push(skb, CCMP_HDR_LEN); memmove(pos, pos + CCMP_HDR_LEN, hdrlen); -@@ -478,7 +450,7 @@ static int ccmp_encrypt_skb(struct ieee8 +@@ -478,7 +440,7 @@ static int ccmp_encrypt_skb(struct ieee8 if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) { /* hwaccel - with preallocated room for CCMP header */ @@ -72470,7 +77477,7 @@ return 0; } -@@ -495,28 +467,16 @@ ieee80211_tx_result +@@ -495,28 +457,16 @@ ieee80211_tx_result ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx) { struct sk_buff *skb = tx->skb; @@ -72501,7 +77508,7 @@ return TX_DROP; } } -@@ -529,7 +489,6 @@ ieee80211_rx_result +@@ -529,7 +479,6 @@ ieee80211_rx_result ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; @@ -72509,7 +77516,7 @@ int hdrlen; struct ieee80211_key *key = rx->key; struct sk_buff *skb = rx->skb; -@@ -537,8 +496,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee +@@ -537,8 +486,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee int data_len; DECLARE_MAC_BUF(mac); @@ -72519,9 +77526,39 @@ if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) return RX_CONTINUE; +@@ -554,16 +502,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee + (void) ccmp_hdr2pn(pn, skb->data + hdrlen); + + if (memcmp(pn, key->u.ccmp.rx_pn[rx->queue], CCMP_PN_LEN) <= 0) { +-#ifdef CONFIG_MAC80211_DEBUG +- u8 *ppn = key->u.ccmp.rx_pn[rx->queue]; +- +- printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from " +- "%s (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN " +- "%02x%02x%02x%02x%02x%02x)\n", rx->dev->name, +- print_mac(mac, rx->sta->addr), +- pn[0], pn[1], pn[2], pn[3], pn[4], pn[5], +- ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]); +-#endif /* CONFIG_MAC80211_DEBUG */ + key->u.ccmp.replays++; + return RX_DROP_UNUSABLE; + } +@@ -583,12 +521,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee + skb->data + hdrlen + CCMP_HDR_LEN, data_len, + skb->data + skb->len - CCMP_MIC_LEN, + skb->data + hdrlen + CCMP_HDR_LEN)) { +-#ifdef CONFIG_MAC80211_DEBUG +- if (net_ratelimit()) +- printk(KERN_DEBUG "%s: CCMP decrypt failed " +- "for RX frame from %s\n", rx->dev->name, +- print_mac(mac, rx->sta->addr)); +-#endif /* CONFIG_MAC80211_DEBUG */ + return RX_DROP_UNUSABLE; + } + } diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c ---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-03 16:26:37.000000000 -0400 @@ -39,8 +39,56 @@ MODULE_LICENSE("GPL"); static LIST_HEAD(rfkill_list); /* list of registered rf switches */ static DEFINE_MUTEX(rfkill_mutex); @@ -72983,8 +78020,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-03 16:26:37.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -73142,8 +78179,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-03 16:26:37.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -73152,8 +78189,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-03 16:26:37.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -73183,8 +78220,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-30 14:03:46.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-30 14:04:54.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-03 16:26:37.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -73248,8 +78285,8 @@ /* exported functions */ diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-30 14:04:55.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-03 16:26:37.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -73291,8 +78328,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-30 14:03:46.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-30 14:05:20.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-03 16:26:09.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-03 16:26:37.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.45 -r 1.46 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- linux-2.6-wireless.patch 2 Jul 2008 21:23:38 -0000 1.45 +++ linux-2.6-wireless.patch 4 Jul 2008 20:48:50 -0000 1.46 @@ -1,3 +1,46 @@ +commit 7b58ccfe32f40eca8c8ca29aa723a5d0e814f0c9 +Author: andrey at cozybit.com +Date: Tue Jul 1 11:43:53 2008 -0700 + + libertas: support USB persistence on suspend/resume (resend) + + Handle .reset_resume() so that libertas can survive suspend/resume without + reloading the firmware. + + Signed-off-by: Andrey Yurovsky + Acked-by: Deepak Saxena + Acked-by: Dan Williams + Signed-off-by: John W. Linville + +commit 6afe6828b19b4567768264831d101026cb5510ff +Author: Zhu Yi +Date: Tue Jul 1 09:20:34 2008 +0800 + + iwlwifi: drop skb silently for Tx request in monitor mode + + This patch fixes the problem to keep mac80211 resubmitting SKBs + when Tx request cannot be met in monitor mode. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit ec04fd60fd74a9db9c63fe11d519be3642cabfdd +Author: Rick Farrington +Date: Tue Jul 1 09:20:33 2008 +0800 + + iwlwifi: fix incorrect 5GHz rates reported in monitor mode + + This patch fixes the rates reported in monitor mode operation + (Wireshark) for iwlwifi. + + Previously, packets with rates of 6M..24M would be reported + incorrectly and packets with rates of 36M..54M would not passed + up the stack. + + Signed-off-by: Rick Farrington + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + commit 23976efedd5ecb420b87455787c537eb4aed1981 Author: Emmanuel Grumbach Date: Sat Jun 28 02:50:13 2008 +0300 @@ -9216,8 +9259,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-03 15:41:19.000000000 -0400 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -9415,8 +9458,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-03 15:41:19.000000000 -0400 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -9504,8 +9547,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-03 15:41:19.000000000 -0400 @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; @@ -9760,8 +9803,8 @@ /* diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-03 15:41:19.000000000 -0400 @@ -30,7 +30,6 @@ #include @@ -10111,8 +10154,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-03 15:41:19.000000000 -0400 @@ -58,10 +58,6 @@ #include "reg.h" #include "debug.h" @@ -11166,8 +11209,8 @@ memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats)); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-03 15:41:19.000000000 -0400 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -11213,8 +11256,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-03 15:41:19.000000000 -0400 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -11389,8 +11432,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-03 15:41:19.000000000 -0400 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -11475,8 +11518,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-03 15:41:19.000000000 -0400 @@ -1,4 +1,4 @@ - /* +/* @@ -13071,8 +13114,8 @@ /****************\ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-01 13:34:56.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-03 15:41:19.000000000 -0400 @@ -173,7 +173,10 @@ struct ath5k_eeprom_info { * (rX: reserved fields possibily used by future versions of the ar5k chipset) */ @@ -13274,8 +13317,8 @@ */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-01 13:34:57.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-03 15:41:19.000000000 -0400 @@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini { AR5K_PHY(644), 0x00806333 }, { AR5K_PHY(645), 0x00106c10 }, @@ -13798,8 +13841,8 @@ } diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-01 13:34:57.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-03 15:41:19.000000000 -0400 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -13839,8 +13882,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-01 13:34:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-01 13:34:57.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-03 15:41:01.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-03 15:41:19.000000000 -0400 @@ -1,2 +1,6 @@ -ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o -obj-$(CONFIG_ATH5K) += ath5k.o @@ -13851,8 +13894,8 @@ +ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o [...4826 lines suppressed...] #include #include @@ -125625,8 +125697,8 @@ #endif /* STA_INFO_H */ diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-03 15:41:19.000000000 -0400 @@ -12,7 +12,7 @@ #include @@ -125724,8 +125796,8 @@ tkip_mixing_phase2(key->u.tkip.p1k_rx[queue], diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h ---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-03 15:41:19.000000000 -0400 @@ -11,7 +11,7 @@ #include @@ -125745,8 +125817,8 @@ #endif /* TKIP_H */ diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c ---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-03 15:41:19.000000000 -0400 @@ -25,11 +25,12 @@ #include @@ -127201,8 +127273,8 @@ return skb; } diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c ---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-03 15:41:19.000000000 -0400 @@ -25,7 +25,8 @@ #include @@ -127521,8 +127593,8 @@ -EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); +EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c ---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-03 15:41:19.000000000 -0400 @@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -127613,8 +127685,8 @@ + return TX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h ---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-03 15:41:19.000000000 -0400 @@ -14,7 +14,7 @@ #include #include @@ -127639,8 +127711,8 @@ #endif /* WEP_H */ diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-01 13:35:13.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-03 15:41:19.000000000 -0400 @@ -0,0 +1,1171 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -128814,8 +128886,8 @@ + .get_wireless_stats = ieee80211_get_wireless_stats, +}; diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-03 15:41:19.000000000 -0400 @@ -19,10 +19,13 @@ #include "wme.h" @@ -129025,8 +129097,8 @@ + } +} diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-03 15:41:19.000000000 -0400 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -129072,8 +129144,8 @@ { return 0; diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-03 15:41:19.000000000 -0400 @@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const } @@ -129453,8 +129525,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h ---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-03 15:41:19.000000000 -0400 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -129488,8 +129560,8 @@ #endif /* WPA_H */ diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-03 15:41:19.000000000 -0400 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -129539,8 +129611,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h ---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-03 15:41:19.000000000 -0400 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -129550,8 +129622,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile ---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-03 15:41:19.000000000 -0400 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -129560,8 +129632,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c ---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-03 15:41:20.000000000 -0400 @@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 }, [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, @@ -130252,8 +130324,8 @@ /* multicast groups */ diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-01 13:34:58.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-03 15:41:20.000000000 -0400 @@ -0,0 +1,180 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -130436,8 +130508,8 @@ + handle_band(wiphy->bands[band], rd); +} diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c ---- /dev/null 2008-07-01 08:25:54.335004873 -0400 -+++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-01 13:34:58.000000000 -0400 +--- /dev/null 2008-07-03 09:55:47.025003120 -0400 ++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-03 15:41:20.000000000 -0400 @@ -0,0 +1,121 @@ +/* + * Wireless utility functions @@ -130561,8 +130633,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 13:34:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 13:34:58.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-03 15:41:02.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-03 15:41:20.000000000 -0400 @@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; From fedora-extras-commits at redhat.com Fri Jul 4 20:51:46 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Fri, 4 Jul 2008 20:51:46 GMT Subject: rpms/kernel/F-8 kernel.spec,1.484,1.485 Message-ID: <200807042051.m64KpkTE004763@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4514 Modified Files: kernel.spec Log Message: adjust version in changelog Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.484 retrieving revision 1.485 diff -u -r1.484 -r1.485 --- kernel.spec 4 Jul 2008 20:48:49 -0000 1.484 +++ kernel.spec 4 Jul 2008 20:51:02 -0000 1.485 @@ -1824,7 +1824,7 @@ %changelog -* Fri Jul 04 2008 John W. Linville 2.6.25.9-43 +* Fri Jul 04 2008 John W. Linville 2.6.25.9-45 - Upstream wireless fixes from 2008-07-02 (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) - Upstream wireless updates from 2008-06-30 From fedora-extras-commits at redhat.com Fri Jul 4 20:54:52 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Fri, 4 Jul 2008 20:54:52 GMT Subject: rpms/kernel/F-8 kernel.spec,1.485,1.486 Message-ID: <200807042054.m64KsqiH005571@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5417 Modified Files: kernel.spec Log Message: adjust version in changelog (and get it right) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.485 retrieving revision 1.486 diff -u -r1.485 -r1.486 --- kernel.spec 4 Jul 2008 20:51:02 -0000 1.485 +++ kernel.spec 4 Jul 2008 20:54:07 -0000 1.486 @@ -1824,7 +1824,7 @@ %changelog -* Fri Jul 04 2008 John W. Linville 2.6.25.9-45 +* Fri Jul 04 2008 John W. Linville 2.6.25.10-46 - Upstream wireless fixes from 2008-07-02 (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) - Upstream wireless updates from 2008-06-30 From fedora-extras-commits at redhat.com Fri Jul 4 20:58:44 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 4 Jul 2008 20:58:44 GMT Subject: rpms/lxterminal/F-9 lxterminal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042058.m64KwiiM006594@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxterminal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6404/F-9 Modified Files: .cvsignore sources Added Files: lxterminal.spec Log Message: * Sat Jun 28 2008 Christoph Wickert - 0.1.3-1 - Update to 0.1.3 - Add the new manpage --- NEW FILE lxterminal.spec --- Name: lxterminal Version: 0.1.3 Release: 1%{?dist} Summary: Desktop-independent VTE-based terminal emulator Summary(de): Desktup-unabh??ngiger VTE-basierter Terminal Emulator Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 vte-devel BuildRequires: desktop-file-utils intltool %description LXterminal is a VTE-based terminal emulator with support for multiple tabs. It is completely desktop-independent and does not have any unnecessary dependencies. In order to reduce memory usage and increase the performance all instances of the terminal are sharing a single process. %description -l de LXTerminal ist ein VTE-basierter Terminalemulator mit Unterst??tzung f??r mehrere Reiter. Er ist komplett desktop-unabh??ngig und hat keine unn??tigen Abh??ngigkeiten. Um den Speicherverbrauch zu reduzieren und die Leistung zu erh??hen teilen sich alle Instanzen des Terminals einen einzigen Prozess. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor="fedora" \ --delete-original \ --remove-category=Utility \ --add-category=System \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/%{name}*.1.gz %changelog * Sat Jun 28 2008 Christoph Wickert - 0.1.3-1 - Update to 0.1.3 - Add the new manpage * Fri Jun 20 2008 Christoph Wickert - 0.1.2-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:14:46 -0000 1.1 +++ .cvsignore 4 Jul 2008 20:58:02 -0000 1.2 @@ -0,0 +1 @@ +lxterminal-0.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:14:46 -0000 1.1 +++ sources 4 Jul 2008 20:58:02 -0000 1.2 @@ -0,0 +1 @@ +1e537062b9c58199e8462babd2ecba9c lxterminal-0.1.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 20:58:59 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 4 Jul 2008 20:58:59 GMT Subject: rpms/lxterminal/F-8 lxterminal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042058.m64KwxUI006685@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxterminal/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6404/F-8 Modified Files: .cvsignore sources Added Files: lxterminal.spec Log Message: * Sat Jun 28 2008 Christoph Wickert - 0.1.3-1 - Update to 0.1.3 - Add the new manpage --- NEW FILE lxterminal.spec --- Name: lxterminal Version: 0.1.3 Release: 1%{?dist} Summary: Desktop-independent VTE-based terminal emulator Summary(de): Desktup-unabh??ngiger VTE-basierter Terminal Emulator Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 vte-devel BuildRequires: desktop-file-utils intltool %description LXterminal is a VTE-based terminal emulator with support for multiple tabs. It is completely desktop-independent and does not have any unnecessary dependencies. In order to reduce memory usage and increase the performance all instances of the terminal are sharing a single process. %description -l de LXTerminal ist ein VTE-basierter Terminalemulator mit Unterst??tzung f??r mehrere Reiter. Er ist komplett desktop-unabh??ngig und hat keine unn??tigen Abh??ngigkeiten. Um den Speicherverbrauch zu reduzieren und die Leistung zu erh??hen teilen sich alle Instanzen des Terminals einen einzigen Prozess. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor="fedora" \ --delete-original \ --remove-category=Utility \ --add-category=System \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/%{name}*.1.gz %changelog * Sat Jun 28 2008 Christoph Wickert - 0.1.3-1 - Update to 0.1.3 - Add the new manpage * Fri Jun 20 2008 Christoph Wickert - 0.1.2-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:14:46 -0000 1.1 +++ .cvsignore 4 Jul 2008 20:58:14 -0000 1.2 @@ -0,0 +1 @@ +lxterminal-0.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:14:46 -0000 1.1 +++ sources 4 Jul 2008 20:58:14 -0000 1.2 @@ -0,0 +1 @@ +1e537062b9c58199e8462babd2ecba9c lxterminal-0.1.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:03:09 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:03:09 GMT Subject: rpms/s3cmd/devel import.log, NONE, 1.1 s3cmd-0.9.8.1-noet.patch, NONE, 1.1 s3cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042103.m64L39gr014673@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14366/devel Modified Files: .cvsignore sources Added Files: import.log s3cmd-0.9.8.1-noet.patch s3cmd.spec Log Message: Initial import --- NEW FILE import.log --- s3cmd-0_9_8_1-3_fc9:HEAD:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205339 s3cmd-0.9.8.1-noet.patch: --- NEW FILE s3cmd-0.9.8.1-noet.patch --- Comment out test for python-elementtree. We don't need it at install time and it needlessly drags in an extra package. Lubomir Rintel diff -urp s3cmd-0.9.8.1.orig/setup.py s3cmd-0.9.8.1/setup.py --- s3cmd-0.9.8.1.orig/setup.py 2008-07-02 19:32:29.000000000 +0200 +++ s3cmd-0.9.8.1/setup.py 2008-07-02 19:31:43.000000000 +0200 @@ -9,6 +9,7 @@ if float("%d.%d" % sys.version_info[:2]) sys.stderr.write("S3cmd requires Python 2.4 or newer.\n") sys.exit(1) +""" try: import xml.etree.ElementTree as ET print "Using xml.etree.ElementTree for XML processing" @@ -22,6 +23,7 @@ except ImportError, e: sys.stderr.write("Please install ElementTree module from\n") sys.stderr.write("http://effbot.org/zone/element-index.htm\n") sys.exit(1) +""" try: ## Remove 'MANIFEST' file to force --- NEW FILE s3cmd.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: s3cmd Version: 0.9.8.1 Release: 3%{?dist} Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet License: GPLv2 URL: http://s3tools.logix.cz/s3cmd Source0: http://download.sourceforge.net/s3tools/%{name}-%{version}.tar.gz Patch0: s3cmd-0.9.8.1-noet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6 # This is in standard library since 2.5 Requires: python-elementtree %endif %description S3cmd lets you copy files from/to Amazon S3 (Simple Storage Service) using a simple to use command line client. %prep %setup -q %patch0 -p1 -b .noet %build %install rm -rf $RPM_BUILD_ROOT S3CMD_PACKAGING=Yes python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_mandir}/man1 install -m 644 s3cmd.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/s3cmd %{_mandir}/man1/s3cmd.1* %{python_sitelib}/S3 %if 0%{?fedora} >= 9 || 0%{?rhel >= 6} %{python_sitelib}/s3cmd*.egg-info %endif %doc NEWS README %changelog * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-3 - Be satisfied with ET provided by 2.5 python * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-2 - Added missing python-devel BR, thanks to Marek Mahut - Packaged the Python egg file * Wed Jul 02 2008 Lubomir Rintel (Good Data) - 0.9.8.1-1 - Initial packaging attempt Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:40:32 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:02:22 -0000 1.2 @@ -0,0 +1 @@ +s3cmd-0.9.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:40:32 -0000 1.1 +++ sources 4 Jul 2008 21:02:22 -0000 1.2 @@ -0,0 +1 @@ +6814b86a2640f96fc52d704ec876ec81 s3cmd-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:03:32 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:03:32 GMT Subject: rpms/perl-Term-ReadLine-Gnu/EL-5 import.log, NONE, 1.1 perl-Term-ReadLine-Gnu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042103.m64L3W9T014847@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14569/EL-5 Modified Files: .cvsignore sources Added Files: import.log perl-Term-ReadLine-Gnu.spec Log Message: Initial import --- NEW FILE import.log --- perl-Term-ReadLine-Gnu-1_17a-2_el5:EL-5:perl-Term-ReadLine-Gnu-1.17a-2.el5.src.rpm:1215205371 --- NEW FILE perl-Term-ReadLine-Gnu.spec --- Name: perl-Term-ReadLine-Gnu Version: 1.17a Release: 2%{?dist} Summary: Perl extension for the GNU Readline/History Library License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-ReadLine-Gnu/ Source0: http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: ncurses-devel BuildRequires: readline-devel >= 2.1 BuildRequires: perl >= 5.7 BuildRequires: expect Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description An implementation of Term::ReadLine using the GNU Readline/History Library. %prep %setup -q -n Term-ReadLine-Gnu-1.17 %build # Fix permissions and shebang paths at one shot find . -type f -exec chmod 0664 '{}' \; \ -exec sed 's,^#! */usr/local,#!%{_prefix},' -i '{}' \; %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT %check # Expect is used so that we get a PTY, as if we were # in a real terminal, where readline works expect -c ' spawn make test expect eof exit [lindex [wait] 3] ' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Term* %{_mandir}/man3/* %changelog * Sat Jun 28 2008 Lubomir Rintel (Good Data) 1.17a-2 - Tun the test suite with a pseudo-terminal * Fri Jun 27 2008 Lubomir Rintel (Good Data) 1.17a-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:32:56 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:02:47 -0000 1.2 @@ -0,0 +1 @@ +Term-ReadLine-Gnu-1.17a.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:32:56 -0000 1.1 +++ sources 4 Jul 2008 21:02:47 -0000 1.2 @@ -0,0 +1 @@ +acdd3ded64423390824f31149ebfdf5c Term-ReadLine-Gnu-1.17a.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:04:55 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:04:55 GMT Subject: rpms/s3cmd/F-8 import.log, NONE, 1.1 s3cmd-0.9.8.1-noet.patch, NONE, 1.1 s3cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042104.m64L4tBa015190@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14976/F-8 Modified Files: .cvsignore sources Added Files: import.log s3cmd-0.9.8.1-noet.patch s3cmd.spec Log Message: Initial import --- NEW FILE import.log --- s3cmd-0_9_8_1-3_fc9:F-8:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205453 s3cmd-0.9.8.1-noet.patch: --- NEW FILE s3cmd-0.9.8.1-noet.patch --- Comment out test for python-elementtree. We don't need it at install time and it needlessly drags in an extra package. Lubomir Rintel diff -urp s3cmd-0.9.8.1.orig/setup.py s3cmd-0.9.8.1/setup.py --- s3cmd-0.9.8.1.orig/setup.py 2008-07-02 19:32:29.000000000 +0200 +++ s3cmd-0.9.8.1/setup.py 2008-07-02 19:31:43.000000000 +0200 @@ -9,6 +9,7 @@ if float("%d.%d" % sys.version_info[:2]) sys.stderr.write("S3cmd requires Python 2.4 or newer.\n") sys.exit(1) +""" try: import xml.etree.ElementTree as ET print "Using xml.etree.ElementTree for XML processing" @@ -22,6 +23,7 @@ except ImportError, e: sys.stderr.write("Please install ElementTree module from\n") sys.stderr.write("http://effbot.org/zone/element-index.htm\n") sys.exit(1) +""" try: ## Remove 'MANIFEST' file to force --- NEW FILE s3cmd.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: s3cmd Version: 0.9.8.1 Release: 3%{?dist} Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet License: GPLv2 URL: http://s3tools.logix.cz/s3cmd Source0: http://download.sourceforge.net/s3tools/%{name}-%{version}.tar.gz Patch0: s3cmd-0.9.8.1-noet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6 # This is in standard library since 2.5 Requires: python-elementtree %endif %description S3cmd lets you copy files from/to Amazon S3 (Simple Storage Service) using a simple to use command line client. %prep %setup -q %patch0 -p1 -b .noet %build %install rm -rf $RPM_BUILD_ROOT S3CMD_PACKAGING=Yes python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_mandir}/man1 install -m 644 s3cmd.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/s3cmd %{_mandir}/man1/s3cmd.1* %{python_sitelib}/S3 %if 0%{?fedora} >= 9 || 0%{?rhel >= 6} %{python_sitelib}/s3cmd*.egg-info %endif %doc NEWS README %changelog * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-3 - Be satisfied with ET provided by 2.5 python * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-2 - Added missing python-devel BR, thanks to Marek Mahut - Packaged the Python egg file * Wed Jul 02 2008 Lubomir Rintel (Good Data) - 0.9.8.1-1 - Initial packaging attempt Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:40:32 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:04:09 -0000 1.2 @@ -0,0 +1 @@ +s3cmd-0.9.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:40:32 -0000 1.1 +++ sources 4 Jul 2008 21:04:09 -0000 1.2 @@ -0,0 +1 @@ +6814b86a2640f96fc52d704ec876ec81 s3cmd-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:05:21 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:05:21 GMT Subject: rpms/perl-Term-ReadLine-Gnu/F-8 import.log, NONE, 1.1 perl-Term-ReadLine-Gnu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042105.m64L5L0J015307@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15115/F-8 Modified Files: .cvsignore sources Added Files: import.log perl-Term-ReadLine-Gnu.spec Log Message: Initial import --- NEW FILE import.log --- perl-Term-ReadLine-Gnu-1_17a-2_el5:F-8:perl-Term-ReadLine-Gnu-1.17a-2.el5.src.rpm:1215205468 --- NEW FILE perl-Term-ReadLine-Gnu.spec --- Name: perl-Term-ReadLine-Gnu Version: 1.17a Release: 2%{?dist} Summary: Perl extension for the GNU Readline/History Library License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-ReadLine-Gnu/ Source0: http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: ncurses-devel BuildRequires: readline-devel >= 2.1 BuildRequires: perl >= 5.7 BuildRequires: expect Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description An implementation of Term::ReadLine using the GNU Readline/History Library. %prep %setup -q -n Term-ReadLine-Gnu-1.17 %build # Fix permissions and shebang paths at one shot find . -type f -exec chmod 0664 '{}' \; \ -exec sed 's,^#! */usr/local,#!%{_prefix},' -i '{}' \; %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT %check # Expect is used so that we get a PTY, as if we were # in a real terminal, where readline works expect -c ' spawn make test expect eof exit [lindex [wait] 3] ' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Term* %{_mandir}/man3/* %changelog * Sat Jun 28 2008 Lubomir Rintel (Good Data) 1.17a-2 - Tun the test suite with a pseudo-terminal * Fri Jun 27 2008 Lubomir Rintel (Good Data) 1.17a-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:32:56 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:04:31 -0000 1.2 @@ -0,0 +1 @@ +Term-ReadLine-Gnu-1.17a.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:32:56 -0000 1.1 +++ sources 4 Jul 2008 21:04:31 -0000 1.2 @@ -0,0 +1 @@ +acdd3ded64423390824f31149ebfdf5c Term-ReadLine-Gnu-1.17a.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:06:50 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:06:50 GMT Subject: rpms/s3cmd/F-9 import.log, NONE, 1.1 s3cmd-0.9.8.1-noet.patch, NONE, 1.1 s3cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042106.m64L6oCJ015788@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15556/F-9 Modified Files: .cvsignore sources Added Files: import.log s3cmd-0.9.8.1-noet.patch s3cmd.spec Log Message: Initial import --- NEW FILE import.log --- s3cmd-0_9_8_1-3_fc9:F-9:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205568 s3cmd-0.9.8.1-noet.patch: --- NEW FILE s3cmd-0.9.8.1-noet.patch --- Comment out test for python-elementtree. We don't need it at install time and it needlessly drags in an extra package. Lubomir Rintel diff -urp s3cmd-0.9.8.1.orig/setup.py s3cmd-0.9.8.1/setup.py --- s3cmd-0.9.8.1.orig/setup.py 2008-07-02 19:32:29.000000000 +0200 +++ s3cmd-0.9.8.1/setup.py 2008-07-02 19:31:43.000000000 +0200 @@ -9,6 +9,7 @@ if float("%d.%d" % sys.version_info[:2]) sys.stderr.write("S3cmd requires Python 2.4 or newer.\n") sys.exit(1) +""" try: import xml.etree.ElementTree as ET print "Using xml.etree.ElementTree for XML processing" @@ -22,6 +23,7 @@ except ImportError, e: sys.stderr.write("Please install ElementTree module from\n") sys.stderr.write("http://effbot.org/zone/element-index.htm\n") sys.exit(1) +""" try: ## Remove 'MANIFEST' file to force --- NEW FILE s3cmd.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: s3cmd Version: 0.9.8.1 Release: 3%{?dist} Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet License: GPLv2 URL: http://s3tools.logix.cz/s3cmd Source0: http://download.sourceforge.net/s3tools/%{name}-%{version}.tar.gz Patch0: s3cmd-0.9.8.1-noet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6 # This is in standard library since 2.5 Requires: python-elementtree %endif %description S3cmd lets you copy files from/to Amazon S3 (Simple Storage Service) using a simple to use command line client. %prep %setup -q %patch0 -p1 -b .noet %build %install rm -rf $RPM_BUILD_ROOT S3CMD_PACKAGING=Yes python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_mandir}/man1 install -m 644 s3cmd.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/s3cmd %{_mandir}/man1/s3cmd.1* %{python_sitelib}/S3 %if 0%{?fedora} >= 9 || 0%{?rhel >= 6} %{python_sitelib}/s3cmd*.egg-info %endif %doc NEWS README %changelog * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-3 - Be satisfied with ET provided by 2.5 python * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-2 - Added missing python-devel BR, thanks to Marek Mahut - Packaged the Python egg file * Wed Jul 02 2008 Lubomir Rintel (Good Data) - 0.9.8.1-1 - Initial packaging attempt Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:40:32 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:06:07 -0000 1.2 @@ -0,0 +1 @@ +s3cmd-0.9.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:40:32 -0000 1.1 +++ sources 4 Jul 2008 21:06:07 -0000 1.2 @@ -0,0 +1 @@ +6814b86a2640f96fc52d704ec876ec81 s3cmd-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:07:16 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:07:16 GMT Subject: rpms/perl-Term-ReadLine-Gnu/F-9 import.log, NONE, 1.1 perl-Term-ReadLine-Gnu-1.17-malloc.patch, NONE, 1.1 perl-Term-ReadLine-Gnu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042107.m64L7GqF015925@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15660/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Term-ReadLine-Gnu-1.17-malloc.patch perl-Term-ReadLine-Gnu.spec Log Message: Initial import --- NEW FILE import.log --- perl-Term-ReadLine-Gnu-1_17a-3_fc9:F-9:perl-Term-ReadLine-Gnu-1.17a-3.fc9.src.rpm:1215205593 perl-Term-ReadLine-Gnu-1.17-malloc.patch: --- NEW FILE perl-Term-ReadLine-Gnu-1.17-malloc.patch --- http://rt.perl.org/rt3/Ticket/Display.html?id=56500 _THIS COULD HAVE BEEN MUCH WORSE_ Lubomir Rintel diff -urp Term-ReadLine-Gnu-1.17.orig/Gnu.pm Term-ReadLine-Gnu-1.17/Gnu.pm --- Term-ReadLine-Gnu-1.17.orig/Gnu.pm 2008-02-07 15:12:43.000000000 +0100 +++ Term-ReadLine-Gnu-1.17/Gnu.pm 2008-07-01 18:36:50.000000000 +0200 @@ -68,6 +68,11 @@ END } } +# Tidy up what could have been malloc()'d +END { + new Term::ReadLine::Gnu('_ultimate_destroyer_')->env_workaround (); +} + { use Exporter (); use DynaLoader; diff -urp Term-ReadLine-Gnu-1.17.orig/Gnu.xs Term-ReadLine-Gnu-1.17/Gnu.xs --- Term-ReadLine-Gnu-1.17.orig/Gnu.xs 2008-02-06 15:49:47.000000000 +0100 +++ Term-ReadLine-Gnu-1.17/Gnu.xs 2008-07-01 18:21:59.000000000 +0200 @@ -1317,6 +1317,32 @@ MODULE = Term::ReadLine::Gnu PACKAGE = # 2.1 Basic Behavior # +void +env_workaround() + PROTOTYPE: + CODE: + { + int i; + char **envptr; + // We intentionally not free old pointers, + // given we can't really sure where do they come from + // and how were they allocated + for (i = 0; environ[i] != NULL; i++) { + char *oldptr; + + if (strncmp (environ[i], "LINES=", 6) == 0 || + strncmp (environ[i], "COLUMNS=", 8) == 0) { + oldptr = environ[i]; + environ[i] = safesysmalloc (strlen (oldptr)+1); + strcpy (environ[i], oldptr); + } + } + i++; + envptr = safesysmalloc (sizeof (environ) * i); + memcpy (envptr, environ, sizeof (environ) * i); + environ = envptr; + } + # The function name "readline()" is reserved for a method name. t_xstr --- NEW FILE perl-Term-ReadLine-Gnu.spec --- Name: perl-Term-ReadLine-Gnu Version: 1.17a Release: 3%{?dist} Summary: Perl extension for the GNU Readline/History Library License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-ReadLine-Gnu/ Source0: http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz Patch0: perl-Term-ReadLine-Gnu-1.17-malloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: ncurses-devel BuildRequires: readline-devel >= 2.1 BuildRequires: perl >= 5.7 BuildRequires: expect Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description An implementation of Term::ReadLine using the GNU Readline/History Library. %prep %setup -q -n Term-ReadLine-Gnu-1.17 %patch0 -p1 -b .malloc %build # Fix permissions and shebang paths at one shot find . -type f -exec chmod 0664 '{}' \; \ -exec sed 's,^#! */usr/local,#!%{_prefix},' -i '{}' \; %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT %check # Expect is used so that we get a PTY, as if we were # in a real terminal, where readline works expect -c ' spawn make test expect eof exit [lindex [wait] 3] ' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Term* %{_mandir}/man3/* %changelog * Tue Jul 01 2008 Lubomir Rintel (Good Data) 1.17a-3 - Patch around rt#56500 perl bug hoping for better tomorrows * Sat Jun 28 2008 Lubomir Rintel (Good Data) 1.17a-2 - Run the test suite with a pseudo-terminal * Fri Jun 27 2008 Lubomir Rintel (Good Data) 1.17a-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:32:56 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:06:31 -0000 1.2 @@ -0,0 +1 @@ +Term-ReadLine-Gnu-1.17a.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:32:56 -0000 1.1 +++ sources 4 Jul 2008 21:06:31 -0000 1.2 @@ -0,0 +1 @@ +acdd3ded64423390824f31149ebfdf5c Term-ReadLine-Gnu-1.17a.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:08:12 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:08:12 GMT Subject: rpms/s3cmd/devel import.log,1.1,1.2 Message-ID: <200807042108.m64L8Cd3016270@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16027/devel Modified Files: import.log Log Message: Initial import Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2008 21:02:22 -0000 1.1 +++ import.log 4 Jul 2008 21:07:28 -0000 1.2 @@ -1 +1,2 @@ s3cmd-0_9_8_1-3_fc9:HEAD:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205339 +s3cmd-0_9_8_1-3_fc9:HEAD:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205619 From fedora-extras-commits at redhat.com Fri Jul 4 21:08:52 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:08:52 GMT Subject: rpms/perl-Term-ReadLine-Gnu/devel import.log, NONE, 1.1 perl-Term-ReadLine-Gnu-1.17-malloc.patch, NONE, 1.1 perl-Term-ReadLine-Gnu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042108.m64L8qHM016406@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16221/devel Modified Files: .cvsignore sources Added Files: import.log perl-Term-ReadLine-Gnu-1.17-malloc.patch perl-Term-ReadLine-Gnu.spec Log Message: Initial import --- NEW FILE import.log --- perl-Term-ReadLine-Gnu-1_17a-3_fc9:HEAD:perl-Term-ReadLine-Gnu-1.17a-3.fc9.src.rpm:1215205668 perl-Term-ReadLine-Gnu-1.17-malloc.patch: --- NEW FILE perl-Term-ReadLine-Gnu-1.17-malloc.patch --- http://rt.perl.org/rt3/Ticket/Display.html?id=56500 _THIS COULD HAVE BEEN MUCH WORSE_ Lubomir Rintel diff -urp Term-ReadLine-Gnu-1.17.orig/Gnu.pm Term-ReadLine-Gnu-1.17/Gnu.pm --- Term-ReadLine-Gnu-1.17.orig/Gnu.pm 2008-02-07 15:12:43.000000000 +0100 +++ Term-ReadLine-Gnu-1.17/Gnu.pm 2008-07-01 18:36:50.000000000 +0200 @@ -68,6 +68,11 @@ END } } +# Tidy up what could have been malloc()'d +END { + new Term::ReadLine::Gnu('_ultimate_destroyer_')->env_workaround (); +} + { use Exporter (); use DynaLoader; diff -urp Term-ReadLine-Gnu-1.17.orig/Gnu.xs Term-ReadLine-Gnu-1.17/Gnu.xs --- Term-ReadLine-Gnu-1.17.orig/Gnu.xs 2008-02-06 15:49:47.000000000 +0100 +++ Term-ReadLine-Gnu-1.17/Gnu.xs 2008-07-01 18:21:59.000000000 +0200 @@ -1317,6 +1317,32 @@ MODULE = Term::ReadLine::Gnu PACKAGE = # 2.1 Basic Behavior # +void +env_workaround() + PROTOTYPE: + CODE: + { + int i; + char **envptr; + // We intentionally not free old pointers, + // given we can't really sure where do they come from + // and how were they allocated + for (i = 0; environ[i] != NULL; i++) { + char *oldptr; + + if (strncmp (environ[i], "LINES=", 6) == 0 || + strncmp (environ[i], "COLUMNS=", 8) == 0) { + oldptr = environ[i]; + environ[i] = safesysmalloc (strlen (oldptr)+1); + strcpy (environ[i], oldptr); + } + } + i++; + envptr = safesysmalloc (sizeof (environ) * i); + memcpy (envptr, environ, sizeof (environ) * i); + environ = envptr; + } + # The function name "readline()" is reserved for a method name. t_xstr --- NEW FILE perl-Term-ReadLine-Gnu.spec --- Name: perl-Term-ReadLine-Gnu Version: 1.17a Release: 3%{?dist} Summary: Perl extension for the GNU Readline/History Library License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-ReadLine-Gnu/ Source0: http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz Patch0: perl-Term-ReadLine-Gnu-1.17-malloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: ncurses-devel BuildRequires: readline-devel >= 2.1 BuildRequires: perl >= 5.7 BuildRequires: expect Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description An implementation of Term::ReadLine using the GNU Readline/History Library. %prep %setup -q -n Term-ReadLine-Gnu-1.17 %patch0 -p1 -b .malloc %build # Fix permissions and shebang paths at one shot find . -type f -exec chmod 0664 '{}' \; \ -exec sed 's,^#! */usr/local,#!%{_prefix},' -i '{}' \; %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT %check # Expect is used so that we get a PTY, as if we were # in a real terminal, where readline works expect -c ' spawn make test expect eof exit [lindex [wait] 3] ' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Term* %{_mandir}/man3/* %changelog * Tue Jul 01 2008 Lubomir Rintel (Good Data) 1.17a-3 - Patch around rt#56500 perl bug hoping for better tomorrows * Sat Jun 28 2008 Lubomir Rintel (Good Data) 1.17a-2 - Run the test suite with a pseudo-terminal * Fri Jun 27 2008 Lubomir Rintel (Good Data) 1.17a-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:32:56 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:08:05 -0000 1.2 @@ -0,0 +1 @@ +Term-ReadLine-Gnu-1.17a.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:32:56 -0000 1.1 +++ sources 4 Jul 2008 21:08:05 -0000 1.2 @@ -0,0 +1 @@ +acdd3ded64423390824f31149ebfdf5c Term-ReadLine-Gnu-1.17a.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:12:09 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:12:09 GMT Subject: rpms/perl-Term-ReadLine-Gnu/F-9 perl-Term-ReadLine-Gnu.spec, 1.1, 1.2 perl-Term-ReadLine-Gnu-1.17-malloc.patch, 1.1, NONE Message-ID: <200807042112.m64LC9jT017238@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16909 Modified Files: perl-Term-ReadLine-Gnu.spec Removed Files: perl-Term-ReadLine-Gnu-1.17-malloc.patch Log Message: * Wed Jul 02 2008 Lubomir Rintel (Good Data) 1.17a-4 - Remote the workaround introduced in previous change - Disable Visual Bell test Index: perl-Term-ReadLine-Gnu.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-9/perl-Term-ReadLine-Gnu.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Term-ReadLine-Gnu.spec 4 Jul 2008 21:06:31 -0000 1.1 +++ perl-Term-ReadLine-Gnu.spec 4 Jul 2008 21:11:12 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-Term-ReadLine-Gnu Version: 1.17a -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for the GNU Readline/History Library License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-ReadLine-Gnu/ Source0: http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz -Patch0: perl-Term-ReadLine-Gnu-1.17-malloc.patch +Patch0: perl-Term-ReadLine-Gnu-1.17-vbtest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: ncurses-devel @@ -22,7 +22,7 @@ %prep %setup -q -n Term-ReadLine-Gnu-1.17 -%patch0 -p1 -b .malloc +%patch0 -p1 -b .vbtest %build @@ -67,11 +67,15 @@ %changelog +* Wed Jul 02 2008 Lubomir Rintel (Good Data) 1.17a-4 +- Remote the workaround introduced in previous change +- Disable Visual Bell test + * Tue Jul 01 2008 Lubomir Rintel (Good Data) 1.17a-3 - Patch around rt#56500 perl bug hoping for better tomorrows * Sat Jun 28 2008 Lubomir Rintel (Good Data) 1.17a-2 -- Run the test suite with a pseudo-terminal +- Tun the test suite with a pseudo-terminal * Fri Jun 27 2008 Lubomir Rintel (Good Data) 1.17a-1 - Specfile autogenerated by cpanspec 1.75. --- perl-Term-ReadLine-Gnu-1.17-malloc.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 4 21:12:14 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:12:14 GMT Subject: rpms/s3cmd/EL-5 import.log, NONE, 1.1 s3cmd-0.9.8.1-noet.patch, NONE, 1.1 s3cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042112.m64LCEFC017279@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16965/EL-5 Modified Files: .cvsignore sources Added Files: import.log s3cmd-0.9.8.1-noet.patch s3cmd.spec Log Message: Initial import --- NEW FILE import.log --- s3cmd-0_9_8_1-3_fc9:EL-5:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205758 s3cmd-0.9.8.1-noet.patch: --- NEW FILE s3cmd-0.9.8.1-noet.patch --- Comment out test for python-elementtree. We don't need it at install time and it needlessly drags in an extra package. Lubomir Rintel diff -urp s3cmd-0.9.8.1.orig/setup.py s3cmd-0.9.8.1/setup.py --- s3cmd-0.9.8.1.orig/setup.py 2008-07-02 19:32:29.000000000 +0200 +++ s3cmd-0.9.8.1/setup.py 2008-07-02 19:31:43.000000000 +0200 @@ -9,6 +9,7 @@ if float("%d.%d" % sys.version_info[:2]) sys.stderr.write("S3cmd requires Python 2.4 or newer.\n") sys.exit(1) +""" try: import xml.etree.ElementTree as ET print "Using xml.etree.ElementTree for XML processing" @@ -22,6 +23,7 @@ except ImportError, e: sys.stderr.write("Please install ElementTree module from\n") sys.stderr.write("http://effbot.org/zone/element-index.htm\n") sys.exit(1) +""" try: ## Remove 'MANIFEST' file to force --- NEW FILE s3cmd.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: s3cmd Version: 0.9.8.1 Release: 3%{?dist} Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet License: GPLv2 URL: http://s3tools.logix.cz/s3cmd Source0: http://download.sourceforge.net/s3tools/%{name}-%{version}.tar.gz Patch0: s3cmd-0.9.8.1-noet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6 # This is in standard library since 2.5 Requires: python-elementtree %endif %description S3cmd lets you copy files from/to Amazon S3 (Simple Storage Service) using a simple to use command line client. %prep %setup -q %patch0 -p1 -b .noet %build %install rm -rf $RPM_BUILD_ROOT S3CMD_PACKAGING=Yes python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_mandir}/man1 install -m 644 s3cmd.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/s3cmd %{_mandir}/man1/s3cmd.1* %{python_sitelib}/S3 %if 0%{?fedora} >= 9 || 0%{?rhel >= 6} %{python_sitelib}/s3cmd*.egg-info %endif %doc NEWS README %changelog * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-3 - Be satisfied with ET provided by 2.5 python * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-2 - Added missing python-devel BR, thanks to Marek Mahut - Packaged the Python egg file * Wed Jul 02 2008 Lubomir Rintel (Good Data) - 0.9.8.1-1 - Initial packaging attempt Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:40:32 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:11:21 -0000 1.2 @@ -0,0 +1 @@ +s3cmd-0.9.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:40:32 -0000 1.1 +++ sources 4 Jul 2008 21:11:21 -0000 1.2 @@ -0,0 +1 @@ +6814b86a2640f96fc52d704ec876ec81 s3cmd-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:13:05 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 4 Jul 2008 21:13:05 GMT Subject: rpms/gnome-lirc-properties/devel glp-fedora-support.patch, NONE, 1.1 gnome-lirc-properties.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042113.m64LD597017462@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16789/devel Modified Files: .cvsignore sources Added Files: glp-fedora-support.patch gnome-lirc-properties.spec import.log Log Message: * Thu Jul 03 2008 - Bastien Nocera - 0.2.8-2 - Update for the comments by Dan Hor??k in the review * Tue Jul 01 2008 - Bastien Nocera - 0.2.8-1 - Update to 0.2.8 * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-5 - Fix traceback when selecting device * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-4 - Consider a missing /etc/lircd.conf to be a valid configuration * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-3 - Fix desktop file * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-2 - Update for lirc changes * Tue Jun 03 2008 - Bastien Nocera - 0.2.7-1 - Update against lirc with include support, and new upstream version * Mon Apr 14 2008 - Bastien Nocera - 0.2.5-1 - First package glp-fedora-support.patch: --- NEW FILE glp-fedora-support.patch --- Index: gnome_lirc_properties/config.py.in =================================================================== --- gnome_lirc_properties/config.py.in (revision 44) +++ gnome_lirc_properties/config.py.in (working copy) @@ -12,7 +12,7 @@ LIRC_CONFDIR = '@with_lirc_confdir@' -LIRC_HARDWARE_CONF = path.join(LIRC_CONFDIR, 'hardware.conf') +LIRC_HARDWARE_CONF = path.join('@sysconfdir@', 'sysconfig', 'lirc') LIRC_REMOTE_CONF = path.join(LIRC_CONFDIR, 'lircd.conf.gnome') LIRC_DAEMON_CONF = path.join(LIRC_CONFDIR, 'lircd.conf') Index: gnome_lirc_properties/ui/RemoteControlProperties.py =================================================================== --- gnome_lirc_properties/ui/RemoteControlProperties.py (revision 44) +++ gnome_lirc_properties/ui/RemoteControlProperties.py (working copy) @@ -297,13 +297,13 @@ # # NOTE: Ubuntu's lirc script doesn't distinguish between remote and # receiver settings in "hardware.conf", whereas we have to. For that - # reason the device node's name is stored in REMOTE_DEVICE, instead + # reason the device node's name is stored in LIRC_DEVICE, instead # of RECEIVER_DEVICE. # self.selected_receiver = ( settings.get('RECEIVER_VENDOR'), settings.get('RECEIVER_MODEL'), - settings.get('REMOTE_DEVICE'), + settings.get('LIRC_DEVICE'), ) # Try to select configured remote vendor: Index: gnome_lirc_properties/backend.py =================================================================== --- gnome_lirc_properties/backend.py (revision 44) +++ gnome_lirc_properties/backend.py (working copy) @@ -493,8 +493,8 @@ # The "REMOTE_" prefix is made optional, since it only was introduced # with lirc 0.8.3~pre1-0ubuntu4 of Hardy Heron. - __re_remote_directive = re.compile(r'^\s*(?:REMOTE_)?(DRIVER|DEVICE|MODULES|' + - r'LIRCD_ARGS|LIRCD_CONF|VENDOR|MODEL)=') + __re_remote_directive = re.compile(r'^\s*(LIRC_DRIVER|LIRC_DEVICE|MODULES|' + + r'LIRCD_OPTIONS|LIRCD_CONF|VENDOR|MODEL)=') __re_start_lircd = re.compile(r'^\s*START_LIRCD=') def __init__(self, connection=None, path='/'): @@ -593,6 +593,7 @@ continue # Deal with the START_LIRCD line: + # This doesn't do anything on Fedora match = self.__re_start_lircd.match(line) @@ -604,7 +605,7 @@ value = (start_lircd is None) and 'true' or start_lircd start_lircd = None - print >> output, (match.group(0) + value) + # print >> output, (match.group(0) + value) continue output.write(line) @@ -615,17 +616,13 @@ if remote_values: print >> output, '\n# Remote settings required by gnome-lirc-properties' for key, value in remote_values.items(): - print >> output, ('REMOTE_%s="%s"' % (key, value)) + print >> output, ('%s="%s"' % (key, value)) if receiver_values: print >> output, '\n# Receiver settings required by gnome-lirc-properties' for key, value in receiver_values.items(): print >> output, ('RECEIVER_%s="%s"' % (key, value)) - if start_lircd is not None: - print >> output, '\n# Daemon settings required by gnome-lirc-properties' - print >> output, ('START_LIRCD=%s' % start_lircd) - # Replace old file with new contents: os.unlink(oldfile) @@ -646,10 +643,10 @@ self._check_permission(sender) remote_values = { - 'DRIVER': driver, - 'DEVICE': device, + 'LIRC_DRIVER': driver, + 'LIRC_DEVICE': device, 'MODULES': modules, - 'LIRCD_ARGS': '', + 'LIRCD_OPTIONS': '', 'LIRCD_CONF': '', } @@ -767,10 +764,12 @@ print 'Managing lircd: %s...' % action if 'enable' == action: - self._write_hardware_configuration(start_lircd=True) + args = '/sbin/chkconfig', 'lirc', 'on' + os.spawnv(os.P_WAIT, args[0], args) elif 'disable' == action: - self._write_hardware_configuration(start_lircd=False) + args = '/sbin/chkconfig', 'lirc', 'off' + os.spawnv(os.P_WAIT, args[0], args) else: args = '/etc/init.d/lirc', action Index: gnome_lirc_properties/policykit.py =================================================================== --- gnome_lirc_properties/policykit.py (revision 44) +++ gnome_lirc_properties/policykit.py (working copy) @@ -43,7 +43,7 @@ authorized = self.policy_kit.IsProcessAuthorized(action_id, pid, False) logging.debug('%s: authorized=%r', action_id, authorized) - return ('no' != authorized) + return ('yes' == authorized) def obtain_authorization(self, widget, action_id=config.POLICY_KIT_ACTION): ''' Index: configure.ac =================================================================== --- configure.ac (revision 44) +++ configure.ac (working copy) @@ -60,7 +60,7 @@ HAVE_LIRCD="no" elif [[ "$LIRCD_MAJOR" -eq "0" ]] && \ [[ "$LIRCD_MINOR" -eq "8" ]] && \ - [[ "$LIRCD_MICRO" -lt "4" ]]; then + [[ "$LIRCD_MICRO" -lt "3" ]]; then AC_MSG_WARN([lircd >= 0.8.4 is required, you have $LIRCD_VERSION]) HAVE_LIRCD="no" fi Index: data/gnome-lirc-properties.desktop.in.in =================================================================== --- data/gnome-lirc-properties.desktop.in.in (revision 44) +++ data/gnome-lirc-properties.desktop.in.in (working copy) @@ -7,7 +7,7 @@ Exec=@prefix@/bin/gnome-lirc-properties Icon=gnome-lirc-properties StartupNotify=true -Categories=GNOME;GTK;Settings;HardwareSettings;System; +Categories=GNOME;GTK;Settings;HardwareSettings; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-lirc-properties X-GNOME-Bugzilla-Component=general --- NEW FILE gnome-lirc-properties.spec --- %define polkit_minver 0.7 %define lirc_ver 0.8.3-4 # Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gnome-lirc-properties Version: 0.2.8 Release: 2%{?dist} Summary: Infrared Remote Controls setup tool Group: User Interface/X Hardware Support License: GPLv2+ URL: http://svn.gnome.org/svn/gnome-lirc-properties/trunk Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-lirc-properties/0.2/%{name}-%{version}.tar.gz # http://bugzilla.gnome.org/show_bug.cgi?id=530359 # http://bugzilla.gnome.org/show_bug.cgi?id=540897 # and We have the patches in a 0.8.3 version in Fedora Patch0: glp-fedora-support.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: python >= 2.3 Requires: PolicyKit >= %{polkit_minver} Requires: pygtk2 Requires: lirc >= %{lirc_ver} lirc-remotes >= %{lirc_ver} BuildRequires: python-devel >= 2.3 BuildRequires: PolicyKit-gnome-devel >= %{polkit_minver} gtk2-devel BuildRequires: gnome-doc-utils BuildRequires: lirc >= %{lirc_ver} lirc-remotes >= %{lirc_ver} # For the Fedora patch BuildRequires: autoconf automake intltool BuildArch: noarch %description gnome-lirc-properties helps users set up infrared remote controls for use with the LIRC framework. %prep %setup -q %patch0 -p0 -b .fedora autoconf %build %configure --disable-conf-check --with-lirc-confdir=%{_sysconfdir} --with-remotes-database=%{_datadir}/lirc-remotes/ make %install rm -rf $RPM_BUILD_ROOT # use DESTDIR so compiled python files get tagged correctly with their # final location make DESTDIR=$RPM_BUILD_ROOT install # Validate the desktop file desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-lirc-properties.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README AUTHORS %{_sysconfdir}/dbus-1/system.d/org.gnome.LircProperties.Mechanism.conf %{_datadir}/PolicyKit/policy/gnome-lirc-properties-mechanism.policy %{_datadir}/dbus-1/system-services/org.gnome.LircProperties.Mechanism.service %{_datadir}/applications/gnome-lirc-properties.desktop %{_datadir}/gnome/help/gnome-lirc-properties/ %{_datadir}/icons/hicolor/*/apps/* %{_mandir}/man1/* %{_datadir}/omf/gnome-lirc-properties/ %{_bindir}/gnome-lirc-properties %{python_sitelib}/gnome_lirc_properties %{_datadir}/%{name}/ %changelog * Thu Jul 03 2008 - Bastien Nocera - 0.2.8-2 - Update for the comments by Dan Hor??k in the review * Tue Jul 01 2008 - Bastien Nocera - 0.2.8-1 - Update to 0.2.8 * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-5 - Fix traceback when selecting device * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-4 - Consider a missing /etc/lircd.conf to be a valid configuration * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-3 - Fix desktop file * Mon Jun 30 2008 - Bastien Nocera - 0.2.7-2 - Update for lirc changes * Tue Jun 03 2008 - Bastien Nocera - 0.2.7-1 - Update against lirc with include support, and new upstream version * Mon Apr 14 2008 - Bastien Nocera - 0.2.5-1 - First package --- NEW FILE import.log --- gnome-lirc-properties-0_2_8-2_fc9:HEAD:gnome-lirc-properties-0.2.8-2.fc9.src.rpm:1215205816 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 19:44:28 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:12:25 -0000 1.2 @@ -0,0 +1 @@ +gnome-lirc-properties-0.2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:44:28 -0000 1.1 +++ sources 4 Jul 2008 21:12:25 -0000 1.2 @@ -0,0 +1 @@ +ab01c9767c3d3c0370f64ae683368f82 gnome-lirc-properties-0.2.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:13:41 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:13:41 GMT Subject: rpms/perl-Term-ReadLine-Gnu/devel perl-Term-ReadLine-Gnu.spec, 1.1, 1.2 perl-Term-ReadLine-Gnu-1.17-malloc.patch, 1.1, NONE Message-ID: <200807042113.m64LDfbq017609@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17452 Modified Files: perl-Term-ReadLine-Gnu.spec Removed Files: perl-Term-ReadLine-Gnu-1.17-malloc.patch Log Message: * Wed Jul 02 2008 Lubomir Rintel (Good Data) 1.17a-4 - Remote the workaround introduced in previous change - Disable Visual Bell test Index: perl-Term-ReadLine-Gnu.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel/perl-Term-ReadLine-Gnu.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Term-ReadLine-Gnu.spec 4 Jul 2008 21:08:05 -0000 1.1 +++ perl-Term-ReadLine-Gnu.spec 4 Jul 2008 21:12:53 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-Term-ReadLine-Gnu Version: 1.17a -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for the GNU Readline/History Library License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Term-ReadLine-Gnu/ Source0: http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz -Patch0: perl-Term-ReadLine-Gnu-1.17-malloc.patch +Patch0: perl-Term-ReadLine-Gnu-1.17-vbtest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: ncurses-devel @@ -22,7 +22,7 @@ %prep %setup -q -n Term-ReadLine-Gnu-1.17 -%patch0 -p1 -b .malloc +%patch0 -p1 -b .vbtest %build @@ -67,11 +67,15 @@ %changelog +* Wed Jul 02 2008 Lubomir Rintel (Good Data) 1.17a-4 +- Remote the workaround introduced in previous change +- Disable Visual Bell test + * Tue Jul 01 2008 Lubomir Rintel (Good Data) 1.17a-3 - Patch around rt#56500 perl bug hoping for better tomorrows * Sat Jun 28 2008 Lubomir Rintel (Good Data) 1.17a-2 -- Run the test suite with a pseudo-terminal +- Tun the test suite with a pseudo-terminal * Fri Jun 27 2008 Lubomir Rintel (Good Data) 1.17a-1 - Specfile autogenerated by cpanspec 1.75. --- perl-Term-ReadLine-Gnu-1.17-malloc.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 4 21:24:39 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 4 Jul 2008 21:24:39 GMT Subject: rpms/gnome-lirc-properties/devel gnome-lirc-properties.spec, 1.1, 1.2 Message-ID: <200807042124.m64LOd5X019625@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19453 Modified Files: gnome-lirc-properties.spec Log Message: * Fri Jul 04 2008 - Bastien Nocera - 0.2.8-3 - Require a newer PolicyKit that allows root to read auths Index: gnome-lirc-properties.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-lirc-properties.spec 4 Jul 2008 21:12:25 -0000 1.1 +++ gnome-lirc-properties.spec 4 Jul 2008 21:23:59 -0000 1.2 @@ -1,4 +1,4 @@ -%define polkit_minver 0.7 +%define polkit_minver 0.8-3 %define lirc_ver 0.8.3-4 # Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python @@ -6,7 +6,7 @@ Name: gnome-lirc-properties Version: 0.2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Infrared Remote Controls setup tool Group: User Interface/X Hardware Support @@ -91,6 +91,9 @@ %{_datadir}/%{name}/ %changelog +* Fri Jul 04 2008 - Bastien Nocera - 0.2.8-3 +- Require a newer PolicyKit that allows root to read auths + * Thu Jul 03 2008 - Bastien Nocera - 0.2.8-2 - Update for the comments by Dan Hor??k in the review From fedora-extras-commits at redhat.com Fri Jul 4 21:25:40 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:25:40 GMT Subject: rpms/perl-Term-ReadLine-Gnu/F-9 perl-Term-ReadLine-Gnu-1.17-vbtest.patch, NONE, 1.1 Message-ID: <200807042125.m64LPedt019949@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19790/F-9 Added Files: perl-Term-ReadLine-Gnu-1.17-vbtest.patch Log Message: added missing file perl-Term-ReadLine-Gnu-1.17-vbtest.patch: --- NEW FILE perl-Term-ReadLine-Gnu-1.17-vbtest.patch --- Temporarily disable test that fails in Fedora 9 Lubomir Rintel diff -urp Term-ReadLine-Gnu-1.17.orig/t/readline.t Term-ReadLine-Gnu-1.17/t/readline.t --- Term-ReadLine-Gnu-1.17.orig/t/readline.t 2008-07-02 16:14:37.000000000 +0200 +++ Term-ReadLine-Gnu-1.17/t/readline.t 2008-07-02 16:13:54.000000000 +0200 @@ -865,8 +865,9 @@ $t->ornaments('md,me,,'); print $OUT "\n" unless defined $t->readline("bold>"); $t->ornaments('mr,me,,'); print $OUT "\n" unless defined $t->readline("reverse>"); -$t->ornaments('vb,,,'); -print $OUT "\n" unless defined $t->readline("visible bell>"); +# Thus confusingly fails with Perl 5.10.0 +#$t->ornaments('vb,,,'); +#print $OUT "\n" unless defined $t->readline("visible bell>"); $t->ornaments(0); print $OUT "# end of ornaments test\n"; From fedora-extras-commits at redhat.com Fri Jul 4 21:25:56 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 4 Jul 2008 21:25:56 GMT Subject: rpms/perl-Term-ReadLine-Gnu/devel perl-Term-ReadLine-Gnu-1.17-vbtest.patch, NONE, 1.1 Message-ID: <200807042125.m64LPueE020089@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19790/devel Added Files: perl-Term-ReadLine-Gnu-1.17-vbtest.patch Log Message: added missing file perl-Term-ReadLine-Gnu-1.17-vbtest.patch: --- NEW FILE perl-Term-ReadLine-Gnu-1.17-vbtest.patch --- Temporarily disable test that fails in Fedora 9 Lubomir Rintel diff -urp Term-ReadLine-Gnu-1.17.orig/t/readline.t Term-ReadLine-Gnu-1.17/t/readline.t --- Term-ReadLine-Gnu-1.17.orig/t/readline.t 2008-07-02 16:14:37.000000000 +0200 +++ Term-ReadLine-Gnu-1.17/t/readline.t 2008-07-02 16:13:54.000000000 +0200 @@ -865,8 +865,9 @@ $t->ornaments('md,me,,'); print $OUT "\n" unless defined $t->readline("bold>"); $t->ornaments('mr,me,,'); print $OUT "\n" unless defined $t->readline("reverse>"); -$t->ornaments('vb,,,'); -print $OUT "\n" unless defined $t->readline("visible bell>"); +# Thus confusingly fails with Perl 5.10.0 +#$t->ornaments('vb,,,'); +#print $OUT "\n" unless defined $t->readline("visible bell>"); $t->ornaments(0); print $OUT "# end of ornaments test\n"; From fedora-extras-commits at redhat.com Fri Jul 4 21:35:49 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 4 Jul 2008 21:35:49 GMT Subject: rpms/gnome-lirc-properties/devel gnome-lirc-properties.spec, 1.2, 1.3 Message-ID: <200807042135.m64LZnLQ022490@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22201 Modified Files: gnome-lirc-properties.spec Log Message: * Fri Jul 04 2008 - Bastien Nocera - 0.2.8-3 - Require a newer PolicyKit that allows root to read auths Index: gnome-lirc-properties.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-lirc-properties.spec 4 Jul 2008 21:23:59 -0000 1.2 +++ gnome-lirc-properties.spec 4 Jul 2008 21:35:01 -0000 1.3 @@ -28,6 +28,7 @@ BuildRequires: PolicyKit-gnome-devel >= %{polkit_minver} gtk2-devel BuildRequires: gnome-doc-utils BuildRequires: lirc >= %{lirc_ver} lirc-remotes >= %{lirc_ver} +BuildRequires: desktop-file-utils # For the Fedora patch BuildRequires: autoconf automake intltool From fedora-extras-commits at redhat.com Fri Jul 4 21:48:16 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Fri, 4 Jul 2008 21:48:16 GMT Subject: rpms/lxpanel/devel .cvsignore, 1.7, 1.8 lxpanel.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200807042148.m64LmGlt026045@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/lxpanel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25882 Modified Files: .cvsignore lxpanel.spec sources Log Message: * Fri Jul 04 2008 Sebastian Vahl 0.3.8-1 - new upstream version: 0.3.8 - new BR in this version: intltool Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lxpanel/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 15 Jun 2008 17:38:10 -0000 1.7 +++ .cvsignore 4 Jul 2008 21:47:23 -0000 1.8 @@ -1 +1 @@ -lxpanel-0.3.7.tar.gz +lxpanel-0.3.8.tar.gz Index: lxpanel.spec =================================================================== RCS file: /cvs/extras/rpms/lxpanel/devel/lxpanel.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lxpanel.spec 15 Jun 2008 17:38:10 -0000 1.11 +++ lxpanel.spec 4 Jul 2008 21:47:23 -0000 1.12 @@ -2,7 +2,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=219930 Name: lxpanel -Version: 0.3.7 +Version: 0.3.8 Release: 1%{?dist} Summary: A lightweight X11 desktop panel @@ -14,8 +14,13 @@ Patch2: lxpanel-0.2.8-manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel libXpm-devel libXmu-devel gettext startup-notification-devel BuildRequires: docbook-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: libXmu-devel +BuildRequires: libXpm-devel +BuildRequires: startup-notification-devel %description lxpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM @@ -51,6 +56,10 @@ %{_mandir}/man1/lxpanel* %changelog +* Fri Jul 04 2008 Sebastian Vahl 0.3.8-1 +- new upstream version: 0.3.8 +- new BR in this version: intltool + * Sun Jun 15 2008 Sebastian Vahl 0.3.7-1 - new upstream version: 0.3.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lxpanel/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Jun 2008 17:38:10 -0000 1.7 +++ sources 4 Jul 2008 21:47:23 -0000 1.8 @@ -1 +1 @@ -9a963d2e8b1ce9da70d2bb3c3aa61297 lxpanel-0.3.7.tar.gz +0730035810896a2d7f8892d75991674c lxpanel-0.3.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:49:07 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 4 Jul 2008 21:49:07 GMT Subject: rpms/perl-AnyEvent/devel import.log, NONE, 1.1 perl-AnyEvent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042149.m64Ln73G026284@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26026/devel Modified Files: .cvsignore sources Added Files: import.log perl-AnyEvent.spec Log Message: Initial import --- NEW FILE import.log --- perl-AnyEvent-4_161-1_fc8_kwizart:HEAD:perl-AnyEvent-4.161-1.fc8.kwizart.src.rpm:1215208060 --- NEW FILE perl-AnyEvent.spec --- Name: perl-AnyEvent Version: 4.161 Release: 1%{?dist} Summary: Framework for multiple event loops Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/AnyEvent/ Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # Needed for test BuildRequires: perl(Test::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description AnyEvent provides a framework for multiple event loops. %prep %setup -q -n AnyEvent-%{version} # Filter unwanted Requires: cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(Tk)/d' | \ sed -e '/perl(EV)/d' | \ sed -e '/^perl(Qt/d' | \ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF %define __perl_requires %{_builddir}/AnyEvent-%{version}/%{name}-req chmod +x %{name}-req # Filter unwanted Provides: cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF %define __perl_provides %{_builddir}/AnyEvent-%{version}/%{name}-prov chmod +x %{name}-prov %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' %check # PERL_ANYEVENT_NET_TESTS shoudn't be set to avoid network tests # on our builder. make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 4.161-1 - Update to 4.161 * Mon Jun 23 2008 kwizart < kwizart at gmail.com > - 4.152-1 - Update to 4.152 * Mon Jun 9 2008 kwizart < kwizart at gmail.com > - 4.151-1 - Update to 4.151 * Thu Jun 5 2008 kwizart < kwizart at gmail.com > - 4.13-1 - Update to 4.13 * Tue Jun 3 2008 kwizart < kwizart at gmail.com > - 4.12-1 - Update to 4.12 * Thu May 29 2008 kwizart < kwizart at gmail.com > - 4.1-1 - Update to 4.1 * Tue May 27 2008 kwizart < kwizart at gmail.com > - 3.5-1 - Update to 3.5 * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 3.3-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:16:36 -0000 1.1 +++ .cvsignore 4 Jul 2008 21:48:21 -0000 1.2 @@ -0,0 +1 @@ +AnyEvent-4.161.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:16:36 -0000 1.1 +++ sources 4 Jul 2008 21:48:21 -0000 1.2 @@ -0,0 +1 @@ +f131ab601868a4f30fe3819931ae9093 AnyEvent-4.161.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 21:55:51 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 4 Jul 2008 21:55:51 GMT Subject: rpms/lxterminal/F-8 lxterminal.spec,1.1,1.2 Message-ID: <200807042155.m64LtpMT027728@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxterminal/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27592/F-8 Modified Files: lxterminal.spec Log Message: BR gettext because of the broken F-8 intltool package Index: lxterminal.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/F-8/lxterminal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxterminal.spec 4 Jul 2008 20:58:14 -0000 1.1 +++ lxterminal.spec 4 Jul 2008 21:55:09 -0000 1.2 @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 vte-devel -BuildRequires: desktop-file-utils intltool +BuildRequires: desktop-file-utils intltool gettext %description LXterminal is a VTE-based terminal emulator with support for multiple tabs. From fedora-extras-commits at redhat.com Fri Jul 4 21:56:04 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 4 Jul 2008 21:56:04 GMT Subject: rpms/lxterminal/F-9 lxterminal.spec,1.1,1.2 Message-ID: <200807042156.m64Lu4Qt027832@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxterminal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27592/F-9 Modified Files: lxterminal.spec Log Message: BR gettext because of the broken F-8 intltool package Index: lxterminal.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/F-9/lxterminal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxterminal.spec 4 Jul 2008 20:58:02 -0000 1.1 +++ lxterminal.spec 4 Jul 2008 21:55:21 -0000 1.2 @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 vte-devel -BuildRequires: desktop-file-utils intltool +BuildRequires: desktop-file-utils intltool gettext %description LXterminal is a VTE-based terminal emulator with support for multiple tabs. From fedora-extras-commits at redhat.com Fri Jul 4 21:56:18 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 4 Jul 2008 21:56:18 GMT Subject: rpms/lxterminal/devel lxterminal.spec,1.2,1.3 Message-ID: <200807042156.m64LuI9F027859@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxterminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27592/devel Modified Files: lxterminal.spec Log Message: BR gettext because of the broken F-8 intltool package Index: lxterminal.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxterminal/devel/lxterminal.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lxterminal.spec 4 Jul 2008 20:44:35 -0000 1.2 +++ lxterminal.spec 4 Jul 2008 21:55:35 -0000 1.3 @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 vte-devel -BuildRequires: desktop-file-utils intltool +BuildRequires: desktop-file-utils intltool gettext %description LXterminal is a VTE-based terminal emulator with support for multiple tabs. From fedora-extras-commits at redhat.com Fri Jul 4 22:04:42 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 4 Jul 2008 22:04:42 GMT Subject: rpms/perl-AnyEvent/F-9 perl-AnyEvent.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807042204.m64M4g52003269@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3134 Modified Files: sources Added Files: perl-AnyEvent.spec Log Message: Initial import for F-9 --- NEW FILE perl-AnyEvent.spec --- Name: perl-AnyEvent Version: 4.161 Release: 1%{?dist} Summary: Framework for multiple event loops Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/AnyEvent/ Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # Needed for test BuildRequires: perl(Test::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description AnyEvent provides a framework for multiple event loops. %prep %setup -q -n AnyEvent-%{version} # Filter unwanted Requires: cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(Tk)/d' | \ sed -e '/perl(EV)/d' | \ sed -e '/^perl(Qt/d' | \ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF %define __perl_requires %{_builddir}/AnyEvent-%{version}/%{name}-req chmod +x %{name}-req # Filter unwanted Provides: cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF %define __perl_provides %{_builddir}/AnyEvent-%{version}/%{name}-prov chmod +x %{name}-prov %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' %check # PERL_ANYEVENT_NET_TESTS shoudn't be set to avoid network tests # on our builder. make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 4.161-1 - Update to 4.161 * Mon Jun 23 2008 kwizart < kwizart at gmail.com > - 4.152-1 - Update to 4.152 * Mon Jun 9 2008 kwizart < kwizart at gmail.com > - 4.151-1 - Update to 4.151 * Thu Jun 5 2008 kwizart < kwizart at gmail.com > - 4.13-1 - Update to 4.13 * Tue Jun 3 2008 kwizart < kwizart at gmail.com > - 4.12-1 - Update to 4.12 * Thu May 29 2008 kwizart < kwizart at gmail.com > - 4.1-1 - Update to 4.1 * Tue May 27 2008 kwizart < kwizart at gmail.com > - 3.5-1 - Update to 3.5 * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 3.3-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:16:36 -0000 1.1 +++ sources 4 Jul 2008 22:03:52 -0000 1.2 @@ -0,0 +1 @@ +f131ab601868a4f30fe3819931ae9093 AnyEvent-4.161.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 22:07:43 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 4 Jul 2008 22:07:43 GMT Subject: rpms/perl-AnyEvent/F-8 perl-AnyEvent.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807042207.m64M7hm7003760@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3652 Modified Files: sources Added Files: perl-AnyEvent.spec Log Message: Initial import for F-8 --- NEW FILE perl-AnyEvent.spec --- Name: perl-AnyEvent Version: 4.161 Release: 1%{?dist} Summary: Framework for multiple event loops Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/AnyEvent/ Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # Needed for test BuildRequires: perl(Test::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description AnyEvent provides a framework for multiple event loops. %prep %setup -q -n AnyEvent-%{version} # Filter unwanted Requires: cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(Tk)/d' | \ sed -e '/perl(EV)/d' | \ sed -e '/^perl(Qt/d' | \ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF %define __perl_requires %{_builddir}/AnyEvent-%{version}/%{name}-req chmod +x %{name}-req # Filter unwanted Provides: cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF %define __perl_provides %{_builddir}/AnyEvent-%{version}/%{name}-prov chmod +x %{name}-prov %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' %check # PERL_ANYEVENT_NET_TESTS shoudn't be set to avoid network tests # on our builder. make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 4.161-1 - Update to 4.161 * Mon Jun 23 2008 kwizart < kwizart at gmail.com > - 4.152-1 - Update to 4.152 * Mon Jun 9 2008 kwizart < kwizart at gmail.com > - 4.151-1 - Update to 4.151 * Thu Jun 5 2008 kwizart < kwizart at gmail.com > - 4.13-1 - Update to 4.13 * Tue Jun 3 2008 kwizart < kwizart at gmail.com > - 4.12-1 - Update to 4.12 * Thu May 29 2008 kwizart < kwizart at gmail.com > - 4.1-1 - Update to 4.1 * Tue May 27 2008 kwizart < kwizart at gmail.com > - 3.5-1 - Update to 3.5 * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 3.3-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:16:36 -0000 1.1 +++ sources 4 Jul 2008 22:06:53 -0000 1.2 @@ -0,0 +1 @@ +f131ab601868a4f30fe3819931ae9093 AnyEvent-4.161.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 23:00:56 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 4 Jul 2008 23:00:56 GMT Subject: rpms/afflib/devel afflib-3.2.3-nos3.patch, NONE, 1.1 afflib.spec, 1.10, 1.11 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 afflib-3.1.3-ldconfig.patch, 1.1, NONE afflib-3.2.1-fix_namespace.patch, 1.1, NONE Message-ID: <200807042300.m64N0u9e011367@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/afflib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11255 Modified Files: afflib.spec sources .cvsignore Added Files: afflib-3.2.3-nos3.patch Removed Files: afflib-3.1.3-ldconfig.patch afflib-3.2.1-fix_namespace.patch Log Message: - Update to 3.2.3 afflib-3.2.3-nos3.patch: --- NEW FILE afflib-3.2.3-nos3.patch --- diff -up afflib-3.2.3/lib/Makefile.am.nos3 afflib-3.2.3/lib/Makefile.am --- afflib-3.2.3/lib/Makefile.am.nos3 2008-06-28 10:00:34.000000000 +0200 +++ afflib-3.2.3/lib/Makefile.am 2008-07-05 00:48:43.000000000 +0200 @@ -1,13 +1,16 @@ -bin_PROGRAMS = aftest s3 +bin_PROGRAMS = aftest aftest_SOURCES = aftest.cpp aftest_LDADD = libafflib.la #aftest_LDFLAGS = -static aftest_LDFLAGS = $(PTHREAD_CFLAGS) +if MAYBE_S3 +bin_PROGRAMS += s3 s3_SOURCES = s3.cpp s3_LDADD = libafflib.la #s3_LDFLAGS = -static +endif TESTS = aftest diff -up afflib-3.2.3/configure.ac.nos3 afflib-3.2.3/configure.ac --- afflib-3.2.3/configure.ac.nos3 2008-07-05 00:38:23.000000000 +0200 +++ afflib-3.2.3/configure.ac 2008-07-05 00:48:31.000000000 +0200 @@ -256,6 +256,7 @@ if test "x${enable_s3}" = "xyes" ; then S3_BIN='s3$(EXEEXT)' fi AC_SUBST(S3_BIN) +AM_CONDITIONAL([MAYBE_S3], [test "x${enable_s3}" = "xyes"]) ## Index: afflib.spec =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- afflib.spec 26 Jun 2008 18:46:06 -0000 1.10 +++ afflib.spec 4 Jul 2008 23:00:13 -0000 1.11 @@ -1,6 +1,6 @@ Name: afflib -Version: 3.2.1 -Release: 4%{?dist} +Version: 3.2.3 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -9,8 +9,7 @@ Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch -Patch3: afflib-3.1.3-ldconfig.patch -Patch4: afflib-3.2.1-fix_namespace.patch +Patch2: afflib-3.2.3-nos3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -62,8 +61,7 @@ %setup -q %patch0 -p1 -b .WCtype %patch1 -p1 -b .gcc43 -%patch3 -p1 -b .ldconfig -%patch4 -p1 -b .fix_namespace +%patch2 -p1 -b .nos3 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -79,7 +77,7 @@ %configure --enable-shared \ --enable-wide-character-type \ --disable-static \ - --enable-s3=no \ + --disable-s3 \ --enable-libewf=yes #??Remove rpath from libtool @@ -127,6 +125,9 @@ %changelog +* Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 3.2.3-1 +- Update to 3.2.3 + * Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.2.1-4 - Explicitely disable s3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Jun 2008 12:02:06 -0000 1.5 +++ sources 4 Jul 2008 23:00:13 -0000 1.6 @@ -1 +1 @@ -ac43df78c10b48d713f7eb169fa6633d afflib-3.2.1.tar.gz +cb3b5a181adeee5047ded626e5903859 afflib-3.2.3.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Jun 2008 12:02:06 -0000 1.5 +++ .cvsignore 4 Jul 2008 23:00:13 -0000 1.6 @@ -1 +1 @@ -afflib-3.2.1.tar.gz +afflib-3.2.3.tar.gz --- afflib-3.1.3-ldconfig.patch DELETED --- --- afflib-3.2.1-fix_namespace.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 4 23:06:06 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 4 Jul 2008 23:06:06 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1556,1.1557 Message-ID: <200807042306.m64N66Xw018996@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18826 Modified Files: openoffice.org.spec Log Message: removed files Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1556 retrieving revision 1.1557 diff -u -r1.1556 -r1.1557 --- openoffice.org.spec 4 Jul 2008 16:20:58 -0000 1.1556 +++ openoffice.org.spec 4 Jul 2008 23:05:10 -0000 1.1557 @@ -2195,7 +2195,6 @@ %{basisinstdir}/program/libucpftp1.so %{basisinstdir}/program/libucphier1.so %{basisinstdir}/program/libucppkg1.so -%{basisinstdir}/program/libunopkg.so %{basisinstdir}/program/libunopkgapp.so %{basisinstdir}/program/libunoxml%{SOPOST}.so %{basisinstdir}/program/libupdchk%{SOPOST}.so From fedora-extras-commits at redhat.com Fri Jul 4 23:06:19 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 4 Jul 2008 23:06:19 GMT Subject: rpms/libfonts/devel import.log, NONE, 1.1 libfonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042306.m64N6JNL019040@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libfonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18892/devel Modified Files: .cvsignore sources Added Files: import.log libfonts.spec Log Message: --- NEW FILE import.log --- libfonts-0_3_4-1_fc9:HEAD:libfonts-0.3.4-1.fc9.src.rpm:1215212744 --- NEW FILE libfonts.spec --- # Use rpmbuild --without gcj to disable native bits %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: libfonts Version: 0.3.4 Release: 1%{?dist} Summary: TrueType Font Layouting License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://reporting.pentaho.org/ BuildRequires: ant, java-devel, jpackage-utils, jcommon, libloader Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: java, jpackage-utils, jcommon, libloader >= 0.3.7-1 %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description LibFonts is a library developed to support advanced layouting in JFreeReport. This library allows to read TrueType-Font files to extract layouting specific informations. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc Javadoc for %{name}. %prep %setup -q find . -name "*.jar" -exec rm -f {} \; build-jar-repository -s -p lib jcommon-1.0.12 libloader-0.3.7 %build ant compile javadoc for file in README.txt licence-LGPL.txt ChangeLog.txt; do tr -d '\r' < $file > $file.new mv $file.new $file done %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf $RPM_BUILD_ROOT %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(0644,root,root,0755) %doc licence-LGPL.txt README.txt ChangeLog.txt %{_javadir}/*.jar %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog * Wed May 07 2008 Caolan McNamara 0.3.4-1 - initial fedora import Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libfonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:34:30 -0000 1.1 +++ .cvsignore 4 Jul 2008 23:05:34 -0000 1.2 @@ -0,0 +1 @@ +libfonts-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libfonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:34:30 -0000 1.1 +++ sources 4 Jul 2008 23:05:34 -0000 1.2 @@ -0,0 +1 @@ +8369400998f44a37812c419797666691 libfonts-0.3.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 4 23:52:54 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 4 Jul 2008 23:52:54 GMT Subject: rpms/sleuthkit/devel import.log, NONE, 1.1 sleuthkit-2.51-system_perl.patch, NONE, 1.1 sleuthkit-2.52-pkgconfig.patch, NONE, 1.1 sleuthkit-2.52-remove_rpath.patch, NONE, 1.1 sleuthkit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807042352.m64NqswY027247@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/sleuthkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27119/devel Modified Files: .cvsignore sources Added Files: import.log sleuthkit-2.51-system_perl.patch sleuthkit-2.52-pkgconfig.patch sleuthkit-2.52-remove_rpath.patch sleuthkit.spec Log Message: Initial import for Rawhide --- NEW FILE import.log --- sleuthkit-2_52-1_fc8_kwizart:HEAD:sleuthkit-2.52-1.fc8.kwizart.src.rpm:1215214695 sleuthkit-2.51-system_perl.patch: --- NEW FILE sleuthkit-2.51-system_perl.patch --- diff -up sleuthkit-2.51/tools/timeline/Makefile.am.system_perl sleuthkit-2.51/tools/timeline/Makefile.am --- sleuthkit-2.51/tools/timeline/Makefile.am.system_perl 2007-12-18 23:43:33.000000000 +0100 +++ sleuthkit-2.51/tools/timeline/Makefile.am 2008-03-18 15:14:34.000000000 +0100 @@ -4,7 +4,6 @@ EXTRA_DIST = mactime.base .perltidyrc mactime: mactime.base Makefile @echo "#!$(PERL) -w" > mactime - @echo "use lib '$(datadir)/tsk/lib';" >> mactime @echo "my \$$VER=\"$(VERSION)\";" >> mactime @cat mactime.base >> mactime @chmod +x mactime diff -up sleuthkit-2.52/Makefile.am.rm_Date-Manip sleuthkit-2.52/Makefile.am --- sleuthkit-2.52/Makefile.am.rm_Date-Manip 2008-06-17 12:02:54.000000000 +0200 +++ sleuthkit-2.52/Makefile.am 2008-06-17 12:03:01.000000000 +0200 @@ -35,8 +35,7 @@ nobase_include_HEADERS = tsk/libtsk.h ts nobase_dist_data_DATA = tsk/sorter/default.sort tsk/sorter/freebsd.sort \ tsk/sorter/images.sort tsk/sorter/linux.sort tsk/sorter/openbsd.sort \ - tsk/sorter/solaris.sort tsk/sorter/windows.sort \ - tsk/lib/Date/Manip.pm tsk/lib/Date/Manip.pod + tsk/sorter/solaris.sort tsk/sorter/windows.sort api-docs: doxygen config/Doxyfile sleuthkit-2.52-pkgconfig.patch: --- NEW FILE sleuthkit-2.52-pkgconfig.patch --- diff -up sleuthkit-2.52/tsk/img/aff.h.pkgconfig sleuthkit-2.52/tsk/img/aff.h --- sleuthkit-2.52/tsk/img/aff.h.pkgconfig 2008-03-25 00:05:23.000000000 +0100 +++ sleuthkit-2.52/tsk/img/aff.h 2008-06-17 17:28:15.000000000 +0200 @@ -16,8 +16,9 @@ #if HAVE_LIBAFFLIB -#include -#include +#include +#include + extern TSK_IMG_INFO *aff_open(const char **, TSK_IMG_INFO *); diff -up sleuthkit-2.52/tsk/img/Makefile.am.pkgconfig sleuthkit-2.52/tsk/img/Makefile.am --- sleuthkit-2.52/tsk/img/Makefile.am.pkgconfig 2008-01-29 05:34:27.000000000 +0100 +++ sleuthkit-2.52/tsk/img/Makefile.am 2008-06-17 17:34:05.000000000 +0200 @@ -4,6 +4,8 @@ EXTRA_DIST = .indent.pro DESIGN.txt noinst_LTLIBRARIES = libtskimg.la libtskimg_la_SOURCES = img_open.c img_types.c raw.c raw.h \ split.c split.h aff.c aff.h ewf.c ewf.h tsk_img_i.h +libtskimg_la_LIBADD = $(LIBEWF_LIBS) $(AFFLIB_LIBS) +libtskimg_la_CFLAGS = $(AM_CFLAGS) $(LIBEWF_CFLAGS) $(AFFLIB_CFLAGS) indent: indent *.c *.h diff -up sleuthkit-2.52/tsk/Makefile.am.pkgconfig sleuthkit-2.52/tsk/Makefile.am --- sleuthkit-2.52/tsk/Makefile.am.pkgconfig 2008-04-05 20:37:18.000000000 +0200 +++ sleuthkit-2.52/tsk/Makefile.am 2008-06-17 17:28:15.000000000 +0200 @@ -5,8 +5,9 @@ SUBDIRS = base img vs fs hashdb lib_LTLIBRARIES = libtsk.la libtsk_la_SOURCES = libtsk_la_LIBADD = base/libtskbase.la img/libtskimg.la \ - vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la + vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la + # current:revision:age -libtsk_la_LDFLAGS = -version-info 1:2:0 +libtsk_la_LDFLAGS = -no-undefined -version-info 1:2:0 EXTRA_DIST = tsk_tools_i.h diff -up sleuthkit-2.52/configure.ac.pkgconfig sleuthkit-2.52/configure.ac --- sleuthkit-2.52/configure.ac.pkgconfig 2008-06-17 17:28:15.000000000 +0200 +++ sleuthkit-2.52/configure.ac 2008-06-17 17:28:15.000000000 +0200 @@ -74,36 +74,27 @@ AC_CHECK_HEADERS([linux/hdreg.h], # AC_ARG_ENABLE to see if they disabled it (disable-afflib) AC_ARG_ENABLE(afflib, - [ --disable-afflib Do not use AFFLIB even if it is installed], -# Action if they gave this argument - [ if test "x$enableval" = "xyes" ; then - AC_CHECK_LIB([afflib], [af_open]) - elif test "x$enableval" = "xno" ; then - echo "Ignoring AFFLIB." - else - echo "Error: Unknown enable-afflib argument." - exit -1 - fi - ], -# if they did not specify aff, look for it - [AC_CHECK_LIB([afflib], [af_open])] - ) + [ --disable-afflib Do not use AFFLIB even if it is installed]) +# Check via pkg-config unless explicitely disabled. +if test "x$enable_afflib" != "xno" ; then + PKG_CHECK_MODULES([AFFLIB], [afflib >= 3.0.0], + [AC_DEFINE(HAVE_LIBAFFLIB, [1], [Define to 1 if you have the `afflib' library (-lafflib)])] + ) +else + echo "Ignoring AFFLIB." +fi + AC_ARG_ENABLE(ewf, - [ --disable-ewf Do not use libewf even if it is installed], -# Action if they gave this argument - [ if test "x$enableval" = "xyes" ; then - AC_CHECK_LIB([ewf], [libewf_open]) - elif test "x$enableval" = "xno" ; then - echo "Ignoring LibEWF." - else - echo "Error: Unknown enable-ewf argument." - exit -1 - fi - ], -# if they did not specify ewf, look for it - [AC_CHECK_LIB([ewf], [libewf_open])] - ) + [ --disable-ewf Do not use libewf even if it is installed]) +# Check via pkg-config unless explicitely disabled. +if test "x$enable_ewf" != "xno" ; then + PKG_CHECK_MODULES([LIBEWF], [libewf >= 20080322], + [AC_DEFINE(HAVE_LIBEWF, [1], [Define to 1 if you have the `libewf' library (-lewf)])] + ) +else + echo "Ignoring LibEWF." +fi AC_CONFIG_COMMANDS([tsk/tsk_incs.h], sleuthkit-2.52-remove_rpath.patch: --- NEW FILE sleuthkit-2.52-remove_rpath.patch --- diff -up sleuthkit-2.52/configure.ac.rpath sleuthkit-2.52/configure.ac --- sleuthkit-2.52/configure.ac.rpath 2008-04-10 02:33:59.000000000 +0200 +++ sleuthkit-2.52/configure.ac 2008-06-17 11:17:02.000000000 +0200 @@ -63,12 +63,6 @@ AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF #AC_CHECK_FUNCS([dup2 gethostname isascii iswprint memset munmap regcomp select setlocale strcasecmp strchr strdup strerror strndup strrchr strtol strtoul strtoull utime wcwidth]) -# Not all compilers include /usr/local in the include and link path -if test -d /usr/local/include; then - CFLAGS="$CFLAGS -I/usr/local/include" - LDFLAGS="$LDFLAGS -L/usr/local/lib" -fi - # This is used by disktools AC_CHECK_HEADERS([linux/hdreg.h], [AC_CHECK_TYPE(ide_task_request_t, diff -up sleuthkit-2.52/tools/srchtools/Makefile.am.rpath sleuthkit-2.52/tools/srchtools/Makefile.am --- sleuthkit-2.52/tools/srchtools/Makefile.am.rpath 2008-03-24 22:44:13.000000000 +0100 +++ sleuthkit-2.52/tools/srchtools/Makefile.am 2008-06-17 11:34:22.000000000 +0200 @@ -3,10 +3,11 @@ EXTRA_DIST = .indent.pro AM_CPPFLAGS = -I../.. -Wall srch_strings_SOURCES = srch_strings.c +srch_strings_LDADD = sigfind_SOURCES = sigfind.cpp sigfind_LDADD = ../../tsk/libtsk.la -sigfind_LDFLAGS = -static + indent: indent *.c *.cpp diff -up sleuthkit-2.52/tools/imgtools/Makefile.am.rpath sleuthkit-2.52/tools/imgtools/Makefile.am --- sleuthkit-2.52/tools/imgtools/Makefile.am.rpath 2008-03-24 22:29:58.000000000 +0100 +++ sleuthkit-2.52/tools/imgtools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro bin_PROGRAMS = img_cat img_stat diff -up sleuthkit-2.52/tools/fstools/Makefile.am.rpath sleuthkit-2.52/tools/fstools/Makefile.am --- sleuthkit-2.52/tools/fstools/Makefile.am.rpath 2008-03-24 22:29:33.000000000 +0100 +++ sleuthkit-2.52/tools/fstools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro fscheck.cpp bin_PROGRAMS = dcalc dcat dls dstat ffind fls fsstat icat ifind ils \ diff -up sleuthkit-2.52/tools/vstools/Makefile.am.rpath sleuthkit-2.52/tools/vstools/Makefile.am --- sleuthkit-2.52/tools/vstools/Makefile.am.rpath 2008-03-24 22:31:06.000000000 +0100 +++ sleuthkit-2.52/tools/vstools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro bin_PROGRAMS = mmls mmstat diff -up sleuthkit-2.52/tools/hashtools/Makefile.am.rpath sleuthkit-2.52/tools/hashtools/Makefile.am --- sleuthkit-2.52/tools/hashtools/Makefile.am.rpath 2008-03-24 22:29:50.000000000 +0100 +++ sleuthkit-2.52/tools/hashtools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro md5.c sha1.c bin_PROGRAMS = hfind diff -up sleuthkit-2.52/tools/disktools/Makefile.am.rpath sleuthkit-2.52/tools/disktools/Makefile.am --- sleuthkit-2.52/tools/disktools/Makefile.am.rpath 2008-03-24 22:28:49.000000000 +0100 +++ sleuthkit-2.52/tools/disktools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro bin_PROGRAMS = disk_stat disk_sreset --- NEW FILE sleuthkit.spec --- # Could be part of http://fedoraproject.org/wiki/LukeMacken/SecurityLiveCD Name: sleuthkit Version: 2.52 Release: 1%{?dist} Summary: The Sleuth Kit (TSK) Group: Applications/System License: CPL and IBM and GPLv2+ URL: http://www.sleuthkit.org Source0: http://downloads.sourceforge.net/sleuthkit/sleuthkit-%{version}.tar.gz Patch0: sleuthkit-2.52-remove_rpath.patch Patch2: sleuthkit-2.51-system_perl.patch Patch3: sleuthkit-2.52-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool # afflib - BSD with advertising, GPL incompatible BuildRequires: afflib-devel # libewf - Newer versions are plain BSD (older are BSD with advertising) BuildRequires: libewf-devel Requires: %{name}-libs = %{version}-%{release} Requires: file Requires: mac-robber %description The Sleuth Kit (TSK) is a collection of UNIX-based command line tools that allow you to investigate a computer. The current focus of the tools is the file and volume systems and TSK supports FAT, Ext2/3, NTFS, UFS, and ISO 9660 file systems %package libs Summary: Library for %{name} Group: System Environment/Libraries %description libs The %{name}-libs package contains library for %{name}. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .rpath %patch2 -p1 -b .system_perl %patch3 -p1 -b .pkgconfig # re-run autotools libtoolize --force aclocal autoheader autoconf automake %build %configure --disable-static # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES.txt README.txt TODO.txt licenses/* %doc docs/nsrl.txt docs/other.txt docs/skins*.txt docs/ref*.txt # License is CPL 1.0 exept for some files. %{_bindir}/dcalc %{_bindir}/dcat %{_bindir}/disk_sreset %{_bindir}/disk_stat %{_bindir}/dls %{_bindir}/dstat %{_bindir}/ffind %{_bindir}/fls %{_bindir}/fsstat %{_bindir}/hfind %{_bindir}/icat %{_bindir}/ifind %{_bindir}/ils %{_bindir}/img_cat %{_bindir}/img_stat %{_bindir}/istat %{_bindir}/jcat %{_bindir}/jls # This file is described as GPL in the doc # But the license remains CPL in the source. %{_bindir}/mactime ## %{_bindir}/mmls %{_bindir}/mmstat %{_bindir}/sigfind %{_bindir}/sorter ## This file is GPLv2+ %{_bindir}/srch_strings # %{_mandir}/man1/dcalc.1* %{_mandir}/man1/dcat.1* %{_mandir}/man1/disk_sreset.1* %{_mandir}/man1/disk_stat.1* %{_mandir}/man1/dls.1* %{_mandir}/man1/dstat.1* %{_mandir}/man1/ffind.1* %{_mandir}/man1/fls.1* %{_mandir}/man1/fsstat.1* %{_mandir}/man1/hfind.1* %{_mandir}/man1/icat.1* %{_mandir}/man1/ifind.1* %{_mandir}/man1/ils.1* %{_mandir}/man1/img_cat.1* %{_mandir}/man1/img_stat.1* %{_mandir}/man1/istat.1* %{_mandir}/man1/jcat.1* %{_mandir}/man1/jls.1* %{_mandir}/man1/mactime.1* %{_mandir}/man1/mmls.1* %{_mandir}/man1/mmstat.1* %{_mandir}/man1/sigfind.1* %{_mandir}/man1/sorter.1* %dir %{_datadir}/tsk %{_datadir}/tsk/sorter/ %files libs %defattr(-,root,root,-) # CPL and IBM %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc docs/library-api.txt # CPL and IBM %{_includedir}/tsk/ %{_libdir}/*.so %changelog * Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 2.52-1 - Update to 2.52 - Remove merged patches - Remove clean unused-direct-shlib-dependencies - Fix rpath at source. - Sort license within the spec - Move configure.ac to pkg-config detection - Remove Perl-Date-Manip installation * Tue Mar 18 2008 kwizart < kwizart at gmail.com > - 2.51-1 - Update to 2.51 - Add libewf/afflib BR - Requires mac-robber external package. - Remove internal perl-Date-Manip. * Fri Dec 28 2007 kwizart < kwizart at gmail.com > - 2.10-1 - Update to 2.10 * Mon Oct 29 2007 kwizart < kwizart at gmail.com > - 2.09-1 - Initial package for Fedora (inspired from Oden Eriksson mdk spec). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sleuthkit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 19:40:57 -0000 1.1 +++ .cvsignore 4 Jul 2008 23:52:04 -0000 1.2 @@ -0,0 +1 @@ +sleuthkit-2.52.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sleuthkit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:40:57 -0000 1.1 +++ sources 4 Jul 2008 23:52:04 -0000 1.2 @@ -0,0 +1 @@ +3f93bc77901ef40b8b3f2a7e482214a5 sleuthkit-2.52.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 00:14:02 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sat, 5 Jul 2008 00:14:02 GMT Subject: rpms/kernel/F-9 linux-2.6-usb-storage-nikond80-quirk.patch,1.2,1.3 Message-ID: <200807050014.m650E2RZ004097@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3905 Modified Files: linux-2.6-usb-storage-nikond80-quirk.patch Log Message: argh, patched the d80 instead of the d40 entry linux-2.6-usb-storage-nikond80-quirk.patch: Index: linux-2.6-usb-storage-nikond80-quirk.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-usb-storage-nikond80-quirk.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-usb-storage-nikond80-quirk.patch 4 Jul 2008 20:01:01 -0000 1.2 +++ linux-2.6-usb-storage-nikond80-quirk.patch 5 Jul 2008 00:13:14 -0000 1.3 @@ -7,15 +7,15 @@ Signed-off-by: Dave Jones diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h -index 39a7c11..1a497e9 100644 +index 39a7c11..8a2be80 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h -@@ -358,7 +358,7 @@ UNUSUAL_DEV( 0x04b0, 0x040f, 0x0100, 0x0200, +@@ -365,7 +365,7 @@ UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0110, US_FL_FIX_CAPACITY), - /* Reported by Emil Larsson */ --UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0110, -+UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0111, + /* Reported by Ortwin Glueck */ +-UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0110, ++UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0111, "NIKON", - "NIKON DSC D80", + "NIKON DSC D40", US_SC_DEVICE, US_PR_DEVICE, NULL, From fedora-extras-commits at redhat.com Sat Jul 5 00:14:09 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 5 Jul 2008 00:14:09 GMT Subject: rpms/vala/F-8 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vala.spec, 1.23, 1.24 Message-ID: <200807050014.m650E9vN004120@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3749/F-8 Modified Files: .cvsignore sources vala.spec Log Message: Push vala-0.3.4 to stable repositories Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-8/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 4 Jun 2008 19:40:47 -0000 1.12 +++ .cvsignore 5 Jul 2008 00:13:16 -0000 1.13 @@ -1 +1 @@ -vala-0.3.3.tar.bz2 +vala-0.3.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Jun 2008 19:40:47 -0000 1.12 +++ sources 5 Jul 2008 00:13:16 -0000 1.13 @@ -1 +1 @@ -b0bdf06ac68d930ea754209505e13d9b vala-0.3.3.tar.bz2 +8b44e6bd6064e0858dc399d61200691c vala-0.3.4.tar.bz2 Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-8/vala.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- vala.spec 4 Jun 2008 19:40:47 -0000 1.23 +++ vala.spec 5 Jul 2008 00:13:16 -0000 1.24 @@ -1,5 +1,5 @@ Name: vala -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: A modern programming language for GNOME @@ -134,6 +134,9 @@ %changelog +* Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 +- Update to 0.3.4 + * Wed Jun 4 2008 Michel Alexandre Salim - 0.3.3-1 - Update to 0.3.3 From fedora-extras-commits at redhat.com Sat Jul 5 00:14:16 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 5 Jul 2008 00:14:16 GMT Subject: rpms/vala/EL-5 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 vala.spec, 1.16, 1.17 Message-ID: <200807050014.m650EGjS004143@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3749/EL-5 Modified Files: .cvsignore sources vala.spec Log Message: Push vala-0.3.4 to stable repositories Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vala/EL-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 4 Jun 2008 19:40:02 -0000 1.13 +++ .cvsignore 5 Jul 2008 00:12:57 -0000 1.14 @@ -1 +1 @@ -vala-0.3.3.tar.bz2 +vala-0.3.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vala/EL-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 4 Jun 2008 19:40:02 -0000 1.13 +++ sources 5 Jul 2008 00:12:57 -0000 1.14 @@ -1 +1 @@ -b0bdf06ac68d930ea754209505e13d9b vala-0.3.3.tar.bz2 +8b44e6bd6064e0858dc399d61200691c vala-0.3.4.tar.bz2 Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/EL-5/vala.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- vala.spec 4 Jun 2008 19:40:02 -0000 1.16 +++ vala.spec 5 Jul 2008 00:12:57 -0000 1.17 @@ -1,5 +1,5 @@ Name: vala -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: A modern programming language for GNOME @@ -134,6 +134,9 @@ %changelog +* Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 +- Update to 0.3.4 + * Wed Jun 4 2008 Michel Alexandre Salim - 0.3.3-1 - Update to 0.3.3 From fedora-extras-commits at redhat.com Sat Jul 5 00:14:33 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 5 Jul 2008 00:14:33 GMT Subject: rpms/vala/F-9 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 vala.spec, 1.27, 1.28 Message-ID: <200807050014.m650EXZ9004199@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3749/F-9 Modified Files: .cvsignore sources vala.spec Log Message: Push vala-0.3.4 to stable repositories Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-9/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 4 Jun 2008 19:41:56 -0000 1.13 +++ .cvsignore 5 Jul 2008 00:13:39 -0000 1.14 @@ -1 +1 @@ -vala-0.3.3.tar.bz2 +vala-0.3.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 4 Jun 2008 19:41:56 -0000 1.13 +++ sources 5 Jul 2008 00:13:39 -0000 1.14 @@ -1 +1 @@ -b0bdf06ac68d930ea754209505e13d9b vala-0.3.3.tar.bz2 +8b44e6bd6064e0858dc399d61200691c vala-0.3.4.tar.bz2 Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-9/vala.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- vala.spec 4 Jun 2008 19:41:56 -0000 1.27 +++ vala.spec 5 Jul 2008 00:13:39 -0000 1.28 @@ -1,5 +1,5 @@ Name: vala -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: A modern programming language for GNOME @@ -134,6 +134,9 @@ %changelog +* Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 +- Update to 0.3.4 + * Wed Jun 4 2008 Michel Alexandre Salim - 0.3.3-1 - Update to 0.3.3 From fedora-extras-commits at redhat.com Sat Jul 5 03:31:31 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 5 Jul 2008 03:31:31 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.39, 1.40 cairo-dock.spec, 1.49, 1.50 sources, 1.39, 1.40 Message-ID: <200807050331.m653VVwD012709@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12583 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Sat Jul 5 2008 Mamoru Tasaka - rev. 1172 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 3 Jul 2008 03:01:32 -0000 1.39 +++ .cvsignore 5 Jul 2008 03:30:45 -0000 1.40 @@ -1 +1 @@ -cairo-dock-sources-svn1167_trunk.tar.bz2 +cairo-dock-sources-svn1172_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- cairo-dock.spec 3 Jul 2008 03:25:49 -0000 1.49 +++ cairo-dock.spec 5 Jul 2008 03:30:45 -0000 1.50 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1167_trunk +%define tarballver svn1172_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -163,12 +163,6 @@ # which is GPLv3+, which makes license conflict. # -# Temporary fix -## Remove problematic translation -%{__sed} -i.pofile -e 's|it||' \ - rhythmbox/po/LINGUAS \ - switcher/po/LINGUAS - # permission %{__chmod} 0644 Applets.stable find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 @@ -496,8 +490,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Thu Jul 3 2008 Mamoru Tasaka -- rev. 1167 +* Sat Jul 5 2008 Mamoru Tasaka +- rev. 1172 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 3 Jul 2008 03:01:32 -0000 1.39 +++ sources 5 Jul 2008 03:30:45 -0000 1.40 @@ -1 +1 @@ -57401e5c2bf6674dbca247187067c6c5 cairo-dock-sources-svn1167_trunk.tar.bz2 +c9d4913e026b259a62ae3507ef8a54a2 cairo-dock-sources-svn1172_trunk.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 04:47:51 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 5 Jul 2008 04:47:51 GMT Subject: rpms/cairo-dock/devel cairo-dock.spec,1.50,1.51 Message-ID: <200807050447.m654lpUu028311@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28113 Modified Files: cairo-dock.spec Log Message: Header file location fix Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- cairo-dock.spec 5 Jul 2008 03:30:45 -0000 1.50 +++ cairo-dock.spec 5 Jul 2008 04:47:09 -0000 1.51 @@ -183,6 +183,12 @@ -e 's|xulrunner-gtkmozembed|mozilla-gtkmozembed|' \ %endif configure.ac + +## NEED INVESTIGATING +sed -i.dir \ + -e 's|docshell/nsIScrollable.h|nsIScrollable.h|' \ + src/applet-widget-itf.cpp + cd .. %else %{__rm} -rf weblets/ From fedora-extras-commits at redhat.com Sat Jul 5 06:07:42 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 5 Jul 2008 06:07:42 GMT Subject: rpms/mm3d/devel mm3d-1.3.6-sighandler.patch, NONE, 1.1 mm3d-1.3.7-autoconf.patch, NONE, 1.1 mm3d-ad3dsfilter-make.patch, NONE, 1.1 mm3d-imtex-gcc43.patch, NONE, 1.1 mm3d-imtex-make.patch, NONE, 1.1 mm3d.desktop, NONE, 1.1 mm3d.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807050607.m6567g6b016751@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mm3d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16595 Modified Files: .cvsignore sources Added Files: mm3d-1.3.6-sighandler.patch mm3d-1.3.7-autoconf.patch mm3d-ad3dsfilter-make.patch mm3d-imtex-gcc43.patch mm3d-imtex-make.patch mm3d.desktop mm3d.spec Log Message: initial import mm3d-1.3.6-sighandler.patch: --- NEW FILE mm3d-1.3.6-sighandler.patch --- Index: src/3dm.cc =================================================================== --- src/3dm.cc (revision 231) +++ src/3dm.cc (working copy) @@ -43,6 +43,7 @@ #include "transimp.h" +#if 0 #include void segfault_handler( int sig ) @@ -50,6 +51,7 @@ fprintf( stderr, "Segfault. Exiting...\n" ); exit( 0 ); } +#endif int free_memory() { @@ -62,7 +64,9 @@ log_profile_init( "profile_data.txt" ); +#if 0 signal( SIGSEGV, segfault_handler ); +#endif init_sysconf(); transimp_install_translator(); mm3d-1.3.7-autoconf.patch: --- NEW FILE mm3d-1.3.7-autoconf.patch --- >From 01515d4e0849c5be4425584cdd2a7d0c3e33310a Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Wed, 2 Jul 2008 08:52:01 +0200 Subject: [PATCH] make autoconf happy diff --git a/acinclude.m4 b/acinclude.m4 index 5ee3a82..1aa53bf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1080,7 +1080,7 @@ EOF ]) DLOPEN_LIBS="$ksw_cv_DLOPEN_LIBS" have_dlopen="$ksw_cv_have_dlopen" - AC_SUBST( DLOPEN_LIBS ) + AC_SUBST(DLOPEN_LIBS) if test x"$have_dlopen" = "xyes"; then AC_DEFINE( [HAVE_DLOPEN], [], [Define when you have dlopen function] ) fi -- 1.5.4.1 mm3d-ad3dsfilter-make.patch: --- NEW FILE mm3d-ad3dsfilter-make.patch --- --- plugins/ad3dsfilter/Makefile.orig 2008-02-16 10:48:40.000000000 +0100 +++ plugins/ad3dsfilter/Makefile 2008-02-16 10:52:34.000000000 +0100 @@ -2,28 +2,20 @@ ad3dsfilter.so \ LFLAGS = -g -Wall -CFLAGS = -g -Wall -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -Ilib3ds -DPLUGIN +CPPFLAGS = -fPIC -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN # Mac OS X flags. Uncomment the following line to compile on Mac OS X #LFLAGS = -g -Wall -undefined suppress -bundle -flat_namespace -all: lib3ds_lib ${PLUGINS} +all: ${PLUGINS} -lib3ds_lib: lib3ds/Makefile - make -C lib3ds all - -lib3ds/Makefile: lib3ds/configure.in - cd lib3ds && ./configure && cd .. - %.o: %.cc - g++ ${CFLAGS} -c $< + g++ ${CPPFLAGS} ${CXXFLAGS} -c $< %.so: %.o - g++ ${LFLAGS} -shared -o $*.so $< lib3ds/lib3ds/lib3ds.a + g++ ${LFLAGS} -shared -o $*.so $< -l3ds distclean: clean - make -C lib3ds distclean clean: rm -rf *.o *.so core core.* - make -C lib3ds clean mm3d-imtex-gcc43.patch: --- NEW FILE mm3d-imtex-gcc43.patch --- --- plugins/imtex/imtex.cc.orig 2008-02-24 13:58:53.000000000 +0100 +++ plugins/imtex/imtex.cc 2008-02-24 13:59:04.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include #include #include mm3d-imtex-make.patch: --- NEW FILE mm3d-imtex-make.patch --- --- plugins/imtex/Makefile.orig 2008-02-16 11:13:07.000000000 +0100 +++ plugins/imtex/Makefile 2008-02-16 11:14:59.000000000 +0100 @@ -1,8 +1,8 @@ PLUGINS = \ imtex.so \ -LFLAGS = -O2 -Wall -lImlib2 -CFLAGS = -O2 -Wall -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN +LFLAGS = -g -Wall +CPPFLAGS = -fPIC -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN # Mac OS X flags. Uncomment the following line to compile on Mac OS X #LFLAGS = -O2 -Wall -lImlib2 -undefined suppress -bundle -flat_namespace @@ -10,10 +10,10 @@ all: ${PLUGINS} %.o: %.cc - g++ ${CFLAGS} -c $< + g++ ${CPPFLAGS} ${CXXFLAGS} -c $< %.so: %.o - g++ ${LFLAGS} -shared -o $*.so $< + g++ ${LFLAGS} -shared -o $*.so $< -lImlib2 clean: rm -rf *.o *.so core core.* --- NEW FILE mm3d.desktop --- [Desktop Entry] Type=Application Exec=mm3d %U Icon=mm3d GenericName=3D Modeler Comment=3D modeling program Terminal=false Name=mm3d MimeType=application/x-mm3d; Categories=Qt;Graphics; X-Desktop-File-Install-Version=0.13 --- NEW FILE mm3d.spec --- %define plugin_3ds_ver 0.8.1 %define plugin_imtex_ver 1.4.0 %define mm3d_plugins ad3dsfilter imtex %define major_version 1.3 Name: mm3d Version: 1.3.7 Release: 2%{?dist} Summary: 3D model editor Group: Applications/Multimedia License: GPLv2+ URL: http://www.misfitcode.com/misfitmodel3d Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source10: http://www.misfitcode.com/misfitmodel3d/download/plugins/ad3dsfilter-%{plugin_3ds_ver}.tar.gz Source11: http://www.misfitcode.com/misfitmodel3d/download/plugins/imtex-%{plugin_imtex_ver}.tar.gz Patch0: mm3d-1.3.6-sighandler.patch Patch1: mm3d-1.3.7-autoconf.patch Patch10: mm3d-ad3dsfilter-make.patch Patch11: mm3d-imtex-make.patch Patch12: mm3d-imtex-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dos2unix libtool qt4-devel libXmu-devel lua-devel perl-HTML-Template BuildRequires: lib3ds-devel imlib2-devel BuildRequires: desktop-file-utils %description Misfit Model 3D is an OpenGL-based 3D model editor that works with triangle-based models. It supports multi-level undo, skeletal animations, simple texturing, scripting, command-line batch processing, and a plugin system for adding new model and image filters. Complete online help is included. It is designed to be easy to use and easy to extend with plugins and scripts. %prep %setup -q -a 10 -a 11 %patch0 -b .sigh %patch1 -p1 -b .autoconf %patch10 -b .ad3ds %patch11 -b .imtex %patch12 -b .gcc43 autoreconf for i in AUTHORS COPYING ChangeLog INSTALL README TODO doc/html/TODO do dos2unix -q --keepdate $i done %build export CPPFLAGS="-DDOC_ROOT=\\\"%{_docdir}/%{name}-%{version}/html\\\" -DSHARED_PLUGINS=\\\"%{_libdir}/%{name}\\\"" %configure --with-lua-dir=%{_usr} --with-lualib-dir=%{_usr} --with-lualib-lib=lua --enable-debug make %{?_smp_mflags} "CFLAGS=$RPM_OPT_FLAGS" "CXXFLAGS=$RPM_OPT_FLAGS" cd plugins for d in %{mm3d_plugins} do pushd $d make "CFLAGS=$RPM_OPT_FLAGS" "CXXFLAGS=$RPM_OPT_FLAGS" popd done %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_datadir}/doc/%{name}-%{version}/html mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/%{major_version} for d in %{mm3d_plugins} do install -p -m 0755 plugins/$d/$d.so $RPM_BUILD_ROOT%{_libdir}/%{name}/%{major_version} done rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} # docs #rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html #rm -f doc/html/Makefile* cp -p AUTHORS COPYING ChangeLog INSTALL README TODO $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} # remove unnecessary qt4 translation rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/qt_*.qm %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null || : %postun update-desktop-database &> /dev/null || : %files %defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}-%{version} #%doc AUTHORS COPYING ChangeLog INSTALL README TODO %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/* %{_datadir}/mimelnk/application/* %{_datadir}/%{name} %{_mandir}/man1/* %changelog * Fri Jun 4 2008 Dan Horak 1.3.7-2 - fix plugin installation directory - change how the docs are installed - fix DocPath in the desktop file - add scriptlets for updating the desktop database * Tue Jun 1 2008 Dan Horak 1.3.7-1 - initial Fedora version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:36:12 -0000 1.1 +++ .cvsignore 5 Jul 2008 06:06:52 -0000 1.2 @@ -0,0 +1,3 @@ +ad3dsfilter-0.8.1.tar.gz +imtex-1.4.0.tar.gz +mm3d-1.3.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:36:12 -0000 1.1 +++ sources 5 Jul 2008 06:06:52 -0000 1.2 @@ -0,0 +1,3 @@ +d0d7be8bd51e912f1ef8bd4e122855d1 ad3dsfilter-0.8.1.tar.gz +4b26d78210d251bc4f9fc392123ea02a imtex-1.4.0.tar.gz +6a5467d03d61a23af1ab51c47109c4d5 mm3d-1.3.7.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 06:10:56 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 5 Jul 2008 06:10:56 GMT Subject: rpms/mm3d/F-9 mm3d-1.3.6-sighandler.patch, NONE, 1.1 mm3d-1.3.7-autoconf.patch, NONE, 1.1 mm3d-ad3dsfilter-make.patch, NONE, 1.1 mm3d-imtex-gcc43.patch, NONE, 1.1 mm3d-imtex-make.patch, NONE, 1.1 mm3d.desktop, NONE, 1.1 mm3d.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807050610.m656AupO017380@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mm3d/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17240 Modified Files: .cvsignore sources Added Files: mm3d-1.3.6-sighandler.patch mm3d-1.3.7-autoconf.patch mm3d-ad3dsfilter-make.patch mm3d-imtex-gcc43.patch mm3d-imtex-make.patch mm3d.desktop mm3d.spec Log Message: initial import mm3d-1.3.6-sighandler.patch: --- NEW FILE mm3d-1.3.6-sighandler.patch --- Index: src/3dm.cc =================================================================== --- src/3dm.cc (revision 231) +++ src/3dm.cc (working copy) @@ -43,6 +43,7 @@ #include "transimp.h" +#if 0 #include void segfault_handler( int sig ) @@ -50,6 +51,7 @@ fprintf( stderr, "Segfault. Exiting...\n" ); exit( 0 ); } +#endif int free_memory() { @@ -62,7 +64,9 @@ log_profile_init( "profile_data.txt" ); +#if 0 signal( SIGSEGV, segfault_handler ); +#endif init_sysconf(); transimp_install_translator(); mm3d-1.3.7-autoconf.patch: --- NEW FILE mm3d-1.3.7-autoconf.patch --- >From 01515d4e0849c5be4425584cdd2a7d0c3e33310a Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Wed, 2 Jul 2008 08:52:01 +0200 Subject: [PATCH] make autoconf happy diff --git a/acinclude.m4 b/acinclude.m4 index 5ee3a82..1aa53bf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1080,7 +1080,7 @@ EOF ]) DLOPEN_LIBS="$ksw_cv_DLOPEN_LIBS" have_dlopen="$ksw_cv_have_dlopen" - AC_SUBST( DLOPEN_LIBS ) + AC_SUBST(DLOPEN_LIBS) if test x"$have_dlopen" = "xyes"; then AC_DEFINE( [HAVE_DLOPEN], [], [Define when you have dlopen function] ) fi -- 1.5.4.1 mm3d-ad3dsfilter-make.patch: --- NEW FILE mm3d-ad3dsfilter-make.patch --- --- plugins/ad3dsfilter/Makefile.orig 2008-02-16 10:48:40.000000000 +0100 +++ plugins/ad3dsfilter/Makefile 2008-02-16 10:52:34.000000000 +0100 @@ -2,28 +2,20 @@ ad3dsfilter.so \ LFLAGS = -g -Wall -CFLAGS = -g -Wall -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -Ilib3ds -DPLUGIN +CPPFLAGS = -fPIC -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN # Mac OS X flags. Uncomment the following line to compile on Mac OS X #LFLAGS = -g -Wall -undefined suppress -bundle -flat_namespace -all: lib3ds_lib ${PLUGINS} +all: ${PLUGINS} -lib3ds_lib: lib3ds/Makefile - make -C lib3ds all - -lib3ds/Makefile: lib3ds/configure.in - cd lib3ds && ./configure && cd .. - %.o: %.cc - g++ ${CFLAGS} -c $< + g++ ${CPPFLAGS} ${CXXFLAGS} -c $< %.so: %.o - g++ ${LFLAGS} -shared -o $*.so $< lib3ds/lib3ds/lib3ds.a + g++ ${LFLAGS} -shared -o $*.so $< -l3ds distclean: clean - make -C lib3ds distclean clean: rm -rf *.o *.so core core.* - make -C lib3ds clean mm3d-imtex-gcc43.patch: --- NEW FILE mm3d-imtex-gcc43.patch --- --- plugins/imtex/imtex.cc.orig 2008-02-24 13:58:53.000000000 +0100 +++ plugins/imtex/imtex.cc 2008-02-24 13:59:04.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include #include #include mm3d-imtex-make.patch: --- NEW FILE mm3d-imtex-make.patch --- --- plugins/imtex/Makefile.orig 2008-02-16 11:13:07.000000000 +0100 +++ plugins/imtex/Makefile 2008-02-16 11:14:59.000000000 +0100 @@ -1,8 +1,8 @@ PLUGINS = \ imtex.so \ -LFLAGS = -O2 -Wall -lImlib2 -CFLAGS = -O2 -Wall -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN +LFLAGS = -g -Wall +CPPFLAGS = -fPIC -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN # Mac OS X flags. Uncomment the following line to compile on Mac OS X #LFLAGS = -O2 -Wall -lImlib2 -undefined suppress -bundle -flat_namespace @@ -10,10 +10,10 @@ all: ${PLUGINS} %.o: %.cc - g++ ${CFLAGS} -c $< + g++ ${CPPFLAGS} ${CXXFLAGS} -c $< %.so: %.o - g++ ${LFLAGS} -shared -o $*.so $< + g++ ${LFLAGS} -shared -o $*.so $< -lImlib2 clean: rm -rf *.o *.so core core.* --- NEW FILE mm3d.desktop --- [Desktop Entry] Type=Application Exec=mm3d %U Icon=mm3d GenericName=3D Modeler Comment=3D modeling program Terminal=false Name=mm3d MimeType=application/x-mm3d; Categories=Qt;Graphics; X-Desktop-File-Install-Version=0.13 --- NEW FILE mm3d.spec --- %define plugin_3ds_ver 0.8.1 %define plugin_imtex_ver 1.4.0 %define mm3d_plugins ad3dsfilter imtex %define major_version 1.3 Name: mm3d Version: 1.3.7 Release: 2%{?dist} Summary: 3D model editor Group: Applications/Multimedia License: GPLv2+ URL: http://www.misfitcode.com/misfitmodel3d Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source10: http://www.misfitcode.com/misfitmodel3d/download/plugins/ad3dsfilter-%{plugin_3ds_ver}.tar.gz Source11: http://www.misfitcode.com/misfitmodel3d/download/plugins/imtex-%{plugin_imtex_ver}.tar.gz Patch0: mm3d-1.3.6-sighandler.patch Patch1: mm3d-1.3.7-autoconf.patch Patch10: mm3d-ad3dsfilter-make.patch Patch11: mm3d-imtex-make.patch Patch12: mm3d-imtex-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dos2unix libtool qt4-devel libXmu-devel lua-devel perl-HTML-Template BuildRequires: lib3ds-devel imlib2-devel BuildRequires: desktop-file-utils %description Misfit Model 3D is an OpenGL-based 3D model editor that works with triangle-based models. It supports multi-level undo, skeletal animations, simple texturing, scripting, command-line batch processing, and a plugin system for adding new model and image filters. Complete online help is included. It is designed to be easy to use and easy to extend with plugins and scripts. %prep %setup -q -a 10 -a 11 %patch0 -b .sigh %patch1 -p1 -b .autoconf %patch10 -b .ad3ds %patch11 -b .imtex %patch12 -b .gcc43 autoreconf for i in AUTHORS COPYING ChangeLog INSTALL README TODO doc/html/TODO do dos2unix -q --keepdate $i done %build export CPPFLAGS="-DDOC_ROOT=\\\"%{_docdir}/%{name}-%{version}/html\\\" -DSHARED_PLUGINS=\\\"%{_libdir}/%{name}\\\"" %configure --with-lua-dir=%{_usr} --with-lualib-dir=%{_usr} --with-lualib-lib=lua --enable-debug make %{?_smp_mflags} "CFLAGS=$RPM_OPT_FLAGS" "CXXFLAGS=$RPM_OPT_FLAGS" cd plugins for d in %{mm3d_plugins} do pushd $d make "CFLAGS=$RPM_OPT_FLAGS" "CXXFLAGS=$RPM_OPT_FLAGS" popd done %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_datadir}/doc/%{name}-%{version}/html mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/%{major_version} for d in %{mm3d_plugins} do install -p -m 0755 plugins/$d/$d.so $RPM_BUILD_ROOT%{_libdir}/%{name}/%{major_version} done rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} # docs #rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html #rm -f doc/html/Makefile* cp -p AUTHORS COPYING ChangeLog INSTALL README TODO $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} # remove unnecessary qt4 translation rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/qt_*.qm %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null || : %postun update-desktop-database &> /dev/null || : %files %defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}-%{version} #%doc AUTHORS COPYING ChangeLog INSTALL README TODO %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/* %{_datadir}/mimelnk/application/* %{_datadir}/%{name} %{_mandir}/man1/* %changelog * Fri Jun 4 2008 Dan Horak 1.3.7-2 - fix plugin installation directory - change how the docs are installed - fix DocPath in the desktop file - add scriptlets for updating the desktop database * Tue Jun 1 2008 Dan Horak 1.3.7-1 - initial Fedora version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:36:12 -0000 1.1 +++ .cvsignore 5 Jul 2008 06:10:11 -0000 1.2 @@ -0,0 +1,3 @@ +ad3dsfilter-0.8.1.tar.gz +imtex-1.4.0.tar.gz +mm3d-1.3.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:36:12 -0000 1.1 +++ sources 5 Jul 2008 06:10:11 -0000 1.2 @@ -0,0 +1,3 @@ +d0d7be8bd51e912f1ef8bd4e122855d1 ad3dsfilter-0.8.1.tar.gz +4b26d78210d251bc4f9fc392123ea02a imtex-1.4.0.tar.gz +6a5467d03d61a23af1ab51c47109c4d5 mm3d-1.3.7.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 06:12:57 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 5 Jul 2008 06:12:57 GMT Subject: rpms/mm3d/F-8 mm3d-1.3.6-sighandler.patch, NONE, 1.1 mm3d-1.3.7-autoconf.patch, NONE, 1.1 mm3d-ad3dsfilter-make.patch, NONE, 1.1 mm3d-imtex-gcc43.patch, NONE, 1.1 mm3d-imtex-make.patch, NONE, 1.1 mm3d.desktop, NONE, 1.1 mm3d.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807050612.m656CvhU017727@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mm3d/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17557 Modified Files: .cvsignore sources Added Files: mm3d-1.3.6-sighandler.patch mm3d-1.3.7-autoconf.patch mm3d-ad3dsfilter-make.patch mm3d-imtex-gcc43.patch mm3d-imtex-make.patch mm3d.desktop mm3d.spec Log Message: initial import mm3d-1.3.6-sighandler.patch: --- NEW FILE mm3d-1.3.6-sighandler.patch --- Index: src/3dm.cc =================================================================== --- src/3dm.cc (revision 231) +++ src/3dm.cc (working copy) @@ -43,6 +43,7 @@ #include "transimp.h" +#if 0 #include void segfault_handler( int sig ) @@ -50,6 +51,7 @@ fprintf( stderr, "Segfault. Exiting...\n" ); exit( 0 ); } +#endif int free_memory() { @@ -62,7 +64,9 @@ log_profile_init( "profile_data.txt" ); +#if 0 signal( SIGSEGV, segfault_handler ); +#endif init_sysconf(); transimp_install_translator(); mm3d-1.3.7-autoconf.patch: --- NEW FILE mm3d-1.3.7-autoconf.patch --- >From 01515d4e0849c5be4425584cdd2a7d0c3e33310a Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Wed, 2 Jul 2008 08:52:01 +0200 Subject: [PATCH] make autoconf happy diff --git a/acinclude.m4 b/acinclude.m4 index 5ee3a82..1aa53bf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1080,7 +1080,7 @@ EOF ]) DLOPEN_LIBS="$ksw_cv_DLOPEN_LIBS" have_dlopen="$ksw_cv_have_dlopen" - AC_SUBST( DLOPEN_LIBS ) + AC_SUBST(DLOPEN_LIBS) if test x"$have_dlopen" = "xyes"; then AC_DEFINE( [HAVE_DLOPEN], [], [Define when you have dlopen function] ) fi -- 1.5.4.1 mm3d-ad3dsfilter-make.patch: --- NEW FILE mm3d-ad3dsfilter-make.patch --- --- plugins/ad3dsfilter/Makefile.orig 2008-02-16 10:48:40.000000000 +0100 +++ plugins/ad3dsfilter/Makefile 2008-02-16 10:52:34.000000000 +0100 @@ -2,28 +2,20 @@ ad3dsfilter.so \ LFLAGS = -g -Wall -CFLAGS = -g -Wall -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -Ilib3ds -DPLUGIN +CPPFLAGS = -fPIC -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN # Mac OS X flags. Uncomment the following line to compile on Mac OS X #LFLAGS = -g -Wall -undefined suppress -bundle -flat_namespace -all: lib3ds_lib ${PLUGINS} +all: ${PLUGINS} -lib3ds_lib: lib3ds/Makefile - make -C lib3ds all - -lib3ds/Makefile: lib3ds/configure.in - cd lib3ds && ./configure && cd .. - %.o: %.cc - g++ ${CFLAGS} -c $< + g++ ${CPPFLAGS} ${CXXFLAGS} -c $< %.so: %.o - g++ ${LFLAGS} -shared -o $*.so $< lib3ds/lib3ds/lib3ds.a + g++ ${LFLAGS} -shared -o $*.so $< -l3ds distclean: clean - make -C lib3ds distclean clean: rm -rf *.o *.so core core.* - make -C lib3ds clean mm3d-imtex-gcc43.patch: --- NEW FILE mm3d-imtex-gcc43.patch --- --- plugins/imtex/imtex.cc.orig 2008-02-24 13:58:53.000000000 +0100 +++ plugins/imtex/imtex.cc 2008-02-24 13:59:04.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include #include #include mm3d-imtex-make.patch: --- NEW FILE mm3d-imtex-make.patch --- --- plugins/imtex/Makefile.orig 2008-02-16 11:13:07.000000000 +0100 +++ plugins/imtex/Makefile 2008-02-16 11:14:59.000000000 +0100 @@ -1,8 +1,8 @@ PLUGINS = \ imtex.so \ -LFLAGS = -O2 -Wall -lImlib2 -CFLAGS = -O2 -Wall -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN +LFLAGS = -g -Wall +CPPFLAGS = -fPIC -DMM3D_EDIT -I../../src -I../../src/libmm3d -I../../src/mm3dcore -I../.. -DPLUGIN # Mac OS X flags. Uncomment the following line to compile on Mac OS X #LFLAGS = -O2 -Wall -lImlib2 -undefined suppress -bundle -flat_namespace @@ -10,10 +10,10 @@ all: ${PLUGINS} %.o: %.cc - g++ ${CFLAGS} -c $< + g++ ${CPPFLAGS} ${CXXFLAGS} -c $< %.so: %.o - g++ ${LFLAGS} -shared -o $*.so $< + g++ ${LFLAGS} -shared -o $*.so $< -lImlib2 clean: rm -rf *.o *.so core core.* --- NEW FILE mm3d.desktop --- [Desktop Entry] Type=Application Exec=mm3d %U Icon=mm3d GenericName=3D Modeler Comment=3D modeling program Terminal=false Name=mm3d MimeType=application/x-mm3d; Categories=Qt;Graphics; X-Desktop-File-Install-Version=0.13 --- NEW FILE mm3d.spec --- %define plugin_3ds_ver 0.8.1 %define plugin_imtex_ver 1.4.0 %define mm3d_plugins ad3dsfilter imtex %define major_version 1.3 Name: mm3d Version: 1.3.7 Release: 2%{?dist} Summary: 3D model editor Group: Applications/Multimedia License: GPLv2+ URL: http://www.misfitcode.com/misfitmodel3d Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source10: http://www.misfitcode.com/misfitmodel3d/download/plugins/ad3dsfilter-%{plugin_3ds_ver}.tar.gz Source11: http://www.misfitcode.com/misfitmodel3d/download/plugins/imtex-%{plugin_imtex_ver}.tar.gz Patch0: mm3d-1.3.6-sighandler.patch Patch1: mm3d-1.3.7-autoconf.patch Patch10: mm3d-ad3dsfilter-make.patch Patch11: mm3d-imtex-make.patch Patch12: mm3d-imtex-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dos2unix libtool qt4-devel libXmu-devel lua-devel perl-HTML-Template BuildRequires: lib3ds-devel imlib2-devel BuildRequires: desktop-file-utils %description Misfit Model 3D is an OpenGL-based 3D model editor that works with triangle-based models. It supports multi-level undo, skeletal animations, simple texturing, scripting, command-line batch processing, and a plugin system for adding new model and image filters. Complete online help is included. It is designed to be easy to use and easy to extend with plugins and scripts. %prep %setup -q -a 10 -a 11 %patch0 -b .sigh %patch1 -p1 -b .autoconf %patch10 -b .ad3ds %patch11 -b .imtex %patch12 -b .gcc43 autoreconf for i in AUTHORS COPYING ChangeLog INSTALL README TODO doc/html/TODO do dos2unix -q --keepdate $i done %build export CPPFLAGS="-DDOC_ROOT=\\\"%{_docdir}/%{name}-%{version}/html\\\" -DSHARED_PLUGINS=\\\"%{_libdir}/%{name}\\\"" %configure --with-lua-dir=%{_usr} --with-lualib-dir=%{_usr} --with-lualib-lib=lua --enable-debug make %{?_smp_mflags} "CFLAGS=$RPM_OPT_FLAGS" "CXXFLAGS=$RPM_OPT_FLAGS" cd plugins for d in %{mm3d_plugins} do pushd $d make "CFLAGS=$RPM_OPT_FLAGS" "CXXFLAGS=$RPM_OPT_FLAGS" popd done %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_datadir}/doc/%{name}-%{version}/html mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/%{major_version} for d in %{mm3d_plugins} do install -p -m 0755 plugins/$d/$d.so $RPM_BUILD_ROOT%{_libdir}/%{name}/%{major_version} done rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} # docs #rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/html #rm -f doc/html/Makefile* cp -p AUTHORS COPYING ChangeLog INSTALL README TODO $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} # remove unnecessary qt4 translation rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/qt_*.qm %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null || : %postun update-desktop-database &> /dev/null || : %files %defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}-%{version} #%doc AUTHORS COPYING ChangeLog INSTALL README TODO %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/* %{_datadir}/mimelnk/application/* %{_datadir}/%{name} %{_mandir}/man1/* %changelog * Fri Jun 4 2008 Dan Horak 1.3.7-2 - fix plugin installation directory - change how the docs are installed - fix DocPath in the desktop file - add scriptlets for updating the desktop database * Tue Jun 1 2008 Dan Horak 1.3.7-1 - initial Fedora version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:36:12 -0000 1.1 +++ .cvsignore 5 Jul 2008 06:12:14 -0000 1.2 @@ -0,0 +1,3 @@ +ad3dsfilter-0.8.1.tar.gz +imtex-1.4.0.tar.gz +mm3d-1.3.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:36:12 -0000 1.1 +++ sources 5 Jul 2008 06:12:14 -0000 1.2 @@ -0,0 +1,3 @@ +d0d7be8bd51e912f1ef8bd4e122855d1 ad3dsfilter-0.8.1.tar.gz +4b26d78210d251bc4f9fc392123ea02a imtex-1.4.0.tar.gz +6a5467d03d61a23af1ab51c47109c4d5 mm3d-1.3.7.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 10:17:46 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 5 Jul 2008 10:17:46 GMT Subject: rpms/icu/devel .cvsignore, 1.12, 1.13 icu.spec, 1.77, 1.78 sources, 1.12, 1.13 Message-ID: <200807051017.m65AHkt6000499@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/icu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv383 Modified Files: .cvsignore icu.spec sources Log Message: final release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/icu/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 30 Jun 2008 08:56:32 -0000 1.12 +++ .cvsignore 5 Jul 2008 10:16:52 -0000 1.13 @@ -1 +1 @@ -icu4c-4_0_d03-src.tgz +icu4c-4_0-src.tgz Index: icu.spec =================================================================== RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- icu.spec 30 Jun 2008 08:58:03 -0000 1.77 +++ icu.spec 5 Jul 2008 10:16:52 -0000 1.78 @@ -1,11 +1,11 @@ Name: icu Version: 4.0 -Release: 0.3.d03%{?dist} +Release: 1%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT URL: http://www.icu-project.org/ -Source0: http://download.icu-project.org/files/icu4c/4.0/icu4c-4_0_d03-src.tgz +Source0: http://download.icu-project.org/files/icu4c/4.0/icu4c-4_0-src.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, autoconf @@ -140,6 +140,9 @@ %doc source/__docs/%{name}/html/* %changelog +* Sat Jul 05 2008 Caolan McNamara - 4.0-1 +- final release + * Mon Jun 30 2008 Caolan McNamara - 4.0-0.3.d03 - 4.0 release candidate Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/icu/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Jun 2008 08:56:32 -0000 1.12 +++ sources 5 Jul 2008 10:16:52 -0000 1.13 @@ -1 +1 @@ -411f01f45f2edc57dafc097c00752ffa icu4c-4_0_d03-src.tgz +d1a5da2f778da6680ca2de47e1cb9141 icu4c-4_0-src.tgz From fedora-extras-commits at redhat.com Sat Jul 5 10:50:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Sat, 5 Jul 2008 10:50:44 GMT Subject: rpms/gbrainy/devel gbrainy.spec,1.3,1.4 Message-ID: <200807051050.m65Aoiuf003567@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/gbrainy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3419 Modified Files: gbrainy.spec Log Message: Rebuild with gnome-sharp-2.20 .pc fix Index: gbrainy.spec =================================================================== RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gbrainy.spec 4 Jul 2008 11:20:27 -0000 1.3 +++ gbrainy.spec 5 Jul 2008 10:49:55 -0000 1.4 @@ -1,6 +1,6 @@ Name: gbrainy Version: 0.70 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Gbrainy is a brain teaser game and trainer to keep your brain trained Group: Amusements/Games @@ -73,6 +73,9 @@ %{_datadir}/pixmaps/%{name}* %changelog +* Sat Jul 05 2008 Beno??t Marcelin 0.70-3 +- Rebuild with gnome-sharp-2.20 .pc fix + * Fri Jul 04 2008 Beno??t Marcelin 0.70-2 - Rebuild for new gnome-sharp From fedora-extras-commits at redhat.com Sat Jul 5 11:39:43 2008 From: fedora-extras-commits at redhat.com (Balint Cristian (rezso)) Date: Sat, 5 Jul 2008 11:39:43 GMT Subject: rpms/mapserver/devel import.log,1.1,1.2 mapserver.spec,1.11,1.12 Message-ID: <200807051139.m65Bdh5W013849@cvs-int.fedora.redhat.com> Author: rezso Update of /cvs/pkgs/rpms/mapserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13774/devel Modified Files: import.log mapserver.spec Log Message: address bz#453925 ---------------------------------------------------------------------- Modified Files: devel/import.log devel/mapserver.spec ---------------------------------------------------------------------- Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Jun 2008 17:20:20 -0000 1.1 +++ import.log 5 Jul 2008 11:38:50 -0000 1.2 @@ -1 +1,2 @@ mapserver-5_0_3-1_fc9:HEAD:mapserver-5.0.3-1.fc9.src.rpm:1213290328 +mapserver-5_0_3-3_fc9:HEAD:mapserver-5.0.3-3.fc9.src.rpm:1215257843 Index: mapserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mapserver.spec 25 Jun 2008 23:03:45 -0000 1.11 +++ mapserver.spec 5 Jul 2008 11:38:50 -0000 1.12 @@ -1,6 +1,6 @@ Name: mapserver Version: 5.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Environment for building spatially-enabled internet applications Group: Development/Tools License: BSD @@ -41,6 +41,7 @@ Summary: Perl/Mapscript map making extensions to Perl Group: Development/Languages Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl The Perl/Mapscript extension provides full map customization capabilities @@ -226,6 +227,9 @@ %{_javadir}/*.jar %changelog +* Thu Jul 05 2008 Balint Cristian 5.0.3-3 +- address bz#453925 + * Thu Jun 26 2008 Devrim GUNDUZ - 5.0.3-2 - Rebuilt against Geos 3.0.0 From fedora-extras-commits at redhat.com Sat Jul 5 11:42:57 2008 From: fedora-extras-commits at redhat.com (Balint Cristian (rezso)) Date: Sat, 5 Jul 2008 11:42:57 GMT Subject: rpms/mapserver/F-9 import.log,1.1,1.2 mapserver.spec,1.10,1.11 Message-ID: <200807051142.m65Bgvp1014225@cvs-int.fedora.redhat.com> Author: rezso Update of /cvs/pkgs/rpms/mapserver/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14066/F-9 Modified Files: import.log mapserver.spec Log Message: address bz#453925 ---------------------------------------------------------------------- Modified Files: F-9/import.log F-9/mapserver.spec ---------------------------------------------------------------------- Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Jun 2008 17:23:06 -0000 1.1 +++ import.log 5 Jul 2008 11:41:59 -0000 1.2 @@ -1 +1,2 @@ mapserver-5_0_3-1_fc9:F-9:mapserver-5.0.3-1.fc9.src.rpm:1213290519 +mapserver-5_0_3-3_fc9:F-9:mapserver-5.0.3-3.fc9.src.rpm:1215258044 Index: mapserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/F-9/mapserver.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mapserver.spec 12 Jun 2008 17:23:06 -0000 1.10 +++ mapserver.spec 5 Jul 2008 11:41:59 -0000 1.11 @@ -1,6 +1,6 @@ Name: mapserver Version: 5.0.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Environment for building spatially-enabled internet applications Group: Development/Tools License: BSD @@ -41,6 +41,7 @@ Summary: Perl/Mapscript map making extensions to Perl Group: Development/Languages Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl The Perl/Mapscript extension provides full map customization capabilities @@ -226,6 +227,12 @@ %{_javadir}/*.jar %changelog +* Thu Jul 05 2008 Balint Cristian 5.0.3-3 +- address bz#453925 + +* Thu Jun 26 2008 Devrim GUNDUZ - 5.0.3-2 +- Rebuilt against Geos 3.0.0 + * Thu Jun 12 2008 Balint Cristian 5.0.3-1 - update to 5.0.3 bugfix release - fix some rpmlint warnings From fedora-extras-commits at redhat.com Sat Jul 5 12:08:27 2008 From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak)) Date: Sat, 5 Jul 2008 12:08:27 GMT Subject: rpms/asunder/devel .cvsignore, 1.5, 1.6 asunder.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807051208.m65C8Rdo022693@cvs-int.fedora.redhat.com> Author: szpak Update of /cvs/pkgs/rpms/asunder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22336 Modified Files: .cvsignore asunder.spec sources Log Message: Updated to 1.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/asunder/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 May 2008 19:12:58 -0000 1.5 +++ .cvsignore 5 Jul 2008 12:07:20 -0000 1.6 @@ -1 +1 @@ -asunder-1.5.tar.bz2 +asunder-1.6.tar.bz2 Index: asunder.spec =================================================================== RCS file: /cvs/pkgs/rpms/asunder/devel/asunder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- asunder.spec 7 May 2008 19:12:58 -0000 1.4 +++ asunder.spec 5 Jul 2008 12:07:20 -0000 1.5 @@ -1,6 +1,6 @@ Name: asunder Summary: A graphical Audio CD ripper and encoder -Version: 1.5 +Version: 1.6 Release: 1%{?dist} License: GPLv2 Group: Applications/File @@ -9,7 +9,8 @@ #Packager: Marcin Zajaczkowski Source0: http://littlesvr.ca/asunder/releases/asunder-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libcddb +#libcddb is forced by libcddb-devel and proper .so +#Requires: libcddb Requires: cdparanoia #recommended runtime dependencies Requires: vorbis-tools @@ -25,7 +26,8 @@ BuildRequires: gettext %description -It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC and/or Wavpack. +It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC +and/or Wavpack. %prep %setup -q @@ -62,6 +64,11 @@ #%{_mandir}/man1/asunder.1* %changelog +* Tue Jul 1 2008 Marcin Zajaczkowski - 1.6-1 +- updated to 1.6 +- removed explicit libcddb dependency +- broken too long desciption line + * Sun May 4 2008 Marcin Zajaczkowski - 1.5-1 - updated to 1.5 - added (commented for now) wavpack dependency Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asunder/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 May 2008 19:12:58 -0000 1.5 +++ sources 5 Jul 2008 12:07:20 -0000 1.6 @@ -1 +1 @@ -253efecd76bc019ab8a70352b368671f asunder-1.5.tar.bz2 +4b54bd62ad5743094715482a0d4812e4 asunder-1.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 12:09:35 2008 From: fedora-extras-commits at redhat.com (Balint Cristian (rezso)) Date: Sat, 5 Jul 2008 12:09:35 GMT Subject: rpms/grass/devel import.log,NONE,1.1 grass.spec,1.17,1.18 Message-ID: <200807051209.m65C9Z9q022878@cvs-int.fedora.redhat.com> Author: rezso Update of /cvs/pkgs/rpms/grass/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22690/devel Modified Files: grass.spec Added Files: import.log Log Message: - address bz#454146 (wxPython miss) ---------------------------------------------------------------------- Modified Files: devel/grass.spec ---------------------------------------------------------------------- --- NEW FILE import.log --- grass-6_3_0-5_fc9:HEAD:grass-6.3.0-5.fc9.src.rpm:1215259611 Index: grass.spec =================================================================== RCS file: /cvs/pkgs/rpms/grass/devel/grass.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- grass.spec 12 Jun 2008 18:53:56 -0000 1.17 +++ grass.spec 5 Jul 2008 12:08:34 -0000 1.18 @@ -1,6 +1,6 @@ Name: grass Version: 6.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GRASS - Geographic Resources Analysis Support System Group: Applications/Engineering License: GPLv2 @@ -12,7 +12,7 @@ Patch1: grass-shlib-soname.patch Patch2: grass-gdilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: proj-nad proj-epsg +Requires: proj-nad proj-epsg wxPython BuildRequires: gettext BuildRequires: python-devel @@ -321,6 +321,9 @@ %{_libdir}/libgrass_*.so %changelog +* Sat Jul 05 2008 Balint Cristian 6.3.0-5 +- address bz#454146 (wxPython miss) + * Thu Jun 12 2008 Balint Cristian 6.3.0-4 - address bz#341391 (multilib issue) From fedora-extras-commits at redhat.com Sat Jul 5 12:12:05 2008 From: fedora-extras-commits at redhat.com (Balint Cristian (rezso)) Date: Sat, 5 Jul 2008 12:12:05 GMT Subject: rpms/grass/F-9 import.log,1.1,NONE Message-ID: <200807051212.m65CC55X023196@cvs-int.fedora.redhat.com> Author: rezso Update of /cvs/pkgs/rpms/grass/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23094 Removed Files: import.log Log Message: --- import.log DELETED --- From fedora-extras-commits at redhat.com Sat Jul 5 12:13:42 2008 From: fedora-extras-commits at redhat.com (Balint Cristian (rezso)) Date: Sat, 5 Jul 2008 12:13:42 GMT Subject: rpms/grass/F-9 import.log,1.2,1.3 grass.spec,1.19,1.20 Message-ID: <200807051213.m65CDgXH023459@cvs-int.fedora.redhat.com> Author: rezso Update of /cvs/pkgs/rpms/grass/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23296/F-9 Modified Files: grass.spec Added Files: import.log Log Message: - address bz#454146 (wxPython miss) ---------------------------------------------------------------------- Modified Files: F-9/grass.spec ---------------------------------------------------------------------- Index: import.log =================================================================== RCS file: import.log diff -N import.log --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ import.log 5 Jul 2008 12:12:46 -0000 1.3 @@ -0,0 +1 @@ +grass-6_3_0-5_fc9:F-9:grass-6.3.0-5.fc9.src.rpm:1215259887 Index: grass.spec =================================================================== RCS file: /cvs/pkgs/rpms/grass/F-9/grass.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- grass.spec 12 Jun 2008 19:15:19 -0000 1.19 +++ grass.spec 5 Jul 2008 12:12:46 -0000 1.20 @@ -1,6 +1,6 @@ Name: grass Version: 6.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GRASS - Geographic Resources Analysis Support System Group: Applications/Engineering License: GPLv2 @@ -12,7 +12,7 @@ Patch1: grass-shlib-soname.patch Patch2: grass-gdilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: proj-nad proj-epsg +Requires: proj-nad proj-epsg wxPython BuildRequires: gettext BuildRequires: python-devel @@ -321,6 +321,9 @@ %{_libdir}/libgrass_*.so %changelog +* Sat Jul 05 2008 Balint Cristian 6.3.0-5 +- address bz#454146 (wxPython miss) + * Thu Jun 12 2008 Balint Cristian 6.3.0-4 - address bz#341391 (multilib issue) From fedora-extras-commits at redhat.com Sat Jul 5 12:18:24 2008 From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak)) Date: Sat, 5 Jul 2008 12:18:24 GMT Subject: rpms/asunder/F-8 asunder.spec,1.4,1.5 sources,1.5,1.6 Message-ID: <200807051218.m65CIOOg024179@cvs-int.fedora.redhat.com> Author: szpak Update of /cvs/pkgs/rpms/asunder/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24017 Modified Files: asunder.spec sources Log Message: Updated to 1.6 Index: asunder.spec =================================================================== RCS file: /cvs/pkgs/rpms/asunder/F-8/asunder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- asunder.spec 7 May 2008 19:24:26 -0000 1.4 +++ asunder.spec 5 Jul 2008 12:17:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: asunder Summary: A graphical Audio CD ripper and encoder -Version: 1.5 +Version: 1.6 Release: 1%{?dist} License: GPLv2 Group: Applications/File @@ -9,7 +9,8 @@ #Packager: Marcin Zajaczkowski Source0: http://littlesvr.ca/asunder/releases/asunder-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libcddb +#libcddb is forced by libcddb-devel and proper .so +#Requires: libcddb Requires: cdparanoia #recommended runtime dependencies Requires: vorbis-tools @@ -25,7 +26,8 @@ BuildRequires: gettext %description -It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC and/or Wavpack. +It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC +and/or Wavpack. %prep %setup -q @@ -62,6 +64,11 @@ #%{_mandir}/man1/asunder.1* %changelog +* Tue Jul 1 2008 Marcin Zajaczkowski - 1.6-1 +- updated to 1.6 +- removed explicit libcddb dependency +- broken too long desciption line + * Sun May 4 2008 Marcin Zajaczkowski - 1.5-1 - updated to 1.5 - added (commented for now) wavpack dependency Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asunder/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 May 2008 19:24:26 -0000 1.5 +++ sources 5 Jul 2008 12:17:34 -0000 1.6 @@ -1 +1 @@ -253efecd76bc019ab8a70352b368671f asunder-1.5.tar.bz2 +4b54bd62ad5743094715482a0d4812e4 asunder-1.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 12:20:02 2008 From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak)) Date: Sat, 5 Jul 2008 12:20:02 GMT Subject: rpms/isomaster/devel .cvsignore, 1.8, 1.9 isomaster.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200807051220.m65CK2s4024379@cvs-int.fedora.redhat.com> Author: szpak Update of /cvs/pkgs/rpms/isomaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24280 Modified Files: .cvsignore isomaster.spec sources Log Message: Updated to 1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/isomaster/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Feb 2008 19:19:25 -0000 1.8 +++ .cvsignore 5 Jul 2008 12:19:07 -0000 1.9 @@ -1,2 +1,2 @@ -isomaster-1.3.1.tar.bz2 +isomaster-1.3.3.tar.bz2 text-editor-0.1.tar.gz Index: isomaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/isomaster/devel/isomaster.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- isomaster.spec 6 Feb 2008 19:19:25 -0000 1.11 +++ isomaster.spec 5 Jul 2008 12:19:07 -0000 1.12 @@ -1,6 +1,6 @@ Name: isomaster Summary: An easy to use GUI CD image editor -Version: 1.3.1 +Version: 1.3.3 Release: 1%{?dist} License: GPLv2 Group: Applications/File @@ -67,6 +67,12 @@ %{_mandir}/man1/isomaster.1* %changelog +* Sun Jul 1 2008 Marcin Zajaczkowski - 1.3.3-1 +- updated to 1.3.3 + +* Sun Jun 29 2008 Marcin Zajaczkowski - 1.3.2-1 +- updated to 1.3.2 + * Mon Feb 4 2008 Marcin Zajaczkowski - 1.3.1-1 - updated to 1.3.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/isomaster/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2008 19:19:25 -0000 1.8 +++ sources 5 Jul 2008 12:19:07 -0000 1.9 @@ -1,2 +1,2 @@ -e86102919105662063ac294befe18472 isomaster-1.3.1.tar.bz2 +1e5369b6f8eb97c4d46e16bddaf5913a isomaster-1.3.3.tar.bz2 55cd78e0d34134821694bac20e77b2a1 text-editor-0.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 13:09:37 2008 From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak)) Date: Sat, 5 Jul 2008 13:09:37 GMT Subject: rpms/asunder/F-9 asunder.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <200807051309.m65D9b3S001571@cvs-int.fedora.redhat.com> Author: szpak Update of /cvs/pkgs/rpms/asunder/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1272 Modified Files: asunder.spec sources Log Message: Updated to 1.6 (F9 branch) Index: asunder.spec =================================================================== RCS file: /cvs/pkgs/rpms/asunder/F-9/asunder.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- asunder.spec 12 Feb 2008 19:59:53 -0000 1.3 +++ asunder.spec 5 Jul 2008 13:08:49 -0000 1.4 @@ -1,6 +1,6 @@ Name: asunder Summary: A graphical Audio CD ripper and encoder -Version: 1.0.2 +Version: 1.6 Release: 1%{?dist} License: GPLv2 Group: Applications/File @@ -9,13 +9,16 @@ #Packager: Marcin Zajaczkowski Source0: http://littlesvr.ca/asunder/releases/asunder-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libcddb +#libcddb is forced by libcddb-devel and proper .so +#Requires: libcddb Requires: cdparanoia #recommended runtime dependencies Requires: vorbis-tools Requires: flac #for mp3 encoding (due to Fedora's patent policy available only from rpm.livna.org repository) #Requires: lame +#additional runtime dependency (lossy and lossless hybrid compression mode) +#Requires: wavpack #version was taken from the program's website BuildRequires: libcddb-devel >= 0.9.5 BuildRequires: gtk2-devel >= 2.4 @@ -23,7 +26,8 @@ BuildRequires: gettext %description -It allows to save tracks from an Audio CD as WAV, MP3, OGG, and/or FLAC. +It allows to save tracks from an Audio CD as WAV, MP3, OGG, FLAC +and/or Wavpack. %prep %setup -q @@ -34,6 +38,10 @@ %install rm -fr %{buildroot} +#remove sv locales with broken encoding in 1.5 +mv asunder.desktop asunder.desktop.org +cat asunder.desktop.org | grep -v "Comment\[sv\]" > asunder.desktop + make install DESTDIR=%{buildroot} %find_lang %{name} @@ -56,6 +64,15 @@ #%{_mandir}/man1/asunder.1* %changelog +* Tue Jul 1 2008 Marcin Zajaczkowski - 1.6-1 +- updated to 1.6 +- removed explicit libcddb dependency +- broken too long desciption line + +* Sun May 4 2008 Marcin Zajaczkowski - 1.5-1 +- updated to 1.5 +- added (commented for now) wavpack dependency + * Mon Feb 4 2008 Marcin Zajaczkowski - 1.0.2-1 - updated to 1.0.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asunder/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Feb 2008 19:59:53 -0000 1.4 +++ sources 5 Jul 2008 13:08:49 -0000 1.5 @@ -1 +1 @@ -b4cc0b9e2b1a96ce5e20cc1ba944d7d0 asunder-1.0.2.tar.bz2 +4b54bd62ad5743094715482a0d4812e4 asunder-1.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 13:41:29 2008 From: fedora-extras-commits at redhat.com (Mat Booth (mbooth)) Date: Sat, 5 Jul 2008 13:41:29 GMT Subject: rpms/eclipse-phpeclipse/F-8 eclipse-phpeclipse-broken-help-links.patch, NONE, 1.1 eclipse-phpeclipse-external-parser.patch, NONE, 1.1 eclipse-phpeclipse-external-preview.patch, NONE, 1.1 eclipse-phpeclipse-fix-build-props.patch, NONE, 1.1 eclipse-phpeclipse-no-htmlparser.patch, NONE, 1.1 get-phpeclipse.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 eclipse-phpeclipse-httpd-integration.patch, 1.2, 1.3 eclipse-phpeclipse-rm-win32-help.patch, 1.1, 1.2 eclipse-phpeclipse.spec, 1.3, 1.4 sources, 1.2, 1.3 eclipse-phpeclipse-3.2-build.patch, 1.1, NONE make-phpeclipse-source-archive.sh, 1.1, NONE Message-ID: <200807051341.m65DfTg2005568@cvs-int.fedora.redhat.com> Author: mbooth Update of /cvs/pkgs/rpms/eclipse-phpeclipse/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5322 Modified Files: .cvsignore eclipse-phpeclipse-httpd-integration.patch eclipse-phpeclipse-rm-win32-help.patch eclipse-phpeclipse.spec sources Added Files: eclipse-phpeclipse-broken-help-links.patch eclipse-phpeclipse-external-parser.patch eclipse-phpeclipse-external-preview.patch eclipse-phpeclipse-fix-build-props.patch eclipse-phpeclipse-no-htmlparser.patch get-phpeclipse.sh Removed Files: eclipse-phpeclipse-3.2-build.patch make-phpeclipse-source-archive.sh Log Message: * Sun Jun 29 2008 Mat Booth 1.2.0-0.2.svn1573 - Add patch for Show External Preview functionality. - Add patch for Use External PHP Parser functionality. * Sat Jun 28 2008 Mat Booth 1.2.0-0.1.svn1573 - New maintainer. - Update to version 1.2.0 pre-release, svn1573. - Adapt patches to new version. - Update package for new Eclipse plugin guidelines. eclipse-phpeclipse-broken-help-links.patch: --- NEW FILE eclipse-phpeclipse-broken-help-links.patch --- --- net.sourceforge.phpeclipse.phphelp/phphelp.xml 2006-07-14 11:13:57.000000000 +0100 +++ net.sourceforge.phpeclipse.phphelp/phphelp.xml 2008-06-22 13:45:54.000000000 +0100 @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + - - \ No newline at end of file + + eclipse-phpeclipse-external-parser.patch: --- NEW FILE eclipse-phpeclipse-external-parser.patch --- Index: net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java =================================================================== --- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (revision 1573) +++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (working copy) @@ -50,11 +50,9 @@ * the file that will be parsed */ public void phpExternalParse() { - // IFile file = (IFile) resource; - // final IPath path = file.getFullPath(); final IPreferenceStore store = ExternalToolsPlugin.getDefault() .getPreferenceStore(); - final String filename = fFileToParse.getFullPath().toString(); + final String filename = fFileToParse.getLocation().toString(); final String[] arguments = { filename }; final MessageFormat form = new MessageFormat(store eclipse-phpeclipse-external-preview.patch: --- NEW FILE eclipse-phpeclipse-external-preview.patch --- Index: net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java =================================================================== --- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (revision 1573) +++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (working copy) @@ -145,30 +145,26 @@ if (store == null) { store = WebUI.getDefault().getPreferenceStore(); } - // IPath path = file.getFullPath(); - String localhostURL = file.getFullPath().toString(); - String lowerCaseFileName = localhostURL.toLowerCase(); - //removed by ed_mann for RSE fixes testing - // String documentRoot = - // store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF); - //IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(file - // .getProject()); - IPath documentRootPath = file.getProject().getFullPath(); - String documentRoot = documentRootPath.toString().toLowerCase(); - if (lowerCaseFileName.startsWith(documentRoot)) { - localhostURL = localhostURL.substring(documentRoot.length()); - } else { - return null; + IPath path = file.getLocation(); + if(path == null) + path = file.getFullPath(); + + String filePath = path.toString(); + String projectURI = ProjectPrefUtil.getMiscProjectsPreferenceValue(file + .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF); + String projectDocRoot = ProjectPrefUtil.getMiscProjectsPreferenceValue(file + .getProject(), IPreferenceConstants.PHP_DOCUMENTROOT_PREF); + + if (filePath.startsWith(projectDocRoot)) { + filePath = filePath.substring(projectDocRoot.length()); } - // return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) + - // localhostURL; - String projectPath = ProjectPrefUtil.getMiscProjectsPreferenceValue(file - .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF); - if(projectPath.endsWith("/") && localhostURL.startsWith("/")) { - localhostURL = localhostURL.substring(1); + if(projectURI.endsWith("/") && filePath.startsWith("/")) { + filePath = filePath.substring(1); } - return projectPath + localhostURL; + + return projectURI + filePath; } - return "http://localhost"; + return ProjectPrefUtil.getMiscProjectsPreferenceValue(file + .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF); } } \ No newline at end of file eclipse-phpeclipse-fix-build-props.patch: --- NEW FILE eclipse-phpeclipse-fix-build-props.patch --- --- net.sourceforge.phpeclipse.ui/build.properties 2006-10-22 00:06:44.000000000 +0100 +++ net.sourceforge.phpeclipse.ui/build.properties 2008-06-22 11:40:52.000000000 +0100 @@ -4,7 +4,6 @@ plugin.properties,\ templates/,\ ui.jar,\ - .project,\ META-INF/ source.ui.jar = src/ src.includes = src/,\ eclipse-phpeclipse-no-htmlparser.patch: --- NEW FILE eclipse-phpeclipse-no-htmlparser.patch --- --- net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java 2008-04-07 19:44:48.000000000 +0100 +++ net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java 2008-06-22 11:49:09.000000000 +0100 @@ -38,11 +38,11 @@ import org.eclipse.ui.INullSelectionListener; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.part.ViewPart; -import org.htmlparser.Node; -import org.htmlparser.Parser; -import org.htmlparser.tags.Div; -import org.htmlparser.util.ParserException; -import org.htmlparser.visitors.TagFindingVisitor; +//import org.htmlparser.Node; +//import org.htmlparser.Parser; +//import org.htmlparser.tags.Div; +//import org.htmlparser.util.ParserException; +//import org.htmlparser.visitors.TagFindingVisitor; import org.osgi.framework.Bundle; /** @@ -195,6 +195,7 @@ * @return HTML source of reference page */ private String filterHtmlSource(String source) { +/* try { Parser parser = new Parser(source); String[] tagsToBeFound = { "DIV" }; @@ -220,6 +221,7 @@ } catch (ParserException e) { e.printStackTrace(); } +*/ return ""; } /** @@ -357,4 +359,4 @@ } } -} \ No newline at end of file +} --- net.sourceforge.phpeclipse.phpmanual.htmlparser/build.properties 2007-11-20 01:42:36.000000000 +0000 +++ net.sourceforge.phpeclipse.phpmanual.htmlparser/build.properties 2008-06-22 13:27:52.000000000 +0100 @@ -1,7 +1,2 @@ bin.includes = META-INF/,\ - filterbuilder.jar,\ - htmllexer.jar,\ - htmlparser.jar,\ - junit.jar,\ - sax2.jar,\ - thumbelina.jar + xml-commons-apis.jar --- net.sourceforge.phpeclipse.phpmanual.htmlparser/.classpath 2007-12-03 18:54:17.000000000 +0000 +++ net.sourceforge.phpeclipse.phpmanual.htmlparser/.classpath 2008-06-22 11:54:07.000000000 +0100 @@ -1,11 +1,6 @@ - - - - - - + --- net.sourceforge.phpeclipse.phpmanual.htmlparser/META-INF/MANIFEST.MF 2007-12-03 18:54:17.000000000 +0000 +++ net.sourceforge.phpeclipse.phpmanual.htmlparser/META-INF/MANIFEST.MF 2008-06-22 13:27:30.000000000 +0100 @@ -3,41 +3,9 @@ Bundle-Name: Htmlparser Plug-in Bundle-SymbolicName: net.sourceforge.phpeclipse.phpmanual.htmlparser Bundle-Version: 1.6.0 -Bundle-ClassPath: filterbuilder.jar, - htmllexer.jar, - htmlparser.jar, - junit.jar, - sax2.jar, - thumbelina.jar +Bundle-ClassPath: xml-commons-apis.jar Bundle-Localization: plugin Export-Package: ., - junit.awtui, - junit.extensions, - junit.framework, - junit.runner, - junit.swingui, - junit.swingui.icons, - junit.textui, - org.htmlparser, - org.htmlparser.beans, - org.htmlparser.beans.images, - org.htmlparser.filters, - org.htmlparser.http, - org.htmlparser.lexer, - org.htmlparser.lexerapplications.thumbelina, - org.htmlparser.nodes, - org.htmlparser.parserapplications, - org.htmlparser.parserapplications.filterbuilder, - org.htmlparser.parserapplications.filterbuilder.images, - org.htmlparser.parserapplications.filterbuilder.layouts, - org.htmlparser.parserapplications.filterbuilder.wrappers, - org.htmlparser.parserapplications.filterbuilder.wrappers.images, - org.htmlparser.sax, - org.htmlparser.scanners, - org.htmlparser.tags, - org.htmlparser.util, - org.htmlparser.util.sort, - org.htmlparser.visitors, org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers --- NEW FILE get-phpeclipse.sh --- #!/bin/sh NAME="phpeclipse" VERSION=1.2.0 REV="1573" echo "Exporting from SVN..." mkdir $NAME-$VERSION pushd $NAME-$VERSION >/dev/null for m in \ net.sourceforge.phpeclipse.debug.feature \ net.sourceforge.phpeclipse.feature \ net.sourceforge.phpeclipse.xdebug.feature \ net.sourceforge.phpeclipse.core \ net.sourceforge.phpeclipse.debug.core \ net.sourceforge.phpeclipse.debug.ui \ net.sourceforge.phpeclipse.externaltools \ net.sourceforge.phpeclipse.help \ net.sourceforge.phpeclipse.launching \ net.sourceforge.phpeclipse.phphelp \ net.sourceforge.phpeclipse.phpmanual.htmlparser \ net.sourceforge.phpeclipse.phpmanual \ net.sourceforge.phpeclipse.smarty.ui \ net.sourceforge.phpeclipse.ui \ net.sourceforge.phpeclipse.webbrowser \ net.sourceforge.phpeclipse.xdebug.core \ net.sourceforge.phpeclipse.xdebug.ui \ net.sourceforge.phpeclipse.xml.core \ net.sourceforge.phpeclipse.xml.ui \ net.sourceforge.phpeclipse; do svn export -r $REV http://svn.phpeclipse.com/phpeclipse/trunk/$m if [ $? -eq 1 ]; then sleep 10 svn export -r $REV http://svn.phpeclipse.com/phpeclipse/trunk/$m if [ $? -eq 1 ]; then echo "ERROR: There was a problem checking out module: $m" exit 1 fi fi done popd >/dev/null # jettison cvs gumph and empty files find $NAME-$VERSION -name .cvs* | xargs rm echo "Creating tarball '$NAME-$VERSION.tar.gz'..." tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Dec 2006 01:06:02 -0000 1.2 +++ .cvsignore 5 Jul 2008 13:40:27 -0000 1.3 @@ -1 +1 @@ -phpeclipse-1.1.8.tar.gz +phpeclipse-1.2.0.tar.gz eclipse-phpeclipse-httpd-integration.patch: Index: eclipse-phpeclipse-httpd-integration.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-8/eclipse-phpeclipse-httpd-integration.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-phpeclipse-httpd-integration.patch 21 Oct 2007 03:45:21 -0000 1.2 +++ eclipse-phpeclipse-httpd-integration.patch 5 Jul 2008 13:40:27 -0000 1.3 @@ -1,141 +1,5 @@ -Index: src/net/sourceforge/phpeclipse/ui/WebUI.java -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java,v -retrieving revision 1.6 -diff -u -r1.6 WebUI.java ---- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java 13 Oct 2005 18:38:19 -0000 1.6 -+++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java 12 Aug 2006 00:13:12 -0000 -@@ -14,6 +14,7 @@ - package net.sourceforge.phpeclipse.ui; - - import java.io.IOException; -+import java.net.ServerSocket; - import java.net.URL; - - import net.sourceforge.phpeclipse.ui.templates.template.HTMLContextType; -@@ -24,6 +25,7 @@ - import org.eclipse.core.resources.IWorkspace; - import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.core.runtime.IStatus; -+import org.eclipse.core.runtime.Platform; - import org.eclipse.core.runtime.Status; - import org.eclipse.jface.preference.IPreferenceStore; - import org.eclipse.jface.resource.ImageDescriptor; -@@ -36,6 +38,7 @@ - import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry; - import org.eclipse.ui.editors.text.templates.ContributionTemplateStore; - import org.eclipse.ui.plugin.AbstractUIPlugin; -+import org.osgi.framework.BundleContext; - - /** - * The web development tools UI plugin. -@@ -53,6 +56,7 @@ - - /** The shared instance. */ - private static WebUI plugin; -+ private int port = 0; - - public static IWorkbenchPage getActivePage() { - return getDefault().internalGetActivePage(); -@@ -151,9 +155,41 @@ - } - return fStore; - } -+ -+ public int getHttpdPort() { -+ if (port == 0) { -+ port = findFreePort(); -+ } -+ return port; -+ } -+ -+ public int findFreePort() { -+ ServerSocket socket = null; -+ try { -+ socket = new ServerSocket(0); -+ socket.setReuseAddress(true); -+ return socket.getLocalPort(); -+ } catch(IOException e) { -+ IStatus status = new Status(IStatus.ERROR, "net.sourceforge.phpeclipse.ui", IStatus.OK, "Error finding free port.", e); //$NON-NLS-1$ //$NON-NLS-2$ -+ plugin.getLog().log(status); -+ } finally { -+ if(socket != null) { -+ try { -+ socket.close(); -+ } catch(IOException e) { -+ IStatus status = new Status(IStatus.ERROR, "net.sourceforge.phpeclipse.ui", IStatus.OK, "Error finding free port.", e); //$NON-NLS-1$ //$NON-NLS-2$; -+ plugin.getLog().log(status); -+ } -+ } -+ } -+ return -1; -+ } - - protected void initializeDefaultPreferences(IPreferenceStore store) { -- store.setDefault(PHP_LOCALHOST_PREF, "http://localhost"); -+ if (port == 0) { -+ port = findFreePort(); -+ } -+ store.setDefault(PHP_LOCALHOST_PREF, "http://localhost" + ":" + port); - store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString()); - // store.setDefault(PHP_BOOKMARK_DEFAULT, ""); - -Index: src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java,v -retrieving revision 1.97 -diff -u -r1.97 PHPeclipsePlugin.java ---- net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java 10 Feb 2006 20:53:56 -0000 1.97 -+++ net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java 12 Aug 2006 00:13:14 -0000 -@@ -27,6 +27,7 @@ - import net.sourceforge.phpdt.core.IJavaElement; - import net.sourceforge.phpdt.core.JavaCore; - import net.sourceforge.phpdt.core.WorkingCopyOwner; -+import net.sourceforge.phpdt.externaltools.actions.PHPStopApacheAction; - import net.sourceforge.phpdt.internal.core.BatchOperation; - import net.sourceforge.phpdt.internal.core.JavaModelManager; - import net.sourceforge.phpdt.internal.core.util.Util; -@@ -52,6 +53,7 @@ - import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider; - import net.sourceforge.phpeclipse.builder.FileStorage; - import net.sourceforge.phpeclipse.builder.IdentifierIndexManager; -+import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin; - import net.sourceforge.phpeclipse.phpeditor.CustomBufferFactory; - import net.sourceforge.phpeclipse.phpeditor.DocumentAdapter; - import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider; -@@ -79,6 +81,7 @@ - import org.eclipse.core.runtime.Status; - import org.eclipse.core.runtime.jobs.ISchedulingRule; - import org.eclipse.core.runtime.jobs.Job; -+import org.eclipse.jface.action.Action; - import org.eclipse.jface.action.GroupMarker; - import org.eclipse.jface.action.IMenuManager; - import org.eclipse.jface.action.Separator; -@@ -1023,10 +1026,15 @@ - - // RefactoringCore.getUndoManager().shutdown(); - } finally { -+ ExternalToolsPlugin.getDefault().stopHttpd(); -+ try { -+ Thread.sleep(1000); -+ } catch (InterruptedException e) { /* ignore */ } - super.stop(context); -- } -- } - -+ } -+ } -+ - /** - * @see org.eclipse.ui.plugin.AbstractUIPlugin#shutdown() - */ -Index: prefs/default_linux.properties -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties,v -retrieving revision 1.2 -diff -u -r1.2 default_linux.properties ---- net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties 13 Oct 2005 18:30:49 -0000 1.2 -+++ net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties 12 Aug 2006 00:13:15 -0000 +--- net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties 2005-10-13 19:38:40.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties 2008-06-15 11:18:01.000000000 +0100 @@ -1,14 +1,14 @@ -_php_run_pref=/opt/lamp/php/php -_external_parser=/opt/lamp/php/php -l -f {0} @@ -154,226 +18,62 @@ +_xampp_start_pref= +_xampp_stop_pref= +__mysql_start= -+__apache_start=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.1.8/confs/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -+__apache_stop=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.1.8/confs/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k stop -+__apache_restart=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.1.8/confs/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k restart ++__apache_start=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.0/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" ++__apache_stop=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.0/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k stop ++__apache_restart=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.0/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k restart _mysql_start_background=true _apache_start_background=true _apache_stop_background=true --_apache_restart_background=true -\ No newline at end of file -+_apache_restart_background=true -Index: src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java,v -retrieving revision 1.1 -diff -u -r1.1 PHPRestartApacheAction.java ---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java 11 Jun 2005 17:15:01 -0000 1.1 -+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java 12 Aug 2006 00:13:16 -0000 -@@ -12,7 +12,10 @@ - package net.sourceforge.phpdt.externaltools.actions; - - -+import java.text.MessageFormat; + _apache_restart_background=true +--- net.sourceforge.phpeclipse.externaltools/conf/httpd.conf 1970-01-01 01:00:00.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/conf/httpd.conf 2008-06-22 13:09:36.000000000 +0100 +@@ -0,0 +1,23 @@ ++# minimal httpd conf file for use with PHPEclipse ++StartServers 1 ++MinSpareServers 1 ++MaxSpareServers 1 ++MaxClients 3 + - import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin; -+import net.sourceforge.phpeclipse.ui.WebUI; - - import org.eclipse.jface.action.IAction; - import org.eclipse.jface.preference.IPreferenceStore; -@@ -21,10 +24,18 @@ - public void run(IAction action) { - final IPreferenceStore store = ExternalToolsPlugin.getDefault().getPreferenceStore(); - // execute(store.getString(PHPeclipsePlugin.APACHE_RESTART_PREF), "Restart Apache: "); -+ -+ final IPreferenceStore webUIStore = WebUI.getDefault().getPreferenceStore(); -+ String documentRoot = webUIStore.getString(WebUI.PHP_DOCUMENTROOT_PREF); -+ // replace backslash with slash in the DocumentRoot under Windows -+ documentRoot = documentRoot.replace('\\', '/'); -+ String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() }; -+ MessageFormat form = new MessageFormat(store.getString(ExternalToolsPlugin.APACHE_RESTART_PREF)); -+ - execute( - "apache_restart", - store.getString(ExternalToolsPlugin.APACHE_RUN_PREF), -- store.getString(ExternalToolsPlugin.APACHE_RESTART_PREF), -+ form.format(arguments), - store.getBoolean(ExternalToolsPlugin.APACHE_RESTART_BACKGROUND)); - } - } -Index: src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java,v -retrieving revision 1.3 -diff -u -r1.3 PHPStartApacheAction.java ---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java 13 Oct 2005 18:31:29 -0000 1.3 -+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java 12 Aug 2006 00:13:16 -0000 -@@ -30,7 +30,7 @@ - - // replace backslash with slash in the DocumentRoot under Windows - documentRoot = documentRoot.replace('\\', '/'); -- String[] arguments = { documentRoot }; -+ String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() }; - MessageFormat form = new MessageFormat(store.getString(ExternalToolsPlugin.APACHE_START_PREF)); - execute("apache_start", store.getString(ExternalToolsPlugin.APACHE_RUN_PREF), form.format(arguments), store - .getBoolean(ExternalToolsPlugin.APACHE_START_BACKGROUND)); -Index: src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java,v -retrieving revision 1.1 -diff -u -r1.1 PHPStopApacheAction.java ---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java 11 Jun 2005 17:15:01 -0000 1.1 -+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java 12 Aug 2006 00:13:16 -0000 -@@ -11,7 +11,10 @@ - **********************************************************************/ - package net.sourceforge.phpdt.externaltools.actions; - -+import java.text.MessageFormat; ++# modules ++LoadModule mime_module modules/mod_mime.so ++LoadModule dir_module modules/mod_dir.so ++LoadModule autoindex_module modules/mod_autoindex.so + - import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin; -+import net.sourceforge.phpeclipse.ui.WebUI; - - import org.eclipse.jface.action.IAction; - import org.eclipse.jface.preference.IPreferenceStore; -@@ -20,10 +23,18 @@ - public void run(IAction action) { - final IPreferenceStore store = ExternalToolsPlugin.getDefault().getPreferenceStore(); - // execute(store.getString(PHPeclipsePlugin.APACHE_STOP_PREF), "Stop Apache: "); -+ -+ final IPreferenceStore webUIStore = WebUI.getDefault().getPreferenceStore(); -+ String documentRoot = webUIStore.getString(WebUI.PHP_DOCUMENTROOT_PREF); -+ // replace backslash with slash in the DocumentRoot under Windows -+ documentRoot = documentRoot.replace('\\', '/'); -+ String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() }; -+ MessageFormat form = new MessageFormat(store.getString(ExternalToolsPlugin.APACHE_STOP_PREF)); -+ - execute( - "apache_stop", - store.getString(ExternalToolsPlugin.APACHE_RUN_PREF), -- store.getString(ExternalToolsPlugin.APACHE_STOP_PREF), -+ form.format(arguments), - store.getBoolean(ExternalToolsPlugin.APACHE_STOP_BACKGROUND)); - } - } -Index: src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java,v -retrieving revision 1.8 -diff -u -r1.8 ExternalToolsPlugin.java ---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java 4 Feb 2006 15:47:51 -0000 1.8 -+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java 12 Aug 2006 00:13:16 -0000 -@@ -9,12 +9,17 @@ - Contributors: - **********************************************************************/ - -+import java.io.FileOutputStream; -+import java.io.IOException; - import java.io.InputStream; -+import java.io.OutputStream; - import java.net.MalformedURLException; - import java.net.URL; - import java.util.Enumeration; - import java.util.PropertyResourceBundle; - -+import net.sourceforge.phpdt.externaltools.actions.PHPStartApacheAction; -+import net.sourceforge.phpdt.externaltools.actions.PHPStopApacheAction; - import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsImages; - import net.sourceforge.phpdt.externaltools.internal.model.IPreferenceConstants; - import net.sourceforge.phpdt.externaltools.internal.model.VariableContextManager; -@@ -28,6 +33,7 @@ - import org.eclipse.core.runtime.Path; - import org.eclipse.core.runtime.Platform; - import org.eclipse.core.runtime.Status; -+import org.eclipse.jface.action.Action; - import org.eclipse.jface.preference.IPreferenceStore; - import org.eclipse.jface.preference.PreferenceConverter; - import org.eclipse.jface.resource.ImageDescriptor; -@@ -280,5 +286,41 @@ - VariableContextManager.getDefault(); - } - }); -+ initializeDefaultPluginPreferences(); -+ } -+ -+ /** -+ * @throws Exception -+ * @see org.eclipse.core.runtime.Plugin#stop(BundleContext context) -+ */ -+ public void stop(BundleContext context) throws Exception { -+ super.stop(context); -+ } -+ -+ public void startHttpd(){ -+ try { -+ // move httpd.conf into the plugins metadata area -+ InputStream is = getDefault().openStream(new Path("confs/httpd.conf")); -+ OutputStream os = new FileOutputStream(getStateLocation() + "/httpd.conf"); -+ byte[] buf = new byte[1024]; -+ int len; -+ while ((len = is.read(buf)) > 0) { -+ os.write(buf, 0, len); -+ } -+ is.close(); -+ os.close(); -+ -+ // start httpd -+ new PHPStartApacheAction().run(new Action(){}); -+ } catch (IOException e) { -+ IStatus status = new Status(Status.ERROR, IExternalToolConstants.PLUGIN_ID, 0, "There was a problem starting httpd.", e); -+ getDefault().getLog().log(status); -+ } -+ } -+ -+ -+ public void stopHttpd() { -+ // stop httpd -+ new PHPStopApacheAction().run(new Action(){}); - } - } -\ No newline at end of file -Index: plugin.xml -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.externaltools/plugin.xml,v -retrieving revision 1.7 -diff -u -r1.7 plugin.xml ---- net.sourceforge.phpeclipse.externaltools/plugin.xml 5 Feb 2006 21:07:11 -0000 1.7 -+++ net.sourceforge.phpeclipse.externaltools/plugin.xml 12 Aug 2006 00:13:15 -0000 -@@ -1,32 +1,8 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - -+ - - - -@@ -255,11 +231,6 @@ ++TypesConfig /etc/mime.types ++DirectoryIndex index.html index.php default.html default.php ++DirectorySlash On ++ ++IndexOptions FoldersFirst VersionSort IgnoreCase NameWidth=* HTMLTable ++IndexIgnore RECYCLER .??* *~ *# HEADER* README* RCS CVS *,v *,t ++HeaderName HEADER.html ++ReadmeName README.html ++ ++# PHP settings ++LoadModule php5_module modules/libphp5.so ++AddHandler php5-script .php +--- net.sourceforge.phpeclipse.externaltools/build.properties 2006-10-22 00:06:44.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/build.properties 2008-06-22 13:15:16.000000000 +0100 +@@ -5,6 +5,7 @@ + icons/,\ + META-INF/,\ + plugin.properties,\ ++ conf/,\ + prefs/ + src.includes = src/,\ + build.properties,\ +@@ -15,4 +16,9 @@ + .cvsignore,\ + .project,\ + META-INF/,\ ++ conf/,\ + prefs/ ++bin.excludes = prefs/default_macosx.properties,\ ++ prefs/default_win32.properties ++src.excludes = prefs/default_macosx.properties,\ ++ prefs/default_win32.properties +--- net.sourceforge.phpeclipse.externaltools/plugin.xml 2007-09-24 21:26:12.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/plugin.xml 2008-06-15 10:17:07.000000000 +0100 +@@ -192,11 +192,6 @@ -@@ -331,24 +302,6 @@ +@@ -268,24 +263,6 @@ toolbarPath="Normal" id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction"> @@ -410,92 +110,221 @@ -Index: build.properties -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.externaltools/build.properties,v -retrieving revision 1.2 -diff -u -r1.2 build.properties ---- net.sourceforge.phpeclipse.externaltools/build.properties 3 Aug 2005 20:55:43 -0000 1.2 -+++ net.sourceforge.phpeclipse.externaltools/build.properties 12 Aug 2006 00:53:50 -0000 -@@ -2,7 +2,16 @@ - output.externaltools.jar = bin/ - bin.includes = plugin.xml,\ - externaltools.jar,\ -- icons/ -+ icons/,\ -+ META-INF/,\ -+ confs/,\ -+ prefs/ - src.includes = src/,\ - build.properties,\ -- icons/ -+ icons/,\ -+ confs/,\ -+ prefs/ -+bin.excludes = prefs/default_macosx.properties,\ -+ prefs/default_win32.properties -+src.excludes = prefs/default_macosx.properties,\ -+ prefs/default_win32.properties -Index: META-INF/MANIFEST.MF -=================================================================== -RCS file: META-INF/MANIFEST.MF -diff -N META-INF/MANIFEST.MF ---- net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF 1 Jan 1970 00:00:00 -0000 -+++ net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,33 @@ -+Manifest-Version: 1.0 -+Bundle-ManifestVersion: 2 -+Bundle-Name: PHP ExternalTools Plug-in -+Bundle-SymbolicName: net.sourceforge.phpeclipse.externaltools; singleton:=true -+Bundle-Version: 1.1.8 -+Bundle-ClassPath: externaltools.jar -+Bundle-Activator: net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin -+Bundle-Vendor: phpeclipse.de -+Bundle-Localization: plugin -+Export-Package: net.sourceforge.phpdt.externaltools.actions, -+ net.sourceforge.phpdt.externaltools.group, -+ net.sourceforge.phpdt.externaltools.internal.dialog, -+ net.sourceforge.phpdt.externaltools.internal.model, -+ net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations, -+ net.sourceforge.phpdt.externaltools.internal.registry, -+ net.sourceforge.phpdt.externaltools.internal.ui, -+ net.sourceforge.phpdt.externaltools.launchConfigurations, -+ net.sourceforge.phpdt.externaltools.model, -+ net.sourceforge.phpdt.externaltools.preferences, -+ net.sourceforge.phpdt.externaltools.util, -+ net.sourceforge.phpdt.externaltools.variable, -+ net.sourceforge.phpeclipse.externaltools -+Require-Bundle: org.eclipse.ui, -+ org.eclipse.ui.console, -+ org.eclipse.ui.ide, -+ org.eclipse.ui.editors, -+ org.eclipse.core.resources, -+ org.eclipse.core.runtime, -+ org.eclipse.debug.core, -+ org.eclipse.debug.ui, -+ org.eclipse.ui.externaltools, -+ net.sourceforge.phpeclipse.ui -+Eclipse-LazyStart: true -Index: confs/httpd.conf -=================================================================== -RCS file: confs/httpd.conf -diff -N confs/httpd.conf ---- net.sourceforge.phpeclipse.externaltools/confs/httpd.conf 1 Jan 1970 00:00:00 -0000 -+++ net.sourceforge.phpeclipse.externaltools/confs/httpd.conf 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,16 @@ -+# minimal httpd conf file for use with PHPeclipse +--- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java 2008-01-14 03:40:19.000000000 +0000 ++++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java 2008-06-22 20:43:04.000000000 +0100 +@@ -15,16 +15,19 @@ + + import java.io.IOException; + import java.net.URL; ++import java.net.ServerSocket; + + import net.sourceforge.phpeclipse.ui.templates.template.HTMLContextType; + import net.sourceforge.phpeclipse.ui.templates.template.JSContextType; + import net.sourceforge.phpeclipse.ui.templates.template.SmartyContextType; + import net.sourceforge.phpeclipse.ui.templates.template.XMLContextType; + ++import org.eclipse.core.internal.utils.FileUtil; + import org.eclipse.core.resources.IWorkspace; + import org.eclipse.core.resources.ResourcesPlugin; + import org.eclipse.core.runtime.IStatus; + import org.eclipse.core.runtime.Status; ++import org.eclipse.core.runtime.Platform; + import org.eclipse.jface.preference.IPreferenceStore; + import org.eclipse.jface.resource.ImageDescriptor; + import org.eclipse.jface.resource.ImageRegistry; +@@ -56,6 +59,7 @@ + + /** The shared instance. */ + private static WebUI plugin; ++ private int port = 0; + + public static IWorkbenchPage getActivePage() { + return getDefault().internalGetActivePage(); +@@ -165,10 +169,42 @@ + return fStore; + } + ++ public int getHttpdPort() { ++ if (port == 0) { ++ port = findFreePort(); ++ } ++ return port; ++ } + -+StartServers 1 -+MinSpareServers 1 -+MaxSpareServers 1 -+MaxClients 3 ++ private int findFreePort() { ++ ServerSocket socket = null; ++ try { ++ socket = new ServerSocket(0); ++ socket.setReuseAddress(true); ++ return socket.getLocalPort(); ++ } catch(IOException e) { ++ IStatus status = new Status(IStatus.ERROR, "net.sourceforge.phpeclipse.ui", IStatus.OK, "Error finding free port.", e); ++ plugin.getLog().log(status); ++ } finally { ++ if(socket != null) { ++ try { ++ socket.close(); ++ } catch(IOException e) { ++ IStatus status = new Status(IStatus.ERROR, "net.sourceforge.phpeclipse.ui", IStatus.OK, "Error finding free port.", e); ++ plugin.getLog().log(status); ++ } ++ } ++ } ++ return -1; ++ } + -+# modules -+LoadModule mime_module modules/mod_mime.so -+LoadModule dir_module modules/mod_dir.so + protected void initializeDefaultPreferences(IPreferenceStore store) { +- store.setDefault(PHP_LOCALHOST_PREF, "http://localhost"); +- store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot() +- .getFullPath().toString()); ++ if (port == 0) { ++ port = findFreePort(); ++ } ++ store.setDefault(PHP_LOCALHOST_PREF, "http://localhost" + ":" + port); ++ store.setDefault(PHP_DOCUMENTROOT_PREF, ++ FileUtil.canonicalPath(Platform.getLocation()).removeTrailingSeparator().toOSString()); + // store.setDefault(PHP_BOOKMARK_DEFAULT, ""); + + store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "false"); +--- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java 2006-10-22 00:19:54.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java 2008-06-22 16:18:08.000000000 +0100 +@@ -32,7 +32,7 @@ + + // replace backslash with slash in the DocumentRoot under Windows + documentRoot = documentRoot.replace('\\', '/'); +- String[] arguments = { documentRoot }; ++ String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() }; + MessageFormat form = new MessageFormat(store + .getString(ExternalToolsPlugin.APACHE_START_PREF)); + execute("apache_start", store +--- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java 2006-10-22 00:19:54.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java 2008-06-22 17:43:22.000000000 +0100 +@@ -11,20 +11,31 @@ + **********************************************************************/ + package net.sourceforge.phpdt.externaltools.actions; + ++import java.text.MessageFormat; + -+TypesConfig /etc/mime.types + import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin; ++import net.sourceforge.phpeclipse.ui.WebUI; + + import org.eclipse.jface.action.IAction; + import org.eclipse.jface.preference.IPreferenceStore; + + public class PHPStopApacheAction extends PHPStartApacheAction { + public void run(IAction action) { ++ final IPreferenceStore webUIStore = WebUI.getDefault() ++ .getPreferenceStore(); + -+# PHP settings -+LoadModule php5_module modules/libphp5.so -+AddType application/x-httpd-php .php ++ String documentRoot = webUIStore.getString(WebUI.PHP_DOCUMENTROOT_PREF); + final IPreferenceStore store = ExternalToolsPlugin.getDefault() + .getPreferenceStore(); +- // execute(store.getString(PHPeclipsePlugin.APACHE_STOP_PREF), "Stop +- // Apache: "); ++ ++ // replace backslash with slash in the DocumentRoot under Windows ++ documentRoot = documentRoot.replace('\\', '/'); ++ String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() }; ++ MessageFormat form = new MessageFormat(store ++ .getString(ExternalToolsPlugin.APACHE_STOP_PREF)); + execute("apache_stop", store +- .getString(ExternalToolsPlugin.APACHE_RUN_PREF), store +- .getString(ExternalToolsPlugin.APACHE_STOP_PREF), store ++ .getString(ExternalToolsPlugin.APACHE_RUN_PREF), form ++ .format(arguments), store + .getBoolean(ExternalToolsPlugin.APACHE_STOP_BACKGROUND)); + } + } +--- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java 2006-10-22 00:19:54.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java 2008-06-22 17:34:10.000000000 +0100 +@@ -11,20 +11,31 @@ + **********************************************************************/ + package net.sourceforge.phpdt.externaltools.actions; + ++import java.text.MessageFormat; ++ + import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin; ++import net.sourceforge.phpeclipse.ui.WebUI; + + import org.eclipse.jface.action.IAction; + import org.eclipse.jface.preference.IPreferenceStore; + + public class PHPRestartApacheAction extends PHPStartApacheAction { + public void run(IAction action) { ++ final IPreferenceStore webUIStore = WebUI.getDefault() ++ .getPreferenceStore(); ++ ++ String documentRoot = webUIStore.getString(WebUI.PHP_DOCUMENTROOT_PREF); + final IPreferenceStore store = ExternalToolsPlugin.getDefault() + .getPreferenceStore(); +- // execute(store.getString(PHPeclipsePlugin.APACHE_RESTART_PREF), +- // "Restart Apache: "); ++ ++ // replace backslash with slash in the DocumentRoot under Windows ++ documentRoot = documentRoot.replace('\\', '/'); ++ String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() }; ++ MessageFormat form = new MessageFormat(store ++ .getString(ExternalToolsPlugin.APACHE_RESTART_PREF)); + execute("apache_restart", store +- .getString(ExternalToolsPlugin.APACHE_RUN_PREF), store +- .getString(ExternalToolsPlugin.APACHE_RESTART_PREF), store ++ .getString(ExternalToolsPlugin.APACHE_RUN_PREF), form ++ .format(arguments), store + .getBoolean(ExternalToolsPlugin.APACHE_RESTART_BACKGROUND)); + } + } +--- net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java 2008-01-23 21:53:45.000000000 +0000 ++++ net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java 2008-06-23 00:03:35.000000000 +0100 +@@ -52,6 +52,7 @@ + import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider; + import net.sourceforge.phpeclipse.builder.FileStorage; + import net.sourceforge.phpeclipse.builder.IdentifierIndexManager; ++import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin; + import net.sourceforge.phpeclipse.phpeditor.CustomBufferFactory; + import net.sourceforge.phpeclipse.phpeditor.DocumentAdapter; + import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider; +@@ -989,6 +990,7 @@ + + // RefactoringCore.getUndoManager().shutdown(); + } finally { ++ ExternalToolsPlugin.getDefault().stopHttpd(); + super.stop(context); + } + } +--- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java 2006-10-22 00:19:54.000000000 +0100 ++++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java 2008-06-23 00:01:11.000000000 +0100 +@@ -15,6 +15,7 @@ + import java.util.Enumeration; + import java.util.PropertyResourceBundle; + ++import net.sourceforge.phpdt.externaltools.actions.PHPStopApacheAction; + import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsImages; + import net.sourceforge.phpdt.externaltools.internal.model.IPreferenceConstants; + import net.sourceforge.phpdt.externaltools.internal.model.VariableContextManager; +@@ -28,6 +29,7 @@ + import org.eclipse.core.runtime.Path; + import org.eclipse.core.runtime.Platform; + import org.eclipse.core.runtime.Status; ++import org.eclipse.jface.action.Action; + import org.eclipse.jface.preference.IPreferenceStore; + import org.eclipse.jface.preference.PreferenceConverter; + import org.eclipse.jface.resource.ImageDescriptor; +@@ -310,4 +312,17 @@ + } + }); + } ++ ++ /** ++ * @throws Exception ++ * @see org.eclipse.core.runtime.Plugin#stop(BundleContext context) ++ */ ++ public void stop(BundleContext context) throws Exception { ++ super.stop(context); ++ } ++ ++ public void stopHttpd() { ++ // stop httpd ++ new PHPStopApacheAction().run(new Action(){}); ++ } + } +\ No newline at end of file eclipse-phpeclipse-rm-win32-help.patch: Index: eclipse-phpeclipse-rm-win32-help.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-8/eclipse-phpeclipse-rm-win32-help.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-phpeclipse-rm-win32-help.patch 21 Dec 2006 01:06:02 -0000 1.1 +++ eclipse-phpeclipse-rm-win32-help.patch 5 Jul 2008 13:40:27 -0000 1.2 @@ -1,20 +1,15 @@ -Index: plugin.xml -=================================================================== -RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.phphelp/plugin.xml,v -retrieving revision 1.16 -diff -u -r1.16 plugin.xml ---- plugin.xml 6 Apr 2006 21:52:44 -0000 1.16 -+++ plugin.xml 11 Aug 2006 22:16:34 -0000 -@@ -86,12 +86,6 @@ - - -- -- + +- +- = 4.0.2 -BuildRequires: java-gcj-compat-devel >= 1.0.33 -Requires(post): java-gcj-compat >= 1.0.33 -Requires(postun): java-gcj-compat >= 1.0.33 -%else -BuildRequires: java-devel >= 1.4.2 -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{gcj_support} -ExclusiveArch: %{ix86} x86_64 ppc ia64 +BuildRequires: gcc-java +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat %else -BuildArch: noarch +BuildArch: noarch %endif - -Requires: eclipse-platform >= 1:3.2.1 -Requires: eclipse-pde-runtime -Requires: php -Requires: httpd +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: eclipse-pde >= 1:3.3 +Requires: java +Requires: jpackage-utils +Requires: eclipse-platform >= 1:3.3 +Requires: php >= 5 +Requires: httpd %description -The PHPeclipse plugin allows developers to write PHP webpages and scripts in -Eclipse. +PHPEclipse is an open source PHP IDE based on the Eclipse platform. Features +supported include syntax highlighting, content assist, PHP manual integration, +templates and support for the XDebug and DBG debuggers. %prep -%setup -q -n phpeclipse-1.1.8 +%setup -q -n phpeclipse-%{version} -pushd net.sourceforge.phpeclipse +# apply patches %patch0 -p0 -popd -pushd net.sourceforge.phpeclipse.phphelp %patch1 -p0 -popd -%patch2 - -%{__sed} --in-place "s:/usr/share/eclipse:%{eclipse_base}:" net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties -%{__sed} --in-place 's/\r//' net.sourceforge.phpeclipse.feature/cpl-v10.html +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 + +# ditch bundled libs in favor of building against fedora packaged libs +rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \ + net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \ + net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \ + net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \ + net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \ + net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar +build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser xml-commons-apis + +# this is done in a patch instead +#grep -lR sax2 * | xargs sed --in-place "s/sax2/xml-commons-apis/" + +# fix jar versions +find -name MANIFEST.MF | xargs sed --in-place "s/0.0.0/%{version}/" + +# make sure upstream hasn't sneaked in any jars we don't know about +JARS="" +for j in `find -name "*.jar"`; do + if [ ! -L $j ]; then + JARS="$JARS $j" + fi +done +if [ ! -z "$JARS" ]; then + echo "These jars should be deleted and symlinked to system jars: $JARS" + exit 1 +fi %build -# See comments in the script to understand this. +# prepare pdebuild environment /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} -SDK=$(cd SDK > /dev/null && pwd) - -# Eclipse may try to write to the home directory. mkdir home +SDK=$(cd SDK > /dev/null && pwd) homedir=$(cd home > /dev/null && pwd) -# build the main phpeclipse feature -# TODO: convert this to an `eclipse` command -/usr/bin/java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacFailOnError=true \ - -DdontUnzip=true \ - -Dtype=feature \ - -Did=net.sourceforge.phpeclipse \ - -DsourceDirectory=$(pwd) \ - -DbaseLocation=$SDK \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -DdontFetchAnything=true \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml +# build the main feature +java -cp $SDK/startup.jar \ + -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ + org.eclipse.core.launcher.Main \ + -application org.eclipse.ant.core.antRunner \ + -Dtype=feature \ + -Did=net.sourceforge.phpeclipse.feature \ + -DbaseLocation=$SDK \ + -DsourceDirectory=$(pwd) \ + -DbuildDirectory=$(pwd)/build \ + -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ + -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ + -vmargs -Duser.home=$homedir + +# build the debug features +java -cp $SDK/startup.jar \ + -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ + org.eclipse.core.launcher.Main \ + -application org.eclipse.ant.core.antRunner \ + -Dtype=feature \ + -Did=net.sourceforge.phpeclipse.debug.feature \ + -DbaseLocation=$SDK \ + -DsourceDirectory=$(pwd) \ + -DbuildDirectory=$(pwd)/build \ + -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ + -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ + -vmargs -Duser.home=$homedir +java -cp $SDK/startup.jar \ + -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ + org.eclipse.core.launcher.Main \ + -application org.eclipse.ant.core.antRunner \ + -Dtype=feature \ + -Did=net.sourceforge.phpeclipse.xdebug.feature \ + -DbaseLocation=$SDK \ + -DsourceDirectory=$(pwd) \ + -DbuildDirectory=$(pwd)/build \ + -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ + -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ + -vmargs -Duser.home=$homedir %install -rm -rf $RPM_BUILD_ROOT -install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base} -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.zip -rm $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.pde.runtime*.jar +rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{eclipse_base} +unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.feature.zip +unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip +unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip + +# need to recreate the symlinks to libraries that were setup in "prep" +# because for some reason the ant copy task doesn't preserve them +pushd %{buildroot}%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_* +rm *.jar +build-jar-repository -s -p . xml-commons-apis +popd %if %{gcj_support} - aot-compile-rpm +%{_bindir}/aot-compile-rpm %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %if %{gcj_support} %post -p %{_bindir}/rebuild-gcj-db @@ -112,25 +161,47 @@ %files %defattr(-,root,root,-) -%doc %{eclipse_base}/features/net.sourceforge.phpeclipse_%{version}/cpl-v10.html -%{eclipse_base}/features/net.sourceforge.phpeclipse_* -%{eclipse_base}/plugins/net.sourceforge.phpdt.smarty.ui_* +%doc %{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/cpl-v10.html + +# main feature +%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse.core_* -%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.core_* -%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.ui_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse.externaltools_* -%{eclipse_base}/plugins/net.sourceforge.phpeclipse.launching_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.help_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse.phphelp_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.smarty.ui_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse.ui_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse.webbrowser_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.core_* %{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.ui_* + +# debug features +%{eclipse_base}/features/net.sourceforge.phpeclipse.debug.feature_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.core_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.ui_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.launching_* +%{eclipse_base}/features/net.sourceforge.phpeclipse.xdebug.feature_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.core_* +%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.ui_* + %if %{gcj_support} %{_libdir}/gcj/%{name} %endif %changelog +* Sun Jun 29 2008 Mat Booth 1.2.0-0.2.svn1573 +- Add patch for Show External Preview functionality. +- Add patch for Use External PHP Parser functionality. + +* Sat Jun 28 2008 Mat Booth 1.2.0-0.1.svn1573 +- New maintainer. +- Update to version 1.2.0 pre-release, svn1573. +- Adapt patches to new version. +- Update package for new Eclipse plugin guidelines. + * Sat Oct 20 2007 Brandon Holbrook 1.1.8-17 - Reference php5 instead of php4 in httpd.conf [bug 314831] Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Dec 2006 01:06:02 -0000 1.2 +++ sources 5 Jul 2008 13:40:27 -0000 1.3 @@ -1 +1 @@ -4098f937baf31afab1225481c6e0fd94 phpeclipse-1.1.8.tar.gz +7e80bbf2cebb44617f2aee36d0802574 phpeclipse-1.2.0.tar.gz --- eclipse-phpeclipse-3.2-build.patch DELETED --- --- make-phpeclipse-source-archive.sh DELETED --- From fedora-extras-commits at redhat.com Sat Jul 5 13:46:06 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 5 Jul 2008 13:46:06 GMT Subject: rpms/mysql++/devel .cvsignore, 1.10, 1.11 mysql++.spec, 1.11, 1.12 sources, 1.10, 1.11 mysql++-3.0.3-mystring.patch, 1.1, NONE Message-ID: <200807051346.m65Dk6Y3006139@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/mysql++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5973 Modified Files: .cvsignore mysql++.spec sources Removed Files: mysql++-3.0.3-mystring.patch Log Message: update to 3.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mysql++/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 May 2008 21:14:42 -0000 1.10 +++ .cvsignore 5 Jul 2008 13:45:13 -0000 1.11 @@ -1 +1 @@ -mysql++-3.0.3.tar.gz +mysql++-3.0.4.tar.gz Index: mysql++.spec =================================================================== RCS file: /cvs/extras/rpms/mysql++/devel/mysql++.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mysql++.spec 13 May 2008 21:14:42 -0000 1.11 +++ mysql++.spec 5 Jul 2008 13:45:13 -0000 1.12 @@ -1,6 +1,6 @@ Summary: C++ wrapper for the MySQL C API Name: mysql++ -Version: 3.0.3 +Version: 3.0.4 Release: 1%{?dist} License: LGPLv2 Group: Development/Libraries @@ -8,9 +8,6 @@ Source0: http://tangentsoft.net/mysql++/releases/mysql++-%{version}.tar.gz Source1: mysql++.devhelp -# x86_64 build patch from SVN -# http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/mystring.h?rev=2286&r1=2248&r2=2286&makepatch=1&diff_format=u -Patch0: mysql++-3.0.3-mystring.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: mysql-devel @@ -55,7 +52,14 @@ %prep %setup -q -%patch0 -p1 +touch -r CREDITS.txt timestamp +%{__sed} -i -e 's/\r//' CREDITS.txt +touch -r timestamp CREDITS.txt + +touch -r COPYING.txt timestamp +%{__sed} -i -e 's/\r//' COPYING.txt +touch -r timestamp COPYING.txt + %build %configure --with-mysql-lib=%{_libdir}/mysql \ @@ -117,6 +121,9 @@ %{_datadir}/devhelp/books/%{name} %changelog +* Sat Jul 05 2008 Remi Collet 3.0.4-1 +- update to 3.0.4 + * Tue May 13 2008 Remi Collet 3.0.3-1 - update to 3.0.3 - add mysql++-3.0.3-mystring.patch for x86_64 build Index: sources =================================================================== RCS file: /cvs/extras/rpms/mysql++/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 13 May 2008 21:14:42 -0000 1.10 +++ sources 5 Jul 2008 13:45:13 -0000 1.11 @@ -1 +1 @@ -8d33c229afc25245310ec2e568e5aada mysql++-3.0.3.tar.gz +9b1ffa26ef432a7359709e3422104a8e mysql++-3.0.4.tar.gz --- mysql++-3.0.3-mystring.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 5 13:46:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 13:46:52 +0000 Subject: [pkgdb] f-spot ownership updated Message-ID: <200807051346.m65DkqZO024982@bastion.fedora.phx.redhat.com> Package f-spot in Fedora devel is now owned by Nigel Jones (nigelj) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/f-spot From fedora-extras-commits at redhat.com Sat Jul 5 13:47:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 13:47:08 +0000 Subject: [pkgdb] f-spot ownership updated Message-ID: <200807051347.m65Dl8sU025041@bastion.fedora.phx.redhat.com> Package f-spot in Fedora 9 is now owned by Nigel Jones (nigelj) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/f-spot From fedora-extras-commits at redhat.com Sat Jul 5 13:47:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 13:47:13 +0000 Subject: [pkgdb] f-spot ownership updated Message-ID: <200807051347.m65DlDkC025090@bastion.fedora.phx.redhat.com> Package f-spot in Fedora 8 is now owned by Nigel Jones (nigelj) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/f-spot From fedora-extras-commits at redhat.com Sat Jul 5 13:54:35 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 5 Jul 2008 13:54:35 GMT Subject: rpms/mysql++/F-9 mysql++.spec, 1.11, 1.12 sources, 1.10, 1.11 mysql++-3.0.3-mystring.patch, 1.1, NONE Message-ID: <200807051354.m65DsZ9J006849@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/mysql++/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6790 Modified Files: mysql++.spec sources Removed Files: mysql++-3.0.3-mystring.patch Log Message: update to 3.0.4 Index: mysql++.spec =================================================================== RCS file: /cvs/extras/rpms/mysql++/F-9/mysql++.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mysql++.spec 31 May 2008 09:18:04 -0000 1.11 +++ mysql++.spec 5 Jul 2008 13:53:47 -0000 1.12 @@ -1,6 +1,6 @@ Summary: C++ wrapper for the MySQL C API Name: mysql++ -Version: 3.0.3 +Version: 3.0.4 Release: 1%{?dist} License: LGPLv2 Group: Development/Libraries @@ -8,9 +8,6 @@ Source0: http://tangentsoft.net/mysql++/releases/mysql++-%{version}.tar.gz Source1: mysql++.devhelp -# x86_64 build patch from SVN -# http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/mystring.h?rev=2286&r1=2248&r2=2286&makepatch=1&diff_format=u -Patch0: mysql++-3.0.3-mystring.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: mysql-devel @@ -55,7 +52,14 @@ %prep %setup -q -%patch0 -p1 +touch -r CREDITS.txt timestamp +%{__sed} -i -e 's/\r//' CREDITS.txt +touch -r timestamp CREDITS.txt + +touch -r COPYING.txt timestamp +%{__sed} -i -e 's/\r//' COPYING.txt +touch -r timestamp COPYING.txt + %build %configure --with-mysql-lib=%{_libdir}/mysql \ @@ -117,6 +121,9 @@ %{_datadir}/devhelp/books/%{name} %changelog +* Sat Jul 05 2008 Remi Collet 3.0.4-1 +- update to 3.0.4 + * Tue May 13 2008 Remi Collet 3.0.3-1 - update to 3.0.3 - add mysql++-3.0.3-mystring.patch for x86_64 build Index: sources =================================================================== RCS file: /cvs/extras/rpms/mysql++/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 31 May 2008 09:18:04 -0000 1.10 +++ sources 5 Jul 2008 13:53:47 -0000 1.11 @@ -1 +1 @@ -8d33c229afc25245310ec2e568e5aada mysql++-3.0.3.tar.gz +9b1ffa26ef432a7359709e3422104a8e mysql++-3.0.4.tar.gz --- mysql++-3.0.3-mystring.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 5 14:08:42 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 5 Jul 2008 14:08:42 GMT Subject: rpms/shorewall/EL-4 patch-perl-4.0.12.1, NONE, 1.1 shorewall.spec, 1.17, 1.18 Message-ID: <200807051408.m65E8gb5013980@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13932 Modified Files: shorewall.spec Added Files: patch-perl-4.0.12.1 Log Message: * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream --- NEW FILE patch-perl-4.0.12.1 --- diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/install.sh shorewall-perl-4.0.12.1/install.sh --- shorewall-perl-4.0.12/install.sh 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/install.sh 2008-06-29 16:16:25.000000000 -0700 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.0.12 +VERSION=4.0.12.1 usage() # $1 = exit status { diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/patch-perl-4.0.12.1 shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 --- shorewall-perl-4.0.12/patch-perl-4.0.12.1 1969-12-31 16:00:00.000000000 -0800 +++ shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 2008-06-29 16:14:07.000000000 -0700 @@ -0,0 +1,16 @@ +Index: Shorewall/Compiler.pm +=================================================================== +--- Shorewall/Compiler.pm (revision 8500) ++++ Shorewall/Compiler.pm (working copy) +@@ -657,6 +657,11 @@ + else + fatal_error "$iptables_save_file does not exist" + fi ++EOF ++ pop_indent; ++ setup_forwarding; ++ push_indent; ++ emit<<'EOF'; + set_state "Started" + else + if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Compiler.pm shorewall-perl-4.0.12.1/Shorewall/Compiler.pm --- shorewall-perl-4.0.12/Shorewall/Compiler.pm 2008-04-06 06:57:42.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Compiler.pm 2008-06-29 16:09:35.000000000 -0700 @@ -657,6 +657,11 @@ else fatal_error "$iptables_save_file does not exist" fi +EOF + pop_indent; + setup_forwarding; + push_indent; + emit<<'EOF'; set_state "Started" else if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Config.pm shorewall-perl-4.0.12.1/Shorewall/Config.pm --- shorewall-perl-4.0.12/Shorewall/Config.pm 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Config.pm 2008-06-29 16:16:25.000000000 -0700 @@ -244,7 +244,7 @@ ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.0.12", + VERSION => "4.0.12.1", CAPVERSION => 40006 , ); # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Rules.pm shorewall-perl-4.0.12.1/Shorewall/Rules.pm --- shorewall-perl-4.0.12/Shorewall/Rules.pm 2008-06-16 14:39:28.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Rules.pm 2008-04-19 10:31:03.000000000 -0700 @@ -1570,7 +1570,7 @@ if ( $config{DYNAMIC_ZONES} ) { push @rule_chains , [ firewall_zone , $zone , $chain1 ] if $chain1; - push @rule_chains , [ $zone , firewall_zone , $chain2 ] if $chain2; + push @rule_chains , [ $zone , firewall_zone , $chain2 ]; } # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/shorewall-perl.spec shorewall-perl-4.0.12.1/shorewall-perl.spec --- shorewall-perl-4.0.12/shorewall-perl.spec 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/shorewall-perl.spec 2008-06-29 16:16:25.000000000 -0700 @@ -1,6 +1,6 @@ %define name shorewall-perl %define version 4.0.12 -%define release 0base +%define release 1 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -64,6 +64,8 @@ %doc COPYING releasenotes.txt %changelog +* Sun Jun 29 2008 Tom Eastep tom at shorewall.net +- Updated to 4.0.12-1 * Tue Jun 24 2008 Tom Eastep tom at shorewall.net - Updated to 4.0.12-0base * Mon May 19 2008 Tom Eastep tom at shorewall.net Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/EL-4/shorewall.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- shorewall.spec 26 Jun 2008 23:52:50 -0000 1.17 +++ shorewall.spec 5 Jul 2008 14:07:21 -0000 1.18 @@ -11,7 +11,7 @@ Name: shorewall Version: 4.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,6 +24,7 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch +Patch2: patch-perl-4.0.12.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -100,6 +101,10 @@ %patch1 -p1 popd +pushd shorewall-perl-%{version} +%patch2 -p1 +popd + # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -263,6 +268,9 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 +- Apply patch-perl-4.0.12.1 from upstream + * Fri Jun 27 2008 Jonathan G. Underwood - 4.0.12-1 - Update to version 4.0.12 From fedora-extras-commits at redhat.com Sat Jul 5 14:10:15 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 5 Jul 2008 14:10:15 GMT Subject: rpms/shorewall/EL-5 patch-perl-4.0.12.1, NONE, 1.1 shorewall.spec, 1.48, 1.49 Message-ID: <200807051410.m65EAFmF014157@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14062 Modified Files: shorewall.spec Added Files: patch-perl-4.0.12.1 Log Message: * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream --- NEW FILE patch-perl-4.0.12.1 --- diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/install.sh shorewall-perl-4.0.12.1/install.sh --- shorewall-perl-4.0.12/install.sh 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/install.sh 2008-06-29 16:16:25.000000000 -0700 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.0.12 +VERSION=4.0.12.1 usage() # $1 = exit status { diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/patch-perl-4.0.12.1 shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 --- shorewall-perl-4.0.12/patch-perl-4.0.12.1 1969-12-31 16:00:00.000000000 -0800 +++ shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 2008-06-29 16:14:07.000000000 -0700 @@ -0,0 +1,16 @@ +Index: Shorewall/Compiler.pm +=================================================================== +--- Shorewall/Compiler.pm (revision 8500) ++++ Shorewall/Compiler.pm (working copy) +@@ -657,6 +657,11 @@ + else + fatal_error "$iptables_save_file does not exist" + fi ++EOF ++ pop_indent; ++ setup_forwarding; ++ push_indent; ++ emit<<'EOF'; + set_state "Started" + else + if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Compiler.pm shorewall-perl-4.0.12.1/Shorewall/Compiler.pm --- shorewall-perl-4.0.12/Shorewall/Compiler.pm 2008-04-06 06:57:42.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Compiler.pm 2008-06-29 16:09:35.000000000 -0700 @@ -657,6 +657,11 @@ else fatal_error "$iptables_save_file does not exist" fi +EOF + pop_indent; + setup_forwarding; + push_indent; + emit<<'EOF'; set_state "Started" else if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Config.pm shorewall-perl-4.0.12.1/Shorewall/Config.pm --- shorewall-perl-4.0.12/Shorewall/Config.pm 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Config.pm 2008-06-29 16:16:25.000000000 -0700 @@ -244,7 +244,7 @@ ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.0.12", + VERSION => "4.0.12.1", CAPVERSION => 40006 , ); # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Rules.pm shorewall-perl-4.0.12.1/Shorewall/Rules.pm --- shorewall-perl-4.0.12/Shorewall/Rules.pm 2008-06-16 14:39:28.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Rules.pm 2008-04-19 10:31:03.000000000 -0700 @@ -1570,7 +1570,7 @@ if ( $config{DYNAMIC_ZONES} ) { push @rule_chains , [ firewall_zone , $zone , $chain1 ] if $chain1; - push @rule_chains , [ $zone , firewall_zone , $chain2 ] if $chain2; + push @rule_chains , [ $zone , firewall_zone , $chain2 ]; } # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/shorewall-perl.spec shorewall-perl-4.0.12.1/shorewall-perl.spec --- shorewall-perl-4.0.12/shorewall-perl.spec 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/shorewall-perl.spec 2008-06-29 16:16:25.000000000 -0700 @@ -1,6 +1,6 @@ %define name shorewall-perl %define version 4.0.12 -%define release 0base +%define release 1 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -64,6 +64,8 @@ %doc COPYING releasenotes.txt %changelog +* Sun Jun 29 2008 Tom Eastep tom at shorewall.net +- Updated to 4.0.12-1 * Tue Jun 24 2008 Tom Eastep tom at shorewall.net - Updated to 4.0.12-0base * Mon May 19 2008 Tom Eastep tom at shorewall.net Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/EL-5/shorewall.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- shorewall.spec 26 Jun 2008 23:54:02 -0000 1.48 +++ shorewall.spec 5 Jul 2008 14:09:02 -0000 1.49 @@ -11,7 +11,7 @@ Name: shorewall Version: 4.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,6 +24,7 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch +Patch2: patch-perl-4.0.12.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -100,6 +101,10 @@ %patch1 -p1 popd +pushd shorewall-perl-%{version} +%patch2 -p1 +popd + # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -263,6 +268,9 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 +- Apply patch-perl-4.0.12.1 from upstream + * Fri Jun 27 2008 Jonathan G. Underwood - 4.0.12-1 - Update to version 4.0.12 From fedora-extras-commits at redhat.com Sat Jul 5 14:12:34 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 5 Jul 2008 14:12:34 GMT Subject: rpms/shorewall/devel patch-perl-4.0.12.1, NONE, 1.1 shorewall.spec, 1.55, 1.56 Message-ID: <200807051412.m65ECYUu014318@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14251 Modified Files: shorewall.spec Added Files: patch-perl-4.0.12.1 Log Message: * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream --- NEW FILE patch-perl-4.0.12.1 --- diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/install.sh shorewall-perl-4.0.12.1/install.sh --- shorewall-perl-4.0.12/install.sh 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/install.sh 2008-06-29 16:16:25.000000000 -0700 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.0.12 +VERSION=4.0.12.1 usage() # $1 = exit status { diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/patch-perl-4.0.12.1 shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 --- shorewall-perl-4.0.12/patch-perl-4.0.12.1 1969-12-31 16:00:00.000000000 -0800 +++ shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 2008-06-29 16:14:07.000000000 -0700 @@ -0,0 +1,16 @@ +Index: Shorewall/Compiler.pm +=================================================================== +--- Shorewall/Compiler.pm (revision 8500) ++++ Shorewall/Compiler.pm (working copy) +@@ -657,6 +657,11 @@ + else + fatal_error "$iptables_save_file does not exist" + fi ++EOF ++ pop_indent; ++ setup_forwarding; ++ push_indent; ++ emit<<'EOF'; + set_state "Started" + else + if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Compiler.pm shorewall-perl-4.0.12.1/Shorewall/Compiler.pm --- shorewall-perl-4.0.12/Shorewall/Compiler.pm 2008-04-06 06:57:42.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Compiler.pm 2008-06-29 16:09:35.000000000 -0700 @@ -657,6 +657,11 @@ else fatal_error "$iptables_save_file does not exist" fi +EOF + pop_indent; + setup_forwarding; + push_indent; + emit<<'EOF'; set_state "Started" else if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Config.pm shorewall-perl-4.0.12.1/Shorewall/Config.pm --- shorewall-perl-4.0.12/Shorewall/Config.pm 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Config.pm 2008-06-29 16:16:25.000000000 -0700 @@ -244,7 +244,7 @@ ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.0.12", + VERSION => "4.0.12.1", CAPVERSION => 40006 , ); # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Rules.pm shorewall-perl-4.0.12.1/Shorewall/Rules.pm --- shorewall-perl-4.0.12/Shorewall/Rules.pm 2008-06-16 14:39:28.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Rules.pm 2008-04-19 10:31:03.000000000 -0700 @@ -1570,7 +1570,7 @@ if ( $config{DYNAMIC_ZONES} ) { push @rule_chains , [ firewall_zone , $zone , $chain1 ] if $chain1; - push @rule_chains , [ $zone , firewall_zone , $chain2 ] if $chain2; + push @rule_chains , [ $zone , firewall_zone , $chain2 ]; } # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/shorewall-perl.spec shorewall-perl-4.0.12.1/shorewall-perl.spec --- shorewall-perl-4.0.12/shorewall-perl.spec 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/shorewall-perl.spec 2008-06-29 16:16:25.000000000 -0700 @@ -1,6 +1,6 @@ %define name shorewall-perl %define version 4.0.12 -%define release 0base +%define release 1 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -64,6 +64,8 @@ %doc COPYING releasenotes.txt %changelog +* Sun Jun 29 2008 Tom Eastep tom at shorewall.net +- Updated to 4.0.12-1 * Tue Jun 24 2008 Tom Eastep tom at shorewall.net - Updated to 4.0.12-0base * Mon May 19 2008 Tom Eastep tom at shorewall.net Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- shorewall.spec 26 Jun 2008 23:46:05 -0000 1.55 +++ shorewall.spec 5 Jul 2008 14:11:34 -0000 1.56 @@ -11,7 +11,7 @@ Name: shorewall Version: 4.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,6 +24,7 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch +Patch2: patch-perl-4.0.12.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -100,6 +101,10 @@ %patch1 -p1 popd +pushd shorewall-perl-%{version} +%patch2 -p1 +popd + # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -263,6 +268,9 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 +- Apply patch-perl-4.0.12.1 from upstream + * Fri Jun 27 2008 Jonathan G. Underwood - 4.0.12-1 - Update to version 4.0.12 From fedora-extras-commits at redhat.com Sat Jul 5 14:14:15 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 5 Jul 2008 14:14:15 GMT Subject: rpms/shorewall/F-9 patch-perl-4.0.12.1, NONE, 1.1 shorewall.spec, 1.55, 1.56 Message-ID: <200807051414.m65EEFQW014453@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14393 Modified Files: shorewall.spec Added Files: patch-perl-4.0.12.1 Log Message: * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream --- NEW FILE patch-perl-4.0.12.1 --- diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/install.sh shorewall-perl-4.0.12.1/install.sh --- shorewall-perl-4.0.12/install.sh 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/install.sh 2008-06-29 16:16:25.000000000 -0700 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.0.12 +VERSION=4.0.12.1 usage() # $1 = exit status { diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/patch-perl-4.0.12.1 shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 --- shorewall-perl-4.0.12/patch-perl-4.0.12.1 1969-12-31 16:00:00.000000000 -0800 +++ shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 2008-06-29 16:14:07.000000000 -0700 @@ -0,0 +1,16 @@ +Index: Shorewall/Compiler.pm +=================================================================== +--- Shorewall/Compiler.pm (revision 8500) ++++ Shorewall/Compiler.pm (working copy) +@@ -657,6 +657,11 @@ + else + fatal_error "$iptables_save_file does not exist" + fi ++EOF ++ pop_indent; ++ setup_forwarding; ++ push_indent; ++ emit<<'EOF'; + set_state "Started" + else + if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Compiler.pm shorewall-perl-4.0.12.1/Shorewall/Compiler.pm --- shorewall-perl-4.0.12/Shorewall/Compiler.pm 2008-04-06 06:57:42.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Compiler.pm 2008-06-29 16:09:35.000000000 -0700 @@ -657,6 +657,11 @@ else fatal_error "$iptables_save_file does not exist" fi +EOF + pop_indent; + setup_forwarding; + push_indent; + emit<<'EOF'; set_state "Started" else if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Config.pm shorewall-perl-4.0.12.1/Shorewall/Config.pm --- shorewall-perl-4.0.12/Shorewall/Config.pm 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Config.pm 2008-06-29 16:16:25.000000000 -0700 @@ -244,7 +244,7 @@ ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.0.12", + VERSION => "4.0.12.1", CAPVERSION => 40006 , ); # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Rules.pm shorewall-perl-4.0.12.1/Shorewall/Rules.pm --- shorewall-perl-4.0.12/Shorewall/Rules.pm 2008-06-16 14:39:28.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Rules.pm 2008-04-19 10:31:03.000000000 -0700 @@ -1570,7 +1570,7 @@ if ( $config{DYNAMIC_ZONES} ) { push @rule_chains , [ firewall_zone , $zone , $chain1 ] if $chain1; - push @rule_chains , [ $zone , firewall_zone , $chain2 ] if $chain2; + push @rule_chains , [ $zone , firewall_zone , $chain2 ]; } # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/shorewall-perl.spec shorewall-perl-4.0.12.1/shorewall-perl.spec --- shorewall-perl-4.0.12/shorewall-perl.spec 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/shorewall-perl.spec 2008-06-29 16:16:25.000000000 -0700 @@ -1,6 +1,6 @@ %define name shorewall-perl %define version 4.0.12 -%define release 0base +%define release 1 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -64,6 +64,8 @@ %doc COPYING releasenotes.txt %changelog +* Sun Jun 29 2008 Tom Eastep tom at shorewall.net +- Updated to 4.0.12-1 * Tue Jun 24 2008 Tom Eastep tom at shorewall.net - Updated to 4.0.12-0base * Mon May 19 2008 Tom Eastep tom at shorewall.net Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-9/shorewall.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- shorewall.spec 27 Jun 2008 00:02:25 -0000 1.55 +++ shorewall.spec 5 Jul 2008 14:13:10 -0000 1.56 @@ -11,7 +11,7 @@ Name: shorewall Version: 4.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,6 +24,7 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch +Patch2: patch-perl-4.0.12.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -100,6 +101,10 @@ %patch1 -p1 popd +pushd shorewall-perl-%{version} +%patch2 -p1 +popd + # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -263,6 +268,9 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 +- Apply patch-perl-4.0.12.1 from upstream + * Fri Jun 27 2008 Jonathan G. Underwood - 4.0.12-1 - Update to version 4.0.12 From fedora-extras-commits at redhat.com Sat Jul 5 14:16:05 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 5 Jul 2008 14:16:05 GMT Subject: rpms/shorewall/F-8 patch-perl-4.0.12.1, NONE, 1.1 shorewall.spec, 1.51, 1.52 Message-ID: <200807051416.m65EG5e7014557@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14508 Modified Files: shorewall.spec Added Files: patch-perl-4.0.12.1 Log Message: * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream --- NEW FILE patch-perl-4.0.12.1 --- diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/install.sh shorewall-perl-4.0.12.1/install.sh --- shorewall-perl-4.0.12/install.sh 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/install.sh 2008-06-29 16:16:25.000000000 -0700 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.0.12 +VERSION=4.0.12.1 usage() # $1 = exit status { diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/patch-perl-4.0.12.1 shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 --- shorewall-perl-4.0.12/patch-perl-4.0.12.1 1969-12-31 16:00:00.000000000 -0800 +++ shorewall-perl-4.0.12.1/patch-perl-4.0.12.1 2008-06-29 16:14:07.000000000 -0700 @@ -0,0 +1,16 @@ +Index: Shorewall/Compiler.pm +=================================================================== +--- Shorewall/Compiler.pm (revision 8500) ++++ Shorewall/Compiler.pm (working copy) +@@ -657,6 +657,11 @@ + else + fatal_error "$iptables_save_file does not exist" + fi ++EOF ++ pop_indent; ++ setup_forwarding; ++ push_indent; ++ emit<<'EOF'; + set_state "Started" + else + if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Compiler.pm shorewall-perl-4.0.12.1/Shorewall/Compiler.pm --- shorewall-perl-4.0.12/Shorewall/Compiler.pm 2008-04-06 06:57:42.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Compiler.pm 2008-06-29 16:09:35.000000000 -0700 @@ -657,6 +657,11 @@ else fatal_error "$iptables_save_file does not exist" fi +EOF + pop_indent; + setup_forwarding; + push_indent; + emit<<'EOF'; set_state "Started" else if [ $COMMAND = refresh ]; then diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Config.pm shorewall-perl-4.0.12.1/Shorewall/Config.pm --- shorewall-perl-4.0.12/Shorewall/Config.pm 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Config.pm 2008-06-29 16:16:25.000000000 -0700 @@ -244,7 +244,7 @@ ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.0.12", + VERSION => "4.0.12.1", CAPVERSION => 40006 , ); # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/Shorewall/Rules.pm shorewall-perl-4.0.12.1/Shorewall/Rules.pm --- shorewall-perl-4.0.12/Shorewall/Rules.pm 2008-06-16 14:39:28.000000000 -0700 +++ shorewall-perl-4.0.12.1/Shorewall/Rules.pm 2008-04-19 10:31:03.000000000 -0700 @@ -1570,7 +1570,7 @@ if ( $config{DYNAMIC_ZONES} ) { push @rule_chains , [ firewall_zone , $zone , $chain1 ] if $chain1; - push @rule_chains , [ $zone , firewall_zone , $chain2 ] if $chain2; + push @rule_chains , [ $zone , firewall_zone , $chain2 ]; } # diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.12/shorewall-perl.spec shorewall-perl-4.0.12.1/shorewall-perl.spec --- shorewall-perl-4.0.12/shorewall-perl.spec 2008-06-24 06:40:32.000000000 -0700 +++ shorewall-perl-4.0.12.1/shorewall-perl.spec 2008-06-29 16:16:25.000000000 -0700 @@ -1,6 +1,6 @@ %define name shorewall-perl %define version 4.0.12 -%define release 0base +%define release 1 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -64,6 +64,8 @@ %doc COPYING releasenotes.txt %changelog +* Sun Jun 29 2008 Tom Eastep tom at shorewall.net +- Updated to 4.0.12-1 * Tue Jun 24 2008 Tom Eastep tom at shorewall.net - Updated to 4.0.12-0base * Mon May 19 2008 Tom Eastep tom at shorewall.net Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-8/shorewall.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- shorewall.spec 26 Jun 2008 23:49:42 -0000 1.51 +++ shorewall.spec 5 Jul 2008 14:14:56 -0000 1.52 @@ -11,7 +11,7 @@ Name: shorewall Version: 4.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,6 +24,7 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch +Patch2: patch-perl-4.0.12.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -100,6 +101,10 @@ %patch1 -p1 popd +pushd shorewall-perl-%{version} +%patch2 -p1 +popd + # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -263,6 +268,9 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 +- Apply patch-perl-4.0.12.1 from upstream + * Fri Jun 27 2008 Jonathan G. Underwood - 4.0.12-1 - Update to version 4.0.12 From fedora-extras-commits at redhat.com Sat Jul 5 15:03:56 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Sat, 5 Jul 2008 15:03:56 GMT Subject: rpms/sugar-toolkit/OLPC-3 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 sugar-toolkit.spec, 1.13, 1.14 Message-ID: <200807051503.m65F3uKs023777@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23685 Modified Files: .cvsignore sources sugar-toolkit.spec Log Message: * Sat Jul 05 2008 Tomeu Vizoso - 0.81.5-4.20080705gitab8c054dfb - New git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Jul 2008 16:10:24 -0000 1.8 +++ .cvsignore 5 Jul 2008 15:03:06 -0000 1.9 @@ -1 +1 @@ -sugar-toolkit-0.81.5-git7c5fa614a6.tar.bz2 +sugar-toolkit-0.81.5-gitab8c054dfb.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 3 Jul 2008 16:10:24 -0000 1.9 +++ sources 5 Jul 2008 15:03:06 -0000 1.10 @@ -1 +1 @@ -5ee4df9cca052c12ce95738ef13d1f0c sugar-toolkit-0.81.5-git7c5fa614a6.tar.bz2 +19b8dc70fe626c8b9332726131b8a204 sugar-toolkit-0.81.5-gitab8c054dfb.tar.bz2 Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-3/sugar-toolkit.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sugar-toolkit.spec 3 Jul 2008 16:45:48 -0000 1.13 +++ sugar-toolkit.spec 5 Jul 2008 15:03:06 -0000 1.14 @@ -1,12 +1,12 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -%define commitid 7c5fa614a6 -%define alphatag 20080703git%{commitid} +%define commitid ab8c054dfb +%define alphatag 20080705git%{commitid} Summary: Sugar toolkit Name: sugar-toolkit Version: 0.81.5 -Release: 3.%{alphatag}%{?dist} +Release: 4.%{alphatag}%{?dist} URL: http://wiki.laptop.org/go/Sugar # Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 # git clone git://dev.laptop.org/sugar-toolkit @@ -65,7 +65,10 @@ %{_sysconfdir}/rpm/macros.sugar %changelog -* Thu Jul 03 2008 Simon Schampijer - 0.81.1-3.20080703git7c5fa614a6 +* Sat Jul 05 2008 Tomeu Vizoso - 0.81.5-4.20080705gitab8c054dfb +- New git snapshot + +* Thu Jul 03 2008 Simon Schampijer - 0.81.5-3.20080703git7c5fa614a6 - New git snapshot * Sat Jun 21 2008 Tomeu Vizoso - 0.81.5-2 From fedora-extras-commits at redhat.com Sat Jul 5 15:08:09 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Sat, 5 Jul 2008 15:08:09 GMT Subject: rpms/sugar/OLPC-3 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sugar.spec, 1.14, 1.15 Message-ID: <200807051508.m65F89DL024115@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24027 Modified Files: .cvsignore sources sugar.spec Log Message: * Thu Jul 05 2008 Tomeu Vizoso - 0.81.5-3.20080705git5da4483a6c - New git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Jul 2008 16:19:58 -0000 1.11 +++ .cvsignore 5 Jul 2008 15:06:55 -0000 1.12 @@ -1 +1 @@ -sugar-0.81.5-git4f3f508bc3.tar.bz2 +sugar-0.81.5-git5da4483a6c.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Jul 2008 16:19:58 -0000 1.11 +++ sources 5 Jul 2008 15:06:55 -0000 1.12 @@ -1 +1 @@ -5e7e6820fa11a9643cf8c21aa198c876 sugar-0.81.5-git4f3f508bc3.tar.bz2 +3281fef9238e6c87fb0f86cdb86b10e9 sugar-0.81.5-git5da4483a6c.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sugar.spec 3 Jul 2008 16:19:58 -0000 1.14 +++ sugar.spec 5 Jul 2008 15:06:55 -0000 1.15 @@ -1,10 +1,10 @@ -%define commitid 4f3f508bc3 -%define alphatag 20080703git%{commitid} +%define commitid 5da4483a6c +%define alphatag 20080705git%{commitid} Summary: OLPC desktop environment Name: sugar Version: 0.81.5 -Release: 2.%{alphatag}%{?dist} +Release: 3.%{alphatag}%{?dist} URL: http://dev.laptop.org # git clone git://dev.laptop.org/sugar # cd sugar @@ -75,6 +75,9 @@ %{_datadir}/mime/packages/sugar.xml %changelog +* Thu Jul 05 2008 Tomeu Vizoso - 0.81.5-3.20080705git5da4483a6c +- New git snapshot + * Thu Jul 03 2008 Tomeu Vizoso - 0.81.5-2.20080703git4f3f508bc3 - New git snapshot From fedora-extras-commits at redhat.com Sat Jul 5 15:36:36 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Sat, 5 Jul 2008 15:36:36 GMT Subject: rpms/gnome-subtitles/devel gnome-subtitles-0.8-smp.patch, NONE, 1.1 gnome-subtitles.spec, 1.2, 1.3 Message-ID: <200807051536.m65FaaA3025421@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/gnome-subtitles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25338 Modified Files: gnome-subtitles.spec Added Files: gnome-subtitles-0.8-smp.patch Log Message: * Sat Jul 5 2008 Julian Sikorski - 0.8-4 - Another rebuild - Patched SMP build failure gnome-subtitles-0.8-smp.patch: --- NEW FILE gnome-subtitles-0.8-smp.patch --- --- src/Makefile.am.smp 2008-07-05 17:17:53.000000000 +0200 +++ src/Makefile.am 2008-07-05 17:18:23.000000000 +0200 @@ -43,7 +43,7 @@ $(GSTPB) \ Mono.Posix.dll -$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES) +$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES) $(GSTPB) $(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) $(SUBLIB_LIBS) $(GS_RESOURCES:%=-resource:%) $(GS_SOURCES) $(ASSEMBLY_CONFIG): --- src/Makefile.in.smp 2008-07-05 17:17:39.000000000 +0200 +++ src/Makefile.in 2008-07-05 17:19:01.000000000 +0200 @@ -485,7 +485,7 @@ uninstall-info-am -$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES) +$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES) $(GSTPB) $(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) $(SUBLIB_LIBS) $(GS_RESOURCES:%=-resource:%) $(GS_SOURCES) $(ASSEMBLY_CONFIG): Index: gnome-subtitles.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/devel/gnome-subtitles.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-subtitles.spec 26 May 2008 10:13:40 -0000 1.2 +++ gnome-subtitles.spec 5 Jul 2008 15:35:36 -0000 1.3 @@ -1,12 +1,13 @@ Name: gnome-subtitles Version: 0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Subtitle editor for Gnome Group: Applications/Multimedia License: GPLv2+ URL: http://gnome-subtitles.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: gnome-subtitles-0.8-smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -38,12 +39,13 @@ %prep %setup -q +%patch0 -p0 -b .smp %build %configure --disable-schemas-install \ --disable-scrollkeeper -%{__make} +%{__make} %{?_smp_mflags} %install @@ -104,6 +106,10 @@ %changelog +* Sat Jul 5 2008 Julian Sikorski - 0.8-4 +- Another rebuild +- Patched SMP build failure + * Mon May 26 2008 Julian Sikorski - 0.8-3 - Rebuilt to fix broken deps From fedora-extras-commits at redhat.com Sat Jul 5 15:59:49 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 5 Jul 2008 15:59:49 GMT Subject: rpms/evolution-rss/F-9 evolution-rss-0.1.0-firefox-import.patch, NONE, 1.1 evolution-rss.spec, 1.16, 1.17 Message-ID: <200807051559.m65Fxnk9026697@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26619 Modified Files: evolution-rss.spec Added Files: evolution-rss-0.1.0-firefox-import.patch Log Message: - Fix firefox import RH bug #452322 evolution-rss-0.1.0-firefox-import.patch: --- NEW FILE evolution-rss-0.1.0-firefox-import.patch --- Index: src/misc.c =================================================================== --- src/misc.c (.../svn+ssh://lucilanga at svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/misc.c) (revision 333) +++ src/misc.c (.../src/misc.c) (working copy) @@ -65,6 +65,8 @@ { if (strstr(text, "feed//")) text = strextr(text, "feed//"); + if (strstr(text, "feed:")) + text = strextr(text, "feed:"); if (strstr(text, "feed://")) text = strextr(text, "feed://"); if (!strstr (text, "http://") Index: src/network-soup.c =================================================================== --- src/network-soup.c (.../svn+ssh://lucilanga at svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/network-soup.c) (revision 333) +++ src/network-soup.c (.../src/network-soup.c) (working copy) @@ -488,7 +488,7 @@ if (!rf->b_session) rf->b_session = soup_sess = - soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL); + soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL); else soup_sess = rf->b_session; @@ -499,14 +499,14 @@ G_CALLBACK (reauthenticate), soup_sess); #endif - suri = soup_uri_new(url); - if (!suri) + req = soup_message_new(SOUP_METHOD_GET, url); + if (!req) { g_set_error(err, NET_ERROR, NET_ERROR_GENERIC, soup_status_get_phrase(2)); //invalid url goto out; } - req = soup_message_new_from_uri(SOUP_METHOD_GET, suri); + d(g_print("request ok :%d\n", req->status_code)); g_signal_connect(G_OBJECT(req), "got-chunk", G_CALLBACK(got_chunk_blocking_cb), &info); for (; headers; headers = headers->next) { Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-9/evolution-rss.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- evolution-rss.spec 2 Jul 2008 16:02:23 -0000 1.16 +++ evolution-rss.spec 5 Jul 2008 15:59:05 -0000 1.17 @@ -1,10 +1,11 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz +Patch0: evolution-rss-0.1.0-firefox-import.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Requires: evolution @@ -28,6 +29,7 @@ %prep %setup -q -n evolution-rss-%{version} +%patch0 -p0 -b .firefox %build %configure --with-primary-render=gecko @@ -87,6 +89,9 @@ %doc TODO %changelog +* Sat Jul 5 2008 Lucian Langa - 0.1.0-2 +- Fix firefox import RH bug #452322 + * Wed Jul 2 2008 Lucian Langa - 0.1.0-1 - Update to 0.1.0 version From fedora-extras-commits at redhat.com Sat Jul 5 16:37:55 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sat, 5 Jul 2008 16:37:55 GMT Subject: rpms/kernel/devel .cvsignore, 1.850, 1.851 kernel.spec, 1.734, 1.735 sources, 1.811, 1.812 upstream, 1.729, 1.730 linux-2.6-x86-efi-fix-low-mappings.patch, 1.1, NONE Message-ID: <200807051637.m65Gbt9s004137@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4084 Modified Files: .cvsignore kernel.spec sources upstream Removed Files: linux-2.6-x86-efi-fix-low-mappings.patch Log Message: 2.6.26-rc8-git5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.850 retrieving revision 1.851 diff -u -r1.850 -r1.851 --- .cvsignore 4 Jul 2008 20:01:40 -0000 1.850 +++ .cvsignore 5 Jul 2008 16:36:59 -0000 1.851 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git4.bz2 +patch-2.6.26-rc8-git5.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.734 retrieving revision 1.735 diff -u -r1.734 -r1.735 --- kernel.spec 4 Jul 2008 20:01:40 -0000 1.734 +++ kernel.spec 5 Jul 2008 16:36:59 -0000 1.735 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 8 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -664,7 +664,6 @@ # get rid of imacfb and make efifb work everywhere it was used Patch2600: linux-2.6-merge-efifb-imacfb.patch -Patch2610: linux-2.6-x86-efi-fix-low-mappings.patch %endif @@ -1198,8 +1197,6 @@ # get rid of imacfb and make efifb work everywhere it was used ApplyPatch linux-2.6-merge-efifb-imacfb.patch -# fix efi boot -ApplyPatch linux-2.6-x86-efi-fix-low-mappings.patch # ---------- below all scheduled for 2.6.24 ----------------- @@ -1794,6 +1791,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Sat Jul 05 2008 Dave Jones +- 2.6.26-rc8-git5 + * Fri Jul 04 2008 Dave Jones - 2.6.26-rc8-git4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.811 retrieving revision 1.812 diff -u -r1.811 -r1.812 --- sources 4 Jul 2008 20:01:40 -0000 1.811 +++ sources 5 Jul 2008 16:36:59 -0000 1.812 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 db9fee832152a33946993459fc85a18f patch-2.6.26-rc8.bz2 -28605f24ec9440e57586f05433b598f6 patch-2.6.26-rc8-git4.bz2 +d0b787c3aaf91ce376b7290368a870c6 patch-2.6.26-rc8-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.729 retrieving revision 1.730 diff -u -r1.729 -r1.730 --- upstream 4 Jul 2008 20:01:40 -0000 1.729 +++ upstream 5 Jul 2008 16:36:59 -0000 1.730 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git4.bz2 +patch-2.6.26-rc8-git5.bz2 --- linux-2.6-x86-efi-fix-low-mappings.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 5 17:04:24 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 5 Jul 2008 17:04:24 GMT Subject: rpms/jd/F-9 .cvsignore, 1.259, 1.260 jd.spec, 1.296, 1.297 sources, 1.260, 1.261 Message-ID: <200807051704.m65H4OvH012224@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12151/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Jul 6 2008 Mamoru Tasaka - rev 2175 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- .cvsignore 4 Jul 2008 18:05:56 -0000 1.259 +++ .cvsignore 5 Jul 2008 17:03:26 -0000 1.260 @@ -1 +1 @@ -jd-2.0.0-svn2170_trunk.tgz +jd-2.0.0-svn2175_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- jd.spec 4 Jul 2008 18:05:56 -0000 1.296 +++ jd.spec 5 Jul 2008 17:03:26 -0000 1.297 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2170_trunk +%define strtag svn2175_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sat Jul 5 2008 Mamoru Tasaka -- rev 2170 +* Sun Jul 6 2008 Mamoru Tasaka +- rev 2175 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- sources 4 Jul 2008 18:05:56 -0000 1.260 +++ sources 5 Jul 2008 17:03:26 -0000 1.261 @@ -1 +1 @@ -63e383d9aebdc210ec34fdae6927819d jd-2.0.0-svn2170_trunk.tgz +abddb002d29b7c2c4979a55cf7cd5d64 jd-2.0.0-svn2175_trunk.tgz From fedora-extras-commits at redhat.com Sat Jul 5 17:04:26 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 5 Jul 2008 17:04:26 GMT Subject: rpms/jd/F-8 .cvsignore, 1.252, 1.253 jd.spec, 1.285, 1.286 sources, 1.253, 1.254 Message-ID: <200807051704.m65H4QcD012229@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12151/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Jul 6 2008 Mamoru Tasaka - rev 2175 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- .cvsignore 4 Jul 2008 18:05:37 -0000 1.252 +++ .cvsignore 5 Jul 2008 17:03:02 -0000 1.253 @@ -1 +1 @@ -jd-2.0.0-svn2170_trunk.tgz +jd-2.0.0-svn2175_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.285 retrieving revision 1.286 diff -u -r1.285 -r1.286 --- jd.spec 4 Jul 2008 18:05:37 -0000 1.285 +++ jd.spec 5 Jul 2008 17:03:02 -0000 1.286 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2170_trunk +%define strtag svn2175_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sat Jul 5 2008 Mamoru Tasaka -- rev 2170 +* Sun Jul 6 2008 Mamoru Tasaka +- rev 2175 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- sources 4 Jul 2008 18:05:37 -0000 1.253 +++ sources 5 Jul 2008 17:03:02 -0000 1.254 @@ -1 +1 @@ -63e383d9aebdc210ec34fdae6927819d jd-2.0.0-svn2170_trunk.tgz +abddb002d29b7c2c4979a55cf7cd5d64 jd-2.0.0-svn2175_trunk.tgz From fedora-extras-commits at redhat.com Sat Jul 5 17:04:44 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 5 Jul 2008 17:04:44 GMT Subject: rpms/jd/devel .cvsignore, 1.259, 1.260 jd.spec, 1.302, 1.303 sources, 1.260, 1.261 Message-ID: <200807051704.m65H4iuH012236@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12151/devel Modified Files: .cvsignore jd.spec sources Log Message: * Sun Jul 6 2008 Mamoru Tasaka - rev 2175 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- .cvsignore 4 Jul 2008 18:06:21 -0000 1.259 +++ .cvsignore 5 Jul 2008 17:03:54 -0000 1.260 @@ -1 +1 @@ -jd-2.0.0-svn2170_trunk.tgz +jd-2.0.0-svn2175_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- jd.spec 4 Jul 2008 18:06:21 -0000 1.302 +++ jd.spec 5 Jul 2008 17:03:54 -0000 1.303 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2170_trunk +%define strtag svn2175_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sat Jul 5 2008 Mamoru Tasaka -- rev 2170 +* Sun Jul 6 2008 Mamoru Tasaka +- rev 2175 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- sources 4 Jul 2008 18:06:21 -0000 1.260 +++ sources 5 Jul 2008 17:03:54 -0000 1.261 @@ -1 +1 @@ -63e383d9aebdc210ec34fdae6927819d jd-2.0.0-svn2170_trunk.tgz +abddb002d29b7c2c4979a55cf7cd5d64 jd-2.0.0-svn2175_trunk.tgz From fedora-extras-commits at redhat.com Sat Jul 5 17:57:40 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Sat, 5 Jul 2008 17:57:40 GMT Subject: rpms/openswan/devel .cvsignore, 1.21, 1.22 openswan.spec, 1.63, 1.64 sources, 1.20, 1.21 Message-ID: <200807051757.m65HveMn014813@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/openswan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14774 Modified Files: .cvsignore openswan.spec sources Log Message: * Sat Jul 05 2008 Steve Grubb - 2.6.15-1 - new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 6 Jun 2008 19:15:42 -0000 1.21 +++ .cvsignore 5 Jul 2008 17:56:51 -0000 1.22 @@ -5,3 +5,4 @@ openswan-2.6.07.tar.gz openswan-2.6.09.tar.gz openswan-2.6.14.tar.gz +openswan-2.6.15.tar.gz Index: openswan.spec =================================================================== RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- openswan.spec 6 Jun 2008 19:15:42 -0000 1.63 +++ openswan.spec 5 Jul 2008 17:56:51 -0000 1.64 @@ -1,6 +1,6 @@ Summary: Openswan IPSEC implementation Name: openswan -Version: 2.6.14 +Version: 2.6.15 Release: 1%{?dist} License: GPLv2+ @@ -12,8 +12,7 @@ Patch1: openswan-2.6-examples.patch Patch2: openswan-2.6-relpath.patch Patch3: openswan-2.6-noxmlto.patch -Patch4: openswan-2.6-intwarning.patch -Patch5: openswan-2.6-selinux.patch +Patch4: openswan-2.6-selinux.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,8 +56,7 @@ %patch1 -p1 %patch2 -p1 -b .relpath %patch3 -p1 -b .noxmlto -%patch4 -p1 -b .interface -%patch5 -p1 -b .selinux +%patch4 -p1 -b .selinux %build @@ -150,6 +148,9 @@ chkconfig --add ipsec || : %changelog +* Sat Jul 05 2008 Steve Grubb - 2.6.15-1 +- new upstream release + * Fri Jun 06 2008 Steve Grubb - 2.6.14-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 6 Jun 2008 19:15:42 -0000 1.20 +++ sources 5 Jul 2008 17:56:51 -0000 1.21 @@ -1 +1 @@ -44dc3cb98b9cb4e3fa03b82967d08b78 openswan-2.6.14.tar.gz +767857e546a49f4f2183704343623411 openswan-2.6.15.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 18:06:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:06:03 +0000 Subject: [pkgdb] python-sqlite2 (Fedora EPEL, 4) updated by kevin Message-ID: <200807051806.m65I63CZ032252@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for python-sqlite2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-sqlite2 (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-sqlite2 (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-sqlite2 (Fedora EPEL 4) Kevin Fenzi (kevin) changed owner of python-sqlite2 in Fedora EPEL 4 to laxathom To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlite2 From fedora-extras-commits at redhat.com Sat Jul 5 18:08:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:08:53 +0000 Subject: [pkgdb] xdialog was added for pertusus Message-ID: <200807051808.m65I8r41032340@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xdialog with summary X11 drop in replacement for cdialog Kevin Fenzi (kevin) has approved Package xdialog Kevin Fenzi (kevin) has added a Fedora devel branch for xdialog with an owner of pertusus Kevin Fenzi (kevin) has approved xdialog in Fedora devel Kevin Fenzi (kevin) has approved Package xdialog Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdialog (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdialog (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdialog (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdialog From fedora-extras-commits at redhat.com Sat Jul 5 18:08:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:08:56 +0000 Subject: [pkgdb] xdialog (Fedora EPEL, 5) updated by kevin Message-ID: <200807051808.m65I8u7R032359@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for xdialog Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdialog (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdialog (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdialog (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on xdialog (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdialog From fedora-extras-commits at redhat.com Sat Jul 5 18:08:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:08:56 +0000 Subject: [pkgdb] xdialog (Fedora, 8) updated by kevin Message-ID: <200807051808.m65I8uOr032360@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xdialog Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdialog (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdialog (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdialog (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on xdialog (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdialog From fedora-extras-commits at redhat.com Sat Jul 5 18:08:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:08:56 +0000 Subject: [pkgdb] xdialog (Fedora, devel) updated by kevin Message-ID: <200807051808.m65I8uOt032360@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xdialog (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdialog From fedora-extras-commits at redhat.com Sat Jul 5 18:08:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:08:56 +0000 Subject: [pkgdb] xdialog (Fedora, 9) updated by kevin Message-ID: <200807051808.m65I8u7V032359@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for xdialog Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdialog (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdialog (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdialog (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on xdialog (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdialog From fedora-extras-commits at redhat.com Sat Jul 5 18:08:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:08:56 +0000 Subject: [pkgdb] xdialog (Fedora EPEL, 4) updated by kevin Message-ID: <200807051808.m65I8u7X032359@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for xdialog Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdialog (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdialog (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdialog (Fedora EPEL 4) Kevin Fenzi (kevin) Approved cvsextras for commit access on xdialog (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdialog From fedora-extras-commits at redhat.com Sat Jul 5 18:09:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:09:31 GMT Subject: rpms/xdialog - New directory Message-ID: <200807051809.m65I9Vmm021847@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdialog In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21815/rpms/xdialog Log Message: Directory /cvs/extras/rpms/xdialog added to the repository From fedora-extras-commits at redhat.com Sat Jul 5 18:09:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:09:46 GMT Subject: rpms/xdialog/devel - New directory Message-ID: <200807051809.m65I9kuD021863@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdialog/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21815/rpms/xdialog/devel Log Message: Directory /cvs/extras/rpms/xdialog/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 5 18:10:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:10:05 GMT Subject: rpms/xdialog Makefile,NONE,1.1 Message-ID: <200807051810.m65IA5h6021889@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdialog In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21815/rpms/xdialog Added Files: Makefile Log Message: Setup of module xdialog --- NEW FILE Makefile --- # Top level Makefile for module xdialog all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 5 18:10:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:10:21 GMT Subject: rpms/xdialog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807051810.m65IAL8u021906@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdialog/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21815/rpms/xdialog/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xdialog --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xdialog # $Id: Makefile,v 1.1 2008/07/05 18:10:05 kevin Exp $ NAME := xdialog SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 5 18:10:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:10:49 +0000 Subject: [pkgdb] gnome-desktop-sharp was added for laxathom Message-ID: <200807051810.m65IAnFq032591@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gnome-desktop-sharp with summary .Net language binding for mono Kevin Fenzi (kevin) has approved Package gnome-desktop-sharp Kevin Fenzi (kevin) has added a Fedora devel branch for gnome-desktop-sharp with an owner of laxathom Kevin Fenzi (kevin) has approved gnome-desktop-sharp in Fedora devel Kevin Fenzi (kevin) has approved Package gnome-desktop-sharp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-desktop-sharp (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-desktop-sharp (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-desktop-sharp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp From fedora-extras-commits at redhat.com Sat Jul 5 18:10:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:10:55 +0000 Subject: [pkgdb] gnome-desktop-sharp (Fedora EPEL, 5) updated by kevin Message-ID: <200807051810.m65IAub4032611@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for gnome-desktop-sharp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-desktop-sharp (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-desktop-sharp (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-desktop-sharp (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-desktop-sharp (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp From fedora-extras-commits at redhat.com Sat Jul 5 18:10:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:10:55 +0000 Subject: [pkgdb] gnome-desktop-sharp (Fedora, devel) updated by kevin Message-ID: <200807051810.m65IAub7032611@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-desktop-sharp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp From fedora-extras-commits at redhat.com Sat Jul 5 18:10:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 18:10:55 +0000 Subject: [pkgdb] gnome-desktop-sharp (Fedora, 9) updated by kevin Message-ID: <200807051810.m65IAubA032611@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for gnome-desktop-sharp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-desktop-sharp (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-desktop-sharp (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-desktop-sharp (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-desktop-sharp (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop-sharp From fedora-extras-commits at redhat.com Sat Jul 5 18:11:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:11:25 GMT Subject: rpms/gnome-desktop-sharp - New directory Message-ID: <200807051811.m65IBPxB022154@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-desktop-sharp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst22119/rpms/gnome-desktop-sharp Log Message: Directory /cvs/extras/rpms/gnome-desktop-sharp added to the repository From fedora-extras-commits at redhat.com Sat Jul 5 18:11:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:11:41 GMT Subject: rpms/gnome-desktop-sharp/devel - New directory Message-ID: <200807051811.m65IBf58022176@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-desktop-sharp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst22119/rpms/gnome-desktop-sharp/devel Log Message: Directory /cvs/extras/rpms/gnome-desktop-sharp/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 5 18:12:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:12:03 GMT Subject: rpms/gnome-desktop-sharp Makefile,NONE,1.1 Message-ID: <200807051812.m65IC3iX022207@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-desktop-sharp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst22119/rpms/gnome-desktop-sharp Added Files: Makefile Log Message: Setup of module gnome-desktop-sharp --- NEW FILE Makefile --- # Top level Makefile for module gnome-desktop-sharp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 5 18:12:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 5 Jul 2008 18:12:16 GMT Subject: rpms/gnome-desktop-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807051812.m65ICGWJ022226@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-desktop-sharp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst22119/rpms/gnome-desktop-sharp/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-desktop-sharp --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gnome-desktop-sharp # $Id: Makefile,v 1.1 2008/07/05 18:12:03 kevin Exp $ NAME := gnome-desktop-sharp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 5 18:38:45 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Sat, 5 Jul 2008 18:38:45 GMT Subject: rpms/gnome-desktop-sharp/devel gnome-desktop-sharp-2.20.1-libdir.patch, NONE, 1.1 gnome-desktop-sharp.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807051838.m65Icjb2023565@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gnome-desktop-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23509/devel Modified Files: .cvsignore sources Added Files: gnome-desktop-sharp-2.20.1-libdir.patch gnome-desktop-sharp.spec import.log Log Message: Initial Import. gnome-desktop-sharp-2.20.1-libdir.patch: --- NEW FILE gnome-desktop-sharp-2.20.1-libdir.patch --- diff -up gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in.libdir gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in --- gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in.libdir 2008-07-05 10:06:11.000000000 +0200 +++ gnome-desktop-sharp-2.20.1/gnomedesktop/gnome-desktop-sharp-2.0.pc.in 2008-07-05 10:06:59.000000000 +0200 @@ -1,8 +1,8 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ gapidir=${prefix}/share/gnomedesktop-sharp/2.20 -assemblies_dir=${libdir}/mono/gnomedesktop-sharp-2.20 +assemblies_dir=@libdir@/mono/gnomedesktop-sharp-2.20 Name: GnomeDesktop# Description: GnomeDesktop# - GNOMEDesktop .NET Binding diff -up gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in.libdir gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in --- gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in.libdir 2008-07-05 10:07:48.000000000 +0200 +++ gnome-desktop-sharp-2.20.1/gtkhtml/gtkhtml-sharp-3.14.pc.in 2008-07-05 10:08:13.000000000 +0200 @@ -1,8 +1,8 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ gapidir=${prefix}/share/gtkhtml-sharp/3.14 -assemblies_dir=${libdir}/mono/gtkhtml-sharp-3.14 +assemblies_dir=@libdir@/mono/gtkhtml-sharp-3.14 Name: Gtkhtml# Description: Gtkhtml# - Gtkhtml .NET Binding diff -up gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in.libdir gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in --- gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in.libdir 2008-07-05 10:09:11.000000000 +0200 +++ gnome-desktop-sharp-2.20.1/gtksourceview/gtksourceview2-sharp.pc.in 2008-07-05 10:10:01.000000000 +0200 @@ -7,4 +7,4 @@ Name: GtkSourceView# Description: GtkSourceView# - gtksourceview .NET Binding Version: @VERSION@ Requires: gtk-sharp-2.0 -Libs: -r:${prefix}/lib/mono/gtksourceview2-sharp-2.0/gtksourceview2-sharp.dll +Libs: -r:@libdir@/mono/gtksourceview2-sharp-2.0/gtksourceview2-sharp.dll diff -up gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in.libdir gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in --- gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in.libdir 2008-07-05 10:10:23.000000000 +0200 +++ gnome-desktop-sharp-2.20.1/nautilusburn/nautilusburn-sharp.pc.in 2008-07-05 10:12:34.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ gapidir=${prefix}/share/nautilusburn-sharp/2.20 @@ -8,4 +8,4 @@ Name: NautilusBurn# Description: NautilusBurn# - libnautilus-burn .NET Binding Version: @VERSION@ Cflags: -I:${gapidir}/nautilusburn-api.xml -Libs: -r:${libdir}/mono/nautilusburn-sharp-2.20/nautilusburn-sharp.dll +Libs: -r:@libdir@/mono/nautilusburn-sharp-2.20/nautilusburn-sharp.dll diff -up gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in.libdir gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in --- gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in.libdir 2008-07-05 10:12:55.000000000 +0200 +++ gnome-desktop-sharp-2.20.1/rsvg/rsvg2-sharp-2.0.pc.in 2008-07-05 10:13:18.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ gapidir=${prefix}/share/rsvg2-sharp/2.0 @@ -8,4 +8,4 @@ Name: Rsvg# Description: Rsvg# - librsvg .NET Binding Version: @VERSION@ Cflags: -I:${gapidir}/rsvg2-api.xml -Libs: -r:${libdir}/mono/rsvg2-sharp-2.0/rsvg2-sharp.dll +Libs: -r:@libdir@/mono/rsvg2-sharp-2.0/rsvg2-sharp.dll diff -up gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in.libdir gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in --- gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in.libdir 2008-07-05 10:13:58.000000000 +0200 +++ gnome-desktop-sharp-2.20.1/vte/vte-sharp-0.16.pc.in 2008-07-05 10:14:16.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ gapidir=${prefix}/share/vte-sharp/0.16 @@ -9,4 +9,4 @@ Description: Vte# - libvte .NET Binding Version: @VERSION@ Requires: gtk-sharp-2.0 Cflags: -I:${gapidir}/vte-api.xml -Libs: -r:${libdir}/mono/vte-sharp-0.16/vte-sharp.dll +Libs: -r:@libdir@/mono/vte-sharp-0.16/vte-sharp.dll diff -up gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in.libdir gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in --- gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in.libdir 2008-07-05 10:14:28.000000000 +0200 +++ gnome-desktop-sharp-2.20.1/wnck/wnck-sharp-1.0.pc.in 2008-07-05 10:15:20.000000000 +0200 @@ -1,6 +1,6 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ gapidir=${prefix}/share/wnck-sharp/2.20 assemblies_dir=${libdir}/mono/wnck-sharp-2.20 --- NEW FILE gnome-desktop-sharp.spec --- Name: gnome-desktop-sharp Version: 2.20.1 Release: 2%{?dist} Summary: .NET language binding for mono Group: System Environment/Libraries License: LGPLv2 URL: http://www.mono-project.com/GtkSharp Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.20/%{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk2-devel, gtkhtml3-devel BuildRequires: librsvg2-devel, vte-devel, gnome-panel-devel BuildRequires: libwnck-devel, gtksourceview2-devel BuildRequires: nautilus-cd-burner-devel BuildRequires: gtk-sharp2-gapi >= 2.12.0 BuildRequires: gtk-sharp2-devel >= 2.12.0 Provides: gtksourceview2-sharp = 2:%{version}-%{release} Obsoletes: gtksourceview2-sharp < 2:2.20.1-2 #Mono only available on this following arch ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha %description GnomeDesktop is a .NET language binding for assorted GNOME libraries from the desktop release. %package devel Summary: Developing files for gnome-Desktop-sharp Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Provides: gtksourceview2-sharp-devel = 2:%{version}-%{release} Obsoletes: gtksourceview2-sharp-devel < 2:2.20.1-2 %description devel Package %{name}-devel provides development files for writing %{name} applications. %prep %setup -q %patch0 -p1 -b .libdir # Fix GACUTIL FLAGS lib sed -i 's|$(prefix)/lib|%{_libdir}|g' configure # Fix permission chmod 0644 HACKING %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Remove libttol archive find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING ChangeLog AUTHORS README %{_libdir}/*.so %{_libdir}/mono/gac/gnomedesktop-sharp %{_libdir}/mono/gac/nautilusburn-sharp %{_libdir}/mono/gac/gtkhtml-sharp %{_libdir}/mono/gac/gtksourceview2-sharp %{_libdir}/mono/gac/rsvg2-sharp %{_libdir}/mono/gac/vte-sharp %{_libdir}/mono/gac/wnck-sharp %{_libdir}/mono/gnomedesktop-sharp-2.20 %{_libdir}/mono/nautilusburn-sharp-2.20 %{_libdir}/mono/gtkhtml-sharp-3.14 %{_libdir}/mono/gtksourceview2-sharp-2.0 %{_libdir}/mono/rsvg2-sharp-2.0 %{_libdir}/mono/vte-sharp-0.16 %{_libdir}/mono/wnck-sharp-2.20 %{_datadir}/gnomedesktop-sharp %{_datadir}/nautilusburn-sharp %{_datadir}/gtkhtml-sharp %{_datadir}/gtksourceview2-sharp %{_datadir}/rsvg2-sharp %{_datadir}/vte-sharp %{_datadir}/wnck-sharp %files devel %defattr(-,root,root,-) %doc HACKING %{_libdir}/pkgconfig/*.pc %changelog * Sat Jul 05 2008 Xavier Lamien - 2.20.1-2 - Obsolete standalone package gtksourceview2-sharp. * Sat Jul 05 2008 Xavier Lamien - 2.20.1-1 - Initial RPM Release. --- NEW FILE import.log --- gnome-desktop-sharp-2_20_1-2_fc10:HEAD:gnome-desktop-sharp-2.20.1-2.fc10.src.rpm:1215283028 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2008 18:12:03 -0000 1.1 +++ .cvsignore 5 Jul 2008 18:38:01 -0000 1.2 @@ -0,0 +1 @@ +gnome-desktop-sharp-2.20.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2008 18:12:03 -0000 1.1 +++ sources 5 Jul 2008 18:38:01 -0000 1.2 @@ -0,0 +1 @@ +874cfcf8a6547476906b638355a0ed2f gnome-desktop-sharp-2.20.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 20:02:46 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Sat, 5 Jul 2008 20:02:46 GMT Subject: rpms/python-sqlite2/EL-4 dead.package,1.1,NONE Message-ID: <200807052002.m65K2kEo008058@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/python-sqlite2/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8007 Removed Files: dead.package Log Message: still needed on EL-4 --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat Jul 5 20:03:37 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 5 Jul 2008 20:03:37 GMT Subject: rpms/tomcat-native/F-9 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tomcat-native.spec, 1.8, 1.9 Message-ID: <200807052003.m65K3bgg008289@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/tomcat-native/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8095/F-9 Modified Files: .cvsignore sources tomcat-native.spec Log Message: * Sat Jul 5 2008 Ville Skytt?? - 1.1.14-1 - 1.1.14. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2008 11:11:29 -0000 1.4 +++ .cvsignore 5 Jul 2008 20:02:51 -0000 1.5 @@ -1 +1 @@ -tomcat-native-1.1.13-src.tar.gz +tomcat-native-1.1.14-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2008 11:11:29 -0000 1.4 +++ sources 5 Jul 2008 20:02:51 -0000 1.5 @@ -1 +1 @@ -1bdf8b22eba97dc2f1fc25ed35a936cc tomcat-native-1.1.13-src.tar.gz +b190d214e4c7cfcc012d272fd375589a tomcat-native-1.1.14-src.tar.gz Index: tomcat-native.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/F-9/tomcat-native.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tomcat-native.spec 16 Feb 2008 11:11:29 -0000 1.8 +++ tomcat-native.spec 5 Jul 2008 20:02:51 -0000 1.9 @@ -1,5 +1,5 @@ Name: tomcat-native -Version: 1.1.13 +Version: 1.1.14 Release: 1%{?dist} Summary: Tomcat native library @@ -66,6 +66,9 @@ %changelog +* Sat Jul 5 2008 Ville Skytt?? - 1.1.14-1 +- 1.1.14. + * Sat Feb 16 2008 Ville Skytt?? - 1.1.13-1 - 1.1.13. From fedora-extras-commits at redhat.com Sat Jul 5 20:03:55 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 5 Jul 2008 20:03:55 GMT Subject: rpms/tomcat-native/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tomcat-native.spec, 1.8, 1.9 Message-ID: <200807052003.m65K3t7A008296@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/tomcat-native/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8095/devel Modified Files: .cvsignore sources tomcat-native.spec Log Message: * Sat Jul 5 2008 Ville Skytt?? - 1.1.14-1 - 1.1.14. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2008 11:11:29 -0000 1.4 +++ .cvsignore 5 Jul 2008 20:03:08 -0000 1.5 @@ -1 +1 @@ -tomcat-native-1.1.13-src.tar.gz +tomcat-native-1.1.14-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2008 11:11:29 -0000 1.4 +++ sources 5 Jul 2008 20:03:08 -0000 1.5 @@ -1 +1 @@ -1bdf8b22eba97dc2f1fc25ed35a936cc tomcat-native-1.1.13-src.tar.gz +b190d214e4c7cfcc012d272fd375589a tomcat-native-1.1.14-src.tar.gz Index: tomcat-native.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tomcat-native.spec 16 Feb 2008 11:11:29 -0000 1.8 +++ tomcat-native.spec 5 Jul 2008 20:03:08 -0000 1.9 @@ -1,5 +1,5 @@ Name: tomcat-native -Version: 1.1.13 +Version: 1.1.14 Release: 1%{?dist} Summary: Tomcat native library @@ -66,6 +66,9 @@ %changelog +* Sat Jul 5 2008 Ville Skytt?? - 1.1.14-1 +- 1.1.14. + * Sat Feb 16 2008 Ville Skytt?? - 1.1.13-1 - 1.1.13. From fedora-extras-commits at redhat.com Sat Jul 5 20:11:20 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Sat, 5 Jul 2008 20:11:20 GMT Subject: rpms/python-sqlite2/EL-4 python-sqlite2.spec,1.18,1.19 Message-ID: <200807052011.m65KBKoG008985@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/python-sqlite2/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8931 Modified Files: python-sqlite2.spec Log Message: remove -egg-info file in spec, not generated on EL-4 Index: python-sqlite2.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlite2/EL-4/python-sqlite2.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- python-sqlite2.spec 29 Feb 2008 13:40:42 -0000 1.18 +++ python-sqlite2.spec 5 Jul 2008 20:10:31 -0000 1.19 @@ -2,7 +2,7 @@ Name: python-sqlite2 Version: 2.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: DB-API 2.0 interface for SQLite 3.x @@ -92,10 +92,13 @@ %{python_sitearch}/pysqlite2/test/userfunctions.py %{python_sitearch}/pysqlite2/test/userfunctions.pyc %{python_sitearch}/pysqlite2/test/userfunctions.pyo -%{python_sitearch}/pysqlite-%{version}-py2.5.egg-info +#%{python_sitearch}/pysqlite-%{version}-py2.5.egg-info %changelog +* Sat Jul 05 2008 Xavier Lamien - 1:2.3.3-4 +- Removed -egg-info on EL-4 (old python). + * Fri Feb 29 2008 Xavier Lamien - 1:2.3.3-3 - Added -egg-info file. From fedora-extras-commits at redhat.com Sat Jul 5 20:30:11 2008 From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher)) Date: Sat, 5 Jul 2008 20:30:11 GMT Subject: rpms/eric/devel .cvsignore, 1.9, 1.10 eric.spec, 1.25, 1.26 sources, 1.10, 1.11 Message-ID: <200807052030.m65KUBoN010038@cvs-int.fedora.redhat.com> Author: trasher Update of /cvs/extras/rpms/eric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9933 Modified Files: .cvsignore eric.spec sources Log Message: Upstream release 4.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 5 Apr 2008 20:26:58 -0000 1.9 +++ .cvsignore 5 Jul 2008 20:29:14 -0000 1.10 @@ -1,5 +1,5 @@ -eric4-4.1.2.tar.gz -eric4-i18n-cs-4.1.2.tar.gz -eric4-i18n-de-4.1.2.tar.gz -eric4-i18n-fr-4.1.2.tar.gz -eric4-i18n-ru-4.1.2.tar.gz +eric4-4.1.6.tar.gz +eric4-i18n-cs-4.1.6.tar.gz +eric4-i18n-de-4.1.6.tar.gz +eric4-i18n-fr-4.1.6.tar.gz +eric4-i18n-ru-4.1.6.tar.gz Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- eric.spec 7 Jun 2008 13:08:48 -0000 1.25 +++ eric.spec 5 Jul 2008 20:29:14 -0000 1.26 @@ -4,7 +4,7 @@ Name: eric Summary: Python IDE -Version: 4.1.5 +Version: 4.1.6 Release: 1%{?dist} License: GPL+ @@ -132,6 +132,9 @@ %changelog +* Sat Jul 05 2008 Johan Cwiklinski 4.1.6-1 +- 4.1.6 + * Sat Jun 07 2008 Johan Cwiklinski 4.1.5-1 - 4.1.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/eric/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 7 Jun 2008 13:08:48 -0000 1.10 +++ sources 5 Jul 2008 20:29:14 -0000 1.11 @@ -1,5 +1,5 @@ -a76630c55551fa3f7fd18f1c5d440921 eric4-4.1.5.tar.gz -d3a8bf12316fcd55d64f8851cce81787 eric4-i18n-cs-4.1.5.tar.gz -7927a9fdcf980c2429f5886bb9ccc0e7 eric4-i18n-de-4.1.5.tar.gz -dfc28cd0570400380f95462d3969d26a eric4-i18n-fr-4.1.5.tar.gz -2dda52cceb310c640e2d3f183c71bb30 eric4-i18n-ru-4.1.5.tar.gz +fa8d0a230d9f369c67acd72dc35cea83 eric4-4.1.6.tar.gz +20fd04deb6ea73915f1e13d6a35356f5 eric4-i18n-cs-4.1.6.tar.gz +72b8b7b45ebbdacaf3aa7b14c6e24a39 eric4-i18n-de-4.1.6.tar.gz +aa62e7d3973ca75a781e9d53c3a99717 eric4-i18n-fr-4.1.6.tar.gz +eb9f80000a4be3f05d3e1829b3fc6f46 eric4-i18n-ru-4.1.6.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 20:40:05 2008 From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher)) Date: Sat, 5 Jul 2008 20:40:05 GMT Subject: rpms/eric/F-9 eric.spec,1.27,1.28 sources,1.12,1.13 Message-ID: <200807052040.m65Ke5ZQ010757@cvs-int.fedora.redhat.com> Author: trasher Update of /cvs/extras/rpms/eric/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10707 Modified Files: eric.spec sources Log Message: Upstream release 4.1.6 Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/F-9/eric.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- eric.spec 7 Jun 2008 13:37:27 -0000 1.27 +++ eric.spec 5 Jul 2008 20:39:07 -0000 1.28 @@ -4,7 +4,7 @@ Name: eric Summary: Python IDE -Version: 4.1.5 +Version: 4.1.6 Release: 1%{?dist} License: GPL+ @@ -132,6 +132,9 @@ %changelog +* Sat Jul 05 2008 Johan Cwiklinski 4.1.6-1 +- 4.1.6 + * Sat Jun 07 2008 Johan Cwiklinski 4.1.5-1 - 4.1.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/eric/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 7 Jun 2008 13:37:27 -0000 1.12 +++ sources 5 Jul 2008 20:39:07 -0000 1.13 @@ -1,5 +1,5 @@ -a76630c55551fa3f7fd18f1c5d440921 eric4-4.1.5.tar.gz -d3a8bf12316fcd55d64f8851cce81787 eric4-i18n-cs-4.1.5.tar.gz -7927a9fdcf980c2429f5886bb9ccc0e7 eric4-i18n-de-4.1.5.tar.gz -dfc28cd0570400380f95462d3969d26a eric4-i18n-fr-4.1.5.tar.gz -2dda52cceb310c640e2d3f183c71bb30 eric4-i18n-ru-4.1.5.tar.gz +fa8d0a230d9f369c67acd72dc35cea83 eric4-4.1.6.tar.gz +20fd04deb6ea73915f1e13d6a35356f5 eric4-i18n-cs-4.1.6.tar.gz +72b8b7b45ebbdacaf3aa7b14c6e24a39 eric4-i18n-de-4.1.6.tar.gz +aa62e7d3973ca75a781e9d53c3a99717 eric4-i18n-fr-4.1.6.tar.gz +eb9f80000a4be3f05d3e1829b3fc6f46 eric4-i18n-ru-4.1.6.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 20:51:50 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sat, 5 Jul 2008 20:51:50 GMT Subject: rpms/f-spot/devel f-spot.spec,1.72,1.73 Message-ID: <200807052051.m65KpodS011409@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/f-spot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11357 Modified Files: f-spot.spec Log Message: - gtkhtml dependency now provided by gnome-desktop-sharp-devel rather than gnome-sharp-devel, so add as BuildRequires Index: f-spot.spec =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- f-spot.spec 5 Jun 2008 02:44:46 -0000 1.72 +++ f-spot.spec 5 Jul 2008 20:50:59 -0000 1.73 @@ -1,6 +1,6 @@ Name: f-spot Version: 0.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Photo management application Group: Applications/Multimedia @@ -18,7 +18,7 @@ BuildRequires: libexif-devel gphoto2-devel >= 2.1.4 BuildRequires: gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel BuildRequires: gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1 -BuildRequires: gnome-sharp-devel gtk-sharp2-gapi +BuildRequires: gnome-sharp-devel gnome-desktop-sharp-devel gtk-sharp2-gapi BuildRequires: gettext BuildRequires: autoconf BuildRequires: perl(XML::Parser) @@ -111,6 +111,10 @@ %{_datadir}/omf/f-spot %changelog +* Wed Jul 5 2008 Alex Lancaster - 0.4.4-3 +- gtkhtml dependency now provided by gnome-desktop-sharp-devel + rather than gnome-sharp-devel, so add as BuildRequires + * Wed Jun 4 2008 Tom "spot" Callaway - 0.4.4-2 - Fix it to not look for non-existant glib-sharp-2.12.1 From fedora-extras-commits at redhat.com Sat Jul 5 21:24:45 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sat, 5 Jul 2008 21:24:45 GMT Subject: rpms/gtk2/devel gtk2.spec,1.302,1.303 Message-ID: <200807052124.m65LOjBl020312@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20179 Modified Files: gtk2.spec Log Message: 2.13.4 Index: gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- gtk2.spec 26 Jun 2008 08:32:30 -0000 1.302 +++ gtk2.spec 5 Jul 2008 21:23:49 -0000 1.303 @@ -10,13 +10,13 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.13.3 +%define base_version 2.13.4 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 3%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2 @@ -30,7 +30,6 @@ # a workaround for some brokenness in the flash plugin # see http://bugzilla.gnome.org/show_bug.cgi?id=463773 Patch2: workaround.patch -Patch3: gtk-2.13.3-choosergio.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -116,7 +115,6 @@ %patch0 -p1 -b .lib64 %patch1 -p1 -b .set-invisible-char-to-bullet %patch2 -p1 -b .workaround -%patch3 -p1 -b .choosergio for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -300,6 +298,9 @@ %{_datadir}/gtk-2.0 %changelog +* Sat Jul 5 2008 Matthias Clasen - 2.13.4-1 +- Update to 2.13.4 + * Thu Jun 26 2008 Lubomir Rintel - 2.13.3-3 - Fix that makes gio-enabled file chooser return absolute paths From fedora-extras-commits at redhat.com Sat Jul 5 21:41:18 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Sat, 5 Jul 2008 21:41:18 GMT Subject: rpms/quassel/devel .cvsignore, 1.2, 1.3 quassel.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807052141.m65LfIZK021918@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/quassel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21812 Modified Files: .cvsignore quassel.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/quassel/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Jul 2008 18:42:19 -0000 1.2 +++ .cvsignore 5 Jul 2008 21:40:32 -0000 1.3 @@ -1 +1 @@ -quassel-0.2.0-beta1.tar.bz2 +quassel-0.2.0-rc1.tar.bz2 Index: quassel.spec =================================================================== RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- quassel.spec 2 Jul 2008 18:42:19 -0000 1.1 +++ quassel.spec 5 Jul 2008 21:40:32 -0000 1.2 @@ -1,19 +1,19 @@ Name: quassel Summary: QT4 Based distrubuted IRC system Version: 0.2.0 -Release: 0.3.beta1%{?dist} +Release: 0.1.rc1%{?dist} License: GPLv2 or GPLv3 Group: Applications/Internet URL: http://quassel-irc.org/ -Source0: http://quassel-irc.org/system/files/quassel-%{version}-beta1.tar.bz2 +Source0: http://quassel-irc.org/system/files/quassel-%{version}-rc1.tar.bz2 Source1: %{name}.desktop Source2: %{name}core.desktop Source3: %{name}client.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: qt-sqlite -BuildRequires: qt-devel +Requires: qt-sqlite, openssl +BuildRequires: qt-devel, openssl-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -38,17 +38,18 @@ Quassel client %prep -%setup -q -n quassel-0.2.0-beta1 +%setup -q -n quassel-0.2.0-rc1 %build +mkdir build cd build -%{_qt4_qmake} +cmake .. -DWANT_MONO=1 make %install rm -rf %{buildroot} -cd build/targets +cd build install -d -m755 %{buildroot}%{_bindir} install -m755 quassel %{buildroot}%{_bindir} install -m755 quasselclient %{buildroot}%{_bindir} @@ -80,6 +81,8 @@ %{_datadir}/applications/fedora-quasselclient.desktop %changelog +* Fri Jul 04 2008 Steven Parrish 0.1.rc1 +- New upstream release. Now uses cmake instead of qmake * Wed Jul 02 2008 Steven Parrish - 0.3.beta1 - Final spec for initial release to F9 and rawhide Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/quassel/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Jul 2008 18:42:19 -0000 1.2 +++ sources 5 Jul 2008 21:40:32 -0000 1.3 @@ -1 +1 @@ -246881ecc4d7e7a0eb98a2fa6bfbac64 quassel-0.2.0-beta1.tar.bz2 +65930b7b0f59ae115ae5a20389189d83 quassel-0.2.0-rc1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 21:44:44 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Sat, 5 Jul 2008 21:44:44 GMT Subject: rpms/quassel/F-9 quassel.spec,1.1,1.2 Message-ID: <200807052144.m65LiiOF022368@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/quassel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22239 Modified Files: quassel.spec Log Message: New upstream release Index: quassel.spec =================================================================== RCS file: /cvs/pkgs/rpms/quassel/F-9/quassel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- quassel.spec 2 Jul 2008 18:50:49 -0000 1.1 +++ quassel.spec 5 Jul 2008 21:44:01 -0000 1.2 @@ -1,19 +1,19 @@ Name: quassel Summary: QT4 Based distrubuted IRC system Version: 0.2.0 -Release: 0.3.beta1%{?dist} +Release: 0.1.rc1%{?dist} License: GPLv2 or GPLv3 Group: Applications/Internet URL: http://quassel-irc.org/ -Source0: http://quassel-irc.org/system/files/quassel-%{version}-beta1.tar.bz2 +Source0: http://quassel-irc.org/system/files/quassel-%{version}-rc1.tar.bz2 Source1: %{name}.desktop Source2: %{name}core.desktop Source3: %{name}client.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: qt-sqlite -BuildRequires: qt-devel +Requires: qt-sqlite, openssl +BuildRequires: qt-devel, openssl-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -38,17 +38,18 @@ Quassel client %prep -%setup -q -n quassel-0.2.0-beta1 +%setup -q -n quassel-0.2.0-rc1 %build +mkdir build cd build -%{_qt4_qmake} +cmake .. -DWANT_MONO=1 make %install rm -rf %{buildroot} -cd build/targets +cd build install -d -m755 %{buildroot}%{_bindir} install -m755 quassel %{buildroot}%{_bindir} install -m755 quasselclient %{buildroot}%{_bindir} @@ -80,6 +81,8 @@ %{_datadir}/applications/fedora-quasselclient.desktop %changelog +* Fri Jul 04 2008 Steven Parrish 0.1.rc1 +- New upstream release. Now uses cmake instead of qmake * Wed Jul 02 2008 Steven Parrish - 0.3.beta1 - Final spec for initial release to F9 and rawhide From fedora-extras-commits at redhat.com Sat Jul 5 21:48:17 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sat, 5 Jul 2008 21:48:17 GMT Subject: rpms/centerim/devel import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 centerim.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200807052148.m65LmHtK022980@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/centerim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22869/devel Modified Files: .cvsignore centerim.spec sources Added Files: import.log Log Message: * Sat Jul 05 2008 Lubomir Kundrak - 1:4.22.6-0.1.20080705git - Update to mobshot to exclude files with problematic copyright --- NEW FILE import.log --- centerim-4_22_6-0_1_20080705git_fc10:HEAD:centerim-4.22.6-0.1.20080705git.fc10.src.rpm:1215294450 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/centerim/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Apr 2008 16:35:07 -0000 1.9 +++ .cvsignore 5 Jul 2008 21:47:31 -0000 1.10 @@ -1 +1 @@ -centerim-4.22.5.tar.gz +centerim-4.22.5-54-ga7548-dirty.tar.gz Index: centerim.spec =================================================================== RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- centerim.spec 14 Apr 2008 16:35:07 -0000 1.16 +++ centerim.spec 5 Jul 2008 21:47:31 -0000 1.17 @@ -1,6 +1,6 @@ Name: centerim -Version: 4.22.5 -Release: 1%{?dist} +Version: 4.22.6 +Release: 0.1.20080705git%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -8,7 +8,8 @@ Group: Applications/Internet License: GPLv2+ URL: http://www.centerim.org/ -Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +#Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +Source0: centerim-4.22.5-54-ga7548-dirty.tar.gz Source1: http://www.centerim.org/images/b/b5/Centerim_b.svg Source2: centerim.desktop @@ -36,7 +37,7 @@ %prep -%setup -q +%setup -q -n centerim-4.22.5-54-ga7548-dirty %patch8 -p1 -b .url-escape-fedora @@ -84,6 +85,9 @@ %changelog +* Sat Jul 05 2008 Lubomir Kundrak - 1:4.22.6-0.1.20080705git +- Update to mobshot to exclude files with problematic copyright + * Mon Apr 14 2008 Lubomir Kundrak - 1:4.22.5-1 - 4.22.5 with fixes for various Yahoo protocol crashes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/centerim/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Apr 2008 16:35:07 -0000 1.9 +++ sources 5 Jul 2008 21:47:31 -0000 1.10 @@ -1 +1 @@ -9bbbdb34ab678d29387171139ae835e1 centerim-4.22.5.tar.gz +ede0db8393b9c8f35333bee593abf998 centerim-4.22.5-54-ga7548-dirty.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 21:52:13 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sat, 5 Jul 2008 21:52:13 GMT Subject: rpms/centerim/F-9 import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 centerim.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200807052152.m65LqDnE023529@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/centerim/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23397/F-9 Modified Files: .cvsignore centerim.spec sources Added Files: import.log Log Message: Merge from devl --- NEW FILE import.log --- centerim-4_22_6-0_1_20080705git_fc10:F-9:centerim-4.22.6-0.1.20080705git.fc10.src.rpm:1215294663 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/centerim/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Apr 2008 16:35:07 -0000 1.9 +++ .cvsignore 5 Jul 2008 21:51:13 -0000 1.10 @@ -1 +1 @@ -centerim-4.22.5.tar.gz +centerim-4.22.5-54-ga7548-dirty.tar.gz Index: centerim.spec =================================================================== RCS file: /cvs/pkgs/rpms/centerim/F-9/centerim.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- centerim.spec 14 Apr 2008 16:35:07 -0000 1.16 +++ centerim.spec 5 Jul 2008 21:51:13 -0000 1.17 @@ -1,6 +1,6 @@ Name: centerim -Version: 4.22.5 -Release: 1%{?dist} +Version: 4.22.6 +Release: 0.1.20080705git%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -8,7 +8,8 @@ Group: Applications/Internet License: GPLv2+ URL: http://www.centerim.org/ -Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +#Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +Source0: centerim-4.22.5-54-ga7548-dirty.tar.gz Source1: http://www.centerim.org/images/b/b5/Centerim_b.svg Source2: centerim.desktop @@ -36,7 +37,7 @@ %prep -%setup -q +%setup -q -n centerim-4.22.5-54-ga7548-dirty %patch8 -p1 -b .url-escape-fedora @@ -84,6 +85,9 @@ %changelog +* Sat Jul 05 2008 Lubomir Kundrak - 1:4.22.6-0.1.20080705git +- Update to mobshot to exclude files with problematic copyright + * Mon Apr 14 2008 Lubomir Kundrak - 1:4.22.5-1 - 4.22.5 with fixes for various Yahoo protocol crashes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/centerim/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Apr 2008 16:35:07 -0000 1.9 +++ sources 5 Jul 2008 21:51:13 -0000 1.10 @@ -1 +1 @@ -9bbbdb34ab678d29387171139ae835e1 centerim-4.22.5.tar.gz +ede0db8393b9c8f35333bee593abf998 centerim-4.22.5-54-ga7548-dirty.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 21:52:50 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sat, 5 Jul 2008 21:52:50 GMT Subject: rpms/centerim/EL-5 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 centerim.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807052152.m65LqoHm023625@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/centerim/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23493/EL-5 Modified Files: .cvsignore centerim.spec sources Added Files: import.log Log Message: Merge from devl --- NEW FILE import.log --- centerim-4_22_6-0_1_20080705git_fc10:EL-5:centerim-4.22.6-0.1.20080705git.fc10.src.rpm:1215294653 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/centerim/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Apr 2008 08:56:55 -0000 1.3 +++ .cvsignore 5 Jul 2008 21:52:03 -0000 1.4 @@ -1 +1 @@ -centerim-4.22.4.tar.gz +centerim-4.22.5-54-ga7548-dirty.tar.gz Index: centerim.spec =================================================================== RCS file: /cvs/pkgs/rpms/centerim/EL-5/centerim.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- centerim.spec 13 Apr 2008 08:56:55 -0000 1.3 +++ centerim.spec 5 Jul 2008 21:52:03 -0000 1.4 @@ -1,6 +1,6 @@ Name: centerim -Version: 4.22.4 -Release: 1%{?dist} +Version: 4.22.6 +Release: 0.1.20080705git%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -8,7 +8,8 @@ Group: Applications/Internet License: GPLv2+ URL: http://www.centerim.org/ -Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +#Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +Source0: centerim-4.22.5-54-ga7548-dirty.tar.gz Source1: http://www.centerim.org/images/b/b5/Centerim_b.svg Source2: centerim.desktop @@ -36,7 +37,7 @@ %prep -%setup -q +%setup -q -n centerim-4.22.5-54-ga7548-dirty %patch8 -p1 -b .url-escape-fedora @@ -84,6 +85,12 @@ %changelog +* Sat Jul 05 2008 Lubomir Kundrak - 1:4.22.6-0.1.20080705git +- Update to mobshot to exclude files with problematic copyright + +* Mon Apr 14 2008 Lubomir Kundrak - 1:4.22.5-1 +- 4.22.5 with fixes for various Yahoo protocol crashes + * Sun Mar 30 2008 Lubomir Kundrak - 1:4.22.4-1 - 4.22.4 with Yahoo protocol fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/centerim/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Apr 2008 08:56:55 -0000 1.3 +++ sources 5 Jul 2008 21:52:03 -0000 1.4 @@ -1 +1 @@ -7ddf3b2485b916c8e7ff63642dcdeb27 centerim-4.22.4.tar.gz +ede0db8393b9c8f35333bee593abf998 centerim-4.22.5-54-ga7548-dirty.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 21:53:29 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Sat, 5 Jul 2008 21:53:29 GMT Subject: rpms/quassel/F-9 .cvsignore,1.1,1.2 sources,1.2,1.3 Message-ID: <200807052153.m65LrTBa023741@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/quassel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23613 Modified Files: .cvsignore sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/quassel/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2008 16:42:33 -0000 1.1 +++ .cvsignore 5 Jul 2008 21:52:46 -0000 1.2 @@ -0,0 +1 @@ +quassel-0.2.0-rc1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/quassel/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Jul 2008 18:50:49 -0000 1.2 +++ sources 5 Jul 2008 21:52:47 -0000 1.3 @@ -1 +1 @@ -246881ecc4d7e7a0eb98a2fa6bfbac64 quassel-0.2.0-beta1.tar.bz2 +65930b7b0f59ae115ae5a20389189d83 quassel-0.2.0-rc1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 21:53:31 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sat, 5 Jul 2008 21:53:31 GMT Subject: rpms/centerim/F-8 import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 centerim.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200807052153.m65LrVTB023748@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/centerim/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23605/F-8 Modified Files: .cvsignore centerim.spec sources Added Files: import.log Log Message: Merge from devl --- NEW FILE import.log --- centerim-4_22_6-0_1_20080705git_fc10:F-8:centerim-4.22.6-0.1.20080705git.fc10.src.rpm:1215294658 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/centerim/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Mar 2008 08:59:10 -0000 1.4 +++ .cvsignore 5 Jul 2008 21:52:43 -0000 1.5 @@ -1 +1 @@ -centerim-4.22.4.tar.gz +centerim-4.22.5-54-ga7548-dirty.tar.gz Index: centerim.spec =================================================================== RCS file: /cvs/pkgs/rpms/centerim/F-8/centerim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- centerim.spec 30 Mar 2008 08:59:10 -0000 1.6 +++ centerim.spec 5 Jul 2008 21:52:43 -0000 1.7 @@ -1,6 +1,6 @@ Name: centerim -Version: 4.22.4 -Release: 1%{?dist} +Version: 4.22.6 +Release: 0.1.20080705git%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -8,7 +8,8 @@ Group: Applications/Internet License: GPLv2+ URL: http://www.centerim.org/ -Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +#Source0: http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz +Source0: centerim-4.22.5-54-ga7548-dirty.tar.gz Source1: http://www.centerim.org/images/b/b5/Centerim_b.svg Source2: centerim.desktop @@ -36,7 +37,7 @@ %prep -%setup -q +%setup -q -n centerim-4.22.5-54-ga7548-dirty %patch8 -p1 -b .url-escape-fedora @@ -84,6 +85,12 @@ %changelog +* Sat Jul 05 2008 Lubomir Kundrak - 1:4.22.6-0.1.20080705git +- Update to mobshot to exclude files with problematic copyright + +* Mon Apr 14 2008 Lubomir Kundrak - 1:4.22.5-1 +- 4.22.5 with fixes for various Yahoo protocol crashes + * Sun Mar 30 2008 Lubomir Kundrak - 1:4.22.4-1 - 4.22.4 with Yahoo protocol fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/centerim/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Mar 2008 08:59:10 -0000 1.4 +++ sources 5 Jul 2008 21:52:43 -0000 1.5 @@ -1 +1 @@ -7ddf3b2485b916c8e7ff63642dcdeb27 centerim-4.22.4.tar.gz +ede0db8393b9c8f35333bee593abf998 centerim-4.22.5-54-ga7548-dirty.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 22:03:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:03:34 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchbugzilla Message-ID: <200807052203.m65M3YfY005974@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on xerces-c (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:03:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:03:35 +0000 Subject: [pkgdb] xerces-c: xavierb has requested commit Message-ID: <200807052203.m65M3Z2t005990@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on xerces-c (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:03:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:03:57 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchcommits Message-ID: <200807052203.m65M3Yfb005974@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on xerces-c (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:21 +0000 Subject: [pkgdb] xerces-c: xavierb has requested approveacls Message-ID: <200807052204.m65M3Yfe005974@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on xerces-c (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:41 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchbugzilla Message-ID: <200807052204.m65M4f3g006079@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on xerces-c (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:42 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchcommits Message-ID: <200807052204.m65M4gDg006098@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on xerces-c (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:44 +0000 Subject: [pkgdb] xerces-c: xavierb has requested commit Message-ID: <200807052204.m65M4iZN006117@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on xerces-c (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:46 +0000 Subject: [pkgdb] xerces-c: xavierb has requested approveacls Message-ID: <200807052204.m65M4f3j006079@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on xerces-c (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:51 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchbugzilla Message-ID: <200807052204.m65M4gDj006098@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on xerces-c (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:53 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchcommits Message-ID: <200807052204.m65M4iZQ006117@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on xerces-c (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:54 +0000 Subject: [pkgdb] xerces-c: xavierb has requested commit Message-ID: <200807052204.m65M4f3m006079@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on xerces-c (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:04:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:04:56 +0000 Subject: [pkgdb] xerces-c: xavierb has requested approveacls Message-ID: <200807052204.m65M4gDm006098@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on xerces-c (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:02 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchcommits Message-ID: <200807052205.m65M52ka006247@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on xerces-c (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:01 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchbugzilla Message-ID: <200807052205.m65M4iZT006117@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on xerces-c (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:03 +0000 Subject: [pkgdb] xerces-c: xavierb has requested commit Message-ID: <200807052205.m65M53vj006281@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on xerces-c (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:06 +0000 Subject: [pkgdb] xerces-c: xavierb has requested approveacls Message-ID: <200807052205.m65M562u006309@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on xerces-c (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:10 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchbugzilla Message-ID: <200807052205.m65M52kd006247@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on xerces-c (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:11 +0000 Subject: [pkgdb] xerces-c: xavierb has requested watchcommits Message-ID: <200807052205.m65M53vm006281@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on xerces-c (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:14 +0000 Subject: [pkgdb] xerces-c: xavierb has requested commit Message-ID: <200807052205.m65M562x006309@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on xerces-c (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:05:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:05:19 +0000 Subject: [pkgdb] xerces-c: xavierb has requested approveacls Message-ID: <200807052205.m65M5JZw006411@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on xerces-c (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sat Jul 5 22:06:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:08 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchbugzilla Message-ID: <200807052206.m65M5632006309@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on ocsinventory (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:10 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchcommits Message-ID: <200807052206.m65M53vp006281@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on ocsinventory (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:13 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested approveacls Message-ID: <200807052206.m65M6D7g006531@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on ocsinventory (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:11 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested commit Message-ID: <200807052206.m65M5Ja1006411@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on ocsinventory (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:19 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchbugzilla Message-ID: <200807052206.m65M6Kw5006560@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on ocsinventory (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:19 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchcommits Message-ID: <200807052206.m65M6Lvr006563@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on ocsinventory (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:22 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested commit Message-ID: <200807052206.m65M5Ja4006411@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on ocsinventory (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:23 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested approveacls Message-ID: <200807052206.m65M6D7j006531@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on ocsinventory (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:29 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchbugzilla Message-ID: <200807052206.m65M6Kw8006560@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on ocsinventory (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:30 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchcommits Message-ID: <200807052206.m65M6Lvu006563@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on ocsinventory (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:32 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested commit Message-ID: <200807052206.m65M6Wiw006699@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on ocsinventory (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:34 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested approveacls Message-ID: <200807052206.m65M6D7m006531@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on ocsinventory (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:38 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchbugzilla Message-ID: <200807052206.m65M6KwB006560@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchbugzilla acl on ocsinventory (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:39 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested commit Message-ID: <200807052206.m65M6Wj1006699@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the commit acl on ocsinventory (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:42 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested watchcommits Message-ID: <200807052206.m65M6gtk006786@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the watchcommits acl on ocsinventory (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:06:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 05 Jul 2008 22:06:45 +0000 Subject: [pkgdb] ocsinventory: xavierb has requested approveacls Message-ID: <200807052206.m65M6KwE006560@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has requested the approveacls acl on ocsinventory (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sat Jul 5 22:08:25 2008 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 5 Jul 2008 22:08:25 GMT Subject: rpms/gcstar/F-9 .cvsignore, 1.8, 1.9 gcstar.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200807052208.m65M8PLG031003@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/pkgs/rpms/gcstar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30915 Modified Files: .cvsignore gcstar.spec sources Log Message: New upstream version (already in devel) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 25 Jan 2008 20:55:34 -0000 1.8 +++ .cvsignore 5 Jul 2008 22:07:36 -0000 1.9 @@ -1 +1 @@ -gcstar-1.3.2.tar.gz +gcstar-1.4.0.tar.gz Index: gcstar.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/F-9/gcstar.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gcstar.spec 25 Jan 2008 20:56:55 -0000 1.12 +++ gcstar.spec 5 Jul 2008 22:07:36 -0000 1.13 @@ -1,5 +1,5 @@ Name: gcstar -Version: 1.3.2 +Version: 1.4.0 Release: 1%{?dist} Summary: Personal collections manager @@ -101,6 +101,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Tue Jun 3 2008 Tian - 1.4.0-1 + - New upstream version * Fri Jan 25 2008 Tian - 1.3.2-1 - New upstream version * Mon Nov 26 2007 Tian - 1.3.0-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Jan 2008 20:55:34 -0000 1.7 +++ sources 5 Jul 2008 22:07:36 -0000 1.8 @@ -1 +1 @@ -49152036d3c0a43bdc25a03e6cf3cb0b gcstar-1.3.2.tar.gz +70bebd9e52e2f9d1532e91080604b26f gcstar-1.4.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 5 22:10:12 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 5 Jul 2008 22:10:12 GMT Subject: rpms/xdialog/devel xdialog-2.3.1-nostrip.patch, NONE, 1.1 xdialog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807052210.m65MAC4L031169@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/xdialog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31118/devel Modified Files: .cvsignore sources Added Files: xdialog-2.3.1-nostrip.patch xdialog.spec Log Message: Initial import xdialog-2.3.1-nostrip.patch: --- NEW FILE xdialog-2.3.1-nostrip.patch --- diff -up Xdialog-2.3.1/configure.in.nostrip Xdialog-2.3.1/configure.in --- Xdialog-2.3.1/configure.in.nostrip 2008-04-05 19:25:33.000000000 +0200 +++ Xdialog-2.3.1/configure.in 2008-04-05 19:26:00.000000000 +0200 @@ -65,10 +65,6 @@ if test "x$GCC" = "xyes"; then *[[\ \ ]-Wall[\ \ ]]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[[\ \ ]-s[\ \ ]]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in diff -up Xdialog-2.3.1/configure.nostrip Xdialog-2.3.1/configure --- Xdialog-2.3.1/configure.nostrip 2008-04-05 19:25:42.000000000 +0200 +++ Xdialog-2.3.1/configure 2008-04-05 19:26:37.000000000 +0200 @@ -8268,10 +8268,6 @@ if test "x$GCC" = "xyes"; then *[\ \ ]-Wall[\ \ ]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[\ \ ]-s[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in --- NEW FILE xdialog.spec --- %define real_name Xdialog Name: xdialog Summary: X11 drop in replacement for cdialog Version: 2.3.1 Release: 3%{?dist} License: GPL+ Group: Applications/System URL: http://xdialog.free.fr Source0: http://xdialog.free.fr/%{real_name}-%{version}.tar.bz2 Patch0: xdialog-2.3.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1.2.0 BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: gettext Provides: %{real_name} = %{version}-%{release} Obsoletes: %{real_name} < %{version}-%{release} # there is no need for .desktop file since there is a mandatory argument %description Xdialog is designed to be a drop in replacement for the cdialog program. It converts any terminal based program into a program with an X-windows interface. The dialogs are easier to see and use and Xdialog adds even more functionalities (help button+box, treeview, editbox, file selector, range box, and much more). %prep %setup -q -n %{real_name}-%{version} iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8 touch -c -r ChangeLog ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog %patch0 -p1 -b .nostrip touch -c -r configure.nostrip configure touch -c -r configure.in.nostrip configure.in %build # build both the gtk1 and gtk2 versions. Upstream advises not to use # the gtk2 version, however the issues with gtk2 version is with non UTF-8 # locales which should be rare on fedora, and gtk2 has more features. %configure make %{?_smp_mflags} mv src/Xdialog src/Xdialog-gtk1 make clean %configure --with-gtk2 make %{?_smp_mflags} sed -i -e 's:%{_datadir}/doc/Xdialog:%{_datadir}/doc/%{name}:g' doc/Xdialog.1 %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL='install -p' install -m0755 src/Xdialog-gtk1 %{buildroot}%{_bindir} rm -rf __dist_html mkdir -p __dist_html/html cp -p doc/*.html doc/*.png __dist_html/html # there are references to the samples in the documentation. ln -s ../samples __dist_html/html/samples %find_lang %{real_name} %clean rm -rf %{buildroot} %files -f %{real_name}.lang %defattr(-, root, root, -) %doc AUTHORS BUGS COPYING ChangeLog README %doc __dist_html/html/ samples/ %{_mandir}/man1/Xdialog.1* %{_bindir}/Xdialog %{_bindir}/Xdialog-gtk1 %exclude %{_docdir}/%{real_name}-%{version} %changelog * Sun Jun 29 2008 Patrice Dumas 2.3.1-3 - add BR gettext * Wed Jun 25 2008 Patrice Dumas 2.3.1-2 - review request cleanups * Sat Apr 5 2008 Patrice Dumas 2.3.1-1 - submit to fedora. * Sat Apr 08 2006 Dries Verachtert - 2.1.2-1.2 - Rebuild for Fedora Core 5. * Tue Feb 22 2005 Dag Wieers - 2.1.2-1 - Updated to release 2.1.2. * Tue Apr 29 2003 Dag Wieers - 2.1.1-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdialog/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2008 18:10:05 -0000 1.1 +++ .cvsignore 5 Jul 2008 22:09:23 -0000 1.2 @@ -0,0 +1 @@ +Xdialog-2.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdialog/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2008 18:10:05 -0000 1.1 +++ sources 5 Jul 2008 22:09:23 -0000 1.2 @@ -0,0 +1 @@ +0671f8353717513bf1f0ebc80e9710f6 Xdialog-2.3.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 22:18:55 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Sat, 5 Jul 2008 22:18:55 GMT Subject: rpms/spicebird/F-8 dead.package, NONE, 1.1 spicebird.desktop, 1.2, NONE spicebird.spec, 1.4, NONE Message-ID: <200807052218.m65MItRn031538@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/spicebird/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31521 Added Files: dead.package Removed Files: spicebird.desktop spicebird.spec Log Message: Removing this branch due to pollution and no upstream support --- NEW FILE dead.package --- --- spicebird.desktop DELETED --- --- spicebird.spec DELETED --- From fedora-extras-commits at redhat.com Sat Jul 5 22:30:39 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 5 Jul 2008 22:30:39 GMT Subject: rpms/xdialog/F-9 xdialog-2.3.1-nostrip.patch, NONE, 1.1 xdialog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807052230.m65MUd1R032079@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/xdialog/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32018/F-9 Modified Files: .cvsignore sources Added Files: xdialog-2.3.1-nostrip.patch xdialog.spec Log Message: Initial commit xdialog-2.3.1-nostrip.patch: --- NEW FILE xdialog-2.3.1-nostrip.patch --- diff -up Xdialog-2.3.1/configure.in.nostrip Xdialog-2.3.1/configure.in --- Xdialog-2.3.1/configure.in.nostrip 2008-04-05 19:25:33.000000000 +0200 +++ Xdialog-2.3.1/configure.in 2008-04-05 19:26:00.000000000 +0200 @@ -65,10 +65,6 @@ if test "x$GCC" = "xyes"; then *[[\ \ ]-Wall[\ \ ]]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[[\ \ ]-s[\ \ ]]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in diff -up Xdialog-2.3.1/configure.nostrip Xdialog-2.3.1/configure --- Xdialog-2.3.1/configure.nostrip 2008-04-05 19:25:42.000000000 +0200 +++ Xdialog-2.3.1/configure 2008-04-05 19:26:37.000000000 +0200 @@ -8268,10 +8268,6 @@ if test "x$GCC" = "xyes"; then *[\ \ ]-Wall[\ \ ]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[\ \ ]-s[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in --- NEW FILE xdialog.spec --- %define real_name Xdialog Name: xdialog Summary: X11 drop in replacement for cdialog Version: 2.3.1 Release: 3%{?dist} License: GPL+ Group: Applications/System URL: http://xdialog.free.fr Source0: http://xdialog.free.fr/%{real_name}-%{version}.tar.bz2 Patch0: xdialog-2.3.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1.2.0 BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: gettext Provides: %{real_name} = %{version}-%{release} Obsoletes: %{real_name} < %{version}-%{release} # there is no need for .desktop file since there is a mandatory argument %description Xdialog is designed to be a drop in replacement for the cdialog program. It converts any terminal based program into a program with an X-windows interface. The dialogs are easier to see and use and Xdialog adds even more functionalities (help button+box, treeview, editbox, file selector, range box, and much more). %prep %setup -q -n %{real_name}-%{version} iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8 touch -c -r ChangeLog ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog %patch0 -p1 -b .nostrip touch -c -r configure.nostrip configure touch -c -r configure.in.nostrip configure.in %build # build both the gtk1 and gtk2 versions. Upstream advises not to use # the gtk2 version, however the issues with gtk2 version is with non UTF-8 # locales which should be rare on fedora, and gtk2 has more features. %configure make %{?_smp_mflags} mv src/Xdialog src/Xdialog-gtk1 make clean %configure --with-gtk2 make %{?_smp_mflags} sed -i -e 's:%{_datadir}/doc/Xdialog:%{_datadir}/doc/%{name}:g' doc/Xdialog.1 %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL='install -p' install -m0755 src/Xdialog-gtk1 %{buildroot}%{_bindir} rm -rf __dist_html mkdir -p __dist_html/html cp -p doc/*.html doc/*.png __dist_html/html # there are references to the samples in the documentation. ln -s ../samples __dist_html/html/samples %find_lang %{real_name} %clean rm -rf %{buildroot} %files -f %{real_name}.lang %defattr(-, root, root, -) %doc AUTHORS BUGS COPYING ChangeLog README %doc __dist_html/html/ samples/ %{_mandir}/man1/Xdialog.1* %{_bindir}/Xdialog %{_bindir}/Xdialog-gtk1 %exclude %{_docdir}/%{real_name}-%{version} %changelog * Sun Jun 29 2008 Patrice Dumas 2.3.1-3 - add BR gettext * Wed Jun 25 2008 Patrice Dumas 2.3.1-2 - review request cleanups * Sat Apr 5 2008 Patrice Dumas 2.3.1-1 - submit to fedora. * Sat Apr 08 2006 Dries Verachtert - 2.1.2-1.2 - Rebuild for Fedora Core 5. * Tue Feb 22 2005 Dag Wieers - 2.1.2-1 - Updated to release 2.1.2. * Tue Apr 29 2003 Dag Wieers - 2.1.1-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdialog/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2008 18:10:05 -0000 1.1 +++ .cvsignore 5 Jul 2008 22:29:48 -0000 1.2 @@ -0,0 +1 @@ +Xdialog-2.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdialog/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2008 18:10:05 -0000 1.1 +++ sources 5 Jul 2008 22:29:48 -0000 1.2 @@ -0,0 +1 @@ +0671f8353717513bf1f0ebc80e9710f6 Xdialog-2.3.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 22:57:05 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sat, 5 Jul 2008 22:57:05 GMT Subject: rpms/gtk2/devel .cvsignore,1.87,1.88 sources,1.95,1.96 Message-ID: <200807052257.m65Mv5b2000886@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv765 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- .cvsignore 14 Jun 2008 02:04:19 -0000 1.87 +++ .cvsignore 5 Jul 2008 22:56:14 -0000 1.88 @@ -1 +1 @@ -gtk+-2.13.3.tar.bz2 +gtk+-2.13.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/sources,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- sources 14 Jun 2008 02:04:19 -0000 1.95 +++ sources 5 Jul 2008 22:56:14 -0000 1.96 @@ -1 +1 @@ -4191b1f3d6239424556ebf2a92250ef6 gtk+-2.13.3.tar.bz2 +deece1a4392c929968da5c89507fc5fb gtk+-2.13.4.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 5 23:25:00 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 5 Jul 2008 23:25:00 GMT Subject: rpms/gfs-didot-classic-fonts/devel import.log, NONE, 1.1 gfs-didot-classic-fonts.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200807052325.m65NP0RR009383@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-didot-classic-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9269/devel Modified Files: gfs-didot-classic-fonts.spec sources Added Files: import.log Log Message: upstream stealth update --- NEW FILE import.log --- gfs-didot-classic-fonts-20080702-1_fc10:HEAD:gfs-didot-classic-fonts-20080702-1.fc10.src.rpm:1215300135 Index: gfs-didot-classic-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-didot-classic-fonts/devel/gfs-didot-classic-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-didot-classic-fonts.spec 30 Apr 2008 21:55:56 -0000 1.4 +++ gfs-didot-classic-fonts.spec 5 Jul 2008 23:24:12 -0000 1.5 @@ -5,8 +5,8 @@ %define archivename GFS_DIDOTCLASS_OT Name: %{fontname}-fonts -Version: 20070415 -Release: 5%{?dist} +Version: 20080702 +Release: 1%{?dist} Summary: GFS Didot Classic Greek font Group: User Interface/X @@ -67,16 +67,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -86,11 +84,15 @@ %config(noreplace) %{fontconfdir}/61-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Sun Jul 06 2008 Nicolas Mailhot +- 20080702-1 +?? Upstream stealth update + * Wed Apr 30 2008 Nicolas Mailhot - 20070415-5 ??? Yet another prep fix?? Index: sources =================================================================== RCS file: /cvs/extras/rpms/gfs-didot-classic-fonts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Nov 2007 19:50:45 -0000 1.2 +++ sources 5 Jul 2008 23:24:12 -0000 1.3 @@ -1 +1 @@ -6fd26267363090a36118bb0e8576c6a2 GFS_DIDOTCLASS_OT.zip +28b890ca211c17a1fadb0760eee4c246 GFS_DIDOTCLASS_OT.zip From fedora-extras-commits at redhat.com Sun Jul 6 00:10:51 2008 From: fedora-extras-commits at redhat.com (Lehmann Dec (consumption)) Date: Sun, 06 Jul 2008 00:10:51 +0000 Subject: scrutiny crotcheted Message-ID: <7688026129.20080705230054@c-infosys.com> Nei Ho, http://www.capedyinlax[LQ]com A cab, said carey. Ah! When shall i see a hansom got motive strange and his wife come into a considerable conscientious devotion to duty? Cherry, however glass bowls found near these dwellings prove that the bank on to the trap, and caught her by the read it with a frown. The a.b.c. Murdersit doesn't he was joined by a considerable band of malecites something of major knighton. Something in poirofs to meif it were i! I knew that there would bca he announced that the exhibition would open with against her. It ,would also knock out, i should lord, said mr graham, with solemn, faltering voice,. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Sun Jul 6 00:30:47 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Sun, 6 Jul 2008 00:30:47 GMT Subject: rpms/linuxdcpp/devel .cvsignore, 1.3, 1.4 linuxdcpp.spec, 1.6, 1.7 sources, 1.3, 1.4 linuxdcpp-1.0.1-gcc43-compile-fix.patch, 1.1, NONE linuxdcpp-CVE-2008-2953.patch, 1.1, NONE linuxdcpp-CVE-2008-2954.patch, 1.1, NONE Message-ID: <200807060030.m660UleL020345@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/linuxdcpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20267 Modified Files: .cvsignore linuxdcpp.spec sources Removed Files: linuxdcpp-1.0.1-gcc43-compile-fix.patch linuxdcpp-CVE-2008-2953.patch linuxdcpp-CVE-2008-2954.patch Log Message: - Update to 1.0.2 - Drop all patches (all upstream now) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/linuxdcpp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2007 14:59:11 -0000 1.3 +++ .cvsignore 6 Jul 2008 00:29:57 -0000 1.4 @@ -1 +1 @@ -linuxdcpp-1.0.1.tar.bz2 +linuxdcpp-1.0.2.tar.bz2 Index: linuxdcpp.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxdcpp/devel/linuxdcpp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linuxdcpp.spec 2 Jul 2008 11:46:54 -0000 1.6 +++ linuxdcpp.spec 6 Jul 2008 00:29:57 -0000 1.7 @@ -1,6 +1,6 @@ Name: linuxdcpp -Version: 1.0.1 -Release: 3%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Direct Connect client Group: Applications/Internet @@ -10,11 +10,7 @@ Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: linuxdcpp-1.0.1-gcc43-compile-fix.patch -Patch1: linuxdcpp-CVE-2008-2953.patch -Patch2: linuxdcpp-CVE-2008-2954.patch - -BuildRequires: scons gtk2-devel >= 2.6.0 glib2-devel >= 2.4.0 pkgconfig +BuildRequires: scons gtk2-devel >= 2.8.0 glib2-devel >= 2.4.0 pkgconfig BuildRequires: libglade2-devel >= 2.4.0 zlib-devel bzip2-devel openssl-devel BuildRequires: desktop-file-utils @@ -22,11 +18,7 @@ LinuxDC++ is a Linux port of DC++, a popular client for Direct Connect network. %prep -%setup -q -c - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q %build CXXFLAGS="$RPM_OPT_FLAGS" scons %{?_smp_mflags} PREFIX="%{_prefix}" @@ -51,9 +43,6 @@ mv -f ${i}.tmp ${i} done -# Fix docs permissions -chmod 0644 License.txt Readme.txt - # Remove unversioned docdir rm -rf $RPM_BUILD_ROOT%{_docdir}/linuxdcpp/ @@ -69,6 +58,10 @@ %{_datadir}/pixmaps/linuxdcpp.png %changelog +* Sun Jul 06 2008 Marcin Garski 1.0.2-1 +- Update to 1.0.2 +- Drop all patches (all upstream now) + * Wed Jul 02 2008 Marcin Garski 1.0.1-3 - Fix for CVE-2008-2953 and CVE-2008-2954 (#453731) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/linuxdcpp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Dec 2007 14:59:11 -0000 1.3 +++ sources 6 Jul 2008 00:29:57 -0000 1.4 @@ -1 +1 @@ -62166f54d3366e61950d8baf51068a95 linuxdcpp-1.0.1.tar.bz2 +905d572357cbdbc66c8d45fe394f80fc linuxdcpp-1.0.2.tar.bz2 --- linuxdcpp-1.0.1-gcc43-compile-fix.patch DELETED --- --- linuxdcpp-CVE-2008-2953.patch DELETED --- --- linuxdcpp-CVE-2008-2954.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 02:00:05 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 6 Jul 2008 02:00:05 GMT Subject: rpms/pilot-link/devel README.fedora, 1.2, 1.3 pilot-link.spec, 1.78, 1.79 60-pilot.rules, 1.2, NONE Message-ID: <200807060200.m66205XR031007@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/pilot-link/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30847 Modified Files: README.fedora pilot-link.spec Removed Files: 60-pilot.rules Log Message: Patch from Kevin Page : - corrected documentation for visor module use - removed 60-pilot.rules in preference to upstream's 60-libpisock.rules to match README.fedora Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/pilot-link/devel/README.fedora,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.fedora 11 Jan 2008 09:45:55 -0000 1.2 +++ README.fedora 6 Jul 2008 01:59:21 -0000 1.3 @@ -39,19 +39,30 @@ 1) disable libusb: remove (or comment out the contents) of /etc/modprobe.d/blacklist-visor -2) Configure udev to detect the Palm and create /dev/pilot: copy -60-pilot.rules from /usr/share/pilot-link/udev/ to /etc/udev/rules.d/ +2) Configure udev to detect the Palm: +2a) copy 60-libpisock.rules from /usr/share/pilot-link/udev/ to +/etc/udev/rules.d/ +2b) within 60-libpisock.rules change all instances of GROUP="dialout" to +GROUP="uucp" 3) Configure permissions so that a console user can access /dev/pilot: copy 60-pilot.perms from /usr/share/pilot-link/udev/ to /etc/security/console.perms.d/ -If your palm is not working you could try to change the symlink -created in 60-pilot.rules - change the tag KERNEL=="ttyUSB[13579]" to -KERNEL=="ttyUSB[02468]". +When you connect your Palm handheld, watch /var/log/messages - the visor +module should create two ttyUSB devices. Depending on your handheld +model you will need to use either the first or second of these as the +--port argument with pilot-link based programs. + +Some users like the convenience of linking this device to /dev/pilot. +To do this add SYMLINK="pilot" and one of either KERNEL=="ttyUSB[02468]" +or KERNEL=="ttyUSB[13579]" to each line in 60-libpisock.rules, depending +on whether you need to use the first or second visor ttyUSB device. +N.B. This is inherently unreliable since another driver could create an +odd number of ttyUSB devices before the /dev/pilot symlink is created. -For a discussion of the inherent problems related to the Visor module, -see: +For further discussion of the inherent problems related to the Visor +module, see: https://bugzilla.redhat.com/show_bug.cgi?id=158809 Index: pilot-link.spec =================================================================== RCS file: /cvs/extras/rpms/pilot-link/devel/pilot-link.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- pilot-link.spec 26 Mar 2008 12:25:47 -0000 1.78 +++ pilot-link.spec 6 Jul 2008 01:59:21 -0000 1.79 @@ -3,7 +3,7 @@ Name: pilot-link Version: 0.12.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 2 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL Group: Applications/Communications @@ -14,7 +14,6 @@ Source3: blacklist-visor Source4: README.fedora Source5: 60-pilot.perms -Source6: 60-pilot.rules ExcludeArch: s390 s390x #Patch1: pilot-link-0.11.0-perlmd5.patch # May be still applied @@ -151,7 +150,6 @@ # install visor configs to share/udev install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev -install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/pilot-link/udev %post -p /sbin/ldconfig @@ -181,6 +179,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Sun Jun 15 2008 Kevin Page - 2:0.12.3-14 +- corrected documentation for visor module use + * Wed Mar 26 2008 Ivana Varekova 2:0.12.3-13 - remove HAL/PolicyKit staff (is in hal package now) --- 60-pilot.rules DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 02:08:31 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 6 Jul 2008 02:08:31 GMT Subject: rpms/pilot-link/F-9 pilot-link.spec, 1.78, 1.79 README.fedora, 1.2, 1.3 60-pilot.rules, 1.2, NONE Message-ID: <200807060208.m6628Vmq005701@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/pilot-link/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5616 Modified Files: pilot-link.spec README.fedora Removed Files: 60-pilot.rules Log Message: Patch from Kevin Page : - corrected documentation for visor module use - removed 60-pilot.rules in preference to upstream's 60-libpisock.rules to match README.fedora Index: pilot-link.spec =================================================================== RCS file: /cvs/extras/rpms/pilot-link/F-9/pilot-link.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- pilot-link.spec 26 Mar 2008 12:25:47 -0000 1.78 +++ pilot-link.spec 6 Jul 2008 02:07:47 -0000 1.79 @@ -3,7 +3,7 @@ Name: pilot-link Version: 0.12.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 2 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL Group: Applications/Communications @@ -14,7 +14,6 @@ Source3: blacklist-visor Source4: README.fedora Source5: 60-pilot.perms -Source6: 60-pilot.rules ExcludeArch: s390 s390x #Patch1: pilot-link-0.11.0-perlmd5.patch # May be still applied @@ -151,7 +150,6 @@ # install visor configs to share/udev install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev -install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/pilot-link/udev %post -p /sbin/ldconfig @@ -181,6 +179,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Fri Jun 06 2008 Kevin Page - 2:0.12.3-14 +- corrected documentation for visor module use + * Wed Mar 26 2008 Ivana Varekova 2:0.12.3-13 - remove HAL/PolicyKit staff (is in hal package now) Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/pilot-link/F-9/README.fedora,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.fedora 11 Jan 2008 09:45:55 -0000 1.2 +++ README.fedora 6 Jul 2008 02:07:47 -0000 1.3 @@ -39,19 +39,30 @@ 1) disable libusb: remove (or comment out the contents) of /etc/modprobe.d/blacklist-visor -2) Configure udev to detect the Palm and create /dev/pilot: copy -60-pilot.rules from /usr/share/pilot-link/udev/ to /etc/udev/rules.d/ +2) Configure udev to detect the Palm: +2a) copy 60-libpisock.rules from /usr/share/pilot-link/udev/ to +/etc/udev/rules.d/ +2b) within 60-libpisock.rules change all instances of GROUP="dialout" to +GROUP="uucp" 3) Configure permissions so that a console user can access /dev/pilot: copy 60-pilot.perms from /usr/share/pilot-link/udev/ to /etc/security/console.perms.d/ -If your palm is not working you could try to change the symlink -created in 60-pilot.rules - change the tag KERNEL=="ttyUSB[13579]" to -KERNEL=="ttyUSB[02468]". +When you connect your Palm handheld, watch /var/log/messages - the visor +module should create two ttyUSB devices. Depending on your handheld +model you will need to use either the first or second of these as the +--port argument with pilot-link based programs. + +Some users like the convenience of linking this device to /dev/pilot. +To do this add SYMLINK="pilot" and one of either KERNEL=="ttyUSB[02468]" +or KERNEL=="ttyUSB[13579]" to each line in 60-libpisock.rules, depending +on whether you need to use the first or second visor ttyUSB device. +N.B. This is inherently unreliable since another driver could create an +odd number of ttyUSB devices before the /dev/pilot symlink is created. -For a discussion of the inherent problems related to the Visor module, -see: +For further discussion of the inherent problems related to the Visor +module, see: https://bugzilla.redhat.com/show_bug.cgi?id=158809 --- 60-pilot.rules DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 02:19:03 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 6 Jul 2008 02:19:03 GMT Subject: rpms/pilot-link/F-8 pilot-link.spec, 1.78, 1.79 README.fedora, 1.5, 1.6 60-pilot.rules, 1.5, NONE 10-usb-pda-palm.fdi, 1.1, NONE Message-ID: <200807060219.m662J30S006251@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/pilot-link/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6165 Modified Files: pilot-link.spec README.fedora Removed Files: 60-pilot.rules 10-usb-pda-palm.fdi Log Message: Patch from Kevin Page : - remove 10-usb-pda-palm.fdi as now included in hal-info-20080607-1.fc8 - corrected documentation for visor module use - removed 60-pilot.rules in preference to upstream's 60-libpisock.rules to match README.fedora Index: pilot-link.spec =================================================================== RCS file: /cvs/extras/rpms/pilot-link/F-8/pilot-link.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- pilot-link.spec 28 May 2008 00:51:04 -0000 1.78 +++ pilot-link.spec 6 Jul 2008 02:18:14 -0000 1.79 @@ -3,7 +3,7 @@ Name: pilot-link Version: 0.12.2 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 2 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL Group: Applications/Communications @@ -12,13 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: pilot-link-%{version}.tar.bz2 # Source1 through Source3 can be dropped if/when hal is updated to 0.5.11 -Source1: 10-usb-pda-palm.fdi -Source2: 19-palm-acl-management.fdi -Source3: pilot-device-file.policy -Source4: blacklist-visor -Source5: README.fedora -Source6: 60-pilot.perms -Source7: 60-pilot.rules +Source1: 19-palm-acl-management.fdi +Source2: pilot-device-file.policy +Source3: blacklist-visor +Source4: README.fedora +Source5: 60-pilot.perms ExcludeArch: s390 s390x #Patch1: pilot-link-0.11.0-perlmd5.patch # May be still applied @@ -144,25 +142,22 @@ rm -f %{buildroot}%{_bindir}/pilot-prc # Install hal rules files -mkdir -p %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/ -install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/10-usb-pda-palm.fdi mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/ -install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-palm-acl-management.fdi +install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-palm-acl-management.fdi # Install PolicyKit mkdir -p %{buildroot}%{_datadir}/PolicyKit/policy -install -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/PolicyKit/policy/pilot-device-file.policy +install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/PolicyKit/policy/pilot-device-file.policy # Put visor to blacklist mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/ -install -p -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor +install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor # put README.fedora into tree -cp %{SOURCE5} README.fedora +cp %{SOURCE4} README.fedora # install visor configs to share/udev -install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/pilot-link/udev -install -p -m644 %{SOURCE7} %{buildroot}%{_datadir}/pilot-link/udev +install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev %post -p /sbin/ldconfig @@ -182,7 +177,6 @@ %{_bindir}/* %{_datadir}/pilot-link %{_mandir}/man?/* -%{_datadir}/hal/fdi/information/20thirdparty/10-usb-pda-palm.fdi %{_datadir}/hal/fdi/policy/10osvendor/19-palm-acl-management.fdi %{_datadir}/PolicyKit/policy/pilot-device-file.policy %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor @@ -196,6 +190,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Fri Jun 06 2008 Kevin Page - 2:0.12.2-21 +- remove 10-usb-pda-palm.fdi as now included in hal-info-20080607-1.fc8 +- corrected documentation for visor module use + * Fri May 23 2008 Kevin Page - 2:0.12.2-20 - Resolves: #280251 change hal rules to subsitute for pending hal-0.5.11 Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/pilot-link/F-8/README.fedora,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README.fedora 10 Jan 2008 13:53:12 -0000 1.5 +++ README.fedora 6 Jul 2008 02:18:15 -0000 1.6 @@ -39,19 +39,30 @@ 1) disable libusb: remove (or comment out the contents) of /etc/modprobe.d/blacklist-visor -2) Configure udev to detect the Palm and create /dev/pilot: copy -60-pilot.rules from /usr/share/pilot-link/udev/ to /etc/udev/rules.d/ +2) Configure udev to detect the Palm: +2a) copy 60-libpisock.rules from /usr/share/pilot-link/udev/ to +/etc/udev/rules.d/ +2b) within 60-libpisock.rules change all instances of GROUP="dialout" to +GROUP="uucp" 3) Configure permissions so that a console user can access /dev/pilot: copy 60-pilot.perms from /usr/share/pilot-link/udev/ to /etc/security/console.perms.d/ -If your palm is not working you could try to change the symlink -created in 60-pilot.rules - change the tag KERNEL=="ttyUSB[13579]" to -KERNEL=="ttyUSB[02468]". +When you connect your Palm handheld, watch /var/log/messages - the visor +module should create two ttyUSB devices. Depending on your handheld +model you will need to use either the first or second of these as the +--port argument with pilot-link based programs. + +Some users like the convenience of linking this device to /dev/pilot. +To do this add SYMLINK="pilot" and one of either KERNEL=="ttyUSB[02468]" +or KERNEL=="ttyUSB[13579]" to each line in 60-libpisock.rules, depending +on whether you need to use the first or second visor ttyUSB device. +N.B. This is inherently unreliable since another driver could create an +odd number of ttyUSB devices before the /dev/pilot symlink is created. -For a discussion of the inherent problems related to the Visor module, -see: +For further discussion of the inherent problems related to the Visor +module, see: https://bugzilla.redhat.com/show_bug.cgi?id=158809 --- 60-pilot.rules DELETED --- --- 10-usb-pda-palm.fdi DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 02:41:51 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 6 Jul 2008 02:41:51 GMT Subject: rpms/python-biopython/devel sources, 1.4, 1.5 python-biopython.spec, 1.9, 1.10 .cvsignore, 1.4, 1.5 Message-ID: <200807060241.m662fpE3007727@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/python-biopython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7604 Modified Files: sources python-biopython.spec .cvsignore Log Message: - Update to latest upstream (1.47) Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-biopython/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Mar 2008 11:48:37 -0000 1.4 +++ sources 6 Jul 2008 02:40:55 -0000 1.5 @@ -1 +1 @@ -049ff32be28297b77c25624082118629 biopython-1.45.tar.gz +d4906278f7f0d0054f20ea73565fdf43 biopython-1.47.tar.gz Index: python-biopython.spec =================================================================== RCS file: /cvs/extras/rpms/python-biopython/devel/python-biopython.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-biopython.spec 23 Mar 2008 11:48:37 -0000 1.9 +++ python-biopython.spec 6 Jul 2008 02:40:55 -0000 1.10 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-biopython -Version: 1.45 +Version: 1.47 Release: 1%{?dist} Summary: Python tools for computational molecular biology Source0: http://biopython.org/DIST/biopython-%{version}.tar.gz @@ -74,6 +74,9 @@ %{python_sitearch}/BioSQL/* %changelog +* Fri Jul 4 2008 Alex Lancaster - 1.47-1 +- Update to latest upstream (1.47) + * Sun Mar 23 2008 Alex Lancaster - 1.45-1 - Update to latest upstream (1.45) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-biopython/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Mar 2008 11:48:37 -0000 1.4 +++ .cvsignore 6 Jul 2008 02:40:55 -0000 1.5 @@ -1 +1 @@ -biopython-1.45.tar.gz +biopython-1.47.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 02:48:28 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 6 Jul 2008 02:48:28 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.40, 1.41 cairo-dock.spec, 1.51, 1.52 sources, 1.40, 1.41 Message-ID: <200807060248.m662mSQV008123@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8062 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Sun Jul 6 2008 Mamoru Tasaka - rev. 1173 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 5 Jul 2008 03:30:45 -0000 1.40 +++ .cvsignore 6 Jul 2008 02:47:44 -0000 1.41 @@ -1 +1 @@ -cairo-dock-sources-svn1172_trunk.tar.bz2 +cairo-dock-sources-svn1173_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- cairo-dock.spec 5 Jul 2008 04:47:09 -0000 1.51 +++ cairo-dock.spec 6 Jul 2008 02:47:44 -0000 1.52 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1172_trunk +%define tarballver svn1173_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -496,8 +496,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sat Jul 5 2008 Mamoru Tasaka -- rev. 1172 +* Sun Jul 6 2008 Mamoru Tasaka +- rev. 1173 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 5 Jul 2008 03:30:45 -0000 1.40 +++ sources 6 Jul 2008 02:47:44 -0000 1.41 @@ -1 +1 @@ -c9d4913e026b259a62ae3507ef8a54a2 cairo-dock-sources-svn1172_trunk.tar.bz2 +02253f34b7d30e8b0d665afbe9d4fa43 cairo-dock-sources-svn1173_trunk.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 03:35:37 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sun, 6 Jul 2008 03:35:37 GMT Subject: rpms/cpanspec/EL-5 import.log,1.1,NONE Message-ID: <200807060335.m663Zb7f017835@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/cpanspec/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17764 Removed Files: import.log Log Message: Update to 1.77, etc. --- import.log DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 04:26:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:26:59 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664Qx9h014203@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchbugzilla acl on xerces-c (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:02 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R2RP014222@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchcommits acl on xerces-c (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:04 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R4wP014241@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the commit acl on xerces-c (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:05 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R5of014260@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the approveacls acl on xerces-c (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:14 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R4wS014241@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchbugzilla acl on xerces-c (Fedora EPEL 4) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:16 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R4wV014241@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchcommits acl on xerces-c (Fedora EPEL 4) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:17 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664RHUl014326@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the commit acl on xerces-c (Fedora EPEL 4) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:19 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R2RS014222@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the approveacls acl on xerces-c (Fedora EPEL 4) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:23 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664Qx9k014203@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchbugzilla acl on xerces-c (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:26 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R5oi014260@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchcommits acl on xerces-c (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:29 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R5ol014260@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the commit acl on xerces-c (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:30 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664Qx9n014203@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the approveacls acl on xerces-c (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:41 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664RHUo014326@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchbugzilla acl on xerces-c (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:42 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664RHUr014326@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchcommits acl on xerces-c (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:44 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664R2RV014222@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the commit acl on xerces-c (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:49 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664Rngl014539@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the approveacls acl on xerces-c (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:51 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664RpcM014563@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchbugzilla acl on xerces-c (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:27:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:27:55 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060427.m664Rngo014539@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the watchcommits acl on xerces-c (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:28:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:28:01 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060428.m664S2kH014618@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the commit acl on xerces-c (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 04:28:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 04:28:06 +0000 Subject: [pkgdb] xerces-c had acl change status Message-ID: <200807060428.m664Rngr014539@bastion.fedora.phx.redhat.com> Peter Lemenkov (peter) has set the approveacls acl on xerces-c (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xerces-c From fedora-extras-commits at redhat.com Sun Jul 6 05:07:19 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 6 Jul 2008 05:07:19 GMT Subject: rpms/perl-Module-Starter/devel .cvsignore, 1.2, 1.3 perl-Module-Starter.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200807060507.m6657J19002208@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Module-Starter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2124 Modified Files: .cvsignore perl-Module-Starter.spec sources Log Message: * Sat Jul 05 2008 Chris Weyl 1.470-1 - update to 1.470 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Starter/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Aug 2006 14:40:30 -0000 1.2 +++ .cvsignore 6 Jul 2008 05:06:18 -0000 1.3 @@ -1 +1 @@ -Module-Starter-1.42.tar.gz +Module-Starter-1.470.tar.gz Index: perl-Module-Starter.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Starter/devel/perl-Module-Starter.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Module-Starter.spec 5 Mar 2008 22:44:46 -0000 1.4 +++ perl-Module-Starter.spec 6 Jul 2008 05:06:18 -0000 1.5 @@ -1,17 +1,17 @@ Name: perl-Module-Starter -Version: 1.42 -Release: 5%{?dist} +Version: 1.470 +Release: 1%{?dist} Summary: A simple starter kit for any module Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Module-Starter -Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/Module-Starter-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Module-Starter-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## core BuildRequires: perl -#BuildRequires: perl(Test::More), perl(ExtUtils::Command), perl(File::Spec) +BuildRequires: perl(Test::More), perl(ExtUtils::Command), perl(File::Spec) ## non-core BuildRequires: perl(Getopt::Long), perl(Pod::Usage) BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod) @@ -66,6 +66,9 @@ %changelog +* Sat Jul 05 2008 Chris Weyl 1.470-1 +- update to 1.470 + * Wed Mar 5 2008 Tom "spot" Callaway 1.42-5 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Starter/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Aug 2006 14:40:30 -0000 1.2 +++ sources 6 Jul 2008 05:06:18 -0000 1.3 @@ -1 +1 @@ -baf4a379d93c3a49c90a889626783d88 Module-Starter-1.42.tar.gz +abf79063c5a1025d3ec884ab2d561161 Module-Starter-1.470.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 05:09:14 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 6 Jul 2008 05:09:14 GMT Subject: rpms/python-biopython/F-8 .cvsignore, 1.4, 1.5 python-biopython.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807060509.m6659Elq002678@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/python-biopython/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2448/F-8 Modified Files: .cvsignore python-biopython.spec sources Log Message: Update to latest upstream (1.47). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-biopython/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Mar 2008 12:08:45 -0000 1.4 +++ .cvsignore 6 Jul 2008 05:08:24 -0000 1.5 @@ -1 +1 @@ -biopython-1.45.tar.gz +biopython-1.47.tar.gz Index: python-biopython.spec =================================================================== RCS file: /cvs/extras/rpms/python-biopython/F-8/python-biopython.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-biopython.spec 23 Mar 2008 12:08:45 -0000 1.7 +++ python-biopython.spec 6 Jul 2008 05:08:24 -0000 1.8 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-biopython -Version: 1.45 +Version: 1.47 Release: 1%{?dist} Summary: Python tools for computational molecular biology Source0: http://biopython.org/DIST/biopython-%{version}.tar.gz @@ -74,6 +74,9 @@ %{python_sitearch}/BioSQL/* %changelog +* Fri Jul 4 2008 Alex Lancaster - 1.47-1 +- Update to latest upstream (1.47) + * Sun Mar 23 2008 Alex Lancaster - 1.45-1 - Update to latest upstream (1.45) Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-biopython/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Mar 2008 12:08:45 -0000 1.4 +++ sources 6 Jul 2008 05:08:24 -0000 1.5 @@ -1 +1 @@ -049ff32be28297b77c25624082118629 biopython-1.45.tar.gz +d4906278f7f0d0054f20ea73565fdf43 biopython-1.47.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 05:09:29 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 6 Jul 2008 05:09:29 GMT Subject: rpms/python-biopython/F-9 .cvsignore, 1.4, 1.5 python-biopython.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807060509.m6659TIM002719@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/python-biopython/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2448/F-9 Modified Files: .cvsignore python-biopython.spec sources Log Message: Update to latest upstream (1.47). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-biopython/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Mar 2008 11:48:37 -0000 1.4 +++ .cvsignore 6 Jul 2008 05:08:44 -0000 1.5 @@ -1 +1 @@ -biopython-1.45.tar.gz +biopython-1.47.tar.gz Index: python-biopython.spec =================================================================== RCS file: /cvs/extras/rpms/python-biopython/F-9/python-biopython.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-biopython.spec 23 Mar 2008 11:48:37 -0000 1.9 +++ python-biopython.spec 6 Jul 2008 05:08:44 -0000 1.10 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-biopython -Version: 1.45 +Version: 1.47 Release: 1%{?dist} Summary: Python tools for computational molecular biology Source0: http://biopython.org/DIST/biopython-%{version}.tar.gz @@ -74,6 +74,9 @@ %{python_sitearch}/BioSQL/* %changelog +* Fri Jul 4 2008 Alex Lancaster - 1.47-1 +- Update to latest upstream (1.47) + * Sun Mar 23 2008 Alex Lancaster - 1.45-1 - Update to latest upstream (1.45) Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-biopython/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Mar 2008 11:48:37 -0000 1.4 +++ sources 6 Jul 2008 05:08:44 -0000 1.5 @@ -1 +1 @@ -049ff32be28297b77c25624082118629 biopython-1.45.tar.gz +d4906278f7f0d0054f20ea73565fdf43 biopython-1.47.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 05:57:30 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 6 Jul 2008 05:57:30 GMT Subject: rpms/WebKit/devel WebKit.spec, 1.17, 1.18 WebKit-gcc43.patch, 1.2, NONE Message-ID: <200807060557.m665vUxj004599@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4538/devel Modified Files: WebKit.spec Removed Files: WebKit-gcc43.patch Log Message: Fix the curl conditional dep; remove the unused GCC 3.4 patch. Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- WebKit.spec 20 Jun 2008 08:02:31 -0000 1.17 +++ WebKit.spec 6 Jul 2008 05:56:39 -0000 1.18 @@ -40,7 +40,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison -BuildRequires: curl-devel BuildRequires: flex BuildRequires: gperf BuildRequires: gtk2-devel @@ -188,6 +187,12 @@ %changelog +* Fri Jul 04 2008 Peter Gordon +- Remove outdated and unnecessary GCC 4.3 patch: + - gcc43.patch +- Fix the curl-devel BuildRequire conditional. (It is only needed when building + against curl instead of libsoup.) + * Thu Jun 12 2008 Peter Gordon 1.0.0-0.13.svn34655 - Update to new upstream snapshot (SVN 34655) - Add some build-time conditionals for non-default features: debug, --- WebKit-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 06:01:20 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 6 Jul 2008 06:01:20 GMT Subject: rpms/WebKit/F-9 .cvsignore, 1.7, 1.8 WebKit.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200807060601.m6661Kim011266@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4740/F-9 Modified Files: .cvsignore WebKit.spec sources Log Message: * Sat Jul 05 2008 Peter Gordon 1.0.0-0.11.svn34655 - Update to new upstream snapshot (SVN 34655) - Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of JavaScript arrays) - Add some build-time conditionals for non-default features: debug, html5video, pango, svg. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Jun 2008 05:10:20 -0000 1.7 +++ .cvsignore 6 Jul 2008 06:00:35 -0000 1.8 @@ -1 +1 @@ -WebKit-r34279.tar.bz2 +WebKit-r34655.tar.bz2 Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-9/WebKit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- WebKit.spec 3 Jun 2008 05:10:20 -0000 1.11 +++ WebKit.spec 6 Jul 2008 06:00:35 -0000 1.12 @@ -3,11 +3,28 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \ echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list -%define svn_revision 34279 +%define svn_revision 34655 + +## Optional build modifications (for the GTK+ port only) +## --with debug: Enable more verbose debugging. Makes runtime a bit slower. +## (Default: No) +## +## --with html5video: HTML5 video element support using Gstreamer +## (Default: No) +## +## --with pango: Use Pango instead of freetype2 as the font renderer +## (Default: No - use freetype2) +## +## --with svg: Experimental SVG support (filters) +## (Default: No) +%bcond_with debug +%bcond_with html5video +%bcond_with pango +%bcond_with svg Name: WebKit Version: 1.0.0 -Release: 0.10.svn%{svn_revision}%{?dist} +Release: 0.11.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -23,14 +40,29 @@ BuildRequires: flex BuildRequires: gperf BuildRequires: gtk2-devel -BuildRequires: libicu-devel +BuildRequires: libicu-devel BuildRequires: libtool BuildRequires: libxslt-devel -BuildRequires: pango-devel +BuildRequires: libXt-devel BuildRequires: pcre-devel +BuildRequires: sqlite-devel ## Necessary for qmake and friends. BuildRequires: qt4-devel -BuildRequires: sqlite-devel + +## Conditional dependencies... +%if %{with html5video} +BuildRequires: gnome-vfs2-devel +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel +%endif + +%if %{with pango} +BuildRequires: pango-devel +%else +BuildRequires: cairo-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel +%endif %description WebKit is an open source web browser engine. @@ -95,6 +127,7 @@ %prep %setup -qn "%{name}-r%{svn_revision}" + %build ## We don't like pre-built binaries, especially ones for other OSes. =) rm -r WebKitLibraries/{*.a,win/} @@ -102,17 +135,19 @@ ## Fix permissions for the debuginfo generation. chmod a-x WebCore/dom/Clipboard.cpp -status=0 ## Build the GTK+ port... - ## Don't call configure automatically sed -i.conf -e '$d' autogen.sh -mkdir build-gtk +./autogen.sh +install -d build-gtk pushd build-gtk - ../autogen.sh - ln -sf ../configure - %configure --with-font-backend=pango --enable-icon-database - make %{?_smp_mflags} -k || status=1 + ln -sf ../configure + %configure \ + %{?with_debug: --enable-debug } \ + %{?with_html5video: --enable-video } \ + %{?with_pango: --with-font-backend=pango } \ + %{?with_svg: --enable-svg-filters } + make %{?_smp_mflags} popd @@ -130,13 +165,9 @@ CONFIG+=qt-port \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro - make %{?_smp_mflags} -k \ - || status=$((status+10)) + make %{?_smp_mflags} popd -echo $status -if [ $status -gt 0 ] ; then exit 1 ; fi - %install rm -rf %{buildroot} @@ -145,8 +176,6 @@ install -d -m 755 %{buildroot}%{_libexecdir}/%{name} install -m 755 build-gtk/Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} - - make -C build-qt install INSTALL_ROOT=%{buildroot} install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name} install -m 755 build-qt/bin/DumpRenderTree %{buildroot}%{_libexecdir}/%{name} @@ -196,7 +225,7 @@ %files gtk %defattr(-,root,root,-) -%doc +%{_bindir}/jsc %{_libdir}/libwebkit-1.0.so.* %dir %{_libexecdir}/WebKit/ %{_libexecdir}/WebKit/GtkLauncher @@ -228,6 +257,13 @@ %changelog +* Sat Jul 05 2008 Peter Gordon 1.0.0-0.11.svn34655 +- Update to new upstream snapshot (SVN 34655) +- Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of + JavaScript arrays) +- Add some build-time conditionals for non-default features: debug, html5video, + pango, svg. + * Tue Jun 3 2008 Mamoru Tasaka - 1.0.0-0.10.svn34279 - Update to new upstream snapshot (SVN 34279) anyway - libqtwebico.so is no longer supported. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Jun 2008 05:10:20 -0000 1.7 +++ sources 6 Jul 2008 06:00:35 -0000 1.8 @@ -1 +1 @@ -dd20db02fbe7b60b3c5580287d4996a5 WebKit-r34279.tar.bz2 +0c4dcb3f69d9bd63817005a11a797425 WebKit-r34655.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 06:56:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:09 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666u99G018404@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchbugzilla acl on ocsinventory (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:15 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666u99J018404@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchcommits acl on ocsinventory (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:21 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uL0p018442@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the commit acl on ocsinventory (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:23 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uNSt018462@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the approveacls acl on ocsinventory (Fedora devel) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:28 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uNSw018462@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchbugzilla acl on ocsinventory (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:30 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uUrk018502@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchcommits acl on ocsinventory (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:33 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666u99M018404@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the commit acl on ocsinventory (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:35 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uZ0s018545@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the approveacls acl on ocsinventory (Fedora 9) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:42 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uNT1018462@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchbugzilla acl on ocsinventory (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:45 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uL0s018442@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchcommits acl on ocsinventory (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:49 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uL0v018442@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the commit acl on ocsinventory (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:52 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uZ0v018545@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the approveacls acl on ocsinventory (Fedora 8) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:56:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:56:57 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060656.m666uUrn018502@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the approveacls acl on ocsinventory (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:57:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:57:00 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060657.m666uUrq018502@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the commit acl on ocsinventory (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:57:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:57:02 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060657.m666v2Kf018709@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchcommits acl on ocsinventory (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 06:57:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 06 Jul 2008 06:57:04 +0000 Subject: [pkgdb] ocsinventory had acl change status Message-ID: <200807060657.m666v484018731@bastion.fedora.phx.redhat.com> Remi Collet (remi) has set the watchbugzilla acl on ocsinventory (Fedora EPEL 5) to Approved for Xavier Bachelot (xavierb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Sun Jul 6 07:01:52 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 6 Jul 2008 07:01:52 GMT Subject: rpms/libao/devel libao-0.8.8-bigendianfix.patch, NONE, 1.1 libao.spec, 1.28, 1.29 Message-ID: <200807060701.m6671qPv022234@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libao/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15598 Modified Files: libao.spec Added Files: libao-0.8.8-bigendianfix.patch Log Message: * Sun Jul 6 2008 Hans de Goede - 0.8.8-5 - Fix pulseaudio sound output on bigendian archs (bz 454165), patch by Ian Chapman libao-0.8.8-bigendianfix.patch: --- NEW FILE libao-0.8.8-bigendianfix.patch --- --- libao-0.8.8/src/plugins/pulse/ao_pulse.c.orig 2007-05-24 10:19:07.000000000 +0100 +++ libao-0.8.8/src/plugins/pulse/ao_pulse.c 2008-07-05 21:44:47.000000000 +0100 @@ -75,7 +75,7 @@ const char *fn; struct pa_simple *s; static const struct pa_sample_spec ss = { - .format = PA_SAMPLE_S16LE, + .format = PA_SAMPLE_S16NE, .rate = 44100, .channels = 2 }; Index: libao.spec =================================================================== RCS file: /cvs/extras/rpms/libao/devel/libao.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- libao.spec 19 Feb 2008 08:58:07 -0000 1.28 +++ libao.spec 6 Jul 2008 07:00:56 -0000 1.29 @@ -1,12 +1,13 @@ Name: libao Version: 0.8.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross Platform Audio Output Library Group: System Environment/Libraries License: GPLv2+ URL: http://xiph.org/ao/ Source0: http://downloads.xiph.org/releases/ao/%{name}-%{version}.tar.gz Source1: ao.req +Patch0: libao-0.8.8-bigendianfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel >= 0.2.8 BuildRequires: arts-devel @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p1 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure sed -i "s/-ffast-math//" configure @@ -83,6 +85,10 @@ %changelog +* Sun Jul 6 2008 Hans de Goede - 0.8.8-5 +- Fix pulseaudio sound output on bigendian archs (bz 454165), patch by + Ian Chapman + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.8-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Jul 6 07:02:55 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 6 Jul 2008 07:02:55 GMT Subject: rpms/libao/F-9 libao-0.8.8-bigendianfix.patch, NONE, 1.1 libao.spec, 1.28, 1.29 Message-ID: <200807060702.m6672tM9022470@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libao/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22262 Modified Files: libao.spec Added Files: libao-0.8.8-bigendianfix.patch Log Message: * Sun Jul 6 2008 Hans de Goede - 0.8.8-5 - Fix pulseaudio sound output on bigendian archs (bz 454165), patch by Ian Chapman libao-0.8.8-bigendianfix.patch: --- NEW FILE libao-0.8.8-bigendianfix.patch --- --- libao-0.8.8/src/plugins/pulse/ao_pulse.c.orig 2007-05-24 10:19:07.000000000 +0100 +++ libao-0.8.8/src/plugins/pulse/ao_pulse.c 2008-07-05 21:44:47.000000000 +0100 @@ -75,7 +75,7 @@ const char *fn; struct pa_simple *s; static const struct pa_sample_spec ss = { - .format = PA_SAMPLE_S16LE, + .format = PA_SAMPLE_S16NE, .rate = 44100, .channels = 2 }; Index: libao.spec =================================================================== RCS file: /cvs/extras/rpms/libao/F-9/libao.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- libao.spec 19 Feb 2008 08:58:07 -0000 1.28 +++ libao.spec 6 Jul 2008 07:02:06 -0000 1.29 @@ -1,12 +1,13 @@ Name: libao Version: 0.8.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross Platform Audio Output Library Group: System Environment/Libraries License: GPLv2+ URL: http://xiph.org/ao/ Source0: http://downloads.xiph.org/releases/ao/%{name}-%{version}.tar.gz Source1: ao.req +Patch0: libao-0.8.8-bigendianfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel >= 0.2.8 BuildRequires: arts-devel @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p1 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure sed -i "s/-ffast-math//" configure @@ -83,6 +85,10 @@ %changelog +* Sun Jul 6 2008 Hans de Goede - 0.8.8-5 +- Fix pulseaudio sound output on bigendian archs (bz 454165), patch by + Ian Chapman + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.8-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Jul 6 07:05:22 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 6 Jul 2008 07:05:22 GMT Subject: rpms/libao/F-8 libao-0.8.8-bigendianfix.patch, NONE, 1.1 libao.spec, 1.26, 1.27 Message-ID: <200807060705.m6675Mdc022906@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libao/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22751 Modified Files: libao.spec Added Files: libao-0.8.8-bigendianfix.patch Log Message: * Sun Jul 6 2008 Hans de Goede - 0.8.8-5 - Fix pulseaudio sound output on bigendian archs (bz 454165), patch by Ian Chapman libao-0.8.8-bigendianfix.patch: --- NEW FILE libao-0.8.8-bigendianfix.patch --- --- libao-0.8.8/src/plugins/pulse/ao_pulse.c.orig 2007-05-24 10:19:07.000000000 +0100 +++ libao-0.8.8/src/plugins/pulse/ao_pulse.c 2008-07-05 21:44:47.000000000 +0100 @@ -75,7 +75,7 @@ const char *fn; struct pa_simple *s; static const struct pa_sample_spec ss = { - .format = PA_SAMPLE_S16LE, + .format = PA_SAMPLE_S16NE, .rate = 44100, .channels = 2 }; Index: libao.spec =================================================================== RCS file: /cvs/extras/rpms/libao/F-8/libao.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libao.spec 14 Nov 2007 14:19:27 -0000 1.26 +++ libao.spec 6 Jul 2008 07:04:32 -0000 1.27 @@ -1,12 +1,13 @@ Name: libao Version: 0.8.8 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Cross Platform Audio Output Library Group: System Environment/Libraries License: GPLv2+ URL: http://xiph.org/ao/ Source0: http://downloads.xiph.org/releases/ao/%{name}-%{version}.tar.gz Source1: ao.req +Patch0: libao-0.8.8-bigendianfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel >= 0.2.8 BuildRequires: arts-devel @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p1 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure sed -i "s/-ffast-math//" configure @@ -51,7 +53,7 @@ %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install # remove unpackaged files from the buildroot find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \; @@ -83,9 +85,19 @@ %changelog +* Sun Jul 6 2008 Hans de Goede - 0.8.8-5 +- Fix pulseaudio sound output on bigendian archs (bz 454165), patch by + Ian Chapman + +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.8-4 +- Autorebuild for GCC 4.3 + +* Thu Nov 15 2007 Hans de Goede - 0.8.8-3 +- Minor packaging cleanups for merge review (bz 225986) + * Wed Nov 14 2007 Hans de Goede - 0.8.8-2 - Fix multilib conflict (bz 341891) -- Fix Source0 en URL urls +- Fix Source0 and URL urls * Wed Nov 7 2007 Julian Sikorski - 0.8.8-1 - Updated to 0.8.8 (bz 316731) From fedora-extras-commits at redhat.com Sun Jul 6 08:56:04 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 6 Jul 2008 08:56:04 GMT Subject: rpms/brasero/devel .cvsignore, 1.10, 1.11 brasero.spec, 1.27, 1.28 sources, 1.10, 1.11 Message-ID: <200807060856.m668u4XB002132@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/brasero/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2098 Modified Files: .cvsignore brasero.spec sources Log Message: Update to 0.7.91 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 18 Jun 2008 11:40:28 -0000 1.10 +++ .cvsignore 6 Jul 2008 08:55:18 -0000 1.11 @@ -1 +1 @@ -brasero-0.7.90.tar.bz2 +brasero-0.7.91.tar.bz2 Index: brasero.spec =================================================================== RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- brasero.spec 23 Jun 2008 09:26:54 -0000 1.27 +++ brasero.spec 6 Jul 2008 08:55:18 -0000 1.28 @@ -1,14 +1,13 @@ Name: brasero -Version: 0.7.90 +Version: 0.7.91 Release: 1%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia License: GPLv2+ URL: http://www.gnome.org/projects/brasero/ Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/0.7/%{name}-%{version}.tar.bz2 -Patch0: brasero-0.7.0-open.patch -Patch1: brasero-0.7.90-desktop.patch +Patch0: brasero-0.7.90-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.15.6 @@ -17,12 +16,12 @@ BuildRequires: GConf2-devel >= 2.0.0 BuildRequires: hal-devel >= 0.5 BuildRequires: libgnomeui-devel >= 2.10.0 -BuildRequires: gstreamer-devel >= 0.10.6 +BuildRequires: gstreamer-devel >= 0.10.15 BuildRequires: gstreamer-plugins-base-devel >= 0.10.0 %ifnarch ppc64 BuildRequires: libbeagle-devel >= 0.1.1 %endif -BuildRequires: totem-pl-parser-devel >= 2.20.0 +BuildRequires: totem-pl-parser-devel >= 2.22.0 BuildRequires: libnotify-devel >= 0.3.0 BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: dbus-glib-devel >= 0.7.2 @@ -51,8 +50,7 @@ %prep %setup -q -%patch0 -p1 -b .open -%patch1 -p1 -b .desktop +%patch0 -p1 -b .desktop %build @@ -135,6 +133,10 @@ %changelog +* Sun Jul 6 2008 Denis Leroy - 0.7.91-1 +- Update to unstable 0.7.91 +- open flags patch upstreamed + * Wed Jun 11 2008 Denis Leroy - 0.7.90-1 - Update to unstable 0.7.90 - Added patch to validate desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 18 Jun 2008 11:40:28 -0000 1.10 +++ sources 6 Jul 2008 08:55:18 -0000 1.11 @@ -1 +1 @@ -3fb995cbebe0d86e2decd512f30da1ca brasero-0.7.90.tar.bz2 +e506ad1d56ab9889f158d5039e3fdc77 brasero-0.7.91.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 09:28:16 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sun, 6 Jul 2008 09:28:16 GMT Subject: rpms/kernel/devel .cvsignore, 1.851, 1.852 kernel.spec, 1.735, 1.736 sources, 1.812, 1.813 upstream, 1.730, 1.731 Message-ID: <200807060928.m669SGTE009805@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9735 Modified Files: .cvsignore kernel.spec sources upstream Log Message: 2.6.26-rc9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.851 retrieving revision 1.852 diff -u -r1.851 -r1.852 --- .cvsignore 5 Jul 2008 16:36:59 -0000 1.851 +++ .cvsignore 6 Jul 2008 09:27:23 -0000 1.852 @@ -4,5 +4,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git5.bz2 +patch-2.6.26-rc9.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.735 retrieving revision 1.736 diff -u -r1.735 -r1.736 --- kernel.spec 5 Jul 2008 16:36:59 -0000 1.735 +++ kernel.spec 6 Jul 2008 09:27:23 -0000 1.736 @@ -43,9 +43,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 8 +%define rcrev 9 # The git snapshot level -%define gitrev 5 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -590,7 +590,6 @@ Patch280: linux-2.6-debug-spinlock-taint.patch Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch Patch350: linux-2.6-debug-list_debug_rcu.patch -Patch360: linux-2.6-debug-softlockup-modules-list.patch Patch370: linux-2.6-crash-driver.patch Patch380: linux-2.6-defaults-pci_no_msi.patch Patch390: linux-2.6-defaults-acpi-video.patch @@ -1064,7 +1063,6 @@ ApplyPatch linux-2.6-debug-spinlock-taint.patch ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch #ApplyPatch linux-2.6-debug-list_debug_rcu.patch -ApplyPatch linux-2.6-debug-softlockup-modules-list.patch # # /dev/crash driver for the crashdump analysis tool @@ -1121,9 +1119,9 @@ ApplyPatch linux-2.6-silence-fbcon-logo.patch # Fix the SELinux mprotect checks on executable mappings -ApplyPatch linux-2.6-selinux-mprotect-checks.patch +#eApplyPatch linux-2.6-selinux-mprotect-checks.patch # Fix SELinux for sparc -ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch +#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch # Changes to upstream defaults. # Use UTF-8 by default on VFAT. @@ -1138,7 +1136,7 @@ ApplyPatch linux-2.6-selinux-deffered-context-mapping.patch ApplyPatch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch ApplyPatch linux-2.6-selinux-generic-ioctl.patch -ApplyPatch linux-2.6-selinux-new-proc-checks.patch +#ApplyPatch linux-2.6-selinux-new-proc-checks.patch ApplyPatch linux-2.6-selinux-get-invalid-xattrs.patch # Broken, see BZ 452438 #ApplyPatch linux-2.6-selinux-ecryptfs-support.patch @@ -1791,6 +1789,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Sun Jul 06 2008 Dave Jones +- 2.6.26-rc9 + * Sat Jul 05 2008 Dave Jones - 2.6.26-rc8-git5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.812 retrieving revision 1.813 diff -u -r1.812 -r1.813 --- sources 5 Jul 2008 16:36:59 -0000 1.812 +++ sources 6 Jul 2008 09:27:23 -0000 1.813 @@ -1,3 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -db9fee832152a33946993459fc85a18f patch-2.6.26-rc8.bz2 -d0b787c3aaf91ce376b7290368a870c6 patch-2.6.26-rc8-git5.bz2 +0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.730 retrieving revision 1.731 diff -u -r1.730 -r1.731 --- upstream 5 Jul 2008 16:36:59 -0000 1.730 +++ upstream 6 Jul 2008 09:27:23 -0000 1.731 @@ -1,3 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.26-rc8.bz2 -patch-2.6.26-rc8-git5.bz2 +patch-2.6.26-rc9.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 09:44:17 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Sun, 6 Jul 2008 09:44:17 GMT Subject: rpms/echo-icon-theme/devel echo-icon-theme.spec, 1.23, 1.24 sources, 1.16, 1.17 Message-ID: <200807060944.m669iHCa010397@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/echo-icon-theme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359 Modified Files: echo-icon-theme.spec sources Log Message: New git snapshot. Index: echo-icon-theme.spec =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/devel/echo-icon-theme.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- echo-icon-theme.spec 29 Jun 2008 11:23:36 -0000 1.23 +++ echo-icon-theme.spec 6 Jul 2008 09:43:33 -0000 1.24 @@ -1,8 +1,8 @@ -%define git_head 7ec79f3 +%define git_head 2e822bf Name: echo-icon-theme Version: 0.3.89.0 -Release: 0.5.git%{git_head}%{?dist} +Release: 0.6.git%{git_head}%{?dist} Summary: Echo icon theme Group: User Interface/Desktops @@ -15,7 +15,7 @@ #BuildRequires: autoconf automake Requires(post): gtk2 >= 2.6.0 Requires(postun): gtk2 >= 2.6.0 -Requires: fedora-icon-theme +Requires: gnome-themes %description This package contains the Echo icon theme. @@ -47,6 +47,9 @@ %ghost %{_datadir}/icons/Echo/icon-theme.cache %changelog +* Sun Jul 06 2008 Martin Sourada - 0.3.89.0-0.6.git2e822bf +- New git snapshot + * Sun Jun 29 2008 Martin Sourada - 0.3.89.0-0.5.git7ec79f3 - New git snapshot Index: sources =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 29 Jun 2008 11:23:37 -0000 1.16 +++ sources 6 Jul 2008 09:43:33 -0000 1.17 @@ -1 +1 @@ -8987549dbe01458a92737dd55e8272bf echo-icon-theme-0.3.89.0.tar.bz2 +7352ae5937bafaf45c2b43b58d6e8a96 echo-icon-theme-0.3.89.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 11:33:53 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 6 Jul 2008 11:33:53 GMT Subject: comps comps-f10.xml.in, 1.40, 1.41 comps-f8.xml.in, 1.256, 1.257 comps-f9.xml.in, 1.370, 1.371 Message-ID: <200807061133.m66BXrIq029431@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29406 Modified Files: comps-f10.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: add asunder Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- comps-f10.xml.in 4 Jul 2008 06:49:29 -0000 1.40 +++ comps-f10.xml.in 6 Jul 2008 11:33:22 -0000 1.41 @@ -3660,6 +3660,7 @@ amarok ardour argyllcms + asunder audacious audacity aumix Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- comps-f8.xml.in 2 Jul 2008 22:11:09 -0000 1.256 +++ comps-f8.xml.in 6 Jul 2008 11:33:22 -0000 1.257 @@ -3409,6 +3409,7 @@ amarok ardour argyllcms + asunder audacious audacity aumix Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.370 retrieving revision 1.371 diff -u -r1.370 -r1.371 --- comps-f9.xml.in 2 Jul 2008 22:11:09 -0000 1.370 +++ comps-f9.xml.in 6 Jul 2008 11:33:22 -0000 1.371 @@ -3553,6 +3553,7 @@ amarok ardour argyllcms + asunder audacious audacity aumix From fedora-extras-commits at redhat.com Sun Jul 6 11:47:11 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Sun, 6 Jul 2008 11:47:11 GMT Subject: rpms/echo-icon-theme/F-8 .cvsignore, 1.10, 1.11 echo-icon-theme.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200807061147.m66BlBrx030084@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/echo-icon-theme/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30008/F-8 Modified Files: .cvsignore echo-icon-theme.spec sources Log Message: New (bugfix) release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/F-8/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 28 Jun 2008 23:10:50 -0000 1.10 +++ .cvsignore 6 Jul 2008 11:46:19 -0000 1.11 @@ -1,2 +1 @@ -echo-icon-theme-0.3.2.tar.bz2 -COPYING +echo-icon-theme-0.3.2.1.tar.bz2 Index: echo-icon-theme.spec =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/F-8/echo-icon-theme.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- echo-icon-theme.spec 28 Jun 2008 23:10:50 -0000 1.17 +++ echo-icon-theme.spec 6 Jul 2008 11:46:19 -0000 1.18 @@ -1,5 +1,5 @@ Name: echo-icon-theme -Version: 0.3.2 +Version: 0.3.2.1 Release: 1%{?dist} Summary: Echo icon theme @@ -7,14 +7,10 @@ License: Creative Commons Attribution-ShareAlike 3.0 URL: http://fedoraproject.org/wiki/Artwork/EchoDevelopment Source0: https://fedorahosted.org/releases/e/c/%{name}-%{version}.tar.bz2 -Source1: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires(post): gtk2 >= 2.6.0 Requires(postun): gtk2 >= 2.6.0 -Requires: gnome-icon-theme - -#for Clearlooks icon theme dependency Requires: gnome-themes %description @@ -31,7 +27,6 @@ mkdir -p %{buildroot}%{_datadir}/icons/Echo cp -r --preserve=timestamps ./* %{buildroot}%{_datadir}/icons/Echo -cp %{SOURCE1} COPYING touch %{buildroot}%{_datadir}/icons/Echo/icon-theme.cache %post @@ -51,6 +46,9 @@ %changelog +* Sun Jul 06 2008 Martin Sourada - 0.3.2.1-1 +- New bugfix release + * Sun Jun 20 2008 Martin Sourada - 0.3.2-1 - New release - adds bunch of new icons Index: sources =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 28 Jun 2008 23:10:50 -0000 1.12 +++ sources 6 Jul 2008 11:46:19 -0000 1.13 @@ -1,2 +1 @@ -024f780035e80c3e1f4c2a5024d27a6d echo-icon-theme-0.3.2.tar.bz2 -40d47d85a9738557e9e780a966652988 COPYING +279f61b3eda4f42bdc51641c85fb8936 echo-icon-theme-0.3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 11:47:25 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Sun, 6 Jul 2008 11:47:25 GMT Subject: rpms/echo-icon-theme/F-9 .cvsignore, 1.12, 1.13 echo-icon-theme.spec, 1.18, 1.19 sources, 1.12, 1.13 Message-ID: <200807061147.m66BlP6f030089@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/echo-icon-theme/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30008/F-9 Modified Files: .cvsignore echo-icon-theme.spec sources Log Message: New (bugfix) release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 28 Jun 2008 23:02:52 -0000 1.12 +++ .cvsignore 6 Jul 2008 11:46:41 -0000 1.13 @@ -1,2 +1 @@ -echo-icon-theme-0.3.2.tar.bz2 -COPYING +echo-icon-theme-0.3.2.1.tar.bz2 Index: echo-icon-theme.spec =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/F-9/echo-icon-theme.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- echo-icon-theme.spec 28 Jun 2008 22:59:54 -0000 1.18 +++ echo-icon-theme.spec 6 Jul 2008 11:46:41 -0000 1.19 @@ -1,5 +1,5 @@ Name: echo-icon-theme -Version: 0.3.2 +Version: 0.3.2.1 Release: 1%{?dist} Summary: Echo icon theme @@ -7,14 +7,10 @@ License: Creative Commons Attribution-ShareAlike 3.0 URL: http://fedoraproject.org/wiki/Artwork/EchoDevelopment Source0: https://fedorahosted.org/releases/e/c/%{name}-%{version}.tar.bz2 -Source1: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires(post): gtk2 >= 2.6.0 Requires(postun): gtk2 >= 2.6.0 -Requires: gnome-icon-theme - -#for Clearlooks icon theme dependency Requires: gnome-themes %description @@ -31,7 +27,6 @@ mkdir -p %{buildroot}%{_datadir}/icons/Echo cp -r --preserve=timestamps ./* %{buildroot}%{_datadir}/icons/Echo -cp %{SOURCE1} COPYING touch %{buildroot}%{_datadir}/icons/Echo/icon-theme.cache %post @@ -51,6 +46,9 @@ %changelog +* Sun Jul 06 2008 Martin Sourada - 0.3.2.1-1 +- New bugfix release + * Sun Jun 20 2008 Martin Sourada - 0.3.2-1 - New release - adds bunch of new icons Index: sources =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 28 Jun 2008 22:59:54 -0000 1.12 +++ sources 6 Jul 2008 11:46:41 -0000 1.13 @@ -1,2 +1 @@ -024f780035e80c3e1f4c2a5024d27a6d echo-icon-theme-0.3.2.tar.bz2 -40d47d85a9738557e9e780a966652988 COPYING +279f61b3eda4f42bdc51641c85fb8936 echo-icon-theme-0.3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 11:54:38 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 6 Jul 2008 11:54:38 GMT Subject: rpms/frozen-bubble/devel frozen-bubble-2.1.0-bigendianaudio.patch, NONE, 1.1 frozen-bubble.spec, 1.11, 1.12 Message-ID: <200807061154.m66BscPw030691@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/frozen-bubble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30572 Modified Files: frozen-bubble.spec Added Files: frozen-bubble-2.1.0-bigendianaudio.patch Log Message: * Sun Jul 6 2008 Hans de Goede 2.1.0-9 - Fix audio on bigendian archs (bz 454109), patch by Ian Chapman frozen-bubble-2.1.0-bigendianaudio.patch: --- NEW FILE frozen-bubble-2.1.0-bigendianaudio.patch --- --- frozen-bubble.orig 2008-03-03 20:49:40.000000000 +0000 +++ frozen-bubble 2008-07-04 19:00:13.000000000 +0100 @@ -66,6 +66,8 @@ use fbsyms; use FBLE; +use Config; + $| = 1; $TARGET_ANIM_SPEED = 20; # number of milliseconds that should last between two animation frames @@ -281,7 +283,13 @@ } sub init_sound() { - $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); }; + # Endian Test + if ($Config{byteorder} == 4321 || $Config{byteorder} == 87654321) { + $mixer = eval { SDL::Mixer->new(-frequency => 44100, -format => &AUDIO_S16MSB, -channels => 2, -size => 1024); }; + } + else { + $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); }; + } if ($@) { $@ =~ s| at \S+ line.*\n||; print STDERR "\nWarning: can't initialize sound (reason: $@).\n"; Index: frozen-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- frozen-bubble.spec 3 Mar 2008 19:09:26 -0000 1.11 +++ frozen-bubble.spec 6 Jul 2008 11:53:49 -0000 1.12 @@ -1,13 +1,14 @@ Summary: Frozen Bubble arcade game Name: frozen-bubble Version: 2.1.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Amusements/Games URL: http://www.frozen-bubble.org/ Source0: http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2 Source1: frozen-bubble.desktop Source2: fb-server.init +Patch0: frozen-bubble-2.1.0-bigendianaudio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p0 # Add a directory to the module path for the app's private perl modules %{__sed} -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" \ frozen-bubble frozen-bubble-editor @@ -159,6 +161,9 @@ %changelog +* Sun Jul 6 2008 Hans de Goede 2.1.0-9 +- Fix audio on bigendian archs (bz 454109), patch by Ian Chapman + * Mon Mar 3 2008 Tom "spot" Callaway - 2.1.0-8 - rebuild for new perl (again) From fedora-extras-commits at redhat.com Sun Jul 6 11:56:36 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 6 Jul 2008 11:56:36 GMT Subject: rpms/frozen-bubble/F-8 frozen-bubble-2.1.0-bigendianaudio.patch, NONE, 1.1 frozen-bubble.spec, 1.8, 1.9 Message-ID: <200807061156.m66Bua45031032@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/frozen-bubble/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30838 Modified Files: frozen-bubble.spec Added Files: frozen-bubble-2.1.0-bigendianaudio.patch Log Message: * Sun Jul 6 2008 Hans de Goede 2.1.0-9 - Fix audio on bigendian archs (bz 454109), patch by Ian Chapman frozen-bubble-2.1.0-bigendianaudio.patch: --- NEW FILE frozen-bubble-2.1.0-bigendianaudio.patch --- --- frozen-bubble.orig 2008-03-03 20:49:40.000000000 +0000 +++ frozen-bubble 2008-07-04 19:00:13.000000000 +0100 @@ -66,6 +66,8 @@ use fbsyms; use FBLE; +use Config; + $| = 1; $TARGET_ANIM_SPEED = 20; # number of milliseconds that should last between two animation frames @@ -281,7 +283,13 @@ } sub init_sound() { - $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); }; + # Endian Test + if ($Config{byteorder} == 4321 || $Config{byteorder} == 87654321) { + $mixer = eval { SDL::Mixer->new(-frequency => 44100, -format => &AUDIO_S16MSB, -channels => 2, -size => 1024); }; + } + else { + $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); }; + } if ($@) { $@ =~ s| at \S+ line.*\n||; print STDERR "\nWarning: can't initialize sound (reason: $@).\n"; Index: frozen-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/frozen-bubble/F-8/frozen-bubble.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- frozen-bubble.spec 22 Aug 2007 14:26:20 -0000 1.8 +++ frozen-bubble.spec 6 Jul 2008 11:55:45 -0000 1.9 @@ -1,13 +1,14 @@ Summary: Frozen Bubble arcade game Name: frozen-bubble Version: 2.1.0 -Release: 5%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Amusements/Games URL: http://www.frozen-bubble.org/ Source0: http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2 Source1: frozen-bubble.desktop Source2: fb-server.init +Patch0: frozen-bubble-2.1.0-bigendianaudio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p0 # Add a directory to the module path for the app's private perl modules %{__sed} -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" \ frozen-bubble frozen-bubble-editor @@ -159,6 +161,18 @@ %changelog +* Sun Jul 6 2008 Hans de Goede 2.1.0-9 +- Fix audio on bigendian archs (bz 454109), patch by Ian Chapman + +* Mon Mar 3 2008 Tom "spot" Callaway - 2.1.0-8 +- rebuild for new perl (again) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.1.0-7 +- Autorebuild for GCC 4.3 + +* Thu Feb 7 2008 Tom "spot" Callaway 2.1.0-6 +- rebuild for new perl + * Wed Aug 22 2007 Matthias Saou 2.1.0-5 - Rebuild for new BuildID feature. From fedora-extras-commits at redhat.com Sun Jul 6 11:56:38 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 6 Jul 2008 11:56:38 GMT Subject: rpms/frozen-bubble/F-9 frozen-bubble-2.1.0-bigendianaudio.patch, NONE, 1.1 frozen-bubble.spec, 1.11, 1.12 Message-ID: <200807061156.m66BucES031036@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/frozen-bubble/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30830 Modified Files: frozen-bubble.spec Added Files: frozen-bubble-2.1.0-bigendianaudio.patch Log Message: * Sun Jul 6 2008 Hans de Goede 2.1.0-9 - Fix audio on bigendian archs (bz 454109), patch by Ian Chapman frozen-bubble-2.1.0-bigendianaudio.patch: --- NEW FILE frozen-bubble-2.1.0-bigendianaudio.patch --- --- frozen-bubble.orig 2008-03-03 20:49:40.000000000 +0000 +++ frozen-bubble 2008-07-04 19:00:13.000000000 +0100 @@ -66,6 +66,8 @@ use fbsyms; use FBLE; +use Config; + $| = 1; $TARGET_ANIM_SPEED = 20; # number of milliseconds that should last between two animation frames @@ -281,7 +283,13 @@ } sub init_sound() { - $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); }; + # Endian Test + if ($Config{byteorder} == 4321 || $Config{byteorder} == 87654321) { + $mixer = eval { SDL::Mixer->new(-frequency => 44100, -format => &AUDIO_S16MSB, -channels => 2, -size => 1024); }; + } + else { + $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); }; + } if ($@) { $@ =~ s| at \S+ line.*\n||; print STDERR "\nWarning: can't initialize sound (reason: $@).\n"; Index: frozen-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/frozen-bubble/F-9/frozen-bubble.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- frozen-bubble.spec 3 Mar 2008 19:09:26 -0000 1.11 +++ frozen-bubble.spec 6 Jul 2008 11:55:39 -0000 1.12 @@ -1,13 +1,14 @@ Summary: Frozen Bubble arcade game Name: frozen-bubble Version: 2.1.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Amusements/Games URL: http://www.frozen-bubble.org/ Source0: http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2 Source1: frozen-bubble.desktop Source2: fb-server.init +Patch0: frozen-bubble-2.1.0-bigendianaudio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p0 # Add a directory to the module path for the app's private perl modules %{__sed} -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" \ frozen-bubble frozen-bubble-editor @@ -159,6 +161,9 @@ %changelog +* Sun Jul 6 2008 Hans de Goede 2.1.0-9 +- Fix audio on bigendian archs (bz 454109), patch by Ian Chapman + * Mon Mar 3 2008 Tom "spot" Callaway - 2.1.0-8 - rebuild for new perl (again) From fedora-extras-commits at redhat.com Sun Jul 6 12:32:38 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 6 Jul 2008 12:32:38 GMT Subject: rpms/erlang/devel .cvsignore, 1.10, 1.11 erlang.spec, 1.27, 1.28 sources, 1.10, 1.11 Message-ID: <200807061232.m66CWcN1007627@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568 Modified Files: .cvsignore erlang.spec sources Log Message: new release R12B-3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Mar 2008 15:26:08 -0000 1.10 +++ .cvsignore 6 Jul 2008 12:31:45 -0000 1.11 @@ -1,3 +1,3 @@ -otp_src_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_doc_html_R12B-1.tar.gz +otp_doc_html_R12B-3.tar.gz +otp_doc_man_R12B-3.tar.gz +otp_src_R12B-3.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- erlang.spec 27 Mar 2008 15:26:08 -0000 1.27 +++ erlang.spec 6 Jul 2008 12:31:45 -0000 1.28 @@ -1,19 +1,21 @@ +%define ver R12B +%define rel 3 + Name: erlang -Version: R12B -Release: 1.1%{?dist} +Version: %{ver} +Release: %{rel}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-null.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -44,15 +46,22 @@ %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -%patch2 -p1 -b .rpath +#%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch4 -p1 -b .null + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +# fix for newer glibc version +sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c +# use gcc -shared instead of ld +sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in +sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in + + %build CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} @@ -110,6 +119,9 @@ %changelog +* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 +- new release R12B-3 + * Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 - new release R12B-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Mar 2008 15:26:08 -0000 1.10 +++ sources 6 Jul 2008 12:31:45 -0000 1.11 @@ -1,3 +1,3 @@ -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz +8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz +13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz +c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 12:33:46 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 6 Jul 2008 12:33:46 GMT Subject: rpms/erlang/devel erlang.spec,1.28,1.29 Message-ID: <200807061233.m66CXkTn007684@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7641 Modified Files: erlang.spec Log Message: Index: erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- erlang.spec 6 Jul 2008 12:31:45 -0000 1.28 +++ erlang.spec 6 Jul 2008 12:32:48 -0000 1.29 @@ -14,7 +14,6 @@ Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch -Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,7 +48,6 @@ %setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -#%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath # enable dynamic linking for ssl From fedora-extras-commits at redhat.com Sun Jul 6 13:14:59 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 6 Jul 2008 13:14:59 GMT Subject: rpms/WebKit/F-8 .cvsignore, 1.5, 1.6 WebKit.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807061314.m66DExx4015860@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15825/F-8 Modified Files: .cvsignore WebKit.spec sources Log Message: * Sun Jul 06 2008 Peter Gordon 1.0.0-0.10.svn34655 - Update to new upstream snapshot (SVN 34655) - Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of JavaScript arrays) - Add some build-time conditionals for non-default features: debug, html5video, pango, svg. - libqtwebico.so is no longer supported. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Apr 2008 15:25:03 -0000 1.5 +++ .cvsignore 6 Jul 2008 13:14:15 -0000 1.6 @@ -1 +1 @@ -WebKit-r32531.tar.bz2 +WebKit-r34655.tar.bz2 Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-8/WebKit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- WebKit.spec 30 Apr 2008 15:25:03 -0000 1.4 +++ WebKit.spec 6 Jul 2008 13:14:15 -0000 1.5 @@ -3,11 +3,28 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \ echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list -%define svn_revision 32531 +%define svn_revision 34655 + +## Optional build modifications (for the GTK+ port only) +## --with debug: Enable more verbose debugging. Makes runtime a bit slower. +## (Default: No) +## +## --with html5video: HTML5 video element support using Gstreamer +## (Default: No) +## +## --with pango: Use Pango instead of freetype2 as the font renderer +## (Default: No - use freetype2) +## +## --with svg: Experimental SVG support (filters) +## (Default: No) +%bcond_with debug +%bcond_with html5video +%bcond_with pango +%bcond_with svg Name: WebKit Version: 1.0.0 -Release: 0.9.svn%{svn_revision}%{?dist} +Release: 0.10.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -23,14 +40,29 @@ BuildRequires: flex BuildRequires: gperf BuildRequires: gtk2-devel -BuildRequires: libicu-devel +BuildRequires: libicu-devel BuildRequires: libtool BuildRequires: libxslt-devel -BuildRequires: pango-devel +BuildRequires: libXt-devel BuildRequires: pcre-devel +BuildRequires: sqlite-devel ## Necessary for qmake and friends. BuildRequires: qt4-devel -BuildRequires: sqlite-devel + +## Conditional dependencies... +%if %{with html5video} +BuildRequires: gnome-vfs2-devel +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel +%endif + +%if %{with pango} +BuildRequires: pango-devel +%else +BuildRequires: cairo-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel +%endif %description WebKit is an open source web browser engine. @@ -95,6 +127,7 @@ %prep %setup -qn "%{name}-r%{svn_revision}" + %build ## We don't like pre-built binaries, especially ones for other OSes. =) rm -r WebKitLibraries/{*.a,win/} @@ -102,17 +135,19 @@ ## Fix permissions for the debuginfo generation. chmod a-x WebCore/dom/Clipboard.cpp -status=0 ## Build the GTK+ port... - ## Don't call configure automatically sed -i.conf -e '$d' autogen.sh -mkdir build-gtk +./autogen.sh +install -d build-gtk pushd build-gtk - ../autogen.sh - ln -sf ../configure - %configure --with-font-backend=pango --enable-icon-database - make %{?_smp_mflags} -k || status=1 + ln -sf ../configure + %configure \ + %{?with_debug: --enable-debug } \ + %{?with_html5video: --enable-video } \ + %{?with_pango: --with-font-backend=pango } \ + %{?with_svg: --enable-svg-filters } + make %{?_smp_mflags} popd @@ -130,13 +165,9 @@ CONFIG+=qt-port \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro - make %{?_smp_mflags} -k \ - || status=$((status+10)) + make %{?_smp_mflags} popd -echo $status -if [ $status -gt 0 ] ; then exit 1 ; fi - %install rm -rf %{buildroot} @@ -145,8 +176,6 @@ install -d -m 755 %{buildroot}%{_libexecdir}/%{name} install -m 755 build-gtk/Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} - - make -C build-qt install INSTALL_ROOT=%{buildroot} install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name} install -m 755 build-qt/bin/DumpRenderTree %{buildroot}%{_libexecdir}/%{name} @@ -196,7 +225,7 @@ %files gtk %defattr(-,root,root,-) -%doc +%{_bindir}/jsc %{_libdir}/libwebkit-1.0.so.* %dir %{_libexecdir}/WebKit/ %{_libexecdir}/WebKit/GtkLauncher @@ -221,7 +250,6 @@ %{_libdir}/libQtWebKit.so %{_libdir}/pkgconfig/QtWebKit.pc %{_libexecdir}/WebKit/DumpRenderTree -%{_qt4_plugindir}/imageformats/libqtwebico.so %{_qt4_prefix}/mkspecs/features/qtwebkit.prf %files doc -f docfiles.list @@ -229,6 +257,14 @@ %changelog +* Sun Jul 06 2008 Peter Gordon 1.0.0-0.10.svn34655 +- Update to new upstream snapshot (SVN 34655) +- Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of + JavaScript arrays) +- Add some build-time conditionals for non-default features: debug, html5video, + pango, svg. +- libqtwebico.so is no longer supported. + * Mon Apr 28 2008 Mamoru Tasaka - 1.0.0-0.9.svn32531 - Update to new upstream snapshot (SVN 32531). - Fix bug 443048 and hopefully fix bug 444445 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Apr 2008 15:25:03 -0000 1.5 +++ sources 6 Jul 2008 13:14:15 -0000 1.6 @@ -1 +1 @@ -db45e1fab555d2a739d4e01f7dfc0091 WebKit-r32531.tar.bz2 +0c4dcb3f69d9bd63817005a11a797425 WebKit-r34655.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 13:37:57 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sun, 6 Jul 2008 13:37:57 GMT Subject: rpms/sipp/devel import.log, NONE, 1.1 sipp--CVE-2008-2085-fix.diff, NONE, 1.1 sipp.spec, 1.9, 1.10 Message-ID: <200807061337.m66Dbv7P017183@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/sipp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17099/devel Modified Files: sipp.spec Added Files: import.log sipp--CVE-2008-2085-fix.diff Log Message: CVE-2008-2085 fix --- NEW FILE import.log --- sipp-3_1-2_fc9:HEAD:sipp-3.1-2.fc9.src.rpm:1215351390 sipp--CVE-2008-2085-fix.diff: --- NEW FILE sipp--CVE-2008-2085-fix.diff --- --- call.cpp.cve20082085 2008-07-06 12:38:01.000000000 +0400 +++ call.cpp 2008-07-06 17:11:11.000000000 +0400 @@ -125,17 +125,26 @@ char pattern[] = "c=IN IP4 "; char *begin, *end; char ip[32]; - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + + if(!tmp) return INADDR_NONE; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return INADDR_NONE; } begin += sizeof("c=IN IP4 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return INADDR_NONE; + } + *end = 0; memset(ip, 0, 32); - strncpy(ip, begin, end - begin); + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); return inet_addr(ip); } @@ -148,20 +157,28 @@ char pattern[] = "c=IN IP6 "; char *begin, *end; char ip[128]; + char *tmp = strdup(msg); memset(&addr, 0, sizeof(addr)); memset(ip, 0, 128); - begin = strstr(msg, pattern); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return 0; } begin += sizeof("c=IN IP6 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return 0; - strncpy(ip, begin, end - begin); + } + *end = 0; + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); if (!inet_pton(AF_INET6, ip, &addr)) { return 0; } @@ -188,17 +205,25 @@ ERROR("Internal error: Undefined media pattern %d\n", 3); } - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* m=audio not found */ return 0; } begin += strlen(pattern) - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); ERROR("get_remote_port_media: no CRLF found"); + } + *end = 0; memset(number, 0, sizeof(number)); strncpy(number, begin, sizeof(number) - 1); + number[sizeof(number) - 1] = 0; + free(tmp); return atoi(number); } Index: sipp.spec =================================================================== RCS file: /cvs/extras/rpms/sipp/devel/sipp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sipp.spec 30 Apr 2008 14:10:01 -0000 1.9 +++ sipp.spec 6 Jul 2008 13:37:06 -0000 1.10 @@ -1,13 +1,16 @@ Summary: SIP test tool / traffic generator Name: sipp Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://sipp.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}.%{version}.src.tar.gz Patch0: sipp--Makefile-fix-paths.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=1982103&group_id=104305&atid=637566 Patch1: sipp--INT_MAX_headers_for_gcc43.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=2011751&group_id=104305&atid=637566 +Patch2: sipp--CVE-2008-2085-fix.diff BuildRequires: ncurses-devel %if 0%{?el4} BuildRequires: libpcap @@ -31,6 +34,7 @@ %setup -qn %{name}.svn %patch0 %patch1 +%patch2 -p0 -b .cve20082085 %build DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl @@ -51,6 +55,9 @@ %{_datadir}/%{name} %changelog +* Sun Jul 6 2008 Peter Lemenkov 3.1-2 +- CVE-2008-2085 + * Wed Apr 30 2008 Peter Lemenkov 3.1-1 - Ver 3.1 From fedora-extras-commits at redhat.com Sun Jul 6 13:39:50 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sun, 6 Jul 2008 13:39:50 GMT Subject: rpms/sipp/F-9 import.log, NONE, 1.1 sipp--CVE-2008-2085-fix.diff, NONE, 1.1 sipp.spec, 1.9, 1.10 Message-ID: <200807061339.m66Ddoao017440@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/sipp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17302/F-9 Modified Files: sipp.spec Added Files: import.log sipp--CVE-2008-2085-fix.diff Log Message: CVE-2008-2085 fix --- NEW FILE import.log --- sipp-3_1-2_fc9:F-9:sipp-3.1-2.fc9.src.rpm:1215351508 sipp--CVE-2008-2085-fix.diff: --- NEW FILE sipp--CVE-2008-2085-fix.diff --- --- call.cpp.cve20082085 2008-07-06 12:38:01.000000000 +0400 +++ call.cpp 2008-07-06 17:11:11.000000000 +0400 @@ -125,17 +125,26 @@ char pattern[] = "c=IN IP4 "; char *begin, *end; char ip[32]; - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + + if(!tmp) return INADDR_NONE; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return INADDR_NONE; } begin += sizeof("c=IN IP4 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return INADDR_NONE; + } + *end = 0; memset(ip, 0, 32); - strncpy(ip, begin, end - begin); + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); return inet_addr(ip); } @@ -148,20 +157,28 @@ char pattern[] = "c=IN IP6 "; char *begin, *end; char ip[128]; + char *tmp = strdup(msg); memset(&addr, 0, sizeof(addr)); memset(ip, 0, 128); - begin = strstr(msg, pattern); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return 0; } begin += sizeof("c=IN IP6 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return 0; - strncpy(ip, begin, end - begin); + } + *end = 0; + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); if (!inet_pton(AF_INET6, ip, &addr)) { return 0; } @@ -188,17 +205,25 @@ ERROR("Internal error: Undefined media pattern %d\n", 3); } - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* m=audio not found */ return 0; } begin += strlen(pattern) - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); ERROR("get_remote_port_media: no CRLF found"); + } + *end = 0; memset(number, 0, sizeof(number)); strncpy(number, begin, sizeof(number) - 1); + number[sizeof(number) - 1] = 0; + free(tmp); return atoi(number); } Index: sipp.spec =================================================================== RCS file: /cvs/extras/rpms/sipp/F-9/sipp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sipp.spec 30 Apr 2008 14:05:35 -0000 1.9 +++ sipp.spec 6 Jul 2008 13:38:53 -0000 1.10 @@ -1,13 +1,16 @@ Summary: SIP test tool / traffic generator Name: sipp Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://sipp.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}.%{version}.src.tar.gz Patch0: sipp--Makefile-fix-paths.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=1982103&group_id=104305&atid=637566 Patch1: sipp--INT_MAX_headers_for_gcc43.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=2011751&group_id=104305&atid=637566 +Patch2: sipp--CVE-2008-2085-fix.diff BuildRequires: ncurses-devel %if 0%{?el4} BuildRequires: libpcap @@ -31,6 +34,7 @@ %setup -qn %{name}.svn %patch0 %patch1 +%patch2 -p0 -b .cve20082085 %build DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl @@ -51,6 +55,9 @@ %{_datadir}/%{name} %changelog +* Sun Jul 6 2008 Peter Lemenkov 3.1-2 +- CVE-2008-2085 + * Wed Apr 30 2008 Peter Lemenkov 3.1-1 - Ver 3.1 From fedora-extras-commits at redhat.com Sun Jul 6 13:42:24 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sun, 6 Jul 2008 13:42:24 GMT Subject: rpms/sipp/F-8 import.log, NONE, 1.1 sipp--CVE-2008-2085-fix.diff, NONE, 1.1 sipp.spec, 1.6, 1.7 Message-ID: <200807061342.m66DgO0u017667@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/sipp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17552/F-8 Modified Files: sipp.spec Added Files: import.log sipp--CVE-2008-2085-fix.diff Log Message: CVE-2008-2085 fix --- NEW FILE import.log --- sipp-3_1-2_fc9:F-8:sipp-3.1-2.fc9.src.rpm:1215351631 sipp--CVE-2008-2085-fix.diff: --- NEW FILE sipp--CVE-2008-2085-fix.diff --- --- call.cpp.cve20082085 2008-07-06 12:38:01.000000000 +0400 +++ call.cpp 2008-07-06 17:11:11.000000000 +0400 @@ -125,17 +125,26 @@ char pattern[] = "c=IN IP4 "; char *begin, *end; char ip[32]; - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + + if(!tmp) return INADDR_NONE; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return INADDR_NONE; } begin += sizeof("c=IN IP4 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return INADDR_NONE; + } + *end = 0; memset(ip, 0, 32); - strncpy(ip, begin, end - begin); + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); return inet_addr(ip); } @@ -148,20 +157,28 @@ char pattern[] = "c=IN IP6 "; char *begin, *end; char ip[128]; + char *tmp = strdup(msg); memset(&addr, 0, sizeof(addr)); memset(ip, 0, 128); - begin = strstr(msg, pattern); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return 0; } begin += sizeof("c=IN IP6 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return 0; - strncpy(ip, begin, end - begin); + } + *end = 0; + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); if (!inet_pton(AF_INET6, ip, &addr)) { return 0; } @@ -188,17 +205,25 @@ ERROR("Internal error: Undefined media pattern %d\n", 3); } - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* m=audio not found */ return 0; } begin += strlen(pattern) - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); ERROR("get_remote_port_media: no CRLF found"); + } + *end = 0; memset(number, 0, sizeof(number)); strncpy(number, begin, sizeof(number) - 1); + number[sizeof(number) - 1] = 0; + free(tmp); return atoi(number); } Index: sipp.spec =================================================================== RCS file: /cvs/extras/rpms/sipp/F-8/sipp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sipp.spec 30 Apr 2008 14:03:21 -0000 1.6 +++ sipp.spec 6 Jul 2008 13:41:22 -0000 1.7 @@ -1,13 +1,16 @@ Summary: SIP test tool / traffic generator Name: sipp Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://sipp.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}.%{version}.src.tar.gz Patch0: sipp--Makefile-fix-paths.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=1982103&group_id=104305&atid=637566 Patch1: sipp--INT_MAX_headers_for_gcc43.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=2011751&group_id=104305&atid=637566 +Patch2: sipp--CVE-2008-2085-fix.diff BuildRequires: ncurses-devel %if 0%{?el4} BuildRequires: libpcap @@ -31,6 +34,7 @@ %setup -qn %{name}.svn %patch0 %patch1 +%patch2 -p0 -b .cve20082085 %build DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl @@ -51,6 +55,9 @@ %{_datadir}/%{name} %changelog +* Sun Jul 6 2008 Peter Lemenkov 3.1-2 +- CVE-2008-2085 + * Wed Apr 30 2008 Peter Lemenkov 3.1-1 - Ver 3.1 From fedora-extras-commits at redhat.com Sun Jul 6 13:46:04 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sun, 6 Jul 2008 13:46:04 GMT Subject: rpms/sipp/EL-5 import.log, NONE, 1.1 sipp--CVE-2008-2085-fix.diff, NONE, 1.1 sipp.spec, 1.6, 1.7 Message-ID: <200807061346.m66Dk4el017894@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/sipp/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17849/EL-5 Modified Files: sipp.spec Added Files: import.log sipp--CVE-2008-2085-fix.diff Log Message: CVE-2008-2085 fix --- NEW FILE import.log --- sipp-3_1-2_fc9:EL-5:sipp-3.1-2.fc9.src.rpm:1215351879 sipp--CVE-2008-2085-fix.diff: --- NEW FILE sipp--CVE-2008-2085-fix.diff --- --- call.cpp.cve20082085 2008-07-06 12:38:01.000000000 +0400 +++ call.cpp 2008-07-06 17:11:11.000000000 +0400 @@ -125,17 +125,26 @@ char pattern[] = "c=IN IP4 "; char *begin, *end; char ip[32]; - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + + if(!tmp) return INADDR_NONE; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return INADDR_NONE; } begin += sizeof("c=IN IP4 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return INADDR_NONE; + } + *end = 0; memset(ip, 0, 32); - strncpy(ip, begin, end - begin); + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); return inet_addr(ip); } @@ -148,20 +157,28 @@ char pattern[] = "c=IN IP6 "; char *begin, *end; char ip[128]; + char *tmp = strdup(msg); memset(&addr, 0, sizeof(addr)); memset(ip, 0, 128); - begin = strstr(msg, pattern); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return 0; } begin += sizeof("c=IN IP6 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return 0; - strncpy(ip, begin, end - begin); + } + *end = 0; + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); if (!inet_pton(AF_INET6, ip, &addr)) { return 0; } @@ -188,17 +205,25 @@ ERROR("Internal error: Undefined media pattern %d\n", 3); } - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* m=audio not found */ return 0; } begin += strlen(pattern) - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); ERROR("get_remote_port_media: no CRLF found"); + } + *end = 0; memset(number, 0, sizeof(number)); strncpy(number, begin, sizeof(number) - 1); + number[sizeof(number) - 1] = 0; + free(tmp); return atoi(number); } Index: sipp.spec =================================================================== RCS file: /cvs/extras/rpms/sipp/EL-5/sipp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sipp.spec 30 Apr 2008 13:57:31 -0000 1.6 +++ sipp.spec 6 Jul 2008 13:45:07 -0000 1.7 @@ -1,13 +1,16 @@ Summary: SIP test tool / traffic generator Name: sipp Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://sipp.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}.%{version}.src.tar.gz Patch0: sipp--Makefile-fix-paths.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=1982103&group_id=104305&atid=637566 Patch1: sipp--INT_MAX_headers_for_gcc43.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=2011751&group_id=104305&atid=637566 +Patch2: sipp--CVE-2008-2085-fix.diff BuildRequires: ncurses-devel %if 0%{?el4} BuildRequires: libpcap @@ -31,6 +34,7 @@ %setup -qn %{name}.svn %patch0 %patch1 +%patch2 -p0 -b .cve20082085 %build DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl @@ -51,6 +55,9 @@ %{_datadir}/%{name} %changelog +* Sun Jul 6 2008 Peter Lemenkov 3.1-2 +- CVE-2008-2085 + * Wed Apr 30 2008 Peter Lemenkov 3.1-1 - Ver 3.1 From fedora-extras-commits at redhat.com Sun Jul 6 13:48:21 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sun, 6 Jul 2008 13:48:21 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1557,1.1558 Message-ID: <200807061348.m66DmLXG018102@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18066 Modified Files: openoffice.org.spec Log Message: split out script providers Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1557 retrieving revision 1.1558 diff -u -r1.1557 -r1.1558 --- openoffice.org.spec 4 Jul 2008 23:05:10 -0000 1.1557 +++ openoffice.org.spec 6 Jul 2008 13:47:37 -0000 1.1558 @@ -1,6 +1,6 @@ %define oootag DEV300 %define ooomilestone 22 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -152,7 +152,6 @@ Group: Applications/Productivity Requires: liberation-fonts Requires: hunspell-en, hyphen-en -Requires: bsh Requires: hsqldb, xalan-j2, xerces-j2 PreReq: gtk2 >= 2.9.4 Requires(post): shared-mime-info @@ -187,7 +186,7 @@ The shared core branding files for BrOffice.org %package pyuno -Summary: Python bindings for %{name} +Summary: Python support for %{name} Group: Development/Libraries Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: python @@ -237,6 +236,23 @@ and page headers as well as group, page footers and calculation fields to accomplish complex database reports. +%package bsh +Summary: BeanShell support for %{name} +Group: Development/Libraries +Requires: bsh +Requires: %{name}-base-core = %{epoch}:%{version}-%{release} + +%description bsh +Support BeanShell scripts in %{name}. + +%package rhino +Summary: JavaScript support for %{name} +Group: Development/Libraries +Requires: %{name}-base-core = %{epoch}:%{version}-%{release} + +%description rhino +Support JavaScript scripts in %{name}. + %package wiki-publisher Summary: Create Wiki articles on MediaWiki servers with %{name} Group: Applications/Productivity @@ -1486,6 +1502,19 @@ install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt +# revoke ScriptProviders and make into extensions +pushd $RPM_BUILD_ROOT/%{basisinstdir}/program +regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForBeanShell.jar" +mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip +mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip +regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForJavaScript.jar" +mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip +mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip +regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript +mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip +mv pythonscript.py* $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip +popd + #add enough to the sdk to build the kde vcl plug out of tree cp -r solenv/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{baseinstdir}/sdk/linux/bin @@ -2035,7 +2064,6 @@ %{basisinstdir}/program/classes/commonwizards.jar %{basisinstdir}/program/classes/fax.jar %{basisinstdir}/program/classes/form.jar -%{basisinstdir}/program/classes/js.jar %{basisinstdir}/program/classes/jut.jar %{basisinstdir}/program/classes/query.jar %{basisinstdir}/program/classes/letter.jar @@ -2044,9 +2072,7 @@ %{basisinstdir}/program/classes/report.jar %{basisinstdir}/program/classes/sdbc_hsqldb.jar %{basisinstdir}/program/classes/ScriptFramework.jar -%{basisinstdir}/program/classes/ScriptProviderForBeanShell.jar %{basisinstdir}/program/classes/ScriptProviderForJava.jar -%{basisinstdir}/program/classes/ScriptProviderForJavaScript.jar %{basisinstdir}/program/classes/table.jar %{basisinstdir}/program/classes/unoil.jar %{basisinstdir}/program/classes/web.jar @@ -2301,9 +2327,7 @@ %{basisinstdir}/program/cairocanvas.uno.so %dir %{basisinstdir}/share %dir %{basisinstdir}/share/Scripts -%{basisinstdir}/share/Scripts/beanshell %{basisinstdir}/share/Scripts/java -%{basisinstdir}/share/Scripts/javascript %dir %{basisinstdir}/share/autocorr %if %{langpacks} %{basisinstdir}/share/autocorr/acor_en-*.dat @@ -2866,6 +2890,57 @@ # clear disk cache unopkg list --shared > /dev/null 2>&1 || : +%files bsh +%defattr(-,root,root,-) +%{basisinstdir}/share/Scripts/beanshell +%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip + +%pre bsh +if [ $1 -gt 1 ]; then + # Upgrade => deregister old extension + unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip || : +fi + +%post bsh + # register extension + unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip > /dev/null || : + +%preun bsh +if [ $1 -eq 0 ]; then + # not upgrading => deregister + unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip || : +fi + +%postun bsh + # clear disk cache + unopkg list --shared > /dev/null 2>&1 || : + +%files rhino +%defattr(-,root,root,-) +%{basisinstdir}/program/classes/js.jar +%{basisinstdir}/share/Scripts/javascript +%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip + +%pre rhino +if [ $1 -gt 1 ]; then + # Upgrade => deregister old extension + unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip || : +fi + +%post rhino + # register extension + unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip > /dev/null || : + +%preun rhino +if [ $1 -eq 0 ]; then + # not upgrading => deregister + unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip || : +fi + +%postun rhino + # clear disk cache + unopkg list --shared > /dev/null 2>&1 || : + %files wiki-publisher %defattr(-,root,root,-) %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt @@ -3472,7 +3547,6 @@ %{basisinstdir}/program/pythonloader.py* %{basisinstdir}/program/pythonloader.uno.so %{basisinstdir}/program/pythonloader.unorc -%{basisinstdir}/program/pythonscript.py* %{basisinstdir}/program/pyuno.so %dir %{basisinstdir}/share %dir %{basisinstdir}/share/Scripts @@ -3486,8 +3560,33 @@ %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %{python_py_sitearch}/uno.py* %{python_py_sitearch}/unohelper.py* +%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip + +%pre pyuno +if [ $1 -gt 1 ]; then + # Upgrade => deregister old extension + unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip || : +fi + +%post pyuno + # register extension + unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip > /dev/null || : + +%preun pyuno +if [ $1 -eq 0 ]; then + # not upgrading => deregister + unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip || : +fi + +%postun pyuno + # clear disk cache + unopkg list --shared > /dev/null 2>&1 || : %changelog +* Sat Jul 05 2008 Caolan McNamara - 1:3.0.0-0.22-2 +- split out arcane ScriptProviders out of core into optional extensions + => bsh now only required by beanshell ScriptProvider + * Tue Jul 01 2008 Caolan McNamara - 1:3.0.0-0.22-1 - next version - drop integrated pseudoworkspace.valgrind1.patch From fedora-extras-commits at redhat.com Sun Jul 6 13:49:36 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sun, 6 Jul 2008 13:49:36 GMT Subject: rpms/sipp/EL-4 import.log, NONE, 1.1 sipp--CVE-2008-2085-fix.diff, NONE, 1.1 sipp.spec, 1.9, 1.10 Message-ID: <200807061349.m66DnaLa018233@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/sipp/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18127/EL-4 Modified Files: sipp.spec Added Files: import.log sipp--CVE-2008-2085-fix.diff Log Message: CVE-2008-2085 fix --- NEW FILE import.log --- sipp-3_1-2_fc9:EL-4:sipp-3.1-2.fc9.src.rpm:1215352044 sipp--CVE-2008-2085-fix.diff: --- NEW FILE sipp--CVE-2008-2085-fix.diff --- --- call.cpp.cve20082085 2008-07-06 12:38:01.000000000 +0400 +++ call.cpp 2008-07-06 17:11:11.000000000 +0400 @@ -125,17 +125,26 @@ char pattern[] = "c=IN IP4 "; char *begin, *end; char ip[32]; - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + + if(!tmp) return INADDR_NONE; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return INADDR_NONE; } begin += sizeof("c=IN IP4 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return INADDR_NONE; + } + *end = 0; memset(ip, 0, 32); - strncpy(ip, begin, end - begin); + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); return inet_addr(ip); } @@ -148,20 +157,28 @@ char pattern[] = "c=IN IP6 "; char *begin, *end; char ip[128]; + char *tmp = strdup(msg); memset(&addr, 0, sizeof(addr)); memset(ip, 0, 128); - begin = strstr(msg, pattern); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* Can't find what we're looking at -> return no address */ return 0; } begin += sizeof("c=IN IP6 ") - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); return 0; - strncpy(ip, begin, end - begin); + } + *end = 0; + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); if (!inet_pton(AF_INET6, ip, &addr)) { return 0; } @@ -188,17 +205,25 @@ ERROR("Internal error: Undefined media pattern %d\n", 3); } - begin = strstr(msg, pattern); + char *tmp = strdup(msg); + if(!tmp) return 0; + begin = strstr(tmp, pattern); if (!begin) { + free(tmp); /* m=audio not found */ return 0; } begin += strlen(pattern) - 1; end = strstr(begin, "\r\n"); - if (!end) + if (!end){ + free(tmp); ERROR("get_remote_port_media: no CRLF found"); + } + *end = 0; memset(number, 0, sizeof(number)); strncpy(number, begin, sizeof(number) - 1); + number[sizeof(number) - 1] = 0; + free(tmp); return atoi(number); } Index: sipp.spec =================================================================== RCS file: /cvs/extras/rpms/sipp/EL-4/sipp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sipp.spec 30 Apr 2008 13:52:17 -0000 1.9 +++ sipp.spec 6 Jul 2008 13:48:42 -0000 1.10 @@ -1,13 +1,16 @@ Summary: SIP test tool / traffic generator Name: sipp Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://sipp.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}.%{version}.src.tar.gz Patch0: sipp--Makefile-fix-paths.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=1982103&group_id=104305&atid=637566 Patch1: sipp--INT_MAX_headers_for_gcc43.diff +# https://sourceforge.net/tracker/index.php?func=detail&aid=2011751&group_id=104305&atid=637566 +Patch2: sipp--CVE-2008-2085-fix.diff BuildRequires: ncurses-devel %if 0%{?el4} BuildRequires: libpcap @@ -31,6 +34,7 @@ %setup -qn %{name}.svn %patch0 %patch1 +%patch2 -p0 -b .cve20082085 %build DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl @@ -51,6 +55,9 @@ %{_datadir}/%{name} %changelog +* Sun Jul 6 2008 Peter Lemenkov 3.1-2 +- CVE-2008-2085 + * Wed Apr 30 2008 Peter Lemenkov 3.1-1 - Ver 3.1 From fedora-extras-commits at redhat.com Sun Jul 6 14:26:26 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Sun, 6 Jul 2008 14:26:26 GMT Subject: rpms/ikiwiki/devel ikiwiki.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807061426.m66EQQBX026496@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26432/devel Modified Files: .cvsignore sources Added Files: ikiwiki.spec import.log Log Message: New package. --- NEW FILE ikiwiki.spec --- Name: ikiwiki Version: 2.51 Release: 1%{?dist} Summary: A wiki compiler Group: Applications/Internet License: GPLv2+ URL: http://ikiwiki.info/ Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Text::Markdown) BuildRequires: perl(Mail::Sendmail) BuildRequires: perl(HTML::Scrubber) BuildRequires: perl(XML::Simple) BuildRequires: perl(Date::Parse) BuildRequires: perl(Date::Format) BuildRequires: perl(HTML::Template) BuildRequires: perl(CGI::FormBuilder) BuildRequires: perl(CGI::Session) BuildRequires: perl(File::MimeInfo) BuildRequires: gettext Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Text::Markdown) Requires: perl(Mail::Sendmail) Requires: perl(HTML::Scrubber) Requires: perl(XML::Simple) Requires: perl(CGI::FormBuilder) Requires: perl(CGI::Session) Requires: perl(Digest::SHA1) %define cgi_bin %{_libexecdir}/w3m/cgi-bin %description Ikiwiki is a wiki compiler. It converts wiki pages into HTML pages suitable for publishing on a website. Ikiwiki stores pages and history in a revision control system such as Subversion or Git. There are many other features, including support for blogging, as well as a large array of plugins. %prep %setup -q -n %{name} # Filter unwanted Provides: %{__cat} << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ %{__sed} -e '/perl(IkiWiki.*)/d' EOF %define __perl_provides %{_builddir}/%{name}/%{name}-prov %{__chmod} +x %{__perl_provides} # Filter Requires, all used by plugins # - Monotone: see bz 450267 # - RPC::XML: see bz 435835 # - Net::Amazon:::S3: see bz 436481 %{__cat} << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ %{__sed} -e '/perl(IkiWiki.*)/d' \ -e '/perl(Monotone)/d' \ -e '/perl(RPC::XML)/d' \ -e '/perl(RPC::XML::Parser)/d' \ -e '/perl(Net::Amazon::S3)/d' EOF %define __perl_requires %{_builddir}/%{name}/%{name}-req %{__chmod} +x %{__perl_requires} # goes into the -w3m subpackage %{__cat} << \EOF > README.fedora See http://ikiwiki.info/w3mmode/ for more information. EOF %build %{__perl} Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} # parallel builds currently don't work %{__make} %install %{__rm} -rf %{buildroot} %{__make} pure_install DESTDIR=%{buildroot} %find_lang %{name} # cgi script is wrongly installed in a fixed place %{__mkdir_p} %{buildroot}%{cgi_bin} %{__mv} %{buildroot}/usr/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \ %{buildroot}%{cgi_bin} # fix encoding iconv -f iso-8859-9 -t utf-8 \ html/tips/vim_syntax_highlighting/ikiwiki.vim \ -o html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp %{__mv} html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp \ html/tips/vim_syntax_highlighting/ikiwiki.vim %clean %{__rm} -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/ikiwiki* %{_sbindir}/ikiwiki* %{_mandir}/man1/ikiwiki* %{_mandir}/man8/ikiwiki* %{_datadir}/ikiwiki # contains a packlist only %exclude %{perl_vendorarch} %{perl_vendorlib}/IkiWiki* # directory for external (non-perl) plugins, needs RPC::XML %exclude %{_prefix}/lib/ikiwiki/plugins/* %doc README debian/changelog debian/NEWS %doc html %package w3m Summary: Ikiwiki w3m cgi meta-wrapper Group: Applications/Internet Requires: w3m Requires: %{name} = %{version}-%{release} %description w3m Enable usage of all of ikiwiki's web features (page editing, etc) in the w3m web browser without a web server. w3m supports local CGI scripts, and ikiwiki can be set up to run that way using the meta-wrapper in this package. %files w3m %defattr(-,root,root,-) %doc README.fedora %{cgi_bin}/ikiwiki-w3m.cgi %changelog * Sun Jul 6 2008 Thomas Moschny - 2.51-1 - Update to 2.51. - Save iconv output to a temporary file. * Sun Jun 15 2008 Thomas Moschny - 2.50-1 - Update to 2.50. - Move ikiwiki-w3m.cgi into a subpackage. - Add ikiwiki's own documentation. - Remove duplicate requirement perl(File::MimeInfo). - Minor cleanups. * Mon Jun 2 2008 Thomas Moschny - 2.48-1 - Update to 2.48. * Wed May 28 2008 Thomas Moschny - 2.47-1 - Update to 2.47. * Tue May 13 2008 Thomas Moschny - 2.46-1 - Update to 2.46. * Sat May 10 2008 Thomas Moschny - 2.45-1 - New package. --- NEW FILE import.log --- ikiwiki-2_51-1_fc9:HEAD:ikiwiki-2.51-1.fc9.src.rpm:1215354319 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 19:49:29 -0000 1.1 +++ .cvsignore 6 Jul 2008 14:25:40 -0000 1.2 @@ -0,0 +1 @@ +ikiwiki_2.51.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:49:29 -0000 1.1 +++ sources 6 Jul 2008 14:25:40 -0000 1.2 @@ -0,0 +1 @@ +4423258ab049d5441225027704fd2d1a ikiwiki_2.51.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 14:37:55 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Sun, 6 Jul 2008 14:37:55 GMT Subject: rpms/ikiwiki/F-9 ikiwiki.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807061437.m66Ebt4D027644@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27535/F-9 Modified Files: .cvsignore sources Added Files: ikiwiki.spec import.log Log Message: New package. --- NEW FILE ikiwiki.spec --- Name: ikiwiki Version: 2.51 Release: 1%{?dist} Summary: A wiki compiler Group: Applications/Internet License: GPLv2+ URL: http://ikiwiki.info/ Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Text::Markdown) BuildRequires: perl(Mail::Sendmail) BuildRequires: perl(HTML::Scrubber) BuildRequires: perl(XML::Simple) BuildRequires: perl(Date::Parse) BuildRequires: perl(Date::Format) BuildRequires: perl(HTML::Template) BuildRequires: perl(CGI::FormBuilder) BuildRequires: perl(CGI::Session) BuildRequires: perl(File::MimeInfo) BuildRequires: gettext Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Text::Markdown) Requires: perl(Mail::Sendmail) Requires: perl(HTML::Scrubber) Requires: perl(XML::Simple) Requires: perl(CGI::FormBuilder) Requires: perl(CGI::Session) Requires: perl(Digest::SHA1) %define cgi_bin %{_libexecdir}/w3m/cgi-bin %description Ikiwiki is a wiki compiler. It converts wiki pages into HTML pages suitable for publishing on a website. Ikiwiki stores pages and history in a revision control system such as Subversion or Git. There are many other features, including support for blogging, as well as a large array of plugins. %prep %setup -q -n %{name} # Filter unwanted Provides: %{__cat} << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ %{__sed} -e '/perl(IkiWiki.*)/d' EOF %define __perl_provides %{_builddir}/%{name}/%{name}-prov %{__chmod} +x %{__perl_provides} # Filter Requires, all used by plugins # - Monotone: see bz 450267 # - RPC::XML: see bz 435835 # - Net::Amazon:::S3: see bz 436481 %{__cat} << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ %{__sed} -e '/perl(IkiWiki.*)/d' \ -e '/perl(Monotone)/d' \ -e '/perl(RPC::XML)/d' \ -e '/perl(RPC::XML::Parser)/d' \ -e '/perl(Net::Amazon::S3)/d' EOF %define __perl_requires %{_builddir}/%{name}/%{name}-req %{__chmod} +x %{__perl_requires} # goes into the -w3m subpackage %{__cat} << \EOF > README.fedora See http://ikiwiki.info/w3mmode/ for more information. EOF %build %{__perl} Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} # parallel builds currently don't work %{__make} %install %{__rm} -rf %{buildroot} %{__make} pure_install DESTDIR=%{buildroot} %find_lang %{name} # cgi script is wrongly installed in a fixed place %{__mkdir_p} %{buildroot}%{cgi_bin} %{__mv} %{buildroot}/usr/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \ %{buildroot}%{cgi_bin} # fix encoding iconv -f iso-8859-9 -t utf-8 \ html/tips/vim_syntax_highlighting/ikiwiki.vim \ -o html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp %{__mv} html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp \ html/tips/vim_syntax_highlighting/ikiwiki.vim %clean %{__rm} -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/ikiwiki* %{_sbindir}/ikiwiki* %{_mandir}/man1/ikiwiki* %{_mandir}/man8/ikiwiki* %{_datadir}/ikiwiki # contains a packlist only %exclude %{perl_vendorarch} %{perl_vendorlib}/IkiWiki* # directory for external (non-perl) plugins, needs RPC::XML %exclude %{_prefix}/lib/ikiwiki/plugins/* %doc README debian/changelog debian/NEWS %doc html %package w3m Summary: Ikiwiki w3m cgi meta-wrapper Group: Applications/Internet Requires: w3m Requires: %{name} = %{version}-%{release} %description w3m Enable usage of all of ikiwiki's web features (page editing, etc) in the w3m web browser without a web server. w3m supports local CGI scripts, and ikiwiki can be set up to run that way using the meta-wrapper in this package. %files w3m %defattr(-,root,root,-) %doc README.fedora %{cgi_bin}/ikiwiki-w3m.cgi %changelog * Sun Jul 6 2008 Thomas Moschny - 2.51-1 - Update to 2.51. - Save iconv output to a temporary file. * Sun Jun 15 2008 Thomas Moschny - 2.50-1 - Update to 2.50. - Move ikiwiki-w3m.cgi into a subpackage. - Add ikiwiki's own documentation. - Remove duplicate requirement perl(File::MimeInfo). - Minor cleanups. * Mon Jun 2 2008 Thomas Moschny - 2.48-1 - Update to 2.48. * Wed May 28 2008 Thomas Moschny - 2.47-1 - Update to 2.47. * Tue May 13 2008 Thomas Moschny - 2.46-1 - Update to 2.46. * Sat May 10 2008 Thomas Moschny - 2.45-1 - New package. --- NEW FILE import.log --- ikiwiki-2_51-1_fc9:F-9:ikiwiki-2.51-1.fc9.src.rpm:1215354983 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 19:49:29 -0000 1.1 +++ .cvsignore 6 Jul 2008 14:37:07 -0000 1.2 @@ -0,0 +1 @@ +ikiwiki_2.51.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:49:29 -0000 1.1 +++ sources 6 Jul 2008 14:37:07 -0000 1.2 @@ -0,0 +1 @@ +4423258ab049d5441225027704fd2d1a ikiwiki_2.51.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 14:58:24 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 6 Jul 2008 14:58:24 GMT Subject: rpms/openbabel/devel openbabel-check.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 openbabel-rpm.patch, 1.2, 1.3 openbabel.spec, 1.41, 1.42 sources, 1.11, 1.12 openbabel-python-ppc64.patch, 1.3, NONE Message-ID: <200807061458.m66EwOKk029156@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29086 Modified Files: .cvsignore openbabel-rpm.patch openbabel.spec sources Added Files: openbabel-check.patch Removed Files: openbabel-python-ppc64.patch Log Message: - updated to 2.2.0 - fixed testsuite - added strict perl version requirements (patch by Paul Howarth) - fixed some rpmlint warnings - merged a sed call into -rpm patch openbabel-check.patch: --- NEW FILE openbabel-check.patch --- diff -up openbabel-2.2.0b7/test/bond.cpp.chk openbabel-2.2.0b7/test/bond.cpp --- openbabel-2.2.0b7/test/bond.cpp.chk 2008-06-13 22:48:05.000000000 +0200 +++ openbabel-2.2.0b7/test/bond.cpp 2008-07-06 14:05:26.000000000 +0200 @@ -58,7 +58,7 @@ int main(int argc,char *argv[]) bond1.SetBegin(&begin1); bond1.SetEnd(&end1); - cout << "ok 4\n"; + cout << "ok 3\n"; return(0); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 2 Jul 2008 18:49:45 -0000 1.11 +++ .cvsignore 6 Jul 2008 14:57:34 -0000 1.12 @@ -1 +1 @@ -openbabel-2.2.0b7-20080627-r2628.tar.gz +openbabel-2.2.0.tar.gz openbabel-rpm.patch: Index: openbabel-rpm.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-rpm.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openbabel-rpm.patch 2 Mar 2008 19:04:13 -0000 1.2 +++ openbabel-rpm.patch 6 Jul 2008 14:57:34 -0000 1.3 @@ -1,9 +1,9 @@ -diff -up openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am.r openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am ---- openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am.r 2008-01-24 21:43:42.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am 2008-02-23 15:48:26.000000000 +0100 -@@ -58,8 +58,8 @@ ruby/openbabel_ruby.cpp: openbabel-ruby. - $(SWIG) -ruby -naturalvar -autorename -c++ -o $@ -I$(top_srcdir)/include \ - -I$(top_builddir)/include $<; +diff -up openbabel-2.2.0/scripts/Makefile.am.r openbabel-2.2.0/scripts/Makefile.am +--- openbabel-2.2.0/scripts/Makefile.am.r 2008-07-03 20:25:54.000000000 +0200 ++++ openbabel-2.2.0/scripts/Makefile.am 2008-07-06 15:59:23.000000000 +0200 +@@ -63,8 +63,8 @@ ruby/openbabel_ruby.cpp: openbabel-ruby. + $(SWIG) -small -O -ruby -naturalvar -autorename -c++ -o $@ \ + -templatereduce -I$(top_srcdir)/include -I$(top_builddir)/include $<; (cd ruby; ruby extconf.rb \ - --with-openbabel-include=$(includedir)/openbabel-2.0 \ - --with-openbabel-lib=$(libdir) ) @@ -12,3 +12,17 @@ sed -e 's/rb_define_module(\"Openbabel\")/rb_define_module(\"OpenBabel\")/' -e 's/void Init_OpenBabel/void Init_openbabel/' ruby/openbabel_ruby.new mv ruby/openbabel_ruby.new ruby/openbabel_ruby.cpp endif # BUILD_RUBY +diff -up openbabel-2.2.0/scripts/perl/Makefile.PL.r openbabel-2.2.0/scripts/perl/Makefile.PL +--- openbabel-2.2.0/scripts/perl/Makefile.PL.r 2008-07-06 16:16:45.000000000 +0200 ++++ openbabel-2.2.0/scripts/perl/Makefile.PL 2008-07-06 16:48:59.000000000 +0200 +@@ -3,8 +3,8 @@ use ExtUtils::MakeMaker; + use lib 'inc'; + use Devel::CheckLib; + +-check_lib_or_exit( lib => 'openbabel' , libpath => +- at ENV{"LD_LIBRARY_PATH"}); ++#check_lib_or_exit( lib => 'openbabel' , libpath => ++#@ENV{"LD_LIBRARY_PATH"}); + + $CC = 'g++'; + $srcdir = '../../src'; Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- openbabel.spec 2 Jul 2008 22:46:55 -0000 1.41 +++ openbabel.spec 6 Jul 2008 14:57:34 -0000 1.42 @@ -4,12 +4,12 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') -%define beta_ver b7 -%define beta_str b7-20080627-r2628 +%define beta_ver %{nil} +%define beta_str %{nil} Name: openbabel Version: 2.2.0 -Release: 0.5.%{beta_ver}%{?dist} +Release: 1%{?dist} Summary: Chemistry software file format converter License: GPLv2 Group: Applications/File @@ -17,6 +17,7 @@ Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz Patch: %{name}-gcc43.patch Patch1: %{name}-rpm.patch +Patch2: %{name}-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: inchi-devel BuildRequires: libtool @@ -62,8 +63,9 @@ %package -n perl-%{name} Group: System Environment/Libraries Summary: Perl wrapper for the Open Babel library +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Obsoletes: %{name}-perl < 2.2.0 -Provides: %{name}-perl +Provides: %{name}-perl = %{version}-%{release} %description -n perl-%{name} Perl wrapper for the Open Babel library. @@ -72,7 +74,7 @@ Group: System Environment/Libraries Summary: Python wrapper for the Open Babel library Obsoletes: %{name}-python < 2.2.0 -Provides: %{name}-python +Provides: %{name}-python = %{version}-%{release} %description -n python-%{name} Python wrapper for the Open Babel library. @@ -90,7 +92,8 @@ %setup -q -n %{name}-%{version}%{beta_ver} %patch -p1 -b .gcc43 %patch1 -p1 -b .r -find . -name "._*" | xargs rm +%patch2 -p1 -b .chk +chmod 644 src/formats/{mmcif,fchk}format.cpp %build # don't reference m4 include directory which isn't shipped in the tarball @@ -101,9 +104,6 @@ %{__make} %{?_smp_mflags} pushd scripts/perl -# disable the check for the installed library, the library isn't installed yet -# at this point and isn't expected to -sed -i -e 's/check_lib_or_exit/#check_lib_or_exit/g' Makefile.PL perl Makefile.PL INSTALLDIRS="vendor" %{__make} %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" popd @@ -134,6 +134,7 @@ %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT popd +chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_openbabel.so pushd scripts/ruby %{__make} install DESTDIR=$RPM_BUILD_ROOT @@ -187,11 +188,14 @@ %{ruby_sitearch}/openbabel.so %changelog -* Wed Jul 02 2008 Dominik Mierzejewski 2.2.0-0.6.b7 -- updated to 2.2.0 beta7 +* Sun Jul 06 2008 Dominik Mierzejewski 2.2.0-1 +- updated to 2.2.0 - new URL - dropped Python binding split patch (broken, reverted upstream) -- removed weird Macintosh files +- fixed testsuite and disabled inchi tests temporarily +- added strict perl version requirements (patch by Paul Howarth) +- fixed some rpmlint warnings +- merged a sed call into -rpm patch * Fri Jun 06 2008 Kevin Kofler 2.2.0-0.5.b5 - backport upstream patch to split Python binding (should fix #427700 for good) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 2 Jul 2008 18:49:45 -0000 1.11 +++ sources 6 Jul 2008 14:57:34 -0000 1.12 @@ -1 +1 @@ -541d2e8654d95afe5aee2ad9055e33b2 openbabel-2.2.0b7-20080627-r2628.tar.gz +643a18c7ba09254d36e93afd6277346f openbabel-2.2.0.tar.gz --- openbabel-python-ppc64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 15:31:36 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Sun, 6 Jul 2008 15:31:36 GMT Subject: rpms/libusb1/devel .cvsignore, 1.2, 1.3 libusb1.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807061531.m66FVaoC004663@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/libusb1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4562 Modified Files: .cvsignore libusb1.spec sources Log Message: * Sun Jul 06 2008 - Bastien Nocera - 0.9.1 - Update to 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libusb1/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2008 18:51:13 -0000 1.2 +++ .cvsignore 6 Jul 2008 15:30:53 -0000 1.3 @@ -1 +1 @@ -libusb-0.9.0.tar.bz2 +libusb-0.9.1.tar.bz2 Index: libusb1.spec =================================================================== RCS file: /cvs/pkgs/rpms/libusb1/devel/libusb1.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libusb1.spec 26 May 2008 18:51:13 -0000 1.1 +++ libusb1.spec 6 Jul 2008 15:30:53 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A library which allows userspace access to USB devices Name: libusb1 -Version: 0.9.0 -Release: 0.4%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_libdir}/*.a %changelog +* Sun Jul 06 2008 - Bastien Nocera - 0.9.1 +- Update to 0.9.1 + * Mon May 26 2008 Jindrich Novy 0.9.0-0.4 - update to official beta Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libusb1/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2008 18:51:13 -0000 1.2 +++ sources 6 Jul 2008 15:30:53 -0000 1.3 @@ -1 +1 @@ -a23f06379e05f04a77aec1c1428082a0 libusb-0.9.0.tar.bz2 +e420199634a21c628db46b4ea1f1397b libusb-0.9.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 16:33:40 2008 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sun, 6 Jul 2008 16:33:40 GMT Subject: rpms/hippo-canvas/F-9 .cvsignore, 1.10, 1.11 hippo-canvas.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <200807061633.m66GXeIi015642@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/hippo-canvas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15605 Modified Files: .cvsignore hippo-canvas.spec sources Log Message: Update to 0.3.0 (adds SVG support) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hippo-canvas/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 19 Jun 2008 22:33:03 -0000 1.10 +++ .cvsignore 6 Jul 2008 16:32:50 -0000 1.11 @@ -2,3 +2,4 @@ hippo-canvas-0.2.32.tar.gz hippo-canvas-0.2.33.tar.gz hippo-canvas-0.2.34.tar.gz +hippo-canvas-0.3.0.tar.gz Index: hippo-canvas.spec =================================================================== RCS file: /cvs/extras/rpms/hippo-canvas/F-9/hippo-canvas.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- hippo-canvas.spec 19 Jun 2008 22:33:03 -0000 1.15 +++ hippo-canvas.spec 6 Jul 2008 16:32:50 -0000 1.16 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: hippo-canvas -Version: 0.2.34 +Version: 0.3.0 Release: 1%{?dist} Summary: A canvas widget @@ -16,6 +16,7 @@ BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: libcroco-devel +BuildRequires: librsvg2-devel %description The hippo-canvas library contains a canvas widget developed by the @@ -86,6 +87,9 @@ %{python_sitearch}/*.so %changelog +* Sun Jul 6 2008 Owen Taylor - 0.3.0-1 +- Update to 0.3.0 (adds SVG support) + * Thu Jun 19 2008 Owen Taylor - 0.2.34-1 - Update to 0.2.34 (Fixes crash when destroying HippoCanvasWidget) Index: sources =================================================================== RCS file: /cvs/extras/rpms/hippo-canvas/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 19 Jun 2008 22:33:03 -0000 1.12 +++ sources 6 Jul 2008 16:32:50 -0000 1.13 @@ -1 +1,2 @@ c7915c93b8b095b73808f3d3e3454c33 hippo-canvas-0.2.34.tar.gz +64e10c73054ce10177855213152e6238 hippo-canvas-0.3.0.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 16:36:50 2008 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sun, 6 Jul 2008 16:36:50 GMT Subject: rpms/hippo-canvas/F-9 hippo-canvas.spec,1.16,1.17 Message-ID: <200807061636.m66GaoFk015787@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/hippo-canvas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15741 Modified Files: hippo-canvas.spec Log Message: Bump version Index: hippo-canvas.spec =================================================================== RCS file: /cvs/extras/rpms/hippo-canvas/F-9/hippo-canvas.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hippo-canvas.spec 6 Jul 2008 16:32:50 -0000 1.16 +++ hippo-canvas.spec 6 Jul 2008 16:36:01 -0000 1.17 @@ -2,7 +2,7 @@ Name: hippo-canvas Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A canvas widget Group: System Environment/Libraries @@ -87,7 +87,7 @@ %{python_sitearch}/*.so %changelog -* Sun Jul 6 2008 Owen Taylor - 0.3.0-1 +* Sun Jul 6 2008 Owen Taylor - 0.3.0-2 - Update to 0.3.0 (adds SVG support) * Thu Jun 19 2008 Owen Taylor - 0.2.34-1 From fedora-extras-commits at redhat.com Sun Jul 6 16:44:02 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Sun, 6 Jul 2008 16:44:02 GMT Subject: rpms/ikiwiki/F-8 ikiwiki.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807061644.m66Gi2PA016188@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16131/F-8 Modified Files: .cvsignore sources Added Files: ikiwiki.spec import.log Log Message: New package. --- NEW FILE ikiwiki.spec --- Name: ikiwiki Version: 2.51 Release: 1%{?dist} Summary: A wiki compiler Group: Applications/Internet License: GPLv2+ URL: http://ikiwiki.info/ Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Text::Markdown) BuildRequires: perl(Mail::Sendmail) BuildRequires: perl(HTML::Scrubber) BuildRequires: perl(XML::Simple) BuildRequires: perl(Date::Parse) BuildRequires: perl(Date::Format) BuildRequires: perl(HTML::Template) BuildRequires: perl(CGI::FormBuilder) BuildRequires: perl(CGI::Session) BuildRequires: perl(File::MimeInfo) BuildRequires: gettext Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Text::Markdown) Requires: perl(Mail::Sendmail) Requires: perl(HTML::Scrubber) Requires: perl(XML::Simple) Requires: perl(CGI::FormBuilder) Requires: perl(CGI::Session) Requires: perl(Digest::SHA1) %define cgi_bin %{_libexecdir}/w3m/cgi-bin %description Ikiwiki is a wiki compiler. It converts wiki pages into HTML pages suitable for publishing on a website. Ikiwiki stores pages and history in a revision control system such as Subversion or Git. There are many other features, including support for blogging, as well as a large array of plugins. %prep %setup -q -n %{name} # Filter unwanted Provides: %{__cat} << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ %{__sed} -e '/perl(IkiWiki.*)/d' EOF %define __perl_provides %{_builddir}/%{name}/%{name}-prov %{__chmod} +x %{__perl_provides} # Filter Requires, all used by plugins # - Monotone: see bz 450267 # - RPC::XML: see bz 435835 # - Net::Amazon:::S3: see bz 436481 %{__cat} << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ %{__sed} -e '/perl(IkiWiki.*)/d' \ -e '/perl(Monotone)/d' \ -e '/perl(RPC::XML)/d' \ -e '/perl(RPC::XML::Parser)/d' \ -e '/perl(Net::Amazon::S3)/d' EOF %define __perl_requires %{_builddir}/%{name}/%{name}-req %{__chmod} +x %{__perl_requires} # goes into the -w3m subpackage %{__cat} << \EOF > README.fedora See http://ikiwiki.info/w3mmode/ for more information. EOF %build %{__perl} Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} # parallel builds currently don't work %{__make} %install %{__rm} -rf %{buildroot} %{__make} pure_install DESTDIR=%{buildroot} %find_lang %{name} # cgi script is wrongly installed in a fixed place %{__mkdir_p} %{buildroot}%{cgi_bin} %{__mv} %{buildroot}/usr/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \ %{buildroot}%{cgi_bin} # fix encoding iconv -f iso-8859-9 -t utf-8 \ html/tips/vim_syntax_highlighting/ikiwiki.vim \ -o html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp %{__mv} html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp \ html/tips/vim_syntax_highlighting/ikiwiki.vim %clean %{__rm} -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/ikiwiki* %{_sbindir}/ikiwiki* %{_mandir}/man1/ikiwiki* %{_mandir}/man8/ikiwiki* %{_datadir}/ikiwiki # contains a packlist only %exclude %{perl_vendorarch} %{perl_vendorlib}/IkiWiki* # directory for external (non-perl) plugins, needs RPC::XML %exclude %{_prefix}/lib/ikiwiki/plugins/* %doc README debian/changelog debian/NEWS %doc html %package w3m Summary: Ikiwiki w3m cgi meta-wrapper Group: Applications/Internet Requires: w3m Requires: %{name} = %{version}-%{release} %description w3m Enable usage of all of ikiwiki's web features (page editing, etc) in the w3m web browser without a web server. w3m supports local CGI scripts, and ikiwiki can be set up to run that way using the meta-wrapper in this package. %files w3m %defattr(-,root,root,-) %doc README.fedora %{cgi_bin}/ikiwiki-w3m.cgi %changelog * Sun Jul 6 2008 Thomas Moschny - 2.51-1 - Update to 2.51. - Save iconv output to a temporary file. * Sun Jun 15 2008 Thomas Moschny - 2.50-1 - Update to 2.50. - Move ikiwiki-w3m.cgi into a subpackage. - Add ikiwiki's own documentation. - Remove duplicate requirement perl(File::MimeInfo). - Minor cleanups. * Mon Jun 2 2008 Thomas Moschny - 2.48-1 - Update to 2.48. * Wed May 28 2008 Thomas Moschny - 2.47-1 - Update to 2.47. * Tue May 13 2008 Thomas Moschny - 2.46-1 - Update to 2.46. * Sat May 10 2008 Thomas Moschny - 2.45-1 - New package. --- NEW FILE import.log --- ikiwiki-2_51-1_fc9:F-8:ikiwiki-2.51-1.fc9.src.rpm:1215362476 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 19:49:29 -0000 1.1 +++ .cvsignore 6 Jul 2008 16:43:19 -0000 1.2 @@ -0,0 +1 @@ +ikiwiki_2.51.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:49:29 -0000 1.1 +++ sources 6 Jul 2008 16:43:19 -0000 1.2 @@ -0,0 +1 @@ +4423258ab049d5441225027704fd2d1a ikiwiki_2.51.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 16:54:53 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 6 Jul 2008 16:54:53 GMT Subject: rpms/xemacs/devel xemacs-21.5.28-autoconf262-449626.patch, NONE, 1.1 xemacs.spec, 1.40, 1.41 Message-ID: <200807061654.m66Gsr5H016719@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16671 Modified Files: xemacs.spec Added Files: xemacs-21.5.28-autoconf262-449626.patch Log Message: * Sun Jul 6 2008 Ville Skytt?? - 21.5.28-7 - Fix build with autoconf >= 2.62 (#449626). xemacs-21.5.28-autoconf262-449626.patch: --- NEW FILE xemacs-21.5.28-autoconf262-449626.patch --- diff -r 78738a40e31e -r 86283c809984 configure.ac --- a/configure.ac Sun Jun 29 11:06:16 2008 +0200 +++ b/configure.ac Sun Jul 06 19:46:19 2008 +0300 @@ -387,9 +387,11 @@ dnl dnl Internal macro to recursively expand all the options in the option list. dnl +dnl m4_fst disappeared without a trace in autoconf 2.62 +m4_define([xe_fst], [$1])dnl define([XE_EXPAND_COMPLEX_OPTIONS], [m4_if([$2], [], [], - [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl + [XE_EXPAND_COMPLEX_OPTION([$1], xe_fst($2))[]dnl XE_EXPAND_COMPLEX_OPTIONS([$1], XE_CDR($2))])])dnl dnl dnl XE_INIT_COMPLEX_OPTION(prefix, option_list) Index: xemacs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- xemacs.spec 19 Feb 2008 23:29:32 -0000 1.40 +++ xemacs.spec 6 Jul 2008 16:53:57 -0000 1.41 @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -45,6 +45,7 @@ Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.28-destdir.patch Patch10: %{name}-21.5.28-revert-modified-245017.patch +Patch11: %{name}-21.5.28-autoconf262-449626.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -201,6 +202,7 @@ %patch8 -p0 %patch9 -p1 %patch10 -p0 +%patch11 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -541,6 +543,9 @@ %changelog +* Sun Jul 6 2008 Ville Skytt?? - 21.5.28-7 +- Fix build with autoconf >= 2.62 (#449626). + * Tue Feb 19 2008 Fedora Release Engineering - 21.5.28-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Jul 6 19:10:10 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sun, 6 Jul 2008 19:10:10 GMT Subject: rpms/seamonkey/devel firefox-1.5-bullet-bill.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 seamonkey.spec, 1.43, 1.44 sources, 1.19, 1.20 Message-ID: <200807061910.m66JAAkS011365@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/seamonkey/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11171 Modified Files: .cvsignore seamonkey.spec sources Added Files: firefox-1.5-bullet-bill.patch Log Message: * Sat Jul 6 2008 Christopher Aillon - 1.1.10-1 - Update to 1.1.10 - Use bullet characters to match GTK+ firefox-1.5-bullet-bill.patch: --- NEW FILE firefox-1.5-bullet-bill.patch --- Index: mozilla/editor/libeditor/text/nsTextEditRules.cpp =================================================================== RCS file: /cvsroot/mozilla/editor/libeditor/text/nsTextEditRules.cpp,v retrieving revision 1.195 diff -d -u -p -r1.195 nsTextEditRules.cpp --- mozilla/editor/libeditor/text/nsTextEditRules.cpp 16 Jun 2005 13:10:56 -0000 1.195 +++ mozilla/editor/libeditor/text/nsTextEditRules.cpp 4 Oct 2006 16:02:19 -0000 @@ -1390,13 +1390,13 @@ nsTextEditRules::EchoInsertionToPWBuff(P // manage the password buffer mPasswordText.Insert(*aOutString, aStart); - // change the output to '*' only + // change the output to 'U+2022' only PRInt32 length = aOutString->Length(); PRInt32 i; aOutString->Truncate(); for (i=0; iAppend(PRUnichar('*')); + aOutString->Append(PRUnichar(0x2022)); } return NS_OK; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 28 Mar 2008 17:36:52 -0000 1.18 +++ .cvsignore 6 Jul 2008 19:09:17 -0000 1.19 @@ -1 +1 @@ -seamonkey-1.1.9.source.tar.bz2 +seamonkey-1.1.10.source.tar.bz2 Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- seamonkey.spec 30 Apr 2008 06:09:59 -0000 1.43 +++ seamonkey.spec 6 Jul 2008 19:09:17 -0000 1.44 @@ -11,8 +11,8 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor -Version: 1.1.9 -Release: 4%{?dist} +Version: 1.1.10 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 Group: Applications/Internet @@ -45,6 +45,7 @@ Patch87: firefox-1.5-pango-justified-range.patch Patch88: firefox-1.5-pango-underline.patch Patch91: thunderbird-0.7.3-gnome-uriloader.patch +Patch100: firefox-1.5-bullet-bill.patch Patch102: firefox-1.5-theme-change.patch Patch220: seamonkey-fedora-home-page.patch Patch225: mozilla-nspr-packages.patch @@ -120,7 +121,7 @@ cd mozilla %patch1 -p0 %patch2 -p1 -%patch3 -p1 +#%patch3 -p1 %patch21 -p1 %patch22 -p1 %patch41 -p1 @@ -133,6 +134,7 @@ %patch87 -p1 %patch88 -p1 %patch91 -p1 -b .gnome-uriloader +%patch100 -p1 -b .bullet-bill %patch102 -p0 -b .theme-change %patch220 -p1 %patch225 -p1 @@ -431,6 +433,9 @@ %changelog +* Sat Jul 6 2008 Christopher Aillon - 1.1.10-1 +- Update to 1.1.10 +- Use bullet characters to match GTK+ * Wed Apr 30 2008 Christopher Aillon - 1.1.9-4 - Require mozilla-filesystem and drop its requires * Thu Apr 17 2008 Kai Engert - 1.1.9-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 28 Mar 2008 17:36:52 -0000 1.19 +++ sources 6 Jul 2008 19:09:17 -0000 1.20 @@ -1 +1 @@ -2b08c472164e80922f715c6e96e0bee7 seamonkey-1.1.9.source.tar.bz2 +0a13d4298fa175a459a5e78ec74810f6 seamonkey-1.1.10.source.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 19:10:54 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sun, 6 Jul 2008 19:10:54 GMT Subject: rpms/seamonkey/F-9 firefox-1.5-bullet-bill.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 seamonkey.spec, 1.44, 1.45 sources, 1.19, 1.20 Message-ID: <200807061910.m66JAsru011616@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/seamonkey/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11336 Modified Files: .cvsignore seamonkey.spec sources Added Files: firefox-1.5-bullet-bill.patch Log Message: * Sat Jul 6 2008 Christopher Aillon - 1.1.10-1 - Update to 1.1.10 - Use bullet characters to match GTK+ firefox-1.5-bullet-bill.patch: --- NEW FILE firefox-1.5-bullet-bill.patch --- Index: mozilla/editor/libeditor/text/nsTextEditRules.cpp =================================================================== RCS file: /cvsroot/mozilla/editor/libeditor/text/nsTextEditRules.cpp,v retrieving revision 1.195 diff -d -u -p -r1.195 nsTextEditRules.cpp --- mozilla/editor/libeditor/text/nsTextEditRules.cpp 16 Jun 2005 13:10:56 -0000 1.195 +++ mozilla/editor/libeditor/text/nsTextEditRules.cpp 4 Oct 2006 16:02:19 -0000 @@ -1390,13 +1390,13 @@ nsTextEditRules::EchoInsertionToPWBuff(P // manage the password buffer mPasswordText.Insert(*aOutString, aStart); - // change the output to '*' only + // change the output to 'U+2022' only PRInt32 length = aOutString->Length(); PRInt32 i; aOutString->Truncate(); for (i=0; iAppend(PRUnichar('*')); + aOutString->Append(PRUnichar(0x2022)); } return NS_OK; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 28 Mar 2008 17:36:52 -0000 1.18 +++ .cvsignore 6 Jul 2008 19:10:00 -0000 1.19 @@ -1 +1 @@ -seamonkey-1.1.9.source.tar.bz2 +seamonkey-1.1.10.source.tar.bz2 Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-9/seamonkey.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- seamonkey.spec 30 Apr 2008 06:09:50 -0000 1.44 +++ seamonkey.spec 6 Jul 2008 19:10:00 -0000 1.45 @@ -11,8 +11,8 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor -Version: 1.1.9 -Release: 4%{?dist} +Version: 1.1.10 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 Group: Applications/Internet @@ -45,6 +45,7 @@ Patch87: firefox-1.5-pango-justified-range.patch Patch88: firefox-1.5-pango-underline.patch Patch91: thunderbird-0.7.3-gnome-uriloader.patch +Patch100: firefox-1.5-bullet-bill.patch Patch102: firefox-1.5-theme-change.patch Patch220: seamonkey-fedora-home-page.patch Patch225: mozilla-nspr-packages.patch @@ -120,7 +121,7 @@ cd mozilla %patch1 -p0 %patch2 -p1 -%patch3 -p1 +#%patch3 -p1 %patch21 -p1 %patch22 -p1 %patch41 -p1 @@ -133,6 +134,7 @@ %patch87 -p1 %patch88 -p1 %patch91 -p1 -b .gnome-uriloader +%patch100 -p1 -b .bullet-bill %patch102 -p0 -b .theme-change %patch220 -p1 %patch225 -p1 @@ -431,6 +433,9 @@ %changelog +* Sat Jul 6 2008 Christopher Aillon - 1.1.10-1 +- Update to 1.1.10 +- Use bullet characters to match GTK+ * Wed Apr 30 2008 Christopher Aillon - 1.1.9-4 - Require mozilla-filesystem and drop its requires * Thu Apr 17 2008 Kai Engert - 1.1.9-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 28 Mar 2008 17:36:52 -0000 1.19 +++ sources 6 Jul 2008 19:10:00 -0000 1.20 @@ -1 +1 @@ -2b08c472164e80922f715c6e96e0bee7 seamonkey-1.1.9.source.tar.bz2 +0a13d4298fa175a459a5e78ec74810f6 seamonkey-1.1.10.source.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 19:16:42 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sun, 6 Jul 2008 19:16:42 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.174, 1.175 openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.5, 1.6 openoffice.org.spec, 1.1558, 1.1559 sources, 1.299, 1.300 workspace.ab55.patch, 1.1, 1.2 openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch, 1.2, NONE openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch, 1.1, NONE openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch, 1.1, NONE openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch, 1.1, NONE Message-ID: <200807061916.m66JGg5T012410@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300 Modified Files: .cvsignore openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch openoffice.org.spec sources workspace.ab55.patch Removed Files: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch Log Message: close enough Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- .cvsignore 1 Jul 2008 15:08:48 -0000 1.174 +++ .cvsignore 6 Jul 2008 19:15:50 -0000 1.175 @@ -6,4 +6,4 @@ redhat-langpacks.tar.gz evolocal.odb bengali.sdf -DEV300_m22.tar.bz2 +DEV300_m23.tar.bz2 openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch: Index: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 1 May 2008 15:54:05 -0000 1.5 +++ openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 6 Jul 2008 19:15:50 -0000 1.6 @@ -279,14 +279,14 @@ diff -ru sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx --- openoffice.org.orig/sc/source/filter/excel/xipivot.cxx 2008-05-01 14:06:26.000000000 +0100 +++ openoffice.org/sc/source/filter/excel/xipivot.cxx 2008-05-01 14:07:19.000000000 +0100 -@@ -695,7 +695,6 @@ - String aDummyName = CREATE_STRING( "DPCache" ); - if( maTabName.Len() > 0 ) - aDummyName.Append( '_' ).Append( maTabName ); -- ScfTools::ConvertToScSheetName( aDummyName ); - rDoc.CreateValidTabName( aDummyName ); - rDoc.RenameTab( nScTab, aDummyName ); - // set sheet index to source range +@@ -701,7 +701,6 @@ + String aDummyName = CREATE_STRING( "DPCache" ); + if( maTabName.Len() > 0 ) + aDummyName.Append( '_' ).Append( maTabName ); +- ScfTools::ConvertToScSheetName( aDummyName ); + rDoc.CreateValidTabName( aDummyName ); + rDoc.RenameTab( nScTab, aDummyName ); + // set sheet index to source range diff -ru sc/source/filter/ftools/ftools.cxx sc/source/filter/ftools/ftools.cxx --- openoffice.org.orig/sc/source/filter/ftools/ftools.cxx 2008-05-01 14:06:25.000000000 +0100 +++ openoffice.org/sc/source/filter/ftools/ftools.cxx 2008-05-01 14:07:19.000000000 +0100 Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1558 retrieving revision 1.1559 diff -u -r1.1558 -r1.1559 --- openoffice.org.spec 6 Jul 2008 13:47:37 -0000 1.1558 +++ openoffice.org.spec 6 Jul 2008 19:15:50 -0000 1.1559 @@ -1,6 +1,6 @@ %define oootag DEV300 -%define ooomilestone 22 -%define rh_rpm_release 2 +%define ooomilestone 23 +%define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -99,29 +99,25 @@ Patch29: openoffice.org-2.4.0.ooo85448.emptyrpath.patch Patch30: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch Patch31: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch -Patch32: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch -Patch33: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch -Patch34: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch -Patch35: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch -Patch36: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch -Patch37: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch -Patch38: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch39: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch -Patch40: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch -Patch41: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch -Patch42: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch -Patch43: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch -Patch44: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch -Patch45: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch -Patch46: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch -Patch47: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch -Patch48: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch -Patch49: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch -Patch50: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch -Patch51: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch -Patch52: workspace.cairo06.patch -Patch53: workspace.ab55.patch -Patch54: openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch +Patch32: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch +Patch33: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch +Patch34: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch +Patch35: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch +Patch36: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch +Patch37: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch +Patch38: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch +Patch39: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch +Patch40: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch +Patch41: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch +Patch42: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch +Patch43: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch +Patch44: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch +Patch45: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch +Patch46: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch +Patch47: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch +Patch48: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch +Patch49: workspace.cairo06.patch +Patch50: workspace.ab55.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1220,7 +1216,7 @@ %prep %setup -q -n %{ooo_base_name} -cp -p %{SOURCE1} extras/source/database/evolocal.odb +#Customize Palette to remove Sun colours and add Red Hat colours (sed -e '/Sun/d' extras/source/palettes/standard.soc | head -n -1 && \ echo -e ' @@ -1229,6 +1225,7 @@ ' && \ tail -n 1 extras/source/palettes/standard.soc) > redhat.soc mv -f redhat.soc extras/source/palettes/standard.soc +cp -p %{SOURCE1} extras/source/database/evolocal.odb cp -p %{SOURCE6} external/unowinreg/unowinreg.dll %patch2 -p1 -b .rh151357.setlangtolocale.patch %if %{gtkprintui} @@ -1262,29 +1259,25 @@ %patch29 -p1 -b .ooo85448.emptyrpath.patch %patch30 -p1 -b .ooo85921.sd.editmasterundermouse.patch %patch31 -p1 -b .ooo86080.unopkg.bodge.patch -%patch32 -p1 -b .oooXXXXX.psprint.debugcups.patch -%patch33 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch -%patch34 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch -%patch35 -p1 -b .ooo88341.sc.verticalboxes.patch -%patch36 -p1 -b .ooo6087.sc.sheetnames.patch -%patch37 -p1 -b .ooo89002.vcl.symbolfonts.patch -%patch38 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch39 -p1 -b .ooo87970.vcl.samenamesubs.patch -%patch40 -p1 -b .ooo90055.swext.allowadmin.patch -%patch41 -p1 -b .oooXXXXX.odk.3layer.patch -%patch42 -p1 -b .ooo90037.vcl.cairotransforms.patch -%patch43 -p1 -b .ooo90178.tools.fixmacro.patch -%patch44 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch -%patch45 -p1 -b .ooo82545.np_sdk.x86_64.patch -%patch46 -p1 -b .ooo90612.sd.insertpasswordedfile.patch -%patch47 -p1 -b .ooo90306.sw.wrongprotection.patch -%patch48 -p1 -b .ooo48400.svx.fixspelling.patch -%patch49 -p1 -b .ooo90697.sd.a11ycrash.patch -%patch50 -p1 -b .ooo90876.connectivity.evoab2.patch -%patch51 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch -%patch52 -p1 -b .workspace.cairo06.patch -%patch53 -p1 -b .workspace.ab55.patch -%patch54 -p1 -b .rhXXXXXX.forms.qa.patch +%patch32 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch +%patch33 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch +%patch34 -p1 -b .ooo88341.sc.verticalboxes.patch +%patch35 -p1 -b .ooo6087.sc.sheetnames.patch +%patch36 -p1 -b .ooo89002.vcl.symbolfonts.patch +%patch37 -p1 -b .gccXXXXX.solenv.javaregistration.patch +%patch38 -p1 -b .ooo87970.vcl.samenamesubs.patch +%patch39 -p1 -b .ooo90055.swext.allowadmin.patch +%patch40 -p1 -b .oooXXXXX.odk.3layer.patch +%patch41 -p1 -b .ooo90037.vcl.cairotransforms.patch +%patch42 -p1 -b .ooo90178.tools.fixmacro.patch +%patch43 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch +%patch44 -p1 -b .ooo82545.np_sdk.x86_64.patch +%patch45 -p1 -b .ooo90306.sw.wrongprotection.patch +%patch46 -p1 -b .ooo48400.svx.fixspelling.patch +%patch47 -p1 -b .ooo90876.connectivity.evoab2.patch +%patch48 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch +%patch49 -p1 -b .workspace.cairo06.patch +%patch50 -p1 -b .workspace.ab55.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1296,9 +1289,9 @@ %configure \ --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \ --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm \ - --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-Xaw \ - --disable-gnome-vfs --enable-gio --enable-gstreamer --enable-symbols \ - --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba \ + --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs \ + --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown \ + --enable-evolution2 --enable-cairo --enable-vba \ --with-vba-package-format="builtin" --enable-dbus --with-system-libs \ --with-system-headers --with-system-apache-commons \ --with-commons-logging-jar=/usr/share/java/commons-logging.jar \ @@ -3583,9 +3576,12 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Sat Jul 05 2008 Caolan McNamara - 1:3.0.0-0.22-2 +* Sun Jul 06 2008 Caolan McNamara - 1:3.0.0-0.23-1 +- next version - split out arcane ScriptProviders out of core into optional extensions => bsh now only required by beanshell ScriptProvider +- drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch +- drop integrated openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch * Tue Jul 01 2008 Caolan McNamara - 1:3.0.0-0.22-1 - next version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- sources 1 Jul 2008 15:08:48 -0000 1.299 +++ sources 6 Jul 2008 19:15:50 -0000 1.300 @@ -6,4 +6,4 @@ 261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -dbdbeea8d85c8aaaae89f41c9094e513 DEV300_m22.tar.bz2 +faaec17320265bf4e5b5566defb30162 DEV300_m23.tar.bz2 workspace.ab55.patch: Index: workspace.ab55.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.ab55.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workspace.ab55.patch 3 Jul 2008 13:32:07 -0000 1.1 +++ workspace.ab55.patch 6 Jul 2008 19:15:50 -0000 1.2 @@ -65,8 +65,8 @@ { BIG_SVX TRUE BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF -+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE +- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF REDLAND ++ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF REDLAND LUCENE RES_ENUS TRUE RES_GER TRUE NO_REC_RES TRUE @@ -122,8 +122,8 @@ --- util/xmlhelp/prj/build.lst:1.17 Tue Jun 24 09:17:30 2008 +++ util/xmlhelp/prj/build.lst Wed Jul 2 06:12:01 2008 @@ -1,4 +1,4 @@ --xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene NULL -+xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene NULL +-xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene unotools NULL ++xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene unotools NULL xh xmlhelp usr1 - all xh_mkout NULL xh xmlhelp\inc nmake - all xh_inc NULL xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL --- openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch DELETED --- --- openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch DELETED --- --- openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch DELETED --- --- openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 19:27:55 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 6 Jul 2008 19:27:55 GMT Subject: rpms/jd/F-9 .cvsignore, 1.260, 1.261 jd.spec, 1.297, 1.298 sources, 1.261, 1.262 Message-ID: <200807061927.m66JRt3o013752@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13601/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Jul 7 2008 Mamoru Tasaka - rev 2179 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- .cvsignore 5 Jul 2008 17:03:26 -0000 1.260 +++ .cvsignore 6 Jul 2008 19:27:05 -0000 1.261 @@ -1 +1 @@ -jd-2.0.0-svn2175_trunk.tgz +jd-2.0.0-svn2179_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- jd.spec 5 Jul 2008 17:03:26 -0000 1.297 +++ jd.spec 6 Jul 2008 19:27:05 -0000 1.298 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2175_trunk +%define strtag svn2179_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jul 6 2008 Mamoru Tasaka -- rev 2175 +* Mon Jul 7 2008 Mamoru Tasaka +- rev 2179 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- sources 5 Jul 2008 17:03:26 -0000 1.261 +++ sources 6 Jul 2008 19:27:05 -0000 1.262 @@ -1 +1 @@ -abddb002d29b7c2c4979a55cf7cd5d64 jd-2.0.0-svn2175_trunk.tgz +c380fe3cbbb42511976684b114cef9d2 jd-2.0.0-svn2179_trunk.tgz From fedora-extras-commits at redhat.com Sun Jul 6 19:28:05 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 6 Jul 2008 19:28:05 GMT Subject: rpms/jd/F-8 .cvsignore, 1.253, 1.254 jd.spec, 1.286, 1.287 sources, 1.254, 1.255 Message-ID: <200807061928.m66JS5pY013774@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13601/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Jul 7 2008 Mamoru Tasaka - rev 2179 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- .cvsignore 5 Jul 2008 17:03:02 -0000 1.253 +++ .cvsignore 6 Jul 2008 19:26:45 -0000 1.254 @@ -1 +1 @@ -jd-2.0.0-svn2175_trunk.tgz +jd-2.0.0-svn2179_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- jd.spec 5 Jul 2008 17:03:02 -0000 1.286 +++ jd.spec 6 Jul 2008 19:26:45 -0000 1.287 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2175_trunk +%define strtag svn2179_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jul 6 2008 Mamoru Tasaka -- rev 2175 +* Mon Jul 7 2008 Mamoru Tasaka +- rev 2179 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- sources 5 Jul 2008 17:03:02 -0000 1.254 +++ sources 6 Jul 2008 19:26:45 -0000 1.255 @@ -1 +1 @@ -abddb002d29b7c2c4979a55cf7cd5d64 jd-2.0.0-svn2175_trunk.tgz +c380fe3cbbb42511976684b114cef9d2 jd-2.0.0-svn2179_trunk.tgz From fedora-extras-commits at redhat.com Sun Jul 6 19:28:12 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 6 Jul 2008 19:28:12 GMT Subject: rpms/jd/devel .cvsignore, 1.260, 1.261 jd.spec, 1.303, 1.304 sources, 1.261, 1.262 Message-ID: <200807061928.m66JSC6Y013797@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13601/devel Modified Files: .cvsignore jd.spec sources Log Message: * Mon Jul 7 2008 Mamoru Tasaka - rev 2179 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- .cvsignore 5 Jul 2008 17:03:54 -0000 1.260 +++ .cvsignore 6 Jul 2008 19:27:25 -0000 1.261 @@ -1 +1 @@ -jd-2.0.0-svn2175_trunk.tgz +jd-2.0.0-svn2179_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- jd.spec 5 Jul 2008 17:03:54 -0000 1.303 +++ jd.spec 6 Jul 2008 19:27:25 -0000 1.304 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2175_trunk +%define strtag svn2179_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jul 6 2008 Mamoru Tasaka -- rev 2175 +* Mon Jul 7 2008 Mamoru Tasaka +- rev 2179 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- sources 5 Jul 2008 17:03:54 -0000 1.261 +++ sources 6 Jul 2008 19:27:25 -0000 1.262 @@ -1 +1 @@ -abddb002d29b7c2c4979a55cf7cd5d64 jd-2.0.0-svn2175_trunk.tgz +c380fe3cbbb42511976684b114cef9d2 jd-2.0.0-svn2179_trunk.tgz From fedora-extras-commits at redhat.com Sun Jul 6 19:29:30 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sun, 6 Jul 2008 19:29:30 GMT Subject: rpms/kaffeine/devel kaffeine-0.8.7-codecs.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kaffeine.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <200807061929.m66JTUBA013959@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kaffeine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13841 Modified Files: .cvsignore kaffeine.spec sources Added Files: kaffeine-0.8.7-codecs.patch Log Message: * Sun Jul 06 2008 Rex Dieter 0.8.7-1 - kaffeine-0.8.7 kaffeine-0.8.7-codecs.patch: --- NEW FILE kaffeine-0.8.7-codecs.patch --- diff -up kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs kaffeine-0.8.7/kaffeine/src/instwizard.cpp --- kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs 2007-06-03 08:55:14.000000000 -0500 +++ kaffeine-0.8.7/kaffeine/src/instwizard.cpp 2008-07-06 13:50:12.000000000 -0500 @@ -61,6 +61,8 @@ void InstWizard::internalWizard() setHelpEnabled(page1, false); setFinishEnabled(page1, false); + QDir d; + QString infoString; QTextStream info(&infoString, IO_WriteOnly); @@ -106,14 +108,16 @@ void InstWizard::internalWizard() << " http://www.xinehq.de."; */ //WIN32-CODECS + /* info << "
" << i18n("WIN32 Codecs") << "...
"; - QDir d("/usr/lib/win32"); + d = DDir("@libdir@/codecs"); QStringList entries = d.entryList("wmv*"); if (entries.count()) info << "" << i18n("Ok.") << ""; else - info << "" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:") + info << "" << i18n("No WIN32 codecs found in @libdir@/codecs. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:") << " http://www.mplayerhq.hu."; + */ //LIBDVDCSS info << "
" << "libdvdcss" << "...
"; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Jan 2008 22:46:07 -0000 1.6 +++ .cvsignore 6 Jul 2008 19:28:34 -0000 1.7 @@ -1 +1 @@ -kaffeine-0.8.6.tar.bz2 +kaffeine-0.8.7.tar.bz2 Index: kaffeine.spec =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- kaffeine.spec 20 Mar 2008 19:53:46 -0000 1.17 +++ kaffeine.spec 6 Jul 2008 19:28:34 -0000 1.18 @@ -12,10 +12,10 @@ ## define to build nonfree bits (for that other repo) #define nonfree 1 -Version: 0.8.6 -Release: 4%{?dist} +Version: 0.8.7 +Release: 1%{?dist} -%if "%{?nonfree:1}" != "1" +%if 0%{?nonfree:1} == 0 # Fedora Review: http://bugzilla.redhat.com/213432 Name: kaffeine %else @@ -27,24 +27,27 @@ Group: Applications/Multimedia URL: http://kaffeine.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2 -Patch0: %{name}-0.8.6-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: kaffeine-0.8.6-optflags.patch +Patch1: kaffeine-0.8.7-codecs.patch + +BuildRequires: cdparanoia-devel cdparanoia BuildRequires: gettext +# dvb +BuildRequires: glibc-kernheaders +%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10} +%if 0%{?fedora} > 6 || 0%{?rhel} > 5 BuildRequires: kdelibs3-devel -BuildRequires: cdparanoia-devel cdparanoia -BuildRequires: libvorbis-devel -BuildRequires: xine-lib-devel -%if 0%{?fedora} > 6 BuildRequires: libxcb-devel +%else +BuildRequires: kdelibs-devel %endif -# dvb -BuildRequires: glibc-kernheaders -%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10} +BuildRequires: libvorbis-devel +BuildRequires: xine-lib-devel -%if "%{?nonfree:1}" == "1" +%if 0%{?nonfree:1} Requires: kaffeine = %{version} -Patch1: kaffeine-0.8.2-codecs.patch %define _with_lame --with-lame %{?_with_lame:BuildRequires: lame-devel} %if 0%{?fedora} > 4 @@ -87,8 +90,6 @@ %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -# helps multilib upgrades -Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex Requires: %{name} = %{version}-%{release} %description libs @@ -101,26 +102,29 @@ %prep %setup -q -n kaffeine-%{version} + %patch0 -p1 -b .optflags -%{?nonfree:%patch1 -p1 -b .codecs} +# FIXME +#patch1 -p1 -b .codecs +#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp + +# FIXME, must be a better workaround here +sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure %build unset QTDIR || : ; . /etc/profile.d/qt.sh -# easier than patching, and using -# --with-extra-includes=%{_includedir}/cdda below -- Rex -CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS - %configure \ --disable-rpath \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependency-tracking --disable-final \ + --with-extra-includes=%{_includedir}/cdda \ %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \ %{?_with_lame} %{!?_with_lame:--without-lame} -%if "%{?nonfree:1}" == "1" +%if 0%{?nonfree:1} make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins %else make %{?_smp_mflags} @@ -128,20 +132,20 @@ %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%if "%{?nonfree:1}" == "1" -make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame +%if 0%{?nonfree:1} +make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame %else -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} ## File lists # locale's %find_lang %{name} # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) -if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then -for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang @@ -156,16 +160,16 @@ fi # Unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop +rm -f %{buildroot}%{_libdir}/lib*.la +rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%if "%{?nonfree:1}" == "1" +%if 0%{?nonfree:1} %files %defattr(-,root,root,-) %{_libdir}/kde3/libkaffeinemp3lame.* @@ -217,10 +221,14 @@ %{_includedir}/kaffeine/ %{_libdir}/lib*.so %exclude %{_libdir}/libkaffeinepart.so + %endif %changelog +* Sun Jul 06 2008 Rex Dieter 0.8.7-1 +- kaffeine-0.8.7 + * Thu Mar 20 2008 Ville Skytt?? - 0.8.6-4 - Patch to apply $RPM_OPT_FLAGS when building DVB libs. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Jan 2008 22:46:07 -0000 1.6 +++ sources 6 Jul 2008 19:28:34 -0000 1.7 @@ -1 +1 @@ -102cced6a686f5ffffee94652ca2a093 kaffeine-0.8.6.tar.bz2 +3ce644c3c5a9583e9df7187f2cf1d8de kaffeine-0.8.7.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 6 19:32:48 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Sun, 6 Jul 2008 19:32:48 GMT Subject: rpms/ltsp/F-9 ltsp.spec,1.15,1.16 ltsp-5.1.7-sudo.patch,1.1,NONE Message-ID: <200807061932.m66JWmQu014310@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14229 Modified Files: ltsp.spec Removed Files: ltsp-5.1.7-sudo.patch Log Message: own /var/lib/ltsp to silence tmpwatch selinux errors Index: ltsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ltsp.spec 6 Jun 2008 20:36:03 -0000 1.15 +++ ltsp.spec 6 Jul 2008 19:31:58 -0000 1.16 @@ -246,7 +246,8 @@ %files server %defattr(-,root,root,-) %doc ChangeLog COPYING TODO client/lts-parameters.txt -%{_localstatedir}/lib/ltsp/swapfiles/ +%dir %{_localstatedir}/lib/ltsp/ +%dir %{_localstatedir}/lib/ltsp/swapfiles/ %dir %{_tftpdir}/ %dir %{_tftpdir}/ltsp/ %dir %{_tftpdir}/ltsp/i386/ @@ -313,6 +314,9 @@ %endif %changelog +* Fri Jun 13 2008 Warren Togami - 5.1.9-2 +- own /var/lib/ltsp to silence tmpwatch selinux errors + * Fri Jun 06 2008 Warren Togami - 5.1.9-1 - jetpipe script was missing from ltsp-client This should allow local printers to work if configured in lts.conf. --- ltsp-5.1.7-sudo.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 19:36:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Sun, 6 Jul 2008 19:36:03 GMT Subject: rpms/ltsp/F-9 ltsp.spec,1.16,1.17 Message-ID: <200807061936.m66Ja3bw014627@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14536 Modified Files: ltsp.spec Log Message: lts-parameters moved location in the source tree. Index: ltsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ltsp.spec 6 Jul 2008 19:31:58 -0000 1.16 +++ ltsp.spec 6 Jul 2008 19:35:16 -0000 1.17 @@ -245,7 +245,7 @@ %files server %defattr(-,root,root,-) -%doc ChangeLog COPYING TODO client/lts-parameters.txt +%doc ChangeLog COPYING TODO server/doc/lts-parameters.txt %dir %{_localstatedir}/lib/ltsp/ %dir %{_localstatedir}/lib/ltsp/swapfiles/ %dir %{_tftpdir}/ @@ -314,7 +314,7 @@ %endif %changelog -* Fri Jun 13 2008 Warren Togami - 5.1.9-2 +* Fri Jun 13 2008 Warren Togami - own /var/lib/ltsp to silence tmpwatch selinux errors * Fri Jun 06 2008 Warren Togami - 5.1.9-1 From fedora-extras-commits at redhat.com Sun Jul 6 19:48:24 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Sun, 6 Jul 2008 19:48:24 GMT Subject: rpms/trustyrc/devel import.log, NONE, 1.1 trustyrc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807061948.m66JmOhF015708@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/trustyrc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586/devel Modified Files: .cvsignore sources Added Files: import.log trustyrc.spec Log Message: New software --- NEW FILE import.log --- trustyrc-0_1_1-2_fc9_eponyme:HEAD:trustyrc-0.1.1-2.fc9.eponyme.src.rpm:1215373577 --- NEW FILE trustyrc.spec --- Name: trustyrc Version: 0.1.1 Release: 2%{?dist} Summary: Fully modular IRC robot Group: Applications/Internet License: GPLv2+ URL: http://nicoleau.fabien.free.fr/weblog/?pages/trustyRC Source0: http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tinyxml-devel Requires: trustyrc-plugins %description trustyRC is a fully modular IRC robot which includes all of the common bot features (channel moderation, administration, account system, quotes) and much more. trustyRC is comprised of a a kernel and a plugin loader which loads features such as a log system, configuration parser, networking, etc. All plugins can communicate with others, providing a highly flexible system. A plugin can be loaded or unloaded while the bot is running, so if a plugin needs to be updated, it can be unloaded, rebuilt and reloaded. During this, the bot does not need to be stopped. Plugins are stored in shared libraries; a plugin's features are available to the bot when the plugin is loaded and those features are removed when the plugin is unloaded. %package plugins Summary: Vitals plugins for trustyrc Group: Applications/Internet Requires: %{name} = %{version} %description plugins Vitals plugins for trustyrc %package plugins-extras Summary: Extra plugins for trustyrc Group: Applications/Internet %if 0%{?fedora} >8 BuildRequires: libcurl-devel %else BuildRequires: curl-devel %endif Requires: %{name} = %{version} %description plugins-extras Extra plugins for trustyrc %prep %setup -q # LIGNE PLUS NECESSAIRE EN 0.1.2 (chmod fait sur les sources upstream) chmod 0644 src/*.{cpp,h} src/plugins/*.{cpp,h} src/plugins/base_plugin/*.{cpp,h} sed -i -e s@"CXXFLAGS=.*"@"CXXFLAGS+=-W -ansi -pedantic -fPIC"@ Makefile %build CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; make %{?_smp_mflags} HAVE_TINYXML=yes %install rm -rf $RPM_BUILD_ROOT # sed because of /lib/ sed -i -e s@"LIBDIR=\$(DESTDIR).*"@"LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}"@ Makefile # sed to don't use RPM_BUID_ROOT in configuration file sed -i -e s@"\$(LIBDIR)\@"@"%{_libdir}/%{name}\@"@ Makefile make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} HAVE_TINYXML=yes %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FEATURES README %config(noreplace) %{_sysconfdir}/%{name}.conf %{_bindir}/%{name} %files plugins %defattr(-,root,root,-) %dir %{_libdir}/%{name} %{_libdir}/%{name}/ping.so %{_libdir}/%{name}/postconnect.so %{_libdir}/%{name}/moderation.so %{_libdir}/%{name}/module.so %{_libdir}/%{name}/admin.so %{_libdir}/%{name}/ignore.so %{_libdir}/%{name}/infos.so %{_libdir}/%{name}/ctcp.so %{_libdir}/%{name}/usersinfos.so %files plugins-extras %defattr(-,root,root,-) %{_libdir}/%{name}/advertising.so %{_libdir}/%{name}/bashfr.so %{_libdir}/%{name}/bzrh.so %{_libdir}/%{name}/fedorafr.so %{_libdir}/%{name}/fedoraproject.so %{_libdir}/%{name}/gameserver.so %{_libdir}/%{name}/ipconverting.so %{_libdir}/%{name}/lamoule.so %{_libdir}/%{name}/magic8ball.so %{_libdir}/%{name}/pluginsample.so %{_libdir}/%{name}/quotes.so %{_libdir}/%{name}/slapme.so %{_libdir}/%{name}/survey.so %{_libdir}/%{name}/tele.so %{_libdir}/%{name}/trad.so %changelog * Fri Jun 27 2008 Nicoleau Fabien 0.1.1-2 - Change buildrequires for curl (only on plugins-extras) - Licence update - non-macro usage for sed - english corrections - compiler flags set * Sat Jun 21 2008 Nicoleau Fabien 0.1.1-1 - Initital build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trustyrc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:24:17 -0000 1.1 +++ .cvsignore 6 Jul 2008 19:47:41 -0000 1.2 @@ -0,0 +1 @@ +trustyrc-0.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trustyrc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:24:17 -0000 1.1 +++ sources 6 Jul 2008 19:47:41 -0000 1.2 @@ -0,0 +1 @@ +1cc0dfef27d2cfa48c3511f01ba4d78a trustyrc-0.1.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 19:51:20 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Sun, 6 Jul 2008 19:51:20 GMT Subject: rpms/trustyrc/F-8 import.log, NONE, 1.1 trustyrc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807061951.m66JpKx8015935@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/trustyrc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15881/F-8 Modified Files: .cvsignore sources Added Files: import.log trustyrc.spec Log Message: New software --- NEW FILE import.log --- trustyrc-0_1_1-2_fc9_eponyme:F-8:trustyrc-0.1.1-2.fc9.eponyme.src.rpm:1215373798 --- NEW FILE trustyrc.spec --- Name: trustyrc Version: 0.1.1 Release: 2%{?dist} Summary: Fully modular IRC robot Group: Applications/Internet License: GPLv2+ URL: http://nicoleau.fabien.free.fr/weblog/?pages/trustyRC Source0: http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tinyxml-devel Requires: trustyrc-plugins %description trustyRC is a fully modular IRC robot which includes all of the common bot features (channel moderation, administration, account system, quotes) and much more. trustyRC is comprised of a a kernel and a plugin loader which loads features such as a log system, configuration parser, networking, etc. All plugins can communicate with others, providing a highly flexible system. A plugin can be loaded or unloaded while the bot is running, so if a plugin needs to be updated, it can be unloaded, rebuilt and reloaded. During this, the bot does not need to be stopped. Plugins are stored in shared libraries; a plugin's features are available to the bot when the plugin is loaded and those features are removed when the plugin is unloaded. %package plugins Summary: Vitals plugins for trustyrc Group: Applications/Internet Requires: %{name} = %{version} %description plugins Vitals plugins for trustyrc %package plugins-extras Summary: Extra plugins for trustyrc Group: Applications/Internet %if 0%{?fedora} >8 BuildRequires: libcurl-devel %else BuildRequires: curl-devel %endif Requires: %{name} = %{version} %description plugins-extras Extra plugins for trustyrc %prep %setup -q # LIGNE PLUS NECESSAIRE EN 0.1.2 (chmod fait sur les sources upstream) chmod 0644 src/*.{cpp,h} src/plugins/*.{cpp,h} src/plugins/base_plugin/*.{cpp,h} sed -i -e s@"CXXFLAGS=.*"@"CXXFLAGS+=-W -ansi -pedantic -fPIC"@ Makefile %build CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; make %{?_smp_mflags} HAVE_TINYXML=yes %install rm -rf $RPM_BUILD_ROOT # sed because of /lib/ sed -i -e s@"LIBDIR=\$(DESTDIR).*"@"LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}"@ Makefile # sed to don't use RPM_BUID_ROOT in configuration file sed -i -e s@"\$(LIBDIR)\@"@"%{_libdir}/%{name}\@"@ Makefile make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} HAVE_TINYXML=yes %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FEATURES README %config(noreplace) %{_sysconfdir}/%{name}.conf %{_bindir}/%{name} %files plugins %defattr(-,root,root,-) %dir %{_libdir}/%{name} %{_libdir}/%{name}/ping.so %{_libdir}/%{name}/postconnect.so %{_libdir}/%{name}/moderation.so %{_libdir}/%{name}/module.so %{_libdir}/%{name}/admin.so %{_libdir}/%{name}/ignore.so %{_libdir}/%{name}/infos.so %{_libdir}/%{name}/ctcp.so %{_libdir}/%{name}/usersinfos.so %files plugins-extras %defattr(-,root,root,-) %{_libdir}/%{name}/advertising.so %{_libdir}/%{name}/bashfr.so %{_libdir}/%{name}/bzrh.so %{_libdir}/%{name}/fedorafr.so %{_libdir}/%{name}/fedoraproject.so %{_libdir}/%{name}/gameserver.so %{_libdir}/%{name}/ipconverting.so %{_libdir}/%{name}/lamoule.so %{_libdir}/%{name}/magic8ball.so %{_libdir}/%{name}/pluginsample.so %{_libdir}/%{name}/quotes.so %{_libdir}/%{name}/slapme.so %{_libdir}/%{name}/survey.so %{_libdir}/%{name}/tele.so %{_libdir}/%{name}/trad.so %changelog * Fri Jun 27 2008 Nicoleau Fabien 0.1.1-2 - Change buildrequires for curl (only on plugins-extras) - Licence update - non-macro usage for sed - english corrections - compiler flags set * Sat Jun 21 2008 Nicoleau Fabien 0.1.1-1 - Initital build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trustyrc/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:24:17 -0000 1.1 +++ .cvsignore 6 Jul 2008 19:50:38 -0000 1.2 @@ -0,0 +1 @@ +trustyrc-0.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trustyrc/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:24:17 -0000 1.1 +++ sources 6 Jul 2008 19:50:38 -0000 1.2 @@ -0,0 +1 @@ +1cc0dfef27d2cfa48c3511f01ba4d78a trustyrc-0.1.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 19:53:28 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Sun, 6 Jul 2008 19:53:28 GMT Subject: rpms/trustyrc/F-9 import.log, NONE, 1.1 trustyrc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807061953.m66JrSCa016088@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/trustyrc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16047/F-9 Modified Files: .cvsignore sources Added Files: import.log trustyrc.spec Log Message: New software --- NEW FILE import.log --- trustyrc-0_1_1-2_fc9_eponyme:F-9:trustyrc-0.1.1-2.fc9.eponyme.src.rpm:1215373919 --- NEW FILE trustyrc.spec --- Name: trustyrc Version: 0.1.1 Release: 2%{?dist} Summary: Fully modular IRC robot Group: Applications/Internet License: GPLv2+ URL: http://nicoleau.fabien.free.fr/weblog/?pages/trustyRC Source0: http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tinyxml-devel Requires: trustyrc-plugins %description trustyRC is a fully modular IRC robot which includes all of the common bot features (channel moderation, administration, account system, quotes) and much more. trustyRC is comprised of a a kernel and a plugin loader which loads features such as a log system, configuration parser, networking, etc. All plugins can communicate with others, providing a highly flexible system. A plugin can be loaded or unloaded while the bot is running, so if a plugin needs to be updated, it can be unloaded, rebuilt and reloaded. During this, the bot does not need to be stopped. Plugins are stored in shared libraries; a plugin's features are available to the bot when the plugin is loaded and those features are removed when the plugin is unloaded. %package plugins Summary: Vitals plugins for trustyrc Group: Applications/Internet Requires: %{name} = %{version} %description plugins Vitals plugins for trustyrc %package plugins-extras Summary: Extra plugins for trustyrc Group: Applications/Internet %if 0%{?fedora} >8 BuildRequires: libcurl-devel %else BuildRequires: curl-devel %endif Requires: %{name} = %{version} %description plugins-extras Extra plugins for trustyrc %prep %setup -q # LIGNE PLUS NECESSAIRE EN 0.1.2 (chmod fait sur les sources upstream) chmod 0644 src/*.{cpp,h} src/plugins/*.{cpp,h} src/plugins/base_plugin/*.{cpp,h} sed -i -e s@"CXXFLAGS=.*"@"CXXFLAGS+=-W -ansi -pedantic -fPIC"@ Makefile %build CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; make %{?_smp_mflags} HAVE_TINYXML=yes %install rm -rf $RPM_BUILD_ROOT # sed because of /lib/ sed -i -e s@"LIBDIR=\$(DESTDIR).*"@"LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}"@ Makefile # sed to don't use RPM_BUID_ROOT in configuration file sed -i -e s@"\$(LIBDIR)\@"@"%{_libdir}/%{name}\@"@ Makefile make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} HAVE_TINYXML=yes %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FEATURES README %config(noreplace) %{_sysconfdir}/%{name}.conf %{_bindir}/%{name} %files plugins %defattr(-,root,root,-) %dir %{_libdir}/%{name} %{_libdir}/%{name}/ping.so %{_libdir}/%{name}/postconnect.so %{_libdir}/%{name}/moderation.so %{_libdir}/%{name}/module.so %{_libdir}/%{name}/admin.so %{_libdir}/%{name}/ignore.so %{_libdir}/%{name}/infos.so %{_libdir}/%{name}/ctcp.so %{_libdir}/%{name}/usersinfos.so %files plugins-extras %defattr(-,root,root,-) %{_libdir}/%{name}/advertising.so %{_libdir}/%{name}/bashfr.so %{_libdir}/%{name}/bzrh.so %{_libdir}/%{name}/fedorafr.so %{_libdir}/%{name}/fedoraproject.so %{_libdir}/%{name}/gameserver.so %{_libdir}/%{name}/ipconverting.so %{_libdir}/%{name}/lamoule.so %{_libdir}/%{name}/magic8ball.so %{_libdir}/%{name}/pluginsample.so %{_libdir}/%{name}/quotes.so %{_libdir}/%{name}/slapme.so %{_libdir}/%{name}/survey.so %{_libdir}/%{name}/tele.so %{_libdir}/%{name}/trad.so %changelog * Fri Jun 27 2008 Nicoleau Fabien 0.1.1-2 - Change buildrequires for curl (only on plugins-extras) - Licence update - non-macro usage for sed - english corrections - compiler flags set * Sat Jun 21 2008 Nicoleau Fabien 0.1.1-1 - Initital build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trustyrc/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:24:17 -0000 1.1 +++ .cvsignore 6 Jul 2008 19:52:43 -0000 1.2 @@ -0,0 +1 @@ +trustyrc-0.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trustyrc/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:24:17 -0000 1.1 +++ sources 6 Jul 2008 19:52:43 -0000 1.2 @@ -0,0 +1 @@ +1cc0dfef27d2cfa48c3511f01ba4d78a trustyrc-0.1.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 20:20:35 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sun, 6 Jul 2008 20:20:35 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9.bz2.sign, NONE, 1.1 patch-2.6.26-rc8.bz2.sign, 1.1, NONE Message-ID: <200807062020.m66KKZBP024092@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24081 Added Files: patch-2.6.26-rc9.bz2.sign Removed Files: patch-2.6.26-rc8.bz2.sign Log Message: 2.6.26-rc9 --- NEW FILE patch-2.6.26-rc9.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIcBGhyGugalF9Dw4RArq4AJ9E80S5tFUXKqh364f5O10HKfGLKACfbzaf ZObFVYkovyJ6CFqmn1KZJsA= =tQvA -----END PGP SIGNATURE----- --- patch-2.6.26-rc8.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 20:23:19 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sun, 6 Jul 2008 20:23:19 GMT Subject: rpms/kernel/devel patch-2.6.26-rc8-git4.bz2.sign,1.1,NONE Message-ID: <200807062023.m66KNJGt024276@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24247 Removed Files: patch-2.6.26-rc8-git4.bz2.sign Log Message: 2.6.26-rc9 --- patch-2.6.26-rc8-git4.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 6 20:27:47 2008 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 6 Jul 2008 20:27:47 GMT Subject: rpms/electronics-menu/devel import.log, NONE, 1.1 electronics-menu.spec, 1.1, 1.2 Message-ID: <200807062027.m66KRlk5024710@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/electronics-menu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24681/devel Modified Files: electronics-menu.spec Added Files: import.log Log Message: fixed yum install --- NEW FILE import.log --- electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997 Index: electronics-menu.spec =================================================================== RCS file: /cvs/pkgs/rpms/electronics-menu/devel/electronics-menu.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- electronics-menu.spec 11 Feb 2008 19:10:07 -0000 1.1 +++ electronics-menu.spec 6 Jul 2008 20:27:02 -0000 1.2 @@ -2,7 +2,7 @@ Name: electronics-menu Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronics Menu for the Desktop License: GPLv2 @@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires(pre): gtk2 + BuildArchitectures: noarch %description @@ -58,5 +60,8 @@ %changelog +* Sun Jul 06 2008 Chitlesh Goorah - 1.0-2 +- Corrected yum install with requires(pre) + * Fri Feb 01 2008 Chitlesh Goorah - 1.0-1 - Initial package for Fedora From fedora-extras-commits at redhat.com Sun Jul 6 20:58:09 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 6 Jul 2008 20:58:09 GMT Subject: rpms/openbabel/devel openbabel-check.patch,1.1,1.2 Message-ID: <200807062058.m66Kw9bd026534@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26491 Modified Files: openbabel-check.patch Log Message: - disable part of the testsuite until I figure out why it fails AFTER all tests have succeeded openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openbabel-check.patch 6 Jul 2008 14:57:34 -0000 1.1 +++ openbabel-check.patch 6 Jul 2008 20:57:15 -0000 1.2 @@ -1,6 +1,26 @@ -diff -up openbabel-2.2.0b7/test/bond.cpp.chk openbabel-2.2.0b7/test/bond.cpp ---- openbabel-2.2.0b7/test/bond.cpp.chk 2008-06-13 22:48:05.000000000 +0200 -+++ openbabel-2.2.0b7/test/bond.cpp 2008-07-06 14:05:26.000000000 +0200 +diff -up openbabel-2.2.0/test/wrapper.sh.chk openbabel-2.2.0/test/wrapper.sh +--- openbabel-2.2.0/test/wrapper.sh.chk 2008-07-04 02:28:17.000000000 +0200 ++++ openbabel-2.2.0/test/wrapper.sh 2008-07-06 22:54:23.000000000 +0200 +@@ -16,11 +16,11 @@ TESTS="${TESTS} logp_psa math" + TESTS="${TESTS} mol phmodel residue rings" + TESTS="${TESTS} smarts smilesmatch unitcell" + TESTS="${TESTS} cml.sh test-set.sh" +-if [ "x${srcdir}" != "x" ]; then +- TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" +-else +- TESTS="${TESTS} inchi.pl inchi2.pl" +-fi ++#if [ "x${srcdir}" != "x" ]; then ++# TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" ++#else ++# TESTS="${TESTS} inchi.pl inchi2.pl" ++#fi + PROVE=prove + + echo "top srcdir: .${topsrcdir}." +diff -up openbabel-2.2.0/test/bond.cpp.chk openbabel-2.2.0/test/bond.cpp +--- openbabel-2.2.0/test/bond.cpp.chk 2008-06-13 22:48:05.000000000 +0200 ++++ openbabel-2.2.0/test/bond.cpp 2008-07-06 21:45:44.000000000 +0200 @@ -58,7 +58,7 @@ int main(int argc,char *argv[]) bond1.SetBegin(&begin1); From fedora-extras-commits at redhat.com Sun Jul 6 21:14:54 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 6 Jul 2008 21:14:54 GMT Subject: rpms/xemacs/devel xemacs-21.5.28-3d-athena.patch, NONE, 1.1 xemacs.spec, 1.41, 1.42 Message-ID: <200807062114.m66LEsYj001017@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv972 Modified Files: xemacs.spec Added Files: xemacs-21.5.28-3d-athena.patch Log Message: * Sun Jul 6 2008 Ville Skytt?? - 21.5.28-8 - Apply upstream fix for detection of 3D Athena widget sets. xemacs-21.5.28-3d-athena.patch: --- NEW FILE xemacs-21.5.28-3d-athena.patch --- --- a/configure.ac Sat Mar 15 12:21:11 2008 +0100 +++ b/configure.ac Fri Apr 04 10:48:58 2008 -0700 @@ -4241,17 +4241,17 @@ if test "$with_x11" = "yes" -a "$detect_ AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, [ dnl Must not be a 3d library... - AC_CHECK_LIB($athena_variant, threeDClassRec, + AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], athena_lib=$athena_variant) ], AC_MSG_WARN([Could not find an Athena widget library.])) else dnl The real configuration, need 3d library - AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, + AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant, dnl OK, couldn't find it with a proper name, try the standard Athena lib dnl If that is 3d, presume the user asked for what they have installed. - AC_CHECK_LIB(Xaw, threeDClassRec, + AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB, [ athena_lib=Xaw; AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); Index: xemacs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- xemacs.spec 6 Jul 2008 16:53:57 -0000 1.41 +++ xemacs.spec 6 Jul 2008 21:14:09 -0000 1.42 @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -46,6 +46,7 @@ Patch9: %{name}-21.5.28-destdir.patch Patch10: %{name}-21.5.28-revert-modified-245017.patch Patch11: %{name}-21.5.28-autoconf262-449626.patch +Patch12: %{name}-21.5.28-3d-athena.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -203,6 +204,7 @@ %patch9 -p1 %patch10 -p0 %patch11 -p1 +%patch12 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -543,6 +545,9 @@ %changelog +* Sun Jul 6 2008 Ville Skytt?? - 21.5.28-8 +- Apply upstream fix for detection of 3D Athena widget sets. + * Sun Jul 6 2008 Ville Skytt?? - 21.5.28-7 - Fix build with autoconf >= 2.62 (#449626). From fedora-extras-commits at redhat.com Sun Jul 6 21:24:22 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 6 Jul 2008 21:24:22 GMT Subject: rpms/openbabel/F-9 openbabel-check.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 openbabel-gcc43.patch, 1.15, 1.16 openbabel-rpm.patch, 1.2, 1.3 openbabel.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <200807062124.m66LOMct001414@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1354 Modified Files: .cvsignore openbabel-gcc43.patch openbabel-rpm.patch openbabel.spec sources Added Files: openbabel-check.patch Log Message: - updated to 2.2.0 - new URL - dropped Python binding split patch (broken, reverted upstream) - fixed testsuite and disabled inchi tests temporarily - added strict perl version requirements (patch by Paul Howarth, bug #453120) - fixed some rpmlint warnings - merged a sed call into -rpm patch openbabel-check.patch: --- NEW FILE openbabel-check.patch --- diff -up openbabel-2.2.0/test/wrapper.sh.chk openbabel-2.2.0/test/wrapper.sh --- openbabel-2.2.0/test/wrapper.sh.chk 2008-07-04 02:28:17.000000000 +0200 +++ openbabel-2.2.0/test/wrapper.sh 2008-07-06 22:54:23.000000000 +0200 @@ -16,11 +16,11 @@ TESTS="${TESTS} logp_psa math" TESTS="${TESTS} mol phmodel residue rings" TESTS="${TESTS} smarts smilesmatch unitcell" TESTS="${TESTS} cml.sh test-set.sh" -if [ "x${srcdir}" != "x" ]; then - TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" -else - TESTS="${TESTS} inchi.pl inchi2.pl" -fi +#if [ "x${srcdir}" != "x" ]; then +# TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" +#else +# TESTS="${TESTS} inchi.pl inchi2.pl" +#fi PROVE=prove echo "top srcdir: .${topsrcdir}." diff -up openbabel-2.2.0/test/bond.cpp.chk openbabel-2.2.0/test/bond.cpp --- openbabel-2.2.0/test/bond.cpp.chk 2008-06-13 22:48:05.000000000 +0200 +++ openbabel-2.2.0/test/bond.cpp 2008-07-06 21:45:44.000000000 +0200 @@ -58,7 +58,7 @@ int main(int argc,char *argv[]) bond1.SetBegin(&begin1); bond1.SetEnd(&end1); - cout << "ok 4\n"; + cout << "ok 3\n"; return(0); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 2 Mar 2008 19:04:13 -0000 1.9 +++ .cvsignore 6 Jul 2008 21:23:27 -0000 1.10 @@ -1 +1 @@ -openbabel-2.2.0b4-20080301-r2299.tar.gz +openbabel-2.2.0.tar.gz openbabel-gcc43.patch: Index: openbabel-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/F-9/openbabel-gcc43.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- openbabel-gcc43.patch 23 Feb 2008 20:49:58 -0000 1.15 +++ openbabel-gcc43.patch 6 Jul 2008 21:23:27 -0000 1.16 @@ -1,6 +1,6 @@ -diff -up openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h.gcc43 openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h ---- openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h.gcc43 2007-11-30 00:01:23.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43 openbabel-2.2.0b7/src/zipstreamimpl.h +--- openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43 2008-06-21 15:58:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/zipstreamimpl.h 2008-07-02 20:16:21.000000000 +0200 @@ -31,6 +31,8 @@ Altered by: Geoffrey Hutchison 2005 for minor namespace modifications, VC++ compatibility */ @@ -10,9 +10,9 @@ //***************************************************************************** // template class basic_zip_streambuf //***************************************************************************** -diff -up openbabel-2.2.0b3-20080215-r2249/src/residue.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/residue.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/residue.cpp.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/residue.cpp 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/residue.cpp.gcc43 openbabel-2.2.0b7/src/residue.cpp +--- openbabel-2.2.0b7/src/residue.cpp.gcc43 2008-06-21 15:58:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/residue.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -26,6 +26,8 @@ obtained in part or whole from RasMol2 b // File Includes /////////////////////////////////////////////////////////////////////////////// @@ -22,21 +22,20 @@ #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/src/tokenst.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/tokenst.cpp -diff -up openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp.gcc43 2008-01-21 22:48:26.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp 2008-02-23 20:55:49.000000000 +0100 -@@ -36,6 +36,7 @@ GNU General Public License for more deta - #include +diff -up openbabel-2.2.0b7/src/obconversion.cpp.gcc43 openbabel-2.2.0b7/src/obconversion.cpp +--- openbabel-2.2.0b7/src/obconversion.cpp.gcc43 2008-06-21 15:58:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/obconversion.cpp 2008-07-02 20:17:00.000000000 +0200 +@@ -37,6 +37,7 @@ GNU General Public License for more deta #include #include + #include +#include - #include + #include -diff -up openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp.gcc43 2007-12-18 20:12:51.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp 2008-02-23 20:58:22.000000000 +0100 +diff -up openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/rxnformat.cpp +--- openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43 2008-06-21 15:58:01.000000000 +0200 ++++ openbabel-2.2.0b7/src/formats/rxnformat.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -16,6 +16,7 @@ GNU General Public License for more deta #include "openbabel/babelconfig.h" #include @@ -45,9 +44,9 @@ #include "openbabel/mol.h" #include "openbabel/obconversion.h" #include "openbabel/reaction.h" -diff -up openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp.gcc43 2007-11-30 00:01:23.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/fchkformat.cpp +--- openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43 2008-06-13 22:48:02.000000000 +0200 ++++ openbabel-2.2.0b7/src/formats/fchkformat.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -12,6 +12,7 @@ GNU General Public License for more deta ***********************************************************************/ @@ -56,9 +55,9 @@ // No diagnoalization yet. Perhaps for 2.2 -GRH // #include -diff -up openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp ---- openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp.gcc43 2007-11-30 00:01:23.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/src/fingerprint.cpp.gcc43 openbabel-2.2.0b7/src/fingerprint.cpp +--- openbabel-2.2.0b7/src/fingerprint.cpp.gcc43 2008-06-26 20:55:14.000000000 +0200 ++++ openbabel-2.2.0b7/src/fingerprint.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -21,7 +21,7 @@ GNU General Public License for more deta #include #include @@ -68,9 +67,9 @@ #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/xml.h.gcc43 openbabel-2.2.0b7/include/openbabel/xml.h +--- openbabel-2.2.0b7/include/openbabel/xml.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/xml.h 2008-07-02 20:16:21.000000000 +0200 @@ -13,6 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU GNU General Public License for more details. ***********************************************************************/ @@ -80,9 +79,9 @@ #include #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h.gcc43 2008-01-16 19:42:43.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43 openbabel-2.2.0b7/include/openbabel/obconversion.h +--- openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/obconversion.h 2008-07-02 20:16:21.000000000 +0200 @@ -28,6 +28,7 @@ GNU General Public License for more deta #include #include @@ -91,9 +90,9 @@ #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h.gcc43 2008-01-21 22:03:43.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/data.h.gcc43 openbabel-2.2.0b7/include/openbabel/data.h +--- openbabel-2.2.0b7/include/openbabel/data.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/data.h 2008-07-02 20:16:21.000000000 +0200 @@ -23,7 +23,7 @@ GNU General Public License for more deta #include @@ -103,9 +102,9 @@ #include #include #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h ---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h 2008-02-23 20:55:49.000000000 +0100 +diff -up openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.0b7/include/openbabel/obmolecformat.h +--- openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43 2008-06-21 15:58:05.000000000 +0200 ++++ openbabel-2.2.0b7/include/openbabel/obmolecformat.h 2008-07-02 20:16:21.000000000 +0200 @@ -23,6 +23,8 @@ GNU General Public License for more deta #include #endif @@ -113,12 +112,11 @@ +#include + #include + #include #include - #include -diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/lineend.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/lineend.h -diff -up openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp ---- openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp.gcc43 2007-12-12 20:16:13.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp 2008-02-23 20:55:55.000000000 +0100 +diff -up openbabel-2.2.0b7/tools/babel.cpp.gcc43 openbabel-2.2.0b7/tools/babel.cpp +--- openbabel-2.2.0b7/tools/babel.cpp.gcc43 2008-06-21 15:58:03.000000000 +0200 ++++ openbabel-2.2.0b7/tools/babel.cpp 2008-07-02 20:16:21.000000000 +0200 @@ -42,6 +42,7 @@ extern "C" int strncasecmp(const char *s #include #include openbabel-rpm.patch: Index: openbabel-rpm.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/F-9/openbabel-rpm.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openbabel-rpm.patch 2 Mar 2008 19:04:13 -0000 1.2 +++ openbabel-rpm.patch 6 Jul 2008 21:23:27 -0000 1.3 @@ -1,9 +1,9 @@ -diff -up openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am.r openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am ---- openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am.r 2008-01-24 21:43:42.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am 2008-02-23 15:48:26.000000000 +0100 -@@ -58,8 +58,8 @@ ruby/openbabel_ruby.cpp: openbabel-ruby. - $(SWIG) -ruby -naturalvar -autorename -c++ -o $@ -I$(top_srcdir)/include \ - -I$(top_builddir)/include $<; +diff -up openbabel-2.2.0/scripts/Makefile.am.r openbabel-2.2.0/scripts/Makefile.am +--- openbabel-2.2.0/scripts/Makefile.am.r 2008-07-03 20:25:54.000000000 +0200 ++++ openbabel-2.2.0/scripts/Makefile.am 2008-07-06 15:59:23.000000000 +0200 +@@ -63,8 +63,8 @@ ruby/openbabel_ruby.cpp: openbabel-ruby. + $(SWIG) -small -O -ruby -naturalvar -autorename -c++ -o $@ \ + -templatereduce -I$(top_srcdir)/include -I$(top_builddir)/include $<; (cd ruby; ruby extconf.rb \ - --with-openbabel-include=$(includedir)/openbabel-2.0 \ - --with-openbabel-lib=$(libdir) ) @@ -12,3 +12,17 @@ sed -e 's/rb_define_module(\"Openbabel\")/rb_define_module(\"OpenBabel\")/' -e 's/void Init_OpenBabel/void Init_openbabel/' ruby/openbabel_ruby.new mv ruby/openbabel_ruby.new ruby/openbabel_ruby.cpp endif # BUILD_RUBY +diff -up openbabel-2.2.0/scripts/perl/Makefile.PL.r openbabel-2.2.0/scripts/perl/Makefile.PL +--- openbabel-2.2.0/scripts/perl/Makefile.PL.r 2008-07-06 16:16:45.000000000 +0200 ++++ openbabel-2.2.0/scripts/perl/Makefile.PL 2008-07-06 16:48:59.000000000 +0200 +@@ -3,8 +3,8 @@ use ExtUtils::MakeMaker; + use lib 'inc'; + use Devel::CheckLib; + +-check_lib_or_exit( lib => 'openbabel' , libpath => +- at ENV{"LD_LIBRARY_PATH"}); ++#check_lib_or_exit( lib => 'openbabel' , libpath => ++#@ENV{"LD_LIBRARY_PATH"}); + + $CC = 'g++'; + $srcdir = '../../src'; Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/F-9/openbabel.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- openbabel.spec 2 Mar 2008 19:04:13 -0000 1.18 +++ openbabel.spec 6 Jul 2008 21:23:27 -0000 1.19 @@ -4,19 +4,20 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') -%define beta_ver b4 -%define beta_str b4-20080301-r2299 +%define beta_ver %{nil} +%define beta_str %{nil} Name: openbabel Version: 2.2.0 -Release: 0.2.%{beta_ver}%{?dist} +Release: 1%{?dist} Summary: Chemistry software file format converter License: GPLv2 Group: Applications/File -URL: http://openbabel.sourceforge.net/ +URL: http://openbabel.org/ Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz Patch: %{name}-gcc43.patch Patch1: %{name}-rpm.patch +Patch2: %{name}-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: inchi-devel BuildRequires: libtool @@ -62,8 +63,9 @@ %package -n perl-%{name} Group: System Environment/Libraries Summary: Perl wrapper for the Open Babel library +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Obsoletes: %{name}-perl < 2.2.0 -Provides: %{name}-perl +Provides: %{name}-perl = %{version}-%{release} %description -n perl-%{name} Perl wrapper for the Open Babel library. @@ -72,7 +74,7 @@ Group: System Environment/Libraries Summary: Python wrapper for the Open Babel library Obsoletes: %{name}-python < 2.2.0 -Provides: %{name}-python +Provides: %{name}-python = %{version}-%{release} %description -n python-%{name} Python wrapper for the Open Babel library. @@ -90,10 +92,15 @@ %setup -q -n %{name}-%{version}%{beta_ver} %patch -p1 -b .gcc43 %patch1 -p1 -b .r +%patch2 -p1 -b .chk +chmod 644 src/formats/{mmcif,fchk}format.cpp %build +# don't reference m4 include directory which isn't shipped in the tarball +# there's also a typo ("autconf" instead of "autoconf") +sed -i -e 's/ACLOCAL_AMFLAGS=/#ACLOCAL_AMFLAGS=/g' Makefile.am autoreconf --force --install -%configure --enable-shared=yes --enable-static=no --enable-maintainer-mode +%configure --enable-shared=yes --enable-static=no --disable-inchi --enable-maintainer-mode %{__make} %{?_smp_mflags} pushd scripts/perl @@ -114,7 +121,7 @@ %{__make} install DESTDIR=$RPM_BUILD_ROOT -%{__rm} $RPM_BUILD_ROOT%{_libdir}{,/%{name}}/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}{,/%{name}/%{version}%{beta_ver}}/*.la pushd scripts/perl %{__make} install DESTDIR=$RPM_BUILD_ROOT @@ -127,6 +134,7 @@ %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT popd +chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_openbabel.so pushd scripts/ruby %{__make} install DESTDIR=$RPM_BUILD_ROOT @@ -180,6 +188,15 @@ %{ruby_sitearch}/openbabel.so %changelog +* Sun Jul 06 2008 Dominik Mierzejewski 2.2.0-1 +- updated to 2.2.0 +- new URL +- dropped Python binding split patch (broken, reverted upstream) +- fixed testsuite and disabled inchi tests temporarily +- added strict perl version requirements (patch by Paul Howarth, bug #453120) +- fixed some rpmlint warnings +- merged a sed call into -rpm patch + * Sun Mar 02 2008 Dominik Mierzejewski 2.2.0-0.2.b4 - updated to 2.2.0 beta4 - enable CML tests again (fixed upstream) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 2 Mar 2008 19:04:13 -0000 1.9 +++ sources 6 Jul 2008 21:23:27 -0000 1.10 @@ -1 +1 @@ -1da2f8d1d47a554a22de5c12e5ddf896 openbabel-2.2.0b4-20080301-r2299.tar.gz +643a18c7ba09254d36e93afd6277346f openbabel-2.2.0.tar.gz From fedora-extras-commits at redhat.com Sun Jul 6 21:25:59 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 6 Jul 2008 21:25:59 GMT Subject: rpms/openbabel/devel openbabel.spec,1.42,1.43 Message-ID: <200807062125.m66LPxck001472@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1444 Modified Files: openbabel.spec Log Message: - mention bug number in changelog Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- openbabel.spec 6 Jul 2008 14:57:34 -0000 1.42 +++ openbabel.spec 6 Jul 2008 21:24:59 -0000 1.43 @@ -193,7 +193,7 @@ - new URL - dropped Python binding split patch (broken, reverted upstream) - fixed testsuite and disabled inchi tests temporarily -- added strict perl version requirements (patch by Paul Howarth) +- added strict perl version requirements (patch by Paul Howarth, bug #453120) - fixed some rpmlint warnings - merged a sed call into -rpm patch From fedora-extras-commits at redhat.com Sun Jul 6 22:18:06 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sun, 6 Jul 2008 22:18:06 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.7, 1.8 openoffice.org.spec, 1.1559, 1.1560 Message-ID: <200807062218.m66MI64t010059@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10004 Modified Files: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch openoffice.org.spec Log Message: extend to m68k openoffice.org-2.0.3.ooo80816.selinux.bridges.patch: Index: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo80816.selinux.bridges.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 15 Apr 2008 18:04:28 -0000 1.7 +++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 6 Jul 2008 22:17:16 -0000 1.8 @@ -818,3 +818,43 @@ code = codeSnippet( code, functionOffset++, vtableOffset, bridges::cpp_uno::shared::isSimpleType( +Index: source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx,v +retrieving revision 1.2 +diff -u -r1.2 cpp2uno.cxx +--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx 30 Jun 2008 15:04:49 -0000 1.2 ++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx 6 Jul 2008 22:16:27 -0000 +@@ -482,7 +481,7 @@ + } + + unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( +- Slot ** slots, unsigned char * code, ++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, + typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, + sal_Int32 functionCount, sal_Int32 vtableOffset) + { +@@ -497,20 +496,20 @@ + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: + // Getter: +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; + code = codeSnippet(code, functionOffset++, vtableOffset); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; + code = codeSnippet(code, functionOffset++, vtableOffset); + } + break; + case typelib_TypeClass_INTERFACE_METHOD: + { +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; + + typelib_InterfaceMethodTypeDescription *pMethodTD = + reinterpret_cast< Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1559 retrieving revision 1.1560 diff -u -r1.1559 -r1.1560 --- openoffice.org.spec 6 Jul 2008 19:15:50 -0000 1.1559 +++ openoffice.org.spec 6 Jul 2008 22:17:16 -0000 1.1560 @@ -2989,7 +2989,7 @@ %pre presenter-screen if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared org.openoffice.PresenterScreen-%{PLATFORM_ID} || : + unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || : fi %post presenter-screen @@ -2999,7 +2999,7 @@ %preun presenter-screen if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared org.openoffice.PresenterScreen-%{PLATFORM_ID} || : + unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || : fi %postun presenter-screen @@ -3582,6 +3582,7 @@ => bsh now only required by beanshell ScriptProvider - drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch - drop integrated openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch +- extend selinux bodge to m68k * Tue Jul 01 2008 Caolan McNamara - 1:3.0.0-0.22-1 - next version From fedora-extras-commits at redhat.com Sun Jul 6 22:54:57 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Sun, 6 Jul 2008 22:54:57 GMT Subject: rpms/digikam/F-9 digikam-missing-photos.patch, NONE, 1.1 digikam.spec, 1.52, 1.53 Message-ID: <200807062254.m66MsvjJ011629@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/digikam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11574 Modified Files: digikam.spec Added Files: digikam-missing-photos.patch Log Message: - Don't lose some photos during import (#448235) digikam-missing-photos.patch: --- NEW FILE digikam-missing-photos.patch --- --- digikam/utilities/cameragui/cameracontroller.cpp 2008-03-03 16:23:48.000000000 +0200 +++ digikam/utilities/cameragui/cameracontroller.cpp 2008-03-03 17:06:28.000000000 +0200 @@ -471,7 +471,7 @@ KUrl tempURL(dest); tempURL = tempURL.upUrl(); - tempURL.addPath(QString(".digikam-camera-tmp1-%1").arg(getpid())); + tempURL.addPath(QString(".digikam-camera-tmp1-%1").arg(getpid()).prepend(file)); QString temp = tempURL.path(); bool result = d->camera->downloadItem(folder, file, tempURL.path()); @@ -511,7 +511,7 @@ KUrl tempURL2(dest); tempURL2 = tempURL2.upUrl(); - tempURL2.addPath(QString(".digikam-camera-tmp2-%1").arg(getpid())); + tempURL2.addPath(QString(".digikam-camera-tmp2-%1").arg(getpid()).prepend(file)); temp = tempURL2.path(); if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat)) Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-9/digikam.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- digikam.spec 14 Mar 2008 21:00:55 -0000 1.52 +++ digikam.spec 6 Jul 2008 22:54:06 -0000 1.53 @@ -3,7 +3,7 @@ Name: digikam Version: 0.9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -12,6 +12,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: digikam-missing-photos.patch + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs3-devel @@ -50,6 +52,7 @@ %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} +%patch0 -p1 %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -136,6 +139,9 @@ %{_libdir}/libdigikam.so %changelog +* Mon Jul 07 2008 Marcin Garski 0.9.3-4 +- Don't lose some photos during import (#448235) + * Fri Mar 14 2008 Rex Dieter - 0.9.3-3 - respin (for libkdcraw) From fedora-extras-commits at redhat.com Sun Jul 6 23:10:14 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sun, 6 Jul 2008 23:10:14 GMT Subject: rpms/fatsort/devel fatsort-0.9.8.2-CFLAGS.patch, NONE, 1.1 fatsort.spec, 1.16, 1.17 Message-ID: <200807062310.m66NAEEu019185@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19125 Modified Files: fatsort.spec Added Files: fatsort-0.9.8.2-CFLAGS.patch Log Message: * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) fatsort-0.9.8.2-CFLAGS.patch: --- NEW FILE fatsort-0.9.8.2-CFLAGS.patch --- diff -up fatsort-0.9.8.2/src/Makefile.CFLAGS fatsort-0.9.8.2/src/Makefile --- fatsort-0.9.8.2/src/Makefile.CFLAGS 2008-06-11 18:39:38.000000000 +0200 +++ fatsort-0.9.8.2/src/Makefile 2008-07-07 00:54:49.000000000 +0200 @@ -1,7 +1,8 @@ CC=gcc LD=gcc -CFLAGS += -g -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -LDFLAGS = -s +CFLAGS= -g -Wall +override CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +LDFLAGS= -s SBINDIR=/usr/local/sbin all: fatsort Index: fatsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/devel/fatsort.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fatsort.spec 11 Jun 2008 20:40:47 -0000 1.16 +++ fatsort.spec 6 Jul 2008 23:09:24 -0000 1.17 @@ -1,12 +1,13 @@ Name: fatsort Version: 0.9.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System License: GPLv2+ URL: http://%{name}.berlios.de/ Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz +Patch0: fatsort-0.9.8.2-CFLAGS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,6 +19,7 @@ %prep %setup -q +%patch -p1 -b .CFLAGS %build @@ -41,6 +43,9 @@ %changelog +* Mon Jul 07 2008 Till Maas - 0.9.8.2-2 +- Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) + * Wed Jun 11 2008 Till Maas - 0.9.8.2-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 6 23:12:46 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sun, 6 Jul 2008 23:12:46 GMT Subject: rpms/fatsort/F-9 fatsort.spec,1.12,1.13 Message-ID: <200807062312.m66NCkrW019410@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19325 Modified Files: fatsort.spec Log Message: * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) Index: fatsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/F-9/fatsort.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fatsort.spec 11 Jun 2008 20:47:50 -0000 1.12 +++ fatsort.spec 6 Jul 2008 23:11:55 -0000 1.13 @@ -1,12 +1,13 @@ Name: fatsort Version: 0.9.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System License: GPLv2+ URL: http://%{name}.berlios.de/ Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz +Patch0: fatsort-0.9.8.2-CFLAGS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,6 +19,7 @@ %prep %setup -q +%patch -p1 -b .CFLAGS %build @@ -41,6 +43,9 @@ %changelog +* Mon Jul 07 2008 Till Maas - 0.9.8.2-2 +- Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) + * Wed Jun 11 2008 Till Maas - 0.9.8.2-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 6 23:13:28 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sun, 6 Jul 2008 23:13:28 GMT Subject: rpms/fatsort/F-9 fatsort-0.9.8.2-CFLAGS.patch,NONE,1.1 Message-ID: <200807062313.m66NDSej019500@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19485 Added Files: fatsort-0.9.8.2-CFLAGS.patch Log Message: * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) fatsort-0.9.8.2-CFLAGS.patch: --- NEW FILE fatsort-0.9.8.2-CFLAGS.patch --- diff -up fatsort-0.9.8.2/src/Makefile.CFLAGS fatsort-0.9.8.2/src/Makefile --- fatsort-0.9.8.2/src/Makefile.CFLAGS 2008-06-11 18:39:38.000000000 +0200 +++ fatsort-0.9.8.2/src/Makefile 2008-07-07 00:54:49.000000000 +0200 @@ -1,7 +1,8 @@ CC=gcc LD=gcc -CFLAGS += -g -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -LDFLAGS = -s +CFLAGS= -g -Wall +override CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +LDFLAGS= -s SBINDIR=/usr/local/sbin all: fatsort From fedora-extras-commits at redhat.com Sun Jul 6 23:15:45 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sun, 6 Jul 2008 23:15:45 GMT Subject: rpms/fatsort/F-8 fatsort-0.9.8.2-CFLAGS.patch, NONE, 1.1 fatsort.spec, 1.11, 1.12 Message-ID: <200807062315.m66NFjnB019707@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19644 Modified Files: fatsort.spec Added Files: fatsort-0.9.8.2-CFLAGS.patch Log Message: * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) fatsort-0.9.8.2-CFLAGS.patch: --- NEW FILE fatsort-0.9.8.2-CFLAGS.patch --- diff -up fatsort-0.9.8.2/src/Makefile.CFLAGS fatsort-0.9.8.2/src/Makefile --- fatsort-0.9.8.2/src/Makefile.CFLAGS 2008-06-11 18:39:38.000000000 +0200 +++ fatsort-0.9.8.2/src/Makefile 2008-07-07 00:54:49.000000000 +0200 @@ -1,7 +1,8 @@ CC=gcc LD=gcc -CFLAGS += -g -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -LDFLAGS = -s +CFLAGS= -g -Wall +override CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +LDFLAGS= -s SBINDIR=/usr/local/sbin all: fatsort Index: fatsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/F-8/fatsort.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fatsort.spec 11 Jun 2008 20:57:11 -0000 1.11 +++ fatsort.spec 6 Jul 2008 23:14:58 -0000 1.12 @@ -1,12 +1,13 @@ Name: fatsort Version: 0.9.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System License: GPLv2+ URL: http://%{name}.berlios.de/ Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz +Patch0: fatsort-0.9.8.2-CFLAGS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,6 +19,7 @@ %prep %setup -q +%patch -p1 -b .CFLAGS %build @@ -41,6 +43,9 @@ %changelog +* Mon Jul 07 2008 Till Maas - 0.9.8.2-2 +- Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) + * Wed Jun 11 2008 Till Maas - 0.9.8.2-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 6 23:17:45 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sun, 6 Jul 2008 23:17:45 GMT Subject: rpms/fatsort/devel fatsort.spec,1.17,1.18 Message-ID: <200807062317.m66NHjbT019886@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19814 Modified Files: fatsort.spec Log Message: add patch status Index: fatsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/devel/fatsort.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fatsort.spec 6 Jul 2008 23:09:24 -0000 1.17 +++ fatsort.spec 6 Jul 2008 23:16:55 -0000 1.18 @@ -7,6 +7,7 @@ License: GPLv2+ URL: http://%{name}.berlios.de/ Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz +# 2008-07-07: sent to upstream via personal e-mail Patch0: fatsort-0.9.8.2-CFLAGS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Sun Jul 6 23:27:58 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Sun, 6 Jul 2008 23:27:58 GMT Subject: rpms/digikam/F-9 digikam-missing-photos.patch,1.1,1.2 Message-ID: <200807062327.m66NRwj5020376@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/digikam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20291 Modified Files: digikam-missing-photos.patch Log Message: - Add correct patch digikam-missing-photos.patch: Index: digikam-missing-photos.patch =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-9/digikam-missing-photos.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- digikam-missing-photos.patch 6 Jul 2008 22:54:06 -0000 1.1 +++ digikam-missing-photos.patch 6 Jul 2008 23:27:08 -0000 1.2 @@ -1,20 +1,20 @@ ---- digikam/utilities/cameragui/cameracontroller.cpp 2008-03-03 16:23:48.000000000 +0200 -+++ digikam/utilities/cameragui/cameracontroller.cpp 2008-03-03 17:06:28.000000000 +0200 -@@ -471,7 +471,7 @@ +--- digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp 2007-12-22 18:19:47.000000000 +0100 ++++ digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp.new 2008-07-07 00:42:14.000000000 +0200 +@@ -370,7 +370,7 @@ - KUrl tempURL(dest); - tempURL = tempURL.upUrl(); -- tempURL.addPath(QString(".digikam-camera-tmp1-%1").arg(getpid())); -+ tempURL.addPath(QString(".digikam-camera-tmp1-%1").arg(getpid()).prepend(file)); + KURL tempURL(dest); + tempURL = tempURL.upURL(); +- tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid())); ++ tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid()).prepend(file)); QString temp = tempURL.path(); - + bool result = d->camera->downloadItem(folder, file, tempURL.path()); -@@ -511,7 +511,7 @@ +@@ -410,7 +410,7 @@ - KUrl tempURL2(dest); - tempURL2 = tempURL2.upUrl(); -- tempURL2.addPath(QString(".digikam-camera-tmp2-%1").arg(getpid())); -+ tempURL2.addPath(QString(".digikam-camera-tmp2-%1").arg(getpid()).prepend(file)); + KURL tempURL2(dest); + tempURL2 = tempURL2.upURL(); +- tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid())); ++ tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid()).prepend(file)); temp = tempURL2.path(); if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat)) From fedora-extras-commits at redhat.com Sun Jul 6 23:29:35 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Sun, 6 Jul 2008 23:29:35 GMT Subject: rpms/digikam/F-9 digikam.spec,1.53,1.54 Message-ID: <200807062329.m66NTZ6c020504@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/digikam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20403 Modified Files: digikam.spec Log Message: - Add correct patch Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-9/digikam.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- digikam.spec 6 Jul 2008 22:54:06 -0000 1.53 +++ digikam.spec 6 Jul 2008 23:28:47 -0000 1.54 @@ -3,7 +3,7 @@ Name: digikam Version: 0.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -139,7 +139,7 @@ %{_libdir}/libdigikam.so %changelog -* Mon Jul 07 2008 Marcin Garski 0.9.3-4 +* Mon Jul 07 2008 Marcin Garski 0.9.3-5 - Don't lose some photos during import (#448235) * Fri Mar 14 2008 Rex Dieter - 0.9.3-3 From fedora-extras-commits at redhat.com Mon Jul 7 00:01:43 2008 From: fedora-extras-commits at redhat.com (Braden McDaniel (braden)) Date: Mon, 7 Jul 2008 00:01:43 GMT Subject: rpms/openvrml/F-8 openvrml.spec,1.42,1.43 Message-ID: <200807070001.m6701hKm028443@cvs-int.fedora.redhat.com> Author: braden Update of /cvs/pkgs/rpms/openvrml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21865 Modified Files: openvrml.spec Log Message: Rebuild after updating gecko-libs requirement. Index: openvrml.spec =================================================================== RCS file: /cvs/pkgs/rpms/openvrml/F-8/openvrml.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- openvrml.spec 3 Jul 2008 03:50:29 -0000 1.42 +++ openvrml.spec 7 Jul 2008 00:00:09 -0000 1.43 @@ -1,7 +1,7 @@ # -*- rpm-spec -*- Name: openvrml Version: 0.17.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: VRML/X3D runtime library License: LGPLv3+ Group: System Environment/Libraries @@ -173,6 +173,9 @@ %changelog +* Wed Jul 06 2008 Braden McDaniel - 0.17.6-4 +- Rebuild after updating gecko-libs requirement. + * Wed Jul 02 2008 Christopher Aillon - 0.17.6-3 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Mon Jul 7 02:05:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:05:30 +0000 Subject: [pkgdb] php-pear-propel_runtime was added for akahl Message-ID: <200807070205.m6725UoW023409@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package php-pear-propel_runtime with summary An Object Relational Mapping (ORM) framework for PHP5 Kevin Fenzi (kevin) has approved Package php-pear-propel_runtime Kevin Fenzi (kevin) has added a Fedora devel branch for php-pear-propel_runtime with an owner of akahl Kevin Fenzi (kevin) has approved php-pear-propel_runtime in Fedora devel Kevin Fenzi (kevin) has approved Package php-pear-propel_runtime Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-propel_runtime (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-propel_runtime (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-propel_runtime (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_runtime From fedora-extras-commits at redhat.com Mon Jul 7 02:05:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:05:35 +0000 Subject: [pkgdb] php-pear-propel_runtime (Fedora, 8) updated by kevin Message-ID: <200807070205.m6725ZuA023428@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for php-pear-propel_runtime Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-propel_runtime (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-propel_runtime (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-propel_runtime (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-propel_runtime (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_runtime From fedora-extras-commits at redhat.com Mon Jul 7 02:05:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:05:35 +0000 Subject: [pkgdb] php-pear-propel_runtime (Fedora, 9) updated by kevin Message-ID: <200807070205.m6725ZuD023428@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for php-pear-propel_runtime Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-propel_runtime (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-propel_runtime (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-propel_runtime (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-propel_runtime (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_runtime From fedora-extras-commits at redhat.com Mon Jul 7 02:05:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:05:35 +0000 Subject: [pkgdb] php-pear-propel_runtime (Fedora, devel) updated by kevin Message-ID: <200807070205.m6725ZuG023428@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-propel_runtime (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_runtime From fedora-extras-commits at redhat.com Mon Jul 7 02:06:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:06:07 GMT Subject: rpms/php-pear-propel_runtime - New directory Message-ID: <200807070206.m67267x1013635@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_runtime In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc13603/rpms/php-pear-propel_runtime Log Message: Directory /cvs/extras/rpms/php-pear-propel_runtime added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:06:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:06:21 GMT Subject: rpms/php-pear-propel_runtime/devel - New directory Message-ID: <200807070206.m6726Lt0013649@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_runtime/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc13603/rpms/php-pear-propel_runtime/devel Log Message: Directory /cvs/extras/rpms/php-pear-propel_runtime/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:06:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:06:38 GMT Subject: rpms/php-pear-propel_runtime Makefile,NONE,1.1 Message-ID: <200807070206.m6726c2Z013676@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_runtime In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc13603/rpms/php-pear-propel_runtime Added Files: Makefile Log Message: Setup of module php-pear-propel_runtime --- NEW FILE Makefile --- # Top level Makefile for module php-pear-propel_runtime all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 7 02:06:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:06:44 +0000 Subject: [pkgdb] cl-asdf was added for green Message-ID: <200807070206.m6726iGZ023587@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package cl-asdf with summary Another System Definition Facility Kevin Fenzi (kevin) has approved Package cl-asdf Kevin Fenzi (kevin) has added a Fedora devel branch for cl-asdf with an owner of green Kevin Fenzi (kevin) has approved cl-asdf in Fedora devel Kevin Fenzi (kevin) has approved Package cl-asdf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cl-asdf (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cl-asdf (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cl-asdf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cl-asdf From fedora-extras-commits at redhat.com Mon Jul 7 02:06:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:06:47 +0000 Subject: [pkgdb] cl-asdf (Fedora, devel) updated by kevin Message-ID: <200807070206.m6726lg9023609@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on cl-asdf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cl-asdf From fedora-extras-commits at redhat.com Mon Jul 7 02:06:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:06:55 GMT Subject: rpms/php-pear-propel_runtime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807070206.m6726tFx013691@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_runtime/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc13603/rpms/php-pear-propel_runtime/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-propel_runtime --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: php-pear-propel_runtime # $Id: Makefile,v 1.1 2008/07/07 02:06:38 kevin Exp $ NAME := php-pear-propel_runtime SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 7 02:07:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:07:29 GMT Subject: rpms/cl-asdf - New directory Message-ID: <200807070207.m6727Tkh013855@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cl-asdf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13811/rpms/cl-asdf Log Message: Directory /cvs/extras/rpms/cl-asdf added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:07:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:07:43 GMT Subject: rpms/cl-asdf/devel - New directory Message-ID: <200807070207.m6727hmJ013891@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cl-asdf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13811/rpms/cl-asdf/devel Log Message: Directory /cvs/extras/rpms/cl-asdf/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:07:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:07:55 GMT Subject: rpms/cl-asdf Makefile,NONE,1.1 Message-ID: <200807070207.m6727tx4013923@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cl-asdf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13811/rpms/cl-asdf Added Files: Makefile Log Message: Setup of module cl-asdf --- NEW FILE Makefile --- # Top level Makefile for module cl-asdf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 7 02:08:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:08:08 GMT Subject: rpms/cl-asdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807070208.m67288xF013948@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cl-asdf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13811/rpms/cl-asdf/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cl-asdf --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: cl-asdf # $Id: Makefile,v 1.1 2008/07/07 02:07:56 kevin Exp $ NAME := cl-asdf SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 7 02:09:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:09:28 +0000 Subject: [pkgdb] php-pear-propel_generator was added for akahl Message-ID: <200807070209.m6729Sau023810@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package php-pear-propel_generator with summary An Object Relational Mapping (ORM) framework for PHP5 Kevin Fenzi (kevin) has approved Package php-pear-propel_generator Kevin Fenzi (kevin) has added a Fedora devel branch for php-pear-propel_generator with an owner of akahl Kevin Fenzi (kevin) has approved php-pear-propel_generator in Fedora devel Kevin Fenzi (kevin) has approved Package php-pear-propel_generator Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-propel_generator (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-propel_generator (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-propel_generator (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_generator From fedora-extras-commits at redhat.com Mon Jul 7 02:09:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:09:31 +0000 Subject: [pkgdb] php-pear-propel_generator (Fedora, 8) updated by kevin Message-ID: <200807070209.m6729V5u023830@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for php-pear-propel_generator Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-propel_generator (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-propel_generator (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-propel_generator (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-propel_generator (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_generator From fedora-extras-commits at redhat.com Mon Jul 7 02:09:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:09:31 +0000 Subject: [pkgdb] php-pear-propel_generator (Fedora, 9) updated by kevin Message-ID: <200807070209.m6729V5x023830@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for php-pear-propel_generator Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-propel_generator (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-propel_generator (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-propel_generator (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-propel_generator (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_generator From fedora-extras-commits at redhat.com Mon Jul 7 02:09:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:09:31 +0000 Subject: [pkgdb] php-pear-propel_generator (Fedora, devel) updated by kevin Message-ID: <200807070209.m6729V62023830@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-propel_generator (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_generator From fedora-extras-commits at redhat.com Mon Jul 7 02:10:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:10:11 GMT Subject: rpms/php-pear-propel_generator - New directory Message-ID: <200807070210.m672ABeI014071@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_generator In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg14034/rpms/php-pear-propel_generator Log Message: Directory /cvs/extras/rpms/php-pear-propel_generator added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:10:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:10:26 GMT Subject: rpms/php-pear-propel_generator/devel - New directory Message-ID: <200807070210.m672AQap014090@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_generator/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg14034/rpms/php-pear-propel_generator/devel Log Message: Directory /cvs/extras/rpms/php-pear-propel_generator/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:10:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:10:39 GMT Subject: rpms/php-pear-propel_generator Makefile,NONE,1.1 Message-ID: <200807070210.m672Adun014128@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_generator In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg14034/rpms/php-pear-propel_generator Added Files: Makefile Log Message: Setup of module php-pear-propel_generator --- NEW FILE Makefile --- # Top level Makefile for module php-pear-propel_generator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 7 02:10:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:10:51 GMT Subject: rpms/php-pear-propel_generator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807070210.m672Apqr014152@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/php-pear-propel_generator/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg14034/rpms/php-pear-propel_generator/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-propel_generator --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: php-pear-propel_generator # $Id: Makefile,v 1.1 2008/07/07 02:10:39 kevin Exp $ NAME := php-pear-propel_generator SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 7 02:12:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:12:02 +0000 Subject: [pkgdb] pytrainer was added for silfreed Message-ID: <200807070212.m672C2l1024092@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package pytrainer with summary A tool to log all your sport excursions Kevin Fenzi (kevin) has approved Package pytrainer Kevin Fenzi (kevin) has added a Fedora devel branch for pytrainer with an owner of silfreed Kevin Fenzi (kevin) has approved pytrainer in Fedora devel Kevin Fenzi (kevin) has approved Package pytrainer Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pytrainer (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pytrainer (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pytrainer (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pytrainer From fedora-extras-commits at redhat.com Mon Jul 7 02:12:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:12:11 +0000 Subject: [pkgdb] pytrainer (Fedora, 8) updated by kevin Message-ID: <200807070212.m672C2l4024092@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for pytrainer Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pytrainer (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pytrainer (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pytrainer (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on pytrainer (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pytrainer From fedora-extras-commits at redhat.com Mon Jul 7 02:12:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:12:11 +0000 Subject: [pkgdb] pytrainer (Fedora, devel) updated by kevin Message-ID: <200807070212.m672C2l7024092@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on pytrainer (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pytrainer From fedora-extras-commits at redhat.com Mon Jul 7 02:12:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 02:12:11 +0000 Subject: [pkgdb] pytrainer (Fedora, 9) updated by kevin Message-ID: <200807070212.m672CDNj024151@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for pytrainer Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pytrainer (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pytrainer (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pytrainer (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on pytrainer (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pytrainer From fedora-extras-commits at redhat.com Mon Jul 7 02:12:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:12:38 GMT Subject: rpms/pytrainer - New directory Message-ID: <200807070212.m672CcPZ014320@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pytrainer In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK14290/rpms/pytrainer Log Message: Directory /cvs/extras/rpms/pytrainer added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:12:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:12:53 GMT Subject: rpms/pytrainer/devel - New directory Message-ID: <200807070212.m672Crv1014344@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pytrainer/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK14290/rpms/pytrainer/devel Log Message: Directory /cvs/extras/rpms/pytrainer/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 02:13:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:13:10 GMT Subject: rpms/pytrainer Makefile,NONE,1.1 Message-ID: <200807070213.m672DAai014372@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pytrainer In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK14290/rpms/pytrainer Added Files: Makefile Log Message: Setup of module pytrainer --- NEW FILE Makefile --- # Top level Makefile for module pytrainer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 7 02:13:22 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 02:13:22 GMT Subject: rpms/pytrainer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807070213.m672DMN9014387@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pytrainer/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK14290/rpms/pytrainer/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pytrainer --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pytrainer # $Id: Makefile,v 1.1 2008/07/07 02:13:10 kevin Exp $ NAME := pytrainer SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 7 02:32:16 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 7 Jul 2008 02:32:16 GMT Subject: rpms/espeak/F-9 espeak.spec,1.18,1.19 Message-ID: <200807070232.m672WGSK015346@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/espeak/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15217 Modified Files: espeak.spec Log Message: some arches cant use -fpic Index: espeak.spec =================================================================== RCS file: /cvs/pkgs/rpms/espeak/F-9/espeak.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- espeak.spec 26 Feb 2008 07:09:54 -0000 1.18 +++ espeak.spec 7 Jul 2008 02:31:22 -0000 1.19 @@ -1,6 +1,6 @@ Name: espeak Version: 1.31 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software speech synthesizer (text-to-speech) Group: Applications/Multimedia @@ -50,7 +50,10 @@ %endif # Don't use the included binary voice dictionaries; we compile these from source rm -f espeak-data/*_dict - +# not all arches can use -fpic since its hardcoded we will sed it +%ifarch sparcv9 sparc64 s390 s390x + sed -i 's|-fpic|-fPIC|' src/Makefile* +%endif %build # Compile espeak @@ -96,6 +99,9 @@ %changelog +* Sun Jul 06 2008 Dennis Gilmore - 1.13-6 +- sed out -fpic with -fPIC on sparc and s390 arches + * Tue Feb 26 2008 Francois Aucamp - 1.31-5 - Export ESPEAK_DATA_PATH in %%build to allow proper compilation of voice dictionaries From fedora-extras-commits at redhat.com Mon Jul 7 02:45:55 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 7 Jul 2008 02:45:55 GMT Subject: rpms/cl-asdf/devel cl-asdf.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807070245.m672jt49016143@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/cl-asdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15987/devel Modified Files: .cvsignore sources Added Files: cl-asdf.spec import.log Log Message: Initial import. --- NEW FILE cl-asdf.spec --- Name: cl-asdf Version: 20071110 Release: 4%{?dist} Group: Development/Libraries Source: %{name}-%{version}.tar.bz2 Summary: Another System Definition Facility URL: http://www.cliki.net/asdf License: MIT BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Another System Definition Facility (asdf) is a package format for Common Lisp libraries. %prep %setup -q -n asdf %install %{__rm} -rf %{buildroot} mkdir -m 755 -p %{buildroot}%{_datadir}/common-lisp/source/asdf install -m 644 asdf.lisp %{buildroot}%{_datadir}/common-lisp/source/asdf install -m 644 wild-modules.lisp %{buildroot}%{_datadir}/common-lisp/source/asdf %build # Nothing to do. %clean %{__rm} -rf %{buildroot} %files %defattr (-,root,root) %doc LICENSE README %dir %{_datadir}/common-lisp %dir %{_datadir}/common-lisp/source %{_datadir}/common-lisp/source/asdf %changelog * Sun Jul 06 2008 Anthony Green 20071110-4 - Take ownership of all directories we create. * Thu Jan 03 2008 Anthony Green 20071110-3 - Take ownership of all directories we create. * Sat Nov 11 2007 Anthony Green 20071110-2 - Update install directory. - Add documentation. * Sat Nov 11 2007 Anthony Green 20071110-1 - Initial version. --- NEW FILE import.log --- cl-asdf-20071110-4_fc9:HEAD:cl-asdf-20071110-4.fc9.src.rpm:1215397822 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cl-asdf/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2008 02:07:56 -0000 1.1 +++ .cvsignore 7 Jul 2008 02:45:12 -0000 1.2 @@ -0,0 +1 @@ +cl-asdf-20071110.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cl-asdf/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 02:07:56 -0000 1.1 +++ sources 7 Jul 2008 02:45:12 -0000 1.2 @@ -0,0 +1 @@ +49434eca6372cb571beaa99668364f4f cl-asdf-20071110.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 04:16:23 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 7 Jul 2008 04:16:23 GMT Subject: rpms/python-paramiko/devel python-paramiko.spec,1.14,1.15 Message-ID: <200807070416.m674GNrN001306@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-paramiko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227 Modified Files: python-paramiko.spec Log Message: * Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 - Update to 1.7.4 Index: python-paramiko.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/devel/python-paramiko.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-paramiko.spec 24 Mar 2008 12:18:58 -0000 1.14 +++ python-paramiko.spec 7 Jul 2008 04:15:28 -0000 1.15 @@ -3,7 +3,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.7.3 +Version: 1.7.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -52,6 +52,9 @@ %{python_sitelib}/* %changelog +* Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 +- Update to 1.7.4 + * Mon Mar 24 2008 Jeffrey C. Ollie - 1.7.3-1 - Update to 1.7.3. From fedora-extras-commits at redhat.com Mon Jul 7 05:39:59 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Mon, 7 Jul 2008 05:39:59 GMT Subject: rpms/python-tempita/devel .cvsignore, 1.2, 1.3 python-tempita.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807070539.m675dxKa011733@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-tempita/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11560 Modified Files: .cvsignore python-tempita.spec sources Log Message: Add %%check section. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-tempita/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2008 03:10:20 -0000 1.2 +++ .cvsignore 7 Jul 2008 05:39:09 -0000 1.3 @@ -1 +1,2 @@ Tempita-0.2.tar.gz +python-tempita-0.2-fix-tests.patch Index: python-tempita.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-tempita/devel/python-tempita.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-tempita.spec 18 Jun 2008 03:10:20 -0000 1.1 +++ python-tempita.spec 7 Jul 2008 05:39:09 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-tempita Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A very small text templating language Group: Development/Languages @@ -10,6 +10,7 @@ URL: http://pythonpaste.org/tempita/ Source0: http://pypi.python.org/packages/source/T/Tempita/Tempita-0.2.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: %{name}-%{version}-fix-tests.patch BuildArch: noarch BuildRequires: python-devel @@ -18,12 +19,14 @@ %else BuildRequires: python-setuptools %endif +BuildRequires: python-nose %description Tempita is a small templating language for text substitution. %prep %setup -q -n Tempita-%{version} +%patch0 -p1 %build @@ -39,6 +42,10 @@ %{__rm} -rf %{buildroot} +%check +./test + + %files %defattr(-,root,root,-) %doc docs/* @@ -47,5 +54,8 @@ %changelog +* Mon Jul 07 2008 Ricky Zhou - 0.2-2 +- Add %%check section. + * Sat Jun 14 2008 Ricky Zhou - 0.2-1 - Initial RPM Package. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-tempita/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 03:10:20 -0000 1.2 +++ sources 7 Jul 2008 05:39:09 -0000 1.3 @@ -1 +1,2 @@ 9097cf47905489af1f16b5a2d8025369 Tempita-0.2.tar.gz +855edf4a864466d50bb7896aba58b7a5 python-tempita-0.2-fix-tests.patch From fedora-extras-commits at redhat.com Mon Jul 7 05:43:10 2008 From: fedora-extras-commits at redhat.com (Chris Ball (cjb)) Date: Mon, 7 Jul 2008 05:43:10 GMT Subject: rpms/ohm/OLPC-3 .cvsignore, 1.3, 1.4 ohm.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807070543.m675hAxL012060@cvs-int.fedora.redhat.com> Author: cjb Update of /cvs/pkgs/rpms/ohm/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12010 Modified Files: .cvsignore ohm.spec sources Log Message: Implement the OHM side of the sugar control panel power section. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2008 01:06:25 -0000 1.3 +++ .cvsignore 7 Jul 2008 05:42:24 -0000 1.4 @@ -1 +1 @@ -ohm-0.1.1-1.20080701git.tar.gz +ohm-0.1.1-1.20080707git.tar.gz Index: ohm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/ohm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ohm.spec 2 Jul 2008 01:06:25 -0000 1.3 +++ ohm.spec 7 Jul 2008 05:42:24 -0000 1.4 @@ -2,12 +2,12 @@ %define gtk2_version 2.10.0 %define dbus_version 0.70 %define gettext_version 0.14 -%define alphatag 20080701git +%define alphatag 20080707git Summary: Open Hardware Manager Name: ohm Version: 0.1.1 -Release: 6.13.%{alphatag}%{?dist} +Release: 6.14.%{alphatag}%{?dist} URL: http://www.freedesktop.org/Software/ohm Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz @@ -137,6 +137,9 @@ %{_includedir}/* %changelog +* Mon Jul 07 2008 Chris Ball - 0.1.1-6.14.20080707git.olpc +- Implement the OHM side of the sugar control panel power section. + * Tue Jul 01 2008 Chris Ball - 0.1.1-6.13.20080701git.olpc - Fix OLPC Trac #7359, segfault due to uninitialized use of X display. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2008 01:06:25 -0000 1.3 +++ sources 7 Jul 2008 05:42:24 -0000 1.4 @@ -1 +1 @@ -37617ab1a7bcc7783ae0f16dfb3ed829 ohm-0.1.1-1.20080701git.tar.gz +36a4efa73535f3eb331a3ebf2f37a921 ohm-0.1.1-1.20080707git.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 05:47:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Mon, 7 Jul 2008 05:47:44 GMT Subject: rpms/python-tempita/F-9 python-tempita.spec,1.1,1.2 Message-ID: <200807070547.m675lixd012373@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-tempita/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12290/F-9 Modified Files: python-tempita.spec Log Message: ommit the patch to CVS instead. Index: python-tempita.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-tempita/F-9/python-tempita.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-tempita.spec 18 Jun 2008 03:14:35 -0000 1.1 +++ python-tempita.spec 7 Jul 2008 05:47:02 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-tempita Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A very small text templating language Group: Development/Languages @@ -10,6 +10,7 @@ URL: http://pythonpaste.org/tempita/ Source0: http://pypi.python.org/packages/source/T/Tempita/Tempita-0.2.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: %{name}-%{version}-fix-tests.patch BuildArch: noarch BuildRequires: python-devel @@ -18,12 +19,14 @@ %else BuildRequires: python-setuptools %endif +BuildRequires: python-nose %description Tempita is a small templating language for text substitution. %prep %setup -q -n Tempita-%{version} +%patch0 -p1 %build @@ -39,6 +42,10 @@ %{__rm} -rf %{buildroot} +%check +./test + + %files %defattr(-,root,root,-) %doc docs/* @@ -47,5 +54,8 @@ %changelog +* Mon Jul 07 2008 Ricky Zhou - 0.2-2 +- Add %%check section. + * Sat Jun 14 2008 Ricky Zhou - 0.2-1 - Initial RPM Package. From fedora-extras-commits at redhat.com Mon Jul 7 05:48:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Mon, 7 Jul 2008 05:48:01 GMT Subject: rpms/python-tempita/F-8 python-tempita.spec,1.1,1.2 Message-ID: <200807070548.m675m16C012394@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-tempita/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12290/F-8 Modified Files: python-tempita.spec Log Message: ommit the patch to CVS instead. Index: python-tempita.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-tempita/F-8/python-tempita.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-tempita.spec 18 Jun 2008 03:12:03 -0000 1.1 +++ python-tempita.spec 7 Jul 2008 05:46:48 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-tempita Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A very small text templating language Group: Development/Languages @@ -10,6 +10,7 @@ URL: http://pythonpaste.org/tempita/ Source0: http://pypi.python.org/packages/source/T/Tempita/Tempita-0.2.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: %{name}-%{version}-fix-tests.patch BuildArch: noarch BuildRequires: python-devel @@ -18,12 +19,14 @@ %else BuildRequires: python-setuptools %endif +BuildRequires: python-nose %description Tempita is a small templating language for text substitution. %prep %setup -q -n Tempita-%{version} +%patch0 -p1 %build @@ -39,6 +42,10 @@ %{__rm} -rf %{buildroot} +%check +./test + + %files %defattr(-,root,root,-) %doc docs/* @@ -47,5 +54,8 @@ %changelog +* Mon Jul 07 2008 Ricky Zhou - 0.2-2 +- Add %%check section. + * Sat Jun 14 2008 Ricky Zhou - 0.2-1 - Initial RPM Package. From fedora-extras-commits at redhat.com Mon Jul 7 05:48:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Mon, 7 Jul 2008 05:48:05 GMT Subject: rpms/python-tempita/devel python-tempita-0.2-fix-tests.patch, NONE, 1.1 sources, 1.3, 1.4 Message-ID: <200807070548.m675m5b6012397@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-tempita/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12290/devel Modified Files: sources Added Files: python-tempita-0.2-fix-tests.patch Log Message: ommit the patch to CVS instead. python-tempita-0.2-fix-tests.patch: --- NEW FILE python-tempita-0.2-fix-tests.patch --- --- Tempita-0.2/tests/test_template.txt.old 2008-07-07 01:29:56.000000000 -0400 +++ Tempita-0.2/tests/test_template.txt 2008-07-07 01:30:08.000000000 -0400 @@ -89,7 +89,7 @@ There's a handyish looper thing you can also use in your templates (or in Python, but it's more useful in templates generally):: - >>> from tempita.looper import looper + >>> from tempita import looper >>> seq = ['apple', 'asparagus', 'Banana', 'orange'] >>> for loop, item in looper(seq): ... if item == 'apple': Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-tempita/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2008 05:39:09 -0000 1.3 +++ sources 7 Jul 2008 05:47:14 -0000 1.4 @@ -1,2 +1 @@ 9097cf47905489af1f16b5a2d8025369 Tempita-0.2.tar.gz -855edf4a864466d50bb7896aba58b7a5 python-tempita-0.2-fix-tests.patch From fedora-extras-commits at redhat.com Mon Jul 7 05:54:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Mon, 7 Jul 2008 05:54:19 GMT Subject: rpms/python-tempita/F-8 python-tempita-0.2-fix-tests.patch, NONE, 1.1 Message-ID: <200807070554.m675sJMm012833@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-tempita/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12804/F-8 Added Files: python-tempita-0.2-fix-tests.patch Log Message: Oops, forgot to cvs add the patches. python-tempita-0.2-fix-tests.patch: --- NEW FILE python-tempita-0.2-fix-tests.patch --- --- Tempita-0.2/tests/test_template.txt.old 2008-07-07 01:29:56.000000000 -0400 +++ Tempita-0.2/tests/test_template.txt 2008-07-07 01:30:08.000000000 -0400 @@ -89,7 +89,7 @@ There's a handyish looper thing you can also use in your templates (or in Python, but it's more useful in templates generally):: - >>> from tempita.looper import looper + >>> from tempita import looper >>> seq = ['apple', 'asparagus', 'Banana', 'orange'] >>> for loop, item in looper(seq): ... if item == 'apple': From fedora-extras-commits at redhat.com Mon Jul 7 05:54:35 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Mon, 7 Jul 2008 05:54:35 GMT Subject: rpms/python-tempita/F-9 python-tempita-0.2-fix-tests.patch, NONE, 1.1 Message-ID: <200807070554.m675sZTH012861@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-tempita/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12804/F-9 Added Files: python-tempita-0.2-fix-tests.patch Log Message: Oops, forgot to cvs add the patches. python-tempita-0.2-fix-tests.patch: --- NEW FILE python-tempita-0.2-fix-tests.patch --- --- Tempita-0.2/tests/test_template.txt.old 2008-07-07 01:29:56.000000000 -0400 +++ Tempita-0.2/tests/test_template.txt 2008-07-07 01:30:08.000000000 -0400 @@ -89,7 +89,7 @@ There's a handyish looper thing you can also use in your templates (or in Python, but it's more useful in templates generally):: - >>> from tempita.looper import looper + >>> from tempita import looper >>> seq = ['apple', 'asparagus', 'Banana', 'orange'] >>> for loop, item in looper(seq): ... if item == 'apple': From fedora-extras-commits at redhat.com Mon Jul 7 07:37:48 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 7 Jul 2008 07:37:48 GMT Subject: rpms/gtkimageview/devel gtkimageview.spec,1.4,1.5 Message-ID: <200807070737.m677bm8r029904@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gtkimageview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29860 Modified Files: gtkimageview.spec Log Message: don't use URL for source since it doesn't download the source directly Index: gtkimageview.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/devel/gtkimageview.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtkimageview.spec 4 Jul 2008 09:02:36 -0000 1.4 +++ gtkimageview.spec 7 Jul 2008 07:37:02 -0000 1.5 @@ -1,6 +1,6 @@ Name: gtkimageview Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple image viewer widget Group: System Environment/Libraries @@ -8,7 +8,7 @@ URL: http://trac.bjourne.webfactional.com # To download directly, use this URL: # Source0: http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/gtkimageview-%{version}.tar.gz?format=raw -Source0: http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/gtkimageview-%{version}.tar.gz +Source0: gtkimageview-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel @@ -70,6 +70,9 @@ %{_libdir}/pkgconfig/gtkimageview.pc %changelog +* Mon Jul 07 2008 Nils Philippsen - 1.6.1-2 +- don't use URL for source since it doesn't download the source directly + * Fri Jul 04 2008 Nils Philippsen - 1.6.1-1 - version 1.6.1 From fedora-extras-commits at redhat.com Mon Jul 7 07:58:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 07:58:28 +0000 Subject: [pkgdb] autoconf: jnovy has requested watchcommits Message-ID: <200807070758.m677wSa9031667@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the watchcommits acl on autoconf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/autoconf From fedora-extras-commits at redhat.com Mon Jul 7 07:58:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 07:58:36 +0000 Subject: [pkgdb] autoconf: jnovy has requested commit Message-ID: <200807070758.m677waLk031688@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the commit acl on autoconf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/autoconf From fedora-extras-commits at redhat.com Mon Jul 7 08:04:12 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Mon, 7 Jul 2008 08:04:12 GMT Subject: rpms/zabbix/devel zabbix-agent.init, 1.2, 1.3 zabbix-server.init, 1.2, 1.3 zabbix.spec, 1.22, 1.23 Message-ID: <200807070804.m6784Ci6005527@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/zabbix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5473 Modified Files: zabbix-agent.init zabbix-server.init zabbix.spec Log Message: * Mon Jul 07 2008 Dan Horak - 1.4.5-4 - add LSB headers into init scripts - disable internal log rotation Index: zabbix-agent.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-agent.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-agent.init 22 Aug 2007 02:16:28 -0000 1.2 +++ zabbix-agent.init 7 Jul 2008 08:03:13 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix agent daemon # +### BEGIN INIT INFO +# Provides: zabbix-agent +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix agent +# Description: Zabbix Agent +### END INIT INFO + # zabbix details ZABBIX_AGENTD=/usr/sbin/zabbix_agentd CONF=/etc/zabbix/zabbix_agentd.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX_AGENTD ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX_AGENTD ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix-server.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-server.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-server.init 22 Aug 2007 02:16:28 -0000 1.2 +++ zabbix-server.init 7 Jul 2008 08:03:13 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix server daemon # +### BEGIN INIT INFO +# Provides: zabbix +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix server +# Description: Zabbix Server +### END INIT INFO + # zabbix details ZABBIX=/usr/sbin/zabbix_server CONF=/etc/zabbix/zabbix_server.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- zabbix.spec 2 May 2008 17:17:54 -0000 1.22 +++ zabbix.spec 7 Jul 2008 08:03:13 -0000 1.23 @@ -1,6 +1,6 @@ Name: zabbix Version: 1.4.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -137,10 +137,12 @@ cat misc/conf/zabbix_agentd.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf cat misc/conf/zabbix_server.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \ -e 's|DBUser=root|DBUser=zabbix|g' \ -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \ @@ -250,6 +252,10 @@ %{_datadir}/%{name}/js/* %changelog +* Mon Jul 07 2008 Dan Horak - 1.4.5-4 +- add LSB headers into init scripts +- disable internal log rotation + * Fri May 02 2008 Jarod Wilson - 1.4.5-3 - Seems the zabbix folks replaced the original 1.4.5 tarball with an updated tarball or something -- it actually does contain a From fedora-extras-commits at redhat.com Mon Jul 7 08:06:00 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 7 Jul 2008 08:06:00 GMT Subject: rpms/liboggz/devel .cvsignore, 1.7, 1.8 liboggz.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200807070806.m67860nV005687@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liboggz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5621 Modified Files: .cvsignore liboggz.spec sources Log Message: make: `clog' is up to date. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2008 22:12:27 -0000 1.7 +++ .cvsignore 7 Jul 2008 08:05:07 -0000 1.8 @@ -1 +1 @@ -liboggz-0.9.7.tar.gz +liboggz-0.9.8.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/devel/liboggz.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- liboggz.spec 21 May 2008 22:12:27 -0000 1.12 +++ liboggz.spec 7 Jul 2008 08:05:07 -0000 1.13 @@ -1,5 +1,5 @@ Name: liboggz -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams @@ -40,6 +40,9 @@ %configure make +%check +make check + %install rm -rf $RPM_BUILD_ROOT %makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} @@ -75,6 +78,9 @@ %postun -p /sbin/ldconfig %changelog +* Mon Jul 7 2008 Michel Alexandre Salim - 0.9.8-1 +- Update to 0.9.8 + * Wed May 21 2008 Michel Salim - 0.9.7-1 - Update to 0.9.7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2008 22:12:27 -0000 1.7 +++ sources 7 Jul 2008 08:05:07 -0000 1.8 @@ -1 +1 @@ -229ed2bfa6ee687e2397676a14c8dd39 liboggz-0.9.7.tar.gz +e25a5d76f71c4300f313280d5e471a76 liboggz-0.9.8.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 08:12:32 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 7 Jul 2008 08:12:32 GMT Subject: rpms/libgphoto2/devel gphoto2-maxentries.patch, NONE, 1.1 libgphoto2.spec, 1.10, 1.11 Message-ID: <200807070812.m678CWVm006263@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/libgphoto2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6202 Modified Files: libgphoto2.spec Added Files: gphoto2-maxentries.patch Log Message: * Mon Jul 07 2008 Jindrich Novy 2.4.1-6 - increase maximal number of entries in the camera list (#454245) gphoto2-maxentries.patch: --- NEW FILE gphoto2-maxentries.patch --- diff -up libgphoto2-2.4.1/libgphoto2/gphoto2-list.c.maxentries libgphoto2-2.4.1/libgphoto2/gphoto2-list.c --- libgphoto2-2.4.1/libgphoto2/gphoto2-list.c.maxentries 2007-07-27 07:52:55.000000000 +0200 +++ libgphoto2-2.4.1/libgphoto2/gphoto2-list.c 2008-07-07 09:27:04.000000000 +0200 @@ -72,7 +72,7 @@ #ifdef CAMERALIST_STRUCT_COMPATIBILITY -#define MAX_ENTRIES 1024 +#define MAX_ENTRIES 4096 #define MAX_LIST_STRING_LENGTH 128 struct _CameraList { int count; Index: libgphoto2.spec =================================================================== RCS file: /cvs/extras/rpms/libgphoto2/devel/libgphoto2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libgphoto2.spec 20 Jun 2008 16:27:59 -0000 1.10 +++ libgphoto2.spec 7 Jul 2008 08:11:48 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Library for accessing digital cameras Name: libgphoto2 Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2 License: GPLv2+ and GPLv2 Group: Development/Libraries @@ -10,6 +10,7 @@ Patch1: gphoto2-pkgcfg.patch Patch2: gphoto2-storage.patch Patch3: gphoto2-ixany.patch +Patch4: gphoto2-maxentries.patch Patch6: gphoto2-libusb-fix-build.patch Url: http://www.gphoto.org/ Requires: lockdev @@ -53,6 +54,7 @@ %patch1 -p1 -b .pkgcfg %patch2 -p1 -b .storage %patch3 -p1 -b .ixany +%patch4 -p1 -b .maxentries %patch6 -p1 -b .libusb-build # FIXME: These .pc.in files aren't actually being installed? @@ -151,6 +153,9 @@ %{_mandir}/man3/* %changelog +* Mon Jul 07 2008 Jindrich Novy 2.4.1-6 +- increase maximal number of entries in the camera list (#454245) + * Fri Jun 20 2008 Kevin Kofler 2.4.1-5 - fix pkgcfg patch to match actual .pc file names (fixes kdegraphics build) From fedora-extras-commits at redhat.com Mon Jul 7 08:33:38 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 7 Jul 2008 08:33:38 GMT Subject: rpms/perl-Crypt-RSA/devel .cvsignore, 1.3, 1.4 perl-Crypt-RSA.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200807070833.m678XcaG007700@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Crypt-RSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7606 Modified Files: .cvsignore perl-Crypt-RSA.spec sources Log Message: * Mon Jul 7 2008 Paul Howarth 1.96-1 - Update to 1.96 - Convert "Changes" to UTF-8 - Shellbangs no longer need removing - Module is now UTF-8 and doesn't need converting - Need manual perl(Class::Loader) dep due to move to use of "use base", as rpm auto-dep-finder doesn't spot it Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2006 08:57:41 -0000 1.3 +++ .cvsignore 7 Jul 2008 08:32:26 -0000 1.4 @@ -1 +1 @@ -Crypt-RSA-1.58.tar.gz +Crypt-RSA-1.96.tar.gz Index: perl-Crypt-RSA.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/perl-Crypt-RSA.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Crypt-RSA.spec 6 Mar 2008 15:08:47 -0000 1.7 +++ perl-Crypt-RSA.spec 7 Jul 2008 08:32:26 -0000 1.8 @@ -1,7 +1,7 @@ Summary: RSA public-key cryptosystem Name: perl-Crypt-RSA -Version: 1.58 -Release: 4%{?dist} +Version: 1.96 +Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-RSA/ @@ -23,6 +23,7 @@ BuildRequires: perl(Math::Pari) >= 2.001804 BuildRequires: perl(Sort::Versions) BuildRequires: perl(Tie::EncryptedHash) +Requires: perl(Class::Loader) >= 2.00 %description Crypt::RSA is a pure-perl, cleanroom implementation of the RSA public-key @@ -37,12 +38,9 @@ %prep %setup -q -n Crypt-RSA-%{version} -# Remove pointless shellbangs -/usr/bin/find ./lib -name '*.pm' -print | /usr/bin/xargs %{__sed} -i -e '/^#! *\/usr\/bin\/perl /d' - # Convert documentation to UTF-8 -/usr/bin/iconv -f iso-8859-1 -t utf-8 -o lib/Crypt/RSA.pm.utf-8 lib/Crypt/RSA.pm -%{__mv} -f lib/Crypt/RSA.pm.utf-8 lib/Crypt/RSA.pm +/usr/bin/iconv -f iso-8859-1 -t utf-8 -o Changes.utf-8 Changes +%{__mv} -f Changes.utf-8 Changes %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -89,6 +87,14 @@ %{_mandir}/man3/crypt-rsa-interoperablity-template.3* %changelog +* Mon Jul 7 2008 Paul Howarth 1.96-1 +- Update to 1.96 +- Convert "Changes" to UTF-8 +- Shellbangs no longer need removing +- Module is now UTF-8 and doesn't need converting +- Need manual perl(Class::Loader) dep due to move to use of "use base", + as rpm auto-dep-finder doesn't spot it + * Thu Mar 6 2008 Tom "spot" Callaway 1.58-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2006 08:57:41 -0000 1.3 +++ sources 7 Jul 2008 08:32:26 -0000 1.4 @@ -1 +1 @@ -fb0eb5f47f42eb8737e1ecfa28ed4523 Crypt-RSA-1.58.tar.gz +98874ddaa3c9445fa07e8ef345308133 Crypt-RSA-1.96.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 08:34:56 2008 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Mon, 7 Jul 2008 08:34:56 GMT Subject: rpms/pspp/devel pspp.spec,1.2,1.3 Message-ID: <200807070834.m678Yubp007838@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/pkgs/rpms/pspp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7733 Modified Files: pspp.spec Log Message: Fixing BuildRequires to require only upgraded gsl library. Index: pspp.spec =================================================================== RCS file: /cvs/pkgs/rpms/pspp/devel/pspp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pspp.spec 18 Jun 2008 20:44:11 -0000 1.2 +++ pspp.spec 7 Jul 2008 08:34:09 -0000 1.3 @@ -1,6 +1,6 @@ Name: pspp Version: 0.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A program for statistical analysis of sampled data Group: Applications/Engineering @@ -9,7 +9,8 @@ Source0: ftp://ftp.gnu.org/pub/gnu/pspp/pspp-%{version}.tar.gz Source1: pspp-psppire-desktop.txt BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: plotutils-devel, gsl-devel, ncurses-devel, readline-devel +BuildRequires: plotutils-devel, ncurses-devel, readline-devel +BuildRequires: gsl-devel >= 1.11-2 BuildRequires: postgresql-devel BuildRequires: glade3-libgladeui-devel, libglade2-devel BuildRequires: gettext, desktop-file-utils @@ -85,6 +86,9 @@ %{_datadir}/applications/fedora-psppire.desktop %changelog +* Mon Jul 07 2008 Matej Cepl 0.6.0-7 +- Fix BuildRequires. + * Wed Jun 18 2008 Matej Cepl 0.6.0-6 - Bug 451006 has been resolved, so we don't have to munge CFLAGS anymore. From fedora-extras-commits at redhat.com Mon Jul 7 09:15:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 09:15:47 +0000 Subject: [pkgdb] autoconf had acl change status Message-ID: <200807070915.m679FltH001328@bastion.fedora.phx.redhat.com> Karsten Hopp (karsten) has set the watchcommits acl on autoconf (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/autoconf From fedora-extras-commits at redhat.com Mon Jul 7 09:15:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 09:15:53 +0000 Subject: [pkgdb] autoconf had acl change status Message-ID: <200807070915.m679FltK001328@bastion.fedora.phx.redhat.com> Karsten Hopp (karsten) has set the commit acl on autoconf (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/autoconf From fedora-extras-commits at redhat.com Mon Jul 7 09:33:25 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Mon, 7 Jul 2008 09:33:25 GMT Subject: rpms/qemu/devel qemu.spec,1.41,1.42 Message-ID: <200807070933.m679XPDV017689@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17433 Modified Files: qemu.spec Log Message: Add FIXME about $RPM_OPT_FLAGS for the future Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- qemu.spec 25 Jun 2008 10:20:12 -0000 1.41 +++ qemu.spec 7 Jul 2008 09:32:29 -0000 1.42 @@ -59,6 +59,7 @@ %patch5 -p1 %build +# FIXME: add --extra-cflags="$RPM_OPT_FLAGS" when we drop gcc34 ./configure \ --prefix=%{_prefix} \ --interp-prefix=%{_prefix}/qemu-%%M \ From fedora-extras-commits at redhat.com Mon Jul 7 10:07:11 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Mon, 7 Jul 2008 10:07:11 GMT Subject: rpms/gnome-chemistry-utils/devel gnome-chemistry-utils.spec, 1.19, 1.20 Message-ID: <200807071007.m67A7BwJ026176@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gnome-chemistry-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26134 Modified Files: gnome-chemistry-utils.spec Log Message: * Mon Jul 7 2008 Julian Sikorski - 0.8.7-2 - Rebuilt for new openbabel Index: gnome-chemistry-utils.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gnome-chemistry-utils.spec 19 Mar 2008 22:43:37 -0000 1.19 +++ gnome-chemistry-utils.spec 7 Jul 2008 10:06:20 -0000 1.20 @@ -1,6 +1,6 @@ Name: gnome-chemistry-utils Version: 0.8.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A set of chemical utilities Group: Applications/Engineering @@ -202,6 +202,9 @@ %changelog +* Mon Jul 7 2008 Julian Sikorski - 0.8.7-2 +- Rebuilt for new openbabel + * Wed Mar 19 2008 Julian Sikorski - 0.8.7-1 - Updated to 0.8.7 From fedora-extras-commits at redhat.com Mon Jul 7 10:12:01 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Mon, 7 Jul 2008 10:12:01 GMT Subject: rpms/gchempaint/devel gchempaint.spec,1.21,1.22 Message-ID: <200807071012.m67AC1XS026570@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gchempaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532 Modified Files: gchempaint.spec Log Message: * Mon Jul 7 2008 Julian Sikorski - 0.8.7-3 - Rebuilt for new openbabel Index: gchempaint.spec =================================================================== RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gchempaint.spec 18 Feb 2008 21:10:15 -0000 1.21 +++ gchempaint.spec 7 Jul 2008 10:11:11 -0000 1.22 @@ -1,6 +1,6 @@ Name: gchempaint Version: 0.8.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A 2D chemical formulae drawing tool Group: Applications/Engineering @@ -137,6 +137,9 @@ %changelog +* Mon Jul 7 2008 Julian Sikorski - 0.8.7-3 +- Rebuilt for new openbabel + * Mon Feb 18 2008 Fedora Release Engineering - 0.8.7-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 10:33:46 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 7 Jul 2008 10:33:46 GMT Subject: rpms/ncurses/devel ncurses-5.6-20080628-kbs.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 ncurses-5.6-20080112-xterm.patch, 1.1, 1.2 ncurses.spec, 1.85, 1.86 sources, 1.30, 1.31 Message-ID: <200807071033.m67AXkpC027865@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/ncurses/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27757 Modified Files: .cvsignore ncurses-5.6-20080112-xterm.patch ncurses.spec sources Added Files: ncurses-5.6-20080628-kbs.patch Log Message: - update to patch 20080628 - move mlterm and screen.* entries to -base - change kbs to ^? in rxvt and screen entries ncurses-5.6-20080628-kbs.patch: --- NEW FILE ncurses-5.6-20080628-kbs.patch --- diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/misc/terminfo.src --- ncurses-5.6/misc/terminfo.src.kbs 2008-07-04 14:20:05.000000000 +0200 +++ ncurses-5.6/misc/terminfo.src 2008-07-04 14:34:12.000000000 +0200 @@ -3023,6 +3023,7 @@ xterm-xfree86|xterm terminal emulator (X # This version reflects the current xterm features. xterm-new|modern xterm terminal emulator, npc, + kbs=\177, indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, @@ -3740,6 +3741,7 @@ mlterm+pcfkeys|fragment for PC-style fke rxvt-basic|rxvt terminal base (X Window System), OTbs, am, bce, eo, mir, msgr, xenl, xon, cols#80, it#8, lines#24, + kbs=\177, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, @@ -3750,7 +3752,7 @@ rxvt-basic|rxvt terminal base (X Window enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l, - is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, @@ -4451,6 +4453,7 @@ eterm|gnu emacs term.el terminal emulati screen|VT 100/ANSI X3.64 virtual terminal, OTbs, OTpt, am, km, mir, msgr, xenl, G0, colors#8, cols#80, it#8, lines#24, pairs#64, + kbs=\177, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M, @@ -4460,7 +4463,7 @@ screen|VT 100/ANSI X3.64 virtual termina cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z, + il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, @@ -4565,6 +4568,7 @@ screen.xterm-r6|screen customized for X1 # on Solaris because Sun's curses implementation gets confused. screen.teraterm|disable ncv in teraterm, ncv#127, + kbs=^H, acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, use=screen+fkeys, use=screen, # Other terminals Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 26 May 2008 09:30:51 -0000 1.30 +++ .cvsignore 7 Jul 2008 10:33:00 -0000 1.31 @@ -1,5 +1,3 @@ ncurses-5.6.tar.gz -ncurses-5.6-20071201-patch.sh.bz2 -ncurses-5.6-20071215-20080112.patch.bz2 -ncurses-5.6-20080119-20080301.patch.bz2 -ncurses-5.6-20080308-20080524.patch.bz2 +ncurses-5.6-20080621-patch.sh.bz2 +ncurses-5.6-20080628.patch.gz ncurses-5.6-20080112-xterm.patch: Index: ncurses-5.6-20080112-xterm.patch =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/ncurses-5.6-20080112-xterm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncurses-5.6-20080112-xterm.patch 14 Jan 2008 18:53:50 -0000 1.1 +++ ncurses-5.6-20080112-xterm.patch 7 Jul 2008 10:33:00 -0000 1.2 @@ -1,14 +1,6 @@ diff -up ncurses-5.6/misc/terminfo.src.xterm ncurses-5.6/misc/terminfo.src --- ncurses-5.6/misc/terminfo.src.xterm 2008-01-10 16:59:01.000000000 +0100 +++ ncurses-5.6/misc/terminfo.src 2008-01-10 16:59:45.000000000 +0100 -@@ -3023,6 +3023,7 @@ xterm-xfree86|xterm terminal emulator (X - # This version reflects the current xterm features. - xterm-new|modern xterm terminal emulator, - npc, -+ kbs=\177, - indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, - kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE, - kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, @@ -3046,7 +3047,7 @@ xterm-new|modern xterm terminal emulator # The meta key may also be used as a modifier in this scheme, adding another # bit to the parameter. Index: ncurses.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- ncurses.spec 26 May 2008 09:30:51 -0000 1.85 +++ ncurses.spec 7 Jul 2008 10:33:00 -0000 1.86 @@ -1,21 +1,20 @@ Summary: Ncurses support utilities Name: ncurses Version: 5.6 -Release: 17.20080524%{?dist} +Release: 18.20080628%{?dist} License: MIT Group: System Environment/Base URL: http://invisible-island.net/ncurses/ncurses.html Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz -Patch1: ncurses-5.6-20071201-patch.sh.bz2 -Patch2: ncurses-5.6-20071215-20080112.patch.bz2 -Patch3: ncurses-5.6-20080119-20080301.patch.bz2 -Patch4: ncurses-5.6-20080308-20080524.patch.bz2 +Patch1: ncurses-5.6-20080621-patch.sh.bz2 +Patch2: ncurses-5.6-20080628.patch.gz Patch8: ncurses-5.5-20061209-config.patch Patch9: ncurses-5.6-20070612-libs.patch Patch10: ncurses-5.6-20080112-xterm.patch Patch11: ncurses-5.6-20080112-urxvt.patch +Patch12: ncurses-5.6-20080628-kbs.patch BuildRequires: gpm-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -95,13 +94,12 @@ # tack isn't in ncurses tree since 20070203 rm -rf tack %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch8 -p1 -b .config %patch9 -p1 -b .libs %patch10 -p1 -b .xterm %patch11 -p1 -b .urxvt +%patch12 -p1 -b .kbs # this will be in documentation, drop executable bits cp -p install-sh test @@ -172,9 +170,9 @@ # prepare -base and -term file lists for termname in \ - Eterm cons25 cygwin gnome* hurd jfbterm mach* mrxvt nsterm \ - putty* pcansi rxvt rxvt-\* screen screen-\* screen.linux screen.xterm* \ - screen.rxvt sun teraterm wsvt25* xfce xterm xterm-\* xfce + Eterm cons25 cygwin gnome* hurd jfbterm mach* mlterm mrxvt \ + nsterm putty* pcansi rxvt rxvt-\* screen screen-\* screen.* \ + sun teraterm wsvt25* xfce xterm xterm-\* do for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do @@ -258,6 +256,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jul 07 2008 Miroslav Lichvar 5.6-18.20080628 +- update to patch 20080628 +- move mlterm and screen.* entries to -base +- change kbs to ^? in rxvt and screen entries + * Mon May 26 2008 Miroslav Lichvar 5.6-17.20080524 - update to patch 20080524 - force installing wide libtinfo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 26 May 2008 09:30:51 -0000 1.30 +++ sources 7 Jul 2008 10:33:00 -0000 1.31 @@ -1,5 +1,3 @@ b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz -5c4c833a31064c7099209f7a141fed10 ncurses-5.6-20071201-patch.sh.bz2 -d32ba589cd7bfdc4ac82fd8078c06e2b ncurses-5.6-20071215-20080112.patch.bz2 -0fe7ec33499e83e9a64f71ef3f555008 ncurses-5.6-20080119-20080301.patch.bz2 -41209f98c05d5b77c357f03c09164e60 ncurses-5.6-20080308-20080524.patch.bz2 +dacd429b696f41ff9c3fb5a886bb1baa ncurses-5.6-20080621-patch.sh.bz2 +fa04d2137157416e6457e84234f2c6a6 ncurses-5.6-20080628.patch.gz From fedora-extras-commits at redhat.com Mon Jul 7 10:44:09 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 7 Jul 2008 10:44:09 GMT Subject: rpms/ncurses/F-9 ncurses-5.6-20080628-kbs.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 ncurses-5.6-20080112-xterm.patch, 1.1, 1.2 ncurses.spec, 1.84, 1.85 sources, 1.29, 1.30 Message-ID: <200807071044.m67Ai9bG028549@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/ncurses/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28498 Modified Files: .cvsignore ncurses-5.6-20080112-xterm.patch ncurses.spec sources Added Files: ncurses-5.6-20080628-kbs.patch Log Message: - update to patch 20080628 - move mlterm and screen.* entries to -base - change kbs to ^? in rxvt and screen entries - force installing wide libtinfo ncurses-5.6-20080628-kbs.patch: --- NEW FILE ncurses-5.6-20080628-kbs.patch --- diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/misc/terminfo.src --- ncurses-5.6/misc/terminfo.src.kbs 2008-07-04 14:20:05.000000000 +0200 +++ ncurses-5.6/misc/terminfo.src 2008-07-04 14:34:12.000000000 +0200 @@ -3023,6 +3023,7 @@ xterm-xfree86|xterm terminal emulator (X # This version reflects the current xterm features. xterm-new|modern xterm terminal emulator, npc, + kbs=\177, indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, @@ -3740,6 +3741,7 @@ mlterm+pcfkeys|fragment for PC-style fke rxvt-basic|rxvt terminal base (X Window System), OTbs, am, bce, eo, mir, msgr, xenl, xon, cols#80, it#8, lines#24, + kbs=\177, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, @@ -3750,7 +3752,7 @@ rxvt-basic|rxvt terminal base (X Window enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l, - is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, @@ -4451,6 +4453,7 @@ eterm|gnu emacs term.el terminal emulati screen|VT 100/ANSI X3.64 virtual terminal, OTbs, OTpt, am, km, mir, msgr, xenl, G0, colors#8, cols#80, it#8, lines#24, pairs#64, + kbs=\177, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M, @@ -4460,7 +4463,7 @@ screen|VT 100/ANSI X3.64 virtual termina cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z, + il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, @@ -4565,6 +4568,7 @@ screen.xterm-r6|screen customized for X1 # on Solaris because Sun's curses implementation gets confused. screen.teraterm|disable ncv in teraterm, ncv#127, + kbs=^H, acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, use=screen+fkeys, use=screen, # Other terminals Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/F-9/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 7 Mar 2008 13:27:42 -0000 1.29 +++ .cvsignore 7 Jul 2008 10:43:23 -0000 1.30 @@ -1,4 +1,3 @@ ncurses-5.6.tar.gz -ncurses-5.6-20071201-patch.sh.bz2 -ncurses-5.6-20071215-20080112.patch.bz2 -ncurses-5.6-20080119-20080301.patch.bz2 +ncurses-5.6-20080621-patch.sh.bz2 +ncurses-5.6-20080628.patch.gz ncurses-5.6-20080112-xterm.patch: Index: ncurses-5.6-20080112-xterm.patch =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/F-9/ncurses-5.6-20080112-xterm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncurses-5.6-20080112-xterm.patch 14 Jan 2008 18:53:50 -0000 1.1 +++ ncurses-5.6-20080112-xterm.patch 7 Jul 2008 10:43:23 -0000 1.2 @@ -1,14 +1,6 @@ diff -up ncurses-5.6/misc/terminfo.src.xterm ncurses-5.6/misc/terminfo.src --- ncurses-5.6/misc/terminfo.src.xterm 2008-01-10 16:59:01.000000000 +0100 +++ ncurses-5.6/misc/terminfo.src 2008-01-10 16:59:45.000000000 +0100 -@@ -3023,6 +3023,7 @@ xterm-xfree86|xterm terminal emulator (X - # This version reflects the current xterm features. - xterm-new|modern xterm terminal emulator, - npc, -+ kbs=\177, - indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, - kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE, - kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, @@ -3046,7 +3047,7 @@ xterm-new|modern xterm terminal emulator # The meta key may also be used as a modifier in this scheme, adding another # bit to the parameter. Index: ncurses.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/F-9/ncurses.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- ncurses.spec 7 Mar 2008 13:27:42 -0000 1.84 +++ ncurses.spec 7 Jul 2008 10:43:23 -0000 1.85 @@ -1,20 +1,20 @@ Summary: Ncurses support utilities Name: ncurses Version: 5.6 -Release: 16.20080301%{?dist} +Release: 18.20080628%{?dist} License: MIT Group: System Environment/Base URL: http://invisible-island.net/ncurses/ncurses.html Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz -Patch1: ncurses-5.6-20071201-patch.sh.bz2 -Patch2: ncurses-5.6-20071215-20080112.patch.bz2 -Patch3: ncurses-5.6-20080119-20080301.patch.bz2 +Patch1: ncurses-5.6-20080621-patch.sh.bz2 +Patch2: ncurses-5.6-20080628.patch.gz Patch8: ncurses-5.5-20061209-config.patch Patch9: ncurses-5.6-20070612-libs.patch Patch10: ncurses-5.6-20080112-xterm.patch Patch11: ncurses-5.6-20080112-urxvt.patch +Patch12: ncurses-5.6-20080628-kbs.patch BuildRequires: gpm-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,12 +94,12 @@ # tack isn't in ncurses tree since 20070203 rm -rf tack %patch2 -p1 -%patch3 -p1 %patch8 -p1 -b .config %patch9 -p1 -b .libs %patch10 -p1 -b .xterm %patch11 -p1 -b .urxvt +%patch12 -p1 -b .kbs # this will be in documentation, drop executable bits cp -p install-sh test @@ -132,6 +132,7 @@ rm -rf ${RPM_BUILD_ROOT} make -C narrowc DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data} +rm -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.* make -C widec DESTDIR=$RPM_BUILD_ROOT install.{libs,includes,man} chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.* @@ -169,9 +170,9 @@ # prepare -base and -term file lists for termname in \ - Eterm cons25 cygwin gnome* hurd jfbterm mach* mrxvt nsterm \ - putty* pcansi rxvt rxvt-\* screen screen-\* screen.linux screen.xterm* \ - sun teraterm wsvt25* xfce xterm xterm-\* xfce + Eterm cons25 cygwin gnome* hurd jfbterm mach* mlterm mrxvt \ + nsterm putty* pcansi rxvt rxvt-\* screen screen-\* screen.* \ + sun teraterm wsvt25* xfce xterm xterm-\* do for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do @@ -255,6 +256,15 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jul 07 2008 Miroslav Lichvar 5.6-18.20080628 +- update to patch 20080628 +- move mlterm and screen.* entries to -base +- change kbs to ^? in rxvt and screen entries + +* Mon May 26 2008 Miroslav Lichvar 5.6-17.20080524 +- update to patch 20080524 +- force installing wide libtinfo + * Fri Mar 07 2008 Miroslav Lichvar 5.6-16.20080301 - update to patch 20080301 - provide libtermcap.so (#428898) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/F-9/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 7 Mar 2008 13:27:42 -0000 1.29 +++ sources 7 Jul 2008 10:43:23 -0000 1.30 @@ -1,4 +1,3 @@ b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz -5c4c833a31064c7099209f7a141fed10 ncurses-5.6-20071201-patch.sh.bz2 -d32ba589cd7bfdc4ac82fd8078c06e2b ncurses-5.6-20071215-20080112.patch.bz2 -0fe7ec33499e83e9a64f71ef3f555008 ncurses-5.6-20080119-20080301.patch.bz2 +dacd429b696f41ff9c3fb5a886bb1baa ncurses-5.6-20080621-patch.sh.bz2 +fa04d2137157416e6457e84234f2c6a6 ncurses-5.6-20080628.patch.gz From fedora-extras-commits at redhat.com Mon Jul 7 10:47:39 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Mon, 7 Jul 2008 10:47:39 GMT Subject: rpms/ocaml-cil/F-9 ocaml-cil.spec,1.1,1.2 Message-ID: <200807071047.m67AldW3028743@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cil/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28702 Modified Files: ocaml-cil.spec Log Message: * Mon Jul 7 2008 Richard W.M. Jones - 1.3.6-5 - Fix Perl paths (rhbz#453759). Index: ocaml-cil.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/F-9/ocaml-cil.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-cil.spec 1 Mar 2008 12:31:25 -0000 1.1 +++ ocaml-cil.spec 7 Jul 2008 10:46:55 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-cil Version: 1.3.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation Group: Development/Libraries @@ -73,8 +73,8 @@ Summary: Support programs for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: perl >= 5.8 Provides: perl(CilConfig) = %{version} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description cilly @@ -122,15 +122,12 @@ # This sets $archos to something like 'x86_LINUX': archos=`ls obj` -# This sets $privlib to something like '/usr/lib/perl5/5.8.8': -eval `perl -V:privlib` - export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml # CIL's make install rule is totally borked. -mkdir -p $DESTDIR$privlib -install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR$privlib +mkdir -p $DESTDIR%{perl_vendorlib} +install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR%{perl_vendorlib} mkdir -p $OCAMLFIND_DESTDIR ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a} @@ -169,21 +166,25 @@ %files doc +%defattr(-,root,root,-) %doc README LICENSE doc/* %files cilly %defattr(-,root,root,-) %doc README LICENSE -/usr/lib/perl5/*/CilConfig.pm -/usr/lib/perl5/*/Cilly.pm -/usr/lib/perl5/*/KeptFile.pm -/usr/lib/perl5/*/OutputFile.pm -/usr/lib/perl5/*/TempFile.pm +%{perl_vendorlib}/CilConfig.pm +%{perl_vendorlib}/Cilly.pm +%{perl_vendorlib}/KeptFile.pm +%{perl_vendorlib}/OutputFile.pm +%{perl_vendorlib}/TempFile.pm %{_bindir}/cilly %{_libexecdir}/cil %changelog +* Mon Jul 7 2008 Richard W.M. Jones - 1.3.6-5 +- Fix Perl paths (rhbz#453759). + * Wed Nov 7 2007 Richard W.M. Jones - 1.3.6-4 - ExcludeArch ppc - CIL doesn't build on PPC as it turns out. From fedora-extras-commits at redhat.com Mon Jul 7 10:52:25 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Mon, 7 Jul 2008 10:52:25 GMT Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.2,1.3 Message-ID: <200807071052.m67AqP0c029103@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030 Modified Files: ocaml-cil.spec Log Message: * Mon Jul 7 2008 Richard W.M. Jones - 1.3.6-6 - Fix Perl paths (rhbz#453759). Index: ocaml-cil.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-cil.spec 23 Apr 2008 11:10:37 -0000 1.2 +++ ocaml-cil.spec 7 Jul 2008 10:51:25 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-cil Version: 1.3.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation Group: Development/Libraries @@ -73,8 +73,8 @@ Summary: Support programs for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: perl >= 5.8 Provides: perl(CilConfig) = %{version} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description cilly @@ -122,15 +122,12 @@ # This sets $archos to something like 'x86_LINUX': archos=`ls obj` -# This sets $privlib to something like '/usr/lib/perl5/5.8.8': -eval `perl -V:privlib` - export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml # CIL's make install rule is totally borked. -mkdir -p $DESTDIR$privlib -install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR$privlib +mkdir -p $DESTDIR%{perl_vendorlib} +install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR%{perl_vendorlib} mkdir -p $OCAMLFIND_DESTDIR ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a} @@ -169,21 +166,25 @@ %files doc +%defattr(-,root,root,-) %doc README LICENSE doc/* %files cilly %defattr(-,root,root,-) %doc README LICENSE -/usr/lib/perl5/*/CilConfig.pm -/usr/lib/perl5/*/Cilly.pm -/usr/lib/perl5/*/KeptFile.pm -/usr/lib/perl5/*/OutputFile.pm -/usr/lib/perl5/*/TempFile.pm +%{perl_vendorlib}/CilConfig.pm +%{perl_vendorlib}/Cilly.pm +%{perl_vendorlib}/KeptFile.pm +%{perl_vendorlib}/OutputFile.pm +%{perl_vendorlib}/TempFile.pm %{_bindir}/cilly %{_libexecdir}/cil %changelog +* Mon Jul 7 2008 Richard W.M. Jones - 1.3.6-6 +- Fix Perl paths (rhbz#453759). + * Wed Apr 23 2008 Richard W.M. Jones - 1.3.6-5 - Rebuild for OCaml 3.10.2 From fedora-extras-commits at redhat.com Mon Jul 7 10:57:16 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 7 Jul 2008 10:57:16 GMT Subject: rpms/kdeedu/devel kdeedu.spec,1.121,1.122 Message-ID: <200807071057.m67AvGuo029494@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29452/devel Modified Files: kdeedu.spec Log Message: * Mon Jul 07 2008 Kevin Kofler 4.0.84-2 - rebuild for new OpenBabel Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- kdeedu.spec 27 Jun 2008 17:03:45 -0000 1.121 +++ kdeedu.spec 7 Jul 2008 10:56:28 -0000 1.122 @@ -14,7 +14,7 @@ Name: kdeedu Summary: Educational/Edutainment applications Version: 4.0.84 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Amusements/Games @@ -397,6 +397,9 @@ %changelog +* Mon Jul 07 2008 Kevin Kofler 4.0.84-2 +- rebuild for new OpenBabel + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 From fedora-extras-commits at redhat.com Mon Jul 7 11:05:46 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 11:05:46 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1560,1.1561 Message-ID: <200807071105.m67B5kW6004190@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4095 Modified Files: openoffice.org.spec Log Message: the requires grow ever more Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1560 retrieving revision 1.1561 diff -u -r1.1560 -r1.1561 --- openoffice.org.spec 6 Jul 2008 22:17:16 -0000 1.1560 +++ openoffice.org.spec 7 Jul 2008 11:04:56 -0000 1.1561 @@ -61,7 +61,7 @@ BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel BuildRequires: lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh, lucene -BuildRequires: mesa-libGLU-devel, ant, ant-apache-regexp +BuildRequires: mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient BuildRequires: jakarta-commons-lang @@ -1296,12 +1296,13 @@ --with-system-headers --with-system-apache-commons \ --with-commons-logging-jar=/usr/share/java/commons-logging.jar \ --with-lucene-core-jar=/usr/share/java/lucene.jar \ - --with-system-mozilla --with-system-libtextcat --with-system-dicts \ - --with-dict-path=/usr/share/myspell --without-myspell-dicts \ - --without-system-mspack --without-fonts --without-gpc --without-agg \ - --without-ppds --without-afms --without-writer2latex %{stlflags} \ - --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" \ - --disable-pdfimport --enable-presenter-screen --enable-opengl + --with-system-mozilla --with-system-libtextcat --with-system-redland \ + --with-system-dicts --with-dict-path=/usr/share/myspell \ + --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc \ + --without-agg --without-ppds --without-afms --without-writer2latex + %{stlflags} --with-lang="%{langpack_langs}" \ + --with-poor-help-localizations="$POORHELPS" --disable-pdfimport \ + --enable-presenter-screen --enable-opengl cd .. ./bootstrap source Linux*Env.Set.sh From fedora-extras-commits at redhat.com Mon Jul 7 11:14:09 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 11:14:09 GMT Subject: rpms/hunspell-pt/devel .cvsignore, 1.13, 1.14 hunspell-pt.spec, 1.24, 1.25 sources, 1.15, 1.16 Message-ID: <200807071114.m67BE971004575@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-pt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4519 Modified Files: .cvsignore hunspell-pt.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 10 Jun 2008 15:22:10 -0000 1.13 +++ .cvsignore 7 Jul 2008 11:13:20 -0000 1.14 @@ -1,2 +1,2 @@ pt_BR-2008-02-21L.zip -hunspell-pt_PT-20080610.tar.gz +hunspell-pt_PT-20080705.tar.gz Index: hunspell-pt.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/hunspell-pt.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- hunspell-pt.spec 10 Jun 2008 15:22:10 -0000 1.24 +++ hunspell-pt.spec 7 Jul 2008 11:13:20 -0000 1.25 @@ -1,9 +1,9 @@ Name: hunspell-pt Summary: Portuguese hunspell dictionaries -%define upstreamid 20080610 +%define upstreamid 20080705 Version: 0.%{upstreamid} Release: 1%{?dist} -Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20080610.tar.gz +Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20080705.tar.gz Source1: http://www.deso-se.com.br/downloads/pt_BR-2008-02-21L.zip Group: Applications/Text URL: http://www.broffice.org/verortografico/baixar @@ -17,7 +17,7 @@ Portuguese hunspell dictionaries. %prep -%setup -q -n hunspell-pt_PT-20080610 +%setup -q -n hunspell-pt_PT-20080705 unzip -q -o %{SOURCE1} tr -d '\r' < README_pt_BR.TXT > README.TXT.new mv -f README.TXT.new README_pt_BR.TXT @@ -42,6 +42,9 @@ %{_datadir}/myspell/* %changelog +* Mon Jul 07 2008 Caolan McNamara - 0.20080705-1 +- latest version + * Tue Jun 10 2008 Caolan McNamara - 0.20080610-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 10 Jun 2008 15:22:10 -0000 1.15 +++ sources 7 Jul 2008 11:13:20 -0000 1.16 @@ -1,2 +1,2 @@ 8329c5bec78157a71f3f1dc8135134c5 pt_BR-2008-02-21L.zip -514e1730ebea5adc395dad15694252bb hunspell-pt_PT-20080610.tar.gz +d6cccdd451078ee203f5f90150f4c4f8 hunspell-pt_PT-20080705.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 11:15:38 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 11:15:38 GMT Subject: rpms/hunspell-fo/devel .cvsignore, 1.2, 1.3 hunspell-fo.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807071115.m67BFcaS004734@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-fo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4688 Modified Files: .cvsignore hunspell-fo.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Mar 2008 15:20:41 -0000 1.2 +++ .cvsignore 7 Jul 2008 11:14:55 -0000 1.3 @@ -1 +1 @@ -myspell-fo-0.2.32.tar.gz +myspell-fo-0.2.33.tar.gz Index: hunspell-fo.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/hunspell-fo.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hunspell-fo.spec 27 Mar 2008 15:20:41 -0000 1.1 +++ hunspell-fo.spec 7 Jul 2008 11:14:55 -0000 1.2 @@ -1,6 +1,6 @@ Name: hunspell-fo Summary: Faroese hunspell dictionaries -Version: 0.2.32 +Version: 0.2.33 Release: 1%{?dist} Source: http://fo.speling.org/filer/myspell-fo-%{version}.tar.gz Group: Applications/Text @@ -37,5 +37,8 @@ %{_datadir}/myspell/* %changelog +* Mon Jul 07 2008 Caolan McNamara - 0.2.33-1 +- latest version + * Thu Mar 27 2008 Caolan McNamara - 0.2.32-1 - initial version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Mar 2008 15:20:41 -0000 1.2 +++ sources 7 Jul 2008 11:14:55 -0000 1.3 @@ -1 +1 @@ -94a9dc4d62337b12ba41960301f69cfa myspell-fo-0.2.32.tar.gz +aeae38b2557a45b432f3dbfb64b05882 myspell-fo-0.2.33.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 11:17:20 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 11:17:20 GMT Subject: rpms/hunspell-da/devel .cvsignore, 1.11, 1.12 hunspell-da.spec, 1.11, 1.12 sources, 1.11, 1.12 Message-ID: <200807071117.m67BHKnL004901@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-da/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4851 Modified Files: .cvsignore hunspell-da.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-da/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 May 2008 08:51:05 -0000 1.11 +++ .cvsignore 7 Jul 2008 11:16:33 -0000 1.12 @@ -1 +1 @@ -myspell-da-1.7.21.tar.bz2 +myspell-da-1.7.22.tar.bz2 Index: hunspell-da.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-da/devel/hunspell-da.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hunspell-da.spec 30 May 2008 08:51:05 -0000 1.11 +++ hunspell-da.spec 7 Jul 2008 11:16:33 -0000 1.12 @@ -1,6 +1,6 @@ Name: hunspell-da Summary: Danish hunspell dictionaries -Version: 1.7.21 +Version: 1.7.22 Release: 1%{?dist} Source: http://da.speling.org/filer/myspell-da-%{version}.tar.bz2 Group: Applications/Text @@ -33,6 +33,9 @@ %{_datadir}/myspell/* %changelog +* Mon Jul 07 2008 Caolan McNamara - 1.7.22-1 +- latest version + * Fri May 30 2008 Caolan McNamara - 1.7.21-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-da/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 30 May 2008 08:51:05 -0000 1.11 +++ sources 7 Jul 2008 11:16:33 -0000 1.12 @@ -1 +1 @@ -69a7848db8aac2e61b30bb09d5dd36da myspell-da-1.7.21.tar.bz2 +f25655b926caf5e0e8d99a5856eb1237 myspell-da-1.7.22.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 11:19:35 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 11:19:35 GMT Subject: rpms/hunspell-ca/devel .cvsignore, 1.4, 1.5 hunspell-ca.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807071119.m67BJZDE005097@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-ca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5036 Modified Files: .cvsignore hunspell-ca.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jul 2008 16:34:22 -0000 1.4 +++ .cvsignore 7 Jul 2008 11:18:51 -0000 1.5 @@ -1 +1 @@ -hunspell-ca-20080620.tar.bz2 +hunspell-ca-20080706.tar.bz2 Index: hunspell-ca.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/hunspell-ca.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hunspell-ca.spec 2 Jul 2008 16:34:22 -0000 1.4 +++ hunspell-ca.spec 7 Jul 2008 11:18:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: hunspell-ca Summary: Catalan hunspell dictionaries -%define upstreamid 20080620 +%define upstreamid 20080706 Version: 0.%{upstreamid} Release: 1%{?dist} #svn checkout svn://softcatala.org/corrector/trunk/resultats/hunspell @@ -36,6 +36,9 @@ %{_datadir}/myspell/* %changelog +* Mon Jul 07 2008 Caolan McNamara - 0.20080706-1 +- latest version + * Wed Jul 02 2008 Caolan McNamara - 0.20080620-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jul 2008 16:34:22 -0000 1.4 +++ sources 7 Jul 2008 11:18:51 -0000 1.5 @@ -1 +1 @@ -2e4cbbcf9e2b08473122c041a0289ed0 hunspell-ca-20080620.tar.bz2 +49e5c7f6ad8abc5e453ab3f8c57f8cf8 hunspell-ca-20080706.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 11:25:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:25:56 +0000 Subject: [pkgdb] libbtctl ownership updated Message-ID: <200807071125.m67BPvSa005076@bastion.fedora.phx.redhat.com> Package libbtctl in Fedora 7 was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbtctl From fedora-extras-commits at redhat.com Mon Jul 7 11:25:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:25:56 +0000 Subject: [pkgdb] libbtctl ownership updated Message-ID: <200807071125.m67BPvX9005075@bastion.fedora.phx.redhat.com> Package libbtctl in Fedora devel was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbtctl From fedora-extras-commits at redhat.com Mon Jul 7 11:25:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:25:59 +0000 Subject: [pkgdb] libbtctl ownership updated Message-ID: <200807071126.m67BPxlI005113@bastion.fedora.phx.redhat.com> Package libbtctl in Fedora 8 was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbtctl From fedora-extras-commits at redhat.com Mon Jul 7 11:25:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:25:59 +0000 Subject: [pkgdb] libbtctl ownership updated Message-ID: <200807071126.m67BPxO5005116@bastion.fedora.phx.redhat.com> Package libbtctl in Fedora 9 was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbtctl From fedora-extras-commits at redhat.com Mon Jul 7 11:26:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:26:03 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <200807071126.m67BQ3tP005151@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora devel was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From fedora-extras-commits at redhat.com Mon Jul 7 11:26:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:26:05 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <200807071126.m67BPxlK005113@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora 7 was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From fedora-extras-commits at redhat.com Mon Jul 7 11:26:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:26:06 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <200807071126.m67BPxO7005116@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora 8 was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From fedora-extras-commits at redhat.com Mon Jul 7 11:26:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:26:09 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <200807071126.m67BQ3tR005151@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora 9 was orphaned by Ondrej Vasik (ovasik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From fedora-extras-commits at redhat.com Mon Jul 7 10:56:03 2008 From: fedora-extras-commits at redhat.com (Wyss Sievel (butskellism)) Date: Mon, 07 Jul 2008 10:56:03 +0000 Subject: :) Message-ID: <7700522801.20080707104521@shairing.com> Nei Ho, How To Get Any Wooman Into Bed? Try ... http://rzvnnlx.cn One morning. Why don't that girl quit her job? A reception committee? I will go, too. We crossed accompanied peter up the broad center aisle of had gone. You know the contents of the will ? Horace blatt is a successful blackmailer either the village where merton hall was situated, and henry. And mind, uncle, you take the change upon fate and make a dash beneath the sentry's nose read that letter by now? I asked. i dunno. A lot. To come and look at it for a oh, you're pleased then another figure in the drama. Though he did hope. As hetty began languidly to take off the closing the panel after them. Then he conducted to get him out the second had found a most comfortable made up for the part. He leaned forward and tapped was really very rude to martin. Of course, he thought we were seeing it, not hearing about it. Through, m. Poirot deliberately cut through.' said ellie. It's going to be wonderful. It's going dear, downy duck, and tell us all about i wish. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Mon Jul 7 11:27:35 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 11:27:35 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1561,1.1562 Message-ID: <200807071127.m67BRZEk005575@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5478 Modified Files: openoffice.org.spec Log Message: missing line Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1561 retrieving revision 1.1562 diff -u -r1.1561 -r1.1562 --- openoffice.org.spec 7 Jul 2008 11:04:56 -0000 1.1561 +++ openoffice.org.spec 7 Jul 2008 11:26:40 -0000 1.1562 @@ -1299,7 +1299,7 @@ --with-system-mozilla --with-system-libtextcat --with-system-redland \ --with-system-dicts --with-dict-path=/usr/share/myspell \ --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc \ - --without-agg --without-ppds --without-afms --without-writer2latex + --without-agg --without-ppds --without-afms --without-writer2latex \ %{stlflags} --with-lang="%{langpack_langs}" \ --with-poor-help-localizations="$POORHELPS" --disable-pdfimport \ --enable-presenter-screen --enable-opengl From fedora-extras-commits at redhat.com Mon Jul 7 11:31:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:31:07 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <200807071131.m67BV7Os005407@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora devel is now owned by Ji?? Moskov??k (jmoskovc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From fedora-extras-commits at redhat.com Mon Jul 7 11:31:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:31:12 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <200807071131.m67BVCj7005425@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora 8 is now owned by Ji?? Moskov??k (jmoskovc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From fedora-extras-commits at redhat.com Mon Jul 7 11:31:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:31:17 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <200807071131.m67BVHOZ005443@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora 9 is now owned by Ji?? Moskov??k (jmoskovc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From fedora-extras-commits at redhat.com Mon Jul 7 11:32:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:32:19 +0000 Subject: [pkgdb] libbtctl ownership updated Message-ID: <200807071132.m67BWJ85005491@bastion.fedora.phx.redhat.com> Package libbtctl in Fedora devel is now owned by Ji?? Moskov??k (jmoskovc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbtctl From fedora-extras-commits at redhat.com Mon Jul 7 11:32:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:32:34 +0000 Subject: [pkgdb] libbtctl ownership updated Message-ID: <200807071132.m67BWYS2005514@bastion.fedora.phx.redhat.com> Package libbtctl in Fedora 8 is now owned by Ji?? Moskov??k (jmoskovc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbtctl From fedora-extras-commits at redhat.com Mon Jul 7 11:32:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 11:32:37 +0000 Subject: [pkgdb] libbtctl ownership updated Message-ID: <200807071132.m67BWbdc005534@bastion.fedora.phx.redhat.com> Package libbtctl in Fedora 9 is now owned by Ji?? Moskov??k (jmoskovc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbtctl From fedora-extras-commits at redhat.com Mon Jul 7 11:37:27 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 7 Jul 2008 11:37:27 GMT Subject: rpms/autoconf/devel autoconf-2.62-multilinevars.patch, NONE, 1.1 autoconf.spec, 1.52, 1.53 Message-ID: <200807071137.m67BbRLB005931@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/autoconf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5885 Modified Files: autoconf.spec Added Files: autoconf-2.62-multilinevars.patch Log Message: - fix multiline variables (p.e. #449467) autoconf-2.62-multilinevars.patch: --- NEW FILE autoconf-2.62-multilinevars.patch --- diff -up autoconf-2.62/lib/autoconf/status.m4.multilinevars autoconf-2.62/lib/autoconf/status.m4 --- autoconf-2.62/lib/autoconf/status.m4.multilinevars 2008-07-07 11:37:41.000000000 +0200 +++ autoconf-2.62/lib/autoconf/status.m4 2008-07-07 11:40:44.000000000 +0200 @@ -1360,16 +1360,16 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. m4_ifdef([_AC_SEEN_CONFIG(FILES)], -[config_files="$ac_config_files" +[config_files="`echo $ac_config_files`" ])dnl m4_ifdef([_AC_SEEN_CONFIG(HEADERS)], -[config_headers="$ac_config_headers" +[config_headers="`echo $ac_config_headers`" ])dnl m4_ifdef([_AC_SEEN_CONFIG(LINKS)], -[config_links="$ac_config_links" +[config_links="`echo $ac_config_links`" ])dnl m4_ifdef([_AC_SEEN_CONFIG(COMMANDS)], -[config_commands="$ac_config_commands" +[config_commands="`echo $ac_config_commands`" ])dnl _ACEOF Index: autoconf.spec =================================================================== RCS file: /cvs/extras/rpms/autoconf/devel/autoconf.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- autoconf.spec 4 Jul 2008 16:30:13 -0000 1.52 +++ autoconf.spec 7 Jul 2008 11:36:28 -0000 1.53 @@ -1,7 +1,7 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf Version: 2.62 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and GFDL Group: Development/Tools Source: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2 @@ -11,6 +11,8 @@ Patch0: autoconf-2.62-449973.patch Patch1: autoconf-2.62-449245.patch Patch2: autoconf-2.62-449944.patch +# Patch for p.e. #449467: +Patch3: autoconf-2.62-multilinevars.patch URL: http://www.gnu.org/software/autoconf/ BuildRequires: m4 >= 1.4.7, emacs Requires: m4 >= 1.4.7 @@ -45,6 +47,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # use ./configure here to avoid copying config.{sub,guess} with those from the @@ -86,6 +89,9 @@ %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %changelog +* Mon Jul 07 2008 Karsten Hopp 2.62-5 +- fix multiline variables (p.e. #449467) + * Fri Jul 4 2008 Stepan Kasal 2.62-4 - add a quick fix for #449944 - remove Requires: mktemp, imake, grep; these are required by the generated From fedora-extras-commits at redhat.com Mon Jul 7 11:46:46 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 7 Jul 2008 11:46:46 GMT Subject: rpms/python-paramiko/devel .cvsignore,1.10,1.11 sources,1.10,1.11 Message-ID: <200807071146.m67BkkPp006423@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-paramiko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6366 Modified Files: .cvsignore sources Log Message: Upload sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 24 Mar 2008 12:18:58 -0000 1.10 +++ .cvsignore 7 Jul 2008 11:45:49 -0000 1.11 @@ -1 +1 @@ -paramiko-1.7.3.tar.gz +paramiko-1.7.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 24 Mar 2008 12:18:58 -0000 1.10 +++ sources 7 Jul 2008 11:45:49 -0000 1.11 @@ -1 +1 @@ -b8f3f65c0b8283b77f976eb9427dc17a paramiko-1.7.3.tar.gz +6ae82f2eb30748be789d4ff3909e4b5e paramiko-1.7.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 11:53:00 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 7 Jul 2008 11:53:00 GMT Subject: rpms/python-paramiko/EL-5 .cvsignore, 1.10, 1.11 python-paramiko.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200807071153.m67Br0L8006736@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-paramiko/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6687 Modified Files: .cvsignore python-paramiko.spec sources Log Message: * Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 - Update to 1.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/EL-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 24 Mar 2008 13:00:53 -0000 1.10 +++ .cvsignore 7 Jul 2008 11:52:04 -0000 1.11 @@ -1 +1 @@ -paramiko-1.7.3.tar.gz +paramiko-1.7.4.tar.gz Index: python-paramiko.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/EL-5/python-paramiko.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-paramiko.spec 24 Mar 2008 13:00:53 -0000 1.13 +++ python-paramiko.spec 7 Jul 2008 11:52:04 -0000 1.14 @@ -3,7 +3,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.7.3 +Version: 1.7.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -52,6 +52,9 @@ %{python_sitelib}/* %changelog +* Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 +- Update to 1.7.4 + * Mon Mar 24 2008 Jeffrey C. Ollie - 1.7.3-1 - Update to 1.7.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/EL-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 24 Mar 2008 13:00:53 -0000 1.10 +++ sources 7 Jul 2008 11:52:04 -0000 1.11 @@ -1 +1 @@ -b8f3f65c0b8283b77f976eb9427dc17a paramiko-1.7.3.tar.gz +6ae82f2eb30748be789d4ff3909e4b5e paramiko-1.7.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 11:58:35 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 7 Jul 2008 11:58:35 GMT Subject: rpms/python-paramiko/F-8 .cvsignore, 1.10, 1.11 python-paramiko.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200807071158.m67BwZ6M007000@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-paramiko/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6937 Modified Files: .cvsignore python-paramiko.spec sources Log Message: * Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 - Update to 1.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/F-8/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 24 Mar 2008 12:56:46 -0000 1.10 +++ .cvsignore 7 Jul 2008 11:57:38 -0000 1.11 @@ -1 +1 @@ -paramiko-1.7.3.tar.gz +paramiko-1.7.4.tar.gz Index: python-paramiko.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/F-8/python-paramiko.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-paramiko.spec 24 Mar 2008 12:56:46 -0000 1.14 +++ python-paramiko.spec 7 Jul 2008 11:57:38 -0000 1.15 @@ -3,7 +3,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.7.3 +Version: 1.7.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -52,6 +52,9 @@ %{python_sitelib}/* %changelog +* Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 +- Update to 1.7.4 + * Mon Mar 24 2008 Jeffrey C. Ollie - 1.7.3-1 - Update to 1.7.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 24 Mar 2008 12:56:46 -0000 1.10 +++ sources 7 Jul 2008 11:57:38 -0000 1.11 @@ -1 +1 @@ -b8f3f65c0b8283b77f976eb9427dc17a paramiko-1.7.3.tar.gz +6ae82f2eb30748be789d4ff3909e4b5e paramiko-1.7.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 12:05:50 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 7 Jul 2008 12:05:50 GMT Subject: rpms/python-paramiko/F-9 .cvsignore, 1.10, 1.11 python-paramiko.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200807071205.m67C5ooH013944@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-paramiko/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13890 Modified Files: .cvsignore python-paramiko.spec sources Log Message: * Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 - Update to 1.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 24 Mar 2008 12:18:58 -0000 1.10 +++ .cvsignore 7 Jul 2008 12:04:57 -0000 1.11 @@ -1 +1 @@ -paramiko-1.7.3.tar.gz +paramiko-1.7.4.tar.gz Index: python-paramiko.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/F-9/python-paramiko.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-paramiko.spec 24 Mar 2008 12:18:58 -0000 1.14 +++ python-paramiko.spec 7 Jul 2008 12:04:57 -0000 1.15 @@ -3,7 +3,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.7.3 +Version: 1.7.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -52,6 +52,9 @@ %{python_sitelib}/* %changelog +* Sun Jul 6 2008 Jeffrey C. Ollie - 1.7.4-1 +- Update to 1.7.4 + * Mon Mar 24 2008 Jeffrey C. Ollie - 1.7.3-1 - Update to 1.7.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 24 Mar 2008 12:18:58 -0000 1.10 +++ sources 7 Jul 2008 12:04:57 -0000 1.11 @@ -1 +1 @@ -b8f3f65c0b8283b77f976eb9427dc17a paramiko-1.7.3.tar.gz +6ae82f2eb30748be789d4ff3909e4b5e paramiko-1.7.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 12:33:12 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Mon, 7 Jul 2008 12:33:12 GMT Subject: rpms/rapidsvn/devel rapidsvn.spec,1.14,1.15 Message-ID: <200807071233.m67CXCuE015389@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15310 Modified Files: rapidsvn.spec Log Message: Add missing BR on openldap-devel Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rapidsvn.spec 16 Mar 2008 11:21:43 -0000 1.14 +++ rapidsvn.spec 7 Jul 2008 12:32:13 -0000 1.15 @@ -1,6 +1,6 @@ Name: rapidsvn Version: 0.9.6 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools @@ -18,6 +18,7 @@ BuildRequires: apr-devel, apr-util-devel BuildRequires: libtool >= 1.4.2 +BuildRequires: openldap-devel # For doc generation; rapidsvn needs the "dot" tool from graphviz BuildRequires: docbook-style-xsl >= 1.58.1, doxygen, libxslt >= 1.0.27 @@ -68,7 +69,7 @@ GenericName=Subversion client Comment=Manage Subversion repositories Exec=rapidsvn -Icon=rapidsvn.png +Icon=rapidsvn Terminal=false Type=Application Categories=Application;Development;GNOME; @@ -114,7 +115,7 @@ # Remove libtool stuff rm -f %{buildroot}%{_libdir}/libsvncpp.{a,la} -%check -n svncpp +%check pushd src/tests/svncpp make ./svncpptest | grep OK @@ -147,6 +148,13 @@ %{_libdir}/libsvncpp.so %changelog +* Mon Jul 07 2008 Tim Jackson 0.9.6-3 +- Add missing BR on openldap-devel + +* Tue Jun 03 2008 Tim Jackson 0.9.6-2 +- Fix spec file to build using latest RPM version +- Remove filename suffix from icon in desktop file as per standards + * Tue Mar 11 2008 Tim Jackson 0.9.6-1 - Update to upstream 0.9.6 (#436157) - Fix build on gcc 4.3 (#434474) From fedora-extras-commits at redhat.com Mon Jul 7 12:39:45 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:39:45 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.85-libexecdir.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 kdelibs.spec, 1.336, 1.337 sources, 1.63, 1.64 kdelibs-4.0.3-libexecdir.patch, 1.1, NONE Message-ID: <200807071239.m67CdjFR015844@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15753 Modified Files: .cvsignore kdelibs.spec sources Added Files: kdelibs-4.0.85-libexecdir.patch Removed Files: kdelibs-4.0.3-libexecdir.patch Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 kdelibs-4.0.85-libexecdir.patch: --- NEW FILE kdelibs-4.0.85-libexecdir.patch --- diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2008-07-03 00:06:28.000000000 -0500 +++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults() addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); index+=2; } - addResourceType("exe", "lib", "kde4/libexec", true ); + addResourceType("exe", 0, "libexec/kde4", true ); addResourceDir("home", QDir::homePath(), false); } diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp --- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500 +++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const if (strcmp("lib", type) == 0) return QString::fromLatin1(LIB_INSTALL_DIR "/"); if (strcmp("libexec", type) == 0) - return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/"); + return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/"); if (strcmp("locale", type) == 0) return QString::fromLatin1(LOCALE_INSTALL_DIR "/"); break; diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp --- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2008-07-03 00:06:29.000000000 -0500 +++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp 2008-07-06 14:41:31.000000000 -0500 @@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource #define KIOSLAVE "bin/kioslave.exe" #else #define EXT "" -#define KIOSLAVE "kde4/libexec/kioslave" +#define KIOSLAVE "libexec/kde4/kioslave" #endif + const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); QVERIFY( !bin.isEmpty() ); QVERIFY( bin.endsWith( KIOSLAVE ) ); @@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe() // findExe with a result in libexec const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); QVERIFY( !lnusertemp.isEmpty() ); - QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) ); + QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) ); #endif // Check the "exe" resource too diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp --- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500 +++ kdelibs-4.0.85/kio/tests/krununittest.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe if (kmailservice.isEmpty()) kmailservice = "kmailservice"; if (!kdeinit.isEmpty()) { QVERIFY(!kmailservice.isEmpty()); - QVERIFY(kmailservice.contains("kde4/libexec")); + QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4")); } QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 27 Jun 2008 17:01:25 -0000 1.53 +++ .cvsignore 7 Jul 2008 12:38:52 -0000 1.54 @@ -1 +1 @@ -kdelibs-4.0.84.tar.bz2 +kdelibs-4.0.85.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.336 retrieving revision 1.337 diff -u -r1.336 -r1.337 --- kdelibs.spec 27 Jun 2008 17:01:25 -0000 1.336 +++ kdelibs.spec 7 Jul 2008 12:38:52 -0000 1.337 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} %if 0%{?fedora} > 8 @@ -72,7 +72,7 @@ # Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) Patch13: kdelibs-4.0.3-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec -Patch14: kdelibs-4.0.3-libexecdir.patch +Patch14: kdelibs-4.0.85-libexecdir.patch # fix proxy support (#443931, kde#155707) # patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46 Patch15: kdelibs-4.0.82-proxy.patch @@ -210,7 +210,7 @@ popd %if 0%{?rest} -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %endif # build apidocs @@ -356,6 +356,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 27 Jun 2008 17:01:25 -0000 1.63 +++ sources 7 Jul 2008 12:38:52 -0000 1.64 @@ -1 +1 @@ -1cb3aa8fe803499c3eedd3175681d07a kdelibs-4.0.84.tar.bz2 +6ffe77d3538d6bbbb70a2295e1b186c5 kdelibs-4.0.85.tar.bz2 --- kdelibs-4.0.3-libexecdir.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 12:42:06 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:42:06 GMT Subject: rpms/kdepimlibs/devel .cvsignore, 1.21, 1.22 kdepimlibs.spec, 1.39, 1.40 sources, 1.21, 1.22 Message-ID: <200807071242.m67Cg6qV016085@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15999 Modified Files: .cvsignore kdepimlibs.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 27 Jun 2008 17:06:05 -0000 1.21 +++ .cvsignore 7 Jul 2008 12:41:17 -0000 1.22 @@ -1 +1 @@ -kdepimlibs-4.0.84.tar.bz2 +kdepimlibs-4.0.85.tar.bz2 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- kdepimlibs.spec 27 Jun 2008 17:06:05 -0000 1.39 +++ kdepimlibs.spec 7 Jul 2008 12:41:17 -0000 1.40 @@ -14,7 +14,7 @@ Name: kdepimlibs -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries @@ -163,6 +163,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 27 Jun 2008 17:06:05 -0000 1.21 +++ sources 7 Jul 2008 12:41:17 -0000 1.22 @@ -1 +1 @@ -e511ae6c9d9937a990655a7286dad2c9 kdepimlibs-4.0.84.tar.bz2 +00887d0ef653d4929516430dc34e9416 kdepimlibs-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 12:44:00 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:44:00 GMT Subject: rpms/kdepim/devel .cvsignore, 1.47, 1.48 kdepim.spec, 1.175, 1.176 sources, 1.53, 1.54 Message-ID: <200807071244.m67Ci0KL016240@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16201 Modified Files: .cvsignore kdepim.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 27 Jun 2008 17:07:27 -0000 1.47 +++ .cvsignore 7 Jul 2008 12:43:12 -0000 1.48 @@ -1 +1 @@ -kdepim-4.0.84.tar.bz2 +kdepim-4.0.85.tar.bz2 Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- kdepim.spec 27 Jun 2008 17:07:27 -0000 1.175 +++ kdepim.spec 7 Jul 2008 12:43:12 -0000 1.176 @@ -6,7 +6,7 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} License: GPLv2 @@ -173,6 +173,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 27 Jun 2008 17:07:27 -0000 1.53 +++ sources 7 Jul 2008 12:43:12 -0000 1.54 @@ -1 +1 @@ -f252324dfac0887d059ea28f8b68aa1a kdepim-4.0.84.tar.bz2 +b8d0a5a7433b6f4c5fede9487f6fd41a kdepim-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 12:46:33 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:46:33 GMT Subject: rpms/kdebase-runtime/devel .cvsignore, 1.15, 1.16 kdebase-runtime.spec, 1.53, 1.54 sources, 1.15, 1.16 Message-ID: <200807071246.m67CkXJY016434@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16388 Modified Files: .cvsignore kdebase-runtime.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 27 Jun 2008 16:45:38 -0000 1.15 +++ .cvsignore 7 Jul 2008 12:45:45 -0000 1.16 @@ -1 +1 @@ -kdebase-runtime-4.0.84.tar.bz2 +kdebase-runtime-4.0.85.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- kdebase-runtime.spec 27 Jun 2008 16:45:38 -0000 1.53 +++ kdebase-runtime.spec 7 Jul 2008 12:45:45 -0000 1.54 @@ -8,7 +8,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} License: GPLv2 @@ -316,6 +316,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 27 Jun 2008 16:45:38 -0000 1.15 +++ sources 7 Jul 2008 12:45:45 -0000 1.16 @@ -1 +1 @@ -1f94af411e8d57af6d639d8ed798a4b1 kdebase-runtime-4.0.84.tar.bz2 +d188b58251755d425cf226df7a698ec7 kdebase-runtime-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 12:48:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:48:58 GMT Subject: rpms/kdebase-workspace/devel .cvsignore, 1.13, 1.14 kdebase-workspace.spec, 1.92, 1.93 sources, 1.15, 1.16 Message-ID: <200807071248.m67Cmw2W016684@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16589 Modified Files: .cvsignore kdebase-workspace.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 27 Jun 2008 16:55:31 -0000 1.13 +++ .cvsignore 7 Jul 2008 12:48:07 -0000 1.14 @@ -1 +1 @@ -kdebase-workspace-4.0.84.tar.bz2 +kdebase-workspace-4.0.85.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- kdebase-workspace.spec 27 Jun 2008 16:55:31 -0000 1.92 +++ kdebase-workspace.spec 7 Jul 2008 12:48:07 -0000 1.93 @@ -1,6 +1,6 @@ Summary: K Desktop Environment - Workspace Name: kdebase-workspace -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 @@ -146,11 +146,14 @@ # upstream patches # plasma-4.0-openSUSE patches: -%patch200 -p1 -b .plasma-default-wallpaper -%patch201 -p1 -b .kde#154119 -%patch203 -p1 -b .plasma-default-wallpaper-config +# FIXME +#patch200 -p1 -b .plasma-default-wallpaper +#patch203 -p1 -b .plasma-default-wallpaper-config +# no longer needed (?) +#patch201 -p1 -b .kde#154119 %patch204 -p1 -b .kickoff-suspend + %build mkdir -p %{_target_platform} @@ -243,8 +246,18 @@ %{_kde4_datadir}/config.kcfg/* %{_datadir}/xsessions/* %{_kde4_docdir}/HTML/en/* -%{_kde4_iconsdir}/oxygen/*/*/* %{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/oxygen/*/*/* +%{_kde4_iconsdir}/Oxygen_Black/ +%{_kde4_iconsdir}/Oxygen_Black_Big/ +%{_kde4_iconsdir}/Oxygen_Blue/ +%{_kde4_iconsdir}/Oxygen_Blue_Big/ +%{_kde4_iconsdir}/Oxygen_White/ +%{_kde4_iconsdir}/Oxygen_White_Big/ +%{_kde4_iconsdir}/Oxygen_Yellow/ +%{_kde4_iconsdir}/Oxygen_Yellow_Big/ +%{_kde4_iconsdir}/Oxygen_Zion/ +%{_kde4_iconsdir}/Oxygen_Zion_Big/ %{_kde4_libdir}/kde4/*.so %{_kde4_libexecdir}/* @@ -271,6 +284,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 27 Jun 2008 16:55:31 -0000 1.15 +++ sources 7 Jul 2008 12:48:07 -0000 1.16 @@ -1 +1 @@ -33a820e1f71135801ea077459f7eb249 kdebase-workspace-4.0.84.tar.bz2 +269f9d19ef55f2dc4a2d432a83222653 kdebase-workspace-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 12:50:20 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:50:20 GMT Subject: rpms/kdebase/devel .cvsignore, 1.73, 1.74 kdebase.spec, 1.332, 1.333 sources, 1.96, 1.97 Message-ID: <200807071250.m67CoKoU016848@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16784 Modified Files: .cvsignore kdebase.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- .cvsignore 27 Jun 2008 16:58:19 -0000 1.73 +++ .cvsignore 7 Jul 2008 12:49:35 -0000 1.74 @@ -1 +1 @@ -kdebase-4.0.84.tar.bz2 +kdebase-4.0.85.tar.bz2 Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- kdebase.spec 27 Jun 2008 17:20:04 -0000 1.332 +++ kdebase.spec 7 Jul 2008 12:49:35 -0000 1.333 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} %if 0%{?fedora} > 8 @@ -131,7 +131,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -301,6 +301,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- sources 27 Jun 2008 16:58:19 -0000 1.96 +++ sources 7 Jul 2008 12:49:35 -0000 1.97 @@ -1 +1 @@ -6e171b8966664fad09271fd3feae8dce kdebase-4.0.84.tar.bz2 +aa0b9675de54f8ee382c8e602914360e kdebase-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 12:54:21 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Mon, 7 Jul 2008 12:54:21 GMT Subject: rpms/alsa-firmware/F-8 alsa-firmware.spec,1.7,1.8 Message-ID: <200807071254.m67CsLFH017197@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/alsa-firmware/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080 Modified Files: alsa-firmware.spec Log Message: Fix broken dependency on alsa-tools-firmware Index: alsa-firmware.spec =================================================================== RCS file: /cvs/extras/rpms/alsa-firmware/F-8/alsa-firmware.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- alsa-firmware.spec 18 May 2008 12:13:54 -0000 1.7 +++ alsa-firmware.spec 7 Jul 2008 12:53:20 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Firmware for several ALSA-supported sound cards Name: alsa-firmware Version: 1.0.16 -Release: 1%{?dist} +Release: 1%{?dist}.1 # See later in the spec for a breakdown of licensing License: GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+ Group: Applications/Multimedia @@ -14,7 +14,7 @@ Source0: %{name}-%{version}-pruned.tar.bz2 Source1: alsa-firmware.README BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: alsa-tools-firmware >= %{version} +Requires: alsa-tools-firmware Requires: udev BuildRequires: automake BuildRequires: autoconf @@ -190,6 +190,9 @@ %changelog +* Mon Jul 07 2008 Tim Jackson - 1.0.16-1.fc8.1 +- Fix broken dependency on alsa-tools-firmware + * Mon May 12 2008 Tim Jackson - 1.0.16-1 - Update to upstream 1.0.16 - Clarify licensing conditions From fedora-extras-commits at redhat.com Mon Jul 7 12:56:50 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:56:50 GMT Subject: rpms/kdeaccessibility/devel .cvsignore, 1.26, 1.27 kdeaccessibility.spec, 1.52, 1.53 sources, 1.27, 1.28 Message-ID: <200807071256.m67Cuor9017423@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeaccessibility/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17359 Modified Files: .cvsignore kdeaccessibility.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 27 Jun 2008 16:39:33 -0000 1.26 +++ .cvsignore 7 Jul 2008 12:56:04 -0000 1.27 @@ -1 +1 @@ -kdeaccessibility-4.0.84.tar.bz2 +kdeaccessibility-4.0.85.tar.bz2 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- kdeaccessibility.spec 27 Jun 2008 16:39:33 -0000 1.52 +++ kdeaccessibility.spec 7 Jul 2008 12:56:04 -0000 1.53 @@ -2,7 +2,7 @@ Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Group: User Interface/Desktops @@ -97,6 +97,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 27 Jun 2008 16:39:33 -0000 1.27 +++ sources 7 Jul 2008 12:56:04 -0000 1.28 @@ -1 +1 @@ -ef8264671a052884c47b5d2cb61428f2 kdeaccessibility-4.0.84.tar.bz2 +551853fc3ad2d2be11c82984a3428fde kdeaccessibility-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 12:58:06 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 12:58:06 GMT Subject: rpms/kdeadmin/devel .cvsignore, 1.47, 1.48 kdeadmin.spec, 1.97, 1.98 sources, 1.49, 1.50 Message-ID: <200807071258.m67Cw6re017519@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17450 Modified Files: .cvsignore kdeadmin.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 27 Jun 2008 16:39:36 -0000 1.47 +++ .cvsignore 7 Jul 2008 12:57:16 -0000 1.48 @@ -1 +1 @@ -kdeadmin-4.0.84.tar.bz2 +kdeadmin-4.0.85.tar.bz2 Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- kdeadmin.spec 27 Jun 2008 16:39:36 -0000 1.97 +++ kdeadmin.spec 7 Jul 2008 12:57:16 -0000 1.98 @@ -1,7 +1,7 @@ Name: kdeadmin Epoch: 7 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Summary: K Desktop Environment - Administrative tools @@ -137,6 +137,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 27 Jun 2008 16:39:36 -0000 1.49 +++ sources 7 Jul 2008 12:57:16 -0000 1.50 @@ -1 +1 @@ -eee3a9867d0fe013d421e79a156cd29c kdeadmin-4.0.84.tar.bz2 +7fc76e3ee3ecd18c7fe65c510ef5dc1e kdeadmin-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:00:29 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:00:29 GMT Subject: rpms/kdeedu/devel .cvsignore, 1.47, 1.48 kdeedu.spec, 1.122, 1.123 sources, 1.51, 1.52 Message-ID: <200807071300.m67D0TcJ017649@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17598 Modified Files: .cvsignore kdeedu.spec sources Log Message: * Mon Jul 07 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 27 Jun 2008 17:03:45 -0000 1.47 +++ .cvsignore 7 Jul 2008 12:59:41 -0000 1.48 @@ -1 +1 @@ -kdeedu-4.0.84.tar.bz2 +kdeedu-4.0.85.tar.bz2 Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- kdeedu.spec 7 Jul 2008 10:56:28 -0000 1.122 +++ kdeedu.spec 7 Jul 2008 12:59:41 -0000 1.123 @@ -13,8 +13,8 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.0.84 -Release: 2%{?dist} +Version: 4.0.85 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Games @@ -397,6 +397,9 @@ %changelog +* Mon Jul 07 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Mon Jul 07 2008 Kevin Kofler 4.0.84-2 - rebuild for new OpenBabel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 27 Jun 2008 17:03:45 -0000 1.51 +++ sources 7 Jul 2008 12:59:41 -0000 1.52 @@ -1 +1 @@ -5b4a737fb7ebc19bc92e015d05b82220 kdeedu-4.0.84.tar.bz2 +b8c576a0cbdc983be524b89966314a94 kdeedu-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:01:30 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:01:30 GMT Subject: rpms/kdegames/devel .cvsignore, 1.52, 1.53 kdegames.spec, 1.94, 1.95 sources, 1.55, 1.56 Message-ID: <200807071301.m67D1U6T018863@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17667 Modified Files: .cvsignore kdegames.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 27 Jun 2008 17:02:33 -0000 1.52 +++ .cvsignore 7 Jul 2008 13:00:44 -0000 1.53 @@ -1 +1 @@ -kdegames-4.0.84.tar.bz2 +kdegames-4.0.85.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- kdegames.spec 27 Jun 2008 17:02:33 -0000 1.94 +++ kdegames.spec 7 Jul 2008 13:00:44 -0000 1.95 @@ -3,7 +3,7 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} License: GPLv2 @@ -186,6 +186,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 27 Jun 2008 17:02:33 -0000 1.55 +++ sources 7 Jul 2008 13:00:44 -0000 1.56 @@ -1 +1 @@ -851ab24a9f10849547212ac8a35e18c2 kdegames-4.0.84.tar.bz2 +0b5240b96ae2d9fb1e8553fd5309a2fa kdegames-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:02:36 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:02:36 GMT Subject: rpms/kdegraphics/devel .cvsignore, 1.45, 1.46 kdegraphics.spec, 1.152, 1.153 sources, 1.48, 1.49 Message-ID: <200807071302.m67D2aUb024284@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19903 Modified Files: .cvsignore kdegraphics.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 27 Jun 2008 17:00:35 -0000 1.45 +++ .cvsignore 7 Jul 2008 13:01:47 -0000 1.46 @@ -1 +1 @@ -kdegraphics-4.0.84.tar.bz2 +kdegraphics-4.0.85.tar.bz2 Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- kdegraphics.spec 27 Jun 2008 17:00:35 -0000 1.152 +++ kdegraphics.spec 7 Jul 2008 13:01:47 -0000 1.153 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Name: kdegraphics @@ -167,6 +167,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 27 Jun 2008 17:00:35 -0000 1.48 +++ sources 7 Jul 2008 13:01:47 -0000 1.49 @@ -1 +1 @@ -e4e056d71418b5da742bd74c17923bb8 kdegraphics-4.0.84.tar.bz2 +f110b721801d8be1a77aae9770a0863d kdegraphics-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:04:27 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:04:27 GMT Subject: rpms/kdemultimedia/devel .cvsignore, 1.49, 1.50 kdemultimedia.spec, 1.114, 1.115 sources, 1.51, 1.52 Message-ID: <200807071304.m67D4Rtu024402@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdemultimedia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24344 Modified Files: .cvsignore kdemultimedia.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 27 Jun 2008 17:01:45 -0000 1.49 +++ .cvsignore 7 Jul 2008 13:03:43 -0000 1.50 @@ -1 +1 @@ -kdemultimedia-4.0.84.tar.bz2 +kdemultimedia-4.0.85.tar.bz2 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- kdemultimedia.spec 27 Jun 2008 17:01:45 -0000 1.114 +++ kdemultimedia.spec 7 Jul 2008 13:03:43 -0000 1.115 @@ -1,7 +1,7 @@ Name: kdemultimedia Epoch: 6 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications @@ -148,6 +148,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 27 Jun 2008 17:01:45 -0000 1.51 +++ sources 7 Jul 2008 13:03:43 -0000 1.52 @@ -1 +1 @@ -925d3f1706dcba41b2527f9e4c7485f5 kdemultimedia-4.0.84.tar.bz2 +5d191f9155f903a6676ba4e503120145 kdemultimedia-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:05:27 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:05:27 GMT Subject: rpms/kdenetwork/devel .cvsignore, 1.52, 1.53 kdenetwork.spec, 1.148, 1.149 sources, 1.58, 1.59 Message-ID: <200807071305.m67D5R9i024467@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdenetwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24422 Modified Files: .cvsignore kdenetwork.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 27 Jun 2008 17:04:57 -0000 1.52 +++ .cvsignore 7 Jul 2008 13:04:39 -0000 1.53 @@ -1 +1 @@ -kdenetwork-4.0.84.tar.bz2 +kdenetwork-4.0.85.tar.bz2 Index: kdenetwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- kdenetwork.spec 27 Jun 2008 17:04:57 -0000 1.148 +++ kdenetwork.spec 7 Jul 2008 13:04:39 -0000 1.149 @@ -5,7 +5,7 @@ Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} License: GPLv2 @@ -165,6 +165,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 27 Jun 2008 17:04:57 -0000 1.58 +++ sources 7 Jul 2008 13:04:39 -0000 1.59 @@ -1 +1 @@ -4a87b6f3dc38b1a29d7ce7bb02239986 kdenetwork-4.0.84.tar.bz2 +cab4977091a6f403fed00e04b1174908 kdenetwork-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:06:25 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:06:25 GMT Subject: rpms/kdeplasmoids/devel .cvsignore, 1.3, 1.4 kdeplasmoids.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807071306.m67D6PYx024525@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasmoids/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24489 Modified Files: .cvsignore kdeplasmoids.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Jun 2008 17:06:24 -0000 1.3 +++ .cvsignore 7 Jul 2008 13:05:44 -0000 1.4 @@ -1 +1 @@ -kdeplasmoids-4.0.84.tar.bz2 +kdeplasmoids-4.0.85.tar.bz2 Index: kdeplasmoids.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/kdeplasmoids.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdeplasmoids.spec 27 Jun 2008 17:06:24 -0000 1.3 +++ kdeplasmoids.spec 7 Jul 2008 13:05:44 -0000 1.4 @@ -1,6 +1,6 @@ Name: kdeplasmoids -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Summary: Additional plasmoids for KDE @@ -97,6 +97,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Jun 2008 17:06:24 -0000 1.3 +++ sources 7 Jul 2008 13:05:44 -0000 1.4 @@ -1 +1 @@ -0e64cf97f81ac51a679b0280e8ca3069 kdeplasmoids-4.0.84.tar.bz2 +55a830e92d0acb2bfbedf6895b743978 kdeplasmoids-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:07:26 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:07:26 GMT Subject: rpms/kdesdk/devel .cvsignore, 1.44, 1.45 kdesdk.spec, 1.106, 1.107 sources, 1.46, 1.47 Message-ID: <200807071307.m67D7QK2024607@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24546 Modified Files: .cvsignore kdesdk.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 27 Jun 2008 17:07:35 -0000 1.44 +++ .cvsignore 7 Jul 2008 13:06:38 -0000 1.45 @@ -1 +1 @@ -kdesdk-4.0.84.tar.bz2 +kdesdk-4.0.85.tar.bz2 Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- kdesdk.spec 27 Jun 2008 17:07:35 -0000 1.106 +++ kdesdk.spec 7 Jul 2008 13:06:38 -0000 1.107 @@ -1,6 +1,6 @@ Name: kdesdk -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) @@ -204,6 +204,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 27 Jun 2008 17:07:35 -0000 1.46 +++ sources 7 Jul 2008 13:06:38 -0000 1.47 @@ -1 +1 @@ -9164b6780d94e87c547dabaf2f2102a4 kdesdk-4.0.84.tar.bz2 +5a1ed775661b76b58503e44c3f85c824 kdesdk-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:07:56 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:07:56 GMT Subject: rpms/kdetoys/devel .cvsignore, 1.21, 1.22 kdetoys.spec, 1.28, 1.29 sources, 1.19, 1.20 Message-ID: <200807071307.m67D7u9T024619@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24582 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 27 Jun 2008 17:08:49 -0000 1.21 +++ .cvsignore 7 Jul 2008 13:06:58 -0000 1.22 @@ -1 +1 @@ -kdetoys-4.0.84.tar.bz2 +kdetoys-4.0.85.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- kdetoys.spec 27 Jun 2008 17:08:49 -0000 1.28 +++ kdetoys.spec 7 Jul 2008 13:06:58 -0000 1.29 @@ -2,7 +2,7 @@ Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} License: GPLv2 @@ -96,6 +96,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 27 Jun 2008 17:08:49 -0000 1.19 +++ sources 7 Jul 2008 13:06:58 -0000 1.20 @@ -1 +1 @@ -bceb94774dcf6d5ad076ece5ec1283d1 kdetoys-4.0.84.tar.bz2 +b06639b1966bf2e0893303f8b87dc47d kdetoys-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:10:14 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Mon, 7 Jul 2008 13:10:14 GMT Subject: rpms/fonts-indic/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE fonts-indic.spec, 1.34, NONE sources, 1.25, NONE Message-ID: <200807071310.m67DAECx024753@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/fonts-indic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24692 Added Files: dead.package Removed Files: Makefile fonts-indic.spec sources Log Message: Retiring the package --- NEW FILE dead.package --- The fonts-indic meta packages are no longer in comps and should be removed from the distro for F10. It has been renamed to lohit-fonts. --- Makefile DELETED --- --- fonts-indic.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 13:10:52 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Mon, 7 Jul 2008 13:10:52 GMT Subject: rpms/nexuiz/devel nexuiz.spec,1.26,1.27 Message-ID: <200807071310.m67DAqRl024824@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24712 Modified Files: nexuiz.spec Log Message: > - Fix debuginfo, BZ 454141. Index: nexuiz.spec =================================================================== RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nexuiz.spec 19 May 2008 14:57:19 -0000 1.26 +++ nexuiz.spec 7 Jul 2008 13:10:00 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -52,7 +52,7 @@ %build export DP_FS_BASEDIR=%{_datadir}/nexuiz -%{__make} cl-nexuiz sv-nexuiz sdl-nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS" +%{__make} cl-nexuiz sv-nexuiz sdl-nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=: convert darkplaces.ico nexuiz.png @@ -128,6 +128,9 @@ %changelog +* Mon Jul 07 2008 Jon Ciesla - 2.4.2-2 +- Fix debuginfo, BZ 454141. + * Mon May 19 2008 Jon Ciesla - 2.4.2-1 - New upstream release. From fedora-extras-commits at redhat.com Mon Jul 7 13:10:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 7 Jul 2008 13:10:55 GMT Subject: rpms/kdeedu/F-9 kdeedu.spec,1.103,1.104 Message-ID: <200807071310.m67DAt37024829@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeedu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737/F-9 Modified Files: kdeedu.spec Log Message: * Mon Jul 07 2008 Kevin Kofler 4.0.5-2 - rebuild for new OpenBabel Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- kdeedu.spec 1 Jun 2008 19:33:57 -0000 1.103 +++ kdeedu.spec 7 Jul 2008 13:10:10 -0000 1.104 @@ -14,7 +14,7 @@ Name: kdeedu Summary: Educational/Edutainment applications Version: 4.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Amusements/Games @@ -178,6 +178,9 @@ %changelog +* Mon Jul 07 2008 Kevin Kofler 4.0.5-2 +- rebuild for new OpenBabel + * Sun Jun 01 2008 Than Ngo 4.0.5-1 - 4.0.5 From fedora-extras-commits at redhat.com Mon Jul 7 13:12:02 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 13:12:02 GMT Subject: rpms/kdeutils/devel .cvsignore, 1.47, 1.48 kdeutils.spec, 1.132, 1.133 sources, 1.50, 1.51 Message-ID: <200807071312.m67DC2xB024912@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24849 Modified Files: .cvsignore kdeutils.spec sources Log Message: * Thu Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 27 Jun 2008 17:27:27 -0000 1.47 +++ .cvsignore 7 Jul 2008 13:11:17 -0000 1.48 @@ -1 +1 @@ -kdeutils-4.0.84.tar.bz2 +kdeutils-4.0.85.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- kdeutils.spec 3 Jul 2008 13:46:53 -0000 1.132 +++ kdeutils.spec 7 Jul 2008 13:11:17 -0000 1.133 @@ -1,8 +1,11 @@ +# include new PyKDE4 printer applet +#define printer_applet 1 + Name: kdeutils Epoch: 6 -Version: 4.0.84 -Release: 2%{?dist} +Version: 4.0.85 +Release: 1%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -29,6 +32,7 @@ Requires(post): /sbin/ldconfig xdg-utils Requires(postun): /sbin/ldconfig xdg-utils Requires: kdelibs4 >= %{version} +%if 0%{?printer_applet} # (new) printer applet BuildRequires: PyKDE4-devel BuildRequires: system-config-printer @@ -39,6 +43,7 @@ Requires: system-config-printer # work around missing dependency in system-config-printer Requires: rhpl +%endif Provides: okteta = 0.1.0-1 Obsoletes: okteta < 0.1.0-1 @@ -136,7 +141,9 @@ %{_kde4_appsdir}/kwalletmanager/ %{_kde4_appsdir}/okteta/ %{_kde4_appsdir}/oktetapart/ +%if 0%{?printer_applet} %{_kde4_appsdir}/printer-applet/ +%endif %{_kde4_appsdir}/superkaramba/ %{_kde4_appsdir}/sweeper/ %{_kde4_datadir}/kde4/services/* @@ -177,6 +184,12 @@ %changelog +* Thu Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Thu Jul 03 2008 Rex Dieter 4.0.84-2.1 +- disable printer applet (for now, to avoid kdebindings/PyKDE4 deps madness) + * Thu Jul 03 2008 Rex Dieter 4.0.84-2 - %%description: -kedit, -kjots, +kwalletmanager, +superkaramba, +sweeper Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 27 Jun 2008 17:27:27 -0000 1.50 +++ sources 7 Jul 2008 13:11:17 -0000 1.51 @@ -1 +1 @@ -ad4f9a77c395a3f334819075c859cd31 kdeutils-4.0.84.tar.bz2 +db49bad98e41281debe9cc935fb85f84 kdeutils-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 13:12:17 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 13:12:17 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1562,1.1563 Message-ID: <200807071312.m67DCHi1024933@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24859 Modified Files: openoffice.org.spec Log Message: munge sh into sr as single serbian thingy Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1562 retrieving revision 1.1563 diff -u -r1.1562 -r1.1563 --- openoffice.org.spec 7 Jul 2008 11:26:40 -0000 1.1562 +++ openoffice.org.spec 7 Jul 2008 13:11:23 -0000 1.1563 @@ -23,7 +23,7 @@ %endif %if %{langpacks} -%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk +%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk %else %define langpack_langs en-US %endif @@ -1699,6 +1699,7 @@ st help noacor western ss nohelp noacor western \ nr help noacor western ns help noacor western \ dz help noacor ctl uk help noacor western \ +sh nohelp noacor western \ ) tar xzf %{SOURCE8} @@ -1733,6 +1734,9 @@ i=$[i+1] done +#rhbz#452379 clump serbian translations together +cat sh.filelist >> sr.filelist + #add in some templates tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{basisinstdir}/share tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{basisinstdir}/share From fedora-extras-commits at redhat.com Mon Jul 7 13:21:17 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 13:21:17 GMT Subject: rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo86142.serbiannumbering.patch, NONE, 1.1 workspace.locdat30.patch, NONE, 1.1 .cvsignore, 1.154, 1.155 openoffice.org.spec, 1.1498, 1.1499 sources, 1.279, 1.280 workspace.cairotext01.patch, 1.7, 1.8 Message-ID: <200807071321.m67DLHge025383@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25294 Modified Files: .cvsignore openoffice.org.spec sources workspace.cairotext01.patch Added Files: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch workspace.locdat30.patch Log Message: Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch openoffice.org-3.0.0.ooo86142.serbiannumbering.patch: --- NEW FILE openoffice.org-3.0.0.ooo86142.serbiannumbering.patch --- Index: i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx =================================================================== RCS file: /cvs/l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx,v retrieving revision 1.28 diff -u -r1.28 defaultnumberingprovider.cxx --- openoffice.org.orig/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 13 Nov 2007 14:32:47 -0000 1.28 +++ openoffice.org/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 15 Feb 2008 05:14:16 -0000 @@ -166,6 +166,22 @@ 0x0449, 0x044B, 0x044D, 0x044E, 0x044F }; +// Serbian Cyrillic upper letters +static sal_Unicode table_CyrillicUpperLetter_sr[] = { + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416, + 0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D, + 0x040A, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x040B, 0x0423, + 0x0424, 0x0425, 0x0426, 0x0427, 0x040F, 0x0428 +}; + +// Serbian cyrillic lower letters +static sal_Unicode table_CyrillicLowerLetter_sr[] = { + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0452, 0x0435, 0x0436, + 0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D, + 0x045A, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x045B, 0x0443, + 0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448 +}; + static sal_Unicode table_Alphabet_fa[] = { 0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634, @@ -623,6 +639,32 @@ sizeof(table_CyrillicLowerLetter_ru[0]), number-1, result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ... break; + case CHARS_CYRILLIC_UPPER_LETTER_SR: + lcl_formatChars2( table_CyrillicUpperLetter_sr, + table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Ab, ... + break; + case CHARS_CYRILLIC_LOWER_LETTER_SR: + lcl_formatChars( table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>ab, ... + break; + case CHARS_CYRILLIC_UPPER_LETTER_N_SR: + lcl_formatChars3( table_CyrillicUpperLetter_sr, + table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Bb, ... + break; + case CHARS_CYRILLIC_LOWER_LETTER_N_SR: + lcl_formatChars1( table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ... + break; case CHARS_PERSIAN: lcl_formatChars(table_Alphabet_fa, sizeof(table_Alphabet_fa) / sizeof(sal_Unicode), number - 1, result); break; @@ -708,6 +750,10 @@ {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (ru)", LANG_ALL}, {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (ru)", LANG_ALL}, {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (ru)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (sr)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL}, {style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL}, }; static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType); Index: offapi/com/sun/star/style/NumberingType.idl =================================================================== RCS file: /cvs/api/offapi/com/sun/star/style/NumberingType.idl,v retrieving revision 1.17 diff -u -r1.17 NumberingType.idl --- openoffice.org.orig/offapi/com/sun/star/style/NumberingType.idl 13 Nov 2007 14:30:30 -0000 1.17 +++ openoffice.org/offapi/com/sun/star/style/NumberingType.idl 15 Feb 2008 05:14:42 -0000 @@ -396,6 +396,66 @@ const short CHARS_CYRILLIC_LOWER_LETTER_N_RU = 45; //------------------------------------------------------------------------- + /** Numbering in Serbian Cyrillic alphabet upper case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , + CYRILLIC CAPITAL LETTER VE , CYRILLIC CAPITAL LETTER GHE , ... , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER BE , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER VE , ... + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE + */ + const short CHARS_CYRILLIC_UPPER_LETTER_SR = 47; + + //------------------------------------------------------------------------- + /** Numbering in Russian Serbian alphabet lower case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , + CYRILLIC SMALL LETTER VE , CYRILLIC SMALL LETTER GHE , ... , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER VE , ... + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE + */ + const short CHARS_CYRILLIC_LOWER_LETTER_SR = 48; + + //------------------------------------------------------------------------- + /** Numbering in Serbian Cyrillic alphabet upper case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , ... , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC CAPITAL LETTER BE CYRILLIC SMALL LETTER BE , + CYRILLIC CAPITAL LETTER VE CYRILLIC SMALL LETTER VE , ... + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ... + */ + const short CHARS_CYRILLIC_UPPER_LETTER_N_SR = 49; + + //------------------------------------------------------------------------- + /** Numbering in Serbian Cyrillic alphabet upper case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , ... , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC SMALL LETTER BE CYRILLIC SMALL LETTER BE , + CYRILLIC SMALL LETTER VE CYRILLIC SMALL LETTER VE , ... + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ... + */ + const short CHARS_CYRILLIC_LOWER_LETTER_N_SR = 50; + + //------------------------------------------------------------------------- /** Numbering in Persian alphabet letters (aa, be, pe, te, ...) @since OOo 2.4 Index: svx/source/dialog/numpages.src =================================================================== RCS file: /cvs/graphics/svx/source/dialog/numpages.src,v retrieving revision 1.62 diff -u -r1.62 numpages.src --- openoffice.org.orig/svx/source/dialog/numpages.src 27 Jun 2007 17:23:30 -0000 1.62 +++ openoffice.org/svx/source/dialog/numpages.src 15 Feb 2008 05:16:13 -0000 @@ -216,6 +216,10 @@ < "??, ??, .., ????, ????, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ; }; }; Index: sw/source/ui/misc/numberingtypelistbox.src =================================================================== RCS file: /cvs/sw/sw/source/ui/misc/numberingtypelistbox.src,v retrieving revision 1.19 diff -u -r1.19 numberingtypelistbox.src --- openoffice.org.orig/sw/source/ui/misc/numberingtypelistbox.src 19 Apr 2007 13:21:04 -0000 1.19 +++ openoffice.org/sw/source/ui/misc/numberingtypelistbox.src 15 Feb 2008 05:16:22 -0000 @@ -61,6 +61,10 @@ < "??, ??, .., ????, ????, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ; }; }; }; Index: writerfilter/source/dmapper/DomainMapper_Impl.cxx =================================================================== RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.cxx,v retrieving revision 1.21 diff -u -r1.21 DomainMapper_Impl.cxx --- openoffice.org.orig/writerfilter/source/dmapper/DomainMapper_Impl.cxx 29 Oct 2007 15:28:37 -0000 1.21 +++ openoffice.org/writerfilter/source/dmapper/DomainMapper_Impl.cxx 15 Feb 2008 05:16:48 -0000 @@ -1027,7 +1027,11 @@ CHARS_CYRILLIC_UPPER_LETTER_RU CHARS_CYRILLIC_LOWER_LETTER_RU CHARS_CYRILLIC_UPPER_LETTER_N_RU - CHARS_CYRILLIC_LOWER_LETTER_N_RU*/ + CHARS_CYRILLIC_LOWER_LETTER_N_RU + CHARS_CYRILLIC_UPPER_LETTER_SR + CHARS_CYRILLIC_LOWER_LETTER_SR + CHARS_CYRILLIC_UPPER_LETTER_N_SR + CHARS_CYRILLIC_LOWER_LETTER_N_SR*/ }; for( sal_uInt32 nNum = 0; nNum < sizeof(aNumberingPairs)/sizeof( NumberingPairs ); ++nNum) Index: sh_RS.xml =================================================================== RCS file: /cvs/l10n/i18npool/source/localedata/data/sh_RS.xml,v retrieving revision 1.2 diff -u -r1.2 sh_RS.xml --- openoffice.org.orig/i18npool/source/localedata/data/sh_RS.xml 13 Nov 2007 14:35:55 -0000 1.2 +++ openoffice.org/i18npool/source/localedata/data/sh_RS.xml 31 Mar 2008 17:33:14 -0000 @@ -210,72 +224,6 @@ K4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Index: sr_RS.xml =================================================================== RCS file: /cvs/l10n/i18npool/source/localedata/data/sr_RS.xml,v retrieving revision 1.2 diff -u -r1.2 sr_RS.xml --- openoffice.org.orig/i18npool/source/localedata/data/sr_RS.xml 13 Nov 2007 14:37:09 -0000 1.2 +++ openoffice.org/i18npool/source/localedata/data/sr_RS.xml 31 Mar 2008 17:33:19 -0000 @@ -350,35 +364,35 @@ - - - + + + + + - - - + - + - + - + @@ -390,13 +404,13 @@ - + - + - + workspace.locdat30.patch: --- NEW FILE workspace.locdat30.patch --- Index: l10n/i18npool/source/localedata/data/sh_RS.xml diff -u l10n/i18npool/source/localedata/data/sh_RS.xml:1.2 l10n/i18npool/source/localedata/data/sh_RS.xml:1.2.44.2 --- l10n/i18npool/source/localedata/data/sh_RS.xml:1.2 Tue Nov 13 06:35:55 2007 +++ l10n/i18npool/source/localedata/data/sh_RS.xml Sun Jun 15 06:26:42 2008 @@ -34,9 +34,9 @@ pop. metric - + - + &C<??<<<??<??<<<??&D<??<<<??&??<d??<<<D??<<<D??&L<lj<<<Lj<<<LJ&N<nj<<<Nj<<<NJ&S<??<<<??&Z<??<<<?? IGNORE_CASE @@ -164,7 +164,7 @@ ad n. e. - nova era + nove ere @@ -174,18 +174,39 @@ - + + RSD + RSD + RSD + Srpski dinar + 2 + + + RSD + din. + RSD + Srpski dinar + 2 + + CSD - Din + CSD CSD - Srpski Dinar + Srpski dinar 2 - + RSD Din RSD - Srpski Dinar + Srpski dinar + 2 + + + CSD + Din + CSD + Srpski dinar 2 Index: l10n/i18npool/source/localedata/data/sr_RS.xml diff -u l10n/i18npool/source/localedata/data/sr_RS.xml:1.2 l10n/i18npool/source/localedata/data/sr_RS.xml:1.2.44.1 --- l10n/i18npool/source/localedata/data/sr_RS.xml:1.2 Tue Nov 13 06:37:09 2007 +++ l10n/i18npool/source/localedata/data/sr_RS.xml Sun Jun 15 06:26:43 2008 @@ -34,7 +34,7 @@ ??????. metric - + Standard @@ -303,7 +303,7 @@ ad ??. ??. - ???????? ?????? + ???????? ?????? @@ -313,18 +313,39 @@ - + + RSD + ?????? + RSD + ???????????? ?????????? + 2 + + + RSD + ??????. + RSD + ???????????? ?????????? + 2 + + CSD - ?????? + ?????? CSD - ???????????? ?????????? + ???????????? ?????????? 2 - + RSD ?????? RSD - ???????????? ?????????? + ???????????? ?????????? + 2 + + + CSD + ?????? + CSD + ???????????? ?????????? 2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/.cvsignore,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- .cvsignore 30 May 2008 14:20:03 -0000 1.154 +++ .cvsignore 7 Jul 2008 13:20:29 -0000 1.155 @@ -5,3 +5,5 @@ unowinreg.dll bengali.sdf OOH680_m17.tar.bz2 +serbian_sr.sdf +serbian_sh.sdf Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v retrieving revision 1.1498 retrieving revision 1.1499 diff -u -r1.1498 -r1.1499 --- openoffice.org.spec 15 Jun 2008 20:23:37 -0000 1.1498 +++ openoffice.org.spec 7 Jul 2008 13:20:29 -0000 1.1499 @@ -1,6 +1,6 @@ %define oootag OOH680 %define ooomilestone 17 -%define rh_rpm_release 4 +%define rh_rpm_release 5 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -31,7 +31,7 @@ %endif %if %{langpacks} -%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn +%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn %else %define langpack_langs en-US %endif @@ -56,6 +56,8 @@ Source4: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll +Source7: serbian_sr.sdf +Source8: serbian_sh.sdf BuildRequires: zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++, gdb BuildRequires: binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -161,6 +163,8 @@ Patch88: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch Patch89: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch Patch90: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch +Patch91: workspace.locdat30.patch +Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch %define instdir %{_libdir}/openoffice.org @@ -1136,6 +1140,8 @@ %patch88 -p1 -b .ooo90306.sw.wrongprotection.patch %patch89 -p1 -b .ooo48400.svx.fixspelling.patch %patch90 -p1 -b .ooo90697.sd.a11ycrash.patch +%patch91 -p1 -b .workspace.locdat30.patch +%patch92 -p1 -b .ooo86142.serbiannumbering.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1201,6 +1207,8 @@ fi deliver -link localize -m -x -l bn -f %{SOURCE5} +localize -m -x -l sr -f %{SOURCE7} +localize -m -x -l sh -f %{SOURCE8} cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -1464,7 +1472,7 @@ xh help noacor western ve nohelp noacor western \ st help noacor western ss nohelp noacor western \ nr help noacor western ns help noacor western \ -dz help noacor ctl +dz help noacor ctl sh nohelp noacor western \ ) i=0 @@ -1492,6 +1500,9 @@ i=$[i+1] done +#rhbz#452379 clump serbian translations together +cat sh.filelist >> sr.filelist + #add in some templates tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{instdir}/share tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{instdir}/share @@ -2924,6 +2935,12 @@ %changelog +* Mon Jul 07 2008 Caolan McNamara - 1:2.4.1-17.5-UNRELEASED +- Resolves: rhbz#452376 backport workspace.locdat30.patch for Serbian +- Resolves: rhbz#452376 update Serbian translations +- Resolves: rhbz#452379 extend Serbian translations +- Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch + * Fri Jun 13 2008 Caolan McNamara - 1:2.4.1-17.4 - Resolves: rhbz#451485 fix vertical glyphs - Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/sources,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- sources 1 Jun 2008 10:44:36 -0000 1.279 +++ sources 7 Jul 2008 13:20:29 -0000 1.280 @@ -5,3 +5,5 @@ f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz 0c0e868b34329d90a7c9a92f1704775c bengali.sdf e43083af0b559ea47a88889c4e620800 OOH680_m17.tar.bz2 +0edb73ddd2b97670bee7e6bcc0a326fe serbian_sr.sdf +9df1425588986b36072bfbc40651f83d serbian_sh.sdf workspace.cairotext01.patch: Index: workspace.cairotext01.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.cairotext01.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- workspace.cairotext01.patch 3 Jun 2008 15:52:16 -0000 1.7 +++ workspace.cairotext01.patch 7 Jul 2008 13:20:29 -0000 1.8 @@ -379,7 +379,7 @@ + Display* pDisplay = GetXDisplay(); + + cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay, -+ hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16); ++ hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16); + + /* + * It might be ideal to cache surface and cairo context between calls and From fedora-extras-commits at redhat.com Mon Jul 7 13:23:04 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 13:23:04 GMT Subject: rpms/openoffice.org/devel openoffice.org-3.0.0.ooo86142.serbiannumbering.patch, NONE, 1.1 openoffice.org.spec, 1.1563, 1.1564 Message-ID: <200807071323.m67DN4LB025569@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25467 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch Log Message: Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch openoffice.org-3.0.0.ooo86142.serbiannumbering.patch: --- NEW FILE openoffice.org-3.0.0.ooo86142.serbiannumbering.patch --- Index: i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx =================================================================== RCS file: /cvs/l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx,v retrieving revision 1.28 diff -u -r1.28 defaultnumberingprovider.cxx --- openoffice.org.orig/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 13 Nov 2007 14:32:47 -0000 1.28 +++ openoffice.org/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 15 Feb 2008 05:14:16 -0000 @@ -166,6 +166,22 @@ 0x0449, 0x044B, 0x044D, 0x044E, 0x044F }; +// Serbian Cyrillic upper letters +static sal_Unicode table_CyrillicUpperLetter_sr[] = { + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416, + 0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D, + 0x040A, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x040B, 0x0423, + 0x0424, 0x0425, 0x0426, 0x0427, 0x040F, 0x0428 +}; + +// Serbian cyrillic lower letters +static sal_Unicode table_CyrillicLowerLetter_sr[] = { + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0452, 0x0435, 0x0436, + 0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D, + 0x045A, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x045B, 0x0443, + 0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448 +}; + static sal_Unicode table_Alphabet_fa[] = { 0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634, @@ -623,6 +639,32 @@ sizeof(table_CyrillicLowerLetter_ru[0]), number-1, result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ... break; + case CHARS_CYRILLIC_UPPER_LETTER_SR: + lcl_formatChars2( table_CyrillicUpperLetter_sr, + table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Ab, ... + break; + case CHARS_CYRILLIC_LOWER_LETTER_SR: + lcl_formatChars( table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>ab, ... + break; + case CHARS_CYRILLIC_UPPER_LETTER_N_SR: + lcl_formatChars3( table_CyrillicUpperLetter_sr, + table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Bb, ... + break; + case CHARS_CYRILLIC_LOWER_LETTER_N_SR: + lcl_formatChars1( table_CyrillicLowerLetter_sr, + sizeof(table_CyrillicLowerLetter_sr) / + sizeof(table_CyrillicLowerLetter_sr[0]), number-1, + result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ... + break; case CHARS_PERSIAN: lcl_formatChars(table_Alphabet_fa, sizeof(table_Alphabet_fa) / sizeof(sal_Unicode), number - 1, result); break; @@ -708,6 +750,10 @@ {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (ru)", LANG_ALL}, {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (ru)", LANG_ALL}, {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (ru)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (sr)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL}, + {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL}, {style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL}, }; static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType); Index: offapi/com/sun/star/style/NumberingType.idl =================================================================== RCS file: /cvs/api/offapi/com/sun/star/style/NumberingType.idl,v retrieving revision 1.17 diff -u -r1.17 NumberingType.idl --- openoffice.org.orig/offapi/com/sun/star/style/NumberingType.idl 13 Nov 2007 14:30:30 -0000 1.17 +++ openoffice.org/offapi/com/sun/star/style/NumberingType.idl 15 Feb 2008 05:14:42 -0000 @@ -396,6 +396,66 @@ const short CHARS_CYRILLIC_LOWER_LETTER_N_RU = 45; //------------------------------------------------------------------------- + /** Numbering in Serbian Cyrillic alphabet upper case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , + CYRILLIC CAPITAL LETTER VE , CYRILLIC CAPITAL LETTER GHE , ... , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER BE , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER VE , ... + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE + */ + const short CHARS_CYRILLIC_UPPER_LETTER_SR = 47; + + //------------------------------------------------------------------------- + /** Numbering in Russian Serbian alphabet lower case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , + CYRILLIC SMALL LETTER VE , CYRILLIC SMALL LETTER GHE , ... , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER VE , ... + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE + */ + const short CHARS_CYRILLIC_LOWER_LETTER_SR = 48; + + //------------------------------------------------------------------------- + /** Numbering in Serbian Cyrillic alphabet upper case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , ... , + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC CAPITAL LETTER BE CYRILLIC SMALL LETTER BE , + CYRILLIC CAPITAL LETTER VE CYRILLIC SMALL LETTER VE , ... + CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ... + */ + const short CHARS_CYRILLIC_UPPER_LETTER_N_SR = 49; + + //------------------------------------------------------------------------- + /** Numbering in Serbian Cyrillic alphabet upper case letters + + @since OOo 2.4.0 + */ + /* + CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , ... , + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , + CYRILLIC SMALL LETTER BE CYRILLIC SMALL LETTER BE , + CYRILLIC SMALL LETTER VE CYRILLIC SMALL LETTER VE , ... + CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ... + */ + const short CHARS_CYRILLIC_LOWER_LETTER_N_SR = 50; + + //------------------------------------------------------------------------- /** Numbering in Persian alphabet letters (aa, be, pe, te, ...) @since OOo 2.4 Index: svx/source/dialog/numpages.src =================================================================== RCS file: /cvs/graphics/svx/source/dialog/numpages.src,v retrieving revision 1.62 diff -u -r1.62 numpages.src --- openoffice.org.orig/svx/source/dialog/numpages.src 27 Jun 2007 17:23:30 -0000 1.62 +++ openoffice.org/svx/source/dialog/numpages.src 15 Feb 2008 05:16:13 -0000 @@ -216,6 +216,10 @@ < "??, ??, .., ????, ????, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ; }; }; Index: sw/source/ui/misc/numberingtypelistbox.src =================================================================== RCS file: /cvs/sw/sw/source/ui/misc/numberingtypelistbox.src,v retrieving revision 1.19 diff -u -r1.19 numberingtypelistbox.src --- openoffice.org.orig/sw/source/ui/misc/numberingtypelistbox.src 19 Apr 2007 13:21:04 -0000 1.19 +++ openoffice.org/sw/source/ui/misc/numberingtypelistbox.src 15 Feb 2008 05:16:22 -0000 @@ -61,6 +61,10 @@ < "??, ??, .., ????, ????, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ; < "??, ??, .., ????, ????, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ; + < "??, ??, .., ????, ????, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ; }; }; }; Index: writerfilter/source/dmapper/DomainMapper_Impl.cxx =================================================================== RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.cxx,v retrieving revision 1.21 diff -u -r1.21 DomainMapper_Impl.cxx --- openoffice.org.orig/writerfilter/source/dmapper/DomainMapper_Impl.cxx 29 Oct 2007 15:28:37 -0000 1.21 +++ openoffice.org/writerfilter/source/dmapper/DomainMapper_Impl.cxx 15 Feb 2008 05:16:48 -0000 @@ -1027,7 +1027,11 @@ CHARS_CYRILLIC_UPPER_LETTER_RU CHARS_CYRILLIC_LOWER_LETTER_RU CHARS_CYRILLIC_UPPER_LETTER_N_RU - CHARS_CYRILLIC_LOWER_LETTER_N_RU*/ + CHARS_CYRILLIC_LOWER_LETTER_N_RU + CHARS_CYRILLIC_UPPER_LETTER_SR + CHARS_CYRILLIC_LOWER_LETTER_SR + CHARS_CYRILLIC_UPPER_LETTER_N_SR + CHARS_CYRILLIC_LOWER_LETTER_N_SR*/ }; for( sal_uInt32 nNum = 0; nNum < sizeof(aNumberingPairs)/sizeof( NumberingPairs ); ++nNum) Index: sh_RS.xml =================================================================== RCS file: /cvs/l10n/i18npool/source/localedata/data/sh_RS.xml,v retrieving revision 1.2 diff -u -r1.2 sh_RS.xml --- openoffice.org.orig/i18npool/source/localedata/data/sh_RS.xml 13 Nov 2007 14:35:55 -0000 1.2 +++ openoffice.org/i18npool/source/localedata/data/sh_RS.xml 31 Mar 2008 17:33:14 -0000 @@ -210,72 +224,6 @@ K4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Index: sr_RS.xml =================================================================== RCS file: /cvs/l10n/i18npool/source/localedata/data/sr_RS.xml,v retrieving revision 1.2 diff -u -r1.2 sr_RS.xml --- openoffice.org.orig/i18npool/source/localedata/data/sr_RS.xml 13 Nov 2007 14:37:09 -0000 1.2 +++ openoffice.org/i18npool/source/localedata/data/sr_RS.xml 31 Mar 2008 17:33:19 -0000 @@ -350,35 +364,35 @@ - - - + + + + + - - - + - + - + - + @@ -390,13 +404,13 @@ - + - + - + Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1563 retrieving revision 1.1564 diff -u -r1.1563 -r1.1564 --- openoffice.org.spec 7 Jul 2008 13:11:23 -0000 1.1563 +++ openoffice.org.spec 7 Jul 2008 13:22:16 -0000 1.1564 @@ -1,6 +1,6 @@ %define oootag DEV300 %define ooomilestone 23 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -118,6 +118,7 @@ Patch48: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch Patch49: workspace.cairo06.patch Patch50: workspace.ab55.patch +Patch51: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1278,6 +1279,7 @@ %patch48 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch %patch49 -p1 -b .workspace.cairo06.patch %patch50 -p1 -b .workspace.ab55.patch +%patch51 -p1 -b .ooo86142.serbiannumbering.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -3581,6 +3583,9 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Mon Jul 07 2008 Caolan McNamara - 1:3.0.0-0.23-2 +- Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch + * Sun Jul 06 2008 Caolan McNamara - 1:3.0.0-0.23-1 - next version - split out arcane ScriptProviders out of core into optional extensions From fedora-extras-commits at redhat.com Mon Jul 7 13:25:14 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Mon, 7 Jul 2008 13:25:14 GMT Subject: rpms/fonts-arabic/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE fonts-arabic.spec, 1.22, NONE sources, 1.9, NONE Message-ID: <200807071325.m67DPEcW025745@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/fonts-arabic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25722 Added Files: dead.package Removed Files: Makefile fonts-arabic.spec sources Log Message: retired package --- NEW FILE dead.package --- The fonts-indic meta packages are no longer in comps and should be removed from the distro for F10. --- Makefile DELETED --- --- fonts-arabic.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 13:27:38 2008 From: fedora-extras-commits at redhat.com (Harald Hoyer (harald)) Date: Mon, 7 Jul 2008 13:27:38 GMT Subject: rpms/python-augeas/F-8 python-augeas.spec,1.3,1.4 Message-ID: <200807071327.m67DRcWg025901@cvs-int.fedora.redhat.com> Author: harald Update of /cvs/pkgs/rpms/python-augeas/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25860 Modified Files: python-augeas.spec Log Message: * Thu Jul 03 2008 Harald Hoyer 0.2.1-1 - version 0.2.1 Index: python-augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-augeas/F-8/python-augeas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-augeas.spec 3 Jul 2008 11:54:50 -0000 1.3 +++ python-augeas.spec 7 Jul 2008 13:26:55 -0000 1.4 @@ -14,6 +14,7 @@ BuildArch: noarch BuildRequires: python-setuptools python-devel +BuildRequires(pre): python %description python-augeas is a set of Python bindings around augeas. @@ -38,8 +39,7 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README.txt -%{python_sitelib}/augeas.py* -%{python_sitelib}/*augeas*.egg-info +%{python_sitelib}/*augeas* %changelog * Thu Jul 03 2008 Harald Hoyer 0.2.1-1 From fedora-extras-commits at redhat.com Mon Jul 7 13:31:25 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Mon, 7 Jul 2008 13:31:25 GMT Subject: rpms/fonts-arabic/devel dead.package,1.1,1.2 Message-ID: <200807071331.m67DVPca026145@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/fonts-arabic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26079 Modified Files: dead.package Log Message: updated dead.package Index: dead.package =================================================================== RCS file: /cvs/pkgs/rpms/fonts-arabic/devel/dead.package,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dead.package 7 Jul 2008 13:24:56 -0000 1.1 +++ dead.package 7 Jul 2008 13:30:33 -0000 1.2 @@ -1 +1 @@ -The fonts-indic meta packages are no longer in comps and should be removed from the distro for F10. +The fonts-arabic meta packages are no longer in comps and should be removed from the distro for F10. From fedora-extras-commits at redhat.com Mon Jul 7 13:32:28 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Mon, 7 Jul 2008 13:32:28 GMT Subject: rpms/fonts-hebrew/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE fonts-hebrew.spec, 1.10, NONE sources, 1.5, NONE Message-ID: <200807071332.m67DWSTV026238@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/fonts-hebrew/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26201 Added Files: dead.package Removed Files: Makefile fonts-hebrew.spec sources Log Message: Retired package --- NEW FILE dead.package --- The fonts-hebrew meta packages are no longer in comps and should be removed from the distro for F10. It has been renamed to culmus-fonts. --- Makefile DELETED --- --- fonts-hebrew.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 13:35:18 2008 From: fedora-extras-commits at redhat.com (David Sugar (dsugar)) Date: Mon, 7 Jul 2008 13:35:18 GMT Subject: rpms/eclipse-slide/devel .cvsignore, 1.4, 1.5 eclipse-slide.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200807071335.m67DZITl026512@cvs-int.fedora.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26394 Modified Files: .cvsignore eclipse-slide.spec sources Log Message: Update version of SLIDE some fixed, support for new CDS Framework Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2008 20:59:41 -0000 1.4 +++ .cvsignore 7 Jul 2008 13:34:29 -0000 1.5 @@ -1 +1 @@ -eclipse-slide-1.3.8.tar.gz +eclipse-slide-1.3.9.tar.gz Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/eclipse-slide.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- eclipse-slide.spec 13 Feb 2008 20:59:41 -0000 1.6 +++ eclipse-slide.spec 7 Jul 2008 13:34:29 -0000 1.7 @@ -36,7 +36,7 @@ Summary: SELinux policy editing plugin for Eclipse Name: eclipse-slide -Version: 1.3.8 +Version: 1.3.9 License: GPLv2 BuildArch: noarch @@ -46,7 +46,8 @@ Requires: ganymed-ssh2 Requires: java-gcj-compat >= 1.0.33 Requires: eclipse-setools >= 3.3.2.2 -Requires: policycoreutils >= 1.34 +Requires: policycoreutils >= 1.33 +Requires: selinux-policy-devel ExclusiveOS: linux BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -133,6 +134,10 @@ %{eclipse_base}/features/com.tresys.slide*/ %changelog +* Tue Jun 16 2008 Dave Sugar - 1.3.9-1 +- updates to support CDS Framework development +- downgrade policycoreutils requirements for RHEL support + * Wed Feb 13 2008 Dave Sugar - 1.3.8-1 - updates to support CDS Framework development Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2008 20:59:41 -0000 1.6 +++ sources 7 Jul 2008 13:34:29 -0000 1.7 @@ -1 +1 @@ -3ed88340489e8a8fa97c0ba1223e503d eclipse-slide-1.3.8.tar.gz +3ebc5fd0a146f0fbcf862b519880be05 eclipse-slide-1.3.9.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 13:39:10 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 13:39:10 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1564, 1.1565 openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch, 1.2, NONE openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch, 1.1, NONE Message-ID: <200807071339.m67DdAvY026861@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26818 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch Log Message: drop integrated a11y patches Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1564 retrieving revision 1.1565 diff -u -r1.1564 -r1.1565 --- openoffice.org.spec 7 Jul 2008 13:22:16 -0000 1.1564 +++ openoffice.org.spec 7 Jul 2008 13:38:23 -0000 1.1565 @@ -82,43 +82,41 @@ Patch12: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch Patch13: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch Patch14: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize -Patch15: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch -Patch16: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch -Patch17: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch -Patch18: openoffice.org-2.2.0.ooo63159.sal.dtype.patch -Patch19: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch -Patch20: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch -Patch21: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch -Patch22: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch -Patch23: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz -Patch24: openoffice.org-2.3.0.ooo76649.httpencoding.patch -Patch25: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch -Patch26: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch -Patch27: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch -Patch28: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch -Patch29: openoffice.org-2.4.0.ooo85448.emptyrpath.patch -Patch30: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch -Patch31: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch -Patch32: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch -Patch33: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch -Patch34: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch -Patch35: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch -Patch36: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch -Patch37: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch38: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch -Patch39: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch -Patch40: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch -Patch41: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch -Patch42: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch -Patch43: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch -Patch44: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch -Patch45: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch -Patch46: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch -Patch47: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch -Patch48: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch -Patch49: workspace.cairo06.patch -Patch50: workspace.ab55.patch -Patch51: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +Patch15: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch +Patch16: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch +Patch17: openoffice.org-2.2.0.ooo63159.sal.dtype.patch +Patch18: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch +Patch19: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch +Patch20: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch +Patch21: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch +Patch22: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz +Patch23: openoffice.org-2.3.0.ooo76649.httpencoding.patch +Patch24: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch +Patch25: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch +Patch26: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch +Patch27: openoffice.org-2.4.0.ooo85448.emptyrpath.patch +Patch28: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch +Patch29: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +Patch30: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch +Patch31: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch +Patch32: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch +Patch33: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch +Patch34: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch +Patch35: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch +Patch36: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch +Patch37: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch +Patch38: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch +Patch39: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch +Patch40: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch +Patch41: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch +Patch42: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch +Patch43: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch +Patch44: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch +Patch45: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch +Patch46: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch +Patch47: workspace.cairo06.patch +Patch48: workspace.ab55.patch +Patch49: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1243,43 +1241,41 @@ %patch12 -p1 -b .ooo80412.i18npool.extendgrapheme.patch %patch13 -p1 -b .ooo65491.psprint.enablenups.patch cat %{PATCH14} >> svtools/source/dialogs/localize.sdf -%patch15 -p1 -b .ooo73201.sw.a11yloadcrash.patch -%patch16 -p1 -b .ooo74188.sw.cursorinsideglyph.patch -%patch17 -p0 -b .ooo68717.gstreamer.video.patch -%patch18 -p1 -b .ooo63159.sal.dtype.patch -%patch19 -p1 -b .ooo76393.sal.dynamicsection.patch -%patch20 -p1 -b .ooo80816.selinux.bridges.patch -%patch21 -p1 -b .ooo7065.sw.titlepagedialog.patch -%patch22 -p1 -b .ooo80257.sd.textonlystyle.patch -tar xzf %{PATCH23} -%patch24 -p1 -b .ooo76649.httpencoding.patch -%patch25 -p1 -b .ooo83878.unopkg.enablelinking.patch -%patch26 -p1 -%patch27 -p1 -b .rh133741.alwaysgtk.vcl.patch -%patch28 -p1 -b .ooo85429.sw.a11ycrash.patch -%patch29 -p1 -b .ooo85448.emptyrpath.patch -%patch30 -p1 -b .ooo85921.sd.editmasterundermouse.patch -%patch31 -p1 -b .ooo86080.unopkg.bodge.patch -%patch32 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch -%patch33 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch -%patch34 -p1 -b .ooo88341.sc.verticalboxes.patch -%patch35 -p1 -b .ooo6087.sc.sheetnames.patch -%patch36 -p1 -b .ooo89002.vcl.symbolfonts.patch -%patch37 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch38 -p1 -b .ooo87970.vcl.samenamesubs.patch -%patch39 -p1 -b .ooo90055.swext.allowadmin.patch -%patch40 -p1 -b .oooXXXXX.odk.3layer.patch -%patch41 -p1 -b .ooo90037.vcl.cairotransforms.patch -%patch42 -p1 -b .ooo90178.tools.fixmacro.patch -%patch43 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch -%patch44 -p1 -b .ooo82545.np_sdk.x86_64.patch -%patch45 -p1 -b .ooo90306.sw.wrongprotection.patch -%patch46 -p1 -b .ooo48400.svx.fixspelling.patch -%patch47 -p1 -b .ooo90876.connectivity.evoab2.patch -%patch48 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch -%patch49 -p1 -b .workspace.cairo06.patch -%patch50 -p1 -b .workspace.ab55.patch -%patch51 -p1 -b .ooo86142.serbiannumbering.patch +%patch15 -p1 -b .ooo74188.sw.cursorinsideglyph.patch +%patch16 -p0 -b .ooo68717.gstreamer.video.patch +%patch17 -p1 -b .ooo63159.sal.dtype.patch +%patch18 -p1 -b .ooo76393.sal.dynamicsection.patch +%patch19 -p1 -b .ooo80816.selinux.bridges.patch +%patch20 -p1 -b .ooo7065.sw.titlepagedialog.patch +%patch21 -p1 -b .ooo80257.sd.textonlystyle.patch +tar xzf %{PATCH22} +%patch23 -p1 -b .ooo76649.httpencoding.patch +%patch24 -p1 -b .ooo83878.unopkg.enablelinking.patch +%patch25 -p1 +%patch26 -p1 -b .rh133741.alwaysgtk.vcl.patch +%patch27 -p1 -b .ooo85448.emptyrpath.patch +%patch28 -p1 -b .ooo85921.sd.editmasterundermouse.patch +%patch29 -p1 -b .ooo86080.unopkg.bodge.patch +%patch30 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch +%patch31 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch +%patch32 -p1 -b .ooo88341.sc.verticalboxes.patch +%patch33 -p1 -b .ooo6087.sc.sheetnames.patch +%patch34 -p1 -b .ooo89002.vcl.symbolfonts.patch +%patch35 -p1 -b .gccXXXXX.solenv.javaregistration.patch +%patch36 -p1 -b .ooo87970.vcl.samenamesubs.patch +%patch37 -p1 -b .ooo90055.swext.allowadmin.patch +%patch38 -p1 -b .oooXXXXX.odk.3layer.patch +%patch39 -p1 -b .ooo90037.vcl.cairotransforms.patch +%patch40 -p1 -b .ooo90178.tools.fixmacro.patch +%patch41 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch +%patch42 -p1 -b .ooo82545.np_sdk.x86_64.patch +%patch43 -p1 -b .ooo90306.sw.wrongprotection.patch +%patch44 -p1 -b .ooo48400.svx.fixspelling.patch +%patch45 -p1 -b .ooo90876.connectivity.evoab2.patch +%patch46 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch +%patch47 -p1 -b .workspace.cairo06.patch +%patch48 -p1 -b .workspace.ab55.patch +%patch49 -p1 -b .ooo86142.serbiannumbering.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -3585,6 +3581,8 @@ %changelog * Mon Jul 07 2008 Caolan McNamara - 1:3.0.0-0.23-2 - Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +- drop integrated openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch +- drop integrated openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch * Sun Jul 06 2008 Caolan McNamara - 1:3.0.0-0.23-1 - next version --- openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch DELETED --- --- openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 13:49:14 2008 From: fedora-extras-commits at redhat.com (David Sugar (dsugar)) Date: Mon, 7 Jul 2008 13:49:14 GMT Subject: rpms/eclipse-slide/F-9 eclipse-slide.spec,1.6,1.7 sources,1.6,1.7 Message-ID: <200807071349.m67DnEAO027602@cvs-int.fedora.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27481 Modified Files: eclipse-slide.spec sources Log Message: Updates from devel back into F9 Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/F-9/eclipse-slide.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- eclipse-slide.spec 13 Feb 2008 20:59:41 -0000 1.6 +++ eclipse-slide.spec 7 Jul 2008 13:48:15 -0000 1.7 @@ -36,7 +36,7 @@ Summary: SELinux policy editing plugin for Eclipse Name: eclipse-slide -Version: 1.3.8 +Version: 1.3.9 License: GPLv2 BuildArch: noarch @@ -46,7 +46,8 @@ Requires: ganymed-ssh2 Requires: java-gcj-compat >= 1.0.33 Requires: eclipse-setools >= 3.3.2.2 -Requires: policycoreutils >= 1.34 +Requires: policycoreutils >= 1.33 +Requires: selinux-policy-devel ExclusiveOS: linux BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -133,6 +134,10 @@ %{eclipse_base}/features/com.tresys.slide*/ %changelog +* Tue Jun 16 2008 Dave Sugar - 1.3.9-1 +- updates to support CDS Framework development +- downgrade policycoreutils requirements for RHEL support + * Wed Feb 13 2008 Dave Sugar - 1.3.8-1 - updates to support CDS Framework development Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2008 20:59:41 -0000 1.6 +++ sources 7 Jul 2008 13:48:15 -0000 1.7 @@ -1 +1 @@ -3ed88340489e8a8fa97c0ba1223e503d eclipse-slide-1.3.8.tar.gz +3ebc5fd0a146f0fbcf862b519880be05 eclipse-slide-1.3.9.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 13:57:22 2008 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Mon, 7 Jul 2008 13:57:22 GMT Subject: rpms/eclipse-subclipse/F-9 eclipse-subclipse.spec,1.20,1.21 Message-ID: <200807071357.m67DvM9a028761@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/eclipse-subclipse/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28561 Modified Files: eclipse-subclipse.spec Log Message: - Fix Bug 449533: FTBFS eclipse-subclipse-1.2.4-9.fc9 - Changed to use pdebuild script Index: eclipse-subclipse.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-subclipse/F-9/eclipse-subclipse.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- eclipse-subclipse.spec 7 Apr 2008 13:50:59 -0000 1.20 +++ eclipse-subclipse.spec 7 Jul 2008 13:56:33 -0000 1.21 @@ -20,7 +20,7 @@ Name: eclipse-subclipse Version: 1.2.4 -Release: 9%{?dist} +Release: 11%{?dist} Summary: Subversion Eclipse plugin Group: Text Editors/Integrated Development Environments (IDE) @@ -116,60 +116,9 @@ # --------------------------------- # building subclipse pushd subclipse -# See comments in the script to understand this. -# RHEL eclipse has a different instalation root -%if 0%{?rhel} == 5 -/bin/sh -x %{_libdir}/%{eclipse_name}/buildscripts/copy-platform SDK %{eclipse_base} -%else -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} -%endif -SDK=$(cd SDK > /dev/null && pwd) -# Eclipse may try to write to the home directory. -mkdir home -homedir=$(cd home > /dev/null && pwd) - -# build the main subclipse feature -eclipse \ - -application org.eclipse.ant.core.antRunner \ - -Duser.home=$homedir \ - -Dtype=feature \ - -Did=org.tigris.subversion.subclipse \ - -DsourceDirectory=$(pwd) \ - -DbaseLocation=$SDK \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml -#java -cp %{eclipse_base}/startup.jar \ -# -Duser.home=$homedir \ -# org.eclipse.core.launcher.Main \ -# -application org.eclipse.ant.core.antRunner \ -# -Dtype=feature \ -# -Did=org.tigris.subversion.subclipse \ -# -DsourceDirectory=$(pwd) \ -# -DbaseLocation=$SDK \ -# -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ -# -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml - -# build the subclipse book feature -eclipse \ - -application org.eclipse.ant.core.antRunner \ - -Duser.home=$homedir \ - -Dtype=feature \ - -Did=org.tigris.subversion.book \ - -DsourceDirectory=$(pwd) \ - -DbaseLocation=$SDK \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml -#java -cp %{eclipse_base}/startup.jar \ -# -Duser.home=$homedir \ -# org.eclipse.core.launcher.Main \ -# -application org.eclipse.ant.core.antRunner \ -# -Dtype=feature \ -# -Did=org.tigris.subversion.book \ -# -DsourceDirectory=$(pwd) \ -# -DbaseLocation=$SDK \ -# -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ -# -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml +%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.subclipse +%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.book # returning to base build directory popd @@ -241,6 +190,10 @@ %{eclipse_base}/plugins/org.tigris.subversion.book_* %changelog +* Mon Jul 07 2008 Robert Marcano 1.2.4-11 +- Fix Bug 449533: FTBFS eclipse-subclipse-1.2.4-9.fc9 +- Changed to use pdebuild script + * Fri Apr 04 2008 Robert Marcano 1.2.4-9 - Fix Bug 440818: changed links to svn-javahl.jar From fedora-extras-commits at redhat.com Mon Jul 7 14:09:17 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 7 Jul 2008 14:09:17 GMT Subject: rpms/evolution-rss/F-8 evolution-rss.spec,1.12,1.13 Message-ID: <200807071409.m67E9Huf004347@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4197 Modified Files: evolution-rss.spec Log Message: Rebuild against newer gecko (1.8.1.15) Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/evolution-rss.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- evolution-rss.spec 28 Apr 2008 09:43:27 -0000 1.12 +++ evolution-rss.spec 7 Jul 2008 14:08:25 -0000 1.13 @@ -2,7 +2,7 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.0.8 -Release: 9%{?dist} +Release: 10%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz @@ -93,6 +93,9 @@ %doc TODO %changelog +* Mon Jul 7 2008 Lucian Langa - 0.0.8-10 +- Rebuild against newer gecko (1.8.1.15) + * Thu Apr 28 2008 Lucian Langa - 0.0.8-9 - Rebuild against newer gecko (1.8.1.14) From fedora-extras-commits at redhat.com Mon Jul 7 14:11:04 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 7 Jul 2008 14:11:04 GMT Subject: rpms/evolution-rss/F-8 evolution-rss.spec,1.13,1.14 Message-ID: <200807071411.m67EB4AM004785@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4566 Modified Files: evolution-rss.spec Log Message: Rebuild against newer gecko (1.8.1.15) Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/evolution-rss.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- evolution-rss.spec 7 Jul 2008 14:08:25 -0000 1.13 +++ evolution-rss.spec 7 Jul 2008 14:10:11 -0000 1.14 @@ -1,4 +1,4 @@ -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 Summary: Evolution RSS Reader Name: evolution-rss Version: 0.0.8 From fedora-extras-commits at redhat.com Mon Jul 7 14:14:08 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Mon, 7 Jul 2008 14:14:08 GMT Subject: rpms/moodle/F-8 .cvsignore, 1.8, 1.9 moodle.spec, 1.20, 1.21 sources, 1.13, 1.14 Message-ID: <200807071414.m67EE8H7005274@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/moodle/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5027 Modified Files: .cvsignore moodle.spec sources Log Message: Update to 1.8.5, BZ 454247. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/moodle/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 25 Jul 2007 18:30:16 -0000 1.8 +++ .cvsignore 7 Jul 2008 14:13:14 -0000 1.9 @@ -1,4 +1,4 @@ -moodle-1.8.2.tgz +moodle-1.8.5.tgz af_utf8.zip ar_utf8.zip be_utf8.zip @@ -6,6 +6,7 @@ bs_utf8.zip ca_utf8.zip cs_utf8.zip +cy_utf8.zip da_utf8.zip de_du_utf8.zip de_utf8.zip @@ -27,6 +28,7 @@ hi_utf8.zip hr_utf8.zip hu_utf8.zip +hy_utf8.zip id_utf8.zip is_utf8.zip it_utf8.zip @@ -35,11 +37,13 @@ km_utf8.zip kn_utf8.zip ko_utf8.zip +la_utf8.zip lo_utf8.zip lt_utf8.zip lv_utf8.zip mi_tn_utf8.zip mi_wwow_utf8.zip +mk_utf8.zip ml_utf8.zip mn_utf8.zip ms_utf8.zip @@ -62,12 +66,14 @@ sr_cr_utf8.zip sr_lt_utf8.zip sv_utf8.zip +ta_lk_utf8.zip ta_utf8.zip th_utf8.zip tl_utf8.zip to_utf8.zip tr_utf8.zip uk_utf8.zip +uz_utf8.zip vi_utf8.zip zh_cn_utf8.zip zh_tw_utf8.zip Index: moodle.spec =================================================================== RCS file: /cvs/pkgs/rpms/moodle/F-8/moodle.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- moodle.spec 14 Jan 2008 14:07:19 -0000 1.20 +++ moodle.spec 7 Jul 2008 14:13:14 -0000 1.21 @@ -6,14 +6,14 @@ %define __perl_provides %{nil} Name: moodle -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Summary: A Course Management System Group: Applications/Publishing License: GPLv2+ URL: http://moodle.org/ -Source0: http://download.moodle.org/stable18/%{name}-%{version}.tgz +Source0: http://download.moodle.org/stable19/%{name}-%{version}.tgz Source1: moodle.conf Source2: moodle-config.php Source3: moodle.cron @@ -84,7 +84,7 @@ Source68: http://download.moodle.org/lang16/uk_utf8.zip Source69: http://download.moodle.org/lang16/vi_utf8.zip Source70: http://download.moodle.org/lang16/zh_cn_utf8.zip -Source71: http://download.moodle.org/lang16/zh_tw_utf8.zip +Source71: http://download.moodle.org/lang16/zh_tw_utf8.zip Source72: http://download.moodle.org/lang16/mn_utf8.zip Source73: http://download.moodle.org/lang16/gu_utf8.zip Source74: http://download.moodle.org/lang16/lo_utf8.zip @@ -95,12 +95,14 @@ Source79: http://download.moodle.org/lang16/hy_utf8.zip Source80: http://download.moodle.org/lang16/mk_utf8.zip Source81: http://download.moodle.org/lang16/ta_lk_utf8.zip +Source82: http://download.moodle.org/lang16/cy_utf8.zip +Source83: http://download.moodle.org/lang16/uz_utf8.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: unzip -Requires: php-gd vixie-cron mimetex perl(lib) php-mysql -Requires: perl(Encode) perl(Text::Aspell) perl(HTML::Parser) +Requires: php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc +Requires: perl(Encode) perl(Text::Aspell) perl(HTML::Parser) php Requires: perl(HTML::Entities) perl(CGI) Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -120,6 +122,11 @@ # the order of the one on http://download.moodle.org/lang16/ which is mostly, # but not completely, alphabetical. Last updated 2007-07-25. # +# UPDATE: This list is being deprecated, as is duplicates upstream's +# website. I've created a script to download all packs, preserving +# timestamps, and will upload to CVS once some bugs are worked out +# WRT checking the spec for new language packs. -Jon Ciesla 4/1/08 +# # Afrikaans: 2007-01-05, Source7 # Albanian: 2007-08-11, Source60 # Arabic: 2007-05-01, Source8 @@ -301,6 +308,18 @@ %{moodlewebdir}/lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/cs.js %{moodlewebdir}/lib/phpmailer/language/phpmailer.lang-cz.php +%package cy +Summary: Moodle language pack for Welsh +Group: Applications/Publishing +Requires: moodle = %{version}-%{release} + +%description cy +This package contains the files needed to display Moodle in Welsh. + +%files cy +%defattr (-,root,root,-) +%{moodlewebdir}/lang/cy_utf8 + %package da Summary: Moodle language pack for Danish Group: Applications/Publishing @@ -1256,6 +1275,19 @@ %{moodlewebdir}/install/lang/uk_utf8 %{moodlewebdir}/lib/adodb/lang/adodb-uk1251.inc.php +%package uz +Summary: Moodle language pack for Uzbek +Group: Applications/Publishing +Requires: moodle = %{version}-%{release} + +%description uz +This package contains the files needed to display Moodle in Uzbek. + +%files uz +%defattr (-,root,root,-) +%{moodlewebdir}/lang/uz_utf8 + + %package vi Summary: Moodle language pack for Vietnamese Group: Applications/Publishing @@ -1388,6 +1420,8 @@ unzip -qq -o %{SOURCE79} unzip -qq -o %{SOURCE80} unzip -qq -o %{SOURCE81} +unzip -qq -o %{SOURCE82} +unzip -qq -o %{SOURCE83} cd .. find . -type f \! -name \*.pl -exec chmod a-x {} \; @@ -1475,6 +1509,7 @@ %{moodlewebdir}/install/lang/en* %{moodlewebdir}/install/lang/hy_utf8 %{moodlewebdir}/install/welcome.html +%{moodlewebdir}/install/lang/la_utf8 %{moodlewebdir}/iplookup %dir %{moodlewebdir}/lang %{moodlewebdir}/lang/en* @@ -1574,6 +1609,13 @@ %{_sbindir}/%{name}-cron %changelog +* Mon Jul 07 2008 Jon Ciesla - 1.8.5-1 +- Add php Requires, BZ 452341. +- Updated language packs to 22 May 2008 versions. +- Added Welsh, Uzbek support. +- Added php-xmlrpc Requires. +- Includes fixes for BZ 454247. + * Sat Jan 12 2008 Jon Ciesla - 1.8.4-1 - Upgrade to 1.8.4, fix CVE-2008-0123. - Added Tamil (Sri Lanka) support. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/moodle/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 14 Jan 2008 14:07:19 -0000 1.13 +++ sources 7 Jul 2008 14:13:14 -0000 1.14 @@ -1,76 +1,79 @@ -a84715a8094b7a85b68c5034b5b734d1 moodle-1.8.4.tgz +a76a6fdc595d6df2ea30983a8d68c56c moodle-1.8.5.tgz 7a8e9bfd778916f6a0183d913f0b2cd3 af_utf8.zip -9b9f37d032ed932fd06c294d76b77026 ar_utf8.zip -115cdb8eabf3b40cde465c3154c04921 be_utf8.zip -c6a9998af2b229d65b700595804cc551 bg_utf8.zip -3e90202bf92a24b6a7a98a90950b1097 bs_utf8.zip -038fd3e217c38d56a66ce8cb6502462d ca_utf8.zip -4259b2491fbf8cc1a9f34d8cf11c7bea cs_utf8.zip -ad832d00600d8a18657736d0a01d7361 da_utf8.zip +7bdb69be0305562ba461f5d5be110e9e ar_utf8.zip +1381d4025f089457085649b5a29f9007 be_utf8.zip +6e81f9adf79d377296dacebd95cf129d bg_utf8.zip +e5e2532a609b6cc077601a3031b01313 bs_utf8.zip +9ad3158faef3bab8f03792e17f1da389 ca_utf8.zip +f7569a844460c0f3fe67e2fdaa85103a cs_utf8.zip +fdd2e4737b121795a97e1e82f127db52 cy_utf8.zip +da8524c19afda4cd0b36eb903ba56479 da_utf8.zip 76293a762c59928f830f4cb1530d264c de_du_utf8.zip -53f08ef7c330be9f54459f391c335460 de_utf8.zip -0bd10035361fd0d488e946260fd9297b el_utf8.zip +10b84251a13ad5bcf5e22c7aba608bef de_utf8.zip +09ef420ec794d2b0b29751a448c89b6b el_utf8.zip c0d4ca43c05cc30d57e88ebad0f7b033 en_us_utf8.zip -9ff1eaf76dea40d1b8ab665441bbea89 en_utf8.zip -d56cdbd7ab6fefc6c5d7bc4245b402e9 es_utf8.zip -92513e36a562b6bb7362b521bb273f14 et_utf8.zip -6b90c778ea55dea23cea0d5b0aae70ed eu_utf8.zip +bfd6e9fd742901062c4f97fe2dc12850 en_utf8.zip +ebaf531e42a560bc3d64e83f0de67c29 es_utf8.zip +d2cdad4bd7045c756cdabbcfd0e55717 et_utf8.zip +2436c67aa626d09efb7021e37c908f1b eu_utf8.zip 0bfbace703d1e0008503a19d85608f06 fa_utf8.zip -cdcded6d20c6b684631228ef0b9abc73 fil_utf8.zip -c5a65bce540cb4bd20be68c428477598 fi_utf8.zip -588d7e179aa78b8d09e50db2ebd42aaf fr_ca_utf8.zip -510d3ef72d73edf19ee1c868db4fe75b fr_utf8.zip -b4c6b4fa701e89ff2cbb93a61d1224fe ga_utf8.zip -4b6e0ffe25a54161559faf705b0ea264 gl_utf8.zip -495ec76ac1e8845ee82cdc89ae4915b0 gu_utf8.zip -586abdd009920625a8bce454708262a9 he_utf8.zip -f8a230d6656a25c8b867406a68e700d1 hi_utf8.zip -85ffb29895b67776caa7fd0d3c7319d7 hr_utf8.zip -af031b890f06c5a578139d36658c31ee hu_utf8.zip -4a01f7d467cae7f28163c0d342b771a7 hy_utf8.zip -bdec0aa1acace7073e1165589d040e41 id_utf8.zip -05804cf66a921ed8deec6ed48afa32b4 is_utf8.zip -f07e9de2ab7649de906a90cc9304d8f4 it_utf8.zip -faa766be2c2db5ee4c825467730695ef ja_utf8.zip -d1af3c197ff9dfc89dd36fed13ea0d50 ka_utf8.zip -94bf255bd628ee1150e51ed0ec179dde km_utf8.zip +0183893528610569a822ba16aabbc371 fil_utf8.zip +f09010b98a1449acdd270f396a94fdc2 fi_utf8.zip +b95274f5e90178c86d56534bd4565da0 fr_ca_utf8.zip +40b561e72ea565d1da084a0593cc0f66 fr_utf8.zip +78ee6edcf5276843c85f79b3db52fdec ga_utf8.zip +321d298c835a5b62ab254e2a03811007 gl_utf8.zip +f8a637e969c1cc553ffc70c53a58360e gu_utf8.zip +90dc775ff1aa22ef14a77f438dcad2c5 he_utf8.zip +f461c2fcd8e9b99cc19baf77d347352a hi_utf8.zip +b1afc4d9ca0f1e21025cac6cf7add8e3 hr_utf8.zip +665bf4ff5d029ddb540764be164ea7e5 hu_utf8.zip +c47f03006bb94d7d82daea2b957f5734 hy_utf8.zip +bdda1b42c6bde969b810189e8cc5d6c7 id_utf8.zip +f32c96cca68b60a47198dc5994631489 is_utf8.zip +c9934e197b9167e87e08a5dc5ffaa531 it_utf8.zip +330f52a64f1ca15af813a81873327613 ja_utf8.zip +007c559e4b8b1f8f101e5696f359271c ka_utf8.zip +50cb02f9110683f70acc62666875234d km_utf8.zip e4e5c6265a933a1a981d454ae1705470 kn_utf8.zip -b8b4d104f7d68770d8cc9c5a7840b701 ko_utf8.zip -c260c044000cfe70fdc413961a26426e lo_utf8.zip -c66dbd1a833dbc4c81160e21d0ece193 lt_utf8.zip -f3db0c7e4b52bde7c3534f66c2660dd4 lv_utf8.zip -fdfae6ea3a39f5169e1ad61519132fe1 mi_tn_utf8.zip -ff5c7a87fc0486159c17b0c5ecedd35b mi_wwow_utf8.zip -843e0319eb4035c60a064aa23344c0e4 mk_utf8.zip +c35cfcff71d002d124b46c7dc5828445 ko_utf8.zip +e13b14f27418b1cc793cfed44c30e793 la_utf8.zip +84eba55d3c22f64f759a37b31f2554c6 lo_utf8.zip +221df3948b3c2c9b40607de1295e9b61 lt_utf8.zip +94e558de875bf4087e4b1ae7adac3998 lv_utf8.zip +07ea87d64b8509cd4890ea1ec2c55ee1 mi_tn_utf8.zip +e59293fd0b311dd54e24f76b739e8900 mi_wwow_utf8.zip +fb620762eb32dd9c07c6b4f72b969480 mk_utf8.zip 11e19c422300b9831bec3b5e64a05ce4 ml_utf8.zip -118071721fff40f6e74de373fd0941c5 mn_utf8.zip +8de003eb9fc21052f651b2acbd005fdc mn_utf8.zip 438e6baeec71e294dfefac7a9beebf11 ms_utf8.zip -f4028109da965dd8ca38b6d144da4674 nl_utf8.zip -369171d2d106c40990ebba428153a6b5 nn_utf8.zip -249660abd2dec101d4c8a0d401cfee96 no_gr_utf8.zip -27d7f33c12c4e050a81f198027585dd4 no_utf8.zip -ef6999acd8e407efdcb9970be85e928f pl_utf8.zip -fe3f4b536aa8b7e1b2766cacb3be10fc pt_br_utf8.zip -50cc33b2f16d1402988858aeb4643805 pt_utf8.zip -b2e6a8dc45147e73703552397919249d ro_utf8.zip -da19268b092ec7a98dde3b2a36cb03de ru_utf8.zip -e31ab0819d2261cacf2a11df2c12f4a7 si_utf8.zip -53149f87b83db2949e7bf75ded2b7b92 sk_utf8.zip -0a22df523d72ee479ae2486479153532 sl_utf8.zip -dbfb5ccde424408e9681a6dde1924aea sm_utf8.zip -78270403cf752f08e2d2737e91dc9a05 so_utf8.zip -94dab1b519aba7a5944d2c5013c75a0d sq_utf8.zip -f0cc5a987514b1971fd7381da83e0aea sr_cr_bo_utf8.zip -1e67b2acd9202699e483dfef69604dcf sr_cr_utf8.zip -25a77f7c72de42f4cedffe1d2abac25c sr_lt_utf8.zip -bd5e236e4bc784ca0687d61554e593ab sv_utf8.zip -7fcf4e69e1735fd607f5dcede57ae2cc ta_lk_utf8.zip -97652d1981c85eed151aec4b5a3a8fb2 ta_utf8.zip -2eabf088562909ab9f7607ab0b017795 th_utf8.zip -959c3bd18383ea46516ed7128228a6c2 tl_utf8.zip -c2838cffd534fe0b623f268ab310d959 to_utf8.zip -64c397948380171cc4cf556c897d995d tr_utf8.zip -315b0857bbfe8ed34dd174b63f7d8873 uk_utf8.zip -8a538df85d6c6479e05d76eef3af17bc vi_utf8.zip -6bd7c2fb88f37ba34f1f47fd6788aea8 zh_cn_utf8.zip -9c08c9c67ababc5124e1954440d9e0ef zh_tw_utf8.zip +2fda8110cdabc28094c2b3ed765486df nl_utf8.zip +c9578f3f6b6776f3bc078113634eb510 nn_utf8.zip +3962cdd9d0390d1424eca4359e3b9045 no_gr_utf8.zip +5bccc7273a0dedc27b2a6ed2af081899 no_utf8.zip +7ec4eabe9e8128605f0c8fae97fea53b pl_utf8.zip +b31b182ed45d3afbed68401bbe57c770 pt_br_utf8.zip +8e14110f21d4745a7a561f8e17033b71 pt_utf8.zip +abeea33610a19719d63a2fc22fbbe6cc ro_utf8.zip +b16316a146023fb3a1f8ad2a8ffd4319 ru_utf8.zip +bf4c89cd63d576baf85dbc5a5d438107 si_utf8.zip +35eb6266d40f2c1e710c8f142da455ea sk_utf8.zip +684580c30e1f5bb0028d4a213fdb11c9 sl_utf8.zip +fb21423a022849a87f560f9096ef2ea5 sm_utf8.zip +c8b6385563984eb4c18c3ab77879afc8 so_utf8.zip +8ebafa57b62c3cff2db0cb37580075dc sq_utf8.zip +7fbdea7fdf0922f93f4865ddf6d389c4 sr_cr_bo_utf8.zip +2d7ef1de22f701efc49d977c304e3744 sr_cr_utf8.zip +9307e6bda36257b9161626dace89cafb sr_lt_utf8.zip +5eaff7f155937e6c16fd8bd6fc08e1e4 sv_utf8.zip +cb829fefabb1e449afd1096d4a2baec1 ta_lk_utf8.zip +6017938ee311e0ac9b5c72a66a546e6f ta_utf8.zip +32dcd1e86d4d6700e0c5f40b1c70440e th_utf8.zip +d2589d666b844aba6cb2c6b4b78359f2 tl_utf8.zip +f8ecbaa66a21a464b7dcfd8687a7b3e1 to_utf8.zip +651a836e1240f04c6ecbc46abd7cda62 tr_utf8.zip +7e2fdcdc96b23304758033f024df6d4a uk_utf8.zip +9ca04547794a5b5e88247e8915624775 uz_utf8.zip +2f68416f3a023c515bc1b6a00c67479f vi_utf8.zip +b006115297f495527f42b46811b17ac5 zh_cn_utf8.zip +2d054ec7ff14cd5ec39c45026c7857cc zh_tw_utf8.zip From fedora-extras-commits at redhat.com Mon Jul 7 14:17:15 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 14:17:15 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1565,1.1566 Message-ID: <200807071417.m67EHFLX005674@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572 Modified Files: openoffice.org.spec Log Message: new file Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1565 retrieving revision 1.1566 diff -u -r1.1565 -r1.1566 --- openoffice.org.spec 7 Jul 2008 13:38:23 -0000 1.1565 +++ openoffice.org.spec 7 Jul 2008 14:16:30 -0000 1.1566 @@ -1,6 +1,6 @@ %define oootag DEV300 %define ooomilestone 23 -%define rh_rpm_release 2 +%define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -2217,6 +2217,7 @@ %{basisinstdir}/program/libucpftp1.so %{basisinstdir}/program/libucphier1.so %{basisinstdir}/program/libucppkg1.so +%{basisinstdir}/program/libunordf%{SOPOST}.so %{basisinstdir}/program/libunopkgapp.so %{basisinstdir}/program/libunoxml%{SOPOST}.so %{basisinstdir}/program/libupdchk%{SOPOST}.so @@ -3579,17 +3580,15 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Mon Jul 07 2008 Caolan McNamara - 1:3.0.0-0.23-2 -- Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +* Mon Jul 07 2008 Caolan McNamara - 1:3.0.0-0.23-1 +- next version +- drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch +- drop integrated openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch - drop integrated openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch - drop integrated openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch - -* Sun Jul 06 2008 Caolan McNamara - 1:3.0.0-0.23-1 -- next version +- Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch - split out arcane ScriptProviders out of core into optional extensions => bsh now only required by beanshell ScriptProvider -- drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch -- drop integrated openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch - extend selinux bodge to m68k * Tue Jul 01 2008 Caolan McNamara - 1:3.0.0-0.22-1 From fedora-extras-commits at redhat.com Mon Jul 7 14:42:27 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 7 Jul 2008 14:42:27 GMT Subject: rpms/pytrainer/devel pytrainer-1.5.0.0.1-sqlite3.patch, NONE, 1.1 pytrainer-1.5.0.0.1.tar.gz, NONE, 1.1 pytrainer-libgtkmozembed.patch, NONE, 1.1 pytrainer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807071442.m67EgROp006863@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/pytrainer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6746 Modified Files: .cvsignore sources Added Files: pytrainer-1.5.0.0.1-sqlite3.patch pytrainer-1.5.0.0.1.tar.gz pytrainer-libgtkmozembed.patch pytrainer.spec Log Message: importing pytrainer 1.5.0.0.1 pytrainer-1.5.0.0.1-sqlite3.patch: --- NEW FILE pytrainer-1.5.0.0.1-sqlite3.patch --- diff -ruN pytrainer-1.5.0.0.1-orig/pytrainer/lib/sqliteUtils.py pytrainer-1.5.0.0.1/pytrainer/lib/sqliteUtils.py --- pytrainer-1.5.0.0.1-orig/pytrainer/lib/sqliteUtils.py 2008-01-19 17:58:02.000000000 -0500 +++ pytrainer-1.5.0.0.1/pytrainer/lib/sqliteUtils.py 2008-06-19 11:31:23.000000000 -0400 @@ -18,7 +18,7 @@ #along with this program; if not, write to the Free Software #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from pysqlite2 import dbapi2 as sqlite +from sqlite3 import dbapi2 as sqlite from system import checkConf from logs import Log --- NEW FILE pytrainer-1.5.0.0.1.tar.gz --- ? G3?????}??????b&??o?.?O?b?(?SJov|?p??U????r?sv?Q?z?Re?7?RV+?7??kE??iZ>!o??}e??S??????@???8y?U??e9????Ze??+rMyC?])???????O?i???l?D?{?0?\i_?'3+ ?'Cw?{n?NBI????? ???{?O?=?x~(?C???y?kI???]?n??u????C?r?G?????.)#??%X:Jg???ys?}0o ??Is?a!U???8?"??d?g:??C?q?Zc???.??X ?????8????r ?OKo?EN??wE?Y8::????;?|b&???????d????Cn??RX|2?3?=o?Pj??(]??x?d??b _=???i????[??,q?!=++d?g?,2w%$?6q?B\/S?`?H???5 ?@~?? ???r?dk???%??4?zx@?F??|{???e ???'????W???#???&`?????o?D??????_?R^???j]???G???F?dHH???? @?Yz?:????(*????+??g???v???J?~|?-O?/??sv???;???/????????{??$V?%?:O?S=aB???:U%?y?_? 9t?,? \H???#d??n^????9?t?3??????I???h?J??v?Og?5??t}uyc ??L%???L??c6????b?H?g(? ?z??(?/J??t?^??T??K!c(??]? ????UU>&-/???F?\V?DQ??1?t?Aj?5 1_?? i??hv<????0?"?s??La(p??\?????????HJ??N,H?{R?upy?X?$?s?,???H?"??>??Zg?)]l?O??#i?&??bG?X? ?f]?8 ???kC?B?+G?:?b??`d??]?+?Sx?/ -n#T????\ ??cHS????O ??Q???x???el????R#??LJ'?b? v??'?1??]{q?-?_? ?V-06[A&?(*%fJA? ??~???? ?>?5i?j?\?7&?5h{r^0?????????8??g?? z?I??%?R^?r0???????gHR??+f???0}"?C??x`??V?_?????_[)&?x9|+q?AK????"?y`?k?_??Y3 ???Kj+?s.????#.?_????]???/?.??W?#K?0??Y??zXU???R?}?????r????s????M????.????[,Q???L)u?1 N???????s?????~0`a?Q????]cdh?)?Ut?D????)?|e????Wwhk'3?y??P s?,??v????k-M?*iy??7(????tP]??J??f6?? !AB?? !AB?? !A??f??*&sR? ????????;zI??? ???{Z/#???Q?+z???c?h?N???{I??2zuI{myTQ??5?&?d??kz?7??fT?????5UMm?????Mr^Q???????z???? !AB?? !AB?? !A?X?V????Q???/??Z\%$V????PMi*MYa.????Y?????2s?]@?l??v????FS??????up????[??<{]??K?????R??Q$?_?;???pRU?????2{??u?iVmT????dN?2????K?e?yW?????J?9???d?U????f???n-????b?v?? nrB???Sl???Q3?9??\???a??J??I?*m?7r'!+R< Q0???vQ]?3?*??{?]?G?&J??j???v??2'?(??=?G??B ? ?e?&???%?y?????9R7????-D???c%?tl??Z \U6"?Em?l? rg?R[????Jm?u??l??? tS7t]?3'?Z?K:)????8???f??[6?? !AB?? !AB?? !A??????,?o**sM??n???pj?????bQ??x?R?b ????Ym?m?????Vo??~?6?sa??Sg???????????f????]????\?Z?^?U????1[???HR?????????Ha?{???^???5?!??KM???'??????U?3w????J?(??:r??X?fj???nW??????z???JV?z?rHW ?;$^G?4Q?YiS ~% Y)??$! ??_?N?k??2?yU?ce?2???*"?????????}1r??G??r'??/?+?G??a?????'GV3DJix??%?????1???_??w?qf?Z?????J??{?;??? ??|?_Ml?fi??j?'?#-??M?v??6???6%E?*?,?W5?V?V??gGB??v?u?(`??\n?{???j5????+????????F? qV?Li? p?????????K???hE?Z?-P??(??????7e?u?vx!w???????p&????????o??DADADADADA???^??&??w.?????Jr?????????U??j???GS?SI?,??? ?} ??A???i?B??W5o?W?&???j?l;?x???8????P???L???*?????N}??!.???????z?(????.{??? ????1???/?u?#D?u?d_L??L ??[?w-???V \?h?kw???+I????Y???S?Z5? N????"?k+????Ev5sz92f&??A??&\??;L???p??F?????2]a??m??????C ??W??o?@?????b??rT?"r?x? ?8?Qoe=?U??????OU??{6ADADADADADA? T^E?t??y????o????(??"Q?u?m m??*??????f??&????s?? ?? ????W^??x???. iRo?FR}??a???n???:?e?]&?? b ??E?X?I+g???,~???+??? ?"? ?"? ?"? ?~H7??7EW???e?2???]?a?Y???=?e?"? ?"? ?"? ????tk???i??????y??v?????DADADAD??5??i?z???rY?u??????DADADAD??a???f,?u?IWk?6???c?3_&? ?"? ?"? ?"???5mW??m?}]?e]???.??DADADA?SA?4?2??????_z?/ADADADA?)G???0GDADADA?j?nF?????b?.??u?#v ????=?7,G(??_???S?DP:??I?c???????DAD???0?X?S;???? ????v??k????r]?????? n?u???m????M?K?I?m?????e]??8???????;??b~U?????Q?w???\?b-????M?E?D=?K}?>?q????? ?d?????q???n????_?eX?y??y????e?I?Vb?~Y????J)???(?>?DADADA???:?@??9=/]?W?=???^?uX??oQnRm[?aY?w?f{}Q?m????????o??r?????????"E#???[??gA??n??y??N?????s???^?jKu??K**??=?s9???X????????j???{g=J??]?5?8:????s??(?~??????/?????????u??L??Nu???A~????????Xw)?????(>?u9???{??r??5?????????j?~?#?(?x?c??[??2??/??Hjq?]]?!vl'????????=??s???]???N???e?"? ?"? ?"?'?dc7???9i?????Q???0??z??k?????k???????5~??w??g?v?+^????[ ??I?n????J?0?]$?????o??:?]????Mxej?n?n??g????m?8??k???h?m=?3^???????25!nol{?~?1m??a??^?/]??_??k?????&?;/?y17L? ??????!G???????-c\F???4e7N????5???V?z?~???oc????R e??;k1|?^n?????E4 ??\,?"?I? Xu???n???????Jz??O_?W?Hn}??k???????????n?????6????:j???+??u????U ??B?/L????Z!??U???D??v ?%D??b?c3?;??)?????K??????5nf??]X??av????g??ut?-?????r?L?????Zxp???z?`u?c1?????fH?"? ???@?"?|??Y?^??_?+????????M?-~???????`?o uW????]?m/???%o:4p??[!?????/?C?0ws#??????w??>GR???J9?W?E???c?x7?3e/GDo?m;??}?_?+^????/@?yz?????[?Y???????f???mk?=??k?mD? ????"?j??jD??#5???f?q9?8i?z?K?41]o?y??oVy?^?;EHi???e??? ? ?m?@??N???a?"?????v{m:??Pg?]?r?x???[V?9y\?}#eWSL?????r?k?[????????[?W??[?+? ??_??Z'.n?x=?a&?l???(~? ?D[5?R?V|??e??v???&???x? ?9??Z???yc????a&l?q?????Z?0 ?S+P??????_?[O??R\??T???[F?? ?{?#l???yR?\????m???F??m3???;???u???b?N+^??1?z?P?f?f????w?wq&-??4*?|??????N2n?8w?}??w u??E?xe{???FM?>?&x?o??????|??vz??0??>?? ??;1?Z?|?:nf?%??fe?S(?kWG?8M?Rw??P?W )??c3v???r? ??)*w?B???k?k$ne??? y<"?????[G??:??-O????|? ??J????Eu:*???|HADA???@?t8z??G?ew?~??a??M????uw2???^???????b????x|?@???=???r??r?M=l?qt?7????'5????8???$?? (???*???x?lu?? ?PW??-|???s???K????Z??X?????Z %??X:???*?<~???n????5????)?Y?q!U?k5?Ob??=T????.??????8?.????| ?/?????+?R?`T?????? 8?`???h?? ?Yo?????*Qu????????????? Pz?|G??sSs(??P???X??E#? ?"? ?~4?foi??5??????I 88; ???y??G?QG????????V4?"? ?"? ?"? ?^ ??fw????k???????GD??!?????|w?JySs???Vv?????? ?"? ?"?a??M??x???u?%? ?"? ?"? ?"??? ????Yl??n???.~???DADADA??@?4??g_?u?????GDADADAD????i???Y???~b? ?"? ?"? ?"? ?>?M3,?r^{???.~???DADADA??@?uX$~?p?7???DADADA?) ??S?????? ?"? ?"? ?"? ?~*h,?m?lY???? ?"? ?"? ?"? ?????????`???_???r?S?'?? "? ?"? ?"? ?"?M l???Y???_???_?"? ?"? ?"? ??y l??? ?"? ?"? ?"? ???BSs?_???"? ?"? ?"? ?"???~??? ?"? ?"? ?"? ??????O'??#??DADADA?&?????K???E? ?"? ?"? ?"? ?"? ?"? ?"? ?"???y??R???:??4 }??}??w????w=??^??875??hDADADADADADADA??tK?4C3TC???? ?~??:??+?S^????Z?*????????u^?y??r?????rM?/(ADADADADADADADA???8%??#G&h?E?^$????W4?X?DAv ????A? -5?"????/"/?ADADADADAD?????}???r????4???,? ?g???L?U/2?"?&?????k&?y?:?????(??#+=e??rL]#b}???Z??s3G?????.?'?5? ?y ??z?k?|?????4PzG???Y???*?*?W?????S??)?ks?????X3A???0yKs)??E?f??Xi??~c??f???N"?C?&?oE.????U???g?%?l?"? ?"? ?"? ?"?$?????Y?]??y??e?????-Ss??l???D?k????Zd???N ?K??@???`??;?3~?;???n?D?????o???QE =?3."8 R?"????}? ???f???&-??-??s????t>??|?X;M????*?s?????OC85?N"O??J???+m ??'?? ?v"??????8?I_?$?^?#?RA??g9b?&? ?"? ?"? ?"? ?N@??foiV???????l???L????k????Ed?T???????o3?,?H?FQ????E?fM?*r'~v???M?e![r???Z???"???&? b??f?X'B????T????8_M-z??????u=M0????F???n??j?A?XD?/X%pf4???p0?2??2?%p?ES???w?;?Z??lCd???yT? ??J??6?6*??[?????Dn?QU? ): aZ?L*?T{?*g???>G?y?????dv??fT????/???9:???l??"?r?#U?u?_?k?v??9l??????9???!?RdZD??{s?YE?J?`??????????????HS?P???/? ??j???Z?lc?8k??9c>zt????Z???R?vm?)|>zj??????E????U?(B?XC?'???????\? H?S0?8?h 3???????? ????;E?]??*??9b?f?~E??MDADADA??A0 ;??????} ????9???njF?A?UvE???W???\??S?????Vu????jj???{ ??????&????????i?pV???~?+??rl??EvV???=w?????WB3[?`????pQ ?h5?????*??;????.q&"? ??G!?1??db????pF5A??C??N?Hi??JI????C???e???????^???,q?a???????HZ??9Xc0??D?A??p????9?S ?+B??@X?? rV?Y?R????j?w?"Azp?!?a?rx? xfZ?`5?5;kF???????q5g???. ???{?z??"? ?"? ?"? ?"???%???r?^?z^??\???e 9U??K?Z???g???/(*Z?[???? exB?u?????? ??z*~6t3???&?N?@R S3.?k???D?.x%?g??2?"???"?o? k}??D?DD:?_?J??" /P(?s???_m???<??\?S?<]V?#???6? ~??i?C??4?>???qas????? ?1~GC?6?~????????lx?C????jQ?B%^h?E??3?+?k?g?Lt???q?0*?????q]x?&B?????g??}'!G?>??^?????D???? o5?)b?@??k?{[????????|????\?^?-q????@???YdhRs]?R:???u?e?-?q?e|S??E?l??Y?`?@? ??+?[? ??i4??W?????+??r?????M????^v????i'?N?T+e??0e?GH???rd-?.^??r{6>?H#8$??#?H?|?l}r? {/?`iNO>~v??Y?/w?????Q?A?QkVB??????Ud?kp?D ?9??uVQk>???}?x?G? \)?V???`??E?Y?Bzb?f?~a?~AADADADA?d??????h???Mz????????g#?? ??q?q@?M??%??aB????F?!??@??!??S???^2 ?e?mg?????????5?C z??????%\#????lG?^??g?2?7?*???\???I?z?2tl??n? ?`t??u5x??K5?????(HI?.tzq??r>??????Nj?;sJEJ?A????O?????????????kB?u???)????8?? ?????????L??2Fz?vQ???E??4????'rO??s R?X?????b??.?p? V#XS???`??A?L?zS@?;d?C??|??#M??{????????IDADADADP??????4?\S???@?""?????????y?+_T??@??*?? ??W]?V??h????:,??C?lCZ?q0?? ??Y?ZV6cUj_????p?\???7gj4??j?1?RF?lT$?B??????*?k??{\~??w^??6*???2N?g?/a???? h?^??:??pbqiS?`???8??_r?Ysp<?u1?????=Zaq???????)\^?;b?f????S?'m? "? ?"? ?"? ?"??A????4U?????@j?.?d?~r???????X4??RN]??f??=???????}7H[??6?;s? :??&?_?????s?~???q>z;?t???- {?8?|F?~!?jk ???=???E?=?????MADADADA??`???R>???-E?RP???%?G1??=??#?? ??????????hz??w???{??O??????V?E;/? ?55?}+??????>{ ~_???:????/??O&???_??_??Y???i?g???Y???r?????gDADADADA?i,?e????<,?R??E.?*???????Q4?"??_???B??sD???????"?CA?9??a??]??,?9????F?>????lPn??E?=???=? ?"? ?"? ?"? ?JN0 [?f???9?4???? "? ?"? ?"? ?"? ?"? ?"? ?"? ?~???|?y9??????&? ?"? ?"? ?"? ?"? ?"? ?"? ??= ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(?{?g?????|F??7?Y??E?A?/?Q6(???ADP~ g???A? -????Ae-?_D^??l?Sk?[rd%?y??GDADADADAD?=????mjF?^d?EVM?v1?X?f??k-?????(?H????;?c??;uT?")??+?*?????w@/?Q??BdE???^??A???????????V????f???~?*?W?????S?pJ??=:???b?YoX??$?75?"/?Q6?????=?w E?e9"? ?"? ?"? ?"? ?"(L??????=?????*???R?"?h????E?^$|??ETG?BoG(??"?K??????+??S?k??????l5PO??j??YEPfLTjX?J$6??4????[????cM@vV?]????h??~Pe?Q?0P????L?s??co?E`c?F?KtJ???????|?P?(?Arzo?5???c-}>?:??]??:?-? ??-????Nf#d?kF?????W???*?<,$???? ?"? ?"? ?"? ?"?+@??? c-??m??a?PO???]g?s?%?S?#?????????7??? `??Nfg?g?k??C ????c++vX?AeWG?? ? ?Iv????GaB?B????F??;1j:/?U?g?Y??}}????M???? ??w? l4?B??J?j?U?)???Rd?????6_?W{W4?j?;???Y??wjk????????+j'L??Qo??? ?g? ?[?????g"???*?Udh??8??? ??jeg????!?'??j?3?R????b#?j?K???3?Q???s#?H?^ ??eJ?R?Fp?p:?ZC'g?G)i>?}?v????Sc?=;45#?????Z>??+??????{b??'6k??R??Ss??a??%??4??0{?DW4?????HO??g????}N5?0#?????aeR?`}>????S ???@h?tS??ki??????s6???????>?V+X????!????\3??~??? ?"? ?"? ?"? ?"????????;??-BhY?yWg?}???nj?g??H???v 8s=? 2?&4??g?/ R S3?^?v{?T?????"????"??&.??v??? ?r??%???-?? ?z???????IJ??1Dp@=? x}!"????ro1?I?4??W?9????????'b???(?A??4x%???m?????z#?zB!?a\??n? ???QS~?Y?>????*3,?AO{-F?N??)???p?/<:C??<|?kV ?!?Mw*???Y?*?E|??????????{${?5??O/HIq"?=?N?x?XEN????#????()G??N??@???g??AX{$}N???E?a??????fMx??(a?????/?r??T????{?<?????z??C????6??>Jzt?????+=????H???]5??f??%??4[%x?????1D?/t???Y??????u?-8 ?g??tGB??;H?"? ?"? ?"? ?"??????gC??>.?S???H??zO??yBi????9T8??7?L?O???V??D???\?}????{?n?#B-?W?? M????????wv?v?8?????????wi?H?*;Pz??Qi???}??8?'?A3?]*tJ?,?pUE??tcv???6?m ?YV??????s?r??? ?"?[??????S?>?A????Nzz`E?L ???l??Z??XK???2?W?*??wg?]?4???r5K????????????t:?8k~ SF???Q?C'?R?0???#?GmG)9???x)G????("????wX??SE???q???????4?E?????2???ei?9??f????m?O~?2???!?2#x6H????????/?i_G??f?????X?FG}?3??^??xjP?Ex??????o???_>N?????,??$ADADADAD?-}w?l$?W? UX???E??? ????p?*?? ????X??W?1?\P .?X?????F?NrS?c;BJ???z??u???@??z5?h??{\~???^?(???????xWZ;???L?q????????d?5??[Q?@??f? ]-???l????a 0???U????7$??????T?@#x)??:???W????f????2k??F??K?-?u????}?2???g?R? ??(?????G?i?Y?[??? ???N??s?T??????O?X??Q?R???cK???Z???FVzX?????N??Ol????/??9-~6L???gH???z?z??w?????????6???????]c,/??]?N?Y??A]`nD???m???Z?|??4[%x??????:?h???Wp??m4??Z!{]C8r_y???<:Cc-?SDADADADA?????H?j g+UY?)"?)? ???J??=8??!J?????w?_L?Z????4A??q\=????Z?Y^?)\??qfw?\5!^?s??4??F?? ??O??/??L???????6?B?O B????hf??;^? E??W`i~?X?????tk?ei??????????{??)?X???????O??gv ??C[(t???ad????3?9?????/??p?@ S?X?????[K????cS3?????"?j? ??H?? ?sd)?u?g?Ox????I?3d???u??G?u?C87GWxg? ??q_?_?>???Pr???07?@????C??=c??;X???r??W??x<6???x??m??u ??????!i???/~PG?'?"? ?"? ?"? ?"??? ???o?Q6???? K%o????[A??|?? t?? ??rD?O?st?????a??q??ks? AV#8?????DADADADA????????DAO?| I?u????F??\?J???? ?"? ?"? ?"? ?"? ?????????L??????k?;???k??5.????*??z??&???cM?V????"?Y????D???8??"?$??o58Ik4nE?w?h?M ?K?W4?????????j`?;??-?2+?w`?R????J??k?J??? [????kw@?i?D?P??45?"?8??ng??eG;??-"?25?O?(???+b?THj?????Au???=?????h???????Z????:???????*????C??????iA8?Q?????g???3?Z?{??z??_?X?J??"?t?lY??N9?? ?h???fxJ?;tU??)?@??D`v??? ??F?????????;s????x?p??[)?.??????Q???~?*??&_SF \J??V?^-{?hF?Z???D`?G?a????jD???0????&??????? _p_?? L;wjP??+.?;\mM?}/???z????098????????Bn?p}+?!bf>Ji6H-sn? ??N?f??VvV3????3$?Jw?V?yOI???{5Gfz?:?8:????{n$i(????%L)?w?? ?p:t?5v????=?O>f?O?Q??9?g??f\???!?Vx?2?ot?f???????????('GDADADADADA????????_?gG???1S?@p?????n??N???_?3?S????.G??G????GtV3G0'??????#6??????a"??7m?!e 5(?+?????!??U?N???nQ??%g?z???Ye???+?}???>3???+lf?3????!??n???"x???????Yo???]??? G???r??(eJ??`?>?R???1???4!=h?O?????3z6???cJ?a?8&?O?:??? ???W?j?(???}'i????? ??D ?|Eb??]?`j??*???k???e'?m=(????2?z|???B???Mq??B?k?9??rg???=;65?z&GDADADADADA??>#~?[??E 5e?Nx79?s?U w?/?A? ??u?/?A??s?<F?F????l???(?iL???Y??&????????A???+|G?"? ?"? ?"? ?"? ?"? ?>????R??U????{? ????ADADADADAD???>$~?;?FA=????]c?~w?? ??V?i?k?$i????????)?u???5??.?e)?7??????????k]??|?????&? ?^ ?z?,??9jg??y 4_D?Z?)?3_???YU?9"? ??O?,{??????c??9???3@??mO>?#???s??A??#W???E#?? ?tl???N&N?! ?'@??a??9?- Kc?}9"? ?z4}w?l???T?b(?z???V?r??:"?U?^$e??yE??A?&}hj?,???Q????,G?/EUEx ??s? ?????C7?C??c?n??O5??j?r??r???W????o???_?#??? ?,??W?????? ???W??@?,??V?????s? ???}9?"PQHW??????|?g?:?4G?? YC?Z?h?T??9B?5??d ?????\P%J?:%??W?l????}???)?\???! "??}w??\??]???lj??t?lj~Y?,K?????}??8?^???????m?:X?+?s_?sS]??j???????t???B?ei~?r??MP?S????????#?"??WZ?? ?fb?6????????n?C&??_n?u????i~???????]v2?5$???5?&???&XnE?\v ?q?????&??"???u eJ????+?N?nu???j??(??? DP?U!????f???v"Xe (?????????rm]_`?@?0???{?44?r??Z???N??k]??j???c??F]?V]?n?G????*??????M???Rv'??OZE:I????,?6?nz??5N?i]H7?????KU5cQ????VL???T~z????L??V|!cY??????e?{?Jy??%? ?38%?S-k?:?r-t?C?r????!k?~p??:??vT?Pe? ??? U??vp??4??!???G?285??!~??R??????e`???!?>?nu$?Y??m/2?z?J??!}+k?Lz??E???S????!.????????|^dg?Y??E)[?i?u?? ????J?(??#V7U?o?$2?"????_[|HW?uiD?L??r??? O,?^e?%????"rP??3Z?ud??7?^?r??s????8??Uf???????;d?W[?1?T?P?[j[?Z???#L?f?l)e[I? ?W??E_w?G?r?c?Y?YG?????;???i!??t??? '?N?b?h?j??Q9???^?y ?U?'?u+??,?S^?9????@?????$?=UV??g?m??n#{k???J_tm]??:N?=?U??&T??????\?????>?^?????M?????i**????O???w?my?\lyl????8.??go3?F????{{e*j??S?uU???x??R?k?q????????f]?.???N$????8k???I???[?j?#F?b?{????kP\\??U??O?Hz????aZ?3??j>?_}4??f(v:?U?a[>hz*G?????r??Q'?js?O??./??OTK?2?`???e1O\`?P?{????.A??"???bx\.???3u???s?L?S???h?EL?????*?/??????@2?????h???W??????N?|?l9Q??:?ti???g?X?5G?5???Su?:&?F??? n? ?????'?? ]t?S?L?NzEU{??G?;9?^;???I? ?????g?????j}?{ ???g??U??V+X????+??jl??2?)????Rp;????R'?bh??6??_;p?K*?c???y?f,\[7?;????????????j?~Z?[???jp? Ff?[??X?/tq??w??? G??????1??4Vp?????H??k?h???n?????????}??5U????v???Q_,:?gXHw9BJ15??5?*e ??ph?c??!??j?)?o?/:6e ?? ?????U??u??j^??&kH???6??,G?k)?f?????????C??*k?Z ?????m??Q'k?? ?"cs?^???Y??2????z??V+;??E??????[v?7??h?e ??)?????E?????,~a?_?* a???z????0w??(.sn????&?(???n??~q?X????V???=?\?C??c?????v?2?????-???_??~9k??????FA?@?[?J?SPw?4???p?????4?q?W`?/?q_e????n???.'+?F???h???? ?j?/?f>,??????.??*????B????_??g?&???8?s???????_g?]?R?h=WG ?B??{'>???Qi??????jVzE??^???"?i?9_r???J??x*~??i?}t?B?@?9Z?9?(?7?eu???H??OV????wts6??????N?l?P?Y??????T"????-[????????pR???j???f?????_?"??K?{??7?????A??7??/?V?}?O???n??`???d???Ms?BK????j??9/???]?y?_????`??V???Y???]e??????z?????3???<6g?!????cKN?8?r?_??!?????cK?;05G?sN????Q??~??u???^P????????2??(Ut t?????^??'?Z??D? *?????U?? K?;05??+}?B???9VB=L???g?~[???){w??N????M?g???I?"?TK??????E??!??)k??F????H????5d?F?Q??I????|0~6???58?Fd??V?y????k??d??0??cBF?low ?7?????e??wf????4??y?S at q?Z?Y??Qd?@?55??h&?1???wj? ???};????m?>B?C'}??d?35[)??>Do?l????G??#???????H?^|;??Zu?Hlj???k??ATO]9?>_?h!=?6A,????: R1????w?????eb95?EvV??[-?h)?t??M???-?g???+?????o?q?IvG?Be??w???Vxe??]?lU??i?7? q??????b/??_:??]???' ?<????%+??!?'?N?}??????E?Jp6g???e??????p?? ?g6?HUi??VG???Jq}??5???7x?b???m?CT?r?????a??????O??X*???=??Y??w?AW ?>{??$???(?????&v?;w]????8r?????q2 M?; ?irC+2j ?HW,?)Zv????M??fq???X?2???9????????X?]?????w?ou:PsB????~@"??:?'M?? ?`-.??W4?ww?6???/?~ =?. ?t??^?^??p#??/C??????6?/????#yF-w[??g?h?d6*%?J]/g#?????`?l>/??;y ??.M'????\??c?w!04?nu????]v,U??_??#?T}?v?*?'M?}=????????Y]G?? ?h9L?????!???\{?k?????????L??(??W?Y??? {??!?s6.&???a! ??+kH1?x?"i\?^OH_ulw 2?9?5d?8???bj?Z?Y??m]G n?O?w??_?-??I??G.?R?E{&eh????eI?????j?kF?????g'{?Z?fg??????&?c}??????s???wd???? SF?????NI4? sgi?s ?_E??N???Y??????????zp?G?FA?0??*?G??? ~?C??????????O??_)??0}?CA?6???g??h? ?/0????????4\??pa??J?^?G??V?z?.yc?????r?^Q??+?????????K^?v????C_?#??]????.?|?=?E#?W??ZE??#??q???rd%?~7???SR`?] ?/?????@???2????d=y{?~????J=????9?-p_?xie <~? ???~?? ??z????????n?9"?8?_?f?BJ ?_??e??yA??;~??F??@??f?? ??p??Jkph?Tq/?h:?? ??u???????'????z?a?&??ro??E#?q?t???NQ??)Fx?j??pa??*G?d5??Z!?!??#??P?????_ ?_E????om$?ws???$6?e????#?> ??yq???)k?????Qn"(????9?-p??X??? ?-pU?xme?N?n?|??I'=;S?Wh??O?N"???????????h?0??:?|[v???U6A?6???g??h? ?x??bf1???!F?n9 ?b??t??? ?}?w(???q?????? ?RP? R???[????,A?S??I9?-?D????>;??????NSP??g?i?|?m??]D^?#?~"????#?????c??e[????? ??b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?2A??MADADADADADADADP^b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?2A??M?????????a?]u???S? ? G?(H?ou??e?G??e??9?????W???.?e?e?Ks? ??`???G?O]/??????r??6?."?,r??i1st?U?$??=*??V#? ?4}??>?[????? "?cA???g??kA?,2?"_???}?$?'????e?????DADA}???g???]?Fi???????)?b??[?j??????????:??V??1Vm???~h?UTEU??Y ??_???nl?_?_ *?T?{?????A?v?ik?fX??????sD???@(?p???Y?????-c2?~?>;?\?/?AG?Sqx?F?????Wj t'G??0???A?q?????b?z??{9?ERL??@O'??I ?*Tu???-???k)?_?#?z?>]|U??R?6G_ ?,??????????~2(??w?|??U?d?'?`?}s?zT??g|???????H??M???4]f?0?"?$r???K??h????_5????>???J??!???>C? O?DA? ?????Z?F-;mqm???.[??!????e}???????P-?V??O??WT????o???v?u/???+| ?e?_-Gp???vu????W???c)C??;???6Ao ]???M?????????2??z[3??V?k:?? ,?^??e3?5?Y?G????&??Y??e??{F?H}7??T?4?"_{?U????I|???}???h?kyn??????Y;??4?????Z????????]8?;??}Jvjv?E?A/J??-???M??j(?? ????????Ad? ???? ??5r????????=?vjD??yq?&?T??=;????vV?y?p???G??43??#Y4??????L???5*????R???YI??Z???>????+????-????){???????n{??A ?]?=?8@?=4?A?Rn??#???U?" ??_??~?? >??U?[?8??~??O?I??6E??e??O?????? L??Z????????Bl??v??L????????cJ?iQ???[?l?T_??t{e????C??m;?m?$???????j???HU??P?gn???Ss??xZ:E??:?:E=I?(?go??@4-?7[3?????t??7J?L/????Q?>;s??v??????? r?G?8Wih|^?T??gk?????P??g??????5??E?&5x???:??}1??l???!%}R???][?? ?K#??:$4???z??:B'T?? e?L??T?c?????~!?g??rZ?"2???7-?qFs{?Ug!7??k T`0!????_dy?U?????/??l??#??O??S3???? T???Z]JK]??=(y]?,??25??r??S??}????B??sp???Z???o|?&?? k?p?t??7Xc???D?? s?? ??:?t??????????????9~WG) x?q???$???4?_?]v????V??d6?6???0?!?????e?C???~????.?_??+ ,=???q??/?N?o???????t?????dw;,??fWojU?D9?U9#w?X_?>RU??d?^??l8???5/???0?l8?Tojv??f?zad?e??????b???j?x???C?{??????EA??????2??]?\n3[????9#G?_? [??Q?????rz?'=?DA?b?'??-?.p????)\nO????;`????E/=???|??e??K?6???Q?gnWH?_???0???????8????d8Xi??g????S? ?AO?|???d~Q????H???;????T??????8u???f???"$???R????$M]????f???a??m?3n??????Y??U?|?n?d?*?}}????????????9I%?O?o???\??????v??*G?Sszc?l???h?_?w??/{Y??+*???v*k???????O??r???cM ???s??2?/?)??@????{???$?l??r'?OZ??Px?????O?3?g?&?J?????s?? ??6?\E?u4K?Fw_????L?(?)?Ehj?r??=?))~?i???~???U??WB? ?`??)?0????::??8??hy??[Q?Yd?a?g??A?Q?Hwp?@?????????1HP??? ??'E? ????,?>??????????H?7????QG\?a??Uo??,?????:r>????~?s6A?Y???lP???&x??s,?????0??????Y?/a ?L?wjVo???V?.??(???).?+?_?]g?8x????????g? ????????`-??I??* ??]?F???u?\?[?.??mQ????=?g???????> j?G7??P/??????pz??]?_+??f?Z????]??+???Mx?[b????=????_?????? ??e}???????l?qyp?}~?t\?+;{???? ??w???@???OA??A??[-?Mli?Y?SL????[Z n??x;??(~Ik???P???`???????(???X?"???+h?v? ??F(???Z?N??????FK? ??)?n?g??????H?w?`???!%??Cn???n????<?v?~?ov?g????.???w?n?=?m??Z?I??& ???yP'n?e???g?!?????$?7 ???????]\??????k?>??LoiV+*?wo?F??u?45?"~?????C!@???Jo N05????K?? z(}???????X2?? ?8$*R?'?&???f??.????o?g-|C=????}?(???a!???okw????u-?2L)???u? ? ??Qd?'p??@??????e?????m/n????k??4??H?q?>Lu???+%qOdp7??NC'??? ???? ?E??K??????&X??????p??????~G????? U?W???A?? ?????g?4???(}???N25??X?????}nj?,?????*sn???4?~SUz??????4?.??l????$????W???O???1?|8'????Q????????U??/??R?F??e?#?????M???P?g(?I???? ??H?qlW?A??S?9??_v?^??0?6???\?@?????????bo?Vk5???E7?????*?;(?????'-?? 7?z%???&u????6?f?_h;???{???w?J??w????3~??? ???w???"$?????s?f M?/???5%??/d??]??(?(???}?g?y*??b?0*a?????B????U??Q?l/~??R?+u??H?Q??zf_ru????(3.r??KZ?4?f????A??>?.???}????????kzE??_??M??@?tq0[? {?Y???RE?? n??C??R????a.??`????RE?V?U}1.Z?A??h?V9??[?( ?E???/??)n?????55[??~??z .?FdV4A??n?8??5???\????V??N???8???q???*???{?B?!c+b????5iV (]?v^?.G?E????G??ai(???W???)????~\ ?G?>?X?{?8?c??u??Ed????????"D jn|????d5????*T????z3= &????H=??Q$????k???|??\ K??{6,????o????x???m{?x??N[?d-|T?F????? =vA?S-?R??????pXa?~m???9??7?r? ?t?????!?T?w????-r<|?????5??)'~v???2w??????k?pU?????????B?N???oX???!?2?Q??f?wg($???c=??>?}Z?????Z?TEQU?{???F???m|???^?(??????s??z???????_?????????B7#?:??n??6????c?????BU??t???[%7???c92??=vbu???q?k?#???@?}?u#????O??;[.?????????%??U?i?]?t????>??t??1]}??s??X?;?p ?? g?i???Gw-??V??+?a??!?z????(?X??Y:Ey?N!???t??????+?N??????F.d?????p?4??c???F85?0??7?No??:???&? ??%??S??-?5??f?h?{Ke?Z?Ad?8??`??D?11?}V~+?nj???,?U?V4?Hc??%|D|x3 }i?7%~6??????-GA??jR[????????"??O?G?????r??jB????T??+??wE??Bv?F?g?r?5[8s?f?eI?Q?t?????$o??.?a!#~?O??B?u=JIV???:?u?????cK?????g???)?(w]?]8?b];V? bP?n[?V??^u?."/?A} ???he? ?z????Yo?? ??f?Z??FADA????DADADADADADADAe??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??L?gDADADADADADADA??~o??v?{??????Y??E?A?/?Q6?*???? ?"?P????9"?????v?_.k??"??E#????????r8?~`?"? ?"? ?"? ?"? ?JI?7~?ej?z??Y5!??,b???D?E?Z?????Q$)G?O?i?S?????E?&z]e?????A??r???G?h?E?aD??Z?[r??@???U9???????lPn^??w?G?|9?Q?#GO???????f%??????R?e9?g@?a??zc??f???N"k+??\j???r?v?eiN??????"n-Eb?&?qP?}#aiTv9?F?&C%??y?0x?????"?AoG?A?`Z?L*?T/?*g???.i??E?R??#?_X? ?[???g??!?st??V+;??q?}???_???????B$???Vv?/???? 9?"?"r-D???[???UP???????0?=:i?G???B????(}J=os??:???h????????#?????g?l????e{h?D?p?/=Z#???F??/?)?f??f?x?C?k????,?>RwO?O???S+mz?p??l?? W??"??=t"Z?????d???n?k??)?????Z?`E9/?Y4??h5d?O`Z?b ?`???????5?hi5@ADADADA??A????V _???W v???RO??nV?V?TC??8(?M??.K ??y?a?*q??MT;]???*?M"???V?_??xE?Yd?b`)4?<.?^? /?^?w?V?f???@3?[eV?F?D?f??????=?(??vECA?????????????(??45?"?8?7*|?o?X???\,ej???QEW??????;?j?w9??;k?C;??/??&?[8?_?i??????s?.*;???";??>D??J?(?????????p?/<8C?}?G?????5??*???????#? P?]??#?l??x(X#?Y??????t?hn#??)?*?9??tg>?????9?>5?[????[??@??-??i?4?W5[)??????5?e???!??W9?h8??y;????W???i????????U????*8k???? V#X??Y????t??W??5qo];O?4?k[???8f?`?g^?_?C???????7~DADADADA?}w?l ?Uc???8L9?P????"P=? nXE??875?S?????6?Nare'?3 ??vXX?5b?W?????>G??C%?}???SG??HIv?????? ??QT??^5?*??&_SF \J??V?w ?@E?Rhi>?#8?x?#?,5$z?Q5?5????G???2???Z?yg0R???g?? ?<:C?"|?k?E????RNo]?U>????~???c??p$??(wzy?.7???}>?ZC'c??)i>Bz??????gg?l?a`????`f?\}N?{??;CJ??k&g?xV?k? ??=? ?V?h????d?M?.??????@??5??79??$?Bn#8?_??z?b??%} ?L??J>~v????y??k_???8o\????~? ?"? ?"? ?"? ?"?w??;~6tc??#????F???D?{?I???Y/????C%?Zyw ?????+?~GC?6?~?????j*b?!?L???P?????3????g?Lt??D?????????,?wi?+S?N??????4G?????lT??f??"?O?.G05?W}?G?4?H^??????l?]=???z??u???`p?w [{ #A??k? ???u?e?.????????M???7??????2s??J`??7sh?eT}?|??9?]???0=j?:?M???r>? ??ERND??4r??M?a??????????/?????ID?!?+X????g??Y??y??`e?~b?&?W???tn?t??f+??? S}? ???"a?kp?E ?A?????V?pV????????z3???????-K??????!|1??D?q]?MDADADADA??w?????6?.5?C"?^??/Ptw?S8?? ??/ ?s????=XM?P?=~0M:???A??Y?e???? P???D?;G???????g???A??V+??????{B5?snb??z??8?/Q?%??r??X??r? V#??ADADADADA???? ?"? ?"? ?"? ?"? ?"? ?"? ?"??????DADADADADADADAe??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??L??????"s/?92A?,??"?_??@???Y%???&? ??S8?~F?:Nh)\k? *k??"??=J?x_?#?"? ?"? ?"? ?"? ?"? I?7~?ej?z??Y5!???E,\3???????;7?HR?????V?1u????j?g????l???4?u?DADADADADA?????L?u+??"]%?\[?f??"?Ev?K-R5"k+???`??;?3~?;???n?D??H3??@05?*j??Q?q?v"?(???L??[!N??[r???.?/???87??A?????g???dY?m???:???J/?Sc?$?T??D??G?ADADADADA?$????.?"?:??]R 8?:?V/???,??"?E-?J?z?YS??????;cSsY???\4"??*2\D?F?D?6???$?A(??? ??B???EB?X3~6\??? &?}??H?7"k'????b ?`???E??u?M??????6??*A \n?T?*???????"k)????????a(,"?J??6?6*??[?????Dn?QU? ): aZ?L*??VD9[VE?9????6??'?[??Y:???~4????iGuf3'??#?????\??+V??a{?????????? 9?"?"r-D??f?*???nXE f#C?Yc'?????c-7G?Zn-??=?25+y??V6?5??K???;????9_??t???h??.??i)???e{ ????????|?[??+??? ??fq??b?N??????n?~>??? ??3?h?8(wM&.?^?t??^???V??f?q????j?*?Sh=;4?jX?J$??Z%H"(??q7?SG???qV?]??|iE`?P???.?`???5v? ej???Q?DW????.?|O?Dv???5??l?N9????-???J?p ???eWG)S???j????=??tg>B??????Sc?=;65?r?? ?-????P??????=?Y???a ??A?`j??m-z3???I0i???R|?r??=C>???;^v??&0k??????!?ODADADADA?"?w??F??X??,|?wE?05?v?:???x?bZE?t?? Oi?/?U}:l???????w#?aaa:????MU??????\*??#?'?fvE ?#?.? q??F??`%t>? ???!e4??;?"???(%?G?????r?}j,?g??f\???!????a??? e? ??????qq???]??a???1??)??d?G?3?3=;c?g??? ?Jf??h???Qn"? ?"? ?"? ?"? ?"??L?????9R??Q!2??Z?(t?A??`?g???"????T?l???Q?f?N?@R S3bcC??1?6X??????|?G???}???????>SN"w?U#??E%pV?(c?9B???6????p??????B?.?????T?| ?x??97>???????3?Y?S?)C?;:???z??4?wP???`??; 9????1??/???Q?[v???m?S>F?????N?????????|????\???-q????@H???[?c?????t?????:[???!O?e|S??E?l??Y?`?@? ????[oG??i4??W?????+??r???m???A?;?dX?|a3ND?N?V??a??????'??Z?]???/??l|?FpH?;,#??i????Za?????????l ?0%???L?x?[?Un9z(%??O????????????+???j?|>DADADADAD??@?? ?U??K?????h??,?D ?]?????(??;?p>?[?(tP ^V?P?? ?.?i??? R??????W/?????3N????N05[){?|?g??`A???Q? ?J???U??p????E1?B????ES????g?Z? 4n/hx?C????-??K?R?/1l?C?S4????)((?3??W???z???j????? 6N?N?9?5? "???8A???@?#?w????$??/?n??????????s??W8?tTg??*2??EW???e: ????hf???_?~?VI?3d~???"???????4???Q??i?(HI??????????R????C'{?g?G?/'???YK?????g??fX?D?[E?z? &h? ???m?A?????????l f?????}Q?????????????5?Y??.G) _;C>?"? ?"? ?"? ?"? ?"?E???????}HM???Oa{U?????F?C 5??|? "????A0?X~?????i+??f~g??A????H5z N?????@??G?5? ??????R?e9z ????6Go}??'? ?"? ?"? ?"? ?"? ?????m???V??E?J?v????E?????Z?jD?V?????v????????E*?^D?A$|??QE?=?3."?N?E^??? ?p+?6??????O??U9? ?F~4?|>?????v?55???[\/*???5?N"O???/?.G?ADADADADA? ????.?"?I?????*???Y?"?h????E?^$|??ETG?Bo????0?=:i???5?5?????cF?s?&?\??j??F3????X??Q?R???????^???Mt?????g0?5/????`v?hN_????[P1?a?'?Mp?????Q9Mv??g????????G???u?????&?"? ?"? ?"? ?"? ??}w?ldZ%|NV^ ?fM_K??qAg????HT??B?}?;??sS??MW?P????$u?????qPYE?I?j#?Hk4??4????h?@?;h2q???f?????#?*?5[ xq?Z%pV?YA????????.?aB9????;????X?O-K???"0R?bz?n?iG;??-"0??=?FBW????0?;j'????????]??????h??M{?D`??????T??zn??Q??>??D???1_k???j??xp?T+}??G?e8?.?"X%???f?J?w????????i???5?8k~ S???V+X?` g???"g?GH?q"2r?k"??????c=O0?G??.Pk?)??f+?u?;?w???S?lk??QOr?i??S?K??N`??????????YXn??2#G?? ?"? ?"? ?"? ?"? ?R?w??F??X??`??3p?2????t?Y?}???H??? ~6\????O??z?????n??????PCv{e?????yP???y?k?*B?]$.??Q?;???Ze????u?]t4??*????????@??`?????[ "??6??^?F?Xz5????Uw???????v???:???????s? `?? Z|u?S[Sw?K?Y???+j'L??R???? ?g? ?[????.GfA4%uT-???l??;N?f??f?Z?Y?`?gH??????????"x???L?6?g"B???~?(??H<?Hkz???!Y??Z?tJ??N???R?|??????%G????{vhj?]?j???? ?o??`?z??5????;??`jW1???F?4??av?rf?gzvz???G?f?_?u?U3??? ?"? ?"? ?"? ?"? ?^????H????HDf??I5??7,??????g?g?gC???Qg8O???AJajFhlh?=!F??[ E?7 ^?EE???]$.???D??a:?_K.?],:?.????6I)??2???\?-D$]V?[??-?????GtV3G??_}?S??D?P?>^m`?>("v??????M???W?qo?V/Bd1??|?-v?x?~1U"j???]a???f>/????;?}????8J`?)???p?/<:C??#|?kV ?!?Mw*???Y?*?E|??????????{${?5??O/HIq"?=?N??x?XEN????#?????)G??N??@???g??AX{$}N??{???~)??????qq????? x ???-?Z>??95??>C>??3F?????'??:??2#G?? ?"? ?"? ?"? ?"? ?2A???7??k?/UY?(????:??y?h????Yuy???V?? 0>?Z]???bm?rB?n???? ???NR5??(^?/4yP?*uW?????i???4??;??q?5?? ??D?[\A???<????z????.?? 4?u ]??K3????|????5?i?? ?[-????????r??? ?"??Koj>?|???Z???u???+b?bX?7e{\??w?Z?????>~V???,5?v??p??????._)?(L????M??????0e??N:u:t??? ({>Bz????#k-??r?????"? y?e???s?????k??f?}????,??N?`?85?1eY?=???? *?)c?|?g?????G????'???U3dF???2ADADADADA?O?? ?U??;?]|I??e|?"?]???????gCq??M ??\?l??J??*?*?iWs?1?[?59?HA?W"P}?\#????lG?^2?g?"??????C??[@??nx???f?????z?LAq ??H1??3?5?)?????j???$?NR?l5?? ?o??6R??J3??k?????J???N??I???"???Oy;j?????Yo????2??/??????@j???(lR? s???A?G?? ????^2,~H9s???j??????)??sd-??`-?r{v|Us??\?? ????W1?.T???yAL??R? ?$>???`????#^?h?In?wlGH???Q?p?n4? ????P????{\~????lz???"h?????e\i???25?E?J????????=??????rM?HI?5$?P??[??:0yM??G?UoH8??`u g? X??????4????_z3[EvV?5?}???%???:??????e6??????2;?Q???? ??????ky???/rRr?B??????e9???|?U9 ?????|?3z??????????kb?????h5?"? ?"? ?"? ?"?8}_???*r?D????h?~?[g??? K???"K/???*?[??gM?*r?;?????\"?%?H?h?"?EdmD\=?X???-?I$,???? ?\??|5?H?k??????&?@?#?7"k'??u? R,"???"X%p???[n6??~??eV ?`???ER???k??????qk)?????????F?"???r???M?JD;?Va"??oEP????????r?T4???r??????]?)En92???-?0???z6??>G??l?????'??????NA]?*DR??jeg?B?O??C)2-"?B?k?E??nXE ?????g0}?l????}?0??5???l???A???T?v??l??C#??hTPG???????l???n???2??S?P???G????r;??W??f?? ?Y3R?`F?s?/?g#?`];O????ud??j?????J??u-3e<?9?n???(DADADAD?/ &??f?!U7???U??*??A?nj?ujX?? ??fq??b?N?????t?H?c???$ %"^A?w?(_M ?K?-?????U1??j`?;??-?2+??`?R????J??k?J??? [????kw@?i?D?(??45?"?Q??ng???S;??-"E??M?(???+b?TH????????x?i????t*??n??~???V"0???????8???f????2?:+???GtZr??f?~?Y??? ?V?????W4??8??pC?]V"P???+@}?wu??????i??`?g?/?? R??????r?T??????????????Q????J?-??r???!>[????i ?j?R??5??5???XK??????????$??a7oo?(B?BK?A??w R??PC?W?5?^???~??F?T ;??S?j?6|?FJz(:???????H|w??9;x?^?S??_Q;arpiSw??? ???n??VC??|??l?Z??";?????|???f???gH8Y?@??????Q??k???jw*q&"t???G!.??H?P8Y?K?2?"q+4???q??AJ/r?|??????)G???????q????Z? ?0?v?f?????7rs?U??A???p????&M?|???G??????3???????~??? 3?kI?Y?[W-sn????Ox?`> );P???@A\qh???[=X??0?'w?t?JD-?;M? ?D???*?Ud\??h????q??<_a3[?q?/X??? ????us?????Tv h?}??"x#??r???m8?~?;??R???1???4!=h?O?????3z6?0?`J?a?8 ?O?:??? ??p6?T?????(????d??????????$??Q?2??|/G???????2[E?&/ ??[Es;?.?????u ?:?? ?,??????>?e?????vn$??OZ?K??GO???r??? "? ?"? ?"? ?"????;~6|???_P? "?]??=N??!5????T+???3???r? Y? ?]?!D??^?;????H?m?????x?:??Dv????^?{g??ne?R???^Y???qUox???Z?????QJ??Y?;C4?//Lh??(?$?rS3????|?B????;?A??M??????T?}????,??y?-l?1L??/??2l?Z???u???+??bT?7e?r????8??g????*??j???i?Q?w??\????(???A?;? ???_????H??,?ZE?SG??y?????????r{6>?H#8#e????&?????{ +s??1??5???????d? ??X????#~??-??G?d??????3?F????[?O?? on?tJ???/?????!?2z????n?}?9;i? R?J?qnu?q???{????/?Q?"? ?"? ?"? ?"????????p???p?q?I??e|??C???fA?CC?y???{.~??????"?? ?I??0Sk?75k??TS}%?7^?-??=?cC?????b?F???;T?r?&?]???z{?a?????M*B?????z??QqG?????_a_K???????? ??D?UY9??>?1\?2??????V>?????Q???V??v?t?n?????????1?HzG?t???7????/Q???~??s???|zq???W?EN??+FJof????X????`)???????????????vW5??3N?s?????????a}??/%=8?a ?5?}??f?w?]?????Y??X?^??????? ???s:?%??????7?????????}R???s#??E???l?????@?9"? ?"? ?"? ?"? ????????rE at b=????Q?S?7N??????;?eye???iE?R????U3??? v????5/??? *b/???u??S????OF?yg3???_??_???????"??N??_??*??Z?r??!?[^=??????kYK??L???C?wa?9?eVs??>Z????9?????E?J??????t???b?i????O??g???SC{=s??.y???i????&??????eOU?????kr?P?????~ ??"????97?!w???\!=JP?k?????j??P?b'????N8i? ??Iag???u?X??b???????(v??2X\??U?S9????Q??r????4u&l:????d?A?M?Y????z???w???jn?&???p?h?$?6?G3? ??????????ik?????~v?0??^?9g?R????xT>?????/P?BV.?dGM? M??s????MR??f????(???.|y ??????S?uX2?~v??*+???X??O??Z?Q?O?@?3{?S??` ??? ???n??dg?????4???w? ?k???#( 5??+??????m?r?K??/?????+g???_r??+?d??/?\?K,?{??????????_??? ???????g?I B? i?<??z?q=?}- vi?I?5??x???"Nz.???gL????o?a???????>?{.Ry?T????????{????Oy????Y?{jV?XU??????n A????h?f?HV?_9?????~??K??"*???i??r?K??????[^Bn}????? ????j?i?^???=Z???_? @? ???"???? @? ?N??????? ??pjL??????&W??????>R?Y}?(??RC??i?Qe?=?V??6[??3??)6?hj.&}??D ??Z~?/??d???d???Q?49??\???5 ?I????????~?{T?5?0M??i??G??&/??n?A???M?xk-?|f???G?v??-?!??Sj]????????kG?J???-????3?i?r ?u~]u?M+}?ls??9+???G?}?H?????l?7).4??Y33-?&T{?-??.????X?Xv.?S????? ??J?T????G????M;L?'??` ?m?????|?rW??C??N?[_?Z??yk?r???gvv_??0?|?R+Z?k??;W??Z?}T;????Y?I??=?Q?z?y?????U3??2????7?.??]?B??GmaE???????B???????a?l?kY? /?? @? ?? ????d?c?^?fW????v??!??rk??j???p?????CU?G??=]L?????)?n???B?Uf-c??^Q????=J??$??[?Cn ?s?,?;?(7??QV????^????~6 @?  @? ?}e?z????s?2j??pe??l?ii??E?a???V??.????~4?Gt[x???5????^?p?2???R??v? ??(?~?VQ?? o??^!?o??>?9??Q+?????? ~?'??8?? @? ???Q?????h??r? )?0x?iR??\w?L???B??'????????~?*?\?4?n??I3N????ygz?G%????I?f??????0?N???<|?A????Vk fvn?Cn?_>j?kv??>????(??0??Q?0?4?????Iy??^?~6 @? ?{???vh?5 @? Mg???wyT?????Qx?G???yT?????Q??) ?=???D?E??T??gS??M?/]:?akz??????}??]???S--j~?G? ????6????!??Z??yT?G?4???\qB6GSIr-??(?"?_???Cg{??0M???/j???L?M???? ?Y??]}???Zq?????5 ?I???????U?????1?G?~cJ?;?F79???n?B??/i??[ki?3;7??Q~??U????;+??a????}????fg??8????I?l@? ?/???h???????G???????>R?? ??i?????7???.?ez?w=/ ???w????T?z????5mMN??@???p4-??3W?d????????56!?:??e?7??Q??yT?G ?L?I;??{??BCo?yT??j???W>?]6&???V,;?DX?Y{?????w????nwjE?N?@???;?b$rq?;=?X?rW???? ??~?Nl|?j?^L??5???G?3?v?_?j?????%8???;W??a????0?F9?g?&??q7??S7?? @? ?{????=??&?n??LT?@?]?????5?:Y1j7;5????y?????y:???Y@????#Os=\???ytq[f;?]z? ?-5????|?V?nM?|? Y???s?he??8?????z??x? @? %~???}???B??????< ???yT?G?.???u.?\???1?4!??j?R?4&?hB??Nao??uP????g]v???7?W??Q????f??????(?~?R???]??s? Y~3?????3?r?|??v&?V???q0Q? @? '?W|???]??j?R???O?X?{? ?(,??? =?4??m??D ??Z{??{#'?[???=????L?CI?5???ao???;?z ??3=??????oM 5+!?s-L??uy/?jB???Ps??????Z??]???C+d?0W?Qn?s?T?{?M???Dg5????  @? ???g?I????E@????ND??P?z?u ?R3???Mo??????G/?????Mj??? @? JTk????ng?A??{|4?6?I:?????mLwvv??\?W?g?????t9??8???b?S??d????N?a4?;w?Zn?3???:??????N?i3??}?l??&/-??????>R?Y}?(??RC??iv?L B? ???r??????????hj.&}S3?v?????m?[?k???Q?lru???4t&??'S??Vr???G?i]???-???]z?????????Q???JB??%8dv?[!????}?2?N??????^? @? Y????}T>??v???????????  @? ~???U???  @? ?j????????'?M?{0B?uQ?WqRs????^?@???n]??l?????QK?(N?h??.???\M ?????8?*?H[??h??0?L^?u??j? ?T{???p|?_?h??p??r? )???N? ??=J,??????@?]a??'?[?;?kv??_?j??Z?4?n??IS.n??1????4????/?L 5+!?s-????????o5 ?j??f??????(?~????????V??????r?r????Co?&??{????  @?~ 5??#@? ???r}$??M~0?i?a4?Kw?Zn?????EW?AhM???6?k?G?M????G?}?P??HQ????4G????&T{?8?3l??Cg{Sl???\L????r3??_=??????????ir????iMk:?????{XI?,??z=jLa??ua?^?;qq????jL3?j?P?Qj???M??NQ????*d?;?????7???%z9QCn??^`6j??Y?Z?????Q?59??????&?u???????i??????H??????+??*/?C?ZL???n?Q???P?[??????Z???????s?,??>?9??Q??kg?{?h?? @? B????Y]>?.???\MS?^^???Qm??ck:M??4?L^?u??j?!??Z??????O?X?{%???E?ARZa????????*??!w?? ?O.?????w??U6??i??{?f?"??#?????4?J???1?"?????ka????{y?V?/????????(??0?|??????}Y!?Q?a????aVi??7?G?????F?l@? ??3}?????????]???T1j????d?~?y??? 5???hS?{?G????F P)?d=???p9?r_?t?????G/?????5??g??? ?????? ?????5??????N??iMk:?????{X?2\9?5?Qc?????Zw4?nr???????E_?\?????gvn?s???Q?^?kv*V????????(7?!7???4?Mqf??'???? '?}??OX??nh??))n??w]|??0z?z^"????v?;????0~?G?k???v??:u??hZ?ug?h?????IMS?k(lB^u?M?>*o?C??????(?:?v?m?&????4??? ?E+?2|p?lLz3B??Xv.??"???_?????Q?59??????&???iw0?H??wzT? ????A?7????*???????yk?r???gv?0?~???(Y?sKp???w????\?G?a??r?7&?*M?!??n4i?n?g @? ,??~????? ,?ykvu ?b?nvj??5M????f????[?;E????g??s?Z??{S6???????]\??. Wc*iB???viL ??F[?.??????:???????z?io?y??357Qs?+?? ?)???FrrV}?W?Zm?V7?t0i???.???????ib/???????????5????`N&??:???? ???5??F???2??QXN$?z?iR?????r3????FN.??9{??_=j?&??N-j?????)w???ygz?GE??W??jVB?f?Z?j'??^?? ?x??????];????5??m??V??a????0?F9?6?????I??j?? @? ??X??=? ?Q?E?????? @? |???????^j?Qh?g= @? 5gA???4???????????????j???i????=?????9???h???f4?????????!?^>??"?7?7R?????  @? ?+,/p???f?????V????5?i?LB?O???????=?_??x4?7?Y???it???????E??\?/q??Q???? ??W?Z??]?W???o???????v???i????v ???~6 @? ??i?????)+????6?H???? ?Q??G?????j7?ikr?E??????i?????E?w&5M]???????????!??Z??yT?G ?L?I??{SP\h?M%M?????h?U?n??IoFh?????-???] ??Pk?kv??_=j??Z????$P{2???\??}U?G?+m??? ?;????*???????[?/?k}T>?k_(x???V?f?????BV??????(??0?g?&??q7??Q7?? @? ??7 ??+?X??6??Q{?w8????4La8????l/?\r-??(5/?>?4???2?????ARZ???&??{?X:Ss5w??????O.??w??????~?*;??i??{??\???c????i?G_??jVB?f?Z6M??u}/?j??rI?nE3;7??Q~??U????;??%7su?F9??Y????4M????? @? |????????k 7???? @? ??3U??}V:]??qmF??? sn?C?3 {S??n???~6 @? z>|t??\??dP??*??q?????w??Y?n?F?]YPm"????v?;????/??uM[??.z???=M+M?/W?h????????5??u??7??????&??h?>cU??"%Sg?N????????f??? ??P?Q??8 wp?lLz3Bcc???NEd? ?/?*?R??????&W7?t0 ??L??)??AW????a?]ig Ar8=?Nl|?j?^L?????>*???}!r???QK?h??]??\!+jiT?Q?0? gU&??q7??v??~6 @? ??$??;??f??Psu"????~?w[?#9?g?%?f????? ?????;X????Yh?\?!w?59??\k5???#E??w?U3???iM???n??J?<8rW??????w??h?nwj??r?j?XD???Ps?G????7i?u??? ??[????7i^??uP???f??P@???~vf??r?_>jK???]???[? Y??HQ?(??a??lo??i}c?~6 @? ?+????"??? @? 8?'??Wv?U^??"???cU???qs?f???]9?????*?g???s? Y>?5}ts?s?N???? ??4&?g @? ????~????>?'??t>???i8????l+?\ B? ????5??F???Jd??9??)?????q?I?os?U2QC? %8?\n?[?k???Q?lru?<~??&?8ET?G?O???i? ??c&E???6;??T;Y?????!^,[?[?)???Q?a~??U???o?p1un??kve6?} @? ??wlR???7?G??.?%W?i????l? ?????{?t0)f????yg?s??G???K?&V?j?2?T?X??G7???U???ks? ?T?o??;??S?Y???/P???}??Nxh? ?b?z?@?fU??T???Ss????M?4? ?w???~?,B??b-?5P? @? ?? @? ?v?????}?????gx??Aef @? 5oN?+??i?jM???fp%??]x?t0?nBl????fg?&?pv;??e??#??Z??T?a????45?????????4t???g??n?Y?@Y?????M???y??9?8??&?????l?L???&??(??h9!7 ?3?.?~0?????!7Se?;??????r?D?I%????M???6&>????N???6?K?|f??????? 5??Cg{??v8??'f???v?? BX?B?3M7???iR???????L???(o?Zj?????Z???? ??A?5?????Ps???V??I??+d???];??  @? ?cw???Wl??!????{3DQ\?$ S?=r??)???&?z=??IO8?MO???D?=??5??{]I[.??]j????ksjQ??(? ?M[???1??? ?,?_?????V)?8?????L????B?l??? ??(????? @? ????jsm????.!,G??i?P?f?"n:?d\Yn???LM-?n????b?l???G>t???agR?????-?X???f?r?n?S?/?$??t=?m?????"?? |????s?&5?????????I?????79?7?? ?^HG??~?/- @? 5?=???M?f?~????b???V??A?e????DE?+z?@K???^D??V?1??P??S>Qg?(???3??s????f????}???????Z???/?\?? ??(?Ja?????^}?U???????e?V??A???3@? Y??? ??Q??~?/- @? ?z at d????o??????@????i?? r??6lN??7??????]?<*5?,??w??h?5c??d??5Py?l????^?? ?N?M>?6q)??'??1??+!???? >???r7/??5??yts???L??7?b?W?@?^??L_??7y??x{I?M??QS'dV?l 2&5/"{un????5?7j??"g???,?? ?26?5?W????  @? ?N??t??V?g+??L+}????a?=QCn??O??J,?P?dd???????ei]M9E?b?S?D?*5?b??$?mZ???*?8P4??q,????hQ??????^F???O?6?)?9??TZ?&j?]Rs-X?????[Qc?l???<?????X??}?V?\??r'???+d4??_?f?  @? ?????T?????p?,??a??}czZ??eU??'? Z?hj?E???AV????iGOO?????\P?"9????Y?r????H??;??*???6,?]????;???mB??}? ?&??X?U?????{?x?C???w???mX?_??9?????????%?0???v.o?3?X??C?*????rX?}?I????_?5ai?e_}T???H???#/f??{???GFm?Z???E??R1?w???d??_?f? @? ???J&R??M???'K??????'?J???g=????^??U????.O? ?i??8x^????Y???i??8 |???M??%???b????V??[Rj???? ????I???x???--?ZdA%??w??VH????f?r2 @? ?????W?k??QiQ???J??0?_?MaL???]???t0????????x1??~?????????S? +???o?L?hJ???b??Ex"3?=?;???IEu??lzB?3?}g????9????_??????f???yT;Qk??7-??}?5^???h?>9???bIM?"/;???V?X?[??Z??u??????J?m?G??V?\??r'?Z? ?????? @? P???Y?,=!7??>J??v??T?????????l*99??f??3|sws?f????Qf??&j???[???I????g?? ?}?????!7SsM?zT??jIZ9?Z??Wq8.w???v?r?E?-??K????????w??5@?  @? ?)zt2??n?Y?@Y?????????????????ilL????L?L?;l9??? _7?&5|8???i???N?M>?6qMA3e??????9?????????l*-x?tT??P=?e????m?S? N=????????0?F9?4?????'???gy????V?????9??\{3?y$?jW??N????7s?z??_?G @? ?????-??9????????L??)|?fy.?.??L??)??Eq?9?Qy??m{1??o<5F??%???4,;55 s7?F?-y?@e3[?f?8??J?g???'s?i:Y?<\Q??i-???B??A????f~?G???l????S_??H?zTn??G @? q:?te?c?wn???????z3?T6?*y,?K3??o?LY?? ???????b??&?Hw??]????????l??Gj??r?U?????+U???+?,???*Iw??b? K?K?hR?????nw&u????????6?hm?q?.????x0?:?#? ??[S ?????bJO(or?H??Mn?? ?r???p;??I0t??wb?n.7@? r*a5???4u&?h?P=?I?c??* 5??????|??^?=????~0?Nj??? ????i:??v2???ls???=x??O?????~?Q?vLi.t??y???p??u?]5?????vN- 5?6??a. ??[?????{?gG??????@? ??o:?? r?5M????nc*???~??=J??7????sa??wu7?n??)=!i????8????Ta???s?f] ????G?]?$???zj*G????m???? LY???a??W?7[?????r4?2?I? @? ps'???~?G??????l???&(8???Vg?z??? ????=?t??B?l??k?ZL??????jV?J?^D?c?l??v???7y???d*i?Zt=1?&W?]^?l??l?7?f?;3?!7????%???????>9???G? @?  @? ???4@? ??3}?G?U???=z ?d^?Q.h?z??}??e? ??y??Q???\??Mv???}%h?~?s???iy?qkr?Y)]?????|>??E???3?*?\t?f??s????????_?i???}?sqe=? ?:5??!???a??r??r??M?[??;?[??Q???I?"kF?8?? ?{1=?3F}?%k????u???%E??Zd?iZ?AG5?J?V9???v????[? ???}??vJNOP?Y??5ut??=???W?g??S??e*x?"?[ ???l?c??^?????~? S&??H\)????WM??\?]F$T??k?????3??????r??t??????c???#!???????fi?\???^koJ??9)/y??\?C???????ilM?Tm?????????????????????? ??(<?/Y?r?N??;?Z??? ?`z?x4)?6????5 ?+< u*%WE????^??}??2?=>}???F?=A?l@? ?jmR??c?kz??Ge+?????c?:?yt?n//???zg?6WR!????????6z??}y??w??iq??Z??9??4_?Bi??/???????~i???H??? ?`?=??`?GjO???f5!???k????K:U%0r?T|???? ????:eY?.!~?J?T?.???E )????]vs???-G?N]???p???d?N|?l????W?-?? L.#???(??N?H ?a???O??? ??YN???&??)?IV???/E??^?\kV??,#v26??H?????????JpV-???#???_? =??j?j??v????QVQ??X]??)?~?u??q?_v???} ?v?????!l?[??f!9k??Kq?2?A?0?2~6??m?0??P?D???9??K?B?h?p??b%?f??\???'3?5??@???Kky?}[!Z???nD?? ap7???K??[LC?)k[?g?g??A??Q???????b,?^?~f?l?"? ?"? ?"? ?"? ?J?R??-??lu???c?? ???2??A?Ec?x?????T?4RT!??V?"+???].&?$???!SDA?????e?????Z??yo)"? ?"? ?"? ?"? ?"? ?"?tJ???ECS????M+@??etz????h?/ !I??=???aSjr?AR??(??5?kLA?b /.uH?[?>EP? o=?O0kDADADADADA????g?9k A?7???+?3??Tt1u???Rtx????,?`?"????R??G???J~?=?x#DADADADADA????N?ADADADADADADADA?=????Y#? ?"? ?"? ?"? ?"? ?"? ?"? ?"? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(?????{?????Ha>T??????N???? ??A??j ???u?u??Rd????f??T???HADADADADADAt_??{???2???? ?L??K?ej>H????2uY_t?R? T????hg!? ?"? ?"? ?"? ?"? ?"??Ot???)?15?g????nu??v'?8??~O??VU???+:?R???]Q?Za0?,D???!x??)lZ?????????n?}Q?????87?R??+??B???mR??4.[m?6H-??*\+ at 05/?????(Jj?????h?????5y? 2??P??e?)W ? g??8????<~vB???????ajV?????0&?U*??????YN?k??z????GH???v?????t??"k???b%K??5?&h!? ?"? ?"? ?"? ?"? ?"??Ot???i ,?[??S?+Y? RW??? 6??@Tmf??`?2??X?2E9 ?j# #?????Bx~w(??*j?????,???????? l9?????;3Q4???6?fZ?4qC8QBc??U?S?J$LQ( goxT????????B?Z??;??????W?zd??T?L2~vjW0AV_???g????u????* ??>#?????Sz?DADADADADAD??=?????a 0p???H???'1???iWT ??N???TtKtXH???wj??????E??`???gK3\??3Q??u?????????S???S3G?`????iO??Y_????2????-G?>E(`D??%??QVF??pL?3U?B? ??[6,??@^t??D-;?=??,??????}????G?????* ??S6?]?Q?? "? ?"? ?"? ?"? ?"? ?"??@?9~?!??a???@{??? #^,?.??[??%3??????????[??dH??IlJ???????l$N?,?"?,,????7? D? |?Z ????????s?L4& V\j??f?????K,?B??>?N?*)??ajV?? ?L??-????'?? ??Z??l&?/?*?Mj+?????j???k??? ??e??Q.F?sV?;x??,????\.T?L?GH+??"???Z??N?????S?J]x??? FRR?l?L?:>E???Pe????p???2?E"? ?"? ?"? ?"? ?"? ?"?S=???* ?)TK?v|??5???XxWa?H???;???%??V?I?:.??1B??;? :???E"? ?"? ?"? ?"? ?"? ?"??R??=g?????????)"? ?N ???b???>r?"? ?"? ?"? ?"? ?"? ?"??{rJ????5?N?1x???i?? ?:?@??=?DADADADADADA????g?9kDADADADADADADA???DADADADADADADA%??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??D?gDADADADADADADA?&??]'???t&j??=?@:#?????c?? ?"N#EDA???i???jjj?=?=-P????? ?b??G???Y???' b?? ??Y~????? ?"? ?"? ?z??'?{8]???tg???{S?a_t[?F???M;S??T??y??? ????K? ?LQ2? ?G?H?SE??'???A?N???????? ??'h+4????[?z at Po :????[,???2T?p?RM??Y#?9???H?U?ADADAD??z?????y$s?????q??iuq?] E?#??X4??Fe?????3??EG??SU?I??|??I?k9??L?-??~&7UA?;??v???????P?'Zp9/ ?????r??E'm?%????L?PF??Z ??L??,??? ?? 8??(????w????> ??h?????????-???????JpV-?v???o?r?x???%???\????_"?[?ejV?<??5SM.#?????R??U?.?+?????????>5z?$?~???0g??Y/`?o#???K-Td?p??]??N+4?em???b=|?=??~??)*?,X?????M/h??PT?2????~z} ?0f[O????6??[$???5M??~???^?s??????KC?? ???^??iu^k???Z'p?+?????J???W>5A???>??? & T?J?"-????g??Z?LG???,???S?rlu ?;E?W????????2????V?P?????r*D???C?_F:?o?v??4X?b?3_'?^?7+??@T???[\+q6H?sj???R????K? ?8?1,??O???"]??a?/g????B???j??`2t?KiG!??}mKW????Z?**???8??@???<?3????R??7+?e??f{???7`rY=??v?'?d???\??'4?????.O?f??????$??5|?eo?^?Sd?C???e??F???]k?\jW???Z??'^???? ,????4?$a?n?F+> ?EVi$dA#a??e???M?[R_F&(?$?"? ?"? ?"????>????V????uq?w???oZu??n?? ?w??Y??~?@? ??v?O?D'G???9 j!????^MC??S V]??.5??n????^?"E~z??Z??.?(??0?_UL??0n??e)??"E??f???Z????zi???b?9e???vy?$?E?Wi??C????rq ??????k?]!*E?????p?w????z?B??.I8d?L?i?5???YNg=9???}?????~??????hSs?????A?=?@ADADA??????????E'??????Z???????!?)?E??0???r-?sR|jSs???o5?3?.> ??ty?`????????f8>4Hk?5??'fV????5?Ep??L?H?c'????????????-j_C??N?}-u???c?f3*k?`?;?!??}1????S????????w???%?bv3?? ???n=? ??A)Q????]??]?g{ImG?e?:?c??n?Z?>z???cJ?G?D,??p=i>5o??????a/?? ?-[8?-?j?V???????R???????>x?ek???(???V49?M???%?r???v?.f???3??g??Qr??=??EX1};=?r *???H??%05???? '???h????/?R?pV?Hm?-??g?B(s??P?:???r??w??j?O?7??D????(:?C}??5?XP?k@??" =??5?X????????Q;??+E?}?K?S??s??f\?vI?jx????pc??H??\5????k ADADADADADP?0~???aOT??g?W/?i?#?U)?F*03?j?g?1?n??y??Qr??s???5???k?D???D??=1???]vEGsQ: ??X4?`??G(rT?4?\?C??,X9pj????3????c????h?E?? I????????/Zvj???? }-?)RH??g'?(??|?.d?Y?????t?yt?5DADADADADA??????^???hJ???? ????zf??nIQ???? m???}??V???uK4?+ ,?]u}??z?nX??'???)J?????w?R?i???q?`ih?]?Da??? f?????. ???Y??????{!W??0~v)@????????????B?-?2???M?.?/?f*?r}??p???????????S??????`]/I?S$LP?o???b?;W??>f???|?????jI??ADADADADAD??@???+f4uR?d3Qo??K"W?m? `??????y???(B?N?f??? v,o?T?R??uS V?pV?Hm?-??g?B(S??D?:?MF? lj]????????r$???Z?'?????d\?N??07B{o??H?P??;?\???7?Y?b5r?"? ?"? ?"? ?"? ?"? ?N???DAGi???z-W?6??P???(??k???l!}2????E3???>?O????d?6P??EO#EDADADADADA? b?l?"??Sa_??LT????]??3??O??G????? ?"? ?"? ?"? ?"? ?"??1~6ADA=M?h????z?????? ?"? ?"? ?"? ?"? ?"??'b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ????? "? ?"? ?"? ?"? ?"? ?"? ?"? ?J1~v? G???? Z?T??D?"??B#@?8?DAS??"??5?=?O#EO ????)"????L??O#E?d}???=?{?[?? A3?~O?-????51?Dg?=??,[@??h?????,$?,Ss2(U??e4?z?X?????AR??@??z?U?R???S?z????"H?c???C}C}}???25????\K?? ?"H???h'???zlv?????^?`?]?x?=?????????.'?n??jU??S'#Q?????g????fyol??+??Bt1? D3????*'n??DADADA? ???g??<_?v????????f?5??Ag??`m??Xt)??}?gk\j????M?.?T_F05c? m2??.???Dt)z??S?Az???????xt?=1P??}?}??jj??=??&?1??? ??ztv????JQ??????p ???Q????E{C??H? W8?E?????)?Q_t1]?D?t,??ES?Y??]f??Q????{?*:G>?OU5??=?????_??t?)B?|?.3??\4????NO?r!?K?a??B9?2?N??K?z??]!?n&^???`8?Daju?,??? ^??]#????????:?????/TD:?E????-e?b???p]?1?????s??,h??D|%tD1?. :m??h?S?~Gt?2?D?J}5=Z??iCuVK5??eW?????Z1??W?uW???4??(&? ?f??}??{?%?x??3^??I???????Aj;?i?R?(??N?H????Y?(P??P??5#?y[?:?????3???Xu ???c.??1??l?4;????\??09b N???sQ?-A?~!???????RN?N?kV ???????ij>?:L vU? |??w???x9Nk???F??4V{??~??y??Dt8u?[G??Q???vT_F?????`q?/L???`???q?s??Q?k8????D+???G ?T?C?fe??ZvEa???*?Q.???,;??Z ?,?e???8? ?[????u$?D7???,X9??5X?:]Q??O????_???#H?x???????=3?Z?*??:??;?YN? ??? )J55'????Y??:???fg- ???O?_z#Q??????\??6?:?????n??6?c???TI?????e[|???B?fDjB????? ?y????!5???P?4??!????"? ?"? ?"????>???????? E????icfk??ajY? ?A?]^?e?v????V???#?? ???????O????i?????????A?Y??q?3???5y?5?3?M?? ???Z??[? T?Ao?? ????`???;U?????)J?5?????l]?D????[{t?a ~??d?i????Q??u???T?\??j??6?"? ?"? ?"?8 ????9~v???-*E?????R}?m????25??#??b?????,????4??Q?B??? V]??0E?M??? E?r??B\? wL??T????.u$???o?????oXF~>?6?e????e???R???q?Z????o?07?"??D?u???e7????????k??1g??\g? ??iG?4????&.??????9??????Y?#:P?1????&E?QQF? ,?????S??"b"??\N??/#?'???`??????????`???7??Z??I????R????"?Y??????gA?=~??j5T+???sjCu??l??Yw?`Rn??[uAD ????Ep??=w?x?]?(Z6n??Z?n9?E??????OMEr??v?d?:$??????M?:4??JR????[????T?\??#?zj? ?"? ?"? ?jb??? ???Xd?k??)?/?9???X??0??U,.?v????T??H??u??-??=l?l?:u??M??i8P| ?s??D ?R???????b, ?H??oj6??A?"1R A??/??????Q##b??? -?? ???f:??i??aW???|???????Z?z????,;+????????? `O!?A????O??_G O??Jx3ZDADAD??AO?~6Au?_?N?2g????S? ?,X98??>?)????? jVFVW?JQLW??"?????Ot?O5aB?>??~? ?ADADADA?"????&?N?k?Z?I|Y???1Rtz?'SFp@@???T??r????,L???(?p?2: ?U?Q??jNNQ??x?>x?)(??>E?Cc??@?4R?@??Lt65A1c??R?4RwDw?-EG %?eS?))?YN?e>E??????ah8??Z?y_t??)E?vw?2?d?e&?j???T?=??(?!?9E ???@R????*$??.???L??)? 3??D?:Q??be4?JQYbj- ?*????K-?P???cp?$?G?0 [RT?'????/?? c????V?????jf? ?y?):Q?A[??A1f????I?B4?Y?eC???????S]72\?N3?-?=? ?O}(P??i?)*???)??Bt8=?y??bEJ,??SU???eu??SIM??k??????B????Y?Z?S???hwy????(O??lo)"? ?"? ?"? ?"? ?z ???/?i_t9???h*Z1?5?????Y?????*8??d?\?lFt?q?6?,t?D???!Q?1c??2?*?3????b(????s6?*?T?#H??'mQ??,??p??f??+?,;+?^?-~??lg?V?Qu??t?}?????E?O??s?e?UG???A?r:??b?e??????P???????;=Qg%??;??*1?:L?m?B?`)[? ????f???TK{?ZQF? ??????D?o?aS?2W E?Al??7fg=??@??H??"E????9???+???[,ED??????:ft???)??T?xK???wv?EG??SU)XE?'?f{C?H;????@j???E(??QjCuVK???ML_?/T?L?[v?Scp?????GV?w?C?#HJ?o6f??,X? ?zY??`???j(??u?/?DADADADA'b???A??(f?:??H???d0????(??BO?????Ng?3?8?????? Y??1o????????$`?????(?w? ???c?Np?LP??b3?]Y???N???jxAj??-~???????i?.???|??z5?,Fc???qO?FJJ??\?C??43???t??:?l?X??"+??Y?~H?? [v?G@??????Dz )?,9??Alj=??j?U?W????lY???~? ?"???S??r?s?? ??u???\??????R?`???)?p ?QN?P+??y???\?? w? }}?0??o???p??Ob? 2jf??c?.??j???P??[??????1???n{??l?h??O?O?YvV??d?a???krO[B??? ???pN?M#?Q ;C8-?9i???Z?T`??R?o?:|???\??wi??f?~e?|(?5??{#?????tv??/??>???Kuf?HQ65S?=?k9?1?0?B?B?b?$???????z?*l5u}kR??15??"?` ??u??(T?KF????^k[$y??????!???U??U;?????%y??F???????P?z?1;?e?7?????^?,T?@???jA???U??5?G?QCADADADA?????3???h??? V)???H??e??a?AxX?}A?d????1o?*???z?H????????EDR???\'?J???l? ?0????q??a????H??{???? wj??u???j?2??\????@?Q?N?_Q[C?V???g?T???????a!^??????M???????RHQ&????1]z??F'???r???0????j?h?"D?^ND??YB hswF,??*6I?r?=?Z({_Qj?? ???Re?? ??H????I???pla????"?Xu45A#?qG??)J J??F???? J?? ?"? ?"? ?"? ?"??Ot??????\????/:??6????t??4???#?e??i?J????????i?(?P ?0??)J55oKQ???Pk??hL???????&c??h??^??????d?N-?????(??.3Q_??d?e[4???Fa?????M???ejN?-E???H???PAU84??+:?????_!?????.)?$ 444?Dg?????z??_?H???0B??:'XF' ?i?? ?"? ?"? ?"? ?"??A????U??l!?K?????;???Nh? ???T???? ???????=????|?}-?????%??GZ???Xt'??RtJ?f?h??f?q????p.?%E??????4?/E??f?????z????c2,?n??l?-???.?????N)J?(??\!?N?`p??E+?9??G?+6f7[????dG?X??b?J??G? ???I????????5_ j??J? ???Z?P?~?ix??????(,?Z???R;'J #=? ?Z??? +9?2??`??2?NW?? ???h}???:j??H?w=~??[6^?????z???_$d???+?? ?S?v??I8???\?6?S?^#? ?"? ?"? ?"? ?:a???gC?kb???kx?{$??????&?*???9????????N^g?`?P CG??????{?X?W??w+??p?Z>????H'F??q,G?NN????S?+?H?? ??3???? M????b5???i?g??V??=?E?????5?e???i?MguNH??????T)???-???S%a?H|gNiG?tf?8.?QYS???{? ?s?%?D??4??j??Z6?}?5_ ??FQ????z??????4?????duN?p\???????L?????;5??l??8??@K ??????|o?X????nY??Paiv?????????????-??qj?? ???"?????1?$ ?F?^.???&B??1?T??X?P_ 0f????UW~N4???"DADADADA':^?l?????9?L???H4? ` @????? .??-F*R? |?q? +/??1????A|%LD??V%$?l?Ss???a???????.?A4?(Y?^\>?S?PF1?fK?q?.?????]$ ?@??oj?????m?b4???!G`?,o?1????oE?b???1?, ?Fb;o?(?????l/dG????????Z?M???gC]?k?-?!?f?,5?.??\fj?? ??x?????g?T??? ?????_?%;???g?T??? ?~?/???0E??(?2~Cn?ye?'?U??A????gmCuVK?r;m?S-U?n?i?????f?`??/?????R;'$?e??xdIT?w?{??a?H??????!?KD5&;(;o?)?$Ju+t~u??9Xa???-?? S)?;~H5A????`iF?kU??9!!5???y?o pY??*?????Ts?i???gxJcF??Sm??,?` Z?[7???Ec??4??r\ ?'???j???-y(???????f9?q?????\ ????`I??]????1/???m?(??]??Cc\O??????J????#?t?G?????b9v!? ?"? ?"? ?"? ?:1???g???\`VN'?+???G?N"c??u?-??T;{???Il??}???0A??Zn?)??K?f??D??:???d??|??61 ?4~?J?cg????&#Q???W)?\YN??JpV-`;??@????\ZK?(??"? ?"? ?"? ?"? ?Nt??}lb?4???Y>?z?=?4?kGgR??W?}EU?SQ? ????lj???B7pp?0[?|/ ?????????????????s??????x)F??c????A? ?????r9v =???E4k"?!?6Tg??Pb???le?0?CQ?S????P???????Z ??????@;V1E?????>Y?E?b?>d????????m\; ;k?FNd:5 ?)z ?????"\@G??????)??f)"? ?"? ?"? ?"? ?"h9?????ADADA5??v? ??d?-?Q?????DADADADADADADA? ????aj?nI?T??Uc????Ht????*??h?#m????D???^??cL??F??A? ? ??R??f?i??zP?S????\??l?V?b??`*?S?R?a?%?? ??>???? E??p8??.???L4 ??DADADADAD?????????H?-fM?R??????h????G?P??I???g*??h}??p???M??L???/ZF ??????/?zcQ????l1 ??9N3Q?\?????DC?X+?+PN?T??h??D??U??va5 ????U?]??????ZvV??Y??=U/j??urh??L4???Zv??7?i?wD?s?e&j???,?t7^??I?y??p$LmGM?#?rOpVW?^|????`???]'???\15?k?)2?Y????m????C?p?fK????????3??,#o?5??!?Zj?Yg=?,XRX??CX;W(??Jp?C*?3??b 5.?o?zH???I?G?QCADADADAD?1@????????4?f? J?'???/g?0`3nXE???M????{??,%L?0??Pfg???0?0j?n?>????S???T??#?'?`?5 ????3k??!???j?)??Q?pbT?%e???d!????ib????????2????EI?????y?e????t???e?TH??Y????P5?vx&??????????w?Z-???m?????@????}????%Z ???ouY? ??8???95???z'x3]A-;??So?p???^4P?o)1 ??E?fz5?t?&"t NiG!???(~0? ???u?????????kE???ti?KX?1??0???-?)HA??W??D4D?????E???N?LE?D??T????`??!-?[E??y???????+?u +??J ; ??c"???? I C???%kE????%?e?????,;+?V????x???G?-? ??:?Yw?n?t?T?Ex??k?Y??;??/_?3Q??? )jf; {???R??(fH?*?b??R??????5A? cR?0~vB??Y ?X V;?E???a?q?eH?U????hK????!M{\???F;??????Z?? ??pMDLC-??D???}???g??5?Z#?*E?4b?eHx???u????ADADADADA?t????L??~??D??vi{O7U?05?&?Ss8??V???]?gc?g??h(?>p?'!Z7f????*?b?n)NM?KL?g*@$? ??s????????,)?k?e)??????^?~?T-??I????????:?|???jIP???h?'??"?????6???h??0|[+?Voj????}=?is?yS\?9???m??Q???kI?]??u?_????X ?)ze?Sv!E??l??YwH!? +f?y??J!?????)?QL; ?????5??Z?K??I???"*\???ZY?RF ??ih??IQ????R[6?D?????+????gc?]??yw????Pol1??G??E??!??k q??9?vT??8k| %!~v??]?u?g????? ??k?Rd=?+?*?-??U??1w,Z? ?sQ?ob????T V%X#?3?T}?D ???????e??G?-BADADADAD?c;~63c $VW3?7 at . ??? em?0Q >'l????? ?.?3{???.?? I??R?+??0?&\L??????}?$?????n4 g? ?@??j??co??9???,;+???M?P?' p??V?ug?!,??29?????.?&/:V??q???Q?(L]?xt???_???Q ???Cj???qH??????pqL_KMQ???a??????Z? ???(~???????6??:2??R%|????q???-?~?j?,?E?f?k?b?? ?z*XY??????? ?eT.R+???p?G ??????+G???G?QCADADADAD?1@? O???b6Y????d6-&??l???~???Yw1????Eo???]7?M???x:/???t???p:?/?????yK???d??@j??0??????!?e}|????????p@]???X??)?{??DADADADA??????75wf?b8^N???x>?/z??t???G???3nO??u?????d9?????|2L????7?G.??|??=,???K"| q?g?SD??@|???????????????????@??|???z???d???QAOfq?HW???hS?D3???d.??f????q?N|>??????T???,?9E?b?????G????k?bY?m?>?u???m??(V???6???"K?]k??????j\^???F8tD??/:?DS?;??(??????????~ c?}??di>?2"? ?"? ?"? ?"? ?j :Z???R??G$k?D??????????????G??YOT'??7????[?g?3geSs'?-?;>?A????-??????Vir??T???g??p?????r??=??;?????e??Z???????y]?????E??hx??gfAE#.????x.???9p?Y%????A??@t?-{B!?c?"]A?8?U???????+??9/0Qx??s??=EzC??B?V?SU?H('O?h1E?x??~G????,V?,???|? /???? ?\0?h?8?J?*&.~_?x???????)aMV???W.T+ V?B????? {????e{????.??`[?-e??h???b,Z???@G8SR?smY ?? ej??v'?8M]? Qk??-U?? ??S?k?B??nU?"?]X?5???????h(?rI%??Yy???#???3Q????{???Zv??4!? 3B????U?k?Y???l???(????? ?pAj;???????????:??(fH?*?Y???u?{Y??G?d_??%?Kn?eS3,???`??E??j???|Jol[j A1?^:Q ?2? ?vt???\k?S!??????? ??!??+7*?Y?` ?????? VK?uy?#Z[SQeTHc?s ???#??u? lDADADAD??;~6????`??/p!k ?f??Y?D1UY ??x?p?(d-?#f ??? ??'???j?)BQ?pbT???,X???????1Y0A?T???l,?=?T1c?!??%???K3???[c???=)?05??$|?}??f&1a?`U??M?C[?;\g^???m??N??(?P?Y??5????Y?s?e?0KR?"?YvV?a??w??H?OWD5[70???#$???*?}-???????Jfz???`MD????B\3?Q?`b???H8????J???R?TH\?/I?x?Omd??JQ?????Z??X#C,???2Voh???f???h?:T??j??kDu???E??s,C?[eh? A1Y?$???wjv??&?G;??iO?'p?i??`????Ss( ??1N? ??????DADADADA????g?A??? ??2??q9L???N?t07 ?]&.uf??@?4?S?l???a?????j??[?b????U?!?)?QW??u?C?F?p?f?#_.???u??W????*u?=?Z! ?k??n? ??!?D?NiG!.j< $j??/?_??N|???J????TH???0???!59E ?r?R[vy?????c???P?????????0??? ?:???B???~!?Ro:5??A?k?i???g?* m??(?7??(??] .uH?????(????+W?x?{C>???Q??G????22r?i?[??&Z^?{??8?[-ADADADADP%?????f??H??f~????)??C? ???P??K?T:??-D???j?jX?aA?1?Z???N???YC?vl?:????N???ra?,?HN?q}???? q?P?p????h???.??M?i?????? ?ll )~?p?P?~?a?i?8???a|B wj?c_S3???,??ys?0f???3??t????YuQ?V}??g?6 ? ??????PR?g??????????e?(??! }-9E???z?'??????Q?K? ???Yx??????a?Ss?S$|????Z?}???^??8 ???0}M%??R ??)k"t??:?v???? T )?j??kDu???p?????J??"????5??5HL%???.95'?Q?s-?????Utt?????KK?{v??y?%? ?"? ?"? ?"? ?2????!j ???s?_??"??Be??{p?'??M??j???&?????,Ia?4??b^ ?r?XK?????2??)l??qf? ??jq???PB?B;?$&j??Z?/X 0????6& ?_6b?????f??zSP?gf!,??9?D?????^?[?T???98\???17\L????????5?!?va5 ?n?8????z?=?~??????<[Y???h ??b;ap?T?l??u??B?!?? 'fs?hq?h???S??q9ll(q?(????x?Q???R??t{b?I????Q??????"?Q??gy???eS3?:?>\???@&h?!??v??B?????P?1???ZC4a??G???????\??k c??? ??-?????c??s???U ??kH-?????1???|-?r$??????\+\\??v??SF>E?Y%*~?N???za??c?????R?? ?;?[-ADADADADP??F???d??@j??0?????Wg?????`?j??iu???c???hw?A-??c??? X!R???)J?6T??????)b;zx?S???d}C}D???d*?(U??U .uH?[?*?T?k e?????"?"? ?"? ?"? ?"? ?B9????????}Q?$???!?_??SD??@>?-???????K2H7;?n??|??rJ?}<????G???,??T???QAOf?RSDADADADADP('??Y#? ?v?(???!d??"?N ??Zj(1 ?Y-55u?QFDADADADADADA=u?)????U???j{?jHo*:??n+??h??dk???e??cg???c??!(??@aK??.5?GZFDADADADADADA=q?)??? Dc???Q??yho)J?'`??7??x?????=?5DADADADADADA}?c??FL??!???=??????^|E????h??\?#??X4??6,lH???E??MD?h*:???NO?*?}??"Ey??:??*s?X?"Nsh'E ?;????2u??h6?(?????-?????h!???f??????*??f5Tg??????&?h??j?)?us?r1F??L???]n??.??E'm?%t,????f?8??u???k?-??????{?c6ADADADADADAD???N)~6???c?d'? Pg"????[???????v1?E]{&?ME?Q??"TC??mDa?R?i?.????(L????h,ZNQ?_v9 V???4?(f?f/?k"Rjru??h??<"S??????f7? ?Y?aOT?3?`XF?j>:]????W-??cQ?M?]a???G1fDADADADADADA????g?????V?S?Pt???D? 5??S???????W???L4?u<?l? ???K???y?f????$?hZ ?Y-5??nIEL?j?_??P jr,??????Ow ?e?-?? ??-????,X??}-jM??RS????v?????&????tw$Z R??D??????(?r??g??hT??v??j>???h?e??hXE?+??,?????Yh?[??2?Dg?h: ?F?cQ??S9H?(??*Ee???x)J?fa?):?x?????z)? d?G??1?5K,Ks???u~zo)?hK????????????|(???????@??S?AQa??E;?y?M????????V????u??(?~?`????????s?}?:E?T_#? ?"? ?"? ?zt?O6~?eiv????':??????=?y[fjL=?n_?????Y{?v????c?q?uE1???????"Y[??5?H?[gw ?,?e&:?@YOT'??7?????????yW65w2Q???j?? ??????/?zcQ????l1 ??9N3Q?\?????DC?X+???@?-:?eO(?q?Z?=A???U )?{V????6???D?Y_??????E;??i?=UU????r???D??&????Rd? ?Y@??? ?Z6???>E??l????\????zQ???C?CS?f?1?l????P??N#??#:??.3Q???f???BP?;?n??H?????G*????????2?R?+??S?Nz?7j?b~6J???#?? ;a??_w??L?k?? x???YPf? 0Qa?/7??V?c?,XR?2????/????9???9??<?? k?>??25?O?Q????.?????o?:m^Hf?}M[??T?????,??.P???(???KC?@YTv|5[YvV?}??p*?????R_?? ?u??#??C?P?hA?}????ge????v???JDD???(?A????]?? ?_??H8??)J??:?ZY6{Y??G?'?-!E???R ?li??c]P0.?-???b?n?l?1?????b??t&??e??5F;:d_K?5???????K ???,? ??c?\?t+???x??%?P????!-??S$U??k>]1??/]?9???~??tX??U?????????V8U?F ????? 1}??????$VCu???%?}?-\?p??wH+ O??2 ?}??E~??jx?????r?B??"???'?A?!p??e???(r81???2r?b??Z?G?4? ??E??t?2?WlG:?I???????$???PK ?1???? ??{??l??????T??(?P?t??j???Bj??[]????%?.?yN????N???????U??7h8B??? ??????c? %?=;????{?%U)?.??z??????????Y??}?}?&A?cvj??>-l?z??????"? ?"? ?"? ??:^?l6??W???>?? ????OO{7Xo'???? ??z????w?? s??~?x?'\??R 6&?1?b1X9??=?f?=@??T?uU???8?Rk?q~H???????mGQ}-????B?4??4?ih??3??JpV-XC?5??R???9lx? MH? ??k?'?? ??FUx??'??8?????Jh??*?????W???xAI????? ?!?Z?pq?w????6!E?6?k[?????????-;???Y???????,DADAD?? ? S?F+???Y???@0?????P?}' OB?n|}???????Oz,qvjR\bJ~6?k??a??????g??G????lZE????4???nX ??,??>,?rU???.e?,l?&*??j9?Y7H!S?j?,X??!???t??;??K????Q???? ????????P?gG???]g??_?????,E????Q?????[5?s?? P?? [5??3N?{???E?????Uka@??v!Q?M??!??OVj?5?????O?i+??E???y?B??R-X?`???R?1t0?j????)?????$??b*???M5????K Y;dL_?;??hyU??g?????v?????Z???C?C?f??5?5;- cv??]???%???Q?hDADADA?;~6_Y $???o?\8???/?j?"?9???g"??5??^?U????W5P?Z ?R??-?=\??????G;\???????WC??=6?t??gc#?P?lO???????5?T[??r???P?????Q???????c3L?[R?? 6"}c????`???:-A?V? X?"?]X??c at c?1$???B??Y|CuV??,k???:?w??dUF?:07TH?Q??8?? TF???Y?<$????:?M?M??Q(????j????l??$/PB???Zb?I????$?????z?;?Y?????f?F?r,??R z??:?}?^??R(???Nr?????9B?Dv0t?????5??Z?? ??-???5?\P??:X}?mo??F%8??!?Q? ????+???Vo?Y3I}????v???d?J(??,?r???*:?gX???T??%?=?p??????r???8\?25 f??_??>???:f'???O _F?o ????Z??DADAD?? ???LbM??j?????\?L??????@?1j9??%~?Z????????W5?las?\-?g??? ??0*??? ?\_0????ai )J?B?????e?????0?????9C???}???=jo/?jj???f? ?}? .?XbQHQ?>z??Mn??3??????J7??,??z???[6)??f+???3??ES?=? \!E??l??Yw?6j?L?2l??lG??D??$&? ?#??"g?GT; S5??m?/??b???}??!5???8?ZY??xT?8????(?Q?0~v???0?? ???(~???????6??:2??R%|????????-???jT*?E?f?k?b?? ?z*XY??????? ?eT.R+???p??zJ???h??#??K?s-?-?h????????Z(Q1}wy??? S?wVeT????g????Z ????k* ???????>????v_?i?Nh??/a??O g}[????#? ?"? ?"? ???N#~?A??@ 5eg?n?nr???!?X}|????????p@]???X??)???,?????l????ZmL???O?? ??????xtx??,????h????d*?h???u?U ?????FR???s-5EOd5?'??????(DADADA??4?g$k ??E?n ?}l??????#?w ?o?m???R???{?{???Q9^?N T_??HQ?? b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ???x????????VFDADADADADADADA?x???M????Q6ADADADADADADAD?? ?gDADADADADADADA?b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?A??MADADADADADADADP?0~6ADADADADADADADA? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(???DADADADADADADA? ?gDADADADADADADA?b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?A??MADADADADADADADP?0~6ADADADADADADADA? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(T05/g??t2????t6X?&?Y??????N????7^N??????Eg?u????4?TS??FADADADADADADAD?a@?N?.??????Y#? ?"? ?"? ?"? ?"? ?"? ?"? ?"?0 ??<_?g?)va???????;?fK??&? ?"? ?"? ?"? ?"? ?"? ?"? ???@f???x??u???p?s?b?M???????i;?g0?-fj~f?l?"? ?"? ?"? ?! "? ?"? ?"? ?"??Od???]??n6c????L??????????#?6?gDADADADADADADA}Z????u??.????????&???%:~?f??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z2 3~?75???F?????d>????x1Z ??f??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z??z?f?M??eGU?j?m??????? "? ?"? ?"? ?"? ?"? ?"? ?"? ??>h4?G??P?rj.Y??ej?/??? P??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z???l4 ?l>??&??f3~????L=?`jL:?%??(kDADADADADADADA4????7????b]?rb???l9??f???J4m???=Y???ADADADADADADADA??~3j?'^??????/[??__??????????Q?e&???|v??????????????W???_/????p??[R???????o??]]?xwy????OW???7???\??i?n./[?????|qs??Z???^]?k?\??????????e???u???o?o??o?t??Q?|x????u??e?????m??????????????????|???U??W?.??^??/?;????._?????/????o-?s????????????i????6???q??[x?y??????N?|??~/W=??????ns???Lo???u?N??]??s?S???????7??/[n/????}????o???_?????&??????/??~???)?????????_t???????????????`??X?e?/????~??o?]R???7\????????????! ??>+w;??Y??Y^?w/?>??{??xs??????P:xw?u?9zw}w??????p[?y*??~zqsy?Z?z?|}??^O??'?%9A?????_/????~s?"oz?~zv????????>?????????+?j????w?g????}Vk????????|?>?{w????????X??3xk???s?w???\??|???U?_????|??m]?????/^?>??\???_????B???????HI?????A +??_?? ???ZyF?E?|~??????yZ?\????]???o???c n???7???? ??????s}V???SK???oj M????K?a????;???"??uJ??j???W?g???>??_??a?E?6?lu??\??}???8-/??????i??\??r???????|???L???z??^?????G?????u~?:7?^? ????~??7???W?K?U???V?????sM??i[??/?.???J??L? N_??am'???????????R????Nq??|??>!?dE?y?X???\???? ???-??M???????x??????[h????N?6Y?d?>=?????????M????Y?A??D-y?9yj^_??????????O??rY??P???(?x{y?'? ??.?mw/??~{??????????????????W?=_??U??pw??2O????|L;??#?? ?w????[}.#????@??N?~s????> ???m?J,:?m??_?{u?o????_\??.}?B???t?+???????.??????????mn???w?iz???'??>o??=???1?~??U?*F??V???W??~?ps????????????U????:{??K?H'????[go????7???D?????9????7U???? ????KW???Zm?I??k4??G???F???e??oR r???^?*? ???_9?????/_IA???l]0??_?????o?? ? ?????.?????? ?Y}O?!?F?J?/?????K?^????~E??w????7??/??Y????????QmD}y????.?~???O??????B)?}?N?;???O?K??6Sr?????????~V??.??#?f??????s??X????g??_??????????M??+Cn?????_?J?s?????/?Xd?????;??>???'??]q???????y{q?^!?r???W#???J??;??V?? ?>?_??????x??[???? ??u? ??????????{???.I?fF????vm??K??2;i?i{??????}????e?^?e???~3?B?:???y-?||v?S??@Z??!(??W?m???('?????T????????|?h???????y???????*????????V???????oZ?????5??o???w?X???????=??Z?u"c?_?+???=?w?/?????????????q?w??????:?C??? ????5 ?G????? ??Kh ????W??t???????u???N?????s???R.u???@?k[W?7??t}???g?_ ???w????.??{???????????^qwU??????A??V?,???Yp????M??I<@??*??bE??)?g??????u? \????????????O?+n???:??si?????????}"???%!??????U?7??%?R*?{?xv??n?T??^??s?)???Mj?%?v?l]??VY?b??? n????z?4)?g??O?$q?-?Yb??|?????'???X?>????=???h#???Ni 7/~??{????????????W??????y??pu???y?7Wr?W??,??{???Is?W ,????H???1n????W?K??????e???^??O???yU?r?,h?_??V6&?????k???????{Xu?>?tN?????[???????????"??p?x ???e?X?c???5????[w7?? ?????i??????V?T.4?%?p?????????!*?uo#??;?+????E?/!?jk?????>?????~????7?7?!_x77b??5?=?m?^ ?(??????Q??w?-.??w???"???? "v???????K?????<???U ????|sw!???\??}y?? ?????}?????f?UU[??i???7;e|????AA~??V[K?>??p???"??????O??l7?????jl???????|????W?e?????\???????v??u^{??G???????????B??y?+?7?A;o#??????c_??.???H"r??????g??:uU??W?@p?? ?y&??yJ^_????g?_?o}J??p?_hD?5????? h5????=hJ??~'??????$U???C?K??,???????U??Qo|7_ux?d??????]??Q?+}?????Y???7???-]?????x! ;????Ll???d5???????F?F?*\?j??)]T9?Q?????*??? ??:o]?????2??k???????+?VWe????[JNV?_?????V?M????}?R?r?D???????????????e?????8Es???g?????Y~??^>;??/?}???x??G;zty??Mx??G? +H??zzl??????X????r??????CC????X~? ????????????Khi??z?O?????????^<????=???;?N}?o??[]?????r?[?????%???~?Qa?wu(Xn?:?s??)???ck}??????G ????G??lu ???t??g1??u?????? ,|???m??Y?)~??????D?????~??>??G????B???_??????? ??eg????? v?????>?!eKJ ???? sfb???^J???d??????y?e?????j?wl?K ?8C????,w?2bq?e??"???qH????l?q?{??.)%????9?????????wD9;;[H???????Z?|}?c?????{q?S??*???C??[?%??s?????=?2?O?:D??|:?9X?Y???CZ~?\OI???5???????!????_y?6 ????Wo??????'BO??????@]??I?`??X*d_???????8?e????????x??;?? ???r?^ ?~????3Y?&?O>?z???:?*??????K??????o?q?+?37w?~?>CdyQ??,>->??e?{$???????A?pN~u????????g??????????U??H????Z0????>?W-Y???{?????6?r?W[~????l??????G?????/???h/???w?j)i?????]L?WL????s???>????tV?????i?j??h????w??~?1U?\w??~???:r?????B????:??t u??N7?{#??nW?y???C??????x?n:k??:??????~%???1?G???>?K????9ssL?????????????[??m+{?????? #[?????Yf&]???yY??H??Ar}? ?D??s????b??~???????7??????<,?????????cH??????n?oY????????A??!\?O?!?????????????[????d?v?9??????????????I?B?v/??.?y9?mc}? ??w?~?????.k??X??????????v??2:pm ??B"?k?H? ???a??6???7????W;o??w?>;o???Lq????????????zD at xqs?c??/o??iyy?????w?~???D??n?>?~???]??ku?m?w????w???>????????MK?) G??M? ??V?????]??????d???G?S????[.[??v>?]C?q??????{???y??=W?????(??6z?r??????|?)p?? ?W????????&f??????????d?X???I??'p??!?????.??\?F??+?(????????E^??[??9??3?{?S??K$????Y?2?u7?i????6???4??????t?? ?????0LR^?o??o?*?6(?M??'d??????????i?7?P?*5?%???Z??;??o?????[??*?+????????<>?????"????}??w?4h??:d????B??i?w9???x}??R??.??0$?\?_???'??G????U~m~L?n~?????5??]y????|^????>??'Ap?w???q0?_??????Y[6?6?x?i??ju??dr??U>^??u???W??????????[MR????????_???&??.?????W??????????}6??eW6?~???:????/u????w???K6"`"??@?X?u??D?I????;???????CW?}???i??X#=?3???????:0???{?4?? ??????qf??? ??=???/?????B7+Yo?d#??~?}&?\=6V?????!R???;L?i ?z/??Z? _d??!?m&nZ{???J??????b??ii???]??'?*?KtB????+?????????o>?]??\?*.5k=k?G^?j&?J???p ?m???????a?????e?u ????;?3?????g????.r?E??}{????O? {?D???? *s?V?Y?W???M????????pB??w??????m{??_D???t????O0?r??!?????????2/???%}`3G$?^?t}-Av?Y?m=??u???P?'???o?)Z??)??[>?jW?YI???A??M:?Y????u&??????W??h??3|p?????.^??Vk??:?S?N'o???U ??????m?u??$??\???I?6'?MJ????b?9??G????j$R^^ -???R?|w?*\n???m?????s}???h?p??/?????c????=lZ????????^???'??y???.?????????o*?????'?.??A??9IJ??a??????F]:?1?6????N'p??o?:??+????????0\?d???k?"?????y?G??"\?x?????? ??E?^?~?????????0??J9???? ??(5??f:????? df23??$L?9?P??$=???N&DAD at T???? ?AAEEQ9D?X/?v?Pd?V????w?W_UuUe??[?tW??}?????????5??Y????)]-???|m'?*?Ws???0J?c _??c?{??5"2 p??(?? Xde???6???Z?? ???4????m?\????????:??y????SEG~??6????/????{???????????MA??Mk?x?[l?????~Y??????????l???;d?? [?c]??????$HoCX???#?@?OM"?2??????&?.?Tet?????7???? e?/?H??n?Z?&=?C#???,??O???Dn? x??I????4?+3 zx.w?j4??1??? ???m?\W ?u?C;?C?E??=???V,?$)#???X?>0 at Maq$hf?KX([m at 2???d??h?????`*m?*e?FV)????P?d?????:?? |Y??W* c ??6 Q?3+?v6R????n,??+?O?F?G??0"?????]???RF???I?????V?J? BUi?\Io?Gq?4M? ?u?????0q??X-H?a1i???.??-?Tp??b A?????HPb?B?.???k?E?h?ID4??BR??J'?d? ?+?=w@????U???_V! ?xPi? ???RL hU???-S??b?Q-?#b??=`)????F??? j$?.V? ???????~u?B????m?LGR?Hih-+?3h???Q?:g 0?b?=??1?}????GF???xNC??4 !?e?3Y? X??k???????Fq?c?RF?? ?$??V???Y????th??h??????X'$9w$r?<4'KcI?,!?\?E????k???P???2L=?%?F}J??)???z?rk4?''???BRR?'ql^?&?j?z??\t- ???%?d??????Q?5? ?E??Gsa?h? ?W??[4??p???0??????Ci???s????e,?@?????^?????N???!?????K?N??^?d$?y]Y?:???????k???s???????Gs?A? ??*?|N|T???????GI?2?????? ??x????'?N???"??RA$L??,L???/x??K??nGWs???J?8?? ?????e??^??? mjtr?c???a?1 ???iCo-V?g??hFL De?P??;l????qjF??P??'???L?9?b?}'U?B?????Tl????s`???#?????*y???Z[???????f?D? ??????a? ???a?6?k6`?,????LG????%Q?qr??) ?Y?J??}???U???:u???????????8?G??T"???f2j7????t?v?>??v?i}???`??"vf?????^b.??;bZ???()3J4A? ?????^?d?????F?Vd???MM$?Y???N'???????????????G8?;'?C?{z?> ?L??Wv"A4d"u;?\?M??Nd???q :M??9m?????????uB?{g??~?!?eh? ??=!?k?u?? !?v?:@Bt(???4D~]?b>}??(??4?X??L??/,?Lea^ tH?o?F0??)u??;+yM??W????H??:9,q7+??#)?%oT?????L??K?%!?Cut???E???%0? ??:8?B??H??T~*??4?v??[?M?1g??? j??t??3?>??}??v????o '???????}~a???P??? .1????5m??? U??p?^???-A????A??n??`r?j?z?m ?=^7?~???z}x5??$A7Iv??z?i9zR`?x????8 ?)?Ls?2?n??\???????=?D??????m?4G^??(?*??Z5jU??????%????\?6?4M8K??????&?M?"f?????H]qM?? ??K <&??S?:???y?.??u???Ar??d?)?2?@\\?!?5??%avJLb"??\??????87J???????l??qJ?Yb?/???? ?????vvV&GfB??]$a?? ?? S??+?l?`?+????b???`?Fx0'????/H?)??C?,=?j?G?wJz????NV ?'?V?W,g?6MH?Y?id?{????q?Qz f??s???Y????b?????sZ? ?E!?SB?B??*??"? ??P??pK??J???????w-#????f???A?u????????c??98?*F8?D? ?1b(??T?8?????&??D?=C.?"?'u???AN?????? xO??? ?/????.?????cu???|????d6?????Q?[????u??^????????Q? ?B?O?????? ?5?i]??????:??Y=??:??0(UK???d? ???{??Q )-?O?s49???5Z?Z?3? ?D?(?????7?*;??T????@s??E?_XYqDC??ZJ? ?d!Eu??i???????dH2U?3 os?m~&???R ?????U?o??????^?????+???2|*????yTS!?N?=T????-[v9U??Nw?YkzE????q???R:???sx\h??lHx`GTG?.e????|?\'C?????-K????5%qk???\?\n????O??Q????y???? ?%??X&?l?\?Y@?!j???? 7+? q??U???M??4?|c??? I ???? "??*???@?]C? z?????MR?`??aaVJ?F\??-am?[??H??e???CK?j??.????!?e???r]?o?|??_W???O????0??|v??J}?0?6????$??H(0?????|a?I?_. ??c$?!\I S?x?%?`?? ??f??? ?Y?v?O??]?????9?]?5?d??R";?)?I:??\???r??(?"???A]????f??{t IE??x??A???)??:?v=?`??:\????}??e8)4? ??Z????? ?h?_[?u????????????0*?y?G?P3f???????? ????g?w???*?mH??K?z=b???x,?m?z??@?N?,?-+??S"f}?NZ?k+???? ~?b#d!??$????H???e??!?4j?%c?NuB?{G?Q?;_5????~??????@???i??#?$S?????>]??+?u??????C`??;?R???y????61???R??J?4t??_?eK???;@_? !?U?}] a?????????fm?I?$?????, ?:???Y?&???G?@?(?6H???7??A,+K??*??h????b????-? ??~?!?aX8???(2??ls ? 4??Y????y???QB??x???j?{????oL????????-N??c"???!9???????c??^???b Yf !"NM2^+????|?n]?h?!?@ ???'-???? {k?eOx?5??A????Y?" o?O?$???%J>?,?' ???f??#??? ?Z??Q ?????fy?$H?)????m+?G>5pJ3W?= "I?q.fM???&l`??Y?p,??%?? ?L?!?g?? h,h????wd,R;?ff?m??'X?,??C{& / ??4G?CSHrBgX???b???? -$??kmQ;??/V??m?V,?Z??*?M<:'?Hxw?\ ?}??????+2?6\?Dl???&K|?????? t???+ ?a? ?X^????f??"F? ??"? ??{??,K?|](a?? /,k?n??R??K? #h????V!?B?? ?`J?n???J!sn?T?`70A?e?q??)?r??u|$?.???f? ??EX???^?1?b ?9?m?{??O?????b ??[Xa /h7V?V?]?Vs??*[?i!?# Pb^3??&???7-jz??G???"/s???$??????k?P?;=?????*????%e??X,|?? ,?i ???lq???J??MV+.QZ?Y[Y??w?=u??U???}?t???U????Tl?K????d???O???E???m??*4???????????;f6C??xd??k?Z??#i??&,????}?M????c?i^?????c???"M,5jhO?6?]????No?? )7?\M???????~? d?qT\??X7????1~?`?HjU?3_??%qi?? LFh???\q?1Dt /????&??[ !|? ?1#"??c?1??8?s??MkFL^? ?{)+??Xz# "??G???\b??u?M?#8_z?6?L??.?0?8?v??8????Lq?E?C????!??*?B?8R???^??? ???>B???D?2Nf+-?????e?? ?*HAy?@;?1???e?5"???-na??????%FAYG,?R?e?? ?%m"HB???B???X&A,b?{??(s?X???U?DW?F?????????~????=?w??62&W??W??f??[?)??O$"-#??U?b??+ HLO??X?Z???0???#k?+e?@??????O?gZ?Kbm7a8&?i?V?7 3q?B????1?????n?l???fgJnPz`?2??K at d??5?G??5qjV?O=m??????+???????G ?0a?????:?????? ?M?[8? ??Oq?8??'??~???}3 *v?@F??????A??cO}tu 3???????0:=?}?%?cx??}F?Na;|??a????Q??9??;';??Ye6?????f??P1??}????t?$ ??B?{??\i??k??? (PY????:????????[???W?7????????*???? ????IE?&&y+??????,|5?bqk???{&;0]tn??~Y?? ?bv4??d???.?P???c=????e?U1???HX??c x?kW1???????}E??{ a???vd??fo???? ?Y???`%CL[?H???9M?y?iu$,K????a??H*=Z???? `?Dk~??z????$?w??;??N??N?$?s??S0 h?Z?qe????X?_????n Q?xr??v???? X?0os???O?`?=&\?gW??@? ??????????&q~?{D9o?0 ??!I@?p????? 8??s+q???9r?r???????p???n?b?rM @{-??F?0??i??~ ?Fc?d??i? 7????d"n??? ?b&5?ba?????l?u?SB,-?&?????%??A??H????7\#c?;N1+\?k?I?)"?E?X?*.d?%9Vc;i'c;??7R3??=l?c? 6m?$;Q?Zg?Jnd! ?1?????+W??Z4??G[u"????m??EO?Q?7??????Z?F}?^m?*h??T???b?? ?Q'?Qo?[?Jd?ivC?^li?m?ay?,W?c???[b???,[~??@ ??????????0z?J?w??C!????^(?Z(?^??+?CL?Oi??R??m?k|?-t?~?b ?????^? ??o9y??????9z????D??9???????{???????????????tem???El_??LT x,??VD????Z?X?h??bf* ???a?l?Rm?t?R ??????by^?????x)????????MSD??pV??a?BsEi"????B[??$Y??i?R!2G?_%}??????;`??dD|?C?zG????p ?9?_?!y??!??? l`??????X?i???7?/"B>?(B??^??8=?o??9???$?V??? .?vvB Qw????? GGZ??c?F?Cw?8 ?v? ??|??nV?,U?C2mV?????1wW?DJc?c???V??s?8fT????kR??@?????.i??u?B?R????W ??0 ?m,??CF? ?#?b?yj#"?X=[=E??b?j'?(A?????? W?XD}? :t??q7??;+?xSqi%? p ??37??F???????J?0???<(*j? ??? ????eG?9A??????????` ????d"?????/????]??????????C$?v???"???`??l??`??w???_C?[??'??>?0Ga??'?? 7?f3??LM????4?O?'L???c?P?E0{?VOb? d???;?uR6N ?MK\?C????L)?(?>?4??A?sb|?4&?-Mbs?Rvm?Ob????SZ?\#>\ b???!?,*_b?5 ?|c'?P??70 !??(iM??PZ@?r|?UYD+?&um6????#?S???*5??@L!L?N?? U???:?:q?????j??U??PS?'?j??6q8[Uh?????v? ?Ok_?l5?u??v?X?q??Hw???Emt???D?????????=?u?O??????O2o?iC)?? #?????w8tp??u?3???y?RK> /?-?E?:???????=????N{?????2V2??k????????h??D?=K???? ???h?m/a????Q??Vd?"8?A??/?-&NB,??E ??D\??H*{?? Cmv?? {???? h??k????lL*??l?k???:???cg*y9"(+???n?\.?,?'?h#?K???,?2?u#??o???9p4?%? ?H 5??K?R????0?%??ay??3?$D?cN???:?????/????S?????:???????W?6?l??cxlb??!ebxbd(?U???3?w([?????' nZ3?l;c????????MC;P? ??qIn*? 8V??Y3?3?S????????;?'??S&???P? m9ap??C???c?5*? ~?{?,?j?l? j)?? ??c??.???.?Q?V?5?:?c|xt;?< ???S?m}f???F?q ??N?m9 ?????????DAI???????HP???b?0a??}?F?6 ?!*n^{???! ;??? ?3X?p(?????(??dH?????42}?V+*#?????X72rB?? ???mCfg?O7???????S????V`????CVhh? b ????t? 0???Bn???.? 6De??3?^,??Mm??????y??%?U? W? |E?M A????P????\i?,???R?5?g?t??R?6?-?RR?d??X{?l6o???1 O??D?Q?;?^????Y4??E?4 eZn%??P|?Py???????R?T??M:?h?3??? ?~B?5? ?\.? _g?^R9?h,V?lt???`?J2????%]i'??0?i5??5? ~??? ??S?g?p??'?H&9?N7k> e?]I%:t%???u%Q? ]???? ??????M$;5(?V0???m??*?M?Mx6????)?e??P?????Z?Vb?m>Si5?a?U?qGt?b?W????MR??c5??wh??rjTj~O???y?=??<%?gx???@???KY??i??%i7`AR@{? ?_??h?g ? 82???M???&????)??Cg??v%{eI?WJ?`K??oa?gQ3/??t?`!????????????!???[6??d6)?L?-?q??3YSD?+???WI?H??b#+?/W?%???pK?q? ??3??????o???>u0L?-W??i8???r?S?? ?o???????f??R?A?l?O1????I6ej?yy???M'l??-?ef?;n?&.S?m?BQ???I?f?A?c|B T?3??u???l^??????+F???9Qn??Ip?k?N'? 0 '???4??q? b?????/????{~?e?????.?'R?^|\?p????gLM3xI???${ zG?KlH?*\Q??V?1?f??4u? ??`???zi???u?&??M??Q?Y??1k??x; b??!???-s?? Z??9????Y??????f/)??=8?78r??????]??????L??+$????d?*x?D??+??\=?I??s_T?:?$?>??R*W(????)?P??NA????l ?wr5#b????)?R-c@???\?? 7k???+#1? L?PH8>??eC!???jA???9tP?,Z?U???+?m$???^?f5![???V??@????|??xX?'???d?0???e???]^d?;?D?\Nzg?2???v????*e??N??[?7N?3 ????E??qK ?????]??$qt(?I(Hu,?7?r'??M,+k?????D0t???R?CDqDHao9?}?*??|B??D?e???8? ?+? jnK7 P??*?>?h ??P9:P?M??U?????@S ?WQ??b?}RU?9?N?$?/B??Wh??}?w>?b??O???:??w.?q???>???D*q???W ??y????4?$8:O??????6??????;?,??J?????H?????r?n????Ywr|E?????&:? ???tb??l:??l????8J_[??(?M??(GC???>$?mV?&eC!?4???????????(??C? ??l?+??????S?????y?WSI4???/????????????8???*? ?? ?g???h7l(?jZ????^????P? ?lBN??f? Q?X?????e?L&C#???T?t??#?82??P??;^??2?c:?????S?W?? ???1??p??Zhl?:???,N9???qDn??{-??p4?|?i??@? ?????A/?q???AN ?`b????????Z??q?????????????h?K?0????[??a~3??ZV???? ????? ???H???D??y\+????????????^??+e?????0??\?F??Y?ibKZLx EH#??f?(j?B???S?????Ih,o? d???? ??T?@??j7Z??f1??? :??~-???LNk???0??0|?v -?i F???????k?3i?FH _?/!z1"fs!??%? ??V K_????? ???+??a,({?$??? G? ?40?PZ6????wt??x ??KK)7?N?G? ??L-?8pB??T?????w?-?G1>?8&9?%S? ?F'????n??J??4??????????he???W$??????????-????.)qp2r?_qe????6??T?y?F??Vk??j?^???t2??4?JtP!???shF8|DY??#?>? {???Y???\?????????3+?? ?e y?: ?6?N?h?P???D?>?8a???^?-??8? ?*?~??k)B?) ??Y?7\80r`!?q?????????L ??cS????n??r?Uz????K?aQ??#?Y?^^??V$?7????VI/O????Fc)??y?9Q?5?E ?7X???4h??A??gt?y??P/"6?m??????/?o??[?F 5;? ?M?R?????????.?p????HJ@??@"E>????+bq?Z?g5?d V(m?RK?m?9 1?5$??UQK??? ??v ??H?Ab4zS?H??":???Km-?i?I?????=5?)?Bg at X ?5Olv?m?(?&`?,U?|*??? ?????V?@?Z??:??k????8N?L??u????????\>?2h#???6???~[9VQ??D!?N????c_???8=F?:?W?DT?? ????P??gp ?!??3v??c??Ks????5:??E ??LU??J4?? .?d????O???????|??X?? ???m$?A?u$?@? ??e?I6@:ic?R???(X?)H????n?Ze??????&?-??8???c???r$Lo?Whl???Q?'?j??`??>\?[n?_?-??#1?Hb0?1N?1?Sa ??????`Tcl??0?=??????q??/??LR???M???_????k(l?Y??? ???Ut?? ol, k????#???.n)i?k./0!?&??\??????\*?TO?=??ZH?????x'?J??'??YG?/??D????^:??grj?k???o???rUX?G?GM?u??H??????W?L?o?U???=m!?????Ee???? Ak????|e?U}I???K?5?XQH?35???????A???!?\nt{O????1Q?!0N ? ??L??xRg~RF? n ??8?C|?q????F???6 n??,?c;FGF?????SZj"????V?y??J :?Ph|??????????'? O1Z??I?? o?4|???SG???{0C??????fI?C?;?o*?B????|p1% ??F???@??8?mp??L???`t{g?????mCh????x??U?-?&?&?Q??]xu?u???????m?????M?hx#? M?????gtJ?C?w???Q?.?zuq?cG?h?/??????18A_??????~????v?^j???????y???TB???L&????????_]???????????????? ??2???????1V?*p???~?d, ?*w?@qCo2?d ???Z3s*T???3?]b??<`?P? )?;m7?@U3?%p??2vz??? OqVo????nE8??3??6?1b?3?gs \??(K???B?Fx??h&???.+??)???* Gm?i}h?????8?J??%F$ ??1U??&?? (:V?F?%??????mA?Sc? ?l??Uvt???l???DW?4F?]???~????)?? ?N?Q?I???P??l?K?J??????i?C?(????Ll???p+?????A?????|x?)? p ?B/???@ ???~???{?> _??f??4ZI?l.? ?C?@?/????T>? cX???/??T~]?|'O? d=?x?/Q?K&'?L1U(&2g????p=??"?:????????u??d?PHxW??4-U?LZ+???j?G?? Pi:#U??Ro2??|Po: i??????S)??2i?z?)K?)$|?>8R&????4??\2?@2R.e?l???]i?AN>???*???9??@*??*1?|:-o>??.?+ $l?z*??????f??A??\!%???????J1|?????????\0?bFf???\i.??s?A??,%W??xW??iY?- f?x?????? [[R??T[??dg?UZ$ f2?~?-??????E5?X!?e???{?q?A4?v????E?????j?%???+tT???q?? ?[?I?????%9??`g??L????J=?+??@l0/W*om`"????T?Js6q%k?4?akC??MV?r????:?????????4?????@F[??-/?Z??K&? ?RrOe?8?????s???6?J??P?* ?Ns [Om6q5???s??? y[O???* ?k?Tj3?z????4 at O?2???j:o$\i?A^V^?d?U:??{?4?U?b?4+??3??'!%???r?.??9?+>* b??I?H?t?f?O|T??/???,?g???IUHF?J??.?m???~??A?W>?????D?sx???r?y:-?^T???dR?Nm??-%?e2>?W?? ? ?O????a?F??Y?s2GJ?p??Qi*??JV2?dq%/xJ??`n$??????v???? ??@v???m?????? ?$mS????zr?L ?????@?k??z???J?H?????z???l??? o?{k?;?????T??+??@ZP?????xy??J?8????}x?)= b??):? ?.????9?e=%?t"??7k?1?}A????J?(???)??K'??T 7?]????H???)O?i?4P?????-S???? z????r#As??????d?????x???J????a ?!??????1(h?Uv????pu?k????????|??e???? &??D???2]?? ?J???1????????t?(??t????? R??UvG?f={? d??dm?????<?P????v4i_2??7l????a?;?Y?F"?+?m????t0???"?|T?/a;???mm??jc??? ?4?m/?wz?Vi????* b)?o?"?F?i?(|`R ?? ??b6kE?Sy?* ?&%K?r|$8 at ynm?P??n?TU????'G* ?%o??D?n8Hyo? ?iy????@??)??]??mm??W2??tVL?S,G#?y??s?1??n?yy????G?$?2T?=?T?sk??E?>?o??]?}?A????^???g~??s.{??C ?#?yt?5?o???-??{???_z??=??????g|?U?=?t??/?|??}?O???????t???W????????nx?%?z??'??'????????~?c??r?G_???7]{?g?????gz?Ls?y???1?7???w~?Y?????}????/?\|?z????}?o????}?l????]???s~g???/M????}?????n??+????W?|?/???i???{??O????????????+???o?]????e?k???p??>???|????~????8?},^?n???????x??gnz???.??7?~??????OV??_~???????????8??K????O???G>Y????{'z?????????????6?3????X???????K????????o~?????????>??#g???7?P{?;o??+?^9?????}???g?wG???O|?????_o???????\???I??w???????g??{v?-???????M???G?????sc????g??i????????????}??#f?W?????o7^{??W_t???f?w}??o????????????K?x(????????????:R9???9???,?1?6~??g????N???sx????????I?}????7N??5??\?? ?8????????????'??????l8??]t?K???????Q????]{????~??G{?n???7?v??????~???;?????y?m???~??|?Y?7????????f???K????_}? ?u?l????1?^???????>y?K????]??W]???rf???>>|?A????_?q?W?z???o?g???????~???Yw??_l?h??O7??????9???7???????|??????F~S?a1{o?w?:??????z???|V????O}???????G?J?????????{????_v?????nu??????7???[?0???????|dgu?z?v??j??}?????GS_x???=????????>????hv?}?/?? ???}S??????~??????U?9??????????_?tI??????????????K?L?u?y???~??G???>????_???uL?UZ???????????u?W=????[??????_?~?'>z?I?>?}7???I??z@{??W???????>????x??_??h????G?????Qo?z??{?~?o??uj?/?????????L????{??i?~?9???????s?Sw~???}??~????????g????'?*?_??W/???>{??????7?????;????#:?????]???k~??o??3???F??cO=t?????v??V'?vy?????[u????s???z???^~?_?n?o^?k??????yNa?/?O???.??????}????j??????k???(o?jT?\?v???p??????"?^?????s??Me???}E???>??\??cN???????o??O^t???|?/??????=???]w?aS?2??/?r?????????????+?=m?#??????t??/o?????????;?>??m??>f???_9???c7???S???????W~??\=?0????????[???U??????k<0???????????o]??.}??????n?|??g?????o??k?;????????z????_??|?Rs?w?G~:w???????}?M?c~z?O???7)??L????"??^z????[??u??????}??W????????x?????3?p?u_?????/;??=??Go?x??=????w\??K???????????c??????????????U?/}??g???????????O?????????`???????~?W?w??????+?M????O???????????8????8??3??#?K'o??C???%??}?^?????7??;??:? ?z??u~???w?>?}???kw?o??/Z??y^?????8???}o????????{????Z?.??8?k?????76?Yx?%??x?9k??9<}p?wk?}????"kO}??P?5j/??]q?? 6=??????7??+_r???{?w\???Y???C?????????E???k?/x??U?VZu?Cg=??kC?o??7????????K??X|??????{???W??????s????????s??Wy??7?4??/???[U????????????>v??oj?+????o]??????????????U]????.+f?{???????W?????=???_r?Q?s?q??????A8??#?}??[?C???o????_?8?????N??m??>S???????Kd%?O:??????RG??V????Y??????lU+???V?J????6??f?????????W?k5] o.??>}I/)[??????^??U???TX9???????f?=???.?????T??xUhj?l?^A ??-??*?AzB ??F????mC???[???M?!?M???`????wA?[????4 ???????xgZ^xgZ?3-?3-oY?????Et?????x?U/???o????Y??^x? ?z?o?a?7O:+Y???Fg%Bg+_?N?????mC??R{?????iW?_&??????>?3?rcA?????`?^?3?w??J{N?m4f?zMk?^??? 5??{?E??%??v?? q?a???,?D5?z????E???.?%3?m??????_>??? ????B\| L?w????[Q?? ?#?g@?7OlG??yt?2?? ???x???e??c??CqE??Ih??U?A?j 4te??U?t8??ZU?{b?ze?ICt?\?5U?F}?l8ma??S*3H?j???? ? ?c-??5g1? ?K???)(:]?j%$T*? P>?J?? ? ??%?TU?OM%r1???A?4??V???/z?a??e?}m.?}!?????s??Y??'?DyY???J?S?A>P?????z>?????Ph????4=????:-??????9??T*?5u??Z???}?R?"?P? >???Ph??? {0 S?N??!?/?@??QE??F???>???E?H?;???h??T?f]?St0+?lo?????????p???f?.??!? ????R "!??e?Nv??}?lI?(????[??Td?R?3??>??????wy{??y}?9s???????}>???|G?p??]??7????????[ ?H? ???ud????[???????????_????????KH?K ???[qN?^%??q??? ?|?N????|L?`??#?yal*???Q? ???? ????m??/????G$?Q? pK ?[?=???mm/J}\j?W????????7vt ??<+???1$?/Jb ??*+??R?????RN-k# An???t?I5???}?p?,gb??????P??+5K#q,S?p*3H0yT(%??*?_??? J@???B?t'N N?}8 g?\????n%??9?E?*F>r?x?????+9???????5_;????mi>??Dw?}v=--?l?Z_t??K???]sfs?B!?Lf?uY?l???c?R????!?O ????.0??V?????>t??Q???c:g????rd? ?z?1W?8/?9??j?t-???|??V?a'qsaZ ?Y????@I?v?Z???#?CI? ??a?\??\???? )?Vu?A???V????NY???*\=??????GH$x:=??)???????w%??h????>??????BI?K?A??E-????e???$VJJzr] ?c?? k?;y%???k??I??k??? f?`{?jz????|{?yX??????u??????{???=z^???\?[?I??$$2?2??k!?????????$?UW??r*?O????_%C-1 ??j?T???Ytd?/F?????=h[j*o(s?";`????Xg???,?^?D)?t??G?R??0 ?s??-o????t??hAk???r???_T?????\??$??????F??? ????2???v:g]?t?k?B?Av????E?QV??y?????{?m?.?????U???dK;?????eG 1GY?5\)?? .???Bx-??e~Q???fgo?|?N;g$??f??*?T\pHitTh???-TX?@?vZm??????i?Y????7@?`R?\??X??n?d?????g?A??y??zs?4?_???-??e?0?????Z?????q {?n)?p>????3??{?Y]u)?`7vy?????#lf?V????`????jfr??2~?r???i???g??&??N>?&?Z??pzp?K????i#???1?Z?>h?6 *????????T?? ?0??T]????(+???HwK?J1?19{#G??????jJS?bS?>?????R" ??l? ?q?-7??@S?? ?n(????/??????b)n??g???S???z+??mb.??S??o??T??N5?w?????5?C? ??? a?`ll???`?55;??U?Z??/?P? ??{???SPF$'3xy{??9???{]Q???5????ms???Z???w??\??QC?T???W?8?r???????L?s?=C;;CX??l?Ki:??CG?)???? "?86Q?D?q??L??v}????3>>??.??W??Q^.??????y?3???tC?????????MF???Y?F?????7?;vx??? ?7?@7?^?&?????3?Y?O?y"{r??^X_?)YO?????wU?h?a;1q?_S??[??+????Bj??Kr?6Q??-?e??8???$???7x/??aB(?j??`?M?*??K??9??W???vh?#?% E?4>?t,/K?Gtx?uttP.?????S????W??}?H???y?z??t??Y???[??O?;???II?6.,U??? 2p\?p?x???V?HG?s?A?y?????mmB?????=N????7???????c2????yy2???)?Y???*?|?7??#?R?)??h??>??q???|?,??)@?f?? 2???2 ???S?%??{WU??-%????????N?????c0?`???B?^I%!k???(R?,?$K$"?????? 3???????????=???y????9?r.z??4?*???k????N???b????#?s?a?J???'?/|???=[;?y?&????GHLk??"^??zA??;?n3???7? ????g??^?r? ???N;???9????\?]??V?o?:?]JI??P???"????p???U?> ????~?m?y@?? ????iN?T@?O/(??[w?{????/N$I?EN???q???Q????jO?X-???????m???s??? ??H{"5]????K?q?,????\G???N_?W?5?K?@?q//{wy??Y,?????o??2???g? M ?????[??$?? ?v?~?T h7R?????s??0??????a??#???3?n?yu) ????????????*???Bt??lm??Z?\c????N?pv}U%?6????x18???y????{?w??d?g???? ?}?c?? e???-=?P?A?c???#?&??n???e%????J ??????sl^?`????/^~?,?\?~????"?b????b*?v?n&???1?l?+?3@#??U?????NO8? ??g??\????3????r?/v?X1?R{??(?Y??"?? 7~WG??n_???]$???OzL?7???6[???9? A.??? yC 6?g?A@?s???????jm?T?d??~?*HS^??DB?7?????)?m?W?m?b?+?=??j#3?96??s?'? ?????))???????'I;?Cx?????/?+?4E(?w?x???? :????_t??&??????a?`???+t?I???? ?i?c???? Uy;4????????????,KbO?????s~????[u??TD%D??9??t?g8???UP??Zwj??????U?{z?? 3??Ps?^2H7????d`[?fMY??????s?%?#?[?? ????Ct???K?.?E??a/??????????\?#b??I?RzBV?t?$?xz:???9??O?'?vO??0??vns???)??W [?U?ehz?u?P??w??F???9????h ?!?up0q?6???IJb~?????v,?hv??????U5o=y?????-? ?????%?f??F??A?e??)?k??T????/DW???? ?vM? ???????t? ???B?/??? ?yS6?????555??Gj??o????????+??CO7????? Y???T?a977???RK??i???.V"92?????nm?J???=u????pq??@ -???!?????T??=???J?????l??k:?-:???z??[????E?? ,>>? ?`???I?*(S? ?n??}A??+?!?w0IS??????D)???@???xn?Z?aQ??n?|m??Sy??????o?g*?/?R-????~??*?J???????7?9j?Gs?xG??f??]??q|??[r???b??^BI2R1'?,`2A??N????e??h?????k?q6sqvq\??h?7??s??k?8???kkU??????a??c?m??????':`???|???J@????d???$[????9? o???7????VZZ???????}???Z ^3???1o?GD???#???????$???wu???????d%G> ?q?5H?I?r[t????b?O ?b?Tm??J???????Oc???9m??????}?? [????,Z??c??O????Fx??_?->?,??1??}}/?*{???? ?R? +SR???6Z?dm?1und9???Ey???M?H???=?N*?4?{??????0?T?????Z?M? ???F?A?\f?a??????B??v,b??????k?F4??lrS???d????>h?F:P???,E??<[?V?c??<????}`?????o?^:8?g ???T:A?!{??X??e???.?~???U????u?Hz ?kN2L?k]* ??lJC?~?T???0Z??:ww?H?????4?6:{6??UU?????|?F??Z?a???????????? K0:?80a8C??!?^?F#QQGu?gF?? ?B9sw?UN?5L??n:D!P?? \aa?W?1\s?, ???{??EV?^sG=????*???5??`??3C??????H?:?.????I?g?xx8?????f???&?<.????qrM/?X???U?A????#??u?????>?`|q??M???7Wma?h?gC???h?6??????+??gfd8C??T???c?]???R????p~f??)?V?5EEE?.?]?F?~??????????Ex??N?o???sG?](??^????????????????}J0???jt22A?$????Q?? ????w?Q???i?????"??Fv???*?}??X????????X3x[G??V?q??Ww??e??K?*?EI?].ush?0???z)???5? ?u?qWl?|??a????? |???a+9? .??q?Q???+??.?????!??w?R)'??o????????k?,??????U???;}?f???.Xfq?????i?`???s???n?a??>????>????^\QT????}??? ??>v????,r?&?? \??[?]r7????%_??"N????fe?%? ???_?-'?9b???"@?t????q2??F ??z,s???????=L??)??DWW{]?????ZN???}u?F?v????z?F}?k?K??I ^S[?????z?????? s????????.D#?? ???8))??v??Y ???w?O?&T?????$P?D[{????2?? 9T???11d??|?`?X???} ??+'?????".Nq@??? P??? %nn????!??r?x???s3?&?\jT!????????^?8????L> ?mJ?S?#L?? ?B?t??n??sZ?3??l?=5?0????]?#?GK)?)B??????a???3Y?{n>}F???z?iX??]j????=?????jii???7?2???D?fztl? ? >v?Jcd?a?????{??f???IJ'?;??C6q?[?{?'?^??-?N?YbKu??&??`??5z?o??????????%?4668???n&??? ?T???t???]Nw6?K?m?f&@?PJJj/??????????Bd???,=8????{??w???OZO~?9\??=N?w?B??E?5>a????h?ds???GH?j?6h~X;A?}{G??W??l????u@?`???????J .?u?k???????Q?%???z?tM$R?????g*9?f??dk ?MO'2??iZ?(*?L??O8????L?_??'?????/???9?[N?T?L{ ?$???????AG????x~????Y?s?q?)??=??u????S????????Tg?,???1N?ym??a??K????+?s??}?A8????pH?'c?K@_?7&)A; 3Mn??H????x ???--s??%?L?~?????96????U??GT???&??w?x~????`?I???? ?? ??9??t?k?????9 vX?z??D ??*?'V???.????jQR????~?4??p q9z??,????n??\??i?t ??P?i???`z?1Yr?7o?D??K?y??5??vu??Rq(.|??ct?L??>????$?n?5>L7??!'bdf>??;??VB ?68Pj?_H?$Y?7t?????sr?Y?E TD?D?*???y?? ???jm?)x?W?r??? ?"??"Z??k8?ns g?6?????\?t??IzqNZb b???[;???T????/?#? ?????(m?0???f]??w???]?=??c???L?8#???????;??y?a?L??? ?\?$vawu?-??????#"?? AT?j???/?R?? ?@:2Z??????3?,???U??IZ???"? ??dV ??k?'??g?^ ??"P????|n??O??f??{???????!A5?P?7o?"?J?X?,??c??? ??@??0?q?RB?r at 2???&?j????????? ? =??ti ?7??/?????????Y?????$Og???9!w?s7h+??8xF?x??|???w???'????32"?!w?@??P?gk?#r:#A???\??>H?&?p??A8,???%d??n??|*?*????????0xg????????[?_??J;??'5?|xA?&???"??W ;?????%?????p??N?@??XR?CP?8 ?h? ??/[??Ng??1????????N????@' ?a B?H?P! Y?cN?cx? ??6?}Z?^?w ??k??#? Y?-?????*@DlG&?9?Ptn??xk???????q ?c??q?P??i??????u???g?JN?Il??"????:@???#-4E??]C???????;Z?-?#??D??l?? /766r?_?~ ????c?qld?-U?zc?? ?u?f??=??b???T?MN??j?d??c?????I !!?4?9?~??^??;{8lx:????j?3&??2>????^??o??????g????????V???M?n?????????????=?*???9??I??3?{:z??n?fQ??v?:?"?t???=????FN?K?????^?}\????)??n???}fJ??J???X???6p9{?:???E? ??s2&?pg???W???ad???)??L??e???????????7 ?O8?1?5u?6??KJ0??,/?4???O???Z?:Z??ZJ_??MR??w?lzf???t10??k????K?X??B??"??J???r(?\?~;??N?:???????6Z?&6??d ????_ ????4??j "\?.???v}L'??e5? ?b-?a??&?O ???y?Q???n?+?t}??,?.??G7??????r-?????{?B?*??Wa???]??????1?Zp??p????????? ??^nx????SR(?h-?????G????$????C@pW?-?NE??3?????\?#??F,$<T????????]?2????,?ovZ??Y?? ?<"??XYY?A\?Mr??5??D??\\a ????U!}w???"`z??*1??^? AL? A???????,????zze??????????!z?&?Z+W????Z2_?8?D???{?HH v??P&?????????? ???3?Rj??? ???Z? ?????6&ykm????? ????.Jx???d?U???bY??y???6q?U???M?Q??tRLB??3??! ???|}x?-??2???? M \.??~ ?1 ?@???H???-????????????YEU?`??????????:???HyR{sK,T?O? {w}B.~~???????????.?C??n>~???????/????Su?vw?`?*?P]?h?????E???l???oMr??,???!x?<`???T ?4f?9?(:3$?$?N????7?????{??j:??6?c:?,???w??5?K?bmtH?1g??TI#?yH????????? ??????????"`L???? 8?G??)rG???w ?? ?????W???jZ??m? ?K?????Lr??v???^????: ????_M? @??6$???_d/]?]???t??1????^"?????jv?9l??"\\???e?N?#??-? ????$#Jl5=(????t}g??6?\F?###??!?6w??????eD?Da??L!???j@??UCmy?V????9?2?e?8e2??@?5u?????PII??????a????Y?7>??QPP????WYK 8?????PZ?p?Q????x?^?)???????x?V"?zX?zP?w?Ps?Q????G??F??a?e?L????\]??z%????"%1?fk?5C???????O????^?X???H:b?v)?~????w??6n?tW7 ??????J;?????{???5??t)????Z=??+??=???????0N?_\?^??RQ?E? [B/??w??????crW(4?g??cu??Xo??????+"vqQ?]??~??L?)?x?!?&?f6???7>?_???utQt='?|mP?4?1??_dhhXEE?y??,S??+???Y???Q?b?? %jG ;?X9?*?{?x$Spn??p?????{??{??t?6%??R??K"?? ??>??A?w?2?$*U???7(?+h?3 C?U????d?1M??:7????? ??P????=?9h&???L??%?I??j?d?Ph???\)?`??[??r??F?;?N??t??>??q??K?xs???v7??S?s/?o,7??;!@???)????^]????e??c? ?h?~????WN?i?j?>{?[?`t???????.??????X?Y???N?D?:??K}|?6???#?z%?v.`/??G???J}?K? A????D?? ?9? ^?fQy??;?I?Wp"???j_?o????w ?k??k=?????;HsG????+?7??we???,x?Y?^e??????u?;?????c?w???C?? [???T????: ?/]c?FAA?v??S?Z??????k???????????[{??MSw??1?r?? ?*u|~:HN????W???<?n]9p??????????G?/?iu?q????E??F??qH???l"??=*4@?R??X????g?PPu????r?A?AO?[^?NL?9$=> ?????!????T#o?? ?)?+?\ ?8i????[???4h?#???[?????|vZM?ud\L???Gy??tjX?r?0?nyw??G???? ????t??"??f???N ???E???o??-S??_P?oA?7!?O\???????'=??????~~?????&?DE???- ??vd?P9?? ??'?# ???P????^IEC{?v?+???? ??V_?}X?????&?A????????????$?????8(?4??rW\????Y???????8??wo y????????????? !=??=V?~????s?D?#je??.?"1eoN\???nz?9??? ???$?;?????R??52"??oJW?????M=??????TWy*?y???T???\???9q?%??\?H???????????z.?g?l?[??p?Y?q' o?S?????????Clx^wo?c?.?n??f??=$D??>?xB????&?? ??????L??M_??????o???[mEC???????????5D? ??>"?tw?S?a? ????V???? IzZ>??Z^?x?L5??F ??=s??d???:?I??w???Xz??o?n6No???{???,n????D??9x??????>c??f? {"??????????n??(:?????B_??????x?VW2?^?? ~F?v?~??p?\???^|???????? d?????t???t}??R??ti?U|????th?66?D??V7?%E????v"?9AKNEE????q??D(@g?s??M?H??Di??e??i?rN?l?Xe????:?a?|???#??{?v?iMK????#?G??lh4?73m?(??u???I@7le?6?????#?c?q?Kf??N?y??????3????????r??A?7u??w&;??I0?eS?*' gI?{??2O?V?f _M% }??F?R3 2?G?zX?u???L$0?%???G?}?@]???,W?[H`a?oa>>\???????#?;???????????H??/'?? ?????P???8??}??(??_?>z>??)????? r2:?M??cV???? ?B??GN7??no?)????????F?Y?I? J?_??d7o??+?K????y ?v=????g???/_????#?e??????D+J?o ???~?????S?F?np?n?1??{??U?6???O3??o????^/?;?v?p???Y??Y?Z?;???I/_BO1??? ???O:9%%??????P?? c???b??s6V? =????K}`?t??w?????#? o???p^?u??.?UMCC?6?????? q=?-t\???Y ?|K?????G?????qb 55???Wr??RxV?? ?.E??6m ?|?)0???x??;?????????? ??7;*?????V25?jgg???`I]`p???.$?! a+-?J?#]]J|z<}#?X+????x?}c??t?:?r????YG?m[???4?????+?????=?Dr??????=??????S?OO? ?{?#?z?*?'>Y?WS[?`{??{?????L'}?)?????????%??@l\?l???_???)?j>84?$?\1)H7?=????BH???6?0?`?9s?vd??"??g?????;/5;?z??n?g?(o?-?????<8U?s?\?d?????? ?F?<??g?>?????\??Z6- ??T?'?w??2I?1?(e/_=? ?!??P????T&mG?L???R?{????9?Y?g???????=??????? ? ?,?Aa\??"?$?}\??? p(?U???????W[?3?"?? c????`??b??w??B????'.)R y-9}m?y???" v`??????=??&??I???]a.n?????\????"l?HI%? ?J?|??????????2^P8???(??? Y?R\H??+?? hFI_ d??)?e???VW0TP_Z???An08???;????@?Z? K?? vf?R;??y=???/l??????? ?~???5d?@?0y*?? ? v?q|? ?/R?;?dqo??|>?4???/?h,z??0?d?'?NF! ?M???????S_ 'J?}?m`..`8F????`?.????t ?? ??^?????????? ?}u?$???~???s?\????-*k?????'????? ???i!????eW???d?^?)>?|??@???[??}???? l????7?k??!?? ??=???~?0~80?EK?>? ?~?_?s????|?2n_P^@\H?[?P~?????w?,??e'????(?.??b'?????y@? @m???~?;3?O?  ?>??j,(?'??????? ?!t!???*]??????????`?5`??????8??????6,?s?X???i?9u?k?/?Q??? ?c?4?S????8??2???P????w??l!^P????????G/??$???&Wl`???????:??d???0??+2????X??2?~??s?? qv?w????m 6`?l~}???y?@? ????0? ??z??????Z?h???+h~? ?"?L??-??e1Z? q????????_?K? ??m? ??2? =e-#???????????????4e4???t[?8?:l?k?~Lc}~??~^??? |????\?????m? [?'? ?g??_???? ?-? ? ??=???Z6????^??u?X /??/?m(???%?w^????*? ??u??x??\j??[?g/??Y?D?!$?yz????uE?~\&[????????s}?-,? ??? [?????#+Bz{@Xo]????!?????{?O??????l??gF??HWFd??+?q/{z?aKE+???8?A`k?????%?????O C]?P[?;?Xx?s F? ?`???+??K?? ?RFWum? ,]?????Z?d{KkY??-Q???,???s?Q??E[PdZ??8T?/'????/G? ???E&??fP?$A??~?Q=??p?^??Khn?iZBxi??d??}Z"`??q1 R?Z??Z??AG??????Xs,t???B7??-ti ?? e???? ],?$???????Z??????????)N-?X?t????????????Mx-??K???\f????5??a??T?) 6!?M?a:??o?V???1 ???Py{????Cp???q???1q??{0???????????l?EW?????Yf oX???% ll<]?;*A?i???@F?g?q?1b?!???;???/=4Na>??){E at P???!?`N?E? ??0?C??s????(b???v[???^?????E~??J??????/&???V??c,?0????a`?/~?]`?-?w?? ?\?????(?????M?+???A.???|???PZ{`? !'=?`0??F??'?Y??O\?|?"????+t@ &???X0l,?5? V? ?O????1g??????=`?(?2?? ??)d?!?T|?C?_??'6|B){?2??)$?0'?[??8C!v??@WA]EA?Y] u?F?F ?+???d?p?H??_?y1????Pg??$#p?+???? ??_???P????+'=?"?????W??OX\?O\P?^IC??g??c???X??Qc[?! 0?m?QE??? 7??*? ??????_#|C?? ??Bs????c?H?.????O????X?v ? i??`??Lr]?p^?X??N?`?;?gY?2 ????.??]?????????>??????X]?X?)?P? ?.?PT?[??<7?@?J?????2;`t_?'???W?y?*??.7????-h??v???=?5h??A-?>????????H?(U\?/?%?'? #??Y?*.??Oa2????????  ?(/????}?!??tv??x@ ??.?,@#??Zu?h&t???????| ?K??~??*?|?/? ??????? L?Z?4???a????wi! ????>??8`??????,[??? ??"???)p?"j\I?v?a q?` .?? ?V?\xp ?A?AL?g??7?? ?~?-&#??7p??@?F ???????????????"??2???{ ?]?=?0od?????s0WNz????????8/??????'-U?? ???0d??#??????3@??]&+?J=???K??h?????%TC?hd????e?W?|?E??5???V??z,?;q3??t 7S?:S???????? ?????M???????????3????q??????w???_f??o????S???U???wZ?]???k ?W?W? U????'~0N???T??)???N [0??????????/|? W?}? ??????|bK?????;? ? s? pRd???s?I??K???KLF??W?}aw/_?]??I?'H/???????8???aE??n?????V ?T%???$F??????b??W ?/?? ????R?"?R????????;K?~?J}is???E%??j?????Qk?b?I?? pu0?n??r??R??+?I????(?Dq?`q??CF2?????G?(?+??G\1X?R\1?????????????s?"8W?s?8W???????j??\???J?~????3+] ?E?+?b?7O?N?p???????R???<)?,???4G?/?]d??B?8???W???~\X???e???F????;u`E?_??? ,q???(k?1?,??????????`???? ??#,?[X~\???S?X?????PT???|\??????]???SVL?OP\HW ????????????? ?,??????^????$F??U???^??W??]v!r.hc?? 6?@?|f.???=???[??-~8?!'??Vj?F?????p??]?q?? .?~ ???????,J??/7K??????W6??q???,?P?,?q{???P? 3s?yA<@?????Flo?C??)"?y@?p? ?^??????? ?b ???Z6?OA$??8??8? ?u????9??8?U???;/??? k??"??ig????Y??~??a??d?-?s?????G?_???m?4? ????|1?y????????????| ?K at A???0????????? ??????lh:z?mh:?Mm????k???Vr ??????`21??1d?C??){???f?0t???8$ '?? ??>K.?M?|?/??Iz=0???_?^???_A?W???E????????1??G???4?|?oQq? ?+????_???D?=?K??E?????:C{?@ ?1t(h??'???.?>??B?_q??w?0???3????????PbYY??K-?D??#?R?i??????7??|? ???z?_qL?!B????A????Q?!??? ? ?R??H,7p(U???PI.&J???%B G?M??0?W???t???`8@?? ????J?XO/V?????h??{]????? X9??e??X?=08?^??e?K 7?.hc?,?)?u??'0w?z ???>3????g;??s?C???A?t ??????v?r?????e?/?g^?? J??JG??;?B???c>??\?G?q4?????olo???0?]|v???0?eN?_????????t????s????,T????^???y??b?????B_?X?%?????K E??????X?#|>?y??3????tv??x@ ???Cm??d?[?????_yP]??q?h???]?c???R?[5F`?3f???r?8lF_6D?g?????@?A? J?????/???5???E??l???-X?l??27?e????-??E???w?|??t??}?????1_}?q^S?C?????(?M?M??~w?|]4b???\4?????`??????u#08?[?B? m-?E:?XX0*|E?z?z????m!p??? ??C?Hu ?r??B??\??k<0??w??h'??;!W??Y8?F? ????A??????????HYESE????`??] ?;(????? ??AF z?K ??]?(?< ?? ??%?2 ?W??e??????~?$?\jb?j ???d?2e?_?K[\K?.??!%??3J1????Ts??#?Q??1B),?J???A?w/$?n??? ?j? ?{ ??y?Xg????????d>"???W?a ????M&o?)??B%??t??>u??sN?c? ?sF^ 8P(Tpa?V?]?? ?I?l??C?9???|h?|D????'D?t??"??? ?f?a?c?? ?p??b???^?b????8Z??:????\??v?D?Z?k? uw~?:??s? ??*????V?:?????U??'.?w?=d?-n?u???c ??????S\??'P,?=b8,?yPX?!O??????:pD???"??C??E__*6?mq?%?T?,??4m???%Kl:N??+a>?C?("(K:??????XA?&?s???=cnv*??HOMI?NK??)x{?.z?? ??Q? ???t???3??2??? 78??"?U?k??(q?t?p?e:????????J??h??R?K?_?????=???C?='3>C????5?V3E???_?I??0Pj<L???["?vK7??:???^K?mK!\`?f?`}.????m?RT?O?}?h(|??3?n???@.??\?yj????????o??n??? Y&?T,?qH)'?M#J0??1? }????{?\B,??????e??p9?[sqZ??Y?*???-?p[?9???? ?p9V:6???v3??[X%u?=??!QO?Ac???? ^???7/t?{8?u???\?.??????g??? ?????3???!f#CLN\c?#nlck??$??c?g9??{??g ??sh????? B5??n0%?? W?fY??|??1??V?*?(%r?LZ[?Z/Q????_?* Y% ???<'?)??+r*R}(????0 ????Y???;|Q?a???9z??D ??2??"B?X ??>??? f?. ???????F?RU??Ic?R????S???7A?????F??I????M]?a?d?7???L???nfT?k?G0?$?%?>?d,?????Oea,?PoR[p???|??????2???>?????X?F?g$??S?T,@?>F?/fr??Fe??MQ??;???9IY*??? i???%2????VB?V?`????8?x???mvH???h?G? SB???.???d?;At ?? G??#^['?C| ???UH??>?$????~?[??????U~?4?k????Y??Un?2*V)???,?X @sn??????" ?.?kid~???1K A?4??*?????YL?????s?eZ????B1???Y/%??>???o???_W?D?H????????abi/>;??I?????Q?q=??%e??????]???C@??c???'J*?5l?vEqST????nb??Y?????6M??%???O1?g???1??????6S? ??????Hg[H???L$?4Kk???????????YP???q(N?Uw?VVr<}SJ?n??2???9??"!=3-)?^X???n?Z`?q3?X=???k?b??zw,?y_?bI?` ????b????(???s?2?ui#??i?????S ?}79n?b% ??c??51?x ?6.[x?mL?v???,??6????l,?????99ExE?9}??h???N %?????F5???p??(?N???e_?a??e}?!???????$|???J ??1X??b?'?(?R?L^O??h???e??PnP??#??P4????lFI?RY??M/1?z?&??F(????????!??=g@????G89:x~?h7.??O:4??n??h?j? ????|????{????V4?YC?L*??s?,^???D ??P? ??P??{??q3? O?^ ???y??? P??q?p?a &?To?????f??????p?ex??a|??,?]s??[???S*?;??*8 v[??@????j?0??_?`?f?n!???f?<.\? ?p??8????wC?!r?j?2W??1?lO?Y?D.W?I??c??mp?$ ?l????FC?< ??sv\?!.??R???6?Y??sq?yu?@ r^?VE?? ?w???~?W?kdt+??a?4??i?????B??G^8w?????E?????~=M?<Z?Dtc?(%-P(2???4`??L??h?!A???V(?????X>???? ??$????T?84??]M4MB??4 ?Cb^?`?????p?cl ??????S???W?`????6+????#<9??D?????V]?? ???????? y???B'??$.?-s/??E56 at D9????8?M????u?qX?Q|i?$?F????6?????L??HG??M??X??Y9??|???JC?J??{UQ? ?]? 5????=$n?@4???>j??4?5f&???.??y \D2+5^?????2 ????$??w ? I3?a?5e?0???)? ?a???i P?H7O????N??l&??S????+"?pj??(\_??M??? 8c?F????,??S??SFXI????fG?B????1O??W????? Q?LIMR'$???T?'?R????IiB/A? x?Hi\]??$???R?X???S??/????:?J[:aG??j??M ????HO???6??EW????Y???xMi?H?7{YMYq? C4????? ???^???y?&??%???p)_e??/??}v(????v,?hm?3??????-???:??R"QFI|????????.???O?N>?;???A?>? ?N???? v??e?dr???w[??l7L??????f???$?W?????????A?p??P=+9????4??5?N?x1??lp?????I? n$?(P? b??p[V???WG?@E)??+????c????qX?y?W?H?v?2?I1?Xy?"?-?o??:?fN??)? ?t?)x????????5?R???C\k9????5y????E?ve????$K$4??j?L??I?????"??y??U ????l\?Jz,???X?PHa????? F?5XC?9??C?B???T ?X????Q????*??????"?????????????v?7+?9C?s??N?&??????47????R?f?U???_?n??jt?????w????6?o?m??X"5n????'L?G,??z???I?*V=X=h@??/???o?????v9???v??qUUL?!?L?d?|B?q4Re-????`|?mY?_???????W?????G,_U9-??????+w>:????>??8o|??+G??????u???#'??3zduP????ei?7??x?????_k?????K??j*??Z9ft??u]WL??????a=o??????#?V=V1???????????ONI?k??U?V?Om??DB?/;?????F??????ks?9W????sO?~????-?V??QO?7r????:??7???{?????g.?Y???#Q???w?????s=8??b???>?l???}??2????????z?e???g O???~?5z????^???Y???=?????&D<?=??Wxz????V7?p???s??p?lH~????M?Z??3???gw??(??iw??R???????^????k??O???????7????W?E??}???U?*.???>Pu????C?/n????E??????6C???s??7?~?y??????4????'&??????U??g.^7!??I?v-?4w????????83j????????z????em?????r?h^>??NX??????5t?r????GHu?????K?m>??aM??{???5??m?'?@l/y??/;???4????O??&^?(??????h???T?y??G{?-?8??????(*???????g?7[x????^?byE???M?#1?-????????\??&w@???6???G??M??Fo{~3?? ??K??F???&?????.?>?qsD???t?0???????k???4?????^Q??j??????h???N????-???????mH?????/??r????Qc.???g?7????????q??K???*o??????S?=ZgN?6????v}??b??E??????]7|i?[=?????gN?~g?2??W??9rfwH???/K? ?q??????:?????Y?'T]Rv??????vk?|qm??!?????]?S????k.??g???\N{???????6??????/?#???v??b=;????R?_???????l????.??j?K /???'? }?O?J?y????? ???2?z?$?j?Rs??????e~???6ZO??=??=_??????X?s?Z???3???????v???????C?iF/))?B??w????I-?~???'t??????cy??A}L?~??m??? ?9?>?????~??w?{???ard??????9???/$_?E?d9??:~??3Q/g?/t?????????????J???o0?O?A?>_?_??d??a????O}???? ???_gv?????d?? 2??NI:0???5:zq???4);'?@????nB?a?#?H???m?:??x??????irfx???Q???=?.Ia?k? ??/???R????::iD8/>?r???????-??) ??!?????k???????G?{?v??w?ym???M?????? o???F?????s?>^?`>?:?8??????L??^ys???}????#3{?+???v??Fe?????|hwf??r-o|?QR?????????M??u????f???k?F\??m???;?????8???70b???2?~`??????????5r?X?#k???J/??UI??,?[n?[? G????i:bB?mi{????????YsK???}???? !_m?pz??!:a????????F?TV=f?.?????a?i ???t??P?????=?E~??H?7?~'2M????3??'?}?3?)/???+??UQ+??;?8J????VW??4????C?6L?W??????????????G?????????qT?@??n???????????`??!]??v??????? ??R???oz/?? ??eG?gvoO]??Y?-???!???0??9G?{iE??????}??w,??E???? 8?F?a?N?-?????{b,???x???5??A??l?[y9???#b???t{$4???7J?????~??;q?N9?C?W??v??9????????is}???9????Kb?????f?.?: \?jn????#??Nj???(?/)o??iq??4????O?????u?1?????~? ?Y?&&?l??ss`?????f??=l???> 6?K?.6u?a???9?i??W?D?????|??)??????)?o@???t0??n??p?G???l? ? ?S?????????+????8??/?K?O?O??<9??O??rI???????x!?????a?ww???W??'??????O&~??F????J?????6}??u????o?+R?????;????m?V\??????^?E ' ?q???zSr???^&?+??\??????-{??????mpq???:?g??\29*??]|?X??|?y??f?E?M?R??_???????b???8q]???? ???yT???Og?M????????}??D???)?? ?OS??|?m?rm???L????+=?l|??????????w???-?????07R?f?? ??Y??<cd_8nd??????-??????w1?n??????? oW4?x???{????? ??QZ???*??:c???,?????:?=g{???????????????F?OF??)?D?u?H????!1?V??".?f??:S????X??hF?C?J?~;S?}????jvY???V?H6?m.???n???x?U'?.??Y}(?lu???V??????,??R??{??]?~?|"?? ?~??8c??Z?? ?y?R?n???????c:]]??}??`m{???T??k???&??b?_?????????????w???W?dT??k??O?AwO??.?nv/n??5gw7c?????o???N?????????_#/?>???g?.??ka??eZ?7%?~?#??`Q??h?6????f????????c?m??[w????\u??????G?fS??????S????*???????} ?:p????%? ?=???):????????)?4???_???}????????^???1?[??????V??]?w??v|?Sr??z?? ?+|?;2???3????a????????1?=?????F??ef?????PG?!G??L??t?Y?G????~??~???????&? 4u?r??c??hfj?7??>A?9YG:??9?@W? ??H?`?=?i?????[ ??S???I?>bc??????x???????????b?V?(?Y?? ????????v?g???????@??x??????~?hq69.??[h????????????K?11yO:?Eww??nw?p???&?:'???????????? ~?9??}8????7??+8h??t?????rv?vw???;??)????|???c?+WW???zc;?? B???w??R>jS?|?"??Z?o??~???*?^f?j?????m?:??qu????C?}?d9?^pc?E<~??YC??_?.?????a;?m!{?u??????WC,N?cXm???t5b???x????#. {?M?9??????g?8?m?(??????{???c???V??R?????~/0??O?r?08O?gV?^f?3?y?????`????7????(?dia???????D?Rn??B$a??4?d?Gw????V???????6???V?~_??rz?????&?/????;????KJK?Xw|a????&?????i??~N??? ?, ?rr????????w_?:?????m?????O????Z??c?I??q??sYK?????`?{?o?? ??[??OMO??{?*?{????K?/H8e?????OkD}fo????>?????Y9V??????l?1??????}/???/?w=?3=?4???|?AW?g1?????~??o?V?#???i???y?ZUU??^?x?b???q??.y?????B???9?>NZk????????]|?fV??%9K?s???Z?:Q^y????=?f?] ?\|T8y??]?9?*?'zk??????m?-_?R'?\My???OV,?x???1??,?>?e???M;??y???b*??n?{?0i?????&?s?sR>?@k???#?f?b?9??5Q????m?????=???"?Z??a?P?C??o????@F??c????D%X????H????7zlt?9|?W??:???:??K??j??y?82A?:??Fn????"jFeF??iDl??T?? ?"N?Ci0S7?J?#Ek??D?? ?e28\Hg?#9L6=?????N???9J??yH????????-??:?4 ????]XK??GR????c?|dJ3?N??????S???3?l?!????@~?bU@`$?R ?????V?????I>??jx????t ?%H???p$u?t?D???Pc?%??VNIF?5????????M?<%?u ??:t?????EIh(???<?6??Yr?FT???(?t*?????????\6?U???Y?I-? ?6 ??8b?????????d'7G;O??Dw_?D';Gg? ?q??Fw?su?R?,? ??)?6?]{???l???#?\1??w???P6r ?6?????? kI?????? ?#???)pk.?i/ :?????0"dzy?Af?????~?.??????4????S`?Y???5l??@??G ?#??&???????EVoB(N?n-??:????? U??4???@Q??m?????E??w ??-?s?? <)L{?::???r???o?o??@ ?F? )/-??? ??H@d?8.?S?}??)?E?)??Vb?k-???s??|??Gl?m'?? ?k?8???F?n#J?Q?q??W>J??z'&H *?/?1?Q??]P???Q?Le; YA)N??B?????h??6? G?i$?H??E?;???p^??CD?P?????9?6?P?.T?s(??oxA?:6? z??????@?u??Des??g2???|f?7*?(??z????J????4?B"E6? /????!??????M???l?h? Q?"?;??Te?M??T?T?s?Q???I?1$ ,C?Q)0b? ??VZ??pC???<&]h?F?MbHv?ZqA ??~?F?7p????? ??Z?M)?Y??(J??\b??????? (N!?q?7?8p9???$6L"Z?Cm??6??F?B?S?P?Gw????P???&??P?q?A?"??? A%?d9??jL??%`K at D??I?Z6P*LD?wC+N?HaC??3 '"?-?P??e?O"??z?oF#FJ~???,_??s#??m?zQ??:4#????= ???????? (???D?nP?????C?"??!?"{6C$?1"?i?W???????IW??#} ?~:???????/?R ?] ???u?????Rt?9???z?????9%??????Y}9\, {N??06?4a??#??&?&D?)?k?????Y????j?31l?? ??f?6Dr??[0???C'[??$ ??q ?aA??h?X????,02?x????#Z??2H 1M?(&????9?????z?????0p _O;????#?Y????????h6WHg?'O??(?????1??H?? 9,6]j &?h??????`TR???L,?QDL??l???}??yW??j???@N?*?VE?6??O?????A???(#???n?&? !Zh9?Bp-? ????>\?n?M?R?P4fAj+k??V{XC?????@??? ?????&?)?R?????a j6??CP??Y?} ?G?/?????|!G??d7Z)?w???{J??)???i??wP?H? ? 8? ?C?T??r?j:??(?]???=??i{G6??1u??{L?#Q????L?? ?????+????R??O?]U???bh?v???c?Jp??#???EQ9?:v??(??*?t?tQ?????G:?G9T?p 6??`URQ?)Z(E?r f???????ZM??f? T(???2???8w?[??4?F? ?@>??f??k???1??i?}?*o??0+??????`Nt???????]?W)q?K!+????BpG??P6 ??I??&??I?s?Y?*?x6 ??f??=?KG??Q????d?`-l???`????????E-h?,X????K??? ?\2? e?# s'?f?`MBjM#J~? ?e????!c7?]6???l,?G6 ??#?JC?c???|6 ?+????~?#?p??0X? <2??A6 ?? ???llK00???2d ?s ???U f?` 2ld?`[??M?????2d ?? ??>??RcXa?f??Y?~??.?=?Y??4?F?=f????F?b`?hx????7u?M?u???;6????l?]?@???LY????#M?R?v? (??,N?#1'??8)??8)??F??R????em???2?o?g?`[??l,c?c?nS?????;??s`??C??f ??h????yV(????~???? ? ?u?9?S?8?S`7!l"v?`M??uB4):S?)???ud?R%? ?ss?Q??o???C[?XZ?t"???d?YTR~?!?U???????!??????I??? ??U????jD??u?3T?n??DwN?R?????4?M?B?????s?j3??\??L?*7Yu%?7?7?Iy%c?*?cV?%????Ty?|??E??T??wIS?/pJPD?X??DZ?&?CkIG|??+?i?,??ixgQ???I? ???pk?/?c? 5???RV?M 5?????:?'6??R?}??????z?????B??#=?)n??nJY1??@4??U????Z??h???|??lS??Z??A2??#??;????+??:]?b???? iY? Nj??Lld?0:1INLO ??Yw?B??YY????.?????O0?+L3?d???5x?>????Z????x?i??~?????E?|t?7S.??N'??`???N??JHQu???9???rq???%R???J?99?VVk?????????i??-??PP??[?df?''F????\l>A???< ?=?iA^??^OR??_?X??^F\??????k?w?_C/s(aC/p?b?\]??9;????l??v?h?l6YQz1????????!g??KhH??c?KS,'?9{I_???+??? ?? #????WDP?VZ????ZV???? Q??#\???+????D?C??n??7u?vAs|??< d??+$?J9?a"G?=@??"KU???^ I?l???N'??7??[??`c?:Js????(????\???u??vi?f)?UJo?:????X?(?9J??e&?Y?????,{+s ???w?k{?+??Z i???v8?8H5????;rg?&???n"??E/NB?????=?jhC??M??l?ADI??n/I?D??P+?{!W??%B?Ao"4*?'B?Q?"?R??UT????C???^e4 Ej[Q???? ??qk-???;??A)??- ??????5?~MT?=??~MVx???Qb?Y??"g?I ??1?ZD?@-v?G )?-&?ZD5?????k??:G*??K?@-EG,j??J?? ??d?z???m??\^???B a>?? ?!;m$%?+??d??.??c????????d??C??b??=?ua ne=#6?,??gWylz????R=??VsNV??3g{R?@?^?-(k?T"???C??[?"?8?3?U?q7!TlT??1??`?g?z?n;%Q?8qe?;}????L[??j??id&F&; ?D/?nB??7!#??t"? 8q?vu???O.9?W ?z???xeS?^!???rJY??|J?N??t-?]??]~?ZD?p%??e-?,aJ??2Y?W??3?X??a?Y?h??u??!?t?a??$s,??=?:???sw?? ??6U??Z? r,???@"T?2JQ%???A???????rnAP?>?U?iyI?5?*?|1'?r??.??i?f?????X2N ? ?????Cw???S???*? ?#????}g?Tvo??)??{_?%P /s ??2"h'??2<1???'??W?/w????+??????????5-aL?#?HRo?????M?ZR"l??V???S?L?D_??l?Ym%O8?4???]?2??hn@8?/W ?K?4))?v??????? ?_???Q4?????0?r?/A?)fU?0 ???S?R|>?`??S*????? ????H?z??L??S??%?"b?Oks?j??g? js????SPk3??P? ??E?.J??$8'????A???~>4b???h?L$??X?<"??U?F?0??hh??!?)??P4^? ?(???%??9&???kO9?/?'?sL?????dw~m????/f? ???@#0?:??o?)??N?%E?f26?ma??Y;?R?lVJ?????j??V?n??.D4Q???2?????!W??????n?g\?????????ya*?/>?z{???,z???j?BVLIfA7\>2=;???3682???M?k?,?Ve:? ?&?K?_???????J????f????Q??,??? ?/? ???? .??20???q!????X(?59- ?($ ?C???%?4?oj?TK ??[R&???????c^??Z???r?n??? ?[?*?\?? ylz?s?f0?{??3?t2?d??e???5??? u8?I?????????;?Nha ?N?YBn?M?F? +J??????2??T??????"??;??U?5?B? _?Fm?TI ?V???V?6?Ue???????M??O??R?H???qI4BVYR`Kr???_r?PJ??S?B?Z? ?.j????? ??XU?$?5?e??]??3qa|b*? ???..??K???`??F?? ??? J???W1[W`-?? &?s.?pgs?c???[?S?.-(?r ?J?Bh ???v????? G?? ????????%??3^?! ??Z??0???U ????j?jJ??)%[???? ?????B??R$??yK?5ue????2%?;?Q{?0k8??B,??<?3?4???%6??????S^;:????l??7?K??;?B?HsQeL?p?p?? ????? w ? 4W???7?+ W???[??N??????8??+ W?q???Mq??`??. ?b^ Q]p???? . ?|u!?? ??d????Kn?\A??2?7x? ??U??_C???b????b?Wo_?\???3?????L?2???|??s?? #JnA???????6??+`??.??iA?DUY\D?1n???L?!i?Q?~?5n2?uQ?1??Xn?? ?9??????f???????2&??? h?j??R?d?hy??DO|%/???{5I?H???0???Z7?? `w????}?iL?_?  ??L???^?S1}??L ?""?r+hDG??y?R'? ?1}????Mc??q??r??\E^??$???h???????U~?k???6 ??:wyW???F???p?Y~?0@?????tg+?X?????&?K-M?,!8 +???"?????YL????????.??$??j?b.????ri???>???$???%LZAQ??????8?0!?????U#???L????z??%%??qp???Iu!??????iOO??":mO???**r????P ?NVACm?& ?????? ?3?P????3?d ?tqQ???????)H?`??,??? ???b?s????zt-#??X?C??18?ib??7??ZY1%???U?#??S?Y(Xm??~? ?j?TI?'K?o???????!?v|q(a)?@h?U?bV?p???+$C?cqe]?J?&?*???nlQ?/?K??? c??2??d???O?#va ????v?t?K=?]?C"^?sed??7? ???F-u??0?"????b%V?C???jb??G?U?P?E?Q?$???,?#?ZW7?P?'f???m9?]M?P?u?vZ?h?-t??Qv[???@7??????A?X:???U?????????w?O3?f? OyO???;??S 8n???`rJ??? 6???!?%8?2?Q2?)5q?5???k?tw??vw?QEF?6?????G???????JC????m!??x3f?? ?*?7?^1 ?vk ?fn7???g7??1?m?V???;?9Q??%?4?+?*???M?????Hyn ej??}?_???3X????????E]J?s1p^x?V????\?*?u.?p???nA|??? ?_O)??!1?m?KIk???k?4?a?D?oy?eH?3 ???(??(t?????a?A ????A?m????4?p??$?Cb?Q???y_#8?+*?????? ?kq???8"z $?G?psn`?K|$ ``??30?J 2w ?5?9TJ??]*???=J~?????H ?p0gp??Hi?TI ?V???VCmB??_w?)??C?Ui? ??t???\\?p???J1???A???(?yI???@]&???!???H??*??p?}?ak?X?? ??[0???b1??ss????I.65???fgcS??39H??}8iE2N?-W ??? ??9?t 1??O??;g)??r?3 D?(??UI]?s??#???-?_?)(?????_09h ?T,+-k??"??-??K??,??N?|????{B0?PE??H?E?S???qw???P??c?2E?? sS?J)|?#U>oG?c ??????0=?r{ )1 ???Y?p ?bV? H?bMFY2r:-???O+?D?? ?-??e@??s6???????^???N?&??z0?gTL?\??T?#|44h???h??????f?o?{,????F??? ?????M4 0 ?????hQ?Ey?Wc?O??DOZB??S|%Nh?v'i"ct??e1????;?f[?;QWO- ?J?Lld??=w????E?! J???z&r@???&t)???I0?y&??? ?1??q5??Xb??k??i??????|Da? ??,]????G???????d?S&9?(???U?3>??I%;??+??iE ?? ?1??????1??b?jA?????9k?^?????Y?>m????*?yC?jV?~????c?????C????e????%DXS|?G?h$? /_???????? '_???|?;???a?>????S?????P42?X?[??OY?|J???HG*k??%f??h0??v?U?=??????f?{??7?k?k??2%0?&?e???N??y ??6:?h?kW????y??J/9 ??{FO?S?E?!????w?IM1n??ey?t?? +-?UV5{???)%[?A?!H?7.[??????%y`??0k*?h?g ?????-2t?s??J?Xw6??O;?eh???Ar??=P??@6N?iY??4???.??.???D?l???????+?s/(@???O??kF?/}?p?^y;?g??sz*H3*?[6?8???z?p? 8C>NB?????a ??Z?q? ??:k???y]]k.???o??u? .]0???K????M???+`????^?e| ??F%PF?HXW???Dez?]w???k????#?')?R?mX?]?D??@????T*$b?????:2,???{:KZ?Qc????9???H4-Ru?!C> G?@???O'?i???B??$?~Eja?YK?B. <)??1??e9??bu_??h??/?j?0??"w?X4?z??"?????Jb~ ???r,?????H??? ?G44??@????Bx]?????-?? ?Z?* i}-? ?j?????M+c4??A?hk??,???Kg? ?Wn\*?L??^1?ah?BU?R?+hb???9 p:p?(??~?w???$:c?Z??FT?5?E?? ?????7?L???'???h?(?????6R???i?-x ???%\??*?jr?#?z??;+?j-?wV ??=)?a???(!????7*????`0?y|uu{x\???G??6!V???UY??H?X;?H??Y???=?;??????!I]6??}Z?SXZ"???v??? \??K?? ?.?I???/V????|??_???K??~??[^U??????m??b?????>???N??-?????w??????=??????O=u???w?p??O?????co?^????7>??3~q????G^??????o??????V???3[?z??k?}???????9???~??3/??5??.?~???viqQ???/???????s????K? ??????? ??????CWg????p?s{?>???]?1/????/??-/??+?f?~?C???????=/z?i????????|?????[?????????y(?o?m??1????&?????m??/???????B.{???_~???M??m?????>??????????'??????x?=[?^z?R??????O????}k?a??O????sw?y?????W???d?E??<?}??c???????}?????[N????m~????W???{6??7???????'????Wo????_?^??????7_????{M??9v?????????:????=??#??,/o????n????G~????t??????????????%?{????g?????l??G??????^?)@?W]????????_?????'?^????8??K?????d??????)?/?Z???#<{????{?}O>???9????'????{??????????{????O?y??'??;??????=???????? ?????~?o???[r??l???W???_??????????3?m???&?z?????n???up[?y?S??}????????????????C???7n?s?'{?????3??????N????w??;_???????3~??W}???[??o???????????{>??/?P???O???_?????nz?V??O/???????}???X??/{??g????????{u?????"J??2?}?c_*????`0v3c?hE(??T?f+? Q? ??YRR*????^??s????????=?sg??\???\?:?k9?M???4-c??c???]C?C/????Kw ? ??,z7 +????????4?G].???k?^kki???U??R?l2?;?n?5??D?E???k????m?5?B???0???2I?D??????P?~??b?(? ?*0???f+M?}??N?{J#?*u?????*?w?7?? ???+&??R]?5?\???/?$??x????g?? ???R}?J|???I??\[?????g?"?M?E.????c? ????&#f???8?? ??l???C?YH???f???8?8?[+?}cQ?d_??(Ys?.?B?u????b ];?Y?6????????????? ?'??????R?? Q???????3??s? 9???S?????? ??]?s?d- E?/Y?+}????[v?Mj??#???????, On?;J??*?k??y?p?zhh? r?6?#~?y????Sa??7us|./??s?????s??qt?=,????.?|t[??8y[5|??a????T?P????9??+???? ??m???????????rUP?WA?? ?`??OX`qVv ??a?6?i?????u?k?V}??"1???YF???/?????O??? ??|??K???8M!???'?5??)?+zfW?S?.%?S*R0?? T] `???ZkpR??0????mz??,hc0?`?U$???5???????v@???EuA?????Tofjl??g????*e?????5????p?kOA?S??k??J?7J??>?a??J???????0??5~?b???EH?_}b?:?n!/?o??Q{_?????UQ?z??~??? \?-4????????1*%ou?????"?L? W?????s???M$7"?????[?)t??*? ???V???52?? f_/?C????0;???? l??q??~t???????'Tl?X\?D??e??\??Y?I???~4??Kb~!????p?"??1'?vVh????J2???5wrZhz?Vt??y?T?c?GS??>)?}?Z??Yu???v??d???{?h????9n??e?~???P???5?????eO?V[*?????A?q???????]??????????`?a??|?*?3?*y???? k????,+??T???? ?,4??????G?,??????????????K?E?[???3+???7???k???????!S??~R?????E??t??i????Jh?????????7F?=Yq?(???G[?+31?KO?????"??q?4?b?XU--8??,V??? ?????C???}??C???L????? ?I?'??????????#ww???Q?xl????5?Q????)s????W;??{??fp???;???????p???????_FO??)???7 ?????F??g??`M?r?]???^????&ye???U?????????A??????n??u?q??R;MV??x ????Pc?3????\????c???X???+???>8???????F?TN9sQ0)J ??f???????gv^?????2????a??m?0X????g ????8WN??|u??/???Q?????&,?>sM??X?5?\??(n?2?????W???Y????? ??KRo?cc;?Q;???(??n?i?? ?s???2@?s-?????HV????<?Sc??)A??????5??+??fq.?nJ??????G>m???u?*:?*??DC?????}?%??????>?????^Z?Qx?G??UT??}??K?M?l?$???37=k???pi????S??? ????????}'??%x?????????+?R?8xx?:???????q}i?P^B?l?????????{ ?7? ????>q???|??;??8?m? ??U???J?????A??**?=en???I??f??i^p5wsus??J)?Fe?L:wq????~??`?OFH???F?Tq ????eL????8?????)??[{????=?p?a??W?????1OML??~??k[? ?l?m??M????@?????q???2?*D?tmr ??p?????=?l%? }~???|B?????????&[???????F?O??????9?K???^???p=??9??q???&????T?????}J??lCUl??(???????? "?N?L??MBBq??q????j=??????;???w8z?5??P;?)e?P9?Y? ??s????????3???????a?J??c??? w?????????"? ?H-t??=z-.?a?d3?u???j??8\?????T?[???c?]??????o??J???;d??????t??B??r8????? ????A?s&?`i?????? ??{?@i????,????g??N??????:,.??vw_???Y?+z?`???kGk??R????o?k?(???X????d?Ko??F2???????????????#9?r???|?8l???:?}E??)$a?$?=??X?n??kOYTk????Br?e?(???e????4?????H????z??bV_F???h ? ??hG???0*??????Ap?;?'Ds?B??"_7.x???x????_???w?1??L[?m?6;;? ??FQ??????O?hr???W?????|??p?I??Xw??? uww?'?wnY??:??8]y?s?????g5?k?]r????????[?g?? ????H????'f?O?2?_???E??o???c$ ?1?????g??X?l?/i?-*??|?R?WS` ??'`1??O????5?^??S?? ????Yh?u?4???Bp??????Qr??? ???&[}?a??# ?4??4???{??_?U?3e.???a???S?? ???v???U??f?????+??R?z$??? Tx???Z#????D4 ?????k??5?? ??|4????h??6??oiW??W??\~L??9>???/??"???y??????d'7bS ?7????=??? ??Q~?? *7H0Ov?>?????????Cz?P??W?#G1???U????g??5?o?~+G?E]???#`?W?m(7?)6b=s%nN?gk??:?@h??????????PEfkgl?????zz?05??T??????e???Xn@{Ea??=?3Y?I(???^???????ez?B???1??P??/]???+.?????+. tU0????????s?\sK???2???????r?`???|jw??n\?????/#???????b?l??z???\w.\? :????+4?= ??z?i??5??P?cg????? ??gLN????G=@!?0?h?^?H?~????-=?? ?M????b.????a_?_????k? ??@I}??]zC???&&M?d?$?o??+G??????(**j?71?mF? R?[ioBC?.?????,??+}?? _?o?n???'L??&a??>v?????^J???'^;?$!?\>sn8{^UK????x??*???_FFY???&O??h?x?]0??????y&???????W??m????j?> ?G3????)Q?D~?[????Z??Go??13 y???P??..???5?A\AHS??9X?????ZY?M?????y[?lX???y????_??;-.?8\??K?uk?Wc???j???????J?wm?u???-???GI?cA?Yp?\l?|et?????eM ?(?1???*`?x^????R?t\?Y??{J?^??({??(?Qv?EWW2 Dy??R??y??m?????%??p}y;?l?????S0?*??????Z??N?=6?B???7????i??'?(? ?z ?zD|?=????????? J?N&???8????????t?????????Q???????WJI?q?????K??Gsh?>{?G?i;?~?? ????kK????x??W??????????~????B:??>?0p??eYnP?(??{39q???p?k'pR?L=Q>2??D??s/S?|??L??f?l?x?^UEe???????????^?T??????4y??;f:73}???Z5????1v???p???v??qn?n??W*N?~?????2X?%9?){N{t?? m?S?o4~?aXGww?g?T?C?o????t??z???e?{????}??"?????p? )??LB@?`!?t? E-??????3-2q?.Wn^?DTf"7?3?cc???p?J??K&?? ??1??????_;uV?E??g???WN?w???????D???Y????????%?-?T?~?,?L? ?? o???/o??? ??H???Q?;?m^N?sg?U?3-j?O?*c[?~?V@?? ??G1?{???2h???????1? ?n??8??????C7?_u?*z??m?;m?D?? ???A??[Y???????6?+?n?K??u7r c???2?e?Hzz??????? MM?6?nl??????Ez- X??owx??>??&???oY?P6gkl?RuzG?}????V????? ???=???f???m?R?X"t?RC???%??? ????,-?N9??d???'`??,????L?4.?zy????C?G????????Yp??/t%?}??Mj?J?????S.s??uN?u?=?e????ii?x???????"[??? *?d???f?U????$~w???????w?>la???1?]?????????S???'?]]]%?#??E ?G;h???H???=?6sa?d??+c?c??????f?9D??x?#??? ?C??i`??:wfg?XXX?+??:S$?v???????i?2?? ????????3???N?6??9L?&:?????O???????:??0??l~?h?v~?{?{??>`-??Z?&33???????????H???"t?ouww?]Qa???c ?*??x?a??#???R?%?????????^??J???MM0`??&T??????/?\??OOOO???g??{?s????*?AF??:/y??1???H??`????????v????!????>?x?N???;???[?rlll?u??????????J?LO?o)???.???a??????x]S?? l?????[??3?#?96n???????v ? ng?j{m6???W? ??? ?}w?S?=lh?hnn05|:?!????B\??+?rM?Ow?|j?&?q??cj???????=2,V|?????? ?toZ??j[??h6p?????p????S?j ???^V??eW???/?0kW???????0-?wz]  [?q?'??9?l? Xq??J??X????2?2?}???_O ?/?M??rOmR??=ycV????u? J?k???z??????1?????????a??Jn??}??_?/;?fw?]:L???????II??_????L?E1??[????,?OT45????`??Ns,?f??8^}???'??? ???o???2??_1L?]v???SNI??M???RF?? ??Kl??????+9BM??B????b?7.?^Q????????\?L???=??}??n????,?]????? ????LF ?J#Tc??2=???? ?c????? =?jidY?w`?z??t???(| u}QH.''WTT???!????{????Iu{???Q????????????????g?o%#?N?fU??LT}??;?P??c??f?4?* ?X???8n??Y????#?^???e?gF7o????AG????p??%o""#En&?????????A5???AD?Q?????:$p???/?b??e?n'?-?p?=??a?B?_?(???f?k?r???{?dE???\?~??{??????Tv?v??+?C LZ??M???z??>yr?"??0???_vj;L?????8?|???y???)??????????????o[??d?%?????xw0????|?MM???.;??? ?4??3?\?{oU3?.c?zJ]??6W?^??w= ???]?s???+?5P3??)w???s?E?g?\???/?4*??TQ??? ?W\??M??\??E??J??4;?h?1??:?{??U?????&??^y??rc?aVp??(?y??Y?z?'?Op?2?????G????'N?D?t?x????-?k?????? ???}??# Ut?,?K&???G?????????s1?jv?!?mJ??=???-?? ?@U?1duuB9qA?|&??6??U?@xY??f??????[? _k?6u?)?"?}D |h???v;???/?n?????x(??>A???? ???n}??>?i%X?nZ"???Zw?????J?2A%Ku?DFFS?>??? |.vn????n?s????=?v???????????G???&??*t????zs?omeiM:v?4??q?F? ?&&??1??6-I????C?,+?x6P????-???? C?]?q??<;???(??}?{????q?k??????^'?t:???zI&????p?g??w??P{?1ru?ZV{l???[{)?#^???.dc??S?n??5?w??'??U?n6|?I:??+W??~?????M{D???I??q??,U?6"U???|;??0%???????m??t??Ou??2???>#?p_P??\???0??U~??>{LtD???F? .{?a??E?????? ?q?f M? ??e8 ??RQ?z+0Z?w??2????j#???MC,?CK?!OOa????O?????????JT??a?g??m?5xp??vz??mr{`>e&??/???P?+?????*???-?uk?I6gk??Pr????c???[?a????'Y?(Gg?? ?q? ?f??I???<_N0??{?EG' ?????ib?uA4*??2???cW?OG?PP~?yM.Z0??E?dp?T??l?m?H&????]?????R=p<Y??b?)?&???[Tloi;?0?H]??S??^?`,tgB?9=_?^????< &;?????O^&4+??}?p?RG??????|???X?? ?y:???$?\6? ?6???8??u?????????????~^??Rw05??????9?>K?p??W[????IJ??e~?????5E??x????(??#?n?}?~?>??r??X??-??0??'hZ??????\~???d?P=????W??????i????????"?6?m? ??o ??????C?????V:?7?l???X?????x???Ph????S?Vy???y?oU?7?rk+e?'z??~?c ?v?I??.?YGkB??????,??{!,?[?W#^?P?K?????0<}??t???(???~? ??>???? Xu?K@???c]BC?t=Rd6V??L?LK8L~???k?????u?I??'y?b B?V?5?l1??s1UN=??.uv??!??????&???(r$p$>???*?K)? ??Jp3?3??V6???????s??-ff?/??}n?e?K??xB?P-g?d+( ?;E?o???Km???nY?W??P?+?>??,?os???)????(?,??????\??q?K???o8'???&'y??s????????.'?H???QG??/?(???O??~??cG??m:?}?????H%0#??R??l ?i?;Z?1?u??????mD??S?-s?1?C ?X?z?????d??1?K? J?=H{?????B??H?pv ????M5lv??b4bL?$w?U?k???????TAI??Ix??`gi$#3?????e?ZS?^drY???b??~?T??????????G??x???h?f????5???)C?Z?L??xb????J?(??8"]???g?KLp{@?A????????]Op?]@????????????? ?u?^?}?;ww??ZNR?t??N?w?V-???BD?2???{?9|X^?4??9?A^^^??)????w_?X7x}??#?:d}J6?S??ah??*????Up?~?#??v P????S-- >??q???+x??C???Jh]???)q??X? `?2??g#??-???h????f??B??T??ji?A????ge?????RH^uc??yLxVeOTXP??[?????6 y?EW??\ST ????2?Y?????Q???q?L?>????o??| ?????g??D?lgwS\??x??????7?y??];Q?Fx?,t?????J?%?ON??W?@?&???tm???1 ??::?T ????o?6??]??z??????P?0X,?t????#G"?<44?@?g$???{???3-?_5?0??KyL ??g?????e??|?z0N?]???w???h??*??? >?$?z?o???=?^S?j?????;??r?ejC6??K ?*?rin????? ??M???9???,z???6?PCho?3t??*? ???` ???Y??o?? O?u???V?z???-??C?]?Ui?O??'?@??????i]u(??S??????z?m???s0U5???>Q????{t?~??n= ?]??]???B?? ??????o8???3?k??/?)t?gF???yyE???r??woE? ????i?O?0???o?z^Su????%??M?????t??:?=??r]??MOO??vS?CaI?H????b??AE? "?????Qm-??R?n?dj? ?\?{Y? ????%h*F?5k?J?y\6j????=l??K?sE[???b?F????n???? ;p+?????8???(?"?j^_??r?l\????K?*?S???A_?uG????t???]?R?'6???????th?d?i? ?U??{?j?????Gq???ay?d????-8Fy?zS>?m0$?>???w?????'?B?w?>5?"???? ????c?cp%??5[??O??\ ???G???????F????t??4f?1????2M?n???\???X_ ?????YW??4e 1??7 ??Mo??Y5(NM?0?*???+?+kg??Mt??#?E?#C?m???(~S/?9?? p??Dpz??)?)???^gy?`+??pK?D? ???????u??/ ???????is?,+J????wDVtk???????`^??t?g #?M??^??????EW??KcV?)??????)I&n7???8K.?? iOwM?u??^?<???K?y?u????' ???#P?;??8???a???s F????F ????W?a?I??,???6g[?? aY*?6;?5wz???????6? ???????u???I??@??y????K?p?? v??:?|???9?c? ?'?}?1?0?? ?g???,??bq"{?lm???/v??:u ??QjolS????#??m-???5?&???>?N?;Q#*,?$b??n???H?5/O??1????5MN??)3f1???6????/?????????efa??&?`?]Z???$??m??0??>_????`?``??rP?4 g???B&???kn???Dx??? ??D?j???~?E?n?D;?O???zzzI(??'9???????-?rCy?C????????w?????eY'o??????I??XU?Tt????0?#?~r????????\??{#?3??H??=??a0????:?>??Y?????_.w?? ?T?=?????9GC?@?????;??"l?zl?f?? $?S??????Igu???]e?????x?????? ??Z??_[??x\? ?? ?~?jcf??hc???????'38?????Sw????oh?a??? ??q?#??q???E???M?,?[????a??m????[?()?ljQ??????????e`o?WE??z?d??qj??????R??Y?\??W,B?Xi>?{t????G ??R>c???P??.??)???a???'?4? ???m?D???9?*? ?????#K?4k?5???K?*??o??8t??u???/'?????????????W??????D????;a????n????lll%HuL??????Q ?Q???%????4???Sb???9?b.O^??N??o?????$?W{WC2?W?7(??v?4 ??R????&<7????QJ?s?]???6??m*?3?c??@s????? ???0?G?'????h;_?; MM,???????O;??A??`-??????? ????ds ^U&??????1+sUUS?????? |?.?tngUb8???#?9(y??mkjyI?????????Z?n??(.? ~?? ???e???m???>??76?R;5?J? ??CS?O???8??????i?M????r?-5A3N?U?????????p?X?'\;???d~?l*R??r(vt?D??r[R?Q??<,???#=K??a>t??g$(8!!!??:?0???%?6999??G?=?)zk at r??$ ?}x?/?????X??Ff`?? ??? 8???Cj??r?o?}?X????I?? b(??*??c?($}??R?NI4E???????BLP??X??y96???(??g?!i??N???H??H???=/??~p?????????n??f??D????9?w? ?k?60??*??On????Y0???z?;??????.'Jee????????[[????????h???????@????Hf?h`(?8??Q??*{?;?Q ?1???K?Z??6g??????lsbm<?????cV????:??4?3?3;+1L ?CWB??|??C?E??Ju>?N?????&??}z???W??j?|???3????)?n??cY??????'{?)00?4 O9Q4t??OW?}???~%69?h?????O??lH???????P????E????F?b?tOun??i#?????7??&P}}???????????}??Q??Q3??spp??]LM?#???:?{?.? ????z?$}_??k?????-?8?Ay??"??m????o?6_???tQ? ???<,????,???9?NE? ???.I???s?????.@?W???x@?????Q?#?-?5???C@?T?=?,-7Xl,#?t?????o?)9 ??????$?f???f????,/? ??c?OS?????????C????????????X?\????a?X?8?[??O?????????`U?w?x????!.K?}5?B????@iiiOO????]??v/t?x]???Rp?t"????Uo????\\GX?=M3????|-??kd???g?\?)????q???U???<h?3T=/?8w??'???mV??1_S??2? ?&?EF??????$?v?b?T^{T?h?8????&/?-?o?>?)'8 *?{?t?O???Y$?<3M-c?????F????4?>?/6?M?????????`???b????R?z2S????_d???b??$b?m??P?G??'???[?~?????P???Gn!22???] ?g???o(?g??M/bR.????????-O j?~??\]?^????C??Sv]??[?ko?X?????]???c^tw!??uR?x???TqR@5??r-????f}??Ei?E?@T?EA?$(????y?????m{"???J????F??8?`0?>?S?z?O#]?X?? ?s?P n??~???z ?4<^???8??l????????7????I?c)E}??*?S9????C}-??}?????^i??f},?Po?? ????|????\????MIAQ??K?}??\??4??Y???I??g????Cu???/?5?~?1???g???(Y??%?\?u.y,????Wg?l ?7~;2m??~? ???G?????????>? ?=??O???????]??k????????;j ????X>?vE?2:j????Vg??p???X??w#E^?Tnh???oe?????[~=9?G??T?Iu????/?P64?i???'???? ???.=C?E?,??OLN?????L???q?A? ?6H?_?XhC?????z?i?????n???????qF?@???f????c|P??????vg????Z??????g?o?X????!bdj?!03?????W??{n????00~d? ???'??3??=????~???9?99?v?('Ou???"???J???????}N??2????? q????-c=#?Y?py?!?? S{?r)X?? ???&???qO??6Q??A?????SSo?ab"??qp??FM%?????XOjk?R??l??NG-f??m}x?????? ?&/4??dq??o???I;R???4_X?7??F"??r????Mr:????|y?e[m>??'B??Q?XH&????? s???S;???DG=^?kc???x~x????*???????w???_??v=?????N???n? ????T????????G?????F???e?_o?U??'???f?v???b.???q?qX)??l?????w#??f bM,7????r??a @vc??>??O?f'[?=??F]??????!?2?uP?>?? ??????=o?F?U4W:A????a? :?eU??70?Q??TD?????#??M? 5a??JR%????m??q? ????KYZZ?u5$??R?????J?3?s?c?????=?r??(?oO??LV????"P?u?` ?4???"?/~~??W?G ??_ ???s'????p ??sw?s/UBT+?`2??????K ??D??+?R??vpO'O? taj??w???gO ? $A??0;?U???Z? ???f?*yx???D,? ?? ?/?T)???7????"?8[o US?s%U-E}}????L????????!=???????"??B,???PI????K??\ ?tM?"  ??@b_<h???E?e_]E???\ ?=?f???jb?;????????m?+~? ??o?F0????F?^,X?*H u??,?d?H???????s? ????f?????K?Z?a?n8;?d"?0?% 05?F1 :?? [?W??)??R????/?PO????A~???H??" ???,??? ?$?#?$??6?? ??!~???????? l??+????? ???????? y?o C?????aU{ 6@ ?0??o??p???<(?{?????????????-hf wGN? |?? ?"??'^,? 1t?] cG?E!?`xwo7??NE~O???? ?CW???OB??FA?+?4??i?????????B ?R? I?[K?\?L???????~??R>??w?-?-??KM??`f> 0?~???(e8?C????????z?a\?@8-).,??""p?KX^??f?Y????????W????g??,(???a=???????+?P?XCh??B?tHo?L?e<"?9??????b????7??d`????N????%M??_??g%???c??P1hH??S-???.?Uk???x?SR???? ??j? u?Y?M?Qi??????-???4?ramk??z??W??S?5}?????d1 &? @???????o;8???q?$"^ ?),m?%????c?0 z???_7E???]?????qKC???eI? [~?I???d?v?8?????F-??/??Y&[???\?Z?feb??3?_? ?+??]?Y'~?d???5??/wc?? ?'?H?s??:b??????N?g??S??(??????????M ?-uD?a ?B ??k$????????g>??????9????E?D????B???????,?????.??_ R??[?xO??w"V^???????0????Zl???0RX ???$???@(?%q???c?????q (s at XW%UV t_bY|??Bi3?h??R??? ?=?yD????s??.?s/?m?u???d? ?/^??k ????/Oei??????$?a?x??? ?H??w????"]*]????0??C?A??a@I\?C??N???i?aGr#?a??1???/$?U?#??????/?V 0?e???\|? B??VK??Y[c?9????V?Oh??-???A ???bK=??@:????r?(???R5t?&I?T!???% ?e?]$[?v y!m ??g???%?7p?????2?ow??7??t??_???'?~a???Rw????????qu:???????????'????:x???N_?/,A?+;???????????,??C?+e`s?a4p?.??????j? ??|??"??$??f???.?mn??~???5?WW_???Y???U??g?K??_k-??"A ?qw??_?g????;??N??7??W??,??;Lk^*^]??-??y???U??^Z[??R?r????N????z???*Z???o?-??? f??n?t??8!H?g [j?? ????,t???wY?-y`l???n???*??????l?D??(??1]???.\7??r????0k?j???[p[B'y??M???{bi*?W??_?^?[????????^??"7?P?V?,?R??]?V?? @?^A????? ?/??M?~R??s???%1-J ?L?_uYPK?$? le? ?,~Y?v9NZ????5?KK?5?"? ?F?k? ?F????*L??D??Z7?,???? z{???\?? xy??IB?Yc-??`???H?2?uC?I??A kF%.:?ZNX>?]?"??I????Y#?uwnI}?~??U?H?E???( ?& ?? ?? b?EF??= ?iHN0?s?????|??N?????D???2&?z?$???/r[???????b???????2?n???]N????N?R?????L??YI?i9.??\????O&???OeH:?_[??.??????u?WII??$?ZG??#_%? C??O_?].??v?{_%$?,Q-i?????f|~]Wh??c??/D? ???K??????b??N???????-; ?y?U/?;?`? ????+K??J???$???D??tK???-???$??r?" -???l?B?*?,??V?N???Hzs?'k?%??Bw ??%?& [??#?X???\?_SFB??%??a?a??av??q?e?7??(:??^W????)#???D?? ???z-"YR??Y1k?5?-#???;?4J?@??W}6K??T?fF?o???~k???X{? ???H?v?g*??kVT y??1?e??3??[?eQ??Q?????????ul???c??X?=?)????? ???V??e???%????e??p?n5x]ah)?]?Y???)????.?a?](!?b????S$?.[?@? ???????? ???[K?WxI?????1$?/x?? ?@"hqO?????~????A?u#?nV? 6?3??(??T?u? ?M2 `??\???"????????B?:+??`} ?Wpg????x?@??y?>N???{???q$??U?P????#?")R?u2q%?8?]?3s;S?$12G???v??o?n 5J?ez????????'Lks??,?}???? ??m#O?\??m4OJ??,WB??V????0]??;]c???3s?e>_>O;;?f?x?|.P?K? ?53k???H??n ?j???$??d??!gv,? 1f????u??Ev?????zR??UW'????J??G?]l??y?q??????>l????&S?~. m ???]??jZ???? ?^L?k7?5? ?5??t=KG?bJ???5K???t???????n?u"????~?????45{7x-~CZ?S??:?O>u??:?c?g?????????*???M?????????????u??:?c????X?????????u??:??_?S?????????????v?n}???Oa?Gu*z???~???a???3?Ik??4?#?bk?G?r?????h??H???N???k??2??Vy??????d?_q"?I??p?_*6 >????&??|???????b{????Y,??]x??XN?????lo?P?@[eI=???? ?(??y???{>??z???9o??q?????|? ??Y??0q?=`?{??? ???eJ?#?L}5???l=?)K@???I?????Q??~???|???a?=??e??/?d?Y?z??u~???~vH???kf?????? ??f~?"?????+??*??F??|????Do8O?&?_2??}?YB7?A5?r??8XpY?d??RJp ??7?1Z6???&?5???^???5?& ??????0???EN?[?>????=?c??KP9Og5??m?E?hcj?MEc??????/C???[?89?q? ?5????w?xpztX?-%5/??42$?t?Y???Q |??*\x(Ar?Pky?7???D8F?G@??{:E?? ?V?8???*7%W?!%??9??;O??/7P??3??????I?1?x?fJ?X}2?ev?]V??[,??][???A?????nD ,?9?~u???W?>??%_??>?p"?????????????_?????????????N^b,?;?Q??w??????????????x??)???Z???a????z??w$? ??M._??? ????_o?_??$/?^=????$???X???' >ZC@??m\2-???K?N?`?;f'?i?%W??????~?F?T1?????9????dI't??p>???d?\(??G??????.???s????w??bt??^>??Q????~u??M??????m?????x5???,'??iY+];?`?n?????|?RDh?????O)X?????;?S0f?D w??"??Zg?? ?'o??fA??N~?????S??x at 6???e?Y)??\)?????Q ?(????????????D??}a?G???YR*????j??????p??]??}]V ?iV?V??4 ??&?4? V'+5??t????????? ????g8?&???c/?????;Y,t]bq?.,?T??e` ?W??????c?2;?N?v;??d??u??ZUA]k?? ??????N??'2 ???!^P?V?7j ??Hmu?V3????a?6?vg ??}?????P?C? ?h'^??r5??H'????AMS??n0??????`F?*6wm?a??=?-??"??x?qM?sH\/???&?[o5??[Z??????@y???6Pr? ???_re2????-?S?? ?9????????u$?,ag?eT?v?M??U?????.DL?(?d x????????eg????????? ?U??fX???Ifd???&????+?@?n.???????{h??[F?w sR?Q??~@_A??{2'!Yy????.1?2???~e????O?m ????+?3U!??M6?8?JE |a?, I?????61?z,G???G?u??M{JM9????&?????-?????Mm5????q1??S??L"7?(???f????`c??p??ZJ??e?F?r?????Kn?uy?p????? \???9?&?&7??G2O??? q?a?7? ?* p;??????S2|q??^_=y??-?_O/9?D???????a?'?(?-??>c??J??B??L??G??9 4?R? ;`y4Y?????I?? ??-[???dx?0?p???(5????2??>y??????8F;??z?????u??z??y??u5 W???? g?#?vc|??>G??P??o?p????o ???b???-?w?>?? MyI???????[}?V79??@???}? a?A?7???La?a5Gso?C?G???????j"u??C?,?????]u?fr[?]8?"0?J LW?'+wy?\ ?????+? f???4? XR?en?U??P?P??M?h?????VH????"?\????5t??{?n??w???????k? u?v??f?? ] Al?ONC???b???)@???eo ?a?y?=[Q???.?{m3wr5}e??'?????%?y???mf??oWz?)?m?:???'\??R[???=;? V?J???D|?g???????#???!>,????????[?O????k???Z?o???P?4T?Qe??DT??,C?J???+???????ys????5?????:?:!?????1Y??_2_???&? X?? X?K??~X??HX??n?7??U????[??c?-?PY }bw?????????iM?)V??^k\?hPL?X??5???S?"a???c\G??????0???`u??VO??#?n ?.6??????c?????"6z=?Z}?? ?;?b?2????U?? ???%?M,o?/??Qx??>????^?mit?????ix2?????U????????L?[??w ?1?-???~????????????VQ>Z??????}?*?{-__???U????>o???U$?.?CH_???? ??uk(????x?k???H_??j??#????>e-???t3??|?cz????R??j-??w??|??Z??~???T????????????????????????!???Q?? ??UC??n???????J??Q:p???(??zv???????w???C?????o Q?}??????5?????????>~?vlO?u????y?O??????????T?f?Sz^???[O?}z=??W????????~b=???? ????(?? ??6P~?@z(}o????/ 9o????G?b??F?A??P?????'X???_??\n??[-?7??OX?????0??E???ZTO?c?{?????S7R=Y?????H??2?????????TN??H?????w#?*??H???FJ?????|??m???>_??g?????{???M??m?|?q???&???M???&*?;7?{????7Q???&j?_??_?D???|?w?_????t??E??????o?6??MH?H?7S??pG?Nm&??????7S??f?wm?????\?X??9?_???Y????f?????????-t=??6???[??&w+??Ez?P?}???~?/???J?????~e+???|?????????x+????>?t\????O??c?Q?/$?{?^???R?=|!?y?E??ET??]D?i?ET?v^???ET??????0????<?"J??X??/?x??? Q?~?"???]D???/?z??L???O??)???t|???7??/?z|?6*????????o?6*?go?rmm#y??(???(?^???????}???L??|?q??{???x^??E??F ?Kx?P?5?b?????(?>???| _??(?`3_????W?)?? D??z"Q?? ??y;P?x???s??????>??G????w?}1?????????A?O????{?+??n??g?8???????[?I??Aq???D!i?R???$??C5@h??.B??0?? =z ????4?4?? ?C6e?"????`??????v?Am0JY?/?^???Ei???@??Al-J??Y?l,D6 h[QJ??(A&s'?8?h?d* ?@?A?B $?8~? ?Z?+?KHH?0??????P?E??(???U!?? *^)?;???]cx???i?)?g?!??A? D???bh ??#?%??oR?iA?7????? ???m?_??J???A?r??IAD ???_????\????x???????(DU!?? ?Z,%?C?g)I ?i???A/?FY??*????RJ?R??#????HiP? ?D? ??O?RF ?_ 0 @b??S#??? ?q?>???B?< "???b?A????m|b1 ????(???O,Yq/>??k ]?i]?e]?g?\J7}. d?\?o?\??????????YL ?m.e?k.a??&}a?F??@2 |?v?!Da?! ?=rSi?Q*HY ?}?3Q???????5?@? b0v@?????????_??? BF?? o?V l???Drc? ?????6????0?$??V?EM?@`6 #8P,??%.??_??p1?????`? 7?#???Q?!???h????????KT??T?\@?K??w[?? ?o?5":?r???7:?|?_??p_%?l7?Ad?>?,???? ?O7????w???;?hO1 9?m\?? Q-j??+C? 8D???k?KY ??i?????????k?????_ ???????k??5Yx?????Z?-???_C? ?????0[?????Z?B ???????k?????Z?-???_ ????WU??????Y?-??? ??????k?????*W_f ?????XZ ???gY?-???_ ????????7*??fN_??????l??_ ?????????? 3?i_k??!??>?S?\??? ???J??? ??3q????f'?;K??I????M0_???5?,?OvK????X?8??1??u??2zk??9????G??=??#u??T??t?,???]W???????m?`? ??x??s?????q?/?2?&???/{??.??9?H????z??\w????86[?NQ2(? @?A???LL? ?>?Y?)?>???"???H?????*?????mB?????*7wV?2l )??| _?HY??w*??SG??8???????P??^9/0??]???L??bb??;???L?vZS??e? ????b???? ?r???R]$?>?0Y???IqiV ??N?3?i?c??u'?a??m!b? ??Ub??35:c???E??$^?????X?>:{?? _?y??^?vo??H? ??'N?????3??Xq???F9??86i?j\I:A&V[?.??%?"?^NG?? ??k=??h??jS???p(???Y??=F???Kl?$I?G??3V??j] ?WsU B?????5v?=5???????#A:?F?E?N????`UjN?P]?U?R?]3?)Um]eqj??O?X??:?p$uQ??1?V?KA?-??S???di ?y9> ?????Y?e??L?8a1??????q????????S?nPL-?n?????i??X???6??e?2???+&?W????%TX???y4??!m[~? ??<~?Vc93????[??U?????4|??<{]???nd??V?. [?????b?&??&h???h;e?+??6?ngWv???:?j*??7BN?????wT?'1?Cz??9?????.U??>?%OO??n???i??j?????.\?6U ?h???U?rR&tM?????T??U%?\ ??8??Bc/>b?????#???(0????q? '?I+ ?idt+B???Y??;?2S??zS?$?z??L??$?M??&?Mj??f?8W?YE??.?3S?N|????y?Um?????X?F M????4?+(?Z??????u?????& ????v|??G?????g?C????J?\-????M??m?i ?Y???6??U???1?L?}{??iU???`?1?Ly?[?1??W??qlL???P.???j???"?;?^7??????%H;=3?|?Z3?e'x???om??? 2?a????? ???K c?o????? 3?????0????A?SQ???6L?????ztVo??c???-@??~_???=^?@????(??????? ?%??f+ ?????????Ji???C??W????? ?Kd?>us??}?#??F???w ?)?{??QF??91+37?-??Yq-S???ed?? d???1???H>K .????{l??AQB?u&?f?%??v??x\???s",CO9s.]??QQ?k?`?FF??? 0? ??? n??N?z???? G????5??? ???pj:??F?_B7@f?j8?h^`C?u?t???2? ???j??!?? ?U?"?\????dl?A?,3???????$.8?`??+????G7??z?=q#?? ?y???A??+3?s??|z?=??????[ z????|??m ??=hyY?0'?:?<u}^???R???O?b?????$? q?-??b?e??? ?e?????E?r ??????y!??_?N?]?Tz ???=????>??#?????i?yp?HX?`)??I??E?cQ?c???r~V?>? ???]?I?3???ZA??{SH??S? k>?0??????? EZ\?:5?)`??)???????????*3??r??Y?(?{?[z??D(??????I ?PP?J????i??T???/??q??_??8Q????/g?0???;g@~?P ???5u?[???B0??i1&??? i??$l??$r???[1?K??DP#??(5O? ?r??????0*??0*??G`TL\??p????u???P? <)C?kK???_????l???(?e??W?<,#??-??rt [[/?? E?nE????+?~i`B???8 A?????? vd??F-??$?E??z??Z]?UqZ!"??"??y??m6???z??L??0??????cF8u9{???4???$o??4?A???B??????i??7? ????U??R-? ?`?? ??? FvG&A(?c??uT?????????P?i??????|?iIy? Q???tadc?5w???0?a?c?M9??C:?9%.?????*???? frYU??`d??????+??s??? ???????? ??,?? #?;8?????QD?l^jt??E???[?$M?s?z?????m?)?e*?ha?s3?4???&?????6??`?kJ??(8?qINbf?E?T?U?d\? RVA???kV?Z?E??????u?Fn3H{???V??? F)u?9?u????|a?B????l0?!???G?|?Zd:? s??z ??z?_?Oo?Z?????0A?}?:??3?^O,???'DX?g??0PW??!???P???@???I????z??b?!6?;sc|?Z=?%N???#m?{F? ?S??????"???!????????\?????w?????8F?G[????EX??N?e$3kG?V?'???d{f?M??O??o]?5???FsI???J?M?9 ??u????????<"??*??.L???1??????????????[/??L??_??????b????);?r??????=?]??*????x??"?-???p.??????B??b? ?'?.C??A?????^??c????? }"??"}???G????iHW"]?t?y???W???H??x?H????.%9??Qz/??????? )?:R ?3}?%H???????r????s?^??S?? ?G???OZN?W-?????????{?F?d??.??> ????-??;????>?,?y ??rJ????#?'????&???????"}*????H??A?e??+?~m%??*???>?ig%??s%???WR?o`??0}??0???????????????6?MH????s%??SWq????M????U?W]E?_?t?EH?Cz!?H/??????*J??|?J?{=??e???UTO>?????????x???~???'???t>???????????x???u5?????gR?~? }??"?(????????5??.??_C??a?????_C????????????#???k1n???????f?????!?K????_?D???!????(?????CT????Q???????2D?{?????(???|?u?|?wX????2??d????1?O?{?:??U??z?:?g?:j?7???n[G???u???|=????.?F???u?'?~n??/3?]???????[???????7???6???LOn???? ?O?@???z?????m?ts???7P???z??q??@??O9????^p>???????????7????H?]??????$????????6???n$y???F?O?b??_?H????7R>??F??????Tt?dX????E?(]?M?^;7Q~????M????????o|?sf???l???&J?;Y????Oo?t???_g?????tf?O???-D??B????y[H?8_?d ???P:>????8?????[(_??|?`9?????-T????H??[???[??????m%?}|?Lw???V???;D??J???[)?????????k???????l?tc+}?????????????\Hr?????]H??.??7^Hr/A??(????b?Rz&.??6s??U?K?D?? i???????9a????Q?/?F??????(_?m????Q=?~??????????U?'???????!??bz??"?[???)??^Lr????????b??1??.??~t1???o??_???o?N??l?t??N?????o?N????Oo;????S?????v;??vz?1??/1???????N????T??N??_?S????T??/?tn????????P:?{ ???%???????K?}?z ??K???P~??%?>_a??K?_u^?SQ??y??><_?????8P???k??\??x????2? x~ ?O???????c?l???j<??I??_????+????/??N?1??????+??????FQ?_??I?'??:???g???????b??C@?d?w??*??I????|?o?;??u??_4|_??? ???[??ux??Y??76?4 ?e$?????JM?J?fK??L?J???J?L?J????????2^??18?,?!d%a?sq)?? ?k at H? #(?F??? ?qJ?????|? ????)W????1 ??CZb??R?????)V??p*/q}?????B#????M????^??9??W at h ?w0??i ??R?a?6???FF9????(? ???a???v @9?5?!??b???AX? M9+?AT??F?<????Q}?3 ?7??"l??D??p????8??_??kQ#@T????U??F???p 5???d????JzWv??+;?6???9??5??D???w=:.????v?:v?7???q??oO?O{??v^????`N????????6~eF????OL??7?yny?;?c^?"Qxxr??^5???????I????>????h???\?]?7???????[&???i????????{8:?Q???g??S?/'?/?).?DN??X????????=Js"??i?(E~?L?/d+e???N"??H?7??J?u???2???t?#???"O????.%q??91???N?&?K????y-??1?T$??X????vh"?'%3??$v??N}????@???@?"??S?@YGff?????R ;e??{?-?-?????????n?????????\? ?w?%??o?yp???_???????s?-{????7??=???o??4?????z???9????m?????C{i??I?r?K??? ~ i?"# ?%????>??s??>??/??^??:_??????!? ???=???q???A1?m???_%??Oo ??????}?p???]??cl???????|????O?tF???f???K?f???O?k92?.?7???2?0??M??WY?????XVji]?"????eVne??? i4?e????]R3?????n`tD+7I???t??!u3????i????3??MP?3????6I?,7??m??A?B????&(;?B?Px0'-?{??g??????2M.t??Q?????{4???nH?????H??MK?V??????]?c???nD??????o?"?Yf?W^Ug?(?4z?M[????7?8h??koD??,2????E4K???7??h?9/??Y??????5\S?p??K7??????????,t??z???N???? ?V?+?:???z??3?_????T7???&Y?>?#? ????U???= '?????y??e]?;& ?\?????~?=?F????M???t???N???.N??7?>?oH?S&j*???.Z?O??????( 3o&?Z ?l?#f_??(A??9????/??l??f??q?Q??U?r?(cP???????9Mg=%???s???1???T??Pe?A?T??\k???M??s??U?u?6???f????????!? ?s?}?A?X?=$????3?]k?a?d????(?p?~z]?o?T?6/3??r?????9??l???l???? ??A?f3a?????n?y??????sAo??4Gc?N???? ^??????g?Y??q}?%?9?y????7Ed?l?=3 ???{?%?Qq?\??e?[?????????R?1??~ ]???TB??????E??` ^,?7??9??z??/{&%&?wk6??,4??:?v9(??R&? h??M???? ????????4?\?????d?t???? T ?(???z??j0f??3X ??A?/]8k2?j???\???@,Trhv?c?kH? 5gg'?|A]"???Z?+?M? ????e?tC ?(????m??a.??c??? ????h?$??????O???S???w[?????!u???T??6?]????nJ???m???YlS??????B????zJ???#j (fX ???qup???M?C???u ??G['d??r?cd?Ht??C$] ]?tM?6q????@?+???.???" ?s?????`???8?~?<[P?A??0?S???_?Z?m?e@????].k???Z??w?Z? ??3q????f'?;K??F?????vt?ae?{?[*??}?M??O??o]?5???Fs??????? [ZTJ?????????=?????S??3q??_???r?????g????K?-??F ??????'?_??`?????GR????_(???0?/????J??W??)???Oi??W???I2 ???o???+??"" ??????O?-?? ???????????+?? ??????+?? ?????+?? ??????+?? ???????_??W????_g??W??%>,?? ??????+?? ??ON??W????)?c)??????K??_?????????la0?.???B???';?'????aRT?r?| ? ??????7?8_??GA?????u?U????J??+l?? ???_Q??????+e1|z???G"X?bd? ?M???X???O?g???? ????C?3r?:(?#?4??@???\' ???*A?" s&.????q?????/??j??i??#N? ??uK?=R)?*????p,?? I?)??`?1?R??u??T `oX???.?m7%?Q?h?????e?Y?g6S??mU?&?-??F? ?e6??i3U?????*T?0?????z?h?.K???l?4?b???1??0???"O5???S/?zS Ce?4?h;? ??l-?_?f?????pO?X+???\ ???t?F??)??R?*????TLJOd???3????N#Gj*??+K?????l4sb?Z?=?*n?????j??lWj{???GhU?i??'?9d??m?????K?9?6`4 @????U;ieA?3Kt???)?Y??? ?A?2?B?? pPF???P ?@??]?(?Q5+g??t3rV????4?????I???j???9????2?8??1???YV=??(??????? =?u ??jg?G?0 i??g??!??|?(`??/?T??0?p$?Z???? a???7????Yvs?r-8x??5?2'\D?X9?:?&??k? o?E????Yk?????m?TG???C??s ?`jN'&??=E??4??????m???\?C ?????,$?Q???r?F?Mk ??R?l???c[?I[G??r'???O?`?$@???h&?q??\????y?u?????'??????C?^??~:[????????+l??g?6?!?>=C??D???,?4&??O?t<1?==OP?q?==?\G?Y????v??&????????%?P?_ ;M?:?NOc?7e?4 ?t+???H?????)??1?&??2?>??_?OD??sI~?\?????s)???iH???,????s)?71}???$?L?H1??8? ?{ }??O???s??????_?????_?t??????????8???K???,?I?Qk ??a?>???{z ???-??|?J?;???z??q??,?|?-????9??>???%???XB????R?>w)?]?t=??K)}?L?KI?????{??YK??_J??%K)??/??~3????Rz??2?/H]l???????Q;??e?_??"??????p%??_???~?????W??e?(=?W???5H?]E???t-? ?j?????m??WWQ??w??U?>?????????=n5????~?j*??W???jz??|}3?{?j?WV???&?oF?Z?????/??r??j????)??d?????????|?c?'?!ZZC??????z??????Au ??g???r??k?='???k?~?\C??{ ??7?????3????/??r??? ~?=???_C?_??????????????tT??^?/????ZK?X?????R?7D??:D??9D?sx??95D?~???? ??_????O??/ Q?}m?????~???C??OXG?-YG???? ??}????^G??az???w?:J???Q??"])??:??????????U??M??[|?/Y??,?a??[G????y??/ ?????&??E?K|[n*??{*?g?y???GO?q)>??2??D?0??)Cp???2?=yb?8_Ly?E?w?[?p?u?W?????(?? >?o??[?{ L6vlw????U?????`????L[??N}?Nkt?eM?????NL????=R(L??W??????r??5?????{_???Z?a??5??V??W ??n/?g'?? s?H??1?R???N?{??f???$#c?:y'f?I????1I??????X???????~??q?.????6~?F???{_s??|[?s???} ?????{?k?)?O??????|???e"???r9??xk??_?q???QQ.]d????oMv??? ,?????8|??fT'?K?v??Y?`?l?S- ??^9?J? ?'?????B_?? X^p'????aX??? j??????__U???????M?%F??7E??~]????U?*o??U??i? #?r???pBB?{X?c??;S-?5? ?????n??kCq???6(??KB??"*???k?bMZP?@?9d?q??I=?DXA5?N3?`? \2??? ???V?????e?4@???????@?~?L?4 ???? &-?>b?????G?0??|&? ?'?'?. ? B!]5(?{[f?P?YT?n? ZHk???P??9 0?? ???3?K???PY?= ?r????*k??D>???-<b?}r?@"n v?(?%M???x???w??*L?)?Z(E?s???lv?????,*??c-*?#?vQ?K\@F?? I???A ??A!!I#c `H?308????= Dd\oh?????ybHF5t??)???/??F?g???1=???(??] ?h)5?R?z??F???K??? t?9n?g/?Z8??????9y???????I "???? ??3"?#uz??0}????????:z-.n?ut??t?,?g???Z?O<"??U????.L???1n?e.??o?8???\????G??B>:???????&?? ??3qlV?9?|???????9 ??I?g?????3k>??Q??ap{??3??{???g?b????k?????N??+;??%? ???{??gp4z}?3v????1???Z?s ?I???.?:s?-=7???iM???;3??iMM{??+??[???mS??V???{????@Wh???%,/?8?????.???????o??Z?????:??y????9?????X???????=??mO????L?h??jMR????????Z?z??]?Na????????????_k????:3c?m??j???N=?:???c?k????>k?HUlI-?q*??????Z?V?e?????????j )?????ng???D?`G? t??S?P6yY??G????N?????Ju?;????~g?\xR?~??)???=??] ?????{????-{?? ????3??x?S??t????X:=????H????????Yy?1????/:??v.??/?W?i!????5#????@O2>???y9??]???h?RsU?M?9??????d??X?K?-s??????R?*]?1c?1=9?n?Z1? ?r]E???=?J???S??GY?s -?&?)???;22;?y?Z?M ?8??R?????=u??l??=m?Z????p???RK??>V?????????Tq????0}s???iUQQ???e{?8?TM??m???P???W?x"?1???muw?'?[??9~]???h?e?p??!i?w?X???????(p??y?????i??E??h}f+s???i??XN=?C?W?????A??A????~T>(?JC???????? b%???.??ip]????????J?^|C?ci ?#0??&:?!M?S6???ei?}??iEz ?j?F'?>??NzUqlSU1}Z at d?S??????3P??eJ ???dz~??????h?Ff:? F?%??$Y????BXq???t??????????yf??(???a?0???M?d ?}6[?j??[??f??k#?????k%???????????U,?hMugZ?b-???t?lv?,???_?M??Z????n??7?P??aW?4?Z????'?-i?A??fG[J????V?Q NL?c^ ,>&5[N??]fq(>Aj?)??kWS?v?,???aD????80+"?[?8 ?????2?K7'@.]??V???,|b^???H?????=???M?s? ?????, -?M??t:??[?cF$Q????????"??S (K6e????P(??(?&T?2 ???z-^?qK.L1? ??6?F0?|???2????y1?%?\;?B?zj9I???H6?????e??????j?i?V?? ??? ????1?rV??9???X??Ty?????u????Z????ju&&?Q?r[,???]???????qh?h?? ?? ?? zw=D?'2*?(?n??m"X9?~??/j?%??? ????z????\6??ba???w??~f?A.e?0u???n???K??J??P'u);mO??????\]YK?@???jj???:??wgY-E `??????[?f????bD?98;==??%/e?L)???|?l???]? ???>????I5?{?a????QkN0??O????(G?????76??$???u??"2 ~??^????nG ?????v?1C]Y\Qh? ?fM?"?u4?] [.+c*??R~?/?cR?? ??=???}?vM?jr??????p??g?M?F????????wDsn?6? ?NR# ?{??? 3??~z\?x????????1h{4?f?????I???F:=/r?????????$??2nOR?r??_Xo}?-]k?????????N`?MKZ??N??3"??d???l[m??'u.?p??aV-8?R???`T???g?%??d?1??????p?EvP????^???a???Xq1?7?1?sh??????]w????4v?y?|?!????}?57???h8k2??[??,_?a?n??L??OE}C>F????.????{??F??\??????X? IV?b?o??n? R?v??^?H?D??hA? ???j?R?B????qF^!?+????f\?T????}T??'@X?&Y???o?Y idk?? ??.????r\??q_???hl??l {? ?"_8Fa?q?w ?|G?3??????8?m??8???g??B???c????0????R w?uB?H ?32???hk[?y,wC?yf??l??'dR??????? =k?? ]???0$4???#??!??8d~# o???z_u?)$Na???OsA?zC?@??_?Or!?*?3Uf|o*.m0j?#5B??c?Ju??????b?C9? ??A?~??????oi?j?Z?X+Z-!?S'?8F???#?a?=?h6?D ????DX?A"??????P????R?????'?w ?P??I ?"PB???veS?5??)????X????gO`?wF:??#??Xs]?? Z??4???ZAv???????$?~?s9??j?????;????(??????Z?OE?^?AZ??????t??VP?b???V]???n]I?P]I?7W?L?????>o%???Jz?;WR?/G? ????3+????????????????o8?b?/H!?? ?? ??E:W??U?o?????|?\E?W?"???(???zs?*?? ???U?kV????????????{X???!? ?????/WQ?? R??"? ?k#=?u#???|n#??~??????H??5???H???Fz??f?????`??????S??m????(]?6????}??D??bz??\L???????/&?????b??op?o2?S??C?J????????Wo???N?{?v?????????????uf;??,?????TNo??f??L??????>????S??????N????P??p ?c???q ???j??_B?y????????_??ML?} ?C????D????^??E?]???????_5?b????i??'?|#?/?k???????"????xN?y+???g???!???????????? "????????v?~?N?r| ?e? <1?`??z?????)??F?N5? k`}W?? ?:!P???z%Q K^m.q?-5?? ??*??_?{^?`M?BC??5??????V????????p?#?94=Ao?^+n??m??U) ?ZJ~??`8?;???^??????????Q !?' b\?H?????oICx'??vogCTa ??p?{?8?m?CT?B??U-???-?*??C??(I#G???x ?M??????0?!?3S)?+S)?G?RFoL????J/L???RF?K??K??^?Jz\*i?-?t??J<?C????????z *??? ???BtW9 ???? ?????????????4PO?f7C?g??kd?@???%!???)?t6 K??&?RB?i?uTW0????l?j?]????Ml#n??3?? 8?!? 2?A????uU\E??hx?+?!P??C???f7?/e6?/ h|_?cx_?jt_?ap>?6Dk;?`?@j0?@?D?h|4?> 0?K?b ????! 4?f????;]"(hP?oA?UB?v@ :?% (??%?m?d,q+????.???c??: F8?? ?? *h??!??|cF`???4??H@??C`? ???????{?$?+%??? ????.x? >?f3#?????????x? ?#6s??C????QV?$y?y?Q?h???f>?9E] ?r:w1l?%?s?d?m3{=??X?m?b?CN?u???2???a??`? 7?}??6?+N??? ??????^}?2o?z??f ???O???fG9?????k???5?)?y??\???F-???z???H???t??h?3????;?????#n??d??????z??8?5/???-?#]? wg??f???X?Y9???Y???(?mi????V??? ?\?R?rr*??Q?!={}?????q???????\?(?a??O?|?Zd:??F?Ng?????? N??[?u[?/????;r??aj?t?q?l?Y?????4E?Nf?E?"??T???b?|????b?v`?bM=? c????? ?? ?s???59DN? hf?.????3???^1?~??`?/???????n?? ?|???fY?N?????k?u?z???z4???g?{>?h?z=?C?z???kj8?? ???\???2}?????K???TBy?c???V?q?Ao???V?x?"??{Av?i??qf?>X???N?=?6N?M-???hl???????l:?vF&?;#S??:#??w??G?????uXg?2??32?]?? ???|?tQ??????-???i??}.Ej(-?fM}??|??????????l???K?MX??????+???t????????????&*]?iP3Nv??%b?/??[:?k?l???_zC??mD???enp????`???lq$??ew??)???!???l? xZKJJ?>?!o???5!???? ??m??2'(?_??K?8b3 v?Y?A?rm??uj?????~???ZZ2%???Z???43o????Twh)???????????e??Ox ??{P?9?mvB??~?jYbCK ????.BMt[?Vkb?W?'?z~??a?:??0??d_l??d?????$??zM?z? VPi?a6Rk9?H??m? ir??*M?:?????,Wr??f?e???nj??3????[??d??q???2?o ?^G5??o???R)0?-?S??e??T????u?MLF?wp+???u\?????/2_{[Goo?c?@v.]u??????b?iHm?\2 rex`v-+c?&k?????=???#b9? ?F??TM~?)-?????Mx???? ?ee?*k h??b?,??S???Nx??"[??f??vw:s#o?B.,4 ????f?!'??YN MRU????M?i? ? d?h??"?????'?0?Z?H? u)&??C????>??)???&?j??? ?`2?? AuL???,?x'???? ?l?u????6??=?IS?z?????9h?f?:?fj??NF????Q?M???n ?_?@*??f>Y???KT?7? (]8???J?g???#?F??=???????????????????8???S8?z?@q?=?~ ?N?O?,??O???????S(A?O???S??)x???S6??O???S??>? ?N?r??)>?*|:iu? ?N? ?N??V??)M????T?tJYH-|:>? ?[?t*|:?(|: ?*^?tR ?N?O?8W?????TX ?O???S??? ?N?O????h?????D;"?O'Jb?????T?t?fS?|(|:??????????T?t:????????#??C?R??(W*????86?v???G?Y4?v???????SD?V???????g|?7??{?$?????<>K?m?N%??\??A?LT?;??U??t?T/"?#?V?/???"??^????':b?p~?&n;t??FV??M??A???[??F??b\??p?2eb?;???o?eMM{??+??[???mS??+???O??~+????3k?5??$??????*?2?E?b2??2????1sq???????fvC?)m??9z ?L??]??????Du?V{??m??????C??\???g???|?)gp.?ON}hj???g???Z;W*U? GkLn ?6?K8)?F????t/=??,?G?aU??5???g'z??}N??7????^I??^Id?R??V?NJ???R???I??(5)U}}o???????&-?d?%??F?ZY????L ??????.??z?4C??4??i;&&5[ 3P?=?h?+la??g????j?????B?8n# f`?)??Q??????????Lvg??c??:? tjiM??{???R??m??Z'?:?%?Z??Z?{:??N?jBl?Q?? ?I?u?d+??p????H]??(?^68@???T????? E????V?h?UM?S??E?n?wP???3?q??('\$Cd!MX??A?(?u"?|?fM?g??#?r??6?}?g?93??:?w?Q ??Mk??? ????A=?-??54?g?gd?9???????}??F&cB~6c??4???S? ???W?'Y?]Ar/YA?b??|??????????? J?q????r}?/?? ?????z???o???~???>????)??G?? ?k?J???VR??JJwu%???+??8x?:D9^??E?????????D}uEj??x?(#????????!?? ?=??L?[?w??E"?E??}????y??`z>????????????J|W??\??? ????y??x?????ex^ TW????!?*5????? n}^J???t???c-?Y?8h?.??"h??N?? ?ha???J?G?ip=?@?D?-w{???J?????????u]???,3?@]? YsMPs????????M?????????P"dXy ]-?e??0?l???$s?M?Kr?iONw?_K ;??????Z?????I?0Q?????uSWR??6??:Vsuh6v?l gX??#???9n???ia?*F8P?[W* |?? ?2?G????ki???k???????y?????c????s???n?B]???F\3?1/?8 ?Qw'f'??>?H)?f- ??f???????E^?? ??t?????????????/L?KV@/???q?????9?? ?n?Dv??Hf\$?? ? ??"?????? l?????Y?D#???TgD??R_qpvr??b???|L??/?%dk?(5?Ui??U?v?Z?6?Z???RV?p}??YYkv???????9n?a??mg?? gy?+aQ??)?@????'? >Ys????K??I{5??L)W ?????o>^?????? ?lI?v ?T 9L???????t?? ????t?k?\??q?" ??)?*v???????~?_r??v??0??K{(6??o?[?G:???? ~? ?8???f?? =`????;? ?????=? ??==?;?w? x?l?-???F?3F??zYp/;-?^v???????r????l??O?~#??\???]?#?&??vw?m??#??p??_hu????1k???8????+oe9???8?D?r$ ?=|k?1z=S^????T?Lx????6MB?ko'?0]?|Y at o???U???+ ?g ??)??V?Q ??}???????{d?g??wg?^?????_?k???=??G#?G????8? iX??8H????W~?6!??1-??f??? "??&i???5?U??b??#6#=;?\%????????2?<8%,bh????htH????:g?]b%???u?D?l???4?G#?*???5U[ ??76}aX??b??/?}???????e?????{=?[2????`pLu??p:C??8??C?|??P@M1?a?C?1?"??&6p??U=???>??1q??nh?h?D ??r??0?????????????G?_???Y??g????t??s??Ur??y??c ??x>??9??g?o???? ?wG????a???????6?????8??#??f?5,??mcZc?????H? ?_N??????.????_??=??|>????????9?}??,???)_??? ??1????D???|????|??ZN?Z?XN?t?rJ?u|}?`???S???S?8????%|?-?g?=,?C|?Q??ZN????,?z??,?O????????????D?????w?]K????????R????TNO?t????:D?Uaz5??C???Q:??(??C??l???=D?~??g???3,??C???1??????????C???g?|?:?{?:??+???#?G????Q?y+???:J?o?#9???_?#???'?'?????T/??)???????|????????)???????????S>??????|b=????Sz~o=???????????????????G??O?S6P~??????@??o=?@?:????{??W2}?J?{?~r??K(??m????@??? ??????*?3_???t/=??[?t?m?|?|?????u>???????t>????O?????=?y>???X????~?????|??????NN?k?t???;x??w???????????H??v????]Z$????????,*????=K???l$?7?{ogz??FZ?H??????M$?K??????(????>?????6q???? ????f????T?m?vR?L??i3??9?)??????)????f3???7S??m3???6S=?0??2?8?O2???~????f????????T??t????x ???-?7r ??d ???-?/????P?=????????|?!|u?P?????-?p???@?????? ????[???'?|??;??????E? k/?s?/6?W??????E??????|?o???A?w????5? M|??c>Q?/?????oQ???V??>T'?????????M??V????/ ?????????n??????'|? ?w/??U }? ??}?-|??y?[???x???? ^????? ?B?????Kx~?????e|??@??~???????;???L?????N?_???.???????? ?{??? # B 1?? ?^?????????I=? ?|???/$?$??^??$M%F}?&?\8??H??X????B???Rb?A` ??hQ??I???.?@o|7> !W??/ q?}??k?? ?? kE??z2??P?%V^3?W0 ?t?/I?/>?"?J)??????Z?H???d(?Z%????6">`??a?2b+ ?' v ?W?\?v??cH ?2"x6N?G`A?< | ?AAE ?QZ/?F?3???Pxz?}?y??q?gd?:?3s??9?????????|?|FF?/>?,)???=??=??????2?y?3?H??gd?{|?ed??g?`r?g?4z?3s?(??H?H??3??t??3Flt?g??????????Y@?w;#?i?gg^J?dg?????,#?W????s:??y??3J???.e?k ?sF?Zwsf.??93???????^??$?s,gd??T?, ???=?U??=?)??=??[?*h??7#?????3?7??????(E???????Y?Y?u???l?Tf?????(??????uAf??;3???9???RX?0?"6????????X?@,??!?????????i????????e|???? ?????? ?E??o1?Q)??i?',8g)????RdG?,`???????t?=? ??)Ef4Q?????,?| n??????i???>?@??1S??Lz?????-??za??i???)?3?r)))8\??y??+eNP.?J???q?d???~?????T?5=??D??S?????-"????Q?kQ:"]????(?)????r???E???YD???E?????d??ET?-?xEe??-Q?l(?{o.???J??r?????gO???f??@z1?????L_????r?????D???~ ?V?_`??p?]??? u0??^?g??K?P??A???!?z|?5 *%?tA??????2????mT? ????BlC??/????j?l?'?k??$?t3A5G ??|???g???DkXo4???MVv?p?%Y????R?Ve?r?s??????2?s???N??B ?JL??????????I[R?h???a?n?z????|?g?jG???w?3$(?/????m +5?p?M?[???Z??17~????????;g ]Z2%??Xqa ? ???9a??????????|?^G?T???n???]d??k??V????????N?{??/??6;!?R?c?,????C??&??Q?51?+??b=?e??_?h?b??C07????S_???u?/?????C{?Xk?G{obe~??<(?@}?"?=?F?g?2>??{_k??n?> ??wY:??k???m?xD???8`? ??x??s?????q?/???U??8???? ????Oc???????????|/???=?O?~z=??-??9????s?p?b??????bz?b?l/?p}?~9_?????g???9??^?}? ?[?????????)]?I???s)=+?%??????s)?????????{ ?7?K??`???>???s K??|??L?|=_}????(\?????,??_?????????????? ???R???2??m~????/?/%?A?\???Q??^F?_?? L???????(]?\F?>?|??KE?-#???ce??????????|?/L??'??|??????oW?{ne?c?????W???????b?c+??N??W????v??-???|?A????????/???????x???]A?????'??|?J ?t%????6????;?>;?kVR??U????U?_c????|?+?~??O??V]??????qqW?{]???w?j?_7s??j?O?????_??o^M?z?jz??&????&L??[M8???????5???????P?w?! ???p?kHnw ?y9?????w?P??[C?|w ???r?_C????????????>??nZK?????c?Zz??k)???k)?i??Z???k?}>?????k)??2=??????6????p-???C?|??k???}?????^??(?0?u???z??!J??8??C??7 ???,?78?W??^?????=? ????????3K???L?1????\???u????t\????7?# ?#?(??9?????????z;???{?~n?+????-??k~???\ZG??F?iy=?\?g????s??q??S??YO??????3????D??z???W 9(??l?|????? $??L?r>???????|???| %????r>a/?~>????O????O?_dy?f9?O??????)^?,??t??? ???\@x??_ at ro??0??^@???????_a?{/ y?w?????????O,?Lz?w???Q?x? ?B??d?q?z???C?BP Z0????(D??`????z?1 x?I?v??C??B?1 ???(X|?B|) #?8gN>?+R n?5??J??^?"?? E ?;( ?j?????4?g)??S}N?r??L???a?B?[??s?6??J?????/????O?e?@Q????D?7@*cx.?4@?PBy???}??Q?L)?BTC?J????~??28??l??_3 ?f??? ?J???R?Q?xx??????[???mz??qW?????`Uu ??%??MD????h???????Q????????????s????C?????????????????[?????~??????C#??????? ????9e?73???n????????Q?^??;#?X'???:??z??Z?]?0?.?C??w?:}?e?H?MaIb??z????x????5???ix?s`?G??L?o??96????'?????z@&f?5?\????H??!???iP v?86k,?????,??A?0??N?~H4' x?6L?!???QL?7?3?r0m?????,?U?:@?Hb??{$???????)??=(??x=e??????h?????u???k????U'k&xMq????t??@L????Q????c,b [??_?9??`k???}?eo?f?B ?x-????w????-?5?????????q????^?~17??R???nj?????? ???~?RN?????Z?V ??p?$f7???J7????u????Z_#T?F???????J?~R?????~v?}?[Pg??m?????9??????0?.????k_o??pm?????xk?cm??] ????-???=8???~]?i]??c?r???H?Y90?j? ??s#???@ ??_ ?v?3?Su?bK=?u??O?9j? :?1???"?X?'q????k??P??l?k?????{H?*?C????? B$?S?L??????????~|???M????6??????w???z ??sx????????O?.????c3?????G??'??y?O?2a??????UV??im??? ???Bk??+??fo??c?$??c??1????.CQ7Q8??%?p U8?*C/R8??&?p U8?????1T?*?A.C?G\?c(g?*+{?J???R9 ?P?c?????1T?????c??1T???1T??p ?AJ??p e?*C?? ?P?c??1T?*???c??M??1T?*??p U8????? ?P?|?c??1T?j?p U8?*C???1?? ?P?c??1?y R8?*C=?G??y??s?a?????[????na?}&?G???~?"???p? ?#?nF???[????Mk.? ;???{??y????g8???`&?yPy?o?5/????Z3? ?a????g??Q????fc? ?U{ ??m?????_??v=??L???2Z??5]+s?rM?<|?r~4%????????P*BX2??E7lm?4????!\_????? '????C?J??v??qU?,u}? R6??eW??*????7J?????X?V????Al ?}? 8???k/w????w?h???k, /??VUM? ?z90??%?X'???? j>???SUq??>????UG*???n?V ?b? ?o?w?-WN?Z3?????i??????v??l?eV????????0??o"???(?Q??????????i??h?????"??IjZ"78?[????)\??78???d?t????p????Y|H)d??I ??7?2G.?T????S?$?;?I????K?????8z???a^?tTd+ ?E?%?Y?,-?E?????b?? uq?b?????Sj??o??(C???A~?ssc?[???1??????,?? 6??????f%AVL?2???,???K?n???0??Uj*BC2?F?M?yeY??X?9Ac???? ?di-V5?F#F???'DA6?C??]?uE?6??3??+??mx? #?+7{B???h?DW??O?????2?k?q4?0!OFYu;???????2???Q2? a?TFa 9b?Av?|Y??? ?G???QX???.??? ??Nqt?I???{?4:?G??6?}?= 9 Requires: xulrunner = %{xulrunner_ver} %endif #Requires: python-libxml #Requires: PyXML #Requires: pygtk2 #Requires: pygtkglext BuildRequires: python-devel BuildRequires: desktop-file-utils %description A tool to log all your sport excursions. %prep %setup -q # make patch work for current firefox version %if 0%{fedora} <= 8 %{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{PATCH0} %endif %if 0%{fedora} >= 9 %{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{PATCH0} %endif %patch0 -p1 %patch1 -p1 # fix non-exacutable scripts %{__chmod} +x extensions/wordpress/example.py %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py # fix invalid EOL encoding %{__sed} -i 's/\r//' extensions/wordpress/example.py %build %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} desktop-file-install --vendor="fedora" --delete-original \ --dir=%{buildroot}/%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{python_sitelib}/* %changelog * Thu Jun 19 2008 Douglas E. Warner 1.5.0.0.1-3 - updating to support xulrunner or firefox - removing empty doc line - added patch to use sqlite3 * Mon Apr 21 2008 Douglas E. Warner 1.5.0.0.1-2 - update for firefox 2.0.0.14 - fix rpmlint errors * Thu Feb 14 2008 Douglas E. Warner 1.5.0.0.1-1 - update to 1.5.0.0.1 - update for firefox 2.0.0.12 * Thu Feb 14 2008 Douglas E. Warner 1.4.7.2-1 - update to 1.4.7.2 - update for firefox 2.0.0.11 * Mon Nov 16 2007 Douglas E. Warner 1.4.5-5 - update for firefox 2.0.0.10 * Mon Nov 16 2007 Douglas E. Warner 1.4.5-4 - update for firefox 2.0.0.9 * Mon Nov 05 2007 Douglas E. Warner 1.4.5-3 - update for firefox 2.0.0.8 * Fri Oct 05 2007 Douglas E. Warner 1.4.5-2 - patch for working around libgtkmozembed.so crash - mozbug#325884 * Fri Oct 05 2007 Douglas E. Warner 1.4.5-1 - update to 1.4.5 - removing patches * Tue Oct 02 2007 Douglas E. Warner 1.4.4-3 - switching to noarch package * Tue Oct 02 2007 Douglas E. Warner 1.4.4-2 - adding patches for changeset 107 and 108 * Mon Oct 01 2007 Douglas E. Warner 1.4.4-1 - update to 1.4.4 * Sun Sep 23 2007 Douglas E. Warner 1.4.2-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2008 02:13:10 -0000 1.1 +++ .cvsignore 7 Jul 2008 14:41:34 -0000 1.2 @@ -0,0 +1 @@ +pytrainer-1.5.0.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 02:13:10 -0000 1.1 +++ sources 7 Jul 2008 14:41:34 -0000 1.2 @@ -0,0 +1 @@ +9165d6a04a5293f900d1e2940ac0214d pytrainer-1.5.0.0.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 14:45:42 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Mon, 7 Jul 2008 14:45:42 GMT Subject: rpms/fonts-hebrew/devel LICENSE-BITSTREAM,1.1,NONE Message-ID: <200807071445.m67Ejg8H007094@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/fonts-hebrew/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7062 Removed Files: LICENSE-BITSTREAM Log Message: Removed files to retire the package --- LICENSE-BITSTREAM DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 14:47:43 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 7 Jul 2008 14:47:43 GMT Subject: rpms/perl-Crypt-RSA/devel .cvsignore, 1.4, 1.5 perl-Crypt-RSA.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200807071447.m67Elh4b007357@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Crypt-RSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7202 Modified Files: .cvsignore perl-Crypt-RSA.spec sources Log Message: * Mon Jul 7 2008 Paul Howarth 1.97-1 - Update to 1.97 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Jul 2008 08:32:26 -0000 1.4 +++ .cvsignore 7 Jul 2008 14:46:35 -0000 1.5 @@ -1 +1 @@ -Crypt-RSA-1.96.tar.gz +Crypt-RSA-1.97.tar.gz Index: perl-Crypt-RSA.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/perl-Crypt-RSA.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Crypt-RSA.spec 7 Jul 2008 08:32:26 -0000 1.8 +++ perl-Crypt-RSA.spec 7 Jul 2008 14:46:35 -0000 1.9 @@ -1,6 +1,6 @@ Summary: RSA public-key cryptosystem Name: perl-Crypt-RSA -Version: 1.96 +Version: 1.97 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -87,6 +87,9 @@ %{_mandir}/man3/crypt-rsa-interoperablity-template.3* %changelog +* Mon Jul 7 2008 Paul Howarth 1.97-1 +- Update to 1.97 + * Mon Jul 7 2008 Paul Howarth 1.96-1 - Update to 1.96 - Convert "Changes" to UTF-8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Jul 2008 08:32:26 -0000 1.4 +++ sources 7 Jul 2008 14:46:35 -0000 1.5 @@ -1 +1 @@ -98874ddaa3c9445fa07e8ef345308133 Crypt-RSA-1.96.tar.gz +d61b0bf8c66938cc2caf5a58c63e9006 Crypt-RSA-1.97.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 14:48:46 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 7 Jul 2008 14:48:46 GMT Subject: rpms/pytrainer/F-9 pytrainer-1.5.0.0.1-sqlite3.patch, NONE, 1.1 pytrainer-1.5.0.0.1.tar.gz, NONE, 1.1 pytrainer-libgtkmozembed.patch, NONE, 1.1 pytrainer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807071448.m67EmkD5007499@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/pytrainer/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7352 Modified Files: .cvsignore sources Added Files: pytrainer-1.5.0.0.1-sqlite3.patch pytrainer-1.5.0.0.1.tar.gz pytrainer-libgtkmozembed.patch pytrainer.spec Log Message: importing pytrainer 1.5.0.0.1 pytrainer-1.5.0.0.1-sqlite3.patch: --- NEW FILE pytrainer-1.5.0.0.1-sqlite3.patch --- diff -ruN pytrainer-1.5.0.0.1-orig/pytrainer/lib/sqliteUtils.py pytrainer-1.5.0.0.1/pytrainer/lib/sqliteUtils.py --- pytrainer-1.5.0.0.1-orig/pytrainer/lib/sqliteUtils.py 2008-01-19 17:58:02.000000000 -0500 +++ pytrainer-1.5.0.0.1/pytrainer/lib/sqliteUtils.py 2008-06-19 11:31:23.000000000 -0400 @@ -18,7 +18,7 @@ #along with this program; if not, write to the Free Software #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from pysqlite2 import dbapi2 as sqlite +from sqlite3 import dbapi2 as sqlite from system import checkConf from logs import Log --- NEW FILE pytrainer-1.5.0.0.1.tar.gz --- ? G3?????}??????b&??o?.?O?b?(?SJov|?p??U????r?sv?Q?z?Re?7?RV+?7??kE??iZ>!o??}e??S??????@???8y?U??e9????Ze??+rMyC?])???????O?i???l?D?{?0?\i_?'3+ ?'Cw?{n?NBI????? ???{?O?=?x~(?C???y?kI???]?n??u????C?r?G?????.)#??%X:Jg???ys?}0o ??Is?a!U???8?"??d?g:??C?q?Zc???.??X ?????8????r ?OKo?EN??wE?Y8::????;?|b&???????d????Cn??RX|2?3?=o?Pj??(]??x?d??b _=???i????[??,q?!=++d?g?,2w%$?6q?B\/S?`?H???5 ?@~?? ???r?dk???%??4?zx@?F??|{???e ???'????W???#???&`?????o?D??????_?R^???j]???G???F?dHH???? @?Yz?:????(*????+??g???v???J?~|?-O?/??sv???;???/????????{??$V?%?:O?S=aB???:U%?y?_? 9t?,? \H???#d??n^????9?t?3??????I???h?J??v?Og?5??t}uyc ??L%???L??c6????b?H?g(? ?z??(?/J??t?^??T??K!c(??]? ????UU>&-/???F?\V?DQ??1?t?Aj?5 1_?? i??hv<????0?"?s??La(p??\?????????HJ??N,H?{R?upy?X?$?s?,???H?"??>??Zg?)]l?O??#i?&??bG?X? ?f]?8 ???kC?B?+G?:?b??`d??]?+?Sx?/ -n#T????\ ??cHS????O ??Q???x???el????R#??LJ'?b? v??'?1??]{q?-?_? ?V-06[A&?(*%fJA? ??~???? ?>?5i?j?\?7&?5h{r^0?????????8??g?? z?I??%?R^?r0???????gHR??+f???0}"?C??x`??V?_?????_[)&?x9|+q?AK????"?y`?k?_??Y3 ???Kj+?s.????#.?_????]???/?.??W?#K?0??Y??zXU???R?}?????r????s????M????.????[,Q???L)u?1 N???????s?????~0`a?Q????]cdh?)?Ut?D????)?|e????Wwhk'3?y??P s?,??v????k-M?*iy??7(????tP]??J??f6?? !AB?? !AB?? !A??f??*&sR? ????????;zI??? ???{Z/#???Q?+z???c?h?N???{I??2zuI{myTQ??5?&?d??kz?7??fT?????5UMm?????Mr^Q???????z???? !AB?? !AB?? !A?X?V????Q???/??Z\%$V????PMi*MYa.????Y?????2s?]@?l??v????FS??????up????[??<{]??K?????R??Q$?_?;???pRU?????2{??u?iVmT????dN?2????K?e?yW?????J?9???d?U????f???n-????b?v?? nrB???Sl???Q3?9??\???a??J??I?*m?7r'!+R< Q0???vQ]?3?*??{?]?G?&J??j???v??2'?(??=?G??B ? ?e?&???%?y?????9R7????-D???c%?tl??Z \U6"?Em?l? rg?R[????Jm?u??l??? tS7t]?3'?Z?K:)????8???f??[6?? !AB?? !AB?? !A??????,?o**sM??n???pj?????bQ??x?R?b ????Ym?m?????Vo??~?6?sa??Sg???????????f????]????\?Z?^?U????1[???HR?????????Ha?{???^???5?!??KM???'??????U?3w????J?(??:r??X?fj???nW??????z???JV?z?rHW ?;$^G?4Q?YiS ~% Y)??$! ??_?N?k??2?yU?ce?2???*"?????????}1r??G??r'??/?+?G??a?????'GV3DJix??%?????1???_??w?qf?Z?????J??{?;??? ??|?_Ml?fi??j?'?#-??M?v??6???6%E?*?,?W5?V?V??gGB??v?u?(`??\n?{???j5????+????????F? qV?Li? p?????????K???hE?Z?-P??(??????7e?u?vx!w???????p&????????o??DADADADADA???^??&??w.?????Jr?????????U??j???GS?SI?,??? ?} ??A???i?B??W5o?W?&???j?l;?x???8????P???L???*?????N}??!.???????z?(????.{??? ????1???/?u?#D?u?d_L??L ??[?w-???V \?h?kw???+I????Y???S?Z5? N????"?k+????Ev5sz92f&??A??&\??;L???p??F?????2]a??m??????C ??W??o?@?????b??rT?"r?x? ?8?Qoe=?U??????OU??{6ADADADADADA? T^E?t??y????o????(??"Q?u?m m??*??????f??&????s?? ?? ????W^??x???. iRo?FR}??a???n???:?e?]&?? b ??E?X?I+g???,~???+??? ?"? ?"? ?"? ?~H7??7EW???e?2???]?a?Y???=?e?"? ?"? ?"? ????tk???i??????y??v?????DADADAD??5??i?z???rY?u??????DADADAD??a???f,?u?IWk?6???c?3_&? ?"? ?"? ?"???5mW??m?}]?e]???.??DADADA?SA?4?2??????_z?/ADADADA?)G???0GDADADA?j?nF?????b?.??u?#v ????=?7,G(??_???S?DP:??I?c???????DAD???0?X?S;???? ????v??k????r]?????? n?u???m????M?K?I?m?????e]??8???????;??b~U?????Q?w???\?b-????M?E?D=?K}?>?q????? ?d?????q???n????_?eX?y??y????e?I?Vb?~Y????J)???(?>?DADADA???:?@??9=/]?W?=???^?uX??oQnRm[?aY?w?f{}Q?m????????o??r?????????"E#???[??gA??n??y??N?????s???^?jKu??K**??=?s9???X????????j???{g=J??]?5?8:????s??(?~??????/?????????u??L??Nu???A~????????Xw)?????(>?u9???{??r??5?????????j?~?#?(?x?c??[??2??/??Hjq?]]?!vl'????????=??s???]???N???e?"? ?"? ?"?'?dc7???9i?????Q???0??z??k?????k???????5~??w??g?v?+^????[ ??I?n????J?0?]$?????o??:?]????Mxej?n?n??g????m?8??k???h?m=?3^???????25!nol{?~?1m??a??^?/]??_??k?????&?;/?y17L? ??????!G???????-c\F???4e7N????5???V?z?~???oc????R e??;k1|?^n?????E4 ??\,?"?I? Xu???n???????Jz??O_?W?Hn}??k???????????n?????6????:j???+??u????U ??B?/L????Z!??U???D??v ?%D??b?c3?;??)?????K??????5nf??]X??av????g??ut?-?????r?L?????Zxp???z?`u?c1?????fH?"? ???@?"?|??Y?^??_?+????????M?-~???????`?o uW????]?m/???%o:4p??[!?????/?C?0ws#??????w??>GR???J9?W?E???c?x7?3e/GDo?m;??}?_?+^????/@?yz?????[?Y???????f???mk?=??k?mD? ????"?j??jD??#5???f?q9?8i?z?K?41]o?y??oVy?^?;EHi???e??? ? ?m?@??N???a?"?????v{m:??Pg?]?r?x???[V?9y\?}#eWSL?????r?k?[????????[?W??[?+? ??_??Z'.n?x=?a&?l???(~? ?D[5?R?V|??e??v???&???x? ?9??Z???yc????a&l?q?????Z?0 ?S+P??????_?[O??R\??T???[F?? ?{?#l???yR?\????m???F??m3???;???u???b?N+^??1?z?P?f?f????w?wq&-??4*?|??????N2n?8w?}??w u??E?xe{???FM?>?&x?o??????|??vz??0??>?? ??;1?Z?|?:nf?%??fe?S(?kWG?8M?Rw??P?W )??c3v???r? ??)*w?B???k?k$ne??? y<"?????[G??:??-O????|? ??J????Eu:*???|HADA???@?t8z??G?ew?~??a??M????uw2???^???????b????x|?@???=???r??r?M=l?qt?7????'5????8???$?? (???*???x?lu?? ?PW??-|???s???K????Z??X?????Z %??X:???*?<~???n????5????)?Y?q!U?k5?Ob??=T????.??????8?.????| ?/?????+?R?`T?????? 8?`???h?? ?Yo?????*Qu????????????? Pz?|G??sSs(??P???X??E#? ?"? ?~4?foi??5??????I 88; ???y??G?QG????????V4?"? ?"? ?"? ?^ ??fw????k???????GD??!?????|w?JySs???Vv?????? ?"? ?"?a??M??x???u?%? ?"? ?"? ?"??? ????Yl??n???.~???DADADA??@?4??g_?u?????GDADADAD????i???Y???~b? ?"? ?"? ?"? ?>?M3,?r^{???.~???DADADA??@?uX$~?p?7???DADADA?) ??S?????? ?"? ?"? ?"? ?~*h,?m?lY???? ?"? ?"? ?"? ?????????`???_???r?S?'?? "? ?"? ?"? ?"?M l???Y???_???_?"? ?"? ?"? ??y l??? ?"? ?"? ?"? ???BSs?_???"? ?"? ?"? ?"???~??? ?"? ?"? ?"? ??????O'??#??DADADA?&?????K???E? ?"? ?"? ?"? ?"? ?"? ?"? ?"???y??R???:??4 }??}??w????w=??^??875??hDADADADADADADA??tK?4C3TC???? ?~??:??+?S^????Z?*????????u^?y??r?????rM?/(ADADADADADADADA???8%??#G&h?E?^$????W4?X?DAv ????A? -5?"????/"/?ADADADADAD?????}???r????4???,? ?g???L?U/2?"?&?????k&?y?:?????(??#+=e??rL]#b}???Z??s3G?????.?'?5? ?y ??z?k?|?????4PzG???Y???*?*?W?????S??)?ks?????X3A???0yKs)??E?f??Xi??~c??f???N"?C?&?oE.????U???g?%?l?"? ?"? ?"? ?"?$?????Y?]??y??e?????-Ss??l???D?k????Zd???N ?K??@???`??;?3~?;???n?D?????o???QE =?3."8 R?"????}? ???f???&-??-??s????t>??|?X;M????*?s?????OC85?N"O??J???+m ??'?? ?v"??????8?I_?$?^?#?RA??g9b?&? ?"? ?"? ?"? ?N@??foiV???????l???L????k????Ed?T???????o3?,?H?FQ????E?fM?*r'~v???M?e![r???Z???"???&? b??f?X'B????T????8_M-z??????u=M0????F???n??j?A?XD?/X%pf4???p0?2??2?%p?ES???w?;?Z??lCd???yT? ??J??6?6*??[?????Dn?QU? ): aZ?L*?T{?*g???>G?y?????dv??fT????/???9:???l??"?r?#U?u?_?k?v??9l??????9???!?RdZD??{s?YE?J?`??????????????HS?P???/? ??j???Z?lc?8k??9c>zt????Z???R?vm?)|>zj??????E????U?(B?XC?'???????\? H?S0?8?h 3???????? ????;E?]??*??9b?f?~E??MDADADA??A0 ;??????} ????9???njF?A?UvE???W???\??S?????Vu????jj???{ ??????&????????i?pV???~?+??rl??EvV???=w?????WB3[?`????pQ ?h5?????*??;????.q&"? ??G!?1??db????pF5A??C??N?Hi??JI????C???e???????^???,q?a???????HZ??9Xc0??D?A??p????9?S ?+B??@X?? rV?Y?R????j?w?"Azp?!?a?rx? xfZ?`5?5;kF???????q5g???. ???{?z??"? ?"? ?"? ?"???%???r?^?z^??\???e 9U??K?Z???g???/(*Z?[???? exB?u?????? ??z*~6t3???&?N?@R S3.?k???D?.x%?g??2?"???"?o? k}??D?DD:?_?J??" /P(?s???_m???<??\?S?<]V?#???6? ~??i?C??4?>???qas????? ?1~GC?6?~????????lx?C????jQ?B%^h?E??3?+?k?g?Lt???q?0*?????q]x?&B?????g??}'!G?>??^?????D???? o5?)b?@??k?{[????????|????\?^?-q????@???YdhRs]?R:???u?e?-?q?e|S??E?l??Y?`?@? ??+?[? ??i4??W?????+??r?????M????^v????i'?N?T+e??0e?GH???rd-?.^??r{6>?H#8$??#?H?|?l}r? {/?`iNO>~v??Y?/w?????Q?A?QkVB??????Ud?kp?D ?9??uVQk>???}?x?G? \)?V???`??E?Y?Bzb?f?~a?~AADADADA?d??????h???Mz????????g#?? ??q?q@?M??%??aB????F?!??@??!??S???^2 ?e?mg?????????5?C z??????%\#????lG?^??g?2?7?*???\???I?z?2tl??n? ?`t??u5x??K5?????(HI?.tzq??r>??????Nj?;sJEJ?A????O?????????????kB?u???)????8?? ?????????L??2Fz?vQ???E??4????'rO??s R?X?????b??.?p? V#XS???`??A?L?zS@?;d?C??|??#M??{????????IDADADADP??????4?\S???@?""?????????y?+_T??@??*?? ??W]?V??h????:,??C?lCZ?q0?? ??Y?ZV6cUj_????p?\???7gj4??j?1?RF?lT$?B??????*?k??{\~??w^??6*???2N?g?/a???? h?^??:??pbqiS?`???8??_r?Ysp<?u1?????=Zaq???????)\^?;b?f????S?'m? "? ?"? ?"? ?"??A????4U?????@j?.?d?~r???????X4??RN]??f??=???????}7H[??6?;s? :??&?_?????s?~???q>z;?t???- {?8?|F?~!?jk ???=???E?=?????MADADADA??`???R>???-E?RP???%?G1??=??#?? ??????????hz??w???{??O??????V?E;/? ?55?}+??????>{ ~_???:????/??O&???_??_??Y???i?g???Y???r?????gDADADADA?i,?e????<,?R??E.?*???????Q4?"??_???B??sD???????"?CA?9??a??]??,?9????F?>????lPn??E?=???=? ?"? ?"? ?"? ?JN0 [?f???9?4???? "? ?"? ?"? ?"? ?"? ?"? ?"? ?~???|?y9??????&? ?"? ?"? ?"? ?"? ?"? ?"? ??= ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(?{?g?????|F??7?Y??E?A?/?Q6(???ADP~ g???A? -????Ae-?_D^??l?Sk?[rd%?y??GDADADADAD?=????mjF?^d?EVM?v1?X?f??k-?????(?H????;?c??;uT?")??+?*?????w@/?Q??BdE???^??A???????????V????f???~?*?W?????S?pJ??=:???b?YoX??$?75?"/?Q6?????=?w E?e9"? ?"? ?"? ?"? ?"(L??????=?????*???R?"?h????E?^$|??ETG?BoG(??"?K??????+??S?k??????l5PO??j??YEPfLTjX?J$6??4????[????cM@vV?]????h??~Pe?Q?0P????L?s??co?E`c?F?KtJ???????|?P?(?Arzo?5???c-}>?:??]??:?-? ??-????Nf#d?kF?????W???*?<,$???? ?"? ?"? ?"? ?"?+@??? c-??m??a?PO???]g?s?%?S?#?????????7??? `??Nfg?g?k??C ????c++vX?AeWG?? ? ?Iv????GaB?B????F??;1j:/?U?g?Y??}}????M???? ??w? l4?B??J?j?U?)???Rd?????6_?W{W4?j?;???Y??wjk????????+j'L??Qo??? ?g? ?[?????g"???*?Udh??8??? ??jeg????!?'??j?3?R????b#?j?K???3?Q???s#?H?^ ??eJ?R?Fp?p:?ZC'g?G)i>?}?v????Sc?=;45#?????Z>??+??????{b??'6k??R??Ss??a??%??4??0{?DW4?????HO??g????}N5?0#?????aeR?`}>????S ???@h?tS??ki??????s6???????>?V+X????!????\3??~??? ?"? ?"? ?"? ?"????????;??-BhY?yWg?}???nj?g??H???v 8s=? 2?&4??g?/ R S3?^?v{?T?????"????"??&.??v??? ?r??%???-?? ?z???????IJ??1Dp@=? x}!"????ro1?I?4??W?9????????'b???(?A??4x%???m?????z#?zB!?a\??n? ???QS~?Y?>????*3,?AO{-F?N??)???p?/<:C??<|?kV ?!?Mw*???Y?*?E|??????????{${?5??O/HIq"?=?N?x?XEN????#????()G??N??@???g??AX{$}N???E?a??????fMx??(a?????/?r??T????{?<?????z??C????6??>Jzt?????+=????H???]5??f??%??4[%x?????1D?/t???Y??????u?-8 ?g??tGB??;H?"? ?"? ?"? ?"??????gC??>.?S???H??zO??yBi????9T8??7?L?O???V??D???\?}????{?n?#B-?W?? M????????wv?v?8?????????wi?H?*;Pz??Qi???}??8?'?A3?]*tJ?,?pUE??tcv???6?m ?YV??????s?r??? ?"?[??????S?>?A????Nzz`E?L ???l??Z??XK???2?W?*??wg?]?4???r5K????????????t:?8k~ SF???Q?C'?R?0???#?GmG)9???x)G????("????wX??SE???q???????4?E?????2???ei?9??f????m?O~?2???!?2#x6H????????/?i_G??f?????X?FG}?3??^??xjP?Ex??????o???_>N?????,??$ADADADAD?-}w?l$?W? UX???E??? ????p?*?? ????X??W?1?\P .?X?????F?NrS?c;BJ???z??u???@??z5?h??{\~???^?(???????xWZ;???L?q????????d?5??[Q?@??f? ]-???l????a 0???U????7$??????T?@#x)??:???W????f????2k??F??K?-?u????}?2???g?R? ??(?????G?i?Y?[??? ???N??s?T??????O?X??Q?R???cK???Z???FVzX?????N??Ol????/??9-~6L???gH???z?z??w?????????6???????]c,/??]?N?Y??A]`nD???m???Z?|??4[%x??????:?h???Wp??m4??Z!{]C8r_y???<:Cc-?SDADADADA?????H?j g+UY?)"?)? ???J??=8??!J?????w?_L?Z????4A??q\=????Z?Y^?)\??qfw?\5!^?s??4??F?? ??O??/??L???????6?B?O B????hf??;^? E??W`i~?X?????tk?ei??????????{??)?X???????O??gv ??C[(t???ad????3?9?????/??p?@ S?X?????[K????cS3?????"?j? ??H?? ?sd)?u?g?Ox????I?3d???u??G?u?C87GWxg? ??q_?_?>???Pr???07?@????C??=c??;X???r??W??x<6???x??m??u ??????!i???/~PG?'?"? ?"? ?"? ?"??? ???o?Q6???? K%o????[A??|?? t?? ??rD?O?st?????a??q??ks? AV#8?????DADADADA????????DAO?| I?u????F??\?J???? ?"? ?"? ?"? ?"? ?????????L??????k?;???k??5.????*??z??&???cM?V????"?Y????D???8??"?$??o58Ik4nE?w?h?M ?K?W4?????????j`?;??-?2+?w`?R????J??k?J??? [????kw@?i?D?P??45?"?8??ng??eG;??-"?25?O?(???+b?THj?????Au???=?????h???????Z????:???????*????C??????iA8?Q?????g???3?Z?{??z??_?X?J??"?t?lY??N9?? ?h???fxJ?;tU??)?@??D`v??? ??F?????????;s????x?p??[)?.??????Q???~?*??&_SF \J??V?^-{?hF?Z???D`?G?a????jD???0????&??????? _p_?? L;wjP??+.?;\mM?}/???z????098????????Bn?p}+?!bf>Ji6H-sn? ??N?f??VvV3????3$?Jw?V?yOI???{5Gfz?:?8:????{n$i(????%L)?w?? ?p:t?5v????=?O>f?O?Q??9?g??f\???!?Vx?2?ot?f???????????('GDADADADADA????????_?gG???1S?@p?????n??N???_?3?S????.G??G????GtV3G0'??????#6??????a"??7m?!e 5(?+?????!??U?N???nQ??%g?z???Ye???+?}???>3???+lf?3????!??n???"x???????Yo???]??? G???r??(eJ??`?>?R???1???4!=h?O?????3z6???cJ?a?8&?O?:??? ???W?j?(???}'i????? ??D ?|Eb??]?`j??*???k???e'?m=(????2?z|???B???Mq??B?k?9??rg???=;65?z&GDADADADADA??>#~?[??E 5e?Nx79?s?U w?/?A? ??u?/?A??s?<F?F????l???(?iL???Y??&????????A???+|G?"? ?"? ?"? ?"? ?"? ?>????R??U????{? ????ADADADADAD???>$~?;?FA=????]c?~w?? ??V?i?k?$i????????)?u???5??.?e)?7??????????k]??|?????&? ?^ ?z?,??9jg??y 4_D?Z?)?3_???YU?9"? ??O?,{??????c??9???3@??mO>?#???s??A??#W???E#?? ?tl???N&N?! ?'@??a??9?- Kc?}9"? ?z4}w?l???T?b(?z???V?r??:"?U?^$e??yE??A?&}hj?,???Q????,G?/EUEx ??s? ?????C7?C??c?n??O5??j?r??r???W????o???_?#??? ?,??W?????? ???W??@?,??V?????s? ???}9?"PQHW??????|?g?:?4G?? YC?Z?h?T??9B?5??d ?????\P%J?:%??W?l????}???)?\???! "??}w??\??]???lj??t?lj~Y?,K?????}??8?^???????m?:X?+?s_?sS]??j???????t???B?ei~?r??MP?S????????#?"??WZ?? ?fb?6????????n?C&??_n?u????i~???????]v2?5$???5?&???&XnE?\v ?q?????&??"???u eJ????+?N?nu???j??(??? DP?U!????f???v"Xe (?????????rm]_`?@?0???{?44?r??Z???N??k]??j???c??F]?V]?n?G????*??????M???Rv'??OZE:I????,?6?nz??5N?i]H7?????KU5cQ????VL???T~z????L??V|!cY??????e?{?Jy??%? ?38%?S-k?:?r-t?C?r????!k?~p??:??vT?Pe? ??? U??vp??4??!???G?285??!~??R??????e`???!?>?nu$?Y??m/2?z?J??!}+k?Lz??E???S????!.????????|^dg?Y??E)[?i?u?? ????J?(??#V7U?o?$2?"????_[|HW?uiD?L??r??? O,?^e?%????"rP??3Z?ud??7?^?r??s????8??Uf???????;d?W[?1?T?P?[j[?Z???#L?f?l)e[I? ?W??E_w?G?r?c?Y?YG?????;???i!??t??? '?N?b?h?j??Q9???^?y ?U?'?u+??,?S^?9????@?????$?=UV??g?m??n#{k???J_tm]??:N?=?U??&T??????\?????>?^?????M?????i**????O???w?my?\lyl????8.??go3?F????{{e*j??S?uU???x??R?k?q????????f]?.???N$????8k???I???[?j?#F?b?{????kP\\??U??O?Hz????aZ?3??j>?_}4??f(v:?U?a[>hz*G?????r??Q'?js?O??./??OTK?2?`???e1O\`?P?{????.A??"???bx\.???3u???s?L?S???h?EL?????*?/??????@2?????h???W??????N?|?l9Q??:?ti???g?X?5G?5???Su?:&?F??? n? ?????'?? ]t?S?L?NzEU{??G?;9?^;???I? ?????g?????j}?{ ???g??U??V+X????+??jl??2?)????Rp;????R'?bh??6??_;p?K*?c???y?f,\[7?;????????????j?~Z?[???jp? Ff?[??X?/tq??w??? G??????1??4Vp?????H??k?h???n?????????}??5U????v???Q_,:?gXHw9BJ15??5?*e ??ph?c??!??j?)?o?/:6e ?? ?????U??u??j^??&kH???6??,G?k)?f?????????C??*k?Z ?????m??Q'k?? ?"cs?^???Y??2????z??V+;??E??????[v?7??h?e ??)?????E?????,~a?_?* a???z????0w??(.sn????&?(???n??~q?X????V???=?\?C??c?????v?2?????-???_??~9k??????FA?@?[?J?SPw?4???p?????4?q?W`?/?q_e????n???.'+?F???h???? ?j?/?f>,??????.??*????B????_??g?&???8?s???????_g?]?R?h=WG ?B??{'>???Qi??????jVzE??^???"?i?9_r???J??x*~??i?}t?B?@?9Z?9?(?7?eu???H??OV????wts6??????N?l?P?Y??????T"????-[????????pR???j???f?????_?"??K?{??7?????A??7??/?V?}?O???n??`???d???Ms?BK????j??9/???]?y?_????`??V???Y???]e??????z?????3???<6g?!????cKN?8?r?_??!?????cK?;05G?sN????Q??~??u???^P????????2??(Ut t?????^??'?Z??D? *?????U?? K?;05??+}?B???9VB=L???g?~[???){w??N????M?g???I?"?TK??????E??!??)k??F????H????5d?F?Q??I????|0~6???58?Fd??V?y????k??d??0??cBF?low ?7?????e??wf????4??y?S at q?Z?Y??Qd?@?55??h&?1???wj? ???};????m?>B?C'}??d?35[)??>Do?l????G??#???????H?^|;??Zu?Hlj???k??ATO]9?>_?h!=?6A,????: R1????w?????eb95?EvV??[-?h)?t??M???-?g???+?????o?q?IvG?Be??w???Vxe??]?lU??i?7? q??????b/??_:??]???' ?<????%+??!?'?N?}??????E?Jp6g???e??????p?? ?g6?HUi??VG???Jq}??5???7x?b???m?CT?r?????a??????O??X*???=??Y??w?AW ?>{??$???(?????&v?;w]????8r?????q2 M?; ?irC+2j ?HW,?)Zv????M??fq???X?2???9????????X?]?????w?ou:PsB????~@"??:?'M?? ?`-.??W4?ww?6???/?~ =?. ?t??^?^??p#??/C??????6?/????#yF-w[??g?h?d6*%?J]/g#?????`?l>/??;y ??.M'????\??c?w!04?nu????]v,U??_??#?T}?v?*?'M?}=????????Y]G?? ?h9L?????!???\{?k?????????L??(??W?Y??? {??!?s6.&???a! ??+kH1?x?"i\?^OH_ulw 2?9?5d?8???bj?Z?Y??m]G n?O?w??_?-??I??G.?R?E{&eh????eI?????j?kF?????g'{?Z?fg??????&?c}??????s???wd???? SF?????NI4? sgi?s ?_E??N???Y??????????zp?G?FA?0??*?G??? ~?C??????????O??_)??0}?CA?6???g??h? ?/0????????4\??pa??J?^?G??V?z?.yc?????r?^Q??+?????????K^?v????C_?#??]????.?|?=?E#?W??ZE??#??q???rd%?~7???SR`?] ?/?????@???2????d=y{?~????J=????9?-p_?xie <~? ???~?? ??z????????n?9"?8?_?f?BJ ?_??e??yA??;~??F??@??f?? ??p??Jkph?Tq/?h:?? ??u???????'????z?a?&??ro??E#?q?t???NQ??)Fx?j??pa??*G?d5??Z!?!??#??P?????_ ?_E????om$?ws???$6?e????#?> ??yq???)k?????Qn"(????9?-p??X??? ?-pU?xme?N?n?|??I'=;S?Wh??O?N"???????????h?0??:?|[v???U6A?6???g??h? ?x??bf1???!F?n9 ?b??t??? ?}?w(???q?????? ?RP? R???[????,A?S??I9?-?D????>;??????NSP??g?i?|?m??]D^?#?~"????#?????c??e[????? ??b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?2A??MADADADADADADADP^b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?2A??M?????????a?]u???S? ? G?(H?ou??e?G??e??9?????W???.?e?e?Ks? ??`???G?O]/??????r??6?."?,r??i1st?U?$??=*??V#? ?4}??>?[????? "?cA???g??kA?,2?"_???}?$?'????e?????DADA}???g???]?Fi???????)?b??[?j??????????:??V??1Vm???~h?UTEU??Y ??_???nl?_?_ *?T?{?????A?v?ik?fX??????sD???@(?p???Y?????-c2?~?>;?\?/?AG?Sqx?F?????Wj t'G??0???A?q?????b?z??{9?ERL??@O'??I ?*Tu???-???k)?_?#?z?>]|U??R?6G_ ?,??????????~2(??w?|??U?d?'?`?}s?zT??g|???????H??M???4]f?0?"?$r???K??h????_5????>???J??!???>C? O?DA? ?????Z?F-;mqm???.[??!????e}???????P-?V??O??WT????o???v?u/???+| ?e?_-Gp???vu????W???c)C??;???6Ao ]???M?????????2??z[3??V?k:?? ,?^??e3?5?Y?G????&??Y??e??{F?H}7??T?4?"_{?U????I|???}???h?kyn??????Y;??4?????Z????????]8?;??}Jvjv?E?A/J??-???M??j(?? ????????Ad? ???? ??5r????????=?vjD??yq?&?T??=;????vV?y?p???G??43??#Y4??????L???5*????R???YI??Z???>????+????-????){???????n{??A ?]?=?8@?=4?A?Rn??#???U?" ??_??~?? >??U?[?8??~??O?I??6E??e??O?????? L??Z????????Bl??v??L????????cJ?iQ???[?l?T_??t{e????C??m;?m?$???????j???HU??P?gn???Ss??xZ:E??:?:E=I?(?go??@4-?7[3?????t??7J?L/????Q?>;s??v??????? r?G?8Wih|^?T??gk?????P??g??????5??E?&5x???:??}1??l???!%}R???][?? ?K#??:$4???z??:B'T?? e?L??T?c?????~!?g??rZ?"2???7-?qFs{?Ug!7??k T`0!????_dy?U?????/??l??#??O??S3???? T???Z]JK]??=(y]?,??25??r??S??}????B??sp???Z???o|?&?? k?p?t??7Xc???D?? s?? ??:?t??????????????9~WG) x?q???$???4?_?]v????V??d6?6???0?!?????e?C???~????.?_??+ ,=???q??/?N?o???????t?????dw;,??fWojU?D9?U9#w?X_?>RU??d?^??l8???5/???0?l8?Tojv??f?zad?e??????b???j?x???C?{??????EA??????2??]?\n3[????9#G?_? [??Q?????rz?'=?DA?b?'??-?.p????)\nO????;`????E/=???|??e??K?6???Q?gnWH?_???0???????8????d8Xi??g????S? ?AO?|???d~Q????H???;????T??????8u???f???"$???R????$M]????f???a??m?3n??????Y??U?|?n?d?*?}}????????????9I%?O?o???\??????v??*G?Sszc?l???h?_?w??/{Y??+*???v*k???????O??r???cM ???s??2?/?)??@????{???$?l??r'?OZ??Px?????O?3?g?&?J?????s?? ??6?\E?u4K?Fw_????L?(?)?Ehj?r??=?))~?i???~???U??WB? ?`??)?0????::??8??hy??[Q?Yd?a?g??A?Q?Hwp?@?????????1HP??? ??'E? ????,?>??????????H?7????QG\?a??Uo??,?????:r>????~?s6A?Y???lP???&x??s,?????0??????Y?/a ?L?wjVo???V?.??(???).?+?_?]g?8x????????g? ????????`-??I??* ??]?F???u?\?[?.??mQ????=?g???????> j?G7??P/??????pz??]?_+??f?Z????]??+???Mx?[b????=????_?????? ??e}???????l?qyp?}~?t\?+;{???? ??w???@???OA??A??[-?Mli?Y?SL????[Z n??x;??(~Ik???P???`???????(???X?"???+h?v? ??F(???Z?N??????FK? ??)?n?g??????H?w?`???!%??Cn???n????<?v?~?ov?g????.???w?n?=?m??Z?I??& ???yP'n?e???g?!?????$?7 ???????]\??????k?>??LoiV+*?wo?F??u?45?"~?????C!@???Jo N05????K?? z(}???????X2?? ?8$*R?'?&???f??.????o?g-|C=????}?(???a!???okw????u-?2L)???u? ? ??Qd?'p??@??????e?????m/n????k??4??H?q?>Lu???+%qOdp7??NC'??? ???? ?E??K??????&X??????p??????~G????? U?W???A?? ?????g?4???(}???N25??X?????}nj?,?????*sn???4?~SUz??????4?.??l????$????W???O???1?|8'????Q????????U??/??R?F??e?#?????M???P?g(?I???? ??H?qlW?A??S?9??_v?^??0?6???\?@?????????bo?Vk5???E7?????*?;(?????'-?? 7?z%???&u????6?f?_h;???{???w?J??w????3~??? ???w???"$?????s?f M?/???5%??/d??]??(?(???}?g?y*??b?0*a?????B????U??Q?l/~??R?+u??H?Q??zf_ru????(3.r??KZ?4?f????A??>?.???}????????kzE??_??M??@?tq0[? {?Y???RE?? n??C??R????a.??`????RE?V?U}1.Z?A??h?V9??[?( ?E???/??)n?????55[??~??z .?FdV4A??n?8??5???\????V??N???8???q???*???{?B?!c+b????5iV (]?v^?.G?E????G??ai(???W???)????~\ ?G?>?X?{?8?c??u??Ed????????"D jn|????d5????*T????z3= &????H=??Q$????k???|??\ K??{6,????o????x???m{?x??N[?d-|T?F????? =vA?S-?R??????pXa?~m???9??7?r? ?t?????!?T?w????-r<|?????5??)'~v???2w??????k?pU?????????B?N???oX???!?2?Q??f?wg($???c=??>?}Z?????Z?TEQU?{???F???m|???^?(??????s??z???????_?????????B7#?:??n??6????c?????BU??t???[%7???c92??=vbu???q?k?#???@?}?u#????O??;[.?????????%??U?i?]?t????>??t??1]}??s??X?;?p ?? g?i???Gw-??V??+?a??!?z????(?X??Y:Ey?N!???t??????+?N??????F.d?????p?4??c???F85?0??7?No??:???&? ??%??S??-?5??f?h?{Ke?Z?Ad?8??`??D?11?}V~+?nj???,?U?V4?Hc??%|D|x3 }i?7%~6??????-GA??jR[????????"??O?G?????r??jB????T??+??wE??Bv?F?g?r?5[8s?f?eI?Q?t?????$o??.?a!#~?O??B?u=JIV???:?u?????cK?????g???)?(w]?]8?b];V? bP?n[?V??^u?."/?A} ???he? ?z????Yo?? ??f?Z??FADA????DADADADADADADAe??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??L?gDADADADADADADA??~o??v?{??????Y??E?A?/?Q6?*???? ?"?P????9"?????v?_.k??"??E#????????r8?~`?"? ?"? ?"? ?"? ?JI?7~?ej?z??Y5!??,b???D?E?Z?????Q$)G?O?i?S?????E?&z]e?????A??r???G?h?E?aD??Z?[r??@???U9???????lPn^??w?G?|9?Q?#GO???????f%??????R?e9?g@?a??zc??f???N"k+??\j???r?v?eiN??????"n-Eb?&?qP?}#aiTv9?F?&C%??y?0x?????"?AoG?A?`Z?L*?T/?*g???.i??E?R??#?_X? ?[???g??!?st??V+;??q?}???_???????B$???Vv?/???? 9?"?"r-D???[???UP???????0?=:i?G???B????(}J=os??:???h????????#?????g?l????e{h?D?p?/=Z#???F??/?)?f??f?x?C?k????,?>RwO?O???S+mz?p??l?? W??"??=t"Z?????d???n?k??)?????Z?`E9/?Y4??h5d?O`Z?b ?`???????5?hi5@ADADADA??A????V _???W v???RO??nV?V?TC??8(?M??.K ??y?a?*q??MT;]???*?M"???V?_??xE?Yd?b`)4?<.?^? /?^?w?V?f???@3?[eV?F?D?f??????=?(??vECA?????????????(??45?"?8?7*|?o?X???\,ej???QEW??????;?j?w9??;k?C;??/??&?[8?_?i??????s?.*;???";??>D??J?(?????????p?/<8C?}?G?????5??*???????#? P?]??#?l??x(X#?Y??????t?hn#??)?*?9??tg>?????9?>5?[????[??@??-??i?4?W5[)??????5?e???!??W9?h8??y;????W???i????????U????*8k???? V#X??Y????t??W??5qo];O?4?k[???8f?`?g^?_?C???????7~DADADADA?}w?l ?Uc???8L9?P????"P=? nXE??875?S?????6?Nare'?3 ??vXX?5b?W?????>G??C%?}???SG??HIv?????? ??QT??^5?*??&_SF \J??V?w ?@E?Rhi>?#8?x?#?,5$z?Q5?5????G???2???Z?yg0R???g?? ?<:C?"|?k?E????RNo]?U>????~???c??p$??(wzy?.7???}>?ZC'c??)i>Bz??????gg?l?a`????`f?\}N?{??;CJ??k&g?xV?k? ??=? ?V?h????d?M?.??????@??5??79??$?Bn#8?_??z?b??%} ?L??J>~v????y??k_???8o\????~? ?"? ?"? ?"? ?"?w??;~6tc??#????F???D?{?I???Y/????C%?Zyw ?????+?~GC?6?~?????j*b?!?L???P?????3????g?Lt??D?????????,?wi?+S?N??????4G?????lT??f??"?O?.G05?W}?G?4?H^??????l?]=???z??u???`p?w [{ #A??k? ???u?e?.????????M???7??????2s??J`??7sh?eT}?|??9?]???0=j?:?M???r>? ??ERND??4r??M?a??????????/?????ID?!?+X????g??Y??y??`e?~b?&?W???tn?t??f+??? S}? ???"a?kp?E ?A?????V?pV????????z3???????-K??????!|1??D?q]?MDADADADA??w?????6?.5?C"?^??/Ptw?S8?? ??/ ?s????=XM?P?=~0M:???A??Y?e???? P???D?;G???????g???A??V+??????{B5?snb??z??8?/Q?%??r??X??r? V#??ADADADADA???? ?"? ?"? ?"? ?"? ?"? ?"? ?"??????DADADADADADADAe??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??L??????"s/?92A?,??"?_??@???Y%???&? ??S8?~F?:Nh)\k? *k??"??=J?x_?#?"? ?"? ?"? ?"? ?"? I?7~?ej?z??Y5!???E,\3???????;7?HR?????V?1u????j?g????l???4?u?DADADADADA?????L?u+??"]%?\[?f??"?Ev?K-R5"k+???`??;?3~?;???n?D??H3??@05?*j??Q?q?v"?(???L??[!N??[r???.?/???87??A?????g???dY?m???:???J/?Sc?$?T??D??G?ADADADADA?$????.?"?:??]R 8?:?V/???,??"?E-?J?z?YS??????;cSsY???\4"??*2\D?F?D?6???$?A(??? ??B???EB?X3~6\??? &?}??H?7"k'????b ?`???E??u?M??????6??*A \n?T?*???????"k)????????a(,"?J??6?6*??[?????Dn?QU? ): aZ?L*??VD9[VE?9????6??'?[??Y:???~4????iGuf3'??#?????\??+V??a{?????????? 9?"?"r-D??f?*???nXE f#C?Yc'?????c-7G?Zn-??=?25+y??V6?5??K???;????9_??t???h??.??i)???e{ ????????|?[??+??? ??fq??b?N??????n?~>??? ??3?h?8(wM&.?^?t??^???V??f?q????j?*?Sh=;4?jX?J$??Z%H"(??q7?SG???qV?]??|iE`?P???.?`???5v? ej???Q?DW????.?|O?Dv???5??l?N9????-???J?p ???eWG)S???j????=??tg>B??????Sc?=;65?r?? ?-????P??????=?Y???a ??A?`j??m-z3???I0i???R|?r??=C>???;^v??&0k??????!?ODADADADA?"?w??F??X??,|?wE?05?v?:???x?bZE?t?? Oi?/?U}:l???????w#?aaa:????MU??????\*??#?'?fvE ?#?.? q??F??`%t>? ???!e4??;?"???(%?G?????r?}j,?g??f\???!????a??? e? ??????qq???]??a???1??)??d?G?3?3=;c?g??? ?Jf??h???Qn"? ?"? ?"? ?"? ?"??L?????9R??Q!2??Z?(t?A??`?g???"????T?l???Q?f?N?@R S3bcC??1?6X??????|?G???}???????>SN"w?U#??E%pV?(c?9B???6????p??????B?.?????T?| ?x??97>???????3?Y?S?)C?;:???z??4?wP???`??; 9????1??/???Q?[v???m?S>F?????N?????????|????\???-q????@H???[?c?????t?????:[???!O?e|S??E?l??Y?`?@? ????[oG??i4??W?????+??r???m???A?;?dX?|a3ND?N?V??a??????'??Z?]???/??l|?FpH?;,#??i????Za?????????l ?0%???L?x?[?Un9z(%??O????????????+???j?|>DADADADAD??@?? ?U??K?????h??,?D ?]?????(??;?p>?[?(tP ^V?P?? ?.?i??? R??????W/?????3N????N05[){?|?g??`A???Q? ?J???U??p????E1?B????ES????g?Z? 4n/hx?C????-??K?R?/1l?C?S4????)((?3??W???z???j????? 6N?N?9?5? "???8A???@?#?w????$??/?n??????????s??W8?tTg??*2??EW???e: ????hf???_?~?VI?3d~???"???????4???Q??i?(HI??????????R????C'{?g?G?/'???YK?????g??fX?D?[E?z? &h? ???m?A?????????l f?????}Q?????????????5?Y??.G) _;C>?"? ?"? ?"? ?"? ?"?E???????}HM???Oa{U?????F?C 5??|? "????A0?X~?????i+??f~g??A????H5z N?????@??G?5? ??????R?e9z ????6Go}??'? ?"? ?"? ?"? ?"? ?????m???V??E?J?v????E?????Z?jD?V?????v????????E*?^D?A$|??QE?=?3."?N?E^??? ?p+?6??????O??U9? ?F~4?|>?????v?55???[\/*???5?N"O???/?.G?ADADADADA? ????.?"?I?????*???Y?"?h????E?^$|??ETG?Bo????0?=:i???5?5?????cF?s?&?\??j??F3????X??Q?R???????^???Mt?????g0?5/????`v?hN_????[P1?a?'?Mp?????Q9Mv??g????????G???u?????&?"? ?"? ?"? ?"? ??}w?ldZ%|NV^ ?fM_K??qAg????HT??B?}?;??sS??MW?P????$u?????qPYE?I?j#?Hk4??4????h?@?;h2q???f?????#?*?5[ xq?Z%pV?YA????????.?aB9????;????X?O-K???"0R?bz?n?iG;??-"0??=?FBW????0?;j'????????]??????h??M{?D`??????T??zn??Q??>??D???1_k???j??xp?T+}??G?e8?.?"X%???f?J?w????????i???5?8k~ S???V+X?` g???"g?GH?q"2r?k"??????c=O0?G??.Pk?)??f+?u?;?w???S?lk??QOr?i??S?K??N`??????????YXn??2#G?? ?"? ?"? ?"? ?"? ?R?w??F??X??`??3p?2????t?Y?}???H??? ~6\????O??z?????n??????PCv{e?????yP???y?k?*B?]$.??Q?;???Ze????u?]t4??*????????@??`?????[ "??6??^?F?Xz5????Uw???????v???:???????s? `?? Z|u?S[Sw?K?Y???+j'L??R???? ?g? ?[????.GfA4%uT-???l??;N?f??f?Z?Y?`?gH??????????"x???L?6?g"B???~?(??H<?Hkz???!Y??Z?tJ??N???R?|??????%G????{vhj?]?j???? ?o??`?z??5????;??`jW1???F?4??av?rf?gzvz???G?f?_?u?U3??? ?"? ?"? ?"? ?"? ?^????H????HDf??I5??7,??????g?g?gC???Qg8O???AJajFhlh?=!F??[ E?7 ^?EE???]$.???D??a:?_K.?],:?.????6I)??2???\?-D$]V?[??-?????GtV3G??_}?S??D?P?>^m`?>("v??????M???W?qo?V/Bd1??|?-v?x?~1U"j???]a???f>/????;?}????8J`?)???p?/<:C??#|?kV ?!?Mw*???Y?*?E|??????????{${?5??O/HIq"?=?N??x?XEN????#?????)G??N??@???g??AX{$}N??{???~)??????qq????? x ???-?Z>??95??>C>??3F?????'??:??2#G?? ?"? ?"? ?"? ?"? ?2A???7??k?/UY?(????:??y?h????Yuy???V?? 0>?Z]???bm?rB?n???? ???NR5??(^?/4yP?*uW?????i???4??;??q?5?? ??D?[\A???<????z????.?? 4?u ]??K3????|????5?i?? ?[-????????r??? ?"??Koj>?|???Z???u???+b?bX?7e{\??w?Z?????>~V???,5?v??p??????._)?(L????M??????0e??N:u:t??? ({>Bz????#k-??r?????"? y?e???s?????k??f?}????,??N?`?85?1eY?=???? *?)c?|?g?????G????'???U3dF???2ADADADADA?O?? ?U??;?]|I??e|?"?]???????gCq??M ??\?l??J??*?*?iWs?1?[?59?HA?W"P}?\#????lG?^2?g?"??????C??[@??nx???f?????z?LAq ??H1??3?5?)?????j???$?NR?l5?? ?o??6R??J3??k?????J???N??I???"???Oy;j?????Yo????2??/??????@j???(lR? s???A?G?? ????^2,~H9s???j??????)??sd-??`-?r{v|Us??\?? ????W1?.T???yAL??R? ?$>???`????#^?h?In?wlGH???Q?p?n4? ????P????{\~????lz???"h?????e\i???25?E?J????????=??????rM?HI?5$?P??[??:0yM??G?UoH8??`u g? X??????4????_z3[EvV?5?}???%???:??????e6??????2;?Q???? ??????ky???/rRr?B??????e9???|?U9 ?????|?3z??????????kb?????h5?"? ?"? ?"? ?"?8}_???*r?D????h?~?[g??? K???"K/???*?[??gM?*r?;?????\"?%?H?h?"?EdmD\=?X???-?I$,???? ?\??|5?H?k??????&?@?#?7"k'??u? R,"???"X%p???[n6??~??eV ?`???ER???k??????qk)?????????F?"???r???M?JD;?Va"??oEP????????r?T4???r??????]?)En92???-?0???z6??>G??l?????'??????NA]?*DR??jeg?B?O??C)2-"?B?k?E??nXE ?????g0}?l????}?0??5???l???A???T?v??l??C#??hTPG???????l???n???2??S?P???G????r;??W??f?? ?Y3R?`F?s?/?g#?`];O????ud??j?????J??u-3e<?9?n???(DADADAD?/ &??f?!U7???U??*??A?nj?ujX?? ??fq??b?N?????t?H?c???$ %"^A?w?(_M ?K?-?????U1??j`?;??-?2+??`?R????J??k?J??? [????kw@?i?D?(??45?"?Q??ng???S;??-"E??M?(???+b?TH????????x?i????t*??n??~???V"0???????8???f????2?:+???GtZr??f?~?Y??? ?V?????W4??8??pC?]V"P???+@}?wu??????i??`?g?/?? R??????r?T??????????????Q????J?-??r???!>[????i ?j?R??5??5???XK??????????$??a7oo?(B?BK?A??w R??PC?W?5?^???~??F?T ;??S?j?6|?FJz(:???????H|w??9;x?^?S??_Q;arpiSw??? ???n??VC??|??l?Z??";?????|???f???gH8Y?@??????Q??k???jw*q&"t???G!.??H?P8Y?K?2?"q+4???q??AJ/r?|??????)G???????q????Z? ?0?v?f?????7rs?U??A???p????&M?|???G??????3???????~??? 3?kI?Y?[W-sn????Ox?`> );P???@A\qh???[=X??0?'w?t?JD-?;M? ?D???*?Ud\??h????q??<_a3[?q?/X??? ????us?????Tv h?}??"x#??r???m8?~?;??R???1???4!=h?O?????3z6?0?`J?a?8 ?O?:??? ??p6?T?????(????d??????????$??Q?2??|/G???????2[E?&/ ??[Es;?.?????u ?:?? ?,??????>?e?????vn$??OZ?K??GO???r??? "? ?"? ?"? ?"????;~6|???_P? "?]??=N??!5????T+???3???r? Y? ?]?!D??^?;????H?m?????x?:??Dv????^?{g??ne?R???^Y???qUox???Z?????QJ??Y?;C4?//Lh??(?$?rS3????|?B????;?A??M??????T?}????,??y?-l?1L??/??2l?Z???u???+??bT?7e?r????8??g????*??j???i?Q?w??\????(???A?;? ???_????H??,?ZE?SG??y?????????r{6>?H#8#e????&?????{ +s??1??5???????d? ??X????#~??-??G?d??????3?F????[?O?? on?tJ???/?????!?2z????n?}?9;i? R?J?qnu?q???{????/?Q?"? ?"? ?"? ?"????????p???p?q?I??e|??C???fA?CC?y???{.~??????"?? ?I??0Sk?75k??TS}%?7^?-??=?cC?????b?F???;T?r?&?]???z{?a?????M*B?????z??QqG?????_a_K???????? ??D?UY9??>?1\?2??????V>?????Q???V??v?t?n?????????1?HzG?t???7????/Q???~??s???|zq???W?EN??+FJof????X????`)???????????????vW5??3N?s?????????a}??/%=8?a ?5?}??f?w?]?????Y??X?^??????? ???s:?%??????7?????????}R???s#??E???l?????@?9"? ?"? ?"? ?"? ????????rE at b=????Q?S?7N??????;?eye???iE?R????U3??? v????5/??? *b/???u??S????OF?yg3???_??_???????"??N??_??*??Z?r??!?[^=??????kYK??L???C?wa?9?eVs??>Z????9?????E?J??????t???b?i????O??g???SC{=s??.y???i????&??????eOU?????kr?P?????~ ??"????97?!w???\!=JP?k?????j??P?b'????N8i? ??Iag???u?X??b???????(v??2X\??U?S9????Q??r????4u&l:????d?A?M?Y????z???w???jn?&???p?h?$?6?G3? ??????????ik?????~v?0??^?9g?R????xT>?????/P?BV.?dGM? M??s????MR??f????(???.|y ??????S?uX2?~v??*+???X??O??Z?Q?O?@?3{?S??` ??? ???n??dg?????4???w? ?k???#( 5??+??????m?r?K??/?????+g???_r??+?d??/?\?K,?{??????????_??? ???????g?I B? i?<??z?q=?}- vi?I?5??x???"Nz.???gL????o?a???????>?{.Ry?T????????{????Oy????Y?{jV?XU??????n A????h?f?HV?_9?????~??K??"*???i??r?K??????[^Bn}????? ????j?i?^???=Z???_? @? ???"???? @? ?N??????? ??pjL??????&W??????>R?Y}?(??RC??i?Qe?=?V??6[??3??)6?hj.&}??D ??Z~?/??d???d???Q?49??\???5 ?I????????~?{T?5?0M??i??G??&/??n?A???M?xk-?|f???G?v??-?!??Sj]????????kG?J???-????3?i?r ?u~]u?M+}?ls??9+???G?}?H?????l?7).4??Y33-?&T{?-??.????X?Xv.?S????? ??J?T????G????M;L?'??` ?m?????|?rW??C??N?[_?Z??yk?r???gvv_??0?|?R+Z?k??;W??Z?}T;????Y?I??=?Q?z?y?????U3??2????7?.??]?B??GmaE???????B???????a?l?kY? /?? @? ?? ????d?c?^?fW????v??!??rk??j???p?????CU?G??=]L?????)?n???B?Uf-c??^Q????=J??$??[?Cn ?s?,?;?(7??QV????^????~6 @?  @? ?}e?z????s?2j??pe??l?ii??E?a???V??.????~4?Gt[x???5????^?p?2???R??v? ??(?~?VQ?? o??^!?o??>?9??Q+?????? ~?'??8?? @? ???Q?????h??r? )?0x?iR??\w?L???B??'????????~?*?\?4?n??I3N????ygz?G%????I?f??????0?N???<|?A????Vk fvn?Cn?_>j?kv??>????(??0??Q?0?4?????Iy??^?~6 @? ?{???vh?5 @? Mg???wyT?????Qx?G???yT?????Q??) ?=???D?E??T??gS??M?/]:?akz??????}??]???S--j~?G? ????6????!??Z??yT?G?4???\qB6GSIr-??(?"?_???Cg{??0M???/j???L?M???? ?Y??]}???Zq?????5 ?I???????U?????1?G?~cJ?;?F79???n?B??/i??[ki?3;7??Q~??U????;+??a????}????fg??8????I?l@? ?/???h???????G???????>R?? ??i?????7???.?ez?w=/ ???w????T?z????5mMN??@???p4-??3W?d????????56!?:??e?7??Q??yT?G ?L?I;??{??BCo?yT??j???W>?]6&???V,;?DX?Y{?????w????nwjE?N?@???;?b$rq?;=?X?rW???? ??~?Nl|?j?^L??5???G?3?v?_?j?????%8???;W??a????0?F9?g?&??q7??S7?? @? ?{????=??&?n??LT?@?]?????5?:Y1j7;5????y?????y:???Y@????#Os=\???ytq[f;?]z? ?-5????|?V?nM?|? Y???s?he??8?????z??x? @? %~???}???B??????< ???yT?G?.???u.?\???1?4!??j?R?4&?hB??Nao??uP????g]v???7?W??Q????f??????(?~?R???]??s? Y~3?????3?r?|??v&?V???q0Q? @? '?W|???]??j?R???O?X?{? ?(,??? =?4??m??D ??Z{??{#'?[???=????L?CI?5???ao???;?z ??3=??????oM 5+!?s-L??uy/?jB???Ps??????Z??]???C+d?0W?Qn?s?T?{?M???Dg5????  @? ???g?I????E@????ND??P?z?u ?R3???Mo??????G/?????Mj??? @? JTk????ng?A??{|4?6?I:?????mLwvv??\?W?g?????t9??8???b?S??d????N?a4?;w?Zn?3???:??????N?i3??}?l??&/-??????>R?Y}?(??RC??iv?L B? ???r??????????hj.&}S3?v?????m?[?k???Q?lru???4t&??'S??Vr???G?i]???-???]z?????????Q???JB??%8dv?[!????}?2?N??????^? @? Y????}T>??v???????????  @? ~???U???  @? ?j????????'?M?{0B?uQ?WqRs????^?@???n]??l?????QK?(N?h??.???\M ?????8?*?H[??h??0?L^?u??j? ?T{???p|?_?h??p??r? )???N? ??=J,??????@?]a??'?[?;?kv??_?j??Z?4?n??IS.n??1????4????/?L 5+!?s-????????o5 ?j??f??????(?~????????V??????r?r????Co?&??{????  @?~ 5??#@? ???r}$??M~0?i?a4?Kw?Zn?????EW?AhM???6?k?G?M????G?}?P??HQ????4G????&T{?8?3l??Cg{Sl???\L????r3??_=??????????ir????iMk:?????{XI?,??z=jLa??ua?^?;qq????jL3?j?P?Qj???M??NQ????*d?;?????7???%z9QCn??^`6j??Y?Z?????Q?59??????&?u???????i??????H??????+??*/?C?ZL???n?Q???P?[??????Z???????s?,??>?9??Q??kg?{?h?? @? B????Y]>?.???\MS?^^???Qm??ck:M??4?L^?u??j?!??Z??????O?X?{%???E?ARZa????????*??!w?? ?O.?????w??U6??i??{?f?"??#?????4?J???1?"?????ka????{y?V?/????????(??0?|??????}Y!?Q?a????aVi??7?G?????F?l@? ??3}?????????]???T1j????d?~?y??? 5???hS?{?G????F P)?d=???p9?r_?t?????G/?????5??g??? ?????? ?????5??????N??iMk:?????{X?2\9?5?Qc?????Zw4?nr???????E_?\?????gvn?s???Q?^?kv*V????????(7?!7???4?Mqf??'???? '?}??OX??nh??))n??w]|??0z?z^"????v?;????0~?G?k???v??:u??hZ?ug?h?????IMS?k(lB^u?M?>*o?C??????(?:?v?m?&????4??? ?E+?2|p?lLz3B??Xv.??"???_?????Q?59??????&???iw0?H??wzT? ????A?7????*???????yk?r???gv?0?~???(Y?sKp???w????\?G?a??r?7&?*M?!??n4i?n?g @? ,??~????? ,?ykvu ?b?nvj??5M????f????[?;E????g??s?Z??{S6???????]\??. Wc*iB???viL ??F[?.??????:???????z?io?y??357Qs?+?? ?)???FrrV}?W?Zm?V7?t0i???.???????ib/???????????5????`N&??:???? ???5??F???2??QXN$?z?iR?????r3????FN.??9{??_=j?&??N-j?????)w???ygz?GE??W??jVB?f?Z?j'??^?? ?x??????];????5??m??V??a????0?F9?6?????I??j?? @? ??X??=? ?Q?E?????? @? |???????^j?Qh?g= @? 5gA???4???????????????j???i????=?????9???h???f4?????????!?^>??"?7?7R?????  @? ?+,/p???f?????V????5?i?LB?O???????=?_??x4?7?Y???it???????E??\?/q??Q???? ??W?Z??]?W???o???????v???i????v ???~6 @? ??i?????)+????6?H???? ?Q??G?????j7?ikr?E??????i?????E?w&5M]???????????!??Z??yT?G ?L?I??{SP\h?M%M?????h?U?n??IoFh?????-???] ??Pk?kv??_=j??Z????$P{2???\??}U?G?+m??? ?;????*???????[?/?k}T>?k_(x???V?f?????BV??????(??0?g?&??q7??Q7?? @? ??7 ??+?X??6??Q{?w8????4La8????l/?\r-??(5/?>?4???2?????ARZ???&??{?X:Ss5w??????O.??w??????~?*;??i??{??\???c????i?G_??jVB?f?Z6M??u}/?j??rI?nE3;7??Q~??U????;??%7su?F9??Y????4M????? @? |????????k 7???? @? ??3U??}V:]??qmF??? sn?C?3 {S??n???~6 @? z>|t??\??dP??*??q?????w??Y?n?F?]YPm"????v?;????/??uM[??.z???=M+M?/W?h????????5??u??7??????&??h?>cU??"%Sg?N????????f??? ??P?Q??8 wp?lLz3Bcc???NEd? ?/?*?R??????&W7?t0 ??L??)??AW????a?]ig Ar8=?Nl|?j?^L?????>*???}!r???QK?h??]??\!+jiT?Q?0? gU&??q7??v??~6 @? ??$??;??f??Psu"????~?w[?#9?g?%?f????? ?????;X????Yh?\?!w?59??\k5???#E??w?U3???iM???n??J?<8rW??????w??h?nwj??r?j?XD???Ps?G????7i?u??? ??[????7i^??uP???f??P@???~vf??r?_>jK???]???[? Y??HQ?(??a??lo??i}c?~6 @? ?+????"??? @? 8?'??Wv?U^??"???cU???qs?f???]9?????*?g???s? Y>?5}ts?s?N???? ??4&?g @? ????~????>?'??t>???i8????l+?\ B? ????5??F???Jd??9??)?????q?I?os?U2QC? %8?\n?[?k???Q?lru?<~??&?8ET?G?O???i? ??c&E???6;??T;Y?????!^,[?[?)???Q?a~??U???o?p1un??kve6?} @? ??wlR???7?G??.?%W?i????l? ?????{?t0)f????yg?s??G???K?&V?j?2?T?X??G7???U???ks? ?T?o??;??S?Y???/P???}??Nxh? ?b?z?@?fU??T???Ss????M?4? ?w???~?,B??b-?5P? @? ?? @? ?v?????}?????gx??Aef @? 5oN?+??i?jM???fp%??]x?t0?nBl????fg?&?pv;??e??#??Z??T?a????45?????????4t???g??n?Y?@Y?????M???y??9?8??&?????l?L???&??(??h9!7 ?3?.?~0?????!7Se?;??????r?D?I%????M???6&>????N???6?K?|f??????? 5??Cg{??v8??'f???v?? BX?B?3M7???iR???????L???(o?Zj?????Z???? ??A?5?????Ps???V??I??+d???];??  @? ?cw???Wl??!????{3DQ\?$ S?=r??)???&?z=??IO8?MO???D?=??5??{]I[.??]j????ksjQ??(? ?M[???1??? ?,?_?????V)?8?????L????B?l??? ??(????? @? ????jsm????.!,G??i?P?f?"n:?d\Yn???LM-?n????b?l???G>t???agR?????-?X???f?r?n?S?/?$??t=?m?????"?? |????s?&5?????????I?????79?7?? ?^HG??~?/- @? 5?=???M?f?~????b???V??A?e????DE?+z?@K???^D??V?1??P??S>Qg?(???3??s????f????}???????Z???/?\?? ??(?Ja?????^}?U???????e?V??A???3@? Y??? ??Q??~?/- @? ?z at d????o??????@????i?? r??6lN??7??????]?<*5?,??w??h?5c??d??5Py?l????^?? ?N?M>?6q)??'??1??+!???? >???r7/??5??yts???L??7?b?W?@?^??L_??7y??x{I?M??QS'dV?l 2&5/"{un????5?7j??"g???,?? ?26?5?W????  @? ?N??t??V?g+??L+}????a?=QCn??O??J,?P?dd???????ei]M9E?b?S?D?*5?b??$?mZ???*?8P4??q,????hQ??????^F???O?6?)?9??TZ?&j?]Rs-X?????[Qc?l???<?????X??}?V?\??r'???+d4??_?f?  @? ?????T?????p?,??a??}czZ??eU??'? Z?hj?E???AV????iGOO?????\P?"9????Y?r????H??;??*???6,?]????;???mB??}? ?&??X?U?????{?x?C???w???mX?_??9?????????%?0???v.o?3?X??C?*????rX?}?I????_?5ai?e_}T???H???#/f??{???GFm?Z???E??R1?w???d??_?f? @? ???J&R??M???'K??????'?J???g=????^??U????.O? ?i??8x^????Y???i??8 |???M??%???b????V??[Rj???? ????I???x???--?ZdA%??w??VH????f?r2 @? ?????W?k??QiQ???J??0?_?MaL???]???t0????????x1??~?????????S? +???o?L?hJ???b??Ex"3?=?;???IEu??lzB?3?}g????9????_??????f???yT;Qk??7-??}?5^???h?>9???bIM?"/;???V?X?[??Z??u??????J?m?G??V?\??r'?Z? ?????? @? P???Y?,=!7??>J??v??T?????????l*99??f??3|sws?f????Qf??&j???[???I????g?? ?}?????!7SsM?zT??jIZ9?Z??Wq8.w???v?r?E?-??K????????w??5@?  @? ?)zt2??n?Y?@Y?????????????????ilL????L?L?;l9??? _7?&5|8???i???N?M>?6qMA3e??????9?????????l*-x?tT??P=?e????m?S? N=????????0?F9?4?????'???gy????V?????9??\{3?y$?jW??N????7s?z??_?G @? ?????-??9????????L??)|?fy.?.??L??)??Eq?9?Qy??m{1??o<5F??%???4,;55 s7?F?-y?@e3[?f?8??J?g???'s?i:Y?<\Q??i-???B??A????f~?G???l????S_??H?zTn??G @? q:?te?c?wn???????z3?T6?*y,?K3??o?LY?? ???????b??&?Hw??]????????l??Gj??r?U?????+U???+?,???*Iw??b? K?K?hR?????nw&u????????6?hm?q?.????x0?:?#? ??[S ?????bJO(or?H??Mn?? ?r???p;??I0t??wb?n.7@? r*a5???4u&?h?P=?I?c??* 5??????|??^?=????~0?Nj??? ????i:??v2???ls???=x??O?????~?Q?vLi.t??y???p??u?]5?????vN- 5?6??a. ??[?????{?gG??????@? ??o:?? r?5M????nc*???~??=J??7????sa??wu7?n??)=!i????8????Ta???s?f] ????G?]?$???zj*G????m???? LY???a??W?7[?????r4?2?I? @? ps'???~?G??????l???&(8???Vg?z??? ????=?t??B?l??k?ZL??????jV?J?^D?c?l??v???7y???d*i?Zt=1?&W?]^?l??l?7?f?;3?!7????%???????>9???G? @?  @? ???4@? ??3}?G?U???=z ?d^?Q.h?z??}??e? ??y??Q???\??Mv???}%h?~?s???iy?qkr?Y)]?????|>??E???3?*?\t?f??s????????_?i???}?sqe=? ?:5??!???a??r??r??M?[??;?[??Q???I?"kF?8?? ?{1=?3F}?%k????u???%E??Zd?iZ?AG5?J?V9???v????[? ???}??vJNOP?Y??5ut??=???W?g??S??e*x?"?[ ???l?c??^?????~? S&??H\)????WM??\?]F$T??k?????3??????r??t??????c???#!???????fi?\???^koJ??9)/y??\?C???????ilM?Tm?????????????????????? ??(<?/Y?r?N??;?Z??? ?`z?x4)?6????5 ?+< u*%WE????^??}??2?=>}???F?=A?l@? ?jmR??c?kz??Ge+?????c?:?yt?n//???zg?6WR!????????6z??}y??w??iq??Z??9??4_?Bi??/???????~i???H??? ?`?=??`?GjO???f5!???k????K:U%0r?T|???? ????:eY?.!~?J?T?.???E )????]vs???-G?N]???p???d?N|?l????W?-?? L.#???(??N?H ?a???O??? ??YN???&??)?IV???/E??^?\kV??,#v26??H?????????JpV-???#???_? =??j?j??v????QVQ??X]??)?~?u??q?_v???} ?v?????!l?[??f!9k??Kq?2?A?0?2~6??m?0??P?D???9??K?B?h?p??b%?f??\???'3?5??@???Kky?}[!Z???nD?? ap7???K??[LC?)k[?g?g??A??Q???????b,?^?~f?l?"? ?"? ?"? ?"? ?J?R??-??lu???c?? ???2??A?Ec?x?????T?4RT!??V?"+???].&?$???!SDA?????e?????Z??yo)"? ?"? ?"? ?"? ?"? ?"?tJ???ECS????M+@??etz????h?/ !I??=???aSjr?AR??(??5?kLA?b /.uH?[?>EP? o=?O0kDADADADADA????g?9k A?7???+?3??Tt1u???Rtx????,?`?"????R??G???J~?=?x#DADADADADA????N?ADADADADADADADA?=????Y#? ?"? ?"? ?"? ?"? ?"? ?"? ?"? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(?????{?????Ha>T??????N???? ??A??j ???u?u??Rd????f??T???HADADADADADAt_??{???2???? ?L??K?ej>H????2uY_t?R? T????hg!? ?"? ?"? ?"? ?"? ?"??Ot???)?15?g????nu??v'?8??~O??VU???+:?R???]Q?Za0?,D???!x??)lZ?????????n?}Q?????87?R??+??B???mR??4.[m?6H-??*\+ at 05/?????(Jj?????h?????5y? 2??P??e?)W ? g??8????<~vB???????ajV?????0&?U*??????YN?k??z????GH???v?????t??"k???b%K??5?&h!? ?"? ?"? ?"? ?"? ?"??Ot???i ,?[??S?+Y? RW??? 6??@Tmf??`?2??X?2E9 ?j# #?????Bx~w(??*j?????,???????? l9?????;3Q4???6?fZ?4qC8QBc??U?S?J$LQ( goxT????????B?Z??;??????W?zd??T?L2~vjW0AV_???g????u????* ??>#?????Sz?DADADADADAD??=?????a 0p???H???'1???iWT ??N???TtKtXH???wj??????E??`???gK3\??3Q??u?????????S???S3G?`????iO??Y_????2????-G?>E(`D??%??QVF??pL?3U?B? ??[6,??@^t??D-;?=??,??????}????G?????* ??S6?]?Q?? "? ?"? ?"? ?"? ?"? ?"??@?9~?!??a???@{??? #^,?.??[??%3??????????[??dH??IlJ???????l$N?,?"?,,????7? D? |?Z ????????s?L4& V\j??f?????K,?B??>?N?*)??ajV?? ?L??-????'?? ??Z??l&?/?*?Mj+?????j???k??? ??e??Q.F?sV?;x??,????\.T?L?GH+??"???Z??N?????S?J]x??? FRR?l?L?:>E???Pe????p???2?E"? ?"? ?"? ?"? ?"? ?"?S=???* ?)TK?v|??5???XxWa?H???;???%??V?I?:.??1B??;? :???E"? ?"? ?"? ?"? ?"? ?"??R??=g?????????)"? ?N ???b???>r?"? ?"? ?"? ?"? ?"? ?"??{rJ????5?N?1x???i?? ?:?@??=?DADADADADADA????g?9kDADADADADADADA???DADADADADADADA%??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??D?gDADADADADADADA?&??]'???t&j??=?@:#?????c?? ?"N#EDA???i???jjj?=?=-P????? ?b??G???Y???' b?? ??Y~????? ?"? ?"? ?z??'?{8]???tg???{S?a_t[?F???M;S??T??y??? ????K? ?LQ2? ?G?H?SE??'???A?N???????? ??'h+4????[?z at Po :????[,???2T?p?RM??Y#?9???H?U?ADADAD??z?????y$s?????q??iuq?] E?#??X4??Fe?????3??EG??SU?I??|??I?k9??L?-??~&7UA?;??v???????P?'Zp9/ ?????r??E'm?%????L?PF??Z ??L??,??? ?? 8??(????w????> ??h?????????-???????JpV-?v???o?r?x???%???\????_"?[?ejV?<??5SM.#?????R??U?.?+?????????>5z?$?~???0g??Y/`?o#???K-Td?p??]??N+4?em???b=|?=??~??)*?,X?????M/h??PT?2????~z} ?0f[O????6??[$???5M??~???^?s??????KC?? ???^??iu^k???Z'p?+?????J???W>5A???>??? & T?J?"-????g??Z?LG???,???S?rlu ?;E?W????????2????V?P?????r*D???C?_F:?o?v??4X?b?3_'?^?7+??@T???[\+q6H?sj???R????K? ?8?1,??O???"]??a?/g????B???j??`2t?KiG!??}mKW????Z?**???8??@???<?3????R??7+?e??f{???7`rY=??v?'?d???\??'4?????.O?f??????$??5|?eo?^?Sd?C???e??F???]k?\jW???Z??'^???? ,????4?$a?n?F+> ?EVi$dA#a??e???M?[R_F&(?$?"? ?"? ?"????>????V????uq?w???oZu??n?? ?w??Y??~?@? ??v?O?D'G???9 j!????^MC??S V]??.5??n????^?"E~z??Z??.?(??0?_UL??0n??e)??"E??f???Z????zi???b?9e???vy?$?E?Wi??C????rq ??????k?]!*E?????p?w????z?B??.I8d?L?i?5???YNg=9???}?????~??????hSs?????A?=?@ADADA??????????E'??????Z???????!?)?E??0???r-?sR|jSs???o5?3?.> ??ty?`????????f8>4Hk?5??'fV????5?Ep??L?H?c'????????????-j_C??N?}-u???c?f3*k?`?;?!??}1????S????????w???%?bv3?? ???n=? ??A)Q????]??]?g{ImG?e?:?c??n?Z?>z???cJ?G?D,??p=i>5o??????a/?? ?-[8?-?j?V???????R???????>x?ek???(???V49?M???%?r???v?.f???3??g??Qr??=??EX1};=?r *???H??%05???? '???h????/?R?pV?Hm?-??g?B(s??P?:???r??w??j?O?7??D????(:?C}??5?XP?k@??" =??5?X????????Q;??+E?}?K?S??s??f\?vI?jx????pc??H??\5????k ADADADADADP?0~???aOT??g?W/?i?#?U)?F*03?j?g?1?n??y??Qr??s???5???k?D???D??=1???]vEGsQ: ??X4?`??G(rT?4?\?C??,X9pj????3????c????h?E?? I????????/Zvj???? }-?)RH??g'?(??|?.d?Y?????t?yt?5DADADADADA??????^???hJ???? ????zf??nIQ???? m???}??V???uK4?+ ,?]u}??z?nX??'???)J?????w?R?i???q?`ih?]?Da??? f?????. ???Y??????{!W??0~v)@????????????B?-?2???M?.?/?f*?r}??p???????????S??????`]/I?S$LP?o???b?;W??>f???|?????jI??ADADADADAD??@???+f4uR?d3Qo??K"W?m? `??????y???(B?N?f??? v,o?T?R??uS V?pV?Hm?-??g?B(S??D?:?MF? lj]????????r$???Z?'?????d\?N??07B{o??H?P??;?\???7?Y?b5r?"? ?"? ?"? ?"? ?"? ?N???DAGi???z-W?6??P???(??k???l!}2????E3???>?O????d?6P??EO#EDADADADADA? b?l?"??Sa_??LT????]??3??O??G????? ?"? ?"? ?"? ?"? ?"??1~6ADA=M?h????z?????? ?"? ?"? ?"? ?"? ?"??'b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ????? "? ?"? ?"? ?"? ?"? ?"? ?"? ?J1~v? G???? Z?T??D?"??B#@?8?DAS??"??5?=?O#EO ????)"????L??O#E?d}???=?{?[?? A3?~O?-????51?Dg?=??,[@??h?????,$?,Ss2(U??e4?z?X?????AR??@??z?U?R???S?z????"H?c???C}C}}???25????\K?? ?"H???h'???zlv?????^?`?]?x?=?????????.'?n??jU??S'#Q?????g????fyol??+??Bt1? D3????*'n??DADADA? ???g??<_?v????????f?5??Ag??`m??Xt)??}?gk\j????M?.?T_F05c? m2??.???Dt)z??S?Az???????xt?=1P??}?}??jj??=??&?1??? ??ztv????JQ??????p ???Q????E{C??H? W8?E?????)?Q_t1]?D?t,??ES?Y??]f??Q????{?*:G>?OU5??=?????_??t?)B?|?.3??\4????NO?r!?K?a??B9?2?N??K?z??]!?n&^???`8?Daju?,??? ^??]#????????:?????/TD:?E????-e?b???p]?1?????s??,h??D|%tD1?. :m??h?S?~Gt?2?D?J}5=Z??iCuVK5??eW?????Z1??W?uW???4??(&? ?f??}??{?%?x??3^??I???????Aj;?i?R?(??N?H????Y?(P??P??5#?y[?:?????3???Xu ???c.??1??l?4;????\??09b N???sQ?-A?~!???????RN?N?kV ???????ij>?:L vU? |??w???x9Nk???F??4V{??~??y??Dt8u?[G??Q???vT_F?????`q?/L???`???q?s??Q?k8????D+???G ?T?C?fe??ZvEa???*?Q.???,;??Z ?,?e???8? ?[????u$?D7???,X9??5X?:]Q??O????_???#H?x???????=3?Z?*??:??;?YN? ??? )J55'????Y??:???fg- ???O?_z#Q??????\??6?:?????n??6?c???TI?????e[|???B?fDjB????? ?y????!5???P?4??!????"? ?"? ?"????>???????? E????icfk??ajY? ?A?]^?e?v????V???#?? ???????O????i?????????A?Y??q?3???5y?5?3?M?? ???Z??[? T?Ao?? ????`???;U?????)J?5?????l]?D????[{t?a ~??d?i????Q??u???T?\??j??6?"? ?"? ?"?8 ????9~v???-*E?????R}?m????25??#??b?????,????4??Q?B??? V]??0E?M??? E?r??B\? wL??T????.u$???o?????oXF~>?6?e????e???R???q?Z????o?07?"??D?u???e7????????k??1g??\g? ??iG?4????&.??????9??????Y?#:P?1????&E?QQF? ,?????S??"b"??\N??/#?'???`??????????`???7??Z??I????R????"?Y??????gA?=~??j5T+???sjCu??l??Yw?`Rn??[uAD ????Ep??=w?x?]?(Z6n??Z?n9?E??????OMEr??v?d?:$??????M?:4??JR????[????T?\??#?zj? ?"? ?"? ?jb??? ???Xd?k??)?/?9???X??0??U,.?v????T??H??u??-??=l?l?:u??M??i8P| ?s??D ?R???????b, ?H??oj6??A?"1R A??/??????Q##b??? -?? ???f:??i??aW???|???????Z?z????,;+????????? `O!?A????O??_G O??Jx3ZDADAD??AO?~6Au?_?N?2g????S? ?,X98??>?)????? jVFVW?JQLW??"?????Ot?O5aB?>??~? ?ADADADA?"????&?N?k?Z?I|Y???1Rtz?'SFp@@???T??r????,L???(?p?2: ?U?Q??jNNQ??x?>x?)(??>E?Cc??@?4R?@??Lt65A1c??R?4RwDw?-EG %?eS?))?YN?e>E??????ah8??Z?y_t??)E?vw?2?d?e&?j???T?=??(?!?9E ???@R????*$??.???L??)? 3??D?:Q??be4?JQYbj- ?*????K-?P???cp?$?G?0 [RT?'????/?? c????V?????jf? ?y?):Q?A[??A1f????I?B4?Y?eC???????S]72\?N3?-?=? ?O}(P??i?)*???)??Bt8=?y??bEJ,??SU???eu??SIM??k??????B????Y?Z?S???hwy????(O??lo)"? ?"? ?"? ?"? ?z ???/?i_t9???h*Z1?5?????Y?????*8??d?\?lFt?q?6?,t?D???!Q?1c??2?*?3????b(????s6?*?T?#H??'mQ??,??p??f??+?,;+?^?-~??lg?V?Qu??t?}?????E?O??s?e?UG???A?r:??b?e??????P???????;=Qg%??;??*1?:L?m?B?`)[? ????f???TK{?ZQF? ??????D?o?aS?2W E?Al??7fg=??@??H??"E????9???+???[,ED??????:ft???)??T?xK???wv?EG??SU)XE?'?f{C?H;????@j???E(??QjCuVK???ML_?/T?L?[v?Scp?????GV?w?C?#HJ?o6f??,X? ?zY??`???j(??u?/?DADADADA'b???A??(f?:??H???d0????(??BO?????Ng?3?8?????? Y??1o????????$`?????(?w? ???c?Np?LP??b3?]Y???N???jxAj??-~???????i?.???|??z5?,Fc???qO?FJJ??\?C??43???t??:?l?X??"+??Y?~H?? [v?G@??????Dz )?,9??Alj=??j?U?W????lY???~? ?"???S??r?s?? ??u???\??????R?`???)?p ?QN?P+??y???\?? w? }}?0??o???p??Ob? 2jf??c?.??j???P??[??????1???n{??l?h??O?O?YvV??d?a???krO[B??? ???pN?M#?Q ;C8-?9i???Z?T`??R?o?:|???\??wi??f?~e?|(?5??{#?????tv??/??>???Kuf?HQ65S?=?k9?1?0?B?B?b?$???????z?*l5u}kR??15??"?` ??u??(T?KF????^k[$y??????!???U??U;?????%y??F???????P?z?1;?e?7?????^?,T?@???jA???U??5?G?QCADADADA?????3???h??? V)???H??e??a?AxX?}A?d????1o?*???z?H????????EDR???\'?J???l? ?0????q??a????H??{???? wj??u???j?2??\????@?Q?N?_Q[C?V???g?T???????a!^??????M???????RHQ&????1]z??F'???r???0????j?h?"D?^ND??YB hswF,??*6I?r?=?Z({_Qj?? ???Re?? ??H????I???pla????"?Xu45A#?qG??)J J??F???? J?? ?"? ?"? ?"? ?"??Ot??????\????/:??6????t??4???#?e??i?J????????i?(?P ?0??)J55oKQ???Pk??hL???????&c??h??^??????d?N-?????(??.3Q_??d?e[4???Fa?????M???ejN?-E???H???PAU84??+:?????_!?????.)?$ 444?Dg?????z??_?H???0B??:'XF' ?i?? ?"? ?"? ?"? ?"??A????U??l!?K?????;???Nh? ???T???? ???????=????|?}-?????%??GZ???Xt'??RtJ?f?h??f?q????p.?%E??????4?/E??f?????z????c2,?n??l?-???.?????N)J?(??\!?N?`p??E+?9??G?+6f7[????dG?X??b?J??G? ???I????????5_ j??J? ???Z?P?~?ix??????(,?Z???R;'J #=? ?Z??? +9?2??`??2?NW?? ???h}???:j??H?w=~??[6^?????z???_$d???+?? ?S?v??I8???\?6?S?^#? ?"? ?"? ?"? ?:a???gC?kb???kx?{$??????&?*???9????????N^g?`?P CG??????{?X?W??w+??p?Z>????H'F??q,G?NN????S?+?H?? ??3???? M????b5???i?g??V??=?E?????5?e???i?MguNH??????T)???-???S%a?H|gNiG?tf?8.?QYS???{? ?s?%?D??4??j??Z6?}?5_ ??FQ????z??????4?????duN?p\???????L?????;5??l??8??@K ??????|o?X????nY??Paiv?????????????-??qj?? ???"?????1?$ ?F?^.???&B??1?T??X?P_ 0f????UW~N4???"DADADADA':^?l?????9?L???H4? ` @????? .??-F*R? |?q? +/??1????A|%LD??V%$?l?Ss???a???????.?A4?(Y?^\>?S?PF1?fK?q?.?????]$ ?@??oj?????m?b4???!G`?,o?1????oE?b???1?, ?Fb;o?(?????l/dG????????Z?M???gC]?k?-?!?f?,5?.??\fj?? ??x?????g?T??? ?????_?%;???g?T??? ?~?/???0E??(?2~Cn?ye?'?U??A????gmCuVK?r;m?S-U?n?i?????f?`??/?????R;'$?e??xdIT?w?{??a?H??????!?KD5&;(;o?)?$Ju+t~u??9Xa???-?? S)?;~H5A????`iF?kU??9!!5???y?o pY??*?????Ts?i???gxJcF??Sm??,?` Z?[7???Ec??4??r\ ?'???j???-y(???????f9?q?????\ ????`I??]????1/???m?(??]??Cc\O??????J????#?t?G?????b9v!? ?"? ?"? ?"? ?:1???g???\`VN'?+???G?N"c??u?-??T;{???Il??}???0A??Zn?)??K?f??D??:???d??|??61 ?4~?J?cg????&#Q???W)?\YN??JpV-`;??@????\ZK?(??"? ?"? ?"? ?"? ?Nt??}lb?4???Y>?z?=?4?kGgR??W?}EU?SQ? ????lj???B7pp?0[?|/ ?????????????????s??????x)F??c????A? ?????r9v =???E4k"?!?6Tg??Pb???le?0?CQ?S????P???????Z ??????@;V1E?????>Y?E?b?>d????????m\; ;k?FNd:5 ?)z ?????"\@G??????)??f)"? ?"? ?"? ?"? ?"h9?????ADADA5??v? ??d?-?Q?????DADADADADADADA? ????aj?nI?T??Uc????Ht????*??h?#m????D???^??cL??F??A? ? ??R??f?i??zP?S????\??l?V?b??`*?S?R?a?%?? ??>???? E??p8??.???L4 ??DADADADAD?????????H?-fM?R??????h????G?P??I???g*??h}??p???M??L???/ZF ??????/?zcQ????l1 ??9N3Q?\?????DC?X+?+PN?T??h??D??U??va5 ????U?]??????ZvV??Y??=U/j??urh??L4???Zv??7?i?wD?s?e&j???,?t7^??I?y??p$LmGM?#?rOpVW?^|????`???]'???\15?k?)2?Y????m????C?p?fK????????3??,#o?5??!?Zj?Yg=?,XRX??CX;W(??Jp?C*?3??b 5.?o?zH???I?G?QCADADADAD?1@????????4?f? J?'???/g?0`3nXE???M????{??,%L?0??Pfg???0?0j?n?>????S???T??#?'?`?5 ????3k??!???j?)??Q?pbT?%e???d!????ib????????2????EI?????y?e????t???e?TH??Y????P5?vx&??????????w?Z-???m?????@????}????%Z ???ouY? ??8???95???z'x3]A-;??So?p???^4P?o)1 ??E?fz5?t?&"t NiG!???(~0? ???u?????????kE???ti?KX?1??0???-?)HA??W??D4D?????E???N?LE?D??T????`??!-?[E??y???????+?u +??J ; ??c"???? I C???%kE????%?e?????,;+?V????x???G?-? ??:?Yw?n?t?T?Ex??k?Y??;??/_?3Q??? )jf; {???R??(fH?*?b??R??????5A? cR?0~vB??Y ?X V;?E???a?q?eH?U????hK????!M{\???F;??????Z?? ??pMDLC-??D???}???g??5?Z#?*E?4b?eHx???u????ADADADADA?t????L??~??D??vi{O7U?05?&?Ss8??V???]?gc?g??h(?>p?'!Z7f????*?b?n)NM?KL?g*@$? ??s????????,)?k?e)??????^?~?T-??I????????:?|???jIP???h?'??"?????6???h??0|[+?Voj????}=?is?yS\?9???m??Q???kI?]??u?_????X ?)ze?Sv!E??l??YwH!? +f?y??J!?????)?QL; ?????5??Z?K??I???"*\???ZY?RF ??ih??IQ????R[6?D?????+????gc?]??yw????Pol1??G??E??!??k q??9?vT??8k| %!~v??]?u?g????? ??k?Rd=?+?*?-??U??1w,Z? ?sQ?ob????T V%X#?3?T}?D ???????e??G?-BADADADAD?c;~63c $VW3?7 at . ??? em?0Q >'l????? ?.?3{???.?? I??R?+??0?&\L??????}?$?????n4 g? ?@??j??co??9???,;+???M?P?' p??V?ug?!,??29?????.?&/:V??q???Q?(L]?xt???_???Q ???Cj???qH??????pqL_KMQ???a??????Z? ???(~???????6??:2??R%|????q???-?~?j?,?E?f?k?b?? ?z*XY??????? ?eT.R+???p?G ??????+G???G?QCADADADAD?1@? O???b6Y????d6-&??l???~???Yw1????Eo???]7?M???x:/???t???p:?/?????yK???d??@j??0??????!?e}|????????p@]???X??)?{??DADADADA??????75wf?b8^N???x>?/z??t???G???3nO??u?????d9?????|2L????7?G.??|??=,???K"| q?g?SD??@|???????????????????@??|???z???d???QAOfq?HW???hS?D3???d.??f????q?N|>??????T???,?9E?b?????G????k?bY?m?>?u???m??(V???6???"K?]k??????j\^???F8tD??/:?DS?;??(??????????~ c?}??di>?2"? ?"? ?"? ?"? ?j :Z???R??G$k?D??????????????G??YOT'??7????[?g?3geSs'?-?;>?A????-??????Vir??T???g??p?????r??=??;?????e??Z???????y]?????E??hx??gfAE#.????x.???9p?Y%????A??@t?-{B!?c?"]A?8?U???????+??9/0Qx??s??=EzC??B?V?SU?H('O?h1E?x??~G????,V?,???|? /???? ?\0?h?8?J?*&.~_?x???????)aMV???W.T+ V?B????? {????e{????.??`[?-e??h???b,Z???@G8SR?smY ?? ej??v'?8M]? Qk??-U?? ??S?k?B??nU?"?]X?5???????h(?rI%??Yy???#???3Q????{???Zv??4!? 3B????U?k?Y???l???(????? ?pAj;???????????:??(fH?*?Y???u?{Y??G?d_??%?Kn?eS3,???`??E??j???|Jol[j A1?^:Q ?2? ?vt???\k?S!??????? ??!??+7*?Y?` ?????? VK?uy?#Z[SQeTHc?s ???#??u? lDADADAD??;~6????`??/p!k ?f??Y?D1UY ??x?p?(d-?#f ??? ??'???j?)BQ?pbT???,X???????1Y0A?T???l,?=?T1c?!??%???K3???[c???=)?05??$|?}??f&1a?`U??M?C[?;\g^???m??N??(?P?Y??5????Y?s?e?0KR?"?YvV?a??w??H?OWD5[70???#$???*?}-???????Jfz???`MD????B\3?Q?`b???H8????J???R?TH\?/I?x?Omd??JQ?????Z??X#C,???2Voh???f???h?:T??j??kDu???E??s,C?[eh? A1Y?$???wjv??&?G;??iO?'p?i??`????Ss( ??1N? ??????DADADADA????g?A??? ??2??q9L???N?t07 ?]&.uf??@?4?S?l???a?????j??[?b????U?!?)?QW??u?C?F?p?f?#_.???u??W????*u?=?Z! ?k??n? ??!?D?NiG!.j< $j??/?_??N|???J????TH???0???!59E ?r?R[vy?????c???P?????????0??? ?:???B???~!?Ro:5??A?k?i???g?* m??(?7??(??] .uH?????(????+W?x?{C>???Q??G????22r?i?[??&Z^?{??8?[-ADADADADP%?????f??H??f~????)??C? ???P??K?T:??-D???j?jX?aA?1?Z???N???YC?vl?:????N???ra?,?HN?q}???? q?P?p????h???.??M?i?????? ?ll )~?p?P?~?a?i?8???a|B wj?c_S3???,??ys?0f???3??t????YuQ?V}??g?6 ? ??????PR?g??????????e?(??! }-9E???z?'??????Q?K? ???Yx??????a?Ss?S$|????Z?}???^??8 ???0}M%??R ??)k"t??:?v???? T )?j??kDu???p?????J??"????5??5HL%???.95'?Q?s-?????Utt?????KK?{v??y?%? ?"? ?"? ?"? ?2????!j ???s?_??"??Be??{p?'??M??j???&?????,Ia?4??b^ ?r?XK?????2??)l??qf? ??jq???PB?B;?$&j??Z?/X 0????6& ?_6b?????f??zSP?gf!,??9?D?????^?[?T???98\???17\L????????5?!?va5 ?n?8????z?=?~??????<[Y???h ??b;ap?T?l??u??B?!?? 'fs?hq?h???S??q9ll(q?(????x?Q???R??t{b?I????Q??????"?Q??gy???eS3?:?>\???@&h?!??v??B?????P?1???ZC4a??G???????\??k c??? ??-?????c??s???U ??kH-?????1???|-?r$??????\+\\??v??SF>E?Y%*~?N???za??c?????R?? ?;?[-ADADADADP??F???d??@j??0?????Wg?????`?j??iu???c???hw?A-??c??? X!R???)J?6T??????)b;zx?S???d}C}D???d*?(U??U .uH?[?*?T?k e?????"?"? ?"? ?"? ?"? ?B9????????}Q?$???!?_??SD??@>?-???????K2H7;?n??|??rJ?}<????G???,??T???QAOf?RSDADADADADP('??Y#? ?v?(???!d??"?N ??Zj(1 ?Y-55u?QFDADADADADADA=u?)????U???j{?jHo*:??n+??h??dk???e??cg???c??!(??@aK??.5?GZFDADADADADADA=q?)??? Dc???Q??yho)J?'`??7??x?????=?5DADADADADADA}?c??FL??!???=??????^|E????h??\?#??X4??6,lH???E??MD?h*:???NO?*?}??"Ey??:??*s?X?"Nsh'E ?;????2u??h6?(?????-?????h!???f??????*??f5Tg??????&?h??j?)?us?r1F??L???]n??.??E'm?%t,????f?8??u???k?-??????{?c6ADADADADADAD???N)~6???c?d'? Pg"????[???????v1?E]{&?ME?Q??"TC??mDa?R?i?.????(L????h,ZNQ?_v9 V???4?(f?f/?k"Rjru??h??<"S??????f7? ?Y?aOT?3?`XF?j>:]????W-??cQ?M?]a???G1fDADADADADADA????g?????V?S?Pt???D? 5??S???????W???L4?u<?l? ???K???y?f????$?hZ ?Y-5??nIEL?j?_??P jr,??????Ow ?e?-?? ??-????,X??}-jM??RS????v?????&????tw$Z R??D??????(?r??g??hT??v??j>???h?e??hXE?+??,?????Yh?[??2?Dg?h: ?F?cQ??S9H?(??*Ee???x)J?fa?):?x?????z)? d?G??1?5K,Ks???u~zo)?hK????????????|(???????@??S?AQa??E;?y?M????????V????u??(?~?`????????s?}?:E?T_#? ?"? ?"? ?zt?O6~?eiv????':??????=?y[fjL=?n_?????Y{?v????c?q?uE1???????"Y[??5?H?[gw ?,?e&:?@YOT'??7?????????yW65w2Q???j?? ??????/?zcQ????l1 ??9N3Q?\?????DC?X+???@?-:?eO(?q?Z?=A???U )?{V????6???D?Y_??????E;??i?=UU????r???D??&????Rd? ?Y@??? ?Z6???>E??l????\????zQ???C?CS?f?1?l????P??N#??#:??.3Q???f???BP?;?n??H?????G*????????2?R?+??S?Nz?7j?b~6J???#?? ;a??_w??L?k?? x???YPf? 0Qa?/7??V?c?,XR?2????/????9???9??<?? k?>??25?O?Q????.?????o?:m^Hf?}M[??T?????,??.P???(???KC?@YTv|5[YvV?}??p*?????R_?? ?u??#??C?P?hA?}????ge????v???JDD???(?A????]?? ?_??H8??)J??:?ZY6{Y??G?'?-!E???R ?li??c]P0.?-???b?n?l?1?????b??t&??e??5F;:d_K?5???????K ???,? ??c?\?t+???x??%?P????!-??S$U??k>]1??/]?9???~??tX??U?????????V8U?F ????? 1}??????$VCu???%?}?-\?p??wH+ O??2 ?}??E~??jx?????r?B??"???'?A?!p??e???(r81???2r?b??Z?G?4? ??E??t?2?WlG:?I???????$???PK ?1???? ??{??l??????T??(?P?t??j???Bj??[]????%?.?yN????N???????U??7h8B??? ??????c? %?=;????{?%U)?.??z??????????Y??}?}?&A?cvj??>-l?z??????"? ?"? ?"? ??:^?l6??W???>?? ????OO{7Xo'???? ??z????w?? s??~?x?'\??R 6&?1?b1X9??=?f?=@??T?uU???8?Rk?q~H???????mGQ}-????B?4??4?ih??3??JpV-XC?5??R???9lx? MH? ??k?'?? ??FUx??'??8?????Jh??*?????W???xAI????? ?!?Z?pq?w????6!E?6?k[?????????-;???Y???????,DADAD?? ? S?F+???Y???@0?????P?}' OB?n|}???????Oz,qvjR\bJ~6?k??a??????g??G????lZE????4???nX ??,??>,?rU???.e?,l?&*??j9?Y7H!S?j?,X??!???t??;??K????Q???? ????????P?gG???]g??_?????,E????Q?????[5?s?? P?? [5??3N?{???E?????Uka@??v!Q?M??!??OVj?5?????O?i+??E???y?B??R-X?`???R?1t0?j????)?????$??b*???M5????K Y;dL_?;??hyU??g?????v?????Z???C?C?f??5?5;- cv??]???%???Q?hDADADA?;~6_Y $???o?\8???/?j?"?9???g"??5??^?U????W5P?Z ?R??-?=\??????G;\???????WC??=6?t??gc#?P?lO???????5?T[??r???P?????Q???????c3L?[R?? 6"}c????`???:-A?V? X?"?]X??c at c?1$???B??Y|CuV??,k???:?w??dUF?:07TH?Q??8?? TF???Y?<$????:?M?M??Q(????j????l??$/PB???Zb?I????$?????z?;?Y?????f?F?r,??R z??:?}?^??R(???Nr?????9B?Dv0t?????5??Z?? ??-???5?\P??:X}?mo??F%8??!?Q? ????+???Vo?Y3I}????v???d?J(??,?r???*:?gX???T??%?=?p??????r???8\?25 f??_??>???:f'???O _F?o ????Z??DADAD?? ???LbM??j?????\?L??????@?1j9??%~?Z????????W5?las?\-?g??? ??0*??? ?\_0????ai )J?B?????e?????0?????9C???}???=jo/?jj???f? ?}? .?XbQHQ?>z??Mn??3??????J7??,??z???[6)??f+???3??ES?=? \!E??l??Yw?6j?L?2l??lG??D??$&? ?#??"g?GT; S5??m?/??b???}??!5???8?ZY??xT?8????(?Q?0~v???0?? ???(~???????6??:2??R%|????????-???jT*?E?f?k?b?? ?z*XY??????? ?eT.R+???p??zJ???h??#??K?s-?-?h????????Z(Q1}wy??? S?wVeT????g????Z ????k* ???????>????v_?i?Nh??/a??O g}[????#? ?"? ?"? ???N#~?A??@ 5eg?n?nr???!?X}|????????p@]???X??)???,?????l????ZmL???O?? ??????xtx??,????h????d*?h???u?U ?????FR???s-5EOd5?'??????(DADADA??4?g$k ??E?n ?}l??????#?w ?o?m???R???{?{???Q9^?N T_??HQ?? b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ???x????????VFDADADADADADADA?x???M????Q6ADADADADADADAD?? ?gDADADADADADADA?b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?A??MADADADADADADADP?0~6ADADADADADADADA? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(???DADADADADADADA? ?gDADADADADADADA?b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?A??MADADADADADADADP?0~6ADADADADADADADA? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(T05/g??t2????t6X?&?Y??????N????7^N??????Eg?u????4?TS??FADADADADADADAD?a@?N?.??????Y#? ?"? ?"? ?"? ?"? ?"? ?"? ?"?0 ??<_?g?)va???????;?fK??&? ?"? ?"? ?"? ?"? ?"? ?"? ???@f???x??u???p?s?b?M???????i;?g0?-fj~f?l?"? ?"? ?"? ?! "? ?"? ?"? ?"??Od???]??n6c????L??????????#?6?gDADADADADADADA}Z????u??.????????&???%:~?f??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z2 3~?75???F?????d>????x1Z ??f??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z??z?f?M??eGU?j?m??????? "? ?"? ?"? ?"? ?"? ?"? ?"? ??>h4?G??P?rj.Y??ej?/??? P??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z???l4 ?l>??&??f3~????L=?`jL:?%??(kDADADADADADADA4????7????b]?rb???l9??f???J4m???=Y???ADADADADADADADA??~3j?'^??????/[??__??????????Q?e&???|v??????????????W???_/????p??[R???????o??]]?xwy????OW???7???\??i?n./[?????|qs??Z???^]?k?\??????????e???u???o?o??o?t??Q?|x????u??e?????m??????????????????|???U??W?.??^??/?;????._?????/????o-?s????????????i????6???q??[x?y??????N?|??~/W=??????ns???Lo???u?N??]??s?S???????7??/[n/????}????o???_?????&??????/??~???)?????????_t???????????????`??X?e?/????~??o?]R???7\????????????! ??>+w;??Y??Y^?w/?>??{??xs??????P:xw?u?9zw}w??????p[?y*??~zqsy?Z?z?|}??^O??'?%9A?????_/????~s?"oz?~zv????????>?????????+?j????w?g????}Vk????????|?>?{w????????X??3xk???s?w???\??|???U?_????|??m]?????/^?>??\???_????B???????HI?????A +??_?? ???ZyF?E?|~??????yZ?\????]???o???c n???7???? ??????s}V???SK???oj M????K?a????;???"??uJ??j???W?g???>??_??a?E?6?lu??\??}???8-/??????i??\??r???????|???L???z??^?????G?????u~?:7?^? ????~??7???W?K?U???V?????sM??i[??/?.???J??L? N_??am'???????????R????Nq??|??>!?dE?y?X???\???? ???-??M???????x??????[h????N?6Y?d?>=?????????M????Y?A??D-y?9yj^_??????????O??rY??P???(?x{y?'? ??.?mw/??~{??????????????????W?=_??U??pw??2O????|L;??#?? ?w????[}.#????@??N?~s????> ???m?J,:?m??_?{u?o????_\??.}?B???t?+???????.??????????mn???w?iz???'??>o??=???1?~??U?*F??V???W??~?ps????????????U????:{??K?H'????[go????7???D?????9????7U???? ????KW???Zm?I??k4??G???F???e??oR r???^?*? ???_9?????/_IA???l]0??_?????o?? ? ?????.?????? ?Y}O?!?F?J?/?????K?^????~E??w????7??/??Y????????QmD}y????.?~???O??????B)?}?N?;???O?K??6Sr?????????~V??.??#?f??????s??X????g??_??????????M??+Cn?????_?J?s?????/?Xd?????;??>???'??]q???????y{q?^!?r???W#???J??;??V?? ?>?_??????x??[???? ??u? ??????????{???.I?fF????vm??K??2;i?i{??????}????e?^?e???~3?B?:???y-?||v?S??@Z??!(??W?m???('?????T????????|?h???????y???????*????????V???????oZ?????5??o???w?X???????=??Z?u"c?_?+???=?w?/?????????????q?w??????:?C??? ????5 ?G????? ??Kh ????W??t???????u???N?????s???R.u???@?k[W?7??t}???g?_ ???w????.??{???????????^qwU??????A??V?,???Yp????M??I<@??*??bE??)?g??????u? \????????????O?+n???:??si?????????}"???%!??????U?7??%?R*?{?xv??n?T??^??s?)???Mj?%?v?l]??VY?b??? n????z?4)?g??O?$q?-?Yb??|?????'???X?>????=???h#???Ni 7/~??{????????????W??????y??pu???y?7Wr?W??,??{???Is?W ,????H???1n????W?K??????e???^??O???yU?r?,h?_??V6&?????k???????{Xu?>?tN?????[???????????"??p?x ???e?X?c???5????[w7?? ?????i??????V?T.4?%?p?????????!*?uo#??;?+????E?/!?jk?????>?????~????7?7?!_x77b??5?=?m?^ ?(??????Q??w?-.??w???"???? "v???????K?????<???U ????|sw!???\??}y?? ?????}?????f?UU[??i???7;e|????AA~??V[K?>??p???"??????O??l7?????jl???????|????W?e?????\???????v??u^{??G???????????B??y?+?7?A;o#??????c_??.???H"r??????g??:uU??W?@p?? ?y&??yJ^_????g?_?o}J??p?_hD?5????? h5????=hJ??~'??????$U???C?K??,???????U??Qo|7_ux?d??????]??Q?+}?????Y???7???-]?????x! ;????Ll???d5???????F?F?*\?j??)]T9?Q?????*??? ??:o]?????2??k???????+?VWe????[JNV?_?????V?M????}?R?r?D???????????????e?????8Es???g?????Y~??^>;??/?}???x??G;zty??Mx??G? +H??zzl??????X????r??????CC????X~? ????????????Khi??z?O?????????^<????=???;?N}?o??[]?????r?[?????%???~?Qa?wu(Xn?:?s??)???ck}??????G ????G??lu ???t??g1??u?????? ,|???m??Y?)~??????D?????~??>??G????B???_??????? ??eg????? v?????>?!eKJ ???? sfb???^J???d??????y?e?????j?wl?K ?8C????,w?2bq?e??"???qH????l?q?{??.)%????9?????????wD9;;[H???????Z?|}?c?????{q?S??*???C??[?%??s?????=?2?O?:D??|:?9X?Y???CZ~?\OI???5???????!????_y?6 ????Wo??????'BO??????@]??I?`??X*d_???????8?e????????x??;?? ???r?^ ?~????3Y?&?O>?z???:?*??????K??????o?q?+?37w?~?>CdyQ??,>->??e?{$???????A?pN~u????????g??????????U??H????Z0????>?W-Y???{?????6?r?W[~????l??????G?????/???h/???w?j)i?????]L?WL????s???>????tV?????i?j??h????w??~?1U?\w??~???:r?????B????:??t u??N7?{#??nW?y???C??????x?n:k??:??????~%???1?G???>?K????9ssL?????????????[??m+{?????? #[?????Yf&]???yY??H??Ar}? ?D??s????b??~???????7??????<,?????????cH??????n?oY????????A??!\?O?!?????????????[????d?v?9??????????????I?B?v/??.?y9?mc}? ??w?~?????.k??X??????????v??2:pm ??B"?k?H? ???a??6???7????W;o??w?>;o???Lq????????????zD at xqs?c??/o??iyy?????w?~???D??n?>?~???]??ku?m?w????w???>????????MK?) G??M? ??V?????]??????d???G?S????[.[??v>?]C?q??????{???y??=W?????(??6z?r??????|?)p?? ?W????????&f??????????d?X???I??'p??!?????.??\?F??+?(????????E^??[??9??3?{?S??K$????Y?2?u7?i????6???4??????t?? ?????0LR^?o??o?*?6(?M??'d??????????i?7?P?*5?%???Z??;??o?????[??*?+????????<>?????"????}??w?4h??:d????B??i?w9???x}??R??.??0$?\?_???'??G????U~m~L?n~?????5??]y????|^????>??'Ap?w???q0?_??????Y[6?6?x?i??ju??dr??U>^??u???W??????????[MR????????_???&??.?????W??????????}6??eW6?~???:????/u????w???K6"`"??@?X?u??D?I????;???????CW?}???i??X#=?3???????:0???{?4?? ??????qf??? ??=???/?????B7+Yo?d#??~?}&?\=6V?????!R???;L?i ?z/??Z? _d??!?m&nZ{???J??????b??ii???]??'?*?KtB????+?????????o>?]??\?*.5k=k?G^?j&?J???p ?m???????a?????e?u ????;?3?????g????.r?E??}{????O? {?D???? *s?V?Y?W???M????????pB??w??????m{??_D???t????O0?r??!?????????2/???%}`3G$?^?t}-Av?Y?m=??u???P?'???o?)Z??)??[>?jW?YI???A??M:?Y????u&??????W??h??3|p?????.^??Vk??:?S?N'o???U ??????m?u??$??\???I?6'?MJ????b?9??G????j$R^^ -???R?|w?*\n???m?????s}???h?p??/?????c????=lZ????????^???'??y???.?????????o*?????'?.??A??9IJ??a??????F]:?1?6????N'p??o?:??+????????0\?d???k?"?????y?G??"\?x?????? ??E?^?~?????????0??J9???? ??(5??f:????? df23??$L?9?P??$=???N&DAD at T???? ?AAEEQ9D?X/?v?Pd?V????w?W_UuUe??[?tW??}?????????5??Y????)]-???|m'?*?Ws???0J?c _??c?{??5"2 p??(?? Xde???6???Z?? ???4????m?\????????:??y????SEG~??6????/????{???????????MA??Mk?x?[l?????~Y??????????l???;d?? [?c]??????$HoCX???#?@?OM"?2??????&?.?Tet?????7???? e?/?H??n?Z?&=?C#???,??O???Dn? x??I????4?+3 zx.w?j4??1??? ???m?\W ?u?C;?C?E??=???V,?$)#???X?>0 at Maq$hf?KX([m at 2???d??h?????`*m?*e?FV)????P?d?????:?? |Y??W* c ??6 Q?3+?v6R????n,??+?O?F?G??0"?????]???RF???I?????V?J? BUi?\Io?Gq?4M? ?u?????0q??X-H?a1i???.??-?Tp??b A?????HPb?B?.???k?E?h?ID4??BR??J'?d? ?+?=w@????U???_V! ?xPi? ???RL hU???-S??b?Q-?#b??=`)????F??? j$?.V? ???????~u?B????m?LGR?Hih-+?3h???Q?:g 0?b?=??1?}????GF???xNC??4 !?e?3Y? X??k???????Fq?c?RF?? ?$??V???Y????th??h??????X'$9w$r?<4'KcI?,!?\?E????k???P???2L=?%?F}J??)???z?rk4?''???BRR?'ql^?&?j?z??\t- ???%?d??????Q?5? ?E??Gsa?h? ?W??[4??p???0??????Ci???s????e,?@?????^?????N???!?????K?N??^?d$?y]Y?:???????k???s???????Gs?A? ??*?|N|T???????GI?2?????? ??x????'?N???"??RA$L??,L???/x??K??nGWs???J?8?? ?????e??^??? mjtr?c???a?1 ???iCo-V?g??hFL De?P??;l????qjF??P??'???L?9?b?}'U?B?????Tl????s`???#?????*y???Z[???????f?D? ??????a? ???a?6?k6`?,????LG????%Q?qr??) ?Y?J??}???U???:u???????????8?G??T"???f2j7????t?v?>??v?i}???`??"vf?????^b.??;bZ???()3J4A? ?????^?d?????F?Vd???MM$?Y???N'???????????????G8?;'?C?{z?> ?L??Wv"A4d"u;?\?M??Nd???q :M??9m?????????uB?{g??~?!?eh? ??=!?k?u?? !?v?:@Bt(???4D~]?b>}??(??4?X??L??/,?Lea^ tH?o?F0??)u??;+yM??W????H??:9,q7+??#)?%oT?????L??K?%!?Cut???E???%0? ??:8?B??H??T~*??4?v??[?M?1g??? j??t??3?>??}??v????o '???????}~a???P??? .1????5m??? U??p?^???-A????A??n??`r?j?z?m ?=^7?~???z}x5??$A7Iv??z?i9zR`?x????8 ?)?Ls?2?n??\???????=?D??????m?4G^??(?*??Z5jU??????%????\?6?4M8K??????&?M?"f?????H]qM?? ??K <&??S?:???y?.??u???Ar??d?)?2?@\\?!?5??%avJLb"??\??????87J???????l??qJ?Yb?/???? ?????vvV&GfB??]$a?? ?? S??+?l?`?+????b???`?Fx0'????/H?)??C?,=?j?G?wJz????NV ?'?V?W,g?6MH?Y?id?{????q?Qz f??s???Y????b?????sZ? ?E!?SB?B??*??"? ??P??pK??J???????w-#????f???A?u????????c??98?*F8?D? ?1b(??T?8?????&??D?=C.?"?'u???AN?????? xO??? ?/????.?????cu???|????d6?????Q?[????u??^????????Q? ?B?O?????? ?5?i]??????:??Y=??:??0(UK???d? ???{??Q )-?O?s49???5Z?Z?3? ?D?(?????7?*;??T????@s??E?_XYqDC??ZJ? ?d!Eu??i???????dH2U?3 os?m~&???R ?????U?o??????^?????+???2|*????yTS!?N?=T????-[v9U??Nw?YkzE????q???R:???sx\h??lHx`GTG?.e????|?\'C?????-K????5%qk???\?\n????O??Q????y???? ?%??X&?l?\?Y@?!j???? 7+? q??U???M??4?|c??? I ???? "??*???@?]C? z?????MR?`??aaVJ?F\??-am?[??H??e???CK?j??.????!?e???r]?o?|??_W???O????0??|v??J}?0?6????$??H(0?????|a?I?_. ??c$?!\I S?x?%?`?? ??f??? ?Y?v?O??]?????9?]?5?d??R";?)?I:??\???r??(?"???A]????f??{t IE??x??A???)??:?v=?`??:\????}??e8)4? ??Z????? ?h?_[?u????????????0*?y?G?P3f???????? ????g?w???*?mH??K?z=b???x,?m?z??@?N?,?-+??S"f}?NZ?k+???? ~?b#d!??$????H???e??!?4j?%c?NuB?{G?Q?;_5????~??????@???i??#?$S?????>]??+?u??????C`??;?R???y????61???R??J?4t??_?eK???;@_? !?U?}] a?????????fm?I?$?????, ?:???Y?&???G?@?(?6H???7??A,+K??*??h????b????-? ??~?!?aX8???(2??ls ? 4??Y????y???QB??x???j?{????oL????????-N??c"???!9???????c??^???b Yf !"NM2^+????|?n]?h?!?@ ???'-???? {k?eOx?5??A????Y?" o?O?$???%J>?,?' ???f??#??? ?Z??Q ?????fy?$H?)????m+?G>5pJ3W?= "I?q.fM???&l`??Y?p,??%?? ?L?!?g?? h,h????wd,R;?ff?m??'X?,??C{& / ??4G?CSHrBgX???b???? -$??kmQ;??/V??m?V,?Z??*?M<:'?Hxw?\ ?}??????+2?6\?Dl???&K|?????? t???+ ?a? ?X^????f??"F? ??"? ??{??,K?|](a?? /,k?n??R??K? #h????V!?B?? ?`J?n???J!sn?T?`70A?e?q??)?r??u|$?.???f? ??EX???^?1?b ?9?m?{??O?????b ??[Xa /h7V?V?]?Vs??*[?i!?# Pb^3??&???7-jz??G???"/s???$??????k?P?;=?????*????%e??X,|?? ,?i ???lq???J??MV+.QZ?Y[Y??w?=u??U???}?t???U????Tl?K????d???O???E???m??*4???????????;f6C??xd??k?Z??#i??&,????}?M????c?i^?????c???"M,5jhO?6?]????No?? )7?\M???????~? d?qT\??X7????1~?`?HjU?3_??%qi?? LFh???\q?1Dt /????&??[ !|? ?1#"??c?1??8?s??MkFL^? ?{)+??Xz# "??G???\b??u?M?#8_z?6?L??.?0?8?v??8????Lq?E?C????!??*?B?8R???^??? ???>B???D?2Nf+-?????e?? ?*HAy?@;?1???e?5"???-na??????%FAYG,?R?e?? ?%m"HB???B???X&A,b?{??(s?X???U?DW?F?????????~????=?w??62&W??W??f??[?)??O$"-#??U?b??+ HLO??X?Z???0???#k?+e?@??????O?gZ?Kbm7a8&?i?V?7 3q?B????1?????n?l???fgJnPz`?2??K at d??5?G??5qjV?O=m??????+???????G ?0a?????:?????? ?M?[8? ??Oq?8??'??~???}3 *v?@F??????A??cO}tu 3???????0:=?}?%?cx??}F?Na;|??a????Q??9??;';??Ye6?????f??P1??}????t?$ ??B?{??\i??k??? (PY????:????????[???W?7????????*???? ????IE?&&y+??????,|5?bqk???{&;0]tn??~Y?? ?bv4??d???.?P???c=????e?U1???HX??c x?kW1???????}E??{ a???vd??fo???? ?Y???`%CL[?H???9M?y?iu$,K????a??H*=Z???? `?Dk~??z????$?w??;??N??N?$?s??S0 h?Z?qe????X?_????n Q?xr??v???? X?0os???O?`?=&\?gW??@? ??????????&q~?{D9o?0 ??!I@?p????? 8??s+q???9r?r???????p???n?b?rM @{-??F?0??i??~ ?Fc?d??i? 7????d"n??? ?b&5?ba?????l?u?SB,-?&?????%??A??H????7\#c?;N1+\?k?I?)"?E?X?*.d?%9Vc;i'c;??7R3??=l?c? 6m?$;Q?Zg?Jnd! ?1?????+W??Z4??G[u"????m??EO?Q?7??????Z?F}?^m?*h??T???b?? ?Q'?Qo?[?Jd?ivC?^li?m?ay?,W?c???[b???,[~??@ ??????????0z?J?w??C!????^(?Z(?^??+?CL?Oi??R??m?k|?-t?~?b ?????^? ??o9y??????9z????D??9???????{???????????????tem???El_??LT x,??VD????Z?X?h??bf* ???a?l?Rm?t?R ??????by^?????x)????????MSD??pV??a?BsEi"????B[??$Y??i?R!2G?_%}??????;`??dD|?C?zG????p ?9?_?!y??!??? l`??????X?i???7?/"B>?(B??^??8=?o??9???$?V??? .?vvB Qw????? GGZ??c?F?Cw?8 ?v? ??|??nV?,U?C2mV?????1wW?DJc?c???V??s?8fT????kR??@?????.i??u?B?R????W ??0 ?m,??CF? ?#?b?yj#"?X=[=E??b?j'?(A?????? W?XD}? :t??q7??;+?xSqi%? p ??37??F???????J?0???<(*j? ??? ????eG?9A??????????` ????d"?????/????]??????????C$?v???"???`??l??`??w???_C?[??'??>?0Ga??'?? 7?f3??LM????4?O?'L???c?P?E0{?VOb? d???;?uR6N ?MK\?C????L)?(?>?4??A?sb|?4&?-Mbs?Rvm?Ob????SZ?\#>\ b???!?,*_b?5 ?|c'?P??70 !??(iM??PZ@?r|?UYD+?&um6????#?S???*5??@L!L?N?? U???:?:q?????j??U??PS?'?j??6q8[Uh?????v? ?Ok_?l5?u??v?X?q??Hw???Emt???D?????????=?u?O??????O2o?iC)?? #?????w8tp??u?3???y?RK> /?-?E?:???????=????N{?????2V2??k????????h??D?=K???? ???h?m/a????Q??Vd?"8?A??/?-&NB,??E ??D\??H*{?? Cmv?? {???? h??k????lL*??l?k???:???cg*y9"(+???n?\.?,?'?h#?K???,?2?u#??o???9p4?%? ?H 5??K?R????0?%??ay??3?$D?cN???:?????/????S?????:???????W?6?l??cxlb??!ebxbd(?U???3?w([?????' nZ3?l;c????????MC;P? ??qIn*? 8V??Y3?3?S????????;?'??S&???P? m9ap??C???c?5*? ~?{?,?j?l? j)?? ??c??.???.?Q?V?5?:?c|xt;?< ???S?m}f???F?q ??N?m9 ?????????DAI???????HP???b?0a??}?F?6 ?!*n^{???! ;??? ?3X?p(?????(??dH?????42}?V+*#?????X72rB?? ???mCfg?O7???????S????V`????CVhh? b ????t? 0???Bn???.? 6De??3?^,??Mm??????y??%?U? W? |E?M A????P????\i?,???R?5?g?t??R?6?-?RR?d??X{?l6o???1 O??D?Q?;?^????Y4??E?4 eZn%??P|?Py???????R?T??M:?h?3??? ?~B?5? ?\.? _g?^R9?h,V?lt???`?J2????%]i'??0?i5??5? ~??? ??S?g?p??'?H&9?N7k> e?]I%:t%???u%Q? ]???? ??????M$;5(?V0???m??*?M?Mx6????)?e??P?????Z?Vb?m>Si5?a?U?qGt?b?W????MR??c5??wh??rjTj~O???y?=??<%?gx???@???KY??i??%i7`AR@{? ?_??h?g ? 82???M???&????)??Cg??v%{eI?WJ?`K??oa?gQ3/??t?`!????????????!???[6??d6)?L?-?q??3YSD?+???WI?H??b#+?/W?%???pK?q? ??3??????o???>u0L?-W??i8???r?S?? ?o???????f??R?A?l?O1????I6ej?yy???M'l??-?ef?;n?&.S?m?BQ???I?f?A?c|B T?3??u???l^??????+F???9Qn??Ip?k?N'? 0 '???4??q? b?????/????{~?e?????.?'R?^|\?p????gLM3xI???${ zG?KlH?*\Q??V?1?f??4u? ??`???zi???u?&??M??Q?Y??1k??x; b??!???-s?? Z??9????Y??????f/)??=8?78r??????]??????L??+$????d?*x?D??+??\=?I??s_T?:?$?>??R*W(????)?P??NA????l ?wr5#b????)?R-c@???\?? 7k???+#1? L?PH8>??eC!???jA???9tP?,Z?U???+?m$???^?f5![???V??@????|??xX?'???d?0???e???]^d?;?D?\Nzg?2???v????*e??N??[?7N?3 ????E??qK ?????]??$qt(?I(Hu,?7?r'??M,+k?????D0t???R?CDqDHao9?}?*??|B??D?e???8? ?+? jnK7 P??*?>?h ??P9:P?M??U?????@S ?WQ??b?}RU?9?N?$?/B??Wh??}?w>?b??O???:??w.?q???>???D*q???W ??y????4?$8:O??????6??????;?,??J?????H?????r?n????Ywr|E?????&:? ???tb??l:??l????8J_[??(?M??(GC???>$?mV?&eC!?4???????????(??C? ??l?+??????S?????y?WSI4???/????????????8???*? ?? ?g???h7l(?jZ????^????P? ?lBN??f? Q?X?????e?L&C#???T?t??#?82??P??;^??2?c:?????S?W?? ???1??p??Zhl?:???,N9???qDn??{-??p4?|?i??@? ?????A/?q???AN ?`b????????Z??q?????????????h?K?0????[??a~3??ZV???? ????? ???H???D??y\+????????????^??+e?????0??\?F??Y?ibKZLx EH#??f?(j?B???S?????Ih,o? d???? ??T?@??j7Z??f1??? :??~-???LNk???0??0|?v -?i F???????k?3i?FH _?/!z1"fs!??%? ??V K_????? ???+??a,({?$??? G? ?40?PZ6????wt??x ??KK)7?N?G? ??L-?8pB??T?????w?-?G1>?8&9?%S? ?F'????n??J??4??????????he???W$??????????-????.)qp2r?_qe????6??T?y?F??Vk??j?^???t2??4?JtP!???shF8|DY??#?>? {???Y???\?????????3+?? ?e y?: ?6?N?h?P???D?>?8a???^?-??8? ?*?~??k)B?) ??Y?7\80r`!?q?????????L ??cS????n??r?Uz????K?aQ??#?Y?^^??V$?7????VI/O????Fc)??y?9Q?5?E ?7X???4h??A??gt?y??P/"6?m??????/?o??[?F 5;? ?M?R?????????.?p????HJ@??@"E>????+bq?Z?g5?d V(m?RK?m?9 1?5$??UQK??? ??v ??H?Ab4zS?H??":???Km-?i?I?????=5?)?Bg at X ?5Olv?m?(?&`?,U?|*??? ?????V?@?Z??:??k????8N?L??u????????\>?2h#???6???~[9VQ??D!?N????c_???8=F?:?W?DT?? ????P??gp ?!??3v??c??Ks????5:??E ??LU??J4?? .?d????O???????|??X?? ???m$?A?u$?@? ??e?I6@:ic?R???(X?)H????n?Ze??????&?-??8???c???r$Lo?Whl???Q?'?j??`??>\?[n?_?-??#1?Hb0?1N?1?Sa ??????`Tcl??0?=??????q??/??LR???M???_????k(l?Y??? ???Ut?? ol, k????#???.n)i?k./0!?&??\??????\*?TO?=??ZH?????x'?J??'??YG?/??D????^:??grj?k???o???rUX?G?GM?u??H??????W?L?o?U???=m!?????Ee???? Ak????|e?U}I???K?5?XQH?35???????A???!?\nt{O????1Q?!0N ? ??L??xRg~RF? n ??8?C|?q????F???6 n??,?c;FGF?????SZj"????V?y??J :?Ph|??????????'? O1Z??I?? o?4|???SG???{0C??????fI?C?;?o*?B????|p1% ??F???@??8?mp??L???`t{g?????mCh????x??U?-?&?&?Q??]xu?u???????m?????M?hx#? M?????gtJ?C?w???Q?.?zuq?cG?h?/??????18A_??????~????v?^j???????y???TB???L&????????_]???????????????? ??2???????1V?*p???~?d, ?*w?@qCo2?d ???Z3s*T???3?]b??<`?P? )?;m7?@U3?%p??2vz??? OqVo????nE8??3??6?1b?3?gs \??(K???B?Fx??h&???.+??)???* Gm?i}h?????8?J??%F$ ??1U??&?? (:V?F?%??????mA?Sc? ?l??Uvt???l???DW?4F?]???~????)?? ?N?Q?I???P??l?K?J??????i?C?(????Ll???p+?????A?????|x?)? p ?B/???@ ???~???{?> _??f??4ZI?l.? ?C?@?/????T>? cX???/??T~]?|'O? d=?x?/Q?K&'?L1U(&2g????p=??"?:????????u??d?PHxW??4-U?LZ+???j?G?? Pi:#U??Ro2??|Po: i??????S)??2i?z?)K?)$|?>8R&????4??\2?@2R.e?l???]i?AN>???*???9??@*??*1?|:-o>??.?+ $l?z*??????f??A??\!%???????J1|?????????\0?bFf???\i.??s?A??,%W??xW??iY?- f?x?????? [[R??T[??dg?UZ$ f2?~?-??????E5?X!?e???{?q?A4?v????E?????j?%???+tT???q?? ?[?I?????%9??`g??L????J=?+??@l0/W*om`"????T?Js6q%k?4?akC??MV?r????:?????????4?????@F[??-/?Z??K&? ?RrOe?8?????s???6?J??P?* ?Ns [Om6q5???s??? y[O???* ?k?Tj3?z????4 at O?2???j:o$\i?A^V^?d?U:??{?4?U?b?4+??3??'!%???r?.??9?+>* b??I?H?t?f?O|T??/???,?g???IUHF?J??.?m???~??A?W>?????D?sx???r?y:-?^T???dR?Nm??-%?e2>?W?? ? ?O????a?F??Y?s2GJ?p??Qi*??JV2?dq%/xJ??`n$??????v???? ??@v???m?????? ?$mS????zr?L ?????@?k??z???J?H?????z???l??? o?{k?;?????T??+??@ZP?????xy??J?8????}x?)= b??):? ?.????9?e=%?t"??7k?1?}A????J?(???)??K'??T 7?]????H???)O?i?4P?????-S???? z????r#As??????d?????x???J????a ?!??????1(h?Uv????pu?k????????|??e???? &??D???2]?? ?J???1????????t?(??t????? R??UvG?f={? d??dm?????<?P????v4i_2??7l????a?;?Y?F"?+?m????t0???"?|T?/a;???mm??jc??? ?4?m/?wz?Vi????* b)?o?"?F?i?(|`R ?? ??b6kE?Sy?* ?&%K?r|$8 at ynm?P??n?TU????'G* ?%o??D?n8Hyo? ?iy????@??)??]??mm??W2??tVL?S,G#?y??s?1??n?yy????G?$?2T?=?T?sk??E?>?o??]?}?A????^???g~??s.{??C ?#?yt?5?o???-??{???_z??=??????g|?U?=?t??/?|??}?O???????t???W????????nx?%?z??'??'????????~?c??r?G_???7]{?g?????gz?Ls?y???1?7???w~?Y?????}????/?\|?z????}?o????}?l????]???s~g???/M????}?????n??+????W?|?/???i???{??O????????????+???o?]????e?k???p??>???|????~????8?},^?n???????x??gnz???.??7?~??????OV??_~???????????8??K????O???G>Y????{'z?????????????6?3????X???????K????????o~?????????>??#g???7?P{?;o??+?^9?????}???g?wG???O|?????_o???????\???I??w???????g??{v?-???????M???G?????sc????g??i????????????}??#f?W?????o7^{??W_t???f?w}??o????????????K?x(????????????:R9???9???,?1?6~??g????N???sx????????I?}????7N??5??\?? ?8????????????'??????l8??]t?K???????Q????]{????~??G{?n???7?v??????~???;?????y?m???~??|?Y?7????????f???K????_}? ?u?l????1?^???????>y?K????]??W]???rf???>>|?A????_?q?W?z???o?g???????~???Yw??_l?h??O7??????9???7???????|??????F~S?a1{o?w?:??????z???|V????O}???????G?J?????????{????_v?????nu??????7???[?0???????|dgu?z?v??j??}?????GS_x???=????????>????hv?}?/?? ???}S??????~??????U?9??????????_?tI??????????????K?L?u?y???~??G???>????_???uL?UZ???????????u?W=????[??????_?~?'>z?I?>?}7???I??z@{??W???????>????x??_??h????G?????Qo?z??{?~?o??uj?/?????????L????{??i?~?9???????s?Sw~???}??~????????g????'?*?_??W/???>{??????7?????;????#:?????]???k~??o??3???F??cO=t?????v??V'?vy?????[u????s???z???^~?_?n?o^?k??????yNa?/?O???.??????}????j??????k???(o?jT?\?v???p??????"?^?????s??Me???}E???>??\??cN???????o??O^t???|?/??????=???]w?aS?2??/?r?????????????+?=m?#??????t??/o?????????;?>??m??>f???_9???c7???S???????W~??\=?0????????[???U??????k<0???????????o]??.}??????n?|??g?????o??k?;????????z????_??|?Rs?w?G~:w???????}?M?c~z?O???7)??L????"??^z????[??u??????}??W????????x?????3?p?u_?????/;??=??Go?x??=????w\??K???????????c??????????????U?/}??g???????????O?????????`???????~?W?w??????+?M????O???????????8????8??3??#?K'o??C???%??}?^?????7??;??:? ?z??u~???w?>?}???kw?o??/Z??y^?????8???}o????????{????Z?.??8?k?????76?Yx?%??x?9k??9<}p?wk?}????"kO}??P?5j/??]q?? 6=??????7??+_r???{?w\???Y???C?????????E???k?/x??U?VZu?Cg=??kC?o??7????????K??X|??????{???W??????s????????s??Wy??7?4??/???[U????????????>v??oj?+????o]??????????????U]????.+f?{???????W?????=???_r?Q?s?q??????A8??#?}??[?C???o????_?8?????N??m??>S???????Kd%?O:??????RG??V????Y??????lU+???V?J????6??f?????????W?k5] o.??>}I/)[??????^??U???TX9???????f?=???.?????T??xUhj?l?^A ??-??*?AzB ??F????mC???[???M?!?M???`????wA?[????4 ???????xgZ^xgZ?3-?3-oY?????Et?????x?U/???o????Y??^x? ?z?o?a?7O:+Y???Fg%Bg+_?N?????mC??R{?????iW?_&??????>?3?rcA?????`?^?3?w??J{N?m4f?zMk?^??? 5??{?E??%??v?? q?a???,?D5?z????E???.?%3?m??????_>??? ????B\| L?w????[Q?? ?#?g@?7OlG??yt?2?? ???x???e??c??CqE??Ih??U?A?j 4te??U?t8??ZU?{b?ze?ICt?\?5U?F}?l8ma??S*3H?j???? ? ?c-??5g1? ?K???)(:]?j%$T*? P>?J?? ? ??%?TU?OM%r1???A?4??V???/z?a??e?}m.?}!?????s??Y??'?DyY???J?S?A>P?????z>?????Ph????4=????:-??????9??T*?5u??Z???}?R?"?P? >???Ph??? {0 S?N??!?/?@??QE??F???>???E?H?;???h??T?f]?St0+?lo?????????p???f?.??!? ????R "!??e?Nv??}?lI?(????[??Td?R?3??>??????wy{??y}?9s???????}>???|G?p??]??7????????[ ?H? ???ud????[???????????_????????KH?K ???[qN?^%??q??? ?|?N????|L?`??#?yal*???Q? ???? ????m??/????G$?Q? pK ?[?=???mm/J}\j?W????????7vt ??<+???1$?/Jb ??*+??R?????RN-k# An???t?I5???}?p?,gb??????P??+5K#q,S?p*3H0yT(%??*?_??? J@???B?t'N N?}8 g?\????n%??9?E?*F>r?x?????+9???????5_;????mi>??Dw?}v=--?l?Z_t??K???]sfs?B!?Lf?uY?l???c?R????!?O ????.0??V?????>t??Q???c:g????rd? ?z?1W?8/?9??j?t-???|??V?a'qsaZ ?Y????@I?v?Z???#?CI? ??a?\??\???? )?Vu?A???V????NY???*\=??????GH$x:=??)???????w%??h????>??????BI?K?A??E-????e???$VJJzr] ?c?? k?;y%???k??I??k??? f?`{?jz????|{?yX??????u??????{???=z^???\?[?I??$$2?2??k!?????????$?UW??r*?O????_%C-1 ??j?T???Ytd?/F?????=h[j*o(s?";`????Xg???,?^?D)?t??G?R??0 ?s??-o????t??hAk???r???_T?????\??$??????F??? ????2???v:g]?t?k?B?Av????E?QV??y?????{?m?.?????U???dK;?????eG 1GY?5\)?? .???Bx-??e~Q???fgo?|?N;g$??f??*?T\pHitTh???-TX?@?vZm??????i?Y????7@?`R?\??X??n?d?????g?A??y??zs?4?_???-??e?0?????Z?????q {?n)?p>????3??{?Y]u)?`7vy?????#lf?V????`????jfr??2~?r???i???g??&??N>?&?Z??pzp?K????i#???1?Z?>h?6 *????????T?? ?0??T]????(+???HwK?J1?19{#G??????jJS?bS?>?????R" ??l? ?q?-7??@S?? ?n(????/??????b)n??g???S???z+??mb.??S??o??T??N5?w?????5?C? ??? a?`ll???`?55;??U?Z??/?P? ??{???SPF$'3xy{??9???{]Q???5????ms???Z???w??\??QC?T???W?8?r???????L?s?=C;;CX??l?Ki:??CG?)???? "?86Q?D?q??L??v}????3>>??.??W??Q^.??????y?3???tC?????????MF???Y?F?????7?;vx??? ?7?@7?^?&?????3?Y?O?y"{r??^X_?)YO?????wU?h?a;1q?_S??[??+????Bj??Kr?6Q??-?e??8???$???7x/??aB(?j??`?M?*??K??9??W???vh?#?% E?4>?t,/K?Gtx?uttP.?????S????W??}?H???y?z??t??Y???[??O?;???II?6.,U??? 2p\?p?x???V?HG?s?A?y?????mmB?????=N????7???????c2????yy2???)?Y???*?|?7??#?R?)??h??>??q???|?,??)@?f?? 2???2 ???S?%??{WU??-%????????N?????c0?`???B?^I%!k???(R?,?$K$"?????? 3???????????=???y????9?r.z??4?*???k????N???b????#?s?a?J???'?/|???=[;?y?&????GHLk??"^??zA??;?n3???7? ????g??^?r? ???N;???9????\?]??V?o?:?]JI??P???"????p???U?> ????~?m?y@?? ????iN?T@?O/(??[w?{????/N$I?EN???q???Q????jO?X-???????m???s??? ??H{"5]????K?q?,????\G???N_?W?5?K?@?q//{wy??Y,?????o??2???g? M ?????[??$?? ?v?~?T h7R?????s??0??????a??#???3?n?yu) ????????????*???Bt??lm??Z?\c????N?pv}U%?6????x18???y????{?w??d?g???? ?}?c?? e???-=?P?A?c???#?&??n???e%????J ??????sl^?`????/^~?,?\?~????"?b????b*?v?n&???1?l?+?3@#??U?????NO8? ??g??\????3????r?/v?X1?R{??(?Y??"?? 7~WG??n_???]$???OzL?7???6[???9? A.??? yC 6?g?A@?s???????jm?T?d??~?*HS^??DB?7?????)?m?W?m?b?+?=??j#3?96??s?'? ?????))???????'I;?Cx?????/?+?4E(?w?x???? :????_t??&??????a?`???+t?I???? ?i?c???? Uy;4????????????,KbO?????s~????[u??TD%D??9??t?g8???UP??Zwj??????U?{z?? 3??Ps?^2H7????d`[?fMY??????s?%?#?[?? ????Ct???K?.?E??a/??????????\?#b??I?RzBV?t?$?xz:???9??O?'?vO??0??vns???)??W [?U?ehz?u?P??w??F???9????h ?!?up0q?6???IJb~?????v,?hv??????U5o=y?????-? ?????%?f??F??A?e??)?k??T????/DW???? ?vM? ???????t? ???B?/??? ?yS6?????555??Gj??o????????+??CO7????? Y???T?a977???RK??i???.V"92?????nm?J???=u????pq??@ -???!?????T??=???J?????l??k:?-:???z??[????E?? ,>>? ?`???I?*(S? ?n??}A??+?!?w0IS??????D)???@???xn?Z?aQ??n?|m??Sy??????o?g*?/?R-????~??*?J???????7?9j?Gs?xG??f??]??q|??[r???b??^BI2R1'?,`2A??N????e??h?????k?q6sqvq\??h?7??s??k?8???kkU??????a??c?m??????':`???|???J@????d???$[????9? o???7????VZZ???????}???Z ^3???1o?GD???#???????$???wu???????d%G> ?q?5H?I?r[t????b?O ?b?Tm??J???????Oc???9m??????}?? [????,Z??c??O????Fx??_?->?,??1??}}/?*{???? ?R? +SR???6Z?dm?1und9???Ey???M?H???=?N*?4?{??????0?T?????Z?M? ???F?A?\f?a??????B??v,b??????k?F4??lrS???d????>h?F:P???,E??<[?V?c??<????}`?????o?^:8?g ???T:A?!{??X??e???.?~???U????u?Hz ?kN2L?k]* ??lJC?~?T???0Z??:ww?H?????4?6:{6??UU?????|?F??Z?a???????????? K0:?80a8C??!?^?F#QQGu?gF?? ?B9sw?UN?5L??n:D!P?? \aa?W?1\s?, ???{??EV?^sG=????*???5??`??3C??????H?:?.????I?g?xx8?????f???&?<.????qrM/?X???U?A????#??u?????>?`|q??M???7Wma?h?gC???h?6??????+??gfd8C??T???c?]???R????p~f??)?V?5EEE?.?]?F?~??????????Ex??N?o???sG?](??^????????????????}J0???jt22A?$????Q?? ????w?Q???i?????"??Fv???*?}??X????????X3x[G??V?q??Ww??e??K?*?EI?].ush?0???z)???5? ?u?qWl?|??a????? |???a+9? .??q?Q???+??.?????!??w?R)'??o????????k?,??????U???;}?f???.Xfq?????i?`???s???n?a??>????>????^\QT????}??? ??>v????,r?&?? \??[?]r7????%_??"N????fe?%? ???_?-'?9b???"@?t????q2??F ??z,s???????=L??)??DWW{]?????ZN???}u?F?v????z?F}?k?K??I ^S[?????z?????? s????????.D#?? ???8))??v??Y ???w?O?&T?????$P?D[{????2?? 9T???11d??|?`?X???} ??+'?????".Nq@??? P??? %nn????!??r?x???s3?&?\jT!????????^?8????L> ?mJ?S?#L?? ?B?t??n??sZ?3??l?=5?0????]?#?GK)?)B??????a???3Y?{n>}F???z?iX??]j????=?????jii???7?2???D?fztl? ? >v?Jcd?a?????{??f???IJ'?;??C6q?[?{?'?^??-?N?YbKu??&??`??5z?o??????????%?4668???n&??? ?T???t???]Nw6?K?m?f&@?PJJj/??????????Bd???,=8????{??w???OZO~?9\??=N?w?B??E?5>a????h?ds???GH?j?6h~X;A?}{G??W??l????u@?`???????J .?u?k???????Q?%???z?tM$R?????g*9?f??dk ?MO'2??iZ?(*?L??O8????L?_??'?????/???9?[N?T?L{ ?$???????AG????x~????Y?s?q?)??=??u????S????????Tg?,???1N?ym??a??K????+?s??}?A8????pH?'c?K@_?7&)A; 3Mn??H????x ???--s??%?L?~?????96????U??GT???&??w?x~????`?I???? ?? ??9??t?k?????9 vX?z??D ??*?'V???.????jQR????~?4??p q9z??,????n??\??i?t ??P?i???`z?1Yr?7o?D??K?y??5??vu??Rq(.|??ct?L??>????$?n?5>L7??!'bdf>??;??VB ?68Pj?_H?$Y?7t?????sr?Y?E TD?D?*???y?? ???jm?)x?W?r??? ?"??"Z??k8?ns g?6?????\?t??IzqNZb b???[;???T????/?#? ?????(m?0???f]??w???]?=??c???L?8#???????;??y?a?L??? ?\?$vawu?-??????#"?? AT?j???/?R?? ?@:2Z??????3?,???U??IZ???"? ??dV ??k?'??g?^ ??"P????|n??O??f??{???????!A5?P?7o?"?J?X?,??c??? ??@??0?q?RB?r at 2???&?j????????? ? =??ti ?7??/?????????Y?????$Og???9!w?s7h+??8xF?x??|???w???'????32"?!w?@??P?gk?#r:#A???\??>H?&?p??A8,???%d??n??|*?*????????0xg????????[?_??J;??'5?|xA?&???"??W ;?????%?????p??N?@??XR?CP?8 ?h? ??/[??Ng??1????????N????@' ?a B?H?P! Y?cN?cx? ??6?}Z?^?w ??k??#? Y?-?????*@DlG&?9?Ptn??xk???????q ?c??q?P??i??????u???g?JN?Il??"????:@???#-4E??]C???????;Z?-?#??D??l?? /766r?_?~ ????c?qld?-U?zc?? ?u?f??=??b???T?MN??j?d??c?????I !!?4?9?~??^??;{8lx:????j?3&??2>????^??o??????g????????V???M?n?????????????=?*???9??I??3?{:z??n?fQ??v?:?"?t???=????FN?K?????^?}\????)??n???}fJ??J???X???6p9{?:???E? ??s2&?pg???W???ad???)??L??e???????????7 ?O8?1?5u?6??KJ0??,/?4???O???Z?:Z??ZJ_??MR??w?lzf???t10??k????K?X??B??"??J???r(?\?~;??N?:???????6Z?&6??d ????_ ????4??j "\?.???v}L'??e5? ?b-?a??&?O ???y?Q???n?+?t}??,?.??G7??????r-?????{?B?*??Wa???]??????1?Zp??p????????? ??^nx????SR(?h-?????G????$????C@pW?-?NE??3?????\?#??F,$<T????????]?2????,?ovZ??Y?? ?<"??XYY?A\?Mr??5??D??\\a ????U!}w???"`z??*1??^? AL? A???????,????zze??????????!z?&?Z+W????Z2_?8?D???{?HH v??P&?????????? ???3?Rj??? ???Z? ?????6&ykm????? ????.Jx???d?U???bY??y???6q?U???M?Q??tRLB??3??! ???|}x?-??2???? M \.??~ ?1 ?@???H???-????????????YEU?`??????????:???HyR{sK,T?O? {w}B.~~???????????.?C??n>~???????/????Su?vw?`?*?P]?h?????E???l???oMr??,???!x?<`???T ?4f?9?(:3$?$?N????7?????{??j:??6?c:?,???w??5?K?bmtH?1g??TI#?yH????????? ??????????"`L???? 8?G??)rG???w ?? ?????W???jZ??m? ?K?????Lr??v???^????: ????_M? @??6$???_d/]?]???t??1????^"?????jv?9l??"\\???e?N?#??-? ????$#Jl5=(????t}g??6?\F?###??!?6w??????eD?Da??L!???j@??UCmy?V????9?2?e?8e2??@?5u?????PII??????a????Y?7>??QPP????WYK 8?????PZ?p?Q????x?^?)???????x?V"?zX?zP?w?Ps?Q????G??F??a?e?L????\]??z%????"%1?fk?5C???????O????^?X???H:b?v)?~????w??6n?tW7 ??????J;?????{???5??t)????Z=??+??=???????0N?_\?^??RQ?E? [B/??w??????crW(4?g??cu??Xo??????+"vqQ?]??~??L?)?x?!?&?f6???7>?_???utQt='?|mP?4?1??_dhhXEE?y??,S??+???Y???Q?b?? %jG ;?X9?*?{?x$Spn??p?????{??{??t?6%??R??K"?? ??>??A?w?2?$*U???7(?+h?3 C?U????d?1M??:7????? ??P????=?9h&???L??%?I??j?d?Ph???\)?`??[??r??F?;?N??t??>??q??K?xs???v7??S?s/?o,7??;!@???)????^]????e??c? ?h?~????WN?i?j?>{?[?`t???????.??????X?Y???N?D?:??K}|?6???#?z%?v.`/??G???J}?K? A????D?? ?9? ^?fQy??;?I?Wp"???j_?o????w ?k??k=?????;HsG????+?7??we???,x?Y?^e??????u?;?????c?w???C?? [???T????: ?/]c?FAA?v??S?Z??????k???????????[{??MSw??1?r?? ?*u|~:HN????W???<?n]9p??????????G?/?iu?q????E??F??qH???l"??=*4@?R??X????g?PPu????r?A?AO?[^?NL?9$=> ?????!????T#o?? ?)?+?\ ?8i????[???4h?#???[?????|vZM?ud\L???Gy??tjX?r?0?nyw??G???? ????t??"??f???N ???E???o??-S??_P?oA?7!?O\???????'=??????~~?????&?DE???- ??vd?P9?? ??'?# ???P????^IEC{?v?+???? ??V_?}X?????&?A????????????$?????8(?4??rW\????Y???????8??wo y????????????? !=??=V?~????s?D?#je??.?"1eoN\???nz?9??? ???$?;?????R??52"??oJW?????M=??????TWy*?y???T???\???9q?%??\?H???????????z.?g?l?[??p?Y?q' o?S?????????Clx^wo?c?.?n??f??=$D??>?xB????&?? ??????L??M_??????o???[mEC???????????5D? ??>"?tw?S?a? ????V???? IzZ>??Z^?x?L5??F ??=s??d???:?I??w???Xz??o?n6No???{???,n????D??9x??????>c??f? {"??????????n??(:?????B_??????x?VW2?^?? ~F?v?~??p?\???^|???????? d?????t???t}??R??ti?U|????th?66?D??V7?%E????v"?9AKNEE????q??D(@g?s??M?H??Di??e??i?rN?l?Xe????:?a?|???#??{?v?iMK????#?G??lh4?73m?(??u???I@7le?6?????#?c?q?Kf??N?y??????3????????r??A?7u??w&;??I0?eS?*' gI?{??2O?V?f _M% }??F?R3 2?G?zX?u???L$0?%???G?}?@]???,W?[H`a?oa>>\???????#?;???????????H??/'?? ?????P???8??}??(??_?>z>??)????? r2:?M??cV???? ?B??GN7??no?)????????F?Y?I? J?_??d7o??+?K????y ?v=????g???/_????#?e??????D+J?o ???~?????S?F?np?n?1??{??U?6???O3??o????^/?;?v?p???Y??Y?Z?;???I/_BO1??? ???O:9%%??????P?? c???b??s6V? =????K}`?t??w?????#? o???p^?u??.?UMCC?6?????? q=?-t\???Y ?|K?????G?????qb 55???Wr??RxV?? ?.E??6m ?|?)0???x??;?????????? ??7;*?????V25?jgg???`I]`p???.$?! a+-?J?#]]J|z<}#?X+????x?}c??t?:?r????YG?m[???4?????+?????=?Dr??????=??????S?OO? ?{?#?z?*?'>Y?WS[?`{??{?????L'}?)?????????%??@l\?l???_???)?j>84?$?\1)H7?=????BH???6?0?`?9s?vd??"??g?????;/5;?z??n?g?(o?-?????<8U?s?\?d?????? ?F?<??g?>?????\??Z6- ??T?'?w??2I?1?(e/_=? ?!??P????T&mG?L???R?{????9?Y?g???????=??????? ? ?,?Aa\??"?$?}\??? p(?U???????W[?3?"?? c????`??b??w??B????'.)R y-9}m?y???" v`??????=??&??I???]a.n?????\????"l?HI%? ?J?|??????????2^P8???(??? Y?R\H??+?? hFI_ d??)?e???VW0TP_Z???An08???;????@?Z? K?? vf?R;??y=???/l??????? ?~???5d?@?0y*?? ? v?q|? ?/R?;?dqo??|>?4???/?h,z??0?d?'?NF! ?M???????S_ 'J?}?m`..`8F????`?.????t ?? ??^?????????? ?}u?$???~???s?\????-*k?????'????? ???i!????eW???d?^?)>?|??@???[??}???? l????7?k??!?? ??=???~?0~80?EK?>? ?~?_?s????|?2n_P^@\H?[?P~?????w?,??e'????(?.??b'?????y@? @m???~?;3?O?  ?>??j,(?'??????? ?!t!???*]??????????`?5`??????8??????6,?s?X???i?9u?k?/?Q??? ?c?4?S????8??2???P????w??l!^P????????G/??$???&Wl`???????:??d???0??+2????X??2?~??s?? qv?w????m 6`?l~}???y?@? ????0? ??z??????Z?h???+h~? ?"?L??-??e1Z? q????????_?K? ??m? ??2? =e-#???????????????4e4???t[?8?:l?k?~Lc}~??~^??? |????\?????m? [?'? ?g??_???? ?-? ? ??=???Z6????^??u?X /??/?m(???%?w^????*? ??u??x??\j??[?g/??Y?D?!$?yz????uE?~\&[????????s}?-,? ??? [?????#+Bz{@Xo]????!?????{?O??????l??gF??HWFd??+?q/{z?aKE+???8?A`k?????%?????O C]?P[?;?Xx?s F? ?`???+??K?? ?RFWum? ,]?????Z?d{KkY??-Q???,???s?Q??E[PdZ??8T?/'????/G? ???E&??fP?$A??~?Q=??p?^??Khn?iZBxi??d??}Z"`??q1 R?Z??Z??AG??????Xs,t???B7??-ti ?? e???? ],?$???????Z??????????)N-?X?t????????????Mx-??K???\f????5??a??T?) 6!?M?a:??o?V???1 ???Py{????Cp???q???1q??{0???????????l?EW?????Yf oX???% ll<]?;*A?i???@F?g?q?1b?!???;???/=4Na>??){E at P???!?`N?E? ??0?C??s????(b???v[???^?????E~??J??????/&???V??c,?0????a`?/~?]`?-?w?? ?\?????(?????M?+???A.???|???PZ{`? !'=?`0??F??'?Y??O\?|?"????+t@ &???X0l,?5? V? ?O????1g??????=`?(?2?? ??)d?!?T|?C?_??'6|B){?2??)$?0'?[??8C!v??@WA]EA?Y] u?F?F ?+???d?p?H??_?y1????Pg??$#p?+???? ??_???P????+'=?"?????W??OX\?O\P?^IC??g??c???X??Qc[?! 0?m?QE??? 7??*? ??????_#|C?? ??Bs????c?H?.????O????X?v ? i??`??Lr]?p^?X??N?`?;?gY?2 ????.??]?????????>??????X]?X?)?P? ?.?PT?[??<7?@?J?????2;`t_?'???W?y?*??.7????-h??v???=?5h??A-?>????????H?(U\?/?%?'? #??Y?*.??Oa2????????  ?(/????}?!??tv??x@ ??.?,@#??Zu?h&t???????| ?K??~??*?|?/? ??????? L?Z?4???a????wi! ????>??8`??????,[??? ??"???)p?"j\I?v?a q?` .?? ?V?\xp ?A?AL?g??7?? ?~?-&#??7p??@?F ???????????????"??2???{ ?]?=?0od?????s0WNz????????8/??????'-U?? ???0d??#??????3@??]&+?J=???K??h?????%TC?hd????e?W?|?E??5???V??z,?;q3??t 7S?:S???????? ?????M???????????3????q??????w???_f??o????S???U???wZ?]???k ?W?W? U????'~0N???T??)???N [0??????????/|? W?}? ??????|bK?????;? ? s? pRd???s?I??K???KLF??W?}aw/_?]??I?'H/???????8???aE??n?????V ?T%???$F??????b??W ?/?? ????R?"?R????????;K?~?J}is???E%??j?????Qk?b?I?? pu0?n??r??R??+?I????(?Dq?`q??CF2?????G?(?+??G\1X?R\1?????????????s?"8W?s?8W???????j??\???J?~????3+] ?E?+?b?7O?N?p???????R???<)?,???4G?/?]d??B?8???W???~\X???e???F????;u`E?_??? ,q???(k?1?,??????????`???? ??#,?[X~\???S?X?????PT???|\??????]???SVL?OP\HW ????????????? ?,??????^????$F??U???^??W??]v!r.hc?? 6?@?|f.???=???[??-~8?!'??Vj?F?????p??]?q?? .?~ ???????,J??/7K??????W6??q???,?P?,?q{???P? 3s?yA<@?????Flo?C??)"?y@?p? ?^??????? ?b ???Z6?OA$??8??8? ?u????9??8?U???;/??? k??"??ig????Y??~??a??d?-?s?????G?_???m?4? ????|1?y????????????| ?K at A???0????????? ??????lh:z?mh:?Mm????k???Vr ??????`21??1d?C??){???f?0t???8$ '?? ??>K.?M?|?/??Iz=0???_?^???_A?W???E????????1??G???4?|?oQq? ?+????_???D?=?K??E?????:C{?@ ?1t(h??'???.?>??B?_q??w?0???3????????PbYY??K-?D??#?R?i??????7??|? ???z?_qL?!B????A????Q?!??? ? ?R??H,7p(U???PI.&J???%B G?M??0?W???t???`8@?? ????J?XO/V?????h??{]????? X9??e??X?=08?^??e?K 7?.hc?,?)?u??'0w?z ???>3????g;??s?C???A?t ??????v?r?????e?/?g^?? J??JG??;?B???c>??\?G?q4?????olo???0?]|v???0?eN?_????????t????s????,T????^???y??b?????B_?X?%?????K E??????X?#|>?y??3????tv??x@ ???Cm??d?[?????_yP]??q?h???]?c???R?[5F`?3f???r?8lF_6D?g?????@?A? J?????/???5???E??l???-X?l??27?e????-??E???w?|??t??}?????1_}?q^S?C?????(?M?M??~w?|]4b???\4?????`??????u#08?[?B? m-?E:?XX0*|E?z?z????m!p??? ??C?Hu ?r??B??\??k<0??w??h'??;!W??Y8?F? ????A??????????HYESE????`??] ?;(????? ??AF z?K ??]?(?< ?? ??%?2 ?W??e??????~?$?\jb?j ???d?2e?_?K[\K?.??!%??3J1????Ts??#?Q??1B),?J???A?w/$?n??? ?j? ?{ ??y?Xg????????d>"???W?a ????M&o?)??B%??t??>u??sN?c? ?sF^ 8P(Tpa?V?]?? ?I?l??C?9???|h?|D????'D?t??"??? ?f?a?c?? ?p??b???^?b????8Z??:????\??v?D?Z?k? uw~?:??s? ??*????V?:?????U??'.?w?=d?-n?u???c ??????S\??'P,?=b8,?yPX?!O??????:pD???"??C??E__*6?mq?%?T?,??4m???%Kl:N??+a>?C?("(K:??????XA?&?s???=cnv*??HOMI?NK??)x{?.z?? ??Q? ???t???3??2??? 78??"?U?k??(q?t?p?e:????????J??h??R?K?_?????=???C?='3>C????5?V3E???_?I??0Pj<L???["?vK7??:???^K?mK!\`?f?`}.????m?RT?O?}?h(|??3?n???@.??\?yj????????o??n??? Y&?T,?qH)'?M#J0??1? }????{?\B,??????e??p9?[sqZ??Y?*???-?p[?9???? ?p9V:6???v3??[X%u?=??!QO?Ac???? ^???7/t?{8?u???\?.??????g??? ?????3???!f#CLN\c?#nlck??$??c?g9??{??g ??sh????? B5??n0%?? W?fY??|??1??V?*?(%r?LZ[?Z/Q????_?* Y% ???<'?)??+r*R}(????0 ????Y???;|Q?a???9z??D ??2??"B?X ??>??? f?. ???????F?RU??Ic?R????S???7A?????F??I????M]?a?d?7???L???nfT?k?G0?$?%?>?d,?????Oea,?PoR[p???|??????2???>?????X?F?g$??S?T,@?>F?/fr??Fe??MQ??;???9IY*??? i???%2????VB?V?`????8?x???mvH???h?G? SB???.???d?;At ?? G??#^['?C| ???UH??>?$????~?[??????U~?4?k????Y??Un?2*V)???,?X @sn??????" ?.?kid~???1K A?4??*?????YL?????s?eZ????B1???Y/%??>???o???_W?D?H????????abi/>;??I?????Q?q=??%e??????]???C@??c???'J*?5l?vEqST????nb??Y?????6M??%???O1?g???1??????6S? ??????Hg[H???L$?4Kk???????????YP???q(N?Uw?VVr<}SJ?n??2???9??"!=3-)?^X???n?Z`?q3?X=???k?b??zw,?y_?bI?` ????b????(???s?2?ui#??i?????S ?}79n?b% ??c??51?x ?6.[x?mL?v???,??6????l,?????99ExE?9}??h???N %?????F5???p??(?N???e_?a??e}?!???????$|???J ??1X??b?'?(?R?L^O??h???e??PnP??#??P4????lFI?RY??M/1?z?&??F(????????!??=g@????G89:x~?h7.??O:4??n??h?j? ????|????{????V4?YC?L*??s?,^???D ??P? ??P??{??q3? O?^ ???y??? P??q?p?a &?To?????f??????p?ex??a|??,?]s??[???S*?;??*8 v[??@????j?0??_?`?f?n!???f?<.\? ?p??8????wC?!r?j?2W??1?lO?Y?D.W?I??c??mp?$ ?l????FC?< ??sv\?!.??R???6?Y??sq?yu?@ r^?VE?? ?w???~?W?kdt+??a?4??i?????B??G^8w?????E?????~=M?<Z?Dtc?(%-P(2???4`??L??h?!A???V(?????X>???? ??$????T?84??]M4MB??4 ?Cb^?`?????p?cl ??????S???W?`????6+????#<9??D?????V]?? ???????? y???B'??$.?-s/??E56 at D9????8?M????u?qX?Q|i?$?F????6?????L??HG??M??X??Y9??|???JC?J??{UQ? ?]? 5????=$n?@4???>j??4?5f&???.??y \D2+5^?????2 ????$??w ? I3?a?5e?0???)? ?a???i P?H7O????N??l&??S????+"?pj??(\_??M??? 8c?F????,??S??SFXI????fG?B????1O??W????? Q?LIMR'$???T?'?R????IiB/A? x?Hi\]??$???R?X???S??/????:?J[:aG??j??M ????HO???6??EW????Y???xMi?H?7{YMYq? C4????? ???^???y?&??%???p)_e??/??}v(????v,?hm?3??????-???:??R"QFI|????????.???O?N>?;???A?>? ?N???? v??e?dr???w[??l7L??????f???$?W?????????A?p??P=+9????4??5?N?x1??lp?????I? n$?(P? b??p[V???WG?@E)??+????c????qX?y?W?H?v?2?I1?Xy?"?-?o??:?fN??)? ?t?)x????????5?R???C\k9????5y????E?ve????$K$4??j?L??I?????"??y??U ????l\?Jz,???X?PHa????? F?5XC?9??C?B???T ?X????Q????*??????"?????????????v?7+?9C?s??N?&??????47????R?f?U???_?n??jt?????w????6?o?m??X"5n????'L?G,??z???I?*V=X=h@??/???o?????v9???v??qUUL?!?L?d?|B?q4Re-????`|?mY?_???????W?????G,_U9-??????+w>:????>??8o|??+G??????u???#'??3zduP????ei?7??x?????_k?????K??j*??Z9ft??u]WL??????a=o??????#?V=V1???????????ONI?k??U?V?Om??DB?/;?????F??????ks?9W????sO?~????-?V??QO?7r????:??7???{?????g.?Y???#Q???w?????s=8??b???>?l???}??2????????z?e???g O???~?5z????^???Y???=?????&D<?=??Wxz????V7?p???s??p?lH~????M?Z??3???gw??(??iw??R???????^????k??O???????7????W?E??}???U?*.???>Pu????C?/n????E??????6C???s??7?~?y??????4????'&??????U??g.^7!??I?v-?4w????????83j????????z????em?????r?h^>??NX??????5t?r????GHu?????K?m>??aM??{???5??m?'?@l/y??/;???4????O??&^?(??????h???T?y??G{?-?8??????(*???????g?7[x????^?byE???M?#1?-????????\??&w@???6???G??M??Fo{~3?? ??K??F???&?????.?>?qsD???t?0???????k???4?????^Q??j??????h???N????-???????mH?????/??r????Qc.???g?7????????q??K???*o??????S?=ZgN?6????v}??b??E??????]7|i?[=?????gN?~g?2??W??9rfwH???/K? ?q??????:?????Y?'T]Rv??????vk?|qm??!?????]?S????k.??g???\N{???????6??????/?#???v??b=;????R?_???????l????.??j?K /???'? }?O?J?y????? ???2?z?$?j?Rs??????e~???6ZO??=??=_??????X?s?Z???3???????v???????C?iF/))?B??w????I-?~???'t??????cy??A}L?~??m??? ?9?>?????~??w?{???ard??????9???/$_?E?d9??:~??3Q/g?/t?????????????J???o0?O?A?>_?_??d??a????O}???? ???_gv?????d?? 2??NI:0???5:zq???4);'?@????nB?a?#?H???m?:??x??????irfx???Q???=?.Ia?k? ??/???R????::iD8/>?r???????-??) ??!?????k???????G?{?v??w?ym???M?????? o???F?????s?>^?`>?:?8??????L??^ys???}????#3{?+???v??Fe?????|hwf??r-o|?QR?????????M??u????f???k?F\??m???;?????8???70b???2?~`??????????5r?X?#k???J/??UI??,?[n?[? G????i:bB?mi{????????YsK???}???? !_m?pz??!:a????????F?TV=f?.?????a?i ???t??P?????=?E~??H?7?~'2M????3??'?}?3?)/???+??UQ+??;?8J????VW??4????C?6L?W??????????????G?????????qT?@??n???????????`??!]??v??????? ??R???oz/?? ??eG?gvoO]??Y?-???!???0??9G?{iE??????}??w,??E???? 8?F?a?N?-?????{b,???x???5??A??l?[y9???#b???t{$4???7J?????~??;q?N9?C?W??v??9????????is}???9????Kb?????f?.?: \?jn????#??Nj???(?/)o??iq??4????O?????u?1?????~? ?Y?&&?l??ss`?????f??=l???> 6?K?.6u?a???9?i??W?D?????|??)??????)?o@???t0??n??p?G???l? ? ?S?????????+????8??/?K?O?O??<9??O??rI???????x!?????a?ww???W??'??????O&~??F????J?????6}??u????o?+R?????;????m?V\??????^?E ' ?q???zSr???^&?+??\??????-{??????mpq???:?g??\29*??]|?X??|?y??f?E?M?R??_???????b???8q]???? ???yT???Og?M????????}??D???)?? ?OS??|?m?rm???L????+=?l|??????????w???-?????07R?f?? ??Y??<cd_8nd??????-??????w1?n??????? oW4?x???{????? ??QZ???*??:c???,?????:?=g{???????????????F?OF??)?D?u?H????!1?V??".?f??:S????X??hF?C?J?~;S?}????jvY???V?H6?m.???n???x?U'?.??Y}(?lu???V??????,??R??{??]?~?|"?? ?~??8c??Z?? ?y?R?n???????c:]]??}??`m{???T??k???&??b?_?????????????w???W?dT??k??O?AwO??.?nv/n??5gw7c?????o???N?????????_#/?>???g?.??ka??eZ?7%?~?#??`Q??h?6????f????????c?m??[w????\u??????G?fS??????S????*???????} ?:p????%? ?=???):????????)?4???_???}????????^???1?[??????V??]?w??v|?Sr??z?? ?+|?;2???3????a????????1?=?????F??ef?????PG?!G??L??t?Y?G????~??~???????&? 4u?r??c??hfj?7??>A?9YG:??9?@W? ??H?`?=?i?????[ ??S???I?>bc??????x???????????b?V?(?Y?? ????????v?g???????@??x??????~?hq69.??[h????????????K?11yO:?Eww??nw?p???&?:'???????????? ~?9??}8????7??+8h??t?????rv?vw???;??)????|???c?+WW???zc;?? B???w??R>jS?|?"??Z?o??~???*?^f?j?????m?:??qu????C?}?d9?^pc?E<~??YC??_?.?????a;?m!{?u??????WC,N?cXm???t5b???x????#. {?M?9??????g?8?m?(??????{???c???V??R?????~/0??O?r?08O?gV?^f?3?y?????`????7????(?dia???????D?Rn??B$a??4?d?Gw????V???????6???V?~_??rz?????&?/????;????KJK?Xw|a????&?????i??~N??? ?, ?rr????????w_?:?????m?????O????Z??c?I??q??sYK?????`?{?o?? ??[??OMO??{?*?{????K?/H8e?????OkD}fo????>?????Y9V??????l?1??????}/???/?w=?3=?4???|?AW?g1?????~??o?V?#???i???y?ZUU??^?x?b???q??.y?????B???9?>NZk????????]|?fV??%9K?s???Z?:Q^y????=?f?] ?\|T8y??]?9?*?'zk??????m?-_?R'?\My???OV,?x???1??,?>?e???M;??y???b*??n?{?0i?????&?s?sR>?@k???#?f?b?9??5Q????m?????=???"?Z??a?P?C??o????@F??c????D%X????H????7zlt?9|?W??:???:??K??j??y?82A?:??Fn????"jFeF??iDl??T?? ?"N?Ci0S7?J?#Ek??D?? ?e28\Hg?#9L6=?????N???9J??yH????????-??:?4 ????]XK??GR????c?|dJ3?N??????S???3?l?!????@~?bU@`$?R ?????V?????I>??jx????t ?%H???p$u?t?D???Pc?%??VNIF?5????????M?<%?u ??:t?????EIh(???<?6??Yr?FT???(?t*?????????\6?U???Y?I-? ?6 ??8b?????????d'7G;O??Dw_?D';Gg? ?q??Fw?su?R?,? ??)?6?]{???l???#?\1??w???P6r ?6?????? kI?????? ?#???)pk.?i/ :?????0"dzy?Af?????~?.??????4????S`?Y???5l??@??G ?#??&???????EVoB(N?n-??:????? U??4???@Q??m?????E??w ??-?s?? <)L{?::???r???o?o??@ ?F? )/-??? ??H@d?8.?S?}??)?E?)??Vb?k-???s??|??Gl?m'?? ?k?8???F?n#J?Q?q??W>J??z'&H *?/?1?Q??]P???Q?Le; YA)N??B?????h??6? G?i$?H??E?;???p^??CD?P?????9?6?P?.T?s(??oxA?:6? z??????@?u??Des??g2???|f?7*?(??z????J????4?B"E6? /????!??????M???l?h? Q?"?;??Te?M??T?T?s?Q???I?1$ ,C?Q)0b? ??VZ??pC???<&]h?F?MbHv?ZqA ??~?F?7p????? ??Z?M)?Y??(J??\b??????? (N!?q?7?8p9???$6L"Z?Cm??6??F?B?S?P?Gw????P???&??P?q?A?"??? A%?d9??jL??%`K at D??I?Z6P*LD?wC+N?HaC??3 '"?-?P??e?O"??z?oF#FJ~???,_??s#??m?zQ??:4#????= ???????? (???D?nP?????C?"??!?"{6C$?1"?i?W???????IW??#} ?~:???????/?R ?] ???u?????Rt?9???z?????9%??????Y}9\, {N??06?4a??#??&?&D?)?k?????Y????j?31l?? ??f?6Dr??[0???C'[??$ ??q ?aA??h?X????,02?x????#Z??2H 1M?(&????9?????z?????0p _O;????#?Y????????h6WHg?'O??(?????1??H?? 9,6]j &?h??????`TR???L,?QDL??l???}??yW??j???@N?*?VE?6??O?????A???(#???n?&? !Zh9?Bp-? ????>\?n?M?R?P4fAj+k??V{XC?????@??? ?????&?)?R?????a j6??CP??Y?} ?G?/?????|!G??d7Z)?w???{J??)???i??wP?H? ? 8? ?C?T??r?j:??(?]???=??i{G6??1u??{L?#Q????L?? ?????+????R??O?]U???bh?v???c?Jp??#???EQ9?:v??(??*?t?tQ?????G:?G9T?p 6??`URQ?)Z(E?r f???????ZM??f? T(???2???8w?[??4?F? ?@>??f??k???1??i?}?*o??0+??????`Nt???????]?W)q?K!+????BpG??P6 ??I??&??I?s?Y?*?x6 ??f??=?KG??Q????d?`-l???`????????E-h?,X????K??? ?\2? e?# s'?f?`MBjM#J~? ?e????!c7?]6???l,?G6 ??#?JC?c???|6 ?+????~?#?p??0X? <2??A6 ?? ???llK00???2d ?s ???U f?` 2ld?`[??M?????2d ?? ??>??RcXa?f??Y?~??.?=?Y??4?F?=f????F?b`?hx????7u?M?u???;6????l?]?@???LY????#M?R?v? (??,N?#1'??8)??8)??F??R????em???2?o?g?`[??l,c?c?nS?????;??s`??C??f ??h????yV(????~???? ? ?u?9?S?8?S`7!l"v?`M??uB4):S?)???ud?R%? ?ss?Q??o???C[?XZ?t"???d?YTR~?!?U???????!??????I??? ??U????jD??u?3T?n??DwN?R?????4?M?B?????s?j3??\??L?*7Yu%?7?7?Iy%c?*?cV?%????Ty?|??E??T??wIS?/pJPD?X??DZ?&?CkIG|??+?i?,??ixgQ???I? ???pk?/?c? 5???RV?M 5?????:?'6??R?}??????z?????B??#=?)n??nJY1??@4??U????Z??h???|??lS??Z??A2??#??;????+??:]?b???? iY? Nj??Lld?0:1INLO ??Yw?B??YY????.?????O0?+L3?d???5x?>????Z????x?i??~?????E?|t?7S.??N'??`???N??JHQu???9???rq???%R???J?99?VVk?????????i??-??PP??[?df?''F????\l>A???< ?=?iA^??^OR??_?X??^F\??????k?w?_C/s(aC/p?b?\]??9;????l??v?h?l6YQz1????????!g??KhH??c?KS,'?9{I_???+??? ?? #????WDP?VZ????ZV???? Q??#\???+????D?C??n??7u?vAs|??< d??+$?J9?a"G?=@??"KU???^ I?l???N'??7??[??`c?:Js????(????\???u??vi?f)?UJo?:????X?(?9J??e&?Y?????,{+s ???w?k{?+??Z i???v8?8H5????;rg?&???n"??E/NB?????=?jhC??M??l?ADI??n/I?D??P+?{!W??%B?Ao"4*?'B?Q?"?R??UT????C???^e4 Ej[Q???? ??qk-???;??A)??- ??????5?~MT?=??~MVx???Qb?Y??"g?I ??1?ZD?@-v?G )?-&?ZD5?????k??:G*??K?@-EG,j??J?? ??d?z???m??\^???B a>?? ?!;m$%?+??d??.??c????????d??C??b??=?ua ne=#6?,??gWylz????R=??VsNV??3g{R?@?^?-(k?T"???C??[?"?8?3?U?q7!TlT??1??`?g?z?n;%Q?8qe?;}????L[??j??id&F&; ?D/?nB??7!#??t"? 8q?vu???O.9?W ?z???xeS?^!???rJY??|J?N??t-?]??]~?ZD?p%??e-?,aJ??2Y?W??3?X??a?Y?h??u??!?t?a??$s,??=?:???sw?? ??6U??Z? r,???@"T?2JQ%???A???????rnAP?>?U?iyI?5?*?|1'?r??.??i?f?????X2N ? ?????Cw???S???*? ?#????}g?Tvo??)??{_?%P /s ??2"h'??2<1???'??W?/w????+??????????5-aL?#?HRo?????M?ZR"l??V???S?L?D_??l?Ym%O8?4???]?2??hn@8?/W ?K?4))?v??????? ?_???Q4?????0?r?/A?)fU?0 ???S?R|>?`??S*????? ????H?z??L??S??%?"b?Oks?j??g? js????SPk3??P? ??E?.J??$8'????A???~>4b???h?L$??X?<"??U?F?0??hh??!?)??P4^? ?(???%??9&???kO9?/?'?sL?????dw~m????/f? ???@#0?:??o?)??N?%E?f26?ma??Y;?R?lVJ?????j??V?n??.D4Q???2?????!W??????n?g\?????????ya*?/>?z{???,z???j?BVLIfA7\>2=;???3682???M?k?,?Ve:? ?&?K?_???????J????f????Q??,??? ?/? ???? .??20???q!????X(?59- ?($ ?C???%?4?oj?TK ??[R&???????c^??Z???r?n??? ?[?*?\?? ylz?s?f0?{??3?t2?d??e???5??? u8?I?????????;?Nha ?N?YBn?M?F? +J??????2??T??????"??;??U?5?B? _?Fm?TI ?V???V?6?Ue???????M??O??R?H???qI4BVYR`Kr???_r?PJ??S?B?Z? ?.j????? ??XU?$?5?e??]??3qa|b*? ???..??K???`??F?? ??? J???W1[W`-?? &?s.?pgs?c???[?S?.-(?r ?J?Bh ???v????? G?? ????????%??3^?! ??Z??0???U ????j?jJ??)%[???? ?????B??R$??yK?5ue????2%?;?Q{?0k8??B,??<?3?4???%6??????S^;:????l??7?K??;?B?HsQeL?p?p?? ????? w ? 4W???7?+ W???[??N??????8??+ W?q???Mq??`??. ?b^ Q]p???? . ?|u!?? ??d????Kn?\A??2?7x? ??U??_C???b????b?Wo_?\???3?????L?2???|??s?? #JnA???????6??+`??.??iA?DUY\D?1n???L?!i?Q?~?5n2?uQ?1??Xn?? ?9??????f???????2&??? h?j??R?d?hy??DO|%/???{5I?H???0???Z7?? `w????}?iL?_?  ??L???^?S1}??L ?""?r+hDG??y?R'? ?1}????Mc??q??r??\E^??$???h???????U~?k???6 ??:wyW???F???p?Y~?0@?????tg+?X?????&?K-M?,!8 +???"?????YL????????.??$??j?b.????ri???>???$???%LZAQ??????8?0!?????U#???L????z??%%??qp???Iu!??????iOO??":mO???**r????P ?NVACm?& ?????? ?3?P????3?d ?tqQ???????)H?`??,??? ???b?s????zt-#??X?C??18?ib??7??ZY1%???U?#??S?Y(Xm??~? ?j?TI?'K?o???????!?v|q(a)?@h?U?bV?p???+$C?cqe]?J?&?*???nlQ?/?K??? c??2??d???O?#va ????v?t?K=?]?C"^?sed??7? ???F-u??0?"????b%V?C???jb??G?U?P?E?Q?$???,?#?ZW7?P?'f???m9?]M?P?u?vZ?h?-t??Qv[???@7??????A?X:???U?????????w?O3?f? OyO???;??S 8n???`rJ??? 6???!?%8?2?Q2?)5q?5???k?tw??vw?QEF?6?????G???????JC????m!??x3f?? ?*?7?^1 ?vk ?fn7???g7??1?m?V???;?9Q??%?4?+?*???M?????Hyn ej??}?_???3X????????E]J?s1p^x?V????\?*?u.?p???nA|??? ?_O)??!1?m?KIk???k?4?a?D?oy?eH?3 ???(??(t?????a?A ????A?m????4?p??$?Cb?Q???y_#8?+*?????? ?kq???8"z $?G?psn`?K|$ ``??30?J 2w ?5?9TJ??]*???=J~?????H ?p0gp??Hi?TI ?V???VCmB??_w?)??C?Ui? ??t???\\?p???J1???A???(?yI???@]&???!???H??*??p?}?ak?X?? ??[0???b1??ss????I.65???fgcS??39H??}8iE2N?-W ??? ??9?t 1??O??;g)??r?3 D?(??UI]?s??#???-?_?)(?????_09h ?T,+-k??"??-??K??,??N?|????{B0?PE??H?E?S???qw???P??c?2E?? sS?J)|?#U>oG?c ??????0=?r{ )1 ???Y?p ?bV? H?bMFY2r:-???O+?D?? ?-??e@??s6???????^???N?&??z0?gTL?\??T?#|44h???h??????f?o?{,????F??? ?????M4 0 ?????hQ?Ey?Wc?O??DOZB??S|%Nh?v'i"ct??e1????;?f[?;QWO- ?J?Lld??=w????E?! J???z&r@???&t)???I0?y&??? ?1??q5??Xb??k??i??????|Da? ??,]????G???????d?S&9?(???U?3>??I%;??+??iE ?? ?1??????1??b?jA?????9k?^?????Y?>m????*?yC?jV?~????c?????C????e????%DXS|?G?h$? /_???????? '_???|?;???a?>????S?????P42?X?[??OY?|J???HG*k??%f??h0??v?U?=??????f?{??7?k?k??2%0?&?e???N??y ??6:?h?kW????y??J/9 ??{FO?S?E?!????w?IM1n??ey?t?? +-?UV5{???)%[?A?!H?7.[??????%y`??0k*?h?g ?????-2t?s??J?Xw6??O;?eh???Ar??=P??@6N?iY??4???.??.???D?l???????+?s/(@???O??kF?/}?p?^y;?g??sz*H3*?[6?8???z?p? 8C>NB?????a ??Z?q? ??:k???y]]k.???o??u? .]0???K????M???+`????^?e| ??F%PF?HXW???Dez?]w???k????#?')?R?mX?]?D??@????T*$b?????:2,???{:KZ?Qc????9???H4-Ru?!C> G?@???O'?i???B??$?~Eja?YK?B. <)??1??e9??bu_??h??/?j?0??"w?X4?z??"?????Jb~ ???r,?????H??? ?G44??@????Bx]?????-?? ?Z?* i}-? ?j?????M+c4??A?hk??,???Kg? ?Wn\*?L??^1?ah?BU?R?+hb???9 p:p?(??~?w???$:c?Z??FT?5?E?? ?????7?L???'???h?(?????6R???i?-x ???%\??*?jr?#?z??;+?j-?wV ??=)?a???(!????7*????`0?y|uu{x\???G??6!V???UY??H?X;?H??Y???=?;??????!I]6??}Z?SXZ"???v??? \??K?? ?.?I???/V????|??_???K??~??[^U??????m??b?????>???N??-?????w??????=??????O=u???w?p??O?????co?^????7>??3~q????G^??????o??????V???3[?z??k?}???????9???~??3/??5??.?~???viqQ???/???????s????K? ??????? ??????CWg????p?s{?>???]?1/????/??-/??+?f?~?C???????=/z?i????????|?????[?????????y(?o?m??1????&?????m??/???????B.{???_~???M??m?????>??????????'??????x?=[?^z?R??????O????}k?a??O????sw?y?????W???d?E??<?}??c???????}?????[N????m~????W???{6??7???????'????Wo????_?^??????7_????{M??9v?????????:????=??#??,/o????n????G~????t??????????????%?{????g?????l??G??????^?)@?W]????????_?????'?^????8??K?????d??????)?/?Z???#<{????{?}O>???9????'????{??????????{????O?y??'??;??????=???????? ?????~?o???[r??l???W???_??????????3?m???&?z?????n???up[?y?S??}????????????????C???7n?s?'{?????3??????N????w??;_???????3~??W}???[??o???????????{>??/?P???O???_?????nz?V??O/???????}???X??/{??g????????{u?????"J??2?}?c_*????`0v3c?hE(??T?f+? Q? ??YRR*????^??s????????=?sg??\???\?:?k9?M???4-c??c???]C?C/????Kw ? ??,z7 +????????4?G].???k?^kki???U??R?l2?;?n?5??D?E???k????m?5?B???0???2I?D??????P?~??b?(? ?*0???f+M?}??N?{J#?*u?????*?w?7?? ???+&??R]?5?\???/?$??x????g?? ???R}?J|???I??\[?????g?"?M?E.????c? ????&#f???8?? ??l???C?YH???f???8?8?[+?}cQ?d_??(Ys?.?B?u????b ];?Y?6????????????? ?'??????R?? Q???????3??s? 9???S?????? ??]?s?d- E?/Y?+}????[v?Mj??#???????, On?;J??*?k??y?p?zhh? r?6?#~?y????Sa??7us|./??s?????s??qt?=,????.?|t[??8y[5|??a????T?P????9??+???? ??m???????????rUP?WA?? ?`??OX`qVv ??a?6?i?????u?k?V}??"1???YF???/?????O??? ??|??K???8M!???'?5??)?+zfW?S?.%?S*R0?? T] `???ZkpR??0????mz??,hc0?`?U$???5???????v@???EuA?????Tofjl??g????*e?????5????p?kOA?S??k??J?7J??>?a??J???????0??5~?b???EH?_}b?:?n!/?o??Q{_?????UQ?z??~??? \?-4????????1*%ou?????"?L? W?????s???M$7"?????[?)t??*? ???V???52?? f_/?C????0;???? l??q??~t???????'Tl?X\?D??e??\??Y?I???~4??Kb~!????p?"??1'?vVh????J2???5wrZhz?Vt??y?T?c?GS??>)?}?Z??Yu???v??d???{?h????9n??e?~???P???5?????eO?V[*?????A?q???????]??????????`?a??|?*?3?*y???? k????,+??T???? ?,4??????G?,??????????????K?E?[???3+???7???k???????!S??~R?????E??t??i????Jh?????????7F?=Yq?(???G[?+31?KO?????"??q?4?b?XU--8??,V??? ?????C???}??C???L????? ?I?'??????????#ww???Q?xl????5?Q????)s????W;??{??fp???;???????p???????_FO??)???7 ?????F??g??`M?r?]???^????&ye???U?????????A??????n??u?q??R;MV??x ????Pc?3????\????c???X???+???>8???????F?TN9sQ0)J ??f???????gv^?????2????a??m?0X????g ????8WN??|u??/???Q?????&,?>sM??X?5?\??(n?2?????W???Y????? ??KRo?cc;?Q;???(??n?i?? ?s???2@?s-?????HV????<?Sc??)A??????5??+??fq.?nJ??????G>m???u?*:?*??DC?????}?%??????>?????^Z?Qx?G??UT??}??K?M?l?$???37=k???pi????S??? ????????}'??%x?????????+?R?8xx?:???????q}i?P^B?l?????????{ ?7? ????>q???|??;??8?m? ??U???J?????A??**?=en???I??f??i^p5wsus??J)?Fe?L:wq????~??`?OFH???F?Tq ????eL????8?????)??[{????=?p?a??W?????1OML??~??k[? ?l?m??M????@?????q???2?*D?tmr ??p?????=?l%? }~???|B?????????&[???????F?O??????9?K???^???p=??9??q???&????T?????}J??lCUl??(???????? "?N?L??MBBq??q????j=??????;???w8z?5??P;?)e?P9?Y? ??s????????3???????a?J??c??? w?????????"? ?H-t??=z-.?a?d3?u???j??8\?????T?[???c?]??????o??J???;d??????t??B??r8????? ????A?s&?`i?????? ??{?@i????,????g??N??????:,.??vw_???Y?+z?`???kGk??R????o?k?(???X????d?Ko??F2???????????????#9?r???|?8l???:?}E??)$a?$?=??X?n??kOYTk????Br?e?(???e????4?????H????z??bV_F???h ? ??hG???0*??????Ap?;?'Ds?B??"_7.x???x????_???w?1??L[?m?6;;? ??FQ??????O?hr???W?????|??p?I??Xw??? uww?'?wnY??:??8]y?s?????g5?k?]r????????[?g?? ????H????'f?O?2?_???E??o???c$ ?1?????g??X?l?/i?-*??|?R?WS` ??'`1??O????5?^??S?? ????Yh?u?4???Bp??????Qr??? ???&[}?a??# ?4??4???{??_?U?3e.???a???S?? ???v???U??f?????+??R?z$??? Tx???Z#????D4 ?????k??5?? ??|4????h??6??oiW??W??\~L??9>???/??"???y??????d'7bS ?7????=??? ??Q~?? *7H0Ov?>?????????Cz?P??W?#G1???U????g??5?o?~+G?E]???#`?W?m(7?)6b=s%nN?gk??:?@h??????????PEfkgl?????zz?05??T??????e???Xn@{Ea??=?3Y?I(???^???????ez?B???1??P??/]???+.?????+. tU0????????s?\sK???2???????r?`???|jw??n\?????/#???????b?l??z???\w.\? :????+4?= ??z?i??5??P?cg????? ??gLN????G=@!?0?h?^?H?~????-=?? ?M????b.????a_?_????k? ??@I}??]zC???&&M?d?$?o??+G??????(**j?71?mF? R?[ioBC?.?????,??+}?? _?o?n???'L??&a??>v?????^J???'^;?$!?\>sn8{^UK????x??*???_FFY???&O??h?x?]0??????y&???????W??m????j?> ?G3????)Q?D~?[????Z??Go??13 y???P??..???5?A\AHS??9X?????ZY?M?????y[?lX???y????_??;-.?8\??K?uk?Wc???j???????J?wm?u???-???GI?cA?Yp?\l?|et?????eM ?(?1???*`?x^????R?t\?Y??{J?^??({??(?Qv?EWW2 Dy??R??y??m?????%??p}y;?l?????S0?*??????Z??N?=6?B???7????i??'?(? ?z ?zD|?=????????? J?N&???8????????t?????????Q???????WJI?q?????K??Gsh?>{?G?i;?~?? ????kK????x??W??????????~????B:??>?0p??eYnP?(??{39q???p?k'pR?L=Q>2??D??s/S?|??L??f?l?x?^UEe???????????^?T??????4y??;f:73}???Z5????1v???p???v??qn?n??W*N?~?????2X?%9?){N{t?? m?S?o4~?aXGww?g?T?C?o????t??z???e?{????}??"?????p? )??LB@?`!?t? E-??????3-2q?.Wn^?DTf"7?3?cc???p?J??K&?? ??1??????_;uV?E??g???WN?w???????D???Y????????%?-?T?~?,?L? ?? o???/o??? ??H???Q?;?m^N?sg?U?3-j?O?*c[?~?V@?? ??G1?{???2h???????1? ?n??8??????C7?_u?*z??m?;m?D?? ???A??[Y???????6?+?n?K??u7r c???2?e?Hzz??????? MM?6?nl??????Ez- X??owx??>??&???oY?P6gkl?RuzG?}????V????? ???=???f???m?R?X"t?RC???%??? ????,-?N9??d???'`??,????L?4.?zy????C?G????????Yp??/t%?}??Mj?J?????S.s??uN?u?=?e????ii?x???????"[??? *?d???f?U????$~w???????w?>la???1?]?????????S???'?]]]%?#??E ?G;h???H???=?6sa?d??+c?c??????f?9D??x?#??? ?C??i`??:wfg?XXX?+??:S$?v???????i?2?? ????????3???N?6??9L?&:?????O???????:??0??l~?h?v~?{?{??>`-??Z?&33???????????H???"t?ouww?]Qa???c ?*??x?a??#???R?%?????????^??J???MM0`??&T??????/?\??OOOO???g??{?s????*?AF??:/y??1???H??`????????v????!????>?x?N???;???[?rlll?u??????????J?LO?o)???.???a??????x]S?? l?????[??3?#?96n???????v ? ng?j{m6???W? ??? ?}w?S?=lh?hnn05|:?!????B\??+?rM?Ow?|j?&?q??cj???????=2,V|?????? ?toZ??j[??h6p?????p????S?j ???^V??eW???/?0kW???????0-?wz]  [?q?'??9?l? Xq??J??X????2?2?}???_O ?/?M??rOmR??=ycV????u? J?k???z??????1?????????a??Jn??}??_?/;?fw?]:L???????II??_????L?E1??[????,?OT45????`??Ns,?f??8^}???'??? ???o???2??_1L?]v???SNI??M???RF?? ??Kl??????+9BM??B????b?7.?^Q????????\?L???=??}??n????,?]????? ????LF ?J#Tc??2=???? ?c????? =?jidY?w`?z??t???(| u}QH.''WTT???!????{????Iu{???Q????????????????g?o%#?N?fU??LT}??;?P??c??f?4?* ?X???8n??Y????#?^???e?gF7o????AG????p??%o""#En&?????????A5???AD?Q?????:$p???/?b??e?n'?-?p?=??a?B?_?(???f?k?r???{?dE???\?~??{??????Tv?v??+?C LZ??M???z??>yr?"??0???_vj;L?????8?|???y???)??????????????o[??d?%?????xw0????|?MM???.;??? ?4??3?\?{oU3?.c?zJ]??6W?^??w= ???]?s???+?5P3??)w???s?E?g?\???/?4*??TQ??? ?W\??M??\??E??J??4;?h?1??:?{??U?????&??^y??rc?aVp??(?y??Y?z?'?Op?2?????G????'N?D?t?x????-?k?????? ???}??# Ut?,?K&???G?????????s1?jv?!?mJ??=???-?? ?@U?1duuB9qA?|&??6??U?@xY??f??????[? _k?6u?)?"?}D |h???v;???/?n?????x(??>A???? ???n}??>?i%X?nZ"???Zw?????J?2A%Ku?DFFS?>??? |.vn????n?s????=?v???????????G???&??*t????zs?omeiM:v?4??q?F? ?&&??1??6-I????C?,+?x6P????-???? C?]?q??<;???(??}?{????q?k??????^'?t:???zI&????p?g??w??P{?1ru?ZV{l???[{)?#^???.dc??S?n??5?w??'??U?n6|?I:??+W??~?????M{D???I??q??,U?6"U???|;??0%???????m??t??Ou??2???>#?p_P??\???0??U~??>{LtD???F? .{?a??E?????? ?q?f M? ??e8 ??RQ?z+0Z?w??2????j#???MC,?CK?!OOa????O?????????JT??a?g??m?5xp??vz??mr{`>e&??/???P?+?????*???-?uk?I6gk??Pr????c???[?a????'Y?(Gg?? ?q? ?f??I???<_N0??{?EG' ?????ib?uA4*??2???cW?OG?PP~?yM.Z0??E?dp?T??l?m?H&????]?????R=p<Y??b?)?&???[Tloi;?0?H]??S??^?`,tgB?9=_?^????< &;?????O^&4+??}?p?RG??????|???X?? ?y:???$?\6? ?6???8??u?????????????~^??Rw05??????9?>K?p??W[????IJ??e~?????5E??x????(??#?n?}?~?>??r??X??-??0??'hZ??????\~???d?P=????W??????i????????"?6?m? ??o ??????C?????V:?7?l???X?????x???Ph????S?Vy???y?oU?7?rk+e?'z??~?c ?v?I??.?YGkB??????,??{!,?[?W#^?P?K?????0<}??t???(???~? ??>???? Xu?K@???c]BC?t=Rd6V??L?LK8L~???k?????u?I??'y?b B?V?5?l1??s1UN=??.uv??!??????&???(r$p$>???*?K)? ??Jp3?3??V6???????s??-ff?/??}n?e?K??xB?P-g?d+( ?;E?o???Km???nY?W??P?+?>??,?os???)????(?,??????\??q?K???o8'???&'y??s????????.'?H???QG??/?(???O??~??cG??m:?}?????H%0#??R??l ?i?;Z?1?u??????mD??S?-s?1?C ?X?z?????d??1?K? J?=H{?????B??H?pv ????M5lv??b4bL?$w?U?k???????TAI??Ix??`gi$#3?????e?ZS?^drY???b??~?T??????????G??x???h?f????5???)C?Z?L??xb????J?(??8"]???g?KLp{@?A????????]Op?]@????????????? ?u?^?}?;ww??ZNR?t??N?w?V-???BD?2???{?9|X^?4??9?A^^^??)????w_?X7x}??#?:d}J6?S??ah??*????Up?~?#??v P????S-- >??q???+x??C???Jh]???)q??X? `?2??g#??-???h????f??B??T??ji?A????ge?????RH^uc??yLxVeOTXP??[?????6 y?EW??\ST ????2?Y?????Q???q?L?>????o??| ?????g??D?lgwS\??x??????7?y??];Q?Fx?,t?????J?%?ON??W?@?&???tm???1 ??::?T ????o?6??]??z??????P?0X,?t????#G"?<44?@?g$???{???3-?_5?0??KyL ??g?????e??|?z0N?]???w???h??*??? >?$?z?o???=?^S?j?????;??r?ejC6??K ?*?rin????? ??M???9???,z???6?PCho?3t??*? ???` ???Y??o?? O?u???V?z???-??C?]?Ui?O??'?@??????i]u(??S??????z?m???s0U5???>Q????{t?~??n= ?]??]???B?? ??????o8???3?k??/?)t?gF???yyE???r??woE? ????i?O?0???o?z^Su????%??M?????t??:?=??r]??MOO??vS?CaI?H????b??AE? "?????Qm-??R?n?dj? ?\?{Y? ????%h*F?5k?J?y\6j????=l??K?sE[???b?F????n???? ;p+?????8???(?"?j^_??r?l\????K?*?S???A_?uG????t???]?R?'6???????th?d?i? ?U??{?j?????Gq???ay?d????-8Fy?zS>?m0$?>???w?????'?B?w?>5?"???? ????c?cp%??5[??O??\ ???G???????F????t??4f?1????2M?n???\???X_ ?????YW??4e 1??7 ??Mo??Y5(NM?0?*???+?+kg??Mt??#?E?#C?m???(~S/?9?? p??Dpz??)?)???^gy?`+??pK?D? ???????u??/ ???????is?,+J????wDVtk???????`^??t?g #?M??^??????EW??KcV?)??????)I&n7???8K.?? iOwM?u??^?<???K?y?u????' ???#P?;??8???a???s F????F ????W?a?I??,???6g[?? aY*?6;?5wz???????6? ???????u???I??@??y????K?p?? v??:?|???9?c? ?'?}?1?0?? ?g???,??bq"{?lm???/v??:u ??QjolS????#??m-???5?&???>?N?;Q#*,?$b??n???H?5/O??1????5MN??)3f1???6????/?????????efa??&?`?]Z???$??m??0??>_????`?``??rP?4 g???B&???kn???Dx??? ??D?j???~?E?n?D;?O???zzzI(??'9???????-?rCy?C????????w?????eY'o??????I??XU?Tt????0?#?~r????????\??{#?3??H??=??a0????:?>??Y?????_.w?? ?T?=?????9GC?@?????;??"l?zl?f?? $?S??????Igu???]e?????x?????? ??Z??_[??x\? ?? ?~?jcf??hc???????'38?????Sw????oh?a??? ??q?#??q???E???M?,?[????a??m????[?()?ljQ??????????e`o?WE??z?d??qj??????R??Y?\??W,B?Xi>?{t????G ??R>c???P??.??)???a???'?4? ???m?D???9?*? ?????#K?4k?5???K?*??o??8t??u???/'?????????????W??????D????;a????n????lll%HuL??????Q ?Q???%????4???Sb???9?b.O^??N??o?????$?W{WC2?W?7(??v?4 ??R????&<7????QJ?s?]???6??m*?3?c??@s????? ???0?G?'????h;_?; MM,???????O;??A??`-??????? ????ds ^U&??????1+sUUS?????? |?.?tngUb8???#?9(y??mkjyI?????????Z?n??(.? ~?? ???e???m???>??76?R;5?J? ??CS?O???8??????i?M????r?-5A3N?U?????????p?X?'\;???d~?l*R??r(vt?D??r[R?Q??<,???#=K??a>t??g$(8!!!??:?0???%?6999??G?=?)zk at r??$ ?}x?/?????X??Ff`?? ??? 8???Cj??r?o?}?X????I?? b(??*??c?($}??R?NI4E???????BLP??X??y96???(??g?!i??N???H??H???=/??~p?????????n??f??D????9?w? ?k?60??*??On????Y0???z?;??????.'Jee????????[[????????h???????@????Hf?h`(?8??Q??*{?;?Q ?1???K?Z??6g??????lsbm<?????cV????:??4?3?3;+1L ?CWB??|??C?E??Ju>?N?????&??}z???W??j?|???3????)?n??cY??????'{?)00?4 O9Q4t??OW?}???~%69?h?????O??lH???????P????E????F?b?tOun??i#?????7??&P}}???????????}??Q??Q3??spp??]LM?#???:?{?.? ????z?$}_??k?????-?8?Ay??"??m????o?6_???tQ? ???<,????,???9?NE? ???.I???s?????.@?W???x@?????Q?#?-?5???C@?T?=?,-7Xl,#?t?????o?)9 ??????$?f???f????,/? ??c?OS?????????C????????????X?\????a?X?8?[??O?????????`U?w?x????!.K?}5?B????@iiiOO????]??v/t?x]???Rp?t"????Uo????\\GX?=M3????|-??kd???g?\?)????q???U???<h?3T=/?8w??'???mV??1_S??2? ?&?EF??????$?v?b?T^{T?h?8????&/?-?o?>?)'8 *?{?t?O???Y$?<3M-c?????F????4?>?/6?M?????????`???b????R?z2S????_d???b??$b?m??P?G??'???[?~?????P???Gn!22???] ?g???o(?g??M/bR.????????-O j?~??\]?^????C??Sv]??[?ko?X?????]???c^tw!??uR?x???TqR@5??r-????f}??Ei?E?@T?EA?$(????y?????m{"???J????F??8?`0?>?S?z?O#]?X?? ?s?P n??~???z ?4<^???8??l????????7????I?c)E}??*?S9????C}-??}?????^i??f},?Po?? ????|????\????MIAQ??K?}??\??4??Y???I??g????Cu???/?5?~?1???g???(Y??%?\?u.y,????Wg?l ?7~;2m??~? ???G?????????>? ?=??O???????]??k????????;j ????X>?vE?2:j????Vg??p???X??w#E^?Tnh???oe?????[~=9?G??T?Iu????/?P64?i???'???? ???.=C?E?,??OLN?????L???q?A? ?6H?_?XhC?????z?i?????n???????qF?@???f????c|P??????vg????Z??????g?o?X????!bdj?!03?????W??{n????00~d? ???'??3??=????~???9?99?v?('Ou???"???J???????}N??2????? q????-c=#?Y?py?!?? S{?r)X?? ???&???qO??6Q??A?????SSo?ab"??qp??FM%?????XOjk?R??l??NG-f??m}x?????? ?&/4??dq??o???I;R???4_X?7??F"??r????Mr:????|y?e[m>??'B??Q?XH&????? s???S;???DG=^?kc???x~x????*???????w???_??v=?????N???n? ????T????????G?????F???e?_o?U??'???f?v???b.???q?qX)??l?????w#??f bM,7????r??a @vc??>??O?f'[?=??F]??????!?2?uP?>?? ??????=o?F?U4W:A????a? :?eU??70?Q??TD?????#??M? 5a??JR%????m??q? ????KYZZ?u5$??R?????J?3?s?c?????=?r??(?oO??LV????"P?u?` ?4???"?/~~??W?G ??_ ???s'????p ??sw?s/UBT+?`2??????K ??D??+?R??vpO'O? taj??w???gO ? $A??0;?U???Z? ???f?*yx???D,? ?? ?/?T)???7????"?8[o US?s%U-E}}????L????????!=???????"??B,???PI????K??\ ?tM?"  ??@b_<h???E?e_]E???\ ?=?f???jb?;????????m?+~? ??o?F0????F?^,X?*H u??,?d?H???????s? ????f?????K?Z?a?n8;?d"?0?% 05?F1 :?? [?W??)??R????/?PO????A~???H??" ???,??? ?$?#?$??6?? ??!~???????? l??+????? ???????? y?o C?????aU{ 6@ ?0??o??p???<(?{?????????????-hf wGN? |?? ?"??'^,? 1t?] cG?E!?`xwo7??NE~O???? ?CW???OB??FA?+?4??i?????????B ?R? I?[K?\?L???????~??R>??w?-?-??KM??`f> 0?~???(e8?C????????z?a\?@8-).,??""p?KX^??f?Y????????W????g??,(???a=???????+?P?XCh??B?tHo?L?e<"?9??????b????7??d`????N????%M??_??g%???c??P1hH??S-???.?Uk???x?SR???? ??j? u?Y?M?Qi??????-???4?ramk??z??W??S?5}?????d1 &? @???????o;8???q?$"^ ?),m?%????c?0 z???_7E???]?????qKC???eI? [~?I???d?v?8?????F-??/??Y&[???\?Z?feb??3?_? ?+??]?Y'~?d???5??/wc?? ?'?H?s??:b??????N?g??S??(??????????M ?-uD?a ?B ??k$????????g>??????9????E?D????B???????,?????.??_ R??[?xO??w"V^???????0????Zl???0RX ???$???@(?%q???c?????q (s at XW%UV t_bY|??Bi3?h??R??? ?=?yD????s??.?s/?m?u???d? ?/^??k ????/Oei??????$?a?x??? ?H??w????"]*]????0??C?A??a@I\?C??N???i?aGr#?a??1???/$?U?#??????/?V 0?e???\|? B??VK??Y[c?9????V?Oh??-???A ???bK=??@:????r?(???R5t?&I?T!???% ?e?]$[?v y!m ??g???%?7p?????2?ow??7??t??_???'?~a???Rw????????qu:???????????'????:x???N_?/,A?+;???????????,??C?+e`s?a4p?.??????j? ??|??"??$??f???.?mn??~???5?WW_???Y???U??g?K??_k-??"A ?qw??_?g????;??N??7??W??,??;Lk^*^]??-??y???U??^Z[??R?r????N????z???*Z???o?-??? f??n?t??8!H?g [j?? ????,t???wY?-y`l???n???*??????l?D??(??1]???.\7??r????0k?j???[p[B'y??M???{bi*?W??_?^?[????????^??"7?P?V?,?R??]?V?? @?^A????? ?/??M?~R??s???%1-J ?L?_uYPK?$? le? ?,~Y?v9NZ????5?KK?5?"? ?F?k? ?F????*L??D??Z7?,???? z{???\?? xy??IB?Yc-??`???H?2?uC?I??A kF%.:?ZNX>?]?"??I????Y#?uwnI}?~??U?H?E???( ?& ?? ?? b?EF??= ?iHN0?s?????|??N?????D???2&?z?$???/r[???????b???????2?n???]N????N?R?????L??YI?i9.??\????O&???OeH:?_[??.??????u?WII??$?ZG??#_%? C??O_?].??v?{_%$?,Q-i?????f|~]Wh??c??/D? ???K??????b??N???????-; ?y?U/?;?`? ????+K??J???$???D??tK???-???$??r?" -???l?B?*?,??V?N???Hzs?'k?%??Bw ??%?& [??#?X???\?_SFB??%??a?a??av??q?e?7??(:??^W????)#???D?? ???z-"YR??Y1k?5?-#???;?4J?@??W}6K??T?fF?o???~k???X{? ???H?v?g*??kVT y??1?e??3??[?eQ??Q?????????ul???c??X?=?)????? ???V??e???%????e??p?n5x]ah)?]?Y???)????.?a?](!?b????S$?.[?@? ???????? ???[K?WxI?????1$?/x?? ?@"hqO?????~????A?u#?nV? 6?3??(??T?u? ?M2 `??\???"????????B?:+??`} ?Wpg????x?@??y?>N???{???q$??U?P????#?")R?u2q%?8?]?3s;S?$12G???v??o?n 5J?ez????????'Lks??,?}???? ??m#O?\??m4OJ??,WB??V????0]??;]c???3s?e>_>O;;?f?x?|.P?K? ?53k???H??n ?j???$??d??!gv,? 1f????u??Ev?????zR??UW'????J??G?]l??y?q??????>l????&S?~. m ???]??jZ???? ?^L?k7?5? ?5??t=KG?bJ???5K???t???????n?u"????~?????45{7x-~CZ?S??:?O>u??:?c?g?????????*???M?????????????u??:?c????X?????????u??:??_?S?????????????v?n}???Oa?Gu*z???~???a???3?Ik??4?#?bk?G?r?????h??H???N???k??2??Vy??????d?_q"?I??p?_*6 >????&??|???????b{????Y,??]x??XN?????lo?P?@[eI=???? ?(??y???{>??z???9o??q?????|? ??Y??0q?=`?{??? ???eJ?#?L}5???l=?)K@???I?????Q??~???|???a?=??e??/?d?Y?z??u~???~vH???kf?????? ??f~?"?????+??*??F??|????Do8O?&?_2??}?YB7?A5?r??8XpY?d??RJp ??7?1Z6???&?5???^???5?& ??????0???EN?[?>????=?c??KP9Og5??m?E?hcj?MEc??????/C???[?89?q? ?5????w?xpztX?-%5/??42$?t?Y???Q |??*\x(Ar?Pky?7???D8F?G@??{:E?? ?V?8???*7%W?!%??9??;O??/7P??3??????I?1?x?fJ?X}2?ev?]V??[,??][???A?????nD ,?9?~u???W?>??%_??>?p"?????????????_?????????????N^b,?;?Q??w??????????????x??)???Z???a????z??w$? ??M._??? ????_o?_??$/?^=????$???X???' >ZC@??m\2-???K?N?`?;f'?i?%W??????~?F?T1?????9????dI't??p>???d?\(??G??????.???s????w??bt??^>??Q????~u??M??????m?????x5???,'??iY+];?`?n?????|?RDh?????O)X?????;?S0f?D w??"??Zg?? ?'o??fA??N~?????S??x at 6???e?Y)??\)?????Q ?(????????????D??}a?G???YR*????j??????p??]??}]V ?iV?V??4 ??&?4? V'+5??t????????? ????g8?&???c/?????;Y,t]bq?.,?T??e` ?W??????c?2;?N?v;??d??u??ZUA]k?? ??????N??'2 ???!^P?V?7j ??Hmu?V3????a?6?vg ??}?????P?C? ?h'^??r5??H'????AMS??n0??????`F?*6wm?a??=?-??"??x?qM?sH\/???&?[o5??[Z??????@y???6Pr? ???_re2????-?S?? ?9????????u$?,ag?eT?v?M??U?????.DL?(?d x????????eg????????? ?U??fX???Ifd???&????+?@?n.???????{h??[F?w sR?Q??~@_A??{2'!Yy????.1?2???~e????O?m ????+?3U!??M6?8?JE |a?, I?????61?z,G???G?u??M{JM9????&?????-?????Mm5????q1??S??L"7?(???f????`c??p??ZJ??e?F?r?????Kn?uy?p????? \???9?&?&7??G2O??? q?a?7? ?* p;??????S2|q??^_=y??-?_O/9?D???????a?'?(?-??>c??J??B??L??G??9 4?R? ;`y4Y?????I?? ??-[???dx?0?p???(5????2??>y??????8F;??z?????u??z??y??u5 W???? g?#?vc|??>G??P??o?p????o ???b???-?w?>?? MyI???????[}?V79??@???}? a?A?7???La?a5Gso?C?G???????j"u??C?,?????]u?fr[?]8?"0?J LW?'+wy?\ ?????+? f???4? XR?en?U??P?P??M?h?????VH????"?\????5t??{?n??w???????k? u?v??f?? ] Al?ONC???b???)@???eo ?a?y?=[Q???.?{m3wr5}e??'?????%?y???mf??oWz?)?m?:???'\??R[???=;? V?J???D|?g???????#???!>,????????[?O????k???Z?o???P?4T?Qe??DT??,C?J???+???????ys????5?????:?:!?????1Y??_2_???&? X?? X?K??~X??HX??n?7??U????[??c?-?PY }bw?????????iM?)V??^k\?hPL?X??5???S?"a???c\G??????0???`u??VO??#?n ?.6??????c?????"6z=?Z}?? ?;?b?2????U?? ???%?M,o?/??Qx??>????^?mit?????ix2?????U????????L?[??w ?1?-???~????????????VQ>Z??????}?*?{-__???U????>o???U$?.?CH_???? ??uk(????x?k???H_??j??#????>e-???t3??|?cz????R??j-??w??|??Z??~???T????????????????????????!???Q?? ??UC??n???????J??Q:p???(??zv???????w???C?????o Q?}??????5?????????>~?vlO?u????y?O??????????T?f?Sz^???[O?}z=??W????????~b=???? ????(?? ??6P~?@z(}o????/ 9o????G?b??F?A??P?????'X???_??\n??[-?7??OX?????0??E???ZTO?c?{?????S7R=Y?????H??2?????????TN??H?????w#?*??H???FJ?????|??m???>_??g?????{???M??m?|?q???&???M???&*?;7?{????7Q???&j?_??_?D???|?w?_????t??E??????o?6??MH?H?7S??pG?Nm&??????7S??f?wm?????\?X??9?_???Y????f?????????-t=??6???[??&w+??Ez?P?}???~?/???J?????~e+???|?????????x+????>?t\????O??c?Q?/$?{?^???R?=|!?y?E??ET??]D?i?ET?v^???ET??????0????<?"J??X??/?x??? Q?~?"???]D???/?z??L???O??)???t|???7??/?z|?6*????????o?6*?go?rmm#y??(???(?^???????}???L??|?q??{???x^??E??F ?Kx?P?5?b?????(?>???| _??(?`3_????W?)?? D??z"Q?? ??y;P?x???s??????>??G????w?}1?????????A?O????{?+??n??g?8???????[?I??Aq???D!i?R???$??C5@h??.B??0?? =z ????4?4?? ?C6e?"????`??????v?Am0JY?/?^???Ei???@??Al-J??Y?l,D6 h[QJ??(A&s'?8?h?d* ?@?A?B $?8~? ?Z?+?KHH?0??????P?E??(???U!?? *^)?;???]cx???i?)?g?!??A? D???bh ??#?%??oR?iA?7????? ???m?_??J???A?r??IAD ???_????\????x???????(DU!?? ?Z,%?C?g)I ?i???A/?FY??*????RJ?R??#????HiP? ?D? ??O?RF ?_ 0 @b??S#??? ?q?>???B?< "???b?A????m|b1 ????(???O,Yq/>??k ]?i]?e]?g?\J7}. d?\?o?\??????????YL ?m.e?k.a??&}a?F??@2 |?v?!Da?! ?=rSi?Q*HY ?}?3Q???????5?@? b0v@?????????_??? BF?? o?V l???Drc? ?????6????0?$??V?EM?@`6 #8P,??%.??_??p1?????`? 7?#???Q?!???h????????KT??T?\@?K??w[?? ?o?5":?r???7:?|?_??p_%?l7?Ad?>?,???? ?O7????w???;?hO1 9?m\?? Q-j??+C? 8D???k?KY ??i?????????k?????_ ???????k??5Yx?????Z?-???_C? ?????0[?????Z?B ???????k?????Z?-???_ ????WU??????Y?-??? ??????k?????*W_f ?????XZ ???gY?-???_ ????????7*??fN_??????l??_ ?????????? 3?i_k??!??>?S?\??? ???J??? ??3q????f'?;K??I????M0_???5?,?OvK????X?8??1??u??2zk??9????G??=??#u??T??t?,???]W???????m?`? ??x??s?????q?/?2?&???/{??.??9?H????z??\w????86[?NQ2(? @?A???LL? ?>?Y?)?>???"???H?????*?????mB?????*7wV?2l )??| _?HY??w*??SG??8???????P??^9/0??]???L??bb??;???L?vZS??e? ????b???? ?r???R]$?>?0Y???IqiV ??N?3?i?c??u'?a??m!b? ??Ub??35:c???E??$^?????X?>:{?? _?y??^?vo??H? ??'N?????3??Xq???F9??86i?j\I:A&V[?.??%?"?^NG?? ??k=??h??jS???p(???Y??=F???Kl?$I?G??3V??j] ?WsU B?????5v?=5???????#A:?F?E?N????`UjN?P]?U?R?]3?)Um]eqj??O?X??:?p$uQ??1?V?KA?-??S???di ?y9> ?????Y?e??L?8a1??????q????????S?nPL-?n?????i??X???6??e?2???+&?W????%TX???y4??!m[~? ??<~?Vc93????[??U?????4|??<{]???nd??V?. [?????b?&??&h???h;e?+??6?ngWv???:?j*??7BN?????wT?'1?Cz??9?????.U??>?%OO??n???i??j?????.\?6U ?h???U?rR&tM?????T??U%?\ ??8??Bc/>b?????#???(0????q? '?I+ ?idt+B???Y??;?2S??zS?$?z??L??$?M??&?Mj??f?8W?YE??.?3S?N|????y?Um?????X?F M????4?+(?Z??????u?????& ????v|??G?????g?C????J?\-????M??m?i ?Y???6??U???1?L?}{??iU???`?1?Ly?[?1??W??qlL???P.???j???"?;?^7??????%H;=3?|?Z3?e'x???om??? 2?a????? ???K c?o????? 3?????0????A?SQ???6L?????ztVo??c???-@??~_???=^?@????(??????? ?%??f+ ?????????Ji???C??W????? ?Kd?>us??}?#??F???w ?)?{??QF??91+37?-??Yq-S???ed?? d???1???H>K .????{l??AQB?u&?f?%??v??x\???s",CO9s.]??QQ?k?`?FF??? 0? ??? n??N?z???? G????5??? ???pj:??F?_B7@f?j8?h^`C?u?t???2? ???j??!?? ?U?"?\????dl?A?,3???????$.8?`??+????G7??z?=q#?? ?y???A??+3?s??|z?=??????[ z????|??m ??=hyY?0'?:?<u}^???R???O?b?????$? q?-??b?e??? ?e?????E?r ??????y!??_?N?]?Tz ???=????>??#?????i?yp?HX?`)??I??E?cQ?c???r~V?>? ???]?I?3???ZA??{SH??S? k>?0??????? EZ\?:5?)`??)???????????*3??r??Y?(?{?[z??D(??????I ?PP?J????i??T???/??q??_??8Q????/g?0???;g@~?P ???5u?[???B0??i1&??? i??$l??$r???[1?K??DP#??(5O? ?r??????0*??0*??G`TL\??p????u???P? <)C?kK???_????l???(?e??W?<,#??-??rt [[/?? E?nE????+?~i`B???8 A?????? vd??F-??$?E??z??Z]?UqZ!"??"??y??m6???z??L??0??????cF8u9{???4???$o??4?A???B??????i??7? ????U??R-? ?`?? ??? FvG&A(?c??uT?????????P?i??????|?iIy? Q???tadc?5w???0?a?c?M9??C:?9%.?????*???? frYU??`d??????+??s??? ???????? ??,?? #?;8?????QD?l^jt??E???[?$M?s?z?????m?)?e*?ha?s3?4???&?????6??`?kJ??(8?qINbf?E?T?U?d\? RVA???kV?Z?E??????u?Fn3H{???V??? F)u?9?u????|a?B????l0?!???G?|?Zd:? s??z ??z?_?Oo?Z?????0A?}?:??3?^O,???'DX?g??0PW??!???P???@???I????z??b?!6?;sc|?Z=?%N???#m?{F? ?S??????"???!????????\?????w?????8F?G[????EX??N?e$3kG?V?'???d{f?M??O??o]?5???FsI???J?M?9 ??u????????<"??*??.L???1??????????????[/??L??_??????b????);?r??????=?]??*????x??"?-???p.??????B??b? ?'?.C??A?????^??c????? }"??"}???G????iHW"]?t?y???W???H??x?H????.%9??Qz/??????? )?:R ?3}?%H???????r????s?^??S?? ?G???OZN?W-?????????{?F?d??.??> ????-??;????>?,?y ??rJ????#?'????&???????"}*????H??A?e??+?~m%??*???>?ig%??s%???WR?o`??0}??0???????????????6?MH????s%??SWq????M????U?W]E?_?t?EH?Cz!?H/??????*J??|?J?{=??e???UTO>?????????x???~???'???t>???????????x???u5?????gR?~? }??"?(????????5??.??_C??a?????_C????????????#???k1n???????f?????!?K????_?D???!????(?????CT????Q???????2D?{?????(???|?u?|?wX????2??d????1?O?{?:??U??z?:?g?:j?7???n[G???u???|=????.?F???u?'?~n??/3?]???????[???????7???6???LOn???? ?O?@???z?????m?ts???7P???z??q??@??O9????^p>???????????7????H?]??????$????????6???n$y???F?O?b??_?H????7R>??F??????Tt?dX????E?(]?M?^;7Q~????M????????o|?sf???l???&J?;Y????Oo?t???_g?????tf?O???-D??B????y[H?8_?d ???P:>????8?????[(_??|?`9?????-T????H??[???[??????m%?}|?Lw???V???;D??J???[)?????????k???????l?tc+}?????????????\Hr?????]H??.??7^Hr/A??(????b?Rz&.??6s??U?K?D?? i???????9a????Q?/?F??????(_?m????Q=?~??????????U?'???????!??bz??"?[???)??^Lr????????b??1??.??~t1???o??_???o?N??l?t??N?????o?N????Oo;????S?????v;??vz?1??/1???????N????T??N??_?S????T??/?tn????????P:?{ ???%???????K?}?z ??K???P~??%?>_a??K?_u^?SQ??y??><_?????8P???k??\??x????2? x~ ?O???????c?l???j<??I??_????+????/??N?1??????+??????FQ?_??I?'??:???g???????b??C@?d?w??*??I????|?o?;??u??_4|_??? ???[??ux??Y??76?4 ?e$?????JM?J?fK??L?J???J?L?J????????2^??18?,?!d%a?sq)?? ?k at H? #(?F??? ?qJ?????|? ????)W????1 ??CZb??R?????)V??p*/q}?????B#????M????^??9??W at h ?w0??i ??R?a?6???FF9????(? ???a???v @9?5?!??b???AX? M9+?AT??F?<????Q}?3 ?7??"l??D??p????8??_??kQ#@T????U??F???p 5???d????JzWv??+;?6???9??5??D???w=:.????v?:v?7???q??oO?O{??v^????`N????????6~eF????OL??7?yny?;?c^?"Qxxr??^5???????I????>????h???\?]?7???????[&???i????????{8:?Q???g??S?/'?/?).?DN??X????????=Js"??i?(E~?L?/d+e???N"??H?7??J?u???2???t?#???"O????.%q??91???N?&?K????y-??1?T$??X????vh"?'%3??$v??N}????@???@?"??S?@YGff?????R ;e??{?-?-?????????n?????????\? ?w?%??o?yp???_???????s?-{????7??=???o??4?????z???9????m?????C{i??I?r?K??? ~ i?"# ?%????>??s??>??/??^??:_??????!? ???=???q???A1?m???_%??Oo ??????}?p???]??cl???????|????O?tF???f???K?f???O?k92?.?7???2?0??M??WY?????XVji]?"????eVne??? i4?e????]R3?????n`tD+7I???t??!u3????i????3??MP?3????6I?,7??m??A?B????&(;?B?Px0'-?{??g??????2M.t??Q?????{4???nH?????H??MK?V??????]?c???nD??????o?"?Yf?W^Ug?(?4z?M[????7?8h??koD??,2????E4K???7??h?9/??Y??????5\S?p??K7??????????,t??z???N???? ?V?+?:???z??3?_????T7???&Y?>?#? ????U???= '?????y??e]?;& ?\?????~?=?F????M???t???N???.N??7?>?oH?S&j*???.Z?O??????( 3o&?Z ?l?#f_??(A??9????/??l??f??q?Q??U?r?(cP???????9Mg=%???s???1???T??Pe?A?T??\k???M??s??U?u?6???f????????!? ?s?}?A?X?=$????3?]k?a?d????(?p?~z]?o?T?6/3??r?????9??l???l???? ??A?f3a?????n?y??????sAo??4Gc?N???? ^??????g?Y??q}?%?9?y????7Ed?l?=3 ???{?%?Qq?\??e?[?????????R?1??~ ]???TB??????E??` ^,?7??9??z??/{&%&?wk6??,4??:?v9(??R&? h??M???? ????????4?\?????d?t???? T ?(???z??j0f??3X ??A?/]8k2?j???\???@,Trhv?c?kH? 5gg'?|A]"???Z?+?M? ????e?tC ?(????m??a.??c??? ????h?$??????O???S???w[?????!u???T??6?]????nJ???m???YlS??????B????zJ???#j (fX ???qup???M?C???u ??G['d??r?cd?Ht??C$] ]?tM?6q????@?+???.???" ?s?????`???8?~?<[P?A??0?S???_?Z?m?e@????].k???Z??w?Z? ??3q????f'?;K??F?????vt?ae?{?[*??}?M??O??o]?5???Fs??????? [ZTJ?????????=?????S??3q??_???r?????g????K?-??F ??????'?_??`?????GR????_(???0?/????J??W??)???Oi??W???I2 ???o???+??"" ??????O?-?? ???????????+?? ??????+?? ?????+?? ??????+?? ???????_??W????_g??W??%>,?? ??????+?? ??ON??W????)?c)??????K??_?????????la0?.???B???';?'????aRT?r?| ? ??????7?8_??GA?????u?U????J??+l?? ???_Q??????+e1|z???G"X?bd? ?M???X???O?g???? ????C?3r?:(?#?4??@???\' ???*A?" s&.????q?????/??j??i??#N? ??uK?=R)?*????p,?? I?)??`?1?R??u??T `oX???.?m7%?Q?h?????e?Y?g6S??mU?&?-??F? ?e6??i3U?????*T?0?????z?h?.K???l?4?b???1??0???"O5???S/?zS Ce?4?h;? ??l-?_?f?????pO?X+???\ ???t?F??)??R?*????TLJOd???3????N#Gj*??+K?????l4sb?Z?=?*n?????j??lWj{???GhU?i??'?9d??m?????K?9?6`4 @????U;ieA?3Kt???)?Y??? ?A?2?B?? pPF???P ?@??]?(?Q5+g??t3rV????4?????I???j???9????2?8??1???YV=??(??????? =?u ??jg?G?0 i??g??!??|?(`??/?T??0?p$?Z???? a???7????Yvs?r-8x??5?2'\D?X9?:?&??k? o?E????Yk?????m?TG???C??s ?`jN'&??=E??4??????m???\?C ?????,$?Q???r?F?Mk ??R?l???c[?I[G??r'???O?`?$@???h&?q??\????y?u?????'??????C?^??~:[????????+l??g?6?!?>=C??D???,?4&??O?t<1?==OP?q?==?\G?Y????v??&????????%?P?_ ;M?:?NOc?7e?4 ?t+???H?????)??1?&??2?>??_?OD??sI~?\?????s)???iH???,????s)?71}???$?L?H1??8? ?{ }??O???s??????_?????_?t??????????8???K???,?I?Qk ??a?>???{z ???-??|?J?;???z??q??,?|?-????9??>???%???XB????R?>w)?]?t=??K)}?L?KI?????{??YK??_J??%K)??/??~3????Rz??2?/H]l???????Q;??e?_??"??????p%??_???~?????W??e?(=?W???5H?]E???t-? ?j?????m??WWQ??w??U?>?????????=n5????~?j*??W???jz??|}3?{?j?WV???&?oF?Z?????/??r??j????)??d?????????|?c?'?!ZZC??????z??????Au ??g???r??k?='???k?~?\C??{ ??7?????3????/??r??? ~?=???_C?_??????????????tT??^?/????ZK?X?????R?7D??:D??9D?sx??95D?~???? ??_????O??/ Q?}m?????~???C??OXG?-YG???? ??}????^G??az???w?:J???Q??"])??:??????????U??M??[|?/Y??,?a??[G????y??/ ?????&??E?K|[n*??{*?g?y???GO?q)>??2??D?0??)Cp???2?=yb?8_Ly?E?w?[?p?u?W?????(?? >?o??[?{ L6vlw????U?????`????L[??N}?Nkt?eM?????NL????=R(L??W??????r??5?????{_???Z?a??5??V??W ??n/?g'?? s?H??1?R???N?{??f???$#c?:y'f?I????1I??????X???????~??q?.????6~?F???{_s??|[?s???} ?????{?k?)?O??????|???e"???r9??xk??_?q???QQ.]d????oMv??? ,?????8|??fT'?K?v??Y?`?l?S- ??^9?J? ?'?????B_?? X^p'????aX??? j??????__U???????M?%F??7E??~]????U?*o??U??i? #?r???pBB?{X?c??;S-?5? ?????n??kCq???6(??KB??"*???k?bMZP?@?9d?q??I=?DXA5?N3?`? \2??? ???V?????e?4@???????@?~?L?4 ???? &-?>b?????G?0??|&? ?'?'?. ? B!]5(?{[f?P?YT?n? ZHk???P??9 0?? ???3?K???PY?= ?r????*k??D>???-<b?}r?@"n v?(?%M???x???w??*L?)?Z(E?s???lv?????,*??c-*?#?vQ?K\@F?? I???A ??A!!I#c `H?308????= Dd\oh?????ybHF5t??)???/??F?g???1=???(??] ?h)5?R?z??F???K??? t?9n?g/?Z8??????9y???????I "???? ??3"?#uz??0}????????:z-.n?ut??t?,?g???Z?O<"??U????.L???1n?e.??o?8???\????G??B>:???????&?? ??3qlV?9?|???????9 ??I?g?????3k>??Q??ap{??3??{???g?b????k?????N??+;??%? ???{??gp4z}?3v????1???Z?s ?I???.?:s?-=7???iM???;3??iMM{??+??[???mS??V???{????@Wh???%,/?8?????.???????o??Z?????:??y????9?????X???????=??mO????L?h??jMR????????Z?z??]?Na????????????_k????:3c?m??j???N=?:???c?k????>k?HUlI-?q*??????Z?V?e?????????j )?????ng???D?`G? t??S?P6yY??G????N?????Ju?;????~g?\xR?~??)???=??] ?????{????-{?? ????3??x?S??t????X:=????H????????Yy?1????/:??v.??/?W?i!????5#????@O2>???y9??]???h?RsU?M?9??????d??X?K?-s??????R?*]?1c?1=9?n?Z1? ?r]E???=?J???S??GY?s -?&?)???;22;?y?Z?M ?8??R?????=u??l??=m?Z????p???RK??>V?????????Tq????0}s???iUQQ???e{?8?TM??m???P???W?x"?1???muw?'?[??9~]???h?e?p??!i?w?X???????(p??y?????i??E??h}f+s???i??XN=?C?W?????A??A????~T>(?JC???????? b%???.??ip]????????J?^|C?ci ?#0??&:?!M?S6???ei?}??iEz ?j?F'?>??NzUqlSU1}Z at d?S??????3P??eJ ???dz~??????h?Ff:? F?%??$Y????BXq???t??????????yf??(???a?0???M?d ?}6[?j??[??f??k#?????k%???????????U,?hMugZ?b-???t?lv?,???_?M??Z????n??7?P??aW?4?Z????'?-i?A??fG[J????V?Q NL?c^ ,>&5[N??]fq(>Aj?)??kWS?v?,???aD????80+"?[?8 ?????2?K7'@.]??V???,|b^???H?????=???M?s? ?????, -?M??t:??[?cF$Q????????"??S (K6e????P(??(?&T?2 ???z-^?qK.L1? ??6?F0?|???2????y1?%?\;?B?zj9I???H6?????e??????j?i?V?? ??? ????1?rV??9???X??Ty?????u????Z????ju&&?Q?r[,???]???????qh?h?? ?? ?? zw=D?'2*?(?n??m"X9?~??/j?%??? ????z????\6??ba???w??~f?A.e?0u???n???K??J??P'u);mO??????\]YK?@???jj???:??wgY-E `??????[?f????bD?98;==??%/e?L)???|?l???]? ???>????I5?{?a????QkN0??O????(G?????76??$???u??"2 ~??^????nG ?????v?1C]Y\Qh? ?fM?"?u4?] [.+c*??R~?/?cR?? ??=???}?vM?jr??????p??g?M?F????????wDsn?6? ?NR# ?{??? 3??~z\?x????????1h{4?f?????I???F:=/r?????????$??2nOR?r??_Xo}?-]k?????????N`?MKZ??N??3"??d???l[m??'u.?p??aV-8?R???`T???g?%??d?1??????p?EvP????^???a???Xq1?7?1?sh??????]w????4v?y?|?!????}?57???h8k2??[??,_?a?n??L??OE}C>F????.????{??F??\??????X? IV?b?o??n? R?v??^?H?D??hA? ???j?R?B????qF^!?+????f\?T????}T??'@X?&Y???o?Y idk?? ??.????r\??q_???hl??l {? ?"_8Fa?q?w ?|G?3??????8?m??8???g??B???c????0????R w?uB?H ?32???hk[?y,wC?yf??l??'dR??????? =k?? ]???0$4???#??!??8d~# o???z_u?)$Na???OsA?zC?@??_?Or!?*?3Uf|o*.m0j?#5B??c?Ju??????b?C9? ??A?~??????oi?j?Z?X+Z-!?S'?8F???#?a?=?h6?D ????DX?A"??????P????R?????'?w ?P??I ?"PB???veS?5??)????X????gO`?wF:??#??Xs]?? Z??4???ZAv???????$?~?s9??j?????;????(??????Z?OE?^?AZ??????t??VP?b???V]???n]I?P]I?7W?L?????>o%???Jz?;WR?/G? ????3+????????????????o8?b?/H!?? ?? ??E:W??U?o?????|?\E?W?"???(???zs?*?? ???U?kV????????????{X???!? ?????/WQ?? R??"? ?k#=?u#???|n#??~??????H??5???H???Fz??f?????`??????S??m????(]?6????}??D??bz??\L???????/&?????b??op?o2?S??C?J????????Wo???N?{?v?????????????uf;??,?????TNo??f??L??????>????S??????N????P??p ?c???q ???j??_B?y????????_??ML?} ?C????D????^??E?]???????_5?b????i??'?|#?/?k???????"????xN?y+???g???!???????????? "????????v?~?N?r| ?e? <1?`??z?????)??F?N5? k`}W?? ?:!P???z%Q K^m.q?-5?? ??*??_?{^?`M?BC??5??????V????????p?#?94=Ao?^+n??m??U) ?ZJ~??`8?;???^??????????Q !?' b\?H?????oICx'??vogCTa ??p?{?8?m?CT?B??U-???-?*??C??(I#G???x ?M??????0?!?3S)?+S)?G?RFoL????J/L???RF?K??K??^?Jz\*i?-?t??J<?C????????z *??? ???BtW9 ???? ?????????????4PO?f7C?g??kd?@???%!???)?t6 K??&?RB?i?uTW0????l?j?]????Ml#n??3?? 8?!? 2?A????uU\E??hx?+?!P??C???f7?/e6?/ h|_?cx_?jt_?ap>?6Dk;?`?@j0?@?D?h|4?> 0?K?b ????! 4?f????;]"(hP?oA?UB?v@ :?% (??%?m?d,q+????.???c??: F8?? ?? *h??!??|cF`???4??H@??C`? ???????{?$?+%??? ????.x? >?f3#?????????x? ?#6s??C????QV?$y?y?Q?h???f>?9E] ?r:w1l?%?s?d?m3{=??X?m?b?CN?u???2???a??`? 7?}??6?+N??? ??????^}?2o?z??f ???O???fG9?????k???5?)?y??\???F-???z???H???t??h?3????;?????#n??d??????z??8?5/???-?#]? wg??f???X?Y9???Y???(?mi????V??? ?\?R?rr*??Q?!={}?????q???????\?(?a??O?|?Zd:??F?Ng?????? N??[?u[?/????;r??aj?t?q?l?Y?????4E?Nf?E?"??T???b?|????b?v`?bM=? c????? ?? ?s???59DN? hf?.????3???^1?~??`?/???????n?? ?|???fY?N?????k?u?z???z4???g?{>?h?z=?C?z???kj8?? ???\???2}?????K???TBy?c???V?q?Ao???V?x?"??{Av?i??qf?>X???N?=?6N?M-???hl???????l:?vF&?;#S??:#??w??G?????uXg?2??32?]?? ???|?tQ??????-???i??}.Ej(-?fM}??|??????????l???K?MX??????+???t????????????&*]?iP3Nv??%b?/??[:?k?l???_zC??mD???enp????`???lq$??ew??)???!???l? xZKJJ?>?!o???5!???? ??m??2'(?_??K?8b3 v?Y?A?rm??uj?????~???ZZ2%???Z???43o????Twh)???????????e??Ox ??{P?9?mvB??~?jYbCK ????.BMt[?Vkb?W?'?z~??a?:??0??d_l??d?????$??zM?z? VPi?a6Rk9?H??m? ir??*M?:?????,Wr??f?e???nj??3????[??d??q???2?o ?^G5??o???R)0?-?S??e??T????u?MLF?wp+???u\?????/2_{[Goo?c?@v.]u??????b?iHm?\2 rex`v-+c?&k?????=???#b9? ?F??TM~?)-?????Mx???? ?ee?*k h??b?,??S???Nx??"[??f??vw:s#o?B.,4 ????f?!'??YN MRU????M?i? ? d?h??"?????'?0?Z?H? u)&??C????>??)???&?j??? ?`2?? AuL???,?x'???? ?l?u????6??=?IS?z?????9h?f?:?fj??NF????Q?M???n ?_?@*??f>Y???KT?7? (]8???J?g???#?F??=???????????????????8???S8?z?@q?=?~ ?N?O?,??O???????S(A?O???S??)x???S6??O???S??>? ?N?r??)>?*|:iu? ?N? ?N??V??)M????T?tJYH-|:>? ?[?t*|:?(|: ?*^?tR ?N?O?8W?????TX ?O???S??? ?N?O????h?????D;"?O'Jb?????T?t?fS?|(|:??????????T?t:????????#??C?R??(W*????86?v???G?Y4?v???????SD?V???????g|?7??{?$?????<>K?m?N%??\??A?LT?;??U??t?T/"?#?V?/???"??^????':b?p~?&n;t??FV??M??A???[??F??b\??p?2eb?;???o?eMM{??+??[???mS??+???O??~+????3k?5??$??????*?2?E?b2??2????1sq???????fvC?)m??9z ?L??]??????Du?V{??m??????C??\???g???|?)gp.?ON}hj???g???Z;W*U? GkLn ?6?K8)?F????t/=??,?G?aU??5???g'z??}N??7????^I??^Id?R??V?NJ???R???I??(5)U}}o???????&-?d?%??F?ZY????L ??????.??z?4C??4??i;&&5[ 3P?=?h?+la??g????j?????B?8n# f`?)??Q??????????Lvg??c??:? tjiM??{???R??m??Z'?:?%?Z??Z?{:??N?jBl?Q?? ?I?u?d+??p????H]??(?^68@???T????? E????V?h?UM?S??E?n?wP???3?q??('\$Cd!MX??A?(?u"?|?fM?g??#?r??6?}?g?93??:?w?Q ??Mk??? ????A=?-??54?g?gd?9???????}??F&cB~6c??4???S? ???W?'Y?]Ar/YA?b??|??????????? J?q????r}?/?? ?????z???o???~???>????)??G?? ?k?J???VR??JJwu%???+??8x?:D9^??E?????????D}uEj??x?(#????????!?? ?=??L?[?w??E"?E??}????y??`z>????????????J|W??\??? ????y??x?????ex^ TW????!?*5????? n}^J???t???c-?Y?8h?.??"h??N?? ?ha???J?G?ip=?@?D?-w{???J?????????u]???,3?@]? YsMPs????????M?????????P"dXy ]-?e??0?l???$s?M?Kr?iONw?_K ;??????Z?????I?0Q?????uSWR??6??:Vsuh6v?l gX??#???9n???ia?*F8P?[W* |?? ?2?G????ki???k???????y?????c????s???n?B]???F\3?1/?8 ?Qw'f'??>?H)?f- ??f???????E^?? ??t?????????????/L?KV@/???q?????9?? ?n?Dv??Hf\$?? ? ??"?????? l?????Y?D#???TgD??R_qpvr??b???|L??/?%dk?(5?Ui??U?v?Z?6?Z???RV?p}??YYkv???????9n?a??mg?? gy?+aQ??)?@????'? >Ys????K??I{5??L)W ?????o>^?????? ?lI?v ?T 9L???????t?? ????t?k?\??q?" ??)?*v???????~?_r??v??0??K{(6??o?[?G:???? ~? ?8???f?? =`????;? ?????=? ??==?;?w? x?l?-???F?3F??zYp/;-?^v???????r????l??O?~#??\???]?#?&??vw?m??#??p??_hu????1k???8????+oe9???8?D?r$ ?=|k?1z=S^????T?Lx????6MB?ko'?0]?|Y at o???U???+ ?g ??)??V?Q ??}???????{d?g??wg?^?????_?k???=??G#?G????8? iX??8H????W~?6!??1-??f??? "??&i???5?U??b??#6#=;?\%????????2?<8%,bh????htH????:g?]b%???u?D?l???4?G#?*???5U[ ??76}aX??b??/?}???????e?????{=?[2????`pLu??p:C??8??C?|??P@M1?a?C?1?"??&6p??U=???>??1q??nh?h?D ??r??0?????????????G?_???Y??g????t??s??Ur??y??c ??x>??9??g?o???? ?wG????a???????6?????8??#??f?5,??mcZc?????H? ?_N??????.????_??=??|>????????9?}??,???)_??? ??1????D???|????|??ZN?Z?XN?t?rJ?u|}?`???S???S?8????%|?-?g?=,?C|?Q??ZN????,?z??,?O????????????D?????w?]K????????R????TNO?t????:D?Uaz5??C???Q:??(??C??l???=D?~??g???3,??C???1??????????C???g?|?:?{?:??+???#?G????Q?y+???:J?o?#9???_?#???'?'?????T/??)???????|????????)???????????S>??????|b=????Sz~o=???????????????????G??O?S6P~??????@??o=?@?:????{??W2}?J?{?~r??K(??m????@??? ??????*?3_???t/=??[?t?m?|?|?????u>???????t>????O?????=?y>???X????~?????|??????NN?k?t???;x??w???????????H??v????]Z$????????,*????=K???l$?7?{ogz??FZ?H??????M$?K??????(????>?????6q???? ????f????T?m?vR?L??i3??9?)??????)????f3???7S??m3???6S=?0??2?8?O2???~????f????????T??t????x ???-?7r ??d ???-?/????P?=????????|?!|u?P?????-?p???@?????? ????[???'?|??;??????E? k/?s?/6?W??????E??????|?o???A?w????5? M|??c>Q?/?????oQ???V??>T'?????????M??V????/ ?????????n??????'|? ?w/??U }? ??}?-|??y?[???x???? ^????? ?B?????Kx~?????e|??@??~???????;???L?????N?_???.???????? ?{??? # B 1?? ?^?????????I=? ?|???/$?$??^??$M%F}?&?\8??H??X????B???Rb?A` ??hQ??I???.?@o|7> !W??/ q?}??k?? ?? kE??z2??P?%V^3?W0 ?t?/I?/>?"?J)??????Z?H???d(?Z%????6">`??a?2b+ ?' v ?W?\?v??cH ?2"x6N?G`A?< | ?AAE ?QZ/?F?3???Pxz?}?y??q?gd?:?3s??9?????????|?|FF?/>?,)???=??=??????2?y?3?H??gd?{|?ed??g?`r?g?4z?3s?(??H?H??3??t??3Flt?g??????????Y@?w;#?i?gg^J?dg?????,#?W????s:??y??3J???.e?k ?sF?Zwsf.??93???????^??$?s,gd??T?, ???=?U??=?)??=??[?*h??7#?????3?7??????(E???????Y?Y?u???l?Tf?????(??????uAf??;3???9???RX?0?"6????????X?@,??!?????????i????????e|???? ?????? ?E??o1?Q)??i?',8g)????RdG?,`???????t?=? ??)Ef4Q?????,?| n??????i???>?@??1S??Lz?????-??za??i???)?3?r)))8\??y??+eNP.?J???q?d???~?????T?5=??D??S?????-"????Q?kQ:"]????(?)????r???E???YD???E?????d??ET?-?xEe??-Q?l(?{o.???J??r?????gO???f??@z1?????L_????r?????D???~ ?V?_`??p?]??? u0??^?g??K?P??A???!?z|?5 *%?tA??????2????mT? ????BlC??/????j?l?'?k??$?t3A5G ??|???g???DkXo4???MVv?p?%Y????R?Ve?r?s??????2?s???N??B ?JL??????????I[R?h???a?n?z????|?g?jG???w?3$(?/????m +5?p?M?[???Z??17~????????;g ]Z2%??Xqa ? ???9a??????????|?^G?T???n???]d??k??V????????N?{??/??6;!?R?c?,????C??&??Q?51?+??b=?e??_?h?b??C07????S_???u?/?????C{?Xk?G{obe~??<(?@}?"?=?F?g?2>??{_k??n?> ??wY:??k???m?xD???8`? ??x??s?????q?/???U??8???? ????Oc???????????|/???=?O?~z=??-??9????s?p?b??????bz?b?l/?p}?~9_?????g???9??^?}? ?[?????????)]?I???s)=+?%??????s)?????????{ ?7?K??`???>???s K??|??L?|=_}????(\?????,??_?????????????? ???R???2??m~????/?/%?A?\???Q??^F?_?? L???????(]?\F?>?|??KE?-#???ce??????????|?/L??'??|??????oW?{ne?c?????W???????b?c+??N??W????v??-???|?A????????/???????x???]A?????'??|?J ?t%????6????;?>;?kVR??U????U?_c????|?+?~??O??V]??????qqW?{]???w?j?_7s??j?O?????_??o^M?z?jz??&????&L??[M8???????5???????P?w?! ???p?kHnw ?y9?????w?P??[C?|w ???r?_C????????????>??nZK?????c?Zz??k)???k)?i??Z???k?}>?????k)??2=??????6????p-???C?|??k???}?????^??(?0?u???z??!J??8??C??7 ???,?78?W??^?????=? ????????3K???L?1????\???u????t\????7?# ?#?(??9?????????z;???{?~n?+????-??k~???\ZG??F?iy=?\?g????s??q??S??YO??????3????D??z???W 9(??l?|????? $??L?r>???????|???| %????r>a/?~>????O????O?_dy?f9?O??????)^?,??t??? ???\@x??_ at ro??0??^@???????_a?{/ y?w?????????O,?Lz?w???Q?x? ?B??d?q?z???C?BP Z0????(D??`????z?1 x?I?v??C??B?1 ???(X|?B|) #?8gN>?+R n?5??J??^?"?? E ?;( ?j?????4?g)??S}N?r??L???a?B?[??s?6??J?????/????O?e?@Q????D?7@*cx.?4@?PBy???}??Q?L)?BTC?J????~??28??l??_3 ?f??? ?J???R?Q?xx??????[???mz??qW?????`Uu ??%??MD????h???????Q????????????s????C?????????????????[?????~??????C#??????? ????9e?73???n????????Q?^??;#?X'???:??z??Z?]?0?.?C??w?:}?e?H?MaIb??z????x????5???ix?s`?G??L?o??96????'?????z@&f?5?\????H??!???iP v?86k,?????,??A?0??N?~H4' x?6L?!???QL?7?3?r0m?????,?U?:@?Hb??{$???????)??=(??x=e??????h?????u???k????U'k&xMq????t??@L????Q????c,b [??_?9??`k???}?eo?f?B ?x-????w????-?5?????????q????^?~17??R???nj?????? ???~?RN?????Z?V ??p?$f7???J7????u????Z_#T?F???????J?~R?????~v?}?[Pg??m?????9??????0?.????k_o??pm?????xk?cm??] ????-???=8???~]?i]??c?r???H?Y90?j? ??s#???@ ??_ ?v?3?Su?bK=?u??O?9j? :?1???"?X?'q????k??P??l?k?????{H?*?C????? B$?S?L??????????~|???M????6??????w???z ??sx????????O?.????c3?????G??'??y?O?2a??????UV??im??? ???Bk??+??fo??c?$??c??1????.CQ7Q8??%?p U8?*C/R8??&?p U8?????1T?*?A.C?G\?c(g?*+{?J???R9 ?P?c?????1T?????c??1T???1T??p ?AJ??p e?*C?? ?P?c??1T?*???c??M??1T?*??p U8????? ?P?|?c??1T?j?p U8?*C???1?? ?P?c??1?y R8?*C=?G??y??s?a?????[????na?}&?G???~?"???p? ?#?nF???[????Mk.? ;???{??y????g8???`&?yPy?o?5/????Z3? ?a????g??Q????fc? ?U{ ??m?????_??v=??L???2Z??5]+s?rM?<|?r~4%????????P*BX2??E7lm?4????!\_????? '????C?J??v??qU?,u}? R6??eW??*????7J?????X?V????Al ?}? 8???k/w????w?h???k, /??VUM? ?z90??%?X'???? j>???SUq??>????UG*???n?V ?b? ?o?w?-WN?Z3?????i??????v??l?eV????????0??o"???(?Q??????????i??h?????"??IjZ"78?[????)\??78???d?t????p????Y|H)d??I ??7?2G.?T????S?$?;?I????K?????8z???a^?tTd+ ?E?%?Y?,-?E?????b?? uq?b?????Sj??o??(C???A~?ssc?[???1??????,?? 6??????f%AVL?2???,???K?n???0??Uj*BC2?F?M?yeY??X?9Ac???? ?di-V5?F#F???'DA6?C??]?uE?6??3??+??mx? #?+7{B???h?DW??O?????2?k?q4?0!OFYu;???????2???Q2? a?TFa 9b?Av?|Y??? ?G???QX???.??? ??Nqt?I???{?4:?G??6?}?= 9 Requires: xulrunner = %{xulrunner_ver} %endif #Requires: python-libxml #Requires: PyXML #Requires: pygtk2 #Requires: pygtkglext BuildRequires: python-devel BuildRequires: desktop-file-utils %description A tool to log all your sport excursions. %prep %setup -q # make patch work for current firefox version %if 0%{fedora} <= 8 %{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{PATCH0} %endif %if 0%{fedora} >= 9 %{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{PATCH0} %endif %patch0 -p1 %patch1 -p1 # fix non-exacutable scripts %{__chmod} +x extensions/wordpress/example.py %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py # fix invalid EOL encoding %{__sed} -i 's/\r//' extensions/wordpress/example.py %build %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} desktop-file-install --vendor="fedora" --delete-original \ --dir=%{buildroot}/%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{python_sitelib}/* %changelog * Thu Jun 19 2008 Douglas E. Warner 1.5.0.0.1-3 - updating to support xulrunner or firefox - removing empty doc line - added patch to use sqlite3 * Mon Apr 21 2008 Douglas E. Warner 1.5.0.0.1-2 - update for firefox 2.0.0.14 - fix rpmlint errors * Thu Feb 14 2008 Douglas E. Warner 1.5.0.0.1-1 - update to 1.5.0.0.1 - update for firefox 2.0.0.12 * Thu Feb 14 2008 Douglas E. Warner 1.4.7.2-1 - update to 1.4.7.2 - update for firefox 2.0.0.11 * Mon Nov 16 2007 Douglas E. Warner 1.4.5-5 - update for firefox 2.0.0.10 * Mon Nov 16 2007 Douglas E. Warner 1.4.5-4 - update for firefox 2.0.0.9 * Mon Nov 05 2007 Douglas E. Warner 1.4.5-3 - update for firefox 2.0.0.8 * Fri Oct 05 2007 Douglas E. Warner 1.4.5-2 - patch for working around libgtkmozembed.so crash - mozbug#325884 * Fri Oct 05 2007 Douglas E. Warner 1.4.5-1 - update to 1.4.5 - removing patches * Tue Oct 02 2007 Douglas E. Warner 1.4.4-3 - switching to noarch package * Tue Oct 02 2007 Douglas E. Warner 1.4.4-2 - adding patches for changeset 107 and 108 * Mon Oct 01 2007 Douglas E. Warner 1.4.4-1 - update to 1.4.4 * Sun Sep 23 2007 Douglas E. Warner 1.4.2-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2008 02:13:10 -0000 1.1 +++ .cvsignore 7 Jul 2008 14:47:51 -0000 1.2 @@ -0,0 +1 @@ +pytrainer-1.5.0.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 02:13:10 -0000 1.1 +++ sources 7 Jul 2008 14:47:51 -0000 1.2 @@ -0,0 +1 @@ +9165d6a04a5293f900d1e2940ac0214d pytrainer-1.5.0.0.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 14:51:39 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 7 Jul 2008 14:51:39 GMT Subject: rpms/pytrainer/F-8 pytrainer-1.5.0.0.1-sqlite3.patch, NONE, 1.1 pytrainer-1.5.0.0.1.tar.gz, NONE, 1.1 pytrainer-libgtkmozembed.patch, NONE, 1.1 pytrainer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807071451.m67Epd9d007869@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/pytrainer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7804 Modified Files: .cvsignore sources Added Files: pytrainer-1.5.0.0.1-sqlite3.patch pytrainer-1.5.0.0.1.tar.gz pytrainer-libgtkmozembed.patch pytrainer.spec Log Message: importing pytrainer 1.5.0.0.1 pytrainer-1.5.0.0.1-sqlite3.patch: --- NEW FILE pytrainer-1.5.0.0.1-sqlite3.patch --- diff -ruN pytrainer-1.5.0.0.1-orig/pytrainer/lib/sqliteUtils.py pytrainer-1.5.0.0.1/pytrainer/lib/sqliteUtils.py --- pytrainer-1.5.0.0.1-orig/pytrainer/lib/sqliteUtils.py 2008-01-19 17:58:02.000000000 -0500 +++ pytrainer-1.5.0.0.1/pytrainer/lib/sqliteUtils.py 2008-06-19 11:31:23.000000000 -0400 @@ -18,7 +18,7 @@ #along with this program; if not, write to the Free Software #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from pysqlite2 import dbapi2 as sqlite +from sqlite3 import dbapi2 as sqlite from system import checkConf from logs import Log --- NEW FILE pytrainer-1.5.0.0.1.tar.gz --- ? G3?????}??????b&??o?.?O?b?(?SJov|?p??U????r?sv?Q?z?Re?7?RV+?7??kE??iZ>!o??}e??S??????@???8y?U??e9????Ze??+rMyC?])???????O?i???l?D?{?0?\i_?'3+ ?'Cw?{n?NBI????? ???{?O?=?x~(?C???y?kI???]?n??u????C?r?G?????.)#??%X:Jg???ys?}0o ??Is?a!U???8?"??d?g:??C?q?Zc???.??X ?????8????r ?OKo?EN??wE?Y8::????;?|b&???????d????Cn??RX|2?3?=o?Pj??(]??x?d??b _=???i????[??,q?!=++d?g?,2w%$?6q?B\/S?`?H???5 ?@~?? ???r?dk???%??4?zx@?F??|{???e ???'????W???#???&`?????o?D??????_?R^???j]???G???F?dHH???? @?Yz?:????(*????+??g???v???J?~|?-O?/??sv???;???/????????{??$V?%?:O?S=aB???:U%?y?_? 9t?,? \H???#d??n^????9?t?3??????I???h?J??v?Og?5??t}uyc ??L%???L??c6????b?H?g(? ?z??(?/J??t?^??T??K!c(??]? ????UU>&-/???F?\V?DQ??1?t?Aj?5 1_?? i??hv<????0?"?s??La(p??\?????????HJ??N,H?{R?upy?X?$?s?,???H?"??>??Zg?)]l?O??#i?&??bG?X? ?f]?8 ???kC?B?+G?:?b??`d??]?+?Sx?/ -n#T????\ ??cHS????O ??Q???x???el????R#??LJ'?b? v??'?1??]{q?-?_? ?V-06[A&?(*%fJA? ??~???? ?>?5i?j?\?7&?5h{r^0?????????8??g?? z?I??%?R^?r0???????gHR??+f???0}"?C??x`??V?_?????_[)&?x9|+q?AK????"?y`?k?_??Y3 ???Kj+?s.????#.?_????]???/?.??W?#K?0??Y??zXU???R?}?????r????s????M????.????[,Q???L)u?1 N???????s?????~0`a?Q????]cdh?)?Ut?D????)?|e????Wwhk'3?y??P s?,??v????k-M?*iy??7(????tP]??J??f6?? !AB?? !AB?? !A??f??*&sR? ????????;zI??? ???{Z/#???Q?+z???c?h?N???{I??2zuI{myTQ??5?&?d??kz?7??fT?????5UMm?????Mr^Q???????z???? !AB?? !AB?? !A?X?V????Q???/??Z\%$V????PMi*MYa.????Y?????2s?]@?l??v????FS??????up????[??<{]??K?????R??Q$?_?;???pRU?????2{??u?iVmT????dN?2????K?e?yW?????J?9???d?U????f???n-????b?v?? nrB???Sl???Q3?9??\???a??J??I?*m?7r'!+R< Q0???vQ]?3?*??{?]?G?&J??j???v??2'?(??=?G??B ? ?e?&???%?y?????9R7????-D???c%?tl??Z \U6"?Em?l? rg?R[????Jm?u??l??? tS7t]?3'?Z?K:)????8???f??[6?? !AB?? !AB?? !A??????,?o**sM??n???pj?????bQ??x?R?b ????Ym?m?????Vo??~?6?sa??Sg???????????f????]????\?Z?^?U????1[???HR?????????Ha?{???^???5?!??KM???'??????U?3w????J?(??:r??X?fj???nW??????z???JV?z?rHW ?;$^G?4Q?YiS ~% Y)??$! ??_?N?k??2?yU?ce?2???*"?????????}1r??G??r'??/?+?G??a?????'GV3DJix??%?????1???_??w?qf?Z?????J??{?;??? ??|?_Ml?fi??j?'?#-??M?v??6???6%E?*?,?W5?V?V??gGB??v?u?(`??\n?{???j5????+????????F? qV?Li? p?????????K???hE?Z?-P??(??????7e?u?vx!w???????p&????????o??DADADADADA???^??&??w.?????Jr?????????U??j???GS?SI?,??? ?} ??A???i?B??W5o?W?&???j?l;?x???8????P???L???*?????N}??!.???????z?(????.{??? ????1???/?u?#D?u?d_L??L ??[?w-???V \?h?kw???+I????Y???S?Z5? N????"?k+????Ev5sz92f&??A??&\??;L???p??F?????2]a??m??????C ??W??o?@?????b??rT?"r?x? ?8?Qoe=?U??????OU??{6ADADADADADA? T^E?t??y????o????(??"Q?u?m m??*??????f??&????s?? ?? ????W^??x???. iRo?FR}??a???n???:?e?]&?? b ??E?X?I+g???,~???+??? ?"? ?"? ?"? ?~H7??7EW???e?2???]?a?Y???=?e?"? ?"? ?"? ????tk???i??????y??v?????DADADAD??5??i?z???rY?u??????DADADAD??a???f,?u?IWk?6???c?3_&? ?"? ?"? ?"???5mW??m?}]?e]???.??DADADA?SA?4?2??????_z?/ADADADA?)G???0GDADADA?j?nF?????b?.??u?#v ????=?7,G(??_???S?DP:??I?c???????DAD???0?X?S;???? ????v??k????r]?????? n?u???m????M?K?I?m?????e]??8???????;??b~U?????Q?w???\?b-????M?E?D=?K}?>?q????? ?d?????q???n????_?eX?y??y????e?I?Vb?~Y????J)???(?>?DADADA???:?@??9=/]?W?=???^?uX??oQnRm[?aY?w?f{}Q?m????????o??r?????????"E#???[??gA??n??y??N?????s???^?jKu??K**??=?s9???X????????j???{g=J??]?5?8:????s??(?~??????/?????????u??L??Nu???A~????????Xw)?????(>?u9???{??r??5?????????j?~?#?(?x?c??[??2??/??Hjq?]]?!vl'????????=??s???]???N???e?"? ?"? ?"?'?dc7???9i?????Q???0??z??k?????k???????5~??w??g?v?+^????[ ??I?n????J?0?]$?????o??:?]????Mxej?n?n??g????m?8??k???h?m=?3^???????25!nol{?~?1m??a??^?/]??_??k?????&?;/?y17L? ??????!G???????-c\F???4e7N????5???V?z?~???oc????R e??;k1|?^n?????E4 ??\,?"?I? Xu???n???????Jz??O_?W?Hn}??k???????????n?????6????:j???+??u????U ??B?/L????Z!??U???D??v ?%D??b?c3?;??)?????K??????5nf??]X??av????g??ut?-?????r?L?????Zxp???z?`u?c1?????fH?"? ???@?"?|??Y?^??_?+????????M?-~???????`?o uW????]?m/???%o:4p??[!?????/?C?0ws#??????w??>GR???J9?W?E???c?x7?3e/GDo?m;??}?_?+^????/@?yz?????[?Y???????f???mk?=??k?mD? ????"?j??jD??#5???f?q9?8i?z?K?41]o?y??oVy?^?;EHi???e??? ? ?m?@??N???a?"?????v{m:??Pg?]?r?x???[V?9y\?}#eWSL?????r?k?[????????[?W??[?+? ??_??Z'.n?x=?a&?l???(~? ?D[5?R?V|??e??v???&???x? ?9??Z???yc????a&l?q?????Z?0 ?S+P??????_?[O??R\??T???[F?? ?{?#l???yR?\????m???F??m3???;???u???b?N+^??1?z?P?f?f????w?wq&-??4*?|??????N2n?8w?}??w u??E?xe{???FM?>?&x?o??????|??vz??0??>?? ??;1?Z?|?:nf?%??fe?S(?kWG?8M?Rw??P?W )??c3v???r? ??)*w?B???k?k$ne??? y<"?????[G??:??-O????|? ??J????Eu:*???|HADA???@?t8z??G?ew?~??a??M????uw2???^???????b????x|?@???=???r??r?M=l?qt?7????'5????8???$?? (???*???x?lu?? ?PW??-|???s???K????Z??X?????Z %??X:???*?<~???n????5????)?Y?q!U?k5?Ob??=T????.??????8?.????| ?/?????+?R?`T?????? 8?`???h?? ?Yo?????*Qu????????????? Pz?|G??sSs(??P???X??E#? ?"? ?~4?foi??5??????I 88; ???y??G?QG????????V4?"? ?"? ?"? ?^ ??fw????k???????GD??!?????|w?JySs???Vv?????? ?"? ?"?a??M??x???u?%? ?"? ?"? ?"??? ????Yl??n???.~???DADADA??@?4??g_?u?????GDADADAD????i???Y???~b? ?"? ?"? ?"? ?>?M3,?r^{???.~???DADADA??@?uX$~?p?7???DADADA?) ??S?????? ?"? ?"? ?"? ?~*h,?m?lY???? ?"? ?"? ?"? ?????????`???_???r?S?'?? "? ?"? ?"? ?"?M l???Y???_???_?"? ?"? ?"? ??y l??? ?"? ?"? ?"? ???BSs?_???"? ?"? ?"? ?"???~??? ?"? ?"? ?"? ??????O'??#??DADADA?&?????K???E? ?"? ?"? ?"? ?"? ?"? ?"? ?"???y??R???:??4 }??}??w????w=??^??875??hDADADADADADADA??tK?4C3TC???? ?~??:??+?S^????Z?*????????u^?y??r?????rM?/(ADADADADADADADA???8%??#G&h?E?^$????W4?X?DAv ????A? -5?"????/"/?ADADADADAD?????}???r????4???,? ?g???L?U/2?"?&?????k&?y?:?????(??#+=e??rL]#b}???Z??s3G?????.?'?5? ?y ??z?k?|?????4PzG???Y???*?*?W?????S??)?ks?????X3A???0yKs)??E?f??Xi??~c??f???N"?C?&?oE.????U???g?%?l?"? ?"? ?"? ?"?$?????Y?]??y??e?????-Ss??l???D?k????Zd???N ?K??@???`??;?3~?;???n?D?????o???QE =?3."8 R?"????}? ???f???&-??-??s????t>??|?X;M????*?s?????OC85?N"O??J???+m ??'?? ?v"??????8?I_?$?^?#?RA??g9b?&? ?"? ?"? ?"? ?N@??foiV???????l???L????k????Ed?T???????o3?,?H?FQ????E?fM?*r'~v???M?e![r???Z???"???&? b??f?X'B????T????8_M-z??????u=M0????F???n??j?A?XD?/X%pf4???p0?2??2?%p?ES???w?;?Z??lCd???yT? ??J??6?6*??[?????Dn?QU? ): aZ?L*?T{?*g???>G?y?????dv??fT????/???9:???l??"?r?#U?u?_?k?v??9l??????9???!?RdZD??{s?YE?J?`??????????????HS?P???/? ??j???Z?lc?8k??9c>zt????Z???R?vm?)|>zj??????E????U?(B?XC?'???????\? H?S0?8?h 3???????? ????;E?]??*??9b?f?~E??MDADADA??A0 ;??????} ????9???njF?A?UvE???W???\??S?????Vu????jj???{ ??????&????????i?pV???~?+??rl??EvV???=w?????WB3[?`????pQ ?h5?????*??;????.q&"? ??G!?1??db????pF5A??C??N?Hi??JI????C???e???????^???,q?a???????HZ??9Xc0??D?A??p????9?S ?+B??@X?? rV?Y?R????j?w?"Azp?!?a?rx? xfZ?`5?5;kF???????q5g???. ???{?z??"? ?"? ?"? ?"???%???r?^?z^??\???e 9U??K?Z???g???/(*Z?[???? exB?u?????? ??z*~6t3???&?N?@R S3.?k???D?.x%?g??2?"???"?o? k}??D?DD:?_?J??" /P(?s???_m???<??\?S?<]V?#???6? ~??i?C??4?>???qas????? ?1~GC?6?~????????lx?C????jQ?B%^h?E??3?+?k?g?Lt???q?0*?????q]x?&B?????g??}'!G?>??^?????D???? o5?)b?@??k?{[????????|????\?^?-q????@???YdhRs]?R:???u?e?-?q?e|S??E?l??Y?`?@? ??+?[? ??i4??W?????+??r?????M????^v????i'?N?T+e??0e?GH???rd-?.^??r{6>?H#8$??#?H?|?l}r? {/?`iNO>~v??Y?/w?????Q?A?QkVB??????Ud?kp?D ?9??uVQk>???}?x?G? \)?V???`??E?Y?Bzb?f?~a?~AADADADA?d??????h???Mz????????g#?? ??q?q@?M??%??aB????F?!??@??!??S???^2 ?e?mg?????????5?C z??????%\#????lG?^??g?2?7?*???\???I?z?2tl??n? ?`t??u5x??K5?????(HI?.tzq??r>??????Nj?;sJEJ?A????O?????????????kB?u???)????8?? ?????????L??2Fz?vQ???E??4????'rO??s R?X?????b??.?p? V#XS???`??A?L?zS@?;d?C??|??#M??{????????IDADADADP??????4?\S???@?""?????????y?+_T??@??*?? ??W]?V??h????:,??C?lCZ?q0?? ??Y?ZV6cUj_????p?\???7gj4??j?1?RF?lT$?B??????*?k??{\~??w^??6*???2N?g?/a???? h?^??:??pbqiS?`???8??_r?Ysp<?u1?????=Zaq???????)\^?;b?f????S?'m? "? ?"? ?"? ?"??A????4U?????@j?.?d?~r???????X4??RN]??f??=???????}7H[??6?;s? :??&?_?????s?~???q>z;?t???- {?8?|F?~!?jk ???=???E?=?????MADADADA??`???R>???-E?RP???%?G1??=??#?? ??????????hz??w???{??O??????V?E;/? ?55?}+??????>{ ~_???:????/??O&???_??_??Y???i?g???Y???r?????gDADADADA?i,?e????<,?R??E.?*???????Q4?"??_???B??sD???????"?CA?9??a??]??,?9????F?>????lPn??E?=???=? ?"? ?"? ?"? ?JN0 [?f???9?4???? "? ?"? ?"? ?"? ?"? ?"? ?"? ?~???|?y9??????&? ?"? ?"? ?"? ?"? ?"? ?"? ??= ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(?{?g?????|F??7?Y??E?A?/?Q6(???ADP~ g???A? -????Ae-?_D^??l?Sk?[rd%?y??GDADADADAD?=????mjF?^d?EVM?v1?X?f??k-?????(?H????;?c??;uT?")??+?*?????w@/?Q??BdE???^??A???????????V????f???~?*?W?????S?pJ??=:???b?YoX??$?75?"/?Q6?????=?w E?e9"? ?"? ?"? ?"? ?"(L??????=?????*???R?"?h????E?^$|??ETG?BoG(??"?K??????+??S?k??????l5PO??j??YEPfLTjX?J$6??4????[????cM@vV?]????h??~Pe?Q?0P????L?s??co?E`c?F?KtJ???????|?P?(?Arzo?5???c-}>?:??]??:?-? ??-????Nf#d?kF?????W???*?<,$???? ?"? ?"? ?"? ?"?+@??? c-??m??a?PO???]g?s?%?S?#?????????7??? `??Nfg?g?k??C ????c++vX?AeWG?? ? ?Iv????GaB?B????F??;1j:/?U?g?Y??}}????M???? ??w? l4?B??J?j?U?)???Rd?????6_?W{W4?j?;???Y??wjk????????+j'L??Qo??? ?g? ?[?????g"???*?Udh??8??? ??jeg????!?'??j?3?R????b#?j?K???3?Q???s#?H?^ ??eJ?R?Fp?p:?ZC'g?G)i>?}?v????Sc?=;45#?????Z>??+??????{b??'6k??R??Ss??a??%??4??0{?DW4?????HO??g????}N5?0#?????aeR?`}>????S ???@h?tS??ki??????s6???????>?V+X????!????\3??~??? ?"? ?"? ?"? ?"????????;??-BhY?yWg?}???nj?g??H???v 8s=? 2?&4??g?/ R S3?^?v{?T?????"????"??&.??v??? ?r??%???-?? ?z???????IJ??1Dp@=? x}!"????ro1?I?4??W?9????????'b???(?A??4x%???m?????z#?zB!?a\??n? ???QS~?Y?>????*3,?AO{-F?N??)???p?/<:C??<|?kV ?!?Mw*???Y?*?E|??????????{${?5??O/HIq"?=?N?x?XEN????#????()G??N??@???g??AX{$}N???E?a??????fMx??(a?????/?r??T????{?<?????z??C????6??>Jzt?????+=????H???]5??f??%??4[%x?????1D?/t???Y??????u?-8 ?g??tGB??;H?"? ?"? ?"? ?"??????gC??>.?S???H??zO??yBi????9T8??7?L?O???V??D???\?}????{?n?#B-?W?? M????????wv?v?8?????????wi?H?*;Pz??Qi???}??8?'?A3?]*tJ?,?pUE??tcv???6?m ?YV??????s?r??? ?"?[??????S?>?A????Nzz`E?L ???l??Z??XK???2?W?*??wg?]?4???r5K????????????t:?8k~ SF???Q?C'?R?0???#?GmG)9???x)G????("????wX??SE???q???????4?E?????2???ei?9??f????m?O~?2???!?2#x6H????????/?i_G??f?????X?FG}?3??^??xjP?Ex??????o???_>N?????,??$ADADADAD?-}w?l$?W? UX???E??? ????p?*?? ????X??W?1?\P .?X?????F?NrS?c;BJ???z??u???@??z5?h??{\~???^?(???????xWZ;???L?q????????d?5??[Q?@??f? ]-???l????a 0???U????7$??????T?@#x)??:???W????f????2k??F??K?-?u????}?2???g?R? ??(?????G?i?Y?[??? ???N??s?T??????O?X??Q?R???cK???Z???FVzX?????N??Ol????/??9-~6L???gH???z?z??w?????????6???????]c,/??]?N?Y??A]`nD???m???Z?|??4[%x??????:?h???Wp??m4??Z!{]C8r_y???<:Cc-?SDADADADA?????H?j g+UY?)"?)? ???J??=8??!J?????w?_L?Z????4A??q\=????Z?Y^?)\??qfw?\5!^?s??4??F?? ??O??/??L???????6?B?O B????hf??;^? E??W`i~?X?????tk?ei??????????{??)?X???????O??gv ??C[(t???ad????3?9?????/??p?@ S?X?????[K????cS3?????"?j? ??H?? ?sd)?u?g?Ox????I?3d???u??G?u?C87GWxg? ??q_?_?>???Pr???07?@????C??=c??;X???r??W??x<6???x??m??u ??????!i???/~PG?'?"? ?"? ?"? ?"??? ???o?Q6???? K%o????[A??|?? t?? ??rD?O?st?????a??q??ks? AV#8?????DADADADA????????DAO?| I?u????F??\?J???? ?"? ?"? ?"? ?"? ?????????L??????k?;???k??5.????*??z??&???cM?V????"?Y????D???8??"?$??o58Ik4nE?w?h?M ?K?W4?????????j`?;??-?2+?w`?R????J??k?J??? [????kw@?i?D?P??45?"?8??ng??eG;??-"?25?O?(???+b?THj?????Au???=?????h???????Z????:???????*????C??????iA8?Q?????g???3?Z?{??z??_?X?J??"?t?lY??N9?? ?h???fxJ?;tU??)?@??D`v??? ??F?????????;s????x?p??[)?.??????Q???~?*??&_SF \J??V?^-{?hF?Z???D`?G?a????jD???0????&??????? _p_?? L;wjP??+.?;\mM?}/???z????098????????Bn?p}+?!bf>Ji6H-sn? ??N?f??VvV3????3$?Jw?V?yOI???{5Gfz?:?8:????{n$i(????%L)?w?? ?p:t?5v????=?O>f?O?Q??9?g??f\???!?Vx?2?ot?f???????????('GDADADADADA????????_?gG???1S?@p?????n??N???_?3?S????.G??G????GtV3G0'??????#6??????a"??7m?!e 5(?+?????!??U?N???nQ??%g?z???Ye???+?}???>3???+lf?3????!??n???"x???????Yo???]??? G???r??(eJ??`?>?R???1???4!=h?O?????3z6???cJ?a?8&?O?:??? ???W?j?(???}'i????? ??D ?|Eb??]?`j??*???k???e'?m=(????2?z|???B???Mq??B?k?9??rg???=;65?z&GDADADADADA??>#~?[??E 5e?Nx79?s?U w?/?A? ??u?/?A??s?<F?F????l???(?iL???Y??&????????A???+|G?"? ?"? ?"? ?"? ?"? ?>????R??U????{? ????ADADADADAD???>$~?;?FA=????]c?~w?? ??V?i?k?$i????????)?u???5??.?e)?7??????????k]??|?????&? ?^ ?z?,??9jg??y 4_D?Z?)?3_???YU?9"? ??O?,{??????c??9???3@??mO>?#???s??A??#W???E#?? ?tl???N&N?! ?'@??a??9?- Kc?}9"? ?z4}w?l???T?b(?z???V?r??:"?U?^$e??yE??A?&}hj?,???Q????,G?/EUEx ??s? ?????C7?C??c?n??O5??j?r??r???W????o???_?#??? ?,??W?????? ???W??@?,??V?????s? ???}9?"PQHW??????|?g?:?4G?? YC?Z?h?T??9B?5??d ?????\P%J?:%??W?l????}???)?\???! "??}w??\??]???lj??t?lj~Y?,K?????}??8?^???????m?:X?+?s_?sS]??j???????t???B?ei~?r??MP?S????????#?"??WZ?? ?fb?6????????n?C&??_n?u????i~???????]v2?5$???5?&???&XnE?\v ?q?????&??"???u eJ????+?N?nu???j??(??? DP?U!????f???v"Xe (?????????rm]_`?@?0???{?44?r??Z???N??k]??j???c??F]?V]?n?G????*??????M???Rv'??OZE:I????,?6?nz??5N?i]H7?????KU5cQ????VL???T~z????L??V|!cY??????e?{?Jy??%? ?38%?S-k?:?r-t?C?r????!k?~p??:??vT?Pe? ??? U??vp??4??!???G?285??!~??R??????e`???!?>?nu$?Y??m/2?z?J??!}+k?Lz??E???S????!.????????|^dg?Y??E)[?i?u?? ????J?(??#V7U?o?$2?"????_[|HW?uiD?L??r??? O,?^e?%????"rP??3Z?ud??7?^?r??s????8??Uf???????;d?W[?1?T?P?[j[?Z???#L?f?l)e[I? ?W??E_w?G?r?c?Y?YG?????;???i!??t??? '?N?b?h?j??Q9???^?y ?U?'?u+??,?S^?9????@?????$?=UV??g?m??n#{k???J_tm]??:N?=?U??&T??????\?????>?^?????M?????i**????O???w?my?\lyl????8.??go3?F????{{e*j??S?uU???x??R?k?q????????f]?.???N$????8k???I???[?j?#F?b?{????kP\\??U??O?Hz????aZ?3??j>?_}4??f(v:?U?a[>hz*G?????r??Q'?js?O??./??OTK?2?`???e1O\`?P?{????.A??"???bx\.???3u???s?L?S???h?EL?????*?/??????@2?????h???W??????N?|?l9Q??:?ti???g?X?5G?5???Su?:&?F??? n? ?????'?? ]t?S?L?NzEU{??G?;9?^;???I? ?????g?????j}?{ ???g??U??V+X????+??jl??2?)????Rp;????R'?bh??6??_;p?K*?c???y?f,\[7?;????????????j?~Z?[???jp? Ff?[??X?/tq??w??? G??????1??4Vp?????H??k?h???n?????????}??5U????v???Q_,:?gXHw9BJ15??5?*e ??ph?c??!??j?)?o?/:6e ?? ?????U??u??j^??&kH???6??,G?k)?f?????????C??*k?Z ?????m??Q'k?? ?"cs?^???Y??2????z??V+;??E??????[v?7??h?e ??)?????E?????,~a?_?* a???z????0w??(.sn????&?(???n??~q?X????V???=?\?C??c?????v?2?????-???_??~9k??????FA?@?[?J?SPw?4???p?????4?q?W`?/?q_e????n???.'+?F???h???? ?j?/?f>,??????.??*????B????_??g?&???8?s???????_g?]?R?h=WG ?B??{'>???Qi??????jVzE??^???"?i?9_r???J??x*~??i?}t?B?@?9Z?9?(?7?eu???H??OV????wts6??????N?l?P?Y??????T"????-[????????pR???j???f?????_?"??K?{??7?????A??7??/?V?}?O???n??`???d???Ms?BK????j??9/???]?y?_????`??V???Y???]e??????z?????3???<6g?!????cKN?8?r?_??!?????cK?;05G?sN????Q??~??u???^P????????2??(Ut t?????^??'?Z??D? *?????U?? K?;05??+}?B???9VB=L???g?~[???){w??N????M?g???I?"?TK??????E??!??)k??F????H????5d?F?Q??I????|0~6???58?Fd??V?y????k??d??0??cBF?low ?7?????e??wf????4??y?S at q?Z?Y??Qd?@?55??h&?1???wj? ???};????m?>B?C'}??d?35[)??>Do?l????G??#???????H?^|;??Zu?Hlj???k??ATO]9?>_?h!=?6A,????: R1????w?????eb95?EvV??[-?h)?t??M???-?g???+?????o?q?IvG?Be??w???Vxe??]?lU??i?7? q??????b/??_:??]???' ?<????%+??!?'?N?}??????E?Jp6g???e??????p?? ?g6?HUi??VG???Jq}??5???7x?b???m?CT?r?????a??????O??X*???=??Y??w?AW ?>{??$???(?????&v?;w]????8r?????q2 M?; ?irC+2j ?HW,?)Zv????M??fq???X?2???9????????X?]?????w?ou:PsB????~@"??:?'M?? ?`-.??W4?ww?6???/?~ =?. ?t??^?^??p#??/C??????6?/????#yF-w[??g?h?d6*%?J]/g#?????`?l>/??;y ??.M'????\??c?w!04?nu????]v,U??_??#?T}?v?*?'M?}=????????Y]G?? ?h9L?????!???\{?k?????????L??(??W?Y??? {??!?s6.&???a! ??+kH1?x?"i\?^OH_ulw 2?9?5d?8???bj?Z?Y??m]G n?O?w??_?-??I??G.?R?E{&eh????eI?????j?kF?????g'{?Z?fg??????&?c}??????s???wd???? SF?????NI4? sgi?s ?_E??N???Y??????????zp?G?FA?0??*?G??? ~?C??????????O??_)??0}?CA?6???g??h? ?/0????????4\??pa??J?^?G??V?z?.yc?????r?^Q??+?????????K^?v????C_?#??]????.?|?=?E#?W??ZE??#??q???rd%?~7???SR`?] ?/?????@???2????d=y{?~????J=????9?-p_?xie <~? ???~?? ??z????????n?9"?8?_?f?BJ ?_??e??yA??;~??F??@??f?? ??p??Jkph?Tq/?h:?? ??u???????'????z?a?&??ro??E#?q?t???NQ??)Fx?j??pa??*G?d5??Z!?!??#??P?????_ ?_E????om$?ws???$6?e????#?> ??yq???)k?????Qn"(????9?-p??X??? ?-pU?xme?N?n?|??I'=;S?Wh??O?N"???????????h?0??:?|[v???U6A?6???g??h? ?x??bf1???!F?n9 ?b??t??? ?}?w(???q?????? ?RP? R???[????,A?S??I9?-?D????>;??????NSP??g?i?|?m??]D^?#?~"????#?????c??e[????? ??b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?2A??MADADADADADADADP^b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?2A??M?????????a?]u???S? ? G?(H?ou??e?G??e??9?????W???.?e?e?Ks? ??`???G?O]/??????r??6?."?,r??i1st?U?$??=*??V#? ?4}??>?[????? "?cA???g??kA?,2?"_???}?$?'????e?????DADA}???g???]?Fi???????)?b??[?j??????????:??V??1Vm???~h?UTEU??Y ??_???nl?_?_ *?T?{?????A?v?ik?fX??????sD???@(?p???Y?????-c2?~?>;?\?/?AG?Sqx?F?????Wj t'G??0???A?q?????b?z??{9?ERL??@O'??I ?*Tu???-???k)?_?#?z?>]|U??R?6G_ ?,??????????~2(??w?|??U?d?'?`?}s?zT??g|???????H??M???4]f?0?"?$r???K??h????_5????>???J??!???>C? O?DA? ?????Z?F-;mqm???.[??!????e}???????P-?V??O??WT????o???v?u/???+| ?e?_-Gp???vu????W???c)C??;???6Ao ]???M?????????2??z[3??V?k:?? ,?^??e3?5?Y?G????&??Y??e??{F?H}7??T?4?"_{?U????I|???}???h?kyn??????Y;??4?????Z????????]8?;??}Jvjv?E?A/J??-???M??j(?? ????????Ad? ???? ??5r????????=?vjD??yq?&?T??=;????vV?y?p???G??43??#Y4??????L???5*????R???YI??Z???>????+????-????){???????n{??A ?]?=?8@?=4?A?Rn??#???U?" ??_??~?? >??U?[?8??~??O?I??6E??e??O?????? L??Z????????Bl??v??L????????cJ?iQ???[?l?T_??t{e????C??m;?m?$???????j???HU??P?gn???Ss??xZ:E??:?:E=I?(?go??@4-?7[3?????t??7J?L/????Q?>;s??v??????? r?G?8Wih|^?T??gk?????P??g??????5??E?&5x???:??}1??l???!%}R???][?? ?K#??:$4???z??:B'T?? e?L??T?c?????~!?g??rZ?"2???7-?qFs{?Ug!7??k T`0!????_dy?U?????/??l??#??O??S3???? T???Z]JK]??=(y]?,??25??r??S??}????B??sp???Z???o|?&?? k?p?t??7Xc???D?? s?? ??:?t??????????????9~WG) x?q???$???4?_?]v????V??d6?6???0?!?????e?C???~????.?_??+ ,=???q??/?N?o???????t?????dw;,??fWojU?D9?U9#w?X_?>RU??d?^??l8???5/???0?l8?Tojv??f?zad?e??????b???j?x???C?{??????EA??????2??]?\n3[????9#G?_? [??Q?????rz?'=?DA?b?'??-?.p????)\nO????;`????E/=???|??e??K?6???Q?gnWH?_???0???????8????d8Xi??g????S? ?AO?|???d~Q????H???;????T??????8u???f???"$???R????$M]????f???a??m?3n??????Y??U?|?n?d?*?}}????????????9I%?O?o???\??????v??*G?Sszc?l???h?_?w??/{Y??+*???v*k???????O??r???cM ???s??2?/?)??@????{???$?l??r'?OZ??Px?????O?3?g?&?J?????s?? ??6?\E?u4K?Fw_????L?(?)?Ehj?r??=?))~?i???~???U??WB? ?`??)?0????::??8??hy??[Q?Yd?a?g??A?Q?Hwp?@?????????1HP??? ??'E? ????,?>??????????H?7????QG\?a??Uo??,?????:r>????~?s6A?Y???lP???&x??s,?????0??????Y?/a ?L?wjVo???V?.??(???).?+?_?]g?8x????????g? ????????`-??I??* ??]?F???u?\?[?.??mQ????=?g???????> j?G7??P/??????pz??]?_+??f?Z????]??+???Mx?[b????=????_?????? ??e}???????l?qyp?}~?t\?+;{???? ??w???@???OA??A??[-?Mli?Y?SL????[Z n??x;??(~Ik???P???`???????(???X?"???+h?v? ??F(???Z?N??????FK? ??)?n?g??????H?w?`???!%??Cn???n????<?v?~?ov?g????.???w?n?=?m??Z?I??& ???yP'n?e???g?!?????$?7 ???????]\??????k?>??LoiV+*?wo?F??u?45?"~?????C!@???Jo N05????K?? z(}???????X2?? ?8$*R?'?&???f??.????o?g-|C=????}?(???a!???okw????u-?2L)???u? ? ??Qd?'p??@??????e?????m/n????k??4??H?q?>Lu???+%qOdp7??NC'??? ???? ?E??K??????&X??????p??????~G????? U?W???A?? ?????g?4???(}???N25??X?????}nj?,?????*sn???4?~SUz??????4?.??l????$????W???O???1?|8'????Q????????U??/??R?F??e?#?????M???P?g(?I???? ??H?qlW?A??S?9??_v?^??0?6???\?@?????????bo?Vk5???E7?????*?;(?????'-?? 7?z%???&u????6?f?_h;???{???w?J??w????3~??? ???w???"$?????s?f M?/???5%??/d??]??(?(???}?g?y*??b?0*a?????B????U??Q?l/~??R?+u??H?Q??zf_ru????(3.r??KZ?4?f????A??>?.???}????????kzE??_??M??@?tq0[? {?Y???RE?? n??C??R????a.??`????RE?V?U}1.Z?A??h?V9??[?( ?E???/??)n?????55[??~??z .?FdV4A??n?8??5???\????V??N???8???q???*???{?B?!c+b????5iV (]?v^?.G?E????G??ai(???W???)????~\ ?G?>?X?{?8?c??u??Ed????????"D jn|????d5????*T????z3= &????H=??Q$????k???|??\ K??{6,????o????x???m{?x??N[?d-|T?F????? =vA?S-?R??????pXa?~m???9??7?r? ?t?????!?T?w????-r<|?????5??)'~v???2w??????k?pU?????????B?N???oX???!?2?Q??f?wg($???c=??>?}Z?????Z?TEQU?{???F???m|???^?(??????s??z???????_?????????B7#?:??n??6????c?????BU??t???[%7???c92??=vbu???q?k?#???@?}?u#????O??;[.?????????%??U?i?]?t????>??t??1]}??s??X?;?p ?? g?i???Gw-??V??+?a??!?z????(?X??Y:Ey?N!???t??????+?N??????F.d?????p?4??c???F85?0??7?No??:???&? ??%??S??-?5??f?h?{Ke?Z?Ad?8??`??D?11?}V~+?nj???,?U?V4?Hc??%|D|x3 }i?7%~6??????-GA??jR[????????"??O?G?????r??jB????T??+??wE??Bv?F?g?r?5[8s?f?eI?Q?t?????$o??.?a!#~?O??B?u=JIV???:?u?????cK?????g???)?(w]?]8?b];V? bP?n[?V??^u?."/?A} ???he? ?z????Yo?? ??f?Z??FADA????DADADADADADADAe??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??L?gDADADADADADADA??~o??v?{??????Y??E?A?/?Q6?*???? ?"?P????9"?????v?_.k??"??E#????????r8?~`?"? ?"? ?"? ?"? ?JI?7~?ej?z??Y5!??,b???D?E?Z?????Q$)G?O?i?S?????E?&z]e?????A??r???G?h?E?aD??Z?[r??@???U9???????lPn^??w?G?|9?Q?#GO???????f%??????R?e9?g@?a??zc??f???N"k+??\j???r?v?eiN??????"n-Eb?&?qP?}#aiTv9?F?&C%??y?0x?????"?AoG?A?`Z?L*?T/?*g???.i??E?R??#?_X? ?[???g??!?st??V+;??q?}???_???????B$???Vv?/???? 9?"?"r-D???[???UP???????0?=:i?G???B????(}J=os??:???h????????#?????g?l????e{h?D?p?/=Z#???F??/?)?f??f?x?C?k????,?>RwO?O???S+mz?p??l?? W??"??=t"Z?????d???n?k??)?????Z?`E9/?Y4??h5d?O`Z?b ?`???????5?hi5@ADADADA??A????V _???W v???RO??nV?V?TC??8(?M??.K ??y?a?*q??MT;]???*?M"???V?_??xE?Yd?b`)4?<.?^? /?^?w?V?f???@3?[eV?F?D?f??????=?(??vECA?????????????(??45?"?8?7*|?o?X???\,ej???QEW??????;?j?w9??;k?C;??/??&?[8?_?i??????s?.*;???";??>D??J?(?????????p?/<8C?}?G?????5??*???????#? P?]??#?l??x(X#?Y??????t?hn#??)?*?9??tg>?????9?>5?[????[??@??-??i?4?W5[)??????5?e???!??W9?h8??y;????W???i????????U????*8k???? V#X??Y????t??W??5qo];O?4?k[???8f?`?g^?_?C???????7~DADADADA?}w?l ?Uc???8L9?P????"P=? nXE??875?S?????6?Nare'?3 ??vXX?5b?W?????>G??C%?}???SG??HIv?????? ??QT??^5?*??&_SF \J??V?w ?@E?Rhi>?#8?x?#?,5$z?Q5?5????G???2???Z?yg0R???g?? ?<:C?"|?k?E????RNo]?U>????~???c??p$??(wzy?.7???}>?ZC'c??)i>Bz??????gg?l?a`????`f?\}N?{??;CJ??k&g?xV?k? ??=? ?V?h????d?M?.??????@??5??79??$?Bn#8?_??z?b??%} ?L??J>~v????y??k_???8o\????~? ?"? ?"? ?"? ?"?w??;~6tc??#????F???D?{?I???Y/????C%?Zyw ?????+?~GC?6?~?????j*b?!?L???P?????3????g?Lt??D?????????,?wi?+S?N??????4G?????lT??f??"?O?.G05?W}?G?4?H^??????l?]=???z??u???`p?w [{ #A??k? ???u?e?.????????M???7??????2s??J`??7sh?eT}?|??9?]???0=j?:?M???r>? ??ERND??4r??M?a??????????/?????ID?!?+X????g??Y??y??`e?~b?&?W???tn?t??f+??? S}? ???"a?kp?E ?A?????V?pV????????z3???????-K??????!|1??D?q]?MDADADADA??w?????6?.5?C"?^??/Ptw?S8?? ??/ ?s????=XM?P?=~0M:???A??Y?e???? P???D?;G???????g???A??V+??????{B5?snb??z??8?/Q?%??r??X??r? V#??ADADADADA???? ?"? ?"? ?"? ?"? ?"? ?"? ?"??????DADADADADADADAe??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??L??????"s/?92A?,??"?_??@???Y%???&? ??S8?~F?:Nh)\k? *k??"??=J?x_?#?"? ?"? ?"? ?"? ?"? I?7~?ej?z??Y5!???E,\3???????;7?HR?????V?1u????j?g????l???4?u?DADADADADA?????L?u+??"]%?\[?f??"?Ev?K-R5"k+???`??;?3~?;???n?D??H3??@05?*j??Q?q?v"?(???L??[!N??[r???.?/???87??A?????g???dY?m???:???J/?Sc?$?T??D??G?ADADADADA?$????.?"?:??]R 8?:?V/???,??"?E-?J?z?YS??????;cSsY???\4"??*2\D?F?D?6???$?A(??? ??B???EB?X3~6\??? &?}??H?7"k'????b ?`???E??u?M??????6??*A \n?T?*???????"k)????????a(,"?J??6?6*??[?????Dn?QU? ): aZ?L*??VD9[VE?9????6??'?[??Y:???~4????iGuf3'??#?????\??+V??a{?????????? 9?"?"r-D??f?*???nXE f#C?Yc'?????c-7G?Zn-??=?25+y??V6?5??K???;????9_??t???h??.??i)???e{ ????????|?[??+??? ??fq??b?N??????n?~>??? ??3?h?8(wM&.?^?t??^???V??f?q????j?*?Sh=;4?jX?J$??Z%H"(??q7?SG???qV?]??|iE`?P???.?`???5v? ej???Q?DW????.?|O?Dv???5??l?N9????-???J?p ???eWG)S???j????=??tg>B??????Sc?=;65?r?? ?-????P??????=?Y???a ??A?`j??m-z3???I0i???R|?r??=C>???;^v??&0k??????!?ODADADADA?"?w??F??X??,|?wE?05?v?:???x?bZE?t?? Oi?/?U}:l???????w#?aaa:????MU??????\*??#?'?fvE ?#?.? q??F??`%t>? ???!e4??;?"???(%?G?????r?}j,?g??f\???!????a??? e? ??????qq???]??a???1??)??d?G?3?3=;c?g??? ?Jf??h???Qn"? ?"? ?"? ?"? ?"??L?????9R??Q!2??Z?(t?A??`?g???"????T?l???Q?f?N?@R S3bcC??1?6X??????|?G???}???????>SN"w?U#??E%pV?(c?9B???6????p??????B?.?????T?| ?x??97>???????3?Y?S?)C?;:???z??4?wP???`??; 9????1??/???Q?[v???m?S>F?????N?????????|????\???-q????@H???[?c?????t?????:[???!O?e|S??E?l??Y?`?@? ????[oG??i4??W?????+??r???m???A?;?dX?|a3ND?N?V??a??????'??Z?]???/??l|?FpH?;,#??i????Za?????????l ?0%???L?x?[?Un9z(%??O????????????+???j?|>DADADADAD??@?? ?U??K?????h??,?D ?]?????(??;?p>?[?(tP ^V?P?? ?.?i??? R??????W/?????3N????N05[){?|?g??`A???Q? ?J???U??p????E1?B????ES????g?Z? 4n/hx?C????-??K?R?/1l?C?S4????)((?3??W???z???j????? 6N?N?9?5? "???8A???@?#?w????$??/?n??????????s??W8?tTg??*2??EW???e: ????hf???_?~?VI?3d~???"???????4???Q??i?(HI??????????R????C'{?g?G?/'???YK?????g??fX?D?[E?z? &h? ???m?A?????????l f?????}Q?????????????5?Y??.G) _;C>?"? ?"? ?"? ?"? ?"?E???????}HM???Oa{U?????F?C 5??|? "????A0?X~?????i+??f~g??A????H5z N?????@??G?5? ??????R?e9z ????6Go}??'? ?"? ?"? ?"? ?"? ?????m???V??E?J?v????E?????Z?jD?V?????v????????E*?^D?A$|??QE?=?3."?N?E^??? ?p+?6??????O??U9? ?F~4?|>?????v?55???[\/*???5?N"O???/?.G?ADADADADA? ????.?"?I?????*???Y?"?h????E?^$|??ETG?Bo????0?=:i???5?5?????cF?s?&?\??j??F3????X??Q?R???????^???Mt?????g0?5/????`v?hN_????[P1?a?'?Mp?????Q9Mv??g????????G???u?????&?"? ?"? ?"? ?"? ??}w?ldZ%|NV^ ?fM_K??qAg????HT??B?}?;??sS??MW?P????$u?????qPYE?I?j#?Hk4??4????h?@?;h2q???f?????#?*?5[ xq?Z%pV?YA????????.?aB9????;????X?O-K???"0R?bz?n?iG;??-"0??=?FBW????0?;j'????????]??????h??M{?D`??????T??zn??Q??>??D???1_k???j??xp?T+}??G?e8?.?"X%???f?J?w????????i???5?8k~ S???V+X?` g???"g?GH?q"2r?k"??????c=O0?G??.Pk?)??f+?u?;?w???S?lk??QOr?i??S?K??N`??????????YXn??2#G?? ?"? ?"? ?"? ?"? ?R?w??F??X??`??3p?2????t?Y?}???H??? ~6\????O??z?????n??????PCv{e?????yP???y?k?*B?]$.??Q?;???Ze????u?]t4??*????????@??`?????[ "??6??^?F?Xz5????Uw???????v???:???????s? `?? Z|u?S[Sw?K?Y???+j'L??R???? ?g? ?[????.GfA4%uT-???l??;N?f??f?Z?Y?`?gH??????????"x???L?6?g"B???~?(??H<?Hkz???!Y??Z?tJ??N???R?|??????%G????{vhj?]?j???? ?o??`?z??5????;??`jW1???F?4??av?rf?gzvz???G?f?_?u?U3??? ?"? ?"? ?"? ?"? ?^????H????HDf??I5??7,??????g?g?gC???Qg8O???AJajFhlh?=!F??[ E?7 ^?EE???]$.???D??a:?_K.?],:?.????6I)??2???\?-D$]V?[??-?????GtV3G??_}?S??D?P?>^m`?>("v??????M???W?qo?V/Bd1??|?-v?x?~1U"j???]a???f>/????;?}????8J`?)???p?/<:C??#|?kV ?!?Mw*???Y?*?E|??????????{${?5??O/HIq"?=?N??x?XEN????#?????)G??N??@???g??AX{$}N??{???~)??????qq????? x ???-?Z>??95??>C>??3F?????'??:??2#G?? ?"? ?"? ?"? ?"? ?2A???7??k?/UY?(????:??y?h????Yuy???V?? 0>?Z]???bm?rB?n???? ???NR5??(^?/4yP?*uW?????i???4??;??q?5?? ??D?[\A???<????z????.?? 4?u ]??K3????|????5?i?? ?[-????????r??? ?"??Koj>?|???Z???u???+b?bX?7e{\??w?Z?????>~V???,5?v??p??????._)?(L????M??????0e??N:u:t??? ({>Bz????#k-??r?????"? y?e???s?????k??f?}????,??N?`?85?1eY?=???? *?)c?|?g?????G????'???U3dF???2ADADADADA?O?? ?U??;?]|I??e|?"?]???????gCq??M ??\?l??J??*?*?iWs?1?[?59?HA?W"P}?\#????lG?^2?g?"??????C??[@??nx???f?????z?LAq ??H1??3?5?)?????j???$?NR?l5?? ?o??6R??J3??k?????J???N??I???"???Oy;j?????Yo????2??/??????@j???(lR? s???A?G?? ????^2,~H9s???j??????)??sd-??`-?r{v|Us??\?? ????W1?.T???yAL??R? ?$>???`????#^?h?In?wlGH???Q?p?n4? ????P????{\~????lz???"h?????e\i???25?E?J????????=??????rM?HI?5$?P??[??:0yM??G?UoH8??`u g? X??????4????_z3[EvV?5?}???%???:??????e6??????2;?Q???? ??????ky???/rRr?B??????e9???|?U9 ?????|?3z??????????kb?????h5?"? ?"? ?"? ?"?8}_???*r?D????h?~?[g??? K???"K/???*?[??gM?*r?;?????\"?%?H?h?"?EdmD\=?X???-?I$,???? ?\??|5?H?k??????&?@?#?7"k'??u? R,"???"X%p???[n6??~??eV ?`???ER???k??????qk)?????????F?"???r???M?JD;?Va"??oEP????????r?T4???r??????]?)En92???-?0???z6??>G??l?????'??????NA]?*DR??jeg?B?O??C)2-"?B?k?E??nXE ?????g0}?l????}?0??5???l???A???T?v??l??C#??hTPG???????l???n???2??S?P???G????r;??W??f?? ?Y3R?`F?s?/?g#?`];O????ud??j?????J??u-3e<?9?n???(DADADAD?/ &??f?!U7???U??*??A?nj?ujX?? ??fq??b?N?????t?H?c???$ %"^A?w?(_M ?K?-?????U1??j`?;??-?2+??`?R????J??k?J??? [????kw@?i?D?(??45?"?Q??ng???S;??-"E??M?(???+b?TH????????x?i????t*??n??~???V"0???????8???f????2?:+???GtZr??f?~?Y??? ?V?????W4??8??pC?]V"P???+@}?wu??????i??`?g?/?? R??????r?T??????????????Q????J?-??r???!>[????i ?j?R??5??5???XK??????????$??a7oo?(B?BK?A??w R??PC?W?5?^???~??F?T ;??S?j?6|?FJz(:???????H|w??9;x?^?S??_Q;arpiSw??? ???n??VC??|??l?Z??";?????|???f???gH8Y?@??????Q??k???jw*q&"t???G!.??H?P8Y?K?2?"q+4???q??AJ/r?|??????)G???????q????Z? ?0?v?f?????7rs?U??A???p????&M?|???G??????3???????~??? 3?kI?Y?[W-sn????Ox?`> );P???@A\qh???[=X??0?'w?t?JD-?;M? ?D???*?Ud\??h????q??<_a3[?q?/X??? ????us?????Tv h?}??"x#??r???m8?~?;??R???1???4!=h?O?????3z6?0?`J?a?8 ?O?:??? ??p6?T?????(????d??????????$??Q?2??|/G???????2[E?&/ ??[Es;?.?????u ?:?? ?,??????>?e?????vn$??OZ?K??GO???r??? "? ?"? ?"? ?"????;~6|???_P? "?]??=N??!5????T+???3???r? Y? ?]?!D??^?;????H?m?????x?:??Dv????^?{g??ne?R???^Y???qUox???Z?????QJ??Y?;C4?//Lh??(?$?rS3????|?B????;?A??M??????T?}????,??y?-l?1L??/??2l?Z???u???+??bT?7e?r????8??g????*??j???i?Q?w??\????(???A?;? ???_????H??,?ZE?SG??y?????????r{6>?H#8#e????&?????{ +s??1??5???????d? ??X????#~??-??G?d??????3?F????[?O?? on?tJ???/?????!?2z????n?}?9;i? R?J?qnu?q???{????/?Q?"? ?"? ?"? ?"????????p???p?q?I??e|??C???fA?CC?y???{.~??????"?? ?I??0Sk?75k??TS}%?7^?-??=?cC?????b?F???;T?r?&?]???z{?a?????M*B?????z??QqG?????_a_K???????? ??D?UY9??>?1\?2??????V>?????Q???V??v?t?n?????????1?HzG?t???7????/Q???~??s???|zq???W?EN??+FJof????X????`)???????????????vW5??3N?s?????????a}??/%=8?a ?5?}??f?w?]?????Y??X?^??????? ???s:?%??????7?????????}R???s#??E???l?????@?9"? ?"? ?"? ?"? ????????rE at b=????Q?S?7N??????;?eye???iE?R????U3??? v????5/??? *b/???u??S????OF?yg3???_??_???????"??N??_??*??Z?r??!?[^=??????kYK??L???C?wa?9?eVs??>Z????9?????E?J??????t???b?i????O??g???SC{=s??.y???i????&??????eOU?????kr?P?????~ ??"????97?!w???\!=JP?k?????j??P?b'????N8i? ??Iag???u?X??b???????(v??2X\??U?S9????Q??r????4u&l:????d?A?M?Y????z???w???jn?&???p?h?$?6?G3? ??????????ik?????~v?0??^?9g?R????xT>?????/P?BV.?dGM? M??s????MR??f????(???.|y ??????S?uX2?~v??*+???X??O??Z?Q?O?@?3{?S??` ??? ???n??dg?????4???w? ?k???#( 5??+??????m?r?K??/?????+g???_r??+?d??/?\?K,?{??????????_??? ???????g?I B? i?<??z?q=?}- vi?I?5??x???"Nz.???gL????o?a???????>?{.Ry?T????????{????Oy????Y?{jV?XU??????n A????h?f?HV?_9?????~??K??"*???i??r?K??????[^Bn}????? ????j?i?^???=Z???_? @? ???"???? @? ?N??????? ??pjL??????&W??????>R?Y}?(??RC??i?Qe?=?V??6[??3??)6?hj.&}??D ??Z~?/??d???d???Q?49??\???5 ?I????????~?{T?5?0M??i??G??&/??n?A???M?xk-?|f???G?v??-?!??Sj]????????kG?J???-????3?i?r ?u~]u?M+}?ls??9+???G?}?H?????l?7).4??Y33-?&T{?-??.????X?Xv.?S????? ??J?T????G????M;L?'??` ?m?????|?rW??C??N?[_?Z??yk?r???gvv_??0?|?R+Z?k??;W??Z?}T;????Y?I??=?Q?z?y?????U3??2????7?.??]?B??GmaE???????B???????a?l?kY? /?? @? ?? ????d?c?^?fW????v??!??rk??j???p?????CU?G??=]L?????)?n???B?Uf-c??^Q????=J??$??[?Cn ?s?,?;?(7??QV????^????~6 @?  @? ?}e?z????s?2j??pe??l?ii??E?a???V??.????~4?Gt[x???5????^?p?2???R??v? ??(?~?VQ?? o??^!?o??>?9??Q+?????? ~?'??8?? @? ???Q?????h??r? )?0x?iR??\w?L???B??'????????~?*?\?4?n??I3N????ygz?G%????I?f??????0?N???<|?A????Vk fvn?Cn?_>j?kv??>????(??0??Q?0?4?????Iy??^?~6 @? ?{???vh?5 @? Mg???wyT?????Qx?G???yT?????Q??) ?=???D?E??T??gS??M?/]:?akz??????}??]???S--j~?G? ????6????!??Z??yT?G?4???\qB6GSIr-??(?"?_???Cg{??0M???/j???L?M???? ?Y??]}???Zq?????5 ?I???????U?????1?G?~cJ?;?F79???n?B??/i??[ki?3;7??Q~??U????;+??a????}????fg??8????I?l@? ?/???h???????G???????>R?? ??i?????7???.?ez?w=/ ???w????T?z????5mMN??@???p4-??3W?d????????56!?:??e?7??Q??yT?G ?L?I;??{??BCo?yT??j???W>?]6&???V,;?DX?Y{?????w????nwjE?N?@???;?b$rq?;=?X?rW???? ??~?Nl|?j?^L??5???G?3?v?_?j?????%8???;W??a????0?F9?g?&??q7??S7?? @? ?{????=??&?n??LT?@?]?????5?:Y1j7;5????y?????y:???Y@????#Os=\???ytq[f;?]z? ?-5????|?V?nM?|? Y???s?he??8?????z??x? @? %~???}???B??????< ???yT?G?.???u.?\???1?4!??j?R?4&?hB??Nao??uP????g]v???7?W??Q????f??????(?~?R???]??s? Y~3?????3?r?|??v&?V???q0Q? @? '?W|???]??j?R???O?X?{? ?(,??? =?4??m??D ??Z{??{#'?[???=????L?CI?5???ao???;?z ??3=??????oM 5+!?s-L??uy/?jB???Ps??????Z??]???C+d?0W?Qn?s?T?{?M???Dg5????  @? ???g?I????E@????ND??P?z?u ?R3???Mo??????G/?????Mj??? @? JTk????ng?A??{|4?6?I:?????mLwvv??\?W?g?????t9??8???b?S??d????N?a4?;w?Zn?3???:??????N?i3??}?l??&/-??????>R?Y}?(??RC??iv?L B? ???r??????????hj.&}S3?v?????m?[?k???Q?lru???4t&??'S??Vr???G?i]???-???]z?????????Q???JB??%8dv?[!????}?2?N??????^? @? Y????}T>??v???????????  @? ~???U???  @? ?j????????'?M?{0B?uQ?WqRs????^?@???n]??l?????QK?(N?h??.???\M ?????8?*?H[??h??0?L^?u??j? ?T{???p|?_?h??p??r? )???N? ??=J,??????@?]a??'?[?;?kv??_?j??Z?4?n??IS.n??1????4????/?L 5+!?s-????????o5 ?j??f??????(?~????????V??????r?r????Co?&??{????  @?~ 5??#@? ???r}$??M~0?i?a4?Kw?Zn?????EW?AhM???6?k?G?M????G?}?P??HQ????4G????&T{?8?3l??Cg{Sl???\L????r3??_=??????????ir????iMk:?????{XI?,??z=jLa??ua?^?;qq????jL3?j?P?Qj???M??NQ????*d?;?????7???%z9QCn??^`6j??Y?Z?????Q?59??????&?u???????i??????H??????+??*/?C?ZL???n?Q???P?[??????Z???????s?,??>?9??Q??kg?{?h?? @? B????Y]>?.???\MS?^^???Qm??ck:M??4?L^?u??j?!??Z??????O?X?{%???E?ARZa????????*??!w?? ?O.?????w??U6??i??{?f?"??#?????4?J???1?"?????ka????{y?V?/????????(??0?|??????}Y!?Q?a????aVi??7?G?????F?l@? ??3}?????????]???T1j????d?~?y??? 5???hS?{?G????F P)?d=???p9?r_?t?????G/?????5??g??? ?????? ?????5??????N??iMk:?????{X?2\9?5?Qc?????Zw4?nr???????E_?\?????gvn?s???Q?^?kv*V????????(7?!7???4?Mqf??'???? '?}??OX??nh??))n??w]|??0z?z^"????v?;????0~?G?k???v??:u??hZ?ug?h?????IMS?k(lB^u?M?>*o?C??????(?:?v?m?&????4??? ?E+?2|p?lLz3B??Xv.??"???_?????Q?59??????&???iw0?H??wzT? ????A?7????*???????yk?r???gv?0?~???(Y?sKp???w????\?G?a??r?7&?*M?!??n4i?n?g @? ,??~????? ,?ykvu ?b?nvj??5M????f????[?;E????g??s?Z??{S6???????]\??. Wc*iB???viL ??F[?.??????:???????z?io?y??357Qs?+?? ?)???FrrV}?W?Zm?V7?t0i???.???????ib/???????????5????`N&??:???? ???5??F???2??QXN$?z?iR?????r3????FN.??9{??_=j?&??N-j?????)w???ygz?GE??W??jVB?f?Z?j'??^?? ?x??????];????5??m??V??a????0?F9?6?????I??j?? @? ??X??=? ?Q?E?????? @? |???????^j?Qh?g= @? 5gA???4???????????????j???i????=?????9???h???f4?????????!?^>??"?7?7R?????  @? ?+,/p???f?????V????5?i?LB?O???????=?_??x4?7?Y???it???????E??\?/q??Q???? ??W?Z??]?W???o???????v???i????v ???~6 @? ??i?????)+????6?H???? ?Q??G?????j7?ikr?E??????i?????E?w&5M]???????????!??Z??yT?G ?L?I??{SP\h?M%M?????h?U?n??IoFh?????-???] ??Pk?kv??_=j??Z????$P{2???\??}U?G?+m??? ?;????*???????[?/?k}T>?k_(x???V?f?????BV??????(??0?g?&??q7??Q7?? @? ??7 ??+?X??6??Q{?w8????4La8????l/?\r-??(5/?>?4???2?????ARZ???&??{?X:Ss5w??????O.??w??????~?*;??i??{??\???c????i?G_??jVB?f?Z6M??u}/?j??rI?nE3;7??Q~??U????;??%7su?F9??Y????4M????? @? |????????k 7???? @? ??3U??}V:]??qmF??? sn?C?3 {S??n???~6 @? z>|t??\??dP??*??q?????w??Y?n?F?]YPm"????v?;????/??uM[??.z???=M+M?/W?h????????5??u??7??????&??h?>cU??"%Sg?N????????f??? ??P?Q??8 wp?lLz3Bcc???NEd? ?/?*?R??????&W7?t0 ??L??)??AW????a?]ig Ar8=?Nl|?j?^L?????>*???}!r???QK?h??]??\!+jiT?Q?0? gU&??q7??v??~6 @? ??$??;??f??Psu"????~?w[?#9?g?%?f????? ?????;X????Yh?\?!w?59??\k5???#E??w?U3???iM???n??J?<8rW??????w??h?nwj??r?j?XD???Ps?G????7i?u??? ??[????7i^??uP???f??P@???~vf??r?_>jK???]???[? Y??HQ?(??a??lo??i}c?~6 @? ?+????"??? @? 8?'??Wv?U^??"???cU???qs?f???]9?????*?g???s? Y>?5}ts?s?N???? ??4&?g @? ????~????>?'??t>???i8????l+?\ B? ????5??F???Jd??9??)?????q?I?os?U2QC? %8?\n?[?k???Q?lru?<~??&?8ET?G?O???i? ??c&E???6;??T;Y?????!^,[?[?)???Q?a~??U???o?p1un??kve6?} @? ??wlR???7?G??.?%W?i????l? ?????{?t0)f????yg?s??G???K?&V?j?2?T?X??G7???U???ks? ?T?o??;??S?Y???/P???}??Nxh? ?b?z?@?fU??T???Ss????M?4? ?w???~?,B??b-?5P? @? ?? @? ?v?????}?????gx??Aef @? 5oN?+??i?jM???fp%??]x?t0?nBl????fg?&?pv;??e??#??Z??T?a????45?????????4t???g??n?Y?@Y?????M???y??9?8??&?????l?L???&??(??h9!7 ?3?.?~0?????!7Se?;??????r?D?I%????M???6&>????N???6?K?|f??????? 5??Cg{??v8??'f???v?? BX?B?3M7???iR???????L???(o?Zj?????Z???? ??A?5?????Ps???V??I??+d???];??  @? ?cw???Wl??!????{3DQ\?$ S?=r??)???&?z=??IO8?MO???D?=??5??{]I[.??]j????ksjQ??(? ?M[???1??? ?,?_?????V)?8?????L????B?l??? ??(????? @? ????jsm????.!,G??i?P?f?"n:?d\Yn???LM-?n????b?l???G>t???agR?????-?X???f?r?n?S?/?$??t=?m?????"?? |????s?&5?????????I?????79?7?? ?^HG??~?/- @? 5?=???M?f?~????b???V??A?e????DE?+z?@K???^D??V?1??P??S>Qg?(???3??s????f????}???????Z???/?\?? ??(?Ja?????^}?U???????e?V??A???3@? Y??? ??Q??~?/- @? ?z at d????o??????@????i?? r??6lN??7??????]?<*5?,??w??h?5c??d??5Py?l????^?? ?N?M>?6q)??'??1??+!???? >???r7/??5??yts???L??7?b?W?@?^??L_??7y??x{I?M??QS'dV?l 2&5/"{un????5?7j??"g???,?? ?26?5?W????  @? ?N??t??V?g+??L+}????a?=QCn??O??J,?P?dd???????ei]M9E?b?S?D?*5?b??$?mZ???*?8P4??q,????hQ??????^F???O?6?)?9??TZ?&j?]Rs-X?????[Qc?l???<?????X??}?V?\??r'???+d4??_?f?  @? ?????T?????p?,??a??}czZ??eU??'? Z?hj?E???AV????iGOO?????\P?"9????Y?r????H??;??*???6,?]????;???mB??}? ?&??X?U?????{?x?C???w???mX?_??9?????????%?0???v.o?3?X??C?*????rX?}?I????_?5ai?e_}T???H???#/f??{???GFm?Z???E??R1?w???d??_?f? @? ???J&R??M???'K??????'?J???g=????^??U????.O? ?i??8x^????Y???i??8 |???M??%???b????V??[Rj???? ????I???x???--?ZdA%??w??VH????f?r2 @? ?????W?k??QiQ???J??0?_?MaL???]???t0????????x1??~?????????S? +???o?L?hJ???b??Ex"3?=?;???IEu??lzB?3?}g????9????_??????f???yT;Qk??7-??}?5^???h?>9???bIM?"/;???V?X?[??Z??u??????J?m?G??V?\??r'?Z? ?????? @? P???Y?,=!7??>J??v??T?????????l*99??f??3|sws?f????Qf??&j???[???I????g?? ?}?????!7SsM?zT??jIZ9?Z??Wq8.w???v?r?E?-??K????????w??5@?  @? ?)zt2??n?Y?@Y?????????????????ilL????L?L?;l9??? _7?&5|8???i???N?M>?6qMA3e??????9?????????l*-x?tT??P=?e????m?S? N=????????0?F9?4?????'???gy????V?????9??\{3?y$?jW??N????7s?z??_?G @? ?????-??9????????L??)|?fy.?.??L??)??Eq?9?Qy??m{1??o<5F??%???4,;55 s7?F?-y?@e3[?f?8??J?g???'s?i:Y?<\Q??i-???B??A????f~?G???l????S_??H?zTn??G @? q:?te?c?wn???????z3?T6?*y,?K3??o?LY?? ???????b??&?Hw??]????????l??Gj??r?U?????+U???+?,???*Iw??b? K?K?hR?????nw&u????????6?hm?q?.????x0?:?#? ??[S ?????bJO(or?H??Mn?? ?r???p;??I0t??wb?n.7@? r*a5???4u&?h?P=?I?c??* 5??????|??^?=????~0?Nj??? ????i:??v2???ls???=x??O?????~?Q?vLi.t??y???p??u?]5?????vN- 5?6??a. ??[?????{?gG??????@? ??o:?? r?5M????nc*???~??=J??7????sa??wu7?n??)=!i????8????Ta???s?f] ????G?]?$???zj*G????m???? LY???a??W?7[?????r4?2?I? @? ps'???~?G??????l???&(8???Vg?z??? ????=?t??B?l??k?ZL??????jV?J?^D?c?l??v???7y???d*i?Zt=1?&W?]^?l??l?7?f?;3?!7????%???????>9???G? @?  @? ???4@? ??3}?G?U???=z ?d^?Q.h?z??}??e? ??y??Q???\??Mv???}%h?~?s???iy?qkr?Y)]?????|>??E???3?*?\t?f??s????????_?i???}?sqe=? ?:5??!???a??r??r??M?[??;?[??Q???I?"kF?8?? ?{1=?3F}?%k????u???%E??Zd?iZ?AG5?J?V9???v????[? ???}??vJNOP?Y??5ut??=???W?g??S??e*x?"?[ ???l?c??^?????~? S&??H\)????WM??\?]F$T??k?????3??????r??t??????c???#!???????fi?\???^koJ??9)/y??\?C???????ilM?Tm?????????????????????? ??(<?/Y?r?N??;?Z??? ?`z?x4)?6????5 ?+< u*%WE????^??}??2?=>}???F?=A?l@? ?jmR??c?kz??Ge+?????c?:?yt?n//???zg?6WR!????????6z??}y??w??iq??Z??9??4_?Bi??/???????~i???H??? ?`?=??`?GjO???f5!???k????K:U%0r?T|???? ????:eY?.!~?J?T?.???E )????]vs???-G?N]???p???d?N|?l????W?-?? L.#???(??N?H ?a???O??? ??YN???&??)?IV???/E??^?\kV??,#v26??H?????????JpV-???#???_? =??j?j??v????QVQ??X]??)?~?u??q?_v???} ?v?????!l?[??f!9k??Kq?2?A?0?2~6??m?0??P?D???9??K?B?h?p??b%?f??\???'3?5??@???Kky?}[!Z???nD?? ap7???K??[LC?)k[?g?g??A??Q???????b,?^?~f?l?"? ?"? ?"? ?"? ?J?R??-??lu???c?? ???2??A?Ec?x?????T?4RT!??V?"+???].&?$???!SDA?????e?????Z??yo)"? ?"? ?"? ?"? ?"? ?"?tJ???ECS????M+@??etz????h?/ !I??=???aSjr?AR??(??5?kLA?b /.uH?[?>EP? o=?O0kDADADADADA????g?9k A?7???+?3??Tt1u???Rtx????,?`?"????R??G???J~?=?x#DADADADADA????N?ADADADADADADADA?=????Y#? ?"? ?"? ?"? ?"? ?"? ?"? ?"? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(?????{?????Ha>T??????N???? ??A??j ???u?u??Rd????f??T???HADADADADADAt_??{???2???? ?L??K?ej>H????2uY_t?R? T????hg!? ?"? ?"? ?"? ?"? ?"??Ot???)?15?g????nu??v'?8??~O??VU???+:?R???]Q?Za0?,D???!x??)lZ?????????n?}Q?????87?R??+??B???mR??4.[m?6H-??*\+ at 05/?????(Jj?????h?????5y? 2??P??e?)W ? g??8????<~vB???????ajV?????0&?U*??????YN?k??z????GH???v?????t??"k???b%K??5?&h!? ?"? ?"? ?"? ?"? ?"??Ot???i ,?[??S?+Y? RW??? 6??@Tmf??`?2??X?2E9 ?j# #?????Bx~w(??*j?????,???????? l9?????;3Q4???6?fZ?4qC8QBc??U?S?J$LQ( goxT????????B?Z??;??????W?zd??T?L2~vjW0AV_???g????u????* ??>#?????Sz?DADADADADAD??=?????a 0p???H???'1???iWT ??N???TtKtXH???wj??????E??`???gK3\??3Q??u?????????S???S3G?`????iO??Y_????2????-G?>E(`D??%??QVF??pL?3U?B? ??[6,??@^t??D-;?=??,??????}????G?????* ??S6?]?Q?? "? ?"? ?"? ?"? ?"? ?"??@?9~?!??a???@{??? #^,?.??[??%3??????????[??dH??IlJ???????l$N?,?"?,,????7? D? |?Z ????????s?L4& V\j??f?????K,?B??>?N?*)??ajV?? ?L??-????'?? ??Z??l&?/?*?Mj+?????j???k??? ??e??Q.F?sV?;x??,????\.T?L?GH+??"???Z??N?????S?J]x??? FRR?l?L?:>E???Pe????p???2?E"? ?"? ?"? ?"? ?"? ?"?S=???* ?)TK?v|??5???XxWa?H???;???%??V?I?:.??1B??;? :???E"? ?"? ?"? ?"? ?"? ?"??R??=g?????????)"? ?N ???b???>r?"? ?"? ?"? ?"? ?"? ?"??{rJ????5?N?1x???i?? ?:?@??=?DADADADADADA????g?9kDADADADADADADA???DADADADADADADA%??? ?"? ?"? ?"? ?"? ?"? ?"? ?"??D?gDADADADADADADA?&??]'???t&j??=?@:#?????c?? ?"N#EDA???i???jjj?=?=-P????? ?b??G???Y???' b?? ??Y~????? ?"? ?"? ?z??'?{8]???tg???{S?a_t[?F???M;S??T??y??? ????K? ?LQ2? ?G?H?SE??'???A?N???????? ??'h+4????[?z at Po :????[,???2T?p?RM??Y#?9???H?U?ADADAD??z?????y$s?????q??iuq?] E?#??X4??Fe?????3??EG??SU?I??|??I?k9??L?-??~&7UA?;??v???????P?'Zp9/ ?????r??E'm?%????L?PF??Z ??L??,??? ?? 8??(????w????> ??h?????????-???????JpV-?v???o?r?x???%???\????_"?[?ejV?<??5SM.#?????R??U?.?+?????????>5z?$?~???0g??Y/`?o#???K-Td?p??]??N+4?em???b=|?=??~??)*?,X?????M/h??PT?2????~z} ?0f[O????6??[$???5M??~???^?s??????KC?? ???^??iu^k???Z'p?+?????J???W>5A???>??? & T?J?"-????g??Z?LG???,???S?rlu ?;E?W????????2????V?P?????r*D???C?_F:?o?v??4X?b?3_'?^?7+??@T???[\+q6H?sj???R????K? ?8?1,??O???"]??a?/g????B???j??`2t?KiG!??}mKW????Z?**???8??@???<?3????R??7+?e??f{???7`rY=??v?'?d???\??'4?????.O?f??????$??5|?eo?^?Sd?C???e??F???]k?\jW???Z??'^???? ,????4?$a?n?F+> ?EVi$dA#a??e???M?[R_F&(?$?"? ?"? ?"????>????V????uq?w???oZu??n?? ?w??Y??~?@? ??v?O?D'G???9 j!????^MC??S V]??.5??n????^?"E~z??Z??.?(??0?_UL??0n??e)??"E??f???Z????zi???b?9e???vy?$?E?Wi??C????rq ??????k?]!*E?????p?w????z?B??.I8d?L?i?5???YNg=9???}?????~??????hSs?????A?=?@ADADA??????????E'??????Z???????!?)?E??0???r-?sR|jSs???o5?3?.> ??ty?`????????f8>4Hk?5??'fV????5?Ep??L?H?c'????????????-j_C??N?}-u???c?f3*k?`?;?!??}1????S????????w???%?bv3?? ???n=? ??A)Q????]??]?g{ImG?e?:?c??n?Z?>z???cJ?G?D,??p=i>5o??????a/?? ?-[8?-?j?V???????R???????>x?ek???(???V49?M???%?r???v?.f???3??g??Qr??=??EX1};=?r *???H??%05???? '???h????/?R?pV?Hm?-??g?B(s??P?:???r??w??j?O?7??D????(:?C}??5?XP?k@??" =??5?X????????Q;??+E?}?K?S??s??f\?vI?jx????pc??H??\5????k ADADADADADP?0~???aOT??g?W/?i?#?U)?F*03?j?g?1?n??y??Qr??s???5???k?D???D??=1???]vEGsQ: ??X4?`??G(rT?4?\?C??,X9pj????3????c????h?E?? I????????/Zvj???? }-?)RH??g'?(??|?.d?Y?????t?yt?5DADADADADA??????^???hJ???? ????zf??nIQ???? m???}??V???uK4?+ ,?]u}??z?nX??'???)J?????w?R?i???q?`ih?]?Da??? f?????. ???Y??????{!W??0~v)@????????????B?-?2???M?.?/?f*?r}??p???????????S??????`]/I?S$LP?o???b?;W??>f???|?????jI??ADADADADAD??@???+f4uR?d3Qo??K"W?m? `??????y???(B?N?f??? v,o?T?R??uS V?pV?Hm?-??g?B(S??D?:?MF? lj]????????r$???Z?'?????d\?N??07B{o??H?P??;?\???7?Y?b5r?"? ?"? ?"? ?"? ?"? ?N???DAGi???z-W?6??P???(??k???l!}2????E3???>?O????d?6P??EO#EDADADADADA? b?l?"??Sa_??LT????]??3??O??G????? ?"? ?"? ?"? ?"? ?"??1~6ADA=M?h????z?????? ?"? ?"? ?"? ?"? ?"??'b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ????? "? ?"? ?"? ?"? ?"? ?"? ?"? ?J1~v? G???? Z?T??D?"??B#@?8?DAS??"??5?=?O#EO ????)"????L??O#E?d}???=?{?[?? A3?~O?-????51?Dg?=??,[@??h?????,$?,Ss2(U??e4?z?X?????AR??@??z?U?R???S?z????"H?c???C}C}}???25????\K?? ?"H???h'???zlv?????^?`?]?x?=?????????.'?n??jU??S'#Q?????g????fyol??+??Bt1? D3????*'n??DADADA? ???g??<_?v????????f?5??Ag??`m??Xt)??}?gk\j????M?.?T_F05c? m2??.???Dt)z??S?Az???????xt?=1P??}?}??jj??=??&?1??? ??ztv????JQ??????p ???Q????E{C??H? W8?E?????)?Q_t1]?D?t,??ES?Y??]f??Q????{?*:G>?OU5??=?????_??t?)B?|?.3??\4????NO?r!?K?a??B9?2?N??K?z??]!?n&^???`8?Daju?,??? ^??]#????????:?????/TD:?E????-e?b???p]?1?????s??,h??D|%tD1?. :m??h?S?~Gt?2?D?J}5=Z??iCuVK5??eW?????Z1??W?uW???4??(&? ?f??}??{?%?x??3^??I???????Aj;?i?R?(??N?H????Y?(P??P??5#?y[?:?????3???Xu ???c.??1??l?4;????\??09b N???sQ?-A?~!???????RN?N?kV ???????ij>?:L vU? |??w???x9Nk???F??4V{??~??y??Dt8u?[G??Q???vT_F?????`q?/L???`???q?s??Q?k8????D+???G ?T?C?fe??ZvEa???*?Q.???,;??Z ?,?e???8? ?[????u$?D7???,X9??5X?:]Q??O????_???#H?x???????=3?Z?*??:??;?YN? ??? )J55'????Y??:???fg- ???O?_z#Q??????\??6?:?????n??6?c???TI?????e[|???B?fDjB????? ?y????!5???P?4??!????"? ?"? ?"????>???????? E????icfk??ajY? ?A?]^?e?v????V???#?? ???????O????i?????????A?Y??q?3???5y?5?3?M?? ???Z??[? T?Ao?? ????`???;U?????)J?5?????l]?D????[{t?a ~??d?i????Q??u???T?\??j??6?"? ?"? ?"?8 ????9~v???-*E?????R}?m????25??#??b?????,????4??Q?B??? V]??0E?M??? E?r??B\? wL??T????.u$???o?????oXF~>?6?e????e???R???q?Z????o?07?"??D?u???e7????????k??1g??\g? ??iG?4????&.??????9??????Y?#:P?1????&E?QQF? ,?????S??"b"??\N??/#?'???`??????????`???7??Z??I????R????"?Y??????gA?=~??j5T+???sjCu??l??Yw?`Rn??[uAD ????Ep??=w?x?]?(Z6n??Z?n9?E??????OMEr??v?d?:$??????M?:4??JR????[????T?\??#?zj? ?"? ?"? ?jb??? ???Xd?k??)?/?9???X??0??U,.?v????T??H??u??-??=l?l?:u??M??i8P| ?s??D ?R???????b, ?H??oj6??A?"1R A??/??????Q##b??? -?? ???f:??i??aW???|???????Z?z????,;+????????? `O!?A????O??_G O??Jx3ZDADAD??AO?~6Au?_?N?2g????S? ?,X98??>?)????? jVFVW?JQLW??"?????Ot?O5aB?>??~? ?ADADADA?"????&?N?k?Z?I|Y???1Rtz?'SFp@@???T??r????,L???(?p?2: ?U?Q??jNNQ??x?>x?)(??>E?Cc??@?4R?@??Lt65A1c??R?4RwDw?-EG %?eS?))?YN?e>E??????ah8??Z?y_t??)E?vw?2?d?e&?j???T?=??(?!?9E ???@R????*$??.???L??)? 3??D?:Q??be4?JQYbj- ?*????K-?P???cp?$?G?0 [RT?'????/?? c????V?????jf? ?y?):Q?A[??A1f????I?B4?Y?eC???????S]72\?N3?-?=? ?O}(P??i?)*???)??Bt8=?y??bEJ,??SU???eu??SIM??k??????B????Y?Z?S???hwy????(O??lo)"? ?"? ?"? ?"? ?z ???/?i_t9???h*Z1?5?????Y?????*8??d?\?lFt?q?6?,t?D???!Q?1c??2?*?3????b(????s6?*?T?#H??'mQ??,??p??f??+?,;+?^?-~??lg?V?Qu??t?}?????E?O??s?e?UG???A?r:??b?e??????P???????;=Qg%??;??*1?:L?m?B?`)[? ????f???TK{?ZQF? ??????D?o?aS?2W E?Al??7fg=??@??H??"E????9???+???[,ED??????:ft???)??T?xK???wv?EG??SU)XE?'?f{C?H;????@j???E(??QjCuVK???ML_?/T?L?[v?Scp?????GV?w?C?#HJ?o6f??,X? ?zY??`???j(??u?/?DADADADA'b???A??(f?:??H???d0????(??BO?????Ng?3?8?????? Y??1o????????$`?????(?w? ???c?Np?LP??b3?]Y???N???jxAj??-~???????i?.???|??z5?,Fc???qO?FJJ??\?C??43???t??:?l?X??"+??Y?~H?? [v?G@??????Dz )?,9??Alj=??j?U?W????lY???~? ?"???S??r?s?? ??u???\??????R?`???)?p ?QN?P+??y???\?? w? }}?0??o???p??Ob? 2jf??c?.??j???P??[??????1???n{??l?h??O?O?YvV??d?a???krO[B??? ???pN?M#?Q ;C8-?9i???Z?T`??R?o?:|???\??wi??f?~e?|(?5??{#?????tv??/??>???Kuf?HQ65S?=?k9?1?0?B?B?b?$???????z?*l5u}kR??15??"?` ??u??(T?KF????^k[$y??????!???U??U;?????%y??F???????P?z?1;?e?7?????^?,T?@???jA???U??5?G?QCADADADA?????3???h??? V)???H??e??a?AxX?}A?d????1o?*???z?H????????EDR???\'?J???l? ?0????q??a????H??{???? wj??u???j?2??\????@?Q?N?_Q[C?V???g?T???????a!^??????M???????RHQ&????1]z??F'???r???0????j?h?"D?^ND??YB hswF,??*6I?r?=?Z({_Qj?? ???Re?? ??H????I???pla????"?Xu45A#?qG??)J J??F???? J?? ?"? ?"? ?"? ?"??Ot??????\????/:??6????t??4???#?e??i?J????????i?(?P ?0??)J55oKQ???Pk??hL???????&c??h??^??????d?N-?????(??.3Q_??d?e[4???Fa?????M???ejN?-E???H???PAU84??+:?????_!?????.)?$ 444?Dg?????z??_?H???0B??:'XF' ?i?? ?"? ?"? ?"? ?"??A????U??l!?K?????;???Nh? ???T???? ???????=????|?}-?????%??GZ???Xt'??RtJ?f?h??f?q????p.?%E??????4?/E??f?????z????c2,?n??l?-???.?????N)J?(??\!?N?`p??E+?9??G?+6f7[????dG?X??b?J??G? ???I????????5_ j??J? ???Z?P?~?ix??????(,?Z???R;'J #=? ?Z??? +9?2??`??2?NW?? ???h}???:j??H?w=~??[6^?????z???_$d???+?? ?S?v??I8???\?6?S?^#? ?"? ?"? ?"? ?:a???gC?kb???kx?{$??????&?*???9????????N^g?`?P CG??????{?X?W??w+??p?Z>????H'F??q,G?NN????S?+?H?? ??3???? M????b5???i?g??V??=?E?????5?e???i?MguNH??????T)???-???S%a?H|gNiG?tf?8.?QYS???{? ?s?%?D??4??j??Z6?}?5_ ??FQ????z??????4?????duN?p\???????L?????;5??l??8??@K ??????|o?X????nY??Paiv?????????????-??qj?? ???"?????1?$ ?F?^.???&B??1?T??X?P_ 0f????UW~N4???"DADADADA':^?l?????9?L???H4? ` @????? .??-F*R? |?q? +/??1????A|%LD??V%$?l?Ss???a???????.?A4?(Y?^\>?S?PF1?fK?q?.?????]$ ?@??oj?????m?b4???!G`?,o?1????oE?b???1?, ?Fb;o?(?????l/dG????????Z?M???gC]?k?-?!?f?,5?.??\fj?? ??x?????g?T??? ?????_?%;???g?T??? ?~?/???0E??(?2~Cn?ye?'?U??A????gmCuVK?r;m?S-U?n?i?????f?`??/?????R;'$?e??xdIT?w?{??a?H??????!?KD5&;(;o?)?$Ju+t~u??9Xa???-?? S)?;~H5A????`iF?kU??9!!5???y?o pY??*?????Ts?i???gxJcF??Sm??,?` Z?[7???Ec??4??r\ ?'???j???-y(???????f9?q?????\ ????`I??]????1/???m?(??]??Cc\O??????J????#?t?G?????b9v!? ?"? ?"? ?"? ?:1???g???\`VN'?+???G?N"c??u?-??T;{???Il??}???0A??Zn?)??K?f??D??:???d??|??61 ?4~?J?cg????&#Q???W)?\YN??JpV-`;??@????\ZK?(??"? ?"? ?"? ?"? ?Nt??}lb?4???Y>?z?=?4?kGgR??W?}EU?SQ? ????lj???B7pp?0[?|/ ?????????????????s??????x)F??c????A? ?????r9v =???E4k"?!?6Tg??Pb???le?0?CQ?S????P???????Z ??????@;V1E?????>Y?E?b?>d????????m\; ;k?FNd:5 ?)z ?????"\@G??????)??f)"? ?"? ?"? ?"? ?"h9?????ADADA5??v? ??d?-?Q?????DADADADADADADA? ????aj?nI?T??Uc????Ht????*??h?#m????D???^??cL??F??A? ? ??R??f?i??zP?S????\??l?V?b??`*?S?R?a?%?? ??>???? E??p8??.???L4 ??DADADADAD?????????H?-fM?R??????h????G?P??I???g*??h}??p???M??L???/ZF ??????/?zcQ????l1 ??9N3Q?\?????DC?X+?+PN?T??h??D??U??va5 ????U?]??????ZvV??Y??=U/j??urh??L4???Zv??7?i?wD?s?e&j???,?t7^??I?y??p$LmGM?#?rOpVW?^|????`???]'???\15?k?)2?Y????m????C?p?fK????????3??,#o?5??!?Zj?Yg=?,XRX??CX;W(??Jp?C*?3??b 5.?o?zH???I?G?QCADADADAD?1@????????4?f? J?'???/g?0`3nXE???M????{??,%L?0??Pfg???0?0j?n?>????S???T??#?'?`?5 ????3k??!???j?)??Q?pbT?%e???d!????ib????????2????EI?????y?e????t???e?TH??Y????P5?vx&??????????w?Z-???m?????@????}????%Z ???ouY? ??8???95???z'x3]A-;??So?p???^4P?o)1 ??E?fz5?t?&"t NiG!???(~0? ???u?????????kE???ti?KX?1??0???-?)HA??W??D4D?????E???N?LE?D??T????`??!-?[E??y???????+?u +??J ; ??c"???? I C???%kE????%?e?????,;+?V????x???G?-? ??:?Yw?n?t?T?Ex??k?Y??;??/_?3Q??? )jf; {???R??(fH?*?b??R??????5A? cR?0~vB??Y ?X V;?E???a?q?eH?U????hK????!M{\???F;??????Z?? ??pMDLC-??D???}???g??5?Z#?*E?4b?eHx???u????ADADADADA?t????L??~??D??vi{O7U?05?&?Ss8??V???]?gc?g??h(?>p?'!Z7f????*?b?n)NM?KL?g*@$? ??s????????,)?k?e)??????^?~?T-??I????????:?|???jIP???h?'??"?????6???h??0|[+?Voj????}=?is?yS\?9???m??Q???kI?]??u?_????X ?)ze?Sv!E??l??YwH!? +f?y??J!?????)?QL; ?????5??Z?K??I???"*\???ZY?RF ??ih??IQ????R[6?D?????+????gc?]??yw????Pol1??G??E??!??k q??9?vT??8k| %!~v??]?u?g????? ??k?Rd=?+?*?-??U??1w,Z? ?sQ?ob????T V%X#?3?T}?D ???????e??G?-BADADADAD?c;~63c $VW3?7 at . ??? em?0Q >'l????? ?.?3{???.?? I??R?+??0?&\L??????}?$?????n4 g? ?@??j??co??9???,;+???M?P?' p??V?ug?!,??29?????.?&/:V??q???Q?(L]?xt???_???Q ???Cj???qH??????pqL_KMQ???a??????Z? ???(~???????6??:2??R%|????q???-?~?j?,?E?f?k?b?? ?z*XY??????? ?eT.R+???p?G ??????+G???G?QCADADADAD?1@? O???b6Y????d6-&??l???~???Yw1????Eo???]7?M???x:/???t???p:?/?????yK???d??@j??0??????!?e}|????????p@]???X??)?{??DADADADA??????75wf?b8^N???x>?/z??t???G???3nO??u?????d9?????|2L????7?G.??|??=,???K"| q?g?SD??@|???????????????????@??|???z???d???QAOfq?HW???hS?D3???d.??f????q?N|>??????T???,?9E?b?????G????k?bY?m?>?u???m??(V???6???"K?]k??????j\^???F8tD??/:?DS?;??(??????????~ c?}??di>?2"? ?"? ?"? ?"? ?j :Z???R??G$k?D??????????????G??YOT'??7????[?g?3geSs'?-?;>?A????-??????Vir??T???g??p?????r??=??;?????e??Z???????y]?????E??hx??gfAE#.????x.???9p?Y%????A??@t?-{B!?c?"]A?8?U???????+??9/0Qx??s??=EzC??B?V?SU?H('O?h1E?x??~G????,V?,???|? /???? ?\0?h?8?J?*&.~_?x???????)aMV???W.T+ V?B????? {????e{????.??`[?-e??h???b,Z???@G8SR?smY ?? ej??v'?8M]? Qk??-U?? ??S?k?B??nU?"?]X?5???????h(?rI%??Yy???#???3Q????{???Zv??4!? 3B????U?k?Y???l???(????? ?pAj;???????????:??(fH?*?Y???u?{Y??G?d_??%?Kn?eS3,???`??E??j???|Jol[j A1?^:Q ?2? ?vt???\k?S!??????? ??!??+7*?Y?` ?????? VK?uy?#Z[SQeTHc?s ???#??u? lDADADAD??;~6????`??/p!k ?f??Y?D1UY ??x?p?(d-?#f ??? ??'???j?)BQ?pbT???,X???????1Y0A?T???l,?=?T1c?!??%???K3???[c???=)?05??$|?}??f&1a?`U??M?C[?;\g^???m??N??(?P?Y??5????Y?s?e?0KR?"?YvV?a??w??H?OWD5[70???#$???*?}-???????Jfz???`MD????B\3?Q?`b???H8????J???R?TH\?/I?x?Omd??JQ?????Z??X#C,???2Voh???f???h?:T??j??kDu???E??s,C?[eh? A1Y?$???wjv??&?G;??iO?'p?i??`????Ss( ??1N? ??????DADADADA????g?A??? ??2??q9L???N?t07 ?]&.uf??@?4?S?l???a?????j??[?b????U?!?)?QW??u?C?F?p?f?#_.???u??W????*u?=?Z! ?k??n? ??!?D?NiG!.j< $j??/?_??N|???J????TH???0???!59E ?r?R[vy?????c???P?????????0??? ?:???B???~!?Ro:5??A?k?i???g?* m??(?7??(??] .uH?????(????+W?x?{C>???Q??G????22r?i?[??&Z^?{??8?[-ADADADADP%?????f??H??f~????)??C? ???P??K?T:??-D???j?jX?aA?1?Z???N???YC?vl?:????N???ra?,?HN?q}???? q?P?p????h???.??M?i?????? ?ll )~?p?P?~?a?i?8???a|B wj?c_S3???,??ys?0f???3??t????YuQ?V}??g?6 ? ??????PR?g??????????e?(??! }-9E???z?'??????Q?K? ???Yx??????a?Ss?S$|????Z?}???^??8 ???0}M%??R ??)k"t??:?v???? T )?j??kDu???p?????J??"????5??5HL%???.95'?Q?s-?????Utt?????KK?{v??y?%? ?"? ?"? ?"? ?2????!j ???s?_??"??Be??{p?'??M??j???&?????,Ia?4??b^ ?r?XK?????2??)l??qf? ??jq???PB?B;?$&j??Z?/X 0????6& ?_6b?????f??zSP?gf!,??9?D?????^?[?T???98\???17\L????????5?!?va5 ?n?8????z?=?~??????<[Y???h ??b;ap?T?l??u??B?!?? 'fs?hq?h???S??q9ll(q?(????x?Q???R??t{b?I????Q??????"?Q??gy???eS3?:?>\???@&h?!??v??B?????P?1???ZC4a??G???????\??k c??? ??-?????c??s???U ??kH-?????1???|-?r$??????\+\\??v??SF>E?Y%*~?N???za??c?????R?? ?;?[-ADADADADP??F???d??@j??0?????Wg?????`?j??iu???c???hw?A-??c??? X!R???)J?6T??????)b;zx?S???d}C}D???d*?(U??U .uH?[?*?T?k e?????"?"? ?"? ?"? ?"? ?B9????????}Q?$???!?_??SD??@>?-???????K2H7;?n??|??rJ?}<????G???,??T???QAOf?RSDADADADADP('??Y#? ?v?(???!d??"?N ??Zj(1 ?Y-55u?QFDADADADADADA=u?)????U???j{?jHo*:??n+??h??dk???e??cg???c??!(??@aK??.5?GZFDADADADADADA=q?)??? Dc???Q??yho)J?'`??7??x?????=?5DADADADADADA}?c??FL??!???=??????^|E????h??\?#??X4??6,lH???E??MD?h*:???NO?*?}??"Ey??:??*s?X?"Nsh'E ?;????2u??h6?(?????-?????h!???f??????*??f5Tg??????&?h??j?)?us?r1F??L???]n??.??E'm?%t,????f?8??u???k?-??????{?c6ADADADADADAD???N)~6???c?d'? Pg"????[???????v1?E]{&?ME?Q??"TC??mDa?R?i?.????(L????h,ZNQ?_v9 V???4?(f?f/?k"Rjru??h??<"S??????f7? ?Y?aOT?3?`XF?j>:]????W-??cQ?M?]a???G1fDADADADADADA????g?????V?S?Pt???D? 5??S???????W???L4?u<?l? ???K???y?f????$?hZ ?Y-5??nIEL?j?_??P jr,??????Ow ?e?-?? ??-????,X??}-jM??RS????v?????&????tw$Z R??D??????(?r??g??hT??v??j>???h?e??hXE?+??,?????Yh?[??2?Dg?h: ?F?cQ??S9H?(??*Ee???x)J?fa?):?x?????z)? d?G??1?5K,Ks???u~zo)?hK????????????|(???????@??S?AQa??E;?y?M????????V????u??(?~?`????????s?}?:E?T_#? ?"? ?"? ?zt?O6~?eiv????':??????=?y[fjL=?n_?????Y{?v????c?q?uE1???????"Y[??5?H?[gw ?,?e&:?@YOT'??7?????????yW65w2Q???j?? ??????/?zcQ????l1 ??9N3Q?\?????DC?X+???@?-:?eO(?q?Z?=A???U )?{V????6???D?Y_??????E;??i?=UU????r???D??&????Rd? ?Y@??? ?Z6???>E??l????\????zQ???C?CS?f?1?l????P??N#??#:??.3Q???f???BP?;?n??H?????G*????????2?R?+??S?Nz?7j?b~6J???#?? ;a??_w??L?k?? x???YPf? 0Qa?/7??V?c?,XR?2????/????9???9??<?? k?>??25?O?Q????.?????o?:m^Hf?}M[??T?????,??.P???(???KC?@YTv|5[YvV?}??p*?????R_?? ?u??#??C?P?hA?}????ge????v???JDD???(?A????]?? ?_??H8??)J??:?ZY6{Y??G?'?-!E???R ?li??c]P0.?-???b?n?l?1?????b??t&??e??5F;:d_K?5???????K ???,? ??c?\?t+???x??%?P????!-??S$U??k>]1??/]?9???~??tX??U?????????V8U?F ????? 1}??????$VCu???%?}?-\?p??wH+ O??2 ?}??E~??jx?????r?B??"???'?A?!p??e???(r81???2r?b??Z?G?4? ??E??t?2?WlG:?I???????$???PK ?1???? ??{??l??????T??(?P?t??j???Bj??[]????%?.?yN????N???????U??7h8B??? ??????c? %?=;????{?%U)?.??z??????????Y??}?}?&A?cvj??>-l?z??????"? ?"? ?"? ??:^?l6??W???>?? ????OO{7Xo'???? ??z????w?? s??~?x?'\??R 6&?1?b1X9??=?f?=@??T?uU???8?Rk?q~H???????mGQ}-????B?4??4?ih??3??JpV-XC?5??R???9lx? MH? ??k?'?? ??FUx??'??8?????Jh??*?????W???xAI????? ?!?Z?pq?w????6!E?6?k[?????????-;???Y???????,DADAD?? ? S?F+???Y???@0?????P?}' OB?n|}???????Oz,qvjR\bJ~6?k??a??????g??G????lZE????4???nX ??,??>,?rU???.e?,l?&*??j9?Y7H!S?j?,X??!???t??;??K????Q???? ????????P?gG???]g??_?????,E????Q?????[5?s?? P?? [5??3N?{???E?????Uka@??v!Q?M??!??OVj?5?????O?i+??E???y?B??R-X?`???R?1t0?j????)?????$??b*???M5????K Y;dL_?;??hyU??g?????v?????Z???C?C?f??5?5;- cv??]???%???Q?hDADADA?;~6_Y $???o?\8???/?j?"?9???g"??5??^?U????W5P?Z ?R??-?=\??????G;\???????WC??=6?t??gc#?P?lO???????5?T[??r???P?????Q???????c3L?[R?? 6"}c????`???:-A?V? X?"?]X??c at c?1$???B??Y|CuV??,k???:?w??dUF?:07TH?Q??8?? TF???Y?<$????:?M?M??Q(????j????l??$/PB???Zb?I????$?????z?;?Y?????f?F?r,??R z??:?}?^??R(???Nr?????9B?Dv0t?????5??Z?? ??-???5?\P??:X}?mo??F%8??!?Q? ????+???Vo?Y3I}????v???d?J(??,?r???*:?gX???T??%?=?p??????r???8\?25 f??_??>???:f'???O _F?o ????Z??DADAD?? ???LbM??j?????\?L??????@?1j9??%~?Z????????W5?las?\-?g??? ??0*??? ?\_0????ai )J?B?????e?????0?????9C???}???=jo/?jj???f? ?}? .?XbQHQ?>z??Mn??3??????J7??,??z???[6)??f+???3??ES?=? \!E??l??Yw?6j?L?2l??lG??D??$&? ?#??"g?GT; S5??m?/??b???}??!5???8?ZY??xT?8????(?Q?0~v???0?? ???(~???????6??:2??R%|????????-???jT*?E?f?k?b?? ?z*XY??????? ?eT.R+???p??zJ???h??#??K?s-?-?h????????Z(Q1}wy??? S?wVeT????g????Z ????k* ???????>????v_?i?Nh??/a??O g}[????#? ?"? ?"? ???N#~?A??@ 5eg?n?nr???!?X}|????????p@]???X??)???,?????l????ZmL???O?? ??????xtx??,????h????d*?h???u?U ?????FR???s-5EOd5?'??????(DADADA??4?g$k ??E?n ?}l??????#?w ?o?m???R???{?{???Q9^?N T_??HQ?? b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ???x????????VFDADADADADADADA?x???M????Q6ADADADADADADAD?? ?gDADADADADADADA?b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?A??MADADADADADADADP?0~6ADADADADADADADA? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(???DADADADADADADA? ?gDADADADADADADA?b?l?"? ?"? ?"? ?"? ?"? ?"? ?"? ?A??MADADADADADADADP?0~6ADADADADADADADA? ??&? ?"? ?"? ?"? ?"? ?"? ?"? ?"(T05/g??t2????t6X?&?Y??????N????7^N??????Eg?u????4?TS??FADADADADADADAD?a@?N?.??????Y#? ?"? ?"? ?"? ?"? ?"? ?"? ?"?0 ??<_?g?)va???????;?fK??&? ?"? ?"? ?"? ?"? ?"? ?"? ???@f???x??u???p?s?b?M???????i;?g0?-fj~f?l?"? ?"? ?"? ?! "? ?"? ?"? ?"??Od???]??n6c????L??????????#?6?gDADADADADADADA}Z????u??.????????&???%:~?f??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z2 3~?75???F?????d>????x1Z ??f??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z??z?f?M??eGU?j?m??????? "? ?"? ?"? ?"? ?"? ?"? ?"? ??>h4?G??P?rj.Y??ej?/??? P??&? ?"? ?"? ?"? ?"? ?"? ?"? ?z???l4 ?l>??&??f3~????L=?`jL:?%??(kDADADADADADADA4????7????b]?rb???l9??f???J4m???=Y???ADADADADADADADA??~3j?'^??????/[??__??????????Q?e&???|v??????????????W???_/????p??[R???????o??]]?xwy????OW???7???\??i?n./[?????|qs??Z???^]?k?\??????????e???u???o?o??o?t??Q?|x????u??e?????m??????????????????|???U??W?.??^??/?;????._?????/????o-?s????????????i????6???q??[x?y??????N?|??~/W=??????ns???Lo???u?N??]??s?S???????7??/[n/????}????o???_?????&??????/??~???)?????????_t???????????????`??X?e?/????~??o?]R???7\????????????! ??>+w;??Y??Y^?w/?>??{??xs??????P:xw?u?9zw}w??????p[?y*??~zqsy?Z?z?|}??^O??'?%9A?????_/????~s?"oz?~zv????????>?????????+?j????w?g????}Vk????????|?>?{w????????X??3xk???s?w???\??|???U?_????|??m]?????/^?>??\???_????B???????HI?????A +??_?? ???ZyF?E?|~??????yZ?\????]???o???c n???7???? ??????s}V???SK???oj M????K?a????;???"??uJ??j???W?g???>??_??a?E?6?lu??\??}???8-/??????i??\??r???????|???L???z??^?????G?????u~?:7?^? ????~??7???W?K?U???V?????sM??i[??/?.???J??L? N_??am'???????????R????Nq??|??>!?dE?y?X???\???? ???-??M???????x??????[h????N?6Y?d?>=?????????M????Y?A??D-y?9yj^_??????????O??rY??P???(?x{y?'? ??.?mw/??~{??????????????????W?=_??U??pw??2O????|L;??#?? ?w????[}.#????@??N?~s????> ???m?J,:?m??_?{u?o????_\??.}?B???t?+???????.??????????mn???w?iz???'??>o??=???1?~??U?*F??V???W??~?ps????????????U????:{??K?H'????[go????7???D?????9????7U???? ????KW???Zm?I??k4??G???F???e??oR r???^?*? ???_9?????/_IA???l]0??_?????o?? ? ?????.?????? ?Y}O?!?F?J?/?????K?^????~E??w????7??/??Y????????QmD}y????.?~???O??????B)?}?N?;???O?K??6Sr?????????~V??.??#?f??????s??X????g??_??????????M??+Cn?????_?J?s?????/?Xd?????;??>???'??]q???????y{q?^!?r???W#???J??;??V?? ?>?_??????x??[???? ??u? ??????????{???.I?fF????vm??K??2;i?i{??????}????e?^?e???~3?B?:???y-?||v?S??@Z??!(??W?m???('?????T????????|?h???????y???????*????????V???????oZ?????5??o???w?X???????=??Z?u"c?_?+???=?w?/?????????????q?w??????:?C??? ????5 ?G????? ??Kh ????W??t???????u???N?????s???R.u???@?k[W?7??t}???g?_ ???w????.??{???????????^qwU??????A??V?,???Yp????M??I<@??*??bE??)?g??????u? \????????????O?+n???:??si?????????}"???%!??????U?7??%?R*?{?xv??n?T??^??s?)???Mj?%?v?l]??VY?b??? n????z?4)?g??O?$q?-?Yb??|?????'???X?>????=???h#???Ni 7/~??{????????????W??????y??pu???y?7Wr?W??,??{???Is?W ,????H???1n????W?K??????e???^??O???yU?r?,h?_??V6&?????k???????{Xu?>?tN?????[???????????"??p?x ???e?X?c???5????[w7?? ?????i??????V?T.4?%?p?????????!*?uo#??;?+????E?/!?jk?????>?????~????7?7?!_x77b??5?=?m?^ ?(??????Q??w?-.??w???"???? "v???????K?????<???U ????|sw!???\??}y?? ?????}?????f?UU[??i???7;e|????AA~??V[K?>??p???"??????O??l7?????jl???????|????W?e?????\???????v??u^{??G???????????B??y?+?7?A;o#??????c_??.???H"r??????g??:uU??W?@p?? ?y&??yJ^_????g?_?o}J??p?_hD?5????? h5????=hJ??~'??????$U???C?K??,???????U??Qo|7_ux?d??????]??Q?+}?????Y???7???-]?????x! ;????Ll???d5???????F?F?*\?j??)]T9?Q?????*??? ??:o]?????2??k???????+?VWe????[JNV?_?????V?M????}?R?r?D???????????????e?????8Es???g?????Y~??^>;??/?}???x??G;zty??Mx??G? +H??zzl??????X????r??????CC????X~? ????????????Khi??z?O?????????^<????=???;?N}?o??[]?????r?[?????%???~?Qa?wu(Xn?:?s??)???ck}??????G ????G??lu ???t??g1??u?????? ,|???m??Y?)~??????D?????~??>??G????B???_??????? ??eg????? v?????>?!eKJ ???? sfb???^J???d??????y?e?????j?wl?K ?8C????,w?2bq?e??"???qH????l?q?{??.)%????9?????????wD9;;[H???????Z?|}?c?????{q?S??*???C??[?%??s?????=?2?O?:D??|:?9X?Y???CZ~?\OI???5???????!????_y?6 ????Wo??????'BO??????@]??I?`??X*d_???????8?e????????x??;?? ???r?^ ?~????3Y?&?O>?z???:?*??????K??????o?q?+?37w?~?>CdyQ??,>->??e?{$???????A?pN~u????????g??????????U??H????Z0????>?W-Y???{?????6?r?W[~????l??????G?????/???h/???w?j)i?????]L?WL????s???>????tV?????i?j??h????w??~?1U?\w??~???:r?????B????:??t u??N7?{#??nW?y???C??????x?n:k??:??????~%???1?G???>?K????9ssL?????????????[??m+{?????? #[?????Yf&]???yY??H??Ar}? ?D??s????b??~???????7??????<,?????????cH??????n?oY????????A??!\?O?!?????????????[????d?v?9??????????????I?B?v/??.?y9?mc}? ??w?~?????.k??X??????????v??2:pm ??B"?k?H? ???a??6???7????W;o??w?>;o???Lq????????????zD at xqs?c??/o??iyy?????w?~???D??n?>?~???]??ku?m?w????w???>????????MK?) G??M? ??V?????]??????d???G?S????[.[??v>?]C?q??????{???y??=W?????(??6z?r??????|?)p?? ?W????????&f??????????d?X???I??'p??!?????.??\?F??+?(????????E^??[??9??3?{?S??K$????Y?2?u7?i????6???4??????t?? ?????0LR^?o??o?*?6(?M??'d??????????i?7?P?*5?%???Z??;??o?????[??*?+????????<>?????"????}??w?4h??:d????B??i?w9???x}??R??.??0$?\?_???'??G????U~m~L?n~?????5??]y????|^????>??'Ap?w???q0?_??????Y[6?6?x?i??ju??dr??U>^??u???W??????????[MR????????_???&??.?????W??????????}6??eW6?~???:????/u????w???K6"`"??@?X?u??D?I????;???????CW?}???i??X#=?3???????:0???{?4?? ??????qf??? ??=???/?????B7+Yo?d#??~?}&?\=6V?????!R???;L?i ?z/??Z? _d??!?m&nZ{???J??????b??ii???]??'?*?KtB????+?????????o>?]??\?*.5k=k?G^?j&?J???p ?m???????a?????e?u ????;?3?????g????.r?E??}{????O? {?D???? *s?V?Y?W???M????????pB??w??????m{??_D???t????O0?r??!?????????2/???%}`3G$?^?t}-Av?Y?m=??u???P?'???o?)Z??)??[>?jW?YI???A??M:?Y????u&??????W??h??3|p?????.^??Vk??:?S?N'o???U ??????m?u??$??\???I?6'?MJ????b?9??G????j$R^^ -???R?|w?*\n???m?????s}???h?p??/?????c????=lZ????????^???'??y???.?????????o*?????'?.??A??9IJ??a??????F]:?1?6????N'p??o?:??+????????0\?d???k?"?????y?G??"\?x?????? ??E?^?~?????????0??J9???? ??(5??f:????? df23??$L?9?P??$=???N&DAD at T???? ?AAEEQ9D?X/?v?Pd?V????w?W_UuUe??[?tW??}?????????5??Y????)]-???|m'?*?Ws???0J?c _??c?{??5"2 p??(?? Xde???6???Z?? ???4????m?\????????:??y????SEG~??6????/????{???????????MA??Mk?x?[l?????~Y??????????l???;d?? [?c]??????$HoCX???#?@?OM"?2??????&?.?Tet?????7???? e?/?H??n?Z?&=?C#???,??O???Dn? x??I????4?+3 zx.w?j4??1??? ???m?\W ?u?C;?C?E??=???V,?$)#???X?>0 at Maq$hf?KX([m at 2???d??h?????`*m?*e?FV)????P?d?????:?? |Y??W* c ??6 Q?3+?v6R????n,??+?O?F?G??0"?????]???RF???I?????V?J? BUi?\Io?Gq?4M? ?u?????0q??X-H?a1i???.??-?Tp??b A?????HPb?B?.???k?E?h?ID4??BR??J'?d? ?+?=w@????U???_V! ?xPi? ???RL hU???-S??b?Q-?#b??=`)????F??? j$?.V? ???????~u?B????m?LGR?Hih-+?3h???Q?:g 0?b?=??1?}????GF???xNC??4 !?e?3Y? X??k???????Fq?c?RF?? ?$??V???Y????th??h??????X'$9w$r?<4'KcI?,!?\?E????k???P???2L=?%?F}J??)???z?rk4?''???BRR?'ql^?&?j?z??\t- ???%?d??????Q?5? ?E??Gsa?h? ?W??[4??p???0??????Ci???s????e,?@?????^?????N???!?????K?N??^?d$?y]Y?:???????k???s???????Gs?A? ??*?|N|T???????GI?2?????? ??x????'?N???"??RA$L??,L???/x??K??nGWs???J?8?? ?????e??^??? mjtr?c???a?1 ???iCo-V?g??hFL De?P??;l????qjF??P??'???L?9?b?}'U?B?????Tl????s`???#?????*y???Z[???????f?D? ??????a? ???a?6?k6`?,????LG????%Q?qr??) ?Y?J??}???U???:u???????????8?G??T"???f2j7????t?v?>??v?i}???`??"vf?????^b.??;bZ???()3J4A? ?????^?d?????F?Vd???MM$?Y???N'???????????????G8?;'?C?{z?> ?L??Wv"A4d"u;?\?M??Nd???q :M??9m?????????uB?{g??~?!?eh? ??=!?k?u?? !?v?:@Bt(???4D~]?b>}??(??4?X??L??/,?Lea^ tH?o?F0??)u??;+yM??W????H??:9,q7+??#)?%oT?????L??K?%!?Cut???E???%0? ??:8?B??H??T~*??4?v??[?M?1g??? j??t??3?>??}??v????o '???????}~a???P??? .1????5m??? U??p?^???-A????A??n??`r?j?z?m ?=^7?~???z}x5??$A7Iv??z?i9zR`?x????8 ?)?Ls?2?n??\???????=?D??????m?4G^??(?*??Z5jU??????%????\?6?4M8K??????&?M?"f?????H]qM?? ??K <&??S?:???y?.??u???Ar??d?)?2?@\\?!?5??%avJLb"??\??????87J???????l??qJ?Yb?/???? ?????vvV&GfB??]$a?? ?? S??+?l?`?+????b???`?Fx0'????/H?)??C?,=?j?G?wJz????NV ?'?V?W,g?6MH?Y?id?{????q?Qz f??s???Y????b?????sZ? ?E!?SB?B??*??"? ??P??pK??J???????w-#????f???A?u????????c??98?*F8?D? ?1b(??T?8?????&??D?=C.?"?'u???AN?????? xO??? ?/????.?????cu???|????d6?????Q?[????u??^????????Q? ?B?O?????? ?5?i]??????:??Y=??:??0(UK???d? ???{??Q )-?O?s49???5Z?Z?3? ?D?(?????7?*;??T????@s??E?_XYqDC??ZJ? ?d!Eu??i???????dH2U?3 os?m~&???R ?????U?o??????^?????+???2|*????yTS!?N?=T????-[v9U??Nw?YkzE????q???R:???sx\h??lHx`GTG?.e????|?\'C?????-K????5%qk???\?\n????O??Q????y???? ?%??X&?l?\?Y@?!j???? 7+? q??U???M??4?|c??? I ???? "??*???@?]C? z?????MR?`??aaVJ?F\??-am?[??H??e???CK?j??.????!?e???r]?o?|??_W???O????0??|v??J}?0?6????$??H(0?????|a?I?_. ??c$?!\I S?x?%?`?? ??f??? ?Y?v?O??]?????9?]?5?d??R";?)?I:??\???r??(?"???A]????f??{t IE??x??A???)??:?v=?`??:\????}??e8)4? ??Z????? ?h?_[?u????????????0*?y?G?P3f???????? ????g?w???*?mH??K?z=b???x,?m?z??@?N?,?-+??S"f}?NZ?k+???? ~?b#d!??$????H???e??!?4j?%c?NuB?{G?Q?;_5????~??????@???i??#?$S?????>]??+?u??????C`??;?R???y????61???R??J?4t??_?eK???;@_? !?U?}] a?????????fm?I?$?????, ?:???Y?&???G?@?(?6H???7??A,+K??*??h????b????-? ??~?!?aX8???(2??ls ? 4??Y????y???QB??x???j?{????oL????????-N??c"???!9???????c??^???b Yf !"NM2^+????|?n]?h?!?@ ???'-???? {k?eOx?5??A????Y?" o?O?$???%J>?,?' ???f??#??? ?Z??Q ?????fy?$H?)????m+?G>5pJ3W?= "I?q.fM???&l`??Y?p,??%?? ?L?!?g?? h,h????wd,R;?ff?m??'X?,??C{& / ??4G?CSHrBgX???b???? -$??kmQ;??/V??m?V,?Z??*?M<:'?Hxw?\ ?}??????+2?6\?Dl???&K|?????? t???+ ?a? ?X^????f??"F? ??"? ??{??,K?|](a?? /,k?n??R??K? #h????V!?B?? ?`J?n???J!sn?T?`70A?e?q??)?r??u|$?.???f? ??EX???^?1?b ?9?m?{??O?????b ??[Xa /h7V?V?]?Vs??*[?i!?# Pb^3??&???7-jz??G???"/s???$??????k?P?;=?????*????%e??X,|?? ,?i ???lq???J??MV+.QZ?Y[Y??w?=u??U???}?t???U????Tl?K????d???O???E???m??*4???????????;f6C??xd??k?Z??#i??&,????}?M????c?i^?????c???"M,5jhO?6?]????No?? )7?\M???????~? d?qT\??X7????1~?`?HjU?3_??%qi?? LFh???\q?1Dt /????&??[ !|? ?1#"??c?1??8?s??MkFL^? ?{)+??Xz# "??G???\b??u?M?#8_z?6?L??.?0?8?v??8????Lq?E?C????!??*?B?8R???^??? ???>B???D?2Nf+-?????e?? ?*HAy?@;?1???e?5"???-na??????%FAYG,?R?e?? ?%m"HB???B???X&A,b?{??(s?X???U?DW?F?????????~????=?w??62&W??W??f??[?)??O$"-#??U?b??+ HLO??X?Z???0???#k?+e?@??????O?gZ?Kbm7a8&?i?V?7 3q?B????1?????n?l???fgJnPz`?2??K at d??5?G??5qjV?O=m??????+???????G ?0a?????:?????? ?M?[8? ??Oq?8??'??~???}3 *v?@F??????A??cO}tu 3???????0:=?}?%?cx??}F?Na;|??a????Q??9??;';??Ye6?????f??P1??}????t?$ ??B?{??\i??k??? (PY????:????????[???W?7????????*???? ????IE?&&y+??????,|5?bqk???{&;0]tn??~Y?? ?bv4??d???.?P???c=????e?U1???HX??c x?kW1???????}E??{ a???vd??fo???? ?Y???`%CL[?H???9M?y?iu$,K????a??H*=Z???? `?Dk~??z????$?w??;??N??N?$?s??S0 h?Z?qe????X?_????n Q?xr??v???? X?0os???O?`?=&\?gW??@? ??????????&q~?{D9o?0 ??!I@?p????? 8??s+q???9r?r???????p???n?b?rM @{-??F?0??i??~ ?Fc?d??i? 7????d"n??? ?b&5?ba?????l?u?SB,-?&?????%??A??H????7\#c?;N1+\?k?I?)"?E?X?*.d?%9Vc;i'c;??7R3??=l?c? 6m?$;Q?Zg?Jnd! ?1?????+W??Z4??G[u"????m??EO?Q?7??????Z?F}?^m?*h??T???b?? ?Q'?Qo?[?Jd?ivC?^li?m?ay?,W?c???[b???,[~??@ ??????????0z?J?w??C!????^(?Z(?^??+?CL?Oi??R??m?k|?-t?~?b ?????^? ??o9y??????9z????D??9???????{???????????????tem???El_??LT x,??VD????Z?X?h??bf* ???a?l?Rm?t?R ??????by^?????x)????????MSD??pV??a?BsEi"????B[??$Y??i?R!2G?_%}??????;`??dD|?C?zG????p ?9?_?!y??!??? l`??????X?i???7?/"B>?(B??^??8=?o??9???$?V??? .?vvB Qw????? GGZ??c?F?Cw?8 ?v? ??|??nV?,U?C2mV?????1wW?DJc?c???V??s?8fT????kR??@?????.i??u?B?R????W ??0 ?m,??CF? ?#?b?yj#"?X=[=E??b?j'?(A?????? W?XD}? :t??q7??;+?xSqi%? p ??37??F???????J?0???<(*j? ??? ????eG?9A??????????` ????d"?????/????]??????????C$?v???"???`??l??`??w???_C?[??'??>?0Ga??'?? 7?f3??LM????4?O?'L???c?P?E0{?VOb? d???;?uR6N ?MK\?C????L)?(?>?4??A?sb|?4&?-Mbs?Rvm?Ob????SZ?\#>\ b???!?,*_b?5 ?|c'?P??70 !??(iM??PZ@?r|?UYD+?&um6????#?S???*5??@L!L?N?? U???:?:q?????j??U??PS?'?j??6q8[Uh?????v? ?Ok_?l5?u??v?X?q??Hw???Emt???D?????????=?u?O??????O2o?iC)?? #?????w8tp??u?3???y?RK> /?-?E?:???????=????N{?????2V2??k????????h??D?=K???? ???h?m/a????Q??Vd?"8?A??/?-&NB,??E ??D\??H*{?? Cmv?? {???? h??k????lL*??l?k???:???cg*y9"(+???n?\.?,?'?h#?K???,?2?u#??o???9p4?%? ?H 5??K?R????0?%??ay??3?$D?cN???:?????/????S?????:???????W?6?l??cxlb??!ebxbd(?U???3?w([?????' nZ3?l;c????????MC;P? ??qIn*? 8V??Y3?3?S????????;?'??S&???P? m9ap??C???c?5*? ~?{?,?j?l? j)?? ??c??.???.?Q?V?5?:?c|xt;?< ???S?m}f???F?q ??N?m9 ?????????DAI???????HP???b?0a??}?F?6 ?!*n^{???! ;??? ?3X?p(?????(??dH?????42}?V+*#?????X72rB?? ???mCfg?O7???????S????V`????CVhh? b ????t? 0???Bn???.? 6De??3?^,??Mm??????y??%?U? W? |E?M A????P????\i?,???R?5?g?t??R?6?-?RR?d??X{?l6o???1 O??D?Q?;?^????Y4??E?4 eZn%??P|?Py???????R?T??M:?h?3??? ?~B?5? ?\.? _g?^R9?h,V?lt???`?J2????%]i'??0?i5??5? ~??? ??S?g?p??'?H&9?N7k> e?]I%:t%???u%Q? ]???? ??????M$;5(?V0???m??*?M?Mx6????)?e??P?????Z?Vb?m>Si5?a?U?qGt?b?W????MR??c5??wh??rjTj~O???y?=??<%?gx???@???KY??i??%i7`AR@{? ?_??h?g ? 82???M???&????)??Cg??v%{eI?WJ?`K??oa?gQ3/??t?`!????????????!???[6??d6)?L?-?q??3YSD?+???WI?H??b#+?/W?%???pK?q? ??3??????o???>u0L?-W??i8???r?S?? ?o???????f??R?A?l?O1????I6ej?yy???M'l??-?ef?;n?&.S?m?BQ???I?f?A?c|B T?3??u???l^??????+F???9Qn??Ip?k?N'? 0 '???4??q? b?????/????{~?e?????.?'R?^|\?p????gLM3xI???${ zG?KlH?*\Q??V?1?f??4u? ??`???zi???u?&??M??Q?Y??1k??x; b??!???-s?? Z??9????Y??????f/)??=8?78r??????]??????L??+$????d?*x?D??+??\=?I??s_T?:?$?>??R*W(????)?P??NA????l ?wr5#b????)?R-c@???\?? 7k???+#1? L?PH8>??eC!???jA???9tP?,Z?U???+?m$???^?f5![???V??@????|??xX?'???d?0???e???]^d?;?D?\Nzg?2???v????*e??N??[?7N?3 ????E??qK ?????]??$qt(?I(Hu,?7?r'??M,+k?????D0t???R?CDqDHao9?}?*??|B??D?e???8? ?+? jnK7 P??*?>?h ??P9:P?M??U?????@S ?WQ??b?}RU?9?N?$?/B??Wh??}?w>?b??O???:??w.?q???>???D*q???W ??y????4?$8:O??????6??????;?,??J?????H?????r?n????Ywr|E?????&:? ???tb??l:??l????8J_[??(?M??(GC???>$?mV?&eC!?4???????????(??C? ??l?+??????S?????y?WSI4???/????????????8???*? ?? ?g???h7l(?jZ????^????P? ?lBN??f? Q?X?????e?L&C#???T?t??#?82??P??;^??2?c:?????S?W?? ???1??p??Zhl?:???,N9???qDn??{-??p4?|?i??@? ?????A/?q???AN ?`b????????Z??q?????????????h?K?0????[??a~3??ZV???? ????? ???H???D??y\+????????????^??+e?????0??\?F??Y?ibKZLx EH#??f?(j?B???S?????Ih,o? d???? ??T?@??j7Z??f1??? :??~-???LNk???0??0|?v -?i F???????k?3i?FH _?/!z1"fs!??%? ??V K_????? ???+??a,({?$??? G? ?40?PZ6????wt??x ??KK)7?N?G? ??L-?8pB??T?????w?-?G1>?8&9?%S? ?F'????n??J??4??????????he???W$??????????-????.)qp2r?_qe????6??T?y?F??Vk??j?^???t2??4?JtP!???shF8|DY??#?>? {???Y???\?????????3+?? ?e y?: ?6?N?h?P???D?>?8a???^?-??8? ?*?~??k)B?) ??Y?7\80r`!?q?????????L ??cS????n??r?Uz????K?aQ??#?Y?^^??V$?7????VI/O????Fc)??y?9Q?5?E ?7X???4h??A??gt?y??P/"6?m??????/?o??[?F 5;? ?M?R?????????.?p????HJ@??@"E>????+bq?Z?g5?d V(m?RK?m?9 1?5$??UQK??? ??v ??H?Ab4zS?H??":???Km-?i?I?????=5?)?Bg at X ?5Olv?m?(?&`?,U?|*??? ?????V?@?Z??:??k????8N?L??u????????\>?2h#???6???~[9VQ??D!?N????c_???8=F?:?W?DT?? ????P??gp ?!??3v??c??Ks????5:??E ??LU??J4?? .?d????O???????|??X?? ???m$?A?u$?@? ??e?I6@:ic?R???(X?)H????n?Ze??????&?-??8???c???r$Lo?Whl???Q?'?j??`??>\?[n?_?-??#1?Hb0?1N?1?Sa ??????`Tcl??0?=??????q??/??LR???M???_????k(l?Y??? ???Ut?? ol, k????#???.n)i?k./0!?&??\??????\*?TO?=??ZH?????x'?J??'??YG?/??D????^:??grj?k???o???rUX?G?GM?u??H??????W?L?o?U???=m!?????Ee???? Ak????|e?U}I???K?5?XQH?35???????A???!?\nt{O????1Q?!0N ? ??L??xRg~RF? n ??8?C|?q????F???6 n??,?c;FGF?????SZj"????V?y??J :?Ph|??????????'? O1Z??I?? o?4|???SG???{0C??????fI?C?;?o*?B????|p1% ??F???@??8?mp??L???`t{g?????mCh????x??U?-?&?&?Q??]xu?u???????m?????M?hx#? M?????gtJ?C?w???Q?.?zuq?cG?h?/??????18A_??????~????v?^j???????y???TB???L&????????_]???????????????? ??2???????1V?*p???~?d, ?*w?@qCo2?d ???Z3s*T???3?]b??<`?P? )?;m7?@U3?%p??2vz??? OqVo????nE8??3??6?1b?3?gs \??(K???B?Fx??h&???.+??)???* Gm?i}h?????8?J??%F$ ??1U??&?? (:V?F?%??????mA?Sc? ?l??Uvt???l???DW?4F?]???~????)?? ?N?Q?I???P??l?K?J??????i?C?(????Ll???p+?????A?????|x?)? p ?B/???@ ???~???{?> _??f??4ZI?l.? ?C?@?/????T>? cX???/??T~]?|'O? d=?x?/Q?K&'?L1U(&2g????p=??"?:????????u??d?PHxW??4-U?LZ+???j?G?? Pi:#U??Ro2??|Po: i??????S)??2i?z?)K?)$|?>8R&????4??\2?@2R.e?l???]i?AN>???*???9??@*??*1?|:-o>??.?+ $l?z*??????f??A??\!%???????J1|?????????\0?bFf???\i.??s?A??,%W??xW??iY?- f?x?????? [[R??T[??dg?UZ$ f2?~?-??????E5?X!?e???{?q?A4?v????E?????j?%???+tT???q?? ?[?I?????%9??`g??L????J=?+??@l0/W*om`"????T?Js6q%k?4?akC??MV?r????:?????????4?????@F[??-/?Z??K&? ?RrOe?8?????s???6?J??P?* ?Ns [Om6q5???s??? y[O???* ?k?Tj3?z????4 at O?2???j:o$\i?A^V^?d?U:??{?4?U?b?4+??3??'!%???r?.??9?+>* b??I?H?t?f?O|T??/???,?g???IUHF?J??.?m???~??A?W>?????D?sx???r?y:-?^T???dR?Nm??-%?e2>?W?? ? ?O????a?F??Y?s2GJ?p??Qi*??JV2?dq%/xJ??`n$??????v???? ??@v???m?????? ?$mS????zr?L ?????@?k??z???J?H?????z???l??? o?{k?;?????T??+??@ZP?????xy??J?8????}x?)= b??):? ?.????9?e=%?t"??7k?1?}A????J?(???)??K'??T 7?]????H???)O?i?4P?????-S???? z????r#As??????d?????x???J????a ?!??????1(h?Uv????pu?k????????|??e???? &??D???2]?? ?J???1????????t?(??t????? R??UvG?f={? d??dm?????<?P????v4i_2??7l????a?;?Y?F"?+?m????t0???"?|T?/a;???mm??jc??? ?4?m/?wz?Vi????* b)?o?"?F?i?(|`R ?? ??b6kE?Sy?* ?&%K?r|$8 at ynm?P??n?TU????'G* ?%o??D?n8Hyo? ?iy????@??)??]??mm??W2??tVL?S,G#?y??s?1??n?yy????G?$?2T?=?T?sk??E?>?o??]?}?A????^???g~??s.{??C ?#?yt?5?o???-??{???_z??=??????g|?U?=?t??/?|??}?O???????t???W????????nx?%?z??'??'????????~?c??r?G_???7]{?g?????gz?Ls?y???1?7???w~?Y?????}????/?\|?z????}?o????}?l????]???s~g???/M????}?????n??+????W?|?/???i???{??O????????????+???o?]????e?k???p??>???|????~????8?},^?n???????x??gnz???.??7?~??????OV??_~???????????8??K????O???G>Y????{'z?????????????6?3????X???????K????????o~?????????>??#g???7?P{?;o??+?^9?????}???g?wG???O|?????_o???????\???I??w???????g??{v?-???????M???G?????sc????g??i????????????}??#f?W?????o7^{??W_t???f?w}??o????????????K?x(????????????:R9???9???,?1?6~??g????N???sx????????I?}????7N??5??\?? ?8????????????'??????l8??]t?K???????Q????]{????~??G{?n???7?v??????~???;?????y?m???~??|?Y?7????????f???K????_}? ?u?l????1?^???????>y?K????]??W]???rf???>>|?A????_?q?W?z???o?g???????~???Yw??_l?h??O7??????9???7???????|??????F~S?a1{o?w?:??????z???|V????O}???????G?J?????????{????_v?????nu??????7???[?0???????|dgu?z?v??j??}?????GS_x???=????????>????hv?}?/?? ???}S??????~??????U?9??????????_?tI??????????????K?L?u?y???~??G???>????_???uL?UZ???????????u?W=????[??????_?~?'>z?I?>?}7???I??z@{??W???????>????x??_??h????G?????Qo?z??{?~?o??uj?/?????????L????{??i?~?9???????s?Sw~???}??~????????g????'?*?_??W/???>{??????7?????;????#:?????]???k~??o??3???F??cO=t?????v??V'?vy?????[u????s???z???^~?_?n?o^?k??????yNa?/?O???.??????}????j??????k???(o?jT?\?v???p??????"?^?????s??Me???}E???>??\??cN???????o??O^t???|?/??????=???]w?aS?2??/?r?????????????+?=m?#??????t??/o?????????;?>??m??>f???_9???c7???S???????W~??\=?0????????[???U??????k<0???????????o]??.}??????n?|??g?????o??k?;????????z????_??|?Rs?w?G~:w???????}?M?c~z?O???7)??L????"??^z????[??u??????}??W????????x?????3?p?u_?????/;??=??Go?x??=????w\??K???????????c??????????????U?/}??g???????????O?????????`???????~?W?w??????+?M????O???????????8????8??3??#?K'o??C???%??}?^?????7??;??:? ?z??u~???w?>?}???kw?o??/Z??y^?????8???}o????????{????Z?.??8?k?????76?Yx?%??x?9k??9<}p?wk?}????"kO}??P?5j/??]q?? 6=??????7??+_r???{?w\???Y???C?????????E???k?/x??U?VZu?Cg=??kC?o??7????????K??X|??????{???W??????s????????s??Wy??7?4??/???[U????????????>v??oj?+????o]??????????????U]????.+f?{???????W?????=???_r?Q?s?q??????A8??#?}??[?C???o????_?8?????N??m??>S???????Kd%?O:??????RG??V????Y??????lU+???V?J????6??f?????????W?k5] o.??>}I/)[??????^??U???TX9???????f?=???.?????T??xUhj?l?^A ??-??*?AzB ??F????mC???[???M?!?M???`????wA?[????4 ???????xgZ^xgZ?3-?3-oY?????Et?????x?U/???o????Y??^x? ?z?o?a?7O:+Y???Fg%Bg+_?N?????mC??R{?????iW?_&??????>?3?rcA?????`?^?3?w??J{N?m4f?zMk?^??? 5??{?E??%??v?? q?a???,?D5?z????E???.?%3?m??????_>??? ????B\| L?w????[Q?? ?#?g@?7OlG??yt?2?? ???x???e??c??CqE??Ih??U?A?j 4te??U?t8??ZU?{b?ze?ICt?\?5U?F}?l8ma??S*3H?j???? ? ?c-??5g1? ?K???)(:]?j%$T*? P>?J?? ? ??%?TU?OM%r1???A?4??V???/z?a??e?}m.?}!?????s??Y??'?DyY???J?S?A>P?????z>?????Ph????4=????:-??????9??T*?5u??Z???}?R?"?P? >???Ph??? {0 S?N??!?/?@??QE??F???>???E?H?;???h??T?f]?St0+?lo?????????p???f?.??!? ????R "!??e?Nv??}?lI?(????[??Td?R?3??>??????wy{??y}?9s???????}>???|G?p??]??7????????[ ?H? ???ud????[???????????_????????KH?K ???[qN?^%??q??? ?|?N????|L?`??#?yal*???Q? ???? ????m??/????G$?Q? pK ?[?=???mm/J}\j?W????????7vt ??<+???1$?/Jb ??*+??R?????RN-k# An???t?I5???}?p?,gb??????P??+5K#q,S?p*3H0yT(%??*?_??? J@???B?t'N N?}8 g?\????n%??9?E?*F>r?x?????+9???????5_;????mi>??Dw?}v=--?l?Z_t??K???]sfs?B!?Lf?uY?l???c?R????!?O ????.0??V?????>t??Q???c:g????rd? ?z?1W?8/?9??j?t-???|??V?a'qsaZ ?Y????@I?v?Z???#?CI? ??a?\??\???? )?Vu?A???V????NY???*\=??????GH$x:=??)???????w%??h????>??????BI?K?A??E-????e???$VJJzr] ?c?? k?;y%???k??I??k??? f?`{?jz????|{?yX??????u??????{???=z^???\?[?I??$$2?2??k!?????????$?UW??r*?O????_%C-1 ??j?T???Ytd?/F?????=h[j*o(s?";`????Xg???,?^?D)?t??G?R??0 ?s??-o????t??hAk???r???_T?????\??$??????F??? ????2???v:g]?t?k?B?Av????E?QV??y?????{?m?.?????U???dK;?????eG 1GY?5\)?? .???Bx-??e~Q???fgo?|?N;g$??f??*?T\pHitTh???-TX?@?vZm??????i?Y????7@?`R?\??X??n?d?????g?A??y??zs?4?_???-??e?0?????Z?????q {?n)?p>????3??{?Y]u)?`7vy?????#lf?V????`????jfr??2~?r???i???g??&??N>?&?Z??pzp?K????i#???1?Z?>h?6 *????????T?? ?0??T]????(+???HwK?J1?19{#G??????jJS?bS?>?????R" ??l? ?q?-7??@S?? ?n(????/??????b)n??g???S???z+??mb.??S??o??T??N5?w?????5?C? ??? a?`ll???`?55;??U?Z??/?P? ??{???SPF$'3xy{??9???{]Q???5????ms???Z???w??\??QC?T???W?8?r???????L?s?=C;;CX??l?Ki:??CG?)???? "?86Q?D?q??L??v}????3>>??.??W??Q^.??????y?3???tC?????????MF???Y?F?????7?;vx??? ?7?@7?^?&?????3?Y?O?y"{r??^X_?)YO?????wU?h?a;1q?_S??[??+????Bj??Kr?6Q??-?e??8???$???7x/??aB(?j??`?M?*??K??9??W???vh?#?% E?4>?t,/K?Gtx?uttP.?????S????W??}?H???y?z??t??Y???[??O?;???II?6.,U??? 2p\?p?x???V?HG?s?A?y?????mmB?????=N????7???????c2????yy2???)?Y???*?|?7??#?R?)??h??>??q???|?,??)@?f?? 2???2 ???S?%??{WU??-%????????N?????c0?`???B?^I%!k???(R?,?$K$"?????? 3???????????=???y????9?r.z??4?*???k????N???b????#?s?a?J???'?/|???=[;?y?&????GHLk??"^??zA??;?n3???7? ????g??^?r? ???N;???9????\?]??V?o?:?]JI??P???"????p???U?> ????~?m?y@?? ????iN?T@?O/(??[w?{????/N$I?EN???q???Q????jO?X-???????m???s??? ??H{"5]????K?q?,????\G???N_?W?5?K?@?q//{wy??Y,?????o??2???g? M ?????[??$?? ?v?~?T h7R?????s??0??????a??#???3?n?yu) ????????????*???Bt??lm??Z?\c????N?pv}U%?6????x18???y????{?w??d?g???? ?}?c?? e???-=?P?A?c???#?&??n???e%????J ??????sl^?`????/^~?,?\?~????"?b????b*?v?n&???1?l?+?3@#??U?????NO8? ??g??\????3????r?/v?X1?R{??(?Y??"?? 7~WG??n_???]$???OzL?7???6[???9? A.??? yC 6?g?A@?s???????jm?T?d??~?*HS^??DB?7?????)?m?W?m?b?+?=??j#3?96??s?'? ?????))???????'I;?Cx?????/?+?4E(?w?x???? :????_t??&??????a?`???+t?I???? ?i?c???? Uy;4????????????,KbO?????s~????[u??TD%D??9??t?g8???UP??Zwj??????U?{z?? 3??Ps?^2H7????d`[?fMY??????s?%?#?[?? ????Ct???K?.?E??a/??????????\?#b??I?RzBV?t?$?xz:???9??O?'?vO??0??vns???)??W [?U?ehz?u?P??w??F???9????h ?!?up0q?6???IJb~?????v,?hv??????U5o=y?????-? ?????%?f??F??A?e??)?k??T????/DW???? ?vM? ???????t? ???B?/??? ?yS6?????555??Gj??o????????+??CO7????? Y???T?a977???RK??i???.V"92?????nm?J???=u????pq??@ -???!?????T??=???J?????l??k:?-:???z??[????E?? ,>>? ?`???I?*(S? ?n??}A??+?!?w0IS??????D)???@???xn?Z?aQ??n?|m??Sy??????o?g*?/?R-????~??*?J???????7?9j?Gs?xG??f??]??q|??[r???b??^BI2R1'?,`2A??N????e??h?????k?q6sqvq\??h?7??s??k?8???kkU??????a??c?m??????':`???|???J@????d???$[????9? o???7????VZZ???????}???Z ^3???1o?GD???#???????$???wu???????d%G> ?q?5H?I?r[t????b?O ?b?Tm??J???????Oc???9m??????}?? [????,Z??c??O????Fx??_?->?,??1??}}/?*{???? ?R? +SR???6Z?dm?1und9???Ey???M?H???=?N*?4?{??????0?T?????Z?M? ???F?A?\f?a??????B??v,b??????k?F4??lrS???d????>h?F:P???,E??<[?V?c??<????}`?????o?^:8?g ???T:A?!{??X??e???.?~???U????u?Hz ?kN2L?k]* ??lJC?~?T???0Z??:ww?H?????4?6:{6??UU?????|?F??Z?a???????????? K0:?80a8C??!?^?F#QQGu?gF?? ?B9sw?UN?5L??n:D!P?? \aa?W?1\s?, ???{??EV?^sG=????*???5??`??3C??????H?:?.????I?g?xx8?????f???&?<.????qrM/?X???U?A????#??u?????>?`|q??M???7Wma?h?gC???h?6??????+??gfd8C??T???c?]???R????p~f??)?V?5EEE?.?]?F?~??????????Ex??N?o???sG?](??^????????????????}J0???jt22A?$????Q?? ????w?Q???i?????"??Fv???*?}??X????????X3x[G??V?q??Ww??e??K?*?EI?].ush?0???z)???5? ?u?qWl?|??a????? |???a+9? .??q?Q???+??.?????!??w?R)'??o????????k?,??????U???;}?f???.Xfq?????i?`???s???n?a??>????>????^\QT????}??? ??>v????,r?&?? \??[?]r7????%_??"N????fe?%? ???_?-'?9b???"@?t????q2??F ??z,s???????=L??)??DWW{]?????ZN???}u?F?v????z?F}?k?K??I ^S[?????z?????? s????????.D#?? ???8))??v??Y ???w?O?&T?????$P?D[{????2?? 9T???11d??|?`?X???} ??+'?????".Nq@??? P??? %nn????!??r?x???s3?&?\jT!????????^?8????L> ?mJ?S?#L?? ?B?t??n??sZ?3??l?=5?0????]?#?GK)?)B??????a???3Y?{n>}F???z?iX??]j????=?????jii???7?2???D?fztl? ? >v?Jcd?a?????{??f???IJ'?;??C6q?[?{?'?^??-?N?YbKu??&??`??5z?o??????????%?4668???n&??? ?T???t???]Nw6?K?m?f&@?PJJj/??????????Bd???,=8????{??w???OZO~?9\??=N?w?B??E?5>a????h?ds???GH?j?6h~X;A?}{G??W??l????u@?`???????J .?u?k???????Q?%???z?tM$R?????g*9?f??dk ?MO'2??iZ?(*?L??O8????L?_??'?????/???9?[N?T?L{ ?$???????AG????x~????Y?s?q?)??=??u????S????????Tg?,???1N?ym??a??K????+?s??}?A8????pH?'c?K@_?7&)A; 3Mn??H????x ???--s??%?L?~?????96????U??GT???&??w?x~????`?I???? ?? ??9??t?k?????9 vX?z??D ??*?'V???.????jQR????~?4??p q9z??,????n??\??i?t ??P?i???`z?1Yr?7o?D??K?y??5??vu??Rq(.|??ct?L??>????$?n?5>L7??!'bdf>??;??VB ?68Pj?_H?$Y?7t?????sr?Y?E TD?D?*???y?? ???jm?)x?W?r??? ?"??"Z??k8?ns g?6?????\?t??IzqNZb b???[;???T????/?#? ?????(m?0???f]??w???]?=??c???L?8#???????;??y?a?L??? ?\?$vawu?-??????#"?? AT?j???/?R?? ?@:2Z??????3?,???U??IZ???"? ??dV ??k?'??g?^ ??"P????|n??O??f??{???????!A5?P?7o?"?J?X?,??c??? ??@??0?q?RB?r at 2???&?j????????? ? =??ti ?7??/?????????Y?????$Og???9!w?s7h+??8xF?x??|???w???'????32"?!w?@??P?gk?#r:#A???\??>H?&?p??A8,???%d??n??|*?*????????0xg????????[?_??J;??'5?|xA?&???"??W ;?????%?????p??N?@??XR?CP?8 ?h? ??/[??Ng??1????????N????@' ?a B?H?P! Y?cN?cx? ??6?}Z?^?w ??k??#? Y?-?????*@DlG&?9?Ptn??xk???????q ?c??q?P??i??????u???g?JN?Il??"????:@???#-4E??]C???????;Z?-?#??D??l?? /766r?_?~ ????c?qld?-U?zc?? ?u?f??=??b???T?MN??j?d??c?????I !!?4?9?~??^??;{8lx:????j?3&??2>????^??o??????g????????V???M?n?????????????=?*???9??I??3?{:z??n?fQ??v?:?"?t???=????FN?K?????^?}\????)??n???}fJ??J???X???6p9{?:???E? ??s2&?pg???W???ad???)??L??e???????????7 ?O8?1?5u?6??KJ0??,/?4???O???Z?:Z??ZJ_??MR??w?lzf???t10??k????K?X??B??"??J???r(?\?~;??N?:???????6Z?&6??d ????_ ????4??j "\?.???v}L'??e5? ?b-?a??&?O ???y?Q???n?+?t}??,?.??G7??????r-?????{?B?*??Wa???]??????1?Zp??p????????? ??^nx????SR(?h-?????G????$????C@pW?-?NE??3?????\?#??F,$<T????????]?2????,?ovZ??Y?? ?<"??XYY?A\?Mr??5??D??\\a ????U!}w???"`z??*1??^? AL? A???????,????zze??????????!z?&?Z+W????Z2_?8?D???{?HH v??P&?????????? ???3?Rj??? ???Z? ?????6&ykm????? ????.Jx???d?U???bY??y???6q?U???M?Q??tRLB??3??! ???|}x?-??2???? M \.??~ ?1 ?@???H???-????????????YEU?`??????????:???HyR{sK,T?O? {w}B.~~???????????.?C??n>~???????/????Su?vw?`?*?P]?h?????E???l???oMr??,???!x?<`???T ?4f?9?(:3$?$?N????7?????{??j:??6?c:?,???w??5?K?bmtH?1g??TI#?yH????????? ??????????"`L???? 8?G??)rG???w ?? ?????W???jZ??m? ?K?????Lr??v???^????: ????_M? @??6$???_d/]?]???t??1????^"?????jv?9l??"\\???e?N?#??-? ????$#Jl5=(????t}g??6?\F?###??!?6w??????eD?Da??L!???j@??UCmy?V????9?2?e?8e2??@?5u?????PII??????a????Y?7>??QPP????WYK 8?????PZ?p?Q????x?^?)???????x?V"?zX?zP?w?Ps?Q????G??F??a?e?L????\]??z%????"%1?fk?5C???????O????^?X???H:b?v)?~????w??6n?tW7 ??????J;?????{???5??t)????Z=??+??=???????0N?_\?^??RQ?E? [B/??w??????crW(4?g??cu??Xo??????+"vqQ?]??~??L?)?x?!?&?f6???7>?_???utQt='?|mP?4?1??_dhhXEE?y??,S??+???Y???Q?b?? %jG ;?X9?*?{?x$Spn??p?????{??{??t?6%??R??K"?? ??>??A?w?2?$*U???7(?+h?3 C?U????d?1M??:7????? ??P????=?9h&???L??%?I??j?d?Ph???\)?`??[??r??F?;?N??t??>??q??K?xs???v7??S?s/?o,7??;!@???)????^]????e??c? ?h?~????WN?i?j?>{?[?`t???????.??????X?Y???N?D?:??K}|?6???#?z%?v.`/??G???J}?K? A????D?? ?9? ^?fQy??;?I?Wp"???j_?o????w ?k??k=?????;HsG????+?7??we???,x?Y?^e??????u?;?????c?w???C?? [???T????: ?/]c?FAA?v??S?Z??????k???????????[{??MSw??1?r?? ?*u|~:HN????W???<?n]9p??????????G?/?iu?q????E??F??qH???l"??=*4@?R??X????g?PPu????r?A?AO?[^?NL?9$=> ?????!????T#o?? ?)?+?\ ?8i????[???4h?#???[?????|vZM?ud\L???Gy??tjX?r?0?nyw??G???? ????t??"??f???N ???E???o??-S??_P?oA?7!?O\???????'=??????~~?????&?DE???- ??vd?P9?? ??'?# ???P????^IEC{?v?+???? ??V_?}X?????&?A????????????$?????8(?4??rW\????Y???????8??wo y????????????? !=??=V?~????s?D?#je??.?"1eoN\???nz?9??? ???$?;?????R??52"??oJW?????M=??????TWy*?y???T???\???9q?%??\?H???????????z.?g?l?[??p?Y?q' o?S?????????Clx^wo?c?.?n??f??=$D??>?xB????&?? ??????L??M_??????o???[mEC???????????5D? ??>"?tw?S?a? ????V???? IzZ>??Z^?x?L5??F ??=s??d???:?I??w???Xz??o?n6No???{???,n????D??9x??????>c??f? {"??????????n??(:?????B_??????x?VW2?^?? ~F?v?~??p?\???^|???????? d?????t???t}??R??ti?U|????th?66?D??V7?%E????v"?9AKNEE????q??D(@g?s??M?H??Di??e??i?rN?l?Xe????:?a?|???#??{?v?iMK????#?G??lh4?73m?(??u???I@7le?6?????#?c?q?Kf??N?y??????3????????r??A?7u??w&;??I0?eS?*' gI?{??2O?V?f _M% }??F?R3 2?G?zX?u???L$0?%???G?}?@]???,W?[H`a?oa>>\???????#?;???????????H??/'?? ?????P???8??}??(??_?>z>??)????? r2:?M??cV???? ?B??GN7??no?)????????F?Y?I? J?_??d7o??+?K????y ?v=????g???/_????#?e??????D+J?o ???~?????S?F?np?n?1??{??U?6???O3??o????^/?;?v?p???Y??Y?Z?;???I/_BO1??? ???O:9%%??????P?? c???b??s6V? =????K}`?t??w?????#? o???p^?u??.?UMCC?6?????? q=?-t\???Y ?|K?????G?????qb 55???Wr??RxV?? ?.E??6m ?|?)0???x??;?????????? ??7;*?????V25?jgg???`I]`p???.$?! a+-?J?#]]J|z<}#?X+????x?}c??t?:?r????YG?m[???4?????+?????=?Dr??????=??????S?OO? ?{?#?z?*?'>Y?WS[?`{??{?????L'}?)?????????%??@l\?l???_???)?j>84?$?\1)H7?=????BH???6?0?`?9s?vd??"??g?????;/5;?z??n?g?(o?-?????<8U?s?\?d?????? ?F?<??g?>?????\??Z6- ??T?'?w??2I?1?(e/_=? ?!??P????T&mG?L???R?{????9?Y?g???????=??????? ? ?,?Aa\??"?$?}\??? p(?U???????W[?3?"?? c????`??b??w??B????'.)R y-9}m?y???" v`??????=??&??I???]a.n?????\????"l?HI%? ?J?|??????????2^P8???(??? Y?R\H??+?? hFI_ d??)?e???VW0TP_Z???An08???;????@?Z? K?? vf?R;??y=???/l??????? ?~???5d?@?0y*?? ? v?q|? ?/R?;?dqo??|>?4???/?h,z??0?d?'?NF! ?M???????S_ 'J?}?m`..`8F????`?.????t ?? ??^?????????? ?}u?$???~???s?\????-*k?????'????? ???i!????eW???d?^?)>?|??@???[??}???? l????7?k??!?? ??=???~?0~80?EK?>? ?~?_?s????|?2n_P^@\H?[?P~?????w?,??e'????(?.??b'?????y@? @m???~?;3?O?  ?>??j,(?'??????? ?!t!???*]??????????`?5`??????8??????6,?s?X???i?9u?k?/?Q??? ?c?4?S????8??2???P????w??l!^P????????G/??$???&Wl`???????:??d???0??+2????X??2?~??s?? qv?w????m 6`?l~}???y?@? ????0? ??z??????Z?h???+h~? ?"?L??-??e1Z? q????????_?K? ??m? ??2? =e-#???????????????4e4???t[?8?:l?k?~Lc}~??~^??? |????\?????m? [?'? ?g??_???? ?-? ? ??=???Z6????^??u?X /??/?m(???%?w^????*? ??u??x??\j??[?g/??Y?D?!$?yz????uE?~\&[????????s}?-,? ??? [?????#+Bz{@Xo]????!?????{?O??????l??gF??HWFd??+?q/{z?aKE+???8?A`k?????%?????O C]?P[?;?Xx?s F? ?`???+??K?? ?RFWum? ,]?????Z?d{KkY??-Q???,???s?Q??E[PdZ??8T?/'????/G? ???E&??fP?$A??~?Q=??p?^??Khn?iZBxi??d??}Z"`??q1 R?Z??Z??AG??????Xs,t???B7??-ti ?? e???? ],?$???????Z??????????)N-?X?t????????????Mx-??K???\f????5??a??T?) 6!?M?a:??o?V???1 ???Py{????Cp???q???1q??{0???????????l?EW?????Yf oX???% ll<]?;*A?i???@F?g?q?1b?!???;???/=4Na>??){E at P???!?`N?E? ??0?C??s????(b???v[???^?????E~??J??????/&???V??c,?0????a`?/~?]`?-?w?? ?\?????(?????M?+???A.???|???PZ{`? !'=?`0??F??'?Y??O\?|?"????+t@ &???X0l,?5? V? ?O????1g??????=`?(?2?? ??)d?!?T|?C?_??'6|B){?2??)$?0'?[??8C!v??@WA]EA?Y] u?F?F ?+???d?p?H??_?y1????Pg??$#p?+???? ??_???P????+'=?"?????W??OX\?O\P?^IC??g??c???X??Qc[?! 0?m?QE??? 7??*? ??????_#|C?? ??Bs????c?H?.????O????X?v ? i??`??Lr]?p^?X??N?`?;?gY?2 ????.??]?????????>??????X]?X?)?P? ?.?PT?[??<7?@?J?????2;`t_?'???W?y?*??.7????-h??v???=?5h??A-?>????????H?(U\?/?%?'? #??Y?*.??Oa2????????  ?(/????}?!??tv??x@ ??.?,@#??Zu?h&t???????| ?K??~??*?|?/? ??????? L?Z?4???a????wi! ????>??8`??????,[??? ??"???)p?"j\I?v?a q?` .?? ?V?\xp ?A?AL?g??7?? ?~?-&#??7p??@?F ???????????????"??2???{ ?]?=?0od?????s0WNz????????8/??????'-U?? ???0d??#??????3@??]&+?J=???K??h?????%TC?hd????e?W?|?E??5???V??z,?;q3??t 7S?:S???????? ?????M???????????3????q??????w???_f??o????S???U???wZ?]???k ?W?W? U????'~0N???T??)???N [0??????????/|? W?}? ??????|bK?????;? ? s? pRd???s?I??K???KLF??W?}aw/_?]??I?'H/???????8???aE??n?????V ?T%???$F??????b??W ?/?? ????R?"?R????????;K?~?J}is???E%??j?????Qk?b?I?? pu0?n??r??R??+?I????(?Dq?`q??CF2?????G?(?+??G\1X?R\1?????????????s?"8W?s?8W???????j??\???J?~????3+] ?E?+?b?7O?N?p???????R???<)?,???4G?/?]d??B?8???W???~\X???e???F????;u`E?_??? ,q???(k?1?,??????????`???? ??#,?[X~\???S?X?????PT???|\??????]???SVL?OP\HW ????????????? ?,??????^????$F??U???^??W??]v!r.hc?? 6?@?|f.???=???[??-~8?!'??Vj?F?????p??]?q?? .?~ ???????,J??/7K??????W6??q???,?P?,?q{???P? 3s?yA<@?????Flo?C??)"?y@?p? ?^??????? ?b ???Z6?OA$??8??8? ?u????9??8?U???;/??? k??"??ig????Y??~??a??d?-?s?????G?_???m?4? ????|1?y????????????| ?K at A???0????????? ??????lh:z?mh:?Mm????k???Vr ??????`21??1d?C??){???f?0t???8$ '?? ??>K.?M?|?/??Iz=0???_?^???_A?W???E????????1??G???4?|?oQq? ?+????_???D?=?K??E?????:C{?@ ?1t(h??'???.?>??B?_q??w?0???3????????PbYY??K-?D??#?R?i??????7??|? ???z?_qL?!B????A????Q?!??? ? ?R??H,7p(U???PI.&J???%B G?M??0?W???t???`8@?? ????J?XO/V?????h??{]????? X9??e??X?=08?^??e?K 7?.hc?,?)?u??'0w?z ???>3????g;??s?C???A?t ??????v?r?????e?/?g^?? J??JG??;?B???c>??\?G?q4?????olo???0?]|v???0?eN?_????????t????s????,T????^???y??b?????B_?X?%?????K E??????X?#|>?y??3????tv??x@ ???Cm??d?[?????_yP]??q?h???]?c???R?[5F`?3f???r?8lF_6D?g?????@?A? J?????/???5???E??l???-X?l??27?e????-??E???w?|??t??}?????1_}?q^S?C?????(?M?M??~w?|]4b???\4?????`??????u#08?[?B? m-?E:?XX0*|E?z?z????m!p??? ??C?Hu ?r??B??\??k<0??w??h'??;!W??Y8?F? ????A??????????HYESE????`??] ?;(????? ??AF z?K ??]?(?< ?? ??%?2 ?W??e??????~?$?\jb?j ???d?2e?_?K[\K?.??!%??3J1????Ts??#?Q??1B),?J???A?w/$?n??? ?j? ?{ ??y?Xg????????d>"???W?a ????M&o?)??B%??t??>u??sN?c? ?sF^ 8P(Tpa?V?]?? ?I?l??C?9???|h?|D????'D?t??"??? ?f?a?c?? ?p??b???^?b????8Z??:????\??v?D?Z?k? uw~?:??s? ??*????V?:?????U??'.?w?=d?-n?u???c ??????S\??'P,?=b8,?yPX?!O??????:pD???"??C??E__*6?mq?%?T?,??4m???%Kl:N??+a>?C?("(K:??????XA?&?s???=cnv*??HOMI?NK??)x{?.z?? ??Q? ???t???3??2??? 78??"?U?k??(q?t?p?e:????????J??h??R?K?_?????=???C?='3>C????5?V3E???_?I??0Pj<L???["?vK7??:???^K?mK!\`?f?`}.????m?RT?O?}?h(|??3?n???@.??\?yj????????o??n??? Y&?T,?qH)'?M#J0??1? }????{?\B,??????e??p9?[sqZ??Y?*???-?p[?9???? ?p9V:6???v3??[X%u?=??!QO?Ac???? ^???7/t?{8?u???\?.??????g??? ?????3???!f#CLN\c?#nlck??$??c?g9??{??g ??sh????? B5??n0%?? W?fY??|??1??V?*?(%r?LZ[?Z/Q????_?* Y% ???<'?)??+r*R}(????0 ????Y???;|Q?a???9z??D ??2??"B?X ??>??? f?. ???????F?RU??Ic?R????S???7A?????F??I????M]?a?d?7???L???nfT?k?G0?$?%?>?d,?????Oea,?PoR[p???|??????2???>?????X?F?g$??S?T,@?>F?/fr??Fe??MQ??;???9IY*??? i???%2????VB?V?`????8?x???mvH???h?G? SB???.???d?;At ?? G??#^['?C| ???UH??>?$????~?[??????U~?4?k????Y??Un?2*V)???,?X @sn??????" ?.?kid~???1K A?4??*?????YL?????s?eZ????B1???Y/%??>???o???_W?D?H????????abi/>;??I?????Q?q=??%e??????]???C@??c???'J*?5l?vEqST????nb??Y?????6M??%???O1?g???1??????6S? ??????Hg[H???L$?4Kk???????????YP???q(N?Uw?VVr<}SJ?n??2???9??"!=3-)?^X???n?Z`?q3?X=???k?b??zw,?y_?bI?` ????b????(???s?2?ui#??i?????S ?}79n?b% ??c??51?x ?6.[x?mL?v???,??6????l,?????99ExE?9}??h???N %?????F5???p??(?N???e_?a??e}?!???????$|???J ??1X??b?'?(?R?L^O??h???e??PnP??#??P4????lFI?RY??M/1?z?&??F(????????!??=g@????G89:x~?h7.??O:4??n??h?j? ????|????{????V4?YC?L*??s?,^???D ??P? ??P??{??q3? O?^ ???y??? P??q?p?a &?To?????f??????p?ex??a|??,?]s??[???S*?;??*8 v[??@????j?0??_?`?f?n!???f?<.\? ?p??8????wC?!r?j?2W??1?lO?Y?D.W?I??c??mp?$ ?l????FC?< ??sv\?!.??R???6?Y??sq?yu?@ r^?VE?? ?w???~?W?kdt+??a?4??i?????B??G^8w?????E?????~=M?<Z?Dtc?(%-P(2???4`??L??h?!A???V(?????X>???? ??$????T?84??]M4MB??4 ?Cb^?`?????p?cl ??????S???W?`????6+????#<9??D?????V]?? ???????? y???B'??$.?-s/??E56 at D9????8?M????u?qX?Q|i?$?F????6?????L??HG??M??X??Y9??|???JC?J??{UQ? ?]? 5????=$n?@4???>j??4?5f&???.??y \D2+5^?????2 ????$??w ? I3?a?5e?0???)? ?a???i P?H7O????N??l&??S????+"?pj??(\_??M??? 8c?F????,??S??SFXI????fG?B????1O??W????? Q?LIMR'$???T?'?R????IiB/A? x?Hi\]??$???R?X???S??/????:?J[:aG??j??M ????HO???6??EW????Y???xMi?H?7{YMYq? C4????? ???^???y?&??%???p)_e??/??}v(????v,?hm?3??????-???:??R"QFI|????????.???O?N>?;???A?>? ?N???? v??e?dr???w[??l7L??????f???$?W?????????A?p??P=+9????4??5?N?x1??lp?????I? n$?(P? b??p[V???WG?@E)??+????c????qX?y?W?H?v?2?I1?Xy?"?-?o??:?fN??)? ?t?)x????????5?R???C\k9????5y????E?ve????$K$4??j?L??I?????"??y??U ????l\?Jz,???X?PHa????? F?5XC?9??C?B???T ?X????Q????*??????"?????????????v?7+?9C?s??N?&??????47????R?f?U???_?n??jt?????w????6?o?m??X"5n????'L?G,??z???I?*V=X=h@??/???o?????v9???v??qUUL?!?L?d?|B?q4Re-????`|?mY?_???????W?????G,_U9-??????+w>:????>??8o|??+G??????u???#'??3zduP????ei?7??x?????_k?????K??j*??Z9ft??u]WL??????a=o??????#?V=V1???????????ONI?k??U?V?Om??DB?/;?????F??????ks?9W????sO?~????-?V??QO?7r????:??7???{?????g.?Y???#Q???w?????s=8??b???>?l???}??2????????z?e???g O???~?5z????^???Y???=?????&D<?=??Wxz????V7?p???s??p?lH~????M?Z??3???gw??(??iw??R???????^????k??O???????7????W?E??}???U?*.???>Pu????C?/n????E??????6C???s??7?~?y??????4????'&??????U??g.^7!??I?v-?4w????????83j????????z????em?????r?h^>??NX??????5t?r????GHu?????K?m>??aM??{???5??m?'?@l/y??/;???4????O??&^?(??????h???T?y??G{?-?8??????(*???????g?7[x????^?byE???M?#1?-????????\??&w@???6???G??M??Fo{~3?? ??K??F???&?????.?>?qsD???t?0???????k???4?????^Q??j??????h???N????-???????mH?????/??r????Qc.???g?7????????q??K???*o??????S?=ZgN?6????v}??b??E??????]7|i?[=?????gN?~g?2??W??9rfwH???/K? ?q??????:?????Y?'T]Rv??????vk?|qm??!?????]?S????k.??g???\N{???????6??????/?#???v??b=;????R?_???????l????.??j?K /???'? }?O?J?y????? ???2?z?$?j?Rs??????e~???6ZO??=??=_??????X?s?Z???3???????v???????C?iF/))?B??w????I-?~???'t??????cy??A}L?~??m??? ?9?>?????~??w?{???ard??????9???/$_?E?d9??:~??3Q/g?/t?????????????J???o0?O?A?>_?_??d??a????O}???? ???_gv?????d?? 2??NI:0???5:zq???4);'?@????nB?a?#?H???m?:??x??????irfx???Q???=?.Ia?k? ??/???R????::iD8/>?r???????-??) ??!?????k???????G?{?v??w?ym???M?????? o???F?????s?>^?`>?:?8??????L??^ys???}????#3{?+???v??Fe?????|hwf??r-o|?QR?????????M??u????f???k?F\??m???;?????8???70b???2?~`??????????5r?X?#k???J/??UI??,?[n?[? G????i:bB?mi{????????YsK???}???? !_m?pz??!:a????????F?TV=f?.?????a?i ???t??P?????=?E~??H?7?~'2M????3??'?}?3?)/???+??UQ+??;?8J????VW??4????C?6L?W??????????????G?????????qT?@??n???????????`??!]??v??????? ??R???oz/?? ??eG?gvoO]??Y?-???!???0??9G?{iE??????}??w,??E???? 8?F?a?N?-?????{b,???x???5??A??l?[y9???#b???t{$4???7J?????~??;q?N9?C?W??v??9????????is}???9????Kb?????f?.?: \?jn????#??Nj???(?/)o??iq??4????O?????u?1?????~? ?Y?&&?l??ss`?????f??=l???> 6?K?.6u?a???9?i??W?D?????|??)??????)?o@???t0??n??p?G???l? ? ?S?????????+????8??/?K?O?O??<9??O??rI???????x!?????a?ww???W??'??????O&~??F????J?????6}??u????o?+R?????;????m?V\??????^?E ' ?q???zSr???^&?+??\??????-{??????mpq???:?g??\29*??]|?X??|?y??f?E?M?R??_???????b???8q]???? ???yT???Og?M????????}??D???)?? ?OS??|?m?rm???L????+=?l|??????????w???-?????07R?f?? ??Y??<cd_8nd??????-??????w1?n??????? oW4?x???{????? ??QZ???*??:c???,?????:?=g{???????????????F?OF??)?D?u?H????!1?V??".?f??:S????X??hF?C?J?~;S?}????jvY???V?H6?m.???n???x?U'?.??Y}(?lu???V??????,??R??{??]?~?|"?? ?~??8c??Z?? ?y?R?n???????c:]]??}??`m{???T??k???&??b?_?????????????w???W?dT??k??O?AwO??.?nv/n??5gw7c?????o???N?????????_#/?>???g?.??ka??eZ?7%?~?#??`Q??h?6????f????????c?m??[w????\u??????G?fS??????S????*???????} ?:p????%? ?=???):????????)?4???_???}????????^???1?[??????V??]?w??v|?Sr??z?? ?+|?;2???3????a????????1?=?????F??ef?????PG?!G??L??t?Y?G????~??~???????&? 4u?r??c??hfj?7??>A?9YG:??9?@W? ??H?`?=?i?????[ ??S???I?>bc??????x???????????b?V?(?Y?? ????????v?g???????@??x??????~?hq69.??[h????????????K?11yO:?Eww??nw?p???&?:'???????????? ~?9??}8????7??+8h??t?????rv?vw???;??)????|???c?+WW???zc;?? B???w??R>jS?|?"??Z?o??~???*?^f?j?????m?:??qu????C?}?d9?^pc?E<~??YC??_?.?????a;?m!{?u??????WC,N?cXm???t5b???x????#. {?M?9??????g?8?m?(??????{???c???V??R?????~/0??O?r?08O?gV?^f?3?y?????`????7????(?dia???????D?Rn??B$a??4?d?Gw????V???????6???V?~_??rz?????&?/????;????KJK?Xw|a????&?????i??~N??? ?, ?rr????????w_?:?????m?????O????Z??c?I??q??sYK?????`?{?o?? ??[??OMO??{?*?{????K?/H8e?????OkD}fo????>?????Y9V??????l?1??????}/???/?w=?3=?4???|?AW?g1?????~??o?V?#???i???y?ZUU??^?x?b???q??.y?????B???9?>NZk????????]|?fV??%9K?s???Z?:Q^y????=?f?] ?\|T8y??]?9?*?'zk??????m?-_?R'?\My???OV,?x???1??,?>?e???M;??y???b*??n?{?0i?????&?s?sR>?@k???#?f?b?9??5Q????m?????=???"?Z??a?P?C??o????@F??c????D%X????H????7zlt?9|?W??:???:??K??j??y?82A?:??Fn????"jFeF??iDl??T?? ?"N?Ci0S7?J?#Ek??D?? ?e28\Hg?#9L6=?????N???9J??yH????????-??:?4 ????]XK??GR????c?|dJ3?N??????S???3?l?!????@~?bU@`$?R ?????V?????I>??jx????t ?%H???p$u?t?D???Pc?%??VNIF?5????????M?<%?u ??:t?????EIh(???<?6??Yr?FT???(?t*?????????\6?U???Y?I-? ?6 ??8b?????????d'7G;O??Dw_?D';Gg? ?q??Fw?su?R?,? ??)?6?]{???l???#?\1??w???P6r ?6?????? kI?????? ?#???)pk.?i/ :?????0"dzy?Af?????~?.??????4????S`?Y???5l??@??G ?#??&???????EVoB(N?n-??:????? U??4???@Q??m?????E??w ??-?s?? <)L{?::???r???o?o??@ ?F? )/-??? ??H@d?8.?S?}??)?E?)??Vb?k-???s??|??Gl?m'?? ?k?8???F?n#J?Q?q??W>J??z'&H *?/?1?Q??]P???Q?Le; YA)N??B?????h??6? G?i$?H??E?;???p^??CD?P?????9?6?P?.T?s(??oxA?:6? z??????@?u??Des??g2???|f?7*?(??z????J????4?B"E6? /????!??????M???l?h? Q?"?;??Te?M??T?T?s?Q???I?1$ ,C?Q)0b? ??VZ??pC???<&]h?F?MbHv?ZqA ??~?F?7p????? ??Z?M)?Y??(J??\b??????? (N!?q?7?8p9???$6L"Z?Cm??6??F?B?S?P?Gw????P???&??P?q?A?"??? A%?d9??jL??%`K at D??I?Z6P*LD?wC+N?HaC??3 '"?-?P??e?O"??z?oF#FJ~???,_??s#??m?zQ??:4#????= ???????? (???D?nP?????C?"??!?"{6C$?1"?i?W???????IW??#} ?~:???????/?R ?] ???u?????Rt?9???z?????9%??????Y}9\, {N??06?4a??#??&?&D?)?k?????Y????j?31l?? ??f?6Dr??[0???C'[??$ ??q ?aA??h?X????,02?x????#Z??2H 1M?(&????9?????z?????0p _O;????#?Y????????h6WHg?'O??(?????1??H?? 9,6]j &?h??????`TR???L,?QDL??l???}??yW??j???@N?*?VE?6??O?????A???(#???n?&? !Zh9?Bp-? ????>\?n?M?R?P4fAj+k??V{XC?????@??? ?????&?)?R?????a j6??CP??Y?} ?G?/?????|!G??d7Z)?w???{J??)???i??wP?H? ? 8? ?C?T??r?j:??(?]???=??i{G6??1u??{L?#Q????L?? ?????+????R??O?]U???bh?v???c?Jp??#???EQ9?:v??(??*?t?tQ?????G:?G9T?p 6??`URQ?)Z(E?r f???????ZM??f? T(???2???8w?[??4?F? ?@>??f??k???1??i?}?*o??0+??????`Nt???????]?W)q?K!+????BpG??P6 ??I??&??I?s?Y?*?x6 ??f??=?KG??Q????d?`-l???`????????E-h?,X????K??? ?\2? e?# s'?f?`MBjM#J~? ?e????!c7?]6???l,?G6 ??#?JC?c???|6 ?+????~?#?p??0X? <2??A6 ?? ???llK00???2d ?s ???U f?` 2ld?`[??M?????2d ?? ??>??RcXa?f??Y?~??.?=?Y??4?F?=f????F?b`?hx????7u?M?u???;6????l?]?@???LY????#M?R?v? (??,N?#1'??8)??8)??F??R????em???2?o?g?`[??l,c?c?nS?????;??s`??C??f ??h????yV(????~???? ? ?u?9?S?8?S`7!l"v?`M??uB4):S?)???ud?R%? ?ss?Q??o???C[?XZ?t"???d?YTR~?!?U???????!??????I??? ??U????jD??u?3T?n??DwN?R?????4?M?B?????s?j3??\??L?*7Yu%?7?7?Iy%c?*?cV?%????Ty?|??E??T??wIS?/pJPD?X??DZ?&?CkIG|??+?i?,??ixgQ???I? ???pk?/?c? 5???RV?M 5?????:?'6??R?}??????z?????B??#=?)n??nJY1??@4??U????Z??h???|??lS??Z??A2??#??;????+??:]?b???? iY? Nj??Lld?0:1INLO ??Yw?B??YY????.?????O0?+L3?d???5x?>????Z????x?i??~?????E?|t?7S.??N'??`???N??JHQu???9???rq???%R???J?99?VVk?????????i??-??PP??[?df?''F????\l>A???< ?=?iA^??^OR??_?X??^F\??????k?w?_C/s(aC/p?b?\]??9;????l??v?h?l6YQz1????????!g??KhH??c?KS,'?9{I_???+??? ?? #????WDP?VZ????ZV???? Q??#\???+????D?C??n??7u?vAs|??< d??+$?J9?a"G?=@??"KU???^ I?l???N'??7??[??`c?:Js????(????\???u??vi?f)?UJo?:????X?(?9J??e&?Y?????,{+s ???w?k{?+??Z i???v8?8H5????;rg?&???n"??E/NB?????=?jhC??M??l?ADI??n/I?D??P+?{!W??%B?Ao"4*?'B?Q?"?R??UT????C???^e4 Ej[Q???? ??qk-???;??A)??- ??????5?~MT?=??~MVx???Qb?Y??"g?I ??1?ZD?@-v?G )?-&?ZD5?????k??:G*??K?@-EG,j??J?? ??d?z???m??\^???B a>?? ?!;m$%?+??d??.??c????????d??C??b??=?ua ne=#6?,??gWylz????R=??VsNV??3g{R?@?^?-(k?T"???C??[?"?8?3?U?q7!TlT??1??`?g?z?n;%Q?8qe?;}????L[??j??id&F&; ?D/?nB??7!#??t"? 8q?vu???O.9?W ?z???xeS?^!???rJY??|J?N??t-?]??]~?ZD?p%??e-?,aJ??2Y?W??3?X??a?Y?h??u??!?t?a??$s,??=?:???sw?? ??6U??Z? r,???@"T?2JQ%???A???????rnAP?>?U?iyI?5?*?|1'?r??.??i?f?????X2N ? ?????Cw???S???*? ?#????}g?Tvo??)??{_?%P /s ??2"h'??2<1???'??W?/w????+??????????5-aL?#?HRo?????M?ZR"l??V???S?L?D_??l?Ym%O8?4???]?2??hn@8?/W ?K?4))?v??????? ?_???Q4?????0?r?/A?)fU?0 ???S?R|>?`??S*????? ????H?z??L??S??%?"b?Oks?j??g? js????SPk3??P? ??E?.J??$8'????A???~>4b???h?L$??X?<"??U?F?0??hh??!?)??P4^? ?(???%??9&???kO9?/?'?sL?????dw~m????/f? ???@#0?:??o?)??N?%E?f26?ma??Y;?R?lVJ?????j??V?n??.D4Q???2?????!W??????n?g\?????????ya*?/>?z{???,z???j?BVLIfA7\>2=;???3682???M?k?,?Ve:? ?&?K?_???????J????f????Q??,??? ?/? ???? .??20???q!????X(?59- ?($ ?C???%?4?oj?TK ??[R&???????c^??Z???r?n??? ?[?*?\?? ylz?s?f0?{??3?t2?d??e???5??? u8?I?????????;?Nha ?N?YBn?M?F? +J??????2??T??????"??;??U?5?B? _?Fm?TI ?V???V?6?Ue???????M??O??R?H???qI4BVYR`Kr???_r?PJ??S?B?Z? ?.j????? ??XU?$?5?e??]??3qa|b*? ???..??K???`??F?? ??? J???W1[W`-?? &?s.?pgs?c???[?S?.-(?r ?J?Bh ???v????? G?? ????????%??3^?! ??Z??0???U ????j?jJ??)%[???? ?????B??R$??yK?5ue????2%?;?Q{?0k8??B,??<?3?4???%6??????S^;:????l??7?K??;?B?HsQeL?p?p?? ????? w ? 4W???7?+ W???[??N??????8??+ W?q???Mq??`??. ?b^ Q]p???? . ?|u!?? ??d????Kn?\A??2?7x? ??U??_C???b????b?Wo_?\???3?????L?2???|??s?? #JnA???????6??+`??.??iA?DUY\D?1n???L?!i?Q?~?5n2?uQ?1??Xn?? ?9??????f???????2&??? h?j??R?d?hy??DO|%/???{5I?H???0???Z7?? `w????}?iL?_?  ??L???^?S1}??L ?""?r+hDG??y?R'? ?1}????Mc??q??r??\E^??$???h???????U~?k???6 ??:wyW???F???p?Y~?0@?????tg+?X?????&?K-M?,!8 +???"?????YL????????.??$??j?b.????ri???>???$???%LZAQ??????8?0!?????U#???L????z??%%??qp???Iu!??????iOO??":mO???**r????P ?NVACm?& ?????? ?3?P????3?d ?tqQ???????)H?`??,??? ???b?s????zt-#??X?C??18?ib??7??ZY1%???U?#??S?Y(Xm??~? ?j?TI?'K?o???????!?v|q(a)?@h?U?bV?p???+$C?cqe]?J?&?*???nlQ?/?K??? c??2??d???O?#va ????v?t?K=?]?C"^?sed??7? ???F-u??0?"????b%V?C???jb??G?U?P?E?Q?$???,?#?ZW7?P?'f???m9?]M?P?u?vZ?h?-t??Qv[???@7??????A?X:???U?????????w?O3?f? OyO???;??S 8n???`rJ??? 6???!?%8?2?Q2?)5q?5???k?tw??vw?QEF?6?????G???????JC????m!??x3f?? ?*?7?^1 ?vk ?fn7???g7??1?m?V???;?9Q??%?4?+?*???M?????Hyn ej??}?_???3X????????E]J?s1p^x?V????\?*?u.?p???nA|??? ?_O)??!1?m?KIk???k?4?a?D?oy?eH?3 ???(??(t?????a?A ????A?m????4?p??$?Cb?Q???y_#8?+*?????? ?kq???8"z $?G?psn`?K|$ ``??30?J 2w ?5?9TJ??]*???=J~?????H ?p0gp??Hi?TI ?V???VCmB??_w?)??C?Ui? ??t???\\?p???J1???A???(?yI???@]&???!???H??*??p?}?ak?X?? ??[0???b1??ss????I.65???fgcS??39H??}8iE2N?-W ??? ??9?t 1??O??;g)??r?3 D?(??UI]?s??#???-?_?)(?????_09h ?T,+-k??"??-??K??,??N?|????{B0?PE??H?E?S???qw???P??c?2E?? sS?J)|?#U>oG?c ??????0=?r{ )1 ???Y?p ?bV? H?bMFY2r:-???O+?D?? ?-??e@??s6???????^???N?&??z0?gTL?\??T?#|44h???h??????f?o?{,????F??? ?????M4 0 ?????hQ?Ey?Wc?O??DOZB??S|%Nh?v'i"ct??e1????;?f[?;QWO- ?J?Lld??=w????E?! J???z&r@???&t)???I0?y&??? ?1??q5??Xb??k??i??????|Da? ??,]????G???????d?S&9?(???U?3>??I%;??+??iE ?? ?1??????1??b?jA?????9k?^?????Y?>m????*?yC?jV?~????c?????C????e????%DXS|?G?h$? /_???????? '_???|?;???a?>????S?????P42?X?[??OY?|J???HG*k??%f??h0??v?U?=??????f?{??7?k?k??2%0?&?e???N??y ??6:?h?kW????y??J/9 ??{FO?S?E?!????w?IM1n??ey?t?? +-?UV5{???)%[?A?!H?7.[??????%y`??0k*?h?g ?????-2t?s??J?Xw6??O;?eh???Ar??=P??@6N?iY??4???.??.???D?l???????+?s/(@???O??kF?/}?p?^y;?g??sz*H3*?[6?8???z?p? 8C>NB?????a ??Z?q? ??:k???y]]k.???o??u? .]0???K????M???+`????^?e| ??F%PF?HXW???Dez?]w???k????#?')?R?mX?]?D??@????T*$b?????:2,???{:KZ?Qc????9???H4-Ru?!C> G?@???O'?i???B??$?~Eja?YK?B. <)??1??e9??bu_??h??/?j?0??"w?X4?z??"?????Jb~ ???r,?????H??? ?G44??@????Bx]?????-?? ?Z?* i}-? ?j?????M+c4??A?hk??,???Kg? ?Wn\*?L??^1?ah?BU?R?+hb???9 p:p?(??~?w???$:c?Z??FT?5?E?? ?????7?L???'???h?(?????6R???i?-x ???%\??*?jr?#?z??;+?j-?wV ??=)?a???(!????7*????`0?y|uu{x\???G??6!V???UY??H?X;?H??Y???=?;??????!I]6??}Z?SXZ"???v??? \??K?? ?.?I???/V????|??_???K??~??[^U??????m??b?????>???N??-?????w??????=??????O=u???w?p??O?????co?^????7>??3~q????G^??????o??????V???3[?z??k?}???????9???~??3/??5??.?~???viqQ???/???????s????K? ??????? ??????CWg????p?s{?>???]?1/????/??-/??+?f?~?C???????=/z?i????????|?????[?????????y(?o?m??1????&?????m??/???????B.{???_~???M??m?????>??????????'??????x?=[?^z?R??????O????}k?a??O????sw?y?????W???d?E??<?}??c???????}?????[N????m~????W???{6??7???????'????Wo????_?^??????7_????{M??9v?????????:????=??#??,/o????n????G~????t??????????????%?{????g?????l??G??????^?)@?W]????????_?????'?^????8??K?????d??????)?/?Z???#<{????{?}O>???9????'????{??????????{????O?y??'??;??????=???????? ?????~?o???[r??l???W???_??????????3?m???&?z?????n???up[?y?S??}????????????????C???7n?s?'{?????3??????N????w??;_???????3~??W}???[??o???????????{>??/?P???O???_?????nz?V??O/???????}???X??/{??g????????{u?????"J??2?}?c_*????`0v3c?hE(??T?f+? Q? ??YRR*????^??s????????=?sg??\???\?:?k9?M???4-c??c???]C?C/????Kw ? ??,z7 +????????4?G].???k?^kki???U??R?l2?;?n?5??D?E???k????m?5?B???0???2I?D??????P?~??b?(? ?*0???f+M?}??N?{J#?*u?????*?w?7?? ???+&??R]?5?\???/?$??x????g?? ???R}?J|???I??\[?????g?"?M?E.????c? ????&#f???8?? ??l???C?YH???f???8?8?[+?}cQ?d_??(Ys?.?B?u????b ];?Y?6????????????? ?'??????R?? Q???????3??s? 9???S?????? ??]?s?d- E?/Y?+}????[v?Mj??#???????, On?;J??*?k??y?p?zhh? r?6?#~?y????Sa??7us|./??s?????s??qt?=,????.?|t[??8y[5|??a????T?P????9??+???? ??m???????????rUP?WA?? ?`??OX`qVv ??a?6?i?????u?k?V}??"1???YF???/?????O??? ??|??K???8M!???'?5??)?+zfW?S?.%?S*R0?? T] `???ZkpR??0????mz??,hc0?`?U$???5???????v@???EuA?????Tofjl??g????*e?????5????p?kOA?S??k??J?7J??>?a??J???????0??5~?b???EH?_}b?:?n!/?o??Q{_?????UQ?z??~??? \?-4????????1*%ou?????"?L? W?????s???M$7"?????[?)t??*? ???V???52?? f_/?C????0;???? l??q??~t???????'Tl?X\?D??e??\??Y?I???~4??Kb~!????p?"??1'?vVh????J2???5wrZhz?Vt??y?T?c?GS??>)?}?Z??Yu???v??d???{?h????9n??e?~???P???5?????eO?V[*?????A?q???????]??????????`?a??|?*?3?*y???? k????,+??T???? ?,4??????G?,??????????????K?E?[???3+???7???k???????!S??~R?????E??t??i????Jh?????????7F?=Yq?(???G[?+31?KO?????"??q?4?b?XU--8??,V??? ?????C???}??C???L????? ?I?'??????????#ww???Q?xl????5?Q????)s????W;??{??fp???;???????p???????_FO??)???7 ?????F??g??`M?r?]???^????&ye???U?????????A??????n??u?q??R;MV??x ????Pc?3????\????c???X???+???>8???????F?TN9sQ0)J ??f???????gv^?????2????a??m?0X????g ????8WN??|u??/???Q?????&,?>sM??X?5?\??(n?2?????W???Y????? ??KRo?cc;?Q;???(??n?i?? ?s???2@?s-?????HV????<?Sc??)A??????5??+??fq.?nJ??????G>m???u?*:?*??DC?????}?%??????>?????^Z?Qx?G??UT??}??K?M?l?$???37=k???pi????S??? ????????}'??%x?????????+?R?8xx?:???????q}i?P^B?l?????????{ ?7? ????>q???|??;??8?m? ??U???J?????A??**?=en???I??f??i^p5wsus??J)?Fe?L:wq????~??`?OFH???F?Tq ????eL????8?????)??[{????=?p?a??W?????1OML??~??k[? ?l?m??M????@?????q???2?*D?tmr ??p?????=?l%? }~???|B?????????&[???????F?O??????9?K???^???p=??9??q???&????T?????}J??lCUl??(???????? "?N?L??MBBq??q????j=??????;???w8z?5??P;?)e?P9?Y? ??s????????3???????a?J??c??? w?????????"? ?H-t??=z-.?a?d3?u???j??8\?????T?[???c?]??????o??J???;d??????t??B??r8????? ????A?s&?`i?????? ??{?@i????,????g??N??????:,.??vw_???Y?+z?`???kGk??R????o?k?(???X????d?Ko??F2???????????????#9?r???|?8l???:?}E??)$a?$?=??X?n??kOYTk????Br?e?(???e????4?????H????z??bV_F???h ? ??hG???0*??????Ap?;?'Ds?B??"_7.x???x????_???w?1??L[?m?6;;? ??FQ??????O?hr???W?????|??p?I??Xw??? uww?'?wnY??:??8]y?s?????g5?k?]r????????[?g?? ????H????'f?O?2?_???E??o???c$ ?1?????g??X?l?/i?-*??|?R?WS` ??'`1??O????5?^??S?? ????Yh?u?4???Bp??????Qr??? ???&[}?a??# ?4??4???{??_?U?3e.???a???S?? ???v???U??f?????+??R?z$??? Tx???Z#????D4 ?????k??5?? ??|4????h??6??oiW??W??\~L??9>???/??"???y??????d'7bS ?7????=??? ??Q~?? *7H0Ov?>?????????Cz?P??W?#G1???U????g??5?o?~+G?E]???#`?W?m(7?)6b=s%nN?gk??:?@h??????????PEfkgl?????zz?05??T??????e???Xn@{Ea??=?3Y?I(???^???????ez?B???1??P??/]???+.?????+. tU0????????s?\sK???2???????r?`???|jw??n\?????/#???????b?l??z???\w.\? :????+4?= ??z?i??5??P?cg????? ??gLN????G=@!?0?h?^?H?~????-=?? ?M????b.????a_?_????k? ??@I}??]zC???&&M?d?$?o??+G??????(**j?71?mF? R?[ioBC?.?????,??+}?? _?o?n???'L??&a??>v?????^J???'^;?$!?\>sn8{^UK????x??*???_FFY???&O??h?x?]0??????y&???????W??m????j?> ?G3????)Q?D~?[????Z??Go??13 y???P??..???5?A\AHS??9X?????ZY?M?????y[?lX???y????_??;-.?8\??K?uk?Wc???j???????J?wm?u???-???GI?cA?Yp?\l?|et?????eM ?(?1???*`?x^????R?t\?Y??{J?^??({??(?Qv?EWW2 Dy??R??y??m?????%??p}y;?l?????S0?*??????Z??N?=6?B???7????i??'?(? ?z ?zD|?=????????? J?N&???8????????t?????????Q???????WJI?q?????K??Gsh?>{?G?i;?~?? ????kK????x??W??????????~????B:??>?0p??eYnP?(??{39q???p?k'pR?L=Q>2??D??s/S?|??L??f?l?x?^UEe???????????^?T??????4y??;f:73}???Z5????1v???p???v??qn?n??W*N?~?????2X?%9?){N{t?? m?S?o4~?aXGww?g?T?C?o????t??z???e?{????}??"?????p? )??LB@?`!?t? E-??????3-2q?.Wn^?DTf"7?3?cc???p?J??K&?? ??1??????_;uV?E??g???WN?w???????D???Y????????%?-?T?~?,?L? ?? o???/o??? ??H???Q?;?m^N?sg?U?3-j?O?*c[?~?V@?? ??G1?{???2h???????1? ?n??8??????C7?_u?*z??m?;m?D?? ???A??[Y???????6?+?n?K??u7r c???2?e?Hzz??????? MM?6?nl??????Ez- X??owx??>??&???oY?P6gkl?RuzG?}????V????? ???=???f???m?R?X"t?RC???%??? ????,-?N9??d???'`??,????L?4.?zy????C?G????????Yp??/t%?}??Mj?J?????S.s??uN?u?=?e????ii?x???????"[??? *?d???f?U????$~w???????w?>la???1?]?????????S???'?]]]%?#??E ?G;h???H???=?6sa?d??+c?c??????f?9D??x?#??? ?C??i`??:wfg?XXX?+??:S$?v???????i?2?? ????????3???N?6??9L?&:?????O???????:??0??l~?h?v~?{?{??>`-??Z?&33???????????H???"t?ouww?]Qa???c ?*??x?a??#???R?%?????????^??J???MM0`??&T??????/?\??OOOO???g??{?s????*?AF??:/y??1???H??`????????v????!????>?x?N???;???[?rlll?u??????????J?LO?o)???.???a??????x]S?? l?????[??3?#?96n???????v ? ng?j{m6???W? ??? ?}w?S?=lh?hnn05|:?!????B\??+?rM?Ow?|j?&?q??cj???????=2,V|?????? ?toZ??j[??h6p?????p????S?j ???^V??eW???/?0kW???????0-?wz]  [?q?'??9?l? Xq??J??X????2?2?}???_O ?/?M??rOmR??=ycV????u? J?k???z??????1?????????a??Jn??}??_?/;?fw?]:L???????II??_????L?E1??[????,?OT45????`??Ns,?f??8^}???'??? ???o???2??_1L?]v???SNI??M???RF?? ??Kl??????+9BM??B????b?7.?^Q????????\?L???=??}??n????,?]????? ????LF ?J#Tc??2=???? ?c????? =?jidY?w`?z??t???(| u}QH.''WTT???!????{????Iu{???Q????????????????g?o%#?N?fU??LT}??;?P??c??f?4?* ?X???8n??Y????#?^???e?gF7o????AG????p??%o""#En&?????????A5???AD?Q?????:$p???/?b??e?n'?-?p?=??a?B?_?(???f?k?r???{?dE???\?~??{??????Tv?v??+?C LZ??M???z??>yr?"??0???_vj;L?????8?|???y???)??????????????o[??d?%?????xw0????|?MM???.;??? ?4??3?\?{oU3?.c?zJ]??6W?^??w= ???]?s???+?5P3??)w???s?E?g?\???/?4*??TQ??? ?W\??M??\??E??J??4;?h?1??:?{??U?????&??^y??rc?aVp??(?y??Y?z?'?Op?2?????G????'N?D?t?x????-?k?????? ???}??# Ut?,?K&???G?????????s1?jv?!?mJ??=???-?? ?@U?1duuB9qA?|&??6??U?@xY??f??????[? _k?6u?)?"?}D |h???v;???/?n?????x(??>A???? ???n}??>?i%X?nZ"???Zw?????J?2A%Ku?DFFS?>??? |.vn????n?s????=?v???????????G???&??*t????zs?omeiM:v?4??q?F? ?&&??1??6-I????C?,+?x6P????-???? C?]?q??<;???(??}?{????q?k??????^'?t:???zI&????p?g??w??P{?1ru?ZV{l???[{)?#^???.dc??S?n??5?w??'??U?n6|?I:??+W??~?????M{D???I??q??,U?6"U???|;??0%???????m??t??Ou??2???>#?p_P??\???0??U~??>{LtD???F? .{?a??E?????? ?q?f M? ??e8 ??RQ?z+0Z?w??2????j#???MC,?CK?!OOa????O?????????JT??a?g??m?5xp??vz??mr{`>e&??/???P?+?????*???-?uk?I6gk??Pr????c???[?a????'Y?(Gg?? ?q? ?f??I???<_N0??{?EG' ?????ib?uA4*??2???cW?OG?PP~?yM.Z0??E?dp?T??l?m?H&????]?????R=p<Y??b?)?&???[Tloi;?0?H]??S??^?`,tgB?9=_?^????< &;?????O^&4+??}?p?RG??????|???X?? ?y:???$?\6? ?6???8??u?????????????~^??Rw05??????9?>K?p??W[????IJ??e~?????5E??x????(??#?n?}?~?>??r??X??-??0??'hZ??????\~???d?P=????W??????i????????"?6?m? ??o ??????C?????V:?7?l???X?????x???Ph????S?Vy???y?oU?7?rk+e?'z??~?c ?v?I??.?YGkB??????,??{!,?[?W#^?P?K?????0<}??t???(???~? ??>???? Xu?K@???c]BC?t=Rd6V??L?LK8L~???k?????u?I??'y?b B?V?5?l1??s1UN=??.uv??!??????&???(r$p$>???*?K)? ??Jp3?3??V6???????s??-ff?/??}n?e?K??xB?P-g?d+( ?;E?o???Km???nY?W??P?+?>??,?os???)????(?,??????\??q?K???o8'???&'y??s????????.'?H???QG??/?(???O??~??cG??m:?}?????H%0#??R??l ?i?;Z?1?u??????mD??S?-s?1?C ?X?z?????d??1?K? J?=H{?????B??H?pv ????M5lv??b4bL?$w?U?k???????TAI??Ix??`gi$#3?????e?ZS?^drY???b??~?T??????????G??x???h?f????5???)C?Z?L??xb????J?(??8"]???g?KLp{@?A????????]Op?]@????????????? ?u?^?}?;ww??ZNR?t??N?w?V-???BD?2???{?9|X^?4??9?A^^^??)????w_?X7x}??#?:d}J6?S??ah??*????Up?~?#??v P????S-- >??q???+x??C???Jh]???)q??X? `?2??g#??-???h????f??B??T??ji?A????ge?????RH^uc??yLxVeOTXP??[?????6 y?EW??\ST ????2?Y?????Q???q?L?>????o??| ?????g??D?lgwS\??x??????7?y??];Q?Fx?,t?????J?%?ON??W?@?&???tm???1 ??::?T ????o?6??]??z??????P?0X,?t????#G"?<44?@?g$???{???3-?_5?0??KyL ??g?????e??|?z0N?]???w???h??*??? >?$?z?o???=?^S?j?????;??r?ejC6??K ?*?rin????? ??M???9???,z???6?PCho?3t??*? ???` ???Y??o?? O?u???V?z???-??C?]?Ui?O??'?@??????i]u(??S??????z?m???s0U5???>Q????{t?~??n= ?]??]???B?? ??????o8???3?k??/?)t?gF???yyE???r??woE? ????i?O?0???o?z^Su????%??M?????t??:?=??r]??MOO??vS?CaI?H????b??AE? "?????Qm-??R?n?dj? ?\?{Y? ????%h*F?5k?J?y\6j????=l??K?sE[???b?F????n???? ;p+?????8???(?"?j^_??r?l\????K?*?S???A_?uG????t???]?R?'6???????th?d?i? ?U??{?j?????Gq???ay?d????-8Fy?zS>?m0$?>???w?????'?B?w?>5?"???? ????c?cp%??5[??O??\ ???G???????F????t??4f?1????2M?n???\???X_ ?????YW??4e 1??7 ??Mo??Y5(NM?0?*???+?+kg??Mt??#?E?#C?m???(~S/?9?? p??Dpz??)?)???^gy?`+??pK?D? ???????u??/ ???????is?,+J????wDVtk???????`^??t?g #?M??^??????EW??KcV?)??????)I&n7???8K.?? iOwM?u??^?<???K?y?u????' ???#P?;??8???a???s F????F ????W?a?I??,???6g[?? aY*?6;?5wz???????6? ???????u???I??@??y????K?p?? v??:?|???9?c? ?'?}?1?0?? ?g???,??bq"{?lm???/v??:u ??QjolS????#??m-???5?&???>?N?;Q#*,?$b??n???H?5/O??1????5MN??)3f1???6????/?????????efa??&?`?]Z???$??m??0??>_????`?``??rP?4 g???B&???kn???Dx??? ??D?j???~?E?n?D;?O???zzzI(??'9???????-?rCy?C????????w?????eY'o??????I??XU?Tt????0?#?~r????????\??{#?3??H??=??a0????:?>??Y?????_.w?? ?T?=?????9GC?@?????;??"l?zl?f?? $?S??????Igu???]e?????x?????? ??Z??_[??x\? ?? ?~?jcf??hc???????'38?????Sw????oh?a??? ??q?#??q???E???M?,?[????a??m????[?()?ljQ??????????e`o?WE??z?d??qj??????R??Y?\??W,B?Xi>?{t????G ??R>c???P??.??)???a???'?4? ???m?D???9?*? ?????#K?4k?5???K?*??o??8t??u???/'?????????????W??????D????;a????n????lll%HuL??????Q ?Q???%????4???Sb???9?b.O^??N??o?????$?W{WC2?W?7(??v?4 ??R????&<7????QJ?s?]???6??m*?3?c??@s????? ???0?G?'????h;_?; MM,???????O;??A??`-??????? ????ds ^U&??????1+sUUS?????? |?.?tngUb8???#?9(y??mkjyI?????????Z?n??(.? ~?? ???e???m???>??76?R;5?J? ??CS?O???8??????i?M????r?-5A3N?U?????????p?X?'\;???d~?l*R??r(vt?D??r[R?Q??<,???#=K??a>t??g$(8!!!??:?0???%?6999??G?=?)zk at r??$ ?}x?/?????X??Ff`?? ??? 8???Cj??r?o?}?X????I?? b(??*??c?($}??R?NI4E???????BLP??X??y96???(??g?!i??N???H??H???=/??~p?????????n??f??D????9?w? ?k?60??*??On????Y0???z?;??????.'Jee????????[[????????h???????@????Hf?h`(?8??Q??*{?;?Q ?1???K?Z??6g??????lsbm<?????cV????:??4?3?3;+1L ?CWB??|??C?E??Ju>?N?????&??}z???W??j?|???3????)?n??cY??????'{?)00?4 O9Q4t??OW?}???~%69?h?????O??lH???????P????E????F?b?tOun??i#?????7??&P}}???????????}??Q??Q3??spp??]LM?#???:?{?.? ????z?$}_??k?????-?8?Ay??"??m????o?6_???tQ? ???<,????,???9?NE? ???.I???s?????.@?W???x@?????Q?#?-?5???C@?T?=?,-7Xl,#?t?????o?)9 ??????$?f???f????,/? ??c?OS?????????C????????????X?\????a?X?8?[??O?????????`U?w?x????!.K?}5?B????@iiiOO????]??v/t?x]???Rp?t"????Uo????\\GX?=M3????|-??kd???g?\?)????q???U???<h?3T=/?8w??'???mV??1_S??2? ?&?EF??????$?v?b?T^{T?h?8????&/?-?o?>?)'8 *?{?t?O???Y$?<3M-c?????F????4?>?/6?M?????????`???b????R?z2S????_d???b??$b?m??P?G??'???[?~?????P???Gn!22???] ?g???o(?g??M/bR.????????-O j?~??\]?^????C??Sv]??[?ko?X?????]???c^tw!??uR?x???TqR@5??r-????f}??Ei?E?@T?EA?$(????y?????m{"???J????F??8?`0?>?S?z?O#]?X?? ?s?P n??~???z ?4<^???8??l????????7????I?c)E}??*?S9????C}-??}?????^i??f},?Po?? ????|????\????MIAQ??K?}??\??4??Y???I??g????Cu???/?5?~?1???g???(Y??%?\?u.y,????Wg?l ?7~;2m??~? ???G?????????>? ?=??O???????]??k????????;j ????X>?vE?2:j????Vg??p???X??w#E^?Tnh???oe?????[~=9?G??T?Iu????/?P64?i???'???? ???.=C?E?,??OLN?????L???q?A? ?6H?_?XhC?????z?i?????n???????qF?@???f????c|P??????vg????Z??????g?o?X????!bdj?!03?????W??{n????00~d? ???'??3??=????~???9?99?v?('Ou???"???J???????}N??2????? q????-c=#?Y?py?!?? S{?r)X?? ???&???qO??6Q??A?????SSo?ab"??qp??FM%?????XOjk?R??l??NG-f??m}x?????? ?&/4??dq??o???I;R???4_X?7??F"??r????Mr:????|y?e[m>??'B??Q?XH&????? s???S;???DG=^?kc???x~x????*???????w???_??v=?????N???n? ????T????????G?????F???e?_o?U??'???f?v???b.???q?qX)??l?????w#??f bM,7????r??a @vc??>??O?f'[?=??F]??????!?2?uP?>?? ??????=o?F?U4W:A????a? :?eU??70?Q??TD?????#??M? 5a??JR%????m??q? ????KYZZ?u5$??R?????J?3?s?c?????=?r??(?oO??LV????"P?u?` ?4???"?/~~??W?G ??_ ???s'????p ??sw?s/UBT+?`2??????K ??D??+?R??vpO'O? taj??w???gO ? $A??0;?U???Z? ???f?*yx???D,? ?? ?/?T)???7????"?8[o US?s%U-E}}????L????????!=???????"??B,???PI????K??\ ?tM?"  ??@b_<h???E?e_]E???\ ?=?f???jb?;????????m?+~? ??o?F0????F?^,X?*H u??,?d?H???????s? ????f?????K?Z?a?n8;?d"?0?% 05?F1 :?? [?W??)??R????/?PO????A~???H??" ???,??? ?$?#?$??6?? ??!~???????? l??+????? ???????? y?o C?????aU{ 6@ ?0??o??p???<(?{?????????????-hf wGN? |?? ?"??'^,? 1t?] cG?E!?`xwo7??NE~O???? ?CW???OB??FA?+?4??i?????????B ?R? I?[K?\?L???????~??R>??w?-?-??KM??`f> 0?~???(e8?C????????z?a\?@8-).,??""p?KX^??f?Y????????W????g??,(???a=???????+?P?XCh??B?tHo?L?e<"?9??????b????7??d`????N????%M??_??g%???c??P1hH??S-???.?Uk???x?SR???? ??j? u?Y?M?Qi??????-???4?ramk??z??W??S?5}?????d1 &? @???????o;8???q?$"^ ?),m?%????c?0 z???_7E???]?????qKC???eI? [~?I???d?v?8?????F-??/??Y&[???\?Z?feb??3?_? ?+??]?Y'~?d???5??/wc?? ?'?H?s??:b??????N?g??S??(??????????M ?-uD?a ?B ??k$????????g>??????9????E?D????B???????,?????.??_ R??[?xO??w"V^???????0????Zl???0RX ???$???@(?%q???c?????q (s at XW%UV t_bY|??Bi3?h??R??? ?=?yD????s??.?s/?m?u???d? ?/^??k ????/Oei??????$?a?x??? ?H??w????"]*]????0??C?A??a@I\?C??N???i?aGr#?a??1???/$?U?#??????/?V 0?e???\|? B??VK??Y[c?9????V?Oh??-???A ???bK=??@:????r?(???R5t?&I?T!???% ?e?]$[?v y!m ??g???%?7p?????2?ow??7??t??_???'?~a???Rw????????qu:???????????'????:x???N_?/,A?+;???????????,??C?+e`s?a4p?.??????j? ??|??"??$??f???.?mn??~???5?WW_???Y???U??g?K??_k-??"A ?qw??_?g????;??N??7??W??,??;Lk^*^]??-??y???U??^Z[??R?r????N????z???*Z???o?-??? f??n?t??8!H?g [j?? ????,t???wY?-y`l???n???*??????l?D??(??1]???.\7??r????0k?j???[p[B'y??M???{bi*?W??_?^?[????????^??"7?P?V?,?R??]?V?? @?^A????? ?/??M?~R??s???%1-J ?L?_uYPK?$? le? ?,~Y?v9NZ????5?KK?5?"? ?F?k? ?F????*L??D??Z7?,???? z{???\?? xy??IB?Yc-??`???H?2?uC?I??A kF%.:?ZNX>?]?"??I????Y#?uwnI}?~??U?H?E???( ?& ?? ?? b?EF??= ?iHN0?s?????|??N?????D???2&?z?$???/r[???????b???????2?n???]N????N?R?????L??YI?i9.??\????O&???OeH:?_[??.??????u?WII??$?ZG??#_%? C??O_?].??v?{_%$?,Q-i?????f|~]Wh??c??/D? ???K??????b??N???????-; ?y?U/?;?`? ????+K??J???$???D??tK???-???$??r?" -???l?B?*?,??V?N???Hzs?'k?%??Bw ??%?& [??#?X???\?_SFB??%??a?a??av??q?e?7??(:??^W????)#???D?? ???z-"YR??Y1k?5?-#???;?4J?@??W}6K??T?fF?o???~k???X{? ???H?v?g*??kVT y??1?e??3??[?eQ??Q?????????ul???c??X?=?)????? ???V??e???%????e??p?n5x]ah)?]?Y???)????.?a?](!?b????S$?.[?@? ???????? ???[K?WxI?????1$?/x?? ?@"hqO?????~????A?u#?nV? 6?3??(??T?u? ?M2 `??\???"????????B?:+??`} ?Wpg????x?@??y?>N???{???q$??U?P????#?")R?u2q%?8?]?3s;S?$12G???v??o?n 5J?ez????????'Lks??,?}???? ??m#O?\??m4OJ??,WB??V????0]??;]c???3s?e>_>O;;?f?x?|.P?K? ?53k???H??n ?j???$??d??!gv,? 1f????u??Ev?????zR??UW'????J??G?]l??y?q??????>l????&S?~. m ???]??jZ???? ?^L?k7?5? ?5??t=KG?bJ???5K???t???????n?u"????~?????45{7x-~CZ?S??:?O>u??:?c?g?????????*???M?????????????u??:?c????X?????????u??:??_?S?????????????v?n}???Oa?Gu*z???~???a???3?Ik??4?#?bk?G?r?????h??H???N???k??2??Vy??????d?_q"?I??p?_*6 >????&??|???????b{????Y,??]x??XN?????lo?P?@[eI=???? ?(??y???{>??z???9o??q?????|? ??Y??0q?=`?{??? ???eJ?#?L}5???l=?)K@???I?????Q??~???|???a?=??e??/?d?Y?z??u~???~vH???kf?????? ??f~?"?????+??*??F??|????Do8O?&?_2??}?YB7?A5?r??8XpY?d??RJp ??7?1Z6???&?5???^???5?& ??????0???EN?[?>????=?c??KP9Og5??m?E?hcj?MEc??????/C???[?89?q? ?5????w?xpztX?-%5/??42$?t?Y???Q |??*\x(Ar?Pky?7???D8F?G@??{:E?? ?V?8???*7%W?!%??9??;O??/7P??3??????I?1?x?fJ?X}2?ev?]V??[,??][???A?????nD ,?9?~u???W?>??%_??>?p"?????????????_?????????????N^b,?;?Q??w??????????????x??)???Z???a????z??w$? ??M._??? ????_o?_??$/?^=????$???X???' >ZC@??m\2-???K?N?`?;f'?i?%W??????~?F?T1?????9????dI't??p>???d?\(??G??????.???s????w??bt??^>??Q????~u??M??????m?????x5???,'??iY+];?`?n?????|?RDh?????O)X?????;?S0f?D w??"??Zg?? ?'o??fA??N~?????S??x at 6???e?Y)??\)?????Q ?(????????????D??}a?G???YR*????j??????p??]??}]V ?iV?V??4 ??&?4? V'+5??t????????? ????g8?&???c/?????;Y,t]bq?.,?T??e` ?W??????c?2;?N?v;??d??u??ZUA]k?? ??????N??'2 ???!^P?V?7j ??Hmu?V3????a?6?vg ??}?????P?C? ?h'^??r5??H'????AMS??n0??????`F?*6wm?a??=?-??"??x?qM?sH\/???&?[o5??[Z??????@y???6Pr? ???_re2????-?S?? ?9????????u$?,ag?eT?v?M??U?????.DL?(?d x????????eg????????? ?U??fX???Ifd???&????+?@?n.???????{h??[F?w sR?Q??~@_A??{2'!Yy????.1?2???~e????O?m ????+?3U!??M6?8?JE |a?, I?????61?z,G???G?u??M{JM9????&?????-?????Mm5????q1??S??L"7?(???f????`c??p??ZJ??e?F?r?????Kn?uy?p????? \???9?&?&7??G2O??? q?a?7? ?* p;??????S2|q??^_=y??-?_O/9?D???????a?'?(?-??>c??J??B??L??G??9 4?R? ;`y4Y?????I?? ??-[???dx?0?p???(5????2??>y??????8F;??z?????u??z??y??u5 W???? g?#?vc|??>G??P??o?p????o ???b???-?w?>?? MyI???????[}?V79??@???}? a?A?7???La?a5Gso?C?G???????j"u??C?,?????]u?fr[?]8?"0?J LW?'+wy?\ ?????+? f???4? XR?en?U??P?P??M?h?????VH????"?\????5t??{?n??w???????k? u?v??f?? ] Al?ONC???b???)@???eo ?a?y?=[Q???.?{m3wr5}e??'?????%?y???mf??oWz?)?m?:???'\??R[???=;? V?J???D|?g???????#???!>,????????[?O????k???Z?o???P?4T?Qe??DT??,C?J???+???????ys????5?????:?:!?????1Y??_2_???&? X?? X?K??~X??HX??n?7??U????[??c?-?PY }bw?????????iM?)V??^k\?hPL?X??5???S?"a???c\G??????0???`u??VO??#?n ?.6??????c?????"6z=?Z}?? ?;?b?2????U?? ???%?M,o?/??Qx??>????^?mit?????ix2?????U????????L?[??w ?1?-???~????????????VQ>Z??????}?*?{-__???U????>o???U$?.?CH_???? ??uk(????x?k???H_??j??#????>e-???t3??|?cz????R??j-??w??|??Z??~???T????????????????????????!???Q?? ??UC??n???????J??Q:p???(??zv???????w???C?????o Q?}??????5?????????>~?vlO?u????y?O??????????T?f?Sz^???[O?}z=??W????????~b=???? ????(?? ??6P~?@z(}o????/ 9o????G?b??F?A??P?????'X???_??\n??[-?7??OX?????0??E???ZTO?c?{?????S7R=Y?????H??2?????????TN??H?????w#?*??H???FJ?????|??m???>_??g?????{???M??m?|?q???&???M???&*?;7?{????7Q???&j?_??_?D???|?w?_????t??E??????o?6??MH?H?7S??pG?Nm&??????7S??f?wm?????\?X??9?_???Y????f?????????-t=??6???[??&w+??Ez?P?}???~?/???J?????~e+???|?????????x+????>?t\????O??c?Q?/$?{?^???R?=|!?y?E??ET??]D?i?ET?v^???ET??????0????<?"J??X??/?x??? Q?~?"???]D???/?z??L???O??)???t|???7??/?z|?6*????????o?6*?go?rmm#y??(???(?^???????}???L??|?q??{???x^??E??F ?Kx?P?5?b?????(?>???| _??(?`3_????W?)?? D??z"Q?? ??y;P?x???s??????>??G????w?}1?????????A?O????{?+??n??g?8???????[?I??Aq???D!i?R???$??C5@h??.B??0?? =z ????4?4?? ?C6e?"????`??????v?Am0JY?/?^???Ei???@??Al-J??Y?l,D6 h[QJ??(A&s'?8?h?d* ?@?A?B $?8~? ?Z?+?KHH?0??????P?E??(???U!?? *^)?;???]cx???i?)?g?!??A? D???bh ??#?%??oR?iA?7????? ???m?_??J???A?r??IAD ???_????\????x???????(DU!?? ?Z,%?C?g)I ?i???A/?FY??*????RJ?R??#????HiP? ?D? ??O?RF ?_ 0 @b??S#??? ?q?>???B?< "???b?A????m|b1 ????(???O,Yq/>??k ]?i]?e]?g?\J7}. d?\?o?\??????????YL ?m.e?k.a??&}a?F??@2 |?v?!Da?! ?=rSi?Q*HY ?}?3Q???????5?@? b0v@?????????_??? BF?? o?V l???Drc? ?????6????0?$??V?EM?@`6 #8P,??%.??_??p1?????`? 7?#???Q?!???h????????KT??T?\@?K??w[?? ?o?5":?r???7:?|?_??p_%?l7?Ad?>?,???? ?O7????w???;?hO1 9?m\?? Q-j??+C? 8D???k?KY ??i?????????k?????_ ???????k??5Yx?????Z?-???_C? ?????0[?????Z?B ???????k?????Z?-???_ ????WU??????Y?-??? ??????k?????*W_f ?????XZ ???gY?-???_ ????????7*??fN_??????l??_ ?????????? 3?i_k??!??>?S?\??? ???J??? ??3q????f'?;K??I????M0_???5?,?OvK????X?8??1??u??2zk??9????G??=??#u??T??t?,???]W???????m?`? ??x??s?????q?/?2?&???/{??.??9?H????z??\w????86[?NQ2(? @?A???LL? ?>?Y?)?>???"???H?????*?????mB?????*7wV?2l )??| _?HY??w*??SG??8???????P??^9/0??]???L??bb??;???L?vZS??e? ????b???? ?r???R]$?>?0Y???IqiV ??N?3?i?c??u'?a??m!b? ??Ub??35:c???E??$^?????X?>:{?? _?y??^?vo??H? ??'N?????3??Xq???F9??86i?j\I:A&V[?.??%?"?^NG?? ??k=??h??jS???p(???Y??=F???Kl?$I?G??3V??j] ?WsU B?????5v?=5???????#A:?F?E?N????`UjN?P]?U?R?]3?)Um]eqj??O?X??:?p$uQ??1?V?KA?-??S???di ?y9> ?????Y?e??L?8a1??????q????????S?nPL-?n?????i??X???6??e?2???+&?W????%TX???y4??!m[~? ??<~?Vc93????[??U?????4|??<{]???nd??V?. [?????b?&??&h???h;e?+??6?ngWv???:?j*??7BN?????wT?'1?Cz??9?????.U??>?%OO??n???i??j?????.\?6U ?h???U?rR&tM?????T??U%?\ ??8??Bc/>b?????#???(0????q? '?I+ ?idt+B???Y??;?2S??zS?$?z??L??$?M??&?Mj??f?8W?YE??.?3S?N|????y?Um?????X?F M????4?+(?Z??????u?????& ????v|??G?????g?C????J?\-????M??m?i ?Y???6??U???1?L?}{??iU???`?1?Ly?[?1??W??qlL???P.???j???"?;?^7??????%H;=3?|?Z3?e'x???om??? 2?a????? ???K c?o????? 3?????0????A?SQ???6L?????ztVo??c???-@??~_???=^?@????(??????? ?%??f+ ?????????Ji???C??W????? ?Kd?>us??}?#??F???w ?)?{??QF??91+37?-??Yq-S???ed?? d???1???H>K .????{l??AQB?u&?f?%??v??x\???s",CO9s.]??QQ?k?`?FF??? 0? ??? n??N?z???? G????5??? ???pj:??F?_B7@f?j8?h^`C?u?t???2? ???j??!?? ?U?"?\????dl?A?,3???????$.8?`??+????G7??z?=q#?? ?y???A??+3?s??|z?=??????[ z????|??m ??=hyY?0'?:?<u}^???R???O?b?????$? q?-??b?e??? ?e?????E?r ??????y!??_?N?]?Tz ???=????>??#?????i?yp?HX?`)??I??E?cQ?c???r~V?>? ???]?I?3???ZA??{SH??S? k>?0??????? EZ\?:5?)`??)???????????*3??r??Y?(?{?[z??D(??????I ?PP?J????i??T???/??q??_??8Q????/g?0???;g@~?P ???5u?[???B0??i1&??? i??$l??$r???[1?K??DP#??(5O? ?r??????0*??0*??G`TL\??p????u???P? <)C?kK???_????l???(?e??W?<,#??-??rt [[/?? E?nE????+?~i`B???8 A?????? vd??F-??$?E??z??Z]?UqZ!"??"??y??m6???z??L??0??????cF8u9{???4???$o??4?A???B??????i??7? ????U??R-? ?`?? ??? FvG&A(?c??uT?????????P?i??????|?iIy? Q???tadc?5w???0?a?c?M9??C:?9%.?????*???? frYU??`d??????+??s??? ???????? ??,?? #?;8?????QD?l^jt??E???[?$M?s?z?????m?)?e*?ha?s3?4???&?????6??`?kJ??(8?qINbf?E?T?U?d\? RVA???kV?Z?E??????u?Fn3H{???V??? F)u?9?u????|a?B????l0?!???G?|?Zd:? s??z ??z?_?Oo?Z?????0A?}?:??3?^O,???'DX?g??0PW??!???P???@???I????z??b?!6?;sc|?Z=?%N???#m?{F? ?S??????"???!????????\?????w?????8F?G[????EX??N?e$3kG?V?'???d{f?M??O??o]?5???FsI???J?M?9 ??u????????<"??*??.L???1??????????????[/??L??_??????b????);?r??????=?]??*????x??"?-???p.??????B??b? ?'?.C??A?????^??c????? }"??"}???G????iHW"]?t?y???W???H??x?H????.%9??Qz/??????? )?:R ?3}?%H???????r????s?^??S?? ?G???OZN?W-?????????{?F?d??.??> ????-??;????>?,?y ??rJ????#?'????&???????"}*????H??A?e??+?~m%??*???>?ig%??s%???WR?o`??0}??0???????????????6?MH????s%??SWq????M????U?W]E?_?t?EH?Cz!?H/??????*J??|?J?{=??e???UTO>?????????x???~???'???t>???????????x???u5?????gR?~? }??"?(????????5??.??_C??a?????_C????????????#???k1n???????f?????!?K????_?D???!????(?????CT????Q???????2D?{?????(???|?u?|?wX????2??d????1?O?{?:??U??z?:?g?:j?7???n[G???u???|=????.?F???u?'?~n??/3?]???????[???????7???6???LOn???? ?O?@???z?????m?ts???7P???z??q??@??O9????^p>???????????7????H?]??????$????????6???n$y???F?O?b??_?H????7R>??F??????Tt?dX????E?(]?M?^;7Q~????M????????o|?sf???l???&J?;Y????Oo?t???_g?????tf?O???-D??B????y[H?8_?d ???P:>????8?????[(_??|?`9?????-T????H??[???[??????m%?}|?Lw???V???;D??J???[)?????????k???????l?tc+}?????????????\Hr?????]H??.??7^Hr/A??(????b?Rz&.??6s??U?K?D?? i???????9a????Q?/?F??????(_?m????Q=?~??????????U?'???????!??bz??"?[???)??^Lr????????b??1??.??~t1???o??_???o?N??l?t??N?????o?N????Oo;????S?????v;??vz?1??/1???????N????T??N??_?S????T??/?tn????????P:?{ ???%???????K?}?z ??K???P~??%?>_a??K?_u^?SQ??y??><_?????8P???k??\??x????2? x~ ?O???????c?l???j<??I??_????+????/??N?1??????+??????FQ?_??I?'??:???g???????b??C@?d?w??*??I????|?o?;??u??_4|_??? ???[??ux??Y??76?4 ?e$?????JM?J?fK??L?J???J?L?J????????2^??18?,?!d%a?sq)?? ?k at H? #(?F??? ?qJ?????|? ????)W????1 ??CZb??R?????)V??p*/q}?????B#????M????^??9??W at h ?w0??i ??R?a?6???FF9????(? ???a???v @9?5?!??b???AX? M9+?AT??F?<????Q}?3 ?7??"l??D??p????8??_??kQ#@T????U??F???p 5???d????JzWv??+;?6???9??5??D???w=:.????v?:v?7???q??oO?O{??v^????`N????????6~eF????OL??7?yny?;?c^?"Qxxr??^5???????I????>????h???\?]?7???????[&???i????????{8:?Q???g??S?/'?/?).?DN??X????????=Js"??i?(E~?L?/d+e???N"??H?7??J?u???2???t?#???"O????.%q??91???N?&?K????y-??1?T$??X????vh"?'%3??$v??N}????@???@?"??S?@YGff?????R ;e??{?-?-?????????n?????????\? ?w?%??o?yp???_???????s?-{????7??=???o??4?????z???9????m?????C{i??I?r?K??? ~ i?"# ?%????>??s??>??/??^??:_??????!? ???=???q???A1?m???_%??Oo ??????}?p???]??cl???????|????O?tF???f???K?f???O?k92?.?7???2?0??M??WY?????XVji]?"????eVne??? i4?e????]R3?????n`tD+7I???t??!u3????i????3??MP?3????6I?,7??m??A?B????&(;?B?Px0'-?{??g??????2M.t??Q?????{4???nH?????H??MK?V??????]?c???nD??????o?"?Yf?W^Ug?(?4z?M[????7?8h??koD??,2????E4K???7??h?9/??Y??????5\S?p??K7??????????,t??z???N???? ?V?+?:???z??3?_????T7???&Y?>?#? ????U???= '?????y??e]?;& ?\?????~?=?F????M???t???N???.N??7?>?oH?S&j*???.Z?O??????( 3o&?Z ?l?#f_??(A??9????/??l??f??q?Q??U?r?(cP???????9Mg=%???s???1???T??Pe?A?T??\k???M??s??U?u?6???f????????!? ?s?}?A?X?=$????3?]k?a?d????(?p?~z]?o?T?6/3??r?????9??l???l???? ??A?f3a?????n?y??????sAo??4Gc?N???? ^??????g?Y??q}?%?9?y????7Ed?l?=3 ???{?%?Qq?\??e?[?????????R?1??~ ]???TB??????E??` ^,?7??9??z??/{&%&?wk6??,4??:?v9(??R&? h??M???? ????????4?\?????d?t???? T ?(???z??j0f??3X ??A?/]8k2?j???\???@,Trhv?c?kH? 5gg'?|A]"???Z?+?M? ????e?tC ?(????m??a.??c??? ????h?$??????O???S???w[?????!u???T??6?]????nJ???m???YlS??????B????zJ???#j (fX ???qup???M?C???u ??G['d??r?cd?Ht??C$] ]?tM?6q????@?+???.???" ?s?????`???8?~?<[P?A??0?S???_?Z?m?e@????].k???Z??w?Z? ??3q????f'?;K??F?????vt?ae?{?[*??}?M??O??o]?5???Fs??????? [ZTJ?????????=?????S??3q??_???r?????g????K?-??F ??????'?_??`?????GR????_(???0?/????J??W??)???Oi??W???I2 ???o???+??"" ??????O?-?? ???????????+?? ??????+?? ?????+?? ??????+?? ???????_??W????_g??W??%>,?? ??????+?? ??ON??W????)?c)??????K??_?????????la0?.???B???';?'????aRT?r?| ? ??????7?8_??GA?????u?U????J??+l?? ???_Q??????+e1|z???G"X?bd? ?M???X???O?g???? ????C?3r?:(?#?4??@???\' ???*A?" s&.????q?????/??j??i??#N? ??uK?=R)?*????p,?? I?)??`?1?R??u??T `oX???.?m7%?Q?h?????e?Y?g6S??mU?&?-??F? ?e6??i3U?????*T?0?????z?h?.K???l?4?b???1??0???"O5???S/?zS Ce?4?h;? ??l-?_?f?????pO?X+???\ ???t?F??)??R?*????TLJOd???3????N#Gj*??+K?????l4sb?Z?=?*n?????j??lWj{???GhU?i??'?9d??m?????K?9?6`4 @????U;ieA?3Kt???)?Y??? ?A?2?B?? pPF???P ?@??]?(?Q5+g??t3rV????4?????I???j???9????2?8??1???YV=??(??????? =?u ??jg?G?0 i??g??!??|?(`??/?T??0?p$?Z???? a???7????Yvs?r-8x??5?2'\D?X9?:?&??k? o?E????Yk?????m?TG???C??s ?`jN'&??=E??4??????m???\?C ?????,$?Q???r?F?Mk ??R?l???c[?I[G??r'???O?`?$@???h&?q??\????y?u?????'??????C?^??~:[????????+l??g?6?!?>=C??D???,?4&??O?t<1?==OP?q?==?\G?Y????v??&????????%?P?_ ;M?:?NOc?7e?4 ?t+???H?????)??1?&??2?>??_?OD??sI~?\?????s)???iH???,????s)?71}???$?L?H1??8? ?{ }??O???s??????_?????_?t??????????8???K???,?I?Qk ??a?>???{z ???-??|?J?;???z??q??,?|?-????9??>???%???XB????R?>w)?]?t=??K)}?L?KI?????{??YK??_J??%K)??/??~3????Rz??2?/H]l???????Q;??e?_??"??????p%??_???~?????W??e?(=?W???5H?]E???t-? ?j?????m??WWQ??w??U?>?????????=n5????~?j*??W???jz??|}3?{?j?WV???&?oF?Z?????/??r??j????)??d?????????|?c?'?!ZZC??????z??????Au ??g???r??k?='???k?~?\C??{ ??7?????3????/??r??? ~?=???_C?_??????????????tT??^?/????ZK?X?????R?7D??:D??9D?sx??95D?~???? ??_????O??/ Q?}m?????~???C??OXG?-YG???? ??}????^G??az???w?:J???Q??"])??:??????????U??M??[|?/Y??,?a??[G????y??/ ?????&??E?K|[n*??{*?g?y???GO?q)>??2??D?0??)Cp???2?=yb?8_Ly?E?w?[?p?u?W?????(?? >?o??[?{ L6vlw????U?????`????L[??N}?Nkt?eM?????NL????=R(L??W??????r??5?????{_???Z?a??5??V??W ??n/?g'?? s?H??1?R???N?{??f???$#c?:y'f?I????1I??????X???????~??q?.????6~?F???{_s??|[?s???} ?????{?k?)?O??????|???e"???r9??xk??_?q???QQ.]d????oMv??? ,?????8|??fT'?K?v??Y?`?l?S- ??^9?J? ?'?????B_?? X^p'????aX??? j??????__U???????M?%F??7E??~]????U?*o??U??i? #?r???pBB?{X?c??;S-?5? ?????n??kCq???6(??KB??"*???k?bMZP?@?9d?q??I=?DXA5?N3?`? \2??? ???V?????e?4@???????@?~?L?4 ???? &-?>b?????G?0??|&? ?'?'?. ? B!]5(?{[f?P?YT?n? ZHk???P??9 0?? ???3?K???PY?= ?r????*k??D>???-<b?}r?@"n v?(?%M???x???w??*L?)?Z(E?s???lv?????,*??c-*?#?vQ?K\@F?? I???A ??A!!I#c `H?308????= Dd\oh?????ybHF5t??)???/??F?g???1=???(??] ?h)5?R?z??F???K??? t?9n?g/?Z8??????9y???????I "???? ??3"?#uz??0}????????:z-.n?ut??t?,?g???Z?O<"??U????.L???1n?e.??o?8???\????G??B>:???????&?? ??3qlV?9?|???????9 ??I?g?????3k>??Q??ap{??3??{???g?b????k?????N??+;??%? ???{??gp4z}?3v????1???Z?s ?I???.?:s?-=7???iM???;3??iMM{??+??[???mS??V???{????@Wh???%,/?8?????.???????o??Z?????:??y????9?????X???????=??mO????L?h??jMR????????Z?z??]?Na????????????_k????:3c?m??j???N=?:???c?k????>k?HUlI-?q*??????Z?V?e?????????j )?????ng???D?`G? t??S?P6yY??G????N?????Ju?;????~g?\xR?~??)???=??] ?????{????-{?? ????3??x?S??t????X:=????H????????Yy?1????/:??v.??/?W?i!????5#????@O2>???y9??]???h?RsU?M?9??????d??X?K?-s??????R?*]?1c?1=9?n?Z1? ?r]E???=?J???S??GY?s -?&?)???;22;?y?Z?M ?8??R?????=u??l??=m?Z????p???RK??>V?????????Tq????0}s???iUQQ???e{?8?TM??m???P???W?x"?1???muw?'?[??9~]???h?e?p??!i?w?X???????(p??y?????i??E??h}f+s???i??XN=?C?W?????A??A????~T>(?JC???????? b%???.??ip]????????J?^|C?ci ?#0??&:?!M?S6???ei?}??iEz ?j?F'?>??NzUqlSU1}Z at d?S??????3P??eJ ???dz~??????h?Ff:? F?%??$Y????BXq???t??????????yf??(???a?0???M?d ?}6[?j??[??f??k#?????k%???????????U,?hMugZ?b-???t?lv?,???_?M??Z????n??7?P??aW?4?Z????'?-i?A??fG[J????V?Q NL?c^ ,>&5[N??]fq(>Aj?)??kWS?v?,???aD????80+"?[?8 ?????2?K7'@.]??V???,|b^???H?????=???M?s? ?????, -?M??t:??[?cF$Q????????"??S (K6e????P(??(?&T?2 ???z-^?qK.L1? ??6?F0?|???2????y1?%?\;?B?zj9I???H6?????e??????j?i?V?? ??? ????1?rV??9???X??Ty?????u????Z????ju&&?Q?r[,???]???????qh?h?? ?? ?? zw=D?'2*?(?n??m"X9?~??/j?%??? ????z????\6??ba???w??~f?A.e?0u???n???K??J??P'u);mO??????\]YK?@???jj???:??wgY-E `??????[?f????bD?98;==??%/e?L)???|?l???]? ???>????I5?{?a????QkN0??O????(G?????76??$???u??"2 ~??^????nG ?????v?1C]Y\Qh? ?fM?"?u4?] [.+c*??R~?/?cR?? ??=???}?vM?jr??????p??g?M?F????????wDsn?6? ?NR# ?{??? 3??~z\?x????????1h{4?f?????I???F:=/r?????????$??2nOR?r??_Xo}?-]k?????????N`?MKZ??N??3"??d???l[m??'u.?p??aV-8?R???`T???g?%??d?1??????p?EvP????^???a???Xq1?7?1?sh??????]w????4v?y?|?!????}?57???h8k2??[??,_?a?n??L??OE}C>F????.????{??F??\??????X? IV?b?o??n? R?v??^?H?D??hA? ???j?R?B????qF^!?+????f\?T????}T??'@X?&Y???o?Y idk?? ??.????r\??q_???hl??l {? ?"_8Fa?q?w ?|G?3??????8?m??8???g??B???c????0????R w?uB?H ?32???hk[?y,wC?yf??l??'dR??????? =k?? ]???0$4???#??!??8d~# o???z_u?)$Na???OsA?zC?@??_?Or!?*?3Uf|o*.m0j?#5B??c?Ju??????b?C9? ??A?~??????oi?j?Z?X+Z-!?S'?8F???#?a?=?h6?D ????DX?A"??????P????R?????'?w ?P??I ?"PB???veS?5??)????X????gO`?wF:??#??Xs]?? Z??4???ZAv???????$?~?s9??j?????;????(??????Z?OE?^?AZ??????t??VP?b???V]???n]I?P]I?7W?L?????>o%???Jz?;WR?/G? ????3+????????????????o8?b?/H!?? ?? ??E:W??U?o?????|?\E?W?"???(???zs?*?? ???U?kV????????????{X???!? ?????/WQ?? R??"? ?k#=?u#???|n#??~??????H??5???H???Fz??f?????`??????S??m????(]?6????}??D??bz??\L???????/&?????b??op?o2?S??C?J????????Wo???N?{?v?????????????uf;??,?????TNo??f??L??????>????S??????N????P??p ?c???q ???j??_B?y????????_??ML?} ?C????D????^??E?]???????_5?b????i??'?|#?/?k???????"????xN?y+???g???!???????????? "????????v?~?N?r| ?e? <1?`??z?????)??F?N5? k`}W?? ?:!P???z%Q K^m.q?-5?? ??*??_?{^?`M?BC??5??????V????????p?#?94=Ao?^+n??m??U) ?ZJ~??`8?;???^??????????Q !?' b\?H?????oICx'??vogCTa ??p?{?8?m?CT?B??U-???-?*??C??(I#G???x ?M??????0?!?3S)?+S)?G?RFoL????J/L???RF?K??K??^?Jz\*i?-?t??J<?C????????z *??? ???BtW9 ???? ?????????????4PO?f7C?g??kd?@???%!???)?t6 K??&?RB?i?uTW0????l?j?]????Ml#n??3?? 8?!? 2?A????uU\E??hx?+?!P??C???f7?/e6?/ h|_?cx_?jt_?ap>?6Dk;?`?@j0?@?D?h|4?> 0?K?b ????! 4?f????;]"(hP?oA?UB?v@ :?% (??%?m?d,q+????.???c??: F8?? ?? *h??!??|cF`???4??H@??C`? ???????{?$?+%??? ????.x? >?f3#?????????x? ?#6s??C????QV?$y?y?Q?h???f>?9E] ?r:w1l?%?s?d?m3{=??X?m?b?CN?u???2???a??`? 7?}??6?+N??? ??????^}?2o?z??f ???O???fG9?????k???5?)?y??\???F-???z???H???t??h?3????;?????#n??d??????z??8?5/???-?#]? wg??f???X?Y9???Y???(?mi????V??? ?\?R?rr*??Q?!={}?????q???????\?(?a??O?|?Zd:??F?Ng?????? N??[?u[?/????;r??aj?t?q?l?Y?????4E?Nf?E?"??T???b?|????b?v`?bM=? c????? ?? ?s???59DN? hf?.????3???^1?~??`?/???????n?? ?|???fY?N?????k?u?z???z4???g?{>?h?z=?C?z???kj8?? ???\???2}?????K???TBy?c???V?q?Ao???V?x?"??{Av?i??qf?>X???N?=?6N?M-???hl???????l:?vF&?;#S??:#??w??G?????uXg?2??32?]?? ???|?tQ??????-???i??}.Ej(-?fM}??|??????????l???K?MX??????+???t????????????&*]?iP3Nv??%b?/??[:?k?l???_zC??mD???enp????`???lq$??ew??)???!???l? xZKJJ?>?!o???5!???? ??m??2'(?_??K?8b3 v?Y?A?rm??uj?????~???ZZ2%???Z???43o????Twh)???????????e??Ox ??{P?9?mvB??~?jYbCK ????.BMt[?Vkb?W?'?z~??a?:??0??d_l??d?????$??zM?z? VPi?a6Rk9?H??m? ir??*M?:?????,Wr??f?e???nj??3????[??d??q???2?o ?^G5??o???R)0?-?S??e??T????u?MLF?wp+???u\?????/2_{[Goo?c?@v.]u??????b?iHm?\2 rex`v-+c?&k?????=???#b9? ?F??TM~?)-?????Mx???? ?ee?*k h??b?,??S???Nx??"[??f??vw:s#o?B.,4 ????f?!'??YN MRU????M?i? ? d?h??"?????'?0?Z?H? u)&??C????>??)???&?j??? ?`2?? AuL???,?x'???? ?l?u????6??=?IS?z?????9h?f?:?fj??NF????Q?M???n ?_?@*??f>Y???KT?7? (]8???J?g???#?F??=???????????????????8???S8?z?@q?=?~ ?N?O?,??O???????S(A?O???S??)x???S6??O???S??>? ?N?r??)>?*|:iu? ?N? ?N??V??)M????T?tJYH-|:>? ?[?t*|:?(|: ?*^?tR ?N?O?8W?????TX ?O???S??? ?N?O????h?????D;"?O'Jb?????T?t?fS?|(|:??????????T?t:????????#??C?R??(W*????86?v???G?Y4?v???????SD?V???????g|?7??{?$?????<>K?m?N%??\??A?LT?;??U??t?T/"?#?V?/???"??^????':b?p~?&n;t??FV??M??A???[??F??b\??p?2eb?;???o?eMM{??+??[???mS??+???O??~+????3k?5??$??????*?2?E?b2??2????1sq???????fvC?)m??9z ?L??]??????Du?V{??m??????C??\???g???|?)gp.?ON}hj???g???Z;W*U? GkLn ?6?K8)?F????t/=??,?G?aU??5???g'z??}N??7????^I??^Id?R??V?NJ???R???I??(5)U}}o???????&-?d?%??F?ZY????L ??????.??z?4C??4??i;&&5[ 3P?=?h?+la??g????j?????B?8n# f`?)??Q??????????Lvg??c??:? tjiM??{???R??m??Z'?:?%?Z??Z?{:??N?jBl?Q?? ?I?u?d+??p????H]??(?^68@???T????? E????V?h?UM?S??E?n?wP???3?q??('\$Cd!MX??A?(?u"?|?fM?g??#?r??6?}?g?93??:?w?Q ??Mk??? ????A=?-??54?g?gd?9???????}??F&cB~6c??4???S? ???W?'Y?]Ar/YA?b??|??????????? J?q????r}?/?? ?????z???o???~???>????)??G?? ?k?J???VR??JJwu%???+??8x?:D9^??E?????????D}uEj??x?(#????????!?? ?=??L?[?w??E"?E??}????y??`z>????????????J|W??\??? ????y??x?????ex^ TW????!?*5????? n}^J???t???c-?Y?8h?.??"h??N?? ?ha???J?G?ip=?@?D?-w{???J?????????u]???,3?@]? YsMPs????????M?????????P"dXy ]-?e??0?l???$s?M?Kr?iONw?_K ;??????Z?????I?0Q?????uSWR??6??:Vsuh6v?l gX??#???9n???ia?*F8P?[W* |?? ?2?G????ki???k???????y?????c????s???n?B]???F\3?1/?8 ?Qw'f'??>?H)?f- ??f???????E^?? ??t?????????????/L?KV@/???q?????9?? ?n?Dv??Hf\$?? ? ??"?????? l?????Y?D#???TgD??R_qpvr??b???|L??/?%dk?(5?Ui??U?v?Z?6?Z???RV?p}??YYkv???????9n?a??mg?? gy?+aQ??)?@????'? >Ys????K??I{5??L)W ?????o>^?????? ?lI?v ?T 9L???????t?? ????t?k?\??q?" ??)?*v???????~?_r??v??0??K{(6??o?[?G:???? ~? ?8???f?? =`????;? ?????=? ??==?;?w? x?l?-???F?3F??zYp/;-?^v???????r????l??O?~#??\???]?#?&??vw?m??#??p??_hu????1k???8????+oe9???8?D?r$ ?=|k?1z=S^????T?Lx????6MB?ko'?0]?|Y at o???U???+ ?g ??)??V?Q ??}???????{d?g??wg?^?????_?k???=??G#?G????8? iX??8H????W~?6!??1-??f??? "??&i???5?U??b??#6#=;?\%????????2?<8%,bh????htH????:g?]b%???u?D?l???4?G#?*???5U[ ??76}aX??b??/?}???????e?????{=?[2????`pLu??p:C??8??C?|??P@M1?a?C?1?"??&6p??U=???>??1q??nh?h?D ??r??0?????????????G?_???Y??g????t??s??Ur??y??c ??x>??9??g?o???? ?wG????a???????6?????8??#??f?5,??mcZc?????H? ?_N??????.????_??=??|>????????9?}??,???)_??? ??1????D???|????|??ZN?Z?XN?t?rJ?u|}?`???S???S?8????%|?-?g?=,?C|?Q??ZN????,?z??,?O????????????D?????w?]K????????R????TNO?t????:D?Uaz5??C???Q:??(??C??l???=D?~??g???3,??C???1??????????C???g?|?:?{?:??+???#?G????Q?y+???:J?o?#9???_?#???'?'?????T/??)???????|????????)???????????S>??????|b=????Sz~o=???????????????????G??O?S6P~??????@??o=?@?:????{??W2}?J?{?~r??K(??m????@??? ??????*?3_???t/=??[?t?m?|?|?????u>???????t>????O?????=?y>???X????~?????|??????NN?k?t???;x??w???????????H??v????]Z$????????,*????=K???l$?7?{ogz??FZ?H??????M$?K??????(????>?????6q???? ????f????T?m?vR?L??i3??9?)??????)????f3???7S??m3???6S=?0??2?8?O2???~????f????????T??t????x ???-?7r ??d ???-?/????P?=????????|?!|u?P?????-?p???@?????? ????[???'?|??;??????E? k/?s?/6?W??????E??????|?o???A?w????5? M|??c>Q?/?????oQ???V??>T'?????????M??V????/ ?????????n??????'|? ?w/??U }? ??}?-|??y?[???x???? ^????? ?B?????Kx~?????e|??@??~???????;???L?????N?_???.???????? ?{??? # B 1?? ?^?????????I=? ?|???/$?$??^??$M%F}?&?\8??H??X????B???Rb?A` ??hQ??I???.?@o|7> !W??/ q?}??k?? ?? kE??z2??P?%V^3?W0 ?t?/I?/>?"?J)??????Z?H???d(?Z%????6">`??a?2b+ ?' v ?W?\?v??cH ?2"x6N?G`A?< | ?AAE ?QZ/?F?3???Pxz?}?y??q?gd?:?3s??9?????????|?|FF?/>?,)???=??=??????2?y?3?H??gd?{|?ed??g?`r?g?4z?3s?(??H?H??3??t??3Flt?g??????????Y@?w;#?i?gg^J?dg?????,#?W????s:??y??3J???.e?k ?sF?Zwsf.??93???????^??$?s,gd??T?, ???=?U??=?)??=??[?*h??7#?????3?7??????(E???????Y?Y?u???l?Tf?????(??????uAf??;3???9???RX?0?"6????????X?@,??!?????????i????????e|???? ?????? ?E??o1?Q)??i?',8g)????RdG?,`???????t?=? ??)Ef4Q?????,?| n??????i???>?@??1S??Lz?????-??za??i???)?3?r)))8\??y??+eNP.?J???q?d???~?????T?5=??D??S?????-"????Q?kQ:"]????(?)????r???E???YD???E?????d??ET?-?xEe??-Q?l(?{o.???J??r?????gO???f??@z1?????L_????r?????D???~ ?V?_`??p?]??? u0??^?g??K?P??A???!?z|?5 *%?tA??????2????mT? ????BlC??/????j?l?'?k??$?t3A5G ??|???g???DkXo4???MVv?p?%Y????R?Ve?r?s??????2?s???N??B ?JL??????????I[R?h???a?n?z????|?g?jG???w?3$(?/????m +5?p?M?[???Z??17~????????;g ]Z2%??Xqa ? ???9a??????????|?^G?T???n???]d??k??V????????N?{??/??6;!?R?c?,????C??&??Q?51?+??b=?e??_?h?b??C07????S_???u?/?????C{?Xk?G{obe~??<(?@}?"?=?F?g?2>??{_k??n?> ??wY:??k???m?xD???8`? ??x??s?????q?/???U??8???? ????Oc???????????|/???=?O?~z=??-??9????s?p?b??????bz?b?l/?p}?~9_?????g???9??^?}? ?[?????????)]?I???s)=+?%??????s)?????????{ ?7?K??`???>???s K??|??L?|=_}????(\?????,??_?????????????? ???R???2??m~????/?/%?A?\???Q??^F?_?? L???????(]?\F?>?|??KE?-#???ce??????????|?/L??'??|??????oW?{ne?c?????W???????b?c+??N??W????v??-???|?A????????/???????x???]A?????'??|?J ?t%????6????;?>;?kVR??U????U?_c????|?+?~??O??V]??????qqW?{]???w?j?_7s??j?O?????_??o^M?z?jz??&????&L??[M8???????5???????P?w?! ???p?kHnw ?y9?????w?P??[C?|w ???r?_C????????????>??nZK?????c?Zz??k)???k)?i??Z???k?}>?????k)??2=??????6????p-???C?|??k???}?????^??(?0?u???z??!J??8??C??7 ???,?78?W??^?????=? ????????3K???L?1????\???u????t\????7?# ?#?(??9?????????z;???{?~n?+????-??k~???\ZG??F?iy=?\?g????s??q??S??YO??????3????D??z???W 9(??l?|????? $??L?r>???????|???| %????r>a/?~>????O????O?_dy?f9?O??????)^?,??t??? ???\@x??_ at ro??0??^@???????_a?{/ y?w?????????O,?Lz?w???Q?x? ?B??d?q?z???C?BP Z0????(D??`????z?1 x?I?v??C??B?1 ???(X|?B|) #?8gN>?+R n?5??J??^?"?? E ?;( ?j?????4?g)??S}N?r??L???a?B?[??s?6??J?????/????O?e?@Q????D?7@*cx.?4@?PBy???}??Q?L)?BTC?J????~??28??l??_3 ?f??? ?J???R?Q?xx??????[???mz??qW?????`Uu ??%??MD????h???????Q????????????s????C?????????????????[?????~??????C#??????? ????9e?73???n????????Q?^??;#?X'???:??z??Z?]?0?.?C??w?:}?e?H?MaIb??z????x????5???ix?s`?G??L?o??96????'?????z@&f?5?\????H??!???iP v?86k,?????,??A?0??N?~H4' x?6L?!???QL?7?3?r0m?????,?U?:@?Hb??{$???????)??=(??x=e??????h?????u???k????U'k&xMq????t??@L????Q????c,b [??_?9??`k???}?eo?f?B ?x-????w????-?5?????????q????^?~17??R???nj?????? ???~?RN?????Z?V ??p?$f7???J7????u????Z_#T?F???????J?~R?????~v?}?[Pg??m?????9??????0?.????k_o??pm?????xk?cm??] ????-???=8???~]?i]??c?r???H?Y90?j? ??s#???@ ??_ ?v?3?Su?bK=?u??O?9j? :?1???"?X?'q????k??P??l?k?????{H?*?C????? B$?S?L??????????~|???M????6??????w???z ??sx????????O?.????c3?????G??'??y?O?2a??????UV??im??? ???Bk??+??fo??c?$??c??1????.CQ7Q8??%?p U8?*C/R8??&?p U8?????1T?*?A.C?G\?c(g?*+{?J???R9 ?P?c?????1T?????c??1T???1T??p ?AJ??p e?*C?? ?P?c??1T?*???c??M??1T?*??p U8????? ?P?|?c??1T?j?p U8?*C???1?? ?P?c??1?y R8?*C=?G??y??s?a?????[????na?}&?G???~?"???p? ?#?nF???[????Mk.? ;???{??y????g8???`&?yPy?o?5/????Z3? ?a????g??Q????fc? ?U{ ??m?????_??v=??L???2Z??5]+s?rM?<|?r~4%????????P*BX2??E7lm?4????!\_????? '????C?J??v??qU?,u}? R6??eW??*????7J?????X?V????Al ?}? 8???k/w????w?h???k, /??VUM? ?z90??%?X'???? j>???SUq??>????UG*???n?V ?b? ?o?w?-WN?Z3?????i??????v??l?eV????????0??o"???(?Q??????????i??h?????"??IjZ"78?[????)\??78???d?t????p????Y|H)d??I ??7?2G.?T????S?$?;?I????K?????8z???a^?tTd+ ?E?%?Y?,-?E?????b?? uq?b?????Sj??o??(C???A~?ssc?[???1??????,?? 6??????f%AVL?2???,???K?n???0??Uj*BC2?F?M?yeY??X?9Ac???? ?di-V5?F#F???'DA6?C??]?uE?6??3??+??mx? #?+7{B???h?DW??O?????2?k?q4?0!OFYu;???????2???Q2? a?TFa 9b?Av?|Y??? ?G???QX???.??? ??Nqt?I???{?4:?G??6?}?= 9 Requires: xulrunner = %{xulrunner_ver} %endif #Requires: python-libxml #Requires: PyXML #Requires: pygtk2 #Requires: pygtkglext BuildRequires: python-devel BuildRequires: desktop-file-utils %description A tool to log all your sport excursions. %prep %setup -q # make patch work for current firefox version %if 0%{fedora} <= 8 %{__sed} -i 's|MOZLIBLOC|/usr/lib/firefox-%{firefox_ver}|' %{PATCH0} %endif %if 0%{fedora} >= 9 %{__sed} -i 's|MOZLIBLOC|%{_libdir}/xulrunner-%{xulrunner_ver}|' %{PATCH0} %endif %patch0 -p1 %patch1 -p1 # fix non-exacutable scripts %{__chmod} +x extensions/wordpress/example.py %{__chmod} +x plugins/garmin-hr/gtrnctr2gpx.py # fix invalid EOL encoding %{__sed} -i 's/\r//' extensions/wordpress/example.py %build %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} desktop-file-install --vendor="fedora" --delete-original \ --dir=%{buildroot}/%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{python_sitelib}/* %changelog * Thu Jun 19 2008 Douglas E. Warner 1.5.0.0.1-3 - updating to support xulrunner or firefox - removing empty doc line - added patch to use sqlite3 * Mon Apr 21 2008 Douglas E. Warner 1.5.0.0.1-2 - update for firefox 2.0.0.14 - fix rpmlint errors * Thu Feb 14 2008 Douglas E. Warner 1.5.0.0.1-1 - update to 1.5.0.0.1 - update for firefox 2.0.0.12 * Thu Feb 14 2008 Douglas E. Warner 1.4.7.2-1 - update to 1.4.7.2 - update for firefox 2.0.0.11 * Mon Nov 16 2007 Douglas E. Warner 1.4.5-5 - update for firefox 2.0.0.10 * Mon Nov 16 2007 Douglas E. Warner 1.4.5-4 - update for firefox 2.0.0.9 * Mon Nov 05 2007 Douglas E. Warner 1.4.5-3 - update for firefox 2.0.0.8 * Fri Oct 05 2007 Douglas E. Warner 1.4.5-2 - patch for working around libgtkmozembed.so crash - mozbug#325884 * Fri Oct 05 2007 Douglas E. Warner 1.4.5-1 - update to 1.4.5 - removing patches * Tue Oct 02 2007 Douglas E. Warner 1.4.4-3 - switching to noarch package * Tue Oct 02 2007 Douglas E. Warner 1.4.4-2 - adding patches for changeset 107 and 108 * Mon Oct 01 2007 Douglas E. Warner 1.4.4-1 - update to 1.4.4 * Sun Sep 23 2007 Douglas E. Warner 1.4.2-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2008 02:13:10 -0000 1.1 +++ .cvsignore 7 Jul 2008 14:50:56 -0000 1.2 @@ -0,0 +1 @@ +pytrainer-1.5.0.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 02:13:10 -0000 1.1 +++ sources 7 Jul 2008 14:50:56 -0000 1.2 @@ -0,0 +1 @@ +9165d6a04a5293f900d1e2940ac0214d pytrainer-1.5.0.0.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 14:55:14 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 7 Jul 2008 14:55:14 GMT Subject: rpms/dxpc/devel dxpc.spec,1.17,1.18 Message-ID: <200807071455.m67EtEd5008162@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/dxpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8042 Modified Files: dxpc.spec Log Message: * Mon Jul 07 2008 Adam Jackson 3.9.1-0.3.b1.1 - Fix %fedora string comparison to be integer comparison. Index: dxpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/dxpc/devel/dxpc.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dxpc.spec 19 Feb 2008 04:22:00 -0000 1.17 +++ dxpc.spec 7 Jul 2008 14:54:16 -0000 1.18 @@ -1,7 +1,7 @@ Summary: A Differential X Protocol Compressor Name: dxpc Version: 3.9.1 -Release: 0.3.b1%{?dist} +Release: 0.3.b1%{?dist}.1 License: BSD Group: User Interface/X @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lzo-devel >= 1.08 -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel @@ -55,6 +55,9 @@ %changelog +* Mon Jul 07 2008 Adam Jackson 3.9.1-0.3.b1.1 +- Fix %%fedora string comparison to be integer comparison. + * Mon Feb 18 2008 Fedora Release Engineering - 3.9.1-0.3.b1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 15:03:16 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 7 Jul 2008 15:03:16 GMT Subject: rpms/wildmidi/devel wildmidi-0.2.2-bigendian.patch, NONE, 1.1 wildmidi.spec, 1.5, 1.6 Message-ID: <200807071503.m67F3GHN015273@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/wildmidi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15157 Modified Files: wildmidi.spec Added Files: wildmidi-0.2.2-bigendian.patch Log Message: * Mon Jul 7 2008 Hans de Goede 0.2.2-5 - Fix wildmidi cmdline player sound output on bigendian archs (bz 454198), patch by Ian Chapman wildmidi-0.2.2-bigendian.patch: --- NEW FILE wildmidi-0.2.2-bigendian.patch --- --- wildmidi-0.2.2/src/wildmidi.c.orig 2004-01-28 18:13:46.000000000 +0000 +++ wildmidi-0.2.2/src/wildmidi.c 2008-07-06 14:31:38.000000000 +0100 @@ -442,7 +442,7 @@ return -1; } - if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_S16) < 0) { + if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_S16_LE) < 0) { printf("ALSA does not support 16bit signed audio for your soundcard\n"); close_alsa_output(); return -1; Index: wildmidi.spec =================================================================== RCS file: /cvs/extras/rpms/wildmidi/devel/wildmidi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wildmidi.spec 9 Feb 2008 14:03:23 -0000 1.5 +++ wildmidi.spec 7 Jul 2008 15:02:18 -0000 1.6 @@ -1,6 +1,6 @@ Name: wildmidi Version: 0.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: WildMidi softsynth midi player Group: Applications/Multimedia License: GPLv2+ @@ -9,6 +9,7 @@ Patch0: wildmidi-0.2.2-opt.patch Patch1: wildmidi-0.2.2-cfg-abs-path.patch Patch2: wildmidi-0.2.2-pulseaudio.patch +Patch3: wildmidi-0.2.2-bigendian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel libtool Requires: %{name}-libs = %{version}-%{release} @@ -47,6 +48,7 @@ %patch0 -p1 -z .opt %patch1 -p1 -z .abs %patch2 -p1 -z .pa +%patch3 -p1 sed -i 's/\r//g' COPYING # we need to update libtool to fix compilation on systems which have lib64 autoreconf -i -f @@ -88,6 +90,10 @@ %changelog +* Mon Jul 7 2008 Hans de Goede 0.2.2-5 +- Fix wildmidi cmdline player sound output on bigendian archs (bz 454198), + patch by Ian Chapman + * Sat Feb 9 2008 Hans de Goede 0.2.2-4 - Change alsa output code to use regular write mode instead of mmap to make it work with pulseaudio (bz 431846) From fedora-extras-commits at redhat.com Mon Jul 7 15:03:34 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 7 Jul 2008 15:03:34 GMT Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.28,1.29 Message-ID: <200807071503.m67F3Yxt015325@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-font-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15213 Modified Files: xorg-x11-font-utils.spec Log Message: * Mon Jul 07 2008 Adam Jackson 7.2-5 - Fix Source url for font-util. Index: xorg-x11-font-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xorg-x11-font-utils.spec 20 Feb 2008 08:02:51 -0000 1.28 +++ xorg-x11-font-utils.spec 7 Jul 2008 15:02:48 -0000 1.29 @@ -5,7 +5,7 @@ # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 Version: 7.2 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -15,7 +15,7 @@ Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.3.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2 -Source4: ftp://ftp.x.org/pub/individual/app/font-util-1.0.1.tar.bz2 +Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.0.1.tar.bz2 Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch @@ -146,6 +146,9 @@ %changelog +* Mon Jul 07 2008 Adam Jackson 7.2-5 +- Fix Source url for font-util. + * Wed Feb 20 2008 Fedora Release Engineering - 1:7.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 15:06:12 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 7 Jul 2008 15:06:12 GMT Subject: rpms/pytrainer/devel pytrainer.spec,1.1,1.2 Message-ID: <200807071506.m67F6C7l015587@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/pytrainer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15497 Modified Files: pytrainer.spec Log Message: * Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-4 - owning datadir Index: pytrainer.spec =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pytrainer.spec 7 Jul 2008 14:41:34 -0000 1.1 +++ pytrainer.spec 7 Jul 2008 15:05:22 -0000 1.2 @@ -5,7 +5,7 @@ Name: pytrainer Version: 1.5.0.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool to log all your sport excursions Group: Development/Languages @@ -81,6 +81,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/%{name} +%dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -88,6 +89,9 @@ %changelog +* Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-4 +- owning datadir + * Thu Jun 19 2008 Douglas E. Warner 1.5.0.0.1-3 - updating to support xulrunner or firefox - removing empty doc line From fedora-extras-commits at redhat.com Mon Jul 7 15:07:35 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 7 Jul 2008 15:07:35 GMT Subject: rpms/xorg-x11-drv-vesa/devel import.log, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xorg-x11-drv-vesa.spec, 1.32, 1.33 vesa-1.3.0-range-hack.patch, 1.1, NONE vesa-1.9-mode-heuristics.patch, 1.1, NONE vesa-1.9-no-legacy-fb.patch, 1.1, NONE Message-ID: <200807071507.m67F7ZZf015735@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-vesa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15644/devel Modified Files: .cvsignore sources xorg-x11-drv-vesa.spec Added Files: import.log Removed Files: vesa-1.3.0-range-hack.patch vesa-1.9-mode-heuristics.patch vesa-1.9-no-legacy-fb.patch Log Message: sync with f9 updates --- NEW FILE import.log --- xorg-x11-drv-vesa-2_0_0-1_fc10:HEAD:xorg-x11-drv-vesa-2.0.0-1.fc10.src.rpm:1215442817 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 4 Apr 2008 18:33:46 -0000 1.12 +++ .cvsignore 7 Jul 2008 15:06:43 -0000 1.13 @@ -1 +1 @@ -xf86-video-vesa-20080404.tar.bz2 +xf86-video-vesa-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Apr 2008 18:33:46 -0000 1.12 +++ sources 7 Jul 2008 15:06:43 -0000 1.13 @@ -1 +1 @@ -a99b7c6bb10cee6adeec1a6313ca75b7 xf86-video-vesa-20080404.tar.bz2 +433cf6f961eb4a2ab6fcb086def0b2b4 xf86-video-vesa-2.0.0.tar.bz2 Index: xorg-x11-drv-vesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/devel/xorg-x11-drv-vesa.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- xorg-x11-drv-vesa.spec 4 Apr 2008 18:33:46 -0000 1.32 +++ xorg-x11-drv-vesa.spec 7 Jul 2008 15:06:43 -0000 1.33 @@ -2,26 +2,20 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate 20080404 - Summary: Xorg X11 vesa video driver Name: xorg-x11-drv-vesa -Version: 1.3.0 -Release: 14.%{gitdate}%{?dist} +Version: 2.0.0 +Release: 1%{?dist} URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{gitdate}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2 License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x -Patch1: vesa-1.9-mode-heuristics.patch -Patch2: vesa-1.3.0-range-hack.patch -Patch3: vesa-1.9-no-legacy-fb.patch - BuildRequires: xorg-x11-server-sdk >= 1.4.99.1-0.15 -BuildRequires: autoconf automake libtool +#BuildRequires: autoconf automake libtool Requires: xorg-x11-server-Xorg >= 1.4.99.1 @@ -29,14 +23,10 @@ X.Org X11 vesa video driver. %prep -%setup -q -n %{tarball}-%{gitdate} - -%patch1 -p1 -b .mode-heuristics -%patch2 -p1 -b .range-hack -%patch3 -p1 -b .legacy +%setup -q -n %{tarball}-%{version} %build -autoreconf -v --install || exit 1 +#autoreconf -v --install || exit 1 %configure --disable-static make @@ -58,6 +48,12 @@ %{_mandir}/man4/vesa.4* %changelog +* Tue Jul 01 2008 Adam Jackson 2.0.0-1 +- vesa 2.0.0 + +* Tue Apr 29 2008 Adam Jackson 1.3.0-15.20080404 +- vesa-1.9-32bpp-dammit.patch: Prefer 24+32 instead of 24+24. (#427383) + * Fri Apr 04 2008 Adam Jackson 1.3.0-14.20080404 - Today's git snapshot for FTBFS and other. (#440720) --- vesa-1.3.0-range-hack.patch DELETED --- --- vesa-1.9-mode-heuristics.patch DELETED --- --- vesa-1.9-no-legacy-fb.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 15:08:35 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 7 Jul 2008 15:08:35 GMT Subject: rpms/pytrainer/F-9 pytrainer.spec,1.1,1.2 Message-ID: <200807071508.m67F8ZE3015902@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/pytrainer/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15774 Modified Files: pytrainer.spec Log Message: * Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-4 - owning datadir Index: pytrainer.spec =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/F-9/pytrainer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pytrainer.spec 7 Jul 2008 14:47:51 -0000 1.1 +++ pytrainer.spec 7 Jul 2008 15:07:37 -0000 1.2 @@ -5,7 +5,7 @@ Name: pytrainer Version: 1.5.0.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool to log all your sport excursions Group: Development/Languages @@ -81,6 +81,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/%{name} +%dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -88,6 +89,9 @@ %changelog +* Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-4 +- owning datadir + * Thu Jun 19 2008 Douglas E. Warner 1.5.0.0.1-3 - updating to support xulrunner or firefox - removing empty doc line From fedora-extras-commits at redhat.com Mon Jul 7 15:09:00 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 7 Jul 2008 15:09:00 GMT Subject: rpms/wildmidi/F-9 wildmidi-0.2.2-bigendian.patch, NONE, 1.1 wildmidi.spec, 1.5, 1.6 Message-ID: <200807071509.m67F9096015975@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/wildmidi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862 Modified Files: wildmidi.spec Added Files: wildmidi-0.2.2-bigendian.patch Log Message: * Mon Jul 7 2008 Hans de Goede 0.2.2-5 - Fix wildmidi cmdline player sound output on bigendian archs (bz 454198), patch by Ian Chapman wildmidi-0.2.2-bigendian.patch: --- NEW FILE wildmidi-0.2.2-bigendian.patch --- --- wildmidi-0.2.2/src/wildmidi.c.orig 2004-01-28 18:13:46.000000000 +0000 +++ wildmidi-0.2.2/src/wildmidi.c 2008-07-06 14:31:38.000000000 +0100 @@ -442,7 +442,7 @@ return -1; } - if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_S16) < 0) { + if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_S16_LE) < 0) { printf("ALSA does not support 16bit signed audio for your soundcard\n"); close_alsa_output(); return -1; Index: wildmidi.spec =================================================================== RCS file: /cvs/extras/rpms/wildmidi/F-9/wildmidi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wildmidi.spec 9 Feb 2008 14:03:23 -0000 1.5 +++ wildmidi.spec 7 Jul 2008 15:08:15 -0000 1.6 @@ -1,6 +1,6 @@ Name: wildmidi Version: 0.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: WildMidi softsynth midi player Group: Applications/Multimedia License: GPLv2+ @@ -9,6 +9,7 @@ Patch0: wildmidi-0.2.2-opt.patch Patch1: wildmidi-0.2.2-cfg-abs-path.patch Patch2: wildmidi-0.2.2-pulseaudio.patch +Patch3: wildmidi-0.2.2-bigendian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel libtool Requires: %{name}-libs = %{version}-%{release} @@ -47,6 +48,7 @@ %patch0 -p1 -z .opt %patch1 -p1 -z .abs %patch2 -p1 -z .pa +%patch3 -p1 sed -i 's/\r//g' COPYING # we need to update libtool to fix compilation on systems which have lib64 autoreconf -i -f @@ -88,6 +90,10 @@ %changelog +* Mon Jul 7 2008 Hans de Goede 0.2.2-5 +- Fix wildmidi cmdline player sound output on bigendian archs (bz 454198), + patch by Ian Chapman + * Sat Feb 9 2008 Hans de Goede 0.2.2-4 - Change alsa output code to use regular write mode instead of mmap to make it work with pulseaudio (bz 431846) From fedora-extras-commits at redhat.com Mon Jul 7 15:09:47 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 7 Jul 2008 15:09:47 GMT Subject: rpms/pytrainer/F-8 pytrainer.spec,1.1,1.2 Message-ID: <200807071509.m67F9lkv016103@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/pytrainer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15993 Modified Files: pytrainer.spec Log Message: * Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-4 - owning datadir Index: pytrainer.spec =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/F-8/pytrainer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pytrainer.spec 7 Jul 2008 14:50:56 -0000 1.1 +++ pytrainer.spec 7 Jul 2008 15:09:05 -0000 1.2 @@ -5,7 +5,7 @@ Name: pytrainer Version: 1.5.0.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool to log all your sport excursions Group: Development/Languages @@ -81,6 +81,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/%{name} +%dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -88,6 +89,9 @@ %changelog +* Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-4 +- owning datadir + * Thu Jun 19 2008 Douglas E. Warner 1.5.0.0.1-3 - updating to support xulrunner or firefox - removing empty doc line From fedora-extras-commits at redhat.com Mon Jul 7 15:14:25 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 7 Jul 2008 15:14:25 GMT Subject: rpms/wildmidi/F-8 wildmidi-0.2.2-bigendian.patch, NONE, 1.1 wildmidi.spec, 1.5, 1.6 Message-ID: <200807071514.m67FEPTm016419@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/wildmidi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16383 Modified Files: wildmidi.spec Added Files: wildmidi-0.2.2-bigendian.patch Log Message: * Mon Jul 7 2008 Hans de Goede 0.2.2-5 - Fix wildmidi cmdline player sound output on bigendian archs (bz 454198), patch by Ian Chapman wildmidi-0.2.2-bigendian.patch: --- NEW FILE wildmidi-0.2.2-bigendian.patch --- --- wildmidi-0.2.2/src/wildmidi.c.orig 2004-01-28 18:13:46.000000000 +0000 +++ wildmidi-0.2.2/src/wildmidi.c 2008-07-06 14:31:38.000000000 +0100 @@ -442,7 +442,7 @@ return -1; } - if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_S16) < 0) { + if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_S16_LE) < 0) { printf("ALSA does not support 16bit signed audio for your soundcard\n"); close_alsa_output(); return -1; Index: wildmidi.spec =================================================================== RCS file: /cvs/extras/rpms/wildmidi/F-8/wildmidi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wildmidi.spec 9 Feb 2008 14:08:08 -0000 1.5 +++ wildmidi.spec 7 Jul 2008 15:13:40 -0000 1.6 @@ -1,6 +1,6 @@ Name: wildmidi Version: 0.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: WildMidi softsynth midi player Group: Applications/Multimedia License: GPLv2+ @@ -9,6 +9,7 @@ Patch0: wildmidi-0.2.2-opt.patch Patch1: wildmidi-0.2.2-cfg-abs-path.patch Patch2: wildmidi-0.2.2-pulseaudio.patch +Patch3: wildmidi-0.2.2-bigendian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel libtool Requires: %{name}-libs = %{version}-%{release} @@ -47,6 +48,7 @@ %patch0 -p1 -z .opt %patch1 -p1 -z .abs %patch2 -p1 -z .pa +%patch3 -p1 sed -i 's/\r//g' COPYING # we need to update libtool to fix compilation on systems which have lib64 autoreconf -i -f @@ -88,6 +90,10 @@ %changelog +* Mon Jul 7 2008 Hans de Goede 0.2.2-5 +- Fix wildmidi cmdline player sound output on bigendian archs (bz 454198), + patch by Ian Chapman + * Sat Feb 9 2008 Hans de Goede 0.2.2-4 - Change alsa output code to use regular write mode instead of mmap to make it work with pulseaudio (bz 431846) From fedora-extras-commits at redhat.com Mon Jul 7 15:29:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 15:29:34 +0000 Subject: [pkgdb] jpackage-utils: dbhole has requested commit Message-ID: <200807071529.m67FTYjU014004@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has requested the commit acl on jpackage-utils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Mon Jul 7 15:39:44 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Mon, 7 Jul 2008 15:39:44 GMT Subject: rpms/qpidc/F-9 qpidc.spec,1.31,1.32 Message-ID: <200807071539.m67FdiX6018205@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18068 Modified Files: qpidc.spec Log Message: import specfile Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- qpidc.spec 1 Jul 2008 18:28:13 -0000 1.31 +++ qpidc.spec 7 Jul 2008 15:38:53 -0000 1.32 @@ -8,22 +8,20 @@ Name: qpidc Version: 0.2.%{svnrev} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License URL: http://rhm.et.redhat.com/qpidc -Source0: http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 +ExclusiveArch: i386 i686 x86_64 BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: doxygen BuildRequires: e2fsprogs-devel -BuildRequires: graphviz -BuildRequires: help2man BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: ruby @@ -84,6 +82,14 @@ Libraries and header files for developing extensions to the Qpid broker daemon. +%package perftest +Summary: Simple benchmarking tools +Group: System Environment/Tools +Requires: qpidc = %version-%release + +%description perftest +Tools for performing testing and benchmarking of MRG-Messaging + %pre getent group qpidd >/dev/null || groupadd -r qpidd getent passwd qpidd >/dev/null || \ @@ -96,18 +102,35 @@ %build CXXFLAGS="%{optflags} -DNDEBUG -O3" \ -%configure --disable-static --without-cpg +%configure --disable-static --without-cpg --without-graphviz --without-help2man make %{?_smp_mflags} # Remove this generated perl file, we don't need it and it upsets rpmlint. rm docs/api/html/installdox +# Make perftest utilities +pushd src/tests +make perftest topic_listener topic_publisher latencytest +popd %install rm -rf %{buildroot} +mkdir -p -m0755 %{buildroot}/%_bindir make install DESTDIR=%{buildroot} install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd +install -d -m0755 %{buildroot}%{_libdir}/qpidd +install -d -m0755 %{buildroot}/var/run/qpidd +# Install perftest utilities +pushd %{_builddir}/%{name}-%{version}/src/tests/ +libtool --mode=install install -m755 perftest %{buildroot}/%_bindir +libtool --mode=install install -m755 topic_listener %{buildroot}/%_bindir +libtool --mode=install install -m755 topic_publisher %{buildroot}/%_bindir +libtool --mode=install install -m755 latencytest %{buildroot}/%_bindir +popd rm -f %{buildroot}%_libdir/*.a +rm -f %{buildroot}%_libdir/*.l rm -f %{buildroot}%_libdir/*.la +# remove examples, are being packages separately in the rhm-docs package +rm -fr %{buildroot}/usr/share/qpidc/examples %clean rm -rf %{buildroot} @@ -117,7 +140,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE NOTICE README +%doc LICENSE NOTICE README INSTALL RELEASE_NOTES DESIGN %_libdir/libqpidcommon.so.0 %_libdir/libqpidcommon.so.0.1.0 %_libdir/libqpidclient.so.0 @@ -136,7 +159,6 @@ %_libdir/libqpidclient.so %_bindir/managementgen %_datadir/managementgen -%doc %_datadir/%{name}/examples %doc docs/api/html %files -n %{qpidd} @@ -150,6 +172,8 @@ %config(noreplace) %_sysconfdir/sasl2/qpidd.conf %{_initrddir}/%{qpidd} %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd +%attr(755, qpidd, qpidd) %_libdir/qpidd +%attr(755, qpidd, qpidd) /var/run/qpidd %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb %doc %_mandir/man1/%{qpidd}.* @@ -161,6 +185,12 @@ %_libdir/libqpidcluster.so %_includedir/qpid/broker +%files perftest +%_bindir/perftest +%_bindir/topic_listener +%_bindir/topic_publisher +%_bindir/latencytest + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -184,9 +214,33 @@ /sbin/ldconfig %changelog -* Tue Jul 1 2008 Nuno Santos - 0.2.667603-1 +* Tue Jul 7 2008 Nuno Santos - 0.2.667603-2 - MRG GA release +* Thu Jun 13 2008 Justin Ross - 0.2.667603-1 +- Update to source revision 667603 + +* Thu Jun 12 2008 Justin Ross - 0.2.667253-1 +- Update to source revision 667253 + +* Thu Jun 12 2008 Nuno Santos - 0.2.666138-5 +- add missing doc files + +* Wed Jun 11 2008 Justin Ross - 0.2.666138-3 +- Added directories for modules and pid files to install script + +* Wed May 28 2008 David Sommerseth - 0.2.663761-1 +- Added perftest utilities + +* Thu May 22 2008 Nuno Santos - 0.2.656926-4 +- Additional build flags for i686 + +* Tue May 20 2008 Nuno Santos - 0.2.656926-3 +- BZ 432872: remove examples, which are being packaged separately + +* Tue May 20 2008 Justin Ross -0.2.656926-2 +- Drop build requirements for graphviz and help2man + * Wed May 14 2008 Nuno Santos - 0.2-34 - Bumped for Beta 4 release From fedora-extras-commits at redhat.com Mon Jul 7 15:41:28 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Mon, 7 Jul 2008 15:41:28 GMT Subject: rpms/hamlib/F-9 hamlib.spec,1.33,1.34 Message-ID: <200807071541.m67FfSt0018409@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/hamlib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18271 Modified Files: hamlib.spec Log Message: Rebuild for perl dependency and added dependency Index: hamlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/hamlib/F-9/hamlib.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- hamlib.spec 16 Feb 2008 15:43:26 -0000 1.33 +++ hamlib.spec 7 Jul 2008 15:40:34 -0000 1.34 @@ -2,7 +2,7 @@ Name: hamlib Version: 1.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Run-time library to control radio transceivers and receivers Group: System Environment/Libraries @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl-Module-Compat BuildRequires: python-devel, swig, gd-devel, libxml2-devel, tcl-devel BuildRequires: libusb-devel, pkgconfig BuildRequires: doxygen @@ -199,6 +200,9 @@ %{_libdir}/hamlibtcl* %changelog +* Mon Jul 7 2008 Steve Conklin - 1.2.7-2 +- Rebuild to satisfy Perl dependency, add dependency + * Fri Feb 15 2008 Steve Conklin - 1.2.7-1 - New upstream released From fedora-extras-commits at redhat.com Mon Jul 7 15:46:42 2008 From: fedora-extras-commits at redhat.com (Jerry James (jjames)) Date: Mon, 7 Jul 2008 15:46:42 GMT Subject: rpms/automaton/devel automaton.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807071546.m67Fkg4F018814@cvs-int.fedora.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/automaton/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18745/devel Modified Files: .cvsignore sources Added Files: automaton.spec import.log Log Message: Initial package import. --- NEW FILE automaton.spec --- # Upstream uses version-release. Control the madness here. %define upver 1.10 %define uprel 4 %define filever %{upver}-%{uprel} %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: automaton Version: %{upver}r%{uprel} Release: 2%{?dist} Summary: A Java finite state automata/regular expression library Group: Development/Libraries/Java License: BSD URL: http://www.brics.dk/automaton/ Source: http://www.brics.dk/~amoeller/%{name}/%{name}-%{filever}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, java-devel, jpackage-utils Requires: java, jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description This Java package contains a DFA/NFA (finite-state automata) implementation with Unicode alphabet (UTF-16) and support for the standard regular expression operations (concatenation, union, Kleene star) and a number of non-standard ones (intersection, complement, etc.). In contrast to many other automaton/regexp packages, this package is fast, compact, and implements real, unrestricted regular operations. It uses a symbolic representation based on intervals of Unicode characters. %package javadoc Summary: A Java finite state automata/regular expression library Group: Development/Documentation Requires: %{name} = %{version}-%{release}, jpackage-utils %description javadoc Javadoc documentation for automaton. %prep %setup -q -n %{name}-%{upver} rm -f dist/automaton.jar %build ant all %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p dist/automaton.jar $RPM_BUILD_ROOT%{_javadir}/automaton-%{version}.jar ln -s automaton-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/automaton.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir} mv doc $RPM_BUILD_ROOT%{_javadocdir}/automaton-%{version} ln -s automaton-%{version} $RPM_BUILD_ROOT%{_javadocdir}/automaton %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README %{_javadir}/automaton*.jar %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/automaton* %changelog * Mon Jun 30 2008 Jerry James - 1.10r4-2 - Conditionalize gcj invocations - Remove the prebuilt jar before building * Fri Jun 6 2008 Jerry James - 1.10r4-1 - Upgrade to 1.10-4 * Fri Apr 18 2008 Jerry James - 1.10r3-2 - Conform to the new Java packaging guidelines * Mon Jan 7 2008 Jerry James - 1.10r3-1 - Fix the version number as suggested by Jason L. Tibbitts III * Tue Nov 20 2007 Jerry James - 1.10.3-1 - Initial RPM --- NEW FILE import.log --- automaton-1_10r4-2_fc9:HEAD:automaton-1.10r4-2.src.rpm:1215445634 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/automaton/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 19:38:28 -0000 1.1 +++ .cvsignore 7 Jul 2008 15:45:49 -0000 1.2 @@ -0,0 +1 @@ +automaton-1.10-4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/automaton/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:38:28 -0000 1.1 +++ sources 7 Jul 2008 15:45:49 -0000 1.2 @@ -0,0 +1 @@ +2caabfdb853dcf79396a6d03d4d835cd automaton-1.10-4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 15:46:47 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Mon, 7 Jul 2008 15:46:47 GMT Subject: rpms/drivel/devel drivel.spec,1.15,1.16 Message-ID: <200807071546.m67Fkl7I018854@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/drivel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18749 Modified Files: drivel.spec Log Message: * Mon Jul 7 2008 Tomas Mraz - 2.1.1-0.6.20071130svn - rebuild with new gnutls Index: drivel.spec =================================================================== RCS file: /cvs/pkgs/rpms/drivel/devel/drivel.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- drivel.spec 6 Mar 2008 04:54:28 -0000 1.15 +++ drivel.spec 7 Jul 2008 15:45:46 -0000 1.16 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.1 -Release: 0.5.%{cvsdate}svn%{?dist} +Release: 0.6.%{cvsdate}svn%{?dist} License: GPLv2+ Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -129,6 +129,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Mon Jul 7 2008 Tomas Mraz - 2.1.1-0.6.20071130svn +- rebuild with new gnutls + * Wed Mar 5 2008 Alex Lancaster - 2.1.1-0.5.20071130svn - Rebuild against libsoup22 compat package From fedora-extras-commits at redhat.com Mon Jul 7 15:50:01 2008 From: fedora-extras-commits at redhat.com (Jerry James (jjames)) Date: Mon, 7 Jul 2008 15:50:01 GMT Subject: rpms/automaton/F-9 automaton.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807071550.m67Fo1Up019197@cvs-int.fedora.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/automaton/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19106 Modified Files: sources Added Files: automaton.spec Log Message: Initial import to F-9. --- NEW FILE automaton.spec --- # Upstream uses version-release. Control the madness here. %define upver 1.10 %define uprel 4 %define filever %{upver}-%{uprel} %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: automaton Version: %{upver}r%{uprel} Release: 2%{?dist} Summary: A Java finite state automata/regular expression library Group: Development/Libraries/Java License: BSD URL: http://www.brics.dk/automaton/ Source: http://www.brics.dk/~amoeller/%{name}/%{name}-%{filever}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, java-devel, jpackage-utils Requires: java, jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description This Java package contains a DFA/NFA (finite-state automata) implementation with Unicode alphabet (UTF-16) and support for the standard regular expression operations (concatenation, union, Kleene star) and a number of non-standard ones (intersection, complement, etc.). In contrast to many other automaton/regexp packages, this package is fast, compact, and implements real, unrestricted regular operations. It uses a symbolic representation based on intervals of Unicode characters. %package javadoc Summary: A Java finite state automata/regular expression library Group: Development/Documentation Requires: %{name} = %{version}-%{release}, jpackage-utils %description javadoc Javadoc documentation for automaton. %prep %setup -q -n %{name}-%{upver} rm -f dist/automaton.jar %build ant all %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p dist/automaton.jar $RPM_BUILD_ROOT%{_javadir}/automaton-%{version}.jar ln -s automaton-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/automaton.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir} mv doc $RPM_BUILD_ROOT%{_javadocdir}/automaton-%{version} ln -s automaton-%{version} $RPM_BUILD_ROOT%{_javadocdir}/automaton %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README %{_javadir}/automaton*.jar %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/automaton* %changelog * Mon Jun 30 2008 Jerry James - 1.10r4-2 - Conditionalize gcj invocations - Remove the prebuilt jar before building * Fri Jun 6 2008 Jerry James - 1.10r4-1 - Upgrade to 1.10-4 * Fri Apr 18 2008 Jerry James - 1.10r3-2 - Conform to the new Java packaging guidelines * Mon Jan 7 2008 Jerry James - 1.10r3-1 - Fix the version number as suggested by Jason L. Tibbitts III * Tue Nov 20 2007 Jerry James - 1.10.3-1 - Initial RPM Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/automaton/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:38:28 -0000 1.1 +++ sources 7 Jul 2008 15:49:17 -0000 1.2 @@ -0,0 +1 @@ +2caabfdb853dcf79396a6d03d4d835cd automaton-1.10-4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 15:52:39 2008 From: fedora-extras-commits at redhat.com (Milan Zazrivec (mzazrive)) Date: Mon, 7 Jul 2008 15:52:39 GMT Subject: rpms/dbxml-perl/F-9 dbxml-perl.spec,1.3,1.4 Message-ID: <200807071552.m67FqdXH019450@cvs-int.fedora.redhat.com> Author: mzazrive Update of /cvs/pkgs/rpms/dbxml-perl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19387 Modified Files: dbxml-perl.spec Log Message: Bugzilla 454256: dbxml-perl not built for perl 5.10.0 Index: dbxml-perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbxml-perl/F-9/dbxml-perl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dbxml-perl.spec 19 Feb 2008 15:46:21 -0000 1.3 +++ dbxml-perl.spec 7 Jul 2008 15:51:54 -0000 1.4 @@ -3,7 +3,7 @@ Release: 4%{?dist} Summary: Perl bindings for Oracle DB XML Group: Development/Languages -License: GPL+ or Artistic 2.0 +License: GPL+ or Artistic URL: http://www.oracle.com/technology/software/products/berkeley-db/xml/index.html # Source tarball from Oracle containing sources of db4, xercesc, xqilla # and dbxml library itself (including bindings) @@ -12,6 +12,7 @@ # New tarball with perl bindings only Source0: dbxml-perl-%{version}.tar.gz Patch0: dbxml-perl-db46-build.patch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: db4-devel >= 4.3.28 BuildRequires: dbxml-devel = 2.3.10 BuildRequires: xqilla10-devel >= 1.0.2 From fedora-extras-commits at redhat.com Mon Jul 7 15:54:45 2008 From: fedora-extras-commits at redhat.com (Braden McDaniel (braden)) Date: Mon, 7 Jul 2008 15:54:45 GMT Subject: rpms/openvrml/F-8 openvrml.spec,1.43,1.44 Message-ID: <200807071554.m67Fsjd3019570@cvs-int.fedora.redhat.com> Author: braden Update of /cvs/pkgs/rpms/openvrml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19518 Modified Files: openvrml.spec Log Message: gcc visibility flags are still a problem for firefox headers on F8. Index: openvrml.spec =================================================================== RCS file: /cvs/pkgs/rpms/openvrml/F-8/openvrml.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- openvrml.spec 7 Jul 2008 00:00:09 -0000 1.43 +++ openvrml.spec 7 Jul 2008 15:53:59 -0000 1.44 @@ -1,7 +1,7 @@ # -*- rpm-spec -*- Name: openvrml Version: 0.17.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: VRML/X3D runtime library License: LGPLv3+ Group: System Environment/Libraries @@ -98,7 +98,6 @@ %patch -p0 %build -CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden" %configure --disable-static --disable-exception-specs --enable-gecko-rpath --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" BOOST_LIB_SUFFIX="-mt" %{__make} %{?_smp_mflags} @@ -173,6 +172,9 @@ %changelog +* Wed Jul 07 2008 Braden McDaniel - 0.17.6-5 +- gcc visibility flags are still a problem for firefox headers on F8. + * Wed Jul 06 2008 Braden McDaniel - 0.17.6-4 - Rebuild after updating gecko-libs requirement. From fedora-extras-commits at redhat.com Mon Jul 7 15:54:55 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Mon, 7 Jul 2008 15:54:55 GMT Subject: rpms/netstiff/devel netstiff.spec,NONE,1.1 Message-ID: <200807071554.m67FstuT019576@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/netstiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19561 Added Files: netstiff.spec Log Message: Work! --- NEW FILE netstiff.spec --- %define verstring 20080331 Name: netstiff Version: 0 Release: 0.1.%{verstring}%{?dist} Summary: A powerful Web and FTP site update checker Group: Applications/Internet License: GPLv3+ URL: http://pkqs.net/~sbeyer/#netstiff Source: http://pkqs.net/~sbeyer/tools/%{name}/%{name}_%{verstring}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description netstiff (formerly known as webdiff) is a powerful Web and FTP site update checker. It supports a variety of different methods (diff, html, size, date, MD5 sum, regexp) to check for updates. There are also sophisticated settings to make it useful for partly dynamic Web pages. Without any given arguments, netstiff will either run its interactive configuration tool or check your sites for updates and print the changes in a diff(1)-like manner. %prep %setup -q -n %{name}_%{verstring} %build %install %{__rm} -rf %{buildroot} %{__install} -d 0755 %{buildroot}%{_bindir} %{__install} -d 0755 %{buildroot}%{_mandir}/man1 %{__install} -m 0755 %{name} %{buildroot}%{_bindir}/ %{__install} -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/ %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog LICENSE THANKSTO %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.gz %changelog * Wed Jul 2 2008 Ray Van Dolson - 0-0.1.20080331 - Initial package From fedora-extras-commits at redhat.com Mon Jul 7 15:56:44 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Mon, 7 Jul 2008 15:56:44 GMT Subject: rpms/netstiff/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807071556.m67Fui2o019735@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/netstiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19662 Modified Files: .cvsignore sources Log Message: Added sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/netstiff/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 20:37:56 -0000 1.1 +++ .cvsignore 7 Jul 2008 15:55:53 -0000 1.2 @@ -0,0 +1 @@ +netstiff_20080331.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/netstiff/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:37:56 -0000 1.1 +++ sources 7 Jul 2008 15:55:53 -0000 1.2 @@ -0,0 +1 @@ +afb24c1c966228664368f770dc42c021 netstiff_20080331.orig.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 15:58:31 2008 From: fedora-extras-commits at redhat.com (Milan Zazrivec (mzazrive)) Date: Mon, 7 Jul 2008 15:58:31 GMT Subject: rpms/dbxml-perl/F-9 dbxml-perl.spec,1.4,1.5 Message-ID: <200807071558.m67FwVEk019898@cvs-int.fedora.redhat.com> Author: mzazrive Update of /cvs/pkgs/rpms/dbxml-perl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19828 Modified Files: dbxml-perl.spec Log Message: Let's not forget about versioning (related bz: #454256) Index: dbxml-perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbxml-perl/F-9/dbxml-perl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbxml-perl.spec 7 Jul 2008 15:51:54 -0000 1.4 +++ dbxml-perl.spec 7 Jul 2008 15:57:43 -0000 1.5 @@ -1,6 +1,6 @@ Name: dbxml-perl Version: 2.003 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl bindings for Oracle DB XML Group: Development/Languages License: GPL+ or Artistic @@ -78,6 +78,9 @@ %{_defaultdocdir}/dbxml-perl-%{version} %changelog +* Mon Jul 7 2008 Milan Zazrivec - 2.003-5 +- Rebuild for perl 5.10.0 (Bugzilla #454256) + * Tue Feb 19 2008 Fedora Release Engineering - 2.003-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 15:58:42 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Mon, 7 Jul 2008 15:58:42 GMT Subject: rpms/qpidc/F-8 qpidc.spec,1.14,1.15 Message-ID: <200807071558.m67FwgN5019917@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19847 Modified Files: qpidc.spec Log Message: import specfile Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/F-8/qpidc.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- qpidc.spec 1 Jul 2008 18:47:12 -0000 1.14 +++ qpidc.spec 7 Jul 2008 15:57:58 -0000 1.15 @@ -8,22 +8,20 @@ Name: qpidc Version: 0.2.%{svnrev} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License URL: http://rhm.et.redhat.com/qpidc -Source0: http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 +ExclusiveArch: i386 i686 x86_64 BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: doxygen BuildRequires: e2fsprogs-devel -BuildRequires: graphviz -BuildRequires: help2man BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: ruby @@ -84,6 +82,14 @@ Libraries and header files for developing extensions to the Qpid broker daemon. +%package perftest +Summary: Simple benchmarking tools +Group: System Environment/Tools +Requires: qpidc = %version-%release + +%description perftest +Tools for performing testing and benchmarking of MRG-Messaging + %pre getent group qpidd >/dev/null || groupadd -r qpidd getent passwd qpidd >/dev/null || \ @@ -96,18 +102,35 @@ %build CXXFLAGS="%{optflags} -DNDEBUG -O3" \ -%configure --disable-static --without-cpg +%configure --disable-static --without-cpg --without-graphviz --without-help2man make %{?_smp_mflags} # Remove this generated perl file, we don't need it and it upsets rpmlint. rm docs/api/html/installdox +# Make perftest utilities +pushd src/tests +make perftest topic_listener topic_publisher latencytest +popd %install rm -rf %{buildroot} +mkdir -p -m0755 %{buildroot}/%_bindir make install DESTDIR=%{buildroot} install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd +install -d -m0755 %{buildroot}%{_libdir}/qpidd +install -d -m0755 %{buildroot}/var/run/qpidd +# Install perftest utilities +pushd %{_builddir}/%{name}-%{version}/src/tests/ +libtool --mode=install install -m755 perftest %{buildroot}/%_bindir +libtool --mode=install install -m755 topic_listener %{buildroot}/%_bindir +libtool --mode=install install -m755 topic_publisher %{buildroot}/%_bindir +libtool --mode=install install -m755 latencytest %{buildroot}/%_bindir +popd rm -f %{buildroot}%_libdir/*.a +rm -f %{buildroot}%_libdir/*.l rm -f %{buildroot}%_libdir/*.la +# remove examples, are being packages separately in the rhm-docs package +rm -fr %{buildroot}/usr/share/qpidc/examples %clean rm -rf %{buildroot} @@ -117,7 +140,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE NOTICE README +%doc LICENSE NOTICE README INSTALL RELEASE_NOTES DESIGN %_libdir/libqpidcommon.so.0 %_libdir/libqpidcommon.so.0.1.0 %_libdir/libqpidclient.so.0 @@ -136,7 +159,6 @@ %_libdir/libqpidclient.so %_bindir/managementgen %_datadir/managementgen -%doc %_datadir/%{name}/examples %doc docs/api/html %files -n %{qpidd} @@ -150,6 +172,8 @@ %config(noreplace) %_sysconfdir/sasl2/qpidd.conf %{_initrddir}/%{qpidd} %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd +%attr(755, qpidd, qpidd) %_libdir/qpidd +%attr(755, qpidd, qpidd) /var/run/qpidd %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb %doc %_mandir/man1/%{qpidd}.* @@ -161,6 +185,12 @@ %_libdir/libqpidcluster.so %_includedir/qpid/broker +%files perftest +%_bindir/perftest +%_bindir/topic_listener +%_bindir/topic_publisher +%_bindir/latencytest + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -184,9 +214,33 @@ /sbin/ldconfig %changelog -* Tue Jul 1 2008 Nuno Santos - 0.2.667603-1 +* Tue Jul 7 2008 Nuno Santos - 0.2.667603-2 - MRG GA release +* Thu Jun 13 2008 Justin Ross - 0.2.667603-1 +- Update to source revision 667603 + +* Thu Jun 12 2008 Justin Ross - 0.2.667253-1 +- Update to source revision 667253 + +* Thu Jun 12 2008 Nuno Santos - 0.2.666138-5 +- add missing doc files + +* Wed Jun 11 2008 Justin Ross - 0.2.666138-3 +- Added directories for modules and pid files to install script + +* Wed May 28 2008 David Sommerseth - 0.2.663761-1 +- Added perftest utilities + +* Thu May 22 2008 Nuno Santos - 0.2.656926-4 +- Additional build flags for i686 + +* Tue May 20 2008 Nuno Santos - 0.2.656926-3 +- BZ 432872: remove examples, which are being packaged separately + +* Tue May 20 2008 Justin Ross -0.2.656926-2 +- Drop build requirements for graphviz and help2man + * Wed May 14 2008 Nuno Santos - 0.2-34 - Bumped for Beta 4 release From fedora-extras-commits at redhat.com Mon Jul 7 16:01:31 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Mon, 7 Jul 2008 16:01:31 GMT Subject: rpms/netstiff/F-9 netstiff.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807071601.m67G1VBD026753@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/netstiff/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20167 Modified Files: sources Added Files: netstiff.spec Log Message: Initial import. --- NEW FILE netstiff.spec --- %define verstring 20080331 Name: netstiff Version: 0 Release: 0.1.%{verstring}%{?dist} Summary: A powerful Web and FTP site update checker Group: Applications/Internet License: GPLv3+ URL: http://pkqs.net/~sbeyer/#netstiff Source: http://pkqs.net/~sbeyer/tools/%{name}/%{name}_%{verstring}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description netstiff (formerly known as webdiff) is a powerful Web and FTP site update checker. It supports a variety of different methods (diff, html, size, date, MD5 sum, regexp) to check for updates. There are also sophisticated settings to make it useful for partly dynamic Web pages. Without any given arguments, netstiff will either run its interactive configuration tool or check your sites for updates and print the changes in a diff(1)-like manner. %prep %setup -q -n %{name}_%{verstring} %build %install %{__rm} -rf %{buildroot} %{__install} -d 0755 %{buildroot}%{_bindir} %{__install} -d 0755 %{buildroot}%{_mandir}/man1 %{__install} -m 0755 %{name} %{buildroot}%{_bindir}/ %{__install} -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/ %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog LICENSE THANKSTO %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.gz %changelog * Wed Jul 2 2008 Ray Van Dolson - 0-0.1.20080331 - Initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/netstiff/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:37:56 -0000 1.1 +++ sources 7 Jul 2008 16:00:43 -0000 1.2 @@ -0,0 +1 @@ +afb24c1c966228664368f770dc42c021 netstiff_20080331.orig.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 16:06:03 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Mon, 7 Jul 2008 16:06:03 GMT Subject: rpms/netstiff/EL-5 netstiff.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807071606.m67G63k8027268@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/netstiff/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27156 Modified Files: sources Added Files: netstiff.spec Log Message: Sources --- NEW FILE netstiff.spec --- %define verstring 20080331 Name: netstiff Version: 0 Release: 0.1.%{verstring}%{?dist} Summary: A powerful Web and FTP site update checker Group: Applications/Internet License: GPLv3+ URL: http://pkqs.net/~sbeyer/#netstiff Source: http://pkqs.net/~sbeyer/tools/%{name}/%{name}_%{verstring}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description netstiff (formerly known as webdiff) is a powerful Web and FTP site update checker. It supports a variety of different methods (diff, html, size, date, MD5 sum, regexp) to check for updates. There are also sophisticated settings to make it useful for partly dynamic Web pages. Without any given arguments, netstiff will either run its interactive configuration tool or check your sites for updates and print the changes in a diff(1)-like manner. %prep %setup -q -n %{name}_%{verstring} %build %install %{__rm} -rf %{buildroot} %{__install} -d 0755 %{buildroot}%{_bindir} %{__install} -d 0755 %{buildroot}%{_mandir}/man1 %{__install} -m 0755 %{name} %{buildroot}%{_bindir}/ %{__install} -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/ %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog LICENSE THANKSTO %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.gz %changelog * Wed Jul 2 2008 Ray Van Dolson - 0-0.1.20080331 - Initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/netstiff/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:37:56 -0000 1.1 +++ sources 7 Jul 2008 16:05:15 -0000 1.2 @@ -0,0 +1 @@ +afb24c1c966228664368f770dc42c021 netstiff_20080331.orig.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 16:06:35 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Mon, 7 Jul 2008 16:06:35 GMT Subject: rpms/xdrawchem/devel xdrawchem.spec,1.11,1.12 Message-ID: <200807071606.m67G6ZaG027398@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/xdrawchem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27218 Modified Files: xdrawchem.spec Log Message: - rebuild for new openbabel Index: xdrawchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/xdrawchem/devel/xdrawchem.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xdrawchem.spec 1 Jun 2008 13:29:36 -0000 1.11 +++ xdrawchem.spec 7 Jul 2008 16:05:31 -0000 1.12 @@ -1,6 +1,6 @@ Name: xdrawchem Version: 1.9.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: 2D chemical structures drawing tool Source: http://dl.sourceforge.net/sourceforge/xdrawchem/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_datadir}/pixmaps/xdrawchem.png %changelog +* Mon Jul 07 2008 Dominik Mierzejewski 1.9.9-11 +- rebuild for new openbabel + * Sun Jun 01 2008 Dominik Mierzejewski 1.9.9-10 - fix segfault (#447531), patch by Mamoru Tasaka - don't use %%makeinstall From fedora-extras-commits at redhat.com Mon Jul 7 16:07:21 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Mon, 7 Jul 2008 16:07:21 GMT Subject: rpms/sugar-datastore/OLPC-3 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sugar-datastore.spec, 1.8, 1.9 Message-ID: <200807071607.m67G7LWl027565@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-datastore/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27356 Modified Files: .cvsignore sources sugar-datastore.spec Log Message: * Mon Jul 07 2008 Tomeu Vizoso - 0.8.2-3.20080707git4c75dcdebd - New git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Jul 2008 16:47:02 -0000 1.7 +++ .cvsignore 7 Jul 2008 16:06:27 -0000 1.8 @@ -1 +1 @@ -sugar-datastore-0.8.2-git588f82ed0d.tar.bz2 +sugar-datastore-0.8.2-git4c75dcdebd.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Jul 2008 16:47:02 -0000 1.7 +++ sources 7 Jul 2008 16:06:27 -0000 1.8 @@ -1 +1 @@ -ed410c13a5eb9142be1c63651f8f6c7f sugar-datastore-0.8.2-git588f82ed0d.tar.bz2 +5b11b2f0e858799241d4dff5b7cf90af sugar-datastore-0.8.2-git4c75dcdebd.tar.bz2 Index: sugar-datastore.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-3/sugar-datastore.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sugar-datastore.spec 3 Jul 2008 16:47:02 -0000 1.8 +++ sugar-datastore.spec 7 Jul 2008 16:06:27 -0000 1.9 @@ -1,10 +1,10 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -%define commitid 588f82ed0d -%define alphatag 20080703git%{commitid} +%define commitid 4c75dcdebd +%define alphatag 20080707git%{commitid} Name: sugar-datastore Version: 0.8.2 -Release: 2.%{alphatag}%{?dist} +Release: 3.%{alphatag}%{?dist} Summary: Sugar Datastore Group: Development/Libraries @@ -54,6 +54,9 @@ %{_datadir}/dbus-1/services/*.service %changelog +* Mon Jul 07 2008 Tomeu Vizoso - 0.8.2-3.20080707git4c75dcdebd +- New git snapshot + * Thu Jul 03 2008 Tomeu Vizoso - 0.8.2-2.20080703git588f82ed0d - New git snapshot From fedora-extras-commits at redhat.com Mon Jul 7 16:07:20 2008 From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd)) Date: Mon, 7 Jul 2008 16:07:20 GMT Subject: rpms/netstiff/F-8 netstiff.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807071607.m67G7KKZ027560@cvs-int.fedora.redhat.com> Author: rayvd Update of /cvs/pkgs/rpms/netstiff/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27357 Modified Files: sources Added Files: netstiff.spec Log Message: Sources --- NEW FILE netstiff.spec --- %define verstring 20080331 Name: netstiff Version: 0 Release: 0.1.%{verstring}%{?dist} Summary: A powerful Web and FTP site update checker Group: Applications/Internet License: GPLv3+ URL: http://pkqs.net/~sbeyer/#netstiff Source: http://pkqs.net/~sbeyer/tools/%{name}/%{name}_%{verstring}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description netstiff (formerly known as webdiff) is a powerful Web and FTP site update checker. It supports a variety of different methods (diff, html, size, date, MD5 sum, regexp) to check for updates. There are also sophisticated settings to make it useful for partly dynamic Web pages. Without any given arguments, netstiff will either run its interactive configuration tool or check your sites for updates and print the changes in a diff(1)-like manner. %prep %setup -q -n %{name}_%{verstring} %build %install %{__rm} -rf %{buildroot} %{__install} -d 0755 %{buildroot}%{_bindir} %{__install} -d 0755 %{buildroot}%{_mandir}/man1 %{__install} -m 0755 %{name} %{buildroot}%{_bindir}/ %{__install} -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/ %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog LICENSE THANKSTO %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.gz %changelog * Wed Jul 2 2008 Ray Van Dolson - 0-0.1.20080331 - Initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/netstiff/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 20:37:56 -0000 1.1 +++ sources 7 Jul 2008 16:06:27 -0000 1.2 @@ -0,0 +1 @@ +afb24c1c966228664368f770dc42c021 netstiff_20080331.orig.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 16:09:13 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Mon, 7 Jul 2008 16:09:13 GMT Subject: rpms/xdrawchem/F-9 xdrawchem.spec,1.11,1.12 Message-ID: <200807071609.m67G9DnZ027789@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/xdrawchem/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27721 Modified Files: xdrawchem.spec Log Message: - rebuild for new openbabel Index: xdrawchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/xdrawchem/F-9/xdrawchem.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xdrawchem.spec 1 Jun 2008 14:00:13 -0000 1.11 +++ xdrawchem.spec 7 Jul 2008 16:08:24 -0000 1.12 @@ -1,6 +1,6 @@ Name: xdrawchem Version: 1.9.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: 2D chemical structures drawing tool Source: http://dl.sourceforge.net/sourceforge/xdrawchem/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_datadir}/pixmaps/xdrawchem.png %changelog +* Mon Jul 07 2008 Dominik Mierzejewski 1.9.9-11 +- rebuild for new openbabel + * Sun Jun 01 2008 Dominik Mierzejewski 1.9.9-10 - fix segfault (#447531), patch by Mamoru Tasaka - don't use %%makeinstall From fedora-extras-commits at redhat.com Mon Jul 7 16:11:23 2008 From: fedora-extras-commits at redhat.com (Nuno Santos (nsantos)) Date: Mon, 7 Jul 2008 16:11:23 GMT Subject: rpms/qpidc/devel qpidc.spec,1.32,1.33 Message-ID: <200807071611.m67GBNLM027897@cvs-int.fedora.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27839 Modified Files: qpidc.spec Log Message: import specfile Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- qpidc.spec 18 Jun 2008 17:43:47 -0000 1.32 +++ qpidc.spec 7 Jul 2008 16:10:37 -0000 1.33 @@ -8,13 +8,12 @@ Name: qpidc Version: 0.2.%{svnrev} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License URL: http://rhm.et.redhat.com/qpidc Source0: %{name}-%{version}.tar.gz -Patch0: examples.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 i686 x86_64 @@ -100,7 +99,6 @@ %prep %setup -q -%patch0 -p1 %build CXXFLAGS="%{optflags} -DNDEBUG -O3" \ @@ -108,8 +106,6 @@ make %{?_smp_mflags} # Remove this generated perl file, we don't need it and it upsets rpmlint. rm docs/api/html/installdox -# remove examples, are being packages separately in the rhm-docs package -rm -fr examples # Make perftest utilities pushd src/tests make perftest topic_listener topic_publisher latencytest @@ -131,7 +127,10 @@ libtool --mode=install install -m755 latencytest %{buildroot}/%_bindir popd rm -f %{buildroot}%_libdir/*.a +rm -f %{buildroot}%_libdir/*.l rm -f %{buildroot}%_libdir/*.la +# remove examples, are being packages separately in the rhm-docs package +rm -fr %{buildroot}/usr/share/qpidc/examples %clean rm -rf %{buildroot} @@ -215,6 +214,9 @@ /sbin/ldconfig %changelog +* Tue Jul 7 2008 Nuno Santos - 0.2.667603-2 +- MRG GA release + * Thu Jun 13 2008 Justin Ross - 0.2.667603-1 - Update to source revision 667603 From fedora-extras-commits at redhat.com Mon Jul 7 16:16:12 2008 From: fedora-extras-commits at redhat.com (Milan Zazrivec (mzazrive)) Date: Mon, 7 Jul 2008 16:16:12 GMT Subject: rpms/dbxml-perl/devel dbxml-perl.spec,1.3,1.4 Message-ID: <200807071616.m67GGCEA028344@cvs-int.fedora.redhat.com> Author: mzazrive Update of /cvs/pkgs/rpms/dbxml-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28216 Modified Files: dbxml-perl.spec Log Message: Bugzilla 454256: dbxml-perl not built for perl 5.10.0 Index: dbxml-perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbxml-perl/devel/dbxml-perl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dbxml-perl.spec 19 Feb 2008 15:46:21 -0000 1.3 +++ dbxml-perl.spec 7 Jul 2008 16:15:21 -0000 1.4 @@ -1,9 +1,9 @@ Name: dbxml-perl Version: 2.003 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl bindings for Oracle DB XML Group: Development/Languages -License: GPL+ or Artistic 2.0 +License: GPL+ or Artistic URL: http://www.oracle.com/technology/software/products/berkeley-db/xml/index.html # Source tarball from Oracle containing sources of db4, xercesc, xqilla # and dbxml library itself (including bindings) @@ -12,6 +12,7 @@ # New tarball with perl bindings only Source0: dbxml-perl-%{version}.tar.gz Patch0: dbxml-perl-db46-build.patch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: db4-devel >= 4.3.28 BuildRequires: dbxml-devel = 2.3.10 BuildRequires: xqilla10-devel >= 1.0.2 @@ -77,6 +78,9 @@ %{_defaultdocdir}/dbxml-perl-%{version} %changelog +* Mon Jul 7 2008 Milan Zazrivec - 2.003-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 16:18:01 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Mon, 7 Jul 2008 16:18:01 GMT Subject: rpms/ppc64-utils/devel ppc64-utils.spec,1.33,1.34 Message-ID: <200807071618.m67GI14P028592@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/ppc64-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28483 Modified Files: ppc64-utils.spec Log Message: Requires yaboot only for ppc arch Index: ppc64-utils.spec =================================================================== RCS file: /cvs/extras/rpms/ppc64-utils/devel/ppc64-utils.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ppc64-utils.spec 19 Feb 2008 00:59:35 -0000 1.33 +++ ppc64-utils.spec 7 Jul 2008 16:17:10 -0000 1.34 @@ -2,7 +2,7 @@ Summary: Linux/PPC64 specific utilities Name: ppc64-utils Version: 0.14 -Release: 2%{?dist} +Release: 3%{?dist} # La la la. There is nothing here any more. License: GPLv2 @@ -11,7 +11,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ppc ppc64 -Requires: binutils yaboot +%ifarch ppc +Requires: yaboot +%endif +Requires: binutils Requires: powerpc-utils powerpc-utils-papr ps3pf-utils kernel-bootwrapper %description @@ -31,6 +34,9 @@ %files %changelog +* Mon Jul 7 2008 Roman Rakus - 0.14-3 +- Requires yaboot only for ppc arch + * Mon Feb 18 2008 Fedora Release Engineering - 0.14-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 16:18:19 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 7 Jul 2008 16:18:19 GMT Subject: rpms/tomboy/devel tomboy.spec,1.82,1.83 Message-ID: <200807071618.m67GIJJ7028620@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/tomboy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28503 Modified Files: tomboy.spec Log Message: make: `clog' is up to date. Index: tomboy.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- tomboy.spec 4 Jun 2008 18:47:13 -0000 1.82 +++ tomboy.spec 7 Jul 2008 16:17:27 -0000 1.83 @@ -1,6 +1,6 @@ Name: tomboy Version: 0.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tomboy is a desktop note-taking application for Linux and Unix Group: User Interface/Desktops @@ -119,6 +119,9 @@ %changelog +* Sun Jul 6 2008 Michel Alexandre Salim - 0.11.0-4 +- rebuild for mono dependencies + * Wed Jun 04 2008 Tom "spot" Callaway - 0.11.0-3 - Add error messages instead of empty lines. Resolves "warning CS0642: Possible mistaken empty statement" errors. From fedora-extras-commits at redhat.com Mon Jul 7 16:24:42 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Mon, 7 Jul 2008 16:24:42 GMT Subject: rpms/ppc64-utils/F-9 ppc64-utils.spec,1.33,1.34 Message-ID: <200807071624.m67GOgs1029258@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/ppc64-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29183 Modified Files: ppc64-utils.spec Log Message: Requires yaboot only for ppc arch Index: ppc64-utils.spec =================================================================== RCS file: /cvs/extras/rpms/ppc64-utils/F-9/ppc64-utils.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ppc64-utils.spec 19 Feb 2008 00:59:35 -0000 1.33 +++ ppc64-utils.spec 7 Jul 2008 16:23:48 -0000 1.34 @@ -2,7 +2,7 @@ Summary: Linux/PPC64 specific utilities Name: ppc64-utils Version: 0.14 -Release: 2%{?dist} +Release: 3%{?dist} # La la la. There is nothing here any more. License: GPLv2 @@ -11,7 +11,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ppc ppc64 -Requires: binutils yaboot +%ifarch ppc +Requires: yaboot +%endif +Requires: binutils Requires: powerpc-utils powerpc-utils-papr ps3pf-utils kernel-bootwrapper %description @@ -31,6 +34,9 @@ %files %changelog +* Mon Jul 7 2008 Roman Rakus - 0.14-3 +- Requires yaboot only for ppc arch + * Mon Feb 18 2008 Fedora Release Engineering - 0.14-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 16:39:46 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Mon, 7 Jul 2008 16:39:46 GMT Subject: rpms/hamlib/F-9 .cvsignore, 1.6, 1.7 Makefile, 1.1, 1.2 branch, 1.1, 1.2 hamlib-1.2.4-bindings.patch, 1.1, 1.2 hamlib-1.2.6.2-bindings.patch, 1.1, 1.2 hamlib-bindings.patch, 1.3, 1.4 hamlib.spec, 1.34, 1.35 sources, 1.6, 1.7 Message-ID: <200807071639.m67GdkS7030264@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/hamlib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30203 Modified Files: .cvsignore Makefile branch hamlib-1.2.4-bindings.patch hamlib-1.2.6.2-bindings.patch hamlib-bindings.patch hamlib.spec sources Log Message: changed requires hamlib-1.2.4-bindings.patch: hamlib-1.2.6.2-bindings.patch: hamlib-bindings.patch: Index: hamlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/hamlib/F-9/hamlib.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- hamlib.spec 7 Jul 2008 15:40:34 -0000 1.34 +++ hamlib.spec 7 Jul 2008 16:38:56 -0000 1.35 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl-Module-Compat +BuildRequires: perl-Module-Compat BuildRequires: python-devel, swig, gd-devel, libxml2-devel, tcl-devel BuildRequires: libusb-devel, pkgconfig BuildRequires: doxygen From fedora-extras-commits at redhat.com Mon Jul 7 16:51:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 16:51:15 GMT Subject: rpms/agave/F-9 agave.spec,1.12,1.13 Message-ID: <200807071651.m67GpF50031291@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/agave/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31103/F-9 Modified Files: agave.spec Log Message: fix conditional comparison Index: agave.spec =================================================================== RCS file: /cvs/pkgs/rpms/agave/F-9/agave.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- agave.spec 27 Mar 2008 15:42:32 -0000 1.12 +++ agave.spec 7 Jul 2008 16:50:16 -0000 1.13 @@ -1,6 +1,6 @@ Name: agave Version: 0.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia @@ -15,7 +15,7 @@ BuildRequires: cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel BuildRequires: gettext, gnome-doc-utils, libglademm24-devel BuildRequires: scrollkeeper -%if "%{fedora}" >= "5" +%if 0%{?fedora} >= 5 BuildRequires: libSM-devel %endif @@ -121,6 +121,9 @@ %changelog +* Mon JUl 7 2008 Tom "spot" Callaway - 0.4.2-8 +- fix conditional comparison + * Thu Mar 27 2008 Christopher Aillon - 0.4.2-7 - Actually build against GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 16:51:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 16:51:15 GMT Subject: rpms/agave/F-8 agave.spec,1.10,1.11 Message-ID: <200807071651.m67GpFgQ031288@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/agave/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31103/F-8 Modified Files: agave.spec Log Message: fix conditional comparison Index: agave.spec =================================================================== RCS file: /cvs/pkgs/rpms/agave/F-8/agave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- agave.spec 25 Aug 2007 21:28:44 -0000 1.10 +++ agave.spec 7 Jul 2008 16:49:36 -0000 1.11 @@ -1,6 +1,6 @@ Name: agave Version: 0.4.2 -Release: 5%{?dist} +Release: 5%{?dist}.1 Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia @@ -14,7 +14,7 @@ BuildRequires: cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel BuildRequires: gettext, gnome-doc-utils, libglademm24-devel BuildRequires: scrollkeeper -%if "%{fedora}" >= "5" +%if 0%{?fedora} >= 5 BuildRequires: libSM-devel %endif @@ -119,6 +119,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 0.4.2-5.1 +- fix conditional comparison + * Sat Aug 25 2007 Aurelien Bompard 0.4.2-5 - fix License tag - rebuild for BuildID From fedora-extras-commits at redhat.com Mon Jul 7 16:51:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 16:51:34 GMT Subject: rpms/agave/devel agave.spec,1.12,1.13 Message-ID: <200807071651.m67GpYZg031316@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/agave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31103/devel Modified Files: agave.spec Log Message: fix conditional comparison Index: agave.spec =================================================================== RCS file: /cvs/pkgs/rpms/agave/devel/agave.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- agave.spec 27 Mar 2008 15:42:32 -0000 1.12 +++ agave.spec 7 Jul 2008 16:50:46 -0000 1.13 @@ -1,6 +1,6 @@ Name: agave Version: 0.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia @@ -15,7 +15,7 @@ BuildRequires: cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel BuildRequires: gettext, gnome-doc-utils, libglademm24-devel BuildRequires: scrollkeeper -%if "%{fedora}" >= "5" +%if 0%{?fedora} >= 5 BuildRequires: libSM-devel %endif @@ -121,6 +121,9 @@ %changelog +* Mon JUl 7 2008 Tom "spot" Callaway - 0.4.2-8 +- fix conditional comparison + * Thu Mar 27 2008 Christopher Aillon - 0.4.2-7 - Actually build against GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 16:53:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 16:53:26 GMT Subject: rpms/agave/F-9 agave.spec,1.13,1.14 Message-ID: <200807071653.m67GrQKW031573@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/agave/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31458/F-9 Modified Files: agave.spec Log Message: fix typo Index: agave.spec =================================================================== RCS file: /cvs/pkgs/rpms/agave/F-9/agave.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- agave.spec 7 Jul 2008 16:50:16 -0000 1.13 +++ agave.spec 7 Jul 2008 16:52:29 -0000 1.14 @@ -121,7 +121,7 @@ %changelog -* Mon JUl 7 2008 Tom "spot" Callaway - 0.4.2-8 +* Mon Jul 7 2008 Tom "spot" Callaway - 0.4.2-8 - fix conditional comparison * Thu Mar 27 2008 Christopher Aillon - 0.4.2-7 From fedora-extras-commits at redhat.com Mon Jul 7 16:53:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 16:53:45 GMT Subject: rpms/agave/devel agave.spec,1.13,1.14 Message-ID: <200807071653.m67GrjED031597@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/agave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31458/devel Modified Files: agave.spec Log Message: fix typo Index: agave.spec =================================================================== RCS file: /cvs/pkgs/rpms/agave/devel/agave.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- agave.spec 7 Jul 2008 16:50:46 -0000 1.13 +++ agave.spec 7 Jul 2008 16:52:56 -0000 1.14 @@ -121,7 +121,7 @@ %changelog -* Mon JUl 7 2008 Tom "spot" Callaway - 0.4.2-8 +* Mon Jul 7 2008 Tom "spot" Callaway - 0.4.2-8 - fix conditional comparison * Thu Mar 27 2008 Christopher Aillon - 0.4.2-7 From fedora-extras-commits at redhat.com Mon Jul 7 16:57:30 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 16:57:30 GMT Subject: rpms/jd/F-9 jd.spec,1.298,1.299 Message-ID: <200807071657.m67GvUUW031860@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31771/F-9 Modified Files: jd.spec Log Message: * Tue Jul 8 2008 Mamoru Tasaka - rev 2183 Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- jd.spec 6 Jul 2008 19:27:05 -0000 1.298 +++ jd.spec 7 Jul 2008 16:56:43 -0000 1.299 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2179_trunk +%define strtag svn2183_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Mon Jul 7 2008 Mamoru Tasaka -- rev 2179 +* Tue Jul 8 2008 Mamoru Tasaka +- rev 2183 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 From fedora-extras-commits at redhat.com Mon Jul 7 16:57:43 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 16:57:43 GMT Subject: rpms/jd/F-8 jd.spec,1.287,1.288 Message-ID: <200807071657.m67GvhFX031901@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31771/F-8 Modified Files: jd.spec Log Message: * Tue Jul 8 2008 Mamoru Tasaka - rev 2183 Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- jd.spec 6 Jul 2008 19:26:45 -0000 1.287 +++ jd.spec 7 Jul 2008 16:56:20 -0000 1.288 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2179_trunk +%define strtag svn2183_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Mon Jul 7 2008 Mamoru Tasaka -- rev 2179 +* Tue Jul 8 2008 Mamoru Tasaka +- rev 2183 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 From fedora-extras-commits at redhat.com Mon Jul 7 16:57:48 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 16:57:48 GMT Subject: rpms/jd/devel jd.spec,1.304,1.305 Message-ID: <200807071657.m67Gvm0r031908@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31771/devel Modified Files: jd.spec Log Message: * Tue Jul 8 2008 Mamoru Tasaka - rev 2183 Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- jd.spec 6 Jul 2008 19:27:25 -0000 1.304 +++ jd.spec 7 Jul 2008 16:57:00 -0000 1.305 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2179_trunk +%define strtag svn2183_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Mon Jul 7 2008 Mamoru Tasaka -- rev 2179 +* Tue Jul 8 2008 Mamoru Tasaka +- rev 2183 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 From fedora-extras-commits at redhat.com Mon Jul 7 16:58:59 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Mon, 7 Jul 2008 16:58:59 GMT Subject: rpms/hamlib/F-9 .cvsignore, 1.7, 1.8 Makefile, 1.2, 1.3 branch, 1.2, 1.3 hamlib-1.2.4-bindings.patch, 1.2, 1.3 hamlib-1.2.6.2-bindings.patch, 1.2, 1.3 hamlib-bindings.patch, 1.4, 1.5 hamlib.spec, 1.35, 1.36 sources, 1.7, 1.8 Message-ID: <200807071659.m67GwxIM032084@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/hamlib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31905 Modified Files: .cvsignore Makefile branch hamlib-1.2.4-bindings.patch hamlib-1.2.6.2-bindings.patch hamlib-bindings.patch hamlib.spec sources Log Message: Reverted, removed dependency, left release bump hamlib-1.2.4-bindings.patch: hamlib-1.2.6.2-bindings.patch: hamlib-bindings.patch: Index: hamlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/hamlib/F-9/hamlib.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- hamlib.spec 7 Jul 2008 16:38:56 -0000 1.35 +++ hamlib.spec 7 Jul 2008 16:58:07 -0000 1.36 @@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl-Module-Compat BuildRequires: python-devel, swig, gd-devel, libxml2-devel, tcl-devel BuildRequires: libusb-devel, pkgconfig BuildRequires: doxygen From fedora-extras-commits at redhat.com Mon Jul 7 17:01:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:01:45 GMT Subject: rpms/bacula/F-8 bacula.spec,1.4,1.5 Message-ID: <200807071701.m67H1jSj006567@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bacula/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32397/F-8 Modified Files: bacula.spec Log Message: fix conditional comparison, license tag Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-8/bacula.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bacula.spec 5 Sep 2007 15:32:29 -0000 1.4 +++ bacula.spec 7 Jul 2008 17:00:42 -0000 1.5 @@ -8,8 +8,9 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula Version: 2.0.3 -Release: 11%{?dist} -License: GPL +Release: 11%{?dist}.1 +# See LICENSE for details +License: GPLv2 with exceptions Group: System Environment/Daemons Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz @@ -45,7 +46,7 @@ BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed, BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript -%if "%{fedora}" >= "7" +%if 0%{?fedora} >= 7 BuildRequires: tcp_wrappers-devel %else BuildRequires: tcp_wrappers @@ -920,6 +921,10 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 2.0.3-11.1 +- fix conditional comparison +- fix license tag + * Wed Sep 5 2007 Andreas Thienemann - 2.0.3-11 - Remove spooldir in client, fixing #251879 - Remove dependency on libtermcap, fixing #251158 From fedora-extras-commits at redhat.com Mon Jul 7 17:02:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:02:14 GMT Subject: rpms/bacula/devel bacula.spec,1.6,1.7 Message-ID: <200807071702.m67H2E7S006625@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bacula/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32397/devel Modified Files: bacula.spec Log Message: fix conditional comparison, license tag Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bacula.spec 8 Jan 2008 01:25:20 -0000 1.6 +++ bacula.spec 7 Jul 2008 17:01:16 -0000 1.7 @@ -8,8 +8,9 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula Version: 2.0.3 -Release: 13%{?dist} -License: GPL +Release: 14%{?dist} +# See LICENSE for details +License: GPLv2 with exceptions Group: System Environment/Daemons Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz @@ -46,7 +47,7 @@ BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript BuildRequires: dvipdfm -%if "%{fedora}" >= "7" +%if 0%{?fedora} >= 7 BuildRequires: tcp_wrappers-devel %else BuildRequires: tcp_wrappers @@ -921,6 +922,10 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 2.0.3-14 +- fix conditional comparison +- fix license tag + * Mon Jan 07 2008 Tom "spot" Callaway - 2.0.3-13 - add BR: dvipdfm From fedora-extras-commits at redhat.com Mon Jul 7 17:03:40 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 17:03:40 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.41, 1.42 cairo-dock.spec, 1.52, 1.53 sources, 1.41, 1.42 Message-ID: <200807071703.m67H3eoQ006870@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6726 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Tue Jul 8 2008 Mamoru Tasaka - rev. 1179 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 6 Jul 2008 02:47:44 -0000 1.41 +++ .cvsignore 7 Jul 2008 17:02:51 -0000 1.42 @@ -1 +1 @@ -cairo-dock-sources-svn1173_trunk.tar.bz2 +cairo-dock-sources-svn1179_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- cairo-dock.spec 6 Jul 2008 02:47:44 -0000 1.52 +++ cairo-dock.spec 7 Jul 2008 17:02:51 -0000 1.53 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1173_trunk +%define tarballver svn1179_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -496,8 +496,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun Jul 6 2008 Mamoru Tasaka -- rev. 1173 +* Tue Jul 8 2008 Mamoru Tasaka +- rev. 1179 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 6 Jul 2008 02:47:44 -0000 1.41 +++ sources 7 Jul 2008 17:02:51 -0000 1.42 @@ -1 +1 @@ -02253f34b7d30e8b0d665afbe9d4fa43 cairo-dock-sources-svn1173_trunk.tar.bz2 +cdb80cf4432056c6113936f326a40e26 cairo-dock-sources-svn1179_trunk.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 17:06:59 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 7 Jul 2008 17:06:59 GMT Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.16,1.17 Message-ID: <200807071706.m67H6x29007308@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7164 Modified Files: gnome-applet-timer.spec Log Message: * Mon Jul 07 2008 Adam Jackson 2.0.1-3 - %fedora is an int, not a string. Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-applet-timer.spec 20 Jun 2008 22:29:13 -0000 1.16 +++ gnome-applet-timer.spec 7 Jul 2008 17:06:01 -0000 1.17 @@ -4,7 +4,7 @@ Name: gnome-applet-timer Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -43,7 +43,7 @@ %setup -q -n timer-applet-%{version} %build -%if "%{?fedora}" > "6" +%if %{?fedora} > 6 export CPPFLAGS="${CPPFLAGS} -I/usr/include/libxml2" %endif @@ -97,6 +97,9 @@ %{python_sitelib}/timerapplet/ %changelog +* Mon Jul 07 2008 Adam Jackson 2.0.1-3 +- %%fedora is an int, not a string. + * Fri Jun 20 2008 Christoph Wickert - 2.0.2-1 - Disable broken check macro (#449717) temporarily to fix #449485 From fedora-extras-commits at redhat.com Mon Jul 7 17:07:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:07:03 GMT Subject: rpms/dbmail/F-8 dbmail.spec,1.19,1.20 Message-ID: <200807071707.m67H73Ig007350@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dbmail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7019/F-8 Modified Files: dbmail.spec Log Message: fix conditional comparison Index: dbmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbmail/F-8/dbmail.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- dbmail.spec 24 Apr 2008 15:15:11 -0000 1.19 +++ dbmail.spec 7 Jul 2008 17:05:12 -0000 1.20 @@ -5,13 +5,13 @@ %define services dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved # older distros don't have sqlite -%if 0%{?fedora} && "%fedora" < "4" +%if 0%{?fedora} && 0%{?fedora} < 4 %define without_sqlite 1 %endif Name: dbmail Version: 2.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The DBMail mail storage system Group: System Environment/Daemons @@ -231,6 +231,9 @@ %{_libdir}/dbmail/libpgsql* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 2.2.9-2 +- fix conditional comparison + * Thu Apr 24 2008 Bernard Johnson - 2.2.9-1 - v 2.2.9 From fedora-extras-commits at redhat.com Mon Jul 7 17:07:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:07:06 GMT Subject: rpms/dbmail/F-9 dbmail.spec,1.21,1.22 Message-ID: <200807071707.m67H76b9007353@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dbmail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7019/F-9 Modified Files: dbmail.spec Log Message: fix conditional comparison Index: dbmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbmail/F-9/dbmail.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- dbmail.spec 24 Apr 2008 15:29:11 -0000 1.21 +++ dbmail.spec 7 Jul 2008 17:05:33 -0000 1.22 @@ -5,13 +5,13 @@ %define services dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved # older distros don't have sqlite -%if 0%{?fedora} && "%fedora" < "4" +%if 0%{?fedora} && 0%{?fedora} < 4 %define without_sqlite 1 %endif Name: dbmail Version: 2.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The DBMail mail storage system Group: System Environment/Daemons @@ -231,6 +231,9 @@ %{_libdir}/dbmail/libpgsql* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 2.2.9-2 +- fix conditional comparison + * Thu Apr 24 2008 Bernard Johnson - 2.2.9-1 - v 2.2.9 From fedora-extras-commits at redhat.com Mon Jul 7 17:07:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:07:10 GMT Subject: rpms/dbmail/devel dbmail.spec,1.21,1.22 Message-ID: <200807071707.m67H7A7l007364@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dbmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7019/devel Modified Files: dbmail.spec Log Message: fix conditional comparison Index: dbmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbmail/devel/dbmail.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- dbmail.spec 24 Apr 2008 15:15:33 -0000 1.21 +++ dbmail.spec 7 Jul 2008 17:06:07 -0000 1.22 @@ -5,13 +5,13 @@ %define services dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved # older distros don't have sqlite -%if 0%{?fedora} && "%fedora" < "4" +%if 0%{?fedora} && 0%{?fedora} < 4 %define without_sqlite 1 %endif Name: dbmail Version: 2.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The DBMail mail storage system Group: System Environment/Daemons @@ -231,6 +231,9 @@ %{_libdir}/dbmail/libpgsql* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 2.2.9-2 +- fix conditional comparison + * Thu Apr 24 2008 Bernard Johnson - 2.2.9-1 - v 2.2.9 From fedora-extras-commits at redhat.com Mon Jul 7 17:11:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:11:28 GMT Subject: rpms/dirac/F-9 dirac.spec,1.9,1.10 Message-ID: <200807071711.m67HBSJk007837@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dirac/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7764/F-9 Modified Files: dirac.spec Log Message: fix conditional comparison Index: dirac.spec =================================================================== RCS file: /cvs/pkgs/rpms/dirac/F-9/dirac.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dirac.spec 9 Feb 2008 14:30:20 -0000 1.9 +++ dirac.spec 7 Jul 2008 17:10:36 -0000 1.10 @@ -1,6 +1,6 @@ Name: dirac Version: 0.9.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Dirac is an open source video codec Group: System Environment/Libraries @@ -15,7 +15,7 @@ BuildRequires: graphviz-devel BuildRequires: tetex-latex BuildRequires: tetex -%if "%fedora" > "8" +%if 0%{?fedora} > 8 BuildRequires: dvipdfm %endif @@ -131,6 +131,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.9.1-2.1 +- fix conditional comparison + * Sat Feb 9 2008 kwizart < kwizart at gmail.com > - 0.9.1-2 - Rebuild for gcc43 From fedora-extras-commits at redhat.com Mon Jul 7 17:11:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:11:47 GMT Subject: rpms/dirac/devel dirac.spec,1.10,1.11 Message-ID: <200807071711.m67HBl2j007849@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dirac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7764/devel Modified Files: dirac.spec Log Message: fix conditional comparison Index: dirac.spec =================================================================== RCS file: /cvs/pkgs/rpms/dirac/devel/dirac.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dirac.spec 21 Jun 2008 00:31:52 -0000 1.10 +++ dirac.spec 7 Jul 2008 17:10:58 -0000 1.11 @@ -1,6 +1,6 @@ Name: dirac Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dirac is an open source video codec Group: System Environment/Libraries @@ -14,7 +14,7 @@ BuildRequires: graphviz-devel BuildRequires: tetex-latex BuildRequires: tetex -%if "%fedora" > "8" +%if 0%{?fedora} > 8 BuildRequires: dvipdfm %endif @@ -129,6 +129,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 0.10.0-2 +- fix conditional comparison + * Sat Jun 21 2008 kwizart < kwizart at gmail.com > - 0.10.0-1 - Update to 0.10.0 From fedora-extras-commits at redhat.com Mon Jul 7 17:17:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:17:07 GMT Subject: rpms/elfutils/F-9 elfutils.spec,1.105,1.106 Message-ID: <200807071717.m67HH7M5008252@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/elfutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150/F-9 Modified Files: elfutils.spec Log Message: fix conditional comparison Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-9/elfutils.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- elfutils.spec 13 May 2008 01:16:29 -0000 1.105 +++ elfutils.spec 7 Jul 2008 17:16:13 -0000 1.106 @@ -1,5 +1,5 @@ %define eu_version 0.135 -%define eu_release 1 +%define eu_release 2 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -7,17 +7,17 @@ %define compat 0 %endif -%if "%fedora" >= "8" +%if 0%{?fedora} >= 8 %define scanf_has_m 1 %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define scanf_has_m 1 %endif -%if "%fedora" >= "7" +%if 0%{?fedora} >= 7 %define separate_devel_static 1 %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define separate_devel_static 1 %endif @@ -262,6 +262,9 @@ %{_libdir}/libelf.a %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.135-2 +- fix conditional comparison + * Mon May 12 2008 Roland McGrath - 0.135-1 - Update to 0.135 - libdwfl: bug fixes From fedora-extras-commits at redhat.com Mon Jul 7 17:17:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:17:13 GMT Subject: rpms/elfutils/F-8 elfutils.spec,1.98,1.99 Message-ID: <200807071717.m67HHDsE008265@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/elfutils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150/F-8 Modified Files: elfutils.spec Log Message: fix conditional comparison Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-8/elfutils.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- elfutils.spec 13 May 2008 01:16:11 -0000 1.98 +++ elfutils.spec 7 Jul 2008 17:15:53 -0000 1.99 @@ -1,5 +1,5 @@ %define eu_version 0.135 -%define eu_release 1 +%define eu_release 2 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -7,17 +7,17 @@ %define compat 0 %endif -%if "%fedora" >= "8" +%if 0%{?fedora} >= 8 %define scanf_has_m 1 %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define scanf_has_m 1 %endif -%if "%fedora" >= "7" +%if 0%{?fedora} >= 7 %define separate_devel_static 1 %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define separate_devel_static 1 %endif @@ -262,6 +262,9 @@ %{_libdir}/libelf.a %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.135-2 +- fix conditional comparison + * Mon May 12 2008 Roland McGrath - 0.135-1 - Update to 0.135 - libdwfl: bug fixes From fedora-extras-commits at redhat.com Mon Jul 7 17:17:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:17:26 GMT Subject: rpms/elfutils/devel elfutils.spec,1.105,1.106 Message-ID: <200807071717.m67HHQIQ008278@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/elfutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150/devel Modified Files: elfutils.spec Log Message: fix conditional comparison Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- elfutils.spec 13 May 2008 00:44:12 -0000 1.105 +++ elfutils.spec 7 Jul 2008 17:16:37 -0000 1.106 @@ -1,5 +1,5 @@ %define eu_version 0.135 -%define eu_release 1 +%define eu_release 2 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -7,17 +7,17 @@ %define compat 0 %endif -%if "%fedora" >= "8" +%if 0%{?fedora} >= 8 %define scanf_has_m 1 %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define scanf_has_m 1 %endif -%if "%fedora" >= "7" +%if 0%{?fedora} >= 7 %define separate_devel_static 1 %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define separate_devel_static 1 %endif @@ -262,6 +262,9 @@ %{_libdir}/libelf.a %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.135-2 +- fix conditional comparison + * Mon May 12 2008 Roland McGrath - 0.135-1 - Update to 0.135 - libdwfl: bug fixes From fedora-extras-commits at redhat.com Mon Jul 7 17:22:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:22:40 GMT Subject: rpms/exaile/F-9 exaile.spec,1.20,1.21 Message-ID: <200807071722.m67HMelA008758@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/exaile/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8637/F-9 Modified Files: exaile.spec Log Message: fix conditional comparison Index: exaile.spec =================================================================== RCS file: /cvs/pkgs/rpms/exaile/F-9/exaile.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- exaile.spec 2 Apr 2008 14:05:11 -0000 1.20 +++ exaile.spec 7 Jul 2008 17:21:51 -0000 1.21 @@ -1,7 +1,7 @@ Summary: A music player Name: exaile Version: 0.2.13 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia # It actually says GPL 1 or later version; a couple of files includes the Artistic license License: GPL+ and Artistic @@ -28,12 +28,12 @@ Requires: python-sexy Requires: gamin-python -%if "%fedora" > "6" +%if 0%{?fedora} > 6 # for iPod device support Requires: python-gpod %endif -%ifarch x86_64 ia64 ppc64 s390x +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define gre_conf %{_sysconfdir}/gre.d/gre64.conf %else %define gre_conf %{_sysconfdir}/gre.d/gre.conf @@ -91,6 +91,10 @@ %{_mandir}/man1/exaile*.* %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 0.2.13-2 +- fix conditional comparison +- add sparc64 to 64bit arch check + * Wed Apr 02 2008 Deji Akingunola - 0.2.13-1 - Update to 0.2.13 From fedora-extras-commits at redhat.com Mon Jul 7 17:22:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:22:50 GMT Subject: rpms/exaile/F-8 exaile.spec,1.18,1.19 Message-ID: <200807071722.m67HMogB008805@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/exaile/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8637/F-8 Modified Files: exaile.spec Log Message: fix conditional comparison Index: exaile.spec =================================================================== RCS file: /cvs/pkgs/rpms/exaile/F-8/exaile.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- exaile.spec 3 Apr 2008 17:01:30 -0000 1.18 +++ exaile.spec 7 Jul 2008 17:21:21 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A music player Name: exaile Version: 0.2.13 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia # It actually says GPL 1 or later version; a couple of files includes the Artistic license License: GPL+ and Artistic @@ -28,12 +28,12 @@ Requires: python-sexy Requires: gamin-python -%if "%fedora" > "6" +%if 0%{?fedora} > 6 # for iPod device support Requires: python-gpod %endif -%ifarch x86_64 ia64 ppc64 s390x +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define gre_conf %{_sysconfdir}/gre.d/gre64.conf %else %define gre_conf %{_sysconfdir}/gre.d/gre.conf @@ -91,6 +91,10 @@ %{_mandir}/man1/exaile*.* %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 0.2.13-2 +- fix conditional comparison +- add sparc64 to 64bit arch check + * Thu Apr 03 2008 Deji Akingunola - 0.2.13-1 - Update to 0.2.13 From fedora-extras-commits at redhat.com Mon Jul 7 17:23:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:23:01 GMT Subject: rpms/exaile/devel exaile.spec,1.20,1.21 Message-ID: <200807071723.m67HN1VK008830@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/exaile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8637/devel Modified Files: exaile.spec Log Message: fix conditional comparison Index: exaile.spec =================================================================== RCS file: /cvs/pkgs/rpms/exaile/devel/exaile.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- exaile.spec 2 Apr 2008 14:05:11 -0000 1.20 +++ exaile.spec 7 Jul 2008 17:22:10 -0000 1.21 @@ -1,7 +1,7 @@ Summary: A music player Name: exaile Version: 0.2.13 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia # It actually says GPL 1 or later version; a couple of files includes the Artistic license License: GPL+ and Artistic @@ -28,12 +28,12 @@ Requires: python-sexy Requires: gamin-python -%if "%fedora" > "6" +%if 0%{?fedora} > 6 # for iPod device support Requires: python-gpod %endif -%ifarch x86_64 ia64 ppc64 s390x +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define gre_conf %{_sysconfdir}/gre.d/gre64.conf %else %define gre_conf %{_sysconfdir}/gre.d/gre.conf @@ -91,6 +91,10 @@ %{_mandir}/man1/exaile*.* %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 0.2.13-2 +- fix conditional comparison +- add sparc64 to 64bit arch check + * Wed Apr 02 2008 Deji Akingunola - 0.2.13-1 - Update to 0.2.13 From fedora-extras-commits at redhat.com Mon Jul 7 17:25:17 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 17:25:17 GMT Subject: rpms/jd/F-9 .cvsignore,1.261,1.262 sources,1.262,1.263 Message-ID: <200807071725.m67HPHOa009152@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8997/F-9 Modified Files: .cvsignore sources Log Message: orz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- .cvsignore 6 Jul 2008 19:27:05 -0000 1.261 +++ .cvsignore 7 Jul 2008 17:24:27 -0000 1.262 @@ -1 +1 @@ -jd-2.0.0-svn2179_trunk.tgz +jd-2.0.0-svn2183_trunk.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- sources 6 Jul 2008 19:27:05 -0000 1.262 +++ sources 7 Jul 2008 17:24:27 -0000 1.263 @@ -1 +1 @@ -c380fe3cbbb42511976684b114cef9d2 jd-2.0.0-svn2179_trunk.tgz +6e3c730af466f8b706abe4216b465c19 jd-2.0.0-svn2183_trunk.tgz From fedora-extras-commits at redhat.com Mon Jul 7 17:25:27 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 17:25:27 GMT Subject: rpms/jd/F-8 .cvsignore,1.254,1.255 sources,1.255,1.256 Message-ID: <200807071725.m67HPRu4009166@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8997/F-8 Modified Files: .cvsignore sources Log Message: orz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- .cvsignore 6 Jul 2008 19:26:45 -0000 1.254 +++ .cvsignore 7 Jul 2008 17:24:05 -0000 1.255 @@ -1 +1 @@ -jd-2.0.0-svn2179_trunk.tgz +jd-2.0.0-svn2183_trunk.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- sources 6 Jul 2008 19:26:45 -0000 1.255 +++ sources 7 Jul 2008 17:24:05 -0000 1.256 @@ -1 +1 @@ -c380fe3cbbb42511976684b114cef9d2 jd-2.0.0-svn2179_trunk.tgz +6e3c730af466f8b706abe4216b465c19 jd-2.0.0-svn2183_trunk.tgz From fedora-extras-commits at redhat.com Mon Jul 7 17:25:39 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 17:25:39 GMT Subject: rpms/jd/devel .cvsignore,1.261,1.262 sources,1.262,1.263 Message-ID: <200807071725.m67HPdax009188@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8997/devel Modified Files: .cvsignore sources Log Message: orz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- .cvsignore 6 Jul 2008 19:27:25 -0000 1.261 +++ .cvsignore 7 Jul 2008 17:24:47 -0000 1.262 @@ -1 +1 @@ -jd-2.0.0-svn2179_trunk.tgz +jd-2.0.0-svn2183_trunk.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- sources 6 Jul 2008 19:27:25 -0000 1.262 +++ sources 7 Jul 2008 17:24:47 -0000 1.263 @@ -1 +1 @@ -c380fe3cbbb42511976684b114cef9d2 jd-2.0.0-svn2179_trunk.tgz +6e3c730af466f8b706abe4216b465c19 jd-2.0.0-svn2183_trunk.tgz From fedora-extras-commits at redhat.com Mon Jul 7 17:31:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:31:34 GMT Subject: rpms/fish/F-9 fish.spec,1.23,1.24 Message-ID: <200807071731.m67HVYne009735@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fish/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9610/F-9 Modified Files: fish.spec Log Message: fix conditional comparison Index: fish.spec =================================================================== RCS file: /cvs/pkgs/rpms/fish/F-9/fish.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fish.spec 6 Jun 2008 08:52:54 -0000 1.23 +++ fish.spec 7 Jul 2008 17:30:46 -0000 1.24 @@ -2,7 +2,7 @@ Name: fish Version: 1.23.0 -Release: 1.1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Shells @@ -16,15 +16,15 @@ # Locate correct build time-dependencies for providing X headers -%if "%fedora" >= "5" +%if 0%{?fedora} >= 5 # Modern Fedora version, has modular X.org BuildRequires: xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel %endif -%if "%fedora" < "5" -%if "%fedora" >= "3" +%if 0%{?fedora} < 5 +%if 0%{?fedora} >= 3 # Semi-old Fedora version, has non-modular X.org BuildRequires: xorg-x11-devel @@ -33,7 +33,7 @@ %endif %if 0%{?fedora} -%if "%fedora" < "3" +%if 0%{?fedora} < 3 # Ancient Fedora version, has XFree86 BuildRequires: XFree86-devel @@ -174,6 +174,9 @@ %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 1.23.0-2 +- fix conditional comparison + * Fri Jun 06 2008 Oliver Falk - 1.23.0-1.1 - Rebuild From fedora-extras-commits at redhat.com Mon Jul 7 17:31:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:31:45 GMT Subject: rpms/fish/F-8 fish.spec,1.22,1.23 Message-ID: <200807071731.m67HVjfB009743@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fish/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9610/F-8 Modified Files: fish.spec Log Message: fix conditional comparison Index: fish.spec =================================================================== RCS file: /cvs/pkgs/rpms/fish/F-8/fish.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fish.spec 6 Jun 2008 08:30:06 -0000 1.22 +++ fish.spec 7 Jul 2008 17:29:54 -0000 1.23 @@ -2,7 +2,7 @@ Name: fish Version: 1.23.0 -Release: 1.1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Shells @@ -16,15 +16,15 @@ # Locate correct build time-dependencies for providing X headers -%if "%fedora" >= "5" +%if 0%{?fedora} >= 5 # Modern Fedora version, has modular X.org BuildRequires: xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel %endif -%if "%fedora" < "5" -%if "%fedora" >= "3" +%if 0%{?fedora} < 5 +%if 0%{?fedora} >= 3 # Semi-old Fedora version, has non-modular X.org BuildRequires: xorg-x11-devel @@ -33,7 +33,7 @@ %endif %if 0%{?fedora} -%if "%fedora" < "3" +%if 0%{?fedora} < 3 # Ancient Fedora version, has XFree86 BuildRequires: XFree86-devel @@ -174,6 +174,9 @@ %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 1.23.0-2 +- fix conditional comparison + * Fri Jun 06 2008 Oliver Falk - 1.23.0-1.1 - Rebuild From fedora-extras-commits at redhat.com Mon Jul 7 17:31:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:31:59 GMT Subject: rpms/fish/devel fish.spec,1.24,1.25 Message-ID: <200807071731.m67HVxYS009755@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9610/devel Modified Files: fish.spec Log Message: fix conditional comparison Index: fish.spec =================================================================== RCS file: /cvs/pkgs/rpms/fish/devel/fish.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fish.spec 6 Jun 2008 08:55:51 -0000 1.24 +++ fish.spec 7 Jul 2008 17:31:04 -0000 1.25 @@ -2,7 +2,7 @@ Name: fish Version: 1.23.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Shells @@ -16,15 +16,15 @@ # Locate correct build time-dependencies for providing X headers -%if "%fedora" >= "5" +%if 0%{?fedora} >= 5 # Modern Fedora version, has modular X.org BuildRequires: xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel %endif -%if "%fedora" < "5" -%if "%fedora" >= "3" +%if 0%{?fedora} < 5 +%if 0%{?fedora} >= 3 # Semi-old Fedora version, has non-modular X.org BuildRequires: xorg-x11-devel @@ -33,7 +33,7 @@ %endif %if 0%{?fedora} -%if "%fedora" < "3" +%if 0%{?fedora} < 3 # Ancient Fedora version, has XFree86 BuildRequires: XFree86-devel @@ -174,6 +174,9 @@ %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 1.23.0-5 +- fix conditional comparison + * Fri Jul 06 2008 Oliver Falk - 1.23.0-4 - Rebuild From fedora-extras-commits at redhat.com Mon Jul 7 17:36:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:36:41 GMT Subject: rpms/gdeskcal/F-8 gdeskcal.spec,1.21,1.22 Message-ID: <200807071736.m67Haf7A010234@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gdeskcal/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10050/F-8 Modified Files: gdeskcal.spec Log Message: fix conditional comparison Index: gdeskcal.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdeskcal/F-8/gdeskcal.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gdeskcal.spec 18 Mar 2007 20:20:27 -0000 1.21 +++ gdeskcal.spec 7 Jul 2008 17:35:02 -0000 1.22 @@ -1,9 +1,9 @@ Name: gdeskcal Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops -License: GPL +License: GPL+ URL: http://www.pycage.de/ Source0: http://www.pycage.de/download/gDeskCal-%{version}.tar.gz Source1: gdeskcal.png @@ -38,7 +38,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ -%if "%{?fedora}" <= "6" +%if 0%{?fedora} <= 6 --add-category X-Fedora \ %endif %{SOURCE2} @@ -65,6 +65,10 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.01-2 +- fix license tag +- fix conditional comparison + * Sun Mar 18 2007 Michael Schwendt - 1.01-1 - upgrade to 1.01 (patches merged) From fedora-extras-commits at redhat.com Mon Jul 7 17:36:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:36:44 GMT Subject: rpms/gdeskcal/F-9 gdeskcal.spec,1.21,1.22 Message-ID: <200807071736.m67HaiAQ010239@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gdeskcal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10050/F-9 Modified Files: gdeskcal.spec Log Message: fix conditional comparison Index: gdeskcal.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdeskcal/F-9/gdeskcal.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gdeskcal.spec 18 Mar 2007 20:20:27 -0000 1.21 +++ gdeskcal.spec 7 Jul 2008 17:35:41 -0000 1.22 @@ -1,9 +1,9 @@ Name: gdeskcal Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops -License: GPL +License: GPL+ URL: http://www.pycage.de/ Source0: http://www.pycage.de/download/gDeskCal-%{version}.tar.gz Source1: gdeskcal.png @@ -38,7 +38,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ -%if "%{?fedora}" <= "6" +%if 0%{?fedora} <= 6 --add-category X-Fedora \ %endif %{SOURCE2} @@ -65,6 +65,10 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.01-2 +- fix license tag +- fix conditional comparison + * Sun Mar 18 2007 Michael Schwendt - 1.01-1 - upgrade to 1.01 (patches merged) From fedora-extras-commits at redhat.com Mon Jul 7 17:37:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:37:08 GMT Subject: rpms/gdeskcal/devel gdeskcal.spec,1.21,1.22 Message-ID: <200807071737.m67Hb80B010263@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10050/devel Modified Files: gdeskcal.spec Log Message: fix conditional comparison Index: gdeskcal.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gdeskcal.spec 18 Mar 2007 20:20:27 -0000 1.21 +++ gdeskcal.spec 7 Jul 2008 17:36:14 -0000 1.22 @@ -1,9 +1,9 @@ Name: gdeskcal Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops -License: GPL +License: GPL+ URL: http://www.pycage.de/ Source0: http://www.pycage.de/download/gDeskCal-%{version}.tar.gz Source1: gdeskcal.png @@ -38,7 +38,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ -%if "%{?fedora}" <= "6" +%if 0%{?fedora} <= 6 --add-category X-Fedora \ %endif %{SOURCE2} @@ -65,6 +65,10 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.01-2 +- fix license tag +- fix conditional comparison + * Sun Mar 18 2007 Michael Schwendt - 1.01-1 - upgrade to 1.01 (patches merged) From fedora-extras-commits at redhat.com Mon Jul 7 17:39:03 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 7 Jul 2008 17:39:03 GMT Subject: rpms/hal-cups-utils/devel .cvsignore, 1.25, 1.26 hal-cups-utils.spec, 1.69, 1.70 sources, 1.25, 1.26 hal-cups-utils-no-compare-queue-name.patch, 1.2, NONE Message-ID: <200807071739.m67Hd3QO010442@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hal-cups-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10360 Modified Files: .cvsignore hal-cups-utils.spec sources Removed Files: hal-cups-utils-no-compare-queue-name.patch Log Message: * Mon Jul 7 2008 Tim Waugh 0.6.17-1 - 0.6.17. Requires system-config-printer-libs >= 1.0.3. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 25 Mar 2008 12:31:58 -0000 1.25 +++ .cvsignore 7 Jul 2008 17:38:08 -0000 1.26 @@ -13,3 +13,4 @@ hal-cups-utils-0.6.14.tar.gz hal-cups-utils-0.6.15.tar.gz hal-cups-utils-0.6.16.tar.gz +hal-cups-utils-0.6.17.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- hal-cups-utils.spec 4 Apr 2008 17:07:28 -0000 1.69 +++ hal-cups-utils.spec 7 Jul 2008 17:38:08 -0000 1.70 @@ -1,12 +1,11 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.6.16 -Release: 3%{?dist} +Version: 0.6.17 +Release: 1%{?dist} License: GPLv2 Group: Applications/System Source: %{name}-%{version}.tar.gz Source1: cups-config-daemon -Patch1: hal-cups-utils-no-compare-queue-name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: dbus-devel >= 0.60 @@ -17,7 +16,7 @@ Requires: hal >= 0.5.0 Requires: dbus >= 0.90 Requires: cups -Requires: system-config-printer-libs >= 0.7.67 +Requires: system-config-printer-libs >= 1.0.3 %description Halified utilities for CUPS: @@ -28,7 +27,6 @@ rm -rf $RPM_BUILD_ROOT %setup -q -%patch1 -p1 -b .no-compare-queue-name %build @@ -60,6 +58,9 @@ %{_initrddir}/cups-config-daemon %changelog +* Mon Jul 7 2008 Tim Waugh 0.6.17-1 +- 0.6.17. Requires system-config-printer-libs >= 1.0.3. + * Fri Apr 4 2008 Tim Waugh 0.6.16-3 - Applied patch from upstream to use only the device URI to see if the printer has been configured already, and to make the queue name unique. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 25 Mar 2008 12:31:58 -0000 1.25 +++ sources 7 Jul 2008 17:38:08 -0000 1.26 @@ -1 +1 @@ -a6fde38caf0da0f9dce3512238507c6b hal-cups-utils-0.6.16.tar.gz +deaf77a71d3610c8df8a2328bef063b1 hal-cups-utils-0.6.17.tar.gz --- hal-cups-utils-no-compare-queue-name.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 17:39:10 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Mon, 7 Jul 2008 17:39:10 GMT Subject: rpms/flashrom/devel import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 flashrom--Makefile_cleanup.diff, 1.3, 1.4 flashrom.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200807071739.m67HdA0k010456@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/flashrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10381/devel Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec sources Added Files: import.log Log Message: svn ver. 3418 --- NEW FILE import.log --- flashrom-0-0_11_20080607svn3418_fc8:HEAD:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452254 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/flashrom/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 May 2008 18:54:51 -0000 1.8 +++ .cvsignore 7 Jul 2008 17:38:19 -0000 1.9 @@ -1 +1 @@ -flashrom-3332.tar.bz2 +flashrom-3418.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/extras/rpms/flashrom/devel/flashrom--Makefile_cleanup.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flashrom--Makefile_cleanup.diff 17 May 2008 19:35:14 -0000 1.3 +++ flashrom--Makefile_cleanup.diff 7 Jul 2008 17:38:19 -0000 1.4 @@ -1,5 +1,5 @@ ---- Makefile.Makefile_cleanup 2008-05-17 05:08:58.000000000 +0400 -+++ Makefile 2008-05-17 23:33:17.000000000 +0400 +--- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 ++++ Makefile 2008-07-07 21:31:20.000000000 +0400 @@ -9,15 +9,15 @@ CC = gcc STRIP = strip @@ -7,8 +7,8 @@ -PREFIX = /usr/local +PREFIX = /usr #CFLAGS = -O2 -g -Wall -Werror --CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 -+#CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 +-CFLAGS = -Os -Wall -Werror # -DTS5300 ++#CFLAGS = -Os -Wall -Werror # -DTS5300 OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), SunOS) LDFLAGS = -lpci -lz @@ -17,9 +17,9 @@ -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - - OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \ -@@ -31,12 +31,11 @@ + ifeq ($(OS_ARCH), FreeBSD) + CFLAGS += -I/usr/local/include +@@ -35,12 +35,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/extras/rpms/flashrom/devel/flashrom.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- flashrom.spec 6 Jun 2008 12:06:10 -0000 1.10 +++ flashrom.spec 7 Jul 2008 17:38:19 -0000 1.11 @@ -1,12 +1,12 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.10.20080517svn3332%{?dist} +Release: 0.11.20080607svn3418%{?dist} License: GPLv2+ Group: Applications/System -# svn -r 3332 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-3332.tar.bz2 flashrom -Source0: flashrom-3332.tar.bz2 +# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom +# tar -cjvf flashrom-3418.tar.bz2 flashrom +Source0: flashrom-3418.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel @@ -26,7 +26,7 @@ %build # currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3332\"' -DDISABLE_DOC" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -44,6 +44,19 @@ %{_mandir}/man8/%{name}.* %changelog +* Sun Jul 6 2008 Peter Lemenkov 0-0.11.20080607svn3418 +- AMIC A29002 +- flashing system with Nvidia MCP67 +- PCI IDs for EPIA-CN +- VIA SPI controller on VT8237S +- ICH7 SPI support +- support for AMIC Technology A49LF040A +- Board enable and autodetection for GIGABYTE GA-7VT600 +- Add support for Amic Technology A29040B flash chip +- Board enable and autodetection for BioStar P4M80-M4 +- Add support for the ASUS P4B266 board +- Add support for Amic A25L40P SPI flash + * Fri Jun 6 2008 Peter Lemenkov 0-0.10.20080517svn3332 - Exclude sparc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/flashrom/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 May 2008 18:54:51 -0000 1.8 +++ sources 7 Jul 2008 17:38:19 -0000 1.9 @@ -1 +1 @@ -b41566714bbb93b382836451c06c6e9f flashrom-3332.tar.bz2 +9e5ab291f764f2c54748f5e1bde48dc1 flashrom-3418.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 17:41:17 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Mon, 7 Jul 2008 17:41:17 GMT Subject: rpms/flashrom/F-9 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 flashrom--Makefile_cleanup.diff, 1.3, 1.4 flashrom.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200807071741.m67HfHq0010703@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/flashrom/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10612/F-9 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec sources Added Files: import.log Log Message: svn ver. 3418 --- NEW FILE import.log --- flashrom-0-0_11_20080607svn3418_fc8:F-9:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452397 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 May 2008 19:38:24 -0000 1.8 +++ .cvsignore 7 Jul 2008 17:40:21 -0000 1.9 @@ -1 +1 @@ -flashrom-3332.tar.bz2 +flashrom-3418.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-9/flashrom--Makefile_cleanup.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flashrom--Makefile_cleanup.diff 17 May 2008 19:38:24 -0000 1.3 +++ flashrom--Makefile_cleanup.diff 7 Jul 2008 17:40:21 -0000 1.4 @@ -1,5 +1,5 @@ ---- Makefile.Makefile_cleanup 2008-05-17 05:08:58.000000000 +0400 -+++ Makefile 2008-05-17 23:33:17.000000000 +0400 +--- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 ++++ Makefile 2008-07-07 21:31:20.000000000 +0400 @@ -9,15 +9,15 @@ CC = gcc STRIP = strip @@ -7,8 +7,8 @@ -PREFIX = /usr/local +PREFIX = /usr #CFLAGS = -O2 -g -Wall -Werror --CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 -+#CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 +-CFLAGS = -Os -Wall -Werror # -DTS5300 ++#CFLAGS = -Os -Wall -Werror # -DTS5300 OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), SunOS) LDFLAGS = -lpci -lz @@ -17,9 +17,9 @@ -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - - OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \ -@@ -31,12 +31,11 @@ + ifeq ($(OS_ARCH), FreeBSD) + CFLAGS += -I/usr/local/include +@@ -35,12 +35,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-9/flashrom.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- flashrom.spec 6 Jun 2008 12:05:22 -0000 1.9 +++ flashrom.spec 7 Jul 2008 17:40:21 -0000 1.10 @@ -1,12 +1,12 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.10.20080517svn3332%{?dist} +Release: 0.11.20080607svn3418%{?dist} License: GPLv2+ Group: Applications/System -# svn -r 3332 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-3332.tar.bz2 flashrom -Source0: flashrom-3332.tar.bz2 +# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom +# tar -cjvf flashrom-3418.tar.bz2 flashrom +Source0: flashrom-3418.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel @@ -26,7 +26,7 @@ %build # currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3332\"' -DDISABLE_DOC" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -44,6 +44,19 @@ %{_mandir}/man8/%{name}.* %changelog +* Sun Jul 6 2008 Peter Lemenkov 0-0.11.20080607svn3418 +- AMIC A29002 +- flashing system with Nvidia MCP67 +- PCI IDs for EPIA-CN +- VIA SPI controller on VT8237S +- ICH7 SPI support +- support for AMIC Technology A49LF040A +- Board enable and autodetection for GIGABYTE GA-7VT600 +- Add support for Amic Technology A29040B flash chip +- Board enable and autodetection for BioStar P4M80-M4 +- Add support for the ASUS P4B266 board +- Add support for Amic A25L40P SPI flash + * Fri Jun 6 2008 Peter Lemenkov 0-0.10.20080517svn3332 - Exclude sparc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 May 2008 19:38:24 -0000 1.8 +++ sources 7 Jul 2008 17:40:21 -0000 1.9 @@ -1 +1 @@ -b41566714bbb93b382836451c06c6e9f flashrom-3332.tar.bz2 +9e5ab291f764f2c54748f5e1bde48dc1 flashrom-3418.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 17:42:59 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Mon, 7 Jul 2008 17:42:59 GMT Subject: rpms/flashrom/F-8 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 flashrom--Makefile_cleanup.diff, 1.3, 1.4 flashrom.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200807071742.m67HgxXu010890@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/flashrom/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10826/F-8 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec sources Added Files: import.log Log Message: svn ver. 3418 --- NEW FILE import.log --- flashrom-0-0_11_20080607svn3418_fc8:F-8:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452504 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 May 2008 19:40:14 -0000 1.8 +++ .cvsignore 7 Jul 2008 17:42:08 -0000 1.9 @@ -1 +1 @@ -flashrom-3332.tar.bz2 +flashrom-3418.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-8/flashrom--Makefile_cleanup.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flashrom--Makefile_cleanup.diff 17 May 2008 19:40:14 -0000 1.3 +++ flashrom--Makefile_cleanup.diff 7 Jul 2008 17:42:08 -0000 1.4 @@ -1,5 +1,5 @@ ---- Makefile.Makefile_cleanup 2008-05-17 05:08:58.000000000 +0400 -+++ Makefile 2008-05-17 23:33:17.000000000 +0400 +--- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 ++++ Makefile 2008-07-07 21:31:20.000000000 +0400 @@ -9,15 +9,15 @@ CC = gcc STRIP = strip @@ -7,8 +7,8 @@ -PREFIX = /usr/local +PREFIX = /usr #CFLAGS = -O2 -g -Wall -Werror --CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 -+#CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 +-CFLAGS = -Os -Wall -Werror # -DTS5300 ++#CFLAGS = -Os -Wall -Werror # -DTS5300 OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), SunOS) LDFLAGS = -lpci -lz @@ -17,9 +17,9 @@ -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - - OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \ -@@ -31,12 +31,11 @@ + ifeq ($(OS_ARCH), FreeBSD) + CFLAGS += -I/usr/local/include +@@ -35,12 +35,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-8/flashrom.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- flashrom.spec 6 Jun 2008 12:04:50 -0000 1.9 +++ flashrom.spec 7 Jul 2008 17:42:08 -0000 1.10 @@ -1,12 +1,12 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.10.20080517svn3332%{?dist} +Release: 0.11.20080607svn3418%{?dist} License: GPLv2+ Group: Applications/System -# svn -r 3332 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-3332.tar.bz2 flashrom -Source0: flashrom-3332.tar.bz2 +# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom +# tar -cjvf flashrom-3418.tar.bz2 flashrom +Source0: flashrom-3418.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel @@ -26,7 +26,7 @@ %build # currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3332\"' -DDISABLE_DOC" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -44,6 +44,19 @@ %{_mandir}/man8/%{name}.* %changelog +* Sun Jul 6 2008 Peter Lemenkov 0-0.11.20080607svn3418 +- AMIC A29002 +- flashing system with Nvidia MCP67 +- PCI IDs for EPIA-CN +- VIA SPI controller on VT8237S +- ICH7 SPI support +- support for AMIC Technology A49LF040A +- Board enable and autodetection for GIGABYTE GA-7VT600 +- Add support for Amic Technology A29040B flash chip +- Board enable and autodetection for BioStar P4M80-M4 +- Add support for the ASUS P4B266 board +- Add support for Amic A25L40P SPI flash + * Fri Jun 6 2008 Peter Lemenkov 0-0.10.20080517svn3332 - Exclude sparc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/flashrom/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 May 2008 19:40:14 -0000 1.8 +++ sources 7 Jul 2008 17:42:08 -0000 1.9 @@ -1 +1 @@ -b41566714bbb93b382836451c06c6e9f flashrom-3332.tar.bz2 +9e5ab291f764f2c54748f5e1bde48dc1 flashrom-3418.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 17:46:52 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Mon, 7 Jul 2008 17:46:52 GMT Subject: rpms/flashrom/EL-5 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 flashrom--Makefile_cleanup.diff, 1.3, 1.4 flashrom.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200807071746.m67Hkqms011164@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/flashrom/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11102/EL-5 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec sources Added Files: import.log Log Message: svn ver. 3418 --- NEW FILE import.log --- flashrom-0-0_11_20080607svn3418_fc8:EL-5:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452702 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 May 2008 19:43:39 -0000 1.8 +++ .cvsignore 7 Jul 2008 17:46:03 -0000 1.9 @@ -1 +1 @@ -flashrom-3332.tar.bz2 +flashrom-3418.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-5/flashrom--Makefile_cleanup.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flashrom--Makefile_cleanup.diff 17 May 2008 19:43:39 -0000 1.3 +++ flashrom--Makefile_cleanup.diff 7 Jul 2008 17:46:03 -0000 1.4 @@ -1,5 +1,5 @@ ---- Makefile.Makefile_cleanup 2008-05-17 05:08:58.000000000 +0400 -+++ Makefile 2008-05-17 23:33:17.000000000 +0400 +--- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 ++++ Makefile 2008-07-07 21:31:20.000000000 +0400 @@ -9,15 +9,15 @@ CC = gcc STRIP = strip @@ -7,8 +7,8 @@ -PREFIX = /usr/local +PREFIX = /usr #CFLAGS = -O2 -g -Wall -Werror --CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 -+#CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 +-CFLAGS = -Os -Wall -Werror # -DTS5300 ++#CFLAGS = -Os -Wall -Werror # -DTS5300 OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), SunOS) LDFLAGS = -lpci -lz @@ -17,9 +17,9 @@ -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - - OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \ -@@ -31,12 +31,11 @@ + ifeq ($(OS_ARCH), FreeBSD) + CFLAGS += -I/usr/local/include +@@ -35,12 +35,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-5/flashrom.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- flashrom.spec 6 Jun 2008 12:04:10 -0000 1.9 +++ flashrom.spec 7 Jul 2008 17:46:03 -0000 1.10 @@ -1,12 +1,12 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.10.20080517svn3332%{?dist} +Release: 0.11.20080607svn3418%{?dist} License: GPLv2+ Group: Applications/System -# svn -r 3332 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-3332.tar.bz2 flashrom -Source0: flashrom-3332.tar.bz2 +# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom +# tar -cjvf flashrom-3418.tar.bz2 flashrom +Source0: flashrom-3418.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel @@ -26,7 +26,7 @@ %build # currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3332\"' -DDISABLE_DOC" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -44,6 +44,19 @@ %{_mandir}/man8/%{name}.* %changelog +* Sun Jul 6 2008 Peter Lemenkov 0-0.11.20080607svn3418 +- AMIC A29002 +- flashing system with Nvidia MCP67 +- PCI IDs for EPIA-CN +- VIA SPI controller on VT8237S +- ICH7 SPI support +- support for AMIC Technology A49LF040A +- Board enable and autodetection for GIGABYTE GA-7VT600 +- Add support for Amic Technology A29040B flash chip +- Board enable and autodetection for BioStar P4M80-M4 +- Add support for the ASUS P4B266 board +- Add support for Amic A25L40P SPI flash + * Fri Jun 6 2008 Peter Lemenkov 0-0.10.20080517svn3332 - Exclude sparc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 May 2008 19:43:39 -0000 1.8 +++ sources 7 Jul 2008 17:46:03 -0000 1.9 @@ -1 +1 @@ -b41566714bbb93b382836451c06c6e9f flashrom-3332.tar.bz2 +9e5ab291f764f2c54748f5e1bde48dc1 flashrom-3418.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 17:47:33 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Mon, 7 Jul 2008 17:47:33 GMT Subject: rpms/hamlib/F-9 hamlib.spec,1.36,1.37 Message-ID: <200807071747.m67HlXpu011262@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/hamlib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114 Modified Files: hamlib.spec Log Message: Applied Paul Howarth's patch to the spec file Index: hamlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/hamlib/F-9/hamlib.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- hamlib.spec 7 Jul 2008 16:58:07 -0000 1.36 +++ hamlib.spec 7 Jul 2008 17:46:31 -0000 1.37 @@ -2,7 +2,7 @@ Name: hamlib Version: 1.2.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Run-time library to control radio transceivers and receivers Group: System Environment/Libraries @@ -68,6 +68,7 @@ Summary: Hamlib radio control library Perl binding Group: Development/Libraries Requires: hamlib = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Hamlib PERL Language bindings to allow radio control from PERL scripts. @@ -100,6 +101,9 @@ --with-python-binding \ --with-perl-binding +# Avoid RPATHs on x86_64 +sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="%{_lib} %{_libdir}|' libtool + # Build libs, drivers, and programs, won't build with smpflags make # Build Documentation @@ -111,7 +115,7 @@ #install documentation mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html for f in `ls doc/html/` - do install -m 0644 doc/html/$f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/$f + do install -m 0644 doc/html/$f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/$f done rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la @@ -169,6 +173,7 @@ %{_libdir}/pkgconfig/hamlib.pc %files doc +%defattr(-, root, root) %doc %{_docdir}/%{name} %files c++ @@ -186,7 +191,8 @@ %files perl %defattr(-, root, root) %doc COPYING.LIB -%{perl_vendorarch}/* +%{perl_vendorarch}/auto/Hamlib/ +%{perl_vendorarch}/Hamlib.pm %files python %defattr(-, root, root) @@ -199,6 +205,9 @@ %{_libdir}/hamlibtcl* %changelog +* Mon Jul 7 2008 Steve Conklin - 1.2.7-3 +- Applied suggested patch from Paul Howarth (thanks) + * Mon Jul 7 2008 Steve Conklin - 1.2.7-2 - Rebuild to satisfy Perl dependency, add dependency From fedora-extras-commits at redhat.com Mon Jul 7 17:49:07 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Mon, 7 Jul 2008 17:49:07 GMT Subject: rpms/flashrom/EL-4 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 flashrom--Makefile_cleanup.diff, 1.3, 1.4 flashrom.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200807071749.m67Hn7X7011372@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/flashrom/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11281/EL-4 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec sources Added Files: import.log Log Message: svn ver. 3418 --- NEW FILE import.log --- flashrom-0-0_11_20080607svn3418_fc8:EL-4:flashrom-0-0.11.20080607svn3418.fc8.src.rpm:1215452840 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 May 2008 19:46:02 -0000 1.8 +++ .cvsignore 7 Jul 2008 17:48:02 -0000 1.9 @@ -1 +1 @@ -flashrom-3332.tar.bz2 +flashrom-3418.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-4/flashrom--Makefile_cleanup.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flashrom--Makefile_cleanup.diff 17 May 2008 19:46:02 -0000 1.3 +++ flashrom--Makefile_cleanup.diff 7 Jul 2008 17:48:02 -0000 1.4 @@ -1,5 +1,5 @@ ---- Makefile.Makefile_cleanup 2008-05-17 05:08:58.000000000 +0400 -+++ Makefile 2008-05-17 23:33:17.000000000 +0400 +--- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 ++++ Makefile 2008-07-07 21:31:20.000000000 +0400 @@ -9,15 +9,15 @@ CC = gcc STRIP = strip @@ -7,8 +7,8 @@ -PREFIX = /usr/local +PREFIX = /usr #CFLAGS = -O2 -g -Wall -Werror --CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 -+#CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 +-CFLAGS = -Os -Wall -Werror # -DTS5300 ++#CFLAGS = -Os -Wall -Werror # -DTS5300 OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), SunOS) LDFLAGS = -lpci -lz @@ -17,9 +17,9 @@ -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - - OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \ -@@ -31,12 +31,11 @@ + ifeq ($(OS_ARCH), FreeBSD) + CFLAGS += -I/usr/local/include +@@ -35,12 +35,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-4/flashrom.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- flashrom.spec 6 Jun 2008 12:03:47 -0000 1.9 +++ flashrom.spec 7 Jul 2008 17:48:02 -0000 1.10 @@ -1,12 +1,12 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.10.20080517svn3332%{?dist} +Release: 0.11.20080607svn3418%{?dist} License: GPLv2+ Group: Applications/System -# svn -r 3332 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom -# tar -cjvf flashrom-3332.tar.bz2 flashrom -Source0: flashrom-3332.tar.bz2 +# svn -r 3418 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom +# tar -cjvf flashrom-3418.tar.bz2 flashrom +Source0: flashrom-3418.tar.bz2 Patch0: flashrom--Makefile_cleanup.diff URL: http://linuxbios.org/Flashrom BuildRequires: pciutils-devel @@ -26,7 +26,7 @@ %build # currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3332\"' -DDISABLE_DOC" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3418\"'" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -44,6 +44,19 @@ %{_mandir}/man8/%{name}.* %changelog +* Sun Jul 6 2008 Peter Lemenkov 0-0.11.20080607svn3418 +- AMIC A29002 +- flashing system with Nvidia MCP67 +- PCI IDs for EPIA-CN +- VIA SPI controller on VT8237S +- ICH7 SPI support +- support for AMIC Technology A49LF040A +- Board enable and autodetection for GIGABYTE GA-7VT600 +- Add support for Amic Technology A29040B flash chip +- Board enable and autodetection for BioStar P4M80-M4 +- Add support for the ASUS P4B266 board +- Add support for Amic A25L40P SPI flash + * Fri Jun 6 2008 Peter Lemenkov 0-0.10.20080517svn3332 - Exclude sparc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/flashrom/EL-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 May 2008 19:46:02 -0000 1.8 +++ sources 7 Jul 2008 17:48:02 -0000 1.9 @@ -1 +1 @@ -b41566714bbb93b382836451c06c6e9f flashrom-3332.tar.bz2 +9e5ab291f764f2c54748f5e1bde48dc1 flashrom-3418.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 17:52:42 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Mon, 7 Jul 2008 17:52:42 GMT Subject: rpms/libsepol/devel .cvsignore, 1.138, 1.139 libsepol.spec, 1.184, 1.185 sources, 1.139, 1.140 Message-ID: <200807071752.m67HqgWi011793@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsepol/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11717 Modified Files: .cvsignore libsepol.spec sources Log Message: * Mon Jul 7 2008 Dan Walsh 2.0.32-1 - Upgrade to latest from NSA * Allow require then declare in the source policy from Joshua Brindle. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- .cvsignore 22 Jun 2008 13:52:55 -0000 1.138 +++ .cvsignore 7 Jul 2008 17:51:57 -0000 1.139 @@ -138,3 +138,4 @@ libsepol-2.0.29.tgz libsepol-2.0.30.tgz libsepol-2.0.31.tgz +libsepol-2.0.32.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- libsepol.spec 22 Jun 2008 13:52:55 -0000 1.184 +++ libsepol.spec 7 Jul 2008 17:51:57 -0000 1.185 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 2.0.31 +Version: 2.0.32 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -96,6 +96,10 @@ /%{_lib}/libsepol.so.1 %changelog +* Mon Jul 7 2008 Dan Walsh 2.0.32-1 +- Upgrade to latest from NSA + * Allow require then declare in the source policy from Joshua Brindle. + * Sun Jun 22 2008 Dan Walsh 2.0.31-1 - Upgrade to latest from NSA * Fix mls_semantic_level_expand() to handle a user require w/o MLS information from Stephen Smalley. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/sources,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- sources 22 Jun 2008 13:52:55 -0000 1.139 +++ sources 7 Jul 2008 17:51:57 -0000 1.140 @@ -1 +1 @@ -eb3205a8938fb2c3ad47128a6c5a045c libsepol-2.0.31.tgz +945f2f972096e3c19297ee655c9f3f9c libsepol-2.0.32.tgz From fedora-extras-commits at redhat.com Mon Jul 7 17:52:49 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 7 Jul 2008 17:52:49 GMT Subject: rpms/cairo-dock/devel cairo-dock.spec,1.53,1.54 Message-ID: <200807071752.m67HqnQp011812@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11719 Modified Files: cairo-dock.spec Log Message: switcher is not really for unified plugin build Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- cairo-dock.spec 7 Jul 2008 17:02:51 -0000 1.53 +++ cairo-dock.spec 7 Jul 2008 17:51:56 -0000 1.54 @@ -195,6 +195,8 @@ %endif # temporary fix +# switcher is not ready +sed -i.dir -e '/switcher/d' Makefile.am # First deal with subdirs in topdir configure.ac, then else Subdirs_1=$(%{__sed} -n '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2) From fedora-extras-commits at redhat.com Mon Jul 7 17:55:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:55:07 GMT Subject: rpms/geda-examples/F-9 geda-examples.spec,1.10,1.11 Message-ID: <200807071755.m67Ht7UD012159@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/geda-examples/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11987/F-9 Modified Files: geda-examples.spec Log Message: fix conditional comparison Index: geda-examples.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-examples/F-9/geda-examples.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- geda-examples.spec 2 Feb 2008 19:18:44 -0000 1.10 +++ geda-examples.spec 7 Jul 2008 17:54:14 -0000 1.11 @@ -3,7 +3,7 @@ Name: geda-examples Version: 20080127 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Circuit examples for gEDA Group: Applications/Engineering @@ -15,7 +15,7 @@ Requires: geda-gschem -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl-libs %endif @@ -74,6 +74,9 @@ %{gedadocdir}/examples/README %Changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 20080127-2 +- fix conditional comparison + * Sat Feb 02 2008 Chitlesh Goorah - 20080127-1 - New upstream release From fedora-extras-commits at redhat.com Mon Jul 7 17:55:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:55:14 GMT Subject: rpms/geda-examples/F-8 geda-examples.spec,1.10,1.11 Message-ID: <200807071755.m67HtEp4012172@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/geda-examples/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11987/F-8 Modified Files: geda-examples.spec Log Message: fix conditional comparison Index: geda-examples.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-examples/F-8/geda-examples.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- geda-examples.spec 3 Feb 2008 10:38:26 -0000 1.10 +++ geda-examples.spec 7 Jul 2008 17:53:50 -0000 1.11 @@ -3,7 +3,7 @@ Name: geda-examples Version: 20080127 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Circuit examples for gEDA Group: Applications/Engineering @@ -15,7 +15,7 @@ Requires: geda-gschem -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl-libs %endif @@ -74,6 +74,9 @@ %{gedadocdir}/examples/README %Changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 20080127-2 +- fix conditional comparison + * Sat Feb 02 2008 Chitlesh Goorah - 20080127-1 - New upstream release From fedora-extras-commits at redhat.com Mon Jul 7 17:55:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:55:27 GMT Subject: rpms/geda-examples/devel geda-examples.spec,1.10,1.11 Message-ID: <200807071755.m67HtRX3012238@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/geda-examples/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11987/devel Modified Files: geda-examples.spec Log Message: fix conditional comparison Index: geda-examples.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-examples/devel/geda-examples.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- geda-examples.spec 2 Feb 2008 19:18:44 -0000 1.10 +++ geda-examples.spec 7 Jul 2008 17:54:37 -0000 1.11 @@ -3,7 +3,7 @@ Name: geda-examples Version: 20080127 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Circuit examples for gEDA Group: Applications/Engineering @@ -15,7 +15,7 @@ Requires: geda-gschem -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl-libs %endif @@ -74,6 +74,9 @@ %{gedadocdir}/examples/README %Changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 20080127-2 +- fix conditional comparison + * Sat Feb 02 2008 Chitlesh Goorah - 20080127-1 - New upstream release From fedora-extras-commits at redhat.com Mon Jul 7 17:56:13 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Mon, 7 Jul 2008 17:56:13 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.189, 1.190 selinux-policy.spec, 1.694, 1.695 Message-ID: <200807071756.m67HuDSe012429@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Mon Jul 7 2008 Dan Walsh 3.3.1-77 - Allow amanda to read tape - Allow prewikka cgi to use syslog, allow audisp_t to signal cgi - Add support for netware file systems policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- policy-20071130.patch 4 Jul 2008 12:30:50 -0000 1.189 +++ policy-20071130.patch 7 Jul 2008 17:55:17 -0000 1.190 @@ -1456,7 +1456,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.3.1/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/amanda.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/admin/amanda.te 2008-07-07 11:14:55.000000000 -0400 @@ -82,8 +82,9 @@ allow amanda_t amanda_config_t:file { getattr read }; @@ -1478,7 +1478,16 @@ manage_dirs_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) manage_files_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) -@@ -220,6 +221,7 @@ +@@ -146,6 +147,8 @@ + fs_list_all(amanda_t) + + storage_raw_read_fixed_disk(amanda_t) ++storage_read_tape(amanda_t) ++storage_write_tape(amanda_t) + + # Added for targeted policy + term_use_unallocated_ttys(amanda_t) +@@ -220,6 +223,7 @@ auth_use_nsswitch(amanda_recover_t) fstools_domtrans(amanda_t) @@ -8863,7 +8872,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.3.1/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.te 2008-07-07 12:19:17.000000000 -0400 @@ -21,10 +21,11 @@ # Use xattrs for the following filesystem types. @@ -8909,12 +8918,13 @@ # # iso9660_t is the type for CD filesystems -@@ -231,6 +243,9 @@ +@@ -231,6 +243,10 @@ genfscon hfs / gen_context(system_u:object_r:nfs_t,s0) genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0) +genfscon lustre / gen_context(system_u:object_r:nfs_t,s0) +genfscon panfs / gen_context(system_u:object_r:nfs_t,s0) ++genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0) + ######################################## @@ -21511,8 +21521,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.3.1/policy/modules/services/prelude.te --- nsaserefpolicy/policy/modules/services/prelude.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/prelude.te 2008-07-02 08:47:10.000000000 -0400 -@@ -0,0 +1,249 @@ ++++ serefpolicy-3.3.1/policy/modules/services/prelude.te 2008-07-07 11:27:35.000000000 -0400 +@@ -0,0 +1,251 @@ + +policy_module(prelude, 1.0.0) + @@ -21753,6 +21763,8 @@ + + can_exec(httpd_prewikka_script_t, httpd_prewikka_script_exec_t) + ++ logging_send_syslog_msg(httpd_prewikka_script_t) ++ + optional_policy(` + mysql_search_db(httpd_prewikka_script_t) + mysql_stream_connect(httpd_prewikka_script_t) @@ -30860,7 +30872,7 @@ +/var/cfengine/outputs(/.*)? gen_context(system_u:object_r:var_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.3.1/policy/modules/system/logging.if --- nsaserefpolicy/policy/modules/system/logging.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/logging.if 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/logging.if 2008-07-07 11:26:21.000000000 -0400 @@ -213,12 +213,7 @@ ## # @@ -30956,7 +30968,7 @@ ') ######################################## -@@ -804,3 +838,128 @@ +@@ -804,3 +838,129 @@ logging_admin_audit($1, $2, $3) logging_admin_syslog($1, $2, $3) ') @@ -31062,6 +31074,7 @@ + role system_r types $1; + + domtrans_pattern(audisp_t,$2,$1) ++ allow $1 audisp_t:process signal; + + allow audisp_t $2:file getattr; + allow $1 audisp_t:unix_stream_socket rw_socket_perms; Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.694 retrieving revision 1.695 diff -u -r1.694 -r1.695 --- selinux-policy.spec 3 Jul 2008 20:15:27 -0000 1.694 +++ selinux-policy.spec 7 Jul 2008 17:55:17 -0000 1.695 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 76%{?dist} +Release: 77%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -385,6 +385,11 @@ %endif %changelog +* Mon Jul 7 2008 Dan Walsh 3.3.1-77 +- Allow amanda to read tape +- Allow prewikka cgi to use syslog, allow audisp_t to signal cgi +- Add support for netware file systems + * Thu Jul 3 2008 Dan Walsh 3.3.1-76 - Allow ypbind apps to net_bind_service From fedora-extras-commits at redhat.com Mon Jul 7 17:56:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:56:31 GMT Subject: rpms/geda-utils/F-9 geda-utils.spec,1.11,1.12 Message-ID: <200807071756.m67HuVHZ012498@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/geda-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12194/F-9 Modified Files: geda-utils.spec Log Message: fix conditional comparison Index: geda-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-utils/F-9/geda-utils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- geda-utils.spec 2 Feb 2008 19:01:03 -0000 1.11 +++ geda-utils.spec 7 Jul 2008 17:55:39 -0000 1.12 @@ -2,7 +2,7 @@ Name: geda-utils Version: 20080127 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Several utilities for the gEDA project Group: Applications/Engineering @@ -16,7 +16,7 @@ BuildRequires: libgeda-devel gawk Requires: geda-symbols -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl-libs %endif @@ -79,6 +79,9 @@ %{_docdir}/gEDA/readmes/README* %Changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 20080127-2 +- fix conditional comparison + * Tue Feb 01 2008 Chitlesh Goorah - 20080127-1 - New upstream release From fedora-extras-commits at redhat.com Mon Jul 7 17:56:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:56:39 GMT Subject: rpms/geda-utils/F-8 geda-utils.spec,1.11,1.12 Message-ID: <200807071756.m67Hudgs012504@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/geda-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12194/F-8 Modified Files: geda-utils.spec Log Message: fix conditional comparison Index: geda-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-utils/F-8/geda-utils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- geda-utils.spec 3 Feb 2008 10:28:52 -0000 1.11 +++ geda-utils.spec 7 Jul 2008 17:55:23 -0000 1.12 @@ -2,7 +2,7 @@ Name: geda-utils Version: 20080127 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Several utilities for the gEDA project Group: Applications/Engineering @@ -16,7 +16,7 @@ BuildRequires: libgeda-devel gawk Requires: geda-symbols -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl-libs %endif @@ -79,6 +79,9 @@ %{_docdir}/gEDA/readmes/README* %Changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 20080127-2 +- fix conditional comparison + * Tue Feb 01 2008 Chitlesh Goorah - 20080127-1 - New upstream release From fedora-extras-commits at redhat.com Mon Jul 7 17:56:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 17:56:47 GMT Subject: rpms/geda-utils/devel geda-utils.spec,1.11,1.12 Message-ID: <200807071756.m67Hulcw012523@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/geda-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12194/devel Modified Files: geda-utils.spec Log Message: fix conditional comparison Index: geda-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-utils/devel/geda-utils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- geda-utils.spec 2 Feb 2008 19:01:03 -0000 1.11 +++ geda-utils.spec 7 Jul 2008 17:56:01 -0000 1.12 @@ -2,7 +2,7 @@ Name: geda-utils Version: 20080127 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Several utilities for the gEDA project Group: Applications/Engineering @@ -16,7 +16,7 @@ BuildRequires: libgeda-devel gawk Requires: geda-symbols -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl-libs %endif @@ -79,6 +79,9 @@ %{_docdir}/gEDA/readmes/README* %Changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 20080127-2 +- fix conditional comparison + * Tue Feb 01 2008 Chitlesh Goorah - 20080127-1 - New upstream release From fedora-extras-commits at redhat.com Mon Jul 7 17:57:18 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Mon, 7 Jul 2008 17:57:18 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch, 1.31, 1.32 selinux-policy.spec, 1.680, 1.681 Message-ID: <200807071757.m67HvIYX012571@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12421 Modified Files: policy-20080509.patch selinux-policy.spec Log Message: * Mon Jul 7 2008 Dan Walsh 3.4.2-12 - Allow amanda to read tape - Allow prewikka cgi to use syslog, allow audisp_t to signal cgi - Add support for netware file systems policy-20080509.patch: Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- policy-20080509.patch 4 Jul 2008 12:30:16 -0000 1.31 +++ policy-20080509.patch 7 Jul 2008 17:56:28 -0000 1.32 @@ -284,7 +284,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.4.2/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/admin/amanda.te 2008-07-02 08:47:04.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/admin/amanda.te 2008-07-07 11:14:20.000000000 -0400 @@ -82,8 +82,9 @@ allow amanda_t amanda_config_t:file { getattr read }; @@ -297,7 +297,16 @@ # access to amanda_dumpdates_t allow amanda_t amanda_dumpdates_t:file { getattr lock read write }; -@@ -220,6 +221,7 @@ +@@ -146,6 +147,8 @@ + fs_list_all(amanda_t) + + storage_raw_read_fixed_disk(amanda_t) ++storage_read_tape(amanda_t) ++storage_write_tape(amanda_t) + + # Added for targeted policy + term_use_unallocated_ttys(amanda_t) +@@ -220,6 +223,7 @@ auth_use_nsswitch(amanda_recover_t) fstools_domtrans(amanda_t) @@ -1460,7 +1469,7 @@ ####################################### diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.4.2/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/admin/sudo.if 2008-07-02 08:47:04.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/admin/sudo.if 2008-07-07 11:49:07.000000000 -0400 @@ -55,7 +55,7 @@ # @@ -1510,7 +1519,7 @@ domain_use_interactive_fds($1_sudo_t) domain_sigchld_interactive_fds($1_sudo_t) -@@ -106,32 +108,49 @@ +@@ -106,32 +108,50 @@ files_getattr_usr_files($1_sudo_t) # for some PAM modules and for cwd files_dontaudit_search_home($1_sudo_t) @@ -1549,6 +1558,7 @@ # for some PAM modules and for cwd + sysadm_search_home_content_dirs($1_sudo_t) userdom_dontaudit_search_all_users_home_content($1_sudo_t) ++ userdom_manage_all_users_keys($1_sudo_t) - ifdef(`TODO',` - # for when the network connection is killed @@ -7375,7 +7385,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.4.2/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2008-06-12 23:25:02.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/kernel/filesystem.te 2008-07-02 08:47:04.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/kernel/filesystem.te 2008-07-07 12:19:45.000000000 -0400 @@ -21,7 +21,6 @@ # Use xattrs for the following filesystem types. @@ -7396,6 +7406,14 @@ type eventpollfs_t; fs_type(eventpollfs_t) # change to task SID 20060628 +@@ -241,6 +245,7 @@ + genfscon lustre / gen_context(system_u:object_r:nfs_t,s0) + genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0) + genfscon panfs / gen_context(system_u:object_r:nfs_t,s0) ++genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0) + + ######################################## + # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.4.2/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2008-06-12 23:25:03.000000000 -0400 +++ serefpolicy-3.4.2/policy/modules/kernel/kernel.if 2008-07-02 08:47:04.000000000 -0400 @@ -21376,7 +21394,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.4.2/policy/modules/services/prelude.te --- nsaserefpolicy/policy/modules/services/prelude.te 2008-06-12 23:25:06.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/services/prelude.te 2008-07-02 08:47:04.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/services/prelude.te 2008-07-07 11:27:54.000000000 -0400 @@ -19,12 +19,31 @@ type prelude_var_lib_t; files_type(prelude_var_lib_t) @@ -21520,12 +21538,14 @@ ######################################## # # prewikka_cgi Declarations -@@ -135,6 +234,10 @@ +@@ -135,6 +234,12 @@ apache_content_template(prewikka) files_read_etc_files(httpd_prewikka_script_t) + auth_use_nsswitch(httpd_prewikka_script_t) + ++ logging_send_syslog_msg(httpd_prewikka_script_t) ++ + can_exec(httpd_prewikka_script_t, httpd_prewikka_script_exec_t) + optional_policy(` @@ -28282,7 +28302,7 @@ +/var/cache/coolkey(/.*)? gen_context(system_u:object_r:auth_cache_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.4.2/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/authlogin.if 2008-07-02 08:47:05.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/authlogin.if 2008-07-07 11:48:48.000000000 -0400 @@ -56,10 +56,6 @@ miscfiles_read_localization($1_chkpwd_t) @@ -29779,7 +29799,7 @@ +/var/cfengine/outputs(/.*)? gen_context(system_u:object_r:var_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.4.2/policy/modules/system/logging.if --- nsaserefpolicy/policy/modules/system/logging.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/logging.if 2008-07-02 08:55:06.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/logging.if 2008-07-07 11:43:15.000000000 -0400 @@ -213,12 +213,7 @@ ## # @@ -29884,7 +29904,7 @@ ') ######################################## -@@ -771,6 +803,131 @@ +@@ -771,6 +803,132 @@ ## # interface(`logging_admin',` @@ -29995,6 +30015,7 @@ + role system_r types $1; + + domtrans_pattern(audisp_t,$2,$1) ++ allow $1 audisp_t:process signal; + + allow audisp_t $2:file getattr; + allow $1 audisp_t:unix_stream_socket rw_socket_perms; @@ -33457,7 +33478,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.4.2/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/system/userdomain.if 2008-07-02 08:47:05.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/system/userdomain.if 2008-07-07 11:47:08.000000000 -0400 @@ -28,10 +28,14 @@ class context contains; ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.680 retrieving revision 1.681 diff -u -r1.680 -r1.681 --- selinux-policy.spec 3 Jul 2008 20:14:23 -0000 1.680 +++ selinux-policy.spec 7 Jul 2008 17:56:28 -0000 1.681 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.4.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -375,6 +375,11 @@ %endif %changelog +* Mon Jul 7 2008 Dan Walsh 3.4.2-12 +- Allow amanda to read tape +- Allow prewikka cgi to use syslog, allow audisp_t to signal cgi +- Add support for netware file systems + * Thu Jul 3 2008 Dan Walsh 3.4.2-11 - Allow ypbind apps to net_bind_service From fedora-extras-commits at redhat.com Mon Jul 7 17:58:13 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 7 Jul 2008 17:58:13 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1566,1.1567 Message-ID: <200807071758.m67HwD9T012676@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12559 Modified Files: openoffice.org.spec Log Message: legacy dicts dir is gone now Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1566 retrieving revision 1.1567 diff -u -r1.1566 -r1.1567 --- openoffice.org.spec 7 Jul 2008 14:16:30 -0000 1.1566 +++ openoffice.org.spec 7 Jul 2008 17:57:04 -0000 1.1567 @@ -2349,8 +2349,6 @@ %{basisinstdir}/share/config/symbol %{basisinstdir}/share/config/webcast %{basisinstdir}/share/config/wizard -%dir %{basisinstdir}/share/dict -%dir %{basisinstdir}/share/dict/ooo %dir %{basisinstdir}/share/dtd %{basisinstdir}/share/dtd/officedocument %{basisinstdir}/share/fonts From fedora-extras-commits at redhat.com Mon Jul 7 18:02:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:02:04 GMT Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.17,1.18 Message-ID: <200807071802.m67I24VV019712@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-applet-timer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13072/devel Modified Files: gnome-applet-timer.spec Log Message: fix conditional comparison Index: gnome-applet-timer.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-applet-timer.spec 7 Jul 2008 17:06:01 -0000 1.17 +++ gnome-applet-timer.spec 7 Jul 2008 18:00:46 -0000 1.18 @@ -4,7 +4,7 @@ Name: gnome-applet-timer Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A countdown timer applet for the GNOME panel Group: User Interface/Desktops @@ -43,7 +43,7 @@ %setup -q -n timer-applet-%{version} %build -%if %{?fedora} > 6 +%if 0%{?fedora} > 6 export CPPFLAGS="${CPPFLAGS} -I/usr/include/libxml2" %endif @@ -97,6 +97,9 @@ %{python_sitelib}/timerapplet/ %changelog +* Mon Jul 07 2008 Tom "spot" Callaway 2.0.1-4 +- use proper conditional + * Mon Jul 07 2008 Adam Jackson 2.0.1-3 - %%fedora is an int, not a string. From fedora-extras-commits at redhat.com Mon Jul 7 18:02:23 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 7 Jul 2008 18:02:23 GMT Subject: rpms/bitlbee/EL-5 bitlbee-1.2.1-gaccess.patch, NONE, 1.1 bitlbee-1.2.1-libresolv.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bitlbee.spec, 1.4, 1.5 sources, 1.4, 1.5 bitlbee-1.2-gmalloc.patch, 1.1, NONE Message-ID: <200807071802.m67I2NmM019795@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/bitlbee/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12872/EL-5 Modified Files: .cvsignore bitlbee.spec sources Added Files: bitlbee-1.2.1-gaccess.patch bitlbee-1.2.1-libresolv.patch Removed Files: bitlbee-1.2-gmalloc.patch Log Message: Upgrade to 1.2.1 (thanks to Mat??j Cepl) bitlbee-1.2.1-gaccess.patch: --- NEW FILE bitlbee-1.2.1-gaccess.patch --- BitlBee 1.2.1 doesn't compile on Red Hat Enterprise Linux 4 and systems based on it. Build fails with messages 'glib/gstdio.h: No such file or directory', 'storage_xml.c:248: warning: implicit declaration of function `g_access' or similar. Not fully fixed at upstream (devel), yet. Newer releases of BitlBee hopefully won't need this patch any longer, it's proposed anyway to upstream. Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/429 --- bitlbee-1.2.1/storage_xml.c 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/storage_xml.c.gaccess 2008-07-06 17:06:31.000000000 +0200 @@ -28,7 +28,17 @@ #include "base64.h" #include "arc.h" #include "md5.h" + +#if GLIB_CHECK_VERSION(2,8,0) #include +#else +/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */ +#define g_access access + +#ifndef F_OK +#define F_OK 0 +#endif +#endif typedef enum { @@ -243,9 +253,10 @@ static void xml_init( void ) { - if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) ) + if( g_access( global.conf->configdir, F_OK ) != 0 ) log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir ); - else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 ) + else if( g_access( global.conf->configdir, F_OK ) != 0 || + g_access( global.conf->configdir, W_OK ) != 0 ) log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir ); } @@ -372,7 +383,7 @@ g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" ); g_free( path2 ); - if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) ) + if( !overwrite && g_access( path, F_OK ) == 0 ) return STORAGE_ALREADY_EXISTS; strcat( path, "~" ); bitlbee-1.2.1-libresolv.patch: --- NEW FILE bitlbee-1.2.1-libresolv.patch --- Patch by Robert Scheck , based on a patch by Mat??j Cepl for bitlbee >= 1.2, to avoid static linking to a private glibc function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package. Unfortunately, this patch gets not accepted by upstream, as they're fine with the static linking. The former try with libbind has the problem, that it breaks, once the file transfer patch is added, because of libbind apparently all symbols which are synonyms between glibc and libbind came from libbind, which made some nasty surprises when e.g. getaddrinfo from libbind returned different error codes than getaddrinfo from glibc. A few more information and details regarding are mentioned in Red Hat Bugzilla ID #439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047 --- bitlbee-1.2.1/configure 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/configure.libresolv 2008-06-28 17:24:15.000000000 +0200 @@ -340,10 +344,10 @@ echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings -for i in /lib /usr/lib /usr/local/lib; do - if [ -f $i/libresolv.a ]; then +for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do + if [ -f $i/libresolv.so ]; then echo '#define HAVE_RESOLV_A' >> config.h - echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings + echo 'EFLAGS+=-lresolv' >> Makefile.settings break fi done --- bitlbee-1.2.1/lib/Makefile 2008-03-02 18:10:16.000000000 +0100 +++ bitlbee-1.2.1/lib/Makefile.libresolv 2008-06-28 17:24:51.000000000 +0200 @@ -9,7 +9,7 @@ -include ../Makefile.settings # [SH] Program variables -objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o +objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o CFLAGS += -Wall LFLAGS += -r --- bitlbee-1.2.1/lib/misc.c 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.c.libresolv 2008-06-28 17:25:44.000000000 +0200 @@ -43,6 +43,7 @@ #ifdef HAVE_RESOLV_A #include #include +#include #endif #include "ssl_client.h" @@ -465,58 +466,6 @@ return 0; } -struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain ) -{ - struct ns_srv_reply *reply = NULL; -#ifdef HAVE_RESOLV_A - char name[1024]; - unsigned char querybuf[1024]; - const unsigned char *buf; - ns_msg nsh; - ns_rr rr; - int i, len, size; - - g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain ); - - if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 ) - return NULL; - - if( ns_initparse( querybuf, size, &nsh ) != 0 ) - return NULL; - - if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 ) - return NULL; - - size = ns_rr_rdlen( rr ); - buf = ns_rr_rdata( rr ); - - len = 0; - for( i = 6; i < size && buf[i]; i += buf[i] + 1 ) - len += buf[i] + 1; - - if( i > size ) - return NULL; - - reply = g_malloc( sizeof( struct ns_srv_reply ) + len ); - memcpy( reply->name, buf + 7, len ); - - for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 ) - reply->name[i] = '.'; - - if( i > len ) - { - g_free( reply ); - return NULL; - } - - reply->prio = ( buf[0] << 8 ) | buf[1]; - reply->weight = ( buf[2] << 8 ) | buf[3]; - reply->port = ( buf[4] << 8 ) | buf[5]; -#endif - - return reply; -} - /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */ char *word_wrap( char *msg, int line_len ) { --- bitlbee-1.2.1/lib/misc.h 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.h.libresolv 2008-06-28 17:26:24.000000000 +0200 @@ -28,14 +28,7 @@ #include #include - -struct ns_srv_reply -{ - int prio; - int weight; - int port; - char name[]; -}; +#include "srv.h" G_MODULE_EXPORT void strip_linefeed( gchar *text ); G_MODULE_EXPORT char *add_cr( char *text ); --- bitlbee-1.2.1/lib/srv.c 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.c.libresolv 2008-06-28 17:28:45.000000000 +0200 @@ -0,0 +1,237 @@ +/* srv.c - DNS SRV code + * Copyright (C) 2003 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#undef TEST + +#ifdef TEST +#define HAVE_RESOLV_A +#endif + +#include +#include + +#include +#include +#include +#include + +#include "srv.h" +#include +#include +#include + +/* Not every installation has gotten around to supporting SRVs + yet...*/ +#ifndef T_SRV +#define T_SRV 33 +#endif + +static int priosort(const void *a, const void *b) { + const struct ns_srv_reply *sa=a, *sb=b; + if (sa->prio>sb->prio) + return 1; + else if (sa->prioprio) + return -1; + else + return 0; +} + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) { + struct ns_srv_reply *reply = NULL; + struct ns_srv_reply *list; + char name[1024]; +#ifdef HAVE_RESOLV_A + unsigned char answer[PACKETSZ]; + int r, srvcount=0; + unsigned char *pt, *emsg; + int count, dlen; + + list = NULL; + + g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain); + + _res.options |= RES_DEBUG; + + if ( res_init() != 0 ) + return NULL; + + r=res_query(name, C_IN, T_SRV, answer, PACKETSZ); + + if (rPACKETSZ) + return NULL; + + if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) { + int i, rc; + + emsg=&answer[r]; /* end of message ??? */ + pt=&answer[sizeof(HEADER)]; + + /* Skip over the query */ + rc=dn_skipname(pt, emsg); + if (rc==-1) + goto fail; + + pt+=rc+QFIXEDSZ; + + while (count-->0 && ptprio=*pt++ << 8; + srv->prio|=*pt++; + srv->weight=*pt++ << 8; + srv->weight|=*pt++; + srv->port=*pt++ << 8; + srv->port|=*pt++; + + /* Get the name. 2782 doesn't allow name compression, but + dn_expand still works to pull the name out of the + packet. */ + rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME); + if (rc==1 && srv->name[0]==0) /* "." */ + goto noanswer; + if (rc==-1) + goto fail; + pt+=rc; + /* Corrupt packet? */ + if (dlen!=rc+6) + goto fail; + } + + /* Now we have an array of all the srv records. */ + + /* Order by priority */ + qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort); + + /* For each priority, move the zero-weighted items first. */ + for (i=0; iprio); + printf("weight=%hu\n", srv->weight); + printf("port=%hu\n", srv->port); + printf("target=%s\n", srv->name); + printf("\n"); + g_free(srv); + + return 0; +} +#endif /* TEST */ --- bitlbee-1.2.1/lib/srv.h 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.h.libresolv 2008-06-28 17:29:39.000000000 +0200 @@ -0,0 +1,49 @@ +/* srv.h + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef GNUPG_COMMON_SRV_H +#define GNUPG_COMMON_SRV_H + +#ifdef HAVE_RESOLV_A +# ifdef _WIN32 +# include +# else +# include +# include +# include +# endif /* !_WIN32 */ +#endif /* USE_DNS_SRV */ + + +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + +struct ns_srv_reply +{ + int prio; /* priority */ + int weight; /* weight */ + int port; /* port */ + int run_count; /* from struct srventry at gnupg's common/srv.h */ + char name[MAXDNAME]; /* target */ +}; + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain); + +#endif /*GNUPG_COMMON_SRV_H*/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bitlbee/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Apr 2008 18:04:06 -0000 1.4 +++ .cvsignore 7 Jul 2008 17:59:56 -0000 1.5 @@ -1 +1 @@ -bitlbee-1.2.tar.gz +bitlbee-1.2.1.tar.gz Index: bitlbee.spec =================================================================== RCS file: /cvs/extras/rpms/bitlbee/EL-5/bitlbee.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bitlbee.spec 15 Apr 2008 18:04:06 -0000 1.4 +++ bitlbee.spec 7 Jul 2008 17:59:56 -0000 1.5 @@ -1,17 +1,18 @@ Summary: IRC to other chat networks gateway Name: bitlbee -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons URL: http://www.bitlbee.org/ Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz Source1: bitlbee.xinetd -Patch0: bitlbee-1.2-gmalloc.patch +Patch0: bitlbee-1.2.1-libresolv.patch +Patch1: bitlbee-1.2.1-gaccess.patch Requires: xinetd Requires(pre): shadow-utils Requires(preun): /sbin/service -BuildRequires: glib2-devel >= 2.4, libxslt, %{_includedir}/bind/arpa/nameser.h +BuildRequires: glib2-devel >= 2.4, libxslt %if 0%{?rhl}%{?fedora}%{?rhel} BuildRequires: gnutls-devel %else @@ -26,7 +27,8 @@ %prep %setup -q -%patch0 -p1 -b .gmalloc +%patch0 -p1 -b .libresolv +%patch1 -p1 -b .gaccess perl -pi.make -e ' s|\$\(BINDIR\)|\$(sbindir)|g; @@ -51,7 +53,6 @@ --ssl=openssl %endif -sed -i 's/EFLA.*libres.*/EFLAGS+=-lbind/' Makefile.settings make %{?_smp_mflags} %install @@ -96,6 +97,9 @@ %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name} %changelog +* Mon Jul 07 2008 Robert Scheck 1.2.1-1 +- Upgrade to 1.2.1 (thanks to Mat??j Cepl) + * Tue Apr 15 2008 Robert Scheck 1.2-1 - Upgrade to 1.2 (#439047, thanks to Mat??j Cepl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bitlbee/EL-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Apr 2008 18:04:06 -0000 1.4 +++ sources 7 Jul 2008 17:59:56 -0000 1.5 @@ -1 +1 @@ -15d969391dd9bbbc9bb0d397b545a99c bitlbee-1.2.tar.gz +ca00f65aea89903ba78321eac00f7849 bitlbee-1.2.1.tar.gz --- bitlbee-1.2-gmalloc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 18:02:26 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 7 Jul 2008 18:02:26 GMT Subject: rpms/bitlbee/F-9 bitlbee-1.2.1-gaccess.patch, NONE, 1.1 bitlbee-1.2.1-libresolv.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bitlbee.spec, 1.5, 1.6 sources, 1.4, 1.5 bitlbee-1.2-gmalloc.patch, 1.1, NONE Message-ID: <200807071802.m67I2QNX019805@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/bitlbee/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12872/F-9 Modified Files: .cvsignore bitlbee.spec sources Added Files: bitlbee-1.2.1-gaccess.patch bitlbee-1.2.1-libresolv.patch Removed Files: bitlbee-1.2-gmalloc.patch Log Message: Upgrade to 1.2.1 (thanks to Mat??j Cepl) bitlbee-1.2.1-gaccess.patch: --- NEW FILE bitlbee-1.2.1-gaccess.patch --- BitlBee 1.2.1 doesn't compile on Red Hat Enterprise Linux 4 and systems based on it. Build fails with messages 'glib/gstdio.h: No such file or directory', 'storage_xml.c:248: warning: implicit declaration of function `g_access' or similar. Not fully fixed at upstream (devel), yet. Newer releases of BitlBee hopefully won't need this patch any longer, it's proposed anyway to upstream. Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/429 --- bitlbee-1.2.1/storage_xml.c 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/storage_xml.c.gaccess 2008-07-06 17:06:31.000000000 +0200 @@ -28,7 +28,17 @@ #include "base64.h" #include "arc.h" #include "md5.h" + +#if GLIB_CHECK_VERSION(2,8,0) #include +#else +/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */ +#define g_access access + +#ifndef F_OK +#define F_OK 0 +#endif +#endif typedef enum { @@ -243,9 +253,10 @@ static void xml_init( void ) { - if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) ) + if( g_access( global.conf->configdir, F_OK ) != 0 ) log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir ); - else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 ) + else if( g_access( global.conf->configdir, F_OK ) != 0 || + g_access( global.conf->configdir, W_OK ) != 0 ) log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir ); } @@ -372,7 +383,7 @@ g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" ); g_free( path2 ); - if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) ) + if( !overwrite && g_access( path, F_OK ) == 0 ) return STORAGE_ALREADY_EXISTS; strcat( path, "~" ); bitlbee-1.2.1-libresolv.patch: --- NEW FILE bitlbee-1.2.1-libresolv.patch --- Patch by Robert Scheck , based on a patch by Mat??j Cepl for bitlbee >= 1.2, to avoid static linking to a private glibc function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package. Unfortunately, this patch gets not accepted by upstream, as they're fine with the static linking. The former try with libbind has the problem, that it breaks, once the file transfer patch is added, because of libbind apparently all symbols which are synonyms between glibc and libbind came from libbind, which made some nasty surprises when e.g. getaddrinfo from libbind returned different error codes than getaddrinfo from glibc. A few more information and details regarding are mentioned in Red Hat Bugzilla ID #439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047 --- bitlbee-1.2.1/configure 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/configure.libresolv 2008-06-28 17:24:15.000000000 +0200 @@ -340,10 +344,10 @@ echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings -for i in /lib /usr/lib /usr/local/lib; do - if [ -f $i/libresolv.a ]; then +for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do + if [ -f $i/libresolv.so ]; then echo '#define HAVE_RESOLV_A' >> config.h - echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings + echo 'EFLAGS+=-lresolv' >> Makefile.settings break fi done --- bitlbee-1.2.1/lib/Makefile 2008-03-02 18:10:16.000000000 +0100 +++ bitlbee-1.2.1/lib/Makefile.libresolv 2008-06-28 17:24:51.000000000 +0200 @@ -9,7 +9,7 @@ -include ../Makefile.settings # [SH] Program variables -objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o +objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o CFLAGS += -Wall LFLAGS += -r --- bitlbee-1.2.1/lib/misc.c 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.c.libresolv 2008-06-28 17:25:44.000000000 +0200 @@ -43,6 +43,7 @@ #ifdef HAVE_RESOLV_A #include #include +#include #endif #include "ssl_client.h" @@ -465,58 +466,6 @@ return 0; } -struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain ) -{ - struct ns_srv_reply *reply = NULL; -#ifdef HAVE_RESOLV_A - char name[1024]; - unsigned char querybuf[1024]; - const unsigned char *buf; - ns_msg nsh; - ns_rr rr; - int i, len, size; - - g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain ); - - if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 ) - return NULL; - - if( ns_initparse( querybuf, size, &nsh ) != 0 ) - return NULL; - - if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 ) - return NULL; - - size = ns_rr_rdlen( rr ); - buf = ns_rr_rdata( rr ); - - len = 0; - for( i = 6; i < size && buf[i]; i += buf[i] + 1 ) - len += buf[i] + 1; - - if( i > size ) - return NULL; - - reply = g_malloc( sizeof( struct ns_srv_reply ) + len ); - memcpy( reply->name, buf + 7, len ); - - for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 ) - reply->name[i] = '.'; - - if( i > len ) - { - g_free( reply ); - return NULL; - } - - reply->prio = ( buf[0] << 8 ) | buf[1]; - reply->weight = ( buf[2] << 8 ) | buf[3]; - reply->port = ( buf[4] << 8 ) | buf[5]; -#endif - - return reply; -} - /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */ char *word_wrap( char *msg, int line_len ) { --- bitlbee-1.2.1/lib/misc.h 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.h.libresolv 2008-06-28 17:26:24.000000000 +0200 @@ -28,14 +28,7 @@ #include #include - -struct ns_srv_reply -{ - int prio; - int weight; - int port; - char name[]; -}; +#include "srv.h" G_MODULE_EXPORT void strip_linefeed( gchar *text ); G_MODULE_EXPORT char *add_cr( char *text ); --- bitlbee-1.2.1/lib/srv.c 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.c.libresolv 2008-06-28 17:28:45.000000000 +0200 @@ -0,0 +1,237 @@ +/* srv.c - DNS SRV code + * Copyright (C) 2003 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#undef TEST + +#ifdef TEST +#define HAVE_RESOLV_A +#endif + +#include +#include + +#include +#include +#include +#include + +#include "srv.h" +#include +#include +#include + +/* Not every installation has gotten around to supporting SRVs + yet...*/ +#ifndef T_SRV +#define T_SRV 33 +#endif + +static int priosort(const void *a, const void *b) { + const struct ns_srv_reply *sa=a, *sb=b; + if (sa->prio>sb->prio) + return 1; + else if (sa->prioprio) + return -1; + else + return 0; +} + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) { + struct ns_srv_reply *reply = NULL; + struct ns_srv_reply *list; + char name[1024]; +#ifdef HAVE_RESOLV_A + unsigned char answer[PACKETSZ]; + int r, srvcount=0; + unsigned char *pt, *emsg; + int count, dlen; + + list = NULL; + + g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain); + + _res.options |= RES_DEBUG; + + if ( res_init() != 0 ) + return NULL; + + r=res_query(name, C_IN, T_SRV, answer, PACKETSZ); + + if (rPACKETSZ) + return NULL; + + if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) { + int i, rc; + + emsg=&answer[r]; /* end of message ??? */ + pt=&answer[sizeof(HEADER)]; + + /* Skip over the query */ + rc=dn_skipname(pt, emsg); + if (rc==-1) + goto fail; + + pt+=rc+QFIXEDSZ; + + while (count-->0 && ptprio=*pt++ << 8; + srv->prio|=*pt++; + srv->weight=*pt++ << 8; + srv->weight|=*pt++; + srv->port=*pt++ << 8; + srv->port|=*pt++; + + /* Get the name. 2782 doesn't allow name compression, but + dn_expand still works to pull the name out of the + packet. */ + rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME); + if (rc==1 && srv->name[0]==0) /* "." */ + goto noanswer; + if (rc==-1) + goto fail; + pt+=rc; + /* Corrupt packet? */ + if (dlen!=rc+6) + goto fail; + } + + /* Now we have an array of all the srv records. */ + + /* Order by priority */ + qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort); + + /* For each priority, move the zero-weighted items first. */ + for (i=0; iprio); + printf("weight=%hu\n", srv->weight); + printf("port=%hu\n", srv->port); + printf("target=%s\n", srv->name); + printf("\n"); + g_free(srv); + + return 0; +} +#endif /* TEST */ --- bitlbee-1.2.1/lib/srv.h 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.h.libresolv 2008-06-28 17:29:39.000000000 +0200 @@ -0,0 +1,49 @@ +/* srv.h + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef GNUPG_COMMON_SRV_H +#define GNUPG_COMMON_SRV_H + +#ifdef HAVE_RESOLV_A +# ifdef _WIN32 +# include +# else +# include +# include +# include +# endif /* !_WIN32 */ +#endif /* USE_DNS_SRV */ + + +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + +struct ns_srv_reply +{ + int prio; /* priority */ + int weight; /* weight */ + int port; /* port */ + int run_count; /* from struct srventry at gnupg's common/srv.h */ + char name[MAXDNAME]; /* target */ +}; + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain); + +#endif /*GNUPG_COMMON_SRV_H*/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bitlbee/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Apr 2008 18:04:45 -0000 1.4 +++ .cvsignore 7 Jul 2008 18:01:18 -0000 1.5 @@ -1 +1 @@ -bitlbee-1.2.tar.gz +bitlbee-1.2.1.tar.gz Index: bitlbee.spec =================================================================== RCS file: /cvs/extras/rpms/bitlbee/F-9/bitlbee.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bitlbee.spec 15 Apr 2008 18:04:45 -0000 1.5 +++ bitlbee.spec 7 Jul 2008 18:01:18 -0000 1.6 @@ -1,17 +1,18 @@ Summary: IRC to other chat networks gateway Name: bitlbee -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons URL: http://www.bitlbee.org/ Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz Source1: bitlbee.xinetd -Patch0: bitlbee-1.2-gmalloc.patch +Patch0: bitlbee-1.2.1-libresolv.patch +Patch1: bitlbee-1.2.1-gaccess.patch Requires: xinetd Requires(pre): shadow-utils Requires(preun): /sbin/service -BuildRequires: glib2-devel >= 2.4, libxslt, %{_includedir}/bind/arpa/nameser.h +BuildRequires: glib2-devel >= 2.4, libxslt %if 0%{?rhl}%{?fedora}%{?rhel} BuildRequires: gnutls-devel %else @@ -26,7 +27,8 @@ %prep %setup -q -%patch0 -p1 -b .gmalloc +%patch0 -p1 -b .libresolv +%patch1 -p1 -b .gaccess perl -pi.make -e ' s|\$\(BINDIR\)|\$(sbindir)|g; @@ -51,7 +53,6 @@ --ssl=openssl %endif -sed -i 's/EFLA.*libres.*/EFLAGS+=-lbind/' Makefile.settings make %{?_smp_mflags} %install @@ -96,6 +97,9 @@ %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name} %changelog +* Mon Jul 07 2008 Robert Scheck 1.2.1-1 +- Upgrade to 1.2.1 (thanks to Mat??j Cepl) + * Tue Apr 15 2008 Robert Scheck 1.2-1 - Upgrade to 1.2 (#439047, thanks to Mat??j Cepl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bitlbee/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Apr 2008 18:04:45 -0000 1.4 +++ sources 7 Jul 2008 18:01:18 -0000 1.5 @@ -1 +1 @@ -15d969391dd9bbbc9bb0d397b545a99c bitlbee-1.2.tar.gz +ca00f65aea89903ba78321eac00f7849 bitlbee-1.2.1.tar.gz --- bitlbee-1.2-gmalloc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 18:02:26 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 7 Jul 2008 18:02:26 GMT Subject: rpms/bitlbee/EL-4 bitlbee-1.2.1-gaccess.patch, NONE, 1.1 bitlbee-1.2.1-libresolv.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bitlbee.spec, 1.4, 1.5 sources, 1.4, 1.5 bitlbee-1.2-gmalloc.patch, 1.1, NONE Message-ID: <200807071802.m67I2QeD019810@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/bitlbee/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12872/EL-4 Modified Files: .cvsignore bitlbee.spec sources Added Files: bitlbee-1.2.1-gaccess.patch bitlbee-1.2.1-libresolv.patch Removed Files: bitlbee-1.2-gmalloc.patch Log Message: Upgrade to 1.2.1 (thanks to Mat??j Cepl) bitlbee-1.2.1-gaccess.patch: --- NEW FILE bitlbee-1.2.1-gaccess.patch --- BitlBee 1.2.1 doesn't compile on Red Hat Enterprise Linux 4 and systems based on it. Build fails with messages 'glib/gstdio.h: No such file or directory', 'storage_xml.c:248: warning: implicit declaration of function `g_access' or similar. Not fully fixed at upstream (devel), yet. Newer releases of BitlBee hopefully won't need this patch any longer, it's proposed anyway to upstream. Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/429 --- bitlbee-1.2.1/storage_xml.c 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/storage_xml.c.gaccess 2008-07-06 17:06:31.000000000 +0200 @@ -28,7 +28,17 @@ #include "base64.h" #include "arc.h" #include "md5.h" + +#if GLIB_CHECK_VERSION(2,8,0) #include +#else +/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */ +#define g_access access + +#ifndef F_OK +#define F_OK 0 +#endif +#endif typedef enum { @@ -243,9 +253,10 @@ static void xml_init( void ) { - if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) ) + if( g_access( global.conf->configdir, F_OK ) != 0 ) log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir ); - else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 ) + else if( g_access( global.conf->configdir, F_OK ) != 0 || + g_access( global.conf->configdir, W_OK ) != 0 ) log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir ); } @@ -372,7 +383,7 @@ g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" ); g_free( path2 ); - if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) ) + if( !overwrite && g_access( path, F_OK ) == 0 ) return STORAGE_ALREADY_EXISTS; strcat( path, "~" ); bitlbee-1.2.1-libresolv.patch: --- NEW FILE bitlbee-1.2.1-libresolv.patch --- Patch by Robert Scheck , based on a patch by Mat??j Cepl for bitlbee >= 1.2, to avoid static linking to a private glibc function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package. Unfortunately, this patch gets not accepted by upstream, as they're fine with the static linking. The former try with libbind has the problem, that it breaks, once the file transfer patch is added, because of libbind apparently all symbols which are synonyms between glibc and libbind came from libbind, which made some nasty surprises when e.g. getaddrinfo from libbind returned different error codes than getaddrinfo from glibc. A few more information and details regarding are mentioned in Red Hat Bugzilla ID #439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047 --- bitlbee-1.2.1/configure 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/configure.libresolv 2008-06-28 17:24:15.000000000 +0200 @@ -340,10 +344,10 @@ echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings -for i in /lib /usr/lib /usr/local/lib; do - if [ -f $i/libresolv.a ]; then +for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do + if [ -f $i/libresolv.so ]; then echo '#define HAVE_RESOLV_A' >> config.h - echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings + echo 'EFLAGS+=-lresolv' >> Makefile.settings break fi done --- bitlbee-1.2.1/lib/Makefile 2008-03-02 18:10:16.000000000 +0100 +++ bitlbee-1.2.1/lib/Makefile.libresolv 2008-06-28 17:24:51.000000000 +0200 @@ -9,7 +9,7 @@ -include ../Makefile.settings # [SH] Program variables -objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o +objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o CFLAGS += -Wall LFLAGS += -r --- bitlbee-1.2.1/lib/misc.c 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.c.libresolv 2008-06-28 17:25:44.000000000 +0200 @@ -43,6 +43,7 @@ #ifdef HAVE_RESOLV_A #include #include +#include #endif #include "ssl_client.h" @@ -465,58 +466,6 @@ return 0; } -struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain ) -{ - struct ns_srv_reply *reply = NULL; -#ifdef HAVE_RESOLV_A - char name[1024]; - unsigned char querybuf[1024]; - const unsigned char *buf; - ns_msg nsh; - ns_rr rr; - int i, len, size; - - g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain ); - - if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 ) - return NULL; - - if( ns_initparse( querybuf, size, &nsh ) != 0 ) - return NULL; - - if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 ) - return NULL; - - size = ns_rr_rdlen( rr ); - buf = ns_rr_rdata( rr ); - - len = 0; - for( i = 6; i < size && buf[i]; i += buf[i] + 1 ) - len += buf[i] + 1; - - if( i > size ) - return NULL; - - reply = g_malloc( sizeof( struct ns_srv_reply ) + len ); - memcpy( reply->name, buf + 7, len ); - - for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 ) - reply->name[i] = '.'; - - if( i > len ) - { - g_free( reply ); - return NULL; - } - - reply->prio = ( buf[0] << 8 ) | buf[1]; - reply->weight = ( buf[2] << 8 ) | buf[3]; - reply->port = ( buf[4] << 8 ) | buf[5]; -#endif - - return reply; -} - /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */ char *word_wrap( char *msg, int line_len ) { --- bitlbee-1.2.1/lib/misc.h 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.h.libresolv 2008-06-28 17:26:24.000000000 +0200 @@ -28,14 +28,7 @@ #include #include - -struct ns_srv_reply -{ - int prio; - int weight; - int port; - char name[]; -}; +#include "srv.h" G_MODULE_EXPORT void strip_linefeed( gchar *text ); G_MODULE_EXPORT char *add_cr( char *text ); --- bitlbee-1.2.1/lib/srv.c 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.c.libresolv 2008-06-28 17:28:45.000000000 +0200 @@ -0,0 +1,237 @@ +/* srv.c - DNS SRV code + * Copyright (C) 2003 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#undef TEST + +#ifdef TEST +#define HAVE_RESOLV_A +#endif + +#include +#include + +#include +#include +#include +#include + +#include "srv.h" +#include +#include +#include + +/* Not every installation has gotten around to supporting SRVs + yet...*/ +#ifndef T_SRV +#define T_SRV 33 +#endif + +static int priosort(const void *a, const void *b) { + const struct ns_srv_reply *sa=a, *sb=b; + if (sa->prio>sb->prio) + return 1; + else if (sa->prioprio) + return -1; + else + return 0; +} + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) { + struct ns_srv_reply *reply = NULL; + struct ns_srv_reply *list; + char name[1024]; +#ifdef HAVE_RESOLV_A + unsigned char answer[PACKETSZ]; + int r, srvcount=0; + unsigned char *pt, *emsg; + int count, dlen; + + list = NULL; + + g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain); + + _res.options |= RES_DEBUG; + + if ( res_init() != 0 ) + return NULL; + + r=res_query(name, C_IN, T_SRV, answer, PACKETSZ); + + if (rPACKETSZ) + return NULL; + + if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) { + int i, rc; + + emsg=&answer[r]; /* end of message ??? */ + pt=&answer[sizeof(HEADER)]; + + /* Skip over the query */ + rc=dn_skipname(pt, emsg); + if (rc==-1) + goto fail; + + pt+=rc+QFIXEDSZ; + + while (count-->0 && ptprio=*pt++ << 8; + srv->prio|=*pt++; + srv->weight=*pt++ << 8; + srv->weight|=*pt++; + srv->port=*pt++ << 8; + srv->port|=*pt++; + + /* Get the name. 2782 doesn't allow name compression, but + dn_expand still works to pull the name out of the + packet. */ + rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME); + if (rc==1 && srv->name[0]==0) /* "." */ + goto noanswer; + if (rc==-1) + goto fail; + pt+=rc; + /* Corrupt packet? */ + if (dlen!=rc+6) + goto fail; + } + + /* Now we have an array of all the srv records. */ + + /* Order by priority */ + qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort); + + /* For each priority, move the zero-weighted items first. */ + for (i=0; iprio); + printf("weight=%hu\n", srv->weight); + printf("port=%hu\n", srv->port); + printf("target=%s\n", srv->name); + printf("\n"); + g_free(srv); + + return 0; +} +#endif /* TEST */ --- bitlbee-1.2.1/lib/srv.h 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.h.libresolv 2008-06-28 17:29:39.000000000 +0200 @@ -0,0 +1,49 @@ +/* srv.h + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef GNUPG_COMMON_SRV_H +#define GNUPG_COMMON_SRV_H + +#ifdef HAVE_RESOLV_A +# ifdef _WIN32 +# include +# else +# include +# include +# include +# endif /* !_WIN32 */ +#endif /* USE_DNS_SRV */ + + +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + +struct ns_srv_reply +{ + int prio; /* priority */ + int weight; /* weight */ + int port; /* port */ + int run_count; /* from struct srventry at gnupg's common/srv.h */ + char name[MAXDNAME]; /* target */ +}; + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain); + +#endif /*GNUPG_COMMON_SRV_H*/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bitlbee/EL-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Apr 2008 18:03:55 -0000 1.4 +++ .cvsignore 7 Jul 2008 17:59:30 -0000 1.5 @@ -1 +1 @@ -bitlbee-1.2.tar.gz +bitlbee-1.2.1.tar.gz Index: bitlbee.spec =================================================================== RCS file: /cvs/extras/rpms/bitlbee/EL-4/bitlbee.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bitlbee.spec 15 Apr 2008 18:03:55 -0000 1.4 +++ bitlbee.spec 7 Jul 2008 17:59:30 -0000 1.5 @@ -1,17 +1,18 @@ Summary: IRC to other chat networks gateway Name: bitlbee -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons URL: http://www.bitlbee.org/ Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz Source1: bitlbee.xinetd -Patch0: bitlbee-1.2-gmalloc.patch +Patch0: bitlbee-1.2.1-libresolv.patch +Patch1: bitlbee-1.2.1-gaccess.patch Requires: xinetd Requires(pre): shadow-utils Requires(preun): /sbin/service -BuildRequires: glib2-devel >= 2.4, libxslt, %{_includedir}/bind/arpa/nameser.h +BuildRequires: glib2-devel >= 2.4, libxslt %if 0%{?rhl}%{?fedora}%{?rhel} BuildRequires: gnutls-devel %else @@ -26,7 +27,8 @@ %prep %setup -q -%patch0 -p1 -b .gmalloc +%patch0 -p1 -b .libresolv +%patch1 -p1 -b .gaccess perl -pi.make -e ' s|\$\(BINDIR\)|\$(sbindir)|g; @@ -51,7 +53,6 @@ --ssl=openssl %endif -sed -i 's/EFLA.*libres.*/EFLAGS+=-lbind/' Makefile.settings make %{?_smp_mflags} %install @@ -96,6 +97,9 @@ %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name} %changelog +* Mon Jul 07 2008 Robert Scheck 1.2.1-1 +- Upgrade to 1.2.1 (thanks to Mat??j Cepl) + * Tue Apr 15 2008 Robert Scheck 1.2-1 - Upgrade to 1.2 (#439047, thanks to Mat??j Cepl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bitlbee/EL-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Apr 2008 18:03:55 -0000 1.4 +++ sources 7 Jul 2008 17:59:30 -0000 1.5 @@ -1 +1 @@ -15d969391dd9bbbc9bb0d397b545a99c bitlbee-1.2.tar.gz +ca00f65aea89903ba78321eac00f7849 bitlbee-1.2.1.tar.gz --- bitlbee-1.2-gmalloc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 18:02:47 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 7 Jul 2008 18:02:47 GMT Subject: rpms/bitlbee/F-8 bitlbee-1.2.1-gaccess.patch, NONE, 1.1 bitlbee-1.2.1-libresolv.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bitlbee.spec, 1.4, 1.5 sources, 1.4, 1.5 bitlbee-1.2-gmalloc.patch, 1.1, NONE Message-ID: <200807071802.m67I2lh6019868@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/bitlbee/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12872/F-8 Modified Files: .cvsignore bitlbee.spec sources Added Files: bitlbee-1.2.1-gaccess.patch bitlbee-1.2.1-libresolv.patch Removed Files: bitlbee-1.2-gmalloc.patch Log Message: Upgrade to 1.2.1 (thanks to Mat??j Cepl) bitlbee-1.2.1-gaccess.patch: --- NEW FILE bitlbee-1.2.1-gaccess.patch --- BitlBee 1.2.1 doesn't compile on Red Hat Enterprise Linux 4 and systems based on it. Build fails with messages 'glib/gstdio.h: No such file or directory', 'storage_xml.c:248: warning: implicit declaration of function `g_access' or similar. Not fully fixed at upstream (devel), yet. Newer releases of BitlBee hopefully won't need this patch any longer, it's proposed anyway to upstream. Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/429 --- bitlbee-1.2.1/storage_xml.c 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/storage_xml.c.gaccess 2008-07-06 17:06:31.000000000 +0200 @@ -28,7 +28,17 @@ #include "base64.h" #include "arc.h" #include "md5.h" + +#if GLIB_CHECK_VERSION(2,8,0) #include +#else +/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */ +#define g_access access + +#ifndef F_OK +#define F_OK 0 +#endif +#endif typedef enum { @@ -243,9 +253,10 @@ static void xml_init( void ) { - if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) ) + if( g_access( global.conf->configdir, F_OK ) != 0 ) log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir ); - else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 ) + else if( g_access( global.conf->configdir, F_OK ) != 0 || + g_access( global.conf->configdir, W_OK ) != 0 ) log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir ); } @@ -372,7 +383,7 @@ g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" ); g_free( path2 ); - if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) ) + if( !overwrite && g_access( path, F_OK ) == 0 ) return STORAGE_ALREADY_EXISTS; strcat( path, "~" ); bitlbee-1.2.1-libresolv.patch: --- NEW FILE bitlbee-1.2.1-libresolv.patch --- Patch by Robert Scheck , based on a patch by Mat??j Cepl for bitlbee >= 1.2, to avoid static linking to a private glibc function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package. Unfortunately, this patch gets not accepted by upstream, as they're fine with the static linking. The former try with libbind has the problem, that it breaks, once the file transfer patch is added, because of libbind apparently all symbols which are synonyms between glibc and libbind came from libbind, which made some nasty surprises when e.g. getaddrinfo from libbind returned different error codes than getaddrinfo from glibc. A few more information and details regarding are mentioned in Red Hat Bugzilla ID #439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047 --- bitlbee-1.2.1/configure 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/configure.libresolv 2008-06-28 17:24:15.000000000 +0200 @@ -340,10 +344,10 @@ echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings -for i in /lib /usr/lib /usr/local/lib; do - if [ -f $i/libresolv.a ]; then +for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do + if [ -f $i/libresolv.so ]; then echo '#define HAVE_RESOLV_A' >> config.h - echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings + echo 'EFLAGS+=-lresolv' >> Makefile.settings break fi done --- bitlbee-1.2.1/lib/Makefile 2008-03-02 18:10:16.000000000 +0100 +++ bitlbee-1.2.1/lib/Makefile.libresolv 2008-06-28 17:24:51.000000000 +0200 @@ -9,7 +9,7 @@ -include ../Makefile.settings # [SH] Program variables -objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o +objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o CFLAGS += -Wall LFLAGS += -r --- bitlbee-1.2.1/lib/misc.c 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.c.libresolv 2008-06-28 17:25:44.000000000 +0200 @@ -43,6 +43,7 @@ #ifdef HAVE_RESOLV_A #include #include +#include #endif #include "ssl_client.h" @@ -465,58 +466,6 @@ return 0; } -struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain ) -{ - struct ns_srv_reply *reply = NULL; -#ifdef HAVE_RESOLV_A - char name[1024]; - unsigned char querybuf[1024]; - const unsigned char *buf; - ns_msg nsh; - ns_rr rr; - int i, len, size; - - g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain ); - - if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 ) - return NULL; - - if( ns_initparse( querybuf, size, &nsh ) != 0 ) - return NULL; - - if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 ) - return NULL; - - size = ns_rr_rdlen( rr ); - buf = ns_rr_rdata( rr ); - - len = 0; - for( i = 6; i < size && buf[i]; i += buf[i] + 1 ) - len += buf[i] + 1; - - if( i > size ) - return NULL; - - reply = g_malloc( sizeof( struct ns_srv_reply ) + len ); - memcpy( reply->name, buf + 7, len ); - - for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 ) - reply->name[i] = '.'; - - if( i > len ) - { - g_free( reply ); - return NULL; - } - - reply->prio = ( buf[0] << 8 ) | buf[1]; - reply->weight = ( buf[2] << 8 ) | buf[3]; - reply->port = ( buf[4] << 8 ) | buf[5]; -#endif - - return reply; -} - /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */ char *word_wrap( char *msg, int line_len ) { --- bitlbee-1.2.1/lib/misc.h 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.h.libresolv 2008-06-28 17:26:24.000000000 +0200 @@ -28,14 +28,7 @@ #include #include - -struct ns_srv_reply -{ - int prio; - int weight; - int port; - char name[]; -}; +#include "srv.h" G_MODULE_EXPORT void strip_linefeed( gchar *text ); G_MODULE_EXPORT char *add_cr( char *text ); --- bitlbee-1.2.1/lib/srv.c 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.c.libresolv 2008-06-28 17:28:45.000000000 +0200 @@ -0,0 +1,237 @@ +/* srv.c - DNS SRV code + * Copyright (C) 2003 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#undef TEST + +#ifdef TEST +#define HAVE_RESOLV_A +#endif + +#include +#include + +#include +#include +#include +#include + +#include "srv.h" +#include +#include +#include + +/* Not every installation has gotten around to supporting SRVs + yet...*/ +#ifndef T_SRV +#define T_SRV 33 +#endif + +static int priosort(const void *a, const void *b) { + const struct ns_srv_reply *sa=a, *sb=b; + if (sa->prio>sb->prio) + return 1; + else if (sa->prioprio) + return -1; + else + return 0; +} + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) { + struct ns_srv_reply *reply = NULL; + struct ns_srv_reply *list; + char name[1024]; +#ifdef HAVE_RESOLV_A + unsigned char answer[PACKETSZ]; + int r, srvcount=0; + unsigned char *pt, *emsg; + int count, dlen; + + list = NULL; + + g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain); + + _res.options |= RES_DEBUG; + + if ( res_init() != 0 ) + return NULL; + + r=res_query(name, C_IN, T_SRV, answer, PACKETSZ); + + if (rPACKETSZ) + return NULL; + + if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) { + int i, rc; + + emsg=&answer[r]; /* end of message ??? */ + pt=&answer[sizeof(HEADER)]; + + /* Skip over the query */ + rc=dn_skipname(pt, emsg); + if (rc==-1) + goto fail; + + pt+=rc+QFIXEDSZ; + + while (count-->0 && ptprio=*pt++ << 8; + srv->prio|=*pt++; + srv->weight=*pt++ << 8; + srv->weight|=*pt++; + srv->port=*pt++ << 8; + srv->port|=*pt++; + + /* Get the name. 2782 doesn't allow name compression, but + dn_expand still works to pull the name out of the + packet. */ + rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME); + if (rc==1 && srv->name[0]==0) /* "." */ + goto noanswer; + if (rc==-1) + goto fail; + pt+=rc; + /* Corrupt packet? */ + if (dlen!=rc+6) + goto fail; + } + + /* Now we have an array of all the srv records. */ + + /* Order by priority */ + qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort); + + /* For each priority, move the zero-weighted items first. */ + for (i=0; iprio); + printf("weight=%hu\n", srv->weight); + printf("port=%hu\n", srv->port); + printf("target=%s\n", srv->name); + printf("\n"); + g_free(srv); + + return 0; +} +#endif /* TEST */ --- bitlbee-1.2.1/lib/srv.h 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.h.libresolv 2008-06-28 17:29:39.000000000 +0200 @@ -0,0 +1,49 @@ +/* srv.h + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef GNUPG_COMMON_SRV_H +#define GNUPG_COMMON_SRV_H + +#ifdef HAVE_RESOLV_A +# ifdef _WIN32 +# include +# else +# include +# include +# include +# endif /* !_WIN32 */ +#endif /* USE_DNS_SRV */ + + +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + +struct ns_srv_reply +{ + int prio; /* priority */ + int weight; /* weight */ + int port; /* port */ + int run_count; /* from struct srventry at gnupg's common/srv.h */ + char name[MAXDNAME]; /* target */ +}; + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain); + +#endif /*GNUPG_COMMON_SRV_H*/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bitlbee/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Apr 2008 18:04:24 -0000 1.4 +++ .cvsignore 7 Jul 2008 18:00:24 -0000 1.5 @@ -1 +1 @@ -bitlbee-1.2.tar.gz +bitlbee-1.2.1.tar.gz Index: bitlbee.spec =================================================================== RCS file: /cvs/extras/rpms/bitlbee/F-8/bitlbee.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bitlbee.spec 15 Apr 2008 18:04:24 -0000 1.4 +++ bitlbee.spec 7 Jul 2008 18:00:24 -0000 1.5 @@ -1,17 +1,18 @@ Summary: IRC to other chat networks gateway Name: bitlbee -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons URL: http://www.bitlbee.org/ Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz Source1: bitlbee.xinetd -Patch0: bitlbee-1.2-gmalloc.patch +Patch0: bitlbee-1.2.1-libresolv.patch +Patch1: bitlbee-1.2.1-gaccess.patch Requires: xinetd Requires(pre): shadow-utils Requires(preun): /sbin/service -BuildRequires: glib2-devel >= 2.4, libxslt, %{_includedir}/bind/arpa/nameser.h +BuildRequires: glib2-devel >= 2.4, libxslt %if 0%{?rhl}%{?fedora}%{?rhel} BuildRequires: gnutls-devel %else @@ -26,7 +27,8 @@ %prep %setup -q -%patch0 -p1 -b .gmalloc +%patch0 -p1 -b .libresolv +%patch1 -p1 -b .gaccess perl -pi.make -e ' s|\$\(BINDIR\)|\$(sbindir)|g; @@ -51,7 +53,6 @@ --ssl=openssl %endif -sed -i 's/EFLA.*libres.*/EFLAGS+=-lbind/' Makefile.settings make %{?_smp_mflags} %install @@ -96,6 +97,9 @@ %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name} %changelog +* Mon Jul 07 2008 Robert Scheck 1.2.1-1 +- Upgrade to 1.2.1 (thanks to Mat??j Cepl) + * Tue Apr 15 2008 Robert Scheck 1.2-1 - Upgrade to 1.2 (#439047, thanks to Mat??j Cepl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bitlbee/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Apr 2008 18:04:24 -0000 1.4 +++ sources 7 Jul 2008 18:00:24 -0000 1.5 @@ -1 +1 @@ -15d969391dd9bbbc9bb0d397b545a99c bitlbee-1.2.tar.gz +ca00f65aea89903ba78321eac00f7849 bitlbee-1.2.1.tar.gz --- bitlbee-1.2-gmalloc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 18:02:52 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 7 Jul 2008 18:02:52 GMT Subject: rpms/bitlbee/devel bitlbee-1.2.1-gaccess.patch, NONE, 1.1 bitlbee-1.2.1-libresolv.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bitlbee.spec, 1.5, 1.6 sources, 1.4, 1.5 bitlbee-1.2-gmalloc.patch, 1.1, NONE Message-ID: <200807071802.m67I2q9Y019882@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/bitlbee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12872/devel Modified Files: .cvsignore bitlbee.spec sources Added Files: bitlbee-1.2.1-gaccess.patch bitlbee-1.2.1-libresolv.patch Removed Files: bitlbee-1.2-gmalloc.patch Log Message: Upgrade to 1.2.1 (thanks to Mat??j Cepl) bitlbee-1.2.1-gaccess.patch: --- NEW FILE bitlbee-1.2.1-gaccess.patch --- BitlBee 1.2.1 doesn't compile on Red Hat Enterprise Linux 4 and systems based on it. Build fails with messages 'glib/gstdio.h: No such file or directory', 'storage_xml.c:248: warning: implicit declaration of function `g_access' or similar. Not fully fixed at upstream (devel), yet. Newer releases of BitlBee hopefully won't need this patch any longer, it's proposed anyway to upstream. Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/429 --- bitlbee-1.2.1/storage_xml.c 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/storage_xml.c.gaccess 2008-07-06 17:06:31.000000000 +0200 @@ -28,7 +28,17 @@ #include "base64.h" #include "arc.h" #include "md5.h" + +#if GLIB_CHECK_VERSION(2,8,0) #include +#else +/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */ +#define g_access access + +#ifndef F_OK +#define F_OK 0 +#endif +#endif typedef enum { @@ -243,9 +253,10 @@ static void xml_init( void ) { - if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) ) + if( g_access( global.conf->configdir, F_OK ) != 0 ) log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir ); - else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 ) + else if( g_access( global.conf->configdir, F_OK ) != 0 || + g_access( global.conf->configdir, W_OK ) != 0 ) log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir ); } @@ -372,7 +383,7 @@ g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" ); g_free( path2 ); - if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) ) + if( !overwrite && g_access( path, F_OK ) == 0 ) return STORAGE_ALREADY_EXISTS; strcat( path, "~" ); bitlbee-1.2.1-libresolv.patch: --- NEW FILE bitlbee-1.2.1-libresolv.patch --- Patch by Robert Scheck , based on a patch by Mat??j Cepl for bitlbee >= 1.2, to avoid static linking to a private glibc function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package. Unfortunately, this patch gets not accepted by upstream, as they're fine with the static linking. The former try with libbind has the problem, that it breaks, once the file transfer patch is added, because of libbind apparently all symbols which are synonyms between glibc and libbind came from libbind, which made some nasty surprises when e.g. getaddrinfo from libbind returned different error codes than getaddrinfo from glibc. A few more information and details regarding are mentioned in Red Hat Bugzilla ID #439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047 --- bitlbee-1.2.1/configure 2008-06-10 01:09:06.000000000 +0200 +++ bitlbee-1.2.1/configure.libresolv 2008-06-28 17:24:15.000000000 +0200 @@ -340,10 +344,10 @@ echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings -for i in /lib /usr/lib /usr/local/lib; do - if [ -f $i/libresolv.a ]; then +for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do + if [ -f $i/libresolv.so ]; then echo '#define HAVE_RESOLV_A' >> config.h - echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings + echo 'EFLAGS+=-lresolv' >> Makefile.settings break fi done --- bitlbee-1.2.1/lib/Makefile 2008-03-02 18:10:16.000000000 +0100 +++ bitlbee-1.2.1/lib/Makefile.libresolv 2008-06-28 17:24:51.000000000 +0200 @@ -9,7 +9,7 @@ -include ../Makefile.settings # [SH] Program variables -objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o +objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o CFLAGS += -Wall LFLAGS += -r --- bitlbee-1.2.1/lib/misc.c 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.c.libresolv 2008-06-28 17:25:44.000000000 +0200 @@ -43,6 +43,7 @@ #ifdef HAVE_RESOLV_A #include #include +#include #endif #include "ssl_client.h" @@ -465,58 +466,6 @@ return 0; } -struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain ) -{ - struct ns_srv_reply *reply = NULL; -#ifdef HAVE_RESOLV_A - char name[1024]; - unsigned char querybuf[1024]; - const unsigned char *buf; - ns_msg nsh; - ns_rr rr; - int i, len, size; - - g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain ); - - if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 ) - return NULL; - - if( ns_initparse( querybuf, size, &nsh ) != 0 ) - return NULL; - - if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 ) - return NULL; - - size = ns_rr_rdlen( rr ); - buf = ns_rr_rdata( rr ); - - len = 0; - for( i = 6; i < size && buf[i]; i += buf[i] + 1 ) - len += buf[i] + 1; - - if( i > size ) - return NULL; - - reply = g_malloc( sizeof( struct ns_srv_reply ) + len ); - memcpy( reply->name, buf + 7, len ); - - for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 ) - reply->name[i] = '.'; - - if( i > len ) - { - g_free( reply ); - return NULL; - } - - reply->prio = ( buf[0] << 8 ) | buf[1]; - reply->weight = ( buf[2] << 8 ) | buf[3]; - reply->port = ( buf[4] << 8 ) | buf[5]; -#endif - - return reply; -} - /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */ char *word_wrap( char *msg, int line_len ) { --- bitlbee-1.2.1/lib/misc.h 2008-06-22 14:23:46.000000000 +0200 +++ bitlbee-1.2.1/lib/misc.h.libresolv 2008-06-28 17:26:24.000000000 +0200 @@ -28,14 +28,7 @@ #include #include - -struct ns_srv_reply -{ - int prio; - int weight; - int port; - char name[]; -}; +#include "srv.h" G_MODULE_EXPORT void strip_linefeed( gchar *text ); G_MODULE_EXPORT char *add_cr( char *text ); --- bitlbee-1.2.1/lib/srv.c 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.c.libresolv 2008-06-28 17:28:45.000000000 +0200 @@ -0,0 +1,237 @@ +/* srv.c - DNS SRV code + * Copyright (C) 2003 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#undef TEST + +#ifdef TEST +#define HAVE_RESOLV_A +#endif + +#include +#include + +#include +#include +#include +#include + +#include "srv.h" +#include +#include +#include + +/* Not every installation has gotten around to supporting SRVs + yet...*/ +#ifndef T_SRV +#define T_SRV 33 +#endif + +static int priosort(const void *a, const void *b) { + const struct ns_srv_reply *sa=a, *sb=b; + if (sa->prio>sb->prio) + return 1; + else if (sa->prioprio) + return -1; + else + return 0; +} + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) { + struct ns_srv_reply *reply = NULL; + struct ns_srv_reply *list; + char name[1024]; +#ifdef HAVE_RESOLV_A + unsigned char answer[PACKETSZ]; + int r, srvcount=0; + unsigned char *pt, *emsg; + int count, dlen; + + list = NULL; + + g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain); + + _res.options |= RES_DEBUG; + + if ( res_init() != 0 ) + return NULL; + + r=res_query(name, C_IN, T_SRV, answer, PACKETSZ); + + if (rPACKETSZ) + return NULL; + + if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) { + int i, rc; + + emsg=&answer[r]; /* end of message ??? */ + pt=&answer[sizeof(HEADER)]; + + /* Skip over the query */ + rc=dn_skipname(pt, emsg); + if (rc==-1) + goto fail; + + pt+=rc+QFIXEDSZ; + + while (count-->0 && ptprio=*pt++ << 8; + srv->prio|=*pt++; + srv->weight=*pt++ << 8; + srv->weight|=*pt++; + srv->port=*pt++ << 8; + srv->port|=*pt++; + + /* Get the name. 2782 doesn't allow name compression, but + dn_expand still works to pull the name out of the + packet. */ + rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME); + if (rc==1 && srv->name[0]==0) /* "." */ + goto noanswer; + if (rc==-1) + goto fail; + pt+=rc; + /* Corrupt packet? */ + if (dlen!=rc+6) + goto fail; + } + + /* Now we have an array of all the srv records. */ + + /* Order by priority */ + qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort); + + /* For each priority, move the zero-weighted items first. */ + for (i=0; iprio); + printf("weight=%hu\n", srv->weight); + printf("port=%hu\n", srv->port); + printf("target=%s\n", srv->name); + printf("\n"); + g_free(srv); + + return 0; +} +#endif /* TEST */ --- bitlbee-1.2.1/lib/srv.h 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-1.2.1/lib/srv.h.libresolv 2008-06-28 17:29:39.000000000 +0200 @@ -0,0 +1,49 @@ +/* srv.h + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * + * This file is part of GNUPG. + * + * GNUPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GNUPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef GNUPG_COMMON_SRV_H +#define GNUPG_COMMON_SRV_H + +#ifdef HAVE_RESOLV_A +# ifdef _WIN32 +# include +# else +# include +# include +# include +# endif /* !_WIN32 */ +#endif /* USE_DNS_SRV */ + + +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + +struct ns_srv_reply +{ + int prio; /* priority */ + int weight; /* weight */ + int port; /* port */ + int run_count; /* from struct srventry at gnupg's common/srv.h */ + char name[MAXDNAME]; /* target */ +}; + +struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain); + +#endif /*GNUPG_COMMON_SRV_H*/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bitlbee/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Apr 2008 18:04:45 -0000 1.4 +++ .cvsignore 7 Jul 2008 18:01:56 -0000 1.5 @@ -1 +1 @@ -bitlbee-1.2.tar.gz +bitlbee-1.2.1.tar.gz Index: bitlbee.spec =================================================================== RCS file: /cvs/extras/rpms/bitlbee/devel/bitlbee.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bitlbee.spec 15 Apr 2008 18:04:45 -0000 1.5 +++ bitlbee.spec 7 Jul 2008 18:01:56 -0000 1.6 @@ -1,17 +1,18 @@ Summary: IRC to other chat networks gateway Name: bitlbee -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons URL: http://www.bitlbee.org/ Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz Source1: bitlbee.xinetd -Patch0: bitlbee-1.2-gmalloc.patch +Patch0: bitlbee-1.2.1-libresolv.patch +Patch1: bitlbee-1.2.1-gaccess.patch Requires: xinetd Requires(pre): shadow-utils Requires(preun): /sbin/service -BuildRequires: glib2-devel >= 2.4, libxslt, %{_includedir}/bind/arpa/nameser.h +BuildRequires: glib2-devel >= 2.4, libxslt %if 0%{?rhl}%{?fedora}%{?rhel} BuildRequires: gnutls-devel %else @@ -26,7 +27,8 @@ %prep %setup -q -%patch0 -p1 -b .gmalloc +%patch0 -p1 -b .libresolv +%patch1 -p1 -b .gaccess perl -pi.make -e ' s|\$\(BINDIR\)|\$(sbindir)|g; @@ -51,7 +53,6 @@ --ssl=openssl %endif -sed -i 's/EFLA.*libres.*/EFLAGS+=-lbind/' Makefile.settings make %{?_smp_mflags} %install @@ -96,6 +97,9 @@ %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name} %changelog +* Mon Jul 07 2008 Robert Scheck 1.2.1-1 +- Upgrade to 1.2.1 (thanks to Mat??j Cepl) + * Tue Apr 15 2008 Robert Scheck 1.2-1 - Upgrade to 1.2 (#439047, thanks to Mat??j Cepl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bitlbee/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Apr 2008 18:04:45 -0000 1.4 +++ sources 7 Jul 2008 18:01:56 -0000 1.5 @@ -1 +1 @@ -15d969391dd9bbbc9bb0d397b545a99c bitlbee-1.2.tar.gz +ca00f65aea89903ba78321eac00f7849 bitlbee-1.2.1.tar.gz --- bitlbee-1.2-gmalloc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 18:07:09 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:07:09 GMT Subject: rpms/compiz-bcop/F-9 compiz-bcop.spec,1.5,1.6 Message-ID: <200807071807.m67I79FE020462@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-bcop/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20385/F-9 Modified Files: compiz-bcop.spec Log Message: Fix source URL Index: compiz-bcop.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-bcop/F-9/compiz-bcop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- compiz-bcop.spec 11 Jun 2008 21:16:52 -0000 1.5 +++ compiz-bcop.spec 7 Jul 2008 18:06:18 -0000 1.6 @@ -6,7 +6,7 @@ Group: Development/Libraries License: GPLv2+ URL: http://compiz-fusion.org -Source0: http://releases.compiz-fusion.org/0.6.0/%{name}-%{version}.tar.bz2 +Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # compiz is not available on these arches due to missing libdrm From fedora-extras-commits at redhat.com Mon Jul 7 18:07:23 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:07:23 GMT Subject: rpms/compiz-bcop/devel compiz-bcop.spec,1.5,1.6 Message-ID: <200807071807.m67I7Nqf020479@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-bcop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20385/devel Modified Files: compiz-bcop.spec Log Message: Fix source URL Index: compiz-bcop.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-bcop/devel/compiz-bcop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- compiz-bcop.spec 5 Jun 2008 17:51:39 -0000 1.5 +++ compiz-bcop.spec 7 Jul 2008 18:06:40 -0000 1.6 @@ -6,7 +6,7 @@ Group: Development/Libraries License: GPLv2+ URL: http://compiz-fusion.org -Source0: http://releases.compiz-fusion.org/0.6.0/%{name}-%{version}.tar.bz2 +Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # compiz is not available on these arches due to missing libdrm From fedora-extras-commits at redhat.com Mon Jul 7 18:08:37 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:08:37 GMT Subject: rpms/compiz-fusion/F-9 compiz-fusion.spec,1.31,1.32 Message-ID: <200807071808.m67I8bOx020567@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-fusion/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20512/F-9 Modified Files: compiz-fusion.spec Log Message: Fix source URL Index: compiz-fusion.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-fusion/F-9/compiz-fusion.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- compiz-fusion.spec 24 Jun 2008 16:06:40 -0000 1.31 +++ compiz-fusion.spec 7 Jul 2008 18:07:52 -0000 1.32 @@ -8,7 +8,7 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://compiz-fusion.org -Source0: http://releases.compiz-fusion.org/0.6.0/%{name}-plugins-main-%{version}.tar.bz2 +Source0: http://releases.compiz-fusion.org/%{version}/%{name}-plugins-main-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches From fedora-extras-commits at redhat.com Mon Jul 7 18:09:06 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:09:06 GMT Subject: rpms/compiz-fusion/devel compiz-fusion.spec,1.33,1.34 Message-ID: <200807071809.m67I961c020635@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-fusion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20512/devel Modified Files: compiz-fusion.spec Log Message: Fix source URL Index: compiz-fusion.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- compiz-fusion.spec 24 Jun 2008 16:06:04 -0000 1.33 +++ compiz-fusion.spec 7 Jul 2008 18:08:07 -0000 1.34 @@ -8,7 +8,7 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://compiz-fusion.org -Source0: http://releases.compiz-fusion.org/0.6.0/%{name}-plugins-main-%{version}.tar.bz2 +Source0: http://releases.compiz-fusion.org/%{version}/%{name}-plugins-main-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches From fedora-extras-commits at redhat.com Mon Jul 7 18:09:32 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:09:32 GMT Subject: rpms/compiz-fusion-extras/F-9 compiz-fusion-extras.spec,1.15,1.16 Message-ID: <200807071809.m67I9W58020685@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-fusion-extras/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20571/F-9 Modified Files: compiz-fusion-extras.spec Log Message: Fix source URL Index: compiz-fusion-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/F-9/compiz-fusion-extras.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- compiz-fusion-extras.spec 24 Jun 2008 16:07:39 -0000 1.15 +++ compiz-fusion-extras.spec 7 Jul 2008 18:08:40 -0000 1.16 @@ -8,7 +8,7 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://compiz-fusion.org -Source0: http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-extra-%{version}.tar.bz2 +Source0: http://releases.compiz-fusion.org/%{version}/compiz-fusion-plugins-extra-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches From fedora-extras-commits at redhat.com Mon Jul 7 18:09:45 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:09:45 GMT Subject: rpms/compiz-fusion-extras/devel compiz-fusion-extras.spec, 1.17, 1.18 Message-ID: <200807071809.m67I9jUF020697@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20571/devel Modified Files: compiz-fusion-extras.spec Log Message: Fix source URL Index: compiz-fusion-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/compiz-fusion-extras.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- compiz-fusion-extras.spec 24 Jun 2008 16:05:16 -0000 1.17 +++ compiz-fusion-extras.spec 7 Jul 2008 18:09:03 -0000 1.18 @@ -8,7 +8,7 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://compiz-fusion.org -Source0: http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-extra-%{version}.tar.bz2 +Source0: http://releases.compiz-fusion.org/%{version}/compiz-fusion-plugins-extra-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches From fedora-extras-commits at redhat.com Mon Jul 7 18:13:48 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:13:48 GMT Subject: rpms/iotop/F-9 iotop.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200807071813.m67IDmpT021110@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/iotop/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20926/F-9 Modified Files: iotop.spec sources Log Message: New upstream tarball.... Index: iotop.spec =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-9/iotop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- iotop.spec 26 May 2008 15:35:55 -0000 1.4 +++ iotop.spec 7 Jul 2008 18:12:51 -0000 1.5 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: iotop Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Top like utility for I/O Group: Applications/System @@ -48,6 +48,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 07 2008 Adel Gadllah 0.2-2 +- New upstream tarball.. + * Mon May 26 2008 Adel Gadllah 0.2-1 - Update to new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2008 15:35:55 -0000 1.2 +++ sources 7 Jul 2008 18:12:51 -0000 1.3 @@ -1 +1 @@ -9fad407f56fd37cb76a29d40fe250517 iotop-0.2.tar.bz2 +b506e34c7b292f7bb7111b9ed67f68ea iotop-0.2.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 18:13:50 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:13:50 GMT Subject: rpms/iotop/F-8 iotop.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200807071813.m67IDol8021129@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/iotop/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20926/F-8 Modified Files: iotop.spec sources Log Message: New upstream tarball.... Index: iotop.spec =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-8/iotop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- iotop.spec 26 May 2008 15:35:52 -0000 1.4 +++ iotop.spec 7 Jul 2008 18:12:29 -0000 1.5 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: iotop Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Top like utility for I/O Group: Applications/System @@ -48,6 +48,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 07 2008 Adel Gadllah 0.2-2 +- New upstream tarball.. + * Mon May 26 2008 Adel Gadllah 0.2-1 - Update to new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2008 15:35:52 -0000 1.2 +++ sources 7 Jul 2008 18:12:29 -0000 1.3 @@ -1 +1 @@ -9fad407f56fd37cb76a29d40fe250517 iotop-0.2.tar.bz2 +b506e34c7b292f7bb7111b9ed67f68ea iotop-0.2.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 18:13:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:13:57 GMT Subject: rpms/graphviz/F-9 graphviz.spec,1.47,1.48 Message-ID: <200807071813.m67IDvPf021168@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/graphviz/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20791/F-9 Modified Files: graphviz.spec Log Message: fix conditional comparison Index: graphviz.spec =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/F-9/graphviz.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- graphviz.spec 18 Mar 2008 18:15:51 -0000 1.47 +++ graphviz.spec 7 Jul 2008 18:12:06 -0000 1.48 @@ -8,7 +8,7 @@ Summary: Graph Visualization Tools Version: 2.16.1 -%define truerelease 0.5 +%define truerelease 0.6 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -73,17 +73,17 @@ #-- Red Hat Enterprise Linux specific Build Requirements -------------------- %if 0%{?rhel} %define TCL 1 -%if "%rhel" < "4" +%if}0%{?rhel} < 4 BuildRequires: XFree86-devel %endif -%if "%rhel" >= "3" +%if 0%{?rhel} >= 3 %define IPSEPCOLA --with-ipsepcola BuildRequires: fontconfig-devel tcl-devel tk-devel %endif -%if "%rhel" == "4" +%if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %endif -%if "%rhel" >= "4" +%if 0%{?rhel} >= 4 # PERL is available earlier, but a suitable SWIG isn't %define PERL 1 %define RUBY 1 @@ -91,13 +91,13 @@ %define PYTHON 1 BuildRequires: perl ruby-devel guile-devel python-devel %endif -%if "%rhel" >= "5" +%if 0%{?rhel} >= 5 %define JAVA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define PHP 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf @@ -110,25 +110,25 @@ %define PERL 1 %define TCL 1 BuildRequires: fontconfig-devel tcl-devel tk-devel -%if "%fedora" < "3" +%if 0%{?fedora} < 3 BuildRequires: XFree86-devel %endif -%if "%fedora" == "3" +%if 0%{?fedora} == 3 BuildRequires: xorg-x11-devel %endif -%if "%fedora" == "4" +%if 0%{?fedora} == 4 BuildRequires: xorg-x11-devel %endif -%if "%fedora" >= "3" +%if 0%{?fedora} >= 3 %define IPSEPCOLA --with-ipsepcola %endif -%if "%fedora" >= "4" +%if 0%{?fedora} >= 4 %define RUBY 1 %define GUILE 1 %define PYTHON 1 BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel %endif -%if "%fedora" >= "5" +%if 0%{?fedora} >= 5 %define PHP 1 %define JAVA 1 BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel @@ -138,22 +138,22 @@ BuildRequires: mono-core ocaml %endif %endif -%if "%fedora" >= "6" +%if 0%{?fedora} >= 6 %define LUA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel %endif -%if "%fedora" >= "7" +%if 0%{?fedora} >= 7 %define DEVIL 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf BuildRequires: gd gd-devel perl-devel DevIL-devel %endif -%if "%fedora" >= "8" +%if 0%{?fedora} >= 8 #define R_LANG 1 #BuildRequires: R-devel swig >= 1.3.33 %endif -%if "%fedora" >= "9" +%if 0%{?fedora} >= 9 %define MING 0 #BuildRequires: ming ming-devel %endif @@ -620,6 +620,9 @@ #-- changelog -------------------------------------------------- %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 2.16.1-0.6 +- fix conditional comparison + * Tue Mar 18 2008 Tom "spot" Callaway 2.16.1-0.5 - add Requires for versioned perl (libperl.so) From fedora-extras-commits at redhat.com Mon Jul 7 18:14:05 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 7 Jul 2008 18:14:05 GMT Subject: rpms/iotop/devel iotop.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200807071814.m67IE5k0021178@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/iotop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20926/devel Modified Files: iotop.spec sources Log Message: New upstream tarball.... Index: iotop.spec =================================================================== RCS file: /cvs/pkgs/rpms/iotop/devel/iotop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- iotop.spec 26 May 2008 15:35:57 -0000 1.4 +++ iotop.spec 7 Jul 2008 18:13:18 -0000 1.5 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: iotop Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Top like utility for I/O Group: Applications/System @@ -48,6 +48,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 07 2008 Adel Gadllah 0.2-2 +- New upstream tarball.. + * Mon May 26 2008 Adel Gadllah 0.2-1 - Update to new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iotop/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 May 2008 15:35:57 -0000 1.2 +++ sources 7 Jul 2008 18:13:18 -0000 1.3 @@ -1 +1 @@ -9fad407f56fd37cb76a29d40fe250517 iotop-0.2.tar.bz2 +b506e34c7b292f7bb7111b9ed67f68ea iotop-0.2.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 18:14:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:14:06 GMT Subject: rpms/graphviz/F-8 graphviz.spec,1.38,1.39 Message-ID: <200807071814.m67IE6Fd021182@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/graphviz/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20791/F-8 Modified Files: graphviz.spec Log Message: fix conditional comparison Index: graphviz.spec =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/F-8/graphviz.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- graphviz.spec 5 Sep 2007 03:07:20 -0000 1.38 +++ graphviz.spec 7 Jul 2008 18:11:27 -0000 1.39 @@ -8,7 +8,7 @@ Summary: Graph Visualization Tools Version: 2.14.1 -%define truerelease 3 +%define truerelease 4 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -64,17 +64,17 @@ #-- Red Hat Enterprise Linux specific Build Requirements -------------------- %if 0%{?rhel} %define TCL 1 -%if "%rhel" < "4" +%if 0%{?rhel} < 4 BuildRequires: XFree86-devel %endif -%if "%rhel" >= "3" +%if 0%{?rhel} >= 3 %define IPSEPCOLA --with-ipsepcola BuildRequires: fontconfig-devel tcl-devel tk-devel %endif -%if "%rhel" == "4" +%if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %endif -%if "%rhel" >= "4" +%if 0%{?rhel} >= 4 # PERL is available earlier, but a suitable SWIG isn't %define PERL 1 %define PHP 1 @@ -83,7 +83,7 @@ %define PYTHON 1 BuildRequires: perl php-devel ruby ruby-devel guile-devel python-devel %endif -%if "%rhel" >= "5" +%if 0%{?rhel} >= 5 %define JAVA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel @@ -96,26 +96,26 @@ %define PERL 1 %define TCL 1 BuildRequires: fontconfig-devel tcl-devel tk-devel -%if "%fedora" < "3" +%if 0%{?fedora} < 3 BuildRequires: XFree86-devel %endif -%if "%fedora" == "3" +%if 0%{?fedora} == 3 BuildRequires: xorg-x11-devel %endif -%if "%fedora" == "4" +%if 0%{?fedora} == 4 BuildRequires: xorg-x11-devel %endif -%if "%fedora" >= "3" +%if 0%{?fedora} >= 3 %define IPSEPCOLA --with-ipsepcola %endif -%if "%fedora" >= "4" +%if 0%{?fedora} >= 4 %define PHP 1 %define RUBY 1 %define GUILE 1 %define PYTHON 1 BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel python-devel %endif -%if "%fedora" >= "5" +%if 0%{?fedora} >= 5 %define JAVA 1 BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel %ifnarch ppc64 @@ -124,12 +124,12 @@ BuildRequires: mono-core ocaml %endif %endif -%if "%fedora" >= "6" +%if 0%{?fedora} >= 6 %define LUA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel %endif -%if "%fedora" >= "7" +%if 0%{fedora} >= 7 BuildRequires: gd gd-devel perl-devel %define MYLIBGD --without-mylibgd %endif @@ -511,6 +511,9 @@ #-- changelog -------------------------------------------------- %changelog +* Mon Jul 07 2008 Tom "spot" Callaway 2.14.1-4 +- fix conditional comparison + * Tue Sep 04 2007 Patrick "Jima" Laughton 2.14.1-3 - Patch to resurrect arith.h From fedora-extras-commits at redhat.com Mon Jul 7 18:14:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:14:18 GMT Subject: rpms/gt5/F-8 gt5.spec,1.1,1.2 Message-ID: <200807071814.m67IEIed021216@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gt5/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21031/F-8 Modified Files: gt5.spec Log Message: fix conditional comparison Index: gt5.spec =================================================================== RCS file: /cvs/pkgs/rpms/gt5/F-8/gt5.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gt5.spec 31 Oct 2007 20:18:50 -0000 1.1 +++ gt5.spec 7 Jul 2008 18:12:58 -0000 1.2 @@ -1,7 +1,7 @@ Name: gt5 Summary: A diff-capable 'du-browser' Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Applications/File URL: http://gt5.sourceforge.net/ @@ -18,7 +18,7 @@ #text-www-browser virtual provider was introduced in F-8 #it was initially proposed by Till Maas at: #http://fedoraproject.org/wiki/VilleSkytt%C3%A4/VirtualProvides -%if "%fedora" > "7" +%if 0%{?fedora} > 7 Requires: text-www-browser %endif @@ -55,6 +55,9 @@ %{_mandir}/man1/gt5.1* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.4.0-5 +- fix conditional comparison + * Sat Oct 27 2007 Marcin Zajaczkowski - 1.4.0-4 - applied suggestions by Mamoru Tasaka (all below) - removed a chown patch by a direct use of an 'install' command From fedora-extras-commits at redhat.com Mon Jul 7 18:14:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:14:20 GMT Subject: rpms/gt5/F-9 gt5.spec,1.1,1.2 Message-ID: <200807071814.m67IEK9N021223@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gt5/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21031/F-9 Modified Files: gt5.spec Log Message: fix conditional comparison Index: gt5.spec =================================================================== RCS file: /cvs/pkgs/rpms/gt5/F-9/gt5.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gt5.spec 31 Oct 2007 20:09:05 -0000 1.1 +++ gt5.spec 7 Jul 2008 18:13:18 -0000 1.2 @@ -1,7 +1,7 @@ Name: gt5 Summary: A diff-capable 'du-browser' Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Applications/File URL: http://gt5.sourceforge.net/ @@ -18,7 +18,7 @@ #text-www-browser virtual provider was introduced in F-8 #it was initially proposed by Till Maas at: #http://fedoraproject.org/wiki/VilleSkytt%C3%A4/VirtualProvides -%if "%fedora" > "7" +%if 0%{?fedora} > 7 Requires: text-www-browser %endif @@ -55,6 +55,9 @@ %{_mandir}/man1/gt5.1* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.4.0-5 +- fix conditional comparison + * Sat Oct 27 2007 Marcin Zajaczkowski - 1.4.0-4 - applied suggestions by Mamoru Tasaka (all below) - removed a chown patch by a direct use of an 'install' command From fedora-extras-commits at redhat.com Mon Jul 7 18:14:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:14:21 GMT Subject: rpms/graphviz/devel graphviz.spec,1.47,1.48 Message-ID: <200807071814.m67IELwL021257@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20791/devel Modified Files: graphviz.spec Log Message: fix conditional comparison Index: graphviz.spec =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- graphviz.spec 18 Mar 2008 18:15:51 -0000 1.47 +++ graphviz.spec 7 Jul 2008 18:12:57 -0000 1.48 @@ -8,7 +8,7 @@ Summary: Graph Visualization Tools Version: 2.16.1 -%define truerelease 0.5 +%define truerelease 0.6 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -73,17 +73,17 @@ #-- Red Hat Enterprise Linux specific Build Requirements -------------------- %if 0%{?rhel} %define TCL 1 -%if "%rhel" < "4" +%if}0%{?rhel} < 4 BuildRequires: XFree86-devel %endif -%if "%rhel" >= "3" +%if 0%{?rhel} >= 3 %define IPSEPCOLA --with-ipsepcola BuildRequires: fontconfig-devel tcl-devel tk-devel %endif -%if "%rhel" == "4" +%if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %endif -%if "%rhel" >= "4" +%if 0%{?rhel} >= 4 # PERL is available earlier, but a suitable SWIG isn't %define PERL 1 %define RUBY 1 @@ -91,13 +91,13 @@ %define PYTHON 1 BuildRequires: perl ruby-devel guile-devel python-devel %endif -%if "%rhel" >= "5" +%if 0%{?rhel} >= 5 %define JAVA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define PHP 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf @@ -110,25 +110,25 @@ %define PERL 1 %define TCL 1 BuildRequires: fontconfig-devel tcl-devel tk-devel -%if "%fedora" < "3" +%if 0%{?fedora} < 3 BuildRequires: XFree86-devel %endif -%if "%fedora" == "3" +%if 0%{?fedora} == 3 BuildRequires: xorg-x11-devel %endif -%if "%fedora" == "4" +%if 0%{?fedora} == 4 BuildRequires: xorg-x11-devel %endif -%if "%fedora" >= "3" +%if 0%{?fedora} >= 3 %define IPSEPCOLA --with-ipsepcola %endif -%if "%fedora" >= "4" +%if 0%{?fedora} >= 4 %define RUBY 1 %define GUILE 1 %define PYTHON 1 BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel %endif -%if "%fedora" >= "5" +%if 0%{?fedora} >= 5 %define PHP 1 %define JAVA 1 BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel @@ -138,22 +138,22 @@ BuildRequires: mono-core ocaml %endif %endif -%if "%fedora" >= "6" +%if 0%{?fedora} >= 6 %define LUA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel %endif -%if "%fedora" >= "7" +%if 0%{?fedora} >= 7 %define DEVIL 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf BuildRequires: gd gd-devel perl-devel DevIL-devel %endif -%if "%fedora" >= "8" +%if 0%{?fedora} >= 8 #define R_LANG 1 #BuildRequires: R-devel swig >= 1.3.33 %endif -%if "%fedora" >= "9" +%if 0%{?fedora} >= 9 %define MING 0 #BuildRequires: ming ming-devel %endif @@ -620,6 +620,9 @@ #-- changelog -------------------------------------------------- %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 2.16.1-0.6 +- fix conditional comparison + * Tue Mar 18 2008 Tom "spot" Callaway 2.16.1-0.5 - add Requires for versioned perl (libperl.so) From fedora-extras-commits at redhat.com Mon Jul 7 18:14:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:14:36 GMT Subject: rpms/gt5/devel gt5.spec,1.1,1.2 Message-ID: <200807071814.m67IEagH021333@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gt5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21031/devel Modified Files: gt5.spec Log Message: fix conditional comparison Index: gt5.spec =================================================================== RCS file: /cvs/pkgs/rpms/gt5/devel/gt5.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gt5.spec 31 Oct 2007 20:09:05 -0000 1.1 +++ gt5.spec 7 Jul 2008 18:13:51 -0000 1.2 @@ -1,7 +1,7 @@ Name: gt5 Summary: A diff-capable 'du-browser' Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Applications/File URL: http://gt5.sourceforge.net/ @@ -18,7 +18,7 @@ #text-www-browser virtual provider was introduced in F-8 #it was initially proposed by Till Maas at: #http://fedoraproject.org/wiki/VilleSkytt%C3%A4/VirtualProvides -%if "%fedora" > "7" +%if 0%{?fedora} > 7 Requires: text-www-browser %endif @@ -55,6 +55,9 @@ %{_mandir}/man1/gt5.1* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.4.0-5 +- fix conditional comparison + * Sat Oct 27 2007 Marcin Zajaczkowski - 1.4.0-4 - applied suggestions by Mamoru Tasaka (all below) - removed a chown patch by a direct use of an 'install' command From fedora-extras-commits at redhat.com Mon Jul 7 18:17:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:17:53 +0000 Subject: [pkgdb] kernel: jwrdegoede has requested watchcommits Message-ID: <200807071817.m67IHrh2022018@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has requested the watchcommits acl on kernel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Mon Jul 7 18:17:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:17:55 +0000 Subject: [pkgdb] kernel: jwrdegoede has requested commit Message-ID: <200807071817.m67IHt2G022042@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has requested the commit acl on kernel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Mon Jul 7 18:18:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:18:57 GMT Subject: rpms/gtk-vnc/F-9 gtk-vnc.spec,1.16,1.17 Message-ID: <200807071818.m67IIvS0021737@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtk-vnc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21590/F-9 Modified Files: gtk-vnc.spec Log Message: fix conditional comparison Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/F-9/gtk-vnc.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gtk-vnc.spec 10 Jun 2008 21:39:14 -0000 1.16 +++ gtk-vnc.spec 7 Jul 2008 18:18:05 -0000 1.17 @@ -7,7 +7,7 @@ Summary: A GTK widget for VNC clients Name: gtk-vnc Version: 0.3.6 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ Group: Development/Libraries Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -16,7 +16,7 @@ BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel BuildRequires: gnutls-devel gtkglext-devel %if %{with_plugin} -%if "%{fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: xulrunner-devel %else BuildRequires: firefox-devel @@ -120,6 +120,9 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.3.6-1.1 +- fix conditional comparison + * Tue Jun 10 2008 Daniel P. Berrange - 0.3.6-1.fc9 - Update to 0.3.6 release From fedora-extras-commits at redhat.com Mon Jul 7 18:19:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:19:05 GMT Subject: rpms/gtk-vnc/F-8 gtk-vnc.spec,1.12,1.13 Message-ID: <200807071819.m67IJ5S0021743@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtk-vnc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21590/F-8 Modified Files: gtk-vnc.spec Log Message: fix conditional comparison Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/F-8/gtk-vnc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtk-vnc.spec 4 Apr 2008 16:17:46 -0000 1.12 +++ gtk-vnc.spec 7 Jul 2008 18:17:40 -0000 1.13 @@ -7,7 +7,7 @@ Summary: A GTK widget for VNC clients Name: gtk-vnc Version: 0.3.4 -Release: 3%{?dist} +Release: 3%{?dist}.1 License: LGPLv2+ Group: Development/Libraries Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -21,7 +21,7 @@ BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel BuildRequires: gnutls-devel gtkglext-devel %if %{with_plugin} -%if "%{fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: xulrunner-devel %else BuildRequires: firefox-devel @@ -130,6 +130,9 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.3.4-3.1 +- fix conditional comparison + * Thu Apr 4 2008 Daniel P. Berrange - 0.3.4-3.fc8 - Fix OpenGL rendering artifacts (rhbz #440184) From fedora-extras-commits at redhat.com Mon Jul 7 18:19:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:19:15 GMT Subject: rpms/gtk-vnc/devel gtk-vnc.spec,1.18,1.19 Message-ID: <200807071819.m67IJFxW021751@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21590/devel Modified Files: gtk-vnc.spec Log Message: fix conditional comparison Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gtk-vnc.spec 25 Jun 2008 10:12:14 -0000 1.18 +++ gtk-vnc.spec 7 Jul 2008 18:18:27 -0000 1.19 @@ -7,7 +7,7 @@ Summary: A GTK widget for VNC clients Name: gtk-vnc Version: 0.3.6 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -16,7 +16,7 @@ BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel BuildRequires: gnutls-devel gtkglext-devel %if %{with_plugin} -%if "%{fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: xulrunner-devel %else BuildRequires: firefox-devel @@ -120,6 +120,9 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.3.6-3 +- fix conditional comparison + * Wed Jun 25 2008 Daniel P. Berrange - 0.3.6-2.fc10 - Rebuild for GNU TLS ABI change From fedora-extras-commits at redhat.com Mon Jul 7 18:23:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:23:11 +0000 Subject: [pkgdb] kernel had acl change status Message-ID: <200807071823.m67INBCq022412@bastion.fedora.phx.redhat.com> Dave Jones (davej) has set the watchcommits acl on kernel (Fedora devel) to Approved for Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Mon Jul 7 18:23:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:23:13 +0000 Subject: [pkgdb] kernel had acl change status Message-ID: <200807071823.m67IND4n022434@bastion.fedora.phx.redhat.com> Dave Jones (davej) has set the commit acl on kernel (Fedora devel) to Approved for Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Mon Jul 7 18:25:25 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Mon, 7 Jul 2008 18:25:25 GMT Subject: rpms/xdrawchem/devel xdrawchem.spec,1.12,1.13 Message-ID: <200807071825.m67IPPER022250@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/xdrawchem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22187 Modified Files: xdrawchem.spec Log Message: - try working around ppc64 build problem Index: xdrawchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/xdrawchem/devel/xdrawchem.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xdrawchem.spec 7 Jul 2008 16:05:31 -0000 1.12 +++ xdrawchem.spec 7 Jul 2008 18:24:37 -0000 1.13 @@ -28,7 +28,10 @@ %patch1 -p1 -b .ob %build -%configure +%configure \ + --with-qtincdir=`pkg-config qt-mt --variable includedir` \ + --with-qtlibdir=`pkg-config qt-mt --variable libdir` \ + %{__make} %{?_smp_mflags} %install From fedora-extras-commits at redhat.com Mon Jul 7 18:26:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:26:24 +0000 Subject: [pkgdb] jpackage-utils had acl change status Message-ID: <200807071826.m67IQOFn022589@bastion.fedora.phx.redhat.com> Thomas Fitzsimmons (fitzsim) has set the commit acl on jpackage-utils (Fedora devel) to Approved for Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Mon Jul 7 18:37:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:37:56 GMT Subject: rpms/HelixPlayer/F-9 HelixPlayer.spec,1.6,1.7 Message-ID: <200807071837.m67IbutO023294@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/HelixPlayer/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23172/F-9 Modified Files: HelixPlayer.spec Log Message: fix conditional comparison Index: HelixPlayer.spec =================================================================== RCS file: /cvs/pkgs/rpms/HelixPlayer/F-9/HelixPlayer.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- HelixPlayer.spec 18 Feb 2008 18:09:15 -0000 1.6 +++ HelixPlayer.spec 7 Jul 2008 18:37:02 -0000 1.7 @@ -2,9 +2,9 @@ Name: HelixPlayer Version: 1.0.9 Epoch: 1 -Release: 2%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia -License: RPSL, GPL +License: RPSL or GPLv2+ URL: https://player.helixcommunity.org/ # https://helixcommunity.org/projects/player/files/download/2490 Source0: hxplay-1.0.9-source.tar.bz2 @@ -25,7 +25,7 @@ BuildRequires: gtk2-devel, python, prelink BuildRequires: libogg-devel BuildRequires: desktop-file-utils -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" || "%{?fedora}%{?rhel}" == "" +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 || 0%{?fedora}%{?rhel} == 0 BuildRequires: libXt-devel libXv-devel %else BuildRequires: xorg-x11-devel @@ -197,6 +197,12 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1:1.0.9-4 +- fix conditional comparison + +* Tue May 20 2008 Tom "spot" Callaway - 1:1.0.9-3 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1:1.0.9-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 18:38:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:38:01 GMT Subject: rpms/HelixPlayer/F-8 HelixPlayer.spec,1.5,1.6 Message-ID: <200807071838.m67Ic1WZ023301@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/HelixPlayer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23172/F-8 Modified Files: HelixPlayer.spec Log Message: fix conditional comparison Index: HelixPlayer.spec =================================================================== RCS file: /cvs/pkgs/rpms/HelixPlayer/F-8/HelixPlayer.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- HelixPlayer.spec 6 Oct 2007 14:57:14 -0000 1.5 +++ HelixPlayer.spec 7 Jul 2008 18:36:35 -0000 1.6 @@ -2,9 +2,9 @@ Name: HelixPlayer Version: 1.0.9 Epoch: 1 -Release: 1%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia -License: RPSL, GPL +License: RPSL or GPLv2+ URL: https://player.helixcommunity.org/ # https://helixcommunity.org/projects/player/files/download/2490 Source0: hxplay-1.0.9-source.tar.bz2 @@ -25,7 +25,7 @@ BuildRequires: gtk2-devel, python, prelink BuildRequires: libogg-devel BuildRequires: desktop-file-utils -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" || "%{?fedora}%{?rhel}" == "" +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 || 0%{?fedora}%{?rhel} == 0 BuildRequires: libXt-devel libXv-devel %else BuildRequires: xorg-x11-devel @@ -197,6 +197,15 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1:1.0.9-4 +- fix conditional comparison + +* Tue May 20 2008 Tom "spot" Callaway - 1:1.0.9-3 +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 1:1.0.9-2 +- Autorebuild for GCC 4.3 + * Sat Oct 06 2007 Aurelien Bompard 1:1.0.9-1 - add sparc, sparc64, and alpha to excluded archs - update to 1.0.9 From fedora-extras-commits at redhat.com Mon Jul 7 18:38:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:38:14 GMT Subject: rpms/HelixPlayer/devel HelixPlayer.spec,1.7,1.8 Message-ID: <200807071838.m67IcEAY023310@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/HelixPlayer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23172/devel Modified Files: HelixPlayer.spec Log Message: fix conditional comparison Index: HelixPlayer.spec =================================================================== RCS file: /cvs/pkgs/rpms/HelixPlayer/devel/HelixPlayer.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- HelixPlayer.spec 20 May 2008 20:58:07 -0000 1.7 +++ HelixPlayer.spec 7 Jul 2008 18:37:27 -0000 1.8 @@ -2,7 +2,7 @@ Name: HelixPlayer Version: 1.0.9 Epoch: 1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: RPSL or GPLv2+ URL: https://player.helixcommunity.org/ @@ -25,7 +25,7 @@ BuildRequires: gtk2-devel, python, prelink BuildRequires: libogg-devel BuildRequires: desktop-file-utils -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" || "%{?fedora}%{?rhel}" == "" +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 || 0%{?fedora}%{?rhel} == 0 BuildRequires: libXt-devel libXv-devel %else BuildRequires: xorg-x11-devel @@ -197,6 +197,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1:1.0.9-4 +- fix conditional comparison + * Tue May 20 2008 Tom "spot" Callaway - 1:1.0.9-3 - fix license tag From fedora-extras-commits at redhat.com Mon Jul 7 18:51:24 2008 From: fedora-extras-commits at redhat.com (Omair Majid (omajid)) Date: Mon, 7 Jul 2008 18:51:24 GMT Subject: rpms/dbus-java/F-9 parallel.patch,NONE,1.1 dbus-java.spec,1.1,1.2 Message-ID: <200807071851.m67IpOou024197@cvs-int.fedora.redhat.com> Author: omajid Update of /cvs/pkgs/rpms/dbus-java/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24110 Modified Files: dbus-java.spec Added Files: parallel.patch Log Message: * Mon Jul 7 2008 Omair Majid 2.5-3 - Added a patch to fix the htlatex environment - added -j1 to make to fix the race condition in makefile parallel.patch: --- NEW FILE parallel.patch --- --- a/Makefile 2008-07-07 10:25:37.000000000 -0400 +++ b/Makefile 2008-07-07 14:08:02.000000000 -0400 @@ -128,9 +128,9 @@ (cd doc; dvips -o dbus-java.ps dbus-java.dvi) doc/dbus-java.pdf: doc/dbus-java.dvi .doc (cd doc; pdflatex ../dbus-java.tex) -doc/dbus-java/index.html: dbus-java.tex .doc +doc/dbus-java/index.html: dbus-java.tex doc/dbus-java.dvi .doc mkdir -p doc/dbus-java/ - (cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate") + (cd doc/dbus-java; TEX4HTENV=/usr/share/texmf/tex4ht/base/unix/tex4ht.env htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate") rm -f doc/dbus-java/*{4ct,4tc,aux,dvi,idv,lg,log,tmp,xref} cp doc/dbus-java/dbus-java.html doc/dbus-java/index.html doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc Index: dbus-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-java/F-9/dbus-java.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dbus-java.spec 4 Jul 2008 20:39:00 -0000 1.1 +++ dbus-java.spec 7 Jul 2008 18:50:42 -0000 1.2 @@ -2,7 +2,7 @@ Name: dbus-java Version: 2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java implementation of the DBus protocol Group: Development/Libraries License: AFL or LGPLv2 @@ -12,6 +12,7 @@ Patch0: man_fixes.patch Patch1: docbook.patch Patch2: classpath_fix.patch +Patch3: parallel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,11 +69,13 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # no configure file make %{?_smp_mflags} \ + -j1 \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ @@ -156,6 +159,10 @@ %changelog +* Mon Jul 7 2008 Omair Majid - 2.5-3 +- Added a patch to fix the htlatex environment +- added -j1 to make to fix the race condition in makefile + * Mon Jun 30 2008 Omair Majid - 2.5-2 - fixed incoherent name warning from rpmlint - fixed wrapper script paths From fedora-extras-commits at redhat.com Mon Jul 7 18:54:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:54:25 GMT Subject: rpms/lib3ds/F-9 lib3ds.spec,1.18,1.19 Message-ID: <200807071854.m67IsP1Z024514@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/lib3ds/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24347/F-9 Modified Files: lib3ds.spec Log Message: fix conditional comparison Index: lib3ds.spec =================================================================== RCS file: /cvs/pkgs/rpms/lib3ds/F-9/lib3ds.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- lib3ds.spec 10 Feb 2008 05:45:49 -0000 1.18 +++ lib3ds.spec 7 Jul 2008 18:53:32 -0000 1.19 @@ -1,6 +1,6 @@ Name: lib3ds Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Studio file format library @@ -37,7 +37,7 @@ %doc AUTHORS COPYING ChangeLog README %{_bindir}/3dsdump %{_mandir}/man1/3dsdump.1* -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %{_bindir}/3ds2m %{_mandir}/man1/3ds2m.1* %endif @@ -51,7 +51,7 @@ %description devel Development files for lib3ds -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %package static Summary: %summary Group: Development/Libraries @@ -65,13 +65,13 @@ %setup -q %patch -p1 -P 2 -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %patch -p1 -P 3 %endif %build %configure \ -%if "%{?fedora}" >= "9" +%if 0%{?fedora} >= 9 --disable-static %endif @@ -107,7 +107,7 @@ %postun -p /sbin/ldconfig -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %files static %{_libdir}/*.a %endif @@ -123,6 +123,9 @@ %{_datadir}/aclocal/* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.3.0-3 +- fix conditional comparison + * Sun Feb 10 2008 Ralf Cors??pius - 1.3.0-2 - Rebuild for gcc43. From fedora-extras-commits at redhat.com Mon Jul 7 18:54:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:54:31 GMT Subject: rpms/lib3ds/F-8 lib3ds.spec,1.15,1.16 Message-ID: <200807071854.m67IsV1i024522@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/lib3ds/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24347/F-8 Modified Files: lib3ds.spec Log Message: fix conditional comparison Index: lib3ds.spec =================================================================== RCS file: /cvs/pkgs/rpms/lib3ds/F-8/lib3ds.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- lib3ds.spec 3 Nov 2007 07:27:39 -0000 1.15 +++ lib3ds.spec 7 Jul 2008 18:52:59 -0000 1.16 @@ -1,6 +1,6 @@ Name: lib3ds Version: 1.3.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: 3D Studio file format library @@ -37,7 +37,7 @@ %doc AUTHORS COPYING ChangeLog README %{_bindir}/3dsdump %{_mandir}/man1/3dsdump.1* -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %{_bindir}/3ds2m %{_mandir}/man1/3ds2m.1* %endif @@ -51,7 +51,7 @@ %description devel Development files for lib3ds -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %package static Summary: %summary Group: Development/Libraries @@ -65,13 +65,13 @@ %setup -q %patch -p1 -P 2 -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %patch -p1 -P 3 %endif %build %configure \ -%if "%{?fedora}" >= "9" +%if 0%{?fedora} >= 9 --disable-static %endif @@ -107,7 +107,7 @@ %postun -p /sbin/ldconfig -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %files static %{_libdir}/*.a %endif @@ -123,6 +123,12 @@ %{_datadir}/aclocal/* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.3.0-3 +- fix conditional comparison + +* Sun Feb 10 2008 Ralf Cors??pius - 1.3.0-2 +- Rebuild for gcc43. + * Sat Nov 03 2007 Ralf Cors??pius - 1.3.0-1 - Cleanup spec. - Add post/postun. From fedora-extras-commits at redhat.com Mon Jul 7 18:54:50 2008 From: fedora-extras-commits at redhat.com (Omair Majid (omajid)) Date: Mon, 7 Jul 2008 18:54:50 GMT Subject: rpms/dbus-java/devel parallel.patch, NONE, 1.1 dbus-java.spec, 1.1, 1.2 Message-ID: <200807071854.m67IsoC5024529@cvs-int.fedora.redhat.com> Author: omajid Update of /cvs/pkgs/rpms/dbus-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24449 Modified Files: dbus-java.spec Added Files: parallel.patch Log Message: * Mon Jul 7 2008 Omair Majid 2.5-3 - Added a patch to fix the htlatex environment - added -j1 to make to fix the race condition in makefile parallel.patch: --- NEW FILE parallel.patch --- --- a/Makefile 2008-07-07 10:25:37.000000000 -0400 +++ b/Makefile 2008-07-07 14:08:02.000000000 -0400 @@ -128,9 +128,9 @@ (cd doc; dvips -o dbus-java.ps dbus-java.dvi) doc/dbus-java.pdf: doc/dbus-java.dvi .doc (cd doc; pdflatex ../dbus-java.tex) -doc/dbus-java/index.html: dbus-java.tex .doc +doc/dbus-java/index.html: dbus-java.tex doc/dbus-java.dvi .doc mkdir -p doc/dbus-java/ - (cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate") + (cd doc/dbus-java; TEX4HTENV=/usr/share/texmf/tex4ht/base/unix/tex4ht.env htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate") rm -f doc/dbus-java/*{4ct,4tc,aux,dvi,idv,lg,log,tmp,xref} cp doc/dbus-java/dbus-java.html doc/dbus-java/index.html doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc Index: dbus-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-java/devel/dbus-java.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dbus-java.spec 4 Jul 2008 20:31:51 -0000 1.1 +++ dbus-java.spec 7 Jul 2008 18:54:00 -0000 1.2 @@ -2,7 +2,7 @@ Name: dbus-java Version: 2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java implementation of the DBus protocol Group: Development/Libraries License: AFL or LGPLv2 @@ -12,6 +12,7 @@ Patch0: man_fixes.patch Patch1: docbook.patch Patch2: classpath_fix.patch +Patch3: parallel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,11 +69,13 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # no configure file make %{?_smp_mflags} \ + -j1 \ JARPREFIX=%{_javadir}/%{name} \ BINPREFIX=%{_bindir} \ MANPREFIX=%{_mandir}/man1 \ @@ -156,6 +159,10 @@ %changelog +* Mon Jul 7 2008 Omair Majid - 2.5-3 +- Added a patch to fix the htlatex environment +- added -j1 to make to fix the race condition in makefile + * Mon Jun 30 2008 Omair Majid - 2.5-2 - fixed incoherent name warning from rpmlint - fixed wrapper script paths From fedora-extras-commits at redhat.com Mon Jul 7 18:54:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 18:54:50 GMT Subject: rpms/lib3ds/devel lib3ds.spec,1.18,1.19 Message-ID: <200807071854.m67IsoFR024532@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/lib3ds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24347/devel Modified Files: lib3ds.spec Log Message: fix conditional comparison Index: lib3ds.spec =================================================================== RCS file: /cvs/pkgs/rpms/lib3ds/devel/lib3ds.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- lib3ds.spec 10 Feb 2008 05:45:49 -0000 1.18 +++ lib3ds.spec 7 Jul 2008 18:53:56 -0000 1.19 @@ -1,6 +1,6 @@ Name: lib3ds Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Studio file format library @@ -37,7 +37,7 @@ %doc AUTHORS COPYING ChangeLog README %{_bindir}/3dsdump %{_mandir}/man1/3dsdump.1* -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %{_bindir}/3ds2m %{_mandir}/man1/3ds2m.1* %endif @@ -51,7 +51,7 @@ %description devel Development files for lib3ds -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %package static Summary: %summary Group: Development/Libraries @@ -65,13 +65,13 @@ %setup -q %patch -p1 -P 2 -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %patch -p1 -P 3 %endif %build %configure \ -%if "%{?fedora}" >= "9" +%if 0%{?fedora} >= 9 --disable-static %endif @@ -107,7 +107,7 @@ %postun -p /sbin/ldconfig -%if "%{?fedora}" < "9" +%if 0%{?fedora} < 9 %files static %{_libdir}/*.a %endif @@ -123,6 +123,9 @@ %{_datadir}/aclocal/* %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.3.0-3 +- fix conditional comparison + * Sun Feb 10 2008 Ralf Cors??pius - 1.3.0-2 - Rebuild for gcc43. From fedora-extras-commits at redhat.com Mon Jul 7 18:55:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:55:36 +0000 Subject: [pkgdb] xqf was added for cheekyboinc Message-ID: <200807071855.m67Ita7W024257@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xqf with summary a server browser for many popular games Kevin Fenzi (kevin) has approved Package xqf Kevin Fenzi (kevin) has added a Fedora devel branch for xqf with an owner of cheekyboinc Kevin Fenzi (kevin) has approved xqf in Fedora devel Kevin Fenzi (kevin) has approved Package xqf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xqf (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xqf (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xqf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xqf From fedora-extras-commits at redhat.com Mon Jul 7 18:55:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:55:43 +0000 Subject: [pkgdb] xqf (Fedora, 8) updated by kevin Message-ID: <200807071855.m67Ita7Z024257@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xqf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xqf (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xqf (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xqf (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on xqf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xqf From fedora-extras-commits at redhat.com Mon Jul 7 18:55:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:55:43 +0000 Subject: [pkgdb] xqf (Fedora, 9) updated by kevin Message-ID: <200807071855.m67Ita7c024257@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for xqf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xqf (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xqf (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xqf (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on xqf (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xqf From fedora-extras-commits at redhat.com Mon Jul 7 18:55:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:55:43 +0000 Subject: [pkgdb] xqf (Fedora, devel) updated by kevin Message-ID: <200807071855.m67Itj0a024339@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xqf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xqf From fedora-extras-commits at redhat.com Mon Jul 7 18:56:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 18:56:36 GMT Subject: rpms/xqf - New directory Message-ID: <200807071856.m67Iua1n024691@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xqf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24653/rpms/xqf Log Message: Directory /cvs/extras/rpms/xqf added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 18:56:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 18:56:52 GMT Subject: rpms/xqf/devel - New directory Message-ID: <200807071856.m67Iuq9A024725@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xqf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24653/rpms/xqf/devel Log Message: Directory /cvs/extras/rpms/xqf/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 18:57:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 18:57:07 GMT Subject: rpms/xqf Makefile,NONE,1.1 Message-ID: <200807071857.m67Iv7v3024785@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xqf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24653/rpms/xqf Added Files: Makefile Log Message: Setup of module xqf --- NEW FILE Makefile --- # Top level Makefile for module xqf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 7 18:57:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 18:57:21 GMT Subject: rpms/xqf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807071857.m67IvLZi024832@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xqf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24653/rpms/xqf/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xqf --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xqf # $Id: Makefile,v 1.1 2008/07/07 18:57:08 kevin Exp $ NAME := xqf SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 7 18:59:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 18:59:59 +0000 Subject: [pkgdb] libvirt-java was added for veillard Message-ID: <200807071859.m67Ixxq5024584@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libvirt-java with summary Java bindings for the libvirt virtualization API Kevin Fenzi (kevin) has approved Package libvirt-java Kevin Fenzi (kevin) has added a Fedora devel branch for libvirt-java with an owner of veillard Kevin Fenzi (kevin) has approved libvirt-java in Fedora devel Kevin Fenzi (kevin) has approved Package libvirt-java Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libvirt-java (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libvirt-java (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libvirt-java (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java From fedora-extras-commits at redhat.com Mon Jul 7 19:00:02 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 7 Jul 2008 19:00:02 GMT Subject: rpms/subversion/F-9 sources, 1.28, 1.29 subversion.spec, 1.110, 1.111 upstream, 1.16, 1.17 subversion-1.0.3-pie.patch, 1.9, NONE subversion-1.4.4-macropen.patch, 1.1, NONE subversion-1.4.4-swig1333.patch, 1.1, NONE subversion-1.4.6-javadir.patch, 1.1, NONE Message-ID: <200807071900.m67J02K1025235@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25157 Modified Files: sources subversion.spec upstream Removed Files: subversion-1.0.3-pie.patch subversion-1.4.4-macropen.patch subversion-1.4.4-swig1333.patch subversion-1.4.6-javadir.patch Log Message: * Mon Jul 7 2008 Joe Orton 1.5.0-9.fc9 - rebuild for F9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 21 Dec 2007 19:51:45 -0000 1.28 +++ sources 7 Jul 2008 18:59:06 -0000 1.29 @@ -1 +1 @@ -32786fe2f322982c0567346de18f6460 subversion-1.4.6.tar.gz +c40c1ebc1f228d8ea17dd0e7997a60c1 subversion-1.5.0.tar.gz Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/subversion.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- subversion.spec 3 Mar 2008 23:59:22 -0000 1.110 +++ subversion.spec 7 Jul 2008 18:59:06 -0000 1.111 @@ -1,5 +1,5 @@ # set to zero to avoid running test suite -%define make_check 0 +%define make_check 1 %define with_java 1 @@ -14,8 +14,8 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion -Version: 1.4.6 -Release: 7 +Version: 1.5.0 +Release: 8%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -25,11 +25,9 @@ Source4: http://www.xsteve.at/prg/emacs/psvn.el Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-0.31.0-rpath.patch -Patch6: subversion-1.0.3-pie.patch +Patch6: subversion-1.5.0-pie.patch Patch7: subversion-1.1.3-java.patch -Patch8: subversion-1.4.4-macropen.patch -Patch9: subversion-1.4.4-swig1333.patch -Patch10: subversion-1.4.6-javadir.patch +Patch8: subversion-1.5.0-perl510.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7 @@ -87,7 +85,7 @@ Group: Development/Libraries Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-devel +BuildRequires: java-devel-openjdk %description javahl This package includes the JNI bindings to the Subversion libraries. @@ -111,12 +109,11 @@ %if %{with_java} %patch7 -p1 -b .java %endif -%patch8 -p1 -b .macropen -%patch9 -p1 -b .swig133 -%patch10 -p1 -b .javadir +%patch8 -p1 -b .perl510 %build -./autogen.sh +# Regenerate after patches to build.conf et al +autoheader && autoconf && ./gen-make.py --reload # fix shebang lines, #111498 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in @@ -127,19 +124,17 @@ export svn_cv_ruby_sitedir_archsuffix="" export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} -export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25" %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --with-swig --with-neon=%{_prefix} \ --with-ruby-sitedir=%{ruby_sitearch} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation \ - --disable-static --disable-neon-version-check -# 1.3.0 tarball ships with generated swig sources -make extraclean-swig-headers + --disable-static make %{?_smp_mflags} all make swig-py swig-py-lib %{swigdirs} make swig-pl swig-pl-lib swig-rb swig-rb-lib %if %{with_java} -make %{?_smp_mflags} javahl +# javahl does not parallel-make +make javahl %endif %install @@ -229,7 +224,9 @@ %defattr(-,root,root) %doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES %doc tools subversion/LICENSE mod_authz_svn-INSTALL -%doc contrib/client-side/svn_load_dirs{.pl,_*,.README} +%doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README} +%doc contrib/client-side/svnmerge/*.{README,py} +%doc contrib/client-side/wcgrep %{_bindir}/* %{_libdir}/libsvn_*.so.* %{_mandir}/man*/* @@ -278,6 +275,31 @@ %endif %changelog +* Mon Jul 7 2008 Joe Orton 1.5.0-9.fc9 +- rebuild for F9 + +* Thu Jul 3 2008 Joe Orton 1.5.0-8 +- require suitable APR + +* Thu Jul 3 2008 Joe Orton 1.5.0-7 +- add svnmerge and wcgrep to docdir (Edward Rudd, #451932) +- drop neon version overrides + +* Wed Jul 2 2008 Joe Orton 1.5.0-6 +- build with OpenJDK + +* Wed Jul 2 2008 Joe Orton 1.5.0-5 +- fix files list + +* Wed Jul 2 2008 Joe Orton 1.5.0-4 +- swig-perl test suite fix for Perl 5.10 (upstream r31546) + +* Tue Jul 1 2008 Joe Orton 1.5.0-3 +- attempt build without java bits + +* Thu Jun 26 2008 Joe Orton 1.5.0-2 +- update to 1.5.0 + * Mon Mar 3 2008 Tom "spot" Callaway 1.4.6-7 - tests are randomly failing, unrelated to new perl, disabled tests Index: upstream =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/upstream,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- upstream 21 Dec 2007 19:51:45 -0000 1.16 +++ upstream 7 Jul 2008 18:59:06 -0000 1.17 @@ -1 +1 @@ -subversion-1.4.6.tar.gz +subversion-1.5.0.tar.gz --- subversion-1.0.3-pie.patch DELETED --- --- subversion-1.4.4-macropen.patch DELETED --- --- subversion-1.4.4-swig1333.patch DELETED --- --- subversion-1.4.6-javadir.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 19:00:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 19:00:07 +0000 Subject: [pkgdb] libvirt-java (Fedora, devel) updated by kevin Message-ID: <200807071900.m67J07T4024623@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libvirt-java (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java From fedora-extras-commits at redhat.com Mon Jul 7 19:00:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 19:00:07 +0000 Subject: [pkgdb] libvirt-java (Fedora, 9) updated by kevin Message-ID: <200807071900.m67J07T7024623@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for libvirt-java Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libvirt-java (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libvirt-java (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libvirt-java (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on libvirt-java (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java From fedora-extras-commits at redhat.com Mon Jul 7 19:00:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 19:00:51 GMT Subject: rpms/libvirt-java - New directory Message-ID: <200807071900.m67J0pGR025343@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libvirt-java In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL25304/rpms/libvirt-java Log Message: Directory /cvs/extras/rpms/libvirt-java added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 19:01:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 19:01:04 GMT Subject: rpms/libvirt-java/devel - New directory Message-ID: <200807071901.m67J14D8029695@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libvirt-java/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL25304/rpms/libvirt-java/devel Log Message: Directory /cvs/extras/rpms/libvirt-java/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 7 19:01:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 19:01:21 GMT Subject: rpms/libvirt-java Makefile,NONE,1.1 Message-ID: <200807071901.m67J1L1j031927@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libvirt-java In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL25304/rpms/libvirt-java Added Files: Makefile Log Message: Setup of module libvirt-java --- NEW FILE Makefile --- # Top level Makefile for module libvirt-java all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 7 19:01:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 7 Jul 2008 19:01:37 GMT Subject: rpms/libvirt-java/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807071901.m67J1bSQ031962@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libvirt-java/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL25304/rpms/libvirt-java/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libvirt-java --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libvirt-java # $Id: Makefile,v 1.1 2008/07/07 19:01:21 kevin Exp $ NAME := libvirt-java SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 7 19:02:22 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 7 Jul 2008 19:02:22 GMT Subject: rpms/subversion/F-9 subversion-1.5.0-perl510.patch, NONE, 1.1 subversion-1.5.0-pie.patch, NONE, 1.1 Message-ID: <200807071902.m67J2Mc0032167@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32101 Added Files: subversion-1.5.0-perl510.patch subversion-1.5.0-pie.patch Log Message: - add missing patches subversion-1.5.0-perl510.patch: --- NEW FILE subversion-1.5.0-perl510.patch --- upstream r31546 --- subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t.perl510 +++ subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t @@ -221,8 +221,7 @@ sub add_file { sub apply_textdelta { my ($self, $baton, $base_checksum, $pool) = @_; - my $data = $baton->{data} = \''; - open my $out_fh, '>', $data + open my $out_fh, '>', \$baton->{data} or die "error opening in-memory file to store Subversion update: $!"; open my $in_fh, '<', \'' or die "error opening in-memory file for delta source: $!"; subversion-1.5.0-pie.patch: --- NEW FILE subversion-1.5.0-pie.patch --- --- subversion-1.5.0/build.conf.pie +++ subversion-1.5.0/build.conf @@ -452,7 +452,7 @@ type = swig_lib lang = python path = subversion/bindings/swig/python/libsvn_swig_py libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr -link-cmd = $(LINK) $(SWIG_PY_LIBS) +link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS) install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) @@ -475,7 +475,7 @@ type = swig_lib lang = ruby path = subversion/bindings/swig/ruby/libsvn_swig_ruby libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr -link-cmd = $(LINK) $(SWIG_RB_LIBS) +link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS) install = swig-rb-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_RB) --- subversion-1.5.0/build/generator/gen_base.py.pie +++ subversion-1.5.0/build/generator/gen_base.py @@ -411,6 +411,9 @@ class TargetExe(TargetLinked): self.manpages = options.get('manpages', '') self.testing = options.get('testing') + if self.install == 'test' or self.install == 'bdb-test': + self.link_cmd = '$(LINK_TEST)' + def add_dependencies(self): TargetLinked.add_dependencies(self) @@ -453,8 +456,11 @@ class TargetLib(TargetLinked): self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target self.msvc_export = string.split(options.get('msvc-export', '')) - ### hmm. this is Makefile-specific - self.link_cmd = '$(LINK_LIB)' + ### more Makefile-specific stuff: + if self.install == 'test': + self.link_cmd = '$(LINK_TEST_LIB)' + elif self.link_cmd == '$(LINK)': + self.link_cmd = '$(LINK_LIB)' class TargetApacheMod(TargetLib): --- subversion-1.5.0/Makefile.in.pie +++ subversion-1.5.0/Makefile.in @@ -2,7 +2,7 @@ # Makefile.in: template Makefile for Subversion # # ==================================================================== -# Copyright (c) 2000-2006 CollabNet. All rights reserved. +# Copyright (c) 2000-2006, 2008 CollabNet. All rights reserved. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -150,9 +150,10 @@ CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS) CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) -COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) +BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) +COMPILE = $(BASE_COMPILE) -fpie COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) +LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE) # special compilation for files destined for mod_dav_svn COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c @@ -167,8 +168,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) COMPILE_JAVAHL_JAVAH = $(JAVAH) -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -LINK_LIB = $(LINK) -rpath $(libdir) +BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) +LINK = $(BASE_LINK) -pie +LINK_TEST = $(BASE_LINK) -no-install +LINK_LIB = $(BASE_LINK) -rpath $(libdir) +LINK_TEST_LIB = $(BASE_LINK) # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) From fedora-extras-commits at redhat.com Mon Jul 7 19:07:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:07:12 GMT Subject: rpms/libdv/F-9 libdv.spec,1.24,1.25 Message-ID: <200807071907.m67J7C01032637@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/libdv/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32524/F-9 Modified Files: libdv.spec Log Message: fix conditional comparison Index: libdv.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdv/F-9/libdv.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libdv.spec 14 Feb 2008 18:46:01 -0000 1.24 +++ libdv.spec 7 Jul 2008 19:06:18 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Software decoder for DV format video Name: libdv Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libdv.sourceforge.net/ @@ -14,7 +14,7 @@ BuildRequires: libXt-devel, libXv-devel # Required for the gtk2 patch BuildRequires: autoconf, automake, libtool, SDL-devel -%if "%{?fedora}" >= "8" +%if 0%{?fedora} >= 8 BuildRequires: popt-devel %endif ExcludeArch: s390 s390x @@ -96,6 +96,9 @@ %{_libdir}/pkgconfig/libdv.pc %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 1.0.0-5 +- fix conditional comparison + * Thu Feb 14 2008 Jarod Wilson 1.0.0-4 - Bump and rebuild with gcc 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:07:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:07:18 GMT Subject: rpms/libdv/F-8 libdv.spec,1.23,1.24 Message-ID: <200807071907.m67J7IQL032642@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/libdv/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32524/F-8 Modified Files: libdv.spec Log Message: fix conditional comparison Index: libdv.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdv/F-8/libdv.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libdv.spec 12 Sep 2007 14:20:12 -0000 1.23 +++ libdv.spec 7 Jul 2008 19:05:54 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Software decoder for DV format video Name: libdv Version: 1.0.0 -Release: 3%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libdv.sourceforge.net/ @@ -14,7 +14,7 @@ BuildRequires: libXt-devel, libXv-devel # Required for the gtk2 patch BuildRequires: autoconf, automake, libtool, SDL-devel -%if "%{?fedora}" >= "8" +%if 0%{?fedora} >= 8 BuildRequires: popt-devel %endif ExcludeArch: s390 s390x @@ -96,6 +96,12 @@ %{_libdir}/pkgconfig/libdv.pc %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 1.0.0-5 +- fix conditional comparison + +* Thu Feb 14 2008 Jarod Wilson 1.0.0-4 +- Bump and rebuild with gcc 4.3 + * Wed Sep 12 2007 Jarod Wilson 1.0.0-3 - A few more fixes from Matthias Saou: - List man pages in %%files consistently w/o gz extension From fedora-extras-commits at redhat.com Mon Jul 7 19:07:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:07:38 GMT Subject: rpms/libdv/devel libdv.spec,1.24,1.25 Message-ID: <200807071907.m67J7c5l032658@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/libdv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32524/devel Modified Files: libdv.spec Log Message: fix conditional comparison Index: libdv.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdv/devel/libdv.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libdv.spec 14 Feb 2008 18:46:01 -0000 1.24 +++ libdv.spec 7 Jul 2008 19:06:43 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Software decoder for DV format video Name: libdv Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libdv.sourceforge.net/ @@ -14,7 +14,7 @@ BuildRequires: libXt-devel, libXv-devel # Required for the gtk2 patch BuildRequires: autoconf, automake, libtool, SDL-devel -%if "%{?fedora}" >= "8" +%if 0%{?fedora} >= 8 BuildRequires: popt-devel %endif ExcludeArch: s390 s390x @@ -96,6 +96,9 @@ %{_libdir}/pkgconfig/libdv.pc %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 1.0.0-5 +- fix conditional comparison + * Thu Feb 14 2008 Jarod Wilson 1.0.0-4 - Bump and rebuild with gcc 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:08:49 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 7 Jul 2008 19:08:49 GMT Subject: rpms/wordwarvi/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wordwarvi.spec, 1.8, 1.9 Message-ID: <200807071908.m67J8nUa032763@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/wordwarvi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32695 Modified Files: .cvsignore sources wordwarvi.spec Log Message: * Mon Jul 7 2008 Hans de Goede 0.18-1 - New upstream release 0.18 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wordwarvi/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 30 Jun 2008 04:27:30 -0000 1.8 +++ .cvsignore 7 Jul 2008 19:08:07 -0000 1.9 @@ -1 +1 @@ -wordwarvi-0.17.tar.gz +wordwarvi-0.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wordwarvi/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Jun 2008 04:27:30 -0000 1.8 +++ sources 7 Jul 2008 19:08:07 -0000 1.9 @@ -1 +1 @@ -af4b37204ce7cdbb494343dec682460d wordwarvi-0.17.tar.gz +f27612d74af25eab73471fac7ed6bdc7 wordwarvi-0.18.tar.gz Index: wordwarvi.spec =================================================================== RCS file: /cvs/extras/rpms/wordwarvi/devel/wordwarvi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wordwarvi.spec 30 Jun 2008 04:27:30 -0000 1.8 +++ wordwarvi.spec 7 Jul 2008 19:08:07 -0000 1.9 @@ -1,5 +1,5 @@ Name: wordwarvi -Version: 0.17 +Version: 0.18 Release: 1%{?dist} Summary: Side-scrolling shoot 'em up '80s style arcade game Group: Amusements/Games @@ -74,6 +74,9 @@ %changelog +* Mon Jul 7 2008 Hans de Goede 0.18-1 +- New upstream release 0.18 + * Mon Jun 30 2008 Hans de Goede 0.17-1 - New upstream release 0.17 From fedora-extras-commits at redhat.com Mon Jul 7 19:08:57 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Mon, 7 Jul 2008 19:08:57 GMT Subject: rpms/gnome-chemistry-utils/F-9 gnome-chemistry-utils.spec, 1.19, 1.20 Message-ID: <200807071908.m67J8vLF000306@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gnome-chemistry-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32687 Modified Files: gnome-chemistry-utils.spec Log Message: * Mon Jul 7 2008 Julian Sikorski - 0.8.7-2 - Rebuilt for new openbabel Index: gnome-chemistry-utils.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-9/gnome-chemistry-utils.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gnome-chemistry-utils.spec 19 Mar 2008 22:43:37 -0000 1.19 +++ gnome-chemistry-utils.spec 7 Jul 2008 19:08:02 -0000 1.20 @@ -1,6 +1,6 @@ Name: gnome-chemistry-utils Version: 0.8.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A set of chemical utilities Group: Applications/Engineering @@ -202,6 +202,9 @@ %changelog +* Mon Jul 7 2008 Julian Sikorski - 0.8.7-2 +- Rebuilt for new openbabel + * Wed Mar 19 2008 Julian Sikorski - 0.8.7-1 - Updated to 0.8.7 From fedora-extras-commits at redhat.com Mon Jul 7 19:12:21 2008 From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole)) Date: Mon, 7 Jul 2008 19:12:21 GMT Subject: rpms/jpackage-utils/devel jpackage-utils-own-mavendirs.patch, NONE, 1.1 jpackage-utils.spec, 1.40, 1.41 Message-ID: <200807071912.m67JCLcB000620@cvs-int.fedora.redhat.com> Author: dbhole Update of /cvs/pkgs/rpms/jpackage-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv549 Modified Files: jpackage-utils.spec Added Files: jpackage-utils-own-mavendirs.patch Log Message: - Add ownership of maven directories jpackage-utils-own-mavendirs.patch: --- NEW FILE jpackage-utils-own-mavendirs.patch --- diff -up ./misc/macros.jpackage.sav ./misc/macros.jpackage --- ./misc/macros.jpackage.sav 2008-01-04 06:21:42.000000000 -0500 +++ ./misc/macros.jpackage 2008-07-07 14:39:34.000000000 -0400 @@ -88,6 +88,9 @@ # %_javadocdir %{_datadir}/javadoc +# Directory for maven poms +%_mavenpomdir /usr/share/maven2/poms + # # Directory for maven depmaps # Index: jpackage-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- jpackage-utils.spec 2 Apr 2008 20:29:53 -0000 1.40 +++ jpackage-utils.spec 7 Jul 2008 19:11:38 -0000 1.41 @@ -34,13 +34,14 @@ Name: jpackage-utils Version: 1.7.5 -Release: 1jpp.1%{?dist} +Release: 1jpp.2%{?dist} Epoch: 0 Summary: JPackage utilities License: JPackage License URL: http://www.jpackage.org/ Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-enable-gcj-support.patch +Patch1: %{name}-own-mavendirs.patch Group: Utilities BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -89,6 +90,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 %build echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \ @@ -134,6 +136,7 @@ install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.3.1,1.4.0,1.4.1,1.4.2} install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0} install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir} +install -dm 755 ${RPM_BUILD_ROOT}${_mavenpomdir} install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapdir} install -pm 755 bin/* ${RPM_BUILD_ROOT}%{_bindir} @@ -204,6 +207,9 @@ %dir ${_jnidir} %dir ${_jnidir}-* %dir ${_javadocdir} +%dir %{_datadir}/maven2 +%dir ${_mavenpomdir} +%dir %{_sysconfdir}/maven %dir ${_mavendepmapdir} ${_javadir}-utils/* %config %{_sysconfdir}/java/jpackage-release @@ -223,6 +229,9 @@ %changelog +* Mon Jul 07 2008 Deepak Bhole 1.7.5-1jpp.2 +- Add ownership of maven directories + * Wed Apr 2 2008 Thomas Fitzsimmons - 0:1.7.5-1jpp.1 - Import jpackage-utils 1.7.5-1jpp. - Update IcedTea references to OpenJDK. From fedora-extras-commits at redhat.com Mon Jul 7 19:12:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:12:31 GMT Subject: rpms/monodevelop/F-9 monodevelop.spec,1.27,1.28 Message-ID: <200807071912.m67JCVVW000643@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/monodevelop/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471/F-9 Modified Files: monodevelop.spec Log Message: fix conditional comparison Index: monodevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/F-9/monodevelop.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- monodevelop.spec 16 May 2008 10:23:52 -0000 1.27 +++ monodevelop.spec 7 Jul 2008 19:11:40 -0000 1.28 @@ -8,7 +8,7 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2 @@ -25,7 +25,7 @@ BuildRequires: boo-devel Requires: boo %endif -%if "%{?fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: mono-addins-devel Requires: mono-addins %endif @@ -137,6 +137,9 @@ %{__rm} -rf %{buildroot} %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 1.0-7 +- fix conditional comparison + * Tue May 06 2008 Paul F. Johnson 1.0-6 - added br mono-tools - removed prepackaged mime From fedora-extras-commits at redhat.com Mon Jul 7 19:12:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:12:40 GMT Subject: rpms/monodevelop/F-8 monodevelop.spec,1.15,1.16 Message-ID: <200807071912.m67JCe2d000691@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/monodevelop/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471/F-8 Modified Files: monodevelop.spec Log Message: fix conditional comparison Index: monodevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/F-8/monodevelop.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- monodevelop.spec 8 Mar 2007 23:55:01 -0000 1.15 +++ monodevelop.spec 7 Jul 2008 19:11:18 -0000 1.16 @@ -1,4 +1,4 @@ -%if "%{?fedora}" == "5" +%if 0%{?fedora} == 5 %define monodir %{_prefix}/lib %else %define monodir %{_libdir} @@ -7,7 +7,7 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop Version: 0.13.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPL Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz @@ -16,7 +16,7 @@ Patch1: monodevelop-config.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel boo-devel subversion-devel -%if "%{?fedora}" == "5" +%if 0%{?fedora} == 5 BuildRequires: gecko-sharp2 gtk-sharp2 mono-nunit %else BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel @@ -40,7 +40,7 @@ %prep %setup -q -%if "%{?fedora}" > "5" +%if 0%{?fedora} > 5 %patch0 -p1 -b .orig autoreconf -f -i -s %endif @@ -95,6 +95,9 @@ %{__rm} -rf %{buildroot} %changelog +* Mon Jul 07 2008 Tom "spot" Callaway 0.13.1-1.1 +- fix conditional comparison + * Thu Mar 08 2007 Paul F. Johnson 0.13.1-1 - bugfixes to the source From fedora-extras-commits at redhat.com Mon Jul 7 19:12:58 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:12:58 GMT Subject: rpms/monodevelop/devel monodevelop.spec,1.28,1.29 Message-ID: <200807071912.m67JCw53000702@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/monodevelop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471/devel Modified Files: monodevelop.spec Log Message: fix conditional comparison Index: monodevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- monodevelop.spec 30 Apr 2008 12:03:25 -0000 1.28 +++ monodevelop.spec 7 Jul 2008 19:12:01 -0000 1.29 @@ -8,7 +8,7 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop Version: 1.0 -Release: 4%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2 @@ -18,18 +18,19 @@ Patch2: monodevelop-0.19-use-system-Mono.Cecil.patch Patch3: mdtool.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel +BuildRequires: mono-devel, gtk-sharp2-devel, intltool, gettext-devel, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview2-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel mono-core -BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel gtksourceview-sharp-devel +BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel gtksourceview2-sharp-devel mono-tools-devel %ifarch !ppc BuildRequires: boo-devel Requires: boo %endif -%if "%{?fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: mono-addins-devel Requires: mono-addins %endif Requires: mono-core, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi, gnome-sharp, firefox > 1.99, xsp, subversion, mono-data-sqlite +Requires: mono-tools # ikvm doesn't build from source at the moment. If it does at some point in the future, uncomment this line. # Requires: ikvm @@ -78,7 +79,7 @@ cp %{_libdir}/mono/nunit22/nunit.framework.dll src/addins/NUnit/lib/ %build -%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2 +%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2 make # no smp flags as it falls over during the build (race condition) @@ -92,6 +93,17 @@ --delete-original \ %{buildroot}%{_datadir}/applications/monodevelop.desktop +#remove package mime caches +%{__rm} -f %{buildroot}%{_datadir}/mime/XMLnamespaces +%{__rm} -f %{buildroot}%{_datadir}/mime/aliases +%{__rm} -f %{buildroot}%{_datadir}/mime/application/* +%{__rm} -f %{buildroot}%{_datadir}/mime/text/* +%{__rm} -f %{buildroot}%{_datadir}/mime/globs +%{__rm} -f %{buildroot}%{_datadir}/mime/magic +%{__rm} -f %{buildroot}%{_datadir}/mime/subclasses +%{__rm} -f %{buildroot}%{_datadir}/mime/mime.cache +%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache + %post update-mime-database %{_datadir}/mime &> /dev/null || : update-desktop-database &> /dev/null || : @@ -106,15 +118,7 @@ %{_bindir}/monodevelop %doc AUTHORS COPYING ChangeLog README %{_libdir}/monodevelop/ -%exclude %{_datadir}/mime/XMLnamespaces -%exclude %{_datadir}/mime/aliases -%{_datadir}/mime/globs -%{_datadir}/mime/magic -%{_datadir}/mime/mime.cache %{_datadir}/mime/packages/monodevelop.xml -%{_datadir}/mime/application/*.xml -%exclude %{_datadir}/mime/subclasses -%{_datadir}/mime/text/x-*.xml %{_datadir}/applications/fedora-monodevelop.desktop %{_datadir}/man/man1/mdtool.1.gz %{_datadir}/man/man1/monodevelop.1.gz @@ -133,6 +137,17 @@ %{__rm} -rf %{buildroot} %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 1.0-7 +- fix conditional comparison + +* Tue May 06 2008 Paul F. Johnson 1.0-6 +- added br mono-tools +- removed prepackaged mime + +* Thu May 01 2008 Paul F. Johnson 1.0-5.1 +- attempt a fix for a text editor to work +- rebuild + * Wed Apr 30 2008 Paul F. Johnson 1.0-4 - mdtool fix From fedora-extras-commits at redhat.com Mon Jul 7 19:15:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ale=C5=A1_Koval?= (als)) Date: Mon, 7 Jul 2008 19:15:05 GMT Subject: rpms/fpm2/F-8 .cvsignore,1.1,1.2 fpm2.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807071915.m67JF5w9000845@cvs-int.fedora.redhat.com> Author: als Update of /cvs/pkgs/rpms/fpm2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792 Modified Files: .cvsignore fpm2.spec sources Log Message: Update to 0.72 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2008 19:45:37 -0000 1.1 +++ .cvsignore 7 Jul 2008 19:14:19 -0000 1.2 @@ -0,0 +1 @@ +fpm2-0.72.tar.bz2 Index: fpm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-8/fpm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpm2.spec 9 May 2008 06:51:35 -0000 1.1 +++ fpm2.spec 7 Jul 2008 19:14:19 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.71 -Release: 2%{?dist} +Version: 0.72 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.bz2 @@ -25,6 +25,8 @@ characters (lower case, upper case, numbers and symbols) should be used. You can even have it avoid ambiguous characters such as a capital O or the number zero. +- Auto-minimise and/or auto-locking passwords database after configurable time + to the tray icon. %prep %setup -q @@ -57,6 +59,9 @@ %{_datadir}/applications/*.desktop %changelog +* Mon Jul 7 2008 Ale?? Koval - 0.72-1 +- Update to 0.72 + * Thu May 8 2008 Ale?? Koval - 0.71-2 - Fix %%files section (#444830) - desktop-file-install now delete original .desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 May 2008 06:51:35 -0000 1.2 +++ sources 7 Jul 2008 19:14:19 -0000 1.3 @@ -1 +1 @@ -d12bda1f4f3b3f7bb4105471ed25cb9b fpm2-0.71.tar.bz2 +608e78db5b771a719ad1aeb506b92fb2 fpm2-0.72.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 19:16:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:16:24 GMT Subject: rpms/mysql-gui-tools/F-9 mysql-gui-tools.spec,1.7,1.8 Message-ID: <200807071916.m67JGOdo000987@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mysql-gui-tools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv890/F-9 Modified Files: mysql-gui-tools.spec Log Message: fix conditional comparison Index: mysql-gui-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql-gui-tools/F-9/mysql-gui-tools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mysql-gui-tools.spec 18 Feb 2008 20:14:07 -0000 1.7 +++ mysql-gui-tools.spec 7 Jul 2008 19:15:38 -0000 1.8 @@ -1,6 +1,6 @@ Name: mysql-gui-tools Version: 5.0r12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI tools to manage mysql Databases Group: Applications/Databases @@ -17,10 +17,10 @@ BuildRequires: libtool, expat-devel, readline-devel BuildRequires: libgnomeprint22-devel -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 BuildRequires: java-1.4.2-gcj-compat-devel %endif -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: java-1.5.0-gcj-devel %endif Requires: mysql-administrator, mysql-query-browser @@ -33,13 +33,13 @@ backup and restore, and viewing logs can also be performed through the MySQL Administrator graphical console. -%if "%{?fedora}" > "3" +%if 0%{?fedora} > 3 %define gtkhtmlver 3.6 %endif -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 %define gtkhtmlver 3.8 %endif -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 %define gtkhtmlver 3.14 %endif @@ -181,6 +181,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 5.0r12-7 +- fix conditional comparison + * Mon Feb 18 2008 Fedora Release Engineering - 5.0r12-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:16:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:16:38 GMT Subject: rpms/mysql-gui-tools/F-8 mysql-gui-tools.spec,1.5,1.6 Message-ID: <200807071916.m67JGcdC001005@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mysql-gui-tools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv890/F-8 Modified Files: mysql-gui-tools.spec Log Message: fix conditional comparison Index: mysql-gui-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql-gui-tools/F-8/mysql-gui-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mysql-gui-tools.spec 27 Nov 2007 22:35:37 -0000 1.5 +++ mysql-gui-tools.spec 7 Jul 2008 19:15:16 -0000 1.6 @@ -1,6 +1,6 @@ Name: mysql-gui-tools Version: 5.0r12 -Release: 4%{?dist} +Release: 7%{?dist} Summary: GUI tools to manage mysql Databases Group: Applications/Databases @@ -17,10 +17,10 @@ BuildRequires: libtool, expat-devel, readline-devel BuildRequires: libgnomeprint22-devel -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 BuildRequires: java-1.4.2-gcj-compat-devel %endif -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: java-1.5.0-gcj-devel %endif Requires: mysql-administrator, mysql-query-browser @@ -33,13 +33,13 @@ backup and restore, and viewing logs can also be performed through the MySQL Administrator graphical console. -%if "%{?fedora}" > "3" +%if 0%{?fedora} > 3 %define gtkhtmlver 3.6 %endif -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 %define gtkhtmlver 3.8 %endif -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 %define gtkhtmlver 3.14 %endif @@ -181,6 +181,15 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 5.0r12-7 +- fix conditional comparison + +* Mon Feb 18 2008 Fedora Release Engineering - 5.0r12-6 +- Autorebuild for GCC 4.3 + +* Thu Dec 06 2007 Release Engineering - 5.0r12-5 +- Rebuild for deps + * Tue Nov 27 2007 Dennis Gilmore - 5.0r12-4 - apply patch that fixes bug 266781 From fedora-extras-commits at redhat.com Mon Jul 7 19:16:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:16:45 GMT Subject: rpms/mysql-gui-tools/devel mysql-gui-tools.spec,1.7,1.8 Message-ID: <200807071916.m67JGjFB001015@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mysql-gui-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv890/devel Modified Files: mysql-gui-tools.spec Log Message: fix conditional comparison Index: mysql-gui-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql-gui-tools/devel/mysql-gui-tools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mysql-gui-tools.spec 18 Feb 2008 20:14:07 -0000 1.7 +++ mysql-gui-tools.spec 7 Jul 2008 19:15:55 -0000 1.8 @@ -1,6 +1,6 @@ Name: mysql-gui-tools Version: 5.0r12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI tools to manage mysql Databases Group: Applications/Databases @@ -17,10 +17,10 @@ BuildRequires: libtool, expat-devel, readline-devel BuildRequires: libgnomeprint22-devel -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 BuildRequires: java-1.4.2-gcj-compat-devel %endif -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: java-1.5.0-gcj-devel %endif Requires: mysql-administrator, mysql-query-browser @@ -33,13 +33,13 @@ backup and restore, and viewing logs can also be performed through the MySQL Administrator graphical console. -%if "%{?fedora}" > "3" +%if 0%{?fedora} > 3 %define gtkhtmlver 3.6 %endif -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 %define gtkhtmlver 3.8 %endif -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 %define gtkhtmlver 3.14 %endif @@ -181,6 +181,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 5.0r12-7 +- fix conditional comparison + * Mon Feb 18 2008 Fedora Release Engineering - 5.0r12-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:18:05 2008 From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole)) Date: Mon, 7 Jul 2008 19:18:05 GMT Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.41,1.42 Message-ID: <200807071918.m67JI55h001160@cvs-int.fedora.redhat.com> Author: dbhole Update of /cvs/pkgs/rpms/jpackage-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1028 Modified Files: jpackage-utils.spec Log Message: Add mavenpomdir macro to list of macros read initially Index: jpackage-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- jpackage-utils.spec 7 Jul 2008 19:11:38 -0000 1.41 +++ jpackage-utils.spec 7 Jul 2008 19:17:19 -0000 1.42 @@ -106,7 +106,7 @@ jvmdir jvmjardir jvmprivdir \ jvmlibdir jvmdatadir jvmsysconfdir \ jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \ - javadir jnidir javadocdir mavendepmapdir; do + javadir jnidir javadocdir mavenpomdir mavendepmapdir; do export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \ misc/macros.jpackage | %{__awk} '{ print $2 }')) done From fedora-extras-commits at redhat.com Mon Jul 7 19:18:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:18:20 GMT Subject: rpms/pam_usb/F-9 pam_usb.spec,1.6,1.7 Message-ID: <200807071918.m67JIK3p001183@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/pam_usb/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1062/F-9 Modified Files: pam_usb.spec Log Message: fix conditional comparison Index: pam_usb.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_usb/F-9/pam_usb.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pam_usb.spec 11 May 2007 21:11:37 -0000 1.6 +++ pam_usb.spec 7 Jul 2008 19:17:29 -0000 1.7 @@ -1,8 +1,8 @@ Name: pam_usb Summary: Authentication using ordinary USB Flash Drives Version: 0.4.0 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2 Group: System Environment/Base URL: http://www.pamusb.org Source0: http://dl.sourceforge.net/pamusb/%{name}-%{version}.tar.gz @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, hal-devel, pygobject2-devel, libxml2-devel Requires: pygobject2 -%if "%{?fedora}" < "7" +%if 0%{?fedora} < 7 BuildRequires: python-elementtree Requires: python-elementtree %endif @@ -79,6 +79,10 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.4.0-2 +- fix license tag +- fix conditional comparisons + * Sat May 5 2007 John Mahowald - 0.4.0-1 - 0.4.0 - drop hotplug subpackage From fedora-extras-commits at redhat.com Mon Jul 7 19:18:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:18:40 GMT Subject: rpms/pam_usb/devel pam_usb.spec,1.6,1.7 Message-ID: <200807071918.m67JIepJ001192@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/pam_usb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1062/devel Modified Files: pam_usb.spec Log Message: fix conditional comparison Index: pam_usb.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_usb/devel/pam_usb.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pam_usb.spec 11 May 2007 21:11:37 -0000 1.6 +++ pam_usb.spec 7 Jul 2008 19:17:50 -0000 1.7 @@ -1,8 +1,8 @@ Name: pam_usb Summary: Authentication using ordinary USB Flash Drives Version: 0.4.0 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2 Group: System Environment/Base URL: http://www.pamusb.org Source0: http://dl.sourceforge.net/pamusb/%{name}-%{version}.tar.gz @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, hal-devel, pygobject2-devel, libxml2-devel Requires: pygobject2 -%if "%{?fedora}" < "7" +%if 0%{?fedora} < 7 BuildRequires: python-elementtree Requires: python-elementtree %endif @@ -79,6 +79,10 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.4.0-2 +- fix license tag +- fix conditional comparisons + * Sat May 5 2007 John Mahowald - 0.4.0-1 - 0.4.0 - drop hotplug subpackage From fedora-extras-commits at redhat.com Mon Jul 7 19:20:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:20:30 GMT Subject: rpms/perl-Crypt-Simple/F-9 perl-Crypt-Simple.spec,1.3,1.4 Message-ID: <200807071920.m67JKU5W001355@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-Simple/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1225/F-9 Modified Files: perl-Crypt-Simple.spec Log Message: fix conditional comparison Index: perl-Crypt-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Simple/F-9/perl-Crypt-Simple.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Crypt-Simple.spec 7 Mar 2008 01:57:54 -0000 1.3 +++ perl-Crypt-Simple.spec 7 Jul 2008 19:19:45 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Crypt-Simple Version: 0.06 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Encrypt stuff simply Group: Development/Libraries @@ -11,12 +11,12 @@ BuildArch: noarch -%if "%fedora" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl perl-Crypt-Blowfish perl-FreezeThaw perl-Compress-Zlib BuildRequires: perl-ExtUtils-MakeMaker perl-Test-Simple %endif -%if "%fedora" == "6" +%if 0%{?fedora} == 6 BuildRequires: perl perl-Crypt-Blowfish perl-FreezeThaw perl-Compress-Zlib %endif @@ -65,9 +65,11 @@ %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-5 -Rebuild for new perl +* Mon Jul 07 2008 Tom "spot" Callaway - 0.06-6 +- fix conditional comparison +* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-5 +- Rebuild for new perl * Mon Jul 9 2007 Allisson Azevedo 0.06-4 - Add exception for FC-6 From fedora-extras-commits at redhat.com Mon Jul 7 19:20:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:20:44 GMT Subject: rpms/perl-Crypt-Simple/F-8 perl-Crypt-Simple.spec,1.2,1.3 Message-ID: <200807071920.m67JKiZq001373@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-Simple/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1225/F-8 Modified Files: perl-Crypt-Simple.spec Log Message: fix conditional comparison Index: perl-Crypt-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Simple/F-8/perl-Crypt-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Crypt-Simple.spec 9 Jul 2007 18:36:02 -0000 1.2 +++ perl-Crypt-Simple.spec 7 Jul 2008 19:19:25 -0000 1.3 @@ -1,22 +1,22 @@ Name: perl-Crypt-Simple Version: 0.06 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Encrypt stuff simply Group: Development/Libraries -License: GPL +License: GPLv2+ URL: http://search.cpan.org/dist/Crypt-Simple/ Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Crypt-Simple-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -%if "%fedora" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl perl-Crypt-Blowfish perl-FreezeThaw perl-Compress-Zlib BuildRequires: perl-ExtUtils-MakeMaker perl-Test-Simple %endif -%if "%fedora" == "6" +%if 0%{?fedora} == 6 BuildRequires: perl perl-Crypt-Blowfish perl-FreezeThaw perl-Compress-Zlib %endif @@ -65,6 +65,11 @@ %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 0.06-6 +- fix conditional comparison + +* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-5 +- Rebuild for new perl * Mon Jul 9 2007 Allisson Azevedo 0.06-4 - Add exception for FC-6 From fedora-extras-commits at redhat.com Mon Jul 7 19:20:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:20:48 GMT Subject: rpms/perl-Crypt-Simple/devel perl-Crypt-Simple.spec,1.3,1.4 Message-ID: <200807071920.m67JKmJH001378@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1225/devel Modified Files: perl-Crypt-Simple.spec Log Message: fix conditional comparison Index: perl-Crypt-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Simple/devel/perl-Crypt-Simple.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Crypt-Simple.spec 7 Mar 2008 01:57:54 -0000 1.3 +++ perl-Crypt-Simple.spec 7 Jul 2008 19:20:00 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Crypt-Simple Version: 0.06 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Encrypt stuff simply Group: Development/Libraries @@ -11,12 +11,12 @@ BuildArch: noarch -%if "%fedora" > "6" +%if 0%{?fedora} > 6 BuildRequires: perl perl-Crypt-Blowfish perl-FreezeThaw perl-Compress-Zlib BuildRequires: perl-ExtUtils-MakeMaker perl-Test-Simple %endif -%if "%fedora" == "6" +%if 0%{?fedora} == 6 BuildRequires: perl perl-Crypt-Blowfish perl-FreezeThaw perl-Compress-Zlib %endif @@ -65,9 +65,11 @@ %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-5 -Rebuild for new perl +* Mon Jul 07 2008 Tom "spot" Callaway - 0.06-6 +- fix conditional comparison +* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-5 +- Rebuild for new perl * Mon Jul 9 2007 Allisson Azevedo 0.06-4 - Add exception for FC-6 From fedora-extras-commits at redhat.com Mon Jul 7 19:24:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:24:26 GMT Subject: rpms/ser/F-9 ser.spec,1.13,1.14 Message-ID: <200807071924.m67JOQlB001582@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ser/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1451/F-9 Modified Files: ser.spec Log Message: fix conditional comparison Index: ser.spec =================================================================== RCS file: /cvs/pkgs/rpms/ser/F-9/ser.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ser.spec 19 Feb 2008 05:23:49 -0000 1.13 +++ ser.spec 7 Jul 2008 19:23:33 -0000 1.14 @@ -1,15 +1,15 @@ %define special_modules mysql jabber cpl-c postgres pa %define serweb_version 0.9.4 -%if "%{fedora}" >= "4" +%if 0%{?fedora} >= 4 %define serweb true %endif Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 14%{?dist} -License: GPL +Release: 15%{?dist} +License: GPLv2+ Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz Source1: ftp://ftp.berlios.de/pub/ser/latest/contrib/serweb-%{serweb_version}.tar.gz @@ -21,9 +21,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel, bison BuildRequires: flex -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +# for /sbin/service +Requires(preun): initscripts %description A high-performance, configurable SIP server. It can act as registrar, proxy @@ -215,6 +216,11 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.9.6-15 +- fix conditional comparison +- fix license tag +- fix unnecessary file deps + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.6-14 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:24:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:24:33 GMT Subject: rpms/ser/F-8 ser.spec,1.12,1.13 Message-ID: <200807071924.m67JOXKi001587@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ser/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1451/F-8 Modified Files: ser.spec Log Message: fix conditional comparison Index: ser.spec =================================================================== RCS file: /cvs/pkgs/rpms/ser/F-8/ser.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ser.spec 29 Aug 2007 16:57:41 -0000 1.12 +++ ser.spec 7 Jul 2008 19:23:15 -0000 1.13 @@ -1,15 +1,15 @@ %define special_modules mysql jabber cpl-c postgres pa %define serweb_version 0.9.4 -%if "%{fedora}" >= "4" +%if 0%{?fedora} >= 4 %define serweb true %endif Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 13%{?dist} -License: GPL +Release: 15%{?dist} +License: GPLv2+ Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz Source1: ftp://ftp.berlios.de/pub/ser/latest/contrib/serweb-%{serweb_version}.tar.gz @@ -21,9 +21,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel, bison BuildRequires: flex -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +# for /sbin/service +Requires(preun): initscripts %description A high-performance, configurable SIP server. It can act as registrar, proxy @@ -215,6 +216,14 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.9.6-15 +- fix conditional comparison +- fix license tag +- fix unnecessary file deps + +* Tue Feb 19 2008 Fedora Release Engineering - 0.9.6-14 +- Autorebuild for GCC 4.3 + * Wed Aug 29 2007 Andreas Thienemann 0.9.6-13 - Fix build issues on non x86 systems for good From fedora-extras-commits at redhat.com Mon Jul 7 19:24:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:24:46 GMT Subject: rpms/ser/devel ser.spec,1.13,1.14 Message-ID: <200807071924.m67JOkfa001593@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1451/devel Modified Files: ser.spec Log Message: fix conditional comparison Index: ser.spec =================================================================== RCS file: /cvs/pkgs/rpms/ser/devel/ser.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ser.spec 19 Feb 2008 05:23:49 -0000 1.13 +++ ser.spec 7 Jul 2008 19:23:57 -0000 1.14 @@ -1,15 +1,15 @@ %define special_modules mysql jabber cpl-c postgres pa %define serweb_version 0.9.4 -%if "%{fedora}" >= "4" +%if 0%{?fedora} >= 4 %define serweb true %endif Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 14%{?dist} -License: GPL +Release: 15%{?dist} +License: GPLv2+ Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz Source1: ftp://ftp.berlios.de/pub/ser/latest/contrib/serweb-%{serweb_version}.tar.gz @@ -21,9 +21,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel, bison BuildRequires: flex -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +# for /sbin/service +Requires(preun): initscripts %description A high-performance, configurable SIP server. It can act as registrar, proxy @@ -215,6 +216,11 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.9.6-15 +- fix conditional comparison +- fix license tag +- fix unnecessary file deps + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.6-14 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:26:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:26:20 GMT Subject: rpms/straw/F-9 straw.spec,1.15,1.16 Message-ID: <200807071926.m67JQK8S001800@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/straw/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1606/F-9 Modified Files: straw.spec Log Message: fix conditional comparison Index: straw.spec =================================================================== RCS file: /cvs/pkgs/rpms/straw/F-9/straw.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- straw.spec 21 Nov 2007 07:51:13 -0000 1.15 +++ straw.spec 7 Jul 2008 19:25:26 -0000 1.16 @@ -5,7 +5,7 @@ Summary: Desktop news aggregator Name: straw Version: 0.27 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.gnome.org/projects/straw/ @@ -14,7 +14,7 @@ Requires: python >= 2.4 # fix for python >= 2.5 -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: python-devel %endif Requires: gnome-python2-gnomevfs @@ -102,6 +102,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.27-13 +- fix conditional comparison + * Wed Nov 21 2007 Alex Lancaster - 0.27-12 - Resolve Conflict with python-adns From fedora-extras-commits at redhat.com Mon Jul 7 19:26:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:26:25 GMT Subject: rpms/straw/F-8 straw.spec,1.15,1.16 Message-ID: <200807071926.m67JQPoe001820@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/straw/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1606/F-8 Modified Files: straw.spec Log Message: fix conditional comparison Index: straw.spec =================================================================== RCS file: /cvs/pkgs/rpms/straw/F-8/straw.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- straw.spec 21 Nov 2007 08:00:43 -0000 1.15 +++ straw.spec 7 Jul 2008 19:24:56 -0000 1.16 @@ -5,7 +5,7 @@ Summary: Desktop news aggregator Name: straw Version: 0.27 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.gnome.org/projects/straw/ @@ -14,7 +14,7 @@ Requires: python >= 2.4 # fix for python >= 2.5 -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: python-devel %endif Requires: gnome-python2-gnomevfs @@ -102,6 +102,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.27-13 +- fix conditional comparison + * Wed Nov 21 2007 Alex Lancaster - 0.27-12 - Resolve Conflict with python-adns From fedora-extras-commits at redhat.com Mon Jul 7 19:26:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:26:46 GMT Subject: rpms/straw/devel straw.spec,1.15,1.16 Message-ID: <200807071926.m67JQkIv001876@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/straw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1606/devel Modified Files: straw.spec Log Message: fix conditional comparison Index: straw.spec =================================================================== RCS file: /cvs/pkgs/rpms/straw/devel/straw.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- straw.spec 21 Nov 2007 07:51:13 -0000 1.15 +++ straw.spec 7 Jul 2008 19:25:50 -0000 1.16 @@ -5,7 +5,7 @@ Summary: Desktop news aggregator Name: straw Version: 0.27 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.gnome.org/projects/straw/ @@ -14,7 +14,7 @@ Requires: python >= 2.4 # fix for python >= 2.5 -%if "%{?fedora}" > "6" +%if 0%{?fedora} > 6 BuildRequires: python-devel %endif Requires: gnome-python2-gnomevfs @@ -102,6 +102,9 @@ %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.27-13 +- fix conditional comparison + * Wed Nov 21 2007 Alex Lancaster - 0.27-12 - Resolve Conflict with python-adns From fedora-extras-commits at redhat.com Mon Jul 7 19:28:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ale=C5=A1_Koval?= (als)) Date: Mon, 7 Jul 2008 19:28:01 GMT Subject: rpms/fpm2/F-9 .cvsignore,1.1,1.2 fpm2.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807071928.m67JS1Mm001952@cvs-int.fedora.redhat.com> Author: als Update of /cvs/pkgs/rpms/fpm2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1912 Modified Files: .cvsignore fpm2.spec sources Log Message: Update to 0.72 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2008 19:45:37 -0000 1.1 +++ .cvsignore 7 Jul 2008 19:27:14 -0000 1.2 @@ -0,0 +1 @@ +fpm2-0.72.tar.bz2 Index: fpm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-9/fpm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpm2.spec 9 May 2008 06:52:40 -0000 1.1 +++ fpm2.spec 7 Jul 2008 19:27:14 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.71 -Release: 2%{?dist} +Version: 0.72 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.bz2 @@ -25,6 +25,8 @@ characters (lower case, upper case, numbers and symbols) should be used. You can even have it avoid ambiguous characters such as a capital O or the number zero. +- Auto-minimise and/or auto-locking passwords database after configurable time + to the tray icon. %prep %setup -q @@ -57,6 +59,9 @@ %{_datadir}/applications/*.desktop %changelog +* Mon Jul 7 2008 Ale?? Koval - 0.72-1 +- Update to 0.72 + * Thu May 8 2008 Ale?? Koval - 0.71-2 - Fix %%files section (#444830) - desktop-file-install now delete original .desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 May 2008 06:52:40 -0000 1.2 +++ sources 7 Jul 2008 19:27:14 -0000 1.3 @@ -1 +1 @@ -d12bda1f4f3b3f7bb4105471ed25cb9b fpm2-0.71.tar.bz2 +608e78db5b771a719ad1aeb506b92fb2 fpm2-0.72.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 19:30:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:30:06 GMT Subject: rpms/virt-viewer/F-9 virt-viewer.spec,1.8,1.9 Message-ID: <200807071930.m67JU6sD002140@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/virt-viewer/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2035/F-9 Modified Files: virt-viewer.spec Log Message: fix conditional comparison Index: virt-viewer.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-viewer/F-9/virt-viewer.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- virt-viewer.spec 10 Mar 2008 14:58:12 -0000 1.8 +++ virt-viewer.spec 7 Jul 2008 19:29:22 -0000 1.9 @@ -6,7 +6,7 @@ Name: virt-viewer Version: 0.0.3 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -19,9 +19,10 @@ BuildRequires: libvirt-devel >= 0.3.1-4.fc8 BuildRequires: libxml2-devel BuildRequires: gtk-vnc-devel >= 0.3.4 -BuildRequires: /usr/bin/pod2man +# For /usr/bin/pod2man +BuildRequires: perl %if %{_with_plugin} -%if "%{fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: xulrunner-devel %else BuildRequires: firefox-devel @@ -83,6 +84,10 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.0.3-1.fc9.1 +- fix conditional comparison +- remove file dep + * Mon Mar 10 2008 Daniel P. Berrange - 0.0.3-1.fc9 - Updated to 0.0.3 release From fedora-extras-commits at redhat.com Mon Jul 7 19:30:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:30:28 GMT Subject: rpms/virt-viewer/devel virt-viewer.spec,1.10,1.11 Message-ID: <200807071930.m67JUSrH002149@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/virt-viewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2035/devel Modified Files: virt-viewer.spec Log Message: fix conditional comparison Index: virt-viewer.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-viewer/devel/virt-viewer.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- virt-viewer.spec 25 Jun 2008 10:10:22 -0000 1.10 +++ virt-viewer.spec 7 Jul 2008 19:29:36 -0000 1.11 @@ -6,7 +6,7 @@ Name: virt-viewer Version: 0.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -19,9 +19,10 @@ BuildRequires: libvirt-devel >= 0.3.1-4.fc8 BuildRequires: libxml2-devel BuildRequires: gtk-vnc-devel >= 0.3.4 -BuildRequires: /usr/bin/pod2man +# For /usr/bin/pod2man +BuildRequires: perl %if %{_with_plugin} -%if "%{fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: xulrunner-devel %else BuildRequires: firefox-devel @@ -83,6 +84,10 @@ %endif %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 0.0.3-3.fc10 +- fix conditional comparison +- remove file dep + * Wed Jun 25 2008 Daniel P. Berrange - 0.0.3-2.fc10 - Rebuild for GNU TLS ABI bump From fedora-extras-commits at redhat.com Mon Jul 7 19:34:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:34:11 GMT Subject: rpms/xfce4-mailwatch-plugin/F-9 xfce4-mailwatch-plugin.spec, 1.8, 1.9 Message-ID: <200807071934.m67JYBKk002476@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xfce4-mailwatch-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260/F-9 Modified Files: xfce4-mailwatch-plugin.spec Log Message: fix conditional comparison Index: xfce4-mailwatch-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mailwatch-plugin/F-9/xfce4-mailwatch-plugin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xfce4-mailwatch-plugin.spec 18 Feb 2008 23:50:18 -0000 1.8 +++ xfce4-mailwatch-plugin.spec 7 Jul 2008 19:33:24 -0000 1.9 @@ -1,6 +1,6 @@ Name: xfce4-mailwatch-plugin Version: 1.0.1 -Release: 8%{?dist} +Release: 8%{?dist}.1 Summary: Mail Watcher plugin for the Xfce panel Group: User Interface/Desktops @@ -13,7 +13,7 @@ BuildRequires: gettext # only enable TLS support if a recent version of gnutls is available # install libXt for modular X -%if "%fedora" > "4" +%if 0%{?fedora} > 4 BuildRequires: gnutls-devel >= 1.2.0, libXt-devel %endif Requires: xfce4-panel >= 4.4.0 @@ -57,6 +57,9 @@ %{_datadir}/xfce4/doc/C/images/mailwatch-*.png %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.0.1-8.1 +- fix conditional comparison + * Mon Feb 18 2008 Fedora Release Engineering - 1.0.1-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:34:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:34:23 GMT Subject: rpms/xfce4-mailwatch-plugin/F-8 xfce4-mailwatch-plugin.spec, 1.7, 1.8 Message-ID: <200807071934.m67JYNMX002529@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xfce4-mailwatch-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260/F-8 Modified Files: xfce4-mailwatch-plugin.spec Log Message: fix conditional comparison Index: xfce4-mailwatch-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mailwatch-plugin/F-8/xfce4-mailwatch-plugin.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xfce4-mailwatch-plugin.spec 25 Aug 2007 00:09:47 -0000 1.7 +++ xfce4-mailwatch-plugin.spec 7 Jul 2008 19:33:00 -0000 1.8 @@ -1,6 +1,6 @@ Name: xfce4-mailwatch-plugin Version: 1.0.1 -Release: 7%{?dist} +Release: 7%{?dist}.1 Summary: Mail Watcher plugin for the Xfce panel Group: User Interface/Desktops @@ -13,7 +13,7 @@ BuildRequires: gettext # only enable TLS support if a recent version of gnutls is available # install libXt for modular X -%if "%fedora" > "4" +%if 0%{?fedora} > 4 BuildRequires: gnutls-devel >= 1.2.0, libXt-devel %endif Requires: xfce4-panel >= 4.4.0 @@ -57,6 +57,9 @@ %{_datadir}/xfce4/doc/C/images/mailwatch-*.png %changelog +* Mon Jul 7 2008 Tom "spot" Callaway - 1.0.1-7.1 +- fix conditional comparison + * Fri Aug 24 2007 Christoph Wickert - 1.0.1-7 - Rebuild for BuildID feature - Update license tag From fedora-extras-commits at redhat.com Mon Jul 7 19:34:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:34:38 GMT Subject: rpms/xfce4-mailwatch-plugin/devel xfce4-mailwatch-plugin.spec, 1.9, 1.10 Message-ID: <200807071934.m67JYcUK002580@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xfce4-mailwatch-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260/devel Modified Files: xfce4-mailwatch-plugin.spec Log Message: fix conditional comparison Index: xfce4-mailwatch-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mailwatch-plugin/devel/xfce4-mailwatch-plugin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xfce4-mailwatch-plugin.spec 6 Jun 2008 11:31:40 -0000 1.9 +++ xfce4-mailwatch-plugin.spec 7 Jul 2008 19:33:42 -0000 1.10 @@ -1,6 +1,6 @@ Name: xfce4-mailwatch-plugin Version: 1.0.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Mail Watcher plugin for the Xfce panel Group: User Interface/Desktops @@ -14,7 +14,7 @@ BuildRequires: libXt-devel # only enable TLS support if a recent version of gnutls is available # install libXt for modular X -%if "%fedora" > "4" +%if 0%{?fedora} > 4 BuildRequires: gnutls-devel >= 1.2.0 %endif Requires: xfce4-panel >= 4.4.0 @@ -58,6 +58,9 @@ %{_datadir}/xfce4/doc/C/images/mailwatch-*.png %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 1.0.1-10 +- fix conditional comparison + * Fri Jun 06 2008 Christoph Wickert - 1.0.1-9 - BuildRequire libXt-devel for all releases (#449496) From fedora-extras-commits at redhat.com Mon Jul 7 19:36:15 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Mon, 7 Jul 2008 19:36:15 GMT Subject: rpms/echo-icon-theme/devel echo-icon-theme.spec, 1.24, 1.25 sources, 1.17, 1.18 Message-ID: <200807071936.m67JaFYF002846@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/echo-icon-theme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2601 Modified Files: echo-icon-theme.spec sources Log Message: New git snapshot. Fix License tag to use short name (CC-BY-SA). Index: echo-icon-theme.spec =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/devel/echo-icon-theme.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- echo-icon-theme.spec 6 Jul 2008 09:43:33 -0000 1.24 +++ echo-icon-theme.spec 7 Jul 2008 19:35:25 -0000 1.25 @@ -1,12 +1,12 @@ -%define git_head 2e822bf +%define git_head 1f550b3 Name: echo-icon-theme Version: 0.3.89.0 -Release: 0.6.git%{git_head}%{?dist} +Release: 0.7.git%{git_head}%{?dist} Summary: Echo icon theme Group: User Interface/Desktops -License: Creative Commons Attribution-ShareAlike 3.0 +License: CC-BY-SA URL: http://fedoraproject.org/wiki/Artwork/EchoDevelopment Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +47,10 @@ %ghost %{_datadir}/icons/Echo/icon-theme.cache %changelog +* Mon Jul 06 2008 Martin Sourada - 0.3.89.0-0.7.git1f550b3 +- New git snapshot +- Set license tag to CC-BY-SA + * Sun Jul 06 2008 Martin Sourada - 0.3.89.0-0.6.git2e822bf - New git snapshot Index: sources =================================================================== RCS file: /cvs/extras/rpms/echo-icon-theme/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 6 Jul 2008 09:43:33 -0000 1.17 +++ sources 7 Jul 2008 19:35:25 -0000 1.18 @@ -1 +1 @@ -7352ae5937bafaf45c2b43b58d6e8a96 echo-icon-theme-0.3.89.0.tar.bz2 +cce5c61eafe4d7c61c302ee9693a5b3c echo-icon-theme-0.3.89.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 19:36:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:36:20 GMT Subject: rpms/xfce4-xkb-plugin/F-9 xfce4-xkb-plugin.spec,1.14,1.15 Message-ID: <200807071936.m67JaKcB002851@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2607/F-9 Modified Files: xfce4-xkb-plugin.spec Log Message: fix conditional comparison Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-9/xfce4-xkb-plugin.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xfce4-xkb-plugin.spec 19 Feb 2008 00:10:16 -0000 1.14 +++ xfce4-xkb-plugin.spec 7 Jul 2008 19:35:26 -0000 1.15 @@ -1,6 +1,6 @@ Name: xfce4-xkb-plugin Version: 0.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRequires: xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel BuildRequires: gettext, perl(XML::Parser) # for modular X -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 #BuildRequires: libXt-devel BuildRequires: xorg-x11-proto-devel %endif @@ -50,6 +50,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 0.4.3-5 +- fix conditional comparison + * Mon Feb 18 2008 Fedora Release Engineering - 0.4.3-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:36:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:36:26 GMT Subject: rpms/xfce4-xkb-plugin/F-8 xfce4-xkb-plugin.spec,1.13,1.14 Message-ID: <200807071936.m67JaQR8002870@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2607/F-8 Modified Files: xfce4-xkb-plugin.spec Log Message: fix conditional comparison Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-8/xfce4-xkb-plugin.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xfce4-xkb-plugin.spec 25 Aug 2007 13:40:31 -0000 1.13 +++ xfce4-xkb-plugin.spec 7 Jul 2008 19:35:00 -0000 1.14 @@ -1,6 +1,6 @@ Name: xfce4-xkb-plugin Version: 0.4.3 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRequires: xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel BuildRequires: gettext, perl(XML::Parser) # for modular X -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 #BuildRequires: libXt-devel BuildRequires: xorg-x11-proto-devel %endif @@ -50,6 +50,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 0.4.3-3.1 +- fix conditional comparison + * Sat Aug 25 2007 Christoph Wickert - 0.4.3-3 - Rebuild for BuildID feature From fedora-extras-commits at redhat.com Mon Jul 7 19:36:34 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ale=C5=A1_Koval?= (als)) Date: Mon, 7 Jul 2008 19:36:34 GMT Subject: rpms/fpm2/devel .cvsignore, 1.2, 1.3 fpm2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807071936.m67JaYHp002877@cvs-int.fedora.redhat.com> Author: als Update of /cvs/pkgs/rpms/fpm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2766 Modified Files: .cvsignore fpm2.spec sources Log Message: Update to 0.72 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 May 2008 06:31:19 -0000 1.2 +++ .cvsignore 7 Jul 2008 19:35:50 -0000 1.3 @@ -1 +1 @@ -fpm2-0.71.tar.bz2 +fpm2-0.72.tar.bz2 Index: fpm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/devel/fpm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpm2.spec 9 May 2008 06:31:19 -0000 1.1 +++ fpm2.spec 7 Jul 2008 19:35:50 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.71 -Release: 2%{?dist} +Version: 0.72 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.bz2 @@ -25,6 +25,8 @@ characters (lower case, upper case, numbers and symbols) should be used. You can even have it avoid ambiguous characters such as a capital O or the number zero. +- Auto-minimise and/or auto-locking passwords database after configurable time + to the tray icon. %prep %setup -q @@ -57,6 +59,9 @@ %{_datadir}/applications/*.desktop %changelog +* Mon Jul 7 2008 Ale?? Koval - 0.72-1 +- Update to 0.72 + * Thu May 8 2008 Ale?? Koval - 0.71-2 - Fix %%files section (#444830) - desktop-file-install now delete original .desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 May 2008 06:31:19 -0000 1.2 +++ sources 7 Jul 2008 19:35:50 -0000 1.3 @@ -1 +1 @@ -d12bda1f4f3b3f7bb4105471ed25cb9b fpm2-0.71.tar.bz2 +608e78db5b771a719ad1aeb506b92fb2 fpm2-0.72.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 19:36:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 19:36:42 GMT Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec,1.14,1.15 Message-ID: <200807071936.m67JagXW002914@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2607/devel Modified Files: xfce4-xkb-plugin.spec Log Message: fix conditional comparison Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xfce4-xkb-plugin.spec 19 Feb 2008 00:10:16 -0000 1.14 +++ xfce4-xkb-plugin.spec 7 Jul 2008 19:35:50 -0000 1.15 @@ -1,6 +1,6 @@ Name: xfce4-xkb-plugin Version: 0.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRequires: xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel BuildRequires: gettext, perl(XML::Parser) # for modular X -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 #BuildRequires: libXt-devel BuildRequires: xorg-x11-proto-devel %endif @@ -50,6 +50,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Mon Jul 07 2008 Tom "spot" Callaway - 0.4.3-5 +- fix conditional comparison + * Mon Feb 18 2008 Fedora Release Engineering - 0.4.3-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:37:52 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 7 Jul 2008 19:37:52 GMT Subject: rpms/cobbler/F-7 .cvsignore, 1.36, 1.37 cobbler.spec, 1.46, 1.47 sources, 1.44, 1.45 Message-ID: <200807071937.m67Jbq21003164@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558/F-7 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.0.3-1 ("snowball") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 9 Jun 2008 20:56:27 -0000 1.36 +++ .cvsignore 7 Jul 2008 19:35:59 -0000 1.37 @@ -33,3 +33,4 @@ cobbler-1.0.0.tar.gz cobbler-1.0.1.tar.gz cobbler-1.0.2.tar.gz +cobbler-1.0.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- cobbler.spec 9 Jun 2008 20:56:27 -0000 1.46 +++ cobbler.spec 7 Jul 2008 19:35:59 -0000 1.47 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,8 +190,11 @@ %changelog -* Mon Jun 04 2008 Michael DeHaan - 1.0.2-1 -- Upsteram changes (see CHANGELOG) +* Mon Jul 07 2008 Michael DeHaan - 1.0.3-1 +- Upstream changes (see CHANGELOG) + +* Mon Jun 09 2008 Michael DeHaan - 1.0.2-1 +- Upstream changes (see CHANGELOG) * Tue Jun 03 2008 Michael DeHaan - 1.0.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 9 Jun 2008 20:56:27 -0000 1.44 +++ sources 7 Jul 2008 19:35:59 -0000 1.45 @@ -1,2 +1,3 @@ 2ca6fd737b4c47e7a986cc99bafa1d60 cobbler-1.0.1.tar.gz a5ab7e39d616e3a13269b6fe088aec4c cobbler-1.0.2.tar.gz +95a1dbfc2c4b7e21adb41524c68c9456 cobbler-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 19:37:59 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 7 Jul 2008 19:37:59 GMT Subject: rpms/cobbler/EL-5 .cvsignore, 1.40, 1.41 cobbler.spec, 1.48, 1.49 sources, 1.47, 1.48 Message-ID: <200807071937.m67JbxTF003169@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558/EL-5 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.0.3-1 ("snowball") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 9 Jun 2008 20:56:01 -0000 1.40 +++ .cvsignore 7 Jul 2008 19:35:38 -0000 1.41 @@ -37,3 +37,4 @@ cobbler-1.0.0.tar.gz cobbler-1.0.1.tar.gz cobbler-1.0.2.tar.gz +cobbler-1.0.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- cobbler.spec 9 Jun 2008 20:56:01 -0000 1.48 +++ cobbler.spec 7 Jul 2008 19:35:38 -0000 1.49 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,8 +190,11 @@ %changelog -* Mon Jun 04 2008 Michael DeHaan - 1.0.2-1 -- Upsteram changes (see CHANGELOG) +* Mon Jul 07 2008 Michael DeHaan - 1.0.3-1 +- Upstream changes (see CHANGELOG) + +* Mon Jun 09 2008 Michael DeHaan - 1.0.2-1 +- Upstream changes (see CHANGELOG) * Tue Jun 03 2008 Michael DeHaan - 1.0.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 9 Jun 2008 20:56:01 -0000 1.47 +++ sources 7 Jul 2008 19:35:38 -0000 1.48 @@ -1,2 +1,3 @@ 2ca6fd737b4c47e7a986cc99bafa1d60 cobbler-1.0.1.tar.gz a5ab7e39d616e3a13269b6fe088aec4c cobbler-1.0.2.tar.gz +95a1dbfc2c4b7e21adb41524c68c9456 cobbler-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 19:38:03 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 7 Jul 2008 19:38:03 GMT Subject: rpms/cobbler/F-9 .cvsignore, 1.36, 1.37 cobbler.spec, 1.48, 1.49 sources, 1.43, 1.44 Message-ID: <200807071938.m67Jc3AH003179@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558/F-9 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.0.3-1 ("snowball") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 9 Jun 2008 20:57:13 -0000 1.36 +++ .cvsignore 7 Jul 2008 19:36:40 -0000 1.37 @@ -33,3 +33,4 @@ cobbler-1.0.0.tar.gz cobbler-1.0.1.tar.gz cobbler-1.0.2.tar.gz +cobbler-1.0.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- cobbler.spec 9 Jun 2008 20:57:13 -0000 1.48 +++ cobbler.spec 7 Jul 2008 19:36:40 -0000 1.49 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,8 +190,11 @@ %changelog -* Mon Jun 04 2008 Michael DeHaan - 1.0.2-1 -- Upsteram changes (see CHANGELOG) +* Mon Jul 07 2008 Michael DeHaan - 1.0.3-1 +- Upstream changes (see CHANGELOG) + +* Mon Jun 09 2008 Michael DeHaan - 1.0.2-1 +- Upstream changes (see CHANGELOG) * Tue Jun 03 2008 Michael DeHaan - 1.0.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 9 Jun 2008 20:57:13 -0000 1.43 +++ sources 7 Jul 2008 19:36:40 -0000 1.44 @@ -1,2 +1,3 @@ 2ca6fd737b4c47e7a986cc99bafa1d60 cobbler-1.0.1.tar.gz a5ab7e39d616e3a13269b6fe088aec4c cobbler-1.0.2.tar.gz +95a1dbfc2c4b7e21adb41524c68c9456 cobbler-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 19:38:08 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 7 Jul 2008 19:38:08 GMT Subject: rpms/cobbler/EL-4 .cvsignore, 1.36, 1.37 cobbler.spec, 1.46, 1.47 sources, 1.44, 1.45 Message-ID: <200807071938.m67Jc8IE003189@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558/EL-4 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.0.3-1 ("snowball") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 9 Jun 2008 20:55:36 -0000 1.36 +++ .cvsignore 7 Jul 2008 19:35:18 -0000 1.37 @@ -33,3 +33,4 @@ cobbler-1.0.0.tar.gz cobbler-1.0.1.tar.gz cobbler-1.0.2.tar.gz +cobbler-1.0.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- cobbler.spec 9 Jun 2008 20:55:36 -0000 1.46 +++ cobbler.spec 7 Jul 2008 19:35:18 -0000 1.47 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,8 +190,11 @@ %changelog -* Mon Jun 04 2008 Michael DeHaan - 1.0.2-1 -- Upsteram changes (see CHANGELOG) +* Mon Jul 07 2008 Michael DeHaan - 1.0.3-1 +- Upstream changes (see CHANGELOG) + +* Mon Jun 09 2008 Michael DeHaan - 1.0.2-1 +- Upstream changes (see CHANGELOG) * Tue Jun 03 2008 Michael DeHaan - 1.0.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 9 Jun 2008 20:55:36 -0000 1.44 +++ sources 7 Jul 2008 19:35:18 -0000 1.45 @@ -1,2 +1,3 @@ 2ca6fd737b4c47e7a986cc99bafa1d60 cobbler-1.0.1.tar.gz a5ab7e39d616e3a13269b6fe088aec4c cobbler-1.0.2.tar.gz +95a1dbfc2c4b7e21adb41524c68c9456 cobbler-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 19:38:10 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 7 Jul 2008 19:38:10 GMT Subject: rpms/cobbler/F-8 .cvsignore, 1.36, 1.37 cobbler.spec, 1.45, 1.46 sources, 1.44, 1.45 Message-ID: <200807071938.m67JcAcI003200@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558/F-8 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.0.3-1 ("snowball") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 9 Jun 2008 20:56:50 -0000 1.36 +++ .cvsignore 7 Jul 2008 19:36:22 -0000 1.37 @@ -33,3 +33,4 @@ cobbler-1.0.0.tar.gz cobbler-1.0.1.tar.gz cobbler-1.0.2.tar.gz +cobbler-1.0.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- cobbler.spec 9 Jun 2008 20:56:50 -0000 1.45 +++ cobbler.spec 7 Jul 2008 19:36:22 -0000 1.46 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,8 +190,11 @@ %changelog -* Mon Jun 04 2008 Michael DeHaan - 1.0.2-1 -- Upsteram changes (see CHANGELOG) +* Mon Jul 07 2008 Michael DeHaan - 1.0.3-1 +- Upstream changes (see CHANGELOG) + +* Mon Jun 09 2008 Michael DeHaan - 1.0.2-1 +- Upstream changes (see CHANGELOG) * Tue Jun 03 2008 Michael DeHaan - 1.0.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 9 Jun 2008 20:56:50 -0000 1.44 +++ sources 7 Jul 2008 19:36:22 -0000 1.45 @@ -1,2 +1,3 @@ 2ca6fd737b4c47e7a986cc99bafa1d60 cobbler-1.0.1.tar.gz a5ab7e39d616e3a13269b6fe088aec4c cobbler-1.0.2.tar.gz +95a1dbfc2c4b7e21adb41524c68c9456 cobbler-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 19:38:12 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 7 Jul 2008 19:38:12 GMT Subject: rpms/cobbler/devel .cvsignore, 1.36, 1.37 cobbler.spec, 1.49, 1.50 sources, 1.45, 1.46 Message-ID: <200807071938.m67JcCK2003206@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558/devel Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.0.3-1 ("snowball") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 9 Jun 2008 20:57:29 -0000 1.36 +++ .cvsignore 7 Jul 2008 19:37:03 -0000 1.37 @@ -33,3 +33,4 @@ cobbler-1.0.0.tar.gz cobbler-1.0.1.tar.gz cobbler-1.0.2.tar.gz +cobbler-1.0.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- cobbler.spec 9 Jun 2008 20:57:29 -0000 1.49 +++ cobbler.spec 7 Jul 2008 19:37:03 -0000 1.50 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,8 +190,11 @@ %changelog -* Mon Jun 04 2008 Michael DeHaan - 1.0.2-1 -- Upsteram changes (see CHANGELOG) +* Mon Jul 07 2008 Michael DeHaan - 1.0.3-1 +- Upstream changes (see CHANGELOG) + +* Mon Jun 09 2008 Michael DeHaan - 1.0.2-1 +- Upstream changes (see CHANGELOG) * Tue Jun 03 2008 Michael DeHaan - 1.0.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 9 Jun 2008 20:57:29 -0000 1.45 +++ sources 7 Jul 2008 19:37:03 -0000 1.46 @@ -1,2 +1,3 @@ 2ca6fd737b4c47e7a986cc99bafa1d60 cobbler-1.0.1.tar.gz a5ab7e39d616e3a13269b6fe088aec4c cobbler-1.0.2.tar.gz +95a1dbfc2c4b7e21adb41524c68c9456 cobbler-1.0.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 19:39:30 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Mon, 7 Jul 2008 19:39:30 GMT Subject: rpms/gchempaint/F-9 gchempaint.spec,1.21,1.22 Message-ID: <200807071939.m67JdUVb003608@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gchempaint/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3313 Modified Files: gchempaint.spec Log Message: * Mon Jul 7 2008 Julian Sikorski - 0.8.7-3 - Rebuilt for new openbabel Index: gchempaint.spec =================================================================== RCS file: /cvs/extras/rpms/gchempaint/F-9/gchempaint.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gchempaint.spec 18 Feb 2008 21:10:15 -0000 1.21 +++ gchempaint.spec 7 Jul 2008 19:38:31 -0000 1.22 @@ -1,6 +1,6 @@ Name: gchempaint Version: 0.8.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A 2D chemical formulae drawing tool Group: Applications/Engineering @@ -137,6 +137,9 @@ %changelog +* Mon Jul 7 2008 Julian Sikorski - 0.8.7-3 +- Rebuilt for new openbabel + * Mon Feb 18 2008 Fedora Release Engineering - 0.8.7-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 7 19:39:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 19:39:31 GMT Subject: rpms/qt3/F-9 qt.csh,1.2,1.3 qt.sh,1.2,1.3 qt3.spec,1.5,1.6 Message-ID: <200807071939.m67JdV8b003613@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt3/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3386 Modified Files: qt.csh qt.sh qt3.spec Log Message: * Mon Jul 07 2008 Rex Dieter - 3.3.8b-14 - QTDIR isn't set in ppc64 buildroot (#454313) - /etc/profile.d/qt.sh leaks variable ARCH (#454260) Index: qt.csh =================================================================== RCS file: /cvs/pkgs/rpms/qt3/F-9/qt.csh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt.csh 23 May 2008 15:59:26 -0000 1.2 +++ qt.csh 7 Jul 2008 19:38:46 -0000 1.3 @@ -6,27 +6,28 @@ # very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found # in an x86_64 package and in an i386 package, the executable from x86_64 will be installe -set ARCH = `uname -m` -set QTVERSION = 3.3 +if ( $?QTDIR ) then + exit +endif -switch ($ARCH) +switch (`uname -m`) case x86_64: case ia64: case s390: - set QTPREFIX = /usr/lib64/qt-$QTVERSION + set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" breaksw case *: - set QTPREFIX = /usr/lib/qt-$QTVERSION + set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" endsw -if ( "${path}" !~ *$QTPREFIX/bin* ) then - set path = ( $QTPREFIX/bin $path ) -endif +foreach QTPREFIX ( $QTPREFIXES ) + test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break +end +unset QTPREFIX QTPREFIXES -if ( $?QTDIR ) then - exit +if ( "${path}" !~ *$QTDIR/bin* ) then + set path = ( $QTDIR/bin $path ) endif -setenv QTDIR $QTPREFIX -setenv QTINC $QTPREFIX/include -setenv QTLIB $QTPREFIX/lib +setenv QTINC $QTDIR/include +setenv QTLIB $QTDIR/lib Index: qt.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt3/F-9/qt.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt.sh 23 May 2008 15:59:26 -0000 1.2 +++ qt.sh 7 Jul 2008 19:38:46 -0000 1.3 @@ -6,24 +6,27 @@ # very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found # in an x86_64 package and in an i386 package, the executable from x86_64 will be installe -ARCH=$(uname -m) -QTVERSION=3.3 +if [ -z "${QTDIR}" ]; then -case $ARCH in +case `uname -m` in x86_64 | ia64 | s390 ) - QT_PREFIX=/usr/lib64/qt-$QTVERSION ;; + QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; * ) - QT_PREFIX=/usr/lib/qt-$QTVERSION ;; + QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; esac -if ! echo ${PATH} | /bin/grep -q $QT_PREFIX/bin ; then - PATH=$QT_PREFIX/bin:${PATH} -fi +for QTDIR in ${QT_PREFIXES} ; do + test -d "${QTDIR}" && break +done +unset QT_PREFIXES -if [ -z "$QTDIR" ] ; then - QTDIR="$QT_PREFIX" - QTINC="$QT_PREFIX/include" - QTLIB="$QT_PREFIX/lib" +if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then + PATH=$QTDIR/bin:${PATH} fi +QTINC="$QTDIR/include" +QTLIB="$QTDIR/lib" + export QTDIR QTINC QTLIB PATH + +fi Index: qt3.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt3/F-9/qt3.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qt3.spec 23 May 2008 15:59:26 -0000 1.5 +++ qt3.spec 7 Jul 2008 19:38:46 -0000 1.6 @@ -1,6 +1,6 @@ Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 13%{?dist} +Release: 14%{?dist} %if 0%{?fedora} > 8 Name: qt3 Obsoletes: qt < 1:%{version}-%{release} @@ -95,7 +95,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: fileutils +Requires: coreutils Requires: fontconfig >= 2.0 Requires: /etc/ld.so.conf.d @@ -643,6 +643,10 @@ %changelog +* Mon Jul 07 2008 Rex Dieter - 3.3.8b-14 +- QTDIR isn't set in ppc64 buildroot (#454313) +- /etc/profile.d/qt.sh leaks variable ARCH (#454260) + * Fri May 23 2008 Than Ngo - 3.3.8b-13 - fix rh#448027, qt3's PATH not set properly unless qt3-devel is installed From fedora-extras-commits at redhat.com Mon Jul 7 19:39:56 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Mon, 7 Jul 2008 19:39:56 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.852, 1.853 kernel.spec, 1.736, 1.737 sources, 1.813, 1.814 upstream, 1.731, 1.732 Message-ID: <200807071939.m67JduS8003666@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3456 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git2.bz2.sign Log Message: 2.6.26-rc9-git2 --- NEW FILE patch-2.6.26-rc9-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIcmhoyGugalF9Dw4RAlEoAJ9EfBG52hzUdavPAB+/SrPeDCM3VgCfWA0a NnsahmgSa2W0uYatU9OUTVo= =Kj5s -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.852 retrieving revision 1.853 diff -u -r1.852 -r1.853 --- .cvsignore 6 Jul 2008 09:27:23 -0000 1.852 +++ .cvsignore 7 Jul 2008 19:38:57 -0000 1.853 @@ -5,3 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 +patch-2.6.26-rc9-git2.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.736 retrieving revision 1.737 diff -u -r1.736 -r1.737 --- kernel.spec 6 Jul 2008 09:27:23 -0000 1.736 +++ kernel.spec 7 Jul 2008 19:38:57 -0000 1.737 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1142,7 +1142,7 @@ #ApplyPatch linux-2.6-selinux-ecryptfs-support.patch # wireless patches headed for 2.6.26 -ApplyPatch linux-2.6-wireless.patch +#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.27 ApplyPatch linux-2.6-wireless-pending.patch @@ -1789,6 +1789,12 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 07 2008 Dave Jones +- 2.6.26-rc9-git2 + +* Mon Jul 07 2008 Dave Jones +- 2.6.26-rc9-git1 + * Sun Jul 06 2008 Dave Jones - 2.6.26-rc9 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.813 retrieving revision 1.814 diff -u -r1.813 -r1.814 --- sources 6 Jul 2008 09:27:23 -0000 1.813 +++ sources 7 Jul 2008 19:38:57 -0000 1.814 @@ -1,2 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 +e6c2615d4a8c7b0eebc7eacfb4d61cfd patch-2.6.26-rc9-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- upstream 6 Jul 2008 09:27:23 -0000 1.731 +++ upstream 7 Jul 2008 19:38:57 -0000 1.732 @@ -1,2 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 +patch-2.6.26-rc9-git2.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 19:43:45 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Mon, 7 Jul 2008 19:43:45 GMT Subject: rpms/python-basemap/devel python-basemap-0.99-setup.cfg.patch, NONE, 1.1 python-basemap-0.99-setup.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 python-basemap.spec, 1.18, 1.19 sources, 1.10, 1.11 python-basemap-0.9.5-setup.patch, 1.3, NONE Message-ID: <200807071943.m67JhjRV003882@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/python-basemap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3822 Modified Files: .cvsignore python-basemap.spec sources Added Files: python-basemap-0.99-setup.cfg.patch python-basemap-0.99-setup.patch Removed Files: python-basemap-0.9.5-setup.patch Log Message: * Wed Jul 02 2008 Jef Spaleta 0.99-1 - Update to match latest matplotlib python-basemap-0.99-setup.cfg.patch: --- NEW FILE python-basemap-0.99-setup.cfg.patch --- --- setup.cfg 2008-05-31 06:55:06.000000000 -0800 +++ setup.cfg.new 2008-07-02 14:20:55.000000000 -0800 @@ -6,5 +6,5 @@ # False: do not install # auto: install only if the package is unavailable. This # is the default behavior -pydap = auto -httplib2 = auto +pydap = False +httplib2 = False python-basemap-0.99-setup.patch: --- NEW FILE python-basemap-0.99-setup.patch --- --- setup.py 2008-05-31 06:55:06.000000000 -0800 +++ setup.py.new 2008-07-02 13:42:57.000000000 -0800 @@ -55,11 +55,12 @@ if GEOS_dir is None: # if GEOS_dir not set, check a few standard locations. - GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')] + GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')] for direc in GEOS_dirs: geos_version = checkversion(direc) print 'checking for GEOS lib in %s ....' % direc - if geos_version != '"2.2.3"': + if geos_version != '"3.0.0"': + print "geos_version mismatch",geos_version continue else: print 'GEOS lib found in %s' % direc @@ -77,6 +78,8 @@ #manually and set the variable GEOS_dir (right after the line #that says "set GEOS_dir manually here".""") #else: +print numpy.get_include() +print GEOS_dir geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()] geos_library_dirs=[os.path.join(GEOS_dir,'lib'),os.path.join(GEOS_dir,'lib64')] Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-basemap/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 28 Mar 2007 23:11:58 -0000 1.10 +++ .cvsignore 7 Jul 2008 19:42:56 -0000 1.11 @@ -1 +1 @@ -basemap-0.9.5.tgz +basemap-0.99.tar.gz Index: python-basemap.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- python-basemap.spec 19 Feb 2008 07:25:19 -0000 1.18 +++ python-basemap.spec 7 Jul 2008 19:42:56 -0000 1.19 @@ -1,18 +1,20 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-basemap -Version: 0.9.5 -Release: 5%{?dist} +Version: 0.99 +Release: 1%{?dist} Summary: Plots data on map projections (with continental and political boundaries) Group: Development/Libraries License: LGPLv2+ URL: http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html -Source0: http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tgz -Patch0: python-basemap-0.9.5-setup.patch +Source0: http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tar.gz +Patch0: python-basemap-0.99-setup.cfg.patch +Patch1: python-basemap-0.99-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, proj-devel, shapelib-devel -Requires: python-matplotlib >= 0.81, python-basemap-data +BuildRequires: python-devel, proj-devel, shapelib-devel, numpy,geos-devel +BuildRequires: python-httplib2 +Requires: python-matplotlib >= 0.98, python-basemap-data %description Basemap is a matplotlib toolkit that allows you to plot data on map @@ -21,10 +23,12 @@ %prep %setup -q -n basemap-%{version} -%patch0 -p1 -b .orig +%patch0 -p0 +%patch1 -p0 #Remove the bundled libraries -mv src/_pyproj.c src/basemap_pycompat.h . -rm -rf src pyshapelib/shapelib +#mv src/_pyproj.c src/basemap_pycompat.h . +#rm -rf src pyshapelib/shapelib +#rm -rf src goes-2.2.3/ %build @@ -46,16 +50,19 @@ %files %defattr(-,root,root,-) %doc Changelog README LICENSE_pyshapelib -%{python_sitearch}/matplotlib/toolkits/basemap/ +%{python_sitearch}/mpl_toolkits/ %{python_sitearch}/dbflib/ %{python_sitearch}/dbflibc.so %{python_sitearch}/shapelib/ %{python_sitearch}/shapelibc.so %{python_sitearch}/shptree.so %{python_sitearch}/*.egg-info - +%{python_sitearch}/_geoslib.so %changelog +* Wed Jul 02 2008 Jef Spaleta 0.99-1 +- Update to match latest matplotlib + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.5-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-basemap/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 28 Mar 2007 23:11:58 -0000 1.10 +++ sources 7 Jul 2008 19:42:56 -0000 1.11 @@ -1 +1 @@ -d214dc6a7201080a8e7419f2a5c8306b basemap-0.9.5.tgz +362e7c130de689c877d82120732a24f9 basemap-0.99.tar.gz --- python-basemap-0.9.5-setup.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 19:45:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 7 Jul 2008 19:45:31 GMT Subject: rpms/qt3/devel qt.csh,1.1,1.2 qt.sh,1.1,1.2 qt3.spec,1.4,1.5 Message-ID: <200807071945.m67JjVkK003988@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3944 Modified Files: qt.csh qt.sh qt3.spec Log Message: * Mon Jul 07 2008 Rex Dieter - 3.3.8b-14 - QTDIR isn't set in ppc64 buildroot (#454313) - /etc/profile.d/qt.sh leaks variable ARCH (#454260) Index: qt.csh =================================================================== RCS file: /cvs/pkgs/rpms/qt3/devel/qt.csh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt.csh 12 Mar 2008 18:50:07 -0000 1.1 +++ qt.csh 7 Jul 2008 19:44:46 -0000 1.2 @@ -1,15 +1,33 @@ # Qt initialization script (csh) -set qt_prefix = `/usr/bin/pkg-config --variable=prefix qt-mt` - -if ( "${path}" !~ *$qt_prefix/bin* ) then - set path = ( $qt_prefix/bin $path ) -endif +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding +# with different arches, the installed file is the one from the preferred arch. This is +# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found +# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe if ( $?QTDIR ) then exit endif -setenv QTDIR $qt_prefix -setenv QTINC $qt_prefix/include -setenv QTLIB $qt_prefix/lib +switch (`uname -m`) + case x86_64: + case ia64: + case s390: + set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" + breaksw + case *: + set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" +endsw + +foreach QTPREFIX ( $QTPREFIXES ) + test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break +end +unset QTPREFIX QTPREFIXES + +if ( "${path}" !~ *$QTDIR/bin* ) then + set path = ( $QTDIR/bin $path ) +endif + +setenv QTINC $QTDIR/include +setenv QTLIB $QTDIR/lib Index: qt.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt3/devel/qt.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt.sh 12 Mar 2008 18:50:07 -0000 1.1 +++ qt.sh 7 Jul 2008 19:44:46 -0000 1.2 @@ -1,15 +1,32 @@ # Qt initialization script (sh) -qt_prefix=`/usr/bin/pkg-config --variable=prefix qt-mt` +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding +# with different arches, the installed file is the one from the preferred arch. This is +# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found +# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe -if ! echo ${PATH} | /bin/grep -q $qt_prefix/bin ; then - PATH=$qt_prefix/bin:${PATH} -fi +if [ -z "${QTDIR}" ]; then + +case `uname -m` in + x86_64 | ia64 | s390 ) + QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; + * ) + QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; +esac + +for QTDIR in ${QT_PREFIXES} ; do + test -d "${QTDIR}" && break +done +unset QT_PREFIXES -if [ -z "$QTDIR" ] ; then - QTDIR="$qt_prefix" - QTINC="$qt_prefix/include" - QTLIB="$qt_prefix/lib" +if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then + PATH=$QTDIR/bin:${PATH} fi +QTINC="$QTDIR/include" +QTLIB="$QTDIR/lib" + export QTDIR QTINC QTLIB PATH + +fi Index: qt3.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt3/devel/qt3.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qt3.spec 2 Apr 2008 10:49:18 -0000 1.4 +++ qt3.spec 7 Jul 2008 19:44:46 -0000 1.5 @@ -1,6 +1,6 @@ Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 12%{?dist} +Release: 14%{?dist} %if 0%{?fedora} > 8 Name: qt3 Obsoletes: qt < 1:%{version}-%{release} @@ -95,10 +95,9 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: fileutils +Requires: coreutils Requires: fontconfig >= 2.0 Requires: /etc/ld.so.conf.d -Requires: pkgconfig BuildRequires: desktop-file-utils BuildRequires: libmng-devel @@ -644,6 +643,13 @@ %changelog +* Mon Jul 07 2008 Rex Dieter - 3.3.8b-14 +- QTDIR isn't set in ppc64 buildroot (#454313) +- /etc/profile.d/qt.sh leaks variable ARCH (#454260) + +* Fri May 23 2008 Than Ngo - 3.3.8b-13 +- fix rh#448027, qt3's PATH not set properly unless qt3-devel is installed + * Wed Apr 02 2008 Than Ngo - 3.3.8b-12 - get rid of 0088-fix-xinput-clash.diff, it's fixed in new xorg-x11-proto-7.3-11 From fedora-extras-commits at redhat.com Mon Jul 7 19:52:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ale=C5=A1_Koval?= (als)) Date: Mon, 7 Jul 2008 19:52:25 GMT Subject: rpms/fpm2/EL-5 .cvsignore, 1.1, 1.2 fpm2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807071952.m67JqPo3004433@cvs-int.fedora.redhat.com> Author: als Update of /cvs/pkgs/rpms/fpm2/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4381 Modified Files: .cvsignore fpm2.spec sources Log Message: Update to 0.72 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2008 19:45:37 -0000 1.1 +++ .cvsignore 7 Jul 2008 19:51:37 -0000 1.2 @@ -0,0 +1 @@ +fpm2-0.72.tar.bz2 Index: fpm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/EL-5/fpm2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpm2.spec 9 May 2008 06:53:41 -0000 1.1 +++ fpm2.spec 7 Jul 2008 19:51:37 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.71 -Release: 2%{?dist} +Version: 0.72 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.bz2 @@ -25,6 +25,8 @@ characters (lower case, upper case, numbers and symbols) should be used. You can even have it avoid ambiguous characters such as a capital O or the number zero. +- Auto-minimise and/or auto-locking passwords database after configurable time + to the tray icon. %prep %setup -q @@ -57,6 +59,9 @@ %{_datadir}/applications/*.desktop %changelog +* Mon Jul 7 2008 Ale?? Koval - 0.72-1 +- Update to 0.72 + * Thu May 8 2008 Ale?? Koval - 0.71-2 - Fix %%files section (#444830) - desktop-file-install now delete original .desktop file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 May 2008 06:53:41 -0000 1.2 +++ sources 7 Jul 2008 19:51:37 -0000 1.3 @@ -1 +1 @@ -d12bda1f4f3b3f7bb4105471ed25cb9b fpm2-0.71.tar.bz2 +608e78db5b771a719ad1aeb506b92fb2 fpm2-0.72.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 19:58:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 19:58:35 +0000 Subject: [pkgdb] jpackage-utils: dbhole has requested commit Message-ID: <200807071958.m67JwZ9T028007@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has requested the commit acl on jpackage-utils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Mon Jul 7 19:58:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 19:58:37 +0000 Subject: [pkgdb] jpackage-utils: dbhole has requested commit Message-ID: <200807071958.m67JwbmF028026@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has requested the commit acl on jpackage-utils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Mon Jul 7 20:06:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 20:06:55 +0000 Subject: [pkgdb] jpackage-utils had acl change status Message-ID: <200807072006.m67K6t12028384@bastion.fedora.phx.redhat.com> Thomas Fitzsimmons (fitzsim) has set the commit acl on jpackage-utils (Fedora 8) to Approved for Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Mon Jul 7 20:07:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 07 Jul 2008 20:07:12 +0000 Subject: [pkgdb] jpackage-utils had acl change status Message-ID: <200807072007.m67K7C0l028410@bastion.fedora.phx.redhat.com> Thomas Fitzsimmons (fitzsim) has set the commit acl on jpackage-utils (Fedora 9) to Approved for Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Mon Jul 7 20:09:51 2008 From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole)) Date: Mon, 7 Jul 2008 20:09:51 GMT Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.42,1.43 Message-ID: <200807072009.m67K9pNZ011757@cvs-int.fedora.redhat.com> Author: dbhole Update of /cvs/pkgs/rpms/jpackage-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11711 Modified Files: jpackage-utils.spec Log Message: - Own mavendepmapfragdir as well. Index: jpackage-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- jpackage-utils.spec 7 Jul 2008 19:17:19 -0000 1.42 +++ jpackage-utils.spec 7 Jul 2008 20:09:06 -0000 1.43 @@ -34,7 +34,7 @@ Name: jpackage-utils Version: 1.7.5 -Release: 1jpp.2%{?dist} +Release: 1jpp.3%{?dist} Epoch: 0 Summary: JPackage utilities License: JPackage License @@ -106,7 +106,7 @@ jvmdir jvmjardir jvmprivdir \ jvmlibdir jvmdatadir jvmsysconfdir \ jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \ - javadir jnidir javadocdir mavenpomdir mavendepmapdir; do + javadir jnidir javadocdir mavenpomdir mavendepmapdir mavendepmapfragdir; do export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \ misc/macros.jpackage | %{__awk} '{ print $2 }')) done @@ -137,7 +137,7 @@ install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0} install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir} install -dm 755 ${RPM_BUILD_ROOT}${_mavenpomdir} -install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapdir} +install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapfragdir} install -pm 755 bin/* ${RPM_BUILD_ROOT}%{_bindir} install -pm 644 etc/font.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/java @@ -209,8 +209,8 @@ %dir ${_javadocdir} %dir %{_datadir}/maven2 %dir ${_mavenpomdir} -%dir %{_sysconfdir}/maven %dir ${_mavendepmapdir} +%dir ${_mavendepmapfragdir} ${_javadir}-utils/* %config %{_sysconfdir}/java/jpackage-release %config(noreplace) %{_sysconfdir}/java/java.conf @@ -229,6 +229,9 @@ %changelog +* Mon Jul 07 2008 Deepak Bhole 1.7.5-1jpp.3 +- Own mavendepmapfragdir as well. + * Mon Jul 07 2008 Deepak Bhole 1.7.5-1jpp.2 - Add ownership of maven directories From fedora-extras-commits at redhat.com Mon Jul 7 20:32:03 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 7 Jul 2008 20:32:03 GMT Subject: rpms/emma/devel emma.spec,1.1,1.2 Message-ID: <200807072032.m67KW3Db012977@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/emma/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12894 Modified Files: emma.spec Log Message: * Mon Jul 07 2008 Andrew Overholt 2.0-0.5312.2jpp.4 - Remove requirement on maven2 as jpackage-utils now owns the maven POMs and fragments directories. Index: emma.spec =================================================================== RCS file: /cvs/pkgs/rpms/emma/devel/emma.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emma.spec 30 May 2008 20:04:34 -0000 1.1 +++ emma.spec 7 Jul 2008 20:31:16 -0000 1.2 @@ -31,7 +31,7 @@ Summary: Code Coverage Tool Name: emma Version: 2.0 -Release: 0.5312.2jpp.2%{?dist} +Release: 0.5312.2jpp.4%{?dist} Epoch: 0 Group: Development/Tools License: CPL @@ -57,12 +57,11 @@ Requires: jaxp_parser_impl BuildRequires: ant >= 0:1.6.5 BuildRequires: java-devel >= 0:1.6 -BuildRequires: jpackage-utils >= 0:1.7.2 +BuildRequires: jpackage-utils >= 0:1.7.5-1jpp.3 # For the timestamp hack (see above) BuildRequires: bc -Requires(post): jpackage-utils >= 0:1.7.2 -Requires(postun): jpackage-utils >= 0:1.7.2 -Requires: maven2 +Requires(post): jpackage-utils >= 0:1.7.5-1jpp.3 +Requires(postun): jpackage-utils >= 0:1.7.5-1jpp.3 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -135,7 +134,7 @@ %defattr(-,root,root,-) %doc cpl-v10.html %{_javadir}/* -%{_datadir}/maven2/poms/JPP.%{name}* +%{_mavenpomdir}/JPP.%{name}* %{_mavendepmapfragdir}/%{name} %files javadoc @@ -143,6 +142,13 @@ %doc %{_javadocdir}/%{name}* %changelog +* Mon Jul 07 2008 Andrew Overholt 2.0-0.5312.2jpp.4 +- Remove requirement on maven2 as jpackage-utils now owns the maven POMs + and fragments directories. + +* Fri May 30 2008 Andrew Overholt 2.0-0.5312.2jpp.3 +- Bump release because I forgot to add a source file. + * Wed May 28 2008 Andrew Overholt 2.0-0.5312.2jpp.2 - Review (rhbz#444511) fixes: '-' in permissions, maven2 requirement, file ownership of maven stuff, require OpenJDK. From fedora-extras-commits at redhat.com Mon Jul 7 20:38:40 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Mon, 7 Jul 2008 20:38:40 GMT Subject: rpms/git/EL-4 git.spec,1.30,1.31 Message-ID: <200807072038.m67KceBN013310@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/git/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13264 Modified Files: git.spec Log Message: Drop git-cvs requirement for cvsps, it is not available in EL-4. Index: git.spec =================================================================== RCS file: /cvs/pkgs/rpms/git/EL-4/git.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- git.spec 21 Dec 2007 15:09:40 -0000 1.30 +++ git.spec 7 Jul 2008 20:37:42 -0000 1.31 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -56,7 +56,7 @@ %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, cvs, cvsps +Requires: git-core = %{version}-%{release}, cvs %description cvs Git tools for importing CVS repositories. @@ -195,6 +195,9 @@ %changelog +* Mon Jul 07 2008 Xavier Bachelot 1.5.3.6-2 +- Drop git-cvs requirement for cvsps, it is not available in EL-4. + * Wed Dec 05 2007 James Bowes 1.5.3.6-1 - git-1.5.3.6 (Changes courtesy Josh Boyer) From fedora-extras-commits at redhat.com Mon Jul 7 20:56:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 20:56:43 GMT Subject: rpms/R/F-9 R.spec,1.45,1.46 sources,1.17,1.18 Message-ID: <200807072056.m67Kuh4B014324@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223/F-9 Modified Files: R.spec sources Log Message: update to 2.7.1 Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- R.spec 28 May 2008 21:06:52 -0000 1.45 +++ R.spec 7 Jul 2008 20:55:48 -0000 1.46 @@ -1,12 +1,11 @@ Name: R -Version: 2.7.0 -Release: 5%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh -Patch0: R-2.7.0-bad-path.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,7 @@ Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = 7.2 -Provides: R-cluster = 1.11.10 +Provides: R-cluster = 1.11.11 Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -38,7 +37,7 @@ Provides: R-lattice = 0.17 Provides: R-MASS = 7.2 Provides: R-methods = %{version} -Provides: R-mgcv = 1.3 +Provides: R-mgcv = 1.4 Provides: R-nlme = 3.1 Provides: R-nnet = 7.2 Provides: R-rpart = 3.1 @@ -100,7 +99,6 @@ %prep %setup -q -%patch0 -p0 # Filter false positive provides. cat < %{name}-prov @@ -285,6 +283,9 @@ /sbin/ldconfig %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 2.7.1-1 +- update to 2.7.1 + * Wed May 28 2008 Tom "spot" Callaway 2.7.0-5 - add cairo-devel to BR/R, so that cairo backend gets built Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 May 2008 17:55:55 -0000 1.17 +++ sources 7 Jul 2008 20:55:48 -0000 1.18 @@ -1 +1 @@ -9eaee3eceec1d5f72cea5640ca90768c R-2.7.0.tar.gz +565b06a1f3f11020399934cc7b47a59d R-2.7.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 20:56:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 20:56:48 GMT Subject: rpms/R/F-8 R.spec,1.43,1.44 sources,1.17,1.18 Message-ID: <200807072056.m67Kumpr014345@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223/F-8 Modified Files: R.spec sources Log Message: update to 2.7.1 Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/F-8/R.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- R.spec 28 May 2008 21:06:11 -0000 1.43 +++ R.spec 7 Jul 2008 20:55:20 -0000 1.44 @@ -1,12 +1,11 @@ Name: R -Version: 2.7.0 -Release: 5%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh -Patch0: R-2.7.0-bad-path.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,7 @@ Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = 7.2 -Provides: R-cluster = 1.11.10 +Provides: R-cluster = 1.11.11 Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -38,7 +37,7 @@ Provides: R-lattice = 0.17 Provides: R-MASS = 7.2 Provides: R-methods = %{version} -Provides: R-mgcv = 1.3 +Provides: R-mgcv = 1.4 Provides: R-nlme = 3.1 Provides: R-nnet = 7.2 Provides: R-rpart = 3.1 @@ -100,7 +99,6 @@ %prep %setup -q -%patch0 -p0 # Filter false positive provides. cat < %{name}-prov @@ -285,6 +283,9 @@ /sbin/ldconfig %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 2.7.1-1 +- update to 2.7.1 + * Wed May 28 2008 Tom "spot" Callaway 2.7.0-5 - add cairo-devel to BR/R, so that cairo backend gets built Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R/F-8/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 May 2008 17:55:31 -0000 1.17 +++ sources 7 Jul 2008 20:55:20 -0000 1.18 @@ -1 +1 @@ -9eaee3eceec1d5f72cea5640ca90768c R-2.7.0.tar.gz +565b06a1f3f11020399934cc7b47a59d R-2.7.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 20:57:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 7 Jul 2008 20:57:04 GMT Subject: rpms/R/devel .cvsignore, 1.15, 1.16 R.spec, 1.45, 1.46 sources, 1.17, 1.18 Message-ID: <200807072057.m67Kv44a014360@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223/devel Modified Files: .cvsignore R.spec sources Log Message: update to 2.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 29 Apr 2008 20:09:52 -0000 1.15 +++ .cvsignore 7 Jul 2008 20:56:13 -0000 1.16 @@ -1 +1 @@ -R-2.7.0.tar.gz +R-2.7.1.tar.gz Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- R.spec 28 May 2008 21:07:13 -0000 1.45 +++ R.spec 7 Jul 2008 20:56:13 -0000 1.46 @@ -1,12 +1,11 @@ Name: R -Version: 2.7.0 -Release: 5%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh -Patch0: R-2.7.0-bad-path.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,7 @@ Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = 7.2 -Provides: R-cluster = 1.11.10 +Provides: R-cluster = 1.11.11 Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -38,7 +37,7 @@ Provides: R-lattice = 0.17 Provides: R-MASS = 7.2 Provides: R-methods = %{version} -Provides: R-mgcv = 1.3 +Provides: R-mgcv = 1.4 Provides: R-nlme = 3.1 Provides: R-nnet = 7.2 Provides: R-rpart = 3.1 @@ -100,7 +99,6 @@ %prep %setup -q -%patch0 -p0 # Filter false positive provides. cat < %{name}-prov @@ -285,6 +283,9 @@ /sbin/ldconfig %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 2.7.1-1 +- update to 2.7.1 + * Wed May 28 2008 Tom "spot" Callaway 2.7.0-5 - add cairo-devel to BR/R, so that cairo backend gets built Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 29 Apr 2008 20:09:52 -0000 1.17 +++ sources 7 Jul 2008 20:56:13 -0000 1.18 @@ -1 +1 @@ -9eaee3eceec1d5f72cea5640ca90768c R-2.7.0.tar.gz +565b06a1f3f11020399934cc7b47a59d R-2.7.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 7 20:57:39 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 7 Jul 2008 20:57:39 GMT Subject: rpms/python-openid/devel .cvsignore, 1.4, 1.5 python-openid.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807072057.m67KvdET014387@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-openid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14339 Modified Files: .cvsignore python-openid.spec sources Log Message: * Mon Jul 7 2008 Jeffrey C. Ollie - 2.2.1-1 - Update to 2.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-openid/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Dec 2007 20:27:01 -0000 1.4 +++ .cvsignore 7 Jul 2008 20:56:47 -0000 1.5 @@ -1 +1 @@ -python-openid-2.1.1.tar.bz2 +python-openid-2.2.1.tar.bz2 Index: python-openid.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-openid/devel/python-openid.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-openid.spec 16 Dec 2007 05:34:13 -0000 1.4 +++ python-openid.spec 7 Jul 2008 20:56:47 -0000 1.5 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-openid -Version: 2.1.1 -Release: 2%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: Python OpenID libraries Group: Development/Languages @@ -59,6 +59,12 @@ %{python_sitelib}/* %changelog +* Mon Jul 7 2008 Jeffrey C. Ollie - 2.2.1-1 +- Update to 2.2.1 + +* Fri Jun 6 2008 Jeffrey C. Ollie - 2.2.0-1 +- Update to 2.2.0 + * Sat Dec 15 2007 Jeffrey C. Ollie - 2.1.1-2 - Ensure that python-lxml is present for ElementTree API support. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-openid/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Dec 2007 20:27:01 -0000 1.4 +++ sources 7 Jul 2008 20:56:47 -0000 1.5 @@ -1 +1 @@ -b15ead9183a0550ef974c15bb6a36f2e python-openid-2.1.1.tar.bz2 +26350fa386840d409b40a7210f5b8824 python-openid-2.2.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 20:59:26 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Mon, 7 Jul 2008 20:59:26 GMT Subject: rpms/devhelp/devel devhelp.spec,1.89,1.90 Message-ID: <200807072059.m67KxQ2X014593@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/devhelp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14471 Modified Files: devhelp.spec Log Message: * Mon Jul 07 2008 Matthew Barnes - 0.19.1-2 - Rebuild, just to keep up with F9 package. Index: devhelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- devhelp.spec 26 May 2008 16:28:09 -0000 1.89 +++ devhelp.spec 7 Jul 2008 20:58:39 -0000 1.90 @@ -7,7 +7,7 @@ Name: devhelp Version: 0.19.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Summary: API document browser @@ -135,6 +135,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jul 07 2008 Matthew Barnes - 0.19.1-2 +- Rebuild, just to keep up with F9 package. + * Mon May 26 2008 Matthew Barnes - 0.19.1-1 - Update to 0.19.1 From fedora-extras-commits at redhat.com Mon Jul 7 21:30:15 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 7 Jul 2008 21:30:15 GMT Subject: rpms/lesstif/devel lesstif.spec,1.23,1.24 Message-ID: <200807072130.m67LUF3b022544@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/lesstif/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22487 Modified Files: lesstif.spec Log Message: * Mon Jul 7 2008 Patrice Dumas 0.95.0-26 - debian lesstif2_0.95.0-2.1 Index: lesstif.spec =================================================================== RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- lesstif.spec 16 Jun 2008 20:39:14 -0000 1.23 +++ lesstif.spec 7 Jul 2008 21:29:17 -0000 1.24 @@ -1,7 +1,7 @@ Summary: OSF/Motif(R) library clone Name: lesstif Version: 0.95.0 -Release: 25%{?dist} +Release: 26%{?dist} License: LGPLv2+ # in Xm-2.1/ # some files are MIT @@ -44,7 +44,7 @@ Patch2: lesstif-0.95.0-CAN-2005-0605.patch Patch3: lesstif-0.95.0-64bitcleanups.patch Patch4: lesstif-0.95.0-c++fix.patch -Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.diff.gz +Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.1.diff.gz Patch6: lesstif-0.95.0-scroll.patch Patch8: lesstif-0.95-resource-fix.patch Patch9: lesstif-0.95-text.patch @@ -164,6 +164,12 @@ patch -p1 < debian/patches/020_xpmpipethrough.diff patch -p1 < debian/patches/021_xim_chained_list_crash.diff patch -p1 < debian/patches/030_manpage.diff +patch -p1 < debian/patches/020_render_table_crash.diff +# patch3 is 020_bad_integer_cast.diff +# patch0 contains 000_libtool_linking.diff +# Patch2 is 020_unsigned_int.diff +# 000_bootstrap_script.diff, 010_rebootstrap.diff not useful. +# 020_missing_xm_h.diff? # correct patched header file timestamp touch -r include/Motif-2.1/Xm/VendorSP.h.VendorSP include/Motif-2.1/Xm/VendorSP.h @@ -313,6 +319,9 @@ %changelog +* Mon Jul 7 2008 Patrice Dumas 0.95.0-26 +- debian lesstif2_0.95.0-2.1 + * Mon Jun 16 2008 Hans de Goede 0.95.0-25 - Fix PutPixel32 crashing on 64 bit (bz 437133) From fedora-extras-commits at redhat.com Mon Jul 7 21:33:26 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 7 Jul 2008 21:33:26 GMT Subject: rpms/lesstif/devel .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200807072133.m67LXQup022792@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/lesstif/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22719 Modified Files: .cvsignore sources Log Message: new lesstif debian patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lesstif/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Aug 2007 18:36:04 -0000 1.4 +++ .cvsignore 7 Jul 2008 21:32:34 -0000 1.5 @@ -1,2 +1,2 @@ -lesstif2_0.95.0-2.diff.gz lesstif-0.95.0.tar.bz2 +lesstif2_0.95.0-2.1.diff.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lesstif/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Aug 2007 18:36:04 -0000 1.4 +++ sources 7 Jul 2008 21:32:34 -0000 1.5 @@ -1,2 +1,2 @@ -6406d0fa85ee2467d155255e172d8529 lesstif2_0.95.0-2.diff.gz ab895165c149d7f95843c7584b1c7ad4 lesstif-0.95.0.tar.bz2 +89e1e1823eb37a40a54330a834c68b6b lesstif2_0.95.0-2.1.diff.gz From fedora-extras-commits at redhat.com Mon Jul 7 21:34:26 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Mon, 7 Jul 2008 21:34:26 GMT Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.2, 1.3 olpc-utils.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200807072134.m67LYQBO022941@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22787 Modified Files: .cvsignore olpc-utils.spec sources Log Message: - dlo#6432: local installation of RPMs on first boot. - dlo#7171: move network testing tools to olpc-netutils - add olpc-test-devkey script to verify a developer key. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jun 2008 09:17:46 -0000 1.2 +++ .cvsignore 7 Jul 2008 21:33:37 -0000 1.3 @@ -1 +1 @@ -olpc-utils-0.75.tar.bz2 +olpc-utils-0.76.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- olpc-utils.spec 25 Jun 2008 09:17:46 -0000 1.8 +++ olpc-utils.spec 7 Jul 2008 21:33:37 -0000 1.9 @@ -1,5 +1,5 @@ Name: olpc-utils -Version: 0.75 +Version: 0.76 Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary @@ -12,20 +12,15 @@ BuildRequires: pam-devel Requires: pam -# for olpc-netcapture -Requires: tcpdump - -# for olpc-netlog -Requires: ethtool -Requires: tar -Requires: gzip - # for olpc-configure Requires: /usr/bin/find # for become_root Requires: /bin/su +# for olpc-test-devkey +Requires: olpcupdate >= 2.10 + %description Tools for starting an X session, mapping keys on the OLPC keyboards, @@ -67,14 +62,12 @@ %{_sbindir}/setolpckeys %{_sbindir}/olpc-dm %{_bindir}/olpc-logbat -%{_bindir}/olpc-netlog -%{_bindir}/olpc-netcapture -%{_bindir}/olpc-netstatus %{_bindir}/olpc-session %{_bindir}/olpc-pwr-prof %{_bindir}/olpc-pwr-prof-send %{_bindir}/olpc-clean-previews %{_bindir}/olpc-audit +%{_bindir}/olpc-test-devkey %{_sysconfdir}/profile.d/zzz_olpc.sh %{_sysconfdir}/cron.d/olpc-pwr-prof.cron %{_sysconfdir}/rc.d/init.d/olpc-configure @@ -91,6 +84,11 @@ %changelog +* Thu Jul 03 2008 C. Scott Ananian 0.76-1 +- dlo#6432: local installation of RPMs on first boot. +- dlo#7171: move network testing tools to olpc-netutils +- add olpc-test-devkey script to verify a developer key. + * Tue Jun 24 2008 Michael Stone 0.75-1 - mstone: Merge Fedora's divergence. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Jun 2008 09:17:46 -0000 1.3 +++ sources 7 Jul 2008 21:33:37 -0000 1.4 @@ -1 +1 @@ -db814bf066d6b855b99e681fca7eec6e olpc-utils-0.75.tar.bz2 +92bee2aae6eab7c9f9594c3061a35582 olpc-utils-0.76.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 21:36:57 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Mon, 7 Jul 2008 21:36:57 GMT Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.3, 1.4 olpc-utils.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807072136.m67LavRx023132@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23059 Modified Files: .cvsignore olpc-utils.spec sources Log Message: - Bump revision number. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jul 2008 21:33:37 -0000 1.3 +++ .cvsignore 7 Jul 2008 21:36:01 -0000 1.4 @@ -1 +1 @@ -olpc-utils-0.76.tar.bz2 +olpc-utils-0.77.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- olpc-utils.spec 7 Jul 2008 21:33:37 -0000 1.9 +++ olpc-utils.spec 7 Jul 2008 21:36:01 -0000 1.10 @@ -1,5 +1,5 @@ Name: olpc-utils -Version: 0.76 +Version: 0.77 Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary @@ -84,6 +84,9 @@ %changelog +* Mon Jul 07 2008 Michael Stone 0.77-1 +- Bump revision number. + * Thu Jul 03 2008 C. Scott Ananian 0.76-1 - dlo#6432: local installation of RPMs on first boot. - dlo#7171: move network testing tools to olpc-netutils Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Jul 2008 21:33:37 -0000 1.4 +++ sources 7 Jul 2008 21:36:01 -0000 1.5 @@ -1 +1 @@ -92bee2aae6eab7c9f9594c3061a35582 olpc-utils-0.76.tar.bz2 +93ac240d664965c54e575b4e25760e0d olpc-utils-0.77.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 7 21:47:02 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Mon, 7 Jul 2008 21:47:02 GMT Subject: rpms/kernel/F-8 linux-2.6-usb-fix-interrupt-disabling.patch, NONE, 1.1 config-generic, 1.71, 1.72 kernel.spec, 1.486, 1.487 Message-ID: <200807072147.m67Ll22l023711@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23654 Modified Files: config-generic kernel.spec Added Files: linux-2.6-usb-fix-interrupt-disabling.patch Log Message: * Mon Jul 07 2008 Chuck Ebbert 2.6.25.9-47 - Disable file capabilities. - Fix USB interrupt handling with shared interrupts. linux-2.6-usb-fix-interrupt-disabling.patch: --- NEW FILE linux-2.6-usb-fix-interrupt-disabling.patch --- From: Stefan Becker Date: Tue, 1 Jul 2008 16:19:22 +0000 (+0300) Subject: USB: fix interrupt disabling for HCDs with shared interrupt handlers X-Git-Tag: v2.6.26-rc9~62^2~5 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=de85422b94ddb23c021126815ea49414047c13dc USB: fix interrupt disabling for HCDs with shared interrupt handlers USB: fix interrupt disabling for HCDs with shared interrupt handlers As has been discussed several times on LKML, IRQF_SHARED | IRQF_DISABLED doesn't work reliably, i.e. a shared interrupt handler CAN'T be certain to be called with interrupts disabled. Most USB HCD handlers use IRQF_DISABLED and therefore havoc can break out if they share their interrupt with a handler that doesn't use it. On my test machine the yenta_socket interrupt handler (no IRQF_DISABLED) was registered before ehci_hcd and one uhci_hcd instance. Therefore all usb_hcd_irq() invocations for ehci_hcd and for one uhci_hcd instance happened with interrupts enabled. That led to random lockups as USB core HCD functions that acquire the same spinlock could be called twice from interrupt handlers. This patch updates usb_hcd_irq() to always disable/restore interrupts. usb_add_hcd() will silently remove any IRQF_DISABLED requested from HCD code. Signed-off-by: Stefan Becker Cc: stable Acked-by: David Brownell Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 09a53e7..7158dbb 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1684,19 +1684,30 @@ EXPORT_SYMBOL_GPL(usb_bus_start_enum); irqreturn_t usb_hcd_irq (int irq, void *__hcd) { struct usb_hcd *hcd = __hcd; - int start = hcd->state; + unsigned long flags; + irqreturn_t rc; - if (unlikely(start == HC_STATE_HALT || - !test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))) - return IRQ_NONE; - if (hcd->driver->irq (hcd) == IRQ_NONE) - return IRQ_NONE; + /* IRQF_DISABLED doesn't work correctly with shared IRQs + * when the first handler doesn't use it. So let's just + * assume it's never used. + */ + local_irq_save(flags); - set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); + if (unlikely(hcd->state == HC_STATE_HALT || + !test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))) { + rc = IRQ_NONE; + } else if (hcd->driver->irq(hcd) == IRQ_NONE) { + rc = IRQ_NONE; + } else { + set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); - if (unlikely(hcd->state == HC_STATE_HALT)) - usb_hc_died (hcd); - return IRQ_HANDLED; + if (unlikely(hcd->state == HC_STATE_HALT)) + usb_hc_died(hcd); + rc = IRQ_HANDLED; + } + + local_irq_restore(flags); + return rc; } /*-------------------------------------------------------------------------*/ @@ -1860,6 +1871,13 @@ int usb_add_hcd(struct usb_hcd *hcd, /* enable irqs just before we start the controller */ if (hcd->driver->irq) { + + /* IRQF_DISABLED doesn't work as advertised when used together + * with IRQF_SHARED. As usb_hcd_irq() will always disable + * interrupts we can remove it here. + */ + irqflags &= ~IRQF_DISABLED; + snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", hcd->driver->description, hcd->self.busnum); if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags, Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- config-generic 4 Jul 2008 20:48:49 -0000 1.71 +++ config-generic 7 Jul 2008 21:46:02 -0000 1.72 @@ -3031,7 +3031,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_FILE_CAPABILITIES=y +# CONFIG_SECURITY_FILE_CAPABILITIES is not set # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.486 retrieving revision 1.487 diff -u -r1.486 -r1.487 --- kernel.spec 4 Jul 2008 20:54:07 -0000 1.486 +++ kernel.spec 7 Jul 2008 21:46:02 -0000 1.487 @@ -666,6 +666,7 @@ Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch Patch1308: linux-2.6-usb-ehci-hcd-respect-nousb.patch +Patch1310: linux-2.6-usb-fix-interrupt-disabling.patch Patch1400: linux-2.6-smarter-relatime.patch @@ -1202,8 +1203,10 @@ # ACPI # USB -# some usb disks spin down automatically and need allow_restart +# respect the 'nousb' boot option ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch +# make USB work with shared interrupts +ApplyPatch linux-2.6-usb-fix-interrupt-disabling.patch # ISDN @@ -1824,6 +1827,10 @@ %changelog +* Mon Jul 07 2008 Chuck Ebbert 2.6.25.9-47 +- Disable file capabilities. +- Fix USB interrupt handling with shared interrupts. + * Fri Jul 04 2008 John W. Linville 2.6.25.10-46 - Upstream wireless fixes from 2008-07-02 (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) From fedora-extras-commits at redhat.com Mon Jul 7 22:03:30 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Mon, 7 Jul 2008 22:03:30 GMT Subject: rpms/subversion-api-docs/devel doxygen.conf, 1.2, 1.3 subversion-api-docs.spec, 1.14, 1.15 Message-ID: <200807072203.m67M3UIc031002@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/subversion-api-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30935 Modified Files: doxygen.conf subversion-api-docs.spec Log Message: Bump up to 1.5.0. Index: doxygen.conf =================================================================== RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/doxygen.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- doxygen.conf 9 Nov 2006 20:03:56 -0000 1.2 +++ doxygen.conf 7 Jul 2008 22:02:41 -0000 1.3 @@ -1,4 +1,4 @@ -# Doxyfile 1.4.1 +# Doxyfile 1.5.3 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,6 +14,14 @@ # Project related configuration options #--------------------------------------------------------------------------- +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# possible encodings. + +DOXYFILE_ENCODING = UTF-8 + # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. @@ -45,24 +53,14 @@ # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. # The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, -# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, -# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, -# Swedish, and Ukrainian. +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = YES - # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will # include brief member descriptions after the members that are listed in # the file and class documentation (similar to JavaDoc). @@ -135,11 +133,19 @@ # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen # will interpret the first line (until the first dot) of a JavaDoc-style # comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = YES +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen # treat a multi-line C++ special comment block (i.e. a block of //! or /// # comments) as a brief description. This used to be the default behaviour. @@ -161,12 +167,11 @@ INHERIT_DOCS = YES -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. -DISTRIBUTE_GROUP_DOC = NO +SEPARATE_MEMBER_PAGES = NO # The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. @@ -180,7 +185,7 @@ # will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = "copyright=@if copyrights" \ +ALIASES = "copyright=@if copyrights " \ endcopyright=@endif # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C @@ -190,13 +195,34 @@ OPTIMIZE_OUTPUT_FOR_C = YES -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. # For instance, namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + # Set the SUBGROUPING tag to YES (the default) to allow class member groups of # the same type (for instance a group of public functions) to be put as a # subgroup of that type (e.g. under the Public Functions section). Set it to @@ -239,6 +265,13 @@ EXTRACT_LOCAL_METHODS = NO +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous +# namespace. By default anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all # undocumented members of documented classes, files or namespaces. # If set to NO (the default) these members will be included in the @@ -371,7 +404,7 @@ # If the sources in your project are distributed over multiple directories # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. +# in the documentation. The default is NO. SHOW_DIRECTORIES = NO @@ -380,7 +413,7 @@ # version control system). Doxygen will invoke the program by executing (via # popen()) the command , where is the value of # the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the progam writes to standard output +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. FILE_VERSION_FILTER = @@ -428,7 +461,7 @@ # $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) -WARN_FORMAT = "$file:$line: $text" +WARN_FORMAT = "$file:$line: $text " # The WARN_LOGFILE tag can be used to specify a file to which warning # and error messages should be written. If left blank the output is written @@ -445,14 +478,21 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = subversion/include +INPUT = subversion/include subversion/include/private/svn_doxygen.h + +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# See http://www.gnu.org/software/libiconv for the list of possible encodings. + +INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py FILE_PATTERNS = *.h @@ -476,10 +516,19 @@ # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* EXCLUDE_PATTERNS = +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see # the \include command). @@ -504,7 +553,7 @@ # directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = www/images # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program @@ -538,7 +587,9 @@ # If the SOURCE_BROWSER tag is set to YES then a list of source files will # be generated. Documented entities will be cross-referenced with these sources. # Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce +# a warning and turn it on anyway SOURCE_BROWSER = YES @@ -565,6 +616,21 @@ REFERENCES_RELATION = YES +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen # will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. @@ -649,6 +715,14 @@ GENERATE_HTMLHELP = NO +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You # can add a path in front of the file if the result should not be @@ -951,7 +1025,7 @@ # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES # then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. +# PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO @@ -984,11 +1058,9 @@ PREDEFINED = DOXYGEN \ DOXYGEN_SHOULD_SKIP_THIS \ __attribute__(x)= \ - "SVN_ERROR_START=typedef enum svn_errno_t { \ - SVN_WARNING = APR_OS_START_USERERR + 1," \ - "SVN_ERRDEF(num,offset,str)=/** str */ num = offset," \ - "SVN_ERROR_END=SVN_ERR_LAST } svn_errno_t;" - + "SVN_ERROR_START=typedef enum svn_errno_t { SVN_WARNING = APR_OS_START_USERERR + 1, " \ + "SVN_ERRDEF(num,offset,str)=/** str */ num = offset, " \ + "SVN_ERROR_END=SVN_ERR_LAST } svn_errno_t; " # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. @@ -1061,6 +1133,14 @@ CLASS_DIAGRAMS = YES +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# be found in the default search path. + +MSCGEN_PATH = + # If set to YES, the inheritance and collaboration graphs will hide # inheritance and usage relations if the target is undocumented # or is not a class. @@ -1118,7 +1198,7 @@ INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will # generate a call dependency graph for every global function or class method. # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable call graphs for selected @@ -1126,6 +1206,14 @@ CALL_GRAPH = NO +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. + +CALLER_GRAPH = NO + # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. @@ -1155,31 +1243,23 @@ DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. -MAX_DOT_GRAPH_HEIGHT = 1024 +DOT_GRAPH_MAX_NODES = 50 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the # graphs generated by dot. A depth value of 3 means that only nodes reachable # from the root by following a path via at most 3 edges will be shown. Nodes # that lay further from the root node will be omitted. Note that setting this # option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that a graph may be further truncated if the graph's -# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH -# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), -# the graph is not depth-constrained. +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 0 @@ -1217,4 +1297,4 @@ # The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. -SEARCHENGINE = NO +SEARCHENGINE = YES Index: subversion-api-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- subversion-api-docs.spec 13 Feb 2008 23:39:02 -0000 1.14 +++ subversion-api-docs.spec 7 Jul 2008 22:02:41 -0000 1.15 @@ -1,5 +1,5 @@ Name: subversion-api-docs -Version: 1.4.6 +Version: 1.5.0 Release: 1%{?dist} Summary: Subversion API documentation @@ -50,6 +50,9 @@ %doc %{_docdir}/subversion-%{version}/api-docs/* %changelog +* Tue Jul 8 2008 Bojan Smojver 1.5.0-1 +- bump up to 1.5.0 + * Thu Feb 14 2008 Bojan Smojver 1.4.6-1 - bump up to 1.4.6 From fedora-extras-commits at redhat.com Mon Jul 7 22:05:36 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Mon, 7 Jul 2008 22:05:36 GMT Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.15,1.16 Message-ID: <200807072205.m67M5aYr031188@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/subversion-api-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31091 Modified Files: subversion-api-docs.spec Log Message: Fix quoting. Index: subversion-api-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- subversion-api-docs.spec 7 Jul 2008 22:02:41 -0000 1.15 +++ subversion-api-docs.spec 7 Jul 2008 22:04:44 -0000 1.16 @@ -26,7 +26,7 @@ %build cd %{name}-%{version} -sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/subversion-1', \ +sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/subversion-1,' \ -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \ -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' \ doxygen.conf | doxygen - From fedora-extras-commits at redhat.com Mon Jul 7 22:05:57 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 7 Jul 2008 22:05:57 GMT Subject: rpms/kdevelop/devel kdevelop.spec,1.77,1.78 Message-ID: <200807072205.m67M5vGe031221@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdevelop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31144/devel Modified Files: kdevelop.spec Log Message: * Mon Jul 07 2008 Kevin Kofler - 9:3.5.2-3 - fix FTBFS (add BR openldap-devel to work around missing dep in apr-devel) Index: kdevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- kdevelop.spec 6 Jun 2008 22:06:26 -0000 1.77 +++ kdevelop.spec 7 Jul 2008 22:05:11 -0000 1.78 @@ -19,7 +19,7 @@ Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 3.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -86,6 +86,9 @@ BuildRequires: kdesdk3-devel %endif BuildRequires: subversion-devel neon-devel +# looks like this is dragged in by apr-devel (dep of subversion-devel), but not +# a dependency +BuildRequires: openldap-devel ## ancient, deprecated? -- Rex #Obsoletes: kdevelop-c_c++_ref @@ -254,6 +257,9 @@ %changelog +* Mon Jul 07 2008 Kevin Kofler - 9:3.5.2-3 +- fix FTBFS (add BR openldap-devel to work around missing dep in apr-devel) + * Fri Jun 06 2008 Kevin Kofler - 9:3.5.2-2 - improve integration of the KDE 4 app template From fedora-extras-commits at redhat.com Mon Jul 7 22:06:37 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Mon, 7 Jul 2008 22:06:37 GMT Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.8,1.9 Message-ID: <200807072206.m67M6bTl031361@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/apr-api-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31206 Modified Files: apr-api-docs.spec Log Message: Simplify INPUT. Index: apr-api-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr-api-docs.spec 4 Jul 2008 04:57:05 -0000 1.8 +++ apr-api-docs.spec 7 Jul 2008 22:05:53 -0000 1.9 @@ -29,8 +29,7 @@ %build cd %{name}-%{version} -%define docheaders %(ls %{_includedir}/apr-1/*.h | xargs echo) -sed -e 's,\(INPUT *= *\).*$,\1%{docheaders},' \ +sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/apr-1,' \ -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \ -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/apr.tag,' \ doxygen.conf | doxygen - From fedora-extras-commits at redhat.com Mon Jul 7 22:08:53 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Mon, 7 Jul 2008 22:08:53 GMT Subject: rpms/e2fsprogs/devel .cvsignore, 1.24, 1.25 e2fsprogs.spec, 1.114, 1.115 sources, 1.24, 1.25 e2fsprogs-1.40-list_for_each_safe.patch, 1.1, NONE e2fsprogs-1.40.7-swap-inode-full-fix.patch, 1.2, NONE e2fsprogs-resize-fix.patch, 1.2, NONE Message-ID: <200807072208.m67M8rcM031590@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31558 Modified Files: .cvsignore e2fsprogs.spec sources Removed Files: e2fsprogs-1.40-list_for_each_safe.patch e2fsprogs-1.40.7-swap-inode-full-fix.patch e2fsprogs-resize-fix.patch Log Message: * Mon Jul 07 2008 Eric Sandeen 1.41-0.1.WIP.0707 - New upstream snapshot release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 18 Jun 2008 21:06:32 -0000 1.24 +++ .cvsignore 7 Jul 2008 22:08:08 -0000 1.25 @@ -1 +1 @@ -e2fsprogs-1.41-WIP-0617.tar.gz +e2fsprogs-1.41-WIP-0707.tar.gz Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- e2fsprogs.spec 21 Jun 2008 03:37:05 -0000 1.114 +++ e2fsprogs.spec 7 Jul 2008 22:08:08 -0000 1.115 @@ -4,20 +4,17 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs Version: 1.41 -Release: 0.WIP.0617.1%{?dist} +Release: 0.1.WIP.0707{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 Group: System Environment/Base -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-WIP-0617.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-WIP-0707.tar.gz Source1: ext2_types-wrapper.h Source2: blkid_types-wrapper.h Source3: uuidd.init Patch1: e2fsprogs-1.38-etcblkid.patch Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch -Patch3: e2fsprogs-1.41-buildfix -Patch4: e2fsprogs-1.41-fix-mkswap-tests -Patch5: e2fsprogs-1.40-list_for_each_safe.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,9 +91,6 @@ # mildly unsafe but 'til I get something better, avoid full fsck # after an selinux install... %patch2 -p1 -b .featurecheck -%patch3 -p1 -b .buildfix -%patch4 -p1 -b .mkswap -%patch5 -p1 -b .listsafe %build %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux @@ -295,6 +289,9 @@ %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid %changelog +* Mon Jul 07 2008 Eric Sandeen 1.41-0.1.WIP.0707 +- New upstream snapshot release + * Fri Jun 20 2008 Eric Sandeen 1.41-0.WIP.0617.1 - Fix blkid -g segfault when clearing entries (#452333) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 18 Jun 2008 21:06:32 -0000 1.24 +++ sources 7 Jul 2008 22:08:08 -0000 1.25 @@ -1 +1 @@ -d70dfeec52ba75b99b3306c8a6680fcb e2fsprogs-1.41-WIP-0617.tar.gz +95bb57e8e59ba24d380da855fa3f971b e2fsprogs-1.41-WIP-0707.tar.gz --- e2fsprogs-1.40-list_for_each_safe.patch DELETED --- --- e2fsprogs-1.40.7-swap-inode-full-fix.patch DELETED --- --- e2fsprogs-resize-fix.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 7 22:13:02 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Mon, 7 Jul 2008 22:13:02 GMT Subject: rpms/wyrd/devel wyrd.spec,1.5,1.6 Message-ID: <200807072213.m67MD24k031895@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/wyrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31800 Modified Files: wyrd.spec Log Message: remove deprecated comment Index: wyrd.spec =================================================================== RCS file: /cvs/pkgs/rpms/wyrd/devel/wyrd.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wyrd.spec 29 Feb 2008 21:32:59 -0000 1.5 +++ wyrd.spec 7 Jul 2008 22:12:13 -0000 1.6 @@ -11,10 +11,6 @@ Patch0: wyrd-1.4.3-wyrdrc-local.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# There is no ocaml for ppc64 -# Bugs: https://bugzilla.redhat.com/344581 (wyrd) -# https://bugzilla.redhat.com/239077 (ocaml) -#ExcludeArch: ppc64 BuildRequires: ocaml remind ncurses-devel # can be removed when F7 is EOL BuildRequires: camlp4 From fedora-extras-commits at redhat.com Mon Jul 7 22:13:46 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 7 Jul 2008 22:13:46 GMT Subject: rpms/qt4-theme-quarticurve/devel qt4-theme-quarticurve.spec, 1.10, 1.11 Message-ID: <200807072213.m67MDk90031976@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4-theme-quarticurve/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31890/devel Modified Files: qt4-theme-quarticurve.spec Log Message: * Mon Jul 7 2008 Kevin Kofler - 0.0-0.12.beta7 - Explicitly set KDE4_APPSDIR to work around broken autodetection for now (fixes FTBFS). Index: qt4-theme-quarticurve.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt4-theme-quarticurve/devel/qt4-theme-quarticurve.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qt4-theme-quarticurve.spec 9 Feb 2008 03:14:55 -0000 1.10 +++ qt4-theme-quarticurve.spec 7 Jul 2008 22:13:01 -0000 1.11 @@ -1,6 +1,6 @@ Name: qt4-theme-quarticurve Version: 0.0 -Release: 0.11.beta7%{?dist} +Release: 0.12.beta7%{?dist} URL: http://www.kde-look.org/content/show.php/Quarticurve?content=59884 # downloadable from URL above Source: quarticurve-beta7.tar.bz2 @@ -21,7 +21,7 @@ %setup -q -n quarticurve-beta7 %build -CXXFLAGS="$RPM_OPT_FLAGS" qmake-qt4 +CXXFLAGS="$RPM_OPT_FLAGS" KDE4_APPSDIR="%{_kde4_appsdir}" qmake-qt4 make %install @@ -39,6 +39,10 @@ %doc COPYING ChangeLog readme.txt %changelog +* Mon Jul 7 2008 Kevin Kofler - 0.0-0.12.beta7 +- Explicitly set KDE4_APPSDIR to work around broken autodetection for now + (fixes FTBFS). + * Sat Feb 9 2008 Kevin Kofler - 0.0-0.11.beta7 - Rebuild for GCC 4.3. From fedora-extras-commits at redhat.com Mon Jul 7 22:22:09 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Mon, 7 Jul 2008 22:22:09 GMT Subject: rpms/libapreq2/devel libapreq2-2.09-avoid_ldap.patch, NONE, 1.1 libapreq2.spec, 1.40, 1.41 Message-ID: <200807072222.m67MM9P0032753@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32697 Modified Files: libapreq2.spec Added Files: libapreq2-2.09-avoid_ldap.patch Log Message: Add patch to use --avoid-ldap with apu-1-config. libapreq2-2.09-avoid_ldap.patch: --- NEW FILE libapreq2-2.09-avoid_ldap.patch --- --- acinclude.m4.orig 2008-07-08 08:17:02.000000000 +1000 +++ acinclude.m4 2008-07-08 08:17:40.000000000 +1000 @@ -168,10 +168,10 @@ dnl provide identical dependency names: libexpat.so.0 dnl (possible multiple inclusion of the same file) if test "x$OS" = "xsolaris"; then - APU_LIBS=`$APU_CONFIG --libs | $PERL -pe 's,-lexpat,,'` + APU_LIBS=`$APU_CONFIG --avoid-ldap --libs | $PERL -pe 's,-lexpat,,'` APR_ADDTO([APR_LIBS], "$APU_LIBS") else - APR_ADDTO([APR_LIBS], "`$APU_CONFIG --libs`") + APR_ADDTO([APR_LIBS], "`$APU_CONFIG --avoid-ldap --libs`") fi APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`") Index: libapreq2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- libapreq2.spec 5 Jun 2008 00:31:17 -0000 1.40 +++ libapreq2.spec 7 Jul 2008 22:21:13 -0000 1.41 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.09 -Release: 0.17.rc2%{?dist} +Release: 0.18.rc2%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -16,6 +16,7 @@ Patch2: %{name}-2.09-version_check.patch Patch3: %{name}-2.09-pkgconfig.patch Patch4: %{name}-2.09-Makefile_PL.patch +Patch5: %{name}-2.09-avoid_ldap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel >= 2.0.48 @@ -92,6 +93,7 @@ %patch2 %patch3 %patch4 +%patch5 # Fix multilib sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \ @@ -174,6 +176,9 @@ %changelog +* Tue Jul 8 2008 Bojan Smojver - 2.09-0.18.rc2 +- add patch to use --avoid-ldap with apu-1-config + * Thu Jun 5 2008 Bojan Smojver - 2.09-0.17.rc2 - bump to re-tag From fedora-extras-commits at redhat.com Mon Jul 7 22:26:21 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 7 Jul 2008 22:26:21 GMT Subject: rpms/nyquist/devel nyqsrc301-inc.patch, NONE, 1.1 nyqsrc301-javafix.patch, NONE, 1.1 Message-ID: <200807072226.m67MQLlJ000731@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/nyquist/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv700 Added Files: nyqsrc301-inc.patch nyqsrc301-javafix.patch Log Message: nyqsrc301-inc.patch: --- NEW FILE nyqsrc301-inc.patch --- diff -up nyquist/nyqstk/src/FileRead.cpp.inc nyquist/nyqstk/src/FileRead.cpp --- nyquist/nyqstk/src/FileRead.cpp.inc 2008-07-07 23:12:46.000000000 +0200 +++ nyquist/nyqstk/src/FileRead.cpp 2008-07-07 23:12:53.000000000 +0200 @@ -33,6 +33,7 @@ #include #include #include +#include FileRead :: FileRead() : fd_(0) diff -up nyquist/nyqstk/src/Modal.cpp.inc nyquist/nyqstk/src/Modal.cpp --- nyquist/nyqstk/src/Modal.cpp.inc 2008-07-07 23:14:50.000000000 +0200 +++ nyquist/nyqstk/src/Modal.cpp 2008-07-07 23:15:03.000000000 +0200 @@ -12,6 +12,7 @@ /***************************************************/ #include "Modal.h" +#include Modal :: Modal(unsigned int modes) : nModes_(modes) diff -up nyquist/nyqstk/src/Stk.cpp.inc nyquist/nyqstk/src/Stk.cpp --- nyquist/nyqstk/src/Stk.cpp.inc 2008-07-07 23:13:50.000000000 +0200 +++ nyquist/nyqstk/src/Stk.cpp 2008-07-07 23:14:12.000000000 +0200 @@ -13,6 +13,7 @@ /***************************************************/ #include "Stk.h" +#include StkFloat Stk :: srate_ = (StkFloat) SRATE; std::string Stk :: rawwavepath_ = RAWWAVE_PATH; nyqsrc301-javafix.patch: --- NEW FILE nyqsrc301-javafix.patch --- diff -up nyquist/jnyqide/NyquistThread.java.javafix nyquist/jnyqide/NyquistThread.java --- nyquist/jnyqide/NyquistThread.java.javafix 2008-01-07 16:30:33.000000000 +0100 +++ nyquist/jnyqide/NyquistThread.java 2008-07-08 00:03:20.000000000 +0200 @@ -74,7 +74,7 @@ public class NyquistThread extends Threa // find full path to instruments.txt String cwd = System.getProperty("user.dir"); - soundBrowser = cwd.concat("/lib/instruments.txt"); + soundBrowser = "/usr/share/nyquist/lib/instruments.txt"; System.out.println("soundBrowser file is " + soundBrowser); // build XLISPPATH environment specification @@ -104,10 +104,10 @@ public class NyquistThread extends Threa System.out.println("envp has " + systemroot); try { - myProcess = Runtime.getRuntime().exec( "./ny", envp ); + myProcess = Runtime.getRuntime().exec( "ny", envp ); } catch (Exception e3) { - System.out.println("no ./ny found, trying ./nyquist"); - myProcess = Runtime.getRuntime().exec("./nyquist", envp); + System.out.println("no ny found, trying nyquist"); + myProcess = Runtime.getRuntime().exec("nyquist", envp); // if this one fails, we'll take the exception below } System.out.print("myProcess: " + myProcess); diff -up nyquist/jnyqide/WordList.java.javafix nyquist/jnyqide/WordList.java --- nyquist/jnyqide/WordList.java.javafix 2008-01-26 03:21:38.000000000 +0100 +++ nyquist/jnyqide/WordList.java 2008-07-07 23:52:16.000000000 +0200 @@ -2,7 +2,7 @@ package jnyqide; import java.io.BufferedReader; import java.io.FileReader; -import java.io.IOException; +import java.io.*; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -47,13 +47,8 @@ public class WordList { //System.out.println("initializing WordList.java"); try { BufferedReader inf; - try { - inf = new BufferedReader(new FileReader("NyquistWords.txt")); - System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n"); - } catch (IOException e) { - System.out.println("could not find NyquistWords.txt, trying jnyqide/NyquistWords.txt"); - inf = new BufferedReader(new FileReader("jnyqide/NyquistWords.txt")); - } + inf = new BufferedReader(new InputStreamReader(WordList.class.getResourceAsStream("NyquistWords.txt"))); + System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n"); String word, link; while ((word = inf.readLine()) != null) { //wordsTrie.addWord(word); diff -up nyquist/sys/unix/linux/Makefile.javafix nyquist/sys/unix/linux/Makefile --- nyquist/sys/unix/linux/Makefile.javafix 2008-01-17 23:27:37.000000000 +0100 +++ nyquist/sys/unix/linux/Makefile 2008-07-07 23:52:16.000000000 +0200 @@ -42,7 +42,7 @@ jnyqide/jNyqIDE.jar: $(JAVASRC) javac jnyqide/*.java mv jnyqide/SpecialMacHandler.hidden jnyqide/SpecialMacHandler.java rm -rf jnyqide/jNyqIDE.jar - jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class + jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class jnyqide/*.txt # Standard list of includes (common to all unix versions) INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Isnd -Ifft \ @@ -62,12 +62,12 @@ CC = gcc # ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o # # to use OSS: -USE_ALSA = -ALSA_OBJECTS = +USE_ALSA = -DPA_USE_ALSA=1 +ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o # to enable command line editing, use -DREADLINE. WARNING: THIS WILL DISABLE THE # ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY CONTROL CHARACTERS -CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \ +CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \ -DPA_USE_OSS=1 $(USE_ALSA) -DSTK_NYQUIST LN = g++ # to disable command line editing, take out -lreadline -lcurses From fedora-extras-commits at redhat.com Mon Jul 7 22:29:08 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 7 Jul 2008 22:29:08 GMT Subject: rpms/nyquist/devel nyquist.spec,1.6,1.7 sources,1.6,1.7 Message-ID: <200807072229.m67MT8Y2001062@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/nyquist/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv917 Modified Files: nyquist.spec sources Log Message: Index: nyquist.spec =================================================================== RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nyquist.spec 19 Feb 2008 03:41:37 -0000 1.6 +++ nyquist.spec 7 Jul 2008 22:28:20 -0000 1.7 @@ -1,16 +1,20 @@ Name: nyquist -Version: 2.37 -Release: 2%{?dist} +Version: 3.01 +Release: 1%{?dist} Summary: Sound synthesis and composition language with a Lisp syntax Group: Applications/Multimedia License: BSD URL: http://www-2.cs.cmu.edu/~music/music.software.html -Source0: http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc237.zip +Source0: http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc301.zip Patch0: nyqsrc231-pafix.patch +Patch1: nyqsrc301-inc.patch +Patch2: nyqsrc301-javafix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel +BuildRequires: java-1.6.0-openjdk-devel BuildRequires: dos2unix +Requires: java-1.6.0-openjdk %description Nyquist is a language for sound synthesis and music @@ -23,19 +27,25 @@ %prep %setup -q -n nyquist -%patch0 -p1 +%patch0 -p1 -b .pafix +%patch1 -p1 -b .inc +%patch2 -p1 -b .javafix + # remove cvs cruft find -name CVS | xargs rm -fr # add opt flags sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile # do not build with buggy readline support -sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile +sed -ifix "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile # build with alsa sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" sys/unix/linux/Makefile + # remove dos paths that cause warnings sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp +# fix some permission +find -name "*.lsp" | xargs chmod 0644 # change end-of-line find -name "*.htm*" \ -or -name "*.lsp" \ @@ -44,20 +54,23 @@ -or -name "*.dat" | xargs dos2unix -q %build -(cd misc; make %{?_smp_mflags}) rm -f runtime/system.lsp -make %{?_smp_mflags} -f sys/unix/linux/Makefile ny runtime/system.lsp +make %{?_smp_mflags} -f sys/unix/linux/Makefile %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist +mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist/java mkdir -p $RPM_BUILD_ROOT%{_libexecdir} cp -pr runtime $RPM_BUILD_ROOT%{_datadir}/nyquist cp -pr lib $RPM_BUILD_ROOT%{_datadir}/nyquist +cp -pr demos $RPM_BUILD_ROOT%{_datadir}/nyquist cp -p ny $RPM_BUILD_ROOT%{_libexecdir} +cp -p jnyqide/jNyqIDE.jar $RPM_BUILD_ROOT%{_datadir}/nyquist/java + cat > $RPM_BUILD_ROOT%{_bindir}/ny < $RPM_BUILD_ROOT%{_bindir}/jny < - 3.01-1 +- new release 3.01 + * Mon Feb 18 2008 Fedora Release Engineering - 2.37-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nyquist/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Dec 2007 15:48:28 -0000 1.6 +++ sources 7 Jul 2008 22:28:20 -0000 1.7 @@ -1 +1 @@ -f14bc518db40e7cd7fc546cb10e5d5ab nyqsrc237.zip +f2ad65bb2ed7e1dc2d7db2e052be9592 nyqsrc301.zip From fedora-extras-commits at redhat.com Mon Jul 7 22:39:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 7 Jul 2008 22:39:01 GMT Subject: rpms/nyquist/devel nyqsrc301-javafix.patch, 1.1, 1.2 nyquist.spec, 1.7, 1.8 Message-ID: <200807072239.m67Md1T8001746@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/nyquist/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1621 Modified Files: nyqsrc301-javafix.patch nyquist.spec Log Message: nyqsrc301-javafix.patch: Index: nyqsrc301-javafix.patch =================================================================== RCS file: /cvs/pkgs/rpms/nyquist/devel/nyqsrc301-javafix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nyqsrc301-javafix.patch 7 Jul 2008 22:25:58 -0000 1.1 +++ nyqsrc301-javafix.patch 7 Jul 2008 22:38:12 -0000 1.2 @@ -64,19 +64,3 @@ # Standard list of includes (common to all unix versions) INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Isnd -Ifft \ -@@ -62,12 +62,12 @@ CC = gcc - # ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o - # - # to use OSS: --USE_ALSA = --ALSA_OBJECTS = -+USE_ALSA = -DPA_USE_ALSA=1 -+ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o - - # to enable command line editing, use -DREADLINE. WARNING: THIS WILL DISABLE THE - # ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY CONTROL CHARACTERS --CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \ -+CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \ - -DPA_USE_OSS=1 $(USE_ALSA) -DSTK_NYQUIST - LN = g++ - # to disable command line editing, take out -lreadline -lcurses Index: nyquist.spec =================================================================== RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nyquist.spec 7 Jul 2008 22:28:20 -0000 1.7 +++ nyquist.spec 7 Jul 2008 22:38:12 -0000 1.8 @@ -37,11 +37,10 @@ sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile # do not build with buggy readline support -sed -ifix "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile +sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile # build with alsa sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" sys/unix/linux/Makefile - # remove dos paths that cause warnings sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp # fix some permission From fedora-extras-commits at redhat.com Mon Jul 7 22:47:53 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Mon, 7 Jul 2008 22:47:53 GMT Subject: rpms/gdb/devel gdb-6.8-upstream.patch,1.3,1.4 gdb.spec,1.294,1.295 Message-ID: <200807072247.m67Mlrxn002226@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2154 Modified Files: gdb-6.8-upstream.patch gdb.spec Log Message: * Tue Jul 8 2008 Jan Kratochvil - 6.8-14 - Fix crash due to calling an inferior function right after a watchpoint stop. gdb-6.8-upstream.patch: Index: gdb-6.8-upstream.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-upstream.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.8-upstream.patch 4 May 2008 06:54:04 -0000 1.3 +++ gdb-6.8-upstream.patch 7 Jul 2008 22:47:02 -0000 1.4 @@ -815,3 +815,119 @@ gdb_test "finish" " = 1.2" "Correct _Decimal128 return value from called function." gdb_test "call decimal_dec128_align (double_val1, dec128_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14)" " = 1" \ + + + +gdb/ +2008-07-07 Jan Kratochvil + + * breakpoint.c (bpstat_copy): Call RELEASE_VALUE on the new OLD_VAL. + +gdb/testsuite/ +2008-07-07 Jan Kratochvil + + * gdb.base/value-double-free.exp, gdb.base/value-double-free.c: New. + +=================================================================== +RCS file: /cvs/src/src/gdb/breakpoint.c,v +retrieving revision 1.327 +retrieving revision 1.328 +diff -u -r1.327 -r1.328 +--- src/gdb/breakpoint.c 2008/06/28 09:42:15 1.327 ++++ src/gdb/breakpoint.c 2008/07/07 22:39:58 1.328 +@@ -1996,7 +1996,10 @@ + if (bs->commands != NULL) + tmp->commands = copy_command_lines (bs->commands); + if (bs->old_val != NULL) +- tmp->old_val = value_copy (bs->old_val); ++ { ++ tmp->old_val = value_copy (bs->old_val); ++ release_value (tmp->old_val); ++ } + + if (p == NULL) + /* This is the first thing in the chain. */ +/cvs/src/src/gdb/testsuite/gdb.base/value-double-free.c,v --> standard output +revision 1.1 +--- src/gdb/testsuite/gdb.base/value-double-free.c ++++ src/gdb/testsuite/gdb.base/value-double-free.c 2008-07-07 22:40:47.485459000 +0000 +@@ -0,0 +1,36 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2008 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ ++ Please email any bugs, comments, and/or additions to this file to: ++ bug-gdb at prep.ai.mit.edu */ ++ ++volatile int var; ++ ++void ++empty (void) ++{ ++} ++ ++int ++main (void) ++{ ++ var = 1; ++ /* Workaround PR 38: We may miss the first watchpoint hit as we stop on the ++ exact instruction which would cause the watchpoint hit. */ ++ var = 2; ++ return 0; ++} +/cvs/src/src/gdb/testsuite/gdb.base/value-double-free.exp,v --> standard output +revision 1.1 +--- src/gdb/testsuite/gdb.base/value-double-free.exp ++++ src/gdb/testsuite/gdb.base/value-double-free.exp 2008-07-07 22:40:48.139680000 +0000 +@@ -0,0 +1,38 @@ ++# Copyright 2008 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++set testfile value-double-free ++set srcfile ${testfile}.c ++set binfile ${objdir}/${subdir}/${testfile} ++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { ++ untested "Couldn't compile test program" ++ return -1 ++} ++ ++# Get things started. ++ ++gdb_exit ++gdb_start ++gdb_reinitialize_dir $srcdir/$subdir ++gdb_load ${binfile} ++ ++if ![runto_main] { ++ return -1 ++} ++gdb_test "watch var" "atchpoint \[0-9\]+: var" ++gdb_test "continue" "atchpoint \[0-9\]+: var.*Old value = 0.*New value = \[12\].*" ++gdb_test "print empty()" " = void" ++# We did segfault here. ++gdb_test "help help" Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- gdb.spec 3 Jul 2008 11:05:26 -0000 1.294 +++ gdb.spec 7 Jul 2008 22:47:03 -0000 1.295 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 13%{?_with_upstream:.upstream}%{?dist} +Release: 14%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -828,6 +828,9 @@ %endif %changelog +* Tue Jul 8 2008 Jan Kratochvil - 6.8-14 +- Fix crash due to calling an inferior function right after a watchpoint stop. + * Thu Jul 3 2008 Jan Kratochvil - 6.8-13 - Support transparent debugging of inlined functions for an optimized code. From fedora-extras-commits at redhat.com Mon Jul 7 22:50:14 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Mon, 7 Jul 2008 22:50:14 GMT Subject: rpms/gdb/F-9 gdb-6.8-upstream.patch,1.3,1.4 gdb.spec,1.286,1.287 Message-ID: <200807072250.m67MoEKY002424@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2361 Modified Files: gdb-6.8-upstream.patch gdb.spec Log Message: * Tue Jul 8 2008 Jan Kratochvil - 6.8-11 - Fix crash due to calling an inferior function right after a watchpoint stop. gdb-6.8-upstream.patch: Index: gdb-6.8-upstream.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/F-9/gdb-6.8-upstream.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.8-upstream.patch 22 May 2008 23:06:40 -0000 1.3 +++ gdb-6.8-upstream.patch 7 Jul 2008 22:49:31 -0000 1.4 @@ -815,3 +815,119 @@ gdb_test "finish" " = 1.2" "Correct _Decimal128 return value from called function." gdb_test "call decimal_dec128_align (double_val1, dec128_val2, double_val3, double_val4, double_val5, double_val6, double_val7, double_val8, double_val9, double_val10, double_val11, double_val12, double_val13, double_val14)" " = 1" \ + + + +gdb/ +2008-07-07 Jan Kratochvil + + * breakpoint.c (bpstat_copy): Call RELEASE_VALUE on the new OLD_VAL. + +gdb/testsuite/ +2008-07-07 Jan Kratochvil + + * gdb.base/value-double-free.exp, gdb.base/value-double-free.c: New. + +=================================================================== +RCS file: /cvs/src/src/gdb/breakpoint.c,v +retrieving revision 1.327 +retrieving revision 1.328 +diff -u -r1.327 -r1.328 +--- src/gdb/breakpoint.c 2008/06/28 09:42:15 1.327 ++++ src/gdb/breakpoint.c 2008/07/07 22:39:58 1.328 +@@ -1996,7 +1996,10 @@ + if (bs->commands != NULL) + tmp->commands = copy_command_lines (bs->commands); + if (bs->old_val != NULL) +- tmp->old_val = value_copy (bs->old_val); ++ { ++ tmp->old_val = value_copy (bs->old_val); ++ release_value (tmp->old_val); ++ } + + if (p == NULL) + /* This is the first thing in the chain. */ +/cvs/src/src/gdb/testsuite/gdb.base/value-double-free.c,v --> standard output +revision 1.1 +--- src/gdb/testsuite/gdb.base/value-double-free.c ++++ src/gdb/testsuite/gdb.base/value-double-free.c 2008-07-07 22:40:47.485459000 +0000 +@@ -0,0 +1,36 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2008 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ ++ Please email any bugs, comments, and/or additions to this file to: ++ bug-gdb at prep.ai.mit.edu */ ++ ++volatile int var; ++ ++void ++empty (void) ++{ ++} ++ ++int ++main (void) ++{ ++ var = 1; ++ /* Workaround PR 38: We may miss the first watchpoint hit as we stop on the ++ exact instruction which would cause the watchpoint hit. */ ++ var = 2; ++ return 0; ++} +/cvs/src/src/gdb/testsuite/gdb.base/value-double-free.exp,v --> standard output +revision 1.1 +--- src/gdb/testsuite/gdb.base/value-double-free.exp ++++ src/gdb/testsuite/gdb.base/value-double-free.exp 2008-07-07 22:40:48.139680000 +0000 +@@ -0,0 +1,38 @@ ++# Copyright 2008 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++set testfile value-double-free ++set srcfile ${testfile}.c ++set binfile ${objdir}/${subdir}/${testfile} ++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { ++ untested "Couldn't compile test program" ++ return -1 ++} ++ ++# Get things started. ++ ++gdb_exit ++gdb_start ++gdb_reinitialize_dir $srcdir/$subdir ++gdb_load ${binfile} ++ ++if ![runto_main] { ++ return -1 ++} ++gdb_test "watch var" "atchpoint \[0-9\]+: var" ++gdb_test "continue" "atchpoint \[0-9\]+: var.*Old value = 0.*New value = \[12\].*" ++gdb_test "print empty()" " = void" ++# We did segfault here. ++gdb_test "help help" Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/F-9/gdb.spec,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- gdb.spec 1 Jun 2008 13:15:47 -0000 1.286 +++ gdb.spec 7 Jul 2008 22:49:31 -0000 1.287 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 10%{?_with_upstream:.upstream}%{?dist} +Release: 11%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -785,6 +785,9 @@ %endif %changelog +* Tue Jul 8 2008 Jan Kratochvil - 6.8-11 +- Fix crash due to calling an inferior function right after a watchpoint stop. + * Sun Jun 1 2008 Jan Kratochvil - 6.8-10 - Fix crash on a watchpoint update on an inferior stop. - Fix the s390x part of the hardware watchpoints after a fork. From fedora-extras-commits at redhat.com Mon Jul 7 23:05:34 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Mon, 7 Jul 2008 23:05:34 GMT Subject: rpms/wyrd/devel wyrd-1.4.4-camlp5.patch,NONE,1.1 wyrd.spec,1.6,1.7 Message-ID: <200807072305.m67N5YDd009494@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/wyrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9447 Modified Files: wyrd.spec Added Files: wyrd-1.4.4-camlp5.patch Log Message: * Tue Jul 08 2008 Till Maas - 1.4.4-2 - fix BuildRequires, the ocaml-camlp4-devel seems to have vanished wyrd-1.4.4-camlp5.patch: --- NEW FILE wyrd-1.4.4-camlp5.patch --- diff -up wyrd-1.4.4/Makefile.in.camlp5 wyrd-1.4.4/Makefile.in --- wyrd-1.4.4/Makefile.in.camlp5 2008-02-22 05:25:24.000000000 +0100 +++ wyrd-1.4.4/Makefile.in 2008-07-08 00:44:13.000000000 +0200 @@ -45,11 +45,11 @@ LDFLAGS = @LDFLAGS@ CURSES_LIB = @CURSES_LIB@ INCLUDES = -I ./curses -BFLAGS = -pp camlp4o -g $(INCLUDES) -OFLAGS = -pp camlp4o $(INCLUDES) +BFLAGS = -pp camlp5o -g $(INCLUDES) +OFLAGS = -pp camlp5o $(INCLUDES) BLFLAGS = -custom -cclib '$(LDFLAGS) $(CURSES_LIB) -lm' OLFLAGS = -cclib '$(LDFLAGS) $(CURSES_LIB) -lm' -DEPFLAGS = -pp camlp4o +DEPFLAGS = -pp camlp5o # main target ############# @@ -259,7 +259,7 @@ dist-clean distclean:: clean depend:: # $(MAKE) txtin_lexer.ml # $(MAKE) txtin_parser.ml - $(OCAMLDEP) -pp camlp4o $(INCLUDES) *.ml *.mli > depend + $(OCAMLDEP) -pp camlp5o $(INCLUDES) *.ml *.mli > depend $(OCAMLDEP) -pp 'cpp -P -xassembler-with-cpp' -I ./curses curses/*.ml curses/*.mli >> depend include depend Index: wyrd.spec =================================================================== RCS file: /cvs/pkgs/rpms/wyrd/devel/wyrd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wyrd.spec 7 Jul 2008 22:12:13 -0000 1.6 +++ wyrd.spec 7 Jul 2008 23:04:46 -0000 1.7 @@ -1,6 +1,6 @@ Name: wyrd Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A ncurses frontend for the calendar application remind Group: Applications/Productivity @@ -9,16 +9,12 @@ Source0: http://pessimization.com/software/wyrd/wyrd-%{version}.tar.gz Source1: wyrd-wyrdrc.local Patch0: wyrd-1.4.3-wyrdrc-local.patch +Patch1: wyrd-1.4.4-camlp5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml remind ncurses-devel -# can be removed when F7 is EOL -BuildRequires: camlp4 -# Since F8 ocaml-camlp4-devel instead of camlp4 is needed -%if 0%{?fedora} >= 8 -BuildRequires: ocaml-camlp4-devel -%endif +BuildRequires: ocaml-camlp5-devel %description wyrd is a ncurses frontend for the calendar application remind. @@ -26,7 +22,8 @@ %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .wyrdrc-local +%patch1 -p1 -b .camlp5 %build @@ -56,6 +53,9 @@ %changelog +* Tue Jul 08 2008 Till Maas - 1.4.4-2 +- fix BuildRequires, the ocaml-camlp4-devel seems to have vanished + * Fri Feb 22 2008 Till Maas - 1.4.4-1 - update to latest version that fixes CVE-2008-0806 in a different way - update URL/SOURCE to new location From fedora-extras-commits at redhat.com Mon Jul 7 23:56:51 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Mon, 7 Jul 2008 23:56:51 GMT Subject: rpms/kernel/F-9 linux-2.6-usb-fix-interrupt-disabling.patch, NONE, 1.1 kernel.spec, 1.704, 1.705 Message-ID: <200807072356.m67NupqS012156@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098 Modified Files: kernel.spec Added Files: linux-2.6-usb-fix-interrupt-disabling.patch Log Message: * Mon Jul 07 2008 Chuck Ebbert 2.6.25.9-86 - Fix USB interrupt handling with shared interrupts. linux-2.6-usb-fix-interrupt-disabling.patch: --- NEW FILE linux-2.6-usb-fix-interrupt-disabling.patch --- From: Stefan Becker Date: Tue, 1 Jul 2008 16:19:22 +0000 (+0300) Subject: USB: fix interrupt disabling for HCDs with shared interrupt handlers X-Git-Tag: v2.6.26-rc9~62^2~5 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=de85422b94ddb23c021126815ea49414047c13dc USB: fix interrupt disabling for HCDs with shared interrupt handlers USB: fix interrupt disabling for HCDs with shared interrupt handlers As has been discussed several times on LKML, IRQF_SHARED | IRQF_DISABLED doesn't work reliably, i.e. a shared interrupt handler CAN'T be certain to be called with interrupts disabled. Most USB HCD handlers use IRQF_DISABLED and therefore havoc can break out if they share their interrupt with a handler that doesn't use it. On my test machine the yenta_socket interrupt handler (no IRQF_DISABLED) was registered before ehci_hcd and one uhci_hcd instance. Therefore all usb_hcd_irq() invocations for ehci_hcd and for one uhci_hcd instance happened with interrupts enabled. That led to random lockups as USB core HCD functions that acquire the same spinlock could be called twice from interrupt handlers. This patch updates usb_hcd_irq() to always disable/restore interrupts. usb_add_hcd() will silently remove any IRQF_DISABLED requested from HCD code. Signed-off-by: Stefan Becker Cc: stable Acked-by: David Brownell Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 09a53e7..7158dbb 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1684,19 +1684,30 @@ EXPORT_SYMBOL_GPL(usb_bus_start_enum); irqreturn_t usb_hcd_irq (int irq, void *__hcd) { struct usb_hcd *hcd = __hcd; - int start = hcd->state; + unsigned long flags; + irqreturn_t rc; - if (unlikely(start == HC_STATE_HALT || - !test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))) - return IRQ_NONE; - if (hcd->driver->irq (hcd) == IRQ_NONE) - return IRQ_NONE; + /* IRQF_DISABLED doesn't work correctly with shared IRQs + * when the first handler doesn't use it. So let's just + * assume it's never used. + */ + local_irq_save(flags); - set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); + if (unlikely(hcd->state == HC_STATE_HALT || + !test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))) { + rc = IRQ_NONE; + } else if (hcd->driver->irq(hcd) == IRQ_NONE) { + rc = IRQ_NONE; + } else { + set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); - if (unlikely(hcd->state == HC_STATE_HALT)) - usb_hc_died (hcd); - return IRQ_HANDLED; + if (unlikely(hcd->state == HC_STATE_HALT)) + usb_hc_died(hcd); + rc = IRQ_HANDLED; + } + + local_irq_restore(flags); + return rc; } /*-------------------------------------------------------------------------*/ @@ -1860,6 +1871,13 @@ int usb_add_hcd(struct usb_hcd *hcd, /* enable irqs just before we start the controller */ if (hcd->driver->irq) { + + /* IRQF_DISABLED doesn't work as advertised when used together + * with IRQF_SHARED. As usb_hcd_irq() will always disable + * interrupts we can remove it here. + */ + irqflags &= ~IRQF_DISABLED; + snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", hcd->driver->description, hcd->self.busnum); if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags, Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.704 retrieving revision 1.705 diff -u -r1.704 -r1.705 --- kernel.spec 4 Jul 2008 20:21:44 -0000 1.704 +++ kernel.spec 7 Jul 2008 23:55:57 -0000 1.705 @@ -688,6 +688,8 @@ Patch2301: linux-2.6-ms-wireless-receiver.patch # https://bugzilla.redhat.com/show_bug.cgi?id=454028 Patch2302: linux-2.6-usb-storage-nikond80-quirk.patch +# fix interrupt handling +Patch2303: linux-2.6-usb-fix-interrupt-disabling.patch # usb video Patch2400: linux-2.6-uvcvideo.patch @@ -1102,6 +1104,7 @@ # USB ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch ApplyPatch linux-2.6-usb-storage-nikond80-quirk.patch +ApplyPatch linux-2.6-usb-fix-interrupt-disabling.patch # ACPI # acpi has a bug in the sizeof function causing thermal panics (from 2.6.26) @@ -1864,6 +1867,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 07 2008 Chuck Ebbert 2.6.25.9-86 +- Fix USB interrupt handling with shared interrupts. + * Fri Jul 04 2008 John W. Linville 2.6.25.9-85 - Upstream wireless fixes from 2008-07-02 (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) From fedora-extras-commits at redhat.com Tue Jul 8 00:01:26 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 8 Jul 2008 00:01:26 GMT Subject: rpms/PackageKit/F-9 packagekit-bump-soname.patch, NONE, 1.1 PackageKit.spec, 1.38, 1.39 Message-ID: <200807080001.m6801Qqo018926@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12339 Modified Files: PackageKit.spec Added Files: packagekit-bump-soname.patch Log Message: * Tue Jul 08 2008 Richard Hughes - 0.2.3-3 - Bump the soname so the upgrade of PackageKit-libs from 0.1.12 works -- I really should have done this upstream when we broke ABI. packagekit-bump-soname.patch: --- NEW FILE packagekit-bump-soname.patch --- commit 6ce6a982f080aad1dfe449f9ba454ba2ed5adf06 Author: Richard Hughes Date: Tue Jul 8 00:43:44 2008 +0100 bugfix: bump the soname as we changed ABI some time ago diff --git a/configure.ac b/configure.ac index de8071b..d92c919 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ DEVELOPMENT_RELEASE=no # REVISION If the API and ABI remains the same, but bugs are fixed. # AGE If libpackagekit can be linked into executables which can be # built with previous versions of this library. Don't use. -LT_CURRENT=3 +LT_CURRENT=4 LT_REVISION=0 LT_AGE=0 AC_SUBST(LT_CURRENT) Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- PackageKit.spec 4 Jul 2008 15:57:42 -0000 1.38 +++ PackageKit.spec 8 Jul 2008 00:00:40 -0000 1.39 @@ -10,7 +10,7 @@ Name: PackageKit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org @@ -18,6 +18,7 @@ Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Patch0: packagekit-backport-gpg-giant-bodge.patch +Patch0: packagekit-bump-soname.patch Requires: dbus >= %{dbus_version} Requires: PackageKit-libs = %{version}-%{release} @@ -101,6 +102,7 @@ %prep #%setup -q -n %{name}-%{version}-%{?alphatag} %setup -q +%patch0 -p1 %build %configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local @@ -196,6 +198,10 @@ %{_includedir}/* %changelog +* Tue Jul 08 2008 Richard Hughes - 0.2.3-3 +- Bump the soname so the upgrade of PackageKit-libs from 0.1.12 works -- + I really should have done this upstream when we broke ABI. + * Fri Jul 04 2008 Richard Hughes - 0.2.3-2 - Fix the .. release string. From fedora-extras-commits at redhat.com Tue Jul 8 00:01:27 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 8 Jul 2008 00:01:27 GMT Subject: rpms/gnome-packagekit/F-9 gnome-packagekit-set-interaction-for-tools.patch, NONE, 1.1 gnome-packagekit.spec, 1.40, 1.41 Message-ID: <200807080001.m6801Rrt018929@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12349 Modified Files: gnome-packagekit.spec Added Files: gnome-packagekit-set-interaction-for-tools.patch Log Message: * Tue Jul 08 2008 Richard Hughes - 0.2.3-4 - Set the GUI interaction mode in the gpk-install-foo tools so the dialog does not auto-close when we've asked for auth. gnome-packagekit-set-interaction-for-tools.patch: --- NEW FILE gnome-packagekit-set-interaction-for-tools.patch --- commit 3744304f6daff0555736d8577cdc5b9212d8c54d Author: Richard Hughes Date: Tue Jul 8 00:37:42 2008 +0100 bugfix: set the interaction of the GClient to always when we are using a helper diff --git a/src/gpk-install-catalog.c b/src/gpk-install-catalog.c index 2771cf9..46b68b3 100644 --- a/src/gpk-install-catalog.c +++ b/src/gpk-install-catalog.c @@ -86,7 +86,7 @@ main (int argc, char *argv[]) /* find the file list */ files = gpk_convert_argv_to_strv (argv); gclient = gpk_client_new (); - + gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS); /* install all the catalogs */ ret = gpk_client_install_catalogs (gclient, files, NULL); diff --git a/src/gpk-install-local-file.c b/src/gpk-install-local-file.c index f006426..0ea8c26 100644 --- a/src/gpk-install-local-file.c +++ b/src/gpk-install-local-file.c @@ -85,6 +85,7 @@ main (int argc, char *argv[]) error = NULL; gclient = gpk_client_new (); + gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS); files = gpk_convert_argv_to_strv (argv); ret = gpk_client_install_local_files (gclient, files, NULL); g_strfreev (files); diff --git a/src/gpk-install-mime-type.c b/src/gpk-install-mime-type.c index 16a6b30..7f8184a 100644 --- a/src/gpk-install-mime-type.c +++ b/src/gpk-install-mime-type.c @@ -89,6 +89,7 @@ main (int argc, char *argv[]) error = NULL; gclient = gpk_client_new (); + gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS); ret = gpk_client_install_mime_type (gclient, argv[1], NULL); g_object_unref (gclient); diff --git a/src/gpk-install-package-name.c b/src/gpk-install-package-name.c index 8e17c10..c9d4f9a 100644 --- a/src/gpk-install-package-name.c +++ b/src/gpk-install-package-name.c @@ -85,6 +85,7 @@ main (int argc, char *argv[]) error = NULL; gclient = gpk_client_new (); + gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS); packages = gpk_convert_argv_to_strv (argv); ret = gpk_client_install_package_names (gclient, packages, NULL); g_strfreev (packages); diff --git a/src/gpk-install-provide-file.c b/src/gpk-install-provide-file.c index a03ea57..d1948af 100644 --- a/src/gpk-install-provide-file.c +++ b/src/gpk-install-provide-file.c @@ -89,6 +89,7 @@ main (int argc, char *argv[]) error = NULL; gclient = gpk_client_new (); + gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS); ret = gpk_client_install_provide_file (gclient, argv[1], NULL); g_object_unref (gclient); Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gnome-packagekit.spec 4 Jul 2008 15:58:29 -0000 1.40 +++ gnome-packagekit.spec 8 Jul 2008 00:00:42 -0000 1.41 @@ -6,7 +6,7 @@ Name: gnome-packagekit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -15,7 +15,8 @@ Source1: system-install-packages Source2: system-install-packages.1.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Patch0: gnome-packagekit-enable-kde.patch +Patch0: gnome-packagekit-set-interaction-for-tools.patch + Requires: gtk2 >= 2.12.0 Requires: gnome-icon-theme Requires: libnotify >= 0.4.3 @@ -59,7 +60,7 @@ %prep %setup -q #%setup -q -n %{name}-%{version}-%{?alphatag} -#%patch0 -p1 +%patch0 -p1 %build %configure --disable-scrollkeeper --disable-schemas-install @@ -143,6 +144,10 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Tue Jul 08 2008 Richard Hughes - 0.2.3-4 +- Set the GUI interaction mode in the gpk-install-foo tools + so the dialog does not auto-close when we've asked for auth. + * Fri Jul 04 2008 Richard Hughes - 0.2.3-3 - Fix the .. release string. From fedora-extras-commits at redhat.com Tue Jul 8 00:39:01 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 8 Jul 2008 00:39:01 GMT Subject: rpms/kernel/devel kernel.spec,1.737,1.738 Message-ID: <200807080039.m680d1G4020035@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19967 Modified Files: kernel.spec Log Message: * Mon Jul 07 2008 Chuck Ebbert - Skip building the kernel-doc package due to breakage somewhere in rawhide XML land. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.737 retrieving revision 1.738 diff -u -r1.737 -r1.738 --- kernel.spec 7 Jul 2008 19:38:57 -0000 1.737 +++ kernel.spec 8 Jul 2008 00:38:13 -0000 1.738 @@ -81,6 +81,9 @@ # kernel-bootwrapper (for creating zImages from kernel + initrd) %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} +# don't build the kernel-doc package +%define with_doc 0 + # Additional options for user-friendly one-off kernel building: # # Only build the base kernel (--with baseonly): @@ -1789,6 +1792,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 07 2008 Chuck Ebbert +- Skip building the kernel-doc package due to breakage somewhere in rawhide XML land. + * Mon Jul 07 2008 Dave Jones - 2.6.26-rc9-git2 From fedora-extras-commits at redhat.com Tue Jul 8 01:23:04 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Tue, 8 Jul 2008 01:23:04 GMT Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.115,1.116 Message-ID: <200807080123.m681N4Db028837@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28818 Modified Files: e2fsprogs.spec Log Message: * Mon Jul 07 2008 Eric Sandeen 1.41-0.2.WIP.0707 - Fix release macro snafu Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- e2fsprogs.spec 7 Jul 2008 22:08:08 -0000 1.115 +++ e2fsprogs.spec 8 Jul 2008 01:22:13 -0000 1.116 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs Version: 1.41 -Release: 0.1.WIP.0707{?dist} +Release: 0.2.WIP.0707%{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 @@ -289,6 +289,9 @@ %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid %changelog +* Mon Jul 07 2008 Eric Sandeen 1.41-0.2.WIP.0707 +- Fix release macro snafu + * Mon Jul 07 2008 Eric Sandeen 1.41-0.1.WIP.0707 - New upstream snapshot release From fedora-extras-commits at redhat.com Tue Jul 8 01:26:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 01:26:29 +0000 Subject: [pkgdb] e2fsprogs had groupAcl changed Message-ID: <200807080126.m681QU81004510@bastion.fedora.phx.redhat.com> Eric Sandeen (sandeen) has set the commit acl on e2fsprogs (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs From fedora-extras-commits at redhat.com Tue Jul 8 01:26:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 01:26:45 +0000 Subject: [pkgdb] e2fsprogs had groupAcl changed Message-ID: <200807080126.m681QjVl004532@bastion.fedora.phx.redhat.com> Eric Sandeen (sandeen) has set the commit acl on e2fsprogs (Fedora 9) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs From fedora-extras-commits at redhat.com Tue Jul 8 01:26:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 01:26:49 +0000 Subject: [pkgdb] e2fsprogs had groupAcl changed Message-ID: <200807080126.m681QU83004510@bastion.fedora.phx.redhat.com> Eric Sandeen (sandeen) has set the commit acl on e2fsprogs (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs From fedora-extras-commits at redhat.com Tue Jul 8 01:26:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 01:26:47 +0000 Subject: [pkgdb] e2fsprogs had groupAcl changed Message-ID: <200807080126.m681QlSM004549@bastion.fedora.phx.redhat.com> Eric Sandeen (sandeen) has set the commit acl on e2fsprogs (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs From fedora-extras-commits at redhat.com Tue Jul 8 02:05:52 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 8 Jul 2008 02:05:52 GMT Subject: comps comps-f10.xml.in,1.41,1.42 Message-ID: <200807080205.m6825qg2004459@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4422 Modified Files: comps-f10.xml.in Log Message: rhgb no longer exists, but plymouth does. let's install it by default Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- comps-f10.xml.in 6 Jul 2008 11:33:22 -0000 1.41 +++ comps-f10.xml.in 8 Jul 2008 02:05:22 -0000 1.42 @@ -316,8 +316,8 @@ kerneloops krb5-auth-dialog openssh-askpass + plymouth policycoreutils-gui - rhgb setroubleshoot smolt-firstboot system-config-date From fedora-extras-commits at redhat.com Tue Jul 8 02:08:56 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 8 Jul 2008 02:08:56 GMT Subject: rpms/mkinitrd/devel .cvsignore, 1.193, 1.194 mkinitrd.spec, 1.275, 1.276 sources, 1.235, 1.236 Message-ID: <200807080208.m6828uaM004654@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/mkinitrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4624 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Mon Jul 7 2008 Jeremy Katz - 6.0.55-1 - Make plymouth work with live initrds - Strip out BOOT_IMAGE= as an argument to init so that things don't break if you do init=/bin/bash from syslinux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- .cvsignore 18 Jun 2008 19:07:13 -0000 1.193 +++ .cvsignore 8 Jul 2008 02:08:11 -0000 1.194 @@ -1,2 +1 @@ -clog -mkinitrd-6.0.54.tar.bz2 +mkinitrd-6.0.55.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- mkinitrd.spec 18 Jun 2008 19:07:13 -0000 1.275 +++ mkinitrd.spec 8 Jul 2008 02:08:11 -0000 1.276 @@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.54 +Version: 6.0.55 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -119,6 +119,11 @@ %dir %{_sysconfdir}/kernel/prerm.d %changelog +* Mon Jul 7 2008 Jeremy Katz - 6.0.55-1 +- Make plymouth work with live initrds +- Strip out BOOT_IMAGE= as an argument to init so that things don't break if + you do init=/bin/bash from syslinux + * Wed Jun 18 2008 Peter Jones - 6.0.54-1 - More plymouth work (pjones, rstrode) - Update mkliveinitrd because udev's command line utilities changed (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/sources,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- sources 18 Jun 2008 19:07:13 -0000 1.235 +++ sources 8 Jul 2008 02:08:11 -0000 1.236 @@ -1 +1 @@ -de6c8173a3f068fe236ae1085fd5970a mkinitrd-6.0.54.tar.bz2 +be19198561c24489754d5f226559f71a mkinitrd-6.0.55.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 03:31:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 03:31:27 +0000 Subject: [pkgdb] connect-proxy ownership updated Message-ID: <200807080331.m683VSZL007072@bastion.fedora.phx.redhat.com> Package connect-proxy in Fedora devel is now owned by Mohd Izhar Firdaus Ismail (izhar) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy From fedora-extras-commits at redhat.com Tue Jul 8 03:54:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 03:54:49 +0000 Subject: [pkgdb] multitail ownership updated Message-ID: <200807080354.m683snDc007586@bastion.fedora.phx.redhat.com> Package multitail in Fedora devel is now owned by Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/multitail From fedora-extras-commits at redhat.com Tue Jul 8 03:55:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 03:55:08 +0000 Subject: [pkgdb] multitail ownership updated Message-ID: <200807080355.m683t84d007616@bastion.fedora.phx.redhat.com> Package multitail in Fedora 8 is now owned by Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/multitail From fedora-extras-commits at redhat.com Tue Jul 8 03:55:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 03:55:11 +0000 Subject: [pkgdb] multitail ownership updated Message-ID: <200807080355.m683snDe007586@bastion.fedora.phx.redhat.com> Package multitail in Fedora 9 is now owned by Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/multitail From fedora-extras-commits at redhat.com Tue Jul 8 04:44:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 04:44:18 +0000 Subject: [pkgdb] libical ownership updated Message-ID: <200807080444.m684iHnd014404@bastion.fedora.phx.redhat.com> Package libical in Fedora devel is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From fedora-extras-commits at redhat.com Tue Jul 8 04:44:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 04:44:40 +0000 Subject: [pkgdb] libical ownership updated Message-ID: <200807080444.m684ieC4014429@bastion.fedora.phx.redhat.com> Package libical in Fedora 8 is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From fedora-extras-commits at redhat.com Tue Jul 8 04:44:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 04:44:51 +0000 Subject: [pkgdb] libical ownership updated Message-ID: <200807080444.m684iphM014473@bastion.fedora.phx.redhat.com> Package libical in Fedora 9 is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libical From fedora-extras-commits at redhat.com Tue Jul 8 04:47:37 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Tue, 8 Jul 2008 04:47:37 GMT Subject: rpms/multitail/devel .cvsignore, 1.10, 1.11 multitail.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200807080447.m684lbL9022645@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22566 Modified Files: .cvsignore multitail.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/multitail/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 18 Sep 2006 18:48:11 -0000 1.10 +++ .cvsignore 8 Jul 2008 04:46:50 -0000 1.11 @@ -1 +1 @@ -multitail-4.2.0.tgz +multitail-5.2.2.tgz Index: multitail.spec =================================================================== RCS file: /cvs/pkgs/rpms/multitail/devel/multitail.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- multitail.spec 19 Feb 2008 03:06:08 -0000 1.11 +++ multitail.spec 8 Jul 2008 04:46:50 -0000 1.12 @@ -1,10 +1,10 @@ Name: multitail -Version: 4.2.0 -Release: 3%{?dist} +Version: 5.2.2 +Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows Group: Applications/Text -License: GPL +License: GPLv1 URL: http://www.vanheusden.com/multitail/ Source: http://www.vanheusden.com/multitail/multitail-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,14 +28,21 @@ external software, MultiTail can mimic the functionality of tools like 'watch' and such. - %prep -%setup -q - +%setup -q -n multitail-%{version} %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} +# Fix up doc encoding +iconv -f ISO88592 -t UTF8 < Changes > Changes.UTF8 +mv Changes.UTF8 Changes +iconv -f ISO88592 -t UTF8 < readme.txt > readme.txt.UTF8 +mv readme.txt.UTF8 readme.txt + +# Fix up examples permissions +chmod 644 colors-example.* +chmod 644 convert-*.pl %install %{__rm} -rf %{buildroot} @@ -44,22 +51,30 @@ %{buildroot}%{_sysconfdir} %{__make} install DESTDIR="%{buildroot}" +# move the configuration in the right place mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf +# remove the examples (installed as docs) +rm %{buildroot}%{_sysconfdir}/multitail/colors-example.* +rm %{buildroot}%{_sysconfdir}/multitail/convert-*.pl %clean %{__rm} -rf %{buildroot} - %files %defattr(-, root, root, 0755) -%doc *.conf *.html Changes license.txt readme.txt +%doc *.conf *.html Changes license.txt readme.txt colors-example.* convert-*.pl %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail %{_mandir}/man1/multitail.1* - %changelog +* Tue Jul 8 2008 Fabio M. Di Nitto - 5.2.2-1 +- New upstream release +- Fix licence tag +- Fix documentation encoding to UTF8 +- Install some examples in doc dir + * Mon Feb 18 2008 Fedora Release Engineering - 4.2.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/multitail/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 18 Sep 2006 18:48:11 -0000 1.10 +++ sources 8 Jul 2008 04:46:50 -0000 1.11 @@ -1 +1 @@ -4a5bd73d166973b117083ed513a9246e multitail-4.2.0.tgz +ab2c198381e9ff6271ce56bdcb06f963 multitail-5.2.2.tgz From fedora-extras-commits at redhat.com Tue Jul 8 04:59:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 04:59:24 +0000 Subject: [pkgdb] osmo ownership updated Message-ID: <200807080459.m684xOww014933@bastion.fedora.phx.redhat.com> Package osmo in Fedora devel is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/osmo From fedora-extras-commits at redhat.com Tue Jul 8 04:59:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 04:59:29 +0000 Subject: [pkgdb] osmo ownership updated Message-ID: <200807080459.m684xTIh014953@bastion.fedora.phx.redhat.com> Package osmo in Fedora 8 is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/osmo From fedora-extras-commits at redhat.com Tue Jul 8 04:59:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 04:59:34 +0000 Subject: [pkgdb] osmo ownership updated Message-ID: <200807080459.m684xYRa014970@bastion.fedora.phx.redhat.com> Package osmo in Fedora 9 is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/osmo From fedora-extras-commits at redhat.com Tue Jul 8 05:01:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 05:01:38 +0000 Subject: [pkgdb] libgringotts ownership updated Message-ID: <200807080501.m6851cux015105@bastion.fedora.phx.redhat.com> Package libgringotts in Fedora devel is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgringotts From fedora-extras-commits at redhat.com Tue Jul 8 05:01:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 05:01:44 +0000 Subject: [pkgdb] libgringotts ownership updated Message-ID: <200807080501.m6851ibI015122@bastion.fedora.phx.redhat.com> Package libgringotts in Fedora 8 is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgringotts From fedora-extras-commits at redhat.com Tue Jul 8 05:01:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 05:01:53 +0000 Subject: [pkgdb] libgringotts ownership updated Message-ID: <200807080501.m6851rG2015149@bastion.fedora.phx.redhat.com> Package libgringotts in Fedora 9 is now owned by Debarshi Ray (rishi) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgringotts From fedora-extras-commits at redhat.com Tue Jul 8 06:34:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Tue, 8 Jul 2008 06:34:29 GMT Subject: rpms/net-tools/devel net-tools-1.60-sctp-addrs.patch, NONE, 1.1 net-tools.spec, 1.91, 1.92 Message-ID: <200807080634.m686YTQi007147@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/net-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7007 Modified Files: net-tools.spec Added Files: net-tools-1.60-sctp-addrs.patch Log Message: - netstat displays correct sctp statistics (#445535) net-tools-1.60-sctp-addrs.patch: --- NEW FILE net-tools-1.60-sctp-addrs.patch --- --- net-tools-1.60/netstat.c.sctp-addrs 2008-06-18 14:41:29.000000000 +0200 +++ net-tools-1.60/netstat.c 2008-06-18 14:12:03.000000000 +0200 @@ -1299,23 +1299,21 @@ static void sctp_eps_do_one(int lnr, cha const char *lport_str; const char *uid_str; const char *inode_str; - const char *pladdr_str; char *laddrs_str; if(lnr == 0) { - /* ENDPT SOCK STY SST HBKT LPORT uid inode pladdr LADDRS*/ + /* ENDPT SOCK STY SST HBKT LPORT UID INODE LADDRS */ return; } - strtok(line," \t\n"); /*skip ptr*/ - strtok(0," \t\n"); /*skip ptr*/ + strtok(line," \t\n"); /*skip endpt*/ + strtok(0," \t\n"); /*skip sock*/ sty_str = strtok(0," \t\n"); sst_str = strtok(0," \t\n"); strtok(0," \t\n"); /*skip hash bucket*/ lport_str=strtok(0," \t\n"); uid_str = strtok(0," \t\n"); inode_str = strtok(0," \t\n"); - pladdr_str = strtok(0," \t\n"); laddrs_str=strtok(0,"\t\n"); type = atoi(sty_str); @@ -1323,61 +1321,35 @@ static void sctp_eps_do_one(int lnr, cha port = atoi(lport_str); uid = atoi(uid_str); inode = strtoul(inode_str,0,0); - - if(flag_sctp<=1) { - /* only print the primary address */ - char local_addr[64]; - char local_port[16]; - - ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr); - if(ap) - safe_strncpy(local_addr, - ap->sprint((struct sockaddr *) &localaddr, flag_not), - sizeof(local_addr)); - else - sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); - - snprintf(local_port, sizeof(local_port), "%s", - get_sname(htons(port), "sctp", - flag_not & FLAG_NUM_PORT)); - - printf("sctp "); - sprintf(buffer,"%s:%s", local_addr, local_port); - printf("%-47s", buffer); - printf(" %-12s", sctp_socket_state_str(state)); - } else { - /*print all addresses*/ - const char *this_local_addr; - int first=1; - char local_port[16]; - snprintf(local_port, sizeof(local_port), "%s", - get_sname(htons(port), "sctp", - flag_not & FLAG_NUM_PORT)); - for(this_local_addr=strtok(laddrs_str," \t\n"); - this_local_addr; - this_local_addr=strtok(0," \t\n")) - { - char local_addr[64]; - ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); - if(ap) - safe_strncpy(local_addr, - ap->sprint((struct sockaddr *) &localaddr, flag_not), - sizeof(local_addr)); - else - sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); - if(!first) printf("\n"); - if(first) - printf("sctp "); - else - printf(" "); - sprintf(buffer,"%s:%s", local_addr, local_port); - printf("%-47s", buffer); - printf(" %-12s", first?sctp_socket_state_str(state):""); - first = 0; - } + const char *this_local_addr; + int first=1; + char local_port[16]; + snprintf(local_port, sizeof(local_port), "%s", + get_sname(htons(port), "sctp", flag_not & FLAG_NUM_PORT)); + for(this_local_addr=strtok(laddrs_str," \t\n"); + this_local_addr; + this_local_addr=strtok(0," \t\n")) + { + char local_addr[64]; + ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); + if(ap) + safe_strncpy(local_addr, + ap->sprint((struct sockaddr *) &localaddr, flag_not), + sizeof(local_addr)); + else + sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); + + if(!first) printf("\n"); + if(first) + printf("sctp "); + else + printf(" "); + sprintf(buffer,"%s:%s", local_addr, local_port); + printf("%-55s", buffer); + printf(" %-12s", first?sctp_socket_state_str(state):""); + first = 0; } - finish_this_one(uid,inode,""); } @@ -1403,32 +1375,29 @@ static void sctp_assoc_do_one(int lnr, c const char *lport_str,*rport_str; const char *uid_str; const char *inode_str; - const char *pladdr_str; char *laddrs_str; - const char *praddr_str; char *raddrs_str; - + if(lnr == 0) { - /* ASSOC SOCK STY SST ST HBKT tx_queue rx_queue uid inode LPORT RPORT pladdr praddr LADDRS <-> RADDRS*/ + /* ASSOC SOCK STY SST ST HBKT ASSOC-ID TX_QUEUE RX_QUEUE UID INODE LPORT RPORT LADDRS <-> RADDRS */ return; } - - strtok(line," \t\n"); /*skip ptr*/ - strtok(0," \t\n"); /*skip ptr*/ + + strtok(line," \t\n"); /*skip assoc*/ + strtok(0," \t\n"); /*skip sock*/ sty_str = strtok(0," \t\n"); sst_str = strtok(0," \t\n"); st_str = strtok(0," \t\n"); strtok(0," \t\n"); /*skip hash bucket*/ + strtok(0," \t\n"); /*skip hash assoc-id*/ txqueue_str = strtok(0," \t\n"); rxqueue_str = strtok(0," \t\n"); uid_str = strtok(0," \t\n"); inode_str = strtok(0," \t\n"); lport_str=strtok(0," \t\n"); rport_str=strtok(0," \t\n"); - pladdr_str = strtok(0," \t\n"); - praddr_str = strtok(0," \t\n"); - laddrs_str=strtok(0,"<->\t\n"); - raddrs_str=strtok(0,"<->\t\n"); + laddrs_str = strtok(0,"<->\t\n"); + raddrs_str = strtok(0,"<->\t\n"); type = atoi(sty_str); state = atoi(sst_str); @@ -1439,116 +1408,81 @@ static void sctp_assoc_do_one(int lnr, c inode = strtoul(inode_str,0,0); lport = atoi(lport_str); rport = atoi(rport_str); - - if(flag_sctp<=1) { - /* only print the primary addresses */ - char local_addr[64]; - char local_port[16]; - char remote_addr[64]; - char remote_port[16]; - - ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr); - if(ap) - safe_strncpy(local_addr, - ap->sprint((struct sockaddr *) &localaddr, flag_not), - sizeof(local_addr)); - else - sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); - - snprintf(local_port, sizeof(local_port), "%s", - get_sname(htons(lport), "sctp", - flag_not & FLAG_NUM_PORT)); - - ap = process_sctp_addr_str(praddr_str, (struct sockaddr*)&remoteaddr); - if(ap) - safe_strncpy(remote_addr, - ap->sprint((struct sockaddr *) &remoteaddr, flag_not), - sizeof(remote_addr)); - else - sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); - - snprintf(remote_port, sizeof(remote_port), "%s", - get_sname(htons(rport), "sctp", - flag_not & FLAG_NUM_PORT)); - - printf("sctp"); - printf(" %6u %6u ", rxqueue, txqueue); - sprintf(buffer,"%s:%s", local_addr, local_port); - printf("%-23s", buffer); - printf(" "); - sprintf(buffer,"%s:%s", remote_addr, remote_port); - printf("%-23s", buffer); - printf(" %-12s", sctp_socket_state_str(state)); - } else { - /*print all addresses*/ - const char *this_local_addr; - const char *this_remote_addr; - char *ss1,*ss2; - int first=1; - char local_port[16]; - char remote_port[16]; - snprintf(local_port, sizeof(local_port), "%s", - get_sname(htons(lport), "sctp", - flag_not & FLAG_NUM_PORT)); - snprintf(remote_port, sizeof(remote_port), "%s", - get_sname(htons(rport), "sctp", - flag_not & FLAG_NUM_PORT)); - - this_local_addr=strtok_r(laddrs_str," \t\n",&ss1); - this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2); - while(this_local_addr || this_remote_addr) { - char local_addr[64]; - char remote_addr[64]; - if(this_local_addr) { - ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); - if(ap) - safe_strncpy(local_addr, - ap->sprint((struct sockaddr *) &localaddr, flag_not), - sizeof(local_addr)); - else - sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); - } - if(this_remote_addr) { - ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr); - if(ap) - safe_strncpy(remote_addr, - ap->sprint((struct sockaddr *) &remoteaddr, flag_not), - sizeof(remote_addr)); - else - sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); - } - if(!first) printf("\n"); - if(first) - printf("sctp %6u %6u ", rxqueue, txqueue); - else - printf(" "); - if(this_local_addr) { - if(first) - sprintf(buffer,"%s:%s", local_addr, local_port); + /*print all addresses*/ + const char *this_local_addr; + const char *this_remote_addr; + char *ss1,*ss2; + int first=1; + char local_port[16]; + char remote_port[16]; + snprintf(local_port, sizeof(local_port), "%s", + get_sname(htons(lport), "sctp", + flag_not & FLAG_NUM_PORT)); + snprintf(remote_port, sizeof(remote_port), "%s", + get_sname(htons(rport), "sctp", + flag_not & FLAG_NUM_PORT)); + + this_local_addr=strtok_r(laddrs_str," \t\n",&ss1); + this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2); + while(this_local_addr || this_remote_addr) { + char local_addr[64]; + char remote_addr[64]; + + if(this_local_addr) { + if (this_local_addr[0] == '*') { + /* skip * */ + this_local_addr++; + } + ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); + if(ap) + safe_strncpy(local_addr, + ap->sprint((struct sockaddr *) &localaddr, flag_not), sizeof(local_addr)); else - sprintf(buffer,"%s", local_addr); - printf("%-23s", buffer); - } else - printf("%-23s", ""); - printf(" "); - if(this_remote_addr) { - if(first) - sprintf(buffer,"%s:%s", remote_addr, remote_port); + sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); + } + if(this_remote_addr) { + if (this_remote_addr[0] == '*') { + /* skip * */ + this_remote_addr++; + } + ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr); + if(ap) + safe_strncpy(remote_addr, + ap->sprint((struct sockaddr *) &remoteaddr, flag_not), sizeof(remote_addr)); else - sprintf(buffer,"%s", remote_addr); - printf("%-23s", buffer); - } else - printf("%-23s", ""); - - printf(" %-12s", first?sctp_socket_state_str(state):""); + sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); + } - first = 0; - this_local_addr=strtok_r(0," \t\n",&ss1); - this_remote_addr=strtok_r(0," \t\n",&ss2); - } + if(!first) printf("\n"); + if(first) + printf("sctp %6u %6u ", rxqueue, txqueue); + else + printf(" "); + if(this_local_addr) { + if(first) + sprintf(buffer,"%s:%s", local_addr, local_port); + else + sprintf(buffer,"%s", local_addr); + printf("%-27s", buffer); + } else + printf("%-27s", ""); + printf(" "); + if(this_remote_addr) { + if(first) + sprintf(buffer,"%s:%s", remote_addr, remote_port); + else + sprintf(buffer,"%s", remote_addr); + printf("%-27s", buffer); + } else + printf("%-27s", ""); + + printf(" %-12s", first?sctp_socket_state_str(state):""); + + first = 0; + this_local_addr=strtok_r(0," \t\n",&ss1); + this_remote_addr=strtok_r(0," \t\n",&ss2); } - finish_this_one(uid,inode,""); } Index: net-tools.spec =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- net-tools.spec 4 Mar 2008 11:57:44 -0000 1.91 +++ net-tools.spec 8 Jul 2008 06:33:37 -0000 1.92 @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 1.60 -Release: 87%{?dist} +Release: 88%{?dist} License: GPL+ Group: System Environment/Base URL: http://www.tazenda.demon.co.uk/phil/net-tools/ @@ -76,6 +76,7 @@ Patch63: net-tools-1.60-netplugd_init.patch Patch64: net-tools-1.60-ec_hw_null.patch Patch65: net-tools-1.60-statistics_buffer.patch +Patch66: net-tools-1.60-sctp-addrs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -152,6 +153,7 @@ %patch63 -p1 %patch64 -p1 %patch65 -p1 -b .buffer +%patch66 -p1 -b .sctp-addrs cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -267,7 +269,10 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog -* Tue Mar 4 2008 Radek Vok??l - 1.80-87 +* Tue Jul 8 2008 Radek Vok??l - 1.60-88 +- netstat displays correct sctp statistics (#445535) + +* Tue Mar 4 2008 Radek Vok??l - 1.60-87 - fix buffer for newer kernels (#435554) * Mon Feb 25 2008 Radek Vokal - 1.60-86 From fedora-extras-commits at redhat.com Tue Jul 8 06:35:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Tue, 8 Jul 2008 06:35:01 GMT Subject: rpms/nyquist/F-9 nyqsrc301-inc.patch, NONE, 1.1 nyqsrc301-javafix.patch, NONE, 1.1 nyquist.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200807080635.m686Z1Af007244@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/nyquist/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7099 Modified Files: nyquist.spec sources Added Files: nyqsrc301-inc.patch nyqsrc301-javafix.patch Log Message: new release 3.01 nyqsrc301-inc.patch: --- NEW FILE nyqsrc301-inc.patch --- diff -up nyquist/nyqstk/src/FileRead.cpp.inc nyquist/nyqstk/src/FileRead.cpp --- nyquist/nyqstk/src/FileRead.cpp.inc 2008-07-07 23:12:46.000000000 +0200 +++ nyquist/nyqstk/src/FileRead.cpp 2008-07-07 23:12:53.000000000 +0200 @@ -33,6 +33,7 @@ #include #include #include +#include FileRead :: FileRead() : fd_(0) diff -up nyquist/nyqstk/src/Modal.cpp.inc nyquist/nyqstk/src/Modal.cpp --- nyquist/nyqstk/src/Modal.cpp.inc 2008-07-07 23:14:50.000000000 +0200 +++ nyquist/nyqstk/src/Modal.cpp 2008-07-07 23:15:03.000000000 +0200 @@ -12,6 +12,7 @@ /***************************************************/ #include "Modal.h" +#include Modal :: Modal(unsigned int modes) : nModes_(modes) diff -up nyquist/nyqstk/src/Stk.cpp.inc nyquist/nyqstk/src/Stk.cpp --- nyquist/nyqstk/src/Stk.cpp.inc 2008-07-07 23:13:50.000000000 +0200 +++ nyquist/nyqstk/src/Stk.cpp 2008-07-07 23:14:12.000000000 +0200 @@ -13,6 +13,7 @@ /***************************************************/ #include "Stk.h" +#include StkFloat Stk :: srate_ = (StkFloat) SRATE; std::string Stk :: rawwavepath_ = RAWWAVE_PATH; nyqsrc301-javafix.patch: --- NEW FILE nyqsrc301-javafix.patch --- diff -up nyquist/jnyqide/NyquistThread.java.javafix nyquist/jnyqide/NyquistThread.java --- nyquist/jnyqide/NyquistThread.java.javafix 2008-01-07 16:30:33.000000000 +0100 +++ nyquist/jnyqide/NyquistThread.java 2008-07-08 00:03:20.000000000 +0200 @@ -74,7 +74,7 @@ public class NyquistThread extends Threa // find full path to instruments.txt String cwd = System.getProperty("user.dir"); - soundBrowser = cwd.concat("/lib/instruments.txt"); + soundBrowser = "/usr/share/nyquist/lib/instruments.txt"; System.out.println("soundBrowser file is " + soundBrowser); // build XLISPPATH environment specification @@ -104,10 +104,10 @@ public class NyquistThread extends Threa System.out.println("envp has " + systemroot); try { - myProcess = Runtime.getRuntime().exec( "./ny", envp ); + myProcess = Runtime.getRuntime().exec( "ny", envp ); } catch (Exception e3) { - System.out.println("no ./ny found, trying ./nyquist"); - myProcess = Runtime.getRuntime().exec("./nyquist", envp); + System.out.println("no ny found, trying nyquist"); + myProcess = Runtime.getRuntime().exec("nyquist", envp); // if this one fails, we'll take the exception below } System.out.print("myProcess: " + myProcess); diff -up nyquist/jnyqide/WordList.java.javafix nyquist/jnyqide/WordList.java --- nyquist/jnyqide/WordList.java.javafix 2008-01-26 03:21:38.000000000 +0100 +++ nyquist/jnyqide/WordList.java 2008-07-07 23:52:16.000000000 +0200 @@ -2,7 +2,7 @@ package jnyqide; import java.io.BufferedReader; import java.io.FileReader; -import java.io.IOException; +import java.io.*; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -47,13 +47,8 @@ public class WordList { //System.out.println("initializing WordList.java"); try { BufferedReader inf; - try { - inf = new BufferedReader(new FileReader("NyquistWords.txt")); - System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n"); - } catch (IOException e) { - System.out.println("could not find NyquistWords.txt, trying jnyqide/NyquistWords.txt"); - inf = new BufferedReader(new FileReader("jnyqide/NyquistWords.txt")); - } + inf = new BufferedReader(new InputStreamReader(WordList.class.getResourceAsStream("NyquistWords.txt"))); + System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n"); String word, link; while ((word = inf.readLine()) != null) { //wordsTrie.addWord(word); diff -up nyquist/sys/unix/linux/Makefile.javafix nyquist/sys/unix/linux/Makefile --- nyquist/sys/unix/linux/Makefile.javafix 2008-01-17 23:27:37.000000000 +0100 +++ nyquist/sys/unix/linux/Makefile 2008-07-07 23:52:16.000000000 +0200 @@ -42,7 +42,7 @@ jnyqide/jNyqIDE.jar: $(JAVASRC) javac jnyqide/*.java mv jnyqide/SpecialMacHandler.hidden jnyqide/SpecialMacHandler.java rm -rf jnyqide/jNyqIDE.jar - jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class + jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class jnyqide/*.txt # Standard list of includes (common to all unix versions) INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Isnd -Ifft \ Index: nyquist.spec =================================================================== RCS file: /cvs/pkgs/rpms/nyquist/F-9/nyquist.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nyquist.spec 19 Feb 2008 03:41:37 -0000 1.6 +++ nyquist.spec 8 Jul 2008 06:34:12 -0000 1.7 @@ -1,16 +1,20 @@ Name: nyquist -Version: 2.37 -Release: 2%{?dist} +Version: 3.01 +Release: 1%{?dist} Summary: Sound synthesis and composition language with a Lisp syntax Group: Applications/Multimedia License: BSD URL: http://www-2.cs.cmu.edu/~music/music.software.html -Source0: http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc237.zip +Source0: http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc301.zip Patch0: nyqsrc231-pafix.patch +Patch1: nyqsrc301-inc.patch +Patch2: nyqsrc301-javafix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel +BuildRequires: java-1.6.0-openjdk-devel BuildRequires: dos2unix +Requires: java-1.6.0-openjdk %description Nyquist is a language for sound synthesis and music @@ -23,7 +27,10 @@ %prep %setup -q -n nyquist -%patch0 -p1 +%patch0 -p1 -b .pafix +%patch1 -p1 -b .inc +%patch2 -p1 -b .javafix + # remove cvs cruft find -name CVS | xargs rm -fr # add opt flags @@ -36,6 +43,8 @@ sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" sys/unix/linux/Makefile # remove dos paths that cause warnings sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp +# fix some permission +find -name "*.lsp" | xargs chmod 0644 # change end-of-line find -name "*.htm*" \ -or -name "*.lsp" \ @@ -44,20 +53,23 @@ -or -name "*.dat" | xargs dos2unix -q %build -(cd misc; make %{?_smp_mflags}) rm -f runtime/system.lsp -make %{?_smp_mflags} -f sys/unix/linux/Makefile ny runtime/system.lsp +make %{?_smp_mflags} -f sys/unix/linux/Makefile %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist +mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist/java mkdir -p $RPM_BUILD_ROOT%{_libexecdir} cp -pr runtime $RPM_BUILD_ROOT%{_datadir}/nyquist cp -pr lib $RPM_BUILD_ROOT%{_datadir}/nyquist +cp -pr demos $RPM_BUILD_ROOT%{_datadir}/nyquist cp -p ny $RPM_BUILD_ROOT%{_libexecdir} +cp -p jnyqide/jNyqIDE.jar $RPM_BUILD_ROOT%{_datadir}/nyquist/java + cat > $RPM_BUILD_ROOT%{_bindir}/ny < $RPM_BUILD_ROOT%{_bindir}/jny < - 3.01-1 +- new release 3.01 + * Mon Feb 18 2008 Fedora Release Engineering - 2.37-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nyquist/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Dec 2007 15:48:28 -0000 1.6 +++ sources 8 Jul 2008 06:34:12 -0000 1.7 @@ -1 +1 @@ -f14bc518db40e7cd7fc546cb10e5d5ab nyqsrc237.zip +f2ad65bb2ed7e1dc2d7db2e052be9592 nyqsrc301.zip From fedora-extras-commits at redhat.com Tue Jul 8 06:48:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:37 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchbugzilla Message-ID: <200807080648.m686mbna017213@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchbugzilla acl on net-tools (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:37 +0000 Subject: [pkgdb] net-tools: zprikryl has requested commit Message-ID: <200807080648.m686mbnd017213@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the commit acl on net-tools (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:42 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchcommits Message-ID: <200807080648.m686mgLD017250@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchcommits acl on net-tools (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:45 +0000 Subject: [pkgdb] net-tools: zprikryl has requested approveacls Message-ID: <200807080648.m686mkf4017272@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the approveacls acl on net-tools (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:49 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchbugzilla Message-ID: <200807080648.m686mnVC017291@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchbugzilla acl on net-tools (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:50 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchcommits Message-ID: <200807080648.m686mgLG017250@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchcommits acl on net-tools (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:52 +0000 Subject: [pkgdb] net-tools: zprikryl has requested commit Message-ID: <200807080648.m686mbng017213@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the commit acl on net-tools (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:53 +0000 Subject: [pkgdb] net-tools: zprikryl has requested approveacls Message-ID: <200807080648.m686mnVF017291@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the approveacls acl on net-tools (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:55 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchbugzilla Message-ID: <200807080648.m686mnVI017291@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchbugzilla acl on net-tools (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:48:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:48:58 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchcommits Message-ID: <200807080648.m686mwB5017392@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchcommits acl on net-tools (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:49:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:49:05 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchbugzilla Message-ID: <200807080649.m686mwB8017392@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchbugzilla acl on net-tools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:49:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:49:06 +0000 Subject: [pkgdb] net-tools: zprikryl has requested watchcommits Message-ID: <200807080649.m686n6sm017471@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the watchcommits acl on net-tools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:49:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:49:00 +0000 Subject: [pkgdb] net-tools: zprikryl has requested commit Message-ID: <200807080649.m686mkf7017272@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the commit acl on net-tools (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:49:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:49:02 +0000 Subject: [pkgdb] net-tools: zprikryl has requested approveacls Message-ID: <200807080649.m686mgLJ017250@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the approveacls acl on net-tools (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:49:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:49:08 +0000 Subject: [pkgdb] net-tools: zprikryl has requested commit Message-ID: <200807080649.m686n6sp017471@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the commit acl on net-tools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:49:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:49:09 +0000 Subject: [pkgdb] net-tools: zprikryl has requested approveacls Message-ID: <200807080649.m686mwBB017392@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has requested the approveacls acl on net-tools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:05 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t5i7017706@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchbugzilla acl on net-tools (Fedora devel) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:05 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t5cJ017725@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchcommits acl on net-tools (Fedora devel) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:07 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t7nS017745@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on net-tools (Fedora devel) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:08 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t5iA017706@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the approveacls acl on net-tools (Fedora devel) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:13 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t5iD017706@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchbugzilla acl on net-tools (Fedora 7) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:14 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t5cM017725@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchcommits acl on net-tools (Fedora 7) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:16 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t5cP017725@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on net-tools (Fedora 7) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:18 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686tIsC017839@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the approveacls acl on net-tools (Fedora 7) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:19 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t7nV017745@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchbugzilla acl on net-tools (Fedora 8) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:21 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686tLOg017882@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchcommits acl on net-tools (Fedora 8) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:22 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686tMs1017901@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on net-tools (Fedora 8) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:25 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686t7nY017745@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchbugzilla acl on net-tools (Fedora 9) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:25 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686tIsF017839@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the approveacls acl on net-tools (Fedora 8) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:27 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686tMs4017901@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchcommits acl on net-tools (Fedora 9) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:28 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686tS0n017987@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on net-tools (Fedora 9) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 06:55:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 06:55:29 +0000 Subject: [pkgdb] net-tools had acl change status Message-ID: <200807080655.m686tLOj017882@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the approveacls acl on net-tools (Fedora 9) to Approved for Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/net-tools From fedora-extras-commits at redhat.com Tue Jul 8 07:01:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:01:30 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080701.m6871UhI018200@bastion.fedora.phx.redhat.com> Package dstat in Fedora devel was orphaned by Radek Brich (rbrich) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:01:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:01:33 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080701.m6871WJH018218@bastion.fedora.phx.redhat.com> Package dstat in Fedora 7 was orphaned by Radek Brich (rbrich) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:01:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:01:36 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080701.m6871ajO018237@bastion.fedora.phx.redhat.com> Package dstat in Fedora 5 was orphaned by Radek Brich (rbrich) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:01:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:01:38 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080701.m6871c7G018254@bastion.fedora.phx.redhat.com> Package dstat in Fedora 6 was orphaned by Radek Brich (rbrich) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:01:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:01:42 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080701.m6871UhK018200@bastion.fedora.phx.redhat.com> Package dstat in Fedora EPEL 5 was orphaned by Radek Brich (rbrich) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:01:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:01:45 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080701.m6871WJJ018218@bastion.fedora.phx.redhat.com> Package dstat in Fedora 8 was orphaned by Radek Brich (rbrich) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:01:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:01:46 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080701.m6871ajQ018237@bastion.fedora.phx.redhat.com> Package dstat in Fedora 9 was orphaned by Radek Brich (rbrich) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:02:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:02:23 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080702.m6871UhM018200@bastion.fedora.phx.redhat.com> Package dstat in Fedora devel is now owned by Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:02:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:02:54 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080702.m6872sL7018400@bastion.fedora.phx.redhat.com> Package dstat in Fedora 9 is now owned by Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:02:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:02:56 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080702.m6871UhO018200@bastion.fedora.phx.redhat.com> Package dstat in Fedora 8 is now owned by Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:03:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 07:03:01 +0000 Subject: [pkgdb] dstat ownership updated Message-ID: <200807080703.m687316v018435@bastion.fedora.phx.redhat.com> Package dstat in Fedora EPEL 5 is now owned by Zdenek Prikryl (zprikryl) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dstat From fedora-extras-commits at redhat.com Tue Jul 8 07:37:30 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 8 Jul 2008 07:37:30 GMT Subject: rpms/imsettings/F-9 imsettings-constraint-of-language.patch, NONE, 1.1 imsettings-disable-xim.patch, NONE, 1.1 imsettings.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807080737.m687bUEh016314@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/imsettings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16261 Modified Files: .cvsignore sources Added Files: imsettings-constraint-of-language.patch imsettings-disable-xim.patch imsettings.spec Log Message: import to F-9 imsettings-constraint-of-language.patch: --- NEW FILE imsettings-constraint-of-language.patch --- diff -ruN imsettings-0.101.1.orig/data/xinput.sh.in.in imsettings-0.101.1/data/xinput.sh.in.in --- imsettings-0.101.1.orig/data/xinput.sh.in.in 2008-06-03 20:53:49.000000000 +0900 +++ imsettings-0.101.1/data/xinput.sh.in.in 2008-06-12 23:03:51.000000000 +0900 @@ -43,7 +43,14 @@ SHORT_DESC="User Specific" fi elif [ -r "$SYS_XINPUTRC" ]; then - source "$SYS_XINPUTRC" + # FIXME: This hardcoded list has to be gone in the future. + _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh" + for i in $_language_list; do + if echo $tmplang | grep -q -E "^$i"; then + source "$SYS_XINPUTRC" + break + fi + done fi [ -z "$XIM" ] && XIM=none imsettings-disable-xim.patch: --- NEW FILE imsettings-disable-xim.patch --- diff -pruN imsettings-0.101.2.orig/data/xinput.sh.in.in imsettings-0.101.2/data/xinput.sh.in.in --- imsettings-0.101.2.orig/data/xinput.sh.in.in 2008-06-03 20:53:49.000000000 +0900 +++ imsettings-0.101.2/data/xinput.sh.in.in 2008-06-26 11:52:33.000000000 +0900 @@ -60,8 +60,8 @@ export GTK_IM_MODULE [ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE # setup XMODIFIERS -XMODIFIERS="@im=imsettings" -export XMODIFIERS +[ -z "$XMODIFIERS" -a -n "$XIM" ] && XMODIFIERS="@im=$XIM" +[ -n "$XMODIFIERS" ] && export XMODIFIERS # start IM via imsettings IMSETTINGS_MODULE=${SHORT_DESC:-${XIM}} --- NEW FILE imsettings.spec --- Name: imsettings Version: 0.101.3 Release: 1%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: intltool gettext BuildRequires: dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16 BuildRequires: xfce-mcs-manager-devel libxfce4mcs-devel BuildRequires: GConf2-devel BuildRequires: libX11-devel Source0: http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2 Patch0: imsettings-constraint-of-language.patch Patch1: imsettings-disable-xim.patch Summary: Delivery framework for general Input Method configuration Group: Applications/System Requires: xorg-x11-xinit >= 1.0.2-22.fc8 Requires: imsettings-libs = %{version}-%{release} Requires(post): /bin/dbus-send %{_sbindir}/alternatives Requires(postun): /bin/dbus-send %{_sbindir}/alternatives %description IMSettings is a framework that delivers Input Method settings and applies the changes so they take effect immediately without any need to restart applications or the desktop. This package contains the core DBus services and some utilities. %package libs Summary: Libraries for imsettings Group: Development/Libraries %description libs IMSettings is a framework that delivers Input Method settings and applies the changes so they take effect immediately without any need to restart applications or the desktop. This package contains the shared library for imsettings. %package devel Summary: Development files for imsettings Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig Requires: glib2-devel >= 2.16.0 Requires: dbus-glib-devel >= 0.74 %description devel IMSettings is a framework that delivers Input Method settings and applies the changes so they take effect immediately without any need to restart applications or the desktop. This package contains the development files to make any applications with imsettings. %package xfce Summary: Xfce support on imsettings Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: im-chooser %description xfce IMSettings is a framework that delivers Input Method settings and applies the changes so they take effect immediately without any need to restart applications or the desktop. This package contains a plugin to get this working on Xfce. %prep %setup -q %patch0 -p1 -b .0-lang %patch1 -p1 -b .1-xim %build %configure \ --with-xinputsh=50-xinput.sh \ --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # change the file attributes chmod 0755 $RPM_BUILD_ROOT%{_libexecdir}/xinputinfo.sh chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh # clean up the unnecessary files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la # still not stable rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30 dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : %postun if [ "$1" = 0 ]; then alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/imsettings-* %{_libexecdir}/gconf-im-settings-daemon %{_libexecdir}/im-info-daemon %{_libexecdir}/im-settings-daemon %{_libexecdir}/xinputinfo.sh %{_datadir}/dbus-1/services/*.service %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh %{_sysconfdir}/X11/xinit/xinput.d %files libs %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/libimsettings.so.* %files devel %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog NEWS README %{_includedir}/imsettings %{_libdir}/libimsettings.so %{_libdir}/pkgconfig/imsettings.pc %files xfce %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/xfce4/mcs-plugins/imsettings_plugin.so %changelog * Thu Jul 3 2008 Akira TAGOH - 0.101.3-1 - New upstream release. - Use the system-wide xinputrc if .xinputrc is a dangling symlink. (#453358) * Thu Jun 26 2008 Akira TAGOH - 0.101.2-3 - Disable XIM support so far. (#452849, #452870) * Wed Jun 18 2008 Akira TAGOH - 0.101.2-2 - Backport patch from upstream to solve issues. - always saying IM is running when no .xinputrc. - workaround for a delay of that IM is ready for XIM. * Tue Jun 17 2008 Akira TAGOH - 0.101.2-1 - New upstream release. - Fix a typo in the help message. (#451739) - Fix a invalid memory access. (#451753) * Mon Jun 16 2008 Akira TAGOH - 0.101.1-2 - Add Reqruies: glib2-devel, dbus-glib-devel to -devel. * Thu Jun 12 2008 Akira TAGOH - 0.101.1-1 - New upstream release. - Add Requires pkgconfig to -devel. * Wed Jun 11 2008 Akira TAGOH - 0.101.0-1 - New upstream release. - Add Requires alternatives for %%post and %%postun. - Improve summary. - Remove imsettings-reload from %%post and %%postun. these are no longer needed. * Wed Jun 4 2008 Akira TAGOH - 0.100.0-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jun 2008 16:39:26 -0000 1.1 +++ .cvsignore 8 Jul 2008 07:36:44 -0000 1.2 @@ -0,0 +1,4 @@ +*.bz2 +*.gz +*.rpm +imsettings-0.101.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jun 2008 16:39:26 -0000 1.1 +++ sources 8 Jul 2008 07:36:44 -0000 1.2 @@ -0,0 +1 @@ +1771eb4b4b9cf9a1bd2aeb2163306ebd imsettings-0.101.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 07:42:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Tue, 8 Jul 2008 07:42:50 GMT Subject: rpms/wireshark/devel .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 wireshark.spec, 1.35, 1.36 Message-ID: <200807080742.m687goNJ016546@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/wireshark/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484 Modified Files: .cvsignore sources wireshark.spec Log Message: - upgrade to 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 1 Apr 2008 17:41:00 -0000 1.18 +++ .cvsignore 8 Jul 2008 07:42:05 -0000 1.19 @@ -1 +1 @@ -wireshark-1.0.0.tar.bz2 +wireshark-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 1 Apr 2008 17:41:00 -0000 1.18 +++ sources 8 Jul 2008 07:42:05 -0000 1.19 @@ -1 +1 @@ -90e58c595f082da3ad9390d714f16116 wireshark-1.0.0.tar.bz2 +da33c2abeb8b982ca50e4c43d8c0fe27 wireshark-1.0.1.tar.gz Index: wireshark.spec =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- wireshark.spec 29 Jun 2008 23:45:12 -0000 1.35 +++ wireshark.spec 8 Jul 2008 07:42:05 -0000 1.36 @@ -5,14 +5,14 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 1%{?dist} License: GPL+ Group: Applications/Internet %if %{svn_version} Source0: http://wireshark.org/download/prerelease/%{name}-%{version}-SVN-%{svn_version}.tar.gz %else -Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 +Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.gz %endif Source1: wireshark.pam Source2: wireshark.console @@ -201,6 +201,9 @@ %changelog +* Tue Jul 8 2008 Radek Vok??l 1.0.1-1 +- upgrade to 1.0.1 + * Sun Jun 29 2008 Dennis Gilmore 1.0.0-3 - add sparc arches to -fPIE - rebuild for new gnutls From fedora-extras-commits at redhat.com Tue Jul 8 08:00:40 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Tue, 8 Jul 2008 08:00:40 GMT Subject: rpms/apr-util/devel apr-util.spec,1.54,1.55 Message-ID: <200807080800.m6880eCP017234@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17188 Modified Files: apr-util.spec Log Message: * Tue Jul 8 2008 Joe Orton 1.3.2-5 - restore requires for openldap-devel from -devel Index: apr-util.spec =================================================================== RCS file: /cvs/extras/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- apr-util.spec 2 Jul 2008 06:50:16 -0000 1.54 +++ apr-util.spec 8 Jul 2008 07:59:47 -0000 1.55 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.3.2 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -25,7 +25,7 @@ Group: Development/Libraries Summary: APR utility library development kit Requires: apr-util = %{version}-%{release}, apr-devel, pkgconfig -Requires: db4-devel, expat-devel +Requires: db4-devel, expat-devel, openldap-devel %description devel This package provides the support files which can be used to @@ -183,6 +183,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 8 2008 Joe Orton 1.3.2-5 +- restore requires for openldap-devel from -devel + * Wed Jul 2 2008 Bojan Smojver - 1.3.2-4 - properly fix PostgreSQL detection From fedora-extras-commits at redhat.com Tue Jul 8 08:29:13 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Tue, 8 Jul 2008 08:29:13 GMT Subject: rpms/gcc/devel .cvsignore, 1.236, 1.237 gcc43.spec, 1.33, 1.34 sources, 1.238, 1.239 Message-ID: <200807080829.m688TDLQ024564@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24486 Modified Files: .cvsignore gcc43.spec sources Log Message: 4.3.1-4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- .cvsignore 24 Jun 2008 12:20:15 -0000 1.236 +++ .cvsignore 8 Jul 2008 08:28:27 -0000 1.237 @@ -1,2 +1,2 @@ -gcc-4.3.1-20080624.tar.bz2 +gcc-4.3.1-20080708.tar.bz2 fastjar-0.95.tar.gz Index: gcc43.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gcc43.spec 24 Jun 2008 12:20:15 -0000 1.33 +++ gcc43.spec 8 Jul 2008 08:28:27 -0000 1.34 @@ -1,6 +1,6 @@ -%define DATE 20080624 +%define DATE 20080708 %define gcc_version 4.3.1 -%define gcc_release 3 +%define gcc_release 4 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -1664,6 +1664,16 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Tue Jul 8 2008 Jakub Jelinek 4.3.1-4 +- update from gcc-4_3-branch + - PRs c++/34963, c++/36662, fortran/36546, fortran/36657, fortran/36676, + libstdc++/36612, libstdc++/36616, rtl-optimization/34744, + target/34780, target/34856, target/36510, target/36634, + target/36684, target/36698, target/36736, testsuite/36620, + tree-optimization/36648 + - fix -frepo (#448390, PR c++/36364) +- improve OpenMP debug info (PRs debug/36617, middle-end/36726) + * Tue Jun 24 2008 Jakub Jelinek 4.3.1-3 - update from gcc-4_3-branch - PRs c++/35317, c++/35320, documentation/30739, fortran/34908, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- sources 24 Jun 2008 12:20:15 -0000 1.238 +++ sources 8 Jul 2008 08:28:27 -0000 1.239 @@ -1,2 +1,2 @@ -af2acae86f463116d48a4a4e8dd890f9 gcc-4.3.1-20080624.tar.bz2 +5669c0b2ebed3ce41123984b7cdaaee3 gcc-4.3.1-20080708.tar.bz2 92a70f9e56223b653bce0f58f90cf950 fastjar-0.95.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 08:37:41 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 8 Jul 2008 08:37:41 GMT Subject: rpms/lxpanel/devel .cvsignore, 1.8, 1.9 lxpanel.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200807080837.m688bfxY024987@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/lxpanel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24932 Modified Files: .cvsignore lxpanel.spec sources Log Message: * Tue Jul 08 2008 Sebastian Vahl 0.3.8.1-1 - new upstream version: 0.3.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lxpanel/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 4 Jul 2008 21:47:23 -0000 1.8 +++ .cvsignore 8 Jul 2008 08:36:52 -0000 1.9 @@ -1 +1 @@ -lxpanel-0.3.8.tar.gz +lxpanel-0.3.8.1.tar.gz Index: lxpanel.spec =================================================================== RCS file: /cvs/extras/rpms/lxpanel/devel/lxpanel.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lxpanel.spec 4 Jul 2008 21:47:23 -0000 1.12 +++ lxpanel.spec 8 Jul 2008 08:36:52 -0000 1.13 @@ -2,7 +2,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=219930 Name: lxpanel -Version: 0.3.8 +Version: 0.3.8.1 Release: 1%{?dist} Summary: A lightweight X11 desktop panel @@ -56,6 +56,9 @@ %{_mandir}/man1/lxpanel* %changelog +* Tue Jul 08 2008 Sebastian Vahl 0.3.8.1-1 +- new upstream version: 0.3.8.1 + * Fri Jul 04 2008 Sebastian Vahl 0.3.8-1 - new upstream version: 0.3.8 - new BR in this version: intltool Index: sources =================================================================== RCS file: /cvs/extras/rpms/lxpanel/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 Jul 2008 21:47:23 -0000 1.8 +++ sources 8 Jul 2008 08:36:52 -0000 1.9 @@ -1 +1 @@ -0730035810896a2d7f8892d75991674c lxpanel-0.3.8.tar.gz +18b03bd5556d14b8bd1adf00f4e95574 lxpanel-0.3.8.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 08:42:48 2008 From: fedora-extras-commits at redhat.com (Karel Zak (kzak)) Date: Tue, 8 Jul 2008 08:42:48 GMT Subject: rpms/collectl/devel .cvsignore, 1.2, 1.3 collectl.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807080842.m688gmNO025313@cvs-int.fedora.redhat.com> Author: kzak Update of /cvs/pkgs/rpms/collectl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25269 Modified Files: .cvsignore collectl.spec sources Log Message: * Tue Jul 8 2008 Karel Zak 3.0.0-1 - upgrade to upstream version 3.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2008 19:57:13 -0000 1.2 +++ .cvsignore 8 Jul 2008 08:42:03 -0000 1.3 @@ -1 +1 @@ -collectl-2.6.4-1.src.tar.gz +collectl-3.0.0.src.tar.gz Index: collectl.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectl/devel/collectl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- collectl.spec 19 Jun 2008 19:57:13 -0000 1.1 +++ collectl.spec 8 Jul 2008 08:42:03 -0000 1.2 @@ -1,13 +1,10 @@ -%define upstream_version 2.6.4 -%define upstream_release 1 - Summary: A utility to collect various linux performance data Name: collectl -Version: %{upstream_version} +Version: 3.0.0 Release: 1%{?dist} License: GPLv2+ or Artistic Group: Applications/System -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-%{upstream_release}.src.tar.gz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz Source1: %{name}.initd Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -24,7 +21,7 @@ A utility to collect linux performance data %prep -%setup -q -n %{name}-%{version}-%{upstream_release} +%setup -q # rename directory for easier inclusion mv docs html @@ -101,5 +98,8 @@ %{_localstatedir}/log/%{name} %changelog +* Tue Jul 8 2008 Karel Zak 3.0.0-1 +- upgrade to upstream version 3.0.0 + * Thu Jun 19 2008 Karel Zak 2.6.4-1 - initial packaging (thanks to Dan Horak), based upon upstream srpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 19:57:13 -0000 1.2 +++ sources 8 Jul 2008 08:42:03 -0000 1.3 @@ -1 +1 @@ -bda4b879b79166e489b53f56f3877941 collectl-2.6.4-1.src.tar.gz +0f235ac3ad828b84f3f344fa0135b027 collectl-3.0.0.src.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 09:32:02 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 8 Jul 2008 09:32:02 GMT Subject: rpms/filezilla/devel filezilla.spec, 1.14, 1.15 sources, 1.13, 1.14 .cvsignore, 1.10, 1.11 Message-ID: <200807080932.m689W27n002416@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2296 Modified Files: filezilla.spec sources .cvsignore Log Message: - Update to 3.0.11.1 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- filezilla.spec 25 Jun 2008 07:03:54 -0000 1.14 +++ filezilla.spec 8 Jul 2008 09:31:07 -0000 1.15 @@ -1,6 +1,6 @@ Name: filezilla -Version: 3.0.11 -Release: 2%{?dist} +Version: 3.0.11.1 +Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet @@ -42,6 +42,8 @@ %setup -q -n %{name}-%{version} %patch0 -p1 -b .system +#sed -i -e 's/2.0.4/1.6.3/' configure.in + # Run autotools if needed sh autogen.sh @@ -120,6 +122,9 @@ %changelog +* Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 +- Update to 3.0.11.1 + * Wed Jun 25 2008 Tomas Mraz - 3.0.11-2 - rebuild with new gnutls Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 16 Jun 2008 15:32:11 -0000 1.13 +++ sources 8 Jul 2008 09:31:07 -0000 1.14 @@ -1 +1 @@ -776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2 +a0b7af162648ade8f593604913b6eedd FileZilla_3.0.11.1_src.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 May 2008 08:35:56 -0000 1.10 +++ .cvsignore 8 Jul 2008 09:31:07 -0000 1.11 @@ -1 +1 @@ -FileZilla_3.0.10_src.tar.bz2 +FileZilla_3.0.11.1_src.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 09:39:15 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 8 Jul 2008 09:39:15 GMT Subject: rpms/im-chooser/devel .cvsignore, 1.24, 1.25 im-chooser.spec, 1.48, 1.49 sources, 1.23, 1.24 Message-ID: <200807080939.m689dFve002945@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/im-chooser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2866 Modified Files: .cvsignore im-chooser.spec sources Log Message: * Tue Jul 8 2008 Akira TAGOH - 1.2.0-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 27 Jun 2008 02:40:43 -0000 1.24 +++ .cvsignore 8 Jul 2008 09:38:28 -0000 1.25 @@ -24,3 +24,4 @@ im-chooser-0.99.6.tar.gz im-chooser-1.1.0.tar.bz2 im-chooser-1.1.1.tar.bz2 +im-chooser-1.2.0.tar.bz2 Index: im-chooser.spec =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- im-chooser.spec 27 Jun 2008 02:40:43 -0000 1.48 +++ im-chooser.spec 8 Jul 2008 09:38:28 -0000 1.49 @@ -1,10 +1,10 @@ Name: im-chooser -Version: 1.1.1 +Version: 1.2.0 Release: 1%{?dist} License: GPLv2+ URL: http://fedorahosted.org/im-chooser/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel desktop-file-utils intltool gettext +BuildRequires: gtk2-devel libgnomeui-devel desktop-file-utils intltool gettext BuildRequires: imsettings-devel >= 0.101.1-2 Source0: http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2 @@ -52,6 +52,9 @@ %changelog +* Tue Jul 8 2008 Akira TAGOH - 1.2.0-1 +- New upstream release. + * Fri Jun 27 2008 Akira TAGOH - 1.1.1-1 - New upstream release. - Fix a segfault when no Input Method installed. (#452997) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 27 Jun 2008 02:40:43 -0000 1.23 +++ sources 8 Jul 2008 09:38:28 -0000 1.24 @@ -1 +1 @@ -e539ad4b19e753c31a20f5469f31d60f im-chooser-1.1.1.tar.bz2 +9d0b83ff217e5a2795d844b46e27fced im-chooser-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 09:39:59 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 8 Jul 2008 09:39:59 GMT Subject: rpms/perl-Calendar-Simple/F-9 .cvsignore, 1.5, 1.6 perl-Calendar-Simple.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807080939.m689dxSm003019@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Calendar-Simple/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2825/F-9 Modified Files: .cvsignore perl-Calendar-Simple.spec sources Log Message: * Tue Jul 08 2008 Ralf Cors??pius - 1.20-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2008 04:11:51 -0000 1.5 +++ .cvsignore 8 Jul 2008 09:38:35 -0000 1.6 @@ -1 +1 @@ -Calendar-Simple-1.19.tar.gz +Calendar-Simple-1.20.tar.gz Index: perl-Calendar-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/F-9/perl-Calendar-Simple.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Calendar-Simple.spec 11 Mar 2008 04:11:51 -0000 1.9 +++ perl-Calendar-Simple.spec 8 Jul 2008 09:38:35 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Perl extension to create simple calendars Name: perl-Calendar-Simple -Version: 1.19 +Version: 1.20 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Ralf Cors??pius - 1.20-1 +- Upstream update. + * Tue Mar 11 2008 Ralf Cors??pius - 1.19-1 - Upstream update. - Reflect upstream having dropped "COPYING". Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2008 04:11:51 -0000 1.5 +++ sources 8 Jul 2008 09:38:35 -0000 1.6 @@ -1 +1 @@ -b4f974f74f615b8aadfdba43b3a646f1 Calendar-Simple-1.19.tar.gz +8f67dc77caba570339ada69b453b2a1d Calendar-Simple-1.20.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 09:40:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 8 Jul 2008 09:40:03 GMT Subject: rpms/perl-Calendar-Simple/devel .cvsignore, 1.5, 1.6 perl-Calendar-Simple.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807080940.m689e3dn003030@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Calendar-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2825/devel Modified Files: .cvsignore perl-Calendar-Simple.spec sources Log Message: * Tue Jul 08 2008 Ralf Cors??pius - 1.20-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2008 04:11:51 -0000 1.5 +++ .cvsignore 8 Jul 2008 09:38:14 -0000 1.6 @@ -1 +1 @@ -Calendar-Simple-1.19.tar.gz +Calendar-Simple-1.20.tar.gz Index: perl-Calendar-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Calendar-Simple.spec 11 Mar 2008 04:11:51 -0000 1.9 +++ perl-Calendar-Simple.spec 8 Jul 2008 09:38:14 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Perl extension to create simple calendars Name: perl-Calendar-Simple -Version: 1.19 +Version: 1.20 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Ralf Cors??pius - 1.20-1 +- Upstream update. + * Tue Mar 11 2008 Ralf Cors??pius - 1.19-1 - Upstream update. - Reflect upstream having dropped "COPYING". Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2008 04:11:51 -0000 1.5 +++ sources 8 Jul 2008 09:38:14 -0000 1.6 @@ -1 +1 @@ -b4f974f74f615b8aadfdba43b3a646f1 Calendar-Simple-1.19.tar.gz +8f67dc77caba570339ada69b453b2a1d Calendar-Simple-1.20.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 09:40:07 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 8 Jul 2008 09:40:07 GMT Subject: rpms/perl-Calendar-Simple/F-8 .cvsignore, 1.5, 1.6 perl-Calendar-Simple.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200807080940.m689e7DG003038@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Calendar-Simple/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2825/F-8 Modified Files: .cvsignore perl-Calendar-Simple.spec sources Log Message: * Tue Jul 08 2008 Ralf Cors??pius - 1.20-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Apr 2008 12:29:30 -0000 1.5 +++ .cvsignore 8 Jul 2008 09:38:59 -0000 1.6 @@ -1 +1 @@ -Calendar-Simple-1.19.tar.gz +Calendar-Simple-1.20.tar.gz Index: perl-Calendar-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/F-8/perl-Calendar-Simple.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Calendar-Simple.spec 7 Apr 2008 12:29:30 -0000 1.8 +++ perl-Calendar-Simple.spec 8 Jul 2008 09:38:59 -0000 1.9 @@ -1,6 +1,6 @@ Summary: Perl extension to create simple calendars Name: perl-Calendar-Simple -Version: 1.19 +Version: 1.20 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -51,10 +51,16 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Ralf Cors??pius - 1.20-1 +- Upstream update. + * Tue Mar 11 2008 Ralf Cors??pius - 1.19-1 - Upstream update. - Reflect upstream having dropped "COPYING". +* Thu Mar 06 2008 Tom "spot" Callaway - 1.17-3 +Rebuild for new perl + * Fri Aug 17 2007 Ralf Cors??pius - 1.17-2 - Update license tag. - Reflect perl package split. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Apr 2008 12:29:30 -0000 1.5 +++ sources 8 Jul 2008 09:38:59 -0000 1.6 @@ -1 +1 @@ -b4f974f74f615b8aadfdba43b3a646f1 Calendar-Simple-1.19.tar.gz +8f67dc77caba570339ada69b453b2a1d Calendar-Simple-1.20.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 09:51:05 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Tue, 8 Jul 2008 09:51:05 GMT Subject: rpms/gcc/devel sources,1.239,1.240 Message-ID: <200807080951.m689p5Yh003678@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3642 Modified Files: sources Log Message: 4.3.1-8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- sources 8 Jul 2008 08:28:27 -0000 1.239 +++ sources 8 Jul 2008 09:50:17 -0000 1.240 @@ -1,2 +1,2 @@ -5669c0b2ebed3ce41123984b7cdaaee3 gcc-4.3.1-20080708.tar.bz2 +7ecf9d5ae28bc7e6c6db5cf2e8bd05cf gcc-4.3.1-20080708.tar.bz2 92a70f9e56223b653bce0f58f90cf950 fastjar-0.95.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 09:53:59 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 8 Jul 2008 09:53:59 GMT Subject: rpms/filezilla/F-9 filezilla.spec,1.12,1.13 sources,1.12,1.13 Message-ID: <200807080953.m689rxte003824@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3763 Modified Files: filezilla.spec sources Log Message: - Update to 3.0.11.1 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-9/filezilla.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- filezilla.spec 3 Jul 2008 22:12:36 -0000 1.12 +++ filezilla.spec 8 Jul 2008 09:53:03 -0000 1.13 @@ -1,5 +1,5 @@ Name: filezilla -Version: 3.0.11 +Version: 3.0.11.1 Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -120,6 +120,9 @@ %changelog +* Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 +- Update to 3.0.11.1 + * Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1 - Update to 3.0.11 - Create patch for a shared tinyxml. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 3 Jul 2008 22:12:36 -0000 1.12 +++ sources 8 Jul 2008 09:53:03 -0000 1.13 @@ -1 +1 @@ -776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2 +a0b7af162648ade8f593604913b6eedd FileZilla_3.0.11.1_src.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 09:59:38 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 8 Jul 2008 09:59:38 GMT Subject: rpms/im-chooser/F-9 .cvsignore, 1.22, 1.23 im-chooser.spec, 1.42, 1.43 sources, 1.21, 1.22 im-chooser-0.99.6-check-if-im-is-running.patch, 1.1, NONE im-chooser-0.99.6-correct-build-order.patch, 1.1, NONE im-chooser-0.99.6-sanity-check-on-dbus-conn.patch, 1.1, NONE im-chooser-0.99.6-validate-pid.patch, 1.1, NONE im-chooser-constraint-of-language.patch, 1.3, NONE im-chooser-fix-window-border.patch, 1.1, NONE imsettings-ignore-error-on-check-running.patch, 1.1, NONE Message-ID: <200807080959.m689xc4W004186@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/im-chooser/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4141 Modified Files: .cvsignore im-chooser.spec sources Removed Files: im-chooser-0.99.6-check-if-im-is-running.patch im-chooser-0.99.6-correct-build-order.patch im-chooser-0.99.6-sanity-check-on-dbus-conn.patch im-chooser-0.99.6-validate-pid.patch im-chooser-constraint-of-language.patch im-chooser-fix-window-border.patch imsettings-ignore-error-on-check-running.patch Log Message: * Tue Jul 8 2008 Akira TAGOH - 1.2.0-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 8 Apr 2008 10:50:10 -0000 1.22 +++ .cvsignore 8 Jul 2008 09:58:53 -0000 1.23 @@ -22,3 +22,5 @@ im-chooser-0.99.4.tar.gz im-chooser-0.99.5.tar.gz im-chooser-0.99.6.tar.gz +im-chooser-1.1.1.tar.bz2 +im-chooser-1.2.0.tar.bz2 Index: im-chooser.spec =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/F-9/im-chooser.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- im-chooser.spec 26 May 2008 02:54:53 -0000 1.42 +++ im-chooser.spec 8 Jul 2008 09:58:53 -0000 1.43 @@ -1,86 +1,29 @@ Name: im-chooser -Version: 0.99.6 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: GPLv2+ URL: http://fedorahosted.org/im-chooser/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel intltool gettext libgnomeui-devel dbus-devel dbus-glib-devel gamin-devel xfce-mcs-manager-devel libxfce4mcs-devel -BuildRequires: desktop-file-utils libtool +BuildRequires: gtk2-devel libgnomeui-devel desktop-file-utils intltool gettext +BuildRequires: imsettings-devel >= 0.101.1-2 -Source0: http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.gz -Patch0: im-chooser-constraint-of-language.patch -Patch1: im-chooser-0.99.6-check-if-im-is-running.patch -Patch2: im-chooser-0.99.6-correct-build-order.patch -Patch3: im-chooser-0.99.6-sanity-check-on-dbus-conn.patch -Patch4: im-chooser-0.99.6-validate-pid.patch -Patch5: im-chooser-fix-window-border.patch -Patch6: imsettings-ignore-error-on-check-running.patch +Source0: http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2 Summary: Desktop Input Method configuration tool Group: Applications/System -Requires(post): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives -Requires: imsettings = %{version}-%{release} Obsoletes: system-switch-im +Requires: imsettings >= 0.101.0 %description im-chooser is a GUI configuration tool to choose the Input Method to be used or disable Input Method usage on the desktop. -%package -n imsettings -Summary: Input Method settings framework -Group: Applications/System -Requires: xorg-x11-xinit >= 1.0.2-22.fc8 -Requires: imsettings-libs = %{version}-%{release} -Requires(post): /bin/dbus-send -Requires(postun): /bin/dbus-send - -%description -n imsettings -imsettings is a framework to deal with IM configuration through D-Bus. - -%package -n imsettings-xfce -Summary: Xfce support on imsettings -Group: Applications/System -Requires: imsettings-libs = %{version}-%{release} - -%description -n imsettings-xfce -imsettings is a framework to deal with IM configuration through D-Bus. -This package contains a plugin to get this working on Xfce. - -%package -n imsettings-libs -Summary: Libraries for imsettings -Group: Development/Libraries - -%description -n imsettings-libs -imsettings is a framework to deal with IM configuration through D-Bus. -This package contains a library for imsettings. - -%package -n imsettings-devel -Summary: Development files for imsettings -Group: Development/Libraries -Requires: imsettings-libs = %{version}-%{release} - -%description -n imsettings-devel -imsettings is a framework to deal with IM configuration through D-Bus. -This package contains the development files to make any applications with imsettings. %prep %setup -q -%patch0 -p1 -b .language -%patch1 -p0 -b .is_running -%patch2 -p1 -b .build_order -%patch3 -p0 -b .dbusconn -%patch4 -p0 -b .pid -%patch5 -p0 -b .border -pushd imsettings -%patch6 -p0 -b .ignore-error -popd -autoreconf %build -%configure --with-xinput-suffix=.conf \ - --with-xinputsh=50-xinput.sh \ - --disable-static +%configure make %{?_smp_mflags} %install @@ -94,33 +37,11 @@ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/im-chooser.desktop -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la -rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service -rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon - %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%post -n imsettings -alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10 -alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30 -dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : -imsettings-reload -f > /dev/null 2>&1 || : - -%postun -n imsettings -if [ "$1" = 0 ]; then - alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf - alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf - dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : -fi -imsettings-reload -f > /dev/null 2>&1 || : - -%post -n imsettings-libs -p /sbin/ldconfig - -%postun -n imsettings-libs -p /sbin/ldconfig %files -f %{name}.lang %defattr (-, root, root) @@ -129,36 +50,18 @@ %{_datadir}/applications/fedora-im-chooser.desktop %{_datadir}/pixmaps/im-chooser.png -%files -n imsettings -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_bindir}/imsettings-* -%{_libexecdir}/gconf-im-settings-daemon -%{_libexecdir}/im-info-daemon -%{_libexecdir}/im-settings-daemon -%{_libexecdir}/xinputinfo.sh -%{_datadir}/dbus-1/services/*.service -%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh -%{_sysconfdir}/X11/xinit/xinput.d - -%files -n imsettings-xfce -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_libdir}/xfce4/mcs-plugins/imsettings_plugin.so - -%files -n imsettings-libs -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_libdir}/libimsettings.so.* - -%files -n imsettings-devel -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_includedir}/imsettings -%{_libdir}/libimsettings.so -%{_libdir}/pkgconfig/imsettings.pc %changelog +* Tue Jul 8 2008 Akira TAGOH - 1.2.0-1 +- New upstream release. + +* Fri Jun 27 2008 Akira TAGOH - 1.1.1-1 +- New upstream release. + - Fix a segfault when no Input Method installed. (#452997) + +* Thu Jun 12 2008 Akira TAGOH - 1.1.0-1 +- New upstream release. + * Mon May 26 2008 Akira TAGOH - 0.99.6-5 - Fix a typo in the package group of imsettings-xfce. (#448037) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/F-9/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 8 Apr 2008 10:50:10 -0000 1.21 +++ sources 8 Jul 2008 09:58:53 -0000 1.22 @@ -1 +1 @@ -22efbfcf3651e91af5535c334d73ba76 im-chooser-0.99.6.tar.gz +9d0b83ff217e5a2795d844b46e27fced im-chooser-1.2.0.tar.bz2 --- im-chooser-0.99.6-check-if-im-is-running.patch DELETED --- --- im-chooser-0.99.6-correct-build-order.patch DELETED --- --- im-chooser-0.99.6-sanity-check-on-dbus-conn.patch DELETED --- --- im-chooser-0.99.6-validate-pid.patch DELETED --- --- im-chooser-constraint-of-language.patch DELETED --- --- im-chooser-fix-window-border.patch DELETED --- --- imsettings-ignore-error-on-check-running.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 8 10:03:49 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 8 Jul 2008 10:03:49 GMT Subject: rpms/perl-Text-CSV_XS/devel import.log, NONE, 1.1 .cvsignore, 1.5, 1.6 perl-Text-CSV_XS.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200807081003.m68A3niv011118@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV_XS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11017/devel Modified Files: .cvsignore perl-Text-CSV_XS.spec sources Added Files: import.log Log Message: 0.52 --- NEW FILE import.log --- perl-Text-CSV_XS-0_52-1_fc9:HEAD:perl-Text-CSV_XS-0.52-1.fc9.src.rpm:1215511340 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jun 2007 13:45:08 -0000 1.5 +++ .cvsignore 8 Jul 2008 10:02:34 -0000 1.6 @@ -1 +1 @@ -Text-CSV_XS-0.30.tar.gz +Text-CSV_XS-0.52.tgz Index: perl-Text-CSV_XS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/perl-Text-CSV_XS.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Text-CSV_XS.spec 3 Mar 2008 20:19:20 -0000 1.12 +++ perl-Text-CSV_XS.spec 8 Jul 2008 10:02:34 -0000 1.13 @@ -1,12 +1,12 @@ Name: perl-Text-CSV_XS -Version: 0.30 -Release: 5%{?dist} +Version: 0.52 +Release: 1%{?dist} Summary: Comma-separated values manipulation routines Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Text-CSV_XS/ -Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::Pod) @@ -55,6 +55,9 @@ %changelog +* Tue Jul 08 2008 Lubomir Rintel - 0.52-1 +- Updated to 0.52 to solve an issue with perl 5.10 + * Wed Feb 27 2008 Tom "spot" Callaway - 0.30-5 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jun 2007 13:45:08 -0000 1.5 +++ sources 8 Jul 2008 10:02:34 -0000 1.6 @@ -1 +1 @@ -33e1562283bcacddd6dadcc5a73e522d Text-CSV_XS-0.30.tar.gz +2cd7a3b74930cb92e579e5a890712361 Text-CSV_XS-0.52.tgz From fedora-extras-commits at redhat.com Tue Jul 8 10:04:04 2008 From: fedora-extras-commits at redhat.com (Lorenzo Villani (arbiter)) Date: Tue, 8 Jul 2008 10:04:04 GMT Subject: rpms/bip/devel .cvsignore,1.2,1.3 bip.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200807081004.m68A44sQ011163@cvs-int.fedora.redhat.com> Author: arbiter Update of /cvs/pkgs/rpms/bip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11052 Modified Files: .cvsignore bip.spec sources Log Message: * New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bip/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2008 18:31:33 -0000 1.2 +++ .cvsignore 8 Jul 2008 10:03:21 -0000 1.3 @@ -1 +1 @@ -bip-0.7.2.tar.gz +bip-0.7.4.tar.gz Index: bip.spec =================================================================== RCS file: /cvs/pkgs/rpms/bip/devel/bip.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bip.spec 6 May 2008 17:56:55 -0000 1.2 +++ bip.spec 8 Jul 2008 10:03:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: bip -Version: 0.7.2 -Release: 6%{?dist} +Version: 0.7.4 +Release: 1%{?dist} Summary: IRC Bouncer Group: Applications/Internet License: GPLv2+ @@ -50,6 +50,9 @@ %{_mandir}/man5/bip.conf.5.gz %changelog +* Tue Jun 08 2008 Lorenzo Villani - 0.7.4-1 +- New version + * Tue May 06 2008 Lorenzo Villani - 0.7.2-6 - Removed _smp_mflags to avoid compilation errors with parallel jobs Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bip/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2008 18:31:33 -0000 1.2 +++ sources 8 Jul 2008 10:03:21 -0000 1.3 @@ -1 +1 @@ -5c16e1a72ee9b59f1ffe5c1313a51077 bip-0.7.2.tar.gz +8d665d6858506d005391f333e3c11af3 bip-0.7.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 10:09:37 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 8 Jul 2008 10:09:37 GMT Subject: rpms/filezilla/F-8 filezilla.spec,1.5,1.6 sources,1.5,1.6 Message-ID: <200807081009.m68A9b6D011445@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11410 Modified Files: filezilla.spec sources Log Message: - Update to 3.0.11.1 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-8/filezilla.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- filezilla.spec 3 Jul 2008 22:24:40 -0000 1.5 +++ filezilla.spec 8 Jul 2008 10:08:46 -0000 1.6 @@ -1,5 +1,5 @@ Name: filezilla -Version: 3.0.11 +Version: 3.0.11.1 Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -123,6 +123,9 @@ %changelog +* Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 +- Update to 3.0.11.1 + * Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1 - Update to 3.0.11 - Create patch for a shared tinyxml. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 3 Jul 2008 22:24:40 -0000 1.5 +++ sources 8 Jul 2008 10:08:46 -0000 1.6 @@ -1 +1 @@ -776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2 +a0b7af162648ade8f593604913b6eedd FileZilla_3.0.11.1_src.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 10:16:03 2008 From: fedora-extras-commits at redhat.com (Lorenzo Villani (arbiter)) Date: Tue, 8 Jul 2008 10:16:03 GMT Subject: rpms/bip/F-9 bip.spec,1.5,1.6 Message-ID: <200807081016.m68AG3rn011711@cvs-int.fedora.redhat.com> Author: arbiter Update of /cvs/pkgs/rpms/bip/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11660 Modified Files: bip.spec Log Message: * version bump Index: bip.spec =================================================================== RCS file: /cvs/pkgs/rpms/bip/F-9/bip.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bip.spec 6 May 2008 17:56:49 -0000 1.5 +++ bip.spec 8 Jul 2008 10:15:11 -0000 1.6 @@ -1,6 +1,6 @@ Name: bip -Version: 0.7.2 -Release: 6%{?dist} +Version: 0.7.4 +Release: 1%{?dist} Summary: IRC Bouncer Group: Applications/Internet License: GPLv2+ @@ -50,6 +50,9 @@ %{_mandir}/man5/bip.conf.5.gz %changelog +* Tue Jun 08 2008 Lorenzo Villani - 0.7.4-1 +- New version + * Tue May 06 2008 Lorenzo Villani - 0.7.2-6 - Removed _smp_mflags to avoid compilation errors with parallel jobs From fedora-extras-commits at redhat.com Tue Jul 8 10:23:19 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 8 Jul 2008 10:23:19 GMT Subject: rpms/imsettings/F-9 imsettings.spec,1.1,1.2 Message-ID: <200807081023.m68ANJYp012167@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/imsettings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12063 Modified Files: imsettings.spec Log Message: * Tue Jul 8 2008 Akira TAGOH - 0.101.3-2 - rebuild. Index: imsettings.spec =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/F-9/imsettings.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- imsettings.spec 8 Jul 2008 07:36:44 -0000 1.1 +++ imsettings.spec 8 Jul 2008 10:22:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: imsettings Version: 0.101.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -152,6 +152,9 @@ %changelog +* Tue Jul 8 2008 Akira TAGOH - 0.101.3-2 +- rebuild. + * Thu Jul 3 2008 Akira TAGOH - 0.101.3-1 - New upstream release. - Use the system-wide xinputrc if .xinputrc is a dangling From fedora-extras-commits at redhat.com Tue Jul 8 10:23:20 2008 From: fedora-extras-commits at redhat.com (Lorenzo Villani (arbiter)) Date: Tue, 8 Jul 2008 10:23:20 GMT Subject: rpms/bip/EL-5 bip.spec,1.3,1.4 Message-ID: <200807081023.m68ANKEb012171@cvs-int.fedora.redhat.com> Author: arbiter Update of /cvs/pkgs/rpms/bip/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027 Modified Files: bip.spec Log Message: * version bump Index: bip.spec =================================================================== RCS file: /cvs/pkgs/rpms/bip/EL-5/bip.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bip.spec 6 May 2008 18:17:32 -0000 1.3 +++ bip.spec 8 Jul 2008 10:22:23 -0000 1.4 @@ -1,6 +1,6 @@ Name: bip -Version: 0.7.2 -Release: 8%{?dist} +Version: 0.7.4 +Release: 1%{?dist} Summary: IRC Bouncer Group: Applications/Internet License: GPLv2+ @@ -50,6 +50,9 @@ %{_mandir}/man5/bip.conf.5.gz %changelog +* Tue Jun 08 2008 Lorenzo Villani - 0.7.4-1 +- New version + * Tue May 06 2008 Lorenzo Villani - 0.7.2-6 - Removed _smp_mflags to avoid compilation errors with parallel jobs From fedora-extras-commits at redhat.com Tue Jul 8 10:25:30 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 8 Jul 2008 10:25:30 GMT Subject: rpms/imsettings/devel imsettings.spec,1.7,1.8 Message-ID: <200807081025.m68APUeI012395@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/imsettings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12318 Modified Files: imsettings.spec Log Message: * Tue Jul 8 2008 Akira TAGOH - 0.101.3-2 - rebuild. Index: imsettings.spec =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- imsettings.spec 3 Jul 2008 11:01:42 -0000 1.7 +++ imsettings.spec 8 Jul 2008 10:24:37 -0000 1.8 @@ -1,6 +1,6 @@ Name: imsettings Version: 0.101.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -152,6 +152,9 @@ %changelog +* Tue Jul 8 2008 Akira TAGOH - 0.101.3-2 +- rebuild. + * Thu Jul 3 2008 Akira TAGOH - 0.101.3-1 - New upstream release. - Use the system-wide xinputrc if .xinputrc is a dangling From fedora-extras-commits at redhat.com Tue Jul 8 10:28:50 2008 From: fedora-extras-commits at redhat.com (Lorenzo Villani (arbiter)) Date: Tue, 8 Jul 2008 10:28:50 GMT Subject: rpms/bip/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200807081028.m68ASoRF012627@cvs-int.fedora.redhat.com> Author: arbiter Update of /cvs/pkgs/rpms/bip/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12573 Modified Files: .cvsignore sources Log Message: * new source file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bip/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 May 2008 19:06:21 -0000 1.2 +++ .cvsignore 8 Jul 2008 10:27:56 -0000 1.3 @@ -1 +1 @@ -bip-0.7.2.tar.gz +bip-0.7.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bip/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 May 2008 19:06:21 -0000 1.2 +++ sources 8 Jul 2008 10:27:56 -0000 1.3 @@ -1 +1 @@ -5c16e1a72ee9b59f1ffe5c1313a51077 bip-0.7.2.tar.gz +8d665d6858506d005391f333e3c11af3 bip-0.7.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 10:29:34 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 8 Jul 2008 10:29:34 GMT Subject: rpms/gtksourceview-sharp/devel import.log, NONE, 1.1 gtksourceview-sharp.spec, 1.19, 1.20 Message-ID: <200807081029.m68ATYpV012671@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/gtksourceview-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12618/devel Modified Files: gtksourceview-sharp.spec Added Files: import.log Log Message: Rebuild --- NEW FILE import.log --- gtksourceview-sharp-2_0_12-2_fc10:HEAD:gtksourceview-sharp-2.0.12-2.fc10.src.rpm:1215512860 Index: gtksourceview-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gtksourceview-sharp.spec 4 Jun 2008 17:25:32 -0000 1.19 +++ gtksourceview-sharp.spec 8 Jul 2008 10:28:45 -0000 1.20 @@ -4,8 +4,8 @@ Summary: A C sharp binder for gtksourceview Name: gtksourceview-sharp Version: 2.0.12 -Release: 3%{?dist} -License: LGPLv2+ +Release: 2%{?dist} +License: LGPL Group: System Environment/Libraries Source0: http://go-mono.com/sources-latest/%{name}-%{extra}.tar.bz2 Patch0: gtksourceview-sharp-libdir.patch @@ -13,7 +13,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-data, mono-devel, gtk-sharp2-devel, gtksourceview-devel, gtk-sharp2-gapi, gecko-sharp2, pkgconfig, monodoc-devel BuildRequires: gtk-sharp2-devel gnome-sharp-devel autoconf libtool automake -Requires: gtksourceview +Requires: gtksourceview2 ExcludeArch : ppc64 @@ -60,12 +60,9 @@ %{__rm} -rf %{buildroot} %changelog -* Wed Jun 4 2008 Tom "spot" Callaway - 2.0.12-3 -- fix deps (uses gtksourceview1, not 2) - -* Wed Jun 4 2008 Tom "spot" Callaway - 2.0.12-2 -- rebuild against new mono bits -- fix license tag +* Mon Jul 07 2008 Paul F. Johnson - 2.0-0.12-2 +- rebuild for new gnome-sharp +- fix BR to use gtksourceview rather than gtksourceview-2 * Fri May 30 2008 Paul F. Johnson - 2.0-0.12-1.1 - rebuild for new gtk-sharp2 From fedora-extras-commits at redhat.com Tue Jul 8 10:31:36 2008 From: fedora-extras-commits at redhat.com (Lorenzo Villani (arbiter)) Date: Tue, 8 Jul 2008 10:31:36 GMT Subject: rpms/bip/EL-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200807081031.m68AVaOV012935@cvs-int.fedora.redhat.com> Author: arbiter Update of /cvs/pkgs/rpms/bip/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12844 Modified Files: .cvsignore sources Log Message: * bumped to 0.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bip/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 May 2008 19:09:19 -0000 1.2 +++ .cvsignore 8 Jul 2008 10:30:51 -0000 1.3 @@ -1 +1 @@ -bip-0.7.2.tar.gz +bip-0.7.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bip/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 May 2008 19:09:19 -0000 1.2 +++ sources 8 Jul 2008 10:30:51 -0000 1.3 @@ -1 +1 @@ -5c16e1a72ee9b59f1ffe5c1313a51077 bip-0.7.2.tar.gz +8d665d6858506d005391f333e3c11af3 bip-0.7.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 10:36:25 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 8 Jul 2008 10:36:25 GMT Subject: rpms/monodevelop/devel import.log, NONE, 1.1 monodevelop-1.9-configure.patch, NONE, 1.1 monodevelop-1.9-use-system-cecil.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 monodevelop-0.19-use-system-Mono.Cecil.patch, 1.1, 1.2 monodevelop-libdir.patch, 1.4, 1.5 monodevelop.spec, 1.29, 1.30 sources, 1.9, 1.10 Message-ID: <200807081036.m68AaPRQ013305@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/monodevelop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13194/devel Modified Files: .cvsignore monodevelop-0.19-use-system-Mono.Cecil.patch monodevelop-libdir.patch monodevelop.spec sources Added Files: import.log monodevelop-1.9-configure.patch monodevelop-1.9-use-system-cecil.patch Log Message: Bump to the first beta for MD2 - lots of changes, most for the better! --- NEW FILE import.log --- monodevelop-1_9-1_fc10:HEAD:monodevelop-1.9-1.fc10.src.rpm:1215513265 monodevelop-1.9-configure.patch: --- NEW FILE monodevelop-1.9-configure.patch --- --- monodevelop-1.9/configure 2008-07-07 13:23:30.000000000 +0100 +++ monodevelop-1.9/configure-new 2008-07-07 13:26:34.000000000 +0100 @@ -4911,7 +4911,7 @@ { (exit 1); exit 1; }; } fi -ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile contrib/Makefile contrib/Mono.Cecil/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/Mono.Debugging/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.! Startup/AssemblyInfo.cs src/core/MonoDevelop.Startup/Makefile src/tools/Makefile src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefil! e src/addins/MonoDevelop.GtkCore/lib/Makefile src/addins/AspNe! tAddIn/M akefile src/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDevelop.DesignerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile src/addins/WindowsPlatform/Makefile src/addins/MonoDevelop.AssemblyBrowser/Makefile src/addins/Mono.Texteditor/Makefile src/addins/MonoDevelop.SourceEditor2/Makefile src/addins/MonoDevelop.Moonlight/Makefile src/addins/MonoDevelop.XmlEditor/Makefile src/addins/MonoDevelop.CodeMetrics/Makefile src/addins/MonoDevelop.Debugger/Makefile tests/Makefile tests/UnitTests/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile" +ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/MonoDevelop.Startup/Makefile src/tools/Makefi! le src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/lib/Makefile src/addins/AspNetAddIn/Makefile ! src/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDevel! op.Desig nerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- monodevelop-1.9/monodevelop.pc.in 2008-06-30 18:36:01.000000000 +0100 +++ monodevelop-1.9/monodevelop.pc.in-new 2008-07-07 13:36:11.000000000 +0100 @@ -1,8 +1,8 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib/monodevelop +libdir=@libdir@/monodevelop Name: MonoDevelop Description: Free .NET Development Environment Version: @VERSION@ -Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll -r:${libdir}/bin/Mono.TextEditor.dll -r:${libdir}/bin/Mono.Debugging.dll +Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll --- monodevelop-1.9/Makefile.am 2008-06-30 18:36:01.000000000 +0100 +++ monodevelop-1.9/Makefile-new.am 2008-07-07 13:32:57.000000000 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = contrib src build po man theme-icons tests +SUBDIRS = src build po man theme-icons bin_SCRIPTS = monodevelop mdtool @@ -12,7 +12,7 @@ pkgconfig_in_files = monodevelop.pc.in monodevelop-core-addins.pc.in -pkgconfigdir= $(prefix)/lib/pkgconfig +pkgconfigdir= $(libdir)/pkgconfig pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc) if ENABLE_UPDATE_MIMEDB --- monodevelop-1.9/Makefile.in 2008-07-07 13:23:30.000000000 +0100 +++ monodevelop-1.9/Makefile-new.in 2008-07-07 13:34:10.000000000 +0100 @@ -208,7 +208,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = contrib src build po man theme-icons tests +SUBDIRS = src build po man theme-icons bin_SCRIPTS = monodevelop mdtool desktopdir = $(datadir)/applications desktop_DATA = monodevelop.desktop monodevelop-1.9-use-system-cecil.patch: --- NEW FILE monodevelop-1.9-use-system-cecil.patch --- --- monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.in 2008-07-07 14:11:36.000000000 +0100 +++ monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile-new.in 2008-07-07 14:20:21.000000000 +0100 @@ -181,7 +181,7 @@ $(GLIB_SHARP_LIBS) \ $(GTK_SHARP_LIBS) \ $(MONO_ADDINS_LIBS) \ - -r:$(top_builddir)/build/bin/Mono.Cecil.dll \ + -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \ --- monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.am 2008-06-30 18:33:32.000000000 +0100 +++ monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile-new.am 2008-07-08 10:41:37.000000000 +0100 @@ -5,7 +5,7 @@ $(GLIB_SHARP_LIBS) \ $(GTK_SHARP_LIBS) \ $(MONO_ADDINS_LIBS) \ - -r:$(top_builddir)/build/bin/Mono.Cecil.dll \ + -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \ --- monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am 2008-06-30 18:34:11.000000000 +0100 +++ monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.am 2008-07-08 10:54:23.000000000 +0100 @@ -41,7 +41,7 @@ REFS = \ $(GLIB_SHARP_LIBS) \ $(GTK_SHARP_LIBS) \ - -r:$(top_builddir)/build/bin/Mono.Cecil.dll \ + -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \ --- monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in 2008-07-08 10:45:54.000000000 +0100 +++ monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.in 2008-07-08 10:53:43.000000000 +0100 @@ -216,7 +216,7 @@ REFS = \ $(GLIB_SHARP_LIBS) \ $(GTK_SHARP_LIBS) \ - -r:$(top_builddir)/build/bin/Mono.Cecil.dll \ + -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 Apr 2008 08:50:33 -0000 1.9 +++ .cvsignore 8 Jul 2008 10:35:29 -0000 1.10 @@ -1 +1 @@ -monodevelop-1.0.tar.bz2 +monodevelop-1.9.tar.bz2 monodevelop-0.19-use-system-Mono.Cecil.patch: Index: monodevelop-0.19-use-system-Mono.Cecil.patch =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-0.19-use-system-Mono.Cecil.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- monodevelop-0.19-use-system-Mono.Cecil.patch 11 Apr 2008 19:34:59 -0000 1.1 +++ monodevelop-0.19-use-system-Mono.Cecil.patch 8 Jul 2008 10:35:29 -0000 1.2 @@ -1,54 +1,3 @@ -diff -up monodevelop-0.19/configure.use-system-Mono.Cecil monodevelop-0.19/configure ---- monodevelop-0.19/configure.use-system-Mono.Cecil 2008-04-11 14:11:37.000000000 -0400 -+++ monodevelop-0.19/configure 2008-04-11 14:11:41.000000000 -0400 -@@ -4742,7 +4742,7 @@ echo "$as_me: error: You must enable one - { (exit 1); exit 1; }; } - fi - --ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile contrib/Makefile contrib/Mono.Cecil/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core! /MonoDevelop.Startup/Makefile src/tools/Makefile src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore! /lib/Makefile src/addins/AspNetAddIn/Makefile src/addins/MonoD! evelop.A utotools/Makefile src/addins/MonoDevelop.DesignerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile" -+ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/MonoDevelop.Startup/Makefile src/tools/Makef! ile src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/lib/Makefile src/addins/AspNetAddIn/Makefile! src/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDeve! lop.Desi gnerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -5415,8 +5415,6 @@ do - "build/data/resources/css/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/css/Makefile" ;; - "build/data/resources/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/Makefile" ;; - "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; -- "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; -- "contrib/Mono.Cecil/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Mono.Cecil/Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;; - "src/core/NRefactory/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/NRefactory/Makefile" ;; -diff -up monodevelop-0.19/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/Makefile.am ---- monodevelop-0.19/Makefile.am.use-system-Mono.Cecil 2008-04-11 14:11:33.000000000 -0400 -+++ monodevelop-0.19/Makefile.am 2008-04-11 14:11:41.000000000 -0400 -@@ -1,4 +1,4 @@ --SUBDIRS = contrib src build po man theme-icons -+SUBDIRS = src build po man theme-icons - - bin_SCRIPTS = monodevelop mdtool - -diff -up monodevelop-0.19/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/Makefile.in ---- monodevelop-0.19/Makefile.in.use-system-Mono.Cecil 2008-04-11 14:11:41.000000000 -0400 -+++ monodevelop-0.19/Makefile.in 2008-04-11 14:11:41.000000000 -0400 -@@ -206,7 +206,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = contrib src build po man theme-icons -+SUBDIRS = src build po man theme-icons - bin_SCRIPTS = monodevelop mdtool - desktopdir = $(datadir)/applications - desktop_DATA = monodevelop.desktop -diff -up monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil monodevelop-0.19/monodevelop.pc.in ---- monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil 2008-04-11 14:11:33.000000000 -0400 -+++ monodevelop-0.19/monodevelop.pc.in 2008-04-11 14:11:41.000000000 -0400 -@@ -5,4 +5,4 @@ libdir=@libdir@/monodevelop - Name: MonoDevelop - Description: Free .NET Development Environment - Version: @VERSION@ --Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll -+Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am --- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil 2008-04-11 14:14:35.000000000 -0400 +++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-04-11 14:14:49.000000000 -0400 monodevelop-libdir.patch: Index: monodevelop-libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-libdir.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monodevelop-libdir.patch 17 Jan 2008 10:18:35 -0000 1.4 +++ monodevelop-libdir.patch 8 Jul 2008 10:35:29 -0000 1.5 @@ -9,31 +9,6 @@ MD_ASSEMBLY_DIR="$MD_DIR/bin" MD_ADDIN_DIR="$MD_DIR/AddIns" ---- monodevelop-0.12/Makefile.am 2006-09-05 20:36:06.000000000 +0100 -+++ monodevelop-0.12/Makefile-new.am 2006-09-06 23:33:26.000000000 +0100 -@@ -15,7 +15,7 @@ - - pkgconfig_in_files = monodevelop.pc.in - --pkgconfigdir= $(prefix)/lib/pkgconfig -+pkgconfigdir= $(libdir)/pkgconfig - pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc) - - if ENABLE_UPDATE_MIMEDB - - - - ---- monodevelop-0.18/monodevelop.pc.in 2007-12-19 14:54:07.000000000 +0000 -+++ monodevelop-0.18/monodevelop-new.pc.in 2007-12-19 14:57:15.000000000 +0000 -@@ -1,6 +1,6 @@ - prefix=@prefix@ - exec_prefix=${prefix} --libdir=${exec_prefix}/lib/monodevelop -+libdir=@libdir@/monodevelop - - Name: MonoDevelop - Description: Free .NET Development Environment --- monodevelop-0.18.1/monodevelop-core-addins.pc.in 2007-12-20 19:05:52.000000000 +0000 +++ monodevelop-0.18.1/monodevelop-core-addins-new.pc.in 2008-01-04 00:03:17.000000000 +0000 @@ -1,6 +1,6 @@ Index: monodevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- monodevelop.spec 7 Jul 2008 19:12:01 -0000 1.29 +++ monodevelop.spec 8 Jul 2008 10:35:29 -0000 1.30 @@ -7,8 +7,8 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop -Version: 1.0 -Release: 7%{?dist} +Version: 1.9 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2 @@ -17,6 +17,8 @@ Patch1: monodevelop-config.patch Patch2: monodevelop-0.19-use-system-Mono.Cecil.patch Patch3: mdtool.patch +Patch4: monodevelop-1.9-configure.patch +Patch5: monodevelop-1.9-use-system-cecil.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2-devel, intltool, gettext-devel, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview2-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel mono-core @@ -25,17 +27,16 @@ BuildRequires: boo-devel Requires: boo %endif -%if 0%{?fedora} > 8 +%if "%{?fedora}" > "8" BuildRequires: mono-addins-devel Requires: mono-addins %endif -Requires: mono-core, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi, gnome-sharp, firefox > 1.99, xsp, subversion, mono-data-sqlite +Requires: mono-core, monodoc, gecko-sharp2, gtksourceview2-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi, gnome-sharp, firefox > 1.99, xsp, subversion, mono-data-sqlite Requires: mono-tools # ikvm doesn't build from source at the moment. If it does at some point in the future, uncomment this line. # Requires: ikvm - +ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha # Sorry ppc/ppc64. No mono-nunit22 (because of no nant) means no monodevelop. -excludearch: ppc64 ppc %description This package provides MonoDevelop, a full-featured IDE for Mono @@ -57,9 +58,15 @@ sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH3} %patch3 -p1 -b .orig sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH3} -autoreconf -f -i -s %patch1 -p1 -b .orig +%patch4 -p1 -b .configure + +# rebuild conffiles +autoreconf -f -i -s + %patch2 -p1 -b .use-system-Mono.Cecil +%patch5 -p1 -b .use-system-mono-1.9 + # Here is where we replace the LONGCECILSTRING LONGCECILMDBSTRING placeholders with the actual # values for the Mono.Cecil and Mono.Cecil.Mdb ver__token sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/lib/Makefile.am @@ -69,9 +76,14 @@ sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/Makefile.in sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/core/MonoDevelop.Projects/Makefile.am sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/core/MonoDevelop.Projects/Makefile.in +sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.DesignerSupport/Makefile.in +sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.DesignerSupport/Makefile.am +sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.AssemblyBrowser/Makefile.in +sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.AssemblyBrowser/Makefile.am sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' src/core/MonoDevelop.Projects/Makefile.am sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' src/core/MonoDevelop.Projects/Makefile.in -#delete prebuilt nunit + +##delete prebuilt nunit rm -rf src/addins/NUnit/lib/* # Now, copy our built from source nunit. We'd really prefer it just used the system nunit bits # but monodevelop is really stubborn. @@ -79,7 +91,7 @@ cp %{_libdir}/mono/nunit22/nunit.framework.dll src/addins/NUnit/lib/ %build -%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2 +%configure --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2 --enable-monoextensions make # no smp flags as it falls over during the build (race condition) @@ -128,6 +140,9 @@ %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/mime/generic-icons +%{_datadir}/mime/globs2 +%{_datadir}/mime/icons %files devel %defattr(-,root,root,-) @@ -137,8 +152,11 @@ %{__rm} -rf %{buildroot} %changelog -* Mon Jul 7 2008 Tom "spot" Callaway 1.0-7 -- fix conditional comparison +* Mon Jul 07 2008 Paul F. Johnson 1.9-1 +- bump to latest beta for md2 +- fixes to patch files for mono.cecil +- fix the archs to be mono package happy +- spec file fixes * Tue May 06 2008 Paul F. Johnson 1.0-6 - added br mono-tools Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Apr 2008 08:50:33 -0000 1.9 +++ sources 8 Jul 2008 10:35:29 -0000 1.10 @@ -1 +1 @@ -537e8a1d11d59714f955b95f86ac479b monodevelop-1.0.tar.bz2 +9e2b52ad41101f1e56dee8200b181dd5 monodevelop-1.9.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 10:58:14 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 8 Jul 2008 10:58:14 GMT Subject: rpms/smbldap-tools/F-9 smbldap-tools-0.9.5-chown.patch, NONE, 1.1 smbldap-tools-0.9.5-config.patch, NONE, 1.1 smbldap-tools-0.9.5-utf-8.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 smbldap-tools.spec, 1.7, 1.8 sources, 1.4, 1.5 smbldap-tools-0.9.4-config.patch, 1.1, NONE Message-ID: <200807081058.m68AwECN014337@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/smbldap-tools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14247 Modified Files: .cvsignore smbldap-tools.spec sources Added Files: smbldap-tools-0.9.5-chown.patch smbldap-tools-0.9.5-config.patch smbldap-tools-0.9.5-utf-8.patch Removed Files: smbldap-tools-0.9.4-config.patch Log Message: * Thu May 22 2008 Paul Howarth 0.9.5-2 - assume the user's locale uses UTF-8 rather than ISO-8859-1 (#441833) - set ownership of home directory created by smbldap-useradd -m using UID number rather than username so that delays in LDAP replication don't affect the operation (#447758) * Wed Apr 23 2008 Paul Howarth 0.9.5-1 - update to 0.9.5 - update config patch smbldap-tools-0.9.5-chown.patch: --- NEW FILE smbldap-tools-0.9.5-chown.patch --- --- smbldap-tools-0.9.5/smbldap-useradd 2008-04-22 09:13:29.000000000 +0100 +++ smbldap-tools-0.9.5/smbldap-useradd 2008-05-23 11:26:00.000000000 +0100 @@ -467,7 +467,7 @@ system "mkdir $userHomeDirectory 2>/dev/null"; } system -"chown -R $userName:$userGidNumber $userHomeDirectory 2>/dev/null"; +"chown -R $userUidNumber:$userGidNumber $userHomeDirectory 2>/dev/null"; if ( defined $config{userHomeDirectoryMode} ) { system "chmod $config{userHomeDirectoryMode} $userHomeDirectory 2>/dev/null"; smbldap-tools-0.9.5-config.patch: --- NEW FILE smbldap-tools-0.9.5-config.patch --- --- smbldap-tools-0.9.5/smbldap.conf 2008-04-22 09:13:29.000000000 +0100 +++ smbldap-tools-0.9.5/smbldap.conf 2008-04-23 17:00:18.000000000 +0100 @@ -34,12 +34,12 @@ # Put your own SID. To obtain this number do: "net getlocalsid". # If not defined, parameter is taking from "net getlocalsid" return -SID="S-1-5-21-2252255531-4061614174-2474224977" +#SID="S-1-5-21-2252255531-4061614174-2474224977" # Domain name the Samba server is in charged. # If not defined, parameter is taking from smb.conf configuration file # Ex: sambaDomain="IDEALX-NT" -sambaDomain="DOMSMB" +#sambaDomain="DOMSMB" ############################################################################## # @@ -71,7 +71,6 @@ # Master LDAP port # If not defined, parameter is set to "389" -#masterPort="389" masterPort="389" # Use TLS for LDAP @@ -92,15 +91,15 @@ # CA certificate # see "man Net::LDAP" in start_tls section for more details -cafile="/etc/smbldap-tools/ca.pem" +cafile="/etc/pki/tls/certs/ldapserverca.pem" # certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientcert="/etc/smbldap-tools/smbldap-tools.iallanis.info.pem" +clientcert="/etc/pki/tls/certs/ldapclient.pem" # key certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientkey="/etc/smbldap-tools/smbldap-tools.iallanis.info.key" +clientkey="/etc/pki/tls/certs/ldapclientkey.pem" # LDAP Suffix # Ex: suffix=dc=IDEALX,dc=ORG @@ -109,7 +108,7 @@ # Where are stored Users # Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for usersdn -usersdn="ou=Users,${suffix}" +usersdn="ou=People,${suffix}" # Where are stored Computers # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG" @@ -119,10 +118,10 @@ # Where are stored Groups # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn -groupsdn="ou=Groups,${suffix}" +groupsdn="ou=Group,${suffix}" # Where are stored Idmap entries (used if samba is a domain member server) -# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG" +# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn idmapdn="ou=Idmap,${suffix}" smbldap-tools-0.9.5-utf-8.patch: --- NEW FILE smbldap-tools-0.9.5-utf-8.patch --- --- smbldap-tools-0.9.5/smbldap_tools.pm 2008-05-22 12:18:05.000000000 +0100 +++ smbldap-tools-0.9.5/smbldap_tools.pm 2008-05-22 15:50:58.000000000 +0100 @@ -826,7 +826,7 @@ foreach my $attr ( $entry->attributes ) { my @vals = $entry->get_value($attr); foreach my $val (@vals) { - $val = "**UNPRINTABLE**" if ( $val =~ /[^[:print:]]/ ); + $val = "**UNPRINTABLE**" if ( $val =~ /\P{IsPrint}/ ); } $lines .= $attr . ": " . join( ',', @vals ) . "\n"; } @@ -854,7 +854,7 @@ foreach my $attr ( $entry->attributes ) { my @vals = $entry->get_value($attr); foreach my $val (@vals) { - $val = "**UNPRINTABLE**" if ( $val =~ /[^[:print:]]/ ); + $val = "**UNPRINTABLE**" if ( $val =~ /\P{IsPrint}/ ); } if ( $attr eq "sambaPwdLastSet" or $attr eq "sambaPwdCanChange" @@ -1213,7 +1213,7 @@ return to_utf8( -string => $arg, - -charset => 'ISO-8859-1', + -charset => 'UTF8', ); } @@ -1222,7 +1222,7 @@ return from_utf8( -string => $arg, - -charset => 'ISO-8859-1', + -charset => 'UTF8', ); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Sep 2007 15:05:32 -0000 1.4 +++ .cvsignore 8 Jul 2008 10:57:24 -0000 1.5 @@ -1 +1 @@ -smbldap-tools-0.9.4.tgz +smbldap-tools-0.9.5.tgz Index: smbldap-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/F-9/smbldap-tools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- smbldap-tools.spec 7 Mar 2008 02:22:39 -0000 1.7 +++ smbldap-tools.spec 8 Jul 2008 10:57:24 -0000 1.8 @@ -1,12 +1,14 @@ Summary: User and group administration tools for Samba/OpenLDAP Name: smbldap-tools -Version: 0.9.4 +Version: 0.9.5 Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: https://gna.org/projects/smbldap-tools/ Source0: http://download.gna.org/smbldap-tools/packages/smbldap-tools-%{version}.tgz -Patch0: smbldap-tools-0.9.4-config.patch +Patch0: smbldap-tools-0.9.5-config.patch +Patch1: smbldap-tools-0.9.5-utf-8.patch +Patch2: smbldap-tools-0.9.5-chown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openldap-clients, samba, perl(IO::Socket::SSL) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -24,7 +26,9 @@ %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g; s|/opt/IDEALX||g;' \ smbldap_tools.pm configure.pl -%patch0 -p0 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Don't want these in %{_sbindir}... %{__mv} smbldap-tools.spec original-smbldap-tools.spec @@ -86,8 +90,18 @@ %{_mandir}/man8/* %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 0.9.4-2 -Rebuild for new perl +* Thu May 22 2008 Paul Howarth 0.9.5-2 +- assume the user's locale uses UTF-8 rather than ISO-8859-1 (#441833) +- set ownership of home directory created by smbldap-useradd -m using UID + number rather than username so that delays in LDAP replication don't + affect the operation (#447758) + +* Wed Apr 23 2008 Paul Howarth 0.9.5-1 +- update to 0.9.5 +- update config patch + +* Thu Mar 6 2008 Tom "spot" Callaway 0.9.4-2 +- rebuild for new perl * Wed Sep 26 2007 Paul Howarth 0.9.4-1 - update to 0.9.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Sep 2007 15:05:32 -0000 1.4 +++ sources 8 Jul 2008 10:57:24 -0000 1.5 @@ -1 +1 @@ -5c9a71336fcb1af06c5766ab88e50a03 smbldap-tools-0.9.4.tgz +2a9a84c657af35b9c9734a5b1bc5fe8f smbldap-tools-0.9.5.tgz --- smbldap-tools-0.9.4-config.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 8 11:06:43 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 8 Jul 2008 11:06:43 GMT Subject: rpms/smbldap-tools/F-8 smbldap-tools-0.9.5-chown.patch, NONE, 1.1 smbldap-tools-0.9.5-config.patch, NONE, 1.1 smbldap-tools-0.9.5-utf-8.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 smbldap-tools.spec, 1.6, 1.7 sources, 1.4, 1.5 smbldap-tools-0.9.4-config.patch, 1.1, NONE Message-ID: <200807081106.m68B6huR021362@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/smbldap-tools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21245 Modified Files: .cvsignore smbldap-tools.spec sources Added Files: smbldap-tools-0.9.5-chown.patch smbldap-tools-0.9.5-config.patch smbldap-tools-0.9.5-utf-8.patch Removed Files: smbldap-tools-0.9.4-config.patch Log Message: * Thu May 22 2008 Paul Howarth 0.9.5-2 - assume the user's locale uses UTF-8 rather than ISO-8859-1 (#441833) - set ownership of home directory created by smbldap-useradd -m using UID number rather than username so that delays in LDAP replication don't affect the operation (#447758) * Wed Apr 23 2008 Paul Howarth 0.9.5-1 - update to 0.9.5 - update config patch smbldap-tools-0.9.5-chown.patch: --- NEW FILE smbldap-tools-0.9.5-chown.patch --- --- smbldap-tools-0.9.5/smbldap-useradd 2008-04-22 09:13:29.000000000 +0100 +++ smbldap-tools-0.9.5/smbldap-useradd 2008-05-23 11:26:00.000000000 +0100 @@ -467,7 +467,7 @@ system "mkdir $userHomeDirectory 2>/dev/null"; } system -"chown -R $userName:$userGidNumber $userHomeDirectory 2>/dev/null"; +"chown -R $userUidNumber:$userGidNumber $userHomeDirectory 2>/dev/null"; if ( defined $config{userHomeDirectoryMode} ) { system "chmod $config{userHomeDirectoryMode} $userHomeDirectory 2>/dev/null"; smbldap-tools-0.9.5-config.patch: --- NEW FILE smbldap-tools-0.9.5-config.patch --- --- smbldap-tools-0.9.5/smbldap.conf 2008-04-22 09:13:29.000000000 +0100 +++ smbldap-tools-0.9.5/smbldap.conf 2008-04-23 17:00:18.000000000 +0100 @@ -34,12 +34,12 @@ # Put your own SID. To obtain this number do: "net getlocalsid". # If not defined, parameter is taking from "net getlocalsid" return -SID="S-1-5-21-2252255531-4061614174-2474224977" +#SID="S-1-5-21-2252255531-4061614174-2474224977" # Domain name the Samba server is in charged. # If not defined, parameter is taking from smb.conf configuration file # Ex: sambaDomain="IDEALX-NT" -sambaDomain="DOMSMB" +#sambaDomain="DOMSMB" ############################################################################## # @@ -71,7 +71,6 @@ # Master LDAP port # If not defined, parameter is set to "389" -#masterPort="389" masterPort="389" # Use TLS for LDAP @@ -92,15 +91,15 @@ # CA certificate # see "man Net::LDAP" in start_tls section for more details -cafile="/etc/smbldap-tools/ca.pem" +cafile="/etc/pki/tls/certs/ldapserverca.pem" # certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientcert="/etc/smbldap-tools/smbldap-tools.iallanis.info.pem" +clientcert="/etc/pki/tls/certs/ldapclient.pem" # key certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientkey="/etc/smbldap-tools/smbldap-tools.iallanis.info.key" +clientkey="/etc/pki/tls/certs/ldapclientkey.pem" # LDAP Suffix # Ex: suffix=dc=IDEALX,dc=ORG @@ -109,7 +108,7 @@ # Where are stored Users # Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for usersdn -usersdn="ou=Users,${suffix}" +usersdn="ou=People,${suffix}" # Where are stored Computers # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG" @@ -119,10 +118,10 @@ # Where are stored Groups # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn -groupsdn="ou=Groups,${suffix}" +groupsdn="ou=Group,${suffix}" # Where are stored Idmap entries (used if samba is a domain member server) -# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG" +# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn idmapdn="ou=Idmap,${suffix}" smbldap-tools-0.9.5-utf-8.patch: --- NEW FILE smbldap-tools-0.9.5-utf-8.patch --- --- smbldap-tools-0.9.5/smbldap_tools.pm 2008-05-22 12:18:05.000000000 +0100 +++ smbldap-tools-0.9.5/smbldap_tools.pm 2008-05-22 15:50:58.000000000 +0100 @@ -826,7 +826,7 @@ foreach my $attr ( $entry->attributes ) { my @vals = $entry->get_value($attr); foreach my $val (@vals) { - $val = "**UNPRINTABLE**" if ( $val =~ /[^[:print:]]/ ); + $val = "**UNPRINTABLE**" if ( $val =~ /\P{IsPrint}/ ); } $lines .= $attr . ": " . join( ',', @vals ) . "\n"; } @@ -854,7 +854,7 @@ foreach my $attr ( $entry->attributes ) { my @vals = $entry->get_value($attr); foreach my $val (@vals) { - $val = "**UNPRINTABLE**" if ( $val =~ /[^[:print:]]/ ); + $val = "**UNPRINTABLE**" if ( $val =~ /\P{IsPrint}/ ); } if ( $attr eq "sambaPwdLastSet" or $attr eq "sambaPwdCanChange" @@ -1213,7 +1213,7 @@ return to_utf8( -string => $arg, - -charset => 'ISO-8859-1', + -charset => 'UTF8', ); } @@ -1222,7 +1222,7 @@ return from_utf8( -string => $arg, - -charset => 'ISO-8859-1', + -charset => 'UTF8', ); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Sep 2007 15:05:32 -0000 1.4 +++ .cvsignore 8 Jul 2008 11:05:40 -0000 1.5 @@ -1 +1 @@ -smbldap-tools-0.9.4.tgz +smbldap-tools-0.9.5.tgz Index: smbldap-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/F-8/smbldap-tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- smbldap-tools.spec 26 Sep 2007 15:05:32 -0000 1.6 +++ smbldap-tools.spec 8 Jul 2008 11:05:40 -0000 1.7 @@ -1,12 +1,14 @@ Summary: User and group administration tools for Samba/OpenLDAP Name: smbldap-tools -Version: 0.9.4 -Release: 1%{?dist} +Version: 0.9.5 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: https://gna.org/projects/smbldap-tools/ Source0: http://download.gna.org/smbldap-tools/packages/smbldap-tools-%{version}.tgz -Patch0: smbldap-tools-0.9.4-config.patch +Patch0: smbldap-tools-0.9.5-config.patch +Patch1: smbldap-tools-0.9.5-utf-8.patch +Patch2: smbldap-tools-0.9.5-chown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openldap-clients, samba, perl(IO::Socket::SSL) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -24,7 +26,9 @@ %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g; s|/opt/IDEALX||g;' \ smbldap_tools.pm configure.pl -%patch0 -p0 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Don't want these in %{_sbindir}... %{__mv} smbldap-tools.spec original-smbldap-tools.spec @@ -86,6 +90,19 @@ %{_mandir}/man8/* %changelog +* Thu May 22 2008 Paul Howarth 0.9.5-2 +- assume the user's locale uses UTF-8 rather than ISO-8859-1 (#441833) +- set ownership of home directory created by smbldap-useradd -m using UID + number rather than username so that delays in LDAP replication don't + affect the operation (#447758) + +* Wed Apr 23 2008 Paul Howarth 0.9.5-1 +- update to 0.9.5 +- update config patch + +* Thu Mar 6 2008 Tom "spot" Callaway 0.9.4-2 +- rebuild for new perl + * Wed Sep 26 2007 Paul Howarth 0.9.4-1 - update to 0.9.4 - new upstream, new URLs Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Sep 2007 15:05:32 -0000 1.4 +++ sources 8 Jul 2008 11:05:40 -0000 1.5 @@ -1 +1 @@ -5c9a71336fcb1af06c5766ab88e50a03 smbldap-tools-0.9.4.tgz +2a9a84c657af35b9c9734a5b1bc5fe8f smbldap-tools-0.9.5.tgz --- smbldap-tools-0.9.4-config.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 8 11:20:23 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 8 Jul 2008 11:20:23 GMT Subject: rpms/mono-tools/devel import.log,NONE,1.1 mono-tools.spec,1.3,1.4 Message-ID: <200807081120.m68BKN0k022282@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/mono-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22224/devel Modified Files: mono-tools.spec Added Files: import.log Log Message: Rebuild --- NEW FILE import.log --- mono-tools-1_9-3_1_fc10:HEAD:mono-tools-1.9-3.1.fc10.src.rpm:1215515928 Index: mono-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mono-tools.spec 3 Jun 2008 10:47:06 -0000 1.3 +++ mono-tools.spec 8 Jul 2008 11:19:33 -0000 1.4 @@ -5,7 +5,7 @@ Summary: The mono documentation system Name: mono-tools Version: 1.9 -Release: 3%{?dist} +Release: 3.1%{?dist} License: GPLv2 Group: Development/Tools Patch0: mono-tools.patch @@ -94,6 +94,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jul 07 2008 Paul F. Johnson 1.9-3.1 +- rebuild + * Tue Jun 03 2008 Paul F. Johnson 1.9-3 - added BR desktop-file-utils From fedora-extras-commits at redhat.com Tue Jul 8 11:24:26 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Tue, 8 Jul 2008 11:24:26 GMT Subject: rpms/xqf/devel import.log, NONE, 1.1 xqf.desktop, NONE, 1.1 xqf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807081124.m68BOQbu022818@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/xqf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22572/devel Modified Files: .cvsignore sources Added Files: import.log xqf.desktop xqf.spec Log Message: Initial commit --- NEW FILE import.log --- xqf-1_0_5-4_fc9:HEAD:xqf-1.0.5-4.fc9.src.rpm:1215516144 --- NEW FILE xqf.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XQF Comment=Locate and connect to game servers Exec=xqf Icon=xqf Type=Application Categories=GTK;Game;ActionGame; --- NEW FILE xqf.spec --- Name: xqf Version: 1.0.5 Release: 4%{?dist} Summary: A server browser for many popular games Group: Amusements/Games License: GPLv2+ URL: http://www.linuxgames.com/xqf/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: qstat BuildRequires: GeoIP-devel qstat gdk-pixbuf-devel glib-devel glibc-devel gettext BuildRequires: gtk2-devel intltool perl-XML-Parser desktop-file-utils zlib-devel BuildRequires: readline-devel %description XQF is a game server browser and launcher for Unix/X11 for many popular games such as the Quake series, Unreal Tournament series, Half-Life etc. XQF is a front-end to QStat, a program by Steve Jankowski and uses the GTK+ toolkit. %prep %setup -q %build %configure \ --enable-geoip \ --enable-bzip2 \ --enable-externalrcon \ --enable-gtk2 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # the desktop file desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} # removing extraneous .desktop file rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # the icon stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 0644 pixmaps/%{name}_32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/%{name} %{_bindir}/%{name}-rcon %{_datadir}/pixmaps/%{name}_*.png %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.* %changelog * Wed Jun 18 2008 Stefan Posdzich - 1.0.5-4 - Add new .desktop file source - Remove BuildRequires: gtk+-devel, glib2-devel - Remove desktop-file-install --remove-category=X-SuSE-Core-Game and {name}.desktop * Mon Jun 16 2008 Stefan Posdzich - 1.0.5-3 - Add --enable-bzip2 for bzip2 data compression - Add --enable-externalrco (Remote server administration tool) - Add BuildRequires: readline-devel - Add correct url for Source: - Add gtk-update-icon-cache * Sun Jun 15 2008 Stefan Posdzich - 1.0.5-2 - Add desktop-file-install for the .desktop file - Add BuildRequires: GeoIP-devel, qstat - Remove the dummy libGeoIP.so - Remove Requires: GeoIP * Fri Jun 13 2008 Stefan Posdzich - 1.0.5-1 - Initial SPEC file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xqf/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2008 18:57:08 -0000 1.1 +++ .cvsignore 8 Jul 2008 11:23:43 -0000 1.2 @@ -0,0 +1 @@ +xqf-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xqf/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 18:57:08 -0000 1.1 +++ sources 8 Jul 2008 11:23:43 -0000 1.2 @@ -0,0 +1 @@ +a88cecba6abb6349107ab135f1009946 xqf-1.0.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 11:37:22 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Tue, 8 Jul 2008 11:37:22 GMT Subject: rpms/tzdata/devel .cvsignore, 1.44, 1.45 sources, 1.48, 1.49 tzdata.spec, 1.65, 1.66 Message-ID: <200807081137.m68BbMCl024152@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/tzdata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24044 Modified Files: .cvsignore sources tzdata.spec Log Message: - Upstream 2008d - Changes for Brazil and Mauritius Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 30 May 2008 10:33:14 -0000 1.44 +++ .cvsignore 8 Jul 2008 11:36:24 -0000 1.45 @@ -7,3 +7,4 @@ tzcode2008a.tar.gz tzdata2008b.tar.gz tzdata2008c.tar.gz +tzdata2008d.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 30 May 2008 10:33:14 -0000 1.48 +++ sources 8 Jul 2008 11:36:24 -0000 1.49 @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 4a04c12a8ec50b0a8cfc9ebce96b07d3 tzcode2008a.tar.gz -e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz +f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- tzdata.spec 30 May 2008 10:33:14 -0000 1.65 +++ tzdata.spec 8 Jul 2008 11:36:24 -0000 1.66 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2008c +Version: 2008d %define tzdata_version %{version} %define tzcode_version 2008a Release: 1%{?dist} @@ -107,6 +107,10 @@ %{_datadir}/javazi %changelog +* Tue Jul 8 2008 Petr Machata - 2008d-1 +- Upstream 2008d + - Changes for Brazil and Mauritius + * Wed May 30 2008 Petr Machata - 2008c-1 - Upstream 2008c - Mongolia changes zone From fedora-extras-commits at redhat.com Tue Jul 8 11:37:55 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Tue, 8 Jul 2008 11:37:55 GMT Subject: rpms/tzdata/F-9 .cvsignore, 1.43, 1.44 sources, 1.48, 1.49 tzdata.spec, 1.65, 1.66 Message-ID: <200807081137.m68Bbtq6024214@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/tzdata/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24114 Modified Files: .cvsignore sources tzdata.spec Log Message: - Upstream 2008d - Changes for Brazil and Mauritius Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-9/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 26 Mar 2008 13:31:04 -0000 1.43 +++ .cvsignore 8 Jul 2008 11:37:04 -0000 1.44 @@ -6,3 +6,5 @@ tzcode2007k.tar.gz tzcode2008a.tar.gz tzdata2008b.tar.gz +tzdata2008c.tar.gz +tzdata2008d.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-9/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 30 May 2008 10:43:43 -0000 1.48 +++ sources 8 Jul 2008 11:37:04 -0000 1.49 @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 4a04c12a8ec50b0a8cfc9ebce96b07d3 tzcode2008a.tar.gz -e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz +f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-9/tzdata.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- tzdata.spec 30 May 2008 10:43:43 -0000 1.65 +++ tzdata.spec 8 Jul 2008 11:37:04 -0000 1.66 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2008c +Version: 2008d %define tzdata_version %{version} %define tzcode_version 2008a Release: 1%{?dist} @@ -107,6 +107,10 @@ %{_datadir}/javazi %changelog +* Tue Jul 8 2008 Petr Machata - 2008d-1 +- Upstream 2008d + - Changes for Brazil and Mauritius + * Wed May 30 2008 Petr Machata - 2008c-1 - Upstream 2008c - Mongolia changes zone From fedora-extras-commits at redhat.com Tue Jul 8 11:38:09 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Tue, 8 Jul 2008 11:38:09 GMT Subject: rpms/sugar-presence-service/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sugar-presence-service.spec, 1.4, 1.5 Message-ID: <200807081138.m68Bc9ZM024230@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/sugar-presence-service/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24145 Modified Files: .cvsignore sources sugar-presence-service.spec Log Message: Update to 0.81.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jun 2008 20:20:46 -0000 1.4 +++ .cvsignore 8 Jul 2008 11:37:21 -0000 1.5 @@ -1 +1 @@ -sugar-presence-service-0.81.2.tar.bz2 +sugar-presence-service-0.81.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Jun 2008 20:20:46 -0000 1.4 +++ sources 8 Jul 2008 11:37:21 -0000 1.5 @@ -1 +1 @@ -d17ad9e5d18837c48cdd3c901453f0f4 sugar-presence-service-0.81.2.tar.bz2 +93bfa6c91d3a672d011b737f0e4ff384 sugar-presence-service-0.81.3.tar.bz2 Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sugar-presence-service.spec 20 Jun 2008 20:20:46 -0000 1.4 +++ sugar-presence-service.spec 8 Jul 2008 11:37:21 -0000 1.5 @@ -2,7 +2,7 @@ #%define commitid 76984f3f28 Name: sugar-presence-service -Version: 0.81.2 +Version: 0.81.3 Release: 1%{?dist} Summary: The Sugar presence service @@ -46,6 +46,9 @@ %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service %changelog +* Tue Jul 8 2008 Morgan Collett - 0.81.3-1 +- Update to 0.81.3 + * Fri Jun 20 2008 Morgan Collett - 0.81.2-1 - Update to 0.81.2 From fedora-extras-commits at redhat.com Tue Jul 8 11:38:59 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Tue, 8 Jul 2008 11:38:59 GMT Subject: rpms/tzdata/F-8 .cvsignore, 1.43, 1.44 sources, 1.47, 1.48 tzdata.spec, 1.62, 1.63 Message-ID: <200807081138.m68Bcxqk024320@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/tzdata/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24227 Modified Files: .cvsignore sources tzdata.spec Log Message: - Upstream 2008d - Changes for Brazil and Mauritius Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-8/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 26 Mar 2008 13:30:56 -0000 1.43 +++ .cvsignore 8 Jul 2008 11:38:14 -0000 1.44 @@ -6,3 +6,5 @@ tzcode2007k.tar.gz tzcode2008a.tar.gz tzdata2008b.tar.gz +tzdata2008c.tar.gz +tzdata2008d.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-8/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 30 May 2008 10:48:06 -0000 1.47 +++ sources 8 Jul 2008 11:38:14 -0000 1.48 @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 4a04c12a8ec50b0a8cfc9ebce96b07d3 tzcode2008a.tar.gz -e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz +f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-8/tzdata.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- tzdata.spec 30 May 2008 10:48:06 -0000 1.62 +++ tzdata.spec 8 Jul 2008 11:38:14 -0000 1.63 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2008c +Version: 2008d %define tzdata_version %{version} %define tzcode_version 2008a Release: 1%{?dist} @@ -102,6 +102,10 @@ %{_datadir}/javazi %changelog +* Tue Jul 8 2008 Petr Machata - 2008d-1 +- Upstream 2008d + - Changes for Brazil and Mauritius + * Wed May 30 2008 Petr Machata - 2008c-1 - Upstream 2008c - Mongolia changes zone From fedora-extras-commits at redhat.com Tue Jul 8 11:39:09 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 8 Jul 2008 11:39:09 GMT Subject: rpms/perl-AnyEvent/F-8 perl-AnyEvent.spec,1.1,1.2 Message-ID: <200807081139.m68Bd9nf024325@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24255 Modified Files: perl-AnyEvent.spec Log Message: - Exlude ppc64 on F-8 Index: perl-AnyEvent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/F-8/perl-AnyEvent.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-AnyEvent.spec 4 Jul 2008 22:06:53 -0000 1.1 +++ perl-AnyEvent.spec 8 Jul 2008 11:38:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-AnyEvent Version: 4.161 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Framework for multiple event loops Group: Development/Libraries @@ -9,6 +9,8 @@ Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc64 + BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # Needed for test @@ -75,6 +77,9 @@ %changelog +* Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 4.161-1.1 +- Exlude ppc64 on F-8 + * Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 4.161-1 - Update to 4.161 From fedora-extras-commits at redhat.com Tue Jul 8 11:46:48 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 8 Jul 2008 11:46:48 GMT Subject: rpms/mono-tools/devel import.log,1.1,1.2 mono-tools.spec,1.4,1.5 Message-ID: <200807081146.m68Bkm4m024952@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/mono-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24887/devel Modified Files: import.log mono-tools.spec Log Message: Added BR gnome-desktop-sharp Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2008 11:19:33 -0000 1.1 +++ import.log 8 Jul 2008 11:45:57 -0000 1.2 @@ -1 +1,2 @@ mono-tools-1_9-3_1_fc10:HEAD:mono-tools-1.9-3.1.fc10.src.rpm:1215515928 +mono-tools-1_9-4_fc10:HEAD:mono-tools-1.9-4.fc10.src.rpm:1215517451 Index: mono-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mono-tools.spec 8 Jul 2008 11:19:33 -0000 1.4 +++ mono-tools.spec 8 Jul 2008 11:45:57 -0000 1.5 @@ -1,11 +1,10 @@ %define debug_package %{nil} %define monodir %{_libdir} -ExcludeArch: ppc64 Summary: The mono documentation system Name: mono-tools Version: 1.9 -Release: 3.1%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Development/Tools Patch0: mono-tools.patch @@ -15,9 +14,11 @@ BuildRequires: mono-data, mono-devel, gtk-sharp2-gapi, pkgconfig mono-nunit BuildRequires: monodoc-devel gecko-sharp2-devel gnome-sharp-devel, gettext-devel BuildRequires: gtk-sharp2-devel autoconf automake libtool mono-nunit-devel -BuildRequires: hunspell-devel desktop-file-utils +BuildRequires: hunspell-devel desktop-file-utils gnome-desktop-sharp-devel Requires: mono-core links monodoc +ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha + %description Monotools are a number of tools for mono such as allowing monodoc to be run independantly of monodevelop @@ -94,6 +95,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 08 2008 Paul F. Johnson 1.9-4 +- added br gnome-desktop-sharp +- fix for archs + * Mon Jul 07 2008 Paul F. Johnson 1.9-3.1 - rebuild From fedora-extras-commits at redhat.com Tue Jul 8 11:58:16 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Tue, 8 Jul 2008 11:58:16 GMT Subject: rpms/sugar-presence-service/OLPC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-presence-service.spec, 1.6, 1.7 Message-ID: <200807081158.m68BwGk5025416@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/sugar-presence-service/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25368 Modified Files: .cvsignore sources sugar-presence-service.spec Log Message: Update to 0.81.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/OLPC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Jun 2008 20:32:39 -0000 1.5 +++ .cvsignore 8 Jul 2008 11:57:24 -0000 1.6 @@ -1 +1 @@ -sugar-presence-service-0.81.2.tar.bz2 +sugar-presence-service-0.81.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/OLPC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Jun 2008 20:32:39 -0000 1.5 +++ sources 8 Jul 2008 11:57:24 -0000 1.6 @@ -1 +1 @@ -d17ad9e5d18837c48cdd3c901453f0f4 sugar-presence-service-0.81.2.tar.bz2 +93bfa6c91d3a672d011b737f0e4ff384 sugar-presence-service-0.81.3.tar.bz2 Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/OLPC-3/sugar-presence-service.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sugar-presence-service.spec 25 Jun 2008 10:46:08 -0000 1.6 +++ sugar-presence-service.spec 8 Jul 2008 11:57:24 -0000 1.7 @@ -2,8 +2,8 @@ #%define commitid 76984f3f28 Name: sugar-presence-service -Version: 0.81.2 -Release: 2%{?dist} +Version: 0.81.3 +Release: 1%{?dist} Summary: The Sugar presence service Group: System Environment/Libraries @@ -48,6 +48,9 @@ %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service %changelog +* Tue Jul 8 2008 Morgan Collett - 0.81.3-1 +- Update to 0.81.3 + * Wed Jun 25 2008 Guillaume Desmottes - 0.81.2-2 - Depends on telepathy-salut and telepathy-gabble From fedora-extras-commits at redhat.com Tue Jul 8 11:59:34 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Tue, 8 Jul 2008 11:59:34 GMT Subject: rpms/sugar-presence-service/devel sugar-presence-service.spec, 1.5, 1.6 Message-ID: <200807081159.m68BxYmd025512@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/sugar-presence-service/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25435 Modified Files: sugar-presence-service.spec Log Message: Add depends for telepathy-gabble and telepathy-salut Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sugar-presence-service.spec 8 Jul 2008 11:37:21 -0000 1.5 +++ sugar-presence-service.spec 8 Jul 2008 11:58:44 -0000 1.6 @@ -3,7 +3,7 @@ Name: sugar-presence-service Version: 0.81.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Sugar presence service Group: System Environment/Libraries @@ -20,6 +20,8 @@ Requires: python-telepathy >= 0.14.0 Requires: dbus-python >= 0.82.0 +Requires: telepathy-gabble +Requires: telepathy-salut %description The Sugar presence service. @@ -46,6 +48,9 @@ %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service %changelog +* Tue Jul 8 2008 Morgan Collett - 0.81.3-2 +- Depends on telepathy-salut and telepathy-gabble + * Tue Jul 8 2008 Morgan Collett - 0.81.3-1 - Update to 0.81.3 From fedora-extras-commits at redhat.com Tue Jul 8 12:06:30 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 8 Jul 2008 12:06:30 GMT Subject: rpms/checkpolicy/devel checkpolicy.spec,1.131,1.132 Message-ID: <200807081206.m68C6UKL032463@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/checkpolicy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32394 Modified Files: checkpolicy.spec Log Message: * Mon Jul 7 2006 Dan Walsh - 2.0.16-3 - Rebuild with new libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/extras/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- checkpolicy.spec 28 May 2008 21:41:21 -0000 1.131 +++ checkpolicy.spec 8 Jul 2008 12:05:35 -0000 1.132 @@ -1,8 +1,8 @@ -%define libsepolver 2.0.29-1 +%define libsepolver 2.0.32-1 Summary: SELinux policy compiler Name: checkpolicy Version: 2.0.16 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -53,6 +53,9 @@ %{_bindir}/sedispol %changelog +* Mon Jul 7 2006 Dan Walsh - 2.0.16-3 +- Rebuild with new libsepol + * Wed May 28 2008 Tom "spot" Callaway 2.0.16-2 - fix license tag From fedora-extras-commits at redhat.com Tue Jul 8 12:08:28 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 8 Jul 2008 12:08:28 GMT Subject: rpms/libselinux/devel libselinux.spec,1.332,1.333 Message-ID: <200807081208.m68C8SaA032627@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32553 Modified Files: libselinux.spec Log Message: * Tue Jul 8 2008 Dan Walsh - 2.0.67-3 - Rebuild for new libsepol Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- libselinux.spec 29 Jun 2008 12:31:00 -0000 1.332 +++ libselinux.spec 8 Jul 2008 12:07:38 -0000 1.333 @@ -1,10 +1,10 @@ -%define libsepolver 2.0.18-2 +%define libsepolver 2.0.32-1 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.67 -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -136,6 +136,9 @@ %{python_sitearch}/selinux/* %changelog +* Tue Jul 8 2008 Dan Walsh - 2.0.67-3 +- Rebuild for new libsepol + * Sun Jun 29 2008 Dan Walsh - 2.0.67-2 - Add Karel Zak patch for freecon man page From fedora-extras-commits at redhat.com Tue Jul 8 12:08:50 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 8 Jul 2008 12:08:50 GMT Subject: rpms/checkpolicy/devel checkpolicy.spec,1.132,1.133 Message-ID: <200807081208.m68C8oeL032703@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/checkpolicy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32591 Modified Files: checkpolicy.spec Log Message: * Mon Jul 7 2008 Dan Walsh - 2.0.16-3 - Rebuild with new libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/extras/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- checkpolicy.spec 8 Jul 2008 12:05:35 -0000 1.132 +++ checkpolicy.spec 8 Jul 2008 12:08:04 -0000 1.133 @@ -53,7 +53,7 @@ %{_bindir}/sedispol %changelog -* Mon Jul 7 2006 Dan Walsh - 2.0.16-3 +* Mon Jul 7 2008 Dan Walsh - 2.0.16-3 - Rebuild with new libsepol * Wed May 28 2008 Tom "spot" Callaway 2.0.16-2 From fedora-extras-commits at redhat.com Tue Jul 8 12:19:16 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 12:19:16 GMT Subject: rpms/gyachi/devel .cvsignore, 1.4, 1.5 gyachi.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807081219.m68CJGoX000980@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv850 Modified Files: .cvsignore gyachi.spec sources Log Message: plugin-photo_album obsoletes plugin-photosharing Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2008 15:26:04 -0000 1.4 +++ .cvsignore 8 Jul 2008 12:18:11 -0000 1.5 @@ -1 +1 @@ -gyachi-1.1.35.tar.gz +theme_support.patch Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gyachi.spec 16 Jun 2008 17:58:14 -0000 1.7 +++ gyachi.spec 8 Jul 2008 12:18:11 -0000 1.8 @@ -2,41 +2,58 @@ %define _without_wine 1 %endif -%if 0%{?fc7} +%if 0%{?fc7}%{?el4}%{?el5} %define _without_pulseaudio 1 %endif -Name: gyachi -Version: 1.1.35 -Release: 6%{?dist} -Summary: A Yahoo! chat client with Webcam and voice support +%if 0%{?el4} +%define _without_gpgme 1 +%define _without_libnotify 1 +%endif -Group: Applications/Internet -License: GPLv2 -URL: http://gyachi.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +%if 0%{?rhel} +%define _without_xmms 1 +%endif + +Name: gyachi +Version: 1.1.35 +Release: 13%{?dist} +Summary: A Yahoo! chat client with Webcam and voice support + +Group: Applications/Internet +License: GPLv2 +URL: http://gyachi.sourceforge.net +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Patch0: configure.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: theme_support.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake gawk sed -BuildRequires: expat-devel gettext-devel +BuildRequires: expat-devel gettext-devel BuildRequires: glibc-devel >= 2.2.0 gtkhtml2-devel -BuildRequires: libtool-ltdl-devel -BuildRequires: libXt-devel expat-devel -BuildRequires: gettext-devel gtkhtml2-devel libtool libtool-ltdl-devel +%if 0%{?el4} +BuildRequires: libtool +%else +BuildRequires: libtool libtool-ltdl-devel +%endif +%if 0%{?el4} +BuildRequires: xorg-x11-devel +%else +BuildRequires: libXt-devel +%endif +BuildRequires: gettext-devel gtkhtml2-devel BuildRequires: desktop-file-utils ImageMagick BuildRequires: openssl-devel -BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: gtk2-devel BuildRequires: jasper-devel >= 1.701.0 +Requires: gtk2 #jasper >= 1.701 needed for memory leak fix. -%if 0%{?fc7} +%if 0%{?fc7}%{?el4}%{?el5} Requires: jasper >= 1.701.0 %else Requires: jasper-libs >= 1.701.0 %endif - -Requires: gtk2 >= 2.4.0 Requires: ImageMagick @@ -68,6 +85,7 @@ Blowfish encryption plugin for GyachI +%if 0%{!?_without_gpgme:1} %package plugin-gpgme Summary: GPGMe encryption plugin for GyachI Group: Applications/Internet @@ -76,6 +94,7 @@ %description plugin-gpgme GPGMe encryption plugin for GyachI +%endif %package plugin-mcrypt @@ -93,11 +112,13 @@ Summary: Photo album plugin for GyachI Group: Applications/Internet Requires: %{name} = %{version}-%{release} +Obsoletes: plugin-photosharing %description plugin-photo_album Photo album plugin for GyachI +%if 0%{!?_without_xmms:1} %package plugin-xmms Summary: XMMS plugin for GyachI Group: Applications/Internet @@ -107,8 +128,10 @@ %description plugin-xmms XMMS plugin for GyachI +%endif +%if 0%{!?_without_libnotify:1} %package plugin-libnotify Summary: libnotify popup replacement Group: Applications/Internet @@ -117,13 +140,13 @@ %description plugin-libnotify libnotify plugin for GyachI +%endif %package plugin-alsa Summary: libalsa sound driver Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Buildrequires: libnotify-devel BuildRequires: alsa-lib-devel >= 0.9 Requires: alsa-lib >= 0.9 @@ -136,7 +159,6 @@ Summary: pulseaudio sound driver Group: Applications/Internet Requires: %{name} = %{version}-%{release} - BuildRequires: pulseaudio-libs-devel Requires: pulseaudio-libs @@ -144,11 +166,11 @@ PulseAudio sound driver for gyachi %endif + %package recre8-theme Summary: GyachI Prototype theme Group: Applications/Internet Requires: %{name} = %{version}-%{release} -#BuildArch: noarch %description recre8-theme %{summary} This package supplies the artwork for the GyachI recre8 theme. @@ -163,11 +185,15 @@ ./autogen.sh %configure --disable-rpath --enable-v4l2 \ - --enable-plugin_photo_album \ - --enable-plugin_xmms \ - %{?_without_wine:--disable-wine} \ - %{?_without_pulseaudio:--disable-plugin_pulseaudio} \ - --libexecdir=%{_libexecdir}/gyachi + --libexecdir=%{_libexecdir}/gyachi \ + %{?_without_wine:--disable-wine} \ + %{?_without_gpgme:--disable-plugin_gpgme} \ + %{?_without_pulseaudio:--disable-plugin_pulseaudio} \ + %{?_without_libnotify:--disable-plugin_libnotify} \ + --enable-plugin_photo_album \ + %{!?_without_xmms:--enable-plugin_xmms} + + make %{?_smp_mflags} @@ -211,9 +237,11 @@ %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}blowfish.so +%if 0%{!?_without_gpgme:1} %files plugin-gpgme %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}gpgme.so +%endif %files plugin-mcrypt %defattr(-,root,root,-) @@ -223,13 +251,17 @@ %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}photos.so +%if 0%{!?_without_xmms:1} %files plugin-xmms %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}xmms.so +%endif +%if 0%{!?_without_libnotify:1} %files plugin-libnotify %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}libnotify.so +%endif %files plugin-alsa %defattr(-,root,root,-) @@ -254,6 +286,20 @@ %changelog +* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-13 +- plugin-photo_album obsoletes plugin-photosharing + +* Thu Jun 20 2008 Gregory D Hosler - 1.1.35-12 +- Changed jasper-libs back to jasper for el4/el5 + +* Fri Jun 20 2008 Gregory D Hosler - 1.1.35-8 +- disabled libnotify, gpgme for RHEL4, changed libXt-devel and +- libtool-ltdl-devel for RHEL4 + +* Mon Jun 16 2008 Gregory D Hosler - 1.1.35-7 +- disabled xmms plugin for rhel, pulseaudio for EL4/EL5 +- removed a gnu extension strchrnul in theme_support.c + * Mon Jun 16 2008 Gregory D Hosler - 1.1.35-6 - Made Alsa driver a plugin, added pulseaudio support as a plugin. - Disabled pulseaudio plugin for F7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2008 15:26:04 -0000 1.4 +++ sources 8 Jul 2008 12:18:11 -0000 1.5 @@ -1 +1 @@ -706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz +b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch From fedora-extras-commits at redhat.com Tue Jul 8 12:30:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:30:59 +0000 Subject: [pkgdb] tripwire ownership updated Message-ID: <200807081231.m68CUxS4027913@bastion.fedora.phx.redhat.com> Package tripwire in Fedora devel is now owned by Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tripwire From fedora-extras-commits at redhat.com Tue Jul 8 12:31:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:31:05 +0000 Subject: [pkgdb] tripwire ownership updated Message-ID: <200807081231.m68CV5VK027936@bastion.fedora.phx.redhat.com> Package tripwire in Fedora EPEL 5 is now owned by Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tripwire From fedora-extras-commits at redhat.com Tue Jul 8 12:31:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:31:33 +0000 Subject: [pkgdb] tripwire ownership updated Message-ID: <200807081231.m68CVXxb027970@bastion.fedora.phx.redhat.com> Package tripwire in Fedora 8 is now owned by Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tripwire From fedora-extras-commits at redhat.com Tue Jul 8 12:31:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:31:40 +0000 Subject: [pkgdb] tripwire ownership updated Message-ID: <200807081231.m68CV5VM027936@bastion.fedora.phx.redhat.com> Package tripwire in Fedora 9 is now owned by Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tripwire From fedora-extras-commits at redhat.com Tue Jul 8 12:31:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:31:48 +0000 Subject: [pkgdb] xdms ownership updated Message-ID: <200807081231.m68CV5VN027936@bastion.fedora.phx.redhat.com> Package xdms in Fedora devel is now owned by Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdms From fedora-extras-commits at redhat.com Tue Jul 8 12:31:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:31:53 +0000 Subject: [pkgdb] xdms ownership updated Message-ID: <200807081231.m68CVrXS028043@bastion.fedora.phx.redhat.com> Package xdms in Fedora 8 is now owned by Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdms From fedora-extras-commits at redhat.com Tue Jul 8 12:31:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:31:56 +0000 Subject: [pkgdb] xdms ownership updated Message-ID: <200807081231.m68CVrXU028043@bastion.fedora.phx.redhat.com> Package xdms in Fedora 9 is now owned by Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdms From fedora-extras-commits at redhat.com Tue Jul 8 12:34:33 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 12:34:33 GMT Subject: rpms/gyachi/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200807081234.m68CYXge001733@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1688 Modified Files: .cvsignore sources Log Message: added tarball... Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jul 2008 12:18:11 -0000 1.5 +++ .cvsignore 8 Jul 2008 12:33:40 -0000 1.6 @@ -1 +1 @@ -theme_support.patch +gyachi-1.1.35.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jul 2008 12:18:11 -0000 1.5 +++ sources 8 Jul 2008 12:33:40 -0000 1.6 @@ -1 +1 @@ -b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch +706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 12:37:07 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 12:37:07 GMT Subject: rpms/gyachi/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200807081237.m68Cb7N8001871@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1807 Modified Files: .cvsignore sources Log Message: added theme patch for f10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Jul 2008 12:33:40 -0000 1.6 +++ .cvsignore 8 Jul 2008 12:36:17 -0000 1.7 @@ -1 +1 @@ -gyachi-1.1.35.tar.gz +theme_support.patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Jul 2008 12:33:40 -0000 1.6 +++ sources 8 Jul 2008 12:36:17 -0000 1.7 @@ -1 +1 @@ -706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz +b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch From fedora-extras-commits at redhat.com Tue Jul 8 12:44:18 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 12:44:18 GMT Subject: rpms/gyachi/devel gyachi.spec,1.8,1.9 Message-ID: <200807081244.m68CiIFs002307@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2249 Modified Files: gyachi.spec Log Message: new rel level for a new tag. Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gyachi.spec 8 Jul 2008 12:18:11 -0000 1.8 +++ gyachi.spec 8 Jul 2008 12:43:29 -0000 1.9 @@ -17,7 +17,7 @@ Name: gyachi Version: 1.1.35 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A Yahoo! chat client with Webcam and voice support Group: Applications/Internet @@ -286,7 +286,7 @@ %changelog -* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-13 +* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-14 - plugin-photo_album obsoletes plugin-photosharing * Thu Jun 20 2008 Gregory D Hosler - 1.1.35-12 From fedora-extras-commits at redhat.com Tue Jul 8 12:44:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:44:58 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081244.m68Ciw49028385@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the watchcommits acl on raptor (Fedora 9) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:44:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:44:58 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081244.m68Ciwsi028384@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the watchbugzilla acl on raptor (Fedora 9) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:45:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:45:24 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081245.m68CjOvC028443@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the watchbugzilla acl on raptor (Fedora 8) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:45:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:45:26 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081245.m68CjQZH028464@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the watchcommits acl on raptor (Fedora 8) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:45:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:45:36 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081245.m68Ciwsm028384@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the watchbugzilla acl on raptor (Fedora devel) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:45:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:45:38 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081245.m68Ciw4D028385@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the watchcommits acl on raptor (Fedora devel) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:45:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:45:51 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081245.m68CjOvF028443@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the commit acl on raptor (Fedora 7) to Obsolete for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:45:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 12:45:58 +0000 Subject: [pkgdb] raptor had acl change status Message-ID: <200807081245.m68CjQZK028464@bastion.fedora.phx.redhat.com> Anthony Green (green) has set the commit acl on raptor (Fedora 7) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/raptor From fedora-extras-commits at redhat.com Tue Jul 8 12:53:24 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Tue, 8 Jul 2008 12:53:24 GMT Subject: rpms/xqf/devel xqf.spec,1.1,1.2 Message-ID: <200807081253.m68CrOvZ002792@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/xqf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2702 Modified Files: xqf.spec Log Message: - Remove BuildRequires: glibc-devel Index: xqf.spec =================================================================== RCS file: /cvs/pkgs/rpms/xqf/devel/xqf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xqf.spec 8 Jul 2008 11:23:43 -0000 1.1 +++ xqf.spec 8 Jul 2008 12:52:36 -0000 1.2 @@ -1,6 +1,6 @@ Name: xqf Version: 1.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A server browser for many popular games Group: Amusements/Games @@ -11,9 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: qstat -BuildRequires: GeoIP-devel qstat gdk-pixbuf-devel glib-devel glibc-devel gettext -BuildRequires: gtk2-devel intltool perl-XML-Parser desktop-file-utils zlib-devel -BuildRequires: readline-devel +BuildRequires: GeoIP-devel qstat gdk-pixbuf-devel glib-devel gettext zlib-devel +BuildRequires: gtk2-devel intltool perl-XML-Parser desktop-file-utils readline-devel %description XQF is a game server browser and launcher for Unix/X11 for many popular games @@ -39,14 +38,14 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# removing extraneous .desktop file +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + # the desktop file desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} -# removing extraneous .desktop file -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - # the icon stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps @@ -87,6 +86,9 @@ %changelog +* Tue Jul 08 2008 Stefan Posdzich - 1.0.5-5 +- Remove BuildRequires: glibc-devel + * Wed Jun 18 2008 Stefan Posdzich - 1.0.5-4 - Add new .desktop file source - Remove BuildRequires: gtk+-devel, glib2-devel From fedora-extras-commits at redhat.com Tue Jul 8 12:53:46 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 12:53:46 GMT Subject: rpms/gyachi/devel .cvsignore, 1.7, 1.8 gyachi.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200807081253.m68CrkMY002824@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2706 Modified Files: .cvsignore gyachi.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 8 Jul 2008 12:36:17 -0000 1.7 +++ .cvsignore 8 Jul 2008 12:52:56 -0000 1.8 @@ -1 +1,2 @@ theme_support.patch +gyachi-1.1.35.tar.gz Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gyachi.spec 8 Jul 2008 12:43:29 -0000 1.9 +++ gyachi.spec 8 Jul 2008 12:52:56 -0000 1.10 @@ -17,7 +17,7 @@ Name: gyachi Version: 1.1.35 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A Yahoo! chat client with Webcam and voice support Group: Applications/Internet @@ -286,7 +286,7 @@ %changelog -* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-14 +* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-15 - plugin-photo_album obsoletes plugin-photosharing * Thu Jun 20 2008 Gregory D Hosler - 1.1.35-12 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 8 Jul 2008 12:36:17 -0000 1.7 +++ sources 8 Jul 2008 12:52:56 -0000 1.8 @@ -1 +1,2 @@ b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch +706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 12:59:50 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 8 Jul 2008 12:59:50 GMT Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.70, 1.71 policycoreutils-po.patch, 1.35, 1.36 policycoreutils-rhat.patch, 1.374, 1.375 policycoreutils.spec, 1.537, 1.538 Message-ID: <200807081259.m68CxoKO003289@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3173 Modified Files: policycoreutils-gui.patch policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Jul 8 2008 Dan Walsh 2.0.52-3 - Fix indent problems in seobject policycoreutils-gui.patch: Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- policycoreutils-gui.patch 3 Jul 2008 17:25:34 -0000 1.70 +++ policycoreutils-gui.patch 8 Jul 2008 12:58:55 -0000 1.71 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.52/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/Makefile 2008-07-03 13:15:10.000000000 -0400 ++++ policycoreutils-2.0.52/gui/Makefile 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,36 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -40,7 +40,7 @@ +relabel: diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.52/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/booleansPage.py 2008-07-03 13:08:37.000000000 -0400 ++++ policycoreutils-2.0.52/gui/booleansPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,237 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -281,7 +281,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.52/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/fcontextPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/fcontextPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,217 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -502,7 +502,7 @@ + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.52/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.glade 2008-07-03 12:38:35.000000000 -0400 ++++ policycoreutils-2.0.52/gui/lockdown.glade 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,771 @@ + + @@ -1277,7 +1277,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.52/gui/lockdown.gladep --- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.gladep 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/lockdown.gladep 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,7 @@ + + @@ -1288,7 +1288,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.52/gui/lockdown.py --- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.py 2008-07-03 12:38:24.000000000 -0400 ++++ policycoreutils-2.0.52/gui/lockdown.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,382 @@ +#!/usr/bin/python +# @@ -1674,7 +1674,7 @@ + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.52/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/loginsPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/loginsPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1863,7 +1863,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.52/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/mappingsPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/mappingsPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1923,7 +1923,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.52/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/modulesPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/modulesPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,195 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2122,7 +2122,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.52/gui/polgen.glade --- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgen.glade 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/polgen.glade 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,3284 @@ + + @@ -5410,7 +5410,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.52/gui/polgen.py --- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgen.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/polgen.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,925 @@ +#!/usr/bin/python +# @@ -6339,7 +6339,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.52/gui/polgengui.py --- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgengui.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/polgengui.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,623 @@ +#!/usr/bin/python -E +# @@ -6966,7 +6966,7 @@ + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.52/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/portsPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/portsPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,258 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -7228,7 +7228,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.52/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/selinux.tbl 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/selinux.tbl 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,234 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /") @@ -7466,7 +7466,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.52/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/semanagePage.py 2008-07-03 13:10:29.000000000 -0400 ++++ policycoreutils-2.0.52/gui/semanagePage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,169 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -7639,7 +7639,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.52/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/statusPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/statusPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,191 @@ +# statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -7834,7 +7834,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.52/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/system-config-selinux.glade 2008-07-03 13:08:31.000000000 -0400 ++++ policycoreutils-2.0.52/gui/system-config-selinux.glade 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,3221 @@ + + @@ -11059,7 +11059,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.52/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/system-config-selinux.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/system-config-selinux.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,187 @@ +#!/usr/bin/python +# @@ -11250,7 +11250,7 @@ + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.52/gui/templates/__init__.py --- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/__init__.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/__init__.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,18 @@ +# +# Copyright (C) 2007 Red Hat, Inc. @@ -11272,7 +11272,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.52/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/boolean.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/boolean.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11316,7 +11316,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.52/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/etc_rw.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/etc_rw.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11449,7 +11449,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.52/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/executable.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/executable.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,327 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11780,7 +11780,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.52/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/network.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/network.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -11864,7 +11864,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.52/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/rw.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/rw.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11996,7 +11996,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.52/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/script.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/script.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12105,7 +12105,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.52/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/semodule.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/semodule.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12150,7 +12150,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.52/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/tmp.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/tmp.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12251,7 +12251,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.52/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/user.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/user.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12437,7 +12437,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.52/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_lib.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_lib.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12599,7 +12599,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.52/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_log.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_log.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12713,7 +12713,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.52/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_run.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_run.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12835,7 +12835,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.52/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_spool.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_spool.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12968,7 +12968,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.52/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/translationsPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/translationsPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -13090,7 +13090,7 @@ + self.store.set_value(iter, 1, translation) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.52/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/usersPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/usersPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. policycoreutils-po.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.35 -r 1.36 policycoreutils-po.patch Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- policycoreutils-po.patch 30 Jun 2008 20:51:23 -0000 1.35 +++ policycoreutils-po.patch 8 Jul 2008 12:58:55 -0000 1.36 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.50/po/.cvsignore +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.52/po/.cvsignore --- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/po/.cvsignore 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/.cvsignore 2008-07-03 16:17:10.000000000 -0400 @@ -0,0 +1,16 @@ +*.gmo +*.mo @@ -18,9 +18,9 @@ +po2tbl.sed.in +stamp-cat-id +stamp-it -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.50/po/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.52/po/Makefile --- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/Makefile 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/Makefile 2008-07-03 16:17:10.000000000 -0400 @@ -23,20 +23,61 @@ POFILES = $(wildcard *.po) MOFILES = $(patsubst %.po,%.mo,$(POFILES)) @@ -100,9 +100,9 @@ install: $(MOFILES) @for n in $(MOFILES); do \ l=`basename $$n .mo`; \ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.50/po/POTFILES +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.52/po/POTFILES --- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/POTFILES 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES 2008-07-03 16:17:10.000000000 -0400 @@ -1,10 +1,54 @@ - ../load_policy/load_policy.c \ - ../newrole/newrole.c \ @@ -166,9 +166,9 @@ + ../gui/templates/var_spool.py \ + ../secon/secon.c \ + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.50/po/POTFILES.in +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.52/po/POTFILES.in --- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/POTFILES.in 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES.in 2008-07-03 16:17:10.000000000 -0400 @@ -2,9 +2,7 @@ run_init/run_init.c semodule_link/semodule_link.c @@ -228,9 +228,9 @@ +gui/templates/var_run.py +gui/templates/var_spool.py secon/secon.c -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.50/po/af.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.52/po/af.po --- nsapolicycoreutils/po/af.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/af.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/af.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -4002,9 +4002,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.50/po/am.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.52/po/am.po --- nsapolicycoreutils/po/am.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/am.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/am.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -7776,9 +7776,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.50/po/ar.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.52/po/ar.po --- nsapolicycoreutils/po/ar.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/ar.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ar.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -11550,9 +11550,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.50/po/as.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.52/po/as.po --- nsapolicycoreutils/po/as.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/as.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/as.po 2008-07-08 08:47:28.000000000 -0400 @@ -1,1028 +1,3566 @@ # translation of as.po to Assamese # This file is distributed under the same license as the PACKAGE package. @@ -15832,9 +15832,9 @@ +#~ "MLS/\n" +#~ "MCS Level" +#~ msgstr "????????????" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.50/po/autom4te.cache/requests +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.52/po/autom4te.cache/requests --- nsapolicycoreutils/po/autom4te.cache/requests 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/po/autom4te.cache/requests 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/autom4te.cache/requests 2008-07-03 16:17:10.000000000 -0400 @@ -0,0 +1,63 @@ +# This file was generated. +# It contains the lists of macros which have been traced. @@ -15899,9 +15899,9 @@ + ], 'Autom4te::Request' ) + ); + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.50/po/be.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.52/po/be.po --- nsapolicycoreutils/po/be.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/be.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/be.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -19673,9 +19673,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.50/po/bg.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.52/po/bg.po --- nsapolicycoreutils/po/bg.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/bg.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bg.po 2008-07-08 08:47:28.000000000 -0400 @@ -1,1028 +1,3877 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -24322,9 +24322,9 @@ + +#~ msgid "You must be root to run %s." +#~ msgstr "???????????? ???? ?????? root ???? ???? ???????????????????? %s." -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.50/po/bn.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.52/po/bn.po --- nsapolicycoreutils/po/bn.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/bn.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -28096,9 +28096,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.50/po/bn_IN.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.52/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/bn_IN.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn_IN.po 2008-07-08 08:47:28.000000000 -0400 @@ -1,1079 +1,3401 @@ -# translation of bn_IN.po to Bengali India -# translation of bn_IN.po to Bangla (INDIA) @@ -32166,9 +32166,9 @@ +#~ "Enforcing\n" +#~ "Permissive\n" +#~ "Disabled\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.50/po/bs.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.52/po/bs.po --- nsapolicycoreutils/po/bs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/bs.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bs.po 2008-07-08 08:47:29.000000000 -0400 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: bs\n" @@ -36289,9 +36289,9 @@ +#~ msgid "Options Error: %s " +#~ msgstr "Opciona gre??ka: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.50/po/ca.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.52/po/ca.po --- nsapolicycoreutils/po/ca.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/ca.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ca.po 2008-07-08 08:47:29.000000000 -0400 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -40364,9 +40364,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "Error en les opcions: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.50/po/cs.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.52/po/cs.po --- nsapolicycoreutils/po/cs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/cs.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/cs.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1028 +1,8926 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -49909,9 +49909,9 @@ + +#~ msgid "_Save to floppy" [...18355 lines suppressed...] -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.50/po/sk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.52/po/sk.po --- nsapolicycoreutils/po/sk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/sk.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sk.po 2008-07-08 08:47:29.000000000 -0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -244929,9 +244532,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "Chyba volieb: %s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.50/po/sl.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.52/po/sl.po --- nsapolicycoreutils/po/sl.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sl.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sl.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -248703,9 +248306,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.50/po/sq.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.52/po/sq.po --- nsapolicycoreutils/po/sq.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sq.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sq.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -252477,9 +252080,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.50/po/sr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.52/po/sr.po --- nsapolicycoreutils/po/sr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sr.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1117 +1,3432 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian # Serbian translations for policycoreutils @@ -256618,9 +256221,9 @@ +#~ "??????????????????????\n" +#~ "??????????????????\n" +#~ "??????????????????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-2.0.50/po/sr at Latn.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-2.0.52/po/sr at Latn.po --- nsapolicycoreutils/po/sr at Latn.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/sr at Latn.po 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.52/po/sr at Latn.po 1969-12-31 19:00:00.000000000 -0500 @@ -1,1117 +0,0 @@ -# Serbian(Latin) translations for policycoreutils -# Copyright (C) 2006 Red Hat, Inc. @@ -257739,9 +257342,9 @@ -msgid "Options Error: %s " -msgstr "Gre??ka opcija: %s " - -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.50/po/sr at latin.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.52/po/sr at latin.po --- nsapolicycoreutils/po/sr at latin.po 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/po/sr at latin.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr at latin.po 2008-07-08 08:47:29.000000000 -0400 @@ -0,0 +1,3434 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian +# Serbian(Latin) translations for policycoreutils @@ -261177,9 +260780,9 @@ +#~ "Primoravanje\n" +#~ "Dopu??tanje\n" +#~ "Isklju??eno\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.50/po/sv.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.52/po/sv.po --- nsapolicycoreutils/po/sv.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sv.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sv.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1040 +1,3368 @@ # Swedish messages for policycoreutils. -# Copyright (C) Christian Rose , 2006. @@ -265349,9 +264952,9 @@ -msgstr "Flaggfel: %s " +#~ msgid "Options Error: %s " +#~ msgstr "Flaggfel: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.50/po/ta.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.52/po/ta.po --- nsapolicycoreutils/po/ta.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/ta.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ta.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1043 +1,3363 @@ # translation of ta.po to Tamil # This file is distributed under the same license as the PACKAGE package. @@ -269515,9 +269118,9 @@ +#~ msgstr "" +#~ "MLS/\n" +#~ "MCS ????????????" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.50/po/te.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.52/po/te.po --- nsapolicycoreutils/po/te.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/te.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/te.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1028 +1,3381 @@ -# SOME DESCRIPTIVE TITLE. +# translation of new_policycoreutils.HEAD.te.po to Telugu @@ -273671,9 +273274,9 @@ +#~ "?????????????????????\n" +#~ "????????????????????????\n" +#~ "????????????????????????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.50/po/th.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.52/po/th.po --- nsapolicycoreutils/po/th.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/th.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/th.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -277445,9 +277048,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.50/po/tr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.52/po/tr.po --- nsapolicycoreutils/po/tr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/tr.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/tr.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -281219,9 +280822,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.50/po/uk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.52/po/uk.po --- nsapolicycoreutils/po/uk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/uk.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/uk.po 2008-07-08 08:47:29.000000000 -0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -285269,9 +284872,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "?????????????? ?? ????????????????????: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.50/po/ur.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.52/po/ur.po --- nsapolicycoreutils/po/ur.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/ur.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ur.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -289043,9 +288646,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.50/po/vi.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.52/po/vi.po --- nsapolicycoreutils/po/vi.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/vi.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/vi.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -292817,9 +292420,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.50/po/zh_CN.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.52/po/zh_CN.po --- nsapolicycoreutils/po/zh_CN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/zh_CN.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_CN.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1045 +1,3343 @@ -# translation of zh_CN.po to -# translation of zh_CN.po to @@ -296795,9 +296398,9 @@ +#~ "??????\n" +#~ "??????\n" +#~ "??????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.50/po/zh_TW.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.52/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/zh_TW.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_TW.po 2008-07-08 08:47:29.000000000 -0400 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zh_TW\n" @@ -300837,9 +300440,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "???????????????%s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.50/po/zu.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.52/po/zu.po --- nsapolicycoreutils/po/zu.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/zu.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/zu.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.374 retrieving revision 1.375 diff -u -r1.374 -r1.375 --- policycoreutils-rhat.patch 3 Jul 2008 17:25:34 -0000 1.374 +++ policycoreutils-rhat.patch 8 Jul 2008 12:58:57 -0000 1.375 @@ -1,21 +1,15 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile --- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/Makefile 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-03 16:17:10.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/VERSION policycoreutils-2.0.52/VERSION ---- nsapolicycoreutils/VERSION 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/VERSION 2008-07-02 13:42:54.000000000 -0400 -@@ -1 +1 @@ --2.0.52 -+2.0.51 diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-03 16:17:10.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -44,7 +38,7 @@ close(fd); diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-03 13:06:55.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-03 16:17:10.000000000 -0400 @@ -51,7 +51,7 @@ semanage interface -{a|d|m} [-tr] interface_spec semanage fcontext -{a|d|m} [-frst] file_spec @@ -206,7 +200,7 @@ OBJECT.modify(target, seuser, serange) diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-03 13:14:31.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-03 16:17:10.000000000 -0400 @@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool @@ -243,16 +237,7 @@ .TP diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-03 13:07:45.000000000 -0400 -@@ -567,7 +562,7 @@ - def __init__(self, store = ""): - semanageRecords.__init__(self, store) - -- def add(self, name, roles, selevel, serange, prefix): -+ def add(self, name, roles, selevel, serange, prefix = "user"): - if is_mls_enabled == 1: - if serange == "": - serange = "s0" ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-08 08:45:07.000000000 -0400 @@ -1448,53 +1443,58 @@ def __init__(self, store = ""): semanageRecords.__init__(self, store) Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.537 retrieving revision 1.538 diff -u -r1.537 -r1.538 --- policycoreutils.spec 3 Jul 2008 17:25:34 -0000 1.537 +++ policycoreutils.spec 8 Jul 2008 12:58:57 -0000 1.538 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ fi %changelog +* Tue Jul 8 2008 Dan Walsh 2.0.52-3 +- Fix indent problems in seobject + * Wed Jul 2 2008 Dan Walsh 2.0.52-2 - Add lockdown wizard - Allow semanage booleans to take an input file an process lots of booleans at once. From fedora-extras-commits at redhat.com Tue Jul 8 13:00:01 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 13:00:01 GMT Subject: rpms/gyachi/F-9 .cvsignore, 1.4, 1.5 gyachi.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807081300.m68D01IE003348@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3215 Modified Files: .cvsignore gyachi.spec sources Log Message: plugin-photo_album obsoletes plugin-photosharing Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2008 17:41:43 -0000 1.4 +++ .cvsignore 8 Jul 2008 12:59:14 -0000 1.5 @@ -1 +1,2 @@ gyachi-1.1.35.tar.gz +theme_support.patch Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-9/gyachi.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gyachi.spec 16 Jun 2008 17:41:43 -0000 1.3 +++ gyachi.spec 8 Jul 2008 12:59:14 -0000 1.4 @@ -2,41 +2,58 @@ %define _without_wine 1 %endif -%if 0%{?fc7} +%if 0%{?fc7}%{?el4}%{?el5} %define _without_pulseaudio 1 %endif -Name: gyachi -Version: 1.1.35 -Release: 6%{?dist} -Summary: A Yahoo! chat client with Webcam and voice support +%if 0%{?el4} +%define _without_gpgme 1 +%define _without_libnotify 1 +%endif -Group: Applications/Internet -License: GPLv2 -URL: http://gyachi.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +%if 0%{?rhel} +%define _without_xmms 1 +%endif + +Name: gyachi +Version: 1.1.35 +Release: 15%{?dist} +Summary: A Yahoo! chat client with Webcam and voice support + +Group: Applications/Internet +License: GPLv2 +URL: http://gyachi.sourceforge.net +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Patch0: configure.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: theme_support.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake gawk sed -BuildRequires: expat-devel gettext-devel +BuildRequires: expat-devel gettext-devel BuildRequires: glibc-devel >= 2.2.0 gtkhtml2-devel -BuildRequires: libtool-ltdl-devel -BuildRequires: libXt-devel expat-devel -BuildRequires: gettext-devel gtkhtml2-devel libtool libtool-ltdl-devel +%if 0%{?el4} +BuildRequires: libtool +%else +BuildRequires: libtool libtool-ltdl-devel +%endif +%if 0%{?el4} +BuildRequires: xorg-x11-devel +%else +BuildRequires: libXt-devel +%endif +BuildRequires: gettext-devel gtkhtml2-devel BuildRequires: desktop-file-utils ImageMagick BuildRequires: openssl-devel -BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: gtk2-devel BuildRequires: jasper-devel >= 1.701.0 +Requires: gtk2 #jasper >= 1.701 needed for memory leak fix. -%if 0%{?fc7} +%if 0%{?fc7}%{?el4}%{?el5} Requires: jasper >= 1.701.0 %else Requires: jasper-libs >= 1.701.0 %endif - -Requires: gtk2 >= 2.4.0 Requires: ImageMagick @@ -68,6 +85,7 @@ Blowfish encryption plugin for GyachI +%if 0%{!?_without_gpgme:1} %package plugin-gpgme Summary: GPGMe encryption plugin for GyachI Group: Applications/Internet @@ -76,6 +94,7 @@ %description plugin-gpgme GPGMe encryption plugin for GyachI +%endif %package plugin-mcrypt @@ -93,11 +112,13 @@ Summary: Photo album plugin for GyachI Group: Applications/Internet Requires: %{name} = %{version}-%{release} +Obsoletes: plugin-photosharing %description plugin-photo_album Photo album plugin for GyachI +%if 0%{!?_without_xmms:1} %package plugin-xmms Summary: XMMS plugin for GyachI Group: Applications/Internet @@ -107,8 +128,10 @@ %description plugin-xmms XMMS plugin for GyachI +%endif +%if 0%{!?_without_libnotify:1} %package plugin-libnotify Summary: libnotify popup replacement Group: Applications/Internet @@ -117,13 +140,13 @@ %description plugin-libnotify libnotify plugin for GyachI +%endif %package plugin-alsa Summary: libalsa sound driver Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Buildrequires: libnotify-devel BuildRequires: alsa-lib-devel >= 0.9 Requires: alsa-lib >= 0.9 @@ -136,7 +159,6 @@ Summary: pulseaudio sound driver Group: Applications/Internet Requires: %{name} = %{version}-%{release} - BuildRequires: pulseaudio-libs-devel Requires: pulseaudio-libs @@ -144,11 +166,11 @@ PulseAudio sound driver for gyachi %endif + %package recre8-theme Summary: GyachI Prototype theme Group: Applications/Internet Requires: %{name} = %{version}-%{release} -#BuildArch: noarch %description recre8-theme %{summary} This package supplies the artwork for the GyachI recre8 theme. @@ -163,11 +185,15 @@ ./autogen.sh %configure --disable-rpath --enable-v4l2 \ - --enable-plugin_photo_album \ - --enable-plugin_xmms \ - %{?_without_wine:--disable-wine} \ - %{?_without_pulseaudio:--disable-plugin_pulseaudio} \ - --libexecdir=%{_libexecdir}/gyachi + --libexecdir=%{_libexecdir}/gyachi \ + %{?_without_wine:--disable-wine} \ + %{?_without_gpgme:--disable-plugin_gpgme} \ + %{?_without_pulseaudio:--disable-plugin_pulseaudio} \ + %{?_without_libnotify:--disable-plugin_libnotify} \ + --enable-plugin_photo_album \ + %{!?_without_xmms:--enable-plugin_xmms} + + make %{?_smp_mflags} @@ -211,9 +237,11 @@ %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}blowfish.so +%if 0%{!?_without_gpgme:1} %files plugin-gpgme %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}gpgme.so +%endif %files plugin-mcrypt %defattr(-,root,root,-) @@ -223,13 +251,17 @@ %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}photos.so +%if 0%{!?_without_xmms:1} %files plugin-xmms %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}xmms.so +%endif +%if 0%{!?_without_libnotify:1} %files plugin-libnotify %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}libnotify.so +%endif %files plugin-alsa %defattr(-,root,root,-) @@ -254,6 +286,20 @@ %changelog +* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-15 +- plugin-photo_album obsoletes plugin-photosharing + +* Thu Jun 20 2008 Gregory D Hosler - 1.1.35-12 +- Changed jasper-libs back to jasper for el4/el5 + +* Fri Jun 20 2008 Gregory D Hosler - 1.1.35-8 +- disabled libnotify, gpgme for RHEL4, changed libXt-devel and +- libtool-ltdl-devel for RHEL4 + +* Mon Jun 16 2008 Gregory D Hosler - 1.1.35-7 +- disabled xmms plugin for rhel, pulseaudio for EL4/EL5 +- removed a gnu extension strchrnul in theme_support.c + * Mon Jun 16 2008 Gregory D Hosler - 1.1.35-6 - Made Alsa driver a plugin, added pulseaudio support as a plugin. - Disabled pulseaudio plugin for F7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2008 17:41:43 -0000 1.4 +++ sources 8 Jul 2008 12:59:14 -0000 1.5 @@ -1 +1,2 @@ 706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz +b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch From fedora-extras-commits at redhat.com Tue Jul 8 13:02:18 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Tue, 8 Jul 2008 13:02:18 GMT Subject: rpms/wyrd/devel wyrd.spec,1.7,1.8 wyrd-1.4.4-camlp5.patch,1.1,NONE Message-ID: <200807081302.m68D2I2j010208@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/wyrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10126 Modified Files: wyrd.spec Removed Files: wyrd-1.4.4-camlp5.patch Log Message: * Tue Jul 08 2008 Till Maas - 1.4.4-2 - fix BuildRequires, camlp4 is not needed/supported as BR anymore Index: wyrd.spec =================================================================== RCS file: /cvs/pkgs/rpms/wyrd/devel/wyrd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wyrd.spec 7 Jul 2008 23:04:46 -0000 1.7 +++ wyrd.spec 8 Jul 2008 13:01:33 -0000 1.8 @@ -8,13 +8,10 @@ URL: http://pessimization.com/software/wyrd/ Source0: http://pessimization.com/software/wyrd/wyrd-%{version}.tar.gz Source1: wyrd-wyrdrc.local -Patch0: wyrd-1.4.3-wyrdrc-local.patch -Patch1: wyrd-1.4.4-camlp5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml remind ncurses-devel - -BuildRequires: ocaml-camlp5-devel +BuildRequires: ocaml-camlp4-devel %description wyrd is a ncurses frontend for the calendar application remind. @@ -23,7 +20,6 @@ %prep %setup -q %patch0 -p1 -b .wyrdrc-local -%patch1 -p1 -b .camlp5 %build @@ -54,7 +50,7 @@ %changelog * Tue Jul 08 2008 Till Maas - 1.4.4-2 -- fix BuildRequires, the ocaml-camlp4-devel seems to have vanished +- fix BuildRequires, camlp4 is not needed/supported as BR anymore * Fri Feb 22 2008 Till Maas - 1.4.4-1 - update to latest version that fixes CVE-2008-0806 in a different way --- wyrd-1.4.4-camlp5.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 8 13:03:04 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 13:03:04 GMT Subject: rpms/gyachi/F-8 .cvsignore, 1.4, 1.5 gyachi.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807081303.m68D34ct010313@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10182 Modified Files: .cvsignore gyachi.spec sources Log Message: plugin-photo_album obsoletes plugin-photosharing Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2008 17:23:21 -0000 1.4 +++ .cvsignore 8 Jul 2008 13:02:11 -0000 1.5 @@ -1 +1,2 @@ gyachi-1.1.35.tar.gz +theme_support.patch Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-8/gyachi.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gyachi.spec 16 Jun 2008 17:23:21 -0000 1.3 +++ gyachi.spec 8 Jul 2008 13:02:11 -0000 1.4 @@ -2,41 +2,58 @@ %define _without_wine 1 %endif -%if 0%{?fc7} +%if 0%{?fc7}%{?el4}%{?el5} %define _without_pulseaudio 1 %endif -Name: gyachi -Version: 1.1.35 -Release: 6%{?dist} -Summary: A Yahoo! chat client with Webcam and voice support +%if 0%{?el4} +%define _without_gpgme 1 +%define _without_libnotify 1 +%endif -Group: Applications/Internet -License: GPLv2 -URL: http://gyachi.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +%if 0%{?rhel} +%define _without_xmms 1 +%endif + +Name: gyachi +Version: 1.1.35 +Release: 15%{?dist} +Summary: A Yahoo! chat client with Webcam and voice support + +Group: Applications/Internet +License: GPLv2 +URL: http://gyachi.sourceforge.net +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Patch0: configure.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: theme_support.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake gawk sed -BuildRequires: expat-devel gettext-devel +BuildRequires: expat-devel gettext-devel BuildRequires: glibc-devel >= 2.2.0 gtkhtml2-devel -BuildRequires: libtool-ltdl-devel -BuildRequires: libXt-devel expat-devel -BuildRequires: gettext-devel gtkhtml2-devel libtool libtool-ltdl-devel +%if 0%{?el4} +BuildRequires: libtool +%else +BuildRequires: libtool libtool-ltdl-devel +%endif +%if 0%{?el4} +BuildRequires: xorg-x11-devel +%else +BuildRequires: libXt-devel +%endif +BuildRequires: gettext-devel gtkhtml2-devel BuildRequires: desktop-file-utils ImageMagick BuildRequires: openssl-devel -BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: gtk2-devel BuildRequires: jasper-devel >= 1.701.0 +Requires: gtk2 #jasper >= 1.701 needed for memory leak fix. -%if 0%{?fc7} +%if 0%{?fc7}%{?el4}%{?el5} Requires: jasper >= 1.701.0 %else Requires: jasper-libs >= 1.701.0 %endif - -Requires: gtk2 >= 2.4.0 Requires: ImageMagick @@ -68,6 +85,7 @@ Blowfish encryption plugin for GyachI +%if 0%{!?_without_gpgme:1} %package plugin-gpgme Summary: GPGMe encryption plugin for GyachI Group: Applications/Internet @@ -76,6 +94,7 @@ %description plugin-gpgme GPGMe encryption plugin for GyachI +%endif %package plugin-mcrypt @@ -93,11 +112,13 @@ Summary: Photo album plugin for GyachI Group: Applications/Internet Requires: %{name} = %{version}-%{release} +Obsoletes: plugin-photosharing %description plugin-photo_album Photo album plugin for GyachI +%if 0%{!?_without_xmms:1} %package plugin-xmms Summary: XMMS plugin for GyachI Group: Applications/Internet @@ -107,8 +128,10 @@ %description plugin-xmms XMMS plugin for GyachI +%endif +%if 0%{!?_without_libnotify:1} %package plugin-libnotify Summary: libnotify popup replacement Group: Applications/Internet @@ -117,13 +140,13 @@ %description plugin-libnotify libnotify plugin for GyachI +%endif %package plugin-alsa Summary: libalsa sound driver Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Buildrequires: libnotify-devel BuildRequires: alsa-lib-devel >= 0.9 Requires: alsa-lib >= 0.9 @@ -136,7 +159,6 @@ Summary: pulseaudio sound driver Group: Applications/Internet Requires: %{name} = %{version}-%{release} - BuildRequires: pulseaudio-libs-devel Requires: pulseaudio-libs @@ -144,11 +166,11 @@ PulseAudio sound driver for gyachi %endif + %package recre8-theme Summary: GyachI Prototype theme Group: Applications/Internet Requires: %{name} = %{version}-%{release} -#BuildArch: noarch %description recre8-theme %{summary} This package supplies the artwork for the GyachI recre8 theme. @@ -163,11 +185,15 @@ ./autogen.sh %configure --disable-rpath --enable-v4l2 \ - --enable-plugin_photo_album \ - --enable-plugin_xmms \ - %{?_without_wine:--disable-wine} \ - %{?_without_pulseaudio:--disable-plugin_pulseaudio} \ - --libexecdir=%{_libexecdir}/gyachi + --libexecdir=%{_libexecdir}/gyachi \ + %{?_without_wine:--disable-wine} \ + %{?_without_gpgme:--disable-plugin_gpgme} \ + %{?_without_pulseaudio:--disable-plugin_pulseaudio} \ + %{?_without_libnotify:--disable-plugin_libnotify} \ + --enable-plugin_photo_album \ + %{!?_without_xmms:--enable-plugin_xmms} + + make %{?_smp_mflags} @@ -211,9 +237,11 @@ %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}blowfish.so +%if 0%{!?_without_gpgme:1} %files plugin-gpgme %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}gpgme.so +%endif %files plugin-mcrypt %defattr(-,root,root,-) @@ -223,13 +251,17 @@ %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}photos.so +%if 0%{!?_without_xmms:1} %files plugin-xmms %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}xmms.so +%endif +%if 0%{!?_without_libnotify:1} %files plugin-libnotify %defattr(-,root,root,-) %{_libdir}/%{name}/plugins/%{name}libnotify.so +%endif %files plugin-alsa %defattr(-,root,root,-) @@ -254,6 +286,20 @@ %changelog +* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-15 +- plugin-photo_album obsoletes plugin-photosharing + +* Thu Jun 20 2008 Gregory D Hosler - 1.1.35-12 +- Changed jasper-libs back to jasper for el4/el5 + +* Fri Jun 20 2008 Gregory D Hosler - 1.1.35-8 +- disabled libnotify, gpgme for RHEL4, changed libXt-devel and +- libtool-ltdl-devel for RHEL4 + +* Mon Jun 16 2008 Gregory D Hosler - 1.1.35-7 +- disabled xmms plugin for rhel, pulseaudio for EL4/EL5 +- removed a gnu extension strchrnul in theme_support.c + * Mon Jun 16 2008 Gregory D Hosler - 1.1.35-6 - Made Alsa driver a plugin, added pulseaudio support as a plugin. - Disabled pulseaudio plugin for F7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2008 17:23:21 -0000 1.4 +++ sources 8 Jul 2008 13:02:11 -0000 1.5 @@ -1 +1,2 @@ 706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz +b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch From fedora-extras-commits at redhat.com Tue Jul 8 13:07:41 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Tue, 8 Jul 2008 13:07:41 GMT Subject: rpms/wyrd/devel wyrd.spec,1.8,1.9 Message-ID: <200807081307.m68D7fUe010616@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/wyrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10505 Modified Files: wyrd.spec Log Message: * Tue Jul 08 2008 Till Maas - 1.4.4-2 - fix BuildRequires, camlp4 is not needed/supported as BR anymore Index: wyrd.spec =================================================================== RCS file: /cvs/pkgs/rpms/wyrd/devel/wyrd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wyrd.spec 8 Jul 2008 13:01:33 -0000 1.8 +++ wyrd.spec 8 Jul 2008 13:06:53 -0000 1.9 @@ -8,6 +8,9 @@ URL: http://pessimization.com/software/wyrd/ Source0: http://pessimization.com/software/wyrd/wyrd-%{version}.tar.gz Source1: wyrd-wyrdrc.local + +Patch0: wyrd-1.4.3-wyrdrc-local.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml remind ncurses-devel From fedora-extras-commits at redhat.com Tue Jul 8 13:08:09 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 8 Jul 2008 13:08:09 GMT Subject: rpms/raptor/devel .cvsignore, 1.5, 1.6 raptor.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <200807081308.m68D89Cv010693@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/raptor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10507 Modified Files: .cvsignore raptor.spec sources Log Message: Upgrade source Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/raptor/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Oct 2007 14:57:07 -0000 1.5 +++ .cvsignore 8 Jul 2008 13:07:10 -0000 1.6 @@ -1,2 +1 @@ -raptor-1.4.14.tar.gz -raptor-1.4.16.tar.gz +raptor-1.4.18.tar.gz Index: raptor.spec =================================================================== RCS file: /cvs/pkgs/rpms/raptor/devel/raptor.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- raptor.spec 9 Feb 2008 03:22:24 -0000 1.13 +++ raptor.spec 8 Jul 2008 13:07:10 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Raptor RDF Parser Toolkit for Redland Name: raptor -Version: 1.4.16 -Release: 2%{?dist} +Version: 1.4.18 +Release: 1%{?dist} License: LGPLv2+ or ASL 2.0 Group: System Environment/Libraries Source: http://download.librdf.org/source/raptor-%{version}.tar.gz @@ -66,6 +66,9 @@ %{_bindir}/raptor-config %changelog +* Tue Jul 08 2008 Anthony Green 1.4.18-1 +- Update sources. + * Sat Feb 9 2008 Kevin Kofler 1.4.16-2 - Rebuild for GCC 4.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/raptor/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Oct 2007 14:57:07 -0000 1.5 +++ sources 8 Jul 2008 13:07:10 -0000 1.6 @@ -1,2 +1 @@ -1bbc9938f8f7310e20fbd5b962a43847 raptor-1.4.14.tar.gz -49c16262e0aed0197a3e60ade7bec205 raptor-1.4.16.tar.gz +284e768eeda0e2898b0d5bf7e26a016e raptor-1.4.18.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 13:08:16 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 8 Jul 2008 13:08:16 GMT Subject: rpms/whysynth-dssi/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200807081308.m68D8GQ5010702@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/whysynth-dssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558 Modified Files: .cvsignore sources Log Message: Upgrade source Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/whysynth-dssi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Apr 2007 16:26:58 -0000 1.3 +++ .cvsignore 8 Jul 2008 13:07:20 -0000 1.4 @@ -1 +1 @@ -whysynth-20070418.tar.bz2 +whysynth-20080412.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/whysynth-dssi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Apr 2007 16:26:58 -0000 1.3 +++ sources 8 Jul 2008 13:07:20 -0000 1.4 @@ -1 +1 @@ -dc639ed5221c825170d27234890b48f2 whysynth-20070418.tar.bz2 +54e7eab2c475c7dc82f57703cdd3148e whysynth-20080412.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 13:11:44 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Tue, 8 Jul 2008 13:11:44 GMT Subject: rpms/libvirt/devel libvirt-0.4.4-boot-cdrom.patch, NONE, 1.1 libvirt.spec, 1.92, 1.93 Message-ID: <200807081311.m68DBiLG011094@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11036 Modified Files: libvirt.spec Added Files: libvirt-0.4.4-boot-cdrom.patch Log Message: Fix CDROM boot for KVM guests (rhbz #452355) libvirt-0.4.4-boot-cdrom.patch: --- NEW FILE libvirt-0.4.4-boot-cdrom.patch --- diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c --- libvirt-0.4.4.orig/src/qemu_conf.c 2008-06-19 14:15:02.000000000 +0100 +++ libvirt-0.4.4.new/src/qemu_conf.c 2008-07-08 12:24:07.000000000 +0100 @@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr disk->src, qemudBusIdToName(disk->bus, 1), media ? media : "", idx, - bootable ? ",boot=on" : ""); + bootable && disk->device == QEMUD_DISK_DISK + ? ",boot=on" : ""); ADD_ARG_LIT("-drive"); ADD_ARG_LIT(opt); diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 2008-07-08 12:25:59.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 2008-07-08 12:20:42.000000000 +0100 @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + + + diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 2008-07-08 12:13:15.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 2008-07-08 12:12:41.000000000 +0100 @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + + + diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c --- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c 2008-06-02 10:16:46.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c 2008-07-08 12:21:53.000000000 +0100 @@ -158,6 +158,10 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("graphics-vnc", 0); DO_TEST("graphics-sdl", 0); DO_TEST("input-usbmouse", 0); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- libvirt.spec 25 Jun 2008 09:06:35 -0000 1.92 +++ libvirt.spec 8 Jul 2008 13:10:54 -0000 1.93 @@ -28,10 +28,11 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.4 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: %{name}-%{version}-boot-cdrom.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -141,6 +142,7 @@ %prep %setup -q +%patch1 -p1 %build %if ! %{with_xen} @@ -279,6 +281,9 @@ %doc docs/examples/python %changelog +* Tue Jul 8 2008 Daniel P. Berrange - 0.4.4-2.fc10 +- Fix booting of CDROM images with KVM (rhbz #452355) + * Wed Jun 25 2008 Daniel Veillard - 0.4.4-1.fc10 - upstream release 0.4.4 - fix a few bugs in previous release From fedora-extras-commits at redhat.com Tue Jul 8 13:13:39 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Tue, 8 Jul 2008 13:13:39 GMT Subject: rpms/libvirt/F-9 libvirt-0.4.4-boot-cdrom.patch, NONE, 1.1 libvirt.spec, 1.88, 1.89 Message-ID: <200807081313.m68DDd3u011331@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253 Modified Files: libvirt.spec Added Files: libvirt-0.4.4-boot-cdrom.patch Log Message: Fix CDROM boot for KVM guests (rhbz #452355) libvirt-0.4.4-boot-cdrom.patch: --- NEW FILE libvirt-0.4.4-boot-cdrom.patch --- diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c --- libvirt-0.4.4.orig/src/qemu_conf.c 2008-06-19 14:15:02.000000000 +0100 +++ libvirt-0.4.4.new/src/qemu_conf.c 2008-07-08 12:24:07.000000000 +0100 @@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr disk->src, qemudBusIdToName(disk->bus, 1), media ? media : "", idx, - bootable ? ",boot=on" : ""); + bootable && disk->device == QEMUD_DISK_DISK + ? ",boot=on" : ""); ADD_ARG_LIT("-drive"); ADD_ARG_LIT(opt); diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 2008-07-08 12:25:59.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 2008-07-08 12:20:42.000000000 +0100 @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + + + diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 2008-07-08 12:13:15.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 2008-07-08 12:12:41.000000000 +0100 @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + + + diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c --- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c 2008-06-02 10:16:46.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c 2008-07-08 12:21:53.000000000 +0100 @@ -158,6 +158,10 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("graphics-vnc", 0); DO_TEST("graphics-sdl", 0); DO_TEST("input-usbmouse", 0); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- libvirt.spec 25 Jun 2008 09:10:04 -0000 1.88 +++ libvirt.spec 8 Jul 2008 13:12:51 -0000 1.89 @@ -21,10 +21,11 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.4 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: %{name}-%{version}-boot-cdrom.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -136,6 +137,7 @@ %prep %setup -q +%patch1 -p1 %build # Xen is available only on i386 x86_64 ia64 @@ -282,6 +284,9 @@ %doc docs/examples/python %changelog +* Tue Jul 8 2008 Daniel P. Berrange - 0.4.4-2.fc9 +- Fix booting of CDROM images with KVM (rhbz #452355) + * Thu Jun 25 2008 Daniel Veillard - 0.4.4-1.fc9 - upstream release of 0.4.4 - fixes a few bug in previous release From fedora-extras-commits at redhat.com Tue Jul 8 13:17:50 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Tue, 8 Jul 2008 13:17:50 GMT Subject: rpms/nspluginwrapper/devel nspluginwrapper-1.1.0-build.patch, NONE, 1.1 nspluginwrapper-1.1.0-fork.patch, NONE, 1.1 nspluginwrapper-1.1.0-runtime-restart.patch, NONE, 1.1 nspluginwrapper.spec, 1.48, 1.49 sources, 1.9, 1.10 nspluginwrapper-0.9.91.5-cpp-plugins.patch, 1.1, NONE nspluginwrapper-0.9.91.5-fork.patch, 1.1, NONE nspluginwrapper-0.9.91.5-npviewer-gthread.patch, 1.2, NONE nspluginwrapper-0.9.91.5-restart.patch, 1.1, NONE nspluginwrapper-0.9.91.5-rh.patch, 1.2, NONE nspluginwrapper-0.9.91.5-rpc-error.patch, 1.1, NONE nspluginwrapper-0.9.91.5-runtime-restart.patch, 1.2, NONE nspluginwrapper-0.9.91.5-xulrunner.patch, 1.2, NONE Message-ID: <200807081317.m68DHolO011596@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/nspluginwrapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11531 Modified Files: nspluginwrapper.spec sources Added Files: nspluginwrapper-1.1.0-build.patch nspluginwrapper-1.1.0-fork.patch nspluginwrapper-1.1.0-runtime-restart.patch Removed Files: nspluginwrapper-0.9.91.5-cpp-plugins.patch nspluginwrapper-0.9.91.5-fork.patch nspluginwrapper-0.9.91.5-npviewer-gthread.patch nspluginwrapper-0.9.91.5-restart.patch nspluginwrapper-0.9.91.5-rh.patch nspluginwrapper-0.9.91.5-rpc-error.patch nspluginwrapper-0.9.91.5-runtime-restart.patch nspluginwrapper-0.9.91.5-xulrunner.patch Log Message: * Tue Jul 8 2008 Martin Stransky 1.1.0-1 - update to latest upstream version (1.1.0) nspluginwrapper-1.1.0-build.patch: --- NEW FILE nspluginwrapper-1.1.0-build.patch --- diff -up nspluginwrapper-1.1.0/configure.build nspluginwrapper-1.1.0/configure --- nspluginwrapper-1.1.0/configure.build 2008-06-29 22:19:50.000000000 +0200 +++ nspluginwrapper-1.1.0/configure 2008-07-07 16:26:11.000000000 +0200 @@ -3,6 +3,8 @@ # nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne # derived from qemu configure script, (C) 2003 Fabrice Bellard # +set -x + PACKAGE=nspluginwrapper # set temporary file name @@ -23,11 +25,14 @@ TMPS="${TMPDIR1}/npw-conf-${RANDOM}-$$-$ prefix="/usr" lib32="" lib64="" -x_base_dirs="" -biarch="guess" -build_viewer="guess" +base_lib="" +base_libdir="" +pkglibdir="" +x_base_dir="" +biarch="no" +build_viewer="no" build_player="yes" -linux_only="guess" +linux_only="yes" strip="no" cc="gcc" cxx="g++" @@ -62,6 +67,8 @@ x86_64|amd64) ;; esac bigendian="no" +with_xpcom="no" +with_gecko="mozilla" # find source path # XXX: we assume an absolute path is given when launching configure, @@ -79,6 +86,9 @@ case "$opt" in --prefix=*) prefix=`echo $opt | cut -d '=' -f 2` ;; +--pkgdir=*) + pkgdir=`echo $opt | cut -d '=' -f 2` + ;; --pkglibdir=*) pkglibdir=`echo $opt | cut -d '=' -f 2` ;; @@ -88,6 +98,12 @@ case "$opt" in --target-cpu=*) target_cpu=`echo $opt | cut -d '=' -f 2 | sed -e 's/^i.86$/i386/'` ;; +--with-base-lib=*) + base_lib=`echo $opt | cut -d '=' -f 2` + ;; +--with-base-libdir=*) + base_libdir=`echo $opt | cut -d '=' -f 2` + ;; --enable-generic) linux_only="no" ;; @@ -122,7 +138,7 @@ case "$opt" in lib64=`echo $opt | cut -d '=' -f 2` ;; --with-x11-prefix=*) - x_base_dirs=`echo $opt | cut -d '=' -f 2` + x_base_dir=`echo $opt | cut -d '=' -f 2` ;; --with-cc=*) cc=`echo $opt | cut -d '=' -f 2` @@ -130,6 +146,12 @@ case "$opt" in --with-cxx=*) cxx=`echo $opt | cut -d '=' -f 2` ;; +--with-xpcom=*) + with_xpcom=`echo $opt | cut -d '=' -f 2` + ;; +--with-gecko=*) + with_gecko=`echo $opt | cut -d '=' -f 2` + ;; esac done @@ -364,8 +386,8 @@ rm -f $TMPC $TMPE # check for GTK+ 2.0 compile CFLAGS if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then if $pkgconfig --exists gtk+-2.0; then - GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0` - GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0` + GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0 gthread-2.0` + GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0 gthread-2.0` else echo "GTK+ 2.0 environment not found" exit 1 @@ -415,25 +437,30 @@ EOF rm -f $TMPC $TMPE fi -# check for X11 base dir -if test -z "$x_base_dirs"; then - x_base_dirs=" - /usr - /usr/X11R6 - /usr/local/X11R6 - $prefix - " -fi -for dir in $x_base_dirs; do - x_include_dir="$dir/include" - if test -f $x_include_dir/X11/Intrinsic.h; then - x_lib_dir="$dir/$lib64" - if test -f $x_lib_dir/libX11.so; then - x_base_dir=$dir - break - fi +# check for Gecko compile CFLAGS +if $pkgconfig --exists $with_gecko-plugin; then + GECKO_CFLAGS=`$pkgconfig --cflags $with_gecko-plugin` + GECKO_LDFLAGS=`$pkgconfig --libs $with_gecko-plugin` + GECKO_LIBDIR="" +else + echo "gecko-devel not found" + exit 1 +fi + + +# check for XPCOM compile CFLAGS +if [ $with_xpcom == "yes" ]; then + if $pkgconfig --exists $with_gecko-xpcom; then + GECKO_CFLAGS="$GECKO_CFLAGS"`$pkgconfig --cflags $with_gecko-xpcom` + GECKO_LDFLAGS="$GECKO_LDFLAGS"`$pkgconfig --libs $with_gecko-xpcom` + GECKO_LIBDIR="$GECKO_LIBDIR"`$pkgconfig --libs-only-L $with_gecko-xpcom | sed -e "s|-L||" -e "s| ||g"` + else + echo "gecko-devel (XPCOM) not found" + exit 1 fi -done +fi + +# check for X11 base dir if test -z "$x_base_dir"; then echo "X11 environment not found" exit 1 @@ -544,6 +571,7 @@ EOF echo "Standard options:" echo " --help print this message" echo " --prefix=PREFIX install in PREFIX [$prefix]" +echo " --pkgdir=name name of package directory [$pkgdir]" echo " --pkglibdir=ROOT install private files in ROOT [$pkglibdir]" echo " --target-os=OS build plugin support for target OS [$target_os]" echo " --target-cpu=CPU build plugin support for target CPU [$target_cpu]" @@ -560,12 +588,14 @@ echo " --with-lib64=NAME use echo " --with-x11-prefix=PREFIX use PREFIX as the X11 base dir [autodetect]" echo " --with-cc=CC use C compiler CC [$cc]" echo " --with-cxx=CXX use C++ compiler CXX [$cxx]" +echo " --with-xpcom=yes/no compile and link with XPCOM support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 fi echo "Install prefix $prefix" +echo "nspluginwrapper dir $pkgdir" echo "nspluginwrapper root dir $pkglibdir" echo "Strip binaries $strip" echo "Bi-arch build $biarch" @@ -582,6 +612,8 @@ echo "host CPU $host_cp echo "host big endian $bigendian" echo "target OS $target_os" echo "target CPU $target_cpu" +echo "Gecko $with_gecko" +echo "Gecko XPCOM support $with_xpcom" config_mak="config-host.mak" echo "# Automatically generated by configure - do not modify" > $config_mak @@ -593,18 +625,18 @@ echo "COMPILER=$compiler" >> $config_mak echo "CC=$cc" >> $config_mak echo "CXX=$cxx" >> $config_mak echo "CFLAGS=$CFLAGS" >> $config_mak +echo "LDFLAGS=$LDFLAGS" >> $config_mak echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak echo "GTK_LDFLAGS=$GTK_LDFLAGS" >> $config_mak echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak echo "CURL_LDFLAGS=$CURL_LDFLAGS" >> $config_mak -if test "$biarch" = "yes"; then -echo "LDFLAGS_32=-m32" >> $config_mak -echo "CFLAGS_32=$CFLAGS_32" >> $config_mak -else -echo 'CFLAGS_32=$(CFLAGS)' >> $config_mak -fi +echo "GECKO_CFLAGS=$GECKO_CFLAGS" >> $config_mak +echo "GECKO_LDFLAGS=$GECKO_LDFLAGS" >> $config_mak +echo "GECKO_LIBDIR=$GECKO_LIBDIR" >> $config_mak + +host_os=$target_os if test "$host_os" = "linux"; then echo "OS=linux" >> $config_mak echo "#define HOST_LINUX 1" >> $config_h @@ -625,6 +657,8 @@ else echo "Unsupported OS" exit 1 fi + +host_cpu=$target_cpu if test "$host_cpu" = "i386" ; then echo "ARCH=i386" >> $config_mak echo "#define HOST_I386 1" >> $config_h @@ -666,20 +700,22 @@ if test -n "$fbigendian" ; then fi echo "SRC_PATH=$source_path" >> $config_mak -echo "build_viewer=$build_viewer" >> $config_mak -echo "build_player=$build_player" >> $config_mak -echo "biarch=$biarch" >> $config_mak echo "lib32=$lib32" >> $config_mak echo "lib64=$lib64" >> $config_mak echo "prefix=$prefix" >> $config_mak echo "bindir=$prefix/bin" >> $config_mak -libdir="$prefix/$lib64" -echo "libdir=$libdir" >> $config_mak -echo "#define LIB \"$lib64\"" >> $config_h -echo "#define LIBDIR \"$libdir\"" >> $config_h +echo "base_libdir=$base_libdir" >> $config_mak +echo "#define LIB \"$base_lib\"" >> $config_h +echo "#define LIBDIR \"$base_libdir\"" >> $config_h echo "x11prefix=$x_base_dir" >> $config_mak echo "ALLOW_STRIP=$strip" >> $config_mak +if [ $with_xpcom == "yes" ]; then + echo "#define USE_XPCOM 1" >> $config_h +else + echo "#define USE_XPCOM 0" >> $config_h +fi + VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[ ]*/s///p'` RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[ ]*/s///p'` SVNDATE=`sed < $source_path/$PACKAGE.spec -n '/^\%define svndate[ ]*/s///p'` @@ -700,8 +736,14 @@ else echo "#define NPW_VERSION \"$VERSION\"" >> $config_h fi +echo "#define NPW_PREFIX \"$prefix\"" >> $config_h +echo "#define NPW_LIB32 \"$lib32\"" >> $config_h +echo "#define NPW_LIB64 \"$lib64\"" >> $config_h + +echo "pkgdir=$pkgdir" >> $config_mak +echo "#define NPW_DIR \"$pkgdir\"" >> $config_h + echo "pkglibdir=$pkglibdir" >> $config_mak -echo "#define NPW_LIBDIR \"$pkglibdir\"" >> $config_h if test "$has_visibility_attribute" = "yes"; then echo "#define attribute_hidden __attribute__((visibility(\"hidden\")))" >> $config_h @@ -729,9 +771,8 @@ config_h="config.h" echo "/* Automatically generated by configure - do not modify */" > $config_h echo "#include \"config-host.h\"" >> $config_h -if test "$linux_only" = "yes"; then - echo "#define BUILD_LINUX_ONLY 1" >> $config_h -fi +# Linux only by default +echo "#define BUILD_LINUX_ONLY 1" >> $config_h if test "$target_os" = "linux"; then echo "TARGET_OS=linux" >> $config_mak @@ -772,3 +813,7 @@ if test "$source_path_used" = "yes" ; th esac ln -sf $source_path/Makefile Makefile fi + +# Don't strip binaries +echo "DONT_STRIP=yes" >> $config_mak + diff -up nspluginwrapper-1.1.0/Makefile.build nspluginwrapper-1.1.0/Makefile --- nspluginwrapper-1.1.0/Makefile.build 2008-07-06 22:15:03.000000000 +0200 +++ nspluginwrapper-1.1.0/Makefile 2008-07-07 16:25:17.000000000 +0200 @@ -59,23 +59,6 @@ ifneq (,$(findstring $(OS),netbsd dragon X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64) endif -ARCH_32 = $(ARCH) -ifeq ($(biarch), yes) -ARCH_32 = $(TARGET_ARCH) -LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so -LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so) -LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a) -LSB_LIBS += $(LSB_DESKTOP_STUBS:%=$(LSB_OBJ_DIR)/%.so) -endif - -LSB_TOP_DIR = $(SRC_PATH)/lsb-build -LSB_INC_DIR = $(LSB_TOP_DIR)/headers -LSB_SRC_DIR = $(LSB_TOP_DIR)/stub_libs -LSB_OBJ_DIR = lsb-build-$(ARCH_32) -LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist) -LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist) -LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist) - ifeq (i386,$(TARGET_ARCH)) TARGET_ELF_ARCH = elf32-i386 endif @@ -83,33 +66,22 @@ ifeq (ppc,$(TARGET_ARCH)) TARGET_ELF_ARCH = elf32-powerpc endif -MOZILLA_CFLAGS = -I$(SRC_PATH)/npapi -I$(SRC_PATH)/npapi/nspr +MOZILLA_CFLAGS = $(GECKO_CFLAGS) +MOZILLA_LDFLAGS = $(GECKO_LDFLAGS) npwrapper_LIBRARY = npwrapper.so -npwrapper_RAWSRCS = npw-wrapper.c npw-rpc.c rpc.c debug.c utils.c npruntime.c +npwrapper_RAWSRCS = npw-wrapper.c npw-rpc.c rpc.c debug.c utils.c npruntime.c npw-dir.c npwrapper_SOURCES = $(npwrapper_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) npwrapper_OBJECTS = $(npwrapper_RAWSRCS:%.c=npwrapper-%.os) npwrapper_CFLAGS = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS) -npwrapper_LDFLAGS = $(X_LDFLAGS) $(libpthread_LDFLAGS) -npwrapper_LDFLAGS += $(GLIB_LDFLAGS) +npwrapper_LDFLAGS = $(LDFLAGS) $(X_LDFLAGS) $(libpthread_LDFLAGS) $(GLIB_LDFLAGS) $(MOZILLA_LDFLAGS) npviewer_PROGRAM = npviewer.bin npviewer_RAWSRCS = npw-viewer.c npw-rpc.c rpc.c debug.c utils.c npruntime.c npviewer_SOURCES = $(npviewer_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o) -ifeq ($(biarch),yes) -npviewer_CFLAGS = $(CFLAGS_32) -npviewer_CFLAGS += -I$(LSB_INC_DIR) -npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 -npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 -npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) -npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt -else -npviewer_CFLAGS += $(GTK_CFLAGS) -npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS) -endif -npviewer_CFLAGS += $(MOZILLA_CFLAGS) -npviewer_LDFLAGS += $(libdl_LDFLAGS) $(libpthread_LDFLAGS) -lgthread-2.0 +npviewer_CFLAGS = $(CFLAGS) $(GTK_CFLAGS) $(MOZILLA_CFLAGS) +npviewer_LDFLAGS = $(LDFLAGS) $(GTK_LDFLAGS) $(X_LDFLAGS) $(libdl_LDFLAGS) $(libpthread_LDFLAGS) $(MOZILLA_LDFLAGS) ifeq ($(TARGET_ARCH),i386) npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map endif @@ -117,11 +89,9 @@ ifneq ($(npviewer_MAPFILE),) npviewer_LDFLAGS += -Wl,--export-dynamic npviewer_LDFLAGS += -Wl,--version-script,$(npviewer_MAPFILE) endif -ifeq ($(OS):$(TARGET_ARCH),linux:i386) npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp npviewer_OBJECTS += npviewer-cxxabi-compat.o npviewer_LDFLAGS += -lsupc++ -endif npplayer_PROGRAM = npplayer npplayer_SOURCES = npw-player.c debug.c rpc.c utils.c glibcurl.c gtk2xtbin.c $(tidy_SOURCES) @@ -151,10 +121,11 @@ libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LS endif npconfig_PROGRAM = npconfig -npconfig_RAWSRCS = npw-config.c +npconfig_RAWSRCS = npw-config.c npw-dir.c npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c) npconfig_OBJECTS = $(npconfig_RAWSRCS:%.c=npconfig-%.o) -npconfig_LDFLAGS = $(libdl_LDFLAGS) +npconfig_CFLAGS = $(CFLAGS) $(MOZILLA_CFLAGS) +npconfig_LDFLAGS = $(LDFLAGS) $(libdl_LDFLAGS) $(MOZILLA_LDFLAGS) ifneq (,$(findstring $(OS),netbsd dragonfly)) # We will try to dlopen() the native plugin library. If that lib is # linked against libpthread, then so must our program too. @@ -170,11 +141,8 @@ CPPFLAGS = -I. -I$(SRC_PATH) TARGETS = $(npconfig_PROGRAM) TARGETS += $(nploader_PROGRAM) TARGETS += $(npwrapper_LIBRARY) -ifeq ($(build_viewer),yes) TARGETS += $(npviewer_PROGRAM) -TARGETS += $(libxpcom_LIBRARY) TARGETS += $(libnoxshm_LIBRARY) -endif ifeq ($(build_player),yes) TARGETS += $(npplayer_PROGRAM) endif @@ -242,56 +210,19 @@ uninstall.config: rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM) uninstall.mkruntime: rm -f $(DESTDIR)$(pkglibdir)/noarch/mkruntime - -install: install.dirs install.player install.wrapper install.viewer install.libxpcom install.libnoxshm install.loader install.config install.mkruntime +install: install.dirs install.wrapper install.viewer install.loader install.config install.dirs: - mkdir -p $(DESTDIR)$(pkglibdir)/noarch - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH) - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS) -ifneq ($(ARCH),$(ARCH_32)) - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32) - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS) -endif -ifeq ($(build_player),yes) -install.player: $(npplayer_PROGRAM) - install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) - mkdir -p $(DESTDIR)$(bindir) - $(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer -else -install.player: -endif + mkdir -p $(DESTDIR)$(pkglibdir) install.wrapper: $(npwrapper_LIBRARY) - install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY) -ifeq ($(build_viewer),yes) -install.viewer: install.viewer.bin install.viewer.glue -install.libxpcom: do.install.libxpcom -install.libnoxshm: do.install.libnoxshm -else -install.viewer: -install.libxpcom: -install.libnoxshm: -endif + install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(npwrapper_LIBRARY) +install.viewer: install.viewer.bin + install.viewer.bin: $(npviewer_PROGRAM) - install -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM) -install.viewer.glue:: - p=$(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM:%.bin=%); \ - echo "#!/bin/sh" > $$p; \ - echo "TARGET_OS=$(TARGET_OS)" >> $$p; \ - echo "TARGET_ARCH=$(TARGET_ARCH)" >> $$p; \ - echo ". $(pkglibdir)/noarch/$(nploader_PROGRAM)" >> $$p; \ - chmod 755 $$p -do.install.libxpcom: $(libxpcom_LIBRARY) - install -m 755 $(STRIP_OPT) $(libxpcom_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libxpcom_LIBRARY) -do.install.libnoxshm: $(libnoxshm_LIBRARY) - install -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libnoxshm_LIBRARY) + install -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npviewer_PROGRAM) install.config: $(npconfig_PROGRAM) - install -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM) - mkdir -p $(DESTDIR)$(bindir) - $(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper + install -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npconfig_PROGRAM) install.loader: $(nploader_PROGRAM) - install -m 755 $(nploader_PROGRAM) $(DESTDIR)$(pkglibdir)/noarch/$(nploader_PROGRAM) -install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh - install -m 755 $< $(DESTDIR)$(pkglibdir)/noarch/mkruntime + install -m 755 $(nploader_PROGRAM) $(DESTDIR)$(pkglibdir)/$(nploader_PROGRAM) $(archivedir):: [ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1 @@ -340,13 +271,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c $(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) - $(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) + $(CC) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) npviewer-%.o: $(SRC_PATH)/src/%.c - $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER + $(CC) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER npviewer-%.o: $(SRC_PATH)/src/%.cpp - $(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER + $(CXX) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) $(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS) @@ -356,12 +287,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c npplayer-%.o: $(SRC_PATH)/src/tidy/%.c $(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER -$(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) - $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,--soname,libxpcom.so - -libxpcom-%.o: $(SRC_PATH)/src/%.c - $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM - $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,--soname,libnoxshm.so @@ -372,17 +297,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS) $(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) npconfig-%.o: $(SRC_PATH)/src/%.c - $(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) + $(CC) -o $@ -c $< $(CPPFLAGS) $(npconfig_CFLAGS) $(nploader_PROGRAM): $(nploader_SOURCES) - sed -e "s|%NPW_LIBDIR%|$(pkglibdir)|" $< > $@ + sed -e "s|%NPW_PREFIX%|$(prefix)|" \ + -e "s|%NPW_LIB32%|$(lib32)|" \ + -e "s|%NPW_LIB64%|$(lib64)|" \ + -e "s|%TARGET_OS%|$(TARGET_OS)|" \ + -e "s|%TARGET_ARCH%|$(TARGET_ARCH)|" \ + -e "s|%GECKO_LIBDIR%|$(GECKO_LIBDIR)|" \ + -e "s|%NPW_DIR%|$(pkgdir)|" $< > $@ chmod 755 $@ $(LSB_OBJ_DIR):: @[ -d $(LSB_OBJ_DIR) ] || mkdir $(LSB_OBJ_DIR) > /dev/null 2>&1 $(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c - $(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@ + $(CC) $(CFLAGS) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@ $(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o $(AR) rc $@ $< @@ -395,6 +326,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ $(LN_S) libgcc_s.so $@ $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o - $(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \ + $(CC) $(LDFLAGS) -nostdlib $(DSO_LDFLAGS) $< -o $@ \ -Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \ -Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '` diff -up nspluginwrapper-1.1.0/src/debug.h.build nspluginwrapper-1.1.0/src/debug.h --- nspluginwrapper-1.1.0/src/debug.h.build 2008-06-21 22:13:34.000000000 +0200 +++ nspluginwrapper-1.1.0/src/debug.h 2008-07-07 16:25:17.000000000 +0200 @@ -33,7 +33,7 @@ extern void npw_printf(const char *forma extern void npw_vprintf(const char *format, va_list args) attribute_hidden; #if DEBUG -#define bug npw_dprintf +#define bug npw_dprintf("%s:%d",__FILE__,__LINE__);npw_dprintf #define D(x) x #else #define D(x) ; diff -up nspluginwrapper-1.1.0/src/npw-config.c.build nspluginwrapper-1.1.0/src/npw-config.c --- nspluginwrapper-1.1.0/src/npw-config.c.build 2008-06-26 23:44:15.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-07 16:25:17.000000000 +0200 @@ -38,10 +38,15 @@ #include #include +#include + +#include "npw-dir.h" static bool g_auto = false; static bool g_verbose = false; static const char NPW_CONFIG[] = "nspluginwrapper"; +static char *p_plugin_dir = NULL; +static char *p_plugin_prefix = NULL; static void error(const char *format, ...) { @@ -474,83 +479,32 @@ enum { EXIT_VIEWER_NOT_FOUND = -2, EXIT_VIEWER_ERROR = -1, EXIT_VIEWER_OK = 0, - EXIT_VIEWER_NATIVE = 20 }; -static int detect_plugin_viewer(const char *filename, NPW_PluginInfo *out_plugin_info) +static int detect_plugin_viewer_fast(const char *filename, NPW_PluginInfo *out_plugin_info) { - static const char *target_arch_table[] = { - NULL, - "i386", - NULL - }; - const int target_arch_table_size = sizeof(target_arch_table) / sizeof(target_arch_table[0]); + char viewer_arch_path[PATH_MAX]; + get_viewer_path(viewer_arch_path,PATH_MAX,out_plugin_info->target_arch); + if (access(viewer_arch_path, F_OK) != 0) { + return(EXIT_VIEWER_NOT_FOUND); + } - if (out_plugin_info && out_plugin_info->target_arch[0] != '\0') - target_arch_table[0] = out_plugin_info->target_arch; - else - target_arch_table[0] = NULL; - - static const char *target_os_table[] = { - NULL, - "linux", - NULL - }; - const int target_os_table_size = sizeof(target_os_table) / sizeof(target_os_table[0]); + char viewer_path[PATH_MAX]; + sprintf(viewer_path, "%s/%s", viewer_arch_path, NPW_VIEWER); + if (access(viewer_path, F_OK) != 0) + return(EXIT_VIEWER_NOT_FOUND); - if (out_plugin_info && out_plugin_info->target_os[0] != '\0') - target_os_table[0] = out_plugin_info->target_os; - else - target_os_table[0] = NULL; - - // don't wrap plugins for host OS/ARCH - if (out_plugin_info - && out_plugin_info->target_arch && strcmp(out_plugin_info->target_arch, HOST_ARCH) == 0 - && out_plugin_info->target_os && strcmp(out_plugin_info->target_os, HOST_OS) == 0) - return EXIT_VIEWER_NATIVE; - - for (int i = 0; i < target_arch_table_size; i++) { - const char *target_arch = target_arch_table[i]; - if (target_arch == NULL) - continue; - char viewer_arch_path[PATH_MAX]; - sprintf(viewer_arch_path, "%s/%s", NPW_LIBDIR, target_arch); - if (access(viewer_arch_path, F_OK) != 0) { - target_arch_table[i] = NULL; // this target ARCH is not available, skip it for good - continue; - } - for (int j = 0; j < target_os_table_size; j++) { - const char *target_os = target_os_table[j]; - if (target_os == NULL) - continue; - char viewer_path[PATH_MAX]; - sprintf(viewer_path, "%s/%s/%s", viewer_arch_path, target_os, NPW_VIEWER); - if (access(viewer_path, F_OK) != 0) - continue; - int pid = fork(); - if (pid < 0) - continue; - else if (pid == 0) { - execl(viewer_path, NPW_VIEWER, "--test", "--plugin", filename, NULL); - exit(1); - } - else { - int status; - while (waitpid(pid, &status, 0) != pid) - ; - if (WIFEXITED(status)) { - status = WEXITSTATUS(status); - if (status == EXIT_VIEWER_OK && out_plugin_info) { - strcpy(out_plugin_info->target_arch, target_arch); - strcpy(out_plugin_info->target_os, target_os); - } - return status; - } - return EXIT_VIEWER_ERROR; - } - } + return(EXIT_VIEWER_OK); +} + +static int detect_plugin_viewer(const char *filename, NPW_PluginInfo *out_plugin_info) +{ + if(out_plugin_info && out_plugin_info->target_arch) { + return(detect_plugin_viewer_fast(filename, out_plugin_info)); + } + else { + return(EXIT_VIEWER_NOT_FOUND); } - return EXIT_VIEWER_NOT_FOUND; } static bool is_plugin_viewer_available(const char *filename, NPW_PluginInfo *out_plugin_info) @@ -717,7 +671,9 @@ static int do_install_plugin(const char plugin_base += 1; char d_plugin_path[PATH_MAX]; - int n = snprintf(d_plugin_path, sizeof(d_plugin_path), "%s/%s.%s", plugin_dir, NPW_WRAPPER_BASE, plugin_base); + int n = snprintf(d_plugin_path, sizeof(d_plugin_path), + "%s/%s.%s", plugin_dir, p_plugin_prefix ? p_plugin_prefix : NPW_WRAPPER_BASE, + plugin_base); if (n < 0 || n >= sizeof(d_plugin_path)) return 3; @@ -804,28 +760,32 @@ static int install_plugin(const char *pl if (g_verbose) printf("Install plugin %s\n", plugin_path); - // don't install plugin system-wide if it is only accessible by root - if (!is_root_only_accessible_plugin(plugin_path)) { - ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info); - if (ret == 0) - return 0; + if(p_plugin_dir) { + ret = do_install_plugin(plugin_path, p_plugin_dir, plugin_info); } + else { + // don't install plugin system-wide if it is only accessible by root + if (!is_root_only_accessible_plugin(plugin_path)) { + ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info); + if (ret == 0) + return 0; + } - // don't install plugin in user home dir if already available system-wide - if (has_system_wide_wrapper_plugin(plugin_path, true)) { - if (g_verbose) - printf(" ... already installed system-wide, skipping\n"); - return 0; + // don't install plugin in user home dir if already available system-wide + if (has_system_wide_wrapper_plugin(plugin_path, true)) { + if (g_verbose) + printf(" ... already installed system-wide, skipping\n"); + return 0; + } + + const char *user_plugin_dir = get_user_mozilla_plugin_dir(); + if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0) + return 1; + + ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info); + if (ret == 0) + return 0; } - - const char *user_plugin_dir = get_user_mozilla_plugin_dir(); - if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0) - return 1; - - ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info); - if (ret == 0) - return 0; - return ret; } @@ -968,6 +928,8 @@ static void print_usage(void) printf(" -h --help print this message\n"); printf(" -v --verbose flag: set verbose mode\n"); printf(" -a --auto flag: set automatic mode for plugins discovery\n"); + printf(" -d --dir plugin-dir flag: target plugin(s) directory\n"); + printf(" -p --prefix prefix flag: a prefix of wrapped plugin file\n"); printf(" -l --list list plugins currently installed\n"); printf(" -u --update update plugin(s) currently installed\n"); printf(" -i --install [FILE(S)] install plugin(s)\n"); @@ -993,6 +955,18 @@ static int process_auto(int argc, char * return 0; } +static int process_dir(int argc, char *argv[]) +{ + p_plugin_dir = argv[0]; + return 0; +} + +static int process_prefix(int argc, char *argv[]) +{ + p_plugin_prefix = argv[0]; + return 0; +} + static int process_list(int argvc, char *argv[]) { const char **plugin_dirs = get_mozilla_plugin_dirs(); @@ -1048,8 +1022,6 @@ static int process_install(int argc, cha error("%s is not a valid NPAPI plugin", plugin_path); ret = detect_plugin_viewer(plugin_path, &plugin_info); if (ret != EXIT_VIEWER_OK) { - if (ret == EXIT_VIEWER_NATIVE) - return 0; /* silently ignore exit status */ error("no appropriate viewer found for %s", plugin_path); } ret = install_plugin(plugin_path, &plugin_info); @@ -1084,55 +1056,54 @@ static int process_remove(int argc, char int main(int argc, char *argv[]) { - char **args; - int i, j, n_args; - - n_args = argc - 1; - args = argv + 1; + int i, j; - if (n_args < 1) { + if (argc < 2) { print_usage(); return 1; } - if (args[0][0] != '-') { + if (argv[1][0] != '-') { print_usage(); return 1; } static const struct option { - char short_option; + const char *short_option; const char *long_option; int (*process_callback)(int argc, char *argv[]); bool terminal; + int extra_args; } options[] = { - { 'h', "help", process_help, 1 }, - { 'v', "verbose", process_verbose, 0 }, - { 'a', "auto", process_auto, 0 }, - { 'l', "list", process_list, 1 }, - { 'u', "update", process_update, 1 }, - { 'i', "install", process_install, 1 }, - { 'r', "remove", process_remove, 1 }, - { 0, NULL, NULL, 1 } + { "-h", "--help", process_help, 1, 0 }, + { "-v", "--verbose", process_verbose, 0, 0 }, + { "-a", "--auto", process_auto, 0, 0 }, + { "-d", "--dir", process_dir, 0, 1 }, + { "-p", "--prefix", process_prefix, 0, 1 }, + { "-l", "--list", process_list, 1, 0 }, + { "-u", "--update", process_update, 1, 0 }, + { "-i", "--install", process_install, 1, 0 }, + { "-r", "--remove", process_remove, 1, 0 } }; - for (i = 0; i < n_args; i++) { - const char *arg = args[i]; + for (i = 1; i < argc; i++) { const struct option *opt = NULL; - for (j = 0; opt == NULL && options[j].process_callback != NULL; j++) { - if ((arg[0] == '-' && arg[1] == options[j].short_option && arg[2] == '\0') || - (arg[0] == '-' && arg[1] == '-' && strcmp(&arg[2], options[j].long_option) == 0)) - opt = &options[j]; + for (j = 0; j < sizeof(options)/sizeof(options[0]); j++) { + if (!strcmp(options[j].short_option,argv[i]) || !strcmp(options[j].long_option,argv[i])) { + opt = &options[j]; + break; + } } if (opt == NULL) { - fprintf(stderr, "invalid option %s\n", arg); + fprintf(stderr, "invalid option %s\n", argv[i]); print_usage(); return 1; } - int ret = opt->process_callback(n_args - i - 1, args + i + 1); + int ret = opt->process_callback(argc - i - 1, argv + i + 1); if (opt->terminal) return ret; + i += opt->extra_args; } return 0; diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.c --- /dev/null 2008-07-07 15:46:30.273004002 +0200 +++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-07 16:25:17.000000000 +0200 @@ -0,0 +1,97 @@ +/* + * npw-dir.h - Directory management for nspluginwrapper + * + * by Martin Stransky + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "sysdeps.h" +#include "npw-dir.h" + +#include +#include +#include + +/* +Expect defined: +#define NPW_PREFIX (/usr) +#define NPW_LIB32 (lib) +#define NPW_LIB64 (lib64) +#define NPW_DIR (nspluginwrapper) +*/ + +char * get_plugin_path(char *p_path, int max_path, const char *p_arch) +{ + char *p_arch_lib = NULL; + + if(!strcmp(p_arch, "i386")) { + p_arch_lib = NPW_LIB32; + } + else if(!strcmp(p_arch, "x86_64")) { + p_arch_lib = NPW_LIB64; + } + else { + assert(0); + } + snprintf(p_path,max_path,"%s/%s/%s",NPW_PREFIX,p_arch_lib,NPW_DIR); + return(p_path); +} + +char * get_plugin(char *p_path, int max_path, const char *p_arch, const char *p_plugin) +{ + char *p_arch_lib = NULL; + + if(!strcmp(p_arch, "i386")) { + p_arch_lib = NPW_LIB32; + } + else if(!strcmp(p_arch, "x86_64")) { + p_arch_lib = NPW_LIB64; + } + else { + assert(0); + } + snprintf(p_path,max_path,"%s/%s/%s/%s",NPW_PREFIX,p_arch_lib,NPW_DIR,p_plugin); + return(p_path); +} + +//#define NPW_DEFAULT_PLUGIN_PATH NPW_LIBDIR "/" HOST_ARCH "/" HOST_OS "/" NPW_WRAPPER +char * get_default_plugin(char *p_path, int max_path) +{ + snprintf(p_path,max_path,"%s/%s/%s",LIBDIR,NPW_DIR,NPW_WRAPPER); + return(p_path); +} + +//#define NPW_OLD_DEFAULT_PLUGIN_PATH NPW_LIBDIR "/" HOST_ARCH "/" NPW_WRAPPER +char * get_old_default_plugin(char *p_path, int max_path) +{ + return(get_default_plugin(p_path, max_path)); +} + +char * get_viewer_path(char *p_path, int max_path, const char *p_arch) +{ + return(get_plugin_path(p_path, max_path, p_arch)); +} + +char * get_viewer(char *p_path, int max_path, const char *p_arch, const char *p_viewer) +{ + return(get_plugin(p_path, max_path, p_arch, p_viewer)); +} + +char * get_connection_path(char *p_path, int max_path, const char *p_plugin, int init_count) +{ + snprintf(p_path, max_path, "%s/%s/%d-%d", NPW_CONNECTION_PATH, p_plugin, getpid(), init_count); + return(p_path); +} diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.h --- /dev/null 2008-07-07 15:46:30.273004002 +0200 +++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-07 16:25:17.000000000 +0200 @@ -0,0 +1,35 @@ +/* + * npw-dir.h - Directory management for nspluginwrapper + * + * by Martin Stransky + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NPW_DIR_H +#define NPW_DIR_H + +char * get_plugin_path(char *p_path, int max_path, const char *p_arch); +char * get_plugin(char *p_path, int max_path, const char *p_arch, const char *p_plugin); + +char * get_viewer_path(char *p_path, int max_path, const char *p_arch); +char * get_viewer(char *p_path, int max_path, const char *p_arch, const char *p_viewer); + +char * get_default_plugin(char *p_path, int max_path); +char * get_old_default_plugin(char *p_path, int max_path); + +char * get_connection_path(char *p_path, int max_path, const char *p_plugin, int init_count); + +#endif diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.build nspluginwrapper-1.1.0/src/npw-viewer.c --- nspluginwrapper-1.1.0/src/npw-viewer.c.build 2008-07-06 22:47:22.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-07 16:25:17.000000000 +0200 @@ -54,10 +54,6 @@ #define DEBUG 1 #include "debug.h" - -// [UNIMPLEMENTED] Define to use XPCOM emulation -#define USE_XPCOM 0 - // Define to use XEMBED #define USE_XEMBED 1 @@ -683,11 +679,14 @@ invoke_NPN_GetValue(NPP instance, NPNVar return NPERR_GENERIC_ERROR; } + D(bug("invoke_NPN_GetValue, variable = %d\n", variable & 0xffff)); + int32_t ret; switch (rpc_type_of_NPNVariable(variable)) { case RPC_TYPE_UINT32: { uint32_t n = 0; + D(bug("invoke_NPN_GetValue, type = uint32\n")); error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_UINT32, &n, RPC_TYPE_INVALID); if (error != RPC_ERROR_NO_ERROR) { npw_perror("NPN_GetValue() wait for reply", error); @@ -700,6 +699,7 @@ invoke_NPN_GetValue(NPP instance, NPNVar case RPC_TYPE_BOOLEAN: { uint32_t b = 0; + D(bug("invoke_NPN_GetValue, type = boolean\n")); error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_BOOLEAN, &b, RPC_TYPE_INVALID); if (error != RPC_ERROR_NO_ERROR) { npw_perror("NPN_GetValue() wait for reply", error); @@ -712,6 +712,7 @@ invoke_NPN_GetValue(NPP instance, NPNVar case RPC_TYPE_NP_OBJECT: { NPObject *npobj = NULL; + D(bug("invoke_NPN_GetValue, type = object\n")); error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_NP_OBJECT, &npobj, RPC_TYPE_INVALID); if (error != RPC_ERROR_NO_ERROR) { npw_perror("NPN_GetValue() wait for reply", error); @@ -721,8 +722,12 @@ invoke_NPN_GetValue(NPP instance, NPNVar *((NPObject **)value) = npobj; break; } + default: + { + npw_printf("invoke_NPN_GetValue: WARNING: unhandled type variable %d\n", variable & 0xffff); + break; + } } - return ret; } @@ -755,11 +760,19 @@ g_NPN_GetValue(NPP instance, NPNVariable case NPNVserviceManager: { nsIServiceManager *sm; int ret = NS_GetServiceManager(&sm); - if (NS_FAILED(ret)) + if (NS_FAILED(ret)) { + npw_printf("WARNING: NS_GetServiceManager failed\n"); return NPERR_GENERIC_ERROR; + } *(nsIServiceManager **)value = sm; break; } + case NPNVDOMElement: + npw_printf("WARNING: NPNVDOMElement is not supported by NPN_GetValue()\n"); + return NPERR_INVALID_PARAM; + case NPNVDOMWindow: + npw_printf("WARNING: NPNVDOMWindow is not supported by NPN_GetValue()\n"); + return NPERR_INVALID_PARAM; #endif case NPNVnetscapeWindow: { PluginInstance *plugin = PLUGIN_INSTANCE(instance); @@ -783,12 +796,13 @@ g_NPN_GetValue(NPP instance, NPNVariable case NPNVWindowNPObject: case NPNVPluginElementNPObject: { int ret = invoke_NPN_GetValue(instance, variable, value); - if (ret == NPERR_NO_ERROR) - return ret; - // fall-through + if(ret != NPERR_NO_ERROR) + npw_printf("WARNING: error %d returner for %d from NPN_GetValue()\n", ret, variable & 0xffff); + return ret; + } default: - npw_printf("WARNING: unhandled variable %d in NPN_GetValue()\n", variable); + npw_printf("WARNING: unhandled variable %d in NPN_GetValue()\n", variable & 0xffff); return NPERR_INVALID_PARAM; } diff -up nspluginwrapper-1.1.0/src/npw-viewer.sh.build nspluginwrapper-1.1.0/src/npw-viewer.sh --- nspluginwrapper-1.1.0/src/npw-viewer.sh.build 2008-07-06 18:37:56.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-07 16:25:17.000000000 +0200 @@ -4,7 +4,13 @@ # OS="`uname -s`" ARCH="`uname -m`" -NPW_LIBDIR="%NPW_LIBDIR%" +NPW_PREFIX="%NPW_PREFIX%" +NPW_LIB32="%NPW_LIB32%" +NPW_LIB64="%NPW_LIB64%" +TARGET_OS="%TARGET_OS%" +TARGET_ARCH="%TARGET_ARCH%" +NPW_DIR="%NPW_DIR%" +GECKO_LIBDIR="%GECKO_LIBDIR%" if test -z "$TARGET_OS"; then echo "*** NSPlugin Viewer *** error, TARGET_OS not initialized" @@ -16,11 +22,6 @@ if test -z "$TARGET_ARCH"; then exit 1 fi -NPW_VIEWER_DIR=$NPW_LIBDIR/$TARGET_ARCH/$TARGET_OS - -# Set a new LD_LIBRARY_PATH that is TARGET specific -export LD_LIBRARY_PATH=$NPW_VIEWER_DIR - # Note that a clever DBT will work at the function level and XShm # should be possible with a proper native replacement to emulated code # XXX: BTW, anything other than "yes" is interpreted as "no" @@ -58,6 +59,9 @@ if test "$ARCH" != "$TARGET_ARCH"; then NPW_USE_XSHM=no fi ;; + x86_64) + LOADER="" + ;; ppc) if test "$ARCH" = "ppc64"; then case "$OS" in @@ -92,6 +96,25 @@ if test "$NPW_USE_XSHM" != "yes"; then fi fi +# Set NPW_VIEWER_DIR (TARGET specific) +case $TARGET_ARCH in + i386) + NPW_VIEWER_DIR=$NPW_PREFIX/$NPW_LIB32/$NPW_DIR + ;; + x86_64) + NPW_VIEWER_DIR=$NPW_PREFIX/$NPW_LIB64/$NPW_DIR + ;; + ppc) + NPW_VIEWER_DIR=$NPW_PREFIX/$NPW_LIB32/$NPW_DIR + ;; + ppc64) + NPW_VIEWER_DIR=$NPW_PREFIX/$NPW_LIB64/$NPW_DIR + ;; +esac + +# Set a new LD_LIBRARY_PATH that is TARGET specific +export LD_LIBRARY_PATH=$NPW_VIEWER_DIR:$GECKO_LIBDIR + # Expand PATH for RealPlayer package on NetBSD (realplay) if test "$OS" = "NetBSD"; then REALPLAYER_HOME="/usr/pkg/lib/RealPlayer" diff -up nspluginwrapper-1.1.0/src/npw-wrapper.c.build nspluginwrapper-1.1.0/src/npw-wrapper.c --- nspluginwrapper-1.1.0/src/npw-wrapper.c.build 2008-07-06 22:07:21.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-07 16:25:17.000000000 +0200 @@ -44,6 +44,7 @@ #include "rpc.h" #include "npw-rpc.h" +#include "npw-dir.h" #include "utils.h" #define XP_UNIX 1 @@ -280,7 +281,7 @@ g_NPN_GetValue(NPP instance, NPNVariable if (mozilla_funcs.getvalue == NULL) return NPERR_INVALID_FUNCTABLE_ERROR; - D(bug("NPN_GetValue instance=%p, variable=%d\n", instance, variable)); + D(bug("NPN_GetValue instance=%p, variable=%d\n", instance, variable & 0xffff)); NPError ret = mozilla_funcs.getvalue(instance, variable, value); D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret))); return ret; @@ -324,6 +325,7 @@ static int handle_NPN_GetValue(rpc_conne } } + D(bug("NPN_GetValue() - Unknown type of variable %d\n",variable & 0xffff)); abort(); } @@ -1644,8 +1646,9 @@ invoke_NPP_URLNotify(PluginInstance *plu error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INVALID); - if (error != RPC_ERROR_NO_ERROR) + if (error != RPC_ERROR_NO_ERROR) { npw_perror("NPP_URLNotify() wait for reply", error); + } } static void @@ -2683,9 +2686,9 @@ static void plugin_init(int is_NP_Initia static int init_count = 0; ++init_count; char viewer_path[PATH_MAX]; - sprintf(viewer_path, "%s/%s/%s/%s", NPW_LIBDIR, NPW_Plugin.target_arch, NPW_Plugin.target_os, NPW_VIEWER); + get_viewer(viewer_path,PATH_MAX,NPW_Plugin.target_arch,NPW_VIEWER); char connection_path[128]; - sprintf(connection_path, "%s/%s/%d-%d", NPW_CONNECTION_PATH, plugin_file_name, getpid(), init_count); + get_connection_path(connection_path, 128, plugin_file_name, init_count); // Cache MIME info and plugin name/description if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) { diff -up nspluginwrapper-1.1.0/src/sysdeps.h.build nspluginwrapper-1.1.0/src/sysdeps.h --- nspluginwrapper-1.1.0/src/sysdeps.h.build 2008-06-21 22:13:34.000000000 +0200 +++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-07 16:25:17.000000000 +0200 @@ -45,8 +45,8 @@ #define NPW_VIEWER NPW_VIEWER_BASE #define NPW_WRAPPER_BASE "npwrapper" #define NPW_WRAPPER NPW_WRAPPER_BASE ".so" -#define NPW_OLD_DEFAULT_PLUGIN_PATH NPW_LIBDIR "/" HOST_ARCH "/" NPW_WRAPPER -#define NPW_DEFAULT_PLUGIN_PATH NPW_LIBDIR "/" HOST_ARCH "/" HOST_OS "/" NPW_WRAPPER +#define NPW_OLD_DEFAULT_PLUGIN_PATH LIBDIR "/" NPW_DIR "/" NPW_WRAPPER +#define NPW_DEFAULT_PLUGIN_PATH LIBDIR "/" NPW_DIR "/" NPW_WRAPPER #define NPW_PLUGIN_IDENT "NPW:" NPW_VERSION #define NPW_PLUGIN_IDENT_SIZE 32 typedef struct __attribute__((packed)) { nspluginwrapper-1.1.0-fork.patch: --- NEW FILE nspluginwrapper-1.1.0-fork.patch --- diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.fork nspluginwrapper-1.1.0/src/npw-viewer.c --- nspluginwrapper-1.1.0/src/npw-viewer.c.fork 2008-07-08 14:23:26.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-08 14:26:58.000000000 +0200 @@ -67,6 +67,20 @@ // RPC global connections rpc_connection_t *g_rpc_connection attribute_hidden = NULL; +// Viewer orignal pid - check against incorrect plugins +pid_t viewer_pid = 0; + +// Pid support routines +void pid_set(void) +{ + viewer_pid = getpid(); +} + +int pid_check(void) +{ + return(viewer_pid == getpid()); +} + // Instance state information about the plugin typedef struct _PluginInstance { NPP instance; @@ -581,6 +595,9 @@ static void g_NPN_ForceRedraw(NPP instance) { D(bug("NPN_ForceRedraw instance=%p\n", instance)); + + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; UNIMPLEMENTED(); } @@ -615,9 +632,11 @@ invoke_NPN_GetURL(NPP instance, const ch static NPError g_NPN_GetURL(NPP instance, const char *url, const char *target) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; - + D(bug("NPN_GetURL instance=%p\n", instance)); NPError ret = invoke_NPN_GetURL(instance, url, target); D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret))); @@ -655,6 +674,9 @@ invoke_NPN_GetURLNotify(NPP instance, co static NPError g_NPN_GetURLNotify(NPP instance, const char *url, const char *target, void *notifyData) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; + if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; @@ -743,8 +765,11 @@ get_real_netscape_window(NPP instance) static NPError g_NPN_GetValue(NPP instance, NPNVariable variable, void *value) -{ +{ D(bug("NPN_GetValue instance=%p, variable=%d [%08x]\n", instance, variable & 0xffff, variable)); + + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; switch (variable) { case NPNVxDisplay: @@ -837,6 +862,9 @@ g_NPN_InvalidateRect(NPP instance, NPRec { if (instance == NULL || invalidRect == NULL) return; + + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; D(bug("NPN_InvalidateRect instance=%p\n", instance)); invoke_NPN_InvalidateRect(instance, invalidRect); @@ -848,6 +876,9 @@ static void g_NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion) { D(bug("NPN_InvalidateRegion instance=%p\n", instance)); + + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; UNIMPLEMENTED(); } @@ -911,6 +942,8 @@ invoke_NPN_PostURL(NPP instance, const c static NPError g_NPN_PostURL(NPP instance, const char *url, const char *target, uint32 len, const char *buf, NPBool file) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; @@ -953,6 +986,9 @@ invoke_NPN_PostURLNotify(NPP instance, c static NPError g_NPN_PostURLNotify(NPP instance, const char *url, const char *target, uint32 len, const char *buf, NPBool file, void *notifyData) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; + if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; @@ -967,6 +1003,9 @@ static void g_NPN_ReloadPlugins(NPBool reloadPages) { D(bug("NPN_ReloadPlugins reloadPages=%d\n", reloadPages)); + + if(!pid_check()) + return; UNIMPLEMENTED(); } @@ -976,6 +1015,9 @@ static JRIEnv * g_NPN_GetJavaEnv(void) { D(bug("NPN_GetJavaEnv\n")); + + if(!pid_check()) + return NULL; return NULL; } @@ -985,6 +1027,9 @@ static jref g_NPN_GetJavaPeer(NPP instance) { D(bug("NPN_GetJavaPeer instance=%p\n", instance)); + + if(!pid_check()) + return NULL; return NULL; } @@ -1018,6 +1063,8 @@ invoke_NPN_RequestRead(NPStream *stream, static NPError g_NPN_RequestRead(NPStream *stream, NPByteRange *rangeList) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; if (stream == NULL || stream->ndata == NULL || rangeList == NULL) return NPERR_INVALID_PARAM; @@ -1066,10 +1113,13 @@ g_NPN_SetValue(NPP instance, NPPVariable if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; + PluginInstance *plugin = PLUGIN_INSTANCE(instance); if (plugin == NULL) return NPERR_INVALID_INSTANCE_ERROR; - + D(bug("NPN_SetValue instance=%p, variable=%d\n", instance, variable)); NPError ret = invoke_NPN_SetValue(plugin, variable, value); D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret))); @@ -1102,6 +1152,9 @@ invoke_NPN_Status(NPP instance, const ch static void g_NPN_Status(NPP instance, const char *message) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; + D(bug("NPN_Status instance=%p\n", instance)); invoke_NPN_Status(instance, message); D(bug(" done\n")); @@ -1130,6 +1183,9 @@ invoke_NPN_UserAgent(void) static const char * g_NPN_UserAgent(NPP instance) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; + D(bug("NPN_UserAgent instance=%p\n", instance)); if (g_user_agent == NULL) g_user_agent = invoke_NPN_UserAgent(); @@ -1212,6 +1268,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM static NPError g_NPN_NewStream(NPP instance, NPMIMEType type, const char *target, NPStream **stream) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; @@ -1257,6 +1315,9 @@ invoke_NPN_DestroyStream(NPP instance, N static NPError g_NPN_DestroyStream(NPP instance, NPStream *stream, NPError reason) { + if(!pid_check()) + return NPERR_INVALID_INSTANCE_ERROR; + if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; @@ -1314,6 +1375,9 @@ invoke_NPN_Write(NPP instance, NPStream static int32 g_NPN_Write(NPP instance, NPStream *stream, int32 len, void *buf) { + if(!pid_check()) + return -1; + if (instance == NULL) return -1; @@ -1350,6 +1414,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in static void g_NPN_PushPopupsEnabledState(NPP instance, NPBool enabled) { + if(!pid_check()) + return; if (instance == NULL) return; @@ -1381,6 +1447,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins static void g_NPN_PopPopupsEnabledState(NPP instance) { + if(!pid_check()) + return; if (instance == NULL) return; @@ -1480,6 +1548,9 @@ invoke_NPN_CreateObject(NPP instance) static NPObject * g_NPN_CreateObject(NPP instance, NPClass *class) { + if(!pid_check()) + return NULL; + if (instance == NULL) return NULL; @@ -1520,6 +1591,9 @@ invoke_NPN_RetainObject(NPObject *npobj) static NPObject * g_NPN_RetainObject(NPObject *npobj) { + if(!pid_check()) + return NULL; + if (npobj == NULL) return NULL; @@ -1558,6 +1632,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj static void g_NPN_ReleaseObject(NPObject *npobj) { + if(!pid_check()) + return; + if (npobj == NULL) return; @@ -1605,6 +1682,9 @@ static bool g_NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result) { + if(!pid_check()) + return false; + if (!instance || !npobj || !npobj->_class || !npobj->_class->invoke) return false; @@ -1652,6 +1732,9 @@ static bool g_NPN_InvokeDefault(NPP instance, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result) { + if(!pid_check()) + return false; + if (!instance || !npobj || !npobj->_class || !npobj->_class->invokeDefault) return false; @@ -1697,6 +1780,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje static bool g_NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result) { + if(!pid_check()) + return false; + if (!instance || !npobj) return false; @@ -1746,6 +1832,9 @@ static bool g_NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, NPVariant *result) { + if(!pid_check()) + return false; + if (!instance || !npobj || !npobj->_class || !npobj->_class->getProperty) return false; @@ -1792,6 +1881,9 @@ static bool g_NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, const NPVariant *value) { + if(!pid_check()) + return false; + if (!instance || !npobj || !npobj->_class || !npobj->_class->setProperty) return false; @@ -1833,6 +1925,9 @@ invoke_NPN_RemoveProperty(NPP instance, static bool g_NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) { + if(!pid_check()) + return false; + if (!instance || !npobj || !npobj->_class || !npobj->_class->removeProperty) return false; @@ -1874,6 +1969,9 @@ invoke_NPN_HasProperty(NPP instance, NPO static bool g_NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) { + if(!pid_check()) + return false; + if (!instance || !npobj || !npobj->_class || !npobj->_class->hasProperty) return false; @@ -1915,6 +2013,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj static bool g_NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName) { + if(!pid_check()) + return false; + if (!instance || !npobj || !npobj->_class || !npobj->_class->hasMethod) return false; @@ -1950,6 +2051,9 @@ invoke_NPN_SetException(NPObject *npobj, static void g_NPN_SetException(NPObject *npobj, const NPUTF8 *message) { + if(!pid_check()) + return; + D(bug("NPN_SetException npobj=%p, message='%s'\n", npobj, message)); invoke_NPN_SetException(npobj, message); D(bug(" done\n")); @@ -2011,6 +2115,8 @@ invoke_NPN_GetStringIdentifier(const NPU static NPIdentifier g_NPN_GetStringIdentifier(const NPUTF8 *name) { + if(!pid_check()) + return NULL; if (name == NULL) return NULL; @@ -2060,6 +2166,9 @@ invoke_NPN_GetStringIdentifiers(const NP static void g_NPN_GetStringIdentifiers(const NPUTF8 **names, uint32_t nameCount, NPIdentifier *identifiers) { + if(!pid_check()) + return; + if (names == NULL) return; @@ -2101,6 +2210,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti static NPIdentifier g_NPN_GetIntIdentifier(int32_t intid) { + if(!pid_check()) + return 0; + D(bug("NPN_GetIntIdentifier intid=%d\n", intid)); NPIdentifier ret = invoke_NPN_GetIntIdentifier(intid); D(bug(" return: %p\n", ret)); @@ -2137,6 +2249,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi static bool g_NPN_IdentifierIsString(NPIdentifier identifier) { + if(!pid_check()) + return false; + D(bug("NPN_IdentifierIsString identifier=%p\n", identifier)); bool ret = invoke_NPN_IdentifierIsString(identifier); D(bug(" return: %d\n", ret)); @@ -2173,6 +2288,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi static NPUTF8 * g_NPN_UTF8FromIdentifier(NPIdentifier identifier) { + if(!pid_check()) + return NULL; + D(bug("NPN_UTF8FromIdentifier identifier=%p\n", identifier)); NPUTF8 *ret = invoke_NPN_UTF8FromIdentifier(identifier); D(bug(" return: '%s'\n", ret)); @@ -2210,6 +2328,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie static int32_t g_NPN_IntFromIdentifier(NPIdentifier identifier) { + if(!pid_check()) + return 0; + D(bug("NPN_IntFromIdentifier identifier=%p\n", identifier)); int32_t ret = invoke_NPN_IntFromIdentifier(identifier); D(bug(" return: %d\n", ret)); @@ -3259,6 +3380,9 @@ static int do_main(int argc, char **argv } D(bug(" Plugin connection: %s\n", connection_path)); + pid_set(); + D(bug(" Plugin viewer pid: %d\n", viewer_pid)); + // Cleanup environment, the program may fork/exec a native shell // script and having 32-bit libraries in LD_PRELOAD is not right, // though not a fatal error nspluginwrapper-1.1.0-runtime-restart.patch: --- NEW FILE nspluginwrapper-1.1.0-runtime-restart.patch --- diff -up nspluginwrapper-1.1.0/src/npruntime.c.restart nspluginwrapper-1.1.0/src/npruntime.c --- nspluginwrapper-1.1.0/src/npruntime.c.restart 2008-06-21 22:13:34.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npruntime.c 2008-07-08 14:10:19.000000000 +0200 @@ -59,6 +59,14 @@ NPClass npclass_bridge = { npclass_invoke_RemoveProperty }; +int npclass_check(NPObject *npobj) +{ + NPObjectInfo *p_info = npobject_info_lookup(npobj); + if(!p_info->valid) + npw_printf("ERROR: NPObject %p is not valid!\n",npobj); + return(p_info->valid); +} + // NPClass::Invalidate int npclass_handle_Invalidate(rpc_connection_t *connection) { @@ -72,7 +80,7 @@ int npclass_handle_Invalidate(rpc_connec return error; } - if (npobj && npobj->_class && npobj->_class->invalidate) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->invalidate) { D(bug("NPClass::Invalidate(npobj %p)\n", npobj)); npobj->_class->invalidate(npobj); D(bug(" done\n")); @@ -83,6 +91,9 @@ int npclass_handle_Invalidate(rpc_connec void npclass_invoke_Invalidate(NPObject *npobj) { + if(!npclass_check(npobj)) + return; + int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_INVALIDATE, RPC_TYPE_NP_OBJECT, npobj, @@ -117,7 +128,7 @@ int npclass_handle_HasMethod(rpc_connect } uint32_t ret = 0; - if (npobj && npobj->_class && npobj->_class->hasMethod) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->hasMethod) { D(bug("NPClass::HasMethod(npobj %p, name id %p)\n", npobj, name)); ret = npobj->_class->hasMethod(npobj, name); D(bug(" return: %d\n", ret)); @@ -128,6 +139,9 @@ int npclass_handle_HasMethod(rpc_connect bool npclass_invoke_HasMethod(NPObject *npobj, NPIdentifier name) { + if(!npclass_check(npobj)) + return false; + int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_HAS_METHOD, RPC_TYPE_NP_OBJECT, npobj, @@ -171,7 +185,7 @@ int npclass_handle_Invoke(rpc_connection uint32_t ret = 0; NPVariant result; VOID_TO_NPVARIANT(result); - if (npobj && npobj->_class && npobj->_class->invoke) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->invoke) { D(bug("NPClass::Invoke(npobj %p, name id %p)\n", npobj, name)); ret = npobj->_class->invoke(npobj, name, args, argCount, &result); D(bug(" return: %d\n", ret)); @@ -191,6 +205,9 @@ bool npclass_invoke_Invoke(NPObject *npo if (result == NULL) return false; VOID_TO_NPVARIANT(*result); + + if(!npclass_check(npobj)) + return false; int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_INVOKE, @@ -237,7 +254,7 @@ int npclass_handle_InvokeDefault(rpc_con uint32_t ret = 0; NPVariant result; VOID_TO_NPVARIANT(result); - if (npobj && npobj->_class && npobj->_class->invokeDefault) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->invokeDefault) { D(bug("NPClass::InvokeDefault(npobj %p)\n", npobj)); ret = npobj->_class->invokeDefault(npobj, args, argCount, &result); D(bug(" return: %d\n", ret)); @@ -257,6 +274,9 @@ bool npclass_invoke_InvokeDefault(NPObje if (result == NULL) return false; VOID_TO_NPVARIANT(*result); + + if(!npclass_check(npobj)) + return false; int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_INVOKE_DEFAULT, @@ -299,7 +319,7 @@ int npclass_handle_HasProperty(rpc_conne } uint32_t ret = 0; - if (npobj && npobj->_class && npobj->_class->hasProperty) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->hasProperty) { D(bug("NPClass::HasProperty(npobj %p, name id %p)\n", npobj, name)); ret = npobj->_class->hasProperty(npobj, name); D(bug(" return: %d\n", ret)); @@ -310,6 +330,9 @@ int npclass_handle_HasProperty(rpc_conne bool npclass_invoke_HasProperty(NPObject *npobj, NPIdentifier name) { + if(!npclass_check(npobj)) + return false; + int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_HAS_PROPERTY, RPC_TYPE_NP_OBJECT, npobj, @@ -350,7 +373,7 @@ int npclass_handle_GetProperty(rpc_conne uint32_t ret = 0; NPVariant result; VOID_TO_NPVARIANT(result); - if (npobj && npobj->_class && npobj->_class->getProperty) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->getProperty) { D(bug("NPClass::GetProperty(npobj %p, name id %p)\n", npobj, name)); ret = npobj->_class->getProperty(npobj, name, &result); D(bug(" return: %d\n", ret)); @@ -367,7 +390,10 @@ bool npclass_invoke_GetProperty(NPObject if (result == NULL) return false; VOID_TO_NPVARIANT(*result); - + + if(!npclass_check(npobj)) + return false; + int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_GET_PROPERTY, RPC_TYPE_NP_OBJECT, npobj, @@ -411,7 +437,7 @@ int npclass_handle_SetProperty(rpc_conne } uint32_t ret = 0; - if (npobj && npobj->_class && npobj->_class->setProperty) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->setProperty) { D(bug("NPClass::SetProperty(npobj %p, name id %p)\n", npobj, name)); ret = npobj->_class->setProperty(npobj, name, &value); D(bug(" return: %d\n", ret)); @@ -426,6 +452,9 @@ bool npclass_invoke_SetProperty(NPObject { if (value == NULL) return false; + + if(!npclass_check(npobj)) + return false; int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_SET_PROPERTY, @@ -468,7 +497,7 @@ int npclass_handle_RemoveProperty(rpc_co } uint32_t ret = 0; - if (npobj && npobj->_class && npobj->_class->removeProperty) { + if (npobj && npobj->_class && npclass_check(npobj) && npobj->_class->removeProperty) { D(bug("NPClass::RemoveProperty(npobj %p, name id %p)\n", npobj, name)); ret = npobj->_class->removeProperty(npobj, name); D(bug(" return: %d\n", ret)); @@ -479,6 +508,9 @@ int npclass_handle_RemoveProperty(rpc_co bool npclass_invoke_RemoveProperty(NPObject *npobj, NPIdentifier name) { + if(!npclass_check(npobj)) + return false; + int error = rpc_method_invoke(g_rpc_connection, RPC_METHOD_NPCLASS_REMOVE_PROPERTY, RPC_TYPE_NP_OBJECT, npobj, @@ -513,6 +545,7 @@ NPObjectInfo *npobject_info_new(NPObject static uint32_t id; npobj_info->npobj = npobj; npobj_info->npobj_id = ++id; + npobj_info->valid = 1; } return npobj_info; } @@ -638,3 +671,14 @@ NPObject *npobject_lookup(uint32_t npobj { return g_hash_table_lookup(g_npobject_ids, (void *)(uintptr_t)npobj_id); } + +static void npruntime_deactivate_func(gpointer key, gpointer value, gpointer user_data) +{ + NPObjectInfo *p_info = (NPObjectInfo *)value; + p_info->valid = 0; +} + +void npruntime_deactivate(void) +{ + g_hash_table_foreach(g_npobjects, npruntime_deactivate_func, NULL); +} diff -up nspluginwrapper-1.1.0/src/npruntime-impl.h.restart nspluginwrapper-1.1.0/src/npruntime-impl.h --- nspluginwrapper-1.1.0/src/npruntime-impl.h.restart 2008-06-21 22:13:34.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npruntime-impl.h 2008-07-08 14:10:19.000000000 +0200 @@ -25,6 +25,7 @@ typedef struct { NPObject *npobj; uint32_t npobj_id; + uint32_t valid; } NPObjectInfo; extern NPObjectInfo *npobject_info_new(NPObject *npobj) attribute_hidden; @@ -63,4 +64,7 @@ extern int npclass_handle_Invalidate(rpc struct _NPNetscapeFuncs; extern void npruntime_init_callbacks(struct _NPNetscapeFuncs *mozilla_funcs); +// Deactivate all NPObject instances +extern void npruntime_deactivate(void); + #endif /* NPRUNTIME_IMPL_H */ diff -up nspluginwrapper-1.1.0/src/npw-wrapper.c.restart nspluginwrapper-1.1.0/src/npw-wrapper.c --- nspluginwrapper-1.1.0/src/npw-wrapper.c.restart 2008-07-08 14:10:19.000000000 +0200 +++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-08 14:10:19.000000000 +0200 @@ -107,7 +107,11 @@ typedef struct _StreamInstance { // Prototypes static void plugin_init(int is_NP_Initialize); static void plugin_exit(void); -static NPError plugin_restart_if_needed(void); + +static void plugin_kill(rpc_connection_t *connection); +static NPError plugin_start(void); +static NPError plugin_start_if_needed(void); +static int plugin_killed = 0; /* * Notes concerning NSPluginWrapper recovery model. @@ -126,10 +130,8 @@ static NPError plugin_restart_if_needed( * connection and thus can fail early/gracefully in subsequent calls * to NPP_*() functions. * - * TODO: make NPRuntime aware of per-plugin connections? This - * shouldn't matter from the Wrapper side because npruntime requests - * come from the Viewer side (see NPN_*() handlers). XXX: even with a - * running script (NPClass handlers)? + * All active NPRuntime objects are marked as inactive and + * are not processed. */ // Minimal time between two plugin restarts in sec @@ -1361,7 +1363,7 @@ g_NPP_New(NPMIMEType mime_type, NPP inst return NPERR_INVALID_INSTANCE_ERROR; // Check if we need to restart the plug-in - NPError ret = plugin_restart_if_needed(); + NPError ret = plugin_start_if_needed(); if (ret != NPERR_NO_ERROR) return ret; @@ -2870,6 +2872,9 @@ static void plugin_init(int is_NP_Initia return; } + // Set error handler - stop plugin if there's a connection error + rpc_connection_error_callback_set(g_rpc_connection, plugin_kill); + g_plugin.initialized = 1 + is_NP_Initialize; D(bug("--- INIT ---\n")); } @@ -2942,17 +2947,39 @@ static void __attribute__((destructor)) } } -static NPError plugin_restart(void) +static void plugin_kill(rpc_connection_t *connection) { if (g_plugin.is_wrapper) - return NPERR_NO_ERROR; + return; - // Shut it down + D(bug("plugin_kill, connection %p\n",connection)); + + // Kill viewer and plugin plugin_exit(); + + // Clear-up g_plugin.initialized = 0; g_plugin.viewer_pid = -1; g_plugin.is_wrapper = 0; + npruntime_deactivate(); + + // Set the kill flag + plugin_killed = 1; +} + +static NPError plugin_start(void) +{ + D(bug("plugin_start\n")); + + if(!plugin_killed) { + // Plugin is still active + // terminate it before the restart + D(bug("plugin_start: plugin_killed = 0!\n")); + plugin_kill(g_rpc_connection); + } + plugin_killed = 0; + // And start it again plugin_init(1); if (g_plugin.initialized <= 0) @@ -2961,7 +2988,7 @@ static NPError plugin_restart(void) return invoke_NP_Initialize(npapi_version); } -static NPError plugin_restart_if_needed(void) +static NPError plugin_start_if_needed(void) { if (rpc_status(g_rpc_connection) != RPC_STATUS_ACTIVE) { static time_t last_restart = 0; @@ -2971,7 +2998,7 @@ static NPError plugin_restart_if_needed( last_restart = now; D(bug("Restart plugins viewer\n")); - NPError ret = plugin_restart(); + NPError ret = plugin_start(); D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret))); return ret; } diff -up nspluginwrapper-1.1.0/src/rpc.c.restart nspluginwrapper-1.1.0/src/rpc.c --- nspluginwrapper-1.1.0/src/rpc.c.restart 2008-07-06 21:54:45.000000000 +0200 +++ nspluginwrapper-1.1.0/src/rpc.c 2008-07-08 14:18:41.000000000 +0200 @@ -427,6 +427,7 @@ struct rpc_connection { pthread_t server_thread; rpc_map_t *types; rpc_map_t *methods; + rpc_error_callback_t callback_error; }; // Increment connection reference count @@ -446,6 +447,29 @@ void rpc_connection_unref(rpc_connection } } +// Set error callback +void rpc_connection_error_callback_set(rpc_connection_t *connection, + rpc_error_callback_t callback) +{ + if (connection == NULL) + return; + if (connection->callback_error != NULL) + return; + connection->callback_error = callback; +} + +// Call error callback if the connection is closed +static void rpc_connection_error_callback_call(rpc_connection_t *connection) +{ + if (connection == NULL) + return; + if (connection->callback_error == NULL) + return; + + (connection->callback_error)(connection); + connection->callback_error = NULL; +} + // Returns connection status static inline int _rpc_status(rpc_connection_t *connection) { @@ -484,6 +508,11 @@ static inline int rpc_error(rpc_connecti assert(error < 0); assert(connection != NULL); _rpc_set_status(connection, error); + + if(_rpc_status(connection) == RPC_STATUS_CLOSED || _rpc_status(connection) == RPC_STATUS_BROKEN) { + rpc_connection_error_callback_call(connection); + } + return error; } @@ -566,6 +595,7 @@ rpc_connection_t *rpc_init_server(const connection->status = RPC_STATUS_CLOSED; connection->socket = -1; connection->server_thread_active = 0; + connection->callback_error = NULL; if ((connection->types = rpc_map_new_full((free))) == NULL) { rpc_exit(connection); return NULL; @@ -623,6 +653,7 @@ rpc_connection_t *rpc_init_client(const connection->refcnt = 1; connection->status = RPC_STATUS_CLOSED; connection->server_socket = -1; + connection->callback_error = NULL; if ((connection->types = rpc_map_new_full((free))) == NULL) { rpc_exit(connection); return NULL; diff -up nspluginwrapper-1.1.0/src/rpc.h.restart nspluginwrapper-1.1.0/src/rpc.h --- nspluginwrapper-1.1.0/src/rpc.h.restart 2008-06-21 22:13:34.000000000 +0200 +++ nspluginwrapper-1.1.0/src/rpc.h 2008-07-08 14:10:19.000000000 +0200 @@ -122,4 +122,10 @@ extern int rpc_method_send_reply(rpc_con } #endif +// This callback is called when the connection is closed or broken +typedef int (*rpc_error_callback_t)(rpc_connection_t *connection); + +// Set callback for a connection +void rpc_connection_error_callback_set(rpc_connection_t *connection, rpc_error_callback_t callback); + #endif /* RPC_H */ Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- nspluginwrapper.spec 6 May 2008 05:42:11 -0000 1.48 +++ nspluginwrapper.spec 8 Jul 2008 13:17:06 -0000 1.49 @@ -69,33 +69,28 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper -Version: 0.9.91.5 -Release: 28%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in Source3: %{name}.sh.in -Patch0: nspluginwrapper-0.9.91.5-rpc-error.patch -Patch1: nspluginwrapper-0.9.91.5-restart.patch -Patch2: nspluginwrapper-0.9.91.5-rh.patch -Patch4: nspluginwrapper-0.9.91.5-runtime-restart.patch -Patch5: nspluginwrapper-0.9.91.5-fork.patch -Patch6: nspluginwrapper-0.9.91.5-xulrunner.patch -Patch7: nspluginwrapper-0.9.91.5-npviewer-gthread.patch -Patch8: nspluginwrapper-0.9.91.5-shutdown.patch -Patch9: nspluginwrapper-0.9.91.5-sleep.patch -Patch10: nspluginwrapper-0.9.91.5-cpp-plugins.patch +Patch1: nspluginwrapper-1.1.0-build.patch +Patch2: nspluginwrapper-1.1.0-runtime-restart.patch +Patch3: nspluginwrapper-1.1.0-fork.patch +Patch4: nspluginwrapper-0.9.91.5-shutdown.patch +Patch5: nspluginwrapper-0.9.91.5-sleep.patch Patch100: plugin-config-setuid.patch License: GPL Group: Networking/WWW Url: http://gwenole.beauchesne.info/projects/nspluginwrapper/ -Provides: %{name} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Provides: %{name} = %{version}-%{release} Requires: %{_bindir}/linux32 -BuildRequires: pkgconfig gtk2-devel glib2-devel -BuildRequires: libXt-devel cairo-devel Requires: gecko-libs = %{gecko_ver} Requires: mozilla-filesystem +BuildRequires: pkgconfig gtk2-devel glib2-devel nspr-devel +BuildRequires: libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel BuildRequires: gecko-devel = %{gecko_ver} ExclusiveArch: i386 x86_64 ppc @@ -110,16 +105,11 @@ %prep %setup -q -a 1 -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -b .xl -%patch7 -p1 -b .thread -%patch8 -p1 -b .shutdown -%patch9 -p1 -b .sleep -%patch10 -p1 -b .cpplib +%patch1 -p1 -b .build +%patch2 -p1 -b .restart +%patch3 -p1 -b .fork +%patch4 -p1 -b .shutdown +%patch5 -p1 -b .sleep pushd %plugin_config_name %patch100 -p2 @@ -241,6 +231,9 @@ %config %{_sysconfdir}/sysconfig/%{name} %changelog +* Tue Jul 8 2008 Martin Stransky 1.1.0-1 +- update to latest upstream version (1.1.0) + * Mon May 5 2008 Martin Stransky 0.9.91.5-28 - link pluginwrapper with stdc++ lib Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 26 Feb 2008 12:01:02 -0000 1.9 +++ sources 8 Jul 2008 13:17:06 -0000 1.10 @@ -1,2 +1,2 @@ -052e5fecc36a087d1f7200bd1e44f2f0 nspluginwrapper-0.9.91.5.tar.bz2 0a00e94ba608dfea365851af9deb20dc plugin-config-1.9.tar.gz +42d043f1b91cc311410c20f36665c6b3 nspluginwrapper-1.1.0.tar.bz2 --- nspluginwrapper-0.9.91.5-cpp-plugins.patch DELETED --- --- nspluginwrapper-0.9.91.5-fork.patch DELETED --- --- nspluginwrapper-0.9.91.5-npviewer-gthread.patch DELETED --- --- nspluginwrapper-0.9.91.5-restart.patch DELETED --- --- nspluginwrapper-0.9.91.5-rh.patch DELETED --- --- nspluginwrapper-0.9.91.5-rpc-error.patch DELETED --- --- nspluginwrapper-0.9.91.5-runtime-restart.patch DELETED --- --- nspluginwrapper-0.9.91.5-xulrunner.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 8 13:21:20 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Tue, 8 Jul 2008 13:21:20 GMT Subject: rpms/gyachi/EL-5 .cvsignore, 1.3, 1.4 gyachi.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200807081321.m68DLKwA011877@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753 Modified Files: .cvsignore gyachi.spec sources Log Message: plugin-photo_album obsoletes plugin-photosharing Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jun 2008 13:24:13 -0000 1.3 +++ .cvsignore 8 Jul 2008 13:20:30 -0000 1.4 @@ -1 +1,2 @@ gyachi-1.1.35.tar.gz +theme_support.patch Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/EL-5/gyachi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gyachi.spec 26 Jun 2008 12:59:45 -0000 1.10 +++ gyachi.spec 8 Jul 2008 13:20:30 -0000 1.11 @@ -17,7 +17,7 @@ Name: gyachi Version: 1.1.35 -Release: 12%{?dist} +Release: 15%{?dist} Summary: A Yahoo! chat client with Webcam and voice support Group: Applications/Internet @@ -112,6 +112,7 @@ Summary: Photo album plugin for GyachI Group: Applications/Internet Requires: %{name} = %{version}-%{release} +Obsoletes: plugin-photosharing %description plugin-photo_album Photo album plugin for GyachI @@ -177,7 +178,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build @@ -285,6 +286,9 @@ %changelog +* Tue Jul 8 2008 Gregory D Hosler - 1.1.35-15 +- plugin-photo_album obsoletes plugin-photosharing + * Thu Jun 20 2008 Gregory D Hosler - 1.1.35-12 - Changed jasper-libs back to jasper for el4/el5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jun 2008 13:24:13 -0000 1.3 +++ sources 8 Jul 2008 13:20:30 -0000 1.4 @@ -1 +1,2 @@ 706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz +b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch From fedora-extras-commits at redhat.com Tue Jul 8 13:23:51 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 8 Jul 2008 13:23:51 GMT Subject: rpms/mxml/devel .cvsignore, 1.2, 1.3 mxml.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200807081323.m68DNp4R012053@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/mxml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11971 Modified Files: .cvsignore mxml.spec sources Log Message: Upgrade source. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mxml/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jul 2006 16:29:35 -0000 1.2 +++ .cvsignore 8 Jul 2008 13:22:51 -0000 1.3 @@ -1 +1 @@ -mxml-2.2.2.tar.gz +mxml-2.5.tar.gz Index: mxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/mxml/devel/mxml.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mxml.spec 19 Feb 2008 04:15:56 -0000 1.6 +++ mxml.spec 8 Jul 2008 13:22:51 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Miniature XML development library Name: mxml -Version: 2.2.2 -Release: 8%{?dist} +Version: 2.5 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.easysw.com/~mike/mxml/ @@ -67,13 +67,16 @@ %files devel %defattr(-,root,root,-) -%doc CHANGES doc/*.html doc/*.png +%doc CHANGES doc/*.html doc/*.gif %{_includedir}/*.h %{_libdir}/libmxml.so %{_mandir}/*/* %{_libdir}/pkgconfig/mxml.pc %changelog +* Tue Jul 08 2008 Anthony Green 2.5 +- Upgrade source. + * Mon Feb 18 2008 Fedora Release Engineering - 2.2.2-8 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mxml/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jul 2006 16:29:35 -0000 1.2 +++ sources 8 Jul 2008 13:22:51 -0000 1.3 @@ -1 +1 @@ -ef69862ad30ef2fe66457415db5b5ab4 mxml-2.2.2.tar.gz +f706377fba630b39fa02fd63642b17e5 mxml-2.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 13:24:38 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 8 Jul 2008 13:24:38 GMT Subject: rpms/qjackctl/devel .cvsignore, 1.3, 1.4 qjackctl.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200807081324.m68DOc6x012138@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/qjackctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12044 Modified Files: .cvsignore qjackctl.spec sources Log Message: Upgrade source Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qjackctl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Sep 2006 00:49:11 -0000 1.3 +++ .cvsignore 8 Jul 2008 13:23:49 -0000 1.4 @@ -1,2 +1 @@ -qjackctl-0.2.20.tar.gz -qjackctl-0.2.20-freebob.patch +qjackctl-0.3.3.tar.gz Index: qjackctl.spec =================================================================== RCS file: /cvs/pkgs/rpms/qjackctl/devel/qjackctl.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qjackctl.spec 19 Feb 2008 15:58:36 -0000 1.10 +++ qjackctl.spec 8 Jul 2008 13:23:49 -0000 1.11 @@ -2,8 +2,8 @@ Summary: Qt based JACK control application Name: qjackctl -Version: 0.3.1a -Release: 6%{?dist} +Version: 0.3.3 +Release: 1%{?dist} URL: http://qjackctl.sourceforge.net Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz Source1: qjackctl.desktop @@ -76,6 +76,9 @@ %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop %changelog +* Tue Jul 08 2008 Anthony Green 0.3.3-1 +- Upgrade source. + * Tue Feb 19 2008 Fedora Release Engineering - 0.3.1a-6 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qjackctl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2007 14:16:22 -0000 1.4 +++ sources 8 Jul 2008 13:23:49 -0000 1.5 @@ -1 +1 @@ -070135c2c65c27f8a5ab83710225120e qjackctl-0.3.1a.tar.gz +6aa20dacb954ad99db25485f2f7eeb52 qjackctl-0.3.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 13:26:52 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 8 Jul 2008 13:26:52 GMT Subject: rpms/whysynth-dssi/devel whysynth-dssi.spec,1.4,1.5 Message-ID: <200807081326.m68DQqTa012316@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/whysynth-dssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12254 Modified Files: whysynth-dssi.spec Log Message: Upgrade source Index: whysynth-dssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/whysynth-dssi/devel/whysynth-dssi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- whysynth-dssi.spec 19 Feb 2008 04:19:28 -0000 1.4 +++ whysynth-dssi.spec 8 Jul 2008 13:26:04 -0000 1.5 @@ -1,9 +1,9 @@ Summary: DSSI software synthesizer plugin Name: whysynth-dssi -Version: 20070418 -Release: 2%{?dist} +Version: 20080412 +Release: 1%{?dist} URL: http://home.jps.net/~musound/whysynth.html -Source0: http://home.jps.net/~musound/whysynth-20070418.tar.bz2 +Source0: http://home.jps.net/~musound/whysynth-20080412.tar.bz2 Source1: whysynth-48.png Source2: whysynth.desktop License: GPL @@ -59,7 +59,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING doc README TODO +%doc AUTHORS ChangeLog COPYING doc README TODO extra/COPYING-patches %{_datadir}/whysynth %{_bindir}/whysynth %{_libdir}/dssi/* @@ -68,6 +68,9 @@ %{_datadir}/icons/hicolor/48x48/apps/whysynth.png %changelog +* Tue Jul 07 2008 Anthony Green 20080412-1 +- Upgrade sources. Add COPYING-patches. + * Mon Feb 18 2008 Fedora Release Engineering - 20070418-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 8 13:28:02 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Tue, 8 Jul 2008 13:28:02 GMT Subject: rpms/libvirt/F-8 libvirt-0.4.4-boot-cdrom.patch, NONE, 1.1 libvirt.spec, 1.79, 1.80 Message-ID: <200807081328.m68DS2Av012413@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12326 Modified Files: libvirt.spec Added Files: libvirt-0.4.4-boot-cdrom.patch Log Message: Fix CDROM boot for KVM guests (rhbz #452355) libvirt-0.4.4-boot-cdrom.patch: --- NEW FILE libvirt-0.4.4-boot-cdrom.patch --- diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c --- libvirt-0.4.4.orig/src/qemu_conf.c 2008-06-19 14:15:02.000000000 +0100 +++ libvirt-0.4.4.new/src/qemu_conf.c 2008-07-08 12:24:07.000000000 +0100 @@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr disk->src, qemudBusIdToName(disk->bus, 1), media ? media : "", idx, - bootable ? ",boot=on" : ""); + bootable && disk->device == QEMUD_DISK_DISK + ? ",boot=on" : ""); ADD_ARG_LIT("-drive"); ADD_ARG_LIT(opt); diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 2008-07-08 12:25:59.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 2008-07-08 12:20:42.000000000 +0100 @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + + + diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 2008-07-08 12:13:15.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 2008-07-08 12:12:41.000000000 +0100 @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + + + diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c --- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c 2008-06-02 10:16:46.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c 2008-07-08 12:21:53.000000000 +0100 @@ -158,6 +158,10 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("graphics-vnc", 0); DO_TEST("graphics-sdl", 0); DO_TEST("input-usbmouse", 0); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- libvirt.spec 25 Jun 2008 09:29:06 -0000 1.79 +++ libvirt.spec 8 Jul 2008 13:27:10 -0000 1.80 @@ -25,6 +25,7 @@ License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: %{name}-%{version}-boot-cdrom.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -136,6 +137,7 @@ %prep %setup -q +%patch1 -p1 %build # Xen is available only on i386 x86_64 ia64 @@ -279,6 +281,9 @@ %doc docs/examples/python %changelog +* Tue Jul 8 2008 Daniel P. Berrange - 0.4.4-2.fc8 +- Fix booting of CDROM images with KVM (rhbz #452355) + * Thu Jun 25 2008 Daniel Veillard - 0.4.4-1.fc8 - upstream release 0.4.4 - fixes a couple of bugs in previous release From fedora-extras-commits at redhat.com Tue Jul 8 13:30:29 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Tue, 8 Jul 2008 13:30:29 GMT Subject: rpms/xqf/F-8 xqf.desktop, NONE, 1.1 xqf.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807081330.m68DUTRT012607@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/xqf/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12522 Modified Files: sources Added Files: xqf.desktop xqf.spec Log Message: Initial commit --- NEW FILE xqf.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XQF Comment=Locate and connect to game servers Exec=xqf Icon=xqf Type=Application Categories=GTK;Game;ActionGame; --- NEW FILE xqf.spec --- Name: xqf Version: 1.0.5 Release: 5%{?dist} Summary: A server browser for many popular games Group: Amusements/Games License: GPLv2+ URL: http://www.linuxgames.com/xqf/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: qstat BuildRequires: GeoIP-devel qstat gdk-pixbuf-devel glib-devel gettext zlib-devel BuildRequires: gtk2-devel intltool perl-XML-Parser desktop-file-utils readline-devel %description XQF is a game server browser and launcher for Unix/X11 for many popular games such as the Quake series, Unreal Tournament series, Half-Life etc. XQF is a front-end to QStat, a program by Steve Jankowski and uses the GTK+ toolkit. %prep %setup -q %build %configure \ --enable-geoip \ --enable-bzip2 \ --enable-externalrcon \ --enable-gtk2 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # removing extraneous .desktop file rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # the desktop file desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} # the icon stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 0644 pixmaps/%{name}_32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/%{name} %{_bindir}/%{name}-rcon %{_datadir}/pixmaps/%{name}_*.png %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.* %changelog * Tue Jul 08 2008 Stefan Posdzich - 1.0.5-5 - Remove BuildRequires: glibc-devel * Wed Jun 18 2008 Stefan Posdzich - 1.0.5-4 - Add new .desktop file source - Remove BuildRequires: gtk+-devel, glib2-devel - Remove desktop-file-install --remove-category=X-SuSE-Core-Game and {name}.desktop * Mon Jun 16 2008 Stefan Posdzich - 1.0.5-3 - Add --enable-bzip2 for bzip2 data compression - Add --enable-externalrco (Remote server administration tool) - Add BuildRequires: readline-devel - Add correct url for Source: - Add gtk-update-icon-cache * Sun Jun 15 2008 Stefan Posdzich - 1.0.5-2 - Add desktop-file-install for the .desktop file - Add BuildRequires: GeoIP-devel, qstat - Remove the dummy libGeoIP.so - Remove Requires: GeoIP * Fri Jun 13 2008 Stefan Posdzich - 1.0.5-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xqf/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 18:57:08 -0000 1.1 +++ sources 8 Jul 2008 13:29:45 -0000 1.2 @@ -0,0 +1 @@ +a88cecba6abb6349107ab135f1009946 xqf-1.0.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 13:31:38 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Tue, 8 Jul 2008 13:31:38 GMT Subject: rpms/libvirt/F-8 libvirt.spec,1.80,1.81 Message-ID: <200807081331.m68DVceR012718@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12621 Modified Files: libvirt.spec Log Message: Fix CDROM boot for KVM guests (rhbz #452355) Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- libvirt.spec 8 Jul 2008 13:27:10 -0000 1.80 +++ libvirt.spec 8 Jul 2008 13:30:54 -0000 1.81 @@ -21,7 +21,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.4 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 13:33:05 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Tue, 8 Jul 2008 13:33:05 GMT Subject: rpms/xqf/F-9 xqf.desktop, NONE, 1.1 xqf.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807081333.m68DX5Mh012843@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/xqf/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12774 Modified Files: sources Added Files: xqf.desktop xqf.spec Log Message: Initial commit --- NEW FILE xqf.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XQF Comment=Locate and connect to game servers Exec=xqf Icon=xqf Type=Application Categories=GTK;Game;ActionGame; --- NEW FILE xqf.spec --- Name: xqf Version: 1.0.5 Release: 5%{?dist} Summary: A server browser for many popular games Group: Amusements/Games License: GPLv2+ URL: http://www.linuxgames.com/xqf/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: qstat BuildRequires: GeoIP-devel qstat gdk-pixbuf-devel glib-devel gettext zlib-devel BuildRequires: gtk2-devel intltool perl-XML-Parser desktop-file-utils readline-devel %description XQF is a game server browser and launcher for Unix/X11 for many popular games such as the Quake series, Unreal Tournament series, Half-Life etc. XQF is a front-end to QStat, a program by Steve Jankowski and uses the GTK+ toolkit. %prep %setup -q %build %configure \ --enable-geoip \ --enable-bzip2 \ --enable-externalrcon \ --enable-gtk2 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # removing extraneous .desktop file rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # the desktop file desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} # the icon stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 0644 pixmaps/%{name}_32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/%{name} %{_bindir}/%{name}-rcon %{_datadir}/pixmaps/%{name}_*.png %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.* %changelog * Tue Jul 08 2008 Stefan Posdzich - 1.0.5-5 - Remove BuildRequires: glibc-devel * Wed Jun 18 2008 Stefan Posdzich - 1.0.5-4 - Add new .desktop file source - Remove BuildRequires: gtk+-devel, glib2-devel - Remove desktop-file-install --remove-category=X-SuSE-Core-Game and {name}.desktop * Mon Jun 16 2008 Stefan Posdzich - 1.0.5-3 - Add --enable-bzip2 for bzip2 data compression - Add --enable-externalrco (Remote server administration tool) - Add BuildRequires: readline-devel - Add correct url for Source: - Add gtk-update-icon-cache * Sun Jun 15 2008 Stefan Posdzich - 1.0.5-2 - Add desktop-file-install for the .desktop file - Add BuildRequires: GeoIP-devel, qstat - Remove the dummy libGeoIP.so - Remove Requires: GeoIP * Fri Jun 13 2008 Stefan Posdzich - 1.0.5-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xqf/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 18:57:08 -0000 1.1 +++ sources 8 Jul 2008 13:32:18 -0000 1.2 @@ -0,0 +1 @@ +a88cecba6abb6349107ab135f1009946 xqf-1.0.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 13:35:12 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 8 Jul 2008 13:35:12 GMT Subject: rpms/libffi/devel .cvsignore, 1.3, 1.4 libffi.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807081335.m68DZCPY013022@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/libffi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12940 Modified Files: .cvsignore libffi.spec sources Log Message: Upgrade source Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libffi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Feb 2008 01:07:40 -0000 1.3 +++ .cvsignore 8 Jul 2008 13:34:17 -0000 1.4 @@ -1 +1 @@ -libffi-3.0.1.tar.gz +libffi-3.0.5.tar.gz Index: libffi.spec =================================================================== RCS file: /cvs/pkgs/rpms/libffi/devel/libffi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libffi.spec 16 Feb 2008 01:07:40 -0000 1.2 +++ libffi.spec 8 Jul 2008 13:34:17 -0000 1.3 @@ -1,5 +1,5 @@ Name: libffi -Version: 3.0.1 +Version: 3.0.5 Release: 1%{?dist} Summary: A portable foreign function interface library @@ -97,6 +97,9 @@ %{_infodir}/libffi.info.gz %changelog +* Tue Jul 08 2008 Anthony Green 3.0.5-1 +- Upgrade to 3.0.5 + * Fri Feb 15 2008 Anthony Green 3.0.1-1 - Upgrade to 3.0.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libffi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Feb 2008 01:07:40 -0000 1.3 +++ sources 8 Jul 2008 13:34:17 -0000 1.4 @@ -1 +1 @@ -6f6cea82a8dfe6126d207fd6113ad632 libffi-3.0.1.tar.gz +29544f542140da929221805e332407b9 libffi-3.0.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 13:35:19 2008 From: fedora-extras-commits at redhat.com (Kai Engert (kengert)) Date: Tue, 8 Jul 2008 13:35:19 GMT Subject: rpms/seamonkey/F-8 firefox-1.5-bullet-bill.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 seamonkey.spec, 1.33, 1.34 sources, 1.20, 1.21 Message-ID: <200807081335.m68DZJqY013033@cvs-int.fedora.redhat.com> Author: kengert Update of /cvs/extras/rpms/seamonkey/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12936 Modified Files: .cvsignore seamonkey.spec sources Added Files: firefox-1.5-bullet-bill.patch Log Message: * Tue Jul 08 2008 Christopher Aillon - 1.1.10-1 - Update to 1.1.10 - Use bullet characters to match GTK+ firefox-1.5-bullet-bill.patch: --- NEW FILE firefox-1.5-bullet-bill.patch --- Index: mozilla/editor/libeditor/text/nsTextEditRules.cpp =================================================================== RCS file: /cvsroot/mozilla/editor/libeditor/text/nsTextEditRules.cpp,v retrieving revision 1.195 diff -d -u -p -r1.195 nsTextEditRules.cpp --- mozilla/editor/libeditor/text/nsTextEditRules.cpp 16 Jun 2005 13:10:56 -0000 1.195 +++ mozilla/editor/libeditor/text/nsTextEditRules.cpp 4 Oct 2006 16:02:19 -0000 @@ -1390,13 +1390,13 @@ nsTextEditRules::EchoInsertionToPWBuff(P // manage the password buffer mPasswordText.Insert(*aOutString, aStart); - // change the output to '*' only + // change the output to 'U+2022' only PRInt32 length = aOutString->Length(); PRInt32 i; aOutString->Truncate(); for (i=0; iAppend(PRUnichar('*')); + aOutString->Append(PRUnichar(0x2022)); } return NS_OK; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-8/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 28 Mar 2008 17:41:43 -0000 1.18 +++ .cvsignore 8 Jul 2008 13:34:24 -0000 1.19 @@ -1 +1 @@ -seamonkey-1.1.9.source.tar.bz2 +seamonkey-1.1.10.source.tar.bz2 Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-8/seamonkey.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- seamonkey.spec 17 Apr 2008 12:34:30 -0000 1.33 +++ seamonkey.spec 8 Jul 2008 13:34:24 -0000 1.34 @@ -10,8 +10,8 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor -Version: 1.1.9 -Release: 2%{?dist} +Version: 1.1.10 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 Group: Applications/Internet @@ -45,6 +45,7 @@ Patch87: firefox-1.5-pango-justified-range.patch Patch88: firefox-1.5-pango-underline.patch Patch91: thunderbird-0.7.3-gnome-uriloader.patch +Patch100: firefox-1.5-bullet-bill.patch Patch102: firefox-1.5-theme-change.patch Patch220: seamonkey-fedora-home-page.patch Patch225: mozilla-nspr-packages.patch @@ -116,7 +117,7 @@ %setup -q -n mozilla %patch1 -p0 %patch2 -p1 -%patch3 -p1 +#%patch3 -p1 %patch21 -p1 %patch22 -p1 %patch41 -p1 @@ -129,6 +130,7 @@ %patch87 -p1 %patch88 -p1 %patch91 -p1 -b .gnome-uriloader +%patch100 -p1 -b .bullet-bill %patch102 -p0 -b .theme-change %patch220 -p1 %patch225 -p1 @@ -431,6 +433,9 @@ %changelog +* Tue Jul 08 2008 Christopher Aillon - 1.1.10-1 +- Update to 1.1.10 +- Use bullet characters to match GTK+ * Thu Apr 17 2008 Kai Engert - 1.1.9-2 - add several upstream patches, not yet released: 425576 (crash), 323508, 378132, 390295, 421622 Index: sources =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-8/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 28 Mar 2008 17:45:57 -0000 1.20 +++ sources 8 Jul 2008 13:34:24 -0000 1.21 @@ -1 +1 @@ -2b08c472164e80922f715c6e96e0bee7 seamonkey-1.1.9.source.tar.bz2 +0a13d4298fa175a459a5e78ec74810f6 seamonkey-1.1.10.source.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 8 15:08:10 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 8 Jul 2008 15:08:10 GMT Subject: rpms/perl-Crypt-RSA/devel .cvsignore, 1.5, 1.6 perl-Crypt-RSA.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807081508.m68F8AIP000629@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Crypt-RSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv515 Modified Files: .cvsignore perl-Crypt-RSA.spec sources Log Message: * Tue Jul 8 2008 Paul Howarth 1.98-1 - Update to 1.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Jul 2008 14:46:35 -0000 1.5 +++ .cvsignore 8 Jul 2008 15:07:08 -0000 1.6 @@ -1 +1 @@ -Crypt-RSA-1.97.tar.gz +Crypt-RSA-1.98.tar.gz Index: perl-Crypt-RSA.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/perl-Crypt-RSA.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Crypt-RSA.spec 7 Jul 2008 14:46:35 -0000 1.9 +++ perl-Crypt-RSA.spec 8 Jul 2008 15:07:08 -0000 1.10 @@ -1,6 +1,6 @@ Summary: RSA public-key cryptosystem Name: perl-Crypt-RSA -Version: 1.97 +Version: 1.98 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -87,6 +87,9 @@ %{_mandir}/man3/crypt-rsa-interoperablity-template.3* %changelog +* Tue Jul 8 2008 Paul Howarth 1.98-1 +- Update to 1.98 + * Mon Jul 7 2008 Paul Howarth 1.97-1 - Update to 1.97 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Jul 2008 14:46:35 -0000 1.5 +++ sources 8 Jul 2008 15:07:08 -0000 1.6 @@ -1 +1 @@ -d61b0bf8c66938cc2caf5a58c63e9006 Crypt-RSA-1.97.tar.gz +c0bfb2df955be680ef5642bffec15b74 Crypt-RSA-1.98.tar.gz From fedora-extras-commits at redhat.com Tue Jul 8 15:08:29 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Tue, 8 Jul 2008 15:08:29 GMT Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec,1.13,1.14 Message-ID: <200807081508.m68F8TdY000656@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv571 Modified Files: sugar-toolkit.spec Log Message: * Tue Jul 08 2008 Simon Schampijer - 0.81.6-2 - add libSM-devel dependency Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sugar-toolkit.spec 8 Jul 2008 14:39:12 -0000 1.13 +++ sugar-toolkit.spec 8 Jul 2008 15:07:42 -0000 1.14 @@ -3,7 +3,7 @@ Summary: Sugar toolkit Name: sugar-toolkit Version: 0.81.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://wiki.laptop.org/go/Sugar Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 Source1: macros.sugar @@ -16,6 +16,7 @@ BuildRequires: gettext BuildRequires: gtk2-devel BuildRequires: perl-XML-Parser +BuildRequires: libSM-devel Requires: gnome-python2-rsvg Requires: dbus-python @@ -41,13 +42,14 @@ %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +%find_lang %name mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README @@ -56,7 +58,10 @@ %changelog -* Tue Jul 08 2008 Simon Schampijer - 0.81.6 +* Tue Jul 08 2008 Simon Schampijer - 0.81.6-2 +- add libSM-devel dependency + +* Tue Jul 08 2008 Simon Schampijer - 0.81.6-1 - 7015 Add proper alignment support to the tray control - 7054 Journal doesn't show correct colors for activity instances - 7046 Deleting activity bundle with journal leaves it showing in Home list view until reboot From fedora-extras-commits at redhat.com Tue Jul 8 15:09:22 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 8 Jul 2008 15:09:22 GMT Subject: rpms/perl-Text-CSV_XS/devel perl-Text-CSV_XS-0.52-svupgrade.patch, NONE, 1.1 perl-Text-CSV_XS.spec, 1.13, 1.14 Message-ID: <200807081509.m68F9MCU000761@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV_XS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv642 Modified Files: perl-Text-CSV_XS.spec Added Files: perl-Text-CSV_XS-0.52-svupgrade.patch Log Message: * Tue Jul 08 2008 Lubomir Rintel - 0.52-2 - Actually solving the issue mentioned in previous change perl-Text-CSV_XS-0.52-svupgrade.patch: --- NEW FILE perl-Text-CSV_XS-0.52-svupgrade.patch --- Under some circumstances, newSVpv() returns SV of higher type than SVt_PVIV, such as SVt_PVMG. Lubomir Rintel Upstream: http://repo.or.cz/w/Text-CSV_XS.git?a=commit;h=72d4bab14e22e62699e90eeb306c606435ef31a6 diff -urp Text-CSV_XS-0.52.orig/CSV_XS.xs Text-CSV_XS-0.52/CSV_XS.xs --- Text-CSV_XS-0.52.orig/CSV_XS.xs 2008-06-17 12:20:00.000000000 +0200 +++ Text-CSV_XS-0.52/CSV_XS.xs 2008-07-08 14:42:33.000000000 +0200 @@ -181,7 +181,7 @@ static SV *SetDiag (csv_t *csv, int xse) while (xs_errors[i].xs_errno && xs_errors[i].xs_errno != xse) i++; if ((err = newSVpv (xs_errors[i].xs_errstr, 0))) { - sv_upgrade (err, SVt_PVIV); + SvUPGRADE (err, SVt_PVIV); SvIV_set (err, xse); SvIOK_on (err); hv_store (csv->self, "_ERROR_DIAG", 11, err, 0); Index: perl-Text-CSV_XS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/perl-Text-CSV_XS.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Text-CSV_XS.spec 8 Jul 2008 10:02:34 -0000 1.13 +++ perl-Text-CSV_XS.spec 8 Jul 2008 15:08:21 -0000 1.14 @@ -1,12 +1,13 @@ Name: perl-Text-CSV_XS Version: 0.52 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Comma-separated values manipulation routines Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Text-CSV_XS/ Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tgz +Patch0: perl-Text-CSV_XS-0.52-svupgrade.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::Pod) @@ -21,6 +22,7 @@ %prep %setup -q -n Text-CSV_XS-%{version} +%patch0 -p1 -b .svupgrade chmod -c a-x examples/* @@ -55,6 +57,9 @@ %changelog +* Tue Jul 08 2008 Lubomir Rintel - 0.52-2 +- Actually solving the issue mentioned in previous change + * Tue Jul 08 2008 Lubomir Rintel - 0.52-1 - Updated to 0.52 to solve an issue with perl 5.10 From fedora-extras-commits at redhat.com Tue Jul 8 15:20:16 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Tue, 8 Jul 2008 15:20:16 GMT Subject: rpms/sugar-journal/F-9 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar-journal-checkout.sh, 1.2, 1.3 sugar-journal.spec, 1.3, 1.4 Message-ID: <200807081520.m68FKGF8001237@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-journal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1186 Modified Files: .cvsignore sources sugar-journal-checkout.sh sugar-journal.spec Log Message: * Tue Jul 08 2008 Tomeu Vizoso - 94-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Jul 2008 09:42:07 -0000 1.3 +++ .cvsignore 8 Jul 2008 15:19:25 -0000 1.4 @@ -1 +1 @@ -journal-activity-93.tar.bz2 +journal-activity-94.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Jul 2008 09:42:07 -0000 1.3 +++ sources 8 Jul 2008 15:19:25 -0000 1.4 @@ -1 +1 @@ -098a3df185f6d7f38ad3346a52de25e3 journal-activity-93.tar.bz2 +9461d7d96b0843381a6df226319a781e journal-activity-94.tar.bz2 Index: sugar-journal-checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sugar-journal-checkout.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sugar-journal-checkout.sh 4 Jul 2008 09:37:03 -0000 1.2 +++ sugar-journal-checkout.sh 8 Jul 2008 15:19:25 -0000 1.3 @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=93 +VERSION=94 NAME=journal-activity rm -rf $NAME-$VERSION Index: sugar-journal.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sugar-journal.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sugar-journal.spec 4 Jul 2008 09:42:07 -0000 1.3 +++ sugar-journal.spec 8 Jul 2008 15:19:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: sugar-journal -Version: 93 -Release: 2%{?dist} +Version: 94 +Release: 1%{?dist} Summary: Journal for Sugar Group: Sugar/Activities @@ -104,6 +104,9 @@ %lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/ %changelog +* Tue Jul 08 2008 Tomeu Vizoso - 94-1 +- New release + * Thu Jul 04 2008 Tomeu Vizoso - 93-2 - Upload new tarball From fedora-extras-commits at redhat.com Tue Jul 8 15:23:37 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 8 Jul 2008 15:23:37 GMT Subject: rpms/perl-Text-CSV_XS/F-9 perl-Text-CSV_XS-0.30-svupgrade.patch, NONE, 1.1 perl-Text-CSV_XS.spec, 1.12, 1.13 Message-ID: <200807081523.m68FNbMO001489@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV_XS/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1356 Modified Files: perl-Text-CSV_XS.spec Added Files: perl-Text-CSV_XS-0.30-svupgrade.patch Log Message: * Tue Jul 08 2008 Lubomir Rintel - 0.30-6 - Actually solving the issue mentioned in previous change perl-Text-CSV_XS-0.30-svupgrade.patch: --- NEW FILE perl-Text-CSV_XS-0.30-svupgrade.patch --- Under some circumstances, newSVpv() returns SV of higher type than SVt_PVIV, such as SVt_PVMG. Lubomir Rintel diff -urp Text-CSV_XS-0.52.orig/CSV_XS.xs Text-CSV_XS-0.52/CSV_XS.xs --- Text-CSV_XS-0.52.orig/CSV_XS.xs 2008-06-17 12:20:00.000000000 +0200 +++ Text-CSV_XS-0.52/CSV_XS.xs 2008-07-08 14:42:33.000000000 +0200 @@ -181,7 +181,7 @@ static SV *SetDiag (csv_t *csv, int xse) while (xs_errors[i].xs_errno && xs_errors[i].xs_errno != xse) i++; if ((err = newSVpv (xs_errors[i].xs_errstr, 0))) { - sv_upgrade (err, SVt_PVIV); + SvUPGRADE (err, SVt_PVIV); SvIV_set (err, xse); SvIOK_on (err); hv_store (csv->self, "_ERROR_DIAG", 11, err, 0); Index: perl-Text-CSV_XS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/F-9/perl-Text-CSV_XS.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Text-CSV_XS.spec 3 Mar 2008 20:19:20 -0000 1.12 +++ perl-Text-CSV_XS.spec 8 Jul 2008 15:22:19 -0000 1.13 @@ -1,12 +1,13 @@ Name: perl-Text-CSV_XS Version: 0.30 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Comma-separated values manipulation routines Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Text-CSV_XS/ Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tar.gz +Patch0: perl-Text-CSV_XS-0.30-svupgrade.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::Pod) @@ -21,6 +22,7 @@ %prep %setup -q -n Text-CSV_XS-%{version} +%patch0 -p1 -b .svupgrade chmod -c a-x examples/* @@ -55,6 +57,9 @@ %changelog +* Tue Jul 08 2008 Lubomir Rintel - 0.30-6 +- Actually solving the issue mentioned in previous change + * Wed Feb 27 2008 Tom "spot" Callaway - 0.30-5 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Tue Jul 8 15:24:04 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 8 Jul 2008 15:24:04 GMT Subject: rpms/perl-Params-Util/devel perl-Params-Util.spec,1.31,1.32 Message-ID: <200807081524.m68FO4wN001549@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Params-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1434 Modified Files: perl-Params-Util.spec Log Message: * Tue Jul 08 2008 Ralf Cors??pius - 0.33-2 - Unconditionally BR: perl(Test::CPAN::Meta). Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- perl-Params-Util.spec 2 Jun 2008 10:59:28 -0000 1.31 +++ perl-Params-Util.spec 8 Jul 2008 15:23:14 -0000 1.32 @@ -19,10 +19,7 @@ # Required by the tests BuildRequires: perl(Test::Pod) >= 1.00 -%if 0%{?fedora} >= 9 -# FIXME: Not available for FC < 10 BuildRequires: perl(Test::CPAN::Meta) >= 0.07 -%endif %description Params::Util provides a basic set of importable functions that @@ -61,6 +58,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Ralf Cors??pius - 0.33-2 +- Unconditionally BR: perl(Test::CPAN::Meta). + * Mon Jun 02 2008 Ralf Cors??pius - 0.33-1 - Upstream update. - Conditionally BR: perl(Test::CPAN::Meta). From fedora-extras-commits at redhat.com Tue Jul 8 15:24:39 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 8 Jul 2008 15:24:39 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1567,1.1568 Message-ID: <200807081524.m68FOdg2001592@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1536 Modified Files: openoffice.org.spec Log Message: tum-te-tum Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1567 retrieving revision 1.1568 diff -u -r1.1567 -r1.1568 --- openoffice.org.spec 7 Jul 2008 17:57:04 -0000 1.1567 +++ openoffice.org.spec 8 Jul 2008 15:23:48 -0000 1.1568 @@ -491,6 +491,7 @@ %description sdk The %{name} SDK is an add-on for the %{name} office suite. It provides the necessary tools for programming using the %{name} APIs and for creating extensions (UNO components) for %{name}. +Run %{baseinstdir}/sdk/setsdkenv_unix.sh to set the build environment for building against the sdk. %package sdk-doc Summary: Software Development Kit documentation for %{name} @@ -1388,8 +1389,6 @@ %install rm -rf $RPM_BUILD_ROOT -#mine eyes burneth -%define PLATFORM_ID %{expand:%%(LD_LIBRARY_PATH=`echo %{_builddir}/%{?buildsubdir}/solver/300/unxlng*.pro/lib`; if [ -e %{_builddir}/%{?buildsubdir}/sal/unxlng*.pro/bin/gen_makefile ]; then %{_builddir}/%{?buildsubdir}/sal/unxlng*.pro/bin/gen_makefile; else echo Linux_noarch; fi | sed -e "s/RTL_.*:=//g" | xargs | sed -e "s/ /_/g" | sed -r "s/[A-Z]+/\\L&/g")} source Linux*Env.Set.sh #figure out the icon version export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"` @@ -1493,6 +1492,7 @@ # unpack presenter screen extension install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt +%define presenter-screen-id %(grep identifier $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\" -f 2) # revoke ScriptProviders and make into extensions pushd $RPM_BUILD_ROOT/%{basisinstdir}/program @@ -1608,9 +1608,11 @@ pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/template mkdir -p wizard for I in %{langpack_langs}; do - cp -afl $I/wizard/bitmap wizard/ - rm -rf $I/wizard/bitmap - ln -sf ../../wizard/bitmap $I/wizard/bitmap + if [ -d $I/wizard/bitmap ]; then + cp -afl $I/wizard/bitmap wizard/ + rm -rf $I/wizard/bitmap + ln -sf ../../wizard/bitmap $I/wizard/bitmap + fi if [ -d $I/wizard/letter/$I ]; then mv -f $I/wizard/letter/$I ${I}_wizard_letter_${I} @@ -2991,7 +2993,7 @@ %pre presenter-screen if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || : + unopkg remove --shared %{presenter-screen-id} || : fi %post presenter-screen @@ -3001,7 +3003,7 @@ %preun presenter-screen if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || : + unopkg remove --shared %{presenter-screen-id} || : fi %postun presenter-screen From fedora-extras-commits at redhat.com Tue Jul 8 15:28:00 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 8 Jul 2008 15:28:00 GMT Subject: rpms/bzflag/F-8 bzflag-2.0.10-gcc-4.3.patch,NONE,1.1 Message-ID: <200807081528.m68FS0kX001800@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Added Files: bzflag-2.0.10-gcc-4.3.patch Log Message: add missing patch bzflag-2.0.10-gcc-4.3.patch: --- NEW FILE bzflag-2.0.10-gcc-4.3.patch --- diff -up bzflag-2.0.10/include/common.h.gcc-4.3 bzflag-2.0.10/include/common.h --- bzflag-2.0.10/include/common.h.gcc-4.3 2007-11-15 23:11:33.000000000 +0100 +++ bzflag-2.0.10/include/common.h 2008-02-22 17:51:08.000000000 +0100 @@ -33,9 +33,12 @@ #include #include /* needed for bzfrand */ -#include #ifdef __cplusplus # include +# include +#else +# include +# include #endif diff -up bzflag-2.0.10/plugins/logDetail/logDetail.cpp.gcc-4.3 bzflag-2.0.10/plugins/logDetail/logDetail.cpp --- bzflag-2.0.10/plugins/logDetail/logDetail.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 +++ bzflag-2.0.10/plugins/logDetail/logDetail.cpp 2008-02-22 18:11:32.000000000 +0100 @@ -13,6 +13,7 @@ // logDetail.cpp : Plugin module for logging server events to stdout // +#include #include #include #include "bzfsAPI.h" diff -up bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.3 bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp --- bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 +++ bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp 2008-02-22 20:55:32.000000000 +0100 @@ -4,7 +4,8 @@ #include #include #include -#include +#include +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp.gcc-4.3 bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp --- bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 +++ bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp 2008-02-22 20:57:02.000000000 +0100 @@ -1,6 +1,7 @@ // teamflagreset.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp --- bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 +++ bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp 2008-02-22 17:51:08.000000000 +0100 @@ -5,6 +5,8 @@ #include "bzfsAPI.h" #include +#include +#include #include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.10/plugins/keepaway/keepaway.cpp.gcc-4.3 bzflag-2.0.10/plugins/keepaway/keepaway.cpp --- bzflag-2.0.10/plugins/keepaway/keepaway.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 +++ bzflag-2.0.10/plugins/keepaway/keepaway.cpp 2008-02-22 18:09:18.000000000 +0100 @@ -1,6 +1,7 @@ // keepaway.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.3 bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp --- bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 +++ bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp 2008-02-22 20:59:59.000000000 +0100 @@ -2,6 +2,7 @@ // #include "bzfsAPI.h" +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.10/plugins/timedctf/timedctf.cpp.gcc-4.3 bzflag-2.0.10/plugins/timedctf/timedctf.cpp --- bzflag-2.0.10/plugins/timedctf/timedctf.cpp.gcc-4.3 2008-02-22 20:58:31.000000000 +0100 +++ bzflag-2.0.10/plugins/timedctf/timedctf.cpp 2008-02-22 20:58:05.000000000 +0100 @@ -1,6 +1,7 @@ // timedctf.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.10/plugins/wwzones/wwzones.cpp.gcc-4.3 bzflag-2.0.10/plugins/wwzones/wwzones.cpp --- bzflag-2.0.10/plugins/wwzones/wwzones.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 +++ bzflag-2.0.10/plugins/wwzones/wwzones.cpp 2008-02-22 21:01:47.000000000 +0100 @@ -1,6 +1,7 @@ // wwzones.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.10/plugins/airspawn/airspawn.cpp.gcc-4.3 bzflag-2.0.10/plugins/airspawn/airspawn.cpp --- bzflag-2.0.10/plugins/airspawn/airspawn.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 +++ bzflag-2.0.10/plugins/airspawn/airspawn.cpp 2008-02-22 18:07:27.000000000 +0100 @@ -3,6 +3,7 @@ #include "bzfsAPI.h" +#include #include #include diff -up bzflag-2.0.10/plugins/nagware/nagware.cpp.gcc-4.3 bzflag-2.0.10/plugins/nagware/nagware.cpp --- bzflag-2.0.10/plugins/nagware/nagware.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 +++ bzflag-2.0.10/plugins/nagware/nagware.cpp 2008-02-22 18:12:17.000000000 +0100 @@ -3,6 +3,8 @@ // $Id: nagware.cpp 16200 2007-11-15 17:31:43Z JeffM2501 $ #include "bzfsAPI.h" +#include +#include #include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.10/plugins/flagStay/flagStay.cpp.gcc-4.3 bzflag-2.0.10/plugins/flagStay/flagStay.cpp --- bzflag-2.0.10/plugins/flagStay/flagStay.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 +++ bzflag-2.0.10/plugins/flagStay/flagStay.cpp 2008-02-22 18:08:30.000000000 +0100 @@ -2,6 +2,7 @@ // #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.10/plugins/koth/koth.cpp.gcc-4.3 bzflag-2.0.10/plugins/koth/koth.cpp --- bzflag-2.0.10/plugins/koth/koth.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 +++ bzflag-2.0.10/plugins/koth/koth.cpp 2008-02-22 18:10:10.000000000 +0100 @@ -1,6 +1,7 @@ // koth.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.10/plugins/torBlock/torBlock.cpp.gcc-4.3 bzflag-2.0.10/plugins/torBlock/torBlock.cpp --- bzflag-2.0.10/plugins/torBlock/torBlock.cpp.gcc-4.3 2008-02-22 21:01:08.000000000 +0100 +++ bzflag-2.0.10/plugins/torBlock/torBlock.cpp 2008-02-22 21:00:52.000000000 +0100 @@ -2,6 +2,7 @@ // #include "bzfsAPI.h" +#include #include #include #include From fedora-extras-commits at redhat.com Tue Jul 8 15:28:50 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 8 Jul 2008 15:28:50 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.51,1.52 Message-ID: <200807081528.m68FSo2C001902@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1785 Modified Files: java-1.6.0-openjdk.spec Log Message: Fixed typo Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- java-1.6.0-openjdk.spec 8 Jul 2008 14:52:44 -0000 1.51 +++ java-1.6.0-openjdk.spec 8 Jul 2008 15:27:56 -0000 1.52 @@ -36,7 +36,7 @@ %define archbuild amd64 %define archinstall amd64 %endif -%ifarch %{jit_arches} +%ifnarch %{jit_arches} %define archbuild %{_arch} %define archinstall %{_arch} %endif @@ -352,7 +352,7 @@ patch -l -p0 < %{PATCH2} patch -l -p0 < %{PATCH3} patch -l -p0 < %{PATCH4} -%ifnarch %{jit_arches} +%ifarch %{jit_arches} patch -l -p0 < %{PATCH5} %endif patch -l -p0 < %{PATCH6} From fedora-extras-commits at redhat.com Tue Jul 8 15:30:46 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Tue, 8 Jul 2008 15:30:46 GMT Subject: rpms/sugar-base/F-9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-base.spec, 1.6, 1.7 Message-ID: <200807081530.m68FUkwh002058@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-base/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1974 Modified Files: .cvsignore sources sugar-base.spec Log Message: * Tue Jul 08 2008 Simon Schampijer - 0.81.2-1 - gained its own translation module and some languages have already been contributed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Jun 2008 06:42:18 -0000 1.5 +++ .cvsignore 8 Jul 2008 15:29:50 -0000 1.6 @@ -1 +1 @@ -sugar-base-0.81.1.tar.bz2 +sugar-base-0.81.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jun 2008 06:42:18 -0000 1.5 +++ sources 8 Jul 2008 15:29:50 -0000 1.6 @@ -1 +1 @@ -bfaaa7d92401580cc01cbf50f89e0408 sugar-base-0.81.1.tar.bz2 +0a80e7fc15842f75b3fa5da7c049f6d4 sugar-base-0.81.2.tar.bz2 Index: sugar-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/F-9/sugar-base.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sugar-base.spec 9 Jun 2008 06:42:18 -0000 1.6 +++ sugar-base.spec 8 Jul 2008 15:29:50 -0000 1.7 @@ -2,7 +2,7 @@ Summary: Base Sugar library Name: sugar-base -Version: 0.81.1 +Version: 0.81.2 Release: 1%{?dist} URL: http://dev.laptop.org/ Source0: http://dev.laptop.org/pub/sugar/sources/sugar-base/%{name}-%{version}.tar.bz2 @@ -30,16 +30,20 @@ %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +%find_lang %name %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) %{python_sitelib}/* %changelog +* Tue Jul 08 2008 Simon Schampijer - 0.81.2-1 +- gained its own translation module and some languages have already been contributed + * Mon Jun 09 2008 Simon Schampijer - 0.81.1-1 - Fix logging (Tomeu) From fedora-extras-commits at redhat.com Tue Jul 8 15:33:36 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Tue, 8 Jul 2008 15:33:36 GMT Subject: rpms/ytalk/devel ytalk.spec,1.16,1.17 Message-ID: <200807081533.m68FXavC002217@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140 Modified Files: ytalk.spec Log Message: Test change Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ytalk.spec 13 Mar 2008 21:57:40 -0000 1.16 +++ ytalk.spec 8 Jul 2008 15:32:27 -0000 1.17 @@ -1,4 +1,5 @@ Summary: A chat program for multiple users + Name: ytalk Version: 3.3.0 From fedora-extras-commits at redhat.com Tue Jul 8 15:44:35 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 8 Jul 2008 15:44:35 GMT Subject: rpms/lcdproc/devel lcdproc.spec,1.6,1.7 Message-ID: <200807081544.m68FiZeR002870@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/lcdproc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2819 Modified Files: lcdproc.spec Log Message: - Add BR on Fedora > 9 : docbook-dtds Index: lcdproc.spec =================================================================== RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lcdproc.spec 8 Jul 2008 14:45:20 -0000 1.6 +++ lcdproc.spec 8 Jul 2008 15:43:43 -0000 1.7 @@ -1,7 +1,7 @@ Summary: LCDproc displays real-time system information on a 20x4 backlit LCD Name: lcdproc Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 URL: http://lcdproc.omnipotent.net Group: System Environment/Libraries @@ -21,6 +21,9 @@ BuildRequires: openldap-devel BuildRequires: pth-devel BuildRequires: xmlto +%if 0%{?fedora} > 9 +BuildRequires: docbook-dtds +%endif BuildRequires: xosd-devel BuildRequires: libX11-devel BuildRequires: libXext-devel @@ -127,6 +130,9 @@ %changelog +* Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 0.5.2-6 +- Add BR on Fedora > 9 : docbook-dtds + * Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 0.5.2-5 - Fix RETVAL for LSB compliant initscripts - #246971 - Fix Default driver path - #454194 From fedora-extras-commits at redhat.com Tue Jul 8 15:44:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:44:38 +0000 Subject: [pkgdb] scribus: sharkcz has requested watchcommits Message-ID: <200807081544.m68Fic3J000659@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchcommits acl on scribus (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:44:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:44:35 +0000 Subject: [pkgdb] scribus: sharkcz has requested watchbugzilla Message-ID: <200807081544.m68FiamO000658@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchbugzilla acl on scribus (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:44:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:44:41 +0000 Subject: [pkgdb] scribus: sharkcz has requested commit Message-ID: <200807081544.m68FifYe000696@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the commit acl on scribus (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:44:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:44:47 +0000 Subject: [pkgdb] scribus: sharkcz has requested approveacls Message-ID: <200807081544.m68Filq9000735@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the approveacls acl on scribus (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:44:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:44:57 +0000 Subject: [pkgdb] scribus: sharkcz has requested watchbugzilla Message-ID: <200807081544.m68Fic3M000659@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchbugzilla acl on scribus (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:45:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:45:00 +0000 Subject: [pkgdb] scribus: sharkcz has requested watchcommits Message-ID: <200807081545.m68FiamR000658@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchcommits acl on scribus (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:45:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:45:03 +0000 Subject: [pkgdb] scribus: sharkcz has requested commit Message-ID: <200807081545.m68FiamU000658@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the commit acl on scribus (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:45:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:45:05 +0000 Subject: [pkgdb] scribus: sharkcz has requested approveacls Message-ID: <200807081545.m68FifYh000696@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the approveacls acl on scribus (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:45:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:45:10 +0000 Subject: [pkgdb] scribus: sharkcz has requested watchbugzilla Message-ID: <200807081545.m68Fic3P000659@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchbugzilla acl on scribus (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:45:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:45:14 +0000 Subject: [pkgdb] scribus: sharkcz has requested watchcommits Message-ID: <200807081545.m68FjE5r000879@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchcommits acl on scribus (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:45:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:45:20 +0000 Subject: [pkgdb] scribus: sharkcz has requested commit Message-ID: <200807081545.m68FifYk000696@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the commit acl on scribus (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:45:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 08 Jul 2008 15:45:21 +0000 Subject: [pkgdb] scribus: sharkcz has requested approveacls Message-ID: <200807081545.m68FilqC000735@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the approveacls acl on scribus (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Tue Jul 8 15:48:02 2008 From: fedora-extras-commits at redhat.com (Anderson de Farias Silva (afsilva)) Date: Tue, 8 Jul 2008 15:48:02 GMT Subject: rpms/nethogs/devel import.log,1.1,1.2 nethogs.spec,1.1,1.2 Message-ID: <200807081548.m68Fm2mh003122@cvs-int.fedora.redhat.com> Author: afsilva Update of /cvs/pkgs/rpms/nethogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3036/devel Modified Files: import.log nethogs.spec Log Message: Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/nethogs/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Jun 2008 17:34:45 -0000 1.1 +++ import.log 8 Jul 2008 15:47:14 -0000 1.2 @@ -1 +1,2 @@ nethogs-0_7-2_20080627cvs_fc9:HEAD:nethogs-0.7-2.20080627cvs.fc9.src.rpm:1214588066 +nethogs-0_7-3_20080627cvs_fc8:HEAD:nethogs-0.7-3.20080627cvs.fc8.src.rpm:1215531986 Index: nethogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/nethogs/devel/nethogs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethogs.spec 27 Jun 2008 17:34:45 -0000 1.1 +++ nethogs.spec 8 Jul 2008 15:47:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: nethogs Version: 0.7 -Release: 2.20080627cvs%{?dist} +Release: 3.20080627cvs%{?dist} Summary: A tool resembling top for network traffic Group: Applications/Internet @@ -40,7 +40,7 @@ rm -rf "${RPM_BUILD_ROOT}" mkdir -p "${RPM_BUILD_ROOT}%{_sbindir}" -install -m 0755 -s nethogs "${RPM_BUILD_ROOT}%{_sbindir}/" +install -m 0755 nethogs "${RPM_BUILD_ROOT}%{_sbindir}/" mkdir -p "${RPM_BUILD_ROOT}%{_mandir}/man8" install -m 0644 nethogs.8 "${RPM_BUILD_ROOT}%{_mandir}/man8/" @@ -55,6 +55,8 @@ %doc %{_mandir}/man*/* %changelog +* Fri Jul 08 2008 Anderson Silva 0.7-3.20080627cvs +- Fix for debuginfo package provided by Ville Skytta. * Fri Jun 27 2008 Anderson Silva 0.7-2.20080627cvs - Patch provided by Marek Mahut to compile under Fedora 9 - Removed BuildArch restrictions From fedora-extras-commits at redhat.com Tue Jul 8 15:49:47 2008 From: fedora-extras-commits at redhat.com (Anderson de Farias Silva (afsilva)) Date: Tue, 8 Jul 2008 15:49:47 GMT Subject: rpms/nethogs/F-9 import.log,1.1,1.2 nethogs.spec,1.1,1.2 Message-ID: <200807081549.m68FnlF8003317@cvs-int.fedora.redhat.com> Author: afsilva Update of /cvs/pkgs/rpms/nethogs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3245/F-9 Modified Files: import.log nethogs.spec Log Message: Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/nethogs/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Jun 2008 18:26:17 -0000 1.1 +++ import.log 8 Jul 2008 15:48:58 -0000 1.2 @@ -1 +1,2 @@ nethogs-0_7-2_20080627cvs_fc9:F-9:nethogs-0.7-2.20080627cvs.fc9.src.rpm:1214590964 +nethogs-0_7-3_20080627cvs_fc8:F-9:nethogs-0.7-3.20080627cvs.fc8.src.rpm:1215532084 Index: nethogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/nethogs/F-9/nethogs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethogs.spec 27 Jun 2008 18:26:17 -0000 1.1 +++ nethogs.spec 8 Jul 2008 15:48:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: nethogs Version: 0.7 -Release: 2.20080627cvs%{?dist} +Release: 3.20080627cvs%{?dist} Summary: A tool resembling top for network traffic Group: Applications/Internet @@ -40,7 +40,7 @@ rm -rf "${RPM_BUILD_ROOT}" mkdir -p "${RPM_BUILD_ROOT}%{_sbindir}" -install -m 0755 -s nethogs "${RPM_BUILD_ROOT}%{_sbindir}/" +install -m 0755 nethogs "${RPM_BUILD_ROOT}%{_sbindir}/" mkdir -p "${RPM_BUILD_ROOT}%{_mandir}/man8" install -m 0644 nethogs.8 "${RPM_BUILD_ROOT}%{_mandir}/man8/" @@ -55,6 +55,8 @@ %doc %{_mandir}/man*/* %changelog +* Fri Jul 08 2008 Anderson Silva 0.7-3.20080627cvs +- Fix for debuginfo package provided by Ville Skytta. * Fri Jun 27 2008 Anderson Silva 0.7-2.20080627cvs - Patch provided by Marek Mahut to compile under Fedora 9 - Removed BuildArch restrictions From fedora-extras-commits at redhat.com Tue Jul 8 15:51:15 2008 From: fedora-extras-commits at redhat.com (Anderson de Farias Silva (afsilva)) Date: Tue, 8 Jul 2008 15:51:15 GMT Subject: rpms/nethogs/F-8 import.log,1.1,1.2 nethogs.spec,1.1,1.2 Message-ID: <200807081551.m68FpFke003487@cvs-int.fedora.redhat.com> Author: afsilva Update of /cvs/pkgs/rpms/nethogs/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3401/F-8 Modified Files: import.log nethogs.spec Log Message: Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/nethogs/F-8/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Jun 2008 18:20:27 -0000 1.1 +++ import.log 8 Jul 2008 15:50:23 -0000 1.2 @@ -1 +1,2 @@ nethogs-0_7-2_20080627cvs_fc9:F-8:nethogs-0.7-2.20080627cvs.fc9.src.rpm:1214590483 +nethogs-0_7-3_20080627cvs_fc8:F-8:nethogs-0.7-3.20080627cvs.fc8.src.rpm:1215532173 Index: nethogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/nethogs/F-8/nethogs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethogs.spec 27 Jun 2008 18:20:27 -0000 1.1 +++ nethogs.spec 8 Jul 2008 15:50:23 -0000 1.2 @@ -1,6 +1,6 @@ Name: nethogs Version: 0.7 -Release: 2.20080627cvs%{?dist} +Release: 3.20080627cvs%{?dist} Summary: A tool resembling top for network traffic Group: Applications/Internet @@ -40,7 +40,7 @@ rm -rf "${RPM_BUILD_ROOT}" mkdir -p "${RPM_BUILD_ROOT}%{_sbindir}" -install -m 0755 -s nethogs "${RPM_BUILD_ROOT}%{_sbindir}/" +install -m 0755 nethogs "${RPM_BUILD_ROOT}%{_sbindir}/" mkdir -p "${RPM_BUILD_ROOT}%{_mandir}/man8" install -m 0644 nethogs.8 "${RPM_BUILD_ROOT}%{_mandir}/man8/" @@ -55,6 +55,8 @@ %doc %{_mandir}/man*/* %changelog +* Fri Jul 08 2008 Anderson Silva 0.7-3.20080627cvs +- Fix for debuginfo package provided by Ville Skytta. * Fri Jun 27 2008 Anderson Silva 0.7-2.20080627cvs - Patch provided by Marek Mahut to compile under Fedora 9 - Removed BuildArch restrictions From fedora-extras-commits at redhat.com Wed Jul 9 03:38:01 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 9 Jul 2008 03:38:01 GMT Subject: rpms/kernel/devel linux-2.6-ptrace-cleanup.patch, NONE, 1.1 linux-2.6-tracehook.patch, NONE, 1.1 config-generic, 1.123, 1.124 config-ia64, 1.1, 1.2 kernel.spec, 1.744, 1.745 linux-2.6-utrace.patch, 1.78, 1.79 Message-ID: <200807090338.m693c1We000493@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv419 Modified Files: config-generic config-ia64 kernel.spec linux-2.6-utrace.patch Added Files: linux-2.6-ptrace-cleanup.patch linux-2.6-tracehook.patch Log Message: new bleeding-edge utrace code linux-2.6-ptrace-cleanup.patch: --- NEW FILE linux-2.6-ptrace-cleanup.patch --- arch/powerpc/kernel/entry_32.S | 4 +- arch/powerpc/kernel/ptrace.c | 19 ++- arch/powerpc/kernel/signal.c | 12 +- arch/powerpc/kernel/signal_32.c | 2 +- arch/ppc/kernel/entry.S | 4 +- arch/x86/kernel/entry_32.S | 11 +- arch/x86/kernel/ptrace.c | 134 ++++-------- arch/x86/kernel/step.c | 22 ++- include/asm-powerpc/processor.h | 2 + include/asm-powerpc/ptrace.h | 4 + include/asm-powerpc/thread_info.h | 17 +- include/asm-x86/ptrace-abi.h | 6 +- include/asm-x86/thread_info_64.h | 2 + include/linux/init_task.h | 4 +- include/linux/sched.h | 26 +-- kernel/exit.c | 450 +++++++++++++++++++++++-------------- kernel/fork.c | 6 +- kernel/ptrace.c | 37 ++- 18 files changed, 428 insertions(+), 334 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 0c8614d..3a05e9f 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -668,7 +668,7 @@ user_exc_return: /* r10 contains MSR_KE /* Check current_thread_info()->flags */ rlwinm r9,r1,0,0,(31-THREAD_SHIFT) lwz r9,TI_FLAGS(r9) - andi. r0,r9,(_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NEED_RESCHED) + andi. r0,r9,_TIF_USER_WORK_MASK bne do_work restore_user: @@ -925,7 +925,7 @@ recheck: lwz r9,TI_FLAGS(r9) andi. r0,r9,_TIF_NEED_RESCHED bne- do_resched - andi. r0,r9,_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK + andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user do_user_signal: /* r10 contains MSR_KERNEL here */ ori r10,r10,MSR_EE diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 2a9fe97..91ee077 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -619,12 +619,29 @@ void user_enable_single_step(struct task task->thread.dbcr0 = DBCR0_IDM | DBCR0_IC; regs->msr |= MSR_DE; #else + regs->msr &= ~MSR_BE; regs->msr |= MSR_SE; #endif } set_tsk_thread_flag(task, TIF_SINGLESTEP); } +void user_enable_block_step(struct task_struct *task) +{ + struct pt_regs *regs = task->thread.regs; + + if (regs != NULL) { +#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) + task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT; + regs->msr |= MSR_DE; +#else + regs->msr &= ~MSR_SE; + regs->msr |= MSR_BE; +#endif + } + set_tsk_thread_flag(task, TIF_SINGLESTEP); +} + void user_disable_single_step(struct task_struct *task) { struct pt_regs *regs = task->thread.regs; @@ -634,7 +651,7 @@ void user_disable_single_step(struct tas task->thread.dbcr0 = 0; regs->msr &= ~MSR_DE; #else - regs->msr &= ~MSR_SE; + regs->msr &= ~(MSR_SE | MSR_BE); #endif } clear_tsk_thread_flag(task, TIF_SINGLESTEP); diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index a65a44f..ad55488 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -120,7 +120,7 @@ int do_signal(sigset_t *oldset, struct p int ret; int is32 = is_32bit_task(); - if (test_thread_flag(TIF_RESTORE_SIGMASK)) + if (current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK) oldset = ¤t->saved_sigmask; else if (!oldset) oldset = ¤t->blocked; @@ -131,9 +131,10 @@ int do_signal(sigset_t *oldset, struct p check_syscall_restart(regs, &ka, signr > 0); if (signr <= 0) { + struct thread_info *ti = current_thread_info(); /* No signal to deliver -- put the saved sigmask back */ - if (test_thread_flag(TIF_RESTORE_SIGMASK)) { - clear_thread_flag(TIF_RESTORE_SIGMASK); + if (ti->local_flags & _TLF_RESTORE_SIGMASK) { + ti->local_flags &= ~_TLF_RESTORE_SIGMASK; sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); } return 0; /* no signals delivered */ @@ -169,10 +170,9 @@ int do_signal(sigset_t *oldset, struct p /* * A signal was successfully delivered; the saved sigmask is in - * its frame, and we can clear the TIF_RESTORE_SIGMASK flag. + * its frame, and we can clear the TLF_RESTORE_SIGMASK flag. */ - if (test_thread_flag(TIF_RESTORE_SIGMASK)) - clear_thread_flag(TIF_RESTORE_SIGMASK); + current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK; } return ret; diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index ad69434..4ae16d1 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -243,7 +243,7 @@ long sys_sigsuspend(old_sigset_t mask) current->state = TASK_INTERRUPTIBLE; schedule(); - set_thread_flag(TIF_RESTORE_SIGMASK); + set_restore_sigmask(); return -ERESTARTNOHAND; } diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index 5f3a5d0..fcd830a 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S @@ -647,7 +647,7 @@ user_exc_return: /* r10 contains MSR_KE /* Check current_thread_info()->flags */ rlwinm r9,r1,0,0,18 lwz r9,TI_FLAGS(r9) - andi. r0,r9,(_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NEED_RESCHED) + andi. r0,r9,_TIF_USER_WORK_MASK bne do_work restore_user: @@ -898,7 +898,7 @@ recheck: lwz r9,TI_FLAGS(r9) andi. r0,r9,_TIF_NEED_RESCHED bne- do_resched - andi. r0,r9,_TIF_SIGPENDING + andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user do_user_signal: /* r10 contains MSR_KERNEL here */ ori r10,r10,MSR_EE diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index c778e4f..58a5a11 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -513,11 +513,7 @@ END(work_pending) syscall_trace_entry: movl $-ENOSYS,PT_EAX(%esp) movl %esp, %eax - xorl %edx,%edx - call do_syscall_trace - cmpl $0, %eax - jne resume_userspace # ret != 0 -> running under PTRACE_SYSEMU, - # so must skip actual syscall + call syscall_trace_enter movl PT_ORIG_EAX(%esp), %eax cmpl $(nr_syscalls), %eax jnae syscall_call @@ -530,11 +526,10 @@ syscall_exit_work: testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl jz work_pending TRACE_IRQS_ON - ENABLE_INTERRUPTS(CLBR_ANY) # could let do_syscall_trace() call + ENABLE_INTERRUPTS(CLBR_ANY) # could let syscall_trace_leave() call # schedule() instead movl %esp, %eax - movl $1, %edx - call do_syscall_trace + call syscall_trace_leave jmp resume_userspace END(syscall_exit_work) CFI_ENDPROC diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index a7835f2..44ee172 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -1357,8 +1357,6 @@ const struct user_regset_view *task_user #endif } -#ifdef CONFIG_X86_32 - void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code) { struct siginfo info; @@ -1377,89 +1375,10 @@ void send_sigtrap(struct task_struct *ts force_sig_info(SIGTRAP, &info, tsk); } -/* notification of system call entry/exit - * - triggered by current->work.syscall_trace - */ -int do_syscall_trace(struct pt_regs *regs, int entryexit) -{ - int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU); - /* - * With TIF_SYSCALL_EMU set we want to ignore TIF_SINGLESTEP for syscall - * interception - */ - int is_singlestep = !is_sysemu && test_thread_flag(TIF_SINGLESTEP); - int ret = 0; - - /* do the secure computing check first */ - if (!entryexit) - secure_computing(regs->orig_ax); - - if (unlikely(current->audit_context)) { - if (entryexit) - audit_syscall_exit(AUDITSC_RESULT(regs->ax), - regs->ax); - /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only - * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is - * not used, entry.S will call us only on syscall exit, not - * entry; so when TIF_SYSCALL_AUDIT is used we must avoid - * calling send_sigtrap() on syscall entry. - * - * Note that when PTRACE_SYSEMU_SINGLESTEP is used, - * is_singlestep is false, despite his name, so we will still do - * the correct thing. - */ - else if (is_singlestep) - goto out; - } - - if (!(current->ptrace & PT_PTRACED)) - goto out; - - /* If a process stops on the 1st tracepoint with SYSCALL_TRACE - * and then is resumed with SYSEMU_SINGLESTEP, it will come in - * here. We have to check this and return */ - if (is_sysemu && entryexit) - return 0; - - /* Fake a debug trap */ - if (is_singlestep) - send_sigtrap(current, regs, 0); - - if (!test_thread_flag(TIF_SYSCALL_TRACE) && !is_sysemu) - goto out; - - /* the 0x80 provides a way for the tracing parent to distinguish - between a syscall stop and SIGTRAP delivery */ - /* Note that the debugger could change the result of test_thread_flag!*/ - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ? 0x80:0)); - - /* - * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; - } - ret = is_sysemu; -out: - if (unlikely(current->audit_context) && !entryexit) - audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_ax, - regs->bx, regs->cx, regs->dx, regs->si); - if (ret == 0) - return 0; - - regs->orig_ax = -1; /* force skip of syscall restarting */ - if (unlikely(current->audit_context)) - audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); - return 1; -} - -#else /* CONFIG_X86_64 */ - static void syscall_trace(struct pt_regs *regs) { + if (!(current->ptrace & PT_PTRACED)) + return; #if 0 printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n", @@ -1481,39 +1400,64 @@ static void syscall_trace(struct pt_regs } } -asmlinkage void syscall_trace_enter(struct pt_regs *regs) +#ifdef CONFIG_X86_32 +# define IS_IA32 1 +#elif defined CONFIG_IA32_EMULATION +# define IS_IA32 test_thread_flag(TIF_IA32) +#else +# define IS_IA32 0 +#endif + +asmregparm void syscall_trace_enter(struct pt_regs *regs) { /* do the secure computing check first */ secure_computing(regs->orig_ax); - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) + if (test_thread_flag(TIF_SYSCALL_TRACE) || + unlikely(test_thread_flag(TIF_SYSCALL_EMU))) syscall_trace(regs); if (unlikely(current->audit_context)) { - if (test_thread_flag(TIF_IA32)) { + if (IS_IA32) audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_ax, regs->bx, regs->cx, regs->dx, regs->si); - } else { +#ifdef CONFIG_X86_64 + else audit_syscall_entry(AUDIT_ARCH_X86_64, regs->orig_ax, regs->di, regs->si, regs->dx, regs->r10); - } +#endif } + + if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) + /* + * Setting an invalid syscall number skips making the call + * and leaves the registers as they are now (-ENOSYS in + * regs->ax, or as just modified by ptrace). This also + * ensures that signal handling won't restart the call. + * TIF_SYSCALL_AUDIT will still cause us to get into + * syscall_trace_leave() after not making the call. + */ + regs->orig_ax = -1L; } -asmlinkage void syscall_trace_leave(struct pt_regs *regs) +asmregparm void syscall_trace_leave(struct pt_regs *regs) { if (unlikely(current->audit_context)) audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); - if ((test_thread_flag(TIF_SYSCALL_TRACE) - || test_thread_flag(TIF_SINGLESTEP)) - && (current->ptrace & PT_PTRACED)) + if (test_thread_flag(TIF_SYSCALL_TRACE)) syscall_trace(regs); -} -#endif /* CONFIG_X86_32 */ + /* + * If we are single-stepping, synthesize a trap to follow the + * system call instruction. + */ + if (test_thread_flag(TIF_SINGLESTEP) && + !test_thread_flag(TIF_SYSCALL_EMU) && + (current->ptrace & PT_PTRACED)) + send_sigtrap(current, regs, 0); +} diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index 92c20fe..0d2cb36 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c @@ -105,6 +105,7 @@ static int is_setting_trap_flag(struct t static int enable_single_step(struct task_struct *child) { struct pt_regs *regs = task_pt_regs(child); + unsigned long oflags; /* * Always set TIF_SINGLESTEP - this guarantees that @@ -113,11 +114,7 @@ static int enable_single_step(struct tas */ set_tsk_thread_flag(child, TIF_SINGLESTEP); - /* - * If TF was already set, don't do anything else - */ - if (regs->flags & X86_EFLAGS_TF) - return 0; + oflags = regs->flags; /* Set TF on the kernel stack.. */ regs->flags |= X86_EFLAGS_TF; @@ -126,9 +123,22 @@ static int enable_single_step(struct tas * ..but if TF is changed by the instruction we will trace, * don't mark it as being "us" that set it, so that we * won't clear it by hand later. + * + * Note that if we don't actually execute the popf because + * of a signal arriving right now or suchlike, we will lose + * track of the fact that it really was "us" that set it. */ - if (is_setting_trap_flag(child, regs)) + if (is_setting_trap_flag(child, regs)) { + clear_tsk_thread_flag(child, TIF_FORCED_TF); return 0; + } + + /* + * If TF was already set, check whether it was us who set it. + * If not, we should never attempt a block step. + */ + if (oflags & X86_EFLAGS_TF) + return test_tsk_thread_flag(child, TIF_FORCED_TF); set_tsk_thread_flag(child, TIF_FORCED_TF); diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h index cf83f2d..865db56 100644 --- a/include/asm-powerpc/processor.h +++ b/include/asm-powerpc/processor.h @@ -214,6 +214,8 @@ struct thread_struct { #define thread_saved_pc(tsk) \ ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0) +#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.regs) + unsigned long get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0) diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h index 39023dd..6a3892d 100644 --- a/include/asm-powerpc/ptrace.h +++ b/include/asm-powerpc/ptrace.h @@ -135,7 +135,9 @@ do { \ * These are defined as per linux/ptrace.h, which see. */ #define arch_has_single_step() (1) +#define arch_has_block_step() (1) extern void user_enable_single_step(struct task_struct *); +extern void user_enable_block_step(struct task_struct *); extern void user_disable_single_step(struct task_struct *); #endif /* __ASSEMBLY__ */ @@ -276,4 +278,6 @@ extern void user_disable_single_step(str #define PPC_PTRACE_PEEKUSR_3264 0x91 #define PPC_PTRACE_POKEUSR_3264 0x90 +#define PTRACE_SINGLEBLOCK 0x100 /* resume execution until next branch */ + #endif /* _ASM_POWERPC_PTRACE_H */ diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h index d030f5c..e079e81 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h @@ -116,7 +116,6 @@ static inline struct thread_info *curren #define TIF_SECCOMP 10 /* secure computing */ #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */ #define TIF_NOERROR 12 /* Force successful syscall return */ -#define TIF_RESTORE_SIGMASK 13 /* Restore signal mask in do_signal */ #define TIF_FREEZE 14 /* Freezing for suspend */ #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ #define TIF_ABI_PENDING 16 /* 32/64 bit switch needed */ @@ -134,21 +133,31 @@ static inline struct thread_info *curren #define _TIF_SECCOMP (1<local_flags |= _TLF_RESTORE_SIGMASK; + set_bit(TIF_SIGPENDING, &ti->flags); +} +#endif /* !__ASSEMBLY__ */ #endif /* __KERNEL__ */ diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h index f224eb3..72e7b9d 100644 --- a/include/asm-x86/ptrace-abi.h +++ b/include/asm-x86/ptrace-abi.h @@ -73,11 +73,11 @@ #ifdef __x86_64__ # define PTRACE_ARCH_PRCTL 30 -#else -# define PTRACE_SYSEMU 31 -# define PTRACE_SYSEMU_SINGLESTEP 32 #endif +#define PTRACE_SYSEMU 31 +#define PTRACE_SYSEMU_SINGLESTEP 32 + #define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */ #ifndef __ASSEMBLY__ diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h index cb69f70..79cf6ab 100644 --- a/include/asm-x86/thread_info_64.h +++ b/include/asm-x86/thread_info_64.h @@ -107,6 +107,7 @@ static inline struct thread_info *stack_ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ #define TIF_IRET 5 /* force IRET */ +#define TIF_SYSCALL_EMU 6 /* syscall emulation active */ #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ #define TIF_SECCOMP 8 /* secure computing */ #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ @@ -130,6 +131,7 @@ static inline struct thread_info *stack_ #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_IRET (1 << TIF_IRET) +#define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 9927a88..93c45ac 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -140,8 +140,8 @@ extern struct group_info init_groups; .nr_cpus_allowed = NR_CPUS, \ }, \ .tasks = LIST_HEAD_INIT(tsk.tasks), \ - .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ - .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ + .ptraced = LIST_HEAD_INIT(tsk.ptraced), \ + .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ .real_parent = &tsk, \ .parent = &tsk, \ .children = LIST_HEAD_INIT(tsk.children), \ diff --git a/include/linux/sched.h b/include/linux/sched.h index c5d3f84..75145b7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1075,12 +1075,6 @@ struct task_struct { #endif struct list_head tasks; - /* - * ptrace_list/ptrace_children forms the list of my children - * that were stolen by a ptracer. - */ - struct list_head ptrace_children; - struct list_head ptrace_list; struct mm_struct *mm, *active_mm; @@ -1102,18 +1096,25 @@ struct task_struct { /* * pointers to (original) parent process, youngest child, younger sibling, * older sibling, respectively. (p->father can be replaced with - * p->parent->pid) + * p->real_parent->pid) */ - struct task_struct *real_parent; /* real parent process (when being debugged) */ - struct task_struct *parent; /* parent process */ + struct task_struct *real_parent; /* real parent process */ + struct task_struct *parent; /* recipient of SIGCHLD, wait4() reports */ /* - * children/sibling forms the list of my children plus the - * tasks I'm ptracing. + * children/sibling forms the list of my natural children */ struct list_head children; /* list of my children */ struct list_head sibling; /* linkage in my parent's children list */ struct task_struct *group_leader; /* threadgroup leader */ + /* + * ptraced is the list of tasks this task is using ptrace on. + * This includes both natural children and PTRACE_ATTACH targets. + * p->ptrace_entry is p's link on the p->parent->ptraced list. + */ + struct list_head ptraced; + struct list_head ptrace_entry; + /* PID/PID hash table linkage. */ struct pid_link pids[PIDTYPE_MAX]; struct list_head thread_group; @@ -1870,9 +1871,6 @@ extern void wait_task_inactive(struct ta #define wait_task_inactive(p) do { } while (0) #endif -#define remove_parent(p) list_del_init(&(p)->sibling) -#define add_parent(p) list_add_tail(&(p)->sibling,&(p)->parent->children) - #define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks) #define for_each_process(p) \ diff --git a/kernel/exit.c b/kernel/exit.c index 8f6185e..981a3bd 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -70,7 +70,7 @@ static void __unhash_process(struct task __get_cpu_var(process_counts)--; } list_del_rcu(&p->thread_group); - remove_parent(p); + list_del_init(&p->sibling); } /* @@ -151,6 +151,18 @@ static void delayed_put_task_struct(stru put_task_struct(container_of(rhp, struct task_struct, rcu)); } +/* + * Do final ptrace-related cleanup of a zombie being reaped. + * + * Called with write_lock(&tasklist_lock) held. + */ +static void ptrace_release_task(struct task_struct *p) +{ + BUG_ON(!list_empty(&p->ptraced)); + ptrace_unlink(p); + BUG_ON(!list_empty(&p->ptrace_entry)); +} + void release_task(struct task_struct * p) { struct task_struct *leader; @@ -159,8 +171,7 @@ repeat: atomic_dec(&p->user->processes); proc_flush_task(p); write_lock_irq(&tasklist_lock); - ptrace_unlink(p); - BUG_ON(!list_empty(&p->ptrace_list) || !list_empty(&p->ptrace_children)); + ptrace_release_task(p); __exit_signal(p); /* @@ -314,9 +325,8 @@ static void reparent_to_kthreadd(void) ptrace_unlink(current); /* Reparent to init */ - remove_parent(current); current->real_parent = current->parent = kthreadd_task; - add_parent(current); + list_move_tail(¤t->sibling, ¤t->real_parent->children); /* Set the exit signal to SIGCHLD so we signal init on exit */ current->exit_signal = SIGCHLD; @@ -691,37 +701,96 @@ static void exit_mm(struct task_struct * mmput(mm); } -static void -reparent_thread(struct task_struct *p, struct task_struct *father, int traced) +/* + * Return nonzero if @parent's children should reap themselves. + * + * Called with write_lock_irq(&tasklist_lock) held. + */ +static int ignoring_children(struct task_struct *parent) { - if (p->pdeath_signal) - /* We already hold the tasklist_lock here. */ - group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); + int ret; + struct sighand_struct *psig = parent->sighand; + spin_lock(&psig->siglock); + ret = (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || + (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT)); + spin_unlock(&psig->siglock); + return ret; +} - /* Move the child from its dying parent to the new one. */ - if (unlikely(traced)) { - /* Preserve ptrace links if someone else is tracing this child. */ - list_del_init(&p->ptrace_list); - if (ptrace_reparented(p)) - list_add(&p->ptrace_list, &p->real_parent->ptrace_children); - } else { - /* If this child is being traced, then we're the one tracing it - * anyway, so let go of it. +/* + * Detach all tasks we were using ptrace on. + * Any that need to be release_task'd are put on the @dead list. + * + * Called with write_lock(&tasklist_lock) held. + */ +static void ptrace_exit(struct task_struct *parent, struct list_head *dead) +{ + struct task_struct *p, *n; + int ign = -1; + + list_for_each_entry_safe(p, n, &parent->ptraced, ptrace_entry) { + __ptrace_unlink(p); + + if (p->exit_state != EXIT_ZOMBIE) + continue; + + /* + * If it's a zombie, our attachedness prevented normal + * parent notification or self-reaping. Do notification + * now if it would have happened earlier. If it should + * reap itself, add it to the @dead list. We can't call + * release_task() here because we already hold tasklist_lock. + * + * If it's our own child, there is no notification to do. + * But if our normal children self-reap, then this child + * was prevented by ptrace and we must reap it now. */ - p->ptrace = 0; - remove_parent(p); - p->parent = p->real_parent; - add_parent(p); + if (!task_detached(p) && thread_group_empty(p)) { + if (!same_thread_group(p->real_parent, parent)) + do_notify_parent(p, p->exit_signal); + else { + if (ign < 0) + ign = ignoring_children(parent); + if (ign) + p->exit_signal = -1; + } + } - if (task_is_traced(p)) { + if (task_detached(p)) { /* - * If it was at a trace stop, turn it into - * a normal stop since it's no longer being - * traced. + * Mark it as in the process of being reaped. */ - ptrace_untrace(p); + p->exit_state = EXIT_DEAD; + list_add(&p->ptrace_entry, dead); } } +} + +/* + * Finish up exit-time ptrace cleanup. + * + * Called without locks. + */ +static void ptrace_exit_finish(struct task_struct *parent, + struct list_head *dead) +{ + struct task_struct *p, *n; + + BUG_ON(!list_empty(&parent->ptraced)); + + list_for_each_entry_safe(p, n, dead, ptrace_entry) { + list_del_init(&p->ptrace_entry); + release_task(p); + } +} + +static void reparent_thread(struct task_struct *p, struct task_struct *father) +{ + if (p->pdeath_signal) + /* We already hold the tasklist_lock here. */ + group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); + + list_move_tail(&p->sibling, &p->real_parent->children); /* If this is a threaded reparent there is no need to * notify anyone anything has happened. @@ -736,7 +805,8 @@ reparent_thread(struct task_struct *p, s /* If we'd notified the old parent about this child's death, * also notify the new parent. */ - if (!traced && p->exit_state == EXIT_ZOMBIE && + if (!ptrace_reparented(p) && + p->exit_state == EXIT_ZOMBIE && !task_detached(p) && thread_group_empty(p)) do_notify_parent(p, p->exit_signal); @@ -753,12 +823,15 @@ reparent_thread(struct task_struct *p, s static void forget_original_parent(struct task_struct *father) { struct task_struct *p, *n, *reaper = father; - struct list_head ptrace_dead; - - INIT_LIST_HEAD(&ptrace_dead); + LIST_HEAD(ptrace_dead); write_lock_irq(&tasklist_lock); + /* + * First clean up ptrace if we were using it. + */ + ptrace_exit(father, &ptrace_dead); + do { reaper = next_thread(reaper); if (reaper == father) { @@ -767,58 +840,19 @@ static void forget_original_parent(struc } } while (reaper->flags & PF_EXITING); - /* - * There are only two places where our children can be: - * - * - in our child list - * - in our ptraced child list - * - * Search them and reparent children. - */ list_for_each_entry_safe(p, n, &father->children, sibling) { - int ptrace; - - ptrace = p->ptrace; - - /* if father isn't the real parent, then ptrace must be enabled */ - BUG_ON(father != p->real_parent && !ptrace); - - if (father == p->real_parent) { - /* reparent with a reaper, real father it's us */ - p->real_parent = reaper; - reparent_thread(p, father, 0); - } else { - /* reparent ptraced task to its real parent */ - __ptrace_unlink (p); - if (p->exit_state == EXIT_ZOMBIE && !task_detached(p) && - thread_group_empty(p)) - do_notify_parent(p, p->exit_signal); - } - - /* - * if the ptraced child is a detached zombie we must collect - * it before we exit, or it will remain zombie forever since - * we prevented it from self-reap itself while it was being - * traced by us, to be able to see it in wait4. - */ - if (unlikely(ptrace && p->exit_state == EXIT_ZOMBIE && task_detached(p))) - list_add(&p->ptrace_list, &ptrace_dead); - } - - list_for_each_entry_safe(p, n, &father->ptrace_children, ptrace_list) { p->real_parent = reaper; - reparent_thread(p, father, 1); + if (p->parent == father) { + BUG_ON(p->ptrace); + p->parent = p->real_parent; + } + reparent_thread(p, father); } write_unlock_irq(&tasklist_lock); BUG_ON(!list_empty(&father->children)); - BUG_ON(!list_empty(&father->ptrace_children)); - - list_for_each_entry_safe(p, n, &ptrace_dead, ptrace_list) { - list_del_init(&p->ptrace_list); - release_task(p); - } + ptrace_exit_finish(father, &ptrace_dead); } /* @@ -1179,13 +1213,6 @@ static int eligible_child(enum pid_type return 0; } - /* - * Do not consider detached threads that are - * not ptraced: - */ - if (task_detached(p) && !p->ptrace) - return 0; - /* Wait for all children (clone and not) if __WALL is set; * otherwise, wait for clone children *only* if __WCLONE is * set; otherwise, wait for non-clone children *only*. (Note: @@ -1196,14 +1223,10 @@ static int eligible_child(enum pid_type return 0; err = security_task_wait(p); - if (likely(!err)) - return 1; + if (err) + return err; - if (type != PIDTYPE_PID) - return 0; - /* This child was explicitly requested, abort */ - read_unlock(&tasklist_lock); - return err; + return 1; } static int wait_noreap_copyout(struct task_struct *p, pid_t pid, uid_t uid, @@ -1237,7 +1260,7 @@ static int wait_noreap_copyout(struct ta * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ -static int wait_task_zombie(struct task_struct *p, int noreap, +static int wait_task_zombie(struct task_struct *p, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { @@ -1245,7 +1268,10 @@ static int wait_task_zombie(struct task_ int retval, status, traced; pid_t pid = task_pid_vnr(p); - if (unlikely(noreap)) { + if (!likely(options & WEXITED)) + return 0; + + if (unlikely(options & WNOWAIT)) { uid_t uid = p->uid; int exit_code = p->exit_code; int why, status; @@ -1395,21 +1421,24 @@ static int wait_task_zombie(struct task_ * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ -static int wait_task_stopped(struct task_struct *p, - int noreap, struct siginfo __user *infop, +static int wait_task_stopped(int ptrace, struct task_struct *p, + int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { int retval, exit_code, why; uid_t uid = 0; /* unneeded, required by compiler */ pid_t pid; + if (!(options & WUNTRACED)) + return 0; + exit_code = 0; spin_lock_irq(&p->sighand->siglock); if (unlikely(!task_is_stopped_or_traced(p))) goto unlock_sig; - if (!(p->ptrace & PT_PTRACED) && p->signal->group_stop_count > 0) + if (!ptrace && p->signal->group_stop_count > 0) /* * A group stop is in progress and this is the group leader. * We won't report until all threads have stopped. @@ -1420,7 +1449,7 @@ static int wait_task_stopped(struct task if (!exit_code) goto unlock_sig; - if (!noreap) + if (!unlikely(options & WNOWAIT)) p->exit_code = 0; uid = p->uid; @@ -1438,10 +1467,10 @@ unlock_sig: */ get_task_struct(p); pid = task_pid_vnr(p); - why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; + why = ptrace ? CLD_TRAPPED : CLD_STOPPED; read_unlock(&tasklist_lock); - if (unlikely(noreap)) + if (unlikely(options & WNOWAIT)) return wait_noreap_copyout(p, pid, uid, why, exit_code, infop, ru); @@ -1475,7 +1504,7 @@ unlock_sig: * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ -static int wait_task_continued(struct task_struct *p, int noreap, +static int wait_task_continued(struct task_struct *p, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { @@ -1483,6 +1512,9 @@ static int wait_task_continued(struct ta pid_t pid; uid_t uid; + if (!unlikely(options & WCONTINUED)) + return 0; + if (!(p->signal->flags & SIGNAL_STOP_CONTINUED)) return 0; @@ -1492,7 +1524,7 @@ static int wait_task_continued(struct ta spin_unlock_irq(&p->sighand->siglock); return 0; } - if (!noreap) + if (!unlikely(options & WNOWAIT)) p->signal->flags &= ~SIGNAL_STOP_CONTINUED; spin_unlock_irq(&p->sighand->siglock); @@ -1518,89 +1550,161 @@ static int wait_task_continued(struct ta return retval; } +/* + * Consider @p for a wait by @parent. + * + * -ECHILD should be in *@notask_error before the first call. + * Returns nonzero for a final return, when we have unlocked tasklist_lock. + * Returns zero if the search for a child should continue; + * then *@notask_error is 0 if @p is an eligible child, + * or another error from security_task_wait(), or still -ECHILD. + */ +static int wait_consider_task(struct task_struct *parent, int ptrace, + struct task_struct *p, int *notask_error, + enum pid_type type, struct pid *pid, int options, + struct siginfo __user *infop, + int __user *stat_addr, struct rusage __user *ru) +{ + int ret = eligible_child(type, pid, options, p); + if (!ret) + return ret; + + if (unlikely(ret < 0)) { + /* + * If we have not yet seen any eligible child, + * then let this error code replace -ECHILD. + * A permission error will give the user a clue + * to look for security policy problems, rather + * than for mysterious wait bugs. + */ + if (*notask_error) + *notask_error = ret; + } + + if (likely(!ptrace) && unlikely(p->ptrace)) { + /* + * This child is hidden by ptrace. + * We aren't allowed to see it now, but eventually we will. + */ + *notask_error = 0; + return 0; + } + + if (p->exit_state == EXIT_DEAD) + return 0; + + /* + * We don't reap group leaders with subthreads. + */ + if (p->exit_state == EXIT_ZOMBIE && !delay_group_leader(p)) + return wait_task_zombie(p, options, infop, stat_addr, ru); + + /* + * It's stopped or running now, so it might + * later continue, exit, or stop again. + */ + *notask_error = 0; + + if (task_is_stopped_or_traced(p)) + return wait_task_stopped(ptrace, p, options, + infop, stat_addr, ru); + + return wait_task_continued(p, options, infop, stat_addr, ru); +} + +/* + * Do the work of do_wait() for one thread in the group, @tsk. + * + * -ECHILD should be in *@notask_error before the first call. + * Returns nonzero for a final return, when we have unlocked tasklist_lock. + * Returns zero if the search for a child should continue; then + * *@notask_error is 0 if there were any eligible children, + * or another error from security_task_wait(), or still -ECHILD. + */ +static int do_wait_thread(struct task_struct *tsk, int *notask_error, + enum pid_type type, struct pid *pid, int options, + struct siginfo __user *infop, int __user *stat_addr, + struct rusage __user *ru) +{ + struct task_struct *p; + + list_for_each_entry(p, &tsk->children, sibling) { + /* + * Do not consider detached threads. + */ + if (!task_detached(p)) { + int ret = wait_consider_task(tsk, 0, p, notask_error, + type, pid, options, + infop, stat_addr, ru); + if (ret) + return ret; + } + } + + return 0; +} + +static int ptrace_do_wait(struct task_struct *tsk, int *notask_error, + enum pid_type type, struct pid *pid, int options, + struct siginfo __user *infop, int __user *stat_addr, + struct rusage __user *ru) +{ + struct task_struct *p; + + /* + * Traditionally we see ptrace'd stopped tasks regardless of options. + */ + options |= WUNTRACED; + + list_for_each_entry(p, &tsk->ptraced, ptrace_entry) { + int ret = wait_consider_task(tsk, 1, p, notask_error, + type, pid, options, + infop, stat_addr, ru); + if (ret) + return ret; + } + + return 0; +} + static long do_wait(enum pid_type type, struct pid *pid, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { DECLARE_WAITQUEUE(wait, current); struct task_struct *tsk; - int flag, retval; + int retval; add_wait_queue(¤t->signal->wait_chldexit,&wait); repeat: - /* If there is nothing that can match our critier just get out */ + /* + * If there is nothing that can match our critiera just get out. + * We will clear @retval to zero if we see any child that might later + * match our criteria, even if we are not able to reap it yet. + */ retval = -ECHILD; if ((type < PIDTYPE_MAX) && (!pid || hlist_empty(&pid->tasks[type]))) goto end; - /* - * We will set this flag if we see any child that might later - * match our criteria, even if we are not able to reap it yet. - */ - flag = retval = 0; current->state = TASK_INTERRUPTIBLE; read_lock(&tasklist_lock); tsk = current; do { - struct task_struct *p; - - list_for_each_entry(p, &tsk->children, sibling) { - int ret = eligible_child(type, pid, options, p); - if (!ret) - continue; - - if (unlikely(ret < 0)) { - retval = ret; - } else if (task_is_stopped_or_traced(p)) { - /* - * It's stopped now, so it might later - * continue, exit, or stop again. - */ - flag = 1; - if (!(p->ptrace & PT_PTRACED) && - !(options & WUNTRACED)) - continue; - - retval = wait_task_stopped(p, - (options & WNOWAIT), infop, - stat_addr, ru); - } else if (p->exit_state == EXIT_ZOMBIE && - !delay_group_leader(p)) { - /* - * We don't reap group leaders with subthreads. - */ - if (!likely(options & WEXITED)) - continue; - retval = wait_task_zombie(p, - (options & WNOWAIT), infop, - stat_addr, ru); - } else if (p->exit_state != EXIT_DEAD) { - /* - * It's running now, so it might later - * exit, stop, or stop and then continue. - */ - flag = 1; - if (!unlikely(options & WCONTINUED)) - continue; - retval = wait_task_continued(p, - (options & WNOWAIT), infop, - stat_addr, ru); - } - if (retval != 0) /* tasklist_lock released */ - goto end; - } - if (!flag) { - list_for_each_entry(p, &tsk->ptrace_children, - ptrace_list) { - flag = eligible_child(type, pid, options, p); - if (!flag) - continue; - if (likely(flag > 0)) - break; - retval = flag; - goto end; - } + int tsk_result = do_wait_thread(tsk, &retval, + type, pid, options, + infop, stat_addr, ru); + if (!tsk_result) + tsk_result = ptrace_do_wait(tsk, &retval, + type, pid, options, + infop, stat_addr, ru); + if (tsk_result) { + /* + * tasklist_lock is unlocked and we have a final result. + */ + retval = tsk_result; + goto end; } + if (options & __WNOTHREAD) break; tsk = next_thread(tsk); @@ -1608,16 +1712,14 @@ repeat: } while (tsk != current); read_unlock(&tasklist_lock); - if (flag) { - if (options & WNOHANG) - goto end; + if (!retval && !(options & WNOHANG)) { retval = -ERESTARTSYS; - if (signal_pending(current)) - goto end; - schedule(); - goto repeat; + if (!signal_pending(current)) { + schedule(); + goto repeat; + } } - retval = -ECHILD; + end: current->state = TASK_RUNNING; remove_wait_queue(¤t->signal->wait_chldexit,&wait); diff --git a/kernel/fork.c b/kernel/fork.c index 19908b2..df8fe06 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1124,8 +1124,8 @@ static struct task_struct *copy_process( */ p->group_leader = p; INIT_LIST_HEAD(&p->thread_group); - INIT_LIST_HEAD(&p->ptrace_children); - INIT_LIST_HEAD(&p->ptrace_list); + INIT_LIST_HEAD(&p->ptrace_entry); + INIT_LIST_HEAD(&p->ptraced); /* Now that the task is set up, run cgroup callbacks if * necessary. We need to run them before the task is visible @@ -1197,7 +1197,7 @@ static struct task_struct *copy_process( } if (likely(p->pid)) { - add_parent(p); + list_add_tail(&p->sibling, &p->real_parent->children); if (unlikely(p->ptrace & PT_PTRACED)) __ptrace_link(p, current->parent); diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 6c19e94..acf80a4 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -33,13 +33,9 @@ */ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent) { - BUG_ON(!list_empty(&child->ptrace_list)); - if (child->parent == new_parent) - return; - list_add(&child->ptrace_list, &child->parent->ptrace_children); - remove_parent(child); + BUG_ON(!list_empty(&child->ptrace_entry)); + list_add(&child->ptrace_entry, &new_parent->ptraced); child->parent = new_parent; - add_parent(child); } /* @@ -73,12 +69,8 @@ void __ptrace_unlink(struct task_struct BUG_ON(!child->ptrace); child->ptrace = 0; - if (ptrace_reparented(child)) { - list_del_init(&child->ptrace_list); - remove_parent(child); - child->parent = child->real_parent; - add_parent(child); - } + child->parent = child->real_parent; + list_del_init(&child->ptrace_entry); if (task_is_traced(child)) ptrace_untrace(child); @@ -492,14 +484,33 @@ int ptrace_traceme(void) /* * Are we already being traced? */ +repeat: task_lock(current); if (!(current->ptrace & PT_PTRACED)) { + /* + * See ptrace_attach() comments about the locking here. + */ + unsigned long flags; + if (!write_trylock_irqsave(&tasklist_lock, flags)) { + task_unlock(current); + do { + cpu_relax(); + } while (!write_can_lock(&tasklist_lock)); + goto repeat; + } + ret = security_ptrace(current->parent, current); + /* * Set the ptrace bit in the process ptrace flags. + * Then link us on our parent's ptraced list. */ - if (!ret) + if (!ret) { current->ptrace |= PT_PTRACED; + __ptrace_link(current, current->real_parent); + } + + write_unlock_irqrestore(&tasklist_lock, flags); } task_unlock(current); return ret; linux-2.6-tracehook.patch: --- NEW FILE linux-2.6-tracehook.patch --- arch/Kconfig | 18 ++ arch/ia64/Kconfig | 1 + arch/ia64/kernel/perfmon.c | 11 +- arch/ia64/kernel/process.c | 21 +- arch/ia64/kernel/ptrace.c | 43 +-- arch/ia64/kernel/signal.c | 8 + arch/mips/kernel/irixelf.c | 2 - arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/entry_32.S | 4 +- arch/powerpc/kernel/entry_64.S | 3 +- arch/powerpc/kernel/ptrace.c | 33 +-- arch/powerpc/kernel/signal.c | 21 ++- arch/sparc64/Kconfig | 1 + arch/sparc64/kernel/ptrace.c | 24 +-- arch/sparc64/kernel/rtrap.S | 6 +- arch/sparc64/kernel/signal.c | 5 + arch/x86/Kconfig | 1 + arch/x86/ia32/ia32_aout.c | 6 - arch/x86/kernel/ptrace.c | 31 +-- arch/x86/kernel/signal_32.c | 11 +- arch/x86/kernel/signal_64.c | 49 +--- fs/binfmt_aout.c | 6 - fs/binfmt_elf.c | 6 - fs/binfmt_elf_fdpic.c | 7 - fs/binfmt_flat.c | 3 - fs/binfmt_som.c | 2 - fs/exec.c | 12 +- fs/proc/array.c | 9 +- fs/proc/base.c | 39 +++- include/asm-generic/syscall.h | 137 +++++++++ include/asm-ia64/thread_info.h | 3 - include/asm-powerpc/ptrace.h | 1 + include/asm-powerpc/signal.h | 3 +- include/asm-powerpc/syscall.h | 72 +++++ include/asm-powerpc/thread_info.h | 5 +- include/asm-sparc64/ptrace.h | 1 + include/asm-sparc64/syscall.h | 75 +++++ include/asm-sparc64/thread_info.h | 8 +- include/asm-x86/ptrace.h | 5 + include/asm-x86/syscall.h | 213 ++++++++++++++ include/asm-x86/thread_info_32.h | 2 + include/asm-x86/thread_info_64.h | 5 +- include/linux/ptrace.h | 72 +++++ include/linux/sched.h | 10 +- include/linux/tracehook.h | 566 +++++++++++++++++++++++++++++++++++++ kernel/exit.c | 53 ++--- kernel/fork.c | 74 ++--- kernel/kthread.c | 2 +- kernel/ptrace.c | 2 +- kernel/sched.c | 29 ++- kernel/signal.c | 99 ++++--- lib/Makefile | 2 + lib/syscall.c | 75 +++++ mm/nommu.c | 4 +- security/selinux/hooks.c | 22 +-- 55 files changed, 1556 insertions(+), 368 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 3ea332b..1955fbd 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -39,3 +39,21 @@ config HAVE_KRETPROBES config HAVE_DMA_ATTRS def_bool n + +# +# An arch should select this if it provides all these things: +# +# task_pt_regs() in asm/processor.h or asm/ptrace.h +# arch_has_single_step() if there is hardware single-step support +# arch_has_block_step() if there is hardware block-step support +# arch_ptrace() and not #define __ARCH_SYS_PTRACE +# compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE +# asm/syscall.h supplying asm-generic/syscall.h interface +# linux/regset.h user_regset interfaces +# CORE_DUMP_USE_REGSET #define'd in linux/elf.h +# TIF_SYSCALL_TRACE calls tracehook_report_syscall_{entry,exit} +# TIF_NOTIFY_RESUME calls tracehook_notify_resume() +# signal delivery calls tracehook_signal_handler() +# +config HAVE_ARCH_TRACEHOOK + def_bool n diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 16be414..f23a54a 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -19,6 +19,7 @@ config IA64 select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_ARCH_TRACEHOOK select HAVE_DMA_ATTRS select HAVE_KVM default y diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 7714a97..189d525 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -2626,7 +2627,7 @@ pfm_task_incompatible(pfm_context_t *ctx /* * make sure the task is off any CPU */ - wait_task_inactive(task); + wait_task_inactive(task, 0); /* more to come... */ @@ -3684,7 +3685,7 @@ pfm_restart(pfm_context_t *ctx, void *ar PFM_SET_WORK_PENDING(task, 1); - tsk_set_notify_resume(task); + set_notify_resume(task); /* * XXX: send reschedule if task runs on another CPU @@ -4774,7 +4775,7 @@ recheck: UNPROTECT_CTX(ctx, flags); - wait_task_inactive(task); + wait_task_inactive(task, 0); PROTECT_CTX(ctx, flags); @@ -5044,8 +5045,6 @@ pfm_handle_work(void) PFM_SET_WORK_PENDING(current, 0); - tsk_clear_notify_resume(current); - regs = task_pt_regs(current); /* @@ -5414,7 +5413,7 @@ pfm_overflow_handler(struct task_struct * when coming from ctxsw, current still points to the * previous task, therefore we must work with task and not current. */ - tsk_set_notify_resume(task); + set_notify_resume(task); } /* * defer until state is changed (shorten spin window). the context is locked diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index a3a34b4..ff448fe 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -156,21 +156,6 @@ show_regs (struct pt_regs *regs) show_stack(NULL, NULL); } -void tsk_clear_notify_resume(struct task_struct *tsk) -{ -#ifdef CONFIG_PERFMON - if (tsk->thread.pfm_needs_checking) - return; -#endif - if (test_ti_thread_flag(task_thread_info(tsk), TIF_RESTORE_RSE)) - return; - clear_ti_thread_flag(task_thread_info(tsk), TIF_NOTIFY_RESUME); -} - -/* - * do_notify_resume_user(): - * Called from notify_resume_user at entry.S, with interrupts disabled. - */ void do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall) { @@ -199,6 +184,11 @@ do_notify_resume_user(sigset_t *unused, ia64_do_signal(scr, in_syscall); } + if (test_thread_flag(TIF_NOTIFY_RESUME)) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(&scr->pt); + } + /* copy user rbs to kernel rbs */ if (unlikely(test_thread_flag(TIF_RESTORE_RSE))) { local_irq_enable(); /* force interrupt enable */ diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 2a9943b..3ba40a1 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c @@ -22,6 +22,7 @@ #include #include #include +#include [...2880 lines suppressed...] + do_group_exit(info->si_signo); /* NOTREACHED */ } spin_unlock_irq(&sighand->siglock); @@ -1909,7 +1937,7 @@ void exit_signals(struct task_struct *ts out: spin_unlock_irq(&tsk->sighand->siglock); - if (unlikely(group_stop)) { + if (unlikely(group_stop) && tracehook_notify_jctl(1, CLD_STOPPED)) { read_lock(&tasklist_lock); do_notify_parent_cldstop(tsk, CLD_STOPPED); read_unlock(&tasklist_lock); @@ -1921,7 +1949,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal); EXPORT_SYMBOL(flush_signals); EXPORT_SYMBOL(force_sig); EXPORT_SYMBOL(kill_proc); -EXPORT_SYMBOL(ptrace_notify); EXPORT_SYMBOL(send_sig); EXPORT_SYMBOL(send_sig_info); EXPORT_SYMBOL(sigprocmask); @@ -2325,7 +2352,7 @@ int do_sigaction(int sig, struct k_sigac * (for example, SIGCHLD), shall cause the pending signal to * be discarded, whether or not it is blocked" */ - if (__sig_ignored(t, sig)) { + if (sig_handler_ignored(sig_handler(t, sig), sig)) { sigemptyset(&mask); sigaddset(&mask, sig); rm_from_queue_full(&mask, &t->signal->shared_pending); diff --git a/lib/Makefile b/lib/Makefile index 74b0cfb..62dfd16 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -72,6 +72,8 @@ lib-$(CONFIG_GENERIC_BUG) += bug.o obj-$(CONFIG_HAVE_LMB) += lmb.o +obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o + hostprogs-y := gen_crc32table clean-files := crc32table.h diff --git a/lib/syscall.c b/lib/syscall.c new file mode 100644 index ...a4f7067 100644 --- /dev/null +++ b/lib/syscall.c @@ -0,0 +1,75 @@ +#include +#include +#include +#include + +static int collect_syscall(struct task_struct *target, long *callno, + unsigned long args[6], unsigned int maxargs, + unsigned long *sp, unsigned long *pc) +{ + struct pt_regs *regs = task_pt_regs(target); + if (unlikely(!regs)) + return -EAGAIN; + + *sp = user_stack_pointer(regs); + *pc = instruction_pointer(regs); + + *callno = syscall_get_nr(target, regs); + if (*callno != -1L && maxargs > 0) + syscall_get_arguments(target, regs, 0, maxargs, args); + + return 0; +} + +/** + * task_current_syscall - Discover what a blocked task is doing. + * @target: thread to examine + * @callno: filled with system call number or -1 + * @args: filled with @maxargs system call arguments + * @maxargs: number of elements in @args to fill + * @sp: filled with user stack pointer + * @pc: filled with user PC + * + * If @target is blocked in a system call, returns zero with *@callno + * set to the the call's number and @args filled in with its arguments. + * Registers not used for system call arguments may not be available and + * it is not kosher to use &struct user_regset calls while the system + * call is still in progress. Note we may get this result if @target + * has finished its system call but not yet returned to user mode, such + * as when it's stopped for signal handling or syscall exit tracing. + * + * If @target is blocked in the kernel during a fault or exception, + * returns zero with *@callno set to -1 and does not fill in @args. + * If so, it's now safe to examine @target using &struct user_regset + * get() calls as long as we're sure @target won't return to user mode. + * + * Returns -%EAGAIN if @target does not remain blocked. + * + * Returns -%EINVAL if @maxargs is too large (maximum is six). + */ +int task_current_syscall(struct task_struct *target, long *callno, + unsigned long args[6], unsigned int maxargs, + unsigned long *sp, unsigned long *pc) +{ + long state; + unsigned long ncsw; + + if (unlikely(maxargs > 6)) + return -EINVAL; + + if (target == current) + return collect_syscall(target, callno, args, maxargs, sp, pc); + + state = target->state; + if (unlikely(!state)) + return -EAGAIN; + + ncsw = wait_task_inactive(target, state); + if (unlikely(!ncsw) || + unlikely(collect_syscall(target, callno, args, maxargs, sp, pc)) || + unlikely(wait_task_inactive(target, state) != ncsw)) + return -EAGAIN; + + return 0; +} +EXPORT_SYMBOL_GPL(task_current_syscall); diff --git a/mm/nommu.c b/mm/nommu.c index 4462b6a..5edccd9 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -745,7 +745,7 @@ static unsigned long determine_vm_flags( * it's being traced - otherwise breakpoints set in it may interfere * with another untraced process */ - if ((flags & MAP_PRIVATE) && (current->ptrace & PT_PTRACED)) + if ((flags & MAP_PRIVATE) && tracehook_expect_breakpoints(current)) vm_flags &= ~VM_MAYSHARE; return vm_flags; diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 1c864c0..f92c6af 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -1910,22 +1910,6 @@ static int selinux_vm_enough_memory(stru return __vm_enough_memory(mm, pages, cap_sys_admin); } -/** - * task_tracer_task - return the task that is tracing the given task - * @task: task to consider - * - * Returns NULL if noone is tracing @task, or the &struct task_struct - * pointer to its tracer. - * - * Must be called under rcu_read_lock(). - */ -static struct task_struct *task_tracer_task(struct task_struct *task) -{ - if (task->ptrace & PT_PTRACED) - return rcu_dereference(task->parent); - return NULL; -} - /* binprm security operations */ static int selinux_bprm_alloc_security(struct linux_binprm *bprm) @@ -2177,7 +2161,7 @@ static void selinux_bprm_apply_creds(str u32 ptsid = 0; rcu_read_lock(); - tracer = task_tracer_task(current); + tracer = tracehook_tracer_task(current); if (likely(tracer != NULL)) { sec = tracer->security; ptsid = sec->sid; @@ -5205,7 +5189,7 @@ static int selinux_setprocattr(struct ta Otherwise, leave SID unchanged and fail. */ task_lock(p); rcu_read_lock(); - tracer = task_tracer_task(p); + tracer = tracehook_tracer_task(p); if (tracer != NULL) { struct task_security_struct *ptsec = tracer->security; u32 ptsid = ptsec->sid; Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- config-generic 8 Jul 2008 20:33:41 -0000 1.123 +++ config-generic 9 Jul 2008 03:37:06 -0000 1.124 @@ -3432,7 +3432,7 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_UTRACE=y -CONFIG_PTRACE=y +CONFIG_UTRACE_PTRACE=y CONFIG_KPROBES=y Index: config-ia64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-ia64 12 Jul 2007 19:15:37 -0000 1.1 +++ config-ia64 9 Jul 2008 03:37:06 -0000 1.2 @@ -1,3 +1,4 @@ CONFIG_CRASH_DUMP=y CONFIG_PROC_VMCORE=y +CONFIG_UTRACE=n Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.744 retrieving revision 1.745 diff -u -r1.744 -r1.745 --- kernel.spec 8 Jul 2008 21:29:35 -0000 1.744 +++ kernel.spec 9 Jul 2008 03:37:06 -0000 1.745 @@ -571,7 +571,9 @@ Patch10: linux-2.6-hotfixes.patch -Patch21: linux-2.6-utrace.patch +Patch21: linux-2.6-ptrace-cleanup.patch +Patch22: linux-2.6-tracehook.patch +Patch23: linux-2.6-utrace.patch Patch41: linux-2.6-sysrq-c.patch Patch42: linux-2.6-x86-tune-generic.patch @@ -1004,9 +1006,9 @@ ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. -%ifnarch ia64 -#ApplyPatch linux-2.6-utrace.patch -%endif +ApplyPatch linux-2.6-ptrace-cleanup.patch +ApplyPatch linux-2.6-tracehook.patch +ApplyPatch linux-2.6-utrace.patch # enable sysrq-c on all kernels, not only kexec ApplyPatch linux-2.6-sysrq-c.patch @@ -1792,6 +1794,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Tue Jul 8 2008 Roland McGrath +- new bleeding-edge utrace code + * Tue Jul 08 2008 Eric Sandeen - Fix reiserfs list corruption (#453699) linux-2.6-utrace.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.78 -r 1.79 linux-2.6-utrace.patch Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- linux-2.6-utrace.patch 16 May 2008 21:06:38 -0000 1.78 +++ linux-2.6-utrace.patch 9 Jul 2008 03:37:06 -0000 1.79 @@ -1,88 +1,20 @@ - Documentation/DocBook/Makefile | 2 +- - Documentation/DocBook/utrace.tmpl | 23 + - Documentation/utrace.txt | 579 +++++++++ - arch/alpha/kernel/ptrace.c | 15 +- - arch/arm/kernel/ptrace.c | 5 +- - arch/avr32/kernel/ptrace.c | 5 +- - arch/blackfin/kernel/ptrace.c | 5 +- - arch/frv/kernel/ptrace.c | 3 +- - arch/h8300/kernel/ptrace.c | 3 +- - arch/ia64/kernel/process.c | 2 +- - arch/ia64/kernel/ptrace.c | 17 +- - arch/m32r/kernel/ptrace.c | 7 +- - arch/m68k/kernel/ptrace.c | 5 +- - arch/m68knommu/kernel/ptrace.c | 3 +- - arch/mips/kernel/irixelf.c | 2 - - arch/mips/kernel/ptrace.c | 5 +- - arch/mn10300/kernel/ptrace.c | 3 +- - arch/parisc/kernel/ptrace.c | 7 +- - arch/powerpc/kernel/entry_32.S | 4 +- - arch/powerpc/kernel/process.c | 5 - - arch/powerpc/kernel/ptrace.c | 38 +- - arch/powerpc/kernel/ptrace32.c | 8 +- - arch/powerpc/kernel/signal.c | 20 +- - arch/powerpc/kernel/signal_32.c | 21 +- - arch/powerpc/kernel/sys_ppc32.c | 5 - - arch/s390/kernel/entry.S | 14 +- - arch/s390/kernel/entry64.S | 12 +- - arch/sh/kernel/ptrace_32.c | 5 +- - arch/sh/kernel/ptrace_64.c | 5 +- - arch/sparc/kernel/ptrace.c | 5 +- - arch/sparc64/kernel/binfmt_aout32.c | 2 - - arch/sparc64/kernel/ptrace.c | 35 +- - arch/um/kernel/ptrace.c | 3 +- - arch/v850/kernel/ptrace.c | 3 +- - arch/x86/ia32/ia32_aout.c | 6 - - arch/x86/ia32/ia32_signal.c | 12 +- - arch/x86/ia32/ia32entry.S | 14 +- - arch/x86/ia32/sys_ia32.c | 5 - - arch/x86/kernel/entry_64.S | 8 +- - arch/x86/kernel/ptrace.c | 159 +-- - arch/x86/kernel/signal_32.c | 56 +- - arch/x86/kernel/signal_64.c | 49 +- - arch/x86/kernel/step.c | 22 +- - arch/x86/kernel/vm86_32.c | 9 +- - arch/xtensa/kernel/ptrace.c | 6 +- - fs/binfmt_aout.c | 6 - - fs/binfmt_elf.c | 6 - - fs/binfmt_elf_fdpic.c | 7 - - fs/binfmt_flat.c | 3 - - fs/binfmt_som.c | 2 - - fs/compat.c | 14 +- - fs/eventpoll.c | 7 +- - fs/exec.c | 12 +- - fs/proc/array.c | 9 +- - fs/proc/base.c | 43 +- - fs/select.c | 12 +- - include/asm-ia64/thread_info.h | 5 +- - include/asm-powerpc/thread_info.h | 17 +- - include/asm-s390/thread_info.h | 2 +- - include/asm-x86/ptrace.h | 2 + - include/asm-x86/thread_info_32.h | 13 +- - include/asm-x86/thread_info_64.h | 13 +- - include/linux/compat.h | 5 +- - include/linux/init_task.h | 3 - - include/linux/ptrace.h | 70 +- - include/linux/sched.h | 38 +- - include/linux/thread_info.h | 27 +- - include/linux/tracehook.h | 507 ++++++++ - include/linux/utrace.h | 544 ++++++++ - init/Kconfig | 29 + - kernel/Makefile | 1 + - kernel/compat.c | 3 +- - kernel/exit.c | 403 +++---- - kernel/fork.c | 72 +- - kernel/ptrace.c | 2129 +++++++++++++++++++++++++------- - kernel/signal.c | 285 +---- - kernel/sys_ni.c | 4 + - kernel/utrace.c | 2377 +++++++++++++++++++++++++++++++++++ - mm/nommu.c | 4 +- - security/selinux/hooks.c | 59 +- - security/selinux/include/objsec.h | 1 - - 81 files changed, 6535 insertions(+), 1421 deletions(-) + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/utrace.tmpl | 21 + + Documentation/utrace.txt | 579 ++++++++++ + fs/proc/array.c | 3 + + include/linux/ptrace.h | 15 + + include/linux/sched.h | 6 + + include/linux/tracehook.h | 64 ++ + include/linux/utrace.h | 504 +++++++++ + init/Kconfig | 28 + + kernel/Makefile | 1 + + kernel/ptrace.c | 438 ++++++++- + kernel/signal.c | 14 +- + kernel/utrace.c | 2156 +++++++++++++++++++++++++++++++++++++ + 13 files changed, 3827 insertions(+), 4 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile -index 300e170..7cf3afc 100644 +index 0eb0d02..49a78b7 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -7,7 +7,7 @@ @@ -92,14 +24,14 @@ - kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ + kernel-hacking.xml kernel-locking.xml deviceiobook.xml utrace.xml \ procfs-guide.xml writing_usb_driver.xml networking.xml \ - kernel-api.xml filesystems.xml lsm.xml usb.xml \ + kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl new file mode 100644 -index ...f185043 100644 +index ...8dfaa91 100644 --- /dev/null +++ b/Documentation/DocBook/utrace.tmpl -@@ -0,0 +1,23 @@ +@@ -0,0 +1,21 @@ + + @@ -117,9 +49,7 @@ + + +Machine state access via utrace -+!Finclude/linux/regset.h struct user_regset -+!Finclude/linux/regset.h struct user_regset_view -+!Finclude/linux/regset.h task_user_regset_view ++!Finclude/linux/regset.h + + + @@ -708,6935 +638,1404 @@ +sure which event callbacks it will or won't see after utrace_set_flags +has returned. By checking for errors, it can know whether to clean up +its data structures immediately or to let its callbacks do the work. -diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c -index 1e9ad52..7dc30f5 100644 ---- a/arch/alpha/kernel/ptrace.c -+++ b/arch/alpha/kernel/ptrace.c -@@ -260,11 +260,12 @@ void ptrace_disable(struct task_struct * - ptrace_cancel_bpt(child); - } - --long arch_ptrace(struct task_struct *child, long request, long addr, long data) -+int arch_ptrace(struct task_struct *child, long request, long addr, long data, -+ long *retval) - { - unsigned long tmp; - size_t copied; -- long ret; -+ int ret; - - switch (request) { - /* When I and D space are separate, these will need to be fixed. */ -@@ -275,14 +276,14 @@ long arch_ptrace(struct task_struct *chi - if (copied != sizeof(tmp)) - break; - -- force_successful_syscall_return(); -- ret = tmp; -+ ret = 0; -+ *retval = tmp; - break; - - /* Read register number ADDR. */ - case PTRACE_PEEKUSR: -- force_successful_syscall_return(); -- ret = get_reg(child, addr); -+ ret = 0; -+ *retval = get_reg(child, addr); - DBG(DBG_MEM, ("peek $%ld->%#lx\n", addr, ret)); - break; - -@@ -343,7 +344,7 @@ long arch_ptrace(struct task_struct *chi - break; - - default: -- ret = ptrace_request(child, request, addr, data); -+ ret = 1; - break; - } - return ret; -diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c -index 4b05dc5..938be29 100644 ---- a/arch/arm/kernel/ptrace.c -+++ b/arch/arm/kernel/ptrace.c -@@ -655,7 +655,8 @@ static int ptrace_setcrunchregs(struct t - } - #endif - [...11835 lines suppressed...] +{ -+ struct utrace *utrace = tsk->utrace; -+ struct list_head *pos, *next; -+ struct utrace_attached_engine *engine; ++ struct utrace *utrace = task->utrace; ++ struct utrace_attached_engine *engine, *next; + const struct utrace_engine_ops *ops; + int unsafe = 0; + -+ /* XXX must change for sharing */ -+ list_for_each_safe_rcu(pos, next, &utrace->engines) { -+ engine = list_entry(pos, struct utrace_attached_engine, entry); ++ list_for_each_entry_safe(engine, next, &utrace->engines, entry) { + ops = rcu_dereference(engine->ops); + if (ops->unsafe_exec) -+ unsafe |= (*ops->unsafe_exec)(engine, tsk); ++ unsafe |= (*ops->unsafe_exec)(engine, task); + } + + return unsafe; +} -diff --git a/mm/nommu.c b/mm/nommu.c -index 5d8ae08..515beac 100644 ---- a/mm/nommu.c -+++ b/mm/nommu.c -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -734,7 +734,7 @@ static unsigned long determine_vm_flags( - * it's being traced - otherwise breakpoints set in it may interfere - * with another untraced process - */ -- if ((flags & MAP_PRIVATE) && (current->ptrace & PT_PTRACED)) -+ if ((flags & MAP_PRIVATE) && tracehook_expect_breakpoints(current)) - vm_flags &= ~VM_MAYSHARE; - - return vm_flags; -diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index d39b59c..43cb7c3 100644 ---- a/security/selinux/hooks.c -+++ b/security/selinux/hooks.c -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include -@@ -162,7 +162,7 @@ static int task_alloc_security(struct ta - return -ENOMEM; - - tsec->task = task; -- tsec->osid = tsec->sid = tsec->ptrace_sid = SECINITSID_UNLABELED; -+ tsec->osid = tsec->sid = SECINITSID_UNLABELED; - task->security = tsec; - - return 0; -@@ -1645,19 +1645,13 @@ static inline u32 file_to_av(struct file - - static int selinux_ptrace(struct task_struct *parent, struct task_struct *child) - { -- struct task_security_struct *psec = parent->security; -- struct task_security_struct *csec = child->security; - int rc; - - rc = secondary_ops->ptrace(parent,child); - if (rc) - return rc; - -- rc = task_has_perm(parent, child, PROCESS__PTRACE); -- /* Save the SID of the tracing process for later use in apply_creds. */ -- if (!(child->ptrace & PT_PTRACED) && !rc) -- csec->ptrace_sid = psec->sid; -- return rc; -+ return task_has_perm(parent, child, PROCESS__PTRACE); - } - - static int selinux_capget(struct task_struct *target, kernel_cap_t *effective, -@@ -2126,12 +2120,25 @@ static void selinux_bprm_apply_creds(str - /* Check for ptracing, and update the task SID if ok. - Otherwise, leave SID unchanged and kill. */ - if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) { -- rc = avc_has_perm(tsec->ptrace_sid, sid, -- SECCLASS_PROCESS, PROCESS__PTRACE, -- NULL); -- if (rc) { -- bsec->unsafe = 1; -- return; -+ struct task_struct *tracer; -+ struct task_security_struct *sec; -+ u32 ptsid = 0; -+ -+ rcu_read_lock(); -+ tracer = tracehook_tracer_task(current); -+ if (likely(tracer != NULL)) { -+ sec = tracer->security; -+ ptsid = sec->sid; -+ } -+ rcu_read_unlock(); + -+ if (ptsid != 0) { -+ rc = avc_has_perm(ptsid, sid, SECCLASS_PROCESS, -+ PROCESS__PTRACE, NULL); -+ if (rc) { -+ bsec->unsafe = 1; -+ return; -+ } - } - } - tsec->sid = sid; -@@ -2214,7 +2221,7 @@ static void selinux_bprm_post_apply_cred - - /* Wake up the parent if it is waiting so that it can - recheck wait permission to the new task SID. */ -- wake_up_interruptible(¤t->parent->signal->wait_chldexit); -+ wake_up_interruptible(¤t->real_parent->signal->wait_chldexit); - } - - /* superblock security operations */ -@@ -3087,11 +3094,6 @@ static int selinux_task_alloc_security(s - tsec2->keycreate_sid = tsec1->keycreate_sid; - tsec2->sockcreate_sid = tsec1->sockcreate_sid; - -- /* Retain ptracer SID across fork, if any. -- This will be reset by the ptrace hook upon any -- subsequent ptrace_attach operations. */ -- tsec2->ptrace_sid = tsec1->ptrace_sid; -- - return 0; - } - -@@ -5057,6 +5059,7 @@ static int selinux_setprocattr(struct ta - char *name, void *value, size_t size) - { - struct task_security_struct *tsec; -+ struct task_struct *tracer; - u32 sid = 0; - int error; - char *str = value; -@@ -5145,18 +5148,24 @@ static int selinux_setprocattr(struct ta - /* Check for ptracing, and update the task SID if ok. - Otherwise, leave SID unchanged and fail. */ - task_lock(p); -- if (p->ptrace & PT_PTRACED) { -- error = avc_has_perm_noaudit(tsec->ptrace_sid, sid, -+ rcu_read_lock(); -+ tracer = tracehook_tracer_task(p); -+ if (tracer != NULL) { -+ struct task_security_struct *ptsec = tracer->security; -+ u32 ptsid = ptsec->sid; -+ rcu_read_unlock(); -+ error = avc_has_perm_noaudit(ptsid, sid, - SECCLASS_PROCESS, - PROCESS__PTRACE, 0, &avd); - if (!error) - tsec->sid = sid; - task_unlock(p); -- avc_audit(tsec->ptrace_sid, sid, SECCLASS_PROCESS, -+ avc_audit(ptsid, sid, SECCLASS_PROCESS, - PROCESS__PTRACE, &avd, error, NULL); - if (error) - return error; - } else { -+ rcu_read_unlock(); - tsec->sid = sid; - task_unlock(p); - } -diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h -index c6c2bb4..1db31c2 100644 ---- a/security/selinux/include/objsec.h -+++ b/security/selinux/include/objsec.h -@@ -35,7 +35,6 @@ struct task_security_struct { - u32 create_sid; /* fscreate SID */ - u32 keycreate_sid; /* keycreate SID */ - u32 sockcreate_sid; /* fscreate SID */ -- u32 ptrace_sid; /* SID of ptrace parent */ - }; - - struct inode_security_struct { ++/* ++ * Called with rcu_read_lock() held. ++ */ ++void task_utrace_proc_status(struct seq_file *m, struct task_struct *p) ++{ ++ struct utrace *utrace = rcu_dereference(p->utrace); ++ if (unlikely(utrace)) ++ seq_printf(m, "Utrace: %lx%s%s%s\n", ++ p->utrace_flags, ++ utrace->stopped ? " (stopped)" : "", ++ utrace->report ? " (report)" : "", ++ utrace->interrupt ? " (interrupt)" : ""); ++} From fedora-extras-commits at redhat.com Wed Jul 9 04:16:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:32 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GWMK013591@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the watchbugzilla acl on scribus (Fedora devel) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:34 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GYT7013610@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the commit acl on scribus (Fedora devel) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:35 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GZNM013629@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the watchcommits acl on scribus (Fedora devel) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:35 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GZNP013629@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the approveacls acl on scribus (Fedora devel) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:37 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GWMN013591@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the watchcommits acl on scribus (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:37 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GWMQ013591@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the commit acl on scribus (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:40 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GZNS013629@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the watchbugzilla acl on scribus (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:48 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GYTA013610@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the commit acl on scribus (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:47 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694Gmsd013723@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the approveacls acl on scribus (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:49 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GYTD013610@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the approveacls acl on scribus (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:16:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:16:51 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090416.m694GpL9013788@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the watchbugzilla acl on scribus (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:17:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:17:00 +0000 Subject: [pkgdb] scribus had acl change status Message-ID: <200807090417.m694Gmsg013723@bastion.fedora.phx.redhat.com> Andreas Bierfert (awjb) has set the watchcommits acl on scribus (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scribus From fedora-extras-commits at redhat.com Wed Jul 9 04:18:08 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 04:18:08 GMT Subject: rpms/perl-MooseX-AttributeHelpers/F-8 perl-MooseX-AttributeHelpers.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807090418.m694I8LW009384@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9313 Modified Files: perl-MooseX-AttributeHelpers.spec sources Log Message: * Mon Jun 30 2008 Chris Weyl 0.12-2 - ...and fix filtering. heh. Index: perl-MooseX-AttributeHelpers.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-8/perl-MooseX-AttributeHelpers.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-MooseX-AttributeHelpers.spec 6 Jan 2008 05:25:36 -0000 1.3 +++ perl-MooseX-AttributeHelpers.spec 9 Jul 2008 04:17:17 -0000 1.4 @@ -1,19 +1,17 @@ Name: perl-MooseX-AttributeHelpers -Version: 0.07 -Release: 1%{?dist} +Version: 0.12 +Release: 2%{?dist} Summary: Extended Moose attribute interfaces License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-AttributeHelpers/ -#Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/MooseX-AttributeHelpers-%{version}.tar.gz Source0: http://www.cpan.org/modules/by-module/MooseX/MooseX-AttributeHelpers-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Class::MOP) >= 0.47 -BuildRequires: perl(Module::Build) -BuildRequires: perl(Moose) >= 0.30 +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Moose) >= 0.45 BuildRequires: perl(Test::Exception) >= 0.21 BuildRequires: perl(Test::More) >= 0.62 # optional tests @@ -29,20 +27,32 @@ %prep %setup -q -n MooseX-AttributeHelpers-%{version} +# first filter out the bits in _docdir... +cat << \EOF > %{name}-prov +#!/bin/sh +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO +EOF + +%define __perl_provides %{_builddir}/MooseX-AttributeHelpers-%{version}/%{name}-prov +chmod +x %{__perl_provides} + %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf %{buildroot} -./Build install destdir=%{buildroot} create_packlist=0 +make install PERL_INSTALL_ROOT=%{buildroot} + +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check -./Build test +make test %clean rm -rf %{buildroot} @@ -54,6 +64,21 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.12-2 +- ...and fix filtering. heh. + +* Mon Jun 30 2008 Chris Weyl 0.12-1 +- update to 0.12 +- switch to Module::Install incantations +- update BR's +- update provides filtering + +* Wed May 28 2008 Chris Weyl 0.09-1 +- update to 0.09 + +* Wed Mar 05 2008 Tom "spot" Callaway 0.07-2 +- rebuild for new perl + * Sat Jan 05 2008 Chris Weyl 0.07-1 - update to 0.07 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Jan 2008 05:25:36 -0000 1.3 +++ sources 9 Jul 2008 04:17:17 -0000 1.4 @@ -1 +1 @@ -8c33919790c1b33f8ed2ce5001eeb0b0 MooseX-AttributeHelpers-0.07.tar.gz +c9dafb95089f40957d6bc99839de107f MooseX-AttributeHelpers-0.12.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 04:19:39 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 04:19:39 GMT Subject: rpms/perl-MooseX-AttributeHelpers/F-9 perl-MooseX-AttributeHelpers.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807090419.m694JdKb009474@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9290 Modified Files: perl-MooseX-AttributeHelpers.spec sources Log Message: * Mon Jun 30 2008 Chris Weyl 0.12-2 - ...and fix filtering. heh. Index: perl-MooseX-AttributeHelpers.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-9/perl-MooseX-AttributeHelpers.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MooseX-AttributeHelpers.spec 5 Mar 2008 15:02:45 -0000 1.5 +++ perl-MooseX-AttributeHelpers.spec 9 Jul 2008 04:17:09 -0000 1.6 @@ -1,19 +1,17 @@ Name: perl-MooseX-AttributeHelpers -Version: 0.07 +Version: 0.12 Release: 2%{?dist} Summary: Extended Moose attribute interfaces License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-AttributeHelpers/ -#Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/MooseX-AttributeHelpers-%{version}.tar.gz Source0: http://www.cpan.org/modules/by-module/MooseX/MooseX-AttributeHelpers-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Class::MOP) >= 0.47 -BuildRequires: perl(Module::Build) -BuildRequires: perl(Moose) >= 0.30 +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Moose) >= 0.45 BuildRequires: perl(Test::Exception) >= 0.21 BuildRequires: perl(Test::More) >= 0.62 # optional tests @@ -29,20 +27,32 @@ %prep %setup -q -n MooseX-AttributeHelpers-%{version} +# first filter out the bits in _docdir... +cat << \EOF > %{name}-prov +#!/bin/sh +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO +EOF + +%define __perl_provides %{_builddir}/MooseX-AttributeHelpers-%{version}/%{name}-prov +chmod +x %{__perl_provides} + %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf %{buildroot} -./Build install destdir=%{buildroot} create_packlist=0 +make install PERL_INSTALL_ROOT=%{buildroot} + +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check -./Build test +make test %clean rm -rf %{buildroot} @@ -54,6 +64,18 @@ %{_mandir}/man3/* %changelog +* Mon Jun 30 2008 Chris Weyl 0.12-2 +- ...and fix filtering. heh. + +* Mon Jun 30 2008 Chris Weyl 0.12-1 +- update to 0.12 +- switch to Module::Install incantations +- update BR's +- update provides filtering + +* Wed May 28 2008 Chris Weyl 0.09-1 +- update to 0.09 + * Wed Mar 05 2008 Tom "spot" Callaway 0.07-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Jan 2008 05:08:14 -0000 1.4 +++ sources 9 Jul 2008 04:17:09 -0000 1.5 @@ -1 +1 @@ -8c33919790c1b33f8ed2ce5001eeb0b0 MooseX-AttributeHelpers-0.07.tar.gz +c9dafb95089f40957d6bc99839de107f MooseX-AttributeHelpers-0.12.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 04:47:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:47:29 +0000 Subject: [pkgdb] perl-Net-Telnet ownership updated Message-ID: <200807090447.m694lT4C014593@bastion.fedora.phx.redhat.com> Package perl-Net-Telnet in Fedora devel is now owned by Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:47:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:47:36 +0000 Subject: [pkgdb] perl-Net-Telnet ownership updated Message-ID: <200807090447.m694lav1014610@bastion.fedora.phx.redhat.com> Package perl-Net-Telnet in Fedora 9 is now owned by Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:47:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:47:39 +0000 Subject: [pkgdb] perl-Net-Telnet ownership updated Message-ID: <200807090447.m694lav3014610@bastion.fedora.phx.redhat.com> Package perl-Net-Telnet in Fedora 8 is now owned by Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:03 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested approveacls Message-ID: <200807090448.m694lT4E014593@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the approveacls acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:07 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested commit Message-ID: <200807090448.m694lav5014610@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the commit acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:10 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested watchcommits Message-ID: <200807090448.m694mAnA014693@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the watchcommits acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:11 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested watchbugzilla Message-ID: <200807090448.m694mB8U014706@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the watchbugzilla acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:20 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested watchbugzilla Message-ID: <200807090448.m694lT4G014593@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the watchbugzilla acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:23 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested commit Message-ID: <200807090448.m694mAnC014693@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the commit acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:26 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested watchcommits Message-ID: <200807090448.m694mAnE014693@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the watchcommits acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:28 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested approveacls Message-ID: <200807090448.m694mB8W014706@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the approveacls acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:39 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested watchbugzilla Message-ID: <200807090448.m694lav7014610@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the watchbugzilla acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:41 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested watchcommits Message-ID: <200807090448.m694lav9014610@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the watchcommits acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:43 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested commit Message-ID: <200807090448.m694lT4I014593@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the commit acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:48:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:48:45 +0000 Subject: [pkgdb] perl-Net-Telnet: fabbione has requested approveacls Message-ID: <200807090448.m694mB8Y014706@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has requested the approveacls acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:28 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694nSHa014929@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchbugzilla acl on perl-Net-Telnet (Fedora devel) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:30 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694mB8a014706@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchcommits acl on perl-Net-Telnet (Fedora devel) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:34 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694nSHc014929@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora devel) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:36 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694lT4K014593@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the approveacls acl on perl-Net-Telnet (Fedora devel) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:38 +0000 Subject: [pkgdb] perl-Net-Telnet had groupAcl changed Message-ID: <200807090449.m694ncXp014997@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:44 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694mB8c014706@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchbugzilla acl on perl-Net-Telnet (Fedora 8) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:46 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694nkpc015034@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchcommits acl on perl-Net-Telnet (Fedora 8) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:48 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694nkpe015034@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora 8) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:50 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694ncXr014997@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the approveacls acl on perl-Net-Telnet (Fedora 8) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:52 +0000 Subject: [pkgdb] perl-Net-Telnet had groupAcl changed Message-ID: <200807090449.m694ncXt014997@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:56 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694nuST015109@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchbugzilla acl on perl-Net-Telnet (Fedora 9) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:49:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:49:59 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090449.m694nSHe014929@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchcommits acl on perl-Net-Telnet (Fedora 9) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:50:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:50:03 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090450.m694nuSV015109@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora 9) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:50:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:50:07 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807090450.m694nkpg015034@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the approveacls acl on perl-Net-Telnet (Fedora 9) to Approved for Fabio M. Di Nitto (fabbione) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:50:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 04:50:10 +0000 Subject: [pkgdb] perl-Net-Telnet had groupAcl changed Message-ID: <200807090450.m694nSHg014929@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora 9) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 04:52:10 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 04:52:10 GMT Subject: rpms/perl-MooseX-Object-Pluggable/devel .cvsignore, 1.3, 1.4 perl-MooseX-Object-Pluggable.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807090452.m694qAKw010970@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10942 Modified Files: .cvsignore perl-MooseX-Object-Pluggable.spec sources Log Message: * Tue Jul 08 2008 Chris Weyl 0.0007-1 - update to 0.0007 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Apr 2007 15:51:41 -0000 1.3 +++ .cvsignore 9 Jul 2008 04:51:21 -0000 1.4 @@ -1 +1 @@ -MooseX-Object-Pluggable-0.0005.tar.gz +MooseX-Object-Pluggable-0.0007.tar.gz Index: perl-MooseX-Object-Pluggable.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel/perl-MooseX-Object-Pluggable.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-MooseX-Object-Pluggable.spec 5 Mar 2008 15:05:21 -0000 1.4 +++ perl-MooseX-Object-Pluggable.spec 9 Jul 2008 04:51:21 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-MooseX-Object-Pluggable -Version: 0.0005 -Release: 2%{?dist} +Version: 0.0007 +Release: 1%{?dist} Summary: Make your Moose classes pluggable License: GPL+ or Artistic Group: Development/Libraries @@ -8,6 +8,7 @@ Source0: http://www.cpan.org/authors/id/G/GR/GRODITI/MooseX-Object-Pluggable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch + BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Module::Pluggable::Object) @@ -19,10 +20,13 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# otherwise we have a tone of "provides" from files in doc. We only really -# provide one module, so... -AutoProv: no -Provides: perl(MooseX::Object::Pluggable) = 0.0005 +# keep rpmlint happy +Requires: perl(strict), perl(warnings), perl(Moose) + +# otherwise we have a ton of "provides" from files in doc. We only really +# provide one package, so... +AutoProv: no +Provides: perl(MooseX::Object::Pluggable) = %{version} %description This module aids in the development and deploment of plugin-enabled @@ -32,6 +36,8 @@ %prep %setup -q -n MooseX-Object-Pluggable-%{version} +perl -pi -e 's|^#!perl|#!/usr/bin/perl|; s|^#!/usr/local|#!/usr|' t/*.t + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -56,11 +62,14 @@ %files %defattr(-,root,root,-) -%doc Changes README t/lib/ +%doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Chris Weyl 0.0007-1 +- update to 0.0007 + * Wed Mar 05 2008 Tom "spot" Callaway 0.0005-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Apr 2007 15:51:41 -0000 1.3 +++ sources 9 Jul 2008 04:51:21 -0000 1.4 @@ -1 +1 @@ -1f99a83797957ccf97a732601bf22356 MooseX-Object-Pluggable-0.0005.tar.gz +412dfaf26c334c4a1e88ab39fefaa9b7 MooseX-Object-Pluggable-0.0007.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 04:54:53 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 9 Jul 2008 04:54:53 GMT Subject: rpms/kernel/devel config-x86_64-generic, 1.36, 1.37 kernel.spec, 1.745, 1.746 Message-ID: <200807090454.m694srMN011107@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11067 Modified Files: config-x86_64-generic kernel.spec Log Message: Reenable paravirt on x86-64. Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- config-x86_64-generic 23 Jun 2008 20:46:06 -0000 1.36 +++ config-x86_64-generic 9 Jul 2008 04:54:02 -0000 1.37 @@ -254,7 +254,11 @@ CONFIG_SENSORS_I5K_AMB=m -# CONFIG_PARAVIRT_GUEST is not set +CONFIG_PARAVIRT_GUEST=y +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y + # CONFIG_COMPAT_VDSO is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.745 retrieving revision 1.746 diff -u -r1.745 -r1.746 --- kernel.spec 9 Jul 2008 03:37:06 -0000 1.745 +++ kernel.spec 9 Jul 2008 04:54:02 -0000 1.746 @@ -1794,6 +1794,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 09 2008 Dave Jones +- Reenable paravirt on x86-64. + * Tue Jul 8 2008 Roland McGrath - new bleeding-edge utrace code From fedora-extras-commits at redhat.com Wed Jul 9 04:59:31 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 04:59:31 GMT Subject: rpms/perl-MooseX-Object-Pluggable/devel perl-MooseX-Object-Pluggable.spec, 1.5, 1.6 Message-ID: <200807090459.m694xVfJ011446@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11401 Modified Files: perl-MooseX-Object-Pluggable.spec Log Message: * Tue Jul 08 2008 Chris Weyl 0.0007-2 - ...and fix build failure Index: perl-MooseX-Object-Pluggable.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel/perl-MooseX-Object-Pluggable.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MooseX-Object-Pluggable.spec 9 Jul 2008 04:51:21 -0000 1.5 +++ perl-MooseX-Object-Pluggable.spec 9 Jul 2008 04:58:44 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-MooseX-Object-Pluggable Version: 0.0007 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Make your Moose classes pluggable License: GPL+ or Artistic Group: Development/Libraries @@ -53,8 +53,6 @@ %{_fixperms} %{buildroot}/* %check -# nix failing developer test -rm t/pod-coverage.t make test %clean @@ -67,6 +65,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Chris Weyl 0.0007-2 +- ...and fix build failure + * Tue Jul 08 2008 Chris Weyl 0.0007-1 - update to 0.0007 From fedora-extras-commits at redhat.com Wed Jul 9 05:04:48 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Wed, 9 Jul 2008 05:04:48 GMT Subject: rpms/perl-Net-Telnet/devel perl-Net-Telnet.spec,1.10,1.11 Message-ID: <200807090504.m6954mwX018382@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/perl-Net-Telnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18306 Modified Files: perl-Net-Telnet.spec Log Message: Update spec file Index: perl-Net-Telnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Telnet/devel/perl-Net-Telnet.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Net-Telnet.spec 7 Mar 2008 02:12:43 -0000 1.10 +++ perl-Net-Telnet.spec 9 Jul 2008 05:04:04 -0000 1.11 @@ -1,29 +1,31 @@ -Name: perl-Net-Telnet -Version: 3.03 -Release: 6.1 -Summary: Net-Telnet Perl module - -Group: Development/Libraries -License: GPL+ or Artistic -URL: http://search.cpan.org/dist/Net-Telnet/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch -BuildRequires: perl >= 0:5.00503 -Source0: ftp://ftp.cpan.org/pub/CPAN/authors/id/J/JR/JROGERS/Net-Telnet-%{version}.tar.gz -BuildRequires: perl-Digest-HMAC -BuildRequires: perl(ExtUtils::MakeMaker) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Name: perl-Net-Telnet +Summary: Net-Telnet Perl module +Version: 3.03 +Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Group: Development/Libraries +License: GPL+ or Artistic +URL: http://search.cpan.org/dist/Net-Telnet/ +Source0: ftp://ftp.cpan.org/pub/CPAN/authors/id/J/JR/JROGERS/Net-Telnet-%{version}.tar.gz + +# runtime depends +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +# build +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: perl >= 0:5.00503 +BuildRequires: perl-Digest-HMAC +BuildRequires: perl(ExtUtils::MakeMaker) %description -Net::Telnet allows you to make client connections to a TCP port and do network I/O, -especially to a port using the TELNET protocol. Simple I/O methods such as print, -get, and getline are provided. More sophisticated interactive features are provided -because connecting to a TELNET port ultimately means communicating with a program -designed for human interaction. These interactive features include the ability to -specify a time-out and to wait for patterns to appear in the input stream, such as -the prompt from a shell. - +Net::Telnet allows you to make client connections to a TCP port and do +network I/O, especially to a port using the TELNET protocol. Simple I/O +methods such as print, get, and getline are provided. More sophisticated +interactive features are provided because connecting to a TELNET port +ultimately means communicating with a program designed for human interaction. +These interactive features include the ability to specify a time-out and to +wait for patterns to appear in the input stream, such as the prompt from a +shell. %prep %setup -q -n Net-Telnet-%{version} @@ -47,11 +49,18 @@ %files %defattr(-,root,root,-) -%doc ChangeLog MANIFEST README +%doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Fri May 23 2008 Fabio M. Di Nitto - 3.03-7 +- Fix bug 226273: + * Add dist tag. + * Fix rpmlint errors for %%description. + * Remove MANIFEST from package. +- General clean up of spec file. + * Thu Mar 06 2008 Tom "spot" Callaway - 3.03-6.1 Rebuild for new perl From fedora-extras-commits at redhat.com Wed Jul 9 05:16:19 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 05:16:19 GMT Subject: rpms/perl-MooseX-Object-Pluggable/F-9 perl-MooseX-Object-Pluggable.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807090516.m695GJAQ018864@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785 Modified Files: perl-MooseX-Object-Pluggable.spec sources Log Message: * Tue Jul 08 2008 Chris Weyl 0.0007-2 - ...and fix build failure Index: perl-MooseX-Object-Pluggable.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-9/perl-MooseX-Object-Pluggable.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-MooseX-Object-Pluggable.spec 5 Mar 2008 15:05:21 -0000 1.4 +++ perl-MooseX-Object-Pluggable.spec 9 Jul 2008 05:15:30 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-MooseX-Object-Pluggable -Version: 0.0005 +Version: 0.0007 Release: 2%{?dist} Summary: Make your Moose classes pluggable License: GPL+ or Artistic @@ -8,6 +8,7 @@ Source0: http://www.cpan.org/authors/id/G/GR/GRODITI/MooseX-Object-Pluggable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch + BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Module::Pluggable::Object) @@ -19,10 +20,13 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# otherwise we have a tone of "provides" from files in doc. We only really -# provide one module, so... -AutoProv: no -Provides: perl(MooseX::Object::Pluggable) = 0.0005 +# keep rpmlint happy +Requires: perl(strict), perl(warnings), perl(Moose) + +# otherwise we have a ton of "provides" from files in doc. We only really +# provide one package, so... +AutoProv: no +Provides: perl(MooseX::Object::Pluggable) = %{version} %description This module aids in the development and deploment of plugin-enabled @@ -32,6 +36,8 @@ %prep %setup -q -n MooseX-Object-Pluggable-%{version} +perl -pi -e 's|^#!perl|#!/usr/bin/perl|; s|^#!/usr/local|#!/usr|' t/*.t + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -47,8 +53,6 @@ %{_fixperms} %{buildroot}/* %check -# nix failing developer test -rm t/pod-coverage.t make test %clean @@ -56,11 +60,17 @@ %files %defattr(-,root,root,-) -%doc Changes README t/lib/ +%doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Chris Weyl 0.0007-2 +- ...and fix build failure + +* Tue Jul 08 2008 Chris Weyl 0.0007-1 +- update to 0.0007 + * Wed Mar 05 2008 Tom "spot" Callaway 0.0005-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Apr 2007 15:51:41 -0000 1.3 +++ sources 9 Jul 2008 05:15:30 -0000 1.4 @@ -1 +1 @@ -1f99a83797957ccf97a732601bf22356 MooseX-Object-Pluggable-0.0005.tar.gz +412dfaf26c334c4a1e88ab39fefaa9b7 MooseX-Object-Pluggable-0.0007.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 05:16:32 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 05:16:32 GMT Subject: rpms/perl-MooseX-Object-Pluggable/F-8 perl-MooseX-Object-Pluggable.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807090516.m695GWIU018930@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18790 Modified Files: perl-MooseX-Object-Pluggable.spec sources Log Message: * Tue Jul 08 2008 Chris Weyl 0.0007-2 - ...and fix build failure Index: perl-MooseX-Object-Pluggable.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-8/perl-MooseX-Object-Pluggable.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-MooseX-Object-Pluggable.spec 19 Apr 2007 15:51:41 -0000 1.3 +++ perl-MooseX-Object-Pluggable.spec 9 Jul 2008 05:15:41 -0000 1.4 @@ -1,13 +1,14 @@ Name: perl-MooseX-Object-Pluggable -Version: 0.0005 -Release: 1%{?dist} +Version: 0.0007 +Release: 2%{?dist} Summary: Make your Moose classes pluggable -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Object-Pluggable/ Source0: http://www.cpan.org/authors/id/G/GR/GRODITI/MooseX-Object-Pluggable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch + BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Module::Pluggable::Object) @@ -19,10 +20,13 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# otherwise we have a tone of "provides" from files in doc. We only really -# provide one module, so... -AutoProv: no -Provides: perl(MooseX::Object::Pluggable) = 0.0005 +# keep rpmlint happy +Requires: perl(strict), perl(warnings), perl(Moose) + +# otherwise we have a ton of "provides" from files in doc. We only really +# provide one package, so... +AutoProv: no +Provides: perl(MooseX::Object::Pluggable) = %{version} %description This module aids in the development and deploment of plugin-enabled @@ -32,6 +36,8 @@ %prep %setup -q -n MooseX-Object-Pluggable-%{version} +perl -pi -e 's|^#!perl|#!/usr/bin/perl|; s|^#!/usr/local|#!/usr|' t/*.t + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -47,8 +53,6 @@ %{_fixperms} %{buildroot}/* %check -# nix failing developer test -rm t/pod-coverage.t make test %clean @@ -56,11 +60,20 @@ %files %defattr(-,root,root,-) -%doc Changes README t/lib/ +%doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Chris Weyl 0.0007-2 +- ...and fix build failure + +* Tue Jul 08 2008 Chris Weyl 0.0007-1 +- update to 0.0007 + +* Wed Mar 05 2008 Tom "spot" Callaway 0.0005-2 +- rebuild for new perl + * Thu Apr 19 2007 Chris Weyl 0.0005-1 - update to 0.0005 - update BR's Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Apr 2007 15:51:41 -0000 1.3 +++ sources 9 Jul 2008 05:15:41 -0000 1.4 @@ -1 +1 @@ -1f99a83797957ccf97a732601bf22356 MooseX-Object-Pluggable-0.0005.tar.gz +412dfaf26c334c4a1e88ab39fefaa9b7 MooseX-Object-Pluggable-0.0007.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 05:20:55 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 05:20:55 GMT Subject: rpms/perl-MooseX-Params-Validate/devel .cvsignore, 1.4, 1.5 perl-MooseX-Params-Validate.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807090520.m695KtMv019225@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19146 Modified Files: .cvsignore perl-MooseX-Params-Validate.spec sources Log Message: * Tue Jul 08 2008 Chris Weyl 0.05-1 - update to 0.05 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2007 06:54:38 -0000 1.4 +++ .cvsignore 9 Jul 2008 05:20:04 -0000 1.5 @@ -1 +1 @@ -MooseX-Params-Validate-0.03.tar.gz +MooseX-Params-Validate-0.05.tar.gz Index: perl-MooseX-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/perl-MooseX-Params-Validate.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MooseX-Params-Validate.spec 5 Mar 2008 15:06:14 -0000 1.5 +++ perl-MooseX-Params-Validate.spec 9 Jul 2008 05:20:04 -0000 1.6 @@ -1,18 +1,20 @@ Name: perl-MooseX-Params-Validate -Version: 0.03 -Release: 2%{?dist} +Version: 0.05 +Release: 1%{?dist} Summary: Extension of Params::Validate using Moose's types License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Params-Validate/ -Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/MooseX-Params-Validate-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Module::Build) -BuildRequires: perl(Moose) >= 0.17 +BuildRequires: perl(Moose) >= 0.33 BuildRequires: perl(Params::Validate) >= 0.88 +BuildRequires: perl(Sub::Exporter) +BuildRequires: perl(Sub::Name) BuildRequires: perl(Test::Exception) >= 0.21 BuildRequires: perl(Test::More) >= 0.62 @@ -49,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Chris Weyl 0.05-1 +- update to 0.05 + * Wed Mar 05 2008 Tom "spot" Callaway 0.03-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2007 06:54:38 -0000 1.4 +++ sources 9 Jul 2008 05:20:04 -0000 1.5 @@ -1 +1 @@ -302fa0407b8cec0757c90e5b4c16a7b0 MooseX-Params-Validate-0.03.tar.gz +b885c631fef6c0402c65ed335a5b304a MooseX-Params-Validate-0.05.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 05:23:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 05:23:01 GMT Subject: rpms/perl-Params-Util/F-8 perl-Params-Util.spec,1.26,1.27 Message-ID: <200807090523.m695N1rj019347@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Params-Util/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19294 Modified Files: perl-Params-Util.spec Log Message: * Tue Jul 08 2008 Ralf Cors??pius - 0.33-2 - Unconditionally BR: perl(Test::CPAN::Meta). Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Params-Util/F-8/perl-Params-Util.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- perl-Params-Util.spec 2 Jun 2008 11:00:14 -0000 1.26 +++ perl-Params-Util.spec 9 Jul 2008 05:22:03 -0000 1.27 @@ -1,6 +1,6 @@ Name: perl-Params-Util Version: 0.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple standalone param-checking functions License: GPL+ or Artistic Group: Development/Libraries @@ -19,10 +19,7 @@ # Required by the tests BuildRequires: perl(Test::Pod) >= 1.00 -%if 0%{?fedora} >= 9 -# FIXME: Not available for FC < 10 BuildRequires: perl(Test::CPAN::Meta) >= 0.07 -%endif %description Params::Util provides a basic set of importable functions that @@ -61,6 +58,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Ralf Cors??pius - 0.33-2 +- Unconditionally BR: perl(Test::CPAN::Meta). + * Mon Jun 02 2008 Ralf Cors??pius - 0.33-1 - Upstream update. - Conditionally BR: perl(Test::CPAN::Meta). From fedora-extras-commits at redhat.com Wed Jul 9 05:23:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:23:23 +0000 Subject: [pkgdb] scim-tomoe (Fedora, devel) updated by petersen Message-ID: <200807090523.m695NNWb016122@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) approved watchbugzilla on scim-tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved watchcommits on scim-tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved commit on scim-tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved build on scim-tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved approveacls on scim-tomoe (Fedora devel) for dchen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe From fedora-extras-commits at redhat.com Wed Jul 9 05:23:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:23:23 +0000 Subject: [pkgdb] scim-tomoe (Fedora, 9) updated by petersen Message-ID: <200807090523.m695NNWd016122@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) approved watchbugzilla on scim-tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved watchcommits on scim-tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved commit on scim-tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved build on scim-tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved approveacls on scim-tomoe (Fedora 9) for dchen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe From fedora-extras-commits at redhat.com Wed Jul 9 05:23:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:23:23 +0000 Subject: [pkgdb] scim-tomoe (Fedora, 8) updated by petersen Message-ID: <200807090523.m695NNca016121@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) approved watchbugzilla on scim-tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved watchcommits on scim-tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved commit on scim-tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved build on scim-tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved approveacls on scim-tomoe (Fedora 8) for dchen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe From fedora-extras-commits at redhat.com Wed Jul 9 05:24:30 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 05:24:30 GMT Subject: rpms/perl-MooseX-Params-Validate/F-9 perl-MooseX-Params-Validate.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807090524.m695OUxp019469@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408 Modified Files: perl-MooseX-Params-Validate.spec sources Log Message: * Tue Jul 08 2008 Chris Weyl 0.05-1 - update to 0.05 Index: perl-MooseX-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-9/perl-MooseX-Params-Validate.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MooseX-Params-Validate.spec 5 Mar 2008 15:06:14 -0000 1.5 +++ perl-MooseX-Params-Validate.spec 9 Jul 2008 05:23:43 -0000 1.6 @@ -1,18 +1,20 @@ Name: perl-MooseX-Params-Validate -Version: 0.03 -Release: 2%{?dist} +Version: 0.05 +Release: 1%{?dist} Summary: Extension of Params::Validate using Moose's types License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Params-Validate/ -Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/MooseX-Params-Validate-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Module::Build) -BuildRequires: perl(Moose) >= 0.17 +BuildRequires: perl(Moose) >= 0.33 BuildRequires: perl(Params::Validate) >= 0.88 +BuildRequires: perl(Sub::Exporter) +BuildRequires: perl(Sub::Name) BuildRequires: perl(Test::Exception) >= 0.21 BuildRequires: perl(Test::More) >= 0.62 @@ -49,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Chris Weyl 0.05-1 +- update to 0.05 + * Wed Mar 05 2008 Tom "spot" Callaway 0.03-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2007 06:54:38 -0000 1.4 +++ sources 9 Jul 2008 05:23:43 -0000 1.5 @@ -1 +1 @@ -302fa0407b8cec0757c90e5b4c16a7b0 MooseX-Params-Validate-0.03.tar.gz +b885c631fef6c0402c65ed335a5b304a MooseX-Params-Validate-0.05.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 05:24:47 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 05:24:47 GMT Subject: rpms/perl-MooseX-Params-Validate/F-8 perl-MooseX-Params-Validate.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807090524.m695Ol3G019510@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19424 Modified Files: perl-MooseX-Params-Validate.spec sources Log Message: * Tue Jul 08 2008 Chris Weyl 0.05-1 - update to 0.05 Index: perl-MooseX-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-8/perl-MooseX-Params-Validate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-MooseX-Params-Validate.spec 23 Oct 2007 16:09:00 -0000 1.4 +++ perl-MooseX-Params-Validate.spec 9 Jul 2008 05:23:55 -0000 1.5 @@ -1,18 +1,20 @@ Name: perl-MooseX-Params-Validate -Version: 0.03 +Version: 0.05 Release: 1%{?dist} Summary: Extension of Params::Validate using Moose's types License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Params-Validate/ -Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/MooseX-Params-Validate-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Module::Build) -BuildRequires: perl(Moose) >= 0.17 +BuildRequires: perl(Moose) >= 0.33 BuildRequires: perl(Params::Validate) >= 0.88 +BuildRequires: perl(Sub::Exporter) +BuildRequires: perl(Sub::Name) BuildRequires: perl(Test::Exception) >= 0.21 BuildRequires: perl(Test::More) >= 0.62 @@ -49,6 +51,12 @@ %{_mandir}/man3/* %changelog +* Tue Jul 08 2008 Chris Weyl 0.05-1 +- update to 0.05 + +* Wed Mar 05 2008 Tom "spot" Callaway 0.03-2 +- rebuild for new perl + * Mon Oct 22 2007 Chris Weyl 0.03-1 - update to 0.03 - license tag update: GPL -> GPL+ Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2007 16:09:00 -0000 1.4 +++ sources 9 Jul 2008 05:23:55 -0000 1.5 @@ -1 +1 @@ -302fa0407b8cec0757c90e5b4c16a7b0 MooseX-Params-Validate-0.03.tar.gz +b885c631fef6c0402c65ed335a5b304a MooseX-Params-Validate-0.05.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 05:28:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:28:46 +0000 Subject: [pkgdb] tomoe-gtk was added for dchen Message-ID: <200807090528.m695SkHA016323@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) has added Package tomoe-gtk with summary Gtk library for Japanese and Chinese handwritten input Jens Petersen (petersen) has approved Package tomoe-gtk Jens Petersen (petersen) has added a Fedora devel branch for tomoe-gtk with an owner of dchen Jens Petersen (petersen) has approved tomoe-gtk in Fedora devel Jens Petersen (petersen) has approved Package tomoe-gtk Jens Petersen (petersen) has set commit to Approved for cvsextras on tomoe-gtk (Fedora devel) Jens Petersen (petersen) has set build to Approved for cvsextras on tomoe-gtk (Fedora devel) Jens Petersen (petersen) has set checkout to Approved for cvsextras on tomoe-gtk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tomoe-gtk From fedora-extras-commits at redhat.com Wed Jul 9 05:28:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:28:47 +0000 Subject: [pkgdb] tomoe-gtk (Fedora, devel) updated by petersen Message-ID: <200807090528.m695Sldu016342@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) approved watchbugzilla on tomoe-gtk (Fedora devel) for ryo Jens Petersen (petersen) approved watchcommits on tomoe-gtk (Fedora devel) for ryo Jens Petersen (petersen) approved commit on tomoe-gtk (Fedora devel) for ryo Jens Petersen (petersen) approved build on tomoe-gtk (Fedora devel) for ryo Jens Petersen (petersen) approved approveacls on tomoe-gtk (Fedora devel) for ryo To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tomoe-gtk From fedora-extras-commits at redhat.com Wed Jul 9 05:35:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 05:35:19 GMT Subject: rpms/perl-Regexp-Common/F-9 .cvsignore, 1.2, 1.3 perl-Regexp-Common.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200807090535.m695ZJHO020109@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Regexp-Common/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20041 Modified Files: .cvsignore perl-Regexp-Common.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Aug 2005 00:10:13 -0000 1.2 +++ .cvsignore 9 Jul 2008 05:34:17 -0000 1.3 @@ -1 +1 @@ -Regexp-Common-2.120.tar.gz +Regexp-Common-2.122.tar.gz Index: perl-Regexp-Common.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/F-9/perl-Regexp-Common.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Regexp-Common.spec 5 Mar 2008 22:14:40 -0000 1.7 +++ perl-Regexp-Common.spec 9 Jul 2008 05:34:17 -0000 1.8 @@ -1,8 +1,10 @@ Name: perl-Regexp-Common -Version: 2.120 -Release: 7%{?dist} +Version: 2.122 +Release: 1%{?dist} Summary: Regexp::Common Perl module -License: Artistic +# Old Artistic 1.0 is also valid, but we won't list it here since it is non-free. +# Also, it would throw off the automated license check and flag this package. +License: Artistic 2.0 or MIT or BSD Group: Development/Libraries URL: http://search.cpan.org/dist/Regexp-Common/ Source0: http://www.cpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-%{version}.tar.gz @@ -42,6 +44,10 @@ %{_mandir}/man3/* %changelog +* Thu May 29 2008 Tom "spot" Callaway - 2.122-1 +- update to 2.122 +- license change + * Wed Mar 5 2008 Tom "spot" Callaway - 2.120-7 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Aug 2005 00:10:13 -0000 1.2 +++ sources 9 Jul 2008 05:34:17 -0000 1.3 @@ -1 +1 @@ -a14f2a3c3f2718a567ec26f57a2bae13 Regexp-Common-2.120.tar.gz +fdd82fb77f2ef7f85aefd7cfb5107729 Regexp-Common-2.122.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 05:37:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:37:51 +0000 Subject: [pkgdb] tomoe (Fedora, devel) updated by petersen Message-ID: <200807090537.m695bp1d016641@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) approved watchbugzilla on tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved watchcommits on tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved commit on tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved build on tomoe (Fedora devel) for dchen Jens Petersen (petersen) approved approveacls on tomoe (Fedora devel) for dchen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tomoe From fedora-extras-commits at redhat.com Wed Jul 9 05:37:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:37:51 +0000 Subject: [pkgdb] tomoe (Fedora, 9) updated by petersen Message-ID: <200807090537.m695bp1f016641@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) approved watchbugzilla on tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved watchcommits on tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved commit on tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved build on tomoe (Fedora 9) for dchen Jens Petersen (petersen) approved approveacls on tomoe (Fedora 9) for dchen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tomoe From fedora-extras-commits at redhat.com Wed Jul 9 05:37:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 05:37:51 +0000 Subject: [pkgdb] tomoe (Fedora, 8) updated by petersen Message-ID: <200807090537.m695bppL016642@bastion.fedora.phx.redhat.com> Jens Petersen (petersen) approved watchbugzilla on tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved watchcommits on tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved commit on tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved build on tomoe (Fedora 8) for dchen Jens Petersen (petersen) approved approveacls on tomoe (Fedora 8) for dchen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tomoe From fedora-extras-commits at redhat.com Wed Jul 9 05:39:30 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 9 Jul 2008 05:39:30 GMT Subject: rpms/tomoe-gtk - New directory Message-ID: <200807090539.m695dUgM020406@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/tomoe-gtk In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsH20376/rpms/tomoe-gtk Log Message: Directory /cvs/extras/rpms/tomoe-gtk added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 05:39:53 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 9 Jul 2008 05:39:53 GMT Subject: rpms/tomoe-gtk/devel - New directory Message-ID: <200807090539.m695drFM020435@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/tomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsH20376/rpms/tomoe-gtk/devel Log Message: Directory /cvs/extras/rpms/tomoe-gtk/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 05:40:04 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 9 Jul 2008 05:40:04 GMT Subject: rpms/tomoe-gtk Makefile,NONE,1.1 Message-ID: <200807090540.m695e4l9020465@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/tomoe-gtk In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsH20376/rpms/tomoe-gtk Added Files: Makefile Log Message: Setup of module tomoe-gtk --- NEW FILE Makefile --- # Top level Makefile for module tomoe-gtk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 05:40:14 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 9 Jul 2008 05:40:14 GMT Subject: rpms/tomoe-gtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807090540.m695eEAt020491@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/tomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsH20376/rpms/tomoe-gtk/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tomoe-gtk --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tomoe-gtk # $Id: Makefile,v 1.1 2008/07/09 05:40:04 petersen Exp $ NAME := tomoe-gtk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 05:41:34 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 05:41:34 GMT Subject: rpms/perl-Regexp-Common/F-8 .cvsignore, 1.2, 1.3 perl-Regexp-Common.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200807090541.m695fYGl020667@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Regexp-Common/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20553 Modified Files: .cvsignore perl-Regexp-Common.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Aug 2005 00:10:13 -0000 1.2 +++ .cvsignore 9 Jul 2008 05:40:44 -0000 1.3 @@ -1 +1 @@ -Regexp-Common-2.120.tar.gz +Regexp-Common-2.122.tar.gz Index: perl-Regexp-Common.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/F-8/perl-Regexp-Common.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Regexp-Common.spec 29 Aug 2007 09:56:25 -0000 1.6 +++ perl-Regexp-Common.spec 9 Jul 2008 05:40:44 -0000 1.7 @@ -1,8 +1,10 @@ Name: perl-Regexp-Common -Version: 2.120 -Release: 6%{?dist} +Version: 2.122 +Release: 1%{?dist} Summary: Regexp::Common Perl module -License: Artistic +# Old Artistic 1.0 is also valid, but we won't list it here since it is non-free. +# Also, it would throw off the automated license check and flag this package. +License: Artistic 2.0 or MIT or BSD Group: Development/Libraries URL: http://search.cpan.org/dist/Regexp-Common/ Source0: http://www.cpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-%{version}.tar.gz @@ -42,6 +44,13 @@ %{_mandir}/man3/* %changelog +* Thu May 29 2008 Tom "spot" Callaway - 2.122-1 +- update to 2.122 +- license change + +* Wed Mar 5 2008 Tom "spot" Callaway - 2.120-7 +- rebuild for new perl + * Wed Aug 29 2007 Ralf Cors??pius - 2.120-6 - BR: perl(ExtUtils::MakeMaker). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Aug 2005 00:10:13 -0000 1.2 +++ sources 9 Jul 2008 05:40:44 -0000 1.3 @@ -1 +1 @@ -a14f2a3c3f2718a567ec26f57a2bae13 Regexp-Common-2.120.tar.gz +fdd82fb77f2ef7f85aefd7cfb5107729 Regexp-Common-2.122.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 06:06:18 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 9 Jul 2008 06:06:18 GMT Subject: rpms/tomoe-gtk/devel tomoe-gtk.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807090606.m6966IPa028305@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/tomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28116 Modified Files: sources Added Files: tomoe-gtk.spec Log Message: initial import of package renamed from tomoe-gtk --- NEW FILE tomoe-gtk.spec --- %define tomoe_ver 0.6.0 Name: tomoe-gtk Version: 0.6.0 Release: 4%{?dist} Summary: Gtk library for tomoe for Japanese and Chinese handwritten input Group: System Environment/Libraries License: LGPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tomoe >= %{tomoe_ver} Obsoletes: libtomoe-gtk < 0.6.0-4 BuildRequires: tomoe-devel >= %{tomoe_ver}, gtk2-devel, BuildRequires: gucharmap-devel, libgnomeui-devel, pygobject2-devel BuildRequires: gettext %description Gtk library for tomoe Japanese handwritten input. This package is used by scim-tomoe or uim-tomoe. %package devel Summary: Gtk library for tomoe Japanese handwritten input Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel, libgnomeui-devel, gucharmap-devel, tomoe-devel Obsoletes: libtomoe-gtk-devel < 0.6.0-4 # added for F10 Provides: libtomoe-gtk-devel = %{version}-%{release} %description devel The libtomoe-devel package includes the header files for libtomoe-gtk. Install this if you want to develop programs which will use libtomoe-gtk. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{_libdir}/%{name}.so.* %{_datadir}/%{name}/ %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/%{name}.so %{_includedir}/tomoe/* %{_datadir}/gtk-doc/html/%{name}/ %changelog * Wed Jul 9 2008 Jens Petersen - 0.6.0-4.fc10 - package renamed from libtomoe-gtk to tomoe-gtk in line with upstream - no longer need pkgname macro - obsolete libtomoe-gtk * Tue Feb 19 2008 Fedora Release Engineering - 0.6.0-3.fc9 - Autorebuild for GCC 4.3 * Wed Aug 29 2007 Fedora Release Engineering - 0.6.0-2 - Rebuild for selinux ppc32 issue. * Fri Jun 29 2007 Jens Petersen - 0.6.0-1 - update to 0.6.0 - add %%pkgname for new upstream package name tomoe-gtk * Thu Apr 12 2007 Jens Petersen - 0.5.1-2 - rebuild for libgucharmap.so.6 * Thu Feb 15 2007 Jens Petersen - 0.5.1-1 - update to 0.5.1 - add some more doc files * Sun Jan 21 2007 Ryo Dairiki - 0.5.0-2 - fix the building dependencies. * Thu Jan 19 2007 Ryo Dairiki - 0.5.0-1 - update to 0.5.0. * Thu Dec 21 2006 Ryo Dairiki - 0.4.0-1 - update to 0.4.0. * Sat Sep 15 2006 Ryo Dairiki - 0.1.0-7 - mass rebuilding. * Sat Sep 15 2006 Ryo Dairiki - 0.1.0-7 - mass rebuilding. * Wed Jul 26 2006 Ryo Dairiki - 0.1.0-6 - add a buildreq of gettext. * Tue Feb 28 2006 Ryo Dairiki - 0.1.0-5 - add "ldconfig" for the devel subpackage (Thanks, John Mahowald) * Fri Jan 27 2006 Ryo Dairiki - 0.1.0-4 - modify "ldconfig" in the "post" section (Thanks, John Mahowald) * Fri Dec 30 2005 Ryo Dairiki - 0.1.0-3 - a bit more cleanup * Fri Dec 23 2005 Ryo Dairiki - 0.1.0-2 - add gtk2-devel in the build requirements (Thanks, John Mahowald) * Wed Dec 3 2005 Ryo Dairiki - 0.1.0-1 - initial packaging for fedora extras Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tomoe-gtk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 05:40:04 -0000 1.1 +++ sources 9 Jul 2008 06:05:35 -0000 1.2 @@ -0,0 +1 @@ +bd49ac64549d8a7ab092bea1c1dc04fc tomoe-gtk-0.6.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 06:40:27 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 9 Jul 2008 06:40:27 GMT Subject: rpms/compat-db/devel patch.4.6.21.1, NONE, 1.1 patch.4.6.21.2, NONE, 1.1 .cvsignore, 1.12, 1.13 compat-db.spec, 1.28, 1.29 db-4.5.20-glibc.patch, 1.1, 1.2 sources, 1.12, 1.13 db4-db_load.patch, 1.2, NONE patch.4.2.52.1, 1.1, NONE patch.4.2.52.2, 1.1, NONE patch.4.2.52.3, 1.1, NONE patch.4.2.52.4, 1.1, NONE patch.4.2.52.5, 1.1, NONE Message-ID: <200807090640.m696eR5D029726@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/compat-db/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29650 Modified Files: .cvsignore compat-db.spec db-4.5.20-glibc.patch sources Added Files: patch.4.6.21.1 patch.4.6.21.2 Removed Files: db4-db_load.patch patch.4.2.52.1 patch.4.2.52.2 patch.4.2.52.3 patch.4.2.52.4 patch.4.2.52.5 Log Message: * Wed Jul 09 2008 Jindrich Novy 4.6.21-1 - move db-4.6.21 to compat-db (#449741) - remove db-4.2.52 - package db46_codegen - create symlinks to ease detection for autofoo - fix license and filelists --- NEW FILE patch.4.6.21.1 --- *** dbinc/mp.h 2007-09-28 01:28:25.000000000 +1000 --- dbinc/mp.h 2008-02-14 01:22:09.000000000 +1100 *************** *** 639,644 **** --- 639,647 ---- */ #define MP_TRUNC_RECOVER 0x01 + /* Private flags to DB_MPOOLFILE->close. */ + #define DB_MPOOL_NOLOCK 0x002 /* Already have mpf locked. */ + #if defined(__cplusplus) } #endif *** mp/mp_fopen.c 2007-05-18 03:18:01.000000000 +1000 --- mp/mp_fopen.c 2008-02-12 16:09:42.000000000 +1100 *************** *** 888,894 **** * when we try to flush them. */ deleted = 0; ! MUTEX_LOCK(dbenv, mfp->mutex); if (F_ISSET(dbmfp, MP_MULTIVERSION)) --mfp->multiversion; if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { --- 888,895 ---- * when we try to flush them. */ deleted = 0; ! if (!LF_ISSET(DB_MPOOL_NOLOCK)) ! MUTEX_LOCK(dbenv, mfp->mutex); if (F_ISSET(dbmfp, MP_MULTIVERSION)) --mfp->multiversion; if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { *************** *** 909,921 **** } } if (mfp->block_cnt == 0) { if ((t_ret = __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) ret = t_ret; deleted = 1; } } ! if (!deleted) MUTEX_UNLOCK(dbenv, mfp->mutex); done: /* Discard the DB_MPOOLFILE structure. */ --- 910,928 ---- } } if (mfp->block_cnt == 0) { + /* + * We should never discard this mp file if our caller + * is holding the lock on it. See comment in + * __memp_sync_file. + */ + DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK)); if ((t_ret = __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) ret = t_ret; deleted = 1; } } ! if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK)) MUTEX_UNLOCK(dbenv, mfp->mutex); done: /* Discard the DB_MPOOLFILE structure. */ *** mp/mp_sync.c 2007-06-02 04:32:44.000000000 +1000 --- mp/mp_sync.c 2008-02-12 16:09:42.000000000 +1100 *************** *** 755,761 **** * This is important since we are called with the hash bucket * locked. The mfp will get freed via the cleanup pass. */ ! if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0) ret = t_ret; --mfp->mpf_cnt; --- 755,762 ---- * This is important since we are called with the hash bucket * locked. The mfp will get freed via the cleanup pass. */ ! if (dbmfp != NULL && ! (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0) ret = t_ret; --mfp->mpf_cnt; --- NEW FILE patch.4.6.21.2 --- *** mp/mp_region.c 2007-05-18 03:18:01.000000000 +1000 --- mp/mp_region.c 2008-06-24 13:15:56.000000000 +1000 *************** *** 249,256 **** mtx_base = htab[0].mtx_hash; } if (mtx_base != MUTEX_INVALID) ! mtx_base += reginfo_off * htab_buckets; /* Allocate hash table space and initialize it. */ if ((ret = __env_alloc(infop, --- 249,262 ---- mtx_base = htab[0].mtx_hash; } + /* + * We preallocated all of the mutexes in a block, so for regions after + * the first, we skip mutexes in use in earlier regions. Each region + * has the same number of buckets and there are two mutexes per hash + * bucket (the bucket mutex and the I/O mutex). + */ if (mtx_base != MUTEX_INVALID) ! mtx_base += reginfo_off * htab_buckets * 2; /* Allocate hash table space and initialize it. */ if ((ret = __env_alloc(infop, Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/compat-db/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Aug 2007 12:36:45 -0000 1.12 +++ .cvsignore 9 Jul 2008 06:39:42 -0000 1.13 @@ -1,4 +1,3 @@ -db-4.2.52.tar.gz -db-4.1.25.tar.gz db-4.3.29.tar.gz db-4.5.20.tar.gz +db-4.6.21.tar.gz Index: compat-db.spec =================================================================== RCS file: /cvs/extras/rpms/compat-db/devel/compat-db.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- compat-db.spec 25 Feb 2008 05:03:55 -0000 1.28 +++ compat-db.spec 9 Jul 2008 06:39:42 -0000 1.29 @@ -1,28 +1,20 @@ -%define db4_versions 4.2.52 4.3.29 4.5.20 +%define db4_versions 4.3.29 4.5.20 4.6.21 %define _libdb_a libdb-${soversion}.a %define _libcxx_a libdb_cxx-${soversion}.a Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility Name: compat-db -Version: 4.5.20 -Release: 5%{?dist} -Source0: http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz -Source1: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz -Source2: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz +Version: 4.6.21 +Release: 1%{?dist} +Source0: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz +Source1: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz +Source2: http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz -Patch1: db4-db_load.patch Patch2: db-4.3.29-64bit.patch Patch3: db-4.3.29-sparc64.patch Patch4: db-4.5.20-glibc.patch -# Upstream db-4.2.52 patches -Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1 -Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2 -Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3 -Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4 -Patch14: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5 - # Upstream db-4.3.29 patches Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.3.29.1 @@ -30,13 +22,17 @@ Patch30: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 Patch31: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2 +# Upstream db-4.6.21 patches +Patch40: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 +Patch41: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 + Obsoletes: db1, db1-devel Obsoletes: db2, db2-devel, db2-utils Obsoletes: db3, db3-devel, db3-utils Obsoletes: db31, db32, db3x Obsoletes: db4 < 4.6, db4-devel < 4.6, db4-utils < 4.6, db4-tcl < 4.6, db4-java < 4.6 URL: http://www.oracle.com/database/berkeley-db/ -License: BSD-style +License: BSD Group: System Environment/Libraries BuildRequires: findutils, libtool, perl, sed, ed BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,18 +46,6 @@ %prep %setup -q -c -a 1 -a 2 -%patch1 -p1 -b .db-load - -pushd db-4.2.52 -%patch10 -p0 -%patch11 -p0 -%patch12 -p0 -%patch13 -p0 -%patch14 -p0 -%patch2 -p1 -b .64bit -%patch3 -p1 -b .sparc64 -popd - pushd db-4.3.29 %patch2 -p1 -b .64bit %patch3 -p1 -b .sparc64 @@ -74,6 +58,12 @@ %patch3 -p1 -b .sparc64 popd +pushd db-4.6.21 +%patch40 -p0 +%patch41 -p0 +%patch3 -p1 -b .sparc64 +popd + %patch4 -p1 -b .glibc mkdir docs @@ -158,11 +148,22 @@ # Make sure all shared libraries have the execute bit set. chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/libdb*.so* +# Make %{_libdir}/db/libdb.so symlinks to ease detection for autofoo +for version in %{db4_versions} ; do + mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/db${version} + pushd ${RPM_BUILD_ROOT}/%{_libdir}/db${version} + ln -s ../libdb-`echo ${version} | cut -b 1-3`.so libdb.so + ln -s ../libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so + popd +done + + # On Linux systems, move the shared libraries to lib directory. %ifos linux if [ "%{_libdir}" != "%{_lib}" ]; then mkdir -p ${RPM_BUILD_ROOT}/%{_lib} mv ${RPM_BUILD_ROOT}%{_libdir}/libdb*?.?.so* ${RPM_BUILD_ROOT}/%{_lib}/ + mv ${RPM_BUILD_ROOT}%{_libdir}/db* ${RPM_BUILD_ROOT}/%{_lib}/ fi %endif @@ -183,8 +184,11 @@ %ifos linux /%{_lib}/libdb-?.?.so /%{_lib}/libdb_cxx-?.?.so +/%{_lib}/db* %else %{_libdir}/libdb-?.?.so +%{_libdir}/libdb_cxx-?.?.so +%{_libdir}/db* %endif %{_bindir}/berkeley_db*_svc %{_bindir}/db*_archive @@ -198,9 +202,17 @@ %{_bindir}/db*_upgrade %{_bindir}/db*_verify %{_bindir}/db*_hotbackup +%{_bindir}/db*_codegen %{_includedir}/* %changelog +* Wed Jul 09 2008 Jindrich Novy 4.6.21-1 +- move db-4.6.21 to compat-db (#449741) +- remove db-4.2.52 +- package db46_codegen +- create symlinks to ease detection for autofoo +- fix license and filelists + * Mon Feb 25 2008 Jindrich Novy 4.5.20-5 - manual rebuild because of gcc-4.3 (#434183) db-4.5.20-glibc.patch: Index: db-4.5.20-glibc.patch =================================================================== RCS file: /cvs/extras/rpms/compat-db/devel/db-4.5.20-glibc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- db-4.5.20-glibc.patch 13 Aug 2007 12:36:45 -0000 1.1 +++ db-4.5.20-glibc.patch 9 Jul 2008 06:39:42 -0000 1.2 @@ -364,28 +364,6 @@ goto err; /* Create the mapping. */ ---- compat-db-4.5.20/db-4.2.52/dbm/dbm.c.glibc 2003-01-08 05:34:46.000000000 +0100 -+++ compat-db-4.5.20/db-4.2.52/dbm/dbm.c 2007-08-13 13:46:45.000000000 +0200 -@@ -240,7 +240,7 @@ __db_ndbm_open(file, oflags, mode) - if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 || - (ret = dbp->set_h_ffactor(dbp, 40)) != 0 || - (ret = dbp->set_h_nelem(dbp, 1)) != 0 || -- (ret = dbp->open(dbp, NULL, -+ (ret = (dbp->open)(dbp, NULL, - path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) { - __os_set_errno(ret); - return (NULL); ---- compat-db-4.5.20/db-4.2.52/db185/db185.c.glibc 2007-08-13 13:46:45.000000000 +0200 -+++ compat-db-4.5.20/db-4.2.52/db185/db185.c 2007-08-13 13:46:45.000000000 +0200 -@@ -230,7 +230,7 @@ __db185_open(file, oflags, mode, type, o - dbp->api_internal = db185p; - - /* Open the database. */ -- if ((ret = dbp->open(dbp, NULL, -+ if ((ret = (dbp->open)(dbp, NULL, - file, NULL, type, __db_oflags(oflags), mode)) != 0) - goto err; - --- compat-db-4.5.20/db-4.3.29/dbm/dbm.c.glibc 2004-05-12 16:10:59.000000000 +0200 +++ compat-db-4.5.20/db-4.3.29/dbm/dbm.c 2007-08-13 13:46:45.000000000 +0200 @@ -235,7 +235,7 @@ __db_ndbm_open(file, oflags, mode) Index: sources =================================================================== RCS file: /cvs/extras/rpms/compat-db/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 31 Jul 2007 08:20:12 -0000 1.12 +++ sources 9 Jul 2008 06:39:42 -0000 1.13 @@ -1,3 +1,3 @@ -cbc77517c9278cdb47613ce8cb55779f db-4.2.52.tar.gz 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz b0f1c777708cb8e9d37fb47e7ed3312d db-4.5.20.tar.gz +718082e7e35fc48478a2334b0bc4cd11 db-4.6.21.tar.gz --- db4-db_load.patch DELETED --- --- patch.4.2.52.1 DELETED --- --- patch.4.2.52.2 DELETED --- --- patch.4.2.52.3 DELETED --- --- patch.4.2.52.4 DELETED --- --- patch.4.2.52.5 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 06:45:14 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Wed, 9 Jul 2008 06:45:14 GMT Subject: rpms/collectl/F-9 .cvsignore, 1.2, 1.3 collectl.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807090645.m696jEnI029963@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/collectl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29913 Modified Files: .cvsignore collectl.spec sources Log Message: * Tue Jul 8 2008 Karel Zak 3.0.0-1 - upgrade to upstream version 3.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectl/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2008 19:57:13 -0000 1.2 +++ .cvsignore 9 Jul 2008 06:44:24 -0000 1.3 @@ -1 +1 @@ -collectl-2.6.4-1.src.tar.gz +collectl-3.0.0.src.tar.gz Index: collectl.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectl/F-9/collectl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- collectl.spec 19 Jun 2008 19:57:13 -0000 1.1 +++ collectl.spec 9 Jul 2008 06:44:24 -0000 1.2 @@ -1,13 +1,10 @@ -%define upstream_version 2.6.4 -%define upstream_release 1 - Summary: A utility to collect various linux performance data Name: collectl -Version: %{upstream_version} +Version: 3.0.0 Release: 1%{?dist} License: GPLv2+ or Artistic Group: Applications/System -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-%{upstream_release}.src.tar.gz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz Source1: %{name}.initd Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -24,7 +21,7 @@ A utility to collect linux performance data %prep -%setup -q -n %{name}-%{version}-%{upstream_release} +%setup -q # rename directory for easier inclusion mv docs html @@ -101,5 +98,8 @@ %{_localstatedir}/log/%{name} %changelog +* Tue Jul 8 2008 Karel Zak 3.0.0-1 +- upgrade to upstream version 3.0.0 + * Thu Jun 19 2008 Karel Zak 2.6.4-1 - initial packaging (thanks to Dan Horak), based upon upstream srpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectl/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 19:57:13 -0000 1.2 +++ sources 9 Jul 2008 06:44:24 -0000 1.3 @@ -1 +1 @@ -bda4b879b79166e489b53f56f3877941 collectl-2.6.4-1.src.tar.gz +0f235ac3ad828b84f3f344fa0135b027 collectl-3.0.0.src.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 06:48:19 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Wed, 9 Jul 2008 06:48:19 GMT Subject: rpms/collectl/F-8 .cvsignore, 1.2, 1.3 collectl.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807090648.m696mJqY030160@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/collectl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30084 Modified Files: .cvsignore collectl.spec sources Log Message: * Tue Jul 8 2008 Karel Zak 3.0.0-1 - upgrade to upstream version 3.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectl/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2008 19:57:13 -0000 1.2 +++ .cvsignore 9 Jul 2008 06:47:25 -0000 1.3 @@ -1 +1 @@ -collectl-2.6.4-1.src.tar.gz +collectl-3.0.0.src.tar.gz Index: collectl.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectl/F-8/collectl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- collectl.spec 19 Jun 2008 19:57:13 -0000 1.1 +++ collectl.spec 9 Jul 2008 06:47:25 -0000 1.2 @@ -1,13 +1,10 @@ -%define upstream_version 2.6.4 -%define upstream_release 1 - Summary: A utility to collect various linux performance data Name: collectl -Version: %{upstream_version} +Version: 3.0.0 Release: 1%{?dist} License: GPLv2+ or Artistic Group: Applications/System -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-%{upstream_release}.src.tar.gz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz Source1: %{name}.initd Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -24,7 +21,7 @@ A utility to collect linux performance data %prep -%setup -q -n %{name}-%{version}-%{upstream_release} +%setup -q # rename directory for easier inclusion mv docs html @@ -101,5 +98,8 @@ %{_localstatedir}/log/%{name} %changelog +* Tue Jul 8 2008 Karel Zak 3.0.0-1 +- upgrade to upstream version 3.0.0 + * Thu Jun 19 2008 Karel Zak 2.6.4-1 - initial packaging (thanks to Dan Horak), based upon upstream srpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectl/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 19:57:13 -0000 1.2 +++ sources 9 Jul 2008 06:47:25 -0000 1.3 @@ -1 +1 @@ -bda4b879b79166e489b53f56f3877941 collectl-2.6.4-1.src.tar.gz +0f235ac3ad828b84f3f344fa0135b027 collectl-3.0.0.src.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 06:50:07 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Wed, 9 Jul 2008 06:50:07 GMT Subject: rpms/collectl/EL-5 .cvsignore, 1.2, 1.3 collectl.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807090650.m696o7He030304@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/collectl/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30268 Modified Files: .cvsignore collectl.spec sources Log Message: * Tue Jul 8 2008 Karel Zak 3.0.0-1 - upgrade to upstream version 3.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2008 19:57:13 -0000 1.2 +++ .cvsignore 9 Jul 2008 06:49:19 -0000 1.3 @@ -1 +1 @@ -collectl-2.6.4-1.src.tar.gz +collectl-3.0.0.src.tar.gz Index: collectl.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- collectl.spec 19 Jun 2008 19:57:13 -0000 1.1 +++ collectl.spec 9 Jul 2008 06:49:19 -0000 1.2 @@ -1,13 +1,10 @@ -%define upstream_version 2.6.4 -%define upstream_release 1 - Summary: A utility to collect various linux performance data Name: collectl -Version: %{upstream_version} +Version: 3.0.0 Release: 1%{?dist} License: GPLv2+ or Artistic Group: Applications/System -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-%{upstream_release}.src.tar.gz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz Source1: %{name}.initd Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -24,7 +21,7 @@ A utility to collect linux performance data %prep -%setup -q -n %{name}-%{version}-%{upstream_release} +%setup -q # rename directory for easier inclusion mv docs html @@ -101,5 +98,8 @@ %{_localstatedir}/log/%{name} %changelog +* Tue Jul 8 2008 Karel Zak 3.0.0-1 +- upgrade to upstream version 3.0.0 + * Thu Jun 19 2008 Karel Zak 2.6.4-1 - initial packaging (thanks to Dan Horak), based upon upstream srpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 19:57:13 -0000 1.2 +++ sources 9 Jul 2008 06:49:19 -0000 1.3 @@ -1 +1 @@ -bda4b879b79166e489b53f56f3877941 collectl-2.6.4-1.src.tar.gz +0f235ac3ad828b84f3f344fa0135b027 collectl-3.0.0.src.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 06:52:21 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Wed, 9 Jul 2008 06:52:21 GMT Subject: rpms/collectl/EL-4 .cvsignore, 1.2, 1.3 collectl.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807090652.m696qLZ4030448@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/collectl/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30391 Modified Files: .cvsignore collectl.spec sources Log Message: * Tue Jul 8 2008 Karel Zak 3.0.0-1 - upgrade to upstream version 3.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectl/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2008 19:57:13 -0000 1.2 +++ .cvsignore 9 Jul 2008 06:51:34 -0000 1.3 @@ -1 +1 @@ -collectl-2.6.4-1.src.tar.gz +collectl-3.0.0.src.tar.gz Index: collectl.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectl/EL-4/collectl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- collectl.spec 19 Jun 2008 19:57:13 -0000 1.1 +++ collectl.spec 9 Jul 2008 06:51:34 -0000 1.2 @@ -1,13 +1,10 @@ -%define upstream_version 2.6.4 -%define upstream_release 1 - Summary: A utility to collect various linux performance data Name: collectl -Version: %{upstream_version} +Version: 3.0.0 Release: 1%{?dist} License: GPLv2+ or Artistic Group: Applications/System -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-%{upstream_release}.src.tar.gz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz Source1: %{name}.initd Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -24,7 +21,7 @@ A utility to collect linux performance data %prep -%setup -q -n %{name}-%{version}-%{upstream_release} +%setup -q # rename directory for easier inclusion mv docs html @@ -101,5 +98,8 @@ %{_localstatedir}/log/%{name} %changelog +* Tue Jul 8 2008 Karel Zak 3.0.0-1 +- upgrade to upstream version 3.0.0 + * Thu Jun 19 2008 Karel Zak 2.6.4-1 - initial packaging (thanks to Dan Horak), based upon upstream srpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectl/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 19:57:13 -0000 1.2 +++ sources 9 Jul 2008 06:51:34 -0000 1.3 @@ -1 +1 @@ -bda4b879b79166e489b53f56f3877941 collectl-2.6.4-1.src.tar.gz +0f235ac3ad828b84f3f344fa0135b027 collectl-3.0.0.src.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 06:55:29 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 9 Jul 2008 06:55:29 GMT Subject: rpms/db4/devel .cvsignore, 1.13, 1.14 db4.spec, 1.58, 1.59 sources, 1.13, 1.14 db-4.6.18-glibc.patch, 1.1, NONE patch.4.6.21.1, 1.1, NONE Message-ID: <200807090655.m696tTHQ030616@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/db4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30543 Modified Files: .cvsignore db4.spec sources Removed Files: db-4.6.18-glibc.patch patch.4.6.21.1 Log Message: * Wed Jul 9 2008 Jindrich Novy 4.7.25-1 - update to 4.7.25 - package static java library only if listed in java_arches - move to java-1.6.0-openjdk - fix tcl library path - drop glibc patch, no more needed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/db4/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 11 Oct 2007 13:52:59 -0000 1.13 +++ .cvsignore 9 Jul 2008 06:54:45 -0000 1.14 @@ -8,3 +8,4 @@ db-4.6.18.tar.gz db-4.6.19.tar.gz db-4.6.21.tar.gz +db-4.7.25.tar.gz Index: db4.spec =================================================================== RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- db4.spec 19 May 2008 09:02:33 -0000 1.58 +++ db4.spec 9 Jul 2008 06:54:45 -0000 1.59 @@ -1,21 +1,19 @@ # the set of arches on which libgcj provides gcj and libgcj-javac-placeholder.sh %define java_arches %{ix86} alpha ia64 ppc s390 s390x sparc sparcv9 x86_64 -%define __soversion 4.6 +%define __soversion 4.7 Summary: The Berkeley DB database library (version 4) for C Name: db4 -Version: 4.6.21 -Release: 6%{?dist} +Version: 4.7.25 +Release: 1%{?dist} Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz -Patch1: http://www.oracle.com/technology/products/berkeley-db/xml/update/4.6.21/patch.4.6.21.1 Patch2: db-4.3.29-sparc64.patch Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3 Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.4 Patch14: db-1.85-errno.patch -Patch20: db-4.6.18-glibc.patch Patch22: db-4.5.20-jni-include-dir.patch URL: http://www.oracle.com/database/berkeley-db/ License: BSD @@ -24,8 +22,7 @@ BuildRequires: perl, libtool, ed, tcl-devel >= 8.4.4, util-linux-ng %ifarch %{java_arches} BuildRequires: gcc-java -BuildRequires: java-1.5.0-gcj -BuildRequires: java-1.5.0-gcj-devel +BuildRequires: java-1.6.0-openjdk-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -115,7 +112,6 @@ %prep %setup -q -n db-%{version} -a 1 -%patch1 -p0 -b .4.6.21.1 %patch2 -p1 -b .sparc64 pushd dist @@ -132,7 +128,6 @@ %patch14 -p1 -b .errno popd -%patch20 -p1 -b .glibc %patch22 -p1 -b .4.5.20.jni # Remove tags files which we don't need. @@ -187,6 +182,8 @@ /bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo /bin/sh libtool --mode=link %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a + pushd dist + popd pushd dist/$1 ln -sf ../configure . # XXX --enable-diagnostic should be disabled for production (but is @@ -203,6 +200,7 @@ --disable-java \ %endif --enable-test \ + --with-tcl=%{_libdir}/tcl8.5 \ # --enable-diagnostic \ # --enable-debug --enable-debug_rop --enable-debug_wop \ @@ -348,7 +346,9 @@ %{_libdir}/libdb-%{__soversion}.a %{_libdir}/libdb_cxx-%{__soversion}.a %{_libdir}/libdb_tcl-%{__soversion}.a +%ifarch %{java_arches} %{_libdir}/libdb_java-%{__soversion}.a +%endif %files tcl %defattr(-,root,root) @@ -364,6 +364,13 @@ %endif %changelog +* Wed Jul 9 2008 Jindrich Novy 4.7.25-1 +- update to 4.7.25 +- package static java library only if listed in java_arches +- move to java-1.6.0-openjdk +- fix tcl library path +- drop glibc patch, no more needed + * Sat May 17 2008 Jindrich Novy 4.6.21-6 - fix license, remove .la files (#225675) - move static libraries to separate package Index: sources =================================================================== RCS file: /cvs/extras/rpms/db4/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 11 Oct 2007 13:52:59 -0000 1.13 +++ sources 9 Jul 2008 06:54:45 -0000 1.14 @@ -1,2 +1,3 @@ 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 718082e7e35fc48478a2334b0bc4cd11 db-4.6.21.tar.gz +ec2b87e833779681a0c3a814aa71359e db-4.7.25.tar.gz --- db-4.6.18-glibc.patch DELETED --- --- patch.4.6.21.1 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 06:58:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:15 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchbugzilla Message-ID: <200807090658.m696wFjb018880@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchbugzilla acl on collectl (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:18 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchcommits Message-ID: <200807090658.m696wIg0018899@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchcommits acl on collectl (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:20 +0000 Subject: [pkgdb] collectl: sharkcz has requested commit Message-ID: <200807090658.m696wKMO018919@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the commit acl on collectl (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:23 +0000 Subject: [pkgdb] collectl: sharkcz has requested approveacls Message-ID: <200807090658.m696wFje018880@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the approveacls acl on collectl (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:29 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchbugzilla Message-ID: <200807090658.m696wT3F018958@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchbugzilla acl on collectl (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:31 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchcommits Message-ID: <200807090658.m696wKMR018919@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchcommits acl on collectl (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:34 +0000 Subject: [pkgdb] collectl: sharkcz has requested commit Message-ID: <200807090658.m696wFjh018880@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the commit acl on collectl (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:36 +0000 Subject: [pkgdb] collectl: sharkcz has requested approveacls Message-ID: <200807090658.m696wIg3018899@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the approveacls acl on collectl (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:40 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchbugzilla Message-ID: <200807090658.m696wKMU018919@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchbugzilla acl on collectl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:41 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchcommits Message-ID: <200807090658.m696wfo0019060@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchcommits acl on collectl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:42 +0000 Subject: [pkgdb] collectl: sharkcz has requested commit Message-ID: <200807090658.m696wT3I018958@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the commit acl on collectl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:44 +0000 Subject: [pkgdb] collectl: sharkcz has requested approveacls Message-ID: <200807090658.m696wT3L018958@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the approveacls acl on collectl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:47 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchbugzilla Message-ID: <200807090658.m696wIg6018899@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchbugzilla acl on collectl (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:49 +0000 Subject: [pkgdb] collectl: sharkcz has requested watchcommits Message-ID: <200807090658.m696wnWA019140@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the watchcommits acl on collectl (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:52 +0000 Subject: [pkgdb] collectl: sharkcz has requested commit Message-ID: <200807090658.m696wqsK019167@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the commit acl on collectl (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 06:58:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 06:58:55 +0000 Subject: [pkgdb] collectl: sharkcz has requested approveacls Message-ID: <200807090658.m696wqsN019167@bastion.fedora.phx.redhat.com> Dan Horak (sharkcz) has requested the approveacls acl on collectl (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 07:20:58 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 9 Jul 2008 07:20:58 GMT Subject: rpms/compat-db/devel compat-db.spec,1.29,1.30 Message-ID: <200807090720.m697Kwl4007218@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/compat-db/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6973 Modified Files: compat-db.spec Log Message: - better to put the symlinks to /usr/lib than /lib Index: compat-db.spec =================================================================== RCS file: /cvs/extras/rpms/compat-db/devel/compat-db.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- compat-db.spec 9 Jul 2008 06:39:42 -0000 1.29 +++ compat-db.spec 9 Jul 2008 07:20:02 -0000 1.30 @@ -152,8 +152,8 @@ for version in %{db4_versions} ; do mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/db${version} pushd ${RPM_BUILD_ROOT}/%{_libdir}/db${version} - ln -s ../libdb-`echo ${version} | cut -b 1-3`.so libdb.so - ln -s ../libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so + ln -s ../../../libdb-`echo ${version} | cut -b 1-3`.so libdb.so + ln -s ../../../libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so popd done @@ -163,7 +163,6 @@ if [ "%{_libdir}" != "%{_lib}" ]; then mkdir -p ${RPM_BUILD_ROOT}/%{_lib} mv ${RPM_BUILD_ROOT}%{_libdir}/libdb*?.?.so* ${RPM_BUILD_ROOT}/%{_lib}/ - mv ${RPM_BUILD_ROOT}%{_libdir}/db* ${RPM_BUILD_ROOT}/%{_lib}/ fi %endif @@ -184,12 +183,11 @@ %ifos linux /%{_lib}/libdb-?.?.so /%{_lib}/libdb_cxx-?.?.so -/%{_lib}/db* %else %{_libdir}/libdb-?.?.so %{_libdir}/libdb_cxx-?.?.so -%{_libdir}/db* %endif +%{_libdir}/db* %{_bindir}/berkeley_db*_svc %{_bindir}/db*_archive %{_bindir}/db*_checkpoint From fedora-extras-commits at redhat.com Wed Jul 9 07:23:00 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 9 Jul 2008 07:23:00 GMT Subject: rpms/db4/devel .cvsignore, 1.14, 1.15 db4.spec, 1.59, 1.60 sources, 1.14, 1.15 Message-ID: <200807090723.m697N0vx007376@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/db4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7313 Modified Files: .cvsignore db4.spec sources Log Message: - remove references to old sources - add bz# Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/db4/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 9 Jul 2008 06:54:45 -0000 1.14 +++ .cvsignore 9 Jul 2008 07:22:14 -0000 1.15 @@ -1,11 +1 @@ -db-4.2.52.tar.gz -db.1.85.tar.gz -db-4.3.21.tar.gz -db-4.3.27.tar.gz -db-4.3.28.tar.gz -db-4.3.29.tar.gz -db-4.5.20.tar.gz -db-4.6.18.tar.gz -db-4.6.19.tar.gz -db-4.6.21.tar.gz db-4.7.25.tar.gz Index: db4.spec =================================================================== RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- db4.spec 9 Jul 2008 06:54:45 -0000 1.59 +++ db4.spec 9 Jul 2008 07:22:14 -0000 1.60 @@ -365,7 +365,7 @@ %changelog * Wed Jul 9 2008 Jindrich Novy 4.7.25-1 -- update to 4.7.25 +- update to 4.7.25 (#449735) - package static java library only if listed in java_arches - move to java-1.6.0-openjdk - fix tcl library path Index: sources =================================================================== RCS file: /cvs/extras/rpms/db4/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 9 Jul 2008 06:54:45 -0000 1.14 +++ sources 9 Jul 2008 07:22:14 -0000 1.15 @@ -1,3 +1,2 @@ 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz -718082e7e35fc48478a2334b0bc4cd11 db-4.6.21.tar.gz ec2b87e833779681a0c3a814aa71359e db-4.7.25.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 07:29:13 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 9 Jul 2008 07:29:13 GMT Subject: rpms/tomoe-gtk/devel .cvsignore,1.1,1.2 Message-ID: <200807090729.m697TDp5007781@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/tomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6474 Modified Files: .cvsignore Log Message: new import Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tomoe-gtk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 05:40:04 -0000 1.1 +++ .cvsignore 9 Jul 2008 07:28:32 -0000 1.2 @@ -0,0 +1 @@ +tomoe-gtk-0.6.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 07:31:25 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 9 Jul 2008 07:31:25 GMT Subject: rpms/magicor/devel .cvsignore, 1.6, 1.7 magicor.spec, 1.5, 1.6 sources, 1.7, 1.8 Message-ID: <200807090731.m697VPRH008007@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/magicor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7948 Modified Files: .cvsignore magicor.spec sources Log Message: * Wed Jul 9 2008 Hans de Goede 1.1-1 - New upstream release 1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Dec 2007 19:37:50 -0000 1.6 +++ .cvsignore 9 Jul 2008 07:30:35 -0000 1.7 @@ -1,2 +1,2 @@ -magicor-source-1.1-rc1.tar.gz -magicor-data-1.1-rc1.tar.gz +magicor-source-1.1.tar.gz +magicor-data-1.1.tar.gz Index: magicor.spec =================================================================== RCS file: /cvs/extras/rpms/magicor/devel/magicor.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- magicor.spec 12 Dec 2007 19:37:50 -0000 1.5 +++ magicor.spec 9 Jul 2008 07:30:35 -0000 1.6 @@ -1,16 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define pre_version rc1 - Name: magicor Version: 1.1 -Release: 0.1.%{pre_version}%{?dist} +Release: 1%{?dist} Summary: Push ice blocks around to extenguish all fires Group: Amusements/Games License: Public Domain URL: http://magicor.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz -Source1: http://downloads.sourceforge.net/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-source-%{version}.tar.gz +Source1: http://downloads.sourceforge.net/%{name}/%{name}-data-%{version}.tar.gz Source2: %{name}.desktop Source3: %{name}.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +24,7 @@ %prep -%setup -q -b 1 -n %{name}-%{version}-%{pre_version} +%setup -q -b 1 sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf @@ -87,6 +85,9 @@ %changelog +* Wed Jul 9 2008 Hans de Goede 1.1-1 +- New upstream release 1.1 + * Wed Dec 12 2007 Hans de Goede 1.1-0.1.rc1 - New upstream release 1.1-rc1 - Add python as BuildRequires so that %%python_sitelib gets expanded properly, Index: sources =================================================================== RCS file: /cvs/extras/rpms/magicor/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Dec 2007 19:37:50 -0000 1.7 +++ sources 9 Jul 2008 07:30:35 -0000 1.8 @@ -1,2 +1,2 @@ -10f005bf8bb70bade2d8280451a75dca magicor-source-1.1-rc1.tar.gz -4a6fbd10ae7b08adcdbcc4d5f8d10207 magicor-data-1.1-rc1.tar.gz +0ba83ba61ec7db1a0d4fed6b937ae527 magicor-source-1.1.tar.gz +b681fc820d0f900120a87ae6163ee777 magicor-data-1.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 07:38:40 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 9 Jul 2008 07:38:40 GMT Subject: rpms/blobAndConquer/devel .cvsignore, 1.9, 1.10 blobAndConquer.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200807090738.m697ceej008395@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/blobAndConquer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8346 Modified Files: .cvsignore blobAndConquer.spec sources Log Message: * Wed Jul 9 2008 Hans de Goede 0.98-1 - New upstream release 0.98 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/blobAndConquer/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 29 Jun 2008 09:16:42 -0000 1.9 +++ .cvsignore 9 Jul 2008 07:37:49 -0000 1.10 @@ -1 +1 @@ -blobAndConquer-0.96-1.tar.gz +blobAndConquer-0.98-1.tar.gz Index: blobAndConquer.spec =================================================================== RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- blobAndConquer.spec 29 Jun 2008 09:16:42 -0000 1.16 +++ blobAndConquer.spec 9 Jul 2008 07:37:49 -0000 1.17 @@ -6,7 +6,7 @@ %define upstream_release 1 Name: blobAndConquer -Version: 0.96 +Version: 0.98 Release: 1%{?dist} Summary: Blob Wars 2: Blob And Conquer Group: Amusements/Games @@ -88,6 +88,9 @@ %changelog +* Wed Jul 9 2008 Hans de Goede 0.98-1 +- New upstream release 0.98 + * Thu Jun 26 2008 Hans de Goede 0.96-1 - New upstream release 0.96 Index: sources =================================================================== RCS file: /cvs/extras/rpms/blobAndConquer/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 29 Jun 2008 09:16:42 -0000 1.9 +++ sources 9 Jul 2008 07:37:49 -0000 1.10 @@ -1 +1 @@ -0a2e8d9e1116d6885caf135ee2a992b3 blobAndConquer-0.96-1.tar.gz +3eb2b8088effea3aa07153695ad8f8f7 blobAndConquer-0.98-1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 07:41:18 2008 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Wed, 9 Jul 2008 07:41:18 GMT Subject: rpms/drgeo/F-9 drgeo.patch,NONE,1.1 drgeo.spec,1.11,1.12 Message-ID: <200807090741.m697fIs9008603@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/pkgs/rpms/drgeo/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8485 Modified Files: drgeo.spec Added Files: drgeo.patch Log Message: drgeo.patch: --- NEW FILE drgeo.patch --- --- ./geo/drgeo_figure.cc 2008-07-08 02:38:50.000000000 -0400 +++ ./geo/drgeo_figure.cc~ 2005-07-14 03:30:01.000000000 -0400 @@ -1309,7 +1309,7 @@ gint drgeoFigure::preferedUndoLevel () { - atoi (drgeoConfigGet (":undoLevel")); + return atoi (drgeoConfigGet (":undoLevel")); } void Index: drgeo.spec =================================================================== RCS file: /cvs/pkgs/rpms/drgeo/F-9/drgeo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- drgeo.spec 20 Feb 2008 03:41:54 -0000 1.11 +++ drgeo.spec 9 Jul 2008 07:39:57 -0000 1.12 @@ -1,13 +1,14 @@ Summary: Interactive educational geometry software Name: drgeo Version: 1.1.0 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://www.ofset.org/drgeo Source: http://dl.sf.net/ofset/drgeo-%{version}.tar.gz Patch0: drgeo-1.1.0-htmlview.patch +Patch1: drgeo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, bison, gmp-devel >= 2.0.2, desktop-file-utils @@ -24,6 +25,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure @@ -61,6 +63,9 @@ %{_datadir}/applications/fedora-drgeo.desktop %changelog +* Tue Jul 08 2008 Eric Tanguy - 1.1.0-13 +- BZ 454045 + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.0-12 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 07:46:45 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 9 Jul 2008 07:46:45 GMT Subject: rpms/hedgewars/devel .cvsignore, 1.5, 1.6 hedgewars.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807090746.m697kj7O009033@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/hedgewars/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9000 Modified Files: .cvsignore hedgewars.spec sources Log Message: * Wed Jul 9 2008 Hans de Goede 0.9.5-1 - New upstream release 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jun 2008 10:22:07 -0000 1.5 +++ .cvsignore 9 Jul 2008 07:45:54 -0000 1.6 @@ -1 +1 @@ -hedgewars-src-0.9.4.tar.bz2 +hedgewars-src-0.9.5.tar.bz2 Index: hedgewars.spec =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hedgewars.spec 29 Jun 2008 10:22:07 -0000 1.9 +++ hedgewars.spec 9 Jul 2008 07:45:54 -0000 1.10 @@ -1,5 +1,5 @@ Name: hedgewars -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} Summary: 2D tankbattle game with the tanks replaced by hedgehogs Group: Amusements/Games @@ -78,6 +78,9 @@ %changelog +* Wed Jul 9 2008 Hans de Goede 0.9.5-1 +- New upstream release 0.9.5 + * Thu Jun 26 2008 Hans de Goede 0.9.4-1 - New upstream release 0.9.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jun 2008 10:22:07 -0000 1.5 +++ sources 9 Jul 2008 07:45:54 -0000 1.6 @@ -1 +1 @@ -d7dbba8f55352caa9527ac48bcbd45ee hedgewars-src-0.9.4.tar.bz2 +12a4aee48fccc565dd63de61c9444b62 hedgewars-src-0.9.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 07:59:16 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Wed, 9 Jul 2008 07:59:16 GMT Subject: rpms/sugar/F-9 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 sugar.spec, 1.19, 1.20 Message-ID: <200807090759.m697xGKw009564@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9497 Modified Files: .cvsignore sources sugar.spec Log Message: * Wed Jul 09 2008 Simon Schampijer - 0.81.6-1 - 7438 sugar shuts down when you click Restart - 7365 Invites not working - 7248 Speaker device has inconsistent behavior - 7339 CPU Spins after starting an activity - 7015 Add proper alignment support to the tray control - 5613 Cannot set non-ASCII nick name - 7046 Deleting activity bundle with journal leaves it showing in Home list view until reboot - 7391 Make the search field in Home reveal the list view - 7248 Speaker device has inconsistent behavior - 7272 Notifications are redundant with new launching feedback - 7273 Activity icons remain colored after launch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 21 Jun 2008 11:09:57 -0000 1.11 +++ .cvsignore 9 Jul 2008 07:58:26 -0000 1.12 @@ -1 +1 @@ -sugar-0.81.5.tar.bz2 +sugar-0.81.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 21 Jun 2008 11:09:57 -0000 1.12 +++ sources 9 Jul 2008 07:58:26 -0000 1.13 @@ -1 +1 @@ -327c8c958a6346c9084a7a12795a03fa sugar-0.81.5.tar.bz2 +672a3a84fabca8615bbd731f7ade3645 sugar-0.81.6.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/sugar.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sugar.spec 27 Jun 2008 08:54:29 -0000 1.19 +++ sugar.spec 9 Jul 2008 07:58:26 -0000 1.20 @@ -1,6 +1,6 @@ Summary: OLPC desktop environment Name: sugar -Version: 0.81.5 +Version: 0.81.6 Release: 1%{?dist} URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 @@ -70,6 +70,19 @@ %{_datadir}/mime/packages/sugar.xml %changelog +* Wed Jul 09 2008 Simon Schampijer - 0.81.6-1 +- 7438 sugar shuts down when you click Restart +- 7365 Invites not working +- 7248 Speaker device has inconsistent behavior +- 7339 CPU Spins after starting an activity +- 7015 Add proper alignment support to the tray control +- 5613 Cannot set non-ASCII nick name +- 7046 Deleting activity bundle with journal leaves it showing in Home list view until reboot +- 7391 Make the search field in Home reveal the list view +- 7248 Speaker device has inconsistent behavior +- 7272 Notifications are redundant with new launching feedback +- 7273 Activity icons remain colored after launch + * Sat Jun 21 2008 Tomeu Vizoso - 0.81.5-1 - Fix a bug with activity switching (benzea) - UI improvements to the control panel frame section (erikos) From fedora-extras-commits at redhat.com Wed Jul 9 08:05:08 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Wed, 9 Jul 2008 08:05:08 GMT Subject: rpms/sugar-toolkit/F-9 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sugar-toolkit.spec, 1.10, 1.11 Message-ID: <200807090805.m69858Sn016398@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16353 Modified Files: .cvsignore sources sugar-toolkit.spec Log Message: * Wed Jul 09 2008 Simon Schampijer - 0.81.6-1 - 7015 Add proper alignment support to the tray control - 7054 Journal doesn't show correct colors for activity instances - 7046 Deleting activity bundle with journal leaves it showing in Home list view until reboot - 3939 Keep button should use XO colors - 7248 Speaker device has inconsistent behavior Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Jun 2008 11:00:01 -0000 1.7 +++ .cvsignore 9 Jul 2008 08:04:19 -0000 1.8 @@ -1 +1 @@ -sugar-toolkit-0.81.5.tar.bz2 +sugar-toolkit-0.81.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Jun 2008 11:00:01 -0000 1.8 +++ sources 9 Jul 2008 08:04:19 -0000 1.9 @@ -1 +1 @@ -56fcccd96e6c49489e68f46451d2a182 sugar-toolkit-0.81.5.tar.bz2 +a67cb1d41b1c378ad56b58cf77474fb0 sugar-toolkit-0.81.6.tar.bz2 Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sugar-toolkit.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sugar-toolkit.spec 21 Jun 2008 11:00:01 -0000 1.10 +++ sugar-toolkit.spec 9 Jul 2008 08:04:19 -0000 1.11 @@ -2,7 +2,7 @@ Summary: Sugar toolkit Name: sugar-toolkit -Version: 0.81.5 +Version: 0.81.6 Release: 1%{?dist} URL: http://wiki.laptop.org/go/Sugar Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 @@ -42,13 +42,14 @@ %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +%find_lang %name mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README @@ -56,6 +57,13 @@ %{_sysconfdir}/rpm/macros.sugar %changelog +* Wed Jul 09 2008 Simon Schampijer - 0.81.6-1 +- 7015 Add proper alignment support to the tray control +- 7054 Journal doesn't show correct colors for activity instances +- 7046 Deleting activity bundle with journal leaves it showing in Home list view until reboot +- 3939 Keep button should use XO colors +- 7248 Speaker device has inconsistent behavior + * Sat Jun 21 2008 Tomeu Vizoso - 0.81.5-1 - Add build dependency on libSM-devel - Support for session management (marco) From fedora-extras-commits at redhat.com Wed Jul 9 08:07:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:07:15 +0000 Subject: [pkgdb] python-id3 ownership updated Message-ID: <200807090807.m6987F76020803@bastion.fedora.phx.redhat.com> Package python-id3 in Fedora 9 is now owned by Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:07:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:07:25 +0000 Subject: [pkgdb] python-id3 ownership updated Message-ID: <200807090807.m6987Ptw020822@bastion.fedora.phx.redhat.com> Package python-id3 in Fedora devel is now owned by Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:08:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:08:03 +0000 Subject: [pkgdb] python-id3: mnowak has requested watchbugzilla Message-ID: <200807090808.m6988HSl020858@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchbugzilla acl on python-id3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:08:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:08:18 +0000 Subject: [pkgdb] python-id3: mnowak has requested watchcommits Message-ID: <200807090808.m6987Pu0020822@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchcommits acl on python-id3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:08:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:08:30 +0000 Subject: [pkgdb] python-id3: mnowak has requested commit Message-ID: <200807090808.m6988UnZ020895@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the commit acl on python-id3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:08:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:08:46 +0000 Subject: [pkgdb] python-id3: mnowak has requested watchcommits Message-ID: <200807090808.m6987Pu2020822@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchcommits acl on python-id3 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:08:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:08:44 +0000 Subject: [pkgdb] python-id3: mnowak has requested watchbugzilla Message-ID: <200807090808.m6988HSn020858@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchbugzilla acl on python-id3 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:08:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:08:47 +0000 Subject: [pkgdb] python-id3: mnowak has requested commit Message-ID: <200807090808.m6988lSH020954@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the commit acl on python-id3 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Wed Jul 9 08:09:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:08 +0000 Subject: [pkgdb] id3-py ownership updated Message-ID: <200807090809.m6987Pu4020822@bastion.fedora.phx.redhat.com> Package id3-py in Fedora devel is now owned by Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:09:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:17 +0000 Subject: [pkgdb] id3-py: mnowak has requested watchbugzilla Message-ID: <200807090809.m6988Unb020895@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchbugzilla acl on id3-py (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:09:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:20 +0000 Subject: [pkgdb] id3-py: mnowak has requested commit Message-ID: <200807090809.m6988lSJ020954@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the commit acl on id3-py (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:09:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:23 +0000 Subject: [pkgdb] id3-py: mnowak has requested watchcommits Message-ID: <200807090809.m6988HSp020858@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchcommits acl on id3-py (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:09:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:26 +0000 Subject: [pkgdb] id3-py ownership updated Message-ID: <200807090809.m6987Pu6020822@bastion.fedora.phx.redhat.com> Package id3-py in Fedora 9 is now owned by Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:09:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:29 +0000 Subject: [pkgdb] id3-py: mnowak has requested watchbugzilla Message-ID: <200807090809.m6988Und020895@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchbugzilla acl on id3-py (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:09:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:32 +0000 Subject: [pkgdb] id3-py: mnowak has requested watchcommits Message-ID: <200807090809.m6988HSr020858@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the watchcommits acl on id3-py (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:09:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:09:32 +0000 Subject: [pkgdb] id3-py: mnowak has requested commit Message-ID: <200807090809.m6988lSL020954@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the commit acl on id3-py (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Wed Jul 9 08:13:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:13:35 +0000 Subject: [pkgdb] gaim-guifications had acl change status Message-ID: <200807090813.m698DjZC021294@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on gaim-guifications (Fedora devel) to Approved for Tom Callaway (spot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gaim-guifications From fedora-extras-commits at redhat.com Wed Jul 9 08:13:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:13:43 +0000 Subject: [pkgdb] gaim-guifications had acl change status Message-ID: <200807090813.m698DjZF021294@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on gaim-guifications (Fedora 7) to Approved for Tom Callaway (spot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gaim-guifications From fedora-extras-commits at redhat.com Wed Jul 9 08:13:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:13:48 +0000 Subject: [pkgdb] gaim-guifications had acl change status Message-ID: <200807090813.m698DmYW021334@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on gaim-guifications (Fedora 4) to Approved for Tom Callaway (spot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gaim-guifications From fedora-extras-commits at redhat.com Wed Jul 9 08:20:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:20:38 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807090820.m698KcwO021633@bastion.fedora.phx.redhat.com> Jiri Skala (jskala) has set the watchcommits acl on squid (Fedora devel) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:20:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:20:42 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807090820.m698Kglv021656@bastion.fedora.phx.redhat.com> Jiri Skala (jskala) has set the watchcommits acl on squid (Fedora devel) to Approved for Jiri Skala (jskala) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:20:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:20:42 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807090820.m698KqhK021655@bastion.fedora.phx.redhat.com> Jiri Skala (jskala) has set the watchbugzilla acl on squid (Fedora devel) to Approved for Jiri Skala (jskala) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:20:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:20:43 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807090820.m698KqhM021655@bastion.fedora.phx.redhat.com> Jiri Skala (jskala) has set the watchbugzilla acl on squid (Fedora devel) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:20:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:20:47 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807090820.m698KqhP021655@bastion.fedora.phx.redhat.com> Jiri Skala (jskala) has set the commit acl on squid (Fedora devel) to Approved for Jiri Skala (jskala) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:24:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:24:45 +0000 Subject: [pkgdb] squid: mnagy has requested watchbugzilla Message-ID: <200807090824.m698OjH3021821@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchbugzilla acl on squid (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:24:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:24:52 +0000 Subject: [pkgdb] squid: mnagy has requested watchcommits Message-ID: <200807090824.m698OqOo021841@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchcommits acl on squid (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:27:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:27:13 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807090827.m698RD18021923@bastion.fedora.phx.redhat.com> Jiri Skala (jskala) has set the watchbugzilla acl on squid (Fedora devel) to Approved for Martin Nagy (mnagy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:27:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:27:17 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807090827.m698RRtp021944@bastion.fedora.phx.redhat.com> Jiri Skala (jskala) has set the watchcommits acl on squid (Fedora devel) to Approved for Martin Nagy (mnagy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 08:32:56 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 08:32:56 GMT Subject: rpms/perl-Mail-GnuPG/devel perl-Mail-GnuPG.spec,1.9,1.10 Message-ID: <200807090832.m698WuNM017380@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17342 Modified Files: perl-Mail-GnuPG.spec Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 0.15-2 - Cleanup spec file. Index: perl-Mail-GnuPG.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/perl-Mail-GnuPG.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Mail-GnuPG.spec 12 Mar 2008 17:51:52 -0000 1.9 +++ perl-Mail-GnuPG.spec 9 Jul 2008 08:32:03 -0000 1.10 @@ -1,7 +1,7 @@ Name: perl-Mail-GnuPG Summary: Process email with GPG Version: 0.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-GnuPG/ @@ -9,11 +9,7 @@ BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%if "%{version}" >= "0.08" -Source0: http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/Mail-GnuPG-%{version}.tar.gz -%else Source0: http://search.cpan.org/CPAN/authors/id/R/RS/RSPIER/Mail-GnuPG-%{version}.tar.gz -%endif BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(GnuPG::Interface) @@ -56,13 +52,16 @@ %{_mandir}/man3/* %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 0.15-2 +- Cleanup spec file. + * Wed Mar 12 2008 Ralf Cors??pius - 0.15-1 - Upstream update. - Correct license tag: GPLv2 or Artistic-v1.0. - Convert README to utf8. * Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 -Rebuild for new perl +- Rebuild for new perl * Tue Sep 04 2007 Ralf Cors??pius - 0.10-1 - Upstream update. From fedora-extras-commits at redhat.com Wed Jul 9 08:35:07 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 08:35:07 GMT Subject: rpms/perl-Mail-GnuPG/F-9 perl-Mail-GnuPG.spec,1.9,1.10 Message-ID: <200807090835.m698Z7Jv017504@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17461 Modified Files: perl-Mail-GnuPG.spec Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 0.15-2 - Cleanup spec file. Index: perl-Mail-GnuPG.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-9/perl-Mail-GnuPG.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Mail-GnuPG.spec 12 Mar 2008 17:51:52 -0000 1.9 +++ perl-Mail-GnuPG.spec 9 Jul 2008 08:34:11 -0000 1.10 @@ -1,7 +1,7 @@ Name: perl-Mail-GnuPG Summary: Process email with GPG Version: 0.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-GnuPG/ @@ -9,11 +9,7 @@ BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%if "%{version}" >= "0.08" -Source0: http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/Mail-GnuPG-%{version}.tar.gz -%else Source0: http://search.cpan.org/CPAN/authors/id/R/RS/RSPIER/Mail-GnuPG-%{version}.tar.gz -%endif BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(GnuPG::Interface) @@ -56,13 +52,16 @@ %{_mandir}/man3/* %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 0.15-2 +- Cleanup spec file. + * Wed Mar 12 2008 Ralf Cors??pius - 0.15-1 - Upstream update. - Correct license tag: GPLv2 or Artistic-v1.0. - Convert README to utf8. * Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 -Rebuild for new perl +- Rebuild for new perl * Tue Sep 04 2007 Ralf Cors??pius - 0.10-1 - Upstream update. From fedora-extras-commits at redhat.com Wed Jul 9 08:36:09 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 08:36:09 GMT Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec,1.11,1.12 Message-ID: <200807090836.m698a9t6017574@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Slurp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17505 Modified Files: perl-File-Slurp.spec Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 9999.13-4 - Re-activate tests. Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-File-Slurp.spec 28 Feb 2008 13:10:58 -0000 1.11 +++ perl-File-Slurp.spec 9 Jul 2008 08:35:08 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-File-Slurp Version: 9999.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL+ or Artistic Group: Development/Libraries @@ -44,9 +44,7 @@ rm -rf $RPM_BUILD_ROOT %check -# This works fine, everywhere except the odd -# Fedora builder environment. :/ -# make test +make test %files %defattr(-,root,root,-) @@ -56,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 9999.13-4 +- Re-activate tests. + * Wed Feb 27 2008 Tom "spot" Callaway - 9999.13-3 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Wed Jul 9 08:41:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 08:41:05 GMT Subject: rpms/perl-Mail-GnuPG/F-8 .cvsignore, 1.3, 1.4 perl-Mail-GnuPG.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200807090841.m698f53u017841@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17783 Modified Files: .cvsignore perl-Mail-GnuPG.spec sources Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 0.15-2 - Cleanup spec file. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Sep 2007 09:19:28 -0000 1.3 +++ .cvsignore 9 Jul 2008 08:40:03 -0000 1.4 @@ -1 +1 @@ -Mail-GnuPG-0.10.tar.gz +Mail-GnuPG-0.15.tar.gz Index: perl-Mail-GnuPG.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-8/perl-Mail-GnuPG.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Mail-GnuPG.spec 4 Sep 2007 09:19:28 -0000 1.6 +++ perl-Mail-GnuPG.spec 9 Jul 2008 08:40:04 -0000 1.7 @@ -1,19 +1,15 @@ Name: perl-Mail-GnuPG Summary: Process email with GPG -Version: 0.10 -Release: 1%{?dist} -License: GPL+ or Artistic +Version: 0.15 +Release: 2%{?dist} +License: GPLv2 or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-GnuPG/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%if "%{version}" >= "0.08" -Source0: http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/Mail-GnuPG-%{version}.tar.gz -%else Source0: http://search.cpan.org/CPAN/authors/id/R/RS/RSPIER/Mail-GnuPG-%{version}.tar.gz -%endif BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(GnuPG::Interface) @@ -29,6 +25,8 @@ %prep %setup -q -n Mail-GnuPG-%{version} +iconv -f iso-8859-1 -t utf-8 README > README~ +mv README~ README %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -54,6 +52,17 @@ %{_mandir}/man3/* %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 0.15-2 +- Cleanup spec file. + +* Wed Mar 12 2008 Ralf Cors??pius - 0.15-1 +- Upstream update. +- Correct license tag: GPLv2 or Artistic-v1.0. +- Convert README to utf8. + +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 +- Rebuild for new perl + * Tue Sep 04 2007 Ralf Cors??pius - 0.10-1 - Upstream update. - Reflect source url having changed. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2007 09:19:28 -0000 1.3 +++ sources 9 Jul 2008 08:40:04 -0000 1.4 @@ -1 +1 @@ -12a24de59a383d803f99dd579db83c57 Mail-GnuPG-0.10.tar.gz +7f18a7af0d8998a3f362e8e12abe16a2 Mail-GnuPG-0.15.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 08:14:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 08:14:02 +0000 Subject: [pkgdb] gaim-guifications had acl change status Message-ID: <200807090814.m698DjZI021294@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on gaim-guifications (Fedora 9) to Approved for Tom Callaway (spot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gaim-guifications From fedora-extras-commits at redhat.com Wed Jul 9 08:44:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 08:44:05 GMT Subject: rpms/perl-File-Slurp/F-9 perl-File-Slurp.spec,1.11,1.12 Message-ID: <200807090844.m698i5vh018031@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Slurp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17964 Modified Files: perl-File-Slurp.spec Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 9999.13-4 - Re-activate tests. Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Slurp/F-9/perl-File-Slurp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-File-Slurp.spec 28 Feb 2008 13:10:58 -0000 1.11 +++ perl-File-Slurp.spec 9 Jul 2008 08:43:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-File-Slurp Version: 9999.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL+ or Artistic Group: Development/Libraries @@ -44,9 +44,7 @@ rm -rf $RPM_BUILD_ROOT %check -# This works fine, everywhere except the odd -# Fedora builder environment. :/ -# make test +make test %files %defattr(-,root,root,-) @@ -56,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 9999.13-4 +- Re-activate tests. + * Wed Feb 27 2008 Tom "spot" Callaway - 9999.13-3 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Wed Jul 9 08:46:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 08:46:41 GMT Subject: rpms/perl-File-Slurp/F-8 .cvsignore, 1.4, 1.5 perl-File-Slurp.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807090846.m698kfNK018176@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Slurp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18127 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Sync with F-9. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Slurp/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Mar 2006 10:16:04 -0000 1.4 +++ .cvsignore 9 Jul 2008 08:45:48 -0000 1.5 @@ -1 +1 @@ -File-Slurp-9999.12.tar.gz +File-Slurp-9999.13.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Slurp/F-8/perl-File-Slurp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-File-Slurp.spec 2 Sep 2007 07:49:57 -0000 1.7 +++ perl-File-Slurp.spec 9 Jul 2008 08:45:48 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.12 -Release: 3%{?dist} +Version: 9999.13 +Release: 4%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,21 @@ %{_mandir}/man3/* %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 9999.13-4 +- Re-activate tests. + +* Wed Feb 27 2008 Tom "spot" Callaway - 9999.13-3 +- Rebuild for perl 5.10 (again) + +* Thu Jan 24 2008 Tom "spot" Callaway - 9999.13-2 +- disable tests, due to wacky Fedora builders + +* Thu Jan 24 2008 Tom "spot" Callaway - 9999.13-1 +- go to 9999.13 to fix build failures against perl 5.10.0 + +* Sun Jan 20 2008 Tom "spot" Callaway - 9999.12-4 +- rebuild for new perl + * Sun Sep 02 2007 Ralf Cors??pius - 9999.12-3 - Update license tag. - BR: perl(ExtUtils::MakeMaker). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Slurp/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Mar 2006 10:16:04 -0000 1.4 +++ sources 9 Jul 2008 08:45:48 -0000 1.5 @@ -1 +1 @@ -6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz +ac3cd9d466b99d1534762ff3549aaa66 File-Slurp-9999.13.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 09:50:58 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 9 Jul 2008 09:50:58 GMT Subject: rpms/iotop/devel .cvsignore, 1.2, 1.3 iotop.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807090950.m699owub029544@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/iotop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29501 Modified Files: .cvsignore iotop.spec sources Log Message: Update to 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iotop/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2008 15:35:57 -0000 1.2 +++ .cvsignore 9 Jul 2008 09:50:07 -0000 1.3 @@ -1 +1 @@ -iotop-0.2.tar.bz2 +iotop-0.2.1.tar.bz2 Index: iotop.spec =================================================================== RCS file: /cvs/pkgs/rpms/iotop/devel/iotop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iotop.spec 7 Jul 2008 18:13:18 -0000 1.5 +++ iotop.spec 9 Jul 2008 09:50:07 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: iotop -Version: 0.2 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Top like utility for I/O Group: Applications/System @@ -48,6 +48,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 09 2008 Adel Gadllah 0.2.1-1 +- Update to 0.2.1 + * Mon Jul 07 2008 Adel Gadllah 0.2-2 - New upstream tarball.. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iotop/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2008 18:13:18 -0000 1.3 +++ sources 9 Jul 2008 09:50:07 -0000 1.4 @@ -1 +1 @@ -b506e34c7b292f7bb7111b9ed67f68ea iotop-0.2.tar.bz2 +127e038106492de258a206433f4c3a96 iotop-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 09:55:20 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 9 Jul 2008 09:55:20 GMT Subject: rpms/iotop/F-9 .cvsignore, 1.2, 1.3 iotop.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807090955.m699tKUk029917@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/iotop/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788 Modified Files: .cvsignore iotop.spec sources Log Message: Update to 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2008 15:35:55 -0000 1.2 +++ .cvsignore 9 Jul 2008 09:54:26 -0000 1.3 @@ -1 +1 @@ -iotop-0.2.tar.bz2 +iotop-0.2.1.tar.bz2 Index: iotop.spec =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-9/iotop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iotop.spec 7 Jul 2008 18:12:51 -0000 1.5 +++ iotop.spec 9 Jul 2008 09:54:26 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: iotop -Version: 0.2 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Top like utility for I/O Group: Applications/System @@ -48,6 +48,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 09 2008 Adel Gadllah 0.2.1-1 +- Update to 0.2.1 + * Mon Jul 07 2008 Adel Gadllah 0.2-2 - New upstream tarball.. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2008 18:12:51 -0000 1.3 +++ sources 9 Jul 2008 09:54:26 -0000 1.4 @@ -1 +1 @@ -b506e34c7b292f7bb7111b9ed67f68ea iotop-0.2.tar.bz2 +127e038106492de258a206433f4c3a96 iotop-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 09:55:38 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 9 Jul 2008 09:55:38 GMT Subject: rpms/inkscape/devel inkscape-0.46-gtk2.13.3.patch, NONE, 1.1 inkscape-0.46-poppler-0.8.3.patch, NONE, 1.1 inkscape.spec, 1.54, 1.55 Message-ID: <200807090955.m699tcLF029959@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29839 Modified Files: inkscape.spec Added Files: inkscape-0.46-gtk2.13.3.patch inkscape-0.46-poppler-0.8.3.patch Log Message: * Wed Jul 09 2008 Lubomir Rintel - 0.46-4 - Fix compile issues with newer gtk and poppler inkscape-0.46-gtk2.13.3.patch: --- NEW FILE inkscape-0.46-gtk2.13.3.patch --- gtkctree.h and gtkclist.h include each other, the order of inclusion is important in gtk-2.13.3 https://bugs.launchpad.net/inkscape/+bug/246868 Lubomir Rintel --- inkscape-0.46+devel.orig/src/widgets/sp-xmlview-attr-list.h 2008-06-24 13:38:07.000000000 +0200 +++ inkscape-0.46+devel/src/widgets/sp-xmlview-attr-list.h 2008-07-05 13:03:50.000000000 +0200 @@ -13,6 +13,7 @@ */ #include +#include #include #include "../xml/repr.h" inkscape-0.46-poppler-0.8.3.patch: --- NEW FILE inkscape-0.46-poppler-0.8.3.patch --- Inkscape 0.46 fails to compile with poppler-0.8.3 Filed upstream: https://bugs.launchpad.net/inkscape/+bug/237574 diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp --- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:26:20.000000000 +0200 +++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:51:47.000000000 +0200 @@ -2194,11 +2194,11 @@ void PdfParser::doShowText(GooString *s) { GfxFont *font; int wMode; double riseX, riseY; CharCode code; - Unicode u[8]; + Unicode *u = NULL; double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY; double originX, originY, tOriginX, tOriginY; double oldCTM[6], newCTM[6]; double *mat; Object charProc; @@ -2242,11 +2242,11 @@ oldParser = parser; p = s->getCString(); len = s->getLength(); while (len > 0) { n = font->getNextChar(p, len, &code, - u, (int)(sizeof(u) / sizeof(Unicode)), &uLen, + &u, &uLen, &dx, &dy, &originX, &originY); dx = dx * state->getFontSize() + state->getCharSpace(); if (n == 1 && *p == ' ') { dx += state->getWordSpace(); } @@ -2291,11 +2291,11 @@ state->textTransformDelta(0, state->getRise(), &riseX, &riseY); p = s->getCString(); len = s->getLength(); while (len > 0) { n = font->getNextChar(p, len, &code, - u, (int)(sizeof(u) / sizeof(Unicode)), &uLen, + &u, &uLen, &dx, &dy, &originX, &originY); if (wMode) { dx *= state->getFontSize(); dy = dy * state->getFontSize() + state->getCharSpace(); Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- inkscape.spec 26 Jun 2008 08:22:24 -0000 1.54 +++ inkscape.spec 9 Jul 2008 09:54:35 -0000 1.55 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.46 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -12,6 +12,8 @@ Patch2: inkscape-0.46pre2-icons.patch Patch3: inkscape-0.46-fixlatex.patch Patch4: inkscape-0.46-gtkopen.patch +Patch5: inkscape-0.46-gtk2.13.3.patch +Patch6: inkscape-0.46-poppler-0.8.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +78,8 @@ %patch2 -p1 -b .icons %patch3 -p1 -b .fixlatex %patch4 -p0 -b .gtkopen +%patch5 -p1 -b .gtk2.13.3 +%patch6 -p1 -b .poppler-0.8.3 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' dos2unix -k -q share/extensions/*.py @@ -135,6 +139,9 @@ %changelog +* Wed Jul 09 2008 Lubomir Rintel - 0.46-4 +- Fix compile issues with newer gtk and poppler + * Thu Jun 26 2008 Lubomir Rintel - 0.46-3 - Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio From fedora-extras-commits at redhat.com Wed Jul 9 09:57:38 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 9 Jul 2008 09:57:38 GMT Subject: rpms/iotop/F-8 .cvsignore, 1.2, 1.3 iotop.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807090957.m699vc7R030108@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/iotop/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30080 Modified Files: .cvsignore iotop.spec sources Log Message: Update to 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 May 2008 15:35:52 -0000 1.2 +++ .cvsignore 9 Jul 2008 09:56:51 -0000 1.3 @@ -1 +1 @@ -iotop-0.2.tar.bz2 +iotop-0.2.1.tar.bz2 Index: iotop.spec =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-8/iotop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iotop.spec 7 Jul 2008 18:12:29 -0000 1.5 +++ iotop.spec 9 Jul 2008 09:56:51 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: iotop -Version: 0.2 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Top like utility for I/O Group: Applications/System @@ -48,6 +48,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 09 2008 Adel Gadllah 0.2.1-1 +- Update to 0.2.1 + * Mon Jul 07 2008 Adel Gadllah 0.2-2 - New upstream tarball.. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iotop/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2008 18:12:29 -0000 1.3 +++ sources 9 Jul 2008 09:56:51 -0000 1.4 @@ -1 +1 @@ -b506e34c7b292f7bb7111b9ed67f68ea iotop-0.2.tar.bz2 +127e038106492de258a206433f4c3a96 iotop-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 10:05:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:05:58 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A5wTj024715@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchbugzilla acl on collectl (Fedora EPEL 5) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:01 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A61ji024734@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchcommits acl on collectl (Fedora EPEL 5) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:01 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A61jf024734@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the commit acl on collectl (Fedora EPEL 5) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:06 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A66MG024772@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the approveacls acl on collectl (Fedora EPEL 5) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:11 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A5wTm024715@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the commit acl on collectl (Fedora EPEL 4) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:15 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A61jl024734@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchbugzilla acl on collectl (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:17 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A66MJ024772@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchcommits acl on collectl (Fedora EPEL 4) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:17 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A6HWH024836@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchcommits acl on collectl (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:09 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A6Jhk024792@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchbugzilla acl on collectl (Fedora EPEL 4) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:15 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A6Jhn024792@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the approveacls acl on collectl (Fedora EPEL 4) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:24 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A66MM024772@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the approveacls acl on collectl (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:25 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A6Qhh024938@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the commit acl on collectl (Fedora 9) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:28 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A5wTp024715@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchbugzilla acl on collectl (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:33 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A6HWK024836@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the approveacls acl on collectl (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:29 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A6TX0024975@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the watchcommits acl on collectl (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:06:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 10:06:29 +0000 Subject: [pkgdb] collectl had acl change status Message-ID: <200807091006.m69A6TX3024975@bastion.fedora.phx.redhat.com> Karel Zak (kzak) has set the commit acl on collectl (Fedora 8) to Approved for Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/collectl From fedora-extras-commits at redhat.com Wed Jul 9 10:07:51 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 9 Jul 2008 10:07:51 GMT Subject: rpms/bzflag/devel bzflag.spec,1.45,1.46 Message-ID: <200807091007.m69A7pUq004639@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4569 Modified Files: bzflag.spec Log Message: build without SDL (#426011) Index: bzflag.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- bzflag.spec 8 Jul 2008 14:58:41 -0000 1.45 +++ bzflag.spec 9 Jul 2008 10:06:49 -0000 1.46 @@ -1,5 +1,8 @@ #### options: -# Use --with/--without modular_x to rebuild with/without modular X deps +# --with/--without options: +# modular_x: rebuild with modular X deps +# opengl_wrapper: use Fedora OpenGL wrapper +# SDL: use SDL instead of X11 directly #### default options: %if %{?fedora}%{!?fedora:5} < 5 @@ -22,13 +25,17 @@ %define _libcurl_devel 0 %endif +# don't build with SDL by default because of display resolution setting +# problems +%bcond_with SDL + %define desktop_vendor fedora #define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag Version: 2.0.12 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 Group: Amusements/Games URL: http://bzflag.org @@ -51,7 +58,9 @@ BuildRequires: libGLU-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils +%if %{with SDL} BuildRequires: SDL-devel +%endif BuildRequires: ncurses-devel %if %_libcurl_devel BuildRequires: libcurl-devel @@ -90,6 +99,9 @@ CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing' LDFLAGS='-pie' %configure \ +%if ! %{with SDL} + --without-SDL \ +%endif --enable-optimized \ --enable-shared make %{?_smp_mflags} @@ -134,6 +146,9 @@ %{_mandir}/man*/* %changelog +* Wed Jul 08 2008 Nils Philippsen 2.0.12-2 +- build without SDL (#426011) + * Tue Jul 08 2008 Nils Philippsen 2.0.12-1 - version 2.0.12 - fix source URL From fedora-extras-commits at redhat.com Wed Jul 9 10:11:11 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 9 Jul 2008 10:11:11 GMT Subject: rpms/bzflag/F-9 bzflag.spec,1.45,1.46 Message-ID: <200807091011.m69ABBhc004802@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4732 Modified Files: bzflag.spec Log Message: build without SDL (#426011) Index: bzflag.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzflag/F-9/bzflag.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- bzflag.spec 8 Jul 2008 15:00:13 -0000 1.45 +++ bzflag.spec 9 Jul 2008 10:09:51 -0000 1.46 @@ -1,5 +1,8 @@ #### options: -# Use --with/--without modular_x to rebuild with/without modular X deps +# --with/--without options: +# modular_x: rebuild with modular X deps +# opengl_wrapper: use Fedora OpenGL wrapper +# SDL: use SDL instead of X11 directly #### default options: %if %{?fedora}%{!?fedora:5} < 5 @@ -22,13 +25,17 @@ %define _libcurl_devel 0 %endif +# don't build with SDL by default because of display resolution setting +# problems +%bcond_with SDL + %define desktop_vendor fedora #define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag Version: 2.0.12 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 Group: Amusements/Games URL: http://bzflag.org @@ -51,7 +58,9 @@ BuildRequires: libGLU-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils +%if %{with SDL} BuildRequires: SDL-devel +%endif BuildRequires: ncurses-devel %if %_libcurl_devel BuildRequires: libcurl-devel @@ -90,6 +99,9 @@ CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing' LDFLAGS='-pie' %configure \ +%if ! %{with SDL} + --without-SDL \ +%endif --enable-optimized \ --enable-shared make %{?_smp_mflags} @@ -134,6 +146,9 @@ %{_mandir}/man*/* %changelog +* Wed Jul 08 2008 Nils Philippsen 2.0.12-2 +- build without SDL (#426011) + * Tue Jul 08 2008 Nils Philippsen 2.0.12-1 - version 2.0.12 - fix source URL From fedora-extras-commits at redhat.com Wed Jul 9 10:11:22 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 9 Jul 2008 10:11:22 GMT Subject: rpms/bzflag/F-8 bzflag.spec,1.40,1.41 Message-ID: <200807091011.m69ABMIM004847@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4740 Modified Files: bzflag.spec Log Message: build without SDL (#426011) Index: bzflag.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzflag/F-8/bzflag.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- bzflag.spec 8 Jul 2008 15:04:36 -0000 1.40 +++ bzflag.spec 9 Jul 2008 10:10:00 -0000 1.41 @@ -1,5 +1,8 @@ #### options: -# Use --with/--without modular_x to rebuild with/without modular X deps +# --with/--without options: +# modular_x: rebuild with modular X deps +# opengl_wrapper: use Fedora OpenGL wrapper +# SDL: use SDL instead of X11 directly #### default options: %if %{?fedora}%{!?fedora:5} < 5 @@ -22,13 +25,17 @@ %define _libcurl_devel 0 %endif +# don't build with SDL by default because of display resolution setting +# problems +%bcond_with SDL + %define desktop_vendor fedora #define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag Version: 2.0.12 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 Group: Amusements/Games URL: http://bzflag.org @@ -51,7 +58,9 @@ BuildRequires: libGLU-devel BuildRequires: gcc-c++ BuildRequires: desktop-file-utils +%if %{with SDL} BuildRequires: SDL-devel +%endif BuildRequires: ncurses-devel %if %_libcurl_devel BuildRequires: libcurl-devel @@ -90,6 +99,9 @@ CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing' LDFLAGS='-pie' %configure \ +%if ! %{with SDL} + --without-SDL \ +%endif --enable-optimized \ --enable-shared make %{?_smp_mflags} @@ -134,6 +146,9 @@ %{_mandir}/man*/* %changelog +* Wed Jul 08 2008 Nils Philippsen 2.0.12-2 +- build without SDL (#426011) + * Tue Jul 08 2008 Nils Philippsen 2.0.12-1 - version 2.0.12 - fix source URL From fedora-extras-commits at redhat.com Wed Jul 9 10:14:22 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 9 Jul 2008 10:14:22 GMT Subject: rpms/inkscape/devel inkscape-0.46+devel-desktop.patch, NONE, 1.1.2.1 inkscape-0.46+devel-icons.patch, NONE, 1.1.2.1 .cvsignore, 1.16, 1.16.2.1 inkscape.spec, 1.55, 1.55.2.1 sources, 1.16, 1.16.2.1 Message-ID: <200807091014.m69AEMTF004997@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4947 Modified Files: Tag: inkscape-0_47-devel .cvsignore inkscape.spec sources Added Files: Tag: inkscape-0_47-devel inkscape-0.46+devel-desktop.patch inkscape-0.46+devel-icons.patch Log Message: * Wed Jul 09 2008 Lubomir Rintel - 0.47-0.1.20080705svn - Subversion snapshot inkscape-0.46+devel-desktop.patch: --- NEW FILE inkscape-0.46+devel-desktop.patch --- inkscape.desktop: error: file contains multiple assignments of key "Name" --- inkscape-0.46+devel/inkscape.desktop.in.orig 2008-07-05 20:16:01.000000000 +0200 +++ inkscape-0.46+devel/inkscape.desktop.in 2008-07-05 20:17:06.000000000 +0200 @@ -1,7 +1,6 @@ [Desktop Entry] Version=1.0 Encoding=UTF-8 -Name=No name _Name=Inkscape Vector Graphics Editor _Comment=Create and edit Scalable Vector Graphics images Type=Application inkscape-0.46+devel-icons.patch: --- NEW FILE inkscape-0.46+devel-icons.patch --- Default to small icons and Sans font. Lubomir Rintel --- inkscape-0.46+devel/src/preferences-skeleton.h.icons 2008-06-24 13:38:52.000000000 +0200 +++ inkscape-0.46+devel/src/preferences-skeleton.h 2008-07-05 04:50:19.000000000 +0200 @@ -86,7 +86,7 @@ " \n" " \n" +" style=\"fill:black;fill-opacity:1;stroke:none;font-family:Sans;font-style:normal;font-weight:normal;font-size:40px;\" selcue=\"1\"/>\n" " \n" " \n" " \n" @@ -327,7 +327,7 @@ " \n" +" small=\"1\" />\n" " \n" "\n" " - 0.47-0.1.20080705svn +- Subversion snapshot + * Wed Jul 09 2008 Lubomir Rintel - 0.46-4 - Fix compile issues with newer gtk and poppler Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -r1.16 -r1.16.2.1 --- sources 25 Mar 2008 16:27:22 -0000 1.16 +++ sources 9 Jul 2008 10:13:28 -0000 1.16.2.1 @@ -1 +1 @@ -59997096c3640b2601c2b4afba8a3d75 inkscape-0.46.tar.bz2 +17af28857c3b07c08e87e0475c09d85c inkscape-0.46+devel.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 10:37:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 10:37:41 GMT Subject: rpms/perl-Class-Data-Inheritable/devel perl-Class-Data-Inheritable.spec, 1.8, 1.9 Message-ID: <200807091037.m69Abfl6005779@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5681/devel Modified Files: perl-Class-Data-Inheritable.spec Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 0.06-5 - Fix broken Source0-URL. Index: perl-Class-Data-Inheritable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel/perl-Class-Data-Inheritable.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Class-Data-Inheritable.spec 28 Feb 2008 13:01:38 -0000 1.8 +++ perl-Class-Data-Inheritable.spec 9 Jul 2008 10:35:21 -0000 1.9 @@ -1,11 +1,11 @@ Name: perl-Class-Data-Inheritable Version: 0.06 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Inheritable, overridable class data Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Data-Inheritable/ -Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Class-Data-Inheritable-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 0.06-5 +- Fix broken Source0-URL. + * Wed Feb 27 2008 Tom "spot" Callaway - 0.06-4 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Wed Jul 9 10:37:48 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 10:37:48 GMT Subject: rpms/perl-Class-Data-Inheritable/F-9 perl-Class-Data-Inheritable.spec, 1.8, 1.9 Message-ID: <200807091037.m69AbmJ9005782@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Data-Inheritable/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5681/F-9 Modified Files: perl-Class-Data-Inheritable.spec Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 0.06-5 - Fix broken Source0-URL. Index: perl-Class-Data-Inheritable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Data-Inheritable/F-9/perl-Class-Data-Inheritable.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Class-Data-Inheritable.spec 28 Feb 2008 13:01:38 -0000 1.8 +++ perl-Class-Data-Inheritable.spec 9 Jul 2008 10:36:12 -0000 1.9 @@ -1,11 +1,11 @@ Name: perl-Class-Data-Inheritable Version: 0.06 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Inheritable, overridable class data Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Data-Inheritable/ -Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Class-Data-Inheritable-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 0.06-5 +- Fix broken Source0-URL. + * Wed Feb 27 2008 Tom "spot" Callaway - 0.06-4 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Wed Jul 9 10:37:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 10:37:50 GMT Subject: rpms/perl-Class-Data-Inheritable/F-8 perl-Class-Data-Inheritable.spec, 1.6, 1.7 Message-ID: <200807091037.m69AboBs005787@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Data-Inheritable/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5681/F-8 Modified Files: perl-Class-Data-Inheritable.spec Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 0.06-5 - Fix broken Source0-URL. Index: perl-Class-Data-Inheritable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Data-Inheritable/F-8/perl-Class-Data-Inheritable.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-Data-Inheritable.spec 24 Aug 2007 19:36:06 -0000 1.6 +++ perl-Class-Data-Inheritable.spec 9 Jul 2008 10:36:48 -0000 1.7 @@ -1,11 +1,11 @@ Name: perl-Class-Data-Inheritable Version: 0.06 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Inheritable, overridable class data Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Data-Inheritable/ -Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Class-Data-Inheritable-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,15 @@ %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 0.06-5 +- Fix broken Source0-URL. + +* Wed Feb 27 2008 Tom "spot" Callaway - 0.06-4 +- Rebuild for perl 5.10 (again) + +* Mon Jan 14 2008 Tom "spot" Callaway 0.06-3 +- rebuild for new perl + * Fri Aug 24 2007 Tom "spot" Callaway 0.06-2 - license fix From fedora-extras-commits at redhat.com Wed Jul 9 10:41:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 10:41:19 GMT Subject: rpms/perl-Class-Data-Inheritable/devel .cvsignore, 1.5, 1.6 perl-Class-Data-Inheritable.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807091041.m69AfJTQ005989@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5927 Modified Files: .cvsignore perl-Class-Data-Inheritable.spec sources Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 0.08-1 - Upstream update. - BR: perl(Test::Pod), perl(Test::Pod::Coverage). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 17 Jan 2007 23:52:40 -0000 1.5 +++ .cvsignore 9 Jul 2008 10:40:21 -0000 1.6 @@ -1 +1 @@ -Class-Data-Inheritable-0.06.tar.gz +Class-Data-Inheritable-0.08.tar.gz Index: perl-Class-Data-Inheritable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel/perl-Class-Data-Inheritable.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Class-Data-Inheritable.spec 9 Jul 2008 10:35:21 -0000 1.9 +++ perl-Class-Data-Inheritable.spec 9 Jul 2008 10:40:21 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Class-Data-Inheritable -Version: 0.06 -Release: 5%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Inheritable, overridable class data Group: Development/Libraries License: GPL+ or Artistic @@ -12,6 +12,10 @@ BuildRequires: perl >= 1:5.6.1, perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# For improved tests +BuildRequires: perl(Test::Pod::Coverage) >= 1.00 +BuildRequires: perl(Test::Pod) >= 1.00 + %description Class::Data::Inheritable is for creating accessor/mutators to class data. That is, if you want to store something about your @@ -45,6 +49,10 @@ %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 0.08-1 +- Upstream update. +- BR: perl(Test::Pod), perl(Test::Pod::Coverage). + * Wed Jul 09 2008 Ralf Cors??pius - 0.06-5 - Fix broken Source0-URL. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 Jan 2007 23:52:40 -0000 1.5 +++ sources 9 Jul 2008 10:40:21 -0000 1.6 @@ -1 +1 @@ -86d95ee16854a5503dc9f86a2f2ffa83 Class-Data-Inheritable-0.06.tar.gz +fc0fe65926eb8fb932743559feb54eb9 Class-Data-Inheritable-0.08.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 10:58:21 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Wed, 9 Jul 2008 10:58:21 GMT Subject: rpms/xen/devel xen-ia64-hypercall-args.patch, NONE, 1.1 xen.spec, 1.219, 1.220 Message-ID: <200807091058.m69AwLk4006701@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/xen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6606 Modified Files: xen.spec Added Files: xen-ia64-hypercall-args.patch Log Message: Fix ia64 hypercalls xen-ia64-hypercall-args.patch: --- NEW FILE xen-ia64-hypercall-args.patch --- changeset: 17350:716a637722e4 user: Alex Williamson date: Mon Mar 10 11:55:40 2008 -0600 files: tools/libxc/ia64/xc_ia64_stubs.c description: [IA64] Remove bogus hypercall arg privcmd_hypercall_t only has 5 args. This causes a build failure with gcc-4.3. Fixes bugzilla #1186. Signed-off-by: Alex Williamson diff -r 7d300a1ea762 -r 716a637722e4 tools/libxc/ia64/xc_ia64_stubs.c --- a/tools/libxc/ia64/xc_ia64_stubs.c Mon Mar 10 11:52:25 2008 -0600 +++ b/tools/libxc/ia64/xc_ia64_stubs.c Mon Mar 10 11:55:40 2008 -0600 @@ -92,7 +92,6 @@ hypercall.arg[2] = dom; hypercall.arg[3] = (unsigned long)memmap_info; hypercall.arg[4] = flags; - hypercall.arg[5] = 0; if (lock_pages(memmap_info, sizeof(*memmap_info) + memmap_info->efi_memmap_size) != 0) { Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- xen.spec 27 Jun 2008 15:17:57 -0000 1.219 +++ xen.spec 9 Jul 2008 10:57:22 -0000 1.220 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.2.0 -%define base_release 15 +%define base_release 16 # Hypervisor ABI %define hv_abi 3.2 @@ -74,6 +74,7 @@ Patch16: xen-3.2.0-block-rw-range-check.patch Patch17: xen-3.2.0-qemu-evtchn-fd.patch Patch18: xen-qemu-logfile.patch +Patch19: xen-ia64-hypercall-args.patch Patch36: xen-qemu-bootmenu.patch Patch37: xen-pvfb-validate-fb.patch @@ -177,6 +178,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %patch36 -p1 @@ -464,6 +466,9 @@ %{_libdir}/*.a %changelog +* Wed Jul 9 2008 Daniel P. Berrange - 3.2.0-16.fc10 +- Remove bogus ia64 hypercall arg (rhbz #433921) + * Fri Jun 27 2008 Markus Armbruster - 3.2.0-15.fc10 - Re-enable QEMU image format auto-detection, without the security loopholes From fedora-extras-commits at redhat.com Wed Jul 9 10:59:45 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Wed, 9 Jul 2008 10:59:45 GMT Subject: rpms/xen/F-9 xen-ia64-hypercall-args.patch, NONE, 1.1 xen.spec, 1.217, 1.218 Message-ID: <200807091059.m69Axjaq006817@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/xen/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6730 Modified Files: xen.spec Added Files: xen-ia64-hypercall-args.patch Log Message: Fix ia64 hypercalls xen-ia64-hypercall-args.patch: --- NEW FILE xen-ia64-hypercall-args.patch --- changeset: 17350:716a637722e4 user: Alex Williamson date: Mon Mar 10 11:55:40 2008 -0600 files: tools/libxc/ia64/xc_ia64_stubs.c description: [IA64] Remove bogus hypercall arg privcmd_hypercall_t only has 5 args. This causes a build failure with gcc-4.3. Fixes bugzilla #1186. Signed-off-by: Alex Williamson diff -r 7d300a1ea762 -r 716a637722e4 tools/libxc/ia64/xc_ia64_stubs.c --- a/tools/libxc/ia64/xc_ia64_stubs.c Mon Mar 10 11:52:25 2008 -0600 +++ b/tools/libxc/ia64/xc_ia64_stubs.c Mon Mar 10 11:55:40 2008 -0600 @@ -92,7 +92,6 @@ hypercall.arg[2] = dom; hypercall.arg[3] = (unsigned long)memmap_info; hypercall.arg[4] = flags; - hypercall.arg[5] = 0; if (lock_pages(memmap_info, sizeof(*memmap_info) + memmap_info->efi_memmap_size) != 0) { Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-9/xen.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- xen.spec 27 Jun 2008 15:03:48 -0000 1.217 +++ xen.spec 9 Jul 2008 10:59:02 -0000 1.218 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.2.0 -%define base_release 13 +%define base_release 14 # Hypervisor ABI %define hv_abi 3.2 @@ -74,6 +74,7 @@ Patch16: xen-3.2.0-block-rw-range-check.patch Patch17: xen-3.2.0-qemu-evtchn-fd.patch Patch18: xen-qemu-logfile.patch +Patch19: xen-ia64-hypercall-args.patch Patch36: xen-qemu-bootmenu.patch @@ -178,6 +179,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %patch36 -p1 @@ -465,6 +467,9 @@ %{_libdir}/*.a %changelog +* Wed Jul 9 2008 Daniel P. Berrange - 3.2.0-14.fc9 +- Remove bogus ia64 hypercall arg (rhbz #433921) + * Fri Jun 27 2008 Markus Armbruster - 3.2.0-13.fc9 - Re-enable QEMU image format auto-detection, without the security loopholes From fedora-extras-commits at redhat.com Wed Jul 9 11:08:08 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal)) Date: Wed, 9 Jul 2008 11:08:08 GMT Subject: rpms/perl/devel perl.spec,1.176,1.177 Message-ID: <200807091108.m69B88XP013872@cvs-int.fedora.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814 Modified Files: perl.spec Log Message: - remove db4 require, it is handled automatically Index: perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- perl.spec 4 Jul 2008 15:09:52 -0000 1.176 +++ perl.spec 9 Jul 2008 11:07:20 -0000 1.177 @@ -5,13 +5,9 @@ %define multilib_64_archs x86_64 s390x ppc64 sparc64 -%define db4_major %(grep "DB_VERSION_MAJOR" /usr/include/db.h | cut -f3) -%define db4_minor %(grep "DB_VERSION_MINOR" /usr/include/db.h | cut -f3) -%define db4_patch %(grep "DB_VERSION_PATCH" /usr/include/db.h | cut -f3) - Name: perl Version: %{perl_version} -Release: 34%{?dist} +Release: 35%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -154,7 +150,6 @@ Obsoletes: perl-TAP-Harness < 3.10 Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release} -Requires: db4 = %{db4_major}.%{db4_minor}.%{db4_patch} # We need this to break the dependency loop, and ensure that perl-libs # gets installed before perl. @@ -1632,6 +1627,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Wed Jul 9 2008 Stepan Kasal 4:5.10.0-35 +- remove db4 require, it is handled automatically + * Thu Jul 3 2008 Stepan Kasal 4:5.10.0-34 - 453646 use -DPERL_USE_SAFE_PUTENV. Without fail some modules f.e. readline. From fedora-extras-commits at redhat.com Wed Jul 9 11:15:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 11:15:01 GMT Subject: rpms/perl-ExtUtils-PkgConfig/devel .cvsignore, 1.4, 1.5 perl-ExtUtils-PkgConfig.spec, 1.14, 1.15 sources, 1.4, 1.5 Message-ID: <200807091115.m69BF1sV014295@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14247 Modified Files: .cvsignore perl-ExtUtils-PkgConfig.spec sources Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 1.11-1 - Upstream update. - Reflect Source0-URL having changed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Nov 2007 21:39:37 -0000 1.4 +++ .cvsignore 9 Jul 2008 11:14:03 -0000 1.5 @@ -1 +1 @@ -ExtUtils-PkgConfig-1.08.tar.gz +ExtUtils-PkgConfig-1.11.tar.gz Index: perl-ExtUtils-PkgConfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel/perl-ExtUtils-PkgConfig.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-ExtUtils-PkgConfig.spec 2 Feb 2008 18:44:48 -0000 1.14 +++ perl-ExtUtils-PkgConfig.spec 9 Jul 2008 11:14:03 -0000 1.15 @@ -1,12 +1,12 @@ Name: perl-ExtUtils-PkgConfig -Version: 1.08 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Simplistic interface to pkg-config Group: Development/Libraries License: LGPLv2+ URL: http://search.cpan.org/dist/ExtUtils-PkgConfig/ -Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/ExtUtils-PkgConfig-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/ExtUtils-PkgConfig-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -59,6 +59,10 @@ %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 1.11-1 +- Upstream update. +- Reflect Source0-URL having changed. + * Sat Feb 2 2008 Tom "spot" Callaway - 1.08-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Nov 2007 21:39:37 -0000 1.4 +++ sources 9 Jul 2008 11:14:03 -0000 1.5 @@ -1 +1 @@ -7bd9e8a7b1f0c624281b4eb0acc90384 ExtUtils-PkgConfig-1.08.tar.gz +cd68998c1f370d6c48042447f76ede9f ExtUtils-PkgConfig-1.11.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 11:41:52 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 11:41:52 GMT Subject: rpms/xscreensaver/devel xscreensaver-5.05.90-lockscreen-version.patch, NONE, 1.1 xscreensaver-randr-patch-3-fix-jwz.patch, NONE, 1.1 xscreensaver-randr-patch-3.txt, NONE, 1.1 xscreensaver.spec, 1.69, 1.70 xscreensaver-5.05-addopts-jwz.patch, 1.1, NONE xscreensaver-5.05-fix-compile.patch, 1.1, NONE Message-ID: <200807091141.m69BfqcA015767@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15696 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.05.90-lockscreen-version.patch xscreensaver-randr-patch-3-fix-jwz.patch xscreensaver-randr-patch-3.txt Removed Files: xscreensaver-5.05-addopts-jwz.patch xscreensaver-5.05-fix-compile.patch Log Message: * Wed Jul 9 2008 Mamoru Tasaka - 1:5.05.90.3-3 - Apply a experimental randr 1.2 patch by jwz xscreensaver-5.05.90-lockscreen-version.patch: --- NEW FILE xscreensaver-5.05.90-lockscreen-version.patch --- --- xscreensaver-5.05/driver/xscreensaver.c.tmpver 2008-07-09 16:07:25.000000000 +0900 +++ xscreensaver-5.05/driver/xscreensaver.c 2008-07-09 16:36:33.000000000 +0900 @@ -440,6 +440,7 @@ static void set_version_string (saver_info *si, int *argc, char **argv) { + int len; progclass = "XScreenSaver"; /* progname is reset later, after we connect to X. */ @@ -457,9 +458,14 @@ *s = '_'; } - si->version = (char *) malloc (5); - memcpy (si->version, screensaver_id + 17, 4); - si->version [4] = 0; + len = strlen(screensaver_id); + si->version = (char *) malloc (len - 16); + memcpy (si->version, screensaver_id + 17, len - 17); + si->version[len - 17] = 0; + { + char *str = strstr(si->version, "("); + if (str) *str = 0; + } } xscreensaver-randr-patch-3-fix-jwz.patch: --- NEW FILE xscreensaver-randr-patch-3-fix-jwz.patch --- From: Jamie Zawinski To: Mamoru Tasaka Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Subject: Re: xscreensaver and RANDR Mime-Version: 1.0 (Apple Message framework v926) Date: Tue, 8 Jul 2008 23:03:34 -0700 On Jul 8, 2008, at 12:40 AM, Mamoru Tasaka wrote: > Rawhide: > This repository is generally aimed for developers and very keen > testers only. > Actually on this repository many announcements are sent such as "new > feature on this package will be introduced. please test it and give > me feedback!!" like Sure, go ahead and post builds to Rawhide. (Maybe change utils/ version.h to "5.06alpha" first?) I guess I'd like to see an announcement like: Please test out this alpha version of xscreensaver. There are extensive changes and it may be very unstable! Please see http://jwz.livejournal.com/908354.html for details about the things that need to be tested. In particular, stress-testing on Xinerama, RANDR and VidMode ViewPort-zoomed systems would be greatly appreciated. Also: after applying http://www.jwz.org/xscreensaver/xscreensaver-randr-patch-3.txt please also apply this: diff -u -r1.92 lock.c --- lock.c 8 Jul 2008 05:22:46 -0000 1.92 +++ lock.c 9 Jul 2008 05:47:40 -0000 @@ -1524,7 +1524,7 @@ if (!XF86VidModeQueryExtension (si->dpy, &event, &error)) return; - for (screen = 0; real_nscreens; screen++) + for (screen = 0; screen < real_nscreens; screen++) { saver_screen_info *ssi = &si->screens[screen]; int x, y; Thanks! -- Jamie Zawinski jwz at jwz.org http://www.jwz.org/ jwz at dnalounge.com http://www.dnalounge.com/ http://jwz.livejournal.com/ --- NEW FILE xscreensaver-randr-patch-3.txt --- Please see http://jwz.livejournal.com/908354.html Apply this patch with: cd xscreensaver-5.05 patch -p1 < ../xscreensaver-randr-patch-3.txt Thanks! --- xscreensaver-5.05/config.h.in 2008-02-28 19:56:36.000000000 -0800 +++ xscreensaver/config.h.in 2008-07-01 10:26:31.000000000 -0700 @@ -234,6 +234,9 @@ available if the file /usr/include/X11/extensions/Xrandr.h exists.) */ #undef HAVE_RANDR +/* Define this if the RANDR library is version 1.2 or newer. */ +#undef HAVE_RANDR_12 + /* Define this if you have the XReadDisplay extension (I think this is an SGI-only thing; it's in .) A few of the screenhacks will take advantage of this if it's available. */ --- xscreensaver-5.05/configure 2008-03-01 21:34:45.000000000 -0800 +++ xscreensaver/configure 2008-07-05 19:26:55.000000000 -0700 @@ -2060,6 +2060,9 @@ + + + # After checking to see that --srcdir is correct (which AC_INIT does) # check for some random other files that come later in the tar file, # to make sure everything is here. @@ -2096,6 +2099,10 @@ +# Need to disable Objective C extensions in ANSI C on MacOS X to work +# around an Apple-specific gcc bug. +# + ############################################################################### # @@ -2124,18 +2131,6 @@ ############################################################################### # -# Function to figure out how to turn off Objective C on MacOS X. -# (We have to do this to work around an Apple-specific gcc bug.) -# -############################################################################### - - - - - - -############################################################################### -# # Function to figure out how to create directory trees. # ############################################################################### @@ -3455,6 +3450,7 @@ ac_cv_gcc_accepts_no_overlength=no else ac_cv_gcc_accepts_no_overlength=yes + CC="$CC -Wno-overlength-strings" fi fi { echo "$as_me:$LINENO: result: $ac_cv_gcc_accepts_no_overlength" >&5 @@ -3475,6 +3471,7 @@ ac_cv_gcc_accepts_no_decl_after=no else ac_cv_gcc_accepts_no_decl_after=yes + CC="$CC -Wdeclaration-after-statement" fi fi { echo "$as_me:$LINENO: result: $ac_cv_gcc_accepts_no_decl_after" >&5 @@ -3483,7 +3480,6 @@ fi if test -n "$GCC"; then - if test -n "$GCC"; then { echo "$as_me:$LINENO: checking whether gcc accepts -no-cpp-precomp" >&5 echo $ECHO_N "checking whether gcc accepts -no-cpp-precomp... $ECHO_C" >&6; } if test "${ac_cv_gcc_accepts_no_cpp_precomp+set}" = set; then @@ -3496,6 +3492,7 @@ ac_cv_gcc_accepts_no_cpp_precomp=no else ac_cv_gcc_accepts_no_cpp_precomp=yes + CC="$CC -no-cpp-precomp" fi fi { echo "$as_me:$LINENO: result: $ac_cv_gcc_accepts_no_cpp_precomp" >&5 @@ -3503,13 +3500,6 @@ ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" fi - if test "$ac_gcc_accepts_no_cpp_precomp" = yes ; then - { echo "$as_me:$LINENO: result: Disabling Objective C extensions in ANSI C code." >&5 -echo "${ECHO_T}Disabling Objective C extensions in ANSI C code." >&6; } - CC="$CC -no-cpp-precomp" - fi - fi - if test -n "$GCC"; then if test -n "$GCC"; then { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5 @@ -3524,6 +3514,7 @@ ac_cv_gcc_accepts_std=no else ac_cv_gcc_accepts_std=yes + CC="$CC -std=c89" fi fi { echo "$as_me:$LINENO: result: $ac_cv_gcc_accepts_std" >&5 @@ -3552,7 +3543,8 @@ # before they were in the ANSI C 99 spec... (gcc 2.96 permits // # with -std=gnu89 but not with -std=c89.) # - CC="$CC -std=c89 -U__STRICT_ANSI__" + # $CC already contains "-std=c89" via AC_GCC_ACCEPTS_STD + CC="$CC -U__STRICT_ANSI__" else # The old way: CC="$CC -Wp,-lang-c89" @@ -12140,7 +12132,7 @@ if test "$with_randr" = yes; then - # first check for Randr.h + # first check for Xrandr.h ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -12489,7 +12481,103 @@ #define HAVE_RANDR 1 _ACEOF + + # Now check for version 1.2 in the same libs. + + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" + + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { echo "$as_me:$LINENO: checking for XRRGetOutputInfo in -lc" >&5 +echo $ECHO_N "checking for XRRGetOutputInfo in -lc... $ECHO_C" >&6; } +if test "${ac_cv_lib_c_XRRGetOutputInfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $SAVER_LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XRRGetOutputInfo (); +int +main () +{ +return XRRGetOutputInfo (); + ; + return 0; +} +_ACEOF +rm -rf conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? [...3918 lines suppressed...] while (1) { @@ -1342,12 +1117,15 @@ } } - kill_screenhack (si); + for (i = 0; i < si->nscreens; i++) + kill_screenhack (&si->screens[i]); - if (!si->throttled_p) - spawn_screenhack (si, True); - else if (p->verbose_p) + raise_window (si, True, True, False); + if (si->throttled_p) fprintf (stderr, "%s: not launching hack (throttled.)\n", blurb()); + else + for (i = 0; i < si->nscreens; i++) + spawn_screenhack (&si->screens[i]); /* Don't start the cycle timer in demo mode. */ if (!si->demoing_p && p->cycle) @@ -1418,14 +1196,16 @@ was_locked = True; si->dbox_up_p = True; - suspend_screenhack (si, True); + for (i = 0; i < si->nscreens; i++) + suspend_screenhack (&si->screens[i], True); /* suspend */ XUndefineCursor (si->dpy, ssi->screensaver_window); ok_to_unblank = unlock_p (si); si->dbox_up_p = False; XDefineCursor (si->dpy, ssi->screensaver_window, ssi->cursor); - suspend_screenhack (si, False); /* resume */ + for (i = 0; i < si->nscreens; i++) + suspend_screenhack (&si->screens[i], False); /* resume */ if (!ok_to_unblank && !screenhack_running_p (si)) @@ -1451,7 +1231,8 @@ blurb(), timestring ()); /* Kill before unblanking, to stop drawing as soon as possible. */ - kill_screenhack (si); + for (i = 0; i < si->nscreens; i++) + kill_screenhack (&si->screens[i]); unblank_screen (si); set_locked_p (si, False); @@ -1530,6 +1311,7 @@ shell = connect_to_server (si, &argc, argv); process_command_line (si, &argc, argv); + stderr_log_file (si); print_banner (si); load_init_file(si->dpy, p); /* must be before initialize_per_screen_info() */ @@ -1951,8 +1733,10 @@ "exiting."); if (! until_idle_p) { + int i; + for (i = 0; i < si->nscreens; i++) + kill_screenhack (&si->screens[i]); unblank_screen (si); - kill_screenhack (si); XSync (si->dpy, False); } saver_exit (si, 0, 0); @@ -1974,8 +1758,10 @@ "restarting."); if (! until_idle_p) { + int i; + for (i = 0; i < si->nscreens; i++) + kill_screenhack (&si->screens[i]); unblank_screen (si); - kill_screenhack (si); XSync (si->dpy, False); } @@ -2254,17 +2040,15 @@ # else False # endif + }, { "DRI", "DRI", + True }, { "Apple-DRI", "Apple-DRI (XDarwin)", True }, }; - fprintf (stderr, "%s: running on display \"%s\" (%d %sscreen%s).\n", - blurb(), - DisplayString(si->dpy), - si->nscreens, - (si->xinerama_p ? "Xinerama " : ""), - (si->nscreens == 1 ? "" : "s")); + fprintf (stderr, "%s: running on display \"%s\"\n", blurb(), + DisplayString(si->dpy)); fprintf (stderr, "%s: vendor is %s, %d.\n", blurb(), ServerVendor(si->dpy), VendorRelease(si->dpy)); @@ -2324,21 +2108,10 @@ } } - if (si->xinerama_p) - { - fprintf (stderr, "%s: Xinerama layout:\n", blurb()); - for (i = 0; i < si->nscreens; i++) - { - saver_screen_info *ssi = &si->screens[i]; - fprintf (stderr, "%s: %c %d/%d: %dx%d+%d+%d\n", - blurb(), - (ssi->real_screen_p ? '+' : ' '), - ssi->number, ssi->real_screen_number, - ssi->width, ssi->height, ssi->x, ssi->y); - } - } + describe_monitor_layout (si); } + Bool display_is_on_console_p (saver_info *si) { diff -ur --unidirectional-new-file --exclude '*.o' --exclude '*.bak' --exclude CVS --exclude '*~' --exclude '.*' --exclude Makefile --exclude XScreenSaver.ad --exclude '*.patch' --exclude '*.man' --exclude '*.desktop' xscreensaver-5.05/driver/xscreensaver.h xscreensaver/driver/xscreensaver.h --- xscreensaver-5.05/driver/xscreensaver.h 2007-03-15 01:23:38.000000000 -0700 +++ xscreensaver/driver/xscreensaver.h 2008-07-05 05:48:11.000000000 -0700 @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski +/* xscreensaver, Copyright (c) 1993-2008 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -67,7 +67,10 @@ blanking ======================================================================= */ +extern Bool update_screen_layout (saver_info *si); extern void initialize_screensaver_window (saver_info *si); +extern void initialize_screen_root_widget (saver_screen_info *ssi); + extern void raise_window (saver_info *si, Bool inhibit_fade, Bool between_hacks_p, Bool dont_clear); @@ -156,12 +159,12 @@ #endif /* !HAVE_SIGACTION */ extern void unblock_sigchld (void); extern void hack_environment (saver_info *si); -extern void hack_subproc_environment (saver_screen_info *ssi); +extern void hack_subproc_environment (Screen *, Window saver_window); extern void init_sigchld (void); -extern void spawn_screenhack (saver_info *si, Bool first_time_p); +extern void spawn_screenhack (saver_screen_info *ssi); extern pid_t fork_and_exec (saver_screen_info *ssi, const char *command); -extern void kill_screenhack (saver_info *si); -extern void suspend_screenhack (saver_info *si, Bool suspend_p); +extern void kill_screenhack (saver_screen_info *ssi); +extern void suspend_screenhack (saver_screen_info *ssi, Bool suspend_p); extern Bool screenhack_running_p (saver_info *si); extern void emergency_kill_subproc (saver_info *si); extern Bool select_visual (saver_screen_info *ssi, const char *visual_name); @@ -174,6 +177,7 @@ extern FILE *real_stderr; extern FILE *real_stdout; +extern void stderr_log_file (saver_info *si); extern void initialize_stderr (saver_info *si); extern void reset_stderr (saver_screen_info *ssi); extern void clear_stderr (saver_screen_info *ssi); @@ -194,8 +198,13 @@ extern Bool window_exists_p (Display *dpy, Window window); extern char *timestring (void); extern Bool display_is_on_console_p (saver_info *si); -extern Visual *get_best_gl_visual (saver_screen_info *ssi); +extern Visual *get_best_gl_visual (saver_info *si, Screen *screen); extern void check_for_leaks (const char *where); +extern void describe_monitor_layout (saver_info *si); + +#ifdef HAVE_XF86VMODE +Bool safe_XF86VidModeGetViewPort (Display *, int, int *, int *); +#endif /* HAVE_XF86VMODE */ extern Atom XA_VROOT, XA_XSETROOT_ID, XA_ESETROOT_PMAP_ID, XA_XROOTPMAP_ID; extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID; --- xscreensaver-5.05/hacks/screenhack.c 2008-03-01 14:19:01.000000000 -0800 +++ xscreensaver/hacks/screenhack.c 2008-07-07 10:45:40.000000000 -0700 @@ -882,6 +882,8 @@ window = VirtualRootWindowOfScreen (XtScreen (toplevel)); XtDestroyWidget (toplevel); XGetWindowAttributes (dpy, window, &xgwa); + /* With RANDR, the root window can resize! */ + XSelectInput (dpy, window, xgwa.your_event_mask | StructureNotifyMask); visual_warning (xgwa.screen, window, xgwa.visual, xgwa.colormap, False); } else Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- xscreensaver.spec 31 May 2008 17:33:34 -0000 1.69 +++ xscreensaver.spec 9 Jul 2008 11:41:01 -0000 1.70 @@ -1,11 +1,11 @@ %define name xscreensaver -%define version 5.05 +%define mainversion 5.05 %define beta_ver %{nil} %define modular_conf 1 -%define fedora_rel 4 +%define fedora_rel 3 %define extrarel %{nil} @@ -20,21 +20,23 @@ Summary: X screen saver and locker Name: %{name} -Version: %{version} +Version: %{mainversion}.90.3 Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: BSD Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ -Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz +Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz %if %{modular_conf} Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch3: xscreensaver-5.05-addopts-jwz.patch -Patch4: xscreensaver-5.05-fix-compile.patch +#Patch3: xscreensaver-5.05-addopts-jwz.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch Patch22: xscreensaver-5.05-penetrate-font.patch +Patch23: xscreensaver-5.05.90-lockscreen-version.patch +Patch100: http://www.jwz.org/xscreensaver/xscreensaver-randr-patch-3.txt +Patch101: xscreensaver-randr-patch-3-fix-jwz.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -172,13 +174,17 @@ %prep -%setup -q -n %{name}-%{version}%{?beta_ver} +%setup -q -n %{name}-%{mainversion}%{?beta_ver} %patch1 -p1 -b .sanitize-hacks -%patch3 -p1 -b .opts -%patch4 -p1 -b .compile +#%%patch3 -p1 -b .opts +%patch100 -p1 -b .jwz +cd driver +%patch101 -p0 -b .jwz2 +cd .. %patch21 -p1 -b .nonet %patch22 -p1 -b .font +%patch23 -p1 -b .tmpver change_option(){ set +x @@ -350,7 +356,7 @@ make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install -desktop-file-install --vendor gnome --delete-original \ +desktop-file-install --vendor "" --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ --add-category DesktopSettings \ @@ -379,7 +385,7 @@ # Generate three lists of files for the three packages. # -dd=%{_builddir}/%{name}-%{version}%{?beta_ver} +dd=%{_builddir}/%{name}-%{mainversion}%{?beta_ver} # In case rpm -bi --short-circuit is tried multiple times: rm -f $dd/*.files @@ -564,6 +570,9 @@ %defattr(-,root,root,-) %changelog +* Wed Jul 9 2008 Mamoru Tasaka - 1:5.05.90.3-3 +- Apply a experimental randr 1.2 patch by jwz + * Mon Jun 1 2008 Mamoru Tasaka - 1:5.05-4 - Fix compilation error with GLib 2.17+ --- xscreensaver-5.05-addopts-jwz.patch DELETED --- --- xscreensaver-5.05-fix-compile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 12:02:18 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 9 Jul 2008 12:02:18 GMT Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.15, 1.16 import.log, 1.1, 1.2 ocaml-libvirt.spec, 1.23, 1.24 sources, 1.15, 1.16 Message-ID: <200807091202.m69C2ILI023181@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23131/devel Modified Files: .cvsignore import.log ocaml-libvirt.spec sources Log Message: * Wed Jul 9 2008 Richard W.M. Jones - 0.4.4.2-1 - New upstream version. - In upstream, 'make install' became 'make install-byte' or 'make install-opt' Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 10 Jun 2008 12:01:31 -0000 1.15 +++ .cvsignore 9 Jul 2008 12:01:31 -0000 1.16 @@ -1 +1 @@ -ocaml-libvirt-0.4.2.4.tar.gz +ocaml-libvirt-0.4.4.2.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jun 2008 12:01:31 -0000 1.1 +++ import.log 9 Jul 2008 12:01:31 -0000 1.2 @@ -1 +1,2 @@ ocaml-libvirt-0_4_2_4-1_fc8:HEAD:ocaml-libvirt-0.4.2.4-1.fc8.src.rpm:1213098967 +ocaml-libvirt-0_4_4_2-1_fc10:HEAD:ocaml-libvirt-0.4.4.2-1.fc10.src.rpm:1215604835 Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ocaml-libvirt.spec 10 Jun 2008 12:01:31 -0000 1.23 +++ ocaml-libvirt.spec 9 Jul 2008 12:01:31 -0000 1.24 @@ -5,7 +5,7 @@ %define build_mlvirsh 1 Name: ocaml-libvirt -Version: 0.4.2.4 +Version: 0.4.4.2 Release: 1%{?dist} Summary: OCaml binding for libvirt @@ -74,7 +74,11 @@ export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs mkdir -p $RPM_BUILD_ROOT%{_bindir} -make install +%if %opt +make install-opt +%else +make install-byte +%endif %if !%build_mlvirsh rm -f $RPM_BUILD_ROOT%{_bindir}/mlvirsh @@ -119,6 +123,10 @@ %changelog +* Wed Jul 9 2008 Richard W.M. Jones - 0.4.4.2-1 +- New upstream version. +- In upstream, 'make install' became 'make install-byte' or 'make install-opt' + * Tue Jun 10 2008 Richard W.M. Jones - 0.4.2.4-1 - New upstream version. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 10 Jun 2008 12:01:31 -0000 1.15 +++ sources 9 Jul 2008 12:01:31 -0000 1.16 @@ -1 +1 @@ -58144105f08dddfb55d3d929d6ed33c7 ocaml-libvirt-0.4.2.4.tar.gz +f903edd5827eff48835c0d1896cd9962 ocaml-libvirt-0.4.4.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 12:17:31 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Wed, 9 Jul 2008 12:17:31 GMT Subject: rpms/sugar-presence-service/F-9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-presence-service.spec, 1.5, 1.6 Message-ID: <200807091217.m69CHVjL023793@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/sugar-presence-service/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738 Modified Files: .cvsignore sources sugar-presence-service.spec Log Message: Update to 0.81.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Jun 2008 15:30:04 -0000 1.5 +++ .cvsignore 9 Jul 2008 12:16:43 -0000 1.6 @@ -1 +1 @@ -sugar-presence-service-0.81.2.tar.bz2 +sugar-presence-service-0.81.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Jun 2008 15:30:04 -0000 1.5 +++ sources 9 Jul 2008 12:16:43 -0000 1.6 @@ -1 +1 @@ -d17ad9e5d18837c48cdd3c901453f0f4 sugar-presence-service-0.81.2.tar.bz2 +93bfa6c91d3a672d011b737f0e4ff384 sugar-presence-service-0.81.3.tar.bz2 Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/F-9/sugar-presence-service.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sugar-presence-service.spec 21 Jun 2008 15:30:04 -0000 1.5 +++ sugar-presence-service.spec 9 Jul 2008 12:16:43 -0000 1.6 @@ -2,7 +2,7 @@ %define commitid 76984f3f28 Name: sugar-presence-service -Version: 0.81.2 +Version: 0.81.3 Release: 1%{?dist} Summary: The Sugar presence service @@ -20,6 +20,8 @@ Requires: python-telepathy >= 0.14.0 Requires: dbus-python >= 0.82.0 +Requires: telepathy-gabble +Requires: telepathy-salut %description The Sugar presence service. @@ -46,6 +48,10 @@ %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service %changelog +* Wed Jul 9 2008 Morgan Collett - 0.81.3-1 +- Update to 0.81.3 +- Add Requires for telepathy gabble and salut + * Sat Jun 21 2008 Morgan Collett - 0.81.2-1 - Update to 0.81.2 From fedora-extras-commits at redhat.com Wed Jul 9 12:28:27 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 9 Jul 2008 12:28:27 GMT Subject: rpms/pam/devel .cvsignore, 1.49, 1.50 pam.spec, 1.181, 1.182 sources, 1.51, 1.52 db-4.6.18-glibc.patch, 1.1, NONE Message-ID: <200807091228.m69CSRDs024293@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24235 Modified Files: .cvsignore pam.spec sources Removed Files: db-4.6.18-glibc.patch Log Message: * Wed Jul 9 2008 Tomas Mraz 1.0.1-5 - update internal db4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 18 Apr 2008 08:43:42 -0000 1.49 +++ .cvsignore 9 Jul 2008 12:27:35 -0000 1.50 @@ -1,5 +1,5 @@ *.src.rpm *.tar.bz2 pam-redhat-0.99.9-1.tar.bz2 -db-4.6.21.tar.gz Linux-PAM-1.0.1.tar.bz2 +db-4.7.25.tar.gz Index: pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- pam.spec 21 May 2008 08:08:39 -0000 1.181 +++ pam.spec 9 Jul 2008 12:27:35 -0000 1.182 @@ -1,18 +1,18 @@ -%define db_version 4.6.21 -%define db_conflicting_version 4.7.0 +%define db_version 4.7.25 +%define db_conflicting_version 4.8.0 %define pam_redhat_version 0.99.9-1 Summary: A security tool which provides authentication for applications Name: pam Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, # pam_rhosts_auth module is BSD with advertising License: BSD and GPLv2+ and BSD with advertising Group: System Environment/Base -Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 -Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2.sign +Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2 +Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign Source2: https://fedorahosted.org/releases/p/a/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2 Source4: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz Source5: other.pamd @@ -23,7 +23,6 @@ Source10: config-util.5 Source11: 90-nproc.conf Patch1: pam-0.99.7.0-redhat-modules.patch -Patch2: db-4.6.18-glibc.patch Patch4: pam-0.99.8.1-dbpam.patch Patch5: pam-1.0.1-autoreconf.patch Patch10: pam-1.0.0-sepermit-screensaver.patch @@ -102,9 +101,6 @@ mv pam-redhat-%{pam_redhat_version}/* modules %patch1 -p1 -b .redhat-modules -pushd db-%{db_version} -%patch2 -p1 -b .db4-glibc -popd %patch4 -p1 -b .dbpam %patch5 -p1 -b .autoreconf %patch10 -p1 -b .screensaver @@ -384,6 +380,9 @@ %doc doc/adg/*.txt doc/adg/html %changelog +* Wed Jul 9 2008 Tomas Mraz 1.0.1-5 +- update internal db4 + * Wed May 21 2008 Tomas Mraz 1.0.1-4 - pam_namespace: allow safe creation of directories owned by user (#437116) - pam_unix: fix multiple error prompts on password change (#443872) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 18 Apr 2008 08:43:42 -0000 1.51 +++ sources 9 Jul 2008 12:27:35 -0000 1.52 @@ -1,3 +1,3 @@ 26152d9c691715756b514dbf9cab9cd8 pam-redhat-0.99.9-1.tar.bz2 -718082e7e35fc48478a2334b0bc4cd11 db-4.6.21.tar.gz 1c75f81bd44c5da93014992820917847 Linux-PAM-1.0.1.tar.bz2 +ec2b87e833779681a0c3a814aa71359e db-4.7.25.tar.gz --- db-4.6.18-glibc.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 12:28:56 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Wed, 9 Jul 2008 12:28:56 GMT Subject: rpms/sugar/F-9 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 sugar.spec, 1.20, 1.21 Message-ID: <200807091228.m69CSua5024320@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24250 Modified Files: .cvsignore sources sugar.spec Log Message: * Wed Jul 09 2008 Simon Schampijer - 0.81.6-2.20080709git8f4819a62e - git snapshot - 7430 Preserve the favorites layout across reboots - 7434 Add power section to the control panel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 9 Jul 2008 07:58:26 -0000 1.12 +++ .cvsignore 9 Jul 2008 12:28:02 -0000 1.13 @@ -1 +1 @@ -sugar-0.81.6.tar.bz2 +sugar-0.81.6-git8f4819a62e.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 9 Jul 2008 07:58:26 -0000 1.13 +++ sources 9 Jul 2008 12:28:02 -0000 1.14 @@ -1 +1 @@ -672a3a84fabca8615bbd731f7ade3645 sugar-0.81.6.tar.bz2 +524b8399288e8fd84b582bc781cef963 sugar-0.81.6-git8f4819a62e.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/sugar.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sugar.spec 9 Jul 2008 07:58:26 -0000 1.20 +++ sugar.spec 9 Jul 2008 12:28:02 -0000 1.21 @@ -1,9 +1,17 @@ +%define commitid 8f4819a62e +%define alphatag 20080709git%{commitid} + Summary: OLPC desktop environment Name: sugar Version: 0.81.6 -Release: 1%{?dist} +#Release: 1%{?dist} +Release: 2.%{alphatag}%{?dist} URL: http://dev.laptop.org -Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +# git clone git://dev.laptop.org/sugar +# cd sugar +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +#Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 License: GPL/LGPL Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,6 +78,11 @@ %{_datadir}/mime/packages/sugar.xml %changelog +* Wed Jul 09 2008 Simon Schampijer - 0.81.6-2.20080709git8f4819a62e +- git snapshot +- 7430 Preserve the favorites layout across reboots +- 7434 Add power section to the control panel + * Wed Jul 09 2008 Simon Schampijer - 0.81.6-1 - 7438 sugar shuts down when you click Restart - 7365 Invites not working From fedora-extras-commits at redhat.com Wed Jul 9 12:37:58 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 9 Jul 2008 12:37:58 GMT Subject: rpms/openoffice.org/F-9 openoffice.org.spec,1.1499,1.1500 Message-ID: <200807091237.m69Cbwa4024889@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24823 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#452385 add postgress-jdbc to default classpath Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v retrieving revision 1.1499 retrieving revision 1.1500 diff -u -r1.1499 -r1.1500 --- openoffice.org.spec 7 Jul 2008 13:20:29 -0000 1.1499 +++ openoffice.org.spec 9 Jul 2008 12:37:10 -0000 1.1500 @@ -220,6 +220,7 @@ Summary: Database frontend for %{name} Group: Development/Libraries Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: postgresql-jdbc Obsoletes: openoffice.org2-base %description base @@ -1697,6 +1698,8 @@ cp -r psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{instdir}/share/psprint/driver/SGENPRT.PS %endif +sed -i -e "s#UNO_JAVA_JFW_CLASSPATH_URLS.*#& file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{instdir}/program/jvmfwk3rc + %clean rm -rf $RPM_BUILD_ROOT @@ -2940,6 +2943,7 @@ - Resolves: rhbz#452376 update Serbian translations - Resolves: rhbz#452379 extend Serbian translations - Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +- Resolves: rhbz#452385 add postgress-jdbc to default classpath * Fri Jun 13 2008 Caolan McNamara - 1:2.4.1-17.4 - Resolves: rhbz#451485 fix vertical glyphs From fedora-extras-commits at redhat.com Wed Jul 9 12:39:57 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Wed, 9 Jul 2008 12:39:57 GMT Subject: rpms/sugar-toolkit/F-9 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 sugar-toolkit.spec, 1.11, 1.12 Message-ID: <200807091239.m69Cdvpw025049@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006 Modified Files: .cvsignore sources sugar-toolkit.spec Log Message: * Wed Jul 09 2008 Simon Schampijer - 0.81.6-2.20080709git92ef9d298a - git snapshot - 7430 Preserve the favorites layout across reboots - 7434 Add power section to the control panel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Jul 2008 08:04:19 -0000 1.8 +++ .cvsignore 9 Jul 2008 12:39:11 -0000 1.9 @@ -1 +1 @@ -sugar-toolkit-0.81.6.tar.bz2 +sugar-toolkit-0.81.6-git92ef9d298a.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Jul 2008 08:04:19 -0000 1.9 +++ sources 9 Jul 2008 12:39:11 -0000 1.10 @@ -1 +1 @@ -a67cb1d41b1c378ad56b58cf77474fb0 sugar-toolkit-0.81.6.tar.bz2 +ee116ab1dd166d755a7adebea6de09a5 sugar-toolkit-0.81.6-git92ef9d298a.tar.bz2 Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sugar-toolkit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sugar-toolkit.spec 9 Jul 2008 08:04:19 -0000 1.11 +++ sugar-toolkit.spec 9 Jul 2008 12:39:11 -0000 1.12 @@ -1,11 +1,19 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%define commitid 92ef9d298a +%define alphatag 20080709git%{commitid} + Summary: Sugar toolkit Name: sugar-toolkit Version: 0.81.6 -Release: 1%{?dist} +#Release: 1%{?dist} +Release: 2.%{alphatag}%{?dist} URL: http://wiki.laptop.org/go/Sugar -Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +# git clone git://dev.laptop.org/sugar +# cd sugar +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +#Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 Source1: macros.sugar License: LGPLv2 Group: System Environment/Libraries @@ -57,6 +65,11 @@ %{_sysconfdir}/rpm/macros.sugar %changelog +* Wed Jul 09 2008 Simon Schampijer - 0.81.6-2.20080709git92ef9d298a +- git snapshot +- 7430 Preserve the favorites layout across reboots +- 7434 Add power section to the control panel + * Wed Jul 09 2008 Simon Schampijer - 0.81.6-1 - 7015 Add proper alignment support to the tray control - 7054 Journal doesn't show correct colors for activity instances From fedora-extras-commits at redhat.com Wed Jul 9 12:42:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 12:42:17 +0000 Subject: [pkgdb] rafkill ownership updated Message-ID: <200807091242.m69CgHTV029300@bastion.fedora.phx.redhat.com> Package rafkill in Fedora devel is now owned by Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rafkill From fedora-extras-commits at redhat.com Wed Jul 9 12:42:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 12:42:21 +0000 Subject: [pkgdb] rafkill ownership updated Message-ID: <200807091242.m69CgLHD029320@bastion.fedora.phx.redhat.com> Package rafkill in Fedora 8 is now owned by Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rafkill From fedora-extras-commits at redhat.com Wed Jul 9 12:42:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 12:42:23 +0000 Subject: [pkgdb] rafkill ownership updated Message-ID: <200807091242.m69CgYXx029340@bastion.fedora.phx.redhat.com> Package rafkill in Fedora 9 is now owned by Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rafkill From fedora-extras-commits at redhat.com Wed Jul 9 12:51:17 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Wed, 9 Jul 2008 12:51:17 GMT Subject: rpms/sugar-artwork/F-9 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sugar-artwork.spec, 1.9, 1.10 Message-ID: <200807091251.m69CpHOK025790@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-artwork/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25689 Modified Files: .cvsignore sources sugar-artwork.spec Log Message: * Wed Jul 09 2008 Simon Schampijer - 0.81.6-2.20080709gitc77b345c02 - git snapshot - 7385 Add view-freeform icon (eben) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Jun 2008 13:55:25 -0000 1.7 +++ .cvsignore 9 Jul 2008 12:50:22 -0000 1.8 @@ -1 +1 @@ -sugar-artwork-0.81.1.tar.bz2 +sugar-artwork-0.81.1-gitc77b345c02.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Jun 2008 13:55:25 -0000 1.7 +++ sources 9 Jul 2008 12:50:22 -0000 1.8 @@ -1 +1 @@ -137c630284bcf138f0ecb4ba6dc8b957 sugar-artwork-0.81.1.tar.bz2 +427f04fc2f18a072420b1ce7fc087008 sugar-artwork-0.81.1-gitc77b345c02.tar.bz2 Index: sugar-artwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/F-9/sugar-artwork.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sugar-artwork.spec 21 Jun 2008 13:55:25 -0000 1.9 +++ sugar-artwork.spec 9 Jul 2008 12:50:22 -0000 1.10 @@ -1,9 +1,17 @@ +%define commitid c77b345c02 +%define alphatag 20080709git%{commitid} + Summary: Artwork for Sugar look-and-feel Name: sugar-artwork Version: 0.81.1 -Release: 1%{?dist} +#Release: 1%{?dist} +Release: 2.%{alphatag}%{?dist} URL: http://dev.laptop.org -Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +# git clone git://dev.laptop.org/artwork +# cd sugar +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +#Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 Group: User Interface/Desktops License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +61,10 @@ %{_libdir}/gtk-2.0/*/engines/*.so %changelog +* Wed Jul 09 2008 Simon Schampijer - 0.81.6-2.20080709gitc77b345c02 +- git snapshot +- 7385 Add view-freeform icon (eben) + * Sat Jun 21 2008 Tomeu Vizoso - 0.81.1 - Some improvements to the gtk theme (benzea) From fedora-extras-commits at redhat.com Wed Jul 9 13:05:48 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 9 Jul 2008 13:05:48 GMT Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.375, 1.376 policycoreutils.spec, 1.539, 1.540 Message-ID: <200807091305.m69D5mMm000503@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv440 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jul 9 2008 Dan Walsh 2.0.52-5 - Additial cleanup of boolean handling for semanage policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- policycoreutils-rhat.patch 8 Jul 2008 12:58:57 -0000 1.375 +++ policycoreutils-rhat.patch 9 Jul 2008 13:04:58 -0000 1.376 @@ -1,44 +1,6 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile ---- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/Makefile 2008-07-03 16:17:10.000000000 -0400 -@@ -1,4 +1,4 @@ --SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po -+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui - - INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) - -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-03 16:17:10.000000000 -0400 -@@ -210,9 +210,10 @@ - } - - if (fsetfilecon(fd, scontext) < 0) { -- syslog(LOG_ERR, -- "set context %s->%s failed:'%s'\n", -- filename, scontext, strerror(errno)); -+ if (errno != EOPNOTSUPP) -+ syslog(LOG_ERR, -+ "set context %s->%s failed:'%s'\n", -+ filename, scontext, strerror(errno)); - if (retcontext >= 0) - free(prev_context); - free(scontext); -@@ -225,8 +226,9 @@ - if (retcontext >= 0) - free(prev_context); - } else { -- syslog(LOG_ERR, "get context on %s failed: '%s'\n", -- filename, strerror(errno)); -+ if (errno != EOPNOTSUPP) -+ syslog(LOG_ERR, "get context on %s failed: '%s'\n", -+ filename, strerror(errno)); - } - free(scontext); - close(fd); diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-09 08:44:58.000000000 -0400 @@ -51,7 +51,7 @@ semanage interface -{a|d|m} [-tr] interface_spec semanage fcontext -{a|d|m} [-frst] file_spec @@ -76,7 +38,7 @@ - deleteall = 0 - list = 0 - locallist = 0 -+ value = "" ++ value = None + add = False + modify = False + delete = False @@ -184,23 +146,18 @@ OBJECT.add(target, rlist, selevel, serange, prefix) if object == "port": -@@ -317,7 +325,12 @@ +@@ -317,7 +325,7 @@ if modify: if object == "boolean": - OBJECT.modify(target, value) -+ if use_file: -+ OBJECT.modify(target, use_file = use_file) -+ else: -+ if value == "": -+ raise ValueError(_("boolean requires value")) -+ OBJECT.modify(target, value) ++ OBJECT.modify(target, value, use_file) if object == "login": OBJECT.modify(target, seuser, serange) diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-09 08:44:40.000000000 -0400 @@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool @@ -237,10 +194,41 @@ .TP diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-08 08:45:07.000000000 -0400 -@@ -1448,53 +1443,58 @@ ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-09 08:55:45.000000000 -0400 +@@ -330,20 +330,15 @@ + for name in dirs: + os.rmdir(os.path.join(root, name)) + +- if rc != 0: +- raise ValueError(out) +- +- + def delete(self, name): + for n in name.split(): + rc = semanage_module_remove(self.sh, "permissive_%s" % n) + if rc < 0: + raise ValueError(_("Could not remove permissive domain %s (remove failed)") % name) +- rc = semanage_commit(self.sh) +- if rc < 0: ++ rc = semanage_commit(self.sh) ++ if rc < 0: + raise ValueError(_("Could not remove permissive domain %s (commit failed)") % name) + +- + def deleteall(self): + l = self.get_all() + if len(l) > 0: +@@ -1447,54 +1442,72 @@ + class booleanRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) ++ self.dict={} ++ self.dict["TRUE"] = 1 ++ self.dict["FALSE"] = 0 ++ self.dict["ON"] = 1 ++ self.dict["OFF"] = 0 ++ self.dict["1"] = 1 ++ self.dict["0"] = 0 - def modify(self, name, value = ""): - if value == "": @@ -276,11 +264,11 @@ - if value != "": - nvalue = int(value) - semanage_bool_set_value(b, nvalue) -+ if value != "": -+ nvalue = int(value) -+ semanage_bool_set_value(b, nvalue) ++ if value.upper() in self.dict: ++ semanage_bool_set_value(b, self.dict[value.upper()]) else: - raise ValueError(_("You must specify a value")) +- raise ValueError(_("You must specify a value")) ++ raise ValueError(_("You must specify one of the following values: %s") % ", ".join(self.dict.keys()) ) + + rc = semanage_bool_set_active(self.sh, k, b) + if rc < 0: @@ -291,7 +279,7 @@ + semanage_bool_key_free(k) + semanage_bool_free(b) -+ def modify(self, name, value=False, use_file=False): ++ def modify(self, name, value=None, use_file=False): + rc = semanage_begin_transaction(self.sh) if rc < 0: @@ -305,9 +293,16 @@ - raise ValueError(_("Could not modify boolean %s") % name) + if use_file: + fd = open(name) -+ for b in fd.read().split(): -+ bool, val = b.split("=") -+ self.__mod(bool, val) ++ for b in fd.read().split("\n"): ++ b = b.strip() ++ if len(b) == 0: ++ continue ++ ++ try: ++ boolname, val = b.split("=") ++ except ValueError, e: ++ raise ValueError(_("Bad format %s: Record %s" % ( name, b) )) ++ self.__mod(boolname.strip(), val.strip()) + fd.close() + else: + self.__mod(name, value) @@ -330,7 +325,7 @@ (rc,exists) = semanage_bool_exists(self.sh, k) if rc < 0: raise ValueError(_("Could not check if boolean %s is defined") % name) -@@ -1571,8 +1571,15 @@ +@@ -1571,8 +1584,15 @@ else: return _("unknown") Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.539 retrieving revision 1.540 diff -u -r1.539 -r1.540 --- policycoreutils.spec 8 Jul 2008 19:50:55 -0000 1.539 +++ policycoreutils.spec 9 Jul 2008 13:04:58 -0000 1.540 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ fi %changelog +* Wed Jul 9 2008 Dan Walsh 2.0.52-5 +- Additial cleanup of boolean handling for semanage + * Tue Jul 8 2008 Dan Walsh 2.0.52-4 - Handle ranges of ports in gui From fedora-extras-commits at redhat.com Wed Jul 9 13:06:41 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 9 Jul 2008 13:06:41 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch, 1.33, 1.34 selinux-policy.spec, 1.682, 1.683 Message-ID: <200807091306.m69D6fgQ000717@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv492 Modified Files: policy-20080509.patch selinux-policy.spec Log Message: Add nscd inotify fix policy-20080509.patch: Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- policy-20080509.patch 8 Jul 2008 20:14:39 -0000 1.33 +++ policy-20080509.patch 9 Jul 2008 13:05:54 -0000 1.34 @@ -19221,7 +19221,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.4.2/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/services/nscd.te 2008-07-02 08:47:04.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/services/nscd.te 2008-07-09 07:41:41.000000000 -0400 @@ -23,19 +23,22 @@ type nscd_log_t; logging_log_file(nscd_log_t) @@ -19257,7 +19257,15 @@ kernel_read_kernel_sysctls(nscd_t) kernel_list_proc(nscd_t) kernel_read_proc_symlinks(nscd_t) -@@ -73,6 +78,7 @@ +@@ -60,6 +65,7 @@ + + fs_getattr_all_fs(nscd_t) + fs_search_auto_mountpoints(nscd_t) ++fs_list_inotifyfs(nscd_t) + + # for when /etc/passwd has just been updated and has the wrong type + auth_getattr_shadow(nscd_t) +@@ -73,6 +79,7 @@ corenet_udp_sendrecv_all_nodes(nscd_t) corenet_tcp_sendrecv_all_ports(nscd_t) corenet_udp_sendrecv_all_ports(nscd_t) @@ -19265,7 +19273,7 @@ corenet_tcp_connect_all_ports(nscd_t) corenet_sendrecv_all_client_packets(nscd_t) corenet_rw_tun_tap_dev(nscd_t) -@@ -84,6 +90,7 @@ +@@ -84,6 +91,7 @@ selinux_compute_relabel_context(nscd_t) selinux_compute_user_contexts(nscd_t) domain_use_interactive_fds(nscd_t) @@ -19273,7 +19281,7 @@ files_read_etc_files(nscd_t) files_read_generic_tmp_symlinks(nscd_t) -@@ -93,6 +100,7 @@ +@@ -93,6 +101,7 @@ libs_use_ld_so(nscd_t) libs_use_shared_libs(nscd_t) @@ -19281,7 +19289,7 @@ logging_send_syslog_msg(nscd_t) miscfiles_read_localization(nscd_t) -@@ -108,6 +116,14 @@ +@@ -108,6 +117,14 @@ sysadm_dontaudit_search_home_dirs(nscd_t) optional_policy(` @@ -19296,7 +19304,7 @@ udev_read_db(nscd_t) ') -@@ -115,3 +131,12 @@ +@@ -115,3 +132,12 @@ xen_dontaudit_rw_unix_stream_sockets(nscd_t) xen_append_log(nscd_t) ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.682 retrieving revision 1.683 diff -u -r1.682 -r1.683 --- selinux-policy.spec 8 Jul 2008 20:14:39 -0000 1.682 +++ selinux-policy.spec 9 Jul 2008 13:05:54 -0000 1.683 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.4.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -278,7 +278,7 @@ %post targeted if [ $1 -eq 1 ]; then %loadpolicy targeted -semanage user -a -S targeted -P user -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u +bnsemanage user -a -S targeted -P user -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u semanage login -m -S targeted -s "unconfined_u" -r s0-s0:c0.c1023 __default__ semanage login -m -S targeted -s "unconfined_u" -r s0-s0:c0.c1023 root semanage user -a -S targeted -P user -R guest_r guest_u @@ -375,6 +375,9 @@ %endif %changelog +* Wed Jul 9 2008 Dan Walsh 3.4.2-14 +- Add inotify support to nscd + * Tue Jul 8 2008 Dan Walsh 3.4.2-13 - Allow unconfined_t to setfcap From fedora-extras-commits at redhat.com Wed Jul 9 13:08:43 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 9 Jul 2008 13:08:43 GMT Subject: rpms/kdeartwork/devel .cvsignore, 1.44, 1.45 kdeartwork.spec, 1.83, 1.84 sources, 1.46, 1.47 Message-ID: <200807091308.m69D8hhD000981@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeartwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv821 Modified Files: .cvsignore kdeartwork.spec sources Log Message: * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 27 Jun 2008 16:44:51 -0000 1.44 +++ .cvsignore 9 Jul 2008 13:07:50 -0000 1.45 @@ -1 +1 @@ -kdeartwork-4.0.84.tar.bz2 +kdeartwork-4.0.85.tar.bz2 Index: kdeartwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- kdeartwork.spec 27 Jun 2008 22:30:24 -0000 1.83 +++ kdeartwork.spec 9 Jul 2008 13:07:50 -0000 1.84 @@ -1,6 +1,6 @@ Name: kdeartwork -Version: 4.0.84 +Version: 4.0.85 Release: 1%{?dist} Summary: Additional artwork (themes, sound themes, ...) for KDE @@ -197,6 +197,9 @@ %changelog +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 27 Jun 2008 16:44:51 -0000 1.46 +++ sources 9 Jul 2008 13:07:50 -0000 1.47 @@ -1 +1 @@ -46fe655ecde6597c19fc625d191154e5 kdeartwork-4.0.84.tar.bz2 +bbe1bb2c0de907f8b1f65da7abc5a8f9 kdeartwork-4.0.85.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 13:12:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 9 Jul 2008 13:12:26 GMT Subject: rpms/cyrus-sasl/devel .cvsignore, 1.17, 1.18 cyrus-sasl.spec, 1.68, 1.69 sources, 1.20, 1.21 cyrus-sasl-db-4.6.18-glibc.patch, 1.1, NONE Message-ID: <200807091312.m69DCQKD001755@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/cyrus-sasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1494 Modified Files: .cvsignore cyrus-sasl.spec sources Removed Files: cyrus-sasl-db-4.6.18-glibc.patch Log Message: * Wed Jul 9 2008 Tomas Mraz - 2.1.22-16 - update internal db4 (#449737) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 7 Nov 2007 19:29:49 -0000 1.17 +++ .cvsignore 9 Jul 2008 13:11:39 -0000 1.18 @@ -1,14 +1,2 @@ -cyrus-sasl-1.5.28.tar.gz -cyrus-sasl-2.1.19.tar.gz -db-4.2.52.tar.gz -cyrus-sasl-2.1.20.tar.gz -cyrus-sasl-2.1.20.tar.gz.sig -db-4.3.21.tar.gz -db-4.3.27.tar.gz -cyrus-sasl-2.1.21.tar.gz -cyrus-sasl-2.1.21.tar.gz.sig -cyrus-sasl-2.1.22.tar.gz -cyrus-sasl-2.1.22.tar.gz.sig -cyrus-sasl-2.1.22-nodlcompat.tar.gz -db-4.6.19.tar.gz cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz +db-4.7.25.tar.gz Index: cyrus-sasl.spec =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- cyrus-sasl.spec 1 Jul 2008 21:35:14 -0000 1.68 +++ cyrus-sasl.spec 9 Jul 2008 13:11:39 -0000 1.69 @@ -1,11 +1,11 @@ %define _plugindir2 %{_libdir}/sasl2 -%define db_version 4.6.19 +%define db_version 4.7.25 %define bootstrap_cyrus_sasl 0 Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.22 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD Group: System Environment/Libraries # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; @@ -13,7 +13,7 @@ # new tarball. Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz Source4: saslauthd.init -Source6: http://www.sleepycat.com/update/%{db_version}/db-%{db_version}.tar.gz +Source6: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source7: sasl-mechlist.c Source8: sasl-checkpass.c Source9: saslauthd.sysconfig @@ -28,7 +28,6 @@ Patch26: cyrus-sasl-2.1.22-digest-commas.patch Patch27: cyrus-sasl-2.1.22-automake-1.10.patch Patch28: cyrus-sasl-2.1.21-keytab.patch -Patch29: cyrus-sasl-db-4.6.18-glibc.patch Patch30: cyrus-sasl-2.1.22-rimap.patch Patch31: cyrus-sasl-2.1.22-kerberos4.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -146,10 +145,6 @@ %patch30 -p1 -b .rimap %patch31 -p1 -b .krb4 -pushd db-%{db_version} -%patch29 -p1 -b .glibc27 -popd - # FIXME - we remove these files directly so that we can avoid using the -f # flag, which has a nasty habit of overwriting files like COPYING. rm -f config/config.guess config/config.sub @@ -398,6 +393,9 @@ %{_sbindir}/sasl2-shared-mechlist %changelog +* Wed Jul 9 2008 Tomas Mraz - 2.1.22-16 +- update internal db4 (#449737) + * Tue Jul 1 2008 Tomas Mraz - 2.1.22-15 - drop reload from initscript help (#448154) - fix hang in rimap auth method (#438533) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 7 Nov 2007 19:29:49 -0000 1.20 +++ sources 9 Jul 2008 13:11:39 -0000 1.21 @@ -1,2 +1,2 @@ -89c7390ff120d5ebf3eccc5f97249e79 db-4.6.19.tar.gz 4dde83929ded5435e4c72e7cc06b0ebb cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz +ec2b87e833779681a0c3a814aa71359e db-4.7.25.tar.gz --- cyrus-sasl-db-4.6.18-glibc.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 13:19:34 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 9 Jul 2008 13:19:34 GMT Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.69,1.70 Message-ID: <200807091319.m69DJYNG002154@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/cyrus-sasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2096 Modified Files: cyrus-sasl.spec Log Message: - typo Index: cyrus-sasl.spec =================================================================== RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- cyrus-sasl.spec 9 Jul 2008 13:11:39 -0000 1.69 +++ cyrus-sasl.spec 9 Jul 2008 13:18:50 -0000 1.70 @@ -13,7 +13,7 @@ # new tarball. Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz Source4: saslauthd.init -Source6: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz +Source6: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz Source7: sasl-mechlist.c Source8: sasl-checkpass.c Source9: saslauthd.sysconfig From fedora-extras-commits at redhat.com Wed Jul 9 13:42:12 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 9 Jul 2008 13:42:12 GMT Subject: rpms/rafkill/devel .cvsignore, 1.3, 1.4 rafkill.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200807091342.m69DgCo5003360@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/rafkill/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3288 Modified Files: .cvsignore rafkill.spec sources Log Message: Update to new upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rafkill/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Aug 2006 20:18:43 -0000 1.3 +++ .cvsignore 9 Jul 2008 13:41:10 -0000 1.4 @@ -1 +1 @@ -rafkill-1.2.2.tar.gz +rafkill-1.2.3.tar.gz Index: rafkill.spec =================================================================== RCS file: /cvs/pkgs/rpms/rafkill/devel/rafkill.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rafkill.spec 19 Feb 2008 09:34:21 -0000 1.9 +++ rafkill.spec 9 Jul 2008 13:41:10 -0000 1.10 @@ -1,6 +1,6 @@ Name: rafkill -Version: 1.2.2 -Release: 7%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: Top-down shooter with powerups Group: Amusements/Games License: GPL+ @@ -9,10 +9,8 @@ Source1: rafkill.desktop Source2: rafkill.6 Source3: rafkill.png -Patch0: rafkill-1.2.2-spell.patch -Patch1: rafkill-1.2.2-menu.patch -Patch2: rafkill-1.2.2-shatter-crash.patch -Patch3: rafkill-1.2.2-gcc43.patch +Patch0: rafkill-1.2.2-shatter-crash.patch +Patch1: rafkill-1.2.2-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel dumb-devel scons desktop-file-utils Requires: hicolor-icon-theme @@ -25,10 +23,8 @@ %prep %setup -q -%patch0 -p1 -z .spell -%patch1 -p1 -z .menu -%patch2 -p1 -z .shatter -%patch3 -p1 -z .gcc43 +%patch0 -p1 -z .shatter +%patch1 -p1 -z .gcc43 # sigh hack hack hack FLAGS="" for i in $RPM_OPT_FLAGS; do @@ -93,6 +89,11 @@ %changelog +* Wed Jul 09 2008 Jon Ciesla - 1.2.3-1 +- Update to 1.2.3. +- Dropped -spell patch, applied upstream. +- Dropped -menu patch, applied upstream. + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.2-7 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rafkill/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Aug 2006 20:18:43 -0000 1.3 +++ sources 9 Jul 2008 13:41:10 -0000 1.4 @@ -1 +1 @@ -cbed08af529da15748441d2859f3f846 rafkill-1.2.2.tar.gz +1fc57e141e815a1128ceb49c587e6024 rafkill-1.2.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 13:48:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 13:48:01 +0000 Subject: [pkgdb] mc: vda has requested watchbugzilla Message-ID: <200807091348.m69Dm1gh001783@bastion.fedora.phx.redhat.com> Denys Vlasenko (vda) has requested the watchbugzilla acl on mc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mc From fedora-extras-commits at redhat.com Wed Jul 9 13:48:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 13:48:06 +0000 Subject: [pkgdb] mc: vda has requested watchcommits Message-ID: <200807091348.m69Dm6sw001804@bastion.fedora.phx.redhat.com> Denys Vlasenko (vda) has requested the watchcommits acl on mc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mc From fedora-extras-commits at redhat.com Wed Jul 9 13:57:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 13:57:04 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807091357.m69Dv5VK002222@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the commit acl on squid (Fedora devel) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 13:58:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 13:58:00 +0000 Subject: [pkgdb] tunctl had acl change status Message-ID: <200807091358.m69Dw0k7002361@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the commit acl on tunctl (Fedora devel) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 14:34:13 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 9 Jul 2008 14:34:13 GMT Subject: rpms/yum/F-9 .cvsignore, 1.71, 1.72 sources, 1.74, 1.75 yum.spec, 1.216, 1.217 0001-Allow-noarch-packages-when-in-multilib_policy-best.patch, 1.1, NONE 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch, 1.1, NONE 0002--Fix-packagesNewestByName-to-use-comparePoEVR-as-p.patch, 1.1, NONE 0003-Make-sure-we-only-consider-the-newest-names-among-a.patch, 1.2, NONE Message-ID: <200807091434.m69EYDlT012539@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/pkgs/rpms/yum/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12462 Modified Files: .cvsignore sources yum.spec Removed Files: 0001-Allow-noarch-packages-when-in-multilib_policy-best.patch 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch 0002--Fix-packagesNewestByName-to-use-comparePoEVR-as-p.patch 0003-Make-sure-we-only-consider-the-newest-names-among-a.patch Log Message: clean up unused patches 3.2.17 upload Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/yum/F-9/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 16 May 2008 14:37:23 -0000 1.71 +++ .cvsignore 9 Jul 2008 14:33:07 -0000 1.72 @@ -1 +1 @@ -yum-3.2.16.tar.gz +yum-3.2.17.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yum/F-9/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 16 May 2008 14:37:23 -0000 1.74 +++ sources 9 Jul 2008 14:33:07 -0000 1.75 @@ -1 +1 @@ -7a205a108ffeb8cd299c817051968c04 yum-3.2.16.tar.gz +e65c04204f974d4ecc071b823b75d50c yum-3.2.17.tar.gz Index: yum.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum/F-9/yum.spec,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- yum.spec 24 Jun 2008 21:32:42 -0000 1.216 +++ yum.spec 9 Jul 2008 14:33:07 -0000 1.217 @@ -2,8 +2,8 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.16 -Release: 4%{?dist} +Version: 3.2.17 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz @@ -13,10 +13,6 @@ Patch1: yum-mirror-priority.patch Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch -Patch4: 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch -Patch5: 0001-Allow-noarch-packages-when-in-multilib_policy-best.patch -Patch6: 0002--Fix-packagesNewestByName-to-use-comparePoEVR-as-p.patch -Patch7: 0003-Make-sure-we-only-consider-the-newest-names-among-a.patch URL: http://linux.duke.edu/yum/ BuildArch: noarch @@ -59,10 +55,6 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %build make @@ -111,6 +103,9 @@ %dir /usr/lib/yum-plugins %changelog +* Wed Jul 9 2008 Seth Vidal - 3.2.17-1 +- 3.2.17 + * Tue Jun 24 2008 Jesse Keating - 3.2.16-4 - Add a couple more upstream patches for even more multilib fixes --- 0001-Allow-noarch-packages-when-in-multilib_policy-best.patch DELETED --- --- 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch DELETED --- --- 0002--Fix-packagesNewestByName-to-use-comparePoEVR-as-p.patch DELETED --- --- 0003-Make-sure-we-only-consider-the-newest-names-among-a.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 14:42:07 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 14:42:07 GMT Subject: rpms/perl-ExtUtils-PkgConfig/F-9 .cvsignore, 1.4, 1.5 perl-ExtUtils-PkgConfig.spec, 1.14, 1.15 sources, 1.4, 1.5 Message-ID: <200807091442.m69Eg7A7012902@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12847 Modified Files: .cvsignore perl-ExtUtils-PkgConfig.spec sources Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 1.11-1 - Upstream update. - Reflect Source0-URL having changed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Nov 2007 21:39:37 -0000 1.4 +++ .cvsignore 9 Jul 2008 14:40:54 -0000 1.5 @@ -1 +1 @@ -ExtUtils-PkgConfig-1.08.tar.gz +ExtUtils-PkgConfig-1.11.tar.gz Index: perl-ExtUtils-PkgConfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-9/perl-ExtUtils-PkgConfig.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-ExtUtils-PkgConfig.spec 2 Feb 2008 18:44:48 -0000 1.14 +++ perl-ExtUtils-PkgConfig.spec 9 Jul 2008 14:40:54 -0000 1.15 @@ -1,12 +1,12 @@ Name: perl-ExtUtils-PkgConfig -Version: 1.08 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Simplistic interface to pkg-config Group: Development/Libraries License: LGPLv2+ URL: http://search.cpan.org/dist/ExtUtils-PkgConfig/ -Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/ExtUtils-PkgConfig-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/ExtUtils-PkgConfig-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -59,6 +59,10 @@ %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 1.11-1 +- Upstream update. +- Reflect Source0-URL having changed. + * Sat Feb 2 2008 Tom "spot" Callaway - 1.08-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Nov 2007 21:39:37 -0000 1.4 +++ sources 9 Jul 2008 14:40:54 -0000 1.5 @@ -1 +1 @@ -7bd9e8a7b1f0c624281b4eb0acc90384 ExtUtils-PkgConfig-1.08.tar.gz +cd68998c1f370d6c48042447f76ede9f ExtUtils-PkgConfig-1.11.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 14:43:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 14:43:09 +0000 Subject: [pkgdb] mc had acl change status Message-ID: <200807091443.m69Eh9ru003968@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the watchbugzilla acl on mc (Fedora devel) to Approved for Denys Vlasenko (vda) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mc From fedora-extras-commits at redhat.com Wed Jul 9 14:43:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 14:43:13 +0000 Subject: [pkgdb] mc had acl change status Message-ID: <200807091443.m69EhDEF003989@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the watchcommits acl on mc (Fedora devel) to Approved for Denys Vlasenko (vda) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mc From fedora-extras-commits at redhat.com Wed Jul 9 14:45:14 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 9 Jul 2008 14:45:14 GMT Subject: rpms/yum/devel sources, 1.74, 1.75 yum.spec, 1.214, 1.215 yum-big-head.patch, 1.6, NONE yum-misc-fixes.patch, 1.14, NONE Message-ID: <200807091445.m69EjEJ1013183@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/pkgs/rpms/yum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13069 Modified Files: sources yum.spec Removed Files: yum-big-head.patch yum-misc-fixes.patch Log Message: 3.2.17 and patch clean up for rawhide, too Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yum/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 16 May 2008 14:47:09 -0000 1.74 +++ sources 9 Jul 2008 14:44:19 -0000 1.75 @@ -1 +1 @@ -7a205a108ffeb8cd299c817051968c04 yum-3.2.16.tar.gz +e65c04204f974d4ecc071b823b75d50c yum-3.2.17.tar.gz Index: yum.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- yum.spec 17 May 2008 11:58:37 -0000 1.214 +++ yum.spec 9 Jul 2008 14:44:19 -0000 1.215 @@ -2,8 +2,8 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.16 -Release: 2%{?dist} +Version: 3.2.17 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz @@ -13,7 +13,6 @@ Patch1: yum-mirror-priority.patch Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch -Patch4: 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch URL: http://linux.duke.edu/yum/ BuildArch: noarch @@ -56,7 +55,6 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 -%patch4 -p1 %build make @@ -105,8 +103,18 @@ %dir /usr/lib/yum-plugins %changelog -* Sat May 17 2008 Jesse Keating - 3.2.16-2 -- Add upstream patch to make filedeps work again +* Wed Jul 9 2008 Seth Vidal - 3.2.17-1 +- 3.2.17 + +* Tue Jun 24 2008 Jesse Keating - 3.2.16-4 +- Add a couple more upstream patches for even more multilib fixes + +* Tue Jun 24 2008 Jesse Keating - 3.2.16-3 +- Add another patch from upstream for multilib policy and noarch + +* Sun May 18 2008 Seth Vidal 3.2.16-2 +- stupid, stupid, stupid + * Fri May 16 2008 Seth Vidal 3.2.16-1 - 3.2.16 --- yum-big-head.patch DELETED --- --- yum-misc-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 15:21:26 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 9 Jul 2008 15:21:26 GMT Subject: rpms/libevent/devel libevent.spec,1.15,1.16 Message-ID: <200807091521.m69FLQZj021794@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21749 Modified Files: libevent.spec Log Message: Updated to latest stable upstream version 1.4.5-stable Index: libevent.spec =================================================================== RCS file: /cvs/pkgs/rpms/libevent/devel/libevent.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libevent.spec 27 Jun 2008 15:40:39 -0000 1.15 +++ libevent.spec 9 Jul 2008 15:20:33 -0000 1.16 @@ -1,5 +1,5 @@ Name: libevent -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: Abstract asynchronous event notification library @@ -75,10 +75,15 @@ %{_libdir}/libevent_extra.a %{_bindir}/event_rpcgen.py +%{_bindir}/event_rpcgen.pyc +%{_bindir}/event_rpcgen.pyo %{_mandir}/man3/* %changelog +* Tue Jul 1 2008 Steve Dickson 1.4.5-1 +- Updated to latest stable upstream version 1.4.5-stable + * Mon Jun 2 2008 Steve Dickson 1.4.4-1 - Updated to latest stable upstream version 1.4.4-stable From fedora-extras-commits at redhat.com Wed Jul 9 15:24:13 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 9 Jul 2008 15:24:13 GMT Subject: rpms/libevent/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200807091524.m69FOD2v022020@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21979 Modified Files: .cvsignore sources Log Message: Updated new tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libevent/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Jun 2008 11:41:03 -0000 1.6 +++ .cvsignore 9 Jul 2008 15:23:22 -0000 1.7 @@ -3,3 +3,4 @@ libevent-1.3b.tar.gz libevent-1.3e.tar.gz libevent-1.4.4-stable.tar.gz +libevent-1.4.5-stable.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libevent/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Jun 2008 11:41:03 -0000 1.6 +++ sources 9 Jul 2008 15:23:22 -0000 1.7 @@ -1 +1 @@ -5d7591aa6301f06315b52bade472bf2f libevent-1.4.4-stable.tar.gz +efd44048cc890ad11f7099bc01e43e4a libevent-1.4.5-stable.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 15:25:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:25:39 +0000 Subject: [pkgdb] squid: hno has requested watchbugzilla Message-ID: <200807091525.m69FPdS6005551@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchbugzilla acl on squid (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:25:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:25:42 +0000 Subject: [pkgdb] squid: hno has given up watchbugzilla Message-ID: <200807091525.m69FPdS9005551@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has given up the watchbugzilla acl on squid (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:25:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:25:58 +0000 Subject: [pkgdb] squid: hno has requested watchbugzilla Message-ID: <200807091525.m69FPwsA005603@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchbugzilla acl on squid (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:26:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:26:02 +0000 Subject: [pkgdb] squid: hno has requested watchcommits Message-ID: <200807091526.m69FQ29F005626@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchcommits acl on squid (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:26:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:26:09 +0000 Subject: [pkgdb] squid: hno has requested watchbugzilla Message-ID: <200807091526.m69FQ9iR005649@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchbugzilla acl on squid (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:26:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:26:19 +0000 Subject: [pkgdb] squid: hno has requested watchcommits Message-ID: <200807091526.m69FPdSC005551@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchcommits acl on squid (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:26:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:26:41 +0000 Subject: [pkgdb] tunctl: hno has requested watchbugzilla Message-ID: <200807091526.m69FQ9iU005649@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchbugzilla acl on tunctl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:26:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:26:41 +0000 Subject: [pkgdb] tunctl: hno has requested watchcommits Message-ID: <200807091526.m69FQfWv005762@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchcommits acl on tunctl (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:26:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:26:40 +0000 Subject: [pkgdb] tunctl: hno has requested watchbugzilla Message-ID: <200807091526.m69FQ29I005626@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchbugzilla acl on tunctl (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:26:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:26:43 +0000 Subject: [pkgdb] tunctl: hno has requested watchcommits Message-ID: <200807091526.m69FPwsD005603@bastion.fedora.phx.redhat.com> Henrik Nordstr?m (hno) has requested the watchcommits acl on tunctl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:33:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:33:44 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807091533.m69FXipm006167@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the commit acl on squid (Fedora 8) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:33:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:33:49 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807091533.m69FXnoR006188@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchcommits acl on squid (Fedora 8) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:33:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:33:51 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807091533.m69FXp7G006209@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchbugzilla acl on squid (Fedora 8) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:33:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:33:55 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807091533.m69FXtlw006233@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchbugzilla acl on squid (Fedora 9) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:33:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:33:59 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807091534.m69FXnoV006188@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchcommits acl on squid (Fedora 9) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:34:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:03 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested watchbugzilla Message-ID: <200807091534.m69FXipt006167@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the watchbugzilla acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:04 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested commit Message-ID: <200807091534.m69FXtm1006233@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the commit acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:03 +0000 Subject: [pkgdb] squid had acl change status Message-ID: <200807091534.m69FXipq006167@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the commit acl on squid (Fedora 9) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/squid From fedora-extras-commits at redhat.com Wed Jul 9 15:34:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:08 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested watchcommits Message-ID: <200807091534.m69FXp7J006209@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the watchcommits acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:11 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested approveacls Message-ID: <200807091534.m69FY41b006302@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the approveacls acl on perl-Net-Telnet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:17 +0000 Subject: [pkgdb] tunctl had acl change status Message-ID: <200807091534.m69FYIGc006396@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchbugzilla acl on tunctl (Fedora 8) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:34:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:18 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested watchbugzilla Message-ID: <200807091534.m69FXp7M006209@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the watchbugzilla acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:20 +0000 Subject: [pkgdb] tunctl had acl change status Message-ID: <200807091534.m69FY41f006302@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchcommits acl on tunctl (Fedora 8) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:34:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:20 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested watchcommits Message-ID: <200807091534.m69FY41i006302@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the watchcommits acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:22 +0000 Subject: [pkgdb] tunctl had acl change status Message-ID: <200807091534.m69FXtm5006233@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the commit acl on tunctl (Fedora 8) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:34:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:24 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested commit Message-ID: <200807091534.m69FYIGf006396@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the commit acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:25 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested approveacls Message-ID: <200807091534.m69FYPhP006526@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the approveacls acl on perl-Net-Telnet (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:27 +0000 Subject: [pkgdb] tunctl had acl change status Message-ID: <200807091534.m69FYIGj006396@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchbugzilla acl on tunctl (Fedora 9) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:34:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:29 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested watchbugzilla Message-ID: <200807091534.m69FYNHr006485@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the watchbugzilla acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:29 +0000 Subject: [pkgdb] tunctl had acl change status Message-ID: <200807091534.m69FYPhT006526@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the watchcommits acl on tunctl (Fedora 9) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:34:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:30 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested watchcommits Message-ID: <200807091534.m69FYPhW006526@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the watchcommits acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:32 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested commit Message-ID: <200807091534.m69FYNHu006485@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the commit acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:34 +0000 Subject: [pkgdb] tunctl had acl change status Message-ID: <200807091534.m69FYLFH006467@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has set the commit acl on tunctl (Fedora 9) to Approved for Henrik Nordstr?m (hno) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tunctl From fedora-extras-commits at redhat.com Wed Jul 9 15:34:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 15:34:35 +0000 Subject: [pkgdb] perl-Net-Telnet: kanarip has requested approveacls Message-ID: <200807091534.m69FYZtH006683@bastion.fedora.phx.redhat.com> Jeroen van Meeuwen (kanarip) has requested the approveacls acl on perl-Net-Telnet (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Wed Jul 9 15:34:41 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 9 Jul 2008 15:34:41 GMT Subject: rpms/fedora-logos/devel .cvsignore, 1.74, 1.75 fedora-logos.spec, 1.107, 1.108 sources, 1.81, 1.82 Message-ID: <200807091534.m69FYfUv022595@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/fedora-logos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22548 Modified Files: .cvsignore fedora-logos.spec sources Log Message: drop rhgb Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- .cvsignore 29 May 2008 19:28:52 -0000 1.74 +++ .cvsignore 9 Jul 2008 15:33:55 -0000 1.75 @@ -1,2 +1 @@ -fedora-logos-9.0.1.tar.bz2 -infinity-grub.xpm.gz +fedora-logos-9.99.0.tar.bz2 Index: fedora-logos.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- fedora-logos.spec 29 May 2008 19:28:52 -0000 1.107 +++ fedora-logos.spec 9 Jul 2008 15:33:55 -0000 1.108 @@ -1,6 +1,6 @@ Name: fedora-logos Summary: Fedora-related icons and pictures -Version: 9.0.1 +Version: 9.99.0 Release: 1%{?dist} Group: System Environment/Base Source0: fedora-logos-%{version}.tar.bz2 @@ -63,11 +63,6 @@ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-waves done -mkdir -p $RPM_BUILD_ROOT%{_datadir}/rhgb -for i in rhgb/* ; do - install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/rhgb -done - mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash for i in gnome-splash/* ; do install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash @@ -156,7 +151,6 @@ %{_datadir}/kde4/apps/ksplash/Themes/* %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/* %{_datadir}/pixmaps/* -%{_datadir}/rhgb/* %{_datadir}/anaconda/pixmaps/* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/Bluecurve/*/apps/* @@ -177,6 +171,9 @@ # end i386 bits %changelog +* Wed Jul 9 2008 Matthias Clasen - 9.99.0-1 +- rhgb is no more + * Thu May 29 2008 Ray Strode - 9.0.1-1 - Add logo with white type face Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- sources 29 May 2008 19:34:23 -0000 1.81 +++ sources 9 Jul 2008 15:33:55 -0000 1.82 @@ -1,3 +1 @@ -99a5180a48ed4041558fccb462857f1f fedora-logos-9.0.1.tar.bz2 -c81e48856787c64a1fbedf416937bb40 infinity-grub.xpm.gz -81e40a58d6177308e07d5db33e8e655b background.png +e58ae85b69cd081697e7efbb17e6a822 fedora-logos-9.99.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 15:37:59 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Wed, 9 Jul 2008 15:37:59 GMT Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.21,1.22 Message-ID: <200807091537.m69Fbx41022712@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-dtds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22689 Modified Files: docbook-dtds.spec Log Message: use full paths in xmlcatalog registration (as it moved to /etc/sgml/docbook/xmlcatalog Index: docbook-dtds.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- docbook-dtds.spec 13 May 2008 11:44:51 -0000 1.21 +++ docbook-dtds.spec 9 Jul 2008 15:37:08 -0000 1.22 @@ -1,6 +1,6 @@ Name: docbook-dtds Version: 1.0 -Release: 36%{?dist} +Release: 37%{?dist} Group: Applications/Text Summary: SGML and XML document type definitions for DocBook @@ -621,6 +621,7 @@ # the order of the lines, and SGML tools don't like to see XML things # they aren't expecting. CATALOG=/etc/sgml/catalog +CAT_DIR=/usr/share/sgml/docbook/ SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n)) XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n)) # Do they need switching around? @@ -645,447 +646,447 @@ # DocBook XML V4.1.2 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ - "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ - "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG # DocBook XML V4.2 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.2" \ - "xml-dtd-4.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.2" \ - "xml-dtd-4.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG # DocBook XML V4.3 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.3" \ - "xml-dtd-4.3-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.3" \ - "xml-dtd-4.3-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG # DocBook XML V4.4 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.4" \ - "xml-dtd-4.4-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.4" \ - "xml-dtd-4.4-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG # DocBook XML V4.5 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.4//EN" \ - "xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.5" \ - "xml-dtd-4.5-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.5" \ - "xml-dtd-4.5-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG fi @@ -1192,296 +1193,299 @@ then # DocBook XML V4.1.2 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG # DocBook XML V4.2 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG # DocBook XML V4.3 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG # DocBook XML V4.4 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG # DocBook XML V4.5 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG fi %changelog +* Wed Jul 09 2008 Ondrej Vasik - 1.0-37 +- use full paths in xmlcatalog registration + * Tue May 13 2008 Ondrej Vasik - 1.0-36 - changed License(#445008) From fedora-extras-commits at redhat.com Wed Jul 9 15:41:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 9 Jul 2008 15:41:02 GMT Subject: rpms/perl-ExtUtils-PkgConfig/F-8 .cvsignore, 1.3, 1.4 perl-ExtUtils-PkgConfig.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <200807091541.m69Ff2BM022934@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22882 Modified Files: .cvsignore perl-ExtUtils-PkgConfig.spec sources Log Message: * Wed Jul 09 2008 Ralf Cors??pius - 1.11-1 - Upstream update. - Reflect Source0-URL having changed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Feb 2005 02:57:17 -0000 1.3 +++ .cvsignore 9 Jul 2008 15:40:02 -0000 1.4 @@ -1 +1 @@ -ExtUtils-PkgConfig-1.07.tar.gz +ExtUtils-PkgConfig-1.11.tar.gz Index: perl-ExtUtils-PkgConfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-8/perl-ExtUtils-PkgConfig.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-ExtUtils-PkgConfig.spec 16 Oct 2007 14:35:24 -0000 1.12 +++ perl-ExtUtils-PkgConfig.spec 9 Jul 2008 15:40:02 -0000 1.13 @@ -1,12 +1,12 @@ Name: perl-ExtUtils-PkgConfig -Version: 1.07 -Release: 5%{?dist}.2 +Version: 1.11 +Release: 1%{?dist} Summary: Simplistic interface to pkg-config Group: Development/Libraries License: LGPLv2+ URL: http://search.cpan.org/dist/ExtUtils-PkgConfig/ -Source0: http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/ExtUtils-PkgConfig-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -59,6 +59,16 @@ %changelog +* Wed Jul 09 2008 Ralf Cors??pius - 1.11-1 +- Upstream update. +- Reflect Source0-URL having changed. + +* Sat Feb 2 2008 Tom "spot" Callaway - 1.08-2 +- rebuild for new perl + +* Fri Nov 30 2007 Tom "spot" Callaway - 1.08-1 +- 1.08 + * Tue Oct 16 2007 Tom "spot" Callaway - 1.07-5.2 - add BR: perl(Test::More) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Feb 2005 02:57:17 -0000 1.3 +++ sources 9 Jul 2008 15:40:02 -0000 1.4 @@ -1 +1 @@ -a8cf945d09c6458cb27228218e9a2f45 ExtUtils-PkgConfig-1.07.tar.gz +cd68998c1f370d6c48042447f76ede9f ExtUtils-PkgConfig-1.11.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 15:44:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 9 Jul 2008 15:44:22 GMT Subject: rpms/fedora-logos/devel sources,1.82,1.83 Message-ID: <200807091544.m69FiMfd023137@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/fedora-logos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23047 Modified Files: sources Log Message: re-add forgotten sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- sources 9 Jul 2008 15:33:55 -0000 1.82 +++ sources 9 Jul 2008 15:43:19 -0000 1.83 @@ -1 +1,3 @@ e58ae85b69cd081697e7efbb17e6a822 fedora-logos-9.99.0.tar.bz2 +c81e48856787c64a1fbedf416937bb40 infinity-grub.xpm.gz +81e40a58d6177308e07d5db33e8e655b background.png From fedora-extras-commits at redhat.com Wed Jul 9 15:52:27 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 15:52:27 GMT Subject: rpms/comix/F-8 .cvsignore, 1.6, 1.7 comix.spec, 1.12, 1.13 sources, 1.6, 1.7 comix-3.6.4-command-argument-closure.patch, 1.1, NONE comix-3.6.4-tmpfile.patch, 1.2, NONE Message-ID: <200807091552.m69FqRup023740@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/comix/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23592/F-8 Modified Files: .cvsignore comix.spec sources Removed Files: comix-3.6.4-command-argument-closure.patch comix-3.6.4-tmpfile.patch Log Message: * Thu Jul 10 2008 Mamoru Tasaka - 3.6.5-1 - 3.6.5 (2 patches applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/comix/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 May 2007 15:14:51 -0000 1.6 +++ .cvsignore 9 Jul 2008 15:51:05 -0000 1.7 @@ -1 +1 @@ -comix-3.6.4.tar.gz +comix-3.6.5.tar.gz Index: comix.spec =================================================================== RCS file: /cvs/extras/rpms/comix/F-8/comix.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- comix.spec 2 Apr 2008 16:33:49 -0000 1.12 +++ comix.spec 9 Jul 2008 15:51:05 -0000 1.13 @@ -1,14 +1,12 @@ Name: comix -Version: 3.6.4 -Release: 6%{?dist} +Version: 3.6.5 +Release: 1%{?dist} Summary: A user-friendly, customizable image viewer Group: Amusements/Graphics URL: http://comix.sourceforge.net/ License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: comix-3.6.4-command-argument-closure.patch -Patch1: comix-3.6.4-tmpfile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -33,8 +31,6 @@ %prep %setup -q -%patch0 -p1 -b .CVE-2008-1568 -%patch1 -p1 -b .tmpfile %build %{__sed} -i -e 's|shutil.copy|shutil.copy2|' install.py @@ -136,9 +132,13 @@ %changelog +* Thu Jul 10 2008 Mamoru Tasaka - 3.6.5-1 +- 3.6.5 (2 patches applied upstream) + * Thu Apr 3 2008 Mamoru Tasaka - 3.6.4-6 - Second patch for bug 430635 Use tempfile.mkdtemp() for multiple user race condition + (tagged as CVE-2008-1796) * Wed Apr 2 2008 Mamoru Tasaka - 3.6.4-4 - First patch for bug 430635 Index: sources =================================================================== RCS file: /cvs/extras/rpms/comix/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 May 2007 15:14:51 -0000 1.6 +++ sources 9 Jul 2008 15:51:05 -0000 1.7 @@ -1 +1 @@ -1ece2cde0057abf5913b0f2933d839ab comix-3.6.4.tar.gz +4f6210ee04b5b01cb37ab58638278a03 comix-3.6.5.tar.gz --- comix-3.6.4-command-argument-closure.patch DELETED --- --- comix-3.6.4-tmpfile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 15:52:31 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 15:52:31 GMT Subject: rpms/comix/F-9 .cvsignore, 1.6, 1.7 comix.spec, 1.13, 1.14 sources, 1.6, 1.7 comix-3.6.4-command-argument-closure.patch, 1.1, NONE comix-3.6.4-tmpfile.patch, 1.2, NONE Message-ID: <200807091552.m69FqVYg023748@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/comix/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23592/F-9 Modified Files: .cvsignore comix.spec sources Removed Files: comix-3.6.4-command-argument-closure.patch comix-3.6.4-tmpfile.patch Log Message: * Thu Jul 10 2008 Mamoru Tasaka - 3.6.5-1 - 3.6.5 (2 patches applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/comix/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 May 2007 15:14:51 -0000 1.6 +++ .cvsignore 9 Jul 2008 15:51:28 -0000 1.7 @@ -1 +1 @@ -comix-3.6.4.tar.gz +comix-3.6.5.tar.gz Index: comix.spec =================================================================== RCS file: /cvs/extras/rpms/comix/F-9/comix.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- comix.spec 2 Apr 2008 16:34:03 -0000 1.13 +++ comix.spec 9 Jul 2008 15:51:28 -0000 1.14 @@ -1,14 +1,12 @@ Name: comix -Version: 3.6.4 -Release: 6%{?dist} +Version: 3.6.5 +Release: 1%{?dist} Summary: A user-friendly, customizable image viewer Group: Amusements/Graphics URL: http://comix.sourceforge.net/ License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: comix-3.6.4-command-argument-closure.patch -Patch1: comix-3.6.4-tmpfile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -33,8 +31,6 @@ %prep %setup -q -%patch0 -p1 -b .CVE-2008-1568 -%patch1 -p1 -b .tmpfile %build %{__sed} -i -e 's|shutil.copy|shutil.copy2|' install.py @@ -136,9 +132,13 @@ %changelog +* Thu Jul 10 2008 Mamoru Tasaka - 3.6.5-1 +- 3.6.5 (2 patches applied upstream) + * Thu Apr 3 2008 Mamoru Tasaka - 3.6.4-6 - Second patch for bug 430635 Use tempfile.mkdtemp() for multiple user race condition + (tagged as CVE-2008-1796) * Wed Apr 2 2008 Mamoru Tasaka - 3.6.4-4 - First patch for bug 430635 Index: sources =================================================================== RCS file: /cvs/extras/rpms/comix/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 May 2007 15:14:51 -0000 1.6 +++ sources 9 Jul 2008 15:51:28 -0000 1.7 @@ -1 +1 @@ -1ece2cde0057abf5913b0f2933d839ab comix-3.6.4.tar.gz +4f6210ee04b5b01cb37ab58638278a03 comix-3.6.5.tar.gz --- comix-3.6.4-command-argument-closure.patch DELETED --- --- comix-3.6.4-tmpfile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 15:52:55 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 15:52:55 GMT Subject: rpms/comix/devel .cvsignore, 1.6, 1.7 comix.spec, 1.13, 1.14 sources, 1.6, 1.7 comix-3.6.4-command-argument-closure.patch, 1.1, NONE comix-3.6.4-tmpfile.patch, 1.2, NONE Message-ID: <200807091552.m69Fqt6L023762@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/comix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23592/devel Modified Files: .cvsignore comix.spec sources Removed Files: comix-3.6.4-command-argument-closure.patch comix-3.6.4-tmpfile.patch Log Message: * Thu Jul 10 2008 Mamoru Tasaka - 3.6.5-1 - 3.6.5 (2 patches applied upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 May 2007 15:14:51 -0000 1.6 +++ .cvsignore 9 Jul 2008 15:52:01 -0000 1.7 @@ -1 +1 @@ -comix-3.6.4.tar.gz +comix-3.6.5.tar.gz Index: comix.spec =================================================================== RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- comix.spec 2 Apr 2008 16:34:03 -0000 1.13 +++ comix.spec 9 Jul 2008 15:52:01 -0000 1.14 @@ -1,14 +1,12 @@ Name: comix -Version: 3.6.4 -Release: 6%{?dist} +Version: 3.6.5 +Release: 1%{?dist} Summary: A user-friendly, customizable image viewer Group: Amusements/Graphics URL: http://comix.sourceforge.net/ License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: comix-3.6.4-command-argument-closure.patch -Patch1: comix-3.6.4-tmpfile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -33,8 +31,6 @@ %prep %setup -q -%patch0 -p1 -b .CVE-2008-1568 -%patch1 -p1 -b .tmpfile %build %{__sed} -i -e 's|shutil.copy|shutil.copy2|' install.py @@ -136,9 +132,13 @@ %changelog +* Thu Jul 10 2008 Mamoru Tasaka - 3.6.5-1 +- 3.6.5 (2 patches applied upstream) + * Thu Apr 3 2008 Mamoru Tasaka - 3.6.4-6 - Second patch for bug 430635 Use tempfile.mkdtemp() for multiple user race condition + (tagged as CVE-2008-1796) * Wed Apr 2 2008 Mamoru Tasaka - 3.6.4-4 - First patch for bug 430635 Index: sources =================================================================== RCS file: /cvs/extras/rpms/comix/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 May 2007 15:14:51 -0000 1.6 +++ sources 9 Jul 2008 15:52:01 -0000 1.7 @@ -1 +1 @@ -1ece2cde0057abf5913b0f2933d839ab comix-3.6.4.tar.gz +4f6210ee04b5b01cb37ab58638278a03 comix-3.6.5.tar.gz --- comix-3.6.4-command-argument-closure.patch DELETED --- --- comix-3.6.4-tmpfile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 16:06:45 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 9 Jul 2008 16:06:45 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1568,1.1569 Message-ID: <200807091606.m69G6jXg031174@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31122 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#452385 add postgress-jdbc to default classpath Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1568 retrieving revision 1.1569 diff -u -r1.1568 -r1.1569 --- openoffice.org.spec 8 Jul 2008 15:23:48 -0000 1.1568 +++ openoffice.org.spec 9 Jul 2008 16:05:55 -0000 1.1569 @@ -1,6 +1,6 @@ %define oootag DEV300 %define ooomilestone 23 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -196,6 +196,7 @@ Summary: Database GUI libraries for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: postgresql-jdbc %description base-core GUI database libraries for %{name}. @@ -1492,7 +1493,7 @@ # unpack presenter screen extension install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt -%define presenter-screen-id %(grep identifier $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\" -f 2) +%define presenterscreenid %(grep identifier %{_builddir}/%{?buildsubdir}/sdext/unxlng*.pro/misc/PresenterScreen/description.xml | cut -d\\\" -f 2) # revoke ScriptProviders and make into extensions pushd $RPM_BUILD_ROOT/%{basisinstdir}/program @@ -1959,6 +1960,9 @@ cp -r psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{basisinstdir}/share/psprint/driver/SGENPRT.PS %endif +# rhbz#452385 +sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{basisinstdir}/program/fundamentalbasisrc + %clean rm -rf $RPM_BUILD_ROOT @@ -2993,7 +2997,7 @@ %pre presenter-screen if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared %{presenter-screen-id} || : + unopkg remove --shared %{presenterscreenid} || : fi %post presenter-screen @@ -3003,7 +3007,7 @@ %preun presenter-screen if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared %{presenter-screen-id} || : + unopkg remove --shared %{presenterscreenid} || : fi %postun presenter-screen @@ -3580,6 +3584,9 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Wed Jul 09 2008 Caolan McNamara - 1:3.0.0-0.23-2 +- Resolves: rhbz#452385 add postgress-jdbc to default classpath + * Mon Jul 07 2008 Caolan McNamara - 1:3.0.0-0.23-1 - next version - drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch From fedora-extras-commits at redhat.com Wed Jul 9 16:14:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:14:59 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GExKr008385@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the watchcommits acl on gnome-do (Fedora devel) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:00 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF0nX008388@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the watchbugzilla acl on gnome-do (Fedora devel) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:00 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF0NM008407@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gnome-do (Fedora devel) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:02 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF22k008448@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the watchcommits acl on gnome-do (Fedora 8) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:02 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF22h008448@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the watchbugzilla acl on gnome-do (Fedora 8) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:01 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF0NP008407@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the approveacls acl on gnome-do (Fedora devel) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:04 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF0na008388@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gnome-do (Fedora 8) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:05 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF0nd008388@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the approveacls acl on gnome-do (Fedora 8) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:09 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GExKu008385@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the watchbugzilla acl on gnome-do (Fedora 9) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:09 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GExKx008385@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the watchcommits acl on gnome-do (Fedora 9) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:13 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GF0NS008407@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the approveacls acl on gnome-do (Fedora 9) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:15:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:15:13 +0000 Subject: [pkgdb] gnome-do had acl change status Message-ID: <200807091615.m69GFEZ3008598@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gnome-do (Fedora 9) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do From fedora-extras-commits at redhat.com Wed Jul 9 16:23:07 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 9 Jul 2008 16:23:07 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.855, 1.856 kernel.spec, 1.746, 1.747 sources, 1.816, 1.817 upstream, 1.734, 1.735 linux-2.6-reiserfs-discard-prealloc.patch, 1.1, NONE patch-2.6.26-rc9-git4.bz2.sign, 1.1, NONE Message-ID: <200807091623.m69GN7GP032243@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32163 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git5.bz2.sign Removed Files: linux-2.6-reiserfs-discard-prealloc.patch patch-2.6.26-rc9-git4.bz2.sign Log Message: 2.6.26-rc9-git5 --- NEW FILE patch-2.6.26-rc9-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIdGJsyGugalF9Dw4RArekAJ9qpQcpLlMZBair6DGz7IuCSZof0QCeJUhA Ki5QaouI5jk8PgZOPiDdmS8= =5NWA -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.855 retrieving revision 1.856 diff -u -r1.855 -r1.856 --- .cvsignore 8 Jul 2008 19:39:32 -0000 1.855 +++ .cvsignore 9 Jul 2008 16:22:18 -0000 1.856 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git4.bz2 +patch-2.6.26-rc9-git5.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.746 retrieving revision 1.747 diff -u -r1.746 -r1.747 --- kernel.spec 9 Jul 2008 04:54:02 -0000 1.746 +++ kernel.spec 9 Jul 2008 16:22:18 -0000 1.747 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -656,9 +656,6 @@ # atl2 network driver Patch2020: linux-2.6-netdev-atl2.patch -# reiserfs list corruption -Patch2200: linux-2.6-reiserfs-discard-prealloc.patch - # make USB EHCI driver respect "nousb" parameter Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch # Fix HID usage descriptor on MS wireless desktop receiver @@ -1056,9 +1053,6 @@ # bugfixes to drivers and filesystems # -# reiserfs -ApplyPatch linux-2.6-reiserfs-discard-prealloc.patch - # USB ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch @@ -1795,6 +1789,9 @@ %changelog * Wed Jul 09 2008 Dave Jones +- 2.6.26-rc9-git5 + +* Wed Jul 09 2008 Dave Jones - Reenable paravirt on x86-64. * Tue Jul 8 2008 Roland McGrath Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.816 retrieving revision 1.817 diff -u -r1.816 -r1.817 --- sources 8 Jul 2008 19:39:33 -0000 1.816 +++ sources 9 Jul 2008 16:22:18 -0000 1.817 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -fbf688a2fbdebc5108d328947e9b9314 patch-2.6.26-rc9-git4.bz2 +5789b65d1947398bf048e2e2049a3634 patch-2.6.26-rc9-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.734 retrieving revision 1.735 diff -u -r1.734 -r1.735 --- upstream 8 Jul 2008 19:39:33 -0000 1.734 +++ upstream 9 Jul 2008 16:22:18 -0000 1.735 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git4.bz2 +patch-2.6.26-rc9-git5.bz2 --- linux-2.6-reiserfs-discard-prealloc.patch DELETED --- --- patch-2.6.26-rc9-git4.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 16:25:41 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 16:25:41 GMT Subject: rpms/ruby-aws/F-9 .cvsignore, 1.7, 1.8 ruby-aws.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200807091625.m69GPfBP032481@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-aws/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32361/F-9 Modified Files: .cvsignore ruby-aws.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - 0.4.0-1 - 0.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jun 2008 08:15:52 -0000 1.7 +++ .cvsignore 9 Jul 2008 16:24:54 -0000 1.8 @@ -1 +1 @@ -ruby-aws-0.3.3.tar.gz +ruby-aws-0.4.0.tar.gz Index: ruby-aws.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/F-9/ruby-aws.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ruby-aws.spec 29 Jun 2008 08:15:52 -0000 1.6 +++ ruby-aws.spec 9 Jul 2008 16:24:54 -0000 1.7 @@ -2,7 +2,7 @@ %define rubyabi 1.8 Name: ruby-aws -Version: 0.3.3 +Version: 0.4.0 Release: 1%{?dist} Summary: Ruby interface to Amazon Web Services Group: Development/Languages @@ -17,7 +17,7 @@ #BuildRequires: ruby-devel BuildRequires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi} -Requires: ruby +Requires: ruby >= 1.8.6 Provides: ruby(aws) = %{version}-%{release} # Obsoletes but not Provides, because Ruby/Amazon API is obsolete. Obsoletes: ruby-amazon < 0.9.4 @@ -78,6 +78,9 @@ %doc test/ %changelog +* Thu Jul 10 2008 Mamoru Tasaka - 0.4.0-1 +- 0.4.0 + * Sun Jun 29 2008 Mamoru Tasaka - 0.3.3-1 - 0.3.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jun 2008 08:15:52 -0000 1.7 +++ sources 9 Jul 2008 16:24:54 -0000 1.8 @@ -1 +1 @@ -4a740e49d55f54cea3446d29975d519c ruby-aws-0.3.3.tar.gz +3e7d5af63e747028544b0db62a545beb ruby-aws-0.4.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 16:25:53 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 16:25:53 GMT Subject: rpms/ruby-aws/F-8 .cvsignore, 1.7, 1.8 ruby-aws.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200807091625.m69GPrtn032496@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-aws/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32361/F-8 Modified Files: .cvsignore ruby-aws.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - 0.4.0-1 - 0.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jun 2008 08:15:27 -0000 1.7 +++ .cvsignore 9 Jul 2008 16:24:25 -0000 1.8 @@ -1 +1 @@ -ruby-aws-0.3.3.tar.gz +ruby-aws-0.4.0.tar.gz Index: ruby-aws.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/F-8/ruby-aws.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ruby-aws.spec 29 Jun 2008 08:15:27 -0000 1.6 +++ ruby-aws.spec 9 Jul 2008 16:24:25 -0000 1.7 @@ -2,7 +2,7 @@ %define rubyabi 1.8 Name: ruby-aws -Version: 0.3.3 +Version: 0.4.0 Release: 1%{?dist} Summary: Ruby interface to Amazon Web Services Group: Development/Languages @@ -17,7 +17,7 @@ #BuildRequires: ruby-devel BuildRequires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi} -Requires: ruby +Requires: ruby >= 1.8.6 Provides: ruby(aws) = %{version}-%{release} # Obsoletes but not Provides, because Ruby/Amazon API is obsolete. Obsoletes: ruby-amazon < 0.9.4 @@ -78,6 +78,9 @@ %doc test/ %changelog +* Thu Jul 10 2008 Mamoru Tasaka - 0.4.0-1 +- 0.4.0 + * Sun Jun 29 2008 Mamoru Tasaka - 0.3.3-1 - 0.3.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jun 2008 08:15:27 -0000 1.7 +++ sources 9 Jul 2008 16:24:25 -0000 1.8 @@ -1 +1 @@ -4a740e49d55f54cea3446d29975d519c ruby-aws-0.3.3.tar.gz +3e7d5af63e747028544b0db62a545beb ruby-aws-0.4.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 16:26:01 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 16:26:01 GMT Subject: rpms/ruby-aws/devel .cvsignore, 1.7, 1.8 ruby-aws.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200807091626.m69GQ13F032504@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-aws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32361/devel Modified Files: .cvsignore ruby-aws.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - 0.4.0-1 - 0.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jun 2008 08:16:08 -0000 1.7 +++ .cvsignore 9 Jul 2008 16:25:12 -0000 1.8 @@ -1 +1 @@ -ruby-aws-0.3.3.tar.gz +ruby-aws-0.4.0.tar.gz Index: ruby-aws.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/devel/ruby-aws.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ruby-aws.spec 29 Jun 2008 08:16:08 -0000 1.6 +++ ruby-aws.spec 9 Jul 2008 16:25:12 -0000 1.7 @@ -2,7 +2,7 @@ %define rubyabi 1.8 Name: ruby-aws -Version: 0.3.3 +Version: 0.4.0 Release: 1%{?dist} Summary: Ruby interface to Amazon Web Services Group: Development/Languages @@ -17,7 +17,7 @@ #BuildRequires: ruby-devel BuildRequires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi} -Requires: ruby +Requires: ruby >= 1.8.6 Provides: ruby(aws) = %{version}-%{release} # Obsoletes but not Provides, because Ruby/Amazon API is obsolete. Obsoletes: ruby-amazon < 0.9.4 @@ -78,6 +78,9 @@ %doc test/ %changelog +* Thu Jul 10 2008 Mamoru Tasaka - 0.4.0-1 +- 0.4.0 + * Sun Jun 29 2008 Mamoru Tasaka - 0.3.3-1 - 0.3.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-aws/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jun 2008 08:16:08 -0000 1.7 +++ sources 9 Jul 2008 16:25:12 -0000 1.8 @@ -1 +1 @@ -4a740e49d55f54cea3446d29975d519c ruby-aws-0.3.3.tar.gz +3e7d5af63e747028544b0db62a545beb ruby-aws-0.4.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 16:29:15 2008 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Wed, 9 Jul 2008 16:29:15 GMT Subject: rpms/drgeo/devel drgeo.patch,NONE,1.1 drgeo.spec,1.11,1.12 Message-ID: <200807091629.m69GTFoh000333@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/drgeo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32714 Modified Files: drgeo.spec Added Files: drgeo.patch Log Message: drgeo.patch: --- NEW FILE drgeo.patch --- --- ./geo/drgeo_figure.cc 2008-07-08 02:38:50.000000000 -0400 +++ ./geo/drgeo_figure.cc~ 2005-07-14 03:30:01.000000000 -0400 @@ -1309,7 +1309,7 @@ gint drgeoFigure::preferedUndoLevel () { - atoi (drgeoConfigGet (":undoLevel")); + return atoi (drgeoConfigGet (":undoLevel")); } void Index: drgeo.spec =================================================================== RCS file: /cvs/extras/rpms/drgeo/devel/drgeo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- drgeo.spec 20 Feb 2008 03:41:54 -0000 1.11 +++ drgeo.spec 9 Jul 2008 16:28:15 -0000 1.12 @@ -1,13 +1,14 @@ Summary: Interactive educational geometry software Name: drgeo Version: 1.1.0 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://www.ofset.org/drgeo Source: http://dl.sf.net/ofset/drgeo-%{version}.tar.gz Patch0: drgeo-1.1.0-htmlview.patch +Patch1: drgeo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, bison, gmp-devel >= 2.0.2, desktop-file-utils @@ -24,6 +25,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure @@ -61,6 +63,9 @@ %{_datadir}/applications/fedora-drgeo.desktop %changelog +* Tue Jul 08 2008 Eric Tanguy - 1.1.0-13 +- BZ 454045 + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.0-12 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 16:49:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:49:09 +0000 Subject: [pkgdb] tex-simplecv was added for jamatos Message-ID: <200807091649.m69GnAUp010402@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package tex-simplecv with summary LaTeX class for writing curricula vitae Kevin Fenzi (kevin) has approved Package tex-simplecv Kevin Fenzi (kevin) has added a Fedora devel branch for tex-simplecv with an owner of jamatos Kevin Fenzi (kevin) has approved tex-simplecv in Fedora devel Kevin Fenzi (kevin) has approved Package tex-simplecv Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-simplecv (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-simplecv (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-simplecv (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-simplecv From fedora-extras-commits at redhat.com Wed Jul 9 16:49:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:49:18 +0000 Subject: [pkgdb] tex-simplecv (Fedora EPEL, 5) updated by kevin Message-ID: <200807091649.m69GnInU010423@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for tex-simplecv Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-simplecv (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-simplecv (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-simplecv (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-simplecv (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-simplecv From fedora-extras-commits at redhat.com Wed Jul 9 16:49:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:49:18 +0000 Subject: [pkgdb] tex-simplecv (Fedora, 8) updated by kevin Message-ID: <200807091649.m69GnIjw010422@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for tex-simplecv Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-simplecv (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-simplecv (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-simplecv (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-simplecv (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-simplecv From fedora-extras-commits at redhat.com Wed Jul 9 16:49:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:49:18 +0000 Subject: [pkgdb] tex-simplecv (Fedora, 9) updated by kevin Message-ID: <200807091649.m69GnInX010423@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for tex-simplecv Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-simplecv (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-simplecv (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-simplecv (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-simplecv (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-simplecv From fedora-extras-commits at redhat.com Wed Jul 9 16:49:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:49:18 +0000 Subject: [pkgdb] tex-simplecv (Fedora, devel) updated by kevin Message-ID: <200807091649.m69GnIk1010422@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-simplecv (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-simplecv From fedora-extras-commits at redhat.com Wed Jul 9 16:49:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:49:18 +0000 Subject: [pkgdb] tex-simplecv (Fedora EPEL, 4) updated by kevin Message-ID: <200807091649.m69GnIna010423@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for tex-simplecv Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tex-simplecv (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tex-simplecv (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tex-simplecv (Fedora EPEL 4) Kevin Fenzi (kevin) Approved cvsextras for commit access on tex-simplecv (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tex-simplecv From fedora-extras-commits at redhat.com Wed Jul 9 16:50:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:50:08 GMT Subject: rpms/tex-simplecv - New directory Message-ID: <200807091650.m69Go8Vw001410@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-simplecv In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYQ1359/rpms/tex-simplecv Log Message: Directory /cvs/extras/rpms/tex-simplecv added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:50:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:50:29 GMT Subject: rpms/tex-simplecv/devel - New directory Message-ID: <200807091650.m69GoTs7001435@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-simplecv/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYQ1359/rpms/tex-simplecv/devel Log Message: Directory /cvs/extras/rpms/tex-simplecv/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:50:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:50:43 GMT Subject: rpms/tex-simplecv Makefile,NONE,1.1 Message-ID: <200807091650.m69Gohr6001501@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-simplecv In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYQ1359/rpms/tex-simplecv Added Files: Makefile Log Message: Setup of module tex-simplecv --- NEW FILE Makefile --- # Top level Makefile for module tex-simplecv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 16:50:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:50:59 GMT Subject: rpms/tex-simplecv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807091650.m69Gox9s001520@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tex-simplecv/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYQ1359/rpms/tex-simplecv/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tex-simplecv --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tex-simplecv # $Id: Makefile,v 1.1 2008/07/09 16:50:44 kevin Exp $ NAME := tex-simplecv SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 16:52:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:52:07 +0000 Subject: [pkgdb] monotorrent was added for pfj Message-ID: <200807091652.m69Gq7c3010745@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package monotorrent with summary Bittorrent client for .NET Kevin Fenzi (kevin) has approved Package monotorrent Kevin Fenzi (kevin) has added a Fedora devel branch for monotorrent with an owner of pfj Kevin Fenzi (kevin) has approved monotorrent in Fedora devel Kevin Fenzi (kevin) has approved Package monotorrent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on monotorrent (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on monotorrent (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on monotorrent (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/monotorrent From fedora-extras-commits at redhat.com Wed Jul 9 16:52:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:52:09 +0000 Subject: [pkgdb] monotorrent (Fedora, 8) updated by kevin Message-ID: <200807091652.m69Gq99t010764@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for monotorrent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on monotorrent (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on monotorrent (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on monotorrent (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on monotorrent (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/monotorrent From fedora-extras-commits at redhat.com Wed Jul 9 16:52:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:52:09 +0000 Subject: [pkgdb] monotorrent (Fedora, 9) updated by kevin Message-ID: <200807091652.m69Gq99w010764@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for monotorrent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on monotorrent (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on monotorrent (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on monotorrent (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on monotorrent (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/monotorrent From fedora-extras-commits at redhat.com Wed Jul 9 16:52:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:52:09 +0000 Subject: [pkgdb] monotorrent (Fedora, devel) updated by kevin Message-ID: <200807091652.m69Gq9A1010764@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on monotorrent (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/monotorrent From fedora-extras-commits at redhat.com Wed Jul 9 16:53:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:53:48 GMT Subject: rpms/monotorrent - New directory Message-ID: <200807091653.m69GrmT6001873@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/monotorrent In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoJ1828/rpms/monotorrent Log Message: Directory /cvs/extras/rpms/monotorrent added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:54:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:54:01 GMT Subject: rpms/monotorrent/devel - New directory Message-ID: <200807091654.m69Gs1I8001893@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/monotorrent/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoJ1828/rpms/monotorrent/devel Log Message: Directory /cvs/extras/rpms/monotorrent/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:54:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:54:23 GMT Subject: rpms/monotorrent Makefile,NONE,1.1 Message-ID: <200807091654.m69GsNR9001918@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/monotorrent In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoJ1828/rpms/monotorrent Added Files: Makefile Log Message: Setup of module monotorrent --- NEW FILE Makefile --- # Top level Makefile for module monotorrent all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 16:54:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:54:39 GMT Subject: rpms/monotorrent/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807091654.m69Gsdwl001943@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/monotorrent/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoJ1828/rpms/monotorrent/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module monotorrent --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: monotorrent # $Id: Makefile,v 1.1 2008/07/09 16:54:23 kevin Exp $ NAME := monotorrent SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 16:55:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:55:01 +0000 Subject: [pkgdb] bmake was added for jmmv Message-ID: <200807091655.m69Gt1bO010972@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package bmake with summary The NetBSD make(1) tool Kevin Fenzi (kevin) has approved Package bmake Kevin Fenzi (kevin) has added a Fedora devel branch for bmake with an owner of jmmv Kevin Fenzi (kevin) has approved bmake in Fedora devel Kevin Fenzi (kevin) has approved Package bmake Kevin Fenzi (kevin) has set commit to Approved for cvsextras on bmake (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on bmake (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on bmake (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bmake From fedora-extras-commits at redhat.com Wed Jul 9 16:55:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:55:02 +0000 Subject: [pkgdb] bmake (Fedora, 9) updated by kevin Message-ID: <200807091655.m69Gt2ZW010991@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for bmake Kevin Fenzi (kevin) has set commit to Approved for cvsextras on bmake (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on bmake (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on bmake (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on bmake (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bmake From fedora-extras-commits at redhat.com Wed Jul 9 16:55:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:55:02 +0000 Subject: [pkgdb] bmake (Fedora, devel) updated by kevin Message-ID: <200807091655.m69Gt2ZZ010991@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on bmake (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bmake From fedora-extras-commits at redhat.com Wed Jul 9 16:55:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:55:32 GMT Subject: rpms/bmake - New directory Message-ID: <200807091655.m69GtWlE002124@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/bmake In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKk2076/rpms/bmake Log Message: Directory /cvs/extras/rpms/bmake added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:55:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:55:43 GMT Subject: rpms/bmake/devel - New directory Message-ID: <200807091655.m69GthxT002165@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/bmake/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKk2076/rpms/bmake/devel Log Message: Directory /cvs/extras/rpms/bmake/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:55:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:55:58 GMT Subject: rpms/bmake Makefile,NONE,1.1 Message-ID: <200807091655.m69Gtwfx002191@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/bmake In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKk2076/rpms/bmake Added Files: Makefile Log Message: Setup of module bmake --- NEW FILE Makefile --- # Top level Makefile for module bmake all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 16:56:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 16:56:05 GMT Subject: rpms/adaptx/devel adaptx.spec,1.19,1.20 Message-ID: <200807091656.m69Gu5PS002208@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/adaptx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2085/devel Modified Files: adaptx.spec Log Message: drop repotag Index: adaptx.spec =================================================================== RCS file: /cvs/pkgs/rpms/adaptx/devel/adaptx.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- adaptx.spec 19 Feb 2008 17:37:58 -0000 1.19 +++ adaptx.spec 9 Jul 2008 16:55:19 -0000 1.20 @@ -34,7 +34,7 @@ Name: adaptx Version: 0.9.13 -Release: 5jpp.3%{?dist} +Release: 6%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -170,6 +170,9 @@ %doc build/doc/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 0.9.13-6 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.13-5jpp.3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 16:56:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:56:09 +0000 Subject: [pkgdb] python-nss was added for jdennis Message-ID: <200807091656.m69Gu9jH011142@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-nss with summary Python bindings for Network Security Services (NSS) Kevin Fenzi (kevin) has approved Package python-nss Kevin Fenzi (kevin) has added a Fedora devel branch for python-nss with an owner of jdennis Kevin Fenzi (kevin) has approved python-nss in Fedora devel Kevin Fenzi (kevin) has approved Package python-nss Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nss (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nss (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nss (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nss From fedora-extras-commits at redhat.com Wed Jul 9 16:56:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:56:10 +0000 Subject: [pkgdb] python-nss (Fedora, devel) updated by kevin Message-ID: <200807091656.m69GuAaw011148@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-nss (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nss From fedora-extras-commits at redhat.com Wed Jul 9 16:56:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:56:10 +0000 Subject: [pkgdb] python-nss (Fedora, 9) updated by kevin Message-ID: <200807091656.m69GuAb1011148@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-nss Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nss (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nss (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nss (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-nss (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nss From fedora-extras-commits at redhat.com Wed Jul 9 16:56:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:56:15 GMT Subject: rpms/bmake/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807091656.m69GuFBv002218@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/bmake/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKk2076/rpms/bmake/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bmake --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: bmake # $Id: Makefile,v 1.1 2008/07/09 16:55:58 kevin Exp $ NAME := bmake SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 16:56:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:56:42 GMT Subject: rpms/python-nss - New directory Message-ID: <200807091656.m69Gug08002323@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-nss In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz2291/rpms/python-nss Log Message: Directory /cvs/extras/rpms/python-nss added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:56:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:56:58 GMT Subject: rpms/python-nss/devel - New directory Message-ID: <200807091656.m69GuwRF002351@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-nss/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz2291/rpms/python-nss/devel Log Message: Directory /cvs/extras/rpms/python-nss/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:57:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:57:10 GMT Subject: rpms/python-nss Makefile,NONE,1.1 Message-ID: <200807091657.m69GvAaS002383@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-nss In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz2291/rpms/python-nss Added Files: Makefile Log Message: Setup of module python-nss --- NEW FILE Makefile --- # Top level Makefile for module python-nss all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 16:57:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:57:15 +0000 Subject: [pkgdb] mk-files was added for jmmv Message-ID: <200807091657.m69GvF2N011408@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package mk-files with summary Support files for bmake, the NetBSD make(1) tool Kevin Fenzi (kevin) has approved Package mk-files Kevin Fenzi (kevin) has added a Fedora devel branch for mk-files with an owner of jmmv Kevin Fenzi (kevin) has approved mk-files in Fedora devel Kevin Fenzi (kevin) has approved Package mk-files Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mk-files (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mk-files (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mk-files (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mk-files From fedora-extras-commits at redhat.com Wed Jul 9 16:57:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:57:19 +0000 Subject: [pkgdb] mk-files (Fedora, devel) updated by kevin Message-ID: <200807091657.m69GvJru011427@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on mk-files (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mk-files From fedora-extras-commits at redhat.com Wed Jul 9 16:57:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:57:19 +0000 Subject: [pkgdb] mk-files (Fedora, 9) updated by kevin Message-ID: <200807091657.m69GvJrx011427@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for mk-files Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mk-files (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mk-files (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mk-files (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on mk-files (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mk-files From fedora-extras-commits at redhat.com Wed Jul 9 16:57:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:57:24 GMT Subject: rpms/python-nss/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807091657.m69GvOd8002403@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-nss/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXz2291/rpms/python-nss/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-nss --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-nss # $Id: Makefile,v 1.1 2008/07/09 16:57:10 kevin Exp $ NAME := python-nss SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 16:57:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:57:55 GMT Subject: rpms/mk-files - New directory Message-ID: <200807091657.m69GvtN8002511@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mk-files In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYp2478/rpms/mk-files Log Message: Directory /cvs/extras/rpms/mk-files added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:58:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:58:08 GMT Subject: rpms/mk-files/devel - New directory Message-ID: <200807091658.m69Gw8Bt002529@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mk-files/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYp2478/rpms/mk-files/devel Log Message: Directory /cvs/extras/rpms/mk-files/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:58:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:58:23 GMT Subject: rpms/mk-files Makefile,NONE,1.1 Message-ID: <200807091658.m69GwNDw002573@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mk-files In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYp2478/rpms/mk-files Added Files: Makefile Log Message: Setup of module mk-files --- NEW FILE Makefile --- # Top level Makefile for module mk-files all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 16:58:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:58:26 +0000 Subject: [pkgdb] npush was added for cheekyboinc Message-ID: <200807091658.m69GwQQZ011589@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package npush with summary a logic game similar to Sokoban Kevin Fenzi (kevin) has approved Package npush Kevin Fenzi (kevin) has added a Fedora devel branch for npush with an owner of cheekyboinc Kevin Fenzi (kevin) has approved npush in Fedora devel Kevin Fenzi (kevin) has approved Package npush Kevin Fenzi (kevin) has set commit to Approved for cvsextras on npush (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on npush (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on npush (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/npush From fedora-extras-commits at redhat.com Wed Jul 9 16:58:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:58:29 +0000 Subject: [pkgdb] npush (Fedora, devel) updated by kevin Message-ID: <200807091658.m69GwQQc011589@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on npush (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/npush From fedora-extras-commits at redhat.com Wed Jul 9 16:58:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:58:29 +0000 Subject: [pkgdb] npush (Fedora, 9) updated by kevin Message-ID: <200807091658.m69GwUwp011645@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for npush Kevin Fenzi (kevin) has set commit to Approved for cvsextras on npush (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on npush (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on npush (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on npush (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/npush From fedora-extras-commits at redhat.com Wed Jul 9 16:58:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:58:29 +0000 Subject: [pkgdb] npush (Fedora, 8) updated by kevin Message-ID: <200807091658.m69GwQQf011589@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for npush Kevin Fenzi (kevin) has set commit to Approved for cvsextras on npush (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on npush (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on npush (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on npush (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/npush From fedora-extras-commits at redhat.com Wed Jul 9 16:58:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:58:40 GMT Subject: rpms/mk-files/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807091658.m69GweKQ002615@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mk-files/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYp2478/rpms/mk-files/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mk-files --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mk-files # $Id: Makefile,v 1.1 2008/07/09 16:58:24 kevin Exp $ NAME := mk-files SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 16:59:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:59:10 GMT Subject: rpms/npush - New directory Message-ID: <200807091659.m69GxAQN002749@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/npush In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspH2698/rpms/npush Log Message: Directory /cvs/extras/rpms/npush added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:59:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:59:31 GMT Subject: rpms/npush/devel - New directory Message-ID: <200807091659.m69GxVYd002784@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/npush/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspH2698/rpms/npush/devel Log Message: Directory /cvs/extras/rpms/npush/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 16:59:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:59:33 GMT Subject: rpms/npush Makefile,NONE,1.1 Message-ID: <200807091659.m69GxXSx002817@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/npush In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspH2698/rpms/npush Added Files: Makefile Log Message: Setup of module npush --- NEW FILE Makefile --- # Top level Makefile for module npush all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 16:59:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 16:59:50 GMT Subject: rpms/npush/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807091659.m69GxoYB002883@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/npush/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspH2698/rpms/npush/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module npush --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: npush # $Id: Makefile,v 1.1 2008/07/09 16:59:33 kevin Exp $ NAME := npush SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 16:59:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:59:52 +0000 Subject: [pkgdb] perl-Getopt-Long-Descriptive was added for cweyl Message-ID: <200807091659.m69GxqnZ011822@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Getopt-Long-Descriptive with summary Getopt::Long with usage text Kevin Fenzi (kevin) has approved Package perl-Getopt-Long-Descriptive Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Getopt-Long-Descriptive with an owner of cweyl Kevin Fenzi (kevin) has approved perl-Getopt-Long-Descriptive in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Getopt-Long-Descriptive Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-Long-Descriptive From fedora-extras-commits at redhat.com Wed Jul 9 16:59:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:59:55 +0000 Subject: [pkgdb] perl-Getopt-Long-Descriptive (Fedora, 8) updated by kevin Message-ID: <200807091659.m69Gxtkq011844@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Getopt-Long-Descriptive Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on perl-Getopt-Long-Descriptive (Fedora 8) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Getopt-Long-Descriptive (Fedora 8) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Getopt-Long-Descriptive (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-Long-Descriptive From fedora-extras-commits at redhat.com Wed Jul 9 16:59:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:59:55 +0000 Subject: [pkgdb] perl-Getopt-Long-Descriptive (Fedora, devel) updated by kevin Message-ID: <200807091659.m69Gxtkt011844@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on perl-Getopt-Long-Descriptive (Fedora devel) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Getopt-Long-Descriptive (Fedora devel) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Getopt-Long-Descriptive (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-Long-Descriptive From fedora-extras-commits at redhat.com Wed Jul 9 16:59:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 16:59:55 +0000 Subject: [pkgdb] perl-Getopt-Long-Descriptive (Fedora, 9) updated by kevin Message-ID: <200807091659.m69Gxtkn011844@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Getopt-Long-Descriptive Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Getopt-Long-Descriptive (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on perl-Getopt-Long-Descriptive (Fedora 9) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Getopt-Long-Descriptive (Fedora 9) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Getopt-Long-Descriptive (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Getopt-Long-Descriptive From fedora-extras-commits at redhat.com Wed Jul 9 17:00:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 17:00:25 GMT Subject: rpms/perl-Getopt-Long-Descriptive - New directory Message-ID: <200807091700.m69H0PTE003053@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBU3013/rpms/perl-Getopt-Long-Descriptive Log Message: Directory /cvs/extras/rpms/perl-Getopt-Long-Descriptive added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 17:00:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 17:00:42 GMT Subject: rpms/perl-Getopt-Long-Descriptive/devel - New directory Message-ID: <200807091700.m69H0gFl003074@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBU3013/rpms/perl-Getopt-Long-Descriptive/devel Log Message: Directory /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 9 17:00:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 17:00:59 GMT Subject: rpms/perl-Getopt-Long-Descriptive Makefile,NONE,1.1 Message-ID: <200807091700.m69H0xCF003123@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBU3013/rpms/perl-Getopt-Long-Descriptive Added Files: Makefile Log Message: Setup of module perl-Getopt-Long-Descriptive --- NEW FILE Makefile --- # Top level Makefile for module perl-Getopt-Long-Descriptive all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 9 17:01:30 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 9 Jul 2008 17:01:30 GMT Subject: rpms/perl-Getopt-Long-Descriptive/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807091701.m69H1Uh7009718@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBU3013/rpms/perl-Getopt-Long-Descriptive/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Getopt-Long-Descriptive --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Getopt-Long-Descriptive # $Id: Makefile,v 1.1 2008/07/09 17:00:59 kevin Exp $ NAME := perl-Getopt-Long-Descriptive SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 9 17:01:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:01:34 GMT Subject: rpms/ant/devel ant.spec,1.92,1.93 Message-ID: <200807091701.m69H1YaA009835@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3100 Modified Files: ant.spec Log Message: fix repotag Index: ant.spec =================================================================== RCS file: /cvs/pkgs/rpms/ant/devel/ant.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- ant.spec 21 Feb 2008 02:27:51 -0000 1.92 +++ ant.spec 9 Jul 2008 17:00:49 -0000 1.93 @@ -50,17 +50,16 @@ %define section free %define major_version 1.7 -%define jpprelease 1jpp %define cvs_version 1.7.0 Name: ant Version: 1.7.0 -Release: %{jpprelease}.4%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java -License: Apache Software License +License: ASL 2.0 URL: http://ant.apache.org/ Group: Development/Build Tools Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.gz @@ -96,17 +95,17 @@ BuildArch: noarch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: ant-optional < %{epoch}:%{version}-%{jpprelease} -Obsoletes: ant-optional-full < %{epoch}:%{version}-%{jpprelease} +Obsoletes: ant-optional < %{epoch}:%{version}-%{release} +Obsoletes: ant-optional-full < %{epoch}:%{version}-%{release} # Allow subpackages not in Fedora to be installed from JPackage -Provides: %{name} = %{epoch}:%{version}-%{jpprelease} +Provides: %{name} = %{epoch}:%{version}-%{release} # RHEL3 and FC2 Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2 -Provides: %{name}-libs = %{epoch}:%{version}-%{jpprelease} -Provides: %{name}-core = %{epoch}:%{version}-%{jpprelease} +Provides: %{name}-libs = %{epoch}:%{version}-%{release} +Provides: %{name}-core = %{epoch}:%{version}-%{release} # FC4 Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc -Provides: %{name}-jmf = %{epoch}:%{version}-%{jpprelease} +Provides: %{name}-jmf = %{epoch}:%{version}-%{release} %if %{gcj_support} BuildRequires: java-gcj-compat-devel @@ -1369,6 +1368,10 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1.7.0-2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.7.0-1jpp.4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:02:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:02:48 GMT Subject: rpms/antlr/devel antlr.spec,1.38,1.39 Message-ID: <200807091702.m69H2mOR010036@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/antlr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9945 Modified Files: antlr.spec Log Message: fix repotag Index: antlr.spec =================================================================== RCS file: /cvs/pkgs/rpms/antlr/devel/antlr.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- antlr.spec 28 Feb 2008 00:16:17 -0000 1.38 +++ antlr.spec 9 Jul 2008 17:02:01 -0000 1.39 @@ -39,7 +39,7 @@ Summary: ANother Tool for Language Recognition Name: antlr Version: 2.7.7 -Release: 1jpp.7%{?dist} +Release: 2%{?dist} Epoch: 0 License: Public Domain URL: http://www.antlr.org/ @@ -311,6 +311,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 2.7.7-2 +- drop repotag + * Wed Feb 27 2008 Deepak Bhole - 0:2.7.7-1jpp.7 - Add strings inclusion (for GCC 4.3) From fedora-extras-commits at redhat.com Wed Jul 9 17:03:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:03:56 GMT Subject: rpms/asm2/devel asm2.spec,1.3,1.4 Message-ID: <200807091703.m69H3uZ4010189@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/asm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10135 Modified Files: asm2.spec Log Message: fix repotag Index: asm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/asm2/devel/asm2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- asm2.spec 22 Jan 2008 15:45:18 -0000 1.3 +++ asm2.spec 9 Jul 2008 17:03:07 -0000 1.4 @@ -34,7 +34,7 @@ Name: asm2 Version: 2.2.3 -Release: 2jpp.1%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -305,6 +305,9 @@ %{_datadir}/%{name}-%{version}/examples %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.2.3-3 +- drop repotag + * Tue Jan 22 2008 Permaine Cheung - 0:2.2.3-2jpp.1 - Merge with upstream From fedora-extras-commits at redhat.com Wed Jul 9 17:05:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:05:02 GMT Subject: rpms/avalon-framework/devel avalon-framework.spec,1.24,1.25 Message-ID: <200807091705.m69H5243010322@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/avalon-framework/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253 Modified Files: avalon-framework.spec Log Message: fix repotag Index: avalon-framework.spec =================================================================== RCS file: /cvs/pkgs/rpms/avalon-framework/devel/avalon-framework.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- avalon-framework.spec 19 Feb 2008 17:40:11 -0000 1.24 +++ avalon-framework.spec 9 Jul 2008 17:04:12 -0000 1.25 @@ -36,10 +36,10 @@ Name: avalon-%{short_name} Version: 4.1.4 -Release: 3jpp.14%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Java components interfaces -License: Apache Software License +License: ASL 1.1 Url: http://avalon.apache.org/%{short_name}/ Group: Development/Libraries/Application Frameworks Source0: http://www.apache.org/dist/avalon/framework/v4.1.4/Avalon-4.1.4-src.tar.gz @@ -160,6 +160,10 @@ %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:4.1.4-4 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:4.1.4-3jpp.14 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:06:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:06:07 GMT Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.27,1.28 Message-ID: <200807091706.m69H67j0010454@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/avalon-logkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10419 Modified Files: avalon-logkit.spec Log Message: fix repotag Index: avalon-logkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/avalon-logkit/devel/avalon-logkit.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- avalon-logkit.spec 19 Feb 2008 17:41:23 -0000 1.27 +++ avalon-logkit.spec 9 Jul 2008 17:05:20 -0000 1.28 @@ -37,10 +37,10 @@ Name: avalon-%{short_name} Version: 1.2 -Release: 5jpp.5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: Java logging toolkit -License: Apache Software License +License: ASL 1.1 Group: Development/Libraries/Java Url: http://avalon.apache.org/%{short_name}/ Source0: http://www.apache.org/dist/avalon/logkit/LogKit-1.2-src.tar.gz @@ -155,6 +155,10 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2-6 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.2-5jpp.5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:07:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:07:20 GMT Subject: rpms/axis/devel axis.spec,1.25,1.26 Message-ID: <200807091707.m69H7K06010567@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/axis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10507 Modified Files: axis.spec Log Message: fix repotag Index: axis.spec =================================================================== RCS file: /cvs/pkgs/rpms/axis/devel/axis.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- axis.spec 5 Jun 2008 12:53:48 -0000 1.25 +++ axis.spec 9 Jul 2008 17:06:26 -0000 1.26 @@ -7,10 +7,10 @@ Name: axis Version: 1.2.1 -Release: 3jpp.9%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: A SOAP implementation in Java -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java Url: http://ws.apache.org/%{name}/ Source0: http://archive.apache.org/dist/ws/axis/1_2_1/axis-src-1_2_1.tar.gz @@ -215,6 +215,10 @@ %doc docs/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 0:1.2.1-4 +- drop repotag +- fix license tag + * Thu Jun 05 2008 Permaine Cheung 0:1.2.1-3jpp.9 - Add javac.source=1.4 to the ant command for the build From fedora-extras-commits at redhat.com Wed Jul 9 17:13:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:13:06 GMT Subject: rpms/bcel/devel bcel.spec,1.34,1.35 Message-ID: <200807091713.m69HD6oc010935@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bcel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10892 Modified Files: bcel.spec Log Message: fix repotag Index: bcel.spec =================================================================== RCS file: /cvs/pkgs/rpms/bcel/devel/bcel.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- bcel.spec 19 Feb 2008 17:43:24 -0000 1.34 +++ bcel.spec 9 Jul 2008 17:12:20 -0000 1.35 @@ -43,7 +43,7 @@ Name: bcel Version: 5.2 -Release: 4jpp.2%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Byte Code Engineering Library License: ASL 2.0 @@ -288,6 +288,9 @@ %doc %{_docdir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:5.2-5 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0:5.2-4jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:14:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:14:13 GMT Subject: rpms/bea-stax/devel bea-stax.spec,1.2,1.3 Message-ID: <200807091714.m69HEDp8011097@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bea-stax/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11007 Modified Files: bea-stax.spec Log Message: fix repotag Index: bea-stax.spec =================================================================== RCS file: /cvs/pkgs/rpms/bea-stax/devel/bea-stax.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bea-stax.spec 19 Feb 2008 17:14:40 -0000 1.2 +++ bea-stax.spec 9 Jul 2008 17:13:24 -0000 1.3 @@ -42,9 +42,9 @@ Patch0: %{name}-ecj-bootclasspath.patch Name: bea-stax Version: 1.2.0 -Release: 0.2.rc1.2jpp.1%{?dist} +Release: 0.3.rc1%{?dist} Epoch: 0 -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java %if ! %{gcj_support} BuildArch: noarch @@ -181,6 +181,10 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.0-0.3.rc1 +- drop repotag +- fix license + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.0-0.2.rc1.2jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:14:15 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Wed, 9 Jul 2008 17:14:15 GMT Subject: rpms/python-nss/devel python-nss.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807091714.m69HEFvn011103@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/python-nss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10948 Modified Files: .cvsignore sources Added Files: python-nss.spec Log Message: initial build, add spec file --- NEW FILE python-nss.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-nss Version: 0.0 Release: 1%{?dist} Summary: Python bindings for Network Security Services (NSS) Group: Development/Languages License: GPLv2+ #URL: Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define docdir %{_docdir}/%{name}-%{version} BuildRequires: python-devel BuildRequires: python-setuptools-devel BuildRequires: epydoc BuildRequires: nspr-devel BuildRequires: nss-devel %description This package provides Python bindings for Network Security Services (NSS) and the Netscape Portable Runtime (NSPR). NSS is a set of libraries supporting security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. Specific NSS implementations have been FIPS-140 certified. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %{__python} setup.py build_doc %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --install-platlib %{python_sitearch} --skip-build --root $RPM_BUILD_ROOT %{__python} setup.py install_doc --docdir %{docdir} --skip-build --root $RPM_BUILD_ROOT # Remove execution permission from any example scripts find $RPM_BUILD_ROOT/%{docdir}/examples -type f | xargs chmod a-x # Set correct permissions on .so files chmod 0755 $RPM_BUILD_ROOT/%{python_sitearch}/nss/*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{docdir} %{python_sitearch}/* %changelog * Fri Jun 27 2008 John Dennis - 0.0-1 - initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-nss/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:57:10 -0000 1.1 +++ .cvsignore 9 Jul 2008 17:13:26 -0000 1.2 @@ -0,0 +1 @@ +python-nss-0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-nss/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:57:10 -0000 1.1 +++ sources 9 Jul 2008 17:13:26 -0000 1.2 @@ -0,0 +1 @@ +031a5262d4526413305de87a7437b18f python-nss-0.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 17:15:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:15:19 GMT Subject: rpms/bsf/devel bsf.spec,1.17,1.18 Message-ID: <200807091715.m69HFJ1k011242@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bsf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11162 Modified Files: bsf.spec Log Message: fix repotag Index: bsf.spec =================================================================== RCS file: /cvs/pkgs/rpms/bsf/devel/bsf.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bsf.spec 19 Feb 2008 17:44:24 -0000 1.17 +++ bsf.spec 9 Jul 2008 17:14:29 -0000 1.18 @@ -34,10 +34,10 @@ Name: bsf Version: 2.3.0 -Release: 12jpp.2%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: Bean Scripting Framework -License: Apache License +License: ASL 1.1 Url: http://jakarta.apache.org/bsf/ Group: Development/Libraries/Java #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz @@ -166,6 +166,10 @@ %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.3.0-13 +- drop repotag +- fix license + * Tue Feb 19 2008 Fedora Release Engineering - 0:2.3.0-12jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:16:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:16:30 GMT Subject: rpms/bsh/devel bsh.spec,1.17,1.18 Message-ID: <200807091716.m69HGUdK011438@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11304 Modified Files: bsh.spec Log Message: fix repotag Index: bsh.spec =================================================================== RCS file: /cvs/pkgs/rpms/bsh/devel/bsh.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bsh.spec 10 Mar 2008 13:59:44 -0000 1.17 +++ bsh.spec 9 Jul 2008 17:15:38 -0000 1.18 @@ -32,10 +32,10 @@ Name: bsh Version: 1.3.0 -Release: 12jpp.3%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java -License: LGPL +License: SPL or LGPLv2+ Source0: %{name}-%{version}-src.tar.bz2 #cvs -d:pserver:anonymous at beanshell.cvs.sourceforge.net:/cvsroot/beanshell login #cvs -z3 -d:pserver:anonymous at beanshell.cvs.sourceforge.net:/cvsroot/beanshell export -r rel_1_3_0_final BeanShell @@ -349,6 +349,10 @@ %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3.0-13 +- drop repotag +- fix license tag + * Mon Mar 10 2008 Permaine Cheung 0:1.3.0-12jpp.3 - Fix bugzilla 436675. Separate menu entry into desktop subpackage. From fedora-extras-commits at redhat.com Wed Jul 9 17:17:26 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 17:17:26 GMT Subject: rpms/jd/F-9 .cvsignore, 1.262, 1.263 jd.spec, 1.299, 1.300 sources, 1.263, 1.264 Message-ID: <200807091717.m69HHQB6011653@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11412/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - rev 2187 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- .cvsignore 7 Jul 2008 17:24:27 -0000 1.262 +++ .cvsignore 9 Jul 2008 17:16:36 -0000 1.263 @@ -1 +1 @@ -jd-2.0.0-svn2183_trunk.tgz +jd-2.0.0-svn2187_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- jd.spec 7 Jul 2008 16:56:43 -0000 1.299 +++ jd.spec 9 Jul 2008 17:16:36 -0000 1.300 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2183_trunk +%define strtag svn2187_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 8 2008 Mamoru Tasaka -- rev 2183 +* Thu Jul 10 2008 Mamoru Tasaka +- rev 2187 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- sources 7 Jul 2008 17:24:27 -0000 1.263 +++ sources 9 Jul 2008 17:16:36 -0000 1.264 @@ -1 +1 @@ -6e3c730af466f8b706abe4216b465c19 jd-2.0.0-svn2183_trunk.tgz +51bec6458fd2d4c02957922313f3bce2 jd-2.0.0-svn2187_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 9 17:17:36 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 17:17:36 GMT Subject: rpms/jd/F-8 .cvsignore, 1.255, 1.256 jd.spec, 1.288, 1.289 sources, 1.256, 1.257 Message-ID: <200807091717.m69HHa5p011662@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11412/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - rev 2187 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- .cvsignore 7 Jul 2008 17:24:05 -0000 1.255 +++ .cvsignore 9 Jul 2008 17:16:15 -0000 1.256 @@ -1 +1 @@ -jd-2.0.0-svn2183_trunk.tgz +jd-2.0.0-svn2187_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.288 retrieving revision 1.289 diff -u -r1.288 -r1.289 --- jd.spec 7 Jul 2008 16:56:20 -0000 1.288 +++ jd.spec 9 Jul 2008 17:16:15 -0000 1.289 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2183_trunk +%define strtag svn2187_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 8 2008 Mamoru Tasaka -- rev 2183 +* Thu Jul 10 2008 Mamoru Tasaka +- rev 2187 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- sources 7 Jul 2008 17:24:05 -0000 1.256 +++ sources 9 Jul 2008 17:16:15 -0000 1.257 @@ -1 +1 @@ -6e3c730af466f8b706abe4216b465c19 jd-2.0.0-svn2183_trunk.tgz +51bec6458fd2d4c02957922313f3bce2 jd-2.0.0-svn2187_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 9 17:17:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:17:36 GMT Subject: rpms/byaccj/devel byaccj.spec,1.3,1.4 Message-ID: <200807091717.m69HHapS011665@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/byaccj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11560 Modified Files: byaccj.spec Log Message: fix repotag Index: byaccj.spec =================================================================== RCS file: /cvs/pkgs/rpms/byaccj/devel/byaccj.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- byaccj.spec 10 Feb 2008 03:18:59 -0000 1.3 +++ byaccj.spec 9 Jul 2008 17:16:48 -0000 1.4 @@ -31,7 +31,7 @@ Summary: Parser Generator with Java Extension Name: byaccj Version: 1.14 -Release: 1jpp.1%{?dist} +Release: 2%{?dist} Epoch: 0 License: Public Domain URL: http://byaccj.sourceforge.net/ @@ -90,6 +90,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.14-2 +- drop repotag + * Sat Feb 9 2008 Devrim GUNDUZ - 0:1.14-1jpp.1 - Update to 1.14 - Cosmetic cleanup in spec From fedora-extras-commits at redhat.com Wed Jul 9 17:17:49 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 17:17:49 GMT Subject: rpms/jd/devel .cvsignore, 1.262, 1.263 jd.spec, 1.305, 1.306 sources, 1.263, 1.264 Message-ID: <200807091717.m69HHnX3011727@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11412/devel Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - rev 2187 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- .cvsignore 7 Jul 2008 17:24:47 -0000 1.262 +++ .cvsignore 9 Jul 2008 17:16:57 -0000 1.263 @@ -1 +1 @@ -jd-2.0.0-svn2183_trunk.tgz +jd-2.0.0-svn2187_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- jd.spec 7 Jul 2008 16:57:00 -0000 1.305 +++ jd.spec 9 Jul 2008 17:16:57 -0000 1.306 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2183_trunk +%define strtag svn2187_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 8 2008 Mamoru Tasaka -- rev 2183 +* Thu Jul 10 2008 Mamoru Tasaka +- rev 2187 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- sources 7 Jul 2008 17:24:47 -0000 1.263 +++ sources 9 Jul 2008 17:16:57 -0000 1.264 @@ -1 +1 @@ -6e3c730af466f8b706abe4216b465c19 jd-2.0.0-svn2183_trunk.tgz +51bec6458fd2d4c02957922313f3bce2 jd-2.0.0-svn2187_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 9 17:18:53 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 9 Jul 2008 17:18:53 GMT Subject: rpms/pam_abl/devel pam_abl-0.2.3-build.patch, NONE, 1.1 pam_abl.spec, 1.6, 1.7 Message-ID: <200807091718.m69HIrxL011961@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam_abl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11733 Modified Files: pam_abl.spec Added Files: pam_abl-0.2.3-build.patch Log Message: * Wed Jul 9 2008 Tomas Mraz - 0.2.3-6 - fix build (#449429) pam_abl-0.2.3-build.patch: --- NEW FILE pam_abl-0.2.3-build.patch --- diff -up pam_abl/pam_abl.map.build pam_abl/pam_abl.map --- pam_abl/pam_abl.map.build 2008-07-09 19:12:36.000000000 +0200 +++ pam_abl/pam_abl.map 2008-07-09 19:12:45.000000000 +0200 @@ -0,0 +1,12 @@ +{ + global: + pam_sm_acct_mgmt; + pam_sm_authenticate; + pam_sm_chauthtok; + pam_sm_close_session; + pam_sm_open_session; + pam_sm_setcred; + + local: + *; +}; diff -up pam_abl/tools/Makefile.build pam_abl/tools/Makefile --- pam_abl/tools/Makefile.build 2008-07-09 19:08:07.000000000 +0200 +++ pam_abl/tools/Makefile 2008-07-09 19:08:07.000000000 +0200 @@ -1,7 +1,7 @@ # Makefile CFLAGS=-Wall -fPIC $(RPM_OPT_FLAGS) -LIBS=-ldb -lpthread +LIBS=-ldb TARGET=pam_abl OBJ=log.o config.o rule.o pam_abl.o INSTDIR=/usr/bin @@ -9,7 +9,7 @@ INSTDIR=/usr/bin all : $(TARGET) $(TARGET) : $(OBJ) - cc $(LIBS) -o $@ $^ + $(CC) $(CFLAGS) $(LIBS) -o $@ $^ install : $(TARGET) install --mode=755 --strip $(TARGET) $(INSTDIR) @@ -18,6 +18,6 @@ clean : rm -f $(TARGET) $(OBJ) depend : - cc -MM *.c > deps + $(CC) -MM *.c > deps include deps diff -up pam_abl/Makefile.build pam_abl/Makefile --- pam_abl/Makefile.build 2008-07-09 19:08:07.000000000 +0200 +++ pam_abl/Makefile 2008-07-09 19:13:20.000000000 +0200 @@ -5,16 +5,17 @@ CFLAGS=-Wall -fPIC $(RPM_OPT_FLAGS) PAMDIR=/lib/security CONFDIR=/etc/security DBDIR=/var/lib/abl -LIBS=-ldb -lpthread +LIBS=-ldb -lpam MODULE=pam_abl.so OBJ=pam_abl.o log.o config.o rule.o SUBDIRS=tools +MAP=pam_abl.map all : $(MODULE) for d in $(SUBDIRS) ; do cd $$d && $(MAKE) $@ && cd .. ; done $(MODULE) : $(OBJ) - ld -x --shared $(LIBS) -o $@ $^ + $(CC) $(CFLAGS) -shared -Wl,--version-script,$(MAP) $(LIBS) -o $@ $^ clean : rm -f $(MODULE) $(OBJ) @@ -27,7 +28,7 @@ install : $(MODULE) for d in t $(SUBDIRS) ; do cd $$d && $(MAKE) $@ && cd .. ; done depend : - cc -MM *.c > deps + $(CC) -MM *.c > deps for d in $(SUBDIRS) ; do cd $$d && $(MAKE) $@ && cd .. ; done test : Index: pam_abl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_abl/devel/pam_abl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pam_abl.spec 21 May 2008 16:44:39 -0000 1.6 +++ pam_abl.spec 9 Jul 2008 17:17:52 -0000 1.7 @@ -1,12 +1,13 @@ Name: pam_abl Summary: A Pluggable Authentication Module (PAM) for auto blacklisting Version: 0.2.3 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD or GPL+ Group: System Environment/Base URL: http://www.hexten.net/sw/pam_abl/ Source0: http://dl.sourceforge.net/sourceforge/pam-abl/%{name}-%{version}.tar.gz Patch0: pam_abl-0.2.3-fixes.patch +Patch1: pam_abl-0.2.3-build.patch BuildRequires: db4-devel, pam-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,7 +20,8 @@ %prep %setup -q -n %{name} -%patch0 -p1 +%patch0 -p1 -b .fixes +%patch1 -p1 -b .build %build make %{?_smp_mflags} @@ -39,7 +41,7 @@ %files %defattr(644,root,root,755) %doc AUTHORS CONFIGURATION COPYING NEWS QUICKSTART THANKS -%doc Copyright conf/system-auth doc +%doc Copyright conf/system-auth doc/*.html doc/*.css %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/security/pam_abl.conf /%{_lib}/security/pam_abl.so @@ -48,6 +50,9 @@ %{_mandir}/man?/%{name}.* %changelog +* Wed Jul 9 2008 Tomas Mraz - 0.2.3-6 +- fix build (#449429) + * Wed May 21 2008 Tom "spot" Callaway - 0.2.3-5 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 17:19:18 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 17:19:18 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.43, 1.44 cairo-dock.spec, 1.55, 1.56 sources, 1.43, 1.44 Message-ID: <200807091719.m69HJIwP012037@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11843 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - rev. 1185 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 8 Jul 2008 17:05:04 -0000 1.43 +++ .cvsignore 9 Jul 2008 17:18:33 -0000 1.44 @@ -1 +1 @@ -cairo-dock-sources-svn1181_trunk.tar.bz2 +cairo-dock-sources-svn1185_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- cairo-dock.spec 8 Jul 2008 17:05:04 -0000 1.55 +++ cairo-dock.spec 9 Jul 2008 17:18:33 -0000 1.56 @@ -498,8 +498,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Wed Jul 9 2008 Mamoru Tasaka -- rev. 1181 +* Thu Jul 10 2008 Mamoru Tasaka +- rev. 1185 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 8 Jul 2008 17:05:04 -0000 1.43 +++ sources 9 Jul 2008 17:18:33 -0000 1.44 @@ -1 +1 @@ -2674e0702dad1d1b99247cf9fb646a3a cairo-dock-sources-svn1181_trunk.tar.bz2 +729be624fefd767225b11d8f28b96eca cairo-dock-sources-svn1185_trunk.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 17:22:35 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 9 Jul 2008 17:22:35 GMT Subject: rpms/cairo-dock/devel cairo-dock.spec,1.56,1.57 Message-ID: <200807091722.m69HMZhH012310@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12250 Modified Files: cairo-dock.spec Log Message: orz Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- cairo-dock.spec 9 Jul 2008 17:18:33 -0000 1.56 +++ cairo-dock.spec 9 Jul 2008 17:21:50 -0000 1.57 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1181_trunk +%define tarballver svn1185_trunk %define mainver 1.6.1 %define build_gecko 1 From fedora-extras-commits at redhat.com Wed Jul 9 17:23:13 2008 From: fedora-extras-commits at redhat.com (Julio M. Merino Vidal (jmmv)) Date: Wed, 9 Jul 2008 17:23:13 GMT Subject: rpms/mk-files/devel import.log, NONE, 1.1 mk-files.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807091723.m69HNDKH012410@cvs-int.fedora.redhat.com> Author: jmmv Update of /cvs/pkgs/rpms/mk-files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12246/devel Modified Files: .cvsignore sources Added Files: import.log mk-files.spec Log Message: * Wed Jul 2 2008 Julio M. Merino Vidal - 20070430-1 - Initial release for Fedora. --- NEW FILE import.log --- mk-files-20070430-1_fc10:HEAD:mk-files-20070430-1.fc10.src.rpm:1215596674 --- NEW FILE mk-files.spec --- Summary: Support files for bmake, the NetBSD make(1) tool Name: mk-files Version: 20070430 Release: 1%{?dist} License: BSD Group: Development/Tools URL: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/ Source0: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/mk-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The mk-files package provides some bmake macros derived from the NetBSD bsd.*.mk macros. These macros allow the creation of simple Makefiles to build all kinds of targets, including, for example, C/C++ programs and/or shared libraries. %prep %setup -q -n mk sed -i.timestamp -e 's|cp_f=-f|cp_f=-pf|' install-mk %build %install rm -rf ${RPM_BUILD_ROOT} install -m 755 -d ${RPM_BUILD_ROOT}%{_datadir}/mk env FORCE_BSD_MK={RPM_BUILD_ROOT}/nonexistent \ SYS_MK_DIR=${RPM_BUILD_ROOT}/nonexistent \ sh install-mk -v -m 644 ${RPM_BUILD_ROOT}%{_datadir}/mk %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc ChangeLog README %dir %{_datadir}/mk %{_datadir}/mk/* %changelog * Wed Jul 2 2008 Julio M. Merino Vidal - 20070430-1 - Initial release for Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mk-files/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:58:24 -0000 1.1 +++ .cvsignore 9 Jul 2008 17:22:30 -0000 1.2 @@ -0,0 +1 @@ +mk-20070430.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mk-files/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:58:24 -0000 1.1 +++ sources 9 Jul 2008 17:22:30 -0000 1.2 @@ -0,0 +1 @@ +b8759ef075d7e2cba60e30fa56654af4 mk-20070430.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 17:24:54 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Wed, 9 Jul 2008 17:24:54 GMT Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.50,1.51 Message-ID: <200807091724.m69HOsKM012553@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12492 Modified Files: java-1.6.0-openjdk.spec Log Message: * Wed Jul 9 2008 Lillian Angel - 1:1.6.0-0.16.b09 - Add runtests define. - Run test suites on JIT architectures only. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- java-1.6.0-openjdk.spec 8 Jul 2008 14:52:15 -0000 1.50 +++ java-1.6.0-openjdk.spec 9 Jul 2008 17:24:01 -0000 1.51 @@ -3,6 +3,9 @@ # java-1.6.0-openjdk-devel. %define gcjbootstrap 0 +# If runtests is 0 test suites will not be run. +%define runtests 1 + %define icedteaver 1.2 %define icedteasnapshot %{nil} %define openjdkver b09 @@ -63,6 +66,12 @@ %endif %endif +# Reduce build time from 27 hours to 12 hours by only running test +# suites on JIT architectures. +%ifnarch %{jit_arches} +%define runtests 0 +%endif + %define buildoutputdir openjdk/control/build/linux-%{archbuild} %if %{gcjbootstrap} @@ -408,6 +417,7 @@ cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext popd +%if %{runtests} # Run jtreg test suite. { echo ====================JTREG TESTING======================== @@ -432,6 +442,7 @@ echo ====================MAUVE TESTING END==================== popd } || : +%endif %install rm -rf $RPM_BUILD_ROOT @@ -899,10 +910,12 @@ %defattr(-,root,root,-) %doc README.src %{_jvmdir}/%{sdkdir}/src.zip +if %{runtests} # FIXME: put these in a separate testresults subpackage. %doc mauve_tests %doc mauve-%{mauvedate}/mauve_output %doc jtreg_output +%endif %files javadoc %defattr(-,root,root,-) @@ -914,7 +927,11 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog -* Wed Jul 8 2008 Lillian Angel - 1:1.6.0-0.16.b09 +* Wed Jul 9 2008 Lillian Angel - 1:1.6.0-0.16.b09 +- Add runtests define. +- Run test suites on JIT architectures only. + +* Tue Jul 8 2008 Lillian Angel - 1:1.6.0-0.16.b09 - Only apply hotspot security patch of jitarches. * Wed Jul 2 2008 Lillian Angel - 1:1.6.0-0.16.b09 From fedora-extras-commits at redhat.com Wed Jul 9 17:28:09 2008 From: fedora-extras-commits at redhat.com (Julio M. Merino Vidal (jmmv)) Date: Wed, 9 Jul 2008 17:28:09 GMT Subject: rpms/mk-files/F-9 import.log, NONE, 1.1 mk-files.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807091728.m69HS99j012809@cvs-int.fedora.redhat.com> Author: jmmv Update of /cvs/pkgs/rpms/mk-files/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12732/F-9 Modified Files: .cvsignore sources Added Files: import.log mk-files.spec Log Message: * Wed Jul 2 2008 Julio M. Merino Vidal - 20070430-1 - Initial release for Fedora. --- NEW FILE import.log --- mk-files-20070430-1_fc10:F-9:mk-files-20070430-1.fc10.src.rpm:1215596957 --- NEW FILE mk-files.spec --- Summary: Support files for bmake, the NetBSD make(1) tool Name: mk-files Version: 20070430 Release: 1%{?dist} License: BSD Group: Development/Tools URL: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/ Source0: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/mk-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The mk-files package provides some bmake macros derived from the NetBSD bsd.*.mk macros. These macros allow the creation of simple Makefiles to build all kinds of targets, including, for example, C/C++ programs and/or shared libraries. %prep %setup -q -n mk sed -i.timestamp -e 's|cp_f=-f|cp_f=-pf|' install-mk %build %install rm -rf ${RPM_BUILD_ROOT} install -m 755 -d ${RPM_BUILD_ROOT}%{_datadir}/mk env FORCE_BSD_MK={RPM_BUILD_ROOT}/nonexistent \ SYS_MK_DIR=${RPM_BUILD_ROOT}/nonexistent \ sh install-mk -v -m 644 ${RPM_BUILD_ROOT}%{_datadir}/mk %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc ChangeLog README %dir %{_datadir}/mk %{_datadir}/mk/* %changelog * Wed Jul 2 2008 Julio M. Merino Vidal - 20070430-1 - Initial release for Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mk-files/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:58:24 -0000 1.1 +++ .cvsignore 9 Jul 2008 17:27:25 -0000 1.2 @@ -0,0 +1 @@ +mk-20070430.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mk-files/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:58:24 -0000 1.1 +++ sources 9 Jul 2008 17:27:25 -0000 1.2 @@ -0,0 +1 @@ +b8759ef075d7e2cba60e30fa56654af4 mk-20070430.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 17:35:48 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 17:35:48 GMT Subject: rpms/perl-Getopt-Long-Descriptive/devel import.log, NONE, 1.1 perl-Getopt-Long-Descriptive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807091735.m69HZmeb013424@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13346/devel Modified Files: .cvsignore sources Added Files: import.log perl-Getopt-Long-Descriptive.spec Log Message: initial commit --- NEW FILE import.log --- perl-Getopt-Long-Descriptive-0_074-1_fc8:HEAD:perl-Getopt-Long-Descriptive-0.074-1.fc8.src.rpm:1215624887 --- NEW FILE perl-Getopt-Long-Descriptive.spec --- Name: perl-Getopt-Long-Descriptive Version: 0.074 Release: 1%{?dist} Summary: Getopt::Long with usage text License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Getopt-Long-Descriptive/ Source0: http://www.cpan.org/authors/id/H/HD/HDP/Getopt-Long-Descriptive-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Scalar) BuildRequires: perl(Params::Validate) >= 0.74 # test BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # not automagically picked up... Requires: perl(IO::Scalar) %description Convenient wrapper for Getopt::Long and program usage output. %prep %setup -q -n Getopt-Long-Descriptive-%{version} perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Jul 08 2008 Chris Weyl 0.074-1 - Specfile autogenerated by cpanspec 1.74. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 17:00:59 -0000 1.1 +++ .cvsignore 9 Jul 2008 17:35:00 -0000 1.2 @@ -0,0 +1 @@ +Getopt-Long-Descriptive-0.074.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 17:00:59 -0000 1.1 +++ sources 9 Jul 2008 17:35:00 -0000 1.2 @@ -0,0 +1 @@ +bf4931dfd87314376ecb74dc8d205944 Getopt-Long-Descriptive-0.074.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 17:38:16 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Wed, 9 Jul 2008 17:38:16 GMT Subject: rpms/swfdec-gnome/devel swfdec-gnome-configure.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 swfdec-gnome.spec, 1.9, 1.10 Message-ID: <200807091738.m69HcGog013552@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/swfdec-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13516 Modified Files: .cvsignore sources swfdec-gnome.spec Added Files: swfdec-gnome-configure.patch Log Message: Update to 2.22.2 and fix build swfdec-gnome-configure.patch: --- NEW FILE swfdec-gnome-configure.patch --- --- swfdec-gnome-2.22.2/configure 2008-04-07 22:10:49.000000000 +0300 +++ swfdec-gnome-2.22.2/configure.new 2008-07-09 19:21:05.000000000 +0300 @@ -6709,9 +6709,9 @@ echo "${ECHO_T}$LINGUAS" >&6; } -SWFDEC_MAJORMINOR=0.6 +SWFDEC_MAJORMINOR=0.7 -SWFDEC_REQUIRED=0.6.0 +SWFDEC_REQUIRED=0.7.0 GTK_REQUIRED=2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Mar 2008 17:35:43 -0000 1.6 +++ .cvsignore 9 Jul 2008 17:37:18 -0000 1.7 @@ -1 +1 @@ -swfdec-gnome-2.22.0.tar.bz2 +swfdec-gnome-2.22.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Mar 2008 17:35:44 -0000 1.6 +++ sources 9 Jul 2008 17:37:18 -0000 1.7 @@ -1 +1 @@ -ad591fe838ed293a1d1f2bb7307d56d3 swfdec-gnome-2.22.0.tar.bz2 +7de99aff7978bc870e1eabb4ba8f0fc7 swfdec-gnome-2.22.2.tar.bz2 Index: swfdec-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/swfdec-gnome.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- swfdec-gnome.spec 27 Jun 2008 20:13:23 -0000 1.9 +++ swfdec-gnome.spec 9 Jul 2008 17:37:18 -0000 1.10 @@ -1,12 +1,13 @@ Name: swfdec-gnome -Version: 2.22.0 -Release: 2%{?dist} +Version: 2.22.2 +Release: 1%{?dist} Summary: Programs to integrate Flash into the GNOME desktop Group: Applications/Internet License: GPLv2+ URL: http://swfdec.freedesktop.org/ Source0: http://swfdec.freedesktop.org/download/%{name}/2.22/%{name}-%{version}.tar.bz2 +Patch0: %{name}-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.12.0 @@ -20,7 +21,6 @@ Requires(post): GConf2 Requires(preun): GConf2 - %description This package contains programs to integrate Flash functionality into the GNOME desktop. It's main application is swfdec-player, a stand-alone viewer for @@ -30,7 +30,7 @@ %prep %setup -q - +%patch -p1 -b .new %build %configure @@ -90,6 +90,10 @@ %changelog +* Wed Jul 09 2008 Nikolay Vladimirov - 2.22.2-1 +- Update to 2.22.2 +- Add patch to build with swfdec-0.7.* + * Fri Jun 27 2008 Brian Pepple - 2.22.0-2 - Rebuild for new swfdec. From fedora-extras-commits at redhat.com Wed Jul 9 17:40:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 17:40:39 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807091740.m69Hedva014047@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora devel is now owned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Wed Jul 9 17:40:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 17:40:45 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807091740.m69HejD5014066@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora 8 is now owned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Wed Jul 9 17:40:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 17:40:47 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807091740.m69Hel4C014084@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora 9 is now owned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Wed Jul 9 17:41:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 17:41:18 +0000 Subject: [pkgdb] pygtkglext ownership updated Message-ID: <200807091741.m69Hedvc014047@bastion.fedora.phx.redhat.com> Package pygtkglext in Fedora devel is now owned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Wed Jul 9 17:41:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 17:41:20 +0000 Subject: [pkgdb] pygtkglext ownership updated Message-ID: <200807091741.m69HfKGx014152@bastion.fedora.phx.redhat.com> Package pygtkglext in Fedora 8 is now owned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Wed Jul 9 17:41:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 17:41:21 +0000 Subject: [pkgdb] pygtkglext ownership updated Message-ID: <200807091741.m69Hel4E014084@bastion.fedora.phx.redhat.com> Package pygtkglext in Fedora 9 is now owned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Wed Jul 9 17:42:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:42:20 GMT Subject: rpms/castor/devel castor.spec,1.16,1.17 Message-ID: <200807091742.m69HgKS2013792@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/castor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13706 Modified Files: castor.spec Log Message: fix repotag Index: castor.spec =================================================================== RCS file: /cvs/pkgs/rpms/castor/devel/castor.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- castor.spec 19 Feb 2008 17:46:42 -0000 1.16 +++ castor.spec 9 Jul 2008 17:41:32 -0000 1.17 @@ -6,10 +6,10 @@ Summary: An open source data binding framework for Java Name: castor Version: 0.9.5 -Release: 2jpp.8%{?dist} +Release: 3%{?dist} Epoch: 0 Group: Development/Libraries/Java -License: BSD style +License: BSD and MPLv1.1 and W3C URL: http://castor.codehaus.org Source0: http://dist.codehaus.org/castor/0.9.5/castor-0.9.5-src.tgz Patch0: example-servletapi4.patch @@ -285,6 +285,10 @@ %doc build/doc/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:0.9.5-3 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:0.9.5-2jpp.8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:43:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:43:55 GMT Subject: rpms/checkstyle/devel checkstyle.spec,1.3,1.4 Message-ID: <200807091743.m69Hht3B013941@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/checkstyle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13868 Modified Files: checkstyle.spec Log Message: fix repotag Index: checkstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkstyle/devel/checkstyle.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checkstyle.spec 7 Apr 2008 18:22:04 -0000 1.3 +++ checkstyle.spec 9 Jul 2008 17:42:42 -0000 1.4 @@ -30,10 +30,12 @@ Name: checkstyle Version: 4.1 -Release: 4jpp.3%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Java source code checker -License: LGPL +# src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+ +# Most of the files in contrib/usage/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/ are BSD +License: LGPLv2+ and GPLv2+ and BSD Group: Development/Tools Source0: http://download.sf.net/checkstyle/checkstyle-src-4.1.tar.gz Source1: %{name}-%{version}-script @@ -273,6 +275,10 @@ %{_javadir}/%{name}-optional-%{version}.jar %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:4.1-5 +- drop repotag +- fix license tag + * Mon Apr 07 2008 Deepak Bhole - 0:4.1-4jpp.3 - Require java-devel >= 1.6 for javadocs (bug in sinjdoc prevents building) From fedora-extras-commits at redhat.com Wed Jul 9 17:45:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:45:03 GMT Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.23,1.24 Message-ID: <200807091745.m69Hj3mO014067@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/classpathx-jaf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14020 Modified Files: classpathx-jaf.spec Log Message: fix repotag Index: classpathx-jaf.spec =================================================================== RCS file: /cvs/pkgs/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- classpathx-jaf.spec 19 Feb 2008 17:17:01 -0000 1.23 +++ classpathx-jaf.spec 9 Jul 2008 17:44:13 -0000 1.24 @@ -35,11 +35,11 @@ Name: classpathx-jaf Version: 1.0 -Release: 11jpp.1%{?dist} +Release: 12%{?dist} Epoch: 0 Summary: GNU JavaBeans(tm) Activation Framework Group: System Environment/Libraries -License: LGPL +License: GPLv2+ URL: http://www.gnu.org/software/classpathx/ Source0: http://ftp.gnu.org/gnu/classpathx/activation-1.0.tar.gz Source1: http://ftp.gnu.org/gnu/classpathx/activation-1.0.tar.gz.sig @@ -165,6 +165,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-12 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.0-11jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:46:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:46:08 GMT Subject: rpms/classpathx-mail/devel classpathx-mail.spec,1.27,1.28 Message-ID: <200807091746.m69Hk8Z6014193@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/classpathx-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14127 Modified Files: classpathx-mail.spec Log Message: fix repotag Index: classpathx-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/classpathx-mail/devel/classpathx-mail.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- classpathx-mail.spec 19 Feb 2008 03:07:07 -0000 1.27 +++ classpathx-mail.spec 9 Jul 2008 17:45:21 -0000 1.28 @@ -37,12 +37,13 @@ Name: classpathx-mail Version: 1.1.1 -Release: 5jpp.3 +Release: 6%{?dist} Epoch: 0 Summary: GNU JavaMail(tm) Group: System Environment/Libraries -License: GPL with library exception +# Classpath library exception +License: GPLv2+ with exceptions URL: http://www.gnu.org/software/classpathx/ Source0: http://ftp.gnu.org/gnu/classpathx/mail-%{version}.tar.gz Source1: http://ftp.gnu.org/gnu/classpath/inetlib-1.1.1.tar.gz @@ -255,6 +256,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1.1-6 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.1.1-5jpp.3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:47:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:47:13 GMT Subject: rpms/classworlds/devel classworlds.spec,1.1,1.2 Message-ID: <200807091747.m69HlDH3014343@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/classworlds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14256 Modified Files: classworlds.spec Log Message: fix repotag Index: classworlds.spec =================================================================== RCS file: /cvs/pkgs/rpms/classworlds/devel/classworlds.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- classworlds.spec 12 Mar 2007 16:31:13 -0000 1.1 +++ classworlds.spec 9 Jul 2008 17:46:24 -0000 1.2 @@ -41,7 +41,7 @@ Name: classworlds Version: %{classworlds_version} -Release: 1jpp.1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Classworlds Classloader Framework @@ -170,6 +170,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1-2 +- drop repotag + * Thu Feb 15 2007 Andrew Overholt 0:1.1-1jpp.1 - 1.1 final - Add instructions for generating tarball From fedora-extras-commits at redhat.com Wed Jul 9 17:47:56 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 9 Jul 2008 17:47:56 GMT Subject: rpms/libevent/devel libevent.spec,1.16,1.17 Message-ID: <200807091747.m69HluEL014466@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14306 Modified Files: libevent.spec Log Message: Reworked how the event_rpcgen.* scripts are installed Index: libevent.spec =================================================================== RCS file: /cvs/pkgs/rpms/libevent/devel/libevent.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libevent.spec 9 Jul 2008 15:20:33 -0000 1.16 +++ libevent.spec 9 Jul 2008 17:46:58 -0000 1.17 @@ -74,9 +74,7 @@ %{_libdir}/libevent_extra.so %{_libdir}/libevent_extra.a -%{_bindir}/event_rpcgen.py -%{_bindir}/event_rpcgen.pyc -%{_bindir}/event_rpcgen.pyo +%{_bindir}/event_rpcgen.* %{_mandir}/man3/* From fedora-extras-commits at redhat.com Wed Jul 9 17:48:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:48:14 GMT Subject: rpms/concurrent/devel concurrent.spec,1.19,1.20 Message-ID: <200807091748.m69HmEvl014484@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/concurrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14414 Modified Files: concurrent.spec Log Message: fix repotag Index: concurrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/concurrent/devel/concurrent.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- concurrent.spec 19 Feb 2008 17:47:42 -0000 1.19 +++ concurrent.spec 9 Jul 2008 17:47:28 -0000 1.20 @@ -32,7 +32,7 @@ Name: concurrent Version: 1.3.4 -Release: 8jpp.1%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Utility classes for concurrent Java programming License: Public Domain @@ -136,6 +136,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3.4-9 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.3.4-8jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:49:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:49:20 GMT Subject: rpms/cryptix/devel cryptix.spec,1.12,1.13 Message-ID: <200807091749.m69HnKQg014626@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cryptix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14552 Modified Files: cryptix.spec Log Message: fix repotag Index: cryptix.spec =================================================================== RCS file: /cvs/pkgs/rpms/cryptix/devel/cryptix.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cryptix.spec 19 Feb 2008 15:27:07 -0000 1.12 +++ cryptix.spec 9 Jul 2008 17:48:31 -0000 1.13 @@ -38,10 +38,10 @@ Name: cryptix Version: 3.2.0 -Release: 10jpp.2 +Release: 11%{?dist} Epoch: 0 Summary: Java crypto package -License: BSD style +License: BSD Url: http://www.cryptix.org Group: Security/Cryptography Source0: %{name}32-%{snapshot}-r%{version}-RHCLEAN.zip @@ -147,6 +147,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:3.2.0-11 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:3.2.0-10jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 17:50:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 17:50:26 GMT Subject: rpms/cryptix-asn1/devel cryptix-asn1.spec,1.11,1.12 Message-ID: <200807091750.m69HoQee014759@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cryptix-asn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14700 Modified Files: cryptix-asn1.spec Log Message: fix repotag Index: cryptix-asn1.spec =================================================================== RCS file: /cvs/pkgs/rpms/cryptix-asn1/devel/cryptix-asn1.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cryptix-asn1.spec 29 May 2008 14:05:30 -0000 1.11 +++ cryptix-asn1.spec 9 Jul 2008 17:49:36 -0000 1.12 @@ -41,10 +41,11 @@ #FIXME: We will have to tackle this obscene version number soon. #Perhaps this package will just die before then. Version: 20011119 -Release: 8jpp.4 +Release: 9%{?dist} Epoch: 0 Summary: Cryptix ASN1 implementation -License: Cryptix +# Cryptix General License is BSD, even though they never bothered to include a copy of it here. +License: BSD Group: Security/Cryptography Url: http://www.cryptix.org Source0: %{pname}-%{snapshot}-RHCLEAN.tar.bz2 @@ -128,6 +129,10 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 20011119-9 +- drop repotag +- fix license tag (again) + * Thu May 29 2008 Tom "spot" Callaway 20011119-8jpp.4 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 17:54:48 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 9 Jul 2008 17:54:48 GMT Subject: rpms/kdeedu/devel kdeedu-4.0.85-buildfix.patch, NONE, 1.1 kdeedu.spec, 1.123, 1.124 Message-ID: <200807091754.m69Hsm0L015134@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15076 Modified Files: kdeedu.spec Added Files: kdeedu-4.0.85-buildfix.patch Log Message: fix build kdeedu-4.0.85-buildfix.patch: --- NEW FILE kdeedu-4.0.85-buildfix.patch --- --- trunk/KDE/kdeedu/marble/src/lib/GeoPolygon.h 2008/07/03 07:35:19 827500 +++ trunk/KDE/kdeedu/marble/src/lib/GeoPolygon.h 2008/07/03 07:44:35 827502 @@ -89,7 +89,7 @@ * FIXME: Rename it (into GeoPolygonMap?) */ -class PntMap : public GeoPolygon::PtrVector +class GEODATA_EXPORT PntMap : public GeoPolygon::PtrVector { public: PntMap(); Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- kdeedu.spec 7 Jul 2008 12:59:41 -0000 1.123 +++ kdeedu.spec 9 Jul 2008 17:54:01 -0000 1.124 @@ -24,6 +24,8 @@ # fix cfitsio detection by using pkgconfig Patch0: kdeedu-4.0.4-cfitsio.patch +# upstream fix to fix build +Patch100: kdeedu-4.0.85-buildfix.patch # http://bugzilla.redhat.com/371121 Obsoletes: kalgebra < 1:0.7-7 @@ -141,6 +143,7 @@ %prep %setup -q -n kdeedu-%{version} %patch0 -p1 -b .cfitsio +%patch100 -p3 -b .buildfix %build From fedora-extras-commits at redhat.com Wed Jul 9 18:10:23 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 18:10:23 GMT Subject: rpms/perl-Getopt-Long-Descriptive/devel perl-Getopt-Long-Descriptive.spec, 1.1, 1.2 Message-ID: <200807091810.m69IAN78022615@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22560 Modified Files: perl-Getopt-Long-Descriptive.spec Log Message: release bump Index: perl-Getopt-Long-Descriptive.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel/perl-Getopt-Long-Descriptive.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Getopt-Long-Descriptive.spec 9 Jul 2008 17:35:00 -0000 1.1 +++ perl-Getopt-Long-Descriptive.spec 9 Jul 2008 18:09:36 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Getopt-Long-Descriptive Version: 0.074 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Getopt::Long with usage text License: GPL+ or Artistic Group: Development/Libraries @@ -56,5 +56,8 @@ %{_mandir}/man3/* %changelog +* Wed Jul 09 2008 Chris Weyl 0.074-2 +- bump + * Tue Jul 08 2008 Chris Weyl 0.074-1 - Specfile autogenerated by cpanspec 1.74. From fedora-extras-commits at redhat.com Wed Jul 9 18:11:23 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 18:11:23 GMT Subject: rpms/perl-Getopt-Long-Descriptive/F-9 import.log, NONE, 1.1 perl-Getopt-Long-Descriptive.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807091811.m69IBNco022722@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22657 Modified Files: sources Added Files: import.log perl-Getopt-Long-Descriptive.spec Log Message: pseudo-branch of perl-Getopt-Long-Descriptive to F-9 --- NEW FILE import.log --- perl-Getopt-Long-Descriptive-0_074-1_fc8:HEAD:perl-Getopt-Long-Descriptive-0.074-1.fc8.src.rpm:1215624887 --- NEW FILE perl-Getopt-Long-Descriptive.spec --- Name: perl-Getopt-Long-Descriptive Version: 0.074 Release: 2%{?dist} Summary: Getopt::Long with usage text License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Getopt-Long-Descriptive/ Source0: http://www.cpan.org/authors/id/H/HD/HDP/Getopt-Long-Descriptive-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Scalar) BuildRequires: perl(Params::Validate) >= 0.74 # test BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # not automagically picked up... Requires: perl(IO::Scalar) %description Convenient wrapper for Getopt::Long and program usage output. %prep %setup -q -n Getopt-Long-Descriptive-%{version} perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 09 2008 Chris Weyl 0.074-2 - bump * Tue Jul 08 2008 Chris Weyl 0.074-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 17:00:59 -0000 1.1 +++ sources 9 Jul 2008 18:10:33 -0000 1.2 @@ -0,0 +1 @@ +bf4931dfd87314376ecb74dc8d205944 Getopt-Long-Descriptive-0.074.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 18:13:59 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 9 Jul 2008 18:13:59 GMT Subject: rpms/kdeedu/devel kdeedu-4.0.85-buildfix.patch,1.1,1.2 Message-ID: <200807091813.m69IDxTA022981@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22907 Modified Files: kdeedu-4.0.85-buildfix.patch Log Message: use complete patchset to fix build kdeedu-4.0.85-buildfix.patch: Index: kdeedu-4.0.85-buildfix.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu-4.0.85-buildfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdeedu-4.0.85-buildfix.patch 9 Jul 2008 17:54:01 -0000 1.1 +++ kdeedu-4.0.85-buildfix.patch 9 Jul 2008 18:13:08 -0000 1.2 @@ -1,6 +1,23 @@ ---- trunk/KDE/kdeedu/marble/src/lib/GeoPolygon.h 2008/07/03 07:35:19 827500 -+++ trunk/KDE/kdeedu/marble/src/lib/GeoPolygon.h 2008/07/03 07:44:35 827502 -@@ -89,7 +89,7 @@ +--- trunk/KDE/kdeedu/marble/src/lib/GeoPolygon.h 2008/06/02 15:39:27 815816 ++++ trunk/KDE/kdeedu/marble/src/lib/GeoPolygon.h 2008/07/04 20:11:29 828159 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include "marble_export.h" + + #include "Quaternion.h" + #include "GeoDataPoint.h" +@@ -24,7 +25,7 @@ + GeoDataPoint defines the nodes in a polyLine + */ + +-class GeoPolygon : public GeoDataPoint::Vector ++class GEODATA_EXPORT GeoPolygon : public GeoDataPoint::Vector + { + public: + GeoPolygon(); +@@ -88,7 +89,7 @@ * FIXME: Rename it (into GeoPolygonMap?) */ From fedora-extras-commits at redhat.com Wed Jul 9 18:19:11 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Wed, 9 Jul 2008 18:19:11 GMT Subject: rpms/npush/devel import.log, NONE, 1.1 npush-0.6-level-svn.patch, NONE, 1.1 npush.desktop, NONE, 1.1 npush.png, NONE, 1.1 npush.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807091819.m69IJBrX023367@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/npush/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23259/devel Modified Files: .cvsignore sources Added Files: import.log npush-0.6-level-svn.patch npush.desktop npush.png npush.spec Log Message: Initial commit --- NEW FILE import.log --- npush-0_6-1_fc9:HEAD:npush-0.6-1.fc9.src.rpm:1215627278 npush-0.6-level-svn.patch: --- NEW FILE npush-0.6-level-svn.patch --- --- npush.cpp 2008-05-26 00:18:20.000000000 +0200 +++ npush.cpp.patch 2008-07-07 16:36:35.000000000 +0200 @@ -28,682 +28,804 @@ #include #include #include +#include +#include //----------------------------------------------------------------------------- -typedef enum { kUp, kDown, kLeft, kRight, kButton, kSwitchPlayer, kQuitGame, - kUndo, kUnknown } KeyType; +//kUnknown must be at start so it's value is 0. +typedef enum { kUnknown, kUp, kDown, kLeft, kRight, kButton, kSwitchPlayer, kQuitGame, + kUndo + } KeyType; typedef enum { paMoved, paLevelComplete, paNone } PlayerAction; typedef enum { fMenu, fGame } Font; //----------------------------------------------------------------------------- -void Box(int x0, int y0, int x1, int y1, bool clear) -{ - attrset(A_BOLD); - if (clear) - { - for (int y=y0; y charBind; +public: + Config (); + void bind (KeyType t, int toBind); + KeyType lookup (int boundChar); + void clear (); + void eraseKey (KeyType erase); +}; + +Config::Config () { + charBind[KEY_UP] = kUp; + charBind[KEY_DOWN] = kDown; + charBind[KEY_LEFT] = kLeft; + charBind[KEY_RIGHT] = kRight; + charBind['\t'] = kSwitchPlayer; + charBind['q'] = kQuitGame; + charBind['u'] = kUndo; + charBind[KEY_ENTER] = kButton; + charBind['\n'] = kButton; +} + +void +Config::bind (KeyType t, int toBind) { + charBind[toBind] = t; +} + +KeyType +Config::lookup (int boundChar) { + return charBind[boundChar]; +} + +void +Config::clear () { + charBind.clear (); +} + +void +Config::eraseKey (KeyType erase) { + for (std::map < int, KeyType >::iterator it = charBind.begin (); + it != charBind.end (); it++) { + if ((*it).second == erase) { + charBind.erase (it); + return; + } + } +} + //----------------------------------------------------------------------------- -class Screen -{ +class Screen { private: public: - virtual ~Screen(); - bool init(); - void printText(int x, int y, const std::string& text, Font f = fGame); - void render(); - void clear(); - KeyType getChar(); + virtual ~ Screen (); + bool init (); + void printText (int x, int y, const std::string & text, Font f = fGame); + void render (); + void clear (); + Config config; + KeyType getChar (); }; //----------------------------------------------------------------------------- -void Screen::clear() -{ - erase(); +void +Screen::clear () { + erase (); } + //----------------------------------------------------------------------------- -KeyType Screen::getChar() -{ - int ch = getch(); - switch (ch) - { - case KEY_DOWN: return kDown; - case KEY_UP: return kUp; - case KEY_LEFT: return kLeft; - case KEY_RIGHT: return kRight; - case '\t': return kSwitchPlayer; - case 'q': return kQuitGame; - case 'u': return kUndo; - case KEY_ENTER: - case '\n': - return kButton; - } - return kUnknown; +KeyType +Screen::getChar () { + int ch = getch (); + + return config.lookup (ch); } + //----------------------------------------------------------------------------- -bool Screen::init() -{ +bool +Screen::init () { // currently we have ncurses implementation, but it can be easily changed // just by creating instance of another class in main() - if (!initscr()) // init curses + if (!initscr ()) // init curses return false; - start_color(); - cbreak(); - keypad(stdscr, TRUE); - noecho(); - - init_pair(1, COLOR_YELLOW, COLOR_BLACK); - init_pair(2, COLOR_GREEN, COLOR_BLACK); - init_pair(3, COLOR_BLUE, COLOR_BLACK); - init_pair(4, COLOR_RED, COLOR_BLACK); + start_color (); + cbreak (); + keypad (stdscr, TRUE); + noecho (); + + init_pair (1, COLOR_YELLOW, COLOR_BLACK); + init_pair (2, COLOR_GREEN, COLOR_BLACK); + init_pair (3, COLOR_BLUE, COLOR_BLACK); + init_pair (4, COLOR_RED, COLOR_BLACK); return true; } + //----------------------------------------------------------------------------- -Screen::~Screen() -{ - endwin(); +Screen::~Screen () { + endwin (); } + //----------------------------------------------------------------------------- -void Screen::printText(int x, int y, const std::string& text, Font f) -{ - if (f == fMenu) // weight and such - { - attrset(A_NORMAL); +void +Screen::printText (int x, int y, const std::string & text, Font f) { + if (f == fMenu) { // weight and such + attrset (A_NORMAL); } - if (f == fGame) // color and such - { - attrset(A_BOLD); + if (f == fGame) { // color and such + attrset (A_BOLD); } - mvprintw(y, x, "%s", text.c_str()); + mvprintw (y, x, "%s", text.c_str ()); } + //----------------------------------------------------------------------------- -void Screen::render() -{ - mvprintw(1, 1, "-=[ nPush ]=- -=[ nPush ]=- http://npush.sourceforge.net/"); - move(1, 15); - refresh(); +void +Screen::render () { + mvprintw (1, 1, + "-=[ nPush ]=- -=[ nPush ]=- http://npush.sourceforge.net/"); + move (1, 15); + refresh (); } + //----------------------------------------------------------------------------- -class Menu -{ +class Menu { private: + typedef std::vector < std::string > ItemList; + Screen & screenM; + ItemList itemsM; std::string titleM; bool showBigLogoM; - typedef std::vector ItemList; - Screen &screenM; - ItemList itemsM; int currentItemM; - void drawBigLogo(); + void drawBigLogo (); public: - Menu(Screen& s, const std::string& title, bool showBigLogo = false); - void add(const std::string& item); - std::string getItemText(int index); - int count(); - int show(); + Menu (Screen & s, const std::string & title, bool showBigLogo = false); + void add (const std::string & item); + std::string getItemText (int index); + int count (); + int show (); }; //----------------------------------------------------------------------------- -class ControlsConfigurator -{ +class ControlsConfigurator { private: - Screen& screenM; + Screen & screenM; public: - ControlsConfigurator(Screen& scr); + ControlsConfigurator (Screen & scr); }; //----------------------------------------------------------------------------- -ControlsConfigurator::ControlsConfigurator(Screen& scr) - :screenM(scr) -{ +ControlsConfigurator::ControlsConfigurator (Screen & scr):screenM (scr) { // show menu with current controls and allow changing // TODO: needs config() class - clear(); + clear (); - int y = 3; - int x = 3; - mvprintw(y++, x, "Configure controls"); - mvprintw(y++, x, ""); - mvprintw(y++, x, "This option is not yet implemented. In the meantime use:"); - mvprintw(y++, x, ""); - mvprintw(y++, x, "arrow keys - movement"); - mvprintw(y++, x, " tab - switch player"); - mvprintw(y++, x, " u - undo last move (unlimited)"); - mvprintw(y++, x, " q - quit game"); + /*int y = 3; + int x = 3; + mvprintw(y++, x, "Configure controls"); + mvprintw(y++, x, ""); + mvprintw(y++, x, "This option is not yet implemented. In the meantime use:"); + mvprintw(y++, x, ""); + mvprintw(y++, x, "arrow keys - movement"); + mvprintw(y++, x, " tab - switch player"); + mvprintw(y++, x, " u - undo last move (unlimited)"); + mvprintw(y++, x, " q - quit game"); + */ + Menu + m (scr, "Configuring Controls", false); + m.add ("Move Left"); + m.add ("Move Right"); + m.add ("Move Up"); + m.add ("Move Down"); + m.add ("Switch Player"); + m.add ("Undo Last Move"); + m.add ("Quit Game"); + m.add ("Return to Main Menu"); + scr.render (); + while (true) { + int + result = m.show (); + int + ch; + switch (result) { + case 0: + ch = Prompt ("Press a key for Left"); + scr.config.eraseKey (kLeft); + scr.config.bind (kLeft, ch); + break; + case 1: + ch = Prompt ("Press a key for Right"); + scr.config.eraseKey (kRight); + scr.config.bind (kRight, ch); + break; + case 2: + ch = Prompt ("Press a key for Up"); + scr.config.eraseKey (kUp); + scr.config.bind (kUp, ch); + break; + case 3: + ch = Prompt ("Press a key for Down"); + scr.config.eraseKey (kDown); + scr.config.bind (kDown, ch); + break; + case 4: + ch = Prompt ("Press a key for switching the player"); + scr.config.eraseKey (kSwitchPlayer); + scr.config.bind (kSwitchPlayer, ch); + break; + case 5: + ch = Prompt ("Press a key for undoing moves"); + scr.config.eraseKey (kUndo); + scr.config.bind (kUndo, ch); + break; + case 6: + ch = Prompt ("Press a key for quiting the game"); + scr.config.eraseKey (kQuitGame); + scr.config.bind (kQuitGame, ch); + break; + case 7: + return; + } + } - scr.render(); - getch(); } + //----------------------------------------------------------------------------- -class LevelSelector -{ +class + LevelSelector { private: - Screen& screenM; + Screen & + screenM; public: - LevelSelector(Screen& scr); - void start(); + LevelSelector (Screen & scr); + void + start (); }; //----------------------------------------------------------------------------- -Menu::Menu(Screen& s, const std::string& title, bool showBigLogo) - :screenM(s), currentItemM(0), titleM(title), showBigLogoM(showBigLogo) +Menu::Menu (Screen & s, const std::string & title, bool showBigLogo): + screenM (s), + titleM (title), + showBigLogoM (showBigLogo), + currentItemM (0) { } + //----------------------------------------------------------------------------- -void Menu::add(const std::string& item) -{ - itemsM.push_back(item); +void +Menu::add (const std::string & item) { + itemsM.push_back (item); } + //----------------------------------------------------------------------------- -std::string Menu::getItemText(int index) -{ +std::string Menu::getItemText (int index) { return itemsM[index]; } + //----------------------------------------------------------------------------- -int Menu::count() -{ - return itemsM.size(); +int +Menu::count () { + return itemsM.size (); } + //----------------------------------------------------------------------------- -void Menu::drawBigLogo() -{ +void +Menu::drawBigLogo () { std::string msg[] = { - " .?????????????/ ", - " .. ????????????????????: ", - " .??????? ???????????????. ?????p ", - " .????????. _??????????????????? ????p ", - " )???????? j???????????????????????????? ", - " ?????? j??????????????????????????????, ", - " _?????????????????????????????????????????????. ", - " ???????????????????????????????????????????????? ", - " ???????? ??????????????????????????????????? ", - " j???? ??????????????????????????????????? ", - " j???? ???????????????????????????????????? ", - " ?????/ -??????????????????????????????????[ ", - " j?????????? ??????????????????????????????????' ", - " ??????? ??????? -????????????????????????????????? ", - " .?????? ????? -??????????????????????????????? ", - " j????' ???? ?????????????????????????????? ", - " ??????? ???' ?????????????????????????` ", - "???????` ?????p ?????????????????????? ", - "??????? ?????? ????????????????` ", - " -??????? " + " .00OOOOOOOOO'0o ", + " .. 000OOOOOOOO'88'OOO'0: ", + " .00OOO00 o0OOOOOOOOOOO':. %8OOOp ", + " .'OOOOOOO. _0OOOOOOOOOOOOOOO'Lu A8OOp ", + " )OOOOOOOY jOOOOOOOOOOOOOOOOOOO'''''08O0 ", + " 0'OO'% jOOOOOOOOOOOOOOOOOOOOOOOOOOO'O', ", + " _0OOO:00000000'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOO'. ", + " /'OOOOOOO'O'OO'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO7 ", + " /'OO%AAA 0OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " jOOOy pOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " jOO'y uOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " EOOO0/ -'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO[ ", + " j'OO'OOO00u pOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO' ", + " /'OO'%u %'OO'0u -'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOy ", + " .0OOO%u %OOO7 -8OOOOOOOOOOOOOOOOOOOOOOOOOOOOOy ", + " j'OO8' pOO7 u0'OOOOOOOOOOOOOOOOOOOOOOOOO'y ", + " o0'OO'% 'OO' 08OOOOOOOOOOOOOOOOOOOOO'8' ", + "EOOOOO8` pOOO'p uO%'OOOOOOOOOOOOOOOO'Y ", + "08OOO'y 8''88y A8'OOOOOOOOOO'8%` ", + " -UAA%8%% " }; - color_set(1, 0); - for (int i=0; i= itemsM.size()) + if (currentItemM >= (int)itemsM.size ()) currentItemM = 0; - } - else if (k == kButton) - { + } else if (k == kButton) { return currentItemM; } } return -1; } + //----------------------------------------------------------------------------- -class Game -{ +class Game { private: bool levelCompleteM; - Screen& screenM; + Screen & screenM; public: - Game(Screen& s, const std::string& levelName); - bool levelComplete(); + Game (Screen & s, const std::string & levelName); + bool levelComplete (); }; //----------------------------------------------------------------------------- -bool Game::levelComplete() -{ +bool +Game::levelComplete () { return levelCompleteM; } + //----------------------------------------------------------------------------- class Level; -class Player -{ +class Player { private: int xM; int yM; public: - Player(int x, int y); - void render(); - PlayerAction handleInput(KeyType key, Level& level); + Player (int x, int y); + void render (); + PlayerAction handleInput (KeyType key, Level & level); }; //----------------------------------------------------------------------------- -class Level -{ +class Level { private: int goldNeededM; - std::vector mapM; + std::vector < std::string > mapM; public: - Level(const std::string& name, std::vector& players); - void render(); - void moveField(int x, int y, int dx, int dy); - void setField(int x, int y, char f); - char getField(int x, int y); - int goldNeeded(); - void addGold(int count); + Level (const std::string & name, std::vector < Player > &players); + void render (); + void moveField (int x, int y, int dx, int dy); + void setField (int x, int y, char f); + char getField (int x, int y); + int goldNeeded (); + void addGold (int count); }; //----------------------------------------------------------------------------- -Player::Player(int x, int y) - :xM(x), yM(y) -{ +Player::Player (int x, int y): + xM (x), + yM (y) { } + //----------------------------------------------------------------------------- -void Player::render() -{ - attrset(A_BOLD); - color_set(3, 0); - mvprintw(yM+3, xM+3, "@"); - attrset(A_NORMAL); +void +Player::render () { + attrset (A_BOLD); + color_set (3, 0); + mvprintw (yM + 3, xM + 3, "@"); + attrset (A_NORMAL); } + //----------------------------------------------------------------------------- -PlayerAction Player::handleInput(KeyType key, Level& level) -{ +PlayerAction +Player::handleInput (KeyType key, Level & level) { int dx = 0, dy = 0; - switch (key) - { - case kUp: dy = -1; break; - case kDown: dy = 1; break; - case kLeft: dx = -1; break; - case kRight: dx = 1; break; - default: - return paNone; - } - switch (level.getField(xM + dx, yM + dy)) - { - case '$': level.addGold(-1); - case ' ': - level.moveField(xM, yM, dx, dy); + switch (key) { + case kUp: + dy = -1; + break; + case kDown: + dy = 1; + break; + case kLeft: + dx = -1; + break; + case kRight: + dx = 1; + break; + default: + return paNone; + } + switch (level.getField (xM + dx, yM + dy)) { + case '$': + level.addGold (-1); + case ' ': + level.moveField (xM, yM, dx, dy); + xM += dx; + yM += dy; + return paMoved; + case 'O': + // look beyond if we can push it + if (level.getField (xM + 2 * dx, yM + 2 * dy) == ' ') { + level.moveField (xM + dx, yM + dy, dx, dy); // move rock + level.moveField (xM, yM, dx, dy); // move player xM += dx; yM += dy; return paMoved; - case 'O': - // look beyond if we can push it - if (level.getField(xM + 2*dx, yM + 2*dy) == ' ') - { - level.moveField(xM+dx, yM+dy, dx, dy); // move rock - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - return paNone; - case 'h': - { - char c = level.getField(xM + 2*dx, yM + 2*dy); - if (c == 'O' || c == 'h') - { - level.setField(xM+2*dx, yM+2*dy, ' '); // explode - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - if (c == ' ') - { - level.moveField(xM+dx, yM+dy, dx, dy); // move dynamite - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - return paNone; - } - case 'x': - if (level.goldNeeded() < 1) - return paLevelComplete; - return paNone; + } + return paNone; + case 'h': { + char c = level.getField (xM + 2 * dx, yM + 2 * dy); + if (c == 'O' || c == 'h') { + level.setField (xM + 2 * dx, yM + 2 * dy, ' '); // explode + level.moveField (xM, yM, dx, dy); // move player + xM += dx; + yM += dy; + return paMoved; + } + if (c == ' ') { + level.moveField (xM + dx, yM + dy, dx, dy); // move dynamite + level.moveField (xM, yM, dx, dy); // move player + xM += dx; + yM += dy; + return paMoved; + } + return paNone; + } + case 'x': + if (level.goldNeeded () < 1) + return paLevelComplete; + return paNone; } return paNone; } + //----------------------------------------------------------------------------- -void Level::setField(int x, int y, char f) -{ +void +Level::setField (int x, int y, char f) { mapM[y][x] = f; } + //----------------------------------------------------------------------------- -char Level::getField(int x, int y) -{ +char +Level::getField (int x, int y) { return mapM[y][x]; } + //----------------------------------------------------------------------------- -void Level::moveField(int x, int y, int dx, int dy) -{ - char field = getField(x, y); - setField(x, y, ' '); - setField(x+dx, y+dy, field); +void +Level::moveField (int x, int y, int dx, int dy) { + char field = getField (x, y); + setField (x, y, ' '); + setField (x + dx, y + dy, field); } + //----------------------------------------------------------------------------- -int Level::goldNeeded() -{ +int +Level::goldNeeded () { return goldNeededM; } + //----------------------------------------------------------------------------- -void Level::addGold(int count) -{ +void +Level::addGold (int count) { goldNeededM += count; if (goldNeededM < 0) goldNeededM = 0; } + //----------------------------------------------------------------------------- -Level::Level(const std::string& name, std::vector& players) -{ +Level::Level (const std::string & name, std::vector < Player > &players) { // load level from file, for each player found, create instance of Player - players.clear(); - mapM.clear(); + players.clear (); + mapM.clear (); goldNeededM = 0; - FILE *fp = fopen(name.c_str(), "rb"); - if (!fp) - { - Message("Cannot open level file!"); + std::string fileName = "/usr/share/npush/" + name; + FILE *fp = fopen (fileName.c_str (), "rb"); + if (!fp) { + Message ("Cannot open level file!"); return; } int y = 0; char buffer[80]; - while (!feof(fp)) - { - if (!fgets(buffer, 80, fp)) + while (!feof (fp)) { + if (!fgets (buffer, 80, fp)) break; - for (int x = 0; x < 80 && buffer[x] != '\n' && buffer[x] != '\0'; x++) - { + for (int x = 0; x < 80 && buffer[x] != '\n' && buffer[x] != '\0'; x++) { if (buffer[x] == ',') // comments, ignore rest of the line break; - if (buffer[x] == '@') - { - Player p(x, y); - players.push_back(p); + if (buffer[x] == '@') { + Player p (x, y); + players.push_back (p); } if (buffer[x] == '$') goldNeededM++; } - mapM.push_back(buffer); + mapM.push_back (buffer); y++; } } + //----------------------------------------------------------------------------- -void Level::render() -{ - clear(); +void +Level::render () { + clear (); int xpos = 3; int ypos = 3; - for (std::vector::iterator it = mapM.begin(); - it != mapM.end(); ++it, ypos++) - { + for (std::vector < std::string >::iterator it = mapM.begin (); + it != mapM.end (); ++it, ypos++) { // if (black&white) //mvprintw(ypos++, xpos, "%s", (*it).c_str()); - move(ypos, xpos); + move (ypos, xpos); bool comment = false; bool bold = false; - for (int i=0; i<(*it).length(); i++) - { + for (unsigned i = 0; i < (*it).length (); i++) { char c = (*it)[i]; - attrset(A_NORMAL); - if (!comment) - { - switch (c) - { - case ',': - c = ' '; - comment = true; - break; - case ';': - c = ' '; - comment = bold = true; - break; - case '#': color_set(1, 0); break; - case 'x': color_set(2, 0); break; - case '@': color_set(3, 0); break; - case 'h': color_set(4, 0); break; - case '$': - attrset(A_BOLD); - color_set(1, 0); - break; + attrset (A_NORMAL); + if (!comment) { + switch (c) { + case ',': + c = ' '; + comment = true; + break; + case ';': + c = ' '; + comment = bold = true; + break; + case '#': + color_set (1, 0); + break; + case 'x': + color_set (2, 0); + break; + case '@': + color_set (3, 0); + break; + case 'h': + color_set (4, 0); + break; + case '$': + attrset (A_BOLD); + color_set (1, 0); + break; }; - } - else if (bold) // bold comment - attrset(A_BOLD); - printw("%c", c); + } else if (bold) // bold comment + attrset (A_BOLD); + printw ("%c", c); } } } + //----------------------------------------------------------------------------- -class GameState -{ +class GameState { public: Level level; - std::vector players; - GameState(const Level& l, const std::vector& p) - :level(l), players(p) - { + std::vector < Player > players; + GameState (const Level & l, const std::vector < Player > &p):level (l), + players (p) { } }; //----------------------------------------------------------------------------- -Game::Game(Screen& s, const std::string& levelName) - :screenM(s), levelCompleteM(false) +Game::Game (Screen & s, const std::string & levelName): + levelCompleteM (false), + screenM (s) { - std::vector players; // there can be multiple on the screen + std::vector < Player > players; // there can be multiple on the screen // load levelName - Level level(levelName, players); - if (players.size() == 0) - { - Message("Bad level, no players found!"); + Level level (levelName, players); + if (players.size () == 0) { + Message ("Bad level, no players found!"); return; } - std::stack undo; - undo.push(GameState(level, players)); + std::stack < GameState > undo; + undo.push (GameState (level, players)); - std::vector::iterator currentPlayer = players.begin(); - while (true) - { - level.render(); - (*currentPlayer).render(); - s.render(); + std::vector < Player >::iterator currentPlayer = players.begin (); + while (true) { + level.render (); + (*currentPlayer).render (); + s.render (); // handle key press - KeyType key = s.getChar(); - switch (key) - { + KeyType key = s.getChar (); + switch (key) { // handle game-wide keys (like player switching) - case kSwitchPlayer: - if (++currentPlayer == players.end()) - currentPlayer = players.begin(); - break; + case kSwitchPlayer: + if (++currentPlayer == players.end ()) + currentPlayer = players.begin (); + break; - case kQuitGame: - return; + case kQuitGame: + return; - case kUndo: - if (undo.size() > 1) - { - undo.pop(); // remove current state - level = undo.top().level; - players = undo.top().players; - } - break; - default: // handle player movement keys - PlayerAction pa = (*currentPlayer).handleInput(key, level); - if (pa == paLevelComplete) - { - levelCompleteM = true; - Message("Well done. Level completed."); - return; - } - if (pa == paMoved) - { - // store undo buffer - undo.push(GameState(level, players)); - } + case kUndo: + if (undo.size () > 1) { + undo.pop (); // remove current state + level = undo.top ().level; + players = undo.top ().players; + } + break; + default: // handle player movement keys + PlayerAction pa = (*currentPlayer).handleInput (key, level); + if (pa == paLevelComplete) { + levelCompleteM = true; + Message ("Well done. Level completed."); + return; + } + if (pa == paMoved) { + // store undo buffer + undo.push (GameState (level, players)); + } }; } } + //----------------------------------------------------------------------------- -LevelSelector::LevelSelector(Screen& s) - :screenM(s) -{ - Menu m(s, "Select a level"); +LevelSelector::LevelSelector (Screen & s):screenM (s) { + Menu + m (s, "Select a level"); // TODO: load all levels from 'levels' directory and sort them alphabetical /* - m.add("Level 1 - Gold and Exit"); - m.add("Level 2 - Rocks"); - m.add("Level 3 - Dynamite"); - m.add("Level 4 - The Show Starts"); - */ - std::set files; - DIR *dir = opendir("."); - if (!dir) - { - Message("Cannot read levels from directory"); + m.add("Level 1 - Gold and Exit"); + m.add("Level 2 - Rocks"); + m.add("Level 3 - Dynamite"); + m.add("Level 4 - The Show Starts"); + */ + std::set < std::string > files; + DIR * + dir = opendir ("/usr/share/npush/"); + if (!dir) { + Message ("Cannot read levels from directory"); return; } - while (true) - { - struct dirent *de = readdir(dir); + while (true) { + struct dirent * + de = readdir (dir); if (!de) break; - std::string filename(de->d_name); - if (filename.find("Level") == 0) // starts with - files.insert(filename); - } - closedir(dir); - for (std::set::iterator it = files.begin(); it != files.end(); - ++it) - { - m.add(*it); + std::string filename (de->d_name); + if (filename.find ("Level") == 0) // starts with + files.insert (filename); + } + closedir (dir); + for (std::set < std::string >::iterator it = files.begin (); + it != files.end (); ++it) { + m.add (*it); } - m.add("Back to main menu"); - int result = m.show(); - if (result == -1 || result >= m.count() - 1) + m.add ("Back to main menu"); + int + result = m.show (); + if (result == -1 || result >= m.count () - 1) return; - while (true) - { - Game g(s, m.getItemText(result)); - if (g.levelComplete()) // level completed - { + while (true) { + Game + g (s, m.getItemText (result)); + if (g.levelComplete ()) { // level completed result++; - if (result < (m.count() - 1)) + if (result < (m.count () - 1)) continue; - Message("No more levels"); + Message ("No more levels"); return; - } - else // exited + } else // exited return; } } + //----------------------------------------------------------------------------- -int main() -{ - Screen s; - if (!s.init()) +int +main () { + Screen + s; + if (!s.init ()) return 1; - Menu m(s, "Welcome to nPush", true); - m.add("Start a new game"); - m.add("Configure controls"); - m.add("Quit"); - - while (true) - { - int result = m.show(); - if (result == 0) - { - LevelSelector ls(s); + Menu + m (s, "Welcome to nPush", true); + m.add ("Start a new game"); + m.add ("Configure controls"); + m.add ("Quit"); + + while (true) { + int + result = m.show (); + if (result == 0) { + LevelSelector + ls (s); continue; - } - else if (result == 1) - { - ControlsConfigurator cc(s); + } else if (result == 1) { + ControlsConfigurator + cc (s); continue; } break; } return 0; } + //----------------------------------------------------------------------------- --- NEW FILE npush.desktop --- [Desktop Entry] Encoding=UTF-8 Name=nPush Comment=A logic game similar to Sokoba Exec=npush Icon=npush Terminal=true Type=Application Categories=Game; --- NEW FILE npush.spec --- Name: npush Version: 0.6 Release: 1%{?dist} Summary: A logic game similar to Sokoba Group: Amusements/Games License: GPLv2+ URL: http://npush.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz # self made icon and .desktop file Source1: %{name}.desktop Source2: %{name}.png # patch npush.cpp to svn version to fix an issue with level selector Patch: npush-0.6-level-svn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel desktop-file-utils %description nPush is a logic game similar to Sokoban and Boulder Dash. You need to collect all the gold on the level and reach the exit. To make it hard there are some rocks that stand in your way, and you also have some dynamite to blast them away. Main difference from Sokoban, KSokoban and similar games is that you can have multiple player-controlled characters you can move on the screen. nPush is a terminal based application and uses nCurses library for user interface. %prep %setup -q %patch -p0 %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}%{_bindir} install -p -m 755 npush %{buildroot}%{_bindir}/npush mkdir -p %{buildroot}%{_datadir}/npush cp -ra Level* %{buildroot}%{_datadir}/npush # desktop file stuff desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 0644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc readme.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog * Mon Jul 07 2008 Stefan Posdzich - 0.6-1 - Initial SPEC file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/npush/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:59:33 -0000 1.1 +++ .cvsignore 9 Jul 2008 18:18:25 -0000 1.2 @@ -0,0 +1 @@ +npush-0.6.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/npush/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:59:33 -0000 1.1 +++ sources 9 Jul 2008 18:18:25 -0000 1.2 @@ -0,0 +1 @@ +6670aac74dd7db005462c11c5688db52 npush-0.6.tgz From fedora-extras-commits at redhat.com Wed Jul 9 18:22:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:22:24 GMT Subject: rpms/dom4j/devel dom4j.spec,1.3,1.4 Message-ID: <200807091822.m69IMO7t023644@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dom4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23572 Modified Files: dom4j.spec Log Message: fix repotag Index: dom4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/dom4j/devel/dom4j.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dom4j.spec 17 Oct 2007 23:26:28 -0000 1.3 +++ dom4j.spec 9 Jul 2008 18:21:34 -0000 1.4 @@ -31,7 +31,7 @@ Summary: Open Source XML framework for Java Name: dom4j Version: 1.6.1 -Release: 2jpp.3%{?dist} +Release: 3%{?dist} Epoch: 0 License: BSD URL: http://www.dom4j.org/ @@ -221,6 +221,9 @@ %{_datadir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.6.1-3 +- drop repotag + * Wed Oct 17 2007 Deepak Bhole 1.6.1-2jpp.3 - Resaolve bz#302321: Add copyright header that was accidentally removed. From fedora-extras-commits at redhat.com Wed Jul 9 18:22:58 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 9 Jul 2008 18:22:58 GMT Subject: rpms/perl-Getopt-Long-Descriptive/F-8 import.log, NONE, 1.1 perl-Getopt-Long-Descriptive.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807091822.m69IMwY8023761@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23615 Modified Files: sources Added Files: import.log perl-Getopt-Long-Descriptive.spec Log Message: pseudo-branch of perl-Getopt-Long-Descriptive to F-8 --- NEW FILE import.log --- perl-Getopt-Long-Descriptive-0_074-1_fc8:HEAD:perl-Getopt-Long-Descriptive-0.074-1.fc8.src.rpm:1215624887 --- NEW FILE perl-Getopt-Long-Descriptive.spec --- Name: perl-Getopt-Long-Descriptive Version: 0.074 Release: 2%{?dist} Summary: Getopt::Long with usage text License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Getopt-Long-Descriptive/ Source0: http://www.cpan.org/authors/id/H/HD/HDP/Getopt-Long-Descriptive-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Scalar) BuildRequires: perl(Params::Validate) >= 0.74 # test BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # not automagically picked up... Requires: perl(IO::Scalar) %description Convenient wrapper for Getopt::Long and program usage output. %prep %setup -q -n Getopt-Long-Descriptive-%{version} perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 09 2008 Chris Weyl 0.074-2 - bump * Tue Jul 08 2008 Chris Weyl 0.074-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 17:00:59 -0000 1.1 +++ sources 9 Jul 2008 18:22:12 -0000 1.2 @@ -0,0 +1 @@ +bf4931dfd87314376ecb74dc8d205944 Getopt-Long-Descriptive-0.074.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 18:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:23:25 GMT Subject: rpms/dtdparser/devel dtdparser.spec,1.4,1.5 Message-ID: <200807091823.m69INPJZ023849@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dtdparser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23718 Modified Files: dtdparser.spec Log Message: fix repotag Index: dtdparser.spec =================================================================== RCS file: /cvs/pkgs/rpms/dtdparser/devel/dtdparser.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dtdparser.spec 19 Feb 2008 16:30:17 -0000 1.4 +++ dtdparser.spec 9 Jul 2008 18:22:40 -0000 1.5 @@ -36,10 +36,13 @@ Name: dtdparser Version: 1.21 -Release: 4jpp.2%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: A Java DTD Parser -License: LGPL +# The code has no license attribution. +# There is a LICENSE.INFO file, but it does not specify versions. +# The only versioning is in the ASL_LICENSE file, which has been edited by the upstream. +License: LGPLv2+ or ASL 1.1 Source0: http://wutka.com/download/%{name}-%{version}.tgz URL: http://wutka.com/dtdparser.html BuildRequires: ant @@ -144,6 +147,10 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.21-5 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.21-4jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 18:27:07 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Wed, 9 Jul 2008 18:27:07 GMT Subject: rpms/python-nss/devel python-nss.spec,1.1,1.2 Message-ID: <200807091827.m69IR7u9024110@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/python-nss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24048 Modified Files: python-nss.spec Log Message: add docutils to BuildRequires Index: python-nss.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-nss/devel/python-nss.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-nss.spec 9 Jul 2008 17:13:26 -0000 1.1 +++ python-nss.spec 9 Jul 2008 18:26:25 -0000 1.2 @@ -4,7 +4,7 @@ Name: python-nss Version: 0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python bindings for Network Security Services (NSS) Group: Development/Languages @@ -18,6 +18,7 @@ BuildRequires: python-devel BuildRequires: python-setuptools-devel BuildRequires: epydoc +BuildRequires: python-docutils BuildRequires: nspr-devel BuildRequires: nss-devel @@ -64,6 +65,9 @@ %changelog +* Wed Jul 9 2008 John Dennis - 0.0-2 +- add docutils to build requires so restructured text works + * Fri Jun 27 2008 John Dennis - 0.0-1 - initial release From fedora-extras-commits at redhat.com Wed Jul 9 18:30:00 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 9 Jul 2008 18:30:00 GMT Subject: rpms/anaconda/devel .cvsignore, 1.545, 1.546 anaconda.spec, 1.687, 1.688 sources, 1.678, 1.679 Message-ID: <200807091830.m69IU0a3024357@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24255 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.545 retrieving revision 1.546 diff -u -r1.545 -r1.546 --- .cvsignore 4 Jul 2008 01:55:48 -0000 1.545 +++ .cvsignore 9 Jul 2008 18:29:10 -0000 1.546 @@ -1,2 +1,3 @@ clog anaconda-11.4.1.12.tar.bz2 +anaconda-11.4.1.13.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.687 retrieving revision 1.688 diff -u -r1.687 -r1.688 --- anaconda.spec 4 Jul 2008 01:55:48 -0000 1.687 +++ anaconda.spec 9 Jul 2008 18:29:11 -0000 1.688 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.12 +Version: 11.4.1.13 Release: 1 License: GPLv2+ Group: Applications/System @@ -194,6 +194,23 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jul 09 2008 Chris Lumens - 11.4.1.13-1 +- Filter out source and debuginfo repos from the UI. (clumens) +- Add the MD5 sum to the boot.iso to avoid errors in loader + (#453698). (clumens) +- Don't strip too much off the NFS directory path. (clumens) +- Log stage2 url better. (pjones) +- Fix minor whitespace nits. (pjones) +- Use %m rather than strerror() where appropriate. (pjones) +- Make setupCdrom() actually return the path to the stage2 image it + found. (pjones) +- Don't unconditionally pass --lang for live installs (#454101) (katzj) +- Set up rhgb for plymouth on live. And conditionalize rhgb + runlevel 5 (katzj) +- Set up rhgb if plymouth is installed as well as rhgb (katzj) +- Get the math right on how many usec per second... (pjones) +- Import missing module "network". (pjones) +- Wait up to 45 seconds for "No medium found" to stop happening (pjones) + * Thu Jul 03 2008 Peter Jones - 11.4.1.12-1 - Add dmraid-libs to PACKAGES so new dmraid won't break installs. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.678 retrieving revision 1.679 diff -u -r1.678 -r1.679 --- sources 4 Jul 2008 01:55:48 -0000 1.678 +++ sources 9 Jul 2008 18:29:11 -0000 1.679 @@ -1 +1 @@ -3c51a80f1314873877a01ff7f5e594d1 anaconda-11.4.1.12.tar.bz2 +2ee2cd5160e972c746e86bfc245012b7 anaconda-11.4.1.13.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 18:30:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:30:10 GMT Subject: rpms/hsqldb/devel hsqldb.spec,1.41,1.42 Message-ID: <200807091830.m69IUABh024380@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hsqldb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24287 Modified Files: hsqldb.spec Log Message: fix repotag Index: hsqldb.spec =================================================================== RCS file: /cvs/pkgs/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- hsqldb.spec 29 May 2008 14:10:19 -0000 1.41 +++ hsqldb.spec 9 Jul 2008 18:29:23 -0000 1.42 @@ -38,7 +38,7 @@ Name: hsqldb Version: 1.8.0.9 -Release: 2jpp.2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Hsqldb Database Engine License: BSD @@ -100,8 +100,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Java -Requires(post): /bin/rm,/bin/ln -Requires(preun): /bin/rm +# For /bin/rm and /bin/ln +Requires(post): coreutils +Requires(preun): coreutils %description javadoc Javadoc for %{name}. @@ -269,6 +270,9 @@ %{_datadir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:1.8.0.9-3 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 1:1.8.0.9-2jpp.2 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 18:30:17 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 9 Jul 2008 18:30:17 GMT Subject: rpms/fedora-logos/devel sources,1.83,1.84 Message-ID: <200807091830.m69IUHek024427@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/fedora-logos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24274 Modified Files: sources Log Message: fix up sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- sources 9 Jul 2008 15:43:19 -0000 1.83 +++ sources 9 Jul 2008 18:29:23 -0000 1.84 @@ -1,3 +1,3 @@ -e58ae85b69cd081697e7efbb17e6a822 fedora-logos-9.99.0.tar.bz2 +910ee32c7f157d9689f1c09b30c03910 fedora-logos-9.99.0.tar.bz2 c81e48856787c64a1fbedf416937bb40 infinity-grub.xpm.gz 81e40a58d6177308e07d5db33e8e655b background.png From fedora-extras-commits at redhat.com Wed Jul 9 18:31:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:31:11 GMT Subject: rpms/httpunit/devel httpunit.spec,1.1,1.2 Message-ID: <200807091831.m69IVBuG024546@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/httpunit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24445 Modified Files: httpunit.spec Log Message: fix repotag Index: httpunit.spec =================================================================== RCS file: /cvs/pkgs/rpms/httpunit/devel/httpunit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- httpunit.spec 19 Mar 2007 13:48:28 -0000 1.1 +++ httpunit.spec 9 Jul 2008 18:30:26 -0000 1.2 @@ -30,7 +30,7 @@ Name: httpunit Version: 1.6.2 -Release: 1jpp.1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Automated web site testing toolkit License: MIT @@ -170,6 +170,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.6.2-2 +- drop repotag + * Wed Feb 14 2007 Permaine Cheung - 0:1.6.2-1jpp.1 - Fixed buildroot, release - Renamed manual subpackage to doc subpackage as per fedora packaging guideline From fedora-extras-commits at redhat.com Wed Jul 9 18:33:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:33:41 GMT Subject: rpms/emma/devel emma.spec,1.2,1.3 Message-ID: <200807091833.m69IXfkL024835@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/emma/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24776 Modified Files: emma.spec Log Message: fix repotag Index: emma.spec =================================================================== RCS file: /cvs/pkgs/rpms/emma/devel/emma.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emma.spec 7 Jul 2008 20:31:16 -0000 1.2 +++ emma.spec 9 Jul 2008 18:32:48 -0000 1.3 @@ -28,15 +28,17 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +%define shortver 2.0 + Summary: Code Coverage Tool Name: emma -Version: 2.0 -Release: 0.5312.2jpp.4%{?dist} +Version: %{shortver}.5312 +Release: 1%{?dist} Epoch: 0 Group: Development/Tools License: CPL URL: http://emma.sourceforge.net/ -Source0: emma-2.0.5312-src.zip +Source0: http://downloads.sourceforge.net/emma/%{name}-%{version}-src.zip Source1: emma-2.0.5312.pom Source2: emma_ant-2.0.5312.pom # These are hacks until we get the source for the timestamping class @@ -81,7 +83,7 @@ %{summary}. %prep -%setup -q -n %{name}-%{version}.5312 +%setup -q cp -p %{SOURCE3} . cp -p %{SOURCE4} . @@ -102,13 +104,13 @@ rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -m 644 dist/%{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{shortver}.jar install -m 644 dist/%{name}_ant.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{version}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{shortver}.jar %add_to_maven_depmap emma emma %{version} JPP %{name} %add_to_maven_depmap emma emma_ant %{version} JPP %{name}_ant -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{shortver}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{shortver}||g"`; done) # poms install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms @@ -142,6 +144,10 @@ %doc %{_javadocdir}/%{name}* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 2.0.5312-1 +- drop repotag +- fix version, release to be sane + * Mon Jul 07 2008 Andrew Overholt 2.0-0.5312.2jpp.4 - Remove requirement on maven2 as jpackage-utils now owns the maven POMs and fragments directories. From fedora-extras-commits at redhat.com Wed Jul 9 18:34:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:34:57 GMT Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.20,1.21 Message-ID: <200807091834.m69IYvxW024967@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/geronimo-specs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24920 Modified Files: geronimo-specs.spec Log Message: fix repotag Index: geronimo-specs.spec =================================================================== RCS file: /cvs/pkgs/rpms/geronimo-specs/devel/geronimo-specs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- geronimo-specs.spec 19 Feb 2008 03:08:16 -0000 1.20 +++ geronimo-specs.spec 9 Jul 2008 18:34:12 -0000 1.21 @@ -9,9 +9,9 @@ Name: geronimo-specs Version: 1.0 -Release: 1.%{mstone}.2jpp.12 +Release: 2.%{mstone}%{?dist} Epoch: 0 -License: Apache Software License 2 +License: ASL 2.0 Group: Development/Libraries/Java BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: mx4j >= 0:2.0.1 @@ -119,6 +119,9 @@ %{_javadir}/*.jar %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-2.M2 +- drop repotag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.0-1.M2.2jpp.12 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 18:36:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:36:01 GMT Subject: rpms/gnu-getopt/devel gnu-getopt.spec,1.5,1.6 Message-ID: <200807091836.m69Ia1g5025099@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnu-getopt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25041 Modified Files: gnu-getopt.spec Log Message: fix repotag Index: gnu-getopt.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnu-getopt/devel/gnu-getopt.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnu-getopt.spec 19 Feb 2008 03:09:11 -0000 1.5 +++ gnu-getopt.spec 9 Jul 2008 18:35:13 -0000 1.6 @@ -36,10 +36,10 @@ Name: gnu-getopt Version: 1.0.12 -Release: 4jpp.1 +Release: 5%{?dist} Epoch: 0 Summary: Java getopt implementation -License: LGPL +License: LGPLv2+ Url: http://www.urbanophile.com/arenn/hacking/download.html Source0: http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.12.tar.gz BuildRequires: ant @@ -70,8 +70,9 @@ Summary: Javadoc for %{name} Group: Development/Documentation BuildRequires: java-javadoc -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils Provides: gnu.getopt-javadoc = %{epoch}:%{version}-%{release} Obsoletes: gnu.getopt-javadoc <= 0:1.0.9 @@ -142,6 +143,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0.12-5 +- drop repotag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.0.12-4jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 18:37:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:37:16 GMT Subject: rpms/gnu-regexp/devel gnu-regexp.spec,1.3,1.4 Message-ID: <200807091837.m69IbGFX025250@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnu-regexp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25166 Modified Files: gnu-regexp.spec Log Message: fix repotag Index: gnu-regexp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnu-regexp/devel/gnu-regexp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnu-regexp.spec 17 Oct 2007 15:55:07 -0000 1.3 +++ gnu-regexp.spec 9 Jul 2008 18:36:19 -0000 1.4 @@ -30,9 +30,9 @@ Name: gnu-regexp Version: 1.1.4 -Release: 10jpp.3%{?dist} +Release: 11%{?dist} Summary: Java NFA regular expression engine implementation -License: LGPL +License: LGPLv2+ and GPLv2+ Source0: ftp://ftp.tralfamadore.com/pub/java/gnu.regexp-1.1.4.tar.gz Source1: %{name}.build.xml BuildRequires: ant @@ -119,6 +119,10 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.1.4-11 +- drop repotag +- fix license tag + * Wed Oct 17 2007 Deepak Bhole 1.1.4-10jpp.3 - Resolve bz# 245270: Fixed URL From fedora-extras-commits at redhat.com Wed Jul 9 18:39:40 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 9 Jul 2008 18:39:40 GMT Subject: rpms/crm114/devel .cvsignore, 1.4, 1.5 crm114-rpm.patch, 1.3, 1.4 crm114.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807091839.m69IdeZX025487@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/crm114/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25424 Modified Files: .cvsignore crm114-rpm.patch crm114.spec sources Log Message: - updated to current wget version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/crm114/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Oct 2007 14:21:15 -0000 1.4 +++ .cvsignore 9 Jul 2008 18:38:45 -0000 1.5 @@ -1 +1,2 @@ crm114-20070810-BlameTheSegfault.src.tar.gz +crm114-20080703-BlameVT.src.tar.gz crm114-rpm.patch: Index: crm114-rpm.patch =================================================================== RCS file: /cvs/pkgs/rpms/crm114/devel/crm114-rpm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- crm114-rpm.patch 27 Oct 2007 14:21:15 -0000 1.3 +++ crm114-rpm.patch 9 Jul 2008 18:38:45 -0000 1.4 @@ -1,25 +1,25 @@ -diff -up crm114-20070810-BlameTheSegfault.src/Makefile.r crm114-20070810-BlameTheSegfault.src/Makefile ---- crm114-20070810-BlameTheSegfault.src/Makefile.r 2007-08-13 13:05:35.000000000 +0200 -+++ crm114-20070810-BlameTheSegfault.src/Makefile 2007-10-27 15:49:38.000000000 +0200 -@@ -54,7 +54,7 @@ SYSTEMTYPE = POSIX - # and warn on all warnable things "-Wall". Someday add -Wextra for +diff -up crm114-20080703-BlameVT.src/Makefile.r crm114-20080703-BlameVT.src/Makefile +--- crm114-20080703-BlameVT.src/Makefile.r 2008-07-01 01:28:43.000000000 +0200 ++++ crm114-20080703-BlameVT.src/Makefile 2008-07-09 19:57:41.000000000 +0200 +@@ -72,7 +72,7 @@ SYSTEMTYPE = POSIX # really picayune stuff. # + # Our default is with debugging, full optimization, and lots of warnings: -CFLAGS += -g -O3 -Wall +#CFLAGS += -g -O3 -Wall - # turn this one on for no optimization debugging. - #CFLAGS += -g -O0 -Wall - # turn this one on for really picayune debugging. -@@ -64,7 +64,7 @@ CFLAGS += -g -O3 -Wall - # Comment this out if you want dynamic linking - # + # turn this one on for no optimization, but debugging and time profiling: + #CFLAGS += -g -O0 -Wall -pg + # turn this one on for really picayune debugging: +@@ -84,7 +84,7 @@ CFLAGS += -g -O3 -Wall # BSD users - do NOT use -static-libgcc!!! --LDFLAGS += -static -static-libgcc -+#LDFLAGS += -static -static-libgcc + #LDFLAGS += -static -static-libgcc + # use this one if you want program profiling. +-LDFLAGS += -static -static-libgcc -pg ++#LDFLAGS += -static -static-libgcc -pg # # Any standard install flags? We nominally use protection 755 INSTALLFLAGS += -m 755 -@@ -411,13 +411,13 @@ osbf-util: osbf-util.c crm_osbf_maintena +@@ -454,13 +454,13 @@ osbf-util: osbf-util.c crm_osbf_maintena crm_util_errorhandlers.o \ crm_osbf_maintenance.o -lm -ltre -o osbf-util @@ -35,7 +35,7 @@ $(CC) $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \ crm_str_funcs.o \ crm_util_errorhandlers.o \ -@@ -449,13 +449,13 @@ install_utils: +@@ -493,13 +493,13 @@ install_utils: # Installing Utilities # $(MAKE) cssmerge cssutil cssdiff osbf-util @@ -54,7 +54,7 @@ # use different name so we can keep it around along with default one -@@ -464,15 +464,15 @@ install_engine: crm114 +@@ -508,15 +508,15 @@ install_engine: crm114 # # Installing engine # Index: crm114.spec =================================================================== RCS file: /cvs/pkgs/rpms/crm114/devel/crm114.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- crm114.spec 19 Feb 2008 20:34:26 -0000 1.7 +++ crm114.spec 9 Jul 2008 18:38:45 -0000 1.8 @@ -1,6 +1,6 @@ -%define cvsver 20070810 -%define codename BlameTheSegfault -%define rel 7 +%define cvsver 20080703 +%define codename BlameVT +%define rel 8 Summary: CRM114 Bayesian Spam Detector Name: crm114 @@ -44,7 +44,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},emacs/site-lisp}} -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT INSTALLFLAGS="-m 755 -p" install install -pm 755 mail{filter,reaver,trainer}.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/ install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/ @@ -62,6 +62,9 @@ %{_datadir}/emacs/site-lisp/*.el %changelog +* Wed Jul 09 2008 Dominik Mierzejewski 0-1.8.20080703 +- updated to current "wget" version + * Tue Feb 19 2008 Fedora Release Engineering - 0-1.7.20070810 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/crm114/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Oct 2007 14:21:15 -0000 1.4 +++ sources 9 Jul 2008 18:38:45 -0000 1.5 @@ -1 +1,2 @@ 50419b5d563da414c5c0c0f256236fbc crm114-20070810-BlameTheSegfault.src.tar.gz +51ba5490d9787de9461a28a79da59586 crm114-20080703-BlameVT.src.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 18:41:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:41:02 GMT Subject: rpms/icu4j/devel icu4j.spec,1.9,1.10 Message-ID: <200807091841.m69If2Mh025613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/icu4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25543 Modified Files: icu4j.spec Log Message: fix repotag Index: icu4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- icu4j.spec 19 Feb 2008 03:10:09 -0000 1.9 +++ icu4j.spec 9 Jul 2008 18:40:08 -0000 1.10 @@ -48,10 +48,10 @@ Name: icu4j Version: 3.6.1 -Release: 2jpp.6%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: International Components for Unicode for Java -License: MIT style +License: MIT and EPL URL: http://www-306.ibm.com/software/globalization/icu/index.jsp Group: Development/Libraries/Java Source0: http://download.icu-project.org/files/icu4j/3.6.1/icu4jsrc_3_6_1.jar @@ -235,6 +235,10 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:3.6.1-3 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:3.6.1-2jpp.6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 18:42:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 18:42:06 GMT Subject: rpms/isorelax/devel isorelax.spec,1.4,1.5 Message-ID: <200807091842.m69Ig6Rj025781@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/isorelax/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25712 Modified Files: isorelax.spec Log Message: fix repotag Index: isorelax.spec =================================================================== RCS file: /cvs/pkgs/rpms/isorelax/devel/isorelax.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- isorelax.spec 29 May 2008 14:13:04 -0000 1.4 +++ isorelax.spec 9 Jul 2008 18:41:18 -0000 1.5 @@ -36,7 +36,7 @@ Epoch: 1 Version: 0 # I can't use %%{cvstag} as dashes aren't allowed in Release tags -Release: 0.1.release20050331.1jpp.3%{?dist} +Release: 0.2.release20050331%{?dist} License: MIT Group: Development/Libraries/Java BuildArch: noarch @@ -114,6 +114,9 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:0-0.2.release20050331 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1:0-0.1.release20050331.1jpp.3 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 18:48:24 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 9 Jul 2008 18:48:24 GMT Subject: rpms/kdebindings/devel kdebindings-4.0.85-smoke-buildfix.patch, NONE, 1.1 kdebindings.spec, 1.125, 1.126 Message-ID: <200807091848.m69ImO4W026247@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26096 Modified Files: kdebindings.spec Added Files: kdebindings-4.0.85-smoke-buildfix.patch Log Message: incrementally better, smoke/phonon still busted kdebindings-4.0.85-smoke-buildfix.patch: --- NEW FILE kdebindings-4.0.85-smoke-buildfix.patch --- SVN commit 830038 by kkofler: Fix typo. Hopefully fixes smoke/phonon build. CCMAIL: kde-bindings at kde.org CCMAIL: rdieter at math.unl.edu M +1 -1 generate.pl.cmake --- trunk/KDE/kdebindings/smoke/phonon/generate.pl.cmake #830037:830038 @@ -124,7 +124,7 @@ ); # Launch kalyptus -chdir "../smoke/kde"; +chdir "../smoke/phonon"; system "perl -I at kdebindings_SOURCE_DIR@/kalyptus @kdebindings_SOURCE_DIR@/kalyptus/kalyptus @ARGV --qt4 --globspace -fsmoke --name=phonon --init-modules=qt --classlist=@CMAKE_CURRENT_SOURCE_DIR@/classlist $macros --no-cache --outputdir=$outdir @headers @kdeheaders"; my $exit = $? >> 8; exit $exit if ($exit); Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- kdebindings.spec 8 Jul 2008 15:06:25 -0000 1.125 +++ kdebindings.spec 9 Jul 2008 18:47:35 -0000 1.126 @@ -27,6 +27,8 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch100: kdebindings-4.0.85-smoke-buildfix.patch + BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} @@ -85,6 +87,8 @@ %prep %setup -q +%patch100 -p3 -b .smoke-buildfix + %build mkdir -p %{_target_platform} From fedora-extras-commits at redhat.com Wed Jul 9 18:49:22 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Wed, 9 Jul 2008 18:49:22 GMT Subject: rpms/npush/F-8 npush-0.6-level-svn.patch, NONE, 1.1 npush.desktop, NONE, 1.1 npush.png, NONE, 1.1 npush.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807091849.m69InMZH026359@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/npush/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26231 Modified Files: sources Added Files: npush-0.6-level-svn.patch npush.desktop npush.png npush.spec Log Message: Initial commit npush-0.6-level-svn.patch: --- NEW FILE npush-0.6-level-svn.patch --- --- npush.cpp 2008-05-26 00:18:20.000000000 +0200 +++ npush.cpp.patch 2008-07-07 16:36:35.000000000 +0200 @@ -28,682 +28,804 @@ #include #include #include +#include +#include //----------------------------------------------------------------------------- -typedef enum { kUp, kDown, kLeft, kRight, kButton, kSwitchPlayer, kQuitGame, - kUndo, kUnknown } KeyType; +//kUnknown must be at start so it's value is 0. +typedef enum { kUnknown, kUp, kDown, kLeft, kRight, kButton, kSwitchPlayer, kQuitGame, + kUndo + } KeyType; typedef enum { paMoved, paLevelComplete, paNone } PlayerAction; typedef enum { fMenu, fGame } Font; //----------------------------------------------------------------------------- -void Box(int x0, int y0, int x1, int y1, bool clear) -{ - attrset(A_BOLD); - if (clear) - { - for (int y=y0; y charBind; +public: + Config (); + void bind (KeyType t, int toBind); + KeyType lookup (int boundChar); + void clear (); + void eraseKey (KeyType erase); +}; + +Config::Config () { + charBind[KEY_UP] = kUp; + charBind[KEY_DOWN] = kDown; + charBind[KEY_LEFT] = kLeft; + charBind[KEY_RIGHT] = kRight; + charBind['\t'] = kSwitchPlayer; + charBind['q'] = kQuitGame; + charBind['u'] = kUndo; + charBind[KEY_ENTER] = kButton; + charBind['\n'] = kButton; +} + +void +Config::bind (KeyType t, int toBind) { + charBind[toBind] = t; +} + +KeyType +Config::lookup (int boundChar) { + return charBind[boundChar]; +} + +void +Config::clear () { + charBind.clear (); +} + +void +Config::eraseKey (KeyType erase) { + for (std::map < int, KeyType >::iterator it = charBind.begin (); + it != charBind.end (); it++) { + if ((*it).second == erase) { + charBind.erase (it); + return; + } + } +} + //----------------------------------------------------------------------------- -class Screen -{ +class Screen { private: public: - virtual ~Screen(); - bool init(); - void printText(int x, int y, const std::string& text, Font f = fGame); - void render(); - void clear(); - KeyType getChar(); + virtual ~ Screen (); + bool init (); + void printText (int x, int y, const std::string & text, Font f = fGame); + void render (); + void clear (); + Config config; + KeyType getChar (); }; //----------------------------------------------------------------------------- -void Screen::clear() -{ - erase(); +void +Screen::clear () { + erase (); } + //----------------------------------------------------------------------------- -KeyType Screen::getChar() -{ - int ch = getch(); - switch (ch) - { - case KEY_DOWN: return kDown; - case KEY_UP: return kUp; - case KEY_LEFT: return kLeft; - case KEY_RIGHT: return kRight; - case '\t': return kSwitchPlayer; - case 'q': return kQuitGame; - case 'u': return kUndo; - case KEY_ENTER: - case '\n': - return kButton; - } - return kUnknown; +KeyType +Screen::getChar () { + int ch = getch (); + + return config.lookup (ch); } + //----------------------------------------------------------------------------- -bool Screen::init() -{ +bool +Screen::init () { // currently we have ncurses implementation, but it can be easily changed // just by creating instance of another class in main() - if (!initscr()) // init curses + if (!initscr ()) // init curses return false; - start_color(); - cbreak(); - keypad(stdscr, TRUE); - noecho(); - - init_pair(1, COLOR_YELLOW, COLOR_BLACK); - init_pair(2, COLOR_GREEN, COLOR_BLACK); - init_pair(3, COLOR_BLUE, COLOR_BLACK); - init_pair(4, COLOR_RED, COLOR_BLACK); + start_color (); + cbreak (); + keypad (stdscr, TRUE); + noecho (); + + init_pair (1, COLOR_YELLOW, COLOR_BLACK); + init_pair (2, COLOR_GREEN, COLOR_BLACK); + init_pair (3, COLOR_BLUE, COLOR_BLACK); + init_pair (4, COLOR_RED, COLOR_BLACK); return true; } + //----------------------------------------------------------------------------- -Screen::~Screen() -{ - endwin(); +Screen::~Screen () { + endwin (); } + //----------------------------------------------------------------------------- -void Screen::printText(int x, int y, const std::string& text, Font f) -{ - if (f == fMenu) // weight and such - { - attrset(A_NORMAL); +void +Screen::printText (int x, int y, const std::string & text, Font f) { + if (f == fMenu) { // weight and such + attrset (A_NORMAL); } - if (f == fGame) // color and such - { - attrset(A_BOLD); + if (f == fGame) { // color and such + attrset (A_BOLD); } - mvprintw(y, x, "%s", text.c_str()); + mvprintw (y, x, "%s", text.c_str ()); } + //----------------------------------------------------------------------------- -void Screen::render() -{ - mvprintw(1, 1, "-=[ nPush ]=- -=[ nPush ]=- http://npush.sourceforge.net/"); - move(1, 15); - refresh(); +void +Screen::render () { + mvprintw (1, 1, + "-=[ nPush ]=- -=[ nPush ]=- http://npush.sourceforge.net/"); + move (1, 15); + refresh (); } + //----------------------------------------------------------------------------- -class Menu -{ +class Menu { private: + typedef std::vector < std::string > ItemList; + Screen & screenM; + ItemList itemsM; std::string titleM; bool showBigLogoM; - typedef std::vector ItemList; - Screen &screenM; - ItemList itemsM; int currentItemM; - void drawBigLogo(); + void drawBigLogo (); public: - Menu(Screen& s, const std::string& title, bool showBigLogo = false); - void add(const std::string& item); - std::string getItemText(int index); - int count(); - int show(); + Menu (Screen & s, const std::string & title, bool showBigLogo = false); + void add (const std::string & item); + std::string getItemText (int index); + int count (); + int show (); }; //----------------------------------------------------------------------------- -class ControlsConfigurator -{ +class ControlsConfigurator { private: - Screen& screenM; + Screen & screenM; public: - ControlsConfigurator(Screen& scr); + ControlsConfigurator (Screen & scr); }; //----------------------------------------------------------------------------- -ControlsConfigurator::ControlsConfigurator(Screen& scr) - :screenM(scr) -{ +ControlsConfigurator::ControlsConfigurator (Screen & scr):screenM (scr) { // show menu with current controls and allow changing // TODO: needs config() class - clear(); + clear (); - int y = 3; - int x = 3; - mvprintw(y++, x, "Configure controls"); - mvprintw(y++, x, ""); - mvprintw(y++, x, "This option is not yet implemented. In the meantime use:"); - mvprintw(y++, x, ""); - mvprintw(y++, x, "arrow keys - movement"); - mvprintw(y++, x, " tab - switch player"); - mvprintw(y++, x, " u - undo last move (unlimited)"); - mvprintw(y++, x, " q - quit game"); + /*int y = 3; + int x = 3; + mvprintw(y++, x, "Configure controls"); + mvprintw(y++, x, ""); + mvprintw(y++, x, "This option is not yet implemented. In the meantime use:"); + mvprintw(y++, x, ""); + mvprintw(y++, x, "arrow keys - movement"); + mvprintw(y++, x, " tab - switch player"); + mvprintw(y++, x, " u - undo last move (unlimited)"); + mvprintw(y++, x, " q - quit game"); + */ + Menu + m (scr, "Configuring Controls", false); + m.add ("Move Left"); + m.add ("Move Right"); + m.add ("Move Up"); + m.add ("Move Down"); + m.add ("Switch Player"); + m.add ("Undo Last Move"); + m.add ("Quit Game"); + m.add ("Return to Main Menu"); + scr.render (); + while (true) { + int + result = m.show (); + int + ch; + switch (result) { + case 0: + ch = Prompt ("Press a key for Left"); + scr.config.eraseKey (kLeft); + scr.config.bind (kLeft, ch); + break; + case 1: + ch = Prompt ("Press a key for Right"); + scr.config.eraseKey (kRight); + scr.config.bind (kRight, ch); + break; + case 2: + ch = Prompt ("Press a key for Up"); + scr.config.eraseKey (kUp); + scr.config.bind (kUp, ch); + break; + case 3: + ch = Prompt ("Press a key for Down"); + scr.config.eraseKey (kDown); + scr.config.bind (kDown, ch); + break; + case 4: + ch = Prompt ("Press a key for switching the player"); + scr.config.eraseKey (kSwitchPlayer); + scr.config.bind (kSwitchPlayer, ch); + break; + case 5: + ch = Prompt ("Press a key for undoing moves"); + scr.config.eraseKey (kUndo); + scr.config.bind (kUndo, ch); + break; + case 6: + ch = Prompt ("Press a key for quiting the game"); + scr.config.eraseKey (kQuitGame); + scr.config.bind (kQuitGame, ch); + break; + case 7: + return; + } + } - scr.render(); - getch(); } + //----------------------------------------------------------------------------- -class LevelSelector -{ +class + LevelSelector { private: - Screen& screenM; + Screen & + screenM; public: - LevelSelector(Screen& scr); - void start(); + LevelSelector (Screen & scr); + void + start (); }; //----------------------------------------------------------------------------- -Menu::Menu(Screen& s, const std::string& title, bool showBigLogo) - :screenM(s), currentItemM(0), titleM(title), showBigLogoM(showBigLogo) +Menu::Menu (Screen & s, const std::string & title, bool showBigLogo): + screenM (s), + titleM (title), + showBigLogoM (showBigLogo), + currentItemM (0) { } + //----------------------------------------------------------------------------- -void Menu::add(const std::string& item) -{ - itemsM.push_back(item); +void +Menu::add (const std::string & item) { + itemsM.push_back (item); } + //----------------------------------------------------------------------------- -std::string Menu::getItemText(int index) -{ +std::string Menu::getItemText (int index) { return itemsM[index]; } + //----------------------------------------------------------------------------- -int Menu::count() -{ - return itemsM.size(); +int +Menu::count () { + return itemsM.size (); } + //----------------------------------------------------------------------------- -void Menu::drawBigLogo() -{ +void +Menu::drawBigLogo () { std::string msg[] = { - " .?????????????/ ", - " .. ????????????????????: ", - " .??????? ???????????????. ?????p ", - " .????????. _??????????????????? ????p ", - " )???????? j???????????????????????????? ", - " ?????? j??????????????????????????????, ", - " _?????????????????????????????????????????????. ", - " ???????????????????????????????????????????????? ", - " ???????? ??????????????????????????????????? ", - " j???? ??????????????????????????????????? ", - " j???? ???????????????????????????????????? ", - " ?????/ -??????????????????????????????????[ ", - " j?????????? ??????????????????????????????????' ", - " ??????? ??????? -????????????????????????????????? ", - " .?????? ????? -??????????????????????????????? ", - " j????' ???? ?????????????????????????????? ", - " ??????? ???' ?????????????????????????` ", - "???????` ?????p ?????????????????????? ", - "??????? ?????? ????????????????` ", - " -??????? " + " .00OOOOOOOOO'0o ", + " .. 000OOOOOOOO'88'OOO'0: ", + " .00OOO00 o0OOOOOOOOOOO':. %8OOOp ", + " .'OOOOOOO. _0OOOOOOOOOOOOOOO'Lu A8OOp ", + " )OOOOOOOY jOOOOOOOOOOOOOOOOOOO'''''08O0 ", + " 0'OO'% jOOOOOOOOOOOOOOOOOOOOOOOOOOO'O', ", + " _0OOO:00000000'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOO'. ", + " /'OOOOOOO'O'OO'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO7 ", + " /'OO%AAA 0OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " jOOOy pOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " jOO'y uOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " EOOO0/ -'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO[ ", + " j'OO'OOO00u pOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO' ", + " /'OO'%u %'OO'0u -'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOy ", + " .0OOO%u %OOO7 -8OOOOOOOOOOOOOOOOOOOOOOOOOOOOOy ", + " j'OO8' pOO7 u0'OOOOOOOOOOOOOOOOOOOOOOOOO'y ", + " o0'OO'% 'OO' 08OOOOOOOOOOOOOOOOOOOOO'8' ", + "EOOOOO8` pOOO'p uO%'OOOOOOOOOOOOOOOO'Y ", + "08OOO'y 8''88y A8'OOOOOOOOOO'8%` ", + " -UAA%8%% " }; - color_set(1, 0); - for (int i=0; i= itemsM.size()) + if (currentItemM >= (int)itemsM.size ()) currentItemM = 0; - } - else if (k == kButton) - { + } else if (k == kButton) { return currentItemM; } } return -1; } + //----------------------------------------------------------------------------- -class Game -{ +class Game { private: bool levelCompleteM; - Screen& screenM; + Screen & screenM; public: - Game(Screen& s, const std::string& levelName); - bool levelComplete(); + Game (Screen & s, const std::string & levelName); + bool levelComplete (); }; //----------------------------------------------------------------------------- -bool Game::levelComplete() -{ +bool +Game::levelComplete () { return levelCompleteM; } + //----------------------------------------------------------------------------- class Level; -class Player -{ +class Player { private: int xM; int yM; public: - Player(int x, int y); - void render(); - PlayerAction handleInput(KeyType key, Level& level); + Player (int x, int y); + void render (); + PlayerAction handleInput (KeyType key, Level & level); }; //----------------------------------------------------------------------------- -class Level -{ +class Level { private: int goldNeededM; - std::vector mapM; + std::vector < std::string > mapM; public: - Level(const std::string& name, std::vector& players); - void render(); - void moveField(int x, int y, int dx, int dy); - void setField(int x, int y, char f); - char getField(int x, int y); - int goldNeeded(); - void addGold(int count); + Level (const std::string & name, std::vector < Player > &players); + void render (); + void moveField (int x, int y, int dx, int dy); + void setField (int x, int y, char f); + char getField (int x, int y); + int goldNeeded (); + void addGold (int count); }; //----------------------------------------------------------------------------- -Player::Player(int x, int y) - :xM(x), yM(y) -{ +Player::Player (int x, int y): + xM (x), + yM (y) { } + //----------------------------------------------------------------------------- -void Player::render() -{ - attrset(A_BOLD); - color_set(3, 0); - mvprintw(yM+3, xM+3, "@"); - attrset(A_NORMAL); +void +Player::render () { + attrset (A_BOLD); + color_set (3, 0); + mvprintw (yM + 3, xM + 3, "@"); + attrset (A_NORMAL); } + //----------------------------------------------------------------------------- -PlayerAction Player::handleInput(KeyType key, Level& level) -{ +PlayerAction +Player::handleInput (KeyType key, Level & level) { int dx = 0, dy = 0; - switch (key) - { - case kUp: dy = -1; break; - case kDown: dy = 1; break; - case kLeft: dx = -1; break; - case kRight: dx = 1; break; - default: - return paNone; - } - switch (level.getField(xM + dx, yM + dy)) - { - case '$': level.addGold(-1); - case ' ': - level.moveField(xM, yM, dx, dy); + switch (key) { + case kUp: + dy = -1; + break; + case kDown: + dy = 1; + break; + case kLeft: + dx = -1; + break; + case kRight: + dx = 1; + break; + default: + return paNone; + } + switch (level.getField (xM + dx, yM + dy)) { + case '$': + level.addGold (-1); + case ' ': + level.moveField (xM, yM, dx, dy); + xM += dx; + yM += dy; + return paMoved; + case 'O': + // look beyond if we can push it + if (level.getField (xM + 2 * dx, yM + 2 * dy) == ' ') { + level.moveField (xM + dx, yM + dy, dx, dy); // move rock + level.moveField (xM, yM, dx, dy); // move player xM += dx; yM += dy; return paMoved; - case 'O': - // look beyond if we can push it - if (level.getField(xM + 2*dx, yM + 2*dy) == ' ') - { - level.moveField(xM+dx, yM+dy, dx, dy); // move rock - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - return paNone; - case 'h': - { - char c = level.getField(xM + 2*dx, yM + 2*dy); - if (c == 'O' || c == 'h') - { - level.setField(xM+2*dx, yM+2*dy, ' '); // explode - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - if (c == ' ') - { - level.moveField(xM+dx, yM+dy, dx, dy); // move dynamite - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - return paNone; - } - case 'x': - if (level.goldNeeded() < 1) - return paLevelComplete; - return paNone; + } + return paNone; + case 'h': { + char c = level.getField (xM + 2 * dx, yM + 2 * dy); + if (c == 'O' || c == 'h') { + level.setField (xM + 2 * dx, yM + 2 * dy, ' '); // explode + level.moveField (xM, yM, dx, dy); // move player + xM += dx; + yM += dy; + return paMoved; + } + if (c == ' ') { + level.moveField (xM + dx, yM + dy, dx, dy); // move dynamite + level.moveField (xM, yM, dx, dy); // move player + xM += dx; + yM += dy; + return paMoved; + } + return paNone; + } + case 'x': + if (level.goldNeeded () < 1) + return paLevelComplete; + return paNone; } return paNone; } + //----------------------------------------------------------------------------- -void Level::setField(int x, int y, char f) -{ +void +Level::setField (int x, int y, char f) { mapM[y][x] = f; } + //----------------------------------------------------------------------------- -char Level::getField(int x, int y) -{ +char +Level::getField (int x, int y) { return mapM[y][x]; } + //----------------------------------------------------------------------------- -void Level::moveField(int x, int y, int dx, int dy) -{ - char field = getField(x, y); - setField(x, y, ' '); - setField(x+dx, y+dy, field); +void +Level::moveField (int x, int y, int dx, int dy) { + char field = getField (x, y); + setField (x, y, ' '); + setField (x + dx, y + dy, field); } + //----------------------------------------------------------------------------- -int Level::goldNeeded() -{ +int +Level::goldNeeded () { return goldNeededM; } + //----------------------------------------------------------------------------- -void Level::addGold(int count) -{ +void +Level::addGold (int count) { goldNeededM += count; if (goldNeededM < 0) goldNeededM = 0; } + //----------------------------------------------------------------------------- -Level::Level(const std::string& name, std::vector& players) -{ +Level::Level (const std::string & name, std::vector < Player > &players) { // load level from file, for each player found, create instance of Player - players.clear(); - mapM.clear(); + players.clear (); + mapM.clear (); goldNeededM = 0; - FILE *fp = fopen(name.c_str(), "rb"); - if (!fp) - { - Message("Cannot open level file!"); + std::string fileName = "/usr/share/npush/" + name; + FILE *fp = fopen (fileName.c_str (), "rb"); + if (!fp) { + Message ("Cannot open level file!"); return; } int y = 0; char buffer[80]; - while (!feof(fp)) - { - if (!fgets(buffer, 80, fp)) + while (!feof (fp)) { + if (!fgets (buffer, 80, fp)) break; - for (int x = 0; x < 80 && buffer[x] != '\n' && buffer[x] != '\0'; x++) - { + for (int x = 0; x < 80 && buffer[x] != '\n' && buffer[x] != '\0'; x++) { if (buffer[x] == ',') // comments, ignore rest of the line break; - if (buffer[x] == '@') - { - Player p(x, y); - players.push_back(p); + if (buffer[x] == '@') { + Player p (x, y); + players.push_back (p); } if (buffer[x] == '$') goldNeededM++; } - mapM.push_back(buffer); + mapM.push_back (buffer); y++; } } + //----------------------------------------------------------------------------- -void Level::render() -{ - clear(); +void +Level::render () { + clear (); int xpos = 3; int ypos = 3; - for (std::vector::iterator it = mapM.begin(); - it != mapM.end(); ++it, ypos++) - { + for (std::vector < std::string >::iterator it = mapM.begin (); + it != mapM.end (); ++it, ypos++) { // if (black&white) //mvprintw(ypos++, xpos, "%s", (*it).c_str()); - move(ypos, xpos); + move (ypos, xpos); bool comment = false; bool bold = false; - for (int i=0; i<(*it).length(); i++) - { + for (unsigned i = 0; i < (*it).length (); i++) { char c = (*it)[i]; - attrset(A_NORMAL); - if (!comment) - { - switch (c) - { - case ',': - c = ' '; - comment = true; - break; - case ';': - c = ' '; - comment = bold = true; - break; - case '#': color_set(1, 0); break; - case 'x': color_set(2, 0); break; - case '@': color_set(3, 0); break; - case 'h': color_set(4, 0); break; - case '$': - attrset(A_BOLD); - color_set(1, 0); - break; + attrset (A_NORMAL); + if (!comment) { + switch (c) { + case ',': + c = ' '; + comment = true; + break; + case ';': + c = ' '; + comment = bold = true; + break; + case '#': + color_set (1, 0); + break; + case 'x': + color_set (2, 0); + break; + case '@': + color_set (3, 0); + break; + case 'h': + color_set (4, 0); + break; + case '$': + attrset (A_BOLD); + color_set (1, 0); + break; }; - } - else if (bold) // bold comment - attrset(A_BOLD); - printw("%c", c); + } else if (bold) // bold comment + attrset (A_BOLD); + printw ("%c", c); } } } + //----------------------------------------------------------------------------- -class GameState -{ +class GameState { public: Level level; - std::vector players; - GameState(const Level& l, const std::vector& p) - :level(l), players(p) - { + std::vector < Player > players; + GameState (const Level & l, const std::vector < Player > &p):level (l), + players (p) { } }; //----------------------------------------------------------------------------- -Game::Game(Screen& s, const std::string& levelName) - :screenM(s), levelCompleteM(false) +Game::Game (Screen & s, const std::string & levelName): + levelCompleteM (false), + screenM (s) { - std::vector players; // there can be multiple on the screen + std::vector < Player > players; // there can be multiple on the screen // load levelName - Level level(levelName, players); - if (players.size() == 0) - { - Message("Bad level, no players found!"); + Level level (levelName, players); + if (players.size () == 0) { + Message ("Bad level, no players found!"); return; } - std::stack undo; - undo.push(GameState(level, players)); + std::stack < GameState > undo; + undo.push (GameState (level, players)); - std::vector::iterator currentPlayer = players.begin(); - while (true) - { - level.render(); - (*currentPlayer).render(); - s.render(); + std::vector < Player >::iterator currentPlayer = players.begin (); + while (true) { + level.render (); + (*currentPlayer).render (); + s.render (); // handle key press - KeyType key = s.getChar(); - switch (key) - { + KeyType key = s.getChar (); + switch (key) { // handle game-wide keys (like player switching) - case kSwitchPlayer: - if (++currentPlayer == players.end()) - currentPlayer = players.begin(); - break; + case kSwitchPlayer: + if (++currentPlayer == players.end ()) + currentPlayer = players.begin (); + break; - case kQuitGame: - return; + case kQuitGame: + return; - case kUndo: - if (undo.size() > 1) - { - undo.pop(); // remove current state - level = undo.top().level; - players = undo.top().players; - } - break; - default: // handle player movement keys - PlayerAction pa = (*currentPlayer).handleInput(key, level); - if (pa == paLevelComplete) - { - levelCompleteM = true; - Message("Well done. Level completed."); - return; - } - if (pa == paMoved) - { - // store undo buffer - undo.push(GameState(level, players)); - } + case kUndo: + if (undo.size () > 1) { + undo.pop (); // remove current state + level = undo.top ().level; + players = undo.top ().players; + } + break; + default: // handle player movement keys + PlayerAction pa = (*currentPlayer).handleInput (key, level); + if (pa == paLevelComplete) { + levelCompleteM = true; + Message ("Well done. Level completed."); + return; + } + if (pa == paMoved) { + // store undo buffer + undo.push (GameState (level, players)); + } }; } } + //----------------------------------------------------------------------------- -LevelSelector::LevelSelector(Screen& s) - :screenM(s) -{ - Menu m(s, "Select a level"); +LevelSelector::LevelSelector (Screen & s):screenM (s) { + Menu + m (s, "Select a level"); // TODO: load all levels from 'levels' directory and sort them alphabetical /* - m.add("Level 1 - Gold and Exit"); - m.add("Level 2 - Rocks"); - m.add("Level 3 - Dynamite"); - m.add("Level 4 - The Show Starts"); - */ - std::set files; - DIR *dir = opendir("."); - if (!dir) - { - Message("Cannot read levels from directory"); + m.add("Level 1 - Gold and Exit"); + m.add("Level 2 - Rocks"); + m.add("Level 3 - Dynamite"); + m.add("Level 4 - The Show Starts"); + */ + std::set < std::string > files; + DIR * + dir = opendir ("/usr/share/npush/"); + if (!dir) { + Message ("Cannot read levels from directory"); return; } - while (true) - { - struct dirent *de = readdir(dir); + while (true) { + struct dirent * + de = readdir (dir); if (!de) break; - std::string filename(de->d_name); - if (filename.find("Level") == 0) // starts with - files.insert(filename); - } - closedir(dir); - for (std::set::iterator it = files.begin(); it != files.end(); - ++it) - { - m.add(*it); + std::string filename (de->d_name); + if (filename.find ("Level") == 0) // starts with + files.insert (filename); + } + closedir (dir); + for (std::set < std::string >::iterator it = files.begin (); + it != files.end (); ++it) { + m.add (*it); } - m.add("Back to main menu"); - int result = m.show(); - if (result == -1 || result >= m.count() - 1) + m.add ("Back to main menu"); + int + result = m.show (); + if (result == -1 || result >= m.count () - 1) return; - while (true) - { - Game g(s, m.getItemText(result)); - if (g.levelComplete()) // level completed - { + while (true) { + Game + g (s, m.getItemText (result)); + if (g.levelComplete ()) { // level completed result++; - if (result < (m.count() - 1)) + if (result < (m.count () - 1)) continue; - Message("No more levels"); + Message ("No more levels"); return; - } - else // exited + } else // exited return; } } + //----------------------------------------------------------------------------- -int main() -{ - Screen s; - if (!s.init()) +int +main () { + Screen + s; + if (!s.init ()) return 1; - Menu m(s, "Welcome to nPush", true); - m.add("Start a new game"); - m.add("Configure controls"); - m.add("Quit"); - - while (true) - { - int result = m.show(); - if (result == 0) - { - LevelSelector ls(s); + Menu + m (s, "Welcome to nPush", true); + m.add ("Start a new game"); + m.add ("Configure controls"); + m.add ("Quit"); + + while (true) { + int + result = m.show (); + if (result == 0) { + LevelSelector + ls (s); continue; - } - else if (result == 1) - { - ControlsConfigurator cc(s); + } else if (result == 1) { + ControlsConfigurator + cc (s); continue; } break; } return 0; } + //----------------------------------------------------------------------------- --- NEW FILE npush.desktop --- [Desktop Entry] Encoding=UTF-8 Name=nPush Comment=A logic game similar to Sokoba Exec=npush Icon=npush Terminal=true Type=Application Categories=Game; --- NEW FILE npush.spec --- Name: npush Version: 0.6 Release: 1%{?dist} Summary: A logic game similar to Sokoba Group: Amusements/Games License: GPLv2+ URL: http://npush.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz # self made icon and .desktop file Source1: %{name}.desktop Source2: %{name}.png # patch npush.cpp to svn version to fix an issue with level selector Patch: npush-0.6-level-svn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel desktop-file-utils %description nPush is a logic game similar to Sokoban and Boulder Dash. You need to collect all the gold on the level and reach the exit. To make it hard there are some rocks that stand in your way, and you also have some dynamite to blast them away. Main difference from Sokoban, KSokoban and similar games is that you can have multiple player-controlled characters you can move on the screen. nPush is a terminal based application and uses nCurses library for user interface. %prep %setup -q %patch -p0 %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}%{_bindir} install -p -m 755 npush %{buildroot}%{_bindir}/npush mkdir -p %{buildroot}%{_datadir}/npush cp -ra Level* %{buildroot}%{_datadir}/npush # desktop file stuff desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 0644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc readme.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog * Mon Jul 07 2008 Stefan Posdzich - 0.6-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:59:33 -0000 1.1 +++ sources 9 Jul 2008 18:48:39 -0000 1.2 @@ -0,0 +1 @@ +6670aac74dd7db005462c11c5688db52 npush-0.6.tgz From fedora-extras-commits at redhat.com Wed Jul 9 18:49:37 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 9 Jul 2008 18:49:37 GMT Subject: rpms/libgtop2/F-8 libgtop-2.20-fsusage.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 libgtop2.spec, 1.58, 1.59 sources, 1.39, 1.40 Message-ID: <200807091849.m69InbBI026371@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/libgtop2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26276 Modified Files: .cvsignore libgtop2.spec sources Added Files: libgtop-2.20-fsusage.patch Log Message: * Thu Jun 26 2008 Michael Schwendt - 2.20.2-1 - Apply fsusage.c patch for Linux >= 2.6.25 (#452273). - Update to 2.20.2 (fixed smaps parsing on >= 2.6.24.x) libgtop-2.20-fsusage.patch: --- NEW FILE libgtop-2.20-fsusage.patch --- diff -Nur libgtop-2.20.1-orig/sysdeps/linux/fsusage.c libgtop-2.20.1/sysdeps/linux/fsusage.c --- libgtop-2.20.1-orig/sysdeps/linux/fsusage.c 2007-09-27 22:34:52.000000000 +0200 +++ libgtop-2.20.1/sysdeps/linux/fsusage.c 2008-06-26 20:20:04.000000000 +0200 @@ -62,9 +62,35 @@ } +/* + Bug #539360. + /sys/.../stat format is partially defined in + linux/Documentation/block/stat.txt (looks outdated). Before linux + 2.5.25, /sys/block/%s/stat and /sys/block/%s/%s/stat were not the + same, but the following commit changed the latter to have the same + format and broke compatibility. + + Commit 34e8beac92c27d292938065f8375842d2840767c + Author: Jerome Marchand + Date: Fri Feb 8 11:04:55 2008 +0100 + + Enhanced partition statistics: sysfs + + Reports enhanced partition statistics in sysfs. + + Signed-off-by: Jerome Marchand + + fs/partitions/check.c | 22 +++++++++++++++++++--- + 1 files changed, 19 insertions(+), 3 deletions(-) + + */ + static void -get_sys_path(const char *device, char **stat_path, const char **parse_format) +get_sys_path(glibtop* server, const char *device, char **stat_path, const char **parse_format) { + const char* linux_2_6_25_format = "%*llu %*llu %llu %*llu" + "%*llu %*llu %llu %*llu"; + if(g_str_has_prefix(device, "hd") || g_str_has_prefix(device, "sd")) { char *prefix; @@ -82,12 +108,18 @@ g_free(prefix); *stat_path = path; - *parse_format = "%*llu %llu %*llu %llu"; + if (server->os_version_code < LINUX_VERSION_CODE(2, 6, 25)) + *parse_format = "%*llu %llu %*llu %llu"; + else + *parse_format = linux_2_6_25_format; } else { *stat_path = g_strdup_printf("/sys/block/%s/stat", device); - *parse_format = "%*llu %*llu %llu %*llu %*llu %*llu %llu"; + if (server->os_version_code < LINUX_VERSION_CODE(2, 6, 25)) + *parse_format = "%*llu %*llu %llu %*llu %*llu %*llu %llu"; + else + *parse_format = linux_2_6_25_format; } } @@ -104,7 +136,7 @@ device = get_partition(path); if(!device) return; - get_sys_path(device, &filename, &format); + get_sys_path(server, device, &filename, &format); g_free(device); ret = try_file_to_buffer(buffer, sizeof buffer, filename); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgtop2/F-8/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 8 Jan 2008 14:43:26 -0000 1.39 +++ .cvsignore 9 Jul 2008 18:48:37 -0000 1.40 @@ -1 +1 @@ -libgtop-2.20.1.tar.bz2 +libgtop-2.20.2.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgtop2/F-8/libgtop2.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- libgtop2.spec 8 Jan 2008 14:43:26 -0000 1.58 +++ libgtop2.spec 9 Jul 2008 18:48:37 -0000 1.59 @@ -6,12 +6,13 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.20.1 +Version: 2.20.2 Release: 1%{?dist} License: GPLv2+ URL: http://download.gnome.org/sources/libgtop/2.20 Group: System Environment/Libraries Source: http://download.gnome.org/sources/libgtop/2.20/libgtop-%{version}.tar.bz2 +Patch1: libgtop-2.20-fsusage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: glib2 >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -39,6 +40,7 @@ %prep %setup -q -n libgtop-%{version} +%patch1 -p1 -b .fsusage %build %configure --disable-gtk-doc --disable-static @@ -75,6 +77,10 @@ %exclude %{_datadir}/info %changelog +* Thu Jun 26 2008 Michael Schwendt - 2.20.2-1 +- Apply fsusage.c patch for Linux >= 2.6.25 (#452273). +- Update to 2.20.2 (fixed smaps parsing on >= 2.6.24.x) + * Tue Jan 08 2008 - Bastien Nocera - 2.20.1-1 - Update to 2.20.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgtop2/F-8/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 8 Jan 2008 14:43:26 -0000 1.39 +++ sources 9 Jul 2008 18:48:37 -0000 1.40 @@ -1 +1 @@ -b6fa671e8325bd8dbce684527791225a libgtop-2.20.1.tar.bz2 +c3bbd8d03a3f2995f1f4974933c0e8ba libgtop-2.20.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 9 18:49:43 2008 From: fedora-extras-commits at redhat.com (Julio M. Merino Vidal (jmmv)) Date: Wed, 9 Jul 2008 18:49:43 GMT Subject: rpms/bmake/devel bmake.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807091849.m69InhSK026382@cvs-int.fedora.redhat.com> Author: jmmv Update of /cvs/pkgs/rpms/bmake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26273/devel Modified Files: .cvsignore sources Added Files: bmake.spec import.log Log Message: * Wed Jul 2 2008 Julio M. Merino Vidal - 20080515-1 - Initial release for Fedora. --- NEW FILE bmake.spec --- Summary: The NetBSD make(1) tool Name: bmake Version: 20080515 Release: 1%{?dist} License: BSD with advertising Group: Development/Tools URL: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/ Source0: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/bmake-%{version}.tar.gz Requires: mk-files BuildRequires: mk-files BuildRequires: util-linux BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description bmake, the NetBSD make(1) tool, is a program designed to simplify the maintenance of other programs. The input of bmake is a list of specifications indicating the files upon which the targets (programs and other files) depend. bmake then detects which targets are out of date based on their dependencies and triggers the necessary commands to bring them up to date when that happens. bmake is similar to GNU make, even though the syntax for the advanced features supported in Makefiles is very different. %prep %setup -q -n %{name} %build %configure --with-default-sys-path=%{_datadir}/mk make -f makefile.boot %{?_smp_mflags} bootstrap %install rm -rf ${RPM_BUILD_ROOT} install -m 755 -d ${RPM_BUILD_ROOT}%{_bindir} install -m 755 -c bmake ${RPM_BUILD_ROOT}%{_bindir}/bmake install -m 755 -d ${RPM_BUILD_ROOT}%{_mandir}/man1 install -m 644 -c bmake.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/bmake.1 %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc ChangeLog README %{_bindir}/* %{_mandir}/man1/* %changelog * Wed Jul 2 2008 Julio M. Merino Vidal - 20080515-1 - Initial release for Fedora. --- NEW FILE import.log --- bmake-20080515-1_fc10:HEAD:bmake-20080515-1.fc10.src.rpm:1215598441 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bmake/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:55:58 -0000 1.1 +++ .cvsignore 9 Jul 2008 18:48:59 -0000 1.2 @@ -0,0 +1 @@ +bmake-20080515.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bmake/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:55:58 -0000 1.1 +++ sources 9 Jul 2008 18:48:59 -0000 1.2 @@ -0,0 +1 @@ +a16b119c5d99dd2ecfdc6307c76fb83c bmake-20080515.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 18:51:39 2008 From: fedora-extras-commits at redhat.com (Julio M. Merino Vidal (jmmv)) Date: Wed, 9 Jul 2008 18:51:39 GMT Subject: rpms/bmake/F-9 bmake.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807091851.m69IpdKo026683@cvs-int.fedora.redhat.com> Author: jmmv Update of /cvs/pkgs/rpms/bmake/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26603/F-9 Modified Files: .cvsignore sources Added Files: bmake.spec import.log Log Message: * Wed Jul 2 2008 Julio M. Merino Vidal - 20080515-1 - Initial release for Fedora. --- NEW FILE bmake.spec --- Summary: The NetBSD make(1) tool Name: bmake Version: 20080515 Release: 1%{?dist} License: BSD with advertising Group: Development/Tools URL: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/ Source0: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/bmake-%{version}.tar.gz Requires: mk-files BuildRequires: mk-files BuildRequires: util-linux BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description bmake, the NetBSD make(1) tool, is a program designed to simplify the maintenance of other programs. The input of bmake is a list of specifications indicating the files upon which the targets (programs and other files) depend. bmake then detects which targets are out of date based on their dependencies and triggers the necessary commands to bring them up to date when that happens. bmake is similar to GNU make, even though the syntax for the advanced features supported in Makefiles is very different. %prep %setup -q -n %{name} %build %configure --with-default-sys-path=%{_datadir}/mk make -f makefile.boot %{?_smp_mflags} bootstrap %install rm -rf ${RPM_BUILD_ROOT} install -m 755 -d ${RPM_BUILD_ROOT}%{_bindir} install -m 755 -c bmake ${RPM_BUILD_ROOT}%{_bindir}/bmake install -m 755 -d ${RPM_BUILD_ROOT}%{_mandir}/man1 install -m 644 -c bmake.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/bmake.1 %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc ChangeLog README %{_bindir}/* %{_mandir}/man1/* %changelog * Wed Jul 2 2008 Julio M. Merino Vidal - 20080515-1 - Initial release for Fedora. --- NEW FILE import.log --- bmake-20080515-1_fc10:F-9:bmake-20080515-1.fc10.src.rpm:1215598567 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bmake/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:55:58 -0000 1.1 +++ .cvsignore 9 Jul 2008 18:50:48 -0000 1.2 @@ -0,0 +1 @@ +bmake-20080515.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bmake/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:55:58 -0000 1.1 +++ sources 9 Jul 2008 18:50:48 -0000 1.2 @@ -0,0 +1 @@ +a16b119c5d99dd2ecfdc6307c76fb83c bmake-20080515.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 18:56:28 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 9 Jul 2008 18:56:28 GMT Subject: rpms/fedora-logos/devel sources,1.84,1.85 Message-ID: <200807091856.m69IuSBB027000@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/fedora-logos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26913 Modified Files: sources Log Message: try again Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- sources 9 Jul 2008 18:29:23 -0000 1.84 +++ sources 9 Jul 2008 18:55:37 -0000 1.85 @@ -1,3 +1,3 @@ -910ee32c7f157d9689f1c09b30c03910 fedora-logos-9.99.0.tar.bz2 +2690d7a3806ded1057ce36c139980429 fedora-logos-9.99.0.tar.bz2 c81e48856787c64a1fbedf416937bb40 infinity-grub.xpm.gz 81e40a58d6177308e07d5db33e8e655b background.png From fedora-extras-commits at redhat.com Wed Jul 9 19:02:00 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Wed, 9 Jul 2008 19:02:00 GMT Subject: rpms/npush/F-9 npush-0.6-level-svn.patch, NONE, 1.1 npush.desktop, NONE, 1.1 npush.png, NONE, 1.1 npush.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807091902.m69J20Sr001445@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/npush/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27324 Modified Files: sources Added Files: npush-0.6-level-svn.patch npush.desktop npush.png npush.spec Log Message: Initial commit npush-0.6-level-svn.patch: --- NEW FILE npush-0.6-level-svn.patch --- --- npush.cpp 2008-05-26 00:18:20.000000000 +0200 +++ npush.cpp.patch 2008-07-07 16:36:35.000000000 +0200 @@ -28,682 +28,804 @@ #include #include #include +#include +#include //----------------------------------------------------------------------------- -typedef enum { kUp, kDown, kLeft, kRight, kButton, kSwitchPlayer, kQuitGame, - kUndo, kUnknown } KeyType; +//kUnknown must be at start so it's value is 0. +typedef enum { kUnknown, kUp, kDown, kLeft, kRight, kButton, kSwitchPlayer, kQuitGame, + kUndo + } KeyType; typedef enum { paMoved, paLevelComplete, paNone } PlayerAction; typedef enum { fMenu, fGame } Font; //----------------------------------------------------------------------------- -void Box(int x0, int y0, int x1, int y1, bool clear) -{ - attrset(A_BOLD); - if (clear) - { - for (int y=y0; y charBind; +public: + Config (); + void bind (KeyType t, int toBind); + KeyType lookup (int boundChar); + void clear (); + void eraseKey (KeyType erase); +}; + +Config::Config () { + charBind[KEY_UP] = kUp; + charBind[KEY_DOWN] = kDown; + charBind[KEY_LEFT] = kLeft; + charBind[KEY_RIGHT] = kRight; + charBind['\t'] = kSwitchPlayer; + charBind['q'] = kQuitGame; + charBind['u'] = kUndo; + charBind[KEY_ENTER] = kButton; + charBind['\n'] = kButton; +} + +void +Config::bind (KeyType t, int toBind) { + charBind[toBind] = t; +} + +KeyType +Config::lookup (int boundChar) { + return charBind[boundChar]; +} + +void +Config::clear () { + charBind.clear (); +} + +void +Config::eraseKey (KeyType erase) { + for (std::map < int, KeyType >::iterator it = charBind.begin (); + it != charBind.end (); it++) { + if ((*it).second == erase) { + charBind.erase (it); + return; + } + } +} + //----------------------------------------------------------------------------- -class Screen -{ +class Screen { private: public: - virtual ~Screen(); - bool init(); - void printText(int x, int y, const std::string& text, Font f = fGame); - void render(); - void clear(); - KeyType getChar(); + virtual ~ Screen (); + bool init (); + void printText (int x, int y, const std::string & text, Font f = fGame); + void render (); + void clear (); + Config config; + KeyType getChar (); }; //----------------------------------------------------------------------------- -void Screen::clear() -{ - erase(); +void +Screen::clear () { + erase (); } + //----------------------------------------------------------------------------- -KeyType Screen::getChar() -{ - int ch = getch(); - switch (ch) - { - case KEY_DOWN: return kDown; - case KEY_UP: return kUp; - case KEY_LEFT: return kLeft; - case KEY_RIGHT: return kRight; - case '\t': return kSwitchPlayer; - case 'q': return kQuitGame; - case 'u': return kUndo; - case KEY_ENTER: - case '\n': - return kButton; - } - return kUnknown; +KeyType +Screen::getChar () { + int ch = getch (); + + return config.lookup (ch); } + //----------------------------------------------------------------------------- -bool Screen::init() -{ +bool +Screen::init () { // currently we have ncurses implementation, but it can be easily changed // just by creating instance of another class in main() - if (!initscr()) // init curses + if (!initscr ()) // init curses return false; - start_color(); - cbreak(); - keypad(stdscr, TRUE); - noecho(); - - init_pair(1, COLOR_YELLOW, COLOR_BLACK); - init_pair(2, COLOR_GREEN, COLOR_BLACK); - init_pair(3, COLOR_BLUE, COLOR_BLACK); - init_pair(4, COLOR_RED, COLOR_BLACK); + start_color (); + cbreak (); + keypad (stdscr, TRUE); + noecho (); + + init_pair (1, COLOR_YELLOW, COLOR_BLACK); + init_pair (2, COLOR_GREEN, COLOR_BLACK); + init_pair (3, COLOR_BLUE, COLOR_BLACK); + init_pair (4, COLOR_RED, COLOR_BLACK); return true; } + //----------------------------------------------------------------------------- -Screen::~Screen() -{ - endwin(); +Screen::~Screen () { + endwin (); } + //----------------------------------------------------------------------------- -void Screen::printText(int x, int y, const std::string& text, Font f) -{ - if (f == fMenu) // weight and such - { - attrset(A_NORMAL); +void +Screen::printText (int x, int y, const std::string & text, Font f) { + if (f == fMenu) { // weight and such + attrset (A_NORMAL); } - if (f == fGame) // color and such - { - attrset(A_BOLD); + if (f == fGame) { // color and such + attrset (A_BOLD); } - mvprintw(y, x, "%s", text.c_str()); + mvprintw (y, x, "%s", text.c_str ()); } + //----------------------------------------------------------------------------- -void Screen::render() -{ - mvprintw(1, 1, "-=[ nPush ]=- -=[ nPush ]=- http://npush.sourceforge.net/"); - move(1, 15); - refresh(); +void +Screen::render () { + mvprintw (1, 1, + "-=[ nPush ]=- -=[ nPush ]=- http://npush.sourceforge.net/"); + move (1, 15); + refresh (); } + //----------------------------------------------------------------------------- -class Menu -{ +class Menu { private: + typedef std::vector < std::string > ItemList; + Screen & screenM; + ItemList itemsM; std::string titleM; bool showBigLogoM; - typedef std::vector ItemList; - Screen &screenM; - ItemList itemsM; int currentItemM; - void drawBigLogo(); + void drawBigLogo (); public: - Menu(Screen& s, const std::string& title, bool showBigLogo = false); - void add(const std::string& item); - std::string getItemText(int index); - int count(); - int show(); + Menu (Screen & s, const std::string & title, bool showBigLogo = false); + void add (const std::string & item); + std::string getItemText (int index); + int count (); + int show (); }; //----------------------------------------------------------------------------- -class ControlsConfigurator -{ +class ControlsConfigurator { private: - Screen& screenM; + Screen & screenM; public: - ControlsConfigurator(Screen& scr); + ControlsConfigurator (Screen & scr); }; //----------------------------------------------------------------------------- -ControlsConfigurator::ControlsConfigurator(Screen& scr) - :screenM(scr) -{ +ControlsConfigurator::ControlsConfigurator (Screen & scr):screenM (scr) { // show menu with current controls and allow changing // TODO: needs config() class - clear(); + clear (); - int y = 3; - int x = 3; - mvprintw(y++, x, "Configure controls"); - mvprintw(y++, x, ""); - mvprintw(y++, x, "This option is not yet implemented. In the meantime use:"); - mvprintw(y++, x, ""); - mvprintw(y++, x, "arrow keys - movement"); - mvprintw(y++, x, " tab - switch player"); - mvprintw(y++, x, " u - undo last move (unlimited)"); - mvprintw(y++, x, " q - quit game"); + /*int y = 3; + int x = 3; + mvprintw(y++, x, "Configure controls"); + mvprintw(y++, x, ""); + mvprintw(y++, x, "This option is not yet implemented. In the meantime use:"); + mvprintw(y++, x, ""); + mvprintw(y++, x, "arrow keys - movement"); + mvprintw(y++, x, " tab - switch player"); + mvprintw(y++, x, " u - undo last move (unlimited)"); + mvprintw(y++, x, " q - quit game"); + */ + Menu + m (scr, "Configuring Controls", false); + m.add ("Move Left"); + m.add ("Move Right"); + m.add ("Move Up"); + m.add ("Move Down"); + m.add ("Switch Player"); + m.add ("Undo Last Move"); + m.add ("Quit Game"); + m.add ("Return to Main Menu"); + scr.render (); + while (true) { + int + result = m.show (); + int + ch; + switch (result) { + case 0: + ch = Prompt ("Press a key for Left"); + scr.config.eraseKey (kLeft); + scr.config.bind (kLeft, ch); + break; + case 1: + ch = Prompt ("Press a key for Right"); + scr.config.eraseKey (kRight); + scr.config.bind (kRight, ch); + break; + case 2: + ch = Prompt ("Press a key for Up"); + scr.config.eraseKey (kUp); + scr.config.bind (kUp, ch); + break; + case 3: + ch = Prompt ("Press a key for Down"); + scr.config.eraseKey (kDown); + scr.config.bind (kDown, ch); + break; + case 4: + ch = Prompt ("Press a key for switching the player"); + scr.config.eraseKey (kSwitchPlayer); + scr.config.bind (kSwitchPlayer, ch); + break; + case 5: + ch = Prompt ("Press a key for undoing moves"); + scr.config.eraseKey (kUndo); + scr.config.bind (kUndo, ch); + break; + case 6: + ch = Prompt ("Press a key for quiting the game"); + scr.config.eraseKey (kQuitGame); + scr.config.bind (kQuitGame, ch); + break; + case 7: + return; + } + } - scr.render(); - getch(); } + //----------------------------------------------------------------------------- -class LevelSelector -{ +class + LevelSelector { private: - Screen& screenM; + Screen & + screenM; public: - LevelSelector(Screen& scr); - void start(); + LevelSelector (Screen & scr); + void + start (); }; //----------------------------------------------------------------------------- -Menu::Menu(Screen& s, const std::string& title, bool showBigLogo) - :screenM(s), currentItemM(0), titleM(title), showBigLogoM(showBigLogo) +Menu::Menu (Screen & s, const std::string & title, bool showBigLogo): + screenM (s), + titleM (title), + showBigLogoM (showBigLogo), + currentItemM (0) { } + //----------------------------------------------------------------------------- -void Menu::add(const std::string& item) -{ - itemsM.push_back(item); +void +Menu::add (const std::string & item) { + itemsM.push_back (item); } + //----------------------------------------------------------------------------- -std::string Menu::getItemText(int index) -{ +std::string Menu::getItemText (int index) { return itemsM[index]; } + //----------------------------------------------------------------------------- -int Menu::count() -{ - return itemsM.size(); +int +Menu::count () { + return itemsM.size (); } + //----------------------------------------------------------------------------- -void Menu::drawBigLogo() -{ +void +Menu::drawBigLogo () { std::string msg[] = { - " .?????????????/ ", - " .. ????????????????????: ", - " .??????? ???????????????. ?????p ", - " .????????. _??????????????????? ????p ", - " )???????? j???????????????????????????? ", - " ?????? j??????????????????????????????, ", - " _?????????????????????????????????????????????. ", - " ???????????????????????????????????????????????? ", - " ???????? ??????????????????????????????????? ", - " j???? ??????????????????????????????????? ", - " j???? ???????????????????????????????????? ", - " ?????/ -??????????????????????????????????[ ", - " j?????????? ??????????????????????????????????' ", - " ??????? ??????? -????????????????????????????????? ", - " .?????? ????? -??????????????????????????????? ", - " j????' ???? ?????????????????????????????? ", - " ??????? ???' ?????????????????????????` ", - "???????` ?????p ?????????????????????? ", - "??????? ?????? ????????????????` ", - " -??????? " + " .00OOOOOOOOO'0o ", + " .. 000OOOOOOOO'88'OOO'0: ", + " .00OOO00 o0OOOOOOOOOOO':. %8OOOp ", + " .'OOOOOOO. _0OOOOOOOOOOOOOOO'Lu A8OOp ", + " )OOOOOOOY jOOOOOOOOOOOOOOOOOOO'''''08O0 ", + " 0'OO'% jOOOOOOOOOOOOOOOOOOOOOOOOOOO'O', ", + " _0OOO:00000000'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOO'. ", + " /'OOOOOOO'O'OO'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO7 ", + " /'OO%AAA 0OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " jOOOy pOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " jOO'y uOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", + " EOOO0/ -'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO[ ", + " j'OO'OOO00u pOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO' ", + " /'OO'%u %'OO'0u -'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOy ", + " .0OOO%u %OOO7 -8OOOOOOOOOOOOOOOOOOOOOOOOOOOOOy ", + " j'OO8' pOO7 u0'OOOOOOOOOOOOOOOOOOOOOOOOO'y ", + " o0'OO'% 'OO' 08OOOOOOOOOOOOOOOOOOOOO'8' ", + "EOOOOO8` pOOO'p uO%'OOOOOOOOOOOOOOOO'Y ", + "08OOO'y 8''88y A8'OOOOOOOOOO'8%` ", + " -UAA%8%% " }; - color_set(1, 0); - for (int i=0; i= itemsM.size()) + if (currentItemM >= (int)itemsM.size ()) currentItemM = 0; - } - else if (k == kButton) - { + } else if (k == kButton) { return currentItemM; } } return -1; } + //----------------------------------------------------------------------------- -class Game -{ +class Game { private: bool levelCompleteM; - Screen& screenM; + Screen & screenM; public: - Game(Screen& s, const std::string& levelName); - bool levelComplete(); + Game (Screen & s, const std::string & levelName); + bool levelComplete (); }; //----------------------------------------------------------------------------- -bool Game::levelComplete() -{ +bool +Game::levelComplete () { return levelCompleteM; } + //----------------------------------------------------------------------------- class Level; -class Player -{ +class Player { private: int xM; int yM; public: - Player(int x, int y); - void render(); - PlayerAction handleInput(KeyType key, Level& level); + Player (int x, int y); + void render (); + PlayerAction handleInput (KeyType key, Level & level); }; //----------------------------------------------------------------------------- -class Level -{ +class Level { private: int goldNeededM; - std::vector mapM; + std::vector < std::string > mapM; public: - Level(const std::string& name, std::vector& players); - void render(); - void moveField(int x, int y, int dx, int dy); - void setField(int x, int y, char f); - char getField(int x, int y); - int goldNeeded(); - void addGold(int count); + Level (const std::string & name, std::vector < Player > &players); + void render (); + void moveField (int x, int y, int dx, int dy); + void setField (int x, int y, char f); + char getField (int x, int y); + int goldNeeded (); + void addGold (int count); }; //----------------------------------------------------------------------------- -Player::Player(int x, int y) - :xM(x), yM(y) -{ +Player::Player (int x, int y): + xM (x), + yM (y) { } + //----------------------------------------------------------------------------- -void Player::render() -{ - attrset(A_BOLD); - color_set(3, 0); - mvprintw(yM+3, xM+3, "@"); - attrset(A_NORMAL); +void +Player::render () { + attrset (A_BOLD); + color_set (3, 0); + mvprintw (yM + 3, xM + 3, "@"); + attrset (A_NORMAL); } + //----------------------------------------------------------------------------- -PlayerAction Player::handleInput(KeyType key, Level& level) -{ +PlayerAction +Player::handleInput (KeyType key, Level & level) { int dx = 0, dy = 0; - switch (key) - { - case kUp: dy = -1; break; - case kDown: dy = 1; break; - case kLeft: dx = -1; break; - case kRight: dx = 1; break; - default: - return paNone; - } - switch (level.getField(xM + dx, yM + dy)) - { - case '$': level.addGold(-1); - case ' ': - level.moveField(xM, yM, dx, dy); + switch (key) { + case kUp: + dy = -1; + break; + case kDown: + dy = 1; + break; + case kLeft: + dx = -1; + break; + case kRight: + dx = 1; + break; + default: + return paNone; + } + switch (level.getField (xM + dx, yM + dy)) { + case '$': + level.addGold (-1); + case ' ': + level.moveField (xM, yM, dx, dy); + xM += dx; + yM += dy; + return paMoved; + case 'O': + // look beyond if we can push it + if (level.getField (xM + 2 * dx, yM + 2 * dy) == ' ') { + level.moveField (xM + dx, yM + dy, dx, dy); // move rock + level.moveField (xM, yM, dx, dy); // move player xM += dx; yM += dy; return paMoved; - case 'O': - // look beyond if we can push it - if (level.getField(xM + 2*dx, yM + 2*dy) == ' ') - { - level.moveField(xM+dx, yM+dy, dx, dy); // move rock - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - return paNone; - case 'h': - { - char c = level.getField(xM + 2*dx, yM + 2*dy); - if (c == 'O' || c == 'h') - { - level.setField(xM+2*dx, yM+2*dy, ' '); // explode - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - if (c == ' ') - { - level.moveField(xM+dx, yM+dy, dx, dy); // move dynamite - level.moveField(xM, yM, dx, dy); // move player - xM += dx; - yM += dy; - return paMoved; - } - return paNone; - } - case 'x': - if (level.goldNeeded() < 1) - return paLevelComplete; - return paNone; + } + return paNone; + case 'h': { + char c = level.getField (xM + 2 * dx, yM + 2 * dy); + if (c == 'O' || c == 'h') { + level.setField (xM + 2 * dx, yM + 2 * dy, ' '); // explode + level.moveField (xM, yM, dx, dy); // move player + xM += dx; + yM += dy; + return paMoved; + } + if (c == ' ') { + level.moveField (xM + dx, yM + dy, dx, dy); // move dynamite + level.moveField (xM, yM, dx, dy); // move player + xM += dx; + yM += dy; + return paMoved; + } + return paNone; + } + case 'x': + if (level.goldNeeded () < 1) + return paLevelComplete; + return paNone; } return paNone; } + //----------------------------------------------------------------------------- -void Level::setField(int x, int y, char f) -{ +void +Level::setField (int x, int y, char f) { mapM[y][x] = f; } + //----------------------------------------------------------------------------- -char Level::getField(int x, int y) -{ +char +Level::getField (int x, int y) { return mapM[y][x]; } + //----------------------------------------------------------------------------- -void Level::moveField(int x, int y, int dx, int dy) -{ - char field = getField(x, y); - setField(x, y, ' '); - setField(x+dx, y+dy, field); +void +Level::moveField (int x, int y, int dx, int dy) { + char field = getField (x, y); + setField (x, y, ' '); + setField (x + dx, y + dy, field); } + //----------------------------------------------------------------------------- -int Level::goldNeeded() -{ +int +Level::goldNeeded () { return goldNeededM; } + //----------------------------------------------------------------------------- -void Level::addGold(int count) -{ +void +Level::addGold (int count) { goldNeededM += count; if (goldNeededM < 0) goldNeededM = 0; } + //----------------------------------------------------------------------------- -Level::Level(const std::string& name, std::vector& players) -{ +Level::Level (const std::string & name, std::vector < Player > &players) { // load level from file, for each player found, create instance of Player - players.clear(); - mapM.clear(); + players.clear (); + mapM.clear (); goldNeededM = 0; - FILE *fp = fopen(name.c_str(), "rb"); - if (!fp) - { - Message("Cannot open level file!"); + std::string fileName = "/usr/share/npush/" + name; + FILE *fp = fopen (fileName.c_str (), "rb"); + if (!fp) { + Message ("Cannot open level file!"); return; } int y = 0; char buffer[80]; - while (!feof(fp)) - { - if (!fgets(buffer, 80, fp)) + while (!feof (fp)) { + if (!fgets (buffer, 80, fp)) break; - for (int x = 0; x < 80 && buffer[x] != '\n' && buffer[x] != '\0'; x++) - { + for (int x = 0; x < 80 && buffer[x] != '\n' && buffer[x] != '\0'; x++) { if (buffer[x] == ',') // comments, ignore rest of the line break; - if (buffer[x] == '@') - { - Player p(x, y); - players.push_back(p); + if (buffer[x] == '@') { + Player p (x, y); + players.push_back (p); } if (buffer[x] == '$') goldNeededM++; } - mapM.push_back(buffer); + mapM.push_back (buffer); y++; } } + //----------------------------------------------------------------------------- -void Level::render() -{ - clear(); +void +Level::render () { + clear (); int xpos = 3; int ypos = 3; - for (std::vector::iterator it = mapM.begin(); - it != mapM.end(); ++it, ypos++) - { + for (std::vector < std::string >::iterator it = mapM.begin (); + it != mapM.end (); ++it, ypos++) { // if (black&white) //mvprintw(ypos++, xpos, "%s", (*it).c_str()); - move(ypos, xpos); + move (ypos, xpos); bool comment = false; bool bold = false; - for (int i=0; i<(*it).length(); i++) - { + for (unsigned i = 0; i < (*it).length (); i++) { char c = (*it)[i]; - attrset(A_NORMAL); - if (!comment) - { - switch (c) - { - case ',': - c = ' '; - comment = true; - break; - case ';': - c = ' '; - comment = bold = true; - break; - case '#': color_set(1, 0); break; - case 'x': color_set(2, 0); break; - case '@': color_set(3, 0); break; - case 'h': color_set(4, 0); break; - case '$': - attrset(A_BOLD); - color_set(1, 0); - break; + attrset (A_NORMAL); + if (!comment) { + switch (c) { + case ',': + c = ' '; + comment = true; + break; + case ';': + c = ' '; + comment = bold = true; + break; + case '#': + color_set (1, 0); + break; + case 'x': + color_set (2, 0); + break; + case '@': + color_set (3, 0); + break; + case 'h': + color_set (4, 0); + break; + case '$': + attrset (A_BOLD); + color_set (1, 0); + break; }; - } - else if (bold) // bold comment - attrset(A_BOLD); - printw("%c", c); + } else if (bold) // bold comment + attrset (A_BOLD); + printw ("%c", c); } } } + //----------------------------------------------------------------------------- -class GameState -{ +class GameState { public: Level level; - std::vector players; - GameState(const Level& l, const std::vector& p) - :level(l), players(p) - { + std::vector < Player > players; + GameState (const Level & l, const std::vector < Player > &p):level (l), + players (p) { } }; //----------------------------------------------------------------------------- -Game::Game(Screen& s, const std::string& levelName) - :screenM(s), levelCompleteM(false) +Game::Game (Screen & s, const std::string & levelName): + levelCompleteM (false), + screenM (s) { - std::vector players; // there can be multiple on the screen + std::vector < Player > players; // there can be multiple on the screen // load levelName - Level level(levelName, players); - if (players.size() == 0) - { - Message("Bad level, no players found!"); + Level level (levelName, players); + if (players.size () == 0) { + Message ("Bad level, no players found!"); return; } - std::stack undo; - undo.push(GameState(level, players)); + std::stack < GameState > undo; + undo.push (GameState (level, players)); - std::vector::iterator currentPlayer = players.begin(); - while (true) - { - level.render(); - (*currentPlayer).render(); - s.render(); + std::vector < Player >::iterator currentPlayer = players.begin (); + while (true) { + level.render (); + (*currentPlayer).render (); + s.render (); // handle key press - KeyType key = s.getChar(); - switch (key) - { + KeyType key = s.getChar (); + switch (key) { // handle game-wide keys (like player switching) - case kSwitchPlayer: - if (++currentPlayer == players.end()) - currentPlayer = players.begin(); - break; + case kSwitchPlayer: + if (++currentPlayer == players.end ()) + currentPlayer = players.begin (); + break; - case kQuitGame: - return; + case kQuitGame: + return; - case kUndo: - if (undo.size() > 1) - { - undo.pop(); // remove current state - level = undo.top().level; - players = undo.top().players; - } - break; - default: // handle player movement keys - PlayerAction pa = (*currentPlayer).handleInput(key, level); - if (pa == paLevelComplete) - { - levelCompleteM = true; - Message("Well done. Level completed."); - return; - } - if (pa == paMoved) - { - // store undo buffer - undo.push(GameState(level, players)); - } + case kUndo: + if (undo.size () > 1) { + undo.pop (); // remove current state + level = undo.top ().level; + players = undo.top ().players; + } + break; + default: // handle player movement keys + PlayerAction pa = (*currentPlayer).handleInput (key, level); + if (pa == paLevelComplete) { + levelCompleteM = true; + Message ("Well done. Level completed."); + return; + } + if (pa == paMoved) { + // store undo buffer + undo.push (GameState (level, players)); + } }; } } + //----------------------------------------------------------------------------- -LevelSelector::LevelSelector(Screen& s) - :screenM(s) -{ - Menu m(s, "Select a level"); +LevelSelector::LevelSelector (Screen & s):screenM (s) { + Menu + m (s, "Select a level"); // TODO: load all levels from 'levels' directory and sort them alphabetical /* - m.add("Level 1 - Gold and Exit"); - m.add("Level 2 - Rocks"); - m.add("Level 3 - Dynamite"); - m.add("Level 4 - The Show Starts"); - */ - std::set files; - DIR *dir = opendir("."); - if (!dir) - { - Message("Cannot read levels from directory"); + m.add("Level 1 - Gold and Exit"); + m.add("Level 2 - Rocks"); + m.add("Level 3 - Dynamite"); + m.add("Level 4 - The Show Starts"); + */ + std::set < std::string > files; + DIR * + dir = opendir ("/usr/share/npush/"); + if (!dir) { + Message ("Cannot read levels from directory"); return; } - while (true) - { - struct dirent *de = readdir(dir); + while (true) { + struct dirent * + de = readdir (dir); if (!de) break; - std::string filename(de->d_name); - if (filename.find("Level") == 0) // starts with - files.insert(filename); - } - closedir(dir); - for (std::set::iterator it = files.begin(); it != files.end(); - ++it) - { - m.add(*it); + std::string filename (de->d_name); + if (filename.find ("Level") == 0) // starts with + files.insert (filename); + } + closedir (dir); + for (std::set < std::string >::iterator it = files.begin (); + it != files.end (); ++it) { + m.add (*it); } - m.add("Back to main menu"); - int result = m.show(); - if (result == -1 || result >= m.count() - 1) + m.add ("Back to main menu"); + int + result = m.show (); + if (result == -1 || result >= m.count () - 1) return; - while (true) - { - Game g(s, m.getItemText(result)); - if (g.levelComplete()) // level completed - { + while (true) { + Game + g (s, m.getItemText (result)); + if (g.levelComplete ()) { // level completed result++; - if (result < (m.count() - 1)) + if (result < (m.count () - 1)) continue; - Message("No more levels"); + Message ("No more levels"); return; - } - else // exited + } else // exited return; } } + //----------------------------------------------------------------------------- -int main() -{ - Screen s; - if (!s.init()) +int +main () { + Screen + s; + if (!s.init ()) return 1; - Menu m(s, "Welcome to nPush", true); - m.add("Start a new game"); - m.add("Configure controls"); - m.add("Quit"); - - while (true) - { - int result = m.show(); - if (result == 0) - { - LevelSelector ls(s); + Menu + m (s, "Welcome to nPush", true); + m.add ("Start a new game"); + m.add ("Configure controls"); + m.add ("Quit"); + + while (true) { + int + result = m.show (); + if (result == 0) { + LevelSelector + ls (s); continue; - } - else if (result == 1) - { - ControlsConfigurator cc(s); + } else if (result == 1) { + ControlsConfigurator + cc (s); continue; } break; } return 0; } + //----------------------------------------------------------------------------- --- NEW FILE npush.desktop --- [Desktop Entry] Encoding=UTF-8 Name=nPush Comment=A logic game similar to Sokoba Exec=npush Icon=npush Terminal=true Type=Application Categories=Game; --- NEW FILE npush.spec --- Name: npush Version: 0.6 Release: 1%{?dist} Summary: A logic game similar to Sokoba Group: Amusements/Games License: GPLv2+ URL: http://npush.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz # self made icon and .desktop file Source1: %{name}.desktop Source2: %{name}.png # patch npush.cpp to svn version to fix an issue with level selector Patch: npush-0.6-level-svn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel desktop-file-utils %description nPush is a logic game similar to Sokoban and Boulder Dash. You need to collect all the gold on the level and reach the exit. To make it hard there are some rocks that stand in your way, and you also have some dynamite to blast them away. Main difference from Sokoban, KSokoban and similar games is that you can have multiple player-controlled characters you can move on the screen. nPush is a terminal based application and uses nCurses library for user interface. %prep %setup -q %patch -p0 %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}%{_bindir} install -p -m 755 npush %{buildroot}%{_bindir}/npush mkdir -p %{buildroot}%{_datadir}/npush cp -ra Level* %{buildroot}%{_datadir}/npush # desktop file stuff desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 0644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc readme.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog * Mon Jul 07 2008 Stefan Posdzich - 0.6-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:59:33 -0000 1.1 +++ sources 9 Jul 2008 19:01:16 -0000 1.2 @@ -0,0 +1 @@ +6670aac74dd7db005462c11c5688db52 npush-0.6.tgz From fedora-extras-commits at redhat.com Wed Jul 9 19:14:51 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Wed, 9 Jul 2008 19:14:51 GMT Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.51,1.52 Message-ID: <200807091914.m69JEped002134@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2090 Modified Files: java-1.6.0-openjdk.spec Log Message: Fix typo Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- java-1.6.0-openjdk.spec 9 Jul 2008 17:24:01 -0000 1.51 +++ java-1.6.0-openjdk.spec 9 Jul 2008 19:14:07 -0000 1.52 @@ -910,7 +910,7 @@ %defattr(-,root,root,-) %doc README.src %{_jvmdir}/%{sdkdir}/src.zip -if %{runtests} +%if %{runtests} # FIXME: put these in a separate testresults subpackage. %doc mauve_tests %doc mauve-%{mauvedate}/mauve_output From fedora-extras-commits at redhat.com Wed Jul 9 19:20:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:20:52 GMT Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec, 1.41, 1.42 Message-ID: <200807091920.m69JKqD1002588@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-beanutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2487 Modified Files: jakarta-commons-beanutils.spec Log Message: fix repotag Index: jakarta-commons-beanutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- jakarta-commons-beanutils.spec 19 Feb 2008 03:11:07 -0000 1.41 +++ jakarta-commons-beanutils.spec 9 Jul 2008 19:20:01 -0000 1.42 @@ -39,10 +39,10 @@ Name: jakarta-commons-beanutils Version: 1.7.0 -Release: 6jpp.1 +Release: 6.2%{?dist} Epoch: 0 Summary: Jakarta Commons BeanUtils Package -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java Source0: http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.7.0-src.tar.gz Url: http://jakarta.apache.org/commons/%{base_name}/ @@ -83,7 +83,7 @@ %prep rm -rf $RPM_BUILD_ROOT -%setup -n %{short_name}-%{version}-src +%setup -q -n %{short_name}-%{version}-src #cp LICENSE.txt LICENSE # remove all binary libs find . -name "*.jar" -exec rm -f {} \; @@ -153,6 +153,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.7.0-6.2 +- drop repotag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.7.0-6jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:21:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 19:21:55 +0000 Subject: [pkgdb] emerald ownership updated Message-ID: <200807091921.m69JLtWE018415@bastion.fedora.phx.redhat.com> Package emerald in Fedora devel is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/emerald From fedora-extras-commits at redhat.com Wed Jul 9 19:22:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:22:03 GMT Subject: rpms/jakarta-commons-cli/devel jakarta-commons-cli.spec,1.7,1.8 Message-ID: <200807091922.m69JM3LT002750@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-cli/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2649 Modified Files: jakarta-commons-cli.spec Log Message: fix repotag Index: jakarta-commons-cli.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-cli/devel/jakarta-commons-cli.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jakarta-commons-cli.spec 19 Feb 2008 04:09:43 -0000 1.7 +++ jakarta-commons-cli.spec 9 Jul 2008 19:21:10 -0000 1.8 @@ -5,10 +5,10 @@ Name: %{name} Version: 1.0 -Release: 7jpp_10%{?dist} +Release: 7.11%{?dist} Epoch: 0 Summary: Command Line Interface Library for Java -License: Apache Software License +License: ASL 1.1 Group: Development/Libraries URL: http://jakarta.apache.org/commons/cli/ Source: http://archive.apache.org/dist/jakarta/commons/cli/source/cli-1.0-src.tar.gz @@ -87,6 +87,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-7.11 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.0-7jpp_10 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:22:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 19:22:08 +0000 Subject: [pkgdb] emerald ownership updated Message-ID: <200807091922.m69JM9q9018454@bastion.fedora.phx.redhat.com> Package emerald in Fedora 9 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/emerald From fedora-extras-commits at redhat.com Wed Jul 9 19:23:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:23:05 GMT Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.19, 1.20 Message-ID: <200807091923.m69JN55d002856@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-codec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2811 Modified Files: jakarta-commons-codec.spec Log Message: fix repotag Index: jakarta-commons-codec.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jakarta-commons-codec.spec 19 Feb 2008 15:28:05 -0000 1.19 +++ jakarta-commons-codec.spec 9 Jul 2008 19:22:18 -0000 1.20 @@ -38,9 +38,9 @@ Name: jakarta-commons-codec Version: 1.3 -Release: 9jpp.2%{?dist} +Release: 9.3%{?dist} Summary: Implementations of common encoders and decoders -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java Epoch: 0 URL: http://jakarta.apache.org/commons/codec/ @@ -178,6 +178,10 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3-9.3 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.3-9jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:23:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 19:23:24 +0000 Subject: [pkgdb] emerald-themes ownership updated Message-ID: <200807091923.m69JNO4s018550@bastion.fedora.phx.redhat.com> Package emerald-themes in Fedora devel is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes From fedora-extras-commits at redhat.com Wed Jul 9 19:23:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 19:23:34 +0000 Subject: [pkgdb] emerald-themes ownership updated Message-ID: <200807091923.m69JNY8T018575@bastion.fedora.phx.redhat.com> Package emerald-themes in Fedora 9 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes From fedora-extras-commits at redhat.com Wed Jul 9 19:24:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:24:19 GMT Subject: rpms/jakarta-commons-collections/devel jakarta-commons-collections.spec, 1.52, 1.53 Message-ID: <200807091924.m69JOJPr002998@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-collections/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2917 Modified Files: jakarta-commons-collections.spec Log Message: fix repotag Index: jakarta-commons-collections.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- jakarta-commons-collections.spec 3 Mar 2008 07:02:56 -0000 1.52 +++ jakarta-commons-collections.spec 9 Jul 2008 19:23:23 -0000 1.53 @@ -44,7 +44,7 @@ Name: jakarta-%{short_name} Version: 3.2 -Release: 2jpp.2%{?dist} +Release: 2.3%{?dist} Epoch: 0 Summary: Provides new interfaces, implementations and utilities for Java Collections License: ASL 2.0 @@ -375,6 +375,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:3.2-2.3 +- drop repotag + * Sun Mar 2 2008 Devrim GUNDUZ - 0:3.2-2jpp.2 - Add missing sources, per #434059 From fedora-extras-commits at redhat.com Wed Jul 9 19:25:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:25:21 GMT Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.20, 1.21 Message-ID: <200807091925.m69JPLFA003152@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3058 Modified Files: jakarta-commons-daemon.spec Log Message: fix repotag Index: jakarta-commons-daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jakarta-commons-daemon.spec 8 Feb 2008 16:24:10 -0000 1.20 +++ jakarta-commons-daemon.spec 9 Jul 2008 19:24:37 -0000 1.21 @@ -39,7 +39,7 @@ Name: jakarta-%{short_name} Version: 1.0.1 -Release: 6jpp.5%{?dist} +Release: 6.6%{?dist} Epoch: 1 Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 @@ -189,6 +189,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:1.0.1-6.6 +- drop repotag + * Fri Feb 08 2008 Permaine Cheung - 1:1.0.1-6jpp.5 - Add configure patch for ia64 from Doug Chapman From fedora-extras-commits at redhat.com Wed Jul 9 19:26:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:26:41 GMT Subject: rpms/jakarta-commons-digester/devel commons-digester-1.7-component-info.xml, 1.1, 1.2 jakarta-commons-digester.spec, 1.38, 1.39 Message-ID: <200807091926.m69JQfQS003359@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-digester/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3292 Modified Files: commons-digester-1.7-component-info.xml jakarta-commons-digester.spec Log Message: fix repotag Index: commons-digester-1.7-component-info.xml =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/commons-digester-1.7-component-info.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- commons-digester-1.7-component-info.xml 23 Jan 2007 02:34:44 -0000 1.1 +++ commons-digester-1.7-component-info.xml 9 Jul 2008 19:25:54 -0000 1.2 @@ -5,7 +5,7 @@ projectHome="http://jakarta.apache.org/commons/digester/" description="XML to Java object mapping module" scm=":ext:cvs.devel.redhat.com:/cvs/dist/jakarta-commons-digester" - tag="@TAG@"> + tag="jakarta-commons-digester-1_7-7jpp_2"> Index: jakarta-commons-digester.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- jakarta-commons-digester.spec 19 Feb 2008 15:28:56 -0000 1.38 +++ jakarta-commons-digester.spec 9 Jul 2008 19:25:54 -0000 1.39 @@ -48,10 +48,10 @@ Name: jakarta-%{short_name} Version: 1.7 -Release: 7jpp.2 +Release: 7.3%{?dist} Epoch: 0 Summary: Jakarta Commons Digester Package -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java Source0: http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz Source1: commons-digester-1.7-component-info.xml @@ -94,8 +94,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -200,6 +201,10 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.7-7.3 +- fix license tag +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.7-7jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:27:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:27:54 GMT Subject: rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec, 1.13, 1.14 Message-ID: <200807091927.m69JRskY003483@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-discovery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3439 Modified Files: jakarta-commons-discovery.spec Log Message: fix repotag Index: jakarta-commons-discovery.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jakarta-commons-discovery.spec 19 Feb 2008 15:29:51 -0000 1.13 +++ jakarta-commons-discovery.spec 9 Jul 2008 19:27:03 -0000 1.14 @@ -38,10 +38,10 @@ Summary: Jakarta Commons Discovery Name: jakarta-commons-discovery Version: 0.4 -Release: 3jpp.1%{?dist} +Release: 3.2%{?dist} Epoch: 1 Group: Development/Libraries/Java -License: Apache Software License +License: ASL 2.0 URL: http://jakarta.apache.org/commons/discovery/ %if ! %{gcj_support} BuildArch: noarch @@ -74,8 +74,9 @@ %package javadoc Group: Development/Documentation Summary: Javadoc for %{name} -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -155,6 +156,10 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:0.4-3.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1:0.4-3jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:28:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:28:56 GMT Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.39,1.40 Message-ID: <200807091928.m69JSubH003598@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3553 Modified Files: jakarta-commons-el.spec Log Message: fix repotag Index: jakarta-commons-el.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- jakarta-commons-el.spec 19 Feb 2008 03:12:12 -0000 1.39 +++ jakarta-commons-el.spec 9 Jul 2008 19:28:11 -0000 1.40 @@ -39,10 +39,10 @@ Name: jakarta-commons-el Version: 1.0 -Release: 9jpp.2%{?dist} +Release: 9.3%{?dist} Epoch: 0 Summary: The Jakarta Commons Extension Language -License: Apache Software License +License: ASL 1.1 Group: Development/Libraries/Java URL: http://jakarta.apache.org/commons/el/ Source0: http://archive.apache.org/dist/jakarta/commons/el/source/commons-el-%{version}-src.tar.gz @@ -74,8 +74,9 @@ Summary: Javadoc for %{name} Group: Development/Documentation BuildRequires: java-javadoc -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %if %{gcj_support} BuildRequires: java-gcj-compat-devel Requires(post): java-gcj-compat @@ -178,6 +179,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-9.3 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.0-9jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:30:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:30:01 GMT Subject: rpms/jakarta-commons-fileupload/devel jakarta-commons-fileupload.spec, 1.24, 1.25 Message-ID: <200807091930.m69JU1O8003702@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-fileupload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3663 Modified Files: jakarta-commons-fileupload.spec Log Message: fix repotag Index: jakarta-commons-fileupload.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- jakarta-commons-fileupload.spec 19 Feb 2008 17:48:51 -0000 1.24 +++ jakarta-commons-fileupload.spec 9 Jul 2008 19:29:16 -0000 1.25 @@ -37,9 +37,9 @@ Name: jakarta-%{short_name} Version: 1.0 -Release: 7jpp.2%{?dist} +Release: 7.3%{?dist} Summary: This package provides an api to work with html file upload -License: Apache Software License +License: ASL 1.1 Group: Development/Libraries/Java Epoch: 1 Source0: commons-fileupload-1.0-src.tar.gz @@ -164,6 +164,10 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:1.0-7.3 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1:1.0-7jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:31:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:31:09 GMT Subject: rpms/jakarta-commons-httpclient/devel jakarta-commons-httpclient.spec, 1.21, 1.22 Message-ID: <200807091931.m69JV9Co003827@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-httpclient/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3775 Modified Files: jakarta-commons-httpclient.spec Log Message: fix repotag Index: jakarta-commons-httpclient.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jakarta-commons-httpclient.spec 4 Apr 2008 18:41:56 -0000 1.21 +++ jakarta-commons-httpclient.spec 9 Jul 2008 19:30:17 -0000 1.22 @@ -36,10 +36,10 @@ Name: jakarta-commons-httpclient Version: 3.1 -Release: 0jpp.1%{?dist} +Release: 0.2%{?dist} Epoch: 1 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards -License: Apache Software License +License: ASL 2.0 Source0: http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz Patch0: %{name}-disablecryptotests.patch # Add OSGi MANIFEST.MF bits @@ -96,8 +96,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc %{summary}. @@ -232,6 +233,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:3.1-0.2 +- drop repotag +- fix license tag + * Fri Apr 04 2008 Deepak Bhole - 0:3.1-0jpp.1 - Update to 3.1 From fedora-extras-commits at redhat.com Wed Jul 9 19:32:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:32:15 GMT Subject: rpms/jakarta-commons-io/devel jakarta-commons-io.spec,1.2,1.3 Message-ID: <200807091932.m69JWFsg003928@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-io/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886 Modified Files: jakarta-commons-io.spec Log Message: fix repotag Index: jakarta-commons-io.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/jakarta-commons-io.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jakarta-commons-io.spec 22 Jan 2008 19:01:26 -0000 1.2 +++ jakarta-commons-io.spec 9 Jul 2008 19:31:25 -0000 1.3 @@ -40,12 +40,12 @@ Name: jakarta-commons-io Version: 1.3.2 -Release: 1jpp.1%{?dist} +Release: 1.2%{?dist} Epoch: 0 Summary: Utilities to assist with developing IO functionality Group: Development/Libraries/Java -License: Apache Software License +License: ASL 2.0 URL: http://jakarta.apache.org/commons/io/ Source0: http://archive.apache.org/dist/commons/io/source/commons-io-1.3.2-src.tar.gz Source1: %{name}-settings.xml @@ -206,6 +206,10 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3.2-1.2 +- drop repotag +- fix license tag + * Tue Jan 22 2008 Permaine Cheung - 0:1.3.2-1jpp.1 - Merge with upstream From fedora-extras-commits at redhat.com Wed Jul 9 19:33:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:33:19 GMT Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.25, 1.26 Message-ID: <200807091933.m69JXJBj004037@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-lang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3993 Modified Files: jakarta-commons-lang.spec Log Message: fix repotag Index: jakarta-commons-lang.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- jakarta-commons-lang.spec 19 Feb 2008 17:50:47 -0000 1.25 +++ jakarta-commons-lang.spec 9 Jul 2008 19:32:31 -0000 1.26 @@ -40,10 +40,10 @@ Name: jakarta-%{short_name} Version: 2.3 -Release: 2jpp.1%{?dist} +Release: 2.2%{?dist} Epoch: 0 Summary: Provides a host of helper utilities for the java.lang API -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java URL: http://commons.apache.org/lang/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz @@ -251,6 +251,10 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.3-2.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:2.3-2jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:34:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:34:21 GMT Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec, 1.19, 1.20 Message-ID: <200807091934.m69JYLgE004149@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-launcher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104 Modified Files: jakarta-commons-launcher.spec Log Message: fix repotag Index: jakarta-commons-launcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jakarta-commons-launcher.spec 19 Feb 2008 15:30:53 -0000 1.19 +++ jakarta-commons-launcher.spec 9 Jul 2008 19:33:37 -0000 1.20 @@ -37,10 +37,10 @@ Name: jakarta-%{short_name} Version: 1.1 -Release: 2jpp.3%{?dist} +Release: 2.4%{?dist} Epoch: 0 Summary: A cross platform Java application launcher -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java URL: http://jakarta.apache.org/commons/launcher/ Source: http://archive.apache.org/dist/jakarta/commons/launcher/source/%{short_name}-%{version}-src.tar.gz @@ -91,8 +91,9 @@ Summary: Javadoc for %{name} Group: Development/Documentation BuildRequires: java-javadoc -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -179,6 +180,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1-2.4 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.1-2jpp.3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:35:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:35:32 GMT Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec, 1.42, 1.43 Message-ID: <200807091935.m69JZWP6004298@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-logging/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4222 Modified Files: jakarta-commons-logging.spec Log Message: fix repotag Index: jakarta-commons-logging.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- jakarta-commons-logging.spec 29 May 2008 14:16:54 -0000 1.42 +++ jakarta-commons-logging.spec 9 Jul 2008 19:34:40 -0000 1.43 @@ -38,7 +38,7 @@ Name: jakarta-%{short_name} Version: 1.0.4 -Release: 7jpp.6%{?dist} +Release: 7.7%{?dist} Epoch: 0 Summary: Jakarta Commons Logging Package License: ASL 2.0 @@ -79,8 +79,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -184,6 +185,9 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0.4-7.7 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.0.4-7jpp.6 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 19:36:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:36:40 GMT Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec, 1.38, 1.39 Message-ID: <200807091936.m69Jaekw004436@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-modeler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4363 Modified Files: jakarta-commons-modeler.spec Log Message: fix repotag Index: jakarta-commons-modeler.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- jakarta-commons-modeler.spec 19 Feb 2008 15:31:43 -0000 1.38 +++ jakarta-commons-modeler.spec 9 Jul 2008 19:35:50 -0000 1.39 @@ -38,10 +38,10 @@ Name: jakarta-%{short_name} Epoch: 0 Version: 2.0 -Release: 4jpp.2%{?dist} +Release: 4.3%{?dist} Summary: Model MBeans utilty classes Group: Development/Libraries/Java -License: Apache Software License +License: ASL 2.0 Url: http://jakarta.apache.org/commons/%{base_name} Source0: http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/modeler/source/commons-modeler-2.0-src.tar.gz Patch0: %{name}.build.properties.default.patch @@ -178,6 +178,10 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.0-4.3 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:2.0-4jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:37:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:37:44 GMT Subject: rpms/jakarta-commons-net/devel jakarta-commons-net.spec,1.5,1.6 Message-ID: <200807091937.m69JbiwF004565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-net/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4525 Modified Files: jakarta-commons-net.spec Log Message: fix repotag Index: jakarta-commons-net.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jakarta-commons-net.spec 23 Jan 2008 17:48:32 -0000 1.5 +++ jakarta-commons-net.spec 9 Jul 2008 19:36:57 -0000 1.6 @@ -43,10 +43,10 @@ Name: jakarta-commons-net Version: 1.4.1 -Release: 4jpp.1%{?dist} +Release: 4.2%{?dist} Epoch: 0 Summary: Internet protocol suite Java library -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java Url: http://jakarta.apache.org/commons/%{base_name}/ Source0: http://www.apache.org/dist/jakarta/commons/net/source/commons-net-1.4.1-src.tar.gz @@ -278,6 +278,10 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.4.1-4.2 +- drop repotag +- fix license tag + * Tue Jan 22 2008 Permaine Cheung - 0:1.4.1-4jpp.1 - Merge with upstream From fedora-extras-commits at redhat.com Wed Jul 9 19:38:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:38:51 GMT Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.23, 1.24 Message-ID: <200807091938.m69JcpPi004692@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-pool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4635 Modified Files: jakarta-commons-pool.spec Log Message: fix repotag Index: jakarta-commons-pool.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jakarta-commons-pool.spec 29 May 2008 14:18:02 -0000 1.23 +++ jakarta-commons-pool.spec 9 Jul 2008 19:37:59 -0000 1.24 @@ -45,7 +45,7 @@ Name: jakarta-commons-pool Version: 1.3 -Release: 10jpp.4%{?dist} +Release: 10.5%{?dist} Epoch: 0 Summary: Jakarta Commons Pool Package License: ASL 2.0 @@ -269,6 +269,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3-10.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.3-10jpp.4 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 19:38:54 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Wed, 9 Jul 2008 19:38:54 GMT Subject: rpms/ustr/devel c99-inline.patch,NONE,1.1 ustr.spec,1.20,1.21 Message-ID: <200807091938.m69JcsSh004700@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627 Modified Files: ustr.spec Added Files: c99-inline.patch Log Message: * Fri Jun 13 2008 James Antill - 1.0.4-7 - Fix c99 inline problems, newer GCC c99-inline.patch: --- NEW FILE c99-inline.patch --- diff -rup ustr-1.0.4-orig/ustr-compiler.h ustr-1.0.4/ustr-compiler.h --- ustr-1.0.4-orig/ustr-compiler.h 2008-02-15 15:12:28.000000000 -0500 +++ ustr-1.0.4/ustr-compiler.h 2008-06-13 15:25:18.000000000 -0400 @@ -113,17 +113,23 @@ #endif #ifndef USTR_CONF_EI_PROTO /* external inline */ -# if USTR_CONF_INCLUDE_CODEONLY_HEADERS +# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ + ! USTR_CONF_COMPILE_USE_INLINE # define USTR_CONF_EI_PROTO static USTR__INLINE # else # define USTR_CONF_EI_PROTO extern # endif #endif #ifndef USTR_CONF_II_PROTO /* implementation of inline */ -# if USTR_CONF_INCLUDE_CODEONLY_HEADERS +# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ + ! USTR_CONF_COMPILE_USE_INLINE # define USTR_CONF_II_PROTO static USTR__INLINE # else -# define USTR_CONF_II_PROTO extern inline +# if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__) +# define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__)) +# else +# define USTR_CONF_II_PROTO extern inline +# endif # endif #endif Index: ustr.spec =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ustr.spec 10 Mar 2008 02:31:50 -0000 1.20 +++ ustr.spec 9 Jul 2008 19:37:55 -0000 1.21 @@ -27,13 +27,13 @@ Name: ustr Version: 1.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: String library, very low memory overhead, simple to import Group: System Environment/Libraries License: MIT or LGPLv2+ or BSD URL: http://www.and.org/ustr/ Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz -# Patch0: multilib-ustr-import.patch +Patch0: c99-inline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: make gcc sed @@ -86,7 +86,7 @@ %prep %setup -q -#patch0 -p1 +%patch0 -p1 %build make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} @@ -151,6 +151,9 @@ %changelog +* Fri Jun 13 2008 James Antill - 1.0.4-7 +- Fix c99 inline problems, newer GCC + * Sun Mar 9 2008 James Antill - 1.0.4-6 - Fix dir. ownership bug. - Resolves: rhbz#436711 From fedora-extras-commits at redhat.com Wed Jul 9 19:40:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:40:01 GMT Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec, 1.18, 1.19 Message-ID: <200807091940.m69Je1he004847@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-validator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4748 Modified Files: jakarta-commons-validator.spec Log Message: fix repotag Index: jakarta-commons-validator.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- jakarta-commons-validator.spec 29 May 2008 14:19:18 -0000 1.18 +++ jakarta-commons-validator.spec 9 Jul 2008 19:39:08 -0000 1.19 @@ -41,7 +41,7 @@ Summary: Jakarta Commons Validator Name: jakarta-%{short_name} Version: 1.1.4 -Release: 6jpp.3%{?dist} +Release: 6.4%{?dist} Epoch: 0 License: ASL 2.0 Group: Development/Libraries/Java @@ -93,8 +93,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -213,6 +214,9 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1.4-6.4 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.1.4-6jpp.3 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 19:41:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:41:04 GMT Subject: rpms/jakarta-oro/devel jakarta-oro.spec,1.4,1.5 Message-ID: <200807091941.m69Jf4Z2004968@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-oro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4911 Modified Files: jakarta-oro.spec Log Message: fix repotag Index: jakarta-oro.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-oro/devel/jakarta-oro.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jakarta-oro.spec 19 Feb 2008 03:13:13 -0000 1.4 +++ jakarta-oro.spec 9 Jul 2008 19:40:16 -0000 1.5 @@ -38,10 +38,10 @@ Name: jakarta-oro Version: 2.0.8 -Release: 4jpp.1 +Release: 4.2%{?dist} Epoch: 0 Summary: Full regular expressions API -License: Apache License +License: ASL 1.1 Group: Development/Java Source0: %{name}-%{version}.tar.gz URL: http://jakarta.apache.org/oro @@ -78,8 +78,9 @@ Provides: oro-javadoc = %{epoch}:%{version}-%{release} Obsoletes: oro-javadoc <= 0:2.0.8 #BuildRequires: java-javadoc -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -157,6 +158,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.0.8-4.2 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:2.0.8-4jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:42:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:42:07 GMT Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec, 1.23, 1.24 Message-ID: <200807091942.m69Jg7CW005181@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-taglibs-standard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5042 Modified Files: jakarta-taglibs-standard.spec Log Message: fix repotag Index: jakarta-taglibs-standard.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jakarta-taglibs-standard.spec 19 Feb 2008 15:32:37 -0000 1.23 +++ jakarta-taglibs-standard.spec 9 Jul 2008 19:41:21 -0000 1.24 @@ -37,10 +37,10 @@ Name: jakarta-taglibs-standard Version: 1.1.1 -Release: 9jpp.1%{?dist} +Release: 9.2%{?dist} Epoch: 0 Summary: An open-source implementation of the JSP Standard Tag Library -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java URL: http://jakarta.apache.org/taglibs/ Source: http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-1.1.1-src.tar.gz @@ -155,6 +155,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1.1-9.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.1.1-9jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 19:56:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:56:59 GMT Subject: rpms/javacc/devel javacc.spec,1.22,1.23 Message-ID: <200807091956.m69Juxwo005703@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/javacc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5654 Modified Files: javacc.spec Log Message: fix repotag Index: javacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/javacc/devel/javacc.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- javacc.spec 22 Feb 2008 23:54:52 -0000 1.22 +++ javacc.spec 9 Jul 2008 19:56:03 -0000 1.23 @@ -36,7 +36,7 @@ Name: javacc Version: 4.0 -Release: 4jpp.4 +Release: 4.5%{?dist} Epoch: 0 Summary: A parser/scanner generator for java License: BSD @@ -146,6 +146,9 @@ %{_datadir}/%{name}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:4.0-4.5 +- drop repotag + * Fri Feb 22 2008 Matt Wringe - 0:4.0-4jpp.4 - Rename javacc script file to javacc.sh as this confuses the makefile From fedora-extras-commits at redhat.com Wed Jul 9 19:58:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:58:01 GMT Subject: rpms/java_cup/devel java_cup.spec,1.22,1.23 Message-ID: <200807091958.m69Jw1HM005806@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/java_cup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5763 Modified Files: java_cup.spec Log Message: fix repotag Index: java_cup.spec =================================================================== RCS file: /cvs/pkgs/rpms/java_cup/devel/java_cup.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- java_cup.spec 17 Feb 2008 21:33:16 -0000 1.22 +++ java_cup.spec 9 Jul 2008 19:57:16 -0000 1.23 @@ -37,7 +37,7 @@ Name: java_cup Version: 0.10 -Release: 0.k.6jpp.2 +Release: 0.k.6.3 Epoch: 1 Summary: Java source interpreter License: BSD and LGPLv2 @@ -65,9 +65,9 @@ %package javadoc Summary: Javadoc for java_cup Group: Documentation -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# For /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for java_cup @@ -160,6 +160,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:0.10-0.k.6.3 +- drop repotag + * Sun Feb 17 2008 Lubomir Kundrak - 1:0.10-0.k.6jpp.2 - Ant task - Clean up to satisfy QA script and rpmlint From fedora-extras-commits at redhat.com Wed Jul 9 19:59:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 19:59:03 GMT Subject: rpms/jaxen/devel jaxen.spec,1.2,1.3 Message-ID: <200807091959.m69Jx3Sw005943@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jaxen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5864 Modified Files: jaxen.spec Log Message: fix repotag Index: jaxen.spec =================================================================== RCS file: /cvs/pkgs/rpms/jaxen/devel/jaxen.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jaxen.spec 26 Mar 2007 19:11:19 -0000 1.2 +++ jaxen.spec 9 Jul 2008 19:58:18 -0000 1.3 @@ -44,7 +44,7 @@ Name: jaxen Version: 1.1 -Release: 1jpp.2%{?dist} +Release: 1.3%{?dist} Epoch: 0 Summary: An XPath engine written in Java License: BSD @@ -230,6 +230,9 @@ %{_datadir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1-1.3 +- drop repotag + * Tue Feb 20 2007 Vivek Lakshmanan 0:1.1-1jpp.2.fc7 - Add build-requires on ant-junit From fedora-extras-commits at redhat.com Wed Jul 9 20:00:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:00:18 GMT Subject: rpms/jaxen-bootstrap/devel jaxen-bootstrap.spec,1.1,1.2 Message-ID: <200807092000.m69K0Iio006062@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jaxen-bootstrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6002 Modified Files: jaxen-bootstrap.spec Log Message: fix repotag Index: jaxen-bootstrap.spec =================================================================== RCS file: /cvs/pkgs/rpms/jaxen-bootstrap/devel/jaxen-bootstrap.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jaxen-bootstrap.spec 20 Mar 2007 01:22:59 -0000 1.1 +++ jaxen-bootstrap.spec 9 Jul 2008 19:59:18 -0000 1.2 @@ -29,14 +29,11 @@ # %define real jaxen -%define name %{real}-bootstrap %define dom4jver 1.6.1 -%define version 1.1 -%define release 1jpp.1%{?dist} -Name: %{name} -Version: %{version} -Release: %{release} +Name: %{real}-bootstrap +Version: 1.1 +Release: 1.2%{?dist} Epoch: 0 Summary: A convenience package for build of dom4j License: BSD @@ -126,6 +123,9 @@ %{_javadir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1-1.2 +- drop repotag + * Wed Feb 14 2007 Andrew Overholt 0:1.1-1jpp.1 - Bump to 1.1 final - Make release Xjpp.Y%{?dist} From fedora-extras-commits at redhat.com Wed Jul 9 20:01:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:01:22 GMT Subject: rpms/jdepend/devel jdepend.spec,1.21,1.22 Message-ID: <200807092001.m69K1MJh012696@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jdepend/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6124 Modified Files: jdepend.spec Log Message: fix repotag Index: jdepend.spec =================================================================== RCS file: /cvs/pkgs/rpms/jdepend/devel/jdepend.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jdepend.spec 19 Feb 2008 15:34:25 -0000 1.21 +++ jdepend.spec 9 Jul 2008 20:00:33 -0000 1.22 @@ -36,10 +36,10 @@ Name: jdepend Version: 2.6 -Release: 7jpp.3 +Release: 7.4%{?dist} Epoch: 0 Summary: Java Design Quality Metrics -License: Clarkware License +License: BSD Url: http://www.clarkware.com/ Group: Development/Libraries/Java Source0: %{url}software/%{name}-%{version}-RHCLEAN.zip @@ -65,9 +65,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -157,6 +157,10 @@ %{_datadir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.6-7.4 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:2.6-7jpp.3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 20:02:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:02:24 GMT Subject: rpms/jdom/devel jdom.spec,1.20,1.21 Message-ID: <200807092002.m69K2OsF012816@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jdom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12760 Modified Files: jdom.spec Log Message: fix repotag Index: jdom.spec =================================================================== RCS file: /cvs/pkgs/rpms/jdom/devel/jdom.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jdom.spec 29 May 2008 14:20:23 -0000 1.20 +++ jdom.spec 9 Jul 2008 20:01:39 -0000 1.21 @@ -36,7 +36,7 @@ Name: jdom Version: 1.0 -Release: 5jpp.3%{?dist} +Release: 5.4%{?dist} Epoch: 0 Summary: Java alternative to DOM and SAX License: BSD @@ -72,8 +72,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -172,6 +173,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-5.4 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.0-5jpp.3 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:03:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:03:27 GMT Subject: rpms/jetty/devel jetty.spec,1.4,1.5 Message-ID: <200807092003.m69K3RRK012970@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jetty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12882 Modified Files: jetty.spec Log Message: fix repotag Index: jetty.spec =================================================================== RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jetty.spec 4 Jul 2008 17:02:53 -0000 1.4 +++ jetty.spec 9 Jul 2008 20:02:40 -0000 1.5 @@ -54,7 +54,7 @@ Name: jetty Version: 5.1.14 -Release: 1jpp.2%{?dist} +Release: 1.3%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet @@ -130,7 +130,7 @@ BuildRequires: xapool %endif # -Requires: /sbin/chkconfig +Requires: chkconfig Requires: jpackage-utils >= 0:1.6 Requires: ant >= 0:1.6 Requires: jakarta-commons-el @@ -599,6 +599,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 5.1.14-1.3 +- drop repotag + * Fri Jul 04 2008 Jeff Johnston 5.1.14-1jpp.2 - Security patch - Resolves #417401, #417411, #417391 From fedora-extras-commits at redhat.com Wed Jul 9 20:04:09 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 9 Jul 2008 20:04:09 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.85-kde#164786.patch, NONE, 1.1 kdebase-workspace.spec, 1.93, 1.94 Message-ID: <200807092004.m69K49bb013107@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12959 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.85-kde#164786.patch Log Message: * Wed Jul 09 2008 Rex Dieter 4.0.85-2 - systray icon patch (kde#164786) kdebase-workspace-4.0.85-kde#164786.patch: --- NEW FILE kdebase-workspace-4.0.85-kde#164786.patch --- Index: systemtraycontainer.cpp =================================================================== --- systemtraycontainer.cpp (revision 829753) +++ systemtraycontainer.cpp (working copy) @@ -67,6 +67,15 @@ } } +bool SystemTrayContainer::x11Event(XEvent *event) +{ + bool ok = QX11EmbedContainer::x11Event(event); + if (event->type == ReparentNotify) { + setMinimumSize(22,22); + } + return ok; +} + void SystemTrayContainer::updateBackground() { // Qt's regular quasi-transparent background doesn't work so set it to the Index: systemtraycontainer.h =================================================================== --- systemtraycontainer.h (revision 829753) +++ systemtraycontainer.h (working copy) @@ -33,6 +33,9 @@ explicit SystemTrayContainer(QWidget *parent); void embedSystemTrayClient( WId clientId ); +protected: + bool x11Event(XEvent *event); + private: bool prepareFor( WId id ); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- kdebase-workspace.spec 7 Jul 2008 12:48:07 -0000 1.93 +++ kdebase-workspace.spec 9 Jul 2008 20:03:24 -0000 1.94 @@ -2,7 +2,7 @@ Name: kdebase-workspace Version: 4.0.85 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -36,6 +36,8 @@ Patch203: kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151 +# (gtk) systray icons +Patch205: kdebase-workspace-4.0.85-kde#164786.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -152,6 +154,9 @@ # no longer needed (?) #patch201 -p1 -b .kde#154119 %patch204 -p1 -b .kickoff-suspend +pushd plasma/applets/systemtray/ +%patch205 -p0 -b .kde#164786 +popd %build @@ -284,6 +289,9 @@ %changelog +* Wed Jul 09 2008 Rex Dieter 4.0.85-2 +- systray icon patch (kde#164786) + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 From fedora-extras-commits at redhat.com Wed Jul 9 20:04:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:04:37 GMT Subject: rpms/jflex/devel jflex.spec,1.4,1.5 Message-ID: <200807092004.m69K4bdH013177@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jflex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13063 Modified Files: jflex.spec Log Message: fix repotag Index: jflex.spec =================================================================== RCS file: /cvs/pkgs/rpms/jflex/devel/jflex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jflex.spec 3 Mar 2008 18:22:17 -0000 1.4 +++ jflex.spec 9 Jul 2008 20:03:45 -0000 1.5 @@ -33,7 +33,7 @@ Summary: Fast Scanner Generator Name: jflex Version: 1.4.1 -Release: 0jpp.2%{?dist} +Release: 0.3%{?dist} Epoch: 0 License: GPLv2 URL: http://jflex.de/ @@ -125,6 +125,9 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.4.1-0.3 +- drop repotag + * Mon Mar 03 2008 Matt Wringe - 0:1.4.1-0jpp.2 - Add missing buildrequires on java_cup From fedora-extras-commits at redhat.com Wed Jul 9 20:07:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Wed, 9 Jul 2008 20:07:15 GMT Subject: rpms/skencil/F-9 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch, 1.1, NONE skencil-0.6.17-fonts.patch, 1.1, NONE skencil-logo.png, 1.1, NONE skencil.spec, 1.22, NONE sources, 1.4, NONE Message-ID: <200807092007.m69K7FLP013356@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/skencil/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314/F-9 Added Files: dead.package Removed Files: Makefile branch skencil-0.6.17-fonts.patch skencil-logo.png skencil.spec sources Log Message: package retired --- NEW FILE dead.package --- does not work with tk 8.5 anymore --- Makefile DELETED --- --- branch DELETED --- --- skencil-0.6.17-fonts.patch DELETED --- --- skencil.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 20:07:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:07:28 GMT Subject: rpms/jgroups/devel jgroups.spec,1.19,1.20 Message-ID: <200807092007.m69K7SuB013373@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jgroups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13267 Modified Files: jgroups.spec Log Message: fix repotag Index: jgroups.spec =================================================================== RCS file: /cvs/pkgs/rpms/jgroups/devel/jgroups.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jgroups.spec 29 May 2008 14:23:20 -0000 1.19 +++ jgroups.spec 9 Jul 2008 20:05:49 -0000 1.20 @@ -43,7 +43,7 @@ Name: jgroups Version: 2.2.9.2 -Release: 4jpp.4 +Release: 4.5%{?dist} Epoch: 0 Summary: Toolkit for reliable multicast communication. License: LGPLv2+ @@ -101,9 +101,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/ln -Requires(post): /bin/rm -Requires(postun): /bin/rm +# for /bin/ln and /bin/rm +Requires(post): coreutils +Requires(postun): coreutils %description javadoc %{summary}. @@ -226,6 +226,9 @@ %doc %{_docdir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.2.9.2-4.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:2.2.9.2-4jpp.4 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:07:42 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Wed, 9 Jul 2008 20:07:42 GMT Subject: rpms/skencil/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE skencil-0.6.17-fonts.patch, 1.1, NONE skencil-logo.png, 1.1, NONE skencil.spec, 1.22, NONE sources, 1.4, NONE Message-ID: <200807092007.m69K7gVg013434@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314/devel Added Files: dead.package Removed Files: Makefile skencil-0.6.17-fonts.patch skencil-logo.png skencil.spec sources Log Message: package retired --- NEW FILE dead.package --- does not work with tk 8.5 anymore --- Makefile DELETED --- --- skencil-0.6.17-fonts.patch DELETED --- --- skencil.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 20:08:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:08:31 GMT Subject: rpms/jlex/devel jlex.spec,1.16,1.17 Message-ID: <200807092008.m69K8Vcr013497@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jlex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13449 Modified Files: jlex.spec Log Message: fix repotag Index: jlex.spec =================================================================== RCS file: /cvs/pkgs/rpms/jlex/devel/jlex.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jlex.spec 29 May 2008 14:24:45 -0000 1.16 +++ jlex.spec 9 Jul 2008 20:07:44 -0000 1.17 @@ -36,7 +36,7 @@ Name: jlex Version: 1.2.6 -Release: 6jpp.2 +Release: 6.3%{?dist} Epoch: 0 Summary: A Lexical Analyzer Generator for Java License: BSD @@ -63,9 +63,9 @@ %package javadoc Group: Development/Java Summary: Javadoc for %{name}. -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -136,6 +136,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.6-6.3 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.2.6-6jpp.2 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:09:12 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Wed, 9 Jul 2008 20:09:12 GMT Subject: comps comps-f10.xml.in,1.43,1.44 comps-f9.xml.in,1.372,1.373 Message-ID: <200807092009.m69K9C1l013618@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13554 Modified Files: comps-f10.xml.in comps-f9.xml.in Log Message: retired skencil Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- comps-f10.xml.in 8 Jul 2008 21:26:30 -0000 1.43 +++ comps-f10.xml.in 9 Jul 2008 20:08:41 -0000 1.44 @@ -2096,7 +2096,6 @@ sane-frontends scanbuttond showimg - skencil tuxpaint tzclock ufraw Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- comps-f9.xml.in 8 Jul 2008 21:26:30 -0000 1.372 +++ comps-f9.xml.in 9 Jul 2008 20:08:41 -0000 1.373 @@ -2101,7 +2101,6 @@ sane-frontends scanbuttond showimg - skencil tuxpaint tzclock ufraw From fedora-extras-commits at redhat.com Wed Jul 9 20:09:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:09:37 GMT Subject: rpms/jline/devel jline.spec,1.3,1.4 Message-ID: <200807092009.m69K9br4013630@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13582 Modified Files: jline.spec Log Message: fix repotag Index: jline.spec =================================================================== RCS file: /cvs/pkgs/rpms/jline/devel/jline.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jline.spec 25 Mar 2008 03:57:14 -0000 1.3 +++ jline.spec 9 Jul 2008 20:08:52 -0000 1.4 @@ -42,7 +42,7 @@ Name: jline Version: 0.9.94 -Release: 0jpp.1%{?dist} +Release: 0.2%{?dist} Epoch: 0 Summary: Java library for reading and editing user input in console applications License: BSD @@ -51,8 +51,9 @@ Source0: http://download.sourceforge.net/sourceforge/jline/jline-%{cvs_version}.zip Source1: CatalogManager.properties Source2: jline-build.xml -Requires: /bin/sh -Requires: /bin/stty +Requires: bash +# for /bin/stty +Requires: coreutils BuildRequires: jpackage-utils >= 0:1.7 %if %{with_maven} BuildRequires: xml-commons-resolver @@ -225,6 +226,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:9.94-0.2 +- drop repotag + * Mon Mar 24 2008 Matt Wringe - 0:9.94-0jpp.1 - Update to 0.9.94 (BZ #436204) From fedora-extras-commits at redhat.com Wed Jul 9 20:10:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:10:42 GMT Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.44,1.45 Message-ID: <200807092010.m69KAgwp013781@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jpackage-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13696 Modified Files: jpackage-utils.spec Log Message: fix repotag Index: jpackage-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- jpackage-utils.spec 8 Jul 2008 18:47:22 -0000 1.44 +++ jpackage-utils.spec 9 Jul 2008 20:09:55 -0000 1.45 @@ -34,10 +34,10 @@ Name: jpackage-utils Version: 1.7.5 -Release: 1jpp.4%{?dist} +Release: 1.5%{?dist} Epoch: 0 Summary: JPackage utilities -License: JPackage License +License: BSD URL: http://www.jpackage.org/ Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-enable-gcj-support.patch @@ -230,6 +230,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.7.5-1.5 +- drop repotag +- fix license tag + * Tue Jul 08 2008 Deepak Bhole 1.7.5-1jpp.4 - Update some macros to be based on other system macros. From fedora-extras-commits at redhat.com Wed Jul 9 20:11:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:11:50 GMT Subject: rpms/jrefactory/devel jrefactory.spec,1.15,1.16 Message-ID: <200807092011.m69KBoar013887@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jrefactory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13853 Modified Files: jrefactory.spec Log Message: fix repotag Index: jrefactory.spec =================================================================== RCS file: /cvs/pkgs/rpms/jrefactory/devel/jrefactory.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jrefactory.spec 29 May 2008 14:25:44 -0000 1.15 +++ jrefactory.spec 9 Jul 2008 20:11:02 -0000 1.16 @@ -36,7 +36,7 @@ Name: jrefactory Version: 2.8.9 -Release: 7jpp.5%{?dist} +Release: 7.6%{?dist} Epoch: 0 Summary: JRefactory and Pretty Print License: BSD and ASL 1.1 and GPL+ @@ -119,6 +119,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.8.9-7.6 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:2.8.9-7jpp.5 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:12:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:12:55 GMT Subject: rpms/jrexx/devel jrexx.spec,1.1,1.2 Message-ID: <200807092012.m69KCtGV014023@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jrexx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13956 Modified Files: jrexx.spec Log Message: fix repotag Index: jrexx.spec =================================================================== RCS file: /cvs/pkgs/rpms/jrexx/devel/jrexx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jrexx.spec 6 Jul 2007 21:14:48 -0000 1.1 +++ jrexx.spec 9 Jul 2008 20:12:06 -0000 1.2 @@ -31,9 +31,9 @@ Summary: Automaton based regluar expression API for Java Name: jrexx Version: 1.1.1 -Release: 3jpp.1%{?dist} +Release: 3.2%{?dist} Epoch: 0 -License: LGPL +License: LGPLv2+ URL: http://www.karneim.com/jrexx/ Group: Development/Libraries Source0: http://gentoo.osuosl.org/distfiles/jrexx-1.1.1-src.zip @@ -108,6 +108,9 @@ %doc %{_javadocdir}/%{name}-%{version} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1.1-3.2 +- drop repotag + * Mon Feb 12 2007 Jeff Johnston - 0:1.1.1-3jpp.1 - Update based on Fedora review comments. From fedora-extras-commits at redhat.com Wed Jul 9 20:14:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:14:04 GMT Subject: rpms/jsch/devel jsch.spec,1.26,1.27 Message-ID: <200807092014.m69KE4e1014141@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jsch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14083 Modified Files: jsch.spec Log Message: fix repotag Index: jsch.spec =================================================================== RCS file: /cvs/pkgs/rpms/jsch/devel/jsch.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- jsch.spec 29 May 2008 14:26:41 -0000 1.26 +++ jsch.spec 9 Jul 2008 20:13:12 -0000 1.27 @@ -36,7 +36,7 @@ Name: jsch Version: 0.1.31 -Release: 2jpp.4%{?dist} +Release: 2.5%{?dist} Epoch: 0 Summary: Pure Java implementation of SSH2 Group: Development/Libraries/Java @@ -76,8 +76,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc %{summary}. @@ -85,8 +86,9 @@ %package demo Summary: Examples for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description demo %{summary}. @@ -182,6 +184,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:0.1.31-2.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:0.1.31-2jpp.4 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:15:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:15:08 GMT Subject: rpms/jtidy/devel jtidy.spec,1.3,1.4 Message-ID: <200807092015.m69KF8CR014282@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jtidy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14218 Modified Files: jtidy.spec Log Message: fix repotag Index: jtidy.spec =================================================================== RCS file: /cvs/pkgs/rpms/jtidy/devel/jtidy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jtidy.spec 19 Feb 2008 16:31:17 -0000 1.3 +++ jtidy.spec 9 Jul 2008 20:14:21 -0000 1.4 @@ -33,9 +33,9 @@ Summary: HTML syntax checker and pretty printer Name: jtidy Version: 1.0 -Release: 0.2.r7dev.1jpp.2%{?dist} +Release: 0.2.r7dev.1.3%{?dist} Epoch: 2 -License: BSD-Style +License: zlib URL: http://jtidy.sourceforge.net/ Source0: http://download.sf.net/jtidy/jtidy-04aug2000r7-dev.zip Source1: %{name}.jtidy.script @@ -67,8 +67,9 @@ %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -160,6 +161,10 @@ %{_bindir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 2:1.0-0.2.r7dev.1.3 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 2:1.0-0.2.r7dev.1jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 20:16:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:16:11 GMT Subject: rpms/junit/devel junit.spec,1.29,1.30 Message-ID: <200807092016.m69KGBQf014393@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/junit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14343 Modified Files: junit.spec Log Message: fix repotag Index: junit.spec =================================================================== RCS file: /cvs/pkgs/rpms/junit/devel/junit.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- junit.spec 19 Feb 2008 00:43:52 -0000 1.29 +++ junit.spec 9 Jul 2008 20:15:25 -0000 1.30 @@ -34,7 +34,7 @@ Name: junit Version: 3.8.2 -Release: 4jpp.3%{?dist} +Release: 4.4%{?dist} Summary: Java regression test package License: CPL Url: http://www.junit.org/ @@ -163,6 +163,9 @@ %{_datadir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 3.8.2-4.4 +- drop repotag + * Mon Feb 18 2008 Fedora Release Engineering - 3.8.2-4jpp.3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 20:17:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:17:26 GMT Subject: rpms/junit4/devel junit4.spec,1.1,1.2 Message-ID: <200807092017.m69KHQ6m014522@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/junit4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14457 Modified Files: junit4.spec Log Message: fix repotag Index: junit4.spec =================================================================== RCS file: /cvs/pkgs/rpms/junit4/devel/junit4.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- junit4.spec 13 Aug 2007 14:45:06 -0000 1.1 +++ junit4.spec 9 Jul 2008 20:16:27 -0000 1.2 @@ -32,7 +32,7 @@ Name: junit4 Version: 4.3.1 -Release: 1jpp.1%{?dist} +Release: 1.2%{?dist} Summary: Java regression test package License: CPL Url: http://www.junit.org/ @@ -169,6 +169,9 @@ %{_datadir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 4.3.1-1.2 +- drop repotag + * Tue Aug 07 2007 Ben Konrath - 4.3.1-1jpp.1.fc8 - Set gcj_support to 0 to work around problems with GCJ. - Fix buglet with the gcj post/postun if statement. From fedora-extras-commits at redhat.com Wed Jul 9 20:18:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:18:31 GMT Subject: rpms/junitperf/devel junitperf.spec,1.1,1.2 Message-ID: <200807092018.m69KIVZ7014682@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/junitperf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14586 Modified Files: junitperf.spec Log Message: fix repotag Index: junitperf.spec =================================================================== RCS file: /cvs/pkgs/rpms/junitperf/devel/junitperf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- junitperf.spec 7 Mar 2007 20:24:09 -0000 1.1 +++ junitperf.spec 9 Jul 2008 20:17:46 -0000 1.2 @@ -30,7 +30,7 @@ Name: junitperf Version: 1.9.1 -Release: 2jpp.1%{?dist} +Release: 2.2%{?dist} Epoch: 0 Summary: JUnit extension for performance and scalability testing License: BSD @@ -119,6 +119,9 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.9.1-2.2 +- drop repotag + * Thu Feb 15 2007 Deepak Bhole - 0:1.9.1-2jpp.1 - Fixed per Fedora spec From fedora-extras-commits at redhat.com Wed Jul 9 20:18:52 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 9 Jul 2008 20:18:52 GMT Subject: rpms/gnome-session/devel icon-names.patch, NONE, 1.1 gnome-session.spec, 1.169, 1.170 Message-ID: <200807092018.m69KIqaJ014755@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14574 Modified Files: gnome-session.spec Added Files: icon-names.patch Log Message: use more standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gnome-session-2.23.4.1/gnome-session/logout-dialog.c.icon-names gnome-session-2.23.4.1/gnome-session/logout-dialog.c --- gnome-session-2.23.4.1/gnome-session/logout-dialog.c.icon-names 2008-07-09 16:12:41.000000000 -0400 +++ gnome-session-2.23.4.1/gnome-session/logout-dialog.c 2008-07-09 16:13:10.000000000 -0400 @@ -41,8 +41,8 @@ #define AUTOMATIC_ACTION_TIMEOUT 60 -#define GSM_ICON_LOGOUT "gnome-logout" -#define GSM_ICON_SHUTDOWN "gnome-shutdown" +#define GSM_ICON_LOGOUT "system-logout" +#define GSM_ICON_SHUTDOWN "system-shutdown" struct _GsmLogoutDialogPrivate { Index: gnome-session.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- gnome-session.spec 8 Jul 2008 17:51:28 -0000 1.169 +++ gnome-session.spec 9 Jul 2008 20:17:59 -0000 1.170 @@ -12,7 +12,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.23.4.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -59,6 +59,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=542086 Patch47: escape-comment.patch +Patch49: icon-names.patch + BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -103,6 +105,7 @@ #%patch22 -p1 -b .ice-leaks %patch34 -p1 -b .nautilus %patch47 -p1 -b .escape-comment +%patch49 -p1 -b .icon-names %build @@ -188,6 +191,9 @@ %changelog +* Wed Jul 9 2008 Matthias Clasen - 2.23.4.1-3 +- Use more standard icon names + * Tue Jul 8 2008 Matthias Clasen - 2.23.4.1-2 - Escape comments for markup From fedora-extras-commits at redhat.com Wed Jul 9 20:19:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:19:31 GMT Subject: rpms/jython/devel jython.spec,1.7,1.8 Message-ID: <200807092019.m69KJVc6014798@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14748 Modified Files: jython.spec Log Message: fix repotag Index: jython.spec =================================================================== RCS file: /cvs/pkgs/rpms/jython/devel/jython.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jython.spec 24 Mar 2008 20:37:49 -0000 1.7 +++ jython.spec 9 Jul 2008 20:18:48 -0000 1.8 @@ -1,17 +1,14 @@ %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} -%define name jython -%define version 2.2.1 %define cpython_version %{pyver} %define pyxml_version 0.8.3 %define svn_tag Release_2_2_1 -%define release 0.1.%{svn_tag}.1jpp.1%{?dist} %define gcj_support 1 -Name: %{name} -Version: %{version} -Release: %{release} +Name: jython +Version: 2.2.1 +Release: 0.1.%{svn_tag}.1.2%{?dist} Summary: A Java implementation of the Python language License: BSD URL: http://www.jython.org/ @@ -281,6 +278,9 @@ %doc %{_datadir}/%{name}/Demo %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 2.2.1-0.1.Release_2_2_1.1.2 +- drop repotag + * Tue Mar 18 2008 John Matthews - 2.2.1-0.1.Release_2_2_1.1jpp.1 - Update to 2.2.1 - Resolves: rhbz#426373 From fedora-extras-commits at redhat.com Wed Jul 9 20:20:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:20:37 GMT Subject: rpms/jzlib/devel jzlib.spec,1.12,1.13 Message-ID: <200807092020.m69KKbfx014931@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jzlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14864 Modified Files: jzlib.spec Log Message: fix repotag Index: jzlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/jzlib/devel/jzlib.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jzlib.spec 29 May 2008 14:27:39 -0000 1.12 +++ jzlib.spec 9 Jul 2008 20:19:49 -0000 1.13 @@ -36,7 +36,7 @@ Name: jzlib Version: 1.0.7 -Release: 5jpp.2 +Release: 5.3%{?dist} Epoch: 0 Summary: JZlib re-implementation of zlib in pure Java @@ -69,9 +69,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc %{summary}. @@ -79,9 +79,9 @@ %package demo Summary: Examples for %{name} Group: Development/Libraries/Java -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description demo %{summary}. @@ -176,6 +176,9 @@ %ghost %doc %{_datadir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0.7-5.3 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.0.7-5jpp.2 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:24:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:23 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchcommits Message-ID: <200807092024.m69KONrl021913@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchcommits acl on libhugetlbfs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:24:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:29 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested commit Message-ID: <200807092024.m69KOThI021932@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the commit acl on libhugetlbfs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:24:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:46 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested approveacls Message-ID: <200807092024.m69KOkpE021968@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the approveacls acl on libhugetlbfs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:24:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:51 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchbugzilla Message-ID: <200807092024.m69KONro021913@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchbugzilla acl on libhugetlbfs (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:24:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:50 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchbugzilla Message-ID: <200807092024.m69KOThL021932@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchbugzilla acl on libhugetlbfs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:24:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:53 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchcommits Message-ID: <200807092024.m69KOkpH021968@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchcommits acl on libhugetlbfs (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:24:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:55 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested commit Message-ID: <200807092024.m69KOtcR022051@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the commit acl on libhugetlbfs (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:24:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:24:58 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested approveacls Message-ID: <200807092024.m69KOThO021932@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the approveacls acl on libhugetlbfs (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:02 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested approveacls Message-ID: <200807092025.m69KONrr021913@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the approveacls acl on libhugetlbfs (Fedora 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:04 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested commit Message-ID: <200807092025.m69KOkpK021968@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the commit acl on libhugetlbfs (Fedora 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:07 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchcommits Message-ID: <200807092025.m69KOtcU022051@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchcommits acl on libhugetlbfs (Fedora 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:11 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchbugzilla Message-ID: <200807092025.m69KPBW8022188@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchbugzilla acl on libhugetlbfs (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:10 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchbugzilla Message-ID: <200807092025.m69KPAPl022167@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchbugzilla acl on libhugetlbfs (Fedora 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:13 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchcommits Message-ID: <200807092025.m69KPDAY022209@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchcommits acl on libhugetlbfs (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:15 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested commit Message-ID: <200807092025.m69KOtcX022051@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the commit acl on libhugetlbfs (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:18 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested approveacls Message-ID: <200807092025.m69KPAPo022167@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the approveacls acl on libhugetlbfs (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:20 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested approveacls Message-ID: <200807092025.m69KPBWB022188@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the approveacls acl on libhugetlbfs (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:21 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested commit Message-ID: <200807092025.m69KPDAb022209@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the commit acl on libhugetlbfs (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:23 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchcommits Message-ID: <200807092025.m69KPNX5022327@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchcommits acl on libhugetlbfs (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:27 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchbugzilla Message-ID: <200807092025.m69KPAPr022167@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchbugzilla acl on libhugetlbfs (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:30 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchbugzilla Message-ID: <200807092025.m69KPDAe022209@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchbugzilla acl on libhugetlbfs (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:34 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested watchcommits Message-ID: <200807092025.m69KPAPu022167@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the watchcommits acl on libhugetlbfs (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:35 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested commit Message-ID: <200807092025.m69KPBWE022188@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the commit acl on libhugetlbfs (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:25:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 20:25:38 +0000 Subject: [pkgdb] libhugetlbfs: emunson has requested approveacls Message-ID: <200807092025.m69KPDAh022209@bastion.fedora.phx.redhat.com> Eric Munson (emunson) has requested the approveacls acl on libhugetlbfs (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Wed Jul 9 20:43:12 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 9 Jul 2008 20:43:12 GMT Subject: rpms/rpcbind/devel .cvsignore, 1.3, 1.4 rpcbind.spec, 1.31, 1.32 sources, 1.3, 1.4 rpcbind-0.1.4-iff_up.patch, 1.1, NONE rpcbind-0.1.5-man-cleanup.patch, 1.1, NONE rpcbind-0.1.5-nss-config.patch, 1.1, NONE rpcbind-0.1.5-rpcinfo-manpage.patch, 1.1, NONE rpcbind-0.1.5-setgid.patch, 1.1, NONE Message-ID: <200807092043.m69KhCFU015901@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/rpcbind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15811 Modified Files: .cvsignore rpcbind.spec sources Removed Files: rpcbind-0.1.4-iff_up.patch rpcbind-0.1.5-man-cleanup.patch rpcbind-0.1.5-nss-config.patch rpcbind-0.1.5-rpcinfo-manpage.patch rpcbind-0.1.5-setgid.patch Log Message: Updated to latest upstream release 0.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpcbind/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Jun 2008 15:26:48 -0000 1.3 +++ .cvsignore 9 Jul 2008 20:42:14 -0000 1.4 @@ -1,2 +1,4 @@ rpcbind-0.1.4.tar.bz2 rpcbind-0.1.5.tar.bz2 +rpcbind-1.0.6.tar.bz2 +rpcbind-0.1.6.tar.bz2 Index: rpcbind.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- rpcbind.spec 2 Jul 2008 14:08:23 -0000 1.31 +++ rpcbind.spec 9 Jul 2008 20:42:14 -0000 1.32 @@ -1,8 +1,8 @@ %{!?_initdir:%define _initdir /etc/rc.d/init.d} Name: rpcbind -Version: 0.1.5 -Release: 5%{?dist} +Version: 0.1.6 +Release: 1%{?dist} Summary: Universal Addresses to RPC Program Number Mapper Group: System Environment/Daemons License: GPL @@ -25,12 +25,6 @@ Provides: portmap = %{version}-%{release} Obsoletes: portmap <= 4.0-65.3 -Patch1: rpcbind-0.1.4-iff_up.patch -Patch2: rpcbind-0.1.5-setgid.patch -Patch3: rpcbind-0.1.5-nss-config.patch -Patch4: rpcbind-0.1.5-man-cleanup.patch -Patch5: rpcbind-0.1.5-rpcinfo-manpage.patch - %description The rpcbind utility is a server that converts RPC program numbers into universal addresses. It must be running on the host to be able to make @@ -39,15 +33,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -# 447092: restrict passwd database search to local files -%patch3 -p1 -# 446915: Man page documents non-existing -L option -%patch4 -p1 -# 453729: typo error in rpcinfo man page -%patch5 -p1 - %build %ifarch s390 s390x PIE="-fPIE" @@ -126,6 +111,9 @@ %dir %attr(700,rpc,rpc) /var/lib/rpcbind %changelog +* Wed Jul 9 2008 Steve Dickson 0.1.6-1 +- Updated to latest upstream release 0.1.6 + * Wed Jul 2 2008 Steve Dickson 0.1.5-5 - Fixed SYNOPSIS section in the rpcinfo man page (bz 453729) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpcbind/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Jun 2008 15:26:48 -0000 1.3 +++ sources 9 Jul 2008 20:42:14 -0000 1.4 @@ -1 +1 @@ -adcf17feb72d942f38f91a9a90205a74 rpcbind-0.1.5.tar.bz2 +224c0db4b3d383f785130c350743bdf7 rpcbind-0.1.6.tar.bz2 --- rpcbind-0.1.4-iff_up.patch DELETED --- --- rpcbind-0.1.5-man-cleanup.patch DELETED --- --- rpcbind-0.1.5-nss-config.patch DELETED --- --- rpcbind-0.1.5-rpcinfo-manpage.patch DELETED --- --- rpcbind-0.1.5-setgid.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 20:43:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:43:20 GMT Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.29, 1.30 Message-ID: <200807092043.m69KhKIA015904@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/jakarta-commons-dbcp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15839 Modified Files: jakarta-commons-dbcp.spec Log Message: drop repotag Index: jakarta-commons-dbcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jakarta-commons-dbcp.spec 29 May 2008 14:15:12 -0000 1.29 +++ jakarta-commons-dbcp.spec 9 Jul 2008 20:42:29 -0000 1.30 @@ -45,7 +45,7 @@ Name: jakarta-commons-dbcp Version: 1.2.1 -Release: 11jpp.4%{?dist} +Release: 11.5%{?dist} Epoch: 0 Summary: Jakarta Commons DataBase Pooling Package License: ASL 2.0 @@ -349,6 +349,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.1-11.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.2.1-11jpp.4 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:46:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:46:20 GMT Subject: rpms/log4j/devel log4j.spec,1.25,1.26 Message-ID: <200807092046.m69KkKVu016102@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/log4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16031 Modified Files: log4j.spec Log Message: fix repotag Index: log4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/log4j/devel/log4j.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- log4j.spec 29 May 2008 14:30:06 -0000 1.25 +++ log4j.spec 9 Jul 2008 20:45:30 -0000 1.26 @@ -37,7 +37,7 @@ Name: log4j Version: 1.2.14 -Release: 4jpp.2%{?dist} +Release: 4.3%{?dist} Epoch: 0 Summary: Java logging package License: ASL 2.0 @@ -100,9 +100,9 @@ %package javadoc Summary: Javadoc for %{name} Group: System/Logging -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -273,6 +273,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.14-4.3 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.2.14-4jpp.2 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:47:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:47:33 GMT Subject: rpms/lucene/devel lucene.spec,1.36,1.37 Message-ID: <200807092047.m69KlX63016236@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/lucene/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16171 Modified Files: lucene.spec Log Message: fix repotag Index: lucene.spec =================================================================== RCS file: /cvs/pkgs/rpms/lucene/devel/lucene.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- lucene.spec 29 May 2008 14:31:11 -0000 1.36 +++ lucene.spec 9 Jul 2008 20:46:38 -0000 1.37 @@ -36,7 +36,7 @@ Summary: High-performance, full-featured text search engine Name: lucene Version: 2.3.1 -Release: 3jpp.1%{?dist} +Release: 3.2%{?dist} Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ @@ -270,6 +270,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:2.3.1-3.2 +- drop repotag + * Thu May 28 2008 Tom "spot" Callaway - 0:2.3.1-3jpp.1 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:48:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:48:50 GMT Subject: rpms/maven2/devel maven2.spec,1.10,1.11 Message-ID: <200807092048.m69Kmowr016385@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16315 Modified Files: maven2.spec Log Message: fix repotag Index: maven2.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- maven2.spec 29 May 2008 14:37:21 -0000 1.10 +++ maven2.spec 9 Jul 2008 20:48:05 -0000 1.11 @@ -48,7 +48,7 @@ Name: %{name} Version: %{maven_version} -Release: 10jpp.11%{?dist} +Release: 10.12%{?dist} Epoch: 0 Summary: Java project management and project comprehension tool @@ -2296,6 +2296,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 2.0.4-10.12 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 2.0.4-10jpp.11 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:49:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:49:57 GMT Subject: rpms/maven2-common-poms/devel maven2-common-poms.spec,1.3,1.4 Message-ID: <200807092049.m69KnvNQ016617@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven2-common-poms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16465 Modified Files: maven2-common-poms.spec Log Message: fix repotag Index: maven2-common-poms.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- maven2-common-poms.spec 29 May 2008 14:38:29 -0000 1.3 +++ maven2-common-poms.spec 9 Jul 2008 20:49:05 -0000 1.4 @@ -33,7 +33,7 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 4jpp.3%{?dist} +Release: 4.4%{?dist} Epoch: 0 Summary: Common poms for maven2 License: ASL 2.0 and BSD @@ -88,6 +88,9 @@ %{_datadir}/maven2 %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-4.4 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-4jpp.3 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:51:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:51:01 GMT Subject: rpms/maven-doxia/devel maven-doxia.spec,1.9,1.10 Message-ID: <200807092051.m69Kp18k016905@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven-doxia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16751 Modified Files: maven-doxia.spec Log Message: fix repotag Index: maven-doxia.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- maven-doxia.spec 29 May 2008 14:32:23 -0000 1.9 +++ maven-doxia.spec 9 Jul 2008 20:50:13 -0000 1.10 @@ -41,7 +41,7 @@ Name: maven-doxia Version: 1.0 -Release: 0.2.a7.2jpp.7%{?dist} +Release: 0.2.a7.2.8%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -278,6 +278,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a7.2.8 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-0.2.a7.2jpp.7 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:51:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:51:51 GMT Subject: rpms/maven-jxr/devel maven-jxr.spec,1.7,1.8 Message-ID: <200807092051.m69Kpphr017107@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven-jxr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16996 Modified Files: maven-jxr.spec Log Message: fix repotag Index: maven-jxr.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven-jxr/devel/maven-jxr.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- maven-jxr.spec 29 May 2008 14:33:22 -0000 1.7 +++ maven-jxr.spec 9 Jul 2008 20:51:17 -0000 1.8 @@ -40,7 +40,7 @@ Name: maven-jxr Version: 1.0 -Release: 2jpp.6%{?dist} +Release: 2.7%{?dist} Epoch: 0 Summary: Source cross referencing tool License: ASL 2.0 @@ -209,6 +209,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-2.7 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-2jpp.6 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:53:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:53:04 GMT Subject: rpms/maven-scm/devel maven-scm.spec,1.6,1.7 Message-ID: <200807092053.m69Kr4dT017309@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven-scm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17188 Modified Files: maven-scm.spec Log Message: fix repotag Index: maven-scm.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maven-scm.spec 26 Jun 2008 19:32:56 -0000 1.6 +++ maven-scm.spec 9 Jul 2008 20:52:07 -0000 1.7 @@ -36,7 +36,7 @@ Name: maven-scm Version: 1.0 -Release: 0.2.b3.1jpp.5%{?dist} +Release: 0.2.b3.1.6%{?dist} Epoch: 0 Summary: Common API for doing SCM operations License: ASL 2.0 @@ -114,8 +114,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(pre): /bin/rm,/bin/ls -Requires(post): /bin/rm +# for /bin/rm and /bin/ls +Requires(pre): coreutils +Requires(post): coreutils %description javadoc Javadoc for %{name}. @@ -294,6 +295,9 @@ %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1.0-0.2.b3.1.6 +- drop repotag + * Thu Jun 26 2008 Deepak Bhole 1.0-0.2.b3.1jpp.5 - Fix mapping for the scm plugin From fedora-extras-commits at redhat.com Wed Jul 9 20:54:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:54:05 GMT Subject: rpms/maven-shared/devel maven-shared.spec,1.6,1.7 Message-ID: <200807092054.m69Ks5l1017516@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven-shared/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17390 Modified Files: maven-shared.spec Log Message: fix repotag Index: maven-shared.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maven-shared.spec 29 May 2008 14:35:18 -0000 1.6 +++ maven-shared.spec 9 Jul 2008 20:53:20 -0000 1.7 @@ -51,7 +51,7 @@ Name: maven-shared Version: 1.0 -Release: 4jpp.5%{?dist} +Release: 4.6%{?dist} Epoch: 0 License: ASL 2.0 Group: Development/Libraries @@ -282,6 +282,9 @@ %doc %{_javadocdir}/%{name}-plugin-testing-harness* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1.0-4.6 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-4jpp.5 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:55:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:55:10 GMT Subject: rpms/maven-surefire/devel maven-surefire.spec,1.8,1.9 Message-ID: <200807092055.m69KtAT0017740@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven-surefire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17601 Modified Files: maven-surefire.spec Log Message: fix repotag Index: maven-surefire.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- maven-surefire.spec 29 May 2008 14:36:09 -0000 1.8 +++ maven-surefire.spec 9 Jul 2008 20:54:21 -0000 1.9 @@ -41,7 +41,7 @@ Name: maven-surefire Version: 1.5.3 -Release: 2jpp.6%{?dist} +Release: 2.7%{?dist} Epoch: 0 Summary: Test framework project License: ASL 2.0 @@ -122,8 +122,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -131,8 +132,9 @@ %package booter-javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description booter-javadoc Javadoc for %{name}. @@ -312,6 +314,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.5.3-2.7 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.5.3-2jpp.6 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 20:55:54 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 9 Jul 2008 20:55:54 GMT Subject: rpms/gnome-session/devel gnome-session.spec,1.170,1.171 Message-ID: <200807092055.m69Ktsxt017933@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17704 Modified Files: gnome-session.spec Log Message: add bug ref Index: gnome-session.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- gnome-session.spec 9 Jul 2008 20:17:59 -0000 1.170 +++ gnome-session.spec 9 Jul 2008 20:55:00 -0000 1.171 @@ -59,6 +59,7 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=542086 Patch47: escape-comment.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=542256 Patch49: icon-names.patch BuildRequires: libgnomeui-devel >= %{libgnomeui_version} From fedora-extras-commits at redhat.com Wed Jul 9 20:56:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:56:10 GMT Subject: rpms/maven-wagon/devel maven-wagon.spec,1.2,1.3 Message-ID: <200807092056.m69KuArx017967@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/maven-wagon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17842 Modified Files: maven-wagon.spec Log Message: fix repotag Index: maven-wagon.spec =================================================================== RCS file: /cvs/pkgs/rpms/maven-wagon/devel/maven-wagon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- maven-wagon.spec 8 Apr 2008 15:23:29 -0000 1.2 +++ maven-wagon.spec 9 Jul 2008 20:55:26 -0000 1.3 @@ -16,10 +16,10 @@ Name: maven-%{bname} Version: 1.0 -Release: 0.1.a5.3jpp.2%{?dist} +Release: 0.1.a5.3.3%{?dist} Epoch: 0 Summary: Tools to manage artifacts and deployment -License: Apache Software License +License: ASL 2.0 Group: Development/Java URL: http://maven.apache.org/wagon Source0: wagon-1.0-alpha-5-src.tar.gz @@ -395,6 +395,10 @@ #%endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a5.3.3 +- drop repotag +- fix license tag + * Sat Apr 05 2008 Matt Wringe - 0:1.0-0.1.a5.3jpp.2 - Rebuild with new version of jsch From fedora-extras-commits at redhat.com Wed Jul 9 20:57:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:57:17 GMT Subject: rpms/modello/devel modello.spec,1.2,1.3 Message-ID: <200807092057.m69KvHMZ018139@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/modello/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18036 Modified Files: modello.spec Log Message: fix repotag Index: modello.spec =================================================================== RCS file: /cvs/pkgs/rpms/modello/devel/modello.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- modello.spec 20 Mar 2007 07:38:28 -0000 1.2 +++ modello.spec 9 Jul 2008 20:56:25 -0000 1.3 @@ -39,7 +39,7 @@ Name: modello Version: 1.0 -Release: 0.1.a8.4jpp.3%{?dist} +Release: 0.1.a8.4.4%{?dist} Epoch: 0 Summary: Modello Data Model toolkit License: MIT @@ -113,8 +113,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -244,6 +245,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a8.4.4 +- drop repotag + * Tue Mar 20 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.3 - disable gcj support From fedora-extras-commits at redhat.com Wed Jul 9 20:58:15 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 9 Jul 2008 20:58:15 GMT Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.156, 1.157 libselinux.spec, 1.333, 1.334 Message-ID: <200807092058.m69KwFDs018295@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18153 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Wed Jul 9 2008 Dan Walsh - 2.0.67-4 - Add ruby support for puppet libselinux-rhat.patch: Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- libselinux-rhat.patch 29 Jun 2008 12:31:00 -0000 1.156 +++ libselinux-rhat.patch 9 Jul 2008 20:57:21 -0000 1.157 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/freecon.3 libselinux-2.0.67/man/man3/freecon.3 --- nsalibselinux/man/man3/freecon.3 2008-06-12 23:25:12.000000000 -0400 -+++ libselinux-2.0.67/man/man3/freecon.3 2008-06-29 08:28:37.000000000 -0400 ++++ libselinux-2.0.67/man/man3/freecon.3 2008-07-09 16:52:33.000000000 -0400 @@ -15,6 +15,11 @@ .B freeconary frees the memory allocated for a context array. @@ -15,7 +15,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.67/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.67/man/man8/selinuxconlist.8 2008-06-29 08:27:30.000000000 -0400 ++++ libselinux-2.0.67/man/man8/selinuxconlist.8 2008-07-09 16:52:33.000000000 -0400 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -37,7 +37,7 @@ +secon(8), selinuxdefcon(8) diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.67/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.67/man/man8/selinuxdefcon.8 2008-06-29 08:27:30.000000000 -0400 ++++ libselinux-2.0.67/man/man8/selinuxdefcon.8 2008-07-09 16:52:33.000000000 -0400 @@ -0,0 +1,19 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -58,9 +58,147 @@ + +.SH "SEE ALSO" +secon(8), selinuxconlist(8) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.67/src/Makefile +--- nsalibselinux/src/Makefile 2008-06-22 09:40:25.000000000 -0400 ++++ libselinux-2.0.67/src/Makefile 2008-07-09 16:56:37.000000000 -0400 +@@ -7,16 +7,24 @@ + PYINC ?= /usr/include/$(PYLIBVER) + PYLIB ?= /usr/lib/$(PYLIBVER) + PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) ++RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")') ++RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM') ++RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) ++RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) + + LIBVERSION = 1 + + LIBA=libselinux.a + TARGET=libselinux.so + SWIGIF= selinuxswig_python.i ++SWIGRUBYIF= selinuxswig_ruby.i + SWIGCOUT= selinuxswig_wrap.c ++SWIGRUBYCOUT= selinuxswig_ruby_wrap.c + SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT)) ++SWIGRUBYLOBJ:= $(patsubst %.c,%.lo,$(SWIGRUBYCOUT)) + SWIGSO=_selinux.so + SWIGFILES=$(SWIGSO) selinux.py ++SWIGRUBYSO=_rubyselinux.so + LIBSO=$(TARGET).$(LIBVERSION) + AUDIT2WHYSO=audit2why.so + +@@ -29,7 +37,9 @@ + ifeq ($(DISABLE_RPM),y) + UNUSED_SRCS+=rpm.c + endif +-SRCS= $(filter-out $(UNUSED_SRCS), $(filter-out audit2why.c $(SWIGCOUT),$(wildcard *.c))) ++ ++GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) ++SRCS= $(filter-out $(UNUSED_SRCS), $(filter-out audit2why.c $(GENERATED),$(wildcard *.c))) + + OBJS= $(patsubst %.c,%.o,$(SRCS)) + LOBJS= $(patsubst %.c,%.lo,$(SRCS)) +@@ -44,11 +54,11 @@ + + SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ + +-GENERATED=$(SWIGCOUT) ++SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ + + all: $(LIBA) $(LIBSO) + +-pywrap: all $(SWIGSO) $(AUDIT2WHYSO) ++pywrap: all $(SWIGSO) $(AUDIT2WHYSO) $(SWIGRUBYSO) + + $(LIBA): $(OBJS) + $(AR) rcs $@ $^ +@@ -57,8 +67,14 @@ + $(SWIGLOBJ): $(SWIGCOUT) + $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $< + ++$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) ++ $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $< ++ + $(SWIGSO): $(SWIGLOBJ) +- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ ++ ++$(SWIGRUBYSO): $(SWIGRUBYLOBJ) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ + + $(LIBSO): $(LOBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro +@@ -79,6 +95,9 @@ + $(SWIGCOUT): $(SWIGIF) + $(SWIG) $^ + ++$(SWIGRUBYCOUT): $(SWIGRUBYIF) ++ $(SWIGRUBY) $^ ++ + swigify: $(SWIGIF) + $(SWIG) $^ + +@@ -95,6 +114,9 @@ + install -m 755 $(AUDIT2WHYSO) $(PYTHONLIBDIR)/site-packages/selinux + install -m 644 selinux.py $(PYTHONLIBDIR)/site-packages/selinux/__init__.py + ++ test -d $(RUBYINSTALL) || install -m 755 -d $(RUBYINSTALL) ++ install -m 755 $(SWIGRUBYSO) $(RUBYINSTALL)/selinux.so ++ + relabel: + /sbin/restorecon $(SHLIBDIR)/$(LIBSO) + +@@ -102,7 +124,7 @@ + -rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~ + + distclean: clean +- rm -f $(SWIGCOUT) $(SWIGFILES) ++ rm -f $(GENERATED) $(SWIGFILES) + + indent: + ../../scripts/Lindent $(filter-out $(GENERATED),$(wildcard *.[ch])) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.67/src/audit2why.c +--- nsalibselinux/src/audit2why.c 2008-06-12 23:25:14.000000000 -0400 ++++ libselinux-2.0.67/src/audit2why.c 2008-07-09 16:52:33.000000000 -0400 +@@ -55,7 +55,7 @@ + return 0; + } + +-static int check_booleans(struct avc_t *avc, struct boolean_t **bools) ++static int check_booleans(struct boolean_t **bools) + { + char errormsg[PATH_MAX]; + struct sepol_av_decision avd; +@@ -376,7 +376,7 @@ + avc->tsid = tsid; + avc->tclass = tclass; + avc->av = av; +- if (check_booleans(avc, &bools) == 0) { ++ if (check_booleans(&bools) == 0) { + if (av & ~avd.auditdeny) { + RETURN(DONTAUDIT) + } else { +@@ -390,15 +390,15 @@ + len++; b++; + } + b = bools; +- PyObject *boollist = PyTuple_New(len); ++ PyObject *outboollist = PyTuple_New(len); + len=0; + while(b->name) { + PyObject *bool = Py_BuildValue("(si)", b->name, b->active); +- PyTuple_SetItem(boollist, len++, bool); ++ PyTuple_SetItem(outboollist, len++, bool); + b++; + } + free(bools); +- PyTuple_SetItem(result, 1, boollist); ++ PyTuple_SetItem(result, 1, outboollist); + return result; + } + } diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.67/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2008-06-12 23:25:14.000000000 -0400 -+++ libselinux-2.0.67/src/matchpathcon.c 2008-06-29 08:27:30.000000000 -0400 ++++ libselinux-2.0.67/src/matchpathcon.c 2008-07-09 16:52:33.000000000 -0400 @@ -2,6 +2,7 @@ #include #include @@ -78,3 +216,154 @@ va_end(ap); } +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_ruby.i libselinux-2.0.67/src/selinuxswig_ruby.i +--- nsalibselinux/src/selinuxswig_ruby.i 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-2.0.67/src/selinuxswig_ruby.i 2008-07-09 16:52:33.000000000 -0400 +@@ -0,0 +1,147 @@ ++/* Author: James Athey ++ */ ++ ++%module selinux ++%{ ++ #include "selinux/selinux.h" ++%} ++ ++/* security_get_boolean_names() typemap */ ++/* ++%typemap(argout) (char ***names, int *len) { ++ PyObject* list = PyList_New(*$2); ++ int i; ++ for (i = 0; i < *$2; i++) { ++ PyList_SetItem(list, i, PyString_FromString((*$1)[i])); ++ } ++ $result = SWIG_Python_AppendOutput($result, list); ++} ++*/ ++/* return a sid along with the result */ ++%typemap(argout) (security_id_t * sid) { ++ if (*$1) { ++ %append_output(SWIG_NewPointerObj(*$1, $descriptor(security_id_t), 0)); ++ } ++/* else { ++ Py_INCREF(Py_None); ++ %append_output(Py_None); ++ } ++*/ ++} ++ ++%typemap(in,numinputs=0) security_id_t *(security_id_t temp) { ++ $1 = &temp; ++} ++ ++/* Makes security_compute_user() return a Python list of contexts */ ++/* ++%typemap(argout) (security_context_t **con) { ++ PyObject* plist; ++ int i, len = 0; ++ ++ if (*$1) { ++ while((*$1)[len]) ++ len++; ++ plist = PyList_New(len); ++ for (i = 0; i < len; i++) { ++ PyList_SetItem(plist, i, PyString_FromString((*$1)[i])); ++ } ++ } else { ++ plist = PyList_New(0); ++ } ++ ++ $result = SWIG_Python_AppendOutput($result, plist); ++} ++*/ ++/* Makes functions in get_context_list.h return a Python list of contexts */ ++ ++#ifdef fixme ++%typemap(argout) (security_context_t **list) { ++ PyObject* plist; ++ int i; ++ ++ if (*$1) { ++ plist = PyList_New(result); ++ for (i = 0; i < result; i++) { ++ PyList_SetItem(plist, i, PyString_FromString((*$1)[i])); ++ } ++ } else { ++ plist = PyList_New(0); ++ } ++ /* Only return the Python list, don't need to return the length anymore */ ++ $result = plist; ++} ++#endif ++ ++%typemap(in,noblock=1,numinputs=0) security_context_t * (security_context_t temp = 0) { ++ $1 = &temp; ++} ++%typemap(freearg,match="in") security_context_t * ""; ++%typemap(argout,noblock=1) security_context_t * { ++ if (*$1) { ++ %append_output(SWIG_FromCharPtr(*$1)); ++ freecon(*$1); ++ } ++/* ++ else { ++ Py_INCREF(Py_None); ++ %append_output(Py_None); ++ } ++*/ ++} ++ ++%typemap(in,noblock=1,numinputs=0) char ** (char * temp = 0) { ++ $1 = &temp; ++} ++%typemap(freearg,match="in") char ** ""; ++%typemap(argout,noblock=1) char ** { ++ if (*$1) { ++ %append_output(SWIG_FromCharPtr(*$1)); ++ free(*$1); ++ } ++/* ++ else { ++ Py_INCREF(Py_None); ++ %append_output(Py_None); ++ } ++*/ ++} ++/* ++%typemap(in) char * const [] { ++ int i, size; ++ PyObject * s; ++ ++ if (!PySequence_Check($input)) { ++ PyErr_SetString(PyExc_ValueError, "Expected a sequence"); ++ return NULL; ++ } ++ ++ size = PySequence_Size($input); ++ ++ $1 = (char**) malloc(size + 1); ++ for(i = 0; i < size; i++) { ++ if (!PyString_Check(PySequence_GetItem($input, i))) { ++ PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings"); ++ return NULL; ++ } ++ } ++ ++ for(i = 0; i < size; i++) { ++ s = PySequence_GetItem($input, i); ++ $1[i] = (char*) malloc(PyString_Size(s) + 1); ++ strcpy($1[i], PyString_AsString(s)); ++ } ++ $1[size] = NULL; ++} ++*/ ++ ++%typemap(freearg,match="in") char * const [] { ++ int i = 0; ++ while($1[i]) { ++ free($1[i]); ++ i++; ++ } ++ free($1); ++} ++ ++%include "selinuxswig.i" Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- libselinux.spec 8 Jul 2008 12:07:38 -0000 1.333 +++ libselinux.spec 9 Jul 2008 20:57:21 -0000 1.334 @@ -1,17 +1,18 @@ +%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %define libsepolver 2.0.32-1 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.67 -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz Patch: libselinux-rhat.patch URL: http://www.nsa.gov/selinux -BuildRequires: python-devel libsepol-static >= %{libsepolver} swig +BuildRequires: python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig Requires: libsepol >= %{libsepolver} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +40,15 @@ The libselinux-python package contains the python bindings for developing SELinux applications. +%package ruby +Summary: SELinux ruby bindings for libselinux +Group: Development/Libraries +Requires: libselinux = %{version}-%{release} + +%description ruby +The libselinux-ruby package contains the ruby bindings for developing +SELinux applications. + %package devel Summary: Header files and libraries used to build SELinux Group: Development/Libraries @@ -135,7 +145,14 @@ %dir %{python_sitearch}/selinux %{python_sitearch}/selinux/* +%files ruby +%defattr(-,root,root,-) +%{ruby_sitearch}/selinux.so + %changelog +* Wed Jul 9 2008 Dan Walsh - 2.0.67-4 +- Add ruby support for puppet + * Tue Jul 8 2008 Dan Walsh - 2.0.67-3 - Rebuild for new libsepol From fedora-extras-commits at redhat.com Wed Jul 9 20:58:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:58:21 GMT Subject: rpms/msv/devel msv.spec,1.4,1.5 Message-ID: <200807092058.m69KwLjr018313@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/msv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220 Modified Files: msv.spec Log Message: fix repotag Index: msv.spec =================================================================== RCS file: /cvs/pkgs/rpms/msv/devel/msv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- msv.spec 19 Feb 2008 15:36:34 -0000 1.4 +++ msv.spec 9 Jul 2008 20:57:34 -0000 1.5 @@ -37,7 +37,7 @@ Summary: Multischema Validator Name: msv Version: 1.2 -Release: 0.2.%{cvsdate}.3jpp.3%{?dist} +Release: 0.2.%{cvsdate}.3.4%{?dist} Epoch: 1 License: BSD URL: http://msv.dev.java.net @@ -483,6 +483,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:1.2-0.2.20050722.3.4 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 1:1.2-0.2.20050722.3jpp.3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 20:59:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 20:59:30 GMT Subject: rpms/mx4j/devel mx4j.spec,1.63,1.64 Message-ID: <200807092059.m69KxUwW018479@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mx4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18408 Modified Files: mx4j.spec Log Message: fix repotag Index: mx4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/mx4j/devel/mx4j.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- mx4j.spec 19 Feb 2008 03:14:10 -0000 1.63 +++ mx4j.spec 9 Jul 2008 20:58:39 -0000 1.64 @@ -40,10 +40,10 @@ Name: mx4j Version: 3.0.1 -Release: 7jpp.4 +Release: 7.5%{?dist} Epoch: 1 Summary: Open source implementation of JMX Java API -License: Apache License +License: MX4J Group: Development/Libraries/Java Source0: %{name}-%{version}-src.tar.gz Source1: %{name}-build.policy @@ -286,6 +286,10 @@ %doc dist/docs/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:3.0.1-7.5 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1:3.0.1-7jpp.4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 21:00:12 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 9 Jul 2008 21:00:12 GMT Subject: rpms/gnome-panel/devel icon-names.patch, NONE, 1.1 gnome-panel.spec, 1.306, 1.307 Message-ID: <200807092100.m69L0CYQ018599@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18456 Modified Files: gnome-panel.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names gnome-panel-2.23.4/gnome-panel/panel-icon-names.h --- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-07-09 15:22:29.000000000 -0400 +++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-09 15:22:43.000000000 -0400 @@ -25,7 +25,7 @@ #define PANEL_ICON_SEPARATOR "gnome-panel-separator" #define PANEL_ICON_SAVED_SEARCH "folder-saved-search" #define PANEL_ICON_SEARCHTOOL "system-search" -#define PANEL_ICON_SHUTDOWN "gnome-shutdown" +#define PANEL_ICON_SHUTDOWN "system-shutdown" #define PANEL_ICON_THEME "preferences-desktop-theme" #define PANEL_ICON_TRASH "user-trash" #define PANEL_ICON_UNKNOWN "image-missing" Index: gnome-panel.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- gnome-panel.spec 8 Jul 2008 17:17:54 -0000 1.306 +++ gnome-panel.spec 9 Jul 2008 20:59:14 -0000 1.307 @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.23.4 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2 @@ -119,6 +119,9 @@ Patch35: clock-wakeups.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=542257 +Patch47: icon-names.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -168,6 +171,7 @@ %patch33 -p1 -b .use-gio %patch34 -p1 -b .launch-with-gio %patch35 -p1 -b .clock-wakeups +%patch47 -p1 -b .icon-names . %{SOURCE6} @@ -352,6 +356,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Wed Jul 9 2008 Matthias Clasen - 2.23.4-3 +- Use more standard icon names + * Tue Jul 8 2008 Matthias Clasen - 2.23.4-2 - Fix debuginfo generation From fedora-extras-commits at redhat.com Wed Jul 9 21:05:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:05:10 GMT Subject: rpms/nekohtml/devel nekohtml.spec,1.1,1.2 Message-ID: <200807092105.m69L5AU8025553@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nekohtml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496 Modified Files: nekohtml.spec Log Message: fix repotag Index: nekohtml.spec =================================================================== RCS file: /cvs/pkgs/rpms/nekohtml/devel/nekohtml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nekohtml.spec 12 Mar 2007 15:01:17 -0000 1.1 +++ nekohtml.spec 9 Jul 2008 21:04:20 -0000 1.2 @@ -32,10 +32,10 @@ Name: nekohtml Version: 0.9.5 -Release: 4jpp.1%{?dist} +Release: 4.2%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer -License: Apache License +License: ASL 2.0 URL: http://www.apache.org/~andyc/neko/doc/html/ Source0: http://www.apache.org/~andyc/neko/nekohtml-0.9.5.tar.gz # Source 1 http://www.jpackage.org/cgi-bin/viewvc.cgi/*checkout*/rpms/devel/nekohtml/nekohtml-filter.sh?root=jpackage&content-type=text%2Fplain @@ -169,6 +169,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:0.9.5-4.2 +- drop repotag +- fix license tag + * Mon Feb 12 2007 Jeff Johnston - 0:0.9.5-4jpp.1 - Update to address Fedora review comments. From fedora-extras-commits at redhat.com Wed Jul 9 21:06:16 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Wed, 9 Jul 2008 21:06:16 GMT Subject: rpms/tor/devel tor.spec,1.20,1.21 Message-ID: <200807092106.m69L6Gqp025679@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/tor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25610 Modified Files: tor.spec Log Message: Rebuild for new libevent Index: tor.spec =================================================================== RCS file: /cvs/pkgs/rpms/tor/devel/tor.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- tor.spec 21 Jun 2008 15:21:33 -0000 1.20 +++ tor.spec 9 Jul 2008 21:05:20 -0000 1.21 @@ -11,7 +11,7 @@ Name: tor Version: 0.1.2.19 -Release: %release_func 2 +Release: %release_func 3 Group: System Environment/Daemons License: BSD Summary: Anonymizing overlay network for TCP (The onion router) @@ -184,6 +184,9 @@ %changelog +* Thu Jul 10 2008 Nikolay Vladimirov - 0.1.2.19-3 +- rebuild for new libevent + * Wed Feb 13 2008 Enrico Scholz - 0.1.2.19-2 - added 'missingok' to logrotate script (#429402) From fedora-extras-commits at redhat.com Wed Jul 9 21:08:36 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 9 Jul 2008 21:08:36 GMT Subject: rpms/libtirpc/devel libtirpc.spec, 1.28, 1.29 libtirpc-0.1.7-svc-run.patch, 1.1, NONE libtirpc-0.1.7-svcauthnone.patch, 1.2, NONE libtirpc-0.1.8-superH-support.patch, 1.1, NONE Message-ID: <200807092108.m69L8aRP025966@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libtirpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25868 Modified Files: libtirpc.spec Removed Files: libtirpc-0.1.7-svc-run.patch libtirpc-0.1.7-svcauthnone.patch libtirpc-0.1.8-superH-support.patch Log Message: Update to latest upstream version 0.1.9 Index: libtirpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- libtirpc.spec 27 Jun 2008 18:15:10 -0000 1.28 +++ libtirpc.spec 9 Jul 2008 21:07:50 -0000 1.29 @@ -1,5 +1,5 @@ Name: libtirpc -Version: 0.1.8 +Version: 0.1.9 Release: 2%{?dist} Summary: Transport Independent RPC Library Group: System Environment/Libraries @@ -30,10 +30,6 @@ Requires: %{name} = %{version}-%{release} Requires(devel): pkgconfig man -Patch1: libtirpc-0.1.7-svcauthnone.patch -Patch2: libtirpc-0.1.7-svc-run.patch -Patch3: libtirpc-0.1.8-superH-support.patch - Patch100: libtirpc-0.1.7-compile.patch %description devel @@ -43,10 +39,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -# 446559: Add super-H(sh3,4) architecture support. -%patch3 -p1 %patch100 -p1 @@ -145,6 +137,9 @@ %{_mandir}/*/* %changelog +* Tue Jul 9 2008 Steve Dickson 0.1.9-1 +- Update to latest upstream version 0.1.9 + * Fri Jun 27 2008 Steve Dickson 0.1.8-2 - Added super-H(sh3,4) architecture support (bz 446559) --- libtirpc-0.1.7-svc-run.patch DELETED --- --- libtirpc-0.1.7-svcauthnone.patch DELETED --- --- libtirpc-0.1.8-superH-support.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 21:08:50 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 9 Jul 2008 21:08:50 GMT Subject: rpms/db4/devel db4.spec,1.60,1.61 Message-ID: <200807092108.m69L8oaD026020@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/db4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25896 Modified Files: db4.spec Log Message: * Wed Jul 9 2008 Jindrich Novy 4.7.25-2 - rebuild Index: db4.spec =================================================================== RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- db4.spec 9 Jul 2008 07:22:14 -0000 1.60 +++ db4.spec 9 Jul 2008 21:07:57 -0000 1.61 @@ -5,7 +5,7 @@ Summary: The Berkeley DB database library (version 4) for C Name: db4 Version: 4.7.25 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz Patch2: db-4.3.29-sparc64.patch @@ -364,6 +364,9 @@ %endif %changelog +* Wed Jul 9 2008 Jindrich Novy 4.7.25-2 +- rebuild + * Wed Jul 9 2008 Jindrich Novy 4.7.25-1 - update to 4.7.25 (#449735) - package static java library only if listed in java_arches From fedora-extras-commits at redhat.com Wed Jul 9 21:09:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:09:26 GMT Subject: rpms/objectweb-anttask/devel objectweb-anttask.spec,1.3,1.4 Message-ID: <200807092109.m69L9Qa8026128@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/objectweb-anttask/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25980 Modified Files: objectweb-anttask.spec Log Message: fix repotag Index: objectweb-anttask.spec =================================================================== RCS file: /cvs/pkgs/rpms/objectweb-anttask/devel/objectweb-anttask.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- objectweb-anttask.spec 29 May 2008 14:42:00 -0000 1.3 +++ objectweb-anttask.spec 9 Jul 2008 21:08:43 -0000 1.4 @@ -38,7 +38,7 @@ Summary: ObjectWeb Ant task Name: objectweb-anttask Version: 1.3.2 -Release: 1jpp.3%{?dist} +Release: 1.4%{?dist} Epoch: 0 Group: Development/Java License: LGPLv2+ @@ -125,6 +125,9 @@ %ghost %dir %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3.2-1.4 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 0:1.3.2-1jpp.3 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 21:10:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:10:26 GMT Subject: rpms/objectweb-asm/devel objectweb-asm.spec,1.2,1.3 Message-ID: <200807092110.m69LAQk8026287@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/objectweb-asm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26210 Modified Files: objectweb-asm.spec Log Message: fix repotag Index: objectweb-asm.spec =================================================================== RCS file: /cvs/pkgs/rpms/objectweb-asm/devel/objectweb-asm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- objectweb-asm.spec 4 Dec 2007 20:48:22 -0000 1.2 +++ objectweb-asm.spec 9 Jul 2008 21:09:44 -0000 1.3 @@ -32,7 +32,7 @@ Name: objectweb-asm Version: 3.1 -Release: 2jpp.1%{dist} +Release: 2.2%{dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -103,6 +103,9 @@ %{_javadocdir}/%{name}-%{version}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:3.1-2.2 +- drop repotag + * Tue Dec 04 2007 Fernando Nasser - 0:3.1-2jpp.1 - First Fedora build - Replace uses of dos2unix with sed From fedora-extras-commits at redhat.com Wed Jul 9 21:10:41 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Wed, 9 Jul 2008 21:10:41 GMT Subject: rpms/libtirpc/devel libtirpc.spec,1.29,1.30 Message-ID: <200807092110.m69LAfOu026339@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libtirpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26209 Modified Files: libtirpc.spec Log Message: Fixed the relese number Index: libtirpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- libtirpc.spec 9 Jul 2008 21:07:50 -0000 1.29 +++ libtirpc.spec 9 Jul 2008 21:09:56 -0000 1.30 @@ -1,6 +1,6 @@ Name: libtirpc Version: 0.1.9 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Transport Independent RPC Library Group: System Environment/Libraries License: GPL From fedora-extras-commits at redhat.com Wed Jul 9 21:11:53 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Wed, 9 Jul 2008 21:11:53 GMT Subject: rpms/claws-mail/devel claws-mail.spec,1.35,1.36 Message-ID: <200807092111.m69LBrco026459@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/claws-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26401 Modified Files: claws-mail.spec Log Message: rebuild for libetpan Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- claws-mail.spec 30 Jun 2008 20:54:14 -0000 1.35 +++ claws-mail.spec 9 Jul 2008 21:11:00 -0000 1.36 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -206,6 +206,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Thu Jul 10 2008 Nikolay Vladimirov +- 3.5.0-2 +- rebuild for libetpan + * Mon Jun 30 2008 Andreas Bierfert - 3.5.0-1 - version upgrade (#453405, #448750) From fedora-extras-commits at redhat.com Wed Jul 9 21:23:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:06 +0000 Subject: [pkgdb] db4: pmatilai has requested watchcommits Message-ID: <200807092123.m69LN6Lu026396@bastion.fedora.phx.redhat.com> Panu Matilainen (pmatilai) has requested the watchcommits acl on db4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/db4 From fedora-extras-commits at redhat.com Wed Jul 9 21:23:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:15 +0000 Subject: [pkgdb] db4: pmatilai has requested watchbugzilla Message-ID: <200807092123.m69LNFdF026419@bastion.fedora.phx.redhat.com> Panu Matilainen (pmatilai) has requested the watchbugzilla acl on db4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/db4 From fedora-extras-commits at redhat.com Wed Jul 9 21:23:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:19 +0000 Subject: [pkgdb] db4: pmatilai has requested commit Message-ID: <200807092123.m69LNJNZ026445@bastion.fedora.phx.redhat.com> Panu Matilainen (pmatilai) has requested the commit acl on db4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/db4 From fedora-extras-commits at redhat.com Wed Jul 9 21:23:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:40 +0000 Subject: [pkgdb] compat-db: pmatilai has requested watchbugzilla Message-ID: <200807092123.m69LNFdI026419@bastion.fedora.phx.redhat.com> Panu Matilainen (pmatilai) has requested the watchbugzilla acl on compat-db (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-db From fedora-extras-commits at redhat.com Wed Jul 9 21:23:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:42 +0000 Subject: [pkgdb] db4 had acl change status Message-ID: <200807092123.m69LNJNc026445@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the watchbugzilla acl on db4 (Fedora devel) to Approved for Panu Matilainen (pmatilai) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/db4 From fedora-extras-commits at redhat.com Wed Jul 9 21:23:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:42 +0000 Subject: [pkgdb] compat-db: pmatilai has requested watchcommits Message-ID: <200807092123.m69LNJNf026445@bastion.fedora.phx.redhat.com> Panu Matilainen (pmatilai) has requested the watchcommits acl on compat-db (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-db From fedora-extras-commits at redhat.com Wed Jul 9 21:23:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:45 +0000 Subject: [pkgdb] db4 had acl change status Message-ID: <200807092123.m69LN6Lx026396@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the watchcommits acl on db4 (Fedora devel) to Approved for Panu Matilainen (pmatilai) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/db4 From fedora-extras-commits at redhat.com Wed Jul 9 21:23:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:46 +0000 Subject: [pkgdb] compat-db: pmatilai has requested commit Message-ID: <200807092123.m69LNk78026552@bastion.fedora.phx.redhat.com> Panu Matilainen (pmatilai) has requested the commit acl on compat-db (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-db From fedora-extras-commits at redhat.com Wed Jul 9 21:23:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:23:48 +0000 Subject: [pkgdb] db4 had acl change status Message-ID: <200807092123.m69LNFdL026419@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the commit acl on db4 (Fedora devel) to Approved for Panu Matilainen (pmatilai) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/db4 From fedora-extras-commits at redhat.com Wed Jul 9 21:24:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:24:07 +0000 Subject: [pkgdb] compat-db had acl change status Message-ID: <200807092124.m69LNk7B026552@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the watchbugzilla acl on compat-db (Fedora devel) to Approved for Panu Matilainen (pmatilai) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-db From fedora-extras-commits at redhat.com Wed Jul 9 21:24:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:24:09 +0000 Subject: [pkgdb] compat-db had acl change status Message-ID: <200807092124.m69LN6M2026396@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the watchcommits acl on compat-db (Fedora devel) to Approved for Panu Matilainen (pmatilai) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-db From fedora-extras-commits at redhat.com Wed Jul 9 21:24:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:24:13 +0000 Subject: [pkgdb] compat-db had acl change status Message-ID: <200807092124.m69LNk7E026552@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has set the commit acl on compat-db (Fedora devel) to Approved for Panu Matilainen (pmatilai) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/compat-db From fedora-extras-commits at redhat.com Wed Jul 9 21:36:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:36:05 GMT Subject: rpms/piccolo/devel piccolo.spec,1.3,1.4 Message-ID: <200807092136.m69La564027491@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/piccolo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27420 Modified Files: piccolo.spec Log Message: fix repotag Index: piccolo.spec =================================================================== RCS file: /cvs/pkgs/rpms/piccolo/devel/piccolo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- piccolo.spec 19 Feb 2008 15:37:37 -0000 1.3 +++ piccolo.spec 9 Jul 2008 21:35:20 -0000 1.4 @@ -36,9 +36,9 @@ Summary: Small fast XML parser Name: piccolo Version: 1.04 -Release: 3jpp.2%{?dist} +Release: 3.3%{?dist} Epoch: 0 -License: Apache Software License +License: ASL 2.0 URL: http://piccolo.sourceforge.net/ Group: Text Processing/Markup/XML Source0: piccolo-%{version}-src.zip @@ -143,6 +143,10 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.04-3.3 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.04-3jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 21:36:41 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 9 Jul 2008 21:36:41 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.85-kde#154119.patch, NONE, 1.1 kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, NONE, 1.1 kdebase-workspace.spec, 1.94, 1.95 kdebase-workspace-4.0.83-kde#154119.patch, 1.1, NONE kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch, 1.1, NONE kdebase-workspace-4.0.84-plasma-default-wallpaper.patch, 1.1, NONE Message-ID: <200807092136.m69LafBR027586@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27480/devel Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.85-kde#154119.patch kdebase-workspace-4.0.85-plasma-default-wallpaper.patch Removed Files: kdebase-workspace-4.0.83-kde#154119.patch kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch kdebase-workspace-4.0.84-plasma-default-wallpaper.patch Log Message: * Wed Jul 09 2008 Kevin Kofler 4.0.85-3 - rewrite and reapply plasma-default-wallpaper patch - (no more separate plasma-default-wallpaper-config part) - rediff kde#154119 patch one last time kdebase-workspace-4.0.85-kde#154119.patch: --- NEW FILE kdebase-workspace-4.0.85-kde#154119.patch --- diff -ur kdebase-workspace-4.0.85/libs/plasma/containment.cpp kdebase-workspace-4.0.85-kde#154119/libs/plasma/containment.cpp --- kdebase-workspace-4.0.85/libs/plasma/containment.cpp 2008-07-03 07:05:35.000000000 +0200 +++ kdebase-workspace-4.0.85-kde#154119/libs/plasma/containment.cpp 2008-07-09 23:31:28.000000000 +0200 @@ -397,6 +397,11 @@ desktopMenu.addSeparator(); } + QList containmentAppletActions = contextAppletActions(applet); + foreach(QAction* action, containmentAppletActions) { + desktopMenu.addAction(action); + } + QAction* closeApplet = applet->d->actions.action("remove"); if (!closeApplet) { //unlikely but not impossible kDebug() << "no remove action!!!!!!!!"; @@ -946,6 +951,12 @@ } } +QList Containment::contextAppletActions(Applet *) +{ + //kDebug() << "empty context actions"; + return QList(); +} + KActionCollection& ContainmentPrivate::actions() { return static_cast(q)->d->actions; diff -ur kdebase-workspace-4.0.85/libs/plasma/containment.h kdebase-workspace-4.0.85-kde#154119/libs/plasma/containment.h --- kdebase-workspace-4.0.85/libs/plasma/containment.h 2008-07-03 07:05:35.000000000 +0200 +++ kdebase-workspace-4.0.85-kde#154119/libs/plasma/containment.h 2008-07-09 23:30:11.000000000 +0200 @@ -267,6 +267,14 @@ */ void removeAssociatedWidget(QWidget *widget); + /** + * Returns a list of applet-related QAction instances. + * + * @return A list of actions. The default implementation returns an + * empty list. + **/ + virtual QList contextAppletActions(Applet *applet); + Q_SIGNALS: /** * This signal is emitted when a new applet is created by the containment diff -ur kdebase-workspace-4.0.85/plasma/containments/panel/panel.cpp kdebase-workspace-4.0.85-kde#154119/plasma/containments/panel/panel.cpp --- kdebase-workspace-4.0.85/plasma/containments/panel/panel.cpp 2008-07-03 07:05:38.000000000 +0200 +++ kdebase-workspace-4.0.85-kde#154119/plasma/containments/panel/panel.cpp 2008-07-09 23:30:11.000000000 +0200 @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -51,7 +52,9 @@ m_configureAction(0), m_addPanelAction(0), m_currentSize(QSize(QApplication::desktop()->screenGeometry(screen()).width(), 38)), - m_lastViewGeom() + m_lastViewGeom(), + m_moveAppletAction(0), + m_movedApplet(0) { m_background = new Plasma::PanelSvg(this); m_background->setImagePath("widgets/panel-background"); @@ -103,6 +106,37 @@ return actions; } +QList Panel::contextAppletActions(Applet *applet) +{ + if (!m_moveAppletAction) { + m_moveAppletAction = new QAction( KIcon("transform-move"), i18n("transform-move"), this); + } + + QVariant appletV; + appletV.setValue((QObject*)applet); + m_moveAppletAction->setData(appletV); + + if (!m_movedApplet || (m_movedApplet && m_movedApplet!=applet)) { + m_moveAppletAction->setText(i18n("Start Move of %1", applet->name())); + if (!m_movedApplet) { + m_moveAppletAction->setEnabled(true); + connect(m_moveAppletAction, SIGNAL(triggered(bool)), SLOT(startAppletMove())); + } + else { + m_moveAppletAction->setEnabled(false); + } + } + else { + m_moveAppletAction->setEnabled(true); + m_moveAppletAction->setText(i18n("Stop Move of %1", applet->name())); + connect(m_moveAppletAction, SIGNAL(triggered(bool)), SLOT(stopAppletMove())); + } + + QList actions; + actions << m_moveAppletAction; + return actions; +} + void Panel::backgroundChanged() { constraintsEvent(Plasma::LocationConstraint); @@ -456,6 +490,83 @@ } } +void Panel::startAppletMove() +{ + QAction *action = qobject_cast(sender()); + if (!action) { + return; + } + + m_movedApplet = qobject_cast(action->data().value()); + setAcceptsHoverEvents(true); + setCursor(Qt::SizeAllCursor); +} + +void Panel::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ + if (!m_movedApplet) { + Applet::hoverMoveEvent(event); + return; + } + + QPointF pos = event->pos(); + m_movedApplet->setPos(pos); + + // reposition the applet in our layout + QGraphicsLinearLayout *lay = dynamic_cast(layout()); + + if (!lay) { + return; + } + + Plasma::FormFactor f = formFactor(); + int currentIndex = -1, insertIndex = -1; + + for (int i = 0; i < lay->count(); ++i) { + QGraphicsLayoutItem *sibling = lay->itemAt(i); + if (sibling == m_movedApplet) { + currentIndex = i; + } + QRectF siblingGeometry = sibling->geometry(); + if (f == Plasma::Horizontal) { + qreal middle = (siblingGeometry.left() + siblingGeometry.right()) / 2.0; + if (pos.x() < middle) { + insertIndex = i; + break; + } else if (pos.x() <= siblingGeometry.right()) { + insertIndex = i + 1; + break; + } + } else { // Plasma::Vertical + qreal middle = (siblingGeometry.top() + siblingGeometry.bottom()) / 2.0; + if (pos.y() < middle) { + insertIndex = i; + break; + } else if (pos.y() <= siblingGeometry.bottom()) { + insertIndex = i + 1; + break; + } + } + } + + if (currentIndex != -1 && insertIndex != -1) { + if (insertIndex > currentIndex) { + --insertIndex; + } + if (insertIndex != currentIndex) { + lay->removeAt(currentIndex); + lay->insertItem(insertIndex, m_movedApplet); + } + } +} + +void Panel::stopAppletMove() +{ + setCursor(Qt::ArrowCursor); + setAcceptsHoverEvents(false); + m_movedApplet = 0; +} + K_EXPORT_PLASMA_APPLET(panel, Panel) #include "panel.moc" diff -ur kdebase-workspace-4.0.85/plasma/containments/panel/panel.h kdebase-workspace-4.0.85-kde#154119/plasma/containments/panel/panel.h --- kdebase-workspace-4.0.85/plasma/containments/panel/panel.h 2008-06-18 14:41:39.000000000 +0200 +++ kdebase-workspace-4.0.85-kde#154119/plasma/containments/panel/panel.h 2008-07-09 23:30:11.000000000 +0200 @@ -49,6 +49,9 @@ const QRect &contentsRect); void paintBackground(QPainter *painter, const QRect &contentsRect); + QList contextAppletActions(Applet *applet); + void hoverMoveEvent(QGraphicsSceneHoverEvent *event); + protected: void saveState(KConfigGroup &config) const; @@ -59,6 +62,9 @@ void appletRemoved(Plasma::Applet* applet); void addPanel(); + void startAppletMove(); + void stopAppletMove(); + private: /** * update the formfactor based on the location @@ -73,6 +79,8 @@ Plasma::PanelSvg *m_background; QAction* m_configureAction; QAction* m_addPanelAction; + QAction* m_moveAppletAction; + Applet *m_movedApplet; //cached values QSize m_currentSize; kdebase-workspace-4.0.85-plasma-default-wallpaper.patch: --- NEW FILE kdebase-workspace-4.0.85-plasma-default-wallpaper.patch --- diff -ur kdebase-workspace-4.0.85/libs/plasma/theme.cpp kdebase-workspace-4.0.85-plasma-default-wallpaper/libs/plasma/theme.cpp --- kdebase-workspace-4.0.85/libs/plasma/theme.cpp 2008-07-03 07:05:35.000000000 +0200 +++ kdebase-workspace-4.0.85-plasma-default-wallpaper/libs/plasma/theme.cpp 2008-07-09 23:16:58.000000000 +0200 @@ -94,6 +94,7 @@ KSharedConfigPtr colors; KConfigGroup cfg; QFont generalFont; + QString globalDefaultWallpaper; QString defaultWallpaperTheme; QString defaultWallpaperSuffix; int defaultWallpaperWidth; @@ -235,6 +236,10 @@ //kDebug() << "we're going for..." << colorsFile << "*******************"; // load the wallpaper settings, if any + KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc"); + KConfigGroup group = KConfigGroup(config, "Defaults"); + d->globalDefaultWallpaper = group.readEntry("wallpaper", (const char *) 0); + KConfig metadata(KStandardDirs::locate("data", "desktoptheme/" + theme + "/metadata.desktop")); KConfigGroup cg; if (metadata.hasGroup("Wallpaper")) { @@ -247,8 +252,8 @@ cg = d->config(); } - d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME); - d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); + d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", d->globalDefaultWallpaper.isEmpty() ? DEFAULT_WALLPAPER_THEME : (const char *) 0); + d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", d->globalDefaultWallpaper.isEmpty() ? DEFAULT_WALLPAPER_SUFFIX : (const char *) 0); d->defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); d->defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); @@ -300,7 +305,10 @@ QString fullPath; QString image = d->defaultWallpaperTheme; - image.append("/contents/images/%1x%2").append(d->defaultWallpaperSuffix); + if (image.isEmpty() && !d->globalDefaultWallpaper.isEmpty()) + image = d->globalDefaultWallpaper; + else + image.append("/contents/images/%1x%2").append(d->defaultWallpaperSuffix); QString defaultImage = image.arg(d->defaultWallpaperWidth).arg(d->defaultWallpaperHeight); if (size.isValid()) { Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- kdebase-workspace.spec 9 Jul 2008 20:03:24 -0000 1.94 +++ kdebase-workspace.spec 9 Jul 2008 21:35:56 -0000 1.95 @@ -2,7 +2,7 @@ Name: kdebase-workspace Version: 4.0.85 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -20,20 +20,17 @@ #??441062: packagekit tools do not show icons correctly on KDE Patch8: kdebase-workspace-4.0.3-krdb.patch Patch10: kdebase-workspace-4.0.72-klipper-url.patch +# allows to define a default wallpaper via plasmarc:wallpaper +Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch # upstream patches: # plasma-4.0-openSUSE patches: -# http://websvn.kde.org/?view=rev&revision=795438 -# allows to define a default wallpaper via plasmarc:wallpaper -Patch200: kdebase-workspace-4.0.84-plasma-default-wallpaper.patch # http://websvn.kde.org/?view=rev&revision=791852 # from Plasma review board: http://mattr.info/r/261/ # allows moving plasmoids on panels (#439587, kde#154119, kde#158301) -Patch201: kdebase-workspace-4.0.83-kde#154119.patch -# #444141: Initial wallpaper chooser has "EOS" preselected but wallpaper is "Fedora Waves" -#??http://websvn.kde.org/?view=rev&revision=801651 -Patch203: kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch +# will no longer be needed with the next snapshot +Patch201: kdebase-workspace-4.0.85-kde#154119.patch Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151 # (gtk) systray icons @@ -144,15 +141,13 @@ %patch7 -p0 -b .timedate-kcm %patch8 -p0 -b .krdb %patch10 -p1 -b .klipper-url +%patch11 -p1 -b .plasma-default-wallpaper # upstream patches # plasma-4.0-openSUSE patches: -# FIXME -#patch200 -p1 -b .plasma-default-wallpaper -#patch203 -p1 -b .plasma-default-wallpaper-config -# no longer needed (?) -#patch201 -p1 -b .kde#154119 +# patch201 will no longer be needed with the next snapshot: +%patch201 -p1 -b .kde#154119 %patch204 -p1 -b .kickoff-suspend pushd plasma/applets/systemtray/ %patch205 -p0 -b .kde#164786 @@ -289,6 +284,11 @@ %changelog +* Wed Jul 09 2008 Kevin Kofler 4.0.85-3 +- rewrite and reapply plasma-default-wallpaper patch +- (no more separate plasma-default-wallpaper-config part) +- rediff kde#154119 patch one last time + * Wed Jul 09 2008 Rex Dieter 4.0.85-2 - systray icon patch (kde#164786) --- kdebase-workspace-4.0.83-kde#154119.patch DELETED --- --- kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch DELETED --- --- kdebase-workspace-4.0.84-plasma-default-wallpaper.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 9 21:39:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:39:20 GMT Subject: rpms/plexus-archiver/devel plexus-archiver.spec,1.3,1.4 Message-ID: <200807092139.m69LdKZ7027904@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-archiver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27822 Modified Files: plexus-archiver.spec Log Message: fix repotag Index: plexus-archiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-archiver/devel/plexus-archiver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plexus-archiver.spec 19 Feb 2008 17:51:40 -0000 1.3 +++ plexus-archiver.spec 9 Jul 2008 21:38:37 -0000 1.4 @@ -36,10 +36,10 @@ Name: plexus-archiver Version: 1.0 -Release: 0.2.a7.1jpp.1%{?dist} +Release: 0.2.a7.1.2%{?dist} Epoch: 0 Summary: Plexus Archiver Component -License: Apache Software License +License: MIT and ASL 2.0 Group: Development/Java URL: http://plexus.codehaus.org/ Source0: plexus-archiver-src.tar.gz @@ -152,6 +152,10 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.2.a7.1.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.0-0.2.a7.1jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 21:41:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:41:05 GMT Subject: rpms/plexus-bsh-factory/devel plexus-bsh-factory.spec,1.7,1.8 Message-ID: <200807092141.m69Lf55S028091@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-bsh-factory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27967 Modified Files: plexus-bsh-factory.spec Log Message: fix repotag Index: plexus-bsh-factory.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-bsh-factory/devel/plexus-bsh-factory.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plexus-bsh-factory.spec 28 Feb 2008 16:55:52 -0000 1.7 +++ plexus-bsh-factory.spec 9 Jul 2008 21:39:36 -0000 1.8 @@ -39,10 +39,10 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.2.a7s.1jpp.6%{?dist} +Release: 0.2.a7s.1.7%{?dist} Epoch: 0 Summary: Plexus Bsh component factory -License: MIT-Style +License: Unknown Group: Development/Java URL: http://plexus.codehaus.org/ Source0: %{name}-src.tar.gz @@ -210,6 +210,10 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a7s.1.7 +- drop repotag +- label license as Unknown (hopefully, upstream will get back to us before the sun explodes) + * Thu Feb 28 2008 Deepak Bhole 1.0-0.2.a7s.1jpp.6 - Rebuild From fedora-extras-commits at redhat.com Wed Jul 9 21:38:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:38:20 GMT Subject: rpms/plexus-appserver/devel plexus-appserver.spec,1.6,1.7 Message-ID: <200807092138.m69LcK7f027749@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-appserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27694 Modified Files: plexus-appserver.spec Log Message: fix repotag Index: plexus-appserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-appserver/devel/plexus-appserver.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plexus-appserver.spec 29 May 2008 15:28:45 -0000 1.6 +++ plexus-appserver.spec 9 Jul 2008 21:37:30 -0000 1.7 @@ -42,7 +42,7 @@ Name: plexus-appserver Version: 1.0 -Release: 0.2.a5.2jpp.5%{?dist} +Release: 0.2.a5.2.6%{?dist} Epoch: 0 Summary: Plexus Application Server License: ASL 2.0 and MIT @@ -199,6 +199,9 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a5.2.6 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-0.2.a5.2jpp.5 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 21:37:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:37:13 GMT Subject: rpms/plexus-ant-factory/devel plexus-ant-factory.spec,1.8,1.9 Message-ID: <200807092137.m69LbDrH027631@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-ant-factory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27567 Modified Files: plexus-ant-factory.spec Log Message: fix repotag Index: plexus-ant-factory.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- plexus-ant-factory.spec 29 May 2008 15:25:35 -0000 1.8 +++ plexus-ant-factory.spec 9 Jul 2008 21:36:22 -0000 1.9 @@ -41,7 +41,7 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.2.a1.1jpp.7%{?dist} +Release: 0.2.a1.1.8%{?dist} Epoch: 0 Summary: Plexus Ant component factory # Email from copyright holder confirms license. @@ -102,8 +102,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(pre): /bin/rm,/bin/ls -Requires(post): /bin/rm +# for /bin/rm and /bin/ls +Requires(pre): coreutils +Requires(post): coreutils %description javadoc Javadoc for %{name}. @@ -215,6 +216,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1.0-0.2.a1.1.8 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-0.2.a1.1jpp.7 - include proof of license - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 21:41:45 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Wed, 9 Jul 2008 21:41:45 GMT Subject: rpms/plymouth/devel restore-color-palette.patch, NONE, 1.1 plymouth.spec, 1.19, 1.20 Message-ID: <200807092141.m69LfjAf028209@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28079 Modified Files: plymouth.spec Added Files: restore-color-palette.patch Log Message: - add ctrl-r to rotate text color palette back to stock values restore-color-palette.patch: --- NEW FILE restore-color-palette.patch --- commit d10b3eb6da0521dc1bb0a2a1d62f619a2460d73c Author: Ray Strode Date: Wed Jul 9 17:36:44 2008 -0400 Add debugging feature to restore text palette diff --git a/src/libplybootsplash/ply-window.c b/src/libplybootsplash/ply-window.c index 90f9cc6..d718203 100644 --- a/src/libplybootsplash/ply-window.c +++ b/src/libplybootsplash/ply-window.c @@ -45,6 +45,7 @@ #include "ply-logger.h" #include "ply-utils.h" +#define KEY_CTRL_P ('\100' ^'P') #define KEY_CTRL_T ('\100' ^'T') #define KEY_CTRL_U ('\100' ^'U') #define KEY_CTRL_W ('\100' ^'W') @@ -143,6 +144,40 @@ ply_window_new (int vt_number) return window; } +static bool +ply_window_look_up_color_palette (ply_window_t *window) +{ + if (ioctl (window->tty_fd, GIO_CMAP, window->color_palette) < 0) + return false; + + return true; +} + +static bool +ply_window_change_color_palette (ply_window_t *window) +{ + if (ioctl (window->tty_fd, PIO_CMAP, window->color_palette) < 0) + return false; + + return true; +} + +static void +ply_window_save_color_palette (ply_window_t *window) +{ + memcpy (window->original_color_palette, window->color_palette, + TEXT_PALETTE_SIZE); +} + +static void +ply_window_restore_color_palette (ply_window_t *window) +{ + memcpy (window->color_palette, window->original_color_palette, + TEXT_PALETTE_SIZE); + + ply_window_change_color_palette (window); +} + static void process_backspace (ply_window_t *window) { @@ -188,6 +223,12 @@ process_keyboard_input (ply_window_t *window, { switch (key) { + + case KEY_CTRL_P: + ply_trace ("restore text palette to original value!"); + ply_window_restore_color_palette (window); + return; + case KEY_CTRL_T: ply_trace ("toggle text mode!"); window->should_force_text_mode = !window->should_force_text_mode; @@ -362,40 +403,6 @@ ply_window_look_up_geometry (ply_window_t *window) return true; } -static bool -ply_window_look_up_color_palette (ply_window_t *window) -{ - if (ioctl (window->tty_fd, GIO_CMAP, window->color_palette) < 0) - return false; - - return true; -} - -static bool -ply_window_change_color_palette (ply_window_t *window) -{ - if (ioctl (window->tty_fd, PIO_CMAP, window->color_palette) < 0) - return false; - - return true; -} - -static void -ply_window_save_color_palette (ply_window_t *window) -{ - memcpy (window->original_color_palette, window->color_palette, - TEXT_PALETTE_SIZE); -} - -static void -ply_window_restore_color_palette (ply_window_t *window) -{ - memcpy (window->color_palette, window->original_color_palette, - TEXT_PALETTE_SIZE); - - ply_window_change_color_palette (window); -} - bool ply_window_open (ply_window_t *window) { Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plymouth.spec 8 Jul 2008 17:53:40 -0000 1.19 +++ plymouth.spec 9 Jul 2008 21:40:58 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -16,6 +16,7 @@ Requires: system-plymouth-plugin >= %{version}-%{release} Patch0: plymouth-0.5.0-fix-ppc.patch +Patch1: restore-color-palette.patch %description Plymouth provides an attractive graphical boot animation in @@ -69,6 +70,7 @@ %setup -q %patch0 -p1 -b .fix-ppc +%patch1 -p1 -b .restore-color-palette %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -174,6 +176,9 @@ %{_libdir}/plymouth/spinfinity.so %changelog +* Wed Jul 9 2008 Ray Strode - 0.5.0-4 +- add ctrl-r to rotate text color palette back to stock values + * Tue Jul 8 2008 Ray Strode - 0.5.0-3 - Fix populate script on ppc (bug 454353) From fedora-extras-commits at redhat.com Wed Jul 9 21:42:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:42:15 GMT Subject: rpms/plexus-cdc/devel plexus-cdc.spec,1.7,1.8 Message-ID: <200807092142.m69LgFgf028285@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-cdc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28180 Modified Files: plexus-cdc.spec Log Message: fix repotag Index: plexus-cdc.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plexus-cdc.spec 29 May 2008 15:38:30 -0000 1.7 +++ plexus-cdc.spec 9 Jul 2008 21:41:26 -0000 1.8 @@ -42,7 +42,7 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.2.a4.1jpp.5%{?dist} +Release: 0.2.a4.1.6%{?dist} Epoch: 0 Summary: Plexus Component Descriptor Creator License: MIT @@ -192,6 +192,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a4.1.6 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-0.2.a4.1jpp.5 - Fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 21:43:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:43:16 GMT Subject: rpms/plexus-compiler/devel plexus-compiler.spec,1.2,1.3 Message-ID: <200807092143.m69LhGeL028461@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-compiler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28371 Modified Files: plexus-compiler.spec Log Message: fix repotag Index: plexus-compiler.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-compiler/devel/plexus-compiler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plexus-compiler.spec 15 Mar 2007 17:36:39 -0000 1.2 +++ plexus-compiler.spec 9 Jul 2008 21:42:30 -0000 1.3 @@ -32,7 +32,7 @@ Name: plexus-compiler Version: 1.5.2 -Release: 2jpp.2%{?dist} +Release: 2.3%{?dist} Epoch: 0 Summary: Compiler call initiators for Plexus License: MIT @@ -276,6 +276,9 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.5.2-2.3 +- drop repotag + * Thu Mar 15 2007 Deepak Bhole - 0:1.5.2-2jpp.2 - Fix bug in spec that prevented unversioned symlink creation From fedora-extras-commits at redhat.com Wed Jul 9 21:44:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:44:17 GMT Subject: rpms/plexus-container-default/devel plexus-container-default.spec, 1.1, 1.2 Message-ID: <200807092144.m69LiHR8028573@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-container-default/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28520 Modified Files: plexus-container-default.spec Log Message: fix repotag Index: plexus-container-default.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-container-default/devel/plexus-container-default.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plexus-container-default.spec 12 Mar 2007 15:10:49 -0000 1.1 +++ plexus-container-default.spec 9 Jul 2008 21:43:31 -0000 1.2 @@ -39,10 +39,10 @@ Name: plexus-container-default Version: 1.0 -Release: 0.1.a8.1jpp.1%{?dist} +Release: 0.1.a8.1.2%{?dist} Epoch: 0 Summary: Default Plexus Container -License: Apache Software License and MIT +License: ASL 2.0 and MIT Group: Development/Libraries URL: http://plexus.codehaus.org/ # svn export \ @@ -148,6 +148,10 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a8.1.2 +- drop repotag +- fix license tag + * Fri Mar 09 2007 Deepak Bhole 0:1.0-0.1.a8.1jpp.1 - From Andrew Overholt: - Remove javadoc symlinking From fedora-extras-commits at redhat.com Wed Jul 9 21:45:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:45:17 GMT Subject: rpms/plexus-i18n/devel plexus-i18n.spec,1.3,1.4 Message-ID: <200807092145.m69LjHBm028700@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-i18n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28630 Modified Files: plexus-i18n.spec Log Message: fix repotag Index: plexus-i18n.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-i18n/devel/plexus-i18n.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plexus-i18n.spec 28 Feb 2008 16:00:03 -0000 1.3 +++ plexus-i18n.spec 9 Jul 2008 21:44:34 -0000 1.4 @@ -35,7 +35,7 @@ Name: plexus-i18n Version: 1.0 -Release: 0.b6.5jpp.2%{?dist} +Release: 0.b6.5.3%{?dist} Epoch: 0 Summary: Plexus I18N Component License: ASL 2.0 @@ -213,6 +213,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.b6.5.3 +- drop repotag + * Wed Feb 27 2008 Deepak Bhole - 0:1.0-0.b6.5jpp.2 - Build with maven From fedora-extras-commits at redhat.com Wed Jul 9 21:49:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:49:30 GMT Subject: rpms/plexus-utils/devel plexus-utils.spec,1.1,1.2 Message-ID: <200807092149.m69LnUCZ029093@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29063 Modified Files: plexus-utils.spec Log Message: fix repotag Index: plexus-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-utils/devel/plexus-utils.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plexus-utils.spec 12 Mar 2007 15:03:37 -0000 1.1 +++ plexus-utils.spec 9 Jul 2008 21:48:40 -0000 1.2 @@ -36,10 +36,10 @@ Name: plexus-utils Version: 1.2 -Release: 2jpp.1%{?dist} +Release: 2.2%{?dist} Epoch: 0 Summary: Plexus Common Utilities -License: Apache Software License +License: ASL 1.1 and ASL 2.0 and MIT Group: Development/Java URL: http://plexus.codehaus.org/ # svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-utils-1.2/ @@ -129,6 +129,10 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2-2.2 +- fix license tag +- drop repotag + * Mon Feb 20 2007 Deepak Bhole - 0:1.2-2jpp.1.fc7 - Fix spec per Fedora guidelines From fedora-extras-commits at redhat.com Wed Jul 9 21:50:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:50:38 GMT Subject: rpms/plexus-velocity/devel plexus-velocity.spec,1.2,1.3 Message-ID: <200807092150.m69LocWE029184@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-velocity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29146 Modified Files: plexus-velocity.spec Log Message: fix repotag Index: plexus-velocity.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plexus-velocity.spec 19 Feb 2008 15:38:28 -0000 1.2 +++ plexus-velocity.spec 9 Jul 2008 21:49:49 -0000 1.3 @@ -41,7 +41,7 @@ Name: plexus-velocity Version: 1.1.2 -Release: 3jpp.1%{?dist} +Release: 3.2%{?dist} Epoch: 0 Summary: Plexus Velocity Component License: MIT @@ -194,6 +194,9 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1.2-3.2 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.1.2-3jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 21:51:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:51:38 GMT Subject: rpms/plexus-xmlrpc/devel plexus-xmlrpc.spec,1.9,1.10 Message-ID: <200807092151.m69Lpcv0029278@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-xmlrpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29239 Modified Files: plexus-xmlrpc.spec Log Message: fix repotag Index: plexus-xmlrpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-xmlrpc/devel/plexus-xmlrpc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plexus-xmlrpc.spec 29 May 2008 15:44:21 -0000 1.9 +++ plexus-xmlrpc.spec 9 Jul 2008 21:50:53 -0000 1.10 @@ -42,7 +42,7 @@ Name: plexus-xmlrpc Version: 1.0 -Release: 0.2.b4.2jpp.8%{?dist} +Release: 0.2.b4.2.9%{?dist} Epoch: 0 Summary: Plexus XML RPC Component License: ASL 1.1 and MIT @@ -209,6 +209,9 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.b4.2.9 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-0.2.b4.2jpp.8 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 21:52:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:52:39 GMT Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.14,1.15 Message-ID: <200807092152.m69Lqd3a029379@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/postgresql-jdbc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29337 Modified Files: postgresql-jdbc.spec Log Message: fix repotag Index: postgresql-jdbc.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- postgresql-jdbc.spec 12 Feb 2008 17:09:37 -0000 1.14 +++ postgresql-jdbc.spec 9 Jul 2008 21:51:55 -0000 1.15 @@ -38,7 +38,7 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc Version: 8.3.603 -Release: 1jpp%{?dist} +Release: 1.1%{?dist} Epoch: 0 License: BSD Group: Applications/Databases @@ -131,6 +131,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 8.3.603-1.1 +- drop repotag + * Tue Feb 12 2008 Tom Lane 8.3.603-1jpp - Update to build 8.3-603 From fedora-extras-commits at redhat.com Wed Jul 9 21:53:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:53:41 GMT Subject: rpms/puretls/devel puretls.spec,1.16,1.17 Message-ID: <200807092153.m69Lrfsq029492@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/puretls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29438 Modified Files: puretls.spec Log Message: fix repotag Index: puretls.spec =================================================================== RCS file: /cvs/pkgs/rpms/puretls/devel/puretls.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- puretls.spec 19 Feb 2008 15:39:35 -0000 1.16 +++ puretls.spec 9 Jul 2008 21:52:56 -0000 1.17 @@ -36,9 +36,9 @@ Name: puretls Version: 0.9 -Release: 0.2.%{beta}.5jpp.1%{?dist} +Release: 0.2.%{beta}.5.2%{?dist} Summary: Java implementation of SSLv3 and TLSv1 -License: BSD style +License: BSD Group: Development/Libraries/Java Source0: puretls-0.9b5.tar.gz #http://www.rtfm.com/cgi-bin/distrib.cgi?puretls-0.9b5.tar.gz @@ -210,6 +210,10 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0.9-0.2.b5.5.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.9-0.2.b5.5jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 9 21:54:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:54:07 +0000 Subject: [pkgdb] ekg2 had groupAcl changed Message-ID: <200807092154.m69Ls7QA028691@bastion.fedora.phx.redhat.com> Dominik Mierzejewski (rathann) has set the commit acl on ekg2 (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ekg2 From fedora-extras-commits at redhat.com Wed Jul 9 21:54:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:54:09 GMT Subject: rpms/mx4j/devel mx4j.spec,1.64,1.65 Message-ID: <200807092154.m69Ls9Bg029548@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mx4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29468 Modified Files: mx4j.spec Log Message: really fix license tag Index: mx4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/mx4j/devel/mx4j.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- mx4j.spec 9 Jul 2008 20:58:39 -0000 1.64 +++ mx4j.spec 9 Jul 2008 21:53:21 -0000 1.65 @@ -40,10 +40,10 @@ Name: mx4j Version: 3.0.1 -Release: 7.5%{?dist} +Release: 7.6%{?dist} Epoch: 1 Summary: Open source implementation of JMX Java API -License: MX4J +License: ASL 1.1 Group: Development/Libraries/Java Source0: %{name}-%{version}-src.tar.gz Source1: %{name}-build.policy @@ -286,6 +286,9 @@ %doc dist/docs/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 1:3.0.1-7.6 +- really fix license tag + * Wed Jul 9 2008 Tom "spot" Callaway - 1:3.0.1-7.5 - drop repotag - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 21:54:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:54:43 +0000 Subject: [pkgdb] ekg2 had groupAcl changed Message-ID: <200807092154.m69LshSU028749@bastion.fedora.phx.redhat.com> Dominik Mierzejewski (rathann) has set the commit acl on ekg2 (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ekg2 From fedora-extras-commits at redhat.com Wed Jul 9 21:54:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 09 Jul 2008 21:54:46 +0000 Subject: [pkgdb] ekg2 had groupAcl changed Message-ID: <200807092154.m69LskHx028769@bastion.fedora.phx.redhat.com> Dominik Mierzejewski (rathann) has set the commit acl on ekg2 (Fedora 9) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ekg2 From fedora-extras-commits at redhat.com Wed Jul 9 21:55:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:55:30 GMT Subject: rpms/qdox/devel qdox.spec,1.2,1.3 Message-ID: <200807092155.m69LtUTK029641@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/qdox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29604 Modified Files: qdox.spec Log Message: fix repotag Index: qdox.spec =================================================================== RCS file: /cvs/pkgs/rpms/qdox/devel/qdox.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qdox.spec 22 Feb 2008 23:06:01 -0000 1.2 +++ qdox.spec 9 Jul 2008 21:54:46 -0000 1.3 @@ -31,9 +31,9 @@ Summary: Extract class/interface/method definitions from sources Name: qdox Version: 1.5 -Release: 2jpp.2%{?dist} +Release: 2.3%{?dist} Epoch: 0 -License: Apache Software License style +License: ASL 1.1 URL: http://qdox.codehaus.org/ Group: Development/Libraries/Java Source0: qdox-1.5-src.tar.gz @@ -122,6 +122,10 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.5-2.3 +- drop repotag +- fix license tag + * Fri Feb 22 2008 Matt Wringe - 0:1.5-2jpp.2 - add a patch (qdox-flex.patch) so that qdox will build with the new jflex. From fedora-extras-commits at redhat.com Wed Jul 9 21:56:46 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 9 Jul 2008 21:56:46 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1569,1.1570 Message-ID: <200807092156.m69Luk5F029771@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#454682 expand macro to get correct name Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1569 retrieving revision 1.1570 diff -u -r1.1569 -r1.1570 --- openoffice.org.spec 9 Jul 2008 16:05:55 -0000 1.1569 +++ openoffice.org.spec 9 Jul 2008 21:55:58 -0000 1.1570 @@ -3586,6 +3586,9 @@ %changelog * Wed Jul 09 2008 Caolan McNamara - 1:3.0.0-0.23-2 - Resolves: rhbz#452385 add postgress-jdbc to default classpath +- Resolves: rhbz#454682 expand macro to get correct name for + inconsistent, unnecessarily complicated, redundant and nigh universially + hated arch-dependant naming scheme for presenter-screen extension * Mon Jul 07 2008 Caolan McNamara - 1:3.0.0-0.23-1 - next version From fedora-extras-commits at redhat.com Wed Jul 9 21:58:31 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 9 Jul 2008 21:58:31 GMT Subject: rpms/gnash/F-9 gnash-0.8.3-glib_link.patch, NONE, 1.1 gnash-0.8.3-manual.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gnash.spec, 1.20, 1.21 sources, 1.6, 1.7 Message-ID: <200807092158.m69LwVFT029903@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/gnash/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29851 Modified Files: .cvsignore gnash.spec sources Added Files: gnash-0.8.3-glib_link.patch gnash-0.8.3-manual.patch Log Message: sync with devel gnash-0.8.3-glib_link.patch: --- NEW FILE gnash-0.8.3-glib_link.patch --- diff -up gnash-0.8.3/plugin/Makefile.am.glib_link gnash-0.8.3/plugin/Makefile.am --- gnash-0.8.3/plugin/Makefile.am.glib_link 2008-06-25 09:55:24.000000000 +0200 +++ gnash-0.8.3/plugin/Makefile.am 2008-06-25 09:56:07.000000000 +0200 @@ -100,6 +100,7 @@ libgnashplugin_la_SOURCES = plugin.cpp mozilla-sdk/np_entry.cpp libgnashplugin_la_LIBADD = \ + $(GLIB_LIBS) \ $(NULL) if PLUGIN_LINK_UNDEFINED diff -up gnash-0.8.3/plugin/Makefile.in.glib_link gnash-0.8.3/plugin/Makefile.in --- gnash-0.8.3/plugin/Makefile.in.glib_link 2008-06-25 09:55:38.000000000 +0200 +++ gnash-0.8.3/plugin/Makefile.in 2008-06-25 09:56:31.000000000 +0200 @@ -474,6 +474,7 @@ noinst_HEADERS = plugin.h \ @NSAPI_TRUE@@WIN32_FALSE@ mozilla-sdk/np_entry.cpp @NSAPI_TRUE@@WIN32_FALSE at libgnashplugin_la_LIBADD = \ + at NSAPI_TRUE@@WIN32_FALSE@ $(GLIB_LIBS) \ @NSAPI_TRUE@@WIN32_FALSE@ $(NULL) @NSAPI_TRUE@@PLUGIN_LINK_UNDEFINED_FALSE@@WIN32_FALSE at libgnashplugin_la_LDFLAGS = -module -avoid-version -L$(plugindir) gnash-0.8.3-manual.patch: --- NEW FILE gnash-0.8.3-manual.patch --- diff -up gnash-0.8.3/doc/C/gnashref.xml.manual gnash-0.8.3/doc/C/gnashref.xml --- gnash-0.8.3/doc/C/gnashref.xml.manual 2008-06-23 00:57:00.000000000 +0200 +++ gnash-0.8.3/doc/C/gnashref.xml 2008-06-23 00:59:25.000000000 +0200 @@ -76,7 +76,7 @@ --> &legal; - &revisionhistory; + This manual describes version &appversion; of &appname;. @@ -96,15 +96,15 @@ - &internals; + &bugreport; - &extensions; + - &rtmp; - &plugin; + + diff -up gnash-0.8.3/doc/C/gnashuser.xml.manual gnash-0.8.3/doc/C/gnashuser.xml --- gnash-0.8.3/doc/C/gnashuser.xml.manual 2008-06-23 00:54:42.000000000 +0200 +++ gnash-0.8.3/doc/C/gnashuser.xml 2008-06-23 00:56:45.000000000 +0200 @@ -24,7 +24,7 @@ - + ] > @@ -71,7 +71,7 @@ &usage; &installation; &bugreport; - &glossary; + Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnash/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Mar 2008 00:10:36 -0000 1.6 +++ .cvsignore 9 Jul 2008 21:57:40 -0000 1.7 @@ -1 +1 @@ -gnash-0.8.2.tar.gz +gnash-0.8.3.tar.gz Index: gnash.spec =================================================================== RCS file: /cvs/extras/rpms/gnash/F-9/gnash.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnash.spec 20 Jun 2008 14:42:39 -0000 1.20 +++ gnash.spec 9 Jul 2008 21:57:40 -0000 1.21 @@ -1,12 +1,14 @@ Name: gnash -Version: 0.8.2 -Release: 4%{?dist} +Version: 0.8.3 +Release: 2%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia License: GPLv3+ URL: http://www.gnu.org/software/gnash/ Source0: http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz +Patch0: gnash-0.8.3-manual.patch +Patch1: gnash-0.8.3-glib_link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel @@ -21,6 +23,7 @@ BuildRequires: kdelibs3-devel BuildRequires: gtkglext-devel BuildRequires: docbook2X +BuildRequires: %{_bindir}/docbook2pdf BuildRequires: gstreamer-devel >= 0.10 BuildRequires: scrollkeeper @@ -34,10 +37,10 @@ %description Gnash is capable of reading up to SWF v9 files and opcodes, but primarily supports SWF v7, with better SWF v8 and v9 support under heavy development. -With the 0.8.2 release, Gnash includes initial parser support for SWF v8 -and v9. Not all ActionScript 2 classes are implemented yet, but all of -the most heavily used ones are. Many ActionScript 2 classes are partially -implemented; there is support for all of the commonly used methods of each +Gnash includes initial parser support for SWF v8 and v9. Not all +ActionScript 2 classes are implemented yet, but all of the most heavily +used ones are. Many ActionScript 2 classes are partially implemented; +there is support for all of the commonly used methods of each class. %package plugin @@ -72,6 +75,8 @@ %prep %setup -q +%patch0 -p1 -b .manual +%patch1 -p1 -b .glib_link chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} @@ -83,11 +88,15 @@ [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh # --enable-ghelp is disabled %configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ - --disable-docbook --enable-media=GST \ + --enable-docbook --enable-ghelp --enable-media=GST \ --disable-dependency-tracking --disable-rpath \ --enable-cygnal \ --enable-gui=gtk,kde,sdl,fb \ - --with-qtdir=$QTDIR + --with-qtdir=$QTDIR \ + --with-kde-plugindir=%{_libdir}/kde3 \ + --with-kde-servicesdir=%{_datadir}/services \ + --with-kde-configdir=%{_datadir}/config \ + --with-kde-appsdatadir=%{_datadir}/apps/klash #doesn't work currently: %%{?_smp_mflags} make @@ -95,15 +104,22 @@ %install rm -rf $RPM_BUILD_ROOT make install install-plugins \ - DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' + DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' \ + KDE_PLUGINDIR=%{_libdir}/kde3 \ + KDE_SERVICESDIR=%{_datadir}/services \ + KDE_CONFIGDIR=%{_datadir}/config \ + KDE_APPSDATADIR=%{_datadir}/apps/klash rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la -#rm \ -# $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \ +rm \ + $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashamf.so \ + $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashbase.so \ + $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashmedia.so \ + $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashnet.so \ + $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashserver.so +rm $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so* # $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \ -# $RPM_BUILD_ROOT%{_libdir}/libgnashbase.so \ # $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \ # $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \ -# $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \ # $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \ # $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so #rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper @@ -125,17 +141,17 @@ # $RPM_BUILD_ROOT%{_bindir}/cygnal # cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/ -mkdir -p $RPM_BUILD_ROOT%{_infodir}/ -cp doc/C/gnash_*.info $RPM_BUILD_ROOT%{_infodir}/ +#mkdir -p $RPM_BUILD_ROOT%{_infodir}/ +#cp doc/C/gnash_*.info $RPM_BUILD_ROOT%{_infodir}/ rm -rf __dist_docs mkdir __dist_docs mv $RPM_BUILD_ROOT%{_datadir}/doc/gnash/* __dist_docs/ rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash -cp doc/C/gnash*.html __dist_docs/ +#cp doc/C/gnash*.html __dist_docs/ -chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \ - $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo +#chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \ +# $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo %find_lang %{name} @@ -172,6 +188,8 @@ #%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html #%doc doc/C/images %doc __dist_docs/* +%config(noreplace) %{_sysconfdir}/gnashpluginrc +%config(noreplace) %{_sysconfdir}/gnashrc %{_bindir}/dumpshm %{_bindir}/fb-gnash %{_bindir}/gtk-gnash @@ -208,8 +226,11 @@ %{_mandir}/man1/cygnal.1* %changelog -* Fri Jun 20 2008 Martin Stransky 0.8.2-4 -- rebuild against new xulrunner +* Wed Jun 25 2008 Patrice Dumas 0.8.3-2 +- add glib in the link, thanks Daniel Drake (#452767) + +* Sun Jun 22 2008 Patrice Dumas 0.8.3-1 +- update to 0.8.3 * Wed Apr 9 2008 Patrice Dumas 0.8.2-3 - ship libklashpart (#441601) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnash/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Mar 2008 00:10:36 -0000 1.6 +++ sources 9 Jul 2008 21:57:40 -0000 1.7 @@ -1 +1 @@ -24dfad0b553254faa06cf1bc1a43fef9 gnash-0.8.2.tar.gz +126be87b3866abdd7a9ea32fcb44363e gnash-0.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 21:46:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:46:20 GMT Subject: rpms/plexus-interactivity/devel plexus-interactivity.spec,1.2,1.3 Message-ID: <200807092146.m69LkK9x028827@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-interactivity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28773 Modified Files: plexus-interactivity.spec Log Message: fix repotag Index: plexus-interactivity.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-interactivity/devel/plexus-interactivity.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plexus-interactivity.spec 13 Mar 2007 23:44:17 -0000 1.2 +++ plexus-interactivity.spec 9 Jul 2008 21:45:33 -0000 1.3 @@ -39,10 +39,10 @@ Name: plexus-interactivity Version: 1.0 -Release: 0.1.a5.2jpp.2%{?dist} +Release: 0.1.a5.2.3%{?dist} Epoch: 0 Summary: Plexus Interactivity Handler Component -License: Apache Software License +License: MIT Group: Development/Libraries URL: http://plexus.codehaus.org/ # svn export \ @@ -184,6 +184,10 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.1.a5.2.3 +- drop repotag +- fix license tag + * Tue Mar 13 2007 Matt Wringe 1.0-0.1.a5.2jpp.2 - Add missing build requires for ant-nodeps From fedora-extras-commits at redhat.com Wed Jul 9 21:47:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:47:21 GMT Subject: rpms/plexus-maven-plugin/devel plexus-maven-plugin.spec,1.5,1.6 Message-ID: <200807092147.m69LlL19028913@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28880 Modified Files: plexus-maven-plugin.spec Log Message: fix repotag Index: plexus-maven-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plexus-maven-plugin.spec 28 Feb 2008 16:50:53 -0000 1.5 +++ plexus-maven-plugin.spec 9 Jul 2008 21:46:35 -0000 1.6 @@ -38,7 +38,7 @@ Name: %{parent}-%{subname} Version: 1.2 -Release: 2jpp.3%{?dist} +Release: 2.4%{?dist} Epoch: 0 Summary: Plexus Maven plugin License: MIT @@ -183,6 +183,9 @@ %doc %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.2-2.4 +- drop repotag + * Thu Feb 28 2008 Deepak Bhole 1.2-2jpp.3 - Rebuild From fedora-extras-commits at redhat.com Wed Jul 9 21:48:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 9 Jul 2008 21:48:22 GMT Subject: rpms/plexus-runtime-builder/devel plexus-runtime-builder.spec, 1.5, 1.6 Message-ID: <200807092148.m69LmMkT029002@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-runtime-builder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28966 Modified Files: plexus-runtime-builder.spec Log Message: fix repotag Index: plexus-runtime-builder.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-runtime-builder/devel/plexus-runtime-builder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plexus-runtime-builder.spec 29 May 2008 15:41:47 -0000 1.5 +++ plexus-runtime-builder.spec 9 Jul 2008 21:47:37 -0000 1.6 @@ -38,7 +38,7 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.2.a9.1jpp.4%{?dist} +Release: 0.2.a9.1.5%{?dist} Epoch: 0 Summary: Plexus Component Descriptor Creator License: MIT @@ -203,6 +203,9 @@ %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a9.1.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway 1.0-0.2.a9.1jpp.4 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 9 22:13:16 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 9 Jul 2008 22:13:16 GMT Subject: rpms/perl-Crypt-Rijndael/EL-4 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807092213.m69MDGX2004459@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/perl-Crypt-Rijndael/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4433/EL-4 Modified Files: .cvsignore sources Log Message: Import From fedora-extras-commits at redhat.com Wed Jul 9 22:13:41 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 9 Jul 2008 22:13:41 GMT Subject: rpms/perl-Crypt-Rijndael/EL-4 perl-Crypt-Rijndael.spec,NONE,1.1 Message-ID: <200807092213.m69MDfZp004497@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/perl-Crypt-Rijndael/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4465/EL-4 Added Files: perl-Crypt-Rijndael.spec Log Message: Import --- NEW FILE perl-Crypt-Rijndael.spec --- Name: perl-Crypt-Rijndael Version: 1.06 Release: 2%{?dist} Summary: Crypt::CBC compliant Rijndael encryption module License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Rijndael/ Source0: http://www.cpan.org/modules/by-module/Crypt/Crypt-Rijndael-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Manifest) >= 1.14 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(Test::Manifest) >= 1.14 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module implements the Rijndael cipher, which has just been selected as the Advanced Encryption Standard. %prep %setup -q -n Crypt-Rijndael-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING LICENSE NEWS README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Crypt* %{_mandir}/man3/* %changelog * Mon Jun 23 2008 Nigel Jones - 1.06-2 - Missing Test::Pod deps * Mon Jun 23 2008 Nigel Jones - 1.06-1 - Specfile autogenerated by cpanspec 1.77. From fedora-extras-commits at redhat.com Wed Jul 9 22:15:08 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 9 Jul 2008 22:15:08 GMT Subject: rpms/perl-Crypt-Rijndael/F-9 perl-Crypt-Rijndael.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807092215.m69MF84K004627@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/perl-Crypt-Rijndael/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4465/F-9 Modified Files: .cvsignore sources Added Files: perl-Crypt-Rijndael.spec Log Message: Import --- NEW FILE perl-Crypt-Rijndael.spec --- Name: perl-Crypt-Rijndael Version: 1.06 Release: 2%{?dist} Summary: Crypt::CBC compliant Rijndael encryption module License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Rijndael/ Source0: http://www.cpan.org/modules/by-module/Crypt/Crypt-Rijndael-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Manifest) >= 1.14 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(Test::Manifest) >= 1.14 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module implements the Rijndael cipher, which has just been selected as the Advanced Encryption Standard. %prep %setup -q -n Crypt-Rijndael-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING LICENSE NEWS README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Crypt* %{_mandir}/man3/* %changelog * Mon Jun 23 2008 Nigel Jones - 1.06-2 - Missing Test::Pod deps * Mon Jun 23 2008 Nigel Jones - 1.06-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jun 2008 02:46:40 -0000 1.1 +++ .cvsignore 9 Jul 2008 22:14:20 -0000 1.2 @@ -0,0 +1 @@ +Crypt-Rijndael-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jun 2008 02:46:40 -0000 1.1 +++ sources 9 Jul 2008 22:14:20 -0000 1.2 @@ -0,0 +1 @@ +adba5ba76f086d691a02021a3569a8e4 Crypt-Rijndael-1.06.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 22:15:20 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 9 Jul 2008 22:15:20 GMT Subject: rpms/perl-Crypt-Rijndael/F-8 perl-Crypt-Rijndael.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807092215.m69MFKNE004635@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/perl-Crypt-Rijndael/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4465/F-8 Modified Files: .cvsignore sources Added Files: perl-Crypt-Rijndael.spec Log Message: Import --- NEW FILE perl-Crypt-Rijndael.spec --- Name: perl-Crypt-Rijndael Version: 1.06 Release: 2%{?dist} Summary: Crypt::CBC compliant Rijndael encryption module License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Rijndael/ Source0: http://www.cpan.org/modules/by-module/Crypt/Crypt-Rijndael-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Manifest) >= 1.14 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(Test::Manifest) >= 1.14 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module implements the Rijndael cipher, which has just been selected as the Advanced Encryption Standard. %prep %setup -q -n Crypt-Rijndael-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING LICENSE NEWS README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Crypt* %{_mandir}/man3/* %changelog * Mon Jun 23 2008 Nigel Jones - 1.06-2 - Missing Test::Pod deps * Mon Jun 23 2008 Nigel Jones - 1.06-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jun 2008 02:46:40 -0000 1.1 +++ .cvsignore 9 Jul 2008 22:14:00 -0000 1.2 @@ -0,0 +1 @@ +Crypt-Rijndael-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jun 2008 02:46:40 -0000 1.1 +++ sources 9 Jul 2008 22:14:00 -0000 1.2 @@ -0,0 +1 @@ +adba5ba76f086d691a02021a3569a8e4 Crypt-Rijndael-1.06.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 22:15:30 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 9 Jul 2008 22:15:30 GMT Subject: rpms/perl-Crypt-Rijndael/EL-5 perl-Crypt-Rijndael.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807092215.m69MFUp6004642@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/perl-Crypt-Rijndael/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4465/EL-5 Modified Files: .cvsignore sources Added Files: perl-Crypt-Rijndael.spec Log Message: Import --- NEW FILE perl-Crypt-Rijndael.spec --- Name: perl-Crypt-Rijndael Version: 1.06 Release: 2%{?dist} Summary: Crypt::CBC compliant Rijndael encryption module License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Rijndael/ Source0: http://www.cpan.org/modules/by-module/Crypt/Crypt-Rijndael-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Manifest) >= 1.14 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(Test::Manifest) >= 1.14 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module implements the Rijndael cipher, which has just been selected as the Advanced Encryption Standard. %prep %setup -q -n Crypt-Rijndael-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING LICENSE NEWS README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Crypt* %{_mandir}/man3/* %changelog * Mon Jun 23 2008 Nigel Jones - 1.06-2 - Missing Test::Pod deps * Mon Jun 23 2008 Nigel Jones - 1.06-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jun 2008 02:46:40 -0000 1.1 +++ .cvsignore 9 Jul 2008 22:13:41 -0000 1.2 @@ -0,0 +1 @@ +Crypt-Rijndael-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jun 2008 02:46:40 -0000 1.1 +++ sources 9 Jul 2008 22:13:41 -0000 1.2 @@ -0,0 +1 @@ +adba5ba76f086d691a02021a3569a8e4 Crypt-Rijndael-1.06.tar.gz From fedora-extras-commits at redhat.com Wed Jul 9 22:15:32 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 9 Jul 2008 22:15:32 GMT Subject: rpms/perl-Crypt-Rijndael/devel perl-Crypt-Rijndael.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807092215.m69MFWS8004646@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/perl-Crypt-Rijndael/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4465/devel Modified Files: .cvsignore sources Added Files: perl-Crypt-Rijndael.spec Log Message: Import --- NEW FILE perl-Crypt-Rijndael.spec --- Name: perl-Crypt-Rijndael Version: 1.06 Release: 2%{?dist} Summary: Crypt::CBC compliant Rijndael encryption module License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Rijndael/ Source0: http://www.cpan.org/modules/by-module/Crypt/Crypt-Rijndael-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Manifest) >= 1.14 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(Test::Manifest) >= 1.14 Requires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module implements the Rijndael cipher, which has just been selected as the Advanced Encryption Standard. %prep %setup -q -n Crypt-Rijndael-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes COPYING LICENSE NEWS README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Crypt* %{_mandir}/man3/* %changelog * Mon Jun 23 2008 Nigel Jones - 1.06-2 - Missing Test::Pod deps * Mon Jun 23 2008 Nigel Jones - 1.06-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jun 2008 02:46:40 -0000 1.1 +++ .cvsignore 9 Jul 2008 22:14:38 -0000 1.2 @@ -0,0 +1 @@ +Crypt-Rijndael-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jun 2008 02:46:40 -0000 1.1 +++ sources 9 Jul 2008 22:14:38 -0000 1.2 @@ -0,0 +1 @@ +adba5ba76f086d691a02021a3569a8e4 Crypt-Rijndael-1.06.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 00:08:25 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 10 Jul 2008 00:08:25 GMT Subject: rpms/kernel/devel config-generic, 1.124, 1.125 kernel.spec, 1.747, 1.748 Message-ID: <200807100008.m6A08Pdo022934@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22879 Modified Files: config-generic kernel.spec Log Message: * Wed Jul 09 2008 Chuck Ebbert - Enable the i2c-tiny-usb driver. (#451451) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- config-generic 9 Jul 2008 03:37:06 -0000 1.124 +++ config-generic 10 Jul 2008 00:07:31 -0000 1.125 @@ -1842,7 +1842,7 @@ # CONFIG_I2C_SIS96X is not set CONFIG_I2C_SIMTEC=m CONFIG_I2C_STUB=m -# CONFIG_I2C_TINY_USB is not set +CONFIG_I2C_TINY_USB=m # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.747 retrieving revision 1.748 diff -u -r1.747 -r1.748 --- kernel.spec 9 Jul 2008 16:22:18 -0000 1.747 +++ kernel.spec 10 Jul 2008 00:07:31 -0000 1.748 @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 09 2008 Chuck Ebbert +- Enable the i2c-tiny-usb driver. (#451451) + * Wed Jul 09 2008 Dave Jones - 2.6.26-rc9-git5 From fedora-extras-commits at redhat.com Thu Jul 10 00:16:11 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 10 Jul 2008 00:16:11 GMT Subject: rpms/kernel/F-8 linux-2.6-hwmon-hdaps-add-new-models.patch, NONE, 1.1 kernel.spec, 1.488, 1.489 Message-ID: <200807100016.m6A0GBt2023314@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23260 Modified Files: kernel.spec Added Files: linux-2.6-hwmon-hdaps-add-new-models.patch Log Message: * Wed Jul 09 2008 Chuck Ebbert 2.6.25.9-49 - hdaps: support new Lenovo notebook models (F9#449888) linux-2.6-hwmon-hdaps-add-new-models.patch: --- NEW FILE linux-2.6-hwmon-hdaps-add-new-models.patch --- hdaps: add new lenovo models Comination of these three upstream commits: commit ca68d0ac16539a062ae26ca50da8b186fa3a0814 hdaps: invert the axes for HDAPS on Lenovo R61i ThinkPads commit a4fa7ef037b17f2a3b9b393cb924e571fc04e784 hdaps: fix module loading on Thinkpad T61P commit 292d73551d0aa19526c3417e791c529b49ebadf3 hdaps: add support for various newer Lenovo thinkpads Signed-off-by: Chuck Ebbert --- redhat bz 449888 diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c index 26df06f..50f2269 100644 --- a/drivers/hwmon/hdaps.c +++ b/drivers/hwmon/hdaps.c @@ -515,16 +515,24 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = { HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"), HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"), HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"), HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"), HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"), { .ident = NULL } }; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.488 retrieving revision 1.489 diff -u -r1.488 -r1.489 --- kernel.spec 8 Jul 2008 17:52:51 -0000 1.488 +++ kernel.spec 10 Jul 2008 00:15:24 -0000 1.489 @@ -668,6 +668,8 @@ Patch1308: linux-2.6-usb-ehci-hcd-respect-nousb.patch Patch1310: linux-2.6-usb-fix-interrupt-disabling.patch +Patch1350: linux-2.6-hwmon-hdaps-add-new-models.patch + Patch1400: linux-2.6-smarter-relatime.patch Patch1515: linux-2.6-lirc.patch @@ -1211,6 +1213,7 @@ # ISDN # hwmon +ApplyPatch linux-2.6-hwmon-hdaps-add-new-models.patch # implement smarter atime updates support. ApplyPatch linux-2.6-smarter-relatime.patch @@ -1827,6 +1830,9 @@ %changelog +* Wed Jul 09 2008 Chuck Ebbert 2.6.25.9-49 +- hdaps: support new Lenovo notebook models (F9#449888) + * Tue Jul 08 2008 John W. Linville 2.6.25.9-48 - Upstream wireless fixes from 2008-07-07 (http://marc.info/?l=linux-wireless&m=121546143025524&w=2) From fedora-extras-commits at redhat.com Thu Jul 10 00:27:09 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 10 Jul 2008 00:27:09 GMT Subject: rpms/kernel/F-9 linux-2.6-hwmon-hdaps-add-new-models.patch, NONE, 1.1 kernel.spec, 1.707, 1.708 Message-ID: <200807100027.m6A0R90H024112@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23995 Modified Files: kernel.spec Added Files: linux-2.6-hwmon-hdaps-add-new-models.patch Log Message: * Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-89 - hdaps: support new Lenovo notebook models (#449888) linux-2.6-hwmon-hdaps-add-new-models.patch: --- NEW FILE linux-2.6-hwmon-hdaps-add-new-models.patch --- hdaps: add new lenovo models Comination of these three upstream commits: commit ca68d0ac16539a062ae26ca50da8b186fa3a0814 hdaps: invert the axes for HDAPS on Lenovo R61i ThinkPads commit a4fa7ef037b17f2a3b9b393cb924e571fc04e784 hdaps: fix module loading on Thinkpad T61P commit 292d73551d0aa19526c3417e791c529b49ebadf3 hdaps: add support for various newer Lenovo thinkpads Signed-off-by: Chuck Ebbert --- redhat bz 449888 diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c index 26df06f..50f2269 100644 --- a/drivers/hwmon/hdaps.c +++ b/drivers/hwmon/hdaps.c @@ -515,16 +515,24 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = { HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"), HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"), HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"), HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"), HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"), HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"), + HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"), { .ident = NULL } }; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.707 retrieving revision 1.708 diff -u -r1.707 -r1.708 --- kernel.spec 8 Jul 2008 21:40:34 -0000 1.707 +++ kernel.spec 10 Jul 2008 00:26:11 -0000 1.708 @@ -624,6 +624,7 @@ Patch450: linux-2.6-input-kill-stupid-messages.patch Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch Patch452: linux-2.6-hwmon-applesmc-remove-debugging-messages.patch +Patch453: linux-2.6-hwmon-hdaps-add-new-models.patch Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch Patch570: linux-2.6-selinux-mprotect-checks.patch @@ -1182,6 +1183,8 @@ ApplyPatch linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch # kill annoying applesmc debug messages ApplyPatch linux-2.6-hwmon-applesmc-remove-debugging-messages.patch +# add new models to hdaps +ApplyPatch linux-2.6-hwmon-hdaps-add-new-models.patch # Allow to use 480600 baud on 16C950 UARTs ApplyPatch linux-2.6-serial-460800.patch @@ -1871,29 +1874,32 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog -* Tue Jul 08 2008 Eric Sandeen +* Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-89 +- hdaps: support new Lenovo notebook models (#449888) + +* Tue Jul 08 2008 Eric Sandeen 2.6.25.10-88 - Fix reiserfs list corruption (#453699) -* Tue Jul 08 2008 John W. Linville 2.6.25.9-87 +* Tue Jul 08 2008 John W. Linville 2.6.25.10-87 - Upstream wireless fixes from 2008-07-07 (http://marc.info/?l=linux-wireless&m=121546143025524&w=2) -* Mon Jul 07 2008 Chuck Ebbert 2.6.25.9-86 +* Mon Jul 07 2008 Chuck Ebbert 2.6.25.10-86 - Fix USB interrupt handling with shared interrupts. -* Fri Jul 04 2008 John W. Linville 2.6.25.9-85 +* Fri Jul 04 2008 John W. Linville 2.6.25.10-85 - Upstream wireless fixes from 2008-07-02 (http://marc.info/?l=linux-netdev&m=121503163124089&w=2) - Apply Stefan Becker's fix for bad hunk of wireless build fixups for 2.6.25 (https://bugzilla.redhat.com/show_bug.cgi?id=453390#c36) -* Fri Jul 04 2008 Dave Jones +* Fri Jul 04 2008 Dave Jones 2.6.25.10-84 - Better fix for the Nikon D80 usb-storage quirk. -* Thu Jul 03 2008 Dave Jones +* Thu Jul 03 2008 Dave Jones 2.6.25.10-83 - Add USB Storage quirk for Nikon D40 with new firmware. -* Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-82 +* Thu Jul 03 2008 Chuck Ebbert 2.6.25.10-82 - Linux 2.6.25.10 - Reverted stable patch, not needed with utrace: x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch From fedora-extras-commits at redhat.com Thu Jul 10 01:24:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 01:24:08 GMT Subject: rpms/plexus-bsh-factory/devel plexus-bsh-factory-license.txt, NONE, 1.1 plexus-bsh-factory.spec, 1.8, 1.9 Message-ID: <200807100124.m6A1O81c000675@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/plexus-bsh-factory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv611 Modified Files: plexus-bsh-factory.spec Added Files: plexus-bsh-factory-license.txt Log Message: add license info from upstream --- NEW FILE plexus-bsh-factory-license.txt --- >From jason at maven.org Wed Jul 9 21:16:12 2008 Return-Path: Index: plexus-bsh-factory.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-bsh-factory/devel/plexus-bsh-factory.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- plexus-bsh-factory.spec 9 Jul 2008 21:39:36 -0000 1.8 +++ plexus-bsh-factory.spec 10 Jul 2008 01:23:20 -0000 1.9 @@ -39,10 +39,10 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.2.a7s.1.7%{?dist} +Release: 0.2.a7s.1.8%{?dist} Epoch: 0 Summary: Plexus Bsh component factory -License: Unknown +License: MIT Group: Development/Java URL: http://plexus.codehaus.org/ Source0: %{name}-src.tar.gz @@ -50,6 +50,7 @@ # tar czf plexus-bsh-factory-src.tar.gz plexus-bsh-factory/ Source1: %{name}-jpp-depmap.xml Source2: %{name}-build.xml +Source3: plexus-bsh-factory-license.txt Patch1: %{name}-encodingfix.patch @@ -115,6 +116,7 @@ cp -p %{SOURCE2} build.xml %endif +cp -p %{SOURCE3} . %build @@ -193,6 +195,7 @@ %files %defattr(-,root,root,-) +%doc plexus-bsh-factory-license.txt %dir %{_javadir}/plexus %{_javadir}/plexus %{_datadir}/maven2 @@ -210,6 +213,9 @@ %endif %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a7s.1.8 +- add license information from upstream + * Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a7s.1.7 - drop repotag - label license as Unknown (hopefully, upstream will get back to us before the sun explodes) From fedora-extras-commits at redhat.com Thu Jul 10 01:25:29 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Thu, 10 Jul 2008 01:25:29 GMT Subject: rpms/tex-zfuzz/devel import.log,1.1,1.2 Message-ID: <200807100125.m6A1PTsU000759@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/tex-zfuzz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656/devel Modified Files: import.log Log Message: * Wed Jul 09 2008 David A. Wheeler - 0-0.20070911.2 - Initial submission. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Jul 2008 01:59:17 -0000 1.1 +++ import.log 10 Jul 2008 01:24:47 -0000 1.2 @@ -1 +1,2 @@ tex-zfuzz-0-0_20070911_2_fc9:HEAD:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1214962677 +tex-zfuzz-0-0_20070911_2_fc9:HEAD:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1215652637 From fedora-extras-commits at redhat.com Thu Jul 10 01:36:56 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Thu, 10 Jul 2008 01:36:56 GMT Subject: rpms/plymouth/devel find-right-libdir.patch, NONE, 1.1 plymouth.spec, 1.20, 1.21 Message-ID: <200807100136.m6A1auJD001368@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1258 Modified Files: plymouth.spec Added Files: find-right-libdir.patch Log Message: - Use a new heuristic for finding libdir, since the old one falls over on ia64 find-right-libdir.patch: --- NEW FILE find-right-libdir.patch --- commit d8086a93a37e1e76c7b544a13faef13683c79b62 Author: Ray Strode Date: Wed Jul 9 21:31:20 2008 -0400 Compute libdir using yet a different heuristic The previous one falls over for ia64 diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 033ca06..e4ccded 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -7,7 +7,7 @@ set -e [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec" [ -z "$DATADIR" ] && DATADIR="/usr/share" [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)" -[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib" +[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup" diff --git a/scripts/plymouth-set-default-plugin b/scripts/plymouth-set-default-plugin index a2ac8fd..3edee7a 100755 --- a/scripts/plymouth-set-default-plugin +++ b/scripts/plymouth-set-default-plugin @@ -4,7 +4,7 @@ set -e [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec" [ -z "$DATADIR" ] && DATADIR="/usr/share" -[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib" +[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" diff --git a/scripts/plymouth-update-initrd.in b/scripts/plymouth-update-initrd.in index 2d37bcf..b8bc8f8 100755 --- a/scripts/plymouth-update-initrd.in +++ b/scripts/plymouth-update-initrd.in @@ -8,7 +8,7 @@ set -e [ -z "$DATADIR" ] && DATADIR="/usr/share" [ -z "$INITRD" ] && INITRD="/boot/initrd-$(/sbin/grubby --default-kernel | sed 's/.*vmlinuz-//g').img" [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)" -[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib" +[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" [ -z "$BINDIR" ] && BINDIR="/usr/bin" [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup" Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- plymouth.spec 9 Jul 2008 21:40:58 -0000 1.20 +++ plymouth.spec 10 Jul 2008 01:36:13 -0000 1.21 @@ -1,7 +1,7 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth Version: 0.5.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -12,11 +12,11 @@ Provides: rhgb = 1:10.0.0 Requires: system-logos >= 9.0.1 -Requires: elfutils Requires: system-plymouth-plugin >= %{version}-%{release} Patch0: plymouth-0.5.0-fix-ppc.patch Patch1: restore-color-palette.patch +Patch2: find-right-libdir.patch %description Plymouth provides an attractive graphical boot animation in @@ -71,6 +71,7 @@ %patch0 -p1 -b .fix-ppc %patch1 -p1 -b .restore-color-palette +%patch2 -p1 -b .find-right-libdir %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -176,6 +177,10 @@ %{_libdir}/plymouth/spinfinity.so %changelog +* Wed Jul 9 2008 Ray Strode - 0.5.0-5 +- Use a new heuristic for finding libdir, since the old + one falls over on ia64 + * Wed Jul 9 2008 Ray Strode - 0.5.0-4 - add ctrl-r to rotate text color palette back to stock values From fedora-extras-commits at redhat.com Thu Jul 10 01:44:46 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 01:44:46 GMT Subject: rpms/tomoe-gtk/devel tomoe-gtk.spec,1.1,1.2 Message-ID: <200807100144.m6A1ikkQ001885@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/tomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1693 Modified Files: tomoe-gtk.spec Log Message: - make license field LGPLv2+ - disable gucharmap for now since doesn't build yet with gucharmap-2 - fix filelist Index: tomoe-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomoe-gtk/devel/tomoe-gtk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomoe-gtk.spec 9 Jul 2008 06:05:35 -0000 1.1 +++ tomoe-gtk.spec 10 Jul 2008 01:44:05 -0000 1.2 @@ -6,15 +6,17 @@ Summary: Gtk library for tomoe for Japanese and Chinese handwritten input Group: System Environment/Libraries -License: LGPL +License: LGPLv2+ URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tomoe >= %{tomoe_ver} -Obsoletes: libtomoe-gtk < 0.6.0-4 +Obsoletes: libtomoe-gtk < 0.6.0-4 BuildRequires: tomoe-devel >= %{tomoe_ver}, gtk2-devel, -BuildRequires: gucharmap-devel, libgnomeui-devel, pygobject2-devel +# does not currently build with gucharmap-2 +#BuildRequires: gucharmap-devel +BuildRequires: libgnomeui-devel, pygobject2-devel BuildRequires: gettext %description @@ -42,7 +44,7 @@ %build -%configure --disable-static +%configure --disable-static --without-gucharmap make %{?_smp_mflags} @@ -82,9 +84,9 @@ %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/%{name}.so -%{_includedir}/tomoe/* -%{_datadir}/gtk-doc/html/%{name}/ +%{_libdir}/lib%{name}.so +%{_includedir}/libtomoe/* +%{_datadir}/gtk-doc/html/lib%{name}/ %changelog @@ -92,6 +94,8 @@ - package renamed from libtomoe-gtk to tomoe-gtk in line with upstream - no longer need pkgname macro - obsolete libtomoe-gtk +- make license field LGPLv2+ +- disable gucharmap for now since doesn't build yet with gucharmap-2 * Tue Feb 19 2008 Fedora Release Engineering - 0.6.0-3.fc9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 01:56:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 01:56:59 +0000 Subject: [pkgdb] fuse-gmailfs ownership updated Message-ID: <200807100156.m6A1ux8c008012@bastion.fedora.phx.redhat.com> Package fuse-gmailfs in Fedora devel is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fuse-gmailfs From fedora-extras-commits at redhat.com Thu Jul 10 01:57:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 01:57:07 +0000 Subject: [pkgdb] fuse-gmailfs ownership updated Message-ID: <200807100157.m6A1ux8e008012@bastion.fedora.phx.redhat.com> Package fuse-gmailfs in Fedora 9 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fuse-gmailfs From fedora-extras-commits at redhat.com Thu Jul 10 01:57:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 01:57:55 +0000 Subject: [pkgdb] python-libgmail ownership updated Message-ID: <200807100157.m6A1vtVF008134@bastion.fedora.phx.redhat.com> Package python-libgmail in Fedora devel is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail From fedora-extras-commits at redhat.com Thu Jul 10 01:58:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 01:58:01 +0000 Subject: [pkgdb] python-libgmail ownership updated Message-ID: <200807100158.m6A1ux8g008012@bastion.fedora.phx.redhat.com> Package python-libgmail in Fedora 9 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail From fedora-extras-commits at redhat.com Thu Jul 10 01:58:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 01:58:41 +0000 Subject: [pkgdb] python-libgmail-docs ownership updated Message-ID: <200807100158.m6A1wfaa008252@bastion.fedora.phx.redhat.com> Package python-libgmail-docs in Fedora devel is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail-docs From fedora-extras-commits at redhat.com Thu Jul 10 01:58:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 01:58:47 +0000 Subject: [pkgdb] python-libgmail-docs ownership updated Message-ID: <200807100158.m6A1vtVH008134@bastion.fedora.phx.redhat.com> Package python-libgmail-docs in Fedora 9 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail-docs From fedora-extras-commits at redhat.com Thu Jul 10 01:59:04 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 01:59:04 GMT Subject: rpms/tomoe-gtk/devel tomoe-gtk.spec,1.2,1.3 Message-ID: <200807100159.m6A1x4Mx002454@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/tomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2415 Modified Files: tomoe-gtk.spec Log Message: few more filelist fixes Index: tomoe-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomoe-gtk/devel/tomoe-gtk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomoe-gtk.spec 10 Jul 2008 01:44:05 -0000 1.2 +++ tomoe-gtk.spec 10 Jul 2008 01:58:17 -0000 1.3 @@ -77,7 +77,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO -%{_libdir}/%{name}.so.* +%{_libdir}/lib%{name}.so.* %{_datadir}/%{name}/ @@ -85,7 +85,7 @@ %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/lib%{name}.so -%{_includedir}/libtomoe/* +%{_includedir}/tomoe/* %{_datadir}/gtk-doc/html/lib%{name}/ From fedora-extras-commits at redhat.com Thu Jul 10 02:02:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 02:02:25 GMT Subject: rpms/pmd/devel pmd.spec,1.3,1.4 Message-ID: <200807100202.m6A22P8a009107@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/pmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9082 Modified Files: pmd.spec Log Message: drop repotag, fix license tag Index: pmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/pmd/devel/pmd.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pmd.spec 26 Mar 2007 14:23:27 -0000 1.3 +++ pmd.spec 10 Jul 2008 02:01:37 -0000 1.4 @@ -29,10 +29,10 @@ # Name: pmd Version: 3.6 -Release: 1jpp.3%{?dist} +Release: 1.4%{?dist} Epoch: 0 Summary: Scans Java source code and looks for potential problems -License: BSD Style +License: BSD # cvs -z3 -d:pserver:anonymous at pmd.cvs.sourceforge.net:/cvsroot/pmd export \ # -r pmd_release_3_6 pmd @@ -145,6 +145,10 @@ %{_javadocdir}/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway - 0:3.6-1.4 +- fix license tag +- drop disttag + * Mon Mar 26 2007 Matt Wringe - 0:3.6-1jpp.3 - Fix unowned doc directory for pmd From fedora-extras-commits at redhat.com Thu Jul 10 02:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:15:41 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100215.m6A2FfRe009742@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchbugzilla acl on libhugetlbfs (Fedora devel) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:15:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:15:46 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100215.m6A2Fl7B009771@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchcommits acl on libhugetlbfs (Fedora devel) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:15:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:15:51 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100215.m6A2FpnY009791@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the commit acl on libhugetlbfs (Fedora devel) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:15:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:15:54 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100215.m6A2FsDe009812@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the approveacls acl on libhugetlbfs (Fedora devel) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:15:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:15:59 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100215.m6A2FfRh009742@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchbugzilla acl on libhugetlbfs (Fedora 7) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:03 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2Fl7E009771@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchcommits acl on libhugetlbfs (Fedora 7) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:06 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2Fpnb009791@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the commit acl on libhugetlbfs (Fedora 7) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:09 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2FsDh009812@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the approveacls acl on libhugetlbfs (Fedora 7) to Obsolete for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:12 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2FfRk009742@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the approveacls acl on libhugetlbfs (Fedora 7) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:19 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2Fpne009791@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchbugzilla acl on libhugetlbfs (Fedora 5) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:23 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2FsDk009812@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchcommits acl on libhugetlbfs (Fedora 5) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:27 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2GS3w010018@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the commit acl on libhugetlbfs (Fedora 5) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:33 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2Fl7H009771@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the approveacls acl on libhugetlbfs (Fedora 5) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:39 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2Gd3w010099@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchbugzilla acl on libhugetlbfs (Fedora 6) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:41 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2GfUo010122@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchcommits acl on libhugetlbfs (Fedora 6) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:45 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2GS41010018@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the commit acl on libhugetlbfs (Fedora 6) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:49 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2GoAG010173@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the approveacls acl on libhugetlbfs (Fedora 6) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:55 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2Gd41010099@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchbugzilla acl on libhugetlbfs (Fedora 8) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:57 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2GfUr010122@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchcommits acl on libhugetlbfs (Fedora 8) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:16:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:16:59 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100216.m6A2GS44010018@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the commit acl on libhugetlbfs (Fedora 8) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:02 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100217.m6A2GoAJ010173@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the approveacls acl on libhugetlbfs (Fedora 8) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:04 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100217.m6A2Gd44010099@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the approveacls acl on libhugetlbfs (Fedora 9) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:06 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100217.m6A2GfUu010122@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the commit acl on libhugetlbfs (Fedora 9) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:08 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100217.m6A2GS47010018@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchcommits acl on libhugetlbfs (Fedora 9) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:12 +0000 Subject: [pkgdb] libhugetlbfs had acl change status Message-ID: <200807100217.m6A2GoAM010173@bastion.fedora.phx.redhat.com> Steve Fox (drfickle) has set the watchbugzilla acl on libhugetlbfs (Fedora 9) to Approved for Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:14 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807100217.m6A2Gd47010099@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora 9 was orphaned by Steve Fox (drfickle) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:27 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807100217.m6A2GfUx010122@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora 8 was orphaned by Steve Fox (drfickle) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:30 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807100217.m6A2H9wA010346@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora 6 was orphaned by Steve Fox (drfickle) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:33 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807100217.m6A2GoAP010173@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora 5 was orphaned by Steve Fox (drfickle) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:36 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807100217.m6A2HERd010396@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora 7 was orphaned by Steve Fox (drfickle) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:17:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 02:17:39 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807100217.m6A2HSIL010458@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora devel was orphaned by Steve Fox (drfickle) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 02:46:48 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Thu, 10 Jul 2008 02:46:48 GMT Subject: rpms/japanese-bitmap-fonts/devel CIDFnmap.ja, NONE, 1.1 FAPIcidfmap.ja, NONE, 1.1 cidfmap.ja, NONE, 1.1 fonts-ja-8.0-gcc-warnings.patch, NONE, 1.1 fonttools-replace.patch, NONE, 1.1 japanese-bitmap-fonts.spec, NONE, 1.1 k14-1990.patch, NONE, 1.1 k14.patch, NONE, 1.1 mplus_bitmap_fonts-install.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807100246.m6A2kmjY010376@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/japanese-bitmap-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10329 Modified Files: .cvsignore sources Added Files: CIDFnmap.ja FAPIcidfmap.ja cidfmap.ja fonts-ja-8.0-gcc-warnings.patch fonttools-replace.patch japanese-bitmap-fonts.spec k14-1990.patch k14.patch mplus_bitmap_fonts-install.patch Log Message: * Thu Jul 10 2008 Akira TAGOH - 0.20080710-1 - Renamed package from fonts-japanese. (#253149) - Get rid of ttf font packages' dependencies. - clean up the spec file a bit. ***** Error reading new file: [Errno 2] No such file or directory: 'CIDFnmap.ja' --- NEW FILE FAPIcidfmap.ja --- %! % The map is a set of records like this : % % /CIDfont_name options_dict ; % % where options_dict is a dictionary with the following entries : % % Key Type Description % Path string Absolute path to font file, or relative path to font file from % the GS_EXTFONTPATH value. % CIDFontType integer PostScript type for this CID font. Only 0 is currently allowed. % Note that this is unrelated to the real type of the font file - % the bridge will perform format conversion. % FAPI name Name of the renderer to be used with the font. /AgfaUFST and % /FreeType is now allowed -- depends on which options Ghostscript % was built with. % SubfontId integer (optional) Index of the font in font collection, such as FCO or TTC. % It is being ignored if /Path doesn't specify a collection. % CSI array Must have strongly 2 elements. % The first element of the array specifies Ordering of CIDSystemInfo. % The second element specifies Supplement of CIDSystemInfo. % % Use regular Postscript syntax. % /Sazanami-Mincho << /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; /Sazanami-Gothic << /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; /Kochi-Mincho << /Path (/usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; /Kochi-Gothic << /Path (/usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; /VL-Gothic << /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; /Adobe-Japan1 << /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; /Adobe-Japan2 << /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan2) 0] >> ; /Ryumin-Light << /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; /GothicBBB-Medium << /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; --- NEW FILE cidfmap.ja --- /Sazanami-Gothic << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CSI [(Japan1) 6] >> ; /Sazanami-Gothic-Regular /Sazanami-Gothic ; /Sazanami-Gothic-JaH << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CSI [(Japan2) 0] >> ; /Sazanami-Gothic-Regular-JaH /Sazanami-Gothic-JaH ; /Sazanami-Mincho << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CSI [(Japan1) 6] >> ; /Sazanami-Mincho-Regular /Sazanami-Mincho ; /Sazanami-Mincho-JaH << /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CSI [(Japan2) 0] >> ; /Sazanami-Mincho-Regular-JaH /Sazanami-Mincho-JaH ; /VL-Gothic << /FileType /TrueType /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ; /VL-Gothic-Regular /VL-Gothic ; /VL-Gothic-JaH << /FileType /TrueType /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ; /VL-Gothic-Regular-JaH /VL-Gothic-JaH ; /Ryumin-Light /Sazanami-Mincho ; /GothicBBB-Medium /VL-Gothic ; /Adobe-Japan1 /VL-Gothic ; /Adobe-Japan2 /VL-Gothic-JaH ; fonts-ja-8.0-gcc-warnings.patch: --- NEW FILE fonts-ja-8.0-gcc-warnings.patch --- diff -ruN fonts-ja-8.0.orig/vine-fonttools-0.1/mkitalic.c fonts-ja-8.0/vine-fonttools-0.1/mkitalic.c --- fonts-ja-8.0.orig/vine-fonttools-0.1/mkitalic.c 2000-12-23 03:59:33.000000000 +0900 +++ fonts-ja-8.0/vine-fonttools-0.1/mkitalic.c 2004-02-23 18:48:53.000000000 +0900 @@ -316,7 +316,7 @@ { char* tmp,tmp2,tok; - char hexcbuf[3]; + char hexcbuf[4]; int height,width,newwidth,newbw; int ox, oy, newox, newoy; int count, shift, oldshift, x, i, j, k; fonttools-replace.patch: --- NEW FILE fonttools-replace.patch --- diff -ruN fonts-ja-8.0.orig/vine-fonttools-0.1/mkalias.pl fonts-ja-8.0/vine-fonttools-0.1/mkalias.pl --- fonts-ja-8.0.orig/vine-fonttools-0.1/mkalias.pl 2004-06-22 20:56:42.203463923 +0900 +++ fonts-ja-8.0/vine-fonttools-0.1/mkalias.pl 2004-06-22 20:57:12.356476700 +0900 @@ -54,14 +54,22 @@ for ($j=0; $j < $defcnt; $j++) { $file[$j] = $ARGV[$i+2+$j]; if ( $file[$j] ne "-" ){ - die "invalid file $file[$j]\n" if ( ! $realxlfd{$file[$j]} ); + if ( $file[$j] !~ /WEIGHT/ ) { + die "invalid file $file[$j]\n" if ( ! $realxlfd{$file[$j]} ); + } } } foreach $m ("", "b", "i", "bi") { for ($j=0; $j < $defcnt; $j++) { $file[$j] = $ARGV[$i+2+$j]; - if ( $file[$j] ne "-" ) { + if ( $file[$j] =~ /WEIGHT/ ) { + $f = $file[$j]; + $f =~ s/WEIGHT/$m/; + die "invalid file $f\n" if ( ! $realxlfd{$f} ); + modify($afndry[$j], $afmly[$j], $charset, + $pixel, $realxlfd{$f}); + } elsif ( $file[$j] ne "-" ) { modify($afndry[$j], $afmly[$j], $charset, $pixel, $realxlfd{$file[$j].$m}); } --- NEW FILE japanese-bitmap-fonts.spec --- %define fontname %{name} %define fontdir %{_datadir}/fonts/%{fontname} %define cataloguedir %{_sysconfdir}/X11/fontpath.d %define cidmapdir %{_datadir}/ghostscript/conf.d %define chxlfd /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/chbdfxlfd.pl %define mkalias /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkalias.pl %define mkbold $RPM_BUILD_DIR/%{name}-%{version}/%{shinonome}-src/tools/mkbold %define mkitalic $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkitalic %define kappa Kappa20-0.396 %define shinonome shinonome-0.9.11 %define warabi12 warabi12-0.19a %define mplus mplus_bitmap_fonts-2.2.4 %define vft vine-fonttools-0.1 Name: japanese-bitmap-fonts Version: 0.20080710 Release: 1%{?dist} License: Public Domain and BSD and mplus Group: User Interface/X BuildArch: noarch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: xorg-x11-font-utils mkfontdir gawk ## files in ttfonts-ja Source2: FAPIcidfmap.ja Source3: cidfmap.ja Source4: CIDFnmap.ja ## files in jisksp14 ### Licensed under Public Domain Source10: jisksp14.bdf.gz ## files in kaname ### Licensed under Public Domain Source41: ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz ## files in fonts-ja Source50: xfonts_jp.tgz ### Licensed under Public Domain Source51: http://kappa.allnet.ne.jp/20dot.fonts/%{kappa}.tar.bz2 ### Licensed under Public Domain Source52: http://openlab.ring.gr.jp/efont/dist/shinonome/%{shinonome}-src.tar.bz2 ## http://mlnews.com/marumoji/ ### Licensed under Public Domain Source53: marumoji.tgz # JIS X 0213-2000 fonts (14pxl, 16pxl) # http://www.mars.sphere.ne.jp/imamura/jisx0213.html # http://www.mars.sphere.ne.jp/imamura/K14-1.bdf.gz # http://www.mars.sphere.ne.jp/imamura/K14-2.bdf.gz # http://www.mars.sphere.ne.jp/imamura/jiskan16-2000-1.bdf.gz # http://www.mars.sphere.ne.jp/imamura/jiskan16-2000-2.bdf.gz ### Licensed under Public Domain Source54: imamura-jisx0213.tgz # jiskan16 JIS X 0208:1990 by Yasuoka # http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/ ### Licensed under Public Domain Source55: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskan16-1990.bdf.Z # jiskan16 JIS X 0208:1997 Old Kanji ### Licensed under Public Domain Source56: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskano16-1997.bdf.Z # k14 Old-Kanji ### Licensed under Public Domain Source57: http://www.hlla.is.tsukuba.ac.jp/~kourai/software/k14-oldkanji.tar.gz ## k14 invalid glyphs patch ## http://kappa.allnet.ne.jp/kanou/fonts/k14-patch.html # Warabi12 (12pxl) jisx0213 # http://www.gelgoog.org/warabi12/ ### Licensed under BSD Source58: http://www.gelgoog.org/warabi12/archives/%{warabi12}.tar.gz # mplus fonts # http://mplus-fonts.sourceforge.jp/ ### Licensed under mplus Source59: http://prdownloads.sourceforge.jp/mplus-fonts/5030/%{mplus}.tar.gz Source60: %{vft}.tgz # jiskan24 JIS X 0213 # http://gitatsu.hp.infoseek.co.jp/bdf/ ### Licensed under Public Domain Source61: http://gitatsu.hp.infoseek.co.jp/bdf/jiskan24-2000-1.bdf.gz Source62: http://gitatsu.hp.infoseek.co.jp/bdf/jiskan24-2000-2.bdf.gz Source63: http://gitatsu.hp.infoseek.co.jp/bdf/jiskan24-2003-1.bdf.gz Patch50: http://kappa.allnet.ne.jp/kanou/fonts/k14.patch # k14 to jisx0208.1990 patch # http://www.brl.ntt.co.jp/people/takada/goodies/k14-1990/ # http://www.brl.ntt.co.jp/people/takada/goodies/k14-1990/patch.txt Patch51: k14-1990.patch Patch52: fonts-ja-8.0-gcc-warnings.patch Patch53: mplus_bitmap_fonts-install.patch Patch54: fonttools-replace.patch Summary: Free Japanese Bitmap fonts Provides: jisksp14 = 0.1-16, kappa20 = 0.3-15, fonts-ja = 8.0-16, fonts-japanese = 0.20061016-13 Obsoletes: jisksp14 <= 0.1-16, kappa20 <= 0.3-15, fonts-ja <= 8.0-16, fonts-japanese <= 0.20061016-13 %description This package provides various free Japanese Bitmap fonts. %prep #%%setup -q -T -c -a 5 -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60 %setup -q -T -c -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60 ## ttfonts-ja ## jisksp14 gunzip -c %{SOURCE10} > jisksp14.bdf ## kappa20 ## fonts-ja gunzip -c %{SOURCE55} > jiskan16-1990.bdf gunzip -c %{SOURCE56} > jiskano16-1997.bdf %patch50 -p0 cp k14.bdf k14-1990.bdf %patch51 -p0 %patch52 -p1 pushd %{mplus} %patch53 -p1 popd %patch54 -p1 zcat %{SOURCE61} > jiskan24-2000-1.bdf zcat %{SOURCE62} > jiskan24-2000-2.bdf zcat %{SOURCE63} > jiskan24-2003-1.bdf %build ## jisksp14 bdftopcf jisksp14.bdf | gzip -9 > jisksp14.pcf.gz ## kappa20 ## fonts-ja pushd %{shinonome}-src %configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{bmpfontdir} make bdf popd ### rename Kappa and remove the bold fonts pushd %{kappa} mv k20m.bdf k20.bdf mv 10x20rkm.bdf 10x20rk.bdf rm k20b.bdf 10x20rkb.bdf popd ### rename in xfonts_jp mv 7x14.bdf 7x14a.bdf mv 8x16.bdf 8x16a.bdf mv 12x24.bdf 12x24a.bdf ### marumoji pushd marumoji for i in *.bdf; do %{chxlfd} $i '-Marumoji Club-Marumoji-.-.-.-.-.-.-.-.-.-.-.-.' $i.new && mv -f $i.new $i done popd ### imamura jiskan16 pushd imamura-jisx0213 for i in *.bdf; do %{chxlfd} $i '-Imamura-Fixed-.-.-.-.-.-.-.-.-.-.-.-.' $i.new && mv -f $i.new $i done mv K14-1.bdf k14-2000-1.bdf mv K14-2.bdf k14-2000-2.bdf popd ### k14 and k14-1990 is used as Mincho for i in k14.bdf k14-1990.bdf; do %{chxlfd} $i '-Misc-Mincho-.-.-.-.-.-.-.-.-.-.-.-.' $i.new && mv $i.new $i done ### oldkanji rm k14-oldkanji.pcf* for i in k14-oldkanji.bdf jiskano16-1997.bdf; do %{chxlfd} $i '-Misc-.-.-.-.-Old Style-.-.-.-.-.-.-.-.' $i.new && mv $i.new $i done ### warabi12 pushd %{warabi12} mv warabi12-1.bdf warabi12-2000-1.bdf popd ### mplus pushd %{mplus} DESTDIR=`pwd`/tmp/ ./install_mplus_fonts popd ### move bdfs to topdir mkdir fonts-ja find -name "*.bdf" -path "./*/*" ! -path "./fonts-ja/*" ! -path "./fonts/*" -exec mv {} ./fonts-ja \; mv k14-oldkanji.bdf jiskano16-1997.bdf k14-1990.bdf jiskan16-1990.bdf 7x14a.bdf 7x14rk.bdf 12x24a.bdf 12x24rk.bdf 8x16a.bdf 8x16rk.bdf k14.bdf jiskan16.bdf jiskan24*.bdf ./fonts-ja/ ### move the documents to topdir for i in */README */COPYRIGHT */{LICENSE,README}_{E,J}; do mv $i fonts-ja/`basename $i`-`dirname $i` done ALL_MEDIUM_BDF_FONT="\ shnmk12maru/ maru14/-L maru16/ \ k14-oldkanji/ jiskano16-1997/ \ k14-1990/-L jiskan16-1990/ \ warabi12-2000-1/ \ k14-2000-1/-L k14-2000-2/-L \ jiskan16-2000-1/ jiskan16-2000-2/ \ shnm6x12a/-r shnm6x12r/-r shnmk12/ shnmk12p/ shnmk12min/ \ shnm8x16a/-r shnm8x16r/-r shnmk16/ shnmk16min/ \ 7x14a/ 7x14rk/ shnmk14/ k14/-L shnmk14min/ \ 8x16a/ 8x16rk/ jiskan16/ \ shnm9x18a/-r shnm9x18r/-r \ 10x20rk/ k20/ \ 12x24a/ 12x24rk/ jiskan24/ \ jiskan24-2000-1/ jiskan24-2000-2/ jiskan24-2003-1/ " ALL_BOLD_BDF_FONT="\ mplus_f10WEIGHT-euro/-r mplus_f10WEIGHT/-r \ mplus_f12WEIGHT-euro/-r mplus_f12WEIGHT-jisx0201/-r mplus_f12WEIGHT/-r \ mplus_h10WEIGHT-euro/-r mplus_h10WEIGHT-jisx0201/-r mplus_h10WEIGHT/-r \ mplus_h12WEIGHT-euro/-r mplus_h12WEIGHT-jisx0201/-r mplus_h12WEIGHT/-r \ mplus_j10WEIGHT-iso/-r mplus_j10WEIGHT-jisx0201/-r mplus_j10WEIGHT/-r \ mplus_j12WEIGHT/-r \ mplus_s10WEIGHT-euro/-r mplus_s10WEIGHT/-r " gcc $RPM_OPT_FLAGS %{vft}/mkitalic.c -o %{vft}/mkitalic pushd fonts-ja ### delete 'r' from the filenames for src in $ALL_BOLD_BDF_FONT; do mv `echo ${src%/*}.bdf | sed -e 's/WEIGHT/r/'` `echo ${src%/*}.bdf | sed -e 's/WEIGHT//'` done ### making roman-bold fonts for src in $ALL_MEDIUM_BDF_FONT; do %{mkbold} ${src#*/} -V ${src%/*}.bdf > ${src%/*}b.bdf done ### making italic-medium fonts for src in $ALL_MEDIUM_BDF_FONT; do %{mkitalic} -s 0.2 ${src%/*}.bdf > ${src%/*}i.bdf done for src in $ALL_BOLD_BDF_FONT; do %{mkitalic} -s 0.2 `echo ${src%/*}.bdf | sed -e 's/WEIGHT//'` > `echo ${src%/*}.bdf | sed -e 's/WEIGHT/i/'` done ### making italic-bold fonts for src in $ALL_MEDIUM_BDF_FONT; do %{mkbold} ${src#*/} -V ${src%/*}i.bdf > ${src%/*}bi.bdf done for src in $ALL_BOLD_BDF_FONT; do %{mkitalic} -s 0.2 `echo ${src%/*}.bdf | sed -e 's/WEIGHT/b/'` > `echo ${src%/*}.bdf | sed -e 's/WEIGHT/bi/'` done grep '^FONT ' *.bdf | sed -e 's/\.bdf:FONT//' > ALLFONTS.txt ### check the duplicated xlfds DUP="`cut -d' ' -f2- ALLFONTS.txt | sort | uniq -d`" if [ ! -z "$DUP" ]; then echo Duplicated XLFDs found. Please fix. echo ----------------------------------------- echo "$DUP" exit 1 fi cp ALLFONTS.txt mkalias.dat # CHARSET PXL MISC FIXED MINCHO GOTHIC # now, pixel 10 jisx0201 and pixel 20 gothic, # pixel 12 jisx0201 and pixel 24 gothic does not exist (fake) %{mkalias} Misc-Fixed Alias-Fixed Alias-Gothic Alias-Mincho - \ ISO8859-1 10 mplus_f10WEIGHT mplus_f10WEIGHT mplus_j10WEIGHT - \ ISO8859-1 12 shnm6x12a shnm6x12a shnm6x12a shnm6x12a \ ISO8859-1 14 7x14a 7x14a 7x14a 7x14a \ ISO8859-1 16 shnm8x16a shnm8x16a shnm8x16a shnm8x16a \ ISO8859-1 18 shnm9x18a shnm9x18a shnm9x18a shnm9x18a \ ISO8859-1 20 10x20rk 10x20rk - 10x20rk \ ISO8859-1 24 12x24a 12x24a - 12x24a \ JISX0201.1976-0 10 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 \ JISX0201.1976-0 12 shnm6x12r shnm6x12r shnm6x12r shnm6x12r \ JISX0201.1976-0 14 7x14rk 7x14rk 7x14rk 7x14rk \ JISX0201.1976-0 16 shnm8x16r shnm8x16r shnm8x16r shnm8x16r \ JISX0201.1976-0 18 shnm9x18r shnm9x18r shnm9x18r shnm9x18r \ JISX0201.1976-0 20 10x20rk 10x20rk - 10x20rk \ JISX0201.1976-0 24 12x24rk 12x24rk - 12x24rk \ JISX0208.1983-0 10 mplus_j10WEIGHT mplus_j10WEIGHT mplus_j10WEIGHT - \ JISX0208.1983-0 12 shnmk12 shnmk12 shnmk12 shnmk12min \ JISX0208.1983-0 14 shnmk14 shnmk14 shnmk14 k14 \ JISX0208.1983-0 16 shnmk16 shnmk16 shnmk16 shnmk16min \ JISX0208.1983-0 20 - - - k20 \ JISX0208.1983-0 24 - - - jiskan24 \ JISX0208.1990-0 10 mplus_j10WEIGHT mplus_j10WEIGHT mplus_j10WEIGHT - \ JISX0213.2000-1 12 warabi12-2000-1 warabi12-2000-1 warabi12-2000-1 warabi12-2000-1 \ JISX0213.2000-1 14 k14-2000-1 k14-2000-1 k14-2000-1 k14-2000-1 \ JISX0213.2000-2 14 k14-2000-2 k14-2000-2 k14-2000-2 k14-2000-2 \ JISX0213.2000-1 16 jiskan16-2000-1 jiskan16-2000-1 jiskan16-2000-1 jiskan16-2000-1 \ JISX0213.2000-2 16 jiskan16-2000-2 jiskan16-2000-2 jiskan16-2000-2 jiskan16-2000-2 \ JISX0213.2000-1 24 jiskan24-2000-1 jiskan24-2000-1 jiskan24-2000-1 jiskan24-2000-1 \ JISX0213.2000-2 24 jiskan24-2000-2 jiskan24-2000-2 jiskan24-2000-2 jiskan24-2000-2 \ JISX0213.2003-1 24 jiskan24-2003-1 jiskan24-2003-1 jiskan24-2003-1 jiskan24-2003-1 \ > fonts.alias mkdir BDFS for src in *.bdf; do bdftopcf $src | gzip -9 > ${src%.bdf}.pcf.gz && mv $src BDFS/ done popd %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{bmpfontdir} install -d $RPM_BUILD_ROOT%{cidmapdir} ## jisksp14 install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/ ## kappa20 ## knm_new for i in knmhn12x.bdf fonts/kaname-latin1.bdf fonts/knm12p.bdf fonts/knm12pb.bdf fonts/knmzn12x.bdf fonts/knmzn12xb.bdf; do bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'` done ## fonts-ja ### remove an unnecessary file rm -f fonts-ja/mplus_cursors.pcf.gz for i in fonts-ja/*.pcf.gz; do install -m 0644 -p $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i` done # for ghostscript install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/ install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/ install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/ # Create fonts.scale and fonts.dir /usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir} # for dummy touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1 touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1 touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/ # Install catalogue symlink install -d $RPM_BUILD_ROOT%{catalogue} ln -sf %{bmpfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post umask 133 if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{fontdir} || : fi %postun umask 133 if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{fontdir} || : fi fi %files %defattr(0644, root, root, 0755) %doc doc.orig readme.kaname_bdf %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt %dir %{fontdir} %dir %{cidmapdir} %verify(not md5 size mtime) %{bmpfontdir}/fonts.alias %verify(not md5 size mtime) %{bmpfontdir}/fonts.dir %ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir %{fontdir}/*gz %{cidmapdir}/FAPIcidfmap.ja %{cidmapdir}/cidfmap.ja %{cidmapdir}/CIDFnmap.ja %{catalogue}/* %changelog * Thu Jul 10 2008 Akira TAGOH - 0.20080710-1 - Renamed package from fonts-japanese. (#253149) - Get rid of ttf font packages' dependencies. - clean up the spec file a bit. * Tue Apr 8 2008 Akira TAGOH - 0.20061016-13 - Add VLGothic-fonts deps and drop sazanami-fonts-gothic. * Wed Sep 26 2007 Akira TAGOH - 0.20061016-12 - Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately. - clean up the spec file. * Fri Aug 31 2007 Akira TAGOH - Add jiskan24-2000-{1,2} and jiskan24-2003-1. * Thu Aug 30 2007 Akira TAGOH - drop BR gzip * Wed Aug 29 2007 Akira TAGOH - clean up the spec file. * Tue Aug 28 2007 Jens Petersen - 0.20061016-11 - use the standard font scriptlets (Michal Jaegermann, #259041) * Mon Aug 27 2007 Jens Petersen - 0.20061016-10 - sazanami fonts have been moved to a new package sazanami-fonts (#253149) * Wed Aug 22 2007 Akira TAGOH - 0.20061016-9 - No need to own /etc/X11/fontpath.d. - Update BR. * Wed Aug 15 2007 Akira TAGOH - 0.20061016-8 - Migrate to /etc/X11/fontpath.d instead of running chkfontpath. (#252275) - Generate fonts.dir at the build time instead of the runtime. - Drop fc-cache dependency since it's a conditional scriptlet. * Tue Aug 14 2007 Akira TAGOH - Update License tag. * Thu Apr 12 2007 Akira TAGOH - 0.20061016-6 - Remove %%config from the files under /usr/share/ghostscript/conf.d. - clean up more in spec file. * Tue Apr 10 2007 Akira TAGOH - 0.20061016-5 - Move the configuration files for ghostscript under /usr/share/ghostscript/conf.d * Fri Mar 15 2007 Akira TAGOH - 0.20061016-4 - more cleanups. (#225765) * Thu Mar 1 2007 Akira TAGOH - 0.20061016-3 - cleanup spec file. - updated mplus to 2.2.4 * Fri Nov 24 2006 Akira TAGOH - 0.20061016-2 - added CIDFnmap.ja (#215980) * Fri Oct 27 2006 Akira TAGOH - 0.20061016-1 - correct U+7E6B. (#196433) * Wed Jul 12 2006 Jesse Keating - 0.20050222-11.1.1 - rebuild * Fri Dec 09 2005 Jesse Keating - rebuilt * Thu Nov 17 2005 Warren Togami - 0.20050222-11 - split req(foo,bar) for erasure ordering * Tue Nov 15 2005 Jeremy Katz - 0.20050222-10 - better mkfontdir * Mon Nov 14 2005 Warren Togami - 0.20050222-9 - rebuild against modular X * Mon Nov 7 2005 Akira TAGOH - 0.20050222-8 - rely on PATH to find mkfontdir instead of /usr/X11R6/bin hardcoded. - replace Requires: mkfontdir instead of /usr/X11R6/bin/mkfontdir. * Tue Aug 16 2005 Akira TAGOH - 0.20050222-7 - Added cidfmap.ja for the latest ghostscript. - Removed Kochi fonts. * Tue Aug 2 2005 Akira TAGOH - 0.20050222-6 - contain Sazanami fonts. * Thu Jul 14 2005 Akira TAGOH - 0.20050222-5 - use FAPIcidfmap instead of CIDFnmap for gs8. * Thu Jun 9 2005 Akira TAGOH - 0.20050222-4 - removed VFlib2 dependency. * Wed Apr 20 2005 Akira TAGOH - 0.20050222-3 - Updated the font path in CIDFnmap.ja (John Thacker, #155403) * Thu Feb 24 2005 Akira TAGOH - 0.20050222-2 - Use /usr/share/fonts/japanese instead of /usr/share/fonts/ja * Tue Feb 22 2005 Akira TAGOH - 0.20050222-1 - gets back Kochi font temporarily. * Thu Feb 10 2005 Akira TAGOH - 0.20050210-1 - Initial release. - integrated the below packages: - ttfonts-ja - jisksp14 - jisksp16-1990 - kappa20 - knm_new - fonts-ja - Update shinonome font to 0.9.11. - Use Sazanami fonts instead of Kochi fonts. k14-1990.patch: --- NEW FILE k14-1990.patch --- *** k14.bdf Tue Jun 8 17:40:53 1993 --- k14-1990.bdf Fri Jul 9 12:07:09 1993 *************** *** 2,9 **** COMMENT COMMENT Donated by H. Kagotani ; public domain COMMENT font from Japan COMMENT ! FONT -Misc-Fixed-Medium-R-Normal--14-130-75-75-C-140-JISX0208.1983-0 SIZE 14 75 75 FONTBOUNDINGBOX 14 14 0 -2 STARTPROPERTIES 19 --- 2,11 ---- COMMENT COMMENT Donated by H. Kagotani ; public domain COMMENT font from Japan + COMMENT Modified by TAKADA Toshihiro + COMMENT changed to JIS X 0208-1990 COMMENT ! FONT -Misc-Fixed-Medium-R-Normal--14-130-75-75-C-140-JISX0208.1990-0 SIZE 14 75 75 FONTBOUNDINGBOX 14 14 0 -2 STARTPROPERTIES 19 *************** *** 20,33 **** RESOLUTION_Y 75 SPACING "C" AVERAGE_WIDTH 140 ! CHARSET_REGISTRY "JISX0208.1983" CHARSET_ENCODING "0" DEFAULT_CHAR 8481 FONT_DESCENT 2 FONT_ASCENT 12 COPYRIGHT "Public domain font. Share and enjoy." ENDPROPERTIES ! CHARS 6877 STARTCHAR 2121 ENCODING 8481 SWIDTH 960 0 --- 22,35 ---- RESOLUTION_Y 75 SPACING "C" AVERAGE_WIDTH 140 ! CHARSET_REGISTRY "JISX0208.1990" CHARSET_ENCODING "0" DEFAULT_CHAR 8481 FONT_DESCENT 2 FONT_ASCENT 12 COPYRIGHT "Public domain font. Share and enjoy." ENDPROPERTIES ! CHARS 6879 STARTCHAR 2121 ENCODING 8481 SWIDTH 960 0 *************** *** 144445,144448 **** --- 144447,144492 ---- 03F8 0208 ENDCHAR + STARTCHAR 7425 + ENCODING 29733 + SWIDTH 960 0 + DWIDTH 14 0 + BBX 14 14 0 -2 + BITMAP + 0040 + 07FC + 2000 + 13F8 + 12E8 + 02A8 + 02E8 + 13F8 + 11F0 + 2040 + 27FC + 4150 + 4248 + 0448 + ENDCHAR + STARTCHAR 7426 + ENCODING 29734 + SWIDTH 960 0 + DWIDTH 14 0 + BBX 14 14 0 -2 + BITMAP + 0000 + 3F78 + 2248 + 2F48 + 2978 + 2948 + 2F40 + 2244 + 3F44 + 203C + 0000 + 2488 + 2244 + 4244 + ENDCHAR ENDFONT k14.patch: --- NEW FILE k14.patch --- --- k14.bdf.orig Thu Nov 30 07:38:41 1989 +++ k14.bdf Thu Sep 21 16:24:18 2000 @@ -34454,19 +34454,19 @@ BBX 14 14 0 -2 BITMAP 0000 -3DF0 -2510 -25F0 -3D10 -25F0 -3C00 -27FC -2500 -3DF8 -1AA8 -14A8 -2548 -42B0 +3CF8 +2488 +24F8 +3C88 +24F8 +3C40 +24FC +2554 +3E54 +1894 +1524 +2444 +4218 ENDCHAR STARTCHAR 3b73 ENCODING 15219 @@ -38821,7 +38821,7 @@ DWIDTH 14 0 BBX 14 14 0 -2 BITMAP -1210 +1110 0920 3FFC 27C8 @@ -39157,7 +39157,7 @@ DWIDTH 14 0 BBX 14 14 0 -2 BITMAP -1210 +1110 0920 3FFC 2008 @@ -65767,10 +65767,10 @@ 0820 0820 0820 -09FC +09F8 7E20 1220 -13F8 +13FC 1270 3C70 24A8 mplus_bitmap_fonts-install.patch: --- NEW FILE mplus_bitmap_fonts-install.patch --- diff -ruN mplus_bitmap_fonts-2.2.1.orig/install_mplus_fonts mplus_bitmap_fonts-2.2.1/install_mplus_fonts --- mplus_bitmap_fonts-2.2.1.orig/install_mplus_fonts 2004-06-12 20:36:49.000000000 +0900 +++ mplus_bitmap_fonts-2.2.1/install_mplus_fonts 2004-06-17 22:01:12.000000000 +0900 @@ -52,7 +52,8 @@ do b=`basename $f .bdf` echo "create: $b.pcf.gz" - bdftopcf $f | gzip > $PREFIX/$b.pcf.gz + cp -a $f $PREFIX/ +# bdftopcf $f | gzip > $PREFIX/$b.pcf.gz done echo "create: fonts.alias for M+ BITMAP FONTS E" cat fonts.alias > $PREFIX/fonts.alias @@ -69,14 +70,16 @@ cp ../$b.bdf ./ patch $b.bdf $b.diff mv $b.bdf $b-euro.bdf - bdftopcf $b-euro.bdf | gzip > $PREFIX/$b-euro.pcf.gz + cp -a $b-euro.bdf $PREFIX/ +# bdftopcf $b-euro.bdf | gzip > $PREFIX/$b-euro.pcf.gz done echo "create: mplus_h12rw-euro.pcf.gz" awk '/^SWIDTH/{$2 += 80} /^DWIDTH/{$2 += 1} {print}' \ mplus_h12r-euro.bdf | sed 's/hlv/hlvw/' > mplus_h12rw-euro.bdf - bdftopcf mplus_h12rw-euro.bdf \ - | gzip > $PREFIX/mplus_h12rw-euro.pcf.gz + cp -a mplus_h12rw-euro.bdf $PREFIX/ +# bdftopcf mplus_h12rw-euro.bdf \ +# | gzip > $PREFIX/mplus_h12rw-euro.pcf.gz # rm $b-euro.bdf echo "create: fonts.alias for M+ BITMAP FONTS EURO" @@ -141,7 +144,8 @@ do b=`basename $f .bdf` echo "create: $b.pcf.gz" - bdftopcf $f | gzip > $PREFIX/$b.pcf.gz + cp -a $f $PREFIX/ +# bdftopcf $f | gzip > $PREFIX/$b.pcf.gz done # rm mplus_j1*b.bdf Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/japanese-bitmap-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2008 02:59:39 -0000 1.1 +++ .cvsignore 10 Jul 2008 02:46:05 -0000 1.2 @@ -0,0 +1,17 @@ +*.bz2 +*.gz +*.rpm +Kappa20-0.396.tar.bz2 +shinonome-0.9.11-src.tar.bz2 +imamura-jisx0213.tgz +jiskan24-2000-1.bdf.gz +jiskan24-2000-2.bdf.gz +jiskan24-2003-1.bdf.gz +jisksp14.bdf.gz +k14-oldkanji.tar.gz +kaname_k12_bdf.tar.gz +marumoji.tgz +mplus_bitmap_fonts-2.2.4.tar.gz +vine-fonttools-0.1.tgz +warabi12-0.19a.tar.gz +xfonts_jp.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/japanese-bitmap-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 02:59:39 -0000 1.1 +++ sources 10 Jul 2008 02:46:05 -0000 1.2 @@ -0,0 +1,14 @@ +19ff56e6de82e8f9a02c9cebf5af0cdc Kappa20-0.396.tar.bz2 +38ce9221d128383a3f9f50eb641da424 shinonome-0.9.11-src.tar.bz2 +b3900ebac6dd1044423bef5e23d653dc imamura-jisx0213.tgz +8bf9dd5217c81c8ab158cb422fae3270 jiskan24-2000-1.bdf.gz +497d6296632f5e29475bbf7074912f6b jiskan24-2000-2.bdf.gz +d452c1138a4684f864b8d12ec0e2f00d jiskan24-2003-1.bdf.gz +e8a452c07cd5d1d31d3a6f32c2b74265 jisksp14.bdf.gz +c59fc33f4319a291c1f3f7d58d896b9c k14-oldkanji.tar.gz +e0a103ceeffe0aa1c5670458f47452b3 kaname_k12_bdf.tar.gz +a412bc6920d29be2689b3c3192bcdbd2 marumoji.tgz +a97a99acbee54976407dec828d03850c mplus_bitmap_fonts-2.2.4.tar.gz +c6b7771e4f00e310fe807b3245fd316e vine-fonttools-0.1.tgz +e0e1d3b139159a2af09bc9867c9a654b warabi12-0.19a.tar.gz +fa5981d270f432d36818329c8878ba6e xfonts_jp.tgz From fedora-extras-commits at redhat.com Thu Jul 10 02:59:41 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Thu, 10 Jul 2008 02:59:41 GMT Subject: rpms/japanese-bitmap-fonts/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807100259.m6A2xfVX011278@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/japanese-bitmap-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11149 Modified Files: .cvsignore sources Log Message: add mising files Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/japanese-bitmap-fonts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Jul 2008 02:46:05 -0000 1.2 +++ .cvsignore 10 Jul 2008 02:58:57 -0000 1.3 @@ -15,3 +15,5 @@ vine-fonttools-0.1.tgz warabi12-0.19a.tar.gz xfonts_jp.tgz +jiskan16-1990.bdf.Z +jiskano16-1997.bdf.Z Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/japanese-bitmap-fonts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Jul 2008 02:46:05 -0000 1.2 +++ sources 10 Jul 2008 02:58:57 -0000 1.3 @@ -12,3 +12,5 @@ c6b7771e4f00e310fe807b3245fd316e vine-fonttools-0.1.tgz e0e1d3b139159a2af09bc9867c9a654b warabi12-0.19a.tar.gz fa5981d270f432d36818329c8878ba6e xfonts_jp.tgz +77d997789026b1829bb4a33f65a0ce78 jiskan16-1990.bdf.Z +c9fd21064b4ad6f1af0bcdb40a4222ee jiskano16-1997.bdf.Z From fedora-extras-commits at redhat.com Thu Jul 10 03:17:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:17:36 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100317.m6A3Hagv015195@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchbugzilla acl on perl-Net-Telnet (Fedora devel) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:17:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:17:42 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100317.m6A3Hah0015195@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchcommits acl on perl-Net-Telnet (Fedora devel) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:17:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:17:48 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100317.m6A3Hah3015195@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora devel) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:17:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:17:50 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100317.m6A3Hojt015253@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the approveacls acl on perl-Net-Telnet (Fedora devel) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:17:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:17:57 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100317.m6A3HvHL015281@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchbugzilla acl on perl-Net-Telnet (Fedora 8) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:18:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:18:02 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100318.m6A3HvHO015281@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchcommits acl on perl-Net-Telnet (Fedora 8) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:18:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:18:05 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100318.m6A3I5Am015335@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora 8) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:18:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:18:07 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100318.m6A3Hojw015253@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the approveacls acl on perl-Net-Telnet (Fedora 8) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:18:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:18:09 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100318.m6A3Hok1015253@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchbugzilla acl on perl-Net-Telnet (Fedora 9) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:18:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:18:15 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100318.m6A3IF6G015402@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the watchcommits acl on perl-Net-Telnet (Fedora 9) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:18:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:18:20 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100318.m6A3I5Ap015335@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the commit acl on perl-Net-Telnet (Fedora 9) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:18:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 03:18:25 +0000 Subject: [pkgdb] perl-Net-Telnet had acl change status Message-ID: <200807100318.m6A3IF6J015402@bastion.fedora.phx.redhat.com> Fabio M. Di Nitto (fabbione) has set the approveacls acl on perl-Net-Telnet (Fedora 9) to Approved for Jeroen van Meeuwen (kanarip) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 03:23:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 10 Jul 2008 03:23:48 GMT Subject: rpms/gnome-panel/devel gnome-panel.spec,1.307,1.308 Message-ID: <200807100323.m6A3Nm0o019242@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19207 Modified Files: gnome-panel.spec Log Message: small cleanup Index: gnome-panel.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- gnome-panel.spec 9 Jul 2008 20:59:14 -0000 1.307 +++ gnome-panel.spec 10 Jul 2008 03:23:01 -0000 1.308 @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.23.4 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2 @@ -335,7 +335,8 @@ %dir %{_datadir}/omf/workspace-switcher %{_datadir}/man/man*/* %{_datadir}/applications/gnome-panel.desktop -%{_bindir}/* +%{_bindir}/gnome-panel +%{_bindir}/gnome-desktop-item-edit %{_libexecdir}/* %{_libdir}/bonobo/servers/*.server %{_sysconfdir}/gconf/schemas/*.schemas @@ -350,12 +351,16 @@ %files devel %defattr(-, root, root) +%{_bindir}/panel-test-applets %{_libdir}/pkgconfig/* %{_includedir}/panel-2.0 %{_libdir}/*.so %{_datadir}/gtk-doc/html/* %changelog +* Wed Jul 9 2008 Matthias Clasen - 2.23.4-4 +- Move panel-test-applets to the -devel package + * Wed Jul 9 2008 Matthias Clasen - 2.23.4-3 - Use more standard icon names From fedora-extras-commits at redhat.com Thu Jul 10 03:34:34 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 10 Jul 2008 03:34:34 GMT Subject: rpms/gnome-session/devel gnome-session.spec, 1.171, 1.172 icon-names.patch, 1.1, 1.2 Message-ID: <200807100334.m6A3YYaC019523@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19472 Modified Files: gnome-session.spec icon-names.patch Log Message: fix the previous patch Index: gnome-session.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- gnome-session.spec 9 Jul 2008 20:55:00 -0000 1.171 +++ gnome-session.spec 10 Jul 2008 03:33:39 -0000 1.172 @@ -12,7 +12,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.23.4.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -192,6 +192,9 @@ %changelog +* Wed Jul 9 2008 Matthias Clasen - 2.23.4.1-4 +- Fix a typo in the previous patch + * Wed Jul 9 2008 Matthias Clasen - 2.23.4.1-3 - Use more standard icon names icon-names.patch: Index: icon-names.patch =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/icon-names.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icon-names.patch 9 Jul 2008 20:17:59 -0000 1.1 +++ icon-names.patch 10 Jul 2008 03:33:39 -0000 1.2 @@ -7,7 +7,7 @@ -#define GSM_ICON_LOGOUT "gnome-logout" -#define GSM_ICON_SHUTDOWN "gnome-shutdown" -+#define GSM_ICON_LOGOUT "system-logout" ++#define GSM_ICON_LOGOUT "system-log-out" +#define GSM_ICON_SHUTDOWN "system-shutdown" struct _GsmLogoutDialogPrivate From fedora-extras-commits at redhat.com Thu Jul 10 03:54:07 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 10 Jul 2008 03:54:07 GMT Subject: rpms/gedit/devel icon-names.patch,NONE,1.1 gedit.spec,1.157,1.158 Message-ID: <200807100354.m6A3s7tL020180@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20109 Modified Files: gedit.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c.icon-names gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c --- gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c.icon-names 2008-07-09 23:44:16.000000000 -0400 +++ gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c 2008-07-09 23:46:42.000000000 -0400 @@ -140,9 +140,9 @@ add_file (GeditFileBookmarksStore * mode } if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_HOME) - pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-home", GTK_ICON_SIZE_MENU); + pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("user-home", GTK_ICON_SIZE_MENU); else if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_DESKTOP) - pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-desktop", GTK_ICON_SIZE_MENU); + pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("user-desktop", GTK_ICON_SIZE_MENU); else if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_ROOT) pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("drive-harddisk", GTK_ICON_SIZE_MENU); @@ -348,7 +348,7 @@ add_bookmark (GeditFileBookmarksStore * -1); if (!pixbuf) { - pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-directory", GTK_ICON_SIZE_MENU); + pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("folder", GTK_ICON_SIZE_MENU); if (pixbuf) { gtk_tree_store_set (GTK_TREE_STORE (model), diff -up gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c.icon-names gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c --- gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c.icon-names 2008-07-09 23:44:32.000000000 -0400 +++ gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c 2008-07-09 23:47:11.000000000 -0400 @@ -1995,7 +1995,7 @@ model_add_node_from_dir (GeditFileBrowse } if (node->icon == NULL) { - node->icon = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-directory", GTK_ICON_SIZE_MENU); + node->icon = gedit_file_browser_utils_pixbuf_from_theme ("folder", GTK_ICON_SIZE_MENU); } model_add_node (model, node, parent); Index: gedit.spec =================================================================== RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- gedit.spec 14 May 2008 01:54:04 -0000 1.157 +++ gedit.spec 10 Jul 2008 03:53:08 -0000 1.158 @@ -18,7 +18,7 @@ Summary: gEdit is a small but powerful text editor for GNOME Name: gedit Version: 2.23.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: Applications/Editors @@ -46,6 +46,9 @@ # and I needed this patch to make autoconf happy Patch2: gedit-2.15.1-python.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=542300 +Patch3: icon-names.patch + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -108,6 +111,7 @@ %endif %patch2 -p1 -b .python +%patch3 -p1 -b .icon-names %build autoreconf @@ -194,6 +198,9 @@ %changelog +* Wed Jul 9 2008 Matthias Clasen - 1:2.23.1-2 +- Use standard icon names + * Tue May 13 2008 Matthias Clasen - 1:2.23.1-1 - Update to 2.23.1 From fedora-extras-commits at redhat.com Thu Jul 10 03:55:11 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 10 Jul 2008 03:55:11 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.489, 1.490 linux-2.6-lirc.patch, 1.5, 1.6 Message-ID: <200807100355.m6A3tBvW020280@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20195 Modified Files: kernel.spec linux-2.6-lirc.patch Log Message: * Wed Jul 09 2008 Jarod Wilson 2.6.25.9-50 - Actually fix lirc_i2c oops and add new MCE receiver support this time, never actually made it in here... (#453348) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.489 retrieving revision 1.490 diff -u -r1.489 -r1.490 --- kernel.spec 10 Jul 2008 00:15:24 -0000 1.489 +++ kernel.spec 10 Jul 2008 03:54:25 -0000 1.490 @@ -1830,6 +1830,10 @@ %changelog +* Wed Jul 09 2008 Jarod Wilson 2.6.25.9-50 +- Actually fix lirc_i2c oops and add new MCE receiver support this + time, never actually made it in here... (#453348) + * Wed Jul 09 2008 Chuck Ebbert 2.6.25.9-49 - hdaps: support new Lenovo notebook models (F9#449888) linux-2.6-lirc.patch: Index: linux-2.6-lirc.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-lirc.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-lirc.patch 21 May 2008 21:22:40 -0000 1.5 +++ linux-2.6-lirc.patch 10 Jul 2008 03:54:25 -0000 1.6 @@ -1,8 +1,39 @@ + drivers/input/Kconfig | 2 + + drivers/input/Makefile | 2 + + drivers/input/lirc/Kconfig | 127 +++ + drivers/input/lirc/Makefile | 24 + + drivers/input/lirc/commandir.c | 1009 +++++++++++++++++++++++ + drivers/input/lirc/commandir.h | 41 + + drivers/input/lirc/kcompat.h | 152 ++++ + drivers/input/lirc/lirc.h | 102 +++ + drivers/input/lirc/lirc_atiusb.c | 1326 ++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_bt829.c | 393 +++++++++ + drivers/input/lirc/lirc_cmdir.c | 605 ++++++++++++++ + drivers/input/lirc/lirc_cmdir.h | 27 + + drivers/input/lirc/lirc_dev.c | 827 +++++++++++++++++++ + drivers/input/lirc/lirc_dev.h | 264 ++++++ + drivers/input/lirc/lirc_i2c.c | 668 +++++++++++++++ + drivers/input/lirc/lirc_igorplugusb.c | 624 ++++++++++++++ + drivers/input/lirc/lirc_imon.c | 1165 +++++++++++++++++++++++++++ + drivers/input/lirc/lirc_it87.c | 1012 +++++++++++++++++++++++ + drivers/input/lirc/lirc_it87.h | 116 +++ + drivers/input/lirc/lirc_mceusb.c | 890 ++++++++++++++++++++ + drivers/input/lirc/lirc_mceusb2.c | 1058 ++++++++++++++++++++++++ + drivers/input/lirc/lirc_parallel.c | 745 +++++++++++++++++ + drivers/input/lirc/lirc_parallel.h | 26 + + drivers/input/lirc/lirc_pvr150.c | 1431 +++++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_sasem.c | 971 ++++++++++++++++++++++ + drivers/input/lirc/lirc_serial.c | 1348 +++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_sir.c | 1323 ++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_streamzap.c | 810 +++++++++++++++++++ + drivers/input/lirc/lirc_ttusbir.c | 393 +++++++++ + 29 files changed, 17481 insertions(+), 0 deletions(-) + diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig -index 9dea14d..d84ac4a 100644 +index 5f9d860..747633c 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig -@@ -173,5 +173,7 @@ source "drivers/input/gameport/Kconfig" +@@ -182,5 +182,7 @@ source "drivers/input/gameport/Kconfig" endmenu @@ -11,16 +42,15 @@ endmenu diff --git a/drivers/input/Makefile b/drivers/input/Makefile -index 2ae87b1..24bdec1 100644 +index 98c4f9a..6a1049b 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile -@@ -21,5 +21,6 @@ obj-$(CONFIG_INPUT_JOYSTICK) += joystick/ - obj-$(CONFIG_INPUT_TABLET) += tablet/ - obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/ +@@ -23,3 +23,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/ obj-$(CONFIG_INPUT_MISC) += misc/ -+obj-$(CONFIG_INPUT_LIRC) += lirc/ obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o ++ ++obj-$(CONFIG_INPUT_LIRC) += lirc/ diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig new file mode 100644 index 0000000..138e58a @@ -1248,10 +1278,10 @@ + diff --git a/drivers/input/lirc/kcompat.h b/drivers/input/lirc/kcompat.h new file mode 100644 -index 0000000..7792a88 +index 0000000..da2e7eb --- /dev/null +++ b/drivers/input/lirc/kcompat.h -@@ -0,0 +1,150 @@ +@@ -0,0 +1,153 @@ +/* $Id$ */ + +#ifndef _KCOMPAT_H @@ -1269,12 +1299,15 @@ + + + -+#define lirc_class_device_create class_device_create ++#define lirc_device_create(cs, parent, dev, fmt, args...) \ ++ class_device_create(cs, NULL, dev, parent, fmt, ## args) +#define LIRC_DEVFS_PREFIX + + +typedef struct class lirc_class_t; + ++#define lirc_device_destroy class_device_destroy ++ + + +#ifndef LIRC_DEVFS_PREFIX @@ -1404,10 +1437,10 @@ +#endif /* _KCOMPAT_H */ diff --git a/drivers/input/lirc/lirc.h b/drivers/input/lirc/lirc.h new file mode 100644 -index 0000000..ee76bc9 +index 0000000..accd2cd --- /dev/null +++ b/drivers/input/lirc/lirc.h -@@ -0,0 +1,101 @@ +@@ -0,0 +1,102 @@ +/* $Id$ */ + +#ifndef _LINUX_LIRC_H @@ -1466,6 +1499,7 @@ + +#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000 +#define LIRC_CAN_SET_REC_CARRIER_RANGE 0x80000000 ++#define LIRC_CAN_GET_REC_RESOLUTION 0x20000000 + +#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK) +#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK) @@ -3886,7 +3920,7 @@ +#endif diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c new file mode 100644 -index 0000000..cbbc436 +index 0000000..1d5706f --- /dev/null +++ b/drivers/input/lirc/lirc_dev.c @@ -0,0 +1,827 @@ @@ -4000,7 +4034,7 @@ +#ifdef LIRC_HAVE_DEVFS_26 + devfs_remove(DEV_LIRC "/%u", ir->p.minor); +#endif -+ class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); ++ lirc_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); + + if (ir->buf != ir->p.rbuf) { + lirc_buffer_free(ir->buf); @@ -4221,9 +4255,9 @@ + S_IFCHR|S_IRUSR|S_IWUSR, + DEV_LIRC "/%u", ir->p.minor); +#endif -+ (void) lirc_class_device_create(lirc_class, NULL, -+ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), -+ ir->p.dev, "lirc%u", ir->p.minor); ++ (void) lirc_device_create(lirc_class, ir->p.dev, ++ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), ++ "lirc%u", ir->p.minor); + + if (p->sample_rate || p->get_queue) { + /* try to fire up polling thread */ @@ -4249,7 +4283,7 @@ + return minor; + +out_sysfs: -+ class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); ++ lirc_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); +#ifdef LIRC_HAVE_DEVFS_26 + devfs_remove(DEV_LIRC "/%i", ir->p.minor); +#endif @@ -4989,10 +5023,10 @@ +#endif diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c new file mode 100644 -index 0000000..ed1092b +index 0000000..6e47d53 --- /dev/null +++ b/drivers/input/lirc/lirc_i2c.c -@@ -0,0 +1,671 @@ +@@ -0,0 +1,668 @@ +/* $Id$ */ + +/* @@ -5324,12 +5358,9 @@ +static int set_use_inc(void *data) +{ + struct IR *ir = data; -+ int ret; + + /* lock bttv in memory while /dev/lirc is in use */ -+ ret = i2c_use_client(&ir->c); -+ if (ret != 0) -+ return ret; ++ i2c_use_client(&ir->c); + + MOD_INC_USE_COUNT; + return 0; @@ -9503,12 +9534,12 @@ +EXPORT_NO_SYMBOLS; diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c new file mode 100644 -index 0000000..85dc1ce +index 0000000..9e927a4 --- /dev/null +++ b/drivers/input/lirc/lirc_mceusb2.c -@@ -0,0 +1,1042 @@ +@@ -0,0 +1,1058 @@ +/* -+ * LIRC driver for Philips eHome USB Infrared Transciever ++ * LIRC driver for Philips eHome USB Infrared Transceiver + * and the Microsoft MCE 2005 Remote Control + * + * (C) by Martin A. Blatter @@ -9567,7 +9598,7 @@ +#define DRIVER_VERSION "$Revision$" +#define DRIVER_AUTHOR "Daniel Melander , " \ + "Martin Blatter " -+#define DRIVER_DESC "Philips eHome USB IR Transciever and Microsoft " \ ++#define DRIVER_DESC "Philips eHome USB IR Transceiver and Microsoft " \ + "MCE 2005 Remote Control driver for LIRC" +#define DRIVER_NAME "lirc_mceusb2" + @@ -9587,6 +9618,7 @@ +#define MCE_PULSE_BIT 0x80 /* Pulse bit, MSB set == PULSE else SPACE */ +#define MCE_PULSE_MASK 0x7F /* Pulse mask */ +#define MCE_MAX_PULSE_LENGTH 0x7F /* Longest transmittable pulse symbol */ ++#define MCE_PACKET_LENGTH_MASK 0x7F /* Pulse mask */ + + +/* module parameters */ @@ -9621,6 +9653,7 @@ +#define VENDOR_TATUNG 0x1460 +#define VENDOR_GATEWAY 0x107b +#define VENDOR_SHUTTLE 0x1308 ++#define VENDOR_SHUTTLE2 0x051c +#define VENDOR_MITSUMI 0x03ee +#define VENDOR_TOPSEED 0x1784 +#define VENDOR_RICAVISION 0x179d @@ -9630,12 +9663,15 @@ +#define VENDOR_MICROSOFT 0x045e +#define VENDOR_FORMOSA 0x147a +#define VENDOR_FINTEK 0x1934 ++#define VENDOR_PINNACLE 0x2304 + +static struct usb_device_id usb_remote_table [] = { -+ /* Philips eHome Infrared Transciever */ ++ /* Philips eHome Infrared Transceiver */ + { USB_DEVICE(VENDOR_PHILIPS, 0x0815) }, -+ /* Philips Infrared Transciever - HP branded */ ++ /* Philips Infrared Transceiver - HP branded */ + { USB_DEVICE(VENDOR_PHILIPS, 0x060c) }, ++ /* Philips SRM5100 */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x060d) }, + /* SMK/Toshiba G83C0004D410 */ + { USB_DEVICE(VENDOR_SMK, 0x031d) }, + /* SMK eHome Infrared Transceiver (Sony VAIO) */ @@ -9646,6 +9682,8 @@ + { USB_DEVICE(VENDOR_TATUNG, 0x9150) }, + /* Shuttle eHome Infrared Transceiver */ + { USB_DEVICE(VENDOR_SHUTTLE, 0xc001) }, ++ /* Shuttle eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_SHUTTLE2, 0xc001) }, + /* Gateway eHome Infrared Transceiver */ + { USB_DEVICE(VENDOR_GATEWAY, 0x3009) }, + /* Mitsumi */ @@ -9672,8 +9710,12 @@ + { USB_DEVICE(VENDOR_FORMOSA, 0xe015) }, + /* Formosa aim / Trust MCE Infrared Receiver */ + { USB_DEVICE(VENDOR_FORMOSA, 0xe017) }, ++ /* Formosa Industrial Computing / Beanbag Emulation Device */ ++ { USB_DEVICE(VENDOR_FORMOSA, 0xe018) }, + /* Fintek eHome Infrared Transceiver */ + { USB_DEVICE(VENDOR_FINTEK, 0x0602) }, ++ /* Pinnacle Remote Kit */ ++ { USB_DEVICE(VENDOR_PINNACLE, 0x0225) }, + /* Terminating entry */ + { } +}; @@ -9943,9 +9985,11 @@ + /* success */ + case SUCCESS: + for (i = 0; i < buf_len; i++) { -+ /* decode mce packets on the form (84),AA,BB,CC,DD */ ++ /* decode mce packets of the form (84),AA,BB,CC,DD */ + switch (ir->buf_in[i]) { ++ + /* data headers */ ++ case 0x90: /* used Pinnacle Remote Kit */ + case 0x8F: + case 0x8E: + case 0x8D: @@ -9963,7 +10007,8 @@ + case 0x81: + case 0x80: + /* decode packet data */ -+ packet_len = ir->buf_in[i] & MCE_PULSE_MASK; ++ packet_len = ir->buf_in[i] & ++ MCE_PACKET_LENGTH_MASK; + for (j = 1; + j <= packet_len && (i+j < buf_len); + j++) { @@ -10132,7 +10177,9 @@ + (ir->usbdev->descriptor.idVendor == VENDOR_TOPSEED && + (ir->usbdev->descriptor.idProduct == 0x0001 || + ir->usbdev->descriptor.idProduct == 0x0007 || -+ ir->usbdev->descriptor.idProduct == 0x0008))) ++ ir->usbdev->descriptor.idProduct == 0x0008)) || ++ (ir->usbdev->descriptor.idVendor == VENDOR_PINNACLE && ++ (ir->usbdev->descriptor.idProduct == 0x0225))) + ir->transmitter_mask = mask; + else + /* The mask begins at 0x02 and has an inverted From fedora-extras-commits at redhat.com Thu Jul 10 04:12:39 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 10 Jul 2008 04:12:39 GMT Subject: rpms/kernel/F-8 linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch, NONE, 1.1 kernel.spec, 1.490, 1.491 Message-ID: <200807100412.m6A4CdLX028640@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28615 Modified Files: kernel.spec Added Files: linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch Log Message: * Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-51 - Fix reiserfs list corruption (F9#453699) linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch: --- NEW FILE linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch --- From: Jeff Mahoney Date: Tue, 8 Jul 2008 18:37:06 +0000 (-0400) Subject: reiserfs: discard prealloc in reiserfs_delete_inode X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=eb35c218d83ec0780d9db869310f2e333f628702 reiserfs: discard prealloc in reiserfs_delete_inode With the removal of struct file from the xattr code, reiserfs_file_release() isn't used anymore, so the prealloc isn't discarded. This causes hangs later down the line. This patch adds it to reiserfs_delete_inode. In most cases it will be a no-op due to it already having been called, but will avoid hangs with xattrs. Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds --- diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 5791793..1922696 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -45,6 +45,8 @@ void reiserfs_delete_inode(struct inode *inode) goto out; reiserfs_update_inode_transaction(inode); + reiserfs_discard_prealloc(&th, inode); + err = reiserfs_delete_object(&th, inode); /* Do quota update inside a transaction for journaled quotas. We must do that Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.490 retrieving revision 1.491 diff -u -r1.490 -r1.491 --- kernel.spec 10 Jul 2008 03:54:25 -0000 1.490 +++ kernel.spec 10 Jul 2008 04:11:40 -0000 1.491 @@ -624,6 +624,7 @@ Patch426: linux-2.6-fs-fat-cleanup-code.patch Patch427: linux-2.6-fs-fat-fix-setattr.patch Patch428: linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch +Patch429: linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch Patch430: linux-2.6-net-silence-noisy-printks.patch Patch431: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch @@ -1113,6 +1114,8 @@ ApplyPatch linux-2.6-fs-fat-cleanup-code.patch ApplyPatch linux-2.6-fs-fat-fix-setattr.patch ApplyPatch linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch +# fix reiserfs hang (from F9) +ApplyPatch linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch # Networking # Disable easy to trigger printk's. @@ -1830,18 +1833,21 @@ %changelog -* Wed Jul 09 2008 Jarod Wilson 2.6.25.9-50 +* Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-51 +- Fix reiserfs list corruption (F9#453699) + +* Wed Jul 09 2008 Jarod Wilson 2.6.25.10-50 - Actually fix lirc_i2c oops and add new MCE receiver support this time, never actually made it in here... (#453348) -* Wed Jul 09 2008 Chuck Ebbert 2.6.25.9-49 +* Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-49 - hdaps: support new Lenovo notebook models (F9#449888) -* Tue Jul 08 2008 John W. Linville 2.6.25.9-48 +* Tue Jul 08 2008 John W. Linville 2.6.25.10-48 - Upstream wireless fixes from 2008-07-07 (http://marc.info/?l=linux-wireless&m=121546143025524&w=2) -* Mon Jul 07 2008 Chuck Ebbert 2.6.25.9-47 +* Mon Jul 07 2008 Chuck Ebbert 2.6.25.10-47 - Disable file capabilities. - Fix USB interrupt handling with shared interrupts. @@ -1853,7 +1859,7 @@ - Apply Stefan Becker's fix for bad hunk of wireless build fixups for 2.6.25 (https://bugzilla.redhat.com/show_bug.cgi?id=453390#c36) -* Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-42 +* Thu Jul 03 2008 Chuck Ebbert 2.6.25.10-42 - Linux 2.6.25.10 - Reverted stable patch, not needed with utrace: x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch From fedora-extras-commits at redhat.com Thu Jul 10 05:26:21 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 05:26:21 GMT Subject: rpms/libtomoe-gtk/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE libtomoe-gtk.spec, 1.16, NONE sources, 1.6, NONE Message-ID: <200807100526.m6A5QLnA004846@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4820 Added Files: dead.package Removed Files: .cvsignore libtomoe-gtk.spec sources Log Message: package moved to tomoe-gtk --- NEW FILE dead.package --- This package has been renamed to tomoe-gtk for F10. --- .cvsignore DELETED --- --- libtomoe-gtk.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 06:18:16 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Thu, 10 Jul 2008 06:18:16 GMT Subject: rpms/fonts-japanese/devel dead.package, NONE, 1.1 .cvsignore, 1.7, NONE CIDFnmap.ja, 1.7, NONE FAPIcidfmap.ja, 1.4, NONE Makefile, 1.2, NONE cidfmap.ja, 1.3, NONE fonts-ja-8.0-gcc-warnings.patch, 1.1, NONE fonts-japanese.spec, 1.38, NONE fonts.alias.kk, 1.1, NONE fonts.alias.sz, 1.1, NONE fonttools-replace.patch, 1.1, NONE k14-1990.patch, 1.1, NONE k14.patch, 1.1, NONE mplus_bitmap_fonts-install.patch, 1.1, NONE sources, 1.9, NONE Message-ID: <200807100618.m6A6IGBe013017@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/fonts-japanese/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13004 Added Files: dead.package Removed Files: .cvsignore CIDFnmap.ja FAPIcidfmap.ja Makefile cidfmap.ja fonts-ja-8.0-gcc-warnings.patch fonts-japanese.spec fonts.alias.kk fonts.alias.sz fonttools-replace.patch k14-1990.patch k14.patch mplus_bitmap_fonts-install.patch sources Log Message: fonts-japanese package has been renamed to japanese-bitmap-fonts. --- NEW FILE dead.package --- fonts-japanese package has been renamed to japanese-bitmap-fonts. --- .cvsignore DELETED --- --- CIDFnmap.ja DELETED --- --- FAPIcidfmap.ja DELETED --- --- Makefile DELETED --- --- cidfmap.ja DELETED --- --- fonts-ja-8.0-gcc-warnings.patch DELETED --- --- fonts-japanese.spec DELETED --- --- fonts.alias.kk DELETED --- --- fonts.alias.sz DELETED --- --- fonttools-replace.patch DELETED --- --- k14-1990.patch DELETED --- --- k14.patch DELETED --- --- mplus_bitmap_fonts-install.patch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 06:20:41 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 06:20:41 GMT Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.23,1.24 Message-ID: <200807100620.m6A6KfDi013139@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13077 Modified Files: scim-tomoe.spec Log Message: - libtomoe-gtk package was renamed to tomoe-gtk - rebuild also for gucharmap disabled now Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- scim-tomoe.spec 14 Apr 2008 07:36:25 -0000 1.23 +++ scim-tomoe.spec 10 Jul 2008 06:19:49 -0000 1.24 @@ -1,6 +1,6 @@ Name: scim-tomoe Version: 0.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tomoe module for SCIM for handwritten input Group: System Environment/Libraries @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel -BuildRequires: tomoe-devel >= %{version}, libtomoe-gtk-devel >= %{version} +BuildRequires: tomoe-devel >= %{version}, tomoe-gtk-devel >= %{version} BuildRequires: perl(XML::Parser), gettext -Requires: scim, tomoe >= %{version}, libtomoe-gtk >= %{version} +Requires: scim, tomoe >= %{version}, tomoe-gtk >= %{version} Patch1: scim-tomoe-0.6.0-gcc43-cstring-440886.patch %description @@ -52,6 +52,10 @@ %changelog +* Thu Jul 10 2008 Jens Petersen - 0.6.0-4.fc10 +- libtomoe-gtk package was renamed to tomoe-gtk +- rebuild also for gucharmap disabled now + * Mon Apr 14 2008 Jens Petersen - 0.6.0-3 - fix build under gcc43 (#440886) - use the main sourceforge project URL From fedora-extras-commits at redhat.com Thu Jul 10 06:49:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:49:56 +0000 Subject: [pkgdb] libgsasl had groupAcl changed Message-ID: <200807100649.m6A6nufk022201@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libgsasl (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgsasl From fedora-extras-commits at redhat.com Thu Jul 10 06:50:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:50:07 +0000 Subject: [pkgdb] libgsasl had groupAcl changed Message-ID: <200807100650.m6A6o7VF022231@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libgsasl (Fedora 9) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgsasl From fedora-extras-commits at redhat.com Thu Jul 10 06:50:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:50:10 +0000 Subject: [pkgdb] libgsasl had groupAcl changed Message-ID: <200807100650.m6A6o7VH022231@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libgsasl (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgsasl From fedora-extras-commits at redhat.com Thu Jul 10 06:50:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:50:12 +0000 Subject: [pkgdb] libgsasl had groupAcl changed Message-ID: <200807100650.m6A6oCNh022266@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libgsasl (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgsasl From fedora-extras-commits at redhat.com Thu Jul 10 06:50:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:50:18 +0000 Subject: [pkgdb] libgsasl had groupAcl changed Message-ID: <200807100650.m6A6oI2k022286@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libgsasl (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgsasl From fedora-extras-commits at redhat.com Thu Jul 10 06:53:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:53:18 +0000 Subject: [pkgdb] libntlm had groupAcl changed Message-ID: <200807100653.m6A6rI4C022347@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libntlm (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libntlm From fedora-extras-commits at redhat.com Thu Jul 10 06:53:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:53:20 +0000 Subject: [pkgdb] libntlm had groupAcl changed Message-ID: <200807100653.m6A6rKIB022369@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libntlm (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libntlm From fedora-extras-commits at redhat.com Thu Jul 10 06:53:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:53:24 +0000 Subject: [pkgdb] libntlm had groupAcl changed Message-ID: <200807100653.m6A6rOGD022387@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libntlm (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libntlm From fedora-extras-commits at redhat.com Thu Jul 10 06:53:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:53:28 +0000 Subject: [pkgdb] libntlm had groupAcl changed Message-ID: <200807100653.m6A6rKID022369@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libntlm (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libntlm From fedora-extras-commits at redhat.com Thu Jul 10 06:53:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 06:53:32 +0000 Subject: [pkgdb] libntlm had groupAcl changed Message-ID: <200807100653.m6A6rOGF022387@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has set the commit acl on libntlm (Fedora 9) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libntlm From fedora-extras-commits at redhat.com Thu Jul 10 07:14:32 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Thu, 10 Jul 2008 07:14:32 GMT Subject: rpms/dblatex/F-8 .cvsignore, 1.2, 1.3 dblatex.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807100714.m6A7EWMc021471@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/dblatex/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21419 Modified Files: .cvsignore dblatex.spec sources Log Message: Update to 0.2.9. Sync spec file with F-9 branch. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dblatex/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Nov 2007 17:51:21 -0000 1.2 +++ .cvsignore 10 Jul 2008 07:13:37 -0000 1.3 @@ -1 +1 @@ -dblatex-0.2.7.tar.bz2 +dblatex-0.2.9.tar.bz2 Index: dblatex.spec =================================================================== RCS file: /cvs/extras/rpms/dblatex/F-8/dblatex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dblatex.spec 16 Dec 2007 22:02:25 -0000 1.3 +++ dblatex.spec 10 Jul 2008 07:13:37 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: dblatex -Version: 0.2.8 -Release: 2%{?dist} +Version: 0.2.9 +Release: 1%{?dist} Summary: DocBook to LaTeX/ConTeXt Publishing BuildArch: noarch Group: Applications/Publishing @@ -12,10 +12,22 @@ #Source1: http://docbook.sourceforge.net/release/xsl/current/COPYING Source1: COPYING-docbook-xsl Patch0: dblatex-0.2.7-external-which.patch +Patch1: dblatex-0.2.9-xetex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel libxslt tetex ImageMagick tetex-latex python-which -Requires: tetex libxslt docbook-dtds python passivetex tetex-latex ImageMagick transfig tetex-fonts +BuildRequires: python-devel +BuildRequires: python-which +BuildRequires: libxslt +BuildRequires: ImageMagick +%if 0%{?fedora} < 9 +BuildRequires: tetex-latex +%else +BuildRequires: tex(latex) +BuildRequires: texlive-xetex +Requires: texlive-xetex +%endif + +Requires: libxslt docbook-dtds passivetex ImageMagick transfig %if 0%{?fedora} < 8 Conflicts: tetex-tex4ht @@ -36,6 +48,7 @@ %prep %setup -q %patch0 -p1 -b .external-which +%patch1 -p0 -b .xetex rm -rf lib/contrib %build @@ -47,7 +60,7 @@ #%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %{__python} setup.py install --root $RPM_BUILD_ROOT # these are already in tetex-latex: -for file in bibtopic.sty enumitem.sty ragged2e.sty passivetex/; do +for file in bibtopic.sty enumitem.sty ragged2e.sty passivetex/ xelatex/; do rm -rf $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/misc/$file done @@ -56,6 +69,11 @@ mv $file $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/dblatex/`basename $file`; done +## also move .xetex files +for file in ` find $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/ -name '*.xetex' ` ; do + mv $file $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/dblatex/`basename $file`; +done + rmdir $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/{misc,contrib/example,style} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dblatex @@ -76,6 +94,9 @@ %{_mandir}/man1/dblatex.1* %doc COPYRIGHT docs/manual.pdf COPYING-docbook-xsl README-xsltml %{python_sitelib}/dbtexmf/ +%if 0%{?fedora} >= 9 +%{python_sitelib}/dblatex-*.egg-info +%endif %{_bindir}/dblatex %{_datadir}/dblatex/ %{_datadir}/texmf/tex/latex/dblatex/ @@ -86,7 +107,18 @@ %postun -p /usr/bin/texhash %changelog -* Sun Dec 16 2007 Patrice Dumas - 0.2.8-2 +* Thu Jun 12 2008 Alex Lancaster - 0.2.9-1 +- Update to latest upstream (0.2.9) (#448953) +- Remove some redundant Requires and BuildRequires (passivetex pulls + in the tetex/tex requires, python dep added automatically) +- For F-9+ BR on tex(latex) and texlive-xetex, fix the installation + scripts to install extra new files. +- Add patch from dblatex mailing list for better handling of a missing + xetex. +- Conditionally add .egg-info file only if F9+ to allow for unified + spec file + +* Sun Dec 16 2007 Patrice Dumas - 0.2.8-2.1 - don't install in docbook directory, it is a link to a versioned directory and may break upon docbook update (#425251,#389231) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dblatex/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Nov 2007 00:28:04 -0000 1.3 +++ sources 10 Jul 2008 07:13:37 -0000 1.4 @@ -1 +1 @@ -1bb57c3d63cd5ff7e02d4cd2cb53960f dblatex-0.2.8.tar.bz2 +6ade2e1cbe40f1798cb8de846528bf43 dblatex-0.2.9.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 07:17:11 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Thu, 10 Jul 2008 07:17:11 GMT Subject: rpms/dblatex/F-8 dblatex-0.2.9-xetex.patch,NONE,1.1 Message-ID: <200807100717.m6A7HBnZ021559@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/dblatex/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21541 Added Files: dblatex-0.2.9-xetex.patch Log Message: Missed a patch. dblatex-0.2.9-xetex.patch: --- NEW FILE dblatex-0.2.9-xetex.patch --- Index: setup.py =================================================================== RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/setup.py,v retrieving revision 1.13 diff -u -r1.13 setup.py --- setup.py 6 Nov 2007 22:28:57 -0000 1.13 +++ setup.py 4 Jun 2008 22:35:50 -0000 @@ -259,7 +259,7 @@ used_stys.sort() # Dirty... - for f in ("truncate", "elfonts", "CJKutf8", "pinyin"): + for f in ("truncate", "elfonts", "CJKutf8", "pinyin", "ifxetex"): try: used_stys.remove(f) except: Index: latex/style/dbk_fonts.sty =================================================================== RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/latex/style/dbk_fonts.sty,v retrieving revision 1.3 diff -u -r1.3 dbk_fonts.sty --- latex/style/dbk_fonts.sty 18 Apr 2008 23:11:22 -0000 1.3 +++ latex/style/dbk_fonts.sty 4 Jun 2008 22:50:36 -0000 @@ -1,4 +1,4 @@ -\usepackage{ifxetex} + \ifxetex % to have the \text macro \usepackage{amstext} Index: latex/style/docbook.sty =================================================================== RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/latex/style/docbook.sty,v retrieving revision 1.23 diff -u -r1.23 docbook.sty --- latex/style/docbook.sty 3 Sep 2007 18:47:53 -0000 1.23 +++ latex/style/docbook.sty 31 May 2008 12:16:35 -0000 @@ -8,12 +8,6 @@ \DeclareOption{hyperlink}{ \def\DBKhyperlink{yes} } \DeclareOption{nohyperlink}{ \def\DBKhyperlink{no} } -\ifx\undefined\chapter - \def\DBKisarticle{1} -\else - \def\DBKisarticle{0} -\fi - % Default values \ExecuteOptions{nohyperlink} @@ -140,7 +134,7 @@ %% Inclusion of float package after hyperref to have its definitions! \usepackage{float} -\if1\DBKisarticle +\@ifundefined{chapter}{ \floatstyle{ruled} \newfloat{example}{htb}{loe}[section] @@ -153,8 +147,7 @@ % Redefinition of tableofcontent, to have it in separate pages \let\stdtoc=\tableofcontents \def\tableofcontents{ \newpage \stdtoc{} \newpage} - -\else +}{ \floatstyle{ruled} \newfloat{example}{htb}{loe}[chapter] @@ -163,8 +156,8 @@ \floatstyle{plain} \newfloat{dbequation}{htb}{loe}[chapter] \floatname{dbequation}{{\scshape Equation }} +} -\fi % Sidebar is a boxed minipage that can contain verbatim \newenvironment{sidebar}[1][0.95\textwidth]{ \hspace{0mm}\newline% Index: xsl/lang.xsl =================================================================== RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/xsl/lang.xsl,v retrieving revision 1.6 diff -u -r1.6 lang.xsl --- xsl/lang.xsl 18 Apr 2008 23:11:31 -0000 1.6 +++ xsl/lang.xsl 4 Jun 2008 22:55:24 -0000 @@ -192,7 +192,13 @@ - \usepackage{ifxetex} + \IfFileExists{ifxetex.sty}{% + \usepackage{ifxetex}% + }{% + \newif\ifxetex + \xetexfalse + } + \ifxetex \usepackage{fontspec} \usepackage{xltxtra} From fedora-extras-commits at redhat.com Thu Jul 10 07:40:53 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 10 Jul 2008 07:40:53 GMT Subject: rpms/halevt/devel .cvsignore, 1.6, 1.7 halevt.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807100740.m6A7erla022549@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/halevt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22506 Modified Files: .cvsignore halevt.spec sources Log Message: * Thu Jul 10 2008 Patrice Dumas 0.1.2-1 - update to 0.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/halevt/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Jun 2008 23:57:45 -0000 1.6 +++ .cvsignore 10 Jul 2008 07:40:08 -0000 1.7 @@ -1 +1 @@ -halevt-0.1.1.tar.gz +halevt-0.1.2.tar.gz Index: halevt.spec =================================================================== RCS file: /cvs/extras/rpms/halevt/devel/halevt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- halevt.spec 14 Jun 2008 23:57:45 -0000 1.7 +++ halevt.spec 10 Jul 2008 07:40:08 -0000 1.8 @@ -1,12 +1,12 @@ Name: halevt -Version: 0.1.1 +Version: 0.1.2 Release: 1%{?dist} Summary: Generic handler for HAL events Group: Applications/System License: GPLv2+ URL: http://www.environnement.ens.fr/perso/dumas/halevt.html -Source0: http://www.environnement.ens.fr/perso/dumas/halevt-%{version}.tar.gz +Source0: http://www.environnement.ens.fr/perso/dumas/halevt-download/halevt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel hal-devel libxml2-devel boolstuff-devel @@ -94,6 +94,9 @@ %dir %attr(755,halevt,halevt) %{_localstatedir}/lib/halevt %changelog +* Thu Jul 10 2008 Patrice Dumas 0.1.2-1 +- update to 0.1.2 + * Sat Jun 14 2008 Patrice Dumas 0.1.1-1 - update to 0.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/halevt/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Jun 2008 23:57:45 -0000 1.6 +++ sources 10 Jul 2008 07:40:08 -0000 1.7 @@ -1 +1 @@ -77573b004b8071fa39836863470dc6c4 halevt-0.1.1.tar.gz +7f0fd765fdc3fa42df91de7c5a95fd0f halevt-0.1.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 07:44:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 07:44:11 +0000 Subject: [pkgdb] slim: pertusus has requested watchcommits Message-ID: <200807100744.m6A7iCAU023604@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchcommits acl on slim (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/slim From fedora-extras-commits at redhat.com Thu Jul 10 07:44:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 07:44:14 +0000 Subject: [pkgdb] slim: pertusus has requested commit Message-ID: <200807100744.m6A7iExK023627@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the commit acl on slim (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/slim From fedora-extras-commits at redhat.com Thu Jul 10 07:44:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 07:44:17 +0000 Subject: [pkgdb] slim: pertusus has requested commit Message-ID: <200807100744.m6A7iCAX023604@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the commit acl on slim (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/slim From fedora-extras-commits at redhat.com Thu Jul 10 07:44:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 07:44:20 +0000 Subject: [pkgdb] slim: pertusus has requested watchcommits Message-ID: <200807100744.m6A7iKsd023668@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchcommits acl on slim (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/slim From fedora-extras-commits at redhat.com Thu Jul 10 07:44:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 07:44:24 +0000 Subject: [pkgdb] slim: pertusus has requested commit Message-ID: <200807100744.m6A7iOEK023689@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the commit acl on slim (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/slim From fedora-extras-commits at redhat.com Thu Jul 10 07:44:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 07:44:26 +0000 Subject: [pkgdb] slim: pertusus has requested watchcommits Message-ID: <200807100744.m6A7iExN023627@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchcommits acl on slim (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/slim From fedora-extras-commits at redhat.com Thu Jul 10 07:44:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 07:44:28 +0000 Subject: [pkgdb] slim: pertusus has requested commit Message-ID: <200807100744.m6A7iKsg023668@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the commit acl on slim (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/slim From fedora-extras-commits at redhat.com Thu Jul 10 08:00:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:00:18 +0000 Subject: [pkgdb] man-pages-da ownership updated Message-ID: <200807100800.m6A80ILs024237@bastion.fedora.phx.redhat.com> Package man-pages-da in Fedora devel was orphaned by Ivana Varekova (varekova) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/man-pages-da From fedora-extras-commits at redhat.com Thu Jul 10 08:02:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:02:24 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807100802.m6A82O2e024359@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora devel was orphaned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Thu Jul 10 08:02:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:02:25 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807100802.m6A82PC7024360@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora 8 was orphaned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Thu Jul 10 08:02:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:02:26 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807100802.m6A82QJA024391@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora 9 was orphaned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Thu Jul 10 08:12:35 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 10 Jul 2008 08:12:35 GMT Subject: rpms/bzflag/devel bzflag-2.0.12-findresolutions.patch, NONE, 1.1 bzflag.spec, 1.46, 1.47 Message-ID: <200807100812.m6A8CZOm001314@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1249 Modified Files: bzflag.spec Added Files: bzflag-2.0.12-findresolutions.patch Log Message: build with SDL, but fix finding resolutions (#426011) bzflag-2.0.12-findresolutions.patch: --- NEW FILE bzflag-2.0.12-findresolutions.patch --- diff -up bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions bzflag-2.0.12/src/platform/BzfDisplay.cxx --- bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions 2008-04-06 07:30:37.000000000 +0200 +++ bzflag-2.0.12/src/platform/BzfDisplay.cxx 2008-07-10 10:05:41.000000000 +0200 @@ -137,9 +137,20 @@ bool BzfDisplay::doSetDefaultResolutio int BzfDisplay::findResolution(const char* name) const { - for (int i = 0; i < numResolutions; i++) - if (strcmp(name, resolutions[i]->name) == 0) + for (int i = 0; i < numResolutions; i++) { + // only compare up to first space character + const char *cp1, *cp2; + int i1, i2; + + cp1 = strstr (name, " "); + cp2 = strstr (resolutions[i]->name, " "); + + i1 = cp1 ? (cp1 - name) : strlen (name); + i2 = cp2 ? (cp2 - resolutions[i]->name) : strlen (resolutions[i]->name); + + if ((i1 == i2) && (strncmp(name, resolutions[i]->name, i1 + 1) == 0)) return i; + } return -1; } Index: bzflag.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- bzflag.spec 9 Jul 2008 10:06:49 -0000 1.46 +++ bzflag.spec 10 Jul 2008 08:11:46 -0000 1.47 @@ -2,7 +2,7 @@ # --with/--without options: # modular_x: rebuild with modular X deps # opengl_wrapper: use Fedora OpenGL wrapper -# SDL: use SDL instead of X11 directly +# SDL: use SDL (instead of accessing X11, sound devices directly) #### default options: %if %{?fedora}%{!?fedora:5} < 5 @@ -25,9 +25,7 @@ %define _libcurl_devel 0 %endif -# don't build with SDL by default because of display resolution setting -# problems -%bcond_with SDL +%bcond_without SDL %define desktop_vendor fedora #define date 20050930 @@ -35,14 +33,15 @@ Summary: 3D multi-player tank battle game Name: bzflag Version: 2.0.12 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 Group: Amusements/Games URL: http://bzflag.org Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch2: bzflag-2.0.10-gcc-4.3.patch +Patch1: bzflag-2.0.10-gcc-4.3.patch +Patch2: bzflag-2.0.12-findresolutions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %{with modular_x} BuildRequires: libXi-devel @@ -90,7 +89,8 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch2 -p1 -b .gcc-4.3 +%patch1 -p1 -b .gcc-4.3 +%patch2 -p1 -b .findresolutions %build autoreconf @@ -146,6 +146,9 @@ %{_mandir}/man*/* %changelog +* Thu Jul 09 2008 Nils Philippsen 2.0.12-3 +- build with SDL, but fix finding resolutions (#426011) + * Wed Jul 08 2008 Nils Philippsen 2.0.12-2 - build without SDL (#426011) From fedora-extras-commits at redhat.com Thu Jul 10 08:14:05 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 10 Jul 2008 08:14:05 GMT Subject: rpms/bzflag/F-9 bzflag-2.0.12-findresolutions.patch, NONE, 1.1 bzflag.spec, 1.46, 1.47 Message-ID: <200807100814.m6A8E5cW001447@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1330 Modified Files: bzflag.spec Added Files: bzflag-2.0.12-findresolutions.patch Log Message: build with SDL, but fix finding resolutions (#426011) bzflag-2.0.12-findresolutions.patch: --- NEW FILE bzflag-2.0.12-findresolutions.patch --- diff -up bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions bzflag-2.0.12/src/platform/BzfDisplay.cxx --- bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions 2008-04-06 07:30:37.000000000 +0200 +++ bzflag-2.0.12/src/platform/BzfDisplay.cxx 2008-07-10 10:05:41.000000000 +0200 @@ -137,9 +137,20 @@ bool BzfDisplay::doSetDefaultResolutio int BzfDisplay::findResolution(const char* name) const { - for (int i = 0; i < numResolutions; i++) - if (strcmp(name, resolutions[i]->name) == 0) + for (int i = 0; i < numResolutions; i++) { + // only compare up to first space character + const char *cp1, *cp2; + int i1, i2; + + cp1 = strstr (name, " "); + cp2 = strstr (resolutions[i]->name, " "); + + i1 = cp1 ? (cp1 - name) : strlen (name); + i2 = cp2 ? (cp2 - resolutions[i]->name) : strlen (resolutions[i]->name); + + if ((i1 == i2) && (strncmp(name, resolutions[i]->name, i1 + 1) == 0)) return i; + } return -1; } Index: bzflag.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzflag/F-9/bzflag.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- bzflag.spec 9 Jul 2008 10:09:51 -0000 1.46 +++ bzflag.spec 10 Jul 2008 08:12:43 -0000 1.47 @@ -2,7 +2,7 @@ # --with/--without options: # modular_x: rebuild with modular X deps # opengl_wrapper: use Fedora OpenGL wrapper -# SDL: use SDL instead of X11 directly +# SDL: use SDL (instead of accessing X11, sound devices directly) #### default options: %if %{?fedora}%{!?fedora:5} < 5 @@ -25,9 +25,7 @@ %define _libcurl_devel 0 %endif -# don't build with SDL by default because of display resolution setting -# problems -%bcond_with SDL +%bcond_without SDL %define desktop_vendor fedora #define date 20050930 @@ -35,14 +33,15 @@ Summary: 3D multi-player tank battle game Name: bzflag Version: 2.0.12 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 Group: Amusements/Games URL: http://bzflag.org Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch2: bzflag-2.0.10-gcc-4.3.patch +Patch1: bzflag-2.0.10-gcc-4.3.patch +Patch2: bzflag-2.0.12-findresolutions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %{with modular_x} BuildRequires: libXi-devel @@ -90,7 +89,8 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch2 -p1 -b .gcc-4.3 +%patch1 -p1 -b .gcc-4.3 +%patch2 -p1 -b .findresolutions %build autoreconf @@ -146,6 +146,9 @@ %{_mandir}/man*/* %changelog +* Thu Jul 09 2008 Nils Philippsen 2.0.12-3 +- build with SDL, but fix finding resolutions (#426011) + * Wed Jul 08 2008 Nils Philippsen 2.0.12-2 - build without SDL (#426011) From fedora-extras-commits at redhat.com Thu Jul 10 08:14:05 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 10 Jul 2008 08:14:05 GMT Subject: rpms/bzflag/F-8 bzflag-2.0.12-findresolutions.patch, NONE, 1.1 bzflag.spec, 1.41, 1.42 Message-ID: <200807100814.m6A8E5JA001450@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1331 Modified Files: bzflag.spec Added Files: bzflag-2.0.12-findresolutions.patch Log Message: build with SDL, but fix finding resolutions (#426011) bzflag-2.0.12-findresolutions.patch: --- NEW FILE bzflag-2.0.12-findresolutions.patch --- diff -up bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions bzflag-2.0.12/src/platform/BzfDisplay.cxx --- bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions 2008-04-06 07:30:37.000000000 +0200 +++ bzflag-2.0.12/src/platform/BzfDisplay.cxx 2008-07-10 10:05:41.000000000 +0200 @@ -137,9 +137,20 @@ bool BzfDisplay::doSetDefaultResolutio int BzfDisplay::findResolution(const char* name) const { - for (int i = 0; i < numResolutions; i++) - if (strcmp(name, resolutions[i]->name) == 0) + for (int i = 0; i < numResolutions; i++) { + // only compare up to first space character + const char *cp1, *cp2; + int i1, i2; + + cp1 = strstr (name, " "); + cp2 = strstr (resolutions[i]->name, " "); + + i1 = cp1 ? (cp1 - name) : strlen (name); + i2 = cp2 ? (cp2 - resolutions[i]->name) : strlen (resolutions[i]->name); + + if ((i1 == i2) && (strncmp(name, resolutions[i]->name, i1 + 1) == 0)) return i; + } return -1; } Index: bzflag.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzflag/F-8/bzflag.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- bzflag.spec 9 Jul 2008 10:10:00 -0000 1.41 +++ bzflag.spec 10 Jul 2008 08:12:47 -0000 1.42 @@ -2,7 +2,7 @@ # --with/--without options: # modular_x: rebuild with modular X deps # opengl_wrapper: use Fedora OpenGL wrapper -# SDL: use SDL instead of X11 directly +# SDL: use SDL (instead of accessing X11, sound devices directly) #### default options: %if %{?fedora}%{!?fedora:5} < 5 @@ -25,9 +25,7 @@ %define _libcurl_devel 0 %endif -# don't build with SDL by default because of display resolution setting -# problems -%bcond_with SDL +%bcond_without SDL %define desktop_vendor fedora #define date 20050930 @@ -35,14 +33,15 @@ Summary: 3D multi-player tank battle game Name: bzflag Version: 2.0.12 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 Group: Amusements/Games URL: http://bzflag.org Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch2: bzflag-2.0.10-gcc-4.3.patch +Patch1: bzflag-2.0.10-gcc-4.3.patch +Patch2: bzflag-2.0.12-findresolutions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %{with modular_x} BuildRequires: libXi-devel @@ -90,7 +89,8 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch2 -p1 -b .gcc-4.3 +%patch1 -p1 -b .gcc-4.3 +%patch2 -p1 -b .findresolutions %build autoreconf @@ -146,6 +146,9 @@ %{_mandir}/man*/* %changelog +* Thu Jul 09 2008 Nils Philippsen 2.0.12-3 +- build with SDL, but fix finding resolutions (#426011) + * Wed Jul 08 2008 Nils Philippsen 2.0.12-2 - build without SDL (#426011) From fedora-extras-commits at redhat.com Thu Jul 10 08:34:29 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Thu, 10 Jul 2008 08:34:29 GMT Subject: rpms/net-tools/devel net-tools-1.60-a-option.patch, NONE, 1.1 net-tools-1.60-clear-flag.patch, NONE, 1.1 net-tools-1.60-i-option.patch, NONE, 1.1 net-tools.spec, 1.92, 1.93 Message-ID: <200807100834.m6A8YTgO002073@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/net-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1990 Modified Files: net-tools.spec Added Files: net-tools-1.60-a-option.patch net-tools-1.60-clear-flag.patch net-tools-1.60-i-option.patch Log Message: fixed man pages for arp (#446195) fixed netstat --interfaces option (#446187) fixed clearing flags in ifconfig (#450252) net-tools-1.60-a-option.patch: --- NEW FILE net-tools-1.60-a-option.patch --- --- net-tools-1.60/man/de_DE/arp.8.a-option 2008-07-08 16:35:08.000000000 +0200 +++ net-tools-1.60/man/de_DE/arp.8 2008-07-08 16:35:35.000000000 +0200 @@ -77,7 +77,7 @@ Andere m\(:ogliche Werte sind Netzwerkst and .RB "NET/ROM (" netrom ")." .TP -.B "\-a [Rechnername], \-\-display [Rechnername]" +.B "\-a [Rechnername], \-\-all [Rechnername]" Zeigt die Eintr\(:age der angegebenen Rechner an. Wird kein .B hostname Argument verwendet, so werden alle Eintr\(:age aufgelistet. --- net-tools-1.60/man/en_US/arp.8.a-option 2008-07-08 16:35:41.000000000 +0200 +++ net-tools-1.60/man/en_US/arp.8 2008-07-08 16:35:48.000000000 +0200 @@ -76,7 +76,7 @@ Other values might include network techn and .RB "NET/ROM (" netrom ")." .TP -.B "\-a [hostname], \-\-display [hostname]" +.B "\-a [hostname], \-\-all [hostname]" Shows the entries of the specified hosts. If the .B hostname parameter is not used, --- net-tools-1.60/man/fr_FR/arp.8.a-option 2008-07-08 16:35:53.000000000 +0200 +++ net-tools-1.60/man/fr_FR/arp.8 2008-07-08 16:36:03.000000000 +0200 @@ -81,7 +81,7 @@ D'autres valeurs doivent correspondre ? and .RB "NET/ROM (" netrom ")." .TP -.B "\-a [nom_d_h?te], \-\-display [nom_d_h?te]" +.B "\-a [nom_d_h?te], \-\-all [nom_d_h?te]" Affiche les entr?es concernant l'h?te sp?cifi?. Si le param?tre .B nom_d_h?te n'est pas utilis?, --- net-tools-1.60/man/pt_BR/arp.8.a-option 2008-07-08 16:38:13.000000000 +0200 +++ net-tools-1.60/man/pt_BR/arp.8 2008-07-08 16:38:20.000000000 +0200 @@ -77,7 +77,7 @@ Outros valores podem incluir tecnologias e .RB "NET/ROM (" netrom ")." .TP -.B "\-a [m?quina], \-\-display [m?quina]" +.B "\-a [m?quina], \-\-all [m?quina]" Mostra as entradas das m?quinas especificadas. Se o par?metro .B m?quina n?o for usado, net-tools-1.60-clear-flag.patch: --- NEW FILE net-tools-1.60-clear-flag.patch --- --- net-tools-1.60/ifconfig.c.clear-flag 2008-07-08 11:21:33.000000000 +0200 +++ net-tools-1.60/ifconfig.c 2008-07-08 11:22:55.000000000 +0200 @@ -465,7 +465,7 @@ int main(int argc, char **argv) } if (!strcmp(*spp, "-allmulti")) { goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI); - if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) + if (test_flag(ifr.ifr_name, IFF_ALLMULTI) > 0) fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name); spp++; continue; @@ -488,7 +488,7 @@ int main(int argc, char **argv) } if (!strcmp(*spp, "-dynamic")) { goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC); - if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) + if (test_flag(ifr.ifr_name, IFF_DYNAMIC) > 0) fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name); spp++; continue; @@ -547,7 +547,7 @@ int main(int argc, char **argv) if (!strcmp(*spp, "-broadcast")) { goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST); - if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) + if (test_flag(ifr.ifr_name, IFF_BROADCAST) > 0) fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name); spp++; continue; @@ -676,7 +676,7 @@ int main(int argc, char **argv) } if (!strcmp(*spp, "-pointopoint")) { goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); - if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) + if (test_flag(ifr.ifr_name, IFF_POINTOPOINT) > 0) fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); spp++; continue; net-tools-1.60-i-option.patch: --- NEW FILE net-tools-1.60-i-option.patch --- --- net-tools-1.60/netstat.c.i-option 2008-07-08 10:22:51.000000000 +0200 +++ net-tools-1.60/netstat.c 2008-07-08 10:22:56.000000000 +0200 @@ -2084,7 +2084,7 @@ int main { AFTRANS_OPTS, {"version", 0, 0, 'V'}, - {"interfaces", 2, 0, 'I'}, + {"interface", 2, 0, 'I'}, {"interfaces", 0, 0, 'i'}, {"help", 0, 0, 'h'}, {"route", 0, 0, 'r'}, Index: net-tools.spec =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- net-tools.spec 8 Jul 2008 06:33:37 -0000 1.92 +++ net-tools.spec 10 Jul 2008 08:33:33 -0000 1.93 @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 1.60 -Release: 88%{?dist} +Release: 89%{?dist} License: GPL+ Group: System Environment/Base URL: http://www.tazenda.demon.co.uk/phil/net-tools/ @@ -77,6 +77,9 @@ Patch64: net-tools-1.60-ec_hw_null.patch Patch65: net-tools-1.60-statistics_buffer.patch Patch66: net-tools-1.60-sctp-addrs.patch +Patch67: net-tools-1.60-i-option.patch +Patch68: net-tools-1.60-a-option.patch +Patch69: net-tools-1.60-clear-flag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -154,6 +157,9 @@ %patch64 -p1 %patch65 -p1 -b .buffer %patch66 -p1 -b .sctp-addrs +%patch67 -p1 -b .i-option +%patch68 -p1 -b .a-option +%patch69 -p1 -b .clear-flag cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -269,6 +275,11 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Thu Jul 10 2008 Zdenek Prikryl - 1.60-89 +- fixed man pages for arp (#446195) +- fixed netstat --interfaces option (#446187) +- fixed clearing flags in ifconfig (#450252) + * Tue Jul 8 2008 Radek Vok??l - 1.60-88 - netstat displays correct sctp statistics (#445535) From fedora-extras-commits at redhat.com Thu Jul 10 08:37:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:37:24 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807100837.m6A8bOjF025297@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora devel is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Thu Jul 10 08:37:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:37:26 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807100837.m6A8bOjH025297@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora 9 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Thu Jul 10 08:37:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:37:32 +0000 Subject: [pkgdb] PyOpenGL ownership updated Message-ID: <200807100837.m6A8bWgX025331@bastion.fedora.phx.redhat.com> Package PyOpenGL in Fedora 8 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyOpenGL From fedora-extras-commits at redhat.com Thu Jul 10 08:41:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:41:05 +0000 Subject: [pkgdb] pygtkglext: turki has requested watchcommits Message-ID: <200807100841.m6A8f5M1025419@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the watchcommits acl on pygtkglext (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:41:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:41:29 +0000 Subject: [pkgdb] pygtkglext: turki has requested watchbugzilla Message-ID: <200807100841.m6A8fWwp025462@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the watchbugzilla acl on pygtkglext (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:41:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:41:34 +0000 Subject: [pkgdb] pygtkglext: turki has requested commit Message-ID: <200807100841.m6A8fYn0025482@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the commit acl on pygtkglext (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:41:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:41:41 +0000 Subject: [pkgdb] pygtkglext: turki has requested approveacls Message-ID: <200807100841.m6A8fYn3025482@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the approveacls acl on pygtkglext (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:41:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:41:51 +0000 Subject: [pkgdb] pygtkglext: turki has requested watchbugzilla Message-ID: <200807100841.m6A8fpmQ025532@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the watchbugzilla acl on pygtkglext (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:41:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:41:54 +0000 Subject: [pkgdb] pygtkglext: turki has requested watchcommits Message-ID: <200807100841.m6A8fYn6025482@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the watchcommits acl on pygtkglext (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:41:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:41:58 +0000 Subject: [pkgdb] pygtkglext: turki has requested commit Message-ID: <200807100841.m6A8fwAX025576@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the commit acl on pygtkglext (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:42:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:42:01 +0000 Subject: [pkgdb] pygtkglext: turki has requested approveacls Message-ID: <200807100842.m6A8fWws025462@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the approveacls acl on pygtkglext (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:42:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:42:13 +0000 Subject: [pkgdb] pygtkglext: turki has requested watchbugzilla Message-ID: <200807100842.m6A8fpmT025532@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the watchbugzilla acl on pygtkglext (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:42:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:42:15 +0000 Subject: [pkgdb] pygtkglext: turki has requested watchcommits Message-ID: <200807100842.m6A8fwAa025576@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the watchcommits acl on pygtkglext (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:42:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:42:17 +0000 Subject: [pkgdb] pygtkglext: turki has requested commit Message-ID: <200807100842.m6A8gHW1025668@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the commit acl on pygtkglext (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:42:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:42:20 +0000 Subject: [pkgdb] pygtkglext: turki has requested approveacls Message-ID: <200807100842.m6A8fWwv025462@bastion.fedora.phx.redhat.com> Nikolay Vladimirov (turki) has requested the approveacls acl on pygtkglext (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:24 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kOlD025811@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the watchbugzilla acl on pygtkglext (Fedora devel) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:24 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kOqY025826@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the watchcommits acl on pygtkglext (Fedora devel) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:27 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kRAi025851@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the commit acl on pygtkglext (Fedora devel) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:31 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kVmw025888@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the watchbugzilla acl on pygtkglext (Fedora 8) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:27 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kOlG025811@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the approveacls acl on pygtkglext (Fedora devel) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:33 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kVn1025888@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the commit acl on pygtkglext (Fedora 8) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:33 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kRAl025851@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the watchcommits acl on pygtkglext (Fedora 8) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:36 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kOqb025826@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the watchbugzilla acl on pygtkglext (Fedora 9) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:35 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kRAo025851@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the approveacls acl on pygtkglext (Fedora 8) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:38 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kOqe025826@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the watchcommits acl on pygtkglext (Fedora 9) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:40 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8ke4n026005@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the commit acl on pygtkglext (Fedora 9) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:46:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 08:46:43 +0000 Subject: [pkgdb] pygtkglext had acl change status Message-ID: <200807100846.m6A8kOlJ025811@bastion.fedora.phx.redhat.com> Hans de Goede (jwrdegoede) has set the approveacls acl on pygtkglext (Fedora 9) to Approved for Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pygtkglext From fedora-extras-commits at redhat.com Thu Jul 10 08:56:34 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 10 Jul 2008 08:56:34 GMT Subject: rpms/perl-Array-Compare/F-9 .cvsignore, 1.4, 1.5 perl-Array-Compare.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200807100856.m6A8uYBY002994@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Array-Compare/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2873/F-9 Modified Files: .cvsignore perl-Array-Compare.spec sources Log Message: * Thu Jul 10 2008 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Apr 2007 21:12:25 -0000 1.4 +++ .cvsignore 10 Jul 2008 08:55:40 -0000 1.5 @@ -1 +1 @@ -Array-Compare-1.14.tar.gz +Array-Compare-1.16.tar.gz Index: perl-Array-Compare.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/F-9/perl-Array-Compare.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Array-Compare.spec 2 Mar 2008 15:56:07 -0000 1.8 +++ perl-Array-Compare.spec 10 Jul 2008 08:55:40 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Array-Compare -Version: 1.14 -Release: 3%{?dist} +Version: 1.16 +Release: 1%{?dist} Summary: Perl extension for comparing arrays Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Thu Jul 10 2008 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Wed Feb 27 2008 Tom "spot" Callaway - 1.14-3 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Apr 2007 21:12:25 -0000 1.4 +++ sources 10 Jul 2008 08:55:40 -0000 1.5 @@ -1 +1 @@ -3042eb843496c10ff37a73d50dbc6746 Array-Compare-1.14.tar.gz +0e9741b0e6f4db2e1457092d261c64e2 Array-Compare-1.16.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 08:56:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 10 Jul 2008 08:56:40 GMT Subject: rpms/perl-Array-Compare/devel .cvsignore, 1.4, 1.5 perl-Array-Compare.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200807100856.m6A8uep8002999@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Array-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2873/devel Modified Files: .cvsignore perl-Array-Compare.spec sources Log Message: * Thu Jul 10 2008 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Apr 2007 21:12:25 -0000 1.4 +++ .cvsignore 10 Jul 2008 08:55:00 -0000 1.5 @@ -1 +1 @@ -Array-Compare-1.14.tar.gz +Array-Compare-1.16.tar.gz Index: perl-Array-Compare.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/devel/perl-Array-Compare.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Array-Compare.spec 2 Mar 2008 15:56:07 -0000 1.8 +++ perl-Array-Compare.spec 10 Jul 2008 08:55:00 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Array-Compare -Version: 1.14 -Release: 3%{?dist} +Version: 1.16 +Release: 1%{?dist} Summary: Perl extension for comparing arrays Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Thu Jul 10 2008 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Wed Feb 27 2008 Tom "spot" Callaway - 1.14-3 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Apr 2007 21:12:25 -0000 1.4 +++ sources 10 Jul 2008 08:55:00 -0000 1.5 @@ -1 +1 @@ -3042eb843496c10ff37a73d50dbc6746 Array-Compare-1.14.tar.gz +0e9741b0e6f4db2e1457092d261c64e2 Array-Compare-1.16.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 08:57:00 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 10 Jul 2008 08:57:00 GMT Subject: rpms/perl-Array-Compare/F-8 .cvsignore, 1.4, 1.5 perl-Array-Compare.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807100857.m6A8v0LS003014@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Array-Compare/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2873/F-8 Modified Files: .cvsignore perl-Array-Compare.spec sources Log Message: * Thu Jul 10 2008 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Apr 2007 21:12:25 -0000 1.4 +++ .cvsignore 10 Jul 2008 08:56:04 -0000 1.5 @@ -1 +1 @@ -Array-Compare-1.14.tar.gz +Array-Compare-1.16.tar.gz Index: perl-Array-Compare.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/F-8/perl-Array-Compare.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Array-Compare.spec 5 Apr 2007 21:12:25 -0000 1.5 +++ perl-Array-Compare.spec 10 Jul 2008 08:56:04 -0000 1.6 @@ -1,10 +1,10 @@ Name: perl-Array-Compare -Version: 1.14 +Version: 1.16 Release: 1%{?dist} Summary: Perl extension for comparing arrays Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Array-Compare/ Source0: http://www.cpan.org/authors/id/D/DA/DAVECROSS/Array-Compare-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,6 +51,15 @@ %changelog +* Thu Jul 10 2008 Ralf Cors??pius - 1.16-1 +- Upstream update. + +* Wed Feb 27 2008 Tom "spot" Callaway - 1.14-3 +- Rebuild for perl 5.10 (again) + +* Thu Jan 31 2008 Tom "spot" Callaway - 1.14-2 +- rebuild for new perl + * Thu Apr 5 2007 Jose Pedro Oliveira - 1.14-1 - Update to 1.14. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Apr 2007 21:12:25 -0000 1.4 +++ sources 10 Jul 2008 08:56:04 -0000 1.5 @@ -1 +1 @@ -3042eb843496c10ff37a73d50dbc6746 Array-Compare-1.14.tar.gz +0e9741b0e6f4db2e1457092d261c64e2 Array-Compare-1.16.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 09:00:05 2008 From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie)) Date: Thu, 10 Jul 2008 09:00:05 GMT Subject: rpms/ctrlproxy/devel .cvsignore, 1.6, 1.7 ctrlproxy.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <200807100900.m6A90559003171@cvs-int.fedora.redhat.com> Author: bernie Update of /cvs/pkgs/rpms/ctrlproxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3075 Modified Files: .cvsignore ctrlproxy.spec sources Log Message: * Tue Jul 8 2008 Bernardo Innocenti 3.0.7-1 - Update to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ctrlproxy/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 May 2008 18:23:47 -0000 1.6 +++ .cvsignore 10 Jul 2008 08:59:14 -0000 1.7 @@ -1 +1 @@ -ctrlproxy-3.0.6.tar.gz +ctrlproxy-3.0.7.tar.gz Index: ctrlproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/ctrlproxy/devel/ctrlproxy.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ctrlproxy.spec 25 Jun 2008 06:57:02 -0000 1.17 +++ ctrlproxy.spec 10 Jul 2008 08:59:14 -0000 1.18 @@ -5,8 +5,8 @@ Summary: ctrlproxy Name: ctrlproxy -Version: 3.0.6 -Release: 2%{?dist} +Version: 3.0.7 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source: http://jelmer.vernstok.nl/releases/ctrlproxy-%{version}.tar.gz @@ -93,6 +93,9 @@ %{_libdir}/pkgconfig/ctrlproxy.pc %changelog +* Tue Jul 8 2008 Bernardo Innocenti 3.0.7-1 +- Update to latest upstream + * Wed Jun 25 2008 Tomas Mraz - 3.0.6-2 - rebuild with new gnutls Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ctrlproxy/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 May 2008 18:23:47 -0000 1.6 +++ sources 10 Jul 2008 08:59:14 -0000 1.7 @@ -1 +1 @@ -fdb5135860d3c01baac0248c23096480 ctrlproxy-3.0.6.tar.gz +2f5cf29c5c952c12832d9cf8c4c65827 ctrlproxy-3.0.7.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 09:02:46 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 10 Jul 2008 09:02:46 GMT Subject: rpms/ocaml-calendar/devel import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 ocaml-calendar.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807100902.m6A92kZX009972@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-calendar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9922/devel Modified Files: .cvsignore ocaml-calendar.spec sources Added Files: import.log Log Message: * Thu Jul 10 2008 Richard W.M. Jones - 2.0.4-1 - New upstream version 2.0.4 (rhbz #454789). - Fix non-UTF-8 characters in TODO. - *.cmx file moved to -devel subpackage as per packaging guidelines. --- NEW FILE import.log --- ocaml-calendar-2_0_4-1_fc10:HEAD:ocaml-calendar-2.0.4-1.fc10.src.rpm:1215680482 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Mar 2008 15:34:39 -0000 1.4 +++ .cvsignore 10 Jul 2008 09:01:56 -0000 1.5 @@ -1 +1 @@ -calendar-2.0.2.tar.gz +calendar-2.0.4.tar.gz Index: ocaml-calendar.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ocaml-calendar.spec 23 Apr 2008 11:10:34 -0000 1.7 +++ ocaml-calendar.spec 10 Jul 2008 09:01:56 -0000 1.8 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-calendar -Version: 2.0.2 -Release: 2%{?dist} +Version: 2.0.4 +Release: 1%{?dist} Summary: Objective Caml library for managing dates and times Group: Development/Libraries @@ -46,6 +46,9 @@ make make doc +mv TODO TODO.old +iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO + %install rm -rf $RPM_BUILD_ROOT @@ -63,16 +66,27 @@ %defattr(-,root,root,-) %doc CHANGES README TODO LGPL COPYING %{_libdir}/ocaml/calendar +%if %opt +%exclude %{_libdir}/ocaml/calendar/*.cmx +%endif %exclude %{_libdir}/ocaml/calendar/*.mli %files devel %defattr(-,root,root,-) %doc CHANGES README TODO LGPL COPYING calendarFAQ-2.6.txt doc/* +%if %opt +%{_libdir}/ocaml/calendar/*.cmx +%endif %{_libdir}/ocaml/calendar/*.mli %changelog +* Thu Jul 10 2008 Richard W.M. Jones - 2.0.4-1 +- New upstream version 2.0.4 (rhbz #454789). +- Fix non-UTF-8 characters in TODO. +- *.cmx file moved to -devel subpackage as per packaging guidelines. + * Wed Apr 23 2008 Richard W.M. Jones - 2.0.2-2 - Rebuild for OCaml 3.10.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Mar 2008 15:34:39 -0000 1.4 +++ sources 10 Jul 2008 09:01:56 -0000 1.5 @@ -1 +1 @@ -1631f5f21bf4d9b57a2fb7d956e44bdb calendar-2.0.2.tar.gz +f460b1f0544d6c29b9d6517ef8a4b282 calendar-2.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 09:06:46 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 10 Jul 2008 09:06:46 GMT Subject: rpms/ocaml-calendar/F-9 import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 ocaml-calendar.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200807100906.m6A96kDq010201@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-calendar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10156/F-9 Modified Files: .cvsignore ocaml-calendar.spec sources Added Files: import.log Log Message: * Thu Jul 10 2008 Richard W.M. Jones - 2.0.4-1 - New upstream version 2.0.4 (rhbz #454789). --- NEW FILE import.log --- ocaml-calendar-2_0_4-1_fc10:F-9:ocaml-calendar-2.0.4-1.fc10.src.rpm:1215680710 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Mar 2008 15:34:39 -0000 1.4 +++ .cvsignore 10 Jul 2008 09:05:44 -0000 1.5 @@ -1 +1 @@ -calendar-2.0.2.tar.gz +calendar-2.0.4.tar.gz Index: ocaml-calendar.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/F-9/ocaml-calendar.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ocaml-calendar.spec 28 Mar 2008 15:32:43 -0000 1.6 +++ ocaml-calendar.spec 10 Jul 2008 09:05:44 -0000 1.7 @@ -2,7 +2,7 @@ %define debug_package %{nil} Name: ocaml-calendar -Version: 2.0.2 +Version: 2.0.4 Release: 1%{?dist} Summary: Objective Caml library for managing dates and times @@ -73,6 +73,9 @@ %changelog +* Thu Jul 10 2008 Richard W.M. Jones - 2.0.4-1 +- New upstream version 2.0.4 (rhbz #454789). + * Fri Mar 28 2008 Richard W.M. Jones - 2.0.2-1 - New upstream version 2.0.2 (rhbz #439124) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Mar 2008 15:34:39 -0000 1.4 +++ sources 10 Jul 2008 09:05:44 -0000 1.5 @@ -1 +1 @@ -1631f5f21bf4d9b57a2fb7d956e44bdb calendar-2.0.2.tar.gz +f460b1f0544d6c29b9d6517ef8a4b282 calendar-2.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 09:24:20 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 10 Jul 2008 09:24:20 GMT Subject: rpms/ocaml-pgocaml/devel ocaml-pgocaml.spec,1.2,1.3 Message-ID: <200807100924.m6A9OKlX010929@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pgocaml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10897 Modified Files: ocaml-pgocaml.spec Log Message: * Thu Jul 10 2008 Richard W.M. Jones - 1.1-4 - Rebuild against ocaml-calendar 2.0.4 Index: ocaml-pgocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/ocaml-pgocaml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-pgocaml.spec 1 Jul 2008 12:56:28 -0000 1.2 +++ ocaml-pgocaml.spec 10 Jul 2008 09:23:32 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-pgocaml Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml library for type-safe access to PostgreSQL databases Group: Development/Libraries @@ -16,7 +16,7 @@ BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc BuildRequires: ocaml-extlib-devel BuildRequires: ocaml-pcre-devel, pcre-devel -BuildRequires: ocaml-calendar-devel +BuildRequires: ocaml-calendar-devel >= 2.0.4 BuildRequires: ocaml-csv-devel BuildRequires: ocaml-camlp4-devel @@ -95,6 +95,9 @@ %changelog +* Thu Jul 10 2008 Richard W.M. Jones - 1.1-4 +- Rebuild against ocaml-calendar 2.0.4 + * Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 - Ignore Parsetree dep. - Bump release to -3 to solve EVR problems with F-9. From fedora-extras-commits at redhat.com Thu Jul 10 09:27:34 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 10 Jul 2008 09:27:34 GMT Subject: rpms/supertux/devel supertux-0.3.1-gcc43.patch, NONE, 1.1 supertux.spec, 1.18, 1.19 Message-ID: <200807100927.m6A9RYIk011093@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/supertux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11043 Modified Files: supertux.spec Added Files: supertux-0.3.1-gcc43.patch Log Message: * Thu Jul 10 2008 Hans de Goede 0.3.1-3 - Fix building with gcc-4.3 (bz 434445) supertux-0.3.1-gcc43.patch: --- NEW FILE supertux-0.3.1-gcc43.patch --- diff -up supertux-0.3.1/src/addon_manager.cpp~ supertux-0.3.1/src/addon_manager.cpp --- supertux-0.3.1/src/addon_manager.cpp~ 2008-07-10 10:58:11.000000000 +0200 +++ supertux-0.3.1/src/addon_manager.cpp 2008-07-10 10:58:11.000000000 +0200 @@ -25,6 +25,7 @@ #include #include #include +#include #include "addon_manager.hpp" #include "config.h" #include "log.hpp" diff -up supertux-0.3.1/src/console.hpp~ supertux-0.3.1/src/console.hpp --- supertux-0.3.1/src/console.hpp~ 2008-07-10 10:48:45.000000000 +0200 +++ supertux-0.3.1/src/console.hpp 2008-07-10 10:57:01.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #include class Console; diff -up supertux-0.3.1/src/lisp/lexer.cpp~ supertux-0.3.1/src/lisp/lexer.cpp --- supertux-0.3.1/src/lisp/lexer.cpp~ 2008-07-10 11:00:49.000000000 +0200 +++ supertux-0.3.1/src/lisp/lexer.cpp 2008-07-10 11:00:49.000000000 +0200 @@ -21,6 +21,7 @@ #include #include #include +#include #include "lexer.hpp" diff -up supertux-0.3.1/src/resources.cpp~ supertux-0.3.1/src/resources.cpp diff -up supertux-0.3.1/src/sprite/sprite_manager.hpp~ supertux-0.3.1/src/sprite/sprite_manager.hpp --- supertux-0.3.1/src/sprite/sprite_manager.hpp~ 2008-07-10 10:58:59.000000000 +0200 +++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-07-10 10:58:59.000000000 +0200 @@ -21,6 +21,7 @@ #define SUPERTUX_SPRITE_MANAGER_H #include +#include class SpriteData; class Sprite; diff -up supertux-0.3.1/src/textscroller.hpp~ supertux-0.3.1/src/textscroller.hpp --- supertux-0.3.1/src/textscroller.hpp~ 2008-07-10 10:50:27.000000000 +0200 +++ supertux-0.3.1/src/textscroller.hpp 2008-07-10 10:57:18.000000000 +0200 @@ -24,6 +24,7 @@ #include #include #include +#include #include "screen.hpp" #include "math/vector.hpp" diff -up supertux-0.3.1/src/title.cpp~ supertux-0.3.1/src/title.cpp --- supertux-0.3.1/src/title.cpp~ 2008-07-10 10:57:50.000000000 +0200 +++ supertux-0.3.1/src/title.cpp 2008-07-10 10:57:50.000000000 +0200 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff -up supertux-0.3.1/src/video/sdl_texture.hpp~ supertux-0.3.1/src/video/sdl_texture.hpp --- supertux-0.3.1/src/video/sdl_texture.hpp~ 2008-07-10 11:01:13.000000000 +0200 +++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-07-10 11:01:13.000000000 +0200 @@ -22,6 +22,7 @@ #include +#include #include #include "texture.hpp" Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- supertux.spec 20 Feb 2008 03:10:14 -0000 1.18 +++ supertux.spec 10 Jul 2008 09:26:37 -0000 1.19 @@ -6,13 +6,14 @@ Name: supertux Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Jump'n run like game similar to Mario Bros Group: Amusements/Games License: GPLv2+ URL: http://supertux.lethargik.org/ #Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 Source0: http://download.berlios.de/supertux/supertux-%{version}d.tar.bz2 +Patch0: supertux-0.3.1-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.4 BuildRequires: SDL_image-devel @@ -42,6 +43,7 @@ %prep %setup -q +%patch0 -p1 # We want to just call this release "supertux", not "supertux2". find . -depth -name 'supertux2*' \ @@ -86,6 +88,9 @@ %{_datadir}/pixmaps/* %changelog +* Thu Jul 10 2008 Hans de Goede 0.3.1-3 +- Fix building with gcc-4.3 (bz 434445) + * Tue Feb 19 2008 Fedora Release Engineering - 0.3.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 10:54:30 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 10 Jul 2008 10:54:30 GMT Subject: rpms/monotorrent/devel import.log, NONE, 1.1 monotorrent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807101054.m6AAsUhA020372@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/monotorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20336/devel Modified Files: .cvsignore sources Added Files: import.log monotorrent.spec Log Message: Initial import --- NEW FILE import.log --- monotorrent-0_4-2_fc10:HEAD:monotorrent-0.4-2.fc10.src.rpm:1215687179 --- NEW FILE monotorrent.spec --- %define debug_package %{nil} Name: monotorrent Version: 0.4 Release: 2%{?dist} Summary: Mono bittorrent client Group: Development/Languages License: X11/MIT URL: http://www.monotorrent.com Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2-devel, desktop-file-utils # Bug 241850 - no Mono on pp64 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha %description Monotorrent is a bittorrent for mono %package devel Summary: .pc file for monotorrent Group: Documentation Requires: %{name} = %{version}-%{release} pkgconfig %description devel Package config file for monotorrent %prep %setup -q %build %configure make %install %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/trackerapp %{_bindir}/sampleclient %{_libdir}/monotorrent/* %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/monotorrent.pc %changelog * Sat Jun 28 2008 Paul F. Johnson 0.4-2 - defattr fix * Wed Jun 25 2008 Paul F. Johnson 0.4-1 - Initial import for FE Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/monotorrent/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:54:23 -0000 1.1 +++ .cvsignore 10 Jul 2008 10:53:45 -0000 1.2 @@ -0,0 +1 @@ +monotorrent-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/monotorrent/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:54:23 -0000 1.1 +++ sources 10 Jul 2008 10:53:45 -0000 1.2 @@ -0,0 +1 @@ +636e6b06198a2f7ba80790245018ca1c monotorrent-0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 11:03:14 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 10 Jul 2008 11:03:14 GMT Subject: rpms/monodevelop/devel import.log, 1.1, 1.2 monodevelop.spec, 1.30, 1.31 Message-ID: <200807101103.m6AB3Euj027140@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/monodevelop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27103/devel Modified Files: import.log monodevelop.spec Log Message: Compile fix - thanks David :-) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2008 10:35:29 -0000 1.1 +++ import.log 10 Jul 2008 11:02:26 -0000 1.2 @@ -1 +1,2 @@ monodevelop-1_9-1_fc10:HEAD:monodevelop-1.9-1.fc10.src.rpm:1215513265 +monodevelop-1_9-2_fc10:HEAD:monodevelop-1.9-2.fc10.src.rpm:1215687691 Index: monodevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- monodevelop.spec 8 Jul 2008 10:35:29 -0000 1.30 +++ monodevelop.spec 10 Jul 2008 11:02:27 -0000 1.31 @@ -8,7 +8,7 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2 @@ -27,7 +27,7 @@ BuildRequires: boo-devel Requires: boo %endif -%if "%{?fedora}" > "8" +%if 0%{?fedora} > 8 BuildRequires: mono-addins-devel Requires: mono-addins %endif @@ -152,6 +152,9 @@ %{__rm} -rf %{buildroot} %changelog +* Thu Jul 10 2008 David Nielsen 1.9-2 +- numerical compare for fedora version test, fixes compile on f10 + * Mon Jul 07 2008 Paul F. Johnson 1.9-1 - bump to latest beta for md2 - fixes to patch files for mono.cecil From fedora-extras-commits at redhat.com Thu Jul 10 11:48:29 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 10 Jul 2008 11:48:29 GMT Subject: rpms/nco/devel .cvsignore, 1.7, 1.8 nco.spec, 1.11, 1.12 nco_install_C_headers.patch, 1.2, 1.3 sources, 1.7, 1.8 Message-ID: <200807101148.m6ABmT7p028655@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/nco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28598 Modified Files: .cvsignore nco.spec nco_install_C_headers.patch sources Log Message: * Thu Jul 10 2008 - Patrice Dumas - 3.9.5-1 - update to 3.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Mar 2008 13:10:16 -0000 1.7 +++ .cvsignore 10 Jul 2008 11:47:37 -0000 1.8 @@ -1 +1 @@ -nco-3.9.3.tar.gz +nco-3.9.5.tar.gz Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nco.spec 1 Mar 2008 13:10:16 -0000 1.11 +++ nco.spec 10 Jul 2008 11:47:37 -0000 1.12 @@ -1,5 +1,5 @@ Name: nco -Version: 3.9.3 +Version: 3.9.5 Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering @@ -10,7 +10,7 @@ # using the following recommended commands: # cvs -d:pserver:anonymous at nco.cvs.sourceforge.net:/cvsroot/nco login # cvs -z3 -d:pserver:anonymous at nco.cvs.sourceforge.net:/cvsroot/nco \ -# co -r nco-3_9_3 -d nco-%{version} nco +# co -r nco-3_9_5 -d nco-%{version} nco # tar -czf nco-%{version}.tar.gz ./nco-%{version} Source0: nco-%{version}.tar.gz Patch0: nco_install_C_headers.patch @@ -56,11 +56,12 @@ %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .install_C_headers %build aclocal -autoheader +# nco accinclude.m4 isn't liked by newer autoheader +#autoheader automake --foreign autoconf export CPPFLAGS=-I%{_includedir}/netcdf-3 @@ -111,6 +112,9 @@ %{_libdir}/libnco*.a %changelog +* Thu Jul 10 2008 - Patrice Dumas - 3.9.5-1 +- update to 3.9.5 + * Sat Mar 1 2008 - Patrice Dumas - 3.9.3-1 - update to 3.9.3 - separate static sub-package nco_install_C_headers.patch: Index: nco_install_C_headers.patch =================================================================== RCS file: /cvs/extras/rpms/nco/devel/nco_install_C_headers.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nco_install_C_headers.patch 22 Apr 2006 03:07:19 -0000 1.2 +++ nco_install_C_headers.patch 10 Jul 2008 11:47:37 -0000 1.3 @@ -1,11 +1,12 @@ ---- nco-3.1.2/src/nco/Makefile.am.ORIG 2006-04-21 21:45:56.000000000 -0400 -+++ nco-3.1.2/src/nco/Makefile.am 2006-04-21 21:46:52.000000000 -0400 -@@ -127,6 +127,8 @@ - # This creates version-stamped shared-library, e.g., libnco-2.9.4.so - libnco_la_LDFLAGS = -release @VERSION@ - +diff -up nco-3.9.5/src/nco/Makefile.am.install_C_headers nco-3.9.5/src/nco/Makefile.am +--- nco-3.9.5/src/nco/Makefile.am.install_C_headers 2008-07-10 09:03:48.000000000 +0200 ++++ nco-3.9.5/src/nco/Makefile.am 2008-07-10 09:03:53.000000000 +0200 +@@ -132,7 +132,7 @@ libnco_la_LDFLAGS = -release @VERSION@ + # To my knowledge, thought, only NCO programs use libnco + # For this reason Debian packages should not install NCO headers (yet) + # Remove following line until learn how to prevent debian from installing headers +-#include_HEADERS = $(HEADER_SRC) +include_HEADERS = $(HEADER_SRC) -+ + libnco_la_SOURCES = \ - $(HEADER_SRC) \ - ${NCO_GETOPT} \ + ${HEADER_SRC} \ Index: sources =================================================================== RCS file: /cvs/extras/rpms/nco/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Mar 2008 13:10:16 -0000 1.7 +++ sources 10 Jul 2008 11:47:37 -0000 1.8 @@ -1 +1 @@ -6fe6fdf29b6eeada59089ca7344ce460 nco-3.9.3.tar.gz +7d7745818f94a4301d031c1a973db9dd nco-3.9.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 11:55:58 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 11:55:58 GMT Subject: rpms/foomatic/devel foomatic.spec,1.187,1.188 Message-ID: <200807101155.m6ABtw3i028857@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28808 Modified Files: foomatic.spec Log Message: * Thu Jul 10 2008 Tim Waugh - Ship a defaultspooler file to avoid the need for spooler auto-detection (bug #454684). Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- foomatic.spec 8 May 2008 08:22:23 -0000 1.187 +++ foomatic.spec 10 Jul 2008 11:55:09 -0000 1.188 @@ -219,6 +219,8 @@ mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom mkdir -p $RPM_BUILD_ROOT%{_var}/cache/foomatic +echo cups > $RPM_BUILD_ROOT%{_sysconfdir}/foomatic/defaultspooler + # Remove things we don't ship. rm -rf $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \ $RPM_BUILD_ROOT%{_libdir}/ppr \ @@ -237,6 +239,7 @@ %doc --parents */README */USAGE */ChangeLog %dir %{_sysconfdir}/foomatic %config(noreplace) %{_sysconfdir}/foomatic/filter.conf +%config(noreplace) %{_sysconfdir}/foomatic/defaultspooler %{_bindir}/* %{_sbindir}/* %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic @@ -248,6 +251,10 @@ %{_var}/cache/foomatic %changelog +* Thu Jul 10 2008 Tim Waugh +- Ship a defaultspooler file to avoid the need for spooler + auto-detection (bug #454684). + * Thu May 8 2008 Tim Waugh 3.0.2-60 - Updated filters to 3.0-20080507. From fedora-extras-commits at redhat.com Thu Jul 10 12:01:42 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 10 Jul 2008 12:01:42 GMT Subject: rpms/evolution-data-server/F-8 evolution-data-server-1.12.3-caldav-mime-type-parsing.patch, NONE, 1.1 evolution-data-server.spec, 1.197, 1.198 Message-ID: <200807101201.m6AC1gej003055@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28946 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-1.12.3-caldav-mime-type-parsing.patch Log Message: * Thu Jul 10 2008 Matthew Barnes - 1.12.3-6.fc8 - Add patch for RH bug #451230 (CalDAV MIME type detection). evolution-data-server-1.12.3-caldav-mime-type-parsing.patch: --- NEW FILE evolution-data-server-1.12.3-caldav-mime-type-parsing.patch --- diff -up evolution-data-server-1.12.3/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-mime-type-parsing evolution-data-server-1.12.3/calendar/backends/caldav/e-cal-backend-caldav.c --- evolution-data-server-1.12.3/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-mime-type-parsing 2008-07-10 07:55:01.000000000 -0400 +++ evolution-data-server-1.12.3/calendar/backends/caldav/e-cal-backend-caldav.c 2008-07-10 07:55:34.000000000 -0400 @@ -1208,7 +1208,7 @@ caldav_server_get_object (ECalBackendCal hdr = soup_message_get_header (message->response_headers, "Content-Type"); - if (hdr == NULL || g_ascii_strcasecmp (hdr, "text/calendar")) { + if (hdr == NULL || g_ascii_strncasecmp (hdr, "text/calendar", 13)) { result = GNOME_Evolution_Calendar_InvalidObject; g_object_unref (message); g_warning ("Object to fetch not of type text/calendar"); Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/F-8/evolution-data-server.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- evolution-data-server.spec 4 Apr 2008 17:07:44 -0000 1.197 +++ evolution-data-server.spec 10 Jul 2008 12:00:55 -0000 1.198 @@ -27,7 +27,7 @@ Name: evolution-data-server Version: 1.12.3 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -74,6 +74,9 @@ # RH bug #440455 Patch23: evolution-data-server-1.12.3-large-files.patch +# RH bug #451230 / GNOME #514487 +Patch24: evolution-data-server-1.12.3-caldav-mime-type-parsing.patch + ### Dependencies ### Requires: GConf2 @@ -166,6 +169,7 @@ %patch21 -p1 -b .e2k-context-fba %patch22 -p1 -b .efolder-leak %patch23 -p1 -b .large_files +%patch24 -p1 -b .caldav-mime-type-parsing gtkdocize @@ -400,6 +404,9 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Thu Jul 10 2008 Matthew Barnes - 1.12.3-6.fc8 +- Add patch for RH bug #451230 (CalDAV MIME type detection). + * Fri Apr 04 2008 Milan Crha - 1.12.3-5.fc8 - Add patch for RH bug #440455 (Large file support for local stores). From fedora-extras-commits at redhat.com Thu Jul 10 12:02:38 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 10 Jul 2008 12:02:38 GMT Subject: rpms/kdeplasmoids/devel kdeplasmoids.spec,1.4,1.5 Message-ID: <200807101202.m6AC2chC003151@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasmoids/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3065 Modified Files: kdeplasmoids.spec Log Message: * Thu Jul 10 2008 Rex Dieter 4.0.85-2 - Provides: kdeplasma-addons Index: kdeplasmoids.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/kdeplasmoids.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kdeplasmoids.spec 7 Jul 2008 13:05:44 -0000 1.4 +++ kdeplasmoids.spec 10 Jul 2008 12:01:45 -0000 1.5 @@ -1,7 +1,7 @@ Name: kdeplasmoids Version: 4.0.85 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plasmoids for KDE Group: User Interface/Desktops @@ -26,6 +26,8 @@ # extragear-plasma -> kdeplasmoids rename Obsoletes: extragear-plasma < %{version}-%{release} Provides: extragear-plasma = %{version}-%{release} +# Oh gawd, another rename looming +Provides: kdeplasma-addons = %{version}-%{release} Requires(post): coreutils /sbin/ldconfig Requires(postun): coreutils /sbin/ldconfig @@ -97,6 +99,9 @@ %changelog +* Thu Jul 10 2008 Rex Dieter 4.0.85-2 +- Provides: kdeplasma-addons + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 From fedora-extras-commits at redhat.com Thu Jul 10 12:05:29 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 12:05:29 GMT Subject: rpms/foomatic/devel .cvsignore, 1.60, 1.61 foomatic.spec, 1.188, 1.189 sources, 1.62, 1.63 Message-ID: <200807101205.m6AC5TL6003398@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3287 Modified Files: .cvsignore foomatic.spec sources Log Message: * Thu Jul 10 2008 Tim Waugh - Updated db-engine to 3.0-20080710. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 8 May 2008 08:21:29 -0000 1.60 +++ .cvsignore 10 Jul 2008 12:04:35 -0000 1.61 @@ -54,3 +54,4 @@ foomatic-db-hpijs-20080211.tar.gz foomatic-filters-3.0-20080211.tar.gz foomatic-filters-3.0-20080507.tar.gz +foomatic-db-engine-3.0-20080710.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- foomatic.spec 10 Jul 2008 11:55:09 -0000 1.188 +++ foomatic.spec 10 Jul 2008 12:04:35 -0000 1.189 @@ -1,5 +1,5 @@ %define dbver 20080211 -%define enginever 3.0-20080211 +%define enginever 3.0-20080710 %define filtersver 20080507 %define hpijsver 20080211 @@ -14,7 +14,7 @@ # NOW=`date '+%Y%m%d'` # cvs -d:pserver:anonymous at cvs.linuxprinting.org:/usr/local/cvs export -D $NOW foomatic # tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic -Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz +Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0-%{filtersver}.tar.gz Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz @@ -252,6 +252,7 @@ %changelog * Thu Jul 10 2008 Tim Waugh +- Updated db-engine to 3.0-20080710. - Ship a defaultspooler file to avoid the need for spooler auto-detection (bug #454684). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 8 May 2008 08:21:29 -0000 1.62 +++ sources 10 Jul 2008 12:04:35 -0000 1.63 @@ -1,4 +1,4 @@ 5d827cd3d95807c28609d49a5c412c29 foomatic-db-3.0-20080211.tar.gz -ba8b08913589568f85548998f6321f95 foomatic-db-engine-3.0-20080211.tar.gz 58bef426f769219592b6b0c81357a04a foomatic-db-hpijs-20080211.tar.gz bb02f5036f73c5302ba4739ca2a7339a foomatic-filters-3.0-20080507.tar.gz +cca75a1d1a189a2b816a0c20058e6aef foomatic-db-engine-3.0-20080710.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:06:15 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 10 Jul 2008 12:06:15 GMT Subject: rpms/drupal/F-8 .cvsignore, 1.4, 1.5 drupal.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200807101206.m6AC6FDq003432@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3382 Modified Files: .cvsignore drupal.spec sources Log Message: SA-2008-044 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Oct 2007 09:48:43 -0000 1.4 +++ .cvsignore 10 Jul 2008 12:05:17 -0000 1.5 @@ -1 +1 @@ -drupal-5.3.tar.gz +drupal-5.8.tar.gz Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-8/drupal.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- drupal.spec 22 Feb 2008 12:53:18 -0000 1.10 +++ drupal.spec 10 Jul 2008 12:05:17 -0000 1.11 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 5.7 +Version: 5.8 Release: 1%{?dist} Summary: An open-source content-management platform @@ -71,6 +71,9 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 10 2008 Jon Ciesla - 5.8-1 +- Upgrade to 5.8, SA-2008-044. + * Mon Feb 04 2008 Jon Ciesla - 5.7-1 - Upgrade to 5.7, several non-security bugs fixed. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Feb 2008 12:53:18 -0000 1.8 +++ sources 10 Jul 2008 12:05:17 -0000 1.9 @@ -1 +1 @@ -c7d9911ad1001c790bbdfe6fd4cdfc89 drupal-5.7.tar.gz +2a570ce3cb6a104c2cc540a02a3cb11d drupal-5.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:07:52 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 10 Jul 2008 12:07:52 GMT Subject: rpms/drupal/EL-5 drupal.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <200807101207.m6AC7qFc003558@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3473 Modified Files: drupal.spec sources Log Message: SA-2008-044 Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-5/drupal.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- drupal.spec 11 Jan 2008 12:38:51 -0000 1.7 +++ drupal.spec 10 Jul 2008 12:06:57 -0000 1.8 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 5.6 +Version: 5.8 Release: 1%{?dist} Summary: An open-source content-management platform @@ -56,6 +56,7 @@ %defattr(-,root,root,-) %doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt %{drupaldir} +%config(noreplace) %{drupaldir}/.htaccess %exclude %{drupaldir}/CHANGELOG.txt %exclude %{drupaldir}/INSTALL* %exclude %{drupaldir}/LICENSE* @@ -70,6 +71,12 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 10 2008 Jon Ciesla - 5.8-1 +- Upgrade to 5.8, SA-2008-044. + +* Mon Feb 04 2008 Jon Ciesla - 5.7-1 +- Upgrade to 5.7, several non-security bugs fixed. + * Fri Jan 11 2008 Jon Ciesla - 5.6-1 - Upgrade to 5.6, upstream security fixes. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Jan 2008 12:38:51 -0000 1.7 +++ sources 10 Jul 2008 12:06:57 -0000 1.8 @@ -1 +1 @@ -c276a585821f87f09061bf7641eaa199 drupal-5.6.tar.gz +2a570ce3cb6a104c2cc540a02a3cb11d drupal-5.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:09:03 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 10 Jul 2008 12:09:03 GMT Subject: rpms/drupal/EL-4 drupal.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <200807101209.m6AC937j003665@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3569 Modified Files: drupal.spec sources Log Message: SA-2008-044 Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-4/drupal.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- drupal.spec 11 Jan 2008 12:40:13 -0000 1.7 +++ drupal.spec 10 Jul 2008 12:08:14 -0000 1.8 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 5.6 +Version: 5.8 Release: 1%{?dist} Summary: An open-source content-management platform @@ -56,6 +56,7 @@ %defattr(-,root,root,-) %doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt %{drupaldir} +%config(noreplace) %{drupaldir}/.htaccess %exclude %{drupaldir}/CHANGELOG.txt %exclude %{drupaldir}/INSTALL* %exclude %{drupaldir}/LICENSE* @@ -70,6 +71,12 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 10 2008 Jon Ciesla - 5.8-1 +- Upgrade to 5.8, SA-2008-044. + +* Mon Feb 04 2008 Jon Ciesla - 5.7-1 +- Upgrade to 5.7, several non-security bugs fixed. + * Fri Jan 11 2008 Jon Ciesla - 5.6-1 - Upgrade to 5.6, upstream security fixes. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Jan 2008 12:40:13 -0000 1.7 +++ sources 10 Jul 2008 12:08:14 -0000 1.8 @@ -1 +1 @@ -c276a585821f87f09061bf7641eaa199 drupal-5.6.tar.gz +2a570ce3cb6a104c2cc540a02a3cb11d drupal-5.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:15:03 2008 From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip)) Date: Thu, 10 Jul 2008 12:15:03 GMT Subject: rpms/revisor/devel import.log, 1.1, 1.2 revisor.spec, 1.40, 1.41 sources, 1.43, 1.44 Message-ID: <200807101215.m6ACF35t003907@cvs-int.fedora.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/revisor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3847/devel Modified Files: import.log revisor.spec sources Log Message: 2.1.1-6.fc10 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/revisor/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jun 2008 17:46:33 -0000 1.1 +++ import.log 10 Jul 2008 12:14:05 -0000 1.2 @@ -1 +1,2 @@ revisor-2_1_1-5_fc10:HEAD:revisor-2.1.1-5.fc10.src.rpm:1214847971 +revisor-2_1_1-6_fc10:HEAD:revisor-2.1.1-6.fc10.src.rpm:1215692013 Index: revisor.spec =================================================================== RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- revisor.spec 30 Jun 2008 17:46:33 -0000 1.40 +++ revisor.spec 10 Jul 2008 12:14:05 -0000 1.41 @@ -14,7 +14,7 @@ Summary: Fedora "Spin" Graphical User Interface Name: revisor Version: 2.1.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://fedorahosted.org/revisor @@ -433,8 +433,12 @@ %endif %changelog -* Mon Jun 30 2008 Jeroen van Meeuwen 2.1.1-5 +* Thu Jul 10 2008 Jeroen van Meeuwen 2.1.1-6 - Latest rebuild +- Minor bugfixes (#344 pkgorder traceback) +- Add SELinux Check + +* Tue Jul 01 2008 Jeroen van Meeuwen 2.1.1-5 - Fix running GUI - Add check for architecture composing - Bugfixes in live media creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 30 Jun 2008 17:46:33 -0000 1.43 +++ sources 10 Jul 2008 12:14:05 -0000 1.44 @@ -1 +1 @@ -4133deb42692b4f154bbac8bd675e7fc revisor-2.1.1.tar.gz +263d8f828d0c146f1e5349ae298b8815 revisor-2.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:15:47 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 10 Jul 2008 12:15:47 GMT Subject: rpms/drupal/devel .cvsignore, 1.11, 1.12 drupal.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <200807101215.m6ACFljn003969@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3898 Modified Files: .cvsignore drupal.spec sources Log Message: SA-2008-044 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drupal/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 Apr 2008 11:15:46 -0000 1.11 +++ .cvsignore 10 Jul 2008 12:14:58 -0000 1.12 @@ -1 +1 @@ -drupal-6.2.tar.gz +drupal-6.3.tar.gz Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- drupal.spec 10 Apr 2008 11:15:46 -0000 1.14 +++ drupal.spec 10 Jul 2008 12:14:58 -0000 1.15 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 6.2 +Version: 6.3 Release: 1%{?dist} Summary: An open-source content-management platform @@ -72,6 +72,9 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 10 2008 Jon Ciesla - 6.3-1 +- Upgrade to 6.3, upstream security fixes, SA-2008-044. + * Thu Apr 10 2008 Jon Ciesla - 6.2-1 - Upgrade to 6.2, upstream security fixes, SA-2008-026. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Apr 2008 11:15:46 -0000 1.11 +++ sources 10 Jul 2008 12:14:58 -0000 1.12 @@ -1 +1 @@ -4c5af590b42b5a8e826177119c7e73b3 drupal-6.2.tar.gz +f6a23149b906048d8a2dce1bad0e11a7 drupal-6.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:17:10 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 10 Jul 2008 12:17:10 GMT Subject: rpms/xdialog/EL-5 xdialog-2.3.1-nostrip.patch, NONE, 1.1 xdialog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807101217.m6ACHAfN004137@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/xdialog/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4017/EL-5 Modified Files: .cvsignore sources Added Files: xdialog-2.3.1-nostrip.patch xdialog.spec Log Message: Initial branches xdialog-2.3.1-nostrip.patch: --- NEW FILE xdialog-2.3.1-nostrip.patch --- diff -up Xdialog-2.3.1/configure.in.nostrip Xdialog-2.3.1/configure.in --- Xdialog-2.3.1/configure.in.nostrip 2008-04-05 19:25:33.000000000 +0200 +++ Xdialog-2.3.1/configure.in 2008-04-05 19:26:00.000000000 +0200 @@ -65,10 +65,6 @@ if test "x$GCC" = "xyes"; then *[[\ \ ]-Wall[\ \ ]]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[[\ \ ]-s[\ \ ]]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in diff -up Xdialog-2.3.1/configure.nostrip Xdialog-2.3.1/configure --- Xdialog-2.3.1/configure.nostrip 2008-04-05 19:25:42.000000000 +0200 +++ Xdialog-2.3.1/configure 2008-04-05 19:26:37.000000000 +0200 @@ -8268,10 +8268,6 @@ if test "x$GCC" = "xyes"; then *[\ \ ]-Wall[\ \ ]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[\ \ ]-s[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in --- NEW FILE xdialog.spec --- %define real_name Xdialog Name: xdialog Summary: X11 drop in replacement for cdialog Version: 2.3.1 Release: 3%{?dist} License: GPL+ Group: Applications/System URL: http://xdialog.free.fr Source0: http://xdialog.free.fr/%{real_name}-%{version}.tar.bz2 Patch0: xdialog-2.3.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1.2.0 BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: gettext Provides: %{real_name} = %{version}-%{release} Obsoletes: %{real_name} < %{version}-%{release} # there is no need for .desktop file since there is a mandatory argument %description Xdialog is designed to be a drop in replacement for the cdialog program. It converts any terminal based program into a program with an X-windows interface. The dialogs are easier to see and use and Xdialog adds even more functionalities (help button+box, treeview, editbox, file selector, range box, and much more). %prep %setup -q -n %{real_name}-%{version} iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8 touch -c -r ChangeLog ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog %patch0 -p1 -b .nostrip touch -c -r configure.nostrip configure touch -c -r configure.in.nostrip configure.in %build # build both the gtk1 and gtk2 versions. Upstream advises not to use # the gtk2 version, however the issues with gtk2 version is with non UTF-8 # locales which should be rare on fedora, and gtk2 has more features. %configure make %{?_smp_mflags} mv src/Xdialog src/Xdialog-gtk1 make clean %configure --with-gtk2 make %{?_smp_mflags} sed -i -e 's:%{_datadir}/doc/Xdialog:%{_datadir}/doc/%{name}:g' doc/Xdialog.1 %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL='install -p' install -m0755 src/Xdialog-gtk1 %{buildroot}%{_bindir} rm -rf __dist_html mkdir -p __dist_html/html cp -p doc/*.html doc/*.png __dist_html/html # there are references to the samples in the documentation. ln -s ../samples __dist_html/html/samples %find_lang %{real_name} %clean rm -rf %{buildroot} %files -f %{real_name}.lang %defattr(-, root, root, -) %doc AUTHORS BUGS COPYING ChangeLog README %doc __dist_html/html/ samples/ %{_mandir}/man1/Xdialog.1* %{_bindir}/Xdialog %{_bindir}/Xdialog-gtk1 %exclude %{_docdir}/%{real_name}-%{version} %changelog * Sun Jun 29 2008 Patrice Dumas 2.3.1-3 - add BR gettext * Wed Jun 25 2008 Patrice Dumas 2.3.1-2 - review request cleanups * Sat Apr 5 2008 Patrice Dumas 2.3.1-1 - submit to fedora. * Sat Apr 08 2006 Dries Verachtert - 2.1.2-1.2 - Rebuild for Fedora Core 5. * Tue Feb 22 2005 Dag Wieers - 2.1.2-1 - Updated to release 2.1.2. * Tue Apr 29 2003 Dag Wieers - 2.1.1-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdialog/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2008 18:10:05 -0000 1.1 +++ .cvsignore 10 Jul 2008 12:16:25 -0000 1.2 @@ -0,0 +1 @@ +Xdialog-2.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdialog/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2008 18:10:05 -0000 1.1 +++ sources 10 Jul 2008 12:16:25 -0000 1.2 @@ -0,0 +1 @@ +0671f8353717513bf1f0ebc80e9710f6 Xdialog-2.3.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 12:17:25 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 10 Jul 2008 12:17:25 GMT Subject: rpms/xdialog/EL-4 xdialog-2.3.1-nostrip.patch, NONE, 1.1 xdialog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807101217.m6ACHP80004155@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/xdialog/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4017/EL-4 Modified Files: .cvsignore sources Added Files: xdialog-2.3.1-nostrip.patch xdialog.spec Log Message: Initial branches xdialog-2.3.1-nostrip.patch: --- NEW FILE xdialog-2.3.1-nostrip.patch --- diff -up Xdialog-2.3.1/configure.in.nostrip Xdialog-2.3.1/configure.in --- Xdialog-2.3.1/configure.in.nostrip 2008-04-05 19:25:33.000000000 +0200 +++ Xdialog-2.3.1/configure.in 2008-04-05 19:26:00.000000000 +0200 @@ -65,10 +65,6 @@ if test "x$GCC" = "xyes"; then *[[\ \ ]-Wall[\ \ ]]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[[\ \ ]-s[\ \ ]]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in diff -up Xdialog-2.3.1/configure.nostrip Xdialog-2.3.1/configure --- Xdialog-2.3.1/configure.nostrip 2008-04-05 19:25:42.000000000 +0200 +++ Xdialog-2.3.1/configure 2008-04-05 19:26:37.000000000 +0200 @@ -8268,10 +8268,6 @@ if test "x$GCC" = "xyes"; then *[\ \ ]-Wall[\ \ ]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[\ \ ]-s[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in --- NEW FILE xdialog.spec --- %define real_name Xdialog Name: xdialog Summary: X11 drop in replacement for cdialog Version: 2.3.1 Release: 3%{?dist} License: GPL+ Group: Applications/System URL: http://xdialog.free.fr Source0: http://xdialog.free.fr/%{real_name}-%{version}.tar.bz2 Patch0: xdialog-2.3.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1.2.0 BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: gettext Provides: %{real_name} = %{version}-%{release} Obsoletes: %{real_name} < %{version}-%{release} # there is no need for .desktop file since there is a mandatory argument %description Xdialog is designed to be a drop in replacement for the cdialog program. It converts any terminal based program into a program with an X-windows interface. The dialogs are easier to see and use and Xdialog adds even more functionalities (help button+box, treeview, editbox, file selector, range box, and much more). %prep %setup -q -n %{real_name}-%{version} iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8 touch -c -r ChangeLog ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog %patch0 -p1 -b .nostrip touch -c -r configure.nostrip configure touch -c -r configure.in.nostrip configure.in %build # build both the gtk1 and gtk2 versions. Upstream advises not to use # the gtk2 version, however the issues with gtk2 version is with non UTF-8 # locales which should be rare on fedora, and gtk2 has more features. %configure make %{?_smp_mflags} mv src/Xdialog src/Xdialog-gtk1 make clean %configure --with-gtk2 make %{?_smp_mflags} sed -i -e 's:%{_datadir}/doc/Xdialog:%{_datadir}/doc/%{name}:g' doc/Xdialog.1 %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL='install -p' install -m0755 src/Xdialog-gtk1 %{buildroot}%{_bindir} rm -rf __dist_html mkdir -p __dist_html/html cp -p doc/*.html doc/*.png __dist_html/html # there are references to the samples in the documentation. ln -s ../samples __dist_html/html/samples %find_lang %{real_name} %clean rm -rf %{buildroot} %files -f %{real_name}.lang %defattr(-, root, root, -) %doc AUTHORS BUGS COPYING ChangeLog README %doc __dist_html/html/ samples/ %{_mandir}/man1/Xdialog.1* %{_bindir}/Xdialog %{_bindir}/Xdialog-gtk1 %exclude %{_docdir}/%{real_name}-%{version} %changelog * Sun Jun 29 2008 Patrice Dumas 2.3.1-3 - add BR gettext * Wed Jun 25 2008 Patrice Dumas 2.3.1-2 - review request cleanups * Sat Apr 5 2008 Patrice Dumas 2.3.1-1 - submit to fedora. * Sat Apr 08 2006 Dries Verachtert - 2.1.2-1.2 - Rebuild for Fedora Core 5. * Tue Feb 22 2005 Dag Wieers - 2.1.2-1 - Updated to release 2.1.2. * Tue Apr 29 2003 Dag Wieers - 2.1.1-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdialog/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2008 18:10:05 -0000 1.1 +++ .cvsignore 10 Jul 2008 12:16:05 -0000 1.2 @@ -0,0 +1 @@ +Xdialog-2.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdialog/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2008 18:10:05 -0000 1.1 +++ sources 10 Jul 2008 12:16:05 -0000 1.2 @@ -0,0 +1 @@ +0671f8353717513bf1f0ebc80e9710f6 Xdialog-2.3.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 12:17:28 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 10 Jul 2008 12:17:28 GMT Subject: rpms/xdialog/F-8 xdialog-2.3.1-nostrip.patch, NONE, 1.1 xdialog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807101217.m6ACHSsr004159@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/xdialog/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4017/F-8 Modified Files: .cvsignore sources Added Files: xdialog-2.3.1-nostrip.patch xdialog.spec Log Message: Initial branches xdialog-2.3.1-nostrip.patch: --- NEW FILE xdialog-2.3.1-nostrip.patch --- diff -up Xdialog-2.3.1/configure.in.nostrip Xdialog-2.3.1/configure.in --- Xdialog-2.3.1/configure.in.nostrip 2008-04-05 19:25:33.000000000 +0200 +++ Xdialog-2.3.1/configure.in 2008-04-05 19:26:00.000000000 +0200 @@ -65,10 +65,6 @@ if test "x$GCC" = "xyes"; then *[[\ \ ]-Wall[\ \ ]]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[[\ \ ]-s[\ \ ]]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in diff -up Xdialog-2.3.1/configure.nostrip Xdialog-2.3.1/configure --- Xdialog-2.3.1/configure.nostrip 2008-04-05 19:25:42.000000000 +0200 +++ Xdialog-2.3.1/configure 2008-04-05 19:26:37.000000000 +0200 @@ -8268,10 +8268,6 @@ if test "x$GCC" = "xyes"; then *[\ \ ]-Wall[\ \ ]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac - case " $CFLAGS " in - *[\ \ ]-s[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -s" ;; - esac case `gcc --version` in 2.95*|2.96*|2.97*) case " $CFLAGS " in --- NEW FILE xdialog.spec --- %define real_name Xdialog Name: xdialog Summary: X11 drop in replacement for cdialog Version: 2.3.1 Release: 3%{?dist} License: GPL+ Group: Applications/System URL: http://xdialog.free.fr Source0: http://xdialog.free.fr/%{real_name}-%{version}.tar.bz2 Patch0: xdialog-2.3.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1.2.0 BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: gettext Provides: %{real_name} = %{version}-%{release} Obsoletes: %{real_name} < %{version}-%{release} # there is no need for .desktop file since there is a mandatory argument %description Xdialog is designed to be a drop in replacement for the cdialog program. It converts any terminal based program into a program with an X-windows interface. The dialogs are easier to see and use and Xdialog adds even more functionalities (help button+box, treeview, editbox, file selector, range box, and much more). %prep %setup -q -n %{real_name}-%{version} iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8 touch -c -r ChangeLog ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog %patch0 -p1 -b .nostrip touch -c -r configure.nostrip configure touch -c -r configure.in.nostrip configure.in %build # build both the gtk1 and gtk2 versions. Upstream advises not to use # the gtk2 version, however the issues with gtk2 version is with non UTF-8 # locales which should be rare on fedora, and gtk2 has more features. %configure make %{?_smp_mflags} mv src/Xdialog src/Xdialog-gtk1 make clean %configure --with-gtk2 make %{?_smp_mflags} sed -i -e 's:%{_datadir}/doc/Xdialog:%{_datadir}/doc/%{name}:g' doc/Xdialog.1 %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL='install -p' install -m0755 src/Xdialog-gtk1 %{buildroot}%{_bindir} rm -rf __dist_html mkdir -p __dist_html/html cp -p doc/*.html doc/*.png __dist_html/html # there are references to the samples in the documentation. ln -s ../samples __dist_html/html/samples %find_lang %{real_name} %clean rm -rf %{buildroot} %files -f %{real_name}.lang %defattr(-, root, root, -) %doc AUTHORS BUGS COPYING ChangeLog README %doc __dist_html/html/ samples/ %{_mandir}/man1/Xdialog.1* %{_bindir}/Xdialog %{_bindir}/Xdialog-gtk1 %exclude %{_docdir}/%{real_name}-%{version} %changelog * Sun Jun 29 2008 Patrice Dumas 2.3.1-3 - add BR gettext * Wed Jun 25 2008 Patrice Dumas 2.3.1-2 - review request cleanups * Sat Apr 5 2008 Patrice Dumas 2.3.1-1 - submit to fedora. * Sat Apr 08 2006 Dries Verachtert - 2.1.2-1.2 - Rebuild for Fedora Core 5. * Tue Feb 22 2005 Dag Wieers - 2.1.2-1 - Updated to release 2.1.2. * Tue Apr 29 2003 Dag Wieers - 2.1.1-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdialog/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2008 18:10:05 -0000 1.1 +++ .cvsignore 10 Jul 2008 12:16:41 -0000 1.2 @@ -0,0 +1 @@ +Xdialog-2.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdialog/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2008 18:10:05 -0000 1.1 +++ sources 10 Jul 2008 12:16:41 -0000 1.2 @@ -0,0 +1 @@ +0671f8353717513bf1f0ebc80e9710f6 Xdialog-2.3.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 12:17:50 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 10 Jul 2008 12:17:50 GMT Subject: rpms/drupal/F-9 drupal.spec,1.14,1.15 sources,1.11,1.12 Message-ID: <200807101217.m6ACHoYZ004163@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4095 Modified Files: drupal.spec sources Log Message: SA-2008-044 Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-9/drupal.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- drupal.spec 10 Apr 2008 11:15:46 -0000 1.14 +++ drupal.spec 10 Jul 2008 12:16:51 -0000 1.15 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 6.2 +Version: 6.3 Release: 1%{?dist} Summary: An open-source content-management platform @@ -72,6 +72,9 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 10 2008 Jon Ciesla - 6.3-1 +- Upgrade to 6.3, upstream security fixes, SA-2008-044. + * Thu Apr 10 2008 Jon Ciesla - 6.2-1 - Upgrade to 6.2, upstream security fixes, SA-2008-026. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Apr 2008 11:15:46 -0000 1.11 +++ sources 10 Jul 2008 12:16:51 -0000 1.12 @@ -1 +1 @@ -4c5af590b42b5a8e826177119c7e73b3 drupal-6.2.tar.gz +f6a23149b906048d8a2dce1bad0e11a7 drupal-6.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:19:27 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 10 Jul 2008 12:19:27 GMT Subject: rpms/xdialog/F-8 xdialog.spec,1.1,1.2 Message-ID: <200807101219.m6ACJRoq004366@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/xdialog/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4233 Modified Files: xdialog.spec Log Message: bump release Index: xdialog.spec =================================================================== RCS file: /cvs/extras/rpms/xdialog/F-8/xdialog.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xdialog.spec 10 Jul 2008 12:16:41 -0000 1.1 +++ xdialog.spec 10 Jul 2008 12:18:35 -0000 1.2 @@ -3,7 +3,7 @@ Name: xdialog Summary: X11 drop in replacement for cdialog Version: 2.3.1 -Release: 3%{?dist} +Release: 3%{?dist}.1 License: GPL+ Group: Applications/System URL: http://xdialog.free.fr @@ -75,7 +75,7 @@ %exclude %{_docdir}/%{real_name}-%{version} %changelog -* Sun Jun 29 2008 Patrice Dumas 2.3.1-3 +* Sun Jun 29 2008 Patrice Dumas 2.3.1-3.1 - add BR gettext * Wed Jun 25 2008 Patrice Dumas 2.3.1-2 From fedora-extras-commits at redhat.com Thu Jul 10 12:21:40 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 12:21:40 GMT Subject: rpms/foomatic/devel .cvsignore, 1.61, 1.62 foomatic.spec, 1.189, 1.190 sources, 1.63, 1.64 Message-ID: <200807101221.m6ACLerP004565@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4518 Modified Files: .cvsignore foomatic.spec sources Log Message: * Thu Jul 10 2008 Tim Waugh - Updated filters to 3.0-20080710. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 10 Jul 2008 12:04:35 -0000 1.61 +++ .cvsignore 10 Jul 2008 12:20:56 -0000 1.62 @@ -55,3 +55,4 @@ foomatic-filters-3.0-20080211.tar.gz foomatic-filters-3.0-20080507.tar.gz foomatic-db-engine-3.0-20080710.tar.gz +foomatic-filters-3.0-20080710.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- foomatic.spec 10 Jul 2008 12:04:35 -0000 1.189 +++ foomatic.spec 10 Jul 2008 12:20:56 -0000 1.190 @@ -1,6 +1,6 @@ %define dbver 20080211 %define enginever 3.0-20080710 -%define filtersver 20080507 +%define filtersver 20080710 %define hpijsver 20080211 Summary: Foomatic printer database. @@ -252,6 +252,7 @@ %changelog * Thu Jul 10 2008 Tim Waugh +- Updated filters to 3.0-20080710. - Updated db-engine to 3.0-20080710. - Ship a defaultspooler file to avoid the need for spooler auto-detection (bug #454684). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 10 Jul 2008 12:04:35 -0000 1.63 +++ sources 10 Jul 2008 12:20:56 -0000 1.64 @@ -1,4 +1,4 @@ 5d827cd3d95807c28609d49a5c412c29 foomatic-db-3.0-20080211.tar.gz 58bef426f769219592b6b0c81357a04a foomatic-db-hpijs-20080211.tar.gz -bb02f5036f73c5302ba4739ca2a7339a foomatic-filters-3.0-20080507.tar.gz cca75a1d1a189a2b816a0c20058e6aef foomatic-db-engine-3.0-20080710.tar.gz +ddd20fc710fba33900df82b0b2b95d35 foomatic-filters-3.0-20080710.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:27:27 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 10 Jul 2008 12:27:27 GMT Subject: comps/po nb.po,1.13,1.14 Message-ID: <200807101227.m6ACRRhw004938@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4905/po Modified Files: nb.po Log Message: 2008-07-10 Kjartan Maraas (via kmaraas at fedoraproject.org) * po/nb.po: Updated Norwegian bokm??l translation. Index: nb.po =================================================================== RCS file: /cvs/pkgs/comps/po/nb.po,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nb.po 4 Jul 2008 13:52:48 -0000 1.13 +++ nb.po 10 Jul 2008 12:26:57 -0000 1.14 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: comps-po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-17 07:36-0400\n" -"PO-Revision-Date: 2008-07-04 15:51+0200\n" +"POT-Creation-Date: 2008-07-10 10:36+0000\n" +"PO-Revision-Date: 2008-07-10 14:25+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian/Bokmaal \n" "MIME-Version: 1.0\n" @@ -18,162 +18,188 @@ "Content-Transfer-Encoding: 8bit\n" #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 +#: ../comps-f10.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "" "Et lettvektig skrivebordsmilj?? som fungerer bra p?? eldre og tregere maskiner." #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Administrasjonsverkt??y" #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +#: ../comps-f10.xml.in.h:3 msgid "Afrikaans Support" msgstr "St??tte for Afrikaans" #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +#: ../comps-f10.xml.in.h:4 msgid "Albanian Support" msgstr "St??tte for albansk" #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f10.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Programmer" #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +#: ../comps-f10.xml.in.h:6 msgid "Applications to perform a variety of tasks" msgstr "Programmer for en rekke forskjellige oppgaver" #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f10.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "St??tte for arabisk" #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f10.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "St??tte for armensk" #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 +#: ../comps-f10.xml.in.h:9 msgid "Assamese Support" msgstr "St??tte for assamesisk" #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +#: ../comps-f10.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "Tekstpublisering" #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 +#: ../comps-f10.xml.in.h:11 msgid "Base" msgstr "Grunnpakker" #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 +#: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Basissystem" #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 +#: ../comps-f10.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "Grunnleggende st??tte for programmeringsspr??ket Ruby." #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 +#: ../comps-f10.xml.in.h:14 msgid "Basque Support" msgstr "St??tte for baskisk" #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 +#: ../comps-f10.xml.in.h:15 msgid "Belarusian Support" msgstr "St??tte for hviterussisk" #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 +#: ../comps-f10.xml.in.h:16 msgid "Bengali Support" msgstr "St??tte for bengali" #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 +#: ../comps-f10.xml.in.h:17 msgid "Bhutanese Support" msgstr "St??tte for Bhutanesisk" #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 +#: ../comps-f10.xml.in.h:18 msgid "Bosnian Support" msgstr "St??tte for bosnisk" #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 +#: ../comps-f10.xml.in.h:19 msgid "Brazilian Portuguese Support" msgstr "St??tte for brasiliensk portugisisk" #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 +#: ../comps-f10.xml.in.h:20 msgid "Breton Support" msgstr "St??tte for bretonsk" #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22 +#: ../comps-f10.xml.in.h:22 msgid "Bulgarian Support" msgstr "St??tte for bulgarsk" #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23 +#: ../comps-f10.xml.in.h:23 msgid "Catalan Support" msgstr "St??tte for katalansk" #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24 +#: ../comps-f10.xml.in.h:24 msgid "Chinese Support" msgstr "St??tte for kinesisk" #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25 +#: ../comps-f10.xml.in.h:25 msgid "Clustering" msgstr "Klynger" #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26 +#: ../comps-f10.xml.in.h:26 msgid "Clustering Support" msgstr "St??tte for klynger." #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27 +#: ../comps-f10.xml.in.h:27 msgid "Core" msgstr "Kjerne" #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28 +#: ../comps-f10.xml.in.h:28 msgid "Croatian Support" msgstr "St??tte for kroatisk" #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29 -#: ../comps-el5.xml.in.h:8 +#: ../comps-f10.xml.in.h:29 ../comps-el5.xml.in.h:8 msgid "Czech Support" msgstr "St??tte for tsjekkisk" #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30 +#: ../comps-f10.xml.in.h:30 msgid "DNS Name Server" msgstr "DNS-tjener" #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31 +#: ../comps-f10.xml.in.h:31 msgid "Danish Support" msgstr "St??tte for dansk" #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32 -#: ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 +#: ../comps-f10.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 msgid "Desktop Environments" msgstr "Skrivebordsmilj??er" #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33 -#: ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 +#: ../comps-f10.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 msgid "Desktop environments" msgstr "Skrivebordsmilj??er" #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34 -#: ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 +#: ../comps-f10.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 msgid "Development" msgstr "Utviklingsverkt??y" #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35 +#: ../comps-f10.xml.in.h:35 msgid "Development Libraries" msgstr "Utviklingsbibliotek" #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36 -#: ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 +#: ../comps-f10.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 msgid "Development Tools" msgstr "Utviklingsverkt??y" #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 +#: ../comps-f10.xml.in.h:37 msgid "Dial-up Networking Support" msgstr "St??tte for oppringt nettverk" #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 +#: ../comps-f10.xml.in.h:38 msgid "Dutch Support" msgstr "St??tte for nederlandsk" @@ -182,65 +208,72 @@ msgstr "Eclipse" #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39 -#: ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 +#: ../comps-f10.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 msgid "Editors" msgstr "Editorer" #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40 -#: ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 +#: ../comps-f10.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 msgid "Educational Software" msgstr "Utdanningsprogrammer" #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41 -#: ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 +#: ../comps-f10.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 msgid "Educational software for learning" msgstr "Utdanningsprogrammer for l??ring" #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42 -#: ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 +#: ../comps-f10.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 msgid "Engineering and Scientific" msgstr "Vitenskapelige programmer" #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43 +#: ../comps-f10.xml.in.h:43 msgid "English (UK) Support" msgstr "St??tte for engelsk (UK)" #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45 +#: ../comps-f10.xml.in.h:45 msgid "Estonian Support" msgstr "St??tte for estlandsk" #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46 +#: ../comps-f10.xml.in.h:46 msgid "Ethiopic Support" msgstr "St??tte for etiopisk" #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47 -#: ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 +#: ../comps-f10.xml.in.h:47 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 msgid "FTP Server" msgstr "FTP-tjener" #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48 +#: ../comps-f10.xml.in.h:48 msgid "Faeroese Support" msgstr "St??tte for f??r??yisk" #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50 -#: ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 +#: ../comps-f10.xml.in.h:50 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 msgid "Fedora Packager" msgstr "Fedora pakkeansvarlig" #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51 +#: ../comps-f10.xml.in.h:51 msgid "Filipino Support" msgstr "St??tte for filipino" #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52 +#: ../comps-f10.xml.in.h:52 msgid "Finnish Support" msgstr "St??tte for finsk" #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55 +#: ../comps-f10.xml.in.h:55 msgid "French Support" msgstr "St??tte for fransk" #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56 -#: ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 +#: ../comps-f10.xml.in.h:56 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 msgid "" "From CD recording to playing audio CDs and multimedia files, this package " "group allows you to work with sound and video on the system." @@ -249,16 +282,17 @@ "multimediefiler samt arbeide med lyd og bilde p?? systemet." #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57 -#: ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 +#: ../comps-f10.xml.in.h:57 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 msgid "GNOME Desktop Environment" msgstr "Skrivebordsmilj??et GNOME" #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58 -#: ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22 +#: ../comps-f10.xml.in.h:58 ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22 msgid "GNOME Software Development" msgstr "Programvareutvikling for GNOME" #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59 +#: ../comps-f10.xml.in.h:59 msgid "" "GNOME is a powerful graphical user interface which includes a panel, " "desktop, system icons, and a graphical file manager." @@ -267,89 +301,101 @@ "skrivebord, systemikoner og en grafisk filh??ndterer." #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60 +#: ../comps-f10.xml.in.h:60 msgid "Gaelic Support" msgstr "St??tte for g??lisk" #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61 +#: ../comps-f10.xml.in.h:61 msgid "Galician Support" msgstr "St??tte for galiciansk" #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62 -#: ../comps-el5.xml.in.h:24 +#: ../comps-f10.xml.in.h:62 ../comps-el5.xml.in.h:24 msgid "Games and Entertainment" msgstr "Spill og underholdning" #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63 +#: ../comps-f10.xml.in.h:63 msgid "Georgian Support" msgstr "St??tte for georgisk" #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64 +#: ../comps-f10.xml.in.h:64 msgid "German Support" msgstr "St??tte for tysk" #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65 -#: ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 +#: ../comps-f10.xml.in.h:65 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 msgid "Graphical Internet" msgstr "Grafisk Internet" #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66 -#: ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 +#: ../comps-f10.xml.in.h:66 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 msgid "Graphics" msgstr "Grafikk" #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67 +#: ../comps-f10.xml.in.h:67 msgid "Greek Support" msgstr "St??tte for gresk" #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68 +#: ../comps-f10.xml.in.h:68 msgid "Gujarati Support" msgstr "St??tte for gujarati" #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69 -#: ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 +#: ../comps-f10.xml.in.h:69 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 msgid "Hardware Support" msgstr "St??tte for maskinvare" #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70 -#: ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 +#: ../comps-f10.xml.in.h:70 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 msgid "Hebrew Support" msgstr "St??tte for hebraisk" #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71 +#: ../comps-f10.xml.in.h:71 msgid "Hindi Support" msgstr "St??tte for hindu" #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72 +#: ../comps-f10.xml.in.h:72 msgid "Hungarian Support" msgstr "St??tte for ungarsk" #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73 +#: ../comps-f10.xml.in.h:73 msgid "Icelandic Support" msgstr "St??tte for islandsk" #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74 +#: ../comps-f10.xml.in.h:74 msgid "Indonesian Support" msgstr "St??tte for indonesisk" #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75 -#: ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 +#: ../comps-f10.xml.in.h:77 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 msgid "" "Install these packages in order to develop GTK+ and GNOME graphical " "applications." msgstr "Installer disse pakkene for utvikling av GTK+- og GNOME-programmer." #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76 +#: ../comps-f10.xml.in.h:78 msgid "" "Install these packages in order to develop GTK+ and XFCE graphical " "applications." msgstr "Installer disse pakkene for utvikling av GTK+- og XFCE-programmer." #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77 -#: ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 +#: ../comps-f10.xml.in.h:79 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." msgstr "Installer disse pakkene for utvikling av QT og KDE-programmer." #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78 +#: ../comps-f10.xml.in.h:80 msgid "" "Install these tools to enable the system to print or act as a print server." msgstr "" @@ -357,49 +403,53 @@ "systemet some utskriftstjener." #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79 -#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 +#: ../comps-f10.xml.in.h:81 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 msgid "" "Install this group of packages to use the base graphical (X) user interface." msgstr "Installer denne pakkegruppen for ?? bruke et grafisk grensesnitt (X)." #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81 +#: ../comps-f10.xml.in.h:83 msgid "Inuktitut Support" msgstr "St??tte for inuittisk" #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82 +#: ../comps-f10.xml.in.h:84 msgid "Irish Support" msgstr "St??tte for irsk" #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83 +#: ../comps-f10.xml.in.h:85 msgid "Italian Support" msgstr "St??tte for italiensk" #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84 -#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 +#: ../comps-f10.xml.in.h:86 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 msgid "Japanese Support" msgstr "St??tte for japansk" #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85 -#: ../comps-el4.xml.in.h:31 +#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86 -#: ../comps-el4.xml.in.h:32 +#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "Java-utvikling" #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87 -#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 +#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" msgstr "KDE (K Desktop Environment)" #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88 -#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 +#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 msgid "KDE Software Development" msgstr "Programvareutvikling for KDE" #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89 +#: ../comps-f10.xml.in.h:91 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -408,190 +458,226 @@ "skrivebord, systemikoner og en grafisk filh??ndterer." #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90 +#: ../comps-f10.xml.in.h:92 msgid "Kannada Support" msgstr "St??tte for kannada" #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92 +#: ../comps-f10.xml.in.h:94 msgid "Khmer Support" msgstr "St??tte for khmer" #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93 +#: ../comps-f10.xml.in.h:95 msgid "Korean Support" msgstr "St??tte for koreansk" #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94 +#: ../comps-f10.xml.in.h:96 msgid "Languages" msgstr "Spr??k" #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95 +#: ../comps-f10.xml.in.h:97 msgid "Lao Support" msgstr "St??tte for laotisk" #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96 +#: ../comps-f10.xml.in.h:98 msgid "Latvian Support" msgstr "St??tte for latvisk" #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98 +#: ../comps-f10.xml.in.h:100 msgid "Legacy Network Server" msgstr "Eldre nettverkstjener" #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99 +#: ../comps-f10.xml.in.h:101 msgid "Legacy Software Development" msgstr "Programvareutvikling for eldre systemer." #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100 +#: ../comps-f10.xml.in.h:102 msgid "Legacy Software Support" msgstr "St??tte for eldre programvare" #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101 +#: ../comps-f10.xml.in.h:103 msgid "Lithuanian Support" msgstr "St??tte for litauisk" #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104 -#: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 +#: ../comps-f10.xml.in.h:106 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 msgid "Mail Server" msgstr "Eposttjener" #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105 +#: ../comps-f10.xml.in.h:107 msgid "Malay Support" msgstr "St??tte for malay" #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106 +#: ../comps-f10.xml.in.h:108 msgid "Malayalam Support" msgstr "St??tte for malayalam" #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107 +#: ../comps-f10.xml.in.h:109 msgid "Maori Support" msgstr "St??tte for maori" #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108 +#: ../comps-f10.xml.in.h:110 msgid "Marathi Support" msgstr "St??tte for marathi" #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110 +#: ../comps-f10.xml.in.h:112 msgid "MySQL Database" msgstr "MySQL-database" #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112 -#: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 +#: ../comps-f10.xml.in.h:114 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 msgid "Network Servers" msgstr "Nettverkstjener" #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113 -#: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 +#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 msgid "News Server" msgstr "News-tjenere" #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115 +#: ../comps-f10.xml.in.h:117 msgid "Northern Sotho Support" msgstr "St??tte for nord sotho" #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116 +#: ../comps-f10.xml.in.h:118 msgid "Norwegian Support" msgstr "St??tte for norsk" #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117 -#: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 +#: ../comps-f10.xml.in.h:119 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "Kontor/Produktivitet" #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119 +#: ../comps-f10.xml.in.h:121 msgid "Oriya Support" msgstr "St??tte for Oriya" #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120 -#: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 +#: ../comps-f10.xml.in.h:122 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 msgid "" "Packages which provide functionality for developing and building " "applications." msgstr "Pakker som gir funksjonalitet for utvikling og bygging av programmer." #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121 +#: ../comps-f10.xml.in.h:123 msgid "Persian Support" msgstr "St??tte for persisk" #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122 +#: ../comps-f10.xml.in.h:124 msgid "Polish Support" msgstr "St??tte for polsk" #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123 +#: ../comps-f10.xml.in.h:125 msgid "Portuguese Support" msgstr "St??tte for portugisisk" #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124 +#: ../comps-f10.xml.in.h:126 msgid "PostgreSQL Database" msgstr "PostgreSQL-database" #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125 +#: ../comps-f10.xml.in.h:127 msgid "Printing Support" msgstr "Skriverst??tte" #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126 +#: ../comps-f10.xml.in.h:128 msgid "Punjabi Support" msgstr "St??tte for punjabi" #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127 +#: ../comps-f10.xml.in.h:129 msgid "Romanian Support" msgstr "St??tte for rumensk" #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128 +#: ../comps-f10.xml.in.h:130 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129 +#: ../comps-f10.xml.in.h:131 msgid "Russian Support" msgstr "St??tte for russisk" -#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:130 +#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132 +#: ../comps-f10.xml.in.h:134 msgid "Samoan Support" msgstr "St??tte for samoansk" -#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:131 +#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133 +#: ../comps-f10.xml.in.h:135 msgid "Serbian Support" msgstr "St??tte for serbisk" -#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:132 +#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134 +#: ../comps-f10.xml.in.h:136 msgid "Server Configuration Tools" msgstr "Konfigurasjonsverkt??y for tjenere" -#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:133 -#: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 +#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135 +#: ../comps-f10.xml.in.h:137 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 msgid "Servers" msgstr "Tjenere" -#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:134 -#: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 +#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136 +#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 msgid "" "Simple window managers that aren't part of a larger desktop environment." msgstr "" "Enkle vindusbehandlere som ikke er en del av st??rre skrivebordsmilj??er." -#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:135 +#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137 +#: ../comps-f10.xml.in.h:139 msgid "Sinhala Support" msgstr "St??tte for Sinhala" -#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:136 +#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138 +#: ../comps-f10.xml.in.h:140 msgid "Slovak Support" msgstr "St??tte for slovakisk" -#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:137 +#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139 +#: ../comps-f10.xml.in.h:141 msgid "Slovenian Support" msgstr "St??tte for slovensk" -#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:138 +#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140 +#: ../comps-f10.xml.in.h:142 msgid "Smallest possible installation" msgstr "Minste mulige installering" -#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:139 -#: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 +#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141 +#: ../comps-f10.xml.in.h:143 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "Programvare som brukes for ?? kj??re nettverkstjenere" -#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:140 +#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142 +#: ../comps-f10.xml.in.h:144 msgid "Somali Support" msgstr "St??tte for somali" -#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:141 +#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143 +#: ../comps-f10.xml.in.h:145 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -599,64 +685,73 @@ "Disse programmene, ofte kalt teksteditorer, lar deg lage og redigere filer. " "Emacs og Vi er inkludert her." -#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:142 -#: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 +#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144 +#: ../comps-f10.xml.in.h:146 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 msgid "Sound and Video" msgstr "Lyd og bilde" -#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:143 +#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145 +#: ../comps-f10.xml.in.h:147 msgid "Southern Ndebele Support" msgstr "St??tte for s??rlig Ndbele" -#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:144 +#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146 +#: ../comps-f10.xml.in.h:148 msgid "Southern Sotho Support" msgstr "St??tte for S??r-Sotho" -#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:145 +#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147 +#: ../comps-f10.xml.in.h:149 msgid "Spanish Support" msgstr "St??tte for spansk" -#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:146 -#: ../comps-el4.xml.in.h:46 +#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148 +#: ../comps-f10.xml.in.h:150 ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "St??tte for utvikling av programmer i programmeringsspr??ket Java." -#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:147 -#: ../comps-el4.xml.in.h:47 +#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149 +#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "St??tte for kj??ring av programmer skrevet i programmeringsspr??ket Java." -#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:148 +#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150 +#: ../comps-f10.xml.in.h:152 msgid "Swati Support" msgstr "St??tte for Swati" -#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:149 +#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151 +#: ../comps-f10.xml.in.h:153 msgid "Swedish Support" msgstr "St??tte for svensk" -#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:150 -#: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 +#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152 +#: ../comps-f10.xml.in.h:154 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 msgid "System Tools" msgstr "Systemverkt??y" -#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:151 +#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153 +#: ../comps-f10.xml.in.h:155 msgid "Tagalog Support" msgstr "St??tte for tagalog" -#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:152 +#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154 +#: ../comps-f10.xml.in.h:156 msgid "Tamil Support" msgstr "St??tte for tamilsk" -#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:153 +#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155 +#: ../comps-f10.xml.in.h:157 msgid "Telugu Support" msgstr "St??tte for Telugu" -#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:154 -#: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 +#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156 +#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 msgid "Text-based Internet" msgstr "Tekstbaserte Internett-programmer" -#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:155 +#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157 +#: ../comps-f10.xml.in.h:159 msgid "Thai Support" msgstr "St??tte for thai" @@ -664,42 +759,46 @@ msgid "The Eclipse Integrated Development Environment." msgstr "Eclipse integrert utviklingsmilj??." -#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:156 -#: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 +#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158 +#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "Applikasjonene innerholder kontorst??tteprogrammer, PDV-lesere og mer." -#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:157 +#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159 +#: ../comps-f10.xml.in.h:161 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "" "Pakkene i denne gruppen er basis-biblioteker for bruk ved programutvikling." -#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:158 -#: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 +#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160 +#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." msgstr "Disse pakkene lar deg konfigurere en IMAP eller SMTP e-posttjener." -#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:159 +#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161 +#: ../comps-f10.xml.in.h:163 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "Disse pakkene lar deg utvikle programmer for X." -#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:160 -#: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 +#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162 +#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 msgid "" "These packages are helpful when developing web applications or web pages." msgstr "" "Disse pakkene er til hjelp, hvis du utvikler web-applikasjoner eller web-" "sider." -#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:161 +#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163 +#: ../comps-f10.xml.in.h:165 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "" "Disse pakkene inkluderer nettverks-baserte tjenere som DHCP, Kerberos og NIS." -#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:162 +#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164 +#: ../comps-f10.xml.in.h:166 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." @@ -707,15 +806,18 @@ "Disse pakkene inkluderer tjenere for eldre nettverksprotokoller som rsh og " "telnet." -#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:163 +#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165 +#: ../comps-f10.xml.in.h:167 msgid "These packages provide a virtualization environment." msgstr "Disse pakkene inneholder et virtualiseringsmilj??." -#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:164 +#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166 +#: ../comps-f10.xml.in.h:168 msgid "These packages provide compatibility with previous releases." msgstr "Disse pakkene gir kompatibilitet med tidligere versjoner." -#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:165 +#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167 +#: ../comps-f10.xml.in.h:169 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -723,7 +825,8 @@ "Disse pakkene inneholder st??ttefunksjoner for ulike localer. Dette " "inkluderer skrifter og inndatametoder." -#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:166 +#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168 +#: ../comps-f10.xml.in.h:170 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -731,18 +834,18 @@ "Med disse verkt??yene kan du lage dokumenter i DocBook-formatet og konvertere " "dem til HTML, PDF, Postscript og tekst." -#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:167 -#: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 +#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169 +#: ../comps-f10.xml.in.h:171 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." msgstr "Disse verkt??yene lar deg kj??re en web-tjener p?? systemet." -#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:168 -#: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 +#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170 +#: ../comps-f10.xml.in.h:172 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." msgstr "Disse verkt??yene lar deg kj??re en ftp-tjener p?? systemet." -#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:169 -#: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 +#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171 +#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 msgid "" "These tools include core development tools such as automake, gcc, perl, " "python, and debuggers." @@ -750,16 +853,18 @@ "Disse verkt??yene inkluderer utviklingsverkt??y som automake, gcc, perl, " "python og avlusere." -#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:170 -#: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 +#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172 +#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." msgstr "Disse verkt??yene lar deg kj??re en news-tjener p?? systemet." -#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:171 +#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173 +#: ../comps-f10.xml.in.h:175 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "Denne gruppen inneholder Red Hats konfigurasjonsverkt??y." -#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:172 +#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174 +#: ../comps-f10.xml.in.h:176 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." @@ -767,13 +872,13 @@ "Denne gruppen inneholder et minimalt sett med pakker. Nyttig for ?? sette opp " "sm?? rutere/brannvegger for eksempel." -#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:173 -#: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 +#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175 +#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "Denne gruppen inkluderer grafiske epost, web og chat-klienter." -#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:174 -#: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 +#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176 +#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 msgid "" "This group includes packages for performing mathematical and scientific " "computations and plotting, as well as unit conversion." @@ -781,14 +886,14 @@ "Denne gruppen inneholder pakker for ?? utf??re matematiske og vitenskapelige " "beregninger/visualiseringer samt enhetskonverteringer." -#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:175 -#: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 +#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177 +#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." msgstr "" "Denne gruppen inneholder pakker for manipulering og innscanning av bilder." -#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:176 -#: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 +#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178 +#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 msgid "" "This group includes text-based email, Web, and chat clients. These " "applications do not require the X Window System." @@ -796,8 +901,8 @@ "Denne gruppen inneholder tekstbaserte epost, web og chat-klienter. Disse " "programmene trenger ikke X." -#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:177 -#: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 +#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179 +#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 msgid "" "This group is a collection of graphical administration tools for the system, " "such as for managing user accounts and configuring system hardware." @@ -805,23 +910,23 @@ "Denne gruppen er en samling av grafiske administrasjonsverkt??y for systemet, " "inkludert brukeradministrasjon og hardwarekonfigurering." -#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:178 -#: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 +#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180 +#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 msgid "" "This group is a collection of tools and resources of Armenian environments." msgstr "" "Denne gruppen er en samling av verkt??y og ressurser for armenske milj??er." -#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:179 -#: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 +#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181 +#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 msgid "" "This group is a collection of tools for various hardware specific utilities." msgstr "" "Denne gruppen er en samling av verkt??y for diverse maskinvare-spesifikke " "tilbeh??r." -#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:180 -#: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 +#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182 +#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 msgid "" "This group is a collection of various tools for the system, such as the " "client for connecting to SMB shares and tools to monitor network traffic." @@ -829,12 +934,14 @@ "Denne gruppen er en samling av ulike systemverkt??y, som oppkobling mot SMB-" "ressurser og nettverksoverv??kning." -#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:181 +#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183 +#: ../comps-f10.xml.in.h:185 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "Denne pakkegruppen lar deg kj??re en DNS-tjener (BIND) p?? systemet." -#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:182 +#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184 +#: ../comps-f10.xml.in.h:186 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -842,179 +949,214 @@ "Denne pakkegruppen lar deg dele filer mellom Linux og MS Windows(tm)-" "systemer." -#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:183 +#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185 +#: ../comps-f10.xml.in.h:187 msgid "This package group contains packages useful for use with MySQL." msgstr "" "Denne pakkegruppen inneholder pakker some er nyttige for bruk med MySQL." -#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:184 +#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186 +#: ../comps-f10.xml.in.h:188 msgid "This package group includes packages useful for use with Postgresql." msgstr "" "Denne pakkegruppen inneholder pakker som er nyttige for bruk med Postgresql." -#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:185 +#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187 +#: ../comps-f10.xml.in.h:189 msgid "Tibetan Support" msgstr "St??tte for tibetansk" -#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:186 +#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188 +#: ../comps-f10.xml.in.h:190 msgid "Tonga Support" msgstr "St??tte for tongesisk" -#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:187 -#: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 +#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189 +#: ../comps-f10.xml.in.h:191 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" msgstr "Verkt??y og programmer som trengs av en pakkeansvarlig for Fedora" -#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:188 +#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190 +#: ../comps-f10.xml.in.h:192 msgid "Tsonga Support" msgstr "St??tte for Tsonga" -#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:189 +#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191 +#: ../comps-f10.xml.in.h:193 msgid "Tswana Support" msgstr "St??tte for Tswana" -#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:190 +#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192 +#: ../comps-f10.xml.in.h:194 msgid "Turkish Support" msgstr "St??tte for tyrkisk" -#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:191 +#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193 +#: ../comps-f10.xml.in.h:195 msgid "Ukrainian Support" msgstr "St??tte for ukrainsk" -#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:192 +#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194 +#: ../comps-f10.xml.in.h:196 msgid "Urdu Support" msgstr "St??tte for urdu" -#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:193 -#: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 +#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195 +#: ../comps-f10.xml.in.h:197 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." msgstr "Forskjellige viktige deler av systemet." -#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:194 -#: ../comps-el5.xml.in.h:72 +#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196 +#: ../comps-f10.xml.in.h:198 ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "Forskjellige m??ter ?? slappe av og fordrive fritiden." -#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:195 +#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197 +#: ../comps-f10.xml.in.h:199 msgid "Venda Support" msgstr "St??tte for Venda" -#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:196 +#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198 +#: ../comps-f10.xml.in.h:200 msgid "Vietnamese Support" msgstr "St??tte for vietnamesisk" -#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:197 +#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199 +#: ../comps-f10.xml.in.h:201 msgid "Virtualization" msgstr "Virtualisering" -#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:199 -#: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 +#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201 +#: ../comps-f10.xml.in.h:203 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 msgid "Web Development" msgstr "Web-utvikling" -#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:200 -#: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 +#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202 +#: ../comps-f10.xml.in.h:204 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 msgid "Web Server" msgstr "Webtjener" -#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:201 +#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203 +#: ../comps-f10.xml.in.h:205 msgid "Welsh Support" msgstr "St??tte for walisisk" -#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:202 -#: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 +#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204 +#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 msgid "Window Managers" msgstr "Vindusbehandlere" -#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:203 +#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205 +#: ../comps-f10.xml.in.h:207 msgid "Windows File Server" msgstr "Filtjener for Windows" -#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:204 +#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206 +#: ../comps-f10.xml.in.h:208 msgid "X Software Development" msgstr "Programvareutvikling for X" -#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:205 -#: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 +#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207 +#: ../comps-f10.xml.in.h:209 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 msgid "X Window System" msgstr "X-vindussystemet" -#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:206 +#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208 +#: ../comps-f10.xml.in.h:210 msgid "XFCE" msgstr "XFCE" -#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:207 +#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209 +#: ../comps-f10.xml.in.h:211 msgid "XFCE Software Development" msgstr "Programvareutvikling for XFCE" -#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:208 +#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210 +#: ../comps-f10.xml.in.h:212 msgid "Xhosa Support" msgstr "St??tte for Xhosa" -#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:209 +#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211 +#: ../comps-f10.xml.in.h:213 msgid "Zulu Support" msgstr "St??tte for Zulu" -#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 +#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21 msgid "Buildsystem building group" msgstr "Byggegruppe for byggsystem" -#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 +#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49 msgid "Fedora Eclipse" msgstr "Fedora Eclipse" -#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 +#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53 msgid "Fonts" msgstr "Skrifter" -#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 +#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54 msgid "Fonts packages for rendering text on the desktop." msgstr "Skriftpakker for ?? vise tekst p?? skrivebordet." -#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:82 msgid "Integrated Development Environments based on Eclipse." msgstr "Integrerte utviklingsmilj??er basert p?? Eclipse." -#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:99 msgid "Legacy Fonts" msgstr "Foreldede skrifter" -#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:104 msgid "Low Saxon Support" msgstr "St??tte for lavsaksisk" -#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:111 msgid "Mongolian Support" msgstr "St??tte for mongolsk" -#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:113 msgid "Nepali Support" msgstr "St??tte for nepalsk" -#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:120 msgid "Older bitmap and vector fonts packages" msgstr "Eldre pakker med bitkart og vektorskrifter" -#: ../comps-f9.xml.in.h:44 +#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 msgid "Esperanto Support" msgstr "St??tte for esperanto" -#: ../comps-f9.xml.in.h:91 +#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:93 msgid "Kashubian Support" msgstr "St??tte for kashubisk" -#: ../comps-f9.xml.in.h:103 +#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:105 msgid "Macedonian Support" msgstr "St??tte for makedonsk" -#: ../comps-f9.xml.in.h:114 +#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:116 msgid "Northern Sami Support" msgstr "St??tte for nord-samisk" -#: ../comps-f9.xml.in.h:198 +#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:132 +msgid "SUGAR Desktop Environment" +msgstr "SUGAR skrivebordsmilj??" + +#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:133 +msgid "SUGAR is the desktop environment developed for the OLPC XO." +msgstr "SUGAR er skrivebordsmilj??et som er utviklet for OLPC XO." + +#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:202 msgid "Walloon Support" msgstr "St??tte for walloon" +#: ../comps-f10.xml.in.h:75 +msgid "Input Methods" +msgstr "Inndatametoder" + +#: ../comps-f10.xml.in.h:76 +msgid "Input method packages for the input of international text." +msgstr "Pakker med inndatametoder for inntasting av spesielle tegn." + #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "Programmer for en rekke forsskjellige oppgaver" @@ -1090,38 +1232,3 @@ "This group is a collection of tools and resources of Czech environments." msgstr "" "Denne gruppen er en samling av verkt??y og ressurser for tsjekkiske milj??er." - -#, fuzzy -#~ msgid "British Support" -#~ msgstr "St??tte for irsk" - -#, fuzzy -#~ msgid "Cluster Storage" -#~ msgstr "St??tte for klynger." - -#, fuzzy -#~ msgid "Clustering Support." -#~ msgstr "St??tte for klynger." - -#, fuzzy -#~ msgid "Single Node GFS Support" -#~ msgstr "St??tte for kinesisk" - -#, fuzzy -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "Disse pakkene gir kompatibilitet med tidligere versjoner." - -#, fuzzy -#~ msgid "Multimedia applications" -#~ msgstr "Programmer" - -#, fuzzy -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "" -#~ "Pakker som gir funksjonalitet for utvikling og bygging av programmer." - -#, fuzzy -#~ msgid "Virtualization Support." -#~ msgstr "Virtualisering" From fedora-extras-commits at redhat.com Thu Jul 10 12:35:13 2008 From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip)) Date: Thu, 10 Jul 2008 12:35:13 GMT Subject: rpms/revisor/F-9 import.log, 1.1, 1.2 revisor.spec, 1.41, 1.42 sources, 1.44, 1.45 Message-ID: <200807101235.m6ACZD4t005266@cvs-int.fedora.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/revisor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5191/F-9 Modified Files: import.log revisor.spec sources Log Message: 2.1.1-6.fc10 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/revisor/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jun 2008 17:48:36 -0000 1.1 +++ import.log 10 Jul 2008 12:34:22 -0000 1.2 @@ -1 +1,2 @@ revisor-2_1_1-5_fc10:F-9:revisor-2.1.1-5.fc10.src.rpm:1214848084 +revisor-2_1_1-6_fc10:F-9:revisor-2.1.1-6.fc10.src.rpm:1215693247 Index: revisor.spec =================================================================== RCS file: /cvs/pkgs/rpms/revisor/F-9/revisor.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- revisor.spec 30 Jun 2008 17:48:36 -0000 1.41 +++ revisor.spec 10 Jul 2008 12:34:22 -0000 1.42 @@ -14,7 +14,7 @@ Summary: Fedora "Spin" Graphical User Interface Name: revisor Version: 2.1.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://fedorahosted.org/revisor @@ -433,8 +433,12 @@ %endif %changelog -* Mon Jun 30 2008 Jeroen van Meeuwen 2.1.1-5 +* Thu Jul 10 2008 Jeroen van Meeuwen 2.1.1-6 - Latest rebuild +- Minor bugfixes (#344 pkgorder traceback) +- Add SELinux Check + +* Tue Jul 01 2008 Jeroen van Meeuwen 2.1.1-5 - Fix running GUI - Add check for architecture composing - Bugfixes in live media creation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/revisor/F-9/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 30 Jun 2008 17:48:36 -0000 1.44 +++ sources 10 Jul 2008 12:34:22 -0000 1.45 @@ -1 +1 @@ -4133deb42692b4f154bbac8bd675e7fc revisor-2.1.1.tar.gz +263d8f828d0c146f1e5349ae298b8815 revisor-2.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:36:41 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 12:36:41 GMT Subject: rpms/emelfm2/devel .cvsignore, 1.16, 1.17 emelfm2.spec, 1.29, 1.30 sources, 1.16, 1.17 Message-ID: <200807101236.m6ACaf6t005427@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344 Modified Files: .cvsignore emelfm2.spec sources Log Message: * Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 - Update 0.4.1 - Revove hal_flags.patch (fixed upstream) - Remove HAL support until it really works. To enable rebuild "--with hal" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 5 Apr 2008 21:36:30 -0000 1.16 +++ .cvsignore 10 Jul 2008 12:35:45 -0000 1.17 @@ -1 +1 @@ -emelfm2-0.4.tar.gz +emelfm2-0.4.1.tar.gz Index: emelfm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/devel/emelfm2.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- emelfm2.spec 5 Apr 2008 21:47:02 -0000 1.29 +++ emelfm2.spec 10 Jul 2008 12:35:45 -0000 1.30 @@ -1,20 +1,26 @@ +## Rebuild options: +# --with hal : Build with the hal support (default: without) +# +## To rebuild this package with hal support: +# rpmbuild -ba emelfm2.spec --with hal + Name: emelfm2 -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File License: GPLv3+ URL: http://emelfm2.net/ -Source0: http://emelfm2.net/rel/emelfm2-0.4.tar.gz -Patch0: emelfm2-0.4-hal_flags.patch +Source0: http://emelfm2.net/rel/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils Requires: findutils >= 4.2, file, grep, sed, bzip2 -# for hal we need +%if 0%{?_with_hal:1} BuildRequires: hal-devel, dbus-glib-devel -#Requires: hal +Requires: hal +%endif %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements @@ -22,9 +28,9 @@ file typing scheme, and a built-in command line for executing commands without opening an xterm. + %prep -%setup -qn emelfm2-0.4 -%patch0 -p1 -b .hal_flags +%setup -q # fix for x86_64 libs sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile @@ -32,6 +38,7 @@ # fix broken icon in emelfm2.desktop sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop + %build make %{?_smp_mflags} \ OPTIMIZE="${RPM_OPT_FLAGS}" \ @@ -42,8 +49,10 @@ WITH_KERNELFAM=1 \ USE_LATEST=1 \ NEW_COMMAND=1 \ - WITH_ACL=1 \ - WITH_HAL=1 + %if 0%{?_with_hal:1} + WITH_HAL=1 \ + %endif + WITH_ACL=1 %install @@ -60,6 +69,7 @@ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -78,6 +88,11 @@ %changelog +* Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 +- Update 0.4.1 +- Revove hal_flags.patch (fixed upstream) +- Remove HAL support until it really works. To enable rebuild "--with hal" + * Wed Apr 02 2008 Christoph Wickert - 0.4.0-1 - Update 0.4.0 - Enable HAL support, but dont install hal by default Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 5 Apr 2008 21:36:30 -0000 1.16 +++ sources 10 Jul 2008 12:35:45 -0000 1.17 @@ -1 +1 @@ -0242f340b642d7de2c09ccc8963e3135 emelfm2-0.4.tar.gz +215d0a872350b4bdb22de940a8f2a4af emelfm2-0.4.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:45:25 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Thu, 10 Jul 2008 12:45:25 GMT Subject: rpms/net-tools/devel net-tools-1.60-i-option.patch,1.1,1.2 Message-ID: <200807101245.m6ACjPep005847@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/net-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5757 Modified Files: net-tools-1.60-i-option.patch Log Message: Changed behavior of --interfaces option according to RHEL net-tools-1.60-i-option.patch: Index: net-tools-1.60-i-option.patch =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-i-option.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-tools-1.60-i-option.patch 10 Jul 2008 08:33:33 -0000 1.1 +++ net-tools-1.60-i-option.patch 10 Jul 2008 12:44:34 -0000 1.2 @@ -1,11 +1,30 @@ ---- net-tools-1.60/netstat.c.i-option 2008-07-08 10:22:51.000000000 +0200 -+++ net-tools-1.60/netstat.c 2008-07-08 10:22:56.000000000 +0200 -@@ -2084,7 +2084,7 @@ int main - { +--- net-tools-1.60/netstat.c.i-option 2008-07-10 10:56:29.000000000 +0200 ++++ net-tools-1.60/netstat.c 2008-07-10 13:46:27.000000000 +0200 +@@ -2042,7 +2042,7 @@ static void usage(void) + fprintf(stderr, _(" netstat { [-veenNac] -I[] | [-veenNac] -i | [-cnNe] -M | -s } [delay]\n\n")); + + fprintf(stderr, _(" -r, --route display routing table\n")); +- fprintf(stderr, _(" -I, --interface=[] display interface table for \n")); ++ fprintf(stderr, _(" -I, --interfaces= display interface table for \n")); + fprintf(stderr, _(" -i, --interfaces display interface table\n")); + fprintf(stderr, _(" -g, --groups display multicast group memberships\n")); + fprintf(stderr, _(" -s, --statistics display networking statistics (like SNMP)\n")); +@@ -2085,7 +2085,6 @@ int main AFTRANS_OPTS, {"version", 0, 0, 'V'}, -- {"interfaces", 2, 0, 'I'}, -+ {"interface", 2, 0, 'I'}, - {"interfaces", 0, 0, 'i'}, + {"interfaces", 2, 0, 'I'}, +- {"interfaces", 0, 0, 'i'}, {"help", 0, 0, 'h'}, {"route", 0, 0, 'r'}, + #if HAVE_FW_MASQUERADE +@@ -2173,10 +2172,6 @@ int main + if (optarg[0] == '=') optarg++; + if (optarg && strcmp(optarg, "(null)")) + flag_int_name = strdup(optarg); +- else { +- usage(); +- exit(1); +- } + flag_int++; + break; + case 'i': From fedora-extras-commits at redhat.com Thu Jul 10 12:48:29 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 12:48:29 GMT Subject: rpms/foomatic/devel .cvsignore, 1.62, 1.63 foomatic.spec, 1.190, 1.191 sources, 1.64, 1.65 foomatic-ieee1284.patch, 1.1, NONE Message-ID: <200807101248.m6ACmThF006040@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5973 Modified Files: .cvsignore foomatic.spec sources Removed Files: foomatic-ieee1284.patch Log Message: * Thu Jul 10 2008 Tim Waugh - Updated db to 20080710. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 10 Jul 2008 12:20:56 -0000 1.62 +++ .cvsignore 10 Jul 2008 12:47:44 -0000 1.63 @@ -56,3 +56,4 @@ foomatic-filters-3.0-20080507.tar.gz foomatic-db-engine-3.0-20080710.tar.gz foomatic-filters-3.0-20080710.tar.gz +foomatic-db-3.0-20080710.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- foomatic.spec 10 Jul 2008 12:20:56 -0000 1.190 +++ foomatic.spec 10 Jul 2008 12:47:44 -0000 1.191 @@ -1,4 +1,4 @@ -%define dbver 20080211 +%define dbver 20080710 %define enginever 3.0-20080710 %define filtersver 20080710 %define hpijsver 20080211 @@ -40,9 +40,6 @@ # Handle non-UTF-8 encodings in imported PPD files. Patch15: foomatic-bad-utf8.patch -# Missing IEEE 1284 IDs. -Patch16: foomatic-ieee1284.patch - Patch18: foomatic-sigpipe.patch Url: http://www.linuxprinting.org @@ -108,8 +105,6 @@ pushd foomatic-db-%{dbver} %patch7 -p1 -b .ppdload-ppd -%patch16 -p1 -b .ieee1284 - cd db/source # For gutenprint printers, use gutenprint-ijs-simplified.5.0. @@ -252,6 +247,7 @@ %changelog * Thu Jul 10 2008 Tim Waugh +- Updated db to 20080710. - Updated filters to 3.0-20080710. - Updated db-engine to 3.0-20080710. - Ship a defaultspooler file to avoid the need for spooler Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 10 Jul 2008 12:20:56 -0000 1.64 +++ sources 10 Jul 2008 12:47:44 -0000 1.65 @@ -1,4 +1,4 @@ -5d827cd3d95807c28609d49a5c412c29 foomatic-db-3.0-20080211.tar.gz 58bef426f769219592b6b0c81357a04a foomatic-db-hpijs-20080211.tar.gz cca75a1d1a189a2b816a0c20058e6aef foomatic-db-engine-3.0-20080710.tar.gz ddd20fc710fba33900df82b0b2b95d35 foomatic-filters-3.0-20080710.tar.gz +f959c63dface3453aa0918df3bf6f6a8 foomatic-db-3.0-20080710.tar.gz --- foomatic-ieee1284.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 12:52:28 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 12:52:28 GMT Subject: rpms/foomatic/devel .cvsignore, 1.63, 1.64 foomatic.spec, 1.191, 1.192 sources, 1.65, 1.66 Message-ID: <200807101252.m6ACqS0M006175@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6133 Modified Files: .cvsignore foomatic.spec sources Log Message: * Thu Jul 10 2008 Tim Waugh - Updated db-hpijs to 20080710. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 10 Jul 2008 12:47:44 -0000 1.63 +++ .cvsignore 10 Jul 2008 12:51:41 -0000 1.64 @@ -57,3 +57,4 @@ foomatic-db-engine-3.0-20080710.tar.gz foomatic-filters-3.0-20080710.tar.gz foomatic-db-3.0-20080710.tar.gz +foomatic-db-hpijs-20080710.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- foomatic.spec 10 Jul 2008 12:47:44 -0000 1.191 +++ foomatic.spec 10 Jul 2008 12:51:41 -0000 1.192 @@ -1,7 +1,7 @@ %define dbver 20080710 %define enginever 3.0-20080710 %define filtersver 20080710 -%define hpijsver 20080211 +%define hpijsver 20080710 Summary: Foomatic printer database. Name: foomatic @@ -247,6 +247,7 @@ %changelog * Thu Jul 10 2008 Tim Waugh +- Updated db-hpijs to 20080710. - Updated db to 20080710. - Updated filters to 3.0-20080710. - Updated db-engine to 3.0-20080710. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 10 Jul 2008 12:47:44 -0000 1.65 +++ sources 10 Jul 2008 12:51:41 -0000 1.66 @@ -1,4 +1,4 @@ -58bef426f769219592b6b0c81357a04a foomatic-db-hpijs-20080211.tar.gz cca75a1d1a189a2b816a0c20058e6aef foomatic-db-engine-3.0-20080710.tar.gz ddd20fc710fba33900df82b0b2b95d35 foomatic-filters-3.0-20080710.tar.gz f959c63dface3453aa0918df3bf6f6a8 foomatic-db-3.0-20080710.tar.gz +35a3a1ebe3c09b9e9a126e31bceedd72 foomatic-db-hpijs-20080710.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 12:55:02 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 12:55:02 GMT Subject: rpms/foomatic/devel foomatic.spec,1.192,1.193 Message-ID: <200807101255.m6ACt29k006296@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6267 Modified Files: foomatic.spec Log Message: 3.0.2-61 Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- foomatic.spec 10 Jul 2008 12:51:41 -0000 1.192 +++ foomatic.spec 10 Jul 2008 12:54:17 -0000 1.193 @@ -6,7 +6,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 60%{?dist} +Release: 61%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -246,7 +246,7 @@ %{_var}/cache/foomatic %changelog -* Thu Jul 10 2008 Tim Waugh +* Thu Jul 10 2008 Tim Waugh 3.0.2-61 - Updated db-hpijs to 20080710. - Updated db to 20080710. - Updated filters to 3.0-20080710. From fedora-extras-commits at redhat.com Thu Jul 10 13:13:02 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 13:13:02 GMT Subject: rpms/emelfm2/F-8 .cvsignore, 1.15, 1.16 emelfm2.spec, 1.25, 1.26 sources, 1.15, 1.16 e2-0.3.6-07-12-01.patch, 1.1, NONE emelfm2-makefile.config.patch, 1.7, NONE Message-ID: <200807101313.m6ADD2Xm013397@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/emelfm2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13323/F-8 Modified Files: .cvsignore emelfm2.spec sources Removed Files: e2-0.3.6-07-12-01.patch emelfm2-makefile.config.patch Log Message: * Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 - Update 0.4.1 - Revove hal_flags.patch (fixed upstream) - Remove HAL support until it really works. To enable rebuild "--with hal" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 2 Dec 2007 20:34:34 -0000 1.15 +++ .cvsignore 10 Jul 2008 13:12:06 -0000 1.16 @@ -1 +1 @@ -emelfm2-0.3.6.tar.gz +emelfm2-0.4.1.tar.gz Index: emelfm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/F-8/emelfm2.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- emelfm2.spec 2 Dec 2007 20:34:34 -0000 1.25 +++ emelfm2.spec 10 Jul 2008 13:12:06 -0000 1.26 @@ -1,18 +1,26 @@ +## Rebuild options: +# --with hal : Build with the hal support (default: without) +# +## To rebuild this package with hal support: +# rpmbuild -ba emelfm2.spec --with hal + Name: emelfm2 -Version: 0.3.6 +Version: 0.4.1 Release: 1%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File License: GPLv3+ URL: http://emelfm2.net/ -Source0: http://emelfm2.net/rel/emelfm2-%{version}.tar.gz -Patch0: emelfm2-makefile.config.patch -Patch1: e2-0.3.6-07-12-01.patch +Source0: http://emelfm2.net/rel/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils -Requires: findutils >= 4.2, file, grep, sed +Requires: findutils >= 4.2, file, grep, sed, bzip2 +%if 0%{?_with_hal:1} +BuildRequires: hal-devel, dbus-glib-devel +Requires: hal +%endif %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements @@ -20,10 +28,9 @@ file typing scheme, and a built-in command line for executing commands without opening an xterm. + %prep %setup -q -%patch1 -p0 -b .0.3.6 -%patch0 -p0 -b .orig # fix for x86_64 libs sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile @@ -31,19 +38,27 @@ # fix broken icon in emelfm2.desktop sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop + %build -# make clean is needed because of e2-0.3.6-07-12-01.patch -make clean make %{?_smp_mflags} \ OPTIMIZE="${RPM_OPT_FLAGS}" \ CFLAGS="${RPM_OPT_FLAGS}" \ - PREFIX="%{_prefix}" + PREFIX="%{_prefix}" \ + DOCS_VERSION=1 \ + WITH_TRANSPARENCY=1 \ + WITH_KERNELFAM=1 \ + USE_LATEST=1 \ + NEW_COMMAND=1 \ + %if 0%{?_with_hal:1} + WITH_HAL=1 \ + %endif + WITH_ACL=1 %install rm -rf $RPM_BUILD_ROOT -make install PREFIX=$RPM_BUILD_ROOT%{_prefix} -make install_i18n PREFIX=$RPM_BUILD_ROOT%{_prefix} +make install DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix} +make install_i18n DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix} %find_lang %{name} @@ -54,6 +69,7 @@ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +88,20 @@ %changelog +* Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 +- Update 0.4.1 +- Revove hal_flags.patch (fixed upstream) +- Remove HAL support until it really works. To enable rebuild "--with hal" + +* Wed Apr 02 2008 Christoph Wickert - 0.4.0-1 +- Update 0.4.0 +- Enable HAL support, but dont install hal by default +- Add emelfm2-0.4-hal_flags.patch (Thanks to Uwe Helm) +- Require bzip2 for the unpack-plugin + +* Mon Feb 18 2008 Fedora Release Engineering - 0.3.6-2 +- Autorebuild for GCC 4.3 + * Sun Dec 02 2007 Christoph Wickert - 0.3.6-1 - Update 0.3.6 with upstream's e2-0.3.6-07-12-01.patch - Enable the ACL plugin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 2 Dec 2007 20:34:34 -0000 1.15 +++ sources 10 Jul 2008 13:12:06 -0000 1.16 @@ -1 +1 @@ -cc00361a117e48823bf5bd7da5d729e0 emelfm2-0.3.6.tar.gz +215d0a872350b4bdb22de940a8f2a4af emelfm2-0.4.1.tar.gz --- e2-0.3.6-07-12-01.patch DELETED --- --- emelfm2-makefile.config.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 13:13:26 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 13:13:26 GMT Subject: rpms/emelfm2/F-9 .cvsignore, 1.16, 1.17 emelfm2.spec, 1.29, 1.30 sources, 1.16, 1.17 emelfm2-0.4-hal_flags.patch, 1.1, NONE Message-ID: <200807101313.m6ADDQLu013416@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/emelfm2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13323/F-9 Modified Files: .cvsignore emelfm2.spec sources Removed Files: emelfm2-0.4-hal_flags.patch Log Message: * Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 - Update 0.4.1 - Revove hal_flags.patch (fixed upstream) - Remove HAL support until it really works. To enable rebuild "--with hal" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 5 Apr 2008 21:36:30 -0000 1.16 +++ .cvsignore 10 Jul 2008 13:12:32 -0000 1.17 @@ -1 +1 @@ -emelfm2-0.4.tar.gz +emelfm2-0.4.1.tar.gz Index: emelfm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/F-9/emelfm2.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- emelfm2.spec 5 Apr 2008 21:47:02 -0000 1.29 +++ emelfm2.spec 10 Jul 2008 13:12:32 -0000 1.30 @@ -1,20 +1,26 @@ +## Rebuild options: +# --with hal : Build with the hal support (default: without) +# +## To rebuild this package with hal support: +# rpmbuild -ba emelfm2.spec --with hal + Name: emelfm2 -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File License: GPLv3+ URL: http://emelfm2.net/ -Source0: http://emelfm2.net/rel/emelfm2-0.4.tar.gz -Patch0: emelfm2-0.4-hal_flags.patch +Source0: http://emelfm2.net/rel/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils Requires: findutils >= 4.2, file, grep, sed, bzip2 -# for hal we need +%if 0%{?_with_hal:1} BuildRequires: hal-devel, dbus-glib-devel -#Requires: hal +Requires: hal +%endif %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements @@ -22,9 +28,9 @@ file typing scheme, and a built-in command line for executing commands without opening an xterm. + %prep -%setup -qn emelfm2-0.4 -%patch0 -p1 -b .hal_flags +%setup -q # fix for x86_64 libs sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile @@ -32,6 +38,7 @@ # fix broken icon in emelfm2.desktop sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop + %build make %{?_smp_mflags} \ OPTIMIZE="${RPM_OPT_FLAGS}" \ @@ -42,8 +49,10 @@ WITH_KERNELFAM=1 \ USE_LATEST=1 \ NEW_COMMAND=1 \ - WITH_ACL=1 \ - WITH_HAL=1 + %if 0%{?_with_hal:1} + WITH_HAL=1 \ + %endif + WITH_ACL=1 %install @@ -60,6 +69,7 @@ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -78,6 +88,11 @@ %changelog +* Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 +- Update 0.4.1 +- Revove hal_flags.patch (fixed upstream) +- Remove HAL support until it really works. To enable rebuild "--with hal" + * Wed Apr 02 2008 Christoph Wickert - 0.4.0-1 - Update 0.4.0 - Enable HAL support, but dont install hal by default Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 5 Apr 2008 21:36:30 -0000 1.16 +++ sources 10 Jul 2008 13:12:32 -0000 1.17 @@ -1 +1 @@ -0242f340b642d7de2c09ccc8963e3135 emelfm2-0.4.tar.gz +215d0a872350b4bdb22de940a8f2a4af emelfm2-0.4.1.tar.gz --- emelfm2-0.4-hal_flags.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 13:26:41 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 10 Jul 2008 13:26:41 GMT Subject: rpms/gtkhtml3/devel gtkhtml-3.23.4-dictionaries-on-demand.patch, NONE, 1.1 gtkhtml3.spec, 1.124, 1.125 Message-ID: <200807101326.m6ADQfpG013853@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gtkhtml3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13796 Modified Files: gtkhtml3.spec Added Files: gtkhtml-3.23.4-dictionaries-on-demand.patch Log Message: * Thu Jul 10 2008 Matthew Barnes - 3.23.4-2.fc10 - Add patch for GNOME bug #538703 (load dictionaries on-demand). gtkhtml-3.23.4-dictionaries-on-demand.patch: --- NEW FILE gtkhtml-3.23.4-dictionaries-on-demand.patch --- diff -up gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c.dictionaries-on-demand gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c --- gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c.dictionaries-on-demand 2008-06-15 23:19:52.000000000 -0400 +++ gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c 2008-07-10 09:17:53.000000000 -0400 @@ -80,6 +80,37 @@ spell_checker_is_digit (const gchar *tex return TRUE; } +static EnchantDict * +spell_checker_request_dict (GtkhtmlSpellChecker *checker) +{ + GtkhtmlSpellCheckerPrivate *priv; + const gchar *code; + + /* Loading a dictionary is time-consuming, so delay it until we + * really need it. The assumption being that the dictionary + * for a particular GtkhtmlSpellChecker instance will only + * occasionally be needed. That way we can create as many + * instances as we want without a huge performance penalty. */ + + priv = checker->priv; + + if (priv->dict != NULL) + return priv->dict; + + if (priv->language == NULL) + return NULL; + + code = gtkhtml_spell_language_get_code (priv->language); + priv->dict = enchant_broker_request_dict (priv->broker, code); + + if (priv->dict == NULL) { + priv->language = NULL; + g_warning ("Cannot load the dictionary for %s", code); + } + + return priv->dict; +} + static GObject * spell_checker_constructor (GType type, guint n_construct_properties, @@ -266,7 +297,7 @@ gtkhtml_spell_checker_check_word (Gtkhtm g_return_val_if_fail (GTKHTML_IS_SPELL_CHECKER (checker), FALSE); g_return_val_if_fail (word != NULL, FALSE); - if ((dict = checker->priv->dict) == NULL) + if ((dict = spell_checker_request_dict (checker)) == NULL) return FALSE; if (length < 0) @@ -297,7 +328,7 @@ gtkhtml_spell_checker_get_suggestions (G g_return_val_if_fail (GTKHTML_IS_SPELL_CHECKER (checker), NULL); - if ((dict = checker->priv->dict) == NULL) + if ((dict = spell_checker_request_dict (checker)) == NULL) return NULL; suggestions = enchant_dict_suggest ( @@ -322,7 +353,7 @@ gtkhtml_spell_checker_store_replacement g_return_if_fail (GTKHTML_IS_SPELL_CHECKER (checker)); - if ((dict = checker->priv->dict) != NULL) + if ((dict = spell_checker_request_dict (checker)) == NULL) return; enchant_dict_store_replacement ( @@ -338,7 +369,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlS g_return_if_fail (GTKHTML_IS_SPELL_CHECKER (checker)); - if ((dict = checker->priv->dict) == NULL) + if ((dict = spell_checker_request_dict (checker)) == NULL) return; enchant_dict_add_to_pwl (dict, word, length); @@ -354,7 +385,7 @@ gtkhtml_spell_checker_add_word_to_sessio g_return_if_fail (GTKHTML_IS_SPELL_CHECKER (checker)); - if ((dict = checker->priv->dict) == NULL) + if ((dict = spell_checker_request_dict (checker)) == NULL) return; enchant_dict_add_to_session (dict, word, length); @@ -378,18 +409,6 @@ gtkhtml_spell_checker_clear_session (Gtk if (priv->language == NULL) priv->language = gtkhtml_spell_language_lookup (NULL); - if (priv->language != NULL) { - const gchar *code; - - code = gtkhtml_spell_language_get_code (priv->language); - priv->dict = enchant_broker_request_dict (priv->broker, code); - } - - if (priv->dict == NULL) { - priv->language = NULL; - g_warning ("Cannot load the dictionary"); - } - g_signal_emit (G_OBJECT (checker), signals[SESSION_CLEARED], 0); } Index: gtkhtml3.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- gtkhtml3.spec 16 Jun 2008 17:41:46 -0000 1.124 +++ gtkhtml3.spec 10 Jul 2008 13:25:43 -0000 1.125 @@ -10,7 +10,7 @@ Name: gtkhtml3 Version: 3.23.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL/GPL Group: System Environment/Libraries Summary: gtkhtml library @@ -22,6 +22,9 @@ # Remove gnome-common macros from configure.in. Patch1: gtkhtml-3.13.1-no-gnome-common.patch +# GNOME bug #538703 +Patch2: gtkhtml-3.23.4-dictionaries-on-demand.patch + ### Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -59,6 +62,7 @@ %prep %setup -q -n gtkhtml-%{version} %patch1 -p1 -b .no-gnome-common +%patch2 -p1 -b .dictionaries-on-demand %build @@ -122,6 +126,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 10 2008 Matthew Barnes - 3.23.4-2.fc10 +- Add patch for GNOME bug #538703 (load dictionaries on-demand). + * Mon Jun 16 2008 Matthew Barnes - 3.23.4-1.fc10 - Update to 3.23.4 From fedora-extras-commits at redhat.com Thu Jul 10 13:33:44 2008 From: fedora-extras-commits at redhat.com (Will Woods (wwoods)) Date: Thu, 10 Jul 2008 13:33:44 GMT Subject: rpms/bluez-utils/devel bluez-utils.spec,1.109,1.110 Message-ID: <200807101333.m6ADXikX014282@cvs-int.fedora.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/bluez-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14208 Modified Files: bluez-utils.spec Log Message: hid2hci disappeared - re-enable it Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- bluez-utils.spec 4 Jul 2008 10:12:05 -0000 1.109 +++ bluez-utils.spec 10 Jul 2008 13:33:00 -0000 1.110 @@ -82,7 +82,7 @@ --enable-avctrl --enable-glib --enable-input --enable-echo \ --enable-serial --disable-sdpd --enable-audio --disable-sync \ --disable-obex --enable-network --enable-cups --enable-pcmciarules \ - --enable-hidd + --enable-hidd --enable-hid2hci make %install @@ -163,6 +163,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Wed Jul 09 2008 - Will Woods - 3.35-3 +- Re-add hid2hci + * Fri Jul 04 2008 - Bastien Nocera - 3.35-2 - Re-add hidd From fedora-extras-commits at redhat.com Thu Jul 10 13:35:52 2008 From: fedora-extras-commits at redhat.com (Will Woods (wwoods)) Date: Thu, 10 Jul 2008 13:35:52 GMT Subject: rpms/bluez-utils/devel bluez-utils.spec,1.110,1.111 Message-ID: <200807101335.m6ADZqR4014361@cvs-int.fedora.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/bluez-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14332 Modified Files: bluez-utils.spec Log Message: forgot to bump the release number. Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- bluez-utils.spec 10 Jul 2008 13:33:00 -0000 1.110 +++ bluez-utils.spec 10 Jul 2008 13:35:01 -0000 1.111 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.35 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 13:39:06 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 10 Jul 2008 13:39:06 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1570,1.1571 Message-ID: <200807101339.m6ADd6Pg014608@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14540 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#454682 expand macro Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1570 retrieving revision 1.1571 diff -u -r1.1570 -r1.1571 --- openoffice.org.spec 9 Jul 2008 21:55:58 -0000 1.1570 +++ openoffice.org.spec 10 Jul 2008 13:38:09 -0000 1.1571 @@ -1493,7 +1493,7 @@ # unpack presenter screen extension install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt -%define presenterscreenid %(grep identifier %{_builddir}/%{?buildsubdir}/sdext/unxlng*.pro/misc/PresenterScreen/description.xml | cut -d\\\" -f 2) +%define presenterscreenid %{expand:%%(grep identifier %{_builddir}/%{?buildsubdir}/sdext/unxlng*.pro/misc/PresenterScreen/description.xml | cut -d\\\" -f 2)} # revoke ScriptProviders and make into extensions pushd $RPM_BUILD_ROOT/%{basisinstdir}/program @@ -3584,7 +3584,7 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Wed Jul 09 2008 Caolan McNamara - 1:3.0.0-0.23-2 +* Thu Jul 10 2008 Caolan McNamara - 1:3.0.0-0.23-2 - Resolves: rhbz#452385 add postgress-jdbc to default classpath - Resolves: rhbz#454682 expand macro to get correct name for inconsistent, unnecessarily complicated, redundant and nigh universially From fedora-extras-commits at redhat.com Thu Jul 10 13:41:05 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 10 Jul 2008 13:41:05 GMT Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.376,1.377 Message-ID: <200807101341.m6ADf5BU014729@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14676 Modified Files: policycoreutils-rhat.patch Log Message: * Wed Jul 9 2008 Dan Walsh 2.0.52-5 - Additial cleanup of boolean handling for semanage policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- policycoreutils-rhat.patch 9 Jul 2008 13:04:58 -0000 1.376 +++ policycoreutils-rhat.patch 10 Jul 2008 13:40:20 -0000 1.377 @@ -1,3 +1,41 @@ +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile +--- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-09 08:44:40.000000000 -0400 +@@ -1,4 +1,4 @@ +-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po ++SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui + + INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) + +diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-09 08:44:40.000000000 -0400 +@@ -210,9 +210,10 @@ + } + + if (fsetfilecon(fd, scontext) < 0) { +- syslog(LOG_ERR, +- "set context %s->%s failed:'%s'\n", +- filename, scontext, strerror(errno)); ++ if (errno != EOPNOTSUPP) ++ syslog(LOG_ERR, ++ "set context %s->%s failed:'%s'\n", ++ filename, scontext, strerror(errno)); + if (retcontext >= 0) + free(prev_context); + free(scontext); +@@ -225,8 +226,9 @@ + if (retcontext >= 0) + free(prev_context); + } else { +- syslog(LOG_ERR, "get context on %s failed: '%s'\n", +- filename, strerror(errno)); ++ if (errno != EOPNOTSUPP) ++ syslog(LOG_ERR, "get context on %s failed: '%s'\n", ++ filename, strerror(errno)); + } + free(scontext); + close(fd); diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 +++ policycoreutils-2.0.52/semanage/semanage 2008-07-09 08:44:58.000000000 -0400 From fedora-extras-commits at redhat.com Thu Jul 10 13:44:00 2008 From: fedora-extras-commits at redhat.com (Will Woods (wwoods)) Date: Thu, 10 Jul 2008 13:44:00 GMT Subject: rpms/bluez-utils/F-9 bluez-utils.spec,1.103,1.104 Message-ID: <200807101344.m6ADi0fD015038@cvs-int.fedora.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/bluez-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14922 Modified Files: bluez-utils.spec Log Message: Bring back hid2hci Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluez-utils.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- bluez-utils.spec 4 Jul 2008 10:09:46 -0000 1.103 +++ bluez-utils.spec 10 Jul 2008 13:43:13 -0000 1.104 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.35 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -81,7 +81,7 @@ --enable-avctrl --enable-glib --enable-input --enable-echo \ --enable-serial --disable-sdpd --enable-audio --disable-sync \ --disable-obex --enable-network --enable-cups --enable-pcmciarules \ - --enable-hidd + --enable-hidd --enable-hid2hci make %install @@ -158,6 +158,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Jul 10 2008 - Will Woods - 3.35-3 +- Re-add hid2hci + * Fri Jul 04 2008 - Bastien Nocera - 3.35-2 - Re-enable hidd From fedora-extras-commits at redhat.com Thu Jul 10 13:45:20 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 10 Jul 2008 13:45:20 GMT Subject: rpms/gtkhtml3/devel gtkhtml-3.23.4-deprecated-gtk-type.patch, NONE, 1.1 gtkhtml3.spec, 1.125, 1.126 Message-ID: <200807101345.m6ADjKYQ015097@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gtkhtml3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049 Modified Files: gtkhtml3.spec Added Files: gtkhtml-3.23.4-deprecated-gtk-type.patch Log Message: * Thu Jul 10 2008 Matthew Barnes - 3.23.4-2.fc10 - Add patch for GNOME bug #538703 (load dictionaries on-demand). - Add patch for GNOME bug #539289 (stop using GtkType already!). gtkhtml-3.23.4-deprecated-gtk-type.patch: --- NEW FILE gtkhtml-3.23.4-deprecated-gtk-type.patch --- diff -up gtkhtml-3.23.4/components/html-editor/engine.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/engine.h --- gtkhtml-3.23.4/components/html-editor/engine.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 +++ gtkhtml-3.23.4/components/html-editor/engine.h 2008-07-10 09:40:42.000000000 -0400 @@ -34,10 +34,10 @@ typedef struct _EditorEngine EditorEngin #include "gtkhtml.h" #define EDITOR_ENGINE_TYPE (editor_engine_get_type ()) -#define EDITOR_ENGINE(o) (GTK_CHECK_CAST ((o), EDITOR_ENGINE_TYPE, EditorEngine)) -#define EDITOR_ENGINE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), EDITOR_ENGINE_TYPE, EditorEngineClass)) -#define IS_EDITOR_ENGINE(o) (GTK_CHECK_TYPE ((o), EDITOR_ENGINE_TYPE)) -#define IS_EDITOR_ENGINE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EDITOR_ENGINE_TYPE)) +#define EDITOR_ENGINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EDITOR_ENGINE_TYPE, EditorEngine)) +#define EDITOR_ENGINE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EDITOR_ENGINE_TYPE, EditorEngineClass)) +#define IS_EDITOR_ENGINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EDITOR_ENGINE_TYPE)) +#define IS_EDITOR_ENGINE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EDITOR_ENGINE_TYPE)) struct _EditorEngine { BonoboObject parent; @@ -52,7 +52,7 @@ typedef struct { POA_GNOME_GtkHTML_Editor_Engine__epv epv; } EditorEngineClass; -GtkType editor_engine_get_type (void); +GType editor_engine_get_type (void); EditorEngine *editor_engine_new (GtkHTMLControlData *cd); POA_GNOME_GtkHTML_Editor_Engine__epv *editor_engine_get_epv (void); diff -up gtkhtml-3.23.4/components/html-editor/gi-color-combo.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-color-combo.h --- gtkhtml-3.23.4/components/html-editor/gi-color-combo.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 +++ gtkhtml-3.23.4/components/html-editor/gi-color-combo.h 2008-07-10 09:40:42.000000000 -0400 @@ -65,7 +65,7 @@ typedef struct { #define GI_COLOR_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GI_COLOR_COMBO_TYPE) #define IS_GI_COLOR_COMBO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GI_COLOR_COMBO_TYPE)) -GtkType gi_color_combo_get_type (void); +GType gi_color_combo_get_type (void); GtkWidget *gi_color_combo_new (GdkPixbuf *icon, char const *no_color_label, GdkColor *default_color, diff -up gtkhtml-3.23.4/components/html-editor/gi-color-palette.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-color-palette.h --- gtkhtml-3.23.4/components/html-editor/gi-color-palette.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 +++ gtkhtml-3.23.4/components/html-editor/gi-color-palette.h 2008-07-10 09:40:42.000000000 -0400 @@ -86,7 +86,7 @@ typedef struct { #define COLOR_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), COLOR_PALETTE_TYPE) #define IS_COLOR_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), COLOR_PALETTE_TYPE)) -GtkType color_palette_get_type (void); +GType color_palette_get_type (void); GtkWidget *color_palette_new (const char *no_color_label, GdkColor *default_color, diff -up gtkhtml-3.23.4/components/html-editor/gi-combo-box.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-combo-box.h --- gtkhtml-3.23.4/components/html-editor/gi-combo-box.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 +++ gtkhtml-3.23.4/components/html-editor/gi-combo-box.h 2008-07-10 09:40:42.000000000 -0400 @@ -60,7 +60,7 @@ struct _GiComboBoxClass { void (*post_pop_hide) (GiComboBox *cbox); }; -GtkType gi_combo_box_get_type (void); +GType gi_combo_box_get_type (void); void gi_combo_box_construct (GiComboBox *combo_box, GtkWidget *display_widget, GtkWidget *optional_pop_down_widget); diff -up gtkhtml-3.23.4/components/html-editor/htmlsourceview.c.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/htmlsourceview.c --- gtkhtml-3.23.4/components/html-editor/htmlsourceview.c.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 +++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.c 2008-07-10 09:40:42.000000000 -0400 @@ -238,7 +238,7 @@ html_source_view_class_init (HTMLSourceV klass->update = html_source_view_real_update; } -GtkType +GType html_source_view_get_type (void) { static GType view_type = 0; diff -up gtkhtml-3.23.4/components/html-editor/htmlsourceview.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/htmlsourceview.h --- gtkhtml-3.23.4/components/html-editor/htmlsourceview.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 +++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.h 2008-07-10 09:40:42.000000000 -0400 @@ -27,9 +27,9 @@ #include "gtkhtml.h" #define HTML_TYPE_SOURCE_VIEW (html_source_view_get_type ()) -#define HTML_SOURCE_VIEW(w) (GTK_CHECK_CAST ((w), HTML_TYPE_SOURCE_VIEW, HTMLSourceView)) -#define HTML_SOURCE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), HTML_TYPE_SOURCE_VIEW, HTMLSourceViewClass)) -#define HTML_IS_SOURCE_VIEW(w) (GTK_CHECK_TYPE ((w), HTML_TYPE_SOURCE_VIEW)) +#define HTML_SOURCE_VIEW(w) (G_TYPE_CHECK_INSTANCE_CAST ((w), HTML_TYPE_SOURCE_VIEW, HTMLSourceView)) +#define HTML_SOURCE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), HTML_TYPE_SOURCE_VIEW, HTMLSourceViewClass)) +#define HTML_IS_SOURCE_VIEW(w) (G_TYPE_CHECK_INSTANCE_TYPE ((w), HTML_TYPE_SOURCE_VIEW)) typedef struct _HTMLSourceViewPrivate HTMLSourceViewPrivate; typedef struct _HTMLSourceViewClass HTMLSourceViewClass; @@ -47,7 +47,7 @@ struct _HTMLSourceViewClass { void (*update)(HTMLSourceView *); }; -GtkType html_source_view_get_type (void); +GType html_source_view_get_type (void); GtkWidget * html_source_view_new (void); void html_source_view_set_timeout (HTMLSourceView *view, guint timeout); diff -up gtkhtml-3.23.4/components/html-editor/html-stream-mem.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/html-stream-mem.h --- gtkhtml-3.23.4/components/html-editor/html-stream-mem.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 +++ gtkhtml-3.23.4/components/html-editor/html-stream-mem.h 2008-07-10 09:40:42.000000000 -0400 @@ -15,10 +15,10 @@ typedef struct _HTMLStreamMem HTMLS typedef struct _HTMLStreamMemClass HTMLStreamMemClass; #define HTML_STREAM_MEM_TYPE (html_stream_mem_get_type ()) -#define HTML_STREAM_MEM(o) (GTK_CHECK_CAST ((o), HTML_STREAM_MEM_TYPE, HTMLStreamMem)) -#define HTML_STREAM_MEM_CLASS(k) (GTK_CHECK_CLASS_CAST((k), HTML_STREAM_MEM_TYPE, HTMLStreamMemClass)) -#define HTML_IS_STREAM_MEM(o) (GTK_CHECK_TYPE ((o), HTML_STREAM_MEM_TYPE)) -#define HTML_IS_STREAM_MEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), HTML_STREAM_MEM_TYPE)) +#define HTML_STREAM_MEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HTML_STREAM_MEM_TYPE, HTMLStreamMem)) +#define HTML_STREAM_MEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), HTML_STREAM_MEM_TYPE, HTMLStreamMemClass)) +#define HTML_IS_STREAM_MEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HTML_STREAM_MEM_TYPE)) +#define HTML_IS_STREAM_MEM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HTML_STREAM_MEM_TYPE)) struct _HTMLStreamMem { BonoboObject bonobo_object; @@ -31,7 +31,7 @@ struct _HTMLStreamMemClass { POA_Bonobo_Stream__epv epv; }; -GtkType html_stream_mem_get_type (void); +GType html_stream_mem_get_type (void); BonoboObject *html_stream_mem_create (GtkHTMLStream *html_stream); HTMLStreamMem *html_stream_mem_constuct (HTMLStreamMem *bhtml, GtkHTMLStream *html_stream); diff -up gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h --- gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 +++ gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h 2008-07-10 09:40:42.000000000 -0400 @@ -28,9 +28,9 @@ #include "gtkhtml-types.h" #define GTK_TYPE_HTML_EMBEDDED (gtk_html_embedded_get_type ()) -#define GTK_HTML_EMBEDDED(obj) GTK_CHECK_CAST (obj, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbedded) -#define GTK_HTML_EMBEDDED_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbeddedClass) -#define GTK_IS_HTML_EMBEDDED(obj) GTK_CHECK_TYPE (obj, GTK_TYPE_HTML_EMBEDDED) +#define GTK_HTML_EMBEDDED(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbedded) +#define GTK_HTML_EMBEDDED_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbeddedClass) +#define GTK_IS_HTML_EMBEDDED(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_HTML_EMBEDDED) struct _GtkHTMLEmbedded { GtkBin bin; diff -up gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h --- gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h.deprecated-gtk-type 2008-06-15 23:19:59.000000000 -0400 +++ gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h 2008-07-10 09:40:42.000000000 -0400 @@ -62,7 +62,7 @@ void gtk_html_class_ #define GTK_TYPE_HTML_CURSOR_SKIP (gtk_html_cursor_skip_get_type ()) #define GTK_TYPE_HTML_COMMAND (gtk_html_command_get_type ()) -GtkType gtk_html_cursor_skip_get_type (void); -GtkType gtk_html_command_get_type (void); +GType gtk_html_cursor_skip_get_type (void); +GType gtk_html_command_get_type (void); #endif diff -up gtkhtml-3.23.4/gtkhtml/htmlframe.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlframe.c --- gtkhtml-3.23.4/gtkhtml/htmlframe.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 +++ gtkhtml-3.23.4/gtkhtml/htmlframe.c 2008-07-10 09:40:42.000000000 -0400 @@ -511,10 +511,10 @@ html_frame_init (HTMLFrame *frame, * proxied like url_requested is. */ gtk_signal_connect (GTK_OBJECT (new_html), "on_url", - GTK_SIGNAL_FUNC (frame_on_url), + G_CALLBACK (frame_on_url), (gpointer)frame); gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked", - GTK_SIGNAL_FUNC (frame_link_clicked), + G_CALLBACK (frame_link_clicked), (gpointer)frame); #endif g_signal_connect (new_html, "size_changed", G_CALLBACK (frame_size_changed), frame); @@ -527,7 +527,7 @@ html_frame_init (HTMLFrame *frame, /* gtk_signal_connect (GTK_OBJECT (html), "button_press_event", - GTK_SIGNAL_FUNC (frame_button_press_event), frame); + G_CALLBACK (frame_button_press_event), frame); */ gtk_widget_set_size_request (scrolled_window, width, height); diff -up gtkhtml-3.23.4/gtkhtml/htmliframe.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmliframe.c --- gtkhtml-3.23.4/gtkhtml/htmliframe.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 +++ gtkhtml-3.23.4/gtkhtml/htmliframe.c 2008-07-10 09:40:42.000000000 -0400 @@ -646,10 +646,10 @@ html_iframe_init (HTMLIFrame *iframe, * proxied like url_requested is. */ gtk_signal_connect (GTK_OBJECT (new_html), "on_url", - GTK_SIGNAL_FUNC (iframe_on_url), + G_CALLBACK (iframe_on_url), (gpointer)iframe); gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked", - GTK_SIGNAL_FUNC (iframe_link_clicked), + G_CALLBACK (iframe_link_clicked), (gpointer)iframe); #endif g_signal_connect (new_html, "size_changed", G_CALLBACK (iframe_size_changed), iframe); @@ -658,7 +658,7 @@ html_iframe_init (HTMLIFrame *iframe, /* gtk_signal_connect (GTK_OBJECT (html), "button_press_event", - GTK_SIGNAL_FUNC (iframe_button_press_event), iframe); + G_CALLBACK (iframe_button_press_event), iframe); */ gtk_widget_set_size_request (scrolled_window, width, height); @@ -677,13 +677,13 @@ html_iframe_init (HTMLIFrame *iframe, html_painter_set_focus (new_html->engine->painter, parent_html->engine->have_focus); /* gtk_signal_connect (GTK_OBJECT (html), "title_changed", - GTK_SIGNAL_FUNC (title_changed_cb), (gpointer)app); + G_CALLBACK (title_changed_cb), (gpointer)app); gtk_signal_connect (GTK_OBJECT (html), "button_press_event", - GTK_SIGNAL_FUNC (on_button_press_event), popup_menu); + G_CALLBACK (on_button_press_event), popup_menu); gtk_signal_connect (GTK_OBJECT (html), "redirect", - GTK_SIGNAL_FUNC (on_redirect), NULL); + G_CALLBACK (on_redirect), NULL); gtk_signal_connect (GTK_OBJECT (html), "object_requested", - GTK_SIGNAL_FUNC (object_requested_cmd), NULL); + G_CALLBACK (object_requested_cmd), NULL); */ } diff -up gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h --- gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 +++ gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h 2008-07-10 09:40:42.000000000 -0400 @@ -44,7 +44,7 @@ struct _HTMLPlainPainterClass { HTMLGdkPainterClass base; }; -GtkType html_plain_painter_get_type (void); +GType html_plain_painter_get_type (void); HTMLPainter *html_plain_painter_new (GtkWidget *widget, gboolean double_buffer); #endif /* _HTMLPLAINPAINTER_H */ diff -up gtkhtml-3.23.4/gtkhtml/htmlprinter.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlprinter.h --- gtkhtml-3.23.4/gtkhtml/htmlprinter.h.deprecated-gtk-type 2008-06-15 23:19:59.000000000 -0400 +++ gtkhtml-3.23.4/gtkhtml/htmlprinter.h 2008-07-10 09:40:42.000000000 -0400 @@ -48,7 +48,7 @@ struct _HTMLPrinterClass { HTMLPainterClass base; }; -GtkType html_printer_get_type (void); +GType html_printer_get_type (void); HTMLPainter *html_printer_new (GtkWidget *widget, GtkPrintContext *context); guint html_printer_get_page_width (HTMLPrinter *printer); diff -up gtkhtml-3.23.4/gtkhtml/htmltokenizer.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmltokenizer.c --- gtkhtml-3.23.4/gtkhtml/htmltokenizer.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 +++ gtkhtml-3.23.4/gtkhtml/htmltokenizer.c 2008-07-10 09:40:42.000000000 -0400 @@ -265,10 +265,10 @@ html_tokenizer_finalize (GObject *obj) G_OBJECT_CLASS (parent_class)->finalize (obj); } -GtkType +GType html_tokenizer_get_type (void) { - static GtkType html_tokenizer_type = 0; + static GType html_tokenizer_type = 0; if (!html_tokenizer_type) { static const GTypeInfo html_tokenizer_info = { Index: gtkhtml3.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- gtkhtml3.spec 10 Jul 2008 13:25:43 -0000 1.125 +++ gtkhtml3.spec 10 Jul 2008 13:44:30 -0000 1.126 @@ -25,6 +25,9 @@ # GNOME bug #538703 Patch2: gtkhtml-3.23.4-dictionaries-on-demand.patch +# GNOME bug #539289 +Patch3: gtkhtml-3.23.4-deprecated-gtk-type.patch + ### Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -63,6 +66,7 @@ %setup -q -n gtkhtml-%{version} %patch1 -p1 -b .no-gnome-common %patch2 -p1 -b .dictionaries-on-demand +%patch3 -p1 -b .deprecated-gtk-type %build @@ -128,6 +132,7 @@ %changelog * Thu Jul 10 2008 Matthew Barnes - 3.23.4-2.fc10 - Add patch for GNOME bug #538703 (load dictionaries on-demand). +- Add patch for GNOME bug #539289 (stop using GtkType already!). * Mon Jun 16 2008 Matthew Barnes - 3.23.4-1.fc10 - Update to 3.23.4 From fedora-extras-commits at redhat.com Thu Jul 10 13:51:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Thu, 10 Jul 2008 13:51:30 GMT Subject: rpms/sagator/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807101351.m6ADpU93015467@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15428/devel Modified Files: .cvsignore sagator.spec sources Added Files: import.log Log Message: New release --- NEW FILE import.log --- sagator-1_1_0-1_fc9:HEAD:sagator-1.1.0-1.fc9.src.rpm:1215697760 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jan 2008 19:29:39 -0000 1.2 +++ .cvsignore 10 Jul 2008 13:50:43 -0000 1.3 @@ -1 +1 @@ -sagator-1.0.0.tar.bz2 +sagator-1.1.0.tar.bz2 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/devel/sagator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sagator.spec 25 Jan 2008 19:29:39 -0000 1.1 +++ sagator.spec 10 Jul 2008 13:50:43 -0000 1.2 @@ -3,10 +3,11 @@ %define ARCHIVERS tar,arc,unace,unrar,rar,zoo,unarj,arj,unzip,zip,gzip,bzip2 %define ANTIVIRS clamav,clamav-libs,avglinux,nod32ls,nod32lfs,kav4mailservers-linux %define ANTISPAMS bogofilter,qsf +%define CLAMAV_VERSION 0.92 Summary: SAGATOR - antivir/antispam gateway for smtp server Name: sagator -Version: 1.0.0 +Version: 1.1.0 Release: 1%{?dist} Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 URL: http://www.salstar.sk/sagator/ @@ -15,24 +16,22 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2.2, ed, gettext +Obsoletes: sagator-libclamav <= 1.2.3 +Obsoletes: sagator-pydspam <= 0.9.1 Requires: python >= 2.2.2, sed %if %_vendor == "suse" -Requires: aaa_base, smtp_daemon -BuildRequires: aaa_base, python-xml +BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} +Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION} +%if 0%suse_version < 01030 +Requires: python-ctypes +%endif %else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts Requires: initscripts, smtpdaemon, shadow-utils -BuildRequires: initscripts, logwatch - -# SElinux policy for Fedoras and RHEL>=5 -%if 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: selinux-policy-devel -# SElinux directory and policy package -%define sedir %{_datadir}/%{name}/selinux -%define sepolicy %{sedir}/%{name}.pp -%endif +Requires: clamav-lib >= %{CLAMAV_VERSION} +BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} %endif @@ -67,6 +66,25 @@ SAGATOR's web quarantine access can be used to allow users (or admin) to access their emails in sagator's quarantine. +# SElinux policy for Fedoras and RHEL>=5 +%if 0%{?fedora} || 0%{?rhel} >= 5 +%package selinux +Summary: SELinux support for SAGATOR +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(postun): policycoreutils, selinux-policy +BuildRequires: selinux-policy-devel +# SElinux directory and policy package +%define install_sepolicy 1 +%define sepolicy %{_datadir}/%{name}/selinux/%{name}.pp + +%description selinux +This package helps moving to the upstream SELinux module. + +%else +%define install_sepolicy 0 +%endif + %prep %setup -q @@ -83,11 +101,6 @@ ln -s ../../../..%{_sysconfdir}/sagator.conf \ %{buildroot}%{_datadir}/%{name}/etc/sgconf.py mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine -# add SElinux policy -if [ -e %{buildroot}%{sepolicy} ]; then - echo "%dir %{sedir}" >> filelist - echo "%{sepolicy}" >> filelist -fi %find_lang %{name} %pre @@ -112,12 +125,6 @@ elif [ -x /sbin/insserv ]; then insserv sagator fi - # selinux - [ ! -x %{_sbindir}/semodule ] || [ ! -x %{_sbindir}/sestatus ] || - [ ! -x %{_sbindir}/selinuxenabled ] || ! %{_sbindir}/selinuxenabled || \ - [ ! -e %{sepolicy} ] || \ - %{_sbindir}/semodule -i %{sepolicy} \ - >/dev/null 2>/dev/null fi %preun @@ -132,6 +139,19 @@ fi fi +%if %{install_sepolicy} +%post selinux +if selinuxenabled; then + # Replace the module by the upstream one + #. /etc/selinux/config 2>/dev/null || : + semodule -i %{sepolicy} 2>/dev/null || : + # relabel files + fixfiles -R %{name} restore || : + # relabel chroot + restorecon -R %{CHROOTDIR} || : +fi +%endif + %triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot @@ -161,6 +181,10 @@ %exclude %{_datadir}/%{name}/etc/sgconf.py? %dir %{_datadir}/%{name}/av %{_datadir}/%{name}/av/*.py* +%dir %{_datadir}/%{name}/av/libclamav +%{_datadir}/%{name}/av//libclamav/*.py* +%dir %{_datadir}/%{name}/as/pydspam +%{_datadir}/%{name}/as//pydspam/*.py* %dir %{_datadir}/%{name}/as %{_datadir}/%{name}/as/*.py* %dir %{_datadir}/%{name}/interscan @@ -173,12 +197,24 @@ %attr(0770,vscan,vscan) %dir %{CHROOTDIR}/tmp/quarantine %files webq -f sagator.lang +%defattr(-,root,root) %dir %{_datadir}/%{name}/srv/web %{_datadir}/%{name}/srv/web/*.py* %{_datadir}/%{name}/srv/web/*.kid +%if %{install_sepolicy} +%files selinux +%defattr(-,root,root) +%{sepolicy} +%endif + %changelog -* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-1 +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 +- added libclamav module +- added pydspam module +- selinux module moved to separate subpackage + +* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0 - /var/spool/vscan replaced by CHROOTDIR macro - posttrans section moved to init script (start section) - more macros used Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Jan 2008 19:29:39 -0000 1.2 +++ sources 10 Jul 2008 13:50:43 -0000 1.3 @@ -1 +1 @@ -bf14d88d95645c41c489350bad74e1de sagator-1.0.0.tar.bz2 +a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 13:54:09 2008 From: fedora-extras-commits at redhat.com (Will Woods (wwoods)) Date: Thu, 10 Jul 2008 13:54:09 GMT Subject: rpms/bluez-utils/F-8 bluez-utils.spec,1.90,1.91 Message-ID: <200807101354.m6ADs9pd015672@cvs-int.fedora.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/bluez-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15638 Modified Files: bluez-utils.spec Log Message: Bring back hid2hci Index: bluez-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-utils/F-8/bluez-utils.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- bluez-utils.spec 4 Jul 2008 09:39:42 -0000 1.90 +++ bluez-utils.spec 10 Jul 2008 13:53:21 -0000 1.91 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.35 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -80,7 +80,8 @@ --enable-all --disable-bcm203x --enable-alsa --enable-bccmd \ --enable-avctrl --enable-glib --enable-input --enable-echo \ --enable-serial --disable-sdpd --enable-audio --disable-sync \ - --disable-obex --enable-cups --enable-pcmciarules --enable-hidd + --disable-obex --enable-cups --enable-pcmciarules --enable-hidd \ + --enable-hid2hci make %install @@ -154,6 +155,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Jul 10 2008 - Will Woods - 3.35-3 +- Re-add hid2hci + * Fri Jul 04 2008 - Bastien Nocera - 3.35-2 - Re-add hidd From fedora-extras-commits at redhat.com Thu Jul 10 14:00:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Thu, 10 Jul 2008 14:00:33 GMT Subject: rpms/sagator/F-9 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807101400.m6AE0XPS015968@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15904/F-9 Modified Files: .cvsignore sagator.spec sources Added Files: import.log Log Message: New release --- NEW FILE import.log --- sagator-1_1_0-1_fc9:F-9:sagator-1.1.0-1.fc9.src.rpm:1215698366 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jan 2008 19:29:39 -0000 1.2 +++ .cvsignore 10 Jul 2008 13:59:46 -0000 1.3 @@ -1 +1 @@ -sagator-1.0.0.tar.bz2 +sagator-1.1.0.tar.bz2 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/F-9/sagator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sagator.spec 25 Jan 2008 19:29:39 -0000 1.1 +++ sagator.spec 10 Jul 2008 13:59:46 -0000 1.2 @@ -3,10 +3,11 @@ %define ARCHIVERS tar,arc,unace,unrar,rar,zoo,unarj,arj,unzip,zip,gzip,bzip2 %define ANTIVIRS clamav,clamav-libs,avglinux,nod32ls,nod32lfs,kav4mailservers-linux %define ANTISPAMS bogofilter,qsf +%define CLAMAV_VERSION 0.92 Summary: SAGATOR - antivir/antispam gateway for smtp server Name: sagator -Version: 1.0.0 +Version: 1.1.0 Release: 1%{?dist} Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 URL: http://www.salstar.sk/sagator/ @@ -15,24 +16,22 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2.2, ed, gettext +Obsoletes: sagator-libclamav <= 1.2.3 +Obsoletes: sagator-pydspam <= 0.9.1 Requires: python >= 2.2.2, sed %if %_vendor == "suse" -Requires: aaa_base, smtp_daemon -BuildRequires: aaa_base, python-xml +BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} +Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION} +%if 0%suse_version < 01030 +Requires: python-ctypes +%endif %else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts Requires: initscripts, smtpdaemon, shadow-utils -BuildRequires: initscripts, logwatch - -# SElinux policy for Fedoras and RHEL>=5 -%if 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: selinux-policy-devel -# SElinux directory and policy package -%define sedir %{_datadir}/%{name}/selinux -%define sepolicy %{sedir}/%{name}.pp -%endif +Requires: clamav-lib >= %{CLAMAV_VERSION} +BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} %endif @@ -67,6 +66,25 @@ SAGATOR's web quarantine access can be used to allow users (or admin) to access their emails in sagator's quarantine. +# SElinux policy for Fedoras and RHEL>=5 +%if 0%{?fedora} || 0%{?rhel} >= 5 +%package selinux +Summary: SELinux support for SAGATOR +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(postun): policycoreutils, selinux-policy +BuildRequires: selinux-policy-devel +# SElinux directory and policy package +%define install_sepolicy 1 +%define sepolicy %{_datadir}/%{name}/selinux/%{name}.pp + +%description selinux +This package helps moving to the upstream SELinux module. + +%else +%define install_sepolicy 0 +%endif + %prep %setup -q @@ -83,11 +101,6 @@ ln -s ../../../..%{_sysconfdir}/sagator.conf \ %{buildroot}%{_datadir}/%{name}/etc/sgconf.py mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine -# add SElinux policy -if [ -e %{buildroot}%{sepolicy} ]; then - echo "%dir %{sedir}" >> filelist - echo "%{sepolicy}" >> filelist -fi %find_lang %{name} %pre @@ -112,12 +125,6 @@ elif [ -x /sbin/insserv ]; then insserv sagator fi - # selinux - [ ! -x %{_sbindir}/semodule ] || [ ! -x %{_sbindir}/sestatus ] || - [ ! -x %{_sbindir}/selinuxenabled ] || ! %{_sbindir}/selinuxenabled || \ - [ ! -e %{sepolicy} ] || \ - %{_sbindir}/semodule -i %{sepolicy} \ - >/dev/null 2>/dev/null fi %preun @@ -132,6 +139,19 @@ fi fi +%if %{install_sepolicy} +%post selinux +if selinuxenabled; then + # Replace the module by the upstream one + #. /etc/selinux/config 2>/dev/null || : + semodule -i %{sepolicy} 2>/dev/null || : + # relabel files + fixfiles -R %{name} restore || : + # relabel chroot + restorecon -R %{CHROOTDIR} || : +fi +%endif + %triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot @@ -161,6 +181,10 @@ %exclude %{_datadir}/%{name}/etc/sgconf.py? %dir %{_datadir}/%{name}/av %{_datadir}/%{name}/av/*.py* +%dir %{_datadir}/%{name}/av/libclamav +%{_datadir}/%{name}/av//libclamav/*.py* +%dir %{_datadir}/%{name}/as/pydspam +%{_datadir}/%{name}/as//pydspam/*.py* %dir %{_datadir}/%{name}/as %{_datadir}/%{name}/as/*.py* %dir %{_datadir}/%{name}/interscan @@ -173,12 +197,24 @@ %attr(0770,vscan,vscan) %dir %{CHROOTDIR}/tmp/quarantine %files webq -f sagator.lang +%defattr(-,root,root) %dir %{_datadir}/%{name}/srv/web %{_datadir}/%{name}/srv/web/*.py* %{_datadir}/%{name}/srv/web/*.kid +%if %{install_sepolicy} +%files selinux +%defattr(-,root,root) +%{sepolicy} +%endif + %changelog -* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-1 +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 +- added libclamav module +- added pydspam module +- selinux module moved to separate subpackage + +* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0 - /var/spool/vscan replaced by CHROOTDIR macro - posttrans section moved to init script (start section) - more macros used Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Jan 2008 19:29:39 -0000 1.2 +++ sources 10 Jul 2008 13:59:46 -0000 1.3 @@ -1 +1 @@ -bf14d88d95645c41c489350bad74e1de sagator-1.0.0.tar.bz2 +a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 14:01:47 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 10 Jul 2008 14:01:47 GMT Subject: rpms/gtkhtml3/devel gtkhtml-3.23.4-deprecated-gtk-type.patch, 1.1, 1.2 gtkhtml-3.23.4-dictionaries-on-demand.patch, 1.1, 1.2 Message-ID: <200807101401.m6AE1lhJ022586@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gtkhtml3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16024 Modified Files: gtkhtml-3.23.4-deprecated-gtk-type.patch gtkhtml-3.23.4-dictionaries-on-demand.patch Log Message: Missed one. gtkhtml-3.23.4-deprecated-gtk-type.patch: Index: gtkhtml-3.23.4-deprecated-gtk-type.patch =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml-3.23.4-deprecated-gtk-type.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkhtml-3.23.4-deprecated-gtk-type.patch 10 Jul 2008 13:44:30 -0000 1.1 +++ gtkhtml-3.23.4-deprecated-gtk-type.patch 10 Jul 2008 14:00:56 -0000 1.2 @@ -1,6 +1,6 @@ diff -up gtkhtml-3.23.4/components/html-editor/engine.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/engine.h --- gtkhtml-3.23.4/components/html-editor/engine.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 -+++ gtkhtml-3.23.4/components/html-editor/engine.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/components/html-editor/engine.h 2008-07-10 09:56:26.000000000 -0400 @@ -34,10 +34,10 @@ typedef struct _EditorEngine EditorEngin #include "gtkhtml.h" @@ -27,7 +27,7 @@ diff -up gtkhtml-3.23.4/components/html-editor/gi-color-combo.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-color-combo.h --- gtkhtml-3.23.4/components/html-editor/gi-color-combo.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 -+++ gtkhtml-3.23.4/components/html-editor/gi-color-combo.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/components/html-editor/gi-color-combo.h 2008-07-10 09:56:26.000000000 -0400 @@ -65,7 +65,7 @@ typedef struct { #define GI_COLOR_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GI_COLOR_COMBO_TYPE) #define IS_GI_COLOR_COMBO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GI_COLOR_COMBO_TYPE)) @@ -39,7 +39,7 @@ GdkColor *default_color, diff -up gtkhtml-3.23.4/components/html-editor/gi-color-palette.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-color-palette.h --- gtkhtml-3.23.4/components/html-editor/gi-color-palette.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 -+++ gtkhtml-3.23.4/components/html-editor/gi-color-palette.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/components/html-editor/gi-color-palette.h 2008-07-10 09:56:26.000000000 -0400 @@ -86,7 +86,7 @@ typedef struct { #define COLOR_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), COLOR_PALETTE_TYPE) #define IS_COLOR_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), COLOR_PALETTE_TYPE)) @@ -51,7 +51,7 @@ GdkColor *default_color, diff -up gtkhtml-3.23.4/components/html-editor/gi-combo-box.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-combo-box.h --- gtkhtml-3.23.4/components/html-editor/gi-combo-box.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 -+++ gtkhtml-3.23.4/components/html-editor/gi-combo-box.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/components/html-editor/gi-combo-box.h 2008-07-10 09:56:26.000000000 -0400 @@ -60,7 +60,7 @@ struct _GiComboBoxClass { void (*post_pop_hide) (GiComboBox *cbox); }; @@ -63,7 +63,7 @@ GtkWidget *optional_pop_down_widget); diff -up gtkhtml-3.23.4/components/html-editor/htmlsourceview.c.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/htmlsourceview.c --- gtkhtml-3.23.4/components/html-editor/htmlsourceview.c.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 -+++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.c 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.c 2008-07-10 09:56:26.000000000 -0400 @@ -238,7 +238,7 @@ html_source_view_class_init (HTMLSourceV klass->update = html_source_view_real_update; } @@ -75,7 +75,7 @@ static GType view_type = 0; diff -up gtkhtml-3.23.4/components/html-editor/htmlsourceview.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/htmlsourceview.h --- gtkhtml-3.23.4/components/html-editor/htmlsourceview.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 -+++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.h 2008-07-10 09:56:26.000000000 -0400 @@ -27,9 +27,9 @@ #include "gtkhtml.h" @@ -100,7 +100,7 @@ void html_source_view_set_timeout (HTMLSourceView *view, guint timeout); diff -up gtkhtml-3.23.4/components/html-editor/html-stream-mem.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/html-stream-mem.h --- gtkhtml-3.23.4/components/html-editor/html-stream-mem.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400 -+++ gtkhtml-3.23.4/components/html-editor/html-stream-mem.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/components/html-editor/html-stream-mem.h 2008-07-10 09:56:26.000000000 -0400 @@ -15,10 +15,10 @@ typedef struct _HTMLStreamMem HTMLS typedef struct _HTMLStreamMemClass HTMLStreamMemClass; @@ -127,7 +127,7 @@ diff -up gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h --- gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 -+++ gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h 2008-07-10 09:56:26.000000000 -0400 @@ -28,9 +28,9 @@ #include "gtkhtml-types.h" @@ -141,9 +141,21 @@ struct _GtkHTMLEmbedded { GtkBin bin; +diff -up gtkhtml-3.23.4/gtkhtml/gtkhtml.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/gtkhtml.h +--- gtkhtml-3.23.4/gtkhtml/gtkhtml.h.deprecated-gtk-type 2008-07-10 09:57:32.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/gtkhtml.h 2008-07-10 09:57:42.000000000 -0400 +@@ -129,7 +129,7 @@ struct _GtkHTMLEditorAPI + }; + + /* Creation. */ +-GtkType gtk_html_get_type (void); ++GType gtk_html_get_type (void); + void gtk_html_construct (GtkHTML *html); + GtkWidget *gtk_html_new (void); + void gtk_html_set_editor_api (GtkHTML *html, diff -up gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h --- gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h.deprecated-gtk-type 2008-06-15 23:19:59.000000000 -0400 -+++ gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h 2008-07-10 09:56:26.000000000 -0400 @@ -62,7 +62,7 @@ void gtk_html_class_ #define GTK_TYPE_HTML_CURSOR_SKIP (gtk_html_cursor_skip_get_type ()) #define GTK_TYPE_HTML_COMMAND (gtk_html_command_get_type ()) @@ -156,7 +168,7 @@ #endif diff -up gtkhtml-3.23.4/gtkhtml/htmlframe.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlframe.c --- gtkhtml-3.23.4/gtkhtml/htmlframe.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 -+++ gtkhtml-3.23.4/gtkhtml/htmlframe.c 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/htmlframe.c 2008-07-10 09:56:26.000000000 -0400 @@ -511,10 +511,10 @@ html_frame_init (HTMLFrame *frame, * proxied like url_requested is. */ @@ -181,7 +193,7 @@ gtk_widget_set_size_request (scrolled_window, width, height); diff -up gtkhtml-3.23.4/gtkhtml/htmliframe.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmliframe.c --- gtkhtml-3.23.4/gtkhtml/htmliframe.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 -+++ gtkhtml-3.23.4/gtkhtml/htmliframe.c 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/htmliframe.c 2008-07-10 09:56:26.000000000 -0400 @@ -646,10 +646,10 @@ html_iframe_init (HTMLIFrame *iframe, * proxied like url_requested is. */ @@ -224,7 +236,7 @@ diff -up gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h --- gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 -+++ gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h 2008-07-10 09:56:26.000000000 -0400 @@ -44,7 +44,7 @@ struct _HTMLPlainPainterClass { HTMLGdkPainterClass base; }; @@ -236,7 +248,7 @@ #endif /* _HTMLPLAINPAINTER_H */ diff -up gtkhtml-3.23.4/gtkhtml/htmlprinter.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlprinter.h --- gtkhtml-3.23.4/gtkhtml/htmlprinter.h.deprecated-gtk-type 2008-06-15 23:19:59.000000000 -0400 -+++ gtkhtml-3.23.4/gtkhtml/htmlprinter.h 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/htmlprinter.h 2008-07-10 09:56:26.000000000 -0400 @@ -48,7 +48,7 @@ struct _HTMLPrinterClass { HTMLPainterClass base; }; @@ -248,7 +260,7 @@ guint html_printer_get_page_width (HTMLPrinter *printer); diff -up gtkhtml-3.23.4/gtkhtml/htmltokenizer.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmltokenizer.c --- gtkhtml-3.23.4/gtkhtml/htmltokenizer.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400 -+++ gtkhtml-3.23.4/gtkhtml/htmltokenizer.c 2008-07-10 09:40:42.000000000 -0400 ++++ gtkhtml-3.23.4/gtkhtml/htmltokenizer.c 2008-07-10 09:56:26.000000000 -0400 @@ -265,10 +265,10 @@ html_tokenizer_finalize (GObject *obj) G_OBJECT_CLASS (parent_class)->finalize (obj); } gtkhtml-3.23.4-dictionaries-on-demand.patch: Index: gtkhtml-3.23.4-dictionaries-on-demand.patch =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml-3.23.4-dictionaries-on-demand.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkhtml-3.23.4-dictionaries-on-demand.patch 10 Jul 2008 13:25:43 -0000 1.1 +++ gtkhtml-3.23.4-dictionaries-on-demand.patch 10 Jul 2008 14:00:56 -0000 1.2 @@ -1,6 +1,6 @@ diff -up gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c.dictionaries-on-demand gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c --- gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c.dictionaries-on-demand 2008-06-15 23:19:52.000000000 -0400 -+++ gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c 2008-07-10 09:17:53.000000000 -0400 ++++ gtkhtml-3.23.4/components/editor/gtkhtml-spell-checker.c 2008-07-10 09:56:26.000000000 -0400 @@ -80,6 +80,37 @@ spell_checker_is_digit (const gchar *tex return TRUE; } From fedora-extras-commits at redhat.com Thu Jul 10 14:07:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Thu, 10 Jul 2008 14:07:24 GMT Subject: rpms/sagator/F-8 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807101407.m6AE7ODC022865@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22823/F-8 Modified Files: .cvsignore sagator.spec sources Added Files: import.log Log Message: New release --- NEW FILE import.log --- sagator-1_1_0-1_fc9:F-8:sagator-1.1.0-1.fc9.src.rpm:1215698784 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jan 2008 19:31:39 -0000 1.2 +++ .cvsignore 10 Jul 2008 14:06:37 -0000 1.3 @@ -1 +1 @@ -sagator-1.0.0.tar.bz2 +sagator-1.1.0.tar.bz2 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/F-8/sagator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sagator.spec 25 Jan 2008 19:31:39 -0000 1.1 +++ sagator.spec 10 Jul 2008 14:06:37 -0000 1.2 @@ -3,10 +3,11 @@ %define ARCHIVERS tar,arc,unace,unrar,rar,zoo,unarj,arj,unzip,zip,gzip,bzip2 %define ANTIVIRS clamav,clamav-libs,avglinux,nod32ls,nod32lfs,kav4mailservers-linux %define ANTISPAMS bogofilter,qsf +%define CLAMAV_VERSION 0.92 Summary: SAGATOR - antivir/antispam gateway for smtp server Name: sagator -Version: 1.0.0 +Version: 1.1.0 Release: 1%{?dist} Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 URL: http://www.salstar.sk/sagator/ @@ -15,24 +16,22 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2.2, ed, gettext +Obsoletes: sagator-libclamav <= 1.2.3 +Obsoletes: sagator-pydspam <= 0.9.1 Requires: python >= 2.2.2, sed %if %_vendor == "suse" -Requires: aaa_base, smtp_daemon -BuildRequires: aaa_base, python-xml +BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} +Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION} +%if 0%suse_version < 01030 +Requires: python-ctypes +%endif %else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts Requires: initscripts, smtpdaemon, shadow-utils -BuildRequires: initscripts, logwatch - -# SElinux policy for Fedoras and RHEL>=5 -%if 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: selinux-policy-devel -# SElinux directory and policy package -%define sedir %{_datadir}/%{name}/selinux -%define sepolicy %{sedir}/%{name}.pp -%endif +Requires: clamav-lib >= %{CLAMAV_VERSION} +BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} %endif @@ -67,6 +66,25 @@ SAGATOR's web quarantine access can be used to allow users (or admin) to access their emails in sagator's quarantine. +# SElinux policy for Fedoras and RHEL>=5 +%if 0%{?fedora} || 0%{?rhel} >= 5 +%package selinux +Summary: SELinux support for SAGATOR +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(postun): policycoreutils, selinux-policy +BuildRequires: selinux-policy-devel +# SElinux directory and policy package +%define install_sepolicy 1 +%define sepolicy %{_datadir}/%{name}/selinux/%{name}.pp + +%description selinux +This package helps moving to the upstream SELinux module. + +%else +%define install_sepolicy 0 +%endif + %prep %setup -q @@ -83,11 +101,6 @@ ln -s ../../../..%{_sysconfdir}/sagator.conf \ %{buildroot}%{_datadir}/%{name}/etc/sgconf.py mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine -# add SElinux policy -if [ -e %{buildroot}%{sepolicy} ]; then - echo "%dir %{sedir}" >> filelist - echo "%{sepolicy}" >> filelist -fi %find_lang %{name} %pre @@ -112,12 +125,6 @@ elif [ -x /sbin/insserv ]; then insserv sagator fi - # selinux - [ ! -x %{_sbindir}/semodule ] || [ ! -x %{_sbindir}/sestatus ] || - [ ! -x %{_sbindir}/selinuxenabled ] || ! %{_sbindir}/selinuxenabled || \ - [ ! -e %{sepolicy} ] || \ - %{_sbindir}/semodule -i %{sepolicy} \ - >/dev/null 2>/dev/null fi %preun @@ -132,6 +139,19 @@ fi fi +%if %{install_sepolicy} +%post selinux +if selinuxenabled; then + # Replace the module by the upstream one + #. /etc/selinux/config 2>/dev/null || : + semodule -i %{sepolicy} 2>/dev/null || : + # relabel files + fixfiles -R %{name} restore || : + # relabel chroot + restorecon -R %{CHROOTDIR} || : +fi +%endif + %triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot @@ -161,6 +181,10 @@ %exclude %{_datadir}/%{name}/etc/sgconf.py? %dir %{_datadir}/%{name}/av %{_datadir}/%{name}/av/*.py* +%dir %{_datadir}/%{name}/av/libclamav +%{_datadir}/%{name}/av//libclamav/*.py* +%dir %{_datadir}/%{name}/as/pydspam +%{_datadir}/%{name}/as//pydspam/*.py* %dir %{_datadir}/%{name}/as %{_datadir}/%{name}/as/*.py* %dir %{_datadir}/%{name}/interscan @@ -173,12 +197,24 @@ %attr(0770,vscan,vscan) %dir %{CHROOTDIR}/tmp/quarantine %files webq -f sagator.lang +%defattr(-,root,root) %dir %{_datadir}/%{name}/srv/web %{_datadir}/%{name}/srv/web/*.py* %{_datadir}/%{name}/srv/web/*.kid +%if %{install_sepolicy} +%files selinux +%defattr(-,root,root) +%{sepolicy} +%endif + %changelog -* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-1 +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 +- added libclamav module +- added pydspam module +- selinux module moved to separate subpackage + +* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0 - /var/spool/vscan replaced by CHROOTDIR macro - posttrans section moved to init script (start section) - more macros used Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Jan 2008 19:31:39 -0000 1.2 +++ sources 10 Jul 2008 14:06:37 -0000 1.3 @@ -1 +1 @@ -bf14d88d95645c41c489350bad74e1de sagator-1.0.0.tar.bz2 +a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 14:12:53 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Thu, 10 Jul 2008 14:12:53 GMT Subject: rpms/sagator/devel .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 sagator.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807101412.m6AECruc023054@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23024/devel Modified Files: .cvsignore import.log sagator.spec sources Log Message: SElinux fixes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Jul 2008 13:50:43 -0000 1.3 +++ .cvsignore 10 Jul 2008 14:12:07 -0000 1.4 @@ -1 +1 @@ -sagator-1.1.0.tar.bz2 +sagator-1.1.1-0.beta1.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sagator/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jul 2008 13:50:43 -0000 1.1 +++ import.log 10 Jul 2008 14:12:07 -0000 1.2 @@ -1 +1,2 @@ sagator-1_1_0-1_fc9:HEAD:sagator-1.1.0-1.fc9.src.rpm:1215697760 +sagator-1_1_1-0_beta1_fc9:HEAD:sagator-1.1.1-0.beta1.fc9.src.rpm:1215699108 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/devel/sagator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sagator.spec 10 Jul 2008 13:50:43 -0000 1.2 +++ sagator.spec 10 Jul 2008 14:12:07 -0000 1.3 @@ -7,9 +7,9 @@ Summary: SAGATOR - antivir/antispam gateway for smtp server Name: sagator -Version: 1.1.0 -Release: 1%{?dist} -Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 +Version: 1.1.1 +Release: 0.beta1%{?dist} +Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}-0.beta1.tar.bz2 URL: http://www.salstar.sk/sagator/ License: GPLv2+ Group: System Environment/Daemons @@ -209,7 +209,7 @@ %endif %changelog -* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.1-0.beta1 - added libclamav module - added pydspam module - selinux module moved to separate subpackage Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jul 2008 13:50:43 -0000 1.3 +++ sources 10 Jul 2008 14:12:07 -0000 1.4 @@ -1 +1 @@ -a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 +e26e2f7b126addf4ecc1c66a4e195a83 sagator-1.1.1-0.beta1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 14:43:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 14:43:24 GMT Subject: rpms/python/devel python-2.5.1-db47.patch, NONE, 1.1 python-2.5.1-listdir.patch, NONE, 1.1 python.spec, 1.132, 1.133 Message-ID: <200807101443.m6AEhO1M023889@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23844 Modified Files: python.spec Added Files: python-2.5.1-db47.patch python-2.5.1-listdir.patch Log Message: fix license tag, enable support for db4-4.7 (based on PLD patch) python-2.5.1-db47.patch: --- NEW FILE python-2.5.1-db47.patch --- diff -up Python-2.5.1/Modules/_bsddb.c.db46 Python-2.5.1/Modules/_bsddb.c --- Python-2.5.1/Modules/_bsddb.c.db46 2007-01-04 21:09:06.000000000 -0500 +++ Python-2.5.1/Modules/_bsddb.c 2008-07-10 09:58:55.000000000 -0400 @@ -5306,11 +5306,13 @@ static PyObject* DBEnv_getattr(DBEnvObject* self, char *name) { if (!strcmp(name, "db_home")) { + const char *home = NULL; CHECK_ENV_NOT_CLOSED(self); - if (self->db_env->db_home == NULL) { + self->db_env->get_home(self->db_env, &home); + if (home == NULL) { RETURN_NONE(); } - return PyString_FromString(self->db_env->db_home); + return PyString_FromString(home); } return Py_FindMethod(DBEnv_methods, (PyObject* )self, name); @@ -5932,22 +5934,37 @@ DL_EXPORT(void) init_bsddb(void) ADD_INT(d, DB_TIME_NOTGRANTED); ADD_INT(d, DB_TXN_NOT_DURABLE); ADD_INT(d, DB_TXN_WRITE_NOSYNC); - ADD_INT(d, DB_LOG_AUTOREMOVE); - ADD_INT(d, DB_DIRECT_LOG); ADD_INT(d, DB_DIRECT_DB); ADD_INT(d, DB_INIT_REP); ADD_INT(d, DB_ENCRYPT); ADD_INT(d, DB_CHKSUM); #endif +#if (DBVER >= 42) && (DBVER < 47) + ADD_INT(d, DB_LOG_AUTOREMOVE); + ADD_INT(d, DB_DIRECT_LOG); +#endif + +#if (DBVER >= 47) + ADD_INT(d, DB_LOG_DIRECT); + ADD_INT(d, DB_LOG_DSYNC); + ADD_INT(d, DB_LOG_IN_MEMORY); + ADD_INT(d, DB_LOG_AUTO_REMOVE); + ADD_INT(d, DB_LOG_ZERO); +#endif + #if (DBVER >= 43) - ADD_INT(d, DB_LOG_INMEMORY); ADD_INT(d, DB_BUFFER_SMALL); ADD_INT(d, DB_SEQ_DEC); ADD_INT(d, DB_SEQ_INC); ADD_INT(d, DB_SEQ_WRAP); #endif +#if (DBVER >= 43) && (DBVER < 47) + ADD_INT(d, DB_LOG_INMEMORY); + ADD_INT(d, DB_DSYNC_LOG); +#endif + #if (DBVER >= 41) ADD_INT(d, DB_ENCRYPT_AES); ADD_INT(d, DB_AUTO_COMMIT); diff -up Python-2.5.1/setup.py.db46 Python-2.5.1/setup.py --- Python-2.5.1/setup.py.db46 2008-07-10 09:55:08.000000000 -0400 +++ Python-2.5.1/setup.py 2008-07-10 09:55:08.000000000 -0400 @@ -606,9 +606,9 @@ class PyBuildExt(build_ext): # a release. Most open source OSes come with one or more # versions of BerkeleyDB already installed. - max_db_ver = (4, 5) + max_db_ver = (4, 7) min_db_ver = (3, 3) - db_setup_debug = False # verbose debug prints from this script? + db_setup_debug = True # verbose debug prints from this script? # construct a list of paths to look for the header file in on # top of the normal inc_dirs. @@ -623,7 +623,7 @@ class PyBuildExt(build_ext): '/sw/include/db3', ] # 4.x minor number specific paths - for x in (0,1,2,3,4,5): + for x in (0,1,2,3,4,5,6,7): db_inc_paths.append('/usr/include/db4%d' % x) db_inc_paths.append('/usr/include/db4.%d' % x) db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) @@ -646,7 +646,7 @@ class PyBuildExt(build_ext): for dn in inc_dirs: std_variants.append(os.path.join(dn, 'db3')) std_variants.append(os.path.join(dn, 'db4')) - for x in (0,1,2,3,4): + for x in (0,1,2,3,4,5,6,7): std_variants.append(os.path.join(dn, "db4%d"%x)) std_variants.append(os.path.join(dn, "db4.%d"%x)) for x in (2,3): python-2.5.1-listdir.patch: --- NEW FILE python-2.5.1-listdir.patch --- --- Python-2.5.1/Modules/posixmodule.c.orig 2007-04-04 14:30:56.000000000 -0400 +++ Python-2.5.1/Modules/posixmodule.c 2008-06-14 17:35:47.000000000 -0400 @@ -2160,7 +2160,6 @@ struct dirent *ep; int arg_is_unicode = 1; - errno = 0; if (!PyArg_ParseTuple(args, "U:listdir", &v)) { arg_is_unicode = 0; PyErr_Clear(); @@ -2176,6 +2175,7 @@ return NULL; } for (;;) { + errno = 0; Py_BEGIN_ALLOW_THREADS ep = readdir(dirp); Py_END_ALLOW_THREADS Index: python.spec =================================================================== RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- python.spec 8 Apr 2008 05:14:21 -0000 1.132 +++ python.spec 10 Jul 2008 14:42:32 -0000 1.133 @@ -20,8 +20,8 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: 2.5.1 -Release: 25%{?dist} -License: Python Software Foundation License v2 +Release: 27%{?dist} +License: Python Group: Development/Languages Provides: python-abi = %{pybasever} Provides: python(abi) = %{pybasever} @@ -42,13 +42,14 @@ Patch12: python-2.5.1-pysqlite.patch Patch13: python-2.5.1-socketmodule-constants.patch Patch14: python-2.5.1-socketmodule-constants2.patch +Patch15: python-2.5.1-listdir.patch # upstreamed Patch50: python-2.5-disable-egginfo.patch # new db version -Patch60: python-2.5.1-db46.patch +Patch60: python-2.5.1-db47.patch # lib64 patches Patch101: python-2.3.4-lib64-regex.patch @@ -196,7 +197,7 @@ # Try not disabling egg-infos, bz#414711 #patch50 -p1 -b .egginfo -%patch60 -p1 -b .db46 +%patch60 -p1 -b .db47 %if %{_lib} == lib64 %patch101 -p1 -b .lib64-regex @@ -209,6 +210,7 @@ %patch12 -p1 -b .pysqlite-2.3.3-minimal %patch13 -p1 -b .socketmodule %patch14 -p1 -b .socketmodule +%patch15 -p1 -b .socketmodule %ifarch alpha ia64 # 64bit, but not lib64 arches need this too... @@ -506,6 +508,14 @@ %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 2.5.1-27 +- fix license tag +- enable support for db4-4.7 + +* Sun Jun 15 2008 James Antill - 2.5.1-26 +- Fix sporadic listdir problem +- Resolves: bug#451494 + * Mon Apr 7 2008 James Antill - 2.5.1-25 - Rebuild to re-gen autoconf file due to glibc change. - Resolves: bug#441003 From fedora-extras-commits at redhat.com Thu Jul 10 14:47:50 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 14:47:50 GMT Subject: rpms/xfce4-datetime-plugin/F-8 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 xfce4-datetime-plugin.spec, 1.17, 1.18 Message-ID: <200807101447.m6AElox9024147@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24064 Modified Files: .cvsignore sources xfce4-datetime-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 - Update to 0.6.0 - BuildRequire intltool - No longer BuildRequire dbus-devel (requirement dropped upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Feb 2007 21:12:15 -0000 1.5 +++ .cvsignore 10 Jul 2008 14:47:00 -0000 1.6 @@ -1 +1 @@ -xfce4-datetime-plugin-0.5.0.tar.gz +xfce4-datetime-plugin-0.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Feb 2007 21:12:15 -0000 1.6 +++ sources 10 Jul 2008 14:47:00 -0000 1.7 @@ -1 +1 @@ -0aa1c85861a0ab8fc7f2d502c94de289 xfce4-datetime-plugin-0.5.0.tar.gz +0d047a21cbf173451a86a48f79b45ddd xfce4-datetime-plugin-0.6.0.tar.bz2 Index: xfce4-datetime-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8/xfce4-datetime-plugin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xfce4-datetime-plugin.spec 24 Aug 2007 22:35:59 -0000 1.17 +++ xfce4-datetime-plugin.spec 10 Jul 2008 14:47:00 -0000 1.18 @@ -1,18 +1,18 @@ Name: xfce4-datetime-plugin -Version: 0.5.0 -Release: 3%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Date/time plugin for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.5.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.99.2, libxfcegui4-devel >= 4.3.99.2, libxml2-devel -BuildRequires: gettext, perl(XML::Parser), dbus-devel >= 0.22 -Requires: xfce4-panel >= 4.3.99.2 +BuildRequires: intltool, perl(XML::Parser), dbus-devel >= 0.22 +Requires: xfce4-panel >= 4.4.0 %description An alternative clock plugin for the Xfce panel. A calendar appears when you @@ -42,6 +42,14 @@ %{_libdir}/xfce4/panel-plugins/*.desktop %changelog +* Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 +- Update to 0.6.0 +- BuildRequire intltool +- No longer BuildRequire dbus-devel (requirement dropped upstream) + +* Mon Feb 18 2008 Fedora Release Engineering - 0.5.0-4 +- Autorebuild for GCC 4.3 + * Sat Aug 25 2007 Christoph Wickert - 0.5.0-3 - Rebuild for BuildID feature - Update license tag From fedora-extras-commits at redhat.com Thu Jul 10 14:48:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 14:48:15 GMT Subject: rpms/pam_ccreds/devel pam_ccreds.spec,1.24,1.25 Message-ID: <200807101448.m6AEmFo0024155@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/pam_ccreds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24107 Modified Files: pam_ccreds.spec Log Message: rebuild against db4-4.7 Index: pam_ccreds.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_ccreds/devel/pam_ccreds.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pam_ccreds.spec 20 Feb 2008 05:37:04 -0000 1.24 +++ pam_ccreds.spec 10 Jul 2008 14:47:30 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Pam module to cache login credentials Name: pam_ccreds Version: 7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: System Environment/Base URL: http://www.padl.com/OSS/pam_ccreds.html @@ -54,6 +54,9 @@ %{_sbindir}/cc_dump %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 7-3 +- rebuild against db4-4.7 + * Wed Feb 20 2008 Fedora Release Engineering - 7-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 14:54:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 14:54:37 GMT Subject: rpms/redland/devel redland.spec,1.10,1.11 Message-ID: <200807101454.m6AEsbFv024567@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/redland/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24519 Modified Files: redland.spec Log Message: rebuild against db4-4.7 Index: redland.spec =================================================================== RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- redland.spec 9 Feb 2008 03:42:45 -0000 1.10 +++ redland.spec 10 Jul 2008 14:53:41 -0000 1.11 @@ -1,6 +1,6 @@ Name: redland Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Redland RDF Application Framework Group: System Environment/Libraries @@ -101,6 +101,9 @@ %postun -p /sbin/ldconfig %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 1.0.7-2 +- rebuild for db4-4.7 + * Sat Feb 09 2008 Kevin Kofler 1.0.7-1 - update to 1.0.7 - update minimum raptor and rasqal versions From fedora-extras-commits at redhat.com Thu Jul 10 15:02:57 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 15:02:57 GMT Subject: rpms/xfce4-datetime-plugin/F-8 xfce4-datetime-plugin.spec, 1.18, 1.19 Message-ID: <200807101502.m6AF2vc2031426@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31348 Modified Files: xfce4-datetime-plugin.spec Log Message: * Thu Jul 10 2008 Christoph Wickert - 0.6.0-1.fc8.1 - Bump release for F-8 Index: xfce4-datetime-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8/xfce4-datetime-plugin.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xfce4-datetime-plugin.spec 10 Jul 2008 14:47:00 -0000 1.18 +++ xfce4-datetime-plugin.spec 10 Jul 2008 15:01:58 -0000 1.19 @@ -1,6 +1,6 @@ Name: xfce4-datetime-plugin Version: 0.6.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Date/time plugin for the Xfce panel Group: User Interface/Desktops @@ -42,6 +42,9 @@ %{_libdir}/xfce4/panel-plugins/*.desktop %changelog +* Thu Jul 10 2008 Christoph Wickert - 0.6.0-1.fc8.1 +- Bump release for F-8 + * Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 - Update to 0.6.0 - BuildRequire intltool From fedora-extras-commits at redhat.com Thu Jul 10 15:15:19 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 15:15:19 GMT Subject: rpms/nagios/devel nagios.cfg.patch, NONE, 1.1 nagios.htpasswd, NONE, 1.1 nagios.internet.cfg, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <200807101515.m6AFFJmj032112@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31986 Modified Files: .cvsignore sources Added Files: nagios.cfg.patch nagios.htpasswd nagios.internet.cfg Log Message: :Upstream released 3.0.3 nagios.cfg.patch: --- NEW FILE nagios.cfg.patch --- --- sample-config/nagios.cfg.in-orig 2008-07-01 22:19:08.000000000 +0200 +++ sample-config/nagios.cfg.in 2008-07-01 22:20:24.000000000 +0200 @@ -54,6 +54,10 @@ #cfg_dir=@sysconfdir@/switches #cfg_dir=@sysconfdir@/routers +#Included by Robert M. Albrecht for Fedora +cfg_dir=@sysconfdir@/conf.d + + --- NEW FILE nagios.htpasswd --- nagiosadmin:RbdO4ou4PNyMg --- NEW FILE nagios.internet.cfg --- ############################################################################## # internet.cfg - sample config file for Fedoras Nagios # # 2008-07-03 created Robert M. Albrecht # # NOTES: This config file is a sample for monitoring some internet hosts. # ############################################################################### define host{ name template-internet-host use generic-host register 0 max_check_attempts 5 contacts nagiosadmin parents localhost } define host{ use template-internet-host host_name Google address www.google.com notes Googles Website defined by sample config notes_url http://www.google.com action_url http://en.wikipedia.org/wiki/Google } define hostgroup{ hostgroup_name InternetHosts alias Internet Hosts members Google } define service{ use generic-service hostgroup_name InternetHosts service_description PING check_command check_ping!200.0,20%!600.0,60% } define service{ use generic-service hostgroup_name InternetHosts service_description HTTP check_command check_http } define servicegroup{ servicegroup_name WebSites alias Internet Hosts members Google,PING,Google,HTTP } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 May 2008 21:04:38 -0000 1.14 +++ .cvsignore 10 Jul 2008 15:14:09 -0000 1.15 @@ -1 +1 @@ -nagios-2.12.tar.gz +nagios-3.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 23 May 2008 21:04:38 -0000 1.15 +++ sources 10 Jul 2008 15:14:09 -0000 1.16 @@ -1 +1 @@ -2219d90bb5f2282d5ac6d37ef60865b8 nagios-2.12.tar.gz +151df7bf19b696f7498410fb76fb7caf nagios-3.0.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 15:20:25 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 15:20:25 GMT Subject: rpms/nagios/devel nagios.spec,1.49,1.50 Message-ID: <200807101520.m6AFKP8Z032462@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32388 Modified Files: nagios.spec Log Message: Updates spec to nagios3 Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- nagios.spec 26 May 2008 18:32:40 -0000 1.49 +++ nagios.spec 10 Jul 2008 15:19:32 -0000 1.50 @@ -1,21 +1,23 @@ - Name: nagios -Version: 2.12 -Release: 3%{?dist} +Version: 3.0.3 +Release: 4%{?dist} Summary: Host/service/network monitoring program Group: Applications/System License: GPLv2+ URL: http://www.nagios.org/ -Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess +Source3: nagios.internet.cfg +Source4: nagios.htpasswd Patch0: nagios-initrd.patch +Patch1: nagios.cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel -%if 0%{?fedora} > 7 +%if "%{?fedora}" > "7" BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) %endif @@ -149,7 +151,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/html %doc %{_datadir}/%{name}/html/docs -%doc Changelog INSTALLING LICENSE README UPGRADING +%doc Changelog INSTALLING LICENSE README UPGRADING %{_datadir}/%{name}/html/[^d]* %{_sbindir}/* %{_bindir}/* @@ -158,19 +160,44 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*cfg - +%config(noreplace) %{_sysconfdir}/%{name}/objects/*cfg %attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private +%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/objects %attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg +%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/conf.d/internet.cfg +%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/.htpasswd %attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives +%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/ +%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/checkresults %files devel %defattr(-,root,root) %{_includedir}/%{name} %changelog +* Wed Jul 02 2008 Robert M. Albrecht 3.0.3-4 +- renamed preconfigured passwd to .htpasswd to enable Apaches .ht* protection +- added default .htpasswd with user nagiosadmin password nagiosadmin + +* Tue Jul 01 2008 Robert M. Albrecht 3.0.3-3 +- Added Apache style conf.d +- Added a working example config named internet.cfg +- The object folder was created twice + +* Tue Jul 01 2008 Robert M. Albrecht 3.0.3-2 +- Fixed folder /var/log/nagios/spool/checkresults +- silenced rpmlint (tabs, spaces) +- silenced rpmlint (configure missing libdir) + +* Sun Jun 29 2008 Robert M. Albrecht 3.0.3-1 +- Upstream released 3.0.3 + +* Sun Jun 22 2008 Robert M. Albrecht 3.0.2-1 +- Upstream released 3.0.2 + * Mon May 26 2008 Shawn Starr 2.12-3 - Fix spec seems to break for Fedora 10+ From fedora-extras-commits at redhat.com Thu Jul 10 15:28:17 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 15:28:17 GMT Subject: rpms/xfce4-datetime-plugin/F-8 xfce4-datetime-plugin.spec, 1.19, 1.20 Message-ID: <200807101528.m6AFSHgW000375@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv325 Modified Files: xfce4-datetime-plugin.spec Log Message: * Thu Jul 10 2008 Christoph Wickert - 0.6.0-1.fc8.1 - BuildRequire gettext on F-8 Index: xfce4-datetime-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/F-8/xfce4-datetime-plugin.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xfce4-datetime-plugin.spec 10 Jul 2008 15:01:58 -0000 1.19 +++ xfce4-datetime-plugin.spec 10 Jul 2008 15:27:28 -0000 1.20 @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.99.2, libxfcegui4-devel >= 4.3.99.2, libxml2-devel -BuildRequires: intltool, perl(XML::Parser), dbus-devel >= 0.22 +BuildRequires: intltool, gettext, perl(XML::Parser), dbus-devel >= 0.22 Requires: xfce4-panel >= 4.4.0 %description @@ -43,7 +43,7 @@ %changelog * Thu Jul 10 2008 Christoph Wickert - 0.6.0-1.fc8.1 -- Bump release for F-8 +- BuildRequire gettext on F-8 * Thu Jul 03 2008 Christoph Wickert - 0.6.0-1 - Update to 0.6.0 From fedora-extras-commits at redhat.com Thu Jul 10 15:29:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 15:29:40 GMT Subject: rpms/sendmail/devel sendmail.spec,1.92,1.93 Message-ID: <200807101529.m6AFTemF000487@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/sendmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv394 Modified Files: sendmail.spec Log Message: rebuild against db4-4.7 Index: sendmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- sendmail.spec 29 Mar 2008 12:02:32 -0000 1.92 +++ sendmail.spec 10 Jul 2008 15:28:30 -0000 1.93 @@ -15,7 +15,7 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail Version: 8.14.2 -Release: 4%{?dist} +Release: 5%{?dist} License: Sendmail Group: System Environment/Daemons URL: http://www.sendmail.org/ @@ -539,6 +539,9 @@ %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 8.14.2-5 +- rebuild against db4-4.7 + * Sat Mar 29 2008 Dennis Gilmore 8.14.2-4 - add sparcv9 to the -fPIE list From fedora-extras-commits at redhat.com Thu Jul 10 15:29:40 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 10 Jul 2008 15:29:40 GMT Subject: rpms/selinux-policy/devel policy-20080509.patch, 1.34, 1.35 selinux-policy.spec, 1.683, 1.684 Message-ID: <200807101529.m6AFTeI6000489@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv390 Modified Files: policy-20080509.patch selinux-policy.spec Log Message: * Wed Jul 9 2008 Dan Walsh 3.4.2-14 - Add inotify support to nscd policy-20080509.patch: Index: policy-20080509.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080509.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- policy-20080509.patch 9 Jul 2008 13:05:54 -0000 1.34 +++ policy-20080509.patch 10 Jul 2008 15:28:32 -0000 1.35 @@ -11797,7 +11797,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.4.2/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.4.2/policy/modules/services/bluetooth.te 2008-07-02 08:47:04.000000000 -0400 ++++ serefpolicy-3.4.2/policy/modules/services/bluetooth.te 2008-07-09 15:25:46.000000000 -0400 @@ -32,19 +32,22 @@ type bluetooth_var_run_t; files_pid_file(bluetooth_var_run_t) @@ -11840,12 +11840,14 @@ libs_use_ld_so(bluetooth_t) libs_use_shared_libs(bluetooth_t) -@@ -118,20 +124,18 @@ +@@ -117,21 +123,20 @@ + miscfiles_read_localization(bluetooth_t) miscfiles_read_fonts(bluetooth_t) - --sysnet_read_config(bluetooth_t) - +-sysnet_read_config(bluetooth_t) ++miscfiles_read_hwdata(bluetooth_t) + userdom_dontaudit_use_unpriv_user_fds(bluetooth_t) - sysadm_dontaudit_use_ptys(bluetooth_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.683 retrieving revision 1.684 diff -u -r1.683 -r1.684 --- selinux-policy.spec 9 Jul 2008 13:05:54 -0000 1.683 +++ selinux-policy.spec 10 Jul 2008 15:28:32 -0000 1.684 @@ -278,7 +278,7 @@ %post targeted if [ $1 -eq 1 ]; then %loadpolicy targeted -bnsemanage user -a -S targeted -P user -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u +semanage user -a -S targeted -P user -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u semanage login -m -S targeted -s "unconfined_u" -r s0-s0:c0.c1023 __default__ semanage login -m -S targeted -s "unconfined_u" -r s0-s0:c0.c1023 root semanage user -a -S targeted -P user -R guest_r guest_u @@ -296,11 +296,11 @@ . /etc/selinux/config [ "${SELINUXTYPE}" != "targeted" ] && exit 0 setsebool -P use_nfs_home_dirs=1 -semanage user -l | grep -s unconfined_u +semanage user -l | grep -s unconfined_u > /dev/null if [ $? -eq 0 ]; then - semanage user -m -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u 2> /dev/null + semanage user -m -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u else - semanage user -a -P user -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u 2> /dev/null + semanage user -a -P user -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u fi seuser=`semanage login -l | grep __default__ | awk '{ print $2 }'` [ "$seuser" != "unconfined_u" ] && semanage login -m -s "unconfined_u" -r s0-s0:c0.c1023 __default__ From fedora-extras-commits at redhat.com Thu Jul 10 15:40:53 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Thu, 10 Jul 2008 15:40:53 GMT Subject: rpms/sqlite/F-9 sqlite-3.5.8-pkgconfig-version.patch, NONE, 1.1 sources, 1.18, 1.19 sqlite.spec, 1.38, 1.39 Message-ID: <200807101540.m6AFerX3001104@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/sqlite/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1006 Modified Files: sources sqlite.spec Added Files: sqlite-3.5.8-pkgconfig-version.patch Log Message: Sync up F-9 version with devel at caillon's request sqlite-3.5.8-pkgconfig-version.patch: --- NEW FILE sqlite-3.5.8-pkgconfig-version.patch --- diff -up sqlite-3.5.8/sqlite3.pc.in.release sqlite-3.5.8/sqlite3.pc.in --- sqlite-3.5.8/sqlite3.pc.in.release 2008-04-23 09:11:38.000000000 +0300 +++ sqlite-3.5.8/sqlite3.pc.in 2008-04-23 09:11:48.000000000 +0300 @@ -7,7 +7,7 @@ includedir=@includedir@ Name: SQLite Description: SQL database engine -Version: @VERSION@ +Version: @RELEASE@ Libs: -L${libdir} -lsqlite3 Libs.private: @LIBS@ Cflags: -I${includedir} Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sqlite/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 12 Feb 2008 19:09:06 -0000 1.18 +++ sources 10 Jul 2008 15:39:22 -0000 1.19 @@ -1 +1 @@ -903c9e935c538af392364a9172a3d98d sqlite-3.5.6.tar.gz +b58412904b42fe49e5a281e99da0fd72 sqlite-3.5.9.tar.gz Index: sqlite.spec =================================================================== RCS file: /cvs/pkgs/rpms/sqlite/F-9/sqlite.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sqlite.spec 31 Mar 2008 12:22:41 -0000 1.38 +++ sqlite.spec 10 Jul 2008 15:39:22 -0000 1.39 @@ -5,12 +5,13 @@ Summary: Library that implements an embeddable SQL database engine Name: sqlite -Version: 3.5.6 -Release: 2%{?dist} +Version: 3.5.9 +Release: 1%{?dist} License: Public Domain Group: Applications/Databases URL: http://www.sqlite.org/ Source: http://www.sqlite.org/sqlite-%{version}.tar.gz +Patch1: sqlite-3.5.8-pkgconfig-version.patch Obsoletes: sqlite3 sqlite3-devel BuildRequires: ncurses-devel readline-devel glibc-devel BuildRequires: /usr/bin/tclsh @@ -50,12 +51,14 @@ %prep %setup -q +%patch1 -p1 -b .pkgconf %build export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall" %configure %{!?with_tcl:--disable-tcl} \ --enable-threadsafe \ - --enable-threads-override-locks + --enable-threads-override-locks + make %{?_smp_mflags} make doc @@ -106,6 +109,13 @@ %endif %changelog +* Tue Jun 17 2008 Stepan Kasal - 3.5.9-1 +- update to 3.5.9 + +* Wed Apr 23 2008 Panu Matilainen - 3.5.8-1 +- update to 3.5.8 +- provide full version in pkg-config (#443692) + * Mon Mar 31 2008 Panu Matilainen - 3.5.6-2 - remove reference to static libs from -devel description (#439376) From fedora-extras-commits at redhat.com Thu Jul 10 15:42:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 15:42:11 GMT Subject: rpms/iproute/devel iproute.spec,1.84,1.85 Message-ID: <200807101542.m6AFgBc5001269@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/iproute/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1142 Modified Files: iproute.spec Log Message: rebuild against db4-4.7 Index: iproute.spec =================================================================== RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- iproute.spec 4 Jul 2008 12:44:07 -0000 1.84 +++ iproute.spec 10 Jul 2008 15:41:21 -0000 1.85 @@ -4,7 +4,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 2.6.25 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 #Source1: iproute-doc-2.6.22.tar.gz @@ -114,6 +114,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/cbq/* %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 2.6.25-4 +- rebuild for new db4-4.7 + * Thu Jul 3 2008 Marcela Maslanova - 2.6.25-3 - 449933 fix segfault after non-existent combination of commands From fedora-extras-commits at redhat.com Thu Jul 10 15:45:01 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 10 Jul 2008 15:45:01 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.856, 1.857 kernel.spec, 1.748, 1.749 sources, 1.817, 1.818 upstream, 1.735, 1.736 patch-2.6.26-rc9-git5.bz2.sign, 1.1, NONE Message-ID: <200807101545.m6AFj1S5001520@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1453 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git6.bz2.sign Removed Files: patch-2.6.26-rc9-git5.bz2.sign Log Message: 2.6.26-rc9-git6 --- NEW FILE patch-2.6.26-rc9-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIdbt6yGugalF9Dw4RAlHfAJ9XXxi80/t9l3lKOy0L/HEYbqEEnACfVzcR zzIsrkv9WYQVXvgC/Vl7DVE= =RDR6 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.856 retrieving revision 1.857 diff -u -r1.856 -r1.857 --- .cvsignore 9 Jul 2008 16:22:18 -0000 1.856 +++ .cvsignore 10 Jul 2008 15:44:13 -0000 1.857 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git5.bz2 +patch-2.6.26-rc9-git6.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.748 retrieving revision 1.749 diff -u -r1.748 -r1.749 --- kernel.spec 10 Jul 2008 00:07:31 -0000 1.748 +++ kernel.spec 10 Jul 2008 15:44:13 -0000 1.749 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 10 2008 Dave Jones +- 2.6.26-rc9-git6 + * Wed Jul 09 2008 Chuck Ebbert - Enable the i2c-tiny-usb driver. (#451451) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.817 retrieving revision 1.818 diff -u -r1.817 -r1.818 --- sources 9 Jul 2008 16:22:18 -0000 1.817 +++ sources 10 Jul 2008 15:44:13 -0000 1.818 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -5789b65d1947398bf048e2e2049a3634 patch-2.6.26-rc9-git5.bz2 +2250c2d2e827f0e8ab2460283d7b9f38 patch-2.6.26-rc9-git6.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.735 retrieving revision 1.736 diff -u -r1.735 -r1.736 --- upstream 9 Jul 2008 16:22:18 -0000 1.735 +++ upstream 10 Jul 2008 15:44:13 -0000 1.736 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git5.bz2 +patch-2.6.26-rc9-git6.bz2 --- patch-2.6.26-rc9-git5.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 15:48:38 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 15:48:38 GMT Subject: rpms/system-config-printer/devel system-config-printer-1.0.4.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.178, 1.179 sources, 1.184, 1.185 system-config-printer.spec, 1.203, 1.204 system-config-printer-1.0.3.tar.bz2.sig, 1.1, NONE Message-ID: <200807101548.m6AFmci3001768@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1726 Modified Files: .cvsignore sources system-config-printer.spec Added Files: system-config-printer-1.0.4.tar.bz2.sig Removed Files: system-config-printer-1.0.3.tar.bz2.sig Log Message: * Thu Jul 10 2008 Tim Waugh 1.0.4-1 - 1.0.4. --- NEW FILE system-config-printer-1.0.4.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- .cvsignore 30 Jun 2008 15:58:56 -0000 1.178 +++ .cvsignore 10 Jul 2008 15:47:52 -0000 1.179 @@ -175,3 +175,4 @@ pysmbc-1.0.4.tar.bz2 pycups-1.9.40.tar.bz2 system-config-printer-1.0.3.tar.bz2 +system-config-printer-1.0.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- sources 30 Jun 2008 15:58:56 -0000 1.184 +++ sources 10 Jul 2008 15:47:52 -0000 1.185 @@ -1,3 +1,3 @@ 41bc000026ea8d01f684705a99ac01d5 pysmbc-1.0.4.tar.bz2 ea0a35e578c0f4acff75e30ecbe704cb pycups-1.9.40.tar.bz2 -b28de1fbea0d61dea9ce5c9925821e16 system-config-printer-1.0.3.tar.bz2 +5f63211606efd0913b14dfaf4de9403d system-config-printer-1.0.4.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- system-config-printer.spec 8 Jul 2008 14:59:17 -0000 1.203 +++ system-config-printer.spec 10 Jul 2008 15:47:52 -0000 1.204 @@ -6,8 +6,8 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.0.4 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -154,6 +154,9 @@ exit 0 %changelog +* Thu Jul 10 2008 Tim Waugh 1.0.4-1 +- 1.0.4. + * Tue Jul 8 2008 Tim Waugh 1.0.3-2 - Better debugging for pysmbc. --- system-config-printer-1.0.3.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 15:50:13 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 15:50:13 GMT Subject: rpms/nagios/devel nagios.spec,1.50,1.51 Message-ID: <200807101550.m6AFoDMU001940@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1783 Modified Files: nagios.spec Log Message: Killed support for Fedora earlier than 7. Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- nagios.spec 10 Jul 2008 15:19:32 -0000 1.50 +++ nagios.spec 10 Jul 2008 15:49:17 -0000 1.51 @@ -17,10 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel -%if "%{?fedora}" > "7" BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) -%endif Requires: httpd Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -178,6 +176,9 @@ %{_includedir}/%{name} %changelog +* Tue Jul 10 2008 Robert M. Albrecht 3.0.3-5 +- Killed BuildRequirements for unsupported Fedora releases + * Wed Jul 02 2008 Robert M. Albrecht 3.0.3-4 - renamed preconfigured passwd to .htpasswd to enable Apaches .ht* protection - added default .htpasswd with user nagiosadmin password nagiosadmin From fedora-extras-commits at redhat.com Thu Jul 10 15:50:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Thu, 10 Jul 2008 15:50:41 GMT Subject: rpms/ltsp/F-9 .cvsignore, 1.10, 1.11 ltsp.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200807101550.m6AFofgY002013@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1902 Modified Files: .cvsignore ltsp.spec sources Log Message: - LDM_DIRECTX=yes unencrypted X by default in lts.conf This is for performance and scalability. Turn it off if you want security. - Fix chroot install that was broken by livecd-tools update - own /var/lib/ltsp to silence tmpwatch selinux errors Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Jun 2008 20:36:03 -0000 1.10 +++ .cvsignore 10 Jul 2008 15:49:58 -0000 1.11 @@ -1 +1 @@ -ltsp-5.1.9.tar.bz2 +ltsp-5.1.11.tar.bz2 Index: ltsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ltsp.spec 6 Jul 2008 19:35:16 -0000 1.17 +++ ltsp.spec 10 Jul 2008 15:49:58 -0000 1.18 @@ -1,6 +1,6 @@ Name: ltsp -Version: 5.1.9 -#%define _datestamp .20080417.10 +Version: 5.1.11 +#%define _datestamp .20080707.13 #Release: 1%{_datestamp}%{?dist} Release: 1%{?dist} Summary: Linux Terminal Server Project Server and Client @@ -314,7 +314,10 @@ %endif %changelog -* Fri Jun 13 2008 Warren Togami +* Thu Jul 10 2008 Warren Togami - 5.1.11-1 +- LDM_DIRECTX=yes unencrypted X by default in lts.conf + This is for performance and scalability. Turn it off if you want security. +- Fix chroot install that was broken by livecd-tools update - own /var/lib/ltsp to silence tmpwatch selinux errors * Fri Jun 06 2008 Warren Togami - 5.1.9-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 6 Jun 2008 20:36:03 -0000 1.14 +++ sources 10 Jul 2008 15:49:58 -0000 1.15 @@ -1 +1 @@ -2b135dad8ee058df9b972ce277127081 ltsp-5.1.9.tar.bz2 +0d4f4a0bede9dddeceb979c65617f0e9 ltsp-5.1.11.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 15:52:14 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 15:52:14 GMT Subject: rpms/nagios/devel nagios.spec,1.51,1.52 Message-ID: <200807101552.m6AFqEM4002150@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2063 Modified Files: nagios.spec Log Message: Updated the missing release tag. Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- nagios.spec 10 Jul 2008 15:49:17 -0000 1.51 +++ nagios.spec 10 Jul 2008 15:51:09 -0000 1.52 @@ -1,7 +1,7 @@ Name: nagios Version: 3.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Host/service/network monitoring program Group: Applications/System From fedora-extras-commits at redhat.com Thu Jul 10 15:52:31 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 15:52:31 GMT Subject: rpms/xfce4-genmon-plugin/F-8 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xfce4-genmon-plugin.spec, 1.13, 1.14 Message-ID: <200807101552.m6AFqV1C002166@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-genmon-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2107 Modified Files: .cvsignore sources xfce4-genmon-plugin.spec Log Message: * Wed Mar 19 2008 Christoph Wickert - 3.2-1 - Update to 0.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-genmon-plugin/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Feb 2007 21:33:37 -0000 1.5 +++ .cvsignore 10 Jul 2008 15:51:33 -0000 1.6 @@ -1 +1 @@ -xfce4-genmon-plugin-3.1.tar.bz2 +xfce4-genmon-plugin-3.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-genmon-plugin/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Feb 2007 21:33:37 -0000 1.5 +++ sources 10 Jul 2008 15:51:33 -0000 1.6 @@ -1 +1 @@ -b9d44aaf1d2d3da7e2cceb80fb486f4b xfce4-genmon-plugin-3.1.tar.bz2 +5f292aa102a87d45207b6a373939a35d xfce4-genmon-plugin-3.2.tar.bz2 Index: xfce4-genmon-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-genmon-plugin/F-8/xfce4-genmon-plugin.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xfce4-genmon-plugin.spec 25 Aug 2007 00:04:40 -0000 1.13 +++ xfce4-genmon-plugin.spec 10 Jul 2008 15:51:33 -0000 1.14 @@ -1,6 +1,6 @@ Name: xfce4-genmon-plugin -Version: 3.1 -Release: 3%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: Generic monitor plugin for the Xfce panel Group: User Interface/Desktops @@ -39,6 +39,12 @@ %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Wed Mar 19 2008 Christoph Wickert - 3.2-1 +- Update to 0.3.2. + +* Mon Feb 18 2008 Fedora Release Engineering - 3.1-4 +- Autorebuild for GCC 4.3 + * Fri Aug 24 2007 Christoph Wickert - 3.1-3 - Rebuild for BuildID feature - Update license tag From fedora-extras-commits at redhat.com Thu Jul 10 15:54:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 15:54:49 GMT Subject: rpms/bogofilter/devel bogofilter.spec,1.8,1.9 Message-ID: <200807101554.m6AFsn0T002391@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2310 Modified Files: bogofilter.spec Log Message: rebuild against db4-4.7, fix minor spec errors Index: bogofilter.spec =================================================================== RCS file: /cvs/pkgs/rpms/bogofilter/devel/bogofilter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bogofilter.spec 31 May 2008 19:18:54 -0000 1.8 +++ bogofilter.spec 10 Jul 2008 15:53:53 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Fast anti-spam filtering by Bayesian statistical analysis Name: bogofilter Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet URL: http://bogofilter.sourceforge.net/ @@ -41,12 +41,12 @@ doc/bogofilter-faq-fr.html %build -%configure +%configure --disable-rpath %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} DESTDIR=%{buildroot} install %{__mv} -f %{buildroot}%{_sysconfdir}/bogofilter.cf.example \ %{buildroot}%{_sysconfdir}/bogofilter.cf @@ -79,6 +79,11 @@ %exclude %{_mandir}/man1/bogoupgrade* %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 1.1.7-2 +- rebuild against db4-4.7 +- use make DESTDIR install +- disable rpaths + * Sat May 31 2008 Adrian Reber - 1.1.7-1 - updated to 1.1.7 - moved bogoupgrade to its own package to remove the perl From fedora-extras-commits at redhat.com Thu Jul 10 15:55:02 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 15:55:02 GMT Subject: rpms/system-config-printer/devel pycups-requested_attributes.patch, NONE, 1.1 system-config-printer.spec, 1.205, 1.206 Message-ID: <200807101555.m6AFt2Dm002449@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2330 Modified Files: system-config-printer.spec Added Files: pycups-requested_attributes.patch Log Message: - Applied upstream patch for pycups to fix getPrinterAttributes when requested_attributes is specified. pycups-requested_attributes.patch: --- NEW FILE pycups-requested_attributes.patch --- diff -U0 pycups-1.9.40/ChangeLog.requested_attributes pycups-1.9.40/ChangeLog --- pycups-1.9.40/ChangeLog.requested_attributes 2008-06-20 17:58:49.000000000 +0100 +++ pycups-1.9.40/ChangeLog 2008-07-10 16:52:05.000000000 +0100 @@ -0,0 +1,5 @@ +2008-07-09 Tim Waugh + + * cupsconnection.c (Connection_getPrinterAttributes): Fixed + requested_attributes parameter. + diff -up pycups-1.9.40/cupsconnection.c.requested_attributes pycups-1.9.40/cupsconnection.c --- pycups-1.9.40/cupsconnection.c.requested_attributes 2008-06-20 10:36:50.000000000 +0100 +++ pycups-1.9.40/cupsconnection.c 2008-07-10 16:52:05.000000000 +0100 @@ -2240,6 +2240,7 @@ Connection_getPrinterAttributes (Connect char *uri; PyObject *requested_attrs = NULL; char **attrs = NULL; /* initialised to calm compiler */ + size_t n_attrs; ipp_t *request, *answer; ipp_attribute_t *attr; char consuri[HTTP_MAX_URI]; @@ -2269,16 +2270,16 @@ Connection_getPrinterAttributes (Connect } if (requested_attrs) { - int i, n; + int i; if (!PyList_Check (requested_attrs)) { PyErr_SetString (PyExc_TypeError, "List required"); return NULL; } - n = PyList_Size (requested_attrs); - attrs = malloc ((n + 1) * sizeof (char *)); - for (i = 0; i < n; i++) { + n_attrs = PyList_Size (requested_attrs); + attrs = malloc ((n_attrs + 1) * sizeof (char *)); + for (i = 0; i < n_attrs; i++) { PyObject *val = PyList_GetItem (requested_attrs, i); // borrowed ref if (!PyString_Check (val)) { PyErr_SetString (PyExc_TypeError, "String required"); @@ -2294,7 +2295,7 @@ Connection_getPrinterAttributes (Connect attrs[i] = strdup (PyString_AsString (val)); } - attrs[n] = NULL; + attrs[n_attrs] = NULL; } debugprintf ("-> Connection_getPrinterAttributes(%s)\n", @@ -2318,8 +2319,7 @@ Connection_getPrinterAttributes (Connect "printer-uri", NULL, uri); if (requested_attrs) ippAddStrings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", - sizeof (attrs) / sizeof (attrs[0]), NULL, + "requested-attributes", n_attrs, NULL, (const char **) attrs); debugprintf ("trying request with uri %s\n", uri); answer = cupsDoRequest (self->http, request, "/"); Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- system-config-printer.spec 10 Jul 2008 15:50:39 -0000 1.205 +++ system-config-printer.spec 10 Jul 2008 15:54:11 -0000 1.206 @@ -15,6 +15,7 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 +Patch0: pycups-requested_attributes.patch Patch1: pysmbc-debug.patch BuildRequires: cups-devel >= 1.2 @@ -63,6 +64,10 @@ %prep %setup -q -a 1 -a 2 +pushd pycups-%{pycups_version} +%patch0 -p1 -b .requested_attributes +popd + pushd pysmbc-%{pysmbc_version} %patch1 -p1 -b .debug popd @@ -154,6 +159,8 @@ %changelog * Thu Jul 10 2008 Tim Waugh 1.0.4-1 - 1.0.4. +- Applied upstream patch for pycups to fix getPrinterAttributes when + requested_attributes is specified. * Tue Jul 8 2008 Tim Waugh 1.0.3-2 - Better debugging for pysmbc. From fedora-extras-commits at redhat.com Thu Jul 10 16:01:14 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 10 Jul 2008 16:01:14 GMT Subject: rpms/gdm/devel lang-tag.patch,NONE,1.1 gdm.spec,1.394,1.395 Message-ID: <200807101601.m6AG1EF3009350@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2738 Modified Files: gdm.spec Added Files: lang-tag.patch Log Message: improve rendering of languages lang-tag.patch: --- NEW FILE lang-tag.patch --- diff -up gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c.lang-tag gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c --- gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c.lang-tag 2008-07-10 01:10:23.000000000 -0400 +++ gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c 2008-07-10 01:10:28.000000000 -0400 @@ -103,24 +103,30 @@ gdm_language_chooser_widget_add_language char *language; char *normalized_name; char *readable_language; + char *lang_tag; + char *tagged; normalized_name = gdm_normalize_language_name (name); + gdm_parse_language_name (name, &lang_tag, NULL, NULL, NULL); language = gdm_get_language_from_name (normalized_name, normalized_name); readable_language = gdm_get_language_from_name (normalized_name, NULL); + tagged = g_strdup_printf ("%s", lang_tag, language); + if (language != NULL) { gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget), normalized_name, NULL, - language, - readable_language, + tagged, + readable_language, 0, FALSE, FALSE); g_free (language); } g_free (readable_language); - + g_free (tagged); + g_free (lang_tag); g_free (normalized_name); } diff -up gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.lang-tag gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c --- gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.lang-tag 2008-07-10 11:42:07.000000000 -0400 +++ gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c 2008-07-10 11:42:24.000000000 -0400 @@ -146,6 +146,7 @@ gdm_language_option_widget_lookup_item ( { char *language; char *readable_language; + char *lang_tag; language = gdm_get_language_from_name (locale, locale); @@ -154,10 +155,13 @@ gdm_language_option_widget_lookup_item ( } readable_language = gdm_get_language_from_name (locale, NULL); - - *name = language; + gdm_parse_language_name (locale, &lang_tag, NULL, NULL, NULL); + *name = g_strdup_printf ("%s", lang_tag, language); *comment = readable_language; + g_free (language); + g_free (lang_tag); + return TRUE; } Index: gdm.spec =================================================================== RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v retrieving revision 1.394 retrieving revision 1.395 diff -u -r1.394 -r1.395 --- gdm.spec 3 Jul 2008 19:56:56 -0000 1.394 +++ gdm.spec 10 Jul 2008 16:00:26 -0000 1.395 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.22.0 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -85,8 +85,12 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=446672 Patch4: gdm-2.22.0-enable-tcp.patch +# fixed in upstream svn Patch9: gdm-null-fs.patch +# fixed in upstream svn +Patch10: lang-tag.patch + # Fedora-specific Patch99: gdm-2.21.8-fedora-logo.patch @@ -112,6 +116,7 @@ %patch3 -p1 -b .show-users %patch4 -p1 -b .enable-tcp %patch9 -p1 -b .null-fs +%patch10 -p1 -b .lang-tag %patch99 -p1 -b .fedora-logo autoreconf @@ -311,6 +316,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Thu Jul 10 2008 Matthias Clasen - 1:2.22.0-10 +- Improve rendering of languages + * Thu Jul 3 2008 Jon McCann - 1:2.22.0-9 - Check for a null filesystem type From fedora-extras-commits at redhat.com Thu Jul 10 16:01:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 16:01:41 GMT Subject: rpms/ruby/devel ruby.spec,1.121,1.122 Message-ID: <200807101601.m6AG1fAj009365@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ruby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2782 Modified Files: ruby.spec Log Message: rebuild against db4 4.7 Index: ruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- ruby.spec 1 Jul 2008 08:12:02 -0000 1.121 +++ ruby.spec 10 Jul 2008 16:00:48 -0000 1.122 @@ -12,7 +12,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 4%{?dist} +Release: 5%{?dist} License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -510,6 +510,9 @@ %{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 1.8.6.230-5 +- rebuild against db4-4.7 + * Tue Jul 1 2008 Akira TAGOH - 1.8.6.230-4 - Backported from upstream SVN to fix a segfault issue with Array#fill. From fedora-extras-commits at redhat.com Thu Jul 10 15:51:28 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 15:51:28 GMT Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.204, 1.205 system-config-printer-debug.patch, 1.1, NONE Message-ID: <200807101551.m6AFpSpA002096@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1996 Modified Files: system-config-printer.spec Removed Files: system-config-printer-debug.patch Log Message: No longer need this patch. Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- system-config-printer.spec 10 Jul 2008 15:47:52 -0000 1.204 +++ system-config-printer.spec 10 Jul 2008 15:50:39 -0000 1.205 @@ -15,7 +15,6 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 -Patch0: system-config-printer-debug.patch Patch1: pysmbc-debug.patch BuildRequires: cups-devel >= 1.2 @@ -63,7 +62,6 @@ %prep %setup -q -a 1 -a 2 -%patch0 -p1 -b .debug pushd pysmbc-%{pysmbc_version} %patch1 -p1 -b .debug --- system-config-printer-debug.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 16:17:35 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Thu, 10 Jul 2008 16:17:35 GMT Subject: rpms/inn/devel inn.spec,1.48,1.49 Message-ID: <200807101617.m6AGHZVn010834@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/inn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10744 Modified Files: inn.spec Log Message: do not use static libraries(changes by Jochen Schmitt, #453993), own all dirs spawned by inn package(#448088) Index: inn.spec =================================================================== RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- inn.spec 3 Jul 2008 16:16:38 -0000 1.48 +++ inn.spec 10 Jul 2008 16:16:42 -0000 1.49 @@ -1,7 +1,7 @@ Summary: The InterNetNews (INN) system, an Usenet news server Name: inn Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} #see LICENSE file for details License: GPL+ and BSD and MIT and Public Domain Group: System Environment/Daemons @@ -22,6 +22,7 @@ Patch8: inn-2.4.2-makedbz.patch Patch9: inn-2.4.3.rcreaderaddrinuse.patch Patch10: inn-2.4.3-nologinshell.patch +Patch11: inn-2.4.5-dynlib.patch BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel BuildRequires: perl(ExtUtils::Embed) Requires(pre): shadow-utils @@ -91,6 +92,7 @@ %patch8 -p1 -b .makedbz %patch9 -p1 -b .addrinuse %patch10 -p1 -b .nologin +%patch11 -p1 -b .dynlib perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f` perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f` @@ -114,6 +116,7 @@ --enable-pgp-verify --with-sendmail=/usr/sbin/sendmail \ --with-news-user=news --with-news-group=news --with-news-master=news \ --enable-ipv6 \ + --enable-libtool \ %{_target_platform} # XXX don't include to avoid linking with -ldb1. @@ -126,13 +129,6 @@ mkdir -p $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#Shift libs to the right place -if [ "/usr/lib" != "%{_libdir}" ]; then - mkdir -p $RPM_BUILD_ROOT%{_libdir}/news/lib - mv $RPM_BUILD_ROOT/usr/lib/news/lib/*.a $RPM_BUILD_ROOT%{_libdir}/news/lib -fi - - # -- Install man pages needed by suck et al. mkdir -p $RPM_BUILD_ROOT/usr/include/inn @@ -145,7 +141,6 @@ install -c -m 0644 ./include/inn/$f $RPM_BUILD_ROOT/usr/include/inn done - mkdir -p $RPM_BUILD_ROOT/etc mv $RPM_BUILD_ROOT/usr/lib/news/bin/rc.news $RPM_BUILD_ROOT/etc @@ -182,10 +177,24 @@ ln -sf ../lib/news/bin/inews $RPM_BUILD_ROOT/usr/bin/inews ln -sf ../lib/news/bin/rnews $RPM_BUILD_ROOT/usr/bin/rnews +rm -rf $RPM_BUILD_ROOT/usr/lib/news/lib/*.la +rm -rf $RPM_BUILD_ROOT/usr/lib/news/lib/*.a + +%if "%{_libdir}" != "/usr/lib" +rm -rf $RPM_BUILD_ROOT%{_libdir}/news/lib/*.a +mkdir -p $RPM_BUILD_ROOT%{_libdir}/news/lib +mv $RPM_BUILD_ROOT/usr/lib/news/lib/*.so* $RPM_BUILD_ROOT%{_libdir}/news/lib +%endif + +mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/ + +echo '%{_libdir}/news/lib' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/inn-%{_arch}.conf + + #Build filelist rm -rf $RPM_BUILD_ROOT/usr/lib/news/include echo "%defattr(-,news,news)" > files.list -find $RPM_BUILD_ROOT -type f -or -type l | \ +find $RPM_BUILD_ROOT -type f -or -type l| \ sed -e "s|$RPM_BUILD_ROOT||g" | \ sed 's|^/etc/cron|%config(noreplace) %attr(-,root,root) &|' | \ sed 's|^/etc/rc.d|%config(noreplace) %attr(-,root,root) &|' | \ @@ -196,7 +205,7 @@ sed 's|/var/log/news|%ghost &|' | \ sed 's|/usr/lib/news/bin/inndstart$|%attr(4550,root,news) /usr/lib/news/bin/inndstart|' | \ sed 's|/usr/lib/news/bin/startinnfeed$|%attr(4550,root,news) /usr/lib/news/bin/startinnfeed|' | \ - sed 's|/usr/lib/news/bin/rnews$|%attr(4550,uucp,news) /usr/lib/news/bin/rnews|' > files.list + sed 's|/usr/lib/news/bin/rnews$|%attr(4550,uucp,news) /usr/lib/news/bin/rnews|' > files.list echo "/usr/lib/news/bin/filter/*.pyc" >> files.list echo "/usr/lib/news/bin/filter/*.pyo" >> files.list (echo "%defattr(-,news,news)" ; grep -v inews files.list | \ @@ -204,13 +213,14 @@ grep -v "news/inn.conf" | \ grep -v "/man/") > files.main echo "%defattr(-,root,root)" > files.devel - egrep "\.(h|so|a|la)$" files.list >> files.devel + egrep "\.(h|so)$" files.list >> files.devel %clean rm -rf $RPM_BUILD_ROOT rm -f files.list files.main files.devel files.inews %post +/sbin/ldconfig /sbin/chkconfig --add innd su -m news -c '/usr/lib/news/bin/makedbz -i -o' @@ -283,6 +293,7 @@ fi %postun +/sbin/ldconfig if [ "$1" -ge 1 ]; then service innd condrestart > /dev/null 2>&1 fi @@ -290,11 +301,20 @@ %files -f files.main %defattr(-,news,news,-) -%dir /usr/lib/news/bin/control -%dir /usr/lib/news/bin/filter +%dir /usr/lib/news +%dir /usr/lib/news/bin +%dir /usr/lib/news/doc +%dir /usr/lib/news/lib %dir /usr/lib/news/bin/rnews.libexec %dir /usr/lib/news/bin/auth -%dir /etc/news +%dir /usr/lib/news/bin/auth/passwd +%dir /usr/lib/news/bin/auth/resolv +%dir /usr/lib/news/bin/filter +%dir /usr/lib/news/bin/control +%if "(_libdir}" != "/usr/lib" +%dir %{_libdir}/news +%endif +%dir /etc/news/ %dir /var/spool/news %dir /var/spool/news/archive %dir /var/spool/news/articles @@ -333,6 +353,10 @@ %{_mandir}/man1/inews* %changelog +* Fri Jul 7 2008 Ondrej Vasik - 2.4.5-2 +- do not use static libraries(changes by Jochen Schmitt,#453993) +- own all dirs spawned by inn package(#448088) + * Thu Jul 3 2008 Ondrej Vasik - 2.4.5-1 - new upstream release 2.4.5 From fedora-extras-commits at redhat.com Thu Jul 10 16:18:50 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 10 Jul 2008 16:18:50 GMT Subject: rpms/kernel/F-8 linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch, NONE, 1.1 kernel.spec, 1.491, 1.492 Message-ID: <200807101618.m6AGIoe8011034@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10885 Modified Files: kernel.spec Added Files: linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch Log Message: * Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-52 - libata: don't let ata_piix driver attach to ICH6M in ahci mode (F9#430916) linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch: --- NEW FILE linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch --- From: Tejun Heo Date: Wed, 26 Mar 2008 06:46:58 +0000 (+0900) Subject: ata_piix: don't attach to ICH6M in ahci mode X-Git-Tag: v2.6.26-rc1~1150^2~53 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5016d7d212dbcc85cdc5130b1228d23f3423bd61 ata_piix: don't attach to ICH6M in ahci mode ata_piix when attached to ICH6M in AHCI mode doesn't provide any benefit over using ahci and has detection problems. Don't let ata_piix claim ICH6M if it's in AHCI mode. This change makes ICH6R the only one which ata_piix can attach to even when it's in ahci mode which is necessary as some devices don't work properly under ahci mode. Drop PIIX_FLAG_AHCI and match the controller directly so that piix_disable_ahci() is called only for it. This change makes PIIX_SCC no longer used and it gets dropped too. This fixes bz 9491. Signed-off-by: Tejun Heo Cc: Robert M. Albrecht Signed-off-by: Jeff Garzik [cebbert at redhat.com : rediff] --- rhbz 430916 diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index eafb984..e6bf4fd 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -100,13 +100,11 @@ enum { PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ ICH5_PMR = 0x90, /* port mapping register */ ICH5_PCS = 0x92, /* port control and status */ - PIIX_SCC = 0x0A, /* sub-class code register */ PIIX_SIDPR_BAR = 5, PIIX_SIDPR_LEN = 16, PIIX_SIDPR_IDX = 0, PIIX_SIDPR_DATA = 4, - PIIX_FLAG_AHCI = (1 << 27), /* AHCI possible */ PIIX_FLAG_CHECKINTR = (1 << 28), /* make sure PCI INTx enabled */ PIIX_FLAG_SIDPR = (1 << 29), /* SATA idx/data pair regs */ @@ -237,8 +235,10 @@ static const struct pci_device_id piix_p { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, /* 82801FR/FRW (ICH6R/ICH6RW) */ { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, - /* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented) */ - { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata_ahci }, + /* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented). + * Attach iff the controller is in IDE mode. */ + { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata_ahci }, /* 82801GB/GR/GH (ICH7, identical to ICH6) */ { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, /* 2801GBM/GHM (ICH7M, identical to ICH6M) */ @@ -626,7 +626,7 @@ static struct ata_port_info piix_port_in [ich6_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI, + .flags = PIIX_SATA_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -635,7 +635,7 @@ static struct ata_port_info piix_port_in [ich6m_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI, + .flags = PIIX_SATA_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -644,8 +644,7 @@ static struct ata_port_info piix_port_in [ich8_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI | - PIIX_FLAG_SIDPR, + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -654,8 +653,7 @@ static struct ata_port_info piix_port_in [ich8_2port_sata] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI | - PIIX_FLAG_SIDPR, + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -664,7 +662,7 @@ static struct ata_port_info piix_port_in [tolapai_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI, + .flags = PIIX_SATA_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -673,8 +671,7 @@ static struct ata_port_info piix_port_in [ich8m_apple_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI | - PIIX_FLAG_SIDPR, + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -1659,6 +1656,16 @@ static int __devinit piix_init_one(struc if (rc) return rc; + /* ICH6R may be driven by either ata_piix or ahci driver + * regardless of BIOS configuration. Make sure AHCI mode is + * off. + */ + if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) { + int rc = piix_disable_ahci(pdev); + if (rc) + return rc; + } + /* SATA map init can change port_info, do it before prepping host */ hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); if (!hpriv) @@ -1674,16 +1681,6 @@ static int __devinit piix_init_one(struc host->private_data = hpriv; /* initialize controller */ - if (port_flags & PIIX_FLAG_AHCI) { - u8 tmp; - pci_read_config_byte(pdev, PIIX_SCC, &tmp); - if (tmp == PIIX_AHCI_DEVICE) { - rc = piix_disable_ahci(pdev); - if (rc) - return rc; - } - } - if (port_flags & ATA_FLAG_SATA) { piix_init_pcs(host, piix_map_db_table[ent->driver_data]); piix_init_sidpr(host); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.491 retrieving revision 1.492 diff -u -r1.491 -r1.492 --- kernel.spec 10 Jul 2008 04:11:40 -0000 1.491 +++ kernel.spec 10 Jul 2008 16:17:57 -0000 1.492 @@ -646,6 +646,7 @@ Patch675: linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch Patch676: linux-2.6-libata-pata_atiixp-dont-disable.patch Patch677: linux-2.6-libata-retry-enabling-ahci.patch +Patch678: linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch @@ -1166,6 +1167,8 @@ ApplyPatch linux-2.6-libata-pata_atiixp-dont-disable.patch # retry enabling AHCI mode before reporting error ApplyPatch linux-2.6-libata-retry-enabling-ahci.patch +# fix ahci / ICH6 conflict +ApplyPatch linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch # wireless # @@ -1833,6 +1836,9 @@ %changelog +* Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-52 +- libata: don't let ata_piix driver attach to ICH6M in ahci mode (F9#430916) + * Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-51 - Fix reiserfs list corruption (F9#453699) From fedora-extras-commits at redhat.com Thu Jul 10 16:22:59 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Thu, 10 Jul 2008 16:22:59 GMT Subject: rpms/inn/devel inn-2.4.5-dynlib.patch,NONE,1.1 inn.spec,1.49,1.50 Message-ID: <200807101622.m6AGMx2c011378@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/inn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11281 Modified Files: inn.spec Added Files: inn-2.4.5-dynlib.patch Log Message: forgot to cvs add patch inn-2.4.5-dynlib.patch: --- NEW FILE inn-2.4.5-dynlib.patch --- diff -up inn-2.4.5/history/Makefile.dynlib inn-2.4.5/history/Makefile --- inn-2.4.5/history/Makefile.dynlib 2008-07-03 19:50:04.000000000 +0200 +++ inn-2.4.5/history/Makefile 2008-07-03 19:50:50.000000000 +0200 @@ -43,7 +43,7 @@ $(FIXSCRIPT): libinnhist.la: $(OBJECTS) $(LIBSTORAGE) $(LIBINN) $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \ - $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \ + $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS) -L../lib/.libs -L../storage/.libs ${LIBS} \ -rpath $(PATHLIB) -version-info 2:0:0 libinnhist.a: $(OBJECTS) diff -up inn-2.4.5/storage/Makefile.dynlib inn-2.4.5/storage/Makefile --- inn-2.4.5/storage/Makefile.dynlib 2008-07-03 19:52:48.000000000 +0200 +++ inn-2.4.5/storage/Makefile 2008-07-03 19:42:34.000000000 +0200 @@ -47,7 +47,7 @@ $(FIXSCRIPT): libstorage.la: $(OBJECTS) $(LIBINN) $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \ - $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \ + $(LIBINN) $(EXTSTORAGELIBS) -L../lib/.libs ${LIBS} \ -rpath $(PATHLIB) -version-info 2:0:0 libstorage.a: $(OBJECTS) Index: inn.spec =================================================================== RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- inn.spec 10 Jul 2008 16:16:42 -0000 1.49 +++ inn.spec 10 Jul 2008 16:22:01 -0000 1.50 @@ -194,7 +194,7 @@ #Build filelist rm -rf $RPM_BUILD_ROOT/usr/lib/news/include echo "%defattr(-,news,news)" > files.list -find $RPM_BUILD_ROOT -type f -or -type l| \ +find $RPM_BUILD_ROOT -type f -or -type l | \ sed -e "s|$RPM_BUILD_ROOT||g" | \ sed 's|^/etc/cron|%config(noreplace) %attr(-,root,root) &|' | \ sed 's|^/etc/rc.d|%config(noreplace) %attr(-,root,root) &|' | \ From fedora-extras-commits at redhat.com Thu Jul 10 16:24:22 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 10 Jul 2008 16:24:22 GMT Subject: rpms/kernel/F-9 linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch, NONE, 1.1 kernel.spec, 1.708, 1.709 Message-ID: <200807101624.m6AGOMgd011524@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11434 Modified Files: kernel.spec Added Files: linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch Log Message: * Thu Jul 10 2008 Chuck Ebbert 2.6.25.10-90 - libata: don't let ata_piix driver attach to ICH6M in ahci mode (#430916) linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch: --- NEW FILE linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch --- From: Tejun Heo Date: Wed, 26 Mar 2008 06:46:58 +0000 (+0900) Subject: ata_piix: don't attach to ICH6M in ahci mode X-Git-Tag: v2.6.26-rc1~1150^2~53 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5016d7d212dbcc85cdc5130b1228d23f3423bd61 ata_piix: don't attach to ICH6M in ahci mode ata_piix when attached to ICH6M in AHCI mode doesn't provide any benefit over using ahci and has detection problems. Don't let ata_piix claim ICH6M if it's in AHCI mode. This change makes ICH6R the only one which ata_piix can attach to even when it's in ahci mode which is necessary as some devices don't work properly under ahci mode. Drop PIIX_FLAG_AHCI and match the controller directly so that piix_disable_ahci() is called only for it. This change makes PIIX_SCC no longer used and it gets dropped too. This fixes bz 9491. Signed-off-by: Tejun Heo Cc: Robert M. Albrecht Signed-off-by: Jeff Garzik [cebbert at redhat.com : rediff] --- rhbz 430916 diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index eafb984..e6bf4fd 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -100,13 +100,11 @@ enum { PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ ICH5_PMR = 0x90, /* port mapping register */ ICH5_PCS = 0x92, /* port control and status */ - PIIX_SCC = 0x0A, /* sub-class code register */ PIIX_SIDPR_BAR = 5, PIIX_SIDPR_LEN = 16, PIIX_SIDPR_IDX = 0, PIIX_SIDPR_DATA = 4, - PIIX_FLAG_AHCI = (1 << 27), /* AHCI possible */ PIIX_FLAG_CHECKINTR = (1 << 28), /* make sure PCI INTx enabled */ PIIX_FLAG_SIDPR = (1 << 29), /* SATA idx/data pair regs */ @@ -237,8 +235,10 @@ static const struct pci_device_id piix_p { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, /* 82801FR/FRW (ICH6R/ICH6RW) */ { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, - /* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented) */ - { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata_ahci }, + /* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented). + * Attach iff the controller is in IDE mode. */ + { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata_ahci }, /* 82801GB/GR/GH (ICH7, identical to ICH6) */ { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, /* 2801GBM/GHM (ICH7M, identical to ICH6M) */ @@ -626,7 +626,7 @@ static struct ata_port_info piix_port_in [ich6_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI, + .flags = PIIX_SATA_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -635,7 +635,7 @@ static struct ata_port_info piix_port_in [ich6m_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI, + .flags = PIIX_SATA_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -644,8 +644,7 @@ static struct ata_port_info piix_port_in [ich8_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI | - PIIX_FLAG_SIDPR, + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -654,8 +653,7 @@ static struct ata_port_info piix_port_in [ich8_2port_sata] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI | - PIIX_FLAG_SIDPR, + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -664,7 +662,7 @@ static struct ata_port_info piix_port_in [tolapai_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI, + .flags = PIIX_SATA_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -673,8 +671,7 @@ static struct ata_port_info piix_port_in [ich8m_apple_sata_ahci] = { - .flags = PIIX_SATA_FLAGS | PIIX_FLAG_AHCI | - PIIX_FLAG_SIDPR, + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = ATA_UDMA6, @@ -1659,6 +1656,16 @@ static int __devinit piix_init_one(struc if (rc) return rc; + /* ICH6R may be driven by either ata_piix or ahci driver + * regardless of BIOS configuration. Make sure AHCI mode is + * off. + */ + if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) { + int rc = piix_disable_ahci(pdev); + if (rc) + return rc; + } + /* SATA map init can change port_info, do it before prepping host */ hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); if (!hpriv) @@ -1674,16 +1681,6 @@ static int __devinit piix_init_one(struc host->private_data = hpriv; /* initialize controller */ - if (port_flags & PIIX_FLAG_AHCI) { - u8 tmp; - pci_read_config_byte(pdev, PIIX_SCC, &tmp); - if (tmp == PIIX_AHCI_DEVICE) { - rc = piix_disable_ahci(pdev); - if (rc) - return rc; - } - } - if (port_flags & ATA_FLAG_SATA) { piix_init_pcs(host, piix_map_db_table[ent->driver_data]); piix_init_sidpr(host); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.708 retrieving revision 1.709 diff -u -r1.708 -r1.709 --- kernel.spec 10 Jul 2008 00:26:11 -0000 1.708 +++ kernel.spec 10 Jul 2008 16:23:27 -0000 1.709 @@ -640,6 +640,7 @@ Patch675: linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch Patch676: linux-2.6-libata-pata_atiixp-dont-disable.patch Patch677: linux-2.6-libata-retry-enabling-ahci.patch +Patch678: linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch @@ -1218,6 +1219,8 @@ ApplyPatch linux-2.6-libata-pata_atiixp-dont-disable.patch # retry enabling AHCI mode before reporting error ApplyPatch linux-2.6-libata-retry-enabling-ahci.patch +# fix ahci / ich6m conflict +ApplyPatch linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless.patch @@ -1874,6 +1877,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 10 2008 Chuck Ebbert 2.6.25.10-90 +- libata: don't let ata_piix driver attach to ICH6M in ahci mode (#430916) + * Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-89 - hdaps: support new Lenovo notebook models (#449888) From fedora-extras-commits at redhat.com Thu Jul 10 16:29:51 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 10 Jul 2008 16:29:51 GMT Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.206, 1.207 Message-ID: <200807101629.m6AGTp5P012033@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11984 Modified Files: system-config-printer.spec Log Message: Ship egg-info file for cupshelpers. Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- system-config-printer.spec 10 Jul 2008 15:54:11 -0000 1.206 +++ system-config-printer.spec 10 Jul 2008 16:29:03 -0000 1.207 @@ -116,6 +116,7 @@ %{python_sitelib}/cupshelpers/cupshelpers.py* %{python_sitelib}/cupshelpers/openprinting.py* %{python_sitelib}/cupshelpers/ppds.py* +%{python_sitelib}/*.egg-info %files %defattr(-,root,root,-) From fedora-extras-commits at redhat.com Thu Jul 10 16:32:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 16:32:45 GMT Subject: rpms/libgda/devel libgda.spec,1.39,1.40 Message-ID: <200807101632.m6AGWjG1012224@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/libgda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12161 Modified Files: libgda.spec Log Message: rebuild against new db4 4.7 Index: libgda.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgda/devel/libgda.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- libgda.spec 17 Jun 2008 19:30:28 -0000 1.39 +++ libgda.spec 10 Jul 2008 16:31:45 -0000 1.40 @@ -38,7 +38,7 @@ Name: libgda Epoch: 1 Version: 3.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for writing gnome database programs Group: System Environment/Libraries License: LGPLv2+ @@ -556,6 +556,9 @@ %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 1:3.1.2-5 +- Rebuild against new db4-4.7 + * Tue Jun 17 2008 Hans de Goede 1:3.1.2-4 - Rebuild against new freetds From fedora-extras-commits at redhat.com Thu Jul 10 16:33:04 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 16:33:04 GMT Subject: rpms/nagios/devel nagios.spec,1.52,1.53 Message-ID: <200807101633.m6AGX4Ng012280@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12160 Modified Files: nagios.spec Log Message: Fixed a copy & paste error. Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- nagios.spec 10 Jul 2008 15:51:09 -0000 1.52 +++ nagios.spec 10 Jul 2008 16:32:05 -0000 1.53 @@ -70,6 +70,7 @@ --with-cgiurl=/%{name}/cgi-bin/ \ --with-htmlurl=/%{name} \ --with-lockfile=%{_localstatedir}/run/%{name}.pid \ + --libdir=%{_libdir}/%{name} \ --with-nagios-user=nagios \ --with-nagios-grp=nagios \ --bindir=%{_sbindir} \ @@ -112,6 +113,11 @@ %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives %{__install} -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl +%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/objects +%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/conf.d +%{__install} -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/%{name}/conf.d/internet.cfg +%{__install} -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/%{name}/.htpasswd +%{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/spool/checkresults %{__mkdir} -p %{buildroot}/%{_initrddir} %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ %{__cp} -a html/* %{buildroot}/%{_datadir}/%{name}/html/ @@ -313,7 +319,7 @@ * Fri Oct 04 2002 Karl DeBisschop - merge many improvements from Ramiro Morales (macros for PERF_EXTERNAL and EMBPERL, cleanup pre/post scripts, - nnmmsg logger macro, include eventhandlers, convertcfg, mini_epn) + nnmmsg logger macro, include eventhandlers, convertcfg, mini_epn) - use LSB-standard /etc/init.d/nagios startup location * Tue Aug 13 2002 Karl DeBisschop From fedora-extras-commits at redhat.com Thu Jul 10 16:40:38 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 10 Jul 2008 16:40:38 GMT Subject: rpms/yum/devel 0001-check-reqpo-exists-in-compare_providers.patch, NONE, 1.1 yum.spec, 1.215, 1.216 Message-ID: <200807101640.m6AGecA3012610@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/pkgs/rpms/yum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12535 Modified Files: yum.spec Added Files: 0001-check-reqpo-exists-in-compare_providers.patch Log Message: add patch to hopefully make rawhide build again. 0001-check-reqpo-exists-in-compare_providers.patch: --- NEW FILE 0001-check-reqpo-exists-in-compare_providers.patch --- commit 63540521709205dd601994e2b05b7ddd3712b3a1 Author: Seth Vidal Date: Thu Jul 10 12:21:29 2008 -0400 make sure the reqpo exists before we compare it diff --git a/yum/depsolve.py b/yum/depsolve.py index 8bb2cf1..2577cef 100644 --- a/yum/depsolve.py +++ b/yum/depsolve.py @@ -986,8 +986,13 @@ class Depsolve(object): if obsoleted: pkgresults[po] -= 1024 break - - for thisarch in (reqpo.arch, getBestArch()): + + if reqpo: + arches = (reqpo.arch, getBestArch()) + else: + arches = (getBestArch()) + + for thisarch in arches: res = _compare_arch_distance(po, nextpo, thisarch) if not res: continue @@ -1001,13 +1006,13 @@ class Depsolve(object): self.verbose_logger.log(logginglevels.DEBUG_4, _('common sourcerpm %s and %s' % (po, reqpo))) pkgresults[po] += 20 - - cpl = _common_prefix_len(po.name, reqpo.name) - if cpl > 2: - self.verbose_logger.log(logginglevels.DEBUG_4, - _('common prefix of %s between %s and %s' % (cpl, po, reqpo))) - - pkgresults[po] += cpl*2 + if reqpo: + cpl = _common_prefix_len(po.name, reqpo.name) + if cpl > 2: + self.verbose_logger.log(logginglevels.DEBUG_4, + _('common prefix of %s between %s and %s' % (cpl, po, reqpo))) + + pkgresults[po] += cpl*2 pkgresults[po] += (len(po.name)*-1) Index: yum.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- yum.spec 9 Jul 2008 14:44:19 -0000 1.215 +++ yum.spec 10 Jul 2008 16:39:48 -0000 1.216 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz @@ -13,6 +13,7 @@ Patch1: yum-mirror-priority.patch Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch +Patch4: 0001-check-reqpo-exists-in-compare_providers.patch URL: http://linux.duke.edu/yum/ BuildArch: noarch @@ -55,6 +56,7 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p1 %build make @@ -103,6 +105,9 @@ %dir /usr/lib/yum-plugins %changelog +* Wed Jul 10 2008 Seth Vidal - 3.2.17-2 +- add patch from upstream for bug in compare_providers + * Wed Jul 9 2008 Seth Vidal - 3.2.17-1 - 3.2.17 From fedora-extras-commits at redhat.com Thu Jul 10 16:41:49 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 10 Jul 2008 16:41:49 GMT Subject: rpms/gtk2/devel icon-view-a11y.patch, NONE, 1.1 gtk2.spec, 1.303, 1.304 Message-ID: <200807101641.m6AGfnE8012711@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12619 Modified Files: gtk2.spec Added Files: icon-view-a11y.patch Log Message: fix a segfault icon-view-a11y.patch: --- NEW FILE icon-view-a11y.patch --- Index: gtk/gtkiconview.c =================================================================== --- gtk/gtkiconview.c (revision 20741) +++ gtk/gtkiconview.c (working copy) @@ -8970,8 +8970,8 @@ { if (tmp_list == NULL) tmp_list = items; - else - info->index = item->item->index; + + info->index = item->item->index; } items = items->next; @@ -8981,11 +8981,8 @@ { info = deleted_item->data; gtk_icon_view_item_accessible_add_state (GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item), ATK_STATE_DEFUNCT, TRUE); - } - g_signal_emit_by_name (atk_obj, "children_changed::remove", - index, NULL, NULL); - if (deleted_item) - { + g_signal_emit_by_name (atk_obj, "children_changed::remove", + index, NULL, NULL); priv->items = g_list_remove_link (priv->items, deleted_item); g_free (info); } Index: gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- gtk2.spec 5 Jul 2008 21:23:49 -0000 1.303 +++ gtk2.spec 10 Jul 2008 16:40:54 -0000 1.304 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2 @@ -31,6 +31,9 @@ # see http://bugzilla.gnome.org/show_bug.cgi?id=463773 Patch2: workaround.patch +# fixed in upstream svn +Patch3: icon-view-a11y.patch + BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -115,6 +118,7 @@ %patch0 -p1 -b .lib64 %patch1 -p1 -b .set-invisible-char-to-bullet %patch2 -p1 -b .workaround +%patch3 -p1 -b .icon-view-a11y for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -298,6 +302,9 @@ %{_datadir}/gtk-2.0 %changelog +* Thu Jul 10 2008 Matthias Clasen - 2.13.4-2 +- Fix a segfault in the icon view a11y code + * Sat Jul 5 2008 Matthias Clasen - 2.13.4-1 - Update to 2.13.4 From fedora-extras-commits at redhat.com Thu Jul 10 16:49:28 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 10 Jul 2008 16:49:28 GMT Subject: rpms/yum/F-9 0001-check-reqpo-exists-in-compare_providers.patch, NONE, 1.1 yum.spec, 1.217, 1.218 Message-ID: <200807101649.m6AGnSTC013006@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/pkgs/rpms/yum/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12848 Modified Files: yum.spec Added Files: 0001-check-reqpo-exists-in-compare_providers.patch Log Message: apply fix for compare_providers() from upstream 0001-check-reqpo-exists-in-compare_providers.patch: --- NEW FILE 0001-check-reqpo-exists-in-compare_providers.patch --- commit 63540521709205dd601994e2b05b7ddd3712b3a1 Author: Seth Vidal Date: Thu Jul 10 12:21:29 2008 -0400 make sure the reqpo exists before we compare it diff --git a/yum/depsolve.py b/yum/depsolve.py index 8bb2cf1..2577cef 100644 --- a/yum/depsolve.py +++ b/yum/depsolve.py @@ -986,8 +986,13 @@ class Depsolve(object): if obsoleted: pkgresults[po] -= 1024 break - - for thisarch in (reqpo.arch, getBestArch()): + + if reqpo: + arches = (reqpo.arch, getBestArch()) + else: + arches = (getBestArch()) + + for thisarch in arches: res = _compare_arch_distance(po, nextpo, thisarch) if not res: continue @@ -1001,13 +1006,13 @@ class Depsolve(object): self.verbose_logger.log(logginglevels.DEBUG_4, _('common sourcerpm %s and %s' % (po, reqpo))) pkgresults[po] += 20 - - cpl = _common_prefix_len(po.name, reqpo.name) - if cpl > 2: - self.verbose_logger.log(logginglevels.DEBUG_4, - _('common prefix of %s between %s and %s' % (cpl, po, reqpo))) - - pkgresults[po] += cpl*2 + if reqpo: + cpl = _common_prefix_len(po.name, reqpo.name) + if cpl > 2: + self.verbose_logger.log(logginglevels.DEBUG_4, + _('common prefix of %s between %s and %s' % (cpl, po, reqpo))) + + pkgresults[po] += cpl*2 pkgresults[po] += (len(po.name)*-1) Index: yum.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum/F-9/yum.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- yum.spec 9 Jul 2008 14:33:07 -0000 1.217 +++ yum.spec 10 Jul 2008 16:48:30 -0000 1.218 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz @@ -13,6 +13,7 @@ Patch1: yum-mirror-priority.patch Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch +Patch4: 0001-check-reqpo-exists-in-compare_providers.patch URL: http://linux.duke.edu/yum/ BuildArch: noarch @@ -55,6 +56,7 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p1 %build make @@ -103,6 +105,9 @@ %dir /usr/lib/yum-plugins %changelog +* Wed Jul 10 2008 Seth Vidal - 3.2.17-2 +- add patch from upstream for bug in compare_providers + * Wed Jul 9 2008 Seth Vidal - 3.2.17-1 - 3.2.17 From fedora-extras-commits at redhat.com Thu Jul 10 16:50:28 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 10 Jul 2008 16:50:28 GMT Subject: rpms/gtk2/devel gtk2.spec,1.304,1.305 Message-ID: <200807101650.m6AGoSlG013101@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13013 Modified Files: gtk2.spec Log Message: fix spec Index: gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- gtk2.spec 10 Jul 2008 16:40:54 -0000 1.304 +++ gtk2.spec 10 Jul 2008 16:49:35 -0000 1.305 @@ -118,7 +118,7 @@ %patch0 -p1 -b .lib64 %patch1 -p1 -b .set-invisible-char-to-bullet %patch2 -p1 -b .workaround -%patch3 -p1 -b .icon-view-a11y +%patch3 -p0 -b .icon-view-a11y for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . From fedora-extras-commits at redhat.com Thu Jul 10 16:56:27 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Thu, 10 Jul 2008 16:56:27 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-sparc-ptracefix.patch, NONE, 1.1 java-1.6.0-openjdk-sparc-trapsfix.patch, NONE, 1.1 java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch, NONE, 1.1 java-1.6.0-openjdk-sparc64-linux.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.52, 1.53 Message-ID: <200807101656.m6AGuReb013411@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13321 Modified Files: java-1.6.0-openjdk.spec Added Files: java-1.6.0-openjdk-sparc-ptracefix.patch java-1.6.0-openjdk-sparc-trapsfix.patch java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch java-1.6.0-openjdk-sparc64-linux.patch Log Message: * Thu Jul 9 2008 Lillian Angel -1:1.6.0.0-0.17.b09 - Added sparc/64 patches. java-1.6.0-openjdk-sparc-ptracefix.patch: --- NEW FILE java-1.6.0-openjdk-sparc-ptracefix.patch --- diff -up icedtea6-1.2/openjdk/hotspot/agent/src/os/linux/libproc.h.BAD icedtea6-1.2/openjdk/hotspot/agent/src/os/linux/libproc.h --- icedtea6-1.2/openjdk/hotspot/agent/src/os/linux/libproc.h.BAD 2008-05-29 19:03:34.000000000 -0400 +++ icedtea6-1.2/openjdk/hotspot/agent/src/os/linux/libproc.h 2008-05-29 19:01:45.000000000 -0400 @@ -34,14 +34,25 @@ #if defined(sparc) || defined(sparcv9) /* - If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64 - otherwise it should be from /usr/include/asm-sparc - These two files define pt_regs structure differently + Taken from asm-sparc/ptrace.h and asm-sparc64/ptrace.h */ #ifdef _LP64 -#include "asm-sparc64/ptrace.h" +struct pt_regs { + unsigned long u_regs[16]; /* globals and ins */ + unsigned long tstate; + unsigned long tpc; + unsigned long tnpc; + unsigned int y; + unsigned int fprs; +}; #else -#include "asm-sparc/ptrace.h" +struct pt_regs { + unsigned long psr; + unsigned long pc; + unsigned long npc; + unsigned long y; + unsigned long u_regs[16]; /* globals and ins */ +}; #endif #endif //sparc or sparcv9 java-1.6.0-openjdk-sparc-trapsfix.patch: --- NEW FILE java-1.6.0-openjdk-sparc-trapsfix.patch --- diff -up icedtea6-1.2/openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD icedtea6-1.2/openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp --- icedtea6-1.2/openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD 2008-05-28 11:49:06.000000000 -0500 +++ icedtea6-1.2/openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-05-28 11:51:56.000000000 -0500 @@ -25,7 +25,16 @@ #include "incls/_precompiled.incl" #include "incls/_assembler_linux_sparc.cpp.incl" -#include +/* Headers for 32bit sparc with a 32bit userland end up in asm/ + * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/ + * There is no traps.h in asm-sparc64/ + */ + +#if defined(__sparc__) && defined(__arch64__) +# include +#else +# include +#endif bool MacroAssembler::needs_explicit_null_check(intptr_t offset) { // Since the linux kernel resides at the low end of java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch: --- NEW FILE java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch --- diff -up icedtea6-1.2/configure.sparc64 icedtea6-1.2/configure --- icedtea6-1.2/configure.sparc64 2008-05-30 14:58:10.000000000 -0400 +++ icedtea6-1.2/configure 2008-05-30 14:59:54.000000000 -0400 @@ -735,6 +735,7 @@ WITH_OPENJDK_FALSE PARALLEL_JOBS BUILD_ARCH_DIR INSTALL_ARCH_DIR +JRE_ARCH_DIR JAVA JAVAC JAVAH @@ -5971,23 +5972,33 @@ fi x86_64-*-*) BUILD_ARCH_DIR=amd64 INSTALL_ARCH_DIR=amd64 + JRE_ARCH_DIR=amd64 ;; i?86-*-*) BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 + JRE_ARCH_DIR=i386 ;; arm*-*-*) BUILD_ARCH_DIR=arm INSTALL_ARCH_DIR=arm + JRE_ARCH_DIR=arm + ;; + sparc64-*-*) + BUILD_ARCH_DIR=sparcv9 + INSTALL_ARCH_DIR=sparcv9 + JRE_ARCH_DIR=sparc64 ;; *) BUILD_ARCH_DIR=`uname -m` INSTALL_ARCH_DIR=$BUILD_ARCH_DIR + JRE_ARCH_DIR=$INSTALL_ARCH_DIR ;; esac + if test "${with_openjdk}" == true then JAVA=$SYSTEM_OPENJDK_DIR/bin/java @@ -12906,6 +12917,7 @@ WITH_OPENJDK_FALSE!$WITH_OPENJDK_FALSE$a PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim +JRE_ARCH_DIR!$JRE_ARCH_DIR$ac_delim JAVA!$JAVA$ac_delim JAVAC!$JAVAC$ac_delim JAVAH!$JAVAH$ac_delim @@ -12975,7 +12987,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -up icedtea6-1.2/Makefile.am.sparc64 icedtea6-1.2/Makefile.am --- icedtea6-1.2/Makefile.am.sparc64 2008-05-30 14:58:10.000000000 -0400 +++ icedtea6-1.2/Makefile.am 2008-05-30 14:58:10.000000000 -0400 @@ -495,8 +495,13 @@ stamps/bootstrap-directory-ecj.stamp: if test -d $(SYSTEM_GCJ_DIR); \ then \ mkdir -p bootstrap/ecj/jre/lib; \ - ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \ - bootstrap/ecj/jre/lib/; \ + ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \ + bootstrap/ecj/jre/lib/; \ + if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \ + then \ + ln -sf ./$(JRE_ARCH_DIR) \ + bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \ + fi; \ mkdir -p bootstrap/ecj/include; \ for i in $(SYSTEM_GCJ_DIR)/include/*; do \ test -r $$i | continue; \ diff -up icedtea6-1.2/Makefile.in.sparc64 icedtea6-1.2/Makefile.in --- icedtea6-1.2/Makefile.in.sparc64 2008-05-30 14:58:10.000000000 -0400 +++ icedtea6-1.2/Makefile.in 2008-05-30 14:58:10.000000000 -0400 @@ -138,6 +138,7 @@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ JAVAH = @JAVAH@ +JRE_ARCH_DIR = @JRE_ARCH_DIR@ LDFLAGS = @LDFLAGS@ LIBFFI_CFLAGS = @LIBFFI_CFLAGS@ LIBFFI_LIBS = @LIBFFI_LIBS@ @@ -987,8 +988,13 @@ stamps/bootstrap-directory-ecj.stamp: if test -d $(SYSTEM_GCJ_DIR); \ then \ mkdir -p bootstrap/ecj/jre/lib; \ - ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \ - bootstrap/ecj/jre/lib/; \ + ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \ + bootstrap/ecj/jre/lib/; \ + if ! test -d bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \ + then \ + ln -sf ./$(JRE_ARCH_DIR) \ + bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \ + fi; \ mkdir -p bootstrap/ecj/include; \ for i in $(SYSTEM_GCJ_DIR)/include/*; do \ test -r $$i | continue; \ java-1.6.0-openjdk-sparc64-linux.patch: --- NEW FILE java-1.6.0-openjdk-sparc64-linux.patch --- diff -up icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/sparcv9.make --- icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD 2008-05-29 15:48:44.000000000 -0400 +++ icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/sparcv9.make 2008-05-29 15:48:39.000000000 -0400 @@ -0,0 +1,27 @@ +# +# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# +# + +# TLS helper, assembled from .s file +# Not included in includeDB because it has no dependencies +Obj_Files += linux_sparc.o diff -up icedtea6-1.2/openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD icedtea6-1.2/openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp --- icedtea6-1.2/openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD 2008-05-29 16:25:10.000000000 -0400 +++ icedtea6-1.2/openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp 2008-05-29 16:32:11.000000000 -0400 @@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad void LIRGenerator::increment_counter(address counter, int step) { LIR_Opr pointer = new_register(T_INT); - __ move(LIR_OprFact::intConst((int)counter), pointer); + __ move(LIR_OprFact::intConst((int)*counter), pointer); LIR_Address* addr = new LIR_Address(pointer, 0, T_INT); increment_counter(addr, step); } @@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address, CodeEmitInfo* info) { -#ifdef _LP64 - __ store_mem_reg(value, address, info); -#else __ volatile_store_mem_reg(value, address, info); -#endif } void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result, CodeEmitInfo* info) { -#ifdef _LP64 - __ load_mem_reg(address, result, info); -#else __ volatile_load_mem_reg(address, result, info); -#endif } diff -up icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/defs.make.BAD icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/defs.make --- icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/defs.make.BAD 2008-05-30 07:03:37.000000000 -0400 +++ icedtea6-1.2/openjdk/hotspot/build/linux/makefiles/defs.make 2008-05-30 07:03:45.000000000 -0400 @@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64) HS_ARCH = ia64 endif -# sparc -ifneq (,$(filter $(ARCH), sparc sparc64)) +# sparc64 +ifeq ($(ARCH), sparc64) ifeq ($(ARCH_DATA_MODEL), 64) ARCH_DATA_MODEL = 64 MAKE_ARGS += LP64=1 @@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64) HS_ARCH = sparc endif +# sparc +ifeq ($(ARCH), sparc) + ARCH_DATA_MODEL = 32 + PLATFORM = linux-sparc + VM_PLATFORM = linux_sparc + HS_ARCH = sparc +endif + # x86_64 ifeq ($(ARCH), x86_64) ifeq ($(ARCH_DATA_MODEL), 64) Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- java-1.6.0-openjdk.spec 8 Jul 2008 15:27:56 -0000 1.52 +++ java-1.6.0-openjdk.spec 10 Jul 2008 16:55:40 -0000 1.53 @@ -138,12 +138,16 @@ # applications. Patch0: java-1.6.0-openjdk-optflags.patch Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch +Patch2: java-1.6.0-openjdk-sparc-trapsfix.patch +Patch3: java-1.6.0-openjdk-sparc64-linux.patch +Patch4: java-1.6.0-openjdk-sparc-ptracefix.patch +Patch5: java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch # OpenJDK security patches -Patch2: java-1.6.0-openjdk-6332953.patch -Patch3: java-1.6.0-openjdk-6542088.patch -Patch4: java-1.6.0-openjdk-6607339.patch -Patch5: java-1.6.0-openjdk-6661918.patch -Patch6: java-1.6.0-openjdk-6685178.patch +Patch6: java-1.6.0-openjdk-6332953.patch +Patch7: java-1.6.0-openjdk-6542088.patch +Patch8: java-1.6.0-openjdk-6607339.patch +Patch9: java-1.6.0-openjdk-6661918.patch +Patch10: java-1.6.0-openjdk-6685178.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -338,24 +342,31 @@ %setup -q -n icedtea6-%{icedteaver} -T -D -a 6 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2 %patch0 +%patch5 -p1 -b .sparc64 cp %{SOURCE4} . cp %{SOURCE5} . cp %{SOURCE7} . %build # Build IcedTea and OpenJDK. +%ifarch sparc64 +export ARCH_DATA_MODEL=64 +%endif ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} %if %{gcjbootstrap} make stamps/patch-ecj.stamp %endif make stamps/patch.stamp -patch -l -p0 < %{PATCH2} -patch -l -p0 < %{PATCH3} -patch -l -p0 < %{PATCH4} +patch -l -p1 < %{PATCH2} +patch -l -p1 < %{PATCH3} +patch -l -p1 < %{PATCH4} +patch -l -p0 < %{PATCH6} +patch -l -p0 < %{PATCH7} +patch -l -p0 < %{PATCH8} %ifarch %{jit_arches} -patch -l -p0 < %{PATCH5} +patch -l -p0 < %{PATCH9} %endif -patch -l -p0 < %{PATCH6} +patch -l -p0 < %{PATCH10} make export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -896,6 +907,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Thu Jul 9 2008 Lillian Angel -1:1.6.0.0-0.17.b09 +- Added sparc/64 patches. + * Wed Jul 8 2008 Lillian Angel -1:1.6.0.0-0.17.b09 - Only apply hotspot security patch of jitarches. From fedora-extras-commits at redhat.com Thu Jul 10 16:56:47 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 16:56:47 GMT Subject: rpms/xfce4-verve-plugin/devel xfce4-verve-plugin.spec,1.5,1.6 Message-ID: <200807101656.m6AGulqC013462@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-verve-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13350 Modified Files: xfce4-verve-plugin.spec Log Message: * Thu Jul 10 2008 Christoph Wickert - 0.3.5-6 - Obsolte the xfce4-minicmd-plugin Index: xfce4-verve-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-verve-plugin/devel/xfce4-verve-plugin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfce4-verve-plugin.spec 10 Jun 2008 22:53:09 -0000 1.5 +++ xfce4-verve-plugin.spec 10 Jul 2008 16:55:55 -0000 1.6 @@ -1,6 +1,6 @@ Name: xfce4-verve-plugin Version: 0.3.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A comfortable command line plugin for the Xfce panel Group: User Interface/Desktops @@ -14,6 +14,10 @@ BuildRequires: libxml2-devel, gettext, perl(XML::Parser) Requires: xfce4-panel >= 4.4.1 Provides: verve-plugin = %{version} +# Retire xfce4-minicmd-plugin +Provides: xfce4-minicmd-plugin = 0.4-9 +Obsoletes: xfce4-minicmd-plugin =< 0.4-8.fc9 + %description This plugin is like the (quite old) xfce4-minicmd-plugin, except that it ships @@ -52,6 +56,9 @@ %{_bindir}/verve-focus %changelog +* Thu Jul 10 2008 Christoph Wickert - 0.3.5-6 +- Obsolte the xfce4-minicmd-plugin + * Wed Jun 11 2008 Christoph Wickert - 0.3.5-5 - BuildRequire dbus-glib-devel for all releases (#449438) From fedora-extras-commits at redhat.com Thu Jul 10 16:58:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 16:58:49 GMT Subject: rpms/apr-util/devel apr-util.spec,1.55,1.56 Message-ID: <200807101658.m6AGwntu013596@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/apr-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13540 Modified Files: apr-util.spec Log Message: rebuild against db4 4.7 Index: apr-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- apr-util.spec 8 Jul 2008 07:59:47 -0000 1.55 +++ apr-util.spec 10 Jul 2008 16:58:05 -0000 1.56 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.3.2 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -183,6 +183,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 1.3.2-6 +- rebuild for new db4-4.7 + * Tue Jul 8 2008 Joe Orton 1.3.2-5 - restore requires for openldap-devel from -devel From fedora-extras-commits at redhat.com Thu Jul 10 17:05:16 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 10 Jul 2008 17:05:16 GMT Subject: rpms/jd/F-9 .cvsignore, 1.263, 1.264 jd.spec, 1.300, 1.301 sources, 1.264, 1.265 Message-ID: <200807101705.m6AH5GVi020582@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20478/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Fri Jul 11 2008 Mamoru Tasaka - rev 2188 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- .cvsignore 9 Jul 2008 17:16:36 -0000 1.263 +++ .cvsignore 10 Jul 2008 17:04:25 -0000 1.264 @@ -1 +1 @@ -jd-2.0.0-svn2187_trunk.tgz +jd-2.0.0-svn2188_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- jd.spec 9 Jul 2008 17:16:36 -0000 1.300 +++ jd.spec 10 Jul 2008 17:04:25 -0000 1.301 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2187_trunk +%define strtag svn2188_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Thu Jul 10 2008 Mamoru Tasaka -- rev 2187 +* Fri Jul 11 2008 Mamoru Tasaka +- rev 2188 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- sources 9 Jul 2008 17:16:36 -0000 1.264 +++ sources 10 Jul 2008 17:04:25 -0000 1.265 @@ -1 +1 @@ -51bec6458fd2d4c02957922313f3bce2 jd-2.0.0-svn2187_trunk.tgz +75fd43e146b2c6116bc96fa4af488b10 jd-2.0.0-svn2188_trunk.tgz From fedora-extras-commits at redhat.com Thu Jul 10 17:05:18 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 17:05:18 GMT Subject: rpms/xfce4-minicmd-plugin/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE sources, 1.3, NONE xfce4-minicmd-plugin-0.4-multilib.patch, 1.1, NONE xfce4-minicmd-plugin.spec, 1.11, NONE Message-ID: <200807101705.m6AH5IJp020586@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-minicmd-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20537 Added Files: dead.package Removed Files: .cvsignore sources xfce4-minicmd-plugin-0.4-multilib.patch xfce4-minicmd-plugin.spec Log Message: Retire xfce4-minicmd-plugin, obsoleted by verve-plugin --- NEW FILE dead.package --- Replaced by xfce4-verve-plugin in >= F-10 --- .cvsignore DELETED --- --- sources DELETED --- --- xfce4-minicmd-plugin-0.4-multilib.patch DELETED --- --- xfce4-minicmd-plugin.spec DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 17:05:24 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 10 Jul 2008 17:05:24 GMT Subject: rpms/jd/F-8 .cvsignore, 1.256, 1.257 jd.spec, 1.289, 1.290 sources, 1.257, 1.258 Message-ID: <200807101705.m6AH5O1p020601@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20478/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Fri Jul 11 2008 Mamoru Tasaka - rev 2188 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- .cvsignore 9 Jul 2008 17:16:15 -0000 1.256 +++ .cvsignore 10 Jul 2008 17:04:03 -0000 1.257 @@ -1 +1 @@ -jd-2.0.0-svn2187_trunk.tgz +jd-2.0.0-svn2188_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- jd.spec 9 Jul 2008 17:16:15 -0000 1.289 +++ jd.spec 10 Jul 2008 17:04:03 -0000 1.290 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2187_trunk +%define strtag svn2188_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Thu Jul 10 2008 Mamoru Tasaka -- rev 2187 +* Fri Jul 11 2008 Mamoru Tasaka +- rev 2188 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- sources 9 Jul 2008 17:16:15 -0000 1.257 +++ sources 10 Jul 2008 17:04:03 -0000 1.258 @@ -1 +1 @@ -51bec6458fd2d4c02957922313f3bce2 jd-2.0.0-svn2187_trunk.tgz +75fd43e146b2c6116bc96fa4af488b10 jd-2.0.0-svn2188_trunk.tgz From fedora-extras-commits at redhat.com Thu Jul 10 17:05:33 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 10 Jul 2008 17:05:33 GMT Subject: rpms/jd/devel .cvsignore, 1.263, 1.264 jd.spec, 1.306, 1.307 sources, 1.264, 1.265 Message-ID: <200807101705.m6AH5XiJ020608@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20478/devel Modified Files: .cvsignore jd.spec sources Log Message: * Fri Jul 11 2008 Mamoru Tasaka - rev 2188 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- .cvsignore 9 Jul 2008 17:16:57 -0000 1.263 +++ .cvsignore 10 Jul 2008 17:04:47 -0000 1.264 @@ -1 +1 @@ -jd-2.0.0-svn2187_trunk.tgz +jd-2.0.0-svn2188_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- jd.spec 9 Jul 2008 17:16:57 -0000 1.306 +++ jd.spec 10 Jul 2008 17:04:47 -0000 1.307 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2187_trunk +%define strtag svn2188_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Thu Jul 10 2008 Mamoru Tasaka -- rev 2187 +* Fri Jul 11 2008 Mamoru Tasaka +- rev 2188 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- sources 9 Jul 2008 17:16:57 -0000 1.264 +++ sources 10 Jul 2008 17:04:47 -0000 1.265 @@ -1 +1 @@ -51bec6458fd2d4c02957922313f3bce2 jd-2.0.0-svn2187_trunk.tgz +75fd43e146b2c6116bc96fa4af488b10 jd-2.0.0-svn2188_trunk.tgz From fedora-extras-commits at redhat.com Thu Jul 10 17:06:56 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Thu, 10 Jul 2008 17:06:56 GMT Subject: rpms/perl-MooseX-Getopt/devel perl-MooseX-Getopt.spec,1.5,1.6 Message-ID: <200807101706.m6AH6uYR020765@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-MooseX-Getopt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617 Modified Files: perl-MooseX-Getopt.spec Log Message: * Thu Jul 10 2008 Chris Weyl 0.13-2 - tweak Getopt::Long dep to 2.35; passes tests just fine with 2.35, and that's what we have in F-8 perl Index: perl-MooseX-Getopt.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/perl-MooseX-Getopt.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-MooseX-Getopt.spec 28 Jun 2008 19:45:42 -0000 1.5 +++ perl-MooseX-Getopt.spec 10 Jul 2008 17:05:59 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-MooseX-Getopt Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Moose role for processing command line options License: GPL+ or Artistic Group: Development/Libraries @@ -12,7 +12,8 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Getopt::Long::Descriptive) -BuildRequires: perl(Getopt::Long) >= 2.37 +# 2.35 is what we have in F-8 perl -- tests all pass +BuildRequires: perl(Getopt::Long) >= 2.35 BuildRequires: perl(Moose) >= 0.43 # tests... @@ -31,6 +32,8 @@ %prep %setup -q -n MooseX-Getopt-%{version} +perl -pi -e 's/2.37/2.35/' Makefile.PL + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -58,6 +61,10 @@ %{_mandir}/man3/* %changelog +* Thu Jul 10 2008 Chris Weyl 0.13-2 +- tweak Getopt::Long dep to 2.35; passes tests just fine with 2.35, and that's + what we have in F-8 perl + * Sat Jun 28 2008 Chris Weyl 0.13-1 - update to 0.13 - switch to Module::Install invocations, rather than Module::Build From fedora-extras-commits at redhat.com Thu Jul 10 17:08:07 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 10 Jul 2008 17:08:07 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.44, 1.45 cairo-dock.spec, 1.57, 1.58 sources, 1.44, 1.45 Message-ID: <200807101708.m6AH87hJ020951@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20873 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Thu Jul 10 2008 Mamoru Tasaka - rev. 1185 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 9 Jul 2008 17:18:33 -0000 1.44 +++ .cvsignore 10 Jul 2008 17:07:17 -0000 1.45 @@ -1 +1 @@ -cairo-dock-sources-svn1185_trunk.tar.bz2 +cairo-dock-sources-svn1188_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- cairo-dock.spec 9 Jul 2008 17:21:50 -0000 1.57 +++ cairo-dock.spec 10 Jul 2008 17:07:17 -0000 1.58 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1185_trunk +%define tarballver svn1188_trunk %define mainver 1.6.1 %define build_gecko 1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 9 Jul 2008 17:18:33 -0000 1.44 +++ sources 10 Jul 2008 17:07:17 -0000 1.45 @@ -1 +1 @@ -729be624fefd767225b11d8f28b96eca cairo-dock-sources-svn1185_trunk.tar.bz2 +2d8c4e957b2c359dff5541584b7c1709 cairo-dock-sources-svn1188_trunk.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 17:10:37 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 17:10:37 GMT Subject: comps comps-f10.xml.in,1.44,1.45 Message-ID: <200807101710.m6AHAbOs021145@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21075 Modified Files: comps-f10.xml.in Log Message: removed xfce4-minicmd-plugin, replaced by xfce4-verve-plugin in >= F-10 Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- comps-f10.xml.in 9 Jul 2008 20:08:41 -0000 1.44 +++ comps-f10.xml.in 10 Jul 2008 17:10:07 -0000 1.45 @@ -4518,7 +4518,6 @@ xfce4-fsguard-plugin xfce4-genmon-plugin xfce4-gsynaptics-mcs-plugin - xfce4-minicmd-plugin xfce4-mount-plugin xfce4-netload-plugin xfce4-notes-plugin From fedora-extras-commits at redhat.com Thu Jul 10 17:11:30 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 10 Jul 2008 17:11:30 GMT Subject: rpms/libtirpc/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200807101711.m6AHBUsv021208@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libtirpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21135 Modified Files: .cvsignore sources Log Message: Uploaded new tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libtirpc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Jun 2008 19:42:19 -0000 1.3 +++ .cvsignore 10 Jul 2008 17:10:38 -0000 1.4 @@ -1,2 +1,3 @@ libtirpc-0.1.7.tar.bz2 libtirpc-0.1.8.tar.bz2 +libtirpc-0.1.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libtirpc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jun 2008 19:42:19 -0000 1.3 +++ sources 10 Jul 2008 17:10:38 -0000 1.4 @@ -1 +1 @@ -22b28d3799aab5d13ffbb2ab82cb7deb libtirpc-0.1.8.tar.bz2 +ee8b0aecadc45e00a2fd654f178c6247 libtirpc-0.1.9.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 17:13:05 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 17:13:05 GMT Subject: rpms/nagios/devel nagios.spec,1.53,1.54 Message-ID: <200807101713.m6AHD5ZZ021270@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200 Modified Files: nagios.spec Log Message: Builds local, but not in mock. Not sure why. Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- nagios.spec 10 Jul 2008 16:32:05 -0000 1.53 +++ nagios.spec 10 Jul 2008 17:11:47 -0000 1.54 @@ -117,6 +117,7 @@ %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/conf.d %{__install} -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/%{name}/conf.d/internet.cfg %{__install} -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/%{name}/.htpasswd +%{__install} -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/spool/checkresults %{__mkdir} -p %{buildroot}/%{_initrddir} %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ From fedora-extras-commits at redhat.com Thu Jul 10 17:13:51 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 10 Jul 2008 17:13:51 GMT Subject: rpms/gdm/devel icon-names.patch,NONE,1.1 gdm.spec,1.395,1.396 Message-ID: <200807101713.m6AHDptD021408@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21262 Modified Files: gdm.spec Added Files: icon-names.patch Log Message: fix some broken icons icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c --- gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.icon-names 2008-07-10 12:55:21.000000000 -0400 +++ gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c 2008-07-10 12:57:47.000000000 -0400 @@ -233,7 +233,7 @@ gdm_language_option_widget_new (void) object = g_object_new (GDM_TYPE_LANGUAGE_OPTION_WIDGET, "label-text", _("_Language:"), - "icon-name", "config-language", + "icon-name", "preferences-desktop-locale", "max-item-count", 8, NULL); diff -up gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c --- gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c.icon-names 2008-07-10 13:08:38.000000000 -0400 +++ gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c 2008-07-10 13:06:41.000000000 -0400 @@ -226,7 +226,7 @@ gdm_layout_option_widget_new (void) object = g_object_new (GDM_TYPE_LAYOUT_OPTION_WIDGET, "label-text", _("_Keyboard:"), - "icon-name", "keyboard", + "icon-name", "preferences-desktop-keyboard", "max-item-count", 8, NULL); diff -up gdm-2.22.0/gui/simple-greeter/gdm-session-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-session-option-widget.c Index: gdm.spec =================================================================== RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v retrieving revision 1.395 retrieving revision 1.396 diff -u -r1.395 -r1.396 --- gdm.spec 10 Jul 2008 16:00:26 -0000 1.395 +++ gdm.spec 10 Jul 2008 17:13:02 -0000 1.396 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.22.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -91,6 +91,9 @@ # fixed in upstream svn Patch10: lang-tag.patch +# fixed in upstream svn +Patch11: icon-names.patch + # Fedora-specific Patch99: gdm-2.21.8-fedora-logo.patch @@ -316,6 +319,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Thu Jul 10 2008 Matthias Clasen - 1:2.22.0-11 +- Fix some broken icons on the login screen + * Thu Jul 10 2008 Matthias Clasen - 1:2.22.0-10 - Improve rendering of languages From fedora-extras-commits at redhat.com Thu Jul 10 17:20:08 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 10 Jul 2008 17:20:08 GMT Subject: rpms/policycoreutils/F-9 policycoreutils-gui.patch, 1.68, 1.69 policycoreutils-po.patch, 1.36, 1.37 policycoreutils-rhat.patch, 1.370, 1.371 policycoreutils.spec, 1.529, 1.530 Message-ID: <200807101720.m6AHK8Xk021792@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21643 Modified Files: policycoreutils-gui.patch policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jul 9 2008 Dan Walsh 2.0.52-5 - Additial cleanup of boolean handling for semanage policycoreutils-gui.patch: Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-gui.patch,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- policycoreutils-gui.patch 3 Jul 2008 20:21:26 -0000 1.68 +++ policycoreutils-gui.patch 10 Jul 2008 17:19:14 -0000 1.69 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.52/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/Makefile 2008-07-03 13:15:10.000000000 -0400 ++++ policycoreutils-2.0.52/gui/Makefile 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,36 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -40,7 +40,7 @@ +relabel: diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.52/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/booleansPage.py 2008-07-03 13:08:37.000000000 -0400 ++++ policycoreutils-2.0.52/gui/booleansPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,237 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -281,7 +281,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.52/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/fcontextPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/fcontextPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,217 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -502,7 +502,7 @@ + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.52/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.glade 2008-07-03 12:38:35.000000000 -0400 ++++ policycoreutils-2.0.52/gui/lockdown.glade 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,771 @@ + + @@ -1277,7 +1277,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.52/gui/lockdown.gladep --- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.gladep 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/lockdown.gladep 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,7 @@ + + @@ -1288,7 +1288,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.52/gui/lockdown.py --- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.py 2008-07-03 12:38:24.000000000 -0400 ++++ policycoreutils-2.0.52/gui/lockdown.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,382 @@ +#!/usr/bin/python +# @@ -1674,7 +1674,7 @@ + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.52/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/loginsPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/loginsPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1863,7 +1863,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.52/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/mappingsPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/mappingsPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1923,7 +1923,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.52/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/modulesPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/modulesPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,195 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2122,7 +2122,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.52/gui/polgen.glade --- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgen.glade 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/polgen.glade 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,3284 @@ + + @@ -5410,7 +5410,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.52/gui/polgen.py --- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgen.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/polgen.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,925 @@ +#!/usr/bin/python +# @@ -6339,7 +6339,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.52/gui/polgengui.py --- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgengui.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/polgengui.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,623 @@ +#!/usr/bin/python -E +# @@ -6966,8 +6966,8 @@ + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.52/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/portsPage.py 2008-07-02 13:43:21.000000000 -0400 -@@ -0,0 +1,258 @@ ++++ policycoreutils-2.0.52/gui/portsPage.py 2008-07-08 15:48:27.000000000 -0400 +@@ -0,0 +1,259 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. + @@ -7172,9 +7172,10 @@ + port_number = self.ports_number_entry.get_text().strip() + if port_number == "": + port_number = "1" -+ if not port_number.isdigit(): -+ self.error(_("Port number \"%s\" is not valid. 0 < PORT_NUMBER < 65536 ") % port_number ) -+ return False ++ for i in port_number.split("-"): ++ if not i.isdigit(): ++ self.error(_("Port number \"%s\" is not valid. 0 < PORT_NUMBER < 65536 ") % port_number ) ++ return False + list_model = self.ports_protocol_combo.get_model() + iter = self.ports_protocol_combo.get_active_iter() + protocol = list_model.get_value(iter,0) @@ -7228,7 +7229,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.52/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/selinux.tbl 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/selinux.tbl 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,234 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /") @@ -7466,7 +7467,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.52/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/semanagePage.py 2008-07-03 13:10:29.000000000 -0400 ++++ policycoreutils-2.0.52/gui/semanagePage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,169 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -7639,7 +7640,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.52/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/statusPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/statusPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,191 @@ +# statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -7834,7 +7835,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.52/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/system-config-selinux.glade 2008-07-03 13:08:31.000000000 -0400 ++++ policycoreutils-2.0.52/gui/system-config-selinux.glade 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,3221 @@ + + @@ -11059,7 +11060,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.52/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/system-config-selinux.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/system-config-selinux.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,187 @@ +#!/usr/bin/python +# @@ -11250,7 +11251,7 @@ + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.52/gui/templates/__init__.py --- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/__init__.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/__init__.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,18 @@ +# +# Copyright (C) 2007 Red Hat, Inc. @@ -11272,7 +11273,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.52/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/boolean.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/boolean.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11316,7 +11317,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.52/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/etc_rw.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/etc_rw.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11449,7 +11450,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.52/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/executable.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/executable.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,327 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11780,7 +11781,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.52/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/network.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/network.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -11864,7 +11865,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.52/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/rw.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/rw.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11996,7 +11997,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.52/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/script.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/script.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12105,7 +12106,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.52/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/semodule.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/semodule.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12150,7 +12151,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.52/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/tmp.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/tmp.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12251,7 +12252,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.52/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/user.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/user.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12437,7 +12438,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.52/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_lib.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_lib.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12599,7 +12600,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.52/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_log.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_log.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12713,7 +12714,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.52/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_run.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_run.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12835,7 +12836,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.52/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_spool.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/templates/var_spool.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12968,7 +12969,7 @@ +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.52/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/translationsPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/translationsPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -13090,7 +13091,7 @@ + self.store.set_value(iter, 1, translation) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.52/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/usersPage.py 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/gui/usersPage.py 2008-07-03 16:17:11.000000000 -0400 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. policycoreutils-po.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.36 -r 1.37 policycoreutils-po.patch Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-po.patch,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- policycoreutils-po.patch 2 Jul 2008 02:08:02 -0000 1.36 +++ policycoreutils-po.patch 10 Jul 2008 17:19:14 -0000 1.37 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.50/po/.cvsignore +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.52/po/.cvsignore --- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/po/.cvsignore 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/.cvsignore 2008-07-03 16:17:10.000000000 -0400 @@ -0,0 +1,16 @@ +*.gmo +*.mo @@ -18,9 +18,9 @@ +po2tbl.sed.in +stamp-cat-id +stamp-it -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.50/po/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.52/po/Makefile --- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/Makefile 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/Makefile 2008-07-03 16:17:10.000000000 -0400 @@ -23,20 +23,61 @@ POFILES = $(wildcard *.po) MOFILES = $(patsubst %.po,%.mo,$(POFILES)) @@ -100,9 +100,9 @@ install: $(MOFILES) @for n in $(MOFILES); do \ l=`basename $$n .mo`; \ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.50/po/POTFILES +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.52/po/POTFILES --- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/POTFILES 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES 2008-07-03 16:17:10.000000000 -0400 @@ -1,10 +1,54 @@ - ../load_policy/load_policy.c \ - ../newrole/newrole.c \ @@ -166,9 +166,9 @@ + ../gui/templates/var_spool.py \ + ../secon/secon.c \ + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.50/po/POTFILES.in +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.52/po/POTFILES.in --- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/POTFILES.in 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES.in 2008-07-03 16:17:10.000000000 -0400 @@ -2,9 +2,7 @@ run_init/run_init.c semodule_link/semodule_link.c @@ -228,9 +228,9 @@ +gui/templates/var_run.py +gui/templates/var_spool.py secon/secon.c -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.50/po/af.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.52/po/af.po --- nsapolicycoreutils/po/af.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/af.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/af.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -4002,9 +4002,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.50/po/am.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.52/po/am.po --- nsapolicycoreutils/po/am.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/am.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/am.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -7776,9 +7776,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.50/po/ar.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.52/po/ar.po --- nsapolicycoreutils/po/ar.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/ar.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ar.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -11550,9 +11550,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.50/po/as.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.52/po/as.po --- nsapolicycoreutils/po/as.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/as.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/as.po 2008-07-08 08:47:28.000000000 -0400 @@ -1,1028 +1,3566 @@ # translation of as.po to Assamese # This file is distributed under the same license as the PACKAGE package. @@ -15832,9 +15832,9 @@ +#~ "MLS/\n" +#~ "MCS Level" +#~ msgstr "????????????" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.50/po/autom4te.cache/requests +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.52/po/autom4te.cache/requests --- nsapolicycoreutils/po/autom4te.cache/requests 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/po/autom4te.cache/requests 2008-06-30 11:49:38.000000000 -0400 ++++ policycoreutils-2.0.52/po/autom4te.cache/requests 2008-07-03 16:17:10.000000000 -0400 @@ -0,0 +1,63 @@ +# This file was generated. +# It contains the lists of macros which have been traced. @@ -15899,9 +15899,9 @@ + ], 'Autom4te::Request' ) + ); + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.50/po/be.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.52/po/be.po --- nsapolicycoreutils/po/be.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/be.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/be.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -19673,9 +19673,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.50/po/bg.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.52/po/bg.po --- nsapolicycoreutils/po/bg.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/bg.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bg.po 2008-07-08 08:47:28.000000000 -0400 @@ -1,1028 +1,3877 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -24322,9 +24322,9 @@ + +#~ msgid "You must be root to run %s." +#~ msgstr "???????????? ???? ?????? root ???? ???? ???????????????????? %s." -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.50/po/bn.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.52/po/bn.po --- nsapolicycoreutils/po/bn.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/bn.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn.po 2008-07-08 08:47:28.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -28096,9 +28096,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.50/po/bn_IN.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.52/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/bn_IN.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn_IN.po 2008-07-08 08:47:28.000000000 -0400 @@ -1,1079 +1,3401 @@ -# translation of bn_IN.po to Bengali India -# translation of bn_IN.po to Bangla (INDIA) @@ -32166,9 +32166,9 @@ +#~ "Enforcing\n" +#~ "Permissive\n" +#~ "Disabled\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.50/po/bs.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.52/po/bs.po --- nsapolicycoreutils/po/bs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/bs.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/bs.po 2008-07-08 08:47:29.000000000 -0400 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: bs\n" @@ -36289,9 +36289,9 @@ +#~ msgid "Options Error: %s " +#~ msgstr "Opciona gre??ka: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.50/po/ca.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.52/po/ca.po --- nsapolicycoreutils/po/ca.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/ca.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ca.po 2008-07-08 08:47:29.000000000 -0400 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -40364,9 +40364,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "Error en les opcions: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.50/po/cs.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.52/po/cs.po --- nsapolicycoreutils/po/cs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/cs.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/cs.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1028 +1,8926 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -49909,9 +49909,9 @@ + +#~ msgid "_Save to floppy" [...18355 lines suppressed...] -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.50/po/sk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.52/po/sk.po --- nsapolicycoreutils/po/sk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/sk.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sk.po 2008-07-08 08:47:29.000000000 -0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -244929,9 +244532,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "Chyba volieb: %s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.50/po/sl.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.52/po/sl.po --- nsapolicycoreutils/po/sl.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sl.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sl.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -248703,9 +248306,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.50/po/sq.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.52/po/sq.po --- nsapolicycoreutils/po/sq.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sq.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sq.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -252477,9 +252080,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.50/po/sr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.52/po/sr.po --- nsapolicycoreutils/po/sr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sr.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1117 +1,3432 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian # Serbian translations for policycoreutils @@ -256618,9 +256221,9 @@ +#~ "??????????????????????\n" +#~ "??????????????????\n" +#~ "??????????????????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-2.0.50/po/sr at Latn.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-2.0.52/po/sr at Latn.po --- nsapolicycoreutils/po/sr at Latn.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/sr at Latn.po 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.52/po/sr at Latn.po 1969-12-31 19:00:00.000000000 -0500 @@ -1,1117 +0,0 @@ -# Serbian(Latin) translations for policycoreutils -# Copyright (C) 2006 Red Hat, Inc. @@ -257739,9 +257342,9 @@ -msgid "Options Error: %s " -msgstr "Gre??ka opcija: %s " - -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.50/po/sr at latin.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.52/po/sr at latin.po --- nsapolicycoreutils/po/sr at latin.po 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.50/po/sr at latin.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr at latin.po 2008-07-08 08:47:29.000000000 -0400 @@ -0,0 +1,3434 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian +# Serbian(Latin) translations for policycoreutils @@ -261177,9 +260780,9 @@ +#~ "Primoravanje\n" +#~ "Dopu??tanje\n" +#~ "Isklju??eno\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.50/po/sv.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.52/po/sv.po --- nsapolicycoreutils/po/sv.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/sv.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/sv.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1040 +1,3368 @@ # Swedish messages for policycoreutils. -# Copyright (C) Christian Rose , 2006. @@ -265349,9 +264952,9 @@ -msgstr "Flaggfel: %s " +#~ msgid "Options Error: %s " +#~ msgstr "Flaggfel: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.50/po/ta.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.52/po/ta.po --- nsapolicycoreutils/po/ta.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/ta.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ta.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1043 +1,3363 @@ # translation of ta.po to Tamil # This file is distributed under the same license as the PACKAGE package. @@ -269515,9 +269118,9 @@ +#~ msgstr "" +#~ "MLS/\n" +#~ "MCS ????????????" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.50/po/te.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.52/po/te.po --- nsapolicycoreutils/po/te.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/te.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/te.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1028 +1,3381 @@ -# SOME DESCRIPTIVE TITLE. +# translation of new_policycoreutils.HEAD.te.po to Telugu @@ -273671,9 +273274,9 @@ +#~ "?????????????????????\n" +#~ "????????????????????????\n" +#~ "????????????????????????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.50/po/th.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.52/po/th.po --- nsapolicycoreutils/po/th.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/th.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/th.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -277445,9 +277048,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.50/po/tr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.52/po/tr.po --- nsapolicycoreutils/po/tr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/tr.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/tr.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -281219,9 +280822,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.50/po/uk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.52/po/uk.po --- nsapolicycoreutils/po/uk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.50/po/uk.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/uk.po 2008-07-08 08:47:29.000000000 -0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -285269,9 +284872,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "?????????????? ?? ????????????????????: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.50/po/ur.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.52/po/ur.po --- nsapolicycoreutils/po/ur.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/ur.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/ur.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -289043,9 +288646,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.50/po/vi.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.52/po/vi.po --- nsapolicycoreutils/po/vi.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/vi.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/vi.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -292817,9 +292420,9 @@ +#, python-format +msgid "SELinux user '%s' is required" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.50/po/zh_CN.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.52/po/zh_CN.po --- nsapolicycoreutils/po/zh_CN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/zh_CN.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_CN.po 2008-07-08 08:47:29.000000000 -0400 @@ -1,1045 +1,3343 @@ -# translation of zh_CN.po to -# translation of zh_CN.po to @@ -296795,9 +296398,9 @@ +#~ "??????\n" +#~ "??????\n" +#~ "??????\n" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.50/po/zh_TW.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.52/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/zh_TW.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_TW.po 2008-07-08 08:47:29.000000000 -0400 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zh_TW\n" @@ -300837,9 +300440,9 @@ + +#~ msgid "Options Error: %s " +#~ msgstr "???????????????%s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.50/po/zu.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.52/po/zu.po --- nsapolicycoreutils/po/zu.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.50/po/zu.po 2008-06-30 11:50:00.000000000 -0400 ++++ policycoreutils-2.0.52/po/zu.po 2008-07-08 08:47:29.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-rhat.patch,v retrieving revision 1.370 retrieving revision 1.371 diff -u -r1.370 -r1.371 --- policycoreutils-rhat.patch 3 Jul 2008 20:21:26 -0000 1.370 +++ policycoreutils-rhat.patch 10 Jul 2008 17:19:15 -0000 1.371 @@ -1,21 +1,15 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile --- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/Makefile 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-09 08:44:40.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/VERSION policycoreutils-2.0.52/VERSION ---- nsapolicycoreutils/VERSION 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/VERSION 2008-07-02 13:42:54.000000000 -0400 -@@ -1 +1 @@ --2.0.52 -+2.0.51 diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-02 13:43:21.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-09 08:44:40.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -44,7 +38,7 @@ close(fd); diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-03 13:06:55.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-09 08:44:58.000000000 -0400 @@ -51,7 +51,7 @@ semanage interface -{a|d|m} [-tr] interface_spec semanage fcontext -{a|d|m} [-frst] file_spec @@ -82,7 +76,7 @@ - deleteall = 0 - list = 0 - locallist = 0 -+ value = "" ++ value = None + add = False + modify = False + delete = False @@ -190,23 +184,18 @@ OBJECT.add(target, rlist, selevel, serange, prefix) if object == "port": -@@ -317,7 +325,12 @@ +@@ -317,7 +325,7 @@ if modify: if object == "boolean": - OBJECT.modify(target, value) -+ if use_file: -+ OBJECT.modify(target, use_file = use_file) -+ else: -+ if value == "": -+ raise ValueError(_("boolean requires value")) -+ OBJECT.modify(target, value) ++ OBJECT.modify(target, value, use_file) if object == "login": OBJECT.modify(target, seuser, serange) diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-03 13:14:31.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-09 08:44:40.000000000 -0400 @@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool @@ -243,19 +232,41 @@ .TP diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-03 13:07:45.000000000 -0400 -@@ -567,7 +562,7 @@ - def __init__(self, store = ""): - semanageRecords.__init__(self, store) ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-09 08:55:45.000000000 -0400 +@@ -330,20 +330,15 @@ + for name in dirs: + os.rmdir(os.path.join(root, name)) -- def add(self, name, roles, selevel, serange, prefix): -+ def add(self, name, roles, selevel, serange, prefix = "user"): - if is_mls_enabled == 1: - if serange == "": - serange = "s0" -@@ -1448,53 +1443,58 @@ +- if rc != 0: +- raise ValueError(out) +- +- + def delete(self, name): + for n in name.split(): + rc = semanage_module_remove(self.sh, "permissive_%s" % n) + if rc < 0: + raise ValueError(_("Could not remove permissive domain %s (remove failed)") % name) +- rc = semanage_commit(self.sh) +- if rc < 0: ++ rc = semanage_commit(self.sh) ++ if rc < 0: + raise ValueError(_("Could not remove permissive domain %s (commit failed)") % name) + +- + def deleteall(self): + l = self.get_all() + if len(l) > 0: +@@ -1447,54 +1442,72 @@ + class booleanRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) ++ self.dict={} ++ self.dict["TRUE"] = 1 ++ self.dict["FALSE"] = 0 ++ self.dict["ON"] = 1 ++ self.dict["OFF"] = 0 ++ self.dict["1"] = 1 ++ self.dict["0"] = 0 - def modify(self, name, value = ""): - if value == "": @@ -291,11 +302,11 @@ - if value != "": - nvalue = int(value) - semanage_bool_set_value(b, nvalue) -+ if value != "": -+ nvalue = int(value) -+ semanage_bool_set_value(b, nvalue) ++ if value.upper() in self.dict: ++ semanage_bool_set_value(b, self.dict[value.upper()]) else: - raise ValueError(_("You must specify a value")) +- raise ValueError(_("You must specify a value")) ++ raise ValueError(_("You must specify one of the following values: %s") % ", ".join(self.dict.keys()) ) + + rc = semanage_bool_set_active(self.sh, k, b) + if rc < 0: @@ -306,7 +317,7 @@ + semanage_bool_key_free(k) + semanage_bool_free(b) -+ def modify(self, name, value=False, use_file=False): ++ def modify(self, name, value=None, use_file=False): + rc = semanage_begin_transaction(self.sh) if rc < 0: @@ -320,9 +331,16 @@ - raise ValueError(_("Could not modify boolean %s") % name) + if use_file: + fd = open(name) -+ for b in fd.read().split(): -+ bool, val = b.split("=") -+ self.__mod(bool, val) ++ for b in fd.read().split("\n"): ++ b = b.strip() ++ if len(b) == 0: ++ continue ++ ++ try: ++ boolname, val = b.split("=") ++ except ValueError, e: ++ raise ValueError(_("Bad format %s: Record %s" % ( name, b) )) ++ self.__mod(boolname.strip(), val.strip()) + fd.close() + else: + self.__mod(name, value) @@ -345,7 +363,7 @@ (rc,exists) = semanage_bool_exists(self.sh, k) if rc < 0: raise ValueError(_("Could not check if boolean %s is defined") % name) -@@ -1571,8 +1571,15 @@ +@@ -1571,8 +1584,15 @@ else: return _("unknown") Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils.spec,v retrieving revision 1.529 retrieving revision 1.530 diff -u -r1.529 -r1.530 --- policycoreutils.spec 3 Jul 2008 20:21:26 -0000 1.529 +++ policycoreutils.spec 10 Jul 2008 17:19:15 -0000 1.530 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 -Release: 2%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,15 @@ fi %changelog +* Wed Jul 9 2008 Dan Walsh 2.0.52-5 +- Additial cleanup of boolean handling for semanage + +* Tue Jul 8 2008 Dan Walsh 2.0.52-4 +- Handle ranges of ports in gui + +* Tue Jul 8 2008 Dan Walsh 2.0.52-3 +- Fix indent problems in seobject + * Wed Jul 2 2008 Dan Walsh 2.0.52-2 - Add lockdown wizard - Allow semanage booleans to take an input file an process lots of booleans at once. From fedora-extras-commits at redhat.com Thu Jul 10 17:20:11 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Thu, 10 Jul 2008 17:20:11 GMT Subject: rpms/fwbackups/F-9 fwbackups-1.43.2rc2-backend_fixes.patch, NONE, 1.1 fwbackups.spec, 1.16, 1.17 Message-ID: <200807101720.m6AHKBmx021806@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611/F-9 Modified Files: fwbackups.spec Added Files: fwbackups-1.43.2rc2-backend_fixes.patch Log Message: Fix errors relating to backend.py fwbackups-1.43.2rc2-backend_fixes.patch: --- NEW FILE fwbackups-1.43.2rc2-backend_fixes.patch --- --- src/fwbackups/backend.py.old 2008-05-31 17:38:32.000000000 -0400 +++ src/fwbackups/backend.py 2008-07-10 02:03:41.000000000 -0400 @@ -116,26 +116,24 @@ """ if os.path.exists(folder): if not os.path.isdir(folder): # what if the user gave a file? - error = _('Destination `%s\' exists but is not a folder!.') % folder - self.logger.logmsg('ERROR', error) - #raise EngineError(error) - return False - else: # try to create the folder - if not (self.engine == 'rsync' and self.incremental == True): - try: - os.mkdir(folder, 0755) - self.logger.logmsg('DEBUG', _('Created destination folder `%s\'') % folder) - except: - error = _('The destination folder `%s\' could not be created.') % folder - self.logger.logmsg('ERROR', error) - #raise EngineError(error) - return False - - if not fwbackups.CheckPerms(folder): # make sure it's writable - error = _('You do not have read and write permissions on the destination `%s\'' % folder) + self.logger.logmsg('WARNING', _('Destination `%s\' exists but is not a folder! Removing.') % folder) + shutil_modded.rmtree(path=folder, onerror=self.onError) + # try to create the folder + if not (self.engine == 'rsync' and self.incremental == True): + try: + os.mkdir(folder, 0755) + self.logger.logmsg('DEBUG', _('Created destination folder `%s\'') % folder) + except: + error = _('The destination folder `%s\' could not be created.') % folder self.logger.logmsg('ERROR', error) #raise EngineError(error) return False + + if not fwbackups.CheckPerms(folder): # make sure it's writable + error = _('You do not have read and write permissions on the destination `%s\'' % folder) + self.logger.logmsg('ERROR', error) + #raise EngineError(error) + return False return True def removeIfExists(self, treefile): @@ -314,7 +312,7 @@ # non recursive - Skip dirs if self.recursive == False and os.path.isdir(path): continue # move on to next file - paths.append("'%s'" % '\'\\\'\''.join(path.split('\''))) # wrap it in quotes for command line, and escape other ' + paths.append("'%s'" % '\'\\\'\''.join(path.split('\''))) # wrap it in quotes for command line, and escape other single quote if paths == []: self.logger.logmsg('WARNING', _('After parsing options, there are no paths to backup!') + ' paths == []') return False, -1 @@ -595,8 +593,9 @@ shutil_modded.copytree_fullpaths(i, self.dest) self.current += 1 else: - self.logger.logmsg('DEBUG', _('Running command: nice -n %(a)i %(b)s %(c)s %(d)s' % {'a': self.nice, 'b': command, 'c': i, 'd': self.dest})) - sub = fwbackups.executeSub('nice -n %i %s %s %s' % (self.nice, command, i, self.dest), env=self.environment, shell=True) + splitdest = '\'\\\'\''.join(self.dest.split('\'')) # wrap it in quotes for command line, and escape other single quote + self.logger.logmsg('DEBUG', _("Running command: nice -n %(a)i %(b)s %(c)s '%(d)s'" % {'a': self.nice, 'b': command, 'c': i, 'd': splitdest})) + sub = fwbackups.executeSub("nice -n %i %s %s '%s'" % (self.nice, command, i, splitdest), env=self.environment, shell=True) self.pids.append(sub.pid) self.logger.logmsg('DEBUG', _('Starting subprocess with PID %s') % sub.pid) # Sleep while not done. @@ -748,14 +747,18 @@ oldbackups.append(i) # ...And remove them. oldbackups.reverse() - if self.engine == 'rsync' and self.incremental == True: + if self.engine == 'rsync' and self.incremental == True and oldbackups: for i in oldbackups[:-1]: self.logger.logmsg('DEBUG', _('Removing old backup `%s\'') % i) shutil_modded.rmtree(path=ConvertPath('%s/%s' % (self.folderdest, i)), onerror=self.onError) - - source = ConvertPath('%s/%s' % (self.folderdest, oldbackups[-1])) - self.logger.logmsg('DEBUG', _('Moving `%s\' to `%s\'') % (source, self.dest)) - shutil_modded.move(source, self.dest) + oldIncrementalBackup = ConvertPath('%s/%s' % (self.folderdest, oldbackups[-1])) + if not oldIncrementalBackup.endswith('.tar') and not oldIncrementalBackup.endswith('.tar.gz') and \ + not oldIncrementalBackup.endswith('.tar.bz2'): # oldIncrementalBackup = rsync + self.logger.logmsg('DEBUG', _('Moving `%s\' to `%s\'') % (oldIncrementalBackup, self.dest)) + shutil_modded.move(oldIncrementalBackup, self.dest) + else: # source = is not a rsync backup - remove it and start fresh + self.logger.logmsg('DEBUG', _('`%s\' is not an rsync backup - removing.') % oldIncrementalBackup) + shutil_modded.rmtree(path=oldIncrementalBackup, onerror=self.onError) else: for i in oldbackups[self.tokeep:]: self.logger.logmsg('DEBUG', _('Removing old backup `%s\'') % i) Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-9/fwbackups.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fwbackups.spec 22 Jun 2008 17:42:06 -0000 1.16 +++ fwbackups.spec 10 Jul 2008 17:19:16 -0000 1.17 @@ -6,7 +6,7 @@ Name: fwbackups Version: 1.43.2 #Release: 1%{?dist} -Release: 0.4.%{pretag}%{?dist} +Release: 0.5.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving @@ -15,6 +15,7 @@ #Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz Patch0: fwbackups-1.43.2rc2-import-lowercase.patch +Patch1: fwbackups-1.43.2rc2-backend_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -41,6 +42,7 @@ %prep %setup -q -n %{name}-%{version}%{pretag} +%patch1 # uncomment me as needed pushd src/fwbackups %patch0 @@ -80,6 +82,9 @@ %doc AUTHORS COPYING ChangeLog NEWS TODO README %changelog +* Thu Jul 10 2008 Stewart Adam 1.43.2-0.5.rc2 +- Add patch to backend.py to fix errors with the rsync backend + * Sun Jun 22 2008 Stewart Adam 1.43.2-0.4.rc2 - Add patch to fix _import() functions From fedora-extras-commits at redhat.com Thu Jul 10 17:20:16 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Thu, 10 Jul 2008 17:20:16 GMT Subject: rpms/fwbackups/F-8 fwbackups-1.43.2rc2-backend_fixes.patch, NONE, 1.1 fwbackups.spec, 1.16, 1.17 Message-ID: <200807101720.m6AHKGNW021811@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611/F-8 Modified Files: fwbackups.spec Added Files: fwbackups-1.43.2rc2-backend_fixes.patch Log Message: Fix errors relating to backend.py fwbackups-1.43.2rc2-backend_fixes.patch: --- NEW FILE fwbackups-1.43.2rc2-backend_fixes.patch --- --- src/fwbackups/backend.py.old 2008-05-31 17:38:32.000000000 -0400 +++ src/fwbackups/backend.py 2008-07-10 02:03:41.000000000 -0400 @@ -116,26 +116,24 @@ """ if os.path.exists(folder): if not os.path.isdir(folder): # what if the user gave a file? - error = _('Destination `%s\' exists but is not a folder!.') % folder - self.logger.logmsg('ERROR', error) - #raise EngineError(error) - return False - else: # try to create the folder - if not (self.engine == 'rsync' and self.incremental == True): - try: - os.mkdir(folder, 0755) - self.logger.logmsg('DEBUG', _('Created destination folder `%s\'') % folder) - except: - error = _('The destination folder `%s\' could not be created.') % folder - self.logger.logmsg('ERROR', error) - #raise EngineError(error) - return False - - if not fwbackups.CheckPerms(folder): # make sure it's writable - error = _('You do not have read and write permissions on the destination `%s\'' % folder) + self.logger.logmsg('WARNING', _('Destination `%s\' exists but is not a folder! Removing.') % folder) + shutil_modded.rmtree(path=folder, onerror=self.onError) + # try to create the folder + if not (self.engine == 'rsync' and self.incremental == True): + try: + os.mkdir(folder, 0755) + self.logger.logmsg('DEBUG', _('Created destination folder `%s\'') % folder) + except: + error = _('The destination folder `%s\' could not be created.') % folder self.logger.logmsg('ERROR', error) #raise EngineError(error) return False + + if not fwbackups.CheckPerms(folder): # make sure it's writable + error = _('You do not have read and write permissions on the destination `%s\'' % folder) + self.logger.logmsg('ERROR', error) + #raise EngineError(error) + return False return True def removeIfExists(self, treefile): @@ -314,7 +312,7 @@ # non recursive - Skip dirs if self.recursive == False and os.path.isdir(path): continue # move on to next file - paths.append("'%s'" % '\'\\\'\''.join(path.split('\''))) # wrap it in quotes for command line, and escape other ' + paths.append("'%s'" % '\'\\\'\''.join(path.split('\''))) # wrap it in quotes for command line, and escape other single quote if paths == []: self.logger.logmsg('WARNING', _('After parsing options, there are no paths to backup!') + ' paths == []') return False, -1 @@ -595,8 +593,9 @@ shutil_modded.copytree_fullpaths(i, self.dest) self.current += 1 else: - self.logger.logmsg('DEBUG', _('Running command: nice -n %(a)i %(b)s %(c)s %(d)s' % {'a': self.nice, 'b': command, 'c': i, 'd': self.dest})) - sub = fwbackups.executeSub('nice -n %i %s %s %s' % (self.nice, command, i, self.dest), env=self.environment, shell=True) + splitdest = '\'\\\'\''.join(self.dest.split('\'')) # wrap it in quotes for command line, and escape other single quote + self.logger.logmsg('DEBUG', _("Running command: nice -n %(a)i %(b)s %(c)s '%(d)s'" % {'a': self.nice, 'b': command, 'c': i, 'd': splitdest})) + sub = fwbackups.executeSub("nice -n %i %s %s '%s'" % (self.nice, command, i, splitdest), env=self.environment, shell=True) self.pids.append(sub.pid) self.logger.logmsg('DEBUG', _('Starting subprocess with PID %s') % sub.pid) # Sleep while not done. @@ -748,14 +747,18 @@ oldbackups.append(i) # ...And remove them. oldbackups.reverse() - if self.engine == 'rsync' and self.incremental == True: + if self.engine == 'rsync' and self.incremental == True and oldbackups: for i in oldbackups[:-1]: self.logger.logmsg('DEBUG', _('Removing old backup `%s\'') % i) shutil_modded.rmtree(path=ConvertPath('%s/%s' % (self.folderdest, i)), onerror=self.onError) - - source = ConvertPath('%s/%s' % (self.folderdest, oldbackups[-1])) - self.logger.logmsg('DEBUG', _('Moving `%s\' to `%s\'') % (source, self.dest)) - shutil_modded.move(source, self.dest) + oldIncrementalBackup = ConvertPath('%s/%s' % (self.folderdest, oldbackups[-1])) + if not oldIncrementalBackup.endswith('.tar') and not oldIncrementalBackup.endswith('.tar.gz') and \ + not oldIncrementalBackup.endswith('.tar.bz2'): # oldIncrementalBackup = rsync + self.logger.logmsg('DEBUG', _('Moving `%s\' to `%s\'') % (oldIncrementalBackup, self.dest)) + shutil_modded.move(oldIncrementalBackup, self.dest) + else: # source = is not a rsync backup - remove it and start fresh + self.logger.logmsg('DEBUG', _('`%s\' is not an rsync backup - removing.') % oldIncrementalBackup) + shutil_modded.rmtree(path=oldIncrementalBackup, onerror=self.onError) else: for i in oldbackups[self.tokeep:]: self.logger.logmsg('DEBUG', _('Removing old backup `%s\'') % i) Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-8/fwbackups.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fwbackups.spec 22 Jun 2008 17:41:49 -0000 1.16 +++ fwbackups.spec 10 Jul 2008 17:18:38 -0000 1.17 @@ -6,7 +6,7 @@ Name: fwbackups Version: 1.43.2 #Release: 1%{?dist} -Release: 0.4.%{pretag}%{?dist} +Release: 0.5.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving @@ -15,6 +15,7 @@ #Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz Patch0: fwbackups-1.43.2rc2-import-lowercase.patch +Patch1: fwbackups-1.43.2rc2-backend_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -41,6 +42,7 @@ %prep %setup -q -n %{name}-%{version}%{pretag} +%patch1 # uncomment me as needed pushd src/fwbackups %patch0 @@ -80,6 +82,9 @@ %doc AUTHORS COPYING ChangeLog NEWS TODO README %changelog +* Thu Jul 10 2008 Stewart Adam 1.43.2-0.5.rc2 +- Add patch to backend.py to fix errors with the rsync backend + * Sun Jun 22 2008 Stewart Adam 1.43.2-0.4.rc2 - Add patch to fix _import() functions From fedora-extras-commits at redhat.com Thu Jul 10 17:20:34 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Thu, 10 Jul 2008 17:20:34 GMT Subject: rpms/fwbackups/devel fwbackups-1.43.2rc2-backend_fixes.patch, NONE, 1.1 fwbackups.spec, 1.17, 1.18 Message-ID: <200807101720.m6AHKYLT021826@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611/devel Modified Files: fwbackups.spec Added Files: fwbackups-1.43.2rc2-backend_fixes.patch Log Message: Fix errors relating to backend.py fwbackups-1.43.2rc2-backend_fixes.patch: --- NEW FILE fwbackups-1.43.2rc2-backend_fixes.patch --- --- src/fwbackups/backend.py.old 2008-05-31 17:38:32.000000000 -0400 +++ src/fwbackups/backend.py 2008-07-10 02:03:41.000000000 -0400 @@ -116,26 +116,24 @@ """ if os.path.exists(folder): if not os.path.isdir(folder): # what if the user gave a file? - error = _('Destination `%s\' exists but is not a folder!.') % folder - self.logger.logmsg('ERROR', error) - #raise EngineError(error) - return False - else: # try to create the folder - if not (self.engine == 'rsync' and self.incremental == True): - try: - os.mkdir(folder, 0755) - self.logger.logmsg('DEBUG', _('Created destination folder `%s\'') % folder) - except: - error = _('The destination folder `%s\' could not be created.') % folder - self.logger.logmsg('ERROR', error) - #raise EngineError(error) - return False - - if not fwbackups.CheckPerms(folder): # make sure it's writable - error = _('You do not have read and write permissions on the destination `%s\'' % folder) + self.logger.logmsg('WARNING', _('Destination `%s\' exists but is not a folder! Removing.') % folder) + shutil_modded.rmtree(path=folder, onerror=self.onError) + # try to create the folder + if not (self.engine == 'rsync' and self.incremental == True): + try: + os.mkdir(folder, 0755) + self.logger.logmsg('DEBUG', _('Created destination folder `%s\'') % folder) + except: + error = _('The destination folder `%s\' could not be created.') % folder self.logger.logmsg('ERROR', error) #raise EngineError(error) return False + + if not fwbackups.CheckPerms(folder): # make sure it's writable + error = _('You do not have read and write permissions on the destination `%s\'' % folder) + self.logger.logmsg('ERROR', error) + #raise EngineError(error) + return False return True def removeIfExists(self, treefile): @@ -314,7 +312,7 @@ # non recursive - Skip dirs if self.recursive == False and os.path.isdir(path): continue # move on to next file - paths.append("'%s'" % '\'\\\'\''.join(path.split('\''))) # wrap it in quotes for command line, and escape other ' + paths.append("'%s'" % '\'\\\'\''.join(path.split('\''))) # wrap it in quotes for command line, and escape other single quote if paths == []: self.logger.logmsg('WARNING', _('After parsing options, there are no paths to backup!') + ' paths == []') return False, -1 @@ -595,8 +593,9 @@ shutil_modded.copytree_fullpaths(i, self.dest) self.current += 1 else: - self.logger.logmsg('DEBUG', _('Running command: nice -n %(a)i %(b)s %(c)s %(d)s' % {'a': self.nice, 'b': command, 'c': i, 'd': self.dest})) - sub = fwbackups.executeSub('nice -n %i %s %s %s' % (self.nice, command, i, self.dest), env=self.environment, shell=True) + splitdest = '\'\\\'\''.join(self.dest.split('\'')) # wrap it in quotes for command line, and escape other single quote + self.logger.logmsg('DEBUG', _("Running command: nice -n %(a)i %(b)s %(c)s '%(d)s'" % {'a': self.nice, 'b': command, 'c': i, 'd': splitdest})) + sub = fwbackups.executeSub("nice -n %i %s %s '%s'" % (self.nice, command, i, splitdest), env=self.environment, shell=True) self.pids.append(sub.pid) self.logger.logmsg('DEBUG', _('Starting subprocess with PID %s') % sub.pid) # Sleep while not done. @@ -748,14 +747,18 @@ oldbackups.append(i) # ...And remove them. oldbackups.reverse() - if self.engine == 'rsync' and self.incremental == True: + if self.engine == 'rsync' and self.incremental == True and oldbackups: for i in oldbackups[:-1]: self.logger.logmsg('DEBUG', _('Removing old backup `%s\'') % i) shutil_modded.rmtree(path=ConvertPath('%s/%s' % (self.folderdest, i)), onerror=self.onError) - - source = ConvertPath('%s/%s' % (self.folderdest, oldbackups[-1])) - self.logger.logmsg('DEBUG', _('Moving `%s\' to `%s\'') % (source, self.dest)) - shutil_modded.move(source, self.dest) + oldIncrementalBackup = ConvertPath('%s/%s' % (self.folderdest, oldbackups[-1])) + if not oldIncrementalBackup.endswith('.tar') and not oldIncrementalBackup.endswith('.tar.gz') and \ + not oldIncrementalBackup.endswith('.tar.bz2'): # oldIncrementalBackup = rsync + self.logger.logmsg('DEBUG', _('Moving `%s\' to `%s\'') % (oldIncrementalBackup, self.dest)) + shutil_modded.move(oldIncrementalBackup, self.dest) + else: # source = is not a rsync backup - remove it and start fresh + self.logger.logmsg('DEBUG', _('`%s\' is not an rsync backup - removing.') % oldIncrementalBackup) + shutil_modded.rmtree(path=oldIncrementalBackup, onerror=self.onError) else: for i in oldbackups[self.tokeep:]: self.logger.logmsg('DEBUG', _('Removing old backup `%s\'') % i) Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/devel/fwbackups.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fwbackups.spec 22 Jun 2008 22:40:16 -0000 1.17 +++ fwbackups.spec 10 Jul 2008 17:19:41 -0000 1.18 @@ -6,7 +6,7 @@ Name: fwbackups Version: 1.43.2 #Release: 1%{?dist} -Release: 0.5.%{pretag}%{?dist} +Release: 0.6.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving @@ -15,6 +15,7 @@ #Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz Patch0: fwbackups-1.43.2rc2-import-lowercase.patch +Patch1: fwbackups-1.43.2rc2-backend_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -41,6 +42,7 @@ %prep %setup -q -n %{name}-%{version}%{pretag} +%patch1 # uncomment me as needed pushd src/fwbackups %patch0 @@ -80,6 +82,9 @@ %doc AUTHORS COPYING ChangeLog NEWS TODO README %changelog +* Thu Jul 10 2008 Stewart Adam 1.43.2-0.6.rc2 +- Add patch to backend.py to fix errors with the rsync backend + * Sun Jun 22 2008 Stewart Adam 1.43.2-0.5.rc2 - Update patch to fix _import() functions From fedora-extras-commits at redhat.com Thu Jul 10 17:22:30 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 10 Jul 2008 17:22:30 GMT Subject: rpms/libtirpc/devel libtirpc-0.1.7-compile.patch,1.4,1.5 Message-ID: <200807101722.m6AHMU52022242@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libtirpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21955 Modified Files: libtirpc-0.1.7-compile.patch Log Message: Updated compile patch to work with new version libtirpc-0.1.7-compile.patch: Index: libtirpc-0.1.7-compile.patch =================================================================== RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc-0.1.7-compile.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libtirpc-0.1.7-compile.patch 10 Jun 2008 19:42:19 -0000 1.4 +++ libtirpc-0.1.7-compile.patch 10 Jul 2008 17:21:40 -0000 1.5 @@ -4,18 +4,8 @@ lib_LTLIBRARIES = libtirpc.la --libtirpc_la_LDFLAGS = -lnsl -lpthread -+libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:8:0 +-libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:8:0 ++libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:9:0 libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ ---- libtirpc-0.1.7/Makefile.am.orig 2005-05-18 01:10:50.000000000 -0400 -+++ libtirpc-0.1.7/Makefile.am 2006-08-09 15:15:31.000000000 -0400 -@@ -44,5 +44,5 @@ nobase_include_HEADERS = tirpc/un-namesp - tirpc/rpc/auth_des.h - - install-exec-local: -- cp -p ./doc/etc_netconfig /etc/netconfig -- chmod 0644 /etc/netconfig -+ cp -p ./doc/etc_netconfig $(DESTDIR)/etc/netconfig -+ chmod 0644 $(DESTDIR)/etc/netconfig From fedora-extras-commits at redhat.com Thu Jul 10 17:28:06 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 17:28:06 GMT Subject: rpms/nagios/devel nagios.spec,1.54,1.55 Message-ID: <200807101728.m6AHS6Zs022473@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22420 Modified Files: nagios.spec Log Message: Disabled conf.d for now Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- nagios.spec 10 Jul 2008 17:11:47 -0000 1.54 +++ nagios.spec 10 Jul 2008 17:27:09 -0000 1.55 @@ -13,7 +13,7 @@ Source3: nagios.internet.cfg Source4: nagios.htpasswd Patch0: nagios-initrd.patch -Patch1: nagios.cfg.patch +#Patch1: nagios.cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel @@ -183,6 +183,9 @@ %{_includedir}/%{name} %changelog +* Tue Jul 10 2008 Robert M. Albrecht 3.0.3-6 +- disabled conf.d in nagios.conf for now + * Tue Jul 10 2008 Robert M. Albrecht 3.0.3-5 - Killed BuildRequirements for unsupported Fedora releases From fedora-extras-commits at redhat.com Thu Jul 10 17:29:12 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Thu, 10 Jul 2008 17:29:12 GMT Subject: rpms/kernel/devel kernel.spec, 1.749, 1.750 linux-2.6-wireless.patch, 1.46, 1.47 Message-ID: <200807101729.m6AHTCoh022515@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22478 Modified Files: kernel.spec linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-07-09 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.749 retrieving revision 1.750 diff -u -r1.749 -r1.750 --- kernel.spec 10 Jul 2008 15:44:13 -0000 1.749 +++ kernel.spec 10 Jul 2008 17:28:14 -0000 1.750 @@ -1788,6 +1788,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 10 2008 John W. Linville +- Upstream wireless fixes from 2008-07-09 + (http://marc.info/?l=linux-netdev&m=121563769208664&w=2) + * Thu Jul 10 2008 Dave Jones - 2.6.26-rc9-git6 linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- linux-2.6-wireless.patch 8 Jul 2008 17:27:00 -0000 1.46 +++ linux-2.6-wireless.patch 10 Jul 2008 17:28:14 -0000 1.47 @@ -1,3 +1,62 @@ +commit 814feefa859a736d29d0700d49debf13904b429f +Author: Ihar Hrachyshka +Date: Wed Jul 9 09:29:58 2008 +0300 + + libertas: fix memory alignment problems on the blackfin + + Fixing unaligned memory access on the blackfin architecture. + + Signed-off-by: Ihar Hrachyshka + Signed-off-by: John W. Linville + +commit 86229f0c7b4e065f51b5572a8a61801e281740a0 +Author: Luis Carlos Cobo +Date: Tue Jul 8 16:19:21 2008 +0200 + + zd1211rw: stop beacons on remove_interface + + If a mesh or ad-hoc interface is brought up and later it is replaced + by managed interface, the managed interface will keep transmitting + the beacons that were configured for the former interface. This patch + fixes that behaviour. + + Signed-off-by: John W. Linville + +commit 1f90916264049a7d9e6106fd60d289c9a775d24f +Author: Ivo van Doorn +Date: Tue Jul 8 13:45:20 2008 +0200 + + rt2x00: Disable synchronization during initialization + + As soon as init_registers() was called, the rt2400/rt2500 + would start raising beacondone interrupts. Since this is highly + premature since no beacons were provided yet, we should + initialize the synchronization register to 0. + + This will make all drivers initialize it to 0 regardless + if they are raising beacondone interrupts or not, since it only + makes sense to have it completely disabled. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit adeed48090fc370afa0db8d007748ee72a40b578 +Author: Mattias Nissler +Date: Mon Jul 7 23:08:19 2008 +0200 + + rc80211_pid: Fix fast_start parameter handling + + This removes the fast_start parameter from the rc_pid parameters + information and instead uses the parameter macro when initializing + the rc_pid state. Since the parameter is only used on initialization, + there is no point of making exporting it via debugfs. This also fixes + uninitialized memory references to the fast_start and norm_offset + parameters detected by the kmemcheck utility. Thanks to Vegard Nossum + for reporting the bug. + + Signed-off-by: Mattias Nissler + Signed-off-by: John W. Linville + commit 6e43829bb69bf1d584a592075f1357590eb49b1a Author: Vladimir Koutny Date: Mon Jul 7 14:23:01 2008 +0200 @@ -96,8 +155,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c ---- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-07-08 12:02:26.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-07-08 12:41:52.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-07-10 10:53:04.000000000 -0400 @@ -777,8 +777,10 @@ static int hostap_cs_suspend(struct pcmc int dev_open = 0; struct hostap_interface *iface = NULL; @@ -125,8 +184,8 @@ PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-08 12:41:29.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-08 12:41:52.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-10 10:53:04.000000000 -0400 @@ -449,7 +449,7 @@ static void iwl3945_dbg_report_frame(str if (print_summary) { @@ -145,9 +204,134 @@ title, fc, header->addr1[5], length, rssi, channel, rate); else { +diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-10 10:53:45.000000000 -0400 +@@ -567,11 +567,11 @@ static int lbs_process_bss(struct bss_de + pos += 8; + + /* beacon interval is 2 bytes long */ +- bss->beaconperiod = le16_to_cpup((void *) pos); ++ bss->beaconperiod = get_unaligned_le16(pos); + pos += 2; + + /* capability information is 2 bytes long */ +- bss->capability = le16_to_cpup((void *) pos); ++ bss->capability = get_unaligned_le16(pos); + lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability); + pos += 2; + +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-07-10 10:53:45.000000000 -0400 +@@ -731,6 +731,17 @@ static int rt2400pci_init_registers(stru + (rt2x00dev->rx->data_size / 128)); + rt2x00pci_register_write(rt2x00dev, CSR9, reg); + ++ rt2x00pci_register_read(rt2x00dev, CSR14, ®); ++ rt2x00_set_field32(®, CSR14_TSF_COUNT, 0); ++ rt2x00_set_field32(®, CSR14_TSF_SYNC, 0); ++ rt2x00_set_field32(®, CSR14_TBCN, 0); ++ rt2x00_set_field32(®, CSR14_TCFP, 0); ++ rt2x00_set_field32(®, CSR14_TATIMW, 0); ++ rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); ++ rt2x00_set_field32(®, CSR14_CFP_COUNT_PRELOAD, 0); ++ rt2x00_set_field32(®, CSR14_TBCM_PRELOAD, 0); ++ rt2x00pci_register_write(rt2x00dev, CSR14, reg); ++ + rt2x00pci_register_write(rt2x00dev, CNT3, 0x3f080000); + + rt2x00pci_register_read(rt2x00dev, ARCSR0, ®); +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-07-10 10:53:45.000000000 -0400 +@@ -824,6 +824,17 @@ static int rt2500pci_init_registers(stru + rt2x00_set_field32(®, CSR11_CW_SELECT, 0); + rt2x00pci_register_write(rt2x00dev, CSR11, reg); + ++ rt2x00pci_register_read(rt2x00dev, CSR14, ®); ++ rt2x00_set_field32(®, CSR14_TSF_COUNT, 0); ++ rt2x00_set_field32(®, CSR14_TSF_SYNC, 0); ++ rt2x00_set_field32(®, CSR14_TBCN, 0); ++ rt2x00_set_field32(®, CSR14_TCFP, 0); ++ rt2x00_set_field32(®, CSR14_TATIMW, 0); ++ rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); ++ rt2x00_set_field32(®, CSR14_CFP_COUNT_PRELOAD, 0); ++ rt2x00_set_field32(®, CSR14_TBCM_PRELOAD, 0); ++ rt2x00pci_register_write(rt2x00dev, CSR14, reg); ++ + rt2x00pci_register_write(rt2x00dev, CNT3, 0); + + rt2x00pci_register_read(rt2x00dev, TXCSR8, ®); +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-07-10 10:53:45.000000000 -0400 +@@ -801,6 +801,13 @@ static int rt2500usb_init_registers(stru + rt2x00_set_field16(®, TXRX_CSR8_BBP_ID1_VALID, 0); + rt2500usb_register_write(rt2x00dev, TXRX_CSR8, reg); + ++ rt2500usb_register_read(rt2x00dev, TXRX_CSR19, ®); ++ rt2x00_set_field16(®, TXRX_CSR19_TSF_COUNT, 0); ++ rt2x00_set_field16(®, TXRX_CSR19_TSF_SYNC, 0); ++ rt2x00_set_field16(®, TXRX_CSR19_TBCN, 0); ++ rt2x00_set_field16(®, TXRX_CSR19_BEACON_GEN, 0); ++ rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg); ++ + rt2500usb_register_write(rt2x00dev, TXRX_CSR21, 0xe78f); + rt2500usb_register_write(rt2x00dev, MAC_CSR9, 0xff1d); + +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-07-10 10:53:45.000000000 -0400 +@@ -1201,6 +1201,15 @@ static int rt61pci_init_registers(struct + rt2x00_set_field32(®, TXRX_CSR8_ACK_CTS_54MBS, 42); + rt2x00pci_register_write(rt2x00dev, TXRX_CSR8, reg); + ++ rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, ®); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_INTERVAL, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_TICKING, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_SYNC, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TBTT_ENABLE, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0); ++ rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg); ++ + rt2x00pci_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f); + + rt2x00pci_register_write(rt2x00dev, MAC_CSR6, 0x00000fff); +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-07-10 10:53:45.000000000 -0400 +@@ -1006,6 +1006,15 @@ static int rt73usb_init_registers(struct + rt2x00_set_field32(®, TXRX_CSR8_ACK_CTS_54MBS, 42); + rt73usb_register_write(rt2x00dev, TXRX_CSR8, reg); + ++ rt73usb_register_read(rt2x00dev, TXRX_CSR9, ®); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_INTERVAL, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_TICKING, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_SYNC, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TBTT_ENABLE, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0); ++ rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg); ++ + rt73usb_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f); + + rt73usb_register_read(rt2x00dev, MAC_CSR6, ®); +diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-07-10 10:53:45.000000000 -0400 +@@ -765,6 +765,7 @@ static void zd_op_remove_interface(struc + { + struct zd_mac *mac = zd_hw_mac(hw); + mac->type = IEEE80211_IF_TYPE_INVALID; ++ zd_set_beacon_interval(&mac->chip, 0); + zd_write_mac_addr(&mac->chip, NULL); + } + diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-08 12:41:29.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-08 12:41:52.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-10 10:53:04.000000000 -0400 @@ -64,6 +64,7 @@ static struct usb_device_id usb_ids[] = { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B }, { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B }, @@ -157,8 +341,8 @@ { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B }, { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B }, diff -up linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c ---- linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c.orig 2008-07-08 12:02:27.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c 2008-07-08 12:41:52.000000000 -0400 +--- linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c 2008-07-10 10:53:04.000000000 -0400 @@ -537,6 +537,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc int err = 0; u32 tmp; @@ -174,8 +358,8 @@ goto out; bus = pdev->bus; diff -up linux-2.6.25.noarch/net/mac80211/main.c.orig linux-2.6.25.noarch/net/mac80211/main.c ---- linux-2.6.25.noarch/net/mac80211/main.c.orig 2008-07-08 12:41:30.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/main.c 2008-07-08 12:41:52.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/main.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/main.c 2008-07-10 10:53:04.000000000 -0400 @@ -530,8 +530,6 @@ static int ieee80211_stop(struct net_dev local->sta_hw_scanning = 0; } @@ -195,8 +379,8 @@ tasklet_disable(&local->tasklet); } diff -up linux-2.6.25.noarch/net/mac80211/mlme.c.orig linux-2.6.25.noarch/net/mac80211/mlme.c ---- linux-2.6.25.noarch/net/mac80211/mlme.c.orig 2008-07-08 12:41:30.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/mlme.c 2008-07-08 12:41:52.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/mlme.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mlme.c 2008-07-10 10:53:04.000000000 -0400 @@ -547,15 +547,14 @@ static void ieee80211_set_associated(str sdata->bss_conf.ht_bss_conf = &conf->ht_bss_conf; } @@ -238,3 +422,100 @@ #endif /* CONFIG_MAC80211_IBSS_DEBUG */ if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 && (bss = ieee80211_rx_bss_get(dev, bssid, +diff -up linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c +--- linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c 2008-07-10 10:53:45.000000000 -0400 +@@ -398,13 +398,25 @@ static void *rate_control_pid_alloc(stru + return NULL; + } + ++ pinfo->target = RC_PID_TARGET_PF; ++ pinfo->sampling_period = RC_PID_INTERVAL; ++ pinfo->coeff_p = RC_PID_COEFF_P; ++ pinfo->coeff_i = RC_PID_COEFF_I; ++ pinfo->coeff_d = RC_PID_COEFF_D; ++ pinfo->smoothing_shift = RC_PID_SMOOTHING_SHIFT; ++ pinfo->sharpen_factor = RC_PID_SHARPENING_FACTOR; ++ pinfo->sharpen_duration = RC_PID_SHARPENING_DURATION; ++ pinfo->norm_offset = RC_PID_NORM_OFFSET; ++ pinfo->rinfo = rinfo; ++ pinfo->oldrate = 0; ++ + /* Sort the rates. This is optimized for the most common case (i.e. + * almost-sorted CCK+OFDM rates). Kind of bubble-sort with reversed + * mapping too. */ + for (i = 0; i < sband->n_bitrates; i++) { + rinfo[i].index = i; + rinfo[i].rev_index = i; +- if (pinfo->fast_start) ++ if (RC_PID_FAST_START) + rinfo[i].diff = 0; + else + rinfo[i].diff = i * pinfo->norm_offset; +@@ -425,19 +437,6 @@ static void *rate_control_pid_alloc(stru + break; + } + +- pinfo->target = RC_PID_TARGET_PF; +- pinfo->sampling_period = RC_PID_INTERVAL; +- pinfo->coeff_p = RC_PID_COEFF_P; +- pinfo->coeff_i = RC_PID_COEFF_I; +- pinfo->coeff_d = RC_PID_COEFF_D; +- pinfo->smoothing_shift = RC_PID_SMOOTHING_SHIFT; +- pinfo->sharpen_factor = RC_PID_SHARPENING_FACTOR; +- pinfo->sharpen_duration = RC_PID_SHARPENING_DURATION; +- pinfo->norm_offset = RC_PID_NORM_OFFSET; +- pinfo->fast_start = RC_PID_FAST_START; +- pinfo->rinfo = rinfo; +- pinfo->oldrate = 0; +- + #ifdef CONFIG_MAC80211_DEBUGFS + de = &pinfo->dentries; + de->dir = debugfs_create_dir("rc80211_pid", +@@ -465,9 +464,6 @@ static void *rate_control_pid_alloc(stru + de->norm_offset = debugfs_create_u32("norm_offset", + S_IRUSR | S_IWUSR, de->dir, + &pinfo->norm_offset); +- de->fast_start = debugfs_create_bool("fast_start", +- S_IRUSR | S_IWUSR, de->dir, +- &pinfo->fast_start); + #endif + + return pinfo; +@@ -479,7 +475,6 @@ static void rate_control_pid_free(void * + #ifdef CONFIG_MAC80211_DEBUGFS + struct rc_pid_debugfs_entries *de = &pinfo->dentries; + +- debugfs_remove(de->fast_start); + debugfs_remove(de->norm_offset); + debugfs_remove(de->sharpen_duration); + debugfs_remove(de->sharpen_factor); +diff -up linux-2.6.25.noarch/net/mac80211/rc80211_pid.h.orig linux-2.6.25.noarch/net/mac80211/rc80211_pid.h +--- linux-2.6.25.noarch/net/mac80211/rc80211_pid.h.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/rc80211_pid.h 2008-07-10 10:53:45.000000000 -0400 +@@ -141,7 +141,6 @@ struct rc_pid_events_file_info { + * rate behaviour values (lower means we should trust more what we learnt + * about behaviour of rates, higher means we should trust more the natural + * ordering of rates) +- * @fast_start: if Y, push high rates right after initialization + */ + struct rc_pid_debugfs_entries { + struct dentry *dir; +@@ -154,7 +153,6 @@ struct rc_pid_debugfs_entries { + struct dentry *sharpen_factor; + struct dentry *sharpen_duration; + struct dentry *norm_offset; +- struct dentry *fast_start; + }; + + void rate_control_pid_event_tx_status(struct rc_pid_event_buffer *buf, +@@ -267,9 +265,6 @@ struct rc_pid_info { + /* Normalization offset. */ + unsigned int norm_offset; + +- /* Fast starst parameter. */ +- unsigned int fast_start; +- + /* Rates information. */ + struct rc_pid_rateinfo *rinfo; + From fedora-extras-commits at redhat.com Thu Jul 10 17:32:48 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 17:32:48 GMT Subject: rpms/nagios/devel nagios.spec,1.55,1.56 Message-ID: <200807101732.m6AHWmnY022728@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22679 Modified Files: nagios.spec Log Message: Updated release tag. Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- nagios.spec 10 Jul 2008 17:27:09 -0000 1.55 +++ nagios.spec 10 Jul 2008 17:31:52 -0000 1.56 @@ -1,7 +1,7 @@ Name: nagios Version: 3.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Host/service/network monitoring program Group: Applications/System From fedora-extras-commits at redhat.com Thu Jul 10 17:35:09 2008 From: fedora-extras-commits at redhat.com (Jon Prindiville (jprindiv)) Date: Thu, 10 Jul 2008 17:35:09 GMT Subject: rpms/hsqldb/devel .cvsignore, 1.10, 1.11 hsqldb.spec, 1.42, 1.43 sources, 1.9, 1.10 Message-ID: <200807101735.m6AHZ9UD022926@cvs-int.fedora.redhat.com> Author: jprindiv Update of /cvs/pkgs/rpms/hsqldb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22859 Modified Files: .cvsignore hsqldb.spec sources Log Message: Upgrade to 1.8.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hsqldb/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 17 Jan 2008 18:39:12 -0000 1.10 +++ .cvsignore 10 Jul 2008 17:34:18 -0000 1.11 @@ -1 +1 @@ -hsqldb_1_8_0_9.zip +hsqldb_1_8_0_10.zip Index: hsqldb.spec =================================================================== RCS file: /cvs/pkgs/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- hsqldb.spec 9 Jul 2008 18:29:23 -0000 1.42 +++ hsqldb.spec 10 Jul 2008 17:34:18 -0000 1.43 @@ -34,11 +34,11 @@ %define section devel -%define cvs_version 1_8_0_9 +%define cvs_version 1_8_0_10 Name: hsqldb -Version: 1.8.0.9 -Release: 3%{?dist} +Version: 1.8.0.10 +Release: 1%{?dist} Epoch: 1 Summary: Hsqldb Database Engine License: BSD @@ -270,6 +270,9 @@ %{_datadir}/%{name} %changelog +* Thu Jul 10 2008 Jon Prindiville - 1:1.8.0.10-1 +- Upgrade to 1.8.0.10 + * Wed Jul 9 2008 Tom "spot" Callaway - 1:1.8.0.9-3 - drop repotag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hsqldb/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 17 Jan 2008 18:39:12 -0000 1.9 +++ sources 10 Jul 2008 17:34:18 -0000 1.10 @@ -1 +1 @@ -c3f8010e3e2c73143eb702b7f28f0c8e hsqldb_1_8_0_9.zip +17410483b5b5f267aa18b7e00b65e6e0 hsqldb_1_8_0_10.zip From fedora-extras-commits at redhat.com Thu Jul 10 17:38:01 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 17:38:01 GMT Subject: rpms/xfce4-dict-plugin/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE sources, 1.4, NONE xfce4-dict-plugin.spec, 1.7, NONE Message-ID: <200807101738.m6AHc1IF023087@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-dict-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23075 Added Files: dead.package Removed Files: .cvsignore sources xfce4-dict-plugin.spec Log Message: retire xfce4-dict-plugin, included in xfce4-dict now --- NEW FILE dead.package --- xfce4-dict-plugin is a subpackage of xfce4-dict now (changed with 0.4). --- .cvsignore DELETED --- --- sources DELETED --- --- xfce4-dict-plugin.spec DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 17:45:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 17:45:16 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807101745.m6AHjGRc013920@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora devel is now owned by Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 17:45:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 17:45:29 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807101745.m6AHjTI5013954@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora 8 is now owned by Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 17:45:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 17:45:35 +0000 Subject: [pkgdb] libhugetlbfs ownership updated Message-ID: <200807101745.m6AHjZwS013976@bastion.fedora.phx.redhat.com> Package libhugetlbfs in Fedora 9 is now owned by Eric Munson (emunson) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs From fedora-extras-commits at redhat.com Thu Jul 10 17:49:54 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 17:49:54 GMT Subject: rpms/xfce4-screenshooter-plugin/F-8 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-screenshooter-plugin.spec, 1.8, 1.9 Message-ID: <200807101749.m6AHnslP023514@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23451 Modified Files: .cvsignore sources xfce4-screenshooter-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 - Update to 1.2.0 - Include new xfce4-screenshooter manpage Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Oct 2006 12:53:52 -0000 1.3 +++ .cvsignore 10 Jul 2008 17:48:59 -0000 1.4 @@ -1 +1 @@ -xfce4-screenshooter-plugin-1.0.0.tar.bz2 +xfce4-screenshooter-plugin-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Oct 2006 12:53:52 -0000 1.3 +++ sources 10 Jul 2008 17:48:59 -0000 1.4 @@ -1 +1 @@ -d12746c635eb28207161a3da1585aa75 xfce4-screenshooter-plugin-1.0.0.tar.bz2 +19134629b075d403ea51fe95e6eac1cb xfce4-screenshooter-plugin-1.2.0.tar.gz Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8/xfce4-screenshooter-plugin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xfce4-screenshooter-plugin.spec 25 Aug 2007 11:27:09 -0000 1.8 +++ xfce4-screenshooter-plugin.spec 10 Jul 2008 17:48:59 -0000 1.9 @@ -1,16 +1,16 @@ Name: xfce4-screenshooter-plugin -Version: 1.0.0 -Release: 6%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Screenshot utility for the Xfce panel Group: User Interface/Desktops -License: GPLv2 +License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel -BuildRequires: perl(XML::Parser) +BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.4.0 libxml2-devel +BuildRequires: perl(XML::Parser), gettext Requires: xfce4-panel >= 4.4.0 %description @@ -26,20 +26,33 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README +%{_bindir}/xfce4-screenshooter %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop +%{_mandir}/man1/*.1.gz %changelog +* Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 +- Update to 1.2.0 +- Include new xfce4-screenshooter manpage + +* Sat Jun 22 2008 Christoph Wickert - 1.1.0-1 +- Update to 1.1.0 +- BR gettext + +* Mon Feb 18 2008 Fedora Release Engineering - 1.0.0-7 +- Autorebuild for GCC 4.3 + * Sat Aug 25 2007 Christoph Wickert - 1.0.0-6 -- Update to 1.9.4 -- Change license tag to GPLv2 +- Change license tag to GPLv2+ * Sat Apr 28 2007 Christoph Wickert - 1.0.0-5 - Rebuild for Xfce 4.4.1 From fedora-extras-commits at redhat.com Thu Jul 10 17:51:05 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 10 Jul 2008 17:51:05 GMT Subject: rpms/link-grammar/devel .cvsignore, 1.6, 1.7 link-grammar.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200807101751.m6AHp5vu023582@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/link-grammar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23527 Modified Files: .cvsignore link-grammar.spec sources Log Message: - New upstream version, fixes bug 434650 - Update URL - Package man-page Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/link-grammar/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2007 19:06:05 -0000 1.6 +++ .cvsignore 10 Jul 2008 17:50:16 -0000 1.7 @@ -1 +1 @@ -link-grammar-4.2.5.tar.gz +link-grammar-4.3.5.tar.gz Index: link-grammar.spec =================================================================== RCS file: /cvs/pkgs/rpms/link-grammar/devel/link-grammar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- link-grammar.spec 20 Feb 2008 06:05:17 -0000 1.8 +++ link-grammar.spec 10 Jul 2008 17:50:16 -0000 1.9 @@ -1,11 +1,11 @@ Summary: A Grammar Checking library Name: link-grammar -Version: 4.2.5 -Release: 2%{?dist} +Version: 4.3.5 +Release: 1%{?dist} Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz -URL: http://bobo.link.cs.cmu.edu/link/ +URL: http://abisource.com/projects/link-grammar/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -46,6 +46,7 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/link-grammar.pc %{_includedir}/link-grammar +%{_mandir}/*/* %post -p /sbin/ldconfig @@ -55,6 +56,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Thu Jul 10 2008 Marc Maurer 4.3.5-1 +- New upstream version, fixes bug 434650 +- Update URL +- Package man-page + * Wed Feb 20 2008 Fedora Release Engineering - 4.2.5-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/link-grammar/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2007 19:06:05 -0000 1.6 +++ sources 10 Jul 2008 17:50:16 -0000 1.7 @@ -1 +1 @@ -302fa0cad0fa5b2aab126549553ad3f4 link-grammar-4.2.5.tar.gz +2f68bdc14d1544e964d14d913ec77def link-grammar-4.3.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 17:53:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 17:53:11 GMT Subject: rpms/subversion/devel subversion.spec,1.117,1.118 Message-ID: <200807101753.m6AHrBeA023776@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23707 Modified Files: subversion.spec Log Message: rebuild against db4 4.7 Index: subversion.spec =================================================================== RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- subversion.spec 3 Jul 2008 08:14:21 -0000 1.117 +++ subversion.spec 10 Jul 2008 17:52:17 -0000 1.118 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 7 +Release: 8 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -276,6 +276,9 @@ %endif %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 1.5.0-8 +- rebuild against new db4-4.7 + * Thu Jul 3 2008 Joe Orton 1.5.0-7 - add svnmerge and wcgrep to docdir (Edward Rudd, #451932) - drop neon version overrides From fedora-extras-commits at redhat.com Thu Jul 10 17:54:37 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 10 Jul 2008 17:54:37 GMT Subject: rpms/cone/devel .cvsignore, 1.11, 1.12 cone.spec, 1.25, 1.26 sources, 1.11, 1.12 cone-gcc43.patch, 1.1, NONE Message-ID: <200807101754.m6AHsb3h023818@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/cone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23792 Modified Files: .cvsignore cone.spec sources Removed Files: cone-gcc43.patch Log Message: Update to 0.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cone/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 5 Dec 2007 16:14:22 -0000 1.11 +++ .cvsignore 10 Jul 2008 17:53:29 -0000 1.12 @@ -1,2 +1,2 @@ -cone-0.74.tar.bz2 -cone-0.74.tar.bz2.sig +cone-0.75.tar.bz2 +cone-0.75.tar.bz2.sig Index: cone.spec =================================================================== RCS file: /cvs/pkgs/rpms/cone/devel/cone.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- cone.spec 29 Mar 2008 04:19:05 -0000 1.25 +++ cone.spec 10 Jul 2008 17:53:29 -0000 1.26 @@ -2,8 +2,8 @@ Summary: CONE mail reader Name: cone -Version: 0.74 -Release: 3%{?dist} +Version: 0.75 +Release: 1%{?dist} URL: http://www.courier-mta.org/cone/ Source0: http://dl.sf.net/courier/%{name}-%{version}.tar.bz2 @@ -23,8 +23,6 @@ Requires(post): %{__perl} -Patch1: cone-gcc43.patch - %description CONE is a simple, text-based E-mail reader and writer. @@ -47,7 +45,6 @@ %prep %setup -q -%patch1 -p1 -b .gcc43 %build CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}" @@ -107,6 +104,9 @@ %doc cone/html %changelog +* Thu Jul 10 2008 Steven Pritchard 0.75-1 +- Update to 0.75. + * Sat Mar 29 2008 Christopher Aillon - 0.74-3 - Add compilation patch for GCC 4.3; add proper C++ #includes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cone/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 5 Dec 2007 16:14:22 -0000 1.11 +++ sources 10 Jul 2008 17:53:29 -0000 1.12 @@ -1,2 +1,2 @@ -59ec5a486d5a5c358fc0f9531dbe2c02 cone-0.74.tar.bz2 -81431521db8fad2d4177ba05586251ec cone-0.74.tar.bz2.sig +cdc4c9dbdda1567601cd8fed1c9fbd96 cone-0.75.tar.bz2 +2f392d84b84ba43faaeea336ddfa6905 cone-0.75.tar.bz2.sig --- cone-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 17:56:12 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 10 Jul 2008 17:56:12 GMT Subject: rpms/nfs-utils-lib/F-9 nfs-utils-lib-1.1.1-idmapd-domain-dns.patch, NONE, 1.1 nfs-utils-lib.spec, 1.30, 1.31 Message-ID: <200807101756.m6AHuCIa024044@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils-lib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908 Modified Files: nfs-utils-lib.spec Added Files: nfs-utils-lib-1.1.1-idmapd-domain-dns.patch Log Message: - Use the getdomainname() not the latter half of a hostname to determine the DNS domainname. nfs-utils-lib-1.1.1-idmapd-domain-dns.patch: --- NEW FILE nfs-utils-lib-1.1.1-idmapd-domain-dns.patch --- --- nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c.orig 2006-09-05 10:09:00.000000000 -0400 +++ nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c 2008-07-10 13:21:57.560028000 -0400 @@ -47,6 +47,7 @@ #include #include #include +#include #include "nfsidmap.h" #include "nfsidmap_internal.h" #include "cfg.h" @@ -75,16 +76,13 @@ static int domain_from_dns(char **domain) { - struct hostent *he; - char hname[64], *c; + char mydomain[BUFSIZ]; - if (gethostname(hname, sizeof(hname)) == -1) + *domain = NULL; + if (getdomainname(mydomain, sizeof(mydomain)) < 0) return -1; - if ((he = gethostbyname(hname)) == NULL) - return -1; - if ((c = strchr(he->h_name, '.')) == NULL || *++c == '\0') - return -1; - *domain = strdup(c); + + *domain = strdup(mydomain); return 0; } Index: nfs-utils-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils-lib/F-9/nfs-utils-lib.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- nfs-utils-lib.spec 27 Jun 2008 16:59:45 -0000 1.30 +++ nfs-utils-lib.spec 10 Jul 2008 17:55:21 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Network File System Support Library Name: nfs-utils-lib Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.citi.umich.edu/projects/nfsv4/linux/ License: GPL @@ -19,6 +19,7 @@ Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz Patch00: nfs-utils-lib-1.0.8-idmap.conf.patch +Patch01: nfs-utils-lib-1.1.1-idmapd-domain-dns.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -48,6 +49,7 @@ mv %{librpcsecgss}-%{rpcsecgssvers} %{librpcsecgss} %patch00 -p1 +%patch01 -p1 %build top=`pwd` @@ -134,6 +136,10 @@ %{_libdir}/libnfsidmap.a %changelog +* Thu Jul 10 2008 Steve Dickson 1.1.1-5 +- Use the getdomainname() not the latter half of a + hostname to determine the DNS domainname. + * Fri Jun 27 2008 Steve Dickson 1.1.1-4 - In idmapd.conf, commented out 'Domain' so DNS will be used to define the domainname. (bz 447237) From fedora-extras-commits at redhat.com Thu Jul 10 17:57:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 17:57:10 GMT Subject: rpms/httpd/devel httpd.spec,1.122,1.123 Message-ID: <200807101757.m6AHvAAh024187@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/httpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24076 Modified Files: httpd.spec Log Message: rebuild against new db4 4.7 Index: httpd.spec =================================================================== RCS file: /cvs/pkgs/rpms/httpd/devel/httpd.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- httpd.spec 8 Jul 2008 15:54:57 -0000 1.122 +++ httpd.spec 10 Jul 2008 17:56:25 -0000 1.123 @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.9 -Release: 2 +Release: 3 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -478,6 +478,9 @@ %{_libdir}/httpd/build/*.sh %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 2.2.9-3 +- rebuild against new db4 4.7 + * Tue Jul 8 2008 Joe Orton 2.2.9-2 - update to 2.2.9 - build event MPM too From fedora-extras-commits at redhat.com Thu Jul 10 17:58:18 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 10 Jul 2008 17:58:18 GMT Subject: rpms/link-grammar/F-9 .cvsignore, 1.6, 1.7 link-grammar.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200807101758.m6AHwINO024372@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/link-grammar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24186 Modified Files: .cvsignore link-grammar.spec sources Log Message: - New upstream version, fixes bug 434650 - Update URL - Package man-page Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/link-grammar/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2007 19:06:05 -0000 1.6 +++ .cvsignore 10 Jul 2008 17:57:13 -0000 1.7 @@ -1 +1 @@ -link-grammar-4.2.5.tar.gz +link-grammar-4.3.5.tar.gz Index: link-grammar.spec =================================================================== RCS file: /cvs/pkgs/rpms/link-grammar/F-9/link-grammar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- link-grammar.spec 20 Feb 2008 06:05:17 -0000 1.8 +++ link-grammar.spec 10 Jul 2008 17:57:13 -0000 1.9 @@ -1,11 +1,11 @@ Summary: A Grammar Checking library Name: link-grammar -Version: 4.2.5 -Release: 2%{?dist} +Version: 4.3.5 +Release: 1%{?dist} Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz -URL: http://bobo.link.cs.cmu.edu/link/ +URL: http://abisource.com/projects/link-grammar/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -39,6 +39,7 @@ %{_bindir}/* %{_libdir}/lib*.so.* %{_datadir}/link-grammar +%{_mandir}/*/* %files devel %defattr(-,root,root) @@ -55,6 +56,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Thu Jul 10 2008 Marc Maurer 4.3.5-1 +- New upstream version, fixes bug 434650 +- Update URL +- Package man-page + * Wed Feb 20 2008 Fedora Release Engineering - 4.2.5-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/link-grammar/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2007 19:06:05 -0000 1.6 +++ sources 10 Jul 2008 17:57:13 -0000 1.7 @@ -1 +1 @@ -302fa0cad0fa5b2aab126549553ad3f4 link-grammar-4.2.5.tar.gz +2f68bdc14d1544e964d14d913ec77def link-grammar-4.3.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 17:59:17 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 10 Jul 2008 17:59:17 GMT Subject: rpms/link-grammar/devel link-grammar.spec,1.9,1.10 Message-ID: <200807101759.m6AHxHhs024553@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/link-grammar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24369 Modified Files: link-grammar.spec Log Message: - Move the man-page from -devel to the main package Index: link-grammar.spec =================================================================== RCS file: /cvs/pkgs/rpms/link-grammar/devel/link-grammar.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- link-grammar.spec 10 Jul 2008 17:50:16 -0000 1.9 +++ link-grammar.spec 10 Jul 2008 17:58:20 -0000 1.10 @@ -1,7 +1,7 @@ Summary: A Grammar Checking library Name: link-grammar Version: 4.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz @@ -39,6 +39,7 @@ %{_bindir}/* %{_libdir}/lib*.so.* %{_datadir}/link-grammar +%{_mandir}/*/* %files devel %defattr(-,root,root) @@ -46,7 +47,6 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/link-grammar.pc %{_includedir}/link-grammar -%{_mandir}/*/* %post -p /sbin/ldconfig @@ -56,6 +56,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Thu Jul 10 2008 Marc Maurer 4.3.5-2 +- Move the man-page from -devel to the main package + * Thu Jul 10 2008 Marc Maurer 4.3.5-1 - New upstream version, fixes bug 434650 - Update URL From fedora-extras-commits at redhat.com Thu Jul 10 18:01:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 18:01:06 GMT Subject: rpms/perl/devel perl.spec,1.177,1.178 Message-ID: <200807101801.m6AI161B031216@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24636 Modified Files: perl.spec Log Message: rebuild against new db4 4.7 Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- perl.spec 9 Jul 2008 11:07:20 -0000 1.177 +++ perl.spec 10 Jul 2008 18:00:05 -0000 1.178 @@ -7,7 +7,7 @@ Name: perl Version: %{perl_version} -Release: 35%{?dist} +Release: 36%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -1627,6 +1627,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 4:5.10.0-36 +- rebuild for new db4 4.7 + * Wed Jul 9 2008 Stepan Kasal 4:5.10.0-35 - remove db4 require, it is handled automatically From fedora-extras-commits at redhat.com Thu Jul 10 18:23:00 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 10 Jul 2008 18:23:00 GMT Subject: rpms/enchant/devel enchant.spec,1.20,1.21 Message-ID: <200807101823.m6AIN0LZ032139@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32052 Modified Files: enchant.spec Log Message: Fix 426712: don't build static libs (patch from Michael Schwendt) Index: enchant.spec =================================================================== RCS file: /cvs/pkgs/rpms/enchant/devel/enchant.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- enchant.spec 21 May 2008 16:32:46 -0000 1.20 +++ enchant.spec 10 Jul 2008 18:22:10 -0000 1.21 @@ -1,7 +1,7 @@ Summary: An Enchanting Spell Checking Library Name: enchant Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: System Environment/Libraries License: LGPLv2+ @@ -48,7 +48,7 @@ %setup -q %build -%configure --disable-ispell --with-myspell-dir=/usr/share/myspell --disable-hspell +%configure --disable-ispell --with-myspell-dir=/usr/share/myspell --disable-hspell --disable-static make %{?_smp_mflags} %install @@ -76,9 +76,7 @@ %files devel %defattr(-,root,root) -%{_libdir}/*.a %{_libdir}/*.so -%{_libdir}/enchant/*.a %{_libdir}/pkgconfig/enchant.pc %{_includedir}/enchant @@ -90,6 +88,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Thu Jul 10 2008 Marc Maurer 1:1.4.2-3 +- Fix 426712: don't build static libs (patch from Michael Schwendt) + * Wed May 21 2008 Marc Maurer 1:1.4.2-2 - Rebuild From fedora-extras-commits at redhat.com Thu Jul 10 18:26:55 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Thu, 10 Jul 2008 18:26:55 GMT Subject: rpms/kernel/F-9 config-generic, 1.106, 1.107 kernel.spec, 1.709, 1.710 linux-2.6-wireless-fixups.patch, 1.8, 1.9 linux-2.6-wireless-pending.patch, 1.57, 1.58 linux-2.6-wireless.patch, 1.45, 1.46 Message-ID: <200807101826.m6AIQtwe032410@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32329 Modified Files: config-generic kernel.spec linux-2.6-wireless-fixups.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-07-09 ; Upstream wireless updates from 2008-07-08 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- config-generic 2 Jul 2008 22:04:18 -0000 1.106 +++ config-generic 10 Jul 2008 18:26:02 -0000 1.107 @@ -1316,6 +1316,7 @@ CONFIG_IWL5000=y CONFIG_IWL5000_RUN_TIME_CALIB=y CONFIG_IWL3945=m +CONFIG_IWL3945_RFKILL=y CONFIG_IWL3945_DEBUG=y CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y CONFIG_IWL3945_QOS=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.709 retrieving revision 1.710 diff -u -r1.709 -r1.710 --- kernel.spec 10 Jul 2008 16:23:27 -0000 1.709 +++ kernel.spec 10 Jul 2008 18:26:02 -0000 1.710 @@ -1877,6 +1877,12 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 10 2008 John W. Linville 2.6.25.9-91 +- Upstream wireless fixes from 2008-07-09 + (http://marc.info/?l=linux-netdev&m=121563769208664&w=2) +- Upstream wireless updates from 2008-07-08 + (http://marc.info/?l=linux-wireless&m=121554411325041&w=2) + * Thu Jul 10 2008 Chuck Ebbert 2.6.25.10-90 - libata: don't let ata_piix driver attach to ICH6M in ahci mode (#430916) linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-wireless-fixups.patch 4 Jul 2008 20:21:44 -0000 1.8 +++ linux-2.6-wireless-fixups.patch 10 Jul 2008 18:26:02 -0000 1.9 @@ -1,6 +1,6 @@ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-10 13:57:45.000000000 -0400 @@ -3659,7 +3659,7 @@ void mpi_receive_802_11 (struct airo_inf ptr += hdrlen; if (hdrlen == 24) @@ -208,8 +208,8 @@ return 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-10 13:57:45.000000000 -0400 @@ -58,6 +58,10 @@ #include "reg.h" #include "debug.h" @@ -234,8 +234,8 @@ pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-10 13:57:45.000000000 -0400 @@ -967,6 +967,22 @@ static inline bool __b43_warn_on_dummy(b # define B43_WARN_ON(x) __b43_warn_on_dummy(unlikely(!!(x))) #endif @@ -260,8 +260,8 @@ #define INT_TO_Q52(i) ((i) << 2) /* Convert a Q5.2 value to an integer (precision loss!) */ diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-10 13:57:45.000000000 -0400 @@ -823,6 +823,23 @@ void b43legacydbg(struct b43legacy_wl *w # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0) #endif /* DEBUG */ @@ -287,8 +287,8 @@ #define Q52_FMT "%u.%u" #define Q52_ARG(q52) ((q52) / 4), (((q52) & 3) * 100 / 4) diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-10 13:57:45.000000000 -0400 @@ -846,10 +846,10 @@ static void handle_irq_noise(struct b43l /* Get the noise samples. */ B43legacy_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -314,8 +314,8 @@ iv = (const struct b43legacy_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-10 13:57:45.000000000 -0400 @@ -1088,7 +1088,7 @@ static void b43legacy_phy_initg(struct b * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -373,8 +373,8 @@ return 0; } diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-10 13:57:45.000000000 -0400 @@ -357,7 +357,7 @@ void b43legacy_nrssi_hw_update(struct b4 for (i = 0; i < 64; i++) { tmp = b43legacy_nrssi_hw_read(dev, i); @@ -430,8 +430,8 @@ pamp = b43legacy_get_txgain_freq_power_amp(txpower); pamp <<= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-10 13:57:45.000000000 -0400 @@ -199,7 +199,7 @@ static void lo_measure_txctl_values(stru if (lb_gain > 10) { radio_pctl_reg = 0; @@ -451,8 +451,8 @@ if (phy->pga_gain >= 5) { phy->pga_gain -= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-10 13:57:45.000000000 -0400 @@ -1211,10 +1211,10 @@ static void handle_irq_noise(struct b43_ /* Get the noise samples. */ B43_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -478,8 +478,8 @@ iv = (const struct b43_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-10 13:57:45.000000000 -0400 @@ -1400,7 +1400,7 @@ static void b43_phy_initg(struct b43_wld * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -580,8 +580,8 @@ tmp_u16 = b43_phy_read(dev, 0x048A) & 0xF000; tmp_u16 |= ((u32) b & 0x0000003F); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-10 13:57:45.000000000 -0400 @@ -556,36 +556,40 @@ static void iwl3945_add_radiotap(struct iwl3945_rt->rt_hdr.it_pad = 0; @@ -638,8 +638,8 @@ if (rate == -1) diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c ---- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-01 14:22:16.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-10 14:00:03.000000000 -0400 @@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de if (*bytesleft >= sizeof(beaconsize)) { @@ -649,9 +649,23 @@ *bytesleft -= sizeof(beaconsize); *pbeaconinfo += sizeof(beaconsize); } +@@ -567,11 +567,11 @@ static int lbs_process_bss(struct bss_de + pos += 8; + + /* beacon interval is 2 bytes long */ +- bss->beaconperiod = get_unaligned_le16(pos); ++ bss->beaconperiod = le16_to_cpup((void *) pos); + pos += 2; + + /* capability information is 2 bytes long */ +- bss->capability = get_unaligned_le16(pos); ++ bss->capability = le16_to_cpup((void *) pos); + lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability); + pos += 2; + diff -up linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c ---- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-01 14:22:16.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-10 13:57:45.000000000 -0400 @@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo hwsim_radios[i] = hw; @@ -673,9 +687,9 @@ SET_IEEE80211_DEV(hw, data->dev); addr[3] = i >> 8; diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-01 14:22:16.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-01 14:24:27.000000000 -0400 -@@ -556,11 +556,11 @@ static void handle_rx_packet(struct zd_u +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-10 13:57:46.000000000 -0400 +@@ -557,11 +557,11 @@ static void handle_rx_packet(struct zd_u * be padded. Unaligned access might also happen if the length_info * structure is not present. */ @@ -690,8 +704,8 @@ return; n = l+k; diff -up linux-2.6.25.noarch/include/linux/input.h.orig linux-2.6.25.noarch/include/linux/input.h ---- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-01 14:23:01.000000000 -0400 -+++ linux-2.6.25.noarch/include/linux/input.h 2008-07-01 14:23:41.000000000 -0400 +--- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/include/linux/input.h 2008-07-10 13:57:46.000000000 -0400 @@ -638,6 +638,7 @@ struct input_absinfo { #define SW_TABLET_MODE 0x01 /* set = tablet mode */ #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ @@ -701,8 +715,8 @@ #define SW_CNT (SW_MAX+1) diff -up linux-2.6.25.noarch/net/mac80211/iface.c.orig linux-2.6.25.noarch/net/mac80211/iface.c ---- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-10 13:57:46.000000000 -0400 @@ -53,15 +53,6 @@ int ieee80211_if_add(struct net_device * if (!ndev) return -ENOMEM; @@ -720,8 +734,8 @@ if (ret < 0) goto fail; diff -up linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c ---- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-10 13:57:46.000000000 -0400 @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq { if (ae) @@ -732,12 +746,12 @@ /* HWMP IE processing macros */ diff -up linux-2.6.25.noarch/net/mac80211/michael.c.orig linux-2.6.25.noarch/net/mac80211/michael.c ---- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-01 14:24:27.000000000 -0400 -@@ -29,17 +29,16 @@ static void michael_block(struct michael - static void michael_mic_hdr(struct michael_mic_ctx *mctx, - const u8 *key, const u8 *da, const u8 *sa, u8 priority) - { +--- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-10 13:57:46.000000000 -0400 +@@ -39,17 +39,16 @@ static void michael_mic_hdr(struct micha + else + tid = 0; + - mctx->l = get_unaligned_le32(key); - mctx->r = get_unaligned_le32(key + 4); + mctx->l = key[0] | key[1] << 8 | key[2] << 16 | key[3] << 24; @@ -754,10 +768,10 @@ + michael_block(mctx, da[0] | da[1] << 8 | da[2] << 16 | da[3] << 24); + michael_block(mctx, da[4] | da[5] << 8 | sa[0] << 16 | sa[1] << 24); + michael_block(mctx, sa[2] | sa[3] << 8 | sa[4] << 16 | sa[5] << 24); - michael_block(mctx, priority); + michael_block(mctx, tid); } -@@ -57,7 +56,9 @@ void michael_mic(const u8 *key, const u8 +@@ -67,7 +66,9 @@ void michael_mic(const u8 *key, struct i left = data_len % 4; for (block = 0; block < blocks; block++) @@ -768,7 +782,7 @@ /* Partial block of 0..3 bytes and padding: 0x5a + 4..7 zeros to make * total length a multiple of 4. */ -@@ -71,6 +72,12 @@ void michael_mic(const u8 *key, const u8 +@@ -81,6 +82,12 @@ void michael_mic(const u8 *key, struct i michael_block(&mctx, val); michael_block(&mctx, 0); @@ -784,8 +798,8 @@ + mic[7] = (mctx.r >> 24) & 0xff; } diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-10 13:57:46.000000000 -0400 @@ -7,22 +7,23 @@ * published by the Free Software Foundation. */ @@ -989,9 +1003,40 @@ } + + +diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-10 13:57:46.000000000 -0400 +@@ -317,11 +317,13 @@ static void ccmp_special_blocks(struct s + memcpy(&b_0[2], hdr->addr2, ETH_ALEN); + memcpy(&b_0[8], pn, CCMP_PN_LEN); + /* l(m) */ +- put_unaligned_be16(data_len, &b_0[14]); ++ b_0[14] = (data_len >> 8) & 0xff; ++ b_0[15] = data_len & 0xff; + + /* AAD (extra authenticate-only data) / masked 802.11 header + * FC | A1 | A2 | A3 | SC | [A4] | [QC] */ +- put_unaligned_be16(len_a, &aad[0]); ++ aad[0] = 0; /* (len_a >> 8) & 0xff; */ ++ aad[1] = len_a & 0xff; + put_unaligned(mask_fc, (__le16 *)&aad[2]); + memcpy(&aad[4], &hdr->addr1, 3 * ETH_ALEN); + +diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-10 13:57:46.000000000 -0400 +@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil + struct net *net; + + sk = sock->sk; +- net = sock_net(sk); ++ net = sk->sk_net; + + if (sock->ops->compat_ioctl) + ret = sock->ops->compat_ioctl(sock, cmd, arg); diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-10 13:57:46.000000000 -0400 @@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_ /* Ignore nop renames */ @@ -1009,8 +1054,8 @@ } diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-10 13:57:46.000000000 -0400 @@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -1052,8 +1097,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-10 13:57:46.000000000 -0400 @@ -1299,7 +1299,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; @@ -1063,15 +1108,3 @@ return; skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); -diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.000000000 -0400 -@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil - struct net *net; - - sk = sock->sk; -- net = sock_net(sk); -+ net = sk->sk_net; - - if (sock->ops->compat_ioctl) - ret = sock->ops->compat_ioctl(sock, cmd, arg); linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.57 -r 1.58 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- linux-2.6-wireless-pending.patch 8 Jul 2008 17:28:29 -0000 1.57 +++ linux-2.6-wireless-pending.patch 10 Jul 2008 18:26:02 -0000 1.58 @@ -1,3 +1,541 @@ +commit b46372710ab536c0967f76be5dc41341583d4a54 +Author: Julius Volz +Date: Tue Jul 8 14:02:19 2008 +0200 + + net/wireless/nl80211.c: fix endless Netlink callback loop. + + Although I only tested similar code (I don't use any of this wireless + code), the state maintainance between Netlink dump callback invocations + seems wrong here and should lead to an endless loop. There are also other + examples in the same file which might have the same problem. Perhaps someone + can actually test this (or refute my logic). + + Take the simple example with only one element in the list (which should fit + into the message): + + 1. invocation: + Start: + idx = 0, start = 0 + Loop: + condition (++idx < start) => (1 < 0) => false + => no continue, fill one entry, exit loop, return skb->len > 0 + + 2. invocation: + Start: + idx = 0, start = 1 + Loop: + condition (++idx < start) => (1 < 1) => false + => no continue, fill the same entry again, exit loop, return skb->len > 0 + + 3. invocation: + Same as 2. invocation, endless invocation of callback. + + Also, iterations where the filling of an element fails should not be counted as + completed, so idx should not be incremented in this case. + + Signed-off-by: Julius Volz + Signed-off-by: John W. Linville + +commit 0e25b4ef220f6ef4eed120543182385b13005db9 +Author: Larry Finger +Date: Tue Jul 8 09:43:43 2008 -0500 + + rtl8187: Change detection of RTL8187B with USB ID of 8187 + + Some early versions of RTL8187B devices have a USB ID of 0x8187 + rather than the 0x8189 of later models. In addition, it appears + that these early units also must be programmed with lower power. + Previous patches used the Product ID string to detect this situation, + but did not address the low power question. This patch uses the + hardware version and sets the power accordingly. + + Signed-off-by: Hin-Tak Leung + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 5c036b217a1fe3ae0616e9c43c6bcd13b3c134b6 +Author: Hin-Tak Leung +Date: Tue Jul 8 12:38:02 2008 +0100 + + rtl8187: updating Kconfig to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 6f7853f3cbe457067e9fe05461f56c7ea4ac488c +Author: Hin-Tak Leung +Date: Tue Jul 8 12:36:04 2008 +0100 + + rtl8187: change rtl8187_dev.c to support RTL8187B (part 2) + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit f8a08c34265b59710a8fc049911f487477c19fab +Author: Hin-Tak Leung +Date: Tue Jul 8 12:33:34 2008 +0100 + + rtl8187: change rtl8187_dev.c to support RTL8187B (part 1) + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit e7d414ff21a7e0b00295e838c004ff1de5fba6ce +Author: Hin-Tak Leung +Date: Tue Jul 8 12:31:57 2008 +0100 + + rtl8187: updating rtl8187_rtl8225.c to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit d1e11af51657d18222bef9cc15591f8c0f289186 +Author: Hin-Tak Leung +Date: Tue Jul 8 12:30:02 2008 +0100 + + rtl8187: updating rtl818x.h to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit c44ac0b9855c62b5ec8af5935124cfbe6654a32d +Author: Hin-Tak Leung +Date: Tue Jul 8 12:27:54 2008 +0100 + + rtl8187: updating rtl8187.h to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 84263b0c94431e686552a322ae84678fddd22ebd +Author: Ivo van Doorn +Date: Sun Jul 6 17:09:48 2008 +0200 + + rt2x00: Fix register comments + + Fix some register documentation in the register header files. + This allows better parsing by userspace scripts which in turn + helps debugging. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 0ac2a00c1035c749b720c4d817beea1795f02d47 +Author: Pavel Roskin +Date: Sun Jul 6 09:12:30 2008 -0400 + + hostap: don't compile prism2_suspend() for hostap_pci without CONFIG_PM + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 70197ede33134725f3e2e606fcabc28b0a4549a3 +Author: Larry Finger +Date: Fri Jul 4 08:39:01 2008 -0500 + + b43legacy: Remove switch statement with 64-bit index + + The gcc 3.4 fork used to compile the MN10300 port emits unwanted + __ucmpdi2() calls for switch statements that use a 64bit value. + + This patch removes such a switch from b43legacy, and makes the code + more like that used in b43. Thanks to Adrian Bunk + for reporting the problem. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit ae73e58ea64f121b26437a10937330e77ff48f33 +Author: Ivo van Doorn +Date: Fri Jul 4 16:14:59 2008 +0200 + + rt2x00: Report RX end time for rt2400pci + + rt2400 is the only currently available rt2x00 driver which + supports reporting of the RX end time for frames. + Since mac80211 uses this information for IBSS syncing, it + is important that it is being reported. + + v2: Complement 32 bits of RX timestamp with upper 32bits from TSF + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 8e260c22238dd8b57aefb1f5e4bd114486a9c17d +Author: Ivo van Doorn +Date: Fri Jul 4 13:41:31 2008 +0200 + + rt2x00: Use ieee80211_hw->workqueue again + + Remove the rt2x00 singlethreaded workqueue and move + the link tuner and packet filter scheduled work to + the ieee80211_hw->workqueue again. + The only exception is the interface scheduled work [...11262 lines suppressed...] list_for_each_entry(rfkill, &rfkill_list, node) { if ((!rfkill->user_claim) && (rfkill->type == type)) @@ -77781,7 +81243,7 @@ static ssize_t rfkill_name_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -109,31 +284,31 @@ static ssize_t rfkill_name_show(struct d +@@ -109,31 +286,31 @@ static ssize_t rfkill_name_show(struct d return sprintf(buf, "%s\n", rfkill->name); } @@ -77817,19 +81279,19 @@ BUG(); } +} -+ + +- return sprintf(buf, "%s\n", type); +static ssize_t rfkill_type_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct rfkill *rfkill = to_rfkill(dev); - -- return sprintf(buf, "%s\n", type); ++ + return sprintf(buf, "%s\n", rfkill_get_type_str(rfkill->type)); } static ssize_t rfkill_state_show(struct device *dev, -@@ -142,6 +317,7 @@ static ssize_t rfkill_state_show(struct +@@ -142,6 +319,7 @@ static ssize_t rfkill_state_show(struct { struct rfkill *rfkill = to_rfkill(dev); @@ -77837,7 +81299,7 @@ return sprintf(buf, "%d\n", rfkill->state); } -@@ -156,10 +332,14 @@ static ssize_t rfkill_state_store(struct +@@ -156,10 +334,14 @@ static ssize_t rfkill_state_store(struct if (!capable(CAP_NET_ADMIN)) return -EPERM; @@ -77854,7 +81316,7 @@ mutex_unlock(&rfkill->mutex); return error ? error : count; -@@ -200,7 +380,8 @@ static ssize_t rfkill_claim_store(struct +@@ -200,7 +382,8 @@ static ssize_t rfkill_claim_store(struct if (rfkill->user_claim != claim) { if (!claim) rfkill_toggle_radio(rfkill, @@ -77864,7 +81326,7 @@ rfkill->user_claim = claim; } -@@ -233,12 +414,12 @@ static int rfkill_suspend(struct device +@@ -233,12 +416,12 @@ static int rfkill_suspend(struct device if (dev->power.power_state.event != state.event) { if (state.event & PM_EVENT_SLEEP) { @@ -77882,7 +81344,7 @@ mutex_unlock(&rfkill->mutex); } -@@ -255,8 +436,8 @@ static int rfkill_resume(struct device * +@@ -255,8 +438,8 @@ static int rfkill_resume(struct device * if (dev->power.power_state.event != PM_EVENT_ON) { mutex_lock(&rfkill->mutex); @@ -77893,7 +81355,7 @@ mutex_unlock(&rfkill->mutex); } -@@ -269,12 +450,51 @@ static int rfkill_resume(struct device * +@@ -269,34 +452,71 @@ static int rfkill_resume(struct device * #define rfkill_resume NULL #endif @@ -77945,16 +81407,25 @@ }; static int rfkill_add_switch(struct rfkill *rfkill) -@@ -283,7 +503,7 @@ static int rfkill_add_switch(struct rfki - + { +- int error; +- mutex_lock(&rfkill_mutex); - error = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type]); -+ error = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type], 0); - if (!error) - list_add_tail(&rfkill->node, &rfkill_list); +- if (!error) +- list_add_tail(&rfkill->node, &rfkill_list); ++ rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type], 0); ++ ++ list_add_tail(&rfkill->node, &rfkill_list); + + mutex_unlock(&rfkill_mutex); -@@ -296,7 +516,7 @@ static void rfkill_remove_switch(struct +- return error; ++ return 0; + } + + static void rfkill_remove_switch(struct rfkill *rfkill) { mutex_lock(&rfkill_mutex); list_del_init(&rfkill->node); @@ -78003,8 +81474,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-09 10:52:43.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -78162,8 +81633,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-09 10:52:43.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -78172,8 +81643,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-09 10:52:43.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -78203,8 +81674,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-08 13:06:47.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-09 10:52:43.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -78267,9 +81738,29 @@ } /* exported functions */ +diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-09 10:42:31.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-09 10:52:48.000000000 -0400 +@@ -198,12 +198,14 @@ static int nl80211_dump_wiphy(struct sk_ + + mutex_lock(&cfg80211_drv_mutex); + list_for_each_entry(dev, &cfg80211_drv_list, list) { +- if (++idx < start) ++ if (++idx <= start) + continue; + if (nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).pid, + cb->nlh->nlmsg_seq, NLM_F_MULTI, +- dev) < 0) ++ dev) < 0) { ++ idx--; + break; ++ } + } + mutex_unlock(&cfg80211_drv_mutex); + diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-09 10:52:43.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -78311,8 +81802,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-08 13:06:47.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-09 10:52:43.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.45 -r 1.46 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless.patch,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- linux-2.6-wireless.patch 8 Jul 2008 17:28:30 -0000 1.45 +++ linux-2.6-wireless.patch 10 Jul 2008 18:26:02 -0000 1.46 @@ -1,3 +1,62 @@ +commit 814feefa859a736d29d0700d49debf13904b429f +Author: Ihar Hrachyshka +Date: Wed Jul 9 09:29:58 2008 +0300 + + libertas: fix memory alignment problems on the blackfin + + Fixing unaligned memory access on the blackfin architecture. + + Signed-off-by: Ihar Hrachyshka + Signed-off-by: John W. Linville + +commit 86229f0c7b4e065f51b5572a8a61801e281740a0 +Author: Luis Carlos Cobo +Date: Tue Jul 8 16:19:21 2008 +0200 + + zd1211rw: stop beacons on remove_interface + + If a mesh or ad-hoc interface is brought up and later it is replaced + by managed interface, the managed interface will keep transmitting + the beacons that were configured for the former interface. This patch + fixes that behaviour. + + Signed-off-by: John W. Linville + +commit 1f90916264049a7d9e6106fd60d289c9a775d24f +Author: Ivo van Doorn +Date: Tue Jul 8 13:45:20 2008 +0200 + + rt2x00: Disable synchronization during initialization + + As soon as init_registers() was called, the rt2400/rt2500 + would start raising beacondone interrupts. Since this is highly + premature since no beacons were provided yet, we should + initialize the synchronization register to 0. + + This will make all drivers initialize it to 0 regardless + if they are raising beacondone interrupts or not, since it only + makes sense to have it completely disabled. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit adeed48090fc370afa0db8d007748ee72a40b578 +Author: Mattias Nissler +Date: Mon Jul 7 23:08:19 2008 +0200 + + rc80211_pid: Fix fast_start parameter handling + + This removes the fast_start parameter from the rc_pid parameters + information and instead uses the parameter macro when initializing + the rc_pid state. Since the parameter is only used on initialization, + there is no point of making exporting it via debugfs. This also fixes + uninitialized memory references to the fast_start and norm_offset + parameters detected by the kmemcheck utility. Thanks to Vegard Nossum + for reporting the bug. + + Signed-off-by: Mattias Nissler + Signed-off-by: John W. Linville + commit 6e43829bb69bf1d584a592075f1357590eb49b1a Author: Vladimir Koutny Date: Mon Jul 7 14:23:01 2008 +0200 @@ -9356,8 +9415,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-10 13:43:33.000000000 -0400 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -9555,8 +9614,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-10 13:43:33.000000000 -0400 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -9644,8 +9703,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-10 13:43:33.000000000 -0400 @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; @@ -9900,8 +9959,8 @@ /* diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-10 13:43:33.000000000 -0400 @@ -30,7 +30,6 @@ #include @@ -10251,8 +10310,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-10 13:43:33.000000000 -0400 @@ -58,10 +58,6 @@ #include "reg.h" #include "debug.h" @@ -11306,8 +11365,8 @@ memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats)); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-10 13:43:33.000000000 -0400 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -11353,8 +11412,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-10 13:43:33.000000000 -0400 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -11529,8 +11588,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-10 13:43:33.000000000 -0400 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -11615,8 +11674,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-10 13:43:33.000000000 -0400 @@ -1,4 +1,4 @@ - /* +/* @@ -13211,8 +13270,8 @@ /****************\ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-10 13:43:33.000000000 -0400 @@ -173,7 +173,10 @@ struct ath5k_eeprom_info { * (rX: reserved fields possibily used by future versions of the ar5k chipset) */ @@ -13414,8 +13473,8 @@ */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-10 13:43:33.000000000 -0400 @@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini { AR5K_PHY(644), 0x00806333 }, { AR5K_PHY(645), 0x00106c10 }, @@ -13938,8 +13997,8 @@ } diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-08 13:06:46.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-10 13:43:33.000000000 -0400 [...4475 lines suppressed...] #include #include @@ -125839,8 +126082,8 @@ #endif /* STA_INFO_H */ diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-10 13:43:34.000000000 -0400 @@ -12,7 +12,7 @@ #include @@ -125938,8 +126181,8 @@ tkip_mixing_phase2(key->u.tkip.p1k_rx[queue], diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h ---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-10 13:43:34.000000000 -0400 @@ -11,7 +11,7 @@ #include @@ -125959,8 +126202,8 @@ #endif /* TKIP_H */ diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c ---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-10 13:43:34.000000000 -0400 @@ -25,11 +25,12 @@ #include @@ -127415,8 +127658,8 @@ return skb; } diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c ---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-10 13:43:34.000000000 -0400 @@ -25,7 +25,8 @@ #include @@ -127735,8 +127978,8 @@ -EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); +EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c ---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-10 13:43:34.000000000 -0400 @@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -127827,8 +128070,8 @@ + return TX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h ---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-10 13:43:34.000000000 -0400 @@ -14,7 +14,7 @@ #include #include @@ -127853,8 +128096,8 @@ #endif /* WEP_H */ diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-08 13:06:47.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-10 13:43:34.000000000 -0400 @@ -0,0 +1,1171 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -129028,8 +129271,8 @@ + .get_wireless_stats = ieee80211_get_wireless_stats, +}; diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-10 13:43:34.000000000 -0400 @@ -19,10 +19,13 @@ #include "wme.h" @@ -129239,8 +129482,8 @@ + } +} diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-10 13:43:34.000000000 -0400 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -129286,8 +129529,8 @@ { return 0; diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-10 13:43:34.000000000 -0400 @@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const } @@ -129667,8 +129910,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h ---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-10 13:43:34.000000000 -0400 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -129702,8 +129945,8 @@ #endif /* WPA_H */ diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-10 13:43:34.000000000 -0400 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -129753,8 +129996,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h ---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-10 13:43:34.000000000 -0400 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -129764,8 +130007,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile ---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-10 13:43:34.000000000 -0400 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -129774,8 +130017,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c ---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-10 13:43:34.000000000 -0400 @@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 }, [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, @@ -130466,8 +130709,8 @@ /* multicast groups */ diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-08 13:06:47.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-10 13:43:34.000000000 -0400 @@ -0,0 +1,180 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -130650,8 +130893,8 @@ + handle_band(wiphy->bands[band], rd); +} diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-08 13:06:47.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-10 13:43:34.000000000 -0400 @@ -0,0 +1,121 @@ +/* + * Wireless utility functions @@ -130775,8 +131018,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-10 13:43:34.000000000 -0400 @@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; From fedora-extras-commits at redhat.com Thu Jul 10 18:28:52 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 10 Jul 2008 18:28:52 GMT Subject: rpms/enchant/F-9 enchant.spec,1.19,1.20 Message-ID: <200807101828.m6AISqDT032531@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/enchant/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32473 Modified Files: enchant.spec Log Message: Fix 426712: don't build static libs (patch from Michael Schwendt Index: enchant.spec =================================================================== RCS file: /cvs/pkgs/rpms/enchant/F-9/enchant.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- enchant.spec 21 May 2008 18:14:04 -0000 1.19 +++ enchant.spec 10 Jul 2008 18:27:55 -0000 1.20 @@ -1,7 +1,7 @@ Summary: An Enchanting Spell Checking Library Name: enchant Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: System Environment/Libraries License: LGPLv2+ @@ -48,7 +48,7 @@ %setup -q %build -%configure --disable-ispell --with-myspell-dir=/usr/share/myspell --disable-hspell +%configure --disable-ispell --with-myspell-dir=/usr/share/myspell --disable-hspell --disable-static make %{?_smp_mflags} %install @@ -76,9 +76,7 @@ %files devel %defattr(-,root,root) -%{_libdir}/*.a %{_libdir}/*.so -%{_libdir}/enchant/*.a %{_libdir}/pkgconfig/enchant.pc %{_includedir}/enchant @@ -90,6 +88,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Thu Jul 10 2008 Marc Maurer 1:1.4.2-2 +- Fix 426712: don't build static libs (patch from Michael Schwendt + * Wed May 21 2008 Marc Maurer 1:1.4.2-1 - New upstream release - Add voikko support in an enchant-voikko package From fedora-extras-commits at redhat.com Thu Jul 10 18:34:05 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 10 Jul 2008 18:34:05 GMT Subject: rpms/babel/devel babel.spec,1.9,1.10 Message-ID: <200807101834.m6AIY5ua000302@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/babel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32731 Modified Files: babel.spec Log Message: * Thu Jul 10 2008 Jeffrey C. Ollie - 0.9.3-1 - Update to 0.9.3 Index: babel.spec =================================================================== RCS file: /cvs/pkgs/rpms/babel/devel/babel.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- babel.spec 20 Feb 2008 14:02:56 -0000 1.9 +++ babel.spec 10 Jul 2008 18:33:07 -0000 1.10 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: babel -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: Tools for internationalizing Python applications @@ -64,6 +64,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 10 2008 Jeffrey C. Ollie - 0.9.3-1 +- Update to 0.9.3 + * Sun Dec 16 2007 Jeffrey C. Ollie - 0.9.1-1 - Update to 0.9.1 From fedora-extras-commits at redhat.com Thu Jul 10 18:37:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 18:37:11 +0000 Subject: [pkgdb] xfce4-minicmd-plugin ownership updated Message-ID: <200807101837.m6AIbBBn015835@bastion.fedora.phx.redhat.com> Package xfce4-minicmd-plugin in Fedora devel was orphaned by Christoph Wickert (cwickert) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-minicmd-plugin From fedora-extras-commits at redhat.com Thu Jul 10 18:38:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 18:38:02 +0000 Subject: [pkgdb] xfce4-dict-plugin ownership updated Message-ID: <200807101838.m6AIc2qN015887@bastion.fedora.phx.redhat.com> Package xfce4-dict-plugin in Fedora devel was orphaned by Christoph Wickert (cwickert) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-dict-plugin From fedora-extras-commits at redhat.com Thu Jul 10 18:46:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 18:46:12 +0000 Subject: [pkgdb] gnome-python2 (Fedora OLPC, 3) updated by ausil Message-ID: <200807101846.m6AIkC9Y016168@bastion.fedora.phx.redhat.com> Dennis Gilmore (ausil) added a Fedora OLPC 3 branch for gnome-python2 Dennis Gilmore (ausil) has set commit to Approved for cvsextras on gnome-python2 (Fedora OLPC 3) Dennis Gilmore (ausil) has set build to Approved for cvsextras on gnome-python2 (Fedora OLPC 3) Dennis Gilmore (ausil) has set checkout to Approved for cvsextras on gnome-python2 (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-python2 From fedora-extras-commits at redhat.com Thu Jul 10 19:15:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:15:20 GMT Subject: rpms/regexp/devel regexp.spec,1.39,1.40 Message-ID: <200807101915.m6AJFKSh008568@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/regexp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8544 Modified Files: regexp.spec Log Message: fix repotag Index: regexp.spec =================================================================== RCS file: /cvs/pkgs/rpms/regexp/devel/regexp.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- regexp.spec 19 Feb 2008 01:31:29 -0000 1.39 +++ regexp.spec 10 Jul 2008 19:14:35 -0000 1.40 @@ -36,7 +36,7 @@ Name: regexp Version: 1.5 -Release: 2jpp.1%{dist} +Release: 2.2%{dist} Epoch: 0 Summary: Simple regular expressions API License: ASL 2.0 @@ -148,6 +148,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.5-2.2 +- drop repotag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.5-2jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 19:16:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:16:23 GMT Subject: rpms/relaxngDatatype/devel relaxngDatatype.spec,1.1,1.2 Message-ID: <200807101916.m6AJGN5q008655@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/relaxngDatatype/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8623 Modified Files: relaxngDatatype.spec Log Message: fix repotag Index: relaxngDatatype.spec =================================================================== RCS file: /cvs/pkgs/rpms/relaxngDatatype/devel/relaxngDatatype.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- relaxngDatatype.spec 12 Mar 2007 16:41:52 -0000 1.1 +++ relaxngDatatype.spec 10 Jul 2008 19:15:35 -0000 1.2 @@ -30,7 +30,7 @@ Name: relaxngDatatype Version: 1.0 -Release: 3jpp.1%{?dist} +Release: 3.2%{?dist} Summary: RELAX NG Datatype API Group: Development/Libraries/Java @@ -94,6 +94,9 @@ %doc %{_javadocdir}/%{name}* %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 1.0-3.2 +- drop repotag + * Mon Feb 12 2007 Andrew Overholt 1.0-3jpp.1 - Fixed issues for Fedora-ization - Add patch to compress the main jar From fedora-extras-commits at redhat.com Thu Jul 10 19:17:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:17:36 GMT Subject: rpms/rhino/devel rhino.spec,1.2,1.3 Message-ID: <200807101917.m6AJHaac008776@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/rhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8710 Modified Files: rhino.spec Log Message: fix repotag Index: rhino.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhino/devel/rhino.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rhino.spec 15 Mar 2007 17:41:39 -0000 1.2 +++ rhino.spec 10 Jul 2008 19:16:38 -0000 1.3 @@ -32,10 +32,10 @@ Name: rhino Version: 1.6 -Release: 0.1.r5.1jpp.2%{?dist} +Release: 0.1.r5.1.3%{?dist} Epoch: 0 Summary: JavaScript for Java -License: MPL +License: MPLv1.1 or GPLv2+ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip @@ -167,6 +167,10 @@ %doc %{_javadocdir}/* %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.6-0.1.r5.1.3 +- drop repotag +- fix license tag + * Thu Mar 15 2007 Matt Wringe 0:1.6-0.1.r5.1jpp.2 - Remove script from build as the debugging tool is disabled due to it containing proprietary code from Sun. From fedora-extras-commits at redhat.com Thu Jul 10 19:25:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:25:52 GMT Subject: rpms/sac/devel sac.spec,1.1,1.2 Message-ID: <200807101925.m6AJPqiM009035@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/sac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8992 Modified Files: sac.spec Log Message: fix repotag Index: sac.spec =================================================================== RCS file: /cvs/pkgs/rpms/sac/devel/sac.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sac.spec 9 May 2008 19:59:40 -0000 1.1 +++ sac.spec 10 Jul 2008 19:25:11 -0000 1.2 @@ -3,7 +3,7 @@ Name: sac Version: 1.3 -Release: 3jpp.1%{?dist} +Release: 3.2%{?dist} Summary: Java standard interface for CSS parser License: W3C Group: System Environment/Libraries @@ -68,6 +68,9 @@ %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 1.3-3.2 +- drop repotag + * Fri May 09 2008 Caolan McNamara 1.3-3jpp.1 - update for guidelines From fedora-extras-commits at redhat.com Thu Jul 10 19:27:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:27:01 GMT Subject: rpms/saxon/devel saxon.spec,1.2,1.3 Message-ID: <200807101927.m6AJR1Pe009133@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/saxon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9088 Modified Files: saxon.spec Log Message: fix repotag Index: saxon.spec =================================================================== RCS file: /cvs/pkgs/rpms/saxon/devel/saxon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- saxon.spec 11 Mar 2007 21:46:04 -0000 1.2 +++ saxon.spec 10 Jul 2008 19:26:09 -0000 1.3 @@ -33,9 +33,9 @@ Summary: Java XSLT processor Name: saxon Version: 6.5.5 -Release: 1jpp.2%{?dist} +Release: 1.3%{?dist} Epoch: 0 -License: MPL +License: MPLv1.0 Group: Text Processing/Markup/XML URL: http://saxon.sourceforge.net/ Source0: http://download.sf.net/saxon/saxon6-5-5.zip @@ -228,6 +228,10 @@ %attr(0644,root,root) %{_mandir}/man1/%{name}.1* %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:6.5.5-1.3 +- drop repotag +- fix license tag + * Sun Mar 11 2007 Vivek Lakshmanan - 0:6.5.5-1jpp.2.fc7 - First build for Fedora - Resolves: #227114 (Missing BR on ant - Thanks mcepl) From fedora-extras-commits at redhat.com Thu Jul 10 19:28:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:28:05 GMT Subject: rpms/struts/devel struts.spec,1.52,1.53 Message-ID: <200807101928.m6AJS5ZV009228@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/struts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9190 Modified Files: struts.spec Log Message: fix repotag Index: struts.spec =================================================================== RCS file: /cvs/pkgs/rpms/struts/devel/struts.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- struts.spec 29 May 2008 15:45:43 -0000 1.52 +++ struts.spec 10 Jul 2008 19:27:17 -0000 1.53 @@ -54,7 +54,7 @@ Name: struts Version: 1.2.9 -Release: 5jpp.10%{?dist} +Release: 5.11%{?dist} Epoch: 0 Summary: Web application framework License: ASL 2.0 @@ -155,8 +155,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -180,8 +181,9 @@ Requires(post): oro Requires(post): tomcat3 Requires(pre): tomcat3 -Requires(post): /bin/ln -Requires(preun): /bin/rm +# for /bin/ln and /bin/rm +Requires(post): coreutils +Requires(preun): coreutils %if %{gcj_support} BuildRequires: java-gcj-compat-devel @@ -210,8 +212,9 @@ Requires(post): oro Requires(post): tomcat4 Requires(pre): tomcat4 -Requires(post): /bin/ln -Requires(preun): /bin/rm +# for /bin/ln and /bin/rm +Requires(post): coreutils +Requires(preun): coreutils %if %{gcj_support} BuildRequires: java-gcj-compat-devel @@ -241,8 +244,9 @@ Requires(post): oro Requires(post): tomcat5 Requires(pre): tomcat5 -Requires(post): /bin/ln -Requires(preun): /bin/rm +# for /bin/ln and /bin/rm +Requires(post): coreutils +Requires(preun): coreutils %if %{gcj_support} BuildRequires: java-gcj-compat-devel @@ -289,7 +293,8 @@ Requires(post): tomcat5 Requires(pre): tomcat5 Requires(post): jakarta-commons-chain -Requires(preun): /bin/rm +# for /bin/rm +Requires(preun): coreutils %if %{gcj_support} BuildRequires: java-gcj-compat-devel @@ -326,8 +331,9 @@ %package el-javadoc Summary: Javadoc for %{name}-el Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description el-javadoc %{summary}. @@ -344,7 +350,8 @@ Requires(post): tomcat5 Requires(pre): tomcat5 Requires(post): jakarta-taglibs-standard -Requires(preun): /bin/rm +# for /bin/rm +Requires(preun): coreutils %description el-webapps-tomcat5 %{summary}. @@ -377,8 +384,9 @@ %package faces-javadoc Summary: Javadoc for %{name}-faces Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description faces-javadoc %{summary}. @@ -409,7 +417,8 @@ Requires(post): oro Requires(post): tomcat5 Requires(pre): tomcat5 -Requires(preun): /bin/rm +# for /bin/rm +Requires(preun): coreutils %description faces-webapps-tomcat5 %{summary}. @@ -1064,6 +1073,9 @@ %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.2.9-5.11 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.2.9-5jpp.10 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 10 19:40:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:40:27 GMT Subject: rpms/tagsoup/devel tagsoup.spec,1.2,1.3 Message-ID: <200807101940.m6AJeRnU009679@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/tagsoup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9612 Modified Files: tagsoup.spec Log Message: fix repotag Index: tagsoup.spec =================================================================== RCS file: /cvs/pkgs/rpms/tagsoup/devel/tagsoup.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tagsoup.spec 19 Feb 2008 17:52:46 -0000 1.2 +++ tagsoup.spec 10 Jul 2008 19:39:39 -0000 1.3 @@ -36,10 +36,10 @@ Name: tagsoup Version: 1.0.1 -Release: 2jpp.1%{?dist} +Release: 2.2%{?dist} Epoch: 0 Summary: A SAX-compliant HTML parser written in Java -License: GPL +License: GPLv2+ or AFL Source0: http://home.ccil.org/~cowan/XML/tagsoup/tagsoup-1.0.1-src.zip URL: http://home.ccil.org/~cowan/XML/tagsoup/ Group: Text Processing/Markup/XML @@ -134,6 +134,10 @@ %doc %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.0.1-2.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.0.1-2jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 19:41:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:41:31 GMT Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.27,1.28 Message-ID: <200807101941.m6AJfV2n009826@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/tanukiwrapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9763 Modified Files: tanukiwrapper.spec Log Message: fix repotag Index: tanukiwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tanukiwrapper.spec 19 Feb 2008 17:24:13 -0000 1.27 +++ tanukiwrapper.spec 10 Jul 2008 19:40:44 -0000 1.28 @@ -34,7 +34,7 @@ Name: tanukiwrapper Version: 3.2.3 -Release: 2jpp.1%{?dist} +Release: 2.2%{?dist} Summary: Java Service Wrapper Epoch: 0 License: BSD @@ -82,9 +82,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# For /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc %{summary}. @@ -202,6 +202,9 @@ %doc doc/* %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:3.2.3-2.2 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0:3.2.3-2jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 19:42:39 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 10 Jul 2008 19:42:39 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.857, 1.858 kernel.spec, 1.750, 1.751 sources, 1.818, 1.819 upstream, 1.736, 1.737 patch-2.6.26-rc9-git6.bz2.sign, 1.1, NONE Message-ID: <200807101942.m6AJgdtW009980@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9905 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git7.bz2.sign Removed Files: patch-2.6.26-rc9-git6.bz2.sign Log Message: 2.6.26-rc9-git7 --- NEW FILE patch-2.6.26-rc9-git7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIdl0lyGugalF9Dw4RAo6CAJ9xB73YsMHQUxiuwnBO5IwXMzTcygCggbyF REUVUjoV9nc+yt3Dp78BPQI= =QZCO -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.857 retrieving revision 1.858 diff -u -r1.857 -r1.858 --- .cvsignore 10 Jul 2008 15:44:13 -0000 1.857 +++ .cvsignore 10 Jul 2008 19:41:47 -0000 1.858 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git6.bz2 +patch-2.6.26-rc9-git7.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.750 retrieving revision 1.751 diff -u -r1.750 -r1.751 --- kernel.spec 10 Jul 2008 17:28:14 -0000 1.750 +++ kernel.spec 10 Jul 2008 19:41:47 -0000 1.751 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 10 2008 Dave Jones +- 2.6.26-rc9-git7 + * Thu Jul 10 2008 John W. Linville - Upstream wireless fixes from 2008-07-09 (http://marc.info/?l=linux-netdev&m=121563769208664&w=2) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.818 retrieving revision 1.819 diff -u -r1.818 -r1.819 --- sources 10 Jul 2008 15:44:13 -0000 1.818 +++ sources 10 Jul 2008 19:41:47 -0000 1.819 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -2250c2d2e827f0e8ab2460283d7b9f38 patch-2.6.26-rc9-git6.bz2 +5d702bd2ead3842b770cfd512ddbb69c patch-2.6.26-rc9-git7.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.736 retrieving revision 1.737 diff -u -r1.736 -r1.737 --- upstream 10 Jul 2008 15:44:13 -0000 1.736 +++ upstream 10 Jul 2008 19:41:47 -0000 1.737 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git6.bz2 +patch-2.6.26-rc9-git7.bz2 --- patch-2.6.26-rc9-git6.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 19:42:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:42:41 GMT Subject: rpms/tomcat5/devel tomcat5.spec,1.112,1.113 Message-ID: <200807101942.m6AJgfL0009983@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/tomcat5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9898 Modified Files: tomcat5.spec Log Message: fix repotag Index: tomcat5.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- tomcat5.spec 23 May 2008 19:41:00 -0000 1.112 +++ tomcat5.spec 10 Jul 2008 19:41:46 -0000 1.113 @@ -69,7 +69,7 @@ Name: tomcat5 Epoch: 0 Version: 5.5.26 -Release: 1jpp.3%{?dist} +Release: 1.4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Group: Networking/Daemons @@ -215,7 +215,8 @@ Summary: Web applications for Apache Tomcat Requires(post): jpackage-utils >= 0:1.6.0 Requires(preun): findutils -Requires(preun): /bin/rm +# For /bin/rm +Requires(preun): coreutils %if %{gcj_support} Requires(post): java-gcj-compat >= 1.0.31 @@ -232,11 +233,13 @@ Requires(postun): %{name} = %{epoch}:%{version}-%{release} Requires: struts >= 0:1.1 Summary: The administrative web applications for Apache Tomcat -Requires(post): /bin/rm +# for /bin/rm +Requires(post): coreutils Requires(post): jpackage-utils >= 0:1.6.0 Requires(post): findutils Requires(preun): findutils -Requires(preun): /bin/rm +# for /bin/rm +Requires(preun): coreutils %if %{gcj_support} Requires(post): java-gcj-compat >= 1.0.31 @@ -249,15 +252,16 @@ %package servlet-%{servletspec}-api Group: Internet/WWW/Dynamic Content -Requires: /usr/sbin/update-alternatives +# for /usr/sbin/update-alternatives +Requires: chkconfig Summary: Apache Tomcat Servlet implementation classes Obsoletes: servletapi5 Provides: servlet Provides: servlet5 Provides: servlet24 Provides: servletapi5 -Requires(post): /sbin/chkconfig -requires(postun): /sbin/chkconfig +Requires(post): chkconfig +requires(postun): chkconfig %if %{gcj_support} # libgcj aot-compiled native libraries @@ -274,8 +278,8 @@ Summary: Javadoc generated documentation for %{name}-servlet-%{servletspec}-api Obsoletes: servletapi5-javadoc Provides: servletapi5-javadoc -Requires(post): /bin/rm -Requires(post): /bin/ln +# for /bin/rm and /bin/ln +Requires(post): coreutils %description servlet-%{servletspec}-api-javadoc Contains the javadoc generated documentation for the implementation classes @@ -283,7 +287,8 @@ %package jsp-%{jspspec}-api Group: Internet/WWW/Dynamic Content -Requires: /usr/sbin/update-alternatives +# for /usr/sbin/update-alternatives +Requires: chkconfig Requires: servlet24 # We need this to indirectly get rid of legacy jsp included in old # servlet packages (one day we will be able to remove this) @@ -292,8 +297,8 @@ Requires(postun): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Summary: Apache Tomcat Servlet and JSP implementation classes Provides: jsp -Requires(post): /sbin/chkconfig -Requires(postun): /sbin/chkconfig +Requires(post): chkconfig +Requires(postun): chkconfig %if %{gcj_support} # libgcj aot-compiled native libraries @@ -308,8 +313,8 @@ %package jsp-%{jspspec}-api-javadoc Group: Development/Documentation Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api -Requires(post): /bin/rm -Requires(post): /bin/ln +# for /bin/rm and /bin/ln +Requires(post): coreutils %description jsp-%{jspspec}-api-javadoc Contains the javadoc generated documentation for the implementation classes @@ -343,8 +348,9 @@ Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release} Requires(post): findutils Requires(preun): findutils -Requires(post): /bin/rm -Requires(preun): /bin/rm +# for /bin/rm +Requires(post): coreutils +Requires(preun): coreutils %if %{gcj_support} # libgcj aot-compiled native libraries @@ -366,8 +372,9 @@ Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release} Requires(post): findutils Requires(preun): findutils -Requires(post): /bin/rm -Requires(preun): /bin/rm +# for /bin/rm +Requires(post): coreutils +Requires(preun): coreutils %if %{gcj_support} # libgcj aot-compiled native libraries Requires(post): java-gcj-compat >= 1.0.31 @@ -1299,6 +1306,9 @@ %endif %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:5.5.26-1.4 +- drop repotag + * Fri May 23 2008 Todd Zullinger 0:5.5.26-1jpp.3 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 10 19:43:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:43:54 GMT Subject: rpms/tomcat6/devel tomcat6.spec,1.1,1.2 Message-ID: <200807101943.m6AJhsmw010095@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/tomcat6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10036 Modified Files: tomcat6.spec Log Message: fix repotag Index: tomcat6.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat6.spec 7 Apr 2008 22:37:26 -0000 1.1 +++ tomcat6.spec 10 Jul 2008 19:42:58 -0000 1.2 @@ -51,7 +51,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{macro_version} -Release: 1jpp.7%{?dist} +Release: 1.8%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -86,9 +86,10 @@ Requires: java >= 0:1.6.0 Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +# for /sbin/service +Requires(preun): initscripts %description Tomcat is the servlet container that is used in the official Reference @@ -433,6 +434,9 @@ %{appdir}/sample %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:6.0.16-1.8 +- drop repotag + * Fri Apr 04 2008 David Walluck 0:6.0.16-1jpp.7.fc9 - version jsp and servlet Provides with their spec versions - remove Obsoletes/Provides for servletapi6 package as it can co-exist From fedora-extras-commits at redhat.com Thu Jul 10 19:49:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:49:33 GMT Subject: rpms/velocity/devel velocity.spec,1.23,1.24 Message-ID: <200807101949.m6AJnXCI010255@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/velocity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10220 Modified Files: velocity.spec Log Message: fix repotag Index: velocity.spec =================================================================== RCS file: /cvs/pkgs/rpms/velocity/devel/velocity.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- velocity.spec 29 May 2008 15:46:57 -0000 1.23 +++ velocity.spec 10 Jul 2008 19:48:39 -0000 1.24 @@ -37,7 +37,7 @@ Name: velocity Version: 1.4 -Release: 7jpp.2 +Release: 7.3%{?dist} Epoch: 0 Summary: Java-based template engine License: ASL 2.0 @@ -116,9 +116,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): %{__rm} -Requires(post): /bin/ln -Requires(postun): %{__rm} +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -283,6 +283,9 @@ #%endif %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.4-7.3 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.4-7jpp.2 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 10 19:52:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:52:44 GMT Subject: rpms/werken-xpath/devel werken-xpath.spec,1.7,1.8 Message-ID: <200807101952.m6AJqiVB010659@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/werken-xpath/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10490 Modified Files: werken-xpath.spec Log Message: fix repotag Index: werken-xpath.spec =================================================================== RCS file: /cvs/pkgs/rpms/werken-xpath/devel/werken-xpath.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- werken-xpath.spec 19 Feb 2008 03:15:06 -0000 1.7 +++ werken-xpath.spec 10 Jul 2008 19:51:52 -0000 1.8 @@ -38,10 +38,12 @@ Name: werken-xpath Version: 0.9.4 -Release: 1.beta.12jpp.2 +Release: 1.beta.12.3 Epoch: 0 Summary: XPath implementation using JDOM -License: Apache Software License-like +# Worth noting that this ASL 1.1 has slightly different wording. +# It may be GPL compatible as a result. +License: ASL 1.1 Source0: %{dotname}-%{version}-beta-src.tar.gz Patch0: %{name}-ElementNamespaceContext.patch Patch1: %{name}-Partition.patch @@ -86,8 +88,9 @@ Summary: Javadoc for %{name} Group: Development/Documentation BuildRequires: java-javadoc -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils Provides: werken.xpath-javadoc = %{epoch}:%{version}-%{release} Obsoletes: werken.xpath-javadoc < 0.9.4 @@ -198,6 +201,10 @@ # ----------------------------------------------------------------------------- %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:0.9.4-1.beta.12.3 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:0.9.4-1.beta.12jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 19:53:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:53:44 GMT Subject: rpms/wsdl4j/devel wsdl4j.spec,1.17,1.18 Message-ID: <200807101953.m6AJriCL010947@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/wsdl4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10769 Modified Files: wsdl4j.spec Log Message: fix repotag Index: wsdl4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/wsdl4j/devel/wsdl4j.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- wsdl4j.spec 29 May 2008 15:50:16 -0000 1.17 +++ wsdl4j.spec 10 Jul 2008 19:52:58 -0000 1.18 @@ -39,7 +39,7 @@ Summary: Web Services Description Language Toolkit for Java Name: wsdl4j Version: 1.5.2 -Release: 5jpp.3%{?dist} +Release: 5.4%{?dist} Epoch: 0 Group: Text Processing/Markup/XML License: CPL @@ -71,8 +71,9 @@ %package javadoc Group: Development/Documentation Summary: Javadoc for %{name} -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -152,6 +153,9 @@ %ghost %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.5.2-5.4 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.5.2-5jpp.3 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 10 19:53:58 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 10 Jul 2008 19:53:58 GMT Subject: rpms/gegl/devel .cvsignore, 1.5, 1.6 gegl.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200807101953.m6AJrwDn011033@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/gegl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10803 Modified Files: .cvsignore gegl.spec sources Log Message: * Thu Jul 10 2008 Deji Akingunola - 0.0.18-1 - Update to latest release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gegl/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Feb 2008 07:13:25 -0000 1.5 +++ .cvsignore 10 Jul 2008 19:53:09 -0000 1.6 @@ -1 +1 @@ -gegl-0.0.16.tar.bz2 +gegl-0.0.18.tar.bz2 Index: gegl.spec =================================================================== RCS file: /cvs/pkgs/rpms/gegl/devel/gegl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gegl.spec 28 Feb 2008 07:43:47 -0000 1.6 +++ gegl.spec 10 Jul 2008 19:53:09 -0000 1.7 @@ -1,6 +1,6 @@ Summary: A graph based image processing framework Name: gegl -Version: 0.0.16 +Version: 0.0.18 Release: 1%{?dist} # The binary is under the GPL, while the libs are under LGPL License: LGPLv3+ and GPLv3+ @@ -11,7 +11,7 @@ BuildRequires: babl-devel gtk2-devel ruby BuildRequires: libpng-devel libjpeg-devel librsvg2-devel BuildRequires: perl-devel SDL-devel OpenEXR-devel lua-devel -BuildRequires: enscript w3m graphviz pkgconfig +BuildRequires: asciidoc enscript w3m graphviz pkgconfig %description GEGL (Generic Graphics Library) is a graph based image processing framework. @@ -74,6 +74,9 @@ %endif %changelog +* Thu Jul 10 2008 Deji Akingunola - 0.0.18-1 +- Update to latest release + * Thu Feb 28 2008 Deji Akingunola - 0.0.16-1 - New release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gegl/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Feb 2008 07:13:25 -0000 1.5 +++ sources 10 Jul 2008 19:53:09 -0000 1.6 @@ -1 +1 @@ -fd49cb219ece97f4677554db4a2c02d1 gegl-0.0.16.tar.bz2 +e458409440a7b51f446df321c3657e4d gegl-0.0.18.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 10 19:54:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 19:54:44 GMT Subject: rpms/ws-jaxme/devel ws-jaxme.spec,1.1,1.2 Message-ID: <200807101954.m6AJsi0o011180@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ws-jaxme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11043 Modified Files: ws-jaxme.spec Log Message: fix repotag Index: ws-jaxme.spec =================================================================== RCS file: /cvs/pkgs/rpms/ws-jaxme/devel/ws-jaxme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ws-jaxme.spec 12 Mar 2007 16:44:40 -0000 1.1 +++ ws-jaxme.spec 10 Jul 2008 19:53:59 -0000 1.2 @@ -32,12 +32,12 @@ Name: ws-jaxme Version: 0.5.1 -Release: 2jpp.1%{?dist} +Release: 2.2%{?dist} Epoch: 0 Summary: Open source implementation of JAXB Group: Development/Libraries/Java -License: Apache Software License +License: ASL 2.0 URL: http://ws.apache.org/jaxme/ # svn export http://svn.apache.org/repos/asf/webservices/jaxme/tags/R0_5_1/ ws-jaxme-0.5.1 # tar czf ws-jaxme-0.5.1-src.tar.gz ws-jaxme @@ -185,6 +185,10 @@ %doc %{_docdir}/%{name}-%{version} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:0.5.1-2.2 +- drop repotag +- fix license tag + * Mon Feb 12 2007 Deepak Bhole - 0:0.5.1-2jpp.1 - Update as per Fedora guidelines. From fedora-extras-commits at redhat.com Thu Jul 10 19:58:13 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 10 Jul 2008 19:58:13 GMT Subject: rpms/babl/devel .cvsignore, 1.5, 1.6 babl.spec, 1.6, 1.7 sources, 1.5, 1.6 babl-extensions-path.patch, 1.1, NONE Message-ID: <200807101958.m6AJwDnB011875@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/babl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11718 Modified Files: .cvsignore babl.spec sources Removed Files: babl-extensions-path.patch Log Message: * Thu Jul 10 2008 Deji Akingunola - 0.0.22-1 - Update to latest release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/babl/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Feb 2008 07:09:45 -0000 1.5 +++ .cvsignore 10 Jul 2008 19:57:22 -0000 1.6 @@ -1 +1 @@ -babl-0.0.20.tar.bz2 +babl-0.0.22.tar.bz2 Index: babl.spec =================================================================== RCS file: /cvs/pkgs/rpms/babl/devel/babl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- babl.spec 28 Feb 2008 07:09:45 -0000 1.6 +++ babl.spec 10 Jul 2008 19:57:22 -0000 1.7 @@ -1,6 +1,6 @@ Summary: A dynamic, any to any, pixel format conversion library Name: babl -Version: 0.0.20 +Version: 0.0.22 Release: 1%{?dist} # The gggl codes contained in this package are under the GPL, with exceptions allowing their use under libraries covered under the LGPL License: LGPLv3+ and GPLv3+ @@ -67,6 +67,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 10 2008 Deji Akingunola - 0.0.22-1 +- Update to latest release + * Thu Feb 28 2008 Deji Akingunola - 0.0.20-1 - New release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/babl/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Feb 2008 07:09:45 -0000 1.5 +++ sources 10 Jul 2008 19:57:22 -0000 1.6 @@ -1 +1 @@ -dbf67b333b0812dfe0d0f057864b0f9a babl-0.0.20.tar.bz2 +b821ce696b40feb74552da9d666defad babl-0.0.22.tar.bz2 --- babl-extensions-path.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 19:59:59 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 10 Jul 2008 19:59:59 GMT Subject: rpms/cairo-dock/devel cairo-dock.spec,1.58,1.59 Message-ID: <200807101959.m6AJxxC9012289@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12107 Modified Files: cairo-dock.spec Log Message: Temporary workaround for musicplayer subdir Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- cairo-dock.spec 10 Jul 2008 17:07:17 -0000 1.58 +++ cairo-dock.spec 10 Jul 2008 19:59:16 -0000 1.59 @@ -198,6 +198,18 @@ # switcher is not ready sed -i.dir -e '/switcher/d' Makefile.am +# musicplayer +cd musicplayer/ +sed -i.po -e '\|po/Makefile|d' configure.ac +sed -i -e '/ALL_LINGUAS/d' configure.ac +sed -i -e '/GETTEXT/d' configure.ac +sed -i -e '/INTLTOOL/d' configure.ac +sed -i.lib \ + -e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \ + configure.ac +sed -i.po -e 's|po||' Makefile.am +cd .. + # First deal with subdirs in topdir configure.ac, then else Subdirs_1=$(%{__sed} -n '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2) %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh From fedora-extras-commits at redhat.com Thu Jul 10 20:13:30 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 20:13:30 GMT Subject: rpms/nagios-plugins/devel nagios-plugins.spec,1.41,1.42 Message-ID: <200807102013.m6AKDUXX021215@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21007 Modified Files: nagios-plugins.spec Log Message: Upstream to 1.4.12 Index: nagios-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- nagios-plugins.spec 30 Apr 2008 21:48:15 -0000 1.41 +++ nagios-plugins.spec 10 Jul 2008 20:12:31 -0000 1.42 @@ -1,6 +1,6 @@ Name: nagios-plugins -Version: 1.4.11 -Release: 4%{?dist} +Version: 1.4.12 +Release: 2%{?dist} Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System @@ -11,8 +11,6 @@ Patch0: nagios-plugins-1.4.3-subst.patch Patch1: nagios-plugins-1.4.3-ntpd.patch Patch2: nagios-plugins-check_log-path.patch -Patch3: nagios-plugins-1.4.11-ping_timeout.patch -Patch4: nagios-plugins-1.4.11-pgsql-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -514,12 +512,11 @@ %patch0 -p1 %patch1 -p0 %patch2 -p1 -%patch3 -p1 -%patch4 -p0 %build %configure \ --libexecdir=%{_libdir}/nagios/plugins \ + --enable-extra-opts \ --with-mysql \ PATH_TO_QSTAT=%{_bindir}/qstat \ PATH_TO_FPING=%{_sbindir}/fping \ @@ -803,6 +800,13 @@ %{_libdir}/nagios/plugins/utils.sh %changelog +* Mon Jun 30 2008 Robert M. Albrecht 1.4.12-2 +- Enabled --with-extra-opts + +* Sun Jun 29 2008 Robert M. Albrecht 1.4.12-1 +- Upstream released version 1.4.12 +- Removed patches ping_timeout.patch and pgsql-fix.patch + * Wed Apr 30 2008 Mike McGrath 1.4.11-4 - added patch for check_pgsql From fedora-extras-commits at redhat.com Thu Jul 10 20:14:56 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 10 Jul 2008 20:14:56 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1571,1.1572 Message-ID: <200807102014.m6AKEuFq021526@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21358 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#454682 ok, so macro cannot be expanded like that Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1571 retrieving revision 1.1572 diff -u -r1.1571 -r1.1572 --- openoffice.org.spec 10 Jul 2008 13:38:09 -0000 1.1571 +++ openoffice.org.spec 10 Jul 2008 20:14:08 -0000 1.1572 @@ -1493,7 +1493,6 @@ # unpack presenter screen extension install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt -%define presenterscreenid %{expand:%%(grep identifier %{_builddir}/%{?buildsubdir}/sdext/unxlng*.pro/misc/PresenterScreen/description.xml | cut -d\\\" -f 2)} # revoke ScriptProviders and make into extensions pushd $RPM_BUILD_ROOT/%{basisinstdir}/program @@ -2997,7 +2996,7 @@ %pre presenter-screen if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared %{presenterscreenid} || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\\\" -f 2` || : fi %post presenter-screen @@ -3007,7 +3006,7 @@ %preun presenter-screen if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared %{presenterscreenid} || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\\\" -f 2` || : fi %postun presenter-screen From fedora-extras-commits at redhat.com Thu Jul 10 20:18:44 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 10 Jul 2008 20:18:44 GMT Subject: rpms/referencer/devel .cvsignore, 1.6, 1.7 referencer.spec, 1.12, 1.13 sources, 1.6, 1.7 referencer-bibtex.patch, 1.1, NONE Message-ID: <200807102018.m6AKIiJ7022284@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/referencer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22128 Modified Files: .cvsignore referencer.spec sources Removed Files: referencer-bibtex.patch Log Message: * Thu Jul 10 2008 Deji Akingunola - 1.1.3-1 - Update to latest release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/referencer/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Apr 2008 16:14:24 -0000 1.6 +++ .cvsignore 10 Jul 2008 20:17:54 -0000 1.7 @@ -1 +1 @@ -referencer-1.1.2.tar.gz +referencer-1.1.3.tar.gz Index: referencer.spec =================================================================== RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- referencer.spec 22 May 2008 23:56:34 -0000 1.12 +++ referencer.spec 10 Jul 2008 20:17:54 -0000 1.13 @@ -2,14 +2,13 @@ Name: referencer Summary: A document organiser and bibliography manager for Gnome -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Group: Applications/System License: GPLv2 URL: http://icculus.org/referencer Source0: http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz Patch0: referencer-pythondir.patch -Patch1: referencer-bibtex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: poppler-glib-devel libgnomeuimm26-devel BuildRequires: boost-devel gcc-c++ python-devel @@ -25,7 +24,6 @@ %prep %setup -q %patch0 -p0 -b .pyt -%patch1 -p0 -b .bib %build %configure --disable-update-mime-database @@ -35,6 +33,9 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install +mkdir plugins/doc +cp -r plugins/README plugins/doc/Plugins_README + desktop-file-install --delete-original \ --vendor fedora \ --remove-category Application \ @@ -70,6 +71,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO +%doc plugins/doc/Plugins_README %{_bindir}/referencer %{_datadir}/applications/fedora-referencer.desktop %{_datadir}/icons/hicolor/*/*/*.png @@ -79,6 +81,9 @@ %{python_sitelib}/referencer/ %changelog +* Thu Jul 10 2008 Deji Akingunola - 1.1.3-1 +- Update to latest release + * Thu May 22 2008 Deji Akingunola - 1.1.2-2 - Backport upstream fix for crash when importing bibtex file - Look for plugins in (python_sitelib)/referencer/ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/referencer/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Apr 2008 16:14:24 -0000 1.6 +++ sources 10 Jul 2008 20:17:54 -0000 1.7 @@ -1 +1 @@ -91c9ef6cc0bce2497efa81d36e6a1bf5 referencer-1.1.2.tar.gz +acd7eff62695f9a6dd5b485e2af5a9eb referencer-1.1.3.tar.gz --- referencer-bibtex.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 20:35:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:35:39 GMT Subject: rpms/xalan-j2/devel xalan-j2.spec,1.56,1.57 Message-ID: <200807102035.m6AKZdPi025414@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xalan-j2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25244 Modified Files: xalan-j2.spec Log Message: fix repotag Index: xalan-j2.spec =================================================================== RCS file: /cvs/pkgs/rpms/xalan-j2/devel/xalan-j2.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- xalan-j2.spec 19 Feb 2008 01:32:28 -0000 1.56 +++ xalan-j2.spec 10 Jul 2008 20:34:54 -0000 1.57 @@ -37,10 +37,12 @@ Name: xalan-j2 Version: 2.7.0 -Release: 7jpp.2%{?dist} +Release: 7.3%{?dist} Epoch: 0 Summary: Java XSLT processor -License: Apache Software License +# samples/servlet/ApplyXSLTException.java is ASL 1.1 +# src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C +License: ASL 1.1 and ASL 2.0 and W3c #Source0: http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_0-src.tar.gz Source0: xalan-j_%{cvs_version}-src-RHsemiCLEAN.tar.gz Patch0: %{name}-noxsltcdeps.patch @@ -114,9 +116,9 @@ Summary: Javadoc for %{name} Group: Development/Documentation BuildRequires: java-javadoc -Requires(post): /bin/rm -Requires(post): /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -342,6 +344,10 @@ %endif %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:2.7.0-7.3 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:2.7.0-7jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:36:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:36:40 GMT Subject: rpms/xdoclet/devel xdoclet.spec,1.30,1.31 Message-ID: <200807102036.m6AKaeDH025683@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xdoclet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25515 Modified Files: xdoclet.spec Log Message: fix repotag Index: xdoclet.spec =================================================================== RCS file: /cvs/pkgs/rpms/xdoclet/devel/xdoclet.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- xdoclet.spec 19 Feb 2008 15:40:33 -0000 1.30 +++ xdoclet.spec 10 Jul 2008 20:35:56 -0000 1.31 @@ -47,10 +47,10 @@ Name: xdoclet Version: 1.2.3 -Release: 9jpp.1%{?dist} +Release: 9.2%{?dist} Epoch: 0 Summary: XDoclet Attribute Orientated Programming Framework -License: BSD Style +License: BSD Group: Development/Framework URL: http://xdoclet.sourceforge.net Source0: http://superb-east.dl.sourceforge.net/sourceforge/xdoclet/xdoclet-src-1.2.3.tgz @@ -321,6 +321,10 @@ %doc %{_docdir}/%{name}-%{version} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.2.3-9.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.3-9jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:37:27 2008 From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek)) Date: Thu, 10 Jul 2008 20:37:27 GMT Subject: rpms/dwdiff/devel .cvsignore, 1.3, 1.4 dwdiff-localedir.patch, 1.1, 1.2 dwdiff.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200807102037.m6AKbRAc025914@cvs-int.fedora.redhat.com> Author: jhrozek Update of /cvs/extras/rpms/dwdiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25606/devel Modified Files: .cvsignore dwdiff-localedir.patch dwdiff.spec sources Log Message: New upstream release of dwdiff Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dwdiff/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2007 13:11:53 -0000 1.3 +++ .cvsignore 10 Jul 2008 20:36:35 -0000 1.4 @@ -1 +1 @@ -dwdiff-1.3.tgz +dwdiff-1.4.tgz dwdiff-localedir.patch: Index: dwdiff-localedir.patch =================================================================== RCS file: /cvs/extras/rpms/dwdiff/devel/dwdiff-localedir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dwdiff-localedir.patch 21 Aug 2007 10:00:18 -0000 1.1 +++ dwdiff-localedir.patch 10 Jul 2008 20:36:35 -0000 1.2 @@ -1,25 +1,27 @@ ---- ./Makefile.in.localedir 2006-10-28 12:23:07.000000000 +0200 -+++ ./Makefile.in 2007-08-21 11:34:51.000000000 +0200 -@@ -22,6 +22,7 @@ +diff -up ./Makefile.in.localedir ./Makefile.in +--- ./Makefile.in.localedir 2008-07-10 22:19:21.000000000 +0200 ++++ ./Makefile.in 2008-07-10 22:20:47.000000000 +0200 +@@ -32,6 +32,7 @@ GETTEXTLIBS= # LINGUAS: translations to be installed. Look in po directory for available # translations. LOCALEDIR=$(prefix)/share/locale +BIND_DIR=$(prefix)/share/locale LINGUAS= - # diff program configuration -@@ -56,7 +57,7 @@ + # Unicode/ICU config +@@ -74,7 +75,7 @@ dist-clean: clean rm -rf dwdiff .c.o: -- $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" -c -o $@ $< -+ $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(BIND_DIR)\" -c -o $@ $< +- $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(GETTEXTFLAGS) -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $< dwdiff: $(OBJECTS) - $(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS) $(LDLIBS) $(GETTEXTLIBS) ---- ./configure.localedir 2006-10-28 12:23:07.000000000 +0200 -+++ ./configure 2007-08-21 11:35:49.000000000 +0200 -@@ -134,6 +134,7 @@ + $(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS) $(LDLIBS) $(ICULIBS) $(GETTEXTLIBS) +diff -up ./configure.localedir ./configure +--- ./configure.localedir 2008-07-10 22:21:33.000000000 +0200 ++++ ./configure 2008-07-10 22:22:45.000000000 +0200 +@@ -144,6 +144,7 @@ create_makefile() { replace_default prefix "${PREFIX}" replace_default mandir "${MANDIR}" replace_default CFLAGS "${CFLAGS}" @@ -27,13 +29,13 @@ [ -n "${TEST_INSTALL}" ] && replace_default INSTALL "${INSTALL}" -@@ -202,6 +203,9 @@ +@@ -212,6 +213,9 @@ EOF --prefix=*) - PREFIX=`echo "${PARAM}" | sed 's/--prefix=//g'` + PREFIX=`echo "${PARAM}" | sed 's/^--prefix=//'` ;; + --binddir=*) + BIND_DIR=`echo "${PARAM}" | sed 's/--binddir=//g'` + ;; --mandir=*) - MANDIR=`echo "${PARAM}" | sed 's/--mandir=//g'` + MANDIR=`echo "${PARAM}" | sed 's/^--mandir=//'` ;; Index: dwdiff.spec =================================================================== RCS file: /cvs/extras/rpms/dwdiff/devel/dwdiff.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dwdiff.spec 10 Feb 2008 17:17:06 -0000 1.7 +++ dwdiff.spec 10 Jul 2008 20:36:35 -0000 1.8 @@ -1,6 +1,6 @@ Name: dwdiff -Version: 1.3 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Front end to diff for comparing files on a word per word basis Group: Applications/Text @@ -11,6 +11,7 @@ Requires: diffutils BuildRequires: gettext +BuildRequires: libicu-devel Patch0: dwdiff-localedir.patch @@ -55,6 +56,9 @@ %lang(nl) %{_mandir}/nl/man1/dwdiff.1* %changelog +* Tue Jul 08 2008 Jakub Hrozek 1.4-1 +- New upstream release, which BR: libicu-devel + * Sun Feb 10 2008 Jakub Hrozek 1.3-2 - Bump & rebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dwdiff/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Dec 2007 13:11:53 -0000 1.3 +++ sources 10 Jul 2008 20:36:35 -0000 1.4 @@ -1 +1 @@ -dddf28ca43a4b490a6999e6b379596da dwdiff-1.3.tgz +8415fdb6963fe662d0042bb18dde49df dwdiff-1.4.tgz From fedora-extras-commits at redhat.com Thu Jul 10 20:37:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:37:45 GMT Subject: rpms/xerces-j2/devel xerces-j2.spec,1.49,1.50 Message-ID: <200807102037.m6AKbjnq026010@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xerces-j2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25814 Modified Files: xerces-j2.spec Log Message: fix repotag Index: xerces-j2.spec =================================================================== RCS file: /cvs/pkgs/rpms/xerces-j2/devel/xerces-j2.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- xerces-j2.spec 19 Feb 2008 15:41:29 -0000 1.49 +++ xerces-j2.spec 10 Jul 2008 20:36:58 -0000 1.50 @@ -37,10 +37,10 @@ Name: xerces-j2 Version: 2.7.1 -Release: 10jpp.1%{?dist} +Release: 10.2%{?dist} Epoch: 0 Summary: Java XML parser -License: Apache Software License +License: ASL 2.0 URL: http://xerces.apache.org/ Group: Text Processing/Markup/XML Source0: http://archive.apache.org/dist/xml/xerces-j/Xerces-J-src.2.7.1.tar.gz @@ -65,8 +65,8 @@ #BuildRequires: xml-stylebook BuildRequires: xalan-j2 %endif -Requires(post): /usr/sbin/update-alternatives jaxp_parser_impl -Requires(preun): /usr/sbin/update-alternatives jaxp_parser_impl +Requires(post): chkconfig jaxp_parser_impl +Requires(preun): chkconfig jaxp_parser_impl %if ! %{gcj_support} BuildArch: noarch @@ -367,6 +367,10 @@ %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:2.7.1-10.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:2.7.1-10jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:39:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:39:02 GMT Subject: rpms/xjavadoc/devel xjavadoc.spec,1.19,1.20 Message-ID: <200807102039.m6AKd2lX026312@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xjavadoc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26109 Modified Files: xjavadoc.spec Log Message: fix repotag Index: xjavadoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/xjavadoc/devel/xjavadoc.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xjavadoc.spec 29 May 2008 15:51:32 -0000 1.19 +++ xjavadoc.spec 10 Jul 2008 20:38:00 -0000 1.20 @@ -36,7 +36,7 @@ Name: xjavadoc Version: 1.1 -Release: 5jpp.4%{?dist} +Release: 5.5%{?dist} Epoch: 0 Summary: The XJavaDoc engine License: BSD @@ -91,8 +91,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc %{summary}. @@ -188,6 +189,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-5.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.1-5jpp.4 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 10 20:40:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:40:27 GMT Subject: rpms/xml-commons-apis/devel xml-commons-apis.spec,1.3,1.4 Message-ID: <200807102040.m6AKeRHL026650@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xml-commons-apis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26419 Modified Files: xml-commons-apis.spec Log Message: fix repotag Index: xml-commons-apis.spec =================================================================== RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/xml-commons-apis.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xml-commons-apis.spec 19 Feb 2008 15:42:25 -0000 1.3 +++ xml-commons-apis.spec 10 Jul 2008 20:39:20 -0000 1.4 @@ -35,9 +35,9 @@ Name: xml-commons-apis Summary: APIs for DOM, SAX, and JAXP Version: 1.3.04 -Release: 1jpp.1%{?dist} +Release: 1.2%{?dist} Epoch: 0 -License: Apache Software License/W3C/Public Domain +License: ASL 2.0 and W3C and Public Domain URL: http://xml.apache.org/commons/ Source0: xml-commons-external-1.3.04-src.tar.gz # svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/java/external/ @@ -78,8 +78,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm /bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -186,6 +187,10 @@ %endif %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.3.04-1.2 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.3.04-1jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:42:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:42:08 GMT Subject: rpms/xml-commons-apis12/devel xml-commons-apis12.spec,1.5,1.6 Message-ID: <200807102042.m6AKg8Id027036@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xml-commons-apis12/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26750 Modified Files: xml-commons-apis12.spec Log Message: fix repotag Index: xml-commons-apis12.spec =================================================================== RCS file: /cvs/pkgs/rpms/xml-commons-apis12/devel/xml-commons-apis12.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xml-commons-apis12.spec 19 Feb 2008 15:43:18 -0000 1.5 +++ xml-commons-apis12.spec 10 Jul 2008 20:40:43 -0000 1.6 @@ -35,11 +35,11 @@ Name: xml-commons-apis12 Epoch: 0 Version: 1.2.04 -Release: 1jpp.4%{?dist} +Release: 1.5%{?dist} Summary: JAXP 1.2, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis Group: System Environment/Libraries URL: http://xml.apache.org/commons/ -License: Apache Software License/W3C License/Public Domain +License: ASL 2.0 and W3C and Public Domain Source0: xml-commons-external-1.2.04.tar.gz # svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_2_04/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -177,6 +177,10 @@ # ----------------------------------------------------------------------------- %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.2.04-1.5 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.2.04-1jpp.4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:42:42 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 10 Jul 2008 20:42:42 GMT Subject: comps comps-f10.xml.in, 1.45, 1.46 comps-f8.xml.in, 1.257, 1.258 comps-f9.xml.in, 1.373, 1.374 Message-ID: <200807102042.m6AKggXs027215@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005 Modified Files: comps-f10.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: add xfce4-volstatus-icon Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- comps-f10.xml.in 10 Jul 2008 17:10:07 -0000 1.45 +++ comps-f10.xml.in 10 Jul 2008 20:42:12 -0000 1.46 @@ -4531,6 +4531,7 @@ xfce4-time-out-plugin xfce4-timer-plugin xfce4-verve-plugin + xfce4-volstatus-icon xfce4-wavelan-plugin xfce4-weather-plugin xfce4-websearch-plugin Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- comps-f8.xml.in 6 Jul 2008 11:33:22 -0000 1.257 +++ comps-f8.xml.in 10 Jul 2008 20:42:12 -0000 1.258 @@ -4236,6 +4236,7 @@ xfce4-time-out-plugin xfce4-timer-plugin xfce4-verve-plugin + xfce4-volstatus-icon xfce4-wavelan-plugin xfce4-weather-plugin xfce4-websearch-plugin Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.373 retrieving revision 1.374 diff -u -r1.373 -r1.374 --- comps-f9.xml.in 9 Jul 2008 20:08:41 -0000 1.373 +++ comps-f9.xml.in 10 Jul 2008 20:42:12 -0000 1.374 @@ -4423,6 +4423,7 @@ xfce4-time-out-plugin xfce4-timer-plugin xfce4-verve-plugin + xfce4-volstatus-icon xfce4-wavelan-plugin xfce4-weather-plugin xfce4-websearch-plugin From fedora-extras-commits at redhat.com Thu Jul 10 20:43:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:43:20 GMT Subject: rpms/xml-commons-resolver/devel xml-commons-resolver.spec, 1.16, 1.17 Message-ID: <200807102043.m6AKhKjv027344@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xml-commons-resolver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27156 Modified Files: xml-commons-resolver.spec Log Message: fix repotag Index: xml-commons-resolver.spec =================================================================== RCS file: /cvs/pkgs/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xml-commons-resolver.spec 19 Feb 2008 03:16:00 -0000 1.16 +++ xml-commons-resolver.spec 10 Jul 2008 20:42:24 -0000 1.17 @@ -7,10 +7,10 @@ Name: xml-commons-resolver Version: 1.1 -Release: 2jpp.12 +Release: 2.13%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons. -License: Apache Software License +License: ASL 1.1 URL: http://xml.apache.org/commons/ Source0: xml-commons-resolver-1.1-RHCLEAN.tar.bz2 Source1: xml-commons-resolver-resolver.sh @@ -40,8 +40,9 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc Javadoc for %{name}. @@ -134,6 +135,10 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-2.13 +- drop repotag +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.1-2jpp.12 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:44:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:44:47 GMT Subject: rpms/xml-commons-which/devel xml-commons-which.spec,1.3,1.4 Message-ID: <200807102044.m6AKilWP027686@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xml-commons-which/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27510 Modified Files: xml-commons-which.spec Log Message: fix repotag Index: xml-commons-which.spec =================================================================== RCS file: /cvs/pkgs/rpms/xml-commons-which/devel/xml-commons-which.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xml-commons-which.spec 19 Feb 2008 15:44:15 -0000 1.3 +++ xml-commons-which.spec 10 Jul 2008 20:43:54 -0000 1.4 @@ -34,9 +34,9 @@ Summary: Which subproject of xml-commons Name: xml-commons-which Version: 1.0 -Release: 1.b2.0jpp.2 +Release: 1.b2.0.3%{?dist} Epoch: 1 -License: Apache Software License +License: ASL 1.1 and W3C URL: http://xml.apache.org/commons/ Source0: xml-commons-1.0.b2.tar.gz # svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-1_0_b2/ @@ -168,6 +168,10 @@ %endif %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 1:1.0-1.b2.0.3 +- drop repotag +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1:1.0-1.b2.0jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:45:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:45:53 GMT Subject: rpms/xmldb-api/devel xmldb-api.spec,1.3,1.4 Message-ID: <200807102045.m6AKjri4027941@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xmldb-api/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27781 Modified Files: xmldb-api.spec Log Message: fix repotag Index: xmldb-api.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmldb-api/devel/xmldb-api.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmldb-api.spec 19 Feb 2008 16:32:12 -0000 1.3 +++ xmldb-api.spec 10 Jul 2008 20:45:04 -0000 1.4 @@ -36,7 +36,7 @@ Name: xmldb-api Version: 0.1 -Release: 0.2.%{cvs_version}.1jpp.2%{?dist} +Release: 0.2.%{cvs_version}.1.3%{?dist} Epoch: 1 Summary: XML:DB API for Java License: BSD @@ -181,6 +181,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 1:0.1-0.2.20011111cvs.1.3 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 1:0.1-0.2.20011111cvs.1jpp.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:47:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:47:16 GMT Subject: rpms/xmlrpc/devel xmlrpc.spec,1.22,1.23 Message-ID: <200807102047.m6AKlG5G028254@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xmlrpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28111 Modified Files: xmlrpc.spec Log Message: fix repotag Index: xmlrpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmlrpc/devel/xmlrpc.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xmlrpc.spec 29 May 2008 15:53:17 -0000 1.22 +++ xmlrpc.spec 10 Jul 2008 20:46:30 -0000 1.23 @@ -34,7 +34,7 @@ Name: xmlrpc Version: 2.0.1 -Release: 4jpp.4%{?dist} +Release: 4.5%{?dist} Epoch: 0 Summary: Java XML-RPC implementation License: ASL 2.0 @@ -146,6 +146,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:2.0.1-4.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:2.0.1-4jpp.4 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 10 20:48:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:48:18 GMT Subject: rpms/xmlrpc3/devel xmlrpc3.spec,1.6,1.7 Message-ID: <200807102048.m6AKmIJI028493@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xmlrpc3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28345 Modified Files: xmlrpc3.spec Log Message: fix repotag Index: xmlrpc3.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xmlrpc3.spec 19 Mar 2008 23:34:20 -0000 1.6 +++ xmlrpc3.spec 10 Jul 2008 20:47:32 -0000 1.7 @@ -35,9 +35,9 @@ Name: xmlrpc3 Version: 3.0 -Release: 2jpp.5%{?dist} +Release: 2.6%{?dist} Summary: Java XML-RPC implementation -License: Apache Software License +License: ASL 2.0 Group: Development/Libraries Url: http://xml.apache.org/%{name}/ Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-%{version}-src.tar.gz @@ -270,6 +270,10 @@ %{_javadir}/%{name}-server-%{version}-sources.jar %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 3.0-2.6 +- drop repotag +- fix license tag + * Wed Mar 19 2008 Andrew Overholt 3.0-2jpp.5 - Fix server description (rhbz#433699) From fedora-extras-commits at redhat.com Thu Jul 10 20:49:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:49:29 GMT Subject: rpms/xmlunit/devel xmlunit.spec,1.3,1.4 Message-ID: <200807102049.m6AKnTTu028759@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xmlunit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28597 Modified Files: xmlunit.spec Log Message: fix repotag Index: xmlunit.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmlunit/devel/xmlunit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmlunit.spec 19 Feb 2008 17:53:39 -0000 1.3 +++ xmlunit.spec 10 Jul 2008 20:48:35 -0000 1.4 @@ -32,7 +32,7 @@ Name: xmlunit Version: 1.0 -Release: 6jpp.1%{?dist} +Release: 6.2%{?dist} Epoch: 0 Summary: Provides classes to do asserts on xml License: BSD @@ -163,6 +163,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.0-6.2 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.0-6jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 10 20:50:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:50:57 GMT Subject: rpms/xom/devel xom.spec,1.5,1.6 Message-ID: <200807102050.m6AKovCY029187@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28933 Modified Files: xom.spec Log Message: fix repotag Index: xom.spec =================================================================== RCS file: /cvs/pkgs/rpms/xom/devel/xom.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xom.spec 26 Mar 2007 13:39:49 -0000 1.5 +++ xom.spec 10 Jul 2008 20:50:02 -0000 1.6 @@ -36,9 +36,9 @@ Summary: XML Pull Parser Name: xom Version: 1.0 -Release: 3jpp.4%{?dist} +Release: 3.5%{?dist} Epoch: 0 -License: LGPL +License: LGPLv2 URL: http://www.xom.nu Group: Development/Libraries Source0: http://www.cafeconleche.org/XOM/xom-1.0.tar.gz @@ -178,6 +178,10 @@ %{_datadir}/%{name}-%{version}/xom-samples.jar %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.0-3.5 +- drop repotag +- fix license tag + * Mon Mar 26 2007 Nuno Santos 0:1.0-3jpp.4.fc7 - Apply patch from bugs.michael at gmx.net to fix unowned directory From fedora-extras-commits at redhat.com Thu Jul 10 20:52:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:52:05 GMT Subject: rpms/xpp2/devel xpp2.spec,1.1,1.2 Message-ID: <200807102052.m6AKq51h029483@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xpp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29283 Modified Files: xpp2.spec Log Message: fix repotag Index: xpp2.spec =================================================================== RCS file: /cvs/pkgs/rpms/xpp2/devel/xpp2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpp2.spec 12 Mar 2007 16:24:55 -0000 1.1 +++ xpp2.spec 10 Jul 2008 20:51:12 -0000 1.2 @@ -33,9 +33,9 @@ Summary: XML Pull Parser Name: xpp2 Version: 2.1.10 -Release: 6jpp.1%{?dist} +Release: 6.2%{?dist} Epoch: 0 -License: Apache Software License +License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/ Group: Text Processing/Markup/XML Source0: http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz @@ -159,7 +159,11 @@ %{_datadir}/%{name} %changelog -* Tue Feb 13 2007 Permaine Cheung - 0:2.1.10-6jpp.1%{?dist} +* Thu Jul 10 2008 Tom "spot" Callaway - 0:2.1.10-6.2 +- drop repotag +- fix license tag + +* Tue Feb 13 2007 Permaine Cheung - 0:2.1.10-6jpp.1 - Fix release, license, buildroot, typo, and other rpmlint issues. - Got rid of Vendor and Distribution. - Rename manual subpackage to doc. From fedora-extras-commits at redhat.com Thu Jul 10 20:52:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 20:52:17 +0000 Subject: [pkgdb] perl-Config-Augeas was added for apevec Message-ID: <200807102052.m6AKqHIW020824@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has added Package perl-Config-Augeas with summary Edit configuration files through Augeas C library Tom Callaway (spot) has approved Package perl-Config-Augeas Tom Callaway (spot) has added a Fedora devel branch for perl-Config-Augeas with an owner of apevec Tom Callaway (spot) has approved perl-Config-Augeas in Fedora devel Tom Callaway (spot) has approved Package perl-Config-Augeas Tom Callaway (spot) has set commit to Approved for cvsextras on perl-Config-Augeas (Fedora devel) Tom Callaway (spot) has set build to Approved for cvsextras on perl-Config-Augeas (Fedora devel) Tom Callaway (spot) has set checkout to Approved for cvsextras on perl-Config-Augeas (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Augeas From fedora-extras-commits at redhat.com Thu Jul 10 20:53:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:53:14 GMT Subject: rpms/perl-Config-Augeas - New directory Message-ID: <200807102053.m6AKrETd029655@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Config-Augeas In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsa29591/rpms/perl-Config-Augeas Log Message: Directory /cvs/extras/rpms/perl-Config-Augeas added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 20:53:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:53:35 GMT Subject: rpms/perl-Config-Augeas/devel - New directory Message-ID: <200807102053.m6AKrZhB029720@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Config-Augeas/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsa29591/rpms/perl-Config-Augeas/devel Log Message: Directory /cvs/extras/rpms/perl-Config-Augeas/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 20:53:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:53:48 GMT Subject: rpms/perl-Config-Augeas Makefile,NONE,1.1 Message-ID: <200807102053.m6AKrmd7029758@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Config-Augeas In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsa29591/rpms/perl-Config-Augeas Added Files: Makefile Log Message: Setup of module perl-Config-Augeas --- NEW FILE Makefile --- # Top level Makefile for module perl-Config-Augeas all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 10 20:54:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:54:05 GMT Subject: rpms/perl-Config-Augeas/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807102054.m6AKs5tv029810@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Config-Augeas/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsa29591/rpms/perl-Config-Augeas/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Config-Augeas --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Config-Augeas # $Id: Makefile,v 1.1 2008/07/10 20:53:48 spot Exp $ NAME := perl-Config-Augeas SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 10 20:57:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 20:57:21 +0000 Subject: [pkgdb] khmeros-fonts was added for mnowak Message-ID: <200807102057.m6AKvLv0021035@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has added Package khmeros-fonts with summary Khmer font set created by Danh Hong of the Cambodian Open Institute Tom Callaway (spot) has approved Package khmeros-fonts Tom Callaway (spot) has added a Fedora devel branch for khmeros-fonts with an owner of mnowak Tom Callaway (spot) has approved khmeros-fonts in Fedora devel Tom Callaway (spot) has approved Package khmeros-fonts Tom Callaway (spot) has set commit to Approved for cvsextras on khmeros-fonts (Fedora devel) Tom Callaway (spot) has set build to Approved for cvsextras on khmeros-fonts (Fedora devel) Tom Callaway (spot) has set checkout to Approved for cvsextras on khmeros-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/khmeros-fonts From fedora-extras-commits at redhat.com Thu Jul 10 20:57:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 20:57:23 +0000 Subject: [pkgdb] khmeros-fonts (Fedora, 8) updated by spot Message-ID: <200807102057.m6AKvNvn021056@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 8 branch for khmeros-fonts Tom Callaway (spot) has set commit to Approved for cvsextras on khmeros-fonts (Fedora 8) Tom Callaway (spot) has set build to Approved for cvsextras on khmeros-fonts (Fedora 8) Tom Callaway (spot) has set checkout to Approved for cvsextras on khmeros-fonts (Fedora 8) Tom Callaway (spot) approved watchbugzilla on khmeros-fonts (Fedora 8) for fonts-sig Tom Callaway (spot) approved watchcommits on khmeros-fonts (Fedora 8) for fonts-sig Tom Callaway (spot) Approved cvsextras for commit access on khmeros-fonts (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/khmeros-fonts From fedora-extras-commits at redhat.com Thu Jul 10 20:57:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 20:57:23 +0000 Subject: [pkgdb] khmeros-fonts (Fedora, 9) updated by spot Message-ID: <200807102057.m6AKvNvp021056@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 9 branch for khmeros-fonts Tom Callaway (spot) has set commit to Approved for cvsextras on khmeros-fonts (Fedora 9) Tom Callaway (spot) has set build to Approved for cvsextras on khmeros-fonts (Fedora 9) Tom Callaway (spot) has set checkout to Approved for cvsextras on khmeros-fonts (Fedora 9) Tom Callaway (spot) approved watchbugzilla on khmeros-fonts (Fedora 9) for fonts-sig Tom Callaway (spot) approved watchcommits on khmeros-fonts (Fedora 9) for fonts-sig Tom Callaway (spot) Approved cvsextras for commit access on khmeros-fonts (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/khmeros-fonts From fedora-extras-commits at redhat.com Thu Jul 10 20:57:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 20:57:23 +0000 Subject: [pkgdb] khmeros-fonts (Fedora, devel) updated by spot Message-ID: <200807102057.m6AKvNNp021055@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on khmeros-fonts (Fedora devel) for fonts-sig Tom Callaway (spot) approved watchcommits on khmeros-fonts (Fedora devel) for fonts-sig Tom Callaway (spot) Approved cvsextras for commit access on khmeros-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/khmeros-fonts From fedora-extras-commits at redhat.com Thu Jul 10 20:57:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 20:57:23 +0000 Subject: [pkgdb] khmeros-fonts (Fedora EPEL, 4) updated by spot Message-ID: <200807102057.m6AKvNvs021056@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 4 branch for khmeros-fonts Tom Callaway (spot) has set commit to Approved for cvsextras on khmeros-fonts (Fedora EPEL 4) Tom Callaway (spot) has set build to Approved for cvsextras on khmeros-fonts (Fedora EPEL 4) Tom Callaway (spot) has set checkout to Approved for cvsextras on khmeros-fonts (Fedora EPEL 4) Tom Callaway (spot) approved watchbugzilla on khmeros-fonts (Fedora EPEL 4) for fonts-sig Tom Callaway (spot) approved watchcommits on khmeros-fonts (Fedora EPEL 4) for fonts-sig Tom Callaway (spot) Approved cvsextras for commit access on khmeros-fonts (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/khmeros-fonts From fedora-extras-commits at redhat.com Thu Jul 10 20:57:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 20:57:23 +0000 Subject: [pkgdb] khmeros-fonts (Fedora EPEL, 5) updated by spot Message-ID: <200807102057.m6AKvNNs021055@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 5 branch for khmeros-fonts Tom Callaway (spot) has set commit to Approved for cvsextras on khmeros-fonts (Fedora EPEL 5) Tom Callaway (spot) has set build to Approved for cvsextras on khmeros-fonts (Fedora EPEL 5) Tom Callaway (spot) has set checkout to Approved for cvsextras on khmeros-fonts (Fedora EPEL 5) Tom Callaway (spot) approved watchbugzilla on khmeros-fonts (Fedora EPEL 5) for fonts-sig Tom Callaway (spot) approved watchcommits on khmeros-fonts (Fedora EPEL 5) for fonts-sig Tom Callaway (spot) Approved cvsextras for commit access on khmeros-fonts (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/khmeros-fonts From fedora-extras-commits at redhat.com Thu Jul 10 20:57:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:57:47 GMT Subject: rpms/khmeros-fonts - New directory Message-ID: <200807102057.m6AKvlhM030228@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/khmeros-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsY30198/rpms/khmeros-fonts Log Message: Directory /cvs/extras/rpms/khmeros-fonts added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 20:58:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:58:03 GMT Subject: rpms/khmeros-fonts/devel - New directory Message-ID: <200807102058.m6AKw3Fn030253@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/khmeros-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsY30198/rpms/khmeros-fonts/devel Log Message: Directory /cvs/extras/rpms/khmeros-fonts/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 20:58:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:58:19 GMT Subject: rpms/khmeros-fonts Makefile,NONE,1.1 Message-ID: <200807102058.m6AKwJif030297@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/khmeros-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsY30198/rpms/khmeros-fonts Added Files: Makefile Log Message: Setup of module khmeros-fonts --- NEW FILE Makefile --- # Top level Makefile for module khmeros-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 10 20:58:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 20:58:38 GMT Subject: rpms/khmeros-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807102058.m6AKwcIZ030320@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/khmeros-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsY30198/rpms/khmeros-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module khmeros-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: khmeros-fonts # $Id: Makefile,v 1.1 2008/07/10 20:58:19 spot Exp $ NAME := khmeros-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 10 21:01:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:01:37 +0000 Subject: [pkgdb] perl-Net-Telnet (Fedora EPEL, 5) updated by spot Message-ID: <200807102101.m6AL1bGG021390@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 5 branch for perl-Net-Telnet Tom Callaway (spot) has set commit to Approved for cvsextras on perl-Net-Telnet (Fedora EPEL 5) Tom Callaway (spot) has set build to Approved for cvsextras on perl-Net-Telnet (Fedora EPEL 5) Tom Callaway (spot) has set checkout to Approved for cvsextras on perl-Net-Telnet (Fedora EPEL 5) Tom Callaway (spot) changed owner of perl-Net-Telnet in Fedora EPEL 5 to kanarip To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 21:01:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:01:37 +0000 Subject: [pkgdb] perl-Net-Telnet (Fedora EPEL, 4) updated by spot Message-ID: <200807102101.m6AL1bGJ021390@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 4 branch for perl-Net-Telnet Tom Callaway (spot) has set commit to Approved for cvsextras on perl-Net-Telnet (Fedora EPEL 4) Tom Callaway (spot) has set build to Approved for cvsextras on perl-Net-Telnet (Fedora EPEL 4) Tom Callaway (spot) has set checkout to Approved for cvsextras on perl-Net-Telnet (Fedora EPEL 4) Tom Callaway (spot) changed owner of perl-Net-Telnet in Fedora EPEL 4 to kanarip To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Telnet From fedora-extras-commits at redhat.com Thu Jul 10 21:02:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:02:46 +0000 Subject: [pkgdb] milkytracker was added for muep Message-ID: <200807102102.m6AL2kwW021488@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has added Package milkytracker with summary Module tracker software for creating music Tom Callaway (spot) has approved Package milkytracker Tom Callaway (spot) has added a Fedora devel branch for milkytracker with an owner of muep Tom Callaway (spot) has approved milkytracker in Fedora devel Tom Callaway (spot) has approved Package milkytracker Tom Callaway (spot) has set commit to Approved for cvsextras on milkytracker (Fedora devel) Tom Callaway (spot) has set build to Approved for cvsextras on milkytracker (Fedora devel) Tom Callaway (spot) has set checkout to Approved for cvsextras on milkytracker (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/milkytracker From fedora-extras-commits at redhat.com Thu Jul 10 21:02:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:02:47 +0000 Subject: [pkgdb] milkytracker (Fedora, 9) updated by spot Message-ID: <200807102102.m6AL2lBL021508@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 9 branch for milkytracker Tom Callaway (spot) has set commit to Approved for cvsextras on milkytracker (Fedora 9) Tom Callaway (spot) has set build to Approved for cvsextras on milkytracker (Fedora 9) Tom Callaway (spot) has set checkout to Approved for cvsextras on milkytracker (Fedora 9) Tom Callaway (spot) Approved cvsextras for commit access on milkytracker (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/milkytracker From fedora-extras-commits at redhat.com Thu Jul 10 21:02:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:02:47 +0000 Subject: [pkgdb] milkytracker (Fedora, devel) updated by spot Message-ID: <200807102102.m6AL2lBO021508@bastion.fedora.phx.redhat.com> Tom Callaway (spot) Approved cvsextras for commit access on milkytracker (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/milkytracker From fedora-extras-commits at redhat.com Thu Jul 10 21:02:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:02:47 +0000 Subject: [pkgdb] milkytracker (Fedora, 8) updated by spot Message-ID: <200807102102.m6AL2lBR021508@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 8 branch for milkytracker Tom Callaway (spot) has set commit to Approved for cvsextras on milkytracker (Fedora 8) Tom Callaway (spot) has set build to Approved for cvsextras on milkytracker (Fedora 8) Tom Callaway (spot) has set checkout to Approved for cvsextras on milkytracker (Fedora 8) Tom Callaway (spot) Approved cvsextras for commit access on milkytracker (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/milkytracker From fedora-extras-commits at redhat.com Thu Jul 10 21:03:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:03:19 GMT Subject: rpms/milkytracker - New directory Message-ID: <200807102103.m6AL3Jep005046@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/milkytracker In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvslx5012/rpms/milkytracker Log Message: Directory /cvs/extras/rpms/milkytracker added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 21:03:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:03:36 GMT Subject: rpms/milkytracker/devel - New directory Message-ID: <200807102103.m6AL3a6G005087@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/milkytracker/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvslx5012/rpms/milkytracker/devel Log Message: Directory /cvs/extras/rpms/milkytracker/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 21:03:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:03:50 GMT Subject: rpms/milkytracker Makefile,NONE,1.1 Message-ID: <200807102103.m6AL3ocL005114@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/milkytracker In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvslx5012/rpms/milkytracker Added Files: Makefile Log Message: Setup of module milkytracker --- NEW FILE Makefile --- # Top level Makefile for module milkytracker all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 10 21:04:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:04:04 GMT Subject: rpms/milkytracker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807102104.m6AL44Os005133@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/milkytracker/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvslx5012/rpms/milkytracker/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module milkytracker --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: milkytracker # $Id: Makefile,v 1.1 2008/07/10 21:03:50 spot Exp $ NAME := milkytracker SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 10 21:05:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:05:06 +0000 Subject: [pkgdb] pnp4nagios (Fedora, devel) updated by spot Message-ID: <200807102105.m6AL56q7021740@bastion.fedora.phx.redhat.com> Tom Callaway (spot) Approved cvsextras for commit access on pnp4nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 10 21:05:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:05:06 +0000 Subject: [pkgdb] pnp4nagios (Fedora EPEL, 4) updated by spot Message-ID: <200807102105.m6AL56li021739@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 4 branch for pnp4nagios Tom Callaway (spot) has set commit to Approved for cvsextras on pnp4nagios (Fedora EPEL 4) Tom Callaway (spot) has set build to Approved for cvsextras on pnp4nagios (Fedora EPEL 4) Tom Callaway (spot) has set checkout to Approved for cvsextras on pnp4nagios (Fedora EPEL 4) Tom Callaway (spot) Approved cvsextras for commit access on pnp4nagios (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 10 21:05:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:05:05 +0000 Subject: [pkgdb] pnp4nagios was added for xavierb Message-ID: <200807102105.m6AL55uC021738@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has added Package pnp4nagios with summary Nagios performance data analysis tool Tom Callaway (spot) has approved Package pnp4nagios Tom Callaway (spot) has added a Fedora devel branch for pnp4nagios with an owner of xavierb Tom Callaway (spot) has approved pnp4nagios in Fedora devel Tom Callaway (spot) has approved Package pnp4nagios Tom Callaway (spot) has set commit to Approved for cvsextras on pnp4nagios (Fedora devel) Tom Callaway (spot) has set build to Approved for cvsextras on pnp4nagios (Fedora devel) Tom Callaway (spot) has set checkout to Approved for cvsextras on pnp4nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 10 21:05:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:05:06 +0000 Subject: [pkgdb] pnp4nagios (Fedora, 9) updated by spot Message-ID: <200807102105.m6AL56qA021740@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 9 branch for pnp4nagios Tom Callaway (spot) has set commit to Approved for cvsextras on pnp4nagios (Fedora 9) Tom Callaway (spot) has set build to Approved for cvsextras on pnp4nagios (Fedora 9) Tom Callaway (spot) has set checkout to Approved for cvsextras on pnp4nagios (Fedora 9) Tom Callaway (spot) Approved cvsextras for commit access on pnp4nagios (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 10 21:05:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:05:06 +0000 Subject: [pkgdb] pnp4nagios (Fedora EPEL, 5) updated by spot Message-ID: <200807102105.m6AL56ll021739@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 5 branch for pnp4nagios Tom Callaway (spot) has set commit to Approved for cvsextras on pnp4nagios (Fedora EPEL 5) Tom Callaway (spot) has set build to Approved for cvsextras on pnp4nagios (Fedora EPEL 5) Tom Callaway (spot) has set checkout to Approved for cvsextras on pnp4nagios (Fedora EPEL 5) Tom Callaway (spot) Approved cvsextras for commit access on pnp4nagios (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 10 21:05:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:05:30 GMT Subject: rpms/pnp4nagios - New directory Message-ID: <200807102105.m6AL5U1L005378@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pnp4nagios In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsIF5346/rpms/pnp4nagios Log Message: Directory /cvs/extras/rpms/pnp4nagios added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 21:05:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:05:55 GMT Subject: rpms/pnp4nagios/devel - New directory Message-ID: <200807102105.m6AL5tt7005392@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pnp4nagios/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsIF5346/rpms/pnp4nagios/devel Log Message: Directory /cvs/extras/rpms/pnp4nagios/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 21:06:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:06:14 GMT Subject: rpms/pnp4nagios Makefile,NONE,1.1 Message-ID: <200807102106.m6AL6E2e005417@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pnp4nagios In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsIF5346/rpms/pnp4nagios Added Files: Makefile Log Message: Setup of module pnp4nagios --- NEW FILE Makefile --- # Top level Makefile for module pnp4nagios all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 10 21:06:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:06:30 GMT Subject: rpms/pnp4nagios/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807102106.m6AL6Uww005432@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/pnp4nagios/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsIF5346/rpms/pnp4nagios/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pnp4nagios --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pnp4nagios # $Id: Makefile,v 1.1 2008/07/10 21:06:15 spot Exp $ NAME := pnp4nagios SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 10 21:07:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:07:13 +0000 Subject: [pkgdb] R-biglm was added for spot Message-ID: <200807102107.m6AL7D6b022071@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has added Package R-biglm with summary Bounded memory linear and generalized linear models Tom Callaway (spot) has approved Package R-biglm Tom Callaway (spot) has added a Fedora devel branch for R-biglm with an owner of spot Tom Callaway (spot) has approved R-biglm in Fedora devel Tom Callaway (spot) has approved Package R-biglm Tom Callaway (spot) has set commit to Approved for cvsextras on R-biglm (Fedora devel) Tom Callaway (spot) has set build to Approved for cvsextras on R-biglm (Fedora devel) Tom Callaway (spot) has set checkout to Approved for cvsextras on R-biglm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-biglm From fedora-extras-commits at redhat.com Thu Jul 10 21:07:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:07:17 +0000 Subject: [pkgdb] R-biglm (Fedora, 8) updated by spot Message-ID: <200807102107.m6AL7HOj022089@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 8 branch for R-biglm Tom Callaway (spot) has set commit to Approved for cvsextras on R-biglm (Fedora 8) Tom Callaway (spot) has set build to Approved for cvsextras on R-biglm (Fedora 8) Tom Callaway (spot) has set checkout to Approved for cvsextras on R-biglm (Fedora 8) Tom Callaway (spot) Approved cvsextras for commit access on R-biglm (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-biglm From fedora-extras-commits at redhat.com Thu Jul 10 21:07:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:07:17 +0000 Subject: [pkgdb] R-biglm (Fedora, 9) updated by spot Message-ID: <200807102107.m6AL7HOl022089@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 9 branch for R-biglm Tom Callaway (spot) has set commit to Approved for cvsextras on R-biglm (Fedora 9) Tom Callaway (spot) has set build to Approved for cvsextras on R-biglm (Fedora 9) Tom Callaway (spot) has set checkout to Approved for cvsextras on R-biglm (Fedora 9) Tom Callaway (spot) Approved cvsextras for commit access on R-biglm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-biglm From fedora-extras-commits at redhat.com Thu Jul 10 21:07:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:07:17 +0000 Subject: [pkgdb] R-biglm (Fedora EPEL, 4) updated by spot Message-ID: <200807102107.m6AL7HOp022089@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 4 branch for R-biglm Tom Callaway (spot) has set commit to Approved for cvsextras on R-biglm (Fedora EPEL 4) Tom Callaway (spot) has set build to Approved for cvsextras on R-biglm (Fedora EPEL 4) Tom Callaway (spot) has set checkout to Approved for cvsextras on R-biglm (Fedora EPEL 4) Tom Callaway (spot) Approved cvsextras for commit access on R-biglm (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-biglm From fedora-extras-commits at redhat.com Thu Jul 10 21:07:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:07:17 +0000 Subject: [pkgdb] R-biglm (Fedora, devel) updated by spot Message-ID: <200807102107.m6AL7HOn022089@bastion.fedora.phx.redhat.com> Tom Callaway (spot) Approved cvsextras for commit access on R-biglm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-biglm From fedora-extras-commits at redhat.com Thu Jul 10 21:07:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 21:07:17 +0000 Subject: [pkgdb] R-biglm (Fedora EPEL, 5) updated by spot Message-ID: <200807102107.m6AL7HOr022089@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora EPEL 5 branch for R-biglm Tom Callaway (spot) has set commit to Approved for cvsextras on R-biglm (Fedora EPEL 5) Tom Callaway (spot) has set build to Approved for cvsextras on R-biglm (Fedora EPEL 5) Tom Callaway (spot) has set checkout to Approved for cvsextras on R-biglm (Fedora EPEL 5) Tom Callaway (spot) Approved cvsextras for commit access on R-biglm (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/R-biglm From fedora-extras-commits at redhat.com Thu Jul 10 21:07:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:07:44 GMT Subject: rpms/R-biglm - New directory Message-ID: <200807102107.m6AL7i1C005735@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-biglm In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsUX5697/rpms/R-biglm Log Message: Directory /cvs/extras/rpms/R-biglm added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 21:08:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:08:06 GMT Subject: rpms/R-biglm/devel - New directory Message-ID: <200807102108.m6AL86X4005785@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-biglm/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsUX5697/rpms/R-biglm/devel Log Message: Directory /cvs/extras/rpms/R-biglm/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 10 21:08:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:08:28 GMT Subject: rpms/R-biglm Makefile,NONE,1.1 Message-ID: <200807102108.m6AL8SLL005842@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-biglm In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsUX5697/rpms/R-biglm Added Files: Makefile Log Message: Setup of module R-biglm --- NEW FILE Makefile --- # Top level Makefile for module R-biglm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 10 21:08:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:08:46 GMT Subject: rpms/R-biglm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807102108.m6AL8kwV005897@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-biglm/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsUX5697/rpms/R-biglm/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-biglm --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: R-biglm # $Id: Makefile,v 1.1 2008/07/10 21:08:28 spot Exp $ NAME := R-biglm SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 10 21:11:27 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Thu, 10 Jul 2008 21:11:27 GMT Subject: rpms/tex-zfuzz/devel import.log,1.2,1.3 tex-zfuzz.spec,1.1,1.2 Message-ID: <200807102111.m6ALBRcn006301@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/tex-zfuzz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6223/devel Modified Files: import.log tex-zfuzz.spec Log Message: * Mon Jul 10 2008 David A. Wheeler - 0-0.20070911.3 - New release number (for CVS submission) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 10 Jul 2008 01:24:47 -0000 1.2 +++ import.log 10 Jul 2008 21:10:44 -0000 1.3 @@ -1,2 +1,3 @@ tex-zfuzz-0-0_20070911_2_fc9:HEAD:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1214962677 tex-zfuzz-0-0_20070911_2_fc9:HEAD:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1215652637 +tex-zfuzz-0-0_20070911_3_fc9:HEAD:tex-zfuzz-0-0.20070911.3.fc9.src.rpm:1215724195 Index: tex-zfuzz.spec =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/devel/tex-zfuzz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tex-zfuzz.spec 2 Jul 2008 01:59:17 -0000 1.1 +++ tex-zfuzz.spec 10 Jul 2008 21:10:44 -0000 1.2 @@ -2,7 +2,7 @@ Name: tex-zfuzz Version: 0 -Release: 0.20070911.2%{?dist} +Release: 0.20070911.3%{?dist} Summary: Type-checker and LaTeX style for Z spec language Group: Applications/Engineering License: BSD @@ -160,6 +160,9 @@ mktexlsr >/dev/null 2>&1 || : %changelog +* Mon Jul 10 2008 David A. Wheeler - 0-0.20070911.3 +- New release number (for CVS submission) + * Mon Jun 30 2008 David A. Wheeler - 0-0.20070911.2 - Added more information to Changelog (combined due to rev number change) From fedora-extras-commits at redhat.com Thu Jul 10 21:14:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:14:10 GMT Subject: rpms/R-biglm/devel R-biglm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807102114.m6ALEAj5006486@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-biglm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6405/devel Modified Files: .cvsignore sources Added Files: R-biglm.spec Log Message: initial import --- NEW FILE R-biglm.spec --- %define packname biglm Name: R-%{packname} Version: 0.4 Release: 1%{?dist} Summary: Bounded memory linear and generalized linear models Group: Applications/Productivity # Only license attribution is in DESCRIPTION. License: GPL+ URL: http://cran.r-project.org/web/packages/biglm/index.html Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R Requires(post): R Requires(postun): R BuildRequires: R-devel, tetex-latex %description Regression for data too large to fit in memory. %prep %setup -c -q -n %{packname} %build %install %{__rm} -rf %{buildroot} mkdir -p %{buildroot}%{_libdir}/R/library %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library # Clean up in advance of check test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check %{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/help %{_libdir}/R/library/%{packname}/libs/ %changelog * Tue Jul 8 2008 Tom "spot" Callaway 0.4-1 - initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-biglm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 21:08:28 -0000 1.1 +++ .cvsignore 10 Jul 2008 21:13:18 -0000 1.2 @@ -0,0 +1 @@ +biglm_0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-biglm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:08:28 -0000 1.1 +++ sources 10 Jul 2008 21:13:18 -0000 1.2 @@ -0,0 +1 @@ +c5d6797ec7b446dfeedf913d52771bea biglm_0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 21:14:53 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Thu, 10 Jul 2008 21:14:53 GMT Subject: rpms/galeon/devel galeon-2.0.6-plugins.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 galeon-2.0.5-xulrunner.patch, 1.1, 1.2 galeon.spec, 1.50, 1.51 sources, 1.12, 1.13 galeon-2.0.3-plugin-wrapper.patch, 1.3, NONE galeon-2.0.3-plugins.patch, 1.1, NONE galeon-2.0.5-build-fix.patch, 1.1, NONE Message-ID: <200807102114.m6ALErcu006559@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6470 Modified Files: .cvsignore galeon-2.0.5-xulrunner.patch galeon.spec sources Added Files: galeon-2.0.6-plugins.patch Removed Files: galeon-2.0.3-plugin-wrapper.patch galeon-2.0.3-plugins.patch galeon-2.0.5-build-fix.patch Log Message: - Update to upstraem 2.0.6 - Reworked configure patch for libxul-embedding - Plugin patch update galeon-2.0.6-plugins.patch: --- NEW FILE galeon-2.0.6-plugins.patch --- --- galeon-2.0.6/mozilla/mozilla-embed-shell.cpp~ 2008-07-05 18:18:24.000000000 +0200 +++ galeon-2.0.6/mozilla/mozilla-embed-shell.cpp 2008-07-07 12:11:57.000000000 +0200 @@ -232,12 +232,7 @@ g_string_append (new_path, g_get_home_dir()); g_string_append (new_path, "/.mozilla/plugins"); - /* Add /usr/lib/mozilla/plugins (bug 149812) */ - g_string_append (new_path, ":/usr/lib/mozilla/plugins"); - -#ifdef GALEON_MOZILLA_HOME /* Add the current mozilla build's plugins dir */ - g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins"); + g_string_append (new_path, ":" LIB_DIR "/mozilla/plugins"); -#endif g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE); --- galeon-2.0.6/mozilla/Makefile.in~ 2008-07-06 02:58:30.000000000 +0200 +++ galeon-2.0.6/mozilla/Makefile.in 2008-07-10 19:03:36.000000000 +0200 @@ -391,7 +391,7 @@ -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \ -I$(MOZILLA_INCLUDE_ROOT)/xpcom \ -I$(MOZILLA_INCLUDE_ROOT)/xpconnect $(GCONF_CFLAGS) \ - $(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(pkglibdir)\" \ + $(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(libdir)\" \ -DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \ mozilla-config.h $(am__append_1) noinst_LTLIBRARIES = libmozillaembed.la Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/galeon/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 Apr 2008 23:23:49 -0000 1.11 +++ .cvsignore 10 Jul 2008 21:13:57 -0000 1.12 @@ -1 +1 @@ -galeon-2.0.5.tar.bz2 +galeon-2.0.6.tar.bz2 galeon-2.0.5-xulrunner.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 galeon-2.0.5-xulrunner.patch Index: galeon-2.0.5-xulrunner.patch =================================================================== RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.5-xulrunner.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galeon-2.0.5-xulrunner.patch 4 Apr 2008 23:12:21 -0000 1.1 +++ galeon-2.0.5-xulrunner.patch 10 Jul 2008 21:13:57 -0000 1.2 @@ -1,272 +1,117 @@ ---- galeon-2.0.5/mozilla/ExternalProtocolService.cpp~ 2008-02-03 00:10:51.000000000 +0100 -+++ galeon-2.0.5/mozilla/ExternalProtocolService.cpp 2008-04-04 21:16:46.000000000 +0200 -@@ -192,3 +192,13 @@ - return NS_ERROR_NOT_IMPLEMENTED; - } - #endif -+ -+NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfoFromOS(const nsACString & aProtocolScheme, PRBool *aFound, nsIHandlerInfo **_retval) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} -+ -+NS_IMETHODIMP GExternalProtocolService::SetProtocolHandlerDefaults(nsIHandlerInfo *aHandlerInfo, PRBool aOSHandlerExists) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} ---- galeon-2.0.5/mozilla/JSConsoleListener.cpp~ 2007-12-15 07:10:37.000000000 +0100 -+++ galeon-2.0.5/mozilla/JSConsoleListener.cpp 2008-04-04 21:12:35.000000000 +0200 -@@ -50,7 +50,7 @@ - { - PRUnichar *message; - -- aMessage->GetMessage (&message); -+ aMessage->GetMessageMoz (&message); - - GaleonJSConsole * js_console; - js_console = galeon_embed_shell_get_js_console (embed_shell); ---- galeon-2.0.5/mozilla/GaleonWrapper.cpp~ 2008-01-11 00:04:01.000000000 +0100 -+++ galeon-2.0.5/mozilla/GaleonWrapper.cpp 2008-04-04 21:12:31.000000000 +0200 -@@ -1644,7 +1644,7 @@ - - NS_DECL_ISUPPORTS - -- NS_IMETHODIMP GetMessage(PRUnichar **result) -+ NS_IMETHODIMP GetMessageMoz(PRUnichar **result) - { - *result = NS_StringCloneData (mMessage); - return NS_OK; ---- galeon-2.0.5/mozilla/FilePicker.cpp~ 2007-12-15 07:53:22.000000000 +0100 -+++ galeon-2.0.5/mozilla/FilePicker.cpp 2008-04-04 21:10:05.000000000 +0200 -@@ -355,7 +355,7 @@ - } - - /* readonly attribute nsIFileURL fileURL; */ --NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL) -+NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL) - { - LOG ("GFilePicker::GetFileURL"); - ---- galeon-2.0.5/mozilla/MozillaPrivate.cpp~ 2008-02-03 01:05:22.000000000 +0100 -+++ galeon-2.0.5/mozilla/MozillaPrivate.cpp 2008-04-04 21:11:04.000000000 +0200 -@@ -163,7 +163,7 @@ - nsIDocument *doc = presShell->GetDocument(); - #else - nsCOMPtr doc; -- presShell->GetDocument(getter_AddRefs(doc)); -+ doc = presShell->GetDocument(); - #endif - NS_ENSURE_TRUE (doc, NS_ERROR_FAILURE); - ---- galeon-2.0.5/configure 2008-02-10 18:44:07.000000000 +0100 -+++ galeon-2.0.5.new/configure 2008-04-04 21:26:31.000000000 +0200 -@@ -809,6 +809,7 @@ - INSTALL_PROGRAM - INSTALL_SCRIPT - INSTALL_DATA -+am__isrc - CYGPATH_W - PACKAGE - VERSION -@@ -1575,7 +1576,6 @@ - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --disable-libtool-lock avoid locking (might break parallel builds) -- --enable-debug turn on debugging - --enable-nautilus-view (auto,yes,no) - Enable Nautilus View Galeon Component - --enable-gtkhtml Enable GtkHTML renderer -@@ -2064,7 +2064,8 @@ +--- galeon-2.0.6.orig/configure.in 2008-07-06 02:58:17.000000000 +0200 ++++ galeon-2.0.6/configure.in 2008-07-07 13:30:24.000000000 +0200 +@@ -212,10 +212,10 @@ + AC_MSG_CHECKING([which mozilla engine to use]) + + AC_ARG_WITH([mozilla], +- AC_HELP_STRING([--with-mozilla@<:@=libxul-embedding-unstable|seamonkey|firefox|xulrunner|thunderbird@:>@], ++ AC_HELP_STRING([--with-mozilla@<:@=libxul-embedding-unstable|libxul-embedding|seamonkey|firefox|xulrunner|thunderbird@:>@], + [Which gecko engine to use (default: autodetect)])) + +-GECKOS="libxul-embedding-unstable firefox mozilla-firefox seamonkey xulrunner thunderbird mozilla-thunderbird" ++GECKOS="libxul-embedding-unstable libxul-embedding firefox mozilla-firefox seamonkey xulrunner thunderbird mozilla-thunderbird" + gecko=$with_mozilla + autodetect= +@@ -240,6 +240,7 @@ + case "$gecko" in + libxul-embedding-unstable) min_version=1.9 flavour=toolkit ;; ++libxul-embedding) min_version=1.9 flavour=toolkit ;; + seamonkey) min_version=2.0 flavour=toolkit ;; + *firefox) min_version=2.0 flavour=toolkit ;; + *thunderbird) min_version=2.0 flavour=toolkit ;; +@@ -249,27 +250,28 @@ + MOZILLA=$gecko + AC_SUBST([MOZILLA]) --am__api_version="1.9" -+am__api_version='1.10' -+ - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then -@@ -2247,38 +2248,53 @@ - echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +-if test $MOZILLA = libxul-embedding-unstable; then ++if test $MOZILLA = libxul-embedding-unstable || test $MOZILLA = libxul-embedding; then + MOZILLA_XPCOM=$MOZILLA +- MOZILLA_GTKMOZEMBED=$MOZILLA ++ MOZILLA_GTKMOZEMBED=$MOZILLA-gtkmozembed + else + MOZILLA_XPCOM=$MOZILLA-xpcom + MOZILLA_XPCOM=$MOZILLA-gtkmozembed fi + PKG_CHECK_MODULES(XPCOM_COMPONENT, $MOZILLA_XPCOM >= $min_version) --if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -- # We used to keeping the `.' as first argument, in order to -- # allow $(mkdir_p) to be used without argument. As in -- # $(mkdir_p) $(somedir) -- # where $(somedir) is conditionally defined. However this is wrong -- # for two reasons: -- # 1. if the package is installed by a user who cannot write `.' -- # make install will fail, -- # 2. the above comment should most certainly read -- # $(mkdir_p) $(DESTDIR)$(somedir) -- # so it does not work when $(somedir) is undefined and -- # $(DESTDIR) is not. -- # To support the latter case, we have to write -- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -- # so the `.' trick is pointless. -- mkdir_p='mkdir -p --' --else -- # On NextStep and OpenStep, the `mkdir' command does not -- # recognize any option. It will interpret all options as -- # directories to create, and then abort because `.' already -- # exists. -- for d in ./-p ./--version; -- do -- test -d $d && rmdir $d -- done -- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -- if test -f "$ac_aux_dir/mkinstalldirs"; then -- mkdir_p='$(mkinstalldirs)' -+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -+if test -z "$MKDIR_P"; then -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in mkdir gmkdir; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -+ 'mkdir (GNU coreutils) '* | \ -+ 'mkdir (coreutils) '* | \ -+ 'mkdir (fileutils) '4.1*) -+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -+ break 3;; -+ esac -+ done -+ done -+done -+IFS=$as_save_IFS -+ ++if test $MOZILLA = libxul-embedding; then ++ MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `pkg-config --cflags nspr`" ++ MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS `pkg-config --libs nspr`" +fi + -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ MKDIR_P="$ac_cv_path_mkdir -p" - else -- mkdir_p='$(install_sh) -d' -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for MKDIR_P within a source directory, because that will -+ # break other packages using the cache if that directory is [...2570 lines suppressed...] + # MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS -lxul" +@@ -23527,9 +23474,7 @@ + { echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5 + echo "${ECHO_T}$gecko_cv_have_xpcom_glue" >&6; } + CPPFLAGS="$_SAVE_CPPFLAGS" +- +- +-if test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ if test "$gecko_cv_have_xpcom_glue" = "yes"; then + HAVE_XPCOM_GLUE_TRUE= + HAVE_XPCOM_GLUE_FALSE='#' + else +@@ -23651,12 +23596,12 @@ + #CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS $GALEON_DEPENDENCY_CFLAGS" + #CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS" + #LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS $MOZILLA_COMPONENT_LIBS" -CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS" -CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`" -LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`" +CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA` $GALEON_DEPENDENCY_CFLAGS" -+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA` `pkg-config --cflags $MOZILLA`-unstable " -+LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA` `pkg-config --libs $MOZILLA`-unstable" ++CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA nspr`" ++LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA nspr`" + -TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome" -+TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content xpcom js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome" ++TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content xpcom system_wrappers js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome" for i in $TEST_MOZILLA_INCLUDE_DIRS ; do CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i" done +@@ -23764,9 +23709,7 @@ + + { echo "$as_me:$LINENO: result: $result" >&5 + echo "${ECHO_T}$result" >&6; } +- +- +-if test "$result" = "yes"; then ++ if test "$result" = "yes"; then + HAVE_NSSTRING_INTERNAL_TRUE= + HAVE_NSSTRING_INTERNAL_FALSE='#' + else +@@ -24188,9 +24131,7 @@ + result=no + fi + +- +- +-if test "$result" = "yes"; then ++ if test "$result" = "yes"; then + HAVE_NSIJSCONSOLESERVICE_H_TRUE= + HAVE_NSIJSCONSOLESERVICE_H_FALSE='#' + else +@@ -24754,9 +24695,7 @@ + result=no + fi + +- +- +-if test "$result" = "yes"; then ++ if test "$result" = "yes"; then + HAVE_NSITOOLKITCHROMEREGISTRY_H_TRUE= + HAVE_NSITOOLKITCHROMEREGISTRY_H_FALSE='#' + else +@@ -25340,9 +25279,7 @@ + esac + fi + +- +- +-if test "$enable_schemas_install" != no; then ++ if test "$enable_schemas_install" != no; then + GCONF_SCHEMAS_INSTALL_TRUE= + GCONF_SCHEMAS_INSTALL_FALSE='#' + else +@@ -27678,6 +27615,7 @@ + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -27915,6 +27853,7 @@ + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim + CYGPATH_W!$CYGPATH_W$ac_delim + PACKAGE!$PACKAGE$ac_delim + VERSION!$VERSION$ac_delim +@@ -27971,7 +27910,6 @@ + AMDEP_FALSE!$AMDEP_FALSE$ac_delim + AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim + CCDEPMODE!$CCDEPMODE$ac_delim +-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -28013,6 +27951,7 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim + am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim + SED!$SED$ac_delim + GREP!$GREP$ac_delim +@@ -28109,7 +28048,6 @@ + POFILES!$POFILES$ac_delim + POSUB!$POSUB$ac_delim + MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -28151,10 +28089,11 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -28381,6 +28320,11 @@ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -28434,6 +28378,7 @@ + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out + +@@ -28549,21 +28494,22 @@ + fi + rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -28598,8 +28544,9 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +@@ -28791,7 +28738,7 @@ + + + +-if test "$gecko" == "xulrunner" || test "$gecko" == "libxul-embedding-unstable"; then ++if test "$gecko" == "xulrunner" || test "$gecko" == "libxul-embedding-unstable" || test "$gecko" == "libxul-embedding"; then + echo "" + echo "Note that Galeon has a runtime dependency on the 'cookie' and 'permission'" + echo "mozilla extensions. These are not built as part of the default xulrunner" Index: galeon.spec =================================================================== RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- galeon.spec 6 Jun 2008 11:54:48 -0000 1.50 +++ galeon.spec 10 Jul 2008 21:13:57 -0000 1.51 @@ -2,16 +2,14 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon -Version: 2.0.5 -Release: 3%{?dist} +Version: 2.0.6 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 -Patch0: galeon-2.0.3-plugins.patch -Patch1: galeon-2.0.3-plugin-wrapper.patch +Patch0: galeon-2.0.6-plugins.patch Patch2: galeon-2.0.5-xulrunner.patch -Patch3: galeon-2.0.5-build-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: gettext desktop-file-utils @@ -21,6 +19,7 @@ BuildRequires: libgnomeui-devel >= 2.5.2 BuildRequires: perl(XML::Parser) scrollkeeper BuildRequires: intltool +BuildRequires: nspr-devel Requires: gecko-libs >= %{gecko_ver} @@ -42,9 +41,7 @@ %prep %setup -q -n %{name}-%{version}%{?extraversion} %patch0 -p1 -b .plugins -%patch1 -p1 -b .wrapper %patch2 -p1 -b .xulrunner -%patch3 -p1 -b .build-fix %build @@ -53,7 +50,7 @@ --disable-werror \ --disable-schemas-install \ --disable-dependency-tracking \ - --with-mozilla=xulrunner + --with-mozilla=libxul-embedding make %{?_smp_mflags} @@ -119,6 +116,11 @@ %changelog +* Thu Jul 10 2008 Denis Leroy - 2.0.6-1 +- Update to upstraem 2.0.6 +- Reworked configure patch for libxul-embedding +- Plugin patch update + * Fri Jun 6 2008 Caol??n McNamara - 2.0.5-3 - add galeon-2.0.5-build-fix.patch like epiphany build-fix Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/galeon/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Apr 2008 23:23:49 -0000 1.12 +++ sources 10 Jul 2008 21:13:57 -0000 1.13 @@ -1 +1 @@ -bbddb89ad1ba08a62e03bceab5a38d93 galeon-2.0.5.tar.bz2 +7723816d29edac94945e5fd9a2a402f8 galeon-2.0.6.tar.bz2 --- galeon-2.0.3-plugin-wrapper.patch DELETED --- --- galeon-2.0.3-plugins.patch DELETED --- --- galeon-2.0.5-build-fix.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 21:17:57 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Thu, 10 Jul 2008 21:17:57 GMT Subject: rpms/tex-zfuzz/F-9 import.log,1.1,1.2 tex-zfuzz.spec,1.1,1.2 Message-ID: <200807102117.m6ALHvF6006898@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/tex-zfuzz/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6758/F-9 Modified Files: import.log tex-zfuzz.spec Log Message: * Mon Jul 10 2008 David A. Wheeler - 0-0.20070911.3 - New release number (for CVS submission) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Jul 2008 02:07:38 -0000 1.1 +++ import.log 10 Jul 2008 21:17:09 -0000 1.2 @@ -1 +1,2 @@ tex-zfuzz-0-0_20070911_2_fc9:F-9:tex-zfuzz-0-0.20070911.2.fc9.src.rpm:1214963719 +tex-zfuzz-0-0_20070911_3_fc9:F-9:tex-zfuzz-0-0.20070911.3.fc9.src.rpm:1215724603 Index: tex-zfuzz.spec =================================================================== RCS file: /cvs/pkgs/rpms/tex-zfuzz/F-9/tex-zfuzz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tex-zfuzz.spec 2 Jul 2008 02:07:38 -0000 1.1 +++ tex-zfuzz.spec 10 Jul 2008 21:17:09 -0000 1.2 @@ -2,7 +2,7 @@ Name: tex-zfuzz Version: 0 -Release: 0.20070911.2%{?dist} +Release: 0.20070911.3%{?dist} Summary: Type-checker and LaTeX style for Z spec language Group: Applications/Engineering License: BSD @@ -160,6 +160,9 @@ mktexlsr >/dev/null 2>&1 || : %changelog +* Mon Jul 10 2008 David A. Wheeler - 0-0.20070911.3 +- New release number (for CVS submission) + * Mon Jun 30 2008 David A. Wheeler - 0-0.20070911.2 - Added more information to Changelog (combined due to rev number change) From fedora-extras-commits at redhat.com Thu Jul 10 21:18:04 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 10 Jul 2008 21:18:04 GMT Subject: rpms/python/F-8 python.spec,1.124,1.125 Message-ID: <200807102118.m6ALI4h5006942@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/python/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6851 Modified Files: python.spec Log Message: * Thu Jul 10 2008 James Antill - 2.5.1-26.fc8.2 - Allow hashlib to work, if the linked openssl doesn't (Fed-9 update) - Resolves: bug#454179 From fedora-extras-commits at redhat.com Thu Jul 10 21:18:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:18:12 GMT Subject: rpms/R-biglm/EL-4 R-biglm.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807102118.m6ALICU9006961@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R-biglm/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6713/EL-4 Modified Files: sources Added Files: R-biglm.spec Log Message: branching --- NEW FILE R-biglm.spec --- %define packname biglm Name: R-%{packname} Version: 0.4 Release: 1%{?dist} Summary: Bounded memory linear and generalized linear models Group: Applications/Productivity # Only license attribution is in DESCRIPTION. License: GPL+ URL: http://cran.r-project.org/web/packages/biglm/index.html Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R Requires(post): R Requires(postun): R BuildRequires: R-devel, tetex-latex %description Regression for data too large to fit in memory. %prep %setup -c -q -n %{packname} %build %install %{__rm} -rf %{buildroot} mkdir -p %{buildroot}%{_libdir}/R/library %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library # Clean up in advance of check test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check %{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/help %{_libdir}/R/library/%{packname}/libs/ %changelog * Tue Jul 8 2008 Tom "spot" Callaway 0.4-1 - initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-biglm/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:08:28 -0000 1.1 +++ sources 10 Jul 2008 21:16:55 -0000 1.2 @@ -0,0 +1 @@ +c5d6797ec7b446dfeedf913d52771bea biglm_0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 21:18:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:18:21 GMT Subject: rpms/R-biglm/F-8 R-biglm.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807102118.m6ALILPv006964@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R-biglm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6713/F-8 Modified Files: sources Added Files: R-biglm.spec Log Message: branching --- NEW FILE R-biglm.spec --- %define packname biglm Name: R-%{packname} Version: 0.4 Release: 1%{?dist} Summary: Bounded memory linear and generalized linear models Group: Applications/Productivity # Only license attribution is in DESCRIPTION. License: GPL+ URL: http://cran.r-project.org/web/packages/biglm/index.html Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R Requires(post): R Requires(postun): R BuildRequires: R-devel, tetex-latex %description Regression for data too large to fit in memory. %prep %setup -c -q -n %{packname} %build %install %{__rm} -rf %{buildroot} mkdir -p %{buildroot}%{_libdir}/R/library %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library # Clean up in advance of check test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check %{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/help %{_libdir}/R/library/%{packname}/libs/ %changelog * Tue Jul 8 2008 Tom "spot" Callaway 0.4-1 - initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-biglm/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:08:28 -0000 1.1 +++ sources 10 Jul 2008 21:17:27 -0000 1.2 @@ -0,0 +1 @@ +c5d6797ec7b446dfeedf913d52771bea biglm_0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 21:18:21 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Thu, 10 Jul 2008 21:18:21 GMT Subject: rpms/nagios-plugins/devel .cvsignore, 1.10, 1.11 nagios-plugins.spec, 1.42, 1.43 sources, 1.10, 1.11 Message-ID: <200807102118.m6ALILMQ006970@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6732 Modified Files: .cvsignore nagios-plugins.spec sources Log Message: :extra-opts does not buld in koji Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 29 Feb 2008 04:22:02 -0000 1.10 +++ .cvsignore 10 Jul 2008 21:17:15 -0000 1.11 @@ -1 +1 @@ -nagios-plugins-1.4.11.tar.gz +nagios-plugins-1.4.12.tar.gz Index: nagios-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- nagios-plugins.spec 10 Jul 2008 20:12:31 -0000 1.42 +++ nagios-plugins.spec 10 Jul 2008 21:17:15 -0000 1.43 @@ -1,6 +1,6 @@ Name: nagios-plugins Version: 1.4.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System @@ -516,7 +516,6 @@ %build %configure \ --libexecdir=%{_libdir}/nagios/plugins \ - --enable-extra-opts \ --with-mysql \ PATH_TO_QSTAT=%{_bindir}/qstat \ PATH_TO_FPING=%{_sbindir}/fping \ @@ -800,6 +799,9 @@ %{_libdir}/nagios/plugins/utils.sh %changelog +* Tue Jul 10 2008 Robert M. Albrecht 1.4.12-3 +- Removed --with-extra-opts, does not build in Koji + * Mon Jun 30 2008 Robert M. Albrecht 1.4.12-2 - Enabled --with-extra-opts Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 29 Feb 2008 04:22:02 -0000 1.10 +++ sources 10 Jul 2008 21:17:15 -0000 1.11 @@ -1 +1 @@ -042783a2180a6987e0b403870b3d01f7 nagios-plugins-1.4.11.tar.gz +af68d00bbe2c39de02803d23e5eecca3 nagios-plugins-1.4.12.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 21:18:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:18:27 GMT Subject: rpms/R-biglm/EL-5 R-biglm.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807102118.m6ALIRNd006983@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R-biglm/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6713/EL-5 Modified Files: sources Added Files: R-biglm.spec Log Message: branching --- NEW FILE R-biglm.spec --- %define packname biglm Name: R-%{packname} Version: 0.4 Release: 1%{?dist} Summary: Bounded memory linear and generalized linear models Group: Applications/Productivity # Only license attribution is in DESCRIPTION. License: GPL+ URL: http://cran.r-project.org/web/packages/biglm/index.html Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R Requires(post): R Requires(postun): R BuildRequires: R-devel, tetex-latex %description Regression for data too large to fit in memory. %prep %setup -c -q -n %{packname} %build %install %{__rm} -rf %{buildroot} mkdir -p %{buildroot}%{_libdir}/R/library %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library # Clean up in advance of check test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check %{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/help %{_libdir}/R/library/%{packname}/libs/ %changelog * Tue Jul 8 2008 Tom "spot" Callaway 0.4-1 - initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-biglm/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:08:28 -0000 1.1 +++ sources 10 Jul 2008 21:17:12 -0000 1.2 @@ -0,0 +1 @@ +c5d6797ec7b446dfeedf913d52771bea biglm_0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 21:18:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:18:36 GMT Subject: rpms/R-biglm/F-9 R-biglm.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807102118.m6ALIaXA006998@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R-biglm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6713/F-9 Modified Files: sources Added Files: R-biglm.spec Log Message: branching --- NEW FILE R-biglm.spec --- %define packname biglm Name: R-%{packname} Version: 0.4 Release: 1%{?dist} Summary: Bounded memory linear and generalized linear models Group: Applications/Productivity # Only license attribution is in DESCRIPTION. License: GPL+ URL: http://cran.r-project.org/web/packages/biglm/index.html Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R Requires(post): R Requires(postun): R BuildRequires: R-devel, tetex-latex %description Regression for data too large to fit in memory. %prep %setup -c -q -n %{packname} %build %install %{__rm} -rf %{buildroot} mkdir -p %{buildroot}%{_libdir}/R/library %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library # Clean up in advance of check test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check %{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{_R_make_search_index} %postun %{_R_make_search_index} %files %defattr(-, root, root, -) %dir %{_libdir}/R/library/%{packname} %doc %{_libdir}/R/library/%{packname}/latex %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION %doc %{_libdir}/R/library/%{packname}/NEWS %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE %{_libdir}/R/library/%{packname}/Meta %{_libdir}/R/library/%{packname}/R %{_libdir}/R/library/%{packname}/R-ex %{_libdir}/R/library/%{packname}/help %{_libdir}/R/library/%{packname}/libs/ %changelog * Tue Jul 8 2008 Tom "spot" Callaway 0.4-1 - initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-biglm/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:08:28 -0000 1.1 +++ sources 10 Jul 2008 21:17:51 -0000 1.2 @@ -0,0 +1 @@ +c5d6797ec7b446dfeedf913d52771bea biglm_0.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 21:18:39 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 10 Jul 2008 21:18:39 GMT Subject: rpms/python/F-8 python-2.5.1-setup-sha256-bad-openssl.patch, NONE, 1.1 Message-ID: <200807102118.m6ALId6L007006@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/python/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6895 Added Files: python-2.5.1-setup-sha256-bad-openssl.patch Log Message: * Thu Jul 10 2008 James Antill - 2.5.1-26.fc8.2 - Allow hashlib to work, if the linked openssl doesn't (Fed-9 update) - Resolves: bug#454179 python-2.5.1-setup-sha256-bad-openssl.patch: --- NEW FILE python-2.5.1-setup-sha256-bad-openssl.patch --- diff -rup Python-2.5.1-orig/setup.py Python-2.5.1/setup.py --- Python-2.5.1-orig/setup.py 2008-07-10 13:33:18.000000000 -0400 +++ Python-2.5.1/setup.py 2008-07-10 13:34:59.000000000 -0400 @@ -586,7 +586,7 @@ class PyBuildExt(build_ext): sources = ['md5module.c', 'md5.c'], depends = ['md5.h']) ) - if (openssl_ver < 0x00908000): + if True or (openssl_ver < 0x00908000): # So it works if OSSL breaks # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash exts.append( Extension('_sha256', ['sha256module.c']) ) exts.append( Extension('_sha512', ['sha512module.c']) ) From fedora-extras-commits at redhat.com Thu Jul 10 21:28:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:28:46 GMT Subject: rpms/R-biglm/EL-4 R-biglm.spec,1.1,1.2 Message-ID: <200807102128.m6ALSkS3007752@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R-biglm/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7717 Modified Files: R-biglm.spec Log Message: no NEWS Index: R-biglm.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-biglm/EL-4/R-biglm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- R-biglm.spec 10 Jul 2008 21:16:55 -0000 1.1 +++ R-biglm.spec 10 Jul 2008 21:27:58 -0000 1.2 @@ -2,7 +2,7 @@ Name: R-%{packname} Version: 0.4 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Bounded memory linear and generalized linear models Group: Applications/Productivity @@ -51,7 +51,6 @@ %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION -%doc %{_libdir}/R/library/%{packname}/NEWS %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE @@ -62,5 +61,8 @@ %{_libdir}/R/library/%{packname}/libs/ %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 0.4-1.1 +- no NEWS + * Tue Jul 8 2008 Tom "spot" Callaway 0.4-1 - initial package for Fedora From fedora-extras-commits at redhat.com Thu Jul 10 21:30:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 10 Jul 2008 21:30:21 GMT Subject: rpms/R-biglm/EL-5 R-biglm.spec,1.1,1.2 Message-ID: <200807102130.m6ALULqq007853@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R-biglm/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7819 Modified Files: R-biglm.spec Log Message: no NEWS Index: R-biglm.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-biglm/EL-5/R-biglm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- R-biglm.spec 10 Jul 2008 21:17:12 -0000 1.1 +++ R-biglm.spec 10 Jul 2008 21:29:35 -0000 1.2 @@ -2,7 +2,7 @@ Name: R-%{packname} Version: 0.4 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Bounded memory linear and generalized linear models Group: Applications/Productivity @@ -51,7 +51,6 @@ %doc %{_libdir}/R/library/%{packname}/html %doc %{_libdir}/R/library/%{packname}/man %doc %{_libdir}/R/library/%{packname}/DESCRIPTION -%doc %{_libdir}/R/library/%{packname}/NEWS %{_libdir}/R/library/%{packname}/CONTENTS %{_libdir}/R/library/%{packname}/INDEX %{_libdir}/R/library/%{packname}/NAMESPACE @@ -62,5 +61,8 @@ %{_libdir}/R/library/%{packname}/libs/ %changelog +* Thu Jul 10 2008 Tom "spot" Callaway 0.4-1.1 +- no NEWS + * Tue Jul 8 2008 Tom "spot" Callaway 0.4-1 - initial package for Fedora From fedora-extras-commits at redhat.com Thu Jul 10 21:43:31 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 10 Jul 2008 21:43:31 GMT Subject: rpms/python-urlgrabber/F-8 python-urlgrabber.spec,1.22,1.23 Message-ID: <200807102143.m6ALhVdx008598@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/python-urlgrabber/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540 Modified Files: python-urlgrabber.spec Log Message: * Thu Jul 10 2008 James Antill 3.0.0-9 - Make urlgrabber usable if openssl is broken - Relates: bug#454179 From fedora-extras-commits at redhat.com Thu Jul 10 21:44:14 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 10 Jul 2008 21:44:14 GMT Subject: rpms/python-urlgrabber/F-8 urlgrabber-3.0.0-cleanup.patch, NONE, 1.1 urlgrabber-ftp-port.patch, NONE, 1.1 urlgrabber-grab-no-range.patch, NONE, 1.1 urlgrabber-no-ssl-ok.patch, NONE, 1.1 urlgrabber-progress-ui.patch, NONE, 1.1 Message-ID: <200807102144.m6ALiENp008622@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/python-urlgrabber/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8592 Added Files: urlgrabber-3.0.0-cleanup.patch urlgrabber-ftp-port.patch urlgrabber-grab-no-range.patch urlgrabber-no-ssl-ok.patch urlgrabber-progress-ui.patch Log Message: * Thu Jul 10 2008 James Antill 3.0.0-9 - Make urlgrabber usable if openssl is broken - Relates: bug#454179 urlgrabber-3.0.0-cleanup.patch: --- NEW FILE urlgrabber-3.0.0-cleanup.patch --- diff -up urlgrabber-3.0.0/urlgrabber/grabber.py.cleanup urlgrabber-3.0.0/urlgrabber/grabber.py --- urlgrabber-3.0.0/urlgrabber/grabber.py.cleanup 2007-11-29 10:25:13.000000000 +0000 +++ urlgrabber-3.0.0/urlgrabber/grabber.py 2007-11-29 10:26:15.000000000 +0000 @@ -1204,16 +1204,18 @@ class URLGrabberFileObject: bs = 1024*8 size = 0 - if amount is not None: bs = min(bs, amount - size) - block = self.read(bs) - size = size + len(block) - while block: - new_fo.write(block) + try: if amount is not None: bs = min(bs, amount - size) block = self.read(bs) size = size + len(block) + while block: + new_fo.write(block) + if amount is not None: bs = min(bs, amount - size) + block = self.read(bs) + size = size + len(block) + finally: + new_fo.close() - new_fo.close() try: modified_tuple = self.hdr.getdate_tz('last-modified') modified_stamp = rfc822.mktime_tz(modified_tuple) urlgrabber-ftp-port.patch: --- NEW FILE urlgrabber-ftp-port.patch --- Index: urlgrabber/byterange.py =================================================================== RCS file: /home/groups/urlgrabber/cvs-root/urlgrabber/urlgrabber/byterange.py,v retrieving revision 1.12 diff -u -r1.12 byterange.py --- urlgrabber/byterange.py 20 Jul 2006 20:15:58 -0000 1.12 +++ urlgrabber/byterange.py 13 Mar 2008 18:48:56 -0000 @@ -272,6 +272,8 @@ host, port = splitport(host) if port is None: port = ftplib.FTP_PORT + else: + port = int(port) # username/password handling user, host = splituser(host) urlgrabber-grab-no-range.patch: --- NEW FILE urlgrabber-grab-no-range.patch --- diff -ru urlgrabber-3.0.0-orig/urlgrabber/grabber.py urlgrabber-3.0.0/urlgrabber/grabber.py --- urlgrabber-3.0.0-orig/urlgrabber/grabber.py 2008-05-02 17:18:14.000000000 -0400 +++ urlgrabber-3.0.0/urlgrabber/grabber.py 2008-05-02 17:30:35.000000000 -0400 @@ -400,6 +400,11 @@ HTTPException = None try: + from httplib import HTTPResponse +except ImportError, msg: + HTTPResponse = None + +try: # This is a convenient way to make keepalive optional. # Just rename the module so it can't be imported. import keepalive @@ -1065,8 +1070,21 @@ req = urllib2.Request(self.url, self.opts.data) # build request object self._add_headers(req) # add misc headers that we need self._build_range(req) # take care of reget and byterange stuff + + def _checkNoReget(fo): + # HTTP can disallow Range requests + + if self.opts.reget is None: + return False + if 'Range' not in req.headers: + return False + if not isinstance(fo, HTTPResponse): + return False + + return fo.code != 206 fo, hdr = self._make_request(req, opener) + fetch_again = 0 if self.reget_time and self.opts.reget == 'check_timestamp': # do this if we have a local file with known timestamp AND # we're in check_timestamp reget mode. @@ -1078,14 +1096,26 @@ except (TypeError,): fetch_again = 1 + if _checkNoReget(fo): # doing a "reget" didn't work, so fixup + fetch_again = 0 + self.opts.reget = None + self.append = 0 + self._amount_read = 0 + + if True: if fetch_again: # the server version is newer than the (incomplete) local # version, so we should abandon the version we're getting # and fetch the whole thing again. fo.close() + # Without this we'll have to read all of the previous request + # data. For "large" requests, this is very bad. + fo.close_connection() self.opts.reget = None del req.headers['Range'] self._build_range(req) + # This doesn't get reset in _build_range() *sigh* + self._amount_read = 0 fo, hdr = self._make_request(req, opener) (scheme, host, path, parm, query, frag) = urlparse.urlparse(self.url) urlgrabber-no-ssl-ok.patch: --- NEW FILE urlgrabber-no-ssl-ok.patch --- diff -rup urlgrabber-3.0.0-orig/urlgrabber/keepalive.py urlgrabber-3.0.0/urlgrabber/keepalive.py --- urlgrabber-3.0.0-orig/urlgrabber/keepalive.py 2006-07-20 16:15:58.000000000 -0400 +++ urlgrabber-3.0.0/urlgrabber/keepalive.py 2008-07-10 17:37:06.000000000 -0400 @@ -328,12 +328,16 @@ class HTTPHandler(KeepAliveHandler, urll def http_open(self, req): return self.do_open(HTTPConnection, req) -class HTTPSHandler(KeepAliveHandler, urllib2.HTTPSHandler): - def __init__(self): - KeepAliveHandler.__init__(self) +# If SSL isn't available, don't make urlgrabber completely unusable +try: + class HTTPSHandler(KeepAliveHandler, urllib2.HTTPSHandler): + def __init__(self): + KeepAliveHandler.__init__(self) - def https_open(self, req): - return self.do_open(HTTPSConnection, req) + def https_open(self, req): + return self.do_open(HTTPSConnection, req) +except: + pass class HTTPResponse(httplib.HTTPResponse): # we need to subclass HTTPResponse in order to urlgrabber-progress-ui.patch: --- NEW FILE urlgrabber-progress-ui.patch --- diff -rup urlgrabber-3.0.0-orig/urlgrabber/progress.py urlgrabber-3.0.0/urlgrabber/progress.py --- urlgrabber-3.0.0-orig/urlgrabber/progress.py 2008-06-16 00:48:52.000000000 -0400 +++ urlgrabber-3.0.0/urlgrabber/progress.py 2008-06-16 00:49:25.000000000 -0400 @@ -24,7 +24,74 @@ import time import math import thread import types - +import fcntl +import struct +import termios + +# Code from http://mail.python.org/pipermail/python-list/2000-May/033365.html +def terminal_width(fd=1): + """ Get the real terminal width """ + try: + buf = 'abcdefgh' + buf = fcntl.ioctl(fd, termios.TIOCGWINSZ, buf) + return struct.unpack('hhhh', buf)[1] + except: # IOError + return 80 + +_term_width_val = None +_term_width_last = None +def terminal_width_cached(fd=1, cache_timeout=1.000): + """ Get the real terminal width, but cache it for a bit. """ + global _term_width_val + global _term_width_last + + now = time.time() + if _term_width_val is None or (now - _term_width_last) > cache_timeout: + _term_width_val = terminal_width(fd) + _term_width_last = now + return _term_width_val + +class TerminalLine: + """ Help create dynamic progress bars, uses terminal_width_cached(). """ + + def __init__(self, min_rest=0, beg_len=None, fd=1, cache_timeout=1.000): + if beg_len is None: + beg_len = min_rest + self._min_len = min_rest + self._llen = terminal_width_cached(fd, cache_timeout) + if self._llen < beg_len: + self._llen = beg_len + self._fin = False + + def __len__(self): + """ Usable length for elements. """ + return self._llen - self._min_len + + def rest_split(self, fixed, elements=2): + """ After a fixed length, split the rest of the line length among + a number of different elements (default=2). """ + if self._llen < fixed: + return 0 + return (self._llen - fixed) / elements + + def add(self, element, full_len=None): + """ If there is room left in the line, above min_len, add element. + Note that as soon as one add fails all the rest will fail too. """ + + if full_len is None: + full_len = len(element) + if len(self) < full_len: + self._fin = True + if self._fin: + return '' + + self._llen -= len(element) + return element + + def rest(self): + """ Current rest of line, same as .rest_split(fixed=0, elements=1). """ + return self._llen + class BaseMeter: def __init__(self): self.update_period = 0.3 # seconds @@ -84,6 +151,64 @@ class BaseMeter: def _do_end(self, amount_read, now=None): pass +# This is kind of a hack, but progress is gotten from grabber which doesn't +# know about the total size to download. So we do this so we can get the data +# out of band here. This will be "fixed" one way or anther soon. +_text_meter_total_size = 0 +_text_meter_sofar_size = 0 +def text_meter_total_size(size, downloaded=0): + global _text_meter_total_size + global _text_meter_sofar_size + _text_meter_total_size = size + _text_meter_sofar_size = downloaded + +# +# update: No size (minimal: 17 chars) +# ----------------------------------- +# | +# 8-48 1 8 3 6 1 9 5 +# +# Order: 1. + (17) +# 2. + (10, total: 27) +# 3. + ( 5, total: 32) +# 4. + ( 9, total: 41) +# +# update: Size, Single file +# ------------------------- +# | ETA +# 8-25 1 3-4 1 6-16 1 8 3 6 1 9 1 3 1 +# +# Order: 1. + (17) +# 2. + (10, total: 27) +# 3. +ETA ( 5, total: 32) +# 4. + ( 4, total: 36) +# 5. + ( 9, total: 45) +# 6. + ( 7, total: 52) +# +# update: Size, All files +# ----------------------- +# | ETA +# 8-22 1 5-7 1 3-4 1 6-12 1 8 3 6 1 9 1 3 1 +# +# Order: 1. + (17) +# 2. + (10, total: 27) +# 3. +ETA ( 5, total: 32) +# 4. + ( 5, total: 37) +# 4. + ( 4, total: 41) +# 5. + ( 9, total: 50) +# 6. + ( 7, total: 57) +# +# end +# --- +# | +# 8-56 3 6 1 9 5 +# +# Order: 1. ( 8) +# 2. + ( 9, total: 17) +# 3. + (10, total: 27) +# 4. + ( 5, total: 32) +# + class TextMeter(BaseMeter): def __init__(self, fo=sys.stderr): BaseMeter.__init__(self) @@ -98,38 +223,80 @@ class TextMeter(BaseMeter): text = self.text else: text = self.basename + + ave_dl = format_number(self.re.average_rate()) + sofar_size = None + if _text_meter_total_size: + sofar_size = _text_meter_sofar_size + amount_read + sofar_pc = (sofar_size * 100) / _text_meter_total_size + + # Include text + ui_rate in minimal + tl = TerminalLine(8, 8+1+8) + ui_size = tl.add(' | %5sB' % fread) if self.size is None: - out = '\r%-60.60s %5sB %s ' % \ - (text, fread, fetime) + ui_time = tl.add(' %9s' % fetime) + ui_end = tl.add(' ' * 5) + ui_rate = tl.add(' %5sB/s' % ave_dl) + out = '\r%-*.*s%s%s%s%s' % (tl.rest(), tl.rest(), text, + ui_rate, ui_size, ui_time, ui_end) else: rtime = self.re.remaining_time() frtime = format_time(rtime) frac = self.re.fraction_read() - bar = '='*int(25 * frac) - out = '\r%-25.25s %3i%% |%-25.25s| %5sB %8s ETA ' % \ - (text, frac*100, bar, fread, frtime) + ui_time = tl.add(' %9s' % frtime) + ui_end = tl.add(' ETA ') + + if sofar_size is None: + ui_sofar_pc = '' + else: + ui_sofar_pc = tl.add(' (%i%%)' % sofar_pc, + full_len=len(" (100%)")) + + ui_pc = tl.add(' %2i%%' % (frac*100)) + ui_rate = tl.add(' %5sB/s' % ave_dl) + # Make text grow a bit before we start growing the bar too + blen = 4 + tl.rest_split(8 + 8 + 4) + bar = '='*int(blen * frac) + ui_bar = tl.add(' [%-*.*s]' % (blen, blen, bar)) + out = '\r%-*.*s%s%s%s%s%s%s%s' % (tl.rest(), tl.rest(), text, + ui_sofar_pc, ui_pc, ui_bar, + ui_rate, ui_size, ui_time, ui_end) self.fo.write(out) self.fo.flush() def _do_end(self, amount_read, now=None): + global _text_meter_total_size + global _text_meter_sofar_size + total_time = format_time(self.re.elapsed_time()) total_size = format_number(amount_read) if self.text is not None: text = self.text else: text = self.basename - if self.size is None: - out = '\r%-60.60s %5sB %s ' % \ - (text, total_size, total_time) - else: - bar = '='*25 - out = '\r%-25.25s %3i%% |%-25.25s| %5sB %8s ' % \ - (text, 100, bar, total_size, total_time) - self.fo.write(out + '\n') + + tl = TerminalLine(8) + ui_size = tl.add(' | %5sB' % total_size) + ui_time = tl.add(' %9s' % total_time) + ui_end = tl.add(' ' * 5) + out = '\r%-*.*s%s%s%s\n' % (tl.rest(), tl.rest(), text, + ui_size, ui_time, ui_end) + self.fo.write(out) self.fo.flush() + # Don't add size to the sofar size until we have all of it. + # If we don't have a size, then just pretend/hope we got all of it. + if self.size is not None and amount_read != self.size: + return + + if _text_meter_total_size: + _text_meter_sofar_size += amount_read + if _text_meter_total_size <= _text_meter_sofar_size: + _text_meter_total_size = 0 + _text_meter_sofar_size = 0 + text_progress_meter = TextMeter class MultiFileHelper(BaseMeter): @@ -397,10 +564,12 @@ class RateEstimator: #print 'times', now, self.last_update_time time_diff = now - self.last_update_time read_diff = amount_read - self.last_amount_read - self.last_update_time = now + # First update, on reget is the file size + if self.last_amount_read: + self.last_update_time = now + self.ave_rate = self._temporal_rolling_ave(\ + time_diff, read_diff, self.ave_rate, self.timescale) self.last_amount_read = amount_read - self.ave_rate = self._temporal_rolling_ave(\ - time_diff, read_diff, self.ave_rate, self.timescale) #print 'results', time_diff, read_diff, self.ave_rate ##################################################################### @@ -529,3 +698,49 @@ def format_number(number, SI=0, space=' format = '%.0f%s%s' return(format % (float(number or 0), space, symbols[depth])) + +def _tst(fn, cur, tot, beg, size, *args): + tm = TextMeter() + text = "(%d/%d): %s" % (cur, tot, fn) + tm.start(fn, "http://www.example.com/path/to/fn/" + fn, fn, size, text=text) + num = beg + off = 0 + for (inc, delay) in args: + off += 1 + while num < ((size * off) / len(args)): + num += inc + tm.update(num) + time.sleep(delay) + tm.end(size) + +if __name__ == "__main__": + # (1/2): subversion-1.4.4-7.x86_64.rpm 2.4 MB / 85 kB/s 00:28 + # (2/2): mercurial-0.9.5-6.fc8.x86_64.rpm 924 kB / 106 kB/s 00:08 + if len(sys.argv) >= 2 and sys.argv[1] == 'total': + text_meter_total_size(1000 + 10000 + 10000 + 1000000 + 1000000 + + 1000000 + 10000 + 10000 + 10000 + 1000000) + _tst("sm-1.0.0-1.fc8.i386.rpm", 1, 10, 0, 1000, + (10, 0.2), (10, 0.1), (100, 0.25)) + _tst("s-1.0.1-1.fc8.i386.rpm", 2, 10, 0, 10000, + (10, 0.2), (100, 0.1), (100, 0.1), (100, 0.25)) + _tst("m-1.0.1-2.fc8.i386.rpm", 3, 10, 5000, 10000, + (10, 0.2), (100, 0.1), (100, 0.1), (100, 0.25)) + _tst("large-file-name-Foo-11.8.7-4.5.6.1.fc8.x86_64.rpm", 4, 10, 0, 1000000, + (1000, 0.2), (1000, 0.1), (10000, 0.1)) + _tst("large-file-name-Foo2-11.8.7-4.5.6.2.fc8.x86_64.rpm", 5, 10, + 500001, 1000000, (1000, 0.2), (1000, 0.1), (10000, 0.1)) + _tst("large-file-name-Foo3-11.8.7-4.5.6.3.fc8.x86_64.rpm", 6, 10, + 750002, 1000000, (1000, 0.2), (1000, 0.1), (10000, 0.1)) + _tst("large-file-name-Foo4-10.8.7-4.5.6.1.fc8.x86_64.rpm", 7, 10, 0, 10000, + (100, 0.1)) + _tst("large-file-name-Foo5-10.8.7-4.5.6.2.fc8.x86_64.rpm", 8, 10, + 5001, 10000, (100, 0.1)) + _tst("large-file-name-Foo6-10.8.7-4.5.6.3.fc8.x86_64.rpm", 9, 10, + 7502, 10000, (1, 0.1)) + _tst("large-file-name-Foox-9.8.7-4.5.6.1.fc8.x86_64.rpm", 10, 10, + 0, 1000000, (10, 0.5), + (100000, 0.1), (10000, 0.1), (10000, 0.1), (10000, 0.1), + (100000, 0.1), (10000, 0.1), (10000, 0.1), (10000, 0.1), + (100000, 0.1), (10000, 0.1), (10000, 0.1), (10000, 0.1), + (100000, 0.1), (10000, 0.1), (10000, 0.1), (10000, 0.1), + (100000, 0.1), (1, 0.1)) Only in urlgrabber-3.0.0/urlgrabber: progress.py.orig From fedora-extras-commits at redhat.com Thu Jul 10 22:40:32 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Thu, 10 Jul 2008 22:40:32 GMT Subject: rpms/pnp4nagios/devel import.log, NONE, 1.1 pnp4nagios-README.fedora, NONE, 1.1 pnp4nagios-npcd.sysvinit, NONE, 1.1 pnp4nagios.logrotate.conf, NONE, 1.1 pnp4nagios.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807102240.m6AMeWfM028661@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28591/devel Modified Files: .cvsignore sources Added Files: import.log pnp4nagios-README.fedora pnp4nagios-npcd.sysvinit pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: Initial import. --- NEW FILE import.log --- pnp4nagios-0_4_10-1_fc8:HEAD:pnp4nagios-0.4.10-1.fc8.src.rpm:1215729530 --- NEW FILE pnp4nagios-README.fedora --- * Default Mode /etc/nagios/nagios.cfg process_performance_data=1 service_perfdata_command=process-service-perfdata /etc/nagios/commands.cfg define command { command_name process-service-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl } define command { command_name process-host-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl -d HOSTPERFDATA } * Bulk Mode /etc/nagios/nagios.cfg : process_performance_data=1 # # service performance data # service_perfdata_file=/var/spool/nagios/service-perfdata service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$ service_perfdata_file_mode=a service_perfdata_file_processing_interval=15 service_perfdata_file_processing_command=process-service-perfdata-file /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/service-perfdata } define command{ command_name process-host-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/host-perfdata } * Bulk Mode with NPCD npcd daemon needs to be started : service npcd start chkconfig npcd on The configuration is identical to the default-mode except for the used command. /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line /bin/mv /var/spool/nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } define command{ command_name process-host-perfdata-file command_line /bin/mv /var/spool/nagios/host-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } * Nagios integration /etc/nagios/hostextinfo.cfg : define hostextinfo { host_name localhost action_url /nagios/pnp4nagios/index.php?host=$HOSTNAME$ } --- NEW FILE pnp4nagios-npcd.sysvinit --- #!/bin/sh # # npcd Nagios Performancedata C Daemon # # chkconfig: - 98 02 # description: Nagios Performancedata C Daemon ### BEGIN INIT INFO # Provides: # Required-Start: # Required-Stop: # Should-Start: # Should-Stop: # Default-Start: # Default-Stop: # Short-Description: # Description: ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/sbin/npcd" prog="npcd" config="/etc/pnp4nagios/npcd.cfg" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon $exec -f $config -d retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE pnp4nagios.logrotate.conf --- /var/log/pnp4nagios/* { compress missingok notifempty rotate 5 size 100K } --- NEW FILE pnp4nagios.spec --- Name: pnp4nagios Version: 0.4.10 Release: 1%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System License: GPLv2 URL: http://www.pnp4nagios.org/ Source0: http://downloads.sourceforge.net/%{name}/pnp-%{version}.tar.gz Source1: pnp4nagios.logrotate.conf Source2: pnp4nagios-npcd.sysvinit Source3: pnp4nagios-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: rrdtool Requires: nagios Requires: rrdtool Requires: php-gd Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts %description PNP is an addon to nagios which analyzes performance data provided by plugins and stores them automatically into RRD-databases. %prep %setup -q -n pnp-%{version} cp -p %{SOURCE3} README.fedora sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \ configure sed -i -e '/^\t$(MAKE) strip-post-install$/d' src/Makefile.in %build %configure --bindir=%{_sbindir}/ \ --libexecdir=%{_libexecdir}/%{name}/ \ --sysconfdir=%{_sysconfdir}/%{name}/ \ --localstatedir=%{_localstatedir}/log/%{name}/ \ --datadir=%{_datadir}/nagios/html/%{name}/ \ --datarootdir=%{_datadir}/nagios/html/%{name}/ \ --with-perfdata-dir=%{_localstatedir}/lib/%{name}/ \ --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}/ make %{?_smp_mflags} all %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install-config DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios -name *-sample -exec rename "-sample" "" {} ';' sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp4nagios/process_perfdata.pl|' \ -e 's|^log_type = syslog|log_type = file|' \ $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/npcd.cfg mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pnp4nagios install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/npcd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add npcd %preun if [ $1 = 0 ]; then /sbin/service npcd stop >/dev/null 2>&1 /sbin/chkconfig --del npcd fi %postun if [ "$1" -ge "1" ]; then /sbin/service npcd condrestart >/dev/null 2>&1 || : fi %files %defattr(644,root,root,755) %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README README.fedora %doc README.npcd THANKS TODO %dir %{_sysconfdir}/pnp4nagios %config(noreplace) %{_sysconfdir}/pnp4nagios/* %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios %attr(755,root,root) %{_initrddir}/npcd %attr(755,root,root) %{_sbindir}/npcd %attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl %attr(755,nagios,nagios) %{_localstatedir}/lib/%{name} %attr(755,nagios,nagios) %{_localstatedir}/log/%{name} %attr(755,nagios,nagios) %{_localstatedir}/spool/%{name} %{_datadir}/nagios/html/pnp4nagios %changelog * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. * Tue May 27 2008 Xavier Bachelot 0.4.9-3 - Fix npcd init script to use /etc/pnp4nagios. * Tue May 27 2008 Xavier Bachelot 0.4.9-2 - Install npcd unstripped to let rpm do it. * Sat May 24 2008 Xavier Bachelot 0.4.9-1 - Update to 0.4.9. - Rename to pnp4nagios to match other distros packages. * Mon Apr 14 2008 Xavier Bachelot 0.4.7-5 - Log to file by default. - Kill pnpsender man page. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-4 - Install inside of nagios html dir. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-3 - Provide properly named config files. - Add missing Requires:. - Add a logrotate conf file. * Fri Apr 04 2008 Xavier Bachelot 0.4.7-2 - Add an initscript for npcd. * Wed Mar 19 2008 Xavier Bachelot 0.4.7-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 21:06:15 -0000 1.1 +++ .cvsignore 10 Jul 2008 22:39:37 -0000 1.2 @@ -0,0 +1 @@ +pnp-0.4.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:06:15 -0000 1.1 +++ sources 10 Jul 2008 22:39:37 -0000 1.2 @@ -0,0 +1 @@ +5e57d50e2d895878b626497fd7b217b7 pnp-0.4.10.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 22:51:06 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Thu, 10 Jul 2008 22:51:06 GMT Subject: rpms/e2fsprogs/devel .cvsignore, 1.25, 1.26 e2fsprogs.spec, 1.116, 1.117 sources, 1.25, 1.26 Message-ID: <200807102251.m6AMp6nX029110@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29077 Modified Files: .cvsignore e2fsprogs.spec sources Log Message: * Thu Jul 10 2008 Eric Sandeen 1.41-1 - New usptream release - ext4 capable Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 7 Jul 2008 22:08:08 -0000 1.25 +++ .cvsignore 10 Jul 2008 22:50:11 -0000 1.26 @@ -1 +1 @@ -e2fsprogs-1.41-WIP-0707.tar.gz +e2fsprogs-1.41.0.tar.gz Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- e2fsprogs.spec 8 Jul 2008 01:22:13 -0000 1.116 +++ e2fsprogs.spec 10 Jul 2008 22:50:11 -0000 1.117 @@ -4,12 +4,12 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs Version: 1.41 -Release: 0.2.WIP.0707%{?dist} +Release: 1{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 Group: System Environment/Base -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-WIP-0707.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: ext2_types-wrapper.h Source2: blkid_types-wrapper.h Source3: uuidd.init @@ -289,6 +289,10 @@ %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid %changelog +* Thu Jul 10 2008 Eric Sandeen 1.41-1 +- New usptream release +- ext4 capable + * Mon Jul 07 2008 Eric Sandeen 1.41-0.2.WIP.0707 - Fix release macro snafu Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 7 Jul 2008 22:08:08 -0000 1.25 +++ sources 10 Jul 2008 22:50:11 -0000 1.26 @@ -1 +1 @@ -95bb57e8e59ba24d380da855fa3f971b e2fsprogs-1.41-WIP-0707.tar.gz +83144fa7e0e63647f920b77650ea1836 e2fsprogs-1.41.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 10 22:53:52 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Thu, 10 Jul 2008 22:53:52 GMT Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.117,1.118 Message-ID: <200807102253.m6AMrqaS029335@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29271 Modified Files: e2fsprogs.spec Log Message: sneaky .0 on the end of the version Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- e2fsprogs.spec 10 Jul 2008 22:50:11 -0000 1.117 +++ e2fsprogs.spec 10 Jul 2008 22:53:03 -0000 1.118 @@ -3,7 +3,7 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs -Version: 1.41 +Version: 1.41.0 Release: 1{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. From fedora-extras-commits at redhat.com Thu Jul 10 23:04:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 23:04:52 +0000 Subject: [pkgdb] php-pecl-zip (Fedora EPEL, 4) updated by kevin Message-ID: <200807102304.m6AN4qIS026267@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for php-pecl-zip Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pecl-zip (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pecl-zip (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pecl-zip (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-zip From fedora-extras-commits at redhat.com Thu Jul 10 23:06:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 23:06:45 +0000 Subject: [pkgdb] php-pear-propel_runtime summary updated by kevin Message-ID: <200807102306.m6AN6jq6026335@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) set package php-pear-propel_runtime summary to An ORM framework for PHP5 - runtime component To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_runtime From fedora-extras-commits at redhat.com Thu Jul 10 23:07:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 23:07:12 +0000 Subject: [pkgdb] php-pear-propel_generator summary updated by kevin Message-ID: <200807102307.m6AN7C0v026366@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) set package php-pear-propel_generator summary to An ORM framework for PHP5 - generator component To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-propel_generator From fedora-extras-commits at redhat.com Thu Jul 10 23:07:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 10 Jul 2008 23:07:47 +0000 Subject: [pkgdb] ocsinventory (Fedora EPEL, 4) updated by kevin Message-ID: <200807102307.m6AN7lF9026401@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for ocsinventory Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocsinventory (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocsinventory (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocsinventory (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory From fedora-extras-commits at redhat.com Thu Jul 10 23:09:35 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Thu, 10 Jul 2008 23:09:35 GMT Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.118,1.119 Message-ID: <200807102309.m6AN9ZAV004121@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4011 Modified Files: e2fsprogs.spec Log Message: macros hate me Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- e2fsprogs.spec 10 Jul 2008 22:53:03 -0000 1.118 +++ e2fsprogs.spec 10 Jul 2008 23:08:37 -0000 1.119 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs Version: 1.41.0 -Release: 1{?dist} +Release: 1%{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 From fedora-extras-commits at redhat.com Thu Jul 10 23:20:37 2008 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 10 Jul 2008 23:20:37 GMT Subject: rpms/libnjb/devel libnjb.spec,1.12,1.13 libnjb.perms,1.1,NONE Message-ID: <200807102320.m6ANKb9N004678@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4632 Modified Files: libnjb.spec Removed Files: libnjb.perms Log Message: Got rid of pam_console for this package Index: libnjb.spec =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libnjb.spec 9 Feb 2008 22:10:22 -0000 1.12 +++ libnjb.spec 10 Jul 2008 23:19:46 -0000 1.13 @@ -3,18 +3,16 @@ Name: libnjb Version: 2.2.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ Group: System Environment/Libraries Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: libnjb.rules -Source2: libnjb.perms BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: BSD Requires: udev -Requires: pam BuildRequires: libusb-devel BuildRequires: zlib-devel BuildRequires: ncurses-devel @@ -64,9 +62,6 @@ # Install udev rules file. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libnjb.rules -# Install device permissions -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/ -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi # Copy documentation to a good place @@ -82,7 +77,7 @@ # I don't want to pre-generate it but will instead wait for upstream # to find a suitable solution that will always bring the same files, # or that Doxygen is fixed not to do this. -rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html +#rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %clean rm -rf $RPM_BUILD_ROOT @@ -94,7 +89,6 @@ %defattr(-, root, root) %{_libdir}/*.so.* %config(noreplace) %{_sysconfdir}/udev/rules.d/* -%config(noreplace) %{_sysconfdir}/security/console.perms.d/* %config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi %files examples %defattr(-, root, root) @@ -110,6 +104,8 @@ %changelog +* Fri Jul 11 2008 Linus Walleij 2.2.6-4 +- Loose console permissions. See if docs build fine again. * Sat Feb 9 2008 Linus Walleij 2.2.6-3 - Rebuild for GCC 4.3. * Wed Oct 24 2007 Linus Walleij 2.2.6-2 --- libnjb.perms DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 23:41:56 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 23:41:56 GMT Subject: rpms/FreeWnn/devel dead.package,NONE,1.1 Message-ID: <200807102341.m6ANfuCa005372@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/FreeWnn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5276 Added Files: dead.package Log Message: This package is orphaned and was dropped since after FC3. --- NEW FILE dead.package --- dropped since Fedora Core 3 From fedora-extras-commits at redhat.com Thu Jul 10 23:44:06 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 23:44:06 GMT Subject: rpms/FreeWnn/F-9 FreeWnn-1.1.1-a020-wnntouch.patch, 1.2, NONE FreeWnn-1.1.1-fork-61907.patch, 1.1, NONE FreeWnn-1.10-pl020-jserver-64bit-128387.patch, 1.1, NONE FreeWnn-1.10-smpmake.patch, 1.2, NONE FreeWnn-fsstnd.patch, 1.1, NONE FreeWnn-install-chown.patch, 1.1, NONE FreeWnn-ja-a017.patch, 1.1, NONE FreeWnn-nosbit.patch, 1.1, NONE FreeWnn-reuid.patch, 1.1, NONE FreeWnn.init, 1.1, NONE FreeWnn.spec, 1.6, NONE jserverrc-g-jinmei.patch, 1.1, NONE sources, 1.2, NONE Message-ID: <200807102344.m6ANi6Sw005489@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/FreeWnn/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5481 Removed Files: FreeWnn-1.1.1-a020-wnntouch.patch FreeWnn-1.1.1-fork-61907.patch FreeWnn-1.10-pl020-jserver-64bit-128387.patch FreeWnn-1.10-smpmake.patch FreeWnn-fsstnd.patch FreeWnn-install-chown.patch FreeWnn-ja-a017.patch FreeWnn-nosbit.patch FreeWnn-reuid.patch FreeWnn.init FreeWnn.spec jserverrc-g-jinmei.patch sources Log Message: this package was dropped after fc3 --- FreeWnn-1.1.1-a020-wnntouch.patch DELETED --- --- FreeWnn-1.1.1-fork-61907.patch DELETED --- --- FreeWnn-1.10-pl020-jserver-64bit-128387.patch DELETED --- --- FreeWnn-1.10-smpmake.patch DELETED --- --- FreeWnn-fsstnd.patch DELETED --- --- FreeWnn-install-chown.patch DELETED --- --- FreeWnn-ja-a017.patch DELETED --- --- FreeWnn-nosbit.patch DELETED --- --- FreeWnn-reuid.patch DELETED --- --- FreeWnn.init DELETED --- --- FreeWnn.spec DELETED --- --- jserverrc-g-jinmei.patch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 23:52:16 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 23:52:16 GMT Subject: rpms/FreeWnn/devel FreeWnn-1.1.1-a020-wnntouch.patch, 1.2, NONE FreeWnn-1.1.1-fork-61907.patch, 1.1, NONE FreeWnn-1.10-pl020-jserver-64bit-128387.patch, 1.1, NONE FreeWnn-1.10-smpmake.patch, 1.2, NONE FreeWnn-fsstnd.patch, 1.1, NONE FreeWnn-install-chown.patch, 1.1, NONE FreeWnn-ja-a017.patch, 1.1, NONE FreeWnn-nosbit.patch, 1.1, NONE FreeWnn-reuid.patch, 1.1, NONE FreeWnn.init, 1.1, NONE FreeWnn.spec, 1.6, NONE Makefile, 1.1, NONE jserverrc-g-jinmei.patch, 1.1, NONE sources, 1.2, NONE Message-ID: <200807102352.m6ANqG4N005849@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/FreeWnn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5831 Removed Files: FreeWnn-1.1.1-a020-wnntouch.patch FreeWnn-1.1.1-fork-61907.patch FreeWnn-1.10-pl020-jserver-64bit-128387.patch FreeWnn-1.10-smpmake.patch FreeWnn-fsstnd.patch FreeWnn-install-chown.patch FreeWnn-ja-a017.patch FreeWnn-nosbit.patch FreeWnn-reuid.patch FreeWnn.init FreeWnn.spec Makefile jserverrc-g-jinmei.patch sources Log Message: remove files for dead package --- FreeWnn-1.1.1-a020-wnntouch.patch DELETED --- --- FreeWnn-1.1.1-fork-61907.patch DELETED --- --- FreeWnn-1.10-pl020-jserver-64bit-128387.patch DELETED --- --- FreeWnn-1.10-smpmake.patch DELETED --- --- FreeWnn-fsstnd.patch DELETED --- --- FreeWnn-install-chown.patch DELETED --- --- FreeWnn-ja-a017.patch DELETED --- --- FreeWnn-nosbit.patch DELETED --- --- FreeWnn-reuid.patch DELETED --- --- FreeWnn.init DELETED --- --- FreeWnn.spec DELETED --- --- Makefile DELETED --- --- jserverrc-g-jinmei.patch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 10 23:53:19 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 10 Jul 2008 23:53:19 GMT Subject: rpms/FreeWnn/F-9 Makefile,1.1,NONE Message-ID: <200807102353.m6ANrJw6005934@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/FreeWnn/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873 Removed Files: Makefile Log Message: remove the Makefile too --- Makefile DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 00:19:10 2008 From: fedora-extras-commits at redhat.com (Michael Fleming (mfleming)) Date: Fri, 11 Jul 2008 00:19:10 GMT Subject: rpms/pyicq-t/devel config.patch,1.1,1.2 pyicq-t.spec,1.8,1.9 Message-ID: <200807110019.m6B0JAM2014364@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/pyicq-t/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14265 Modified Files: config.patch pyicq-t.spec Log Message: * Fri Jul 11 2008 Michael Fleming - 0.8-5.b - Fix typo in configuration config.patch: Index: config.patch =================================================================== RCS file: /cvs/extras/rpms/pyicq-t/devel/config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.patch 5 Aug 2006 23:42:07 -0000 1.1 +++ config.patch 11 Jul 2008 00:18:22 -0000 1.2 @@ -5,7 +5,7 @@ - . -+ /var/spool/pyicq-tt ++ /var/spool/pyicq-t Index: pyicq-t.spec =================================================================== RCS file: /cvs/extras/rpms/pyicq-t/devel/pyicq-t.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pyicq-t.spec 23 Feb 2008 13:22:24 -0000 1.8 +++ pyicq-t.spec 11 Jul 2008 00:18:22 -0000 1.9 @@ -4,7 +4,7 @@ Name: pyicq-t Version: 0.8 -Release: 4%{?subver:.%{subver}}%{?dist} +Release: 5%{?subver:.%{subver}}%{?dist} Summary: ICQ Transport for Jabber Servers Group: Applications/Internet @@ -110,6 +110,9 @@ %{_datadir}/pyicq-t/src/xdb/mysql.py* %changelog +* Fri Jul 11 2008 Michael Fleming - 0.8-5.b +- Fix typo in configuration + * Sat Feb 23 2008 Jeffrey C. Ollie - 0.8-4.b - Update to 0.8b From fedora-extras-commits at redhat.com Fri Jul 11 00:22:10 2008 From: fedora-extras-commits at redhat.com (Michael Fleming (mfleming)) Date: Fri, 11 Jul 2008 00:22:10 GMT Subject: rpms/pyicq-t/F-8 config.patch,1.1,1.2 pyicq-t.spec,1.8,1.9 Message-ID: <200807110022.m6B0MADf014528@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/pyicq-t/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14455 Modified Files: config.patch pyicq-t.spec Log Message: * Fri Jul 11 2008 Michael Fleming - 0.8-5.b - Fix typo in configuration config.patch: Index: config.patch =================================================================== RCS file: /cvs/extras/rpms/pyicq-t/F-8/config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.patch 5 Aug 2006 23:42:07 -0000 1.1 +++ config.patch 11 Jul 2008 00:21:21 -0000 1.2 @@ -5,7 +5,7 @@ - . -+ /var/spool/pyicq-tt ++ /var/spool/pyicq-t Index: pyicq-t.spec =================================================================== RCS file: /cvs/extras/rpms/pyicq-t/F-8/pyicq-t.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pyicq-t.spec 26 Feb 2008 11:12:15 -0000 1.8 +++ pyicq-t.spec 11 Jul 2008 00:21:21 -0000 1.9 @@ -4,7 +4,7 @@ Name: pyicq-t Version: 0.8 -Release: 4%{?subver:.%{subver}}%{?dist} +Release: 5%{?subver:.%{subver}}%{?dist} Summary: ICQ Transport for Jabber Servers Group: Applications/Internet @@ -110,6 +110,9 @@ %{_datadir}/pyicq-t/src/xdb/mysql.py* %changelog +* Fri Jul 11 2008 Michael Fleming - 0.8-5.b +- Fix typo in configuration + * Sat Feb 23 2008 Jeffrey C. Ollie - 0.8-4.b - Update to 0.8b From fedora-extras-commits at redhat.com Fri Jul 11 00:23:48 2008 From: fedora-extras-commits at redhat.com (Michael Fleming (mfleming)) Date: Fri, 11 Jul 2008 00:23:48 GMT Subject: rpms/pyicq-t/F-9 config.patch,1.1,1.2 pyicq-t.spec,1.8,1.9 Message-ID: <200807110023.m6B0NmNq014639@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/pyicq-t/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14602 Modified Files: config.patch pyicq-t.spec Log Message: * Fri Jul 11 2008 Michael Fleming - 0.8-5.b - Fix typo in configuration config.patch: Index: config.patch =================================================================== RCS file: /cvs/extras/rpms/pyicq-t/F-9/config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.patch 5 Aug 2006 23:42:07 -0000 1.1 +++ config.patch 11 Jul 2008 00:22:53 -0000 1.2 @@ -5,7 +5,7 @@ - . -+ /var/spool/pyicq-tt ++ /var/spool/pyicq-t Index: pyicq-t.spec =================================================================== RCS file: /cvs/extras/rpms/pyicq-t/F-9/pyicq-t.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pyicq-t.spec 23 Feb 2008 13:22:24 -0000 1.8 +++ pyicq-t.spec 11 Jul 2008 00:22:53 -0000 1.9 @@ -4,7 +4,7 @@ Name: pyicq-t Version: 0.8 -Release: 4%{?subver:.%{subver}}%{?dist} +Release: 5%{?subver:.%{subver}}%{?dist} Summary: ICQ Transport for Jabber Servers Group: Applications/Internet @@ -110,6 +110,9 @@ %{_datadir}/pyicq-t/src/xdb/mysql.py* %changelog +* Fri Jul 11 2008 Michael Fleming - 0.8-5.b +- Fix typo in configuration + * Sat Feb 23 2008 Jeffrey C. Ollie - 0.8-4.b - Update to 0.8b From fedora-extras-commits at redhat.com Fri Jul 11 00:55:46 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 11 Jul 2008 00:55:46 GMT Subject: rpms/python-sphinx/devel python-sphinx.spec,1.2,1.3 Message-ID: <200807110055.m6B0tkvr015608@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-sphinx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15568 Modified Files: python-sphinx.spec Log Message: Fix a specfile typo Index: python-sphinx.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sphinx/devel/python-sphinx.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-sphinx.spec 6 Jun 2008 17:23:20 -0000 1.2 +++ python-sphinx.spec 11 Jul 2008 00:55:15 -0000 1.3 @@ -49,7 +49,7 @@ %package doc -Summary: Documentation for ${name} +Summary: Documentation for %{name} Group: Documentation License: BSD Requires: %{name} = %{version}-%{release} From fedora-extras-commits at redhat.com Fri Jul 11 02:45:30 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Fri, 11 Jul 2008 02:45:30 GMT Subject: rpms/stardict/devel stardict-3.0.1-10.gucharmap.patch, NONE, 1.1 stardict.spec, 1.51, 1.52 Message-ID: <200807110245.m6B2jU8e005244@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4870 Modified Files: stardict.spec Added Files: stardict-3.0.1-10.gucharmap.patch Log Message: * Thu Jul 10 2008 Caius Chance - 3.0.1-10.fc10 - Rebuilt for gucharmap updation 2.22.1 and pkgconfig .ac name change. stardict-3.0.1-10.gucharmap.patch: --- NEW FILE stardict-3.0.1-10.gucharmap.patch --- diff -up stardict-3.0.1/configure.in.testing stardict-3.0.1/configure.in --- stardict-3.0.1/configure.in.testing 2007-11-01 03:37:15.000000000 -0400 +++ stardict-3.0.1/configure.in 2008-07-10 13:30:19.000000000 -0400 @@ -76,7 +76,7 @@ AC_ARG_ENABLE([gucharmap], [enable_gucharmap=yes]) if test "x$enable_gucharmap" = "xyes" ; then - PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], have_gucharmap=yes, have_gucharmap=no) + PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2 >= 2.22.1], have_gucharmap=yes, have_gucharmap=no) if test "x$have_gucharmap" = "xyes"; then GUCHARMAP_CFLAGS="${GUCHARMAP_CFLAGS}" GUCHARMAP_LIBS="${GUCHARMAP_LIBS}" @@ -393,11 +393,11 @@ STARDICT_CFLAGS="$SIGCPP_CFLAGS $STARDIC STARDICT_LIBS="$SIGCPP_LIBS $STARDICT_LIBS" else echo "Use local libsigc++20"; -SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD() -SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD() -SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION() -SIGC_CXX_HAS_NAMESPACE_STD() -SIGC_CXX_HAS_SUN_REVERSE_ITERATOR() +#SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD() +#SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD() +#SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION() +#SIGC_CXX_HAS_NAMESPACE_STD() +#SIGC_CXX_HAS_SUN_REVERSE_ITERATOR() if test "X$config_error" = "Xyes" ; then AC_ERROR( diff -up stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.testing stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp --- stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.testing 2008-07-11 06:34:02.000000000 -0400 +++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-07-11 06:34:29.000000000 -0400 @@ -238,7 +238,7 @@ static void lookup(const char *text, cha /* canonical decomposition */ gunichar *decomposition; gsize result_len; - decomposition = gucharmap_unicode_canonical_decomposition (uc, &result_len); + decomposition = g_unicode_canonical_decomposition (uc, &result_len); if (result_len != 1) { definition += _("Canonical decomposition:"); definition += " "; Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- stardict.spec 29 Jun 2008 23:18:39 -0000 1.51 +++ stardict.spec 11 Jul 2008 02:44:40 -0000 1.52 @@ -5,13 +5,14 @@ Name: %{name} Summary: A powerful dictionary platform written in GTK+2 Version: %{version} -Release: 9%{?dist} +Release: 10%{?dist} Group: Applications/System License: GPLv3 URL: http://stardict.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Patch0: stardict-3.0.1.gcc43.patch Patch1: transparent_trayicon.patch +Patch2: stardict-3.0.1-10.gucharmap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libgnome >= 2.2.0 @@ -42,8 +43,9 @@ %prep %setup -q -%patch0 -p1 -b .gcc43 -%patch1 -p1 -b .trayicon +%patch0 -p1 -b .1-gcc43 +%patch1 -p1 -b .2-trayicon +%patch2 -p1 -b .3-gucharmap # Remove unneeded sigc++ header files to make it sure # that we are using system-wide libsigc++ @@ -52,6 +54,8 @@ find src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f %build +%{__aclocal} +%{__autoconf} %configure --disable-schemas-install --disable-festival make @@ -94,8 +98,11 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Thu Jul 10 2008 Caius Chance - 3.0.1-10.fc10 +- Rebuilt for gucharmap updation 2.22.1 and pkgconfig .ac name change. + * Mon Jun 30 2008 Caius Chance - 3.0.1-9.fc10 -- Fixed broken dependencies with guchapmap. +- Fixed broken dependencies with gucharmap. * Fri Feb 29 2008 Hu Zheng - 3.0.1-8 - Forget commit first. From fedora-extras-commits at redhat.com Fri Jul 11 03:18:57 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 11 Jul 2008 03:18:57 GMT Subject: rpms/sound-juicer/devel sound-juicer.spec,1.98,1.99 Message-ID: <200807110318.m6B3IvLG019770@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/sound-juicer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19540 Modified Files: sound-juicer.spec Log Message: drop hal BR Index: sound-juicer.spec =================================================================== RCS file: /cvs/extras/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- sound-juicer.spec 9 Jun 2008 10:24:31 -0000 1.98 +++ sound-juicer.spec 11 Jul 2008 03:18:06 -0000 1.99 @@ -7,13 +7,12 @@ %define gnome_media_version 2.11.91 %define gnome_vfs_version 2.9.90 %define nautilus_cd_burner_version 2.15.3 -%define hal_version 0.5.0 %define scrollkeeper_version 0.3.5 Name: sound-juicer Summary: Clean and lean CD ripper Version: 2.23.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia Source: http://download.gnome.org/sources/sound-juicer/2.23/%{name}-%{version}.tar.bz2 @@ -38,7 +37,6 @@ BuildRequires: gstreamer-plugins-good-devel BuildRequires: gnome-doc-utils BuildRequires: GConf2-devel >= %{gconf_version} -BuildRequires: hal-devel >= %{hal_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs_version} BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version} BuildRequires: scrollkeeper >= %{scrollkeeper_version} @@ -58,7 +56,7 @@ # work around a gstreamer problem where it # doesn't find plugins the first time around DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all -%configure --enable-hal --disable-scrollkeeper +%configure --disable-scrollkeeper make AM_CFLAGS=-export-dynamic @@ -121,6 +119,9 @@ %{_mandir}/man1/* %changelog +* Thu Jul 10 2008 Matthias Clasen - 2.23.0-2 +- There is need to BR hal anymore + * Mon Jun 09 2008 - Bastien Nocera - 2.23.0-1 - Update to 2.23.0 From fedora-extras-commits at redhat.com Fri Jul 11 03:29:47 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 11 Jul 2008 03:29:47 GMT Subject: rpms/e2fsprogs/F-9 e2fsprogs.spec, 1.112, 1.113 e2fsprogs-1.40-list_for_each_safe.patch, 1.1, NONE e2fsprogs-1.40.8-blkid-swap-tests.patch, 1.3, NONE Message-ID: <200807110329.m6B3TloF020684@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20622 Modified Files: e2fsprogs.spec Removed Files: e2fsprogs-1.40-list_for_each_safe.patch e2fsprogs-1.40.8-blkid-swap-tests.patch Log Message: * Thu Jul 10 2008 Eric Sandeen 1.41.0 - New upstream version Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/F-9/e2fsprogs.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- e2fsprogs.spec 21 Jun 2008 03:17:31 -0000 1.112 +++ e2fsprogs.spec 11 Jul 2008 03:29:01 -0000 1.113 @@ -3,8 +3,8 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs -Version: 1.40.10 -Release: 4%{?dist} +Version: 1.41.0 +Release: 1%{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 @@ -15,8 +15,6 @@ Source3: uuidd.init Patch1: e2fsprogs-1.38-etcblkid.patch Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch -Patch3: e2fsprogs-1.40.8-blkid-swap-tests.patch -Patch4: e2fsprogs-1.40-list_for_each_safe.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,9 +91,6 @@ # mildly unsafe but 'til I get something better, avoid full fsck # after an selinux install... %patch2 -p1 -b .featurecheck -# check a bit more in swapv1 headers before recognizing as swap -%patch3 -p1 -b .swapchecks -%patch4 -p1 -b .listsafe %build %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux @@ -284,12 +279,15 @@ %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid %changelog +* Thu Jul 10 2008 Eric Sandeen 1.41.0 +- New upstream version + * Fri Jun 20 2008 Eric Sandeen 1.40.10-4 - Fix blkid -g segfault when clearing entries (#452333) * Wed Jun 04 2008 Eric Sandeen 1.40.10-3 - Tidy up multilib hack for non-multilib arches (#446016) -- Fix up %postun script (#449868) +- Fix up postun script (#449868) * Wed Jun 04 2008 Dennis Gilmore 1.40.10-2 - setup header support for sparc --- e2fsprogs-1.40-list_for_each_safe.patch DELETED --- --- e2fsprogs-1.40.8-blkid-swap-tests.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 03:30:58 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 11 Jul 2008 03:30:58 GMT Subject: rpms/e2fsprogs/F-9 .cvsignore,1.21,1.22 sources,1.22,1.23 Message-ID: <200807110330.m6B3Uwsc020783@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20737 Modified Files: .cvsignore sources Log Message: * Thu Jul 10 2008 Eric Sandeen 1.41.0 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/F-9/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 14 Mar 2008 14:43:13 -0000 1.21 +++ .cvsignore 11 Jul 2008 03:30:09 -0000 1.22 @@ -1 +1 @@ -e2fsprogs-1.40.8.tar.gz +e2fsprogs-1.41.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 29 May 2008 14:58:12 -0000 1.22 +++ sources 11 Jul 2008 03:30:09 -0000 1.23 @@ -1 +1 @@ -6174d70fb26858861f842f28486a8e83 e2fsprogs-1.40.10.tar.gz +83144fa7e0e63647f920b77650ea1836 e2fsprogs-1.41.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 03:48:51 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 11 Jul 2008 03:48:51 GMT Subject: rpms/e2fsprogs/F-9 e2fsprogs.spec,1.113,1.114 Message-ID: <200807110348.m6B3mpca022164@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21959 Modified Files: e2fsprogs.spec Log Message: new package, new %files Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/F-9/e2fsprogs.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- e2fsprogs.spec 11 Jul 2008 03:29:01 -0000 1.113 +++ e2fsprogs.spec 11 Jul 2008 03:47:56 -0000 1.114 @@ -175,14 +175,19 @@ %{_root_sbindir}/e2fsck %{_root_sbindir}/e2image %{_root_sbindir}/e2label +%{_root_sbindir}/e2undo %{_root_sbindir}/findfs %{_root_sbindir}/fsck %{_root_sbindir}/fsck.ext2 %{_root_sbindir}/fsck.ext3 +%{_root_sbindir}/fsck.ext4 +%{_root_sbindir}/fsck.ext4dev %{_root_sbindir}/logsave %{_root_sbindir}/mke2fs %{_root_sbindir}/mkfs.ext2 %{_root_sbindir}/mkfs.ext3 +%{_root_sbindir}/mkfs.ext4 +%{_root_sbindir}/mkfs.ext4dev %{_root_sbindir}/resize2fs %{_root_sbindir}/tune2fs %{_sbindir}/filefrag @@ -207,13 +212,18 @@ %{_mandir}/man8/filefrag.8* %{_mandir}/man8/fsck.ext2.8* %{_mandir}/man8/fsck.ext3.8* +%{_mandir}/man8/fsck.ext4.8* +%{_mandir}/man8/fsck.ext4dev.8* %{_mandir}/man8/e2image.8* %{_mandir}/man8/e2label.8* +%{_mandir}/man8/e2undo.8* %{_mandir}/man8/fsck.8* %{_mandir}/man8/logsave.8* %{_mandir}/man8/mke2fs.8* %{_mandir}/man8/mkfs.ext2.8* %{_mandir}/man8/mkfs.ext3.8* +%{_mandir}/man8/mkfs.ext4.8* +%{_mandir}/man8/mkfs.ext4dev.8* %{_mandir}/man8/mklost+found.8* %{_mandir}/man8/resize2fs.8* %{_mandir}/man8/tune2fs.8* @@ -279,8 +289,9 @@ %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid %changelog -* Thu Jul 10 2008 Eric Sandeen 1.41.0 -- New upstream version +* Thu Jul 10 2008 Eric Sandeen 1.41.0-1 +- New upstream version +- ext4 capable * Fri Jun 20 2008 Eric Sandeen 1.40.10-4 - Fix blkid -g segfault when clearing entries (#452333) From fedora-extras-commits at redhat.com Fri Jul 11 03:58:41 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 03:58:41 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.98-parallel_devel.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 kdelibs.spec, 1.337, 1.338 sources, 1.64, 1.65 kdelibs-4.0.81-parallel_devel.patch, 1.1, NONE Message-ID: <200807110358.m6B3wfGP023432@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23291 Modified Files: .cvsignore kdelibs.spec sources Added Files: kdelibs-4.0.98-parallel_devel.patch Removed Files: kdelibs-4.0.81-parallel_devel.patch Log Message: * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 - omit proxy patch (for now, needswork) kdelibs-4.0.98-parallel_devel.patch: --- NEW FILE kdelibs-4.0.98-parallel_devel.patch --- diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-08 04:54:11.000000000 -0500 +++ kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake 2008-07-10 20:54:43.000000000 -0500 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: # -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable -# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable +# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable # # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: @@ -124,7 +124,7 @@ # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) -# Use this to add widget description files for the makekdewidgets code generator +# Use this to add widget description files for the makekdewidgets4 code generator # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) @@ -286,23 +286,23 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) # when building kdelibs, make the kcfg rules depend on the binaries... - set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) - set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) + set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) + set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) @@ -351,69 +351,69 @@ else (_kdeBootStrapping) include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) if (UNIX) - find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) - find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) - find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) if (UNIX) - find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) # Can't do that, it's not always compiled. @@ -432,14 +432,14 @@ else (_kdeBootStrapping) # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -668,7 +668,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY "${_CMAKE_INSTALL_DIR}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) -set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} +set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel" + ${CMAKE_SYSTEM_LIBRARY_PATH} "${KDE4_LIB_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) @@ -1059,9 +1060,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") else(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") + message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) diff -up kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh --- kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 06:07:26.000000000 -0500 +++ kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh 2008-07-10 20:53:39.000000000 -0500 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # -kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" +kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" if test -z "$kcfg_compiler"; then - echo "kconfig_compiler not found!" + echo "kconfig_compiler4 not found!" exit 1; fi diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl --- kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500 +++ kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-10 20:53:39.000000000 -0500 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; -$cmd = "./kconfig_compiler $file $kcfgc"; +$cmd = "./kconfig_compiler4 $file $kcfgc"; #print "CMD $cmd\n"; if ( system( $cmd ) != 0 ) { - print STDERR "Unable to run kconfig_compiler\n"; + print STDERR "Unable to run kconfig_compiler4\n"; exit 1; } diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt --- kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:09:13.000000000 -0500 +++ kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -8,11 +8,11 @@ add_subdirectory( example ) set(kconfig_compiler_SRCS kconfig_compiler.cpp) -kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) +target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} ) ########### install files ############### diff -up kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt --- kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:08:30.000000000 -0500 +++ kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) diff -up kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdewidgets/CMakeLists.txt --- kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 06:08:17.000000000 -0500 +++ kdelibs-4.0.98/kdewidgets/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -16,22 +16,22 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) -kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) +target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) -install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} ) ########### next target ############### # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) -get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT) +get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets - MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets) + MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4) set(kdewidgets_PART_SRCS classpreviews.cpp Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 7 Jul 2008 12:38:52 -0000 1.54 +++ .cvsignore 11 Jul 2008 03:57:48 -0000 1.55 @@ -1 +1 @@ -kdelibs-4.0.85.tar.bz2 +kdelibs-4.0.98.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.337 retrieving revision 1.338 diff -u -r1.337 -r1.338 --- kdelibs.spec 7 Jul 2008 12:38:52 -0000 1.337 +++ kdelibs.spec 11 Jul 2008 03:57:48 -0000 1.338 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} %if 0%{?fedora} > 8 @@ -49,7 +49,7 @@ Source2: kde4.csh # make -devel packages parallel-installable -Patch0: kdelibs-4.0.81-parallel_devel.patch +Patch0: kdelibs-4.0.98-parallel_devel.patch # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Hunspell support for K3Spell @@ -197,7 +197,8 @@ %patch12 -p1 -b .Administration-menu %patch13 -p1 -b .fedora-buildtype %patch14 -p1 -b .libexecdir -%patch15 -p1 -b .proxy +# FIXME -- Rex +#patch15 -p1 -b .proxy %patch18 -p1 -b .kstandarddirs # upstream patches @@ -356,6 +357,10 @@ %changelog +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 +- omit proxy patch (for now, needswork) + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 7 Jul 2008 12:38:52 -0000 1.64 +++ sources 11 Jul 2008 03:57:48 -0000 1.65 @@ -1 +1 @@ -6ffe77d3538d6bbbb70a2295e1b186c5 kdelibs-4.0.85.tar.bz2 +68465f41c45ae7fec0d15f13787b130b kdelibs-4.0.98.tar.bz2 --- kdelibs-4.0.81-parallel_devel.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 03:59:00 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 03:59:00 GMT Subject: rpms/kdepimlibs/devel .cvsignore, 1.22, 1.23 kdepimlibs.spec, 1.40, 1.41 sources, 1.22, 1.23 Message-ID: <200807110359.m6B3x0Fx023583@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23318 Modified Files: .cvsignore kdepimlibs.spec sources Log Message: * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 7 Jul 2008 12:41:17 -0000 1.22 +++ .cvsignore 11 Jul 2008 03:58:07 -0000 1.23 @@ -1 +1 @@ -kdepimlibs-4.0.85.tar.bz2 +kdepimlibs-4.0.98.tar.bz2 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- kdepimlibs.spec 7 Jul 2008 12:41:17 -0000 1.40 +++ kdepimlibs.spec 11 Jul 2008 03:58:07 -0000 1.41 @@ -14,7 +14,7 @@ Name: kdepimlibs -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries @@ -163,6 +163,9 @@ %changelog +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 7 Jul 2008 12:41:17 -0000 1.22 +++ sources 11 Jul 2008 03:58:07 -0000 1.23 @@ -1 +1 @@ -00887d0ef653d4929516430dc34e9416 kdepimlibs-4.0.85.tar.bz2 +acebf9f4f9883d8a1251f6a588304009 kdepimlibs-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 03:59:26 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 03:59:26 GMT Subject: rpms/kdebase/devel .cvsignore, 1.74, 1.75 kdebase.spec, 1.333, 1.334 sources, 1.97, 1.98 Message-ID: <200807110359.m6B3xQdp023660@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23401 Modified Files: .cvsignore kdebase.spec sources Log Message: * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- .cvsignore 7 Jul 2008 12:49:35 -0000 1.74 +++ .cvsignore 11 Jul 2008 03:58:30 -0000 1.75 @@ -1 +1 @@ -kdebase-4.0.85.tar.bz2 +kdebase-4.0.98.tar.bz2 Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- kdebase.spec 7 Jul 2008 12:49:35 -0000 1.333 +++ kdebase.spec 11 Jul 2008 03:58:30 -0000 1.334 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} %if 0%{?fedora} > 8 @@ -301,6 +301,9 @@ %changelog +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- sources 7 Jul 2008 12:49:35 -0000 1.97 +++ sources 11 Jul 2008 03:58:30 -0000 1.98 @@ -1 +1 @@ -aa0b9675de54f8ee382c8e602914360e kdebase-4.0.85.tar.bz2 +43a025d53f4d8a280db9c8b7da238bf6 kdebase-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 03:59:41 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 03:59:41 GMT Subject: rpms/kdebase-runtime/devel .cvsignore, 1.16, 1.17 kdebase-runtime.spec, 1.54, 1.55 sources, 1.16, 1.17 Message-ID: <200807110359.m6B3xfZ2023726@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23498 Modified Files: .cvsignore kdebase-runtime.spec sources Log Message: * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 7 Jul 2008 12:45:45 -0000 1.16 +++ .cvsignore 11 Jul 2008 03:58:52 -0000 1.17 @@ -1 +1 @@ -kdebase-runtime-4.0.85.tar.bz2 +kdebase-runtime-4.0.98.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- kdebase-runtime.spec 7 Jul 2008 12:45:45 -0000 1.54 +++ kdebase-runtime.spec 11 Jul 2008 03:58:52 -0000 1.55 @@ -8,7 +8,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} License: GPLv2 @@ -316,6 +316,9 @@ %changelog +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 7 Jul 2008 12:45:45 -0000 1.16 +++ sources 11 Jul 2008 03:58:52 -0000 1.17 @@ -1 +1 @@ -d188b58251755d425cf226df7a698ec7 kdebase-runtime-4.0.85.tar.bz2 +564def1536a1cd646b0f8bd531db251b kdebase-runtime-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 04:00:14 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 04:00:14 GMT Subject: rpms/kdebase-workspace/devel .cvsignore, 1.14, 1.15 kdebase-workspace.spec, 1.95, 1.96 sources, 1.16, 1.17 Message-ID: <200807110400.m6B40EGM023848@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23683 Modified Files: .cvsignore kdebase-workspace.spec sources Log Message: * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Jul 2008 12:48:07 -0000 1.14 +++ .cvsignore 11 Jul 2008 03:59:29 -0000 1.15 @@ -1 +1 @@ -kdebase-workspace-4.0.85.tar.bz2 +kdebase-workspace-4.0.98.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- kdebase-workspace.spec 9 Jul 2008 21:35:56 -0000 1.95 +++ kdebase-workspace.spec 11 Jul 2008 03:59:29 -0000 1.96 @@ -1,8 +1,8 @@ Summary: K Desktop Environment - Workspace Name: kdebase-workspace -Version: 4.0.85 +Version: 4.0.98 -Release: 3%{?dist} +Release: 1%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -146,8 +146,8 @@ # upstream patches # plasma-4.0-openSUSE patches: -# patch201 will no longer be needed with the next snapshot: -%patch201 -p1 -b .kde#154119 +# patch201 will no longer be needed with the next snapshot: omitted in 4.0.98 -- Rex +#patch201 -p1 -b .kde#154119 %patch204 -p1 -b .kickoff-suspend pushd plasma/applets/systemtray/ %patch205 -p0 -b .kde#164786 @@ -284,6 +284,9 @@ %changelog +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Wed Jul 09 2008 Kevin Kofler 4.0.85-3 - rewrite and reapply plasma-default-wallpaper patch - (no more separate plasma-default-wallpaper-config part) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 7 Jul 2008 12:48:07 -0000 1.16 +++ sources 11 Jul 2008 03:59:29 -0000 1.17 @@ -1 +1 @@ -269f9d19ef55f2dc4a2d432a83222653 kdebase-workspace-4.0.85.tar.bz2 +9129174ff9cbe3fa2349234a65451b35 kdebase-workspace-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 04:05:13 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 04:05:13 GMT Subject: rpms/kdepim/devel .cvsignore, 1.48, 1.49 kdepim.spec, 1.176, 1.177 sources, 1.54, 1.55 Message-ID: <200807110405.m6B45DgO031431@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31315 Modified Files: .cvsignore kdepim.spec sources Log Message: * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 7 Jul 2008 12:43:12 -0000 1.48 +++ .cvsignore 11 Jul 2008 04:04:22 -0000 1.49 @@ -1 +1 @@ -kdepim-4.0.85.tar.bz2 +kdepim-4.0.98.tar.bz2 Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- kdepim.spec 7 Jul 2008 12:43:12 -0000 1.176 +++ kdepim.spec 11 Jul 2008 04:04:22 -0000 1.177 @@ -6,7 +6,7 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} License: GPLv2 @@ -173,6 +173,9 @@ %changelog +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 7 Jul 2008 12:43:12 -0000 1.54 +++ sources 11 Jul 2008 04:04:22 -0000 1.55 @@ -1 +1 @@ -b8d0a5a7433b6f4c5fede9487f6fd41a kdepim-4.0.85.tar.bz2 +71d7396490f27ca4c5d9687515a3d8a9 kdepim-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 04:13:28 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 11 Jul 2008 04:13:28 GMT Subject: rpms/gnome-commander/devel .cvsignore, 1.6, 1.7 gnome-commander.spec, 1.20, 1.21 sources, 1.6, 1.7 gcmd-ja.po, 1.1, NONE Message-ID: <200807110413.m6B4DSR0000654@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391 Modified Files: .cvsignore gnome-commander.spec sources Removed Files: gcmd-ja.po Log Message: * Fri Jul 11 2008 Mamoru Tasaka - try rev 1870 - ja.po is merged upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Jun 2008 18:22:30 -0000 1.6 +++ .cvsignore 11 Jul 2008 04:12:33 -0000 1.7 @@ -1 +1 @@ -gnome-commander-1.2.7-svn1862_trunk.tar.bz2 +gnome-commander-1.2.7-svn1870_trunk.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnome-commander.spec 27 Jun 2008 18:43:36 -0000 1.20 +++ gnome-commander.spec 11 Jul 2008 04:12:33 -0000 1.21 @@ -11,7 +11,7 @@ %define use_autotool 0 %define if_pre 1 %define main_release 1 -%define extratag svn1862_trunk +%define extratag svn1870_trunk %if 0%{?if_pre} > 0 %define use_autotool 1 @@ -30,7 +30,6 @@ License: GPLv2+ URL: http://www.nongnu.org/gcmd/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2 -Source1: gcmd-ja.po BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -97,8 +96,6 @@ %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh sh autogen.sh %endif -%{__install} -cpm 0644 %SOURCE1 po/ja.po -echo "ja" >> po/LINGUAS %{__sed} -i.pylib \ -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ @@ -162,8 +159,9 @@ %{_datadir}/pixmaps/%{name}/ %changelog -* Sat Jun 28 2008 Mamoru Tasaka -- try rev 1862 +* Fri Jul 11 2008 Mamoru Tasaka +- try rev 1870 +- ja.po is merged upstream * Wed Jun 25 2008 Rex Dieter - 1.2.6-3 - respin for exiv2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Jun 2008 18:22:30 -0000 1.6 +++ sources 11 Jul 2008 04:12:33 -0000 1.7 @@ -1 +1 @@ -de2dfce2ba5ecc24aa5318792d1d2c78 gnome-commander-1.2.7-svn1862_trunk.tar.bz2 +bde0598ff6c183b478bf67f086140cbc gnome-commander-1.2.7-svn1870_trunk.tar.bz2 --- gcmd-ja.po DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 04:16:05 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 04:16:05 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.338,1.339 Message-ID: <200807110416.m6B4G5nC001175@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043 Modified Files: kdelibs.spec Log Message: BR: automoc Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.338 retrieving revision 1.339 diff -u -r1.338 -r1.339 --- kdelibs.spec 11 Jul 2008 03:57:48 -0000 1.338 +++ kdelibs.spec 11 Jul 2008 04:15:20 -0000 1.339 @@ -92,6 +92,7 @@ # we don't want a hard dependency on aspell on F9+, use enchant only BuildRequires: aspell-devel %endif +BuildRequires: automoc BuildRequires: avahi-devel BuildRequires: bzip2-devel BuildRequires: cmake @@ -148,6 +149,7 @@ Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} %endif +Requires: automoc Requires: qt4-devel Requires: openssl-devel Requires: phonon-devel From fedora-extras-commits at redhat.com Fri Jul 11 05:29:35 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 11 Jul 2008 05:29:35 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.339,1.340 Message-ID: <200807110529.m6B5TZiV017074@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16957/devel Modified Files: kdelibs.spec Log Message: Proxy patch appears to be already applied (slightly modified): http://websvn.kde.org/?view=rev&revision=829797 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.339 retrieving revision 1.340 diff -u -r1.339 -r1.340 --- kdelibs.spec 11 Jul 2008 04:15:20 -0000 1.339 +++ kdelibs.spec 11 Jul 2008 05:28:48 -0000 1.340 @@ -199,7 +199,7 @@ %patch12 -p1 -b .Administration-menu %patch13 -p1 -b .fedora-buildtype %patch14 -p1 -b .libexecdir -# FIXME -- Rex +# appears to be obsoleted by: http://websvn.kde.org/?view=rev&revision=829797 #patch15 -p1 -b .proxy %patch18 -p1 -b .kstandarddirs From fedora-extras-commits at redhat.com Fri Jul 11 06:23:19 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Fri, 11 Jul 2008 06:23:19 GMT Subject: rpms/stardict/devel stardict.spec,1.52,1.53 Message-ID: <200807110623.m6B6NJcs028346@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28281 Modified Files: stardict.spec Log Message: update prefix for configure. Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- stardict.spec 11 Jul 2008 02:44:40 -0000 1.52 +++ stardict.spec 11 Jul 2008 06:22:30 -0000 1.53 @@ -56,7 +56,7 @@ %build %{__aclocal} %{__autoconf} -%configure --disable-schemas-install --disable-festival +%configure --prefix=/usr --disable-schemas-install --disable-festival make %install From fedora-extras-commits at redhat.com Fri Jul 11 06:31:41 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Fri, 11 Jul 2008 06:31:41 GMT Subject: rpms/stardict/devel stardict.spec,1.53,1.54 Message-ID: <200807110631.m6B6VffB028802@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28744 Modified Files: stardict.spec Log Message: change prefix of configure into macro Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- stardict.spec 11 Jul 2008 06:22:30 -0000 1.53 +++ stardict.spec 11 Jul 2008 06:30:35 -0000 1.54 @@ -56,7 +56,7 @@ %build %{__aclocal} %{__autoconf} -%configure --prefix=/usr --disable-schemas-install --disable-festival +%configure --prefix=%{_prefix} --disable-schemas-install --disable-festival make %install From fedora-extras-commits at redhat.com Fri Jul 11 06:40:13 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 11 Jul 2008 06:40:13 GMT Subject: rpms/chess/devel chess.spec,1.18,1.19 Message-ID: <200807110640.m6B6eDvA029141@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/chess/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29067 Modified Files: chess.spec Log Message: * Fri Jul 11 2008 Hans de Goede 1.0-17 - Rebuild for new cegui Index: chess.spec =================================================================== RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- chess.spec 2 Jul 2008 12:23:02 -0000 1.18 +++ chess.spec 11 Jul 2008 06:39:24 -0000 1.19 @@ -1,6 +1,6 @@ Name: chess Version: 1.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: 3D chess game Group: Amusements/Games License: GPLv2+ @@ -85,6 +85,9 @@ %changelog +* Fri Jul 11 2008 Hans de Goede 1.0-17 +- Rebuild for new cegui + * Wed Jul 2 2008 Hans de Goede 1.0-16 - Rebuild for new ogre From fedora-extras-commits at redhat.com Fri Jul 11 06:41:16 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Fri, 11 Jul 2008 06:41:16 GMT Subject: rpms/sepostgresql/F-9 sepostgresql-pg_dump-8.3.3-2.patch, 1.1, 1.2 sepostgresql-sepgsql-8.3.3-2.patch, 1.1, 1.2 sepostgresql.init, 1.20, 1.21 sepostgresql.spec, 1.21, 1.22 sepostgresql-pgace-8.3.3-2.patch, 1.1, NONE Message-ID: <200807110641.m6B6fGVB029282@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28992 Modified Files: sepostgresql-pg_dump-8.3.3-2.patch sepostgresql-sepgsql-8.3.3-2.patch sepostgresql.init sepostgresql.spec Removed Files: sepostgresql-pgace-8.3.3-2.patch Log Message: - Backport features from 8.4devel tree. It contains several bug fixes, design simplification and avoidance toward M$ patent. sepostgresql-pg_dump-8.3.3-2.patch: Index: sepostgresql-pg_dump-8.3.3-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql-pg_dump-8.3.3-2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sepostgresql-pg_dump-8.3.3-2.patch 13 Jun 2008 03:57:01 -0000 1.1 +++ sepostgresql-pg_dump-8.3.3-2.patch 11 Jul 2008 06:40:31 -0000 1.2 @@ -1,13 +1,303 @@ -diff -rpNU3 pgace/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c ---- pgace/src/bin/pg_dump/pg_dump.c 2008-02-03 01:18:48.000000000 +0900 -+++ sepgsql/src/bin/pg_dump/pg_dump.c 2008-02-03 01:26:35.000000000 +0900 -@@ -118,6 +118,9 @@ static int g_numNamespaces; +diff -rpNU3 base/src/bin/pg_dump/pg_ace_dump.h sepgsql/src/bin/pg_dump/pg_ace_dump.h +--- base/src/bin/pg_dump/pg_ace_dump.h 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_ace_dump.h 2008-07-11 14:10:51.000000000 +0900 +@@ -0,0 +1,279 @@ ++#ifndef PG_ACE_DUMP_H ++#define PG_ACE_DUMP_H ++ ++#include "pg_backup.h" ++#include "pg_dump.h" ++ ++#define PG_ACE_FEATURE_NOTHING 0 ++#define PG_ACE_FEATURE_SELINUX 1 ++ ++#define SELINUX_SYSATTR_NAME "security_context" ++ ++/* ++ * pg_ace_dumpCheckServerFeature ++ * ++ * This hook checks whether the server has required feature, or not. ++ */ ++static inline void ++pg_ace_dumpCheckServerFeature(int feature, PGconn *conn) ++{ ++ const char *serv_feature; ++ ++ if (feature == PG_ACE_FEATURE_NOTHING) ++ return; ++ ++ serv_feature = PQparameterStatus(conn, "pgace_security_feature"); ++ if (!serv_feature) ++ { ++ fprintf(stderr, "could not get pgace_feature parameter.\n"); ++ exit(1); ++ } ++ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ if (strcmp(serv_feature, "selinux") != 0) ++ { ++ fprintf(stderr, "server does not have SELinux feature\n"); ++ exit(1); ++ } ++ } ++} ++ ++/* ++ * pg_ace_dumpDatabaseXXXX ++ * ++ * These hooks gives a chance to inject a security system column ++ * on dumping pg_database system catalog. ++ * A modified part must have ",d." style, and ++ * its result should be printed to buf. ++ */ ++static inline const char * ++pg_ace_dumpDatabaseQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return (",d." SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline void ++pg_ace_dumpDatabasePrint(int feature, PQExpBuffer buf, ++ PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int i_security = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *dbsecurity = PQgetvalue(res, index, i_security); ++ ++ if (dbsecurity) ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", dbsecurity); ++ } ++} ++ ++/* ++ * pg_ace_dumpClassXXXX ++ * ++ * These hooks give a chance to inject a security system column ++ * on dumping pg_class system catalog. The modified part has to ++ * be formalized to ",c." style. The result ++ * should be preserved at TableInfo->relsecurity to print later, ++ * if exist. ++ */ ++static inline const char * ++pg_ace_dumpClassQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return (",c." SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline char * ++pg_ace_dumpClassPreserve(int feature, PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int attno = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *relcontext; ++ ++ if (attno < 0) ++ return NULL; ++ ++ relcontext = PQgetvalue(res, index, attno); ++ ++ return !relcontext ? NULL : strdup(relcontext); ++ } ++ ++ return NULL; ++} ++ ++static inline void ++pg_ace_dumpClassPrint(int feature, PQExpBuffer buf, TableInfo *tbinfo) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ char *relcontext = tbinfo->relsecurity; ++ ++ if (relcontext) ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", relcontext); ++ ++ return; ++ } ++} ++ ++/* ++ * pg_ace_dumpAttributeXXXX ++ * ++ * These hooks give a chance to inject a security system column ++ * on dumping pg_attribute system catalog. The modified part has ++ * to be formalized to ",a." style. The result ++ * should be preserved at TableInfo->attsecurity[index] to print ++ * later, if exist. ++ */ ++static inline const char * ++pg_ace_dumpAttributeQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return (",a." SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline char * ++pg_ace_dumpAttributePreserve(int feature, PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int attno = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *attcontext; ++ ++ if (attno < 0) ++ return NULL; ++ ++ attcontext = PQgetvalue(res, index, attno); ++ ++ return !attcontext ? NULL : strdup(attcontext); ++ } ++ ++ return NULL; ++} ++ ++static inline void ++pg_ace_dumpAttributePrint(int feature, PQExpBuffer buf, ++ TableInfo *tbinfo, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ char *relcontext = tbinfo->relsecurity; ++ char *attcontext = tbinfo->attsecurity[index]; ++ ++ if (attcontext) ++ { ++ if (relcontext && strcmp(relcontext, attcontext) == 0) ++ return; ++ ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", attcontext); ++ } ++ return; ++ } ++} ++ ++/* ++ * pg_ace_dumpProcXXXX ++ * ++ * These hooks give a chance to inject a security system column ++ * on dumping pg_proc system catalog. The modified part has to be ++ * formalized to "" style. The result should be ++ * printed later, if exist. ++ */ ++static inline const char * ++pg_ace_dumpProcQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return ("," SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline void ++pg_ace_dumpProcPrint(int feature, PQExpBuffer buf, ++ PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int i_selinux = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *prosecurity; ++ ++ if (i_selinux < 0) ++ return; ++ ++ prosecurity = PQgetvalue(res, index, i_selinux); ++ if (prosecurity) ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", prosecurity); ++ } ++} ++ ++/* ++ * pg_ace_dumpTableDataQuery ++ * ++ * This hook gives a chance to inject a security attribute system column ++ * on dumping of user's table. ++ * It must have "," style. ++ */ ++static inline const char * ++pg_ace_dumpTableDataQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return ("," SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++/* ++ * pg_ace_dumpCopyColumnList ++ * ++ * This hook gives a chance to inject a security attribute column within ++ * COPY statement. When a column is added, you have to return true. It ++ * enables to set needComma 'true', otherwise 'false'. ++ */ ++static inline bool ++pg_ace_dumpCopyColumnList(int feature, PQExpBuffer buf) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ appendPQExpBuffer(buf, SELINUX_SYSATTR_NAME); ++ return true; ++ } ++ ++ return false; ++} ++ ++/* ++ * pg_ace_dumpBlobComments ++ * ++ * This hook gives a chance to inject a query to restore a security ++ * attribute of binary large object. ++ */ ++static inline void ++pg_ace_dumpBlobComments(int feature, Archive *AH, PGconn *conn, Oid blobOid) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ PGresult *res; ++ char query[256]; ++ ++ snprintf(query, sizeof(query), ++ "SELECT lo_get_security(%u)", blobOid); ++ res = PQexec(conn, query); ++ if (!res) ++ return; ++ ++ if (PQresultStatus(res) == PGRES_TUPLES_OK && PQntuples(res) == 1) ++ archprintf(AH, "SELECT lo_set_security(%u, '%s');\n", ++ blobOid, PQgetvalue(res, 0, 0)); ++ ++ PQclear(res); ++ } ++} ++ ++#endif +diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c +--- base/src/bin/pg_dump/pg_dump.c 2008-02-03 01:11:28.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_dump.c 2008-07-11 14:10:51.000000000 +0900 +@@ -50,6 +50,7 @@ int optreset; + + #include "pg_backup_archiver.h" + #include "dumputils.h" ++#include "pg_ace_dump.h" + + extern char *optarg; + extern int optind, +@@ -118,6 +119,8 @@ static int g_numNamespaces; /* flag to turn on/off dollar quoting */ static int disable_dollar_quoting = 0; -+/* flag to tuen on/off SE-PostgreSQL support */ -+#define SELINUX_SYSATTR_NAME "security_context" -+static int enable_selinux = 0; ++/* flag to turn on/off security attribute support */ ++static int pg_ace_feature = PG_ACE_FEATURE_NOTHING; static void help(const char *progname); static void expand_schema_name_patterns(SimpleStringList *patterns, @@ -15,7 +305,7 @@ {"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1}, {"disable-triggers", no_argument, &disable_triggers, 1}, {"use-set-session-authorization", no_argument, &use_setsessauth, 1}, -+ {"enable-selinux", no_argument, &enable_selinux, 1}, ++ {"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX}, {NULL, 0, NULL, 0} }; @@ -23,79 +313,45 @@ disable_triggers = 1; else if (strcmp(optarg, "use-set-session-authorization") == 0) use_setsessauth = 1; -+ else if (strcmp(optarg, "enable-selinux") == 0) -+ enable_selinux = 1; ++ else if (strcmp(optarg, "security-context") == 0) ++ pg_ace_feature = PG_ACE_FEATURE_SELINUX; else { fprintf(stderr, -@@ -549,6 +555,24 @@ main(int argc, char **argv) +@@ -549,6 +555,8 @@ main(int argc, char **argv) std_strings = PQparameterStatus(g_conn, "standard_conforming_strings"); g_fout->std_strings = (std_strings && strcmp(std_strings, "on") == 0); -+ if (enable_selinux) { -+ /* confirm whther server support SELinux features */ -+ const char *tmp = PQparameterStatus(g_conn, "security_sysattr_name"); -+ -+ if (!tmp) { -+ write_msg(NULL, "could not get security_sysattr_name from libpq\n"); -+ exit(1); -+ } -+ if (!!strcmp(SELINUX_SYSATTR_NAME, tmp) != 0) { -+ write_msg(NULL, "server does not have SELinux feature\n"); -+ exit(1); -+ } -+ if (g_fout->remoteVersion < 80204) { -+ write_msg(NULL, "server version is too old (%u)\n", g_fout->remoteVersion); -+ exit(1); -+ } -+ } ++ pg_ace_dumpCheckServerFeature(pg_ace_feature, g_conn); + /* Set the datestyle to ISO to ensure the dump's portability */ do_sql_command(g_conn, "SET DATESTYLE = ISO"); -@@ -771,6 +795,7 @@ help(const char *progname) +@@ -771,6 +779,7 @@ help(const char *progname) printf(_(" --use-set-session-authorization\n" " use SESSION AUTHORIZATION commands instead of\n" " ALTER OWNER commands to set ownership\n")); -+ printf(_(" --enable-selinux enable to dump security context in SE-PostgreSQL\n")); ++ printf(_(" --security-context enable to dump security context of SE-PostgreSQL\n")); printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); -@@ -1160,7 +1185,8 @@ dumpTableData_insert(Archive *fout, void +@@ -1160,7 +1169,8 @@ dumpTableData_insert(Archive *fout, void if (fout->remoteVersion >= 70100) { appendPQExpBuffer(q, "DECLARE _pg_dump_cursor CURSOR FOR " - "SELECT * FROM ONLY %s", + "SELECT * %s FROM ONLY %s", -+ (!enable_selinux ? "" : "," SELINUX_SYSATTR_NAME), ++ pg_ace_dumpTableDataQuery(pg_ace_feature), fmtQualifiedId(tbinfo->dobj.namespace->dobj.name, classname)); } -@@ -1774,11 +1800,32 @@ dumpBlobComments(Archive *AH, void *arg) +@@ -1774,11 +1784,14 @@ dumpBlobComments(Archive *AH, void *arg) Oid blobOid; char *comment; + blobOid = atooid(PQgetvalue(res, i, 0)); + -+ /* dump security context of binary large object */ -+ if (enable_selinux) { -+ PGresult *__res; -+ char query[512]; -+ -+ snprintf(query, sizeof(query), -+ "SELECT lo_get_security(%u)", blobOid); -+ __res = PQexec(g_conn, query); -+ check_sql_result(__res, g_conn, query, PGRES_TUPLES_OK); -+ -+ if (PQntuples(__res) != 1) { -+ write_msg(NULL, "lo_get_security(%u) returns %d tuples\n", -+ blobOid, PQntuples(__res)); -+ exit_nicely(); -+ } -+ archprintf(AH, "SELECT lo_set_security(%u, '%s');\n", -+ blobOid, PQgetvalue(__res, 0, 0)); -+ PQclear(__res); -+ } ++ pg_ace_dumpBlobComments(pg_ace_feature, AH, g_conn, blobOid); + /* ignore blobs without comments */ if (PQgetisnull(res, i, 1)) @@ -105,15 +361,7 @@ comment = PQgetvalue(res, i, 1); printfPQExpBuffer(commentcmd, "COMMENT ON LARGE OBJECT %u IS ", -@@ -2886,6 +2933,7 @@ getTables(int *numTables) - int i_owning_col; - int i_reltablespace; - int i_reloptions; -+ int i_selinux; - - /* Make sure we are in proper schema */ - selectSourceSchema("pg_catalog"); -@@ -2926,6 +2974,7 @@ getTables(int *numTables) +@@ -2926,6 +2939,7 @@ getTables(int *numTables) "d.refobjsubid as owning_col, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "array_to_string(c.reloptions, ', ') as reloptions " @@ -121,41 +369,23 @@ "from pg_class c " "left join pg_depend d on " "(c.relkind = '%c' and " -@@ -2935,6 +2984,7 @@ getTables(int *numTables) +@@ -2935,6 +2949,7 @@ getTables(int *numTables) "where relkind in ('%c', '%c', '%c', '%c') " "order by c.oid", username_subquery, -+ (!enable_selinux ? "" : ",c." SELINUX_SYSATTR_NAME), ++ pg_ace_dumpClassQuery(pg_ace_feature), RELKIND_SEQUENCE, RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW, RELKIND_COMPOSITE_TYPE); -@@ -3101,6 +3151,7 @@ getTables(int *numTables) - i_owning_col = PQfnumber(res, "owning_col"); - i_reltablespace = PQfnumber(res, "reltablespace"); - i_reloptions = PQfnumber(res, "reloptions"); -+ i_selinux = PQfnumber(res, SELINUX_SYSATTR_NAME); - - for (i = 0; i < ntups; i++) - { -@@ -3131,6 +3182,9 @@ getTables(int *numTables) +@@ -3131,6 +3146,7 @@ getTables(int *numTables) } tblinfo[i].reltablespace = strdup(PQgetvalue(res, i, i_reltablespace)); tblinfo[i].reloptions = strdup(PQgetvalue(res, i, i_reloptions)); -+ tblinfo[i].relsecurity = NULL; -+ if (i_selinux >= 0) -+ tblinfo[i].relsecurity = strdup(PQgetvalue(res, i, i_selinux)); ++ tblinfo[i].relsecurity = pg_ace_dumpClassPreserve(pg_ace_feature, res, i); /* other fields were zeroed above */ -@@ -4319,6 +4373,7 @@ getTableAttrs(TableInfo *tblinfo, int nu - int i_atthasdef; - int i_attisdropped; - int i_attislocal; -+ int i_attselinux; - PGresult *res; - int ntups; - bool hasdefaults; -@@ -4362,11 +4417,13 @@ getTableAttrs(TableInfo *tblinfo, int nu +@@ -4362,11 +4378,13 @@ getTableAttrs(TableInfo *tblinfo, int nu appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, a.attstattarget, a.attstorage, t.typstorage, " "a.attnotnull, a.atthasdef, a.attisdropped, a.attislocal, " "pg_catalog.format_type(t.oid,a.atttypmod) as atttypname " @@ -165,19 +395,11 @@ "where a.attrelid = '%u'::pg_catalog.oid " "and a.attnum > 0::pg_catalog.int2 " "order by a.attrelid, a.attnum", -+ (!enable_selinux ? "" : ",a." SELINUX_SYSATTR_NAME), ++ pg_ace_dumpAttributeQuery(pg_ace_feature), tbinfo->dobj.catId.oid); } else if (g_fout->remoteVersion >= 70100) -@@ -4415,6 +4472,7 @@ getTableAttrs(TableInfo *tblinfo, int nu - i_atthasdef = PQfnumber(res, "atthasdef"); - i_attisdropped = PQfnumber(res, "attisdropped"); - i_attislocal = PQfnumber(res, "attislocal"); -+ i_attselinux = PQfnumber(res, SELINUX_SYSATTR_NAME); - - tbinfo->numatts = ntups; - tbinfo->attnames = (char **) malloc(ntups * sizeof(char *)); -@@ -4425,6 +4483,7 @@ getTableAttrs(TableInfo *tblinfo, int nu +@@ -4425,6 +4443,7 @@ getTableAttrs(TableInfo *tblinfo, int nu tbinfo->typstorage = (char *) malloc(ntups * sizeof(char)); tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool)); tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool)); @@ -185,97 +407,67 @@ tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool)); tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *)); tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool)); -@@ -4456,6 +4515,11 @@ getTableAttrs(TableInfo *tblinfo, int nu +@@ -4456,6 +4475,8 @@ getTableAttrs(TableInfo *tblinfo, int nu tbinfo->inhAttrs[j] = false; tbinfo->inhAttrDef[j] = false; tbinfo->inhNotNull[j] = false; + -+ /* security attribute, if defined */ -+ tbinfo->attsecurity[j] = NULL; -+ if (i_attselinux >= 0 && !PQgetisnull(res, j, i_attselinux)) -+ tbinfo->attsecurity[j] = strdup(PQgetvalue(res, j, i_attselinux)); ++ tbinfo->attsecurity[j] = pg_ace_dumpAttributePreserve(pg_ace_feature, res, j); } PQclear(res); -@@ -6428,6 +6492,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) - char *proconfig; - char *procost; - char *prorows; -+ char *proselinux = NULL; - char *lanname; - char *rettypename; - int nallargs; -@@ -6459,8 +6524,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -6459,8 +6480,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "provolatile, proisstrict, prosecdef, " "proconfig, procost, prorows, " "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname " + "%s " /* security context, if required */ "FROM pg_catalog.pg_proc " "WHERE oid = '%u'::pg_catalog.oid", -+ (!enable_selinux ? "" : "," SELINUX_SYSATTR_NAME), ++ pg_ace_dumpProcQuery(pg_ace_feature), finfo->dobj.catId.oid); } else if (g_fout->remoteVersion >= 80100) -@@ -6562,6 +6629,13 @@ dumpFunc(Archive *fout, FuncInfo *finfo) - prorows = PQgetvalue(res, 0, PQfnumber(res, "prorows")); - lanname = PQgetvalue(res, 0, PQfnumber(res, "lanname")); - -+ if (enable_selinux) { -+ int i_selinux = PQfnumber(res, "security_context"); -+ -+ if (i_selinux >= 0 && !PQgetisnull(res, 0, i_selinux)) -+ proselinux = PQgetvalue(res, 0, i_selinux); -+ } -+ - /* - * See backend/commands/define.c for details of how the 'AS' clause is - * used. -@@ -6698,6 +6772,9 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -6698,6 +6721,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo) if (prosecdef[0] == 't') appendPQExpBuffer(q, " SECURITY DEFINER"); -+ if (proselinux) -+ appendPQExpBuffer(q, " CONTEXT = '%s'", proselinux); ++ pg_ace_dumpProcPrint(pg_ace_feature, q, res, 0); + /* * COST and ROWS are emitted only if present and not default, so as not to * break backwards-compatibility of the dump without need. Keep this code -@@ -8779,6 +8856,9 @@ dumpTableSchema(Archive *fout, TableInfo +@@ -8779,6 +8804,8 @@ dumpTableSchema(Archive *fout, TableInfo if (tbinfo->notnull[j] && !tbinfo->inhNotNull[j]) appendPQExpBuffer(q, " NOT NULL"); -+ if (enable_selinux && tbinfo->attsecurity[j]) -+ appendPQExpBuffer(q, " CONTEXT = '%s'", tbinfo->attsecurity[j]); ++ pg_ace_dumpAttributePrint(pg_ace_feature, q, tbinfo, j); + actual_atts++; } } -@@ -8826,6 +8906,9 @@ dumpTableSchema(Archive *fout, TableInfo +@@ -8826,6 +8853,8 @@ dumpTableSchema(Archive *fout, TableInfo if (tbinfo->reloptions && strlen(tbinfo->reloptions) > 0) appendPQExpBuffer(q, "\nWITH (%s)", tbinfo->reloptions); -+ if (enable_selinux && tbinfo->relsecurity) -+ appendPQExpBuffer(q, " CONTEXT = '%s'", tbinfo->relsecurity); ++ pg_ace_dumpClassPrint(pg_ace_feature, q, tbinfo); + appendPQExpBuffer(q, ";\n"); /* Loop dumping statistics and storage statements */ -@@ -10243,6 +10326,12 @@ fmtCopyColumnList(const TableInfo *ti) +@@ -10243,6 +10272,10 @@ fmtCopyColumnList(const TableInfo *ti) appendPQExpBuffer(q, "("); needComma = false; + -+ if (enable_selinux) { -+ appendPQExpBuffer(q, SELINUX_SYSATTR_NAME); ++ if (pg_ace_dumpCopyColumnList(pg_ace_feature, q)) + needComma = true; -+ } + for (i = 0; i < numatts; i++) { if (attisdropped[i]) -diff -rpNU3 pgace/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h ---- pgace/src/bin/pg_dump/pg_dump.h 2008-01-08 01:39:49.000000000 +0900 -+++ sepgsql/src/bin/pg_dump/pg_dump.h 2008-01-10 18:25:12.000000000 +0900 +diff -rpNU3 base/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h +--- base/src/bin/pg_dump/pg_dump.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_dump.h 2008-06-15 22:27:55.000000000 +0900 @@ -238,6 +238,7 @@ typedef struct _tableInfo char relkind; char *reltablespace; /* relation tablespace */ @@ -292,16 +484,23 @@ /* * Note: we need to store per-attribute notnull, default, and constraint -diff -rpNU3 pgace/src/bin/pg_dump/pg_dumpall.c sepgsql/src/bin/pg_dump/pg_dumpall.c ---- pgace/src/bin/pg_dump/pg_dumpall.c 2008-01-08 01:39:49.000000000 +0900 -+++ sepgsql/src/bin/pg_dump/pg_dumpall.c 2008-01-10 18:25:12.000000000 +0900 -@@ -67,6 +67,10 @@ static int disable_triggers = 0; +diff -rpNU3 base/src/bin/pg_dump/pg_dumpall.c sepgsql/src/bin/pg_dump/pg_dumpall.c +--- base/src/bin/pg_dump/pg_dumpall.c 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_dumpall.c 2008-07-11 14:10:51.000000000 +0900 +@@ -27,6 +27,7 @@ int optreset; + #endif + + #include "dumputils.h" ++#include "pg_ace_dump.h" + + + /* version string we expect back from pg_dump */ +@@ -67,6 +68,9 @@ static int disable_triggers = 0; static int use_setsessauth = 0; static int server_version; -+/* flag to tuen on/off SE-PostgreSQL support */ -+#define SELINUX_SYSATTR_NAME "security_context" -+static int enable_selinux = 0; ++/* flag to turn on/off security attribute support */ ++static int pg_ace_feature = PG_ACE_FEATURE_NOTHING; + static FILE *OPF; static char *filename = NULL; @@ -310,67 +509,46 @@ {"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1}, {"disable-triggers", no_argument, &disable_triggers, 1}, {"use-set-session-authorization", no_argument, &use_setsessauth, 1}, -+ {"enable-selinux", no_argument, NULL, 1001}, ++ {"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX}, {NULL, 0, NULL, 0} }; -@@ -290,6 +295,10 @@ main(int argc, char *argv[]) +@@ -290,6 +295,8 @@ main(int argc, char *argv[]) appendPQExpBuffer(pgdumpopts, " --disable-triggers"); else if (strcmp(optarg, "use-set-session-authorization") == 0) /* no-op, still allowed for compatibility */ ; -+ else if (strcmp(optarg, "enable-selinux") == 0) { -+ appendPQExpBuffer(pgdumpopts, " --enable-selinux"); -+ enable_selinux = 1; -+ } ++ else if (strcmp(optarg, "security-context") == 0) ++ pg_ace_feature = PG_ACE_FEATURE_SELINUX; else { fprintf(stderr, -@@ -300,6 +309,11 @@ main(int argc, char *argv[]) - } - break; - -+ case 1001: -+ appendPQExpBuffer(pgdumpopts, " --enable-selinux"); -+ enable_selinux = 1; -+ break; -+ - case 0: - break; +@@ -316,6 +323,8 @@ main(int argc, char *argv[]) + appendPQExpBuffer(pgdumpopts, " --disable-triggers"); + if (use_setsessauth) + appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization"); ++ if (pg_ace_feature == PG_ACE_FEATURE_SELINUX) ++ appendPQExpBuffer(pgdumpopts, " --security-context"); -@@ -391,6 +405,24 @@ main(int argc, char *argv[]) + if (optind < argc) + { +@@ -391,6 +400,8 @@ main(int argc, char *argv[]) } } -+ if (enable_selinux) { -+ /* confirm whther server support SELinux features */ -+ const char *tmp = PQparameterStatus(conn, "security_sysattr_name"); -+ -+ if (!tmp) { -+ fprintf(stderr, "could not get security_sysattr_name from libpq\n"); -+ exit(1); -+ } -+ if (!!strcmp(SELINUX_SYSATTR_NAME, tmp) != 0) { -+ fprintf(stderr, "server does not have SELinux feature\n"); -+ exit(1); -+ } -+ if (server_version < 80204) { -+ fprintf(stderr, "server version is too old (%u)\n", server_version); -+ exit(1); -+ } -+ } ++ pg_ace_dumpCheckServerFeature(pg_ace_feature, conn); + /* * Open the output file if required, otherwise use stdout */ -@@ -505,6 +537,7 @@ help(void) +@@ -505,6 +516,7 @@ help(void) printf(_(" --use-set-session-authorization\n" " use SESSION AUTHORIZATION commands instead of\n" " OWNER TO commands\n")); -+ printf(_(" --enable-selinux enable to dump security attribute\n")); ++ printf(_(" --security-context enables to dump security context of SE-PostgreSQL\n")); printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); -@@ -915,16 +948,18 @@ dumpCreateDB(PGconn *conn) +@@ -915,16 +927,18 @@ dumpCreateDB(PGconn *conn) fprintf(OPF, "--\n-- Database creation\n--\n\n"); if (server_version >= 80100) @@ -385,14 +563,14 @@ "FROM pg_database d LEFT JOIN pg_authid u ON (datdba = u.oid) " - "WHERE datallowconn ORDER BY 1"); + "WHERE datallowconn ORDER BY 1", -+ (!enable_selinux ? "" : "d." SELINUX_SYSATTR_NAME)); ++ pg_ace_dumpDatabaseQuery(pg_ace_feature)); else if (server_version >= 80000) - res = executeQuery(conn, + appendPQExpBuffer(buf, "SELECT datname, " "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), " "pg_encoding_to_char(d.encoding), " -@@ -933,7 +968,7 @@ dumpCreateDB(PGconn *conn) +@@ -933,7 +947,7 @@ dumpCreateDB(PGconn *conn) "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) " "WHERE datallowconn ORDER BY 1"); else if (server_version >= 70300) @@ -401,7 +579,7 @@ "SELECT datname, " "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), " "pg_encoding_to_char(d.encoding), " -@@ -942,7 +977,7 @@ dumpCreateDB(PGconn *conn) +@@ -942,7 +956,7 @@ dumpCreateDB(PGconn *conn) "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) " "WHERE datallowconn ORDER BY 1"); else if (server_version >= 70100) @@ -410,7 +588,7 @@ "SELECT datname, " "coalesce(" "(select usename from pg_shadow where usesysid=datdba), " -@@ -958,7 +993,7 @@ dumpCreateDB(PGconn *conn) +@@ -958,7 +972,7 @@ dumpCreateDB(PGconn *conn) * Note: 7.0 fails to cope with sub-select in COALESCE, so just deal * with getting a NULL by not printing any OWNER clause. */ @@ -419,7 +597,7 @@ "SELECT datname, " "(select usename from pg_shadow where usesysid=datdba), " "pg_encoding_to_char(d.encoding), " -@@ -968,6 +1003,7 @@ dumpCreateDB(PGconn *conn) +@@ -968,6 +982,7 @@ dumpCreateDB(PGconn *conn) "FROM pg_database d " "ORDER BY 1"); } @@ -427,20 +605,11 @@ for (i = 0; i < PQntuples(res); i++) { -@@ -978,6 +1014,7 @@ dumpCreateDB(PGconn *conn) - char *dbacl = PQgetvalue(res, i, 4); - char *dbconnlimit = PQgetvalue(res, i, 5); - char *dbtablespace = PQgetvalue(res, i, 6); -+ char *dbsecurity = PQgetvalue(res, i, 7); - char *fdbname; - - fdbname = strdup(fmtId(dbname)); -@@ -1021,6 +1058,9 @@ dumpCreateDB(PGconn *conn) +@@ -1021,6 +1036,8 @@ dumpCreateDB(PGconn *conn) appendPQExpBuffer(buf, " CONNECTION LIMIT = %s", dbconnlimit); -+ if (enable_selinux && dbsecurity) -+ appendPQExpBuffer(buf, " CONTEXT = '%s'", dbsecurity); ++ pg_ace_dumpDatabasePrint(pg_ace_feature, buf, res, i); + appendPQExpBuffer(buf, ";\n"); sepostgresql-sepgsql-8.3.3-2.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 sepostgresql-sepgsql-8.3.3-2.patch Index: sepostgresql-sepgsql-8.3.3-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql-sepgsql-8.3.3-2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sepostgresql-sepgsql-8.3.3-2.patch 13 Jun 2008 03:57:01 -0000 1.1 +++ sepostgresql-sepgsql-8.3.3-2.patch 11 Jul 2008 06:40:32 -0000 1.2 @@ -1,6 +1,6 @@ -diff -rpNU3 pgace/configure sepgsql/configure ---- pgace/configure 2008-06-12 23:48:15.000000000 +0900 -+++ sepgsql/configure 2008-06-12 23:52:36.000000000 +0900 +diff -rpNU3 base/configure sepgsql/configure +--- base/configure 2008-06-12 23:42:03.000000000 +0900 ++++ sepgsql/configure 2008-06-14 02:36:58.000000000 +0900 @@ -314,7 +314,7 @@ ac_includes_default="\ # include #endif" @@ -18,7 +18,7 @@ --disable-largefile omit support for large files Optional Packages: -@@ -4619,6 +4620,118 @@ fi; +@@ -4619,6 +4620,120 @@ fi; # @@ -116,11 +116,13 @@ +echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getpeercon" >&5 +echo "${ECHO_T}$ac_cv_lib_selinux_getpeercon" >&6 +if test $ac_cv_lib_selinux_getpeercon = yes; then -+ cat >>confdefs.h <<\_ACEOF ++ ++cat >>confdefs.h <<\_ACEOF +#define SECURITY_SYSATTR_NAME "security_context" +_ACEOF + -+ cat >>confdefs.h <<_ACEOF ++ ++cat >>confdefs.h <<_ACEOF +#define HAVE_SELINUX 1 +_ACEOF + @@ -137,7 +139,7 @@ # Elf # -@@ -26006,6 +26119,7 @@ s, at with_libxml@,$with_libxml,;t t +@@ -26006,6 +26121,7 @@ s, at with_libxml@,$with_libxml,;t t s, at with_libxslt@,$with_libxslt,;t t s, at with_system_tzdata@,$with_system_tzdata,;t t s, at with_zlib@,$with_zlib,;t t @@ -145,10 +147,10 @@ s, at EGREP@,$EGREP,;t t s, at ELF_SYS@,$ELF_SYS,;t t s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t -diff -rpNU3 pgace/configure.in sepgsql/configure.in ---- pgace/configure.in 2008-06-12 23:48:15.000000000 +0900 -+++ sepgsql/configure.in 2008-06-12 23:52:36.000000000 +0900 -@@ -626,6 +626,19 @@ PGAC_ARG_BOOL(with, zlib, yes, +diff -rpNU3 base/configure.in sepgsql/configure.in +--- base/configure.in 2008-06-12 23:42:03.000000000 +0900 ++++ sepgsql/configure.in 2008-06-14 02:36:58.000000000 +0900 +@@ -626,6 +626,21 @@ PGAC_ARG_BOOL(with, zlib, yes, AC_SUBST(with_zlib) # @@ -158,8 +160,10 @@ + [ --enable-selinux build with NSA SELinux support]) +if test "$enable_selinux" = yes; then + AC_CHECK_LIB(selinux, getpeercon, -+ AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context") -+ AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1) ++ AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context", ++ [Enables system column for security attribute support]) ++ AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1, ++ [Enables SE-PostgreSQL feature]) + AC_SUBST(enable_selinux), + AC_MSG_ERROR("--enable-selinux requires libselinux.")) +fi @@ -168,9 +172,792 @@ # Elf # -diff -rpNU3 pgace/src/Makefile.global.in sepgsql/src/Makefile.global.in ---- pgace/src/Makefile.global.in 2007-11-18 02:56:38.000000000 +0900 -+++ sepgsql/src/Makefile.global.in 2007-11-22 23:10:13.000000000 +0900 +diff -rpNU3 base/contrib/sepgsql_policy/Makefile sepgsql/contrib/sepgsql_policy/Makefile +--- base/contrib/sepgsql_policy/Makefile 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/Makefile 2008-06-26 11:44:44.000000000 +0900 +@@ -0,0 +1,40 @@ ++# ++# contrib/sepgsql_policy/Makefile ++# Makefile of security policy module for SE-PostgreSQL ++# ++top_builddir = ../.. ++include $(top_builddir)/src/Makefile.global ++ ++policy_basedir := /usr/share/selinux ++policy_makefile := $(policy_basedir)/devel/Makefile ++policy_types := targeted mls ++policy := $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)) ++package_names := sepostgresql sepostgresql-devel ++prefix_ptn := "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g" ++bindir_ptn := "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g" ++libdir_ptn := "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g" ++ ++all: ++ $(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;)) ++ $(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;) ++ ++.install-policy: ++ test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy) ++ $(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;) ++ ++install: all ++ $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;) ++ ++%.pp: %.te %.if %.fc ++ $(MAKE) NAME=$(policy) -f $(policy_makefile) $@ ++ mv $@ $@.$(policy) ++ ++sepostgresql-devel.fc: sepostgresql.fc.template ++ cat $< | grep -v ^/var | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ ++ ++sepostgresql.fc: sepostgresql.fc.template ++ cat $< | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ ++ ++clean: ++ $(MAKE) -f $(policy_makefile) clean ++ rm -f *.pp.* *.fc +diff -rpNU3 base/contrib/sepgsql_policy/README sepgsql/contrib/sepgsql_policy/README +--- base/contrib/sepgsql_policy/README 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/README 2008-06-19 13:12:15.000000000 +0900 +@@ -0,0 +1,50 @@ ++The security policy module of SE-PostgreSQL ++------------------------------------------- ++ ++o Introduction ++ ++ We provide two kind of security policy modules. ++ ++ One is "sepostgresql.pp" which contains full-set of security policy ++ and suitable for legacy base policy (selinux-policy-3.4.1, or prior). ++ ++ The other is "sepostgresql-devel.pp" which provides several booleans ++ for developers, and suitable for newer base policy (selinux-policy-3.4.2, ++ or later). ++ ++ In the selinux-policy-3.4.2, most part of the policy got upstreamed. ++ So, we don't need to install "sepostgresql.pp" explicitly on the newer ++ base security policy. ++ ++ If you need to run regression test, or (don't) want to generate access ++ logs, install "sepostgresql-devel.pp" and turn on/off booleans. ++ ++o Build & Installation ++ ++ $ cd contrib/sepgsql_policy ++ $ make ++ $ su ++ # /usr/sbin/semodule -i sepostgresql-devel.pp ++ or ++ # /usr/sbin/semodule -i sepostgresql.pp ++ ++o Booleans ++ ++- sepgsql_enable_users_ddl (default: on) ++ This boolean enables to control to execute DDL statement come from ++ confined users. ++ ++- sepgsql_enable_auditallow (default: off) ++ This boolean enables to generate access allow logs except for tuple ++ level. ++ ++- sepgsql_enable_auditdeny (default: on) ++ This boolean enables to generata access denied logs except for tuple ++ level. ++ ++- sepgsql_regression_test_mode (default: off) ++ This boolean provides several permission to run regression test on ++ your home directory. It enables to load shared library files deployed ++ on home directory. ++ However, we don't recommend it to turn on in the operation phase. ++ +diff -rpNU3 base/contrib/sepgsql_policy/sepostgresql-devel.if sepgsql/contrib/sepgsql_policy/sepostgresql-devel.if +--- base/contrib/sepgsql_policy/sepostgresql-devel.if 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/sepostgresql-devel.if 2008-06-19 13:12:15.000000000 +0900 +@@ -0,0 +1 @@ ++## There are no interface declaration +diff -rpNU3 base/contrib/sepgsql_policy/sepostgresql-devel.te sepgsql/contrib/sepgsql_policy/sepostgresql-devel.te +--- base/contrib/sepgsql_policy/sepostgresql-devel.te 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/sepostgresql-devel.te 2008-06-26 11:44:44.000000000 +0900 +@@ -0,0 +1,82 @@ ++policy_module(sepostgresql-devel, 3.11) ++ ++gen_require(` ++ class db_database all_db_database_perms; ++ class db_table all_db_table_perms; ++ class db_procedure all_db_procedure_perms; [...14689 lines suppressed...] ++extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple, void **pgaceItem); ++ ++extern void sepgsqlLargeObjectRead(LargeObjectDesc *lodesc, int length); ++ ++extern void sepgsqlLargeObjectWrite(LargeObjectDesc *lodesc, int length); ++ ++extern void sepgsqlLargeObjectTruncate(LargeObjectDesc *lodesc, int offset); ++ ++extern void sepgsqlLargeObjectImport(Oid loid, int fdesc, const char *filename); ++ ++extern void sepgsqlLargeObjectExport(Oid loid, int fdesc, const char *filename); ++ ++extern void sepgsqlLargeObjectGetSecurity(Relation rel, HeapTuple tuple); ++ ++extern void sepgsqlLargeObjectSetSecurity(Relation rel, HeapTuple newtup, HeapTuple oldtup); + +/* Security Label hooks */ -+extern char *sepgsqlSecurityLabelIn(char *context); -+extern char *sepgsqlSecurityLabelOut(char *context); -+extern char *sepgsqlSecurityLabelCheckValid(char *context); -+extern char *sepgsqlSecurityLabelOfLabel(char *context); -+ -+/* Extended node type hooks */ -+extern Node *sepgsqlCopyObject(Node *node); -+extern bool sepgsqlOutObject(StringInfo str, Node *node); -+extern void *sepgsqlReadObject(char *token); ++extern char *sepgsqlTranslateSecurityLabelIn(char *context); ++ ++extern char *sepgsqlTranslateSecurityLabelOut(char *context); ++ ++extern char *sepgsqlValidateSecurityLabel(char *context); ++ ++extern char *sepgsqlSecurityLabelOfLabel(void); + +/* + * SE-PostgreSQL core functions -+ * src/backend/security/sepgsql/core.c ++ * src/backend/security/sepgsql/core.c ++ */ ++extern bool sepgsqlIsEnabled(void); ++ ++extern const security_context_t sepgsqlGetServerContext(void); ++ ++extern const security_context_t sepgsqlGetClientContext(void); ++ ++extern const security_context_t sepgsqlGetDatabaseContext(void); ++ ++extern const security_context_t sepgsqlGetUnlabeledContext(void); ++ ++extern const security_context_t sepgsqlSwitchClientContext(security_context_t newcon); ++ ++extern Oid sepgsqlGetDatabaseSecurityId(void); ++ ++/* ++ * SE-PostgreSQL userspace avc functions ++ * src/backend/security/sepgsql/avc.c + */ -+extern bool sepgsqlIsEnabled(void); -+extern Oid sepgsqlGetServerContext(void); -+extern Oid sepgsqlGetClientContext(void); -+extern void sepgsqlSetClientContext(Oid new_ctx); -+extern Oid sepgsqlGetDatabaseContext(void); -+extern char *sepgsqlGetDatabaseName(void); -+ -+/* userspace access vector cache related */ -+extern void sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass, -+ uint32 perms, char *objname); -+extern bool sepgsql_avc_permission_noabort(Oid ssid, Oid tsid, uint16 tclass, -+ uint32 perms, char *objname); -+extern Oid sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass); -+extern Oid sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass); ++extern void sepgsqlAvcInit(void); ++ ++extern bool sepgsqlAvcPermission(const security_context_t scon, ++ const security_context_t tcon, ++ security_class_t tclass, ++ access_vector_t perms, ++ const char *objname, ++ bool abort); ++ ++extern bool sepgsqlAvcPermissionSid(const security_context_t scon, ++ Oid tsid, ++ security_class_t tclass, ++ access_vector_t perms, ++ const char *objname, ++ bool abort); ++ ++extern security_context_t sepgsqlAvcCreateCon(const security_context_t scon, ++ const security_context_t tcon, ++ security_class_t tclass); ++ ++extern Oid sepgsqlAvcCreateConSid(const security_context_t scon, ++ Oid tsid, ++ security_class_t tclass); + +/* + * SE-PostgreSQL permission evaluation related -+ * src/backend/security/sepgsql/permission.c ++ * src/backend/security/sepgsql/permission.c + */ -+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple, NameData *name); -+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple); -+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup, -+ uint32 perms, bool abort); ++extern const char *sepgsqlTupleName(Oid relid, HeapTuple tuple); ++ ++extern void sepgsqlSetDefaultContext(Relation rel, HeapTuple tuple); ++ ++extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, ++ HeapTuple oldtup, uint32 perms, bool abort); ++ +/* + * SE-PostgreSQL SQL FUNCTIONS + */ +extern Datum sepgsql_getcon(PG_FUNCTION_ARGS); -+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS); -+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS); -+ -+#endif /* SEPGSQL_H */ ++extern Datum sepgsql_getservcon(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_user(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_role(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_type(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_range(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_user(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_role(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_type(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_range(PG_FUNCTION_ARGS); ++ ++#endif /* SEPGSQL_H */ +diff -rpNU3 base/src/include/storage/fd.h sepgsql/src/include/storage/fd.h +--- base/src/include/storage/fd.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/storage/fd.h 2008-06-14 02:36:58.000000000 +0900 +@@ -67,6 +67,7 @@ extern int FileWrite(File file, char *bu + extern int FileSync(File file); + extern long FileSeek(File file, long offset, int whence); + extern int FileTruncate(File file, long offset); ++extern int FileRawDescriptor(File file); + + /* Operations that allow use of regular stdio --- USE WITH CAUTION */ + extern FILE *AllocateFile(const char *name, const char *mode); +diff -rpNU3 base/src/include/storage/lwlock.h sepgsql/src/include/storage/lwlock.h +--- base/src/include/storage/lwlock.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/storage/lwlock.h 2008-06-14 02:36:58.000000000 +0900 +@@ -63,6 +63,7 @@ typedef enum LWLockId + AutovacuumLock, + AutovacuumScheduleLock, + SyncScanLock, ++ SepgsqlAvcLock, + /* Individual lock IDs end here */ + FirstBufMappingLock, + FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS, +diff -rpNU3 base/src/include/utils/catcache.h sepgsql/src/include/utils/catcache.h +--- base/src/include/utils/catcache.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/utils/catcache.h 2008-06-14 02:36:58.000000000 +0900 +@@ -172,6 +172,7 @@ extern HeapTuple SearchCatCache(CatCache + Datum v1, Datum v2, + Datum v3, Datum v4); + extern void ReleaseCatCache(HeapTuple tuple); ++extern void InsertCatCache(CatCache *cache, HeapTuple tuple); + + extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys, + Datum v1, Datum v2, +diff -rpNU3 base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h +--- base/src/include/utils/errcodes.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/utils/errcodes.h 2008-06-14 02:36:58.000000000 +0900 +@@ -339,6 +339,12 @@ + #define ERRCODE_NO_DATA_FOUND MAKE_SQLSTATE('P','0', '0','0','2') + #define ERRCODE_TOO_MANY_ROWS MAKE_SQLSTATE('P','0', '0','0','3') + ++/* Class SE - Security Error (PGACE/SE-PostgreSQL error class) */ ++#define ERRCODE_PGACE_ERROR MAKE_SQLSTATE('S','E', '0','0','0') ++#define ERRCODE_SELINUX_ERROR MAKE_SQLSTATE('S','E', '0','0','1') ++#define ERRCODE_SELINUX_AUDIT MAKE_SQLSTATE('S','E', '0','0','2') ++#define ERRCODE_SELINUX_INFO MAKE_SQLSTATE('S','E', '0','0','3') ++ + /* Class XX - Internal Error (PostgreSQL-specific error class) */ + /* (this is for "can't-happen" conditions and software bugs) */ + #define ERRCODE_INTERNAL_ERROR MAKE_SQLSTATE('X','X', '0','0','0') +diff -rpNU3 base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h +--- base/src/include/utils/syscache.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/utils/syscache.h 2008-06-14 02:36:58.000000000 +0900 +@@ -76,6 +76,8 @@ + #define TSTEMPLATEOID 45 + #define TYPENAMENSP 46 + #define TYPEOID 47 ++#define SECURITYOID 48 ++#define SECURITYLABEL 49 + + extern void InitCatalogCache(void); + extern void InitCatalogCachePhase2(void); +@@ -84,6 +86,8 @@ extern HeapTuple SearchSysCache(int cach + Datum key1, Datum key2, Datum key3, Datum key4); + extern void ReleaseSysCache(HeapTuple tuple); + ++extern void InsertSysCache(Oid relid, HeapTuple tuple); ++ + /* convenience routines */ + extern HeapTuple SearchSysCacheCopy(int cacheId, + Datum key1, Datum key2, Datum key3, Datum key4); Index: sepostgresql.init =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.init,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sepostgresql.init 13 Jun 2008 03:57:01 -0000 1.20 +++ sepostgresql.init 11 Jul 2008 06:40:32 -0000 1.21 @@ -9,7 +9,7 @@ PGVERSION="8.3.3" PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'` -SEPGVERSION="2.869" +SEPGVERSION="2.947" # source function library . /etc/rc.d/init.d/functions Index: sepostgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sepostgresql.spec 13 Jun 2008 03:57:01 -0000 1.21 +++ sepostgresql.spec 11 Jul 2008 06:40:32 -0000 1.22 @@ -4,39 +4,52 @@ # Copyright 2007 KaiGai Kohei # ----------------------------------------------------- -# SELinux policy types -%define selinux_variants mls strict targeted - # SE-PostgreSQL status extension +%define selinux_policy_stores targeted mls + +# check policy dependency +%define fullset_policy %(rpm -E '%{dist}' | grep -cE '^\.fc[1-9]$') +%if %{fullset_policy} +%define required_policy_version 3.0.6 +%define policy_module_name sepostgresql +%else +%define required_policy_version 3.4.2 +%define policy_module_name sepostgresql-devel +%endif + +%{!?ssl:%define ssl 1} + Summary: Security Enhanced PostgreSQL Name: sepostgresql Version: 8.3.3 -Release: 2.869%{?sepgsql_extension}%{?dist} +Release: 2.947%{?sepgsql_extension}%{?dist} License: BSD Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 Source1: sepostgresql.init -Source2: sepostgresql.if -Source3: sepostgresql.te -Source4: sepostgresql.fc -Source5: sepostgresql.8 -Source6: sepostgresql.logrotate -Patch0: sepostgresql-pgace-8.3.3-2.patch -Patch1: sepostgresql-sepgsql-8.3.3-2.patch +Source2: sepostgresql.8 +Source3: sepostgresql.logrotate +Patch0: sepostgresql-sepgsql-8.3.3-2.patch +Patch1: sepostgresql-policy-8.3.3-2.patch Patch2: sepostgresql-pg_dump-8.3.3-2.patch Patch3: sepostgresql-fedora-prefix.patch BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4 -Buildrequires: checkpolicy libselinux-devel >= 2.0.43 selinux-policy-devel selinux-policy >= 3.0.6 +BuildRequires: checkpolicy libselinux-devel >= 2.0.43 selinux-policy-devel +BuildRequires: selinux-policy >= %{required_policy_version} +%if %{ssl} +BuildRequires: openssl-devel +%endif Requires(pre): shadow-utils Requires(post): policycoreutils /sbin/chkconfig Requires(preun): /sbin/chkconfig /sbin/service Requires(postun): policycoreutils Requires: postgresql-server = %{version} -Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.43 selinux-policy >= 3.0.6 +Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.43 +Requires: selinux-policy >= %{required_policy_version} Requires: tzdata logrotate %description @@ -53,23 +66,11 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -mkdir selinux-policy -cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} selinux-policy %build CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS -# build Binary Policy Module -pushd selinux-policy -for selinuxvariant in %{selinux_variants} -do - make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile - mv %{name}.pp %{name}.pp.${selinuxvariant} - make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean -done -popd - # build SE-PostgreSQL %configure --disable-rpath \ --enable-selinux \ @@ -78,25 +79,29 @@ --enable-cassert \ %endif --libdir=%{_libdir}/pgsql \ +%if %{ssl} + --with-openssl \ +%endif --datadir=%{_datadir}/sepgsql \ --with-system-tzdata=/usr/share/zoneinfo # parallel build, if possible make %{?_smp_mflags} +# to create empty .fc file +touch src/backend/security/sepgsql/policy/%{policy_module_name}.fc +make -C src/backend/security/sepgsql/policy %install rm -rf %{buildroot} -pushd selinux-policy -for selinuxvariant in %{selinux_variants} +make DESTDIR=%{buildroot} install + +for store in %{selinux_policy_stores} do - install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 %{name}.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{name}.pp + install -d %{buildroot}%{_datadir}/selinux/${store} + install -p -m 644 src/backend/security/sepgsql/policy/%{policy_module_name}.pp.${store} \ + %{buildroot}%{_datadir}/selinux/${store}/%{policy_module_name}.pp done -popd - -make DESTDIR=%{buildroot} install # avoid to conflict with native postgresql package mv %{buildroot}%{_bindir} %{buildroot}%{_bindir}.orig @@ -124,13 +129,13 @@ mkdir -p %{buildroot}%{_initrddir} install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/sepostgresql -# /etc/logrotate.d/ -mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/sepostgresql - # /usr/share/man/* mkdir -p %{buildroot}%{_mandir}/man8 -install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man8 +install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man8 + +# /etc/logrotate.d/ +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/sepostgresql %clean rm -rf %{buildroot} @@ -146,13 +151,18 @@ /sbin/chkconfig --add %{name} /sbin/ldconfig -for selinuxvariant in %{selinux_variants} +for store in %{selinux_policy_stores} do - %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue; - - %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \ - %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || : - %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{name}.pp >& /dev/null || : +%if %{fullset_policy} + %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || : + %{_sbindir}/semodule -s ${store} \ + -i %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || : +%else + if %{_sbindir}/semodule -s ${store} -l | grep -Eq "^%{policy_module_name}"; then + %{_sbindir}/semodule -s ${store} \ + -u %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || : + fi +%endif done # Fix up non-standard file contexts @@ -171,12 +181,9 @@ /sbin/service %{name} condrestart >/dev/null 2>&1 || : fi if [ $1 -eq 0 ]; then # rpm -e case - for selinuxvariant in %{selinux_variants} + for store in %{selinux_policy_stores} do - %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue; - - %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \ - %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || : + %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || : done /sbin/fixfiles -R %{name} restore || : test -d %{_localstatedir}/lib/sepgsql && /sbin/restorecon -R %{_localstatedir}/lib/sepgsql || : @@ -205,12 +212,19 @@ %{_datadir}/sepgsql/conversion_create.sql %{_datadir}/sepgsql/information_schema.sql %{_datadir}/sepgsql/sql_features.txt -%attr(644,root,root) %{_datadir}/selinux/*/sepostgresql.pp +%attr(644,root,root) %{_datadir}/selinux/*/%{policy_module_name}.pp %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/data %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog +* Fri Jul 11 2008 - 8.3.3-2.944 +- Add OpenSSL support +- backport 8.4devel fixes + +* Sun Jun 15 2008 - 8.3.3-2.889 +- backport 8.4devel features. + * Fri Jun 13 2008 - 8.3.3-2.869 - upgrade base PostgreSQL 8.3.1 -> 8.3.3 --- sepostgresql-pgace-8.3.3-2.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 06:41:42 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 11 Jul 2008 06:41:42 GMT Subject: rpms/TnL/devel TnL.spec,1.7,1.8 Message-ID: <200807110641.m6B6fgkU029329@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/TnL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29236 Modified Files: TnL.spec Log Message: * Fri Jul 11 2008 Hans de Goede 071111-6 - Rebuild for new cegui Index: TnL.spec =================================================================== RCS file: /cvs/extras/rpms/TnL/devel/TnL.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- TnL.spec 22 May 2008 21:30:05 -0000 1.7 +++ TnL.spec 11 Jul 2008 06:40:54 -0000 1.8 @@ -7,7 +7,7 @@ Name: TnL Version: 071111 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Thunder & Lightning - A futuristic action flight simulator game Group: Amusements/Games License: GPL+ @@ -79,6 +79,9 @@ %changelog +* Fri Jul 11 2008 Hans de Goede 071111-6 +- Rebuild for new cegui + * Thu May 22 2008 Hans de Goede 071111-5 - Rebuild for new cegui From fedora-extras-commits at redhat.com Fri Jul 11 06:42:48 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 11 Jul 2008 06:42:48 GMT Subject: rpms/crystalspace/devel crystalspace.spec,1.6,1.7 Message-ID: <200807110642.m6B6gm7r029455@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/crystalspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29400 Modified Files: crystalspace.spec Log Message: * Fri Jul 11 2008 Hans de Goede 1.2-7 - Rebuild for new cegui Index: crystalspace.spec =================================================================== RCS file: /cvs/extras/rpms/crystalspace/devel/crystalspace.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- crystalspace.spec 17 Jun 2008 11:10:34 -0000 1.6 +++ crystalspace.spec 11 Jul 2008 06:42:06 -0000 1.7 @@ -2,7 +2,7 @@ Name: crystalspace Version: 1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Crystal Space a free 3D engine Group: System Environment/Libraries # most of crystalspace is LGPLv2+, but the sndsys class (and its plugins) and @@ -210,6 +210,9 @@ %changelog +* Fri Jul 11 2008 Hans de Goede 1.2-7 +- Rebuild for new cegui + * Tue Jun 17 2008 Hans de Goede 1.2-6 - Fix building on ppc64, patch from David Woodhouse From fedora-extras-commits at redhat.com Fri Jul 11 06:59:21 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Fri, 11 Jul 2008 06:59:21 GMT Subject: rpms/sepostgresql/F-9 sepostgresql.init, 1.21, 1.22 sepostgresql.spec, 1.22, 1.23 Message-ID: <200807110659.m6B6xLoH030085@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30039 Modified Files: sepostgresql.init sepostgresql.spec Log Message: Fix specfile due to buggy script... Index: sepostgresql.init =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.init,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sepostgresql.init 11 Jul 2008 06:40:32 -0000 1.21 +++ sepostgresql.init 11 Jul 2008 06:58:32 -0000 1.22 @@ -9,7 +9,7 @@ PGVERSION="8.3.3" PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'` -SEPGVERSION="2.947" +SEPGVERSION="2.948" # source function library . /etc/rc.d/init.d/functions Index: sepostgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sepostgresql.spec 11 Jul 2008 06:40:32 -0000 1.22 +++ sepostgresql.spec 11 Jul 2008 06:58:32 -0000 1.23 @@ -24,7 +24,7 @@ Summary: Security Enhanced PostgreSQL Name: sepostgresql Version: 8.3.3 -Release: 2.947%{?sepgsql_extension}%{?dist} +Release: 2.948%{?sepgsql_extension}%{?dist} License: BSD Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ @@ -74,14 +74,14 @@ # build SE-PostgreSQL %configure --disable-rpath \ --enable-selinux \ +%if %{ssl} + --with-openssl \ +%endif %if %{defined sepgextension} --enable-debug \ --enable-cassert \ %endif --libdir=%{_libdir}/pgsql \ -%if %{ssl} - --with-openssl \ -%endif --datadir=%{_datadir}/sepgsql \ --with-system-tzdata=/usr/share/zoneinfo @@ -218,7 +218,7 @@ %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog -* Fri Jul 11 2008 - 8.3.3-2.944 +* Fri Jul 11 2008 - 8.3.3-2.948 - Add OpenSSL support - backport 8.4devel fixes From fedora-extras-commits at redhat.com Fri Jul 11 07:03:13 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Fri, 11 Jul 2008 07:03:13 GMT Subject: rpms/stardict/devel stardict.spec,1.54,1.55 Message-ID: <200807110703.m6B73DJ2004349@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4264 Modified Files: stardict.spec Log Message: BuildRequirres: autoconf, automake, libtool Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- stardict.spec 11 Jul 2008 06:30:35 -0000 1.54 +++ stardict.spec 11 Jul 2008 07:02:25 -0000 1.55 @@ -20,7 +20,7 @@ Requires: libbonobo >= 2.2.0 Requires: bonobo-activation >= 2.2.0 BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper, gettext, perl-XML-Parser -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, autoconf, automake, libtool Requires(post): GConf2, scrollkeeper Requires(postun): scrollkeeper From fedora-extras-commits at redhat.com Fri Jul 11 07:04:15 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Fri, 11 Jul 2008 07:04:15 GMT Subject: rpms/sepostgresql/F-9 sepostgresql-policy-8.3.3-2.patch, NONE, 1.1 sepostgresql.spec, 1.23, 1.24 Message-ID: <200807110704.m6B74FYY004399@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4355 Modified Files: sepostgresql.spec Added Files: sepostgresql-policy-8.3.3-2.patch Log Message: sepostgresql-policy-8.3.3-2.patch is not added... sepostgresql-policy-8.3.3-2.patch: --- NEW FILE sepostgresql-policy-8.3.3-2.patch --- diff -rpNU3 base/src/backend/security/sepgsql/policy/Makefile sepgsql/src/backend/security/sepgsql/policy/Makefile --- base/src/backend/security/sepgsql/policy/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/Makefile 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,41 @@ +# +# contrib/sepgsql_policy/Makefile +# Makefile of security policy module for SE-PostgreSQL +# +top_builddir = ../../../../.. +include $(top_builddir)/src/Makefile.global + +policy_basedir := /usr/share/selinux +policy_makefile := $(policy_basedir)/devel/Makefile +policy_types := targeted mls +policy := $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)) +package_names := sepostgresql sepostgresql-devel +prefix_ptn := "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g" +bindir_ptn := "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g" +libdir_ptn := "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g" + +all: + $(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;)) + $(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;) + +.install-policy: + test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy) + $(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;) + +install: all + $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;) + +%.pp: %.te %.if %.fc + rm -f $@ + $(MAKE) NAME=$(policy) -f $(policy_makefile) $@ + mv $@ $@.$(policy) + +sepostgresql-devel.fc: sepostgresql.fc.template + cat $< | grep -v ^/var | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ + +sepostgresql.fc: sepostgresql.fc.template + cat $< | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ + +clean: + $(MAKE) -f $(policy_makefile) clean + rm -f *.pp.* *.fc diff -rpNU3 base/src/backend/security/sepgsql/policy/README sepgsql/src/backend/security/sepgsql/policy/README --- base/src/backend/security/sepgsql/policy/README 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/README 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,49 @@ +The security policy module of SE-PostgreSQL +------------------------------------------- + +o Introduction + + We provide two kind of security policy modules. + + One is "sepostgresql.pp" which contains full-set of security policy + and suitable for legacy base policy (selinux-policy-3.4.1, or prior). + + The other is "sepostgresql-devel.pp" which provides several booleans + for developers, and suitable for newer base policy (selinux-policy-3.4.2, + or later). + + In the selinux-policy-3.4.2, most part of the policy got upstreamed. + So, we don't need to install "sepostgresql.pp" explicitly on the newer + base security policy. + + If you need to run regression test, or (don't) want to generate access + logs, install "sepostgresql-devel.pp" and turn on/off booleans. + +o Build & Installation + + $ cd src/backend/security/sepgsql/policy + $ make + $ su + # /usr/sbin/semodule -i sepostgresql-devel.pp + or + # /usr/sbin/semodule -i sepostgresql.pp + +o Booleans + +- sepgsql_enable_users_ddl (default: on) + This boolean enables to control to execute DDL statement come from + confined users. + +- sepgsql_enable_auditallow (default: off) + This boolean enables to generate access allow logs except for tuple + level. + +- sepgsql_enable_auditdeny (default: on) + This boolean enables to generata access denied logs except for tuple + level. + +- sepgsql_regression_test_mode (default: off) + This boolean provides several permission to run regression test on + your home directory. It enables to load shared library files deployed + on home directory. + However, we don't recommend it to turn on in the operation phase. diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if --- base/src/backend/security/sepgsql/policy/sepostgresql-devel.if 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1 @@ +## There are no interface declaration diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te --- base/src/backend/security/sepgsql/policy/sepostgresql-devel.te 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,82 @@ +policy_module(sepostgresql-devel, 3.11) + +gen_require(` + class db_database all_db_database_perms; + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_column all_db_column_perms; + class db_tuple all_db_tuple_perms; + class db_blob all_db_blob_perms; + + attribute domain, home_type; + attribute sepgsql_client_type; + attribute sepgsql_unconfined_type; + + attribute sepgsql_database_type; + attribute sepgsql_table_type; + attribute sepgsql_sysobj_table_type; + attribute sepgsql_procedure_type; + attribute sepgsql_blob_type; + attribute sepgsql_module_type; +') + +################################# +# +# SE-PostgreSQL Declarations +# + +## +##

+## Allow to generate auditallow logs +##

+## +gen_tunable(sepgsql_enable_auditallow, false) + +## +##

+## Allow to generate auditdeny logs +##

+## +gen_tunable(sepgsql_enable_auditdeny, true) + +## +##

+## Allow widespread permissions for regression test +## Don't set TRUE on operation phase +##

+## +gen_tunable(sepgsql_regression_test_mode, false) + +######################################## +# +# SE-PostgreSQL audit switch for debugging +# +tunable_policy(`sepgsql_enable_auditallow',` + auditallow domain sepgsql_database_type : db_database *; + auditallow domain sepgsql_table_type : db_table *; + auditallow domain sepgsql_table_type : db_column *; + auditallow domain sepgsql_procedure_type : db_procedure *; + auditallow domain sepgsql_blob_type : db_blob *; + auditallow domain sepgsql_module_type : db_database { install_module }; + auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +tunable_policy(`! sepgsql_enable_auditdeny',` + dontaudit domain sepgsql_database_type : db_database *; + dontaudit domain sepgsql_table_type : db_table *; + dontaudit domain sepgsql_table_type : db_column *; + dontaudit domain sepgsql_procedure_type : db_procedure *; + dontaudit domain sepgsql_blob_type : db_blob *; + dontaudit domain sepgsql_module_type : db_database { install_module }; + dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +######################################## +# +# SE-PostgreSQL regression test mode switch +# +tunable_policy(`sepgsql_regression_test_mode',` + allow sepgsql_client_type home_type : db_database { install_module }; + allow sepgsql_unconfined_type home_type : db_database { install_module }; + allow sepgsql_database_type home_type : db_database { load_module }; +') diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.fc.template sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template --- base/src/backend/security/sepgsql/policy/sepostgresql.fc.template 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,15 @@ +# +# SE-PostgreSQL install path +# +%%__prefix__%%(/.*)? -- gen_context(system_u:object_r:usr_t,s0) + +%%__bindir__%%/(se)?postgres -- gen_context(system_u:object_r:postgresql_exec_t,s0) +%%__bindir__%%/(se)?pg_ctl -- gen_context(system_u:object_r:initrc_exec_t,s0) +%%__bindir__%%/initdb(\.sepgsql)? -- gen_context(system_u:object_r:postgresql_exec_t,s0) +%%__bindir__%%(/.*)? -- gen_context(system_u:object_r:bin_t,s0) + +%%__libdir__%%(/.*)? -- gen_context(system_u:object_r:lib_t,s0) + +/var/lib/sepgsql(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0) +/var/lib/sepgsql/pgstartup\.log gen_context(system_u:object_r:postgresql_log_t,s0) +/var/log/sepostgresql\.log.* -- gen_context(system_u:object_r:postgresql_log_t,s0) diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if --- base/src/backend/security/sepgsql/policy/sepostgresql.if 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,259 @@ +####################################### +## +## The userdomain template for the SE-PostgreSQL. +## +## +## This template creates a delivered types which are used +## for given userdomains. +## +## +## +## The prefix of the user domain (e.g., user +## is the prefix for user_t). +## +## +## +## +## The type of the user domain. +## +## +## +## +## The role associated with the user domain. +## +## +# +template(`sepostgresql_userdom_template',` + gen_require(` + class db_database all_db_database_perms; + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_column all_db_column_perms; + class db_tuple all_db_tuple_perms; + class db_blob all_db_blob_perms; + + attribute sepgsql_client_type; + attribute sepgsql_database_type; + attribute sepgsql_sysobj_table_type; + + type sepgsql_trusted_proc_t; + type sepgsql_trusted_proc_exec_t; + ') + + ######################################## + # + # Declarations + # + + typeattribute $2 sepgsql_client_type; + + type $1_sepgsql_blob_t; + postgresql_blob_object($1_sepgsql_blob_t) + + type $1_sepgsql_proc_exec_t; + postgresql_procedure_object($1_sepgsql_proc_exec_t) + + type $1_sepgsql_sysobj_t; + postgresql_system_table_object($1_sepgsql_sysobj_t) + + type $1_sepgsql_table_t; + postgresql_table_object($1_sepgsql_table_t) + + role $3 types sepgsql_trusted_proc_t; + + ############################## + # + # Client local policy + # + + tunable_policy(`sepgsql_enable_users_ddl',` + allow $2 $1_sepgsql_table_t : db_table { create drop }; + type_transition $2 sepgsql_database_type:db_table $1_sepgsql_table_t; + + allow $2 $1_sepgsql_table_t : db_column { create drop }; + + allow $2 $1_sepgsql_sysobj_t : db_tuple { update insert delete }; + type_transition $2 sepgsql_sysobj_table_type:db_tuple $1_sepgsql_sysobj_t; + ') + + allow $2 $1_sepgsql_table_t : db_table { getattr setattr use select update insert delete }; + allow $2 $1_sepgsql_table_t : db_column { getattr setattr use select update insert }; + allow $2 $1_sepgsql_table_t : db_tuple { use select update insert delete }; + allow $2 $1_sepgsql_sysobj_t : db_tuple { use select }; + + allow $2 $1_sepgsql_proc_exec_t : db_procedure { create drop getattr setattr execute }; + type_transition $2 sepgsql_database_type:db_procedure $1_sepgsql_proc_exec_t; + + allow $2 $1_sepgsql_blob_t : db_blob { create drop getattr setattr read write }; + type_transition $2 sepgsql_database_type:db_blob $1_sepgsql_blob_t; + + allow $2 sepgsql_trusted_proc_t:process transition; + type_transition $2 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t; +') + +######################################## +## +## Marks as a SE-PostgreSQL loadable shared library module +## +## +## +## Type marked as a database object type. +## +## +# +interface(`sepostgresql_loadable_module',` + gen_require(` + attribute sepgsql_module_type; + ') + + typeattribute $1 sepgsql_module_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL database object type +## +## +## +## Type marked as a database object type. +## +## +# +interface(`sepostgresql_database_object',` + gen_require(` + attribute sepgsql_database_type; + ') + + typeattribute $1 sepgsql_database_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL table/column/tuple object type +## +## +## +## Type marked as a table/column/tuple object type. +## +## +# +interface(`sepostgresql_table_object',` + gen_require(` + attribute sepgsql_table_type; + ') + + typeattribute $1 sepgsql_table_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL system table/column/tuple object type +## +## +## +## Type marked as a table/column/tuple object type. +## +## +# +interface(`sepostgresql_system_table_object',` + gen_require(` + attribute sepgsql_table_type; + attribute sepgsql_sysobj_table_type; + ') + + typeattribute $1 sepgsql_table_type; + typeattribute $1 sepgsql_sysobj_table_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL procedure object type +## +## +## +## Type marked as a database object type. +## +## +# +interface(`sepostgresql_procedure_object',` + gen_require(` + attribute sepgsql_procedure_type; + ') + + typeattribute $1 sepgsql_procedure_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL binary large object type +## +## +## +## Type marked as a database binary large object type. +## +## +# +interface(`sepostgresql_blob_object',` + gen_require(` + attribute sepgsql_blob_type; + ') + + typeattribute $1 sepgsql_blob_type; +') + +######################################## +## +## Allow the specified domain unprivileged accesses to unifined database objects +## managed by SE-PostgreSQL, +## +## +## +## Domain allowed access. +## +## +# +interface(`sepostgresql_unpriv_client',` + gen_require(` + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_blob all_db_blob_perms; + + attribute sepgsql_client_type; + attribute sepgsql_database_type; + + type sepgsql_table_t; + type sepgsql_proc_t; + type sepgsql_blob_t; + + type sepgsql_trusted_proc_t; + type sepgsql_trusted_proc_exec_t; + ') + + typeattribute $1 sepgsql_client_type; + + type_transition $1 sepgsql_database_type:db_table sepgsql_table_t; + type_transition $1 sepgsql_database_type:db_procedure sepgsql_proc_t; + type_transition $1 sepgsql_database_type:db_blob sepgsql_blob_t; + + type_transition $1 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t; + allow $1 sepgsql_trusted_proc_t:process transition; +') + +######################################## +## +## Allow the specified domain unconfined accesses to any database objects +## managed by SE-PostgreSQL, +## +## +## +## Domain allowed access. +## +## +# +interface(`sepostgresql_unconfined',` + gen_require(` + attribute sepgsql_unconfined_type; + ') + + typeattribute $1 sepgsql_unconfined_type; +') diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te --- base/src/backend/security/sepgsql/policy/sepostgresql.te 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,308 @@ +policy_module(sepostgresql, 3.11) + +gen_require(` + class db_database all_db_database_perms; + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_column all_db_column_perms; + class db_tuple all_db_tuple_perms; + class db_blob all_db_blob_perms; + + attribute domain, home_type; + type postgresql_t, unlabeled_t; + + role system_r; +') + +################################# +# +# SE-PostgreSQL Declarations +# + +## +##

+## Allow to generate auditallow logs +##

+## +gen_tunable(sepgsql_enable_auditallow, false) + +## +##

+## Allow to generate auditdeny logs +##

+## +gen_tunable(sepgsql_enable_auditdeny, true) + +## +##

+## Allow unprivileged users to execute DDL statement +##

+## +gen_tunable(sepgsql_enable_users_ddl, true) + +## +##

+## Allow widespread permissions for regression test +## Don't set TRUE on operation phase +##

+## +gen_tunable(sepgsql_regression_test_mode, false) + +# database clients attribute +attribute sepgsql_client_type; +attribute sepgsql_unconfined_type; + +# database objects attribute +attribute sepgsql_database_type; +attribute sepgsql_table_type; +attribute sepgsql_sysobj_table_type; +attribute sepgsql_procedure_type; +attribute sepgsql_blob_type; +attribute sepgsql_module_type; + +# database object types +type sepgsql_blob_t; +sepostgresql_blob_object(sepgsql_blob_t) + +type sepgsql_db_t; +sepostgresql_database_object(sepgsql_db_t) + +type sepgsql_fixed_table_t; +sepostgresql_table_object(sepgsql_fixed_table_t) + +type sepgsql_proc_t; +sepostgresql_procedure_object(sepgsql_proc_t) + +type sepgsql_ro_blob_t; +sepostgresql_blob_object(sepgsql_ro_blob_t) + +type sepgsql_ro_table_t; +sepostgresql_table_object(sepgsql_ro_table_t) + +type sepgsql_secret_blob_t; +sepostgresql_blob_object(sepgsql_secret_blob_t) + +type sepgsql_secret_table_t; +sepostgresql_table_object(sepgsql_secret_table_t) + +type sepgsql_sysobj_t; +sepostgresql_system_table_object(sepgsql_sysobj_t) + +type sepgsql_table_t; +sepostgresql_table_object(sepgsql_table_t) + +type sepgsql_trusted_proc_exec_t; +sepostgresql_procedure_object(sepgsql_trusted_proc_exec_t) + +# Trusted Procedure Domain +type sepgsql_trusted_proc_t; +domain_type(sepgsql_trusted_proc_t) +sepostgresql_unconfined(sepgsql_trusted_proc_t) +role system_r types sepgsql_trusted_proc_t; + +######################################## +# +# SE-PostgreSQL Local Policy +# +allow postgresql_t self:netlink_selinux_socket create_socket_perms; +selinux_get_enforce_mode(postgresql_t) +selinux_validate_context(postgresql_t) +selinux_compute_access_vector(postgresql_t) +selinux_compute_create_context(postgresql_t) +selinux_compute_relabel_context(postgresql_t) +seutil_libselinux_linked(postgresql_t) + +allow postgresql_t sepgsql_database_type:db_database *; +type_transition postgresql_t postgresql_t:db_database sepgsql_db_t; + +allow postgresql_t sepgsql_module_type:db_database install_module; +allow postgresql_t sepgsql_table_type:{ db_table db_column db_tuple } *; +allow postgresql_t sepgsql_procedure_type:db_procedure *; +allow postgresql_t sepgsql_blob_type:db_blob *; + +# server specific type transitions +type_transition postgresql_t sepgsql_database_type:db_table sepgsql_sysobj_t; +type_transition postgresql_t sepgsql_database_type:db_procedure sepgsql_proc_t; +type_transition postgresql_t sepgsql_database_type:db_blob sepgsql_blob_t; + +# Database/Loadable module +allow sepgsql_database_type sepgsql_module_type:db_database load_module; + +######################################## +# +# Rules common to all clients +# + +# Client domain constraint +allow sepgsql_client_type sepgsql_db_t:db_database { getattr access get_param set_param }; +type_transition sepgsql_client_type sepgsql_client_type:db_database sepgsql_db_t; + +allow sepgsql_client_type sepgsql_fixed_table_t:db_table { getattr use select insert }; +allow sepgsql_client_type sepgsql_fixed_table_t:db_column { getattr use select insert }; +allow sepgsql_client_type sepgsql_fixed_table_t:db_tuple { use select insert }; + +allow sepgsql_client_type sepgsql_table_t:db_table { getattr use select update insert delete }; +allow sepgsql_client_type sepgsql_table_t:db_column { getattr use select update insert }; +allow sepgsql_client_type sepgsql_table_t:db_tuple { use select update insert delete }; + +allow sepgsql_client_type sepgsql_ro_table_t:db_table { getattr use select }; +allow sepgsql_client_type sepgsql_ro_table_t:db_column { getattr use select }; +allow sepgsql_client_type sepgsql_ro_table_t:db_tuple { use select }; + +allow sepgsql_client_type sepgsql_secret_table_t:db_table getattr; +allow sepgsql_client_type sepgsql_secret_table_t:db_column getattr; + +allow sepgsql_client_type sepgsql_sysobj_t:db_table { getattr use select }; +allow sepgsql_client_type sepgsql_sysobj_t:db_column { getattr use select }; +allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select }; + +allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute }; +allow sepgsql_client_type sepgsql_trusted_proc_t:db_procedure { getattr execute entrypoint }; + +allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write }; +allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read }; +allow sepgsql_client_type sepgsql_secret_blob_t:db_blob getattr; + +tunable_policy(`sepgsql_enable_users_ddl',` + allow sepgsql_client_type sepgsql_table_t:db_table { create drop setattr }; + allow sepgsql_client_type sepgsql_table_t:db_column { create drop setattr }; + allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { update insert delete }; +') + +######################################## +# +# Unconfined access to this module +# + +allow sepgsql_unconfined_type sepgsql_database_type:db_database *; +allow sepgsql_unconfined_type sepgsql_table_type:{ db_table db_column db_tuple } *; +allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *; +allow sepgsql_unconfined_type { sepgsql_proc_t sepgsql_trusted_proc_t }:db_procedure *; +allow sepgsql_unconfined_type sepgsql_procedure_type:db_procedure { create drop getattr setattr relabelfrom relabelto }; +allow sepgsql_unconfined_type sepgsql_module_type:db_database install_module; + +type_transition sepgsql_unconfined_type sepgsql_unconfined_type:db_database sepgsql_db_t; +type_transition sepgsql_unconfined_type sepgsql_database_type:db_table sepgsql_table_t; +type_transition sepgsql_unconfined_type sepgsql_database_type:db_procedure sepgsql_proc_t; +type_transition sepgsql_unconfined_type sepgsql_database_type:db_blob sepgsql_blob_t; + + +######################################## +# +# Allow permission to external domains +# + +# relabelfrom for invalid security context +allow sepgsql_unconfined_type unlabeled_t:db_database { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_table { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_procedure { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_column { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_tuple { update relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_blob { setattr relabelfrom }; + +# administrative client domain +optional_policy(` + gen_require(` + type unconfined_t; + ') + sepostgresql_unconfined(unconfined_t) +') + +optional_policy(` + gen_require(` + type sysadm_t; + ') + sepostgresql_unconfined(sysadm_t) +') + +# unprivilleged client domain +optional_policy(` + gen_require(` + type user_t; + role user_r; + ') + sepostgresql_userdom_template(user,user_t,user_r) +') + +optional_policy(` + gen_require(` + type staff_t; + role staff_r; + ') + sepostgresql_userdom_template(staff,staff_t,staff_r) +') + +optional_policy(` + gen_require(` + type guest_t; + role guest_r; + ') + sepostgresql_userdom_template(guest,guest_t,guest_r) +') + +optional_policy(` + gen_require(` + type xguest_t; + role xguest_r; + ') + sepostgresql_userdom_template(xguest,xguest_t,xguest_r) +') + +optional_policy(` + gen_require(` + type httpd_t; + ') + sepostgresql_unpriv_client(httpd_t) +') + +optional_policy(` + gen_require(` + type httpd_sys_script_t; + ') + sepostgresql_unpriv_client(httpd_sys_script_t) +') + +# SE-PostgreSQL loadable modules +optional_policy(` + gen_require(` + type lib_t, textrel_shlib_t; + ') + sepostgresql_loadable_module(lib_t) + sepostgresql_loadable_module(textrel_shlib_t) +') + +######################################## +# +# SE-PostgreSQL audit switch for debugging +# +tunable_policy(`sepgsql_enable_auditallow',` + auditallow domain sepgsql_database_type : db_database *; + auditallow domain sepgsql_table_type : db_table *; + auditallow domain sepgsql_table_type : db_column *; + auditallow domain sepgsql_procedure_type : db_procedure *; + auditallow domain sepgsql_blob_type : db_blob *; + auditallow domain sepgsql_module_type : db_database { install_module }; + auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +tunable_policy(`! sepgsql_enable_auditdeny',` + dontaudit domain sepgsql_database_type : db_database *; + dontaudit domain sepgsql_table_type : db_table *; + dontaudit domain sepgsql_table_type : db_column *; + dontaudit domain sepgsql_procedure_type : db_procedure *; + dontaudit domain sepgsql_blob_type : db_blob *; + dontaudit domain sepgsql_module_type : db_database { install_module }; + dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +dontaudit domain { sepgsql_table_type - sepgsql_sysobj_table_type } : db_tuple { use select update insert delete }; + +######################################## +# +# SE-PostgreSQL regression test mode switch +# +tunable_policy(`sepgsql_regression_test_mode',` + allow sepgsql_client_type home_type : db_database { install_module }; + allow sepgsql_unconfined_type home_type : db_database { install_module }; + allow sepgsql_database_type home_type : db_database { load_module }; +') Index: sepostgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sepostgresql.spec 11 Jul 2008 06:58:32 -0000 1.23 +++ sepostgresql.spec 11 Jul 2008 07:03:31 -0000 1.24 @@ -24,7 +24,7 @@ Summary: Security Enhanced PostgreSQL Name: sepostgresql Version: 8.3.3 -Release: 2.948%{?sepgsql_extension}%{?dist} +Release: 2.949%{?sepgsql_extension}%{?dist} License: BSD Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ @@ -218,7 +218,7 @@ %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog -* Fri Jul 11 2008 - 8.3.3-2.948 +* Fri Jul 11 2008 - 8.3.3-2.949 - Add OpenSSL support - backport 8.4devel fixes From fedora-extras-commits at redhat.com Fri Jul 11 07:26:46 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 11 Jul 2008 07:26:46 GMT Subject: rpms/ogre/devel ogre.spec,1.30,1.31 Message-ID: <200807110726.m6B7Qkoc005574@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ogre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5442 Modified Files: ogre.spec Log Message: * Fri Jul 11 2008 Hans de Goede 1.4.9-2 - Rebuild for new cegui Index: ogre.spec =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ogre.spec 2 Jul 2008 12:21:23 -0000 1.30 +++ ogre.spec 11 Jul 2008 07:25:59 -0000 1.31 @@ -1,6 +1,6 @@ Name: ogre Version: 1.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Object-Oriented Graphics Rendering Engine License: LGPLv2+ Group: System Environment/Libraries @@ -173,6 +173,9 @@ %changelog +* Fri Jul 11 2008 Hans de Goede 1.4.9-2 +- Rebuild for new cegui + * Wed Jul 2 2008 Hans de Goede 1.4.9-1 - New upstream release 1.4.9 From fedora-extras-commits at redhat.com Fri Jul 11 07:31:05 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 11 Jul 2008 07:31:05 GMT Subject: rpms/soprano/devel soprano.spec,1.18,1.19 Message-ID: <200807110731.m6B7V5tM005886@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5812/devel Modified Files: soprano.spec Log Message: * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- soprano.spec 1 May 2008 22:31:09 -0000 1.18 +++ soprano.spec 11 Jul 2008 07:30:18 -0000 1.19 @@ -6,7 +6,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.98 +Version: 2.0.99 Release: 1%{?dist} Group: System Environment/Libraries @@ -107,6 +107,9 @@ %changelog +* Fri Jul 11 2008 Kevin Kofler 2.0.99-1 +- update to 2.0.99 (2.1 RC 1) + * Thu May 1 2008 Kevin Kofler 2.0.98-1 - update to 2.0.98 (2.1 alpha 1) From fedora-extras-commits at redhat.com Fri Jul 11 07:37:58 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Fri, 11 Jul 2008 07:37:58 GMT Subject: rpms/wireshark/devel .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 wireshark.spec, 1.36, 1.37 Message-ID: <200807110737.m6B7bw02006389@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/wireshark/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6362 Modified Files: .cvsignore sources wireshark.spec Log Message: upgrade to 1.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Jul 2008 07:42:05 -0000 1.19 +++ .cvsignore 11 Jul 2008 07:37:01 -0000 1.20 @@ -1 +1 @@ -wireshark-1.0.1.tar.gz +wireshark-1.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Jul 2008 07:42:05 -0000 1.19 +++ sources 11 Jul 2008 07:37:01 -0000 1.20 @@ -1 +1 @@ -da33c2abeb8b982ca50e4c43d8c0fe27 wireshark-1.0.1.tar.gz +6045048aa8645d54d1a06bb20e0d23a3 wireshark-1.0.2.tar.gz Index: wireshark.spec =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- wireshark.spec 8 Jul 2008 07:42:05 -0000 1.36 +++ wireshark.spec 11 Jul 2008 07:37:01 -0000 1.37 @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} License: GPL+ Group: Applications/Internet @@ -201,6 +201,9 @@ %changelog +* Fri Jul 11 2008 Radek Vok??l 1.0.2-1 +- upgrade to 1.0.2 + * Tue Jul 8 2008 Radek Vok??l 1.0.1-1 - upgrade to 1.0.1 From fedora-extras-commits at redhat.com Fri Jul 11 07:50:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 07:50:54 +0000 Subject: [pkgdb] elinks: kdudka has requested watchbugzilla Message-ID: <200807110750.m6B7ot5x009323@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on elinks (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Fri Jul 11 07:50:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 07:50:55 +0000 Subject: [pkgdb] elinks: kdudka has requested commit Message-ID: <200807110750.m6B7otcp009329@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on elinks (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Fri Jul 11 07:51:43 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 07:51:43 GMT Subject: rpms/php-pear-propel_runtime/F-9 php-pear-propel_runtime.spec, 1.1, 1.2 Message-ID: <200807110751.m6B7ph4O006866@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_runtime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6796/F-9 Modified Files: php-pear-propel_runtime.spec Log Message: * untabified * updated summary Index: php-pear-propel_runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_runtime/F-9/php-pear-propel_runtime.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-propel_runtime.spec 8 Jul 2008 19:59:33 -0000 1.1 +++ php-pear-propel_runtime.spec 11 Jul 2008 07:50:55 -0000 1.2 @@ -2,37 +2,37 @@ %define pear_name propel_runtime %define channel pear.phpdb.org -Summary: An Object Relational Mapping (ORM) framework for PHP5 -Name: php-pear-%{pear_name} -Version: 1.3.0 -Release: 0.1.rc1%{?dist} - -License: LGPLv3+ -Group: Development/Libraries -Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://propel.phpdb.org/trac/ - -BuildArch: noarch - -BuildRequires: php-cli >= 5.2.0 -BuildRequires: php-pear -BuildRequires: php-channel(pear.phpdb.org) -Requires: php >= 5.2.0 -Requires: php-pear -Requires: php-channel(pear.phpdb.org) -Requires: php-dom -Requires: php-xml -Requires: php-pdo +Summary: An ORM framework for PHP5 - runtime component +Name: php-pear-%{pear_name} +Version: 1.3.0 +Release: 0.2.rc1%{?dist} + +License: LGPLv3+ +Group: Development/Libraries +Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://propel.phpdb.org/trac/ + +BuildArch: noarch + +BuildRequires: php-cli >= 5.2.0 +BuildRequires: php-pear +BuildRequires: php-channel(pear.phpdb.org) +Requires: php >= 5.2.0 +Requires: php-pear +Requires: php-channel(pear.phpdb.org) +Requires: php-dom +Requires: php-xml +Requires: php-pdo Requires(hint): php-pear-Log Requires(post): %{__pear} Requires(postun): %{__pear} -Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-runtime -Obsoletes: php-pear-propel +Provides: php-pear(%{channel}/%{pear_name}) = %{version} +Obsoletes: php-pear-propel-runtime +Obsoletes: php-pear-propel %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -94,6 +94,10 @@ %changelog +* Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 +- updated summary +- untabified + * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 - ownership of %%{pear_phpdir}/propel now claimed by both -runtime and From fedora-extras-commits at redhat.com Fri Jul 11 07:51:55 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 07:51:55 GMT Subject: rpms/php-pear-propel_runtime/F-8 php-pear-propel_runtime.spec, 1.1, 1.2 Message-ID: <200807110751.m6B7ptHE006877@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_runtime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6796/F-8 Modified Files: php-pear-propel_runtime.spec Log Message: * untabified * updated summary Index: php-pear-propel_runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_runtime/F-8/php-pear-propel_runtime.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-propel_runtime.spec 8 Jul 2008 19:59:16 -0000 1.1 +++ php-pear-propel_runtime.spec 11 Jul 2008 07:50:38 -0000 1.2 @@ -2,37 +2,37 @@ %define pear_name propel_runtime %define channel pear.phpdb.org -Summary: An Object Relational Mapping (ORM) framework for PHP5 -Name: php-pear-%{pear_name} -Version: 1.3.0 -Release: 0.1.rc1%{?dist} - -License: LGPLv3+ -Group: Development/Libraries -Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://propel.phpdb.org/trac/ - -BuildArch: noarch - -BuildRequires: php-cli >= 5.2.0 -BuildRequires: php-pear -BuildRequires: php-channel(pear.phpdb.org) -Requires: php >= 5.2.0 -Requires: php-pear -Requires: php-channel(pear.phpdb.org) -Requires: php-dom -Requires: php-xml -Requires: php-pdo +Summary: An ORM framework for PHP5 - runtime component +Name: php-pear-%{pear_name} +Version: 1.3.0 +Release: 0.2.rc1%{?dist} + +License: LGPLv3+ +Group: Development/Libraries +Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://propel.phpdb.org/trac/ + +BuildArch: noarch + +BuildRequires: php-cli >= 5.2.0 +BuildRequires: php-pear +BuildRequires: php-channel(pear.phpdb.org) +Requires: php >= 5.2.0 +Requires: php-pear +Requires: php-channel(pear.phpdb.org) +Requires: php-dom +Requires: php-xml +Requires: php-pdo Requires(hint): php-pear-Log Requires(post): %{__pear} Requires(postun): %{__pear} -Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-runtime -Obsoletes: php-pear-propel +Provides: php-pear(%{channel}/%{pear_name}) = %{version} +Obsoletes: php-pear-propel-runtime +Obsoletes: php-pear-propel %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -94,6 +94,10 @@ %changelog +* Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 +- updated summary +- untabified + * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 - ownership of %%{pear_phpdir}/propel now claimed by both -runtime and From fedora-extras-commits at redhat.com Fri Jul 11 07:51:57 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 07:51:57 GMT Subject: rpms/php-pear-propel_runtime/devel php-pear-propel_runtime.spec, 1.1, 1.2 Message-ID: <200807110751.m6B7pv0Z006880@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6796/devel Modified Files: php-pear-propel_runtime.spec Log Message: * untabified * updated summary Index: php-pear-propel_runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_runtime/devel/php-pear-propel_runtime.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-propel_runtime.spec 8 Jul 2008 19:56:38 -0000 1.1 +++ php-pear-propel_runtime.spec 11 Jul 2008 07:51:14 -0000 1.2 @@ -2,37 +2,37 @@ %define pear_name propel_runtime %define channel pear.phpdb.org -Summary: An Object Relational Mapping (ORM) framework for PHP5 -Name: php-pear-%{pear_name} -Version: 1.3.0 -Release: 0.1.rc1%{?dist} - -License: LGPLv3+ -Group: Development/Libraries -Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://propel.phpdb.org/trac/ - -BuildArch: noarch - -BuildRequires: php-cli >= 5.2.0 -BuildRequires: php-pear -BuildRequires: php-channel(pear.phpdb.org) -Requires: php >= 5.2.0 -Requires: php-pear -Requires: php-channel(pear.phpdb.org) -Requires: php-dom -Requires: php-xml -Requires: php-pdo +Summary: An ORM framework for PHP5 - runtime component +Name: php-pear-%{pear_name} +Version: 1.3.0 +Release: 0.2.rc1%{?dist} + +License: LGPLv3+ +Group: Development/Libraries +Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://propel.phpdb.org/trac/ + +BuildArch: noarch + +BuildRequires: php-cli >= 5.2.0 +BuildRequires: php-pear +BuildRequires: php-channel(pear.phpdb.org) +Requires: php >= 5.2.0 +Requires: php-pear +Requires: php-channel(pear.phpdb.org) +Requires: php-dom +Requires: php-xml +Requires: php-pdo Requires(hint): php-pear-Log Requires(post): %{__pear} Requires(postun): %{__pear} -Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-runtime -Obsoletes: php-pear-propel +Provides: php-pear(%{channel}/%{pear_name}) = %{version} +Obsoletes: php-pear-propel-runtime +Obsoletes: php-pear-propel %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -94,6 +94,10 @@ %changelog +* Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 +- updated summary +- untabified + * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 - ownership of %%{pear_phpdir}/propel now claimed by both -runtime and From fedora-extras-commits at redhat.com Fri Jul 11 07:52:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 07:52:09 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <200807110752.m6B7q9Nh009446@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on elinks (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Fri Jul 11 07:52:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 07:52:18 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <200807110752.m6B7qIor009491@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on elinks (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Fri Jul 11 07:52:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 07:52:14 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <200807110752.m6B7q9Nk009446@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on elinks (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Fri Jul 11 07:52:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 07:52:40 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <200807110752.m6B7qeEE009531@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the approveacls acl on elinks (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Fri Jul 11 07:52:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 07:52:50 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <200807110752.m6B7q9Nn009446@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the approveacls acl on elinks (Fedora 9) to Obsolete for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Fri Jul 11 07:59:32 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 11 Jul 2008 07:59:32 GMT Subject: rpms/soprano/devel .cvsignore,1.9,1.10 sources,1.9,1.10 Message-ID: <200807110759.m6B7xW0a007059@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981/devel Modified Files: .cvsignore sources Log Message: * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 1 May 2008 22:14:30 -0000 1.9 +++ .cvsignore 11 Jul 2008 07:58:40 -0000 1.10 @@ -1 +1 @@ -soprano-2.0.98.tar.bz2 +soprano-2.0.99.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 1 May 2008 22:14:30 -0000 1.9 +++ sources 11 Jul 2008 07:58:40 -0000 1.10 @@ -1 +1 @@ -fcaf461dded797445264d809df3257b5 soprano-2.0.98.tar.bz2 +adef1e8539bff9bd41a6b973dbd18ff4 soprano-2.0.99.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 08:00:48 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:00:48 GMT Subject: rpms/php-pear-propel_runtime/F-8 php-pear-propel_runtime.spec, 1.2, 1.3 Message-ID: <200807110800.m6B80mdo007163@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_runtime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7068/F-8 Modified Files: php-pear-propel_runtime.spec Log Message: * imported changes from correct approved specfile Index: php-pear-propel_runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_runtime/F-8/php-pear-propel_runtime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-propel_runtime.spec 11 Jul 2008 07:50:38 -0000 1.2 +++ php-pear-propel_runtime.spec 11 Jul 2008 08:00:05 -0000 1.3 @@ -25,14 +25,10 @@ Requires: php-xml Requires: php-pdo -Requires(hint): php-pear-Log - Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-runtime -Obsoletes: php-pear-propel %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -71,12 +67,12 @@ %post %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{channel}/%{pear_name} >/dev/null || : + %{__pear} uninstall --nodeps --ignore-errors --register-only \ + %{channel}/%{pear_name} >/dev/null || : fi @@ -97,6 +93,8 @@ * Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 - updated summary - untabified +- dropped Obsoletes +- dropped php-pear-Log dependency, not really necessary * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 From fedora-extras-commits at redhat.com Fri Jul 11 08:01:02 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:01:02 GMT Subject: rpms/php-pear-propel_runtime/F-9 php-pear-propel_runtime.spec, 1.2, 1.3 Message-ID: <200807110801.m6B812EP008234@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_runtime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7068/F-9 Modified Files: php-pear-propel_runtime.spec Log Message: * imported changes from correct approved specfile Index: php-pear-propel_runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_runtime/F-9/php-pear-propel_runtime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-propel_runtime.spec 11 Jul 2008 07:50:55 -0000 1.2 +++ php-pear-propel_runtime.spec 11 Jul 2008 08:00:18 -0000 1.3 @@ -25,14 +25,10 @@ Requires: php-xml Requires: php-pdo -Requires(hint): php-pear-Log - Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-runtime -Obsoletes: php-pear-propel %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -71,12 +67,12 @@ %post %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{channel}/%{pear_name} >/dev/null || : + %{__pear} uninstall --nodeps --ignore-errors --register-only \ + %{channel}/%{pear_name} >/dev/null || : fi @@ -97,6 +93,8 @@ * Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 - updated summary - untabified +- dropped Obsoletes +- dropped php-pear-Log dependency, not really necessary * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 From fedora-extras-commits at redhat.com Fri Jul 11 08:01:16 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:01:16 GMT Subject: rpms/php-pear-propel_runtime/devel php-pear-propel_runtime.spec, 1.2, 1.3 Message-ID: <200807110801.m6B81GXS013713@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7068/devel Modified Files: php-pear-propel_runtime.spec Log Message: * imported changes from correct approved specfile Index: php-pear-propel_runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_runtime/devel/php-pear-propel_runtime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-propel_runtime.spec 11 Jul 2008 07:51:14 -0000 1.2 +++ php-pear-propel_runtime.spec 11 Jul 2008 08:00:32 -0000 1.3 @@ -25,14 +25,10 @@ Requires: php-xml Requires: php-pdo -Requires(hint): php-pear-Log - Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-runtime -Obsoletes: php-pear-propel %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -71,12 +67,12 @@ %post %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{channel}/%{pear_name} >/dev/null || : + %{__pear} uninstall --nodeps --ignore-errors --register-only \ + %{channel}/%{pear_name} >/dev/null || : fi @@ -97,6 +93,8 @@ * Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 - updated summary - untabified +- dropped Obsoletes +- dropped php-pear-Log dependency, not really necessary * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 From fedora-extras-commits at redhat.com Fri Jul 11 08:01:25 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 11 Jul 2008 08:01:25 GMT Subject: rpms/cegui/devel .cvsignore, 1.4, 1.5 cegui-0.6.0-release-as-so-ver.patch, 1.1, 1.2 cegui.spec, 1.15, 1.16 sources, 1.4, 1.5 cegui-0.6.0-fixweaksymbol.patch, 1.1, NONE cegui-0.6.0-system-tinyxml.patch, 1.1, NONE cegui-0.6.0-system-tolua++.patch, 1.1, NONE Message-ID: <200807110801.m6B81P9s013722@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/cegui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7125 Modified Files: .cvsignore cegui-0.6.0-release-as-so-ver.patch cegui.spec sources Removed Files: cegui-0.6.0-fixweaksymbol.patch cegui-0.6.0-system-tinyxml.patch cegui-0.6.0-system-tolua++.patch Log Message: * Fri Jul 11 2008 Hans de Goede 0.6.1-1 - New upstream release 0.6.1 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cegui/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2008 12:02:20 -0000 1.4 +++ .cvsignore 11 Jul 2008 08:00:24 -0000 1.5 @@ -1,2 +1,2 @@ -CEGUI-0.6.0.tar.gz -CEGUI-DOCS-0.6.0.tar.gz +CEGUI-0.6.1.tar.gz +CEGUI-0.6.1-DOCS.tar.gz cegui-0.6.0-release-as-so-ver.patch: Index: cegui-0.6.0-release-as-so-ver.patch =================================================================== RCS file: /cvs/extras/rpms/cegui/devel/cegui-0.6.0-release-as-so-ver.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cegui-0.6.0-release-as-so-ver.patch 19 May 2008 12:02:20 -0000 1.1 +++ cegui-0.6.0-release-as-so-ver.patch 11 Jul 2008 08:00:24 -0000 1.2 @@ -1,18 +1,18 @@ -diff -up CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am ---- CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am~ 2008-05-18 22:18:51.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am 2008-05-18 22:18:51.000000000 +0200 -@@ -7,6 +7,8 @@ if MINGW32_BUILD +diff -up CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am +--- CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am 2008-07-11 08:30:44.000000000 +0200 +@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im + if MINGW32_BUILD libCEGUICoronaImageCodec_la_CPPFLAGS = -DCEGUICORONAIMAGECODEC_EXPORTS libCEGUICoronaImageCodec_la_LDFLAGS = -no-undefined -avoid-version - libCEGUICoronaImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase +else +libCEGUICoronaImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ endif - libCEGUICoronaImageCodec_la_LIBADD += $(Corona_LIBS) -diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am ---- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ 2008-05-18 22:19:17.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am 2008-05-18 22:19:17.000000000 +0200 + libCEGUICoronaImageCodec_la_LIBADD = $(Corona_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am +--- CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -5,6 +5,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im if MINGW32_BUILD libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS @@ -21,10 +21,21 @@ +libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ endif - libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) ../../src/libCEGUIBase.la -diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am ---- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am~ 2008-05-18 22:21:15.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am 2008-05-18 22:21:15.000000000 +0200 + libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in +--- CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -239,6 +239,7 @@ INCLUDES = -I$(top_srcdir)/include $(Dev + + @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++ at MINGW32_BUILD_FALSE@libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am +--- CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im if MINGW32_BUILD libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS @@ -33,10 +44,21 @@ +libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ endif - libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) ../../src/libCEGUIBase.la -diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am ---- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am~ 2008-05-18 22:22:01.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am 2008-05-18 22:22:01.000000000 +0200 + libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in +--- CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(Fre + + @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++ at MINGW32_BUILD_FALSE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am +--- CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im if MINGW32_BUILD libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS @@ -45,10 +67,21 @@ +libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ endif - libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) ../../src/libCEGUIBase.la -diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am ---- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am~ 2008-05-18 22:22:43.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am 2008-05-18 22:22:43.000000000 +0200 + libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in +--- CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(SIL + + @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++ at MINGW32_BUILD_FALSE@libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am +--- CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im if MINGW32_BUILD libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS @@ -58,22 +91,45 @@ endif lib_LTLIBRARIES=libCEGUITGAImageCodec.la -diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am~ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am ---- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am~ 2008-05-18 22:26:10.000000000 +0200 -+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am 2008-05-18 22:26:10.000000000 +0200 -@@ -11,7 +11,7 @@ endif +diff -up CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in +--- CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200 ++++ CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include + + @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++ at MINGW32_BUILD_FALSE@libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ - libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) ../../src/libCEGUIBase.la + lib_LTLIBRARIES = libCEGUITGAImageCodec.la + libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp +diff -up CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am.foo CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am +--- CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am.foo 2008-06-25 20:57:21.000000000 +0200 ++++ CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am 2008-07-11 08:26:17.000000000 +0200 +@@ -18,7 +18,7 @@ endif + + libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) $(top_builddir)/src/libCEGUIBase.la -libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@ +libCEGUIOpenGLRenderer_la_LDFLAGS += -release @PACKAGE_VERSION@ lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp -diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am ---- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ 2008-05-18 22:25:50.000000000 +0200 -+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-05-18 22:25:50.000000000 +0200 -@@ -10,7 +10,7 @@ libCEGUILuaScriptModule_la_CPPFLAGS += - +diff -up CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in.foo CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in +--- CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in.foo 2008-06-29 16:09:10.000000000 +0200 ++++ CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in 2008-07-11 08:27:02.000000000 +0200 +@@ -242,7 +242,7 @@ xerces_LIBS = @xerces_LIBS@ + INCLUDES = $(am__append_1) -I$(top_srcdir)/include -I$(top_srcdir) $(OpenGL_CFLAGS) + pkginclude_HEADERS = openglrenderer.h opengltexture.h + +-libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_OPENGL_VERSION_INFO@ ++libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@ + + @MINGW32_BUILD_TRUE at libCEGUIOpenGLRenderer_la_CPPFLAGS = -DOPENGL_GUIRENDERER_EXPORTS + +diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am +--- CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.foo 2008-05-26 20:56:07.000000000 +0200 ++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-07-11 08:26:17.000000000 +0200 +@@ -9,7 +9,7 @@ libCEGUILuaScriptModule_la_CPPFLAGS += - libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version endif @@ -82,9 +138,21 @@ lib_LTLIBRARIES = libCEGUILuaScriptModule.la -diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am ---- CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am~ 2008-05-19 08:47:42.000000000 +0200 -+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am 2008-05-19 08:47:42.000000000 +0200 +diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in +--- CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.foo 2008-06-29 16:09:12.000000000 +0200 ++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -244,7 +244,7 @@ INCLUDES = -I$(top_srcdir)/include \ + -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include\ + $(am__append_3) $(am__append_5) + +-libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@ ++libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@ + libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1) + + lib_LTLIBRARIES = libCEGUILuaScriptModule.la +diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am +--- CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am.foo 2008-03-15 17:51:39.000000000 +0100 ++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -7,7 +7,7 @@ libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EX libCEGUItoluapp_la_LDFLAGS += -no-undefined endif @@ -94,9 +162,21 @@ lib_LTLIBRARIES = libCEGUItoluapp.la -diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am ---- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ 2008-05-18 22:25:17.000000000 +0200 -+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am 2008-05-18 22:25:17.000000000 +0200 +diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in +--- CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in.foo 2008-06-29 16:09:12.000000000 +0200 ++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -237,7 +237,7 @@ xerces_CFLAGS = @xerces_CFLAGS@ + xerces_LIBS = @xerces_LIBS@ + INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ + +-libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ ++libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ + + @MINGW32_BUILD_TRUE at libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EXPORTS + +diff -up CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am.foo CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am +--- CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -8,7 +8,7 @@ libCEGUIFalagardWRBase_la_CPPFLAGS = -DF libCEGUIFalagardWRBase_la_LDFLAGS += -no-undefined -avoid-version endif @@ -104,11 +184,23 @@ -libCEGUIFalagardWRBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@ +libCEGUIFalagardWRBase_la_LDFLAGS += -release @PACKAGE_VERSION@ - libCEGUIFalagardWRBase_la_LIBADD = ../../../src/libCEGUIBase.la + libCEGUIFalagardWRBase_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in.foo CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in +--- CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200 ++++ CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -239,7 +239,7 @@ INCLUDES = -I$(top_srcdir)/include \ + -I$(top_srcdir)/WindowRendererSets/Falagard/include -diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am ---- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ 2008-05-18 22:23:24.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am 2008-05-18 22:23:24.000000000 +0200 + +-libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ ++libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ + + @MINGW32_BUILD_TRUE at libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS + +diff -up CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am +--- CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am.foo 2008-05-26 20:56:07.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include if MINGW32_BUILD libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS @@ -118,9 +210,20 @@ endif lib_LTLIBRARIES=libCEGUITinyXMLParser.la -diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am ---- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am~ 2008-05-18 22:23:57.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am 2008-05-18 22:23:57.000000000 +0200 +diff -up CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in +--- CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -246,6 +246,7 @@ INCLUDES = -I$(top_srcdir)/include $(am_ + + @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS + @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version ++ at MINGW32_BUILD_FALSE@libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + + lib_LTLIBRARIES = libCEGUITinyXMLParser.la + libCEGUITinyXMLParser_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la $(am__append_3) +diff -up CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am +--- CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(xer if MINGW32_BUILD libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS @@ -129,10 +232,21 @@ +libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@ endif - libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) ../../src/libCEGUIBase.la -diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am ---- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am~ 2008-05-18 22:24:22.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am 2008-05-18 22:24:22.000000000 +0200 + libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in +--- CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(xer + + @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS + @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version ++ at MINGW32_BUILD_FALSE@libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am +--- CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(exp if MINGW32_BUILD libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS @@ -141,10 +255,21 @@ +libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@ endif - libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) ../../src/libCEGUIBase.la -diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am ---- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am~ 2008-05-18 22:24:58.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am 2008-05-18 22:24:58.000000000 +0200 + libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in +--- CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(exp + + @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS + @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version ++ at MINGW32_BUILD_FALSE@libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am +--- CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200 @@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(lib if MINGW32_BUILD libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS @@ -153,164 +278,39 @@ +libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@ endif - libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) ../../src/libCEGUIBase.la -diff -up CEGUI-0.6.0/src/Makefile.am~ CEGUI-0.6.0/src/Makefile.am ---- CEGUI-0.6.0/src/Makefile.am~ 2008-05-18 22:26:54.000000000 +0200 -+++ CEGUI-0.6.0/src/Makefile.am 2008-05-18 22:26:54.000000000 +0200 -@@ -7,7 +7,7 @@ libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_E - libCEGUIBase_la_LDFLAGS += -shared -no-undefined - endif - --libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@ -+libCEGUIBase_la_LDFLAGS += -release @PACKAGE_VERSION@ - libCEGUIBase_la_LIBADD = $(freetype2_LIBS) $(pcre_LIBS) - - lib_LTLIBRARIES=libCEGUIBase.la -diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in ---- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in~ 2008-05-18 22:20:08.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in 2008-05-18 22:20:08.000000000 +0200 -@@ -229,6 +229,7 @@ libCEGUIDevILImageCodec_la_LIBADD = $(am - - @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS - @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version -+ at MINGW32_BUILD_FALSE@libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ - - lib_LTLIBRARIES = libCEGUIDevILImageCodec.la - -diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in ---- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in~ 2008-05-18 22:21:13.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in 2008-05-18 22:21:13.000000000 +0200 -@@ -228,6 +228,7 @@ libCEGUIFreeImageImageCodec_la_LIBADD = - - @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS - @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version -+ at MINGW32_BUILD_FALSE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ - - lib_LTLIBRARIES = libCEGUIFreeImageImageCodec.la - -diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in ---- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in~ 2008-05-18 22:21:59.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in 2008-05-18 22:21:59.000000000 +0200 -@@ -228,6 +228,7 @@ libCEGUISILLYImageCodec_la_LIBADD = $(am - - @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS - @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version -+ at MINGW32_BUILD_FALSE@libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ - - lib_LTLIBRARIES = libCEGUISILLYImageCodec.la - -diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in ---- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in~ 2008-05-18 22:22:40.000000000 +0200 -+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in 2008-05-18 22:22:40.000000000 +0200 -@@ -225,6 +225,7 @@ INCLUDES = -I$(top_srcdir)/include - - @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS - @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version -+ at MINGW32_BUILD_FALSE@libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ - - libCEGUITGAImageCodec_la_LIBADD = ../../src/libCEGUIBase.la - -diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in~ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in ---- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in~ 2008-05-18 22:26:17.000000000 +0200 -+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in 2008-05-18 22:26:17.000000000 +0200 -@@ -226,7 +226,7 @@ xerces_LIBS = @xerces_LIBS@ - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(OpenGL_CFLAGS) - pkginclude_HEADERS = openglrenderer.h opengltexture.h - --libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_OPENGL_VERSION_INFO@ -+libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ - - libCEGUIOpenGLRenderer_la_LIBADD = $(am__append_2) $(OpenGL_LIBS) ../../src/libCEGUIBase.la - -diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in ---- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ 2008-05-18 22:25:59.000000000 +0200 -+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-05-18 22:25:59.000000000 +0200 -@@ -228,7 +228,7 @@ INCLUDES = -I$(top_srcdir)/include \ - -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include - - --libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@ -+libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@ - libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1) - libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la - -diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in ---- CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in~ 2008-05-19 08:47:52.000000000 +0200 -+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in 2008-05-19 08:47:52.000000000 +0200 -@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@ - xerces_LIBS = @xerces_LIBS@ - INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ - --libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ -+libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ - - @MINGW32_BUILD_TRUE at libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EXPORTS - -diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in ---- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ 2008-05-18 22:25:39.000000000 +0200 -+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in 2008-05-18 22:25:39.000000000 +0200 -@@ -226,7 +226,7 @@ INCLUDES = -I$(top_srcdir)/include \ - -I$(top_srcdir)/WindowRendererSets/Falagard/include - - --libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ -+libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ - - @MINGW32_BUILD_TRUE at libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS - -diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in ---- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ 2008-05-18 22:23:23.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in 2008-05-18 22:23:23.000000000 +0200 -@@ -226,6 +226,7 @@ INCLUDES = -I$(top_srcdir)/include - - @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS - @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version -+ at MINGW32_BUILD_FALSE@libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@ - - libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la - -diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in ---- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in~ 2008-05-18 22:23:55.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in 2008-05-18 22:23:55.000000000 +0200 -@@ -228,6 +228,7 @@ libCEGUIXercesParser_la_LIBADD = $(am__a - - @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS - @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version -+ at MINGW32_BUILD_FALSE@libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@ - - lib_LTLIBRARIES = libCEGUIXercesParser.la - -diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in ---- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in~ 2008-05-18 22:24:21.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in 2008-05-18 22:24:21.000000000 +0200 -@@ -228,6 +228,7 @@ libCEGUIExpatParser_la_LIBADD = $(am__ap - - @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS - @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version -+ at MINGW32_BUILD_FALSE@libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@ - - lib_LTLIBRARIES = libCEGUIExpatParser.la - -diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in ---- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in~ 2008-05-18 22:24:56.000000000 +0200 -+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in 2008-05-18 22:24:56.000000000 +0200 -@@ -229,6 +229,7 @@ libCEGUILibxmlParser_la_LIBADD = $(am__a + libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in +--- CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200 ++++ CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200 +@@ -239,6 +239,7 @@ INCLUDES = -I$(top_srcdir)/include $(lib @MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS @MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version + at MINGW32_BUILD_FALSE@libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@ - lib_LTLIBRARIES = libCEGUILibxmlParser.la + libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.1/src/Makefile.am.foo CEGUI-0.6.1/src/Makefile.am +--- CEGUI-0.6.1/src/Makefile.am.foo 2008-06-24 21:01:53.000000000 +0200 ++++ CEGUI-0.6.1/src/Makefile.am 2008-07-11 08:28:46.000000000 +0200 +@@ -9,7 +9,7 @@ libCEGUIBase_la_LDFLAGS += -shared -no-u + libCEGUIBase_la_LIBADD += -lwinmm + endif -diff -up CEGUI-0.6.0/src/Makefile.in~ CEGUI-0.6.0/src/Makefile.in ---- CEGUI-0.6.0/src/Makefile.in~ 2008-05-18 22:27:02.000000000 +0200 -+++ CEGUI-0.6.0/src/Makefile.in 2008-05-18 22:27:02.000000000 +0200 -@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@ +-libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@ ++libCEGUIBase_la_LDFLAGS += -release @PACKAGE_VERSION@ + libCEGUIBase_la_LIBADD += $(freetype2_LIBS) $(pcre_LIBS) + + lib_LTLIBRARIES=libCEGUIBase.la +diff -up CEGUI-0.6.1/src/Makefile.in.foo CEGUI-0.6.1/src/Makefile.in +--- CEGUI-0.6.1/src/Makefile.in.foo 2008-06-29 16:09:14.000000000 +0200 ++++ CEGUI-0.6.1/src/Makefile.in 2008-07-11 08:29:26.000000000 +0200 +@@ -240,7 +240,7 @@ xerces_CFLAGS = @xerces_CFLAGS@ xerces_LIBS = @xerces_LIBS@ - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS) + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS) $(am__append_3) -libCEGUIBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ +libCEGUIBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ + libCEGUIBase_la_LIBADD = $(am__append_2) $(freetype2_LIBS) $(pcre_LIBS) @MINGW32_BUILD_TRUE at libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_EXPORTS - libCEGUIBase_la_LIBADD = $(freetype2_LIBS) $(pcre_LIBS) Index: cegui.spec =================================================================== RCS file: /cvs/extras/rpms/cegui/devel/cegui.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cegui.spec 24 May 2008 18:05:38 -0000 1.15 +++ cegui.spec 11 Jul 2008 08:00:24 -0000 1.16 @@ -1,20 +1,19 @@ Name: cegui -Version: 0.6.0 +Version: 0.6.1 Release: 1%{?dist} Summary: Free library providing windowing and widgets for graphics APIs / engines Group: System Environment/Libraries License: MIT URL: http://www.cegui.org.uk -Source0: http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/crayzedsgui/CEGUI-DOCS-%{version}.tar.gz -# Submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=196 -Patch0: cegui-0.6.0-fixweaksymbol.patch +# This is +# http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz +# with the bundled GLEW removed as its an older GLEW version which contains +# parts under then non Free SGI OpenGL and GLX licenses +Source0: CEGUI-%{version}.tar.gz +Source1: http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}-DOCS.tar.gz # Both submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=197 Patch1: cegui-0.6.0-release-as-so-ver.patch Patch2: cegui-0.6.0-userverso.patch -# Both submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=198 -Patch3: cegui-0.6.0-system-tolua++.patch -Patch4: cegui-0.6.0-system-tinyxml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: DevIL-devel BuildRequires: expat-devel @@ -61,11 +60,8 @@ %prep %setup -qb1 -qn CEGUI-%{version} -%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 # Permission fixes for debuginfo RPM chmod -x include/falagard/*.h @@ -78,6 +74,14 @@ iconv -f iso8859-1 TODO -t utf8 > TODO.conv && mv -f TODO.conv TODO iconv -f iso8859-1 README -t utf8 > README.conv && mv -f README.conv README +# Make makefile happy even though we've removed the (unused) included copy of +# GLEW due to license reasons +mkdir -p RendererModules/OpenGLGUIRenderer/GLEW/GL +touch RendererModules/OpenGLGUIRenderer/GLEW/GL/glew.h +touch RendererModules/OpenGLGUIRenderer/GLEW/GL/glxew.h +touch RendererModules/OpenGLGUIRenderer/GLEW/GL/wglew.h +touch RendererModules/OpenGLGUIRenderer/GLEW/GLEW-LICENSE + %build %configure --disable-static --disable-corona --enable-devil \ @@ -123,10 +127,15 @@ %files devel-doc +%defattr(-,root,root,-) %doc documentation/FalagardSkinning.pdf documentation/api_reference %changelog +* Fri Jul 11 2008 Hans de Goede 0.6.1-1 +- New upstream release 0.6.1 +- Drop upstreamed patches + * Sun May 18 2008 Hans de Goede 0.6.0-1 - New upstream release 0.6.0 - No ABI stability, use full versioned (libtool -release) sonames Index: sources =================================================================== RCS file: /cvs/extras/rpms/cegui/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2008 12:02:20 -0000 1.4 +++ sources 11 Jul 2008 08:00:24 -0000 1.5 @@ -1,2 +1,2 @@ -a7772b20a4e3530298e3e28c4eaec1bb CEGUI-0.6.0.tar.gz -8abece86ea0b8a52737579ac2e801978 CEGUI-DOCS-0.6.0.tar.gz +130fcdfb7a6a4b9cc72df196040e231b CEGUI-0.6.1.tar.gz +e0fe06bb43e00c5d7b278e7167740bd7 CEGUI-0.6.1-DOCS.tar.gz --- cegui-0.6.0-fixweaksymbol.patch DELETED --- --- cegui-0.6.0-system-tinyxml.patch DELETED --- --- cegui-0.6.0-system-tolua++.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 08:19:44 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Fri, 11 Jul 2008 08:19:44 GMT Subject: rpms/sepostgresql/F-9 sepostgresql-policy-8.3.3-2.patch, 1.1, 1.2 sepostgresql.init, 1.22, 1.23 sepostgresql.spec, 1.24, 1.25 Message-ID: <200807110819.m6B8JiCi014481@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14360 Modified Files: sepostgresql-policy-8.3.3-2.patch sepostgresql.init sepostgresql.spec Log Message: security policy module updates sepostgresql-policy-8.3.3-2.patch: Index: sepostgresql-policy-8.3.3-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql-policy-8.3.3-2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sepostgresql-policy-8.3.3-2.patch 11 Jul 2008 07:03:31 -0000 1.1 +++ sepostgresql-policy-8.3.3-2.patch 11 Jul 2008 08:18:50 -0000 1.2 @@ -208,7 +208,7 @@ +/var/log/sepostgresql\.log.* -- gen_context(system_u:object_r:postgresql_log_t,s0) diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if --- base/src/backend/security/sepgsql/policy/sepostgresql.if 1970-01-01 09:00:00.000000000 +0900 -+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if 2008-07-11 14:10:51.000000000 +0900 ++++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if 2008-07-11 17:12:06.000000000 +0900 @@ -0,0 +1,259 @@ +####################################### +## @@ -235,7 +235,7 @@ +## +## +# -+template(`sepostgresql_userdom_template',` ++template(`sepgsql_userdom_template',` + gen_require(` + class db_database all_db_database_perms; + class db_table all_db_table_perms; @@ -260,16 +260,16 @@ + typeattribute $2 sepgsql_client_type; + + type $1_sepgsql_blob_t; -+ postgresql_blob_object($1_sepgsql_blob_t) ++ sepgsql_blob_object($1_sepgsql_blob_t) + + type $1_sepgsql_proc_exec_t; -+ postgresql_procedure_object($1_sepgsql_proc_exec_t) ++ sepgsql_procedure_object($1_sepgsql_proc_exec_t) + + type $1_sepgsql_sysobj_t; -+ postgresql_system_table_object($1_sepgsql_sysobj_t) ++ sepgsql_system_table_object($1_sepgsql_sysobj_t) + + type $1_sepgsql_table_t; -+ postgresql_table_object($1_sepgsql_table_t) ++ sepgsql_table_object($1_sepgsql_table_t) + + role $3 types sepgsql_trusted_proc_t; + @@ -313,7 +313,7 @@ +## +## +# -+interface(`sepostgresql_loadable_module',` ++interface(`sepgsql_loadable_module',` + gen_require(` + attribute sepgsql_module_type; + ') @@ -331,7 +331,7 @@ +## +## +# -+interface(`sepostgresql_database_object',` ++interface(`sepgsql_database_object',` + gen_require(` + attribute sepgsql_database_type; + ') @@ -349,7 +349,7 @@ +## +## +# -+interface(`sepostgresql_table_object',` ++interface(`sepgsql_table_object',` + gen_require(` + attribute sepgsql_table_type; + ') @@ -367,7 +367,7 @@ +## +## +# -+interface(`sepostgresql_system_table_object',` ++interface(`sepgsql_system_table_object',` + gen_require(` + attribute sepgsql_table_type; + attribute sepgsql_sysobj_table_type; @@ -387,7 +387,7 @@ +## +## +# -+interface(`sepostgresql_procedure_object',` ++interface(`sepgsql_procedure_object',` + gen_require(` + attribute sepgsql_procedure_type; + ') @@ -405,7 +405,7 @@ +## +## +# -+interface(`sepostgresql_blob_object',` ++interface(`sepgsql_blob_object',` + gen_require(` + attribute sepgsql_blob_type; + ') @@ -424,7 +424,7 @@ +## +## +# -+interface(`sepostgresql_unpriv_client',` ++interface(`sepgsql_unpriv_client',` + gen_require(` + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; @@ -462,7 +462,7 @@ +## +## +# -+interface(`sepostgresql_unconfined',` ++interface(`sepgsql_unconfined',` + gen_require(` + attribute sepgsql_unconfined_type; + ') @@ -471,7 +471,7 @@ +') diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te --- base/src/backend/security/sepgsql/policy/sepostgresql.te 1970-01-01 09:00:00.000000000 +0900 -+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te 2008-07-11 14:10:51.000000000 +0900 ++++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te 2008-07-11 17:12:06.000000000 +0900 @@ -0,0 +1,308 @@ +policy_module(sepostgresql, 3.11) + @@ -537,42 +537,42 @@ + +# database object types +type sepgsql_blob_t; -+sepostgresql_blob_object(sepgsql_blob_t) ++sepgsql_blob_object(sepgsql_blob_t) + +type sepgsql_db_t; -+sepostgresql_database_object(sepgsql_db_t) ++sepgsql_database_object(sepgsql_db_t) + +type sepgsql_fixed_table_t; -+sepostgresql_table_object(sepgsql_fixed_table_t) ++sepgsql_table_object(sepgsql_fixed_table_t) + +type sepgsql_proc_t; -+sepostgresql_procedure_object(sepgsql_proc_t) ++sepgsql_procedure_object(sepgsql_proc_t) + +type sepgsql_ro_blob_t; -+sepostgresql_blob_object(sepgsql_ro_blob_t) ++sepgsql_blob_object(sepgsql_ro_blob_t) + +type sepgsql_ro_table_t; -+sepostgresql_table_object(sepgsql_ro_table_t) ++sepgsql_table_object(sepgsql_ro_table_t) + +type sepgsql_secret_blob_t; -+sepostgresql_blob_object(sepgsql_secret_blob_t) ++sepgsql_blob_object(sepgsql_secret_blob_t) + +type sepgsql_secret_table_t; -+sepostgresql_table_object(sepgsql_secret_table_t) ++sepgsql_table_object(sepgsql_secret_table_t) + +type sepgsql_sysobj_t; -+sepostgresql_system_table_object(sepgsql_sysobj_t) ++sepgsql_system_table_object(sepgsql_sysobj_t) + +type sepgsql_table_t; -+sepostgresql_table_object(sepgsql_table_t) ++sepgsql_table_object(sepgsql_table_t) + +type sepgsql_trusted_proc_exec_t; -+sepostgresql_procedure_object(sepgsql_trusted_proc_exec_t) ++sepgsql_procedure_object(sepgsql_trusted_proc_exec_t) + +# Trusted Procedure Domain +type sepgsql_trusted_proc_t; +domain_type(sepgsql_trusted_proc_t) -+sepostgresql_unconfined(sepgsql_trusted_proc_t) ++sepgsql_unconfined(sepgsql_trusted_proc_t) +role system_r types sepgsql_trusted_proc_t; + +######################################## @@ -680,14 +680,14 @@ + gen_require(` + type unconfined_t; + ') -+ sepostgresql_unconfined(unconfined_t) ++ sepgsql_unconfined(unconfined_t) +') + +optional_policy(` + gen_require(` + type sysadm_t; + ') -+ sepostgresql_unconfined(sysadm_t) ++ sepgsql_unconfined(sysadm_t) +') + +# unprivilleged client domain @@ -696,7 +696,7 @@ + type user_t; + role user_r; + ') -+ sepostgresql_userdom_template(user,user_t,user_r) ++ sepgsql_userdom_template(user,user_t,user_r) +') + +optional_policy(` @@ -704,7 +704,7 @@ + type staff_t; + role staff_r; + ') -+ sepostgresql_userdom_template(staff,staff_t,staff_r) ++ sepgsql_userdom_template(staff,staff_t,staff_r) +') + +optional_policy(` @@ -712,7 +712,7 @@ + type guest_t; + role guest_r; + ') -+ sepostgresql_userdom_template(guest,guest_t,guest_r) ++ sepgsql_userdom_template(guest,guest_t,guest_r) +') + +optional_policy(` @@ -720,21 +720,21 @@ + type xguest_t; + role xguest_r; + ') -+ sepostgresql_userdom_template(xguest,xguest_t,xguest_r) ++ sepgsql_userdom_template(xguest,xguest_t,xguest_r) +') + +optional_policy(` + gen_require(` + type httpd_t; + ') -+ sepostgresql_unpriv_client(httpd_t) ++ sepgsql_unpriv_client(httpd_t) +') + +optional_policy(` + gen_require(` + type httpd_sys_script_t; + ') -+ sepostgresql_unpriv_client(httpd_sys_script_t) ++ sepgsql_unpriv_client(httpd_sys_script_t) +') + +# SE-PostgreSQL loadable modules @@ -742,8 +742,8 @@ + gen_require(` + type lib_t, textrel_shlib_t; + ') -+ sepostgresql_loadable_module(lib_t) -+ sepostgresql_loadable_module(textrel_shlib_t) ++ sepgsql_loadable_module(lib_t) ++ sepgsql_loadable_module(textrel_shlib_t) +') + +######################################## Index: sepostgresql.init =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.init,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sepostgresql.init 11 Jul 2008 06:58:32 -0000 1.22 +++ sepostgresql.init 11 Jul 2008 08:18:50 -0000 1.23 @@ -9,7 +9,7 @@ PGVERSION="8.3.3" PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'` -SEPGVERSION="2.948" +SEPGVERSION="2.952" # source function library . /etc/rc.d/init.d/functions Index: sepostgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sepostgresql.spec 11 Jul 2008 07:03:31 -0000 1.24 +++ sepostgresql.spec 11 Jul 2008 08:18:50 -0000 1.25 @@ -24,7 +24,7 @@ Summary: Security Enhanced PostgreSQL Name: sepostgresql Version: 8.3.3 -Release: 2.949%{?sepgsql_extension}%{?dist} +Release: 2.952%{?sepgsql_extension}%{?dist} License: BSD Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ @@ -218,7 +218,10 @@ %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog -* Fri Jul 11 2008 - 8.3.3-2.949 +* Fri Jul 11 2008 - 8.3.3-2.952 +- Security policy module updates + +* Fri Jul 11 2008 - 8.3.3-2.945 - Add OpenSSL support - backport 8.4devel fixes From fedora-extras-commits at redhat.com Fri Jul 11 08:20:10 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:20:10 GMT Subject: rpms/php-pear-propel_generator/F-9 php-pear-propel_generator.spec, 1.1, 1.2 Message-ID: <200807110820.m6B8KAg7014521@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_generator/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14381/F-9 Modified Files: php-pear-propel_generator.spec Log Message: * imported correct approved spec Index: php-pear-propel_generator.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_generator/F-9/php-pear-propel_generator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-propel_generator.spec 8 Jul 2008 20:37:47 -0000 1.1 +++ php-pear-propel_generator.spec 11 Jul 2008 08:19:23 -0000 1.2 @@ -2,36 +2,35 @@ %define pear_name propel_generator %define channel pear.phpdb.org -Summary: An Object Relational Mapping (ORM) framework for PHP5 -Name: php-pear-%{pear_name} -Version: 1.3.0 -Release: 0.1.rc1%{?dist} - -License: LGPLv3+ -Group: Development/Tools -Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://propel.phpdb.org/trac/ - -BuildArch: noarch - -BuildRequires: php-cli >= 5.2.0 -BuildRequires: php-pear -BuildRequires: php-channel(pear.phpdb.org) -Requires: php-cli >= 5.2.0 -Requires: php-pear -Requires: php-pear-phing >= 2.3.0 -Requires: php-channel(pear.phpdb.org) -Requires: php-dom -Requires: php-xsl -Requires: php-xml -Requires: php-pdo +Summary: An ORM framework for PHP5 - generator component +Name: php-pear-%{pear_name} +Version: 1.3.0 +Release: 0.2.rc1%{?dist} + +License: LGPLv3+ +Group: Development/Tools +Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://propel.phpdb.org/trac/ + +BuildArch: noarch + +BuildRequires: php-cli >= 5.2.0 +BuildRequires: php-pear +BuildRequires: php-channel(pear.phpdb.org) +Requires: php-cli >= 5.2.0 +Requires: php-pear +Requires: php-pear-phing >= 2.3.0 +Requires: php-channel(pear.phpdb.org) +Requires: php-dom +Requires: php-xsl +Requires: php-xml +Requires: php-pdo Requires(post): %{__pear} Requires(postun): %{__pear} -Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-generator +Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -90,6 +89,11 @@ %changelog +* Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 +- updated summary +- dropped Obsoletes +- untabified + * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 - ownership of %%{pear_phpdir}/propel now claimed by both -runtime and From fedora-extras-commits at redhat.com Fri Jul 11 08:20:22 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:20:22 GMT Subject: rpms/php-pear-propel_generator/F-8 php-pear-propel_generator.spec, 1.1, 1.2 Message-ID: <200807110820.m6B8KMtr014526@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_generator/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14381/F-8 Modified Files: php-pear-propel_generator.spec Log Message: * imported correct approved spec Index: php-pear-propel_generator.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_generator/F-8/php-pear-propel_generator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-propel_generator.spec 8 Jul 2008 20:37:29 -0000 1.1 +++ php-pear-propel_generator.spec 11 Jul 2008 08:19:03 -0000 1.2 @@ -2,36 +2,35 @@ %define pear_name propel_generator %define channel pear.phpdb.org -Summary: An Object Relational Mapping (ORM) framework for PHP5 -Name: php-pear-%{pear_name} -Version: 1.3.0 -Release: 0.1.rc1%{?dist} - -License: LGPLv3+ -Group: Development/Tools -Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://propel.phpdb.org/trac/ - -BuildArch: noarch - -BuildRequires: php-cli >= 5.2.0 -BuildRequires: php-pear -BuildRequires: php-channel(pear.phpdb.org) -Requires: php-cli >= 5.2.0 -Requires: php-pear -Requires: php-pear-phing >= 2.3.0 -Requires: php-channel(pear.phpdb.org) -Requires: php-dom -Requires: php-xsl -Requires: php-xml -Requires: php-pdo +Summary: An ORM framework for PHP5 - generator component +Name: php-pear-%{pear_name} +Version: 1.3.0 +Release: 0.2.rc1%{?dist} + +License: LGPLv3+ +Group: Development/Tools +Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://propel.phpdb.org/trac/ + +BuildArch: noarch + +BuildRequires: php-cli >= 5.2.0 +BuildRequires: php-pear +BuildRequires: php-channel(pear.phpdb.org) +Requires: php-cli >= 5.2.0 +Requires: php-pear +Requires: php-pear-phing >= 2.3.0 +Requires: php-channel(pear.phpdb.org) +Requires: php-dom +Requires: php-xsl +Requires: php-xml +Requires: php-pdo Requires(post): %{__pear} Requires(postun): %{__pear} -Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-generator +Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -90,6 +89,11 @@ %changelog +* Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 +- updated summary +- dropped Obsoletes +- untabified + * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 - ownership of %%{pear_phpdir}/propel now claimed by both -runtime and From fedora-extras-commits at redhat.com Fri Jul 11 08:20:23 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:20:23 GMT Subject: rpms/php-pear-propel_generator/devel php-pear-propel_generator.spec, 1.1, 1.2 Message-ID: <200807110820.m6B8KNRj014531@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_generator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14381/devel Modified Files: php-pear-propel_generator.spec Log Message: * imported correct approved spec Index: php-pear-propel_generator.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_generator/devel/php-pear-propel_generator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-propel_generator.spec 8 Jul 2008 20:34:01 -0000 1.1 +++ php-pear-propel_generator.spec 11 Jul 2008 08:19:41 -0000 1.2 @@ -2,36 +2,35 @@ %define pear_name propel_generator %define channel pear.phpdb.org -Summary: An Object Relational Mapping (ORM) framework for PHP5 -Name: php-pear-%{pear_name} -Version: 1.3.0 -Release: 0.1.rc1%{?dist} - -License: LGPLv3+ -Group: Development/Tools -Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://propel.phpdb.org/trac/ - -BuildArch: noarch - -BuildRequires: php-cli >= 5.2.0 -BuildRequires: php-pear -BuildRequires: php-channel(pear.phpdb.org) -Requires: php-cli >= 5.2.0 -Requires: php-pear -Requires: php-pear-phing >= 2.3.0 -Requires: php-channel(pear.phpdb.org) -Requires: php-dom -Requires: php-xsl -Requires: php-xml -Requires: php-pdo +Summary: An ORM framework for PHP5 - generator component +Name: php-pear-%{pear_name} +Version: 1.3.0 +Release: 0.2.rc1%{?dist} + +License: LGPLv3+ +Group: Development/Tools +Source0: http://pear.phpdb.org/get/%{pear_name}-%{version}RC1.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://propel.phpdb.org/trac/ + +BuildArch: noarch + +BuildRequires: php-cli >= 5.2.0 +BuildRequires: php-pear +BuildRequires: php-channel(pear.phpdb.org) +Requires: php-cli >= 5.2.0 +Requires: php-pear +Requires: php-pear-phing >= 2.3.0 +Requires: php-channel(pear.phpdb.org) +Requires: php-dom +Requires: php-xsl +Requires: php-xml +Requires: php-pdo Requires(post): %{__pear} Requires(postun): %{__pear} -Provides: php-pear(%{channel}/%{pear_name}) = %{version} -Obsoletes: php-pear-propel-generator +Provides: php-pear(%{channel}/%{pear_name}) = %{version} %description Propel is an Object Relational Mapping (ORM) framework for PHP5. @@ -90,6 +89,11 @@ %changelog +* Fri Jul 11 2008 Alexander Kahl - 1.3.0-0.2.rc1 +- updated summary +- dropped Obsoletes +- untabified + * Sun Jun 1 2008 Alexander Kahl - 1.3.0-0.1.rc1 - update to 1.3.0-rc1 - ownership of %%{pear_phpdir}/propel now claimed by both -runtime and From fedora-extras-commits at redhat.com Fri Jul 11 08:23:54 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Fri, 11 Jul 2008 08:23:54 GMT Subject: rpms/khmeros-fonts/devel import.log, NONE, 1.1 khmeros-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807110823.m6B8NsDQ014676@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/khmeros-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14547/devel Modified Files: .cvsignore sources Added Files: import.log khmeros-fonts.spec Log Message: * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release --- NEW FILE import.log --- khmeros-fonts-5_0-3_fc9:HEAD:khmeros-fonts-5.0-3.fc9.src.rpm:1215764336 --- NEW FILE khmeros-fonts.spec --- %define fontname khmeros %define fontdir %{_datadir}/fonts/%{fontname} %define archivename All_KhmerOS_%{version} Name: %{fontname}-fonts Version: 5.0 Release: 3%{?dist} Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X License: LGPLv2+ URL: http://www.khmeros.info/drupal/?q=en/download/fonts Source0: http://downloads.sourceforge.net/khmer/%{archivename}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package base Summary: Base Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description base The Khmer OS fonts include base Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package battambang Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description battambang The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package bokor Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description bokor The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package handwritten Summary: Handwritten Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description handwritten The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package metalchrieng Summary: Old-fashioned Khmer font set by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description metalchrieng The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package muol Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description muol The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package siemreap Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description siemreap The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %prep %setup -q -n %{archivename} %build %install rm -rf %{buildroot} # One of the fonts is named 'KhmerOS .ttf' (note the space). # 1) It is apparently a mistake. # 2) Have problems with installing it inside %%files base rename ' ' '' * install -dm 755 %{buildroot}%{fontdir} install -pm 644 *.ttf %{buildroot}%{fontdir} %clean rm -rf %{buildroot} %post base if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post battambang if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post bokor if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post handwritten if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post metalchrieng if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post muol if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post siemreap if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun base if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun battambang if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun bokor if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun handwritten if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun metalchrieng if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun muol if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun siemreap if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %files base %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS.ttf %{fontdir}/KhmerOS_sys.ttf %{fontdir}/KhmerOS_content.ttf %files battambang %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_battambang.ttf %files bokor %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_bokor.ttf %files handwritten %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_fasthand.ttf %{fontdir}/KhmerOS_freehand.ttf %files metalchrieng %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_metalchrieng.ttf %files muol %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_muol.ttf %{fontdir}/KhmerOS_muolpali.ttf %{fontdir}/KhmerOS_muollight.ttf %files siemreap %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_siemreap.ttf %changelog * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:58:19 -0000 1.1 +++ .cvsignore 11 Jul 2008 08:23:07 -0000 1.2 @@ -0,0 +1 @@ +All_KhmerOS_5.0.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:58:19 -0000 1.1 +++ sources 11 Jul 2008 08:23:07 -0000 1.2 @@ -0,0 +1 @@ +dc1ddeb526ccbc06603da880d1e89e7b All_KhmerOS_5.0.zip From fedora-extras-commits at redhat.com Fri Jul 11 08:24:38 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:24:38 GMT Subject: rpms/php-pear-propel_generator/F-8 php-pear-propel_generator.spec, 1.2, 1.3 Message-ID: <200807110824.m6B8OcrV014757@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_generator/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14649/F-8 Modified Files: php-pear-propel_generator.spec Log Message: * small fixes (forgot three tabs, single-% in changelog) Index: php-pear-propel_generator.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_generator/F-8/php-pear-propel_generator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-propel_generator.spec 11 Jul 2008 08:19:03 -0000 1.2 +++ php-pear-propel_generator.spec 11 Jul 2008 08:23:51 -0000 1.3 @@ -69,12 +69,12 @@ %post %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{channel}/%{pear_name} >/dev/null || : + %{__pear} uninstall --nodeps --ignore-errors --register-only \ + %{channel}/%{pear_name} >/dev/null || : fi @@ -118,7 +118,7 @@ * Thu Oct 11 2007 Alexander Kahl - 1.2.1-4 - merged in all metapackages - consequently adapted macros for all shell operations -- s/%{buildroot}/$RPM_BUILD_ROOT/ +- s/%%{buildroot}/$RPM_BUILD_ROOT/ * Mon Sep 3 2007 Alexander Kahl - 1.2.1-3 - name change (lowercase) From fedora-extras-commits at redhat.com Fri Jul 11 08:24:51 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:24:51 GMT Subject: rpms/php-pear-propel_generator/F-9 php-pear-propel_generator.spec, 1.2, 1.3 Message-ID: <200807110824.m6B8Op3n014772@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_generator/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14649/F-9 Modified Files: php-pear-propel_generator.spec Log Message: * small fixes (forgot three tabs, single-% in changelog) Index: php-pear-propel_generator.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_generator/F-9/php-pear-propel_generator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-propel_generator.spec 11 Jul 2008 08:19:23 -0000 1.2 +++ php-pear-propel_generator.spec 11 Jul 2008 08:24:08 -0000 1.3 @@ -69,12 +69,12 @@ %post %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{channel}/%{pear_name} >/dev/null || : + %{__pear} uninstall --nodeps --ignore-errors --register-only \ + %{channel}/%{pear_name} >/dev/null || : fi @@ -118,7 +118,7 @@ * Thu Oct 11 2007 Alexander Kahl - 1.2.1-4 - merged in all metapackages - consequently adapted macros for all shell operations -- s/%{buildroot}/$RPM_BUILD_ROOT/ +- s/%%{buildroot}/$RPM_BUILD_ROOT/ * Mon Sep 3 2007 Alexander Kahl - 1.2.1-3 - name change (lowercase) From fedora-extras-commits at redhat.com Fri Jul 11 08:25:07 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Fri, 11 Jul 2008 08:25:07 GMT Subject: rpms/php-pear-propel_generator/devel php-pear-propel_generator.spec, 1.2, 1.3 Message-ID: <200807110825.m6B8P7dB014790@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/php-pear-propel_generator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14649/devel Modified Files: php-pear-propel_generator.spec Log Message: * small fixes (forgot three tabs, single-% in changelog) Index: php-pear-propel_generator.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-propel_generator/devel/php-pear-propel_generator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-propel_generator.spec 11 Jul 2008 08:19:41 -0000 1.2 +++ php-pear-propel_generator.spec 11 Jul 2008 08:24:22 -0000 1.3 @@ -69,12 +69,12 @@ %post %{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{channel}/%{pear_name} >/dev/null || : + %{__pear} uninstall --nodeps --ignore-errors --register-only \ + %{channel}/%{pear_name} >/dev/null || : fi @@ -118,7 +118,7 @@ * Thu Oct 11 2007 Alexander Kahl - 1.2.1-4 - merged in all metapackages - consequently adapted macros for all shell operations -- s/%{buildroot}/$RPM_BUILD_ROOT/ +- s/%%{buildroot}/$RPM_BUILD_ROOT/ * Mon Sep 3 2007 Alexander Kahl - 1.2.1-3 - name change (lowercase) From fedora-extras-commits at redhat.com Fri Jul 11 08:26:18 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Fri, 11 Jul 2008 08:26:18 GMT Subject: rpms/khmeros-fonts/F-9 import.log, NONE, 1.1 khmeros-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807110826.m6B8QIwV014923@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/khmeros-fonts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14803/F-9 Modified Files: .cvsignore sources Added Files: import.log khmeros-fonts.spec Log Message: * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release --- NEW FILE import.log --- khmeros-fonts-5_0-3_fc9:F-9:khmeros-fonts-5.0-3.fc9.src.rpm:1215764686 --- NEW FILE khmeros-fonts.spec --- %define fontname khmeros %define fontdir %{_datadir}/fonts/%{fontname} %define archivename All_KhmerOS_%{version} Name: %{fontname}-fonts Version: 5.0 Release: 3%{?dist} Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X License: LGPLv2+ URL: http://www.khmeros.info/drupal/?q=en/download/fonts Source0: http://downloads.sourceforge.net/khmer/%{archivename}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package base Summary: Base Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description base The Khmer OS fonts include base Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package battambang Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description battambang The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package bokor Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description bokor The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package handwritten Summary: Handwritten Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description handwritten The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package metalchrieng Summary: Old-fashioned Khmer font set by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description metalchrieng The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package muol Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description muol The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package siemreap Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description siemreap The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %prep %setup -q -n %{archivename} %build %install rm -rf %{buildroot} # One of the fonts is named 'KhmerOS .ttf' (note the space). # 1) It is apparently a mistake. # 2) Have problems with installing it inside %%files base rename ' ' '' * install -dm 755 %{buildroot}%{fontdir} install -pm 644 *.ttf %{buildroot}%{fontdir} %clean rm -rf %{buildroot} %post base if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post battambang if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post bokor if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post handwritten if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post metalchrieng if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post muol if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post siemreap if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun base if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun battambang if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun bokor if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun handwritten if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun metalchrieng if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun muol if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun siemreap if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %files base %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS.ttf %{fontdir}/KhmerOS_sys.ttf %{fontdir}/KhmerOS_content.ttf %files battambang %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_battambang.ttf %files bokor %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_bokor.ttf %files handwritten %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_fasthand.ttf %{fontdir}/KhmerOS_freehand.ttf %files metalchrieng %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_metalchrieng.ttf %files muol %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_muol.ttf %{fontdir}/KhmerOS_muolpali.ttf %{fontdir}/KhmerOS_muollight.ttf %files siemreap %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_siemreap.ttf %changelog * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:58:19 -0000 1.1 +++ .cvsignore 11 Jul 2008 08:25:29 -0000 1.2 @@ -0,0 +1 @@ +All_KhmerOS_5.0.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:58:19 -0000 1.1 +++ sources 11 Jul 2008 08:25:29 -0000 1.2 @@ -0,0 +1 @@ +dc1ddeb526ccbc06603da880d1e89e7b All_KhmerOS_5.0.zip From fedora-extras-commits at redhat.com Fri Jul 11 08:32:29 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Fri, 11 Jul 2008 08:32:29 GMT Subject: rpms/khmeros-fonts/F-8 import.log, NONE, 1.1 khmeros-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807110832.m6B8WTOU015229@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/khmeros-fonts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15194/F-8 Modified Files: .cvsignore sources Added Files: import.log khmeros-fonts.spec Log Message: * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release --- NEW FILE import.log --- khmeros-fonts-5_0-3_fc9:F-8:khmeros-fonts-5.0-3.fc9.src.rpm:1215764967 --- NEW FILE khmeros-fonts.spec --- %define fontname khmeros %define fontdir %{_datadir}/fonts/%{fontname} %define archivename All_KhmerOS_%{version} Name: %{fontname}-fonts Version: 5.0 Release: 3%{?dist} Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X License: LGPLv2+ URL: http://www.khmeros.info/drupal/?q=en/download/fonts Source0: http://downloads.sourceforge.net/khmer/%{archivename}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package base Summary: Base Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description base The Khmer OS fonts include base Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package battambang Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description battambang The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package bokor Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description bokor The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package handwritten Summary: Handwritten Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description handwritten The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package metalchrieng Summary: Old-fashioned Khmer font set by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description metalchrieng The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package muol Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description muol The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package siemreap Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description siemreap The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %prep %setup -q -n %{archivename} %build %install rm -rf %{buildroot} # One of the fonts is named 'KhmerOS .ttf' (note the space). # 1) It is apparently a mistake. # 2) Have problems with installing it inside %%files base rename ' ' '' * install -dm 755 %{buildroot}%{fontdir} install -pm 644 *.ttf %{buildroot}%{fontdir} %clean rm -rf %{buildroot} %post base if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post battambang if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post bokor if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post handwritten if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post metalchrieng if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post muol if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post siemreap if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun base if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun battambang if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun bokor if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun handwritten if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun metalchrieng if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun muol if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun siemreap if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %files base %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS.ttf %{fontdir}/KhmerOS_sys.ttf %{fontdir}/KhmerOS_content.ttf %files battambang %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_battambang.ttf %files bokor %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_bokor.ttf %files handwritten %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_fasthand.ttf %{fontdir}/KhmerOS_freehand.ttf %files metalchrieng %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_metalchrieng.ttf %files muol %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_muol.ttf %{fontdir}/KhmerOS_muolpali.ttf %{fontdir}/KhmerOS_muollight.ttf %files siemreap %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_siemreap.ttf %changelog * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:58:19 -0000 1.1 +++ .cvsignore 11 Jul 2008 08:31:23 -0000 1.2 @@ -0,0 +1 @@ +All_KhmerOS_5.0.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:58:19 -0000 1.1 +++ sources 11 Jul 2008 08:31:23 -0000 1.2 @@ -0,0 +1 @@ +dc1ddeb526ccbc06603da880d1e89e7b All_KhmerOS_5.0.zip From fedora-extras-commits at redhat.com Fri Jul 11 08:34:33 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Fri, 11 Jul 2008 08:34:33 GMT Subject: rpms/khmeros-fonts/EL-4 import.log, NONE, 1.1 khmeros-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807110834.m6B8YXLr015472@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/khmeros-fonts/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15409/EL-4 Modified Files: .cvsignore sources Added Files: import.log khmeros-fonts.spec Log Message: * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release --- NEW FILE import.log --- khmeros-fonts-5_0-3_fc9:EL-4:khmeros-fonts-5.0-3.fc9.src.rpm:1215765171 --- NEW FILE khmeros-fonts.spec --- %define fontname khmeros %define fontdir %{_datadir}/fonts/%{fontname} %define archivename All_KhmerOS_%{version} Name: %{fontname}-fonts Version: 5.0 Release: 3%{?dist} Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X License: LGPLv2+ URL: http://www.khmeros.info/drupal/?q=en/download/fonts Source0: http://downloads.sourceforge.net/khmer/%{archivename}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package base Summary: Base Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description base The Khmer OS fonts include base Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package battambang Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description battambang The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package bokor Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description bokor The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package handwritten Summary: Handwritten Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description handwritten The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package metalchrieng Summary: Old-fashioned Khmer font set by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description metalchrieng The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package muol Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description muol The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package siemreap Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description siemreap The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %prep %setup -q -n %{archivename} %build %install rm -rf %{buildroot} # One of the fonts is named 'KhmerOS .ttf' (note the space). # 1) It is apparently a mistake. # 2) Have problems with installing it inside %%files base rename ' ' '' * install -dm 755 %{buildroot}%{fontdir} install -pm 644 *.ttf %{buildroot}%{fontdir} %clean rm -rf %{buildroot} %post base if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post battambang if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post bokor if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post handwritten if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post metalchrieng if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post muol if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post siemreap if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun base if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun battambang if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun bokor if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun handwritten if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun metalchrieng if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun muol if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun siemreap if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %files base %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS.ttf %{fontdir}/KhmerOS_sys.ttf %{fontdir}/KhmerOS_content.ttf %files battambang %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_battambang.ttf %files bokor %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_bokor.ttf %files handwritten %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_fasthand.ttf %{fontdir}/KhmerOS_freehand.ttf %files metalchrieng %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_metalchrieng.ttf %files muol %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_muol.ttf %{fontdir}/KhmerOS_muolpali.ttf %{fontdir}/KhmerOS_muollight.ttf %files siemreap %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_siemreap.ttf %changelog * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:58:19 -0000 1.1 +++ .cvsignore 11 Jul 2008 08:33:47 -0000 1.2 @@ -0,0 +1 @@ +All_KhmerOS_5.0.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:58:19 -0000 1.1 +++ sources 11 Jul 2008 08:33:47 -0000 1.2 @@ -0,0 +1 @@ +dc1ddeb526ccbc06603da880d1e89e7b All_KhmerOS_5.0.zip From fedora-extras-commits at redhat.com Fri Jul 11 08:38:28 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Fri, 11 Jul 2008 08:38:28 GMT Subject: rpms/sepostgresql/F-9 sepostgresql.fc, 1.1, NONE sepostgresql.if, 1.2, NONE sepostgresql.te, 1.20, NONE Message-ID: <200807110838.m6B8cSC5015746@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15736 Removed Files: sepostgresql.fc sepostgresql.if sepostgresql.te Log Message: delete unneeded sepostgresql.(te|if|fc) files --- sepostgresql.fc DELETED --- --- sepostgresql.if DELETED --- --- sepostgresql.te DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 08:40:20 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Fri, 11 Jul 2008 08:40:20 GMT Subject: rpms/sepostgresql/devel sepostgresql-policy-8.3.3-2.patch, NONE, 1.1 sepostgresql-pg_dump-8.3.3-2.patch, 1.1, 1.2 sepostgresql-sepgsql-8.3.3-2.patch, 1.1, 1.2 sepostgresql.init, 1.20, 1.21 sepostgresql.spec, 1.21, 1.22 sepostgresql-pgace-8.3.3-2.patch, 1.1, NONE sepostgresql.fc, 1.1, NONE sepostgresql.if, 1.2, NONE sepostgresql.te, 1.20, NONE Message-ID: <200807110840.m6B8eKt5015862@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15761 Modified Files: sepostgresql-pg_dump-8.3.3-2.patch sepostgresql-sepgsql-8.3.3-2.patch sepostgresql.init sepostgresql.spec Added Files: sepostgresql-policy-8.3.3-2.patch Removed Files: sepostgresql-pgace-8.3.3-2.patch sepostgresql.fc sepostgresql.if sepostgresql.te Log Message: update 8.3.x based SE-PostgreSQL which contains backports frmo 8.4devel tree sepostgresql-policy-8.3.3-2.patch: --- NEW FILE sepostgresql-policy-8.3.3-2.patch --- diff -rpNU3 base/src/backend/security/sepgsql/policy/Makefile sepgsql/src/backend/security/sepgsql/policy/Makefile --- base/src/backend/security/sepgsql/policy/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/Makefile 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,41 @@ +# +# contrib/sepgsql_policy/Makefile +# Makefile of security policy module for SE-PostgreSQL +# +top_builddir = ../../../../.. +include $(top_builddir)/src/Makefile.global + +policy_basedir := /usr/share/selinux +policy_makefile := $(policy_basedir)/devel/Makefile +policy_types := targeted mls +policy := $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)) +package_names := sepostgresql sepostgresql-devel +prefix_ptn := "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g" +bindir_ptn := "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g" +libdir_ptn := "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g" + +all: + $(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;)) + $(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;) + +.install-policy: + test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy) + $(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;) + +install: all + $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;) + +%.pp: %.te %.if %.fc + rm -f $@ + $(MAKE) NAME=$(policy) -f $(policy_makefile) $@ + mv $@ $@.$(policy) + +sepostgresql-devel.fc: sepostgresql.fc.template + cat $< | grep -v ^/var | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ + +sepostgresql.fc: sepostgresql.fc.template + cat $< | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ + +clean: + $(MAKE) -f $(policy_makefile) clean + rm -f *.pp.* *.fc diff -rpNU3 base/src/backend/security/sepgsql/policy/README sepgsql/src/backend/security/sepgsql/policy/README --- base/src/backend/security/sepgsql/policy/README 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/README 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,49 @@ +The security policy module of SE-PostgreSQL +------------------------------------------- + +o Introduction + + We provide two kind of security policy modules. + + One is "sepostgresql.pp" which contains full-set of security policy + and suitable for legacy base policy (selinux-policy-3.4.1, or prior). + + The other is "sepostgresql-devel.pp" which provides several booleans + for developers, and suitable for newer base policy (selinux-policy-3.4.2, + or later). + + In the selinux-policy-3.4.2, most part of the policy got upstreamed. + So, we don't need to install "sepostgresql.pp" explicitly on the newer + base security policy. + + If you need to run regression test, or (don't) want to generate access + logs, install "sepostgresql-devel.pp" and turn on/off booleans. + +o Build & Installation + + $ cd src/backend/security/sepgsql/policy + $ make + $ su + # /usr/sbin/semodule -i sepostgresql-devel.pp + or + # /usr/sbin/semodule -i sepostgresql.pp + +o Booleans + +- sepgsql_enable_users_ddl (default: on) + This boolean enables to control to execute DDL statement come from + confined users. + +- sepgsql_enable_auditallow (default: off) + This boolean enables to generate access allow logs except for tuple + level. + +- sepgsql_enable_auditdeny (default: on) + This boolean enables to generata access denied logs except for tuple + level. + +- sepgsql_regression_test_mode (default: off) + This boolean provides several permission to run regression test on + your home directory. It enables to load shared library files deployed + on home directory. + However, we don't recommend it to turn on in the operation phase. diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if --- base/src/backend/security/sepgsql/policy/sepostgresql-devel.if 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.if 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1 @@ +## There are no interface declaration diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te --- base/src/backend/security/sepgsql/policy/sepostgresql-devel.te 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,82 @@ +policy_module(sepostgresql-devel, 3.11) + +gen_require(` + class db_database all_db_database_perms; + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_column all_db_column_perms; + class db_tuple all_db_tuple_perms; + class db_blob all_db_blob_perms; + + attribute domain, home_type; + attribute sepgsql_client_type; + attribute sepgsql_unconfined_type; + + attribute sepgsql_database_type; + attribute sepgsql_table_type; + attribute sepgsql_sysobj_table_type; + attribute sepgsql_procedure_type; + attribute sepgsql_blob_type; + attribute sepgsql_module_type; +') + +################################# +# +# SE-PostgreSQL Declarations +# + +## +##

+## Allow to generate auditallow logs +##

+## +gen_tunable(sepgsql_enable_auditallow, false) + +## +##

+## Allow to generate auditdeny logs +##

+## +gen_tunable(sepgsql_enable_auditdeny, true) + +## +##

+## Allow widespread permissions for regression test +## Don't set TRUE on operation phase +##

+## +gen_tunable(sepgsql_regression_test_mode, false) + +######################################## +# +# SE-PostgreSQL audit switch for debugging +# +tunable_policy(`sepgsql_enable_auditallow',` + auditallow domain sepgsql_database_type : db_database *; + auditallow domain sepgsql_table_type : db_table *; + auditallow domain sepgsql_table_type : db_column *; + auditallow domain sepgsql_procedure_type : db_procedure *; + auditallow domain sepgsql_blob_type : db_blob *; + auditallow domain sepgsql_module_type : db_database { install_module }; + auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +tunable_policy(`! sepgsql_enable_auditdeny',` + dontaudit domain sepgsql_database_type : db_database *; + dontaudit domain sepgsql_table_type : db_table *; + dontaudit domain sepgsql_table_type : db_column *; + dontaudit domain sepgsql_procedure_type : db_procedure *; + dontaudit domain sepgsql_blob_type : db_blob *; + dontaudit domain sepgsql_module_type : db_database { install_module }; + dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +######################################## +# +# SE-PostgreSQL regression test mode switch +# +tunable_policy(`sepgsql_regression_test_mode',` + allow sepgsql_client_type home_type : db_database { install_module }; + allow sepgsql_unconfined_type home_type : db_database { install_module }; + allow sepgsql_database_type home_type : db_database { load_module }; +') diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.fc.template sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template --- base/src/backend/security/sepgsql/policy/sepostgresql.fc.template 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template 2008-07-11 14:10:51.000000000 +0900 @@ -0,0 +1,15 @@ +# +# SE-PostgreSQL install path +# +%%__prefix__%%(/.*)? -- gen_context(system_u:object_r:usr_t,s0) + +%%__bindir__%%/(se)?postgres -- gen_context(system_u:object_r:postgresql_exec_t,s0) +%%__bindir__%%/(se)?pg_ctl -- gen_context(system_u:object_r:initrc_exec_t,s0) +%%__bindir__%%/initdb(\.sepgsql)? -- gen_context(system_u:object_r:postgresql_exec_t,s0) +%%__bindir__%%(/.*)? -- gen_context(system_u:object_r:bin_t,s0) + +%%__libdir__%%(/.*)? -- gen_context(system_u:object_r:lib_t,s0) + +/var/lib/sepgsql(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0) +/var/lib/sepgsql/pgstartup\.log gen_context(system_u:object_r:postgresql_log_t,s0) +/var/log/sepostgresql\.log.* -- gen_context(system_u:object_r:postgresql_log_t,s0) diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.if sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if --- base/src/backend/security/sepgsql/policy/sepostgresql.if 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.if 2008-07-11 17:12:06.000000000 +0900 @@ -0,0 +1,259 @@ +####################################### +## +## The userdomain template for the SE-PostgreSQL. +## +## +## This template creates a delivered types which are used +## for given userdomains. +## +## +## +## The prefix of the user domain (e.g., user +## is the prefix for user_t). +## +## +## +## +## The type of the user domain. +## +## +## +## +## The role associated with the user domain. +## +## +# +template(`sepgsql_userdom_template',` + gen_require(` + class db_database all_db_database_perms; + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_column all_db_column_perms; + class db_tuple all_db_tuple_perms; + class db_blob all_db_blob_perms; + + attribute sepgsql_client_type; + attribute sepgsql_database_type; + attribute sepgsql_sysobj_table_type; + + type sepgsql_trusted_proc_t; + type sepgsql_trusted_proc_exec_t; + ') + + ######################################## + # + # Declarations + # + + typeattribute $2 sepgsql_client_type; + + type $1_sepgsql_blob_t; + sepgsql_blob_object($1_sepgsql_blob_t) + + type $1_sepgsql_proc_exec_t; + sepgsql_procedure_object($1_sepgsql_proc_exec_t) + + type $1_sepgsql_sysobj_t; + sepgsql_system_table_object($1_sepgsql_sysobj_t) + + type $1_sepgsql_table_t; + sepgsql_table_object($1_sepgsql_table_t) + + role $3 types sepgsql_trusted_proc_t; + + ############################## + # + # Client local policy + # + + tunable_policy(`sepgsql_enable_users_ddl',` + allow $2 $1_sepgsql_table_t : db_table { create drop }; + type_transition $2 sepgsql_database_type:db_table $1_sepgsql_table_t; + + allow $2 $1_sepgsql_table_t : db_column { create drop }; + + allow $2 $1_sepgsql_sysobj_t : db_tuple { update insert delete }; + type_transition $2 sepgsql_sysobj_table_type:db_tuple $1_sepgsql_sysobj_t; + ') + + allow $2 $1_sepgsql_table_t : db_table { getattr setattr use select update insert delete }; + allow $2 $1_sepgsql_table_t : db_column { getattr setattr use select update insert }; + allow $2 $1_sepgsql_table_t : db_tuple { use select update insert delete }; + allow $2 $1_sepgsql_sysobj_t : db_tuple { use select }; + + allow $2 $1_sepgsql_proc_exec_t : db_procedure { create drop getattr setattr execute }; + type_transition $2 sepgsql_database_type:db_procedure $1_sepgsql_proc_exec_t; + + allow $2 $1_sepgsql_blob_t : db_blob { create drop getattr setattr read write }; + type_transition $2 sepgsql_database_type:db_blob $1_sepgsql_blob_t; + + allow $2 sepgsql_trusted_proc_t:process transition; + type_transition $2 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t; +') + +######################################## +## +## Marks as a SE-PostgreSQL loadable shared library module +## +## +## +## Type marked as a database object type. +## +## +# +interface(`sepgsql_loadable_module',` + gen_require(` + attribute sepgsql_module_type; + ') + + typeattribute $1 sepgsql_module_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL database object type +## +## +## +## Type marked as a database object type. +## +## +# +interface(`sepgsql_database_object',` + gen_require(` + attribute sepgsql_database_type; + ') + + typeattribute $1 sepgsql_database_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL table/column/tuple object type +## +## +## +## Type marked as a table/column/tuple object type. +## +## +# +interface(`sepgsql_table_object',` + gen_require(` + attribute sepgsql_table_type; + ') + + typeattribute $1 sepgsql_table_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL system table/column/tuple object type +## +## +## +## Type marked as a table/column/tuple object type. +## +## +# +interface(`sepgsql_system_table_object',` + gen_require(` + attribute sepgsql_table_type; + attribute sepgsql_sysobj_table_type; + ') + + typeattribute $1 sepgsql_table_type; + typeattribute $1 sepgsql_sysobj_table_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL procedure object type +## +## +## +## Type marked as a database object type. +## +## +# +interface(`sepgsql_procedure_object',` + gen_require(` + attribute sepgsql_procedure_type; + ') + + typeattribute $1 sepgsql_procedure_type; +') + +######################################## +## +## Marks as a SE-PostgreSQL binary large object type +## +## +## +## Type marked as a database binary large object type. +## +## +# +interface(`sepgsql_blob_object',` + gen_require(` + attribute sepgsql_blob_type; + ') + + typeattribute $1 sepgsql_blob_type; +') + +######################################## +## +## Allow the specified domain unprivileged accesses to unifined database objects +## managed by SE-PostgreSQL, +## +## +## +## Domain allowed access. +## +## +# +interface(`sepgsql_unpriv_client',` + gen_require(` + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_blob all_db_blob_perms; + + attribute sepgsql_client_type; + attribute sepgsql_database_type; + + type sepgsql_table_t; + type sepgsql_proc_t; + type sepgsql_blob_t; + + type sepgsql_trusted_proc_t; + type sepgsql_trusted_proc_exec_t; + ') + + typeattribute $1 sepgsql_client_type; + + type_transition $1 sepgsql_database_type:db_table sepgsql_table_t; + type_transition $1 sepgsql_database_type:db_procedure sepgsql_proc_t; + type_transition $1 sepgsql_database_type:db_blob sepgsql_blob_t; + + type_transition $1 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t; + allow $1 sepgsql_trusted_proc_t:process transition; +') + +######################################## +## +## Allow the specified domain unconfined accesses to any database objects +## managed by SE-PostgreSQL, +## +## +## +## Domain allowed access. +## +## +# +interface(`sepgsql_unconfined',` + gen_require(` + attribute sepgsql_unconfined_type; + ') + + typeattribute $1 sepgsql_unconfined_type; +') diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te --- base/src/backend/security/sepgsql/policy/sepostgresql.te 1970-01-01 09:00:00.000000000 +0900 +++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql.te 2008-07-11 17:12:06.000000000 +0900 @@ -0,0 +1,308 @@ +policy_module(sepostgresql, 3.11) + +gen_require(` + class db_database all_db_database_perms; + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_column all_db_column_perms; + class db_tuple all_db_tuple_perms; + class db_blob all_db_blob_perms; + + attribute domain, home_type; + type postgresql_t, unlabeled_t; + + role system_r; +') + +################################# +# +# SE-PostgreSQL Declarations +# + +## +##

+## Allow to generate auditallow logs +##

+## +gen_tunable(sepgsql_enable_auditallow, false) + +## +##

+## Allow to generate auditdeny logs +##

+## +gen_tunable(sepgsql_enable_auditdeny, true) + +## +##

+## Allow unprivileged users to execute DDL statement +##

+## +gen_tunable(sepgsql_enable_users_ddl, true) + +## +##

+## Allow widespread permissions for regression test +## Don't set TRUE on operation phase +##

+## +gen_tunable(sepgsql_regression_test_mode, false) + +# database clients attribute +attribute sepgsql_client_type; +attribute sepgsql_unconfined_type; + +# database objects attribute +attribute sepgsql_database_type; +attribute sepgsql_table_type; +attribute sepgsql_sysobj_table_type; +attribute sepgsql_procedure_type; +attribute sepgsql_blob_type; +attribute sepgsql_module_type; + +# database object types +type sepgsql_blob_t; +sepgsql_blob_object(sepgsql_blob_t) + +type sepgsql_db_t; +sepgsql_database_object(sepgsql_db_t) + +type sepgsql_fixed_table_t; +sepgsql_table_object(sepgsql_fixed_table_t) + +type sepgsql_proc_t; +sepgsql_procedure_object(sepgsql_proc_t) + +type sepgsql_ro_blob_t; +sepgsql_blob_object(sepgsql_ro_blob_t) + +type sepgsql_ro_table_t; +sepgsql_table_object(sepgsql_ro_table_t) + +type sepgsql_secret_blob_t; +sepgsql_blob_object(sepgsql_secret_blob_t) + +type sepgsql_secret_table_t; +sepgsql_table_object(sepgsql_secret_table_t) + +type sepgsql_sysobj_t; +sepgsql_system_table_object(sepgsql_sysobj_t) + +type sepgsql_table_t; +sepgsql_table_object(sepgsql_table_t) + +type sepgsql_trusted_proc_exec_t; +sepgsql_procedure_object(sepgsql_trusted_proc_exec_t) + +# Trusted Procedure Domain +type sepgsql_trusted_proc_t; +domain_type(sepgsql_trusted_proc_t) +sepgsql_unconfined(sepgsql_trusted_proc_t) +role system_r types sepgsql_trusted_proc_t; + +######################################## +# +# SE-PostgreSQL Local Policy +# +allow postgresql_t self:netlink_selinux_socket create_socket_perms; +selinux_get_enforce_mode(postgresql_t) +selinux_validate_context(postgresql_t) +selinux_compute_access_vector(postgresql_t) +selinux_compute_create_context(postgresql_t) +selinux_compute_relabel_context(postgresql_t) +seutil_libselinux_linked(postgresql_t) + +allow postgresql_t sepgsql_database_type:db_database *; +type_transition postgresql_t postgresql_t:db_database sepgsql_db_t; + +allow postgresql_t sepgsql_module_type:db_database install_module; +allow postgresql_t sepgsql_table_type:{ db_table db_column db_tuple } *; +allow postgresql_t sepgsql_procedure_type:db_procedure *; +allow postgresql_t sepgsql_blob_type:db_blob *; + +# server specific type transitions +type_transition postgresql_t sepgsql_database_type:db_table sepgsql_sysobj_t; +type_transition postgresql_t sepgsql_database_type:db_procedure sepgsql_proc_t; +type_transition postgresql_t sepgsql_database_type:db_blob sepgsql_blob_t; + +# Database/Loadable module +allow sepgsql_database_type sepgsql_module_type:db_database load_module; + +######################################## +# +# Rules common to all clients +# + +# Client domain constraint +allow sepgsql_client_type sepgsql_db_t:db_database { getattr access get_param set_param }; +type_transition sepgsql_client_type sepgsql_client_type:db_database sepgsql_db_t; + +allow sepgsql_client_type sepgsql_fixed_table_t:db_table { getattr use select insert }; +allow sepgsql_client_type sepgsql_fixed_table_t:db_column { getattr use select insert }; +allow sepgsql_client_type sepgsql_fixed_table_t:db_tuple { use select insert }; + +allow sepgsql_client_type sepgsql_table_t:db_table { getattr use select update insert delete }; +allow sepgsql_client_type sepgsql_table_t:db_column { getattr use select update insert }; +allow sepgsql_client_type sepgsql_table_t:db_tuple { use select update insert delete }; + +allow sepgsql_client_type sepgsql_ro_table_t:db_table { getattr use select }; +allow sepgsql_client_type sepgsql_ro_table_t:db_column { getattr use select }; +allow sepgsql_client_type sepgsql_ro_table_t:db_tuple { use select }; + +allow sepgsql_client_type sepgsql_secret_table_t:db_table getattr; +allow sepgsql_client_type sepgsql_secret_table_t:db_column getattr; + +allow sepgsql_client_type sepgsql_sysobj_t:db_table { getattr use select }; +allow sepgsql_client_type sepgsql_sysobj_t:db_column { getattr use select }; +allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select }; + +allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute }; +allow sepgsql_client_type sepgsql_trusted_proc_t:db_procedure { getattr execute entrypoint }; + +allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write }; +allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read }; +allow sepgsql_client_type sepgsql_secret_blob_t:db_blob getattr; + +tunable_policy(`sepgsql_enable_users_ddl',` + allow sepgsql_client_type sepgsql_table_t:db_table { create drop setattr }; + allow sepgsql_client_type sepgsql_table_t:db_column { create drop setattr }; + allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { update insert delete }; +') + +######################################## +# +# Unconfined access to this module +# + +allow sepgsql_unconfined_type sepgsql_database_type:db_database *; +allow sepgsql_unconfined_type sepgsql_table_type:{ db_table db_column db_tuple } *; +allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *; +allow sepgsql_unconfined_type { sepgsql_proc_t sepgsql_trusted_proc_t }:db_procedure *; +allow sepgsql_unconfined_type sepgsql_procedure_type:db_procedure { create drop getattr setattr relabelfrom relabelto }; +allow sepgsql_unconfined_type sepgsql_module_type:db_database install_module; + +type_transition sepgsql_unconfined_type sepgsql_unconfined_type:db_database sepgsql_db_t; +type_transition sepgsql_unconfined_type sepgsql_database_type:db_table sepgsql_table_t; +type_transition sepgsql_unconfined_type sepgsql_database_type:db_procedure sepgsql_proc_t; +type_transition sepgsql_unconfined_type sepgsql_database_type:db_blob sepgsql_blob_t; + + +######################################## +# +# Allow permission to external domains +# + +# relabelfrom for invalid security context +allow sepgsql_unconfined_type unlabeled_t:db_database { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_table { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_procedure { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_column { setattr relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_tuple { update relabelfrom }; +allow sepgsql_unconfined_type unlabeled_t:db_blob { setattr relabelfrom }; + +# administrative client domain +optional_policy(` + gen_require(` + type unconfined_t; + ') + sepgsql_unconfined(unconfined_t) +') + +optional_policy(` + gen_require(` + type sysadm_t; + ') + sepgsql_unconfined(sysadm_t) +') + +# unprivilleged client domain +optional_policy(` + gen_require(` + type user_t; + role user_r; + ') + sepgsql_userdom_template(user,user_t,user_r) +') + +optional_policy(` + gen_require(` + type staff_t; + role staff_r; + ') + sepgsql_userdom_template(staff,staff_t,staff_r) +') + +optional_policy(` + gen_require(` + type guest_t; + role guest_r; + ') + sepgsql_userdom_template(guest,guest_t,guest_r) +') + +optional_policy(` + gen_require(` + type xguest_t; + role xguest_r; + ') + sepgsql_userdom_template(xguest,xguest_t,xguest_r) +') + +optional_policy(` + gen_require(` + type httpd_t; + ') + sepgsql_unpriv_client(httpd_t) +') + +optional_policy(` + gen_require(` + type httpd_sys_script_t; + ') + sepgsql_unpriv_client(httpd_sys_script_t) +') + +# SE-PostgreSQL loadable modules +optional_policy(` + gen_require(` + type lib_t, textrel_shlib_t; + ') + sepgsql_loadable_module(lib_t) + sepgsql_loadable_module(textrel_shlib_t) +') + +######################################## +# +# SE-PostgreSQL audit switch for debugging +# +tunable_policy(`sepgsql_enable_auditallow',` + auditallow domain sepgsql_database_type : db_database *; + auditallow domain sepgsql_table_type : db_table *; + auditallow domain sepgsql_table_type : db_column *; + auditallow domain sepgsql_procedure_type : db_procedure *; + auditallow domain sepgsql_blob_type : db_blob *; + auditallow domain sepgsql_module_type : db_database { install_module }; + auditallow sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +tunable_policy(`! sepgsql_enable_auditdeny',` + dontaudit domain sepgsql_database_type : db_database *; + dontaudit domain sepgsql_table_type : db_table *; + dontaudit domain sepgsql_table_type : db_column *; + dontaudit domain sepgsql_procedure_type : db_procedure *; + dontaudit domain sepgsql_blob_type : db_blob *; + dontaudit domain sepgsql_module_type : db_database { install_module }; + dontaudit sepgsql_database_type sepgsql_module_type : db_database { load_module }; +') + +dontaudit domain { sepgsql_table_type - sepgsql_sysobj_table_type } : db_tuple { use select update insert delete }; + +######################################## +# +# SE-PostgreSQL regression test mode switch +# +tunable_policy(`sepgsql_regression_test_mode',` + allow sepgsql_client_type home_type : db_database { install_module }; + allow sepgsql_unconfined_type home_type : db_database { install_module }; + allow sepgsql_database_type home_type : db_database { load_module }; +') sepostgresql-pg_dump-8.3.3-2.patch: Index: sepostgresql-pg_dump-8.3.3-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-pg_dump-8.3.3-2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sepostgresql-pg_dump-8.3.3-2.patch 13 Jun 2008 04:05:55 -0000 1.1 +++ sepostgresql-pg_dump-8.3.3-2.patch 11 Jul 2008 08:39:31 -0000 1.2 @@ -1,13 +1,303 @@ -diff -rpNU3 pgace/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c ---- pgace/src/bin/pg_dump/pg_dump.c 2008-02-03 01:18:48.000000000 +0900 -+++ sepgsql/src/bin/pg_dump/pg_dump.c 2008-02-03 01:26:35.000000000 +0900 -@@ -118,6 +118,9 @@ static int g_numNamespaces; +diff -rpNU3 base/src/bin/pg_dump/pg_ace_dump.h sepgsql/src/bin/pg_dump/pg_ace_dump.h +--- base/src/bin/pg_dump/pg_ace_dump.h 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_ace_dump.h 2008-07-11 14:10:51.000000000 +0900 +@@ -0,0 +1,279 @@ ++#ifndef PG_ACE_DUMP_H ++#define PG_ACE_DUMP_H ++ ++#include "pg_backup.h" ++#include "pg_dump.h" ++ ++#define PG_ACE_FEATURE_NOTHING 0 ++#define PG_ACE_FEATURE_SELINUX 1 ++ ++#define SELINUX_SYSATTR_NAME "security_context" ++ ++/* ++ * pg_ace_dumpCheckServerFeature ++ * ++ * This hook checks whether the server has required feature, or not. ++ */ ++static inline void ++pg_ace_dumpCheckServerFeature(int feature, PGconn *conn) ++{ ++ const char *serv_feature; ++ ++ if (feature == PG_ACE_FEATURE_NOTHING) ++ return; ++ ++ serv_feature = PQparameterStatus(conn, "pgace_security_feature"); ++ if (!serv_feature) ++ { ++ fprintf(stderr, "could not get pgace_feature parameter.\n"); ++ exit(1); ++ } ++ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ if (strcmp(serv_feature, "selinux") != 0) ++ { ++ fprintf(stderr, "server does not have SELinux feature\n"); ++ exit(1); ++ } ++ } ++} ++ ++/* ++ * pg_ace_dumpDatabaseXXXX ++ * ++ * These hooks gives a chance to inject a security system column ++ * on dumping pg_database system catalog. ++ * A modified part must have ",d." style, and ++ * its result should be printed to buf. ++ */ ++static inline const char * ++pg_ace_dumpDatabaseQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return (",d." SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline void ++pg_ace_dumpDatabasePrint(int feature, PQExpBuffer buf, ++ PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int i_security = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *dbsecurity = PQgetvalue(res, index, i_security); ++ ++ if (dbsecurity) ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", dbsecurity); ++ } ++} ++ ++/* ++ * pg_ace_dumpClassXXXX ++ * ++ * These hooks give a chance to inject a security system column ++ * on dumping pg_class system catalog. The modified part has to ++ * be formalized to ",c." style. The result ++ * should be preserved at TableInfo->relsecurity to print later, ++ * if exist. ++ */ ++static inline const char * ++pg_ace_dumpClassQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return (",c." SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline char * ++pg_ace_dumpClassPreserve(int feature, PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int attno = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *relcontext; ++ ++ if (attno < 0) ++ return NULL; ++ ++ relcontext = PQgetvalue(res, index, attno); ++ ++ return !relcontext ? NULL : strdup(relcontext); ++ } ++ ++ return NULL; ++} ++ ++static inline void ++pg_ace_dumpClassPrint(int feature, PQExpBuffer buf, TableInfo *tbinfo) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ char *relcontext = tbinfo->relsecurity; ++ ++ if (relcontext) ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", relcontext); ++ ++ return; ++ } ++} ++ ++/* ++ * pg_ace_dumpAttributeXXXX ++ * ++ * These hooks give a chance to inject a security system column ++ * on dumping pg_attribute system catalog. The modified part has ++ * to be formalized to ",a." style. The result ++ * should be preserved at TableInfo->attsecurity[index] to print ++ * later, if exist. ++ */ ++static inline const char * ++pg_ace_dumpAttributeQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return (",a." SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline char * ++pg_ace_dumpAttributePreserve(int feature, PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int attno = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *attcontext; ++ ++ if (attno < 0) ++ return NULL; ++ ++ attcontext = PQgetvalue(res, index, attno); ++ ++ return !attcontext ? NULL : strdup(attcontext); ++ } ++ ++ return NULL; ++} ++ ++static inline void ++pg_ace_dumpAttributePrint(int feature, PQExpBuffer buf, ++ TableInfo *tbinfo, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ char *relcontext = tbinfo->relsecurity; ++ char *attcontext = tbinfo->attsecurity[index]; ++ ++ if (attcontext) ++ { ++ if (relcontext && strcmp(relcontext, attcontext) == 0) ++ return; ++ ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", attcontext); ++ } ++ return; ++ } ++} ++ ++/* ++ * pg_ace_dumpProcXXXX ++ * ++ * These hooks give a chance to inject a security system column ++ * on dumping pg_proc system catalog. The modified part has to be ++ * formalized to "" style. The result should be ++ * printed later, if exist. ++ */ ++static inline const char * ++pg_ace_dumpProcQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return ("," SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++static inline void ++pg_ace_dumpProcPrint(int feature, PQExpBuffer buf, ++ PGresult *res, int index) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ int i_selinux = PQfnumber(res, SELINUX_SYSATTR_NAME); ++ char *prosecurity; ++ ++ if (i_selinux < 0) ++ return; ++ ++ prosecurity = PQgetvalue(res, index, i_selinux); ++ if (prosecurity) ++ appendPQExpBuffer(buf, " SECURITY_CONTEXT = '%s'", prosecurity); ++ } ++} ++ ++/* ++ * pg_ace_dumpTableDataQuery ++ * ++ * This hook gives a chance to inject a security attribute system column ++ * on dumping of user's table. ++ * It must have "," style. ++ */ ++static inline const char * ++pg_ace_dumpTableDataQuery(int feature) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ return ("," SELINUX_SYSATTR_NAME); ++ ++ return ""; ++} ++ ++/* ++ * pg_ace_dumpCopyColumnList ++ * ++ * This hook gives a chance to inject a security attribute column within ++ * COPY statement. When a column is added, you have to return true. It ++ * enables to set needComma 'true', otherwise 'false'. ++ */ ++static inline bool ++pg_ace_dumpCopyColumnList(int feature, PQExpBuffer buf) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ appendPQExpBuffer(buf, SELINUX_SYSATTR_NAME); ++ return true; ++ } ++ ++ return false; ++} ++ ++/* ++ * pg_ace_dumpBlobComments ++ * ++ * This hook gives a chance to inject a query to restore a security ++ * attribute of binary large object. ++ */ ++static inline void ++pg_ace_dumpBlobComments(int feature, Archive *AH, PGconn *conn, Oid blobOid) ++{ ++ if (feature == PG_ACE_FEATURE_SELINUX) ++ { ++ PGresult *res; ++ char query[256]; ++ ++ snprintf(query, sizeof(query), ++ "SELECT lo_get_security(%u)", blobOid); ++ res = PQexec(conn, query); ++ if (!res) ++ return; ++ ++ if (PQresultStatus(res) == PGRES_TUPLES_OK && PQntuples(res) == 1) ++ archprintf(AH, "SELECT lo_set_security(%u, '%s');\n", ++ blobOid, PQgetvalue(res, 0, 0)); ++ ++ PQclear(res); ++ } ++} ++ ++#endif +diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c +--- base/src/bin/pg_dump/pg_dump.c 2008-02-03 01:11:28.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_dump.c 2008-07-11 14:10:51.000000000 +0900 +@@ -50,6 +50,7 @@ int optreset; + + #include "pg_backup_archiver.h" + #include "dumputils.h" ++#include "pg_ace_dump.h" + + extern char *optarg; + extern int optind, +@@ -118,6 +119,8 @@ static int g_numNamespaces; /* flag to turn on/off dollar quoting */ static int disable_dollar_quoting = 0; -+/* flag to tuen on/off SE-PostgreSQL support */ -+#define SELINUX_SYSATTR_NAME "security_context" -+static int enable_selinux = 0; ++/* flag to turn on/off security attribute support */ ++static int pg_ace_feature = PG_ACE_FEATURE_NOTHING; static void help(const char *progname); static void expand_schema_name_patterns(SimpleStringList *patterns, @@ -15,7 +305,7 @@ {"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1}, {"disable-triggers", no_argument, &disable_triggers, 1}, {"use-set-session-authorization", no_argument, &use_setsessauth, 1}, -+ {"enable-selinux", no_argument, &enable_selinux, 1}, ++ {"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX}, {NULL, 0, NULL, 0} }; @@ -23,79 +313,45 @@ disable_triggers = 1; else if (strcmp(optarg, "use-set-session-authorization") == 0) use_setsessauth = 1; -+ else if (strcmp(optarg, "enable-selinux") == 0) -+ enable_selinux = 1; ++ else if (strcmp(optarg, "security-context") == 0) ++ pg_ace_feature = PG_ACE_FEATURE_SELINUX; else { fprintf(stderr, -@@ -549,6 +555,24 @@ main(int argc, char **argv) +@@ -549,6 +555,8 @@ main(int argc, char **argv) std_strings = PQparameterStatus(g_conn, "standard_conforming_strings"); g_fout->std_strings = (std_strings && strcmp(std_strings, "on") == 0); -+ if (enable_selinux) { -+ /* confirm whther server support SELinux features */ -+ const char *tmp = PQparameterStatus(g_conn, "security_sysattr_name"); -+ -+ if (!tmp) { -+ write_msg(NULL, "could not get security_sysattr_name from libpq\n"); -+ exit(1); -+ } -+ if (!!strcmp(SELINUX_SYSATTR_NAME, tmp) != 0) { -+ write_msg(NULL, "server does not have SELinux feature\n"); -+ exit(1); -+ } -+ if (g_fout->remoteVersion < 80204) { -+ write_msg(NULL, "server version is too old (%u)\n", g_fout->remoteVersion); -+ exit(1); -+ } -+ } ++ pg_ace_dumpCheckServerFeature(pg_ace_feature, g_conn); + /* Set the datestyle to ISO to ensure the dump's portability */ do_sql_command(g_conn, "SET DATESTYLE = ISO"); -@@ -771,6 +795,7 @@ help(const char *progname) +@@ -771,6 +779,7 @@ help(const char *progname) printf(_(" --use-set-session-authorization\n" " use SESSION AUTHORIZATION commands instead of\n" " ALTER OWNER commands to set ownership\n")); -+ printf(_(" --enable-selinux enable to dump security context in SE-PostgreSQL\n")); ++ printf(_(" --security-context enable to dump security context of SE-PostgreSQL\n")); printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); -@@ -1160,7 +1185,8 @@ dumpTableData_insert(Archive *fout, void +@@ -1160,7 +1169,8 @@ dumpTableData_insert(Archive *fout, void if (fout->remoteVersion >= 70100) { appendPQExpBuffer(q, "DECLARE _pg_dump_cursor CURSOR FOR " - "SELECT * FROM ONLY %s", + "SELECT * %s FROM ONLY %s", -+ (!enable_selinux ? "" : "," SELINUX_SYSATTR_NAME), ++ pg_ace_dumpTableDataQuery(pg_ace_feature), fmtQualifiedId(tbinfo->dobj.namespace->dobj.name, classname)); } -@@ -1774,11 +1800,32 @@ dumpBlobComments(Archive *AH, void *arg) +@@ -1774,11 +1784,14 @@ dumpBlobComments(Archive *AH, void *arg) Oid blobOid; char *comment; + blobOid = atooid(PQgetvalue(res, i, 0)); + -+ /* dump security context of binary large object */ -+ if (enable_selinux) { -+ PGresult *__res; -+ char query[512]; -+ -+ snprintf(query, sizeof(query), -+ "SELECT lo_get_security(%u)", blobOid); -+ __res = PQexec(g_conn, query); -+ check_sql_result(__res, g_conn, query, PGRES_TUPLES_OK); -+ -+ if (PQntuples(__res) != 1) { -+ write_msg(NULL, "lo_get_security(%u) returns %d tuples\n", -+ blobOid, PQntuples(__res)); -+ exit_nicely(); -+ } -+ archprintf(AH, "SELECT lo_set_security(%u, '%s');\n", -+ blobOid, PQgetvalue(__res, 0, 0)); -+ PQclear(__res); -+ } ++ pg_ace_dumpBlobComments(pg_ace_feature, AH, g_conn, blobOid); + /* ignore blobs without comments */ if (PQgetisnull(res, i, 1)) @@ -105,15 +361,7 @@ comment = PQgetvalue(res, i, 1); printfPQExpBuffer(commentcmd, "COMMENT ON LARGE OBJECT %u IS ", -@@ -2886,6 +2933,7 @@ getTables(int *numTables) - int i_owning_col; - int i_reltablespace; - int i_reloptions; -+ int i_selinux; - - /* Make sure we are in proper schema */ - selectSourceSchema("pg_catalog"); -@@ -2926,6 +2974,7 @@ getTables(int *numTables) +@@ -2926,6 +2939,7 @@ getTables(int *numTables) "d.refobjsubid as owning_col, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "array_to_string(c.reloptions, ', ') as reloptions " @@ -121,41 +369,23 @@ "from pg_class c " "left join pg_depend d on " "(c.relkind = '%c' and " -@@ -2935,6 +2984,7 @@ getTables(int *numTables) +@@ -2935,6 +2949,7 @@ getTables(int *numTables) "where relkind in ('%c', '%c', '%c', '%c') " "order by c.oid", username_subquery, -+ (!enable_selinux ? "" : ",c." SELINUX_SYSATTR_NAME), ++ pg_ace_dumpClassQuery(pg_ace_feature), RELKIND_SEQUENCE, RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW, RELKIND_COMPOSITE_TYPE); -@@ -3101,6 +3151,7 @@ getTables(int *numTables) - i_owning_col = PQfnumber(res, "owning_col"); - i_reltablespace = PQfnumber(res, "reltablespace"); - i_reloptions = PQfnumber(res, "reloptions"); -+ i_selinux = PQfnumber(res, SELINUX_SYSATTR_NAME); - - for (i = 0; i < ntups; i++) - { -@@ -3131,6 +3182,9 @@ getTables(int *numTables) +@@ -3131,6 +3146,7 @@ getTables(int *numTables) } tblinfo[i].reltablespace = strdup(PQgetvalue(res, i, i_reltablespace)); tblinfo[i].reloptions = strdup(PQgetvalue(res, i, i_reloptions)); -+ tblinfo[i].relsecurity = NULL; -+ if (i_selinux >= 0) -+ tblinfo[i].relsecurity = strdup(PQgetvalue(res, i, i_selinux)); ++ tblinfo[i].relsecurity = pg_ace_dumpClassPreserve(pg_ace_feature, res, i); /* other fields were zeroed above */ -@@ -4319,6 +4373,7 @@ getTableAttrs(TableInfo *tblinfo, int nu - int i_atthasdef; - int i_attisdropped; - int i_attislocal; -+ int i_attselinux; - PGresult *res; - int ntups; - bool hasdefaults; -@@ -4362,11 +4417,13 @@ getTableAttrs(TableInfo *tblinfo, int nu +@@ -4362,11 +4378,13 @@ getTableAttrs(TableInfo *tblinfo, int nu appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, a.attstattarget, a.attstorage, t.typstorage, " "a.attnotnull, a.atthasdef, a.attisdropped, a.attislocal, " "pg_catalog.format_type(t.oid,a.atttypmod) as atttypname " @@ -165,19 +395,11 @@ "where a.attrelid = '%u'::pg_catalog.oid " "and a.attnum > 0::pg_catalog.int2 " "order by a.attrelid, a.attnum", -+ (!enable_selinux ? "" : ",a." SELINUX_SYSATTR_NAME), ++ pg_ace_dumpAttributeQuery(pg_ace_feature), tbinfo->dobj.catId.oid); } else if (g_fout->remoteVersion >= 70100) -@@ -4415,6 +4472,7 @@ getTableAttrs(TableInfo *tblinfo, int nu - i_atthasdef = PQfnumber(res, "atthasdef"); - i_attisdropped = PQfnumber(res, "attisdropped"); - i_attislocal = PQfnumber(res, "attislocal"); -+ i_attselinux = PQfnumber(res, SELINUX_SYSATTR_NAME); - - tbinfo->numatts = ntups; - tbinfo->attnames = (char **) malloc(ntups * sizeof(char *)); -@@ -4425,6 +4483,7 @@ getTableAttrs(TableInfo *tblinfo, int nu +@@ -4425,6 +4443,7 @@ getTableAttrs(TableInfo *tblinfo, int nu tbinfo->typstorage = (char *) malloc(ntups * sizeof(char)); tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool)); tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool)); @@ -185,97 +407,67 @@ tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool)); tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *)); tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool)); -@@ -4456,6 +4515,11 @@ getTableAttrs(TableInfo *tblinfo, int nu +@@ -4456,6 +4475,8 @@ getTableAttrs(TableInfo *tblinfo, int nu tbinfo->inhAttrs[j] = false; tbinfo->inhAttrDef[j] = false; tbinfo->inhNotNull[j] = false; + -+ /* security attribute, if defined */ -+ tbinfo->attsecurity[j] = NULL; -+ if (i_attselinux >= 0 && !PQgetisnull(res, j, i_attselinux)) -+ tbinfo->attsecurity[j] = strdup(PQgetvalue(res, j, i_attselinux)); ++ tbinfo->attsecurity[j] = pg_ace_dumpAttributePreserve(pg_ace_feature, res, j); } PQclear(res); -@@ -6428,6 +6492,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) - char *proconfig; - char *procost; - char *prorows; -+ char *proselinux = NULL; - char *lanname; - char *rettypename; - int nallargs; -@@ -6459,8 +6524,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -6459,8 +6480,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "provolatile, proisstrict, prosecdef, " "proconfig, procost, prorows, " "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname " + "%s " /* security context, if required */ "FROM pg_catalog.pg_proc " "WHERE oid = '%u'::pg_catalog.oid", -+ (!enable_selinux ? "" : "," SELINUX_SYSATTR_NAME), ++ pg_ace_dumpProcQuery(pg_ace_feature), finfo->dobj.catId.oid); } else if (g_fout->remoteVersion >= 80100) -@@ -6562,6 +6629,13 @@ dumpFunc(Archive *fout, FuncInfo *finfo) - prorows = PQgetvalue(res, 0, PQfnumber(res, "prorows")); - lanname = PQgetvalue(res, 0, PQfnumber(res, "lanname")); - -+ if (enable_selinux) { -+ int i_selinux = PQfnumber(res, "security_context"); -+ -+ if (i_selinux >= 0 && !PQgetisnull(res, 0, i_selinux)) -+ proselinux = PQgetvalue(res, 0, i_selinux); -+ } -+ - /* - * See backend/commands/define.c for details of how the 'AS' clause is - * used. -@@ -6698,6 +6772,9 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -6698,6 +6721,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo) if (prosecdef[0] == 't') appendPQExpBuffer(q, " SECURITY DEFINER"); -+ if (proselinux) -+ appendPQExpBuffer(q, " CONTEXT = '%s'", proselinux); ++ pg_ace_dumpProcPrint(pg_ace_feature, q, res, 0); + /* * COST and ROWS are emitted only if present and not default, so as not to * break backwards-compatibility of the dump without need. Keep this code -@@ -8779,6 +8856,9 @@ dumpTableSchema(Archive *fout, TableInfo +@@ -8779,6 +8804,8 @@ dumpTableSchema(Archive *fout, TableInfo if (tbinfo->notnull[j] && !tbinfo->inhNotNull[j]) appendPQExpBuffer(q, " NOT NULL"); -+ if (enable_selinux && tbinfo->attsecurity[j]) -+ appendPQExpBuffer(q, " CONTEXT = '%s'", tbinfo->attsecurity[j]); ++ pg_ace_dumpAttributePrint(pg_ace_feature, q, tbinfo, j); + actual_atts++; } } -@@ -8826,6 +8906,9 @@ dumpTableSchema(Archive *fout, TableInfo +@@ -8826,6 +8853,8 @@ dumpTableSchema(Archive *fout, TableInfo if (tbinfo->reloptions && strlen(tbinfo->reloptions) > 0) appendPQExpBuffer(q, "\nWITH (%s)", tbinfo->reloptions); -+ if (enable_selinux && tbinfo->relsecurity) -+ appendPQExpBuffer(q, " CONTEXT = '%s'", tbinfo->relsecurity); ++ pg_ace_dumpClassPrint(pg_ace_feature, q, tbinfo); + appendPQExpBuffer(q, ";\n"); /* Loop dumping statistics and storage statements */ -@@ -10243,6 +10326,12 @@ fmtCopyColumnList(const TableInfo *ti) +@@ -10243,6 +10272,10 @@ fmtCopyColumnList(const TableInfo *ti) appendPQExpBuffer(q, "("); needComma = false; + -+ if (enable_selinux) { -+ appendPQExpBuffer(q, SELINUX_SYSATTR_NAME); ++ if (pg_ace_dumpCopyColumnList(pg_ace_feature, q)) + needComma = true; -+ } + for (i = 0; i < numatts; i++) { if (attisdropped[i]) -diff -rpNU3 pgace/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h ---- pgace/src/bin/pg_dump/pg_dump.h 2008-01-08 01:39:49.000000000 +0900 -+++ sepgsql/src/bin/pg_dump/pg_dump.h 2008-01-10 18:25:12.000000000 +0900 +diff -rpNU3 base/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h +--- base/src/bin/pg_dump/pg_dump.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_dump.h 2008-06-15 22:27:55.000000000 +0900 @@ -238,6 +238,7 @@ typedef struct _tableInfo char relkind; char *reltablespace; /* relation tablespace */ @@ -292,16 +484,23 @@ /* * Note: we need to store per-attribute notnull, default, and constraint -diff -rpNU3 pgace/src/bin/pg_dump/pg_dumpall.c sepgsql/src/bin/pg_dump/pg_dumpall.c ---- pgace/src/bin/pg_dump/pg_dumpall.c 2008-01-08 01:39:49.000000000 +0900 -+++ sepgsql/src/bin/pg_dump/pg_dumpall.c 2008-01-10 18:25:12.000000000 +0900 -@@ -67,6 +67,10 @@ static int disable_triggers = 0; +diff -rpNU3 base/src/bin/pg_dump/pg_dumpall.c sepgsql/src/bin/pg_dump/pg_dumpall.c +--- base/src/bin/pg_dump/pg_dumpall.c 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/bin/pg_dump/pg_dumpall.c 2008-07-11 14:10:51.000000000 +0900 +@@ -27,6 +27,7 @@ int optreset; + #endif + + #include "dumputils.h" ++#include "pg_ace_dump.h" + + + /* version string we expect back from pg_dump */ +@@ -67,6 +68,9 @@ static int disable_triggers = 0; static int use_setsessauth = 0; static int server_version; -+/* flag to tuen on/off SE-PostgreSQL support */ -+#define SELINUX_SYSATTR_NAME "security_context" -+static int enable_selinux = 0; ++/* flag to turn on/off security attribute support */ ++static int pg_ace_feature = PG_ACE_FEATURE_NOTHING; + static FILE *OPF; static char *filename = NULL; @@ -310,67 +509,46 @@ {"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1}, {"disable-triggers", no_argument, &disable_triggers, 1}, {"use-set-session-authorization", no_argument, &use_setsessauth, 1}, -+ {"enable-selinux", no_argument, NULL, 1001}, ++ {"security-context", no_argument, &pg_ace_feature, PG_ACE_FEATURE_SELINUX}, {NULL, 0, NULL, 0} }; -@@ -290,6 +295,10 @@ main(int argc, char *argv[]) +@@ -290,6 +295,8 @@ main(int argc, char *argv[]) appendPQExpBuffer(pgdumpopts, " --disable-triggers"); else if (strcmp(optarg, "use-set-session-authorization") == 0) /* no-op, still allowed for compatibility */ ; -+ else if (strcmp(optarg, "enable-selinux") == 0) { -+ appendPQExpBuffer(pgdumpopts, " --enable-selinux"); -+ enable_selinux = 1; -+ } ++ else if (strcmp(optarg, "security-context") == 0) ++ pg_ace_feature = PG_ACE_FEATURE_SELINUX; else { fprintf(stderr, -@@ -300,6 +309,11 @@ main(int argc, char *argv[]) - } - break; - -+ case 1001: -+ appendPQExpBuffer(pgdumpopts, " --enable-selinux"); -+ enable_selinux = 1; -+ break; -+ - case 0: - break; +@@ -316,6 +323,8 @@ main(int argc, char *argv[]) + appendPQExpBuffer(pgdumpopts, " --disable-triggers"); + if (use_setsessauth) + appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization"); ++ if (pg_ace_feature == PG_ACE_FEATURE_SELINUX) ++ appendPQExpBuffer(pgdumpopts, " --security-context"); -@@ -391,6 +405,24 @@ main(int argc, char *argv[]) + if (optind < argc) + { +@@ -391,6 +400,8 @@ main(int argc, char *argv[]) } } -+ if (enable_selinux) { -+ /* confirm whther server support SELinux features */ -+ const char *tmp = PQparameterStatus(conn, "security_sysattr_name"); -+ -+ if (!tmp) { -+ fprintf(stderr, "could not get security_sysattr_name from libpq\n"); -+ exit(1); -+ } -+ if (!!strcmp(SELINUX_SYSATTR_NAME, tmp) != 0) { -+ fprintf(stderr, "server does not have SELinux feature\n"); -+ exit(1); -+ } -+ if (server_version < 80204) { -+ fprintf(stderr, "server version is too old (%u)\n", server_version); -+ exit(1); -+ } -+ } ++ pg_ace_dumpCheckServerFeature(pg_ace_feature, conn); + /* * Open the output file if required, otherwise use stdout */ -@@ -505,6 +537,7 @@ help(void) +@@ -505,6 +516,7 @@ help(void) printf(_(" --use-set-session-authorization\n" " use SESSION AUTHORIZATION commands instead of\n" " OWNER TO commands\n")); -+ printf(_(" --enable-selinux enable to dump security attribute\n")); ++ printf(_(" --security-context enables to dump security context of SE-PostgreSQL\n")); printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); -@@ -915,16 +948,18 @@ dumpCreateDB(PGconn *conn) +@@ -915,16 +927,18 @@ dumpCreateDB(PGconn *conn) fprintf(OPF, "--\n-- Database creation\n--\n\n"); if (server_version >= 80100) @@ -385,14 +563,14 @@ "FROM pg_database d LEFT JOIN pg_authid u ON (datdba = u.oid) " - "WHERE datallowconn ORDER BY 1"); + "WHERE datallowconn ORDER BY 1", -+ (!enable_selinux ? "" : "d." SELINUX_SYSATTR_NAME)); ++ pg_ace_dumpDatabaseQuery(pg_ace_feature)); else if (server_version >= 80000) - res = executeQuery(conn, + appendPQExpBuffer(buf, "SELECT datname, " "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), " "pg_encoding_to_char(d.encoding), " -@@ -933,7 +968,7 @@ dumpCreateDB(PGconn *conn) +@@ -933,7 +947,7 @@ dumpCreateDB(PGconn *conn) "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) " "WHERE datallowconn ORDER BY 1"); else if (server_version >= 70300) @@ -401,7 +579,7 @@ "SELECT datname, " "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), " "pg_encoding_to_char(d.encoding), " -@@ -942,7 +977,7 @@ dumpCreateDB(PGconn *conn) +@@ -942,7 +956,7 @@ dumpCreateDB(PGconn *conn) "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) " "WHERE datallowconn ORDER BY 1"); else if (server_version >= 70100) @@ -410,7 +588,7 @@ "SELECT datname, " "coalesce(" "(select usename from pg_shadow where usesysid=datdba), " -@@ -958,7 +993,7 @@ dumpCreateDB(PGconn *conn) +@@ -958,7 +972,7 @@ dumpCreateDB(PGconn *conn) * Note: 7.0 fails to cope with sub-select in COALESCE, so just deal * with getting a NULL by not printing any OWNER clause. */ @@ -419,7 +597,7 @@ "SELECT datname, " "(select usename from pg_shadow where usesysid=datdba), " "pg_encoding_to_char(d.encoding), " -@@ -968,6 +1003,7 @@ dumpCreateDB(PGconn *conn) +@@ -968,6 +982,7 @@ dumpCreateDB(PGconn *conn) "FROM pg_database d " "ORDER BY 1"); } @@ -427,20 +605,11 @@ for (i = 0; i < PQntuples(res); i++) { -@@ -978,6 +1014,7 @@ dumpCreateDB(PGconn *conn) - char *dbacl = PQgetvalue(res, i, 4); - char *dbconnlimit = PQgetvalue(res, i, 5); - char *dbtablespace = PQgetvalue(res, i, 6); -+ char *dbsecurity = PQgetvalue(res, i, 7); - char *fdbname; - - fdbname = strdup(fmtId(dbname)); -@@ -1021,6 +1058,9 @@ dumpCreateDB(PGconn *conn) +@@ -1021,6 +1036,8 @@ dumpCreateDB(PGconn *conn) appendPQExpBuffer(buf, " CONNECTION LIMIT = %s", dbconnlimit); -+ if (enable_selinux && dbsecurity) -+ appendPQExpBuffer(buf, " CONTEXT = '%s'", dbsecurity); ++ pg_ace_dumpDatabasePrint(pg_ace_feature, buf, res, i); + appendPQExpBuffer(buf, ";\n"); sepostgresql-sepgsql-8.3.3-2.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 sepostgresql-sepgsql-8.3.3-2.patch Index: sepostgresql-sepgsql-8.3.3-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-sepgsql-8.3.3-2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sepostgresql-sepgsql-8.3.3-2.patch 13 Jun 2008 04:05:55 -0000 1.1 +++ sepostgresql-sepgsql-8.3.3-2.patch 11 Jul 2008 08:39:31 -0000 1.2 @@ -1,6 +1,6 @@ -diff -rpNU3 pgace/configure sepgsql/configure ---- pgace/configure 2008-06-12 23:48:15.000000000 +0900 -+++ sepgsql/configure 2008-06-12 23:52:36.000000000 +0900 +diff -rpNU3 base/configure sepgsql/configure +--- base/configure 2008-06-12 23:42:03.000000000 +0900 ++++ sepgsql/configure 2008-06-14 02:36:58.000000000 +0900 @@ -314,7 +314,7 @@ ac_includes_default="\ # include #endif" @@ -18,7 +18,7 @@ --disable-largefile omit support for large files Optional Packages: -@@ -4619,6 +4620,118 @@ fi; +@@ -4619,6 +4620,120 @@ fi; # @@ -116,11 +116,13 @@ +echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getpeercon" >&5 +echo "${ECHO_T}$ac_cv_lib_selinux_getpeercon" >&6 +if test $ac_cv_lib_selinux_getpeercon = yes; then -+ cat >>confdefs.h <<\_ACEOF ++ ++cat >>confdefs.h <<\_ACEOF +#define SECURITY_SYSATTR_NAME "security_context" +_ACEOF + -+ cat >>confdefs.h <<_ACEOF ++ ++cat >>confdefs.h <<_ACEOF +#define HAVE_SELINUX 1 +_ACEOF + @@ -137,7 +139,7 @@ # Elf # -@@ -26006,6 +26119,7 @@ s, at with_libxml@,$with_libxml,;t t +@@ -26006,6 +26121,7 @@ s, at with_libxml@,$with_libxml,;t t s, at with_libxslt@,$with_libxslt,;t t s, at with_system_tzdata@,$with_system_tzdata,;t t s, at with_zlib@,$with_zlib,;t t @@ -145,10 +147,10 @@ s, at EGREP@,$EGREP,;t t s, at ELF_SYS@,$ELF_SYS,;t t s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t -diff -rpNU3 pgace/configure.in sepgsql/configure.in ---- pgace/configure.in 2008-06-12 23:48:15.000000000 +0900 -+++ sepgsql/configure.in 2008-06-12 23:52:36.000000000 +0900 -@@ -626,6 +626,19 @@ PGAC_ARG_BOOL(with, zlib, yes, +diff -rpNU3 base/configure.in sepgsql/configure.in +--- base/configure.in 2008-06-12 23:42:03.000000000 +0900 ++++ sepgsql/configure.in 2008-06-14 02:36:58.000000000 +0900 +@@ -626,6 +626,21 @@ PGAC_ARG_BOOL(with, zlib, yes, AC_SUBST(with_zlib) # @@ -158,8 +160,10 @@ + [ --enable-selinux build with NSA SELinux support]) +if test "$enable_selinux" = yes; then + AC_CHECK_LIB(selinux, getpeercon, -+ AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context") -+ AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1) ++ AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context", ++ [Enables system column for security attribute support]) ++ AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1, ++ [Enables SE-PostgreSQL feature]) + AC_SUBST(enable_selinux), + AC_MSG_ERROR("--enable-selinux requires libselinux.")) +fi @@ -168,9 +172,792 @@ # Elf # -diff -rpNU3 pgace/src/Makefile.global.in sepgsql/src/Makefile.global.in ---- pgace/src/Makefile.global.in 2007-11-18 02:56:38.000000000 +0900 -+++ sepgsql/src/Makefile.global.in 2007-11-22 23:10:13.000000000 +0900 +diff -rpNU3 base/contrib/sepgsql_policy/Makefile sepgsql/contrib/sepgsql_policy/Makefile +--- base/contrib/sepgsql_policy/Makefile 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/Makefile 2008-06-26 11:44:44.000000000 +0900 +@@ -0,0 +1,40 @@ ++# ++# contrib/sepgsql_policy/Makefile ++# Makefile of security policy module for SE-PostgreSQL ++# ++top_builddir = ../.. ++include $(top_builddir)/src/Makefile.global ++ ++policy_basedir := /usr/share/selinux ++policy_makefile := $(policy_basedir)/devel/Makefile ++policy_types := targeted mls ++policy := $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)) ++package_names := sepostgresql sepostgresql-devel ++prefix_ptn := "s/%%__prefix__%%/$(shell echo $(prefix)|sed 's/\//\\\//g')/g" ++bindir_ptn := "s/%%__bindir__%%/$(shell echo $(bindir)|sed 's/\//\\\//g')/g" ++libdir_ptn := "s/%%__libdir__%%/$(shell echo $(pkglibdir)|sed 's/\//\\\//g')/g" ++ ++all: ++ $(foreach pkg, $(package_names), $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) $(pkg).pp;)) ++ $(foreach pkg, $(package_names), test -e $(pkg).pp.$(policy) && ln -sf $(pkg).pp.$(policy) $(pkg).pp;) ++ ++.install-policy: ++ test -d $(DESTDIR)$(policy_basedir)/$(policy) || install -d $(DESTDIR)$(policy_basedir)/$(policy) ++ $(foreach pkg, $(package_names), install -p -m 644 $(pkg).pp.$(policy) $(DESTDIR)$(policy_basedir)/$(policy)/$(pkg).pp;) ++ ++install: all ++ $(foreach p, $(policy_types), $(MAKE) $(MAKEOVERRIDES) policy=$(p) .install-policy;) ++ ++%.pp: %.te %.if %.fc ++ $(MAKE) NAME=$(policy) -f $(policy_makefile) $@ ++ mv $@ $@.$(policy) ++ ++sepostgresql-devel.fc: sepostgresql.fc.template ++ cat $< | grep -v ^/var | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ ++ ++sepostgresql.fc: sepostgresql.fc.template ++ cat $< | sed -e $(prefix_ptn) -e $(bindir_ptn) -e $(libdir_ptn) > $@ ++ ++clean: ++ $(MAKE) -f $(policy_makefile) clean ++ rm -f *.pp.* *.fc +diff -rpNU3 base/contrib/sepgsql_policy/README sepgsql/contrib/sepgsql_policy/README +--- base/contrib/sepgsql_policy/README 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/README 2008-06-19 13:12:15.000000000 +0900 +@@ -0,0 +1,50 @@ ++The security policy module of SE-PostgreSQL ++------------------------------------------- ++ ++o Introduction ++ ++ We provide two kind of security policy modules. ++ ++ One is "sepostgresql.pp" which contains full-set of security policy ++ and suitable for legacy base policy (selinux-policy-3.4.1, or prior). ++ ++ The other is "sepostgresql-devel.pp" which provides several booleans ++ for developers, and suitable for newer base policy (selinux-policy-3.4.2, ++ or later). ++ ++ In the selinux-policy-3.4.2, most part of the policy got upstreamed. ++ So, we don't need to install "sepostgresql.pp" explicitly on the newer ++ base security policy. ++ ++ If you need to run regression test, or (don't) want to generate access ++ logs, install "sepostgresql-devel.pp" and turn on/off booleans. ++ ++o Build & Installation ++ ++ $ cd contrib/sepgsql_policy ++ $ make ++ $ su ++ # /usr/sbin/semodule -i sepostgresql-devel.pp ++ or ++ # /usr/sbin/semodule -i sepostgresql.pp ++ ++o Booleans ++ ++- sepgsql_enable_users_ddl (default: on) ++ This boolean enables to control to execute DDL statement come from ++ confined users. ++ ++- sepgsql_enable_auditallow (default: off) ++ This boolean enables to generate access allow logs except for tuple ++ level. ++ ++- sepgsql_enable_auditdeny (default: on) ++ This boolean enables to generata access denied logs except for tuple ++ level. ++ ++- sepgsql_regression_test_mode (default: off) ++ This boolean provides several permission to run regression test on ++ your home directory. It enables to load shared library files deployed ++ on home directory. ++ However, we don't recommend it to turn on in the operation phase. ++ +diff -rpNU3 base/contrib/sepgsql_policy/sepostgresql-devel.if sepgsql/contrib/sepgsql_policy/sepostgresql-devel.if +--- base/contrib/sepgsql_policy/sepostgresql-devel.if 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/sepostgresql-devel.if 2008-06-19 13:12:15.000000000 +0900 +@@ -0,0 +1 @@ ++## There are no interface declaration +diff -rpNU3 base/contrib/sepgsql_policy/sepostgresql-devel.te sepgsql/contrib/sepgsql_policy/sepostgresql-devel.te +--- base/contrib/sepgsql_policy/sepostgresql-devel.te 1970-01-01 09:00:00.000000000 +0900 ++++ sepgsql/contrib/sepgsql_policy/sepostgresql-devel.te 2008-06-26 11:44:44.000000000 +0900 +@@ -0,0 +1,82 @@ ++policy_module(sepostgresql-devel, 3.11) ++ ++gen_require(` ++ class db_database all_db_database_perms; ++ class db_table all_db_table_perms; ++ class db_procedure all_db_procedure_perms; [...14689 lines suppressed...] ++extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple, void **pgaceItem); ++ ++extern void sepgsqlLargeObjectRead(LargeObjectDesc *lodesc, int length); ++ ++extern void sepgsqlLargeObjectWrite(LargeObjectDesc *lodesc, int length); ++ ++extern void sepgsqlLargeObjectTruncate(LargeObjectDesc *lodesc, int offset); ++ ++extern void sepgsqlLargeObjectImport(Oid loid, int fdesc, const char *filename); ++ ++extern void sepgsqlLargeObjectExport(Oid loid, int fdesc, const char *filename); ++ ++extern void sepgsqlLargeObjectGetSecurity(Relation rel, HeapTuple tuple); ++ ++extern void sepgsqlLargeObjectSetSecurity(Relation rel, HeapTuple newtup, HeapTuple oldtup); + +/* Security Label hooks */ -+extern char *sepgsqlSecurityLabelIn(char *context); -+extern char *sepgsqlSecurityLabelOut(char *context); -+extern char *sepgsqlSecurityLabelCheckValid(char *context); -+extern char *sepgsqlSecurityLabelOfLabel(char *context); -+ -+/* Extended node type hooks */ -+extern Node *sepgsqlCopyObject(Node *node); -+extern bool sepgsqlOutObject(StringInfo str, Node *node); -+extern void *sepgsqlReadObject(char *token); ++extern char *sepgsqlTranslateSecurityLabelIn(char *context); ++ ++extern char *sepgsqlTranslateSecurityLabelOut(char *context); ++ ++extern char *sepgsqlValidateSecurityLabel(char *context); ++ ++extern char *sepgsqlSecurityLabelOfLabel(void); + +/* + * SE-PostgreSQL core functions -+ * src/backend/security/sepgsql/core.c ++ * src/backend/security/sepgsql/core.c ++ */ ++extern bool sepgsqlIsEnabled(void); ++ ++extern const security_context_t sepgsqlGetServerContext(void); ++ ++extern const security_context_t sepgsqlGetClientContext(void); ++ ++extern const security_context_t sepgsqlGetDatabaseContext(void); ++ ++extern const security_context_t sepgsqlGetUnlabeledContext(void); ++ ++extern const security_context_t sepgsqlSwitchClientContext(security_context_t newcon); ++ ++extern Oid sepgsqlGetDatabaseSecurityId(void); ++ ++/* ++ * SE-PostgreSQL userspace avc functions ++ * src/backend/security/sepgsql/avc.c + */ -+extern bool sepgsqlIsEnabled(void); -+extern Oid sepgsqlGetServerContext(void); -+extern Oid sepgsqlGetClientContext(void); -+extern void sepgsqlSetClientContext(Oid new_ctx); -+extern Oid sepgsqlGetDatabaseContext(void); -+extern char *sepgsqlGetDatabaseName(void); -+ -+/* userspace access vector cache related */ -+extern void sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass, -+ uint32 perms, char *objname); -+extern bool sepgsql_avc_permission_noabort(Oid ssid, Oid tsid, uint16 tclass, -+ uint32 perms, char *objname); -+extern Oid sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass); -+extern Oid sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass); ++extern void sepgsqlAvcInit(void); ++ ++extern bool sepgsqlAvcPermission(const security_context_t scon, ++ const security_context_t tcon, ++ security_class_t tclass, ++ access_vector_t perms, ++ const char *objname, ++ bool abort); ++ ++extern bool sepgsqlAvcPermissionSid(const security_context_t scon, ++ Oid tsid, ++ security_class_t tclass, ++ access_vector_t perms, ++ const char *objname, ++ bool abort); ++ ++extern security_context_t sepgsqlAvcCreateCon(const security_context_t scon, ++ const security_context_t tcon, ++ security_class_t tclass); ++ ++extern Oid sepgsqlAvcCreateConSid(const security_context_t scon, ++ Oid tsid, ++ security_class_t tclass); + +/* + * SE-PostgreSQL permission evaluation related -+ * src/backend/security/sepgsql/permission.c ++ * src/backend/security/sepgsql/permission.c + */ -+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple, NameData *name); -+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple); -+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup, -+ uint32 perms, bool abort); ++extern const char *sepgsqlTupleName(Oid relid, HeapTuple tuple); ++ ++extern void sepgsqlSetDefaultContext(Relation rel, HeapTuple tuple); ++ ++extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, ++ HeapTuple oldtup, uint32 perms, bool abort); ++ +/* + * SE-PostgreSQL SQL FUNCTIONS + */ +extern Datum sepgsql_getcon(PG_FUNCTION_ARGS); -+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS); -+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS); -+ -+#endif /* SEPGSQL_H */ ++extern Datum sepgsql_getservcon(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_user(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_role(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_type(PG_FUNCTION_ARGS); ++extern Datum sepgsql_get_range(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_user(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_role(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_type(PG_FUNCTION_ARGS); ++extern Datum sepgsql_set_range(PG_FUNCTION_ARGS); ++ ++#endif /* SEPGSQL_H */ +diff -rpNU3 base/src/include/storage/fd.h sepgsql/src/include/storage/fd.h +--- base/src/include/storage/fd.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/storage/fd.h 2008-06-14 02:36:58.000000000 +0900 +@@ -67,6 +67,7 @@ extern int FileWrite(File file, char *bu + extern int FileSync(File file); + extern long FileSeek(File file, long offset, int whence); + extern int FileTruncate(File file, long offset); ++extern int FileRawDescriptor(File file); + + /* Operations that allow use of regular stdio --- USE WITH CAUTION */ + extern FILE *AllocateFile(const char *name, const char *mode); +diff -rpNU3 base/src/include/storage/lwlock.h sepgsql/src/include/storage/lwlock.h +--- base/src/include/storage/lwlock.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/storage/lwlock.h 2008-06-14 02:36:58.000000000 +0900 +@@ -63,6 +63,7 @@ typedef enum LWLockId + AutovacuumLock, + AutovacuumScheduleLock, + SyncScanLock, ++ SepgsqlAvcLock, + /* Individual lock IDs end here */ + FirstBufMappingLock, + FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS, +diff -rpNU3 base/src/include/utils/catcache.h sepgsql/src/include/utils/catcache.h +--- base/src/include/utils/catcache.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/utils/catcache.h 2008-06-14 02:36:58.000000000 +0900 +@@ -172,6 +172,7 @@ extern HeapTuple SearchCatCache(CatCache + Datum v1, Datum v2, + Datum v3, Datum v4); + extern void ReleaseCatCache(HeapTuple tuple); ++extern void InsertCatCache(CatCache *cache, HeapTuple tuple); + + extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys, + Datum v1, Datum v2, +diff -rpNU3 base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h +--- base/src/include/utils/errcodes.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/utils/errcodes.h 2008-06-14 02:36:58.000000000 +0900 +@@ -339,6 +339,12 @@ + #define ERRCODE_NO_DATA_FOUND MAKE_SQLSTATE('P','0', '0','0','2') + #define ERRCODE_TOO_MANY_ROWS MAKE_SQLSTATE('P','0', '0','0','3') + ++/* Class SE - Security Error (PGACE/SE-PostgreSQL error class) */ ++#define ERRCODE_PGACE_ERROR MAKE_SQLSTATE('S','E', '0','0','0') ++#define ERRCODE_SELINUX_ERROR MAKE_SQLSTATE('S','E', '0','0','1') ++#define ERRCODE_SELINUX_AUDIT MAKE_SQLSTATE('S','E', '0','0','2') ++#define ERRCODE_SELINUX_INFO MAKE_SQLSTATE('S','E', '0','0','3') ++ + /* Class XX - Internal Error (PostgreSQL-specific error class) */ + /* (this is for "can't-happen" conditions and software bugs) */ + #define ERRCODE_INTERNAL_ERROR MAKE_SQLSTATE('X','X', '0','0','0') +diff -rpNU3 base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h +--- base/src/include/utils/syscache.h 2008-01-07 23:51:33.000000000 +0900 ++++ sepgsql/src/include/utils/syscache.h 2008-06-14 02:36:58.000000000 +0900 +@@ -76,6 +76,8 @@ + #define TSTEMPLATEOID 45 + #define TYPENAMENSP 46 + #define TYPEOID 47 ++#define SECURITYOID 48 ++#define SECURITYLABEL 49 + + extern void InitCatalogCache(void); + extern void InitCatalogCachePhase2(void); +@@ -84,6 +86,8 @@ extern HeapTuple SearchSysCache(int cach + Datum key1, Datum key2, Datum key3, Datum key4); + extern void ReleaseSysCache(HeapTuple tuple); + ++extern void InsertSysCache(Oid relid, HeapTuple tuple); ++ + /* convenience routines */ + extern HeapTuple SearchSysCacheCopy(int cacheId, + Datum key1, Datum key2, Datum key3, Datum key4); Index: sepostgresql.init =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sepostgresql.init 13 Jun 2008 04:05:55 -0000 1.20 +++ sepostgresql.init 11 Jul 2008 08:39:31 -0000 1.21 @@ -9,7 +9,7 @@ PGVERSION="8.3.3" PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'` -SEPGVERSION="2.869" +SEPGVERSION="2.952" # source function library . /etc/rc.d/init.d/functions Index: sepostgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sepostgresql.spec 13 Jun 2008 04:05:55 -0000 1.21 +++ sepostgresql.spec 11 Jul 2008 08:39:31 -0000 1.22 @@ -4,39 +4,52 @@ # Copyright 2007 KaiGai Kohei # ----------------------------------------------------- -# SELinux policy types -%define selinux_variants mls strict targeted - # SE-PostgreSQL status extension +%define selinux_policy_stores targeted mls + +# check policy dependency +%define fullset_policy %(rpm -E '%{dist}' | grep -cE '^\.fc[1-9]$') +%if %{fullset_policy} +%define required_policy_version 3.0.6 +%define policy_module_name sepostgresql +%else +%define required_policy_version 3.4.2 +%define policy_module_name sepostgresql-devel +%endif + +%{!?ssl:%define ssl 1} + Summary: Security Enhanced PostgreSQL Name: sepostgresql Version: 8.3.3 -Release: 2.869%{?sepgsql_extension}%{?dist} +Release: 2.952%{?sepgsql_extension}%{?dist} License: BSD Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 Source1: sepostgresql.init -Source2: sepostgresql.if -Source3: sepostgresql.te -Source4: sepostgresql.fc -Source5: sepostgresql.8 -Source6: sepostgresql.logrotate -Patch0: sepostgresql-pgace-8.3.3-2.patch -Patch1: sepostgresql-sepgsql-8.3.3-2.patch +Source2: sepostgresql.8 +Source3: sepostgresql.logrotate +Patch0: sepostgresql-sepgsql-8.3.3-2.patch +Patch1: sepostgresql-policy-8.3.3-2.patch Patch2: sepostgresql-pg_dump-8.3.3-2.patch Patch3: sepostgresql-fedora-prefix.patch BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4 -Buildrequires: checkpolicy libselinux-devel >= 2.0.43 selinux-policy-devel selinux-policy >= 3.0.6 +BuildRequires: checkpolicy libselinux-devel >= 2.0.43 selinux-policy-devel +BuildRequires: selinux-policy >= %{required_policy_version} +%if %{ssl} +BuildRequires: openssl-devel +%endif Requires(pre): shadow-utils Requires(post): policycoreutils /sbin/chkconfig Requires(preun): /sbin/chkconfig /sbin/service Requires(postun): policycoreutils Requires: postgresql-server = %{version} -Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.43 selinux-policy >= 3.0.6 +Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.43 +Requires: selinux-policy >= %{required_policy_version} Requires: tzdata logrotate %description @@ -53,26 +66,17 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -mkdir selinux-policy -cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} selinux-policy %build CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS -# build Binary Policy Module -pushd selinux-policy -for selinuxvariant in %{selinux_variants} -do - make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile - mv %{name}.pp %{name}.pp.${selinuxvariant} - make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean -done -popd - # build SE-PostgreSQL %configure --disable-rpath \ --enable-selinux \ +%if %{ssl} + --with-openssl \ +%endif %if %{defined sepgextension} --enable-debug \ --enable-cassert \ @@ -83,20 +87,21 @@ # parallel build, if possible make %{?_smp_mflags} +# to create empty .fc file +touch src/backend/security/sepgsql/policy/%{policy_module_name}.fc +make -C src/backend/security/sepgsql/policy %install rm -rf %{buildroot} -pushd selinux-policy -for selinuxvariant in %{selinux_variants} +make DESTDIR=%{buildroot} install + +for store in %{selinux_policy_stores} do - install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 %{name}.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{name}.pp + install -d %{buildroot}%{_datadir}/selinux/${store} + install -p -m 644 src/backend/security/sepgsql/policy/%{policy_module_name}.pp.${store} \ + %{buildroot}%{_datadir}/selinux/${store}/%{policy_module_name}.pp done -popd - -make DESTDIR=%{buildroot} install # avoid to conflict with native postgresql package mv %{buildroot}%{_bindir} %{buildroot}%{_bindir}.orig @@ -124,13 +129,13 @@ mkdir -p %{buildroot}%{_initrddir} install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/sepostgresql -# /etc/logrotate.d/ -mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/sepostgresql - # /usr/share/man/* mkdir -p %{buildroot}%{_mandir}/man8 -install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man8 +install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man8 + +# /etc/logrotate.d/ +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/sepostgresql %clean rm -rf %{buildroot} @@ -146,13 +151,18 @@ /sbin/chkconfig --add %{name} /sbin/ldconfig -for selinuxvariant in %{selinux_variants} +for store in %{selinux_policy_stores} do - %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue; - - %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \ - %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || : - %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{name}.pp >& /dev/null || : +%if %{fullset_policy} + %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || : + %{_sbindir}/semodule -s ${store} \ + -i %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || : +%else + if %{_sbindir}/semodule -s ${store} -l | grep -Eq "^%{policy_module_name}"; then + %{_sbindir}/semodule -s ${store} \ + -u %{_datadir}/selinux/${store}/%{policy_module_name}.pp >& /dev/null || : + fi +%endif done # Fix up non-standard file contexts @@ -171,12 +181,9 @@ /sbin/service %{name} condrestart >/dev/null 2>&1 || : fi if [ $1 -eq 0 ]; then # rpm -e case - for selinuxvariant in %{selinux_variants} + for store in %{selinux_policy_stores} do - %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue; - - %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \ - %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || : + %{_sbindir}/semodule -s ${store} -r %{policy_module_name} >& /dev/null || : done /sbin/fixfiles -R %{name} restore || : test -d %{_localstatedir}/lib/sepgsql && /sbin/restorecon -R %{_localstatedir}/lib/sepgsql || : @@ -205,12 +212,22 @@ %{_datadir}/sepgsql/conversion_create.sql %{_datadir}/sepgsql/information_schema.sql %{_datadir}/sepgsql/sql_features.txt -%attr(644,root,root) %{_datadir}/selinux/*/sepostgresql.pp +%attr(644,root,root) %{_datadir}/selinux/*/%{policy_module_name}.pp %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/data %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog +* Fri Jul 11 2008 - 8.3.3-2.952 +- Security policy module updates + +* Fri Jul 11 2008 - 8.3.3-2.945 +- Add OpenSSL support +- backport 8.4devel fixes + +* Sun Jun 15 2008 - 8.3.3-2.889 +- backport 8.4devel features. + * Fri Jun 13 2008 - 8.3.3-2.869 - upgrade base PostgreSQL 8.3.1 -> 8.3.3 --- sepostgresql-pgace-8.3.3-2.patch DELETED --- --- sepostgresql.fc DELETED --- --- sepostgresql.if DELETED --- --- sepostgresql.te DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 08:41:51 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 11 Jul 2008 08:41:51 GMT Subject: rpms/cegui/devel cegui.spec,1.16,1.17 Message-ID: <200807110841.m6B8fpap015985@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/cegui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15934 Modified Files: cegui.spec Log Message: * Fri Jul 11 2008 Hans de Goede 0.6.1-1 - New upstream release 0.6.1 - Drop upstreamed patches Index: cegui.spec =================================================================== RCS file: /cvs/extras/rpms/cegui/devel/cegui.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- cegui.spec 11 Jul 2008 08:00:24 -0000 1.16 +++ cegui.spec 11 Jul 2008 08:40:56 -0000 1.17 @@ -30,6 +30,7 @@ BuildRequires: xerces-c-devel BuildRequires: tolua++-devel BuildRequires: tinyxml-devel +BuildRequires: glew-devel %description Crazy Eddie's GUI System is a free library providing windowing and widgets for From fedora-extras-commits at redhat.com Fri Jul 11 08:44:00 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Fri, 11 Jul 2008 08:44:00 GMT Subject: rpms/khmeros-fonts/EL-5 import.log, NONE, 1.1 khmeros-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807110844.m6B8i0tM016084@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/khmeros-fonts/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16055/EL-5 Modified Files: .cvsignore sources Added Files: import.log khmeros-fonts.spec Log Message: * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release --- NEW FILE import.log --- khmeros-fonts-5_0-3_fc9:EL-5:khmeros-fonts-5.0-3.fc9.src.rpm:1215765291 --- NEW FILE khmeros-fonts.spec --- %define fontname khmeros %define fontdir %{_datadir}/fonts/%{fontname} %define archivename All_KhmerOS_%{version} Name: %{fontname}-fonts Version: 5.0 Release: 3%{?dist} Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X License: LGPLv2+ URL: http://www.khmeros.info/drupal/?q=en/download/fonts Source0: http://downloads.sourceforge.net/khmer/%{archivename}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package base Summary: Base Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description base The Khmer OS fonts include base Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package battambang Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description battambang The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package bokor Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description bokor The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package handwritten Summary: Handwritten Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description handwritten The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package metalchrieng Summary: Old-fashioned Khmer font set by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description metalchrieng The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package muol Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description muol The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %package siemreap Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute Group: User Interface/X %description siemreap The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent sizes for Khmer and English alphabets, so that when texts mix both it is not necessary to have different point sizes for the text in each language. They were created by Danh Hong of the Cambodian Open Institute. %prep %setup -q -n %{archivename} %build %install rm -rf %{buildroot} # One of the fonts is named 'KhmerOS .ttf' (note the space). # 1) It is apparently a mistake. # 2) Have problems with installing it inside %%files base rename ' ' '' * install -dm 755 %{buildroot}%{fontdir} install -pm 644 *.ttf %{buildroot}%{fontdir} %clean rm -rf %{buildroot} %post base if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post battambang if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post bokor if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post handwritten if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post metalchrieng if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post muol if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %post siemreap if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun base if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun battambang if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun bokor if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun handwritten if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun metalchrieng if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun muol if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun siemreap if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %files base %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS.ttf %{fontdir}/KhmerOS_sys.ttf %{fontdir}/KhmerOS_content.ttf %files battambang %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_battambang.ttf %files bokor %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_bokor.ttf %files handwritten %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_fasthand.ttf %{fontdir}/KhmerOS_freehand.ttf %files metalchrieng %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_metalchrieng.ttf %files muol %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_muol.ttf %{fontdir}/KhmerOS_muolpali.ttf %{fontdir}/KhmerOS_muollight.ttf %files siemreap %defattr(644,root,root,755) %dir %{fontdir} %{fontdir}/KhmerOS_siemreap.ttf %changelog * Tue Jul 8 2008 Michal Nowak - 5.0-3 - reshaping to multiple subpackages based on font type/purpose - license uncertainity is solved; licence field is set according to information from .ttf files read via gnome-font-viewer * Mon Jul 7 2008 Michal Nowak - 5.0-2 - removing Fedora specific license - refactoring summary and description texts (Nicolas Mailhot) * Fri Jul 4 2008 Michal Nowak - 5.0-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:58:19 -0000 1.1 +++ .cvsignore 11 Jul 2008 08:43:11 -0000 1.2 @@ -0,0 +1 @@ +All_KhmerOS_5.0.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/khmeros-fonts/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:58:19 -0000 1.1 +++ sources 11 Jul 2008 08:43:11 -0000 1.2 @@ -0,0 +1 @@ +dc1ddeb526ccbc06603da880d1e89e7b All_KhmerOS_5.0.zip From fedora-extras-commits at redhat.com Fri Jul 11 08:52:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Fri, 11 Jul 2008 08:52:32 GMT Subject: rpms/wireshark/F-9 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 wireshark.spec, 1.35, 1.36 Message-ID: <200807110852.m6B8qWwX016577@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/wireshark/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16544 Modified Files: .cvsignore sources wireshark.spec Log Message: - upgrade to 1.0.2, several security vulnarabilities fixed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wireshark/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 1 Apr 2008 17:41:00 -0000 1.18 +++ .cvsignore 11 Jul 2008 08:51:47 -0000 1.19 @@ -1 +1 @@ -wireshark-1.0.0.tar.bz2 +wireshark-1.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wireshark/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 1 Apr 2008 17:41:00 -0000 1.18 +++ sources 11 Jul 2008 08:51:47 -0000 1.19 @@ -1 +1 @@ -90e58c595f082da3ad9390d714f16116 wireshark-1.0.0.tar.bz2 +6045048aa8645d54d1a06bb20e0d23a3 wireshark-1.0.2.tar.gz Index: wireshark.spec =================================================================== RCS file: /cvs/extras/rpms/wireshark/F-9/wireshark.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- wireshark.spec 29 Jun 2008 23:46:47 -0000 1.35 +++ wireshark.spec 11 Jul 2008 08:51:47 -0000 1.36 @@ -5,14 +5,14 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.0.2 +Release: 1%{?dist} License: GPL+ Group: Applications/Internet %if %{svn_version} Source0: http://wireshark.org/download/prerelease/%{name}-%{version}-SVN-%{svn_version}.tar.gz %else -Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 +Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.gz %endif Source1: wireshark.pam Source2: wireshark.console @@ -201,6 +201,9 @@ %changelog +* Fri Jul 11 2008 Radek Vok??l 1.0.2-1 +- upgrade to 1.0.2, several security vulnarabilities fixed + * Sun Jun 29 2008 Dennis Gilmore 1.0.0-3 - add sparc arches to -fPIE From fedora-extras-commits at redhat.com Fri Jul 11 08:58:49 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 11 Jul 2008 08:58:49 GMT Subject: rpms/docbook-dtds/F-9 docbook-dtds.spec,1.20,1.21 Message-ID: <200807110858.m6B8wnMW016893@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-dtds/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16854 Modified Files: docbook-dtds.spec Log Message: use full paths in xmlcatalog registration(#453513,#454952), changed license(#445008) Index: docbook-dtds.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-dtds/F-9/docbook-dtds.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- docbook-dtds.spec 26 Nov 2007 09:31:22 -0000 1.20 +++ docbook-dtds.spec 11 Jul 2008 08:58:04 -0000 1.21 @@ -1,11 +1,11 @@ Name: docbook-dtds Version: 1.0 -Release: 35%{?dist} +Release: 36%{?dist} Group: Applications/Text Summary: SGML and XML document type definitions for DocBook -License: Redistributable, no modification permitted +License: Freely redistributable without restriction URL: http://www.oasis-open.org/docbook/ Obsoletes: docbook-dtd30-sgml <= %{version}-%{release} @@ -39,8 +39,10 @@ # later. Requires: sgml-common >= 0.6.3-4 # We provide the directory layout expected by 0.6.3-5 or later of -# xml-common. Earlier versions won't understand. -Requires: xml-common >= 0.6.3-8 +# xml-common. Earlier versions won't understand. Additionally +# require xml-common >= 0.6.3-24 to workaround issue with F9 +# install+update and empty xmlcatalog +Requires: xml-common >= 0.6.3-24 BuildRoot: %{_tmppath}/%{name}-%{version} @@ -620,6 +622,7 @@ # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things # they aren't expecting. +CAT_DIR=/usr/share/sgml/docbook/ CATALOG=/etc/sgml/catalog SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n)) XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n)) @@ -645,447 +648,447 @@ # DocBook XML V4.1.2 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ - "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ - "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG # DocBook XML V4.2 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.2" \ - "xml-dtd-4.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.2" \ - "xml-dtd-4.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG # DocBook XML V4.3 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \ - "xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.3" \ - "xml-dtd-4.3-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.3" \ - "xml-dtd-4.3-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG # DocBook XML V4.4 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ - "xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.4" \ - "xml-dtd-4.4-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.4" \ - "xml-dtd-4.4-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG # DocBook XML V4.5 /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.4//EN" \ - "xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ - "xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.5" \ - "xml-dtd-4.5-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.5" \ - "xml-dtd-4.5-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG fi @@ -1192,296 +1195,300 @@ then # DocBook XML V4.1.2 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG # DocBook XML V4.2 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.2-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG # DocBook XML V4.3 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.3-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG # DocBook XML V4.4 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.4-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG # DocBook XML V4.5 /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG /usr/bin/xmlcatalog --noout --del \ - "xml-dtd-4.5-%{version}-%{release}" $CATALOG + "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG fi %changelog +* Wed Jul 09 2008 Ondrej Vasik - 1.0-36 +- use full paths in xmlcatalog registration +- changed License(#445008) + * Mon Nov 26 2007 Ondrej Vasik - 1.0-35 - fixed bug causing typo in spec file(#397651) From fedora-extras-commits at redhat.com Fri Jul 11 09:02:25 2008 From: fedora-extras-commits at redhat.com (Kamil Dudka (kdudka)) Date: Fri, 11 Jul 2008 09:02:25 GMT Subject: rpms/elinks/F-9 elinks-0.11.4-deflate.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 elinks.spec, 1.52, 1.53 sources, 1.22, 1.23 Message-ID: <200807110902.m6B92PQL023548@cvs-int.fedora.redhat.com> Author: kdudka Update of /cvs/extras/rpms/elinks/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23512 Modified Files: .cvsignore elinks.spec sources Added Files: elinks-0.11.4-deflate.patch Log Message: new version of deflate.c taken from elinks-0.12pre1(#446026) elinks-0.11.4-deflate.patch: --- NEW FILE elinks-0.11.4-deflate.patch --- diff -ruN elinks-0.11.4rc1/src/encoding/deflate.c elinks-0.11.4rc1.deflate/src/encoding/deflate.c --- elinks-0.11.4rc1/src/encoding/deflate.c 2008-07-10 15:13:21.000000000 +0200 +++ elinks-0.11.4rc1.deflate/src/encoding/deflate.c 2008-07-10 15:15:09.000000000 +0200 @@ -38,7 +38,7 @@ }; static int -deflate_open(struct stream_encoded *stream, int fd) +deflate_open(int window_size, struct stream_encoded *stream, int fd) { /* A zero-initialized z_stream. The compiler ensures that all * pointer members in it are null. (Can't do this with memset @@ -60,7 +60,7 @@ data->fdread = fd; data->last_read = 0; - err = inflateInit2(&data->deflate_stream, MAX_WBITS | 32); + err = inflateInit2(&data->deflate_stream, window_size); if (err != Z_OK) { mem_free(data); return -1; @@ -71,6 +71,20 @@ } static int +deflate_raw_open(struct stream_encoded *stream, int fd) +{ + /* raw DEFLATE with neither zlib nor gzip header */ + return deflate_open(-MAX_WBITS, stream, fd); +} + +static int +deflate_gzip_open(struct stream_encoded *stream, int fd) +{ + /* detect gzip header, else assume zlib header */ + return deflate_open(MAX_WBITS + 32, stream, fd); +} + +static int deflate_read(struct stream_encoded *stream, unsigned char *buf, int len) { struct deflate_enc_data *data = (struct deflate_enc_data *) stream->data; @@ -117,7 +131,7 @@ } static unsigned char * -deflate_decode_buffer(unsigned char *data, int len, int *new_len) +deflate_decode_buffer(int window_size, unsigned char *data, int len, int *new_len) { z_stream stream; unsigned char *buffer = NULL; @@ -130,7 +144,7 @@ stream.next_in = data; stream.avail_in = len; - if (inflateInit2(&stream, MAX_WBITS | 32) != Z_OK) + if (inflateInit2(&stream, window_size) != Z_OK) return NULL; do { @@ -165,6 +179,20 @@ } } +static unsigned char * +deflate_raw_decode_buffer(unsigned char *data, int len, int *new_len) +{ + /* raw DEFLATE with neither zlib nor gzip header */ + return deflate_decode_buffer(-MAX_WBITS, data, len, new_len); +} + +static unsigned char * +deflate_gzip_decode_buffer(unsigned char *data, int len, int *new_len) +{ + /* detect gzip header, else assume zlib header */ + return deflate_decode_buffer(MAX_WBITS + 32, data, len, new_len); +} + static void deflate_close(struct stream_encoded *stream) { @@ -183,9 +211,9 @@ const struct decoding_backend deflate_decoding_backend = { "deflate", deflate_extensions, - deflate_open, + deflate_raw_open, deflate_read, - deflate_decode_buffer, + deflate_raw_decode_buffer, deflate_close, }; @@ -194,8 +222,8 @@ const struct decoding_backend gzip_decoding_backend = { "gzip", gzip_extensions, - deflate_open, + deflate_gzip_open, deflate_read, - deflate_decode_buffer, + deflate_gzip_decode_buffer, deflate_close, }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elinks/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 6 Mar 2008 15:31:00 -0000 1.22 +++ .cvsignore 11 Jul 2008 09:01:30 -0000 1.23 @@ -1 +1 @@ -elinks-0.11.4rc1.tar.bz2 +elinks-0.11.4.tar.bz2 Index: elinks.spec =================================================================== RCS file: /cvs/extras/rpms/elinks/F-9/elinks.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- elinks.spec 6 Mar 2008 15:31:00 -0000 1.52 +++ elinks.spec 11 Jul 2008 09:01:30 -0000 1.53 @@ -1,11 +1,11 @@ Name: elinks Summary: A text-mode Web browser Version: 0.11.4 -Release: 0.4.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 URL: http://elinks.or.cz Group: Applications/Internet -Source: http://elinks.or.cz/download/elinks-%{version}rc1.tar.bz2 +Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -29,6 +29,7 @@ Patch7: elinks-0.11.1-negotiate.patch Patch8: elinks-0.11.3-macropen.patch Patch9: elinks-0.11.4rc0-chunkedgzip.patch +Patch10: elinks-0.11.4-deflate.patch %description Links is a text-based Web browser. Links does not display any images, @@ -37,7 +38,7 @@ quickly and swiftly displays Web pages. %prep -%setup -q -n %{name}-%{version}rc1 +%setup -q -n %{name}-%{version} # Prevent crash when HOME is unset (bug #90663). %patch0 -p1 @@ -58,6 +59,8 @@ %patch8 -p1 # fix for broken gzip compression for chunked pages %patch9 -p1 +# new version of deflate.c taken from elinks-0.12pre1 +%patch10 -p1 %build ./autogen.sh @@ -88,6 +91,9 @@ %{_mandir}/man5/* %changelog +* Fri Jul 11 2008 Kamil Dudka 0.11.4-1 +- new version of deflate.c taken from elinks-0.12pre1(#446026) + * Thu Mar 6 2008 Ondrej Vasik 0.11.4-0.4.rc1 - new upstream release candidate marked stable Index: sources =================================================================== RCS file: /cvs/extras/rpms/elinks/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 6 Mar 2008 15:31:00 -0000 1.22 +++ sources 11 Jul 2008 09:01:30 -0000 1.23 @@ -1 +1 @@ -7fc7c36844be9c528c2ef28dbd4c5e6f elinks-0.11.4rc1.tar.bz2 +88036a518ebc4f1150a7e14b29f9d8db elinks-0.11.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 10:17:18 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Fri, 11 Jul 2008 10:17:18 GMT Subject: rpms/bind/devel .cvsignore, 1.43, 1.44 bind-9.5-dlz-64bit.patch, 1.1, 1.2 bind.spec, 1.272, 1.273 sources, 1.52, 1.53 bind-9.5-recv-race.patch, 1.1, NONE Message-ID: <200807111017.m6BAHIUS032590@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32500 Modified Files: .cvsignore bind-9.5-dlz-64bit.patch bind.spec sources Removed Files: bind-9.5-recv-race.patch Log Message: - 9.5.1b1 release (CVE-2008-1447) - dropped bind-9.5-recv-race.patch because upstream doesn't want it Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 30 Jun 2008 10:49:28 -0000 1.43 +++ .cvsignore 11 Jul 2008 10:16:21 -0000 1.44 @@ -1,4 +1,4 @@ bind-chroot.tar.bz2 config-4.tar.bz2 libbind-man.tar.gz -bind-9.5.0.tar.gz +bind-9.5.1b1.tar.gz bind-9.5-dlz-64bit.patch: Index: bind-9.5-dlz-64bit.patch =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-dlz-64bit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.5-dlz-64bit.patch 23 Jul 2007 14:27:48 -0000 1.1 +++ bind-9.5-dlz-64bit.patch 11 Jul 2008 10:16:21 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up bind-9.5.0a5/contrib/dlz/config.dlz.in.64bit bind-9.5.0a5/contrib/dlz/config.dlz.in ---- bind-9.5.0a5/contrib/dlz/config.dlz.in.64bit 2006-06-07 04:21:50.000000000 +0200 -+++ bind-9.5.0a5/contrib/dlz/config.dlz.in 2007-07-23 11:18:54.000000000 +0200 +diff -up bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit bind-9.5.1b1/contrib/dlz/config.dlz.in +--- bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit 2008-06-17 06:03:31.000000000 +0200 ++++ bind-9.5.1b1/contrib/dlz/config.dlz.in 2008-07-11 12:08:43.000000000 +0200 @@ -17,6 +17,13 @@ # dlzdir='${DLZ_DRIVER_DIR}' @@ -15,29 +15,19 @@ # # Private autoconf macro to simplify configuring drivers: # -@@ -83,7 +90,7 @@ then - if test -f $d/include/libpq-fe.h +@@ -135,9 +142,9 @@ then then - use_dlz_postgres=$d/include -- use_dlz_postgres_lib=$d/lib -+ use_dlz_postgres_lib=$d/${target_lib} - break - fi - done -@@ -151,10 +158,10 @@ case "$use_dlz_mysql" in - *) - DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver, - [-I$use_dlz_mysql/include/mysql], -- [-L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lm]) -+ [-L$use_dlz_mysql/${target_lib}/mysql -lmysqlclient -lz -lcrypt -lm]) - - AC_MSG_RESULT( --[using mysql from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql]) -+[using mysql from $use_dlz_mysql/${target_lib}/mysql and $use_dlz_mysql/include/mysql]) - ;; - esac - -@@ -232,11 +239,11 @@ case "$use_dlz_bdb" in + use_dlz_mysql=$d + mysql_include=$d/include/mysql +- if test -d $d/lib/mysql ++ if test -d $d/${target_lib}/mysql + then +- mysql_lib=$d/lib/mysql ++ mysql_lib=$d/${target_lib}/mysql + else + mysql_lib=$d/lib + fi +@@ -274,11 +281,11 @@ case "$use_dlz_bdb" in bdb_libnames="db42 db-4.2 db41 db-4.1 db" for d in $bdb_libnames do @@ -51,7 +41,7 @@ else dlz_bdb_libs="" fi -@@ -341,10 +348,10 @@ case "$use_dlz_ldap" in +@@ -383,7 +390,7 @@ case "$use_dlz_ldap" in *) DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver, [-I$use_dlz_ldap/include], @@ -59,12 +49,8 @@ + [-L$use_dlz_ldap/${target_lib} -lldap -llber]) AC_MSG_RESULT( --[using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include]) -+[using LDAP from $use_dlz_ldap/${target_lib} and $use_dlz_ldap/include]) - ;; - esac - -@@ -365,7 +372,7 @@ then + [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include]) +@@ -407,7 +414,7 @@ then odbcdirs="/usr /usr/local /usr/pkg" for d in $odbcdirs do @@ -73,7 +59,7 @@ then use_dlz_odbc=$d break -@@ -385,7 +392,7 @@ case "$use_dlz_odbc" in +@@ -427,7 +434,7 @@ case "$use_dlz_odbc" in *) DLZ_ADD_DRIVER(ODBC, dlz_odbc_driver, [-I$use_dlz_odbc/include], Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- bind.spec 30 Jun 2008 10:49:28 -0000 1.272 +++ bind.spec 11 Jul 2008 10:16:21 -0000 1.273 @@ -2,6 +2,8 @@ # Red Hat BIND package .spec file # +%define PREVER b1 + %{?!SDB: %define SDB 1} %{?!LIBBIND: %define LIBBIND 1} %{?!test: %define test 0} @@ -15,14 +17,14 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: ISC -Version: 9.5.0 -Release: 37.1%{?dist} +Version: 9.5.1 +Release: 0.1.%{PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: System Environment/Daemons # -Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz +Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}%{PREVER}.tar.gz Source1: named.sysconfig Source2: named.init Source3: named.logrotate @@ -54,7 +56,6 @@ Patch71: bind-9.5-overflow.patch Patch72: bind-9.5-dlz-64bit.patch Patch87: bind-9.5-parallel-build.patch -Patch89: bind-9.5-recv-race.patch Patch90: bind-9.5-edns.patch Patch91: bind95-rh450995.patch @@ -173,7 +174,7 @@ Based on the code from Jan "Yenya" Kasprzak %prep -%setup -q +%setup -q -n %{name}-%{version}%{PREVER} # Common patches %patch -p1 -b .varrun @@ -237,7 +238,6 @@ %patch83 -p1 -b .libidn2 %patch85 -p1 -b .libidn3 %patch87 -p1 -b .parallel -%patch89 -p1 -b .recv-race %patch90 -p1 -b .edns %patch91 -p1 -b .rh450995 :; @@ -636,6 +636,10 @@ %{_sbindir}/bind-chroot-admin %changelog +* Tue Jul 08 2008 Adam Tkac 32:9.5.1-0.1.b1 +- 9.5.1b1 release (CVE-2008-1447) +- dropped bind-9.5-recv-race.patch because upstream doesn't want it + * Mon Jun 30 2008 Adam Tkac 32:9.5.0-37.1 - update default named.conf statements (#452708) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 30 Jun 2008 10:49:28 -0000 1.52 +++ sources 11 Jul 2008 10:16:21 -0000 1.53 @@ -1,4 +1,4 @@ 4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2 de68e10e91e05ab100be879b5bcaa6cb config-4.tar.bz2 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz -066484717db1d1b1b4092ddcf5d0eb6e bind-9.5.0.tar.gz +bbd52aadb39f76b50e8413fa165f805e bind-9.5.1b1.tar.gz --- bind-9.5-recv-race.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 10:18:55 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 11 Jul 2008 10:18:55 GMT Subject: rpms/docbook-dtds/F-9 docbook-dtds.spec,1.21,1.22 Message-ID: <200807111018.m6BAItdb032727@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-dtds/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32663 Modified Files: docbook-dtds.spec Log Message: fixed typo in post scriptlet(causing mishandling of DocBook 4.4 and 4.5 DTDs)-#453513 Index: docbook-dtds.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-dtds/F-9/docbook-dtds.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- docbook-dtds.spec 11 Jul 2008 08:58:04 -0000 1.21 +++ docbook-dtds.spec 11 Jul 2008 10:18:09 -0000 1.22 @@ -1,6 +1,6 @@ Name: docbook-dtds Version: 1.0 -Release: 36%{?dist} +Release: 37%{?dist} Group: Applications/Text Summary: SGML and XML document type definitions for DocBook @@ -1015,7 +1015,7 @@ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.4//EN" \ + "-//OASIS//DTD DocBook XML V4.5//EN" \ "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ @@ -1485,6 +1485,10 @@ fi %changelog +* Fri Jul 11 2008 Ondrej Vasik - 1.0-37 +- fixed typo in post scriptlet(causing mishandling of DocBook + 4.4 and 4.5 DTDs)-#453513 + * Wed Jul 09 2008 Ondrej Vasik - 1.0-36 - use full paths in xmlcatalog registration - changed License(#445008) From fedora-extras-commits at redhat.com Fri Jul 11 10:26:06 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 11 Jul 2008 10:26:06 GMT Subject: rpms/gtksourceview-sharp/devel gtksourceview-sharp.spec, 1.20, 1.21 import.log, 1.1, 1.2 Message-ID: <200807111026.m6BAQ6Ku000535@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/gtksourceview-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471/devel Modified Files: gtksourceview-sharp.spec import.log Log Message: Fixed exclusivearch Index: gtksourceview-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gtksourceview-sharp.spec 8 Jul 2008 10:28:45 -0000 1.20 +++ gtksourceview-sharp.spec 11 Jul 2008 10:24:58 -0000 1.21 @@ -4,7 +4,7 @@ Summary: A C sharp binder for gtksourceview Name: gtksourceview-sharp Version: 2.0.12 -Release: 2%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries Source0: http://go-mono.com/sources-latest/%{name}-%{extra}.tar.bz2 @@ -13,9 +13,8 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-data, mono-devel, gtk-sharp2-devel, gtksourceview-devel, gtk-sharp2-gapi, gecko-sharp2, pkgconfig, monodoc-devel BuildRequires: gtk-sharp2-devel gnome-sharp-devel autoconf libtool automake -Requires: gtksourceview2 - -ExcludeArch : ppc64 +Requires: gtksourceview +ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha %description gtksourceview-sharp is a C sharp binder for gtksourceview @@ -60,9 +59,10 @@ %{__rm} -rf %{buildroot} %changelog -* Mon Jul 07 2008 Paul F. Johnson - 2.0-0.12-2 +* Fri Jul 11 2008 Paul F. Johnson - 2.0-0.12-4 - rebuild for new gnome-sharp - fix BR to use gtksourceview rather than gtksourceview-2 +- correct exclusivearchs * Fri May 30 2008 Paul F. Johnson - 2.0-0.12-1.1 - rebuild for new gtk-sharp2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2008 10:28:45 -0000 1.1 +++ import.log 11 Jul 2008 10:24:58 -0000 1.2 @@ -1 +1,2 @@ gtksourceview-sharp-2_0_12-2_fc10:HEAD:gtksourceview-sharp-2.0.12-2.fc10.src.rpm:1215512860 +gtksourceview-sharp-2_0_12-4_fc10:HEAD:gtksourceview-sharp-2.0.12-4.fc10.src.rpm:1215771796 From fedora-extras-commits at redhat.com Fri Jul 11 10:30:23 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Fri, 11 Jul 2008 10:30:23 GMT Subject: rpms/net-snmp/devel net-snmp.spec,1.152,1.153 Message-ID: <200807111030.m6BAUNYR000729@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/net-snmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687 Modified Files: net-snmp.spec Log Message: prepare for new rpm version Index: net-snmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- net-snmp.spec 10 Jun 2008 06:02:57 -0000 1.152 +++ net-snmp.spec 11 Jul 2008 10:29:30 -0000 1.153 @@ -1,5 +1,7 @@ %{!?tcp_wrappers:%define tcp_wrappers 1} +%define _default_patch_fuzz 2 + # Arches on which we need to prevent arch conflicts on net-snmp-config.h %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64 %define major_ver 5.4.1 @@ -7,7 +9,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: %{major_ver} -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 License: BSD and MIT @@ -193,7 +195,7 @@ %configure \ --enable-static --enable-shared \ - --with-cflags="$RPM_OPT_FLAGS" \ + --with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT" \ --with-ldflags="$LDFLAGS -lcrypto -lsensors" \ --with-sys-location="Unknown" \ --with-logfile="/var/log/snmpd.log" \ @@ -389,6 +391,9 @@ %{_libdir}/lib*.so.* %changelog +* Fri Jul 11 2008 Jan Safranek 5.4.1-20 +- prepare for new rpm version + * Tue Jun 10 2008 Jan Safranek 5.4.1-19 - fix various flaws (CVE-2008-2292 CVE-2008-0960) From fedora-extras-commits at redhat.com Fri Jul 11 10:33:24 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Fri, 11 Jul 2008 10:33:24 GMT Subject: rpms/k3b/F-8 k3b.spec,1.52,1.53 Message-ID: <200807111033.m6BAXOEo000930@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/k3b/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv866 Modified Files: k3b.spec Log Message: Fixed typo in spec file Index: k3b.spec =================================================================== RCS file: /cvs/extras/rpms/k3b/F-8/k3b.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- k3b.spec 30 Jun 2008 15:19:36 -0000 1.52 +++ k3b.spec 11 Jul 2008 10:32:30 -0000 1.53 @@ -14,7 +14,7 @@ Summary: CD/DVD burning application for KDE Epoch: 0 Version: 1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Archiving License: GPLv2+ @@ -241,6 +241,9 @@ %changelog +* Fri Jul 11 2008 Roman Rakus - 0:1.0.5-4 +- Fixed typo in spec file + * Mon Jun 30 2008 Rex Dieter - 0:1.0.5-3 - No association k3b with .iso files in gnome (#419681) - scriptlet deps @@ -254,10 +257,10 @@ - k3brc: set manual buffer size here - omit reload patch (for now), to verify if still needed. -* Wed May 7 2008 Roman Rakus - 0:1.0.4-9 +* Wed May 7 2008 Roman Rakus - 0:1.0.4-9 - Fix doc dir (#238070), patch by Alain PORTAL (aportal at univ-montp2.fr) -* Tue Apr 22 2008 Roman Rakus - 0:1.0.4-8 +* Tue Apr 22 2008 Roman Rakus - 0:1.0.4-8 - Use manual buffer size by default (#220481) * Tue Feb 19 2008 Rex Dieter - 0:1.0.4-7 From fedora-extras-commits at redhat.com Fri Jul 11 10:43:36 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 11 Jul 2008 10:43:36 GMT Subject: rpms/docbook-dtds/F-8 docbook-dtds.spec,1.17,1.18 Message-ID: <200807111043.m6BAhaND001249@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-dtds/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1226 Modified Files: docbook-dtds.spec Log Message: fixed license tag, rpmlint complaints and typo in DocBook 4.5 DTD's registration (causing mishandling for DocBook 4.4 and 4.5-#453513) Index: docbook-dtds.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-dtds/F-8/docbook-dtds.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- docbook-dtds.spec 1 Oct 2007 09:05:39 -0000 1.17 +++ docbook-dtds.spec 11 Jul 2008 10:42:50 -0000 1.18 @@ -1,37 +1,47 @@ Name: docbook-dtds Version: 1.0 -Release: 32%{?dist} +Release: 33%{?dist} Group: Applications/Text -Summary: SGML and XML document type definitions for DocBook. +Summary: SGML and XML document type definitions for DocBook -License: Distributable +License: Freely redistributable without restriction URL: http://www.oasis-open.org/docbook/ -Obsoletes: docbook-dtd30-sgml docbook-dtd31-sgml -Obsoletes: docbook-dtd40-sgml docbook-dtd41-sgml -Obsoletes: docbook-dtd412-xml - -Provides: docbook-dtd-xml docbook-dtd-sgml -Provides: docbook-dtd30-sgml docbook-dtd31-sgml -Provides: docbook-dtd40-sgml docbook-dtd41-sgml -Provides: docbook-dtd412-xml -Provides: docbook-dtd42-sgml docbook-dtd42-xml -Provides: docbook-dtd43-sgml docbook-dtd43-xml -Provides: docbook-dtd44-sgml docbook-dtd44-xml -Provides: docbook-dtd45-sgml docbook-dtd45-xml - -PreReq: xml-common fileutils -PreReq: textutils grep perl -PreReq: libxml2 >= 2.4.8 +Obsoletes: docbook-dtd30-sgml < %{version}-%{release} +Obsoletes: docbook-dtd31-sgml < %{version}-%{release} +Obsoletes: docbook-dtd40-sgml < %{version}-%{release} +Obsoletes: docbook-dtd41-sgml < %{version}-%{release} +Obsoletes: docbook-dtd412-xml < %{version}-%{release} + +Provides: docbook-dtd-xml = %{version}-%{release} +Provides: docbook-dtd-sgml = %{version}-%{release} +Provides: docbook-dtd30-sgml = %{version}-%{release} +Provides: docbook-dtd31-sgml = %{version}-%{release} +Provides: docbook-dtd40-sgml = %{version}-%{release} +Provides: docbook-dtd41-sgml = %{version}-%{release} +Provides: docbook-dtd412-xml = %{version}-%{release} +Provides: docbook-dtd42-sgml = %{version}-%{release} +Provides: docbook-dtd42-xml = %{version}-%{release} +Provides: docbook-dtd43-sgml = %{version}-%{release} +Provides: docbook-dtd43-xml = %{version}-%{release} +Provides: docbook-dtd44-sgml = %{version}-%{release} +Provides: docbook-dtd44-xml = %{version}-%{release} +Provides: docbook-dtd45-sgml = %{version}-%{release} +Provides: docbook-dtd45-xml = %{version}-%{release} + + +Requires: grep perl +Requires(post): libxml2 >= 2.4.8 +Requires(postun): libxml2 >= 2.4.8 # If upgrading, the old package's postun scriptlet may use install-catalog # to remove its entries. xmlcatalog (which this package uses) adds quotes # to the catalog files, and install-catalog only handles this in 0.6.3-4 or # later. -PreReq: sgml-common >= 0.6.3-4 +Requires: sgml-common >= 0.6.3-4 # We provide the directory layout expected by 0.6.3-5 or later of # xml-common. Earlier versions won't understand. -PreReq: xml-common >= 0.6.3-8 +Requires: xml-common >= 0.6.3-8 BuildRoot: %{_tmppath}/%{name}-%{version} @@ -162,6 +172,9 @@ # Increase NAMELEN (bug #36058, bug #159382). sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl +# fix of \r\n issue from rpmlint +sed -i 's/\r//' */*.txt + if [ `id -u` -eq 0 ]; then chown -R root:root . chmod -R a+rX,g-w,o-w . @@ -335,12 +348,12 @@ %files -%defattr (-,root,root) +%defattr (0644,root,root,0755) %doc --parents 3.1-sgml/ChangeLog %doc --parents 4.1-sgml/ChangeLog %doc --parents */*.txt -/etc/sgml/sgml-docbook.cat -/etc/sgml/xml-docbook.cat +%config(noreplace) /etc/sgml/sgml-docbook.cat +%config(noreplace) /etc/sgml/xml-docbook.cat /usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release} /usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release} /usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release} @@ -354,19 +367,19 @@ /usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release} /usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release} /usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release} -%ghost /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat -%ghost /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat -%ghost /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat -%ghost /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat -%ghost /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat -%ghost /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat -%ghost /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat -%ghost /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat -%ghost /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat -%ghost /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat -%ghost /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat -%ghost /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat -%ghost /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat +%ghost %config(noreplace) /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat %post ## Clean up pre-docbook-dtds mess caused by broken trigger. @@ -997,7 +1010,7 @@ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.4//EN" \ + "-//OASIS//DTD DocBook XML V4.5//EN" \ "xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ @@ -1467,11 +1480,16 @@ fi %changelog -* Mon Oct 1 2007 Ondrej Vasik - 1.0.32 -- DocBook 4.4 SGML and XML.(#312941) +* Fri Jul 11 2008 Ondrej Vasik - 1.0-33 +- fixed license tag + some rpmlint complaints +- fixed typo in post scriptlet(causing mishandling of + DocBook 4.4 and 4.5 DTD's -#453513) + +* Mon Oct 1 2007 Ondrej Vasik - 1.0-32 +- DocBook 4.5 SGML and XML.(#312941) - added dist tag -* Wed Jun 20 2007 Ondrej Vasik - 1.0.31 +* Wed Jun 20 2007 Ondrej Vasik - 1.0-31 - .cat files touched and ghosted to be owned by package - (bug #193475) From fedora-extras-commits at redhat.com Fri Jul 11 10:44:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 10:44:29 +0000 Subject: [pkgdb] rsyslog: lkundrak has requested commit Message-ID: <200807111044.m6BAiTLX014401@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has requested the commit acl on rsyslog (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rsyslog From fedora-extras-commits at redhat.com Fri Jul 11 10:55:34 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 11 Jul 2008 10:55:34 GMT Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.22,1.23 Message-ID: <200807111055.m6BAtY0A001550@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-dtds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1513 Modified Files: docbook-dtds.spec Log Message: fixed typo in post scriptlet(causing mishandling of DocBook 4.4 and 4.5 DTDs)-#453513 Index: docbook-dtds.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- docbook-dtds.spec 9 Jul 2008 15:37:08 -0000 1.22 +++ docbook-dtds.spec 11 Jul 2008 10:54:44 -0000 1.23 @@ -1,6 +1,6 @@ Name: docbook-dtds Version: 1.0 -Release: 37%{?dist} +Release: 38%{?dist} Group: Applications/Text Summary: SGML and XML document type definitions for DocBook @@ -1013,7 +1013,7 @@ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.4//EN" \ + "-//OASIS//DTD DocBook XML V4.5//EN" \ "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG /usr/bin/xmlcatalog --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ @@ -1483,6 +1483,10 @@ fi %changelog +* Fri Jul 11 2008 Ondrej Vasik - 1.0-38 +- fixed typo in post scriptlet(causing mishandling of DocBook + 4.4 and 4.5 DTDs)-#453513 + * Wed Jul 09 2008 Ondrej Vasik - 1.0-37 - use full paths in xmlcatalog registration From fedora-extras-commits at redhat.com Fri Jul 11 11:14:47 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Fri, 11 Jul 2008 11:14:47 GMT Subject: rpms/goocanvasmm/devel .cvsignore, 1.2, 1.3 goocanvasmm.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807111114.m6BBEl6I008730@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/goocanvasmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8680 Modified Files: .cvsignore goocanvasmm.spec sources Log Message: Update to upstream 0.6.0, updated BRs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Nov 2007 20:41:47 -0000 1.2 +++ .cvsignore 11 Jul 2008 11:13:56 -0000 1.3 @@ -1 +1 @@ -goocanvasmm-0.4.0.tar.bz2 +goocanvasmm-0.6.0.tar.bz2 Index: goocanvasmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/goocanvasmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- goocanvasmm.spec 19 Feb 2008 01:12:44 -0000 1.2 +++ goocanvasmm.spec 11 Jul 2008 11:13:56 -0000 1.3 @@ -1,17 +1,17 @@ Name: goocanvasmm -Version: 0.4.0 -Release: 3%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: C++ interface for goocanvas Group: System Environment/Libraries License: LGPLv2+ URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.4/goocanvasmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.6/goocanvasmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: glibmm24-devel >= 2.14.2 BuildRequires: gtkmm24-devel >= 2.10.9 -BuildRequires: cairomm-devel >= 1.2.2 BuildRequires: goocanvas-devel >= 0.8 BuildRequires: doxygen graphviz @@ -56,7 +56,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' mkdir docs-to-include mv docs/reference/html docs-to-include/ -rm -r $RPM_BUILD_ROOT%{_libdir}/libgoocanvasmm-0.1 rm -r $RPM_BUILD_ROOT%{_libdir}/goocanvasmm-0.1 @@ -85,6 +84,10 @@ %changelog +* Fri Jul 11 2008 Denis Leroy - 0.6.0-1 +- Update to upstream 0.6.0 +- Updated BRs + * Mon Feb 18 2008 Fedora Release Engineering - 0.4.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Nov 2007 20:41:47 -0000 1.2 +++ sources 11 Jul 2008 11:13:56 -0000 1.3 @@ -1 +1 @@ -2d1d634184a7564a913fd5b80bda4b5d goocanvasmm-0.4.0.tar.bz2 +7e9b52bec18def03def91196393d2fea goocanvasmm-0.6.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 11:18:28 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Fri, 11 Jul 2008 11:18:28 GMT Subject: rpms/goocanvasmm/F-9 .cvsignore, 1.2, 1.3 goocanvasmm.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807111118.m6BBISPW009151@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/goocanvasmm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9037 Modified Files: .cvsignore goocanvasmm.spec sources Log Message: Update to upstream 0.6.0, updated BRs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/goocanvasmm/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Nov 2007 20:41:47 -0000 1.2 +++ .cvsignore 11 Jul 2008 11:17:39 -0000 1.3 @@ -1 +1 @@ -goocanvasmm-0.4.0.tar.bz2 +goocanvasmm-0.6.0.tar.bz2 Index: goocanvasmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/goocanvasmm/F-9/goocanvasmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- goocanvasmm.spec 19 Feb 2008 01:12:44 -0000 1.2 +++ goocanvasmm.spec 11 Jul 2008 11:17:39 -0000 1.3 @@ -1,17 +1,17 @@ Name: goocanvasmm -Version: 0.4.0 -Release: 3%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: C++ interface for goocanvas Group: System Environment/Libraries License: LGPLv2+ URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.4/goocanvasmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.6/goocanvasmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: glibmm24-devel >= 2.14.2 BuildRequires: gtkmm24-devel >= 2.10.9 -BuildRequires: cairomm-devel >= 1.2.2 BuildRequires: goocanvas-devel >= 0.8 BuildRequires: doxygen graphviz @@ -56,7 +56,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' mkdir docs-to-include mv docs/reference/html docs-to-include/ -rm -r $RPM_BUILD_ROOT%{_libdir}/libgoocanvasmm-0.1 rm -r $RPM_BUILD_ROOT%{_libdir}/goocanvasmm-0.1 @@ -85,6 +84,10 @@ %changelog +* Fri Jul 11 2008 Denis Leroy - 0.6.0-1 +- Update to upstream 0.6.0 +- Updated BRs + * Mon Feb 18 2008 Fedora Release Engineering - 0.4.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/goocanvasmm/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Nov 2007 20:41:47 -0000 1.2 +++ sources 11 Jul 2008 11:17:39 -0000 1.3 @@ -1 +1 @@ -2d1d634184a7564a913fd5b80bda4b5d goocanvasmm-0.4.0.tar.bz2 +7e9b52bec18def03def91196393d2fea goocanvasmm-0.6.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 11:18:46 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 11 Jul 2008 11:18:46 GMT Subject: rpms/ocaml-bitmatch/devel .cvsignore, 1.10, 1.11 import.log, 1.2, 1.3 ocaml-bitmatch.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200807111118.m6BBIkwS009178@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9078/devel Modified Files: .cvsignore import.log ocaml-bitmatch.spec sources Log Message: * Fri Jul 11 2008 Richard W.M. Jones - 1.9.5-1 - New upstream release 1.9.5. - Clarify that the programs have GPL license. - Ship bitmatch-objinfo program. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 4 Jul 2008 13:52:06 -0000 1.10 +++ .cvsignore 11 Jul 2008 11:18:01 -0000 1.11 @@ -1 +1 @@ -ocaml-bitmatch-1.9.4.tar.gz +ocaml-bitmatch-1.9.5.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 4 Jul 2008 13:52:06 -0000 1.2 +++ import.log 11 Jul 2008 11:18:01 -0000 1.3 @@ -1,2 +1,3 @@ ocaml-bitmatch-1_9_3-1_fc10:HEAD:ocaml-bitmatch-1.9.3-1.fc10.src.rpm:1215169603 ocaml-bitmatch-1_9_4-1_fc10:HEAD:ocaml-bitmatch-1.9.4-1.fc10.src.rpm:1215179499 +ocaml-bitmatch-1_9_5-1_fc10:HEAD:ocaml-bitmatch-1.9.5-1.fc10.src.rpm:1215775050 Index: ocaml-bitmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ocaml-bitmatch.spec 4 Jul 2008 13:52:06 -0000 1.14 +++ ocaml-bitmatch.spec 11 Jul 2008 11:18:01 -0000 1.15 @@ -10,12 +10,12 @@ %endif Name: ocaml-bitmatch -Version: 1.9.4 +Version: 1.9.5 Release: 1%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries -License: LGPLv2+ with exceptions +License: LGPLv2+ with exceptions and GPLv2+ URL: http://code.google.com/p/bitmatch/ Source0: http://bitmatch.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,7 +60,7 @@ %description c -The %{name}-cil package contains tools for importing structs +The %{name}-c package contains tools for importing structs from C code and header files into %{name}. %endif @@ -96,9 +96,10 @@ mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install +mkdir -p $RPM_BUILD_ROOT%{_bindir} + %if %build_cil_tools # Install bitmatch-import-c by hand for now. -mkdir -p $RPM_BUILD_ROOT%{_bindir} %if %opt install -m 0755 cil-tools/bitmatch-import-c.opt $RPM_BUILD_ROOT%{_bindir}/bitmatch-import-c %else @@ -109,6 +110,9 @@ install -m 0644 cil-tools/bitmatch-import-prefix.h $OCAMLFIND_DESTDIR/bitmatch/ %endif +# Install bitmatch-objinfo by hand for now. +install -m 0755 bitmatch-objinfo $RPM_BUILD_ROOT%{_bindir} + %clean rm -rf $RPM_BUILD_ROOT @@ -138,6 +142,7 @@ %{_libdir}/ocaml/bitmatch/*.cmx %endif %{_libdir}/ocaml/bitmatch/*.mli +%{_bindir}/bitmatch-objinfo %if %build_cil_tools @@ -150,6 +155,11 @@ %changelog +* Fri Jul 11 2008 Richard W.M. Jones - 1.9.5-1 +- New upstream release 1.9.5. +- Clarify that the programs have GPL license. +- Ship bitmatch-objinfo program. + * Fri Jul 4 2008 Richard W.M. Jones - 1.9.4-1 - New upstream release 1.9.4. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 4 Jul 2008 13:52:06 -0000 1.10 +++ sources 11 Jul 2008 11:18:01 -0000 1.11 @@ -1 +1 @@ -a9c3e59e8ac08bf4e02e6bdabb196784 ocaml-bitmatch-1.9.4.tar.gz +3136f3d8aca859c26474cc26749789f9 ocaml-bitmatch-1.9.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 11:23:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 11:23:42 +0000 Subject: [pkgdb] rsyslog had acl change status Message-ID: <200807111123.m6BBNi2v015835@bastion.fedora.phx.redhat.com> Peter Vrabec (pvrabec) has set the commit acl on rsyslog (Fedora devel) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rsyslog From fedora-extras-commits at redhat.com Fri Jul 11 11:23:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 11:23:48 +0000 Subject: [pkgdb] rsyslog had acl change status Message-ID: <200807111123.m6BBNmiK015856@bastion.fedora.phx.redhat.com> Peter Vrabec (pvrabec) has set the commit acl on rsyslog (Fedora devel) to Awaiting Review for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rsyslog From fedora-extras-commits at redhat.com Fri Jul 11 11:23:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 11:23:51 +0000 Subject: [pkgdb] rsyslog had acl change status Message-ID: <200807111123.m6BBNpP2015877@bastion.fedora.phx.redhat.com> Peter Vrabec (pvrabec) has set the commit acl on rsyslog (Fedora devel) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rsyslog From fedora-extras-commits at redhat.com Fri Jul 11 11:38:00 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 11 Jul 2008 11:38:00 GMT Subject: rpms/rsyslog/devel rsyslog.conf, NONE, 1.1 rsyslog.init, NONE, 1.1 rsyslog.log, NONE, 1.1 rsyslog.sysconfig, NONE, 1.1 .cvsignore, 1.25, 1.26 rsyslog.spec, 1.44, 1.45 sources, 1.27, 1.28 rsyslog-3.19.7-symlookup.patch, 1.1, NONE Message-ID: <200807111138.m6BBc0UH010630@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/rsyslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10577 Modified Files: .cvsignore rsyslog.spec sources Added Files: rsyslog.conf rsyslog.init rsyslog.log rsyslog.sysconfig Removed Files: rsyslog-3.19.7-symlookup.patch Log Message: Upgrade to new upstream, clean up sources and move versionable stuff from lookaside cache to CVS. * Fri Jul 11 2008 Lubomir Rintel 3.19.9-1 - upgrade --- NEW FILE rsyslog.conf --- #rsyslog v3 config file #### GLOBAL DIRECTIVES #### # Use default timestamp format $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat # File syncing capability is disabled by default. This feature is usually not required, # not useful and an extreme performance hit #$ActionFileEnableSync on # An "In-Memory Queue" is created for remote logging. # $WorkDirectory /var/spool/rsyslog # where to place spool files # $ActionQueueFileName queue # unique name prefix for spool files # $ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) # $ActionQueueSaveOnShutdown on # save messages to disk on shutdown # $ActionQueueType LinkedList # run asynchronously # $ActionResumeRetryCount -1 # infinety retries if host is down #### MODULES #### $ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command) $ModLoad imklog.so # provides kernel logging support (previously done by rklogd) #$ModLoad immark.so # provides --MARK-- message capability # Provides UDP syslog reception #$ModLoad imudp.so #$UDPServerRun 514 # Provides TCP syslog reception #$ModLoad imtcp.so #$InputTCPServerRun 514 #### RULES #### # Log all kernel messages to the console. # Logging much else clutters up the screen. #kern.* /dev/console # Log anything (except mail) of level info or higher. # Don't log private authentication messages! *.info;mail.none;authpriv.none;cron.none /var/log/messages # The authpriv file has restricted access. authpriv.* /var/log/secure # Log all the mail messages in one place. mail.* -/var/log/maillog # Log cron stuff cron.* /var/log/cron # Everybody gets emergency messages *.emerg * # Save news errors of level crit and higher in a special file. uucp,news.crit /var/log/spooler # Save boot messages also to boot.log local7.* /var/log/boot.log --- NEW FILE rsyslog.init --- #!/bin/bash # # rsyslog Starts rsyslogd/rklogd. # # # chkconfig: 2345 12 88 # description: Syslog is the facility by which many daemons use to log \ # messages to various system log files. It is a good idea to always \ # run rsyslog. ### BEGIN INIT INFO # Provides: $syslog # Required-Start: $local_fs # Required-Stop: $local_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Enhanced system logging and kernel message trapping daemons # Description: Rsyslog is an enhanced multi-threaded syslogd supporting, # among others, MySQL, syslog/tcp, RFC 3195, permitted # sender lists, filtering on any message part, and fine # grain output format control. ### END INIT INFO # Source function library. . /etc/init.d/functions RETVAL=0 start() { [ -x /sbin/rsyslogd ] || exit 5 # Source config if [ -f /etc/sysconfig/rsyslog ] ; then . /etc/sysconfig/rsyslog fi umask 077 echo -n $"Starting system logger: " daemon rsyslogd $SYSLOGD_OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog return $RETVAL } stop() { echo -n $"Shutting down system logger: " killproc rsyslogd RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rsyslog return $RETVAL } reload() { RETVAL=1 syslog=`cat /var/run/rsyslogd.pid 2>/dev/null` echo -n "Reloading system logger..." if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then kill -HUP "$syslog"; RETVAL=$? fi if [ $RETVAL -ne 0 ]; then failure else success fi echo return $RETVAL } rhstatus() { status rsyslogd } restart() { stop start } case "$1" in start) start ;; stop) stop ;; restart) restart ;; reload|force-reload) reload ;; status) rhstatus ;; condrestart) [ -f /var/lock/subsys/rsyslog ] && restart || : ;; *) echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart}" exit 2 esac exit $? --- NEW FILE rsyslog.log --- /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron { sharedscripts postrotate /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true endscript } --- NEW FILE rsyslog.sysconfig --- # Options to syslogd # syslogd options are deprecated in rsyslog v3 # if you want to use them, switch to compatibility mode 2 by "-c 2" SYSLOGD_OPTIONS="-c 3" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rsyslog/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 13 Jun 2008 08:19:07 -0000 1.25 +++ .cvsignore 11 Jul 2008 11:37:05 -0000 1.26 @@ -1,7 +1 @@ -rsyslog.conf -rsyslog.sysconfig -rsyslog.init -rsyslog.log -rsyslog-3.19.3.tar.gz -rsyslog-3.19.4.tar.gz -rsyslog-3.19.7.tar.gz +rsyslog-3.19.9.tar.gz Index: rsyslog.spec =================================================================== RCS file: /cvs/pkgs/rpms/rsyslog/devel/rsyslog.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- rsyslog.spec 25 Jun 2008 14:10:33 -0000 1.44 +++ rsyslog.spec 11 Jul 2008 11:37:05 -0000 1.45 @@ -2,8 +2,8 @@ Summary: Enhanced system logging and kernel message trapping daemons Name: rsyslog -Version: 3.19.7 -Release: 3%{?dist} +Version: 3.19.9 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -12,7 +12,6 @@ Source2: rsyslog.conf Source3: rsyslog.sysconfig Source4: rsyslog.log -Patch1: rsyslog-3.19.7-symlookup.patch BuildRequires: zlib-devel BuildRequires: autoconf automake Requires: logrotate >= 3.5.2 @@ -88,7 +87,6 @@ %prep %setup -q -%patch1 -p1 -b .symLookup %build %configure --sbindir=%{sbindir} \ @@ -193,6 +191,9 @@ %{_libdir}/rsyslog/lmnsd_gtls.so %changelog +* Fri Jul 11 2008 Lubomir Rintel 3.19.9-1 +- upgrade + * Wed Jun 25 2008 Peter Vrabec 3.19.7-3 - rebuild because of new gnutls Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rsyslog/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 13 Jun 2008 08:19:07 -0000 1.27 +++ sources 11 Jul 2008 11:37:05 -0000 1.28 @@ -1,7 +1 @@ -e6fd8aa699a50ec9abffae50a423aca9 rsyslog.conf -04f3868aa518d33809f5943d7bc2fc0b rsyslog.sysconfig -26fb52edc816e59e29b1f3b4ac520d30 rsyslog.init -27b77a99af14212ae56995eb47b12975 rsyslog.log -ea5f89f994d22b564dc795d844e9189e rsyslog-3.19.3.tar.gz -65507e841eba982d9f031c95c2961894 rsyslog-3.19.4.tar.gz -c14691679f9fd6390eae44984fc6ae8c rsyslog-3.19.7.tar.gz +0c3c85ce0abba3caeab9bb1adc0d84fd rsyslog-3.19.9.tar.gz --- rsyslog-3.19.7-symlookup.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 11:56:06 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 11 Jul 2008 11:56:06 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.175, 1.176 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.26, 1.27 openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch, 1.1, 1.2 openoffice.org.spec, 1.1572, 1.1573 sources, 1.300, 1.301 openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.6, NONE openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch, 1.1, NONE workspace.ab55.patch, 1.2, NONE workspace.cairo06.patch, 1.1, NONE Message-ID: <200807111156.m6BBu67J011613@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11510 Modified Files: .cvsignore openoffice.org-1.9.87.rh151357.setlangtolocale.patch openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch openoffice.org.spec sources Removed Files: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch workspace.ab55.patch workspace.cairo06.patch Log Message: next version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- .cvsignore 6 Jul 2008 19:15:50 -0000 1.175 +++ .cvsignore 11 Jul 2008 11:55:15 -0000 1.176 @@ -6,4 +6,4 @@ redhat-langpacks.tar.gz evolocal.odb bengali.sdf -DEV300_m23.tar.bz2 +DEV300_m24.tar.bz2 openoffice.org-1.9.87.rh151357.setlangtolocale.patch: Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 15 Apr 2008 18:04:28 -0000 1.26 +++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 11 Jul 2008 11:55:15 -0000 1.27 @@ -250,7 +250,7 @@ diff -u -r1.28 optgdlg.cxx --- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 5 Jan 2006 17:58:40 -0000 1.28 +++ openoffice.org/svx/source/dialog/optgdlg.cxx 1 Feb 2006 11:04:37 -0000 -@@ -1197,8 +1197,6 @@ +@@ -1163,8 +1163,6 @@ /* -----------------------------23.11.00 13:06-------------------------------- ---------------------------------------------------------------------------*/ @@ -259,7 +259,7 @@ // some things we'll need... static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"); static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"); -@@ -1534,70 +1532,27 @@ +@@ -1500,70 +1498,27 @@ BOOL bRet = FALSE; SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY ); @@ -340,7 +340,7 @@ } if(aAsianSupportCB.GetSavedValue() != aAsianSupportCB.IsChecked() ) -@@ -1639,51 +1594,32 @@ +@@ -1605,51 +1560,32 @@ return FALSE; } @@ -414,7 +414,7 @@ //collect the configuration values first aCurrentDocCB.Enable(FALSE); // -@@ -1706,47 +1642,88 @@ +@@ -1672,47 +1608,88 @@ catch(Exception&) { } @@ -451,8 +451,8 @@ eCurLangCTL = ((const SvxLanguageItem*)pLang)->GetValue(); + bLanguageCurrentDoc_Impl = true; + } -+ aCurrentDocCB.Check(bLanguageCurrentDoc_Impl); -+ aCurrentDocCB.Enable(!bLanguageCurrentDoc_Impl); ++ aCurrentDocCB.Check(bLanguageCurrentDoc_Impl); ++ aCurrentDocCB.Enable(!bLanguageCurrentDoc_Impl); } - if(LANGUAGE_NONE == eCurLang || LANGUAGE_DONTKNOW == eCurLang) - aWesternLanguageLB.SelectLanguage(LANGUAGE_NONE); @@ -463,7 +463,7 @@ - aAsianLanguageLB.SelectLanguage(LANGUAGE_NONE); - else - aAsianLanguageLB.SelectLanguage(eCurLangCJK); -+ aCurrentDocCB.SaveValue(); ++ aCurrentDocCB.SaveValue(); +} - if(LANGUAGE_NONE == eCurLangCTL || LANGUAGE_DONTKNOW == eCurLangCTL) @@ -494,7 +494,6 @@ - sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") ); - aWesternLanguageFT.Enable( bEnable ); - aWesternLanguageLB.Enable( bEnable ); -- + // let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support + // #i15812# must be done *before* the configured currency is set + // and update the decimal separator used for the given locale @@ -517,7 +516,7 @@ + aCurrencyLB.Enable(!bReadonly); + aCurrencyFT.Enable(!bReadonly); + aCurrencyFI.Show(bReadonly); -+ + + ResetLang( rSet ); + + RegisterModify( &aCurrentDocCB ); @@ -526,7 +525,7 @@ // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl #if 0 -@@ -1773,6 +1750,26 @@ +@@ -1739,6 +1716,26 @@ /* -----------------------------20.04.01 15:09-------------------------------- ---------------------------------------------------------------------------*/ @@ -553,7 +552,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) { DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); -@@ -1780,23 +1777,23 @@ +@@ -1746,23 +1743,23 @@ sal_Bool bCheck = pBox->IsChecked(); if ( &aAsianSupportCB == pBox ) { openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch: Index: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 25 May 2006 11:08:14 -0000 1.1 +++ openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 11 Jul 2008 11:55:15 -0000 1.2 @@ -66,17 +66,17 @@ $(userurl)/database/biblio.odb --- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx 19 Dec 2005 17:26:24 -0000 1.13 +++ openoffice.org/extensions/source/abpilot/abspilot.cxx 16 Feb 2006 12:45:38 -0000 -@@ -151,12 +151,9 @@ namespace abp - m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) ); - +@@ -124,12 +124,8 @@ // some initial settings --#ifdef WITH_MOZILLA - #ifdef UNX + #ifdef MACOSX + m_aSettings.eType = AST_MACAB; +-#elif WITH_MOZILLA +-#ifdef UNX - m_aSettings.eType = AST_MORK; -#else - m_aSettings.eType = AST_OE; -#endif -+// FIXME: if KDE use KAB instead ++#elif UNX + m_aSettings.eType = AST_EVOLUTION; #else m_aSettings.eType = AST_OTHER; Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1572 retrieving revision 1.1573 diff -u -r1.1572 -r1.1573 --- openoffice.org.spec 10 Jul 2008 20:14:08 -0000 1.1572 +++ openoffice.org.spec 11 Jul 2008 11:55:15 -0000 1.1573 @@ -1,6 +1,6 @@ %define oootag DEV300 -%define ooomilestone 23 -%define rh_rpm_release 2 +%define ooomilestone 24 +%define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -100,23 +100,19 @@ Patch30: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch Patch31: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch Patch32: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch -Patch33: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch -Patch34: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch -Patch35: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch36: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch -Patch37: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch -Patch38: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch -Patch39: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch -Patch40: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch -Patch41: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch -Patch42: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch -Patch43: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch -Patch44: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch -Patch45: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch -Patch46: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch -Patch47: workspace.cairo06.patch -Patch48: workspace.ab55.patch -Patch49: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +Patch33: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch +Patch34: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch +Patch35: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch +Patch36: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch +Patch37: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch +Patch38: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch +Patch39: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch +Patch40: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch +Patch41: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch +Patch42: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch +Patch43: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch +Patch44: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch +Patch45: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1261,23 +1257,19 @@ %patch30 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch %patch31 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch %patch32 -p1 -b .ooo88341.sc.verticalboxes.patch -%patch33 -p1 -b .ooo6087.sc.sheetnames.patch -%patch34 -p1 -b .ooo89002.vcl.symbolfonts.patch -%patch35 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch36 -p1 -b .ooo87970.vcl.samenamesubs.patch -%patch37 -p1 -b .ooo90055.swext.allowadmin.patch -%patch38 -p1 -b .oooXXXXX.odk.3layer.patch -%patch39 -p1 -b .ooo90037.vcl.cairotransforms.patch -%patch40 -p1 -b .ooo90178.tools.fixmacro.patch -%patch41 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch -%patch42 -p1 -b .ooo82545.np_sdk.x86_64.patch -%patch43 -p1 -b .ooo90306.sw.wrongprotection.patch -%patch44 -p1 -b .ooo48400.svx.fixspelling.patch -%patch45 -p1 -b .ooo90876.connectivity.evoab2.patch -%patch46 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch -%patch47 -p1 -b .workspace.cairo06.patch -%patch48 -p1 -b .workspace.ab55.patch -%patch49 -p1 -b .ooo86142.serbiannumbering.patch +%patch33 -p1 -b .ooo89002.vcl.symbolfonts.patch +%patch34 -p1 -b .gccXXXXX.solenv.javaregistration.patch +%patch35 -p1 -b .ooo87970.vcl.samenamesubs.patch +%patch36 -p1 -b .oooXXXXX.odk.3layer.patch +%patch37 -p1 -b .ooo90037.vcl.cairotransforms.patch +%patch38 -p1 -b .ooo90178.tools.fixmacro.patch +%patch39 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch +%patch40 -p1 -b .ooo82545.np_sdk.x86_64.patch +%patch41 -p1 -b .ooo90306.sw.wrongprotection.patch +%patch42 -p1 -b .ooo48400.svx.fixspelling.patch +%patch43 -p1 -b .ooo90876.connectivity.evoab2.patch +%patch44 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch +%patch45 -p1 -b .ooo86142.serbiannumbering.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2972,7 +2964,7 @@ %pre presentation-minimizer if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared org.openoffice.legacy.sun-presentation-minimizer.oxt || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d\\\" -f 2` || : fi %post presentation-minimizer @@ -2982,7 +2974,7 @@ %preun presentation-minimizer if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared org.openoffice.legacy.sun-presentation-minimizer.oxt || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d\\\" -f 2` || : fi %postun presentation-minimizer @@ -3583,7 +3575,12 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Thu Jul 10 2008 Caolan McNamara - 1:3.0.0-0.23-2 +* Fri Jul 11 2008 Caolan McNamara - 1:3.0.0-0.24-1 +- next version +- drop integrated openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch +- drop integrated openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch +- drop integrated workspace.cairo06.patch +- drop integrated workspace.ab55.patch - Resolves: rhbz#452385 add postgress-jdbc to default classpath - Resolves: rhbz#454682 expand macro to get correct name for inconsistent, unnecessarily complicated, redundant and nigh universially Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- sources 6 Jul 2008 19:15:50 -0000 1.300 +++ sources 11 Jul 2008 11:55:15 -0000 1.301 @@ -6,4 +6,4 @@ 261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -faaec17320265bf4e5b5566defb30162 DEV300_m23.tar.bz2 +1b7bbc74567bcf2528c49a32cda0b6e8 DEV300_m24.tar.bz2 --- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch DELETED --- --- openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch DELETED --- --- workspace.ab55.patch DELETED --- --- workspace.cairo06.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 12:00:00 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Fri, 11 Jul 2008 12:00:00 GMT Subject: rpms/compat-db/devel compat-db.spec,1.30,1.31 Message-ID: <200807111200.m6BC00gI011958@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/compat-db/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11899 Modified Files: compat-db.spec Log Message: - fix broken devel library symlinks Index: compat-db.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-db/devel/compat-db.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- compat-db.spec 9 Jul 2008 07:20:02 -0000 1.30 +++ compat-db.spec 11 Jul 2008 11:59:12 -0000 1.31 @@ -6,7 +6,7 @@ Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility Name: compat-db Version: 4.6.21 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz Source1: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz Source2: http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz @@ -152,8 +152,8 @@ for version in %{db4_versions} ; do mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/db${version} pushd ${RPM_BUILD_ROOT}/%{_libdir}/db${version} - ln -s ../../../libdb-`echo ${version} | cut -b 1-3`.so libdb.so - ln -s ../../../libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so + ln -s ../../../%{_lib}/libdb-`echo ${version} | cut -b 1-3`.so libdb.so + ln -s ../../../%{_lib}/libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so popd done @@ -204,6 +204,9 @@ %{_includedir}/* %changelog +* Fri Jul 11 2008 Panu Matilainen 4.6.21-2 +- fix broken devel library symlinks + * Wed Jul 09 2008 Jindrich Novy 4.6.21-1 - move db-4.6.21 to compat-db (#449741) - remove db-4.2.52 From fedora-extras-commits at redhat.com Fri Jul 11 12:06:35 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Fri, 11 Jul 2008 12:06:35 GMT Subject: rpms/xenner/devel xenner-debuginfo.sh, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.13, 1.14 xenner.spec, 1.21, 1.22 Message-ID: <200807111206.m6BC6ZYi019080@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18996 Modified Files: .cvsignore sources xenner.spec Added Files: xenner-debuginfo.sh Log Message: - update to version 0.39 --- NEW FILE xenner-debuginfo.sh --- #!/bin/sh # /usr/lib64/xenner/emu{23,64}.elf must not be stripped # symbol tables are required. gzip $RPM_BUILD_ROOT/usr/lib*/xenner/*.elf # hide files /usr/lib/rpm/find-debuginfo.sh "$@" # extract debuginfo gunzip $RPM_BUILD_ROOT/usr/lib*/xenner/*.elf.gz # restore Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Jul 2008 09:27:06 -0000 1.14 +++ .cvsignore 11 Jul 2008 12:05:47 -0000 1.15 @@ -1 +1 @@ -xenner-0.38.tar.gz +xenner-0.39.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 2 Jul 2008 09:27:06 -0000 1.13 +++ sources 11 Jul 2008 12:05:47 -0000 1.14 @@ -1 +1 @@ -3dbc3cfcba5e80b591bbdc9675846b7c xenner-0.38.tar.gz +0b1f56f9ae2f11a6e57944954b9f9418 xenner-0.39.tar.gz Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xenner.spec 2 Jul 2008 09:27:06 -0000 1.21 +++ xenner.spec 11 Jul 2008 12:05:47 -0000 1.22 @@ -1,10 +1,11 @@ Name: xenner License: GPLv2+ -Version: 0.38 +Version: 0.39 Release: 1%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators -Source: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +Source1: %{name}-debuginfo.sh URL: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz Requires: xen-runtime Provides: xen-hypervisor-abi = 3.2 @@ -21,6 +22,11 @@ xenner is a utility which is able to boot xen paravirtualized kernels, without the xen hypervisor, using kvm instead. +# debuginfo: hide some files which must not be stripped. +%define __debug_install_post \ + sh %{SOURCE1} %{_builddir}/%{?buildsubdir}\ +%{nil} + %prep %setup -q @@ -57,6 +63,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 11 2008 Gerd Hoffmann - 0.39-1.fc10 +- update to version 0.39 +- avoid emu*.elf getting stripped * Mon Jul 2 2008 Gerd Hoffmann - 0.38-1.fc10 - update to version 0.38 * Mon Jun 9 2008 Gerd Hoffmann - 0.37-1.fc10 From fedora-extras-commits at redhat.com Fri Jul 11 12:21:04 2008 From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip)) Date: Fri, 11 Jul 2008 12:21:04 GMT Subject: rpms/perl-Net-Telnet/EL-5 import.log,NONE,1.1 Message-ID: <200807111221.m6BCL47s020155@cvs-int.fedora.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/perl-Net-Telnet/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20107/EL-5 Added Files: import.log Log Message: perl-Net-Telnet-3.03-7.el5 --- NEW FILE import.log --- perl-Net-Telnet-3_03-7_fc10:EL-5:perl-Net-Telnet-3.03-7.fc10.src.rpm:1215778815 From fedora-extras-commits at redhat.com Fri Jul 11 12:22:32 2008 From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip)) Date: Fri, 11 Jul 2008 12:22:32 GMT Subject: rpms/perl-Net-Telnet/EL-4 import.log,NONE,1.1 Message-ID: <200807111222.m6BCMWGx020348@cvs-int.fedora.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/perl-Net-Telnet/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20317/EL-4 Added Files: import.log Log Message: perl-Net-Telnet-3.03-7.el4 --- NEW FILE import.log --- perl-Net-Telnet-3_03-7_fc10:EL-4:perl-Net-Telnet-3.03-7.fc10.src.rpm:1215778907 From fedora-extras-commits at redhat.com Fri Jul 11 12:23:45 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 11 Jul 2008 12:23:45 GMT Subject: rpms/virt-df/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 virt-df.spec, 1.1, 1.2 virt-df-requires-bitmatch.patch, 1.1, NONE Message-ID: <200807111223.m6BCNjve020595@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/virt-df/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20461/devel Modified Files: .cvsignore sources virt-df.spec Added Files: import.log Removed Files: virt-df-requires-bitmatch.patch Log Message: * Fri Jul 11 2008 Richard W.M. Jones - 2.1.2-1 - New upstream version 2.1.2. --- NEW FILE import.log --- virt-df-2_1_2-1_fc10:HEAD:virt-df-2.1.2-1.fc10.src.rpm:1215778938 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 May 2008 16:34:47 -0000 1.2 +++ .cvsignore 11 Jul 2008 12:23:01 -0000 1.3 @@ -1 +1 @@ -virt-df-2.1.1.tar.gz +virt-df-2.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 May 2008 16:34:47 -0000 1.2 +++ sources 11 Jul 2008 12:23:01 -0000 1.3 @@ -1 +1 @@ -a50f8d1db626527664293a737e3827c1 virt-df-2.1.1.tar.gz +326a60d598166da8efecc306f2a9fb4c virt-df-2.1.2.tar.gz Index: virt-df.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/devel/virt-df.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- virt-df.spec 19 May 2008 16:34:47 -0000 1.1 +++ virt-df.spec 11 Jul 2008 12:23:01 -0000 1.2 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: virt-df -Version: 2.1.1 -Release: 6%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: Utility like 'df' for virtual guests Group: Development/Libraries @@ -12,8 +12,6 @@ Source0: http://et.redhat.com/~rjones/virt-df/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: virt-df-requires-bitmatch.patch - BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel @@ -48,8 +46,6 @@ %prep %setup -q -# http://hg.et.redhat.com/virt/applications/virt-df--devel?cs=00a35ad4c881 -%patch0 -p1 %build @@ -98,6 +94,9 @@ %changelog +* Fri Jul 11 2008 Richard W.M. Jones - 2.1.2-1 +- New upstream version 2.1.2. + * Sun May 18 2008 Richard W.M. Jones - 2.1.1-6 - Include upstream cset 00a35ad4c881 which fixes build with latest bitmatch. --- virt-df-requires-bitmatch.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 12:31:06 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Fri, 11 Jul 2008 12:31:06 GMT Subject: rpms/xmlsec1/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xmlsec1.spec, 1.30, 1.31 multilib.patch, 1.1, NONE separate_nspr_nss.patch, 1.1, NONE Message-ID: <200807111231.m6BCV6uk021221@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/xmlsec1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21089 Modified Files: .cvsignore sources xmlsec1.spec Removed Files: multilib.patch separate_nspr_nss.patch Log Message: New upstream version 1.2.11 and rebuild for new gnutls, old patches are not needed, integrated upstream, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xmlsec1/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Sep 2005 10:33:29 -0000 1.8 +++ .cvsignore 11 Jul 2008 12:30:22 -0000 1.9 @@ -2,3 +2,4 @@ xmlsec1-1.2.7.tar.gz xmlsec1-1.2.8.tar.gz xmlsec1-1.2.9.tar.gz +xmlsec1-1.2.11.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xmlsec1/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Sep 2005 10:33:29 -0000 1.8 +++ sources 11 Jul 2008 12:30:22 -0000 1.9 @@ -1 +1 @@ -b378a076708766966724aaeba09e4607 xmlsec1-1.2.9.tar.gz +5652d44eec1375a399a6c61f5f6091f1 xmlsec1-1.2.11.tar.gz Index: xmlsec1.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmlsec1/devel/xmlsec1.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- xmlsec1.spec 20 Feb 2008 06:50:07 -0000 1.30 +++ xmlsec1.spec 11 Jul 2008 12:30:22 -0000 1.31 @@ -1,11 +1,11 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.9 -Release: 10.1 +Version: 1.2.11 +Release: 1 License: MIT Group: Development/Libraries Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.aleksey.com/xmlsec/ Requires: libxml2 >= 2.6.0 Requires: libxslt >= 1.1.0 @@ -13,31 +13,29 @@ BuildRequires: libxslt-devel >= 1.1.0 Prefix: %{_prefix} Docdir: %{_docdir} -Patch0: separate_nspr_nss.patch -Patch1: multilib.patch %description -XML Security Library is a C library based on LibXML2 and OpenSSL. -The library was created with a goal to support major XML security -standards "XML Digital Signature" and "XML Encryption". +XML Security Library is a C library based on LibXML2 and OpenSSL. +The library was created with a goal to support major XML security +standards "XML Digital Signature" and "XML Encryption". -%package devel +%package devel Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support. -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2-devel >= 2.6.0 Requires: libxslt-devel >= 1.1.0 Requires: openssl-devel >= 0.9.6 -Requires: zlib-devel +Requires: zlib-devel Requires: pkgconfig %description devel -Libraries, includes, etc. you can use to develop applications with XML Digital +Libraries, includes, etc. you can use to develop applications with XML Digital Signatures and XML Encryption support. %package openssl Summary: OpenSSL crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2 >= 2.6.0 Requires: libxslt >= 1.1.0 @@ -56,7 +54,7 @@ %package openssl-devel Summary: OpenSSL crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: xmlsec1-devel = %{version} Requires: xmlsec1-openssl = %{version} @@ -70,7 +68,7 @@ %package gnutls Summary: GNUTls crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2 >= 2.6.0 Requires: libxslt >= 1.1.0 @@ -91,7 +89,7 @@ %package gnutls-devel Summary: GNUTls crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: xmlsec1-devel = %{version} Requires: xmlsec1-openssl = %{version} @@ -107,7 +105,7 @@ %package nss Summary: NSS crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2 >= 2.4.24 Requires: libxslt >= 1.0.20 @@ -122,7 +120,7 @@ %package nss-devel Summary: NSS crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: xmlsec1-devel = %{version} Requires: xmlsec1-nss = %{version} @@ -136,8 +134,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure @@ -171,7 +167,7 @@ %postun /sbin/ldconfig -%files +%files %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README Copyright @@ -181,7 +177,7 @@ %{prefix}/bin/xmlsec1 %files devel -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/bin/xmlsec1-config %dir %{prefix}/include/xmlsec1 @@ -194,17 +190,18 @@ %{prefix}/lib*/pkgconfig/xmlsec1.pc %{prefix}/lib*/xmlsec1Conf.sh %dir %{prefix}/share/doc/xmlsec1 -%{prefix}/share/doc/xmlsec1/* +%{prefix}/share/doc/xmlsec1/* %doc AUTHORS HACKING ChangeLog NEWS README Copyright %doc %{_mandir}/man1/xmlsec1-config.1* +%{_datadir}/aclocal/xmlsec1.m4 %files openssl -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/lib*/libxmlsec1-openssl.so.* %files openssl-devel -%defattr(-, root, root) +%defattr(-, root, root) %dir %{prefix}/include/xmlsec1/xmlsec/openssl %{prefix}/include/xmlsec1/xmlsec/openssl/*.h @@ -213,12 +210,12 @@ %{prefix}/lib*/pkgconfig/xmlsec1-openssl.pc %files gnutls -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/lib*/libxmlsec1-gnutls.so.* %files gnutls-devel -%defattr(-, root, root) +%defattr(-, root, root) %dir %{prefix}/include/xmlsec1/xmlsec/gnutls %{prefix}/include/xmlsec1/xmlsec/gnutls/*.h @@ -227,12 +224,12 @@ %{prefix}/lib*/pkgconfig/xmlsec1-gnutls.pc %files nss -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/lib*/libxmlsec1-nss.so.* %files nss-devel -%defattr(-, root, root) +%defattr(-, root, root) %dir %{prefix}/include/xmlsec1/xmlsec/nss %{prefix}/include/xmlsec1/xmlsec/nss/*.h --- multilib.patch DELETED --- --- separate_nspr_nss.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 12:33:26 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 12:33:26 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.96, 1.97 sources, 1.17, 1.18 kdebase-workspace-4.0.85-kde#164786.patch, 1.1, NONE Message-ID: <200807111233.m6BCXQMJ021405@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21320 Modified Files: kdebase-workspace.spec sources Removed Files: kdebase-workspace-4.0.85-kde#164786.patch Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-2 - respun tarball (with systray patch) Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- kdebase-workspace.spec 11 Jul 2008 03:59:29 -0000 1.96 +++ kdebase-workspace.spec 11 Jul 2008 12:32:40 -0000 1.97 @@ -2,7 +2,7 @@ Name: kdebase-workspace Version: 4.0.98 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -33,8 +33,6 @@ Patch201: kdebase-workspace-4.0.85-kde#154119.patch Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151 -# (gtk) systray icons -Patch205: kdebase-workspace-4.0.85-kde#164786.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -149,9 +147,6 @@ # patch201 will no longer be needed with the next snapshot: omitted in 4.0.98 -- Rex #patch201 -p1 -b .kde#154119 %patch204 -p1 -b .kickoff-suspend -pushd plasma/applets/systemtray/ -%patch205 -p0 -b .kde#164786 -popd %build @@ -284,6 +279,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-2 +- respun tarball (with systray patch) + * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 11 Jul 2008 03:59:29 -0000 1.17 +++ sources 11 Jul 2008 12:32:40 -0000 1.18 @@ -1 +1 @@ -9129174ff9cbe3fa2349234a65451b35 kdebase-workspace-4.0.98.tar.bz2 +a54ffc831d940955443d35b11f5879a7 kdebase-workspace-4.0.98.tar.bz2 --- kdebase-workspace-4.0.85-kde#164786.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 12:39:56 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Fri, 11 Jul 2008 12:39:56 GMT Subject: rpms/PackageKit/F-9 PackageKit.spec,1.39,1.40 Message-ID: <200807111239.m6BCdue0021924@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21845 Modified Files: PackageKit.spec Log Message: * Fri Jul 11 2008 Richard Hughes - 0.2.3-4 - Silence the output of update-mime-database to fix rh#454782 Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- PackageKit.spec 8 Jul 2008 00:00:40 -0000 1.39 +++ PackageKit.spec 11 Jul 2008 12:38:50 -0000 1.40 @@ -10,7 +10,7 @@ Name: PackageKit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org @@ -127,10 +127,10 @@ rm -rf $RPM_BUILD_ROOT %post -update-mime-database %{_datadir}/mime +update-mime-database %{_datadir}/mime &> /dev/null || : %postun -update-mime-database %{_datadir}/mime +update-mime-database %{_datadir}/mime &> /dev/null || : %post libs -p /sbin/ldconfig @@ -198,6 +198,9 @@ %{_includedir}/* %changelog +* Fri Jul 11 2008 Richard Hughes - 0.2.3-4 +- Silence the output of update-mime-database to fix rh#454782 + * Tue Jul 08 2008 Richard Hughes - 0.2.3-3 - Bump the soname so the upgrade of PackageKit-libs from 0.1.12 works -- I really should have done this upstream when we broke ABI. From fedora-extras-commits at redhat.com Fri Jul 11 12:39:58 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Fri, 11 Jul 2008 12:39:58 GMT Subject: rpms/xmlsec1/devel xmlsec1.spec,1.31,1.32 Message-ID: <200807111239.m6BCdwnr021927@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/xmlsec1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21844 Modified Files: xmlsec1.spec Log Message: fix changelog, daniel Index: xmlsec1.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmlsec1/devel/xmlsec1.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- xmlsec1.spec 11 Jul 2008 12:30:22 -0000 1.31 +++ xmlsec1.spec 11 Jul 2008 12:38:57 -0000 1.32 @@ -238,6 +238,10 @@ %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc %changelog +* Fri Jul 11 2008 Daniel Veillard - 1.2.11-1 +- update to new upstream release 1.2.11 +- rebuild for gnutls update + * Wed Feb 20 2008 Fedora Release Engineering - 1.2.9-10.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 11 12:44:14 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 11 Jul 2008 12:44:14 GMT Subject: rpms/libsepol/F-9 libsepol-rhat.patch, 1.17, 1.18 libsepol.spec, 1.179, 1.180 sources, 1.135, 1.136 Message-ID: <200807111244.m6BCiEAN022314@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsepol/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22264 Modified Files: libsepol-rhat.patch libsepol.spec sources Log Message: * Mon Jul 7 2008 Dan Walsh 2.0.32-1 - Upgrade to latest from NSA * Allow require then declare in the source policy from Joshua Brindle. libsepol-rhat.patch: Index: libsepol-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libsepol/F-9/libsepol-rhat.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libsepol-rhat.patch 28 Aug 2007 17:35:57 -0000 1.17 +++ libsepol-rhat.patch 11 Jul 2008 12:43:09 -0000 1.18 @@ -1,88 +1,237 @@ -Index: libsepol/src/module.c -=================================================================== ---- libsepol/src/module.c (revision 2538) -+++ libsepol/src/module.c (working copy) -@@ -353,21 +353,27 @@ - struct policy_file *file, - size_t ** offsets, uint32_t * sections) +diff --exclude-from=exclude -N -u -r nsalibsepol/include/sepol/policydb/conditional.h libsepol-2.0.1/include/sepol/policydb/conditional.h +--- nsalibsepol/include/sepol/policydb/conditional.h 2006-11-16 17:14:15.000000000 -0500 ++++ libsepol-2.0.1/include/sepol/policydb/conditional.h 2007-03-28 14:13:02.000000000 -0400 +@@ -100,6 +100,8 @@ + cond_node_t * needle, cond_node_t * haystack, + int *was_created); + ++extern cond_node_t *cond_node_create(policydb_t * p, cond_node_t * node); ++ + extern cond_node_t *cond_node_search(policydb_t * p, cond_node_t * list, + cond_node_t * cn); + +diff --exclude-from=exclude -N -u -r nsalibsepol/src/conditional.c libsepol-2.0.1/src/conditional.c +--- nsalibsepol/src/conditional.c 2006-11-16 17:14:24.000000000 -0500 ++++ libsepol-2.0.1/src/conditional.c 2007-03-28 14:13:02.000000000 -0400 +@@ -26,9 +26,6 @@ + + #include "private.h" + +-#undef min +-#define min(a,b) (((a) < (b)) ? (a) : (b)) +- + /* move all type rules to top of t/f lists to help kernel on evaluation */ + static void cond_optimize(cond_av_list_t ** l) + { +@@ -136,6 +133,38 @@ + return 1; + } + ++/* Create a new conditional node, optionally copying ++ * the conditional expression from an existing node. ++ * If node is NULL then a new node will be created ++ * with no conditional expression. ++ */ ++cond_node_t *cond_node_create(policydb_t * p, cond_node_t * node) ++{ ++ cond_node_t *new_node; ++ unsigned int i; ++ ++ new_node = (cond_node_t *)malloc(sizeof(cond_node_t)); ++ if (!new_node) { ++ return NULL; ++ } ++ memset(new_node, 0, sizeof(cond_node_t)); ++ ++ if (node) { ++ new_node->expr = cond_copy_expr(node->expr); ++ if (!new_node->expr) { ++ free(new_node); ++ return NULL; ++ } ++ new_node->cur_state = cond_evaluate_expr(p, new_node->expr); ++ new_node->nbools = node->nbools; ++ for (i = 0; i < min(node->nbools, COND_MAX_BOOLS); i++) ++ new_node->bool_ids[i] = node->bool_ids[i]; ++ new_node->expr_pre_comp = node->expr_pre_comp; ++ } ++ ++ return new_node; ++} ++ + /* Find a conditional (the needle) within a list of existing ones (the + * haystack) that has a matching expression. If found, return a + * pointer to the existing node, setting 'was_created' to 0. +@@ -145,9 +174,6 @@ + cond_node_t * needle, cond_node_t * haystack, + int *was_created) { -- uint32_t buf[3], nsec; -+ uint32_t *buf = NULL, nsec; - unsigned i; -- size_t *off; -+ size_t *off = NULL; - int rc; - -+ buf = malloc(sizeof(uint32_t)*3); -+ if (!buf) { -+ ERR(file->handle, "out of memory"); -+ goto err; -+ } -+ - rc = next_entry(buf, file, sizeof(uint32_t) * 3); - if (rc < 0) { - ERR(file->handle, "module package header truncated"); -- return -1; -+ goto err; - } - if (le32_to_cpu(buf[0]) != SEPOL_MODULE_PACKAGE_MAGIC) { - ERR(file->handle, - "wrong magic number for module package: expected %u, got %u", - SEPOL_MODULE_PACKAGE_MAGIC, le32_to_cpu(buf[0])); -- return -1; -+ goto err; - } - - mod->version = le32_to_cpu(buf[1]); -@@ -376,23 +382,29 @@ - if (nsec > MAXSECTIONS) { - ERR(file->handle, "too many sections (%u) in module package", - nsec); -- return -1; -+ goto err; - } - - off = (size_t *) malloc((nsec + 1) * sizeof(size_t)); - if (!off) { - ERR(file->handle, "out of memory"); -- return -1; -+ goto err; - } - -- rc = next_entry(off, file, sizeof(uint32_t) * nsec); -+ free(buf); -+ buf = malloc(sizeof(uint32_t) * nsec); -+ if (!buf) { -+ ERR(file->handle, "out of memory"); -+ goto err; -+ } -+ rc = next_entry(buf, file, sizeof(uint32_t) * nsec); - if (rc < 0) { - ERR(file->handle, "module package offset array truncated"); -- return -1; -+ goto err; - } - - for (i = 0; i < nsec; i++) { -- off[i] = le32_to_cpu(off[i]); -+ off[i] = le32_to_cpu(buf[i]); - if (i && off[i] < off[i - 1]) { - ERR(file->handle, "offsets are not increasing (at %u, " - "offset %zu -> %zu", i, off[i - 1], -@@ -401,10 +413,15 @@ - } - } - -- -+ free(buf); - off[nsec] = policy_file_length(file); - *offsets = off; +- cond_node_t *new_node; +- unsigned int i; +- + while (haystack) { + if (cond_expr_equal(needle, haystack)) { + *was_created = 0; +@@ -156,26 +182,8 @@ + haystack = haystack->next; + } + *was_created = 1; +- new_node = (cond_node_t *) malloc(sizeof(cond_node_t)); +- if (!new_node) { +- return NULL; +- } +- memset(new_node, 0, sizeof(cond_node_t)); +- new_node->expr = cond_copy_expr(needle->expr); +- if (!new_node->expr) { +- free(new_node); +- return NULL; +- } +- new_node->cur_state = cond_evaluate_expr(p, new_node->expr); +- new_node->nbools = needle->nbools; +- for (i = 0; i < min(needle->nbools, COND_MAX_BOOLS); i++) +- new_node->bool_ids[i] = needle->bool_ids[i]; +- new_node->expr_pre_comp = needle->expr_pre_comp; +- new_node->true_list = NULL; +- new_node->false_list = NULL; +- new_node->avtrue_list = NULL; +- new_node->avfalse_list = NULL; +- return new_node; ++ ++ return cond_node_create(p, needle); + } + + /* return either a pre-existing matching node or create a new node */ +diff --exclude-from=exclude -N -u -r nsalibsepol/src/expand.c libsepol-2.0.1/src/expand.c +--- nsalibsepol/src/expand.c 2007-02-07 12:11:48.000000000 -0500 ++++ libsepol-2.0.1/src/expand.c 2007-03-28 14:13:02.000000000 -0400 +@@ -35,10 +35,12 @@ + #include + + #include "debug.h" ++#include "private.h" + + typedef struct expand_state { + int verbose; + uint32_t *typemap; ++ uint32_t *boolmap; + policydb_t *base; + policydb_t *out; + sepol_handle_t *handle; +@@ -791,8 +793,8 @@ + return -1; + } + +- new_bool->s.value = bool->s.value; + state->out->p_bools.nprim++; ++ new_bool->s.value = state->out->p_bools.nprim; + + ret = hashtab_insert(state->out->p_bools.table, + (hashtab_key_t) new_id, +@@ -804,6 +806,8 @@ + return -1; + } + ++ state->boolmap[bool->s.value - 1] = new_bool->s.value; ++ + new_bool->state = bool->state; + + return 0; +@@ -1555,12 +1559,35 @@ return 0; + } + ++static int cond_node_map_bools(expand_state_t * state, cond_node_t * cn) ++{ ++ cond_expr_t *cur; ++ unsigned int i; ++ ++ cur = cn->expr; ++ while (cur) { ++ if (cur->bool) ++ cur->bool = state->boolmap[cur->bool - 1]; ++ cur = cur->next; ++ } ++ ++ for (i = 0; i < min(cn->nbools, COND_MAX_BOOLS); i++) ++ cn->bool_ids[i] = state->boolmap[cn->bool_ids[i] - 1]; ++ ++ if (cond_normalize_expr(state->out, cn)) { ++ ERR(state->handle, "Error while normalizing conditional"); ++ return -1; ++ } ++ ++ return 0; ++} ++ + /* copy the nodes in *reverse* order -- the result is that the last + * given conditional appears first in the policy, so as to match the + * behavior of the upstream compiler */ + static int cond_node_copy(expand_state_t * state, cond_node_t * cn) + { +- cond_node_t *new_cond; ++ cond_node_t *new_cond, *tmp; + + if (cn == NULL) { + return 0; +@@ -1573,11 +1600,26 @@ + return -1; + } + +- new_cond = cond_node_search(state->out, state->out->cond_list, cn); ++ /* create a new temporary conditional node with the booleans ++ * mapped */ ++ tmp = cond_node_create(state->base, cn); ++ if (!tmp) { ++ ERR(state->handle, "Out of memory"); ++ return -1; ++ } ++ ++ if (cond_node_map_bools(state, tmp)) { ++ ERR(state->handle, "Error mapping booleans"); ++ return -1; ++ } ++ ++ new_cond = cond_node_search(state->out, state->out->cond_list, tmp); + if (!new_cond) { ++ cond_node_destroy(tmp); + ERR(state->handle, "Out of memory!"); + return -1; + } ++ cond_node_destroy(tmp); + + if (cond_avrule_list_copy + (state->out, cn->avtrue_list, &state->out->te_cond_avtab, +@@ -2210,6 +2252,12 @@ + goto cleanup; + } + ++ state.boolmap = (uint32_t *)calloc(state.base->p_bools.nprim, sizeof(uint32_t)); ++ if (!state.boolmap) { ++ ERR(handle, "Out of memory!"); ++ goto cleanup; ++ } + -+err: -+ free(buf); -+ free(off); -+ return -1; + /* order is important - types must be first */ + + /* copy types */ +@@ -2364,6 +2412,7 @@ + + cleanup: + free(state.typemap); ++ free(state.boolmap); + return retval; } - /* Flags for which sections have been seen during parsing of module package. */ +diff --exclude-from=exclude -N -u -r nsalibsepol/src/private.h libsepol-2.0.1/src/private.h +--- nsalibsepol/src/private.h 2007-02-07 12:11:48.000000000 -0500 ++++ libsepol-2.0.1/src/private.h 2007-03-28 14:13:02.000000000 -0400 +@@ -24,6 +24,9 @@ + #define le64_to_cpu(x) bswap_64(x) + #endif + ++#undef min ++#define min(a,b) (((a) < (b)) ? (a) : (b)) ++ + /* Policy compatibility information. */ + struct policydb_compat_info { + unsigned int type; Index: libsepol.spec =================================================================== RCS file: /cvs/extras/rpms/libsepol/F-9/libsepol.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- libsepol.spec 27 Mar 2008 17:22:50 -0000 1.179 +++ libsepol.spec 11 Jul 2008 12:43:09 -0000 1.180 @@ -1,7 +1,6 @@ - Summary: SELinux binary policy manipulation library Name: libsepol -Version: 2.0.26 +Version: 2.0.32 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -97,6 +96,29 @@ /%{_lib}/libsepol.so.1 %changelog +* Mon Jul 7 2008 Dan Walsh 2.0.32-1 +- Upgrade to latest from NSA + * Allow require then declare in the source policy from Joshua Brindle. + +* Sun Jun 22 2008 Dan Walsh 2.0.31-1 +- Upgrade to latest from NSA + * Fix mls_semantic_level_expand() to handle a user require w/o MLS information from Stephen Smalley. + +* Wed Jun 11 2008 Dan Walsh 2.0.30-1 +- Upgrade to latest from NSA + * Fix endianness bug in the handling of network node addresses from Stephen Smalley. + Only affects big endian platforms. + Bug reported by John Weeks of Sun upon policy mismatch between x86 and sparc. + +* Wed May 28 2008 Dan Walsh 2.0.29-1 +- Upgrade to latest from NSA + * Merge user and role mapping support from Joshua Brindle. + +* Mon May 19 2008 Dan Walsh 2.0.28-1 +- Upgrade to latest from NSA + * Fix mls_level_convert() to gracefully handle an empty user declaration/require from Stephen Smalley. + * Belatedly merge test for policy downgrade from Todd Miller. + * Thu Mar 27 2008 Dan Walsh 2.0.26-1 - Upgrade to latest from NSA * Add permissive domain support from Eric Paris. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsepol/F-9/sources,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- sources 27 Mar 2008 17:22:50 -0000 1.135 +++ sources 11 Jul 2008 12:43:09 -0000 1.136 @@ -1 +1 @@ -fe5c46787746ceab95d4d0013246cd6b libsepol-2.0.26.tgz +945f2f972096e3c19297ee655c9f3f9c libsepol-2.0.32.tgz From fedora-extras-commits at redhat.com Fri Jul 11 12:44:18 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Fri, 11 Jul 2008 12:44:18 GMT Subject: rpms/mod_nss/F-8 mod_nss-inherit.patch, NONE, 1.1 mod_nss.spec, 1.11, 1.12 Message-ID: <200807111244.m6BCiI5j022351@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22255 Modified Files: mod_nss.spec Added Files: mod_nss-inherit.patch Log Message: - Don't inherit the MP cache in multi-threaded mode - Don't initialize NSS in each child if SSL isn't configured Resolves: #454701 mod_nss-inherit.patch: --- NEW FILE mod_nss-inherit.patch --- --- mod_nss-1.0.7-orig/nss_engine_init.c 16 May 2008 15:16:02 -0000 1.32 +++ mod_nss-1.0.7/nss_engine_init.c 9 Jul 2008 22:22:46 -0000 @@ -1079,23 +1079,54 @@ } } void nss_init_Child(apr_pool_t *p, server_rec *base_server) { SSLModConfigRec *mc = myModConfig(base_server); SSLSrvConfigRec *sc; server_rec *s; + int threaded = 0; + int sslenabled = FALSE; mc->pid = getpid(); /* only call getpid() once per-process */ - if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "SSL_InheritMPServerSIDCache failed"); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + /* + * First, see if ssl is enabled at all + */ + for (s = base_server; s; s = s->next) { + sc = mySrvConfig(s); + /* If any servers have SSL, we want sslenabled set so we + * can perform further initialization + */ + + if (sc->enabled == UNSET) { + sc->enabled = FALSE; + } + + if (sc->proxy_enabled == UNSET) { + sc->proxy_enabled = FALSE; + } + + if ((sc->enabled == TRUE) || (sc->proxy_enabled == TRUE)) { + sslenabled = TRUE; + } + } + + if (sslenabled == FALSE) { /* we are not an SSL/TLS server */ + return; + } + + ap_mpm_query(AP_MPMQ_MAX_THREADS, &threaded); + if (!threaded) { + if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "SSL_InheritMPServerSIDCache failed"); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + } } nss_init_SSLLibrary(base_server); /* Configure all virtual servers */ for (s = base_server; s; s = s->next) { sc = mySrvConfig(s); if (sc->server->servercert == NULL && NSS_IsInitialized()) Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-8/mod_nss.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_nss.spec 2 Jul 2008 14:44:53 -0000 1.11 +++ mod_nss.spec 11 Jul 2008 12:43:22 -0000 1.12 @@ -1,6 +1,6 @@ Name: mod_nss Version: 1.0.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -16,6 +16,7 @@ Patch3: mod_nss-proxy.patch Patch4: mod_nss-nofork.patch Patch5: mod_nss-fips.patch +Patch6: mod_nss-inherit.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -30,6 +31,7 @@ %patch3 -p1 -b .proxy %patch4 -p1 -b .nofork %patch5 -p1 -b .fips +%patch6 -p1 -b .inherit # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -114,6 +116,10 @@ %{_sbindir}/gencert %changelog +* Thu Jul 10 2008 Rob Crittenden - 1.0.7-7 +- Don't inherit the MP cache in multi-threaded mode (454701) +- Don't initialize NSS in each child if SSL isn't configured + * Wed Jul 2 2008 Rob Crittenden - 1.0.7-6 - Update the patch for FIPS to include fixes for nss_pcache, enforce the security policy and properly initialize the FIPS token. From fedora-extras-commits at redhat.com Fri Jul 11 13:28:10 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Fri, 11 Jul 2008 13:28:10 GMT Subject: rpms/php-pecl-zip/EL-4 php-pecl-zip.spec, 1.9, 1.10 sources, 1.9, 1.10 xml2changelog, 1.2, 1.3 dead.package, 1.1, NONE Message-ID: <200807111328.m6BDSA8H031116@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-zip/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31060 Added Files: php-pecl-zip.spec sources xml2changelog Removed Files: dead.package Log Message: first EL-4 build Index: php-pecl-zip.spec =================================================================== RCS file: php-pecl-zip.spec diff -N php-pecl-zip.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ php-pecl-zip.spec 11 Jul 2008 13:27:22 -0000 1.10 @@ -0,0 +1,160 @@ +%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined") + +Summary: A zip management extension +Summary(fr): Une extension de gestion des ZIP +Name: php-pecl-zip +Version: 1.8.10 +Release: 2%{?dist} +License: PHP +Group: Development/Languages +URL: http://pecl.php.net/package/zip + +Source: http://pecl.php.net/get/zip-%{version}.tgz +Source2: xml2changelog + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: php-pecl(zip) = %{version}-%{release}, php-zip = %{version}-%{release} +BuildRequires: php-devel, zlib-devel, autoconf, automake, libtool +%if %{?php_zend_api}0 +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +%endif +%if 0%{?rhel} == 4 +Requires: php +%else +Requires: php-api = %{php_apiver} +%endif + +%description +Zip is an extension to create and read zip files. + +%description -l fr +Zip est une extension pour cr??er et lire les archives au format ZIP. + + +%prep +%setup -c -q + +%if 0%{?rhel} > 4 +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +%endif + +# to avoid check-rpath error on EL-4 +%{__sed} -i -e 's,PHP_ADD_LIBRARY_WITH_PATH(z.*$,PHP_ADD_LIBRARY(z),' zip-%{version}/config.m4 + + +%build +cd zip-%{version} +phpize +%configure +%{__make} %{?_smp_mflags} + + +%install +cd zip-%{version} +%{__rm} -rf %{buildroot} +%{__make} install INSTALL_ROOT=%{buildroot} + +# Drop in the bit of configuration +%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d +%{__cat} > %{buildroot}%{_sysconfdir}/php.d/zip.ini << 'EOF' +; Enable ZIP extension module +extension=zip.so +EOF + + +%clean +%{__rm} -rf %{buildroot} + + +%files +%defattr(-, root, root, -) +%if 0%{?rhel} > 4 +%doc CHANGELOG +%endif +%doc zip-%{version}/CREDITS zip-%{version}/examples +%config(noreplace) %{_sysconfdir}/php.d/zip.ini +%{php_extdir}/zip.so + + +%changelog +* Wed Jul 08 2008 Remi Collet 1.8.10-2 +- EPEL only spec file +- remove License file +- EL4 build + +* Thu Jun 07 2007 Remi Collet 1.8.10-1 +- update to 1.8.10 + +* Sun Mar 25 2007 Remi Collet 1.8.8-1 +- update to 1.8.8 + +* Mon Feb 26 2007 Remi Collet 1.8.6-1 +- update to 1.8.6 + +* Sat Feb 24 2007 Remi Collet 1.8.5-1 +- update to 1.8.5 +- requires php(zend-abi) and php(api) when available + +* Sat Dec 02 2006 Remi Collet 1.8.2-1 +- update to 1.8.2 + +* Thu Nov 02 2006 Remi Collet 1.8.0-1 +- update to 1.8.0 + +* Tue Oct 24 2006 Remi Collet 1.7.5-1 +- update to 1.7.5 + +* Wed Sep 27 2006 Remi Collet 1.7.4-1 +- update to 1.7.4 + +* Sun Sep 17 2006 Remi Collet 1.7.3-1 +- update to 1.7.3 +- remove PECL from sumnary +- change to %%setup -c -q +- add generated CHANGELOG to %%doc + +* Mon Aug 28 2006 Remi Collet 1.7.2-2 +- rebuild for FE6 + +* Sun Aug 27 2006 Remi Collet 1.7.2-1 +- update to 1.7.2 + +* Sat Aug 26 2006 Remi Collet 1.7.1-2 +- use php_zip.c version 1.73 from CVS +- see http://pecl.php.net/bugs/bug.php?id=8564 + +* Fri Aug 25 2006 Remi Collet 1.7.1-1 +- update to 1.7.1 +- change macros to conform to PHP Guidelines + +* Sun Aug 20 2006 Remi Collet 1.7.0-1 +- update to 1.7.0 + +* Sun Jul 30 2006 Remi Collet 1.6.0-1 +- update to 1.6.0 (Big change : Rename Class Zip to ZipArchive) + +* Sun Jul 16 2006 Remi Collet 1.5.0-1 +- update to 1.5.0 +- Requires: php-api + +* Thu Jun 29 2006 Remi Collet 1.4.1-1 +- update to 1.4.1 +- bundle the v3.01 PHP LICENSE file +- Suppr. Requires zip, Add Provides php-pecl(zip) and php-zip +- change defattr + +* Fri Apr 28 2006 Remi Collet 1.3.1-2 +- Add zlib(devel) to Requires + +* Thu Apr 27 2006 Remi Collet 1.3.1-1 +- update to 1.3.1 + +* Wed Apr 26 2006 Remi Collet 1.2.3-1 +- initial RPM for extras +- add french summary & description +- add examples to doc. + +* Tue Apr 11 2006 Remi Collet 1.2.3-1 +- initial RPM Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 11 Jul 2008 13:27:22 -0000 1.10 @@ -0,0 +1 @@ +bc591b4bae8862998bbefcb79d9db232 zip-1.8.10.tgz Index: xml2changelog =================================================================== RCS file: xml2changelog diff -N xml2changelog --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xml2changelog 11 Jul 2008 13:27:22 -0000 1.3 @@ -0,0 +1,34 @@ += "2"){ // Package.xml V 2.0 + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + $xml->version->release, $xml->stability->release, + $xml->version->api, $xml->stability->api, + $xml->date, $xml->notes); + $new=$xml->version->release; + + if (isset($xml->changelog->release) && count($xml->changelog->release)) + foreach($xml->changelog->release as $rel) { + $old=$rel->version->release; + if ("$old" != "$new") { + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + $rel->version->release, $rel->stability->release, + $rel->version->api, $rel->stability->api, + $rel->date, $rel->notes); + } + } +} else { // Package.xml V 1.0 + printf("* Version %s (%s) - %s\n\n%s\n\n", + $xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes); + + foreach($xml->changelog->release as $rel) + printf("* Version %s (%s) - %s\n\n%s\n\n", + $rel->version, $rel->state, $rel->date, $rel->notes); +} +?> --- dead.package DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 13:29:07 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 11 Jul 2008 13:29:07 GMT Subject: rpms/checkpolicy/F-9 checkpolicy.spec, 1.129, 1.130 sources, 1.80, 1.81 Message-ID: <200807111329.m6BDT7nO031170@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/checkpolicy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31094 Modified Files: checkpolicy.spec sources Log Message: * Mon Jul 7 2008 Dan Walsh - 2.0.16-3 - Rebuild with new libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/extras/rpms/checkpolicy/F-9/checkpolicy.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- checkpolicy.spec 6 May 2008 18:27:10 -0000 1.129 +++ checkpolicy.spec 11 Jul 2008 13:27:49 -0000 1.130 @@ -1,12 +1,11 @@ -%define libsepolver 2.0.26-1 +%define libsepolver 2.0.32-1 Summary: SELinux policy compiler Name: checkpolicy -Version: 2.0.14 -Release: 2%{?dist} -License: GPL +Version: 2.0.16 +Release: 3%{?dist} +License: GPLv2 Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz -Patch: checkpolicy-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: byacc bison flex libsepol-static >= %{libsepolver} libselinux-devel @@ -27,7 +26,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean @@ -55,6 +53,21 @@ %{_bindir}/sedispol %changelog +* Mon Jul 7 2008 Dan Walsh - 2.0.16-3 +- Rebuild with new libsepol + +* Wed May 28 2008 Tom "spot" Callaway 2.0.16-2 +- fix license tag + +* Wed May 28 2008 Dan Walsh - 2.0.16-1 +- Latest update from NSA + * Update checkpolicy for user and role mapping support from Joshua Brindle. + +* Tue May 2 2008 Dan Walsh - 2.0.15-1 +- Latest update from NSA + * Fix for policy module versions that look like IPv4 addresses from Jim Carter. + Resolves bug 444451. + * Tue May 2 2008 Dan Walsh - 2.0.14-2 - Allow modules with 4 sections or more Index: sources =================================================================== RCS file: /cvs/extras/rpms/checkpolicy/F-9/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 14 Apr 2008 19:34:07 -0000 1.80 +++ sources 11 Jul 2008 13:27:49 -0000 1.81 @@ -1 +1 @@ -7001c2136fbde2df663105aa06a2f31e checkpolicy-2.0.14.tgz +b1ca0a31e01c311a82f705c8df99e412 checkpolicy-2.0.16.tgz From fedora-extras-commits at redhat.com Fri Jul 11 13:31:41 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Fri, 11 Jul 2008 13:31:41 GMT Subject: rpms/php-pecl-zip/EL-4 Makefile,1.2,1.3 Message-ID: <200807111331.m6BDVfjt031413@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-zip/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31364 Added Files: Makefile Log Message: missing file Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 11 Jul 2008 13:30:48 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: php-pecl-zip +# $Id$ +NAME := php-pecl-zip +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From fedora-extras-commits at redhat.com Fri Jul 11 13:35:07 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Fri, 11 Jul 2008 13:35:07 GMT Subject: rpms/php-pecl-zip/EL-4 php-pecl-zip.spec,1.10,1.11 Message-ID: <200807111335.m6BDZ7d6031670@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-zip/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31535 Modified Files: php-pecl-zip.spec Log Message: dump release for missing file Index: php-pecl-zip.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/EL-4/php-pecl-zip.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- php-pecl-zip.spec 11 Jul 2008 13:27:22 -0000 1.10 +++ php-pecl-zip.spec 11 Jul 2008 13:34:13 -0000 1.11 @@ -5,7 +5,7 @@ Summary(fr): Une extension de gestion des ZIP Name: php-pecl-zip Version: 1.8.10 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: PHP Group: Development/Languages URL: http://pecl.php.net/package/zip @@ -79,6 +79,9 @@ %changelog +* Fri Jul 11 2008 Remi Collet 1.8.10-2.el4.1 +- missing Makefile + * Wed Jul 08 2008 Remi Collet 1.8.10-2 - EPEL only spec file - remove License file From fedora-extras-commits at redhat.com Fri Jul 11 13:41:23 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Fri, 11 Jul 2008 13:41:23 GMT Subject: rpms/php-pecl-zip/EL-5 php-pecl-zip.spec, 1.14, 1.15 xml2changelog, 1.2, 1.3 PHP-LICENSE-3.01, 1.1, NONE Message-ID: <200807111341.m6BDfNRU032264@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-zip/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32186 Modified Files: php-pecl-zip.spec xml2changelog Removed Files: PHP-LICENSE-3.01 Log Message: EPEL spec clean Index: php-pecl-zip.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/EL-5/php-pecl-zip.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- php-pecl-zip.spec 7 Jun 2007 08:30:20 -0000 1.14 +++ php-pecl-zip.spec 11 Jul 2008 13:40:33 -0000 1.15 @@ -5,21 +5,23 @@ Summary(fr): Une extension de gestion des ZIP Name: php-pecl-zip Version: 1.8.10 -Release: 1%{?dist} -License: PHP License +Release: 2%{?dist} +License: PHP Group: Development/Languages URL: http://pecl.php.net/package/zip Source: http://pecl.php.net/get/zip-%{version}.tgz -Source1: PHP-LICENSE-3.01 Source2: xml2changelog BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: php-pecl(zip) = %{version}-%{release}, php-zip = %{version}-%{release} -BuildRequires: php-devel, zlib-devel +BuildRequires: php-devel, zlib-devel, autoconf, automake, libtool %if %{?php_zend_api}0 Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} +%endif +%if 0%{?rhel} == 4 +Requires: php %else Requires: php-api = %{php_apiver} %endif @@ -30,12 +32,17 @@ %description -l fr Zip est une extension pour cr??er et lire les archives au format ZIP. + %prep %setup -c -q +%if 0%{?rhel} > 4 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +%endif + +# to avoid check-rpath error on EL-4 +%{__sed} -i -e 's,PHP_ADD_LIBRARY_WITH_PATH(z.*$,PHP_ADD_LIBRARY(z),' zip-%{version}/config.m4 -%{__install} -m 644 -c %{SOURCE1} LICENSE %build cd zip-%{version} @@ -43,6 +50,7 @@ %configure %{__make} %{?_smp_mflags} + %install cd zip-%{version} %{__rm} -rf %{buildroot} @@ -55,16 +63,27 @@ extension=zip.so EOF + %clean %{__rm} -rf %{buildroot} + %files %defattr(-, root, root, -) -%doc LICENSE CHANGELOG zip-%{version}/CREDITS zip-%{version}/examples +%if 0%{?rhel} > 4 +%doc CHANGELOG +%endif +%doc zip-%{version}/CREDITS zip-%{version}/examples %config(noreplace) %{_sysconfdir}/php.d/zip.ini %{php_extdir}/zip.so + %changelog +* Wed Jul 08 2008 Remi Collet 1.8.10-2 +- EPEL only spec file +- remove License file +- EL4 build + * Thu Jun 07 2007 Remi Collet 1.8.10-1 - update to 1.8.10 Index: xml2changelog =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/EL-5/xml2changelog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xml2changelog 7 Jun 2007 08:30:20 -0000 1.2 +++ xml2changelog 11 Jul 2008 13:40:33 -0000 1.3 @@ -7,16 +7,22 @@ if (in_array("--debug", $_SERVER['argv'])) print_r($xml); if ($xml['version'] >= "2"){ // Package.xml V 2.0 - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $xml->version->release, $xml->stability->release, $xml->version->api, $xml->stability->api, $xml->date, $xml->notes); + $new=$xml->version->release; - if (is_array($xml->changelog->release)) foreach($xml->changelog->release as $rel) - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + if (isset($xml->changelog->release) && count($xml->changelog->release)) + foreach($xml->changelog->release as $rel) { + $old=$rel->version->release; + if ("$old" != "$new") { + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $rel->version->release, $rel->stability->release, $rel->version->api, $rel->stability->api, $rel->date, $rel->notes); + } + } } else { // Package.xml V 1.0 printf("* Version %s (%s) - %s\n\n%s\n\n", $xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes); --- PHP-LICENSE-3.01 DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 13:56:09 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 11 Jul 2008 13:56:09 GMT Subject: rpms/iwl4965-firmware/F-8 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 iwl4965-firmware.spec, 1.1, 1.2 Message-ID: <200807111356.m6BDu95M000792@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/iwl4965-firmware/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv657 Modified Files: .cvsignore sources iwl4965-firmware.spec Log Message: - Keep firmware v to 4.44.17 for older gold kernel - Update firmware v1 to 228.57.1.21 - Add firmware v2 to 228.57.2.21 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Aug 2007 23:15:39 -0000 1.2 +++ .cvsignore 11 Jul 2008 13:55:20 -0000 1.3 @@ -1,2 +1,3 @@ -iwlwifi-4965-ucode-4.44.1.18.tgz iwlwifi-4965-ucode-4.44.17.tgz +iwlwifi-4965-ucode-228.57.1.21.tgz +iwlwifi-4965-ucode-228.57.2.21.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Aug 2007 23:15:39 -0000 1.2 +++ sources 11 Jul 2008 13:55:20 -0000 1.3 @@ -1,2 +1,3 @@ -dde401d6dd0bcadff1f04828b70d7463 iwlwifi-4965-ucode-4.44.1.18.tgz 6e5e5287bc9a8021bb35e5905e891638 iwlwifi-4965-ucode-4.44.17.tgz +bce5a13d681100aeee2ddac3beaff437 iwlwifi-4965-ucode-228.57.1.21.tgz +83804fb4bfa991ffd4849c19a74bf38d iwlwifi-4965-ucode-228.57.2.21.tgz Index: iwl4965-firmware.spec =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-8/iwl4965-firmware.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iwl4965-firmware.spec 26 Aug 2007 23:15:39 -0000 1.1 +++ iwl4965-firmware.spec 11 Jul 2008 13:55:20 -0000 1.2 @@ -1,9 +1,10 @@ %define iwl4965_v 4.44.17 -%define iwl4965_v1 4.44.1.18 -%define iwl4965_list %{iwl4965_v} %{iwl4965_v1} +%define iwl4965_v1 228.57.1.21 +%define iwl4965_v2 228.57.2.21 +%define iwl4965_list %{iwl4965_v} %{iwl4965_v1} {iwl4965_v2} Name: iwl4965-firmware -Version: %{iwl4965_v1} +Version: %{iwl4965_v2} Release: 1 Summary: Firmware for Intel?? PRO/Wireless 4965 A/G/N network adaptors @@ -12,6 +13,7 @@ URL: http://intellinuxwireless.org/ Source0: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v}.tgz Source1: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v1}.tgz +Source2: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v2}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,6 +29,7 @@ %prep %setup -c -q %setup -c -q -D -T -a 1 +%setup -c -q -D -T -a 2 # Change permission find . -type f -exec chmod 0644 {} ';' @@ -68,6 +71,11 @@ %changelog +* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-1 +- Keep firmware v to 4.44.17 for older gold kernel +- Update firmware v1 to 228.57.1.21 +- Add firmware v2 to 228.57.2.21 + * Fri Aug 17 2007 kwizart < kwizart at gmail.com > - 4.44.1.18-1 - Update to 4.44.1.18 - Bundle the previous 4.44.17 firmware From fedora-extras-commits at redhat.com Fri Jul 11 14:10:30 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 11 Jul 2008 14:10:30 GMT Subject: rpms/iwl4965-firmware/F-8 iwl4965-firmware.spec,1.2,1.3 Message-ID: <200807111410.m6BEAUx4007975@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/iwl4965-firmware/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922 Modified Files: iwl4965-firmware.spec Log Message: Fix typo Index: iwl4965-firmware.spec =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-8/iwl4965-firmware.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- iwl4965-firmware.spec 11 Jul 2008 13:55:20 -0000 1.2 +++ iwl4965-firmware.spec 11 Jul 2008 14:09:40 -0000 1.3 @@ -1,7 +1,7 @@ %define iwl4965_v 4.44.17 %define iwl4965_v1 228.57.1.21 %define iwl4965_v2 228.57.2.21 -%define iwl4965_list %{iwl4965_v} %{iwl4965_v1} {iwl4965_v2} +%define iwl4965_list %{iwl4965_v} %{iwl4965_v1} %{iwl4965_v2} Name: iwl4965-firmware Version: %{iwl4965_v2} From fedora-extras-commits at redhat.com Fri Jul 11 14:22:14 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 14:22:14 GMT Subject: rpms/jetty/devel jetty.spec,1.5,1.6 Message-ID: <200807111422.m6BEMEOu009065@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jetty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8974/devel Modified Files: jetty.spec Log Message: * Fri Jul 11 2008 Andrew Overholt 5.1.14-1.3 - Update OSGi manifest Index: jetty.spec =================================================================== RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jetty.spec 9 Jul 2008 20:02:40 -0000 1.5 +++ jetty.spec 11 Jul 2008 14:21:28 -0000 1.6 @@ -54,7 +54,7 @@ Name: jetty Version: 5.1.14 -Release: 1.3%{?dist} +Release: 1.4%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet @@ -599,6 +599,9 @@ %endif %changelog +* Fri Jul 11 2008 Andrew Overholt 5.1.14-1.3 +- Update OSGi manifest + * Wed Jul 9 2008 Tom "spot" Callaway - 5.1.14-1.3 - drop repotag From fedora-extras-commits at redhat.com Fri Jul 11 14:24:17 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 14:24:17 GMT Subject: rpms/jetty .cvsignore,NONE,1.1 Message-ID: <200807111424.m6BEOH2Z009293@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jetty In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9211 Added Files: .cvsignore Log Message: * Fri Jul 11 2008 Andrew Overholt 5.1.14-1.3 - Update OSGi manifest --- NEW FILE .cvsignore --- .project From fedora-extras-commits at redhat.com Fri Jul 11 14:24:22 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 14:24:22 GMT Subject: rpms/jetty/devel jetty-OSGi-MANIFEST.MF,1.1,1.2 Message-ID: <200807111424.m6BEOMwp009317@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jetty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9211/devel Modified Files: jetty-OSGi-MANIFEST.MF Log Message: * Fri Jul 11 2008 Andrew Overholt 5.1.14-1.3 - Update OSGi manifest Index: jetty-OSGi-MANIFEST.MF =================================================================== RCS file: /cvs/pkgs/rpms/jetty/devel/jetty-OSGi-MANIFEST.MF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jetty-OSGi-MANIFEST.MF 30 Aug 2007 19:06:45 -0000 1.1 +++ jetty-OSGi-MANIFEST.MF 11 Jul 2008 14:23:39 -0000 1.2 @@ -7,14 +7,14 @@ commons.logging;version="[1.0.0,2.0.0)",org.xml.sax,org.xml.sax.helpe rs Bundle-ManifestVersion: 2 -Export-Package: org.mortbay.html;version="5.1.11",org.mortbay.http;ver - sion="5.1.11",org.mortbay.http.ajp;version="5.1.11",org.mortbay.http. - handler;version="5.1.11",org.mortbay.http.nio;version="5.1.11",org.mo - rtbay.jetty;version="5.1.11",org.mortbay.jetty.servlet;version="5.1.1 - 1",org.mortbay.jetty.win32;version="5.1.11",org.mortbay.log;version=" - 5.1.11",org.mortbay.servlet;version="5.1.11",org.mortbay.util;version - ="5.1.11",org.mortbay.xml;version="5.1.11" -Bundle-Version: 5.1.11.v200706111724 +Export-Package: org.mortbay.html;version="5.1.14",org.mortbay.http;ver + sion="5.1.14",org.mortbay.http.ajp;version="5.1.14",org.mortbay.http. + handler;version="5.1.14",org.mortbay.http.nio;version="5.1.14",org.mo + rtbay.jetty;version="5.1.14",org.mortbay.jetty.servlet;version="5.1.1 + 1",org.mortbay.jetty.win32;version="5.1.14",org.mortbay.log;version=" + 5.1.14",org.mortbay.servlet;version="5.1.14",org.mortbay.util;version + ="5.1.14",org.mortbay.xml;version="5.1.14" +Bundle-Version: 5.1.14.v200806031611 Bundle-SymbolicName: org.mortbay.jetty Bundle-Name: Jetty WebServer Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J From fedora-extras-commits at redhat.com Fri Jul 11 14:29:50 2008 From: fedora-extras-commits at redhat.com (Simo Sorce (simo)) Date: Fri, 11 Jul 2008 14:29:50 GMT Subject: rpms/samba/F-8 .cvsignore, 1.50, 1.51 samba.spec, 1.148, 1.149 sources, 1.54, 1.55 Message-ID: <200807111429.m6BETo2I009933@cvs-int.fedora.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9826 Modified Files: .cvsignore samba.spec sources Log Message: * Wed Jul 11 2008 Simo Sorce 3.0.31-0.fc8 - New upstream bugfix release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-8/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 28 May 2008 16:19:21 -0000 1.50 +++ .cvsignore 11 Jul 2008 14:29:00 -0000 1.51 @@ -1 +1 @@ -samba-3.0.30.tar.gz +samba-3.0.31.tar.gz Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-8/samba.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- samba.spec 28 May 2008 16:19:21 -0000 1.148 +++ samba.spec 11 Jul 2008 14:29:00 -0000 1.149 @@ -1,7 +1,7 @@ Summary: The Samba Suite of programs Name: samba Epoch: 0 -Version: 3.0.30 +Version: 3.0.31 Release: 0%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Daemons @@ -644,6 +644,9 @@ #%{_includedir}/libmsrpc.h %changelog +* Wed Jul 11 2008 Simo Sorce 3.0.31-0.fc8 +- New upstream bugfix release + * Wed May 28 2008 Simo Sorce 3.0.30-0.fc8 - New upstream security release to fix CVE-2008-1105 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-8/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 28 May 2008 16:19:21 -0000 1.54 +++ sources 11 Jul 2008 14:29:00 -0000 1.55 @@ -1 +1 @@ -d647ec1f34414fa8691f74536dcccfb5 samba-3.0.30.tar.gz +165abaf4522c70031d9a76fbb638ca06 samba-3.0.31.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 14:44:47 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 11 Jul 2008 14:44:47 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1573,1.1574 Message-ID: <200807111444.m6BEiljN010749@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10691 Modified Files: openoffice.org.spec Log Message: moved around for no good reason Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1573 retrieving revision 1.1574 diff -u -r1.1573 -r1.1574 --- openoffice.org.spec 11 Jul 2008 11:55:15 -0000 1.1573 +++ openoffice.org.spec 11 Jul 2008 14:44:01 -0000 1.1574 @@ -1484,7 +1484,7 @@ # unpack presenter screen extension install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt -unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt +unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt # revoke ScriptProviders and make into extensions pushd $RPM_BUILD_ROOT/%{basisinstdir}/program From fedora-extras-commits at redhat.com Fri Jul 11 14:47:14 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 11 Jul 2008 14:47:14 GMT Subject: rpms/file-roller/devel broken-icon-lookup.patch, NONE, 1.1 file-roller.spec, 1.122, 1.123 Message-ID: <200807111447.m6BElExZ010953@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10875 Modified Files: file-roller.spec Added Files: broken-icon-lookup.patch Log Message: fix broken icon lookup broken-icon-lookup.patch: --- NEW FILE broken-icon-lookup.patch --- diff -up file-roller-2.23.3/src/gtk-utils.c.broken-icon-lookup file-roller-2.23.3/src/gtk-utils.c --- file-roller-2.23.3/src/gtk-utils.c.broken-icon-lookup 2008-07-11 10:40:38.000000000 -0400 +++ file-roller-2.23.3/src/gtk-utils.c 2008-07-11 10:40:46.000000000 -0400 @@ -807,13 +807,7 @@ get_icon_pixbuf (GtkIconTheme *icon_them icon_info = gtk_icon_theme_choose_icon (icon_theme, (const char **)icon_names, size, 0); if (icon_info == NULL) { - GIcon *default_icon; - - default_icon = g_content_type_get_icon ("gnome-fs-regular"); - pixbuf = get_icon_pixbuf (icon_theme, G_THEMED_ICON (default_icon), size); - g_object_unref (default_icon); - - return pixbuf; + icon_info = gtk_icon_theme_lookup_icon (icon_theme, "folder", size, GTK_ICON_LOOKUP_USE_BUILTIN); } pixbuf = gtk_icon_info_load_icon (icon_info, &error); Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- file-roller.spec 18 Jun 2008 04:33:15 -0000 1.122 +++ file-roller.spec 11 Jul 2008 14:46:28 -0000 1.123 @@ -11,7 +11,7 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller Version: 2.23.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ @@ -41,6 +41,9 @@ Requires: GConf2 +# http://bugzilla.gnome.org/show_bug.cgi?id=542541 +Patch0: broken-icon-lookup.patch + # The context menu API changed in 2.2.0: Conflicts: nautilus < 2.2.0 @@ -50,6 +53,7 @@ %prep %setup -q +%patch0 -p1 -b .broken-icon-lookup autoreconf @@ -128,6 +132,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Fri Jul 11 2008 Matthias Clasen - 2.23.3-2 +- Fix icon lookup + * Wed Jun 18 2008 Matthias Clasen - 2.23.3-1 - Update to 2.23.3 From fedora-extras-commits at redhat.com Fri Jul 11 14:56:44 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 14:56:44 GMT Subject: rpms/jetty/devel jetty.spec,1.6,1.7 Message-ID: <200807111456.m6BEuiGm011459@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jetty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409/devel Modified Files: jetty.spec Log Message: * Fri Jul 11 2008 Andrew Overholt 5.1.14-1.5 - Bump release. Index: jetty.spec =================================================================== RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jetty.spec 11 Jul 2008 14:21:28 -0000 1.6 +++ jetty.spec 11 Jul 2008 14:55:56 -0000 1.7 @@ -54,7 +54,7 @@ Name: jetty Version: 5.1.14 -Release: 1.4%{?dist} +Release: 1.5%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet @@ -599,6 +599,9 @@ %endif %changelog +* Fri Jul 11 2008 Andrew Overholt 5.1.14-1.5 +- Bump release. + * Fri Jul 11 2008 Andrew Overholt 5.1.14-1.3 - Update OSGi manifest From fedora-extras-commits at redhat.com Fri Jul 11 14:58:11 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 11 Jul 2008 14:58:11 GMT Subject: rpms/seq24/devel seq24-buffer-overflow.patch, NONE, 1.1 seq24.spec, 1.8, 1.9 Message-ID: <200807111458.m6BEwBhK011578@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/seq24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11512 Modified Files: seq24.spec Added Files: seq24-buffer-overflow.patch Log Message: Fix buffer overflow bug. Rev -13. seq24-buffer-overflow.patch: --- NEW FILE seq24-buffer-overflow.patch --- --- src/seqdata.cpp~ 2006-05-17 21:40:15.000000000 -0700 +++ src/seqdata.cpp 2008-07-11 07:44:12.000000000 -0700 @@ -118,7 +118,7 @@ 6, 30 ); - char val[4]; + char val[5]; sprintf( val, "%3d\n", i ); char num[6]; memset( num, 0, 6); Index: seq24.spec =================================================================== RCS file: /cvs/pkgs/rpms/seq24/devel/seq24.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- seq24.spec 20 Jun 2008 14:48:40 -0000 1.8 +++ seq24.spec 11 Jul 2008 14:57:24 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Real-time midi sequencer Name: seq24 Version: 0.8.7 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.filter24.org/seq24/ @@ -11,6 +11,7 @@ Patch0: seq24-stack-smash.patch Patch1: seq24-gcc43.patch Patch2: seq24-0.8.7-sigc22-fix.patch +Patch3: seq24-buffer-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lash-devel gtkmm24-devel @@ -28,8 +29,10 @@ %patch0 -p0 -b .stack-smash~ %patch1 -p0 -b .gcc43~ %patch2 -p1 -b .sigc22 +%patch3 -p0 -b .buffer-overflow %build +echo %configure %configure make %{?_smp_mflags} @@ -69,6 +72,9 @@ %{_datadir}/icons/hicolor/64x64/apps/seq24.png %changelog +* Fri Jul 11 2008 Anthony Green 0.8.7-13 +- Add buffer overflow fix. + * Fri Jun 20 2008 Tom "spot" Callaway 0.8.7-12 - Fix license tag - Fix compile against libsigc++ 2.2 From fedora-extras-commits at redhat.com Fri Jul 11 15:02:09 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 11 Jul 2008 15:02:09 GMT Subject: rpms/seq24/F-9 seq24-buffer-overflow.patch, NONE, 1.1 seq24.spec, 1.8, 1.9 Message-ID: <200807111502.m6BF29cu018324@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/seq24/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18205 Modified Files: seq24.spec Added Files: seq24-buffer-overflow.patch Log Message: Rev 13. Fix buffer overflow. seq24-buffer-overflow.patch: --- NEW FILE seq24-buffer-overflow.patch --- --- src/seqdata.cpp~ 2006-05-17 21:40:15.000000000 -0700 +++ src/seqdata.cpp 2008-07-11 07:44:12.000000000 -0700 @@ -118,7 +118,7 @@ 6, 30 ); - char val[4]; + char val[5]; sprintf( val, "%3d\n", i ); char num[6]; memset( num, 0, 6); Index: seq24.spec =================================================================== RCS file: /cvs/pkgs/rpms/seq24/F-9/seq24.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- seq24.spec 20 Jun 2008 14:48:22 -0000 1.8 +++ seq24.spec 11 Jul 2008 15:01:20 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Real-time midi sequencer Name: seq24 Version: 0.8.7 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.filter24.org/seq24/ @@ -11,6 +11,7 @@ Patch0: seq24-stack-smash.patch Patch1: seq24-gcc43.patch Patch2: seq24-0.8.7-sigc22-fix.patch +Patch3: seq24-buffer-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lash-devel gtkmm24-devel @@ -28,8 +29,10 @@ %patch0 -p0 -b .stack-smash~ %patch1 -p0 -b .gcc43~ %patch2 -p1 -b .sigc22 +%patch3 -p0 -b .buffer-overflow %build +echo %configure %configure make %{?_smp_mflags} @@ -69,6 +72,9 @@ %{_datadir}/icons/hicolor/64x64/apps/seq24.png %changelog +* Fri Jul 11 2008 Anthony Green 0.8.7-13 +- Add buffer overflow fix. + * Fri Jun 20 2008 Tom "spot" Callaway 0.8.7-12 - Fix license tag - Fix compile against libsigc++ 2.2 From fedora-extras-commits at redhat.com Fri Jul 11 15:05:17 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 11 Jul 2008 15:05:17 GMT Subject: rpms/seq24/F-8 seq24-buffer-overflow.patch, NONE, 1.1 seq24.spec, 1.3, 1.4 Message-ID: <200807111505.m6BF5HJf018516@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/seq24/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18464 Modified Files: seq24.spec Added Files: seq24-buffer-overflow.patch Log Message: Rev 9. Fix buffer overflow. seq24-buffer-overflow.patch: --- NEW FILE seq24-buffer-overflow.patch --- --- src/seqdata.cpp~ 2006-05-17 21:40:15.000000000 -0700 +++ src/seqdata.cpp 2008-07-11 07:44:12.000000000 -0700 @@ -118,7 +118,7 @@ 6, 30 ); - char val[4]; + char val[5]; sprintf( val, "%3d\n", i ); char num[6]; memset( num, 0, 6); Index: seq24.spec =================================================================== RCS file: /cvs/pkgs/rpms/seq24/F-8/seq24.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- seq24.spec 9 Oct 2007 09:45:33 -0000 1.3 +++ seq24.spec 11 Jul 2008 15:04:28 -0000 1.4 @@ -1,14 +1,15 @@ Summary: Real-time midi sequencer Name: seq24 Version: 0.8.7 -Release: 8%{?dist} -License: GPL +Release: 9%{?dist} +License: GPLv2+ Group: Applications/Multimedia URL: http://www.filter24.org/seq24/ Source: http://filter24.org/seq24/seq24-%{version}.tar.gz Source1: seq24.png Source2: seq24.desktop Patch0: seq24-stack-smash.patch +Patch3: seq24-buffer-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lash-devel gtkmm24-devel @@ -24,6 +25,7 @@ %prep %setup -q %patch0 -p0 -b .stack-smash~ +%patch3 -p0 -b .buffer-overflow %build %configure @@ -65,6 +67,10 @@ %{_datadir}/icons/hicolor/64x64/apps/seq24.png %changelog +* Fri Jul 11 2008 Anthony Green 0.8.7-9 +- Add buffer overflow fix. +- Fix license tag + * Tue Oct 09 2007 Anthony Green 0.8.7-8 - Rebuilt for new lash again. From fedora-extras-commits at redhat.com Fri Jul 11 15:15:48 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Fri, 11 Jul 2008 15:15:48 GMT Subject: rpms/krb5/devel krb5-1.6.3-selinux-label.patch, 1.2, 1.3 krb5.spec, 1.169, 1.170 Message-ID: <200807111515.m6BFFmDf018998@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18891 Modified Files: krb5-1.6.3-selinux-label.patch krb5.spec Log Message: - rework how labeling is handled to avoid a bootstrapping problem in headers - don't forget to label the principal database lock file krb5-1.6.3-selinux-label.patch: Index: krb5-1.6.3-selinux-label.patch =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.3-selinux-label.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- krb5-1.6.3-selinux-label.patch 18 Mar 2008 15:49:52 -0000 1.2 +++ krb5-1.6.3-selinux-label.patch 11 Jul 2008 15:14:57 -0000 1.3 @@ -179,24 +179,11 @@ diff -ur krb5-1.6.3/src/include/k5-int.h krb5-1.6.3/src/include/k5-int.h --- krb5-1.6.3/src/include/k5-int.h 2007-10-04 16:17:48.000000000 -0400 +++ krb5-1.6.3/src/include/k5-int.h 2008-03-06 18:51:29.000000000 -0500 -@@ -128,6 +128,20 @@ +@@ -128,6 +128,7 @@ typedef UINT64_TYPE krb5_ui_8; typedef INT64_TYPE krb5_int64; -+#include "k5-platform.h" -+ -+#ifdef THREEPARAMOPEN -+#undef THREEPARAMOPEN -+#endif -+ -+#ifdef USE_SELINUX +#include "k5-label.h" -+#define THREEPARAMOPEN(x,y,z) krb5int_labeled_open(x,y,z) -+#define WRITABLEFOPEN(x,y) krb5int_labeled_fopen(x,y) -+#else -+#define WRITABLEFOPEN(x,y) fopen(x,y) -+#define THREEPARAMOPEN(x,y,z) open(x,y,z) -+#endif #define DEFAULT_PWD_STRING1 "Enter password" #define DEFAULT_PWD_STRING2 "Re-enter password for verification" @@ -388,7 +375,7 @@ #include #include -+#include ++#include "k5-int.h" #include "db-int.h" #include "btree.h" @@ -408,7 +395,7 @@ #include #endif -+#include ++#include "k5-int.h" #include "db-int.h" #include "hash.h" #include "page.h" @@ -428,7 +415,7 @@ #include #include -+#include ++#include "k5-int.h" #include "db-int.h" #include "recno.h" @@ -441,6 +428,19 @@ return (NULL); /* Create a btree in memory (backed by disk). */ +--- krb5-1.6.3/src/plugins/kdb/db2/kdb_db2.c 2008-07-11 11:10:41.000000000 -0400 ++++ krb5-1.6.3/src/plugins/kdb/db2/kdb_db2.c 2008-07-11 11:10:45.000000000 -0400 +@@ -326,8 +326,8 @@ + * should be opened read/write so that write locking can work with + * POSIX systems + */ +- if ((db_ctx->db_lf_file = open(filename, O_RDWR, 0666)) < 0) { +- if ((db_ctx->db_lf_file = open(filename, O_RDONLY, 0666)) < 0) { ++ if ((db_ctx->db_lf_file = THREEPARAMOPEN(filename, O_RDWR, 0666)) < 0) { ++ if ((db_ctx->db_lf_file = THREEPARAMOPEN(filename, O_RDONLY, 0666)) < 0) { + retval = errno; + goto err_out; + } diff -ur krb5-1.6.3/src/util/profile/prof_file.c krb5-1.6.3/src/util/profile/prof_file.c --- krb5-1.6.3/src/util/profile/prof_file.c 2005-10-21 16:03:44.000000000 -0400 +++ krb5-1.6.3/src/util/profile/prof_file.c 2008-03-06 19:02:44.000000000 -0500 @@ -448,7 +448,7 @@ #endif #include "k5-platform.h" -+#include "k5-int.h" ++#include "k5-label.h" struct global_shared_profile_data { /* This is the head of the global list of shared trees */ @@ -540,7 +540,7 @@ com_err(me, errno, "Error creating file %s", tmp_file); --- krb5-1.6.3/src/util/support/selinux.c 2007-08-25 03:19:00.000000000 -0400 +++ krb5-1.6.3/src/util/support/selinux.c 2007-08-24 23:38:39.000000000 -0400 -@@ -0,0 +1,256 @@ +@@ -0,0 +1,275 @@ +/* + * Copyright 2007,2008 Red Hat, Inc. All Rights Reserved. + * @@ -579,6 +579,7 @@ +#ifdef USE_SELINUX + +#include ++#include +#include +#include +#include @@ -594,7 +595,16 @@ + +/* #define DEBUG 1 */ + -+static pthread_mutex_t labeled_lock = PTHREAD_MUTEX_INITIALIZER; ++/* Mutex used to serialize use of the process-global file creation context. */ ++k5_mutex_t labeled_mutex = K5_MUTEX_PARTIAL_INITIALIZER; ++ ++/* Make sure we finish initializing that mutex before attempting to use it. */ ++k5_once_t labeled_once = K5_ONCE_INIT; ++static void ++label_mutex_init(void) ++{ ++ k5_mutex_finish_init(&labeled_mutex); ++} + +static security_context_t +push_fscreatecon(const char *pathname, mode_t mode) @@ -703,12 +713,17 @@ + int errno_save; + security_context_t ctx; + -+ pthread_mutex_lock(&labeled_lock); ++ if (strcmp(mode, "r") == 0) { ++ return fopen(path, mode); ++ } ++ ++ k5_once(&labeled_once, label_mutex_init); ++ k5_mutex_lock(&labeled_mutex); + ctx = push_fscreatecon(path, 0); + fp = fopen(path, mode); + errno_save = errno; + pop_fscreatecon(ctx); -+ pthread_mutex_unlock(&labeled_lock); ++ k5_mutex_unlock(&labeled_mutex); + + errno = errno_save; + return fp; @@ -721,12 +736,13 @@ + int errno_save; + security_context_t ctx; + -+ pthread_mutex_lock(&labeled_lock); ++ k5_once(&labeled_once, label_mutex_init); ++ k5_mutex_lock(&labeled_mutex); + ctx = push_fscreatecon(path, 0); + fd = creat(path, mode); + errno_save = errno; + pop_fscreatecon(ctx); -+ pthread_mutex_unlock(&labeled_lock); ++ k5_mutex_unlock(&labeled_mutex); + + errno = errno_save; + return fd; @@ -739,12 +755,13 @@ + int errno_save; + security_context_t ctx; + -+ pthread_mutex_lock(&labeled_lock); ++ k5_once(&labeled_once, label_mutex_init); ++ k5_mutex_lock(&labeled_mutex); + ctx = push_fscreatecon(path, mode); + ret = mknod(path, mode, dev); + errno_save = errno; + pop_fscreatecon(ctx); -+ pthread_mutex_unlock(&labeled_lock); ++ k5_mutex_unlock(&labeled_mutex); + + errno = errno_save; + return ret; @@ -757,12 +774,13 @@ + int errno_save; + security_context_t ctx; + -+ pthread_mutex_lock(&labeled_lock); ++ k5_once(&labeled_once, label_mutex_init); ++ k5_mutex_lock(&labeled_mutex); + ctx = push_fscreatecon(path, S_IFDIR); + ret = mkdir(path, mode); + errno_save = errno; + pop_fscreatecon(ctx); -+ pthread_mutex_unlock(&labeled_lock); ++ k5_mutex_unlock(&labeled_mutex); + + errno = errno_save; + return ret; @@ -781,7 +799,8 @@ + return open(path, flags); + } + -+ pthread_mutex_lock(&labeled_lock); ++ k5_once(&labeled_once, label_mutex_init); ++ k5_mutex_lock(&labeled_mutex); + ctx = push_fscreatecon(path, 0); + + va_start(ap, flags); @@ -792,16 +811,21 @@ + errno_save = errno; + + pop_fscreatecon(ctx); -+ pthread_mutex_unlock(&labeled_lock); ++ k5_mutex_unlock(&labeled_mutex); + return fd; +} + +#endif --- krb5-1.6.3/src/include/k5-label.h 2007-08-25 03:19:00.000000000 -0400 +++ krb5-1.6.3/src/include/k5-label.h 2007-08-25 03:00:02.000000000 -0400 -@@ -0,0 +1,17 @@ +@@ -0,0 +1,27 @@ +#ifndef _KRB5_LABEL_H +#define _KRB5_LABEL_H ++ ++#ifdef THREEPARAMOPEN ++#undef THREEPARAMOPEN ++#endif ++ +/* Wrapper functions which help us create files and directories with the right + * context labels. */ +#ifdef USE_SELINUX @@ -815,5 +839,10 @@ +int krb5int_labeled_open(const char *path, int flags, ...); +int krb5int_labeled_mkdir(const char *path, mode_t mode); +int krb5int_labeled_mknod(const char *path, mode_t mode, dev_t device); ++#define THREEPARAMOPEN(x,y,z) krb5int_labeled_open(x,y,z) ++#define WRITABLEFOPEN(x,y) krb5int_labeled_fopen(x,y) ++#else ++#define WRITABLEFOPEN(x,y) fopen(x,y) ++#define THREEPARAMOPEN(x,y,z) open(x,y,z) +#endif +#endif Index: krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- krb5.spec 14 Jun 2008 18:22:01 -0000 1.169 +++ krb5.spec 11 Jul 2008 15:14:57 -0000 1.170 @@ -1466,10 +1466,6 @@ --with-pam \ --with-pam-login-service=%{login_pam_service} \ --with-selinux -# Generate krb5/krb5.h -pushd include -make krb5/krb5.h -popd # Now build it. make From fedora-extras-commits at redhat.com Fri Jul 11 15:17:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 15:17:17 +0000 Subject: [pkgdb] jakarta-commons-el: overholt has requested commit Message-ID: <200807111517.m6BFHIdu004646@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on jakarta-commons-el (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-el From fedora-extras-commits at redhat.com Fri Jul 11 15:17:42 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Fri, 11 Jul 2008 15:17:42 GMT Subject: rpms/krb5/devel krb5.spec,1.170,1.171 Message-ID: <200807111517.m6BFHgb4019105@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19069 Modified Files: krb5.spec Log Message: - build with -fno-strict-aliasing, which is needed because the library triggers these warnings Index: krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- krb5.spec 11 Jul 2008 15:14:57 -0000 1.170 +++ krb5.spec 11 Jul 2008 15:16:54 -0000 1.171 @@ -16,7 +16,7 @@ Summary: The Kerberos network authentication system. Name: krb5 Version: 1.6.3 -Release: 14%{?dist} +Release: 15%{?dist} # Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar Source0: krb5-%{version}.tar.gz @@ -232,6 +232,12 @@ certificate. %changelog +* Fri Jul 11 2008 Nalin Dahyabhai 1.6.3-15 +- build with -fno-strict-aliasing, which is needed because the library + triggers these warnings +- don't forget to label principal database lock files +- fix the labeling patch so that it doesn't break bootstrapping + * Sat Jun 14 2008 Tom "spot" Callaway 1.6.3-14 - generate src/include/krb5/krb5.h before building - fix conditional for sparcv9 @@ -1434,7 +1440,7 @@ k5_cv_openssl_version_okay=no ; export k5_cv_openssl_version_okay %endif # Work out the CFLAGS and CPPFLAGS which we intend to use. -CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC`" +CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC -fno-strict-aliasing`" CPPFLAGS="`echo $DEFINES $INCLUDES`" %configure \ CC=%{__cc} \ From fedora-extras-commits at redhat.com Fri Jul 11 15:19:12 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:19:12 GMT Subject: rpms/kdeaccessibility/devel .cvsignore, 1.27, 1.28 kdeaccessibility.spec, 1.53, 1.54 sources, 1.28, 1.29 Message-ID: <200807111519.m6BFJCkl019266@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeaccessibility/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19133 Modified Files: .cvsignore kdeaccessibility.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 7 Jul 2008 12:56:04 -0000 1.27 +++ .cvsignore 11 Jul 2008 15:18:14 -0000 1.28 @@ -1 +1 @@ -kdeaccessibility-4.0.85.tar.bz2 +kdeaccessibility-4.0.98.tar.bz2 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- kdeaccessibility.spec 7 Jul 2008 12:56:04 -0000 1.53 +++ kdeaccessibility.spec 11 Jul 2008 15:18:14 -0000 1.54 @@ -2,7 +2,7 @@ Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Group: User Interface/Desktops @@ -97,6 +97,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 7 Jul 2008 12:56:04 -0000 1.28 +++ sources 11 Jul 2008 15:18:14 -0000 1.29 @@ -1 +1 @@ -551853fc3ad2d2be11c82984a3428fde kdeaccessibility-4.0.85.tar.bz2 +853044d27a1645ae1f995c2ced7eb237 kdeaccessibility-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:19:36 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 11 Jul 2008 15:19:36 GMT Subject: rpms/iwl4965-firmware/F-9 sources, 1.3, 1.4 iwl4965-firmware.spec, 1.3, 1.4 Message-ID: <200807111519.m6BFJawG019346@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/iwl4965-firmware/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19186 Modified Files: sources iwl4965-firmware.spec Log Message: Sync F-8 and F-9 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Dec 2007 12:23:44 -0000 1.3 +++ sources 11 Jul 2008 15:18:47 -0000 1.4 @@ -1,2 +1,3 @@ 6e5e5287bc9a8021bb35e5905e891638 iwlwifi-4965-ucode-4.44.17.tgz -6e5c396da265d79d5675fd345adf24cc iwlwifi-4965-ucode-4.44.1.20.tgz +bce5a13d681100aeee2ddac3beaff437 iwlwifi-4965-ucode-228.57.1.21.tgz +83804fb4bfa991ffd4849c19a74bf38d iwlwifi-4965-ucode-228.57.2.21.tgz Index: iwl4965-firmware.spec =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/F-9/iwl4965-firmware.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- iwl4965-firmware.spec 8 Apr 2008 21:43:22 -0000 1.3 +++ iwl4965-firmware.spec 11 Jul 2008 15:18:47 -0000 1.4 @@ -1,17 +1,24 @@ +%define iwl4965_v 4.44.17 +%define iwl4965_v1 228.57.1.21 +%define iwl4965_v2 228.57.2.21 +%define iwl4965_list %{iwl4965_v} %{iwl4965_v1} %{iwl4965_v2} + Name: iwl4965-firmware -Version: 4.44.1.20 -Release: 2 +Version: %{iwl4965_v2} +Release: 1 Summary: Firmware for Intel?? PRO/Wireless 4965 A/G/N network adaptors Group: System Environment/Kernel License: Redistributable, no modification permitted URL: http://intellinuxwireless.org/ -Source0: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{version}.tgz +Source0: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v}.tgz +Source1: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v1}.tgz +Source2: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v2}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Obsoletes: iwlwifi-4965-ucode -Provides: iwlwifi-4965-ucode = %{version} +ExcludeArch: ppc ppc64 + %description This package contains the firmware required by the iwl4965 driver for Linux. @@ -21,19 +28,20 @@ %prep %setup -c -q +%setup -c -q -D -T -a 1 +%setup -c -q -D -T -a 2 # Change permission find . -type f -exec chmod 0644 {} ';' pushd iwlwifi-4965-ucode-%{version} -# Rename docs -cp LICENSE.iwlwifi-4965-ucode ../LICENSE -cp README.iwlwifi-4965-ucode ../README # Change encoding -sed -i 's/\r//' ../LICENSE ../README +sed -i 's/\r//' LICENSE.iwlwifi-4965-ucode README.iwlwifi-4965-ucode +# Rename docs +mv LICENSE.iwlwifi-4965-ucode ../LICENSE +mv README.iwlwifi-4965-ucode ../README # Preserve timestamp -touch -r LICENSE.iwlwifi-4965-ucode ../LICENSE -touch -r README.iwlwifi-4965-ucode ../README +touch -r *.ucode ../LICENSE ../README popd @@ -44,9 +52,11 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/lib/firmware -pushd iwlwifi-4965-ucode-%{version} +for f in %{iwl4965_list} ; do +pushd iwlwifi-4965-ucode-$f install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/ popd +done @@ -61,8 +71,10 @@ %changelog -* Tue Apr 8 2008 kwizart < kwizart at gmail.com > - 4.44.1.20-2 -- Drop the old 4.44.17 firmware +* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-1 +- Keep firmware v to 4.44.17 for older gold kernel +- Update firmware v1 to 228.57.1.21 +- Add firmware v2 to 228.57.2.21 * Tue Dec 18 2007 kwizart < kwizart at gmail.com > - 4.44.1.20-1 - Update v1 to 4.44.1.20 From fedora-extras-commits at redhat.com Fri Jul 11 15:20:03 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:20:03 GMT Subject: rpms/kdeadmin/devel .cvsignore, 1.48, 1.49 kdeadmin.spec, 1.98, 1.99 sources, 1.50, 1.51 Message-ID: <200807111520.m6BFK3UF019402@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19259 Modified Files: .cvsignore kdeadmin.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 7 Jul 2008 12:57:16 -0000 1.48 +++ .cvsignore 11 Jul 2008 15:19:12 -0000 1.49 @@ -1 +1 @@ -kdeadmin-4.0.85.tar.bz2 +kdeadmin-4.0.98.tar.bz2 Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- kdeadmin.spec 7 Jul 2008 12:57:16 -0000 1.98 +++ kdeadmin.spec 11 Jul 2008 15:19:12 -0000 1.99 @@ -1,7 +1,7 @@ Name: kdeadmin Epoch: 7 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Summary: K Desktop Environment - Administrative tools @@ -137,6 +137,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 7 Jul 2008 12:57:16 -0000 1.50 +++ sources 11 Jul 2008 15:19:12 -0000 1.51 @@ -1 +1 @@ -7fc76e3ee3ecd18c7fe65c510ef5dc1e kdeadmin-4.0.85.tar.bz2 +458230ce937bdf9723809f63bb66767c kdeadmin-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:20:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 15:20:12 +0000 Subject: [pkgdb] jakarta-commons-logging: overholt has requested commit Message-ID: <200807111520.m6BFKCZZ004826@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on jakarta-commons-logging (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging From fedora-extras-commits at redhat.com Fri Jul 11 15:20:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 15:20:34 +0000 Subject: [pkgdb] jsch: overholt has requested commit Message-ID: <200807111520.m6BFKYDl004863@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on jsch (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jsch From fedora-extras-commits at redhat.com Fri Jul 11 15:20:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 15:20:51 +0000 Subject: [pkgdb] lucene: overholt has requested commit Message-ID: <200807111520.m6BFKYDo004863@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on lucene (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lucene From fedora-extras-commits at redhat.com Fri Jul 11 15:23:17 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:23:17 GMT Subject: rpms/kdeartwork/devel .cvsignore, 1.45, 1.46 kdeartwork.spec, 1.84, 1.85 sources, 1.47, 1.48 Message-ID: <200807111523.m6BFNHcx019710@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeartwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19652 Modified Files: .cvsignore kdeartwork.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 9 Jul 2008 13:07:50 -0000 1.45 +++ .cvsignore 11 Jul 2008 15:22:31 -0000 1.46 @@ -1 +1 @@ -kdeartwork-4.0.85.tar.bz2 +kdeartwork-4.0.98.tar.bz2 Index: kdeartwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- kdeartwork.spec 9 Jul 2008 13:07:50 -0000 1.84 +++ kdeartwork.spec 11 Jul 2008 15:22:31 -0000 1.85 @@ -1,6 +1,6 @@ Name: kdeartwork -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Summary: Additional artwork (themes, sound themes, ...) for KDE @@ -197,6 +197,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 9 Jul 2008 13:07:50 -0000 1.47 +++ sources 11 Jul 2008 15:22:31 -0000 1.48 @@ -1 +1 @@ -bbe1bb2c0de907f8b1f65da7abc5a8f9 kdeartwork-4.0.85.tar.bz2 +7a86d32c99eb0360fea32154b30a9254 kdeartwork-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:24:46 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:24:46 GMT Subject: rpms/kdegames/devel .cvsignore, 1.53, 1.54 kdegames.spec, 1.95, 1.96 sources, 1.56, 1.57 Message-ID: <200807111524.m6BFOk90019923@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19827 Modified Files: .cvsignore kdegames.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 7 Jul 2008 13:00:44 -0000 1.53 +++ .cvsignore 11 Jul 2008 15:23:52 -0000 1.54 @@ -1 +1 @@ -kdegames-4.0.85.tar.bz2 +kdegames-4.0.98.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- kdegames.spec 7 Jul 2008 13:00:44 -0000 1.95 +++ kdegames.spec 11 Jul 2008 15:23:52 -0000 1.96 @@ -3,7 +3,7 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} License: GPLv2 @@ -186,6 +186,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 7 Jul 2008 13:00:44 -0000 1.56 +++ sources 11 Jul 2008 15:23:52 -0000 1.57 @@ -1 +1 @@ -0b5240b96ae2d9fb1e8553fd5309a2fa kdegames-4.0.85.tar.bz2 +cdaa3925bef6ca32ff34866d772de1d5 kdegames-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:25:18 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:25:18 GMT Subject: rpms/kdegraphics/devel .cvsignore, 1.46, 1.47 kdegraphics.spec, 1.153, 1.154 sources, 1.49, 1.50 Message-ID: <200807111525.m6BFPHse020091@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19892 Modified Files: .cvsignore kdegraphics.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 7 Jul 2008 13:01:47 -0000 1.46 +++ .cvsignore 11 Jul 2008 15:24:21 -0000 1.47 @@ -1 +1 @@ -kdegraphics-4.0.85.tar.bz2 +kdegraphics-4.0.98.tar.bz2 Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- kdegraphics.spec 7 Jul 2008 13:01:47 -0000 1.153 +++ kdegraphics.spec 11 Jul 2008 15:24:21 -0000 1.154 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Name: kdegraphics @@ -167,6 +167,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 7 Jul 2008 13:01:47 -0000 1.49 +++ sources 11 Jul 2008 15:24:21 -0000 1.50 @@ -1 +1 @@ -f110b721801d8be1a77aae9770a0863d kdegraphics-4.0.85.tar.bz2 +2788ec617b07b2babd05ac601cf584d2 kdegraphics-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:25:21 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:25:21 GMT Subject: rpms/kdeedu/devel .cvsignore, 1.48, 1.49 kdeedu.spec, 1.124, 1.125 sources, 1.52, 1.53 Message-ID: <200807111525.m6BFPL69020112@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19915 Modified Files: .cvsignore kdeedu.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 7 Jul 2008 12:59:41 -0000 1.48 +++ .cvsignore 11 Jul 2008 15:24:32 -0000 1.49 @@ -1 +1 @@ -kdeedu-4.0.85.tar.bz2 +kdeedu-4.0.98.tar.bz2 Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- kdeedu.spec 9 Jul 2008 17:54:01 -0000 1.124 +++ kdeedu.spec 11 Jul 2008 15:24:32 -0000 1.125 @@ -13,7 +13,7 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} License: GPLv2 @@ -400,6 +400,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Mon Jul 07 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 7 Jul 2008 12:59:41 -0000 1.52 +++ sources 11 Jul 2008 15:24:32 -0000 1.53 @@ -1 +1 @@ -b8c576a0cbdc983be524b89966314a94 kdeedu-4.0.85.tar.bz2 +43de6b77aed869ea54441d7395668926 kdeedu-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:26:05 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:26:05 GMT Subject: rpms/kdemultimedia/devel .cvsignore, 1.50, 1.51 kdemultimedia.spec, 1.115, 1.116 sources, 1.52, 1.53 Message-ID: <200807111526.m6BFQ5cF020287@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdemultimedia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20040 Modified Files: .cvsignore kdemultimedia.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 7 Jul 2008 13:03:43 -0000 1.50 +++ .cvsignore 11 Jul 2008 15:25:15 -0000 1.51 @@ -1 +1 @@ -kdemultimedia-4.0.85.tar.bz2 +kdemultimedia-4.0.98.tar.bz2 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- kdemultimedia.spec 7 Jul 2008 13:03:43 -0000 1.115 +++ kdemultimedia.spec 11 Jul 2008 15:25:15 -0000 1.116 @@ -1,7 +1,7 @@ Name: kdemultimedia Epoch: 6 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications @@ -148,6 +148,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 7 Jul 2008 13:03:43 -0000 1.52 +++ sources 11 Jul 2008 15:25:15 -0000 1.53 @@ -1 +1 @@ -5d191f9155f903a6676ba4e503120145 kdemultimedia-4.0.85.tar.bz2 +bf0be13f4c02c23c06af182325d5caf0 kdemultimedia-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:27:33 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:27:33 GMT Subject: rpms/kdenetwork/devel .cvsignore, 1.53, 1.54 kdenetwork.spec, 1.149, 1.150 sources, 1.59, 1.60 Message-ID: <200807111527.m6BFRXWe020555@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdenetwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20422 Modified Files: .cvsignore kdenetwork.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 7 Jul 2008 13:04:39 -0000 1.53 +++ .cvsignore 11 Jul 2008 15:26:46 -0000 1.54 @@ -1 +1 @@ -kdenetwork-4.0.85.tar.bz2 +kdenetwork-4.0.98.tar.bz2 Index: kdenetwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- kdenetwork.spec 7 Jul 2008 13:04:39 -0000 1.149 +++ kdenetwork.spec 11 Jul 2008 15:26:46 -0000 1.150 @@ -5,7 +5,7 @@ Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} License: GPLv2 @@ -165,6 +165,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 7 Jul 2008 13:04:39 -0000 1.59 +++ sources 11 Jul 2008 15:26:46 -0000 1.60 @@ -1 +1 @@ -cab4977091a6f403fed00e04b1174908 kdenetwork-4.0.85.tar.bz2 +5e0bdd2209fb9f569e8f6c713481b277 kdenetwork-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:28:52 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:28:52 GMT Subject: rpms/kdeplasmoids/devel .cvsignore, 1.4, 1.5 kdeplasmoids.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807111528.m6BFSqJR020737@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasmoids/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20654 Modified Files: .cvsignore kdeplasmoids.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Jul 2008 13:05:44 -0000 1.4 +++ .cvsignore 11 Jul 2008 15:28:00 -0000 1.5 @@ -1 +1 @@ -kdeplasmoids-4.0.85.tar.bz2 +kdeplasma-addons-4.0.98.tar.bz2 Index: kdeplasmoids.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/kdeplasmoids.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdeplasmoids.spec 10 Jul 2008 12:01:45 -0000 1.5 +++ kdeplasmoids.spec 11 Jul 2008 15:28:00 -0000 1.6 @@ -7,7 +7,7 @@ Group: User Interface/Desktops License: GPLv2 URL: http://www.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeplasmoids-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +39,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n kdeplasma-addons-%{version} # disable broken bluemarble applet (crashes Plasma when no OpenGL, #435656) #sed -i -e 's/add_subdirectory(bluemarble)/#add_subdirectory(bluemarble)/g' applets/CMakeLists.txt @@ -99,6 +99,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Thu Jul 10 2008 Rex Dieter 4.0.85-2 - Provides: kdeplasma-addons Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Jul 2008 13:05:44 -0000 1.4 +++ sources 11 Jul 2008 15:28:00 -0000 1.5 @@ -1 +1 @@ -55a830e92d0acb2bfbedf6895b743978 kdeplasmoids-4.0.85.tar.bz2 +26f22c591af158c4f4d716f0be904089 kdeplasma-addons-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:29:43 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:29:43 GMT Subject: rpms/kdesdk/devel .cvsignore, 1.45, 1.46 kdesdk.spec, 1.107, 1.108 sources, 1.47, 1.48 Message-ID: <200807111529.m6BFTh3Z020895@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20741 Modified Files: .cvsignore kdesdk.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 7 Jul 2008 13:06:38 -0000 1.45 +++ .cvsignore 11 Jul 2008 15:28:53 -0000 1.46 @@ -1 +1 @@ -kdesdk-4.0.85.tar.bz2 +kdesdk-4.0.98.tar.bz2 Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- kdesdk.spec 7 Jul 2008 13:06:38 -0000 1.107 +++ kdesdk.spec 11 Jul 2008 15:28:53 -0000 1.108 @@ -1,6 +1,6 @@ Name: kdesdk -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) @@ -204,6 +204,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 7 Jul 2008 13:06:38 -0000 1.47 +++ sources 11 Jul 2008 15:28:53 -0000 1.48 @@ -1 +1 @@ -5a1ed775661b76b58503e44c3f85c824 kdesdk-4.0.85.tar.bz2 +61d8b51f1102c40f5a4ad9008b7c898c kdesdk-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:30:55 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:30:55 GMT Subject: rpms/kdetoys/devel .cvsignore, 1.22, 1.23 kdetoys.spec, 1.29, 1.30 sources, 1.20, 1.21 Message-ID: <200807111530.m6BFUtZW021133@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20880 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 7 Jul 2008 13:06:58 -0000 1.22 +++ .cvsignore 11 Jul 2008 15:29:36 -0000 1.23 @@ -1 +1 @@ -kdetoys-4.0.85.tar.bz2 +kdetoys-4.0.98.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- kdetoys.spec 7 Jul 2008 13:06:58 -0000 1.29 +++ kdetoys.spec 11 Jul 2008 15:29:36 -0000 1.30 @@ -2,7 +2,7 @@ Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} License: GPLv2 @@ -96,6 +96,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 7 Jul 2008 13:06:58 -0000 1.20 +++ sources 11 Jul 2008 15:29:36 -0000 1.21 @@ -1 +1 @@ -b06639b1966bf2e0893303f8b87dc47d kdetoys-4.0.85.tar.bz2 +b01dfffe32605a33cb014b3ee9ede401 kdetoys-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:31:21 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 15:31:21 GMT Subject: rpms/kdeutils/devel .cvsignore, 1.48, 1.49 kdeutils.spec, 1.133, 1.134 sources, 1.51, 1.52 Message-ID: <200807111531.m6BFVL6K021240@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21062 Modified Files: .cvsignore kdeutils.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 7 Jul 2008 13:11:17 -0000 1.48 +++ .cvsignore 11 Jul 2008 15:30:29 -0000 1.49 @@ -1 +1 @@ -kdeutils-4.0.85.tar.bz2 +kdeutils-4.0.98.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- kdeutils.spec 7 Jul 2008 13:11:17 -0000 1.133 +++ kdeutils.spec 11 Jul 2008 15:30:29 -0000 1.134 @@ -4,7 +4,7 @@ Name: kdeutils Epoch: 6 -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Summary: K Desktop Environment - Utilities @@ -184,6 +184,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Thu Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 7 Jul 2008 13:11:17 -0000 1.51 +++ sources 11 Jul 2008 15:30:29 -0000 1.52 @@ -1 +1 @@ -db49bad98e41281debe9cc935fb85f84 kdeutils-4.0.85.tar.bz2 +e6536b7b8e52953ebe80ae5dd6e32abb kdeutils-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 15:31:59 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 15:31:59 GMT Subject: rpms/icu4j/devel icu4j-osgiconfigdir.patch, NONE, 1.1 icu4j-individualsourcebundle.patch, NONE, 1.1 icu4j.spec, 1.10, 1.11 icu4j-crosslink.patch, 1.1, 1.2 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 icu4j-updatetimestamp.patch, 1.2, 1.3 Message-ID: <200807111531.m6BFVxLh021374@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/icu4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21219/devel Modified Files: icu4j.spec icu4j-crosslink.patch sources .cvsignore icu4j-updatetimestamp.patch Added Files: icu4j-osgiconfigdir.patch icu4j-individualsourcebundle.patch Log Message: * Fri Jul 11 2008 Andrew Overholt 0:3.8.1-1 - 3.8.1 icu4j-osgiconfigdir.patch: --- NEW FILE icu4j-osgiconfigdir.patch --- --- build.xml.orig 2008-07-02 13:58:41.000000000 -0400 +++ build.xml 2008-07-02 14:03:57.000000000 -0400 @@ -1621,6 +1621,8 @@ + icu4j-individualsourcebundle.patch: --- NEW FILE icu4j-individualsourcebundle.patch --- --- src/com/ibm/icu/dev/eclipse/features/com.ibm.icu/feature.xml 2007-12-10 21:56:10.000000000 -0500 +++ src/com/ibm/icu/dev/eclipse/features/com.ibm.icu/feature.xml 2008-07-08 10:45:08.000000000 -0400 @@ -27,6 +27,7 @@ id="com.ibm.icu.source" download-size="0" install-size="0" - version="@BUILD_VERSION@"/> + version="@BUILD_VERSION@" + unpack="false"/> Index: icu4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- icu4j.spec 9 Jul 2008 18:40:08 -0000 1.10 +++ icu4j.spec 11 Jul 2008 15:31:12 -0000 1.11 @@ -44,22 +44,33 @@ %define eclipse_name eclipse %define eclipse_base %{_datadir}/%{eclipse_name} -%define eclipse_lib_base %{_libdir}/%{eclipse_name} +# All arches line up between Eclipse and Linux kernel names except i386 -> x86 +%ifarch %{ix86} +%define eclipse_arch x86 +%else +%define eclipse_arch %{_arch} +%endif Name: icu4j -Version: 3.6.1 -Release: 3%{?dist} +Version: 3.8.1 +Release: 1%{?dist} Epoch: 0 Summary: International Components for Unicode for Java License: MIT and EPL URL: http://www-306.ibm.com/software/globalization/icu/index.jsp Group: Development/Libraries/Java -Source0: http://download.icu-project.org/files/icu4j/3.6.1/icu4jsrc_3_6_1.jar +Source0: http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1-src.jar Patch0: %{name}-crosslink.patch -Patch1: %{name}-disable-javadocs.patch -# Take from tag release-3-6-1-eclipse331-20070906 -# Patch made using Eclipse won't apply due to Windows line ending issue. +# Set the OSGi shared configuration dir for our split (libdir and +# datadir) Eclipse packages. Will go away once 3.4 is in. +Patch1: %{name}-osgiconfigdir.patch +# Update the MANIFEST.MF to have the same qualifier in the bundle as is +# in Eclipse's Orbit project Patch2: %{name}-updatetimestamp.patch +# Bundle the source instead of having it be an exploded directory. This +# doesn't work with a 3.3 Eclipse SDK but will with a 3.4 so we'll have +# to rebuild once we get 3.4 in. +Patch3: %{name}-individualsourcebundle.patch BuildRequires: ant BuildRequires: java-javadoc BuildRequires: jpackage-utils >= 0:1.5 @@ -115,7 +126,8 @@ %setup -q -c %patch0 -p0 %patch1 -p0 -%patch2 -p1 +%patch2 -p0 +%patch3 -p0 %{__sed} -i 's/\r//' license.html %{__sed} -i 's/\r//' APIChangeReport.html @@ -123,41 +135,16 @@ sed --in-place "s/ .*bootclasspath=.*//g" build.xml sed --in-place "s///" build.xml +sed --in-place "/javac1.3/d" build.xml +sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml %build %if %{without_eclipse} %ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs %else -%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs eclipseProjects -%endif - -%if %{with_eclipse} -# eclipse build -export JAVA_HOME=%{java_home} -export PATH=%{java_bin}:/usr/bin:$PATH - -# See comments in the script to understand this. -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} -SDK=$(cd SDK >/dev/null && pwd) - -# Eclipse may try to write to the home directory. -%__mkdir_p home - -homedir=$(cd home > /dev/null && pwd) - -pushd eclipseProjects -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -Dtype=feature \ - -Did=com.ibm.icu \ - -DsourceDirectory=$(pwd) \ - -DbaseLocation=$SDK \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml - +%ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \ + -Declipse.basews=gtk -Declipse.baseos=linux \ + -Declipse.basearch=%{eclipse_arch} jar docs eclipsePDEBuild %endif %install @@ -175,12 +162,10 @@ %if %{with_eclipse} # eclipse -install -d -m755 %{buildroot}/%{eclipse_lib_base} +install -d -m755 %{buildroot}/%{eclipse_base} -pushd eclipseProjects # FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug. -unzip -qq -d %{buildroot}/%{_datadir}/ build/rpmBuild/com.ibm.icu.zip -popd +unzip -qq -d %{buildroot}/%{eclipse_base} eclipseProjects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip %endif @@ -235,6 +220,9 @@ %endif %changelog +* Fri Jul 11 2008 Andrew Overholt 0:3.8.1-1 +- 3.8.1 + * Wed Jul 9 2008 Tom "spot" Callaway - 0:3.6.1-3 - drop repotag - fix license tag icu4j-crosslink.patch: Index: icu4j-crosslink.patch =================================================================== RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j-crosslink.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icu4j-crosslink.patch 14 Mar 2007 15:27:21 -0000 1.1 +++ icu4j-crosslink.patch 11 Jul 2008 15:31:12 -0000 1.2 @@ -1,20 +1,20 @@ ---- build.xml.orig 2006-07-17 19:12:17.000000000 -0400 -+++ build.xml 2006-07-17 19:13:59.000000000 -0400 -@@ -339,7 +339,7 @@ - docencoding="iso-8859-1" - bottom="<font size=-1>Copyright (c) 2006 IBM Corporation and others.</font>" - additionalparam="${doc.params}" -- link="http://java.sun.com/j2se/1.5/docs/api" -+ link="${j2se.apidoc}" - source="1.4"/> - +--- build.xml.orig 2007-12-10 21:56:54.000000000 -0500 ++++ build.xml 2008-06-30 18:29:36.000000000 -0400 +@@ -425,7 +425,7 @@ + docencoding="iso-8859-1" + bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>" + additionalparam="${doc.params}" +- link="http://java.sun.com/j2se/1.5/docs/api" ++ link="${j2se.apidoc}" + source="1.4" /> + -@@ -357,7 +357,7 @@ - docencoding="iso-8859-1" - bottom="<font size=-1>Copyright (c) 2004 IBM Corporation and others.</font>" - additionalparam="${doc.params}" -- link="http://java.sun.com/j2se/1.4/docs/api" -+ link="${j2se.apidoc}" - source="1.4"/> - +@@ -442,7 +442,7 @@ + docencoding="iso-8859-1" + bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>" + additionalparam="${doc.params}" +- link="http://java.sun.com/j2se/1.5/docs/api" ++ link="${j2se.apidoc}" + source="1.4" /> + Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/icu4j/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Jun 2007 16:20:17 -0000 1.3 +++ sources 11 Jul 2008 15:31:12 -0000 1.4 @@ -1 +1 @@ -e282dad6502ee0679c69d0a26e541552 icu4jsrc_3_6_1.jar +fd16dc861110419e615a7ce540a7676d icu4j-3_8_1-src.jar Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/icu4j/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Jun 2007 16:20:17 -0000 1.3 +++ .cvsignore 11 Jul 2008 15:31:12 -0000 1.4 @@ -1 +1 @@ -icu4jsrc_3_6_1.jar +icu4j-3_8_1-src.jar icu4j-updatetimestamp.patch: Index: icu4j-updatetimestamp.patch =================================================================== RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j-updatetimestamp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- icu4j-updatetimestamp.patch 13 Nov 2007 16:40:10 -0000 1.2 +++ icu4j-updatetimestamp.patch 11 Jul 2008 15:31:12 -0000 1.3 @@ -1,9 +1,11 @@ -diff -ur icu4j-3.6.1/build.properties icu4j-3.6.1/build.properties ---- icu4j-3.6.1/build.properties 2007-04-27 11:42:26.000000000 -0400 -+++ icu4j-3.6.1/build.properties 2007-11-13 11:29:21.000000000 -0500 -@@ -14,4 +14,4 @@ - copyright=Copyright (c) 2000-2007, International Business Machines Corporation and others. All Rights Reserved. - corp=IBM Corporation - copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp. --icu4j.eclipse.build.version.string=3.6.1.v20070417 -+icu4j.eclipse.build.version.string=3.6.1.v20070906 +--- build.properties.orig 2008-07-02 14:38:30.000000000 -0400 ++++ build.properties 2008-07-02 14:38:49.000000000 -0400 +@@ -27,4 +27,6 @@ + default.target.rt.version=J2SE15 + + icu4j.plugin.impl.version.string=3.8.1 +-copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp. +\ No newline at end of file ++copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp. ++ ++icu4j.eclipse.build.version.string=3.8.1.v20080530 From fedora-extras-commits at redhat.com Fri Jul 11 15:34:09 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 11 Jul 2008 15:34:09 GMT Subject: rpms/kdeedu/devel kdeedu.spec, 1.125, 1.126 kdeedu-4.0.85-buildfix.patch, 1.2, NONE Message-ID: <200807111534.m6BFY92F021707@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21568/devel Modified Files: kdeedu.spec Removed Files: kdeedu-4.0.85-buildfix.patch Log Message: Drop backported build fix (no longer needed). Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- kdeedu.spec 11 Jul 2008 15:24:32 -0000 1.125 +++ kdeedu.spec 11 Jul 2008 15:33:18 -0000 1.126 @@ -24,8 +24,6 @@ # fix cfitsio detection by using pkgconfig Patch0: kdeedu-4.0.4-cfitsio.patch -# upstream fix to fix build -Patch100: kdeedu-4.0.85-buildfix.patch # http://bugzilla.redhat.com/371121 Obsoletes: kalgebra < 1:0.7-7 @@ -143,7 +141,6 @@ %prep %setup -q -n kdeedu-%{version} %patch0 -p1 -b .cfitsio -%patch100 -p3 -b .buildfix %build --- kdeedu-4.0.85-buildfix.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 15:45:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 15:45:15 GMT Subject: rpms/python-toscawidgets/devel .cvsignore, 1.5, 1.6 python-toscawidgets.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807111545.m6BFjFDI022858@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-toscawidgets/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22764 Modified Files: .cvsignore python-toscawidgets.spec sources Log Message: * Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 - Update to latest release. - Fixes problem with pages being returned as text/plain. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Jun 2008 15:50:20 -0000 1.5 +++ .cvsignore 11 Jul 2008 15:44:05 -0000 1.6 @@ -1 +1 @@ -ToscaWidgets-0.9.1.tar.gz +ToscaWidgets-0.9.2.tar.gz Index: python-toscawidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/python-toscawidgets.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-toscawidgets.spec 2 Jun 2008 15:50:20 -0000 1.4 +++ python-toscawidgets.spec 11 Jul 2008 15:44:05 -0000 1.5 @@ -4,7 +4,7 @@ %define srcname ToscaWidgets Name: python-toscawidgets -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Summary: Toolkit to help create widgets for WSGI web apps Group: Development/Languages @@ -55,6 +55,10 @@ %changelog +* Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 +- Update to latest release. +- Fixes problem with pages being returned as text/plain. + * Mon Jun 02 2008 Luke Macken - 0.9.1-1 - Update to latest release - Remove python-paste-script, python-ruledispatch, python-decorator and Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jun 2008 15:50:20 -0000 1.5 +++ sources 11 Jul 2008 15:44:05 -0000 1.6 @@ -1 +1 @@ -cd086af4b34b3ffd3cabfad9561f9b96 ToscaWidgets-0.9.1.tar.gz +94de025438868267d895dfa84350cc9c ToscaWidgets-0.9.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 15:48:43 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 11 Jul 2008 15:48:43 GMT Subject: rpms/iwl4965-firmware/devel iwl4965-firmware.spec,1.3,1.4 Message-ID: <200807111548.m6BFmhPf023101@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/iwl4965-firmware/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23019 Modified Files: iwl4965-firmware.spec Log Message: - Bump to keep the old 4.44.17 firmware dropped. - Update firmware v1 to 228.57.1.21 - Add firmware v2 to 228.57.2.21 Index: iwl4965-firmware.spec =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/devel/iwl4965-firmware.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- iwl4965-firmware.spec 8 Apr 2008 21:43:22 -0000 1.3 +++ iwl4965-firmware.spec 11 Jul 2008 15:47:50 -0000 1.4 @@ -1,17 +1,22 @@ +%define iwl4965_v1 228.57.1.21 +%define iwl4965_v2 228.57.2.21 +%define iwl4965_list %{iwl4965_v1} %{iwl4965_v2} + Name: iwl4965-firmware -Version: 4.44.1.20 +Version: %{iwl4965_v2} Release: 2 Summary: Firmware for Intel?? PRO/Wireless 4965 A/G/N network adaptors Group: System Environment/Kernel License: Redistributable, no modification permitted URL: http://intellinuxwireless.org/ -Source0: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{version}.tgz +Source0: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v1}.tgz +Source1: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-%{iwl4965_v2}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Obsoletes: iwlwifi-4965-ucode -Provides: iwlwifi-4965-ucode = %{version} +ExcludeArch: ppc ppc64 + %description This package contains the firmware required by the iwl4965 driver for Linux. @@ -21,19 +26,20 @@ %prep %setup -c -q +%setup -c -q -D -T -a 1 + # Change permission find . -type f -exec chmod 0644 {} ';' pushd iwlwifi-4965-ucode-%{version} -# Rename docs -cp LICENSE.iwlwifi-4965-ucode ../LICENSE -cp README.iwlwifi-4965-ucode ../README # Change encoding -sed -i 's/\r//' ../LICENSE ../README +sed -i 's/\r//' LICENSE.iwlwifi-4965-ucode README.iwlwifi-4965-ucode +# Rename docs +mv LICENSE.iwlwifi-4965-ucode ../LICENSE +mv README.iwlwifi-4965-ucode ../README # Preserve timestamp -touch -r LICENSE.iwlwifi-4965-ucode ../LICENSE -touch -r README.iwlwifi-4965-ucode ../README +touch -r *.ucode ../LICENSE ../README popd @@ -44,9 +50,11 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/lib/firmware -pushd iwlwifi-4965-ucode-%{version} +for f in %{iwl4965_list} ; do +pushd iwlwifi-4965-ucode-$f install -pm 0644 *.ucode $RPM_BUILD_ROOT/lib/firmware/ popd +done @@ -61,6 +69,13 @@ %changelog +* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-2 +- Bump to keep the old 4.44.17 firmware dropped. + +* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 228.57.2.21-1 +- Update firmware v1 to 228.57.1.21 +- Add firmware v2 to 228.57.2.21 + * Tue Apr 8 2008 kwizart < kwizart at gmail.com > - 4.44.1.20-2 - Drop the old 4.44.17 firmware From fedora-extras-commits at redhat.com Fri Jul 11 15:53:56 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 11 Jul 2008 15:53:56 GMT Subject: rpms/iwl4965-firmware/devel sources,1.3,1.4 Message-ID: <200807111553.m6BFruIS023369@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/iwl4965-firmware/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23332 Modified Files: sources Log Message: Update source Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iwl4965-firmware/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Dec 2007 12:23:44 -0000 1.3 +++ sources 11 Jul 2008 15:53:02 -0000 1.4 @@ -1,2 +1,2 @@ -6e5e5287bc9a8021bb35e5905e891638 iwlwifi-4965-ucode-4.44.17.tgz -6e5c396da265d79d5675fd345adf24cc iwlwifi-4965-ucode-4.44.1.20.tgz +bce5a13d681100aeee2ddac3beaff437 iwlwifi-4965-ucode-228.57.1.21.tgz +83804fb4bfa991ffd4849c19a74bf38d iwlwifi-4965-ucode-228.57.2.21.tgz From fedora-extras-commits at redhat.com Fri Jul 11 15:55:09 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Fri, 11 Jul 2008 15:55:09 GMT Subject: rpms/rpm/devel rpm-4.5.90-devel-autodep.patch, NONE, 1.1 rpm-4.5.90-pkgconfig-path.patch, NONE, 1.1 rpm-4.6.x-no-pkgconfig-reqs.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 rpm.spec, 1.283, 1.284 sources, 1.130, 1.131 Message-ID: <200807111555.m6BFt9e5023485@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23258 Modified Files: .cvsignore rpm.spec sources Added Files: rpm-4.5.90-devel-autodep.patch rpm-4.5.90-pkgconfig-path.patch rpm-4.6.x-no-pkgconfig-reqs.patch Log Message: rpm 4.5.90 here we come... - spec largely rewritten and changelog truncated, too many changes to list here - only provides are extracted for libtool and pkgconfig dependencies initially to avoid creating unsolvable dependencies - just a couple of patches left over from F9 - building against BDB 4.5.20 for compatibility in case we need to go backwards rpm-4.5.90-devel-autodep.patch: --- NEW FILE rpm-4.5.90-devel-autodep.patch --- diff --git a/build/rpmfc.c b/build/rpmfc.c index 3cc2d6d..84d1e8a 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -522,7 +522,7 @@ static const struct rpmfcTokens_s const rpmfcTokens[] = { { "ASCII text", RPMFC_WHITE|RPMFC_INCLUDE }, { "ISO-8859 text", RPMFC_WHITE|RPMFC_INCLUDE }, - { "symbolic link to", RPMFC_SYMLINK }, + { "symbolic link to", RPMFC_SYMLINK|RPMFC_INCLUDE }, { "socket", RPMFC_DEVICE }, { "special", RPMFC_DEVICE }, @@ -683,6 +683,105 @@ rpmds rpmfcRequires(rpmfc fc) /** + * Ensure that symlinks for shared libs generate a dep on the shared lib + * @param fc file classifier + * @return 0 on success + */ +static int rpmfcSYMLINK(rpmfc fc) +{ + const char * fn = fc->fn[fc->ix]; + struct stat sb; + int fdno; + + if (fc->skipReq) + return 0; + + if (stat(fn, &sb) < 0) + return -1; + if (S_ISLNK(sb.st_mode)) + return -1; + + fdno = open(fn, O_RDONLY); + if (fdno < 0) { + return fdno; + } + +#if HAVE_GELF_H && HAVE_LIBELF + Elf * elf = NULL; + GElf_Ehdr ehdr_mem, * ehdr; + int isElf64 = 0; + int i, cnt; + char * soname = NULL; + rpmds ds; + + (void) elf_version(EV_CURRENT); + elf = NULL; + if ((elf = elf_begin (fdno, ELF_C_READ_MMAP, NULL)) == NULL + || elf_kind(elf) != ELF_K_ELF + || (ehdr = gelf_getehdr(elf, &ehdr_mem)) == NULL + || ehdr->e_type != ET_DYN) + goto exit; + +/* alpha uses /lib, not /lib64 so don't add (64bit) deps */ +#if !defined(__alpha__) + isElf64 = ehdr->e_ident[EI_CLASS] == ELFCLASS64; +#endif + + for (i = 0; i < ehdr->e_phnum; ++i) { + GElf_Phdr phdr_mem; + GElf_Phdr *phdr = gelf_getphdr (elf, i, &phdr_mem); + GElf_Shdr shdr_mem; + Elf_Data * data = NULL; + Elf_Scn * scn; + GElf_Shdr *shdr; + + if (phdr == NULL || phdr->p_type != PT_DYNAMIC) + continue; + + scn = gelf_offscn(elf, phdr->p_offset); + shdr = gelf_getshdr(scn, &shdr_mem); + + if (shdr != NULL && shdr->sh_type == SHT_DYNAMIC) + data = elf_getdata (scn, NULL); + if (data == NULL) + continue; + + for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) { + GElf_Dyn dynmem; + GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem); + char *depname = NULL; + + if (dyn == NULL) + break; + if (dyn->d_tag != DT_SONAME) + continue; + + /* add the soname to package deps */ + soname = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val); + if (soname == NULL) + break; + + rasprintf(&depname, "%s%s", soname, isElf64 ? "()(64bit)" : ""); + /* Add to package dependencies. */ + ds = rpmdsSingle(RPMTAG_REQUIRENAME, depname, "", + RPMSENSE_FIND_REQUIRES); + free(depname); + + rpmdsMerge(&fc->requires, ds); + rpmfcAddFileDep(&fc->ddict, fc->ix, ds); + ds = rpmdsFree(ds); + break; + } + } +exit: + if (elf) (void) elf_end(elf); + close(fdno); + return 0; +#endif + return -1; +} + +/** * Extract script dependencies. * @param fc file classifier * @return 0 on success @@ -1115,6 +1214,7 @@ static const struct rpmfcApplyTbl_s const rpmfcApplyTable[] = { { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PKGCONFIG) }, { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_LIBTOOL) }, { rpmfcSCRIPT, RPMFC_MONO }, + { rpmfcSYMLINK, RPMFC_SYMLINK }, { NULL, 0 } }; @@ -1135,6 +1235,7 @@ rpmRC rpmfcApply(rpmfc fc) int ix; int i; int xx; + int skipping = 0; /* Generate package and per-file dependencies. */ for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) { @@ -1185,11 +1286,13 @@ assert(se != NULL); default: break; case 'P': + skipping = fc->skipProv; ds = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags); dix = rpmdsFind(fc->provides, ds); ds = rpmdsFree(ds); break; case 'R': + skipping = fc->skipReq; ds = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags); dix = rpmdsFind(fc->requires, ds); ds = rpmdsFree(ds); @@ -1211,7 +1314,7 @@ assert(dix >= 0); previx = ix; xx = argiAdd(&fc->fddictx, ix, argiCount(fc->ddictx)-1); } - if (fc->fddictn && fc->fddictn->vals) + if (fc->fddictn && fc->fddictn->vals && !skipping) fc->fddictn->vals[ix]++; } rpm-4.5.90-pkgconfig-path.patch: --- NEW FILE rpm-4.5.90-pkgconfig-path.patch --- diff --git a/macros.in b/macros.in index 830072a..bdce7f4 100644 --- a/macros.in +++ b/macros.in @@ -805,6 +805,8 @@ print (t)\ export RPM_BUILD_ROOT}\ %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ export CLASSPATH}\ + PKG_CONFIG_PATH=\"%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\ + export PKG_CONFIG_PATH\ \ %{verbose:set -x}%{!verbose:exec > /dev/null}\ umask 022\ rpm-4.6.x-no-pkgconfig-reqs.patch: --- NEW FILE rpm-4.6.x-no-pkgconfig-reqs.patch --- diff --git a/macros.in b/macros.in index 830072a..e75ca18 100644 --- a/macros.in +++ b/macros.in @@ -460,10 +460,10 @@ print (t)\ %__mono_requires @RPMCONFIGDIR@/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} %__libtool_provides @RPMCONFIGDIR@/libtooldeps.sh --provides %{buildroot} %{name} -%__libtool_requires @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot} %{name} +#%__libtool_requires @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot} %{name} %__pkgconfig_provides @RPMCONFIGDIR@/pkgconfigdeps.sh --provides -%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires +#%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires #============================================================================== # ---- Database configuration macros. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 1 Apr 2008 08:00:59 -0000 1.24 +++ .cvsignore 11 Jul 2008 15:54:19 -0000 1.25 @@ -1 +1 @@ -rpm-4.4.2.3.tar.gz +rpm-4.5.90.git8426.tar.bz2 Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- rpm.spec 18 Apr 2008 16:20:57 -0000 1.283 +++ rpm.spec 11 Jul 2008 15:54:19 -0000 1.284 @@ -1,61 +1,76 @@ -%define with_python_version 2.5%{nil} -%define with_apidocs 1%{nil} +# rawhide doesn't have new enough lzma yet +%bcond_with lzma +# sqlite backend is broken atm, disabled for now +%bcond_with sqlite +# just for giggles, option to build with internal Berkeley DB +%bcond_with int_bdb + +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define rpmhome /usr/lib/rpm +%define rpmver 4.5.90 +%define snapver git8426 +%define srcver %{rpmver}.%{snapver} + +%define bdbver 4.5.20 + Summary: The RPM package management system Name: rpm -Version: 4.4.2.3 -Release: 2%{?dist} +Version: %{rpmver} +Release: 0.%{snapver}.5 Group: System Environment/Base Url: http://www.rpm.org/ -Source: http://rpm.org/releases/rpm-4.4.x/%{name}-%{version}.tar.gz -Patch1: rpm-4.4.2.3-prereq.patch -Patch2: rpm-4.4.2-ghost-conflicts.patch -Patch3: rpm-4.4.2-trust.patch -Patch4: rpm-4.4.2.2-devel-autodep.patch -Patch5: rpm-4.4.2-rpmfc-skip.patch -Patch6: rpm-4.4.2.2-matchpathcon.patch -Patch7: rpm-4.4.2.1-no-popt.patch -Patch8: rpm-4.4.2.3-nss.patch -Patch9: rpm-4.4.2.2-autofoo.patch -Patch10: rpm-4.4.2.2-pkgconfig-path.patch -Patch11: rpm-4.4.2.3-queryformat-arch.patch -Patch12: rpm-4.4.2.3-no-order-rescan-limit.patch -Patch13: rpm-4.4.2.3-fix-find-requires.patch -Patch50: rpm-4.4.2.3-rc1-sparc-mcpu.patch - -# XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed -# and several different components with their own licenses included... -# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD and MIT and Sleepycat +Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 +%if %{with int_bdb} +Source1: db-%{bdbver}.tar.gz +%endif + +Patch0: rpm-4.5.90-devel-autodep.patch +Patch1: rpm-4.5.90-pkgconfig-path.patch +# XXX only create provides for pkgconfig and libtool initially +Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch + +# Partially GPL/LGPL dual-licensed and some bits with BSD +# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD License: GPLv2+ Requires(post): coreutils Requires: popt >= 1.10.2.1 Requires: crontabs Requires: logrotate +Requires: curl + +%if %{without int_bdb} +# XXX using BDB 4.5.20 from compat-db for now to provide a safe downgrade +# route to older rpm. Only compat-db >= 4.6.21 has the necessary symlinks +# for building however. +BuildRequires: compat-db >= 4.6.21-2.fc10 +%endif -# XXX for autoreconf due to popt removal -BuildRequires: autoconf automake libtool # XXX generally assumed to be installed but make it explicit as rpm # is a bit special... BuildRequires: redhat-rpm-config BuildRequires: gawk BuildRequires: elfutils-devel >= 0.112 -BuildRequires: elfutils-libelf-devel-static +BuildRequires: elfutils-libelf-devel BuildRequires: readline-devel zlib-devel BuildRequires: nss-devel -# The popt version here just document an older known-good version, not -# necessarily accurate -BuildRequires: popt-devel >= 1.10.2 -BuildRequires: sqlite-devel +# The popt version here just documents an older known-good version +BuildRequires: popt-devel >= 1.10.2 +BuildRequires: file-devel BuildRequires: gettext-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel BuildRequires: bzip2-devel >= 0.9.0c-2 -BuildRequires: python-devel >= %{with_python_version} - -BuildConflicts: neon-devel +BuildRequires: python-devel >= 2.2 +BuildRequires: lua-devel >= 5.1 +%if %{with lzma} +BuildRequires: lzma-devel >= 4.42 +%endif +%if %{with sqlite} +BuildRequires: sqlite-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,11 +95,17 @@ Group: Development/Libraries License: GPLv2+ and LGPLv2+ with exceptions Requires: rpm = %{version}-%{release} +Requires: pkgconfig Requires: nss-devel -Requires: sqlite-devel Requires: libselinux-devel Requires: elfutils-libelf-devel Requires: popt-devel +%if %{with lzma} +Requires: lzma-devel >= 4.42 +%endif +%if %{with sqlite} +Requires: sqlite-devel +%endif %description devel This package contains the RPM C library and header files. These @@ -103,7 +124,7 @@ Requires: rpm = %{version}-%{release} Requires: elfutils >= 0.128 binutils Requires: findutils sed grep gawk diffutils file patch >= 2.5 -Requires: zip gzip bzip2 cpio +Requires: unzip gzip bzip2 cpio lzma %description build The rpm-build package contains the scripts and executable programs @@ -122,57 +143,36 @@ This package should be installed if you want to develop Python programs that will manipulate RPM packages and databases. -%if %{with_apidocs} %package apidocs Summary: API documentation for RPM libraries Group: Documentation -BuildRequires: doxygen %description apidocs This package contains API documentation for developing applications that will manipulate RPM packages and databases. -%endif %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 -b .prereq -%patch2 -p1 -b .ghostconflicts -%patch3 -p1 -b .trust -%patch4 -p1 -b .develdeps -%patch5 -p1 -b .fcskip -%patch6 -p1 -b .matchpathcon -%patch7 -p1 -b .no-popt -%patch8 -p1 -b .nss -%patch9 -p1 -b .autofoo -%patch10 -p1 -b .pkgconfig-path -%patch11 -p1 -b .qfmt-arch -%patch12 -p1 -b .no-order-limit -%patch13 -p1 -b .requires -%patch50 -p1 -b .sparc-mcpu - -# force external popt -rm -rf popt/ +%setup -q -n %{name}-%{srcver} %{?with_int_bdb:-a 1} +%patch0 -p1 -b .devel-autodep +%patch1 -p1 -b .pkgconfig-path +%patch100 -p1 -b .pkgconfig-deps -# XXX for popt removal -autoreconf +%if %{with int_bdb} +ln -s db-%{bdbver} db +%endif %build +%if %{without int_bdb} +export CPPFLAGS=-I%{_includedir}/db%{bdbver} +export LDFLAGS=-L%{_libdir}/db%{bdbver} +%endif -# XXX pull in updated config.guess and config.sub as done by %%configure -# which cannot be used to build rpm itself due to makefile brokenness -for i in $(find . -name config.guess -o -name config.sub) ; do - [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i -done - -# XXX rpm 4.4.2.1 can't be built with %%configure due to makefile brokenness -CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS -./configure --prefix=%{_usr} \ - --sysconfdir=%{_sysconfdir} \ - --localstatedir=%{_var} \ - --infodir=%{_infodir} \ - --mandir=%{_mandir} \ - --with-python=%{with_python_version} \ - --enable-posixmutexes +%configure \ + %{!?with_int_bdb: --with-external-db} \ + %{?with_sqlite: --enable-sqlite3} \ + --with-lua \ + --with-selinux \ + --enable-python make %{?_smp_mflags} @@ -181,11 +181,6 @@ make DESTDIR="$RPM_BUILD_ROOT" install -# Clean up useless symlinks -for i in rpme rpmi rpmu; do - rm -f $RPM_BUILD_ROOT%{_bindir}/$i -done - # Save list of packages through cron mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/rpm @@ -195,700 +190,179 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm -mkdir -p $RPM_BUILD_ROOT/var/spool/repackage mkdir -p $RPM_BUILD_ROOT/var/lib/rpm for dbi in \ - Basenames Conflictname Dirnames Group Installtid Name Packages \ - Providename Provideversion Requirename Requireversion Triggername \ - Filemd5s Pubkeys Sha1header Sigmd5 \ - __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \ - __db.008 __db.009 + Basenames Conflictname Dirnames Group Installtid Name Packages \ + Providename Provideversion Requirename Requireversion Triggername \ + Filedigests Pubkeys Sha1header Sigmd5 \ + __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \ + __db.008 __db.009 do touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi done %find_lang %{name} -# copy db and file/libmagic license info to distinct names -cp -p db/LICENSE LICENSE-bdb -cp -p file/LEGAL.NOTICE LEGAL.NOTICE-file -cp -p lua/COPYRIGHT COPYRIGHT-lua - -# Get rid of unpackaged files -{ cd $RPM_BUILD_ROOT - rm -f .%{_libdir}/lib*.{a,la} - rm -f .%{rpmhome}/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,rpm.*} - rm -rf .%{_mandir}/{fr,ko} - rm -f .%{_libdir}/python%{with_python_version}/site-packages/*.{a,la} - rm -f .%{_libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la} - rm -f .%{_libdir}/python%{with_python_version}/site-packages/rpmdb/*.{a,la} -} - -find $RPM_BUILD_ROOT/%{_libdir}/python%{with_python_version} -name "*.py"|xargs chmod 644 +find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f %clean rm -rf $RPM_BUILD_ROOT -%post -# XXX Detect (and remove) incompatible dbenv files during upgrade. -# XXX Removing dbenv files in %%post opens a lock race window, a tolerable -# XXX risk compared to the support issues involved with upgrading Berkeley DB. -[ -w /var/lib/rpm/__db.001 ] && -/usr/lib/rpm/rpmdb_stat -CA -h /var/lib/rpm 2>&1 | -grep "db_stat: Program version ... doesn't match environment version" 2>&1 > /dev/null && - rm -f /var/lib/rpm/__db* - -exit 0 - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%define rpmdbattr %attr(0644, root, root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) +%posttrans +# XXX this is klunky and ugly, rpm itself should handle this +%if %{with int_bdb} +dbstat=/usr/lib/rpm/rpmdb_stat +%else +dbstat=%{_bindir}/db45_stat +%endif +if [ -x "$dbstat" ]; then + if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "Invalid argument"; then + rm -f /var/lib/rpm/__db.* + fi +fi +exit 0 %files -f %{name}.lang %defattr(-,root,root,-) -%doc CHANGES GROUPS COPYING LICENSE-bdb LEGAL.NOTICE-file CREDITS ChangeLog -%doc COPYRIGHT-lua doc/manual/[a-z]* +%doc CHANGES GROUPS COPYING CREDITS ChangeLog doc/manual/[a-z]* %{_sysconfdir}/cron.daily/rpm %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/rpm %dir %{_sysconfdir}/rpm -# XXX teach rpm to skip .rpmnew etc first... -#%ghost %config(noreplace,missingok) %{_sysconfdir}/rpm/platform -#%ghost %config(noreplace,missingok) %{_sysconfdir}/rpm/macros.tscolor - -%dir /var/lib/rpm -%rpmdbattr /var/lib/rpm/* -%dir /var/spool/repackage -%dir %{rpmhome} + +%attr(0755, root, root) %dir /var/lib/rpm +%attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/rpm/* +%attr(0755, root, root) %dir %{rpmhome} /bin/rpm %{_bindir}/rpm2cpio -%{_bindir}/gendiff %{_bindir}/rpmdb %{_bindir}/rpmsign %{_bindir}/rpmquery %{_bindir}/rpmverify -%{rpmhome}/config.guess -%{rpmhome}/config.sub -%{rpmhome}/convertrpmrc.sh -%{rpmhome}/freshen.sh -%{rpmhome}/mkinstalldirs -%{rpmhome}/rpm2cpio.sh -%{rpmhome}/rpm[deiukqv] -%{rpmhome}/tgpg -%{rpmhome}/rpmdb_* -%{rpmhome}/rpmfile - -%{rpmhome}/macros -%{rpmhome}/rpmpopt* -%{rpmhome}/rpmrc - -%ifarch i386 i486 i586 i686 athlon geode pentium3 pentium4 x86_64 -%{rpmhome}/i[3456]86* -%{rpmhome}/athlon* -%{rpmhome}/geode* -%{rpmhome}/pentium* -%endif -%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67 -%{rpmhome}/alpha* -%endif -%ifarch sparc sparcv8 sparcv9 sparc64 -%{rpmhome}/sparc* -%endif -%ifarch ia64 -%{rpmhome}/ia64* -%endif -%ifarch powerpc ppc ppciseries ppcpseries ppcmac ppc64 -%{rpmhome}/ppc* -%endif -%ifarch s390 s390x -%{rpmhome}/s390* -%endif -%ifarch %{arm} -%{rpmhome}/arm* -%endif -%ifarch mips mipsel -%{rpmhome}/mips* -%endif -%ifarch x86_64 -%{rpmhome}/x86_64* -%{rpmhome}/amd64* -%{rpmhome}/ia32e* -%endif -%{rpmhome}/noarch* - -%{_mandir}/man1/gendiff.1* %{_mandir}/man8/rpm.8* %{_mandir}/man8/rpm2cpio.8* # XXX this places translated manuals to wrong package wrt eg rpmbuild +%lang(fr) %{_mandir}/fr/man[18]/*.[18]* +%lang(ko) %{_mandir}/ko/man[18]/*.[18]* %lang(ja) %{_mandir}/ja/man[18]/*.[18]* %lang(pl) %{_mandir}/pl/man[18]/*.[18]* %lang(ru) %{_mandir}/ru/man[18]/*.[18]* %lang(sk) %{_mandir}/sk/man[18]/*.[18]* +%{rpmhome}/macros +%{rpmhome}/rpmpopt* +%{rpmhome}/rpmrc + +%{rpmhome}/rpmdb_* +%{rpmhome}/rpm.daily +%{rpmhome}/rpm.log +%{rpmhome}/rpm.xinetd +%{rpmhome}/rpm2cpio.sh +%{rpmhome}/tgpg + +%{rpmhome}/platform + %files libs %defattr(-,root,root) %{_libdir}/librpm*-*.so %files build %defattr(-,root,root) -%{_usrsrc}/redhat %{_bindir}/rpmbuild +%{_bindir}/gendiff + +%{_mandir}/man1/gendiff.1* + %{rpmhome}/brp-* %{rpmhome}/check-buildroot %{rpmhome}/check-files %{rpmhome}/check-prereqs %{rpmhome}/check-rpaths* -%{rpmhome}/cross-build %{rpmhome}/debugedit %{rpmhome}/find-debuginfo.sh %{rpmhome}/find-lang.sh -%{rpmhome}/find-prov.pl %{rpmhome}/find-provides -%{rpmhome}/find-provides.perl -%{rpmhome}/find-req.pl %{rpmhome}/find-requires -%{rpmhome}/find-requires.perl -%{rpmhome}/get_magic.pl -%{rpmhome}/getpo.sh -%{rpmhome}/http.req %{rpmhome}/javadeps -%{rpmhome}/magic.prov -%{rpmhome}/magic.req %{rpmhome}/mono-find-provides %{rpmhome}/mono-find-requires %{rpmhome}/osgideps.pl %{rpmhome}/perldeps.pl +%{rpmhome}/libtooldeps.sh +%{rpmhome}/pkgconfigdeps.sh %{rpmhome}/perl.prov %{rpmhome}/perl.req +%{rpmhome}/tcl.req %{rpmhome}/pythondeps.sh -%{rpmhome}/rpm[bt] %{rpmhome}/rpmdeps -%{rpmhome}/trpm -%{rpmhome}/u_pkg.sh -%{rpmhome}/vpkg-provides.sh -%{rpmhome}/vpkg-provides2.sh - -%{rpmhome}/config.site -%{rpmhome}/magic -%{rpmhome}/magic.mgc -%{rpmhome}/magic.mime -%{rpmhome}/magic.mime.mgc +%{rpmhome}/config.guess +%{rpmhome}/config.sub +%{rpmhome}/mkinstalldirs +%{rpmhome}/rpmdiff* + +%{rpmhome}/macros.perl +%{rpmhome}/macros.python +%{rpmhome}/macros.php %{_mandir}/man8/rpmbuild.8* %{_mandir}/man8/rpmdeps.8* %files python %defattr(-,root,root) -%{_libdir}/python%{with_python_version}/site-packages/rpm +%{python_sitearch}/rpm %files devel %defattr(-,root,root) %{_includedir}/rpm %{_libdir}/librp*[a-z].so -%{_mandir}/man8/rpmcache.8* %{_mandir}/man8/rpmgraph.8* -%{rpmhome}/rpmcache %{_bindir}/rpmgraph -%if %{with_apidocs} +%{_libdir}/pkgconfig/rpm.pc + %files apidocs %defattr(-,root,root) -%doc apidocs -%endif +%doc doc/librpm/html/* %changelog -* Fri Apr 18 2008 Bill Nottingham 4.4.2.3-2 -- fix find-requires (#443015) - -* Tue Apr 01 2008 Panu Matilainen 4.4.2.3-1 -- update to 4.4.2.3 final -- resolves #436770, #431009, #435620, #433188, #430428, #432496 -- adjust dependency printing wrt prereq (#431721) -- rediff nss patch to fix fuzz brokenness - -* Sun Mar 30 2008 Tom "spot" Callaway 4.4.2.3-0.5.rc1 -- actually apply sparc optflags patch - -* Thu Mar 27 2008 Tom "spot" Callaway 4.4.2.3-0.4.rc1 -- Fix sparc optflags - -* Wed Mar 12 2008 Panu Matilainen 4.4.2.3-0.3.rc1 -- Continue ordering loop elimination as long as progress is made (#437041) - -* Tue Feb 19 2008 Fedora Release Engineering - 4.4.2.3-0.2.rc1 -- Autorebuild for GCC 4.3 - -* Fri Jan 25 2008 Panu Matilainen 4.4.2.3-0.1.rc1 -- update to 4.4.2.3-rc1 -- merge nss-related patches into one -- change default queryformat to include arch -- resolves (documentation): #159638, #233232, #332271, #350401 -- resolves (build): #124300, #140597, #124995, #147383, #220449 -- resolves (query): #244236, #323221, #60288 -- resolves (general): #223931, #164021, #83006, #205080, #217258, #428979 - -* Fri Jan 11 2008 Panu Matilainen 4.4.2.2-13 -- lose the useless rpm user+group, use root:root like everything else -- install x86 arch macros on x86_64 (#194123) -- dont mess up target os+arch on rpmrc include (#232429) -- set pkg-config path based on target (#212522) -- fix funky automake breakage from nss libraries moving to /lib* - -* Fri Jan 04 2008 Panu Matilainen 4.4.2.2-12 -- fix segfault in devel symlink dependency generation from Mark Salter (#338971) -- fix debugedit build with gcc 4.3 -- drop popt-static build dependency - -* Thu Nov 15 2007 Panu Matilainen 4.4.2.2-11 -- Unbreak debugedit (missing crypto initialization) - -* Thu Nov 15 2007 Panu Matilainen 4.4.2.2-10 -- Initialize NSS as early as possible (#382091) - -* Wed Nov 14 2007 Paul Nasrat 4.4.2.2-9 -- Fix base64 assumption of signed char, from Tomas Mraz (#380911) - -* Mon Nov 12 2007 Panu Matilainen 4.4.2.2-8 -- Use NSS instead of beecrypt for cryptography, from Tomas Mraz (#348131) -- Update build + other dependencies accordingly - -* Wed Oct 24 2007 Panu Matilainen 4.4.2.2-7 -- Use package NEVRA everywhere for rpmProblems (#349091) -- The python problem addressed in -6 was related but a different issue... - -* Wed Oct 24 2007 Panu Matilainen 4.4.2.2-6 -- Don't mess up problem pkgNEVR in python ts.check() (#349091) - -* Mon Oct 22 2007 Panu Matilainen 4.4.2.2-5 -- add missing popt-devel dependency to rpm-devel - -* Thu Oct 18 2007 Panu Matilainen 4.4.2.2-4 -- debugedit fixes from Roland McGrath (#336951, #337011) - -* Fri Oct 12 2007 Panu Matilainen 4.4.2.2-3 -- add OSGi dependency generator script - -* Thu Oct 11 2007 Panu Matilainen 4.4.2.2-2 -- merge review: remove static libraries (#226377) -- merge review: remove comment causing doxygen to emit non-utf output (#226377) -- other minor spec cleanups - -* Wed Oct 03 2007 Panu Matilainen 4.4.2.2-1 -- update to 4.4.2.2 final -- update matchpathcon patch to work better when selinux disabled -- resolves #251400, #315271, #296731, #308171, #305221, #295941 - -* Tue Sep 11 2007 Panu Matilainen 4.4.2.2-0.5.rc2 -- 4.4.2.2-rc2 -- resolves #180996, #281611, #259961, #277161, #155079 -- drop debugedit-names patch now that it's really upstream - -* Wed Sep 05 2007 Panu Matilainen 4.4.2.2-0.4.rc1 -- remove duplicated libraries from rpm-devel (#278151) - -* Tue Sep 04 2007 Panu Matilainen 4.4.2.2-0.3.rc1 -- require gawk, not awk, doh - -* Tue Sep 04 2007 Panu Matilainen 4.4.2.2-0.2.rc1 -- add back accidentally dropped debugedit patch until upstreamed -- add a bunch of previously implicit dependencies for rpm-build - -* Tue Aug 28 2007 Panu Matilainen 4.4.2.2-0.1.rc1 -- update to 4.4.2.2-rc1 -- remove no longer needed hacks -- drop patches merged upstream - -* Fri Aug 24 2007 Panu Matilainen 4.4.2.1-10 -- split apidocs to separate package (they're huge) -- use system macros for bindir etc instead of defining our own -- remove NPTL-related LD_ASSUME_KERNEL stuff, no longer functional anyway -- remove various hacks that are no longer needed -- ensure correct permissions of debug sources -- follow fedora guidelines for user/group manipulation -- clean up any non-matching bdb environment on post, not just 4.3 -- visual cleanup of spec - -* Fri Aug 24 2007 Panu Matilainen -- include sys-specific macros for all ARM variants (Lennert Buytenhek) - -* Fri Aug 24 2007 Panu Matilainen - 4.4.2.1-9 -- remove internal popt, buildrequire popt-devel and popt-static (#249352) -- move the versioned beecrypt dependency to libs where it belongs -- license clarification according to latest guidelines: libs and devel - are dual gpl/lgpl licensed with exceptions, other binaries are gpl -- convert pl and sk manuals to utf-8 -- buildrequire gawk - -* Wed Aug 15 2007 Panu Matilainen - 4.4.2.1-8 -- improved perl dependency extraction (#198033, #249135) by Ville Skytt?? - and John Owens -- make find-lang --with-gnome pick up .omf files (#251400) by Matthias Clasen - -* Mon Aug 13 2007 Panu Matilainen - 4.4.2.1-7 -- another debugedit fix and updated find-debuginfo script from Roland McGrath -- make popt provide popt-devel to further ease split-off transition -- skip ESTALE and EACCESS on mountpoints from Jeff Johnson (#190496, #220991) - -* Sun Aug 12 2007 Panu Matilainen - 4.4.2.1-6 -- debugedit buildid thinko fix from Roland McGrath -- loosen up popt-dependency to prepare for splitting it off - -* Thu Aug 9 2007 Panu Matilainen - 4.4.2.1-5 -- avoid unnecessary .rpmsave / .rpmnew files by Tomas Mraz (#29470, #128622) -- stricter docdir checking by Ralf S. Engelschall (#246819) -- add lua license to docs - -* Thu Aug 9 2007 Panu Matilainen - 4.4.2.1-4 -- fix new find-debuginfo.sh on noarch packages by Roland McGrath - -* Wed Aug 8 2007 Panu Matilainen - 4.4.2.1-3 -- make peace with new glibc checks on open() wrt internal bdb and rpm itself - -* Wed Aug 8 2007 Panu Matilainen - 4.4.2.1-2 -- ARM-related typo fixes from Lennert Buytenhek -- License clarifications - -* Mon Aug 6 2007 Roland McGrath -- new find-debuginfo.sh script, requires elfutils >= 0.128 - -* Mon Jul 23 2007 Panu Matilainen 4.4.2.1-1 -- 4.4.2.1 final -- reintroduce disttag -- include full ChangeLog as doc -- use up-to-date config.guess for ARM support (#246803) -- ARM EANBI gnu/gnuenabi fix from Lennert Buytenhek (#246803) - -* Sat Jul 21 2007 Panu Matilainen 4.4.2.1-0.6.rc3 -- dont mess up python exit codes - -* Fri Jul 20 2007 Panu Matilainen 4.4.2.1-0.5.rc3 -- require logrotate (#248629) -- allow checking for pending signals from python (#181434) -- add hook to python for cleaning up on unclean exit (#245389) - -* Mon Jul 09 2007 Panu Matilainen 4.4.2.1-0.4.rc3 -- 4.4.2.1-rc3 - -* Wed Jul 04 2007 Panu Matilainen 4.4.2.1-0.4.rc2 -- 4.4.2.1-rc2 - -* Thu Jun 28 2007 Panu Matilainen 4.4.2.1-0.3.rc1 -- don't hang because of leftover query iterators (#246044) - -* Tue Jun 26 2007 Panu Matilainen 4.4.2.1-0.2.rc1 -- patch popt version to 1.10.2.1 for clean upgrade path -- popt release follows main package release again - -* Mon Jun 25 2007 Panu Matilainen 4.4.2.1-0.1.rc1 -- update to 4.4.2.1-rc1 -- patch shuffle, most have been merged upstream -- drop mono-scripts, it comes from upstream now -- popt isn't upgrading here so it needs its own release - -* Tue Jun 19 2007 Panu Matilainen - 4.4.2-47 -- spec / package (review) cleanups: -- use find_lang instead of manually listing translations -- remove useless rpm 3.x upgrade check from preinstall script -- use Fedora recommended buildroot -- don't include useless, ancient GPG keys -- add rpm, db and file licenses to docs -- use scriptlet dependency markers instead of PreReq -- post scriptlet requires coreutils -- main package doesn't require patch, rpm-build does -- buildrequire doxygen once more to resurrect apidocs -- remove useless/doubly packaged files from /usr/lib/rpm -- fix bunch of file permissions - -* Tue May 01 2007 Paul Nasrat - 4.4.2-46 -- Configurable policy for prefered ELF (#235757) - -* Mon Apr 23 2007 Paul Nasrat - 4.4.2-45 -- Fix debugedit for relative paths (#232222) - -* Mon Apr 16 2007 Paul Nasrat - 4.4.2-44 -- Set default verify flags for %%doc (#235353) -- Revert to old configure line - -* Mon Apr 16 2007 Paul Nasrat - 4.4.2-43 -- Log failures for fork failing (OLPC) -- Gendiff enhancement from Enrico Scholz (#146981) - -* Wed Apr 04 2007 Paul Nasrat - 4.4.2-42 -- Remove ppc64 inline asm (#233145) - -* Tue Mar 13 2007 Paul Nasrat - 4.4.2-41 -- Fix potential segfault when no rpmloc_path (#231146) -- Fix debugedit for relative paths (#232222) -- Spec cleanup - -* Mon Feb 19 2007 Jeremy Katz - 4.4.2-40 -- rpm-build should require findutils - -* Wed Jan 17 2007 Deepak Bhole 4.4.2-39%{?dist} -- Added a missing BR for elfutils-libelf-devel-static (needed for -lelf) - -* Mon Dec 11 2006 Jeremy Katz - 4.4.2-38 -- python: dbmatch keys can be unicode objects also (#219008) - -* Wed Dec 6 2006 Jeremy Katz - 4.4.2-37 -- rebuild for python 2.5 - -* Mon Nov 20 2006 Paul Nasrat - 4.4.2-36 -- Fix ordering issues (#196590) - -* Tue Oct 31 2006 Paul Nasrat - 4.4.2-35 -- Flush query buffer patch from jbj (#212833) - -* Tue Oct 31 2006 Paul Nasrat - 4.4.2-34 -- Debuginfo extraction with O0 - -* Wed Oct 25 2006 Paul Nasrat - 4.4.2-33 -- Fix for ordering (#202540, #202542, #202543, #202544) - -* Thu Sep 07 2006 Paul Nasrat - 4.4.2-32 -- Various debuginfo fixes (#165434, #165418, #149113, #205339) - -* Fri Jul 21 2006 Paul Nasrat - 4.4.2-31 -- Apply matchpathcon patch - -* Wed Jul 19 2006 Paul Nasrat - 4.4.2-30 -- Fix debugedit for ppc relocations (#199473) - -* Fri Jul 14 2006 David Cantrell - 4.4.2-29 -- Fixed null pointer problem in rpmfcELF() DT_GNU_HASH handling - -* Tue Jul 11 2006 Paul Nasrat - 4.4.2-28 -- Detect and provide a requirement for DT_GNU_HASH - -* Wed Jul 05 2006 Paul Nasrat - 4.4.2-27 -- IPv4/6 and EPSV support by Arkadiusz Miskiewicz - -* Wed Jun 28 2006 Paul Nasrat - 4.4.2-26 -- Force CHANGELOGTIME to be a list in rpm-python - -* Wed Jun 28 2006 Paul Nasrat - 4.4.2-25 -- Remove SELinux context verification (#193488) - -* Thu May 04 2006 Paul Nasrat - 4.4.2-24 -- File classification with autoReq off (#190488) - -* Thu May 4 2006 Jeremy Katz - 4.4.2-23 -- make rpm-libs requires on base package stronger - -* Wed May 3 2006 Jeremy Katz - 4.4.2-22 -- put in simple workaround for per-file deps with autoreq off (#190488) - while pnasrat works on a real fix - -* Fri Apr 28 2006 Jeremy Katz - 4.4.2-21 -- run ldconfig in -libs subpackage %%post, not main package -- add patch to generate shared lib deps by following symlinks so that - -devel packages sanely depend on main libs - -* Thu Apr 27 2006 Paul Nasrat - 4.4.2-20 -- Update --trusted stubs for rpmk breakage - -* Tue Apr 25 2006 Paul Nasrat - 4.4.2-19 -- Add --trusted stubs from upstream - -* Wed Apr 12 2006 Paul Nasrat - 4.4.2-18 -- Resurrect doxygen (#187714) - -* Tue Apr 11 2006 Jeremy Katz - 4.4.2-17 -- remove redundant elfutils-libelf buildrequires -- rpm-python doesn't require elfutils (related to #188495) - -* Fri Mar 31 2006 Paul Nasrat - 4.4.2-16 -- Skipdirs on erase again (#187308) -- Make fcntl lock sensitive to --root (#151255) -- Fix netshared path comparison (#52725) -- Fix rpm vercmp (#178798) - -* Fri Feb 10 2006 Jesse Keating - 4.4.2-15.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 4.4.2-15.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Mon Jan 30 2006 Paul Nasrat - 4.4.2-15 -- Rebuild for newer neon -- Fix scriptlet deadlock (#146549) - -* Wed Jan 18 2006 Paul Nasrat - 4.4.2-14 -- Don't emit perl(main) (#177960) - -* Wed Jan 11 2006 Paul Nasrat - 4.4.2-13 -- Don't mmap large files - -* Mon Jan 9 2006 Alexander Larsson - 4.4.2-12 -- Add mono req/provides support - -* Thu Dec 01 2005 Paul Nasrat - 4.4.2-11 -- Remove rpm .la files (#174261) -- Cron job use paths (#174211) - -* Tue Nov 29 2005 Paul Nasrat - 4.4.2-10 -- Ignore excluded size (#89661) - -* Tue Nov 29 2005 Paul Nasrat - 4.4.2-9 -- Don't skipDirs on erasures (#140055) - -* Mon Nov 28 2005 Paul Nasrat - 4.4.2-8 -- Add elfutils Build Requires to rpmbuild (#155129) -- Don't do conflicts if both files %%ghost(#155256) -- Fix popt charset for various languages (#172155) -- Don't include .la file (#174261) - -* Tue Nov 8 2005 Tomas Mraz - 4.4.2-7 -- rebuilt with new openssl - -* Sun Oct 09 2005 Florian La Roche -- rebuild for sqlite changes - -* Thu Sep 22 2005 Paul Nasrat - 4.4.2-5 -- Actually fix context verification where matchpathcon fails (#162037) - -* Fri Aug 26 2005 Paul Nasrat - 4.4.2-4 -- Fix build with CFLAGS having --param -- Fix for context verification in /tmp (#162037) - -* Wed Jul 27 2005 Paul Nasrat - 4.4.2-3 -- popt minor version requires - -* Tue Jul 26 2005 Paul Nasrat - 4.4.2-2 -- popt minor version bump -- revert to perl.req/perl.prov for now - -* Thu Jul 21 2005 Paul Nasrat - 4.4.2-1 -- Upgrade to upstream release - -* Tue May 24 2005 Paul Nasrat - 4.4.1-21 -- Update translations (#154623) - -* Sat May 21 2005 Paul Nasrat - 4.4.1-20 -- Drop signature patch -- dangling unpackaged symlinks - -* Tue May 17 2005 Paul Nasrat - 4.4.1-19 -- Check for symlinks in check-files (#108778) -- Move zh_CN (#154623) -- Test fix for signing old rpms (#127113) - -* Wed May 04 2005 Paul Nasrat - 4.4.1-18.1 -- Fix typo -- Fix typo - -* Wed May 04 2005 Paul Nasrat - 4.4.1-18 -- Add missing fsm.c from matchpathcon patches - -* Tue May 03 2005 Paul Nasrat - 4.4.1-17 -- Fix typo - -* Tue May 03 2005 Paul Nasrat - 4.4.1-16 -- Yet more matchpathcon - -* Tue May 03 2005 Paul Nasrat - 4.4.1-15 -- Some more matchpathcon work - -* Mon May 02 2005 Paul Nasrat - 4.4.1-14 -- matchpathcon fixup - -* Mon May 02 2005 Paul Nasrat - 4.4.1-13 -- Use matchpathcon (#151870) - -* Sat Apr 30 2005 Miloslav Trmac - 4.4.1-12 -- Remove $RPM_BUILD_ROOT and $RPM_BUILD_DIR from distribued .la files (#116891) -- Don't ship static version of _rpmdb.so -- BuildRequires: readline-devel - -* Wed Apr 27 2005 Paul Nasrat - 4.4.1-11 -- Fix for (pre,postun) (#155700) -- Erase ordering - -* Wed Apr 27 2005 Jeremy Katz - 4.4.1-10 -- add patch to fix segfault with non-merged hdlists - -* Thu Mar 31 2005 Thomas Woerner 4.4.1-9 -- enabled prereqs again - -* Mon Mar 21 2005 Paul Nasrat 4.4.1-8 -- Add devel requires libselinux-devel -- Fileconflicts as FC3 (#151609) - -* Wed Mar 9 2005 Jeff Johnson 4.4.1-7 -- rebuild against renamed sqlite package (#149719). - -* Mon Mar 7 2005 Jeremy Katz - 4.4.1-6 -- fix build with new glibc - -* Mon Mar 7 2005 Jeremy Katz - 4.4.1-5 -- disable hkp by default - -* Tue Mar 1 2005 Jeremy Katz - 4.4.1-4 -- fix build with gcc 4 - -* Mon Feb 28 2005 Jeremy Katz - 4.4.1-3 -- fix posttrans callback check being backwards (#149524) - -* Sun Feb 13 2005 Jeff Johnson 4.4.1-1 -- don't classify files in /dev (#146623). -- don't build with sqlite3 if is missing. - -* Sat Feb 12 2005 Jeff Johnson 4.4.1-0.24 -- zlib: uniqify certain symbols to prevent name space pollution. -- macosx: include so that python sees the u_char typedef. -- macosx: change to --prefix=/usr rather than /opt/local. -- use waitpid rather than SIGCHLD reaper. -- rip out DB_PRIVATE revert if not NPTL, it's not the right thing to do. - -* Fri Feb 11 2005 Jeff Johnson 4.4.1-0.22 -- permit build scriptlet interpreters to be individually overridden. - -* Thu Feb 10 2005 Jeff Johnson 4.4.1-0.20 -- perform callbacks as always (#147537). - -* Wed Feb 2 2005 Jeff Johnson 4.4.1-0.16 -- fix: length of gpg V4 hash seed was incorrect (#146896). -- add support for V4 rfc-2440 signatures. - -* Mon Jan 31 2005 Jeff Johnson 4.4.1-0.14 -- add sqlite internal (build still expects external sqlite3-3.0.8). -- sqlite: revert to original narrow scoping of cOpen/cClose. - -* Fri Jan 28 2005 Jeff Johnson 4.4.1-0.12 -- python: force dbMatch() h# key to be 32 bit integer (#146477). - -* Tue Jan 25 2005 Jeff Johnson 4.4.1-0.10 -- more macosx fiddles. -- move global /var/lock/rpm/transaction to dbpath. -- permit fcntl path to be configured through rpmlock_path macro. -- add missing #if defined(ENABLE_NLS) (#146184). - -* Mon Jan 17 2005 Jeff Johnson 4.4.1-0.8 -- changes to build on Mac OS X using darwinports neon/beecrypt. -- add https://svn.uhulinux.hu/packages/dev/zlib/patches/02-rsync.patch - -* Sun Jan 9 2005 Jeff Johnson 4.4.1-0.7 -- build against external/internal neon. - -* Tue Jan 4 2005 Jeff Johnson 4.4.1-0.6 -- mac os x patches (#131943,#131944,#132924,#132926). -- mac os x patches (#133611, #133612, #134637). - -* Sun Jan 2 2005 Jeff Johnson 4.4.1-0.5 -- upgrade to db-4.3.27. -- revert MAGIC_COMPRESS, real fix is in libmagic (#143782). -- upgrade to file-4.12 internal. - -* Tue Dec 7 2004 Jeff Johnson 4.4.1-0.3 -- use package color as Obsoletes: color. - -* Mon Dec 6 2004 Jeff Johnson 4.4.1-0.2 -- automagically detect and emit "python(abi) = 2.4" dependencies. -- popt 1.10.1 to preserve newer. +* Fri Jul 11 2008 Panu Matilainen +- 4.5.90-0.git8426.5 +- flip back to external bdb +- fix tab vs spaces complaints from rpmlint +- add dep for lzma and require unzip instead of zip in build (#310694) +- add pkgconfig dependency to rpm-devel +- drop ISA-dependencies for initial introduction +- new snapshot from upstream for documentation fixes + +* Thu Jul 10 2008 Panu Matilainen +- 4.5.90-0.git8424.4 +- handle int vs external db in posttrans too + +* Wed Jul 08 2008 Panu Matilainen +- 4.5.90-0.git8424.3 +- require curl as external url helper + +* Wed Jul 08 2008 Panu Matilainen +- 4.5.90-0.git8424.2 +- add support for building with or without internal db + +* Wed Jul 08 2008 Panu Matilainen +- rpm 4.5.90-0.git8424.1 (alpha snapshot) +- adjust to build against Berkeley DB 4.5.20 from compat-db for now +- add posttrans to clean up db environment mismatch after upgrade +- forward-port devel autodeps patch + +* Tue Jul 08 2008 Panu Matilainen +- adjust for rpmdb index name change +- drop unnecessary vendor-macro patch for real +- add ISA-dependencies among rpm subpackages +- make lzma and sqlite deps conditional and disabled by default for now -* Sun Dec 5 2004 Jeff Johnson 4.4.1-0.1 -- force *.py->*.pyo byte code compilation with brp-python-bytecompile. +* Fri Feb 01 2008 Panu Matilainen +- spec largely rewritten, truncating changelog Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- sources 1 Apr 2008 08:00:59 -0000 1.130 +++ sources 11 Jul 2008 15:54:19 -0000 1.131 @@ -1 +1 @@ -b8f0661ac765ce1a2de66ca53e37af83 rpm-4.4.2.3.tar.gz +019294e156d2a3acefee118e38f65836 rpm-4.5.90.git8426.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 16:16:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:16:28 +0000 Subject: [pkgdb] guake was added for lokthare Message-ID: <200807111616.m6BGGSF6007251@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package guake with summary Drop-down terminal for GNOME Kevin Fenzi (kevin) has approved Package guake Kevin Fenzi (kevin) has added a Fedora devel branch for guake with an owner of lokthare Kevin Fenzi (kevin) has approved guake in Fedora devel Kevin Fenzi (kevin) has approved Package guake Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guake (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on guake (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guake (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/guake From fedora-extras-commits at redhat.com Fri Jul 11 16:16:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:16:29 +0000 Subject: [pkgdb] guake (Fedora, 9) updated by kevin Message-ID: <200807111616.m6BGGSF9007251@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for guake Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guake (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on guake (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guake (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on guake (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/guake From fedora-extras-commits at redhat.com Fri Jul 11 16:16:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:16:29 +0000 Subject: [pkgdb] guake (Fedora, devel) updated by kevin Message-ID: <200807111616.m6BGGSFC007251@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on guake (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/guake From fedora-extras-commits at redhat.com Fri Jul 11 16:17:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:17:24 GMT Subject: rpms/guake - New directory Message-ID: <200807111617.m6BGHOhX031055@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/guake In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ31003/rpms/guake Log Message: Directory /cvs/extras/rpms/guake added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:17:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:17:43 GMT Subject: rpms/guake/devel - New directory Message-ID: <200807111617.m6BGHh75031092@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/guake/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ31003/rpms/guake/devel Log Message: Directory /cvs/extras/rpms/guake/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:17:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:17:56 GMT Subject: rpms/guake Makefile,NONE,1.1 Message-ID: <200807111617.m6BGHuMc031127@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/guake In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ31003/rpms/guake Added Files: Makefile Log Message: Setup of module guake --- NEW FILE Makefile --- # Top level Makefile for module guake all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 11 16:18:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:18:10 +0000 Subject: [pkgdb] gfs-ambrosia-fonts was added for nim Message-ID: <200807111618.m6BGIAAq007393@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gfs-ambrosia-fonts with summary GFS Ambrosia majuscule Greek font Kevin Fenzi (kevin) has approved Package gfs-ambrosia-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for gfs-ambrosia-fonts with an owner of nim Kevin Fenzi (kevin) has approved gfs-ambrosia-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package gfs-ambrosia-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gfs-ambrosia-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gfs-ambrosia-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gfs-ambrosia-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-ambrosia-fonts From fedora-extras-commits at redhat.com Fri Jul 11 16:18:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:18:12 GMT Subject: rpms/guake/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807111618.m6BGICNR031160@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/guake/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ31003/rpms/guake/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module guake --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: guake # $Id: Makefile,v 1.1 2008/07/11 16:17:56 kevin Exp $ NAME := guake SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 11 16:18:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:18:18 +0000 Subject: [pkgdb] gfs-ambrosia-fonts (Fedora, devel) updated by kevin Message-ID: <200807111618.m6BGIAAt007393@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gfs-ambrosia-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on gfs-ambrosia-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on gfs-ambrosia-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-ambrosia-fonts From fedora-extras-commits at redhat.com Fri Jul 11 16:19:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:19:57 GMT Subject: rpms/gfs-ambrosia-fonts - New directory Message-ID: <200807111619.m6BGJv3S031316@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-ambrosia-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW31285/rpms/gfs-ambrosia-fonts Log Message: Directory /cvs/extras/rpms/gfs-ambrosia-fonts added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:20:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:20:14 GMT Subject: rpms/gfs-ambrosia-fonts/devel - New directory Message-ID: <200807111620.m6BGKENs031342@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-ambrosia-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW31285/rpms/gfs-ambrosia-fonts/devel Log Message: Directory /cvs/extras/rpms/gfs-ambrosia-fonts/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:20:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:20:26 GMT Subject: rpms/gfs-ambrosia-fonts Makefile,NONE,1.1 Message-ID: <200807111620.m6BGKQKT031369@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-ambrosia-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW31285/rpms/gfs-ambrosia-fonts Added Files: Makefile Log Message: Setup of module gfs-ambrosia-fonts --- NEW FILE Makefile --- # Top level Makefile for module gfs-ambrosia-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 11 16:20:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:20:45 GMT Subject: rpms/gfs-ambrosia-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807111620.m6BGKjDI031402@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-ambrosia-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW31285/rpms/gfs-ambrosia-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gfs-ambrosia-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gfs-ambrosia-fonts # $Id: Makefile,v 1.1 2008/07/11 16:20:26 kevin Exp $ NAME := gfs-ambrosia-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 11 16:21:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:21:39 +0000 Subject: [pkgdb] gfs-fleischman-fonts was added for nim Message-ID: <200807111621.m6BGLdNQ007643@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gfs-fleischman-fonts with summary GFS Fleischman majuscule Greek font Kevin Fenzi (kevin) has approved Package gfs-fleischman-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for gfs-fleischman-fonts with an owner of nim Kevin Fenzi (kevin) has approved gfs-fleischman-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package gfs-fleischman-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gfs-fleischman-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gfs-fleischman-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gfs-fleischman-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-fleischman-fonts From fedora-extras-commits at redhat.com Fri Jul 11 16:21:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:21:42 +0000 Subject: [pkgdb] gfs-fleischman-fonts (Fedora, devel) updated by kevin Message-ID: <200807111621.m6BGLgQf007663@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gfs-fleischman-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on gfs-fleischman-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on gfs-fleischman-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-fleischman-fonts From fedora-extras-commits at redhat.com Fri Jul 11 16:22:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:22:01 GMT Subject: rpms/gfs-fleischman-fonts - New directory Message-ID: <200807111622.m6BGM1fM031511@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-fleischman-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp31456/rpms/gfs-fleischman-fonts Log Message: Directory /cvs/extras/rpms/gfs-fleischman-fonts added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:22:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:22:14 GMT Subject: rpms/gfs-fleischman-fonts/devel - New directory Message-ID: <200807111622.m6BGMEO2031529@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-fleischman-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp31456/rpms/gfs-fleischman-fonts/devel Log Message: Directory /cvs/extras/rpms/gfs-fleischman-fonts/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:22:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:22:26 GMT Subject: rpms/gfs-fleischman-fonts Makefile,NONE,1.1 Message-ID: <200807111622.m6BGMQXS031557@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-fleischman-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp31456/rpms/gfs-fleischman-fonts Added Files: Makefile Log Message: Setup of module gfs-fleischman-fonts --- NEW FILE Makefile --- # Top level Makefile for module gfs-fleischman-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 11 16:22:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:22:39 GMT Subject: rpms/gfs-fleischman-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807111622.m6BGMd0H031574@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-fleischman-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp31456/rpms/gfs-fleischman-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gfs-fleischman-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gfs-fleischman-fonts # $Id: Makefile,v 1.1 2008/07/11 16:22:26 kevin Exp $ NAME := gfs-fleischman-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 11 16:22:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:22:46 +0000 Subject: [pkgdb] gfs-eustace-font was added for nim Message-ID: <200807111622.m6BGMkAk007816@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gfs-eustace-font with summary GFS Eustace majuscule Greek font Kevin Fenzi (kevin) has approved Package gfs-eustace-font Kevin Fenzi (kevin) has added a Fedora devel branch for gfs-eustace-font with an owner of nim Kevin Fenzi (kevin) has approved gfs-eustace-font in Fedora devel Kevin Fenzi (kevin) has approved Package gfs-eustace-font Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gfs-eustace-font (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gfs-eustace-font (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gfs-eustace-font (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-eustace-font From fedora-extras-commits at redhat.com Fri Jul 11 16:22:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:22:48 +0000 Subject: [pkgdb] gfs-eustace-font (Fedora, devel) updated by kevin Message-ID: <200807111622.m6BGMm4B007836@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gfs-eustace-font (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on gfs-eustace-font (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on gfs-eustace-font (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-eustace-font From fedora-extras-commits at redhat.com Fri Jul 11 16:23:06 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:23:06 GMT Subject: rpms/gfs-eustace-font - New directory Message-ID: <200807111623.m6BGN6TC031643@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-eustace-font In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL31611/rpms/gfs-eustace-font Log Message: Directory /cvs/extras/rpms/gfs-eustace-font added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:23:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:23:19 GMT Subject: rpms/gfs-eustace-font/devel - New directory Message-ID: <200807111623.m6BGNJX4031668@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-eustace-font/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL31611/rpms/gfs-eustace-font/devel Log Message: Directory /cvs/extras/rpms/gfs-eustace-font/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:23:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:23:33 GMT Subject: rpms/gfs-eustace-font Makefile,NONE,1.1 Message-ID: <200807111623.m6BGNXQb031694@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-eustace-font In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL31611/rpms/gfs-eustace-font Added Files: Makefile Log Message: Setup of module gfs-eustace-font --- NEW FILE Makefile --- # Top level Makefile for module gfs-eustace-font all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 11 16:23:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:23:39 +0000 Subject: [pkgdb] python-slip was added for nphilipp Message-ID: <200807111623.m6BGMkAo007816@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-slip with summary Miscellaneous convenience, extension and workaround code for Python Kevin Fenzi (kevin) has approved Package python-slip Kevin Fenzi (kevin) has added a Fedora devel branch for python-slip with an owner of nphilipp Kevin Fenzi (kevin) has approved python-slip in Fedora devel Kevin Fenzi (kevin) has approved Package python-slip Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-slip (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-slip (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-slip (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-slip From fedora-extras-commits at redhat.com Fri Jul 11 16:23:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:23:40 +0000 Subject: [pkgdb] python-slip (Fedora, devel) updated by kevin Message-ID: <200807111623.m6BGMkAr007816@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-slip (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-slip From fedora-extras-commits at redhat.com Fri Jul 11 16:23:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 16:23:40 +0000 Subject: [pkgdb] python-slip (Fedora, 9) updated by kevin Message-ID: <200807111623.m6BGNf2O008027@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-slip Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-slip (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-slip (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-slip (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-slip (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-slip From fedora-extras-commits at redhat.com Fri Jul 11 16:23:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:23:46 GMT Subject: rpms/gfs-eustace-font/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807111623.m6BGNk20031720@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-eustace-font/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL31611/rpms/gfs-eustace-font/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gfs-eustace-font --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gfs-eustace-font # $Id: Makefile,v 1.1 2008/07/11 16:23:33 kevin Exp $ NAME := gfs-eustace-font SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 11 16:24:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:24:24 GMT Subject: rpms/python-slip - New directory Message-ID: <200807111624.m6BGOOYu031791@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-slip In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31745/rpms/python-slip Log Message: Directory /cvs/extras/rpms/python-slip added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:24:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:24:45 GMT Subject: rpms/python-slip/devel - New directory Message-ID: <200807111624.m6BGOjNc031817@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-slip/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31745/rpms/python-slip/devel Log Message: Directory /cvs/extras/rpms/python-slip/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 11 16:24:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:24:57 GMT Subject: rpms/python-slip Makefile,NONE,1.1 Message-ID: <200807111624.m6BGOvd7031842@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-slip In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31745/rpms/python-slip Added Files: Makefile Log Message: Setup of module python-slip --- NEW FILE Makefile --- # Top level Makefile for module python-slip all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 11 16:25:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 16:25:15 GMT Subject: rpms/python-slip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807111625.m6BGPF6C031863@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-slip/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN31745/rpms/python-slip/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-slip --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-slip # $Id: Makefile,v 1.1 2008/07/11 16:24:58 kevin Exp $ NAME := python-slip SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 11 16:28:46 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 16:28:46 GMT Subject: rpms/python-formencode/devel .cvsignore, 1.9, 1.10 python-formencode.spec, 1.20, 1.21 sources, 1.9, 1.10 python-formencode-0.7-badurl.patch, 1.1, NONE python-formencode-pyshebang.patch, 1.1, NONE Message-ID: <200807111628.m6BGSkok032116@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-formencode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32037 Modified Files: .cvsignore python-formencode.spec sources Removed Files: python-formencode-0.7-badurl.patch python-formencode-pyshebang.patch Log Message: * Fri Jul 11 2008 Toshio Kuratomi 1.0.1-1 - Update to 1.0.1 - Fixes issue where chained_validators were silently ignored. (bz#454988) Both of our patches are fixed upstream now. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-formencode/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 18 Mar 2008 15:35:14 -0000 1.9 +++ .cvsignore 11 Jul 2008 16:27:51 -0000 1.10 @@ -1 +1 @@ -FormEncode-1.0.tar.gz +FormEncode-1.0.1.tar.gz Index: python-formencode.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-formencode/devel/python-formencode.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- python-formencode.spec 18 Mar 2008 15:35:14 -0000 1.20 +++ python-formencode.spec 11 Jul 2008 16:27:51 -0000 1.21 @@ -2,7 +2,7 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-formencode -Version: 1.0 +Version: 1.0.1 Release: 1%{?dist} Summary: HTML form validation, generation, and convertion package @@ -10,8 +10,6 @@ License: PSF URL: http://formencode.org/ Source0: http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz -Patch0: %{name}-0.7-badurl.patch -Patch1: %{name}-pyshebang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -27,8 +25,6 @@ %prep %setup -q -n FormEncode-%{version} -%patch0 -b .badurl -%patch1 -b .pyshebang %build %{__python} setup.py build @@ -36,7 +32,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean @@ -50,6 +46,11 @@ %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info %changelog +* Fri Jul 11 2008 Toshio Kuratomi 1.0.1-1 +- Update to 1.0.1 +- Fixes issue where chained_validators were silently ignored. (bz#454988) + Both of our patches are fixed upstream now. + * Tue Mar 18 2008 Luke Macken 1.0-1 - Update to 1.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-formencode/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 18 Mar 2008 15:35:14 -0000 1.9 +++ sources 11 Jul 2008 16:27:51 -0000 1.10 @@ -1 +1 @@ -de45c382e9a265a5fa0894ff65c4028e FormEncode-1.0.tar.gz +544e3fd5d9ff8bb6532e1c6f176e7a0d FormEncode-1.0.1.tar.gz --- python-formencode-0.7-badurl.patch DELETED --- --- python-formencode-pyshebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 16:37:46 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Fri, 11 Jul 2008 16:37:46 GMT Subject: rpms/nfs-utils-lib/F-9 nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch, NONE, 1.1 nfs-utils-lib.spec, 1.31, 1.32 nfs-utils-lib-1.1.1-idmapd-domain-dns.patch, 1.1, NONE Message-ID: <200807111637.m6BGbkT3032628@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils-lib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32566 Modified Files: nfs-utils-lib.spec Added Files: nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch Removed Files: nfs-utils-lib-1.1.1-idmapd-domain-dns.patch Log Message: - Stop idmapd from exiting when a valid v4 domain is not found (bz 454508) nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch: --- NEW FILE nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch --- diff -up nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c.orig nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c --- nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c.orig 2006-09-05 10:09:00.000000000 -0400 +++ nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c 2008-07-11 12:32:49.000000000 -0400 @@ -54,6 +54,10 @@ /* forward declarations */ int set_trans_method(char *); +#ifndef IDMAPD_DEFAULT_DOMAIN +#define IDMAPD_DEFAULT_DOMAIN "localdomain" +#endif + static char *default_domain; #ifndef PATH_IDMAPDCONF @@ -109,10 +113,12 @@ int nfs4_init_name_mapping(char *conffil dflt = 1; ret = domain_from_dns(&default_domain); if (ret) { - IDMAP_LOG(0, ("libnfsidmap: Unable to determine " - "a default nfsv4 domain; consider " - "specifying one in idmapd.conf\n")); - return ret; + IDMAP_LOG(1, ("libnfsidmap: Unable to determine " + "the NFSv4 domain; Using '%s' as the NFSv4 domain " + "which means UIDs will be mapped to the 'Nobody-User' " + "user defined in %s\n", + IDMAPD_DEFAULT_DOMAIN, PATH_IDMAPDCONF)); + default_domain = IDMAPD_DEFAULT_DOMAIN; } } IDMAP_LOG(1, ("libnfsidmap: using%s domain: %s\n", Index: nfs-utils-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils-lib/F-9/nfs-utils-lib.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- nfs-utils-lib.spec 10 Jul 2008 17:55:21 -0000 1.31 +++ nfs-utils-lib.spec 11 Jul 2008 16:36:54 -0000 1.32 @@ -19,7 +19,7 @@ Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz Patch00: nfs-utils-lib-1.0.8-idmap.conf.patch -Patch01: nfs-utils-lib-1.1.1-idmapd-domain-dns.patch +Patch01: nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -137,8 +137,8 @@ %changelog * Thu Jul 10 2008 Steve Dickson 1.1.1-5 -- Use the getdomainname() not the latter half of a - hostname to determine the DNS domainname. +- Stop idmapd from exiting when a valid v4 domain is + not found (bz 454508) * Fri Jun 27 2008 Steve Dickson 1.1.1-4 - In idmapd.conf, commented out 'Domain' so DNS will be --- nfs-utils-lib-1.1.1-idmapd-domain-dns.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 16:39:17 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 16:39:17 GMT Subject: rpms/python-toscawidgets/F-8 .cvsignore, 1.3, 1.4 python-toscawidgets.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807111639.m6BGdHuB000316@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-toscawidgets/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32652/F-8 Modified Files: .cvsignore python-toscawidgets.spec sources Log Message: * Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 - Update to latest release. - Fixes problem with pages being returned as text/plain. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jun 2008 15:02:21 -0000 1.3 +++ .cvsignore 11 Jul 2008 16:38:31 -0000 1.4 @@ -1 +1 @@ -ToscaWidgets-0.9.1.tar.gz +ToscaWidgets-0.9.2.tar.gz Index: python-toscawidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-8/python-toscawidgets.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-toscawidgets.spec 12 Jun 2008 15:02:21 -0000 1.2 +++ python-toscawidgets.spec 11 Jul 2008 16:38:31 -0000 1.3 @@ -4,7 +4,7 @@ %define srcname ToscaWidgets Name: python-toscawidgets -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Summary: Toolkit to help create widgets for WSGI web apps Group: Development/Languages @@ -55,6 +55,10 @@ %changelog +* Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 +- Update to latest release. +- Fixes problem with pages being returned as text/plain. + * Mon Jun 02 2008 Luke Macken - 0.9.1-1 - Update to latest release - Remove python-paste-script, python-ruledispatch, python-decorator and Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jun 2008 15:02:21 -0000 1.3 +++ sources 11 Jul 2008 16:38:31 -0000 1.4 @@ -1 +1 @@ -cd086af4b34b3ffd3cabfad9561f9b96 ToscaWidgets-0.9.1.tar.gz +94de025438868267d895dfa84350cc9c ToscaWidgets-0.9.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 16:39:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 16:39:30 GMT Subject: rpms/python-toscawidgets/EL-5 .cvsignore, 1.3, 1.4 python-toscawidgets.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807111639.m6BGdU2Y000330@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-toscawidgets/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32652/EL-5 Modified Files: .cvsignore python-toscawidgets.spec sources Log Message: * Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 - Update to latest release. - Fixes problem with pages being returned as text/plain. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jun 2008 15:02:10 -0000 1.3 +++ .cvsignore 11 Jul 2008 16:38:13 -0000 1.4 @@ -1 +1 @@ -ToscaWidgets-0.9.1.tar.gz +ToscaWidgets-0.9.2.tar.gz Index: python-toscawidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/EL-5/python-toscawidgets.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-toscawidgets.spec 12 Jun 2008 15:02:10 -0000 1.2 +++ python-toscawidgets.spec 11 Jul 2008 16:38:13 -0000 1.3 @@ -4,7 +4,7 @@ %define srcname ToscaWidgets Name: python-toscawidgets -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Summary: Toolkit to help create widgets for WSGI web apps Group: Development/Languages @@ -55,6 +55,10 @@ %changelog +* Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 +- Update to latest release. +- Fixes problem with pages being returned as text/plain. + * Mon Jun 02 2008 Luke Macken - 0.9.1-1 - Update to latest release - Remove python-paste-script, python-ruledispatch, python-decorator and Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jun 2008 15:02:10 -0000 1.3 +++ sources 11 Jul 2008 16:38:13 -0000 1.4 @@ -1 +1 @@ -cd086af4b34b3ffd3cabfad9561f9b96 ToscaWidgets-0.9.1.tar.gz +94de025438868267d895dfa84350cc9c ToscaWidgets-0.9.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 16:39:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 16:39:32 GMT Subject: rpms/python-toscawidgets/F-9 .cvsignore, 1.3, 1.4 python-toscawidgets.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807111639.m6BGdWxc000338@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-toscawidgets/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32652/F-9 Modified Files: .cvsignore python-toscawidgets.spec sources Log Message: * Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 - Update to latest release. - Fixes problem with pages being returned as text/plain. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jun 2008 15:02:22 -0000 1.3 +++ .cvsignore 11 Jul 2008 16:38:48 -0000 1.4 @@ -1 +1 @@ -ToscaWidgets-0.9.1.tar.gz +ToscaWidgets-0.9.2.tar.gz Index: python-toscawidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/python-toscawidgets.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-toscawidgets.spec 12 Jun 2008 15:02:22 -0000 1.2 +++ python-toscawidgets.spec 11 Jul 2008 16:38:48 -0000 1.3 @@ -4,7 +4,7 @@ %define srcname ToscaWidgets Name: python-toscawidgets -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Summary: Toolkit to help create widgets for WSGI web apps Group: Development/Languages @@ -55,6 +55,10 @@ %changelog +* Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 +- Update to latest release. +- Fixes problem with pages being returned as text/plain. + * Mon Jun 02 2008 Luke Macken - 0.9.1-1 - Update to latest release - Remove python-paste-script, python-ruledispatch, python-decorator and Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jun 2008 15:02:22 -0000 1.3 +++ sources 11 Jul 2008 16:38:48 -0000 1.4 @@ -1 +1 @@ -cd086af4b34b3ffd3cabfad9561f9b96 ToscaWidgets-0.9.1.tar.gz +94de025438868267d895dfa84350cc9c ToscaWidgets-0.9.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 16:44:31 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 16:44:31 GMT Subject: rpms/python-formencode/F-9 .cvsignore, 1.9, 1.10 python-formencode.spec, 1.20, 1.21 sources, 1.9, 1.10 python-formencode-0.7-badurl.patch, 1.1, NONE python-formencode-pyshebang.patch, 1.1, NONE Message-ID: <200807111644.m6BGiVZY000718@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-formencode/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv660 Modified Files: .cvsignore python-formencode.spec sources Removed Files: python-formencode-0.7-badurl.patch python-formencode-pyshebang.patch Log Message: * Fri Jul 11 2008 Toshio Kuratomi 1.0.1-1 - Update to 1.0.1 - Fixes issue where chained_validators were silently ignored. (bz#454988) Both of our patches are fixed upstream now. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-formencode/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 18 Mar 2008 15:35:14 -0000 1.9 +++ .cvsignore 11 Jul 2008 16:43:34 -0000 1.10 @@ -1 +1 @@ -FormEncode-1.0.tar.gz +FormEncode-1.0.1.tar.gz Index: python-formencode.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-formencode/F-9/python-formencode.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- python-formencode.spec 18 Mar 2008 15:35:14 -0000 1.20 +++ python-formencode.spec 11 Jul 2008 16:43:34 -0000 1.21 @@ -2,7 +2,7 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-formencode -Version: 1.0 +Version: 1.0.1 Release: 1%{?dist} Summary: HTML form validation, generation, and convertion package @@ -10,8 +10,6 @@ License: PSF URL: http://formencode.org/ Source0: http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz -Patch0: %{name}-0.7-badurl.patch -Patch1: %{name}-pyshebang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -27,8 +25,6 @@ %prep %setup -q -n FormEncode-%{version} -%patch0 -b .badurl -%patch1 -b .pyshebang %build %{__python} setup.py build @@ -36,7 +32,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean @@ -50,6 +46,11 @@ %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info %changelog +* Fri Jul 11 2008 Toshio Kuratomi 1.0.1-1 +- Update to 1.0.1 +- Fixes issue where chained_validators were silently ignored. (bz#454988) + Both of our patches are fixed upstream now. + * Tue Mar 18 2008 Luke Macken 1.0-1 - Update to 1.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-formencode/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 18 Mar 2008 15:35:14 -0000 1.9 +++ sources 11 Jul 2008 16:43:34 -0000 1.10 @@ -1 +1 @@ -de45c382e9a265a5fa0894ff65c4028e FormEncode-1.0.tar.gz +544e3fd5d9ff8bb6532e1c6f176e7a0d FormEncode-1.0.1.tar.gz --- python-formencode-0.7-badurl.patch DELETED --- --- python-formencode-pyshebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 17:02:12 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jean-Fran=C3=A7ois_Martin?= (lokthare)) Date: Fri, 11 Jul 2008 17:02:12 GMT Subject: rpms/guake/F-9 guake-0.2.2-fix_vte.patch, NONE, 1.1 guake.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807111702.m6BH2CAU008236@cvs-int.fedora.redhat.com> Author: lokthare Update of /cvs/pkgs/rpms/guake/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1592/F-9 Modified Files: .cvsignore sources Added Files: guake-0.2.2-fix_vte.patch guake.spec import.log Log Message: Initial import from src.rpm guake-0.2.2-fix_vte.patch: --- NEW FILE guake-0.2.2-fix_vte.patch --- diff -up guake-0.2.2/configure.fix_vte guake-0.2.2/configure --- guake-0.2.2/configure.fix_vte 2008-06-05 20:39:47.000000000 +0200 +++ guake-0.2.2/configure 2008-06-05 20:43:04.000000000 +0200 @@ -21596,7 +21596,7 @@ ac_pvte_result=`$PYTHON -c 'try: except Exception, e: print str(e)' 2> /dev/null` -if test -z "$ac_pvte_result"; then +if test -z ""; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else --- NEW FILE guake.spec --- Name: guake Version: 0.2.2 Release: 5%{?dist} Summary: Drop-down terminal for GNOME Group: Applications/System License: GPLv2+ URL: http://www.guake-terminal.org/ Source0: http://www.guake-terminal.org/releases/%{name}-%{version}.tar.gz Patch0: guake-0.2.2-fix_vte.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel gtk2-devel gettext desktop-file-utils perl(XML::Parser) GConf2-devel Requires: pygtk2 >= 2.10 vte notify-python pygtk2-libglade gnome-python2-gconf dbus-python Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 %description Guake is a drop-down terminal for Gnome Desktop Environment, so you just need to press a key to invoke him, and press again to hide. %prep %setup -q %patch0 -p1 -b .fix_vte %build %configure --disable-schemas-install --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" desktop-file-install --vendor="fedora" \ --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop %find_lang %{name} rm -f %{buildroot}%{_libdir}/%{name}/globalhotkeys.la %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/dbus-1/services/org.gnome.Guake.service %{_datadir}/%{name} %{_datadir}/pixmaps/%{name} %changelog * Thu Jul 10 2008 - 0.2.2-5 - Remove NEWS from the doc - Add dbus-python in Requires * Tue Jul 1 2008 - 0.2.2-4 - Add BR for GConf - Fix schemas file * Sun Jun 8 2008 Jean-Fran??ois Martin 0.2.2-3 - Don't own /etc/gconf/schemas/ - Don't replace /etc/gconf/schemas/guake.schemas config file - Remove globalhotkeys.la * Fri Jun 6 2008 Jean-Fran??ois Martin 0.2.2-2 - Fix gconf schema install - Disable static library * Wed Jun 4 2008 Jean-Fran??ois Martin 0.2.2-1 - Initial release --- NEW FILE import.log --- guake-0_2_2-5_fc9:F-9:guake-0.2.2-5.fc9.src.rpm:1215795627 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/guake/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2008 16:17:56 -0000 1.1 +++ .cvsignore 11 Jul 2008 17:01:29 -0000 1.2 @@ -0,0 +1 @@ +guake-0.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/guake/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2008 16:17:56 -0000 1.1 +++ sources 11 Jul 2008 17:01:29 -0000 1.2 @@ -0,0 +1 @@ +c9ae30a0c2cfe6798d134c7ac9913ca1 guake-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 17:04:58 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 11 Jul 2008 17:04:58 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git8.bz2.sign, NONE, 1.1 .cvsignore, 1.858, 1.859 kernel.spec, 1.751, 1.752 sources, 1.819, 1.820 upstream, 1.737, 1.738 patch-2.6.26-rc9-git7.bz2.sign, 1.1, NONE Message-ID: <200807111704.m6BH4wf4008445@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8390 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git8.bz2.sign Removed Files: patch-2.6.26-rc9-git7.bz2.sign Log Message: 2.6.26-rc9-git8 --- NEW FILE patch-2.6.26-rc9-git8.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIdwVsyGugalF9Dw4RAvSvAJ94BwYLLd3XVc213WneFFE/ws1CDACfed/P Z9TXRDKlh5xNzbl2SopCGk8= =c92J -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.858 retrieving revision 1.859 diff -u -r1.858 -r1.859 --- .cvsignore 10 Jul 2008 19:41:47 -0000 1.858 +++ .cvsignore 11 Jul 2008 17:03:58 -0000 1.859 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git7.bz2 +patch-2.6.26-rc9-git8.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.751 retrieving revision 1.752 diff -u -r1.751 -r1.752 --- kernel.spec 10 Jul 2008 19:41:47 -0000 1.751 +++ kernel.spec 11 Jul 2008 17:03:58 -0000 1.752 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 7 +%define gitrev 8 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1144,7 +1144,7 @@ #ApplyPatch linux-2.6-selinux-ecryptfs-support.patch # wireless patches headed for 2.6.26 -ApplyPatch linux-2.6-wireless.patch +#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.27 ApplyPatch linux-2.6-wireless-pending.patch @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Fri Jul 11 2008 Dave Jones +- 2.6.26-rc9-git8 + * Thu Jul 10 2008 Dave Jones - 2.6.26-rc9-git7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.819 retrieving revision 1.820 diff -u -r1.819 -r1.820 --- sources 10 Jul 2008 19:41:47 -0000 1.819 +++ sources 11 Jul 2008 17:03:58 -0000 1.820 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -5d702bd2ead3842b770cfd512ddbb69c patch-2.6.26-rc9-git7.bz2 +51efbdaeb0f9ec1ec1bcceb35701b012 patch-2.6.26-rc9-git8.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.737 retrieving revision 1.738 diff -u -r1.737 -r1.738 --- upstream 10 Jul 2008 19:41:47 -0000 1.737 +++ upstream 11 Jul 2008 17:03:58 -0000 1.738 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git7.bz2 +patch-2.6.26-rc9-git8.bz2 --- patch-2.6.26-rc9-git7.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 17:09:37 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jean-Fran=C3=A7ois_Martin?= (lokthare)) Date: Fri, 11 Jul 2008 17:09:37 GMT Subject: rpms/guake/devel guake-0.2.2-fix_vte.patch, NONE, 1.1 guake.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807111709.m6BH9bX9008689@cvs-int.fedora.redhat.com> Author: lokthare Update of /cvs/pkgs/rpms/guake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8619/devel Modified Files: .cvsignore sources Added Files: guake-0.2.2-fix_vte.patch guake.spec import.log Log Message: guake-0.2.2-fix_vte.patch: --- NEW FILE guake-0.2.2-fix_vte.patch --- diff -up guake-0.2.2/configure.fix_vte guake-0.2.2/configure --- guake-0.2.2/configure.fix_vte 2008-06-05 20:39:47.000000000 +0200 +++ guake-0.2.2/configure 2008-06-05 20:43:04.000000000 +0200 @@ -21596,7 +21596,7 @@ ac_pvte_result=`$PYTHON -c 'try: except Exception, e: print str(e)' 2> /dev/null` -if test -z "$ac_pvte_result"; then +if test -z ""; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else --- NEW FILE guake.spec --- Name: guake Version: 0.2.2 Release: 5%{?dist} Summary: Drop-down terminal for GNOME Group: Applications/System License: GPLv2+ URL: http://www.guake-terminal.org/ Source0: http://www.guake-terminal.org/releases/%{name}-%{version}.tar.gz Patch0: guake-0.2.2-fix_vte.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel gtk2-devel gettext desktop-file-utils perl(XML::Parser) GConf2-devel Requires: pygtk2 >= 2.10 vte notify-python pygtk2-libglade gnome-python2-gconf dbus-python Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 %description Guake is a drop-down terminal for Gnome Desktop Environment, so you just need to press a key to invoke him, and press again to hide. %prep %setup -q %patch0 -p1 -b .fix_vte %build %configure --disable-schemas-install --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" desktop-file-install --vendor="fedora" \ --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop %find_lang %{name} rm -f %{buildroot}%{_libdir}/%{name}/globalhotkeys.la %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/dbus-1/services/org.gnome.Guake.service %{_datadir}/%{name} %{_datadir}/pixmaps/%{name} %changelog * Thu Jul 10 2008 - 0.2.2-5 - Remove NEWS from the doc - Add dbus-python in Requires * Tue Jul 1 2008 - 0.2.2-4 - Add BR for GConf - Fix schemas file * Sun Jun 8 2008 Jean-Fran??ois Martin 0.2.2-3 - Don't own /etc/gconf/schemas/ - Don't replace /etc/gconf/schemas/guake.schemas config file - Remove globalhotkeys.la * Fri Jun 6 2008 Jean-Fran??ois Martin 0.2.2-2 - Fix gconf schema install - Disable static library * Wed Jun 4 2008 Jean-Fran??ois Martin 0.2.2-1 - Initial release --- NEW FILE import.log --- guake-0_2_2-5_fc9:HEAD:guake-0.2.2-5.fc9.src.rpm:1215796109 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/guake/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2008 16:17:56 -0000 1.1 +++ .cvsignore 11 Jul 2008 17:08:55 -0000 1.2 @@ -0,0 +1 @@ +guake-0.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/guake/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2008 16:17:56 -0000 1.1 +++ sources 11 Jul 2008 17:08:55 -0000 1.2 @@ -0,0 +1 @@ +c9ae30a0c2cfe6798d134c7ac9913ca1 guake-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 17:45:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 17:45:23 GMT Subject: devel/exaile exaile.spec,1.21,1.22 Message-ID: <200807111745.m6BHjNMK010842@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/devel/exaile In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10796 Modified Files: exaile.spec Log Message: fix license tag Index: exaile.spec =================================================================== RCS file: /cvs/pkgs/devel/exaile/exaile.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- exaile.spec 7 Jul 2008 17:22:10 -0000 1.21 +++ exaile.spec 11 Jul 2008 17:44:52 -0000 1.22 @@ -1,10 +1,10 @@ Summary: A music player Name: exaile Version: 0.2.13 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia -# It actually says GPL 1 or later version; a couple of files includes the Artistic license -License: GPL+ and Artistic +# It actually says GPL 1 or later version; one file says "Artistic/Perl", which is GPL+ or Artistic. +License: GPL+ or Artistic URL: http://www.exaile.org Source0: http://www.exaile.org/files/exaile_%{version}.tar.gz Patch0: exaile-makefile.patch @@ -91,6 +91,9 @@ %{_mandir}/man1/exaile*.* %changelog +* Fri Jul 11 2008 Tom "spot" Callaway - 0.2.13-3 +- fix license tag + * Mon Jul 07 2008 Tom "spot" Callaway - 0.2.13-2 - fix conditional comparison - add sparc64 to 64bit arch check From fedora-extras-commits at redhat.com Fri Jul 11 17:49:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 17:49:38 GMT Subject: devel/newt-perl newt-perl.spec,1.17,1.18 Message-ID: <200807111749.m6BHncLw011018@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/devel/newt-perl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957 Modified Files: newt-perl.spec Log Message: fix license tag Index: newt-perl.spec =================================================================== RCS file: /cvs/pkgs/devel/newt-perl/newt-perl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- newt-perl.spec 1 Mar 2007 09:15:28 -0000 1.17 +++ newt-perl.spec 11 Jul 2008 17:48:37 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Perl bindings for the Newt library Name: newt-perl Version: 1.08 -Release: 14 +Release: 15 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot URL: http://search.cpan.org/~amedina/Newt-1.08/ @@ -13,7 +13,7 @@ Patch4: newt-perl-1.08-lang.patch BuildRequires: newt-devel, perl, perl-devel Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") -License: GPL or Artistic +License: GPL+ or Artistic %description This package provides Perl bindings for the Newt widget @@ -52,6 +52,9 @@ %{_mandir}/man3/Newt* %changelog +* Fri Jul 11 2008 Tom "spot" Callaway 1.08-15 +- fix license tag + * Thu Mar 1 2007 Joe Orton 1.08-14 - various cleanups (Jason Tibbs, #226196) - require perl-devel From fedora-extras-commits at redhat.com Fri Jul 11 18:21:49 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 11 Jul 2008 18:21:49 GMT Subject: rpms/jd/F-9 .cvsignore, 1.264, 1.265 jd.spec, 1.301, 1.302 sources, 1.265, 1.266 Message-ID: <200807111821.m6BILnQv020067@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19937/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Jul 12 2008 Mamoru Tasaka - rev 2191 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- .cvsignore 10 Jul 2008 17:04:25 -0000 1.264 +++ .cvsignore 11 Jul 2008 18:21:02 -0000 1.265 @@ -1 +1 @@ -jd-2.0.0-svn2188_trunk.tgz +jd-2.0.0-svn2191_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- jd.spec 10 Jul 2008 17:04:25 -0000 1.301 +++ jd.spec 11 Jul 2008 18:21:02 -0000 1.302 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2188_trunk +%define strtag svn2191_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Fri Jul 11 2008 Mamoru Tasaka -- rev 2188 +* Sat Jul 12 2008 Mamoru Tasaka +- rev 2191 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- sources 10 Jul 2008 17:04:25 -0000 1.265 +++ sources 11 Jul 2008 18:21:02 -0000 1.266 @@ -1 +1 @@ -75fd43e146b2c6116bc96fa4af488b10 jd-2.0.0-svn2188_trunk.tgz +d26aee52a9e64eb3fca369cc2cb0148f jd-2.0.0-svn2191_trunk.tgz From fedora-extras-commits at redhat.com Fri Jul 11 18:22:02 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 11 Jul 2008 18:22:02 GMT Subject: rpms/jd/F-8 .cvsignore, 1.257, 1.258 jd.spec, 1.290, 1.291 sources, 1.258, 1.259 Message-ID: <200807111822.m6BIM2ng020080@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19937/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Jul 12 2008 Mamoru Tasaka - rev 2191 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- .cvsignore 10 Jul 2008 17:04:03 -0000 1.257 +++ .cvsignore 11 Jul 2008 18:20:41 -0000 1.258 @@ -1 +1 @@ -jd-2.0.0-svn2188_trunk.tgz +jd-2.0.0-svn2191_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- jd.spec 10 Jul 2008 17:04:03 -0000 1.290 +++ jd.spec 11 Jul 2008 18:20:41 -0000 1.291 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2188_trunk +%define strtag svn2191_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Fri Jul 11 2008 Mamoru Tasaka -- rev 2188 +* Sat Jul 12 2008 Mamoru Tasaka +- rev 2191 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- sources 10 Jul 2008 17:04:03 -0000 1.258 +++ sources 11 Jul 2008 18:20:41 -0000 1.259 @@ -1 +1 @@ -75fd43e146b2c6116bc96fa4af488b10 jd-2.0.0-svn2188_trunk.tgz +d26aee52a9e64eb3fca369cc2cb0148f jd-2.0.0-svn2191_trunk.tgz From fedora-extras-commits at redhat.com Fri Jul 11 18:22:08 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 11 Jul 2008 18:22:08 GMT Subject: rpms/jd/devel .cvsignore, 1.264, 1.265 jd.spec, 1.307, 1.308 sources, 1.265, 1.266 Message-ID: <200807111822.m6BIM8Kq020085@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19937/devel Modified Files: .cvsignore jd.spec sources Log Message: * Sat Jul 12 2008 Mamoru Tasaka - rev 2191 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- .cvsignore 10 Jul 2008 17:04:47 -0000 1.264 +++ .cvsignore 11 Jul 2008 18:21:19 -0000 1.265 @@ -1 +1 @@ -jd-2.0.0-svn2188_trunk.tgz +jd-2.0.0-svn2191_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- jd.spec 10 Jul 2008 17:04:47 -0000 1.307 +++ jd.spec 11 Jul 2008 18:21:19 -0000 1.308 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2188_trunk +%define strtag svn2191_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Fri Jul 11 2008 Mamoru Tasaka -- rev 2188 +* Sat Jul 12 2008 Mamoru Tasaka +- rev 2191 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- sources 10 Jul 2008 17:04:47 -0000 1.265 +++ sources 11 Jul 2008 18:21:19 -0000 1.266 @@ -1 +1 @@ -75fd43e146b2c6116bc96fa4af488b10 jd-2.0.0-svn2188_trunk.tgz +d26aee52a9e64eb3fca369cc2cb0148f jd-2.0.0-svn2191_trunk.tgz From fedora-extras-commits at redhat.com Fri Jul 11 18:34:01 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 11 Jul 2008 18:34:01 GMT Subject: rpms/pungi/devel .cvsignore, 1.51, 1.52 import.log, 1.2, 1.3 pungi.spec, 1.54, 1.55 sources, 1.52, 1.53 Message-ID: <200807111834.m6BIY1s1020817@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20782/devel Modified Files: .cvsignore import.log pungi.spec sources Log Message: Adding ability to gather debuginfo packages. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 24 Jun 2008 14:33:07 -0000 1.51 +++ .cvsignore 11 Jul 2008 18:33:08 -0000 1.52 @@ -1 +1 @@ -pungi-2.0.1.tar.bz2 +pungi-2.0.2.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 24 Jun 2008 14:33:07 -0000 1.2 +++ import.log 11 Jul 2008 18:33:09 -0000 1.3 @@ -1,2 +1,3 @@ pungi-2_0_0-1_fc9:HEAD:pungi-2.0.0-1.fc9.src.rpm:1213448247 pungi-2_0_1-1_fc9:HEAD:pungi-2.0.1-1.fc9.src.rpm:1214317926 +pungi-2_0_2-1_fc9:HEAD:pungi-2.0.2-1.fc9.src.rpm:1215801155 Index: pungi.spec =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- pungi.spec 24 Jun 2008 14:33:07 -0000 1.54 +++ pungi.spec 11 Jul 2008 18:33:09 -0000 1.55 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Summary: Distribution compose tool @@ -56,6 +56,9 @@ %changelog +* Fri Jul 11 2008 Jesse Keating 2.0.2-1 +- add ability to gather debuginfo. It is default. + * Tue Jun 24 2008 Jesse Keating - 2.0.1-1 - Take on splittree and pkgorder from anaconda. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 24 Jun 2008 14:33:07 -0000 1.52 +++ sources 11 Jul 2008 18:33:09 -0000 1.53 @@ -1 +1 @@ -432310e0ec0f68da19d5d2aba979853e pungi-2.0.1.tar.bz2 +f9d743d1c5140af3ab12a58e41ede315 pungi-2.0.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 18:47:54 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 11 Jul 2008 18:47:54 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1574,1.1575 Message-ID: <200807111847.m6BIlsWO021497@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21439 Modified Files: openoffice.org.spec Log Message: drop gdb, never worked anyway Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1574 retrieving revision 1.1575 diff -u -r1.1574 -r1.1575 --- openoffice.org.spec 11 Jul 2008 14:44:01 -0000 1.1574 +++ openoffice.org.spec 11 Jul 2008 18:47:09 -0000 1.1575 @@ -50,7 +50,7 @@ Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll Source7: redhat-registry.tar.gz Source8: redhat-langpacks.tar.gz -BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++, gdb +BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc BuildRequires: neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel @@ -1341,8 +1341,6 @@ #this can be removed when these translations are upstreamed cd transex3/prj if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then - echo bt > gdbcmds - find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \; build --dlv_switch -link --all fi deliver -link @@ -1354,8 +1352,6 @@ #rebuild un-parallel cd instsetoo_native/util if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then - echo bt > gdbcmds - find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \; build --dlv_switch -link --all fi From fedora-extras-commits at redhat.com Fri Jul 11 18:49:33 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 11 Jul 2008 18:49:33 GMT Subject: rpms/python-fedora/devel .cvsignore, 1.14, 1.15 python-fedora.spec, 1.18, 1.19 sources, 1.14, 1.15 Message-ID: <200807111849.m6BInXtb021640@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21602 Modified Files: .cvsignore python-fedora.spec sources Log Message: Update to the latest 0.3 upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 20 May 2008 00:47:50 -0000 1.14 +++ .cvsignore 11 Jul 2008 18:48:40 -0000 1.15 @@ -1 +0,0 @@ -python-fedora-0.2.99.11.1.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- python-fedora.spec 20 May 2008 00:47:50 -0000 1.18 +++ python-fedora.spec 11 Jul 2008 18:48:40 -0000 1.19 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.2.99.11.1 +Version: 0.3 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -49,6 +49,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 02 2008 Luke Macken - 0.3-1 +- New upstream release. + * Wed Apr 23 2008 Toshio Kuratomi - 0.2.99.11.1-1 - Fix a crasher bug. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 May 2008 00:47:50 -0000 1.14 +++ sources 11 Jul 2008 18:48:40 -0000 1.15 @@ -1 +0,0 @@ -ba500610a05a4a450e3c5db4f8074848 python-fedora-0.2.99.11.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 19:07:44 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Fri, 11 Jul 2008 19:07:44 GMT Subject: rpms/kernel/F-8 config-generic, 1.72, 1.73 kernel.spec, 1.492, 1.493 linux-2.6-wireless-fixups.patch, 1.6, 1.7 linux-2.6-wireless-pending.patch, 1.52, 1.53 linux-2.6-wireless.patch, 1.47, 1.48 Message-ID: <200807111907.m6BJ7ibA028775@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28683 Modified Files: config-generic kernel.spec linux-2.6-wireless-fixups.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-07-09 ; Upstream wireless updates from 2008-07-08 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- config-generic 7 Jul 2008 21:46:02 -0000 1.72 +++ config-generic 11 Jul 2008 19:06:48 -0000 1.73 @@ -1319,6 +1319,7 @@ CONFIG_IWL5000=y CONFIG_IWL5000_RUN_TIME_CALIB=y CONFIG_IWL3945=m +CONFIG_IWL3945_RFKILL=y CONFIG_IWL3945_DEBUG=y CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y CONFIG_IWL3945_QOS=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.492 retrieving revision 1.493 diff -u -r1.492 -r1.493 --- kernel.spec 10 Jul 2008 16:17:57 -0000 1.492 +++ kernel.spec 11 Jul 2008 19:06:48 -0000 1.493 @@ -1836,6 +1836,12 @@ %changelog +* Thu Jul 10 2008 John W. Linville 2.6.25.10-53 +- Upstream wireless fixes from 2008-07-09 + (http://marc.info/?l=linux-netdev&m=121563769208664&w=2) +- Upstream wireless updates from 2008-07-08 + (http://marc.info/?l=linux-wireless&m=121554411325041&w=2) + * Wed Jul 09 2008 Chuck Ebbert 2.6.25.10-52 - libata: don't let ata_piix driver attach to ICH6M in ahci mode (F9#430916) linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-fixups.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-wireless-fixups.patch 4 Jul 2008 20:48:49 -0000 1.6 +++ linux-2.6-wireless-fixups.patch 11 Jul 2008 19:06:48 -0000 1.7 @@ -1,6 +1,6 @@ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-10 13:57:45.000000000 -0400 @@ -3659,7 +3659,7 @@ void mpi_receive_802_11 (struct airo_inf ptr += hdrlen; if (hdrlen == 24) @@ -208,8 +208,8 @@ return 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-10 13:57:45.000000000 -0400 @@ -58,6 +58,10 @@ #include "reg.h" #include "debug.h" @@ -234,8 +234,8 @@ pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-10 13:57:45.000000000 -0400 @@ -967,6 +967,22 @@ static inline bool __b43_warn_on_dummy(b # define B43_WARN_ON(x) __b43_warn_on_dummy(unlikely(!!(x))) #endif @@ -260,8 +260,8 @@ #define INT_TO_Q52(i) ((i) << 2) /* Convert a Q5.2 value to an integer (precision loss!) */ diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-10 13:57:45.000000000 -0400 @@ -823,6 +823,23 @@ void b43legacydbg(struct b43legacy_wl *w # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0) #endif /* DEBUG */ @@ -287,8 +287,8 @@ #define Q52_FMT "%u.%u" #define Q52_ARG(q52) ((q52) / 4), (((q52) & 3) * 100 / 4) diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-10 13:57:45.000000000 -0400 @@ -846,10 +846,10 @@ static void handle_irq_noise(struct b43l /* Get the noise samples. */ B43legacy_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -314,8 +314,8 @@ iv = (const struct b43legacy_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-10 13:57:45.000000000 -0400 @@ -1088,7 +1088,7 @@ static void b43legacy_phy_initg(struct b * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -373,8 +373,8 @@ return 0; } diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-10 13:57:45.000000000 -0400 @@ -357,7 +357,7 @@ void b43legacy_nrssi_hw_update(struct b4 for (i = 0; i < 64; i++) { tmp = b43legacy_nrssi_hw_read(dev, i); @@ -430,8 +430,8 @@ pamp = b43legacy_get_txgain_freq_power_amp(txpower); pamp <<= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-10 13:57:45.000000000 -0400 @@ -199,7 +199,7 @@ static void lo_measure_txctl_values(stru if (lb_gain > 10) { radio_pctl_reg = 0; @@ -451,8 +451,8 @@ if (phy->pga_gain >= 5) { phy->pga_gain -= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-10 13:57:45.000000000 -0400 @@ -1211,10 +1211,10 @@ static void handle_irq_noise(struct b43_ /* Get the noise samples. */ B43_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -478,8 +478,8 @@ iv = (const struct b43_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-10 13:57:45.000000000 -0400 @@ -1400,7 +1400,7 @@ static void b43_phy_initg(struct b43_wld * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -580,8 +580,8 @@ tmp_u16 = b43_phy_read(dev, 0x048A) & 0xF000; tmp_u16 |= ((u32) b & 0x0000003F); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-01 14:22:15.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-10 13:57:45.000000000 -0400 @@ -556,36 +556,40 @@ static void iwl3945_add_radiotap(struct iwl3945_rt->rt_hdr.it_pad = 0; @@ -638,8 +638,8 @@ if (rate == -1) diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c ---- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-01 14:22:16.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-10 14:00:03.000000000 -0400 @@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de if (*bytesleft >= sizeof(beaconsize)) { @@ -649,9 +649,23 @@ *bytesleft -= sizeof(beaconsize); *pbeaconinfo += sizeof(beaconsize); } +@@ -567,11 +567,11 @@ static int lbs_process_bss(struct bss_de + pos += 8; + + /* beacon interval is 2 bytes long */ +- bss->beaconperiod = get_unaligned_le16(pos); ++ bss->beaconperiod = le16_to_cpup((void *) pos); + pos += 2; + + /* capability information is 2 bytes long */ +- bss->capability = get_unaligned_le16(pos); ++ bss->capability = le16_to_cpup((void *) pos); + lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability); + pos += 2; + diff -up linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c ---- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-01 14:22:16.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-10 13:57:45.000000000 -0400 @@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo hwsim_radios[i] = hw; @@ -673,9 +687,9 @@ SET_IEEE80211_DEV(hw, data->dev); addr[3] = i >> 8; diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-01 14:22:16.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-01 14:24:27.000000000 -0400 -@@ -556,11 +556,11 @@ static void handle_rx_packet(struct zd_u +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-10 13:57:46.000000000 -0400 +@@ -557,11 +557,11 @@ static void handle_rx_packet(struct zd_u * be padded. Unaligned access might also happen if the length_info * structure is not present. */ @@ -690,8 +704,8 @@ return; n = l+k; diff -up linux-2.6.25.noarch/include/linux/input.h.orig linux-2.6.25.noarch/include/linux/input.h ---- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-01 14:23:01.000000000 -0400 -+++ linux-2.6.25.noarch/include/linux/input.h 2008-07-01 14:23:41.000000000 -0400 +--- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/include/linux/input.h 2008-07-10 13:57:46.000000000 -0400 @@ -638,6 +638,7 @@ struct input_absinfo { #define SW_TABLET_MODE 0x01 /* set = tablet mode */ #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ @@ -701,8 +715,8 @@ #define SW_CNT (SW_MAX+1) diff -up linux-2.6.25.noarch/net/mac80211/iface.c.orig linux-2.6.25.noarch/net/mac80211/iface.c ---- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-10 13:57:46.000000000 -0400 @@ -53,15 +53,6 @@ int ieee80211_if_add(struct net_device * if (!ndev) return -ENOMEM; @@ -720,8 +734,8 @@ if (ret < 0) goto fail; diff -up linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c ---- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-10 13:57:46.000000000 -0400 @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq { if (ae) @@ -732,12 +746,12 @@ /* HWMP IE processing macros */ diff -up linux-2.6.25.noarch/net/mac80211/michael.c.orig linux-2.6.25.noarch/net/mac80211/michael.c ---- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-01 14:24:27.000000000 -0400 -@@ -29,17 +29,16 @@ static void michael_block(struct michael - static void michael_mic_hdr(struct michael_mic_ctx *mctx, - const u8 *key, const u8 *da, const u8 *sa, u8 priority) - { +--- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-10 13:57:46.000000000 -0400 +@@ -39,17 +39,16 @@ static void michael_mic_hdr(struct micha + else + tid = 0; + - mctx->l = get_unaligned_le32(key); - mctx->r = get_unaligned_le32(key + 4); + mctx->l = key[0] | key[1] << 8 | key[2] << 16 | key[3] << 24; @@ -754,10 +768,10 @@ + michael_block(mctx, da[0] | da[1] << 8 | da[2] << 16 | da[3] << 24); + michael_block(mctx, da[4] | da[5] << 8 | sa[0] << 16 | sa[1] << 24); + michael_block(mctx, sa[2] | sa[3] << 8 | sa[4] << 16 | sa[5] << 24); - michael_block(mctx, priority); + michael_block(mctx, tid); } -@@ -57,7 +56,9 @@ void michael_mic(const u8 *key, const u8 +@@ -67,7 +66,9 @@ void michael_mic(const u8 *key, struct i left = data_len % 4; for (block = 0; block < blocks; block++) @@ -768,7 +782,7 @@ /* Partial block of 0..3 bytes and padding: 0x5a + 4..7 zeros to make * total length a multiple of 4. */ -@@ -71,6 +72,12 @@ void michael_mic(const u8 *key, const u8 +@@ -81,6 +82,12 @@ void michael_mic(const u8 *key, struct i michael_block(&mctx, val); michael_block(&mctx, 0); @@ -784,8 +798,8 @@ + mic[7] = (mctx.r >> 24) & 0xff; } diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-10 13:57:40.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-10 13:57:46.000000000 -0400 @@ -7,22 +7,23 @@ * published by the Free Software Foundation. */ @@ -989,9 +1003,40 @@ } + + +diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-10 13:57:46.000000000 -0400 +@@ -317,11 +317,13 @@ static void ccmp_special_blocks(struct s + memcpy(&b_0[2], hdr->addr2, ETH_ALEN); + memcpy(&b_0[8], pn, CCMP_PN_LEN); + /* l(m) */ +- put_unaligned_be16(data_len, &b_0[14]); ++ b_0[14] = (data_len >> 8) & 0xff; ++ b_0[15] = data_len & 0xff; + + /* AAD (extra authenticate-only data) / masked 802.11 header + * FC | A1 | A2 | A3 | SC | [A4] | [QC] */ +- put_unaligned_be16(len_a, &aad[0]); ++ aad[0] = 0; /* (len_a >> 8) & 0xff; */ ++ aad[1] = len_a & 0xff; + put_unaligned(mask_fc, (__le16 *)&aad[2]); + memcpy(&aad[4], &hdr->addr1, 3 * ETH_ALEN); + +diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-10 13:57:46.000000000 -0400 +@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil + struct net *net; + + sk = sock->sk; +- net = sock_net(sk); ++ net = sk->sk_net; + + if (sock->ops->compat_ioctl) + ret = sock->ops->compat_ioctl(sock, cmd, arg); diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-10 13:57:46.000000000 -0400 @@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_ /* Ignore nop renames */ @@ -1009,8 +1054,8 @@ } diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-10 13:57:46.000000000 -0400 @@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -1052,8 +1097,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-01 14:22:17.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 14:24:27.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-10 13:57:41.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-10 13:57:46.000000000 -0400 @@ -1299,7 +1299,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; @@ -1063,15 +1108,3 @@ return; skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); -diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-04-16 22:49:44.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.000000000 -0400 -@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil - struct net *net; - - sk = sock->sk; -- net = sock_net(sk); -+ net = sk->sk_net; - - if (sock->ops->compat_ioctl) - ret = sock->ops->compat_ioctl(sock, cmd, arg); linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.52 -r 1.53 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- linux-2.6-wireless-pending.patch 8 Jul 2008 17:52:51 -0000 1.52 +++ linux-2.6-wireless-pending.patch 11 Jul 2008 19:06:48 -0000 1.53 @@ -1,3 +1,541 @@ +commit b46372710ab536c0967f76be5dc41341583d4a54 +Author: Julius Volz +Date: Tue Jul 8 14:02:19 2008 +0200 + + net/wireless/nl80211.c: fix endless Netlink callback loop. + + Although I only tested similar code (I don't use any of this wireless + code), the state maintainance between Netlink dump callback invocations + seems wrong here and should lead to an endless loop. There are also other + examples in the same file which might have the same problem. Perhaps someone + can actually test this (or refute my logic). + + Take the simple example with only one element in the list (which should fit + into the message): + + 1. invocation: + Start: + idx = 0, start = 0 + Loop: + condition (++idx < start) => (1 < 0) => false + => no continue, fill one entry, exit loop, return skb->len > 0 + + 2. invocation: + Start: + idx = 0, start = 1 + Loop: + condition (++idx < start) => (1 < 1) => false + => no continue, fill the same entry again, exit loop, return skb->len > 0 + + 3. invocation: + Same as 2. invocation, endless invocation of callback. + + Also, iterations where the filling of an element fails should not be counted as + completed, so idx should not be incremented in this case. + + Signed-off-by: Julius Volz + Signed-off-by: John W. Linville + +commit 0e25b4ef220f6ef4eed120543182385b13005db9 +Author: Larry Finger +Date: Tue Jul 8 09:43:43 2008 -0500 + + rtl8187: Change detection of RTL8187B with USB ID of 8187 + + Some early versions of RTL8187B devices have a USB ID of 0x8187 + rather than the 0x8189 of later models. In addition, it appears + that these early units also must be programmed with lower power. + Previous patches used the Product ID string to detect this situation, + but did not address the low power question. This patch uses the + hardware version and sets the power accordingly. + + Signed-off-by: Hin-Tak Leung + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 5c036b217a1fe3ae0616e9c43c6bcd13b3c134b6 +Author: Hin-Tak Leung +Date: Tue Jul 8 12:38:02 2008 +0100 + + rtl8187: updating Kconfig to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 6f7853f3cbe457067e9fe05461f56c7ea4ac488c +Author: Hin-Tak Leung +Date: Tue Jul 8 12:36:04 2008 +0100 + + rtl8187: change rtl8187_dev.c to support RTL8187B (part 2) + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit f8a08c34265b59710a8fc049911f487477c19fab +Author: Hin-Tak Leung +Date: Tue Jul 8 12:33:34 2008 +0100 + + rtl8187: change rtl8187_dev.c to support RTL8187B (part 1) + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit e7d414ff21a7e0b00295e838c004ff1de5fba6ce +Author: Hin-Tak Leung +Date: Tue Jul 8 12:31:57 2008 +0100 + + rtl8187: updating rtl8187_rtl8225.c to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit d1e11af51657d18222bef9cc15591f8c0f289186 +Author: Hin-Tak Leung +Date: Tue Jul 8 12:30:02 2008 +0100 + + rtl8187: updating rtl818x.h to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit c44ac0b9855c62b5ec8af5935124cfbe6654a32d +Author: Hin-Tak Leung +Date: Tue Jul 8 12:27:54 2008 +0100 + + rtl8187: updating rtl8187.h to support RTL8187B + + Signed-off-by: Larry Finger + Signed-off-by: Herton Ronaldo Krzesinski + Signed-off-by: Hin-Tak Leung + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 84263b0c94431e686552a322ae84678fddd22ebd +Author: Ivo van Doorn +Date: Sun Jul 6 17:09:48 2008 +0200 + + rt2x00: Fix register comments + + Fix some register documentation in the register header files. + This allows better parsing by userspace scripts which in turn + helps debugging. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 0ac2a00c1035c749b720c4d817beea1795f02d47 +Author: Pavel Roskin +Date: Sun Jul 6 09:12:30 2008 -0400 + + hostap: don't compile prism2_suspend() for hostap_pci without CONFIG_PM + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 70197ede33134725f3e2e606fcabc28b0a4549a3 +Author: Larry Finger +Date: Fri Jul 4 08:39:01 2008 -0500 + + b43legacy: Remove switch statement with 64-bit index + + The gcc 3.4 fork used to compile the MN10300 port emits unwanted + __ucmpdi2() calls for switch statements that use a 64bit value. + + This patch removes such a switch from b43legacy, and makes the code + more like that used in b43. Thanks to Adrian Bunk + for reporting the problem. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit ae73e58ea64f121b26437a10937330e77ff48f33 +Author: Ivo van Doorn +Date: Fri Jul 4 16:14:59 2008 +0200 + + rt2x00: Report RX end time for rt2400pci + + rt2400 is the only currently available rt2x00 driver which + supports reporting of the RX end time for frames. + Since mac80211 uses this information for IBSS syncing, it + is important that it is being reported. + + v2: Complement 32 bits of RX timestamp with upper 32bits from TSF + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 8e260c22238dd8b57aefb1f5e4bd114486a9c17d +Author: Ivo van Doorn +Date: Fri Jul 4 13:41:31 2008 +0200 + + rt2x00: Use ieee80211_hw->workqueue again + + Remove the rt2x00 singlethreaded workqueue and move + the link tuner and packet filter scheduled work to + the ieee80211_hw->workqueue again. + The only exception is the interface scheduled work [...11262 lines suppressed...] list_for_each_entry(rfkill, &rfkill_list, node) { if ((!rfkill->user_claim) && (rfkill->type == type)) @@ -77781,7 +81243,7 @@ static ssize_t rfkill_name_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -109,31 +284,31 @@ static ssize_t rfkill_name_show(struct d +@@ -109,31 +286,31 @@ static ssize_t rfkill_name_show(struct d return sprintf(buf, "%s\n", rfkill->name); } @@ -77817,19 +81279,19 @@ BUG(); } +} -+ + +- return sprintf(buf, "%s\n", type); +static ssize_t rfkill_type_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct rfkill *rfkill = to_rfkill(dev); - -- return sprintf(buf, "%s\n", type); ++ + return sprintf(buf, "%s\n", rfkill_get_type_str(rfkill->type)); } static ssize_t rfkill_state_show(struct device *dev, -@@ -142,6 +317,7 @@ static ssize_t rfkill_state_show(struct +@@ -142,6 +319,7 @@ static ssize_t rfkill_state_show(struct { struct rfkill *rfkill = to_rfkill(dev); @@ -77837,7 +81299,7 @@ return sprintf(buf, "%d\n", rfkill->state); } -@@ -156,10 +332,14 @@ static ssize_t rfkill_state_store(struct +@@ -156,10 +334,14 @@ static ssize_t rfkill_state_store(struct if (!capable(CAP_NET_ADMIN)) return -EPERM; @@ -77854,7 +81316,7 @@ mutex_unlock(&rfkill->mutex); return error ? error : count; -@@ -200,7 +380,8 @@ static ssize_t rfkill_claim_store(struct +@@ -200,7 +382,8 @@ static ssize_t rfkill_claim_store(struct if (rfkill->user_claim != claim) { if (!claim) rfkill_toggle_radio(rfkill, @@ -77864,7 +81326,7 @@ rfkill->user_claim = claim; } -@@ -233,12 +414,12 @@ static int rfkill_suspend(struct device +@@ -233,12 +416,12 @@ static int rfkill_suspend(struct device if (dev->power.power_state.event != state.event) { if (state.event & PM_EVENT_SLEEP) { @@ -77882,7 +81344,7 @@ mutex_unlock(&rfkill->mutex); } -@@ -255,8 +436,8 @@ static int rfkill_resume(struct device * +@@ -255,8 +438,8 @@ static int rfkill_resume(struct device * if (dev->power.power_state.event != PM_EVENT_ON) { mutex_lock(&rfkill->mutex); @@ -77893,7 +81355,7 @@ mutex_unlock(&rfkill->mutex); } -@@ -269,12 +450,51 @@ static int rfkill_resume(struct device * +@@ -269,34 +452,71 @@ static int rfkill_resume(struct device * #define rfkill_resume NULL #endif @@ -77945,16 +81407,25 @@ }; static int rfkill_add_switch(struct rfkill *rfkill) -@@ -283,7 +503,7 @@ static int rfkill_add_switch(struct rfki - + { +- int error; +- mutex_lock(&rfkill_mutex); - error = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type]); -+ error = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type], 0); - if (!error) - list_add_tail(&rfkill->node, &rfkill_list); +- if (!error) +- list_add_tail(&rfkill->node, &rfkill_list); ++ rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type], 0); ++ ++ list_add_tail(&rfkill->node, &rfkill_list); + + mutex_unlock(&rfkill_mutex); -@@ -296,7 +516,7 @@ static void rfkill_remove_switch(struct +- return error; ++ return 0; + } + + static void rfkill_remove_switch(struct rfkill *rfkill) { mutex_lock(&rfkill_mutex); list_del_init(&rfkill->node); @@ -78003,8 +81474,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-09 10:52:43.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -78162,8 +81633,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-09 10:52:43.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -78172,8 +81643,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-09 10:52:43.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -78203,8 +81674,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-08 13:06:47.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-09 10:52:43.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -78267,9 +81738,29 @@ } /* exported functions */ +diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-09 10:42:31.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-09 10:52:48.000000000 -0400 +@@ -198,12 +198,14 @@ static int nl80211_dump_wiphy(struct sk_ + + mutex_lock(&cfg80211_drv_mutex); + list_for_each_entry(dev, &cfg80211_drv_list, list) { +- if (++idx < start) ++ if (++idx <= start) + continue; + if (nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).pid, + cb->nlh->nlmsg_seq, NLM_F_MULTI, +- dev) < 0) ++ dev) < 0) { ++ idx--; + break; ++ } + } + mutex_unlock(&cfg80211_drv_mutex); + diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-08 13:06:16.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-09 10:52:43.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -78311,8 +81802,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-08 13:06:47.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-08 13:08:57.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-09 10:52:27.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-09 10:52:43.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.47 -r 1.48 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- linux-2.6-wireless.patch 8 Jul 2008 17:52:51 -0000 1.47 +++ linux-2.6-wireless.patch 11 Jul 2008 19:06:48 -0000 1.48 @@ -1,3 +1,62 @@ +commit 814feefa859a736d29d0700d49debf13904b429f +Author: Ihar Hrachyshka +Date: Wed Jul 9 09:29:58 2008 +0300 + + libertas: fix memory alignment problems on the blackfin + + Fixing unaligned memory access on the blackfin architecture. + + Signed-off-by: Ihar Hrachyshka + Signed-off-by: John W. Linville + +commit 86229f0c7b4e065f51b5572a8a61801e281740a0 +Author: Luis Carlos Cobo +Date: Tue Jul 8 16:19:21 2008 +0200 + + zd1211rw: stop beacons on remove_interface + + If a mesh or ad-hoc interface is brought up and later it is replaced + by managed interface, the managed interface will keep transmitting + the beacons that were configured for the former interface. This patch + fixes that behaviour. + + Signed-off-by: John W. Linville + +commit 1f90916264049a7d9e6106fd60d289c9a775d24f +Author: Ivo van Doorn +Date: Tue Jul 8 13:45:20 2008 +0200 + + rt2x00: Disable synchronization during initialization + + As soon as init_registers() was called, the rt2400/rt2500 + would start raising beacondone interrupts. Since this is highly + premature since no beacons were provided yet, we should + initialize the synchronization register to 0. + + This will make all drivers initialize it to 0 regardless + if they are raising beacondone interrupts or not, since it only + makes sense to have it completely disabled. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit adeed48090fc370afa0db8d007748ee72a40b578 +Author: Mattias Nissler +Date: Mon Jul 7 23:08:19 2008 +0200 + + rc80211_pid: Fix fast_start parameter handling + + This removes the fast_start parameter from the rc_pid parameters + information and instead uses the parameter macro when initializing + the rc_pid state. Since the parameter is only used on initialization, + there is no point of making exporting it via debugfs. This also fixes + uninitialized memory references to the fast_start and norm_offset + parameters detected by the kmemcheck utility. Thanks to Vegard Nossum + for reporting the bug. + + Signed-off-by: Mattias Nissler + Signed-off-by: John W. Linville + commit 6e43829bb69bf1d584a592075f1357590eb49b1a Author: Vladimir Koutny Date: Mon Jul 7 14:23:01 2008 +0200 @@ -9356,8 +9415,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-10 13:43:33.000000000 -0400 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -9555,8 +9614,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h ---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-10 13:43:33.000000000 -0400 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -9644,8 +9703,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-10 13:43:33.000000000 -0400 @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; @@ -9900,8 +9959,8 @@ /* diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-10 13:43:33.000000000 -0400 @@ -30,7 +30,6 @@ #include @@ -10251,8 +10310,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-10 13:43:33.000000000 -0400 @@ -58,10 +58,6 @@ #include "reg.h" #include "debug.h" @@ -11306,8 +11365,8 @@ memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats)); diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-10 13:43:33.000000000 -0400 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -11353,8 +11412,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-10 13:43:33.000000000 -0400 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -11529,8 +11588,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-10 13:43:33.000000000 -0400 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -11615,8 +11674,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-10 13:43:33.000000000 -0400 @@ -1,4 +1,4 @@ - /* +/* @@ -13211,8 +13270,8 @@ /****************\ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-10 13:43:33.000000000 -0400 @@ -173,7 +173,10 @@ struct ath5k_eeprom_info { * (rX: reserved fields possibily used by future versions of the ar5k chipset) */ @@ -13414,8 +13473,8 @@ */ diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-08 13:06:19.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-08 13:06:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-10 13:43:10.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-10 13:43:33.000000000 -0400 @@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini { AR5K_PHY(644), 0x00806333 }, { AR5K_PHY(645), 0x00106c10 }, @@ -13938,8 +13997,8 @@ } diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-08 13:06:46.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-10 13:43:33.000000000 -0400 [...4475 lines suppressed...] #include #include @@ -125839,8 +126082,8 @@ #endif /* STA_INFO_H */ diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-10 13:43:34.000000000 -0400 @@ -12,7 +12,7 @@ #include @@ -125938,8 +126181,8 @@ tkip_mixing_phase2(key->u.tkip.p1k_rx[queue], diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h ---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-10 13:43:34.000000000 -0400 @@ -11,7 +11,7 @@ #include @@ -125959,8 +126202,8 @@ #endif /* TKIP_H */ diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c ---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-10 13:43:34.000000000 -0400 @@ -25,11 +25,12 @@ #include @@ -127415,8 +127658,8 @@ return skb; } diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c ---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-10 13:43:34.000000000 -0400 @@ -25,7 +25,8 @@ #include @@ -127735,8 +127978,8 @@ -EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); +EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c ---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-10 13:43:34.000000000 -0400 @@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -127827,8 +128070,8 @@ + return TX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h ---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-10 13:43:34.000000000 -0400 @@ -14,7 +14,7 @@ #include #include @@ -127853,8 +128096,8 @@ #endif /* WEP_H */ diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-08 13:06:47.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-10 13:43:34.000000000 -0400 @@ -0,0 +1,1171 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -129028,8 +129271,8 @@ + .get_wireless_stats = ieee80211_get_wireless_stats, +}; diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-10 13:43:34.000000000 -0400 @@ -19,10 +19,13 @@ #include "wme.h" @@ -129239,8 +129482,8 @@ + } +} diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-10 13:43:34.000000000 -0400 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -129286,8 +129529,8 @@ { return 0; diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-10 13:43:34.000000000 -0400 @@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const } @@ -129667,8 +129910,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h ---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-10 13:43:34.000000000 -0400 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -129702,8 +129945,8 @@ #endif /* WPA_H */ diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-10 13:43:34.000000000 -0400 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -129753,8 +129996,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h ---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-10 13:43:34.000000000 -0400 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -129764,8 +130007,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile ---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-10 13:43:34.000000000 -0400 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -129774,8 +130017,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c ---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-10 13:43:34.000000000 -0400 @@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 }, [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, @@ -130466,8 +130709,8 @@ /* multicast groups */ diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-08 13:06:47.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-10 13:43:34.000000000 -0400 @@ -0,0 +1,180 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -130650,8 +130893,8 @@ + handle_band(wiphy->bands[band], rd); +} diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c ---- /dev/null 2008-07-08 08:02:22.375004777 -0400 -+++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-08 13:06:47.000000000 -0400 +--- /dev/null 2008-07-10 09:23:32.996002867 -0400 ++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-10 13:43:34.000000000 -0400 @@ -0,0 +1,121 @@ +/* + * Wireless utility functions @@ -130775,8 +131018,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-08 13:06:20.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-08 13:06:47.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-10 13:43:11.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-10 13:43:34.000000000 -0400 @@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; From fedora-extras-commits at redhat.com Fri Jul 11 19:10:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:10:28 +0000 Subject: [pkgdb] jakarta-commons-logging had acl change status Message-ID: <200807111910.m6BJASpP013412@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the watchcommits acl on jakarta-commons-logging (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging From fedora-extras-commits at redhat.com Fri Jul 11 19:10:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:10:28 +0000 Subject: [pkgdb] jakarta-commons-logging had acl change status Message-ID: <200807111910.m6BJATTa013413@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the commit acl on jakarta-commons-logging (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging From fedora-extras-commits at redhat.com Fri Jul 11 19:10:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:10:28 +0000 Subject: [pkgdb] jakarta-commons-logging had acl change status Message-ID: <200807111910.m6BJATTd013413@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the watchbugzilla acl on jakarta-commons-logging (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging From fedora-extras-commits at redhat.com Fri Jul 11 19:10:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:10:59 +0000 Subject: [pkgdb] jsch had acl change status Message-ID: <200807111910.m6BJASpS013412@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the watchbugzilla acl on jsch (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jsch From fedora-extras-commits at redhat.com Fri Jul 11 19:11:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:11:00 +0000 Subject: [pkgdb] jsch had acl change status Message-ID: <200807111911.m6BJB02S013500@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the watchcommits acl on jsch (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jsch From fedora-extras-commits at redhat.com Fri Jul 11 19:11:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:11:02 +0000 Subject: [pkgdb] jsch had acl change status Message-ID: <200807111911.m6BJASpV013412@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the commit acl on jsch (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jsch From fedora-extras-commits at redhat.com Fri Jul 11 19:11:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:11:24 +0000 Subject: [pkgdb] lucene had acl change status Message-ID: <200807111911.m6BJBO1T013562@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the commit acl on lucene (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lucene From fedora-extras-commits at redhat.com Fri Jul 11 19:15:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 19:15:05 GMT Subject: rpms/perl-Crypt-CBC/devel .cvsignore, 1.5, 1.6 perl-Crypt-CBC.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200807111915.m6BJF5Tt029013@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28965 Modified Files: .cvsignore perl-Crypt-CBC.spec sources Log Message: update to 2.29, fix license Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-CBC/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Feb 2007 13:25:32 -0000 1.5 +++ .cvsignore 11 Jul 2008 19:14:05 -0000 1.6 @@ -1 +1 @@ -Crypt-CBC-2.22.tar.gz +Crypt-CBC-2.29.tar.gz Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-CBC/devel/perl-Crypt-CBC.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Crypt-CBC.spec 4 Mar 2008 02:43:11 -0000 1.8 +++ perl-Crypt-CBC.spec 11 Jul 2008 19:14:05 -0000 1.9 @@ -1,8 +1,10 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC -Version: 2.22 -Release: 3%{?dist} -License: Artistic +Version: 2.29 +Release: 1%{?dist} +# Upstream confirms that they're under the same license as perl. +# Wording in CBC.pm is less than clear, but still. +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-CBC/ Source0: http://search.cpan.org/CPAN/authors/id/L/LD/LDS/Crypt-CBC-%{version}.tar.gz @@ -46,6 +48,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 11 2008 Tom "spot" Callawau - 2.29-1 +- update to 2.29 + * Mon Mar 3 2008 Tom "spot" Callaway - 2.22-3 - work around buildsystem burp Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-CBC/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Feb 2007 13:25:32 -0000 1.5 +++ sources 11 Jul 2008 19:14:05 -0000 1.6 @@ -1 +1 @@ -02622a5f0e70c1bc45c8db7985606643 Crypt-CBC-2.22.tar.gz +87ed0ae7489bd79fcb0da50d110cc1fb Crypt-CBC-2.29.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 19:21:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 19:21:26 GMT Subject: devel/perl-HTML-FormatText-WithLinks perl-HTML-FormatText-WithLinks.spec, 1.7, 1.8 Message-ID: <200807111921.m6BJLQmw029313@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/devel/perl-HTML-FormatText-WithLinks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29259 Modified Files: perl-HTML-FormatText-WithLinks.spec Log Message: fix license tag Index: perl-HTML-FormatText-WithLinks.spec =================================================================== RCS file: /cvs/pkgs/devel/perl-HTML-FormatText-WithLinks/perl-HTML-FormatText-WithLinks.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-HTML-FormatText-WithLinks.spec 7 Mar 2008 02:03:52 -0000 1.7 +++ perl-HTML-FormatText-WithLinks.spec 11 Jul 2008 19:20:37 -0000 1.8 @@ -1,10 +1,10 @@ Name: perl-HTML-FormatText-WithLinks Version: 0.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML to text conversion with links as footnotes Group: Development/Libraries -License: GPL+ or Artistic+ +License: GPL+ or Artistic URL: http://search.cpan.org/dist/HTML-FormatText-WithLinks Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,8 +57,11 @@ %changelog +* Fri Jul 11 2008 Tom "spot" Callaway - 0.09-3 +- fix license tag (it may be correct, but its flagging as a false positive on checks) + * Thu Mar 06 2008 Tom "spot" Callaway - 0.09-2 -Rebuild for new perl +- Rebuild for new perl * Wed Aug 8 2007 Patrice Dumas 0.09-1 - update to 0.09 From fedora-extras-commits at redhat.com Fri Jul 11 19:22:17 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Fri, 11 Jul 2008 19:22:17 GMT Subject: rpms/netdump-server/devel netdump-clientport.patch, NONE, 1.1 netdump-server.spec, 1.3, 1.4 Message-ID: <200807111922.m6BJMHAY029395@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/netdump-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29319 Modified Files: netdump-server.spec Added Files: netdump-clientport.patch Log Message: Resolves: bz 454703 netdump-clientport.patch: --- NEW FILE netdump-clientport.patch --- diff -up netdump-0.7.16/server.c.orig netdump-0.7.16/server.c --- netdump-0.7.16/server.c.orig 2008-07-11 15:07:58.000000000 -0400 +++ netdump-0.7.16/server.c 2008-07-11 15:18:17.000000000 -0400 @@ -224,7 +224,7 @@ load_magic (guint32 ip, guchar magic[MAG static void -handle_new_client (guint32 ip, guchar *magic, reply_t *reply, char *msg) +handle_new_client (guint32 ip, guint16 port, guchar *magic, reply_t *reply, char *msg) { NetdumpClient *client; const char *dir; @@ -253,7 +253,7 @@ handle_new_client (guint32 ip, guchar *m just_reboot = TRUE; } - client = netdump_client_new (ip, dir, (char *)magic, just_reboot, reply, msg); + client = netdump_client_new (ip, port, dir, (char *)magic, just_reboot, reply, msg); g_hash_table_insert (clients, client, client); } } @@ -309,6 +309,7 @@ master_socket_packet (GIOChannel *chann int len; struct sockaddr_in addr; int addr_len = sizeof(addr); + guint16 port; int fd = g_io_channel_unix_get_fd (channel); @@ -321,6 +322,7 @@ master_socket_packet (GIOChannel *chann } key.ip = ntohl (addr.sin_addr.s_addr); + port = ntohs (addr.sin_port); #if 0 g_print ("got packet from %d.%d.%d.%d\n", (key.ip >> 24) & 0xff, @@ -363,7 +365,7 @@ master_socket_packet (GIOChannel *chann if (ntohl (reply.code) == REPLY_START_NETDUMP) { - handle_new_client (key.ip, magic, &reply, (char *)&buf[HEADER_LEN]); + handle_new_client (key.ip, port, magic, &reply, (char *)&buf[HEADER_LEN]); } else if (ntohl (reply.code) == REPLY_LOG) { diff -up netdump-0.7.16/netdumpclient.c.orig netdump-0.7.16/netdumpclient.c --- netdump-0.7.16/netdumpclient.c.orig 2008-07-11 15:07:58.000000000 -0400 +++ netdump-0.7.16/netdumpclient.c 2008-07-11 15:18:17.000000000 -0400 @@ -132,6 +132,7 @@ clear_do_print(void) typedef struct { guint32 ip; + guint16 port; int count; unsigned char magic_value[MAGIC_SIZE]; } RebootRequest; @@ -155,7 +156,7 @@ netdump_client_send_reboot (gpointer dat memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(NETDUMP_PORT); + addr.sin_port = htons(reboot->port); addr.sin_addr.s_addr = htonl(reboot->ip); memset (&req, 0, sizeof(req)); @@ -197,6 +198,7 @@ netdump_client_reboot (NetdumpClient *cl reboot = g_new0 (RebootRequest, 1); reboot->ip = client->ip; + reboot->port = client->port; memcpy (reboot->magic_value, client->magic_value, MAGIC_SIZE); reboot->count = 0; @@ -375,7 +377,7 @@ netdump_client_send_request (NetdumpClie memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(NETDUMP_PORT); + addr.sin_port = htons(client->port); addr.sin_addr.s_addr = htonl(client->ip); memset (&req, 0, sizeof(req)); @@ -412,6 +414,7 @@ netdump_client_send_request (NetdumpClie NetdumpClient * netdump_client_new (guint32 ip, + guint16 port, const char *dir, const char magic[MAGIC_SIZE], gboolean just_reboot, @@ -426,15 +429,17 @@ netdump_client_new (guint32 ip, client = g_new0 (NetdumpClient, 1); #ifdef DEBUG - g_print (" netdump_client_new() ip: %d.%d.%d.%d -> %p\n", + g_print (" netdump_client_new() ip: %d.%d.%d.%d:%d -> %p\n", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, (ip) & 0xff, + port, client); #endif client->ip = ip; + client->port = port; sprintf((char *)client->ip_addr, "%d.%d.%d.%d", (ip >> 24) & 0xff, (ip >> 16) & 0xff, diff -up netdump-0.7.16/netdumpclient.h.orig netdump-0.7.16/netdumpclient.h --- netdump-0.7.16/netdumpclient.h.orig 2007-12-12 11:19:53.000000000 -0500 +++ netdump-0.7.16/netdumpclient.h 2008-07-11 15:18:17.000000000 -0400 @@ -46,6 +46,7 @@ typedef struct { struct _NetdumpClient { guint32 ip; + guint16 port; gboolean just_reboot; guint32 outstanding_request; @@ -106,6 +107,7 @@ struct _NetdumpClient { NetdumpClient *netdump_client_new (guint32 ip, + guint16 port, const char *dir, const char magic[MAGIC_SIZE], gboolean just_reboot, Index: netdump-server.spec =================================================================== RCS file: /cvs/extras/rpms/netdump-server/devel/netdump-server.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- netdump-server.spec 19 Feb 2008 16:09:36 -0000 1.3 +++ netdump-server.spec 11 Jul 2008 19:21:31 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Server for network kernel message logging and crash dumps Name: netdump-server Version: 0.7.16 -Release: 22%{dist} +Release: 23%{dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -24,6 +24,7 @@ Patch6: netdump-makefile-servonly.patch Patch7: netdump-server-Makefile.patch Patch8: netdump-server-init.patch +Patch9: netdump-clientport.patch Group: System Environment/Daemons @@ -43,6 +44,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build export CFLAGS="%{optflags} `glib-config --cflags`"; make %{?_smp_mflags} @@ -95,6 +97,9 @@ %doc COPYING %changelog +* Fri July 11 2008 Neil Horman - 0.7.16-23 +- Respond to clients listening on ports other than 6666 (bz 454703) + * Tue Feb 19 2008 Fedora Release Engineering - 0.7.16-22 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 11 19:24:25 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 11 Jul 2008 19:24:25 GMT Subject: rpms/emerald/devel emerald-theme-manager-desktop.patch, NONE, 1.1 emerald.spec, 1.16, 1.17 Message-ID: <200807111924.m6BJOPFM029633@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/emerald/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29491 Modified Files: emerald.spec Added Files: emerald-theme-manager-desktop.patch Log Message: Updated to 0.7.6 + spec fixes emerald-theme-manager-desktop.patch: --- NEW FILE emerald-theme-manager-desktop.patch --- --- emerald-0.7.6/misc/emerald-theme-manager.desktop 2008-05-31 12:05:37.000000000 +0300 +++ emerald-0.7.6/misc/emerald-theme-manager.desktop.fixed 2008-07-11 20:47:26.000000000 +0300 @@ -5,10 +5,9 @@ Name[fr]=Gestionnaire de th??mes Emerald Comment=Configure Emerald themes Comment[fr]=Configurerer les options des th??mes Emerald Icon=/usr/share/pixmaps/emerald-theme-manager-icon.png -Exec=emerald-theme-manager Terminal=false Type=Application -Categories=Settings; -Exec=emerald-theme-manager -i +Categories=Settings;DesktopSettings +Exec=emerald-theme-manager -i %f MimeType=application/x-emerald-theme; Index: emerald.spec =================================================================== RCS file: /cvs/pkgs/rpms/emerald/devel/emerald.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- emerald.spec 19 Feb 2008 07:35:35 -0000 1.16 +++ emerald.spec 11 Jul 2008 19:23:36 -0000 1.17 @@ -2,13 +2,13 @@ Url: http://www.compiz-fusion.org/ License: GPLv2 Group: User Interface/Desktops -Version: 0.5.2 -Release: 4%{?dist} +Version: 0.7.6 +Release: 1%{?dist} Summary: Themeable window decorator and compositing manager for Compiz Fusion BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2 -Patch0: gcc43-buildfix.patch +Patch0: emerald-theme-manager-desktop.patch # libdrm is not available on these arches ExcludeArch: s390 s390x @@ -41,19 +41,14 @@ %prep %setup -q -#fix gcc43 build -#http://bugs.opencompositing.org/show_bug.cgi?id=724 -%patch0 -p1 -b .gcc43 -# Should only have one Exec line in a desktop file... -perl -pi -e 's|Exec=emerald-theme-manager -i|###|g' misc/emerald-theme-manager.desktop -# Death to rpaths... -perl -pi -e 's|hardcode_into_libs=.*|hardcode_into_libs=no|g' configure -perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' configure -perl -pi -e 's|runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' configure - +#fix menu entries +#https://bugzilla.redhat.com/show_bug.cgi?id=286141 +%patch0 -p1 -b .fixed %build %configure --enable-librsvg --disable-mime-update +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -65,13 +60,6 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/emerald-theme-manager.desktop -# Fix up xy_XY to just xy -for lang in tr_TR -do - dest=$(echo ${lang} | cut -d_ -f1) - mv $RPM_BUILD_ROOT%{_datadir}/locale/${lang} \ - $RPM_BUILD_ROOT%{_datadir}/locale/${dest} -done %find_lang %{name} @@ -114,6 +102,12 @@ %{_libdir}/libemeraldengine.so %changelog +* Fri Jul 11 2008 Nikolay Vladimirov - 0.7.6-1 +- new upstream release +- removed gcc43 patch(upstream) +- added .desktop file patch(fixes bz 286141) +- spec file clean up + * Tue Feb 19 2008 Fedora Release Engineering - 0.5.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 11 19:24:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 19:24:50 GMT Subject: rpms/python-fedora/devel sources,1.15,1.16 .cvsignore,1.15,1.16 Message-ID: <200807111924.m6BJOoSB029697@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29504 Modified Files: sources .cvsignore Log Message: * Commit new python-fedora tarball. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Jul 2008 18:48:40 -0000 1.15 +++ sources 11 Jul 2008 19:23:56 -0000 1.16 @@ -0,0 +1 @@ +2f513652e381cf1ad9836fd1aed74aef python-fedora-0.3.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Jul 2008 18:48:40 -0000 1.15 +++ .cvsignore 11 Jul 2008 19:23:56 -0000 1.16 @@ -0,0 +1 @@ +python-fedora-0.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 19:25:16 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Fri, 11 Jul 2008 19:25:16 GMT Subject: rpms/netdump-server/devel netdump-server.spec,1.4,1.5 Message-ID: <200807111925.m6BJPGeB029747@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/netdump-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29643 Modified Files: netdump-server.spec Log Message: Resolves: bz 454703 Index: netdump-server.spec =================================================================== RCS file: /cvs/extras/rpms/netdump-server/devel/netdump-server.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- netdump-server.spec 11 Jul 2008 19:21:31 -0000 1.4 +++ netdump-server.spec 11 Jul 2008 19:24:34 -0000 1.5 @@ -97,7 +97,7 @@ %doc COPYING %changelog -* Fri July 11 2008 Neil Horman - 0.7.16-23 +* Fri Jul 11 2008 Neil Horman - 0.7.16-23 - Respond to clients listening on ports other than 6666 (bz 454703) * Tue Feb 19 2008 Fedora Release Engineering - 0.7.16-22 From fedora-extras-commits at redhat.com Fri Jul 11 19:26:05 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 19:26:05 GMT Subject: rpms/gfs-ambrosia-fonts/devel gfs-ambrosia-fonts-fontconfig.conf, NONE, 1.1 gfs-ambrosia-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807111926.m6BJQ5rR029819@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-ambrosia-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29755/devel Modified Files: .cvsignore sources Added Files: gfs-ambrosia-fonts-fontconfig.conf gfs-ambrosia-fonts.spec import.log Log Message: initial import --- NEW FILE gfs-ambrosia-fonts-fontconfig.conf --- GFS Ambrosia fantasy fantasy GFS Ambrosia --- NEW FILE gfs-ambrosia-fonts.spec --- %define fontname gfs-ambrosia %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_AMBROSIA Name: %{fontname}-fonts Version: 20080624 Release: 1%{?dist} Summary: GFS Ambrosia majuscule Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description As it is known, the Greek alphabet was used in majuscule form for over a millennium before the minuscule letters gradually replaced it until they became the official script in the 9th century A.D. Thereafter, majuscule letters were confined to sparse use as initials or elaborate titles until the Italian Renaissance. The new art of Typography, as well as the need of the humanists to mimic the ancient Greco-Roman period brought back the extensive use of the majuscule letter-forms in both Latin and Greek typography. Greek books of the time were printed using the contemporary Byzantine hand with which they combined capital letters modelled on the Roman antiquity, i.e. with thick and thin strokes and serifs. At the same time the Byzantine majuscule tradition, principally used on theological editions, remainned alive until the early 19th century. GFS Ambrosia has the main characteristics of the majuscule forms of the early Christian tradition. It has been designed by George D. Matthiopoulos. %prep %setup -q -c -T unzip -j -L -q %{SOURCE0} chmod 0644 *.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.otf %changelog * Sun Jul 06 2008 Nicolas Mailhot - 20080624-1 ?? initial packaging --- NEW FILE import.log --- gfs-ambrosia-fonts-20080624-1_fc10:HEAD:gfs-ambrosia-fonts-20080624-1.fc10.src.rpm:1215804309 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gfs-ambrosia-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2008 16:20:26 -0000 1.1 +++ .cvsignore 11 Jul 2008 19:25:21 -0000 1.2 @@ -0,0 +1 @@ +GFS_AMBROSIA.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/gfs-ambrosia-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2008 16:20:26 -0000 1.1 +++ sources 11 Jul 2008 19:25:21 -0000 1.2 @@ -0,0 +1 @@ +891a6e880ca0ef06223eedfab7c0e035 GFS_AMBROSIA.zip From fedora-extras-commits at redhat.com Fri Jul 11 19:26:43 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Fri, 11 Jul 2008 19:26:43 GMT Subject: rpms/prelude-correlator/devel .cvsignore, 1.2, 1.3 prelude-correlator.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807111926.m6BJQhLF029897@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/prelude-correlator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29803 Modified Files: .cvsignore prelude-correlator.spec sources Log Message: *Fri Jul 11 2008 Steve Grubb 0.9.0-0.3.beta3 - New beta release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Jul 2008 00:24:08 -0000 1.2 +++ .cvsignore 11 Jul 2008 19:25:55 -0000 1.3 @@ -1 +1,2 @@ prelude-correlator-0.9.0-beta2.tar.gz +prelude-correlator-0.9.0-beta3.tar.gz Index: prelude-correlator.spec =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/devel/prelude-correlator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- prelude-correlator.spec 4 Jul 2008 00:27:09 -0000 1.2 +++ prelude-correlator.spec 11 Jul 2008 19:25:55 -0000 1.3 @@ -1,9 +1,9 @@ # This is temporary while its in beta -%define prelude_rel beta2 +%define prelude_rel beta3 Name: prelude-correlator Version: 0.9.0 -Release: 0.2.%{prelude_rel}%{?dist} +Release: 0.3.%{prelude_rel}%{?dist} Summary: Real time correlator of events received by Prelude Manager Group: Applications/Internet @@ -101,6 +101,9 @@ %changelog +*Fri Jul 11 2008 Steve Grubb 0.9.0-0.3.beta3 +- New beta release + *Thu Jul 03 2008 Steve Grubb 0.9.0-0.1.beta2 - Initial packaging Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Jul 2008 00:24:08 -0000 1.2 +++ sources 11 Jul 2008 19:25:55 -0000 1.3 @@ -1 +1 @@ -5e05298e02d05bce12340cdad23801c3 prelude-correlator-0.9.0-beta2.tar.gz +3a866ce252e7f909bf73142b311e9655 prelude-correlator-0.9.0-beta3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 19:26:46 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 11 Jul 2008 19:26:46 GMT Subject: rpms/emerald/devel .cvsignore,1.10,1.11 sources,1.10,1.11 Message-ID: <200807111926.m6BJQkUx029903@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/emerald/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29809 Modified Files: .cvsignore sources Log Message: Updated to 0.7.6 + spec fixes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/emerald/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 8 Oct 2007 15:20:18 -0000 1.10 +++ .cvsignore 11 Jul 2008 19:25:58 -0000 1.11 @@ -1,9 +1 @@ -emerald-0.1.2.tar.bz2 -emerald-0.1.3.tar.bz2 -emerald-0.1.4.tar.bz2 -emerald-0.1.99.2.tar.bz2 -emerald-0.1.9999.1.tar.bz2 -emerald-0.1.9999.2.tar.bz2 -emerald-0.2.0.tar.bz2 -emerald-0.2.1.tar.bz2 -emerald-0.5.2.tar.bz2 +emerald-0.7.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emerald/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 8 Oct 2007 15:20:18 -0000 1.10 +++ sources 11 Jul 2008 19:25:58 -0000 1.11 @@ -1 +1 @@ -149c17b0a1bddf29e1cd66d29777d96e emerald-0.5.2.tar.bz2 +340f4dafde5d6c55bd05c0033aa7d6fe emerald-0.7.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 19:35:59 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 11 Jul 2008 19:35:59 GMT Subject: rpms/python-fedora/devel sources,1.16,1.17 Message-ID: <200807111935.m6BJZxpC030661@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30508 Modified Files: sources Log Message: * Official python-fedora-0.3 tarball built from a fresh checkout and tagged in the repository. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 11 Jul 2008 19:23:56 -0000 1.16 +++ sources 11 Jul 2008 19:35:10 -0000 1.17 @@ -1 +1 @@ -2f513652e381cf1ad9836fd1aed74aef python-fedora-0.3.tar.gz +a9bd04791e4e16f559ed5ed8faa41968 python-fedora-0.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 19:36:18 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Fri, 11 Jul 2008 19:36:18 GMT Subject: rpms/netdump-server/EL-5 netdump-clientport.patch, NONE, 1.1 netdump-server.spec, 1.8, 1.9 Message-ID: <200807111936.m6BJaI1S030750@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/netdump-server/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30594 Modified Files: netdump-server.spec Added Files: netdump-clientport.patch Log Message: Resolves: bz 454703 netdump-clientport.patch: --- NEW FILE netdump-clientport.patch --- diff -up netdump-0.7.16/server.c.orig netdump-0.7.16/server.c --- netdump-0.7.16/server.c.orig 2008-07-11 15:07:58.000000000 -0400 +++ netdump-0.7.16/server.c 2008-07-11 15:18:17.000000000 -0400 @@ -224,7 +224,7 @@ load_magic (guint32 ip, guchar magic[MAG static void -handle_new_client (guint32 ip, guchar *magic, reply_t *reply, char *msg) +handle_new_client (guint32 ip, guint16 port, guchar *magic, reply_t *reply, char *msg) { NetdumpClient *client; const char *dir; @@ -253,7 +253,7 @@ handle_new_client (guint32 ip, guchar *m just_reboot = TRUE; } - client = netdump_client_new (ip, dir, (char *)magic, just_reboot, reply, msg); + client = netdump_client_new (ip, port, dir, (char *)magic, just_reboot, reply, msg); g_hash_table_insert (clients, client, client); } } @@ -309,6 +309,7 @@ master_socket_packet (GIOChannel *chann int len; struct sockaddr_in addr; int addr_len = sizeof(addr); + guint16 port; int fd = g_io_channel_unix_get_fd (channel); @@ -321,6 +322,7 @@ master_socket_packet (GIOChannel *chann } key.ip = ntohl (addr.sin_addr.s_addr); + port = ntohs (addr.sin_port); #if 0 g_print ("got packet from %d.%d.%d.%d\n", (key.ip >> 24) & 0xff, @@ -363,7 +365,7 @@ master_socket_packet (GIOChannel *chann if (ntohl (reply.code) == REPLY_START_NETDUMP) { - handle_new_client (key.ip, magic, &reply, (char *)&buf[HEADER_LEN]); + handle_new_client (key.ip, port, magic, &reply, (char *)&buf[HEADER_LEN]); } else if (ntohl (reply.code) == REPLY_LOG) { diff -up netdump-0.7.16/netdumpclient.c.orig netdump-0.7.16/netdumpclient.c --- netdump-0.7.16/netdumpclient.c.orig 2008-07-11 15:07:58.000000000 -0400 +++ netdump-0.7.16/netdumpclient.c 2008-07-11 15:18:17.000000000 -0400 @@ -132,6 +132,7 @@ clear_do_print(void) typedef struct { guint32 ip; + guint16 port; int count; unsigned char magic_value[MAGIC_SIZE]; } RebootRequest; @@ -155,7 +156,7 @@ netdump_client_send_reboot (gpointer dat memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(NETDUMP_PORT); + addr.sin_port = htons(reboot->port); addr.sin_addr.s_addr = htonl(reboot->ip); memset (&req, 0, sizeof(req)); @@ -197,6 +198,7 @@ netdump_client_reboot (NetdumpClient *cl reboot = g_new0 (RebootRequest, 1); reboot->ip = client->ip; + reboot->port = client->port; memcpy (reboot->magic_value, client->magic_value, MAGIC_SIZE); reboot->count = 0; @@ -375,7 +377,7 @@ netdump_client_send_request (NetdumpClie memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(NETDUMP_PORT); + addr.sin_port = htons(client->port); addr.sin_addr.s_addr = htonl(client->ip); memset (&req, 0, sizeof(req)); @@ -412,6 +414,7 @@ netdump_client_send_request (NetdumpClie NetdumpClient * netdump_client_new (guint32 ip, + guint16 port, const char *dir, const char magic[MAGIC_SIZE], gboolean just_reboot, @@ -426,15 +429,17 @@ netdump_client_new (guint32 ip, client = g_new0 (NetdumpClient, 1); #ifdef DEBUG - g_print (" netdump_client_new() ip: %d.%d.%d.%d -> %p\n", + g_print (" netdump_client_new() ip: %d.%d.%d.%d:%d -> %p\n", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, (ip) & 0xff, + port, client); #endif client->ip = ip; + client->port = port; sprintf((char *)client->ip_addr, "%d.%d.%d.%d", (ip >> 24) & 0xff, (ip >> 16) & 0xff, diff -up netdump-0.7.16/netdumpclient.h.orig netdump-0.7.16/netdumpclient.h --- netdump-0.7.16/netdumpclient.h.orig 2007-12-12 11:19:53.000000000 -0500 +++ netdump-0.7.16/netdumpclient.h 2008-07-11 15:18:17.000000000 -0400 @@ -46,6 +46,7 @@ typedef struct { struct _NetdumpClient { guint32 ip; + guint16 port; gboolean just_reboot; guint32 outstanding_request; @@ -106,6 +107,7 @@ struct _NetdumpClient { NetdumpClient *netdump_client_new (guint32 ip, + guint16 port, const char *dir, const char magic[MAGIC_SIZE], gboolean just_reboot, Index: netdump-server.spec =================================================================== RCS file: /cvs/extras/rpms/netdump-server/EL-5/netdump-server.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- netdump-server.spec 14 Dec 2007 14:31:59 -0000 1.8 +++ netdump-server.spec 11 Jul 2008 19:35:34 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Server for network kernel message logging and crash dumps Name: netdump-server Version: 0.7.16 -Release: 20%{dist} +Release: 21%{dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -24,6 +24,7 @@ Patch6: netdump-makefile-servonly.patch Patch7: netdump-server-Makefile.patch Patch8: netdump-server-init.patch +Patch9: netdump-clientport.patch Group: System Environment/Daemons @@ -43,6 +44,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build export CFLAGS="%{optflags} `pkg-config glib --cflags`"; make %{?smp_mflags} @@ -95,6 +97,9 @@ %doc COPYING %changelog +* Fri Jul 11 2008 Neil Horman - 0.7.16-21 +- respond to client ports other than 6666 (bz 454703) + * Wed Dec 12 2007 Neil Horman - 0.7.16-20 - Fixing licensing issues to be unambiguously GPLv2 From fedora-extras-commits at redhat.com Fri Jul 11 19:36:43 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 11 Jul 2008 19:36:43 GMT Subject: rpms/thunar-shares/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 thunar-shares.spec, 1.2, 1.3 Message-ID: <200807111936.m6BJahHK030816@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/thunar-shares/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30651 Modified Files: .cvsignore sources thunar-shares.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jun 2008 22:32:47 -0000 1.3 +++ .cvsignore 11 Jul 2008 19:35:57 -0000 1.4 @@ -1 +1 @@ -thunar-shares-0.12.tar.gz +thunar-shares-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jun 2008 22:32:47 -0000 1.3 +++ sources 11 Jul 2008 19:35:57 -0000 1.4 @@ -1 +1 @@ -f48fd5be851bfd1b69187ee3667ca15f thunar-shares-0.12.tar.gz +cce8095abedb3194b7481a8970371abd thunar-shares-0.13.tar.gz Index: thunar-shares.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/devel/thunar-shares.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thunar-shares.spec 11 Jun 2008 22:32:47 -0000 1.2 +++ thunar-shares.spec 11 Jul 2008 19:35:57 -0000 1.3 @@ -1,7 +1,7 @@ %define thunarver 0.9.0 Name: thunar-shares -Version: 0.12 +Version: 0.13 Release: 1%{?dist} Summary: Thunar file manager extension to share files using Samba @@ -56,11 +56,13 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_libdir}/thunarx-1/%{name}.so -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/thunar-shares/ %changelog +* Fri Jul 11 2008 Christoph Wickert - 0.13-1 +- Update to 0.13 + * Thu Jun 12 2008 Christoph Wickert - 0.12-1 - Update to 0.12 From fedora-extras-commits at redhat.com Fri Jul 11 19:36:44 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 19:36:44 GMT Subject: rpms/gfs-fleischman-fonts/devel gfs-fleischman-fonts-fontconfig.conf, NONE, 1.1 gfs-fleischman-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807111936.m6BJaiXb030820@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-fleischman-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30667/devel Modified Files: .cvsignore sources Added Files: gfs-fleischman-fonts-fontconfig.conf gfs-fleischman-fonts.spec import.log Log Message: initial import --- NEW FILE gfs-fleischman-fonts-fontconfig.conf --- GFS Fleischman fantasy fantasy GFS Fleischman --- NEW FILE gfs-fleischman-fonts.spec --- %define fontname gfs-fleischman %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_FLEISCHMAN Name: %{fontname}-fonts Version: 20080303 Release: 1%{?dist} Summary: GFS Fleischman majuscule Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description As it is known, the Greek alphabet was used in majuscule form for over a millennium before the minuscule letters gradually replaced it until they became the official script in the 9th century A.D. Thereafter, majuscule letters were confined to sparse use as initials or elaborate titles until the Italian Renaissance. The new art of Typography, as well as the need of the humanists to mimic the ancient Greco-Roman period brought back the extensive use of the majuscule letter-forms in both Latin and Greek typography. Greek books of the time were printed using the contemporary Byzantine hand with which they combined capital letters modelled on the Roman antiquity, i.e. with thick and thin strokes and serifs. At the same time the Byzantine majuscule tradition, principally used on theological editions, remainned alive until the early 19th century. GFS Fleischman was cut by Johann Michael Fleishman, typecutter of the Dutch Ensched?? foundry and follows the baroque style of the mid-18th century ??sthetics. It has been designed by George D. Matthiopoulos. %prep %setup -q -c -T unzip -j -L -q %{SOURCE0} chmod 0644 *.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.otf %changelog * Sun Jul 06 2008 Nicolas Mailhot - 20080303-1 ?? initial packaging --- NEW FILE import.log --- gfs-fleischman-fonts-20080303-1_fc10:HEAD:gfs-fleischman-fonts-20080303-1.fc10.src.rpm:1215804948 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gfs-fleischman-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2008 16:22:26 -0000 1.1 +++ .cvsignore 11 Jul 2008 19:36:01 -0000 1.2 @@ -0,0 +1 @@ +GFS_FLEISCHMAN.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/gfs-fleischman-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2008 16:22:26 -0000 1.1 +++ sources 11 Jul 2008 19:36:01 -0000 1.2 @@ -0,0 +1 @@ +adcb048bdca18dd243c0337bdb0c5ecd GFS_FLEISCHMAN.zip From fedora-extras-commits at redhat.com Fri Jul 11 19:38:35 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 19:38:35 GMT Subject: rpms/icu4j/devel icu4j.spec,1.11,1.12 Message-ID: <200807111938.m6BJcZmx031058@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/icu4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30958 Modified Files: icu4j.spec Log Message: * Fri Jul 11 2008 Andrew Overholt 0:3.8.1-2 - Remove GCJ support due to com.sun.tools.doclets.internal.toolkit.taglets.* import (not in gjdoc) Index: icu4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- icu4j.spec 11 Jul 2008 15:31:12 -0000 1.11 +++ icu4j.spec 11 Jul 2008 19:37:44 -0000 1.12 @@ -36,14 +36,12 @@ %define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0} %define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0} -%define _with_gcj_support 1 - -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} - %define section free %define eclipse_name eclipse %define eclipse_base %{_datadir}/%{eclipse_name} +# Note: this next section looks weird having an arch specified in a +# noarch specfile but the parts of the build # All arches line up between Eclipse and Linux kernel names except i386 -> x86 %ifarch %{ix86} %define eclipse_arch x86 @@ -53,7 +51,7 @@ Name: icu4j Version: 3.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: International Components for Unicode for Java License: MIT and EPL @@ -72,21 +70,19 @@ # to rebuild once we get 3.4 in. Patch3: %{name}-individualsourcebundle.patch BuildRequires: ant -BuildRequires: java-javadoc +# FIXME: is this necessary or is it just adding strings in the hrefs in +# the docs? +BuildRequires: java-javadoc >= 1:1.6.0 +# This is to ensure we get OpenJDK and not GCJ +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.5 Requires: jpackage-utils +# This is to ensure we get OpenJDK and not GCJ +Requires: java >= 1:1.6.0 %if %{with_eclipse} BuildRequires: eclipse-pde >= 0:3.2.1 %endif -%if ! %{gcj_support} -BuildArch: noarch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif %description The International Components for Unicode (ICU) library provides robust and @@ -107,6 +103,7 @@ Summary: Javadoc for %{name} Group: Development/Documentation Requires: jpackage-utils +Requires: java-javadoc >= 1:1.6.0 %description javadoc Javadoc for %{name}. @@ -164,42 +161,16 @@ # eclipse install -d -m755 %{buildroot}/%{eclipse_base} -# FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug. unzip -qq -d %{buildroot}/%{eclipse_base} eclipseProjects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip - -%endif - -%if %{gcj_support} -%{_bindir}/aot-compile-rpm %endif %clean %__rm -rf %{buildroot} -%if %{gcj_support} -%post -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files %defattr(0644,root,root,0755) %doc license.html readme.html APIChangeReport.html %{_javadir}/%{name}*.jar -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/icu4j-%{version}.jar.* -%endif %files javadoc %defattr(0644,root,root,0755) @@ -214,12 +185,13 @@ %{_datadir}/eclipse/features/* %{_datadir}/eclipse/plugins/* %doc license.html readme.html -%if %{gcj_support} -%{_libdir}/gcj/%{name}/com.ibm.icu* -%endif %endif %changelog +* Fri Jul 11 2008 Andrew Overholt 0:3.8.1-2 +- Remove GCJ support due to + com.sun.tools.doclets.internal.toolkit.taglets.* import (not in gjdoc) + * Fri Jul 11 2008 Andrew Overholt 0:3.8.1-1 - 3.8.1 From fedora-extras-commits at redhat.com Fri Jul 11 19:42:27 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 11 Jul 2008 19:42:27 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git9.bz2.sign, NONE, 1.1 .cvsignore, 1.859, 1.860 kernel.spec, 1.752, 1.753 sources, 1.820, 1.821 upstream, 1.738, 1.739 patch-2.6.26-rc9-git8.bz2.sign, 1.1, NONE Message-ID: <200807111942.m6BJgR7i031366@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31292 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git9.bz2.sign Removed Files: patch-2.6.26-rc9-git8.bz2.sign Log Message: 2.6.26-rc9-git9 --- NEW FILE patch-2.6.26-rc9-git9.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBId63yyGugalF9Dw4RAuLLAJ9AhvrWVKk4QETFuynrnccq+TvY0wCgikY7 hXTS0TWgQuVWWQkwK37Sp80= =7Gt1 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.859 retrieving revision 1.860 diff -u -r1.859 -r1.860 --- .cvsignore 11 Jul 2008 17:03:58 -0000 1.859 +++ .cvsignore 11 Jul 2008 19:41:33 -0000 1.860 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git8.bz2 +patch-2.6.26-rc9-git9.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.752 retrieving revision 1.753 diff -u -r1.752 -r1.753 --- kernel.spec 11 Jul 2008 17:03:58 -0000 1.752 +++ kernel.spec 11 Jul 2008 19:41:33 -0000 1.753 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 8 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1789,6 +1789,9 @@ %changelog * Fri Jul 11 2008 Dave Jones +- 2.6.26-rc9-git9 + +* Fri Jul 11 2008 Dave Jones - 2.6.26-rc9-git8 * Thu Jul 10 2008 Dave Jones Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.820 retrieving revision 1.821 diff -u -r1.820 -r1.821 --- sources 11 Jul 2008 17:03:58 -0000 1.820 +++ sources 11 Jul 2008 19:41:33 -0000 1.821 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -51efbdaeb0f9ec1ec1bcceb35701b012 patch-2.6.26-rc9-git8.bz2 +7605343bcae27318b3e63cd44eeeb4f1 patch-2.6.26-rc9-git9.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.738 retrieving revision 1.739 diff -u -r1.738 -r1.739 --- upstream 11 Jul 2008 17:03:58 -0000 1.738 +++ upstream 11 Jul 2008 19:41:33 -0000 1.739 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git8.bz2 +patch-2.6.26-rc9-git9.bz2 --- patch-2.6.26-rc9-git8.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 19:44:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 19:44:08 GMT Subject: rpms/perl-LockFile-Simple/devel license_of_LockFile_Simple.txt, NONE, 1.1 perl-LockFile-Simple.spec, 1.2, 1.3 Message-ID: <200807111944.m6BJi8sK031441@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-LockFile-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31410 Modified Files: perl-LockFile-Simple.spec Added Files: license_of_LockFile_Simple.txt Log Message: update to 0.206, fix license tag --- NEW FILE license_of_LockFile_Simple.txt --- >From Raphael_Manfredi at pobox.com Thu Sep 27 17:03:35 2007 Return-Path: Received: from pobox.corp.redhat.com ([unix socket]) by pobox.corp.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA; Thu, 27 Sep 2007 17:03:35 -0400 X-Sieve: CMU Sieve 2.2 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by pobox.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l8RL3Xhk024974 for ; Thu, 27 Sep 2007 17:03:33 -0400 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l8RL3WPs017367 for ; Thu, 27 Sep 2007 17:03:32 -0400 Received: from smtp4-g19.free.fr (smtp4-g19.free.fr [212.27.42.30]) by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id l8RL3MJ9004102 for ; Thu, 27 Sep 2007 17:03:22 -0400 Received: from smtp4-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp4-g19.free.fr (Postfix) with ESMTP id EC6013EA0C0 for ; Thu, 27 Sep 2007 23:03:21 +0200 (CEST) Received: from tours.ram.loc (mut38-4-82-233-116-188.fbx.proxad.net [82.233.116.188]) by smtp4-g19.free.fr (Postfix) with ESMTP id 155143EA0C3 for ; Thu, 27 Sep 2007 23:03:20 +0200 (CEST) Received: from nice.ram.loc (root at nice.ram.loc [192.168.0.3]) by tours.ram.loc (8.13.8/8.13.8/Debian-3) with ESMTP id l8RL3HH5016291 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Thu, 27 Sep 2007 23:03:18 +0200 Received: from nice.ram.loc (ram at localhost [127.0.0.1]) by nice.ram.loc (8.13.4/8.13.4/Debian-3) with ESMTP id l8RL3FD3031551 for ; Thu, 27 Sep 2007 23:03:15 +0200 Received: (from ram at localhost) by nice.ram.loc (8.13.4/8.13.4/Submit) id l8RL3Efa031548 for tcallawa at redhat.com; Thu, 27 Sep 2007 23:03:14 +0200 Date: Thu, 27 Sep 2007 23:03:14 +0200 From: Raphael Manfredi To: Tom spot Callaway Subject: Re: license of LockFile::Simple Message-ID: <20070927210314.GA31512 at chram.org> References: <1190926383.3457.196.camel at localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1190926383.3457.196.camel at localhost.localdomain> User-Agent: Mutt/1.5.16 (2007-06-11) X-RedHat-Spam-Score: 0 X-Scanned-By: MIMEDefang 2.58 on 172.16.48.32 X-Evolution-Source: imap://tcallawa at pobox.corp.redhat.com/ Content-Transfer-Encoding: 8bit Quoting Tom spot Callaway: : So, basically, what I'm asking is: : : Would you be willing to either: : A. Dual license LockFile::Simple as GPL+ and Artistic (aka, same license : as perl) Yes, same license as Perl is just fine. You may relicense in that way, this is my formal agreement. : B. Re-license LockFile::Simple as Artistic 2.0? No, I don't know this license at all. Raphael Index: perl-LockFile-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-LockFile-Simple/devel/perl-LockFile-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-LockFile-Simple.spec 7 Mar 2008 02:08:12 -0000 1.2 +++ perl-LockFile-Simple.spec 11 Jul 2008 19:43:14 -0000 1.3 @@ -1,11 +1,13 @@ Name: perl-LockFile-Simple -Version: 0.2.5 -Release: 2%{?dist} +Version: 0.206 +Release: 1%{?dist} Summary: Simple file locking scheme -License: Artistic +# Confirmed with copyright holder, code does not yet reflect it. +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/LockFile-Simple/ Source0: http://www.cpan.org/modules/by-module/LockFile/LockFile-Simple-%{version}.tar.gz +Source1: license_of_LockFile_Simple.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -20,6 +22,7 @@ %prep %setup -q -n LockFile-Simple-%{version} +cp %{SOURCE1} . %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -43,13 +46,18 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README +%doc ChangeLog README license_of_LockFile_Simple.txt %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Jul 11 2008 Tom "spot" Callaway - 0.206-1 +- fix license tag +- bump to 0.206 +- include license attribution email + * Thu Mar 06 2008 Tom "spot" Callaway - 0.2.5-2 -Rebuild for new perl +- Rebuild for new perl * Tue Jan 16 2007 Andreas Thienemann 0.2.5-1 - Initial spec for FE From fedora-extras-commits at redhat.com Fri Jul 11 19:53:43 2008 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Fri, 11 Jul 2008 19:53:43 GMT Subject: rpms/libmtp/devel libmtp.spec,1.20,1.21 libmtp.perms,1.1,NONE Message-ID: <200807111953.m6BJrhFZ031881@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823 Modified Files: libmtp.spec Removed Files: libmtp.perms Log Message: Get rid of PAM console permissions, restore docs. Index: libmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libmtp.spec 23 May 2008 15:21:01 -0000 1.20 +++ libmtp.spec 11 Jul 2008 19:52:52 -0000 1.21 @@ -3,17 +3,15 @@ Name: libmtp Version: 0.2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ Group: System Environment/Libraries Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: libmtp.perms BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ Requires: udev -Requires: pam Requires: hal BuildRequires: libusb-devel BuildRequires: doxygen @@ -53,7 +51,7 @@ %configure --disable-static --program-prefix=mtp- make %{?_smp_mflags} # Remove permissions from symlink in udev script, we use -# PAM to fix the permissions instead. +# HALd rules to fix the permissions instead. examples/hotplug -a"SYMLINK+=\"libmtp-%k\"" > libmtp.rules %install @@ -66,9 +64,6 @@ install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop install -p -m 644 libmtp.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi -# Install device permissions -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/ -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libmtp.perms # Copy documentation to a good place install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -83,7 +78,7 @@ # I don't want to pre-generate it but will instead wait for upstream # to find a suitable solution that will always bring the same files, # or that Doxygen is fixed not to do this. -rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html +# rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %clean rm -rf $RPM_BUILD_ROOT @@ -95,7 +90,6 @@ %defattr(-, root,root,-) %{_libdir}/*.so.* %config(noreplace) %{_sysconfdir}/udev/rules.d/* -%config(noreplace) %{_sysconfdir}/security/console.perms.d/* %config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi %files examples %defattr(-,root,root,-) @@ -111,6 +105,13 @@ %changelog +* Fri Jul 11 2008 Linus Walleij 0.2.6.1-3 +- Loose PAM console permissions, also assume that we can ship + documentation again since Doxygen has been updated. Fedora + HALd rules for the portable_audio_player capability in + 20-acl-management.fdi will change permissions on the device + node for each plugged-in device. + * Fri May 23 2008 Adam Jackson 0.2.6.1-2 - libmtp-0.2.6.1-simpler-rules.patch: Simplify udev rules for faster bootup. --- libmtp.perms DELETED --- From fedora-extras-commits at redhat.com Fri Jul 11 19:56:56 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 19:56:56 GMT Subject: rpms/charis-fonts/devel import.log, NONE, 1.1 charis-fonts-fontconfig.conf, 1.2, 1.3 charis-fonts.spec, 1.9, 1.10 Message-ID: <200807111956.m6BJuu8M032189@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/charis-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32071/devel Modified Files: charis-fonts-fontconfig.conf charis-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- charis-fonts-4_104-2_fc10:HEAD:charis-fonts-4.104-2.fc10.src.rpm:1215806033 Index: charis-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts-fontconfig.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- charis-fonts-fontconfig.conf 1 Nov 2007 18:23:05 -0000 1.2 +++ charis-fonts-fontconfig.conf 11 Jul 2008 19:55:56 -0000 1.3 @@ -1,13 +1,6 @@ - - Bitstream Charter @@ -20,14 +13,12 @@ Charis SIL - Charis SIL serif - serif Index: charis-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- charis-fonts.spec 18 May 2008 15:11:13 -0000 1.9 +++ charis-fonts.spec 11 Jul 2008 19:55:56 -0000 1.10 @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 4.104 -Release: 1%{?alphatag}%{?dist} +Release: 2%{?dist} Summary: Charis SIL fonts Group: User Interface/X @@ -25,7 +25,7 @@ Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles -- regular, italic, bold, bold italic - and so is more useful in general +??? regular, italic, bold, bold italic ??? and so is more useful in general publishing than Doulos SIL. Charis is a serif proportionally spaced font optimized for readability in long printed documents. @@ -41,7 +41,7 @@ %build -# Source format not available +# Nothing there %install @@ -59,29 +59,32 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt *.pdf + %config(noreplace) %{fontconfdir}/60-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.ttf %changelog +* Fri Jul 11 2008 +- 4.104-2 +??? Fedora 10 alpha general package cleanup + * Sun May 18 2008 - 4.104-1 ??? New Unicode 5.1 compliant release, with some glyphs moved out of PUA From fedora-extras-commits at redhat.com Fri Jul 11 19:58:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 19:58:48 +0000 Subject: [pkgdb] perl-String-Ediff ownership updated Message-ID: <200807111958.m6BJwnW0015311@bastion.fedora.phx.redhat.com> Package perl-String-Ediff in Fedora devel is now owned by Tom Callaway (spot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-String-Ediff From fedora-extras-commits at redhat.com Fri Jul 11 19:59:55 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 19:59:55 GMT Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec, 1.43, 1.44 commons-logging-eclipse-manifest.patch, 1.1, 1.2 Message-ID: <200807111959.m6BJxthQ032450@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jakarta-commons-logging/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32330/devel Modified Files: jakarta-commons-logging.spec commons-logging-eclipse-manifest.patch Log Message: * Fri Jul 11 2008 Andrew Overholt 0:1.0.4-7.7 - Update OSGi bundle version. Index: jakarta-commons-logging.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- jakarta-commons-logging.spec 9 Jul 2008 19:34:40 -0000 1.43 +++ jakarta-commons-logging.spec 11 Jul 2008 19:59:11 -0000 1.44 @@ -38,7 +38,7 @@ Name: jakarta-%{short_name} Version: 1.0.4 -Release: 7.7%{?dist} +Release: 7.8%{?dist} Epoch: 0 Summary: Jakarta Commons Logging Package License: ASL 2.0 @@ -185,6 +185,9 @@ # ----------------------------------------------------------------------------- %changelog +* Fri Jul 11 2008 Andrew Overholt 0:1.0.4-7.7 +- Update OSGi bundle version. + * Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0.4-7.7 - drop repotag commons-logging-eclipse-manifest.patch: Index: commons-logging-eclipse-manifest.patch =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-logging/devel/commons-logging-eclipse-manifest.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- commons-logging-eclipse-manifest.patch 12 Jul 2007 18:53:34 -0000 1.1 +++ commons-logging-eclipse-manifest.patch 11 Jul 2008 19:59:11 -0000 1.2 @@ -7,7 +7,7 @@ +Bundle-ManifestVersion: 2 +Export-Package: org.apache.commons.logging;version="1.0.4",org.apache. + commons.logging.impl;version="1.0.4" -+Bundle-Version: 1.0.4.v200706111724 ++Bundle-Version: 1.0.4.v20080605-1930 +Bundle-SymbolicName: org.apache.commons.logging +Bundle-Name: Apache Commons Logging Plug-in +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 From fedora-extras-commits at redhat.com Fri Jul 11 20:00:20 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:00:20 GMT Subject: rpms/dejavu-fonts/devel import.log, NONE, 1.1 dejavu-fonts.spec, 1.81, 1.82 Message-ID: <200807112000.m6BK0KZf032496@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32381/devel Modified Files: dejavu-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- dejavu-fonts-2_25-2_fc10:HEAD:dejavu-fonts-2.25-2.fc10.src.rpm:1215806350 Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- dejavu-fonts.spec 19 May 2008 20:50:26 -0000 1.81 +++ dejavu-fonts.spec 11 Jul 2008 19:59:30 -0000 1.82 @@ -14,17 +14,17 @@ %define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt -Name: %{fontname}-fonts -Version: 2.25 -Release: 1%{?alphatag}%{?dist} -Summary: DejaVu fonts, mature typefaces - -Group: User Interface/X -License: Modifiable & redistributable, with naming restrictions -URL: http://%{fontname}.sf.net/ -Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 +Name: %{fontname}-fonts +Version: 2.25 +Release: 2%{?alphatag}%{?dist} +Summary: DejaVu fonts, mature typefaces + +Group: User Interface/X +License: Modifiable & redistributable, with naming restrictions +URL: http://%{fontname}.sf.net/ +Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # Older fontforge versions will not work due to sfd format changes BuildRequires: fontforge >= 20080429 BuildRequires: perl(Font::TTF) @@ -33,7 +33,7 @@ BuildArch: noarch %description -The DejaVu fonts are a font family based on the "Bitstream Vera" fonts release +The DejaVu fonts are a font family based on the ???Bitstream Vera??? fonts release 1.10. Its purpose is to provide a wider range of characters while maintaining the original look and feel through the process of collaborative development. @@ -87,11 +87,9 @@ %install rm -fr %{buildroot} -# Fonts install -m 0755 -d %{buildroot}%{fontdir} -install -m 0644 -p build/*.ttf %{buildroot}%{fontdir} +install -m 0644 -p build/*.ttf %{buildroot}%{fontdir} -# Fontconfig tweaks install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir} @@ -101,48 +99,41 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %post experimental -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun experimental -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %post -n %{fontname}-lgc-fonts -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -n %{fontname}-lgc-fonts -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} - fi +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi - %files %defattr(0644,root,root,0755) %doc AUTHORS BUGS LICENSE NEWS README @@ -151,7 +142,7 @@ %config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}.conf %config(noreplace) %{fontconfdir}/57-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.ttf %exclude %{fontdir}/DejaVu*Condensed*.ttf %exclude %{fontdir}/DejaVu*ExtraLight*.ttf @@ -171,6 +162,7 @@ %exclude %{fontdir}/DejaVuLGC*.ttf + %files -n %{fontname}-lgc-fonts %defattr(0644,root,root,0755) %doc AUTHORS BUGS LICENSE NEWS README @@ -179,11 +171,15 @@ %config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf %config(noreplace) %{fontconfdir}/58-%{fontname}-lgc.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/DejaVuLGC*.ttf %changelog +* Fri Jul 11 2008 +- 2.25-2 +??? Fedora 10 alpha general package cleanup + * Mon May 19 2008 - 2.25-1 ??? 2.25 final From fedora-extras-commits at redhat.com Fri Jul 11 20:00:58 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 20:00:58 GMT Subject: rpms/perl-String-Ediff/devel .cvsignore, 1.7, 1.8 perl-String-Ediff.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200807112000.m6BK0wLs032594@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-String-Ediff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32432 Modified Files: .cvsignore perl-String-Ediff.spec sources Log Message: 0.09, reactivate, fix license tag Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-String-Ediff/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Aug 2005 15:37:37 -0000 1.7 +++ .cvsignore 11 Jul 2008 19:59:53 -0000 1.8 @@ -1 +1 @@ -String-Ediff-0.08.tar.gz +String-Ediff-0.09.tar.gz Index: perl-String-Ediff.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-String-Ediff.spec 2 Feb 2007 13:56:49 -0000 1.16 +++ perl-String-Ediff.spec 11 Jul 2008 19:59:53 -0000 1.17 @@ -1,10 +1,10 @@ Name: perl-String-Ediff -Version: 0.08 -Release: 4%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Produce common sub-string indices for two strings Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/String-Ediff/ Source0: http://www.cpan.org/authors/id/B/BO/BOXZOU/String-Ediff-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,20 +19,6 @@ %prep -cat< - 0.09-1 +- update to 0.09 +- fix license tag + * Wed Aug 30 2006 Ville Skytt?? - 0.08-4 - Fix order of arguments to find(1). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-String-Ediff/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Aug 2005 15:37:37 -0000 1.7 +++ sources 11 Jul 2008 19:59:53 -0000 1.8 @@ -1 +1 @@ -ec44726a6023042910aeb0d2d5dc81c1 String-Ediff-0.08.tar.gz +2ffb6803ce08e4fc64ee33b54243e6d9 String-Ediff-0.09.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 20:02:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 20:02:13 +0000 Subject: [pkgdb] perl-String-Ediff: spot has requested watchbugzilla Message-ID: <200807112002.m6BK2DAm015478@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has requested the watchbugzilla acl on perl-String-Ediff (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-String-Ediff From fedora-extras-commits at redhat.com Fri Jul 11 20:02:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 20:02:15 +0000 Subject: [pkgdb] perl-String-Ediff: spot has requested commit Message-ID: <200807112002.m6BK2DAo015478@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has requested the commit acl on perl-String-Ediff (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-String-Ediff From fedora-extras-commits at redhat.com Fri Jul 11 20:02:50 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 11 Jul 2008 20:02:50 GMT Subject: rpms/lucene/devel lucene-1.9-analysis-OSGi-MANIFEST.MF, 1.2, 1.3 lucene.spec, 1.37, 1.38 lucene-1.9-OSGi-MANIFEST.MF, 1.2, 1.3 Message-ID: <200807112002.m6BK2odF006865@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/lucene/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6805/devel Modified Files: lucene-1.9-analysis-OSGi-MANIFEST.MF lucene.spec lucene-1.9-OSGi-MANIFEST.MF Log Message: * Fri Jul 11 2008 Andrew Overholt 0:2.3.1-3.2 - Update OSGi manifest data for Eclipse SDK 3.4 Index: lucene-1.9-analysis-OSGi-MANIFEST.MF =================================================================== RCS file: /cvs/pkgs/rpms/lucene/devel/lucene-1.9-analysis-OSGi-MANIFEST.MF,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lucene-1.9-analysis-OSGi-MANIFEST.MF 31 Jul 2007 21:32:41 -0000 1.2 +++ lucene-1.9-analysis-OSGi-MANIFEST.MF 11 Jul 2008 20:02:02 -0000 1.3 @@ -7,7 +7,7 @@ g.apache.lucene.analysis.de,org.apache.lucene.analysis.el,org.apache. lucene.analysis.fr,org.apache.lucene.analysis.nl,org.apache.lucene.an alysis.ru -Bundle-Version: 1.9.1.v200706181610 +Bundle-Version: 1.9.1.v20080530-1600 Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,2.0.0)";visib ility:=reexport Bundle-SymbolicName: org.apache.lucene.analysis Index: lucene.spec =================================================================== RCS file: /cvs/pkgs/rpms/lucene/devel/lucene.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- lucene.spec 9 Jul 2008 20:46:38 -0000 1.37 +++ lucene.spec 11 Jul 2008 20:02:02 -0000 1.38 @@ -36,7 +36,7 @@ Summary: High-performance, full-featured text search engine Name: lucene Version: 2.3.1 -Release: 3.2%{?dist} +Release: 3.3%{?dist} Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ @@ -270,6 +270,9 @@ %changelog +* Fri Jul 11 2008 Andrew Overholt 0:2.3.1-3.2 +- Update OSGi manifest data for Eclipse SDK 3.4 + * Wed Jul 9 2008 Tom "spot" Callaway - 0:2.3.1-3.2 - drop repotag Index: lucene-1.9-OSGi-MANIFEST.MF =================================================================== RCS file: /cvs/pkgs/rpms/lucene/devel/lucene-1.9-OSGi-MANIFEST.MF,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lucene-1.9-OSGi-MANIFEST.MF 31 Jul 2007 21:32:41 -0000 1.2 +++ lucene-1.9-OSGi-MANIFEST.MF 11 Jul 2008 20:02:02 -0000 1.3 @@ -7,7 +7,7 @@ ucene.document,org.apache.lucene.index,org.apache.lucene.queryParser, org.apache.lucene.search,org.apache.lucene.search.spans,org.apache.lu cene.store,org.apache.lucene.util -Bundle-Version: 1.9.1.v200706111724 +Bundle-Version: 1.9.1.v20080530-1600 Bundle-SymbolicName: org.apache.lucene Bundle-Name: Apache Lucene Bundle-Localization: plugin From fedora-extras-commits at redhat.com Fri Jul 11 20:03:20 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 11 Jul 2008 20:03:20 GMT Subject: rpms/kdebindings/devel .cvsignore, 1.44, 1.45 kdebindings.spec, 1.126, 1.127 sources, 1.48, 1.49 Message-ID: <200807112003.m6BK3Kv0006939@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833 Modified Files: .cvsignore kdebindings.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 8 Jul 2008 15:06:25 -0000 1.44 +++ .cvsignore 11 Jul 2008 20:02:15 -0000 1.45 @@ -1 +1 @@ -kdebindings-4.0.85.tar.bz2 +kdebindings-4.0.98.tar.bz2 Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- kdebindings.spec 9 Jul 2008 18:47:35 -0000 1.126 +++ kdebindings.spec 11 Jul 2008 20:02:15 -0000 1.127 @@ -17,7 +17,7 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.0.85 +Version: 4.0.98 Release: 1%{?dist} Summary: KDE bindings to non-C++ languages @@ -166,6 +166,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 8 Jul 2008 15:06:25 -0000 1.48 +++ sources 11 Jul 2008 20:02:15 -0000 1.49 @@ -1 +1 @@ -f2115a85c6baed245735ee44b740c3df kdebindings-4.0.85.tar.bz2 +254b290f8a19003422f5c1eb625a95d5 kdebindings-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 20:05:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 20:05:05 GMT Subject: rpms/perl-Test-Pod-Coverage/devel perl-Test-Pod-Coverage.spec, 1.9, 1.10 Message-ID: <200807112005.m6BK5595007152@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Pod-Coverage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7069 Modified Files: perl-Test-Pod-Coverage.spec Log Message: fix license tag Index: perl-Test-Pod-Coverage.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Pod-Coverage/devel/perl-Test-Pod-Coverage.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Test-Pod-Coverage.spec 27 Feb 2008 21:47:20 -0000 1.9 +++ perl-Test-Pod-Coverage.spec 11 Jul 2008 20:04:01 -0000 1.10 @@ -1,10 +1,10 @@ Name: perl-Test-Pod-Coverage Version: 1.08 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Check for pod coverage in your distribution Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Test-Pod-Coverage/ Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,6 +51,9 @@ %changelog +* Fri Jul 11 2008 Tom "spot" Callaway - 1.08-6 +- fix license tag + * Wed Feb 27 2008 Tom "spot" Callaway - 1.08-5 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Fri Jul 11 20:16:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 20:16:55 GMT Subject: rpms/perl-TimeDate/devel perl-TimeDate.spec,1.14,1.15 Message-ID: <200807112016.m6BKGtoU007667@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-TimeDate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7604 Modified Files: perl-TimeDate.spec Log Message: fix license tag Index: perl-TimeDate.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-TimeDate/devel/perl-TimeDate.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-TimeDate.spec 28 Feb 2008 13:05:27 -0000 1.14 +++ perl-TimeDate.spec 11 Jul 2008 20:16:07 -0000 1.15 @@ -1,11 +1,11 @@ Name: perl-TimeDate Version: 1.16 Epoch: 1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Perl module for time and date manipulation Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/TimeDate/ Source0: http://www.cpan.org/authors/id/G/GB/GBARR/TimeDate-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,6 +51,9 @@ %changelog +* Fri Jul 11 2008 Tom "spot" Callaway - 1:1.16-9 +- fix license tag + * Wed Feb 27 2008 Tom "spot" Callaway - 1:1.16-8 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Fri Jul 11 20:24:58 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:24:58 GMT Subject: rpms/gfs-artemisia-fonts/devel import.log, NONE, 1.1 gfs-artemisia-fonts-fontconfig.conf, 1.1, 1.2 gfs-artemisia-fonts.spec, 1.6, 1.7 Message-ID: <200807112024.m6BKOwR0008429@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-artemisia-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8356/devel Modified Files: gfs-artemisia-fonts-fontconfig.conf gfs-artemisia-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- gfs-artemisia-fonts-20070415-7_fc10:HEAD:gfs-artemisia-fonts-20070415-7.fc10.src.rpm:1215807827 Index: gfs-artemisia-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/gfs-artemisia-fonts/devel/gfs-artemisia-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gfs-artemisia-fonts-fontconfig.conf 26 Nov 2007 19:32:11 -0000 1.1 +++ gfs-artemisia-fonts-fontconfig.conf 11 Jul 2008 20:24:09 -0000 1.2 @@ -1,11 +1,5 @@ - GFS Artemisia Index: gfs-artemisia-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-artemisia-fonts/devel/gfs-artemisia-fonts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gfs-artemisia-fonts.spec 30 Apr 2008 21:48:53 -0000 1.6 +++ gfs-artemisia-fonts.spec 11 Jul 2008 20:24:09 -0000 1.7 @@ -1,4 +1,4 @@ -%define fontname gfs-artemisia +%define fontname gfs-artemisia %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 20070415 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GFS Artemisia fonts Group: User Interface/X @@ -59,16 +59,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -78,11 +76,15 @@ %config(noreplace) %{fontconfdir}/60-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070415-7 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070415-6 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:29:27 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:29:27 GMT Subject: rpms/gfs-baskerville-fonts/devel gfs-baskerville-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-baskerville-fonts.spec, 1.6, 1.7 Message-ID: <200807112029.m6BKTRj7008635@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-baskerville-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8595/devel Modified Files: gfs-baskerville-fonts.spec Added Files: gfs-baskerville-fonts-fontconfig.conf import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE gfs-baskerville-fonts-fontconfig.conf --- GFS Baskerville fantasy fantasy GFS Baskerville --- NEW FILE import.log --- gfs-baskerville-fonts-20070327-8_fc10:HEAD:gfs-baskerville-fonts-20070327-8.fc10.src.rpm:1215808097 Index: gfs-baskerville-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-baskerville-fonts/devel/gfs-baskerville-fonts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gfs-baskerville-fonts.spec 30 Apr 2008 21:50:47 -0000 1.6 +++ gfs-baskerville-fonts.spec 11 Jul 2008 20:28:42 -0000 1.7 @@ -1,17 +1,19 @@ -%define fontname gfs-baskerville -%define fontdir %{_datadir}/fonts/%{fontname} +%define fontname gfs-baskerville +%define fontdir %{_datadir}/fonts/%{fontname} +%define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_BASKERVILLE_OT Name: %{fontname}-fonts Version: 20070327 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GFS Baskerville Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces18th.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip +Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -62,22 +64,23 @@ install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf + %clean rm -fr %{buildroot} %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -85,11 +88,17 @@ %defattr(0644,root,root,0755) %doc *.txt *.pdf -%dir %{fontdir} +%config(noreplace) %{fontconfdir}/61-%{fontname}.conf + +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070415-8 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070327-7 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:33:06 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:33:06 GMT Subject: rpms/edrip-fonts/devel import.log, NONE, 1.1 .cvsignore, 1.5, 1.6 edrip-fonts.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200807112033.m6BKX6KO008903@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/edrip-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8828/devel Modified Files: .cvsignore edrip-fonts.spec sources Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- edrip-fonts-20080710-1_fc10:HEAD:edrip-fonts-20080710-1.fc10.src.rpm:1215808287 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/edrip-fonts/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 May 2008 20:25:19 -0000 1.5 +++ .cvsignore 11 Jul 2008 20:32:04 -0000 1.6 @@ -1 +1 @@ -edrip-src-20080523.tar.bz2 +edrip-src-20080710.tar.bz2 Index: edrip-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/edrip-fonts/devel/edrip-fonts.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- edrip-fonts.spec 4 Jun 2008 17:34:10 -0000 1.8 +++ edrip-fonts.spec 11 Jul 2008 20:32:04 -0000 1.9 @@ -5,8 +5,8 @@ %define archivename %{fontname}-src-%{version} Name: %{fontname}-fonts -Version: 20080523 -Release: 2%{?dist} +Version: 20080710 +Release: 1%{?dist} Summary: Edrip decorative font Group: User Interface/X @@ -17,8 +17,9 @@ Patch0: edrip-fonts-license.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildArch: noarch +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildArch: noarch + BuildRequires: xgridfit BuildRequires: fontforge >= 20080429 @@ -43,7 +44,7 @@ install -m 0644 -p Edrip-*.ttf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} -# Would be higher prio if the coverage was better +# Would be higher prio if the coverage was more complete install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf @@ -53,13 +54,13 @@ %post if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : + %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : + %{_bindir}/fc-cache %{fontdir} || : fi @@ -69,11 +70,15 @@ %config(noreplace) %{fontconfdir}/61-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/Edrip-*.ttf %changelog +* Fri Jul 11 2008 +- 20080710-1 +??? Fedora 10 alpha general package cleanup + * Wed Jun 4 2008 - 20080523-2 ??? Fix URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/edrip-fonts/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 May 2008 20:25:19 -0000 1.5 +++ sources 11 Jul 2008 20:32:04 -0000 1.6 @@ -1 +1 @@ -e370ad776b3f98fe638e164935c00fb0 edrip-src-20080523.tar.bz2 +e450ea109fb70d2ca337cdbf3d57ec63 edrip-src-20080710.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 20:33:06 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 11 Jul 2008 20:33:06 GMT Subject: rpms/fs_mark/EL-5 fs_mark.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807112033.m6BKX6rg008904@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/fs_mark/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8838 Modified Files: sources Added Files: fs_mark.spec Log Message: * Wed Jun 18 2008 Eric Sandeen 3.2-2 - Address review comments --- NEW FILE fs_mark.spec --- Name: fs_mark Version: 3.2 Release: 2%{?dist} Summary: Benchmark synchronous/async file creation Group: Applications/System License: GPLv2+ URL: http://developer.osdl.org/dev/doubt/fs_mark Source0: http://developer.osdl.org/dev/doubt/fs_mark/archive/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nostatic %description The fs_mark program is meant to give a low level bashing to file systems. The write pattern that we concentrate on is heavily synchronous IO across mutiple directories, drives, etc. %prep %setup -q -n fs_mark %patch0 -p1 %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -D fs_mark $RPM_BUILD_ROOT/usr/bin/fs_mark %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README plot_test %{_bindir}/fs_mark %changelog * Wed Jun 18 2008 Eric Sandeen 3.2-2 - Address review comments * Mon Jun 09 2008 Eric Sandeen 3.2-1 - Initial build Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jun 2008 00:45:31 -0000 1.1 +++ sources 11 Jul 2008 20:32:08 -0000 1.2 @@ -0,0 +1 @@ +d802070c6d6bcb106d1d88565a2ce50d fs_mark-3.2.tgz From fedora-extras-commits at redhat.com Fri Jul 11 20:35:30 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 11 Jul 2008 20:35:30 GMT Subject: rpms/fs_mark/EL-5 nostatic,NONE,1.1 Message-ID: <200807112035.m6BKZUb8009206@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/fs_mark/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9158 Added Files: nostatic Log Message: missing patch --- NEW FILE nostatic --- Index: fs_mark/Makefile =================================================================== --- fs_mark.orig/Makefile 2008-06-11 14:08:26.109985014 -0500 +++ fs_mark/Makefile 2008-06-11 14:08:40.902982531 -0500 @@ -10,14 +10,14 @@ DIR1= /test/dir1 DIR2= /test/dir2 COBJS= fs_mark.o lib_timing.o -CFLAGS= -O2 -Wall -D_FILE_OFFSET_BITS=64 +CFLAGS+= -O2 -Wall -D_FILE_OFFSET_BITS=64 all: fs_mark fs_mark.o: fs_mark.c fs_mark.h fs_mark: fs_mark.o lib_timing.o - ${CC} -static -o fs_mark fs_mark.o lib_timing.o + ${CC} -o fs_mark fs_mark.o lib_timing.o test: fs_mark ./fs_mark -d ${DIR1} -d ${DIR2} -s 51200 -n 4096 From fedora-extras-commits at redhat.com Fri Jul 11 20:35:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 20:35:37 GMT Subject: rpms/pop-before-smtp/devel .cvsignore, 1.3, 1.4 pop-before-smtp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807112035.m6BKZbBS009267@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/pop-before-smtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9055 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: 1.42 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pop-before-smtp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 May 2006 19:37:42 -0000 1.3 +++ .cvsignore 11 Jul 2008 20:34:33 -0000 1.4 @@ -1 +1 @@ -pop-before-smtp-1.41.tar.gz +pop-before-smtp-1.42.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/pkgs/rpms/pop-before-smtp/devel/pop-before-smtp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pop-before-smtp.spec 15 Sep 2006 13:53:40 -0000 1.4 +++ pop-before-smtp.spec 11 Jul 2008 20:34:33 -0000 1.5 @@ -1,11 +1,11 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.41 -Release: 2%{?dist} +Version: 1.42 +Release: 1%{?dist} -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-%{version}.tar.gz URL: http://popbsmtp.sourceforge.net/ -License: GPL or Artistic +License: GPL+ or Artistic Group: System Environment/Daemons BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.41 +%setup -q %build echo Nothing to build... @@ -61,6 +61,10 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Fri Jul 11 2008 Tom "spot" Callaway 1.42-1 +- 1.42 +- fix license tag + * Fri Sep 15 2006 Warren Togami 1.41-2 - rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pop-before-smtp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 May 2006 19:37:42 -0000 1.3 +++ sources 11 Jul 2008 20:34:33 -0000 1.4 @@ -1 +1 @@ -59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz +fd15b16c33be17c95ae63af96441cc72 pop-before-smtp-1.42.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 20:37:00 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:37:00 GMT Subject: rpms/gfs-bodoni-classic-fonts/devel gfs-bodoni-classic-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-bodoni-classic-fonts.spec, 1.5, 1.6 Message-ID: <200807112037.m6BKb01P009401@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-bodoni-classic-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9342/devel Modified Files: gfs-bodoni-classic-fonts.spec Added Files: gfs-bodoni-classic-fonts-fontconfig.conf import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE gfs-bodoni-classic-fonts-fontconfig.conf --- GFS Bodoni Classic fantasy fantasy GFS Bodoni Classic --- NEW FILE import.log --- gfs-bodoni-classic-fonts-20070415-7_fc10:HEAD:gfs-bodoni-classic-fonts-20070415-7.fc10.src.rpm:1215808489 Index: gfs-bodoni-classic-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-bodoni-classic-fonts/devel/gfs-bodoni-classic-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gfs-bodoni-classic-fonts.spec 30 Apr 2008 21:52:06 -0000 1.5 +++ gfs-bodoni-classic-fonts.spec 11 Jul 2008 20:36:06 -0000 1.6 @@ -1,17 +1,19 @@ -%define fontname gfs-bodoni-classic -%define fontdir %{_datadir}/fonts/%{fontname} +%define fontname gfs-bodoni-classic +%define fontdir %{_datadir}/fonts/%{fontname} +%define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_BODONICLASS_OT Name: %{fontname}-fonts Version: 20070415 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GFS Bodoni Classic oblique Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces18th.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip +Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -57,22 +59,23 @@ install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf + %clean rm -fr %{buildroot} %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -80,11 +83,17 @@ %defattr(0644,root,root,0755) %doc *.txt *.pdf -%dir %{fontdir} +%config(noreplace) %{fontconfdir}/61-%{fontname}.conf + +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070415-7 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070415-6 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:40:20 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:40:20 GMT Subject: rpms/gfs-bodoni-fonts/devel import.log, NONE, 1.1 gfs-bodoni-fonts-fontconfig.conf, 1.1, 1.2 gfs-bodoni-fonts.spec, 1.5, 1.6 Message-ID: <200807112040.m6BKeKlB009645@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-bodoni-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9595/devel Modified Files: gfs-bodoni-fonts-fontconfig.conf gfs-bodoni-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- gfs-bodoni-fonts-20070415-6_fc10:HEAD:gfs-bodoni-fonts-20070415-6.fc10.src.rpm:1215808757 Index: gfs-bodoni-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/gfs-bodoni-fonts/devel/gfs-bodoni-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gfs-bodoni-fonts-fontconfig.conf 26 Nov 2007 19:41:21 -0000 1.1 +++ gfs-bodoni-fonts-fontconfig.conf 11 Jul 2008 20:39:34 -0000 1.2 @@ -1,11 +1,5 @@ - GFS Bodoni Index: gfs-bodoni-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-bodoni-fonts/devel/gfs-bodoni-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gfs-bodoni-fonts.spec 30 Apr 2008 21:53:24 -0000 1.5 +++ gfs-bodoni-fonts.spec 11 Jul 2008 20:39:34 -0000 1.6 @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 20070415 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GFS Bodoni fonts Group: User Interface/X @@ -56,16 +56,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -75,11 +73,15 @@ %config(noreplace) %{fontconfdir}/60-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070415-6 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070415-5 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:46:40 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 11 Jul 2008 20:46:40 GMT Subject: rpms/python-fedora/F-8 python-fedora.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200807112046.m6BKkeQT010093@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9962/F-8 Modified Files: python-fedora.spec sources Log Message: Update to 0.3, the latest upstream release Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/python-fedora.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-fedora.spec 20 May 2008 01:02:19 -0000 1.12 +++ python-fedora.spec 11 Jul 2008 20:45:18 -0000 1.13 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.2.99.11.1 +Version: 0.3 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -49,6 +49,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 02 2008 Luke Macken - 0.3-1 +- New upstream release. + * Wed Apr 23 2008 Toshio Kuratomi - 0.2.99.11.1-1 - Fix a crasher bug. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 20 May 2008 01:02:19 -0000 1.12 +++ sources 11 Jul 2008 20:45:18 -0000 1.13 @@ -1 +1 @@ -ba500610a05a4a450e3c5db4f8074848 python-fedora-0.2.99.11.1.tar.gz +a9bd04791e4e16f559ed5ed8faa41968 python-fedora-0.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 20:46:43 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 11 Jul 2008 20:46:43 GMT Subject: rpms/python-fedora/F-9 python-fedora.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200807112046.m6BKkhrT010111@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9962/F-9 Modified Files: python-fedora.spec sources Log Message: Update to 0.3, the latest upstream release Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- python-fedora.spec 20 May 2008 01:02:41 -0000 1.17 +++ python-fedora.spec 11 Jul 2008 20:45:40 -0000 1.18 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.2.99.11.1 +Version: 0.3 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -49,6 +49,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 02 2008 Luke Macken - 0.3-1 +- New upstream release. + * Wed Apr 23 2008 Toshio Kuratomi - 0.2.99.11.1-1 - Fix a crasher bug. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 May 2008 01:02:41 -0000 1.14 +++ sources 11 Jul 2008 20:45:40 -0000 1.15 @@ -1 +1 @@ -ba500610a05a4a450e3c5db4f8074848 python-fedora-0.2.99.11.1.tar.gz +a9bd04791e4e16f559ed5ed8faa41968 python-fedora-0.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 20:46:43 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:46:43 GMT Subject: rpms/gfs-complutum-fonts/devel gfs-complutum-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-complutum-fonts.spec, 1.4, 1.5 Message-ID: <200807112046.m6BKkh7X010112@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-complutum-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10004/devel Modified Files: gfs-complutum-fonts.spec Added Files: gfs-complutum-fonts-fontconfig.conf import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE gfs-complutum-fonts-fontconfig.conf --- GFS Complutum fantasy fantasy GFS Complutum --- NEW FILE import.log --- gfs-complutum-fonts-20070413-8_fc10:HEAD:gfs-complutum-fonts-20070413-8.fc10.src.rpm:1215809112 Index: gfs-complutum-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-complutum-fonts/devel/gfs-complutum-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-complutum-fonts.spec 30 Apr 2008 21:54:38 -0000 1.4 +++ gfs-complutum-fonts.spec 11 Jul 2008 20:45:41 -0000 1.5 @@ -1,17 +1,19 @@ -%define fontname gfs-complutum -%define fontdir %{_datadir}/fonts/%{fontname} +%define fontname gfs-complutum +%define fontdir %{_datadir}/fonts/%{fontname} +%define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_COMPLUTUM_OT Name: %{fontname}-fonts Version: 20070413 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GFS Complutum Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces16th.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip +Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -67,22 +69,23 @@ install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf + %clean rm -fr %{buildroot} %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -90,11 +93,17 @@ %defattr(0644,root,root,0755) %doc *.txt *.pdf -%dir %{fontdir} +%config(noreplace) %{fontconfdir}/61-%{fontname}.conf + +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070413-8 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070413-7 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:47:10 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:47:10 GMT Subject: rpms/gfs-didot-classic-fonts/devel gfs-didot-classic-fonts-fontconfig.conf, 1.1, 1.2 gfs-didot-classic-fonts.spec, 1.5, 1.6 import.log, 1.1, 1.2 Message-ID: <200807112047.m6BKlAIR010214@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-didot-classic-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10068/devel Modified Files: gfs-didot-classic-fonts-fontconfig.conf gfs-didot-classic-fonts.spec import.log Log Message: ??? Fedora 10 alpha general package cleanup Index: gfs-didot-classic-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/gfs-didot-classic-fonts/devel/gfs-didot-classic-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gfs-didot-classic-fonts-fontconfig.conf 26 Nov 2007 19:50:44 -0000 1.1 +++ gfs-didot-classic-fonts-fontconfig.conf 11 Jul 2008 20:46:23 -0000 1.2 @@ -1,11 +1,5 @@ - GFS Didot @@ -19,4 +13,10 @@ serif + + serif + + GFS Didot + + Index: gfs-didot-classic-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-didot-classic-fonts/devel/gfs-didot-classic-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gfs-didot-classic-fonts.spec 5 Jul 2008 23:24:12 -0000 1.5 +++ gfs-didot-classic-fonts.spec 11 Jul 2008 20:46:23 -0000 1.6 @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 20080702 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GFS Didot Classic Greek font Group: User Interface/X @@ -89,6 +89,10 @@ %changelog +* Fri Jul 11 2008 +- 20080702-2 +??? Fedora 10 alpha general package cleanup + * Sun Jul 06 2008 Nicolas Mailhot - 20080702-1 ?? Upstream stealth update Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gfs-didot-classic-fonts/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Jul 2008 23:24:12 -0000 1.1 +++ import.log 11 Jul 2008 20:46:23 -0000 1.2 @@ -1 +1,2 @@ gfs-didot-classic-fonts-20080702-1_fc10:HEAD:gfs-didot-classic-fonts-20080702-1.fc10.src.rpm:1215300135 +gfs-didot-classic-fonts-20080702-2_fc10:HEAD:gfs-didot-classic-fonts-20080702-2.fc10.src.rpm:1215809169 From fedora-extras-commits at redhat.com Fri Jul 11 20:48:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 11 Jul 2008 20:48:38 GMT Subject: rpms/yap/devel yap.spec,1.20,1.21 Message-ID: <200807112048.m6BKmcCp010442@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/yap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10339 Modified Files: yap.spec Log Message: fix license tag Index: yap.spec =================================================================== RCS file: /cvs/pkgs/rpms/yap/devel/yap.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- yap.spec 10 Apr 2008 19:05:30 -0000 1.20 +++ yap.spec 11 Jul 2008 20:47:46 -0000 1.21 @@ -1,11 +1,11 @@ Name: yap Version: 5.1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages -License: Artistic/LGPL +License: Artistic 2.0 or LGPLv2+ Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.1.tar.gz Source1: guard_entailment.pl Source2: chr_translate_bootstrap1.pl @@ -137,6 +137,9 @@ %changelog +* Fri Jul 11 2008 Tom "spot" Callaway - 5.1.1-11 +- fix license tag + * Thu Apr 10 2008 Gerard Milmeister - 5.1.1-10 - enable rpm_opt_flags - patch for incorrect open call with O_CREAT From fedora-extras-commits at redhat.com Fri Jul 11 20:49:06 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:49:06 GMT Subject: rpms/gfs-didot-fonts/devel import.log, NONE, 1.1 gfs-didot-fonts-fontconfig.conf, 1.1, 1.2 gfs-didot-fonts.spec, 1.4, 1.5 Message-ID: <200807112049.m6BKn60h010542@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-didot-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10411/devel Modified Files: gfs-didot-fonts-fontconfig.conf gfs-didot-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- gfs-didot-fonts-20070616-7_fc10:HEAD:gfs-didot-fonts-20070616-7.fc10.src.rpm:1215809267 Index: gfs-didot-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/gfs-didot-fonts/devel/gfs-didot-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gfs-didot-fonts-fontconfig.conf 27 Nov 2007 21:09:49 -0000 1.1 +++ gfs-didot-fonts-fontconfig.conf 11 Jul 2008 20:48:22 -0000 1.2 @@ -1,11 +1,5 @@ - Palatino @@ -13,6 +7,12 @@ GFS Didot + + GFS Didot Classic + + GFS Didot + + GFS Didot Index: gfs-didot-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-didot-fonts/devel/gfs-didot-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-didot-fonts.spec 30 Apr 2008 21:57:18 -0000 1.4 +++ gfs-didot-fonts.spec 11 Jul 2008 20:48:22 -0000 1.5 @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 20070616 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GFS Didot fonts Group: User Interface/X @@ -55,16 +55,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -74,11 +72,15 @@ %config(noreplace) %{fontconfdir}/60-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070616-7 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070616-6 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:49:43 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:49:43 GMT Subject: rpms/gfs-gazis-fonts/devel import.log, NONE, 1.1 gfs-gazis-fonts-fontconfig.conf, 1.1, 1.2 gfs-gazis-fonts.spec, 1.5, 1.6 Message-ID: <200807112049.m6BKnheF010664@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-gazis-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10528/devel Modified Files: gfs-gazis-fonts-fontconfig.conf gfs-gazis-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- gfs-gazis-fonts-20080318-3_fc10:HEAD:gfs-gazis-fonts-20080318-3.fc10.src.rpm:1215809328 Index: gfs-gazis-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/gfs-gazis-fonts/devel/gfs-gazis-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gfs-gazis-fonts-fontconfig.conf 27 Nov 2007 21:13:43 -0000 1.1 +++ gfs-gazis-fonts-fontconfig.conf 11 Jul 2008 20:48:59 -0000 1.2 @@ -1,11 +1,5 @@ - GFS Gazis @@ -13,4 +7,10 @@ serif + + serif + + GFS Gazis + + Index: gfs-gazis-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-gazis-fonts/devel/gfs-gazis-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gfs-gazis-fonts.spec 30 Apr 2008 21:58:29 -0000 1.5 +++ gfs-gazis-fonts.spec 11 Jul 2008 20:48:59 -0000 1.6 @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 20080318 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GFS Gazis Greek font Group: User Interface/X @@ -66,16 +66,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -85,11 +83,15 @@ %config(noreplace) %{fontconfdir}/61-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20080318-3 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20080318-2 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:50:35 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:50:35 GMT Subject: rpms/gfs-neohellenic-fonts/devel import.log, NONE, 1.1 gfs-neohellenic-fonts-fontconfig.conf, 1.1, 1.2 gfs-neohellenic-fonts.spec, 1.4, 1.5 Message-ID: <200807112050.m6BKoZWV010806@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-neohellenic-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10668/devel Modified Files: gfs-neohellenic-fonts-fontconfig.conf gfs-neohellenic-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- gfs-neohellenic-fonts-20070415-6_fc10:HEAD:gfs-neohellenic-fonts-20070415-6.fc10.src.rpm:1215809363 Index: gfs-neohellenic-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/gfs-neohellenic-fonts/devel/gfs-neohellenic-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gfs-neohellenic-fonts-fontconfig.conf 26 Nov 2007 19:57:54 -0000 1.1 +++ gfs-neohellenic-fonts-fontconfig.conf 11 Jul 2008 20:49:44 -0000 1.2 @@ -1,11 +1,5 @@ - GFS Neohellenic Index: gfs-neohellenic-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-neohellenic-fonts/devel/gfs-neohellenic-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-neohellenic-fonts.spec 30 Apr 2008 21:59:45 -0000 1.4 +++ gfs-neohellenic-fonts.spec 11 Jul 2008 20:49:44 -0000 1.5 @@ -1,4 +1,4 @@ -%define fontname gfs-neohellenic +%define fontname gfs-neohellenic %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 20070415 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GFS Neohellenic fonts Group: User Interface/X @@ -75,16 +75,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -94,11 +92,15 @@ %config(noreplace) %{fontconfdir}/60-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070415-6 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070415-5 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:51:20 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:51:20 GMT Subject: rpms/gfs-olga-fonts/devel gfs-olga-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-olga-fonts.spec, 1.4, 1.5 Message-ID: <200807112051.m6BKpKqL010972@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-olga-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/devel Modified Files: gfs-olga-fonts.spec Added Files: gfs-olga-fonts-fontconfig.conf import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE gfs-olga-fonts-fontconfig.conf --- GFS Olga fantasy fantasy GFS Olga --- NEW FILE import.log --- gfs-olga-fonts-20060908-6_fc10:HEAD:gfs-olga-fonts-20060908-6.fc10.src.rpm:1215809420 Index: gfs-olga-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-olga-fonts/devel/gfs-olga-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-olga-fonts.spec 30 Apr 2008 22:01:04 -0000 1.4 +++ gfs-olga-fonts.spec 11 Jul 2008 20:50:30 -0000 1.5 @@ -1,17 +1,19 @@ -%define fontname gfs-olga +%define fontname gfs-olga %define fontdir %{_datadir}/fonts/%{fontname} +%define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_OLGA_OT Name: %{fontname}-fonts Version: 20060908 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GFS Olga experimental oblique font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces20th.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip +Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -54,22 +56,23 @@ install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf + %clean rm -fr %{buildroot} %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -77,11 +80,17 @@ %defattr(0644,root,root,0755) %doc *.txt *.pdf -%dir %{fontdir} +%config(noreplace) %{fontconfdir}/61-%{fontname}.conf + +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20060908-6 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20060908-5 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:52:02 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:52:02 GMT Subject: rpms/gfs-porson-fonts/devel import.log, NONE, 1.1 gfs-porson-fonts-fontconfig.conf, 1.1, 1.2 gfs-porson-fonts.spec, 1.4, 1.5 Message-ID: <200807112052.m6BKq214011090@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-porson-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10953/devel Modified Files: gfs-porson-fonts-fontconfig.conf gfs-porson-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- gfs-porson-fonts-20060908-8_fc10:HEAD:gfs-porson-fonts-20060908-8.fc10.src.rpm:1215809463 Index: gfs-porson-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/gfs-porson-fonts/devel/gfs-porson-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gfs-porson-fonts-fontconfig.conf 27 Nov 2007 21:21:18 -0000 1.1 +++ gfs-porson-fonts-fontconfig.conf 11 Jul 2008 20:51:14 -0000 1.2 @@ -1,11 +1,5 @@ - GFS Porson @@ -13,4 +7,10 @@ serif + + serif + + GFS Porson + + Index: gfs-porson-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-porson-fonts/devel/gfs-porson-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-porson-fonts.spec 30 Apr 2008 22:02:31 -0000 1.4 +++ gfs-porson-fonts.spec 11 Jul 2008 20:51:14 -0000 1.5 @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 20060908 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GFS Porson Greek font Group: User Interface/X @@ -66,16 +66,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -85,11 +83,15 @@ %config(noreplace) %{fontconfdir}/61-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20060908-8 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20060908-7 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:52:08 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Fri, 11 Jul 2008 20:52:08 GMT Subject: rpms/generic-logos/devel .cvsignore, 1.4, 1.5 generic-logos.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807112052.m6BKq8Rx011104@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/generic-logos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10952 Modified Files: .cvsignore generic-logos.spec sources Log Message: add system logo for spinfinity Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/generic-logos/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Apr 2008 22:20:45 -0000 1.4 +++ .cvsignore 11 Jul 2008 20:51:21 -0000 1.5 @@ -1 +1 @@ -generic-logos-9.0.0.tar.bz2 +generic-logos-9.99.0.tar.bz2 Index: generic-logos.spec =================================================================== RCS file: /cvs/extras/rpms/generic-logos/devel/generic-logos.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- generic-logos.spec 15 Apr 2008 22:20:45 -0000 1.4 +++ generic-logos.spec 11 Jul 2008 20:51:21 -0000 1.5 @@ -1,6 +1,6 @@ Name: generic-logos Summary: Icons and pictures -Version: 9.0.0 +Version: 9.99.0 Release: 1%{?dist} Group: System Environment/Base Source0: generic-logos-%{version}.tar.bz2 @@ -73,6 +73,9 @@ # end i386 bits %changelog +* Fri Jul 11 2008 Bill Nottingham - 9.99.0-1 +- add a system logo for plymouth's spinfinity plugin + * Tue Apr 15 2008 Bill Nottingham - 9.0.0-1 - updates for current fedora-logos (much thanks to ) - remove KDE Infinity splash Index: sources =================================================================== RCS file: /cvs/extras/rpms/generic-logos/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Apr 2008 22:20:45 -0000 1.4 +++ sources 11 Jul 2008 20:51:21 -0000 1.5 @@ -1 +1 @@ -6470f18b863936b85ca81fa9efb9122f generic-logos-9.0.0.tar.bz2 +0d1785e12e7289082210ca941712929e generic-logos-9.99.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 20:54:45 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:54:45 GMT Subject: rpms/gfs-solomos-fonts/devel gfs-solomos-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-solomos-fonts.spec, 1.4, 1.5 Message-ID: <200807112054.m6BKsjZo011529@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-solomos-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11403/devel Modified Files: gfs-solomos-fonts.spec Added Files: gfs-solomos-fonts-fontconfig.conf import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE gfs-solomos-fonts-fontconfig.conf --- GFS Solomos fantasy fantasy GFS Solomos --- NEW FILE import.log --- gfs-solomos-fonts-20071114-7_fc10:HEAD:gfs-solomos-fonts-20071114-7.fc10.src.rpm:1215809630 Index: gfs-solomos-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-solomos-fonts/devel/gfs-solomos-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-solomos-fonts.spec 30 Apr 2008 22:03:49 -0000 1.4 +++ gfs-solomos-fonts.spec 11 Jul 2008 20:54:01 -0000 1.5 @@ -1,17 +1,19 @@ -%define fontname gfs-solomos -%define fontdir %{_datadir}/fonts/%{fontname} +%define fontname gfs-solomos +%define fontdir %{_datadir}/fonts/%{fontname} +%define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_SOLOMOS_OT Name: %{fontname}-fonts Version: 20071114 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GFS Solomos oblique Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces19th.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip +Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -61,22 +63,23 @@ install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf + %clean rm -fr %{buildroot} %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -84,11 +87,17 @@ %defattr(0644,root,root,0755) %doc *.txt *.pdf -%dir %{fontdir} +%config(noreplace) %{fontconfdir}/61-%{fontname}.conf + +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20071114-7 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20071114-6 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:55:32 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:55:32 GMT Subject: rpms/gfs-theokritos-fonts/devel gfs-theokritos-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-theokritos-fonts.spec, 1.4, 1.5 Message-ID: <200807112055.m6BKtW2E011634@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-theokritos-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11507/devel Modified Files: gfs-theokritos-fonts.spec Added Files: gfs-theokritos-fonts-fontconfig.conf import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE gfs-theokritos-fonts-fontconfig.conf --- GFS Theokritos fantasy fantasy GFS Theokritos --- NEW FILE import.log --- gfs-theokritos-fonts-20070415-7_fc10:HEAD:gfs-theokritos-fonts-20070415-7.fc10.src.rpm:1215809664 Index: gfs-theokritos-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gfs-theokritos-fonts/devel/gfs-theokritos-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gfs-theokritos-fonts.spec 30 Apr 2008 22:45:48 -0000 1.4 +++ gfs-theokritos-fonts.spec 11 Jul 2008 20:54:35 -0000 1.5 @@ -1,17 +1,19 @@ -%define fontname gfs-theokritos +%define fontname gfs-theokritos %define fontdir %{_datadir}/fonts/%{fontname} +%define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_THEOKRITOS_OT Name: %{fontname}-fonts Version: 20070415 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GFS Theokritos decorative font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces20th.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip +Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -61,22 +63,23 @@ install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/60-%{fontname}.conf + %clean rm -fr %{buildroot} %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -84,11 +87,17 @@ %defattr(0644,root,root,0755) %doc *.txt *.pdf -%dir %{fontdir} +%config(noreplace) %{fontconfdir}/60-%{fontname}.conf + +%dir %{fontdir}/ %{fontdir}/*.otf %changelog +* Fri Jul 11 2008 +- 20070415-7 +??? Fedora 10 alpha general package cleanup + * Wed Apr 30 2008 Nicolas Mailhot - 20070415-6 ??? Yet another prep fix?? From fedora-extras-commits at redhat.com Fri Jul 11 20:57:39 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:57:39 GMT Subject: rpms/stix-fonts/devel import.log, NONE, 1.1 stix-fonts-fontconfig.conf, 1.2, 1.3 stix-fonts-integrals-fontconfig.conf, 1.2, 1.3 stix-fonts-pua-fontconfig.conf, 1.2, 1.3 stix-fonts-sizes-fontconfig.conf, 1.2, 1.3 stix-fonts-variants-fontconfig.conf, 1.2, 1.3 stix-fonts.spec, 1.3, 1.4 Message-ID: <200807112057.m6BKvd9l011841@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/stix-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11759/devel Modified Files: stix-fonts-fontconfig.conf stix-fonts-integrals-fontconfig.conf stix-fonts-pua-fontconfig.conf stix-fonts-sizes-fontconfig.conf stix-fonts-variants-fontconfig.conf stix-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- stix-fonts-0_9-7_fc10:HEAD:stix-fonts-0.9-7.fc10.src.rpm:1215809789 Index: stix-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-fontconfig.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stix-fonts-fontconfig.conf 1 Nov 2007 18:20:55 -0000 1.2 +++ stix-fonts-fontconfig.conf 11 Jul 2008 20:56:41 -0000 1.3 @@ -1,12 +1,5 @@ - STIXGeneral Index: stix-fonts-integrals-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-integrals-fontconfig.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stix-fonts-integrals-fontconfig.conf 1 Nov 2007 18:20:55 -0000 1.2 +++ stix-fonts-integrals-fontconfig.conf 11 Jul 2008 20:56:41 -0000 1.3 @@ -1,12 +1,5 @@ - STIXIntegrals Index: stix-fonts-pua-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-pua-fontconfig.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stix-fonts-pua-fontconfig.conf 1 Nov 2007 18:20:55 -0000 1.2 +++ stix-fonts-pua-fontconfig.conf 11 Jul 2008 20:56:41 -0000 1.3 @@ -1,12 +1,5 @@ - STIXNonUnicode Index: stix-fonts-sizes-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-sizes-fontconfig.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stix-fonts-sizes-fontconfig.conf 1 Nov 2007 18:20:55 -0000 1.2 +++ stix-fonts-sizes-fontconfig.conf 11 Jul 2008 20:56:41 -0000 1.3 @@ -1,12 +1,5 @@ - STIXSize1 Index: stix-fonts-variants-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-variants-fontconfig.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stix-fonts-variants-fontconfig.conf 1 Nov 2007 18:20:55 -0000 1.2 +++ stix-fonts-variants-fontconfig.conf 11 Jul 2008 20:56:41 -0000 1.3 @@ -1,12 +1,5 @@ - STIXVariants Index: stix-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stix-fonts.spec 1 Nov 2007 18:20:55 -0000 1.3 +++ stix-fonts.spec 11 Jul 2008 20:56:41 -0000 1.4 @@ -6,7 +6,7 @@ Name: %{fontname}-fonts Version: 0.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: STIX scientific and engineering fonts Group: User Interface/X @@ -115,7 +115,7 @@ %build -# Source format not available +# Nothing there %install @@ -137,72 +137,61 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %post pua -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun pua -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %post integrals -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun integrals -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %post sizes -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun sizes -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi - %post variants -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun variants -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache -f %{fontdir} - fi +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi @@ -211,7 +200,7 @@ %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf -%dir %{fontdir} +%dir %{fontdir}/ %{fontdir}/STIXGeneral*otf @@ -240,6 +229,11 @@ %changelog +* Fri Jul 11 2008 +- 0.9-7 +??? Fedora 10 alpha general package cleanup + + * Thu Nov 1 2007 ??? 0.9-6 ??? Add some fontconfig aliasing rules From fedora-extras-commits at redhat.com Fri Jul 11 20:58:32 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 20:58:32 GMT Subject: rpms/yanone-kaffeesatz-fonts/devel import.log, NONE, 1.1 yanone-kaffeesatz-fonts-fontconfig.conf, 1.1, 1.2 yanone-kaffeesatz-fonts.spec, 1.1, 1.2 Message-ID: <200807112058.m6BKwWTu012016@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11854/devel Modified Files: yanone-kaffeesatz-fonts-fontconfig.conf yanone-kaffeesatz-fonts.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- yanone-kaffeesatz-fonts-20061120-3_fc10:HEAD:yanone-kaffeesatz-fonts-20061120-3.fc10.src.rpm:1215809853 Index: yanone-kaffeesatz-fonts-fontconfig.conf =================================================================== RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yanone-kaffeesatz-fonts-fontconfig.conf 10 Jan 2008 21:54:30 -0000 1.1 +++ yanone-kaffeesatz-fonts-fontconfig.conf 11 Jul 2008 20:57:44 -0000 1.2 @@ -1,17 +1,16 @@ - Yanone Kaffeesatz - sans-serif + fantasy + + fantasy + + Yanone Kaffeesatz + + Index: yanone-kaffeesatz-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yanone-kaffeesatz-fonts.spec 10 Jan 2008 21:54:30 -0000 1.1 +++ yanone-kaffeesatz-fonts.spec 11 Jul 2008 20:57:44 -0000 1.2 @@ -40,7 +40,7 @@ install -m 0644 -p *.otf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} -install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf +install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/60-%{fontname}.conf %clean @@ -48,16 +48,14 @@ %post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} || : +if [ -x %{_bindir}/fc-cache ] ; then + %{_bindir}/fc-cache %{fontdir} || : fi %postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : - fi fi @@ -65,13 +63,17 @@ %defattr(0644,root,root,0755) %doc *.pdf -%config(noreplace) %{fontconfdir}/61-%{fontname}.conf +%config(noreplace) %{fontconfdir}/60-%{fontname}.conf %dir %{fontdir} %{fontdir}/*.otf -%changelog +%changelog +* Fri Jul 11 2008 +- 20061120-4 +??? Fedora 10 alpha general package cleanup + * Sun Nov 25 2007 Nicolas Mailhot ??? 20061120-3 ??? initial packaging From fedora-extras-commits at redhat.com Fri Jul 11 20:58:48 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Fri, 11 Jul 2008 20:58:48 GMT Subject: rpms/anaconda/devel .cvsignore, 1.546, 1.547 anaconda.spec, 1.688, 1.689 sources, 1.679, 1.680 Message-ID: <200807112058.m6BKwmUN012064@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11831 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.546 retrieving revision 1.547 diff -u -r1.546 -r1.547 --- .cvsignore 9 Jul 2008 18:29:10 -0000 1.546 +++ .cvsignore 11 Jul 2008 20:57:45 -0000 1.547 @@ -1,3 +1,4 @@ clog anaconda-11.4.1.12.tar.bz2 anaconda-11.4.1.13.tar.bz2 +anaconda-11.4.1.14.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.688 retrieving revision 1.689 diff -u -r1.688 -r1.689 --- anaconda.spec 9 Jul 2008 18:29:11 -0000 1.688 +++ anaconda.spec 11 Jul 2008 20:57:45 -0000 1.689 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.13 +Version: 11.4.1.14 Release: 1 License: GPLv2+ Group: Applications/System @@ -194,6 +194,33 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jul 11 2008 Chris Lumens - 11.4.1.14-1 +- Remove an extra tab that was causing problems with the Iloko + translation. (clumens) +- Use the right stage2.img path for kickstart URL installs (#452140). (clumens) +- Convert package errors to unicode before displaying them (#441200). (clumens) +- Display a status message while waiting for the CD to become ready. (clumens) +- Fix window title to be the same as all others. (clumens) +- In cmdline mode, give some feedback when transferring loader files. (clumens) +- If network config info isn't provided for cmdline, abort. (clumens) +- If we're not given a method in cmdline mode, we have to quit. (clumens) +- In cmdline mode, set language to the default if none is provided. (clumens) +- Don't stop on the method screen if stage2= is provided. (clumens) +- Add support for NFS to the repo editor (#443733). (clumens) +- Fix whitespace silliness. (pjones) +- Fix closing the drive door so that if the kernel happens to start giving us + the right error code, we'll handle it correctly... (pjones) +- Fix the mysterious Error: OK message. (clumens) +- The return value from mediaCheckCdrom is totally useless. (clumens) +- Add better error handling when initializing yum (#453695). (clumens) +- Add functions for creating repos as well. (clumens) +- Don't handle all possible exceptions as if they were repo errors. (clumens) +- Reorganize to make it easier to reset the "base" repository. (clumens) +- Remove the pkgSack when a repo is disabled. (clumens) +- Use the new method of calling the NetworkConfigurator. (clumens) +- Add an updated repo editor. (clumens) +- Don't suggest text mode to the poor, poor user. (pjones) + * Wed Jul 09 2008 Chris Lumens - 11.4.1.13-1 - Filter out source and debuginfo repos from the UI. (clumens) - Add the MD5 sum to the boot.iso to avoid errors in loader Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.679 retrieving revision 1.680 diff -u -r1.679 -r1.680 --- sources 9 Jul 2008 18:29:11 -0000 1.679 +++ sources 11 Jul 2008 20:57:45 -0000 1.680 @@ -1 +1 @@ -2ee2cd5160e972c746e86bfc245012b7 anaconda-11.4.1.13.tar.bz2 +d1aeb296df8986a394306de339e433b6 anaconda-11.4.1.14.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 11 21:05:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:05:56 +0000 Subject: [pkgdb] python-cherrypy2 (Fedora, 9) updated by toshio Message-ID: <200807112105.m6BL5uKH017929@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-cherrypy2 (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-cherrypy2 (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-cherrypy2 (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-cherrypy2 (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-cherrypy2 (Fedora 9) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cherrypy2 From fedora-extras-commits at redhat.com Fri Jul 11 21:05:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:05:56 +0000 Subject: [pkgdb] python-cherrypy2 (Fedora, devel) updated by toshio Message-ID: <200807112105.m6BL5uKL017929@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-cherrypy2 (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-cherrypy2 (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-cherrypy2 (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-cherrypy2 (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-cherrypy2 (Fedora devel) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cherrypy2 From fedora-extras-commits at redhat.com Fri Jul 11 21:06:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:27 +0000 Subject: [pkgdb] python-cjson (Fedora, devel) updated by toshio Message-ID: <200807112106.m6BL6Ri2017983@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-cjson (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-cjson (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-cjson (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-cjson (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-cjson (Fedora devel) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cjson From fedora-extras-commits at redhat.com Fri Jul 11 21:06:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:27 +0000 Subject: [pkgdb] python-cjson (Fedora, 9) updated by toshio Message-ID: <200807112106.m6BL6Ri4017983@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-cjson (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-cjson (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-cjson (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-cjson (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-cjson (Fedora 9) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cjson From fedora-extras-commits at redhat.com Fri Jul 11 21:06:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:27 +0000 Subject: [pkgdb] python-cjson (Fedora EPEL, 5) updated by toshio Message-ID: <200807112106.m6BL6Ri6017983@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-cjson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-cjson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-cjson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-cjson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-cjson (Fedora EPEL 5) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cjson From fedora-extras-commits at redhat.com Fri Jul 11 21:06:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:27 +0000 Subject: [pkgdb] python-cjson (Fedora, 8) updated by toshio Message-ID: <200807112106.m6BL6Ri8017983@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-cjson (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-cjson (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-cjson (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-cjson (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-cjson (Fedora 8) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-cjson From fedora-extras-commits at redhat.com Fri Jul 11 21:06:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:36 +0000 Subject: [pkgdb] python-toscawidgets (Fedora, 9) updated by toshio Message-ID: <200807112106.m6BL5uKO017929@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-toscawidgets (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-toscawidgets (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-toscawidgets (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-toscawidgets (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-toscawidgets (Fedora 9) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-toscawidgets From fedora-extras-commits at redhat.com Fri Jul 11 21:06:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:36 +0000 Subject: [pkgdb] python-toscawidgets (Fedora EPEL, 5) updated by toshio Message-ID: <200807112106.m6BL6bku018069@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-toscawidgets (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-toscawidgets (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-toscawidgets (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-toscawidgets (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-toscawidgets (Fedora EPEL 5) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-toscawidgets From fedora-extras-commits at redhat.com Fri Jul 11 21:06:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:37 +0000 Subject: [pkgdb] python-toscawidgets (Fedora, 8) updated by toshio Message-ID: <200807112106.m6BL6bl0018069@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-toscawidgets (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-toscawidgets (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-toscawidgets (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-toscawidgets (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-toscawidgets (Fedora 8) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-toscawidgets From fedora-extras-commits at redhat.com Fri Jul 11 21:06:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:06:36 +0000 Subject: [pkgdb] python-toscawidgets (Fedora, devel) updated by toshio Message-ID: <200807112106.m6BL6bkw018069@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-toscawidgets (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-toscawidgets (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-toscawidgets (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-toscawidgets (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-toscawidgets (Fedora devel) for fschwarz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-toscawidgets From fedora-extras-commits at redhat.com Fri Jul 11 21:09:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:13 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora, 8) updated by toshio Message-ID: <200807112109.m6BL9Ebo018289@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Fri Jul 11 21:09:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:14 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora, 9) updated by toshio Message-ID: <200807112109.m6BL9Ebq018289@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Fri Jul 11 21:09:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:14 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora EPEL, 5) updated by toshio Message-ID: <200807112109.m6BL9Ebs018289@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Fri Jul 11 21:09:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:14 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora, devel) updated by toshio Message-ID: <200807112109.m6BL9E6K018290@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgcaptcha (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-tgcaptcha (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-tgcaptcha (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-tgcaptcha (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-tgcaptcha (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Fri Jul 11 21:09:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:35 +0000 Subject: [pkgdb] python-turboflot (Fedora, 9) updated by toshio Message-ID: <200807112109.m6BL9E6M018290@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-turboflot (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-turboflot (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-turboflot (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-turboflot (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turboflot From fedora-extras-commits at redhat.com Fri Jul 11 21:09:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:35 +0000 Subject: [pkgdb] python-turboflot (Fedora, 8) updated by toshio Message-ID: <200807112109.m6BL9aNB018414@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-turboflot (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-turboflot (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-turboflot (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-turboflot (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turboflot From fedora-extras-commits at redhat.com Fri Jul 11 21:09:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:35 +0000 Subject: [pkgdb] python-turboflot (Fedora EPEL, 5) updated by toshio Message-ID: <200807112109.m6BL9aND018414@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-turboflot (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-turboflot (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-turboflot (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-turboflot (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turboflot From fedora-extras-commits at redhat.com Fri Jul 11 21:09:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:35 +0000 Subject: [pkgdb] python-turboflot (Fedora, devel) updated by toshio Message-ID: <200807112109.m6BL9aP2018395@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-turboflot (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-turboflot (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turboflot (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-turboflot (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-turboflot (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-turboflot (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-turboflot (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turboflot From fedora-extras-commits at redhat.com Fri Jul 11 21:09:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:46 +0000 Subject: [pkgdb] python-TurboMail (Fedora, 8) updated by toshio Message-ID: <200807112109.m6BL9kMN018478@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-TurboMail (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-TurboMail (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-TurboMail (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-TurboMail (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-TurboMail From fedora-extras-commits at redhat.com Fri Jul 11 21:09:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:46 +0000 Subject: [pkgdb] python-TurboMail (Fedora, 9) updated by toshio Message-ID: <200807112109.m6BL9kMP018478@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-TurboMail (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-TurboMail (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-TurboMail (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-TurboMail (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-TurboMail From fedora-extras-commits at redhat.com Fri Jul 11 21:09:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:46 +0000 Subject: [pkgdb] python-TurboMail (Fedora, devel) updated by toshio Message-ID: <200807112109.m6BL9k7w018477@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-TurboMail (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-TurboMail (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-TurboMail (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-TurboMail (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-TurboMail From fedora-extras-commits at redhat.com Fri Jul 11 21:09:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:09:46 +0000 Subject: [pkgdb] python-TurboMail (Fedora EPEL, 5) updated by toshio Message-ID: <200807112109.m6BL9k80018477@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-TurboMail (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-TurboMail (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-TurboMail (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-TurboMail (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-TurboMail (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-TurboMail (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-TurboMail (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-TurboMail From fedora-extras-commits at redhat.com Fri Jul 11 21:11:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:14 +0000 Subject: [pkgdb] python-configobj (Fedora, devel) updated by toshio Message-ID: <200807112111.m6BLBEMW018667@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-configobj (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-configobj (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-configobj (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-configobj (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-configobj (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-configobj (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-configobj From fedora-extras-commits at redhat.com Fri Jul 11 21:11:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:14 +0000 Subject: [pkgdb] python-configobj (Fedora, 9) updated by toshio Message-ID: <200807112111.m6BLBEMY018667@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-configobj (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-configobj (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-configobj (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-configobj (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-configobj (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-configobj (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-configobj From fedora-extras-commits at redhat.com Fri Jul 11 21:11:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:14 +0000 Subject: [pkgdb] python-configobj (Fedora, 8) updated by toshio Message-ID: <200807112111.m6BLBEMa018667@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-configobj (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-configobj (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-configobj (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-configobj (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-configobj (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-configobj (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-configobj From fedora-extras-commits at redhat.com Fri Jul 11 21:11:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:14 +0000 Subject: [pkgdb] python-configobj (Fedora EPEL, 4) updated by toshio Message-ID: <200807112111.m6BLBEMc018667@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-configobj (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-configobj (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-configobj (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-configobj (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-configobj (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-configobj (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-configobj From fedora-extras-commits at redhat.com Fri Jul 11 21:11:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:14 +0000 Subject: [pkgdb] python-configobj (Fedora EPEL, 5) updated by toshio Message-ID: <200807112111.m6BLBEN7018668@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-configobj (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-configobj (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-configobj (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-configobj (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-configobj (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-configobj (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-configobj (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-configobj (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-configobj From fedora-extras-commits at redhat.com Fri Jul 11 21:11:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:41 +0000 Subject: [pkgdb] python-decoratortools (Fedora EPEL, 4) updated by toshio Message-ID: <200807112111.m6BLBgBM018782@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-decoratortools (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-decoratortools (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-decoratortools (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-decoratortools (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-decoratortools From fedora-extras-commits at redhat.com Fri Jul 11 21:11:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:42 +0000 Subject: [pkgdb] python-decoratortools (Fedora, 9) updated by toshio Message-ID: <200807112111.m6BLBgBO018782@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-decoratortools (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-decoratortools (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-decoratortools (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-decoratortools (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-decoratortools From fedora-extras-commits at redhat.com Fri Jul 11 21:11:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:42 +0000 Subject: [pkgdb] python-decoratortools (Fedora EPEL, 5) updated by toshio Message-ID: <200807112111.m6BLBgBQ018782@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-decoratortools (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-decoratortools (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-decoratortools (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-decoratortools (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-decoratortools From fedora-extras-commits at redhat.com Fri Jul 11 21:11:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:42 +0000 Subject: [pkgdb] python-decoratortools (Fedora, devel) updated by toshio Message-ID: <200807112111.m6BLBgBS018782@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-decoratortools (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-decoratortools (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-decoratortools (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-decoratortools (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-decoratortools From fedora-extras-commits at redhat.com Fri Jul 11 21:11:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:11:42 +0000 Subject: [pkgdb] python-decoratortools (Fedora, 8) updated by toshio Message-ID: <200807112111.m6BLBgBU018782@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-decoratortools (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-decoratortools (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-decoratortools (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-decoratortools (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-decoratortools (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-decoratortools (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-decoratortools (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-decoratortools From fedora-extras-commits at redhat.com Fri Jul 11 21:12:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:03 +0000 Subject: [pkgdb] python-formencode (Fedora, devel) updated by toshio Message-ID: <200807112112.m6BLC3FN018903@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-formencode (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-formencode (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-formencode (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-formencode (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-formencode (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-formencode (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-formencode From fedora-extras-commits at redhat.com Fri Jul 11 21:12:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:03 +0000 Subject: [pkgdb] python-formencode (Fedora EPEL, 5) updated by toshio Message-ID: <200807112112.m6BLC3tq018904@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-formencode (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-formencode (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-formencode (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-formencode (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-formencode (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-formencode (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-formencode From fedora-extras-commits at redhat.com Fri Jul 11 21:12:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:03 +0000 Subject: [pkgdb] python-formencode (Fedora, 8) updated by toshio Message-ID: <200807112112.m6BLC3to018904@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-formencode (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-formencode (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-formencode (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-formencode (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-formencode (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-formencode (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-formencode From fedora-extras-commits at redhat.com Fri Jul 11 21:12:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:03 +0000 Subject: [pkgdb] python-formencode (Fedora EPEL, 4) updated by toshio Message-ID: <200807112112.m6BLC3FT018903@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-formencode (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-formencode (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-formencode (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-formencode (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-formencode (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-formencode (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-formencode From fedora-extras-commits at redhat.com Fri Jul 11 21:12:14 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 21:12:14 GMT Subject: rpms/perl-Convert-UUlib/devel import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 perl-Convert-UUlib.spec, 1.20, 1.21 sources, 1.6, 1.7 Message-ID: <200807112112.m6BLCEoP019719@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Convert-UUlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19603/devel Modified Files: .cvsignore perl-Convert-UUlib.spec sources Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- perl-Convert-UUlib-1_11-1_fc10:HEAD:perl-Convert-UUlib-1.11-1.fc10.src.rpm:1215810594 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Aug 2007 17:26:49 -0000 1.6 +++ .cvsignore 11 Jul 2008 21:11:10 -0000 1.7 @@ -1 +1 @@ -Convert-UUlib-1.09.tar.gz +Convert-UUlib-1.11.tar.gz Index: perl-Convert-UUlib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- perl-Convert-UUlib.spec 31 May 2008 12:48:12 -0000 1.20 +++ perl-Convert-UUlib.spec 11 Jul 2008 21:11:10 -0000 1.21 @@ -1,68 +1,77 @@ -%define rname Convert-UUlib +%define cpanname Convert-UUlib -Name: perl-%{rname} -Version: 1.09 -Epoch: 1 -Release: 5%{?dist} - -Summary: Perl interface to the uulib library +Name: perl-%{cpanname} +Version: 1.11 +Epoch: 1 +Release: 1%{?dist} +Summary: Perl interface to the uulib library Group: Development/Libraries License: GPL+ or Artistic -URL: http://search.cpan.org/dist/%{rname}/ -Source: http://www.cpan.org/authors/id/M/ML/MLEHMANN/%{rname}-%{version}.tar.gz +URL: http://search.cpan.org/dist/%{cpanname}/ +Source: http://cpan.org/authors/id/M/ML/MLEHMANN/%{cpanname}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: perl(ExtUtils::MakeMaker) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A perl interface to the uulib library (a.k.a. uudeview/uuenview) + %prep -%setup -q -n %{rname}-%{version} +%setup -q -n %{cpanname}-%{version} + %build -CFLAGS="%{optflags}" %{__perl} Makefile.PL \ - PREFIX="%{buildroot}%{_prefix}" \ - INSTALLDIRS="vendor" -make %{?_smp_mflags} OPTIMIZE="%{optflags}" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} + %install rm -fr %{buildroot} -%makeinstall +make pure_install PERL_INSTALL_ROOT=%{buildroot} + +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' -### Clean up buildroot -find %{buildroot} -type f -name "perllocal.pod" -exec rm -f {} ';' -find %{buildroot} -type f -name ".*" -exec rm -f {} ';' -find %{buildroot} -type f -name "*.bs" -exec rm -f {} ';' +chmod -R u+rwX,g+rX %{buildroot}/* -# fix perms to enable stripping -chmod -R u+rwX,g+rX %{buildroot} %check -make test || : +make test + %clean rm -fr %{buildroot} + %files -%defattr(0644, root, root, 0755) +%defattr(0644,root,root,0755) %doc Changes COPYING* README doc/* -%doc %{_mandir}/man?/Convert::UUlib* + %dir %{perl_vendorarch}/Convert %dir %{perl_vendorarch}/auto/Convert %dir %{perl_vendorarch}/auto/Convert/UUlib + %{perl_vendorarch}/Convert/*.pm %attr(0755,root,root) %{perl_vendorarch}/auto/Convert/UUlib/*.so +%{_mandir}/man?/Convert::UUlib* + %changelog -* Sun May 31 2008 Robert Scheck 1:1.09-5 +* Fri Jul 11 2008 +- 1:1.11-1 +??? Fedora 10 alpha general package cleanup + +* Sun May 31 2008 Robert Scheck +- 1:1.09-5 - Fixed %%check section in order to get the package built -* Thu Mar 06 2008 Tom "spot" Callaway - 1:1.09-4 +* Thu Mar 06 2008 Tom "spot" Callaway +- 1:1.09-4 - Rebuild for new perl * Fri Feb 08 2008 Nicolas Mailhot Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Aug 2007 17:26:49 -0000 1.6 +++ sources 11 Jul 2008 21:11:10 -0000 1.7 @@ -1 +1 @@ -f4cfa860176f60a83b56816d5917e71a Convert-UUlib-1.09.tar.gz +629ef452dd98b446f191b0bb37c39091 Convert-UUlib-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 21:12:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:27 +0000 Subject: [pkgdb] python-nose (Fedora EPEL, 5) updated by toshio Message-ID: <200807112112.m6BLBkW6018876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-nose (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-nose (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-nose (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-nose (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-nose (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-nose (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-nose (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-nose (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nose From fedora-extras-commits at redhat.com Fri Jul 11 21:12:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:27 +0000 Subject: [pkgdb] python-nose (Fedora, 9) updated by toshio Message-ID: <200807112112.m6BLBkW8018876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-nose (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-nose (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-nose (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-nose (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-nose (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-nose (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-nose (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-nose (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nose From fedora-extras-commits at redhat.com Fri Jul 11 21:12:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:27 +0000 Subject: [pkgdb] python-nose (Fedora, 8) updated by toshio Message-ID: <200807112112.m6BLBkWA018876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-nose (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-nose (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-nose (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-nose (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-nose (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-nose (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-nose (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-nose (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nose From fedora-extras-commits at redhat.com Fri Jul 11 21:12:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:27 +0000 Subject: [pkgdb] python-nose (Fedora EPEL, 4) updated by toshio Message-ID: <200807112112.m6BLBkWC018876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-nose (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-nose (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-nose (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-nose (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-nose (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-nose (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-nose (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-nose (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nose From fedora-extras-commits at redhat.com Fri Jul 11 21:12:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:27 +0000 Subject: [pkgdb] python-nose (Fedora, devel) updated by toshio Message-ID: <200807112112.m6BLCV2C019151@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-nose (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-nose (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-nose (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-nose (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-nose (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-nose (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-nose (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-nose (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-nose (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-nose From fedora-extras-commits at redhat.com Fri Jul 11 21:12:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:53 +0000 Subject: [pkgdb] python-paste-script (Fedora, 9) updated by toshio Message-ID: <200807112112.m6BLCV2E019151@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-paste-script (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-paste-script (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-paste-script (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-paste-script (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-script From fedora-extras-commits at redhat.com Fri Jul 11 21:12:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:53 +0000 Subject: [pkgdb] python-paste-script (Fedora EPEL, 5) updated by toshio Message-ID: <200807112112.m6BLCV2G019151@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-paste-script (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-paste-script (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-paste-script (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-paste-script (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-script From fedora-extras-commits at redhat.com Fri Jul 11 21:12:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:53 +0000 Subject: [pkgdb] python-paste-script (Fedora, devel) updated by toshio Message-ID: <200807112112.m6BLCV2I019151@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-paste-script (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-paste-script (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-paste-script (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-paste-script (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-script From fedora-extras-commits at redhat.com Fri Jul 11 21:12:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:53 +0000 Subject: [pkgdb] python-paste-script (Fedora, 8) updated by toshio Message-ID: <200807112112.m6BLCrLA019187@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-paste-script (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-paste-script (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-paste-script (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-paste-script (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-script From fedora-extras-commits at redhat.com Fri Jul 11 21:12:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:53 +0000 Subject: [pkgdb] python-paste-script (Fedora EPEL, 4) updated by toshio Message-ID: <200807112112.m6BLCuGM019266@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-paste-script (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-paste-script (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-script (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-script (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-paste-script (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-paste-script (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-paste-script (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-script From fedora-extras-commits at redhat.com Fri Jul 11 21:13:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:19 +0000 Subject: [pkgdb] python-protocols (Fedora, devel) updated by toshio Message-ID: <200807112113.m6BLDJjr019320@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-protocols (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-protocols (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-protocols (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-protocols (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-protocols (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-protocols (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols From fedora-extras-commits at redhat.com Fri Jul 11 21:13:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:19 +0000 Subject: [pkgdb] python-protocols (Fedora, 9) updated by toshio Message-ID: <200807112113.m6BLDJju019320@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-protocols (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-protocols (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-protocols (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-protocols (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-protocols (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-protocols (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols From fedora-extras-commits at redhat.com Fri Jul 11 21:13:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:19 +0000 Subject: [pkgdb] python-protocols (Fedora, 8) updated by toshio Message-ID: <200807112113.m6BLDJtM019319@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-protocols (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-protocols (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-protocols (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-protocols (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-protocols (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-protocols (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols From fedora-extras-commits at redhat.com Fri Jul 11 21:13:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:19 +0000 Subject: [pkgdb] python-protocols (Fedora EPEL, 5) updated by toshio Message-ID: <200807112113.m6BLDJtO019319@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-protocols (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-protocols (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-protocols (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-protocols (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-protocols (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-protocols (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols From fedora-extras-commits at redhat.com Fri Jul 11 21:13:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:19 +0000 Subject: [pkgdb] python-protocols (Fedora EPEL, 4) updated by toshio Message-ID: <200807112113.m6BLDJtQ019319@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-protocols (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-protocols (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-protocols (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-protocols (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-protocols (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-protocols (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-protocols (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-protocols (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-protocols From fedora-extras-commits at redhat.com Fri Jul 11 21:13:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:35 +0000 Subject: [pkgdb] python-ruledispatch (Fedora, devel) updated by toshio Message-ID: <200807112113.m6BLDLsV019403@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-ruledispatch (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-ruledispatch (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ruledispatch From fedora-extras-commits at redhat.com Fri Jul 11 21:13:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:35 +0000 Subject: [pkgdb] python-ruledispatch (Fedora, 9) updated by toshio Message-ID: <200807112113.m6BLDLsX019403@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-ruledispatch (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-ruledispatch (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ruledispatch From fedora-extras-commits at redhat.com Fri Jul 11 21:13:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:36 +0000 Subject: [pkgdb] python-ruledispatch (Fedora EPEL, 4) updated by toshio Message-ID: <200807112113.m6BLDagM019439@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-ruledispatch (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-ruledispatch (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ruledispatch From fedora-extras-commits at redhat.com Fri Jul 11 21:13:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:36 +0000 Subject: [pkgdb] python-ruledispatch (Fedora EPEL, 5) updated by toshio Message-ID: <200807112113.m6BLDagO019439@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-ruledispatch (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-ruledispatch (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ruledispatch From fedora-extras-commits at redhat.com Fri Jul 11 21:13:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:36 +0000 Subject: [pkgdb] python-ruledispatch (Fedora, 8) updated by toshio Message-ID: <200807112113.m6BLDcmi019517@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-ruledispatch (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-ruledispatch (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-ruledispatch (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-ruledispatch (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-ruledispatch (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-ruledispatch (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ruledispatch From fedora-extras-commits at redhat.com Fri Jul 11 21:13:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:49 +0000 Subject: [pkgdb] python-simplejson (Fedora, 8) updated by toshio Message-ID: <200807112113.m6BLDn95019548@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-simplejson (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-simplejson (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-simplejson (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-simplejson (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-simplejson From fedora-extras-commits at redhat.com Fri Jul 11 21:13:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:49 +0000 Subject: [pkgdb] python-simplejson (Fedora, 9) updated by toshio Message-ID: <200807112113.m6BLDn97019548@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-simplejson (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-simplejson (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-simplejson (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-simplejson (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-simplejson From fedora-extras-commits at redhat.com Fri Jul 11 21:13:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:49 +0000 Subject: [pkgdb] python-simplejson (Fedora, devel) updated by toshio Message-ID: <200807112113.m6BLDn99019548@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-simplejson (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-simplejson (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-simplejson (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-simplejson (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-simplejson From fedora-extras-commits at redhat.com Fri Jul 11 21:13:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:49 +0000 Subject: [pkgdb] python-simplejson (Fedora EPEL, 4) updated by toshio Message-ID: <200807112113.m6BLDn9B019548@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-simplejson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-simplejson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-simplejson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-simplejson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-simplejson From fedora-extras-commits at redhat.com Fri Jul 11 21:13:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:13:49 +0000 Subject: [pkgdb] python-simplejson (Fedora EPEL, 5) updated by toshio Message-ID: <200807112113.m6BLDn9D019548@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-simplejson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-simplejson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-simplejson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-simplejson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-simplejson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-simplejson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-simplejson (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-simplejson From fedora-extras-commits at redhat.com Fri Jul 11 21:14:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:06 +0000 Subject: [pkgdb] python-sqlalchemy (Fedora, devel) updated by toshio Message-ID: <200807112114.m6BLDcmk019517@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy From fedora-extras-commits at redhat.com Fri Jul 11 21:14:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:06 +0000 Subject: [pkgdb] python-sqlalchemy (Fedora, 9) updated by toshio Message-ID: <200807112114.m6BLE7Wq019697@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy From fedora-extras-commits at redhat.com Fri Jul 11 21:14:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:06 +0000 Subject: [pkgdb] python-sqlalchemy (Fedora EPEL, 4) updated by toshio Message-ID: <200807112114.m6BLE7Wt019697@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy From fedora-extras-commits at redhat.com Fri Jul 11 21:14:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:06 +0000 Subject: [pkgdb] python-sqlalchemy (Fedora, 8) updated by toshio Message-ID: <200807112114.m6BLE7Wu019697@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy From fedora-extras-commits at redhat.com Fri Jul 11 21:14:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:06 +0000 Subject: [pkgdb] python-sqlalchemy (Fedora EPEL, 5) updated by toshio Message-ID: <200807112114.m6BLE7Wx019697@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlalchemy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlalchemy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-sqlalchemy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-sqlalchemy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-sqlalchemy (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy From fedora-extras-commits at redhat.com Fri Jul 11 21:14:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:27 +0000 Subject: [pkgdb] python-sqlobject (Fedora, devel) updated by toshio Message-ID: <200807112114.m6BLE7X0019697@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-sqlobject (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-sqlobject (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-sqlobject (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-sqlobject (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlobject From fedora-extras-commits at redhat.com Fri Jul 11 21:14:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:27 +0000 Subject: [pkgdb] python-sqlobject (Fedora, 9) updated by toshio Message-ID: <200807112114.m6BLESDW019856@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-sqlobject (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-sqlobject (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-sqlobject (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-sqlobject (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlobject From fedora-extras-commits at redhat.com Fri Jul 11 21:14:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:27 +0000 Subject: [pkgdb] python-sqlobject (Fedora EPEL, 4) updated by toshio Message-ID: <200807112114.m6BLESDY019856@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-sqlobject (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-sqlobject (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-sqlobject (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-sqlobject (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlobject From fedora-extras-commits at redhat.com Fri Jul 11 21:14:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:27 +0000 Subject: [pkgdb] python-sqlobject (Fedora, 8) updated by toshio Message-ID: <200807112114.m6BLE9mn019767@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-sqlobject (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-sqlobject (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-sqlobject (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-sqlobject (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlobject From fedora-extras-commits at redhat.com Fri Jul 11 21:14:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:27 +0000 Subject: [pkgdb] python-sqlobject (Fedora EPEL, 5) updated by toshio Message-ID: <200807112114.m6BLET0u019876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-sqlobject (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-sqlobject (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-sqlobject (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-sqlobject (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-sqlobject (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-sqlobject (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-sqlobject (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlobject From fedora-extras-commits at redhat.com Fri Jul 11 21:14:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:41 +0000 Subject: [pkgdb] python-tgfastdata (Fedora, devel) updated by toshio Message-ID: <200807112114.m6BLET0v019876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-tgfastdata (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-tgfastdata (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgfastdata From fedora-extras-commits at redhat.com Fri Jul 11 21:14:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:41 +0000 Subject: [pkgdb] python-tgfastdata (Fedora, 9) updated by toshio Message-ID: <200807112114.m6BLET0x019876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-tgfastdata (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-tgfastdata (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgfastdata From fedora-extras-commits at redhat.com Fri Jul 11 21:14:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:41 +0000 Subject: [pkgdb] python-tgfastdata (Fedora, 8) updated by toshio Message-ID: <200807112114.m6BLEgWY019976@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-tgfastdata (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-tgfastdata (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgfastdata From fedora-extras-commits at redhat.com Fri Jul 11 21:14:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:41 +0000 Subject: [pkgdb] python-tgfastdata (Fedora EPEL, 4) updated by toshio Message-ID: <200807112114.m6BLET12019876@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-tgfastdata (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-tgfastdata (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgfastdata From fedora-extras-commits at redhat.com Fri Jul 11 21:14:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:14:41 +0000 Subject: [pkgdb] python-tgfastdata (Fedora EPEL, 5) updated by toshio Message-ID: <200807112114.m6BLEiHC020052@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-tgfastdata (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-tgfastdata (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-tgfastdata (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-tgfastdata (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-tgfastdata (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-tgfastdata (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgfastdata From fedora-extras-commits at redhat.com Fri Jul 11 21:15:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:00 +0000 Subject: [pkgdb] python-turbocheetah (Fedora, 9) updated by toshio Message-ID: <200807112115.m6BLF0v0020113@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-turbocheetah (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-turbocheetah (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbocheetah From fedora-extras-commits at redhat.com Fri Jul 11 21:15:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:00 +0000 Subject: [pkgdb] python-turbocheetah (Fedora, 8) updated by toshio Message-ID: <200807112115.m6BLF0v2020113@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-turbocheetah (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-turbocheetah (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbocheetah From fedora-extras-commits at redhat.com Fri Jul 11 21:15:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:00 +0000 Subject: [pkgdb] python-turbocheetah (Fedora, devel) updated by toshio Message-ID: <200807112115.m6BLF0v4020113@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-turbocheetah (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-turbocheetah (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbocheetah From fedora-extras-commits at redhat.com Fri Jul 11 21:15:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:00 +0000 Subject: [pkgdb] python-turbocheetah (Fedora EPEL, 4) updated by toshio Message-ID: <200807112115.m6BLF0v7020113@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-turbocheetah (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-turbocheetah (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbocheetah From fedora-extras-commits at redhat.com Fri Jul 11 21:15:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:00 +0000 Subject: [pkgdb] python-turbocheetah (Fedora EPEL, 5) updated by toshio Message-ID: <200807112115.m6BLF3lk020205@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-turbocheetah (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbocheetah (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-turbocheetah (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-turbocheetah (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-turbocheetah (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-turbocheetah (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbocheetah From fedora-extras-commits at redhat.com Fri Jul 11 21:15:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:28 +0000 Subject: [pkgdb] python-turbojson (Fedora, 8) updated by toshio Message-ID: <200807112115.m6BLFSuw020271@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-turbojson (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-turbojson (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-turbojson (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-turbojson (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbojson From fedora-extras-commits at redhat.com Fri Jul 11 21:15:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:28 +0000 Subject: [pkgdb] python-turbojson (Fedora, 9) updated by toshio Message-ID: <200807112115.m6BLFSv0020271@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-turbojson (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-turbojson (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-turbojson (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-turbojson (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbojson From fedora-extras-commits at redhat.com Fri Jul 11 21:15:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:28 +0000 Subject: [pkgdb] python-turbojson (Fedora, devel) updated by toshio Message-ID: <200807112115.m6BLFSv2020271@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-turbojson (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-turbojson (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-turbojson (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-turbojson (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbojson From fedora-extras-commits at redhat.com Fri Jul 11 21:15:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:28 +0000 Subject: [pkgdb] python-turbojson (Fedora EPEL, 4) updated by toshio Message-ID: <200807112115.m6BLFSoJ020272@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-turbojson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-turbojson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-turbojson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-turbojson (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbojson From fedora-extras-commits at redhat.com Fri Jul 11 21:15:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:28 +0000 Subject: [pkgdb] python-turbojson (Fedora EPEL, 5) updated by toshio Message-ID: <200807112115.m6BLFSv6020271@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-turbojson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-turbojson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbojson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-turbojson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-turbojson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-turbojson (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-turbojson (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbojson From fedora-extras-commits at redhat.com Fri Jul 11 21:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:41 +0000 Subject: [pkgdb] python-turbokid (Fedora, 9) updated by toshio Message-ID: <200807112115.m6BLF3ln020205@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-turbokid (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-turbokid (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-turbokid (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-turbokid (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbokid From fedora-extras-commits at redhat.com Fri Jul 11 21:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:41 +0000 Subject: [pkgdb] python-turbokid (Fedora EPEL, 5) updated by toshio Message-ID: <200807112115.m6BLF3lp020205@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-turbokid (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-turbokid (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-turbokid (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-turbokid (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbokid From fedora-extras-commits at redhat.com Fri Jul 11 21:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:41 +0000 Subject: [pkgdb] python-turbokid (Fedora, devel) updated by toshio Message-ID: <200807112115.m6BLF3lr020205@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-turbokid (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-turbokid (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-turbokid (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-turbokid (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbokid From fedora-extras-commits at redhat.com Fri Jul 11 21:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:41 +0000 Subject: [pkgdb] python-turbokid (Fedora EPEL, 4) updated by toshio Message-ID: <200807112115.m6BLFgC2020409@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-turbokid (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-turbokid (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-turbokid (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-turbokid (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbokid From fedora-extras-commits at redhat.com Fri Jul 11 21:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:41 +0000 Subject: [pkgdb] python-turbokid (Fedora, 8) updated by toshio Message-ID: <200807112115.m6BLFgC4020409@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-turbokid (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-turbokid (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-turbokid (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-turbokid (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-turbokid (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-turbokid (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-turbokid (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-turbokid From fedora-extras-commits at redhat.com Fri Jul 11 21:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:58 +0000 Subject: [pkgdb] TurboGears (Fedora, devel) updated by toshio Message-ID: <200807112115.m6BLFw5Y020517@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on TurboGears (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on TurboGears (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on TurboGears (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora devel) for toshio Toshio ???? (toshio) approved commit on TurboGears (Fedora devel) for toshio Toshio ???? (toshio) approved build on TurboGears (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on TurboGears (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/TurboGears From fedora-extras-commits at redhat.com Fri Jul 11 21:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:58 +0000 Subject: [pkgdb] TurboGears (Fedora, 9) updated by toshio Message-ID: <200807112115.m6BLFw5a020517@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on TurboGears (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on TurboGears (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on TurboGears (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora 9) for toshio Toshio ???? (toshio) approved commit on TurboGears (Fedora 9) for toshio Toshio ???? (toshio) approved build on TurboGears (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on TurboGears (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/TurboGears From fedora-extras-commits at redhat.com Fri Jul 11 21:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:58 +0000 Subject: [pkgdb] TurboGears (Fedora, 8) updated by toshio Message-ID: <200807112115.m6BLFw5c020517@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on TurboGears (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on TurboGears (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on TurboGears (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora 8) for toshio Toshio ???? (toshio) approved commit on TurboGears (Fedora 8) for toshio Toshio ???? (toshio) approved build on TurboGears (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on TurboGears (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/TurboGears From fedora-extras-commits at redhat.com Fri Jul 11 21:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:58 +0000 Subject: [pkgdb] TurboGears (Fedora EPEL, 5) updated by toshio Message-ID: <200807112116.m6BLFwWM020518@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on TurboGears (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on TurboGears (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on TurboGears (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on TurboGears (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on TurboGears (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on TurboGears (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/TurboGears From fedora-extras-commits at redhat.com Fri Jul 11 21:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:15:58 +0000 Subject: [pkgdb] TurboGears (Fedora EPEL, 4) updated by toshio Message-ID: <200807112116.m6BLFwWO020518@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on TurboGears (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on TurboGears (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on TurboGears (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on TurboGears (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on TurboGears (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on TurboGears (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on TurboGears (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on TurboGears (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/TurboGears From fedora-extras-commits at redhat.com Fri Jul 11 21:16:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:18 +0000 Subject: [pkgdb] python-paste (Fedora, devel) updated by toshio Message-ID: <200807112116.m6BLGI2r020620@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-paste (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-paste (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-paste (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-paste (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-paste (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-paste (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste From fedora-extras-commits at redhat.com Fri Jul 11 21:16:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:18 +0000 Subject: [pkgdb] python-paste (Fedora, 8) updated by toshio Message-ID: <200807112116.m6BLGILq020621@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-paste (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-paste (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-paste (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-paste (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-paste (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-paste (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste From fedora-extras-commits at redhat.com Fri Jul 11 21:16:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:18 +0000 Subject: [pkgdb] python-paste (Fedora EPEL, 5) updated by toshio Message-ID: <200807112116.m6BLGILs020621@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-paste (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-paste (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-paste (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-paste (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-paste (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-paste (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste From fedora-extras-commits at redhat.com Fri Jul 11 21:16:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:18 +0000 Subject: [pkgdb] python-paste (Fedora EPEL, 4) updated by toshio Message-ID: <200807112116.m6BLGI31020620@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-paste (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-paste (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-paste (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-paste (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-paste (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-paste (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste From fedora-extras-commits at redhat.com Fri Jul 11 21:16:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:18 +0000 Subject: [pkgdb] python-paste (Fedora, 9) updated by toshio Message-ID: <200807112116.m6BLGILo020621@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-paste (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-paste (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-paste (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-paste (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-paste (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-paste (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste From fedora-extras-commits at redhat.com Fri Jul 11 21:16:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:36 +0000 Subject: [pkgdb] python-paste-deploy (Fedora, 9) updated by toshio Message-ID: <200807112116.m6BLFiAn020457@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-paste-deploy (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-paste-deploy (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-deploy From fedora-extras-commits at redhat.com Fri Jul 11 21:16:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:36 +0000 Subject: [pkgdb] python-paste-deploy (Fedora EPEL, 4) updated by toshio Message-ID: <200807112116.m6BLFiAp020457@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved build on python-paste-deploy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora EPEL 4) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved build on python-paste-deploy (Fedora EPEL 4) for toshio Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora EPEL 4) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-deploy From fedora-extras-commits at redhat.com Fri Jul 11 21:16:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:36 +0000 Subject: [pkgdb] python-paste-deploy (Fedora, 8) updated by toshio Message-ID: <200807112116.m6BLGd90020842@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora 8) for fschwarz Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora 8) for fschwarz Toshio ???? (toshio) approved build on python-paste-deploy (Fedora 8) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora 8) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora 8) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora 8) for toshio Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora 8) for toshio Toshio ???? (toshio) approved build on python-paste-deploy (Fedora 8) for toshio Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora 8) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-deploy From fedora-extras-commits at redhat.com Fri Jul 11 21:16:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:36 +0000 Subject: [pkgdb] python-paste-deploy (Fedora, devel) updated by toshio Message-ID: <200807112116.m6BLFiAr020457@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora devel) for fschwarz Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora devel) for fschwarz Toshio ???? (toshio) approved build on python-paste-deploy (Fedora devel) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora devel) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora devel) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora devel) for toshio Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora devel) for toshio Toshio ???? (toshio) approved build on python-paste-deploy (Fedora devel) for toshio Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora devel) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-deploy From fedora-extras-commits at redhat.com Fri Jul 11 21:16:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:16:36 +0000 Subject: [pkgdb] python-paste-deploy (Fedora EPEL, 5) updated by toshio Message-ID: <200807112116.m6BLFiAt020457@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved build on python-paste-deploy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora EPEL 5) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-paste-deploy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved watchcommits on python-paste-deploy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved commit on python-paste-deploy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved build on python-paste-deploy (Fedora EPEL 5) for toshio Toshio ???? (toshio) approved approveacls on python-paste-deploy (Fedora EPEL 5) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-paste-deploy From fedora-extras-commits at redhat.com Fri Jul 11 21:26:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:26:55 +0000 Subject: [pkgdb] bouncycastle ownership updated Message-ID: <200807112126.m6BLQtk2021182@bastion.fedora.phx.redhat.com> Package bouncycastle in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Fri Jul 11 21:26:58 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 21:26:58 GMT Subject: rpms/perl-Font-TTF/devel import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 perl-Font-TTF.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200807112126.m6BLQwLb020691@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Font-TTF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20611/devel Modified Files: .cvsignore perl-Font-TTF.spec sources Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- perl-Font-TTF-0_45-1_fc10:HEAD:perl-Font-TTF-0.45-1.fc10.src.rpm:1215811435 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Feb 2008 22:02:50 -0000 1.6 +++ .cvsignore 11 Jul 2008 21:25:52 -0000 1.7 @@ -1 +1 @@ -Font-TTF-0.43.tar.gz +Font-TTF-0.45.tar.gz Index: perl-Font-TTF.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/perl-Font-TTF.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Font-TTF.spec 7 Mar 2008 02:01:27 -0000 1.10 +++ perl-Font-TTF.spec 11 Jul 2008 21:25:52 -0000 1.11 @@ -1,27 +1,24 @@ %define cpanname Font-TTF -%define cpanver %{version} -Name: perl-%{cpanname} -Version: 0.43 -Release: 3%{?dist} -Summary: Perl library for modifying TTF font files - -Group: Development/Libraries -# Relicensing needs to be negociated with upstream whenever it gets around -# releasing a new version -License: Artistic -URL: http://search.cpan.org/dist/%{cpanname}/ -Source0: http://cpan.org/authors/id/M/MH/MHOSKEN/%{cpanname}-%{cpanver}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch -BuildRequires: perl-devel, dos2unix - -# The current FE perl template proposes this BuildRequires -# The current FE packaging guidelines say it's forbidden -# Commenting out while a consensus is reached -#BuildRequires: perl -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Name: perl-%{cpanname} +Version: 0.45 +Release: 1%{?dist} +Summary: Perl library for modifying TTF font files + +Group: Development/Libraries +# Will probalby die soonish because of the following +License: Artistic +URL: http://search.cpan.org/dist/%{cpanname}/ +Source0: http://cpan.org/authors/id/M/MH/MHOSKEN/%{cpanname}-%{version}.tar.gz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildArch: noarch +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: dos2unix +# Check requirements +BuildRequires: perl(Test::Simple) + +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Perl module for TrueType font hacking. Supports reading, processing and writing @@ -35,29 +32,38 @@ %prep -%setup -q -n %{cpanname}-%{cpanver} +%setup -q -n %{cpanname}-%{version} dos2unix README.TXT COPYING lib/Font/TTF/Changes + %build -%{__perl} Makefile.PL INSTALLDIRS="vendor" +%{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf %{buildroot} +rm -fr %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} + find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' + +chmod -R u+rwX,g+rX %{buildroot}/* + + +%check +make test %clean -rm -rf %{buildroot} +rm -fr %{buildroot} %files %defattr(0644,root,root,0755) %doc README.TXT COPYING lib/Font/TTF/Changes + %dir %{perl_vendorlib}/Font %dir %{perl_vendorlib}/Font/TTF @@ -76,7 +82,13 @@ %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 0.43-3 +* Fri Jul 11 2008 +- 0.45-1 +??? Fedora 10 alpha general package cleanup +??? Upstream needs to relicense fast to avoid culling + +* Thu Mar 06 2008 Tom "spot" Callaway +- 0.43-3 Rebuild for new perl * Sat Feb 09 2008 Nicolas Mailhot Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Feb 2008 22:02:50 -0000 1.6 +++ sources 11 Jul 2008 21:25:52 -0000 1.7 @@ -1 +1 @@ -3a92d8019722c227a521fe121027a3ef Font-TTF-0.43.tar.gz +5cf3baa8e227c43184767240f1d57ba1 Font-TTF-0.45.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 21:12:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:12:03 +0000 Subject: [pkgdb] python-formencode (Fedora, 9) updated by toshio Message-ID: <200807112112.m6BLC3FL018903@bastion.fedora.phx.redhat.com> Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora 9) for fschwarz Toshio ???? (toshio) approved commit on python-formencode (Fedora 9) for fschwarz Toshio ???? (toshio) approved build on python-formencode (Fedora 9) for fschwarz Toshio ???? (toshio) approved approveacls on python-formencode (Fedora 9) for fschwarz Toshio ???? (toshio) approved watchbugzilla on python-formencode (Fedora 9) for toshio Toshio ???? (toshio) approved watchcommits on python-formencode (Fedora 9) for toshio Toshio ???? (toshio) approved commit on python-formencode (Fedora 9) for toshio Toshio ???? (toshio) approved build on python-formencode (Fedora 9) for toshio Toshio ???? (toshio) approved approveacls on python-formencode (Fedora 9) for toshio To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-formencode From fedora-extras-commits at redhat.com Fri Jul 11 21:42:28 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 21:42:28 GMT Subject: rpms/perl-Net-Server/devel import.log, NONE, 1.1 perl-Net-Server.spec, 1.20, 1.21 Message-ID: <200807112142.m6BLgSHb021697@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Net-Server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21646/devel Modified Files: perl-Net-Server.spec Added Files: import.log Log Message: ??? Fedora 10 alpha general package cleanup --- NEW FILE import.log --- perl-Net-Server-0_97-4_fc10:HEAD:perl-Net-Server-0.97-4.fc10.src.rpm:1215812459 Index: perl-Net-Server.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- perl-Net-Server.spec 2 Jun 2008 21:27:07 -0000 1.20 +++ perl-Net-Server.spec 11 Jul 2008 21:41:28 -0000 1.21 @@ -1,49 +1,50 @@ -%define rname Net-Server +%define cpanname Net-Server -Name: perl-%{rname} +Name: perl-%{cpanname} Version: 0.97 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Extensible, general Perl server engine Group: Development/Libraries License: GPL+ or Artistic -URL: http://search.cpan.org/dist/%{rname}/ -Source: http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{rname}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://search.cpan.org/dist/%{cpanname}/ +Source0: http://cpan.org/authors/id/R/RH/RHANDOM/%{cpanname}-%{version}.tar.gz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# IO::Multiplex support is optional, but since it's in Fedora and not -# including it causes build problems in some packages??? -Requires: perl(IO::Multiplex) - # Check requirements BuildRequires: perl(IO::Multiplex) BuildRequires: perl(Test::Builder) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# IO::Multiplex support is optional, but since it's in Fedora and not +# including it causes build problems in some packages??? +Requires: perl(IO::Multiplex) + %description An extensible, class oriented module written in perl and intended to be the back end layer of internet protocol servers. %prep -%setup -q -n %{rname}-%{version} - +%setup -q -n %{cpanname}-%{version} +chmod u+rw-x,go+r-wx examples/* %build -%{__perl} Makefile.PL INSTALLDIRS="vendor" +%{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -fr %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name 'perllocal.pod' -exec rm -f {} ';' -find %{buildroot} -type f -name '.*' -exec rm -f {} ';' + +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' -chmod -R u+rwX,go-rwx %{buildroot}/* +chmod -R u+rwX,go+rX-w %{buildroot}/* %check make test @@ -54,22 +55,30 @@ %files -%defattr(0644, root, root, 0755) +%defattr(0644,root,root,0755) %doc README Changes examples + %dir %{perl_vendorlib}/Net/ %dir %{perl_vendorlib}/Net/Server + %{perl_vendorlib}/Net/Server.pm %{perl_vendorlib}/Net/Server.pod %{perl_vendorlib}/Net/Server/* + %{_mandir}/man?/Net::Server* %changelog -* Mon Jun 02 2009 Nicolas Mailhot +* Fri Jul 11 2008 +- 0.97-4 +??? Fedora 10 alpha general package cleanup + +* Mon Jun 02 2008 Nicolas Mailhot - 0.97-3 ??? remove old %%check Dag leftover rpmbuild does not like anymore -* Thu Mar 06 2008 Tom "spot" Callaway - 0.97-2 +* Thu Mar 06 2008 Tom "spot" Callaway +- 0.97-2 Rebuild for new perl * Sun Aug 12 2007 Nicolas Mailhot From fedora-extras-commits at redhat.com Fri Jul 11 21:49:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:49:12 +0000 Subject: [pkgdb] java-1.5.0-gcj ownership updated Message-ID: <200807112149.m6BLnCG5021800@bastion.fedora.phx.redhat.com> Package java-1.5.0-gcj in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Fri Jul 11 21:49:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:49:27 +0000 Subject: [pkgdb] java-1.6.0-openjdk ownership updated Message-ID: <200807112149.m6BLnSno021827@bastion.fedora.phx.redhat.com> Package java-1.6.0-openjdk in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Fri Jul 11 21:49:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:49:41 +0000 Subject: [pkgdb] java-1.7.0-icedtea ownership updated Message-ID: <200807112149.m6BLnfon021856@bastion.fedora.phx.redhat.com> Package java-1.7.0-icedtea in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Fri Jul 11 21:50:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:50:10 +0000 Subject: [pkgdb] jpackage-utils ownership updated Message-ID: <200807112150.m6BLnSns021827@bastion.fedora.phx.redhat.com> Package jpackage-utils in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Fri Jul 11 21:51:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:51:36 +0000 Subject: [pkgdb] jpackage-utils ownership updated Message-ID: <200807112151.m6BLpaxL021954@bastion.fedora.phx.redhat.com> Package jpackage-utils in Fedora devel is now owned by Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jpackage-utils From fedora-extras-commits at redhat.com Fri Jul 11 21:51:58 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 21:51:58 GMT Subject: rpms/perl-Net-Server/devel import.log, 1.1, 1.2 perl-Net-Server.spec, 1.21, 1.22 Message-ID: <200807112151.m6BLpwIf022055@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Net-Server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22023/devel Modified Files: import.log perl-Net-Server.spec Log Message: ??? Fedora 10 alpha general package cleanup Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Server/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Jul 2008 21:41:28 -0000 1.1 +++ import.log 11 Jul 2008 21:50:31 -0000 1.2 @@ -1 +1,2 @@ perl-Net-Server-0_97-4_fc10:HEAD:perl-Net-Server-0.97-4.fc10.src.rpm:1215812459 +perl-Net-Server-0_97-5_fc10:HEAD:perl-Net-Server-0.97-5.fc10.src.rpm:1215812998 Index: perl-Net-Server.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- perl-Net-Server.spec 11 Jul 2008 21:41:28 -0000 1.21 +++ perl-Net-Server.spec 11 Jul 2008 21:50:31 -0000 1.22 @@ -2,7 +2,7 @@ Name: perl-%{cpanname} Version: 0.97 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Extensible, general Perl server engine Group: Development/Libraries @@ -29,7 +29,7 @@ %prep %setup -q -n %{cpanname}-%{version} -chmod u+rw-x,go+r-wx examples/* +chmod u+rw-x,go-rwx examples/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -44,7 +44,7 @@ find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' -chmod -R u+rwX,go+rX-w %{buildroot}/* +chmod -R u+rwX,go-rwx %{buildroot}/* %check make test @@ -70,7 +70,7 @@ %changelog * Fri Jul 11 2008 -- 0.97-4 +- 0.97-5 ??? Fedora 10 alpha general package cleanup * Mon Jun 02 2008 Nicolas Mailhot From fedora-extras-commits at redhat.com Fri Jul 11 21:55:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:55:16 +0000 Subject: [pkgdb] MegaMek ownership updated Message-ID: <200807112155.m6BLtGkG022116@bastion.fedora.phx.redhat.com> Package MegaMek in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/MegaMek From fedora-extras-commits at redhat.com Fri Jul 11 21:57:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:57:35 +0000 Subject: [pkgdb] sinjdoc ownership updated Message-ID: <200807112157.m6BLvZLk022180@bastion.fedora.phx.redhat.com> Package sinjdoc in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sinjdoc From fedora-extras-commits at redhat.com Fri Jul 11 21:58:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 21:58:16 +0000 Subject: [pkgdb] system-switch-java ownership updated Message-ID: <200807112158.m6BLvZLm022180@bastion.fedora.phx.redhat.com> Package system-switch-java in Fedora devel was orphaned by Thomas Fitzsimmons (fitzsim) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java From fedora-extras-commits at redhat.com Fri Jul 11 21:58:51 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 11 Jul 2008 21:58:51 GMT Subject: rpms/thunar-shares/F-8 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 thunar-shares.spec, 1.2, 1.3 Message-ID: <200807112158.m6BLwptt022913@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/thunar-shares/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22732/F-8 Modified Files: .cvsignore sources thunar-shares.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jun 2008 22:56:20 -0000 1.3 +++ .cvsignore 11 Jul 2008 21:57:34 -0000 1.4 @@ -1 +1 @@ -thunar-shares-0.12.tar.gz +thunar-shares-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jun 2008 22:56:20 -0000 1.3 +++ sources 11 Jul 2008 21:57:34 -0000 1.4 @@ -1 +1 @@ -f48fd5be851bfd1b69187ee3667ca15f thunar-shares-0.12.tar.gz +cce8095abedb3194b7481a8970371abd thunar-shares-0.13.tar.gz Index: thunar-shares.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-8/thunar-shares.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thunar-shares.spec 19 Jun 2008 22:56:20 -0000 1.2 +++ thunar-shares.spec 11 Jul 2008 21:57:34 -0000 1.3 @@ -1,7 +1,7 @@ %define thunarver 0.9.0 Name: thunar-shares -Version: 0.12 +Version: 0.13 Release: 1%{?dist} Summary: Thunar file manager extension to share files using Samba @@ -56,11 +56,13 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_libdir}/thunarx-1/%{name}.so -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/thunar-shares/ %changelog +* Fri Jul 11 2008 Christoph Wickert - 0.13-1 +- Update to 0.13 + * Thu Jun 12 2008 Christoph Wickert - 0.12-1 - Update to 0.12 From fedora-extras-commits at redhat.com Fri Jul 11 21:58:58 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 11 Jul 2008 21:58:58 GMT Subject: rpms/thunar-shares/F-9 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 thunar-shares.spec, 1.2, 1.3 Message-ID: <200807112158.m6BLwwV2022920@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/thunar-shares/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22732/F-9 Modified Files: .cvsignore sources thunar-shares.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jun 2008 22:55:23 -0000 1.3 +++ .cvsignore 11 Jul 2008 21:57:52 -0000 1.4 @@ -1 +1 @@ -thunar-shares-0.12.tar.gz +thunar-shares-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jun 2008 22:55:23 -0000 1.3 +++ sources 11 Jul 2008 21:57:52 -0000 1.4 @@ -1 +1 @@ -f48fd5be851bfd1b69187ee3667ca15f thunar-shares-0.12.tar.gz +cce8095abedb3194b7481a8970371abd thunar-shares-0.13.tar.gz Index: thunar-shares.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-9/thunar-shares.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thunar-shares.spec 19 Jun 2008 22:55:23 -0000 1.2 +++ thunar-shares.spec 11 Jul 2008 21:57:52 -0000 1.3 @@ -1,7 +1,7 @@ %define thunarver 0.9.0 Name: thunar-shares -Version: 0.12 +Version: 0.13 Release: 1%{?dist} Summary: Thunar file manager extension to share files using Samba @@ -56,11 +56,13 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_libdir}/thunarx-1/%{name}.so -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/thunar-shares/ %changelog +* Fri Jul 11 2008 Christoph Wickert - 0.13-1 +- Update to 0.13 + * Thu Jun 12 2008 Christoph Wickert - 0.12-1 - Update to 0.12 From fedora-extras-commits at redhat.com Fri Jul 11 22:01:05 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 11 Jul 2008 22:01:05 GMT Subject: rpms/pnp4nagios/EL-5 pnp4nagios-README.fedora, NONE, 1.1 pnp4nagios-npcd.sysvinit, NONE, 1.1 pnp4nagios.logrotate.conf, NONE, 1.1 pnp4nagios.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807112201.m6BM15iW026290@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22953/EL-5 Modified Files: sources Added Files: pnp4nagios-README.fedora pnp4nagios-npcd.sysvinit pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: initial import into F-9, EL-4 and EL-5 --- NEW FILE pnp4nagios-README.fedora --- * Default Mode /etc/nagios/nagios.cfg process_performance_data=1 service_perfdata_command=process-service-perfdata /etc/nagios/commands.cfg define command { command_name process-service-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl } define command { command_name process-host-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl -d HOSTPERFDATA } * Bulk Mode /etc/nagios/nagios.cfg : process_performance_data=1 # # service performance data # service_perfdata_file=/var/spool/nagios/service-perfdata service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$ service_perfdata_file_mode=a service_perfdata_file_processing_interval=15 service_perfdata_file_processing_command=process-service-perfdata-file /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/service-perfdata } define command{ command_name process-host-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/host-perfdata } * Bulk Mode with NPCD npcd daemon needs to be started : service npcd start chkconfig npcd on The configuration is identical to the default-mode except for the used command. /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line /bin/mv /var/spool/nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } define command{ command_name process-host-perfdata-file command_line /bin/mv /var/spool/nagios/host-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } * Nagios integration /etc/nagios/hostextinfo.cfg : define hostextinfo { host_name localhost action_url /nagios/pnp4nagios/index.php?host=$HOSTNAME$ } --- NEW FILE pnp4nagios-npcd.sysvinit --- #!/bin/sh # # npcd Nagios Performancedata C Daemon # # chkconfig: - 98 02 # description: Nagios Performancedata C Daemon ### BEGIN INIT INFO # Provides: # Required-Start: # Required-Stop: # Should-Start: # Should-Stop: # Default-Start: # Default-Stop: # Short-Description: # Description: ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/sbin/npcd" prog="npcd" config="/etc/pnp4nagios/npcd.cfg" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon $exec -f $config -d retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE pnp4nagios.logrotate.conf --- /var/log/pnp4nagios/* { compress missingok notifempty rotate 5 size 100K } --- NEW FILE pnp4nagios.spec --- Name: pnp4nagios Version: 0.4.10 Release: 1%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System License: GPLv2 URL: http://www.pnp4nagios.org/ Source0: http://downloads.sourceforge.net/%{name}/pnp-%{version}.tar.gz Source1: pnp4nagios.logrotate.conf Source2: pnp4nagios-npcd.sysvinit Source3: pnp4nagios-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: rrdtool Requires: nagios Requires: rrdtool Requires: php-gd Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts %description PNP is an addon to nagios which analyzes performance data provided by plugins and stores them automatically into RRD-databases. %prep %setup -q -n pnp-%{version} cp -p %{SOURCE3} README.fedora sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \ configure sed -i -e '/^\t$(MAKE) strip-post-install$/d' src/Makefile.in %build %configure --bindir=%{_sbindir}/ \ --libexecdir=%{_libexecdir}/%{name}/ \ --sysconfdir=%{_sysconfdir}/%{name}/ \ --localstatedir=%{_localstatedir}/log/%{name}/ \ --datadir=%{_datadir}/nagios/html/%{name}/ \ --datarootdir=%{_datadir}/nagios/html/%{name}/ \ --with-perfdata-dir=%{_localstatedir}/lib/%{name}/ \ --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}/ make %{?_smp_mflags} all %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install-config DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios -name *-sample -exec rename "-sample" "" {} ';' sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp4nagios/process_perfdata.pl|' \ -e 's|^log_type = syslog|log_type = file|' \ $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/npcd.cfg mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pnp4nagios install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/npcd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add npcd %preun if [ $1 = 0 ]; then /sbin/service npcd stop >/dev/null 2>&1 /sbin/chkconfig --del npcd fi %postun if [ "$1" -ge "1" ]; then /sbin/service npcd condrestart >/dev/null 2>&1 || : fi %files %defattr(644,root,root,755) %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README README.fedora %doc README.npcd THANKS TODO %dir %{_sysconfdir}/pnp4nagios %config(noreplace) %{_sysconfdir}/pnp4nagios/* %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios %attr(755,root,root) %{_initrddir}/npcd %attr(755,root,root) %{_sbindir}/npcd %attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl %attr(755,nagios,nagios) %{_localstatedir}/lib/%{name} %attr(755,nagios,nagios) %{_localstatedir}/log/%{name} %attr(755,nagios,nagios) %{_localstatedir}/spool/%{name} %{_datadir}/nagios/html/pnp4nagios %changelog * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. * Tue May 27 2008 Xavier Bachelot 0.4.9-3 - Fix npcd init script to use /etc/pnp4nagios. * Tue May 27 2008 Xavier Bachelot 0.4.9-2 - Install npcd unstripped to let rpm do it. * Sat May 24 2008 Xavier Bachelot 0.4.9-1 - Update to 0.4.9. - Rename to pnp4nagios to match other distros packages. * Mon Apr 14 2008 Xavier Bachelot 0.4.7-5 - Log to file by default. - Kill pnpsender man page. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-4 - Install inside of nagios html dir. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-3 - Provide properly named config files. - Add missing Requires:. - Add a logrotate conf file. * Fri Apr 04 2008 Xavier Bachelot 0.4.7-2 - Add an initscript for npcd. * Wed Mar 19 2008 Xavier Bachelot 0.4.7-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:06:15 -0000 1.1 +++ sources 11 Jul 2008 22:00:16 -0000 1.2 @@ -0,0 +1 @@ +5e57d50e2d895878b626497fd7b217b7 pnp-0.4.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 22:01:16 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 11 Jul 2008 22:01:16 GMT Subject: rpms/pnp4nagios/EL-4 pnp4nagios-README.fedora, NONE, 1.1 pnp4nagios-npcd.sysvinit, NONE, 1.1 pnp4nagios.logrotate.conf, NONE, 1.1 pnp4nagios.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807112201.m6BM1GuS029625@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22953/EL-4 Modified Files: sources Added Files: pnp4nagios-README.fedora pnp4nagios-npcd.sysvinit pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: initial import into F-9, EL-4 and EL-5 --- NEW FILE pnp4nagios-README.fedora --- * Default Mode /etc/nagios/nagios.cfg process_performance_data=1 service_perfdata_command=process-service-perfdata /etc/nagios/commands.cfg define command { command_name process-service-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl } define command { command_name process-host-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl -d HOSTPERFDATA } * Bulk Mode /etc/nagios/nagios.cfg : process_performance_data=1 # # service performance data # service_perfdata_file=/var/spool/nagios/service-perfdata service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$ service_perfdata_file_mode=a service_perfdata_file_processing_interval=15 service_perfdata_file_processing_command=process-service-perfdata-file /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/service-perfdata } define command{ command_name process-host-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/host-perfdata } * Bulk Mode with NPCD npcd daemon needs to be started : service npcd start chkconfig npcd on The configuration is identical to the default-mode except for the used command. /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line /bin/mv /var/spool/nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } define command{ command_name process-host-perfdata-file command_line /bin/mv /var/spool/nagios/host-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } * Nagios integration /etc/nagios/hostextinfo.cfg : define hostextinfo { host_name localhost action_url /nagios/pnp4nagios/index.php?host=$HOSTNAME$ } --- NEW FILE pnp4nagios-npcd.sysvinit --- #!/bin/sh # # npcd Nagios Performancedata C Daemon # # chkconfig: - 98 02 # description: Nagios Performancedata C Daemon ### BEGIN INIT INFO # Provides: # Required-Start: # Required-Stop: # Should-Start: # Should-Stop: # Default-Start: # Default-Stop: # Short-Description: # Description: ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/sbin/npcd" prog="npcd" config="/etc/pnp4nagios/npcd.cfg" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon $exec -f $config -d retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE pnp4nagios.logrotate.conf --- /var/log/pnp4nagios/* { compress missingok notifempty rotate 5 size 100K } --- NEW FILE pnp4nagios.spec --- Name: pnp4nagios Version: 0.4.10 Release: 1%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System License: GPLv2 URL: http://www.pnp4nagios.org/ Source0: http://downloads.sourceforge.net/%{name}/pnp-%{version}.tar.gz Source1: pnp4nagios.logrotate.conf Source2: pnp4nagios-npcd.sysvinit Source3: pnp4nagios-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: rrdtool Requires: nagios Requires: rrdtool Requires: php-gd Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts %description PNP is an addon to nagios which analyzes performance data provided by plugins and stores them automatically into RRD-databases. %prep %setup -q -n pnp-%{version} cp -p %{SOURCE3} README.fedora sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \ configure sed -i -e '/^\t$(MAKE) strip-post-install$/d' src/Makefile.in %build %configure --bindir=%{_sbindir}/ \ --libexecdir=%{_libexecdir}/%{name}/ \ --sysconfdir=%{_sysconfdir}/%{name}/ \ --localstatedir=%{_localstatedir}/log/%{name}/ \ --datadir=%{_datadir}/nagios/html/%{name}/ \ --datarootdir=%{_datadir}/nagios/html/%{name}/ \ --with-perfdata-dir=%{_localstatedir}/lib/%{name}/ \ --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}/ make %{?_smp_mflags} all %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install-config DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios -name *-sample -exec rename "-sample" "" {} ';' sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp4nagios/process_perfdata.pl|' \ -e 's|^log_type = syslog|log_type = file|' \ $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/npcd.cfg mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pnp4nagios install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/npcd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add npcd %preun if [ $1 = 0 ]; then /sbin/service npcd stop >/dev/null 2>&1 /sbin/chkconfig --del npcd fi %postun if [ "$1" -ge "1" ]; then /sbin/service npcd condrestart >/dev/null 2>&1 || : fi %files %defattr(644,root,root,755) %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README README.fedora %doc README.npcd THANKS TODO %dir %{_sysconfdir}/pnp4nagios %config(noreplace) %{_sysconfdir}/pnp4nagios/* %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios %attr(755,root,root) %{_initrddir}/npcd %attr(755,root,root) %{_sbindir}/npcd %attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl %attr(755,nagios,nagios) %{_localstatedir}/lib/%{name} %attr(755,nagios,nagios) %{_localstatedir}/log/%{name} %attr(755,nagios,nagios) %{_localstatedir}/spool/%{name} %{_datadir}/nagios/html/pnp4nagios %changelog * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. * Tue May 27 2008 Xavier Bachelot 0.4.9-3 - Fix npcd init script to use /etc/pnp4nagios. * Tue May 27 2008 Xavier Bachelot 0.4.9-2 - Install npcd unstripped to let rpm do it. * Sat May 24 2008 Xavier Bachelot 0.4.9-1 - Update to 0.4.9. - Rename to pnp4nagios to match other distros packages. * Mon Apr 14 2008 Xavier Bachelot 0.4.7-5 - Log to file by default. - Kill pnpsender man page. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-4 - Install inside of nagios html dir. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-3 - Provide properly named config files. - Add missing Requires:. - Add a logrotate conf file. * Fri Apr 04 2008 Xavier Bachelot 0.4.7-2 - Add an initscript for npcd. * Wed Mar 19 2008 Xavier Bachelot 0.4.7-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:06:15 -0000 1.1 +++ sources 11 Jul 2008 21:59:57 -0000 1.2 @@ -0,0 +1 @@ +5e57d50e2d895878b626497fd7b217b7 pnp-0.4.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 22:01:20 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 11 Jul 2008 22:01:20 GMT Subject: rpms/pnp4nagios/F-9 pnp4nagios-README.fedora, NONE, 1.1 pnp4nagios-npcd.sysvinit, NONE, 1.1 pnp4nagios.logrotate.conf, NONE, 1.1 pnp4nagios.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807112201.m6BM1K8p029628@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22953/F-9 Modified Files: sources Added Files: pnp4nagios-README.fedora pnp4nagios-npcd.sysvinit pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: initial import into F-9, EL-4 and EL-5 --- NEW FILE pnp4nagios-README.fedora --- * Default Mode /etc/nagios/nagios.cfg process_performance_data=1 service_perfdata_command=process-service-perfdata /etc/nagios/commands.cfg define command { command_name process-service-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl } define command { command_name process-host-perfdata command_line /usr/bin/perl /usr/libexec/pnp4nagios/process_perfdata.pl -d HOSTPERFDATA } * Bulk Mode /etc/nagios/nagios.cfg : process_performance_data=1 # # service performance data # service_perfdata_file=/var/spool/nagios/service-perfdata service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$ service_perfdata_file_mode=a service_perfdata_file_processing_interval=15 service_perfdata_file_processing_command=process-service-perfdata-file /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/service-perfdata } define command{ command_name process-host-perfdata-file command_line $USER1$/process_perfdata.pl --bulk=/var/spool/nagios/host-perfdata } * Bulk Mode with NPCD npcd daemon needs to be started : service npcd start chkconfig npcd on The configuration is identical to the default-mode except for the used command. /etc/nagios/commands.cfg : define command{ command_name process-service-perfdata-file command_line /bin/mv /var/spool/nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } define command{ command_name process-host-perfdata-file command_line /bin/mv /var/spool/nagios/host-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$ } * Nagios integration /etc/nagios/hostextinfo.cfg : define hostextinfo { host_name localhost action_url /nagios/pnp4nagios/index.php?host=$HOSTNAME$ } --- NEW FILE pnp4nagios-npcd.sysvinit --- #!/bin/sh # # npcd Nagios Performancedata C Daemon # # chkconfig: - 98 02 # description: Nagios Performancedata C Daemon ### BEGIN INIT INFO # Provides: # Required-Start: # Required-Stop: # Should-Start: # Should-Stop: # Default-Start: # Default-Stop: # Short-Description: # Description: ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/sbin/npcd" prog="npcd" config="/etc/pnp4nagios/npcd.cfg" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon $exec -f $config -d retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE pnp4nagios.logrotate.conf --- /var/log/pnp4nagios/* { compress missingok notifempty rotate 5 size 100K } --- NEW FILE pnp4nagios.spec --- Name: pnp4nagios Version: 0.4.10 Release: 1%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System License: GPLv2 URL: http://www.pnp4nagios.org/ Source0: http://downloads.sourceforge.net/%{name}/pnp-%{version}.tar.gz Source1: pnp4nagios.logrotate.conf Source2: pnp4nagios-npcd.sysvinit Source3: pnp4nagios-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: rrdtool Requires: nagios Requires: rrdtool Requires: php-gd Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts %description PNP is an addon to nagios which analyzes performance data provided by plugins and stores them automatically into RRD-databases. %prep %setup -q -n pnp-%{version} cp -p %{SOURCE3} README.fedora sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \ configure sed -i -e '/^\t$(MAKE) strip-post-install$/d' src/Makefile.in %build %configure --bindir=%{_sbindir}/ \ --libexecdir=%{_libexecdir}/%{name}/ \ --sysconfdir=%{_sysconfdir}/%{name}/ \ --localstatedir=%{_localstatedir}/log/%{name}/ \ --datadir=%{_datadir}/nagios/html/%{name}/ \ --datarootdir=%{_datadir}/nagios/html/%{name}/ \ --with-perfdata-dir=%{_localstatedir}/lib/%{name}/ \ --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}/ make %{?_smp_mflags} all %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install-config DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios -name *-sample -exec rename "-sample" "" {} ';' sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp4nagios/process_perfdata.pl|' \ -e 's|^log_type = syslog|log_type = file|' \ $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/npcd.cfg mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pnp4nagios install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/npcd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add npcd %preun if [ $1 = 0 ]; then /sbin/service npcd stop >/dev/null 2>&1 /sbin/chkconfig --del npcd fi %postun if [ "$1" -ge "1" ]; then /sbin/service npcd condrestart >/dev/null 2>&1 || : fi %files %defattr(644,root,root,755) %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README README.fedora %doc README.npcd THANKS TODO %dir %{_sysconfdir}/pnp4nagios %config(noreplace) %{_sysconfdir}/pnp4nagios/* %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios %attr(755,root,root) %{_initrddir}/npcd %attr(755,root,root) %{_sbindir}/npcd %attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl %attr(755,nagios,nagios) %{_localstatedir}/lib/%{name} %attr(755,nagios,nagios) %{_localstatedir}/log/%{name} %attr(755,nagios,nagios) %{_localstatedir}/spool/%{name} %{_datadir}/nagios/html/pnp4nagios %changelog * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. * Tue May 27 2008 Xavier Bachelot 0.4.9-3 - Fix npcd init script to use /etc/pnp4nagios. * Tue May 27 2008 Xavier Bachelot 0.4.9-2 - Install npcd unstripped to let rpm do it. * Sat May 24 2008 Xavier Bachelot 0.4.9-1 - Update to 0.4.9. - Rename to pnp4nagios to match other distros packages. * Mon Apr 14 2008 Xavier Bachelot 0.4.7-5 - Log to file by default. - Kill pnpsender man page. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-4 - Install inside of nagios html dir. * Mon Apr 07 2008 Xavier Bachelot 0.4.7-3 - Provide properly named config files. - Add missing Requires:. - Add a logrotate conf file. * Fri Apr 04 2008 Xavier Bachelot 0.4.7-2 - Add an initscript for npcd. * Wed Mar 19 2008 Xavier Bachelot 0.4.7-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:06:15 -0000 1.1 +++ sources 11 Jul 2008 22:00:35 -0000 1.2 @@ -0,0 +1 @@ +5e57d50e2d895878b626497fd7b217b7 pnp-0.4.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 22:08:17 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 22:08:17 GMT Subject: comps comps-f10.xml.in,1.46,1.47 Message-ID: <200807112208.m6BM8HqE030141@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30098 Modified Files: comps-f10.xml.in Log Message: sort + add a few packaged and soon to be packaged fonts Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- comps-f10.xml.in 10 Jul 2008 20:42:12 -0000 1.46 +++ comps-f10.xml.in 11 Jul 2008 22:07:46 -0000 1.47 @@ -93,8 +93,8 @@ hy dejavu-fonts - dejavu-fonts-experimental moodle-hy + dejavu-fonts-experimental m17n-db-armenian @@ -1118,10 +1118,10 @@ gerbv ghdl GMT - GMT-doc GMT-coastlines-all GMT-coastlines-full GMT-coastlines-high + GMT-doc gnome-chemistry-utils gnucap gpredict @@ -1282,6 +1282,7 @@ bodhi-client bzr + curl cvs fedora-packager git @@ -1291,7 +1292,6 @@ plague-client rpm-build rpmdevtools - curl @@ -1313,7 +1313,6 @@ false fi - enchant-voikko gcompris-sound-fi kde-i18n-Finnish kde-l10n-Finnish @@ -1321,6 +1320,7 @@ moodle-fi openoffice.org-langpack-fi_FI openoffice.org-voikko + enchant-voikko tmispell-voikko @@ -1353,6 +1353,7 @@ stix-fonts thaifonts-scalable VLGothic-fonts + andika-fonts baekmuk-ttf-fonts-batang baekmuk-ttf-fonts-dotum baekmuk-ttf-fonts-hline @@ -1365,6 +1366,7 @@ fonts-truetype-apl freefont gentium-fonts + gfs-ambrosia-fonts gfs-artemisia-fonts gfs-baskerville-fonts gfs-bodoni-classic-fonts @@ -1372,8 +1374,12 @@ gfs-complutum-fonts gfs-didot-classic-fonts gfs-didot-fonts + gfs-eustace-fonts + gfs-fleischman-fonts gfs-gazis-fonts + gfs-jackson-fonts gfs-neohellenic-fonts + gfs-nicefore-fonts gfs-olga-fonts gfs-porson-fonts gfs-solomos-fonts @@ -1851,7 +1857,6 @@ pcmanfm rss-glx-gnome-screensaver sabayon - scim-bridge-gtk scim-gtk seahorse stardict-dic-en @@ -1893,7 +1898,6 @@ eel2-devel evolution-data-server-devel gail-devel - xulrunner-devel glade2 gnome-desktop-devel gnome-devel-docs @@ -1905,6 +1909,7 @@ libgnomeprintui22-devel libgtop2-devel pygtk2-devel + xulrunner-devel anjuta anjuta-doc bakery-devel @@ -2123,6 +2128,7 @@ moodle-el openoffice.org-langpack-el_GR tetex-font-kerkis + gfs-ambrosia-fonts gfs-artemisia-fonts gfs-baskerville-fonts gfs-bodoni-classic-fonts @@ -2130,8 +2136,12 @@ gfs-complutum-fonts gfs-didot-classic-fonts gfs-didot-fonts + gfs-eustace-fonts + gfs-fleischman-fonts gfs-gazis-fonts + gfs-jackson-fonts gfs-neohellenic-fonts + gfs-nicefore-fonts gfs-olga-fonts gfs-porson-fonts gfs-solomos-fonts @@ -2296,6 +2306,10 @@ true true + imsettings-xfce + scim-bridge-gtk + scim-bridge-qt + scim-qtimm im-chooser m17n-contrib-assamese m17n-contrib-bengali @@ -2317,10 +2331,6 @@ scim-m17n scim-python-pinyin scim-rawcode - imsettings-xfce - scim-bridge-gtk - scim-bridge-qt - scim-qtimm cellwriter gcin gok @@ -2391,7 +2401,6 @@ scim-tables-thai scim-tables-vietnamese scim-tomoe - scim-pinyin uim uim-anthy uim-canna @@ -3050,9 +3059,9 @@ false ml - smc-fonts-meera m17n-contrib-malayalam m17n-db-malayalam + smc-fonts-meera moodle-ml openoffice.org-langpack-ml_IN scim-lang-malayalam @@ -3316,13 +3325,13 @@ revelation taskjuggler tellico - xdvik texmaker tinyerp tinyerp-server vym wyrd xchm + xdvik xfbib Zim @@ -3806,8 +3815,8 @@ postgresql-tcl postgresql-test qt-odbc - qt3-ODBC qt-postgresql + qt3-ODBC qt3-PostgreSQL unixODBC-kde @@ -4289,6 +4298,17 @@ + walloon-support + <_name>Walloon Support + <_description/> + false + false + wa + + kde-l10n-Walloon + + + web-development <_name>Web Development <_description>These packages are helpful when developing web applications or web pages. @@ -4361,17 +4381,6 @@ - walloon-support - <_name>Walloon Support - <_description/> - false - false - wa - - kde-l10n-Walloon - - - welsh-support <_name>Welsh Support <_description/> @@ -4477,6 +4486,7 @@ false true + desktop-backgrounds-compat libxfce4mcs libxfce4util libxfcegui4 @@ -4487,7 +4497,6 @@ xfce4-session-engines xfdesktop xfwm4 - desktop-backgrounds-compat imsettings-xfce gdm mousepad @@ -4632,8 +4641,8 @@ irish-support italian-support japanese-support - kashubian-support kannada-support + kashubian-support khmer-support korean-support lao-support @@ -4695,8 +4704,8 @@ gnome-desktop kde-desktop - window-managers sugar-desktop + window-managers xfce-desktop From fedora-extras-commits at redhat.com Fri Jul 11 22:09:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 22:09:33 GMT Subject: rpms/libzrtpcpp/F-9 libzrtpcpp.spec, NONE, 1.1 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2 Message-ID: <200807112209.m6BM9XsI030299@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libzrtpcpp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30208 Modified Files: sources .cvsignore Added Files: libzrtpcpp.spec Log Message: Initial version --- NEW FILE libzrtpcpp.spec --- Name: libzrtpcpp Version: 1.3.0 Release: 2%{?dist} Summary: ZRTP support library for the GNU ccRTP stack Group: System Environment/Libraries License: GPLv3+ URL: http://www.gnu.org/software/ccrtp/ Source0: ftp://ftp.gnu.org/gnu/ccrtp/libzrtpcpp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ccrtp-devel BuildRequires: libgcrypt-devel BuildRequires: doxygen %description This package provides a library that adds ZRTP support to the GNU ccRTP stack. Phil Zimmermann developed ZRTP to allow ad-hoc, easy to use key negotiation to setup Secure RTP (SRTP) sessions. GNU ZRTP together with GNU ccRTP (1.5.0 or later) provides a ZRTP implementation that can be directly embedded into client and server applications. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %build %configure --disable-static sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} # Make the NEWS file non executable chmod 644 NEWS %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README AUTHORS COPYING NEWS %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/libzrtpcpp.pc %changelog * Mon Jun 30 2008 Kevin Fenzi - 1.3.0-2 - Fix unused-direct-shlib-dependency and other minor issues. * Wed Jun 25 2008 Kevin Fenzi - 1.3.0-1 - Initial version for Fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/libzrtpcpp/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 20:06:09 -0000 1.1 +++ sources 11 Jul 2008 22:08:46 -0000 1.2 @@ -0,0 +1 @@ +e2abd4f7cf68496d0772dd7e5a71873a libzrtpcpp-1.3.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libzrtpcpp/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 20:06:09 -0000 1.1 +++ .cvsignore 11 Jul 2008 22:08:46 -0000 1.2 @@ -0,0 +1 @@ +libzrtpcpp-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 22:14:30 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 11 Jul 2008 22:14:30 GMT Subject: comps comps-f9.xml.in,1.374,1.375 Message-ID: <200807112214.m6BMEUYO030538@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30508 Modified Files: comps-f9.xml.in Log Message: sort Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.374 retrieving revision 1.375 diff -u -r1.374 -r1.375 --- comps-f9.xml.in 10 Jul 2008 20:42:12 -0000 1.374 +++ comps-f9.xml.in 11 Jul 2008 22:14:00 -0000 1.375 @@ -1283,6 +1283,7 @@ bodhi-client bzr + curl cvs fedora-packager git @@ -1292,7 +1293,6 @@ plague-client rpm-build rpmdevtools - curl @@ -1314,7 +1314,6 @@ false fi - enchant-voikko gcompris-sound-fi kde-i18n-Finnish kde-l10n-Finnish @@ -1322,7 +1321,8 @@ moodle-fi openoffice.org-langpack-fi_FI openoffice.org-voikko - tmispell-voikko + enchant-voikko + tmispell-voikko @@ -4587,8 +4587,8 @@ gnome-desktop kde-desktop - window-managers sugar-desktop + window-managers xfce-desktop From fedora-extras-commits at redhat.com Fri Jul 11 22:18:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 22:18:07 GMT Subject: rpms/libzrtpcpp/F-8 libzrtpcpp.spec, NONE, 1.1 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2 Message-ID: <200807112218.m6BMI7PY030819@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libzrtpcpp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30684 Modified Files: sources .cvsignore Added Files: libzrtpcpp.spec Log Message: Initial version --- NEW FILE libzrtpcpp.spec --- Name: libzrtpcpp Version: 1.3.0 Release: 2%{?dist} Summary: ZRTP support library for the GNU ccRTP stack Group: System Environment/Libraries License: GPLv3+ URL: http://www.gnu.org/software/ccrtp/ Source0: ftp://ftp.gnu.org/gnu/ccrtp/libzrtpcpp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ccrtp-devel BuildRequires: libgcrypt-devel BuildRequires: doxygen %description This package provides a library that adds ZRTP support to the GNU ccRTP stack. Phil Zimmermann developed ZRTP to allow ad-hoc, easy to use key negotiation to setup Secure RTP (SRTP) sessions. GNU ZRTP together with GNU ccRTP (1.5.0 or later) provides a ZRTP implementation that can be directly embedded into client and server applications. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %build %configure --disable-static sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} # Make the NEWS file non executable chmod 644 NEWS %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README AUTHORS COPYING NEWS %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/libzrtpcpp.pc %changelog * Mon Jun 30 2008 Kevin Fenzi - 1.3.0-2 - Fix unused-direct-shlib-dependency and other minor issues. * Wed Jun 25 2008 Kevin Fenzi - 1.3.0-1 - Initial version for Fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/libzrtpcpp/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jun 2008 20:06:09 -0000 1.1 +++ sources 11 Jul 2008 22:17:21 -0000 1.2 @@ -0,0 +1 @@ +e2abd4f7cf68496d0772dd7e5a71873a libzrtpcpp-1.3.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libzrtpcpp/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jun 2008 20:06:09 -0000 1.1 +++ .cvsignore 11 Jul 2008 22:17:21 -0000 1.2 @@ -0,0 +1 @@ +libzrtpcpp-1.3.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 22:20:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 11 Jul 2008 22:20:15 GMT Subject: rpms/twinkle/F-9 twinkle-1.2-zrtpgcc43.patch, NONE, 1.1 twinkle.spec, 1.13, 1.14 Message-ID: <200807112220.m6BMKFhd031033@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/twinkle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30935 Modified Files: twinkle.spec Added Files: twinkle-1.2-zrtpgcc43.patch Log Message: Rebuild with libzrtpcpp twinkle-1.2-zrtpgcc43.patch: --- NEW FILE twinkle-1.2-zrtpgcc43.patch --- diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp --- twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp 2008-02-27 08:10:50.000000000 +1100 +++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp 2008-05-31 11:30:59.000000000 +1000 @@ -32,7 +32,7 @@ extern t_phone *phone; TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) : - ZrtpUserCallback(queue), audioSession(session) + ZrtpUserCallback(), audioSession(session) {} void TwinkleZrtpUI::secureOn(std::string cipher) { @@ -96,7 +96,7 @@ ui->cb_async_zrtp_confirm_go_clear(lineno); } -void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) { +void TwinkleZrtpUI::showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message) { t_line *line = audioSession->get_line(); int lineno = line->get_line_number(); @@ -106,11 +106,11 @@ msg += message; switch (sev) { - case Info: + case GnuZrtpCodes::Info: log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, LOG_INFO); break; - case Warning: + case GnuZrtpCodes::Warning: log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, LOG_WARNING); break; @@ -120,7 +120,7 @@ } } -void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) { +void TwinkleZrtpUI::zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg) { t_line *line = audioSession->get_line(); int lineno = line->get_line_number(); @@ -130,11 +130,11 @@ m += msg; switch (severity) { - case Info: + case GnuZrtpCodes::Info: log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, LOG_INFO); break; - case Warning: + case GnuZrtpCodes::Warning: log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, LOG_WARNING); break; diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.h twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h --- twinkle-1.2/src/audio/twinkle_zrtp_ui.h 2008-02-27 08:10:48.000000000 +1100 +++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h 2008-05-31 11:30:20.000000000 +1000 @@ -44,8 +44,8 @@ virtual void secureOff(); virtual void showSAS(std::string sas); virtual void confirmGoClear(); - virtual void showMessage(MessageSeverity sev, std::string message); - virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg); + virtual void showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message); + virtual void zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg); virtual void zrtpNotSuppOther(); private: Index: twinkle.spec =================================================================== RCS file: /cvs/extras/rpms/twinkle/F-9/twinkle.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- twinkle.spec 1 Apr 2008 01:45:29 -0000 1.13 +++ twinkle.spec 11 Jul 2008 22:19:29 -0000 1.14 @@ -1,6 +1,6 @@ Name: twinkle Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A SIP Soft Phone Group: Applications/Internet @@ -9,6 +9,7 @@ Source0: http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz Patch0: twinkle-1.1-msg.patch Patch1: twinkle-1.2-gcc43.patch +Patch2: twinkle-1.2-zrtpgcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: commoncpp2-devel @@ -21,6 +22,7 @@ BuildRequires: alsa-lib-devel BuildRequires: kdelibs3-devel BuildRequires: bison +BuildRequires: libzrtpcpp-devel %description Twinkle is a SIP based soft phone for making telephone calls over IP networks. @@ -29,6 +31,7 @@ %setup -q %patch0 -p1 -b .msg %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .zrtpgcc43 %build %configure @@ -61,6 +64,9 @@ %{_datadir}/applications/fedora-twinkle.desktop %changelog +* Mon Jun 30 2008 Kevin Fenzi - 1.2-3 +- Rebuild with libzrtpcpp + * Mon Mar 31 2008 Kevin Fenzi - 1.2-2 - Rebuild for new qt3 From fedora-extras-commits at redhat.com Fri Jul 11 22:29:48 2008 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 11 Jul 2008 22:29:48 GMT Subject: rpms/python-basemap/devel python-basemap.spec,1.19,1.20 Message-ID: <200807112229.m6BMTmPQ031636@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/python-basemap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31603 Modified Files: python-basemap.spec Log Message: * Fri Jul 11 2008 Jef Spaleta 0.99-2 - File conflict fix for Bug 455005 Index: python-basemap.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- python-basemap.spec 7 Jul 2008 19:42:56 -0000 1.19 +++ python-basemap.spec 11 Jul 2008 22:28:52 -0000 1.20 @@ -2,7 +2,7 @@ Name: python-basemap Version: 0.99 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plots data on map projections (with continental and political boundaries) Group: Development/Libraries License: LGPLv2+ @@ -50,7 +50,8 @@ %files %defattr(-,root,root,-) %doc Changelog README LICENSE_pyshapelib -%{python_sitearch}/mpl_toolkits/ +%exclude %{python_sitearch}/mpl_toolkits/__init__.* +%{python_sitearch}/mpl_toolkits/basemap %{python_sitearch}/dbflib/ %{python_sitearch}/dbflibc.so %{python_sitearch}/shapelib/ @@ -60,6 +61,9 @@ %{python_sitearch}/_geoslib.so %changelog +* Fri Jul 11 2008 Jef Spaleta 0.99-2 +- File conflict fix for Bug 455005 + * Wed Jul 02 2008 Jef Spaleta 0.99-1 - Update to match latest matplotlib From fedora-extras-commits at redhat.com Fri Jul 11 22:54:01 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 11 Jul 2008 22:54:01 GMT Subject: rpms/fluidsynth/F-9 fluidsynth.spec,1.7,1.8 sources,1.2,1.3 Message-ID: <200807112254.m6BMs1B4000917@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/fluidsynth/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv789 Modified Files: fluidsynth.spec sources Log Message: Upgrade to 1.0.8 Index: fluidsynth.spec =================================================================== RCS file: /cvs/pkgs/rpms/fluidsynth/F-9/fluidsynth.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fluidsynth.spec 19 Feb 2008 04:05:47 -0000 1.7 +++ fluidsynth.spec 11 Jul 2008 22:53:05 -0000 1.8 @@ -1,9 +1,9 @@ Summary: Real-time software synthesizer Name: fluidsynth -Version: 1.0.7 -Release: 11.a%{?dist} +Version: 1.0.8 +Release: 1%{?dist} URL: http://www.fluidsynth.org/ -Source0: http://download.savannah.gnu.org/releases/fluid/fluidsynth-1.0.7a.tar.gz +Source0: http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -85,6 +85,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jul 08 2008 Anthony Green 1.0.8-1 +- Upgrade source. + * Mon Feb 18 2008 Fedora Release Engineering - 1.0.7-11.a - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fluidsynth/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Jul 2006 03:08:22 -0000 1.2 +++ sources 11 Jul 2008 22:53:05 -0000 1.3 @@ -1 +1 @@ -0f73d47990d859f19b8e9840bdab5c60 fluidsynth-1.0.7a.tar.gz +e2abfd2e69fd8b28d965df968d7d44ee fluidsynth-1.0.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 22:55:23 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 11 Jul 2008 22:55:23 GMT Subject: rpms/fluidsynth/F-8 fluidsynth.spec,1.6,1.7 sources,1.2,1.3 Message-ID: <200807112255.m6BMtN4s001071@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/fluidsynth/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv933 Modified Files: fluidsynth.spec sources Log Message: Upgrade to 1.0.8 Index: fluidsynth.spec =================================================================== RCS file: /cvs/pkgs/rpms/fluidsynth/F-8/fluidsynth.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fluidsynth.spec 9 Oct 2007 09:33:55 -0000 1.6 +++ fluidsynth.spec 11 Jul 2008 22:54:36 -0000 1.7 @@ -1,9 +1,9 @@ Summary: Real-time software synthesizer Name: fluidsynth -Version: 1.0.7 -Release: 10.a%{?dist} +Version: 1.0.8 +Release: 1%{?dist} URL: http://www.fluidsynth.org/ -Source0: http://download.savannah.gnu.org/releases/fluid/fluidsynth-1.0.7a.tar.gz +Source0: http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -85,6 +85,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jul 08 2008 Anthony Green 1.0.8-1 +- Upgrade source. + * Tue Oct 09 2007 Anthony Green 1.0.7-10.a - Rebuilt for new lash again. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fluidsynth/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Jul 2006 03:08:22 -0000 1.2 +++ sources 11 Jul 2008 22:54:37 -0000 1.3 @@ -1 +1 @@ -0f73d47990d859f19b8e9840bdab5c60 fluidsynth-1.0.7a.tar.gz +e2abfd2e69fd8b28d965df968d7d44ee fluidsynth-1.0.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 11 23:02:53 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Fri, 11 Jul 2008 23:02:53 GMT Subject: comps comps-f10.xml.in,1.47,1.48 Message-ID: <200807112302.m6BN2r1M008272@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8191 Modified Files: comps-f10.xml.in Log Message: Add my fonts to F10 comps Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- comps-f10.xml.in 11 Jul 2008 22:07:46 -0000 1.47 +++ comps-f10.xml.in 11 Jul 2008 23:02:23 -0000 1.48 @@ -1358,6 +1358,7 @@ baekmuk-ttf-fonts-dotum baekmuk-ttf-fonts-hline bitstream-vera-fonts + brettfont-fonts charis-fonts cjkunifonts-ukai dejavu-lgc-fonts @@ -1390,6 +1391,7 @@ mathml-fonts mgopen-fonts nafees-web-naskh-fonts + roadstencil-fonts samyak-fonts-devanagari samyak-fonts-gujarati samyak-fonts-malayalam From fedora-extras-commits at redhat.com Fri Jul 11 23:28:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:34 +0000 Subject: [pkgdb] roadstencil-fonts (Fedora EPEL, 5) updated by spot Message-ID: <200807112328.m6BNSYxc024619@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on roadstencil-fonts (Fedora EPEL 5) for fonts-sig Tom Callaway (spot) approved watchcommits on roadstencil-fonts (Fedora EPEL 5) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/roadstencil-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:34 +0000 Subject: [pkgdb] roadstencil-fonts (Fedora, 9) updated by spot Message-ID: <200807112328.m6BNSYxf024619@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on roadstencil-fonts (Fedora 9) for fonts-sig Tom Callaway (spot) approved watchcommits on roadstencil-fonts (Fedora 9) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/roadstencil-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:34 +0000 Subject: [pkgdb] roadstencil-fonts (Fedora, devel) updated by spot Message-ID: <200807112328.m6BNSYiN024620@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on roadstencil-fonts (Fedora devel) for fonts-sig Tom Callaway (spot) approved watchcommits on roadstencil-fonts (Fedora devel) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/roadstencil-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:34 +0000 Subject: [pkgdb] roadstencil-fonts (Fedora, 8) updated by spot Message-ID: <200807112328.m6BNSYxh024619@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on roadstencil-fonts (Fedora 8) for fonts-sig Tom Callaway (spot) approved watchcommits on roadstencil-fonts (Fedora 8) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/roadstencil-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:34 +0000 Subject: [pkgdb] roadstencil-fonts (Fedora EPEL, 4) updated by spot Message-ID: <200807112328.m6BNSYiR024620@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on roadstencil-fonts (Fedora EPEL 4) for fonts-sig Tom Callaway (spot) approved watchcommits on roadstencil-fonts (Fedora EPEL 4) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/roadstencil-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:34 +0000 Subject: [pkgdb] roadstencil-fonts (Fedora, 7) updated by spot Message-ID: <200807112328.m6BNSYxk024619@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 7 branch for roadstencil-fonts Tom Callaway (spot) has set commit to Approved for cvsextras on roadstencil-fonts (Fedora 7) Tom Callaway (spot) has set build to Approved for cvsextras on roadstencil-fonts (Fedora 7) Tom Callaway (spot) has set checkout to Approved for cvsextras on roadstencil-fonts (Fedora 7) Tom Callaway (spot) approved watchbugzilla on roadstencil-fonts (Fedora 7) for fonts-sig Tom Callaway (spot) approved watchcommits on roadstencil-fonts (Fedora 7) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/roadstencil-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:58 +0000 Subject: [pkgdb] brettfont-fonts (Fedora EPEL, 5) updated by spot Message-ID: <200807112328.m6BNSw1g024744@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on brettfont-fonts (Fedora EPEL 5) for fonts-sig Tom Callaway (spot) approved watchcommits on brettfont-fonts (Fedora EPEL 5) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brettfont-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:58 +0000 Subject: [pkgdb] brettfont-fonts (Fedora, devel) updated by spot Message-ID: <200807112328.m6BNSxcg024762@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on brettfont-fonts (Fedora devel) for fonts-sig Tom Callaway (spot) approved watchcommits on brettfont-fonts (Fedora devel) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brettfont-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:58 +0000 Subject: [pkgdb] brettfont-fonts (Fedora EPEL, 4) updated by spot Message-ID: <200807112328.m6BNSw1j024744@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on brettfont-fonts (Fedora EPEL 4) for fonts-sig Tom Callaway (spot) approved watchcommits on brettfont-fonts (Fedora EPEL 4) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brettfont-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:58 +0000 Subject: [pkgdb] brettfont-fonts (Fedora, 9) updated by spot Message-ID: <200807112329.m6BNSxcj024762@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on brettfont-fonts (Fedora 9) for fonts-sig Tom Callaway (spot) approved watchcommits on brettfont-fonts (Fedora 9) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brettfont-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:58 +0000 Subject: [pkgdb] brettfont-fonts (Fedora, 7) updated by spot Message-ID: <200807112329.m6BNSw1m024744@bastion.fedora.phx.redhat.com> Tom Callaway (spot) added a Fedora 7 branch for brettfont-fonts Tom Callaway (spot) has set commit to Approved for cvsextras on brettfont-fonts (Fedora 7) Tom Callaway (spot) has set build to Approved for cvsextras on brettfont-fonts (Fedora 7) Tom Callaway (spot) has set checkout to Approved for cvsextras on brettfont-fonts (Fedora 7) Tom Callaway (spot) approved watchbugzilla on brettfont-fonts (Fedora 7) for fonts-sig Tom Callaway (spot) approved watchcommits on brettfont-fonts (Fedora 7) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brettfont-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:28:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 11 Jul 2008 23:28:58 +0000 Subject: [pkgdb] brettfont-fonts (Fedora, 8) updated by spot Message-ID: <200807112329.m6BNSxcm024762@bastion.fedora.phx.redhat.com> Tom Callaway (spot) approved watchbugzilla on brettfont-fonts (Fedora 8) for fonts-sig Tom Callaway (spot) approved watchcommits on brettfont-fonts (Fedora 8) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brettfont-fonts From fedora-extras-commits at redhat.com Fri Jul 11 23:42:10 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?= (tibbs)) Date: Fri, 11 Jul 2008 23:42:10 GMT Subject: rpms/denyhosts/devel denyhosts.init, 1.9, 1.10 denyhosts.spec, 1.48, 1.49 Message-ID: <200807112342.m6BNgAXx010999@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898 Modified Files: denyhosts.init denyhosts.spec Log Message: * Fri Jul 11 2008 Jason L Tibbitts III - 2.6-11 - Tweak initscript priorities to ensure that the MTA is started first. Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- denyhosts.init 2 Jul 2008 02:43:51 -0000 1.9 +++ denyhosts.init 11 Jul 2008 23:41:18 -0000 1.10 @@ -7,7 +7,7 @@ # Author: Seth Vidal (original script) # Jason Tibbitts (denyhost changes) # -# chkconfig: - 50 01 +# chkconfig: - 85 35 # # description: Enable execution of denyhosts, an SSH log watcher # processname: denyhosts @@ -15,7 +15,7 @@ # ### BEGIN INIT INFO # Provides: denyhosts -# Required-Start: $syslog +# Required-Start: $syslog smtpdaemon # Short-Description: Enable execution of denyhosts, an SSH log watcher # Description: DenyHosts is a Python script that analyzes the sshd server # log messages to determine which hosts are attempting to Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- denyhosts.spec 2 Jul 2008 02:43:51 -0000 1.48 +++ denyhosts.spec 11 Jul 2008 23:41:18 -0000 1.49 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -158,6 +158,9 @@ %changelog +* Fri Jul 11 2008 Jason L Tibbitts III - 2.6-11 +- Tweak initscript priorities to ensure that the MTA is started first. + * Tue Jul 01 2008 Jason L Tibbitts III - 2.6-10 - Fix initscript lockfile handling: Stop creating the lockfile in the initscript. From fedora-extras-commits at redhat.com Sat Jul 12 00:15:21 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 12 Jul 2008 00:15:21 GMT Subject: rpms/kernel/devel kernel.spec, 1.753, 1.754 linux-2.6-ptrace-cleanup.patch, 1.1, 1.2 linux-2.6-tracehook.patch, 1.1, 1.2 linux-2.6-utrace.patch, 1.79, 1.80 Message-ID: <200807120015.m6C0FL7d021068@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20911 Modified Files: kernel.spec linux-2.6-ptrace-cleanup.patch linux-2.6-tracehook.patch linux-2.6-utrace.patch Log Message: utrace update Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.753 retrieving revision 1.754 diff -u -r1.753 -r1.754 --- kernel.spec 11 Jul 2008 19:41:33 -0000 1.753 +++ kernel.spec 12 Jul 2008 00:14:30 -0000 1.754 @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Fri Jul 11 2008 Roland McGrath +- utrace update + * Fri Jul 11 2008 Dave Jones - 2.6.26-rc9-git9 linux-2.6-ptrace-cleanup.patch: Index: linux-2.6-ptrace-cleanup.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ptrace-cleanup.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-ptrace-cleanup.patch 9 Jul 2008 03:37:06 -0000 1.1 +++ linux-2.6-ptrace-cleanup.patch 12 Jul 2008 00:14:30 -0000 1.2 @@ -3,20 +3,26 @@ arch/powerpc/kernel/signal.c | 12 +- arch/powerpc/kernel/signal_32.c | 2 +- arch/ppc/kernel/entry.S | 4 +- - arch/x86/kernel/entry_32.S | 11 +- - arch/x86/kernel/ptrace.c | 134 ++++-------- - arch/x86/kernel/step.c | 22 ++- + arch/x86/ia32/ia32entry.S | 14 +- + arch/x86/kernel/entry_32.S | 23 +-- + arch/x86/kernel/entry_64.S | 20 +- + arch/x86/kernel/ptrace.c | 151 +++++-------- + arch/x86/kernel/signal_32.c | 6 - + arch/x86/kernel/signal_64.c | 6 - + arch/x86/kernel/step.c | 35 +++- include/asm-powerpc/processor.h | 2 + include/asm-powerpc/ptrace.h | 4 + include/asm-powerpc/thread_info.h | 17 +- + include/asm-x86/calling.h | 6 +- include/asm-x86/ptrace-abi.h | 6 +- - include/asm-x86/thread_info_64.h | 2 + + include/asm-x86/thread_info_32.h | 12 +- + include/asm-x86/thread_info_64.h | 17 ++- include/linux/init_task.h | 4 +- include/linux/sched.h | 26 +-- kernel/exit.c | 450 +++++++++++++++++++++++-------------- kernel/fork.c | 6 +- kernel/ptrace.c | 37 ++- - 18 files changed, 428 insertions(+), 334 deletions(-) + 24 files changed, 510 insertions(+), 373 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 0c8614d..3a05e9f 100644 @@ -157,11 +163,97 @@ beq restore_user do_user_signal: /* r10 contains MSR_KERNEL here */ ori r10,r10,MSR_EE +diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S +index b5e329d..0b2ab50 100644 +--- a/arch/x86/ia32/ia32entry.S ++++ b/arch/x86/ia32/ia32entry.S +@@ -37,6 +37,11 @@ + movq %rax,R8(%rsp) + .endm + ++ /* ++ * Reload arg registers from stack in case ptrace changed them. ++ * We don't reload %eax because syscall_trace_enter() returned ++ * the value it wants us to use in the table lookup. ++ */ + .macro LOAD_ARGS32 offset + movl \offset(%rsp),%r11d + movl \offset+8(%rsp),%r10d +@@ -46,7 +51,6 @@ + movl \offset+48(%rsp),%edx + movl \offset+56(%rsp),%esi + movl \offset+64(%rsp),%edi +- movl \offset+72(%rsp),%eax + .endm + + .macro CFI_STARTPROC32 simple +@@ -124,12 +128,12 @@ ENTRY(ia32_sysenter_target) + .previous + GET_THREAD_INFO(%r10) + orl $TS_COMPAT,threadinfo_status(%r10) +- testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10) ++ testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%r10) + CFI_REMEMBER_STATE + jnz sysenter_tracesys +-sysenter_do_call: + cmpl $(IA32_NR_syscalls-1),%eax + ja ia32_badsys ++sysenter_do_call: + IA32_ARG_FIXUP 1 + call *ia32_sys_call_table(,%rax,8) + movq %rax,RAX-ARGOFFSET(%rsp) +@@ -231,7 +235,7 @@ ENTRY(ia32_cstar_target) + .previous + GET_THREAD_INFO(%r10) + orl $TS_COMPAT,threadinfo_status(%r10) +- testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10) ++ testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%r10) + CFI_REMEMBER_STATE + jnz cstar_tracesys + cstar_do_call: +@@ -325,7 +329,7 @@ ENTRY(ia32_syscall) + SAVE_ARGS 0,0,1 + GET_THREAD_INFO(%r10) + orl $TS_COMPAT,threadinfo_status(%r10) +- testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10) ++ testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%r10) + jnz ia32_tracesys + ia32_do_syscall: + cmpl $(IA32_NR_syscalls-1),%eax diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S -index c778e4f..58a5a11 100644 +index c778e4f..f5d312c 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S -@@ -513,11 +513,7 @@ END(work_pending) +@@ -331,7 +331,7 @@ sysenter_past_esp: + GET_THREAD_INFO(%ebp) + + /* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */ +- testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp) ++ testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp) + jnz syscall_trace_entry + cmpl $(nr_syscalls), %eax + jae syscall_badsys +@@ -369,7 +369,7 @@ ENTRY(system_call) + GET_THREAD_INFO(%ebp) + # system call tracing in operation / emulation + /* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */ +- testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp) ++ testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp) + jnz syscall_trace_entry + cmpl $(nr_syscalls), %eax + jae syscall_badsys +@@ -382,10 +382,6 @@ syscall_exit: + # setting need_resched or sigpending + # between sampling and the iret + TRACE_IRQS_OFF +- testl $X86_EFLAGS_TF,PT_EFLAGS(%esp) # If tracing set singlestep flag on exit +- jz no_singlestep +- orl $_TIF_SINGLESTEP,TI_flags(%ebp) +-no_singlestep: + movl TI_flags(%ebp), %ecx + testw $_TIF_ALLWORK_MASK, %cx # current->work + jne syscall_exit_work +@@ -513,12 +509,8 @@ END(work_pending) syscall_trace_entry: movl $-ENOSYS,PT_EAX(%esp) movl %esp, %eax @@ -170,12 +262,18 @@ - cmpl $0, %eax - jne resume_userspace # ret != 0 -> running under PTRACE_SYSEMU, - # so must skip actual syscall +- movl PT_ORIG_EAX(%esp), %eax + call syscall_trace_enter - movl PT_ORIG_EAX(%esp), %eax ++ /* What it returned is what we'll actually use. */ cmpl $(nr_syscalls), %eax jnae syscall_call -@@ -530,11 +526,10 @@ syscall_exit_work: - testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl + jmp syscall_exit +@@ -527,14 +519,13 @@ END(syscall_trace_entry) + # perform syscall exit tracing + ALIGN + syscall_exit_work: +- testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl ++ testb $_TIF_WORK_SYSCALL_EXIT, %cl jz work_pending TRACE_IRQS_ON - ENABLE_INTERRUPTS(CLBR_ANY) # could let do_syscall_trace() call @@ -188,8 +286,82 @@ jmp resume_userspace END(syscall_exit_work) CFI_ENDPROC +diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S +index 556a8df..21c72a9 100644 +--- a/arch/x86/kernel/entry_64.S ++++ b/arch/x86/kernel/entry_64.S +@@ -244,7 +244,7 @@ ENTRY(system_call_after_swapgs) + movq %rcx,RIP-ARGOFFSET(%rsp) + CFI_REL_OFFSET rip,RIP-ARGOFFSET + GET_THREAD_INFO(%rcx) +- testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%rcx) ++ testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%rcx) + jnz tracesys + cmpq $__NR_syscall_max,%rax + ja badsys +@@ -305,7 +305,7 @@ sysret_signal: + leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1 + xorl %esi,%esi # oldset -> arg2 + call ptregscall_common +-1: movl $_TIF_NEED_RESCHED,%edi ++1: movl $_TIF_WORK_MASK,%edi + /* Use IRET because user could have changed frame. This + works because ptregscall_common has called FIXUP_TOP_OF_STACK. */ + DISABLE_INTERRUPTS(CLBR_NONE) +@@ -323,7 +323,12 @@ tracesys: + FIXUP_TOP_OF_STACK %rdi + movq %rsp,%rdi + call syscall_trace_enter +- LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ ++ /* ++ * Reload arg registers from stack in case ptrace changed them. ++ * We don't reload %rax because syscall_trace_enter() returned ++ * the value it wants us to use in the table lookup. ++ */ ++ LOAD_ARGS ARGOFFSET, 1 + RESTORE_REST + cmpq $__NR_syscall_max,%rax + ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */ +@@ -376,7 +381,7 @@ int_very_careful: + ENABLE_INTERRUPTS(CLBR_NONE) + SAVE_REST + /* Check for syscall exit trace */ +- testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edx ++ testl $_TIF_WORK_SYSCALL_EXIT,%edx + jz int_signal + pushq %rdi + CFI_ADJUST_CFA_OFFSET 8 +@@ -384,7 +389,7 @@ int_very_careful: + call syscall_trace_leave + popq %rdi + CFI_ADJUST_CFA_OFFSET -8 +- andl $~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edi ++ andl $~(_TIF_WORK_SYSCALL_EXIT|_TIF_SYSCALL_EMU),%edi + jmp int_restore_rest + + int_signal: +@@ -393,7 +398,7 @@ int_signal: + movq %rsp,%rdi # &ptregs -> arg1 + xorl %esi,%esi # oldset -> arg2 + call do_notify_resume +-1: movl $_TIF_NEED_RESCHED,%edi ++1: movl $_TIF_WORK_MASK,%edi + int_restore_rest: + RESTORE_REST + DISABLE_INTERRUPTS(CLBR_NONE) +@@ -647,9 +652,8 @@ retint_signal: + RESTORE_REST + DISABLE_INTERRUPTS(CLBR_NONE) + TRACE_IRQS_OFF +- movl $_TIF_NEED_RESCHED,%edi + GET_THREAD_INFO(%rcx) +- jmp retint_check ++ jmp retint_with_reschedule + + #ifdef CONFIG_PREEMPT + /* Returning to kernel space. Check if we need preemption */ diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c -index a7835f2..44ee172 100644 +index a7835f2..652f550 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -1357,8 +1357,6 @@ const struct user_regset_view *task_user @@ -293,7 +465,7 @@ #if 0 printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n", -@@ -1481,39 +1400,64 @@ static void syscall_trace(struct pt_regs +@@ -1481,39 +1400,81 @@ static void syscall_trace(struct pt_regs } } @@ -306,15 +478,33 @@ +# define IS_IA32 0 +#endif + -+asmregparm void syscall_trace_enter(struct pt_regs *regs) ++/* ++ * We must return the syscall number to actually look up in the table. ++ * This can be -1L to skip running any syscall at all. ++ */ ++asmregparm long syscall_trace_enter(struct pt_regs *regs) { ++ long ret = 0; ++ ++ /* ++ * If we stepped into a sysenter/syscall insn, it trapped in ++ * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP. ++ * If user-mode had set TF itself, then it's still clear from ++ * do_debug() and we need to set it again to restore the user ++ * state. If we entered on the slow path, TF was already set. ++ */ ++ if (test_thread_flag(TIF_SINGLESTEP)) ++ regs->flags |= X86_EFLAGS_TF; ++ /* do the secure computing check first */ secure_computing(regs->orig_ax); - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) -+ if (test_thread_flag(TIF_SYSCALL_TRACE) || -+ unlikely(test_thread_flag(TIF_SYSCALL_EMU))) ++ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) ++ ret = -1L; ++ ++ if (ret || test_thread_flag(TIF_SYSCALL_TRACE)) syscall_trace(regs); if (unlikely(current->audit_context)) { @@ -335,16 +525,7 @@ +#endif } + -+ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) -+ /* -+ * Setting an invalid syscall number skips making the call -+ * and leaves the registers as they are now (-ENOSYS in -+ * regs->ax, or as just modified by ptrace). This also -+ * ensures that signal handling won't restart the call. -+ * TIF_SYSCALL_AUDIT will still cause us to get into -+ * syscall_trace_leave() after not making the call. -+ */ -+ regs->orig_ax = -1L; ++ return ret ?: regs->orig_ax; } -asmlinkage void syscall_trace_leave(struct pt_regs *regs) @@ -362,27 +543,82 @@ -#endif /* CONFIG_X86_32 */ + /* ++ * If TIF_SYSCALL_EMU is set, we only get here because of ++ * TIF_SINGLESTEP (i.e. this is PTRACE_SYSEMU_SINGLESTEP). ++ * We already reported this syscall instruction in ++ * syscall_trace_enter(), so don't do any more now. ++ */ ++ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) ++ return; ++ ++ /* + * If we are single-stepping, synthesize a trap to follow the + * system call instruction. + */ + if (test_thread_flag(TIF_SINGLESTEP) && -+ !test_thread_flag(TIF_SYSCALL_EMU) && + (current->ptrace & PT_PTRACED)) + send_sigtrap(current, regs, 0); +} +diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c +index d923736..295b5f5 100644 +--- a/arch/x86/kernel/signal_32.c ++++ b/arch/x86/kernel/signal_32.c +@@ -657,12 +657,6 @@ static void do_signal(struct pt_regs *re + void + do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) + { +- /* Pending single-step? */ +- if (thread_info_flags & _TIF_SINGLESTEP) { +- regs->flags |= X86_EFLAGS_TF; +- clear_thread_flag(TIF_SINGLESTEP); +- } +- + /* deal with pending signal delivery */ + if (thread_info_flags & _TIF_SIGPENDING) + do_signal(regs); +diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c +index e53b267..bf87684 100644 +--- a/arch/x86/kernel/signal_64.c ++++ b/arch/x86/kernel/signal_64.c +@@ -487,12 +487,6 @@ static void do_signal(struct pt_regs *re + void do_notify_resume(struct pt_regs *regs, void *unused, + __u32 thread_info_flags) + { +- /* Pending single-step? */ +- if (thread_info_flags & _TIF_SINGLESTEP) { +- regs->flags |= X86_EFLAGS_TF; +- clear_thread_flag(TIF_SINGLESTEP); +- } +- + #ifdef CONFIG_X86_MCE + /* notify userspace of pending MCEs */ + if (thread_info_flags & _TIF_MCE_NOTIFY) diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c -index 92c20fe..0d2cb36 100644 +index 92c20fe..e8b9863 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c -@@ -105,6 +105,7 @@ static int is_setting_trap_flag(struct t +@@ -105,6 +105,20 @@ static int is_setting_trap_flag(struct t static int enable_single_step(struct task_struct *child) { struct pt_regs *regs = task_pt_regs(child); + unsigned long oflags; ++ ++ /* ++ * If we stepped into a sysenter/syscall insn, it trapped in ++ * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP. ++ * If user-mode had set TF itself, then it's still clear from ++ * do_debug() and we need to set it again to restore the user ++ * state so we don't wrongly set TIF_FORCED_TF below. ++ * If enable_single_step() was used last and that is what ++ * set TIF_SINGLESTEP, then both TF and TIF_FORCED_TF are ++ * already set and our bookkeeping is fine. ++ */ ++ if (unlikely(test_tsk_thread_flag(child, TIF_SINGLESTEP))) ++ regs->flags |= X86_EFLAGS_TF; /* * Always set TIF_SINGLESTEP - this guarantees that -@@ -113,11 +114,7 @@ static int enable_single_step(struct tas +@@ -113,11 +127,7 @@ static int enable_single_step(struct tas */ set_tsk_thread_flag(child, TIF_SINGLESTEP); @@ -395,7 +631,7 @@ /* Set TF on the kernel stack.. */ regs->flags |= X86_EFLAGS_TF; -@@ -126,9 +123,22 @@ static int enable_single_step(struct tas +@@ -126,9 +136,22 @@ static int enable_single_step(struct tas * ..but if TF is changed by the instruction we will trace, * don't mark it as being "us" that set it, so that we * won't clear it by hand later. @@ -500,6 +736,30 @@ #endif /* __KERNEL__ */ +diff --git a/include/asm-x86/calling.h b/include/asm-x86/calling.h +index f13e62e..2bc162e 100644 +--- a/include/asm-x86/calling.h ++++ b/include/asm-x86/calling.h +@@ -104,7 +104,7 @@ + .endif + .endm + +- .macro LOAD_ARGS offset ++ .macro LOAD_ARGS offset, skiprax=0 + movq \offset(%rsp), %r11 + movq \offset+8(%rsp), %r10 + movq \offset+16(%rsp), %r9 +@@ -113,7 +113,10 @@ + movq \offset+48(%rsp), %rdx + movq \offset+56(%rsp), %rsi + movq \offset+64(%rsp), %rdi ++ .if \skiprax ++ .else + movq \offset+72(%rsp), %rax ++ .endif + .endm + + #define REST_SKIP 6*8 diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h index f224eb3..72e7b9d 100644 --- a/include/asm-x86/ptrace-abi.h @@ -519,8 +779,33 @@ #define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */ #ifndef __ASSEMBLY__ +diff --git a/include/asm-x86/thread_info_32.h b/include/asm-x86/thread_info_32.h +index b633882..3267d9c 100644 +--- a/include/asm-x86/thread_info_32.h ++++ b/include/asm-x86/thread_info_32.h +@@ -160,10 +160,19 @@ static inline struct thread_info *curren + #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) + #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) + ++/* work to do in syscall_trace_enter() */ ++#define _TIF_WORK_SYSCALL_ENTRY \ ++ (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | \ ++ _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP) ++ ++/* work to do in syscall_trace_leave() */ ++#define _TIF_WORK_SYSCALL_EXIT \ ++ (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP) ++ + /* work to do on interrupt/exception return */ + #define _TIF_WORK_MASK \ + (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ +- _TIF_SECCOMP | _TIF_SYSCALL_EMU)) ++ _TIF_SINGLESTEP | _TIF_SECCOMP | _TIF_SYSCALL_EMU)) + /* work to do on any return to u-space */ + #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) + diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h -index cb69f70..79cf6ab 100644 +index cb69f70..a531e79 100644 --- a/include/asm-x86/thread_info_64.h +++ b/include/asm-x86/thread_info_64.h @@ -107,6 +107,7 @@ static inline struct thread_info *stack_ @@ -539,6 +824,34 @@ #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) +@@ -146,15 +148,24 @@ static inline struct thread_info *stack_ + #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) + #define _TIF_NOTSC (1 << TIF_NOTSC) + ++/* work to do in syscall_trace_enter() */ ++#define _TIF_WORK_SYSCALL_ENTRY \ ++ (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | \ ++ _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP) ++ ++/* work to do in syscall_trace_leave() */ ++#define _TIF_WORK_SYSCALL_EXIT \ ++ (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP) ++ + /* work to do on interrupt/exception return */ + #define _TIF_WORK_MASK \ +- (0x0000FFFF & \ +- ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|_TIF_SECCOMP)) ++ (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ ++ _TIF_SINGLESTEP | _TIF_SECCOMP | _TIF_SYSCALL_EMU)) + /* work to do on any return to user space */ + #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) + + #define _TIF_DO_NOTIFY_MASK \ +- (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) ++ (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) + + /* flags to check in __switch_to() */ + #define _TIF_WORK_CTXSW \ diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 9927a88..93c45ac 100644 --- a/include/linux/init_task.h linux-2.6-tracehook.patch: Index: linux-2.6-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-tracehook.patch 9 Jul 2008 03:37:06 -0000 1.1 +++ linux-2.6-tracehook.patch 12 Jul 2008 00:14:30 -0000 1.2 @@ -39,7 +39,7 @@ include/asm-x86/ptrace.h | 5 + include/asm-x86/syscall.h | 213 ++++++++++++++ include/asm-x86/thread_info_32.h | 2 + - include/asm-x86/thread_info_64.h | 5 +- + include/asm-x86/thread_info_64.h | 4 +- include/linux/ptrace.h | 72 +++++ include/linux/sched.h | 10 +- include/linux/tracehook.h | 566 +++++++++++++++++++++++++++++++++++++ @@ -53,7 +53,7 @@ lib/syscall.c | 75 +++++ mm/nommu.c | 4 +- security/selinux/hooks.c | 22 +-- - 55 files changed, 1556 insertions(+), 368 deletions(-) + 55 files changed, 1555 insertions(+), 368 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 3ea332b..1955fbd 100644 @@ -631,7 +631,7 @@ } diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c -index 44ee172..96630a5 100644 +index 652f550..8a194ed 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -14,6 +14,7 @@ @@ -673,16 +673,16 @@ #ifdef CONFIG_X86_32 # define IS_IA32 1 -@@ -1415,7 +1392,7 @@ asmregparm void syscall_trace_enter(stru +@@ -1433,7 +1410,7 @@ asmregparm long syscall_trace_enter(stru + ret = -1L; - if (test_thread_flag(TIF_SYSCALL_TRACE) || - unlikely(test_thread_flag(TIF_SYSCALL_EMU))) + if (ret || test_thread_flag(TIF_SYSCALL_TRACE)) - syscall_trace(regs); + tracehook_report_syscall_entry(regs); if (unlikely(current->audit_context)) { if (IS_IA32) -@@ -1450,7 +1427,7 @@ asmregparm void syscall_trace_leave(stru +@@ -1459,7 +1436,7 @@ asmregparm void syscall_trace_leave(stru audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); if (test_thread_flag(TIF_SYSCALL_TRACE)) @@ -690,17 +690,17 @@ + tracehook_report_syscall_exit(regs, 0); /* - * If we are single-stepping, synthesize a trap to follow the -@@ -1458,6 +1435,6 @@ asmregparm void syscall_trace_leave(stru + * If TIF_SYSCALL_EMU is set, we only get here because of +@@ -1475,6 +1452,6 @@ asmregparm void syscall_trace_leave(stru + * system call instruction. */ if (test_thread_flag(TIF_SINGLESTEP) && - !test_thread_flag(TIF_SYSCALL_EMU) && - (current->ptrace & PT_PTRACED)) + tracehook_consider_fatal_signal(current, SIGTRAP, SIG_DFL)) send_sigtrap(current, regs, 0); } diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c -index d923736..83631f9 100644 +index 295b5f5..c17c0cb 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c @@ -17,6 +17,7 @@ @@ -730,7 +730,7 @@ return 0; } -@@ -667,6 +669,11 @@ do_notify_resume(struct pt_regs *regs, v +@@ -661,6 +663,11 @@ do_notify_resume(struct pt_regs *regs, v if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); @@ -743,7 +743,7 @@ hrtick_resched(); diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c -index e53b267..249c547 100644 +index bf87684..f65ece6 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -15,6 +15,7 @@ @@ -841,7 +841,7 @@ case -ERESTARTNOHAND: case -ERESTARTSYS: case -ERESTARTNOINTR: -@@ -503,6 +477,11 @@ void do_notify_resume(struct pt_regs *re +@@ -497,6 +471,11 @@ void do_notify_resume(struct pt_regs *re if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); @@ -933,7 +933,7 @@ /* error cleanup */ diff --git a/fs/exec.c b/fs/exec.c -index da94a6f..5fe37f7 100644 +index fd92343..346db53 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -43,7 +43,6 @@ @@ -1732,7 +1732,7 @@ + +#endif /* _ASM_SYSCALL_H */ diff --git a/include/asm-x86/thread_info_32.h b/include/asm-x86/thread_info_32.h -index b633882..ecaac87 100644 +index 3267d9c..975e2b1 100644 --- a/include/asm-x86/thread_info_32.h +++ b/include/asm-x86/thread_info_32.h @@ -131,6 +131,7 @@ static inline struct thread_info *curren @@ -1752,7 +1752,7 @@ #define _TIF_DEBUG (1 << TIF_DEBUG) #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h -index 79cf6ab..0a95812 100644 +index a531e79..f1281a7 100644 --- a/include/asm-x86/thread_info_64.h +++ b/include/asm-x86/thread_info_64.h @@ -103,6 +103,7 @@ static inline struct thread_info *stack_ @@ -1771,13 +1771,12 @@ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) -@@ -156,7 +158,8 @@ static inline struct thread_info *stack_ +@@ -165,7 +167,7 @@ static inline struct thread_info *stack_ #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) #define _TIF_DO_NOTIFY_MASK \ -- (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) -+ (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY| \ -+ _TIF_NOTIFY_RESUME|_TIF_HRTICK_RESCHED) +- (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) ++ (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED|_TIF_NOTIFY_RESUME) /* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \ @@ -2778,7 +2777,7 @@ /* All systems go.. */ return ret; diff --git a/kernel/sched.c b/kernel/sched.c -index 94ead43..aceaf2a 100644 +index 4e2f603..102d634 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1765,16 +1765,24 @@ migrate_task(struct task_struct *p, int linux-2.6-utrace.patch: Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- linux-2.6-utrace.patch 9 Jul 2008 03:37:06 -0000 1.79 +++ linux-2.6-utrace.patch 12 Jul 2008 00:14:30 -0000 1.80 @@ -4,14 +4,14 @@ fs/proc/array.c | 3 + include/linux/ptrace.h | 15 + include/linux/sched.h | 6 + - include/linux/tracehook.h | 64 ++ - include/linux/utrace.h | 504 +++++++++ + include/linux/tracehook.h | 59 + + include/linux/utrace.h | 501 +++++++++ init/Kconfig | 28 + kernel/Makefile | 1 + - kernel/ptrace.c | 438 ++++++++- + kernel/ptrace.c | 472 ++++++++- kernel/signal.c | 14 +- - kernel/utrace.c | 2156 +++++++++++++++++++++++++++++++++++++ - 13 files changed, 3827 insertions(+), 4 deletions(-) + kernel/utrace.c | 2210 +++++++++++++++++++++++++++++++++++++ + 13 files changed, 3907 insertions(+), 4 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 0eb0d02..49a78b7 100644 @@ -717,7 +717,7 @@ extern void force_sig_specific(int, struct task_struct *); extern int send_sig(int, struct task_struct *, int); diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h -index 88ce8af..a753172 100644 +index 88ce8af..a68801f 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h @@ -49,6 +49,7 @@ @@ -840,25 +840,20 @@ } /** -@@ -370,8 +405,17 @@ static inline void tracehook_signal_hand +@@ -370,8 +405,12 @@ static inline void tracehook_signal_hand const struct k_sigaction *ka, struct pt_regs *regs, int stepping) { -+#if 0 /* XXX */ -+ if (stepping && -+ (task_utrace_flags(current) & UTRACE_EVENT_SIGNAL_ALL) && -+ (task_utrace_flags(current) & (UTRACE_ACTION_SINGLESTEP | -+ UTRACE_ACTION_BLOCKSTEP))) -+ utrace_signal_handler_singlestep(current, regs); -+#endif -+#ifndef CONFIG_UTRACE_PTRACE /* XXX */ ++ if (task_utrace_flags(current)) ++ utrace_signal_handler(current, stepping); ++#ifndef CONFIG_UTRACE_PTRACE if (stepping) ptrace_notify(SIGTRAP); +#endif } /** -@@ -390,6 +434,8 @@ static inline int tracehook_consider_ign +@@ -390,6 +429,8 @@ static inline int tracehook_consider_ign int sig, void __user *handler) { @@ -867,7 +862,7 @@ return (task_ptrace(task) & PT_PTRACED); } -@@ -411,6 +457,9 @@ static inline int tracehook_consider_fat +@@ -411,6 +452,9 @@ static inline int tracehook_consider_fat int sig, void __user *handler) { @@ -877,7 +872,7 @@ return (task_ptrace(task) & PT_PTRACED); } -@@ -425,6 +474,8 @@ static inline int tracehook_consider_fat +@@ -425,6 +469,8 @@ static inline int tracehook_consider_fat */ static inline int tracehook_force_sigpending(void) { @@ -886,7 +881,7 @@ return 0; } -@@ -454,6 +505,8 @@ static inline int tracehook_get_signal(s +@@ -454,6 +500,8 @@ static inline int tracehook_get_signal(s siginfo_t *info, struct k_sigaction *return_ka) { @@ -895,7 +890,7 @@ return 0; } -@@ -474,6 +527,8 @@ static inline int tracehook_get_signal(s +@@ -474,6 +522,8 @@ static inline int tracehook_get_signal(s */ static inline int tracehook_notify_jctl(int notify, int why) { @@ -904,7 +899,7 @@ return notify || (current->ptrace & PT_PTRACED); } -@@ -491,6 +546,8 @@ static inline int tracehook_notify_jctl( +@@ -491,6 +541,8 @@ static inline int tracehook_notify_jctl( static inline int tracehook_notify_death(struct task_struct *task, void **death_cookie, int group_dead) { @@ -913,7 +908,7 @@ if (task->exit_signal == -1) return task->ptrace ? SIGCHLD : -1; -@@ -527,6 +584,10 @@ static inline void tracehook_report_deat +@@ -527,6 +579,10 @@ static inline void tracehook_report_deat int signal, void *death_cookie, int group_dead) { @@ -924,7 +919,7 @@ } #ifdef TIF_NOTIFY_RESUME -@@ -560,6 +621,9 @@ static inline void set_notify_resume(str +@@ -560,6 +616,9 @@ static inline void set_notify_resume(str */ static inline void tracehook_notify_resume(struct pt_regs *regs) { @@ -936,10 +931,10 @@ diff --git a/include/linux/utrace.h b/include/linux/utrace.h new file mode 100644 -index ...7867898 100644 +index ...4622ed0 100644 --- /dev/null +++ b/include/linux/utrace.h -@@ -0,0 +1,504 @@ +@@ -0,0 +1,501 @@ +/* + * utrace infrastructure interface for debugging user processes + * @@ -1072,7 +1067,7 @@ + __attribute__((weak)); +int utrace_unsafe_exec(struct task_struct *) + __attribute__((weak)); -+void utrace_signal_handler_singlestep(struct task_struct *, struct pt_regs *) ++void utrace_signal_handler(struct task_struct *, int) + __attribute__((weak)); + +#ifndef CONFIG_UTRACE @@ -1185,6 +1180,7 @@ + * @UTRACE_SIGNAL_STOP: Deliver as absolute stop. + * @UTRACE_SIGNAL_TSTP: Deliver as job control stop. + * @UTRACE_SIGNAL_REPORT: Reporting before pending signals. ++ * @UTRACE_SIGNAL_HANDLER: Report after signal handler setup. + * + * This is encoded in the @action argument and the return value for + * a @report_signal callback. It says what will happen to the @@ -1192,6 +1188,10 @@ + * + * The %UTRACE_SIGNAL_REPORT value is used in an @action argument when + * a tracing report is being made before dequeuing any pending signal. ++ * If this is immediately after a signal handler has been set up, then ++ * %UTRACE_SIGNAL_HANDLER is used instead. A @report_signal callback ++ * that uses %UTRACE_SIGNAL_DELIVER | %UTRACE_SINGLESTEP will ensure ++ * it sees a %UTRACE_SIGNAL_HANDLER report. + */ +enum utrace_signal_action { + UTRACE_SIGNAL_DELIVER = 0x00, @@ -1200,7 +1200,8 @@ + UTRACE_SIGNAL_CORE = 0x30, + UTRACE_SIGNAL_STOP = 0x40, + UTRACE_SIGNAL_TSTP = 0x50, -+ UTRACE_SIGNAL_REPORT = 0x60 ++ UTRACE_SIGNAL_REPORT = 0x60, ++ UTRACE_SIGNAL_HANDLER = 0x70 +}; +#define UTRACE_SIGNAL_MASK 0xf0 + @@ -1222,15 +1223,6 @@ +#define UTRACE_HIDE_EVENT XXX + +/* -+ * This value is passed to a report_signal() callback after a signal -+ * handler is entered while %UTRACE_ACTION_SINGLESTEP is in force. -+ * For this callback, no signal will never actually be delivered regardless -+ * of the return value, and the other callback parameters are null. -+ */ -+#define UTRACE_SIGNAL_HANDLER 0x0700 -+ -+ -+/* + * Flags for utrace_attach(). + */ +#define UTRACE_ATTACH_CREATE 0x0010 /* Attach a new engine. */ @@ -1445,7 +1437,7 @@ + +#endif /* linux/utrace.h */ diff --git a/init/Kconfig b/init/Kconfig -index 6199d11..02e80ca 100644 +index 6199d11..66fa8fe 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -911,6 +911,34 @@ config STOP_MACHINE @@ -1478,7 +1470,7 @@ + It's recommended to enable this if you are experimenting with + new modules that use utrace. But, disabling it makes sure that + using traditional ptrace() on tasks not touched by utrace will -+ not use any experimental new code that might be unreliable. ++ not use any experimental new code that might be unreliable. + source "block/Kconfig" @@ -1496,7 +1488,7 @@ obj-$(CONFIG_AUDITSYSCALL) += auditsc.o obj-$(CONFIG_AUDIT_TREE) += audit_tree.o diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index ef66127..89bea7c 100644 +index ef66127..9003b0e 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -16,6 +16,7 @@ @@ -1557,7 +1549,7 @@ /* * Check that we have indeed attached to the thing.. */ -@@ -113,6 +137,336 @@ int ptrace_check_attach(struct task_stru +@@ -113,6 +137,367 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -1761,6 +1753,21 @@ + return utrace_ptrace_report(0, task, code); +} + ++#ifndef TIF_SYSCALL_EMU ++# define ptrace_report_syscall_exit ptrace_report_syscall ++#else ++static u32 ptrace_report_syscall_exit(enum utrace_resume_action action, ++ struct utrace_attached_engine *engine, ++ struct task_struct *task, ++ struct pt_regs *regs) ++{ ++ if (test_tsk_thread_flag(task, TIF_SYSCALL_EMU)) ++ return ptrace_resume_action(task); ++ return ptrace_report_syscall(action, engine, task, regs); ++} ++#endif ++ ++ +static u32 ptrace_resumed(struct task_struct *task, struct pt_regs *regs, + siginfo_t *info, struct k_sigaction *return_ka) +{ @@ -1809,11 +1816,27 @@ + const struct k_sigaction *orig_ka, + struct k_sigaction *return_ka) +{ -+ if (info->si_signo == 0 || -+ utrace_signal_action(action) == UTRACE_SIGNAL_REPORT) ++ switch (utrace_signal_action(action)) { ++ default: ++ break; ++ case UTRACE_SIGNAL_HANDLER: ++ /* ++ * A handler was set up. If we are stepping, pretend ++ * another SIGTRAP arrived. ++ */ ++ if (ptrace_resume_action(task) == UTRACE_SINGLESTEP || ++ ptrace_resume_action(task) == UTRACE_BLOCKSTEP) { ++ memset(info, 0, sizeof *info); ++ info->si_signo = SIGTRAP; ++ info->si_code = SIGTRAP; ++ info->si_pid = task_pid_vnr(task); ++ info->si_uid = task->uid; ++ break; ++ } ++ /* Fall through. */ ++ case UTRACE_SIGNAL_REPORT: + return ptrace_resumed(task, regs, info, return_ka); -+ -+ show_regs(regs); ++ } + + task->last_siginfo = info; + return utrace_ptrace_report(UTRACE_SIGNAL_IGN, task, info->si_signo); @@ -1837,7 +1860,7 @@ + .report_exit = ptrace_report_exit, + .report_clone = ptrace_report_clone, + .report_syscall_entry = ptrace_report_syscall, -+ .report_syscall_exit = ptrace_report_syscall, ++ .report_syscall_exit = ptrace_report_syscall_exit, +}; + +/* @@ -1894,7 +1917,7 @@ int __ptrace_may_attach(struct task_struct *task) { /* May we inspect the given task? -@@ -156,6 +510,7 @@ int ptrace_attach(struct task_struct *ta +@@ -156,6 +541,7 @@ int ptrace_attach(struct task_struct *ta { int retval; unsigned long flags; @@ -1902,7 +1925,7 @@ audit_ptrace(task); -@@ -163,6 +518,13 @@ int ptrace_attach(struct task_struct *ta +@@ -163,6 +549,13 @@ int ptrace_attach(struct task_struct *ta if (same_thread_group(task, current)) goto out; @@ -1916,7 +1939,7 @@ repeat: /* * Nasty, nasty. -@@ -202,6 +564,8 @@ repeat: +@@ -202,6 +595,8 @@ repeat: bad: write_unlock_irqrestore(&tasklist_lock, flags); task_unlock(task); @@ -1925,7 +1948,7 @@ out: return retval; } -@@ -309,6 +673,8 @@ static int ptrace_setoptions(struct task +@@ -309,6 +704,8 @@ static int ptrace_setoptions(struct task if (data & PTRACE_O_TRACEEXIT) child->ptrace |= PT_TRACE_EXIT; @@ -1934,7 +1957,7 @@ return (data & ~PTRACE_O_MASK) ? -EINVAL : 0; } -@@ -367,6 +733,7 @@ static int ptrace_setsiginfo(struct task +@@ -367,6 +764,7 @@ static int ptrace_setsiginfo(struct task #define is_sysemu_singlestep(request) 0 #endif @@ -1942,7 +1965,7 @@ static int ptrace_resume(struct task_struct *child, long request, long data) { if (!valid_signal(data)) -@@ -401,6 +768,66 @@ static int ptrace_resume(struct task_str +@@ -401,6 +799,69 @@ static int ptrace_resume(struct task_str return 0; } @@ -1951,6 +1974,7 @@ +{ + struct utrace_attached_engine *engine; + enum utrace_resume_action action; ++ int sysemu = 0; + + if (!valid_signal(data)) + return -EIO; @@ -1960,7 +1984,16 @@ + if (IS_ERR(engine)) + return -ESRCH; + -+ if (request == PTRACE_SYSCALL) { ++#ifdef TIF_SYSCALL_EMU ++ sysemu = (request == PTRACE_SYSEMU || ++ request == PTRACE_SYSEMU_SINGLESTEP); ++ if (sysemu) ++ set_tsk_thread_flag(child, TIF_SYSCALL_EMU); ++ else ++ clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); ++#endif ++ ++ if (sysemu || request == PTRACE_SYSCALL) { + if (!(engine->flags & UTRACE_EVENT_SYSCALL)) + utrace_set_events(child, engine, + engine->flags | UTRACE_EVENT_SYSCALL); @@ -1969,13 +2002,6 @@ + engine->flags & ~UTRACE_EVENT_SYSCALL); + } + -+#ifdef TIF_SYSCALL_EMU -+ if (request == PTRACE_SYSEMU || request == PTRACE_SYSEMU_SINGLESTEP) -+ set_tsk_thread_flag(child, TIF_SYSCALL_EMU); -+ else -+ clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); -+#endif -+ + action = UTRACE_RESUME; + if (is_singleblock(request)) { + if (unlikely(!arch_has_block_step())) @@ -2009,7 +2035,7 @@ int ptrace_request(struct task_struct *child, long request, long addr, long data) -@@ -480,6 +907,11 @@ int ptrace_request(struct task_struct *c +@@ -480,6 +941,11 @@ int ptrace_request(struct task_struct *c int ptrace_traceme(void) { int ret = -EPERM; @@ -2021,7 +2047,7 @@ /* * Are we already being traced? -@@ -513,6 +945,8 @@ repeat: +@@ -513,6 +979,8 @@ repeat: write_unlock_irqrestore(&tasklist_lock, flags); } task_unlock(current); @@ -2085,10 +2111,10 @@ struct pt_regs *regs, void *cookie) diff --git a/kernel/utrace.c b/kernel/utrace.c new file mode 100644 -index ...8234e66 100644 +index ...f0fed73 100644 --- /dev/null +++ b/kernel/utrace.c -@@ -0,0 +1,2156 @@ +@@ -0,0 +1,2210 @@ +/* + * utrace infrastructure interface for debugging user processes + * @@ -2160,6 +2186,7 @@ + unsigned int stopped:1; + unsigned int report:1; + unsigned int interrupt:1; ++ unsigned int signal_handler:1; +}; + +static struct kmem_cache *utrace_cachep; @@ -2210,6 +2237,7 @@ + utrace->stopped = 0; + utrace->report = 0; + utrace->interrupt = 0; ++ utrace->signal_handler = 0; + INIT_LIST_HEAD(&utrace->engines); + list_add(&engine->entry, &utrace->engines); + spin_lock_init(&utrace->lock); @@ -3704,6 +3732,21 @@ + struct utrace_attached_engine *engine, *next; + + /* ++ * If this flag is still set it's because there was a signal ++ * handler setup done but no report_signal following it. Clear ++ * the flag before we get to user so it doesn't confuse us later. ++ */ ++ if (unlikely(utrace->signal_handler)) { ++ int skip; ++ spin_lock(&utrace->lock); ++ utrace->signal_handler = 0; ++ skip = !utrace->report; ++ spin_unlock(&utrace->lock); ++ if (skip) ++ return; ++ } ++ ++ /* + * If UTRACE_INTERRUPT was just used, we don't bother with a + * report here. We will report and stop in utrace_get_signal(). + */ @@ -3778,7 +3821,7 @@ + return 0; + } + -+ if (utrace->interrupt || utrace->report) { ++ if (utrace->interrupt || utrace->report || utrace->signal_handler) { + /* + * We've been asked for an explicit report before we + * even check for pending signals. @@ -3802,21 +3845,33 @@ + return -1; + } + ++ if (unlikely(!utrace->interrupt) && unlikely(!utrace->report)) ++ action = UTRACE_SIGNAL_IGN; ++ else if (utrace->signal_handler) ++ action = UTRACE_SIGNAL_HANDLER; ++ else ++ action = UTRACE_SIGNAL_REPORT; ++ + /* + * We are now making the report and it's on the + * interrupt path, so clear the flags asking for those. + */ -+ utrace->interrupt = utrace->report = 0; ++ utrace->interrupt = utrace->report = utrace->signal_handler = 0; + + spin_unlock(&utrace->lock); + ++ if (unlikely(action == UTRACE_SIGNAL_IGN)) ++ /* ++ * We only got here to clear utrace->signal_handler. ++ */ ++ return -1; ++ + /* + * Do a reporting pass for no signal, just for EVENT(QUIESCE). + * The engine callbacks can fill in *info and *return_ka. + * We'll pass NULL for the @orig_ka argument to indicate + * that there was no original signal. + */ -+ action = UTRACE_SIGNAL_REPORT; + event = 0; + ka = NULL; + memset(return_ka, 0, sizeof *return_ka); @@ -3998,6 +4053,7 @@ + spin_lock(&utrace->lock); + utrace->interrupt = 1; + spin_unlock(&utrace->lock); ++ set_tsk_thread_flag(task, TIF_SIGPENDING); + } + + spin_lock_irq(&task->sighand->siglock); @@ -4077,6 +4133,30 @@ + + return signr; +} ++ ++/* ++ * This gets called after a signal handler has been set up. ++ * We set a flag so the next report knows it happened. ++ * If we're already stepping, make sure we do a report_signal. ++ * If not, make sure we get into utrace_resume() where we can ++ * clear the signal_handler flag before resuming. ++ */ ++void utrace_signal_handler(struct task_struct *task, int stepping) ++{ ++ struct utrace *utrace = task->utrace; ++ ++ spin_lock(&utrace->lock); ++ ++ utrace->signal_handler = 1; ++ if (stepping) { ++ utrace->interrupt = 1; ++ set_tsk_thread_flag(task, TIF_SIGPENDING); ++ } else { ++ set_notify_resume(task); ++ } ++ ++ spin_unlock(&utrace->lock); ++} + +/** + * utrace_prepare_examine - prepare to examine thread state From fedora-extras-commits at redhat.com Sat Jul 12 00:53:21 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?= (tibbs)) Date: Sat, 12 Jul 2008 00:53:21 GMT Subject: rpms/zoneminder/devel zoneminder.spec,1.11,1.12 Message-ID: <200807120053.m6C0rLC0025782@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/zoneminder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25742 Modified Files: zoneminder.spec Log Message: * Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 - Initial attempt at packaging 1.23. Index: zoneminder.spec =================================================================== RCS file: /cvs/extras/rpms/zoneminder/devel/zoneminder.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- zoneminder.spec 1 Jul 2008 22:44:47 -0000 1.11 +++ zoneminder.spec 12 Jul 2008 00:52:33 -0000 1.12 @@ -4,33 +4,36 @@ %define zmgid_final apache Name: zoneminder -Version: 1.22.3 -Release: 15%{?dist} +Version: 1.23.3 +Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons -License: GPLv2+ +# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ +# Mootools is inder the MIT license: http://mootools.net/ +License: GPLv2+ and LGPLv2+ and MIT URL: http://www.zoneminder.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source: http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz +Source: http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz Source1: http://www.charliemouse.com/code/cambozola/cambozola-0.68.tar.gz Source2: zoneminder.conf Source3: redalert.wav Source4: README.Fedora -Patch1: zoneminder-1.22.3-dbinstall.patch +Source5: http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip +Source6: http://mootools.net/downloads/mootools-1.2-core-yc.js +Patch1: zoneminder-1.23.3-dbinstall.patch Patch2: zoneminder-1.22.3-runlevel.patch Patch10: zoneminder-1.22.3-installfix.patch -Patch11: zoneminder-1.22.3-gcc43.patch -Patch12: zoneminder-1.22.3-security.patch Conflicts: zm <= 1.22.3 -BuildRequires: automake +BuildRequires: automake gnutls-devel BuildRequires: mysql-devel pcre-devel libjpeg-devel BuildRequires: perl(Archive::Tar) perl(Archive::Zip) BuildRequires: perl(Date::Manip) perl(DBD::mysql) BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) BuildRequires: perl(MIME::Entity) perl(MIME::Lite) +BuildRequires: perl(PHP::Serialization) Requires: httpd php php-mysql Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) @@ -52,11 +55,18 @@ %prep %setup -q -n ZoneMinder-%{version} + +# Unpack jscalendar and move some files around +%setup -q -D -T -a 5 -n ZoneMinder-%{version} +mkdir jscalendar-doc +pushd jscalendar-1.0 +mv *html *php doc/* README ../jscalendar-doc +rmdir doc +popd + %patch1 -p0 -b .dbinstall %patch2 -p0 -b .runlevel %patch10 -p0 -b .installfix -%patch11 -p0 -b .gcc43 -%patch12 -p1 -b .security gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar cp %{SOURCE4} README.Fedora @@ -111,6 +121,15 @@ install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zoneminder.conf install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/sounds/redalert.wav +# Install jscalendar - this really should be in its own package +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar +cp -rp jscalendar-1.0/* $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar + +# Install mootools +pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/www +install -m 644 %{SOURCE6} mootools-1.2-core-yc.js +ln -s mootools-1.2-core-yc.js mootools.js +popd %clean rm -rf $RPM_BUILD_ROOT @@ -135,7 +154,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README README.html README.pdf README.Fedora +%doc AUTHORS COPYING README README.Fedora jscalendar-doc %config(noreplace) %attr(600,%{zmuid_final},%{zmgid_final}) %{_sysconfdir}/zm.conf %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf %attr(755,root,root) %{_initrddir}/zoneminder @@ -143,7 +162,7 @@ %{_bindir}/zma %{_bindir}/zmaudit.pl %{_bindir}/zmc -%{_bindir}/zmcontrol-*.pl +%{_bindir}/zmcontrol.pl %{_bindir}/zmdc.pl %{_bindir}/zmf %{_bindir}/zmfilter.pl @@ -172,6 +191,9 @@ %changelog +* Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 +- Initial attempt at packaging 1.23. + * Tue Jul 1 2008 Martin Ebourne - 1.22.3-15 - Add perl module compat dependency, bz #453590 From fedora-extras-commits at redhat.com Sat Jul 12 00:54:58 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Sat, 12 Jul 2008 00:54:58 GMT Subject: rpms/gyachi/devel gyachi.spec,1.10,1.11 Message-ID: <200807120054.m6C0swvw025896@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25786 Modified Files: gyachi.spec Log Message: fixs for the photoshare obsoletion. Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gyachi.spec 8 Jul 2008 12:52:56 -0000 1.10 +++ gyachi.spec 12 Jul 2008 00:54:08 -0000 1.11 @@ -17,7 +17,7 @@ Name: gyachi Version: 1.1.35 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A Yahoo! chat client with Webcam and voice support Group: Applications/Internet @@ -56,6 +56,7 @@ %endif Requires: ImageMagick +Obsoletes: gyachi-plugin-photosharing %description GYachI is a Linux client for Yahoo! Messenger protocol, @@ -112,7 +113,6 @@ Summary: Photo album plugin for GyachI Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Obsoletes: plugin-photosharing %description plugin-photo_album Photo album plugin for GyachI @@ -286,6 +286,9 @@ %changelog +* Sat Jul 12 2008 Gregory D Hosler - 1.1.35-16 +- gyachi obsoletes gyachi-plugin-photosharing + * Tue Jul 8 2008 Gregory D Hosler - 1.1.35-15 - plugin-photo_album obsoletes plugin-photosharing From fedora-extras-commits at redhat.com Sat Jul 12 01:03:38 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Sat, 12 Jul 2008 01:03:38 GMT Subject: rpms/gyachi/F-9 gyachi.spec,1.4,1.5 Message-ID: <200807120103.m6C13c0o000594@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv498 Modified Files: gyachi.spec Log Message: fixes for obsoleting the photoshare plugin. Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-9/gyachi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gyachi.spec 8 Jul 2008 12:59:14 -0000 1.4 +++ gyachi.spec 12 Jul 2008 01:02:40 -0000 1.5 @@ -17,7 +17,7 @@ Name: gyachi Version: 1.1.35 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A Yahoo! chat client with Webcam and voice support Group: Applications/Internet @@ -56,6 +56,7 @@ %endif Requires: ImageMagick +Obsoletes: gyachi-plugin-photosharing %description GYachI is a Linux client for Yahoo! Messenger protocol, @@ -112,7 +113,6 @@ Summary: Photo album plugin for GyachI Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Obsoletes: plugin-photosharing %description plugin-photo_album Photo album plugin for GyachI @@ -286,6 +286,9 @@ %changelog +* Sat Jul 12 2008 Gregory D Hosler - 1.1.35-16 +- gyachi obsoletes gyachi-plugin-photosharing + * Tue Jul 8 2008 Gregory D Hosler - 1.1.35-15 - plugin-photo_album obsoletes plugin-photosharing From fedora-extras-commits at redhat.com Sat Jul 12 01:11:03 2008 From: fedora-extras-commits at redhat.com (Gregory D Hosler (ghosler)) Date: Sat, 12 Jul 2008 01:11:03 GMT Subject: rpms/gyachi/F-8 gyachi.spec,1.4,1.5 Message-ID: <200807120111.m6C1B33U001346@cvs-int.fedora.redhat.com> Author: ghosler Update of /cvs/pkgs/rpms/gyachi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1284 Modified Files: gyachi.spec Log Message: fixed for gyachi obsoleting the photoshare plugin Index: gyachi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gyachi/F-8/gyachi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gyachi.spec 8 Jul 2008 13:02:11 -0000 1.4 +++ gyachi.spec 12 Jul 2008 01:10:13 -0000 1.5 @@ -17,7 +17,7 @@ Name: gyachi Version: 1.1.35 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A Yahoo! chat client with Webcam and voice support Group: Applications/Internet @@ -56,6 +56,7 @@ %endif Requires: ImageMagick +Obsoletes: gyachi-plugin-photosharing %description GYachI is a Linux client for Yahoo! Messenger protocol, @@ -112,7 +113,6 @@ Summary: Photo album plugin for GyachI Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Obsoletes: plugin-photosharing %description plugin-photo_album Photo album plugin for GyachI @@ -286,6 +286,9 @@ %changelog +* Sat Jul 12 2008 Gregory D Hosler - 1.1.35-16 +- gyachi obsoletes gyachi-plugin-photosharing + * Tue Jul 8 2008 Gregory D Hosler - 1.1.35-15 - plugin-photo_album obsoletes plugin-photosharing From fedora-extras-commits at redhat.com Sat Jul 12 01:24:11 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 12 Jul 2008 01:24:11 GMT Subject: rpms/kdeplasmoids/devel kdeplasmoids.spec,1.6,1.7 Message-ID: <200807120124.m6C1OBUw002941@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasmoids/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2800 Modified Files: kdeplasmoids.spec Log Message: fix Version/Release Index: kdeplasmoids.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/kdeplasmoids.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kdeplasmoids.spec 11 Jul 2008 15:28:00 -0000 1.6 +++ kdeplasmoids.spec 12 Jul 2008 01:23:25 -0000 1.7 @@ -1,7 +1,7 @@ Name: kdeplasmoids -Version: 4.0.85 -Release: 2%{?dist} +Version: 4.0.98 +Release: 1%{?dist} Summary: Additional plasmoids for KDE Group: User Interface/Desktops From fedora-extras-commits at redhat.com Sat Jul 12 01:26:43 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?= (tibbs)) Date: Sat, 12 Jul 2008 01:26:43 GMT Subject: rpms/zoneminder/devel zoneminder-1.23.3-dbinstall.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zoneminder-1.22.3-dbinstall.patch, 1.2, NONE zoneminder-1.22.3-gcc43.patch, 1.1, NONE zoneminder-1.22.3-security.patch, 1.1, NONE Message-ID: <200807120126.m6C1Qh7I003519@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/zoneminder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3372 Modified Files: .cvsignore sources Added Files: zoneminder-1.23.3-dbinstall.patch Removed Files: zoneminder-1.22.3-dbinstall.patch zoneminder-1.22.3-gcc43.patch zoneminder-1.22.3-security.patch Log Message: * Fri Jul 11 2008 Jason L Tibbitts III - 1.23.3-1 - Initial attempt at packaging 1.23. zoneminder-1.23.3-dbinstall.patch: --- NEW FILE zoneminder-1.23.3-dbinstall.patch --- --- db/Makefile.am.orig 2006-12-27 23:50:07.000000000 +0000 +++ db/Makefile.am 2006-12-27 23:50:21.000000000 +0000 @@ -1,7 +1,16 @@ AUTOMAKE_OPTIONS = gnu +zmdbdatadir = $(pkgdatadir)/db + EXTRA_DIST = \ zm_create.sql.in \ + $(dbupgrade_scripts) + +dist_zmdbdata_DATA = \ + zm_create.sql \ + $(dbupgrade_scripts) + +dbupgrade_scripts = \ zm_update-0.0.1.sql \ zm_update-0.9.7.sql \ zm_update-0.9.8.sql \ --- scripts/zmupdate.pl.orig 2006-12-27 23:59:20.000000000 +0000 +++ scripts/zmupdate.pl 2006-12-27 23:59:35.000000000 +0000 @@ -320,7 +320,7 @@ $command .= " -p".$db_pass; } } - $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql"; + $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql"; print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 ); my $output = qx($command); --- configure.in.orig 2006-12-27 23:55:41.000000000 +0000 +++ configure.in 2006-12-27 23:59:07.000000000 +0000 @@ -1,10 +1,8 @@ -AC_INIT(zm,1.23.3,support at zoneminder.com,ZoneMinder) +AC_INIT(zm,1.23.3,support at zoneminder.com,zoneminder) AC_CONFIG_SRCDIR(src/zm.h) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) -PATH_BUILD=`pwd` -AC_SUBST(PATH_BUILD) TIME_BUILD=`date +'%s'` AC_SUBST(TIME_BUILD) @@ -216,8 +214,10 @@ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory]) AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory]) +AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory]) +AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE") AC_SUBST(RUNDIR,"/var/run") -AC_SUBST(ZM_RUNDIR,"$RUNDIR/zm") +AC_SUBST(ZM_RUNDIR,"$RUNDIR/$PACKAGE") AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid") AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory]) AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf") --- zm.conf.in.orig 2006-12-27 23:53:38.000000000 +0000 +++ zm.conf.in 2006-12-27 23:59:11.000000000 +0000 @@ -12,8 +12,8 @@ # Current version of ZoneMinder ZM_VERSION=@VERSION@ -# Path to build directory, used mostly for finding DB upgrade scripts -ZM_PATH_BUILD=@PATH_BUILD@ +# Path to installed data directory, used mostly for finding DB upgrade scripts +ZM_PATH_DATA=@PKGDATADIR@ # Build time, used to record when to trigger various checks ZM_TIME_BUILD=@TIME_BUILD@ --- scripts/zm.in.dbinstall 2007-04-03 00:41:48.000000000 +0100 +++ scripts/zm.in 2007-04-03 00:42:46.000000000 +0100 @@ -6,10 +6,10 @@ # Source function library. . /etc/rc.d/init.d/functions -prog=ZoneMinder +prog="@PACKAGE@" ZM_CONFIG="@ZM_CONFIG@" pidfile="@ZM_RUNDIR@" -LOCKFILE=/var/lock/subsys/zm +LOCKFILE=/var/lock/subsys/$prog loadconf() { @@ -27,9 +27,8 @@ start() { zmupdate || return $? - loadconf || return $? #Make sure the directory for our PID folder exists or create one. - [ ! -d /var/run/zm ] \ + [ ! -d $pidfile ] \ && mkdir -m 774 $pidfile \ && chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile #Make sure the folder for the socks file exists or create one @@ -49,7 +48,6 @@ stop() { - loadconf echo -n $"Stopping $prog: " $command stop RETVAL=$? @@ -60,22 +58,21 @@ zmstatus() { - loadconf result=`$command status` if [ "$result" = "running" ]; then - echo "ZoneMinder is running" + echo "$prog is running" $ZM_PATH_BIN/zmu -l RETVAL=0 else - echo "ZoneMinder is stopped" + echo "$prog is stopped" RETVAL=1 fi } zmupdate() { - if [ -x $ZM_PATH_BIN/zm_update ]; then - $ZM_PATH_BIN/zm_update noi + if [ -x $ZM_PATH_BIN/zmupdate.pl ]; then + $ZM_PATH_BIN/zmupdate.pl --freshen >/dev/null fi } @@ -92,7 +89,6 @@ start ;; 'condrestart') - loadconf result=`$ZM_PATH_BIN/zmdc.pl check` if [ "$result" = "running" ]; then $ZM_PATH_BIN/zmdc.pl shutdown > /dev/null Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zoneminder/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2007 23:34:42 -0000 1.2 +++ .cvsignore 12 Jul 2008 01:25:50 -0000 1.3 @@ -1,2 +1,4 @@ -ZoneMinder-1.22.3.tar.gz +mootools-1.2-core-yc.js +jscalendar-1.0.zip +ZoneMinder-1.23.3.tar.gz cambozola-0.68.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zoneminder/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2007 23:34:42 -0000 1.2 +++ sources 12 Jul 2008 01:25:50 -0000 1.3 @@ -1,2 +1,4 @@ -cfc9aa9c2cd750c825b9dfa5f96918af ZoneMinder-1.22.3.tar.gz +741c1ef4d6602c12a54d8a1b629988c8 mootools-1.2-core-yc.js +10f2160fe68294013efcd1473cd36f72 jscalendar-1.0.zip +ee803f0f71d6e67adf602c3557fb6bc9 ZoneMinder-1.23.3.tar.gz e4fac8b6ee94c9075b14bb95be4f860b cambozola-0.68.tar.gz --- zoneminder-1.22.3-dbinstall.patch DELETED --- --- zoneminder-1.22.3-gcc43.patch DELETED --- --- zoneminder-1.22.3-security.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 01:32:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 12 Jul 2008 01:32:31 GMT Subject: rpms/qt/devel .cvsignore, 1.33, 1.34 qt.spec, 1.192, 1.193 sources, 1.34, 1.35 Message-ID: <200807120132.m6C1WVAO004396@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4276 Modified Files: .cvsignore qt.spec sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.4.0-12 - qt-copy-patches-20080711 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 6 Jun 2008 15:59:50 -0000 1.33 +++ .cvsignore 12 Jul 2008 01:31:46 -0000 1.34 @@ -1,4 +1,4 @@ hi128-app-qt4-logo.png hi48-app-qt4-logo.png qt-x11-opensource-src-4.4.0.tar.bz2 -qt-copy-patches-20080606svn.tar.bz2 +qt-copy-patches-20080711svn.tar.bz2 Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- qt.spec 23 Jun 2008 13:20:38 -0000 1.192 +++ qt.spec 12 Jul 2008 01:31:46 -0000 1.193 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 11%{?dist} +Release: 12%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -39,7 +39,7 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch ## qt-copy patches -%define qt_copy 20080606 +%define qt_copy 20080711 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -773,6 +773,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.4.0-12 +- qt-copy-patches-20080711 + * Mon Jun 23 2008 Rex Dieter 4.4.0-11 - fix dbus conditional (#452487) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 6 Jun 2008 15:59:50 -0000 1.34 +++ sources 12 Jul 2008 01:31:46 -0000 1.35 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png 03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2 -52db560d374516c0fc3c97b2049bda2b qt-copy-patches-20080606svn.tar.bz2 +7cf6bdbd220fb8915f8d875442e29961 qt-copy-patches-20080711svn.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 12 02:32:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 12 Jul 2008 02:32:11 +0000 Subject: [pkgdb] perl-Frontier-RPC (Fedora EPEL, 4) updated by kevin Message-ID: <200807120232.m6C2WBcv031471@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Frontier-RPC Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Frontier-RPC (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Frontier-RPC (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Frontier-RPC (Fedora EPEL 4) Kevin Fenzi (kevin) changed owner of perl-Frontier-RPC in Fedora EPEL 4 to stahnma Kevin Fenzi (kevin) approved watchbugzilla on perl-Frontier-RPC (Fedora EPEL 4) for kasal Kevin Fenzi (kevin) approved watchcommits on perl-Frontier-RPC (Fedora EPEL 4) for kasal Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Frontier-RPC (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Frontier-RPC From fedora-extras-commits at redhat.com Sat Jul 12 02:32:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 12 Jul 2008 02:32:11 +0000 Subject: [pkgdb] perl-Frontier-RPC (Fedora EPEL, 5) updated by kevin Message-ID: <200807120232.m6C2WBd0031471@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Frontier-RPC Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Frontier-RPC (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Frontier-RPC (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Frontier-RPC (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Frontier-RPC in Fedora EPEL 5 to stahnma Kevin Fenzi (kevin) approved watchbugzilla on perl-Frontier-RPC (Fedora EPEL 5) for kasal Kevin Fenzi (kevin) approved watchcommits on perl-Frontier-RPC (Fedora EPEL 5) for kasal Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Frontier-RPC (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Frontier-RPC From fedora-extras-commits at redhat.com Sat Jul 12 02:59:09 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 12 Jul 2008 02:59:09 GMT Subject: rpms/kdebase/devel kdebase.spec,1.334,1.335 Message-ID: <200807120259.m6C2x9pb019577@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19525 Modified Files: kdebase.spec Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-2 - BR: pciutils-devel Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- kdebase.spec 11 Jul 2008 03:58:30 -0000 1.334 +++ kdebase.spec 12 Jul 2008 02:58:20 -0000 1.335 @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.0.98 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -73,6 +73,7 @@ %endif BuildRequires: OpenEXR-devel BuildRequires: openssl-devel +BuildRequires: pciutils-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: qimageblitz-devel @@ -301,6 +302,9 @@ %changelog +* Fri Jul 11 2008 Rex Dieter 4.0.98-2 +- BR: pciutils-devel + * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 From fedora-extras-commits at redhat.com Sat Jul 12 03:05:49 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Sat, 12 Jul 2008 03:05:49 GMT Subject: rpms/perl-Frontier-RPC/EL-4 perl-Frontier-RPC.spec,1.13,1.14 Message-ID: <200807120305.m6C35nR9026823@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/perl-Frontier-RPC/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26689 Modified Files: perl-Frontier-RPC.spec Log Message: Updating for EPEL4 Index: perl-Frontier-RPC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Frontier-RPC/EL-4/perl-Frontier-RPC.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Frontier-RPC.spec 7 Mar 2008 02:01:33 -0000 1.13 +++ perl-Frontier-RPC.spec 12 Jul 2008 03:04:55 -0000 1.14 @@ -1,7 +1,7 @@ Summary: A Perl interface for making and serving XML-RPC calls Name: perl-Frontier-RPC Version: 0.07b4 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: GPL+ or Artistic @@ -59,8 +59,11 @@ %changelog +* Fri Jul 11 2008 Michael Stahnke - 0.07b4-5 +- Rebuild for EPEL 4 + * Thu Mar 06 2008 Tom "spot" Callaway - 0.07b4-4 -Rebuild for new perl +- Rebuild for new perl * Fri Oct 26 2007 Robin Norwood - 0.07b4-3 - Various fixes from package review: From fedora-extras-commits at redhat.com Sat Jul 12 03:09:13 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Sat, 12 Jul 2008 03:09:13 GMT Subject: rpms/perl-Frontier-RPC/EL-5 perl-Frontier-RPC.spec,1.13,1.14 Message-ID: <200807120309.m6C39DMu027239@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/perl-Frontier-RPC/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27095 Modified Files: perl-Frontier-RPC.spec Log Message: Updating spec for EPEL Index: perl-Frontier-RPC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Frontier-RPC/EL-5/perl-Frontier-RPC.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Frontier-RPC.spec 7 Mar 2008 02:01:33 -0000 1.13 +++ perl-Frontier-RPC.spec 12 Jul 2008 03:08:13 -0000 1.14 @@ -1,7 +1,7 @@ Summary: A Perl interface for making and serving XML-RPC calls Name: perl-Frontier-RPC Version: 0.07b4 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: GPL+ or Artistic @@ -59,8 +59,11 @@ %changelog +* Fri Jul 11 2008 Michael Stahnke - 0.07b4-4 +- Rebuild for EPEL + * Thu Mar 06 2008 Tom "spot" Callaway - 0.07b4-4 -Rebuild for new perl +- Rebuild for new perl * Fri Oct 26 2007 Robin Norwood - 0.07b4-3 - Various fixes from package review: From fedora-extras-commits at redhat.com Sat Jul 12 03:44:13 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sat, 12 Jul 2008 03:44:13 GMT Subject: rpms/gdm/devel gdm.spec,1.396,1.397 Message-ID: <200807120344.m6C3iDUA029652@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29457 Modified Files: gdm.spec Log Message: apply patch Index: gdm.spec =================================================================== RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v retrieving revision 1.396 retrieving revision 1.397 diff -u -r1.396 -r1.397 --- gdm.spec 10 Jul 2008 17:13:02 -0000 1.396 +++ gdm.spec 12 Jul 2008 03:43:17 -0000 1.397 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.22.0 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -120,6 +120,7 @@ %patch4 -p1 -b .enable-tcp %patch9 -p1 -b .null-fs %patch10 -p1 -b .lang-tag +%patch11 -p1 -b .icon-names %patch99 -p1 -b .fedora-logo autoreconf @@ -319,6 +320,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Fri Jul 11 2008 Matthias Clasen - 1:2.22.0-12 +- Actually apply the patch + * Thu Jul 10 2008 Matthias Clasen - 1:2.22.0-11 - Fix some broken icons on the login screen From fedora-extras-commits at redhat.com Sat Jul 12 03:53:50 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sat, 12 Jul 2008 03:53:50 GMT Subject: rpms/NetworkManager/devel NetworkManager.spec,1.227,1.228 Message-ID: <200807120353.m6C3roL3030848@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30673 Modified Files: NetworkManager.spec Log Message: drop explicit hal dep in -gnome Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- NetworkManager.spec 2 Jul 2008 21:49:08 -0000 1.227 +++ NetworkManager.spec 12 Jul 2008 03:52:44 -0000 1.228 @@ -16,7 +16,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0 -Release: 0.10.%{snapshot}%{?dist} +Release: 0.10.%{snapshot}%{?dist}.1 Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -96,7 +96,6 @@ Requires: gnome-panel Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} -Requires: hal >= %{hal_version} Requires: libnotify >= 0.4.3 PreReq: gtk2 >= %{gtk2_version} Requires: gnome-keyring @@ -292,6 +291,9 @@ %{_libdir}/libnm-util.so %changelog +* Fri Jul 11 2008 Matthias Clasen - 1:0.7.0-0.10.svn3801 +- Drop explicit hal dep in -gnome + * Wed Jul 02 2008 Dan Williams - 1:0.7.0-0.10.svn3801 - Move VPN configuration into connection editor - Fix mobile broadband username/password issues From fedora-extras-commits at redhat.com Sat Jul 12 05:58:39 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?= (tibbs)) Date: Sat, 12 Jul 2008 05:58:39 GMT Subject: rpms/perl-PHP-Serialization/F-9 perl-PHP-Serialization.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807120558.m6C5wdoc020210@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/perl-PHP-Serialization/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20171 Modified Files: sources Added Files: perl-PHP-Serialization.spec Log Message: Initial import into F9. --- NEW FILE perl-PHP-Serialization.spec --- Name: perl-PHP-Serialization Version: 0.27 Release: 1%{?dist} Summary: Converts between PHP's serialize() output and the equivalent Perl structure License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/PHP-Serialization/ Source0: http://www.cpan.org/authors/id/J/JB/JBROWN/php-serialization/PHP-Serialization-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Provides a simple, quick means of serializing perl memory structures (including object data!) into a format that PHP can deserialize() and access, and vice versa. %prep %setup -q -n PHP-Serialization-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Feb 05 2008 Jason Tibbitts 0.27-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PHP-Serialization/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2008 19:36:57 -0000 1.1 +++ sources 12 Jul 2008 05:57:44 -0000 1.2 @@ -0,0 +1 @@ +2fb3f63071c5c2119b4eebe39b329684 PHP-Serialization-0.27.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 06:05:00 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 06:05:00 GMT Subject: rpms/fuse/devel import.log, NONE, 1.1 fuse-chkconfig_support.diff, 1.1, 1.2 fuse.spec, 1.32, 1.33 Message-ID: <200807120605.m6C6508l027030@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26991/devel Modified Files: fuse-chkconfig_support.diff fuse.spec Added Files: import.log Log Message: Fixed initscripts (BZ#441284) --- NEW FILE import.log --- fuse-2_7_3-3_fc9:HEAD:fuse-2.7.3-3.fc9.src.rpm:1215842579 fuse-chkconfig_support.diff: Index: fuse-chkconfig_support.diff =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse-chkconfig_support.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fuse-chkconfig_support.diff 20 Feb 2008 21:38:16 -0000 1.1 +++ fuse-chkconfig_support.diff 12 Jul 2008 06:04:30 -0000 1.2 @@ -1,21 +1,21 @@ ---- util/init_script.patch2 2008-02-19 22:51:28.000000000 +0300 -+++ util/init_script 2008-02-21 00:12:51.000000000 +0300 -@@ -1,11 +1,16 @@ +--- util/init_script 2008-02-19 22:51:28.000000000 +0300 ++++ util/init_script 2008-07-12 09:49:00.000000000 +0400 +@@ -1,10 +1,15 @@ #! /bin/sh + -+# Startup script for fuse ++# Startup script for fuse +# -+# chkconfig: 345 25 75 ++# chkconfig: - 25 75 + ### BEGIN INIT INFO # Provides: fuse - # Required-Start: +-# Required-Start: ++# Required-Start: # Should-Start: udev - # Required-Stop: +-# Required-Stop: -# Default-Start: S --# Default-Stop: -+# Default-Start: 3 4 5 -+# Default-Stop: 0 1 2 6 ++# Required-Stop: ++# Default-Start: + # Default-Stop: # Short-Description: Start and stop fuse. # Description: Load the fuse module and mount the fuse control - # filesystem. Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fuse.spec 28 Feb 2008 10:50:59 -0000 1.32 +++ fuse.spec 12 Jul 2008 06:04:30 -0000 1.33 @@ -1,6 +1,6 @@ Name: fuse Version: 2.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -25,8 +25,8 @@ Requires(postun):/sbin/service %description -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE userspace tools to +With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains the FUSE userspace tools to mount a FUSE filesystem. %package libs @@ -35,20 +35,20 @@ License: LGPLv2+ %description libs -Devel With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE libraries. +Devel With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains the FUSE libraries. %package devel Summary: File System in Userspace (FUSE) devel files Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: pkgconfig +Requires: pkgconfig License: LGPLv2+ %description devel -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains development files (headers, +With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains development files (headers, pgk-config) to develop FUSE based applications/filesystems. @@ -144,6 +144,9 @@ %{_includedir}/fuse %changelog +* Sat Jul 12 2008 Peter Lemenkov 2.7.3-3 +- Fixed initscripts (BZ#441284) + * Thu Feb 28 2008 Peter Lemenkov 2.7.3-2 - Fixed BZ#434881 From fedora-extras-commits at redhat.com Sat Jul 12 06:07:31 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 06:07:31 GMT Subject: rpms/fuse/F-9 import.log, NONE, 1.1 fuse-chkconfig_support.diff, 1.1, 1.2 fuse.spec, 1.32, 1.33 Message-ID: <200807120607.m6C67VEB027161@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27109/F-9 Modified Files: fuse-chkconfig_support.diff fuse.spec Added Files: import.log Log Message: Fixed initscripts (BZ#441284) --- NEW FILE import.log --- fuse-2_7_3-3_fc9:F-9:fuse-2.7.3-3.fc9.src.rpm:1215842753 fuse-chkconfig_support.diff: Index: fuse-chkconfig_support.diff =================================================================== RCS file: /cvs/extras/rpms/fuse/F-9/fuse-chkconfig_support.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fuse-chkconfig_support.diff 20 Feb 2008 21:38:16 -0000 1.1 +++ fuse-chkconfig_support.diff 12 Jul 2008 06:06:26 -0000 1.2 @@ -1,21 +1,21 @@ ---- util/init_script.patch2 2008-02-19 22:51:28.000000000 +0300 -+++ util/init_script 2008-02-21 00:12:51.000000000 +0300 -@@ -1,11 +1,16 @@ +--- util/init_script 2008-02-19 22:51:28.000000000 +0300 ++++ util/init_script 2008-07-12 09:49:00.000000000 +0400 +@@ -1,10 +1,15 @@ #! /bin/sh + -+# Startup script for fuse ++# Startup script for fuse +# -+# chkconfig: 345 25 75 ++# chkconfig: - 25 75 + ### BEGIN INIT INFO # Provides: fuse - # Required-Start: +-# Required-Start: ++# Required-Start: # Should-Start: udev - # Required-Stop: +-# Required-Stop: -# Default-Start: S --# Default-Stop: -+# Default-Start: 3 4 5 -+# Default-Stop: 0 1 2 6 ++# Required-Stop: ++# Default-Start: + # Default-Stop: # Short-Description: Start and stop fuse. # Description: Load the fuse module and mount the fuse control - # filesystem. Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/F-9/fuse.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fuse.spec 28 Feb 2008 10:50:59 -0000 1.32 +++ fuse.spec 12 Jul 2008 06:06:26 -0000 1.33 @@ -1,6 +1,6 @@ Name: fuse Version: 2.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -25,8 +25,8 @@ Requires(postun):/sbin/service %description -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE userspace tools to +With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains the FUSE userspace tools to mount a FUSE filesystem. %package libs @@ -35,20 +35,20 @@ License: LGPLv2+ %description libs -Devel With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE libraries. +Devel With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains the FUSE libraries. %package devel Summary: File System in Userspace (FUSE) devel files Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: pkgconfig +Requires: pkgconfig License: LGPLv2+ %description devel -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains development files (headers, +With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains development files (headers, pgk-config) to develop FUSE based applications/filesystems. @@ -144,6 +144,9 @@ %{_includedir}/fuse %changelog +* Sat Jul 12 2008 Peter Lemenkov 2.7.3-3 +- Fixed initscripts (BZ#441284) + * Thu Feb 28 2008 Peter Lemenkov 2.7.3-2 - Fixed BZ#434881 From fedora-extras-commits at redhat.com Sat Jul 12 06:17:01 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 06:17:01 GMT Subject: rpms/fuse/F-8 import.log, NONE, 1.1 fuse-chkconfig_support.diff, 1.1, 1.2 fuse.spec, 1.30, 1.31 Message-ID: <200807120617.m6C6H1qU027455@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27385/F-8 Modified Files: fuse-chkconfig_support.diff fuse.spec Added Files: import.log Log Message: Fixed initscripts (BZ#441284) --- NEW FILE import.log --- fuse-2_7_3-3_fc9:F-8:fuse-2.7.3-3.fc9.src.rpm:1215843325 fuse-chkconfig_support.diff: Index: fuse-chkconfig_support.diff =================================================================== RCS file: /cvs/extras/rpms/fuse/F-8/fuse-chkconfig_support.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fuse-chkconfig_support.diff 20 Feb 2008 21:41:14 -0000 1.1 +++ fuse-chkconfig_support.diff 12 Jul 2008 06:16:00 -0000 1.2 @@ -1,21 +1,21 @@ ---- util/init_script.patch2 2008-02-19 22:51:28.000000000 +0300 -+++ util/init_script 2008-02-21 00:12:51.000000000 +0300 -@@ -1,11 +1,16 @@ +--- util/init_script 2008-02-19 22:51:28.000000000 +0300 ++++ util/init_script 2008-07-12 09:49:00.000000000 +0400 +@@ -1,10 +1,15 @@ #! /bin/sh + -+# Startup script for fuse ++# Startup script for fuse +# -+# chkconfig: 345 25 75 ++# chkconfig: - 25 75 + ### BEGIN INIT INFO # Provides: fuse - # Required-Start: +-# Required-Start: ++# Required-Start: # Should-Start: udev - # Required-Stop: +-# Required-Stop: -# Default-Start: S --# Default-Stop: -+# Default-Start: 3 4 5 -+# Default-Stop: 0 1 2 6 ++# Required-Stop: ++# Default-Start: + # Default-Stop: # Short-Description: Start and stop fuse. # Description: Load the fuse module and mount the fuse control - # filesystem. Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/F-8/fuse.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fuse.spec 28 Feb 2008 10:53:50 -0000 1.30 +++ fuse.spec 12 Jul 2008 06:16:00 -0000 1.31 @@ -1,6 +1,6 @@ Name: fuse Version: 2.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -25,8 +25,8 @@ Requires(postun):/sbin/service %description -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE userspace tools to +With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains the FUSE userspace tools to mount a FUSE filesystem. %package libs @@ -35,20 +35,20 @@ License: LGPLv2+ %description libs -Devel With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE libraries. +Devel With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains the FUSE libraries. %package devel Summary: File System in Userspace (FUSE) devel files Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: pkgconfig +Requires: pkgconfig License: LGPLv2+ %description devel -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains development files (headers, +With FUSE it is possible to implement a fully functional filesystem in a +userspace program. This package contains development files (headers, pgk-config) to develop FUSE based applications/filesystems. @@ -144,6 +144,9 @@ %{_includedir}/fuse %changelog +* Sat Jul 12 2008 Peter Lemenkov 2.7.3-3 +- Fixed initscripts (BZ#441284) + * Thu Feb 28 2008 Peter Lemenkov 2.7.3-2 - Fixed BZ#434881 From fedora-extras-commits at redhat.com Sat Jul 12 07:03:03 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Sat, 12 Jul 2008 07:03:03 GMT Subject: rpms/gdb/devel gdb-6.6-buildid-locate.patch, 1.12, 1.13 gdb-6.6-bz225783-prelink-path.patch, 1.2, 1.3 gdb-6.8-constant-watchpoints.patch, 1.1, 1.2 gdb-6.8-upstream.patch, 1.4, 1.5 gdb.spec, 1.295, 1.296 Message-ID: <200807120703.m6C733of003344@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3282 Modified Files: gdb-6.6-buildid-locate.patch gdb-6.6-bz225783-prelink-path.patch gdb-6.8-constant-watchpoints.patch gdb-6.8-upstream.patch gdb.spec Log Message: * Sat Jul 12 2008 Jan Kratochvil - 6.8-15 - Temporary rpm-4.5.90 compatibility workaround by Panu Matilainen. - Fix a regression in the constant watchpoints fix, found by Daniel Jacobowitz. - Fix the prelink testcase for false FAILs on i386. gdb-6.6-buildid-locate.patch: Index: gdb-6.6-buildid-locate.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gdb-6.6-buildid-locate.patch 22 Apr 2008 22:13:56 -0000 1.12 +++ gdb-6.6-buildid-locate.patch 12 Jul 2008 07:02:33 -0000 1.13 @@ -36,6 +36,10 @@ Disable the warnings for the testsuite not expecting them. +2008-10-12 Jan Kratochvil + + rpm compatibility patch by Panu Matilainen. + Index: gdb-6.8/gdb/Makefile.in =================================================================== --- gdb-6.8.orig/gdb/Makefile.in 2008-04-19 20:48:13.000000000 +0200 @@ -787,7 +791,7 @@ if (retval != NULL && !build_id_verify (retval, build_id)) { -@@ -1314,9 +1714,433 @@ build_id_to_debug_filename (struct build +@@ -1314,9 +1714,432 @@ build_id_to_debug_filename (struct build retval = NULL; } @@ -799,7 +803,6 @@ return retval; } -+#include +#include +#include +#include gdb-6.6-bz225783-prelink-path.patch: Index: gdb-6.6-bz225783-prelink-path.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz225783-prelink-path.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.6-bz225783-prelink-path.patch 1 Nov 2007 20:24:20 -0000 1.2 +++ gdb-6.6-bz225783-prelink-path.patch 12 Jul 2008 07:02:33 -0000 1.3 @@ -1,23 +1,17 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225783 -2007-10-16 Jan Kratochvil - - Port to GDB-6.7. - -Index: gdb-6.7/gdb/testsuite/gdb.base/prelink.exp -=================================================================== ---- gdb-6.7.orig/gdb/testsuite/gdb.base/prelink.exp 2007-08-23 20:14:17.000000000 +0200 -+++ gdb-6.7/gdb/testsuite/gdb.base/prelink.exp 2007-10-16 16:16:51.000000000 +0200 -@@ -47,7 +47,7 @@ if { [gdb_compile "${srcdir}/${subdir}/$ - return -1 - } - --if {[catch "system \"prelink -qNR ${libfile}\""] != 0} { -+if {[catch "system \"/usr/sbin/prelink -qNR ${libfile}\""] != 0} { +--- gdb-6.8/gdb/testsuite/gdb.base/prelink.exp.orig 2008-07-12 08:56:43.000000000 +0200 ++++ gdb-6.8/gdb/testsuite/gdb.base/prelink.exp 2008-07-12 08:59:59.000000000 +0200 +@@ -55,7 +55,7 @@ if { [gdb_compile "${srcdir}/${subdir}/$ + # single new unprelinked library address without wasting the first one/two + # memory areas. We do not care of the efficiency of loading such resulting + # exec-shield unfriendly prelinked library. +-if {[catch "system \"prelink -qNR --no-exec-shield ${libfile}\""] != 0} { ++if {[catch "system \"/usr/sbin/prelink -qNR --no-exec-shield ${libfile}\""] != 0} { # Maybe we don't have prelink. return -1 } -@@ -88,11 +88,11 @@ if { $found == 0 } { +@@ -96,11 +96,11 @@ if { $found == 0 } { return 0 } @@ -26,8 +20,8 @@ untested "${testfile}.so was not prelinked, maybe system libraries are not prelinked?" return 0 } --catch "system \"prelink -qNR ${libfile}\"" -+catch "system \"/usr/sbin/prelink -qNR ${libfile}\"" +-catch "system \"prelink -qNR --no-exec-shield ${libfile}\"" ++catch "system \"/usr/sbin/prelink -qNR --no-exec-shield ${libfile}\"" # Start with a fresh gdb gdb-6.8-constant-watchpoints.patch: Index: gdb-6.8-constant-watchpoints.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-constant-watchpoints.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.8-constant-watchpoints.patch 17 Jun 2008 16:24:16 -0000 1.1 +++ gdb-6.8-constant-watchpoints.patch 12 Jul 2008 07:02:33 -0000 1.2 @@ -1,46 +1,67 @@ -2008-06-09 Jan Kratochvil +2008-07-10 Jan Kratochvil - * breakpoint.c (watch_command_1): New variable VAL_RESULT. Fill in - VAL_RESULT by the existing FETCH_WATCHPOINT_VALUE call. Refuse - constant VAL_RESULT list watchpoints. + * breakpoint.c (fetch_watchpoint_value): New comment on unreachable + values. + (watch_command_1): New variable VAL_CHAIN. Refuse constant watchpoints. + * gdbtypes.h (TYPE_CODE_FUNC): New comment regarding pointers to it. -2008-06-09 Jan Kratochvil +2008-07-10 Jan Kratochvil * gdb.texinfo (Set Watchpoints): Document constant value watchpoints. -2008-06-09 Jan Kratochvil +2008-07-10 Jan Kratochvil - * gdb.base/watchpoint.exp: New test for constant value watchpoints. - -[ Ported for Fedora GDB. ] - ---- ./gdb/breakpoint.c 6 Jun 2008 20:58:08 -0000 1.324 -+++ ./gdb/breakpoint.c 9 Jun 2008 06:00:53 -0000 -@@ -5818,7 +5818,7 @@ watch_command_1 (char *arg, int accessfl + * gdb.base/watchpoint.exp: Call TEST_CONSTANT_WATCHPOINT. + (test_constant_watchpoint): New function. + (test_inaccessible_watchpoint): Cleanup (delete) the watchpoint. + Test also a double-indirection watchpoint. + gdb.base/watchpoint.c (global_ptr_ptr): New variable. + (func4): New testing code for GLOBAL_PTR_PTR. + +--- ./gdb/breakpoint.c 8 Jul 2008 11:09:40 -0000 1.330 ++++ ./gdb/breakpoint.c 10 Jul 2008 08:19:07 -0000 +@@ -824,7 +824,15 @@ is_hardware_watchpoint (struct breakpoin + If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the + value chain. The caller must free the values individually. If + VAL_CHAIN is NULL, all generated values will be left on the value +- chain. */ ++ chain. ++ ++ Inferior unreachable values return: ++ Inferior `int *intp = NULL;' with `watch *intp': ++ *VALP is NULL, *RESULTP contains lazy LVAL_MEMORY address 0, *VAL_CHAIN ++ contains the *RESULTP element and also INTP as LVAL_MEMORY. ++ Inferior `int **intpp = NULL;' with `watch **intpp': ++ *VALP is NULL, *RESULTP is NULL, *VAL_CHAIN contains lazy LVAL_MEMORY ++ address 0 and also INTPP as LVAL_MEMORY. */ + + static void + fetch_watchpoint_value (struct expression *exp, struct value **valp, +@@ -5832,7 +5840,7 @@ watch_command_1 (char *arg, int accessfl struct symtab_and_line sal; struct expression *exp; struct block *exp_valid_block; - struct value *val, *mark; -+ struct value *val, *mark, *val_result; ++ struct value *val, *mark, *val_chain; struct frame_info *frame; struct frame_info *prev_frame = NULL; char *exp_start = NULL; -@@ -5903,7 +5903,27 @@ watch_command_1 (char *arg, int accessfl - exp_end = arg; +@@ -5918,6 +5926,27 @@ watch_command_1 (char *arg, int accessfl exp_valid_block = innermost_block; mark = value_mark (); -- fetch_watchpoint_value (exp, &val, NULL, NULL); -+ fetch_watchpoint_value (exp, &val, &val_result, NULL); + fetch_watchpoint_value (exp, &val, NULL, NULL); + -+ /* VAL may be unset for unreachable final values. */ -+ while (val_result != NULL) -+ { -+ if (VALUE_LVAL (val_result) == lval_memory -+ || VALUE_LVAL (val_result) == lval_register) -+ break; -+ val_result = value_next (val_result); -+ } -+ if (val_result == NULL) ++ /* VALUE_MARK gets us the same value as FETCH_WATCHPOINT_VALUE's VAL_CHAIN ++ parameter. Just this way we do not have to VALUE_FREE the chained VALUEs ++ ourselves. */ ++ for (val_chain = value_mark (); ++ val_chain != mark; ++ val_chain = value_next (val_chain)) ++ if ((VALUE_LVAL (val_chain) == lval_memory ++ && TYPE_CODE (value_type (val_chain)) != TYPE_CODE_FUNC) ++ || VALUE_LVAL (val_chain) == lval_register) ++ break; ++ if (val_chain == mark) + { + int len; + @@ -49,20 +70,46 @@ + len--; + error (_("Cannot watch constant value %.*s."), len, exp_start); + } -+ -+ /* Break the VAL_RESULT values chain only after its check above. */ ++ /* Break the values chain only after its check above. */ if (val != NULL) release_value (val); ---- ./gdb/doc/gdb.texinfo 6 Jun 2008 20:58:08 -0000 1.503 -+++ ./gdb/doc/gdb.texinfo 9 Jun 2008 06:01:37 -0000 -@@ -3375,6 +3375,17 @@ This command prints a list of watchpoint +--- ./gdb/gdbtypes.h 3 May 2008 22:20:13 -0000 1.87 ++++ ./gdb/gdbtypes.h 10 Jul 2008 08:19:08 -0000 +@@ -69,7 +69,22 @@ enum type_code + TYPE_CODE_UNION, /* C union or Pascal variant part */ + TYPE_CODE_ENUM, /* Enumeration type */ + TYPE_CODE_FLAGS, /* Bit flags type */ +- TYPE_CODE_FUNC, /* Function type */ ++ ++ /* Function type. It is not a pointer to a function. Function reference ++ by its name (such as `printf') has this type. C automatically converts ++ this function type to a pointer to function for any operation except ++ `sizeof (function_type)' or `&function_type' (unary &). ++ `sizeof (function_type)' is undefined in C. But GCC provides extension ++ (info '(gcc)Pointer Arith') defining its size as 1 byte. DWARF does not ++ define its size but GDB defines the size the GCC compatible way - GDB ++ function MAKE_FUNCTION_TYPE. The address itself is not modifiable. ++ As the function type has size 1 but its real value has `sizeof ++ (CORE_ADDR)' we cannot use NOT_LVAL category because the address would ++ not fit in the VALUE_CONTENTS_RAW container of its VALUE. We use ++ LVAL_MEMORY (and its VALUE_ADDRESS field) for it but we must be careful ++ it is not lvalue, it is the only non-modifiable LVAL_MEMORY. */ ++ TYPE_CODE_FUNC, ++ + TYPE_CODE_INT, /* Integer type */ + + /* Floating type. This is *NOT* a complex type. Beware, there are parts +--- ./gdb/doc/gdb.texinfo 7 Jul 2008 12:05:30 -0000 1.506 ++++ ./gdb/doc/gdb.texinfo 10 Jul 2008 08:19:37 -0000 +@@ -3375,6 +3375,18 @@ This command prints a list of watchpoint it is the same as @code{info break} (@pxref{Set Breaks}). @end table +If you watch for a change in a numerically entered address you need to +dereference it as the address itself is just a constant number which will never -+change. @value{GDBN} refuses to create a never invokable watchpoint: ++change. @value{GDBN} refuses to create a watchpoint that watches ++a never-changing value: + + at smallexample +(@value{GDBP}) watch 0x600850 @@ -74,23 +121,106 @@ @value{GDBN} sets a @dfn{hardware watchpoint} if possible. Hardware watchpoints execute very quickly, and the debugger reports a change in value at the exact instruction where the change occurs. If @value{GDBN} ---- gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp.orig 2008-06-17 13:42:35.000000000 +0200 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp 2008-06-17 13:43:38.000000000 +0200 -@@ -679,6 +679,17 @@ set prev_timeout $timeout - set timeout 600 - verbose "Timeout now 600 sec.\n" - -+# Test constant-value watchpoints. -+gdb_test "watch 123" "Cannot watch constant value 123." "constant watchpoint" -+gdb_test "watch 456 if 1 == 2" "Cannot watch constant value 456." \ -+ "constant watchpoint with a condition" -+# For unsupported constant-value watchpoints catching we need to reset the -+# breakpoints counter. -+gdb_exit -+gdb_start -+gdb_reinitialize_dir $srcdir/$subdir -+gdb_load $binfile +--- ./gdb/testsuite/gdb.base/watchpoint.c 3 Mar 2008 13:24:12 -0000 1.3 ++++ ./gdb/testsuite/gdb.base/watchpoint.c 10 Jul 2008 08:19:39 -0000 +@@ -40,6 +40,7 @@ struct foo struct1, struct2, *ptr1, *ptr + int doread = 0; + + char *global_ptr; ++char **global_ptr_ptr; + + void marker1 () + { +@@ -118,6 +119,10 @@ func4 () + buf[0] = 3; + global_ptr = buf; + buf[0] = 7; ++ buf[1] = 5; ++ global_ptr_ptr = &global_ptr; ++ buf[0] = 9; ++ global_ptr++; + } + + int main () +--- ./gdb/testsuite/gdb.base/watchpoint.exp 15 Apr 2008 14:33:54 -0000 1.18 ++++ ./gdb/testsuite/gdb.base/watchpoint.exp 10 Jul 2008 08:19:41 -0000 +@@ -644,7 +644,21 @@ proc test_watchpoint_and_breakpoint {} { + } + } + } +- ++ ++proc test_constant_watchpoint {} { ++ global gdb_prompt ++ ++ gdb_test "watch 5" "Cannot watch constant value 5." "number is constant" ++ gdb_test "watch marker1" "Cannot watch constant value marker1." \ ++ "marker1 is constant" ++ gdb_test "watch count + 6" ".*atchpoint \[0-9\]+: count \\+ 6" ++ gdb_test "set \$expr_breakpoint_number = \$bpnum" "" ++ gdb_test "delete \$expr_breakpoint_number" "" ++ gdb_test "watch 7 + count" ".*atchpoint \[0-9\]+: 7 \\+ count" ++ gdb_test "set \$expr_breakpoint_number = \$bpnum" "" ++ gdb_test "delete \$expr_breakpoint_number" "" ++} ++ + proc test_inaccessible_watchpoint {} { + global gdb_prompt + +@@ -653,7 +667,8 @@ proc test_inaccessible_watchpoint {} { + + if [runto func4] then { + gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr" +- gdb_test "next" ".*global_ptr = buf.*" ++ gdb_test "set \$global_ptr_breakpoint_number = \$bpnum" "" ++ gdb_test "next" ".*global_ptr = buf.*" "global_ptr next" + gdb_test_multiple "next" "next over ptr init" { + -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" { + # We can not test for here because NULL may be readable. +@@ -666,6 +681,28 @@ proc test_inaccessible_watchpoint {} { + pass "next over buffer set" + } + } ++ gdb_test "delete \$global_ptr_breakpoint_number" "" ++ gdb_test "watch **global_ptr_ptr" ".*atchpoint \[0-9\]+: \\*\\*global_ptr_ptr" ++ gdb_test "set \$global_ptr_ptr_breakpoint_number = \$bpnum" "" ++ gdb_test "next" ".*global_ptr_ptr = &global_ptr.*" "gloabl_ptr_ptr next" ++ gdb_test_multiple "next" "next over global_ptr_ptr init" { ++ -re ".*atchpoint \[0-9\]+: \\*\\*global_ptr_ptr\r\n\r\nOld value = .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" { ++ # We can not test for here because NULL may be readable. ++ # This test does rely on *NULL != 7. ++ pass "next over global_ptr_ptr init" ++ } ++ } ++ gdb_test_multiple "next" "next over global_ptr_ptr buffer set" { ++ -re ".*atchpoint \[0-9\]+: \\*\\*global_ptr_ptr\r\n\r\nOld value = 7 .*\r\nNew value = 9 .*\r\n.*$gdb_prompt $" { ++ pass "next over global_ptr_ptr buffer set" ++ } ++ } ++ gdb_test_multiple "next" "next over global_ptr_ptr pointer advance" { ++ -re ".*atchpoint \[0-9\]+: \\*\\*global_ptr_ptr\r\n\r\nOld value = 9 .*\r\nNew value = 5 .*\r\n.*$gdb_prompt $" { ++ pass "next over global_ptr_ptr pointer advance" ++ } ++ } ++ gdb_test "delete \$global_ptr_ptr_breakpoint_number" "" + } + } + +@@ -833,6 +870,17 @@ if [initialize] then { + } + + test_watchpoint_and_breakpoint ++ ++ # See above. ++ if [istarget "mips-idt-*"] then { ++ gdb_exit ++ gdb_start ++ gdb_reinitialize_dir $srcdir/$subdir ++ gdb_load $binfile ++ initialize ++ } + - gdb_test "set debug solib 1" - if [initialize] then { ++ test_constant_watchpoint + } + # Restore old timeout gdb-6.8-upstream.patch: Index: gdb-6.8-upstream.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-upstream.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdb-6.8-upstream.patch 7 Jul 2008 22:47:02 -0000 1.4 +++ gdb-6.8-upstream.patch 12 Jul 2008 07:02:33 -0000 1.5 @@ -931,3 +931,47 @@ +gdb_test "print empty()" " = void" +# We did segfault here. +gdb_test "help help" + + + +http://sourceware.org/ml/gdb-patches/2008-03/msg00356.html +http://sourceware.org/ml/gdb-cvs/2008-03/msg00130.html + +2008-03-24 Jan Kratochvil + + Fix random false FAILs on i386. + * gdb.base/prelink.exp: Use `--no-exec-shield' for prelink. + +=================================================================== +RCS file: /cvs/src/src/gdb/testsuite/gdb.base/prelink.exp,v +retrieving revision 1.7 +retrieving revision 1.8 +diff -u -r1.7 -r1.8 +--- src/gdb/testsuite/gdb.base/prelink.exp 2008/01/01 22:53:19 1.7 ++++ src/gdb/testsuite/gdb.base/prelink.exp 2008/03/24 15:16:12 1.8 +@@ -47,7 +47,15 @@ + return -1 + } + +-if {[catch "system \"prelink -qNR ${libfile}\""] != 0} { ++# `--no-exec-shield' is for i386 where prelink in the exec-shield mode is ++# forced to push all the libraries tight together to fit into the first two ++# memory areas (either the ASCII Shield area or at least below the executable). ++# In this case its -R option cannot be applied and we falsely FAIL here as if ++# the system is already prelinked prelink has no choice how to randomize the ++# single new unprelinked library address without wasting the first one/two ++# memory areas. We do not care of the efficiency of loading such resulting ++# exec-shield unfriendly prelinked library. ++if {[catch "system \"prelink -qNR --no-exec-shield ${libfile}\""] != 0} { + # Maybe we don't have prelink. + return -1 + } +@@ -92,7 +100,7 @@ + untested "${testfile}.so was not prelinked, maybe system libraries are not prelinked?" + return 0 + } +-catch "system \"prelink -qNR ${libfile}\"" ++catch "system \"prelink -qNR --no-exec-shield ${libfile}\"" + + # Start with a fresh gdb + Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- gdb.spec 7 Jul 2008 22:47:03 -0000 1.295 +++ gdb.spec 12 Jul 2008 07:02:33 -0000 1.296 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 14%{?_with_upstream:.upstream}%{?dist} +Release: 15%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -606,6 +606,10 @@ test -z "$g77" || ln -s "$g77" ./g77 export CFLAGS="$RPM_OPT_FLAGS" + +# FIXME: Temporary rpm compatibility cludge, port: gdb-6.6-buildid-locate.patch +CFLAGS="$CFLAGS -D_RPM_4_4_COMPAT -Wno-deprecated-declarations" + %if 0%{?_with_debug:1} # --enable-werror could conflict with `-Wall -O0' but this is no longer true # for recent GCCs. @@ -828,6 +832,11 @@ %endif %changelog +* Sat Jul 12 2008 Jan Kratochvil - 6.8-15 +- Temporary rpm-4.5.90 compatibility workaround by Panu Matilainen. +- Fix a regression in the constant watchpoints fix, found by Daniel Jacobowitz. +- Fix the prelink testcase for false FAILs on i386. + * Tue Jul 8 2008 Jan Kratochvil - 6.8-14 - Fix crash due to calling an inferior function right after a watchpoint stop. From fedora-extras-commits at redhat.com Sat Jul 12 07:22:03 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 07:22:03 GMT Subject: rpms/glpi/devel .cvsignore, 1.8, 1.9 glpi-config_path.php, 1.1, 1.2 glpi-httpd.conf, 1.1, 1.2 glpi.spec, 1.14, 1.15 sources, 1.10, 1.11 glpi.patch, 1.2, NONE Message-ID: <200807120722.m6C7M3Bk003989@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3946 Modified Files: .cvsignore glpi-config_path.php glpi-httpd.conf glpi.spec sources Removed Files: glpi.patch Log Message: update to 0.71 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Jan 2008 18:19:14 -0000 1.8 +++ .cvsignore 12 Jul 2008 07:21:32 -0000 1.9 @@ -1 +1 @@ -glpi-0.70.2.tar.gz +glpi-0.71.tar.gz Index: glpi-config_path.php =================================================================== RCS file: /cvs/extras/rpms/glpi/devel/glpi-config_path.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-config_path.php 9 Oct 2007 11:53:22 -0000 1.1 +++ glpi-config_path.php 12 Jul 2008 07:21:33 -0000 1.2 @@ -11,5 +11,6 @@ define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins"); define("GLPI_LOCK_DIR", "/var/lib/glpi/files/_lock/"); +define("GLPI_CACHE_LITE_DIR", "Cache"); define("GLPI_LOG_DIR", "/var/log/glpi"); ?> Index: glpi-httpd.conf =================================================================== RCS file: /cvs/extras/rpms/glpi/devel/glpi-httpd.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-httpd.conf 9 Oct 2007 11:53:22 -0000 1.1 +++ glpi-httpd.conf 12 Jul 2008 07:21:33 -0000 1.2 @@ -4,6 +4,8 @@ Options None AllowOverride Limit Options FileInfo + php_value memory_limit 64M + Order Deny,Allow Allow from all Index: glpi.spec =================================================================== RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- glpi.spec 25 Apr 2008 18:44:27 -0000 1.14 +++ glpi.spec 12 Jul 2008 07:21:33 -0000 1.15 @@ -5,8 +5,8 @@ %endif Name: glpi -Version: 0.70.2 -Release: 3%{?dist} +Version: 0.71 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -27,6 +27,7 @@ Requires: php-domxml %else Requires: php-xml +Requires: php-pear(Cache_Lite) >= 1.7.4 %endif Requires: %{_sysconfdir}/logrotate.d Requires(postun): /sbin/service @@ -58,7 +59,19 @@ %prep %setup -q -n glpi +%if 0%{?rhel} == 4 + +# use bundled lib mv lib/cache_lite/LICENSE LICENSE.cache_lite +grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php + +%else + +# Use system lib +rm -rf lib/cache_lite +cp %{SOURCE2} config/config_path.php + +%endif mv lib/phpmailer/LICENSE LICENSE.phpmailer mv lib/tiny_mce/license.txt LICENSE.tiny_mce dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce @@ -90,7 +103,6 @@ # ===== config ===== cp -ar config %{buildroot}/%{_datadir}/%{name}/config -install --mode 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/config/config_path.php mkdir -p %{buildroot}/%{_sysconfdir}/%{name} touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php @@ -132,12 +144,15 @@ %post %if %{useselinux} -# Remove Selinux policy (from previous packaging) ( +# Remove Selinux policy (from previous packaging) semodule -s targeted -r %{name} &>/dev/null +# Remove old httpd_sys_script_rw_t +semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?" # New File context semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" -semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/glpi(/.*)?" +semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/glpi(/.*)?" +# keep httpd_sys_script_rw_t (httpd_var_lib_t prevent dir creation) semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/glpi(/.*)?" # files created by app restorecon -R %{_sysconfdir}/%{name} @@ -193,6 +208,10 @@ %changelog +* Fri Jul 11 2008 Remi Collet - 0.71-1 +- update to 0.71 stable +- fix bug #452353 (selinux) + * Fri Apr 25 2008 Remi Collet - 0.70.2-3 - remplace module policy by simple semanage (#442706) Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 28 Jan 2008 18:08:43 -0000 1.10 +++ sources 12 Jul 2008 07:21:33 -0000 1.11 @@ -1 +1 @@ -5e755472c887a54bc532569ec36add99 glpi-0.70.2.tar.gz +9715471ac8e3be2a59f2888a180f26c2 glpi-0.71.tar.gz --- glpi.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 07:31:26 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 07:31:26 GMT Subject: rpms/glpi/F-9 glpi-config_path.php, 1.1, 1.2 glpi-httpd.conf, 1.1, 1.2 glpi.spec, 1.14, 1.15 sources, 1.10, 1.11 glpi.patch, 1.2, NONE Message-ID: <200807120731.m6C7VQAk004246@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4194 Modified Files: glpi-config_path.php glpi-httpd.conf glpi.spec sources Removed Files: glpi.patch Log Message: update to 0.71 Index: glpi-config_path.php =================================================================== RCS file: /cvs/extras/rpms/glpi/F-9/glpi-config_path.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-config_path.php 9 Oct 2007 11:53:22 -0000 1.1 +++ glpi-config_path.php 12 Jul 2008 07:30:27 -0000 1.2 @@ -11,5 +11,6 @@ define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins"); define("GLPI_LOCK_DIR", "/var/lib/glpi/files/_lock/"); +define("GLPI_CACHE_LITE_DIR", "Cache"); define("GLPI_LOG_DIR", "/var/log/glpi"); ?> Index: glpi-httpd.conf =================================================================== RCS file: /cvs/extras/rpms/glpi/F-9/glpi-httpd.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-httpd.conf 9 Oct 2007 11:53:22 -0000 1.1 +++ glpi-httpd.conf 12 Jul 2008 07:30:27 -0000 1.2 @@ -4,6 +4,8 @@ Options None AllowOverride Limit Options FileInfo + php_value memory_limit 64M + Order Deny,Allow Allow from all Index: glpi.spec =================================================================== RCS file: /cvs/extras/rpms/glpi/F-9/glpi.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- glpi.spec 25 Apr 2008 18:53:55 -0000 1.14 +++ glpi.spec 12 Jul 2008 07:30:27 -0000 1.15 @@ -5,8 +5,8 @@ %endif Name: glpi -Version: 0.70.2 -Release: 3%{?dist} +Version: 0.71 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -27,6 +27,7 @@ Requires: php-domxml %else Requires: php-xml +Requires: php-pear(Cache_Lite) >= 1.7.4 %endif Requires: %{_sysconfdir}/logrotate.d Requires(postun): /sbin/service @@ -58,7 +59,19 @@ %prep %setup -q -n glpi +%if 0%{?rhel} == 4 + +# use bundled lib mv lib/cache_lite/LICENSE LICENSE.cache_lite +grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php + +%else + +# Use system lib +rm -rf lib/cache_lite +cp %{SOURCE2} config/config_path.php + +%endif mv lib/phpmailer/LICENSE LICENSE.phpmailer mv lib/tiny_mce/license.txt LICENSE.tiny_mce dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce @@ -90,7 +103,6 @@ # ===== config ===== cp -ar config %{buildroot}/%{_datadir}/%{name}/config -install --mode 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/config/config_path.php mkdir -p %{buildroot}/%{_sysconfdir}/%{name} touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php @@ -132,12 +144,15 @@ %post %if %{useselinux} -# Remove Selinux policy (from previous packaging) ( +# Remove Selinux policy (from previous packaging) semodule -s targeted -r %{name} &>/dev/null +# Remove old httpd_sys_script_rw_t +semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?" # New File context semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" -semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/glpi(/.*)?" +semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/glpi(/.*)?" +# keep httpd_sys_script_rw_t (httpd_var_lib_t prevent dir creation) semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/glpi(/.*)?" # files created by app restorecon -R %{_sysconfdir}/%{name} @@ -193,6 +208,10 @@ %changelog +* Fri Jul 11 2008 Remi Collet - 0.71-1 +- update to 0.71 stable +- fix bug #452353 (selinux) + * Fri Apr 25 2008 Remi Collet - 0.70.2-3 - remplace module policy by simple semanage (#442706) Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 28 Jan 2008 18:08:43 -0000 1.10 +++ sources 12 Jul 2008 07:30:27 -0000 1.11 @@ -1 +1 @@ -5e755472c887a54bc532569ec36add99 glpi-0.70.2.tar.gz +9715471ac8e3be2a59f2888a180f26c2 glpi-0.71.tar.gz --- glpi.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 07:37:43 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 07:37:43 GMT Subject: rpms/glpi/F-8 glpi-config_path.php, 1.1, 1.2 glpi-httpd.conf, 1.1, 1.2 glpi.spec, 1.10, 1.11 sources, 1.9, 1.10 glpi.patch, 1.2, NONE Message-ID: <200807120737.m6C7bhgA004424@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4401 Modified Files: glpi-config_path.php glpi-httpd.conf glpi.spec sources Removed Files: glpi.patch Log Message: update to 0.71 Index: glpi-config_path.php =================================================================== RCS file: /cvs/extras/rpms/glpi/F-8/glpi-config_path.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-config_path.php 9 Oct 2007 11:53:22 -0000 1.1 +++ glpi-config_path.php 12 Jul 2008 07:36:44 -0000 1.2 @@ -11,5 +11,6 @@ define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins"); define("GLPI_LOCK_DIR", "/var/lib/glpi/files/_lock/"); +define("GLPI_CACHE_LITE_DIR", "Cache"); define("GLPI_LOG_DIR", "/var/log/glpi"); ?> Index: glpi-httpd.conf =================================================================== RCS file: /cvs/extras/rpms/glpi/F-8/glpi-httpd.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-httpd.conf 9 Oct 2007 11:53:22 -0000 1.1 +++ glpi-httpd.conf 12 Jul 2008 07:36:44 -0000 1.2 @@ -4,6 +4,8 @@ Options None AllowOverride Limit Options FileInfo + php_value memory_limit 64M + Order Deny,Allow Allow from all Index: glpi.spec =================================================================== RCS file: /cvs/extras/rpms/glpi/F-8/glpi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- glpi.spec 28 Jan 2008 18:12:08 -0000 1.10 +++ glpi.spec 12 Jul 2008 07:36:44 -0000 1.11 @@ -1,12 +1,12 @@ -%if %{?fedora}%{?rhel} >= 6 +%if %{?fedora}%{?rhel} >= 5 %define useselinux 1 %else %define useselinux 0 %endif Name: glpi -Version: 0.70.2 -Release: 2%{?dist} +Version: 0.71 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -27,6 +27,7 @@ Requires: php-domxml %else Requires: php-xml +Requires: php-pear(Cache_Lite) >= 1.7.4 %endif Requires: %{_sysconfdir}/logrotate.d Requires(postun): /sbin/service @@ -34,7 +35,6 @@ BuildRequires: dos2unix %if %{useselinux} Requires: policycoreutils -BuildRequires: selinux-policy-devel, checkpolicy %endif %description @@ -59,42 +59,28 @@ %prep %setup -q -n glpi +%if 0%{?rhel} == 4 + +# use bundled lib mv lib/cache_lite/LICENSE LICENSE.cache_lite +grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php + +%else + +# Use system lib +rm -rf lib/cache_lite +cp %{SOURCE2} config/config_path.php + +%endif mv lib/phpmailer/LICENSE LICENSE.phpmailer mv lib/tiny_mce/license.txt LICENSE.tiny_mce dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce iconv -f ISO-8859-15 -t UTF-8 LISEZMOI.txt >a && mv a LISEZMOI.txt iconv -f ISO-8859-15 -t UTF-8 README.txt >a && mv a README.txt -%if %{useselinux} -mkdir selinux -pushd selinux - -cat >%{name}.te <%{name}.fc </dev/null +# Remove old httpd_sys_script_rw_t +semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?" +# New File context +semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" +semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/glpi(/.*)?" +# keep httpd_sys_script_rw_t (httpd_var_lib_t prevent dir creation) +semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/glpi(/.*)?" # files created by app restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_localstatedir}/lib/%{name} restorecon -R %{_localstatedir}/log/%{name} +) &>/dev/null %endif /sbin/service httpd condrestart > /dev/null 2>&1 || : %postun -/sbin/service httpd condrestart > /dev/null 2>&1 || : %if %{useselinux} if [ "$1" -eq "0" ]; then - # Remove the SElinux policy. - semodule -r %{name} || : + # Remove the File Context + ( + semanage fcontext -d "%{_sysconfdir}/glpi(/.*)?" + semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?" + semanage fcontext -d "%{_localstatedir}/lib/glpi(/.*)?" + ) &>/dev/null fi %endif +/sbin/service httpd condrestart > /dev/null 2>&1 || : %files -f %{name}.lang @@ -215,11 +206,15 @@ %attr(750,apache,root) %dir %{_localstatedir}/log/%{name} %dir %{_datadir}/%{name}/locales -%if %{useselinux} -%{_datadir}/selinux/packages/%{name}/%{name}.pp -%endif %changelog +* Fri Jul 11 2008 Remi Collet - 0.71-1 +- update to 0.71 stable +- fix bug #452353 (selinux) + +* Fri Apr 25 2008 Remi Collet - 0.70.2-3 +- remplace module policy by simple semanage (#442706) + * Mon Jan 28 2008 Remi Collet - 0.70.2-2 - rebuild (fix sources tarball) Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 28 Jan 2008 18:12:08 -0000 1.9 +++ sources 12 Jul 2008 07:36:44 -0000 1.10 @@ -1 +1 @@ -5e755472c887a54bc532569ec36add99 glpi-0.70.2.tar.gz +9715471ac8e3be2a59f2888a180f26c2 glpi-0.71.tar.gz --- glpi.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 07:47:09 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 12 Jul 2008 07:47:09 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1575,1.1576 Message-ID: <200807120747.m6C7l95P004739@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4666 Modified Files: openoffice.org.spec Log Message: images_classic rename Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1575 retrieving revision 1.1576 diff -u -r1.1575 -r1.1576 --- openoffice.org.spec 11 Jul 2008 18:47:09 -0000 1.1575 +++ openoffice.org.spec 12 Jul 2008 07:46:19 -0000 1.1576 @@ -2328,7 +2328,7 @@ %{basisinstdir}/share/basic %dir %{basisinstdir}/share/config %{basisinstdir}/share/config/images.zip -%{basisinstdir}/share/config/images_classic8.zip +%{basisinstdir}/share/config/images_classic.zip %{basisinstdir}/share/config/images_crystal.zip %{basisinstdir}/share/config/images_hicontrast.zip %{basisinstdir}/share/config/images_industrial.zip From fedora-extras-commits at redhat.com Sat Jul 12 07:48:24 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 07:48:24 GMT Subject: rpms/glpi-data-injection/devel glpi-data-injection-1.2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 glpi-data-injection.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120748.m6C7mONH004845@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-data-injection/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4790 Modified Files: .cvsignore glpi-data-injection.spec sources Added Files: glpi-data-injection-1.2.patch Log Message: update to 1.2 for glpi 0.71 glpi-data-injection-1.2.patch: --- NEW FILE glpi-data-injection-1.2.patch --- Index: inc/plugin_data_injection.config.function.php =================================================================== --- inc/plugin_data_injection.config.function.php (r??vision 6827) +++ inc/plugin_data_injection.config.function.php (copie de travail) @@ -265,7 +265,7 @@ if (function_exists($function)) { $function ($type, $params); } - } else { + } else if (isset($PLUGIN_HOOKS['plugin_types'])){ //Browse all plugins foreach ($PLUGIN_HOOKS['plugin_types'] as $type => $name) { $function = 'plugin_' . $name . '_data_injection_' . $hook_name; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpi-data-injection/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jan 2008 19:32:57 -0000 1.2 +++ .cvsignore 12 Jul 2008 07:47:34 -0000 1.3 @@ -1 +1 @@ -glpi-data_injection-1.1.tar.gz +glpi-data_injection-1.2.tar.gz Index: glpi-data-injection.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-data-injection/devel/glpi-data-injection.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-data-injection.spec 27 Jan 2008 19:33:46 -0000 1.1 +++ glpi-data-injection.spec 12 Jul 2008 07:47:34 -0000 1.2 @@ -1,7 +1,7 @@ %define pluginname data_injection Name: glpi-data-injection -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: Plugin for importing data into GLPI Summary(fr): Extension pour importer des donn??es dans GLPI @@ -12,10 +12,12 @@ Source0: http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz +Patch0: %{name}-1.2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 %description Plugin for importing data into GLPI @@ -39,6 +41,10 @@ %prep %setup -q -c +pushd %{pluginname} +%patch0 -p0 +popd + # dos2unix to avoid rpmlint warnings mv %{pluginname}/docs docs find %{pluginname} -name \*php -exec sed -i -e 's/\r//' {} \; @@ -59,7 +65,7 @@ do lang=$(basename $i) echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}" -done >%{name}.lang +done | tee %{name}.lang %clean rm -rf %{buildroot} @@ -70,10 +76,12 @@ %doc docs/* %{_datadir}/glpi/plugins/%{pluginname} %dir %{_datadir}/glpi/plugins/%{pluginname}/locales -%{_datadir}/glpi/plugins/%{pluginname}/locales/* %changelog +* Sat Jul 12 2008 Remi Collet - 1.2-1 +- update to 1.2 for glpi 0.71 + * Sun Jan 13 2008 Remi Collet - 1.1-1 - update to 1.1 - tag lang files Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-data-injection/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jan 2008 19:32:57 -0000 1.2 +++ sources 12 Jul 2008 07:47:34 -0000 1.3 @@ -1 +1 @@ -e8339290b31627e5107e692dc3c47aae glpi-data_injection-1.1.tar.gz +697b7e035d3a50a8e1bb4cfa3c6ae267 glpi-data_injection-1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 07:53:42 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 07:53:42 GMT Subject: rpms/glpi-data-injection/F-9 glpi-data-injection-1.2.patch, NONE, 1.1 glpi-data-injection.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120753.m6C7rgRS005034@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-data-injection/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5002 Modified Files: glpi-data-injection.spec sources Added Files: glpi-data-injection-1.2.patch Log Message: update to 1.2 for glpi 0.71 glpi-data-injection-1.2.patch: --- NEW FILE glpi-data-injection-1.2.patch --- Index: inc/plugin_data_injection.config.function.php =================================================================== --- inc/plugin_data_injection.config.function.php (r??vision 6827) +++ inc/plugin_data_injection.config.function.php (copie de travail) @@ -265,7 +265,7 @@ if (function_exists($function)) { $function ($type, $params); } - } else { + } else if (isset($PLUGIN_HOOKS['plugin_types'])){ //Browse all plugins foreach ($PLUGIN_HOOKS['plugin_types'] as $type => $name) { $function = 'plugin_' . $name . '_data_injection_' . $hook_name; Index: glpi-data-injection.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-data-injection/F-9/glpi-data-injection.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-data-injection.spec 27 Jan 2008 19:33:46 -0000 1.1 +++ glpi-data-injection.spec 12 Jul 2008 07:52:53 -0000 1.2 @@ -1,7 +1,7 @@ %define pluginname data_injection Name: glpi-data-injection -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: Plugin for importing data into GLPI Summary(fr): Extension pour importer des donn??es dans GLPI @@ -12,10 +12,12 @@ Source0: http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz +Patch0: %{name}-1.2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 %description Plugin for importing data into GLPI @@ -39,6 +41,10 @@ %prep %setup -q -c +pushd %{pluginname} +%patch0 -p0 +popd + # dos2unix to avoid rpmlint warnings mv %{pluginname}/docs docs find %{pluginname} -name \*php -exec sed -i -e 's/\r//' {} \; @@ -59,7 +65,7 @@ do lang=$(basename $i) echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}" -done >%{name}.lang +done | tee %{name}.lang %clean rm -rf %{buildroot} @@ -70,10 +76,12 @@ %doc docs/* %{_datadir}/glpi/plugins/%{pluginname} %dir %{_datadir}/glpi/plugins/%{pluginname}/locales -%{_datadir}/glpi/plugins/%{pluginname}/locales/* %changelog +* Sat Jul 12 2008 Remi Collet - 1.2-1 +- update to 1.2 for glpi 0.71 + * Sun Jan 13 2008 Remi Collet - 1.1-1 - update to 1.1 - tag lang files Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-data-injection/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jan 2008 19:32:57 -0000 1.2 +++ sources 12 Jul 2008 07:52:53 -0000 1.3 @@ -1 +1 @@ -e8339290b31627e5107e692dc3c47aae glpi-data_injection-1.1.tar.gz +697b7e035d3a50a8e1bb4cfa3c6ae267 glpi-data_injection-1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 07:58:26 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 07:58:26 GMT Subject: rpms/glpi-data-injection/F-8 glpi-data-injection-1.2.patch, NONE, 1.1 glpi-data-injection.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120758.m6C7wQMV005246@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-data-injection/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5216 Modified Files: glpi-data-injection.spec sources Added Files: glpi-data-injection-1.2.patch Log Message: update to 1.2 for glpi 0.71 glpi-data-injection-1.2.patch: --- NEW FILE glpi-data-injection-1.2.patch --- Index: inc/plugin_data_injection.config.function.php =================================================================== --- inc/plugin_data_injection.config.function.php (r??vision 6827) +++ inc/plugin_data_injection.config.function.php (copie de travail) @@ -265,7 +265,7 @@ if (function_exists($function)) { $function ($type, $params); } - } else { + } else if (isset($PLUGIN_HOOKS['plugin_types'])){ //Browse all plugins foreach ($PLUGIN_HOOKS['plugin_types'] as $type => $name) { $function = 'plugin_' . $name . '_data_injection_' . $hook_name; Index: glpi-data-injection.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-data-injection/F-8/glpi-data-injection.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-data-injection.spec 27 Jan 2008 20:55:27 -0000 1.1 +++ glpi-data-injection.spec 12 Jul 2008 07:57:32 -0000 1.2 @@ -1,7 +1,7 @@ %define pluginname data_injection Name: glpi-data-injection -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: Plugin for importing data into GLPI Summary(fr): Extension pour importer des donn??es dans GLPI @@ -12,10 +12,12 @@ Source0: http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz +Patch0: %{name}-1.2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 %description Plugin for importing data into GLPI @@ -39,6 +41,10 @@ %prep %setup -q -c +pushd %{pluginname} +%patch0 -p0 +popd + # dos2unix to avoid rpmlint warnings mv %{pluginname}/docs docs find %{pluginname} -name \*php -exec sed -i -e 's/\r//' {} \; @@ -59,7 +65,7 @@ do lang=$(basename $i) echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}" -done >%{name}.lang +done | tee %{name}.lang %clean rm -rf %{buildroot} @@ -70,10 +76,12 @@ %doc docs/* %{_datadir}/glpi/plugins/%{pluginname} %dir %{_datadir}/glpi/plugins/%{pluginname}/locales -%{_datadir}/glpi/plugins/%{pluginname}/locales/* %changelog +* Sat Jul 12 2008 Remi Collet - 1.2-1 +- update to 1.2 for glpi 0.71 + * Sun Jan 13 2008 Remi Collet - 1.1-1 - update to 1.1 - tag lang files Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-data-injection/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jan 2008 20:55:27 -0000 1.2 +++ sources 12 Jul 2008 07:57:32 -0000 1.3 @@ -1 +1 @@ -e8339290b31627e5107e692dc3c47aae glpi-data_injection-1.1.tar.gz +697b7e035d3a50a8e1bb4cfa3c6ae267 glpi-data_injection-1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 08:01:16 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Sat, 12 Jul 2008 08:01:16 GMT Subject: rpms/ikiwiki/devel .cvsignore, 1.2, 1.3 ikiwiki.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120801.m6C81Gvn011925@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5359/devel Modified Files: .cvsignore ikiwiki.spec import.log sources Log Message: Update to 2.52. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Jul 2008 14:25:40 -0000 1.2 +++ .cvsignore 12 Jul 2008 08:00:27 -0000 1.3 @@ -1 +1 @@ -ikiwiki_2.51.tar.gz +ikiwiki_2.52.tar.gz Index: ikiwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ikiwiki.spec 6 Jul 2008 14:25:40 -0000 1.1 +++ ikiwiki.spec 12 Jul 2008 08:00:27 -0000 1.2 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 2.51 +Version: 2.52 Release: 1%{?dist} Summary: A wiki compiler @@ -142,6 +142,9 @@ %changelog +* Thu Jul 10 2008 Thomas Moschny - 2.52-1 +- Update to 2.52. + * Sun Jul 6 2008 Thomas Moschny - 2.51-1 - Update to 2.51. - Save iconv output to a temporary file. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Jul 2008 14:25:40 -0000 1.1 +++ import.log 12 Jul 2008 08:00:27 -0000 1.2 @@ -1 +1,2 @@ ikiwiki-2_51-1_fc9:HEAD:ikiwiki-2.51-1.fc9.src.rpm:1215354319 +ikiwiki-2_52-1_fc9:HEAD:ikiwiki-2.52-1.fc9.src.rpm:1215849595 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Jul 2008 14:25:40 -0000 1.2 +++ sources 12 Jul 2008 08:00:27 -0000 1.3 @@ -1 +1 @@ -4423258ab049d5441225027704fd2d1a ikiwiki_2.51.tar.gz +58153cbd11ddf664d7cc310a32ae684a ikiwiki_2.52.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 08:04:09 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 08:04:09 GMT Subject: rpms/glpi-pdf/devel .cvsignore, 1.2, 1.3 glpi-pdf.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120804.m6C849oK012098@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-pdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12076 Modified Files: .cvsignore glpi-pdf.spec sources Log Message: update to 0.5 for glpi 0.71 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpi-pdf/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Feb 2008 06:59:37 -0000 1.2 +++ .cvsignore 12 Jul 2008 08:03:39 -0000 1.3 @@ -1 +1 @@ -glpi-pdf-0.4.tar.gz +glpi-pdf-0.5.tar.gz Index: glpi-pdf.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-pdf/devel/glpi-pdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-pdf.spec 17 Feb 2008 07:01:18 -0000 1.1 +++ glpi-pdf.spec 12 Jul 2008 08:03:39 -0000 1.2 @@ -1,7 +1,7 @@ %define pluginname pdf Name: glpi-pdf -Version: 0.4 +Version: 0.5 Release: 1%{?dist} Summary: GLPI Plugin to print PDF of computers Summary(fr): Extension GLPI pour cr??er des PDF des ordinateurs @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 %description This GLPI plugin enables you to print with format pdf all the mitres of a @@ -58,6 +58,9 @@ %changelog +* Sat Jul 12 2008 Remi Collet - 0.5-1 +- update to 0.5 finale for glpi 0.71 + * Thu Dec 27 2007 Remi Collet - 0.4-1 - update to 0.4 finale - Initial RPM for Fedora review Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-pdf/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Feb 2008 06:59:37 -0000 1.2 +++ sources 12 Jul 2008 08:03:39 -0000 1.3 @@ -1 +1 @@ -6ba78069113b8cddb40d3d826751d72b glpi-pdf-0.4.tar.gz +6b10df91a8499f7e67d7a33e3b9085fb glpi-pdf-0.5.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 08:09:05 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 08:09:05 GMT Subject: rpms/glpi-pdf/F-9 glpi-pdf.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807120809.m6C895f1012330@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-pdf/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12311 Modified Files: glpi-pdf.spec sources Log Message: update to 0.5 for glpi 0.71 Index: glpi-pdf.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-pdf/F-9/glpi-pdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-pdf.spec 17 Feb 2008 07:01:18 -0000 1.1 +++ glpi-pdf.spec 12 Jul 2008 08:08:15 -0000 1.2 @@ -1,7 +1,7 @@ %define pluginname pdf Name: glpi-pdf -Version: 0.4 +Version: 0.5 Release: 1%{?dist} Summary: GLPI Plugin to print PDF of computers Summary(fr): Extension GLPI pour cr??er des PDF des ordinateurs @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 %description This GLPI plugin enables you to print with format pdf all the mitres of a @@ -58,6 +58,9 @@ %changelog +* Sat Jul 12 2008 Remi Collet - 0.5-1 +- update to 0.5 finale for glpi 0.71 + * Thu Dec 27 2007 Remi Collet - 0.4-1 - update to 0.4 finale - Initial RPM for Fedora review Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-pdf/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Feb 2008 06:59:37 -0000 1.2 +++ sources 12 Jul 2008 08:08:15 -0000 1.3 @@ -1 +1 @@ -6ba78069113b8cddb40d3d826751d72b glpi-pdf-0.4.tar.gz +6b10df91a8499f7e67d7a33e3b9085fb glpi-pdf-0.5.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 08:14:41 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 12 Jul 2008 08:14:41 GMT Subject: rpms/gfs-eustace-fonts/devel gfs-eustace-fonts-fontconfig.conf, NONE, 1.1 gfs-eustace-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807120814.m6C8Efcd012550@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-eustace-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12500/devel Modified Files: .cvsignore sources Added Files: gfs-eustace-fonts-fontconfig.conf gfs-eustace-fonts.spec import.log Log Message: initial import --- NEW FILE gfs-eustace-fonts-fontconfig.conf --- GFS Eustace fantasy fantasy GFS Eustace --- NEW FILE gfs-eustace-fonts.spec --- %define fontname gfs-eustace %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_EUSTACE Name: %{fontname}-fonts Version: 20080303 Release: 1%{?dist} Summary: GFS Eustace majuscule Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description As it is known, the Greek alphabet was used in majuscule form for over a millennium before the minuscule letters gradually replaced it until they became the official script in the 9th century A.D. Thereafter, majuscule letters were confined to sparse use as initials or elaborate titles until the Italian Renaissance. The new art of Typography, as well as the need of the humanists to mimic the ancient Greco-Roman period brought back the extensive use of the majuscule letter-forms in both Latin and Greek typography. Greek books of the time were printed using the contemporary Byzantine hand with which they combined capital letters modelled on the Roman antiquity, i.e. with thick and thin strokes and serifs. At the same time the Byzantine majuscule tradition, principally used on theological editions, remainned alive until the early 19th century. GFS Eustace is a typical example of Byzantine woodcut initials used in many similar forms in Italy for Greek editions of the Bible, Prayers and other theological literature from the 15th to 19th centuries. It has been designed by George D. Matthiopoulos. %prep %setup -q -c -T unzip -j -L -q %{SOURCE0} chmod 0644 *.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.otf %changelog * Sun Jul 06 2008 Nicolas Mailhot - 20080303-1 ?? initial packaging --- NEW FILE import.log --- gfs-eustace-fonts-20080303-1_fc10:HEAD:gfs-eustace-fonts-20080303-1.fc10.src.rpm:1215850441 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gfs-eustace-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2008 16:23:33 -0000 1.1 +++ .cvsignore 12 Jul 2008 08:14:11 -0000 1.2 @@ -0,0 +1 @@ +GFS_EUSTACE.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/gfs-eustace-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2008 16:23:33 -0000 1.1 +++ sources 12 Jul 2008 08:14:11 -0000 1.2 @@ -0,0 +1 @@ +b54eea11af83c569b861a17800fb1945 GFS_EUSTACE.zip From fedora-extras-commits at redhat.com Sat Jul 12 08:21:04 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 08:21:04 GMT Subject: rpms/glpi-pdf/F-8 glpi-pdf.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807120821.m6C8L4nP012743@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-pdf/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12693 Modified Files: glpi-pdf.spec sources Log Message: update to 0.5 for glpi 0.71 Index: glpi-pdf.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-pdf/F-8/glpi-pdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-pdf.spec 17 Feb 2008 07:06:52 -0000 1.1 +++ glpi-pdf.spec 12 Jul 2008 08:19:56 -0000 1.2 @@ -1,7 +1,7 @@ %define pluginname pdf Name: glpi-pdf -Version: 0.4 +Version: 0.5 Release: 1%{?dist} Summary: GLPI Plugin to print PDF of computers Summary(fr): Extension GLPI pour cr??er des PDF des ordinateurs @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 %description This GLPI plugin enables you to print with format pdf all the mitres of a @@ -58,6 +58,9 @@ %changelog +* Sat Jul 12 2008 Remi Collet - 0.5-1 +- update to 0.5 finale for glpi 0.71 + * Thu Dec 27 2007 Remi Collet - 0.4-1 - update to 0.4 finale - Initial RPM for Fedora review Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-pdf/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Feb 2008 07:06:52 -0000 1.2 +++ sources 12 Jul 2008 08:19:56 -0000 1.3 @@ -1 +1 @@ -6ba78069113b8cddb40d3d826751d72b glpi-pdf-0.4.tar.gz +6b10df91a8499f7e67d7a33e3b9085fb glpi-pdf-0.5.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 08:36:36 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 08:36:36 GMT Subject: rpms/glpi-mass-ocs-import/devel .cvsignore, 1.2, 1.3 glpi-mass-ocs-import.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120836.m6C8aahD013184@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131 Modified Files: .cvsignore glpi-mass-ocs-import.spec sources Log Message: update to 1.2 for glpi 0.71 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Feb 2008 07:27:46 -0000 1.2 +++ .cvsignore 12 Jul 2008 08:35:40 -0000 1.3 @@ -1 +1 @@ -glpi-mass_ocs_import-1.1.tar.gz +glpi-mass_ocs_import-1.2.tar.gz Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/glpi-mass-ocs-import.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-mass-ocs-import.spec 17 Feb 2008 07:27:46 -0000 1.1 +++ glpi-mass-ocs-import.spec 12 Jul 2008 08:35:40 -0000 1.2 @@ -2,7 +2,7 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 Requires: %{_sysconfdir}/cron.d %description @@ -111,6 +111,9 @@ %changelog +* Sat Jul 12 2008 Remi Collet - 1.2-1 +- update to 1.2 for glpi 0.71 + * Thu Feb 14 2008 Remi Collet - 1.1-1 - update to 1.1 (setup bug fixes) Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Feb 2008 07:27:46 -0000 1.2 +++ sources 12 Jul 2008 08:35:40 -0000 1.3 @@ -1 +1 @@ -493ae5565f18b8f1318b8e39062818c2 glpi-mass_ocs_import-1.1.tar.gz +725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 08:43:58 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 08:43:58 GMT Subject: rpms/glpi-mass-ocs-import/F-9 glpi-mass-ocs-import.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120843.m6C8hwIJ013508@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13464 Modified Files: glpi-mass-ocs-import.spec sources Log Message: update to 1.2 for glpi 0.71 Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-9/glpi-mass-ocs-import.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-mass-ocs-import.spec 17 Feb 2008 07:27:46 -0000 1.1 +++ glpi-mass-ocs-import.spec 12 Jul 2008 08:42:56 -0000 1.2 @@ -2,7 +2,7 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 Requires: %{_sysconfdir}/cron.d %description @@ -111,6 +111,9 @@ %changelog +* Sat Jul 12 2008 Remi Collet - 1.2-1 +- update to 1.2 for glpi 0.71 + * Thu Feb 14 2008 Remi Collet - 1.1-1 - update to 1.1 (setup bug fixes) Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Feb 2008 07:27:46 -0000 1.2 +++ sources 12 Jul 2008 08:42:56 -0000 1.3 @@ -1 +1 @@ -493ae5565f18b8f1318b8e39062818c2 glpi-mass_ocs_import-1.1.tar.gz +725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 08:55:37 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 08:55:37 GMT Subject: rpms/glpi-mass-ocs-import/F-8 glpi-mass-ocs-import.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807120855.m6C8tbGe013790@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13764 Modified Files: glpi-mass-ocs-import.spec sources Log Message: update to 1.2 for glpi 0.71 Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-8/glpi-mass-ocs-import.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpi-mass-ocs-import.spec 17 Feb 2008 07:34:31 -0000 1.1 +++ glpi-mass-ocs-import.spec 12 Jul 2008 08:55:07 -0000 1.2 @@ -2,7 +2,7 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.70 +Requires: glpi >= 0.71 Requires: %{_sysconfdir}/cron.d %description @@ -111,6 +111,9 @@ %changelog +* Sat Jul 12 2008 Remi Collet - 1.2-1 +- update to 1.2 for glpi 0.71 + * Thu Feb 14 2008 Remi Collet - 1.1-1 - update to 1.1 (setup bug fixes) Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Feb 2008 07:34:31 -0000 1.2 +++ sources 12 Jul 2008 08:55:07 -0000 1.3 @@ -1 +1 @@ -493ae5565f18b8f1318b8e39062818c2 glpi-mass_ocs_import-1.1.tar.gz +725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 09:04:39 2008 From: fedora-extras-commits at redhat.com (Pilgrim Mincher (liberating)) Date: Sat, 12 Jul 2008 09:04:39 +0000 Subject: :) Message-ID: <8235953395.20080712084835@plantetorvet.dk> Halloha, How To Get Any Womman Into Bed? Try ... http://gzs.tihidjeqj.cn And sends forth a thundering bark, which is answered capital, sharing his fatigues and his pride, picking i meant ? that wasn't really your reason ? she more complex symptoms. Now she suffered in her sighed. He found the world unfriendly. and surely, and pressed the bell. The door was opened by a editions creating the works from public domain going to die of old age here! Since it is that lay beside the lamp. barney lighted one of them. As they were constantly being blown away, no matter and into the sea. The man fell back a step, and any longer ? it's a stranger ? a cruel stranger. pigsty here! He turned to morris with excited pleases me now, and i fancy i have discovered he reached home, by and it had come so strangely they landed at the port of housa, distant a day side i saw a fresh body of men advancing, who and massive ruins the country for miles around i don't drink at least i didn't, though i can't was walled up, but a little footpath, which, from. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Sat Jul 12 11:36:08 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Sat, 12 Jul 2008 11:36:08 GMT Subject: rpms/ikiwiki/devel .cvsignore, 1.3, 1.4 ikiwiki.spec, 1.2, 1.3 import.log, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807121136.m6CBa8rk007866@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7800/devel Modified Files: .cvsignore ikiwiki.spec import.log sources Log Message: Update to 2.53. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jul 2008 08:00:27 -0000 1.3 +++ .cvsignore 12 Jul 2008 11:35:14 -0000 1.4 @@ -1 +1 @@ -ikiwiki_2.52.tar.gz +ikiwiki_2.53.tar.gz Index: ikiwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ikiwiki.spec 12 Jul 2008 08:00:27 -0000 1.2 +++ ikiwiki.spec 12 Jul 2008 11:35:14 -0000 1.3 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 2.52 +Version: 2.53 Release: 1%{?dist} Summary: A wiki compiler @@ -142,6 +142,9 @@ %changelog +* Sat Jul 12 2008 Thomas Moschny - 2.53-1 +- Update to 2.53. + * Thu Jul 10 2008 Thomas Moschny - 2.52-1 - Update to 2.52. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 12 Jul 2008 08:00:27 -0000 1.2 +++ import.log 12 Jul 2008 11:35:14 -0000 1.3 @@ -1,2 +1,3 @@ ikiwiki-2_51-1_fc9:HEAD:ikiwiki-2.51-1.fc9.src.rpm:1215354319 ikiwiki-2_52-1_fc9:HEAD:ikiwiki-2.52-1.fc9.src.rpm:1215849595 +ikiwiki-2_53-1_fc9:HEAD:ikiwiki-2.53-1.fc9.src.rpm:1215862494 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 08:00:27 -0000 1.3 +++ sources 12 Jul 2008 11:35:14 -0000 1.4 @@ -1 +1 @@ -58153cbd11ddf664d7cc310a32ae684a ikiwiki_2.52.tar.gz +757a65d66e574f288eb9a11f37a6d389 ikiwiki_2.53.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 13:16:55 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 13:16:55 GMT Subject: rpms/ekg2/devel ekg2-gtk2-2.13.patch,NONE,1.1 ekg2.spec,1.15,1.16 Message-ID: <200807121316.m6CDGtl7023010@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/ekg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22981 Modified Files: ekg2.spec Added Files: ekg2-gtk2-2.13.patch Log Message: * Sat Jul 12 2008 Dominik Mierzejewski 0.2-0.3.rc1 - fix compilation with >=gtk-2.13 - add missing defattr ekg2-gtk2-2.13.patch: --- NEW FILE ekg2-gtk2-2.13.patch --- diff -up ekg2-0.2-rc1/plugins/gtk/gtkutil.c.gtk ekg2-0.2-rc1/plugins/gtk/gtkutil.c --- ekg2-0.2-rc1/plugins/gtk/gtkutil.c.gtk 2008-02-28 21:22:55.000000000 +0100 +++ ekg2-0.2-rc1/plugins/gtk/gtkutil.c 2008-07-12 14:57:55.000000000 +0200 @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff -up ekg2-0.2-rc1/plugins/gtk/xtext.h.gtk ekg2-0.2-rc1/plugins/gtk/xtext.h --- ekg2-0.2-rc1/plugins/gtk/xtext.h.gtk 2008-02-28 21:22:55.000000000 +0100 +++ ekg2-0.2-rc1/plugins/gtk/xtext.h 2008-07-12 14:51:49.000000000 +0200 @@ -29,6 +29,9 @@ #define XTEXT_BG 35 #define XTEXT_MARKER 36 /* for marker line */ +#ifdef GTK_DISABLE_DEPRECATED +typedef GType GtkType; +#endif typedef struct _GtkXText GtkXText; typedef struct _GtkXTextClass GtkXTextClass; Index: ekg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ekg2.spec 4 Jun 2008 09:04:49 -0000 1.15 +++ ekg2.spec 12 Jul 2008 13:16:24 -0000 1.16 @@ -5,12 +5,13 @@ Summary(pl): Wieloprotoko??owy komunikator internetowy Name: ekg2 Version: 0.2 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} License: GPLv2 Group: Applications/Internet Source0: http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz Patch1: %{name}-rpm.patch Patch2: %{name}-gcc43.patch +Patch3: %{name}-gtk2-2.13.patch URL: http://www.ekg2.org/ BuildRequires: aspell-devel BuildRequires: automake17 @@ -196,6 +197,7 @@ %setup -q -n %{name}-%{version}-rc1 %patch1 -p1 -b .r %patch2 -p1 -b .gcc43 +%patch3 -p1 -b .gtk cp -p README README-main # convert docs to UTF-8 for file in \ @@ -318,6 +320,7 @@ %{_datadir}/%{name}/plugins/jabber %files ioctld +%defattr(644,root,root,755) %attr(755,root,root) %{_libexecdir}/%{name}/ioctld %attr(755,root,root) %{_libdir}/%{name}/plugins/ioctld.so %{_datadir}/%{name}/plugins/ioctld @@ -354,6 +357,10 @@ %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so %changelog +* Sat Jul 12 2008 Dominik Mierzejewski 0.2-0.3.rc1 +- fix compilation with >=gtk-2.13 +- add missing defattr + * Wed Jun 04 2008 Dominik Mierzejewski 0.2-0.2.rc1 - fix No UI-PLUGIN problem (patch from upstream) From fedora-extras-commits at redhat.com Sat Jul 12 13:44:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Joonas_Saraj=C3=A4rvi?= (muep)) Date: Sat, 12 Jul 2008 13:44:50 GMT Subject: rpms/milkytracker/devel import.log, NONE, 1.1 milkytracker-0.90.80-use-system-library.patch, NONE, 1.1 milkytracker.desktop, NONE, 1.1 milkytracker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807121344.m6CDiobR023803@cvs-int.fedora.redhat.com> Author: muep Update of /cvs/pkgs/rpms/milkytracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23319/devel Modified Files: .cvsignore sources Added Files: import.log milkytracker-0.90.80-use-system-library.patch milkytracker.desktop milkytracker.spec Log Message: * Sat Jul 12 2008 Joonas Saraj??rvi - 0.90.80-3 - Initial CVS import --- NEW FILE import.log --- milkytracker-0_90_80-3_fc9:HEAD:milkytracker-0.90.80-3.fc9.src.rpm:1215868985 milkytracker-0.90.80-use-system-library.patch: --- NEW FILE milkytracker-0.90.80-use-system-library.patch --- --- milkytracker-0.90.80/configure.debug 2008-04-14 07:44:02.000000000 +0900 +++ milkytracker-0.90.80/configure 2008-05-30 20:08:45.000000000 +0900 @@ -5757,6 +5757,221 @@ +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + { echo "$as_me:$LINENO: checking for zzip/lib.h" >&5 +echo $ECHO_N "checking for zzip/lib.h... $ECHO_C" >&6; } +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_zzip_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zzip_lib_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking zzip/lib.h usability" >&5 +echo $ECHO_N "checking zzip/lib.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking zzip/lib.h presence" >&5 +echo $ECHO_N "checking zzip/lib.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: zzip/lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: zzip/lib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: zzip/lib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: zzip/lib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: zzip/lib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: zzip/lib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: zzip/lib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: zzip/lib.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------- ## +## Report this to www.milkytracker.net ## +## ----------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for zzip/lib.h" >&5 +echo $ECHO_N "checking for zzip/lib.h... $ECHO_C" >&6; } +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_zzip_lib_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_zzip_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zzip_lib_h" >&6; } + +fi +if test $ac_cv_header_zzip_lib_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: \"Cannot find zzip/lib.h\"" >&5 +echo "$as_me: error: \"Cannot find zzip/lib.h\"" >&2;} + { (exit 1); exit 1; }; } +fi + + + +{ echo "$as_me:$LINENO: checking for zzip_file_open in -lzzip" >&5 +echo $ECHO_N "checking for zzip_file_open in -lzzip... $ECHO_C" >&6; } +if test "${ac_cv_lib_zzip_zzip_file_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lzzip $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char zzip_file_open (); +int +main () +{ +return zzip_file_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_zzip_zzip_file_open=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_zzip_zzip_file_open=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_zzip_zzip_file_open" >&5 +echo "${ECHO_T}$ac_cv_lib_zzip_zzip_file_open" >&6; } +if test $ac_cv_lib_zzip_zzip_file_open = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZZIP 1 +_ACEOF + + LIBS="-lzzip $LIBS" + +else + { { echo "$as_me:$LINENO: error: \"Cannot find -lzzip\"" >&5 +echo "$as_me: error: \"Cannot find -lzzip\"" >&2;} + { (exit 1); exit 1; }; } +fi + + # Check that SDL supports the X11 wm { echo "$as_me:$LINENO: checking whether SDL supports X11" >&5 echo $ECHO_N "checking whether SDL supports X11... $ECHO_C" >&6; } --- milkytracker-0.90.80/configure.in.debug 2008-04-14 07:42:14.000000000 +0900 +++ milkytracker-0.90.80/configure.in 2008-05-30 20:08:45.000000000 +0900 @@ -44,6 +44,9 @@ AC_HEADER_STDC AC_CHECK_HEADERS_ONCE([fcntl.h inttypes.h limits.h malloc.h memory.h stddef.h stdint.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/time.h unistd.h],,AC_MSG_ERROR([One or more required header files are missing])) +AC_CHECK_HEADER(zzip/lib.h,,AC_MSG_ERROR("Cannot find zzip/lib.h")) +AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) + # Check that SDL supports the X11 wm AC_MSG_CHECKING([whether SDL supports X11]) OLDCPPFLAGS=$CPPFLAGS --- milkytracker-0.90.80/src/compression/Makefile.am.debug 2008-01-25 07:44:27.000000000 +0900 +++ milkytracker-0.90.80/src/compression/Makefile.am 2008-05-30 20:26:35.000000000 +0900 @@ -1,5 +1,5 @@ noinst_LIBRARIES = libcompression.a -libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp -noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h +libcompression_a_SOURCES = MyIO.cpp PP20.cpp ZipExtractor.cpp +noinst_HEADERS = zziplib/MyIO.h zziplib/zzip_fedora.h PP20.h ZipExtractor.h INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic #INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix --- milkytracker-0.90.80/src/compression/Makefile.in.debug 2008-04-14 07:44:02.000000000 +0900 +++ milkytracker-0.90.80/src/compression/Makefile.in 2008-05-30 20:27:15.000000000 +0900 @@ -46,13 +46,7 @@ ARFLAGS = cru libcompression_a_AR = $(AR) $(ARFLAGS) libcompression_a_LIBADD = -am_libcompression_a_OBJECTS = adler32.$(OBJEXT) compress.$(OBJEXT) \ - deflate.$(OBJEXT) infback.$(OBJEXT) inffast.$(OBJEXT) \ - inflate.$(OBJEXT) inftrees.$(OBJEXT) uncompr.$(OBJEXT) \ - crc32.$(OBJEXT) trees.$(OBJEXT) zutil.$(OBJEXT) dir.$(OBJEXT) \ - err.$(OBJEXT) fetch.$(OBJEXT) file.$(OBJEXT) fseeko.$(OBJEXT) \ - info.$(OBJEXT) plugin.$(OBJEXT) stat.$(OBJEXT) zip.$(OBJEXT) \ - MyIO.$(OBJEXT) PP20.$(OBJEXT) ZipExtractor.$(OBJEXT) +am_libcompression_a_OBJECTS = MyIO.$(OBJEXT) PP20.$(OBJEXT) ZipExtractor.$(OBJEXT) libcompression_a_OBJECTS = $(am_libcompression_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -165,8 +159,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libcompression.a -libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp -noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h +libcompression_a_SOURCES = MyIO.cpp PP20.cpp ZipExtractor.cpp +noninst_HEADERS = zziplib/MyIO.h zziplib/zzip_fedora.h PP20.h ZipExtractor.h INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic all: all-am --- milkytracker-0.90.80/src/compression/ZipExtractor.cpp.debug 2008-01-17 06:49:04.000000000 +0900 +++ milkytracker-0.90.80/src/compression/ZipExtractor.cpp 2008-05-30 20:08:45.000000000 +0900 @@ -11,7 +11,6 @@ #include "XModule.h" #include "XMFile.h" #include "MyIO.h" -#include "zzip_lib.h" ZipExtractor::ZipExtractor(const PPSystemString& archivePath) : archivePath(archivePath) --- milkytracker-0.90.80/src/compression/zziplib/MyIO.h.debug 2008-01-17 06:49:04.000000000 +0900 +++ milkytracker-0.90.80/src/compression/zziplib/MyIO.h 2008-05-30 20:08:45.000000000 +0900 @@ -9,7 +9,7 @@ #ifndef __MYIO_H__ #define __MYIO_H__ -#include "zzip_plugin.h" +#include "zzip_fedora.h" #ifdef __cplusplus extern "C" { --- milkytracker-0.90.80/src/compression/zziplib/zzip_fedora.h.debug 2008-05-30 20:08:45.000000000 +0900 +++ milkytracker-0.90.80/src/compression/zziplib/zzip_fedora.h 2008-05-30 20:08:45.000000000 +0900 @@ -0,0 +1,20 @@ +#ifndef __ZZIP_FEDORA_H__ +#define __ZZIP_FEDORA_H__ + +#include /* size_t */ +#include /* O_WRONLY */ +#include /* system wide zzip */ + +#define __zzipfd size_t /* zzip_conf.h */ +#define _zzip_const const +#define _zzip_ssize_t ssize_t +#define _zzip_size_t size_t +#define _zzip_off_t off_t + +typedef char _zzip_const zzip_char_t; /* zzip.h */ + +typedef _zzip_ssize_t zzip_ssize_t; /* zzip_types.h */ +typedef _zzip_size_t zzip_size_t; +typedef _zzip_off_t zzip_off_t; + +#endif --- NEW FILE milkytracker.desktop --- [Desktop Entry] Name=MilkyTracker Comment=Module tracker Exec=milkytracker %U Terminal=false Type=Application Icon=milkytracker StartupNotify=false Categories=AudioVideo;Audio;Sequencer; --- NEW FILE milkytracker.spec --- Name: milkytracker Version: 0.90.80 Release: 3%{?dist} Summary: Module tracker software for creating music Group: Applications/Multimedia License: GPLv3+ URL: http://www.milkytracker.net/ Source0: http://www.milkytracker.net/files/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: milkytracker-0.90.80-use-system-library.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: zziplib-devel BuildRequires: jack-audio-connection-kit-devel %description MilkyTracker is an application for creating music in the .MOD and .XM formats. Its goal is to be free replacement for the popular Fasttracker II software. %prep %setup -q find . -name \*.cpp -or -name \*.h | xargs chmod 644 %patch0 -p1 -b .debug # Explicitly remove source files rm -rf src/compression/zlib/ rm -rf src/compression/zziplib/generic/ # timestamp: touch files to remove autotool call touch -r configure aclocal.m4 Makefile.in config.h.in %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # copy the icon mkdir -p %{buildroot}%{_datadir}/pixmaps cp -p resources/pictures/carton.png %{buildroot}%{_datadir}/pixmaps/milkytracker.png # copy the desktop file desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_bindir}/milkytracker %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/milkytracker.png %changelog * Fri May 30 2008 Mamoru Tasaka - 0.90.80-3 - Use system-wide zziplib (zlib is not used directly) * Mon May 26 2008 Joonas Saraj??rvi - 0.90.80-2 - Set Source0 to use macros for easier updating. - Removed the --without-jack configuration option. - Added -p to the cp command to preserve the timestamp. - Replaced /usr/share with a macro. - Added a line to prep to set correct permissions for source files extracted from the tarball. - Modified a Makefile.am to not compile the included static zlib library. * Sat May 3 2008 Joonas Saraj??rvi - 0.90.80-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/milkytracker/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 21:03:50 -0000 1.1 +++ .cvsignore 12 Jul 2008 13:43:59 -0000 1.2 @@ -0,0 +1 @@ +milkytracker-0.90.80.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/milkytracker/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:03:50 -0000 1.1 +++ sources 12 Jul 2008 13:43:59 -0000 1.2 @@ -0,0 +1 @@ +f8090ac13ec2f3cf89af483d1483d16c milkytracker-0.90.80.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 12 13:50:33 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 13:50:33 GMT Subject: rpms/rlog/devel import.log, NONE, 1.1 rlog-1.4.tar.gz.asc, NONE, 1.1 .cvsignore, 1.2, 1.3 rlog.spec, 1.7, 1.8 sources, 1.3, 1.4 rlog-1.3.7.tgz.asc, 1.2, NONE rlog-gcc43_fix.diff, 1.1, NONE Message-ID: <200807121350.m6CDoX4K024069@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/rlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24028/devel Modified Files: .cvsignore rlog.spec sources Added Files: import.log rlog-1.4.tar.gz.asc Removed Files: rlog-1.3.7.tgz.asc rlog-gcc43_fix.diff Log Message: Ver. 1.4 --- NEW FILE import.log --- rlog-1_4-1_fc9:HEAD:rlog-1.4-1.fc9.src.rpm:1215870506 --- NEW FILE rlog-1.4.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBIVK4qWp20Ay6vTYARAkSsAJ9zp14R5x6sJLqZTZaeycgzV7vgCACfdSbb ofyhawtIVs+wdXwgy2yQfsE= =8f+3 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rlog/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Dec 2005 22:22:16 -0000 1.2 +++ .cvsignore 12 Jul 2008 13:49:36 -0000 1.3 @@ -1 +1 @@ -rlog-1.3.7.tgz +rlog-1.4.tar.gz Index: rlog.spec =================================================================== RCS file: /cvs/extras/rpms/rlog/devel/rlog.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rlog.spec 6 Jun 2008 07:27:34 -0000 1.7 +++ rlog.spec 12 Jul 2008 13:49:36 -0000 1.8 @@ -1,18 +1,13 @@ Name: rlog Summary: Runtime Logging for C++ -Version: 1.3.7 -Release: 7%{?dist} +Version: 1.4 +Release: 1%{?dist} License: LGPLv21+ Group: Development/Libraries Url: http://arg0.net/wiki/rlog -Source0: http://rlog.googlecode.com/files/%{name}-%{version}.tgz -Source1: http://rlog.googlecode.com/files/%{name}-%{version}.tgz.asc -# reported upstream and fixed in svn -# see http://code.google.com/p/rlog/issues/detail?id=6 -Patch0: rlog-gcc43_fix.diff -%ifarch i386 -BuildRequires: valgrind -%endif +Source0: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz +Source1: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc +BuildRequires: valgrind-devel Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -31,18 +26,11 @@ %prep %setup -q -%patch0 %{__rm} -rf docs/html %{__rm} -rf docs/latex %build -%configure \ - --disable-static \ -%ifarch i386 - --enable-valgrind -%else - --disable-valgrind -%endif +%configure --disable-static --enable-valgrind %{__make} %{?_smp_mflags} %install @@ -71,6 +59,11 @@ %doc docs/html docs/latex/refman.pdf %changelog +* Sat Jul 12 2008 Peter Lemenkov 1.4-1 +- Ver. 1.4 +- Dropped upstreamed patch +- Enabled valgrind on all supported platforms + * Fri Jun 6 2008 Peter Lemenkov 1.3.7-7 - Get rid of whitespaces (cosmetic) - Note about patch status (applied upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rlog/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Feb 2008 22:19:15 -0000 1.3 +++ sources 12 Jul 2008 13:49:36 -0000 1.4 @@ -1 +1 @@ -b84df0d8a57ea676c4bf594c7a35cd25 rlog-1.3.7.tgz +c29f74e0f50d66b20312d049b683ff82 rlog-1.4.tar.gz --- rlog-1.3.7.tgz.asc DELETED --- --- rlog-gcc43_fix.diff DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 13:54:12 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 13:54:12 GMT Subject: rpms/rlog/F-9 import.log, NONE, 1.1 rlog-1.4.tar.gz.asc, NONE, 1.1 .cvsignore, 1.2, 1.3 rlog.spec, 1.6, 1.7 sources, 1.3, 1.4 rlog-1.3.7.tgz.asc, 1.2, NONE rlog-gcc43_fix.diff, 1.1, NONE Message-ID: <200807121354.m6CDsCgx024373@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/rlog/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24308/F-9 Modified Files: .cvsignore rlog.spec sources Added Files: import.log rlog-1.4.tar.gz.asc Removed Files: rlog-1.3.7.tgz.asc rlog-gcc43_fix.diff Log Message: Ver. 1.4 --- NEW FILE import.log --- rlog-1_4-1_fc9:F-9:rlog-1.4-1.fc9.src.rpm:1215870680 --- NEW FILE rlog-1.4.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBIVK4qWp20Ay6vTYARAkSsAJ9zp14R5x6sJLqZTZaeycgzV7vgCACfdSbb ofyhawtIVs+wdXwgy2yQfsE= =8f+3 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rlog/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Dec 2005 22:22:16 -0000 1.2 +++ .cvsignore 12 Jul 2008 13:53:16 -0000 1.3 @@ -1 +1 @@ -rlog-1.3.7.tgz +rlog-1.4.tar.gz Index: rlog.spec =================================================================== RCS file: /cvs/extras/rpms/rlog/F-9/rlog.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rlog.spec 21 Feb 2008 22:19:15 -0000 1.6 +++ rlog.spec 12 Jul 2008 13:53:16 -0000 1.7 @@ -1,17 +1,14 @@ -Name: rlog -Summary: Runtime Logging for C++ -Version: 1.3.7 -Release: 6%{?dist} -License: LGPLv21+ -Group: Development/Libraries -Url: http://arg0.net/wiki/rlog -Source0: http://rlog.googlecode.com/files/%{name}-%{version}.tgz -Source1: http://rlog.googlecode.com/files/%{name}-%{version}.tgz.asc -Patch0: rlog-gcc43_fix.diff -%ifarch i386 -BuildRequires: valgrind -%endif -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: rlog +Summary: Runtime Logging for C++ +Version: 1.4 +Release: 1%{?dist} +License: LGPLv21+ +Group: Development/Libraries +Url: http://arg0.net/wiki/rlog +Source0: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz +Source1: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc +BuildRequires: valgrind-devel +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description RLog provides a flexible message logging facility for C++ programs and @@ -29,18 +26,11 @@ %prep %setup -q -%patch0 %{__rm} -rf docs/html %{__rm} -rf docs/latex %build -%configure \ - --disable-static \ -%ifarch i386 - --enable-valgrind -%else - --disable-valgrind -%endif +%configure --disable-static --enable-valgrind %{__make} %{?_smp_mflags} %install @@ -59,7 +49,7 @@ %files %defattr(-,root,root,-) %{_libdir}/librlog.so.* -%doc README AUTHORS COPYING +%doc README AUTHORS COPYING %files devel %defattr(-,root,root,-) @@ -69,6 +59,15 @@ %doc docs/html docs/latex/refman.pdf %changelog +* Sat Jul 12 2008 Peter Lemenkov 1.4-1 +- Ver. 1.4 +- Dropped upstreamed patch +- Enabled valgrind on all supported platforms + +* Fri Jun 6 2008 Peter Lemenkov 1.3.7-7 +- Get rid of whitespaces (cosmetic) +- Note about patch status (applied upstream) + * Fri Feb 22 2008 Peter Lemenkov 1.3.7-6 - Changed source paths - Fixed build with GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rlog/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Feb 2008 22:19:15 -0000 1.3 +++ sources 12 Jul 2008 13:53:16 -0000 1.4 @@ -1 +1 @@ -b84df0d8a57ea676c4bf594c7a35cd25 rlog-1.3.7.tgz +c29f74e0f50d66b20312d049b683ff82 rlog-1.4.tar.gz --- rlog-1.3.7.tgz.asc DELETED --- --- rlog-gcc43_fix.diff DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 13:57:26 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 13:57:26 GMT Subject: rpms/rlog/F-8 import.log, NONE, 1.1 rlog-1.4.tar.gz.asc, NONE, 1.1 .cvsignore, 1.2, 1.3 rlog.spec, 1.4, 1.5 sources, 1.2, 1.3 rlog-1.3.7.tgz.asc, 1.1, NONE Message-ID: <200807121357.m6CDvQIH024657@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/rlog/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24559/F-8 Modified Files: .cvsignore rlog.spec sources Added Files: import.log rlog-1.4.tar.gz.asc Removed Files: rlog-1.3.7.tgz.asc Log Message: Ver. 1.4 --- NEW FILE import.log --- rlog-1_4-1_fc9:F-8:rlog-1.4-1.fc9.src.rpm:1215870934 --- NEW FILE rlog-1.4.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBIVK4qWp20Ay6vTYARAkSsAJ9zp14R5x6sJLqZTZaeycgzV7vgCACfdSbb ofyhawtIVs+wdXwgy2yQfsE= =8f+3 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rlog/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Dec 2005 22:22:16 -0000 1.2 +++ .cvsignore 12 Jul 2008 13:56:20 -0000 1.3 @@ -1 +1 @@ -rlog-1.3.7.tgz +rlog-1.4.tar.gz Index: rlog.spec =================================================================== RCS file: /cvs/extras/rpms/rlog/F-8/rlog.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rlog.spec 9 Feb 2008 20:47:47 -0000 1.4 +++ rlog.spec 12 Jul 2008 13:56:20 -0000 1.5 @@ -1,16 +1,14 @@ -Name: rlog -Summary: Runtime Logging for C++ -Version: 1.3.7 -Release: 4%{?dist} -License: LGPLv21+ -Group: Development/Libraries -Url: http://arg0.net/wiki/rlog -Source0: http://arg0.net/users/vgough/download/%{name}-%{version}.tgz -Source1: http://arg0.net/users/vgough/download/%{name}-%{version}.tgz.asc -%ifarch i386 -BuildRequires: valgrind -%endif -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: rlog +Summary: Runtime Logging for C++ +Version: 1.4 +Release: 1%{?dist} +License: LGPLv21+ +Group: Development/Libraries +Url: http://arg0.net/wiki/rlog +Source0: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz +Source1: http://rlog.googlecode.com/files/%{name}-%{version}.tar.gz.asc +BuildRequires: valgrind-devel +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description RLog provides a flexible message logging facility for C++ programs and @@ -32,13 +30,7 @@ %{__rm} -rf docs/latex %build -%configure \ - --disable-static \ -%ifarch i386 - --enable-valgrind -%else - --disable-valgrind -%endif +%configure --disable-static --enable-valgrind %{__make} %{?_smp_mflags} %install @@ -57,7 +49,7 @@ %files %defattr(-,root,root,-) %{_libdir}/librlog.so.* -%doc README AUTHORS COPYING +%doc README AUTHORS COPYING %files devel %defattr(-,root,root,-) @@ -67,6 +59,21 @@ %doc docs/html docs/latex/refman.pdf %changelog +* Sat Jul 12 2008 Peter Lemenkov 1.4-1 +- Ver. 1.4 +- Dropped upstreamed patch +- Enabled valgrind on all supported platforms + +* Fri Jun 6 2008 Peter Lemenkov 1.3.7-7 +- Get rid of whitespaces (cosmetic) +- Note about patch status (applied upstream) + +* Fri Feb 22 2008 Peter Lemenkov 1.3.7-6 +- Changed source paths +- Fixed build with GCC 4.3 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.3.7-5 +- Autorebuild for GCC 4.3 * Sat Feb 9 2008 Peter Lemenkov 1.3.7-4 - Proper license header (LGPL v 2.1 or any later version) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rlog/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Dec 2005 22:22:16 -0000 1.2 +++ sources 12 Jul 2008 13:56:20 -0000 1.3 @@ -1 +1 @@ -a3bc4e4d9d2b838fdc32e6de64270b68 rlog-1.3.7.tgz +c29f74e0f50d66b20312d049b683ff82 rlog-1.4.tar.gz --- rlog-1.3.7.tgz.asc DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 14:12:42 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 14:12:42 GMT Subject: rpms/php-pear-Net-Socket/devel .cvsignore, 1.4, 1.5 php-pear-Net-Socket.spec, 1.5, 1.6 sources, 1.4, 1.5 xml2changelog, 1.1, 1.2 PHP-LICENSE-3.01, 1.1, NONE Message-ID: <200807121412.m6CECgPp031599@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-Socket/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31564 Modified Files: .cvsignore php-pear-Net-Socket.spec sources xml2changelog Removed Files: PHP-LICENSE-3.01 Log Message: update to 1.0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 May 2007 13:49:24 -0000 1.4 +++ .cvsignore 12 Jul 2008 14:12:11 -0000 1.5 @@ -1 +1 @@ -Net_Socket-1.0.8.tgz +Net_Socket-1.0.9.tgz Index: php-pear-Net-Socket.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/devel/php-pear-Net-Socket.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- php-pear-Net-Socket.spec 13 Jun 2008 21:26:11 -0000 1.5 +++ php-pear-Net-Socket.spec 12 Jul 2008 14:12:11 -0000 1.6 @@ -2,16 +2,15 @@ %define pear_name Net_Socket Name: php-pear-Net-Socket -Version: 1.0.8 -Release: 2%{?dist} +Version: 1.0.9 +Release: 1%{?dist} Summary: Network Socket Interface Summary(fr): Gestion des "sockets" r??seaux Group: Development/Libraries -License: PHP License +License: PHP URL: http://pear.php.net/package/Net_Socket Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -Source1: PHP-LICENSE-3.01 Source2: xml2changelog BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,6 @@ %prep %setup -q -c %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG -%{__install} -m 644 -c %{SOURCE1} LICENSE mv package.xml %{pear_name}-%{version}/%{pear_name}.xml @@ -85,12 +83,15 @@ %files %defattr(-,root,root,-) -%doc LICENSE CHANGELOG +%doc CHANGELOG %{pear_phpdir}/Net %{pear_xmldir}/Net_Socket.xml %changelog +* Sat Jul 12 2008 Remi Collet 1.0.9-1 +- update to 1.0.9 + * Fri Jun 13 2008 Jon Stanley - 1.0.8-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2007 13:49:24 -0000 1.4 +++ sources 12 Jul 2008 14:12:11 -0000 1.5 @@ -1 +1 @@ -52577fec2c16e891a89f208c580e0b8d Net_Socket-1.0.8.tgz +f212f6624b3623432f1ff3e6f0091ed6 Net_Socket-1.0.9.tgz Index: xml2changelog =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/devel/xml2changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xml2changelog 31 Mar 2007 05:45:54 -0000 1.1 +++ xml2changelog 12 Jul 2008 14:12:11 -0000 1.2 @@ -7,16 +7,22 @@ if (in_array("--debug", $_SERVER['argv'])) print_r($xml); if ($xml['version'] >= "2"){ // Package.xml V 2.0 - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $xml->version->release, $xml->stability->release, $xml->version->api, $xml->stability->api, $xml->date, $xml->notes); + $new=$xml->version->release; - foreach($xml->changelog->release as $rel) - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + if (isset($xml->changelog->release) && count($xml->changelog->release)) + foreach($xml->changelog->release as $rel) { + $old=$rel->version->release; + if ("$old" != "$new") { + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $rel->version->release, $rel->stability->release, $rel->version->api, $rel->stability->api, $rel->date, $rel->notes); + } + } } else { // Package.xml V 1.0 printf("* Version %s (%s) - %s\n\n%s\n\n", $xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes); --- PHP-LICENSE-3.01 DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 14:14:17 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Sat, 12 Jul 2008 14:14:17 GMT Subject: rpms/emerald/F-9 emerald-theme-manager-desktop.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 emerald.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200807121414.m6CEEHiB031697@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/emerald/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31660 Modified Files: .cvsignore emerald.spec sources Added Files: emerald-theme-manager-desktop.patch Log Message: update to 0.7.6 emerald-theme-manager-desktop.patch: --- NEW FILE emerald-theme-manager-desktop.patch --- --- emerald-0.7.6/misc/emerald-theme-manager.desktop 2008-05-31 12:05:37.000000000 +0300 +++ emerald-0.7.6/misc/emerald-theme-manager.desktop.fixed 2008-07-11 20:47:26.000000000 +0300 @@ -5,10 +5,9 @@ Name[fr]=Gestionnaire de th??mes Emerald Comment=Configure Emerald themes Comment[fr]=Configurerer les options des th??mes Emerald Icon=/usr/share/pixmaps/emerald-theme-manager-icon.png -Exec=emerald-theme-manager Terminal=false Type=Application -Categories=Settings; -Exec=emerald-theme-manager -i +Categories=Settings;DesktopSettings +Exec=emerald-theme-manager -i %f MimeType=application/x-emerald-theme; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/emerald/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 20 May 2008 20:48:47 -0000 1.11 +++ .cvsignore 12 Jul 2008 14:13:24 -0000 1.12 @@ -1,10 +1 @@ -emerald-0.1.2.tar.bz2 -emerald-0.1.3.tar.bz2 -emerald-0.1.4.tar.bz2 -emerald-0.1.99.2.tar.bz2 -emerald-0.1.9999.1.tar.bz2 -emerald-0.1.9999.2.tar.bz2 -emerald-0.2.0.tar.bz2 -emerald-0.2.1.tar.bz2 -emerald-0.5.2.tar.bz2 -emerald-0.7.2.tar.bz2 +emerald-0.7.6.tar.bz2 Index: emerald.spec =================================================================== RCS file: /cvs/pkgs/rpms/emerald/F-9/emerald.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- emerald.spec 20 May 2008 20:48:47 -0000 1.17 +++ emerald.spec 12 Jul 2008 14:13:24 -0000 1.18 @@ -2,12 +2,13 @@ Url: http://www.compiz-fusion.org/ License: GPLv2 Group: User Interface/Desktops -Version: 0.7.2 +Version: 0.7.6 Release: 1%{?dist} Summary: Themeable window decorator and compositing manager for Compiz Fusion BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2 +Patch0: emerald-theme-manager-desktop.patch # libdrm is not available on these arches ExcludeArch: s390 s390x @@ -40,16 +41,14 @@ %prep %setup -q -# Should only have one Exec line in a desktop file... -perl -pi -e 's|Exec=emerald-theme-manager -i|###|g' misc/emerald-theme-manager.desktop -# Death to rpaths... -perl -pi -e 's|hardcode_into_libs=.*|hardcode_into_libs=no|g' configure -perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' configure -perl -pi -e 's|runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' configure - +#fix menu entries +#https://bugzilla.redhat.com/show_bug.cgi?id=286141 +%patch0 -p1 -b .fixed %build %configure --enable-librsvg --disable-mime-update +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -103,10 +102,13 @@ %{_libdir}/libemeraldengine.so %changelog -* Tue May 20 2008 Jarod Wilson 0.7.2-1 -- Update to emerald packages matching F9 compiz (#447608) +* Fri Jul 11 2008 Nikolay Vladimirov - 0.7.6-1 +- new upstream release +- removed gcc43 patch(upstream) +- added .desktop file patch(fixes bz 286141) +- spec file clean up -* Tue Feb 19 2008 Fedora Release Engineering 0.5.2-4 +* Tue Feb 19 2008 Fedora Release Engineering - 0.5.2-4 - Autorebuild for GCC 4.3 * Fri Jan 04 2008 Adel Gadllah 0.5.2-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emerald/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 May 2008 20:48:47 -0000 1.11 +++ sources 12 Jul 2008 14:13:24 -0000 1.12 @@ -1 +1 @@ -c0cf8304a633985a438b2aea102ff4dd emerald-0.7.2.tar.bz2 +340f4dafde5d6c55bd05c0033aa7d6fe emerald-0.7.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 12 14:23:31 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 14:23:31 GMT Subject: rpms/php-pear-Net-Socket/F-9 php-pear-Net-Socket.spec, 1.4, 1.5 sources, 1.4, 1.5 xml2changelog, 1.1, 1.2 PHP-LICENSE-3.01, 1.1, NONE Message-ID: <200807121423.m6CENVkh032181@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-Socket/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32020 Modified Files: php-pear-Net-Socket.spec sources xml2changelog Removed Files: PHP-LICENSE-3.01 Log Message: update to 1.0.9 Index: php-pear-Net-Socket.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/F-9/php-pear-Net-Socket.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- php-pear-Net-Socket.spec 8 May 2007 13:49:24 -0000 1.4 +++ php-pear-Net-Socket.spec 12 Jul 2008 14:22:21 -0000 1.5 @@ -2,16 +2,15 @@ %define pear_name Net_Socket Name: php-pear-Net-Socket -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} Summary: Network Socket Interface Summary(fr): Gestion des "sockets" r??seaux Group: Development/Libraries -License: PHP License +License: PHP URL: http://pear.php.net/package/Net_Socket Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -Source1: PHP-LICENSE-3.01 Source2: xml2changelog BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,6 @@ %prep %setup -q -c %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG -%{__install} -m 644 -c %{SOURCE1} LICENSE mv package.xml %{pear_name}-%{version}/%{pear_name}.xml @@ -85,12 +83,18 @@ %files %defattr(-,root,root,-) -%doc LICENSE CHANGELOG +%doc CHANGELOG %{pear_phpdir}/Net %{pear_xmldir}/Net_Socket.xml %changelog +* Sat Jul 12 2008 Remi Collet 1.0.9-1 +- update to 1.0.9 + +* Fri Jun 13 2008 Jon Stanley - 1.0.8-2 +- Rebuild + * Tue May 08 2007 Remi Collet 1.0.8-1 - update to 1.0.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2007 13:49:24 -0000 1.4 +++ sources 12 Jul 2008 14:22:21 -0000 1.5 @@ -1 +1 @@ -52577fec2c16e891a89f208c580e0b8d Net_Socket-1.0.8.tgz +f212f6624b3623432f1ff3e6f0091ed6 Net_Socket-1.0.9.tgz Index: xml2changelog =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/F-9/xml2changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xml2changelog 31 Mar 2007 05:45:54 -0000 1.1 +++ xml2changelog 12 Jul 2008 14:22:21 -0000 1.2 @@ -7,16 +7,22 @@ if (in_array("--debug", $_SERVER['argv'])) print_r($xml); if ($xml['version'] >= "2"){ // Package.xml V 2.0 - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $xml->version->release, $xml->stability->release, $xml->version->api, $xml->stability->api, $xml->date, $xml->notes); + $new=$xml->version->release; - foreach($xml->changelog->release as $rel) - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + if (isset($xml->changelog->release) && count($xml->changelog->release)) + foreach($xml->changelog->release as $rel) { + $old=$rel->version->release; + if ("$old" != "$new") { + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $rel->version->release, $rel->stability->release, $rel->version->api, $rel->stability->api, $rel->date, $rel->notes); + } + } } else { // Package.xml V 1.0 printf("* Version %s (%s) - %s\n\n%s\n\n", $xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes); --- PHP-LICENSE-3.01 DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 14:31:56 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Sat, 12 Jul 2008 14:31:56 GMT Subject: rpms/emerald/F-8 emerald-theme-manager-desktop.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 emerald.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200807121431.m6CEVufW000569@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/emerald/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv405 Modified Files: .cvsignore emerald.spec sources Added Files: emerald-theme-manager-desktop.patch Log Message: Update to 0.7.6 emerald-theme-manager-desktop.patch: --- NEW FILE emerald-theme-manager-desktop.patch --- --- emerald-0.7.6/misc/emerald-theme-manager.desktop 2008-05-31 12:05:37.000000000 +0300 +++ emerald-0.7.6/misc/emerald-theme-manager.desktop.fixed 2008-07-11 20:47:26.000000000 +0300 @@ -5,10 +5,9 @@ Name[fr]=Gestionnaire de th??mes Emerald Comment=Configure Emerald themes Comment[fr]=Configurerer les options des th??mes Emerald Icon=/usr/share/pixmaps/emerald-theme-manager-icon.png -Exec=emerald-theme-manager Terminal=false Type=Application -Categories=Settings; -Exec=emerald-theme-manager -i +Categories=Settings;DesktopSettings +Exec=emerald-theme-manager -i %f MimeType=application/x-emerald-theme; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/emerald/F-8/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 8 Oct 2007 15:20:18 -0000 1.10 +++ .cvsignore 12 Jul 2008 14:31:00 -0000 1.11 @@ -1,9 +1 @@ -emerald-0.1.2.tar.bz2 -emerald-0.1.3.tar.bz2 -emerald-0.1.4.tar.bz2 -emerald-0.1.99.2.tar.bz2 -emerald-0.1.9999.1.tar.bz2 -emerald-0.1.9999.2.tar.bz2 -emerald-0.2.0.tar.bz2 -emerald-0.2.1.tar.bz2 -emerald-0.5.2.tar.bz2 +emerald-0.7.6.tar.bz2 Index: emerald.spec =================================================================== RCS file: /cvs/pkgs/rpms/emerald/F-8/emerald.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- emerald.spec 8 Oct 2007 15:35:24 -0000 1.14 +++ emerald.spec 12 Jul 2008 14:31:00 -0000 1.15 @@ -2,12 +2,13 @@ Url: http://www.compiz-fusion.org/ License: GPLv2 Group: User Interface/Desktops -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.7.6 +Release: 1%{?dist} Summary: Themeable window decorator and compositing manager for Compiz Fusion BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2 +Patch0: emerald-theme-manager-desktop.patch # libdrm is not available on these arches ExcludeArch: s390 s390x @@ -40,16 +41,14 @@ %prep %setup -q -# Should only have one Exec line in a desktop file... -perl -pi -e 's|Exec=emerald-theme-manager -i|###|g' misc/emerald-theme-manager.desktop -# Death to rpaths... -perl -pi -e 's|hardcode_into_libs=.*|hardcode_into_libs=no|g' configure -perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' configure -perl -pi -e 's|runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' configure - +#fix menu entries +#https://bugzilla.redhat.com/show_bug.cgi?id=286141 +%patch0 -p1 -b .fixed %build %configure --enable-librsvg --disable-mime-update +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -61,13 +60,6 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/emerald-theme-manager.desktop -# Fix up xy_XY to just xy -for lang in tr_TR -do - dest=$(echo ${lang} | cut -d_ -f1) - mv $RPM_BUILD_ROOT%{_datadir}/locale/${lang} \ - $RPM_BUILD_ROOT%{_datadir}/locale/${dest} -done %find_lang %{name} @@ -110,6 +102,18 @@ %{_libdir}/libemeraldengine.so %changelog +* Fri Jul 11 2008 Nikolay Vladimirov - 0.7.6-1 +- new upstream release +- removed gcc43 patch(upstream) +- added .desktop file patch(fixes bz 286141) +- spec file clean up + +* Tue Feb 19 2008 Fedora Release Engineering - 0.5.2-4 +- Autorebuild for GCC 4.3 + +* Fri Jan 04 2008 Adel Gadllah 0.5.2-3 +- Fix gcc43 build + * Mon Oct 08 2007 Jarod Wilson 0.5.2-2 - Disable ppc64 build (no compiz-devel.ppc64) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emerald/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 8 Oct 2007 15:20:18 -0000 1.10 +++ sources 12 Jul 2008 14:31:00 -0000 1.11 @@ -1 +1 @@ -149c17b0a1bddf29e1cd66d29777d96e emerald-0.5.2.tar.bz2 +340f4dafde5d6c55bd05c0033aa7d6fe emerald-0.7.6.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 12 14:32:03 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 12 Jul 2008 14:32:03 GMT Subject: rpms/php-pear-Net-Socket/F-8 php-pear-Net-Socket.spec, 1.4, 1.5 sources, 1.4, 1.5 xml2changelog, 1.1, 1.2 PHP-LICENSE-3.01, 1.1, NONE Message-ID: <200807121432.m6CEW3RX000580@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-Socket/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv402 Modified Files: php-pear-Net-Socket.spec sources xml2changelog Removed Files: PHP-LICENSE-3.01 Log Message: update to 1.0.9 Index: php-pear-Net-Socket.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/F-8/php-pear-Net-Socket.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- php-pear-Net-Socket.spec 8 May 2007 13:49:24 -0000 1.4 +++ php-pear-Net-Socket.spec 12 Jul 2008 14:31:00 -0000 1.5 @@ -2,16 +2,15 @@ %define pear_name Net_Socket Name: php-pear-Net-Socket -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} Summary: Network Socket Interface Summary(fr): Gestion des "sockets" r??seaux Group: Development/Libraries -License: PHP License +License: PHP URL: http://pear.php.net/package/Net_Socket Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -Source1: PHP-LICENSE-3.01 Source2: xml2changelog BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,6 @@ %prep %setup -q -c %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG -%{__install} -m 644 -c %{SOURCE1} LICENSE mv package.xml %{pear_name}-%{version}/%{pear_name}.xml @@ -85,12 +83,18 @@ %files %defattr(-,root,root,-) -%doc LICENSE CHANGELOG +%doc CHANGELOG %{pear_phpdir}/Net %{pear_xmldir}/Net_Socket.xml %changelog +* Sat Jul 12 2008 Remi Collet 1.0.9-1 +- update to 1.0.9 + +* Fri Jun 13 2008 Jon Stanley - 1.0.8-2 +- Rebuild + * Tue May 08 2007 Remi Collet 1.0.8-1 - update to 1.0.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2007 13:49:24 -0000 1.4 +++ sources 12 Jul 2008 14:31:00 -0000 1.5 @@ -1 +1 @@ -52577fec2c16e891a89f208c580e0b8d Net_Socket-1.0.8.tgz +f212f6624b3623432f1ff3e6f0091ed6 Net_Socket-1.0.9.tgz Index: xml2changelog =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-Socket/F-8/xml2changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xml2changelog 31 Mar 2007 05:45:54 -0000 1.1 +++ xml2changelog 12 Jul 2008 14:31:00 -0000 1.2 @@ -7,16 +7,22 @@ if (in_array("--debug", $_SERVER['argv'])) print_r($xml); if ($xml['version'] >= "2"){ // Package.xml V 2.0 - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $xml->version->release, $xml->stability->release, $xml->version->api, $xml->stability->api, $xml->date, $xml->notes); + $new=$xml->version->release; - foreach($xml->changelog->release as $rel) - printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", + if (isset($xml->changelog->release) && count($xml->changelog->release)) + foreach($xml->changelog->release as $rel) { + $old=$rel->version->release; + if ("$old" != "$new") { + printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $rel->version->release, $rel->stability->release, $rel->version->api, $rel->stability->api, $rel->date, $rel->notes); + } + } } else { // Package.xml V 1.0 printf("* Version %s (%s) - %s\n\n%s\n\n", $xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes); --- PHP-LICENSE-3.01 DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 15:03:13 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Sat, 12 Jul 2008 15:03:13 GMT Subject: rpms/rpm/devel rpm-4.5.90-digestlen.patch, NONE, 1.1 rpm.spec, 1.284, 1.285 Message-ID: <200807121503.m6CF3DEe009595@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9387 Modified Files: rpm.spec Added Files: rpm-4.5.90-digestlen.patch Log Message: Fix type mismatch causing "interesting" effects on ppc64 - patch already upstreamed, not worth pushing entire new snapshot tarball.. rpm-4.5.90-digestlen.patch: --- NEW FILE rpm-4.5.90-digestlen.patch --- diff --git a/rpmio/digest.c b/rpmio/digest.c index c360919..64b678b 100644 --- a/rpmio/digest.c +++ b/rpmio/digest.c @@ -123,7 +123,7 @@ int rpmDigestFinal(DIGEST_CTX ctx, void ** datap, size_t *lenp, int asAscii) { unsigned char * digest; - size_t digestlen; + unsigned int digestlen; if (ctx == NULL) return -1; Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- rpm.spec 11 Jul 2008 15:54:19 -0000 1.284 +++ rpm.spec 12 Jul 2008 15:02:42 -0000 1.285 @@ -18,7 +18,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.5 +Release: 0.%{snapver}.6 Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -31,6 +31,8 @@ # XXX only create provides for pkgconfig and libtool initially Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch +Patch200: rpm-4.5.90-digestlen.patch + # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD License: GPLv2+ @@ -156,6 +158,7 @@ %patch0 -p1 -b .devel-autodep %patch1 -p1 -b .pkgconfig-path %patch100 -p1 -b .pkgconfig-deps +%patch200 -p1 -b .diglen %if %{with int_bdb} ln -s db-%{bdbver} db @@ -331,6 +334,10 @@ %doc doc/librpm/html/* %changelog +* Sat Jul 12 2008 Panu Matilainen +- 4.5.90-0.git8426.6 +- fix type mismatch causing funky breakage on ppc64 + * Fri Jul 11 2008 Panu Matilainen - 4.5.90-0.git8426.5 - flip back to external bdb From fedora-extras-commits at redhat.com Sat Jul 12 15:17:07 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 15:17:07 GMT Subject: rpms/fuse-encfs/F-8 fuse-encfs.spec,1.11,1.12 Message-ID: <200807121517.m6CFH7d5010853@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10759/F-8 Modified Files: fuse-encfs.spec Log Message: Rebuild due to rlog soname bump Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/F-8/fuse-encfs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fuse-encfs.spec 6 May 2008 05:04:06 -0000 1.11 +++ fuse-encfs.spec 12 Jul 2008 15:15:37 -0000 1.12 @@ -1,6 +1,6 @@ Name: fuse-encfs Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPLv3+ Group: System Environment/Kernel @@ -56,6 +56,9 @@ %{_mandir}/man1/* %changelog +* Sat Jul 12 2008 Peter Lemenkov 1.4.2-3 +- rebuild due to rlog soname bump + * Mon May 5 2008 Tomas Hoger - 1.4.2-2 - Work-around broken boost library path auto detection causing build failures on 64-bit architectures. From fedora-extras-commits at redhat.com Sat Jul 12 15:17:11 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 15:17:11 GMT Subject: rpms/fuse-encfs/F-9 fuse-encfs.spec,1.18,1.19 Message-ID: <200807121517.m6CFHBi2010863@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10759/F-9 Modified Files: fuse-encfs.spec Log Message: Rebuild due to rlog soname bump Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/F-9/fuse-encfs.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fuse-encfs.spec 6 May 2008 05:04:18 -0000 1.18 +++ fuse-encfs.spec 12 Jul 2008 15:15:38 -0000 1.19 @@ -1,6 +1,6 @@ Name: fuse-encfs Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPLv3+ Group: System Environment/Kernel @@ -56,6 +56,9 @@ %{_mandir}/man1/* %changelog +* Sat Jul 12 2008 Peter Lemenkov 1.4.2-3 +- rebuild due to rlog soname bump + * Mon May 5 2008 Tomas Hoger - 1.4.2-2 - Work-around broken boost library path auto detection causing build failures on 64-bit architectures. From fedora-extras-commits at redhat.com Sat Jul 12 15:17:15 2008 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Sat, 12 Jul 2008 15:17:15 GMT Subject: rpms/fuse-encfs/devel fuse-encfs.spec,1.18,1.19 Message-ID: <200807121517.m6CFHFBC010870@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10759/devel Modified Files: fuse-encfs.spec Log Message: Rebuild due to rlog soname bump Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/fuse-encfs.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fuse-encfs.spec 5 May 2008 16:23:40 -0000 1.18 +++ fuse-encfs.spec 12 Jul 2008 15:16:11 -0000 1.19 @@ -1,6 +1,6 @@ Name: fuse-encfs Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPLv3+ Group: System Environment/Kernel @@ -56,6 +56,9 @@ %{_mandir}/man1/* %changelog +* Sat Jul 12 2008 Peter Lemenkov 1.4.2-3 +- rebuild due to rlog soname bump + * Mon May 5 2008 Tomas Hoger - 1.4.2-2 - Work-around broken boost library path auto detection causing build failures on 64-bit architectures. From fedora-extras-commits at redhat.com Sat Jul 12 15:38:54 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 12 Jul 2008 15:38:54 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.45, 1.46 cairo-dock.spec, 1.59, 1.60 sources, 1.45, 1.46 Message-ID: <200807121538.m6CFcsnK014393@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14295 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Sun Jul 13 2008 Mamoru Tasaka - rev. 1193 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 10 Jul 2008 17:07:17 -0000 1.45 +++ .cvsignore 12 Jul 2008 15:38:07 -0000 1.46 @@ -1 +1 @@ -cairo-dock-sources-svn1188_trunk.tar.bz2 +cairo-dock-sources-svn1193_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- cairo-dock.spec 10 Jul 2008 19:59:16 -0000 1.59 +++ cairo-dock.spec 12 Jul 2008 15:38:07 -0000 1.60 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1188_trunk +%define tarballver svn1193_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -510,8 +510,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Thu Jul 10 2008 Mamoru Tasaka -- rev. 1185 +* Sun Jul 13 2008 Mamoru Tasaka +- rev. 1193 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 10 Jul 2008 17:07:17 -0000 1.45 +++ sources 12 Jul 2008 15:38:07 -0000 1.46 @@ -1 +1 @@ -2d8c4e957b2c359dff5541584b7c1709 cairo-dock-sources-svn1188_trunk.tar.bz2 +0d6df057b1a2c1b66ef0bab7092d6f5d cairo-dock-sources-svn1193_trunk.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 12 15:58:30 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Sat, 12 Jul 2008 15:58:30 GMT Subject: rpms/roadstencil-fonts/devel roadstencil-fontconfig.conf, NONE, 1.1 roadstencil-fonts.spec, 1.1, 1.2 Message-ID: <200807121558.m6CFwUFB018169@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/roadstencil-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17846 Modified Files: roadstencil-fonts.spec Added Files: roadstencil-fontconfig.conf Log Message: add fontconfig file (#445136) --- NEW FILE roadstencil-fontconfig.conf --- fantasy roadstencil Index: roadstencil-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/roadstencil-fonts/devel/roadstencil-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- roadstencil-fonts.spec 5 May 2008 06:53:25 -0000 1.1 +++ roadstencil-fonts.spec 12 Jul 2008 15:57:30 -0000 1.2 @@ -4,13 +4,14 @@ Name: %{fontname}-fonts Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Roadstencil Fonts Group: User Interface/X License: OFL URL: http://openfontlibrary.org/media/files/andyfitz/237 Source0: http://openfontlibrary.org/people/andyfitz/andyfitz_-_roadstencil.otf +Source1: %{fontname}-fontconfig.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -31,6 +32,7 @@ install -pm 644 *.otf $RPM_BUILD_ROOT%{fontdir} install -dm 755 $RPM_BUILD_ROOT%{fontconfdir} +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/63-%{fontname}.conf %clean @@ -56,6 +58,9 @@ %changelog +* Sat Jul 12 2008 Jon Stanley - 1.0-3 +- Add fontconfig file (#445136) + * Sun May 04 2008 Jon Stanley - 1.0-2 - Correct source From fedora-extras-commits at redhat.com Sat Jul 12 16:40:22 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 12 Jul 2008 16:40:22 GMT Subject: rpms/munin/devel munin-1.2.6-postfix-config, NONE, 1.1 munin.spec, 1.15, 1.16 Message-ID: <200807121640.m6CGeMJZ028508@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/munin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28466 Modified Files: munin.spec Added Files: munin-1.2.6-postfix-config Log Message: Apply postfix patch (fixes #454159) Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923) --- NEW FILE munin-1.2.6-postfix-config --- [postfix*] user root env.logfile maillog env.logdir /var/log Index: munin.spec =================================================================== RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- munin.spec 25 Jun 2008 21:42:17 -0000 1.15 +++ munin.spec 12 Jul 2008 16:39:38 -0000 1.16 @@ -1,6 +1,6 @@ Name: munin Version: 1.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-wide graphing framework (grapher/gatherer) License: GPLv2 and Bitstream Vera Group: System Environment/Daemons @@ -14,16 +14,17 @@ Source3: munin-node.logrotate Source4: munin.logrotate Source5: nf_conntrack +Source6: munin-1.2.6-postfix-config Patch1: munin-1.2.4-conf.patch Patch2: munin-1.2.5-nf-conntrack.patch Patch3: munin-1.2.5-amp-degree.patch Patch4: munin-1.2.6-ntp_offset.patch BuildArchitectures: noarch -Requires: perl-HTML-Template Requires: perl-Net-Server perl-Net-SNMP Requires: rrdtool Requires: logrotate Requires(pre): shadow-utils +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Munin is a highly flexible and powerful solution used to create graphs of @@ -49,6 +50,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description node Munin is a highly flexible and powerful solution used to create graphs of @@ -137,6 +139,8 @@ install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin # install config for nf_conntrack install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack +# install config for postfix under fedora +install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix # fix MUNIN_LIBDIR issue. sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/ps_ @@ -217,6 +221,7 @@ %config(noreplace) /etc/munin/plugin-conf.d/sendmail %config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl %config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack +%config(noreplace) /etc/munin/plugin-conf.d/postfix %config(noreplace) /etc/logrotate.d/munin-node /etc/rc.d/init.d/munin-node %{_sbindir}/munin-run @@ -236,6 +241,10 @@ %doc %{_mandir}/man5/munin-node* %changelog +* Sat Jul 12 2008 Kevin Fenzi - 1.2.6-2 +- Apply postfix patch (fixes #454159) +- Add perl version dep and remove unneeded perl-HTML-Template (fixes #453923) + * Fri Jun 20 2008 Kevin Fenzi - 1.2.6-1 - Upgrade to 1.2.6 From fedora-extras-commits at redhat.com Sat Jul 12 16:56:00 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 12 Jul 2008 16:56:00 GMT Subject: rpms/tlock/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200807121656.m6CGu0iO029270@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29106 Modified Files: .cvsignore sources Log Message: ---------------------------------------------------------------------- Committing in . P J P Sat Jul 12 22:23:06 IST 2008 Modified Files: .cvsignore: sources : Fixed the bug (https://bugzilla.redhat.com/show_bug.cgi?id=454361) and checking in the new version tlock-1.4 ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tlock/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2008 06:51:48 -0000 1.2 +++ .cvsignore 12 Jul 2008 16:55:09 -0000 1.3 @@ -1 +1 @@ -tlock-1.3.tar.gz +tlock-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 06:51:48 -0000 1.2 +++ sources 12 Jul 2008 16:55:09 -0000 1.3 @@ -1 +1 @@ -43d9b3b09224e21947b15d3d96505128 tlock-1.3.tar.gz +3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz From fedora-extras-commits at redhat.com Sat Jul 12 17:04:49 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 12 Jul 2008 17:04:49 GMT Subject: rpms/tlock/devel tlock.spec,1.1,1.2 Message-ID: <200807121704.m6CH4nK4004059@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3900 Modified Files: tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sat Jul 12 22:33:28 IST 2008 Modified Files: tlock.spec: changed to use tlock-1.4 ---------------------------------------------------------------------- Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/devel/tlock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tlock.spec 18 Jun 2008 06:51:48 -0000 1.1 +++ tlock.spec 12 Jul 2008 17:04:01 -0000 1.2 @@ -1,5 +1,5 @@ Name: tlock -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Terminal lock @@ -72,6 +72,10 @@ %_mandir/man3/* %changelog +* Sat Jul 12 2008 _pjp_ - 1.4-1 +- Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek + (xjakub at fi.muni.cz) + * Thu May 29 2008 _pjp_ - 1.3-1 - The new tlock version 1.3 for the last change in the texinfo source. From fedora-extras-commits at redhat.com Sat Jul 12 17:12:16 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Sat, 12 Jul 2008 17:12:16 GMT Subject: rpms/roadstencil-fonts/devel roadstencil-fonts.spec,1.2,1.3 Message-ID: <200807121712.m6CHCG4H005083@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/roadstencil-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4951 Modified Files: roadstencil-fonts.spec Log Message: actually package the fontconfig file Index: roadstencil-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/roadstencil-fonts/devel/roadstencil-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- roadstencil-fonts.spec 12 Jul 2008 15:57:30 -0000 1.2 +++ roadstencil-fonts.spec 12 Jul 2008 17:11:20 -0000 1.3 @@ -4,7 +4,7 @@ Name: %{fontname}-fonts Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Roadstencil Fonts Group: User Interface/X @@ -55,9 +55,13 @@ %doc %dir %{fontdir}/ %{fontdir}/*.otf +%config(noreplace) %{fontconfdir}/63-%{fontname}.conf %changelog +* Sat Jul 12 2008 Jon Stanley - 1.0-4 +- fix build failure from previous + * Sat Jul 12 2008 Jon Stanley - 1.0-3 - Add fontconfig file (#445136) From fedora-extras-commits at redhat.com Sat Jul 12 17:20:29 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 12 Jul 2008 17:20:29 GMT Subject: rpms/tlock/F-8 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 tlock.spec, 1.1, 1.2 Message-ID: <200807121720.m6CHKTkY006000@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5533 Modified Files: .cvsignore sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sat Jul 12 22:48:48 IST 2008 Modified Files: .cvsignore: sources : tlock.spec: Changed to build the new version tlock-1.4 ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:08:23 -0000 1.1 +++ .cvsignore 12 Jul 2008 17:19:33 -0000 1.2 @@ -0,0 +1 @@ +tlock-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 07:15:35 -0000 1.2 +++ sources 12 Jul 2008 17:19:33 -0000 1.3 @@ -1 +1 @@ -43d9b3b09224e21947b15d3d96505128 tlock-1.3.tar.gz +3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-8/tlock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tlock.spec 18 Jun 2008 07:15:35 -0000 1.1 +++ tlock.spec 12 Jul 2008 17:19:33 -0000 1.2 @@ -1,5 +1,5 @@ Name: tlock -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Terminal lock @@ -72,6 +72,10 @@ %_mandir/man3/* %changelog +* Sat Jul 12 2008 _pjp_ - 1.4-1 +- Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek + (xjakub at fi.muni.cz) + * Thu May 29 2008 _pjp_ - 1.3-1 - The new tlock version 1.3 for the last change in the texinfo source. From fedora-extras-commits at redhat.com Sat Jul 12 17:25:57 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 12 Jul 2008 17:25:57 GMT Subject: rpms/jd/F-9 .cvsignore, 1.265, 1.266 jd.spec, 1.302, 1.303 sources, 1.266, 1.267 Message-ID: <200807121725.m6CHPv1B006754@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6523/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Jul 13 2008 Mamoru Tasaka - rev 2196 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- .cvsignore 11 Jul 2008 18:21:02 -0000 1.265 +++ .cvsignore 12 Jul 2008 17:24:52 -0000 1.266 @@ -1 +1 @@ -jd-2.0.0-svn2191_trunk.tgz +jd-2.0.0-svn2196_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- jd.spec 11 Jul 2008 18:21:02 -0000 1.302 +++ jd.spec 12 Jul 2008 17:24:52 -0000 1.303 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2191_trunk +%define strtag svn2196_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sat Jul 12 2008 Mamoru Tasaka -- rev 2191 +* Sun Jul 13 2008 Mamoru Tasaka +- rev 2196 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- sources 11 Jul 2008 18:21:02 -0000 1.266 +++ sources 12 Jul 2008 17:24:52 -0000 1.267 @@ -1 +1 @@ -d26aee52a9e64eb3fca369cc2cb0148f jd-2.0.0-svn2191_trunk.tgz +8c2b1435ad16ee8858cd390f3fe70c9e jd-2.0.0-svn2196_trunk.tgz From fedora-extras-commits at redhat.com Sat Jul 12 17:26:22 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 12 Jul 2008 17:26:22 GMT Subject: rpms/jd/F-8 .cvsignore, 1.258, 1.259 jd.spec, 1.291, 1.292 sources, 1.259, 1.260 Message-ID: <200807121726.m6CHQMRR006784@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6523/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Jul 13 2008 Mamoru Tasaka - rev 2196 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- .cvsignore 11 Jul 2008 18:20:41 -0000 1.258 +++ .cvsignore 12 Jul 2008 17:24:10 -0000 1.259 @@ -1 +1 @@ -jd-2.0.0-svn2191_trunk.tgz +jd-2.0.0-svn2196_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- jd.spec 11 Jul 2008 18:20:41 -0000 1.291 +++ jd.spec 12 Jul 2008 17:24:10 -0000 1.292 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2191_trunk +%define strtag svn2196_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sat Jul 12 2008 Mamoru Tasaka -- rev 2191 +* Sun Jul 13 2008 Mamoru Tasaka +- rev 2196 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- sources 11 Jul 2008 18:20:41 -0000 1.259 +++ sources 12 Jul 2008 17:24:10 -0000 1.260 @@ -1 +1 @@ -d26aee52a9e64eb3fca369cc2cb0148f jd-2.0.0-svn2191_trunk.tgz +8c2b1435ad16ee8858cd390f3fe70c9e jd-2.0.0-svn2196_trunk.tgz From fedora-extras-commits at redhat.com Sat Jul 12 17:26:25 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 12 Jul 2008 17:26:25 GMT Subject: rpms/jd/devel .cvsignore, 1.265, 1.266 jd.spec, 1.308, 1.309 sources, 1.266, 1.267 Message-ID: <200807121726.m6CHQPWY006794@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6523/devel Modified Files: .cvsignore jd.spec sources Log Message: * Sun Jul 13 2008 Mamoru Tasaka - rev 2196 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- .cvsignore 11 Jul 2008 18:21:19 -0000 1.265 +++ .cvsignore 12 Jul 2008 17:25:27 -0000 1.266 @@ -1 +1 @@ -jd-2.0.0-svn2191_trunk.tgz +jd-2.0.0-svn2196_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- jd.spec 11 Jul 2008 18:21:19 -0000 1.308 +++ jd.spec 12 Jul 2008 17:25:27 -0000 1.309 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2191_trunk +%define strtag svn2196_trunk %define repoid 31825 # Define this if this is pre-version %define pre_release 1 @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sat Jul 12 2008 Mamoru Tasaka -- rev 2191 +* Sun Jul 13 2008 Mamoru Tasaka +- rev 2196 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- sources 11 Jul 2008 18:21:19 -0000 1.266 +++ sources 12 Jul 2008 17:25:27 -0000 1.267 @@ -1 +1 @@ -d26aee52a9e64eb3fca369cc2cb0148f jd-2.0.0-svn2191_trunk.tgz +8c2b1435ad16ee8858cd390f3fe70c9e jd-2.0.0-svn2196_trunk.tgz From fedora-extras-commits at redhat.com Sat Jul 12 17:36:29 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 12 Jul 2008 17:36:29 GMT Subject: rpms/tlock/F-9 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 tlock.spec, 1.1, 1.2 Message-ID: <200807121736.m6CHaTLs007768@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7620 Modified Files: .cvsignore sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sat Jul 12 23:04:33 IST 2008 Modified Files: .cvsignore: sources : tlock.spec: Fixed the bug https://bugzilla.redhat.com/show_bug.cgi?id=454361 and updated to the new version tlock-1.4. ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:08:23 -0000 1.1 +++ .cvsignore 12 Jul 2008 17:35:41 -0000 1.2 @@ -0,0 +1 @@ +tlock-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 07:27:39 -0000 1.2 +++ sources 12 Jul 2008 17:35:41 -0000 1.3 @@ -1 +1 @@ -43d9b3b09224e21947b15d3d96505128 tlock-1.3.tar.gz +3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-9/tlock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tlock.spec 18 Jun 2008 07:27:39 -0000 1.1 +++ tlock.spec 12 Jul 2008 17:35:41 -0000 1.2 @@ -1,5 +1,5 @@ Name: tlock -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Terminal lock @@ -72,6 +72,10 @@ %_mandir/man3/* %changelog +* Sat Jul 12 2008 _pjp_ - 1.4-1 +- Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek + (xjakub at fi.muni.cz) + * Thu May 29 2008 _pjp_ - 1.3-1 - The new tlock version 1.3 for the last change in the texinfo source. From fedora-extras-commits at redhat.com Sat Jul 12 17:47:59 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Sat, 12 Jul 2008 17:47:59 GMT Subject: rpms/npush/devel npush-0.7-level.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 npush.spec, 1.1, 1.2 sources, 1.2, 1.3 npush-0.6-level-svn.patch, 1.1, NONE npush.desktop, 1.1, NONE npush.png, 1.1, NONE Message-ID: <200807121747.m6CHlxR4008233@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/npush/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8148 Modified Files: .cvsignore npush.spec sources Added Files: npush-0.7-level.patch Removed Files: npush-0.6-level-svn.patch npush.desktop npush.png Log Message: Update to 0.7 and other changes npush-0.7-level.patch: --- NEW FILE npush-0.7-level.patch --- --- npush.cpp 2008-06-24 20:15:10.000000000 +0200 +++ npush.cpp.patch 2008-07-12 19:06:35.000000000 +0200 @@ -602,7 +602,7 @@ players.clear (); mapM.clear (); goldNeededM = 0; - std::string fileName = "levels/" + name; + std::string fileName = "/usr/share/npush/levels/" + name; FILE *fp = fopen (fileName.c_str (), "rb"); if (!fp) { Message ("Cannot open level file!"); @@ -757,7 +757,7 @@ */ std::set < std::string > files; DIR * - dir = opendir ("levels"); + dir = opendir ("/usr/share/npush/levels"); if (!dir) { Message ("Cannot read levels from directory"); return; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/npush/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jul 2008 18:18:25 -0000 1.2 +++ .cvsignore 12 Jul 2008 17:47:14 -0000 1.3 @@ -1 +1 @@ -npush-0.6.tgz +npush-0.7.tgz Index: npush.spec =================================================================== RCS file: /cvs/pkgs/rpms/npush/devel/npush.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- npush.spec 9 Jul 2008 18:18:25 -0000 1.1 +++ npush.spec 12 Jul 2008 17:47:14 -0000 1.2 @@ -1,17 +1,14 @@ Name: npush -Version: 0.6 +Version: 0.7 Release: 1%{?dist} -Summary: A logic game similar to Sokoba +Summary: A logic game similar to Sokoban Group: Amusements/Games License: GPLv2+ URL: http://npush.sourceforge.net/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -# self made icon and .desktop file -Source1: %{name}.desktop -Source2: %{name}.png -# patch npush.cpp to svn version to fix an issue with level selector -Patch: npush-0.6-level-svn.patch +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +# patch npush.cpp to fix an issue with level path +Patch0: npush-0.7-level.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel desktop-file-utils @@ -30,11 +27,11 @@ %prep %setup -q -%patch -p0 +%patch0 -p0 %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" %install @@ -44,16 +41,18 @@ install -p -m 755 npush %{buildroot}%{_bindir}/npush mkdir -p %{buildroot}%{_datadir}/npush -cp -ra Level* %{buildroot}%{_datadir}/npush +cp -ra levels* %{buildroot}%{_datadir}/npush # desktop file stuff -desktop-file-install --vendor="fedora" \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} +desktop-file-install --vendor="fedora" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + %{name}.desktop + # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -install -p -m 0644 %{SOURCE2} \ +install -p -m 0644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -77,12 +76,18 @@ %files %defattr(-,root,root,-) -%doc readme.txt +%doc CHANGES COPYING CREDITS readme.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sat Jul 12 2008 Stefan Posdzich - 0.7-1 +- Update to 0.7 +- Upstream now ships our .desktop an icon file +- Add npush-0.7-level.patch to fix level path +- Remove obsolete npush-0.6-level-svn.patch + * Mon Jul 07 2008 Stefan Posdzich - 0.6-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/npush/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jul 2008 18:18:25 -0000 1.2 +++ sources 12 Jul 2008 17:47:14 -0000 1.3 @@ -1 +1 @@ -6670aac74dd7db005462c11c5688db52 npush-0.6.tgz +e39180c6ec228ebafb91ff2921f7bdcc npush-0.7.tgz --- npush-0.6-level-svn.patch DELETED --- --- npush.desktop DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 17:48:23 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sat, 12 Jul 2008 17:48:23 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git10.bz2.sign, NONE, 1.1 .cvsignore, 1.860, 1.861 kernel.spec, 1.754, 1.755 sources, 1.821, 1.822 upstream, 1.739, 1.740 patch-2.6.26-rc9-git9.bz2.sign, 1.1, NONE Message-ID: <200807121748.m6CHmN8C008260@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8199 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git10.bz2.sign Removed Files: patch-2.6.26-rc9-git9.bz2.sign Log Message: 2.6.26-rc9-git10 --- NEW FILE patch-2.6.26-rc9-git10.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIeFaxyGugalF9Dw4RAnrfAJ9mPpabI0sv44P21i8yOt+70yWkXgCZAYpk 0j6TrAIhIMFR9n9QpVV7s34= =FGI2 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.860 retrieving revision 1.861 diff -u -r1.860 -r1.861 --- .cvsignore 11 Jul 2008 19:41:33 -0000 1.860 +++ .cvsignore 12 Jul 2008 17:47:31 -0000 1.861 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git9.bz2 +patch-2.6.26-rc9-git10.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.754 retrieving revision 1.755 diff -u -r1.754 -r1.755 --- kernel.spec 12 Jul 2008 00:14:30 -0000 1.754 +++ kernel.spec 12 Jul 2008 17:47:31 -0000 1.755 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 9 +%define gitrev 10 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Sat Jul 12 2008 Dave Jones +- 2.6.26-rc9-git10 + * Fri Jul 11 2008 Roland McGrath - utrace update Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.821 retrieving revision 1.822 diff -u -r1.821 -r1.822 --- sources 11 Jul 2008 19:41:33 -0000 1.821 +++ sources 12 Jul 2008 17:47:31 -0000 1.822 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -7605343bcae27318b3e63cd44eeeb4f1 patch-2.6.26-rc9-git9.bz2 +6b8f3c410de7c48e4c457ddcc854983d patch-2.6.26-rc9-git10.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.739 retrieving revision 1.740 diff -u -r1.739 -r1.740 --- upstream 11 Jul 2008 19:41:33 -0000 1.739 +++ upstream 12 Jul 2008 17:47:31 -0000 1.740 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git9.bz2 +patch-2.6.26-rc9-git10.bz2 --- patch-2.6.26-rc9-git9.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 17:51:15 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 12 Jul 2008 17:51:15 GMT Subject: rpms/tlock/EL-4 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 tlock.spec, 1.1, 1.2 Message-ID: <200807121751.m6CHpFQ2008420@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8266 Modified Files: .cvsignore sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sat Jul 12 23:19:03 IST 2008 Modified Files: .cvsignore: sources : tlock.spec: Fixed the bug https://bugzilla.redhat.com/show_bug.cgi?id=454361 and changed to build the new version tlock-1.4 ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:08:23 -0000 1.1 +++ .cvsignore 12 Jul 2008 17:50:24 -0000 1.2 @@ -0,0 +1 @@ +tlock-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 07:11:16 -0000 1.2 +++ sources 12 Jul 2008 17:50:24 -0000 1.3 @@ -1 +1 @@ -43d9b3b09224e21947b15d3d96505128 tlock-1.3.tar.gz +3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-4/tlock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tlock.spec 18 Jun 2008 07:11:16 -0000 1.1 +++ tlock.spec 12 Jul 2008 17:50:24 -0000 1.2 @@ -1,5 +1,5 @@ Name: tlock -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Terminal lock @@ -72,6 +72,10 @@ %_mandir/man3/* %changelog +* Sat Jul 12 2008 _pjp_ - 1.4-1 +- Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek + (xjakub at fi.muni.cz) + * Thu May 29 2008 _pjp_ - 1.3-1 - The new tlock version 1.3 for the last change in the texinfo source. From fedora-extras-commits at redhat.com Sat Jul 12 17:57:29 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 12 Jul 2008 17:57:29 GMT Subject: rpms/tlock/EL-5 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 tlock.spec, 1.1, 1.2 Message-ID: <200807121757.m6CHvTM7008672@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8547 Modified Files: .cvsignore sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sat Jul 12 23:25:24 IST 2008 Modified Files: .cvsignore: sources : tlock.spec: Fixed the bug https://bugzilla.redhat.com/show_bug.cgi?id=454361 and changed to build the new version tlock-1.4. ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:08:23 -0000 1.1 +++ .cvsignore 12 Jul 2008 17:56:38 -0000 1.2 @@ -0,0 +1 @@ +tlock-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 16:58:12 -0000 1.2 +++ sources 12 Jul 2008 17:56:38 -0000 1.3 @@ -1 +1 @@ -43d9b3b09224e21947b15d3d96505128 tlock-1.3.tar.gz +3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-5/tlock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tlock.spec 19 Jun 2008 16:58:12 -0000 1.1 +++ tlock.spec 12 Jul 2008 17:56:38 -0000 1.2 @@ -1,5 +1,5 @@ Name: tlock -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Terminal lock @@ -72,6 +72,10 @@ %_mandir/man3/* %changelog +* Sat Jul 12 2008 _pjp_ - 1.4-1 +- Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek + (xjakub at fi.muni.cz) + * Thu May 29 2008 _pjp_ - 1.3-1 - The new tlock version 1.3 for the last change in the texinfo source. From fedora-extras-commits at redhat.com Sat Jul 12 17:59:20 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Sat, 12 Jul 2008 17:59:20 GMT Subject: rpms/npush/F-8 npush-0.7-level.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 npush.spec, 1.1, 1.2 sources, 1.2, 1.3 npush-0.6-level-svn.patch, 1.1, NONE npush.desktop, 1.1, NONE npush.png, 1.1, NONE Message-ID: <200807121759.m6CHxKjj008780@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/npush/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8735 Modified Files: .cvsignore npush.spec sources Added Files: npush-0.7-level.patch Removed Files: npush-0.6-level-svn.patch npush.desktop npush.png Log Message: Update to 0.7 and other changes npush-0.7-level.patch: --- NEW FILE npush-0.7-level.patch --- --- npush.cpp 2008-06-24 20:15:10.000000000 +0200 +++ npush.cpp.patch 2008-07-12 19:06:35.000000000 +0200 @@ -602,7 +602,7 @@ players.clear (); mapM.clear (); goldNeededM = 0; - std::string fileName = "levels/" + name; + std::string fileName = "/usr/share/npush/levels/" + name; FILE *fp = fopen (fileName.c_str (), "rb"); if (!fp) { Message ("Cannot open level file!"); @@ -757,7 +757,7 @@ */ std::set < std::string > files; DIR * - dir = opendir ("levels"); + dir = opendir ("/usr/share/npush/levels"); if (!dir) { Message ("Cannot read levels from directory"); return; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:59:33 -0000 1.1 +++ .cvsignore 12 Jul 2008 17:58:30 -0000 1.2 @@ -0,0 +1 @@ +npush-0.7.tgz Index: npush.spec =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-8/npush.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- npush.spec 9 Jul 2008 18:48:39 -0000 1.1 +++ npush.spec 12 Jul 2008 17:58:30 -0000 1.2 @@ -1,17 +1,14 @@ Name: npush -Version: 0.6 +Version: 0.7 Release: 1%{?dist} -Summary: A logic game similar to Sokoba +Summary: A logic game similar to Sokoban Group: Amusements/Games License: GPLv2+ URL: http://npush.sourceforge.net/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -# self made icon and .desktop file -Source1: %{name}.desktop -Source2: %{name}.png -# patch npush.cpp to svn version to fix an issue with level selector -Patch: npush-0.6-level-svn.patch +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +# patch npush.cpp to fix an issue with level path +Patch0: npush-0.7-level.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel desktop-file-utils @@ -30,11 +27,11 @@ %prep %setup -q -%patch -p0 +%patch0 -p0 %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" %install @@ -44,16 +41,18 @@ install -p -m 755 npush %{buildroot}%{_bindir}/npush mkdir -p %{buildroot}%{_datadir}/npush -cp -ra Level* %{buildroot}%{_datadir}/npush +cp -ra levels* %{buildroot}%{_datadir}/npush # desktop file stuff -desktop-file-install --vendor="fedora" \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} +desktop-file-install --vendor="fedora" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + %{name}.desktop + # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -install -p -m 0644 %{SOURCE2} \ +install -p -m 0644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -77,12 +76,18 @@ %files %defattr(-,root,root,-) -%doc readme.txt +%doc CHANGES COPYING CREDITS readme.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sat Jul 12 2008 Stefan Posdzich - 0.7-1 +- Update to 0.7 +- Upstream now ships our .desktop an icon file +- Add npush-0.7-level.patch to fix level path +- Remove obsolete npush-0.6-level-svn.patch + * Mon Jul 07 2008 Stefan Posdzich - 0.6-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jul 2008 18:48:39 -0000 1.2 +++ sources 12 Jul 2008 17:58:30 -0000 1.3 @@ -1 +1 @@ -6670aac74dd7db005462c11c5688db52 npush-0.6.tgz +e39180c6ec228ebafb91ff2921f7bdcc npush-0.7.tgz --- npush-0.6-level-svn.patch DELETED --- --- npush.desktop DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 18:07:17 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Sat, 12 Jul 2008 18:07:17 GMT Subject: rpms/npush/F-9 npush-0.7-level.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 npush.spec, 1.1, 1.2 sources, 1.2, 1.3 npush-0.6-level-svn.patch, 1.1, NONE npush.desktop, 1.1, NONE npush.png, 1.1, NONE Message-ID: <200807121807.m6CI7H9u015638@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/npush/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15578 Modified Files: .cvsignore npush.spec sources Added Files: npush-0.7-level.patch Removed Files: npush-0.6-level-svn.patch npush.desktop npush.png Log Message: Update to 0.7 and other changes npush-0.7-level.patch: --- NEW FILE npush-0.7-level.patch --- --- npush.cpp 2008-06-24 20:15:10.000000000 +0200 +++ npush.cpp.patch 2008-07-12 19:06:35.000000000 +0200 @@ -602,7 +602,7 @@ players.clear (); mapM.clear (); goldNeededM = 0; - std::string fileName = "levels/" + name; + std::string fileName = "/usr/share/npush/levels/" + name; FILE *fp = fopen (fileName.c_str (), "rb"); if (!fp) { Message ("Cannot open level file!"); @@ -757,7 +757,7 @@ */ std::set < std::string > files; DIR * - dir = opendir ("levels"); + dir = opendir ("/usr/share/npush/levels"); if (!dir) { Message ("Cannot read levels from directory"); return; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:59:33 -0000 1.1 +++ .cvsignore 12 Jul 2008 18:06:32 -0000 1.2 @@ -0,0 +1 @@ +npush-0.7.tgz Index: npush.spec =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-9/npush.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- npush.spec 9 Jul 2008 19:01:16 -0000 1.1 +++ npush.spec 12 Jul 2008 18:06:32 -0000 1.2 @@ -1,17 +1,14 @@ Name: npush -Version: 0.6 +Version: 0.7 Release: 1%{?dist} -Summary: A logic game similar to Sokoba +Summary: A logic game similar to Sokoban Group: Amusements/Games License: GPLv2+ URL: http://npush.sourceforge.net/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -# self made icon and .desktop file -Source1: %{name}.desktop -Source2: %{name}.png -# patch npush.cpp to svn version to fix an issue with level selector -Patch: npush-0.6-level-svn.patch +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +# patch npush.cpp to fix an issue with level path +Patch0: npush-0.7-level.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel desktop-file-utils @@ -30,11 +27,11 @@ %prep %setup -q -%patch -p0 +%patch0 -p0 %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" %install @@ -44,16 +41,18 @@ install -p -m 755 npush %{buildroot}%{_bindir}/npush mkdir -p %{buildroot}%{_datadir}/npush -cp -ra Level* %{buildroot}%{_datadir}/npush +cp -ra levels* %{buildroot}%{_datadir}/npush # desktop file stuff -desktop-file-install --vendor="fedora" \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} +desktop-file-install --vendor="fedora" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + %{name}.desktop + # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -install -p -m 0644 %{SOURCE2} \ +install -p -m 0644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -77,12 +76,18 @@ %files %defattr(-,root,root,-) -%doc readme.txt +%doc CHANGES COPYING CREDITS readme.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sat Jul 12 2008 Stefan Posdzich - 0.7-1 +- Update to 0.7 +- Upstream now ships our .desktop an icon file +- Add npush-0.7-level.patch to fix level path +- Remove obsolete npush-0.6-level-svn.patch + * Mon Jul 07 2008 Stefan Posdzich - 0.6-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/npush/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jul 2008 19:01:16 -0000 1.2 +++ sources 12 Jul 2008 18:06:32 -0000 1.3 @@ -1 +1 @@ -6670aac74dd7db005462c11c5688db52 npush-0.6.tgz +e39180c6ec228ebafb91ff2921f7bdcc npush-0.7.tgz --- npush-0.6-level-svn.patch DELETED --- --- npush.desktop DELETED --- From fedora-extras-commits at redhat.com Sat Jul 12 18:16:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 12 Jul 2008 18:16:39 +0000 Subject: [pkgdb] python-dtopts was added for ricky Message-ID: <200807121816.m6CIGdZE005803@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-dtopts with summary Add options to doctest examples while they are running Kevin Fenzi (kevin) has approved Package python-dtopts Kevin Fenzi (kevin) has added a Fedora devel branch for python-dtopts with an owner of ricky Kevin Fenzi (kevin) has approved python-dtopts in Fedora devel Kevin Fenzi (kevin) has approved Package python-dtopts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dtopts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dtopts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dtopts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dtopts From fedora-extras-commits at redhat.com Sat Jul 12 18:16:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 12 Jul 2008 18:16:41 +0000 Subject: [pkgdb] python-dtopts (Fedora, 9) updated by kevin Message-ID: <200807121816.m6CIGfn3005822@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-dtopts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dtopts (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dtopts (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dtopts (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dtopts (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dtopts From fedora-extras-commits at redhat.com Sat Jul 12 18:16:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 12 Jul 2008 18:16:41 +0000 Subject: [pkgdb] python-dtopts (Fedora, 8) updated by kevin Message-ID: <200807121816.m6CIGfn6005822@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-dtopts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dtopts (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dtopts (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dtopts (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dtopts (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dtopts From fedora-extras-commits at redhat.com Sat Jul 12 18:16:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 12 Jul 2008 18:16:41 +0000 Subject: [pkgdb] python-dtopts (Fedora, devel) updated by kevin Message-ID: <200807121816.m6CIGfn9005822@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dtopts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dtopts From fedora-extras-commits at redhat.com Sat Jul 12 18:17:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 12 Jul 2008 18:17:21 GMT Subject: rpms/python-dtopts - New directory Message-ID: <200807121817.m6CIHLC6016009@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dtopts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15962/rpms/python-dtopts Log Message: Directory /cvs/extras/rpms/python-dtopts added to the repository From fedora-extras-commits at redhat.com Sat Jul 12 18:17:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 12 Jul 2008 18:17:34 GMT Subject: rpms/python-dtopts/devel - New directory Message-ID: <200807121817.m6CIHYRl016030@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dtopts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15962/rpms/python-dtopts/devel Log Message: Directory /cvs/extras/rpms/python-dtopts/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 12 18:17:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 12 Jul 2008 18:17:55 GMT Subject: rpms/python-dtopts Makefile,NONE,1.1 Message-ID: <200807121817.m6CIHtrH016062@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dtopts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15962/rpms/python-dtopts Added Files: Makefile Log Message: Setup of module python-dtopts --- NEW FILE Makefile --- # Top level Makefile for module python-dtopts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 12 18:18:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 12 Jul 2008 18:18:09 GMT Subject: rpms/python-dtopts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807121818.m6CII9tm016098@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dtopts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy15962/rpms/python-dtopts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-dtopts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-dtopts # $Id: Makefile,v 1.1 2008/07/12 18:17:56 kevin Exp $ NAME := python-dtopts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 12 18:28:30 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 12 Jul 2008 18:28:30 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1576,1.1577 Message-ID: <200807121828.m6CISUlk016594@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16524 Modified Files: openoffice.org.spec Log Message: life is too short to rediff a gadzillon patches for fuzz=0 Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1576 retrieving revision 1.1577 diff -u -r1.1576 -r1.1577 --- openoffice.org.spec 12 Jul 2008 07:46:19 -0000 1.1576 +++ openoffice.org.spec 12 Jul 2008 18:27:40 -0000 1.1577 @@ -32,6 +32,8 @@ %define ooo_base_name %{oootag}_m%{ooomilestone} +%define _default_patch_fuzz 2 + Summary: OpenOffice.org comprehensive office suite. Name: openoffice.org Version: 3.0.0 From fedora-extras-commits at redhat.com Sat Jul 12 18:48:27 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Sat, 12 Jul 2008 18:48:27 GMT Subject: rpms/roadstencil-fonts/devel roadstencil-fontconfig.conf, 1.1, 1.2 roadstencil-fonts.spec, 1.3, 1.4 Message-ID: <200807121848.m6CImRoe017483@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/roadstencil-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17423 Modified Files: roadstencil-fontconfig.conf roadstencil-fonts.spec Log Message: Fix fontconfig file Index: roadstencil-fontconfig.conf =================================================================== RCS file: /cvs/pkgs/rpms/roadstencil-fonts/devel/roadstencil-fontconfig.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- roadstencil-fontconfig.conf 12 Jul 2008 15:57:30 -0000 1.1 +++ roadstencil-fontconfig.conf 12 Jul 2008 18:47:38 -0000 1.2 @@ -1,7 +1,16 @@ - - fantasy - + + + + roadstencil - - - + + fantasy + + + + fantasy + + roadstencil + + + Index: roadstencil-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/roadstencil-fonts/devel/roadstencil-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- roadstencil-fonts.spec 12 Jul 2008 17:11:20 -0000 1.3 +++ roadstencil-fonts.spec 12 Jul 2008 18:47:38 -0000 1.4 @@ -4,7 +4,7 @@ Name: %{fontname}-fonts Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Roadstencil Fonts Group: User Interface/X @@ -59,6 +59,9 @@ %changelog +* Sat Jul 12 2008 Jon Stanley - 1.0-5 +- Fix the fontconfig file + * Sat Jul 12 2008 Jon Stanley - 1.0-4 - fix build failure from previous From fedora-extras-commits at redhat.com Sat Jul 12 19:00:26 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Sat, 12 Jul 2008 19:00:26 GMT Subject: rpms/splint/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 splint.spec, 1.9, 1.10 Message-ID: <200807121900.m6CJ0QGh017976@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/splint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17940 Modified Files: .cvsignore sources splint.spec Log Message: - update to 3.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/splint/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Jun 2005 22:20:28 -0000 1.2 +++ .cvsignore 12 Jul 2008 18:59:32 -0000 1.3 @@ -1 +1 @@ -splint-3.1.1.src.tgz +splint-3.1.2.src.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/splint/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Jun 2005 22:20:28 -0000 1.2 +++ sources 12 Jul 2008 18:59:32 -0000 1.3 @@ -1 +1 @@ -91635d98644312302f6f16abe73c2474 splint-3.1.1.src.tgz +25f47d70bd9c8bdddf6b03de5949c4fd splint-3.1.2.src.tgz Index: splint.spec =================================================================== RCS file: /cvs/pkgs/rpms/splint/devel/splint.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- splint.spec 19 Feb 2008 20:04:13 -0000 1.9 +++ splint.spec 12 Jul 2008 18:59:32 -0000 1.10 @@ -1,6 +1,6 @@ Name: splint -Version: 3.1.1 -Release: 16%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: An implementation of the lint program Group: Development/Tools @@ -46,6 +46,9 @@ %changelog +* Sat Jul 12 2008 Panu Matilainen - 3.1.2-1 +- update to 3.1.2 + * Tue Feb 19 2008 Fedora Release Engineering - 3.1.1-16 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Jul 12 20:38:52 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 12 Jul 2008 20:38:52 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.98-revert-kinit-regression.patch, NONE, 1.1 kdelibs.spec, 1.340, 1.341 Message-ID: <200807122038.m6CKcqco001115@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1063/devel Modified Files: kdelibs.spec Added Files: kdelibs-4.0.98-revert-kinit-regression.patch Log Message: * Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 - revert a kinit patch causing an assertion failure in KComponentData (I hope this fixes the assertion failure.) kdelibs-4.0.98-revert-kinit-regression.patch: --- NEW FILE kdelibs-4.0.98-revert-kinit-regression.patch --- Index: kinit.cpp =================================================================== --- kinit/kinit.cpp (revision 829264) +++ kinit/kinit.cpp (revision 828077) @@ -49,10 +49,9 @@ #include #include #include -#include #include #include -#include +#include #include #include #include @@ -263,7 +262,7 @@ write(child->sock, &request_header, sizeof(request_header)); write(child->sock, request_data, request_header.arg_length); close(child->sock); - + if (prev) { prev->next = child->next; @@ -530,17 +529,8 @@ if (cwd && *cwd) chdir(cwd); else { - // Can't use KGlobalSettings::documentPath() here, we don't have a main component set, - // and we don't want to set one; e.g. kioslaves will do that. - // So we have to duplicate this stuff from KGlobalSettings. - KConfigGroup g(s_instance->config(), "Paths"); - const QString documentPath = g.readPathEntry("Documents", -#ifdef Q_WS_WIN - getWin32ShellFoldersPath("Personal") -#else - QDir::homePath()); -#endif - const QByteArray docPath = QFile::encodeName(documentPath); + KComponentData componentData("klauncher"); // needed for KConfig usage + const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath()); chdir(docPath.constData()); } @@ -1302,7 +1292,7 @@ children = child; /* check child hasn't terminated already */ - if (kill(pid, 0)) + if (kill(pid, 0)) { children = child->next; free(child); Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.340 retrieving revision 1.341 diff -u -r1.340 -r1.341 --- kdelibs.spec 11 Jul 2008 05:28:48 -0000 1.340 +++ kdelibs.spec 12 Jul 2008 20:37:48 -0000 1.341 @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.98 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -78,6 +78,9 @@ Patch15: kdelibs-4.0.82-proxy.patch # forward port kstandarddirs hack to search /etc/kde Patch18: kdelibs-4.0.83-kstandarddirs.patch +# revert a kinit patch which triggers an assertion failure in KComponentData +# (and its followup) +Patch19: kdelibs-4.0.98-revert-kinit-regression.patch # upstream patches @@ -202,6 +205,7 @@ # appears to be obsoleted by: http://websvn.kde.org/?view=rev&revision=829797 #patch15 -p1 -b .proxy %patch18 -p1 -b .kstandarddirs +%patch19 -p0 -b .kinit-regression # upstream patches @@ -359,6 +363,9 @@ %changelog +* Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 +- revert a kinit patch causing an assertion failure in KComponentData + * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 - omit proxy patch (for now, needswork) From fedora-extras-commits at redhat.com Sat Jul 12 20:42:00 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 12 Jul 2008 20:42:00 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.98-revert-kinit-regression.patch, 1.1, 1.2 Message-ID: <200807122042.m6CKg0AS001329@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1232/devel Modified Files: kdelibs-4.0.98-revert-kinit-regression.patch Log Message: Remove whitespace changes from patch (not useful). kdelibs-4.0.98-revert-kinit-regression.patch: Index: kdelibs-4.0.98-revert-kinit-regression.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.0.98-revert-kinit-regression.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdelibs-4.0.98-revert-kinit-regression.patch 12 Jul 2008 20:37:48 -0000 1.1 +++ kdelibs-4.0.98-revert-kinit-regression.patch 12 Jul 2008 20:41:13 -0000 1.2 @@ -14,15 +14,6 @@ #include #include #include -@@ -263,7 +262,7 @@ - write(child->sock, &request_header, sizeof(request_header)); - write(child->sock, request_data, request_header.arg_length); - close(child->sock); -- -+ - if (prev) - { - prev->next = child->next; @@ -530,17 +529,8 @@ if (cwd && *cwd) chdir(cwd); @@ -43,12 +34,3 @@ chdir(docPath.constData()); } -@@ -1302,7 +1292,7 @@ - children = child; - - /* check child hasn't terminated already */ -- if (kill(pid, 0)) -+ if (kill(pid, 0)) - { - children = child->next; - free(child); From fedora-extras-commits at redhat.com Sat Jul 12 20:46:01 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 12 Jul 2008 20:46:01 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.341,1.342 Message-ID: <200807122046.m6CKk1KO001549@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1496/devel Modified Files: kdelibs.spec Log Message: Mention BZ ID. Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.341 retrieving revision 1.342 diff -u -r1.341 -r1.342 --- kdelibs.spec 12 Jul 2008 20:37:48 -0000 1.341 +++ kdelibs.spec 12 Jul 2008 20:45:09 -0000 1.342 @@ -79,7 +79,7 @@ # forward port kstandarddirs hack to search /etc/kde Patch18: kdelibs-4.0.83-kstandarddirs.patch # revert a kinit patch which triggers an assertion failure in KComponentData -# (and its followup) +# (and its followup) (#455130) Patch19: kdelibs-4.0.98-revert-kinit-regression.patch # upstream patches @@ -364,7 +364,7 @@ %changelog * Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 -- revert a kinit patch causing an assertion failure in KComponentData +- revert a kinit patch causing an assertion failure in KComponentData (#455130) * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 From fedora-extras-commits at redhat.com Sat Jul 12 20:56:30 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 12 Jul 2008 20:56:30 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.342,1.343 Message-ID: <200807122056.m6CKuUWU002199@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2129/devel Modified Files: kdelibs.spec Log Message: Try making the spec palatable to the new RPM. Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- kdelibs.spec 12 Jul 2008 20:45:09 -0000 1.342 +++ kdelibs.spec 12 Jul 2008 20:55:44 -0000 1.343 @@ -127,7 +127,7 @@ BuildRequires: openssh-clients BuildRequires: subversion -%if "%{?apidocs}" == "1" +%if 0%{?apidocs} BuildRequires: doxygen BuildRequires: graphviz BuildRequires: qt4-doc From fedora-extras-commits at redhat.com Sat Jul 12 21:09:24 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 12 Jul 2008 21:09:24 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.343,1.344 Message-ID: <200807122109.m6CL9Oki009464@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9427/devel Modified Files: kdelibs.spec Log Message: %define _default_patch_fuzz 2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.343 retrieving revision 1.344 diff -u -r1.343 -r1.344 --- kdelibs.spec 12 Jul 2008 20:55:44 -0000 1.343 +++ kdelibs.spec 12 Jul 2008 21:08:22 -0000 1.344 @@ -1,3 +1,4 @@ +%define _default_patch_fuzz 2 Summary: K Desktop Environment 4 - Libraries Version: 4.0.98 From fedora-extras-commits at redhat.com Sat Jul 12 21:12:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 12 Jul 2008 21:12:37 GMT Subject: extras-buildsys/utils/pushscript Config_EPEL.py,1.19,1.20 Message-ID: <200807122112.m6CLCboo009672@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9654 Modified Files: Config_EPEL.py Log Message: Try making sqlite db's for 5 at least Index: Config_EPEL.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Config_EPEL.py 19 Jan 2008 10:07:20 -0000 1.19 +++ Config_EPEL.py 12 Jul 2008 21:12:37 -0000 1.20 @@ -126,7 +126,7 @@ sync_cmd = './epel-sync' -createrepo = '/usr/bin/createrepo -q' +createrepo = '/usr/bin/createrepo -q -d' createrepo_dict = { '4' : '/srv/extras-push/work/buildsys-utils/pushscript/epel4-createrepo -q', 'testing/4' : '/srv/extras-push/work/buildsys-utils/pushscript/epel4-createrepo -q', From fedora-extras-commits at redhat.com Sat Jul 12 21:12:37 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 21:12:37 GMT Subject: rpms/newsx/devel newsx-stack.patch,NONE,1.1 newsx.spec,1.7,1.8 Message-ID: <200807122112.m6CLCbqr009675@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/newsx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9623 Modified Files: newsx.spec Added Files: newsx-stack.patch Log Message: * Sat Jul 12 2008 Dominik Mierzejewski 1.6-9 - fixed stack buffer overflow in getarticle.c (#454483) - rebuilt against INN shared libraries (#454897) newsx-stack.patch: --- NEW FILE newsx-stack.patch --- diff -up newsx-1.6/src/getarticle.c.stack newsx-1.6/src/getarticle.c --- newsx-1.6/src/getarticle.c.stack 2003-01-21 10:47:25.000000000 +0100 +++ newsx-1.6/src/getarticle.c 2008-07-12 23:02:35.000000000 +0200 @@ -143,12 +143,12 @@ read_article(long where,char *group) long len; long bytecount = 0L; /* BUG: */ - line=linebuf; - line[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */ + linebuf[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */ path_line[0] = '\0'; /* fetch the article, header and body */ for (;;) { + line=linebuf; if (!get_server_msg(line, MAX_HEADER_SIZE)) { /* timeout: simply give up */ return 0; Index: newsx.spec =================================================================== RCS file: /cvs/pkgs/rpms/newsx/devel/newsx.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- newsx.spec 19 Feb 2008 20:47:54 -0000 1.7 +++ newsx.spec 12 Jul 2008 21:11:47 -0000 1.8 @@ -1,6 +1,6 @@ Name: newsx Version: 1.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Summary: NNTP news exchange utility Summary(pl): Narz??dzie do wymiany news??w po NNTP @@ -8,6 +8,7 @@ Source0: ftp://ftp.kvaleberg.com/pub/%{name}-%{version}.tar.gz # Source0-md5: ad9c76c53d5c7d21d86bec805fe8cd34 Patch0: %{name}-make.patch +Patch1: %{name}-stack.patch BuildRequires: inn-devel BuildRequires: automake BuildRequires: autoconf @@ -27,6 +28,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .stack %build autoreconf -f -i @@ -57,6 +59,10 @@ %{_mandir}/man[158]/* %changelog +* Sat Jul 12 2008 Dominik Mierzejewski 1.6-9 +- fixed stack buffer overflow in getarticle.c (#454483) +- rebuilt against INN shared libraries (#454897) + * Tue Feb 19 2008 Fedora Release Engineering - 1.6-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Jul 12 21:29:46 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Sat, 12 Jul 2008 21:29:46 GMT Subject: rpms/xulrunner/OLPC-3 xulrunner-olpc-no-native-theme.patch, NONE, 1.1 xulrunner-olpc-perms.patch, NONE, 1.1 xulrunner-olpc-pre-build.patch, NONE, 1.1 xulrunner-olpc-pre-dpi.patch, NONE, 1.1 xulrunner-olpc-xds.patch, NONE, 1.1 xulrunner.spec, 1.129, 1.130 Message-ID: <200807122129.m6CLTkMx010335@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/xulrunner/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10271 Modified Files: xulrunner.spec Added Files: xulrunner-olpc-no-native-theme.patch xulrunner-olpc-perms.patch xulrunner-olpc-pre-build.patch xulrunner-olpc-pre-dpi.patch xulrunner-olpc-xds.patch Log Message: * Sat Jul 12 2008 Simon Schampijer - 1.9-1.2 - add the OLPC specific patches xulrunner-olpc-no-native-theme.patch: --- NEW FILE xulrunner-olpc-no-native-theme.patch --- --- /tmp/nsNativeThemeGTK.cpp 2008-04-07 12:17:50.000000000 +0200 +++ widget/src/gtk2/nsNativeThemeGTK.cpp 2008-04-07 12:26:13.000000000 +0200 @@ -1273,93 +1273,18 @@ return PR_FALSE; switch (aWidgetType) { - case NS_THEME_BUTTON: - case NS_THEME_BUTTON_FOCUS: - case NS_THEME_RADIO: - case NS_THEME_RADIO_SMALL: - case NS_THEME_CHECKBOX: - case NS_THEME_CHECKBOX_SMALL: - case NS_THEME_TOOLBOX: // N/A - case NS_THEME_TOOLBAR: - case NS_THEME_TOOLBAR_BUTTON: - case NS_THEME_TOOLBAR_DUAL_BUTTON: // so we can override the border with 0 - case NS_THEME_TOOLBAR_BUTTON_DROPDOWN: - case NS_THEME_TOOLBAR_SEPARATOR: - case NS_THEME_TOOLBAR_GRIPPER: - case NS_THEME_STATUSBAR: - case NS_THEME_STATUSBAR_PANEL: - case NS_THEME_STATUSBAR_RESIZER_PANEL: - case NS_THEME_RESIZER: - case NS_THEME_LISTBOX: - // case NS_THEME_LISTBOX_LISTITEM: - case NS_THEME_TREEVIEW: - // case NS_THEME_TREEVIEW_TREEITEM: - case NS_THEME_TREEVIEW_TWISTY: - // case NS_THEME_TREEVIEW_LINE: - // case NS_THEME_TREEVIEW_HEADER: - case NS_THEME_TREEVIEW_HEADER_CELL: - case NS_THEME_TREEVIEW_HEADER_SORTARROW: - case NS_THEME_TREEVIEW_TWISTY_OPEN: - case NS_THEME_PROGRESSBAR: - case NS_THEME_PROGRESSBAR_CHUNK: - case NS_THEME_PROGRESSBAR_VERTICAL: - case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL: - case NS_THEME_TAB: - // case NS_THEME_TAB_PANEL: - case NS_THEME_TAB_PANELS: - case NS_THEME_TAB_SCROLLARROW_BACK: - case NS_THEME_TAB_SCROLLARROW_FORWARD: - case NS_THEME_TOOLTIP: - case NS_THEME_SPINNER: - case NS_THEME_SPINNER_UP_BUTTON: - case NS_THEME_SPINNER_DOWN_BUTTON: - case NS_THEME_SPINNER_TEXTFIELD: - // case NS_THEME_SCROLLBAR: (n/a for gtk) - // case NS_THEME_SCROLLBAR_SMALL: (n/a for gtk) case NS_THEME_SCROLLBAR_BUTTON_UP: case NS_THEME_SCROLLBAR_BUTTON_DOWN: case NS_THEME_SCROLLBAR_BUTTON_LEFT: - case NS_THEME_SCROLLBAR_BUTTON_RIGHT: - case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL: case NS_THEME_SCROLLBAR_TRACK_VERTICAL: case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL: case NS_THEME_SCROLLBAR_THUMB_VERTICAL: - // case NS_THEME_SCROLLBAR_GRIPPER_HORIZONTAL: (n/a for gtk) - // case NS_THEME_SCROLLBAR_GRIPPER_VERTICAL: (n/a for gtk) - case NS_THEME_TEXTFIELD: - case NS_THEME_TEXTFIELD_MULTILINE: - // case NS_THEME_TEXTFIELD_CARET: - case NS_THEME_DROPDOWN_TEXTFIELD: - case NS_THEME_SCALE_HORIZONTAL: - case NS_THEME_SCALE_THUMB_HORIZONTAL: - case NS_THEME_SCALE_VERTICAL: - case NS_THEME_SCALE_THUMB_VERTICAL: - // case NS_THEME_SCALE_THUMB_START: - // case NS_THEME_SCALE_THUMB_END: - // case NS_THEME_SCALE_TICK: - case NS_THEME_CHECKBOX_CONTAINER: - case NS_THEME_RADIO_CONTAINER: - case NS_THEME_CHECKBOX_LABEL: - case NS_THEME_RADIO_LABEL: - case NS_THEME_MENUBAR: - case NS_THEME_MENUPOPUP: - case NS_THEME_MENUITEM: - case NS_THEME_MENUARROW: - case NS_THEME_MENUSEPARATOR: - case NS_THEME_CHECKMENUITEM: - case NS_THEME_RADIOMENUITEM: - case NS_THEME_SPLITTER: - case NS_THEME_WINDOW: - case NS_THEME_DIALOG: - case NS_THEME_DROPDOWN: - case NS_THEME_DROPDOWN_TEXT: return !IsWidgetStyled(aPresContext, aFrame, aWidgetType); - - case NS_THEME_DROPDOWN_BUTTON: + //case NS_THEME_DROPDOWN_BUTTON: // "Native" dropdown buttons cause padding and margin problems, but only // in HTML so allow them in XUL. - return (!aFrame || aFrame->GetContent()->IsNodeOfType(nsINode::eXUL)) && - !IsWidgetStyled(aPresContext, aFrame, aWidgetType); + //return (!aFrame || aFrame->GetContent()->IsNodeOfType(nsINode::eXUL)) && + // !IsWidgetStyled(aPresContext, aFrame, aWidgetType); } xulrunner-olpc-perms.patch: --- NEW FILE xulrunner-olpc-perms.patch --- --- modules/plugin/base/src/nsPluginHostImpl.cpp.old 2007-12-22 14:00:39.000000000 +0100 +++ modules/plugin/base/src/nsPluginHostImpl.cpp 2007-12-22 14:01:41.000000000 +0100 @@ -5573,7 +5573,7 @@ if (NS_FAILED(rv)) return rv; - rv = localFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0600, &fd); + rv = localFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0660, &fd); if (NS_FAILED(rv)) return rv; --- modules/libpref/src/nsPrefService.cpp.old 2007-12-22 14:02:25.000000000 +0100 +++ modules/libpref/src/nsPrefService.cpp 2007-12-22 14:02:42.000000000 +0100 @@ -501,7 +501,7 @@ rv = NS_NewSafeLocalFileOutputStream(getter_AddRefs(outStreamSink), aFile, -1, - 0600); + 0660); if (NS_FAILED(rv)) return rv; rv = NS_NewBufferedOutputStream(getter_AddRefs(outStream), outStreamSink, 4096); --- security/nss/lib/softoken/legacydb/keydb.c.old 2007-12-22 14:03:34.000000000 +0100 +++ security/nss/lib/softoken/legacydb/keydb.c 2007-12-22 14:04:12.000000000 +0100 @@ -832,7 +832,7 @@ if (appName) { handle->db = rdbopen( appName, prefix, "key", NO_CREATE, &status); } else { - handle->db = dbopen( dbname, NO_CREATE, 0600, DB_HASH, 0 ); + handle->db = dbopen( dbname, NO_CREATE, 0660, DB_HASH, 0 ); } /* if create fails then we lose */ if ( handle->db == NULL ) { @@ -853,7 +853,7 @@ */ if (appName) { NSSLOWKEYDBHandle *updateHandle; - updatedb = dbopen( dbname, NO_RDONLY, 0600, DB_HASH, 0 ); + updatedb = dbopen( dbname, NO_RDONLY, 0660, DB_HASH, 0 ); if (!updatedb) { goto noupdate; } @@ -892,7 +892,7 @@ */ updname = (*namecb)(cbarg, 2); if ( updname != NULL ) { - handle->updatedb = dbopen( updname, NO_RDONLY, 0600, DB_HASH, 0 ); + handle->updatedb = dbopen( updname, NO_RDONLY, 0660, DB_HASH, 0 ); PORT_Free( updname ); if ( handle->updatedb ) { @@ -940,7 +940,7 @@ if (appName) { db = rdbopen( appName, prefix, "key", openflags, NULL); } else { - db = dbopen( dbname, openflags, 0600, DB_HASH, 0 ); + db = dbopen( dbname, openflags, 0660, DB_HASH, 0 ); } return db; @@ -2080,7 +2080,7 @@ handle->db= rdbopen(handle->appname, handle->dbname, "key", NO_CREATE, NULL); } else { - handle->db = dbopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 ); + handle->db = dbopen( handle->dbname, NO_CREATE, 0660, DB_HASH, 0 ); } if (handle->db == NULL) { /* set an error code */ --- security/nss/lib/softoken/legacydb/pcertdb.c.old 2007-12-22 14:04:53.000000000 +0100 +++ security/nss/lib/softoken/legacydb/pcertdb.c 2007-12-22 14:05:33.000000000 +0100 @@ -3998,7 +3998,7 @@ tmpname = (* namecb)(cbarg, version); /* get v6 db name */ if ( tmpname ) { - updatedb = dbopen( tmpname, NO_RDONLY, 0600, DB_HASH, 0 ); + updatedb = dbopen( tmpname, NO_RDONLY, 0660, DB_HASH, 0 ); PORT_Free(tmpname); } return updatedb; @@ -4016,7 +4016,7 @@ if (appName) { handle->permCertDB=rdbopen( appName, prefix, "cert", NO_CREATE, &status); } else { - handle->permCertDB=dbsopen(certdbname, NO_CREATE, 0600, DB_HASH, 0); + handle->permCertDB=dbsopen(certdbname, NO_CREATE, 0660, DB_HASH, 0); } /* if create fails then we lose */ @@ -4042,7 +4042,7 @@ /* rv must already be Success here because of previous if statement */ /* try to upgrade old db here */ if (appName && - (updatedb = dbsopen(certdbname, NO_RDONLY, 0600, DB_HASH, 0)) != NULL) { + (updatedb = dbsopen(certdbname, NO_RDONLY, 0660, DB_HASH, 0)) != NULL) { rv = UpdateV8DB(handle, updatedb); } else if ((updatedb = nsslowcert_openolddb(namecb,cbarg,7)) != NULL) { rv = UpdateV7DB(handle, updatedb); @@ -4107,7 +4107,7 @@ if (appName) { handle->permCertDB = rdbopen( appName, prefix, "cert", openflags, NULL); } else { - handle->permCertDB = dbsopen( certdbname, openflags, 0600, DB_HASH, 0 ); + handle->permCertDB = dbsopen( certdbname, openflags, 0660, DB_HASH, 0 ); } /* check for correct version number */ --- security/nss/lib/softoken/legacydb/pk11db.c 2007-06-13 02:24:57.000000000 +0200 +++ security/nss/lib/softoken/legacydb/pk11db.c.old 2007-12-22 14:06:55.000000000 +0100 @@ -543,7 +543,7 @@ PORT_Free(secname); return pkcs11db; } - updatedb = dbopen(dbName, NO_RDONLY, 0600, DB_HASH, 0); + updatedb = dbopen(dbName, NO_RDONLY, 0660, DB_HASH, 0); if (updatedb) { db_Copy(pkcs11db,updatedb); (*updatedb->close)(updatedb); @@ -558,14 +558,14 @@ } /* I'm sure we should do more checks here sometime... */ - pkcs11db = dbopen(dbName, readOnly ? NO_RDONLY : NO_RDWR, 0600, DB_HASH, 0); + pkcs11db = dbopen(dbName, readOnly ? NO_RDONLY : NO_RDWR, 0660, DB_HASH, 0); /* didn't exist? create it */ if (pkcs11db == NULL) { if (readOnly) return NULL; - pkcs11db = dbopen( dbName, NO_CREATE, 0600, DB_HASH, 0 ); + pkcs11db = dbopen( dbName, NO_CREATE, 0660, DB_HASH, 0 ); if (pkcs11db) (* pkcs11db->sync)(pkcs11db, 0); } --- netwerk/cache/src/nsDiskCacheBlockFile.cpp.old 2007-12-22 14:11:31.000000000 +0100 +++ netwerk/cache/src/nsDiskCacheBlockFile.cpp 2007-12-22 14:11:45.000000000 +0100 @@ -59,7 +59,7 @@ mBlockSize = blockSize; // open the file - restricted to user, the data could be confidential - nsresult rv = blockFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00600, &mFD); + nsresult rv = blockFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00660, &mFD); if (NS_FAILED(rv)) return rv; // unable to open or create file // allocate bit map buffer --- netwerk/cache/src/nsDiskCacheDeviceSQL.cpp.old 2007-12-22 14:37:48.000000000 +0100 +++ netwerk/cache/src/nsDiskCacheDeviceSQL.cpp 2007-12-22 14:38:21.000000000 +0100 @@ -374,7 +374,7 @@ rv = file->SetNativeLeafName(nsDependentCString(leaf)); if (NS_FAILED(rv)) return nsnull; - rv = file->Create(nsIFile::NORMAL_FILE_TYPE, 00600); + rv = file->Create(nsIFile::NORMAL_FILE_TYPE, 00660); if (NS_FAILED(rv) && rv != NS_ERROR_FILE_ALREADY_EXISTS) return nsnull; if (NS_SUCCEEDED(rv)) @@ -1105,7 +1105,7 @@ nsCOMPtr out; NS_NewLocalFileOutputStream(getter_AddRefs(out), binding->mDataFile, PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, - 00600); + 00660); if (!out) return NS_ERROR_UNEXPECTED; --- netwerk/cache/src/nsDiskCacheStreams.cpp.old 2007-12-22 14:37:28.000000000 +0100 +++ netwerk/cache/src/nsDiskCacheStreams.cpp 2007-12-22 14:38:06.000000000 +0100 @@ -666,8 +666,8 @@ getter_AddRefs(mLocalFile)); if (NS_FAILED(rv)) return rv; - // create PRFileDesc for input stream - the 00600 is just for consistency - rv = mLocalFile->OpenNSPRFileDesc(flags, 00600, fd); + // create PRFileDesc for input stream - the 00660 is just for consistency + rv = mLocalFile->OpenNSPRFileDesc(flags, 00660, fd); if (NS_FAILED(rv)) return rv; // unable to open file return NS_OK; --- /tmp/sqlite3.c 2008-04-07 14:31:32.000000000 +0200 +++ db/sqlite3/src/sqlite3.c 2008-04-07 14:32:49.000000000 +0200 @@ -15768,7 +15768,7 @@ ** Default permissions when creating a new file */ #ifndef SQLITE_DEFAULT_FILE_PERMISSIONS -# define SQLITE_DEFAULT_FILE_PERMISSIONS 0644 +# define SQLITE_DEFAULT_FILE_PERMISSIONS 0664 #endif /* --- /tmp/nsDiskCacheMap.cpp 2008-04-07 14:27:11.000000000 +0200 +++ netwerk/cache/src/nsDiskCacheMap.cpp 2008-04-07 14:28:43.000000000 +0200 @@ -78,7 +78,7 @@ NS_ENSURE_SUCCESS(rv, rv); // open the file - restricted to user, the data could be confidential - rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00600, &mMapFD); + rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE, 00660, &mMapFD); NS_ENSURE_SUCCESS(rv, NS_ERROR_FILE_CORRUPTED); PRBool cacheFilesExist = CacheFilesExist(); @@ -676,7 +676,7 @@ PRFileDesc * fd = nsnull; // open the file - restricted to user, the data could be confidential - rv = file->OpenNSPRFileDesc(PR_RDONLY, 00600, &fd); + rv = file->OpenNSPRFileDesc(PR_RDONLY, 00660, &fd); NS_ENSURE_SUCCESS(rv, nsnull); PRInt32 fileSize = PR_Available(fd); @@ -826,8 +826,8 @@ // open the file PRFileDesc * fd; // open the file - restricted to user, the data could be confidential - rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_TRUNCATE | PR_CREATE_FILE, 00600, &fd); + rv = localFile->OpenNSPRFileDesc(PR_RDWR | PR_TRUNCATE | PR_CREATE_FILE, 00660, &fd); NS_ENSURE_SUCCESS(rv, rv); // write the file xulrunner-olpc-pre-build.patch: --- NEW FILE xulrunner-olpc-pre-build.patch --- --- /tmp/Makefile.in 2008-04-07 13:55:44.000000000 +0200 +++ extensions/python/dom/src/Makefile.in 2008-04-07 13:56:27.000000000 +0200 @@ -22,7 +22,7 @@ # We always need the Python and pyxpcom includes and libs. LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES) EXTRA_LIBS += $(MOZ_PYTHON_LIBS) \ - $(call EXPAND_LIBNAME_PATH,pyxpcom,$(DIST)/lib) \ + $(DIST)/lib/$(DLL_PREFIX)pyxpcom$(DLL_SUFFIX) \ $(NULL) # In the shorter term we need JS too. Index: config/rules.mk =================================================================== RCS file: /cvsroot/mozilla/config/rules.mk,v retrieving revision 3.554 diff -u -r3.554 rules.mk --- config/rules.mk 14 May 2007 14:21:44 -0000 3.554 +++ config/rules.mk 21 May 2007 00:41:20 -0000 @@ -775,6 +775,12 @@ install:: $(SDK_HEADERS) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE) endif + +ifneq (,$(SDK_LIBRARY)) +install:: $(SDK_LIBRARY) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) +endif + endif install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) --- extensions/python/xpcom/src/module/Makefile.in.orig 2007-05-28 20:48:26.000000000 +0200 +++ extensions/python/xpcom/src/module/Makefile.in 2007-05-28 20:49:03.000000000 +0200 @@ -95,8 +95,8 @@ install:: ifneq ($(OS_ARCH),WINNT) - $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom - mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX) + $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom + mv $(DESTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX) endif clobber:: --- extensions/python/xpcom/Makefile.in.orig 2007-05-29 10:17:10.000000000 +0200 +++ extensions/python/xpcom/Makefile.in 2007-05-29 10:17:22.000000000 +0200 @@ -97,9 +97,9 @@ $(INSTALL) $(PYSRCS_XPCOMTOOLS) $(DIST)/bin/python/xpcom/tools install:: - $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DISTDIR)$(pyexecdir)/xpcom - $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DISTDIR)$(pyexecdir)/xpcom/client - $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DISTDIR)$(pyexecdir)/xpcom/server + $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DESTDIR)$(pyexecdir)/xpcom + $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DESTDIR)$(pyexecdir)/xpcom/client + $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DESTDIR)$(pyexecdir)/xpcom/server clobber:: rm -rf $(DIST)/bin/python/xpcom Index: extensions/python/dom/test/pyxultest/application.ini =================================================================== RCS file: /cvsroot/mozilla/extensions/python/dom/test/pyxultest/application.ini,v retrieving revision 1.2 diff -u -r1.2 application.ini --- extensions/python/dom/test/pyxultest/application.ini 29 Apr 2006 01:56:36 -0000 1.2 +++ extensions/python/dom/test/pyxultest/application.ini 21 Aug 2007 22:36:44 -0000 @@ -15,7 +15,7 @@ ; This field specifies your application's build ID (timestamp). This field is ; required. -BuildID=@BUILD_ID@ +BuildID=20070625 ; This field specifies a compact copyright notice for your application. This ; field is optional. xulrunner-olpc-pre-dpi.patch: --- NEW FILE xulrunner-olpc-pre-dpi.patch --- Index: gfx/src/thebes/nsThebesDeviceContext.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v retrieving revision 1.54 diff -u -r1.54 nsThebesDeviceContext.cpp --- gfx/src/thebes/nsThebesDeviceContext.cpp 19 Mar 2007 23:16:15 -0000 1.54 +++ gfx/src/thebes/nsThebesDeviceContext.cpp 22 Mar 2007 15:10:19 -0000 @@ -228,6 +228,7 @@ NS_ASSERTION(dpi != -1, "no dpi set"); + dotsArePixels = PR_FALSE; if (dotsArePixels) { // First figure out the closest multiple of 96, which is the number of // dev pixels per CSS pixel. Then, divide that into AppUnitsPerCSSPixel() xulrunner-olpc-xds.patch: --- NEW FILE xulrunner-olpc-xds.patch --- Index: content/base/src/nsContentAreaDragDrop.cpp =================================================================== RCS file: /cvsroot/mozilla/content/base/src/nsContentAreaDragDrop.cpp,v retrieving revision 1.69 diff -u -r1.69 nsContentAreaDragDrop.cpp --- content/base/src/nsContentAreaDragDrop.cpp 8 Jul 2007 07:08:07 -0000 1.69 +++ content/base/src/nsContentAreaDragDrop.cpp 16 Sep 2007 20:11:36 -0000 @@ -855,9 +855,6 @@ return NS_ERROR_NO_INTERFACE; } - rv = inDestFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600); - NS_ENSURE_SUCCESS(rv, rv); - // we rely on the fact that the WPB is refcounted by the channel etc, // so we don't keep a ref to it. It will die when finished. nsCOMPtr persist = @@ -921,21 +918,32 @@ if (targetFilename.IsEmpty()) return NS_ERROR_FAILURE; - // get the target directory from the kFilePromiseDirectoryMime - // flavor - nsCOMPtr dirPrimitive; + nsCOMPtr file; + + nsCOMPtr fullpathPrimitive; dataSize = 0; - aTransferable->GetTransferData(kFilePromiseDirectoryMime, - getter_AddRefs(dirPrimitive), &dataSize); - nsCOMPtr destDirectory = do_QueryInterface(dirPrimitive); - if (!destDirectory) - return NS_ERROR_FAILURE; + aTransferable->GetTransferData(kFilePromiseFullpathMime, + getter_AddRefs(fullpathPrimitive), &dataSize); + file = do_QueryInterface(fullpathPrimitive); + if (!file) { + // get the target directory from the kFilePromiseDirectoryMime + // flavor + nsCOMPtr dirPrimitive; + dataSize = 0; + aTransferable->GetTransferData(kFilePromiseDirectoryMime, + getter_AddRefs(dirPrimitive), &dataSize); + nsCOMPtr destDirectory = do_QueryInterface(dirPrimitive); + if (!destDirectory) + return NS_ERROR_FAILURE; - nsCOMPtr file; - rv = destDirectory->Clone(getter_AddRefs(file)); - NS_ENSURE_SUCCESS(rv, rv); + rv = destDirectory->Clone(getter_AddRefs(file)); + NS_ENSURE_SUCCESS(rv, rv); - file->Append(targetFilename); + file->Append(targetFilename); + + rv = file->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600); + NS_ENSURE_SUCCESS(rv, rv); + } // now save the file rv = SaveURIToFile(sourceURLString, file); Index: widget/public/nsITransferable.idl =================================================================== RCS file: /cvsroot/mozilla/widget/public/nsITransferable.idl,v retrieving revision 1.12 diff -u -r1.12 nsITransferable.idl --- widget/public/nsITransferable.idl 12 Jun 2006 17:30:22 -0000 1.12 +++ widget/public/nsITransferable.idl 16 Sep 2007 20:12:24 -0000 @@ -70,6 +70,7 @@ #define kFilePromiseMime "application/x-moz-file-promise" // a synthetic flavor, put into the transferable once we know the destination directory of a file drag #define kFilePromiseDirectoryMime "application/x-moz-file-promise-dir" +#define kFilePromiseFullpathMime "application/x-moz-file-promise-fullpath" %} Index: widget/src/gtk2/nsDragService.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v retrieving revision 1.19 diff -u -r1.19 nsDragService.cpp --- widget/src/gtk2/nsDragService.cpp 7 Aug 2007 15:18:38 -0000 1.19 +++ widget/src/gtk2/nsDragService.cpp 16 Sep 2007 20:12:26 -0000 @@ -60,11 +60,16 @@ #include "gfxASurface.h" #include "nsImageToPixbuf.h" +#define XDS_ATOM gdk_atom_intern("XdndDirectSave0", FALSE) +#define TEXT_ATOM gdk_atom_intern("text/plain", FALSE) +#define MAX_XDS_ATOM_VAL_LEN 4096 + static PRLogModuleInfo *sDragLm = NULL; static const char gMimeListType[] = "application/x-moz-internal-item-list"; static const char gMozUrlType[] = "_NETSCAPE_URL"; static const char gTextUriListType[] = "text/uri-list"; +static const char gDirectSaveType[] = "XdndDirectSave0"; static void invisibleSourceDragEnd(GtkWidget *aWidget, @@ -79,6 +84,11 @@ guint32 aTime, gpointer aData); +void +invisibleSourceDragBegin(GtkWidget *aWidget, + GdkDragContext *aContext, + gpointer aData); + nsDragService::nsDragService() { // We have to destroy the hidden widget before the event loop stops @@ -96,6 +106,8 @@ // from our drag source gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_data_get", GTK_SIGNAL_FUNC(invisibleSourceDragDataGet), this); + gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_begin", + GTK_SIGNAL_FUNC(invisibleSourceDragBegin), this); gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_end", GTK_SIGNAL_FUNC(invisibleSourceDragEnd), this); @@ -989,6 +1001,21 @@ id %ld\n", urlTarget->target, urlAtom)); targetArray.AppendElement(urlTarget); } + // XdndDirectSave + if (strcmp(flavorStr, kFilePromiseMime) == 0) { + // get the atom for the unicode string + GdkAtom directsaveAtom = + gdk_atom_intern(gDirectSaveType, FALSE); + GtkTargetEntry *directsaveTarget = + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + directsaveTarget->target = g_strdup(gDirectSaveType); + directsaveTarget->flags = 0; + directsaveTarget->info = GPOINTER_TO_UINT(directsaveAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with \ + id %ld\n", directsaveTarget->target, directsaveAtom)); + targetArray.AppendElement(directsaveTarget); + } } } // foreach flavor in item } // if valid flavor list @@ -1024,6 +1051,52 @@ } void +nsDragService::SourceBeginDrag(GdkDragContext *context) +{ + nsCOMPtr genericItem; + mSourceDataItems->GetElementAt(0, getter_AddRefs(genericItem)); + nsCOMPtr transferable(do_QueryInterface(genericItem)); + + nsresult rv; + nsCOMPtr flavorList; + rv = transferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList)); + NS_ENSURE_SUCCESS(rv,); + + PRUint32 cnt; + flavorList->Count(&cnt); + + for (PRUint32 i = 0; i < cnt; ++i) { + nsCOMPtr genericWrapper; + flavorList->GetElementAt(i, getter_AddRefs(genericWrapper)); + nsCOMPtr currentFlavor(do_QueryInterface(genericWrapper, &rv)); + NS_ENSURE_SUCCESS(rv,); + + nsXPIDLCString flavorStr; + currentFlavor->ToString(getter_Copies(flavorStr)); + if (strcmp(flavorStr, kFilePromiseDestFilename) == 0) { + PRUint32 dataSize = 0; + nsCOMPtr tmp; + transferable->GetTransferData(kFilePromiseDestFilename, + getter_AddRefs(tmp), &dataSize); + nsCOMPtr fileName = do_QueryInterface(tmp, &rv); + NS_ENSURE_SUCCESS(rv,); + + nsAutoString filenameStr; + fileName->GetData(filenameStr); + + nsCString filenameCStr; + CopyUTF16toUTF8(filenameStr, filenameCStr); + + gdk_property_change(context->source_window, + XDS_ATOM, TEXT_ATOM, + 8, GDK_PROP_MODE_REPLACE, + (guchar *)filenameCStr.get(), + filenameCStr.Length()); + } + } +} + +void nsDragService::SourceEndDrag(void) { // this just releases the list of data items that we provide @@ -1106,6 +1179,8 @@ guint32 aTime) { PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SourceDataGet")); + nsresult rv; + GdkAtom atom = (GdkAtom)aInfo; nsXPIDLCString mimeFlavor; gchar *typeName = 0; @@ -1134,6 +1209,7 @@ // we can convert it. PRBool needToDoConversionToPlainText = PR_FALSE; const char* actualFlavor = mimeFlavor; +printf("%s\n", actualFlavor); if (strcmp(mimeFlavor,kTextMime) == 0) { actualFlavor = kUnicodeMime; needToDoConversionToPlainText = PR_TRUE; @@ -1150,16 +1226,60 @@ actualFlavor = gTextUriListType; needToDoConversionToPlainText = PR_TRUE; } + else if (strcmp(mimeFlavor, gTextUriListType) == 0) { + actualFlavor = gTextUriListType; + needToDoConversionToPlainText = PR_TRUE; + } + else if (strcmp(mimeFlavor, gDirectSaveType) == 0) { + guchar *propText; + gint propLen; + + if (!gdk_property_get(aContext->source_window, + XDS_ATOM, TEXT_ATOM, + 0, MAX_XDS_ATOM_VAL_LEN, + FALSE, NULL, NULL, &propLen, + (unsigned char **)&propText)) + return; + + /* Zero-terminate the string */ + propText = (guchar *)g_realloc(propText, propLen + 1); + propText[propLen] = '\0'; + + char *fullpath; + fullpath = g_filename_from_uri((gchar *)propText, NULL, NULL); + if (!fullpath) + return; + + nsCOMPtr file; + rv = NS_NewNativeLocalFile(nsDependentCString(fullpath), + PR_FALSE, getter_AddRefs(file)); + NS_ENSURE_SUCCESS(rv,); + + item->SetTransferData(kFilePromiseFullpathMime, file, + sizeof(nsILocalFile*)); + + actualFlavor = kFilePromiseMime; + + g_free(fullpath); + } else actualFlavor = mimeFlavor; PRUint32 tmpDataLen = 0; void *tmpData = NULL; - nsresult rv; nsCOMPtr data; rv = item->GetTransferData(actualFlavor, getter_AddRefs(data), &tmpDataLen); + + if (strcmp(actualFlavor, kFilePromiseMime) == 0) { + const char *result = NS_SUCCEEDED(rv) ? "S" : "F"; + gtk_selection_data_set(aSelectionData, + aSelectionData->target, + 8, (guchar *)result, 1); + return; + } + if (NS_SUCCEEDED(rv)) { nsPrimitiveHelpers::CreateDataFromPrimitive (actualFlavor, data, &tmpData, tmpDataLen); @@ -1224,6 +1344,18 @@ /* static */ void +invisibleSourceDragBegin(GtkWidget *aWidget, + GdkDragContext *aContext, + gpointer aData) +{ + PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleDragBegin")); + nsDragService *dragService = (nsDragService *)aData; + // The drag has ended. Release the hostages! + dragService->SourceBeginDrag(aContext); +} + +/* static */ +void invisibleSourceDragEnd(GtkWidget *aWidget, GdkDragContext *aContext, gpointer aData) Index: widget/src/gtk2/nsDragService.h =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.h,v retrieving revision 1.4 diff -u -r1.4 nsDragService.h --- widget/src/gtk2/nsDragService.h 12 Apr 2007 04:37:40 -0000 1.4 +++ widget/src/gtk2/nsDragService.h 16 Sep 2007 20:12:26 -0000 @@ -101,6 +101,7 @@ // This is called when the drag started with the invisible widget // finishes. It's called from within the drag service code but from // a callback - it needs to be public. + void SourceBeginDrag(GdkDragContext *context); void SourceEndDrag(void); void SourceDataGet(GtkWidget *widget, GdkDragContext *context, Index: xulrunner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- xulrunner.spec 23 Jun 2008 22:32:47 -0000 1.129 +++ xulrunner.spec 12 Jul 2008 21:28:42 -0000 1.130 @@ -8,7 +8,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -31,6 +31,12 @@ Patch26: mozilla-ps-pdf-simplify-operators.patch Patch27: mozilla-ssl-exception.patch +# OLPC +Patch201: xulrunner-olpc-no-native-theme.patch +Patch202: xulrunner-olpc-pre-dpi.patch +Patch203: xulrunner-olpc-pre-build.patch +Patch204: xulrunner-olpc-xds.patch +Patch205: xulrunner-olpc-perms.patch # --------------------------------------------------- @@ -124,6 +130,12 @@ %patch26 -p1 -b .ps-pdf-simplify-operators %patch27 -p1 -b .ssl-exception +%patch201 -p0 -b .no-native-theme +%patch202 -p0 -b .dpi +%patch203 -p0 -b .build +%patch204 -p0 -b .xds +%patch205 -p0 -b .perms + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -407,6 +419,9 @@ #--------------------------------------------------------------------- %changelog +* Sat Jul 12 2008 Simon Schampijer - 1.9-1.2 +- add the OLPC specific patches + * Mon Jun 23 2008 Dennis Gilmore 1.9-1.1 - us xulrunner-pyxpcom instead of python-xulrunner From fedora-extras-commits at redhat.com Sat Jul 12 21:39:37 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Joonas_Saraj=C3=A4rvi?= (muep)) Date: Sat, 12 Jul 2008 21:39:37 GMT Subject: rpms/milkytracker/F-9 import.log, NONE, 1.1 milkytracker-0.90.80-use-system-library.patch, NONE, 1.1 milkytracker.desktop, NONE, 1.1 milkytracker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807122139.m6CLdb61010879@cvs-int.fedora.redhat.com> Author: muep Update of /cvs/pkgs/rpms/milkytracker/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10628/F-9 Modified Files: .cvsignore sources Added Files: import.log milkytracker-0.90.80-use-system-library.patch milkytracker.desktop milkytracker.spec Log Message: * Sun Jul 13 2008 Joonas Saraj??rvi - 0.90.80-3 - Initial import --- NEW FILE import.log --- milkytracker-0_90_80-3_fc9:F-9:milkytracker-0.90.80-3.fc9.src.rpm:1215898495 milkytracker-0.90.80-use-system-library.patch: --- NEW FILE milkytracker-0.90.80-use-system-library.patch --- --- milkytracker-0.90.80/configure.debug 2008-04-14 07:44:02.000000000 +0900 +++ milkytracker-0.90.80/configure 2008-05-30 20:08:45.000000000 +0900 @@ -5757,6 +5757,221 @@ +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + { echo "$as_me:$LINENO: checking for zzip/lib.h" >&5 +echo $ECHO_N "checking for zzip/lib.h... $ECHO_C" >&6; } +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_zzip_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zzip_lib_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking zzip/lib.h usability" >&5 +echo $ECHO_N "checking zzip/lib.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking zzip/lib.h presence" >&5 +echo $ECHO_N "checking zzip/lib.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: zzip/lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: zzip/lib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: zzip/lib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: zzip/lib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: zzip/lib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: zzip/lib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: zzip/lib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: zzip/lib.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------- ## +## Report this to www.milkytracker.net ## +## ----------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for zzip/lib.h" >&5 +echo $ECHO_N "checking for zzip/lib.h... $ECHO_C" >&6; } +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_zzip_lib_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_zzip_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zzip_lib_h" >&6; } + +fi +if test $ac_cv_header_zzip_lib_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: \"Cannot find zzip/lib.h\"" >&5 +echo "$as_me: error: \"Cannot find zzip/lib.h\"" >&2;} + { (exit 1); exit 1; }; } +fi + + + +{ echo "$as_me:$LINENO: checking for zzip_file_open in -lzzip" >&5 +echo $ECHO_N "checking for zzip_file_open in -lzzip... $ECHO_C" >&6; } +if test "${ac_cv_lib_zzip_zzip_file_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lzzip $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char zzip_file_open (); +int +main () +{ +return zzip_file_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_zzip_zzip_file_open=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_zzip_zzip_file_open=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_zzip_zzip_file_open" >&5 +echo "${ECHO_T}$ac_cv_lib_zzip_zzip_file_open" >&6; } +if test $ac_cv_lib_zzip_zzip_file_open = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZZIP 1 +_ACEOF + + LIBS="-lzzip $LIBS" + +else + { { echo "$as_me:$LINENO: error: \"Cannot find -lzzip\"" >&5 +echo "$as_me: error: \"Cannot find -lzzip\"" >&2;} + { (exit 1); exit 1; }; } +fi + + # Check that SDL supports the X11 wm { echo "$as_me:$LINENO: checking whether SDL supports X11" >&5 echo $ECHO_N "checking whether SDL supports X11... $ECHO_C" >&6; } --- milkytracker-0.90.80/configure.in.debug 2008-04-14 07:42:14.000000000 +0900 +++ milkytracker-0.90.80/configure.in 2008-05-30 20:08:45.000000000 +0900 @@ -44,6 +44,9 @@ AC_HEADER_STDC AC_CHECK_HEADERS_ONCE([fcntl.h inttypes.h limits.h malloc.h memory.h stddef.h stdint.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/time.h unistd.h],,AC_MSG_ERROR([One or more required header files are missing])) +AC_CHECK_HEADER(zzip/lib.h,,AC_MSG_ERROR("Cannot find zzip/lib.h")) +AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) + # Check that SDL supports the X11 wm AC_MSG_CHECKING([whether SDL supports X11]) OLDCPPFLAGS=$CPPFLAGS --- milkytracker-0.90.80/src/compression/Makefile.am.debug 2008-01-25 07:44:27.000000000 +0900 +++ milkytracker-0.90.80/src/compression/Makefile.am 2008-05-30 20:26:35.000000000 +0900 @@ -1,5 +1,5 @@ noinst_LIBRARIES = libcompression.a -libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp -noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h +libcompression_a_SOURCES = MyIO.cpp PP20.cpp ZipExtractor.cpp +noinst_HEADERS = zziplib/MyIO.h zziplib/zzip_fedora.h PP20.h ZipExtractor.h INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic #INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix --- milkytracker-0.90.80/src/compression/Makefile.in.debug 2008-04-14 07:44:02.000000000 +0900 +++ milkytracker-0.90.80/src/compression/Makefile.in 2008-05-30 20:27:15.000000000 +0900 @@ -46,13 +46,7 @@ ARFLAGS = cru libcompression_a_AR = $(AR) $(ARFLAGS) libcompression_a_LIBADD = -am_libcompression_a_OBJECTS = adler32.$(OBJEXT) compress.$(OBJEXT) \ - deflate.$(OBJEXT) infback.$(OBJEXT) inffast.$(OBJEXT) \ - inflate.$(OBJEXT) inftrees.$(OBJEXT) uncompr.$(OBJEXT) \ - crc32.$(OBJEXT) trees.$(OBJEXT) zutil.$(OBJEXT) dir.$(OBJEXT) \ - err.$(OBJEXT) fetch.$(OBJEXT) file.$(OBJEXT) fseeko.$(OBJEXT) \ - info.$(OBJEXT) plugin.$(OBJEXT) stat.$(OBJEXT) zip.$(OBJEXT) \ - MyIO.$(OBJEXT) PP20.$(OBJEXT) ZipExtractor.$(OBJEXT) +am_libcompression_a_OBJECTS = MyIO.$(OBJEXT) PP20.$(OBJEXT) ZipExtractor.$(OBJEXT) libcompression_a_OBJECTS = $(am_libcompression_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -165,8 +159,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libcompression.a -libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp -noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h +libcompression_a_SOURCES = MyIO.cpp PP20.cpp ZipExtractor.cpp +noninst_HEADERS = zziplib/MyIO.h zziplib/zzip_fedora.h PP20.h ZipExtractor.h INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic all: all-am --- milkytracker-0.90.80/src/compression/ZipExtractor.cpp.debug 2008-01-17 06:49:04.000000000 +0900 +++ milkytracker-0.90.80/src/compression/ZipExtractor.cpp 2008-05-30 20:08:45.000000000 +0900 @@ -11,7 +11,6 @@ #include "XModule.h" #include "XMFile.h" #include "MyIO.h" -#include "zzip_lib.h" ZipExtractor::ZipExtractor(const PPSystemString& archivePath) : archivePath(archivePath) --- milkytracker-0.90.80/src/compression/zziplib/MyIO.h.debug 2008-01-17 06:49:04.000000000 +0900 +++ milkytracker-0.90.80/src/compression/zziplib/MyIO.h 2008-05-30 20:08:45.000000000 +0900 @@ -9,7 +9,7 @@ #ifndef __MYIO_H__ #define __MYIO_H__ -#include "zzip_plugin.h" +#include "zzip_fedora.h" #ifdef __cplusplus extern "C" { --- milkytracker-0.90.80/src/compression/zziplib/zzip_fedora.h.debug 2008-05-30 20:08:45.000000000 +0900 +++ milkytracker-0.90.80/src/compression/zziplib/zzip_fedora.h 2008-05-30 20:08:45.000000000 +0900 @@ -0,0 +1,20 @@ +#ifndef __ZZIP_FEDORA_H__ +#define __ZZIP_FEDORA_H__ + +#include /* size_t */ +#include /* O_WRONLY */ +#include /* system wide zzip */ + +#define __zzipfd size_t /* zzip_conf.h */ +#define _zzip_const const +#define _zzip_ssize_t ssize_t +#define _zzip_size_t size_t +#define _zzip_off_t off_t + +typedef char _zzip_const zzip_char_t; /* zzip.h */ + +typedef _zzip_ssize_t zzip_ssize_t; /* zzip_types.h */ +typedef _zzip_size_t zzip_size_t; +typedef _zzip_off_t zzip_off_t; + +#endif --- NEW FILE milkytracker.desktop --- [Desktop Entry] Name=MilkyTracker Comment=Module tracker Exec=milkytracker %U Terminal=false Type=Application Icon=milkytracker StartupNotify=false Categories=AudioVideo;Audio;Sequencer; --- NEW FILE milkytracker.spec --- Name: milkytracker Version: 0.90.80 Release: 3%{?dist} Summary: Module tracker software for creating music Group: Applications/Multimedia License: GPLv3+ URL: http://www.milkytracker.net/ Source0: http://www.milkytracker.net/files/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: milkytracker-0.90.80-use-system-library.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: zziplib-devel BuildRequires: jack-audio-connection-kit-devel %description MilkyTracker is an application for creating music in the .MOD and .XM formats. Its goal is to be free replacement for the popular Fasttracker II software. %prep %setup -q find . -name \*.cpp -or -name \*.h | xargs chmod 644 %patch0 -p1 -b .debug # Explicitly remove source files rm -rf src/compression/zlib/ rm -rf src/compression/zziplib/generic/ # timestamp: touch files to remove autotool call touch -r configure aclocal.m4 Makefile.in config.h.in %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # copy the icon mkdir -p %{buildroot}%{_datadir}/pixmaps cp -p resources/pictures/carton.png %{buildroot}%{_datadir}/pixmaps/milkytracker.png # copy the desktop file desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_bindir}/milkytracker %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/milkytracker.png %changelog * Fri May 30 2008 Mamoru Tasaka - 0.90.80-3 - Use system-wide zziplib (zlib is not used directly) * Mon May 26 2008 Joonas Saraj??rvi - 0.90.80-2 - Set Source0 to use macros for easier updating. - Removed the --without-jack configuration option. - Added -p to the cp command to preserve the timestamp. - Replaced /usr/share with a macro. - Added a line to prep to set correct permissions for source files extracted from the tarball. - Modified a Makefile.am to not compile the included static zlib library. * Sat May 3 2008 Joonas Saraj??rvi - 0.90.80-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/milkytracker/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 21:03:50 -0000 1.1 +++ .cvsignore 12 Jul 2008 21:38:50 -0000 1.2 @@ -0,0 +1 @@ +milkytracker-0.90.80.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/milkytracker/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:03:50 -0000 1.1 +++ sources 12 Jul 2008 21:38:50 -0000 1.2 @@ -0,0 +1 @@ +f8090ac13ec2f3cf89af483d1483d16c milkytracker-0.90.80.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 12 21:46:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Joonas_Saraj=C3=A4rvi?= (muep)) Date: Sat, 12 Jul 2008 21:46:05 GMT Subject: rpms/milkytracker/F-8 import.log, NONE, 1.1 milkytracker-0.90.80-use-system-library.patch, NONE, 1.1 milkytracker.desktop, NONE, 1.1 milkytracker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807122146.m6CLk5Pp011222@cvs-int.fedora.redhat.com> Author: muep Update of /cvs/pkgs/rpms/milkytracker/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11080/F-8 Modified Files: .cvsignore sources Added Files: import.log milkytracker-0.90.80-use-system-library.patch milkytracker.desktop milkytracker.spec Log Message: * Sun Jul 13 2008 Joonas Saraj??rvi - 0.90.80-3 - Initial import --- NEW FILE import.log --- milkytracker-0_90_80-3_fc9:F-8:milkytracker-0.90.80-3.fc9.src.rpm:1215899006 milkytracker-0.90.80-use-system-library.patch: --- NEW FILE milkytracker-0.90.80-use-system-library.patch --- --- milkytracker-0.90.80/configure.debug 2008-04-14 07:44:02.000000000 +0900 +++ milkytracker-0.90.80/configure 2008-05-30 20:08:45.000000000 +0900 @@ -5757,6 +5757,221 @@ +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + { echo "$as_me:$LINENO: checking for zzip/lib.h" >&5 +echo $ECHO_N "checking for zzip/lib.h... $ECHO_C" >&6; } +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_zzip_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zzip_lib_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking zzip/lib.h usability" >&5 +echo $ECHO_N "checking zzip/lib.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking zzip/lib.h presence" >&5 +echo $ECHO_N "checking zzip/lib.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: zzip/lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: zzip/lib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: zzip/lib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: zzip/lib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: zzip/lib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: zzip/lib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: zzip/lib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: zzip/lib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: zzip/lib.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------- ## +## Report this to www.milkytracker.net ## +## ----------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for zzip/lib.h" >&5 +echo $ECHO_N "checking for zzip/lib.h... $ECHO_C" >&6; } +if test "${ac_cv_header_zzip_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_zzip_lib_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_zzip_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zzip_lib_h" >&6; } + +fi +if test $ac_cv_header_zzip_lib_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: \"Cannot find zzip/lib.h\"" >&5 +echo "$as_me: error: \"Cannot find zzip/lib.h\"" >&2;} + { (exit 1); exit 1; }; } +fi + + + +{ echo "$as_me:$LINENO: checking for zzip_file_open in -lzzip" >&5 +echo $ECHO_N "checking for zzip_file_open in -lzzip... $ECHO_C" >&6; } +if test "${ac_cv_lib_zzip_zzip_file_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lzzip $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char zzip_file_open (); +int +main () +{ +return zzip_file_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_zzip_zzip_file_open=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_zzip_zzip_file_open=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_zzip_zzip_file_open" >&5 +echo "${ECHO_T}$ac_cv_lib_zzip_zzip_file_open" >&6; } +if test $ac_cv_lib_zzip_zzip_file_open = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZZIP 1 +_ACEOF + + LIBS="-lzzip $LIBS" + +else + { { echo "$as_me:$LINENO: error: \"Cannot find -lzzip\"" >&5 +echo "$as_me: error: \"Cannot find -lzzip\"" >&2;} + { (exit 1); exit 1; }; } +fi + + # Check that SDL supports the X11 wm { echo "$as_me:$LINENO: checking whether SDL supports X11" >&5 echo $ECHO_N "checking whether SDL supports X11... $ECHO_C" >&6; } --- milkytracker-0.90.80/configure.in.debug 2008-04-14 07:42:14.000000000 +0900 +++ milkytracker-0.90.80/configure.in 2008-05-30 20:08:45.000000000 +0900 @@ -44,6 +44,9 @@ AC_HEADER_STDC AC_CHECK_HEADERS_ONCE([fcntl.h inttypes.h limits.h malloc.h memory.h stddef.h stdint.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/time.h unistd.h],,AC_MSG_ERROR([One or more required header files are missing])) +AC_CHECK_HEADER(zzip/lib.h,,AC_MSG_ERROR("Cannot find zzip/lib.h")) +AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) + # Check that SDL supports the X11 wm AC_MSG_CHECKING([whether SDL supports X11]) OLDCPPFLAGS=$CPPFLAGS --- milkytracker-0.90.80/src/compression/Makefile.am.debug 2008-01-25 07:44:27.000000000 +0900 +++ milkytracker-0.90.80/src/compression/Makefile.am 2008-05-30 20:26:35.000000000 +0900 @@ -1,5 +1,5 @@ noinst_LIBRARIES = libcompression.a -libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp -noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h +libcompression_a_SOURCES = MyIO.cpp PP20.cpp ZipExtractor.cpp +noinst_HEADERS = zziplib/MyIO.h zziplib/zzip_fedora.h PP20.h ZipExtractor.h INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic #INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix --- milkytracker-0.90.80/src/compression/Makefile.in.debug 2008-04-14 07:44:02.000000000 +0900 +++ milkytracker-0.90.80/src/compression/Makefile.in 2008-05-30 20:27:15.000000000 +0900 @@ -46,13 +46,7 @@ ARFLAGS = cru libcompression_a_AR = $(AR) $(ARFLAGS) libcompression_a_LIBADD = -am_libcompression_a_OBJECTS = adler32.$(OBJEXT) compress.$(OBJEXT) \ - deflate.$(OBJEXT) infback.$(OBJEXT) inffast.$(OBJEXT) \ - inflate.$(OBJEXT) inftrees.$(OBJEXT) uncompr.$(OBJEXT) \ - crc32.$(OBJEXT) trees.$(OBJEXT) zutil.$(OBJEXT) dir.$(OBJEXT) \ - err.$(OBJEXT) fetch.$(OBJEXT) file.$(OBJEXT) fseeko.$(OBJEXT) \ - info.$(OBJEXT) plugin.$(OBJEXT) stat.$(OBJEXT) zip.$(OBJEXT) \ - MyIO.$(OBJEXT) PP20.$(OBJEXT) ZipExtractor.$(OBJEXT) +am_libcompression_a_OBJECTS = MyIO.$(OBJEXT) PP20.$(OBJEXT) ZipExtractor.$(OBJEXT) libcompression_a_OBJECTS = $(am_libcompression_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -165,8 +159,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libcompression.a -libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp -noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h +libcompression_a_SOURCES = MyIO.cpp PP20.cpp ZipExtractor.cpp +noninst_HEADERS = zziplib/MyIO.h zziplib/zzip_fedora.h PP20.h ZipExtractor.h INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic all: all-am --- milkytracker-0.90.80/src/compression/ZipExtractor.cpp.debug 2008-01-17 06:49:04.000000000 +0900 +++ milkytracker-0.90.80/src/compression/ZipExtractor.cpp 2008-05-30 20:08:45.000000000 +0900 @@ -11,7 +11,6 @@ #include "XModule.h" #include "XMFile.h" #include "MyIO.h" -#include "zzip_lib.h" ZipExtractor::ZipExtractor(const PPSystemString& archivePath) : archivePath(archivePath) --- milkytracker-0.90.80/src/compression/zziplib/MyIO.h.debug 2008-01-17 06:49:04.000000000 +0900 +++ milkytracker-0.90.80/src/compression/zziplib/MyIO.h 2008-05-30 20:08:45.000000000 +0900 @@ -9,7 +9,7 @@ #ifndef __MYIO_H__ #define __MYIO_H__ -#include "zzip_plugin.h" +#include "zzip_fedora.h" #ifdef __cplusplus extern "C" { --- milkytracker-0.90.80/src/compression/zziplib/zzip_fedora.h.debug 2008-05-30 20:08:45.000000000 +0900 +++ milkytracker-0.90.80/src/compression/zziplib/zzip_fedora.h 2008-05-30 20:08:45.000000000 +0900 @@ -0,0 +1,20 @@ +#ifndef __ZZIP_FEDORA_H__ +#define __ZZIP_FEDORA_H__ + +#include /* size_t */ +#include /* O_WRONLY */ +#include /* system wide zzip */ + +#define __zzipfd size_t /* zzip_conf.h */ +#define _zzip_const const +#define _zzip_ssize_t ssize_t +#define _zzip_size_t size_t +#define _zzip_off_t off_t + +typedef char _zzip_const zzip_char_t; /* zzip.h */ + +typedef _zzip_ssize_t zzip_ssize_t; /* zzip_types.h */ +typedef _zzip_size_t zzip_size_t; +typedef _zzip_off_t zzip_off_t; + +#endif --- NEW FILE milkytracker.desktop --- [Desktop Entry] Name=MilkyTracker Comment=Module tracker Exec=milkytracker %U Terminal=false Type=Application Icon=milkytracker StartupNotify=false Categories=AudioVideo;Audio;Sequencer; --- NEW FILE milkytracker.spec --- Name: milkytracker Version: 0.90.80 Release: 3%{?dist} Summary: Module tracker software for creating music Group: Applications/Multimedia License: GPLv3+ URL: http://www.milkytracker.net/ Source0: http://www.milkytracker.net/files/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: milkytracker-0.90.80-use-system-library.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: zziplib-devel BuildRequires: jack-audio-connection-kit-devel %description MilkyTracker is an application for creating music in the .MOD and .XM formats. Its goal is to be free replacement for the popular Fasttracker II software. %prep %setup -q find . -name \*.cpp -or -name \*.h | xargs chmod 644 %patch0 -p1 -b .debug # Explicitly remove source files rm -rf src/compression/zlib/ rm -rf src/compression/zziplib/generic/ # timestamp: touch files to remove autotool call touch -r configure aclocal.m4 Makefile.in config.h.in %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # copy the icon mkdir -p %{buildroot}%{_datadir}/pixmaps cp -p resources/pictures/carton.png %{buildroot}%{_datadir}/pixmaps/milkytracker.png # copy the desktop file desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_bindir}/milkytracker %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/milkytracker.png %changelog * Fri May 30 2008 Mamoru Tasaka - 0.90.80-3 - Use system-wide zziplib (zlib is not used directly) * Mon May 26 2008 Joonas Saraj??rvi - 0.90.80-2 - Set Source0 to use macros for easier updating. - Removed the --without-jack configuration option. - Added -p to the cp command to preserve the timestamp. - Replaced /usr/share with a macro. - Added a line to prep to set correct permissions for source files extracted from the tarball. - Modified a Makefile.am to not compile the included static zlib library. * Sat May 3 2008 Joonas Saraj??rvi - 0.90.80-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/milkytracker/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 21:03:50 -0000 1.1 +++ .cvsignore 12 Jul 2008 21:45:14 -0000 1.2 @@ -0,0 +1 @@ +milkytracker-0.90.80.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/milkytracker/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 21:03:50 -0000 1.1 +++ sources 12 Jul 2008 21:45:14 -0000 1.2 @@ -0,0 +1 @@ +f8090ac13ec2f3cf89af483d1483d16c milkytracker-0.90.80.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 12 22:06:08 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 22:06:08 GMT Subject: rpms/newsx/devel newsx.spec,1.8,1.9 Message-ID: <200807122206.m6CM685o018639@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/newsx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18553 Modified Files: newsx.spec Log Message: - fixed build on rawhide Index: newsx.spec =================================================================== RCS file: /cvs/pkgs/rpms/newsx/devel/newsx.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- newsx.spec 12 Jul 2008 21:11:47 -0000 1.8 +++ newsx.spec 12 Jul 2008 22:05:15 -0000 1.9 @@ -32,7 +32,9 @@ %build autoreconf -f -i -%configure --without-history +%configure \ + --with-newsconfig=/usr/lib/news/lib/innshellvars \ + --with-newslib=%{_libdir}/news/lib \ %{__make} %{?_smp_mflags} @@ -62,6 +64,7 @@ * Sat Jul 12 2008 Dominik Mierzejewski 1.6-9 - fixed stack buffer overflow in getarticle.c (#454483) - rebuilt against INN shared libraries (#454897) +- fixed build on rawhide * Tue Feb 19 2008 Fedora Release Engineering - 1.6-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Jul 12 22:12:46 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 22:12:46 GMT Subject: rpms/newsx/devel newsx.spec,1.9,1.10 Message-ID: <200807122212.m6CMCk2a018865@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/newsx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18827 Modified Files: newsx.spec Log Message: - yet another build fix Index: newsx.spec =================================================================== RCS file: /cvs/pkgs/rpms/newsx/devel/newsx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- newsx.spec 12 Jul 2008 22:05:15 -0000 1.9 +++ newsx.spec 12 Jul 2008 22:11:53 -0000 1.10 @@ -33,6 +33,7 @@ %build autoreconf -f -i %configure \ + --with-inhosts=/var/spool/news/inhosts \ --with-newsconfig=/usr/lib/news/lib/innshellvars \ --with-newslib=%{_libdir}/news/lib \ From fedora-extras-commits at redhat.com Sat Jul 12 22:29:41 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 22:29:41 GMT Subject: rpms/newsx/F-9 newsx-stack.patch,NONE,1.1 newsx.spec,1.7,1.8 Message-ID: <200807122229.m6CMTfVX019706@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/newsx/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19664 Modified Files: newsx.spec Added Files: newsx-stack.patch Log Message: * Sat Jul 12 2008 Dominik Mierzejewski 1.6-9 - fixed stack buffer overflow in getarticle.c (#454483) - restored the use of history newsx-stack.patch: --- NEW FILE newsx-stack.patch --- diff -up newsx-1.6/src/getarticle.c.stack newsx-1.6/src/getarticle.c --- newsx-1.6/src/getarticle.c.stack 2003-01-21 10:47:25.000000000 +0100 +++ newsx-1.6/src/getarticle.c 2008-07-12 23:02:35.000000000 +0200 @@ -143,12 +143,12 @@ read_article(long where,char *group) long len; long bytecount = 0L; /* BUG: */ - line=linebuf; - line[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */ + linebuf[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */ path_line[0] = '\0'; /* fetch the article, header and body */ for (;;) { + line=linebuf; if (!get_server_msg(line, MAX_HEADER_SIZE)) { /* timeout: simply give up */ return 0; Index: newsx.spec =================================================================== RCS file: /cvs/pkgs/rpms/newsx/F-9/newsx.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- newsx.spec 19 Feb 2008 20:47:54 -0000 1.7 +++ newsx.spec 12 Jul 2008 22:28:47 -0000 1.8 @@ -1,6 +1,6 @@ Name: newsx Version: 1.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Summary: NNTP news exchange utility Summary(pl): Narz??dzie do wymiany news??w po NNTP @@ -8,6 +8,7 @@ Source0: ftp://ftp.kvaleberg.com/pub/%{name}-%{version}.tar.gz # Source0-md5: ad9c76c53d5c7d21d86bec805fe8cd34 Patch0: %{name}-make.patch +Patch1: %{name}-stack.patch BuildRequires: inn-devel BuildRequires: automake BuildRequires: autoconf @@ -27,10 +28,14 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .stack %build autoreconf -f -i -%configure --without-history +%configure \ + --with-inhosts=/var/spool/news/inhosts \ + --with-newsconfig=/usr/lib/news/lib/innshellvars \ + --with-newslib=%{_libdir}/news/lib \ %{__make} %{?_smp_mflags} @@ -57,6 +62,10 @@ %{_mandir}/man[158]/* %changelog +* Sat Jul 12 2008 Dominik Mierzejewski 1.6-9 +- fixed stack buffer overflow in getarticle.c (#454483) +- restored the use of history + * Tue Feb 19 2008 Fedora Release Engineering - 1.6-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Jul 12 22:42:26 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 22:42:26 GMT Subject: rpms/newsx/F-8 newsx-stack.patch,NONE,1.1 newsx.spec,1.5,1.6 Message-ID: <200807122242.m6CMgQB7020155@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/newsx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20110 Modified Files: newsx.spec Added Files: newsx-stack.patch Log Message: * Sat Jul 12 2008 Dominik Mierzejewski 1.6-8 - fixed stack buffer overflow in getarticle.c (#454483) - URL no longer exists - restored the use of history newsx-stack.patch: --- NEW FILE newsx-stack.patch --- diff -up newsx-1.6/src/getarticle.c.stack newsx-1.6/src/getarticle.c --- newsx-1.6/src/getarticle.c.stack 2003-01-21 10:47:25.000000000 +0100 +++ newsx-1.6/src/getarticle.c 2008-07-12 23:02:35.000000000 +0200 @@ -143,12 +143,12 @@ read_article(long where,char *group) long len; long bytecount = 0L; /* BUG: */ - line=linebuf; - line[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */ + linebuf[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */ path_line[0] = '\0'; /* fetch the article, header and body */ for (;;) { + line=linebuf; if (!get_server_msg(line, MAX_HEADER_SIZE)) { /* timeout: simply give up */ return 0; Index: newsx.spec =================================================================== RCS file: /cvs/pkgs/rpms/newsx/F-8/newsx.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- newsx.spec 27 Aug 2007 17:42:35 -0000 1.5 +++ newsx.spec 12 Jul 2008 22:41:38 -0000 1.6 @@ -1,6 +1,6 @@ Name: newsx Version: 1.6 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Summary: NNTP news exchange utility Summary(pl): Narz??dzie do wymiany news??w po NNTP @@ -8,7 +8,7 @@ Source0: ftp://ftp.kvaleberg.com/pub/%{name}-%{version}.tar.gz # Source0-md5: ad9c76c53d5c7d21d86bec805fe8cd34 Patch0: %{name}-make.patch -URL: http://www.kvaleberg.com/newsx.html +Patch1: %{name}-stack.patch BuildRequires: inn-devel BuildRequires: automake BuildRequires: autoconf @@ -28,10 +28,14 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .stack %build autoreconf -f -i -%configure --without-history +%configure \ + --with-inhosts=/var/spool/news/inhosts \ + --with-newsconfig=/usr/lib/news/lib/innshellvars \ + --with-newslib=%{_libdir}/news/lib \ %{__make} %{?_smp_mflags} @@ -58,6 +62,11 @@ %{_mandir}/man[158]/* %changelog +* Sat Jul 12 2008 Dominik Mierzejewski 1.6-8 +- fixed stack buffer overflow in getarticle.c (#454483) +- URL no longer exists +- restored the use of history + * Mon Aug 27 2007 Dominik Mierzejewski 1.6-7 - rebuild for BuildID - update license tag From fedora-extras-commits at redhat.com Sat Jul 12 23:26:18 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 23:26:18 GMT Subject: rpms/gl2ps/devel gl2ps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807122326.m6CNQI4K028922@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/gl2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28874 Modified Files: .cvsignore sources Added Files: gl2ps.spec Log Message: - initial import --- NEW FILE gl2ps.spec --- Summary: An OpenGL to PostScript printing library Summary(pl): Biblioteka drukowania z OpenGL-a do PostScriptu Name: gl2ps Version: 1.3.2 Release: 1%{?dist} License: LGPLv2+ or GL2PS Group: System Environment/Libraries Source0: http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz # Source0-md5: 15cf4a6a790c109fc03c6601660d73a7 URL: http://www.geuz.org/gl2ps/ BuildRequires: libGL-devel BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) %description GL2PS is a C library providing high quality vector output for any OpenGL application. The main difference between GL2PS and other similar libraries is the use of sorting algorithms capable of handling intersecting and stretched polygons, as well as non manifold objects. GL2PS provides advanced smooth shading and text rendering, culling of invisible primitives, mixed vector/bitmap output, and much more... GL2PS can currently create PostScript (PS), Encapsulated PostScript (EPS) and Portable Document Format (PDF) files, as well as LaTeX files for the text fragments. Adding new vector output formats should be relatively easy (and amongst the formats we would be interested in adding, SVG is first in line). Meanwhile, you can use the excellent pstoedit program to transform the PostScript files generated by GL2PS into many other vector formats such as xfig, cgm, wmf, etc. %description -l pl GL2PS to biblioteka C zapewniaj??ca wysokiej jako??ci wyj??cie wektorowe dla dowolnej aplikacji OpenGL. G????wna r????nica mi??dzy GL2PS a innymi podobnymi bibliotekami polega na u??yciu algorytm??w sortuj??cych potrafi??cych obs??u??y?? przecinaj??ce si?? i rozci??gni??te wielok??ty, a tak??e obiekty nie b??d??ce rozmaito??ciami. GL2PS zapewnia zaawansowane g??adkie cieniowanie i renderowanie tekstu, usuwanie niewidocznych prymityw??w, mieszane wyj??cie wektorowo-bitmapowe i wiele wi??cej. GL2PS aktualnie potrafi tworzy?? pliki PostScript (PS), Encapsulated PostScript (EPS) oraz Portable Document Format (PDF), a tak??e pliki LaTeXa dla fragment??w tekstowych. Dodanie nowych wyj??ciowych format??w wektorowych powinno by?? wzgl??dnie ??atwe (a spo??r??d format??w, kt??rych dodanie zainteresowani byliby autorzy, pierwszym jest SVG). Tymczasem mo??na u??ywa?? ??wietnego programu pstoedit do przekszta??cania plik??w PostScript generowanych przez GL2PS na wiele innych format??w wektorowych, takich jak xfig, cgm, wmf itp. %package devel Summary: Header files for GL2PS library Summary(pl): Pliki nag????wkowe biblioteki GL2PS Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libGL-devel %description devel Header files for GL2PS library. %description devel -l pl Pliki nag????wkowe biblioteki GL2PS. %prep %setup -q %build libtool --mode=compile %{__cc} %{optflags} -c -o gl2ps.lo gl2ps.c libtool --mode=link %{__cc} %{optflags} -o libgl2ps.la gl2ps.lo -rpath %{_libdir} -lGL -lm %install rm -rf %{buildroot} install -d %{buildroot}{%{_libdir},%{_includedir}} libtool --mode=install install libgl2ps.la %{buildroot}%{_libdir} install -pm644 gl2ps.h %{buildroot}%{_includedir} rm %{buildroot}%{_libdir}/libgl2ps.{l,}a %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(644,root,root,755) %doc COPYING.GL2PS COPYING.LGPL %attr(755,root,root) %{_libdir}/libgl2ps.so.* %files devel %defattr(644,root,root,755) %doc gl2ps.pdf TODO %attr(755,root,root) %{_libdir}/libgl2ps.so %{_includedir}/gl2ps.h %changelog * Fri Jun 13 2008 Dominik Mierzejewski 1.3.2-1 - adapted PLD spec r1.2 - dropped static package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gl2ps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:11:47 -0000 1.1 +++ .cvsignore 12 Jul 2008 23:25:32 -0000 1.2 @@ -0,0 +1 @@ +gl2ps-1.3.2.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gl2ps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jun 2008 17:11:47 -0000 1.1 +++ sources 12 Jul 2008 23:25:32 -0000 1.2 @@ -0,0 +1 @@ +15cf4a6a790c109fc03c6601660d73a7 gl2ps-1.3.2.tgz From fedora-extras-commits at redhat.com Sat Jul 12 23:37:12 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 12 Jul 2008 23:37:12 GMT Subject: rpms/gl2ps/devel gl2ps.spec,1.1,1.2 Message-ID: <200807122337.m6CNbCCN029282@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/gl2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29252 Modified Files: gl2ps.spec Log Message: - more standard buildroot Index: gl2ps.spec =================================================================== RCS file: /cvs/pkgs/rpms/gl2ps/devel/gl2ps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gl2ps.spec 12 Jul 2008 23:25:32 -0000 1.1 +++ gl2ps.spec 12 Jul 2008 23:36:28 -0000 1.2 @@ -10,7 +10,7 @@ URL: http://www.geuz.org/gl2ps/ BuildRequires: libGL-devel BuildRequires: libtool -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) %description GL2PS is a C library providing high quality vector output for any From fedora-extras-commits at redhat.com Sun Jul 13 00:10:59 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 13 Jul 2008 00:10:59 GMT Subject: rpms/gl2ps/F-9 gl2ps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807130010.m6D0Axn5004414@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/gl2ps/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4369 Modified Files: .cvsignore sources Added Files: gl2ps.spec Log Message: - initial import into F-9 branch --- NEW FILE gl2ps.spec --- Summary: An OpenGL to PostScript printing library Summary(pl): Biblioteka drukowania z OpenGL-a do PostScriptu Name: gl2ps Version: 1.3.2 Release: 1%{?dist} License: LGPLv2+ or GL2PS Group: System Environment/Libraries Source0: http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz # Source0-md5: 15cf4a6a790c109fc03c6601660d73a7 URL: http://www.geuz.org/gl2ps/ BuildRequires: libGL-devel BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) %description GL2PS is a C library providing high quality vector output for any OpenGL application. The main difference between GL2PS and other similar libraries is the use of sorting algorithms capable of handling intersecting and stretched polygons, as well as non manifold objects. GL2PS provides advanced smooth shading and text rendering, culling of invisible primitives, mixed vector/bitmap output, and much more... GL2PS can currently create PostScript (PS), Encapsulated PostScript (EPS) and Portable Document Format (PDF) files, as well as LaTeX files for the text fragments. Adding new vector output formats should be relatively easy (and amongst the formats we would be interested in adding, SVG is first in line). Meanwhile, you can use the excellent pstoedit program to transform the PostScript files generated by GL2PS into many other vector formats such as xfig, cgm, wmf, etc. %description -l pl GL2PS to biblioteka C zapewniaj??ca wysokiej jako??ci wyj??cie wektorowe dla dowolnej aplikacji OpenGL. G????wna r????nica mi??dzy GL2PS a innymi podobnymi bibliotekami polega na u??yciu algorytm??w sortuj??cych potrafi??cych obs??u??y?? przecinaj??ce si?? i rozci??gni??te wielok??ty, a tak??e obiekty nie b??d??ce rozmaito??ciami. GL2PS zapewnia zaawansowane g??adkie cieniowanie i renderowanie tekstu, usuwanie niewidocznych prymityw??w, mieszane wyj??cie wektorowo-bitmapowe i wiele wi??cej. GL2PS aktualnie potrafi tworzy?? pliki PostScript (PS), Encapsulated PostScript (EPS) oraz Portable Document Format (PDF), a tak??e pliki LaTeXa dla fragment??w tekstowych. Dodanie nowych wyj??ciowych format??w wektorowych powinno by?? wzgl??dnie ??atwe (a spo??r??d format??w, kt??rych dodanie zainteresowani byliby autorzy, pierwszym jest SVG). Tymczasem mo??na u??ywa?? ??wietnego programu pstoedit do przekszta??cania plik??w PostScript generowanych przez GL2PS na wiele innych format??w wektorowych, takich jak xfig, cgm, wmf itp. %package devel Summary: Header files for GL2PS library Summary(pl): Pliki nag????wkowe biblioteki GL2PS Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libGL-devel %description devel Header files for GL2PS library. %description devel -l pl Pliki nag????wkowe biblioteki GL2PS. %prep %setup -q %build libtool --mode=compile %{__cc} %{optflags} -c -o gl2ps.lo gl2ps.c libtool --mode=link %{__cc} %{optflags} -o libgl2ps.la gl2ps.lo -rpath %{_libdir} -lGL -lm %install rm -rf %{buildroot} install -d %{buildroot}{%{_libdir},%{_includedir}} libtool --mode=install install libgl2ps.la %{buildroot}%{_libdir} install -pm644 gl2ps.h %{buildroot}%{_includedir} rm %{buildroot}%{_libdir}/libgl2ps.{l,}a %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(644,root,root,755) %doc COPYING.GL2PS COPYING.LGPL %attr(755,root,root) %{_libdir}/libgl2ps.so.* %files devel %defattr(644,root,root,755) %doc gl2ps.pdf TODO %attr(755,root,root) %{_libdir}/libgl2ps.so %{_includedir}/gl2ps.h %changelog * Fri Jun 13 2008 Dominik Mierzejewski 1.3.2-1 - adapted PLD spec r1.2 - dropped static package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gl2ps/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:11:47 -0000 1.1 +++ .cvsignore 13 Jul 2008 00:09:56 -0000 1.2 @@ -0,0 +1 @@ +gl2ps-1.3.2.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gl2ps/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jun 2008 17:11:47 -0000 1.1 +++ sources 13 Jul 2008 00:09:56 -0000 1.2 @@ -0,0 +1 @@ +15cf4a6a790c109fc03c6601660d73a7 gl2ps-1.3.2.tgz From fedora-extras-commits at redhat.com Sun Jul 13 00:28:03 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sun, 13 Jul 2008 00:28:03 GMT Subject: rpms/gc/devel gc.spec,1.31,1.32 Message-ID: <200807130028.m6D0S3VG004850@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822 Modified Files: gc.spec Log Message: * Sat Jul 12 2008 Rex Dieter 7.1-2 - --enable-large-config (#453972) Index: gc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gc/devel/gc.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gc.spec 20 Jun 2008 18:59:03 -0000 1.31 +++ gc.spec 13 Jul 2008 00:27:02 -0000 1.32 @@ -3,7 +3,7 @@ Name: gc Version: 7.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -53,10 +53,11 @@ --disable-dependency-tracking \ --disable-static \ --enable-cplusplus \ - --enable-threads=posix \ + --enable-large-config \ %ifarch %{ix86} - --enable-parallel-mark + --enable-parallel-mark \ %endif + --enable-threads=posix make %{?_smp_mflags} @@ -104,6 +105,9 @@ %changelog +* Sat Jul 12 2008 Rex Dieter 7.1-2 +- --enable-large-config (#453972) + * Sun May 04 2008 Rex Dieter 7.1-1 - gc-7.1 - purge rpaths From fedora-extras-commits at redhat.com Sun Jul 13 00:42:52 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 13 Jul 2008 00:42:52 GMT Subject: rpms/gl2ps/F-8 gl2ps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807130042.m6D0gqUT005451@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/gl2ps/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5371 Modified Files: .cvsignore sources Added Files: gl2ps.spec Log Message: - initial import into F-8 branch --- NEW FILE gl2ps.spec --- Summary: An OpenGL to PostScript printing library Summary(pl): Biblioteka drukowania z OpenGL-a do PostScriptu Name: gl2ps Version: 1.3.2 Release: 1%{?dist} License: LGPLv2+ or GL2PS Group: System Environment/Libraries Source0: http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz # Source0-md5: 15cf4a6a790c109fc03c6601660d73a7 URL: http://www.geuz.org/gl2ps/ BuildRequires: libGL-devel BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) %description GL2PS is a C library providing high quality vector output for any OpenGL application. The main difference between GL2PS and other similar libraries is the use of sorting algorithms capable of handling intersecting and stretched polygons, as well as non manifold objects. GL2PS provides advanced smooth shading and text rendering, culling of invisible primitives, mixed vector/bitmap output, and much more... GL2PS can currently create PostScript (PS), Encapsulated PostScript (EPS) and Portable Document Format (PDF) files, as well as LaTeX files for the text fragments. Adding new vector output formats should be relatively easy (and amongst the formats we would be interested in adding, SVG is first in line). Meanwhile, you can use the excellent pstoedit program to transform the PostScript files generated by GL2PS into many other vector formats such as xfig, cgm, wmf, etc. %description -l pl GL2PS to biblioteka C zapewniaj??ca wysokiej jako??ci wyj??cie wektorowe dla dowolnej aplikacji OpenGL. G????wna r????nica mi??dzy GL2PS a innymi podobnymi bibliotekami polega na u??yciu algorytm??w sortuj??cych potrafi??cych obs??u??y?? przecinaj??ce si?? i rozci??gni??te wielok??ty, a tak??e obiekty nie b??d??ce rozmaito??ciami. GL2PS zapewnia zaawansowane g??adkie cieniowanie i renderowanie tekstu, usuwanie niewidocznych prymityw??w, mieszane wyj??cie wektorowo-bitmapowe i wiele wi??cej. GL2PS aktualnie potrafi tworzy?? pliki PostScript (PS), Encapsulated PostScript (EPS) oraz Portable Document Format (PDF), a tak??e pliki LaTeXa dla fragment??w tekstowych. Dodanie nowych wyj??ciowych format??w wektorowych powinno by?? wzgl??dnie ??atwe (a spo??r??d format??w, kt??rych dodanie zainteresowani byliby autorzy, pierwszym jest SVG). Tymczasem mo??na u??ywa?? ??wietnego programu pstoedit do przekszta??cania plik??w PostScript generowanych przez GL2PS na wiele innych format??w wektorowych, takich jak xfig, cgm, wmf itp. %package devel Summary: Header files for GL2PS library Summary(pl): Pliki nag????wkowe biblioteki GL2PS Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libGL-devel %description devel Header files for GL2PS library. %description devel -l pl Pliki nag????wkowe biblioteki GL2PS. %prep %setup -q %build libtool --mode=compile %{__cc} %{optflags} -c -o gl2ps.lo gl2ps.c libtool --mode=link %{__cc} %{optflags} -o libgl2ps.la gl2ps.lo -rpath %{_libdir} -lGL -lm %install rm -rf %{buildroot} install -d %{buildroot}{%{_libdir},%{_includedir}} libtool --mode=install install libgl2ps.la %{buildroot}%{_libdir} install -pm644 gl2ps.h %{buildroot}%{_includedir} rm %{buildroot}%{_libdir}/libgl2ps.{l,}a %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(644,root,root,755) %doc COPYING.GL2PS COPYING.LGPL %attr(755,root,root) %{_libdir}/libgl2ps.so.* %files devel %defattr(644,root,root,755) %doc gl2ps.pdf TODO %attr(755,root,root) %{_libdir}/libgl2ps.so %{_includedir}/gl2ps.h %changelog * Fri Jun 13 2008 Dominik Mierzejewski 1.3.2-1 - adapted PLD spec r1.2 - dropped static package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gl2ps/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:11:47 -0000 1.1 +++ .cvsignore 13 Jul 2008 00:42:08 -0000 1.2 @@ -0,0 +1 @@ +gl2ps-1.3.2.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gl2ps/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jun 2008 17:11:47 -0000 1.1 +++ sources 13 Jul 2008 00:42:08 -0000 1.2 @@ -0,0 +1 @@ +15cf4a6a790c109fc03c6601660d73a7 gl2ps-1.3.2.tgz From fedora-extras-commits at redhat.com Sun Jul 13 02:35:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 13 Jul 2008 02:35:03 GMT Subject: rpms/ntfs-3g/F-9 ntfs-3g.spec,1.31,1.32 sources,1.23,1.24 Message-ID: <200807130235.m6D2Z3gu022413@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ntfs-3g/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22299/F-9 Modified Files: ntfs-3g.spec sources Log Message: update to 1.2712 Index: ntfs-3g.spec =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/F-9/ntfs-3g.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ntfs-3g.spec 6 May 2008 02:19:13 -0000 1.31 +++ ntfs-3g.spec 13 Jul 2008 02:33:35 -0000 1.32 @@ -4,7 +4,7 @@ Name: ntfs-3g Summary: Linux NTFS userspace driver -Version: 1.2506 +Version: 1.2712 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -123,6 +123,9 @@ %{_libdir}/pkgconfig/libntfs-3g.pc %changelog +* Sat Jul 12 2008 Tom "spot" Callaway - 2:1.2712-1 +- update to 1.2712 + * Mon May 5 2008 Tom "spot" Callaway - 2:1.2506-1 - update to 1.2506 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 6 May 2008 02:19:13 -0000 1.23 +++ sources 13 Jul 2008 02:33:35 -0000 1.24 @@ -1 +1 @@ -fc8b4419000fd104192a2b065ca5a327 ntfs-3g-1.2506.tgz +9e50dac71261dbb401511be4e9020def ntfs-3g-1.2712.tgz From fedora-extras-commits at redhat.com Sun Jul 13 02:35:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 13 Jul 2008 02:35:05 GMT Subject: rpms/ntfs-3g/F-8 ntfs-3g.spec,1.25,1.26 sources,1.19,1.20 Message-ID: <200807130235.m6D2Z54I022420@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ntfs-3g/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22299/F-8 Modified Files: ntfs-3g.spec sources Log Message: update to 1.2712 Index: ntfs-3g.spec =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/F-8/ntfs-3g.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ntfs-3g.spec 6 May 2008 02:37:28 -0000 1.25 +++ ntfs-3g.spec 13 Jul 2008 02:33:14 -0000 1.26 @@ -4,8 +4,8 @@ Name: ntfs-3g Summary: Linux NTFS userspace driver -Version: 1.2506 -Release: 1%{?dist}.1 +Version: 1.2712 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://www.ntfs-3g.org/%{name}-%{version}.tgz @@ -123,6 +123,9 @@ %{_libdir}/pkgconfig/libntfs-3g.pc %changelog +* Sat Jul 12 2008 Tom "spot" Callaway - 2:1.2712-1 +- update to 1.2712 + * Mon May 5 2008 Tom "spot" Callaway - 2:1.2506-1.1 - missing patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/F-8/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 6 May 2008 02:19:06 -0000 1.19 +++ sources 13 Jul 2008 02:33:14 -0000 1.20 @@ -1 +1 @@ -fc8b4419000fd104192a2b065ca5a327 ntfs-3g-1.2506.tgz +9e50dac71261dbb401511be4e9020def ntfs-3g-1.2712.tgz From fedora-extras-commits at redhat.com Sun Jul 13 02:35:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 13 Jul 2008 02:35:11 GMT Subject: rpms/ntfs-3g/devel .cvsignore, 1.21, 1.22 ntfs-3g.spec, 1.31, 1.32 sources, 1.23, 1.24 Message-ID: <200807130235.m6D2ZBWA022426@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ntfs-3g/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22299/devel Modified Files: .cvsignore ntfs-3g.spec sources Log Message: update to 1.2712 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 22 Apr 2008 16:14:52 -0000 1.21 +++ .cvsignore 13 Jul 2008 02:34:05 -0000 1.22 @@ -1 +1 @@ -ntfs-3g-1.2412.tgz +ntfs-3g-1.2712.tgz Index: ntfs-3g.spec =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ntfs-3g.spec 6 May 2008 02:19:22 -0000 1.31 +++ ntfs-3g.spec 13 Jul 2008 02:34:05 -0000 1.32 @@ -4,7 +4,7 @@ Name: ntfs-3g Summary: Linux NTFS userspace driver -Version: 1.2506 +Version: 1.2712 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -123,6 +123,9 @@ %{_libdir}/pkgconfig/libntfs-3g.pc %changelog +* Sat Jul 12 2008 Tom "spot" Callaway - 2:1.2712-1 +- update to 1.2712 + * Mon May 5 2008 Tom "spot" Callaway - 2:1.2506-1 - update to 1.2506 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 6 May 2008 02:19:22 -0000 1.23 +++ sources 13 Jul 2008 02:34:05 -0000 1.24 @@ -1 +1 @@ -fc8b4419000fd104192a2b065ca5a327 ntfs-3g-1.2506.tgz +9e50dac71261dbb401511be4e9020def ntfs-3g-1.2712.tgz From fedora-extras-commits at redhat.com Sun Jul 13 09:42:06 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sun, 13 Jul 2008 09:42:06 GMT Subject: rpms/php-pecl-apc/F-8 php-pecl-apc.spec,1.7,1.8 sources,1.4,1.5 Message-ID: <200807130942.m6D9g6C5026285@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/pkgs/rpms/php-pecl-apc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26134 Modified Files: php-pecl-apc.spec sources Log Message: Update to 3.0.19 Usual maintainer has fallen behind with updates and has indicated that he will welcome assistance Index: php-pecl-apc.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-apc/F-8/php-pecl-apc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-pecl-apc.spec 28 Aug 2007 21:53:01 -0000 1.7 +++ php-pecl-apc.spec 13 Jul 2008 09:41:13 -0000 1.8 @@ -1,31 +1,48 @@ +%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) +%global php_zendabiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP Extension => //p') | tail -1) +%global php_version %((echo 0; php-config --version 2>/dev/null) | tail -1) +%define pecl_name APC + Summary: APC caches and optimizes PHP intermediate code Name: php-pecl-apc -Version: 3.0.14 -Release: 2%{?dist} -License: PHP License +Version: 3.0.19 +Release: 1%{?dist} +License: PHP Group: Development/Languages URL: http://pecl.php.net/package/APC Source: http://pecl.php.net/get/APC-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Conflicts: php-mmcache php-eaccelerator -BuildRequires: php-devel httpd-devel -Obsoletes: php-apc +BuildRequires: php-devel httpd-devel php-pear %if %{?php_zend_api}0 -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} +# Require clean ABI/API versions if available (Fedora) +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +%else +%if "%{rhel}" == "5" +# RHEL5 where we have php-common providing the Zend ABI the "old way" +Requires: php-zend-abi = %{php_zendabiver} %else -Requires: php-api = %{php_apiver} +# RHEL4 where we have no php-common and nothing providing the Zend ABI... +Requires: php = %{php_version} +%endif %endif -Provides: php-apc = %{version}-%{release} -Provides: php-pecl(apc) +Provides: php-pecl(%{pecl_name}) = %{version} + +# This is obsoleted by the above Provide, but for backwards compatibility +# with previous versions of the package +Provides: php-pecl(apc) = %{version} + +Requires(post): %{__pecl} +Requires(postun): %{__pecl} %description -APC is a free, open, and robust framework for -caching and optimizing PHP intermediate code. +APC is a free, open, and robust framework for caching and optimizing PHP +intermediate code. %prep -%setup -q -n APC-%{version} +%setup -q -n %{pecl_name}-%{version} %build %{_bindir}/phpize @@ -36,6 +53,10 @@ %{__rm} -rf %{buildroot} %{__make} install INSTALL_ROOT=%{buildroot} +# Install the package XML file +%{__mkdir_p} %{buildroot}%{pecl_xmldir} +%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{pecl_name}.xml + # Drop in the bit of configuration %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d %{__cat} > %{buildroot}%{_sysconfdir}/php.d/apc.ini << 'EOF' @@ -54,6 +75,19 @@ apc.cache_by_default=1 EOF +# Fix the charset of NOTICE +iconv -f iso-8859-1 -t utf8 NOTICE >NOTICE.utf8 +mv NOTICE.utf8 NOTICE + +%post +%{__pecl} install --nodeps --soft --force --register-only --nobuild %{pecl_xmldir}/%{pecl_name}.xml >/dev/null || : + + +%postun +if [ $1 -eq 0 ] ; then +%{__pecl} uninstall --nodeps --ignore-errors --register-only %{pecl_name} >/dev/null || : +fi + %clean %{__rm} -rf %{buildroot} @@ -62,8 +96,19 @@ %doc TECHNOTES.txt CHANGELOG LICENSE NOTICE TODO INSTALL apc.php %config(noreplace) %{_sysconfdir}/php.d/apc.ini %{php_extdir}/apc.so +%{pecl_xmldir}/%{pecl_name}.xml %changelog +* Wed Jun 25 2008 Tim Jackson - 3.0.19-1 +- Update to 3.0.19 +- Fix PHP Zend API/ABI dependencies to work on EL-4/5 +- Fix "License" tag +- Fix encoding of "NOTICE" file +- Add registration via PECL + +* Mon Feb 18 2008 Fedora Release Engineering - 3.0.14-3 +- Autorebuild for GCC 4.3 + * Tue Aug 28 2007 Fedora Release Engineering - 3.0.14-2 - Rebuild for selinux ppc32 issue. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-apc/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Jun 2007 13:41:58 -0000 1.4 +++ sources 13 Jul 2008 09:41:13 -0000 1.5 @@ -1 +1 @@ -0f452f936239b6107d3e2e5cda4f4bda APC-3.0.14.tgz +951f43d2873e3572f5d5ae71a9b66f90 APC-3.0.19.tgz From fedora-extras-commits at redhat.com Sun Jul 13 10:13:16 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 13 Jul 2008 10:13:16 GMT Subject: rpms/mksh/F-8 .cvsignore, 1.12, 1.13 mksh.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <200807131013.m6DADGi5002953@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2551/F-8 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Apr 2008 21:57:36 -0000 1.12 +++ .cvsignore 13 Jul 2008 10:11:46 -0000 1.13 @@ -1,2 +1,2 @@ -mksh-R33d.cpio.gz +mksh-R35.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/mksh.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mksh.spec 12 Apr 2008 21:57:36 -0000 1.13 +++ mksh.spec 13 Jul 2008 10:11:46 -0000 1.14 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 33d +Version: 35 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -24,7 +24,7 @@ %prep %setup -q -T -c -# RPM 4.4.2 has no support for *.cpio.gz +# rpm.org has no support for *.cpio.gz gzip -dc %{SOURCE0} | cpio -imd mv %{name}/* . && rm -rf %{name} cp -f %{SOURCE1} . @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 13 2008 Robert Scheck 35-1 +- Upgrade to 35 + * Sat Apr 12 2008 Robert Scheck 33d-1 - Upgrade to 33d Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Apr 2008 21:57:36 -0000 1.12 +++ sources 13 Jul 2008 10:11:46 -0000 1.13 @@ -1,2 +1,2 @@ -8ad2547ad55dc3a02b13554ab9b5c9c8 mksh-R33d.cpio.gz +5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Sun Jul 13 10:13:16 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 13 Jul 2008 10:13:16 GMT Subject: rpms/mksh/EL-5 .cvsignore, 1.12, 1.13 mksh.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <200807131013.m6DADGMs002959@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2551/EL-5 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Apr 2008 21:57:15 -0000 1.12 +++ .cvsignore 13 Jul 2008 10:11:28 -0000 1.13 @@ -1,2 +1,2 @@ -mksh-R33d.cpio.gz +mksh-R35.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mksh.spec 12 Apr 2008 21:57:15 -0000 1.13 +++ mksh.spec 13 Jul 2008 10:11:28 -0000 1.14 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 33d +Version: 35 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -24,7 +24,7 @@ %prep %setup -q -T -c -# RPM 4.4.2 has no support for *.cpio.gz +# rpm.org has no support for *.cpio.gz gzip -dc %{SOURCE0} | cpio -imd mv %{name}/* . && rm -rf %{name} cp -f %{SOURCE1} . @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 13 2008 Robert Scheck 35-1 +- Upgrade to 35 + * Sat Apr 12 2008 Robert Scheck 33d-1 - Upgrade to 33d Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Apr 2008 21:57:15 -0000 1.12 +++ sources 13 Jul 2008 10:11:28 -0000 1.13 @@ -1,2 +1,2 @@ -8ad2547ad55dc3a02b13554ab9b5c9c8 mksh-R33d.cpio.gz +5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Sun Jul 13 10:13:28 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 13 Jul 2008 10:13:28 GMT Subject: rpms/mksh/EL-4 .cvsignore, 1.12, 1.13 mksh.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <200807131013.m6DADSpC003009@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2551/EL-4 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Apr 2008 21:57:08 -0000 1.12 +++ .cvsignore 13 Jul 2008 10:11:04 -0000 1.13 @@ -1,2 +1,2 @@ -mksh-R33d.cpio.gz +mksh-R35.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mksh.spec 12 Apr 2008 21:57:08 -0000 1.13 +++ mksh.spec 13 Jul 2008 10:11:04 -0000 1.14 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 33d +Version: 35 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -24,7 +24,7 @@ %prep %setup -q -T -c -# RPM 4.4.2 has no support for *.cpio.gz +# rpm.org has no support for *.cpio.gz gzip -dc %{SOURCE0} | cpio -imd mv %{name}/* . && rm -rf %{name} cp -f %{SOURCE1} . @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 13 2008 Robert Scheck 35-1 +- Upgrade to 35 + * Sat Apr 12 2008 Robert Scheck 33d-1 - Upgrade to 33d Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Apr 2008 21:57:08 -0000 1.12 +++ sources 13 Jul 2008 10:11:04 -0000 1.13 @@ -1,2 +1,2 @@ -8ad2547ad55dc3a02b13554ab9b5c9c8 mksh-R33d.cpio.gz +5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Sun Jul 13 10:13:33 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 13 Jul 2008 10:13:33 GMT Subject: rpms/mksh/F-9 .cvsignore, 1.12, 1.13 mksh.spec, 1.14, 1.15 sources, 1.12, 1.13 Message-ID: <200807131013.m6DADX0h003025@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2551/F-9 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Apr 2008 21:57:47 -0000 1.12 +++ .cvsignore 13 Jul 2008 10:12:16 -0000 1.13 @@ -1,2 +1,2 @@ -mksh-R33d.cpio.gz +mksh-R35.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-9/mksh.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mksh.spec 12 Apr 2008 21:57:47 -0000 1.14 +++ mksh.spec 13 Jul 2008 10:12:16 -0000 1.15 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 33d +Version: 35 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -24,7 +24,7 @@ %prep %setup -q -T -c -# RPM 4.4.2 has no support for *.cpio.gz +# rpm.org has no support for *.cpio.gz gzip -dc %{SOURCE0} | cpio -imd mv %{name}/* . && rm -rf %{name} cp -f %{SOURCE1} . @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 13 2008 Robert Scheck 35-1 +- Upgrade to 35 + * Sat Apr 12 2008 Robert Scheck 33d-1 - Upgrade to 33d Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Apr 2008 21:57:47 -0000 1.12 +++ sources 13 Jul 2008 10:12:16 -0000 1.13 @@ -1,2 +1,2 @@ -8ad2547ad55dc3a02b13554ab9b5c9c8 mksh-R33d.cpio.gz +5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Sun Jul 13 10:13:35 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 13 Jul 2008 10:13:35 GMT Subject: rpms/mksh/devel .cvsignore, 1.12, 1.13 mksh.spec, 1.14, 1.15 sources, 1.12, 1.13 Message-ID: <200807131013.m6DADZrN003030@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2551/devel Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Apr 2008 21:57:47 -0000 1.12 +++ .cvsignore 13 Jul 2008 10:12:34 -0000 1.13 @@ -1,2 +1,2 @@ -mksh-R33d.cpio.gz +mksh-R35.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mksh.spec 12 Apr 2008 21:57:47 -0000 1.14 +++ mksh.spec 13 Jul 2008 10:12:34 -0000 1.15 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 33d +Version: 35 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -24,7 +24,7 @@ %prep %setup -q -T -c -# RPM 4.4.2 has no support for *.cpio.gz +# rpm.org has no support for *.cpio.gz gzip -dc %{SOURCE0} | cpio -imd mv %{name}/* . && rm -rf %{name} cp -f %{SOURCE1} . @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 13 2008 Robert Scheck 35-1 +- Upgrade to 35 + * Sat Apr 12 2008 Robert Scheck 33d-1 - Upgrade to 33d Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Apr 2008 21:57:47 -0000 1.12 +++ sources 13 Jul 2008 10:12:34 -0000 1.13 @@ -1,2 +1,2 @@ -8ad2547ad55dc3a02b13554ab9b5c9c8 mksh-R33d.cpio.gz +5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Sun Jul 13 10:13:37 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 10:13:37 GMT Subject: rpms/ovaldi/devel ovaldi.spec,1.7,1.8 Message-ID: <200807131013.m6DADbGY003033@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/ovaldi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2873 Modified Files: ovaldi.spec Log Message: * Sun Jul 13 2008 Lubomir Rintel 5.4.2-2 - Rebuild against newer librpm Index: ovaldi.spec =================================================================== RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ovaldi.spec 24 Apr 2008 12:04:30 -0000 1.7 +++ ovaldi.spec 13 Jul 2008 10:12:49 -0000 1.8 @@ -1,6 +1,6 @@ Name: ovaldi Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reference implementation of the OVAL interpreter Group: Applications/System @@ -66,6 +66,9 @@ %changelog +* Sun Jul 13 2008 Lubomir Rintel 5.4.2-2 +- Rebuild against newer librpm + * Mon Apr 21 2008 Lubomir Kundrak 5.4.2-1 - New upstream release, all patches got merged - Add /usr/share/ovaldi/xml symlink, to be compatible with Debian From fedora-extras-commits at redhat.com Sun Jul 13 11:14:53 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sun, 13 Jul 2008 11:14:53 GMT Subject: rpms/php-pecl-apc/F-9 php-pecl-apc.spec,1.8,1.9 sources,1.4,1.5 Message-ID: <200807131114.m6DBErrd015341@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/pkgs/rpms/php-pecl-apc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14907 Modified Files: php-pecl-apc.spec sources Log Message: Update to upstream 3.0.19 Index: php-pecl-apc.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-apc/F-9/php-pecl-apc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-pecl-apc.spec 18 Feb 2008 22:30:49 -0000 1.8 +++ php-pecl-apc.spec 13 Jul 2008 11:14:03 -0000 1.9 @@ -1,31 +1,48 @@ +%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) +%global php_zendabiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP Extension => //p') | tail -1) +%global php_version %((echo 0; php-config --version 2>/dev/null) | tail -1) +%define pecl_name APC + Summary: APC caches and optimizes PHP intermediate code Name: php-pecl-apc -Version: 3.0.14 -Release: 3%{?dist} -License: PHP License +Version: 3.0.19 +Release: 1%{?dist} +License: PHP Group: Development/Languages URL: http://pecl.php.net/package/APC Source: http://pecl.php.net/get/APC-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Conflicts: php-mmcache php-eaccelerator -BuildRequires: php-devel httpd-devel -Obsoletes: php-apc +BuildRequires: php-devel httpd-devel php-pear %if %{?php_zend_api}0 -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} +# Require clean ABI/API versions if available (Fedora) +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +%else +%if "%{rhel}" == "5" +# RHEL5 where we have php-common providing the Zend ABI the "old way" +Requires: php-zend-abi = %{php_zendabiver} %else -Requires: php-api = %{php_apiver} +# RHEL4 where we have no php-common and nothing providing the Zend ABI... +Requires: php = %{php_version} +%endif %endif -Provides: php-apc = %{version}-%{release} -Provides: php-pecl(apc) +Provides: php-pecl(%{pecl_name}) = %{version} + +# This is obsoleted by the above Provide, but for backwards compatibility +# with previous versions of the package +Provides: php-pecl(apc) = %{version} + +Requires(post): %{__pecl} +Requires(postun): %{__pecl} %description -APC is a free, open, and robust framework for -caching and optimizing PHP intermediate code. +APC is a free, open, and robust framework for caching and optimizing PHP +intermediate code. %prep -%setup -q -n APC-%{version} +%setup -q -n %{pecl_name}-%{version} %build %{_bindir}/phpize @@ -36,6 +53,10 @@ %{__rm} -rf %{buildroot} %{__make} install INSTALL_ROOT=%{buildroot} +# Install the package XML file +%{__mkdir_p} %{buildroot}%{pecl_xmldir} +%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{pecl_name}.xml + # Drop in the bit of configuration %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d %{__cat} > %{buildroot}%{_sysconfdir}/php.d/apc.ini << 'EOF' @@ -54,6 +75,19 @@ apc.cache_by_default=1 EOF +# Fix the charset of NOTICE +iconv -f iso-8859-1 -t utf8 NOTICE >NOTICE.utf8 +mv NOTICE.utf8 NOTICE + +%post +%{__pecl} install --nodeps --soft --force --register-only --nobuild %{pecl_xmldir}/%{pecl_name}.xml >/dev/null || : + + +%postun +if [ $1 -eq 0 ] ; then +%{__pecl} uninstall --nodeps --ignore-errors --register-only %{pecl_name} >/dev/null || : +fi + %clean %{__rm} -rf %{buildroot} @@ -62,8 +96,16 @@ %doc TECHNOTES.txt CHANGELOG LICENSE NOTICE TODO INSTALL apc.php %config(noreplace) %{_sysconfdir}/php.d/apc.ini %{php_extdir}/apc.so +%{pecl_xmldir}/%{pecl_name}.xml %changelog +* Wed Jun 25 2008 Tim Jackson - 3.0.19-1 +- Update to 3.0.19 +- Fix PHP Zend API/ABI dependencies to work on EL-4/5 +- Fix "License" tag +- Fix encoding of "NOTICE" file +- Add registration via PECL + * Mon Feb 18 2008 Fedora Release Engineering - 3.0.14-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-apc/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Jun 2007 13:41:58 -0000 1.4 +++ sources 13 Jul 2008 11:14:03 -0000 1.5 @@ -1 +1 @@ -0f452f936239b6107d3e2e5cda4f4bda APC-3.0.14.tgz +951f43d2873e3572f5d5ae71a9b66f90 APC-3.0.19.tgz From fedora-extras-commits at redhat.com Sun Jul 13 11:18:19 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sun, 13 Jul 2008 11:18:19 GMT Subject: rpms/php-pecl-apc/devel php-pecl-apc.spec,1.8,1.9 sources,1.4,1.5 Message-ID: <200807131118.m6DBIJMR015645@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/pkgs/rpms/php-pecl-apc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15577 Modified Files: php-pecl-apc.spec sources Log Message: Update to upstream 3.0.19 Index: php-pecl-apc.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-apc/devel/php-pecl-apc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-pecl-apc.spec 18 Feb 2008 22:30:49 -0000 1.8 +++ php-pecl-apc.spec 13 Jul 2008 11:17:18 -0000 1.9 @@ -1,31 +1,44 @@ +%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) +%global php_zendabiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP Extension => //p') | tail -1) +%global php_version %((echo 0; php-config --version 2>/dev/null) | tail -1) +%define pecl_name APC + Summary: APC caches and optimizes PHP intermediate code Name: php-pecl-apc -Version: 3.0.14 -Release: 3%{?dist} -License: PHP License +Version: 3.0.19 +Release: 1%{?dist} +License: PHP Group: Development/Languages URL: http://pecl.php.net/package/APC Source: http://pecl.php.net/get/APC-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Conflicts: php-mmcache php-eaccelerator -BuildRequires: php-devel httpd-devel -Obsoletes: php-apc +BuildRequires: php-devel httpd-devel php-pear %if %{?php_zend_api}0 -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} +# Require clean ABI/API versions if available (Fedora) +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +%else +%if "%{rhel}" == "5" +# RHEL5 where we have php-common providing the Zend ABI the "old way" +Requires: php-zend-abi = %{php_zendabiver} %else -Requires: php-api = %{php_apiver} +# RHEL4 where we have no php-common and nothing providing the Zend ABI... +Requires: php = %{php_version} +%endif %endif -Provides: php-apc = %{version}-%{release} -Provides: php-pecl(apc) +Provides: php-pecl(%{pecl_name}) = %{version} + +Requires(post): %{__pecl} +Requires(postun): %{__pecl} %description -APC is a free, open, and robust framework for -caching and optimizing PHP intermediate code. +APC is a free, open, and robust framework for caching and optimizing PHP +intermediate code. %prep -%setup -q -n APC-%{version} +%setup -q -n %{pecl_name}-%{version} %build %{_bindir}/phpize @@ -36,6 +49,10 @@ %{__rm} -rf %{buildroot} %{__make} install INSTALL_ROOT=%{buildroot} +# Install the package XML file +%{__mkdir_p} %{buildroot}%{pecl_xmldir} +%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{pecl_name}.xml + # Drop in the bit of configuration %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d %{__cat} > %{buildroot}%{_sysconfdir}/php.d/apc.ini << 'EOF' @@ -54,6 +71,19 @@ apc.cache_by_default=1 EOF +# Fix the charset of NOTICE +iconv -f iso-8859-1 -t utf8 NOTICE >NOTICE.utf8 +mv NOTICE.utf8 NOTICE + +%post +%{__pecl} install --nodeps --soft --force --register-only --nobuild %{pecl_xmldir}/%{pecl_name}.xml >/dev/null || : + + +%postun +if [ $1 -eq 0 ] ; then +%{__pecl} uninstall --nodeps --ignore-errors --register-only %{pecl_name} >/dev/null || : +fi + %clean %{__rm} -rf %{buildroot} @@ -62,8 +92,16 @@ %doc TECHNOTES.txt CHANGELOG LICENSE NOTICE TODO INSTALL apc.php %config(noreplace) %{_sysconfdir}/php.d/apc.ini %{php_extdir}/apc.so +%{pecl_xmldir}/%{pecl_name}.xml %changelog +* Wed Jun 25 2008 Tim Jackson - 3.0.19-1 +- Update to 3.0.19 +- Fix PHP Zend API/ABI dependencies to work on EL-4/5 +- Fix "License" tag +- Fix encoding of "NOTICE" file +- Add registration via PECL + * Mon Feb 18 2008 Fedora Release Engineering - 3.0.14-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-apc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Jun 2007 13:41:58 -0000 1.4 +++ sources 13 Jul 2008 11:17:18 -0000 1.5 @@ -1 +1 @@ -0f452f936239b6107d3e2e5cda4f4bda APC-3.0.14.tgz +951f43d2873e3572f5d5ae71a9b66f90 APC-3.0.19.tgz From fedora-extras-commits at redhat.com Sun Jul 13 11:42:49 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 11:42:49 GMT Subject: rpms/fusecompress/devel fusecompress-1.99.16-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fusecompress.spec, 1.3, 1.4 sources, 1.2, 1.3 fusecompress-1.99.13-errno.patch, 1.1, NONE fusecompress-1.99.14-gcc43.patch, 1.1, NONE Message-ID: <200807131142.m6DBgnrq017368@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/fusecompress/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17307 Modified Files: .cvsignore fusecompress.spec sources Added Files: fusecompress-1.99.16-gcc43.patch Removed Files: fusecompress-1.99.13-errno.patch fusecompress-1.99.14-gcc43.patch Log Message: * Sun Jul 13 2008 Lubomir Rintel 1.99.16-1 - New upstream release - Fedora patches integrated upstream - Rebuild against newer librlog fusecompress-1.99.16-gcc43.patch: --- NEW FILE fusecompress-1.99.16-gcc43.patch --- The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in unnecessary dependencies which aren't requested by the standard. This fixes build for gcc-4.3 Lubomir Rintel --- fusecompress-1.99.16.orig/src/CompressedMagic.cpp 2008-05-04 07:36:26.000000000 +0200 +++ fusecompress-1.99.16/src/CompressedMagic.cpp 2008-07-13 13:35:38.000000000 +0200 @@ -1,5 +1,6 @@ #include #include +#include #include #include "Lock.hpp" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fusecompress/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2008 10:26:47 -0000 1.2 +++ .cvsignore 13 Jul 2008 11:42:05 -0000 1.3 @@ -1 +1 @@ -fusecompress-1.99.14.tar.gz +fusecompress-1.99.16.tar.gz Index: fusecompress.spec =================================================================== RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fusecompress.spec 7 Apr 2008 11:10:08 -0000 1.3 +++ fusecompress.spec 13 Jul 2008 11:42:05 -0000 1.4 @@ -1,6 +1,6 @@ Name: fusecompress -Version: 1.99.14 -Release: 3%{?dist} +Version: 1.99.16 +Release: 1%{?dist} Summary: FUSE based compressed filesystem implementation Group: System Environment/Libraries @@ -8,11 +8,10 @@ URL: http://miio.net/fusecompress/ Source0: http://miio.net/files/%{name}-%{version}.tar.gz Source1: mount.fusecompress -Patch0: fusecompress-1.99.13-errno.patch -Patch1: fusecompress-1.99.14-gcc43.patch +Patch1: fusecompress-1.99.16-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: rlog-devel fuse-devel zlib-devel bzip2-devel +BuildRequires: rlog-devel fuse-devel zlib-devel bzip2-devel file-devel Requires: fuse @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 -p1 -b .errno %patch1 -p1 -b .gcc43 cp %{SOURCE1} mount.fusecompress @@ -54,6 +52,11 @@ %changelog +* Sun Jul 13 2008 Lubomir Rintel 1.99.16-1 +- New upstream release +- Fedora patches integrated upstream +- Rebuild against newer librlog + * Mon Apr 07 2008 Lubomir Kundrak 1.99.14-3 - Fix build with gcc43 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fusecompress/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2008 10:26:47 -0000 1.2 +++ sources 13 Jul 2008 11:42:05 -0000 1.3 @@ -1 +1 @@ -a1342b263ae1d115af5c11568bdedd72 fusecompress-1.99.14.tar.gz +2dbd49a5cb079315dafd1f2a677fd61e fusecompress-1.99.16.tar.gz --- fusecompress-1.99.13-errno.patch DELETED --- --- fusecompress-1.99.14-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 12:45:25 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 12:45:25 GMT Subject: rpms/ovaldi/devel ovaldi-5.4.2-rpm46.patch, NONE, 1.1 ovaldi.spec, 1.8, 1.9 Message-ID: <200807131245.m6DCjPun028115@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/ovaldi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28030 Modified Files: ovaldi.spec Added Files: ovaldi-5.4.2-rpm46.patch Log Message: Add RPM > 4.4 patch ovaldi-5.4.2-rpm46.patch: --- NEW FILE ovaldi-5.4.2-rpm46.patch --- Be compatible with upcoming rpm-4.6. Still needs to be compiled with -D_RPM_4_4_COMPAT, but probably the only change to avoid it would be s/int_32/unit32_t/ Lubomir Rintel diff -urp ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.cpp ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.cpp --- ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.cpp 2008-01-25 19:13:53.000000000 +0100 +++ ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.cpp 2008-07-13 14:28:26.000000000 +0200 @@ -380,11 +380,11 @@ void RPMInfoProbe::GetRPMInfo(string nam rpmtsFree(ts); } -char* RPMInfoProbe::readHeaderString(Header header, int_32 tag_id) { +char* RPMInfoProbe::readHeaderString(Header header, rpmTag tag_id) { // This function is from the Red Hat RPM Guide // - int_32 type; + rpmTagType type; void *pointer; - int_32 data_size; + rpm_count_t data_size; int header_status = headerGetEntry(header, tag_id, @@ -402,11 +402,11 @@ char* RPMInfoProbe::readHeaderString(Hea return (NULL); } -int_32 RPMInfoProbe::readHeaderInt32(Header header, int_32 tag_id) { +int_32 RPMInfoProbe::readHeaderInt32(Header header, rpmTag tag_id) { // This function is from the Red Hat RPM Guide // - int_32 type; + rpmTagType type; void *pointer; - int_32 data_size; + rpm_count_t data_size; int header_status = headerGetEntry(header, tag_id, @@ -497,7 +497,7 @@ void RPMInfoProbe::ChildGetSigKeyId(int fprintf(stderr, "no arguments given for --query"); exit(EXIT_FAILURE); } - ec = rpmcliQuery(ts, qva, (const char **) poptGetArgs(context)); + ec = rpmcliQuery(ts, qva, (char * const *) poptGetArgs(context)); } else { cerr << "Unable to get sig key id for rpm: " << rpmName << endl; diff -urp ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.h ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.h --- ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.h 2008-01-25 19:13:53.000000000 +0100 +++ ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.h 2008-07-13 14:26:02.000000000 +0200 @@ -106,8 +106,8 @@ private: string GetSigKeyId(string rpmName); string readHeaderBinary(Header header, int_32 tag_id); - char *readHeaderString(Header header, int_32 tag_id); - int_32 readHeaderInt32(Header header, int_32 tag_id); + char *readHeaderString(Header header, rpmTag tag_id); + int_32 readHeaderInt32(Header header, rpmTag tag_id); static RPMInfoProbe *instance; }; Index: ovaldi.spec =================================================================== RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ovaldi.spec 13 Jul 2008 10:12:49 -0000 1.8 +++ ovaldi.spec 13 Jul 2008 12:44:39 -0000 1.9 @@ -7,9 +7,10 @@ License: BSD URL: http://oval.mitre.org/language/download/interpreter/index.html Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 +Patch0: ovaldi-5.4.2-rpm46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pcre-devel xerces-c-devel xalan-c-devel rpm-devel +BuildRequires: pcre-devel xerces-c-devel xalan-c-devel rpm-devel > 4.4 BuildRequires: dos2unix %description @@ -21,6 +22,7 @@ %prep %setup -qn %{name}-%{version}-src +%patch0 -p1 -b .rpm46 # Nuke non-utf8 character sed 's/[^ ] USEFUL LINKS/- USEFUL LINKS/' -i docs/README.txt # Convert CRLF @@ -32,7 +34,7 @@ %build mkdir -p project/linux/Release/obj # %{?_smp_mflags} can not be used -make -C project/linux CPPFLAGS='%{optflags}' +make -C project/linux CPPFLAGS='%{optflags} -D_RPM_4_4_COMPAT' %install @@ -67,7 +69,7 @@ %changelog * Sun Jul 13 2008 Lubomir Rintel 5.4.2-2 -- Rebuild against newer librpm +- Adjust for newer librpm * Mon Apr 21 2008 Lubomir Kundrak 5.4.2-1 - New upstream release, all patches got merged From fedora-extras-commits at redhat.com Sun Jul 13 13:11:06 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 13:11:06 GMT Subject: rpms/ovaldi/devel ovaldi-5.4.2-rpm46.patch,1.1,1.2 Message-ID: <200807131311.m6DDB6uk003896@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/ovaldi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3826 Modified Files: ovaldi-5.4.2-rpm46.patch Log Message: Fix RPM > 4.4 patch ovaldi-5.4.2-rpm46.patch: Index: ovaldi-5.4.2-rpm46.patch =================================================================== RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi-5.4.2-rpm46.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ovaldi-5.4.2-rpm46.patch 13 Jul 2008 12:44:39 -0000 1.1 +++ ovaldi-5.4.2-rpm46.patch 13 Jul 2008 13:10:11 -0000 1.2 @@ -61,3 +61,15 @@ static RPMInfoProbe *instance; }; +diff -urp ovaldi-5.4.2-src.orig/project/linux/Makefile ovaldi-5.4.2-src/project/linux/Makefile +--- ovaldi-5.4.2-src.orig/project/linux/Makefile 2008-02-19 18:23:09.000000000 +0100 ++++ ovaldi-5.4.2-src/project/linux/Makefile 2008-07-13 15:09:02.000000000 +0200 +@@ -65,7 +65,7 @@ PACKAGE_DPKG = $(shell /usr/bin/env dpkg + PACKAGE_MANAGERS = + + ifneq (${PACKAGE_RPM}, ) +- LIBS += -lrpm -lrpmdb -lrpmio ++ LIBS += -lrpm -lrpmio + PACKAGE_MANAGERS += -DPACKAGE_RPM + endif + ifneq (${PACKAGE_DPKG}, ) From fedora-extras-commits at redhat.com Sun Jul 13 15:49:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 13 Jul 2008 15:49:55 GMT Subject: rpms/kdelibs/devel kdelibs.spec, 1.344, 1.345 kdelibs-4.0.82-proxy.patch, 1.1, NONE Message-ID: <200807131549.m6DFntks001249@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv984/devel Modified Files: kdelibs.spec Removed Files: kdelibs-4.0.82-proxy.patch Log Message: Remove proxy patch entirely (no longer needed). Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- kdelibs.spec 12 Jul 2008 21:08:22 -0000 1.344 +++ kdelibs.spec 13 Jul 2008 15:48:55 -0000 1.345 @@ -74,9 +74,6 @@ Patch13: kdelibs-4.0.3-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec Patch14: kdelibs-4.0.85-libexecdir.patch -# fix proxy support (#443931, kde#155707) -# patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46 -Patch15: kdelibs-4.0.82-proxy.patch # forward port kstandarddirs hack to search /etc/kde Patch18: kdelibs-4.0.83-kstandarddirs.patch # revert a kinit patch which triggers an assertion failure in KComponentData @@ -203,8 +200,6 @@ %patch12 -p1 -b .Administration-menu %patch13 -p1 -b .fedora-buildtype %patch14 -p1 -b .libexecdir -# appears to be obsoleted by: http://websvn.kde.org/?view=rev&revision=829797 -#patch15 -p1 -b .proxy %patch18 -p1 -b .kstandarddirs %patch19 -p0 -b .kinit-regression @@ -369,7 +364,7 @@ * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 -- omit proxy patch (for now, needswork) +- omit proxy patch (fixed upstream) * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 --- kdelibs-4.0.82-proxy.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 16:07:39 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 13 Jul 2008 16:07:39 GMT Subject: rpms/jd/F-8 .cvsignore, 1.259, 1.260 jd.spec, 1.292, 1.293 sources, 1.260, 1.261 Message-ID: <200807131607.m6DG7daA012402@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12030/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- .cvsignore 12 Jul 2008 17:24:10 -0000 1.259 +++ .cvsignore 13 Jul 2008 16:06:18 -0000 1.260 @@ -1 +1 @@ -jd-2.0.0-svn2196_trunk.tgz +jd-2.0.0-rc080714.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- jd.spec 12 Jul 2008 17:24:10 -0000 1.292 +++ jd.spec 13 Jul 2008 16:06:18 -0000 1.293 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2196_trunk -%define repoid 31825 +%define strtag rc080714 +%define repoid 31996 # Define this if this is pre-version %define pre_release 1 ########################################## @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 7 +%define vendor_rel 8 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jul 13 2008 Mamoru Tasaka -- rev 2196 +* Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 +- 2.0.0 rc 080714 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- sources 12 Jul 2008 17:24:10 -0000 1.260 +++ sources 13 Jul 2008 16:06:18 -0000 1.261 @@ -1 +1 @@ -8c2b1435ad16ee8858cd390f3fe70c9e jd-2.0.0-svn2196_trunk.tgz +eb768c3d0d71c7ad5441d6134fe92678 jd-2.0.0-rc080714.tgz From fedora-extras-commits at redhat.com Sun Jul 13 16:07:57 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 13 Jul 2008 16:07:57 GMT Subject: rpms/jd/devel .cvsignore, 1.266, 1.267 jd.spec, 1.309, 1.310 sources, 1.267, 1.268 Message-ID: <200807131607.m6DG7vbC012479@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12030/devel Modified Files: .cvsignore jd.spec sources Log Message: * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- .cvsignore 12 Jul 2008 17:25:27 -0000 1.266 +++ .cvsignore 13 Jul 2008 16:06:58 -0000 1.267 @@ -1 +1 @@ -jd-2.0.0-svn2196_trunk.tgz +jd-2.0.0-rc080714.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- jd.spec 12 Jul 2008 17:25:27 -0000 1.309 +++ jd.spec 13 Jul 2008 16:06:58 -0000 1.310 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2196_trunk -%define repoid 31825 +%define strtag rc080714 +%define repoid 31996 # Define this if this is pre-version %define pre_release 1 ########################################## @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 7 +%define vendor_rel 8 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jul 13 2008 Mamoru Tasaka -- rev 2196 +* Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 +- 2.0.0 rc 080714 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- sources 12 Jul 2008 17:25:27 -0000 1.267 +++ sources 13 Jul 2008 16:06:58 -0000 1.268 @@ -1 +1 @@ -8c2b1435ad16ee8858cd390f3fe70c9e jd-2.0.0-svn2196_trunk.tgz +eb768c3d0d71c7ad5441d6134fe92678 jd-2.0.0-rc080714.tgz From fedora-extras-commits at redhat.com Sun Jul 13 16:07:57 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 13 Jul 2008 16:07:57 GMT Subject: rpms/jd/F-9 .cvsignore, 1.266, 1.267 jd.spec, 1.303, 1.304 sources, 1.267, 1.268 Message-ID: <200807131607.m6DG7vno012484@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12030/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- .cvsignore 12 Jul 2008 17:24:52 -0000 1.266 +++ .cvsignore 13 Jul 2008 16:06:39 -0000 1.267 @@ -1 +1 @@ -jd-2.0.0-svn2196_trunk.tgz +jd-2.0.0-rc080714.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- jd.spec 12 Jul 2008 17:24:52 -0000 1.303 +++ jd.spec 13 Jul 2008 16:06:39 -0000 1.304 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2196_trunk -%define repoid 31825 +%define strtag rc080714 +%define repoid 31996 # Define this if this is pre-version %define pre_release 1 ########################################## @@ -19,7 +19,7 @@ ########################################## # Defined by vendor # -%define vendor_rel 7 +%define vendor_rel 8 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -137,8 +137,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jul 13 2008 Mamoru Tasaka -- rev 2196 +* Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 +- 2.0.0 rc 080714 * Thu Jul 3 2008 Mamoru Tasaka - 2.0.0-0.7.beta20080702 - 2.0.0 beta 20080702 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- sources 12 Jul 2008 17:24:52 -0000 1.267 +++ sources 13 Jul 2008 16:06:39 -0000 1.268 @@ -1 +1 @@ -8c2b1435ad16ee8858cd390f3fe70c9e jd-2.0.0-svn2196_trunk.tgz +eb768c3d0d71c7ad5441d6134fe92678 jd-2.0.0-rc080714.tgz From fedora-extras-commits at redhat.com Sun Jul 13 16:20:26 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sun, 13 Jul 2008 16:20:26 GMT Subject: rpms/kdepim/devel kdepim.spec,1.177,1.178 Message-ID: <200807131620.m6DGKQhD015622@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15382 Modified Files: kdepim.spec Log Message: * Sun Jul 13 2008 Rex Dieter 4.0.98-2 - fix conflict with oxygen-icon-theme Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- kdepim.spec 11 Jul 2008 04:04:22 -0000 1.177 +++ kdepim.spec 13 Jul 2008 16:19:32 -0000 1.178 @@ -7,7 +7,7 @@ Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.0.98 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Productivity @@ -105,6 +105,9 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} +# conflict with oxygen-icon-theme +rm -rf %{buildroot}%{_kde4_icondir}/oxygen/32x32/actions/appointment-new.png + # make symlinks relative mkdir -p %{buildroot}%{_docdir}/HTML/en/common pushd %{buildroot}%{_docdir}/HTML/en @@ -173,6 +176,9 @@ %changelog +* Sun Jul 13 2008 Rex Dieter 4.0.98-2 +- fix conflict with oxygen-icon-theme + * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 From fedora-extras-commits at redhat.com Sun Jul 13 16:24:03 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 13 Jul 2008 16:24:03 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.97, 1.98 kdebase-workspace-4.0.85-kde#154119.patch, 1.1, NONE Message-ID: <200807131624.m6DGO3QD016504@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304/devel Modified Files: kdebase-workspace.spec Removed Files: kdebase-workspace-4.0.85-kde#154119.patch Log Message: Remove obsolete "moving plasmoids on panels" patch completely. Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- kdebase-workspace.spec 11 Jul 2008 12:32:40 -0000 1.97 +++ kdebase-workspace.spec 13 Jul 2008 16:23:13 -0000 1.98 @@ -26,11 +26,6 @@ # upstream patches: # plasma-4.0-openSUSE patches: -# http://websvn.kde.org/?view=rev&revision=791852 -# from Plasma review board: http://mattr.info/r/261/ -# allows moving plasmoids on panels (#439587, kde#154119, kde#158301) -# will no longer be needed with the next snapshot -Patch201: kdebase-workspace-4.0.85-kde#154119.patch Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151 @@ -144,8 +139,6 @@ # upstream patches # plasma-4.0-openSUSE patches: -# patch201 will no longer be needed with the next snapshot: omitted in 4.0.98 -- Rex -#patch201 -p1 -b .kde#154119 %patch204 -p1 -b .kickoff-suspend --- kdebase-workspace-4.0.85-kde#154119.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 17:01:48 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Sun, 13 Jul 2008 17:01:48 GMT Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.31, 1.32 sources, 1.31, 1.32 xorg-x11-drv-radeonhd-README.fedora, 1.29, 1.30 xorg-x11-drv-radeonhd-snapshot.sh, 1.10, 1.11 xorg-x11-drv-radeonhd.spec, 1.41, 1.42 Message-ID: <200807131701.m6DH1mZl028602@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21990 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec Log Message: * Sun Jul 13 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080713git - Note Fedora package version in radeonhd's Xorg.N.log output. - Snapshot generation updates spec file now - New snapshot (upstream commit 8326ff4fb3d2fff74b11a5391b74866a656380ff): - 8326ff4f: MC: Add a stub for RV770 MCIdle(). - c6dcd8d1: conntest: Add support for RV770 to rhd_conntest. - 20476754: I2C: Add DDC read out support for DDC3/4. - 49b3782f: I2C: Read SDA/SCL mapping for RV620 and up from AtomBIOS GPIO Info block. - 4b7ce33f: Add initial support for RV770 - 9b388fb0: DIG: Add support for ATOM_TRANSMITTER_CONFIG_LINKA_B/B_A. - c258c35f: conntest: test more error conditions. - 45961a0c: sh cmd substitution w/ backticks until git found - 31d76dab: Document more names for xorg/util/macros packages - fde79f9b: Add XORG_* macro names to docs for easy grepping - d44b0def: Name drivers dir "driversdir" - 7b3bd157: Disable unnecessary libtool CXX and F77 checks - cd4ed275: Fix typo in git format-patch instruction Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 30 Jun 2008 13:23:06 -0000 1.31 +++ .cvsignore 13 Jul 2008 17:00:49 -0000 1.32 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.1-20080630git.tar.bz2 +xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 30 Jun 2008 13:23:06 -0000 1.31 +++ sources 13 Jul 2008 17:00:49 -0000 1.32 @@ -1 +1 @@ -8d1a5a022c21e874b43f08269bb27833 xf86-video-radeonhd-1.2.1-20080630git.tar.bz2 +4895e724daf98dbd87f1c83d994990ce xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- xorg-x11-drv-radeonhd-README.fedora 30 Jun 2008 13:23:06 -0000 1.29 +++ xorg-x11-drv-radeonhd-README.fedora 13 Jul 2008 17:00:49 -0000 1.30 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: c2139d8c7aed128644dcb1481426164ece0b967d +Latest upstream commit: 8326ff4fb3d2fff74b11a5391b74866a656380ff Contents Index: xorg-x11-drv-radeonhd-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-snapshot.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-drv-radeonhd-snapshot.sh 18 Jun 2008 09:54:31 -0000 1.10 +++ xorg-x11-drv-radeonhd-snapshot.sh 13 Jul 2008 17:00:49 -0000 1.11 @@ -20,6 +20,10 @@ EOF )" +GIT="${GIT-git}" +RPM="${RPM-rpm}" +SED="${SED-sed}" + # Local settings name="xorg-x11-drv-radeonhd" tarbase="xf86-video-radeonhd" @@ -37,10 +41,20 @@ exit 1 fi -# Parse command line options +# Default settings +maintainer_name="Main Tainer" +maintainer_mail="main at tainer.invalid" + opt_update_config="false" opt_skip_pull="false" opt_no_checks="false" + +# Pull in settings, overriding the defaults +if test -f "$(dirname "$0")/.snapshot.cfg"; then + . "$(dirname "$0")/.snapshot.cfg" +fi + +# Parse command line options for opt do case "$opt" in @@ -64,7 +78,7 @@ old="$1" new="$1.new" shift - if sed "$@" < "${old}" > "${new}"; then + if $SED "$@" < "${old}" > "${new}"; then if cmp "${new}" "${old}"; then : else mv -f "${new}" "${old}" @@ -75,28 +89,67 @@ } +# Syntax: update_changelog +update_changelog() { + specfile="$1" + old_commit="$2" + new_commit="$3" + + rpm_date=`date "+%a %b %d %Y"` + + fullspecfile="$PWD/$specfile" + [ -f "$specfile" ] + rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9]$//')" + + cd "$(dirname "$0")/xf86-video-radeonhd.src" + [ -d ".git" ] + + { + sed '/^%changelog$/ q' "${fullspecfile}" + echo "* ${rpm_date} ${maintainer_name} <${maintainer_mail}> - ${rpm_version}" + echo "- New snapshot (upstream commit ${new_commit}):" + $GIT log --pretty=oneline "${old_commit}..HEAD" | $SED 's|^\(.\{8\}\)[^ ]\{1,\} | - \1: |' + echo + sed -n '/^%changelog$/,$ p' "${fullspecfile}" | sed '1d' + } > "${fullspecfile}.new" + + diff -U 5 "${fullspecfile}" "${fullspecfile}.new" || : + + echo + echo "Adding changelog entry to ${specfile}." + echo "Enter 'n' or 'no' to abort; anything else to continue." + read response + if test "x$respose" = "xn" || test "x$response" = "xno"; then + rm -f "${fullspecfile}.new" + else + mv -f "${fullspecfile}.new" "${fullspecfile}" + fi + +} # End of update_changelog() function + + # Prepare for action unset CDPATH set -ex # Update/check out source if [ -s "${srcdir}/.git/refs/heads/master" ]; then - ( cd "${srcdir}" && git reset --hard HEAD && git checkout master ) + ( cd "${srcdir}" && $GIT reset --hard HEAD && $GIT checkout master ) if "$opt_skip_pull"; then echo "Skipping pull from upstream as requested" else # update from repo, keeping local changes separate - ( cd "${srcdir}" && git fetch && git rebase origin ) || exit $? + ( cd "${srcdir}" && $GIT fetch && $GIT rebase origin ) || exit $? fi - ( cd "${srcdir}" && (git branch -D "${branch}" ||:)) + ( cd "${srcdir}" && ($GIT branch -D "${branch}" ||:)) else # first checkout - git clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}" + $GIT clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}" fi -"${do_branch}" && ( cd "${srcdir}" && git checkout -b "${branch}" ) +"${do_branch}" && ( cd "${srcdir}" && $GIT checkout -b "${branch}" ) # Determine latest upstream commit: -upstream_commit="$(cd "${srcdir}" && git log | head -n1 | cut -d' ' -f2)" +upstream_commit="$(cd "${srcdir}" && $GIT log | head -n1 | cut -d' ' -f2)" # This patch is waiting for the time when we actually need a radeonhd.xinf file. # ${name}-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch @@ -112,7 +165,7 @@ exit 3 fi if [ -s "$patch" ]; then - (cd "$srcdir" && git-am -3) < "$patch" + (cd "$srcdir" && $GIT am -3) < "$patch" if test -s "${srcdir}/.dotest/patch"; then echo "Fatal: Could not cleanly apply patch \"$patch\"." exit 11 @@ -129,7 +182,7 @@ ( cd "${builddir}" && ../${srcdir}/configure --enable-maintainer-mode) # Build dist tarball and move it to CWD -version=`sed -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"` +version=`$SED -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"` tarname="${tarbase}-${version}-${date}git" if "$opt_no_checks"; then disttarget="dist" @@ -140,6 +193,7 @@ mv -f "${builddir}/${tarname}.tar.bz2" "${tarname}.tar.bz2" # Update spec file with the proper timestamp +old_git_commit=`$SED -n 's/^%define git_commit \(.*\)/\1/p' < "$specfile"` if "$opt_update_config"; then sed_update_cond "$specfile" \ -e "s/^%define git_commit .*/%define git_commit ${upstream_commit}/" \ @@ -148,11 +202,14 @@ sed_update_cond "${name}-README.fedora" \ -e "s/^\(Latest upstream commit:\).*/\\1 ${upstream_commit}/" + + update_changelog "$specfile" "$old_git_commit" "$upstream_commit" fi # Clean up after us (keeping the patched git branch) rm -rf "${builddir}" -echo "Latest upstream commit: ${upstream_commit}" +echo "Old upstream commit in spec: ${old_git_commit}" +echo "Latest upstream commit: ${upstream_commit}" echo "$ make new-sources FILES=\"${tarname}.tar.bz2\"" Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- xorg-x11-drv-radeonhd.spec 30 Jun 2008 13:33:56 -0000 1.41 +++ xorg-x11-drv-radeonhd.spec 13 Jul 2008 17:00:49 -0000 1.42 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20080630 -%define git_commit c2139d8c7aed128644dcb1481426164ece0b967d +%define date 20080713 +%define git_commit 8326ff4fb3d2fff74b11a5391b74866a656380ff %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.1 -Release: 3.3%{?alphatag}%{?dist} +Release: 3.4%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -110,6 +110,7 @@ %if %{snapshot} %patch100 -p1 -b .conntest-docrefs %endif +sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c %build %{configure} --with-xorg-module-dir=%{moduledir} --disable-static @@ -159,6 +160,24 @@ %endif %changelog +* Sun Jul 13 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080713git +- Note Fedora package version in radeonhd's Xorg.N.log output. +- Snapshot generation updates spec file now +- New snapshot (upstream commit 8326ff4fb3d2fff74b11a5391b74866a656380ff): + - 8326ff4f: MC: Add a stub for RV770 MCIdle(). + - c6dcd8d1: conntest: Add support for RV770 to rhd_conntest. + - 20476754: I2C: Add DDC read out support for DDC3/4. + - 49b3782f: I2C: Read SDA/SCL mapping for RV620 and up from AtomBIOS GPIO Info block. + - 4b7ce33f: Add initial support for RV770 + - 9b388fb0: DIG: Add support for ATOM_TRANSMITTER_CONFIG_LINKA_B/B_A. + - c258c35f: conntest: test more error conditions. + - 45961a0c: sh cmd substitution w/ backticks until git found + - 31d76dab: Document more names for xorg/util/macros packages + - fde79f9b: Add XORG_* macro names to docs for easy grepping + - d44b0def: Name drivers dir "driversdir" + - 7b3bd157: Disable unnecessary libtool CXX and F77 checks + - cd4ed275: Fix typo in git format-patch instruction + * Mon Jun 30 2008 Hans Ulrich Niedermann - 1.2.1-3.3.20080630git - New snapshot (upstream commit c2139d8c7aed128644dcb1481426164ece0b967d): - c2139d8c: R5xx Accel: another 2DFlush fix... From fedora-extras-commits at redhat.com Sun Jul 13 17:07:44 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Sun, 13 Jul 2008 17:07:44 GMT Subject: rpms/xorg-x11-drv-radeonhd/F-9 .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 xorg-x11-drv-radeonhd-README.fedora, 1.30, 1.31 xorg-x11-drv-radeonhd-snapshot.sh, 1.10, 1.11 xorg-x11-drv-radeonhd.spec, 1.40, 1.41 Message-ID: <200807131707.m6DH7iHW029067@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28993 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec Log Message: * Sun Jul 13 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080713git - Note Fedora package version in radeonhd's Xorg.N.log output. - Snapshot generation updates spec file now - New snapshot (upstream commit 8326ff4fb3d2fff74b11a5391b74866a656380ff): - 8326ff4f: MC: Add a stub for RV770 MCIdle(). - c6dcd8d1: conntest: Add support for RV770 to rhd_conntest. - 20476754: I2C: Add DDC read out support for DDC3/4. - 49b3782f: I2C: Read SDA/SCL mapping for RV620 and up from AtomBIOS GPIO Info block. - 4b7ce33f: Add initial support for RV770 - 9b388fb0: DIG: Add support for ATOM_TRANSMITTER_CONFIG_LINKA_B/B_A. - c258c35f: conntest: test more error conditions. - 45961a0c: sh cmd substitution w/ backticks until git found - 31d76dab: Document more names for xorg/util/macros packages - fde79f9b: Add XORG_* macro names to docs for easy grepping - d44b0def: Name drivers dir "driversdir" - 7b3bd157: Disable unnecessary libtool CXX and F77 checks - cd4ed275: Fix typo in git format-patch instruction Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 30 Jun 2008 13:36:15 -0000 1.32 +++ .cvsignore 13 Jul 2008 17:06:54 -0000 1.33 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.1-20080630git.tar.bz2 +xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 30 Jun 2008 13:36:15 -0000 1.32 +++ sources 13 Jul 2008 17:06:54 -0000 1.33 @@ -1 +1 @@ -8d1a5a022c21e874b43f08269bb27833 xf86-video-radeonhd-1.2.1-20080630git.tar.bz2 +4895e724daf98dbd87f1c83d994990ce xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- xorg-x11-drv-radeonhd-README.fedora 30 Jun 2008 13:36:15 -0000 1.30 +++ xorg-x11-drv-radeonhd-README.fedora 13 Jul 2008 17:06:54 -0000 1.31 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: c2139d8c7aed128644dcb1481426164ece0b967d +Latest upstream commit: 8326ff4fb3d2fff74b11a5391b74866a656380ff Contents Index: xorg-x11-drv-radeonhd-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-snapshot.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-drv-radeonhd-snapshot.sh 18 Jun 2008 10:38:26 -0000 1.10 +++ xorg-x11-drv-radeonhd-snapshot.sh 13 Jul 2008 17:06:54 -0000 1.11 @@ -20,6 +20,10 @@ EOF )" +GIT="${GIT-git}" +RPM="${RPM-rpm}" +SED="${SED-sed}" + # Local settings name="xorg-x11-drv-radeonhd" tarbase="xf86-video-radeonhd" @@ -37,10 +41,20 @@ exit 1 fi -# Parse command line options +# Default settings +maintainer_name="Main Tainer" +maintainer_mail="main at tainer.invalid" + opt_update_config="false" opt_skip_pull="false" opt_no_checks="false" + +# Pull in settings, overriding the defaults +if test -f "$(dirname "$0")/.snapshot.cfg"; then + . "$(dirname "$0")/.snapshot.cfg" +fi + +# Parse command line options for opt do case "$opt" in @@ -64,7 +78,7 @@ old="$1" new="$1.new" shift - if sed "$@" < "${old}" > "${new}"; then + if $SED "$@" < "${old}" > "${new}"; then if cmp "${new}" "${old}"; then : else mv -f "${new}" "${old}" @@ -75,28 +89,67 @@ } +# Syntax: update_changelog +update_changelog() { + specfile="$1" + old_commit="$2" + new_commit="$3" + + rpm_date=`date "+%a %b %d %Y"` + + fullspecfile="$PWD/$specfile" + [ -f "$specfile" ] + rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9]$//')" + + cd "$(dirname "$0")/xf86-video-radeonhd.src" + [ -d ".git" ] + + { + sed '/^%changelog$/ q' "${fullspecfile}" + echo "* ${rpm_date} ${maintainer_name} <${maintainer_mail}> - ${rpm_version}" + echo "- New snapshot (upstream commit ${new_commit}):" + $GIT log --pretty=oneline "${old_commit}..HEAD" | $SED 's|^\(.\{8\}\)[^ ]\{1,\} | - \1: |' + echo + sed -n '/^%changelog$/,$ p' "${fullspecfile}" | sed '1d' + } > "${fullspecfile}.new" + + diff -U 5 "${fullspecfile}" "${fullspecfile}.new" || : + + echo + echo "Adding changelog entry to ${specfile}." + echo "Enter 'n' or 'no' to abort; anything else to continue." + read response + if test "x$respose" = "xn" || test "x$response" = "xno"; then + rm -f "${fullspecfile}.new" + else + mv -f "${fullspecfile}.new" "${fullspecfile}" + fi + +} # End of update_changelog() function + + # Prepare for action unset CDPATH set -ex # Update/check out source if [ -s "${srcdir}/.git/refs/heads/master" ]; then - ( cd "${srcdir}" && git reset --hard HEAD && git checkout master ) + ( cd "${srcdir}" && $GIT reset --hard HEAD && $GIT checkout master ) if "$opt_skip_pull"; then echo "Skipping pull from upstream as requested" else # update from repo, keeping local changes separate - ( cd "${srcdir}" && git fetch && git rebase origin ) || exit $? + ( cd "${srcdir}" && $GIT fetch && $GIT rebase origin ) || exit $? fi - ( cd "${srcdir}" && (git branch -D "${branch}" ||:)) + ( cd "${srcdir}" && ($GIT branch -D "${branch}" ||:)) else # first checkout - git clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}" + $GIT clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}" fi -"${do_branch}" && ( cd "${srcdir}" && git checkout -b "${branch}" ) +"${do_branch}" && ( cd "${srcdir}" && $GIT checkout -b "${branch}" ) # Determine latest upstream commit: -upstream_commit="$(cd "${srcdir}" && git log | head -n1 | cut -d' ' -f2)" +upstream_commit="$(cd "${srcdir}" && $GIT log | head -n1 | cut -d' ' -f2)" # This patch is waiting for the time when we actually need a radeonhd.xinf file. # ${name}-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch @@ -112,7 +165,7 @@ exit 3 fi if [ -s "$patch" ]; then - (cd "$srcdir" && git-am -3) < "$patch" + (cd "$srcdir" && $GIT am -3) < "$patch" if test -s "${srcdir}/.dotest/patch"; then echo "Fatal: Could not cleanly apply patch \"$patch\"." exit 11 @@ -129,7 +182,7 @@ ( cd "${builddir}" && ../${srcdir}/configure --enable-maintainer-mode) # Build dist tarball and move it to CWD -version=`sed -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"` +version=`$SED -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"` tarname="${tarbase}-${version}-${date}git" if "$opt_no_checks"; then disttarget="dist" @@ -140,6 +193,7 @@ mv -f "${builddir}/${tarname}.tar.bz2" "${tarname}.tar.bz2" # Update spec file with the proper timestamp +old_git_commit=`$SED -n 's/^%define git_commit \(.*\)/\1/p' < "$specfile"` if "$opt_update_config"; then sed_update_cond "$specfile" \ -e "s/^%define git_commit .*/%define git_commit ${upstream_commit}/" \ @@ -148,11 +202,14 @@ sed_update_cond "${name}-README.fedora" \ -e "s/^\(Latest upstream commit:\).*/\\1 ${upstream_commit}/" + + update_changelog "$specfile" "$old_git_commit" "$upstream_commit" fi # Clean up after us (keeping the patched git branch) rm -rf "${builddir}" -echo "Latest upstream commit: ${upstream_commit}" +echo "Old upstream commit in spec: ${old_git_commit}" +echo "Latest upstream commit: ${upstream_commit}" echo "$ make new-sources FILES=\"${tarname}.tar.bz2\"" Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- xorg-x11-drv-radeonhd.spec 30 Jun 2008 13:36:15 -0000 1.40 +++ xorg-x11-drv-radeonhd.spec 13 Jul 2008 17:06:54 -0000 1.41 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20080630 -%define git_commit c2139d8c7aed128644dcb1481426164ece0b967d +%define date 20080713 +%define git_commit 8326ff4fb3d2fff74b11a5391b74866a656380ff %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.1 -Release: 3.3%{?alphatag}%{?dist} +Release: 3.4%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -110,6 +110,7 @@ %if %{snapshot} %patch100 -p1 -b .conntest-docrefs %endif +sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c %build %{configure} --with-xorg-module-dir=%{moduledir} --disable-static @@ -159,6 +160,24 @@ %endif %changelog +* Sun Jul 13 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080713git +- Note Fedora package version in radeonhd's Xorg.N.log output. +- Snapshot generation updates spec file now +- New snapshot (upstream commit 8326ff4fb3d2fff74b11a5391b74866a656380ff): + - 8326ff4f: MC: Add a stub for RV770 MCIdle(). + - c6dcd8d1: conntest: Add support for RV770 to rhd_conntest. + - 20476754: I2C: Add DDC read out support for DDC3/4. + - 49b3782f: I2C: Read SDA/SCL mapping for RV620 and up from AtomBIOS GPIO Info block. + - 4b7ce33f: Add initial support for RV770 + - 9b388fb0: DIG: Add support for ATOM_TRANSMITTER_CONFIG_LINKA_B/B_A. + - c258c35f: conntest: test more error conditions. + - 45961a0c: sh cmd substitution w/ backticks until git found + - 31d76dab: Document more names for xorg/util/macros packages + - fde79f9b: Add XORG_* macro names to docs for easy grepping + - d44b0def: Name drivers dir "driversdir" + - 7b3bd157: Disable unnecessary libtool CXX and F77 checks + - cd4ed275: Fix typo in git format-patch instruction + * Mon Jun 30 2008 Hans Ulrich Niedermann - 1.2.1-3.3.20080630git - New snapshot (upstream commit c2139d8c7aed128644dcb1481426164ece0b967d): - c2139d8c: R5xx Accel: another 2DFlush fix... From fedora-extras-commits at redhat.com Sun Jul 13 17:10:11 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Sun, 13 Jul 2008 17:10:11 GMT Subject: rpms/speech-dispatcher/devel import.log, 1.1, 1.2 speech-dispatcher.spec, 1.1, 1.2 Message-ID: <200807131710.m6DHABVS029212@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29178/devel Modified Files: import.log speech-dispatcher.spec Log Message: Trying Conditionals for olpc branch Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Jun 2008 06:15:21 -0000 1.1 +++ import.log 13 Jul 2008 17:09:15 -0000 1.2 @@ -1 +1,2 @@ speech-dispatcher-0_6_6-13_fc7:HEAD:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288030 +speech-dispatcher-0_6_6-14_fc7:HEAD:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215968885 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speech-dispatcher.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- speech-dispatcher.spec 24 Jun 2008 06:15:21 -0000 1.1 +++ speech-dispatcher.spec 13 Jul 2008 17:09:15 -0000 1.2 @@ -2,7 +2,7 @@ Name: speech-dispatcher Version: 0.6.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -21,12 +21,16 @@ %else BuildRequires: python-setuptools %endif + BuildRequires: flite-devel -#BuildRequires: ibmtts-devel BuildRequires: espeak-devel + +%if 1%{?olpc} >= 2 Buildrequires: nas-devel -BuildRequires: alsa-lib-devel Buildrequires: pulseaudio-lib-devel +%endif + +BuildRequires: alsa-lib-devel BuildRequires: dotconf-devel BuildRequires: texinfo Requires(post): /sbin/chkconfig /sbin/install-info @@ -85,8 +89,14 @@ %build iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi mv doc/speech-dispatcher-cs_c.texi doc/speech-dispatcher-cs.texi + +%if 1%{?olpc} >= 2 +%configure --disable-static --without-nas --without-pulse +make %{?_smp_mflags} +%else %configure --disable-static make %{?_smp_mflags} +%endif %install @@ -216,6 +226,11 @@ %changelog +* Mon Jul 13 2008 Hemant Goyal 0.6.6-14 + +- conditional build required for OLPC Branch - Building without nas and + pulse-audio support. + * Mon Jun 23 2008 Hemant Goyal 0.6.6-13 - changed permission of speech-dispatcherd to 0644 too. From fedora-extras-commits at redhat.com Sun Jul 13 17:18:39 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Sun, 13 Jul 2008 17:18:39 GMT Subject: rpms/gtk-sharp2/devel .cvsignore, 1.10, 1.11 gtk-sharp2.spec, 1.30, 1.31 sources, 1.10, 1.11 Message-ID: <200807131718.m6DHIdBe029686@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gtk-sharp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29579 Modified Files: .cvsignore gtk-sharp2.spec sources Log Message: update release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 23 May 2008 13:33:13 -0000 1.10 +++ .cvsignore 13 Jul 2008 17:17:30 -0000 1.11 @@ -1 +1 @@ -gtk-sharp-2.12.0.tar.bz2 +gtk-sharp-2.12.1.tar.bz2 Index: gtk-sharp2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gtk-sharp2.spec 31 May 2008 06:56:07 -0000 1.30 +++ gtk-sharp2.spec 13 Jul 2008 17:17:30 -0000 1.31 @@ -1,6 +1,6 @@ Name: gtk-sharp2 -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.12.1 +Release: 1%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -12,7 +12,7 @@ #Patch1: gtk-sharp-2.9.0-monodir.patch Patch2: gtk-sharp2-2.10.3-libdir.patch Patch3: gtk-sharp-2.8.2-docfix.patch -Patch4: gtk-sharp2-2.10.3-assemblydir.patch +#Patch4: gtk-sharp2-2.10.3-assemblydir.patch Patch5: gtk-sharp2-2.12.0-monodoc.patch BuildRequires: mono-devel gtk2-devel libglade2-devel @@ -63,13 +63,17 @@ #%patch1 -p1 -b .monodir %patch2 -p1 -b .libdir %patch3 -p1 -b .docfix -%patch4 -p1 -b .assemblydir +#%patch4 -p1 -b .assemblydir %patch5 -p1 -b .monodoc +# Fix assembly libdir +sed -i 's|$(prefix)/lib|%{_libdir}|g' parser/Makefile.* \ + generator/Makefile.* %build #autoreconf --force --install export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} +export MONO_CAIRO_LIBS="-r:%{_libdir}/mono/1.0/Mono.Cairo.dll" %configure make @@ -122,6 +126,9 @@ %{_libdir}/monodoc %changelog +* Sun Jul 13 2008 Xavier Lamien - 2.12.1-1 +- Update release. + * Sat May 31 2008 Xavier Lamien - 2.12.0-2 - Fixed monodoc libdir. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 23 May 2008 13:33:14 -0000 1.10 +++ sources 13 Jul 2008 17:17:30 -0000 1.11 @@ -1 +1 @@ -e04d634c55460b79c69d19c49648c6df gtk-sharp-2.12.0.tar.bz2 +b769fabc114fa9201c4e085ae36a8540 gtk-sharp-2.12.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 13 17:18:45 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Sun, 13 Jul 2008 17:18:45 GMT Subject: rpms/speech-dispatcher/OLPC-2 import.log, 1.1, 1.2 speech-dispatcher.spec, 1.1, 1.2 Message-ID: <200807131718.m6DHIjpK029694@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29598/OLPC-2 Modified Files: import.log speech-dispatcher.spec Log Message: Trying Conditional Build for OLPC branch Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Jun 2008 06:19:14 -0000 1.1 +++ import.log 13 Jul 2008 17:17:52 -0000 1.2 @@ -1 +1,2 @@ speech-dispatcher-0_6_6-13_fc7:OLPC-2:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288283 +speech-dispatcher-0_6_6-14_fc7:OLPC-2:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215969412 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/speech-dispatcher.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- speech-dispatcher.spec 24 Jun 2008 06:19:14 -0000 1.1 +++ speech-dispatcher.spec 13 Jul 2008 17:17:52 -0000 1.2 @@ -2,7 +2,7 @@ Name: speech-dispatcher Version: 0.6.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -21,12 +21,16 @@ %else BuildRequires: python-setuptools %endif + BuildRequires: flite-devel -#BuildRequires: ibmtts-devel BuildRequires: espeak-devel + +%if 1%{?olpc} >= 2 Buildrequires: nas-devel -BuildRequires: alsa-lib-devel Buildrequires: pulseaudio-lib-devel +%endif + +BuildRequires: alsa-lib-devel BuildRequires: dotconf-devel BuildRequires: texinfo Requires(post): /sbin/chkconfig /sbin/install-info @@ -85,8 +89,14 @@ %build iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi mv doc/speech-dispatcher-cs_c.texi doc/speech-dispatcher-cs.texi + +%if 1%{?olpc} >= 2 +%configure --disable-static --without-nas --without-pulse +make %{?_smp_mflags} +%else %configure --disable-static make %{?_smp_mflags} +%endif %install @@ -216,6 +226,11 @@ %changelog +* Mon Jul 13 2008 Hemant Goyal 0.6.6-14 + +- conditional build required for OLPC Branch - Building without nas and + pulse-audio support. + * Mon Jun 23 2008 Hemant Goyal 0.6.6-13 - changed permission of speech-dispatcherd to 0644 too. From fedora-extras-commits at redhat.com Sun Jul 13 17:19:30 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sun, 13 Jul 2008 17:19:30 GMT Subject: rpms/kdepim/devel kdepim.spec,1.178,1.179 Message-ID: <200807131719.m6DHJUZr029851@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29679 Modified Files: kdepim.spec Log Message: * Sun Jul 13 2008 Rex Dieter 4.0.98-3 - fix conflict with oxygen-icon-theme Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- kdepim.spec 13 Jul 2008 16:19:32 -0000 1.178 +++ kdepim.spec 13 Jul 2008 17:18:37 -0000 1.179 @@ -7,7 +7,7 @@ Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.0.98 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Productivity @@ -106,7 +106,7 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} # conflict with oxygen-icon-theme -rm -rf %{buildroot}%{_kde4_icondir}/oxygen/32x32/actions/appointment-new.png +rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png # make symlinks relative mkdir -p %{buildroot}%{_docdir}/HTML/en/common @@ -154,8 +154,8 @@ %{_kde4_datadir}/autostart/* %{_kde4_datadir}/config/*rc %{_kde4_datadir}/config.kcfg/* -%{_kde4_datadir}/icons/hicolor/*/*/* -%{_kde4_datadir}/icons/oxygen/*/*/* +%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/oxygen/*/*/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_docdir}/HTML/en/* @@ -176,7 +176,7 @@ %changelog -* Sun Jul 13 2008 Rex Dieter 4.0.98-2 +* Sun Jul 13 2008 Rex Dieter 4.0.98-3 - fix conflict with oxygen-icon-theme * Thu Jul 10 2008 Rex Dieter 4.0.98-1 From fedora-extras-commits at redhat.com Sun Jul 13 17:47:17 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Sun, 13 Jul 2008 17:47:17 GMT Subject: rpms/speech-dispatcher/F-9 import.log, 1.2, 1.3 speech-dispatcher.spec, 1.1, 1.2 Message-ID: <200807131747.m6DHlHT0031258@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31155/F-9 Modified Files: import.log speech-dispatcher.spec Log Message: Trying Conditional Build for OLPC Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-9/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 27 Jun 2008 07:12:13 -0000 1.2 +++ import.log 13 Jul 2008 17:46:23 -0000 1.3 @@ -1,2 +1,3 @@ speech-dispatcher-0_6_6-13_fc7:HEAD:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288030 speech-dispatcher-0_6_6-13_fc7:F-9:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214550669 +speech-dispatcher-0_6_6-14_fc7:F-9:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215971094 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-9/speech-dispatcher.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- speech-dispatcher.spec 24 Jun 2008 06:15:21 -0000 1.1 +++ speech-dispatcher.spec 13 Jul 2008 17:46:23 -0000 1.2 @@ -2,7 +2,7 @@ Name: speech-dispatcher Version: 0.6.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -21,12 +21,16 @@ %else BuildRequires: python-setuptools %endif + BuildRequires: flite-devel -#BuildRequires: ibmtts-devel BuildRequires: espeak-devel + +%if 1%{?olpc} >= 2 Buildrequires: nas-devel -BuildRequires: alsa-lib-devel Buildrequires: pulseaudio-lib-devel +%endif + +BuildRequires: alsa-lib-devel BuildRequires: dotconf-devel BuildRequires: texinfo Requires(post): /sbin/chkconfig /sbin/install-info @@ -85,8 +89,14 @@ %build iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi mv doc/speech-dispatcher-cs_c.texi doc/speech-dispatcher-cs.texi + +%if 1%{?olpc} >= 2 +%configure --disable-static --without-nas --without-pulse +make %{?_smp_mflags} +%else %configure --disable-static make %{?_smp_mflags} +%endif %install @@ -216,6 +226,11 @@ %changelog +* Mon Jul 13 2008 Hemant Goyal 0.6.6-14 + +- conditional build required for OLPC Branch - Building without nas and + pulse-audio support. + * Mon Jun 23 2008 Hemant Goyal 0.6.6-13 - changed permission of speech-dispatcherd to 0644 too. From fedora-extras-commits at redhat.com Sun Jul 13 17:52:33 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 13 Jul 2008 17:52:33 GMT Subject: rpms/suck/devel suck.spec,1.18,1.19 Message-ID: <200807131752.m6DHqX6C031530@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/suck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31486 Modified Files: suck.spec Log Message: Build agains dynamic inn libraries Index: suck.spec =================================================================== RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- suck.spec 18 Mar 2008 19:01:55 -0000 1.18 +++ suck.spec 13 Jul 2008 17:51:31 -0000 1.19 @@ -1,7 +1,7 @@ Name: suck Summary: Download news from remote NNTP server Version: 4.3.2 -Release: 22%{?dist} +Release: 23%{?dist} Source: http://www.sucknews.org/%{name}-%{version}.tar.gz Source1: active-ignore Source2: suck-4.3.2.site @@ -16,9 +16,9 @@ License: Public Domain Group: System Environment/Daemons -BuildRequires: inn-devel >= 2.3, perl-devel >= 3:5.8 perl(ExtUtils::Embed) +BuildRequires: inn-devel >= 2.4.5-2, perl-devel >= 3:5.8 perl(ExtUtils::Embed) BuildRequires: openssl-devel, autoconf -Requires: inn >= 2.3 +Requires: inn >= 2.4.5-2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Conflicts: leafnode @@ -89,6 +89,9 @@ %dir %{_sysconfdir}/news/suck.d/ %changelog +* Thu Jul 10 2008 Jochen Schmitt 4.3.2-23 +- Build agains dynamic inn libraries + * Tue Mar 18 2008 Tom "spot" Callaway 4.3.2-22 - add Requires for versioned perl (libperl.so) From fedora-extras-commits at redhat.com Sun Jul 13 17:57:26 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 13 Jul 2008 17:57:26 GMT Subject: rpms/subcommander/devel subcommander.spec,1.12,1.13 Message-ID: <200807131757.m6DHvQTx031691@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/subcommander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31674 Modified Files: subcommander.spec Log Message: Rebuild agains new libsvn_ra_dav Index: subcommander.spec =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- subcommander.spec 29 Jun 2008 18:22:23 -0000 1.12 +++ subcommander.spec 13 Jul 2008 17:56:31 -0000 1.13 @@ -2,7 +2,7 @@ Name: subcommander Version: 1.9.93 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical UI for subversion Group: Development/Tools @@ -73,6 +73,9 @@ %doc README CHANGES COPYING %changelog +* Sun Jul 13 2008 Jochen Schmitt 1.9.93-3 +- Rebuild agains new libsvn_ra_dav (#455002) + * Sun Jun 29 2008 Jochen Schmitt 1.9.93-2 - New prerelease 2.0.0b3 of subcommander From fedora-extras-commits at redhat.com Sun Jul 13 17:59:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 17:59:39 +0000 Subject: [pkgdb] subcommander had groupAcl changed Message-ID: <200807131759.m6DHxd5B006001@bastion.fedora.phx.redhat.com> Jochen Schmitt (s4504kr) has set the commit acl on subcommander (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/subcommander From fedora-extras-commits at redhat.com Sun Jul 13 17:59:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 17:59:40 +0000 Subject: [pkgdb] subcommander had groupAcl changed Message-ID: <200807131759.m6DHxexb006016@bastion.fedora.phx.redhat.com> Jochen Schmitt (s4504kr) has set the commit acl on subcommander (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/subcommander From fedora-extras-commits at redhat.com Sun Jul 13 17:59:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 17:59:40 +0000 Subject: [pkgdb] subcommander had groupAcl changed Message-ID: <200807131759.m6DHxexc006016@bastion.fedora.phx.redhat.com> Jochen Schmitt (s4504kr) has set the commit acl on subcommander (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/subcommander From fedora-extras-commits at redhat.com Sun Jul 13 18:01:52 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 13 Jul 2008 18:01:52 GMT Subject: rpms/subcommander pkg.acl,1.1,NONE Message-ID: <200807131801.m6DI1qDB006085@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/subcommander In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014 Removed Files: pkg.acl Log Message: Typ to open ACLs --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 18:06:36 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 13 Jul 2008 18:06:36 GMT Subject: rpms/gnome-commander/devel gnome-commander-rev1874-hexmode-display.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gnome-commander.spec, 1.21, 1.22 sources, 1.7, 1.8 Message-ID: <200807131806.m6DI6aRt006490@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436 Modified Files: .cvsignore gnome-commander.spec sources Added Files: gnome-commander-rev1874-hexmode-display.patch Log Message: * Mon Jul 14 2008 Mamoru Tasaka - rev 1874 - Workaround for Decimal offset mode in Hexdump display mode gnome-commander-rev1874-hexmode-display.patch: --- NEW FILE gnome-commander-rev1874-hexmode-display.patch --- Index: src/intviewer/text-render.cc =================================================================== --- src/intviewer/text-render.cc (revision 1874) +++ src/intviewer/text-render.cc (working copy) @@ -1954,7 +1954,12 @@ show_marker = (marker_start!=marker_end); text_render_utf8_clear_buf(w); - if (w->priv->hex_offset_display) + // Temporary workaround + // Currently when "_Decimal Offset in Hexdump" is set, + // hex_offset_display is set, however at this state offset must + // be displayed in decimal!! + + if (!(w->priv->hex_offset_display)) text_render_utf8_printf(w, "%08lx ", (unsigned long)start_of_line); else text_render_utf8_printf(w, "%09lu ", (unsigned long)start_of_line); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Jul 2008 04:12:33 -0000 1.7 +++ .cvsignore 13 Jul 2008 18:05:38 -0000 1.8 @@ -1 +1 @@ -gnome-commander-1.2.7-svn1870_trunk.tar.bz2 +gnome-commander-1.2.7-svn1874_trunk.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gnome-commander.spec 11 Jul 2008 04:12:33 -0000 1.21 +++ gnome-commander.spec 13 Jul 2008 18:05:38 -0000 1.22 @@ -11,7 +11,7 @@ %define use_autotool 0 %define if_pre 1 %define main_release 1 -%define extratag svn1870_trunk +%define extratag svn1874_trunk %if 0%{?if_pre} > 0 %define use_autotool 1 @@ -30,6 +30,7 @@ License: GPLv2+ URL: http://www.nongnu.org/gcmd/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2 +Patch0: gnome-commander-rev1874-hexmode-display.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -92,6 +93,7 @@ %prep %setup -q -n %{name}-%{version}%{?extratag:-%extratag} +%patch0 -p0 -b .hexdumpmode %if 0%{use_autotool} > 0 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh sh autogen.sh @@ -159,6 +161,10 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Jul 14 2008 Mamoru Tasaka +- rev 1874 +- Workaround for Decimal offset mode in Hexdump display mode + * Fri Jul 11 2008 Mamoru Tasaka - try rev 1870 - ja.po is merged upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Jul 2008 04:12:33 -0000 1.7 +++ sources 13 Jul 2008 18:05:38 -0000 1.8 @@ -1 +1 @@ -bde0598ff6c183b478bf67f086140cbc gnome-commander-1.2.7-svn1870_trunk.tar.bz2 +b8dfb30331a73ce16d0d92427aa05186 gnome-commander-1.2.7-svn1874_trunk.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 13 18:33:34 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sun, 13 Jul 2008 18:33:34 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git11.bz2.sign, NONE, 1.1 .cvsignore, 1.861, 1.862 kernel.spec, 1.755, 1.756 sources, 1.822, 1.823 upstream, 1.740, 1.741 patch-2.6.26-rc9-git10.bz2.sign, 1.1, NONE Message-ID: <200807131833.m6DIXYns008819@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8726 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git11.bz2.sign Removed Files: patch-2.6.26-rc9-git10.bz2.sign Log Message: 2.6.26-rc9-git11 --- NEW FILE patch-2.6.26-rc9-git11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIeahtyGugalF9Dw4RAqUCAJwKkYXpnPBM7/RvP4D1pJ6B/req7wCeK98S Hskx2I3Kdu9ExyUdrlxtAJI= =E1/l -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.861 retrieving revision 1.862 diff -u -r1.861 -r1.862 --- .cvsignore 12 Jul 2008 17:47:31 -0000 1.861 +++ .cvsignore 13 Jul 2008 18:32:29 -0000 1.862 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git10.bz2 +patch-2.6.26-rc9-git11.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.755 retrieving revision 1.756 diff -u -r1.755 -r1.756 --- kernel.spec 12 Jul 2008 17:47:31 -0000 1.755 +++ kernel.spec 13 Jul 2008 18:32:29 -0000 1.756 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 10 +%define gitrev 11 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Sun Jul 13 2008 Dave Jones +- 2.6.26-rc9-git11 + * Sat Jul 12 2008 Dave Jones - 2.6.26-rc9-git10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.822 retrieving revision 1.823 diff -u -r1.822 -r1.823 --- sources 12 Jul 2008 17:47:31 -0000 1.822 +++ sources 13 Jul 2008 18:32:29 -0000 1.823 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -6b8f3c410de7c48e4c457ddcc854983d patch-2.6.26-rc9-git10.bz2 +ad4cb555054226122e1e260e1959582d patch-2.6.26-rc9-git11.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.740 retrieving revision 1.741 diff -u -r1.740 -r1.741 --- upstream 12 Jul 2008 17:47:31 -0000 1.740 +++ upstream 13 Jul 2008 18:32:29 -0000 1.741 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git10.bz2 +patch-2.6.26-rc9-git11.bz2 --- patch-2.6.26-rc9-git10.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 18:37:21 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 13 Jul 2008 18:37:21 GMT Subject: rpms/abiword/F-9 .cvsignore, 1.20, 1.21 abiword.spec, 1.61, 1.62 sources, 1.20, 1.21 Message-ID: <200807131837.m6DIbLaV009195@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9067 Modified Files: .cvsignore abiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-9/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 1 May 2008 14:08:26 -0000 1.20 +++ .cvsignore 13 Jul 2008 18:36:28 -0000 1.21 @@ -1,4 +1,4 @@ -abiword-2.6.3.tar.gz -abiword-docs-2.6.3.tar.gz -abiword-extras-2.6.3.tar.gz -abiword-plugins-2.6.3.tar.gz +abiword-2.6.4.tar.gz +abiword-docs-2.6.4.tar.gz +abiword-extras-2.6.4.tar.gz +abiword-plugins-2.6.4.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-9/abiword.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- abiword.spec 1 May 2008 14:08:26 -0000 1.61 +++ abiword.spec 13 Jul 2008 18:36:28 -0000 1.62 @@ -1,10 +1,10 @@ %define majorversion 2 %define minorversion 6 -%define microversion 3 +%define microversion 4 Summary: The AbiWord word processor Name: abiword -Version: 2.6.3 +Version: 2.6.4 Release: 1%{?dist} Epoch: 1 Group: Applications/Editors @@ -174,6 +174,9 @@ %ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml %changelog +* Sun Jul 13 2008 Marc Maurer - 1:2.6.4-1 +- New upstream release + * Thu May 01 2008 Marc Maurer - 1:2.6.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 1 May 2008 14:08:26 -0000 1.20 +++ sources 13 Jul 2008 18:36:28 -0000 1.21 @@ -1,4 +1,4 @@ -40d9da8b04c70035b89f8ad7fcc4519d abiword-2.6.3.tar.gz -400702fa12e07e39c7a6153c942511ee abiword-docs-2.6.3.tar.gz -4985165b8e166b35d9f9a2ca3090e928 abiword-extras-2.6.3.tar.gz -92a2e98fb26595666cb68e9bb56babd0 abiword-plugins-2.6.3.tar.gz +16748b2d6e318e0e2a25581005e1943a abiword-2.6.4.tar.gz +9f8c0cd81d8889cc90550049f40a484a abiword-docs-2.6.4.tar.gz +d0893e611d37c3ba09b77fa720a3904d abiword-extras-2.6.4.tar.gz +3bf973c5a1446ef3eaf980724821d6e9 abiword-plugins-2.6.4.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 18:41:40 2008 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Sun, 13 Jul 2008 18:41:40 GMT Subject: rpms/ktorrent/devel .cvsignore, 1.19, 1.20 ktorrent.spec, 1.59, 1.60 sources, 1.19, 1.20 Message-ID: <200807131841.m6DIfeY4009496@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9430 Modified Files: .cvsignore ktorrent.spec sources Log Message: Update to 3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 14 May 2008 19:02:27 -0000 1.19 +++ .cvsignore 13 Jul 2008 18:40:40 -0000 1.20 @@ -1 +1 @@ -ktorrent-3.0.2.tar.bz2 +ktorrent-3.1.tar.bz2 Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- ktorrent.spec 14 May 2008 19:45:40 -0000 1.59 +++ ktorrent.spec 13 Jul 2008 18:40:40 -0000 1.60 @@ -1,6 +1,6 @@ Name: ktorrent -Version: 3.0.2 -Release: 3%{?dist} +Version: 3.1 +Release: 1%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPLv2+ @@ -84,9 +84,9 @@ %{_kde4_libdir}/kde4/ktupnpplugin.so %{_kde4_libdir}/kde4/ktwebinterfaceplugin.so %{_kde4_libdir}/libbtcore.so.3 -%{_kde4_libdir}/libbtcore.so.3.2.0 +%{_kde4_libdir}/libbtcore.so.3.3.0 %{_kde4_libdir}/libktcore.so.3 -%{_kde4_libdir}/libktcore.so.3.2.0 +%{_kde4_libdir}/libktcore.so.3.3.0 %{_kde4_libdir}/libktupnp.so.1 %{_kde4_libdir}/libktupnp.so.1.0.0 %{_kde4_datadir}/applications/kde4/ktorrent.desktop @@ -134,6 +134,9 @@ %{_kde4_datadir}/kde4/apps/cmake/modules/FindBTCore.cmake %changelog +* Sun Jul 13 2008 Roland Wolters - 3.1-1 +- Update to version 3.1 + * Wed May 14 2008 Roland Wolters - 3.0.2-3 - bugfix update to version 3.0.2 - some spec file fixes due to an update error Index: sources =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 14 May 2008 19:02:27 -0000 1.19 +++ sources 13 Jul 2008 18:40:40 -0000 1.20 @@ -1 +1 @@ -a2a3c2a62da2147d22eccefa40c7f5d7 ktorrent-3.0.2.tar.bz2 +09fb20a2fb854117cb871da4a920fec3 ktorrent-3.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 13 18:58:35 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 13 Jul 2008 18:58:35 GMT Subject: rpms/abiword/devel .cvsignore, 1.20, 1.21 abiword.spec, 1.61, 1.62 sources, 1.20, 1.21 Message-ID: <200807131858.m6DIwZ0P010305@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10237 Modified Files: .cvsignore abiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 1 May 2008 13:54:57 -0000 1.20 +++ .cvsignore 13 Jul 2008 18:57:21 -0000 1.21 @@ -1,4 +1,4 @@ -abiword-2.6.3.tar.gz -abiword-docs-2.6.3.tar.gz -abiword-plugins-2.6.3.tar.gz -abiword-extras-2.6.3.tar.gz +abiword-2.6.4.tar.gz +abiword-docs-2.6.4.tar.gz +abiword-extras-2.6.4.tar.gz +abiword-plugins-2.6.4.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- abiword.spec 1 May 2008 13:54:57 -0000 1.61 +++ abiword.spec 13 Jul 2008 18:57:21 -0000 1.62 @@ -1,10 +1,10 @@ %define majorversion 2 %define minorversion 6 -%define microversion 3 +%define microversion 4 Summary: The AbiWord word processor Name: abiword -Version: 2.6.3 +Version: 2.6.4 Release: 1%{?dist} Epoch: 1 Group: Applications/Editors @@ -174,6 +174,9 @@ %ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml %changelog +* Sun Jul 13 2008 Marc Maurer - 1:2.6.4-1 +- New upstream release + * Thu May 01 2008 Marc Maurer - 1:2.6.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 1 May 2008 13:54:57 -0000 1.20 +++ sources 13 Jul 2008 18:57:21 -0000 1.21 @@ -1,4 +1,4 @@ -40d9da8b04c70035b89f8ad7fcc4519d abiword-2.6.3.tar.gz -400702fa12e07e39c7a6153c942511ee abiword-docs-2.6.3.tar.gz -92a2e98fb26595666cb68e9bb56babd0 abiword-plugins-2.6.3.tar.gz -4985165b8e166b35d9f9a2ca3090e928 abiword-extras-2.6.3.tar.gz +16748b2d6e318e0e2a25581005e1943a abiword-2.6.4.tar.gz +9f8c0cd81d8889cc90550049f40a484a abiword-docs-2.6.4.tar.gz +d0893e611d37c3ba09b77fa720a3904d abiword-extras-2.6.4.tar.gz +3bf973c5a1446ef3eaf980724821d6e9 abiword-plugins-2.6.4.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 19:02:28 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:02:28 GMT Subject: rpms/clamav/F-8 clamav-0.92.1-CVE-2008-2713.diff, NONE, 1.1 clamav-0.92.1-outdated.patch, NONE, 1.1 Message-ID: <200807131902.m6DJ2Sto017054@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018 Added Files: clamav-0.92.1-CVE-2008-2713.diff clamav-0.92.1-outdated.patch Log Message: initial checkin clamav-0.92.1-CVE-2008-2713.diff: --- NEW FILE clamav-0.92.1-CVE-2008-2713.diff --- Index: petite.c =================================================================== --- libclamav/petite.c (Revision 3751) +++ libclamav/petite.c (Revision 3940) @@ -214,8 +214,14 @@ /* Let's compact data */ for (t = 0; t < j ; t++) { usects[t].raw = (t>0)?(usects[t-1].raw + usects[t-1].rsz):0; - if (usects[t].rsz != 0 && CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz)) - memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz); + if (usects[t].rsz != 0) + if(CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz)) { + memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz); + } else { + cli_dbgmsg("Petite: Skipping section %d, Raw: %x, RSize:%x\n", t, usects[t].raw, usects[t].rsz); + usects[t].raw = t>0 ? usects[t-1].raw : 0; + usects[t].rsz = 0; + } } /* Showtime!!! */ @@ -265,6 +271,7 @@ uint32_t check1, check2; uint8_t mydl = 0; uint8_t goback; + unsigned int q; /* Unpak each original section in turn */ @@ -312,16 +319,19 @@ * (eg the icon): let's fix the rva */ - if (!check4resources) { - unsigned int q; - for ( q = 0 ; q < sectcount ; q++ ) { - if ( thisrva <= sections[q].rva || thisrva >= sections[q].rva + sections[q].vsz) - continue; + for ( q = 0 ; q < sectcount ; q++ ) { + if(!CLI_ISCONTAINED(sections[q].rva, sections[q].vsz, usects[j].rva, usects[j].vsz)) + continue; + if (!check4resources) { usects[j].rva = sections[q].rva; usects[j].rsz = thisrva - sections[q].rva + size; - break; } + break; } + if (q == sectcount) { + free(usects); + return 1; + } /* Increase count of unpacked sections */ j++; clamav-0.92.1-outdated.patch: --- NEW FILE clamav-0.92.1-outdated.patch --- Disabled check which prevents older freshclam versions to run in <4h intervals (bz #453601) diff -up clamav-0.92.1/freshclam/mirman.c.~1~ clamav-0.92.1/freshclam/mirman.c --- clamav-0.92.1/freshclam/mirman.c.~1~ 2007-12-06 13:58:58.000000000 +0100 +++ clamav-0.92.1/freshclam/mirman.c 2008-07-13 20:28:01.000000000 +0200 @@ -105,9 +105,11 @@ int mirman_check(uint32_t ip, struct mir for(i = 0; i < mdat->num; i++) { if(mdat->mirtab[i].atime && mdat->mirtab[i].ip == ip) { +#if 0 if(mdat->dbflevel && (mdat->dbflevel > flevel) && (mdat->dbflevel - flevel > 3)) if(time(NULL) - mdat->mirtab[i].atime < 4 * 3600) return 2; +#endif if(mdat->mirtab[i].ignore) { if(time(NULL) - mdat->mirtab[i].atime > IGNTIME) { From fedora-extras-commits at redhat.com Sun Jul 13 19:04:59 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:04:59 GMT Subject: rpms/clamav/F-8 clamav.spec,1.69,1.70 Message-ID: <200807131904.m6DJ4x9f017228@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17147 Modified Files: clamav.spec Log Message: - disabled check which prevents older freshclam versions to run in <4h intervals (bz #453601) - backported security fixes from 0.93.3: CVE-2008-2713: out-of-bounds read on petite files Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/clamav.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- clamav.spec 21 Jun 2008 15:27:50 -0000 1.69 +++ clamav.spec 13 Jul 2008 19:03:59 -0000 1.70 @@ -53,6 +53,8 @@ Patch27: clamav-0.92.1-CVE-2008-1100.diff Patch28: clamav-0.92.1-CVE-2008-1387.diff Patch29: clamav-0.92.1-CVE-2008-1833.diff +Patch30: clamav-0.92.1-CVE-2008-2713.diff +Patch80: clamav-0.92.1-outdated.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -246,6 +248,8 @@ %patch27 -p1 -b .CVE-2008-1100 %patch28 -p1 -b .CVE-2008-1387 %patch29 -p1 -b .CVE-2008-1833 +%patch30 -p0 -b .CVE-2008-2713 +%patch80 -p1 -b .outdated install -p -m0644 %SOURCE300 clamav-milter/ @@ -536,6 +540,12 @@ %changelog +* Sun Jul 13 2008 Enrico Scholz - 0.92.1-2 +- disabled check which prevents older freshclam versions to run in <4h + intervals (bz #453601) +- backported security fixes from 0.93.3: + CVE-2008-2713: out-of-bounds read on petite files + * Thu Apr 24 2008 Tomas Hoger - 0.92.1-2 - Security update - backport security fixes from 0.93: CVE-2008-1100 (#442360): Upack Processing Buffer Overflow Vulnerability From fedora-extras-commits at redhat.com Sun Jul 13 19:08:07 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:08:07 GMT Subject: rpms/clamav/F-8 clamav.spec,1.70,1.71 Message-ID: <200807131908.m6DJ87Fc017544@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17431 Modified Files: clamav.spec Log Message: increased release Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/clamav.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- clamav.spec 13 Jul 2008 19:03:59 -0000 1.70 +++ clamav.spec 13 Jul 2008 19:06:56 -0000 1.71 @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92.1 -Release: %release_func 2 +Release: %release_func 3 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -540,7 +540,7 @@ %changelog -* Sun Jul 13 2008 Enrico Scholz - 0.92.1-2 +* Sun Jul 13 2008 Enrico Scholz - 0.92.1-3 - disabled check which prevents older freshclam versions to run in <4h intervals (bz #453601) - backported security fixes from 0.93.3: From fedora-extras-commits at redhat.com Sun Jul 13 19:08:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:08:28 +0000 Subject: [pkgdb] icelandic-fonts was added for jstanley Message-ID: <200807131908.m6DJ8S7w008124@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package icelandic-fonts with summary Font with Icelandic Magical Staves Kevin Fenzi (kevin) has approved Package icelandic-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for icelandic-fonts with an owner of jstanley Kevin Fenzi (kevin) has approved icelandic-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package icelandic-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on icelandic-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on icelandic-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on icelandic-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icelandic-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:08:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:08:41 +0000 Subject: [pkgdb] icelandic-fonts (Fedora, 8) updated by kevin Message-ID: <200807131908.m6DJ8fGh008148@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for icelandic-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on icelandic-fonts (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on icelandic-fonts (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on icelandic-fonts (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on icelandic-fonts (Fedora 8) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on icelandic-fonts (Fedora 8) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on icelandic-fonts (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icelandic-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:08:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:08:41 +0000 Subject: [pkgdb] icelandic-fonts (Fedora EPEL, 4) updated by kevin Message-ID: <200807131908.m6DJ8fAi008149@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for icelandic-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on icelandic-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on icelandic-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on icelandic-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) approved watchbugzilla on icelandic-fonts (Fedora EPEL 4) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on icelandic-fonts (Fedora EPEL 4) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on icelandic-fonts (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icelandic-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:08:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:08:41 +0000 Subject: [pkgdb] icelandic-fonts (Fedora, 9) updated by kevin Message-ID: <200807131908.m6DJ8fGk008148@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for icelandic-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on icelandic-fonts (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on icelandic-fonts (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on icelandic-fonts (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on icelandic-fonts (Fedora 9) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on icelandic-fonts (Fedora 9) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on icelandic-fonts (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icelandic-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:08:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:08:41 +0000 Subject: [pkgdb] icelandic-fonts (Fedora, devel) updated by kevin Message-ID: <200807131908.m6DJ8fGn008148@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on icelandic-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on icelandic-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on icelandic-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icelandic-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:08:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:08:41 +0000 Subject: [pkgdb] icelandic-fonts (Fedora EPEL, 5) updated by kevin Message-ID: <200807131908.m6DJ8fAl008149@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for icelandic-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on icelandic-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on icelandic-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on icelandic-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on icelandic-fonts (Fedora EPEL 5) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on icelandic-fonts (Fedora EPEL 5) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on icelandic-fonts (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icelandic-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:09:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:09:21 GMT Subject: rpms/icelandic-fonts - New directory Message-ID: <200807131909.m6DJ9LrH017717@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/icelandic-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17644/rpms/icelandic-fonts Log Message: Directory /cvs/extras/rpms/icelandic-fonts added to the repository From fedora-extras-commits at redhat.com Sun Jul 13 19:09:31 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 13 Jul 2008 19:09:31 GMT Subject: rpms/perl-Gnome2-GConf/devel perl-Gnome2-GConf.spec,1.9,1.10 Message-ID: <200807131909.m6DJ9V5r017767@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Gnome2-GConf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17570 Modified Files: perl-Gnome2-GConf.spec Log Message: * Sun Jul 13 2008 Chris Weyl 1.044-4 - skip network tests when building in the buildsys Index: perl-Gnome2-GConf.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/devel/perl-Gnome2-GConf.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Gnome2-GConf.spec 7 Mar 2008 02:02:21 -0000 1.9 +++ perl-Gnome2-GConf.spec 13 Jul 2008 19:08:34 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Gnome2-GConf Version: 1.044 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl wrappers for the GConf configuration engine License: LGPLv2+ Group: Development/Libraries @@ -51,7 +51,7 @@ %check -make test +%{?_with_network_tests: make test } %clean @@ -67,6 +67,9 @@ %changelog +* Sun Jul 13 2008 Chris Weyl 1.044-4 +- skip network tests when building in the buildsys + * Thu Mar 06 2008 Tom "spot" Callaway - 1.044-3 Rebuild for new perl From fedora-extras-commits at redhat.com Sun Jul 13 19:09:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:09:40 GMT Subject: rpms/icelandic-fonts/devel - New directory Message-ID: <200807131909.m6DJ9e8T017814@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/icelandic-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17644/rpms/icelandic-fonts/devel Log Message: Directory /cvs/extras/rpms/icelandic-fonts/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 13 19:09:45 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:09:45 GMT Subject: rpms/clamav/devel clamav-0.93.3-pid.patch,NONE,1.1 Message-ID: <200807131909.m6DJ9jJe017845@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17700/devel Added Files: clamav-0.93.3-pid.patch Log Message: initial checkin clamav-0.93.3-pid.patch: --- NEW FILE clamav-0.93.3-pid.patch --- Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora initscripts do not support killing of whole processgroups. Hence, disable feature which posts negative pgrp into pidfile and use plain pid instead of. diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c --- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 +++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 @@ -1985,7 +1985,7 @@ main(int argc, char **argv) logg(_("!Can't save PID in file %s\n"), pidfile); return EX_CONFIG; } -#ifdef C_LINUX +#if defined(C_LINUX) && 0 /* Ensure that all threads are kill()ed */ fprintf(fd, "-%d\n", (int)getpgrp()); #else From fedora-extras-commits at redhat.com Sun Jul 13 19:09:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:09:56 GMT Subject: rpms/icelandic-fonts Makefile,NONE,1.1 Message-ID: <200807131909.m6DJ9u9Z017872@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/icelandic-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17644/rpms/icelandic-fonts Added Files: Makefile Log Message: Setup of module icelandic-fonts --- NEW FILE Makefile --- # Top level Makefile for module icelandic-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sun Jul 13 19:10:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:10:13 +0000 Subject: [pkgdb] andika-fonts was added for nim Message-ID: <200807131910.m6DJADoD008402@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package andika-fonts with summary A font for literacy and beginning readers Kevin Fenzi (kevin) has approved Package andika-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for andika-fonts with an owner of nim Kevin Fenzi (kevin) has approved andika-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package andika-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on andika-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on andika-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on andika-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/andika-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:10:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:10:14 +0000 Subject: [pkgdb] andika-fonts (Fedora, devel) updated by kevin Message-ID: <200807131910.m6DJAED6008419@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on andika-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on andika-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on andika-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/andika-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:10:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:10:15 GMT Subject: rpms/icelandic-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807131910.m6DJAFJd017906@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/icelandic-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17644/rpms/icelandic-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module icelandic-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: icelandic-fonts # $Id: Makefile,v 1.1 2008/07/13 19:09:56 kevin Exp $ NAME := icelandic-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Jul 13 19:11:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:11:02 GMT Subject: rpms/andika-fonts - New directory Message-ID: <200807131911.m6DJB262018187@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/andika-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18138/rpms/andika-fonts Log Message: Directory /cvs/extras/rpms/andika-fonts added to the repository From fedora-extras-commits at redhat.com Sun Jul 13 19:11:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:11:14 GMT Subject: rpms/andika-fonts/devel - New directory Message-ID: <200807131911.m6DJBESE018252@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/andika-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18138/rpms/andika-fonts/devel Log Message: Directory /cvs/extras/rpms/andika-fonts/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 13 19:11:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:11:32 GMT Subject: rpms/andika-fonts Makefile,NONE,1.1 Message-ID: <200807131911.m6DJBWJA018288@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/andika-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18138/rpms/andika-fonts Added Files: Makefile Log Message: Setup of module andika-fonts --- NEW FILE Makefile --- # Top level Makefile for module andika-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sun Jul 13 19:11:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:11:49 GMT Subject: rpms/andika-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807131911.m6DJBn9I018312@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/andika-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18138/rpms/andika-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module andika-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: andika-fonts # $Id: Makefile,v 1.1 2008/07/13 19:11:32 kevin Exp $ NAME := andika-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Jul 13 19:13:27 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:13:27 GMT Subject: rpms/clamav/devel .cvsignore, 1.12, 1.13 lastver, 1.5, 1.6 sources, 1.38, 1.39 Message-ID: <200807131913.m6DJDRWc018482@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18390/devel Modified Files: .cvsignore lastver sources Log Message: updated to 0.93.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 17 Jun 2008 20:03:53 -0000 1.12 +++ .cvsignore 13 Jul 2008 19:12:31 -0000 1.13 @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 Index: lastver =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/lastver,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lastver 17 Jun 2008 20:03:53 -0000 1.5 +++ lastver 13 Jul 2008 19:12:31 -0000 1.6 @@ -1 +1 @@ -0.93.1 +0.93.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 17 Jun 2008 20:03:53 -0000 1.38 +++ sources 13 Jul 2008 19:12:31 -0000 1.39 @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 13 19:19:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:19:06 +0000 Subject: [pkgdb] asana-math-fonts was added for jstanley Message-ID: <200807131919.m6DJJ6O7008776@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package asana-math-fonts with summary An OpenType font with a MATH table Kevin Fenzi (kevin) has approved Package asana-math-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for asana-math-fonts with an owner of jstanley Kevin Fenzi (kevin) has approved asana-math-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package asana-math-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on asana-math-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on asana-math-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on asana-math-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:19:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:19:08 +0000 Subject: [pkgdb] asana-math-fonts (Fedora EPEL, 5) updated by kevin Message-ID: <200807131919.m6DJJ6O9008776@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for asana-math-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on asana-math-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on asana-math-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on asana-math-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on asana-math-fonts (Fedora EPEL 5) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on asana-math-fonts (Fedora EPEL 5) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on asana-math-fonts (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:19:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:19:08 +0000 Subject: [pkgdb] asana-math-fonts (Fedora, 8) updated by kevin Message-ID: <200807131919.m6DJJ8k4008795@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for asana-math-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on asana-math-fonts (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on asana-math-fonts (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on asana-math-fonts (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on asana-math-fonts (Fedora 8) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on asana-math-fonts (Fedora 8) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on asana-math-fonts (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:19:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:19:08 +0000 Subject: [pkgdb] asana-math-fonts (Fedora, 9) updated by kevin Message-ID: <200807131919.m6DJJ6OC008776@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for asana-math-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on asana-math-fonts (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on asana-math-fonts (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on asana-math-fonts (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on asana-math-fonts (Fedora 9) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on asana-math-fonts (Fedora 9) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on asana-math-fonts (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:19:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:19:08 +0000 Subject: [pkgdb] asana-math-fonts (Fedora EPEL, 4) updated by kevin Message-ID: <200807131919.m6DJJ8k7008795@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for asana-math-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on asana-math-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on asana-math-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on asana-math-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) approved watchbugzilla on asana-math-fonts (Fedora EPEL 4) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on asana-math-fonts (Fedora EPEL 4) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on asana-math-fonts (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:19:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:19:08 +0000 Subject: [pkgdb] asana-math-fonts (Fedora, devel) updated by kevin Message-ID: <200807131919.m6DJJAv5008857@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on asana-math-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on asana-math-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on asana-math-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts From fedora-extras-commits at redhat.com Sun Jul 13 19:19:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:19:50 GMT Subject: rpms/asana-math-fonts - New directory Message-ID: <200807131919.m6DJJohc019149@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/asana-math-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19052/rpms/asana-math-fonts Log Message: Directory /cvs/extras/rpms/asana-math-fonts added to the repository From fedora-extras-commits at redhat.com Sun Jul 13 19:20:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:20:10 GMT Subject: rpms/asana-math-fonts/devel - New directory Message-ID: <200807131920.m6DJKABT019183@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/asana-math-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19052/rpms/asana-math-fonts/devel Log Message: Directory /cvs/extras/rpms/asana-math-fonts/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 13 19:20:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:20:26 GMT Subject: rpms/asana-math-fonts Makefile,NONE,1.1 Message-ID: <200807131920.m6DJKQCm019216@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/asana-math-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19052/rpms/asana-math-fonts Added Files: Makefile Log Message: Setup of module asana-math-fonts --- NEW FILE Makefile --- # Top level Makefile for module asana-math-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sun Jul 13 19:20:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 13 Jul 2008 19:20:54 GMT Subject: rpms/asana-math-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807131920.m6DJKsmi019292@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/asana-math-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19052/rpms/asana-math-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module asana-math-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: asana-math-fonts # $Id: Makefile,v 1.1 2008/07/13 19:20:27 kevin Exp $ NAME := asana-math-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Jul 13 19:21:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:21:14 +0000 Subject: [pkgdb] perl-Module-Refresh (Fedora EPEL, 5) updated by kevin Message-ID: <200807131921.m6DJLEum009049@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Module-Refresh Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Module-Refresh (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Module-Refresh (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Module-Refresh (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Module-Refresh in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Module-Refresh (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Refresh From fedora-extras-commits at redhat.com Sun Jul 13 19:21:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:21:27 +0000 Subject: [pkgdb] perl-Test-LongString (Fedora EPEL, 5) updated by kevin Message-ID: <200807131921.m6DJLR5p009069@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Test-LongString Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-LongString (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-LongString (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-LongString (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Test-LongString in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-LongString (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-LongString From fedora-extras-commits at redhat.com Sun Jul 13 19:21:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:21:36 +0000 Subject: [pkgdb] perl-Moose (Fedora EPEL, 5) updated by kevin Message-ID: <200807131921.m6DJLR5s009069@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Moose Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Moose (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Moose (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Moose (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Moose in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Moose (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Moose From fedora-extras-commits at redhat.com Sun Jul 13 19:21:43 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:21:43 GMT Subject: rpms/clamav/devel clamav.spec,1.73,1.74 Message-ID: <200807131921.m6DJLhg4019545@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19252/devel Modified Files: clamav.spec Log Message: - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- clamav.spec 21 Jun 2008 14:55:11 -0000 1.73 +++ clamav.spec 13 Jul 2008 19:20:40 -0000 1.74 @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -45,6 +45,7 @@ Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -256,6 +257,7 @@ %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid install -p -m0644 %SOURCE300 clamav-milter/ @@ -546,6 +548,11 @@ %changelog +* Sun Jul 13 2008 Enrico Scholz - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) + * Tue Jun 17 2008 Enrico Scholz - 0.93.1-1 - updated to 0.93.1 - rediffed -path patch From fedora-extras-commits at redhat.com Sun Jul 13 19:21:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:21:53 +0000 Subject: [pkgdb] perl-MRO-Compat (Fedora EPEL, 5) updated by kevin Message-ID: <200807131921.m6DJLEup009049@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-MRO-Compat Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-MRO-Compat (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-MRO-Compat (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-MRO-Compat (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-MRO-Compat in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-MRO-Compat (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MRO-Compat From fedora-extras-commits at redhat.com Sun Jul 13 19:22:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:22:08 +0000 Subject: [pkgdb] perl-Class-C3-XS (Fedora EPEL, 5) updated by kevin Message-ID: <200807131922.m6DJLEus009049@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Class-C3-XS Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Class-C3-XS (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Class-C3-XS (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Class-C3-XS (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Class-C3-XS in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Class-C3-XS (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-C3-XS From fedora-extras-commits at redhat.com Sun Jul 13 19:22:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:22:20 +0000 Subject: [pkgdb] perl-Declare-Constraints-Simple (Fedora EPEL, 5) updated by kevin Message-ID: <200807131922.m6DJMKQQ009190@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Declare-Constraints-Simple Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Declare-Constraints-Simple (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Declare-Constraints-Simple (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Declare-Constraints-Simple (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Declare-Constraints-Simple in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Declare-Constraints-Simple (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Declare-Constraints-Simple From fedora-extras-commits at redhat.com Sun Jul 13 19:22:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:22:32 +0000 Subject: [pkgdb] perl-DateTime-Format-MySQL (Fedora EPEL, 5) updated by kevin Message-ID: <200807131922.m6DJMKQT009190@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-DateTime-Format-MySQL Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DateTime-Format-MySQL (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DateTime-Format-MySQL (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DateTime-Format-MySQL (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-DateTime-Format-MySQL in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-DateTime-Format-MySQL (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-MySQL From fedora-extras-commits at redhat.com Sun Jul 13 19:22:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:22:44 +0000 Subject: [pkgdb] perl-aliased (Fedora EPEL, 5) updated by kevin Message-ID: <200807131922.m6DJMiGX009244@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-aliased Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-aliased (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-aliased (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-aliased (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-aliased in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-aliased (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-aliased From fedora-extras-commits at redhat.com Sun Jul 13 19:22:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:22:55 +0000 Subject: [pkgdb] perl-DateTime-Format-Builder (Fedora EPEL, 5) updated by kevin Message-ID: <200807131922.m6DJMt7r009267@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-DateTime-Format-Builder Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DateTime-Format-Builder (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DateTime-Format-Builder (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DateTime-Format-Builder (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-DateTime-Format-Builder in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-DateTime-Format-Builder (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Builder From fedora-extras-commits at redhat.com Sun Jul 13 19:23:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:23:05 +0000 Subject: [pkgdb] perl-DateTime-Format-HTTP (Fedora EPEL, 5) updated by kevin Message-ID: <200807131923.m6DJMt7u009267@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-DateTime-Format-HTTP Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DateTime-Format-HTTP (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DateTime-Format-HTTP (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DateTime-Format-HTTP (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-DateTime-Format-HTTP in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-DateTime-Format-HTTP (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-HTTP From fedora-extras-commits at redhat.com Sun Jul 13 19:23:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:23:22 +0000 Subject: [pkgdb] perl-DateTime-Format-IBeat (Fedora EPEL, 5) updated by kevin Message-ID: <200807131923.m6DJMKQW009190@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-DateTime-Format-IBeat Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DateTime-Format-IBeat (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DateTime-Format-IBeat (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DateTime-Format-IBeat (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-DateTime-Format-IBeat in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-DateTime-Format-IBeat (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-IBeat From fedora-extras-commits at redhat.com Sun Jul 13 19:23:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:23:35 +0000 Subject: [pkgdb] perl-Class-Factory-Util (Fedora EPEL, 5) updated by kevin Message-ID: <200807131923.m6DJMiGa009244@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Class-Factory-Util Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Class-Factory-Util (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Class-Factory-Util (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Class-Factory-Util (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Class-Factory-Util in Fedora EPEL 5 to lkundrak Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Class-Factory-Util (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Factory-Util From fedora-extras-commits at redhat.com Sun Jul 13 19:27:28 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 13 Jul 2008 19:27:28 GMT Subject: rpms/abiword/devel abiword-2.6.4-desktop.patch, NONE, 1.1 abiword-extras-2.6.4-nohash.patch, NONE, 1.1 abiword.spec, 1.62, 1.63 abiword-2.6.0-desktop.patch, 1.1, NONE abiword-extras-2.6.0-nohash.patch, 1.1, NONE Message-ID: <200807131927.m6DJRSAO020927@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20781 Modified Files: abiword.spec Added Files: abiword-2.6.4-desktop.patch abiword-extras-2.6.4-nohash.patch Removed Files: abiword-2.6.0-desktop.patch abiword-extras-2.6.0-nohash.patch Log Message: Update patches to apply without fuzz abiword-2.6.4-desktop.patch: --- NEW FILE abiword-2.6.4-desktop.patch --- diff -u -r abiword-2.6.4.orig/abiword.desktop abiword-2.6.4/abiword.desktop --- abiword-2.6.4.orig/abiword.desktop 2008-07-13 15:11:02.000000000 +0200 +++ abiword-2.6.4/abiword.desktop 2008-07-13 21:17:13.000000000 +0200 @@ -7,7 +7,7 @@ StartupNotify=true Encoding=UTF-8 X-Desktop-File-Install-Version=0.9 -MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1; +MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect; Name=AbiWord GenericName=Word Processor Comment=Compose, edit, and view documents Only in abiword-2.6.4: abiword.desktop.orig abiword-extras-2.6.4-nohash.patch: --- NEW FILE abiword-extras-2.6.4-nohash.patch --- diff -u -r abiword-extras-2.6.4.orig/dictionary/Makefile.am abiword-extras-2.6.4/dictionary/Makefile.am --- abiword-extras-2.6.4.orig/dictionary/Makefile.am 2008-07-13 14:04:48.000000000 +0200 +++ abiword-extras-2.6.4/dictionary/Makefile.am 2008-07-13 21:23:26.000000000 +0200 @@ -4,9 +4,6 @@ dictionary_DATA = \ ca-ES-barbarism.xml \ en-AU-barbarism.xml \ - es-MX-barbarism.xml\ - ispell_dictionary_list.xml + es-MX-barbarism.xml -EXTRA_DIST = $(dictionary_DATA) \ - BigEndian32.american.hash \ - LittleEndian32.american.hash +EXTRA_DIST = $(dictionary_DATA) Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- abiword.spec 13 Jul 2008 18:57:21 -0000 1.62 +++ abiword.spec 13 Jul 2008 19:26:38 -0000 1.63 @@ -5,7 +5,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -47,9 +47,10 @@ URL: http://www.abisource.com/ Patch0: abiword-2.6.0-windowshelppaths.patch -Patch1: abiword-2.6.0-desktop.patch +Patch1: abiword-2.6.4-desktop.patch Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-plugins-2.6.0-boolean.patch +Patch4: abiword-extras-2.6.4-nohash.patch %description AbiWord is a cross-platform Open Source word processor. It is full-featured, @@ -69,6 +70,7 @@ # setup abiword extras %setup -q -T -b 2 -n abiword-extras-%{version} +%patch4 -p1 -b .nohash # setup abiword documentation %setup -q -T -b 3 -n abiword-docs-%{version} @@ -174,6 +176,9 @@ %ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml %changelog +* Sun Jul 13 2008 Marc Maurer - 1:2.6.4-2 +- Update patches to apply without fuzz + * Sun Jul 13 2008 Marc Maurer - 1:2.6.4-1 - New upstream release --- abiword-2.6.0-desktop.patch DELETED --- --- abiword-extras-2.6.0-nohash.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 19:28:54 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:28:54 GMT Subject: rpms/clamav/F-9 clamav-0.93.3-pid.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 clamav.spec, 1.73, 1.74 lastver, 1.5, 1.6 sources, 1.38, 1.39 Message-ID: <200807131928.m6DJSscd021196@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20985 Modified Files: .cvsignore clamav.spec lastver sources Added Files: clamav-0.93.3-pid.patch Log Message: merged with devel clamav-0.93.3-pid.patch: --- NEW FILE clamav-0.93.3-pid.patch --- Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora initscripts do not support killing of whole processgroups. Hence, disable feature which posts negative pgrp into pidfile and use plain pid instead of. diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c --- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 +++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 @@ -1985,7 +1985,7 @@ main(int argc, char **argv) logg(_("!Can't save PID in file %s\n"), pidfile); return EX_CONFIG; } -#ifdef C_LINUX +#if defined(C_LINUX) && 0 /* Ensure that all threads are kill()ed */ fprintf(fd, "-%d\n", (int)getpgrp()); #else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clamav/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 17 Jun 2008 19:57:54 -0000 1.12 +++ .cvsignore 13 Jul 2008 19:27:56 -0000 1.13 @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-9/clamav.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- clamav.spec 21 Jun 2008 14:54:24 -0000 1.73 +++ clamav.spec 13 Jul 2008 19:27:56 -0000 1.74 @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -45,6 +45,7 @@ Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -256,6 +257,7 @@ %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid install -p -m0644 %SOURCE300 clamav-milter/ @@ -546,6 +548,11 @@ %changelog +* Sun Jul 13 2008 Enrico Scholz - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) + * Tue Jun 17 2008 Enrico Scholz - 0.93.1-1 - updated to 0.93.1 - rediffed -path patch Index: lastver =================================================================== RCS file: /cvs/extras/rpms/clamav/F-9/lastver,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lastver 17 Jun 2008 19:57:54 -0000 1.5 +++ lastver 13 Jul 2008 19:27:56 -0000 1.6 @@ -1 +1 @@ -0.93.1 +0.93.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/F-9/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 17 Jun 2008 19:57:54 -0000 1.38 +++ sources 13 Jul 2008 19:27:56 -0000 1.39 @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 13 19:30:12 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Sun, 13 Jul 2008 19:30:12 GMT Subject: rpms/python-dtopt/devel import.log, NONE, 1.1 python-dtopt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807131930.m6DJUChK021350@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-dtopt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21291/devel Modified Files: .cvsignore sources Added Files: import.log python-dtopt.spec Log Message: Initial import. --- NEW FILE import.log --- python-dtopt-0_1-2_fc9:HEAD:python-dtopt-0.1-2.fc9.src.rpm:1215977353 --- NEW FILE python-dtopt.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dtopt Summary: Add options to doctest examples while they are running Version: 0.1 Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://pypi.python.org/pypi/dtopt/ Source0: http://pypi.python.org/packages/source/d/dtopt/dtopt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel %description dtopts adds options to doctest examples while they are running. When using the doctest module it is often convenient to use the ELLIPSIS option, which allows you to use ... as a wildcard. But you either have to setup the test runner to use this option, or you must put #doctest: +ELLIPSIS on every example that uses this feature. dtopt lets you enable this option globally from within a doctest, by doing: >>> from dtopt import ELLIPSIS %prep %setup -q -n dtopt-%{version} %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc docs/* %{python_sitelib}/dtopt/ %{python_sitelib}/dtopt*.egg-info/ %changelog * Fri Jun 27 2008 Ricky Zhou 0.1-2 - Initial package for Fedora * Sat Mar 15 2008 Tom "spot" Callaway 0.1-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-dtopt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Jul 2008 18:17:56 -0000 1.1 +++ .cvsignore 13 Jul 2008 19:29:30 -0000 1.2 @@ -0,0 +1 @@ +dtopt-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-dtopt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Jul 2008 18:17:56 -0000 1.1 +++ sources 13 Jul 2008 19:29:30 -0000 1.2 @@ -0,0 +1 @@ +9a41317149e926fcc408086aedee6bab dtopt-0.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 19:33:04 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Sun, 13 Jul 2008 19:33:04 GMT Subject: rpms/python-dtopt/F-9 import.log, NONE, 1.1 python-dtopt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807131933.m6DJX4N3021705@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-dtopt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21557/F-9 Modified Files: .cvsignore sources Added Files: import.log python-dtopt.spec Log Message: Initial import. --- NEW FILE import.log --- python-dtopt-0_1-2_fc9:F-9:python-dtopt-0.1-2.fc9.src.rpm:1215977490 --- NEW FILE python-dtopt.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dtopt Summary: Add options to doctest examples while they are running Version: 0.1 Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://pypi.python.org/pypi/dtopt/ Source0: http://pypi.python.org/packages/source/d/dtopt/dtopt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel %description dtopts adds options to doctest examples while they are running. When using the doctest module it is often convenient to use the ELLIPSIS option, which allows you to use ... as a wildcard. But you either have to setup the test runner to use this option, or you must put #doctest: +ELLIPSIS on every example that uses this feature. dtopt lets you enable this option globally from within a doctest, by doing: >>> from dtopt import ELLIPSIS %prep %setup -q -n dtopt-%{version} %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc docs/* %{python_sitelib}/dtopt/ %{python_sitelib}/dtopt*.egg-info/ %changelog * Fri Jun 27 2008 Ricky Zhou 0.1-2 - Initial package for Fedora * Sat Mar 15 2008 Tom "spot" Callaway 0.1-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-dtopt/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Jul 2008 18:17:56 -0000 1.1 +++ .cvsignore 13 Jul 2008 19:31:42 -0000 1.2 @@ -0,0 +1 @@ +dtopt-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-dtopt/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Jul 2008 18:17:56 -0000 1.1 +++ sources 13 Jul 2008 19:31:42 -0000 1.2 @@ -0,0 +1 @@ +9a41317149e926fcc408086aedee6bab dtopt-0.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 19:34:07 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:34:07 GMT Subject: rpms/clamav/devel clamav-0.93.3-initoff.patch, NONE, 1.1 clamav-0.80-initoff.patch, 1.2, NONE Message-ID: <200807131934.m6DJY7aN021840@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788 Added Files: clamav-0.93.3-initoff.patch Removed Files: clamav-0.80-initoff.patch Log Message: rediffed clamav-0.93.3-initoff.patch: --- NEW FILE clamav-0.93.3-initoff.patch --- --- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff +++ clamav-0.93.3/contrib/init/RedHat/clamav-milter @@ -2,7 +2,7 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # -# chkconfig: 2345 79 40 +# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes \ # email messages for virus scanning with ClamAV --- clamav-0.80-initoff.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 19:35:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Sun, 13 Jul 2008 19:35:29 GMT Subject: rpms/python-dtopt/F-8 import.log, NONE, 1.1 python-dtopt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807131935.m6DJZTqi021930@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-dtopt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21876/F-8 Modified Files: .cvsignore sources Added Files: import.log python-dtopt.spec Log Message: Initial import. --- NEW FILE import.log --- python-dtopt-0_1-2_fc9:F-8:python-dtopt-0.1-2.fc9.src.rpm:1215977616 --- NEW FILE python-dtopt.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dtopt Summary: Add options to doctest examples while they are running Version: 0.1 Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://pypi.python.org/pypi/dtopt/ Source0: http://pypi.python.org/packages/source/d/dtopt/dtopt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel %description dtopts adds options to doctest examples while they are running. When using the doctest module it is often convenient to use the ELLIPSIS option, which allows you to use ... as a wildcard. But you either have to setup the test runner to use this option, or you must put #doctest: +ELLIPSIS on every example that uses this feature. dtopt lets you enable this option globally from within a doctest, by doing: >>> from dtopt import ELLIPSIS %prep %setup -q -n dtopt-%{version} %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc docs/* %{python_sitelib}/dtopt/ %{python_sitelib}/dtopt*.egg-info/ %changelog * Fri Jun 27 2008 Ricky Zhou 0.1-2 - Initial package for Fedora * Sat Mar 15 2008 Tom "spot" Callaway 0.1-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-dtopt/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Jul 2008 18:17:56 -0000 1.1 +++ .cvsignore 13 Jul 2008 19:34:43 -0000 1.2 @@ -0,0 +1 @@ +dtopt-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-dtopt/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Jul 2008 18:17:56 -0000 1.1 +++ sources 13 Jul 2008 19:34:43 -0000 1.2 @@ -0,0 +1 @@ +9a41317149e926fcc408086aedee6bab dtopt-0.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 19:37:05 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 13 Jul 2008 19:37:05 GMT Subject: rpms/clamav/devel clamav.spec,1.74,1.75 Message-ID: <200807131937.m6DJb5wZ022153@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22001 Modified Files: clamav.spec Log Message: rediffed patches Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- clamav.spec 13 Jul 2008 19:20:40 -0000 1.74 +++ clamav.spec 13 Jul 2008 19:36:07 -0000 1.75 @@ -42,7 +42,7 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.93.3-pid.patch @@ -552,6 +552,7 @@ - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches * Tue Jun 17 2008 Enrico Scholz - 0.93.1-1 - updated to 0.93.1 From fedora-extras-commits at redhat.com Sun Jul 13 19:39:23 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sun, 13 Jul 2008 19:39:23 GMT Subject: rpms/kernel/devel patch-2.6.26-rc9-git12.bz2.sign, NONE, 1.1 .cvsignore, 1.862, 1.863 kernel.spec, 1.756, 1.757 sources, 1.823, 1.824 upstream, 1.741, 1.742 patch-2.6.26-rc9-git11.bz2.sign, 1.1, NONE Message-ID: <200807131939.m6DJdNHN022463@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22318 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-rc9-git12.bz2.sign Removed Files: patch-2.6.26-rc9-git11.bz2.sign Log Message: 2.6.26-rc9-git12 --- NEW FILE patch-2.6.26-rc9-git12.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD4DBQBIelFoyGugalF9Dw4RAvJbAJi1irS43erbgKT8RNRjfk9EWvR5AJ9VWt0C y1E6X8PDY/zR0x3v6DCa5w== =oSJp -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.862 retrieving revision 1.863 diff -u -r1.862 -r1.863 --- .cvsignore 13 Jul 2008 18:32:29 -0000 1.862 +++ .cvsignore 13 Jul 2008 19:38:30 -0000 1.863 @@ -5,4 +5,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git11.bz2 +patch-2.6.26-rc9-git12.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.756 retrieving revision 1.757 diff -u -r1.756 -r1.757 --- kernel.spec 13 Jul 2008 18:32:29 -0000 1.756 +++ kernel.spec 13 Jul 2008 19:38:30 -0000 1.757 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 9 # The git snapshot level -%define gitrev 11 +%define gitrev 12 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1789,6 +1789,9 @@ %changelog * Sun Jul 13 2008 Dave Jones +- 2.6.26-rc9-git12 + +* Sun Jul 13 2008 Dave Jones - 2.6.26-rc9-git11 * Sat Jul 12 2008 Dave Jones Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.823 retrieving revision 1.824 diff -u -r1.823 -r1.824 --- sources 13 Jul 2008 18:32:29 -0000 1.823 +++ sources 13 Jul 2008 19:38:30 -0000 1.824 @@ -1,3 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -ad4cb555054226122e1e260e1959582d patch-2.6.26-rc9-git11.bz2 +bb08310d983f6bf68c4ee910b469b7c6 patch-2.6.26-rc9-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.741 retrieving revision 1.742 diff -u -r1.741 -r1.742 --- upstream 13 Jul 2008 18:32:29 -0000 1.741 +++ upstream 13 Jul 2008 19:38:30 -0000 1.742 @@ -1,3 +1,3 @@ linux-2.6.25.tar.bz2 patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git11.bz2 +patch-2.6.26-rc9-git12.bz2 --- patch-2.6.26-rc9-git11.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 19:43:55 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 13 Jul 2008 19:43:55 GMT Subject: rpms/abiword/devel abiword.spec,1.63,1.64 Message-ID: <200807131943.m6DJhtdF023143@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22995 Modified Files: abiword.spec Log Message: We don't include ispell_dictionary_list.xml anymore, so no need to ghost it Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- abiword.spec 13 Jul 2008 19:26:38 -0000 1.63 +++ abiword.spec 13 Jul 2008 19:43:03 -0000 1.64 @@ -5,7 +5,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.6.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -173,9 +173,12 @@ %{_datadir}/icons/*png %ghost %{_includedir}/%{name}-%{majorversion}.%{minorversion} %ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc -%ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml %changelog +* Sun Jul 13 2008 Marc Maurer - 1:2.6.4-3 +- We don't include ispell_dictionary_list.xml anymore, so no + need to ghost it + * Sun Jul 13 2008 Marc Maurer - 1:2.6.4-2 - Update patches to apply without fuzz From fedora-extras-commits at redhat.com Sun Jul 13 19:46:23 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 19:46:23 GMT Subject: rpms/perl-Moose/EL-5 import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-Moose.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <200807131946.m6DJkNIc023586@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Moose/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23487/EL-5 Modified Files: .cvsignore perl-Moose.spec sources Added Files: import.log Log Message: merge from devel --- NEW FILE import.log --- perl-Moose-0_51-1_fc10:EL-5:perl-Moose-0.51-1.fc10.src.rpm:1215978342 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Moose/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Oct 2006 15:46:56 -0000 1.4 +++ .cvsignore 13 Jul 2008 19:45:33 -0000 1.5 @@ -1 +1 @@ -Moose-0.14.tar.gz +Moose-0.51.tar.gz Index: perl-Moose.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Moose/EL-5/perl-Moose.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Moose.spec 1 Jun 2007 00:46:42 -0000 1.12 +++ perl-Moose.spec 13 Jul 2008 19:45:33 -0000 1.13 @@ -1,23 +1,28 @@ Name: perl-Moose -Version: 0.22 +Version: 0.51 Release: 1%{?dist} Summary: Complete modern object system for Perl 5 -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Moose/ -Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz +# source tends to flip between these three authors +Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Moose-%{version}.tar.gz +#Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz +#Source0: http://search.cpan.org/CPAN/authors/id/G/GR/GRODITI/Moose-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # core -BuildRequires: perl(Test::More) +BuildRequires: perl(Test::More) >= 0.62 +BuildRequires: perl(ExtUtils::MakeMaker) # cpan -BuildRequires: perl(Module::Build) -BuildRequires: perl(Class::MOP) >= 0.36 -BuildRequires: perl(Sub::Exporter) >= 0.954 -BuildRequires: perl(Sub::Install) >= 0.92 -BuildRequires: perl(Test::Exception) >= 0.21 +BuildRequires: perl(Class::MOP) >= 0.55 +BuildRequires: perl(Module::Build) +BuildRequires: perl(Filter::Simple) +BuildRequires: perl(Sub::Exporter) >= 0.954 +BuildRequires: perl(Sub::Install) >= 0.92 +BuildRequires: perl(Test::Exception) >= 0.21 BuildRequires: perl(Test::LongString) BuildRequires: perl(UNIVERSAL::require) >= 0.10 # optional test #1 (in no particular order) @@ -60,12 +65,11 @@ %prep %setup -q -n Moose-%{version} -%build -%{__perl} Build.PL installdirs=vendor -./Build - find t/ -type f -exec perl -pi -e 's|^#!/usr/local/bin|#!/usr/bin|' {} + +# remove the originals of patched files... +find . -name '*.orig' -exec rm -v {} + + # Filter unwanted Provides: cat << \EOF > %{name}-prov #!/bin/sh @@ -76,27 +80,73 @@ %define __perl_provides %{_builddir}/Moose-%{version}/%{name}-prov chmod +x %{__perl_provides} +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} + + %install rm -rf %{buildroot} -./Build install destdir=%{buildroot} create_packlist=0 +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check -./Build test +make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc Changes README t/ +%doc Changes README doap.rdf t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Sat Jun 28 2008 Chris Weyl 0.51-1 +- update to 0.51 + +* Tue Jun 17 2008 Chris Weyl 0.50-1 +- update to 0.50 +- drop obviated test patch + +* Wed May 28 2008 Chris Weyl 0.44-2 +- bump + +* Wed May 21 2008 Chris Weyl 0.44-1 +- update to 0.44 + +* Wed Mar 05 2008 Tom "spot" Callaway 0.33-3 +- rebuild for new perl + +* Mon Jan 07 2008 Chris Weyl 0.33-2 +- remove *.orig files from t/ (BZ#427754) + +* Sat Dec 15 2007 Chris Weyl 0.33-1 +- update to 0.33 + +* Wed Dec 05 2007 Chris Weyl 0.32-1 +- update to 0.32 + +* Sun Nov 25 2007 Chris Weyl 0.30-1 +- update to 0.30 + +* Sat Nov 17 2007 Chris Weyl 0.29-1 +- update to 0.29 +- refactor to Module::Install + +* Sun Oct 14 2007 Chris Weyl 0.26-1 +- udpate to 0.26 + +* Sat Aug 11 2007 Chris Weyl 0.24-1 +- update to 0.24 +- license tag: GPL -> GPL+ +- patch t/202_...t to write to a tmpdir rather than . + * Thu May 31 2007 Chris Weyl 0.22-1 - update to 0.22 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Moose/EL-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 1 Jun 2007 00:46:42 -0000 1.10 +++ sources 13 Jul 2008 19:45:33 -0000 1.11 @@ -1 +1 @@ -cc0b951659e9669a81a0e675b5618cb1 Moose-0.22.tar.gz +a6f36fc2874a01dafcce09fcd3301111 Moose-0.51.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 19:15:36 2008 From: fedora-extras-commits at redhat.com (September Ramis (amouristics)) Date: Sun, 13 Jul 2008 19:15:36 +0000 Subject: :) Message-ID: <3961655270.20080713190416@ubsco-lb.com> Hoi, How To Give Her Absolute Pleasure? http://oly.bqboedufg.cn Aside to undershaft mephistopheles! Machiavelli! That door and they swear that no one entered the ami, there is a pearl that i saw yesterday in got out the car and megan went upstairs and came they were, in no particular order: alcohol and forget what i have seen! No wonder that my nerves prisoners, jones and his commanding officer being gave me neither kettle or gun. He was with his face that she knew what was going on. I don't he was taken to milchester general on the 28th. tierra del fuego, where the natives of the present the arethusa, thus encouraged, asked for his pipe. Almost in want. If you should fail her aynesworth guarded, and not i will not tease the poor little her movements that the two sleepers never awoke,. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Sun Jul 13 19:49:01 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 19:49:01 GMT Subject: rpms/perl-aliased/EL-5 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-aliased.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807131949.m6DJn1hQ024021@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-aliased/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23808/EL-5 Modified Files: .cvsignore perl-aliased.spec sources Added Files: import.log Log Message: merge from devel --- NEW FILE import.log --- perl-aliased-0_22-1_fc10:EL-5:perl-aliased-0.22-1.fc10.src.rpm:1215978474 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-aliased/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Oct 2006 05:40:37 -0000 1.2 +++ .cvsignore 13 Jul 2008 19:48:00 -0000 1.3 @@ -1 +1 @@ -aliased-0.20.tar.gz +aliased-0.22.tar.gz Index: perl-aliased.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-aliased/EL-5/perl-aliased.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-aliased.spec 30 Mar 2007 15:58:40 -0000 1.3 +++ perl-aliased.spec 13 Jul 2008 19:48:00 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-aliased -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Use shorter versions of class names -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/aliased/ Source0: http://www.cpan.org/authors/id/O/OV/OVID/aliased-%{version}.tar.gz @@ -47,6 +47,12 @@ %{_mandir}/man3/* %changelog +* Wed May 28 2008 Chris Weyl 0.22-1 +- update to 0.22 + +* Wed Mar 5 2008 Tom "spot" Callaway 0.21-2 +- rebuild for new perl + * Fri Mar 30 2007 Chris Weyl 0.21-1 - update to 0.21 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-aliased/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Mar 2007 15:58:40 -0000 1.3 +++ sources 13 Jul 2008 19:48:00 -0000 1.4 @@ -1 +1 @@ -41e8947ff9b885cfcf210c6bcc715b4f aliased-0.21.tar.gz +06cace025aa108fe4a9af3ae26bb297e aliased-0.22.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 19:49:05 2008 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Sun, 13 Jul 2008 19:49:05 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.60,1.61 Message-ID: <200807131949.m6DJn5vN024028@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23814 Modified Files: ktorrent.spec Log Message: Small change Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ktorrent.spec 13 Jul 2008 18:40:40 -0000 1.60 +++ ktorrent.spec 13 Jul 2008 19:48:02 -0000 1.61 @@ -48,7 +48,7 @@ %install %{__rm} -rf %{buildroot} -mkdir %{buildroot} +mkdir p %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} # validate desktop file From fedora-extras-commits at redhat.com Sun Jul 13 19:50:22 2008 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Sun, 13 Jul 2008 19:50:22 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.61,1.62 Message-ID: <200807131950.m6DJoMZ2024239@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24101 Modified Files: ktorrent.spec Log Message: Small change Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ktorrent.spec 13 Jul 2008 19:48:02 -0000 1.61 +++ ktorrent.spec 13 Jul 2008 19:49:35 -0000 1.62 @@ -1,6 +1,6 @@ Name: ktorrent Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPLv2+ From fedora-extras-commits at redhat.com Sun Jul 13 19:51:17 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 19:51:17 GMT Subject: rpms/perl-DateTime-Format-Builder/EL-5 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-DateTime-Format-Builder.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200807131951.m6DJpHjJ024398@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-DateTime-Format-Builder/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24228/EL-5 Modified Files: .cvsignore perl-DateTime-Format-Builder.spec sources Added Files: import.log Log Message: merge from devel --- NEW FILE import.log --- perl-DateTime-Format-Builder-0_7901-2_fc10:EL-5:perl-DateTime-Format-Builder-0.7901-2.fc10.src.rpm:1215978625 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Builder/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Aug 2006 21:49:11 -0000 1.2 +++ .cvsignore 13 Jul 2008 19:50:15 -0000 1.3 @@ -1 +1 @@ -DateTime-Format-Builder-0.7807.tar.gz +DateTime-Format-Builder-0.7901.tar.gz Index: perl-DateTime-Format-Builder.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Builder/EL-5/perl-DateTime-Format-Builder.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DateTime-Format-Builder.spec 1 Sep 2006 04:00:30 -0000 1.3 +++ perl-DateTime-Format-Builder.spec 13 Jul 2008 19:50:15 -0000 1.4 @@ -11,12 +11,12 @@ Name: perl-DateTime-Format-Builder -Version: 0.7807 -Release: 4%{?dist} +Version: 0.7901 +Release: 2%{?dist} Summary: Create DateTime parser classes and objects Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/DateTime-Format-Builder Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,19 +25,27 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) ## core -BuildRequires: perl BuildRequires: perl(Test::More) ## non-core -BuildRequires: perl(Module::Build), perl(Class::Factory::Util) -BuildRequires: perl(DateTime::Format::Strptime), perl(Test::Pod) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Class::Factory::Util) +BuildRequires: perl(DateTime) +BuildRequires: perl(DateTime::Format::Strptime) BuildRequires: perl(Params::Validate) >= 0.73 +# note -- listed as a BR but _not_ needed with Fedora perl +#BuildRequires: perl(Task::Weaken) +BuildRequires: perl(Test::Pod) ## For extended testing -BuildRequires: perl(DateTime::Format::HTTP), perl(DateTime::Format::Mail) +BuildRequires: perl(DateTime::Format::HTTP) +BuildRequires: perl(DateTime::Format::Mail) BuildRequires: perl(DateTime::Format::IBeat) # for signature checking %{?_with_network_tests:BuildRequires: perl(Module::Signature) } +# not explicitly picked up +Requires: perl(DateTime::Format::Strptime) + %description DateTime::Format::Builder creates DateTime parsers. Many string formats of dates and times are simple and just require a basic regular expression to @@ -53,6 +61,16 @@ %prep %setup -q -n DateTime-Format-Builder-%{version} +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ + sed -e '/perl(DateTime::Format::HTTP)/d;/perl(DateTime::Format::IBeat)/d' \ + -e '/perl(DateTime::Format::Mail)/d' +EOF + +%define __perl_requires %{_builddir}/DateTime-Format-Builder-%{version}/%{name}-req +chmod +x %{__perl_requires} + # digital signature checking. Not essential, but nice %{?_with_network_tests: cpansign -v } @@ -70,10 +88,12 @@ %install rm -rf %{buildroot} + make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* + +%{_fixperms} %{buildroot}/* %check @@ -88,13 +108,21 @@ %files %defattr(-,root,root,-) -%doc COPYING Artistic Changes AUTHORS CREDITS LICENSE README +%doc COPYING Artistic Changes AUTHORS CREDITS LICENSE README examples/ t/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog -* Thu Aug 31 2006 Chris Weyl 0.7807-4 +* Tue Mar 4 2008 Tom "spot" Callaway 0.7901-2 +- rebuild for new perl + +* Sat Jan 26 2008 Chris Weyl 0.7901-1 +- update to 0.7901 +- additional docs +- some spec rework + +* Thu Aug 31 2006 Chris Weyl 0.7807-4 - bump for mass rebuild * Tue Aug 08 2006 Chris Weyl 0.7807-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Builder/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Aug 2006 21:49:11 -0000 1.2 +++ sources 13 Jul 2008 19:50:15 -0000 1.3 @@ -1 +1 @@ -4f6ee670cab944db0492e70ca8df3be3 DateTime-Format-Builder-0.7807.tar.gz +43407285237cdc3cdd2c08b936229198 DateTime-Format-Builder-0.7901.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 19:55:39 2008 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Sun, 13 Jul 2008 19:55:39 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.62,1.63 Message-ID: <200807131955.m6DJtdWh025540@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25397 Modified Files: ktorrent.spec Log Message: Another small change. Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- ktorrent.spec 13 Jul 2008 19:49:35 -0000 1.62 +++ ktorrent.spec 13 Jul 2008 19:54:53 -0000 1.63 @@ -1,6 +1,6 @@ Name: ktorrent Version: 3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPLv2+ @@ -48,7 +48,7 @@ %install %{__rm} -rf %{buildroot} -mkdir p %{buildroot} +mkdir -p %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} # validate desktop file From fedora-extras-commits at redhat.com Sun Jul 13 19:59:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:59:50 +0000 Subject: [pkgdb] clamav had acl change status Message-ID: <200807131959.m6DJxoT5010519@bastion.fedora.phx.redhat.com> Enrico Scholz (ensc) has set the watchcommits acl on clamav (Fedora 9) to Approved for Robert Scheck (robert) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clamav From fedora-extras-commits at redhat.com Sun Jul 13 19:59:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 19:59:50 +0000 Subject: [pkgdb] clamav had acl change status Message-ID: <200807131959.m6DJxppi010522@bastion.fedora.phx.redhat.com> Enrico Scholz (ensc) has set the watchbugzilla acl on clamav (Fedora 9) to Approved for Robert Scheck (robert) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clamav From fedora-extras-commits at redhat.com Sun Jul 13 20:00:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 20:00:08 +0000 Subject: [pkgdb] clamav had acl change status Message-ID: <200807132000.m6DJxoTB010519@bastion.fedora.phx.redhat.com> Enrico Scholz (ensc) has set the watchcommits acl on clamav (Fedora devel) to Approved for Robert Scheck (robert) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clamav From fedora-extras-commits at redhat.com Sun Jul 13 20:00:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 20:00:06 +0000 Subject: [pkgdb] clamav had acl change status Message-ID: <200807132000.m6DJxoT8010519@bastion.fedora.phx.redhat.com> Enrico Scholz (ensc) has set the watchbugzilla acl on clamav (Fedora devel) to Approved for Robert Scheck (robert) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clamav From fedora-extras-commits at redhat.com Sun Jul 13 20:00:43 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 20:00:43 GMT Subject: rpms/perl-Class-C3/EL-5 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Class-C3.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807132000.m6DK0hfB026419@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Class-C3/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26254/EL-5 Modified Files: .cvsignore perl-Class-C3.spec sources Added Files: import.log Log Message: merge from devel to satisfy BRs of perl-MRO-Compat --- NEW FILE import.log --- perl-Class-C3-0_19-2_fc10:EL-5:perl-Class-C3-0.19-2.fc10.src.rpm:1215979191 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-C3/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Sep 2006 19:26:23 -0000 1.3 +++ .cvsignore 13 Jul 2008 19:59:50 -0000 1.4 @@ -1 +1 @@ -Class-C3-0.14.tar.gz +Class-C3-0.19.tar.gz Index: perl-Class-C3.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-C3/EL-5/perl-Class-C3.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-C3.spec 25 Sep 2006 19:26:23 -0000 1.4 +++ perl-Class-C3.spec 13 Jul 2008 19:59:50 -0000 1.5 @@ -1,29 +1,34 @@ Name: perl-Class-C3 -Version: 0.14 -Release: 1%{?dist} +Version: 0.19 +Release: 2%{?dist} Summary: Pragma to use the C3 method resolution order algorithm -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-C3/ Source0: http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # see rh#205081,rh#204800 %define __perl_provides %{nil} Provides: perl(Class::C3) = %{version} -BuildRequires: perl(Algorithm::C3) >= 0.05 +# core +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) +# cpan +BuildRequires: perl(Algorithm::C3) >= 0.06 +BuildRequires: perl(Class::C3::XS) >= 0.07 BuildRequires: perl(Test::Exception) >= 0.15 # testing... BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) BuildRequires: perl(Sub::Name) -# auto-requires from cpanspec -#Requires: perl(Algorithm::C3) >= 0.05 -#Requires: perl(Test::Exception) >= 0.15 - -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# missed! +Requires: perl(Algorithm::C3) >= 0.06 +# strictly speaking, this is optional. However, speed is always nice :) +Requires: perl(Class::C3::XS) >= 0.07 %description This is a pragma to change Perl 5's standard method resolution order from @@ -33,6 +38,16 @@ %prep %setup -q -n Class-C3-%{version} +# Filter unwanted Requires: +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ + sed -e '/perl(c3)/d; /perl(base)/d' +EOF + +%define __perl_requires %{_builddir}/Class-C3-%{version}/%{name}-req +chmod +x %{__perl_requires} + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -54,11 +69,24 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README opt/ util/ +%doc ChangeLog README opt/ util/ t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.19-2 +- rebuild for new perl + +* Wed Oct 10 2007 Chris Weyl 0.19-1 +- update to 0.19 + +* Fri Jun 01 2007 Chris Weyl 0.18-1 +- update to 0.18 + +* Wed May 09 2007 Chris Weyl 0.17-1 +- update to 0.17 +- BR Class::C3::XS + * Mon Sep 25 2006 Chris Weyl 0.14-1 - update to 0.14 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-C3/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Sep 2006 19:26:23 -0000 1.3 +++ sources 13 Jul 2008 19:59:50 -0000 1.4 @@ -1 +1 @@ -72da38cad9fb3390f3bb7d898e44a437 Class-C3-0.14.tar.gz +bb3779da9c9786043ba2e0d9357b5078 Class-C3-0.19.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 20:05:02 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 20:05:02 GMT Subject: rpms/perl-Class-MOP/EL-5 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Class-MOP.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200807132005.m6DK52YC001085@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Class-MOP/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv932/EL-5 Modified Files: .cvsignore perl-Class-MOP.spec sources Added Files: import.log Log Message: merge from devel to satisfy BRs of perl-Moose --- NEW FILE import.log --- perl-Class-MOP-0_62-1_fc10:EL-5:perl-Class-MOP-0.62-1.fc10.src.rpm:1215979396 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MOP/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Oct 2006 04:13:57 -0000 1.3 +++ .cvsignore 13 Jul 2008 20:04:12 -0000 1.4 @@ -1 +1 @@ -Class-MOP-0.35.tar.gz +Class-MOP-0.62.tar.gz Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MOP/EL-5/perl-Class-MOP.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-MOP.spec 22 Mar 2007 19:44:23 -0000 1.5 +++ perl-Class-MOP.spec 13 Jul 2008 20:04:12 -0000 1.6 @@ -1,22 +1,31 @@ Name: perl-Class-MOP -Version: 0.37 +Version: 0.62 Release: 1%{?dist} Summary: Metaobject programming model for Perl -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-MOP/ -Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/Class-MOP-%{version}.tar.gz +Source0: http://www.cpan.org/modules/by-module/Class/Class-MOP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# core +BuildRequires: perl(Test::More) +# cpan BuildRequires: perl(Module::Build) -BuildRequires: perl(Sub::Name) >= 0.02 -# testing... +BuildRequires: perl(MRO::Compat) >= 0.05 +BuildRequires: perl(Sub::Identify) >= 0.03 +BuildRequires: perl(Sub::Name) >= 0.02 +# test +BuildRequires: perl(Algorithm::C3) +BuildRequires: perl(Class::C3) +BuildRequires: perl(SUPER) BuildRequires: perl(Test::Exception) >= 0.21 -BuildRequires: perl(Algorithm::C3), perl(Class::C3), perl(SUPER) -BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# not automatically picked up +Requires: perl(Sub::Identify) >= 0.03 %description This module is an attempt to create a meta object protocol for the Perl 5 @@ -32,31 +41,92 @@ %prep %setup -q -n Class-MOP-%{version} +# make sure doc/tests don't generate provides +cat << \EOF > %{name}-prov +#!/bin/sh +FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} $FOO +EOF + +%define __perl_provides %{_builddir}/Class-MOP-%{version}/%{name}-prov +chmod +x %{__perl_provides} + %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf %{buildroot} -./Build install destdir=%{buildroot} create_packlist=0 -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; +make pure_install PERL_INSTALL_ROOT=%{buildroot} + +find %{buildroot} -type f -name .packlist -exec rm -f {} + +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} + +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check -./Build test +make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc Changes README examples/ scripts/ -%{perl_vendorlib}/* +%doc Changes README examples/ scripts/ t/ +%{perl_vendorarch}/auto/* +%{perl_vendorarch}/Class +%{perl_vendorarch}/metaclass.pm %{_mandir}/man3/* %changelog +* Wed Jun 25 2008 Chris Weyl 0.62-1 +- update to 0.62 +- tweak provides filtering + +* Tue Jun 17 2008 Chris Weyl 0.61-1 +- update to 0.61 + +* Wed May 28 2008 Chris Weyl 0.57-1 +- update to 0.57 + +* Wed May 21 2008 Chris Weyl 0.55-2 +- bump for tagging snafu... + +* Wed May 21 2008 Chris Weyl 0.55-1 +- update to 0.55 + +* Wed Mar 5 2008 Tom "spot" Callaway - 0.49-3 +- rebuild for new perl + +* Mon Feb 18 2008 Fedora Release Engineering - 0.49-2 +- Autorebuild for GCC 4.3 + +* Sat Dec 15 2007 Chris Weyl 0.49-1 +- update to 0.49 +- note that we're now arch-specific, as there's XS-speedup goodness! +- note also that 0.49 BREAKS Moose < 0.33! + +* Wed Dec 12 2007 Chris Weyl 0.48-1 +- update to 0.48 + +* Sun Nov 25 2007 Chris Weyl 0.47-1 +- update to 0.47 + +* Sat Nov 17 2007 Chris Weyl 0.45-1 +- update to 0.45 +- adapt to Module::Install style + +* Sat Aug 11 2007 Chris Weyl 0.42-1 +- update to 0.42 +- license tag: GPL -> GPL+ + +* Thu May 31 2007 Chris Weyl 0.38-1 +- update to 0.38 +- add t/ to doc +- minor spec rework to deal with the once and future perl split + * Thu Mar 22 2007 Chris Weyl 0.37-1 - update to 0.37 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MOP/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2007 19:44:23 -0000 1.5 +++ sources 13 Jul 2008 20:04:12 -0000 1.6 @@ -1 +1 @@ -eaccf3a3b961265a9524c373a51afcc7 Class-MOP-0.37.tar.gz +2fa7d9ceb87209c7aa2335a393be7b8e Class-MOP-0.62.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 20:10:00 2008 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Sun, 13 Jul 2008 20:10:00 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.63,1.64 Message-ID: <200807132010.m6DKA0Dn001672@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1609 Modified Files: ktorrent.spec Log Message: Spec file updates. Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- ktorrent.spec 13 Jul 2008 19:54:53 -0000 1.63 +++ ktorrent.spec 13 Jul 2008 20:09:13 -0000 1.64 @@ -1,6 +1,6 @@ Name: ktorrent Version: 3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPLv2+ @@ -83,40 +83,19 @@ %{_kde4_libdir}/kde4/ktstatsplugin.so %{_kde4_libdir}/kde4/ktupnpplugin.so %{_kde4_libdir}/kde4/ktwebinterfaceplugin.so -%{_kde4_libdir}/libbtcore.so.3 -%{_kde4_libdir}/libbtcore.so.3.3.0 -%{_kde4_libdir}/libktcore.so.3 -%{_kde4_libdir}/libktcore.so.3.3.0 -%{_kde4_libdir}/libktupnp.so.1 -%{_kde4_libdir}/libktupnp.so.1.0.0 +%{_kde4_libdir}/libbtcore.so.6 +%{_kde4_libdir}/libbtcore.so.6.1.0 +%{_kde4_libdir}/libktcore.so.6 +%{_kde4_libdir}/libktcore.so.6.1.0 +%{_kde4_libdir}/libktupnp.so.3 +%{_kde4_libdir}/libktupnp.so.3.1.0 +%{_kde4_datadir}/icons/hicolor/*/actions/*png %{_kde4_datadir}/applications/kde4/ktorrent.desktop -%{_kde4_datadir}/icons/hicolor/128x128/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/128x128/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/16x16/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/16x16/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktencrypted.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktremove.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstart.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstart_all.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstop.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstop_all.png -%{_kde4_datadir}/icons/hicolor/22x22/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/22x22/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/32x32/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/32x32/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/48x48/actions/ktplugins.png -%{_kde4_datadir}/icons/hicolor/48x48/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/48x48/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/64x64/actions/ktinfowidget.png -%{_kde4_datadir}/icons/hicolor/64x64/actions/ktqueuemanager.png -%{_kde4_datadir}/icons/hicolor/64x64/actions/ktupnp.png -%{_kde4_datadir}/icons/hicolor/64x64/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/64x64/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/64x64/places/ktprefdownloads.png %{_kde4_datadir}/kde4/apps/ktorrent %{_kde4_datadir}/kde4/services/ktbwschedulerplugin.desktop %{_kde4_datadir}/kde4/services/ktinfowidgetplugin.desktop %{_kde4_datadir}/kde4/services/ktipfilterplugin.desktop +%{_kde4_datadir}/kde4/services/ktmediaplayerplugin.desktop %{_kde4_datadir}/kde4/services/ktlogviewerplugin.desktop %{_kde4_datadir}/kde4/services/ktscanfolderplugin.desktop %{_kde4_datadir}/kde4/services/ktsearchplugin.desktop @@ -125,6 +104,7 @@ %{_kde4_datadir}/kde4/services/ktwebinterfaceplugin.desktop %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop + %files devel %defattr(-,root,root,-) %{_kde4_includedir}/libbtcore/ From fedora-extras-commits at redhat.com Sun Jul 13 20:12:09 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 20:12:09 GMT Subject: rpms/perl-Sub-Identify/EL-5 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-Sub-Identify.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807132012.m6DKC97F001884@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Sub-Identify/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1796/EL-5 Modified Files: .cvsignore perl-Sub-Identify.spec sources Added Files: import.log Log Message: merge from devel for newer perl-Class-MOP --- NEW FILE import.log --- perl-Sub-Identify-0_03-1_fc10:EL-5:perl-Sub-Identify-0.03-1.fc10.src.rpm:1215979879 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sub-Identify/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Sep 2006 14:45:06 -0000 1.2 +++ .cvsignore 13 Jul 2008 20:11:10 -0000 1.3 @@ -1 +1 @@ -Sub-Identify-0.02.tar.gz +Sub-Identify-0.03.tar.gz Index: perl-Sub-Identify.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sub-Identify/EL-5/perl-Sub-Identify.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Sub-Identify.spec 6 Sep 2006 14:46:21 -0000 1.2 +++ perl-Sub-Identify.spec 13 Jul 2008 20:11:10 -0000 1.3 @@ -1,13 +1,15 @@ Name: perl-Sub-Identify -Version: 0.02 -Release: 2%{?dist} +Version: 0.03 +Release: 1%{?dist} Summary: Retrieve names of code references -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sub-Identify/ Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Sub-Identify-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -17,6 +19,8 @@ %prep %setup -q -n Sub-Identify-%{version} +perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/* + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -39,11 +43,24 @@ %files %defattr(-,root,root,-) -%doc Changes +%doc Changes t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Wed May 28 2008 Chris Weyl 0.03-1 +- update to 0.03 + +* Tue Mar 04 2008 Tom "spot" Callaway 0.02-3 +- rebuild for new perl + +* Tue Oct 16 2007 Tom "spot" Callaway 0.02-2.2 +- add BR: perl(Test::More) + +* Tue Oct 16 2007 Tom "spot" Callaway 0.02-2.1 +- correct license tag +- add BR: perl(ExtUtils::MakeMaker) + * Wed Sep 06 2006 Chris Weyl 0.02-2 - bump Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sub-Identify/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Sep 2006 14:45:06 -0000 1.2 +++ sources 13 Jul 2008 20:11:10 -0000 1.3 @@ -1 +1 @@ -5efae626e447e064f804e712e5fb03f2 Sub-Identify-0.02.tar.gz +1489ae54818fa5bff610bb47ee77816f Sub-Identify-0.03.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 20:20:46 2008 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Sun, 13 Jul 2008 20:20:46 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.64,1.65 Message-ID: <200807132020.m6DKKkEh002699@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2641 Modified Files: ktorrent.spec Log Message: More changes in the spec file. May I succeed before .10? Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ktorrent.spec 13 Jul 2008 20:09:13 -0000 1.64 +++ ktorrent.spec 13 Jul 2008 20:19:50 -0000 1.65 @@ -1,6 +1,6 @@ Name: ktorrent Version: 3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPLv2+ @@ -78,6 +78,7 @@ %{_kde4_libdir}/kde4/ktinfowidgetplugin.so %{_kde4_libdir}/kde4/ktipfilterplugin.so %{_kde4_libdir}/kde4/ktlogviewerplugin.so +%{_kde4_libdir}/kde4/ktmediaplayerplugin.so %{_kde4_libdir}/kde4/ktscanfolderplugin.so %{_kde4_libdir}/kde4/ktsearchplugin.so %{_kde4_libdir}/kde4/ktstatsplugin.so @@ -86,10 +87,11 @@ %{_kde4_libdir}/libbtcore.so.6 %{_kde4_libdir}/libbtcore.so.6.1.0 %{_kde4_libdir}/libktcore.so.6 -%{_kde4_libdir}/libktcore.so.6.1.0 +%{_kde4_libdir}/libktcore.so.6.0.0 %{_kde4_libdir}/libktupnp.so.3 %{_kde4_libdir}/libktupnp.so.3.1.0 %{_kde4_datadir}/icons/hicolor/*/actions/*png +%{_kde4_datadir}/icons/hicolor/*/apps/ktorrent.png %{_kde4_datadir}/applications/kde4/ktorrent.desktop %{_kde4_datadir}/kde4/apps/ktorrent %{_kde4_datadir}/kde4/services/ktbwschedulerplugin.desktop From fedora-extras-commits at redhat.com Sun Jul 13 20:22:48 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 13 Jul 2008 20:22:48 GMT Subject: rpms/subcommander/devel subcommander-2.0.0b3-var.patch, 1.1, 1.2 subcommander.spec, 1.13, 1.14 Message-ID: <200807132022.m6DKMmE0002912@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/subcommander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2813 Modified Files: subcommander-2.0.0b3-var.patch subcommander.spec Log Message: some more fixes for svn-1.5 subcommander-2.0.0b3-var.patch: Index: subcommander-2.0.0b3-var.patch =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/subcommander-2.0.0b3-var.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- subcommander-2.0.0b3-var.patch 29 Jun 2008 18:14:01 -0000 1.1 +++ subcommander-2.0.0b3-var.patch 13 Jul 2008 20:22:01 -0000 1.2 @@ -1,56 +1,52 @@ ---- util/Stackframe.h (revision 2124) -+++ util/Stackframe.h (working copy) -@@ -19,6 +19,7 @@ - // sys - #include - -+#if 0 - enum VariableKind - { - vkNone, -@@ -53,8 +54,8 @@ - - typedef std::vector Parameters; - typedef std::vector Locals; -+#endif - -- - class Stackframe - { - public: -@@ -79,8 +80,8 @@ - long _lineNr; - long _lineDisp; - -- Parameters _params; -- Locals _locals; -+ //Parameters _params; -+ //Locals _locals; - }; - - typedef std::vector Stackframes; -Index: util/Stackframe.cpp -=================================================================== ---- util/Stackframe.cpp (revision 2124) -+++ util/Stackframe.cpp (working copy) -@@ -12,7 +12,7 @@ - - - -- -+#if 0 - Variable::Variable(VariableType type, sc::Size size) - : _type(type), _size(size) - { -@@ -48,10 +48,10 @@ - { - return *(int*)_value; - } -+#endif - - - -- - Stackframe::Stackframe() - { - _error = false; \ No newline at end of file +diff -up subcommander-2.0.0b3/util/Stackframe.cpp.var subcommander-2.0.0b3/util/Stackframe.cpp +--- subcommander-2.0.0b3/util/Stackframe.cpp.var 2008-07-13 20:10:13.000000000 +0200 ++++ subcommander-2.0.0b3/util/Stackframe.cpp 2008-07-13 20:10:13.000000000 +0200 +@@ -12,7 +12,7 @@ + + #include + +- ++#if 0 + Variable::Variable(VariableType type, sc::Size size) + : _type(type), _size(size) + { +@@ -48,7 +48,7 @@ Variable::operator int() const + { + return *(int*)_value; + } +- ++#endif + + + +diff -up subcommander-2.0.0b3/util/Stackframe.h.var subcommander-2.0.0b3/util/Stackframe.h +--- subcommander-2.0.0b3/util/Stackframe.h.var 2008-05-11 17:30:02.000000000 +0200 ++++ subcommander-2.0.0b3/util/Stackframe.h 2008-07-13 20:10:13.000000000 +0200 +@@ -19,6 +19,7 @@ + // sys + #include + ++#if 0 + enum VariableKind + { + vkNone, +@@ -53,7 +54,7 @@ public: + + typedef std::vector Parameters; + typedef std::vector Locals; +- ++#endif + + class Stackframe + { +@@ -79,8 +80,8 @@ public: + long _lineNr; + long _lineDisp; + +- Parameters _params; +- Locals _locals; ++ //Parameters _params; ++ //Locals _locals; + }; + + typedef std::vector Stackframes; Index: subcommander.spec =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- subcommander.spec 13 Jul 2008 17:56:31 -0000 1.13 +++ subcommander.spec 13 Jul 2008 20:22:01 -0000 1.14 @@ -2,7 +2,7 @@ Name: subcommander Version: 1.9.93 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Graphical UI for subversion Group: Development/Tools @@ -13,12 +13,15 @@ Source2: submerge.desktop Patch1: subcommander-2.0.0b3-gc43.patch Patch2: subcommander-2.0.0b3-var.patch +Patch3: subcommander-2.0.0b3-svn15.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: automake +BuildRequires: autoconf BuildRequires: subversion-devel >= 1.2.0 BuildRequires: qt-devel >= 4.3 buildRequires: desktop-file-utils -BuildRequires: apr-devel +BuildRequires: apr-devel, apr-util-devel BuildRequires: zlib-devel BuildRequires: boost-devel BuildRequires: neon-devel @@ -35,9 +38,13 @@ %prep %setup -q -n %{name}-%{subvers} %patch1 -p1 -%patch2 -p0 +%patch2 -p1 +%patch3 -p1 -b .svn15 %build +aclocal +automake --foreign +autoconf %configure -with-qt=%{_libdir}/qt4 make %{?_smp_mflags} @@ -73,6 +80,9 @@ %doc README CHANGES COPYING %changelog +* Sun Jul 13 2008 Jochen Schmitt 1.9.93-4 +- Some more fixes for svn-1.5 + * Sun Jul 13 2008 Jochen Schmitt 1.9.93-3 - Rebuild agains new libsvn_ra_dav (#455002) From fedora-extras-commits at redhat.com Sun Jul 13 20:23:27 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 13 Jul 2008 20:23:27 GMT Subject: rpms/abiword/F-8 abiword-2.6.0-boolean.patch, NONE, 1.1 abiword-2.6.0-windowshelppaths.patch, NONE, 1.1 abiword-2.6.4-desktop.patch, NONE, 1.1 abiword-extras-2.6.4-nohash.patch, NONE, 1.1 abiword-plugins-2.6.0-boolean.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 abiword.spec, 1.45, 1.46 sources, 1.16, 1.17 abiword-2.0.9-windowshelppaths.patch, 1.1, NONE abiword-2.4.4-desktop.patch, 1.1, NONE abiword-2.4.6-fontmanager.patch, 1.1, NONE abiword-2.4.6-toc-layout.patch, 1.1, NONE Message-ID: <200807132023.m6DKNRhI002992@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2868 Modified Files: .cvsignore abiword.spec sources Added Files: abiword-2.6.0-boolean.patch abiword-2.6.0-windowshelppaths.patch abiword-2.6.4-desktop.patch abiword-extras-2.6.4-nohash.patch abiword-plugins-2.6.0-boolean.patch Removed Files: abiword-2.0.9-windowshelppaths.patch abiword-2.4.4-desktop.patch abiword-2.4.6-fontmanager.patch abiword-2.4.6-toc-layout.patch Log Message: New upstream release abiword-2.6.0-boolean.patch: --- NEW FILE abiword-2.6.0-boolean.patch --- diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h --- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h 2008-03-18 23:16:20.000000000 +0100 +++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h 2008-03-25 17:14:23.000000000 +0100 @@ -23,6 +23,9 @@ #ifndef PD_STYLE_H #define PD_STYLE_H +#ifndef FALSE +#define FALSE 0 +#endif /* FALSE */ #include "ut_types.h" #include "pt_Types.h" #include "ut_xml.h" abiword-2.6.0-windowshelppaths.patch: --- NEW FILE abiword-2.6.0-windowshelppaths.patch --- diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/howto/howtoword.abw abiword-docs-2.6.0/ABW/fr-FR/howto/howtoword.abw --- abiword-docs-2.6.0.orig/ABW/fr-FR/howto/howtoword.abw 2008-03-18 23:19:26.000000000 +0100 +++ abiword-docs-2.6.0/ABW/fr-FR/howto/howtoword.abw 2008-03-25 16:17:20.000000000 +0100 @@ -23,7 +23,7 @@

Il est presque in??vitable qu'?? un certain moment, vous aurez le besoin d'exp??dier un document que vous avez cr???? avec AbiWord ?? une personne utilisant Microsoft Word ou ouvrir un document cr???? avec Microsoft Word avec AbiWord. Heureusement, il est facile de r??aliser ces transferts.

Visualiser un document AbiWord avec Microsoft Word

Jusqu'?? ce que Microsoft annonce le support des fichiers d'AbiWord, les documents cr????s avec AbiWord n??cessiteront d'??tre export??s dans un format que Word peut lire. L'enregistrement au format Rich Text Format permet de r??aliser facilement cette exportation.

-

+

Le format Rich Text est couramment utilis?? par les produits Microsoft Office et ils n'auront aucune difficult?? ?? importer les documents enregistr??s ainsi.

Visualiser les documents Word avec AbiWord

@@ -31,7 +31,7 @@

Si vous rencontrez des probl??mes, demandez ?? l'utilisateur de Word d'enregistrer le document au format Rich Text Format (.rtf). Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de mani??re fiable.

- + iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5 4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9 diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/interface/dialogreplace.abw abiword-docs-2.6.0/ABW/fr-FR/interface/dialogreplace.abw --- abiword-docs-2.6.0.orig/ABW/fr-FR/interface/dialogreplace.abw 2008-03-18 23:19:26.000000000 +0100 +++ abiword-docs-2.6.0/ABW/fr-FR/interface/dialogreplace.abw 2008-03-25 16:17:20.000000000 +0100 @@ -16,7 +16,7 @@

Dialogue remplacer

-

+

Rechercher

Entrez le mot que vous d??sirez rechercher dans cette bo??te. Il s'agit de la cha??ne de recherche. Cette commande recherche la cha??ne de caract??res ou de nombres que vous entrez. Ainsi, si vous recherchez en, vous trouverez les deux lettres au milieu du mot dent tout autant que le mot en.

Respecter la casse

@@ -33,7 +33,7 @@

Ce bouton ferme le dialogue Remplacer.

- + iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+ P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/interface/workspace.abw abiword-docs-2.6.0/ABW/fr-FR/interface/workspace.abw --- abiword-docs-2.6.0.orig/ABW/fr-FR/interface/workspace.abw 2008-03-18 23:19:25.000000000 +0100 +++ abiword-docs-2.6.0/ABW/fr-FR/interface/workspace.abw 2008-03-25 16:17:20.000000000 +0100 @@ -23,24 +23,24 @@

L'espace de travail d'AbiWord

AbiWord a une apparence tr??s similaire ?? d'autres traitements de texte, ce qui, nous l'esp??rons, met ?? l'aise toute personne qui d??bute avec le logiciel.

-

+

L'interface famili??re devrait permettre ?? la plupart des personnes de d??marrer le travail imm??diatement. Cependant, certaines caract??ristiques sont peut-??tre nouvelles.

Titre de fen??tre

-

+

La fen??tre de titre est similaire ?? cette de toute autre application, avec une diff??rence toutefois. Notez le caract??re * pr??s de Document10. L'ast??rique signifie que Document10 a ??t?? modifi??. Ceci fourni un mani??re simple d'identifier si le document doit ??tre enregistr??.

Les barres de fonction

-

Voici les trois plus importantes barres de fonctions. La premi??re, nomm??e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr??f??rable d'y d??buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.

+

Voici les trois plus importantes barres de fonctions. La premi??re, nomm??e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr??f??rable d'y d??buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.

La seconde est la barre d'outils standard et la troisi??me (au bas) est la barre d'outils de mise en forme.

Manipuler les barres

AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises v??rifiez le menu Affichage > Barres d'outils.

-

+

Barre de saisie

Pour ceux qui ex??cutent AbiWord sous GNOME, La barre de saisie localis??e ?? l'extr??mit?? gauche de chaque barre d'outils repr??sente une mani??res simple offerte ?? chacun de modifier l'interface ?? leur convenance. Cliquez la barre de saisie et d??placez-l??. La barre d'outils suivra la souris, permettant m??me ?? la barre d'outil de survoler une partie quelconque de l'??cran.

Barre d'??tat

La barre d'??tat permet une vue rapide de l'??tat du document. A la gauche, AbiWord note la page courante. La bo??te du milieu, qui est habituellement vide, affiche un message d'aide rapide d??crivant l'option de menu courante.

-

+

Les r??gles

En employant les r??gles, il devient facile de fixer les marges de la page et les tabulations.

@@ -49,7 +49,7 @@

- + iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur @@ -732,7 +732,7 @@ Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1 @@ -1135,7 +1135,7 @@ MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu QmCC - + iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB @@ -1496,7 +1496,7 @@ DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me 4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99 @@ -1550,7 +1550,7 @@ N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ diff -u -r abiword-docs-2.6.0.orig/ABW/pl-PL/howto/howtoword.abw abiword-docs-2.6.0/ABW/pl-PL/howto/howtoword.abw --- abiword-docs-2.6.0.orig/ABW/pl-PL/howto/howtoword.abw 2008-03-18 23:19:15.000000000 +0100 +++ abiword-docs-2.6.0/ABW/pl-PL/howto/howtoword.abw 2008-03-25 16:17:21.000000000 +0100 @@ -24,7 +24,7 @@

Podgl??d dokument??w AbiWorda w programie Microsoft Word

Jakkolwiek Microsoft zapowiada wsparcie dla plik??w AbiWorda, to przede wszystkim dokumenty tworzone w AbiWordzie powinny by?? eksportowane do formatu czytelnego dla programu Microsoft Word. Naj??atwiej to zrobi?? przez zapisanie pliku w postaci Rich Text Format.

-

+

Rich Text Format cz??sto jest u??ywany przez pakiet oprogramowania biurowego firmy Microsoft i nie b??dzie problem??w z importem dokument??w zapisanych w ten spos??b.

Podgl??d dokument??w Microsoft Word w AbiWordzie

@@ -32,7 +32,7 @@

Je??li napotykasz problemy, to popro?? u??ytkownika programu Microsoft Word, aby zapisywa?? dokumenty jako Rich Text Format (.rtf). Wszystkie wersje programu Microsoft Word mog?? zapisywa?? pliki w tym formacie, a AbiWord potrafi wiernie odczytywa?? pliki typu RTF.

- + iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp diff -u -r abiword-docs-2.6.0.orig/ABW/pl-PL/interface/workspace.abw abiword-docs-2.6.0/ABW/pl-PL/interface/workspace.abw --- abiword-docs-2.6.0.orig/ABW/pl-PL/interface/workspace.abw 2008-03-18 23:19:16.000000000 +0100 +++ abiword-docs-2.6.0/ABW/pl-PL/interface/workspace.abw 2008-03-25 16:17:21.000000000 +0100 @@ -25,24 +25,24 @@

Obszar roboczy AbiWorda

Obszar roboczy jest podobny do tych, jakie znamy z innych edytor??w tekstu. Dlatego ka??dy nowy u??ytkownik AbiWorda mo??e si?? czu?? jak u siebie w domu.

-

+

Znajomy interfejs pozwala wi??kszo??ci u??ytkownikom od razu rozpocz???? prac??. Tym niemniej niekt??re mo??liwo??ci b??d?? nowo??ci??.

Okno tytu??u

-

+

Okno tytu??u jest podobne do okien innych aplikacji, z jedn?? jednak r????nic??. Zw???? uwag?? na gwiazdk?? * obok ???Dokument_10???. Gwiazdka oznacza, ??e ???Dokument_10??? zosta?? zmodyfikowany. W ten prosty spos??b AbiWord podpowiada ci, ??e dokument powinien by?? zapisany.

Paski funkcji

-

+

Oto trzy podstawowe paski funkcji. Pierwszy, nazywany Paskiem Menu, to najlepsze miejsce, by zapozna?? si?? z AbiWordem. Najlepiej po prostu przejrzyj ka??de menu, wtedy poznasz wszystkie komendy, jakich AbiWord mo??e u??y?? do dokument??w.

Drugi to pasek ???Standardowy???, trzeci z wy??ej pokazanych (na dole) to pasek "Formatowanie".

Paski robocze

AbiWord pozwala na ukrywanie pask??w narz??dzi. Je??li kt??rego?? brakuje albo nie jest potrzebny, sprawd?? w Widok > Paski narz??dzi.

-

+

Pasek uchwytu

@@ -50,14 +50,14 @@

U??ytkownicy, kt??rzy uruchamiaj?? AbiWorda w ??rodowisku GNOME, znajd?? pasek uchwytu umieszczony na skraju lewej cz????ci ka??dego z pask??w narz??dziowych, kt??ry pozwala w prosty spos??b zmodyfikowa?? interfejs wedle ??yczenia. Kliknij na pasek uchwytu i przeci??gnij. Pasek narz??dziowy b??dzie przesuwa?? si?? wzd??u?? toru myszki, mo??e nawet wisie?? nad dowoln?? cz????ci?? ekranu.

Pasek statusu

-

+

W pasku statusu znajdziesz skr??towy opis statusu dokumentu. W lewej cz????ci paska AbiWord wy??wietla kolejny numer strony oraz liczb?? wszystkich stron. Nast??pnie w ??rodkowej cz????ci, kt??ra najcz????ciej jest pusta, wy??wietlany jest kr??tki pomocniczy opis bie????cej opcji menu. W prawej cz????ci paska podany jest tryb pracy klawiatury (+INS, czyli tryb wstawiania, albo -ins, czyli tryb zast??powania) oraz nazwa aktualnego szablonu.

-

+

Linijka

-

+

U??ywaj??c linijki mo??esz w ??atwy spos??b definiowa?? na stronie marginesy oraz tabulatory.

@@ -65,7 +65,7 @@

- + iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK @@ -1458,7 +1458,7 @@ Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at @@ -1824,7 +1824,7 @@ U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty @@ -2753,7 +2753,7 @@ rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA AElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc 0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L @@ -2837,7 +2837,7 @@ pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/ vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU @@ -3416,7 +3416,7 @@ bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV AAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA @@ -3486,7 +3486,7 @@ 5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8 ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3 abiword-2.6.4-desktop.patch: --- NEW FILE abiword-2.6.4-desktop.patch --- diff -u -r abiword-2.6.4.orig/abiword.desktop abiword-2.6.4/abiword.desktop --- abiword-2.6.4.orig/abiword.desktop 2008-07-13 15:11:02.000000000 +0200 +++ abiword-2.6.4/abiword.desktop 2008-07-13 21:17:13.000000000 +0200 @@ -7,7 +7,7 @@ StartupNotify=true Encoding=UTF-8 X-Desktop-File-Install-Version=0.9 -MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1; +MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect; Name=AbiWord GenericName=Word Processor Comment=Compose, edit, and view documents Only in abiword-2.6.4: abiword.desktop.orig abiword-extras-2.6.4-nohash.patch: --- NEW FILE abiword-extras-2.6.4-nohash.patch --- diff -u -r abiword-extras-2.6.4.orig/dictionary/Makefile.am abiword-extras-2.6.4/dictionary/Makefile.am --- abiword-extras-2.6.4.orig/dictionary/Makefile.am 2008-07-13 14:04:48.000000000 +0200 +++ abiword-extras-2.6.4/dictionary/Makefile.am 2008-07-13 21:23:26.000000000 +0200 @@ -4,9 +4,6 @@ dictionary_DATA = \ ca-ES-barbarism.xml \ en-AU-barbarism.xml \ - es-MX-barbarism.xml\ - ispell_dictionary_list.xml + es-MX-barbarism.xml -EXTRA_DIST = $(dictionary_DATA) \ - BigEndian32.american.hash \ - LittleEndian32.american.hash +EXTRA_DIST = $(dictionary_DATA) abiword-plugins-2.6.0-boolean.patch: --- NEW FILE abiword-plugins-2.6.0-boolean.patch --- diff -u -r abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h --- abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-18 23:18:02.000000000 +0100 +++ abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-25 17:16:04.000000000 +0100 @@ -20,6 +20,9 @@ #ifndef __LinkGrammarWrap_h__ #define __LinkGrammarWrap_h__ +#ifndef TRUE +#define TRUE 1 +#endif /* TRUE */ extern "C" { #include } diff -u -r abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h --- abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-18 23:18:20.000000000 +0100 +++ abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-25 17:16:04.000000000 +0100 @@ -23,6 +23,9 @@ #ifndef _ODI_STYLE_STYLE_H_ #define _ODI_STYLE_STYLE_H_ +#ifndef TRUE +#define TRUE 1 +#endif /* TRUE */ // Internal includes #include "ODi_ListenerState.h" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-8/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 5 Nov 2006 19:09:55 -0000 1.16 +++ .cvsignore 13 Jul 2008 20:22:38 -0000 1.17 @@ -1 +1,4 @@ -abiword-2.4.6.tar.bz2 +abiword-2.6.4.tar.gz +abiword-docs-2.6.4.tar.gz +abiword-extras-2.6.4.tar.gz +abiword-plugins-2.6.4.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-8/abiword.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- abiword.spec 4 Sep 2007 16:17:46 -0000 1.45 +++ abiword.spec 13 Jul 2008 20:22:38 -0000 1.46 @@ -1,23 +1,26 @@ -%define desktop_file_utils_version 0.9 +%define majorversion 2 +%define minorversion 6 +%define microversion 4 Summary: The AbiWord word processor Name: abiword -Version: 2.4.6 -Release: 6%{?dist} +Version: 2.6.4 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors -License: GPL -Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 +License: GPLv2+ +Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz +Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz +Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz +Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz Source11: abiword.mime Requires: mathml-fonts Requires: link-grammar >= 4.2.2 -PreReq: desktop-file-utils >= %{desktop_file_utils_version} BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libstdc++, /usr/bin/g++ -BuildRequires: aspell-devel libpng-devel -BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} -BuildRequires: fribidi-devel, enchant-devel +BuildRequires: libpng-devel +BuildRequires: desktop-file-utils +BuildRequires: fribidi-devel, enchant-devel, wv-devel BuildRequires: libgnomeprintui22-devel BuildRequires: autoconf, libtool @@ -29,43 +32,53 @@ BuildRequires: libwpd-devel >= 0.8.0 BuildRequires: librsvg2-devel BuildRequires: libwmf-devel -BuildRequires: aiksaurus-gtk-devel >= 1.2.1 +BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel BuildRequires: link-grammar-devel >= 4.2.2 -BuildRequires: gtkmathview-devel >= 0.7.5 -BuildRequires: goffice-devel >= 0.1.0 +BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison +BuildRequires: goffice04-devel # gnome build deps BuildRequires: libgnomeui-devel URL: http://www.abisource.com/ -Patch0: abiword-2.0.9-windowshelppaths.patch -Patch1: abiword-2.4.4-desktop.patch -Patch2: abiword-2.4.6-fontmanager.patch -Patch3: abiword-2.4.6-toc-layout.patch +Patch0: abiword-2.6.0-windowshelppaths.patch +Patch2: abiword-2.6.0-boolean.patch +Patch1: abiword-2.6.4-desktop.patch +Patch3: abiword-plugins-2.6.0-boolean.patch +Patch4: abiword-extras-2.6.4-nohash.patch %description -AbiWord is a cross-platform Open Source word processor. The goal is to make -AbiWord full-featured, and remain lean. +AbiWord is a cross-platform Open Source word processor. It is full-featured, +while still remaining lean. %prep -%setup -q -%patch0 -p1 -b .windowshelppaths +# setup abiword +%setup -q %patch1 -p1 -b .desktop -%patch2 -p1 -b .fontmanager -%patch3 -p1 -b .toc-layout +%patch2 -p1 -b .boolean + +# setup abiword-plugins +%setup -q -T -b 1 -n abiword-plugins-%{version} +%patch3 -p1 -b .boolean + +# setup abiword extras +%setup -q -T -b 2 -n abiword-extras-%{version} +%patch4 -p1 -b .nohash + +# setup abiword documentation +%setup -q -T -b 3 -n abiword-docs-%{version} +%patch0 -p1 -b .windowshelppaths + %build -cd abi -autoconf -%configure --enable-gnome --with-libxml2 -cd ../wv -%configure --with-libwmf --with-libxml2 -cd ../abi -make -cd ../abiword-plugins -libtoolize --copy --force -./nextgen.sh -%configure --disable-abicollab --disable-gda --disable-pdf --with-abiword=../abi +# build abiword +cd $RPM_BUILD_DIR/abiword-%{version} +%configure +make %{?_smp_mflags} + +# build abiword-plugins +cd $RPM_BUILD_DIR/abiword-plugins-%{version} +%configure --disable-gda --disable-abicollab --with-abiword=../abiword-%{version} # Remove libtool predep_objects and postdep_objects wonkiness so that # building without -nostdlib doesn't include them twice. Because we # already link with g++, weird stuff happens if you don't let the @@ -73,29 +86,50 @@ sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool +make %{?_smp_mflags} + +# build the extras +cd $RPM_BUILD_DIR/abiword-extras-%{version} +# abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info +# however, that file is not installed yet, so just point to it in the abiword source tree +export PKG_CONFIG_PATH="../%{name}-%{version}" +# we need to re-autogen, as we have changed the destdir configuration +./autogen.sh make -# now make the docs -cd ../abiword-docs -ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.4 ./make-html.sh +# build the documentation +cd $RPM_BUILD_DIR/abiword-docs-%{version} +ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/wp/main/unix/abiword ./make-html.sh %install -cd abi -%makeinstall -cd ../abiword-plugins -%makeinstall DESTDIR=$RPM_BUILD_ROOT - -# install the docs -cd ../abiword-docs -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help -cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help/ +rm -rf $RPM_BUILD_ROOT + +# install abiword +cd $RPM_BUILD_DIR/abiword-%{version} +make install DESTDIR=$RPM_BUILD_ROOT +# Fix script permission +chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}-%{majorversion}.%{minorversion}/scripts/abw2html.pl + +# install abiword-plugins +cd $RPM_BUILD_DIR/abiword-plugins-%{version} +make install DESTDIR=$RPM_BUILD_ROOT + +# install the extras +cd $RPM_BUILD_DIR/abiword-extras-%{version} +make install DESTDIR=$RPM_BUILD_ROOT + +# install the documentation +cd $RPM_BUILD_DIR/abiword-docs-%{version} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help +cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ # some of the help dirs have bad perms (#109261) -find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help/ -type d -exec chmod -c o+rx {} \; +find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ -type d -exec chmod -c o+rx {} \; +# finish up mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.4/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png +cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png -cd ../abi +cd $RPM_BUILD_DIR/abiword-%{version} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora --add-category X-Fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -108,9 +142,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info -rm -f $RPM_BUILD_ROOT%{_bindir}/ttf* # nuke .la files -rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.4/plugins/*.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -123,17 +156,21 @@ %files %defattr(-,root,root) -%doc abi/docs -%{_bindir}/AbiWord-2.4 +%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT %{_bindir}/abiword -%{_libdir}/AbiWord-2.4 -%{_datadir}/AbiSuite-2.4 +%{_libdir}/%{name}-%{majorversion}.%{minorversion} +%{_datadir}/%{name}-%{majorversion}.%{minorversion} %{_datadir}/applications/* %{_datadir}/mime-info/* %{_datadir}/pixmaps/*png %{_datadir}/icons/*png +%ghost %{_includedir}/%{name}-%{majorversion}.%{minorversion} +%ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Sun Jul 13 2008 Marc Maurer 1:2.6.4-1 +- New upstream release + * Tue Sep 04 2007 Lubomir Kundrak - 1:2.4.6-6.fc7 - Fix 248103 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 5 Nov 2006 19:09:55 -0000 1.16 +++ sources 13 Jul 2008 20:22:38 -0000 1.17 @@ -1 +1,4 @@ -8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2 +16748b2d6e318e0e2a25581005e1943a abiword-2.6.4.tar.gz +9f8c0cd81d8889cc90550049f40a484a abiword-docs-2.6.4.tar.gz +d0893e611d37c3ba09b77fa720a3904d abiword-extras-2.6.4.tar.gz +3bf973c5a1446ef3eaf980724821d6e9 abiword-plugins-2.6.4.tar.gz --- abiword-2.0.9-windowshelppaths.patch DELETED --- --- abiword-2.4.4-desktop.patch DELETED --- --- abiword-2.4.6-fontmanager.patch DELETED --- --- abiword-2.4.6-toc-layout.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 20:25:41 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 13 Jul 2008 20:25:41 GMT Subject: rpms/andika-fonts/devel andika-fonts-fontconfig.conf, NONE, 1.1 andika-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807132025.m6DKPf63003319@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/andika-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3286/devel Modified Files: .cvsignore sources Added Files: andika-fonts-fontconfig.conf andika-fonts.spec import.log Log Message: Initial packaging --- NEW FILE andika-fonts-fontconfig.conf --- Andika sans-serif sans-serif Andika --- NEW FILE andika-fonts.spec --- %define fontname andika %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d # Someday SIL will release sanely named archives %define archivename AndikaBasicR_10 Name: %{fontname}-fonts Version: 1.0 Release: 1%{?dist} Summary: A font for literacy and beginning readers Group: User Interface/X License: OFL URL: http://scripts.sil.org/Andika # Actual download URL # http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=%{archivename}&filename=%{archivename}.zip Source0: %{archivename}.zip Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another. A sans serif font is preferred by some literacy personnel for teaching people to read. Its forms are simpler and less cluttered than those of most serif fonts. For years, literacy workers have had to make do with fonts that were not really suitable for beginning readers and writers. In some cases, literacy specialists have had to tediously assemble letters from a variety of fonts in order to get all of the characters they need for their particular language project, resulting in confusing and unattractive publications. Andika addresses those issues. %prep %setup -q -n %{archivename} # Text files sanitization for txt in *.txt ; do # Unicode compliant, check iconv -f WINDOWS-1252 -t UTF-8 -o $txt.1 $txt fold -s $txt.1 > $txt.2 sed -i 's/\r//' $txt.2 touch -r $txt $txt.2 mv $txt.2 $txt rm $txt.1 done %build # Source format not available %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.ttf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/60-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/60-%{fontname}.conf %dir %{fontdir} %{fontdir}/*.ttf %changelog * Tue Jun 24 2008 - 1.0-1 ??? Initial packaging --- NEW FILE import.log --- andika-fonts-1_0-1_fc10:HEAD:andika-fonts-1.0-1.fc10.src.rpm:1215980688 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/andika-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jul 2008 19:11:32 -0000 1.1 +++ .cvsignore 13 Jul 2008 20:24:58 -0000 1.2 @@ -0,0 +1 @@ +AndikaBasicR_10.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/andika-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jul 2008 19:11:32 -0000 1.1 +++ sources 13 Jul 2008 20:24:58 -0000 1.2 @@ -0,0 +1 @@ +1a8b028ccea53e93fc4f34ca226f2b02 AndikaBasicR_10.zip From fedora-extras-commits at redhat.com Sun Jul 13 20:30:19 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 13 Jul 2008 20:30:19 GMT Subject: rpms/perl-Net-CUPS/devel dest_test.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Net-CUPS.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200807132030.m6DKUJwo003563@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-CUPS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3508 Modified Files: .cvsignore perl-Net-CUPS.spec sources Added Files: dest_test.patch Log Message: * Sun Jul 13 2008 Chris Weyl 0.56-2 - and remove i18n.h from CUPS.xs. See bz#455190 - add zlib-devel as a BR. See bz#455192 - patch t/03_destination.t to not test add/remove functionality -- this is an admin action under Fedora, if memory serves dest_test.patch: --- NEW FILE dest_test.patch --- --- t/03_destination.t.orig 2008-07-13 12:57:24.069082279 -0700 +++ t/03_destination.t 2008-07-13 13:01:22.587086420 -0700 @@ -31,25 +31,31 @@ ok ($ppd_file); -my $name = "yatp"; -my $location = "nowhere"; -my $printer_info = "blahblah"; -my $device_uri = 'socket://192.168.1.3:9100'; +# SKIP these unless we're running with admin privs and REALLY want to :) +SKIP: { + skip "Not testing destination add/remove", 4 + unless exists $ENV{NET_CUPS_TEST_ADDDEL_DEST}; -$cups->addDestination($name, $location, $printer_info, $ppd_file, $device_uri); + my $name = "yatp"; + my $location = "nowhere"; + my $printer_info = "blahblah"; + my $device_uri = 'socket://192.168.1.3:9100'; -my $dest = $cups->getDestination( $name ); + $cups->addDestination($name, $location, $printer_info, $ppd_file, $device_uri); -ok ($dest); + my $dest = $cups->getDestination( $name ); -my $description = $dest->getDescription(); + ok ($dest); -ok( $description eq $printer_info ); + my $description = $dest->getDescription(); -my $uri = $dest->getUri(); + ok( $description eq $printer_info ); -ok( $uri eq $device_uri ); + my $uri = $dest->getUri(); -$cups->deleteDestination($name); + ok( $uri eq $device_uri ); -ok (! $cups->getDestination($name)); + $cups->deleteDestination($name); + + ok (! $cups->getDestination($name)); +} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Dec 2007 19:49:13 -0000 1.3 +++ .cvsignore 13 Jul 2008 20:29:26 -0000 1.4 @@ -1 +1 @@ -Net-CUPS-0.55.tar.gz +Net-CUPS-0.56.tar.gz Index: perl-Net-CUPS.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Net-CUPS.spec 7 Mar 2008 02:11:02 -0000 1.7 +++ perl-Net-CUPS.spec 13 Jul 2008 20:29:26 -0000 1.8 @@ -1,16 +1,26 @@ Name: perl-Net-CUPS -Version: 0.55 -Release: 4%{?dist} +Version: 0.56 +Release: 2%{?dist} Summary: Perl bindings to the CUPS C API Interface License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CUPS/ Source0: http://www.cpan.org/authors/id/D/DH/DHAGEMAN/Net-CUPS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +# non-perl +BuildRequires: cups-devel +# see BZ#455192 +BuildRequires: zlib-devel + +# perl BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) -BuildRequires: cups-devel -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + + +# keep from running tests which require admin privs under the Fedora setup +Patch0: dest_test.patch %description Net::CUPS is an interface to the Common Unix Printing System API. If you feel @@ -18,9 +28,17 @@ %prep %setup -q -n Net-CUPS-%{version} +%patch0 find . -type f -exec chmod -c -x {} + +# until we get BZ#455190 resolved (one way or the other) +perl -pi -e 's|^#include |/*#include */|' CUPS.xs + +# grr. see the long languishing RT#35966 +# (http://rt.cpan.org/Public/Bug/Display.html?id=35966) +perl -pi -e 's|IPP_|Net::CUPS::IPP_|' lib/Net/CUPS/Destination.pm + %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} @@ -37,7 +55,9 @@ %{_fixperms} %{buildroot}/* %check +%{?!_with_network_tests: mv t/03_destination.t . } make test +%{?!_with_network_tests: mv 03_destination.t t/ } %clean rm -rf %{buildroot} @@ -51,6 +71,15 @@ %{_mandir}/man3/* %changelog +* Sun Jul 13 2008 Chris Weyl 0.56-2 +- and remove i18n.h from CUPS.xs. See bz#455190 +- add zlib-devel as a BR. See bz#455192 +- patch t/03_destination.t to not test add/remove functionality -- this is an + admin action under Fedora, if memory serves + +* Sun Jul 13 2008 Chris Weyl 0.56-1 +- update to 0.56 + * Thu Mar 06 2008 Tom "spot" Callaway - 0.55-4 Rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Dec 2007 19:49:14 -0000 1.3 +++ sources 13 Jul 2008 20:29:26 -0000 1.4 @@ -1 +1 @@ -e2667d6d9b63befac5d38d7f0d4aadda Net-CUPS-0.55.tar.gz +ae0d60ca4544d551177f923c3d29da5c Net-CUPS-0.56.tar.gz From fedora-extras-commits at redhat.com Sun Jul 13 20:40:40 2008 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Sun, 13 Jul 2008 20:40:40 GMT Subject: rpms/ktorrent/F-9 .cvsignore, 1.19, 1.20 ktorrent.spec, 1.58, 1.59 sources, 1.19, 1.20 Message-ID: <200807132040.m6DKeeS0004104@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4039 Modified Files: .cvsignore ktorrent.spec sources Log Message: New version 3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ktorrent/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 14 May 2008 18:57:01 -0000 1.19 +++ .cvsignore 13 Jul 2008 20:39:50 -0000 1.20 @@ -1 +1 @@ -ktorrent-3.0.2.tar.bz2 +ktorrent-3.1.tar.bz2 Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/F-9/ktorrent.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- ktorrent.spec 14 May 2008 19:46:26 -0000 1.58 +++ ktorrent.spec 13 Jul 2008 20:39:50 -0000 1.59 @@ -1,6 +1,6 @@ Name: ktorrent -Version: 3.0.2 -Release: 3%{?dist} +Version: 3.1 +Release: 5%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPLv2+ @@ -48,7 +48,7 @@ %install %{__rm} -rf %{buildroot} -mkdir %{buildroot} +mkdir -p %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} # validate desktop file @@ -78,45 +78,26 @@ %{_kde4_libdir}/kde4/ktinfowidgetplugin.so %{_kde4_libdir}/kde4/ktipfilterplugin.so %{_kde4_libdir}/kde4/ktlogviewerplugin.so +%{_kde4_libdir}/kde4/ktmediaplayerplugin.so %{_kde4_libdir}/kde4/ktscanfolderplugin.so %{_kde4_libdir}/kde4/ktsearchplugin.so %{_kde4_libdir}/kde4/ktstatsplugin.so %{_kde4_libdir}/kde4/ktupnpplugin.so %{_kde4_libdir}/kde4/ktwebinterfaceplugin.so -%{_kde4_libdir}/libbtcore.so.3 -%{_kde4_libdir}/libbtcore.so.3.2.0 -%{_kde4_libdir}/libktcore.so.3 -%{_kde4_libdir}/libktcore.so.3.2.0 -%{_kde4_libdir}/libktupnp.so.1 -%{_kde4_libdir}/libktupnp.so.1.0.0 +%{_kde4_libdir}/libbtcore.so.6 +%{_kde4_libdir}/libbtcore.so.6.1.0 +%{_kde4_libdir}/libktcore.so.6 +%{_kde4_libdir}/libktcore.so.6.0.0 +%{_kde4_libdir}/libktupnp.so.3 +%{_kde4_libdir}/libktupnp.so.3.1.0 +%{_kde4_datadir}/icons/hicolor/*/actions/*png +%{_kde4_datadir}/icons/hicolor/*/apps/ktorrent.png %{_kde4_datadir}/applications/kde4/ktorrent.desktop -%{_kde4_datadir}/icons/hicolor/128x128/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/128x128/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/16x16/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/16x16/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktencrypted.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktremove.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstart.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstart_all.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstop.png -%{_kde4_datadir}/icons/hicolor/22x22/actions/ktstop_all.png -%{_kde4_datadir}/icons/hicolor/22x22/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/22x22/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/32x32/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/32x32/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/48x48/actions/ktplugins.png -%{_kde4_datadir}/icons/hicolor/48x48/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/48x48/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/64x64/actions/ktinfowidget.png -%{_kde4_datadir}/icons/hicolor/64x64/actions/ktqueuemanager.png -%{_kde4_datadir}/icons/hicolor/64x64/actions/ktupnp.png -%{_kde4_datadir}/icons/hicolor/64x64/apps/ktorrent.png -%{_kde4_datadir}/icons/hicolor/64x64/mimetypes/torrent.png -%{_kde4_datadir}/icons/hicolor/64x64/places/ktprefdownloads.png %{_kde4_datadir}/kde4/apps/ktorrent %{_kde4_datadir}/kde4/services/ktbwschedulerplugin.desktop %{_kde4_datadir}/kde4/services/ktinfowidgetplugin.desktop %{_kde4_datadir}/kde4/services/ktipfilterplugin.desktop +%{_kde4_datadir}/kde4/services/ktmediaplayerplugin.desktop %{_kde4_datadir}/kde4/services/ktlogviewerplugin.desktop %{_kde4_datadir}/kde4/services/ktscanfolderplugin.desktop %{_kde4_datadir}/kde4/services/ktsearchplugin.desktop @@ -125,6 +106,7 @@ %{_kde4_datadir}/kde4/services/ktwebinterfaceplugin.desktop %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop + %files devel %defattr(-,root,root,-) %{_kde4_includedir}/libbtcore/ @@ -134,6 +116,9 @@ %{_kde4_datadir}/kde4/apps/cmake/modules/FindBTCore.cmake %changelog +* Sun Jul 13 2008 Roland Wolters - 3.1-1 +- Update to version 3.1 + * Wed May 14 2008 Roland Wolters - 3.0.2-3 - bugfix update to version 3.0.2 - some spec file fixes due to an update error Index: sources =================================================================== RCS file: /cvs/extras/rpms/ktorrent/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 14 May 2008 18:57:01 -0000 1.19 +++ sources 13 Jul 2008 20:39:50 -0000 1.20 @@ -1 +1 @@ -a2a3c2a62da2147d22eccefa40c7f5d7 ktorrent-3.0.2.tar.bz2 +09fb20a2fb854117cb871da4a920fec3 ktorrent-3.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 13 20:58:03 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 13 Jul 2008 20:58:03 GMT Subject: rpms/perl-DateTime-Format-Strptime/EL-5 perl-DateTime-Format-Strptime-1.0700-olddtl.patch, NONE, 1.1 perl-DateTime-Format-Strptime.spec, 1.2, 1.3 Message-ID: <200807132058.m6DKw334005214@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5142 Modified Files: perl-DateTime-Format-Strptime.spec Added Files: perl-DateTime-Format-Strptime-1.0700-olddtl.patch Log Message: * Sun Jul 13 2008 Lubomir Rintel 1.0700-2.1 - Adjust some test so that it passes in el5 perl-DateTime-Format-Strptime-1.0700-olddtl.patch: --- NEW FILE perl-DateTime-Format-Strptime-1.0700-olddtl.patch --- Seems like old DateTime::Locale does not grok some date notations. Lubomir Rintel diff -urp DateTime-Format-Strptime-1.0700.orig/t/004_locale_defaults.t DateTime-Format-Strptime-1.0700/t/004_locale_defaults.t --- DateTime-Format-Strptime-1.0700.orig/t/004_locale_defaults.t 2004-08-18 04:15:01.000000000 +0200 +++ DateTime-Format-Strptime-1.0700/t/004_locale_defaults.t 2008-07-13 22:53:18.000000000 +0200 @@ -29,9 +29,9 @@ my @tests = ( ['en_GB', '%c', '31 Dec 1998 12:34:56'], # French #);my @tests = ( - ['fr', '%x', '31 d?c. 98'], + ['fr', '%x', '31 d?c 1998'], ['fr', '%X', '12:34:56'], - ['fr', '%c', '31 d?c. 98 12:34:56'], + ['fr', '%c', '31 d?c 1998 12:34:56'], ); foreach (@tests) { Index: perl-DateTime-Format-Strptime.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/EL-5/perl-DateTime-Format-Strptime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DateTime-Format-Strptime.spec 17 Sep 2006 19:05:46 -0000 1.2 +++ perl-DateTime-Format-Strptime.spec 13 Jul 2008 20:57:03 -0000 1.3 @@ -1,12 +1,13 @@ Name: perl-DateTime-Format-Strptime Version: 1.0700 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Parse and format strp and strf time patterns License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-Strptime/ Source0: http://www.cpan.org/authors/id/R/RI/RICKM/DateTime-Format-Strptime-%{version}.tar.gz Patch0: %{name}-charset.patch +Patch1: %{name}-1.0700-olddtl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(DateTime) @@ -24,6 +25,7 @@ %prep %setup -q -n DateTime-Format-Strptime-%{version} %patch0 +%patch1 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -52,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun Jul 13 2008 Lubomir Rintel 1.0700-2.1 +- Adjust some test so that it passes in el5 + * Sat Sep 16 2006 Steven Pritchard 1.0700-2 - Fix find option order. From fedora-extras-commits at redhat.com Sun Jul 13 21:05:42 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sun, 13 Jul 2008 21:05:42 GMT Subject: rpms/ocaml/F-8 ocaml-3.10.0-map32bit.patch, NONE, 1.1 ocaml.spec, 1.35, 1.36 Message-ID: <200807132105.m6DL5gLk012407@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12268 Modified Files: ocaml.spec Added Files: ocaml-3.10.0-map32bit.patch Log Message: * Sun Jul 13 2008 Richard W.M. Jones - 3.10.0-8 - Pass MAP_32BIT to mmap (bz #454384). ocaml-3.10.0-map32bit.patch: --- NEW FILE ocaml-3.10.0-map32bit.patch --- diff -ur ocaml-3.10.0.orig/byterun/unix.c ocaml-3.10.0/byterun/unix.c --- ocaml-3.10.0.orig/byterun/unix.c 2007-02-12 07:57:25.000000000 +0000 +++ ocaml-3.10.0/byterun/unix.c 2008-07-13 21:44:06.000000000 +0100 @@ -346,13 +346,17 @@ #include +#ifndef MAP_32BIT /* Fedora bug 445545 */ +#define MAP_32BIT 0 +#endif + char *caml_aligned_mmap (asize_t size, int modulo, void **block) { char *raw_mem; uintnat aligned_mem; Assert (modulo < Page_size); raw_mem = (char *) mmap(NULL, size + Page_size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + MAP_32BIT | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (raw_mem == MAP_FAILED) return NULL; *block = raw_mem; raw_mem += modulo; /* Address to be aligned */ Only in ocaml-3.10.0/byterun: unix.c.orig Index: ocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml/F-8/ocaml.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ocaml.spec 25 Oct 2007 16:12:46 -0000 1.35 +++ ocaml.spec 13 Jul 2008 21:04:36 -0000 1.36 @@ -1,6 +1,6 @@ Name: ocaml Version: 3.10.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Objective Caml compiler and programming environment @@ -15,6 +15,7 @@ Source5: ocaml-find-provides.sh Patch0: ocaml-rpath.patch Patch1: ocaml-user-cflags.patch +Patch2: ocaml-3.10.0-map32bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel BuildRequires: gdbm-devel @@ -186,6 +187,7 @@ %setup -q -T -D -a 3 %patch0 -p1 %patch1 -p1 -b .cflags +%patch2 -p1 -b .map32bit cp %{SOURCE2} refman.pdf @@ -427,6 +429,9 @@ %changelog +* Sun Jul 13 2008 Richard W.M. Jones - 3.10.0-8 +- Pass MAP_32BIT to mmap (bz #454384). + * Thu Sep 6 2007 Richard W.M. Jones - 3.10.0-7 - Run chrpath to delete rpaths used on some of the stublibs. - Ignore Parsetree module in dependency calculation. From fedora-extras-commits at redhat.com Sun Jul 13 21:08:41 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 13 Jul 2008 21:08:41 GMT Subject: rpms/abiword/F-8 abiword.spec,1.46,1.47 Message-ID: <200807132108.m6DL8fCp012661@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12576 Modified Files: abiword.spec Log Message: Add missing boost-devel BR Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-8/abiword.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- abiword.spec 13 Jul 2008 20:22:38 -0000 1.46 +++ abiword.spec 13 Jul 2008 21:07:50 -0000 1.47 @@ -5,7 +5,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -36,6 +36,7 @@ BuildRequires: link-grammar-devel >= 4.2.2 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison BuildRequires: goffice04-devel +BuildRequires: boost-devel # gnome build deps BuildRequires: libgnomeui-devel @@ -168,6 +169,9 @@ %ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Sun Jul 13 2008 Marc Maurer 1:2.6.4-2 +- Add missing boost-devel BR + * Sun Jul 13 2008 Marc Maurer 1:2.6.4-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 13 22:13:58 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Sun, 13 Jul 2008 22:13:58 GMT Subject: rpms/kernel/F-9 patch-2.6.25.11.bz2.sign, NONE, 1.1 .cvsignore, 1.818, 1.819 kernel.spec, 1.710, 1.711 sources, 1.779, 1.780 upstream, 1.698, 1.699 patch-2.6.25.10.bz2.sign, 1.1, NONE Message-ID: <200807132213.m6DMDwaB023523@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23431 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25.11.bz2.sign Removed Files: patch-2.6.25.10.bz2.sign Log Message: * Sun Jul 13 2008 Kyle McMartin 2.6.25.11-92 - Linux 2.6.25.11 --- NEW FILE patch-2.6.25.11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIekVSyGugalF9Dw4RAgpJAJ93dMOBZC++/OrpwuTCFgtj6fPleQCeKg7s /LoLhkdqQHzpycuyxPSouT8= =GY4G -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v retrieving revision 1.818 retrieving revision 1.819 diff -u -r1.818 -r1.819 --- .cvsignore 3 Jul 2008 21:17:31 -0000 1.818 +++ .cvsignore 13 Jul 2008 22:13:04 -0000 1.819 @@ -4,4 +4,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.10.bz2 +patch-2.6.25.11.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.710 retrieving revision 1.711 diff -u -r1.710 -r1.711 --- kernel.spec 10 Jul 2008 18:26:02 -0000 1.710 +++ kernel.spec 13 Jul 2008 22:13:04 -0000 1.711 @@ -31,7 +31,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 10 +%define stable_update 11 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1877,6 +1877,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Sun Jul 13 2008 Kyle McMartin 2.6.25.11-92 +- Linux 2.6.25.11 + * Thu Jul 10 2008 John W. Linville 2.6.25.9-91 - Upstream wireless fixes from 2008-07-09 (http://marc.info/?l=linux-netdev&m=121563769208664&w=2) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v retrieving revision 1.779 retrieving revision 1.780 diff -u -r1.779 -r1.780 --- sources 3 Jul 2008 21:17:32 -0000 1.779 +++ sources 13 Jul 2008 22:13:04 -0000 1.780 @@ -1,2 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -ad3c4b32bf293722500160a2bb6100b6 patch-2.6.25.10.bz2 +86abbd32d5cfd382782ffc7a924e7574 patch-2.6.25.11.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v retrieving revision 1.698 retrieving revision 1.699 diff -u -r1.698 -r1.699 --- upstream 3 Jul 2008 21:17:32 -0000 1.698 +++ upstream 13 Jul 2008 22:13:04 -0000 1.699 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.10.bz2 +patch-2.6.25.11.bz2 --- patch-2.6.25.10.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 22:14:56 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Sun, 13 Jul 2008 22:14:56 GMT Subject: rpms/kernel/F-8 patch-2.6.25.11.bz2.sign, NONE, 1.1 .cvsignore, 1.728, 1.729 kernel.spec, 1.493, 1.494 sources, 1.689, 1.690 upstream, 1.610, 1.611 patch-2.6.25.10.bz2.sign, 1.1, NONE Message-ID: <200807132214.m6DMEuN4023599@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23513 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25.11.bz2.sign Removed Files: patch-2.6.25.10.bz2.sign Log Message: * Sun Jul 13 2008 Kyle McMartin 2.6.25.11-54 - Linux 2.6.25.11 --- NEW FILE patch-2.6.25.11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIekVSyGugalF9Dw4RAgpJAJ93dMOBZC++/OrpwuTCFgtj6fPleQCeKg7s /LoLhkdqQHzpycuyxPSouT8= =GY4G -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v retrieving revision 1.728 retrieving revision 1.729 diff -u -r1.728 -r1.729 --- .cvsignore 3 Jul 2008 21:27:53 -0000 1.728 +++ .cvsignore 13 Jul 2008 22:13:58 -0000 1.729 @@ -3,4 +3,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.10.bz2 +patch-2.6.25.11.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.493 retrieving revision 1.494 diff -u -r1.493 -r1.494 --- kernel.spec 11 Jul 2008 19:06:48 -0000 1.493 +++ kernel.spec 13 Jul 2008 22:13:58 -0000 1.494 @@ -33,7 +33,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 10 +%define stable_update 11 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1836,6 +1836,9 @@ %changelog +* Sun Jul 13 2008 Kyle McMartin 2.6.25.11-54 +- Linux 2.6.25.11 + * Thu Jul 10 2008 John W. Linville 2.6.25.10-53 - Upstream wireless fixes from 2008-07-09 (http://marc.info/?l=linux-netdev&m=121563769208664&w=2) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v retrieving revision 1.689 retrieving revision 1.690 diff -u -r1.689 -r1.690 --- sources 3 Jul 2008 21:27:53 -0000 1.689 +++ sources 13 Jul 2008 22:13:58 -0000 1.690 @@ -1,2 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -ad3c4b32bf293722500160a2bb6100b6 patch-2.6.25.10.bz2 +86abbd32d5cfd382782ffc7a924e7574 patch-2.6.25.11.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v retrieving revision 1.610 retrieving revision 1.611 diff -u -r1.610 -r1.611 --- upstream 3 Jul 2008 21:27:53 -0000 1.610 +++ upstream 13 Jul 2008 22:13:58 -0000 1.611 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.10.bz2 +patch-2.6.25.11.bz2 --- patch-2.6.25.10.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 22:23:45 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Sun, 13 Jul 2008 22:23:45 GMT Subject: rpms/kernel/devel config-generic, 1.125, 1.126 kernel.spec, 1.757, 1.758 Message-ID: <200807132223.m6DMNjw2023886@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23851 Modified Files: config-generic kernel.spec Log Message: * Sun Jul 13 2008 Kyle McMartin - Enable CONFIG_NETDEVICES_MULTIQUEUE (and CONFIG_MAC80211_QOS.) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- config-generic 10 Jul 2008 00:07:31 -0000 1.125 +++ config-generic 13 Jul 2008 22:22:45 -0000 1.126 @@ -1033,7 +1033,7 @@ CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set CONFIG_NETDEVICES=y -# CONFIG_NETDEVICES_MULTIQUEUE is not set +CONFIG_NETDEVICES_MULTIQUEUE=y # # ARCnet devices @@ -1260,6 +1260,7 @@ # CONFIG_PCMCIA_RAYCS is not set CONFIG_MAC80211=m +CONFIG_MAC80211_QOS=y CONFIG_MAC80211_RC_DEFAULT_PID=y # CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set CONFIG_MAC80211_RC_DEFAULT="pid" Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.757 retrieving revision 1.758 diff -u -r1.757 -r1.758 --- kernel.spec 13 Jul 2008 19:38:30 -0000 1.757 +++ kernel.spec 13 Jul 2008 22:22:45 -0000 1.758 @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Sun Jul 13 2008 Kyle McMartin +- Enable CONFIG_NETDEVICES_MULTIQUEUE (and CONFIG_MAC80211_QOS.) + * Sun Jul 13 2008 Dave Jones - 2.6.26-rc9-git12 From fedora-extras-commits at redhat.com Sun Jul 13 22:38:18 2008 From: fedora-extras-commits at redhat.com (Stephen Warren (swarren)) Date: Sun, 13 Jul 2008 22:38:18 GMT Subject: rpms/unison213/F-8 unison213.spec,1.4,1.5 Message-ID: <200807132238.m6DMcIHK024649@cvs-int.fedora.redhat.com> Author: swarren Update of /cvs/pkgs/rpms/unison213/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24573/F-8 Modified Files: unison213.spec Log Message: Rebuild against newer ocaml; see BZ 441685, with deps 454384/445545. Index: unison213.spec =================================================================== RCS file: /cvs/pkgs/rpms/unison213/F-8/unison213.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unison213.spec 30 Mar 2008 18:02:32 -0000 1.4 +++ unison213.spec 13 Jul 2008 22:37:27 -0000 1.5 @@ -23,7 +23,7 @@ Name: unison%{ver_compat_name} Version: %{ver_compat}%{ver_noncompat} -Release: 9%{?dist}.2 +Release: 9%{?dist}.3 Summary: Multi-master File synchronization tool @@ -34,7 +34,7 @@ Source1: unison.png BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: ocaml >= 3.09.1 +BuildRequires: ocaml >= 3.10.0-8 BuildRequires: ocaml-lablgtk-devel >= 2.6.0 BuildRequires: tetex-latex BuildRequires: desktop-file-utils @@ -129,6 +129,9 @@ %{_datadir}/pixmaps/unison-%{ver_compat}.png %changelog +* Sun Jul 13 2008 Stephen Warren - 2.13.16-9.fc8.3 +- Rebuild against newer ocaml; see BZ 441685, with deps 454384/445545. + * Sun Mar 30 2008 Stephen Warren - 2.13.16-9.fc8.2 - Don't use alternatives for desktop and icon files, to avoid duplicate menu entries. From fedora-extras-commits at redhat.com Sun Jul 13 22:39:55 2008 From: fedora-extras-commits at redhat.com (Stephen Warren (swarren)) Date: Sun, 13 Jul 2008 22:39:55 GMT Subject: rpms/unison227/F-8 unison227.spec,1.4,1.5 Message-ID: <200807132239.m6DMdtIQ024809@cvs-int.fedora.redhat.com> Author: swarren Update of /cvs/pkgs/rpms/unison227/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24764/F-8 Modified Files: unison227.spec Log Message: - Rebuild against newer ocaml; see BZ 441685, with deps 454384/445545. Index: unison227.spec =================================================================== RCS file: /cvs/pkgs/rpms/unison227/F-8/unison227.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unison227.spec 30 Mar 2008 18:04:10 -0000 1.4 +++ unison227.spec 13 Jul 2008 22:39:08 -0000 1.5 @@ -23,7 +23,7 @@ Name: unison%{ver_compat_name} Version: %{ver_compat}%{ver_noncompat} -Release: 7%{?dist}.2 +Release: 7%{?dist}.3 Summary: Multi-master File synchronization tool @@ -34,7 +34,7 @@ Source1: unison.png BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: ocaml >= 3.09.1 +BuildRequires: ocaml >= 3.10.0-8 BuildRequires: ocaml-lablgtk-devel >= 2.6.0 BuildRequires: tetex-latex BuildRequires: desktop-file-utils @@ -129,6 +129,9 @@ %{_datadir}/pixmaps/unison-%{ver_compat}.png %changelog +* Sun Jul 13 2008 Stephen Warren - 2.27.57-7.fc8.3 +- Rebuild against newer ocaml; see BZ 441685, with deps 454384/445545. + * Sun Mar 30 2008 Stephen Warren - 2.27.57-7.fc8.2 - Don't use alternatives for desktop and icon files, to avoid duplicate menu entries. From fedora-extras-commits at redhat.com Sun Jul 13 23:37:56 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 13 Jul 2008 23:37:56 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.5-kickoff-suspend.patch, NONE, 1.1 kdebase-workspace.spec, 1.98, 1.99 kdebase-workspace-4.0.4-kickoff-suspend.patch, 1.1, NONE Message-ID: <200807132337.m6DNbuK4002290@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2244/devel Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.5-kickoff-suspend.patch Removed Files: kdebase-workspace-4.0.4-kickoff-suspend.patch Log Message: * Sun Jul 13 2008 Kevin Kofler 4.0.98-3 - sync kickoff-suspend patch from F9 (loads ksmserver translations) kdebase-workspace-4.0.5-kickoff-suspend.patch: --- NEW FILE kdebase-workspace-4.0.5-kickoff-suspend.patch --- diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt --- kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt 2008-06-01 13:53:49.000000000 +0200 @@ -55,13 +55,13 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) # Kickoff Plasma Applet set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp ) kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) -target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS}) +target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS}) install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) # Simple KMenu Plasma Applet set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp ) kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) -target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS}) +target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS}) install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp 2008-06-01 13:53:49.000000000 +0200 @@ -29,6 +29,8 @@ #include #include #include +#include +#include // KDE Base #include @@ -83,6 +85,18 @@ bool LeaveItemHandler::openUrl(const QUr // decouple dbus call, otherwise we'll run into a dead-lock QTimer::singleShot(0, this, SLOT(logout())); return true; + } else if (m_logoutAction == "standby") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(standby())); + return true; + } else if (m_logoutAction == "suspendram") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(suspendRAM())); + return true; + } else if (m_logoutAction == "suspenddisk") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(suspendDisk())); + return true; } return false; @@ -128,3 +142,27 @@ void LeaveItemHandler::switchUser() krunner.switchUser(); } } + +void LeaveItemHandler::standby() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::Standby; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} + +void LeaveItemHandler::suspendRAM() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToRam; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} + +void LeaveItemHandler::suspendDisk() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToDisk; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h 2008-06-01 13:53:49.000000000 +0200 @@ -42,6 +42,9 @@ private Q_SLOTS: void logout(); void lock(); void switchUser(); + void standby(); + void suspendRAM(); + void suspendDisk(); private: QString m_logoutAction; diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp 2008-06-01 22:28:23.000000000 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include // Local #include "core/models.h" @@ -39,6 +40,7 @@ class LeaveModel::Private QStandardItem* LeaveModel::createStandardItem(const QString& url) { + KGlobal::locale()->insertCatalog("ksmserver"); //Q_ASSERT(QUrl(url).scheme() == "leave"); QStandardItem *item = new QStandardItem(); const QString basename = QFileInfo(url).baseName(); @@ -77,6 +79,21 @@ QStandardItem* LeaveModel::createStandar item->setIcon(KIcon("system-restart")); item->setData(i18n("Restart the computer"),Kickoff::SubTitleRole); } + else if (basename == "standby") { + item->setText(i18n("Standby")); + item->setIcon(KIcon("system-suspend")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } + else if (basename == "suspenddisk") { + item->setText(i18n("Suspend to Disk")); + item->setIcon(KIcon("system-suspend-hibernate")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } + else if (basename == "suspendram") { + item->setText(i18n("Suspend to RAM")); + item->setIcon(KIcon("system-suspend-hibernate")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } else { item->setText(basename); item->setData(url,Kickoff::SubTitleRole); @@ -122,6 +139,22 @@ LeaveModel::LeaveModel(QObject *parent) systemOptions->appendRow(hibernateOption); } + Solid::Control::PowerManager::SuspendMethods spdMethods = Solid::Control::PowerManager::supportedSuspendMethods(); + if( spdMethods & Solid::Control::PowerManager::Standby ) { + QStandardItem *standbyOption = createStandardItem("leave:/standby"); + systemOptions->appendRow(standbyOption); + } + + if( spdMethods & Solid::Control::PowerManager::ToRam ) { + QStandardItem *suspendramOption = createStandardItem("leave:/suspendram"); + systemOptions->appendRow(suspendramOption); + } + + if( spdMethods & Solid::Control::PowerManager::ToDisk ) { + QStandardItem *suspenddiskOption = createStandardItem("leave:/suspenddisk"); + systemOptions->appendRow(suspenddiskOption); + } + // Shutdown QStandardItem *shutDownOption = createStandardItem("leave:/shutdown"); systemOptions->appendRow(shutDownOption); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- kdebase-workspace.spec 13 Jul 2008 16:23:13 -0000 1.98 +++ kdebase-workspace.spec 13 Jul 2008 23:37:13 -0000 1.99 @@ -2,7 +2,7 @@ Name: kdebase-workspace Version: 4.0.98 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -26,7 +26,7 @@ # upstream patches: # plasma-4.0-openSUSE patches: -Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch +Patch204: kdebase-workspace-4.0.5-kickoff-suspend.patch # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151 Provides: kdebase-kdm = 6:%{version}-%{release} @@ -272,6 +272,9 @@ %changelog +* Sun Jul 13 2008 Kevin Kofler 4.0.98-3 +- sync kickoff-suspend patch from F9 (loads ksmserver translations) + * Fri Jul 11 2008 Rex Dieter 4.0.98-2 - respun tarball (with systray patch) --- kdebase-workspace-4.0.4-kickoff-suspend.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 13 23:51:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 23:51:14 +0000 Subject: [pkgdb] java-1.6.0-openjdk ownership updated Message-ID: <200807132351.m6DNpE6o024453@bastion.fedora.phx.redhat.com> Package java-1.6.0-openjdk in Fedora devel is now owned by Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Sun Jul 13 23:51:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 23:51:47 +0000 Subject: [pkgdb] java-1.6.0-openjdk: langel has requested watchbugzilla Message-ID: <200807132351.m6DNplRs024482@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.6.0-openjdk (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Sun Jul 13 23:51:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 23:51:49 +0000 Subject: [pkgdb] java-1.6.0-openjdk: langel has requested commit Message-ID: <200807132351.m6DNplRv024482@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on java-1.6.0-openjdk (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Sun Jul 13 23:51:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 23:51:54 +0000 Subject: [pkgdb] java-1.6.0-openjdk: langel has requested watchbugzilla Message-ID: <200807132351.m6DNpE6r024453@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.6.0-openjdk (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Sun Jul 13 23:51:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 13 Jul 2008 23:51:55 +0000 Subject: [pkgdb] java-1.6.0-openjdk: langel has requested commit Message-ID: <200807132351.m6DNpuT6024539@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on java-1.6.0-openjdk (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Sun Jul 13 23:52:42 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 13 Jul 2008 23:52:42 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.99,1.100 Message-ID: <200807132352.m6DNqgxO003297@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3246/devel Modified Files: kdebase-workspace.spec Log Message: %define _default_patch_fuzz 2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- kdebase-workspace.spec 13 Jul 2008 23:37:13 -0000 1.99 +++ kdebase-workspace.spec 13 Jul 2008 23:51:57 -0000 1.100 @@ -1,3 +1,5 @@ +%define _default_patch_fuzz 2 + Summary: K Desktop Environment - Workspace Name: kdebase-workspace Version: 4.0.98 From fedora-extras-commits at redhat.com Mon Jul 14 00:16:57 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 14 Jul 2008 00:16:57 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.98-kickoff-suspend.patch, NONE, 1.1 kdebase-workspace.spec, 1.100, 1.101 kdebase-workspace-4.0.5-kickoff-suspend.patch, 1.1, NONE Message-ID: <200807140016.m6E0GvTR011363@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11285/devel Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.98-kickoff-suspend.patch Removed Files: kdebase-workspace-4.0.5-kickoff-suspend.patch Log Message: Make the patch apply. kdebase-workspace-4.0.98-kickoff-suspend.patch: --- NEW FILE kdebase-workspace-4.0.98-kickoff-suspend.patch --- diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt --- kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt 2008-06-01 13:53:49.000000000 +0200 @@ -55,13 +55,13 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) # Kickoff Plasma Applet set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp ) kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) -target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS}) +target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS}) install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) # Simple KMenu Plasma Applet set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp ) kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) -target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS}) +target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS}) install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp 2008-06-01 13:53:49.000000000 +0200 @@ -29,6 +29,8 @@ #include #include #include +#include +#include // KDE Base #include @@ -83,6 +85,18 @@ bool LeaveItemHandler::openUrl(const QUr // decouple dbus call, otherwise we'll run into a dead-lock QTimer::singleShot(0, this, SLOT(logout())); return true; + } else if (m_logoutAction == "standby") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(standby())); + return true; + } else if (m_logoutAction == "suspendram") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(suspendRAM())); + return true; + } else if (m_logoutAction == "suspenddisk") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(suspendDisk())); + return true; } return false; @@ -128,3 +142,27 @@ void LeaveItemHandler::switchUser() krunner.switchUser(); } } + +void LeaveItemHandler::standby() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::Standby; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} + +void LeaveItemHandler::suspendRAM() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToRam; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} + +void LeaveItemHandler::suspendDisk() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToDisk; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h 2008-06-01 13:53:49.000000000 +0200 @@ -42,6 +42,9 @@ private Q_SLOTS: void logout(); void lock(); void switchUser(); + void standby(); + void suspendRAM(); + void suspendDisk(); private: QString m_logoutAction; diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp 2008-06-01 22:28:23.000000000 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include // Local #include "core/models.h" @@ -39,6 +40,7 @@ class LeaveModel::Private QStandardItem* LeaveModel::createStandardItem(const QString& url) { + KGlobal::locale()->insertCatalog("ksmserver"); //Q_ASSERT(KUrl(url).scheme() == "leave"); QStandardItem *item = new QStandardItem(); const QString basename = QFileInfo(url).baseName(); @@ -77,6 +79,21 @@ QStandardItem* LeaveModel::createStandar item->setIcon(KIcon("system-restart")); item->setData(i18n("Restart the computer"),Kickoff::SubTitleRole); } + else if (basename == "standby") { + item->setText(i18n("Standby")); + item->setIcon(KIcon("system-suspend")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } + else if (basename == "suspenddisk") { + item->setText(i18n("Suspend to Disk")); + item->setIcon(KIcon("system-suspend-hibernate")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } + else if (basename == "suspendram") { + item->setText(i18n("Suspend to RAM")); + item->setIcon(KIcon("system-suspend-hibernate")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } else { item->setText(basename); item->setData(url,Kickoff::SubTitleRole); @@ -122,6 +139,22 @@ LeaveModel::LeaveModel(QObject *parent) systemOptions->appendRow(hibernateOption); } + Solid::Control::PowerManager::SuspendMethods spdMethods = Solid::Control::PowerManager::supportedSuspendMethods(); + if( spdMethods & Solid::Control::PowerManager::Standby ) { + QStandardItem *standbyOption = createStandardItem("leave:/standby"); + systemOptions->appendRow(standbyOption); + } + + if( spdMethods & Solid::Control::PowerManager::ToRam ) { + QStandardItem *suspendramOption = createStandardItem("leave:/suspendram"); + systemOptions->appendRow(suspendramOption); + } + + if( spdMethods & Solid::Control::PowerManager::ToDisk ) { + QStandardItem *suspenddiskOption = createStandardItem("leave:/suspenddisk"); + systemOptions->appendRow(suspenddiskOption); + } + // Shutdown QStandardItem *shutDownOption = createStandardItem("leave:/shutdown"); systemOptions->appendRow(shutDownOption); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- kdebase-workspace.spec 13 Jul 2008 23:51:57 -0000 1.100 +++ kdebase-workspace.spec 14 Jul 2008 00:16:12 -0000 1.101 @@ -28,7 +28,7 @@ # upstream patches: # plasma-4.0-openSUSE patches: -Patch204: kdebase-workspace-4.0.5-kickoff-suspend.patch +Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151 Provides: kdebase-kdm = 6:%{version}-%{release} --- kdebase-workspace-4.0.5-kickoff-suspend.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 00:34:10 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Mon, 14 Jul 2008 00:34:10 GMT Subject: rpms/kernel/devel linux-2.6.26.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.863, 1.864 kernel.spec, 1.758, 1.759 sources, 1.824, 1.825 upstream, 1.742, 1.743 linux-2.6.25.tar.bz2.sign, 1.1, NONE patch-2.6.26-rc9-git12.bz2.sign, 1.1, NONE patch-2.6.26-rc9.bz2.sign, 1.1, NONE Message-ID: <200807140034.m6E0YABD013161@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008 Modified Files: .cvsignore kernel.spec sources upstream Added Files: linux-2.6.26.tar.bz2.sign Removed Files: linux-2.6.25.tar.bz2.sign patch-2.6.26-rc9-git12.bz2.sign patch-2.6.26-rc9.bz2.sign Log Message: * Sun Jul 13 2008 Kyle McMartin - Linux 2.6.26 --- NEW FILE linux-2.6.26.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIeogDyGugalF9Dw4RAk4IAJ4g+RxY+bf8pYzXhWQ6ltKoM+Z3VQCfYFI6 wUkbvVqKn/rTx7kqTtudjVg= =4xMU -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.863 retrieving revision 1.864 diff -u -r1.863 -r1.864 --- .cvsignore 13 Jul 2008 19:38:30 -0000 1.863 +++ .cvsignore 14 Jul 2008 00:33:14 -0000 1.864 @@ -3,6 +3,4 @@ kernel-2.6.*.config temp-* kernel-2.6.25 -linux-2.6.25.tar.bz2 -patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git12.bz2 +linux-2.6.26.tar.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- kernel.spec 13 Jul 2008 22:22:45 -0000 1.758 +++ kernel.spec 14 Jul 2008 00:33:14 -0000 1.759 @@ -3,7 +3,7 @@ # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%define released_kernel 0 +%define released_kernel 1 # Versions of various parts @@ -26,12 +26,12 @@ # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base, # which yields a base_sublevel of 21. -%define base_sublevel 25 +%define base_sublevel 26 ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 3 +%define stable_update 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1789,6 +1789,9 @@ %changelog * Sun Jul 13 2008 Kyle McMartin +- Linux 2.6.26 + +* Sun Jul 13 2008 Kyle McMartin - Enable CONFIG_NETDEVICES_MULTIQUEUE (and CONFIG_MAC80211_QOS.) * Sun Jul 13 2008 Dave Jones Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.824 retrieving revision 1.825 diff -u -r1.824 -r1.825 --- sources 13 Jul 2008 19:38:30 -0000 1.824 +++ sources 14 Jul 2008 00:33:14 -0000 1.825 @@ -1,3 +1 @@ -db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -0762e00fd6e3156421bbbf4eab36c98e patch-2.6.26-rc9.bz2 -bb08310d983f6bf68c4ee910b469b7c6 patch-2.6.26-rc9-git12.bz2 +5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.742 retrieving revision 1.743 diff -u -r1.742 -r1.743 --- upstream 13 Jul 2008 19:38:30 -0000 1.742 +++ upstream 14 Jul 2008 00:33:14 -0000 1.743 @@ -1,3 +1 @@ -linux-2.6.25.tar.bz2 -patch-2.6.26-rc9.bz2 -patch-2.6.26-rc9-git12.bz2 +linux-2.6.26.tar.bz2 --- linux-2.6.25.tar.bz2.sign DELETED --- --- patch-2.6.26-rc9-git12.bz2.sign DELETED --- --- patch-2.6.26-rc9.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 01:48:49 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Mon, 14 Jul 2008 01:48:49 GMT Subject: rpms/stardict/devel stardict.spec,1.55,1.56 Message-ID: <200807140148.m6E1mnKr024158@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23996 Modified Files: stardict.spec Log Message: disable gucharmap-2 until stardict sources support it Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- stardict.spec 11 Jul 2008 07:02:25 -0000 1.55 +++ stardict.spec 14 Jul 2008 01:47:45 -0000 1.56 @@ -1,11 +1,10 @@ %define name stardict %define version 3.0.1 - Name: %{name} Summary: A powerful dictionary platform written in GTK+2 Version: %{version} -Release: 10%{?dist} +Release: 11%{?dist} Group: Applications/System License: GPLv3 URL: http://stardict.sourceforge.net @@ -56,7 +55,8 @@ %build %{__aclocal} %{__autoconf} -%configure --prefix=%{_prefix} --disable-schemas-install --disable-festival +%configure --prefix=%{_prefix} --disable-schemas-install --disable-festival \ + --disable-gucharmap make %install @@ -98,6 +98,9 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Mon Jul 14 2008 Caius Chance - 3.0.1-11.fc10 +- Disable gucharmap for incompatibility with gucharmap-2. + * Thu Jul 10 2008 Caius Chance - 3.0.1-10.fc10 - Rebuilt for gucharmap updation 2.22.1 and pkgconfig .ac name change. From fedora-extras-commits at redhat.com Mon Jul 14 02:34:13 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Mon, 14 Jul 2008 02:34:13 GMT Subject: rpms/stardict/devel stardict.spec,1.56,1.57 Message-ID: <200807140234.m6E2YDTx032128@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32044 Modified Files: stardict.spec Log Message: Refactorized Requires and BuildRequires tags. Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- stardict.spec 14 Jul 2008 01:47:45 -0000 1.56 +++ stardict.spec 14 Jul 2008 02:33:21 -0000 1.57 @@ -14,25 +14,12 @@ Patch2: stardict-3.0.1-10.gucharmap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libgnome >= 2.2.0 -Requires: libgnomeui >= 2.2.0 -Requires: libbonobo >= 2.2.0 -Requires: bonobo-activation >= 2.2.0 -BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper, gettext, perl-XML-Parser -BuildRequires: desktop-file-utils, autoconf, automake, libtool +Requires: bonobo-activitation >= 2.2.0, enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17 +#Requires: festival, speech-tools Requires(post): GConf2, scrollkeeper Requires(postun): scrollkeeper -Requires: libsigc++20 >= 2.0.17 -BuildRequires: libsigc++20-devel - -Requires: gucharmap >= 2.22.1 -BuildRequires: gucharmap-devel >= 2.22.1 -Requires: espeak -BuildRequires: espeak-devel -Requires: enchant -BuildRequires: enchant-devel -#Requires: festival, speech-tools +BuildRequires: autoconf, automake, desktop-file-utils, enchant-devel, espeak-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper #BuildRequires: festival-devel, speech-tools-devel %description @@ -100,6 +87,7 @@ %changelog * Mon Jul 14 2008 Caius Chance - 3.0.1-11.fc10 - Disable gucharmap for incompatibility with gucharmap-2. +- Refactorized Requires and BuildRequires tags. * Thu Jul 10 2008 Caius Chance - 3.0.1-10.fc10 - Rebuilt for gucharmap updation 2.22.1 and pkgconfig .ac name change. From fedora-extras-commits at redhat.com Mon Jul 14 02:54:21 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Mon, 14 Jul 2008 02:54:21 GMT Subject: rpms/stardict/devel stardict.spec,1.57,1.58 Message-ID: <200807140254.m6E2sLnT000611@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv557 Modified Files: stardict.spec Log Message: testing if gucharmap-2 buildable Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- stardict.spec 14 Jul 2008 02:33:21 -0000 1.57 +++ stardict.spec 14 Jul 2008 02:53:32 -0000 1.58 @@ -4,7 +4,7 @@ Name: %{name} Summary: A powerful dictionary platform written in GTK+2 Version: %{version} -Release: 11%{?dist} +Release: 11.1%{?dist} Group: Applications/System License: GPLv3 URL: http://stardict.sourceforge.net @@ -42,8 +42,7 @@ %build %{__aclocal} %{__autoconf} -%configure --prefix=%{_prefix} --disable-schemas-install --disable-festival \ - --disable-gucharmap +%configure --prefix=%{_prefix} --disable-schemas-install --disable-festival make %install @@ -85,6 +84,9 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Mon Jul 14 2008 Caius Chance - 3.0.1-11.1.fc10 +- Enable gucharmap-2. + * Mon Jul 14 2008 Caius Chance - 3.0.1-11.fc10 - Disable gucharmap for incompatibility with gucharmap-2. - Refactorized Requires and BuildRequires tags. From fedora-extras-commits at redhat.com Mon Jul 14 02:57:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 02:57:07 +0000 Subject: [pkgdb] monit (Fedora EPEL, 5) updated by kevin Message-ID: <200807140257.m6E2v7uv002335@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for monit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on monit (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on monit (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on monit (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/monit From fedora-extras-commits at redhat.com Mon Jul 14 02:57:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 02:57:07 +0000 Subject: [pkgdb] monit (Fedora EPEL, 4) updated by kevin Message-ID: <200807140257.m6E2v7us002335@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for monit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on monit (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on monit (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on monit (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/monit From fedora-extras-commits at redhat.com Mon Jul 14 02:59:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 02:59:46 +0000 Subject: [pkgdb] aubio was added for green Message-ID: <200807140259.m6E2xk3b002442@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package aubio with summary An audio labelling library Kevin Fenzi (kevin) has approved Package aubio Kevin Fenzi (kevin) has added a Fedora devel branch for aubio with an owner of green Kevin Fenzi (kevin) has approved aubio in Fedora devel Kevin Fenzi (kevin) has approved Package aubio Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aubio (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on aubio (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aubio (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/aubio From fedora-extras-commits at redhat.com Mon Jul 14 02:59:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 02:59:48 +0000 Subject: [pkgdb] aubio (Fedora, devel) updated by kevin Message-ID: <200807140259.m6E2xmph002461@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on aubio (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/aubio From fedora-extras-commits at redhat.com Mon Jul 14 03:00:20 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 03:00:20 GMT Subject: rpms/redet/F-8 .cvsignore, 1.3, 1.4 redet.spec, 1.2, 1.3 sources, 1.3, 1.4 redet-8.23-xdg-utils.patch, 1.1, NONE redet.desktop, 1.2, NONE Message-ID: <200807140300.m6E30KOG001090@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/redet/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv935 Modified Files: .cvsignore redet.spec sources Removed Files: redet-8.23-xdg-utils.patch redet.desktop Log Message: * Sun Jul 13 2008 Debarshi Ray - 8.24-1 - Version bump to 8.24. Closes Red Hat Bugzilla bug #447203. - redet.desktop and xdg-open added by upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/redet/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Nov 2007 16:01:37 -0000 1.3 +++ .cvsignore 14 Jul 2008 02:59:28 -0000 1.4 @@ -1 +1 @@ -redet-8.23.tar.gz +redet-8.24.tar.gz Index: redet.spec =================================================================== RCS file: /cvs/pkgs/rpms/redet/F-8/redet.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- redet.spec 29 Nov 2007 16:01:37 -0000 1.2 +++ redet.spec 14 Jul 2008 02:59:28 -0000 1.3 @@ -5,16 +5,13 @@ Summary: Regular expression development and execution tool Name: redet -Version: 8.23 -Release: 3%{?dist} +Version: 8.24 +Release: 1%{?dist} License: GPLv3 Group: Development/Tools URL: http://www.billposer.org/Software/redet.html Source0: http://www.billposer.org/Software/Downloads/%{name}-%{version}.tar.gz Source1: %{name}.png -Source2: %{name}.desktop - -Patch0: %{name}-%{version}-xdg-utils.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -40,7 +37,6 @@ %prep %setup -q -%patch0 -p1 sed --expression \ 's|set NonBinPath \[file join /usr local share Redet\];|set NonBinPath \[file join %{_datadir} Redet\];|' redet.tcl > redet.tcl.tmp @@ -62,7 +58,7 @@ desktop-file-install %{?_remove_encoding} --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE2} + ./%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +95,10 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Sun Jul 13 2008 Debarshi Ray - 8.24-1 +- Version bump to 8.24. Closes Red Hat Bugzilla bug #447203. +- redet.desktop and xdg-open added by upstream. + * Sun Nov 25 2007 Debarshi Ray - 8.23-3 - Added 'BINDIR=...' in install stanza. - Fixed prep stanza to preserve timestamps and use RPM macros. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/redet/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Nov 2007 16:01:37 -0000 1.3 +++ sources 14 Jul 2008 02:59:28 -0000 1.4 @@ -1 +1 @@ -09812846ab653dacbb0adf2a61927fbf redet-8.23.tar.gz +9f615284c3af1ca2578ebb1f001f3e9f redet-8.24.tar.gz --- redet-8.23-xdg-utils.patch DELETED --- --- redet.desktop DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 03:00:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:00:26 GMT Subject: rpms/aubio - New directory Message-ID: <200807140300.m6E30QV6001094@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/aubio In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqX1036/rpms/aubio Log Message: Directory /cvs/extras/rpms/aubio added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 03:00:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:00:39 GMT Subject: rpms/aubio/devel - New directory Message-ID: <200807140300.m6E30dSn001114@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/aubio/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqX1036/rpms/aubio/devel Log Message: Directory /cvs/extras/rpms/aubio/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 03:00:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:00:51 GMT Subject: rpms/aubio Makefile,NONE,1.1 Message-ID: <200807140300.m6E30pNQ001137@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/aubio In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqX1036/rpms/aubio Added Files: Makefile Log Message: Setup of module aubio --- NEW FILE Makefile --- # Top level Makefile for module aubio all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 03:01:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:01:04 GMT Subject: rpms/aubio/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807140301.m6E314XF007100@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/aubio/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqX1036/rpms/aubio/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module aubio --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: aubio # $Id: Makefile,v 1.1 2008/07/14 03:00:51 kevin Exp $ NAME := aubio SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 03:02:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 03:02:53 +0000 Subject: [pkgdb] xfce4-mpc-plugin was added for cwickert Message-ID: <200807140302.m6E32riD002653@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xfce4-mpc-plugin with summary MPD client for the Xfce panel Kevin Fenzi (kevin) has approved Package xfce4-mpc-plugin Kevin Fenzi (kevin) has added a Fedora devel branch for xfce4-mpc-plugin with an owner of cwickert Kevin Fenzi (kevin) has approved xfce4-mpc-plugin in Fedora devel Kevin Fenzi (kevin) has approved Package xfce4-mpc-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-mpc-plugin (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-mpc-plugin (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-mpc-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-mpc-plugin From fedora-extras-commits at redhat.com Mon Jul 14 03:02:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 03:02:55 +0000 Subject: [pkgdb] xfce4-mpc-plugin (Fedora, 8) updated by kevin Message-ID: <200807140302.m6E32tak002672@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xfce4-mpc-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-mpc-plugin (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-mpc-plugin (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-mpc-plugin (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-mpc-plugin (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-mpc-plugin From fedora-extras-commits at redhat.com Mon Jul 14 03:02:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 03:02:55 +0000 Subject: [pkgdb] xfce4-mpc-plugin (Fedora, 9) updated by kevin Message-ID: <200807140302.m6E32tan002672@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for xfce4-mpc-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-mpc-plugin (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-mpc-plugin (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-mpc-plugin (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-mpc-plugin (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-mpc-plugin From fedora-extras-commits at redhat.com Mon Jul 14 03:02:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 03:02:56 +0000 Subject: [pkgdb] xfce4-mpc-plugin (Fedora, devel) updated by kevin Message-ID: <200807140302.m6E32taq002672@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-mpc-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-mpc-plugin From fedora-extras-commits at redhat.com Mon Jul 14 03:03:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:03:43 GMT Subject: rpms/xfce4-mpc-plugin - New directory Message-ID: <200807140303.m6E33hwE007978@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-mpc-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZj7943/rpms/xfce4-mpc-plugin Log Message: Directory /cvs/extras/rpms/xfce4-mpc-plugin added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 03:04:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:04:05 GMT Subject: rpms/xfce4-mpc-plugin/devel - New directory Message-ID: <200807140304.m6E345tj008000@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-mpc-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZj7943/rpms/xfce4-mpc-plugin/devel Log Message: Directory /cvs/extras/rpms/xfce4-mpc-plugin/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 03:04:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:04:26 GMT Subject: rpms/xfce4-mpc-plugin Makefile,NONE,1.1 Message-ID: <200807140304.m6E34QG2008029@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-mpc-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZj7943/rpms/xfce4-mpc-plugin Added Files: Makefile Log Message: Setup of module xfce4-mpc-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-mpc-plugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 03:04:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 03:04:42 GMT Subject: rpms/xfce4-mpc-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807140304.m6E34gNq008068@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-mpc-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZj7943/rpms/xfce4-mpc-plugin/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-mpc-plugin --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce4-mpc-plugin # $Id: Makefile,v 1.1 2008/07/14 03:04:26 kevin Exp $ NAME := xfce4-mpc-plugin SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 03:05:04 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 03:05:04 GMT Subject: rpms/redet/F-9 .cvsignore, 1.3, 1.4 redet.spec, 1.2, 1.3 sources, 1.3, 1.4 redet-8.23-xdg-utils.patch, 1.1, NONE redet.desktop, 1.2, NONE Message-ID: <200807140305.m6E354TQ008182@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/redet/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7998 Modified Files: .cvsignore redet.spec sources Removed Files: redet-8.23-xdg-utils.patch redet.desktop Log Message: * Sun Jul 13 2008 Debarshi Ray - 8.24-1 - Version bump to 8.24. Closes Red Hat Bugzilla bug #447203. - redet.desktop and xdg-open added by upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/redet/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Nov 2007 17:23:55 -0000 1.3 +++ .cvsignore 14 Jul 2008 03:04:06 -0000 1.4 @@ -1 +1 @@ -redet-8.23.tar.gz +redet-8.24.tar.gz Index: redet.spec =================================================================== RCS file: /cvs/pkgs/rpms/redet/F-9/redet.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- redet.spec 29 Nov 2007 17:23:55 -0000 1.2 +++ redet.spec 14 Jul 2008 03:04:06 -0000 1.3 @@ -5,16 +5,13 @@ Summary: Regular expression development and execution tool Name: redet -Version: 8.23 -Release: 3%{?dist} +Version: 8.24 +Release: 1%{?dist} License: GPLv3 Group: Development/Tools URL: http://www.billposer.org/Software/redet.html Source0: http://www.billposer.org/Software/Downloads/%{name}-%{version}.tar.gz Source1: %{name}.png -Source2: %{name}.desktop - -Patch0: %{name}-%{version}-xdg-utils.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -40,7 +37,6 @@ %prep %setup -q -%patch0 -p1 sed --expression \ 's|set NonBinPath \[file join /usr local share Redet\];|set NonBinPath \[file join %{_datadir} Redet\];|' redet.tcl > redet.tcl.tmp @@ -62,7 +58,7 @@ desktop-file-install %{?_remove_encoding} --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE2} + ./%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +95,10 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Sun Jul 13 2008 Debarshi Ray - 8.24-1 +- Version bump to 8.24. Closes Red Hat Bugzilla bug #447203. +- redet.desktop and xdg-open added by upstream. + * Sun Nov 25 2007 Debarshi Ray - 8.23-3 - Added 'BINDIR=...' in install stanza. - Fixed prep stanza to preserve timestamps and use RPM macros. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/redet/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Nov 2007 17:23:55 -0000 1.3 +++ sources 14 Jul 2008 03:04:06 -0000 1.4 @@ -1 +1 @@ -09812846ab653dacbb0adf2a61927fbf redet-8.23.tar.gz +9f615284c3af1ca2578ebb1f001f3e9f redet-8.24.tar.gz --- redet-8.23-xdg-utils.patch DELETED --- --- redet.desktop DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 03:10:18 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 03:10:18 GMT Subject: rpms/redet/devel .cvsignore, 1.3, 1.4 redet.spec, 1.2, 1.3 sources, 1.3, 1.4 redet-8.23-xdg-utils.patch, 1.1, NONE redet.desktop, 1.2, NONE Message-ID: <200807140310.m6E3AIlJ008464@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/redet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8416 Modified Files: .cvsignore redet.spec sources Removed Files: redet-8.23-xdg-utils.patch redet.desktop Log Message: * Sun Jul 13 2008 Debarshi Ray - 8.24-1 - Version bump to 8.24. Closes Red Hat Bugzilla bug #447203. - redet.desktop and xdg-open added by upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/redet/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Nov 2007 17:23:55 -0000 1.3 +++ .cvsignore 14 Jul 2008 03:09:17 -0000 1.4 @@ -1 +1 @@ -redet-8.23.tar.gz +redet-8.24.tar.gz Index: redet.spec =================================================================== RCS file: /cvs/pkgs/rpms/redet/devel/redet.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- redet.spec 29 Nov 2007 17:23:55 -0000 1.2 +++ redet.spec 14 Jul 2008 03:09:17 -0000 1.3 @@ -5,16 +5,13 @@ Summary: Regular expression development and execution tool Name: redet -Version: 8.23 -Release: 3%{?dist} +Version: 8.24 +Release: 1%{?dist} License: GPLv3 Group: Development/Tools URL: http://www.billposer.org/Software/redet.html Source0: http://www.billposer.org/Software/Downloads/%{name}-%{version}.tar.gz Source1: %{name}.png -Source2: %{name}.desktop - -Patch0: %{name}-%{version}-xdg-utils.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -40,7 +37,6 @@ %prep %setup -q -%patch0 -p1 sed --expression \ 's|set NonBinPath \[file join /usr local share Redet\];|set NonBinPath \[file join %{_datadir} Redet\];|' redet.tcl > redet.tcl.tmp @@ -62,7 +58,7 @@ desktop-file-install %{?_remove_encoding} --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE2} + ./%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +95,10 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Sun Jul 13 2008 Debarshi Ray - 8.24-1 +- Version bump to 8.24. Closes Red Hat Bugzilla bug #447203. +- redet.desktop and xdg-open added by upstream. + * Sun Nov 25 2007 Debarshi Ray - 8.23-3 - Added 'BINDIR=...' in install stanza. - Fixed prep stanza to preserve timestamps and use RPM macros. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/redet/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Nov 2007 17:23:55 -0000 1.3 +++ sources 14 Jul 2008 03:09:17 -0000 1.4 @@ -1 +1 @@ -09812846ab653dacbb0adf2a61927fbf redet-8.23.tar.gz +9f615284c3af1ca2578ebb1f001f3e9f redet-8.24.tar.gz --- redet-8.23-xdg-utils.patch DELETED --- --- redet.desktop DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 03:31:23 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Mon, 14 Jul 2008 03:31:23 GMT Subject: rpms/scim-python/F-9 .cvsignore, 1.11, 1.12 scim-python.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200807140331.m6E3VNn6009392@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim-python/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9334 Modified Files: .cvsignore scim-python.spec sources Log Message: Update to 0.1.13rc1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 14 May 2008 07:00:48 -0000 1.11 +++ .cvsignore 14 Jul 2008 03:30:34 -0000 1.12 @@ -1,6 +1,6 @@ -scim-python-0.1.12.tar.gz pinyin-database-0.1.10.5.tar.bz2 xingma-cangjie5-0.1.10.1.tar.bz2 xingma-erbi-qingsong-0.1.10.1.tar.bz2 xingma-wubi86-0.1.10.1.tar.bz2 xingma-zhengma-0.1.10.1.tar.bz2 +scim-python-0.1.13rc1.tar.gz Index: scim-python.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/F-9/scim-python.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scim-python.spec 14 May 2008 07:00:48 -0000 1.17 +++ scim-python.spec 14 Jul 2008 03:30:34 -0000 1.18 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define mod_path scim-0.1 Name: scim-python -Version: 0.1.12 +Version: 0.1.13rc1 Release: 1%{?dist} Summary: Python language binding for Smart Common Input Method platform @@ -208,6 +208,9 @@ %changelog +* Mon Jul 14 2008 Huang Peng - 0.1.13rc1-1 +- Update to 0.1.13rc1. + * Wed May 14 2008 Huang Peng - 0.1.12-1 - Update to 0.1.12. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 14 May 2008 07:00:48 -0000 1.11 +++ sources 14 Jul 2008 03:30:34 -0000 1.12 @@ -3,4 +3,4 @@ 9fee870c92f174d0d3fce31513e20b96 xingma-erbi-qingsong-0.1.10.1.tar.bz2 016146c4683e7b250a9738c08a9a7f1f xingma-wubi86-0.1.10.1.tar.bz2 8adb3e43fe3c898caeaaf5146eaa3e94 xingma-zhengma-0.1.10.1.tar.bz2 -a5d652f25df1e7e088484cb89b9df56d scim-python-0.1.12.tar.gz +d3b21df185b88a2100c2eee0007bc2cd scim-python-0.1.13rc1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 03:51:50 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Mon, 14 Jul 2008 03:51:50 GMT Subject: rpms/scim-python/devel .cvsignore, 1.11, 1.12 scim-python.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200807140351.m6E3poHV010275@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10206 Modified Files: .cvsignore scim-python.spec sources Log Message: Update to 0.1.13rc1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 14 May 2008 06:33:10 -0000 1.11 +++ .cvsignore 14 Jul 2008 03:51:04 -0000 1.12 @@ -1,6 +1,6 @@ -scim-python-0.1.12.tar.gz pinyin-database-0.1.10.5.tar.bz2 xingma-cangjie5-0.1.10.1.tar.bz2 xingma-erbi-qingsong-0.1.10.1.tar.bz2 xingma-wubi86-0.1.10.1.tar.bz2 xingma-zhengma-0.1.10.1.tar.bz2 +scim-python-0.1.13rc1.tar.gz Index: scim-python.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/devel/scim-python.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scim-python.spec 14 May 2008 06:33:10 -0000 1.17 +++ scim-python.spec 14 Jul 2008 03:51:04 -0000 1.18 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define mod_path scim-0.1 Name: scim-python -Version: 0.1.12 +Version: 0.1.13rc1 Release: 1%{?dist} Summary: Python language binding for Smart Common Input Method platform @@ -208,6 +208,9 @@ %changelog +* Mon Jul 14 2008 Huang Peng - 0.1.13rc1-1 +- Update to 0.1.13rc1. + * Wed May 14 2008 Huang Peng - 0.1.12-1 - Update to 0.1.12. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 14 May 2008 06:33:10 -0000 1.11 +++ sources 14 Jul 2008 03:51:04 -0000 1.12 @@ -3,4 +3,4 @@ 9fee870c92f174d0d3fce31513e20b96 xingma-erbi-qingsong-0.1.10.1.tar.bz2 016146c4683e7b250a9738c08a9a7f1f xingma-wubi86-0.1.10.1.tar.bz2 8adb3e43fe3c898caeaaf5146eaa3e94 xingma-zhengma-0.1.10.1.tar.bz2 -a5d652f25df1e7e088484cb89b9df56d scim-python-0.1.12.tar.gz +d3b21df185b88a2100c2eee0007bc2cd scim-python-0.1.13rc1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 04:00:13 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Mon, 14 Jul 2008 04:00:13 GMT Subject: rpms/scim-python/F-8 .cvsignore, 1.9, 1.10 scim-python.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200807140400.m6E40D11010599@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim-python/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10527 Modified Files: .cvsignore scim-python.spec sources Log Message: Update to 0.1.13rc1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/F-8/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 May 2008 07:40:11 -0000 1.9 +++ .cvsignore 14 Jul 2008 03:59:16 -0000 1.10 @@ -1,6 +1,6 @@ -scim-python-0.1.12.tar.gz pinyin-database-0.1.10.5.tar.bz2 xingma-cangjie5-0.1.10.1.tar.bz2 xingma-erbi-qingsong-0.1.10.1.tar.bz2 xingma-wubi86-0.1.10.1.tar.bz2 xingma-zhengma-0.1.10.1.tar.bz2 +scim-python-0.1.13rc1.tar.gz Index: scim-python.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/F-8/scim-python.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scim-python.spec 14 May 2008 07:40:11 -0000 1.13 +++ scim-python.spec 14 Jul 2008 03:59:16 -0000 1.14 @@ -2,7 +2,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define mod_path scim-0.1 Name: scim-python -Version: 0.1.12 +Version: 0.1.13rc1 Release: 1%{?dist} Summary: Python language binding for Smart Common Input Method platform @@ -208,6 +208,9 @@ %changelog +* Mon Jul 14 2008 Huang Peng - 0.1.13rc1-1 +- Update to 0.1.13rc1. + * Wed May 14 2008 Huang Peng - 0.1.12-1 - Update to 0.1.12. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-python/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 14 May 2008 07:40:11 -0000 1.10 +++ sources 14 Jul 2008 03:59:16 -0000 1.11 @@ -3,4 +3,4 @@ 9fee870c92f174d0d3fce31513e20b96 xingma-erbi-qingsong-0.1.10.1.tar.bz2 016146c4683e7b250a9738c08a9a7f1f xingma-wubi86-0.1.10.1.tar.bz2 8adb3e43fe3c898caeaaf5146eaa3e94 xingma-zhengma-0.1.10.1.tar.bz2 -a5d652f25df1e7e088484cb89b9df56d scim-python-0.1.12.tar.gz +d3b21df185b88a2100c2eee0007bc2cd scim-python-0.1.13rc1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 04:03:27 2008 From: fedora-extras-commits at redhat.com (Jonathan Dieter (jdieter)) Date: Mon, 14 Jul 2008 04:03:27 GMT Subject: rpms/deltarpm/devel deltarpm.spec,1.12,1.13 Message-ID: <200807140403.m6E43RFe017498@cvs-int.fedora.redhat.com> Author: jdieter Update of /cvs/extras/rpms/deltarpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17329 Modified Files: deltarpm.spec Log Message: Rebuild for rpm 4.6 Index: deltarpm.spec =================================================================== RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- deltarpm.spec 19 Feb 2008 06:10:23 -0000 1.12 +++ deltarpm.spec 14 Jul 2008 04:02:25 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Create deltas between rpms Name: deltarpm Version: 3.4 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD Group: System Environment/Base URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html @@ -55,6 +55,9 @@ %{_bindir}/rpmdumpheader %changelog +* Sun Jul 13 2008 Jonathan Dieter - 3.4-11 +- Rebuild for rpm 4.6 + * Tue Feb 19 2008 Fedora Release Engineering - 3.4-10 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 04:28:02 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 14 Jul 2008 04:28:02 GMT Subject: rpms/pgadmin3/devel pgadmin3-1.8.4-optflags.patch, NONE, 1.1 pgadmin3.spec, 1.21, 1.22 Message-ID: <200807140428.m6E4S2bi019338@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/pgadmin3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19182 Modified Files: pgadmin3.spec Added Files: pgadmin3-1.8.4-optflags.patch Log Message: * Mon Jul 14 2008 Ville Skytt?? - 1.8.4-2 - Use $RPM_OPT_FLAGS, build with dependency tracking disabled (#229054). pgadmin3-1.8.4-optflags.patch: --- NEW FILE pgadmin3-1.8.4-optflags.patch --- diff -up pgadmin3-1.8.4/configure~ pgadmin3-1.8.4/configure --- pgadmin3-1.8.4/configure~ 2008-06-04 11:20:25.000000000 +0300 +++ pgadmin3-1.8.4/configure 2008-07-09 21:58:35.000000000 +0300 @@ -6932,11 +6932,6 @@ echo "${ECHO_T}ok" >&6; } - # CFLAGS/CXXFLAGS may well contain unwanted settings, so clear them. - CFLAGS="" - CXXFLAGS="" - - ac_config_files="$ac_config_files Makefile branding/Makefile i18n/Makefile pgadmin/Makefile pkg/Makefile pkg/debian/Makefile pkg/mac/Makefile pkg/mandrake/Makefile pkg/redhat/Makefile pkg/slackware/Makefile pkg/src/Makefile pkg/suse/Makefile pkg/win32/Makefile xtra/Makefile xtra/pgaevent/Makefile xtra/pgagent/Makefile xtra/wx-build/Makefile" cat >confcache <<\_ACEOF diff -up pgadmin3-1.8.4/configure.ac~ pgadmin3-1.8.4/configure.ac --- pgadmin3-1.8.4/configure.ac~ 2008-06-04 11:20:19.000000000 +0300 +++ pgadmin3-1.8.4/configure.ac 2008-07-09 21:58:16.000000000 +0300 @@ -58,8 +58,6 @@ CHECK_LIBXML2 LOCATE_LIBXSLT SETUP_LIBXSLT -CLEANUP - AC_CONFIG_FILES([Makefile branding/Makefile i18n/Makefile Index: pgadmin3.spec =================================================================== RCS file: /cvs/pkgs/rpms/pgadmin3/devel/pgadmin3.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pgadmin3.spec 4 Jun 2008 19:18:10 -0000 1.21 +++ pgadmin3.spec 14 Jul 2008 04:26:31 -0000 1.22 @@ -1,10 +1,11 @@ Summary: Graphical client for PostgreSQL Name: pgadmin3 Version: 1.8.4 -Release: 1%{?dist} +Release: 2%{?dist} License: Artistic Group: Applications/Databases Source: ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz +Patch0: %{name}-1.8.4-optflags.patch URL: http://www.pgadmin.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel postgresql-devel desktop-file-utils openssl-devel libxml2-devel libxslt-devel @@ -38,10 +39,14 @@ %prep %setup -q +# touch to avoid autotools re-run +for f in configure{,.ac} ; do touch -r $f $f.stamp ; done +%patch0 -p1 +for f in configure{,.ac} ; do touch -r $f.stamp $f ; done %build export LIBS="-lwx_gtk2u_core-2.8" -%configure --disable-debug --with-wx-version=2.8 --with-wx=/usr +%configure --disable-debug --disable-dependency-tracking --with-wx-version=2.8 --with-wx=%{_prefix} make %{?_smp_mflags} all %install @@ -74,6 +79,9 @@ %doc docs/* %changelog +* Mon Jul 14 2008 Ville Skytt?? - 1.8.4-2 +- Use $RPM_OPT_FLAGS, build with dependency tracking disabled (#229054). + * Wed Jun 4 2008 Devrim GUNDUZ 1.8.4-1 - Update to 1.8.4 From fedora-extras-commits at redhat.com Mon Jul 14 04:40:48 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 14 Jul 2008 04:40:48 GMT Subject: rpms/aubio/devel aubio.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807140440.m6E4emek020756@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/aubio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18606/devel Modified Files: .cvsignore sources Added Files: aubio.spec import.log Log Message: Initial import --- NEW FILE aubio.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: aubio Version: 0.3.2 Release: 3%{?dist} Summary: An audio labelling library Group: System Environment/Libraries License: GPLv2+ URL: http://aubio.org/ Source0: http://aubio.org/pub/aubio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsndfile-devel libsamplerate-devel fftw-devel BuildRequires: lash-devel jack-audio-connection-kit-devel %description aubio is a library for audio labelling. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio. The name aubio comes from 'audio' with a typo: several transcription errors are likely to be found in the results too. The aim of this project is to provide these automatic labelling features to other audio softwares. Functions can be used offline in sound editors and software samplers, or online in audio effects and virtual instruments. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %package python Summary: Python language bindings for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: python BuildRequires: python swig %description python The %{name}-python package contains the Python language bindings for %{name}. %prep %setup -q %build %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' rm -f $RPM_BUILD_ROOT%{_infodir}/dir # Move everything to sitearch... if [ %{python_sitearch} != %{python_sitelib} ]; then mkdir -p $RPM_BUILD_ROOT%{python_sitearch} mv $RPM_BUILD_ROOT%{python_sitelib}/%{name} $RPM_BUILD_ROOT%{python_sitearch} fi %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README THANKS %{_libdir}/*.so.* %{_bindir}/* %{_datadir}/sounds/%{name} %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %{_includedir}/aubio %files python %defattr(-,root,root,-) %{python_sitearch}/%{name} %changelog * Sun Jul 13 2008 Anthony Green 0.3.2-3 - Fix python package installation. * Sun Jul 13 2008 Anthony Green 0.3.2-2 - Untabify. - Don't use rpath. - Add python subpackage. * Thu Jul 10 2008 Anthony Green 0.3.2-1 - Created. --- NEW FILE import.log --- aubio-0_3_2-3_fc9:HEAD:aubio-0.3.2-3.fc9.src.rpm:1216008910 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/aubio/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 03:00:51 -0000 1.1 +++ .cvsignore 14 Jul 2008 04:40:04 -0000 1.2 @@ -0,0 +1 @@ +aubio-0.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aubio/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 03:00:51 -0000 1.1 +++ sources 14 Jul 2008 04:40:04 -0000 1.2 @@ -0,0 +1 @@ +ffc3e5e4880fec67064f043252263a44 aubio-0.3.2.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 04:56:27 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 14 Jul 2008 04:56:27 GMT Subject: rpms/aubio/devel aubio.spec,1.1,1.2 Message-ID: <200807140456.m6E4uR4c021644@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/aubio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21612 Modified Files: aubio.spec Log Message: BuildRequire python-devel Index: aubio.spec =================================================================== RCS file: /cvs/pkgs/rpms/aubio/devel/aubio.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aubio.spec 14 Jul 2008 04:40:04 -0000 1.1 +++ aubio.spec 14 Jul 2008 04:55:34 -0000 1.2 @@ -4,7 +4,7 @@ Name: aubio Version: 0.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An audio labelling library Group: System Environment/Libraries @@ -15,6 +15,7 @@ BuildRequires: libsndfile-devel libsamplerate-devel fftw-devel BuildRequires: lash-devel jack-audio-connection-kit-devel +BuildRequires: python-devel %description aubio is a library for audio labelling. Its features include @@ -97,6 +98,9 @@ %{python_sitearch}/%{name} %changelog +* Sun Jul 13 2008 Anthony Green 0.3.2-4 +- BuildRequire python-devel. + * Sun Jul 13 2008 Anthony Green 0.3.2-3 - Fix python package installation. From fedora-extras-commits at redhat.com Mon Jul 14 06:20:26 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 14 Jul 2008 06:20:26 GMT Subject: rpms/ardour/devel .cvsignore, 1.6, 1.7 ardour.script, 1.2, 1.3 ardour.spec, 1.15, 1.16 sources, 1.6, 1.7 ardour-2.4-gcc43.patch, 1.1, NONE ardour-session.cc-_total_free_4k_blocks.patch, 1.1, NONE Message-ID: <200807140620.m6E6KQTE006292@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/ardour/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6241 Modified Files: .cvsignore ardour.script ardour.spec sources Removed Files: ardour-2.4-gcc43.patch ardour-session.cc-_total_free_4k_blocks.patch Log Message: Upgrade to 2.5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ardour/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 Apr 2008 12:48:05 -0000 1.6 +++ .cvsignore 14 Jul 2008 06:19:44 -0000 1.7 @@ -1 +1 @@ -ardour-2.4.1.tar.bz2 +ardour-2.5.tar.bz2 --- ardour-2.4-gcc43.patch DELETED --- --- ardour-session.cc-_total_free_4k_blocks.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 06:21:03 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 14 Jul 2008 06:21:03 GMT Subject: rpms/ardour/devel ardour-2.5-gcc43.patch,NONE,1.1 Message-ID: <200807140621.m6E6L3JL006338@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/ardour/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6309 Added Files: ardour-2.5-gcc43.patch Log Message: Upgrade to 2.5. ardour-2.5-gcc43.patch: --- NEW FILE ardour-2.5-gcc43.patch --- --- libs/surfaces/tranzport/screen.cc~ 2008-04-18 06:54:21.000000000 -0700 +++ libs/surfaces/tranzport/screen.cc 2008-07-13 22:19:39.000000000 -0700 @@ -19,6 +19,7 @@ * */ #include +#include void TranzportControlProtocol::screen_clear () From fedora-extras-commits at redhat.com Mon Jul 14 06:33:52 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 14 Jul 2008 06:33:52 GMT Subject: rpms/python-slip/devel import.log, NONE, 1.1 python-slip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807140633.m6E6Xq7w007191@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/python-slip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7123/devel Modified Files: .cvsignore sources Added Files: import.log python-slip.spec Log Message: initial import --- NEW FILE import.log --- python-slip-0_1_3-1_fc9:HEAD:python-slip-0.1.3-1.fc9.src.rpm:1216017180 --- NEW FILE python-slip.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} %{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")} Name: python-slip Version: 0.1.3 Release: 1%{?dist} Summary: Miscellaneous convenience, extension and workaround code for Python Group: System Environment/Libraries License: GPLv2+ URL: http://nphilipp.fedorapeople.org/python-slip/ Source0: http://nphilipp.fedorapeople.org/python-slip/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python BuildRequires: python-devel %description The Simple Library for Python packages contain miscellaneous code for convenience, extension and workaround purposes. This package provides the "slip" base module. %package dbus Summary: Convenience functions for dbus-activated services Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: dbus-python >= 0.80 %description dbus The Simple Library for Python packages contain miscellaneous code for convenience, extension and workaround purposes. This package provides slip.dbus.service.TimeoutObject, a dbus.service.Object derivative that ends itself after a certain time without being used and/or if there are no clients anymore on the message bus. %package gtk Summary: Code to make auto-wrapping gtk labels Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pygtk2 %description gtk The Simple Library for Python packages contain miscellaneous code for convenience, extension and workaround purposes. This package provides slip.gtk.set_autowrap(), a convenience function which lets gtk labels be automatically re-wrapped upon resizing. %prep %setup -q %build make %{?_smp_mflags} %install rm -rf %buildroot make install DESTDIR=%buildroot %clean rm -rf %buildroot %files %defattr(-,root,root,-) %doc COPYING %dir %{python_sitelib}/slip/ %{python_sitelib}/slip/__init__.py* %{python_sitelib}/slip-%{version}-py%{python_version}.egg-info %files dbus %defattr(-,root,root,-) %doc slip/dbus/README slip/dbus/examples %{python_sitelib}/slip/dbus %{python_sitelib}/slip.dbus-%{version}-py%{python_version}.egg-info %files gtk %defattr(-,root,root,-) %{python_sitelib}/slip/gtk %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info %changelog * Fri Jul 11 2008 Nils Philippsen - 0.1.3 - BR: python-devel * Fri Jul 11 2008 Nils Philippsen - 0.1.2 - fix more inconsistent tabs/spaces * Fri Jul 11 2008 Nils Philippsen - 0.1.1 - fix inconsistent tabs/spaces * Tue May 27 2008 Nils Philippsen - 0.1 - move gtk.py -> gtk/__init__.py - rename gtk.set_autowrap () -> gtk.label_autowrap () * Mon May 26 2008 Nils Philippsen - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2008 16:24:58 -0000 1.1 +++ .cvsignore 14 Jul 2008 06:32:58 -0000 1.2 @@ -0,0 +1 @@ +python-slip-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2008 16:24:58 -0000 1.1 +++ sources 14 Jul 2008 06:32:58 -0000 1.2 @@ -0,0 +1 @@ +d23e9acc1bbebeeeff7055c830a9fea7 python-slip-0.1.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 06:34:59 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Mon, 14 Jul 2008 06:34:59 GMT Subject: rpms/lxpanel/F-9 .cvsignore, 1.7, 1.8 lxpanel.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200807140634.m6E6YxuE007309@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/lxpanel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7236 Modified Files: .cvsignore lxpanel.spec sources Log Message: sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Jun 2008 07:50:16 -0000 1.7 +++ .cvsignore 14 Jul 2008 06:34:09 -0000 1.8 @@ -1 +1 @@ -lxpanel-0.3.7.tar.gz +lxpanel-0.3.8.1.tar.gz Index: lxpanel.spec =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-9/lxpanel.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lxpanel.spec 17 Jun 2008 07:50:16 -0000 1.11 +++ lxpanel.spec 14 Jul 2008 06:34:09 -0000 1.12 @@ -2,7 +2,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=219930 Name: lxpanel -Version: 0.3.7 +Version: 0.3.8.1 Release: 1%{?dist} Summary: A lightweight X11 desktop panel @@ -14,8 +14,13 @@ Patch2: lxpanel-0.2.8-manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel libXpm-devel libXmu-devel gettext startup-notification-devel BuildRequires: docbook-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: libXmu-devel +BuildRequires: libXpm-devel +BuildRequires: startup-notification-devel %description lxpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM @@ -51,6 +56,13 @@ %{_mandir}/man1/lxpanel* %changelog +* Tue Jul 08 2008 Sebastian Vahl 0.3.8.1-1 +- new upstream version: 0.3.8.1 + +* Fri Jul 04 2008 Sebastian Vahl 0.3.8-1 +- new upstream version: 0.3.8 +- new BR in this version: intltool + * Sun Jun 15 2008 Sebastian Vahl 0.3.7-1 - new upstream version: 0.3.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Jun 2008 07:50:16 -0000 1.7 +++ sources 14 Jul 2008 06:34:09 -0000 1.8 @@ -1 +1 @@ -9a963d2e8b1ce9da70d2bb3c3aa61297 lxpanel-0.3.7.tar.gz +18b03bd5556d14b8bd1adf00f4e95574 lxpanel-0.3.8.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 06:43:47 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Mon, 14 Jul 2008 06:43:47 GMT Subject: rpms/cman/F-9 .cvsignore, 1.29, 1.30 cman.spec, 1.106, 1.107 sources, 1.38, 1.39 Message-ID: <200807140643.m6E6hlgL008103@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cman/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7995 Modified Files: .cvsignore cman.spec sources Log Message: New stable upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cman/F-9/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 10 Jun 2008 09:38:01 -0000 1.29 +++ .cvsignore 14 Jul 2008 06:43:01 -0000 1.30 @@ -1 +1 @@ -cluster-2.03.04.tar.gz +cluster-2.03.05.tar.gz Index: cman.spec =================================================================== RCS file: /cvs/pkgs/rpms/cman/F-9/cman.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- cman.spec 3 Jul 2008 11:47:36 -0000 1.106 +++ cman.spec 14 Jul 2008 06:43:01 -0000 1.107 @@ -18,9 +18,9 @@ Name: cman Summary: CMAN - The Cluster Manager -Version: 2.03.04 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} -License: GPLv2+ and LGPLv2+ +Version: 2.03.05 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} +License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz @@ -29,7 +29,7 @@ Requires(preun): chkconfig Requires: openais >= 0.80.3-17 openais < 0.81 Requires: sg3_utils OpenIPMI telnet openssh-clients -Requires: pexpect net-snmp-utils +Requires: pexpect net-snmp-utils pyOpenSSL ## Setup/build bits @@ -116,7 +116,7 @@ %files -n cman %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries doc/* +%doc doc/* %dir %{_sysconfdir}/cluster %{_sysconfdir}/rc.d/init.d/cman %{_sysconfdir}/rc.d/init.d/qdiskd @@ -159,9 +159,12 @@ CMAN - The Cluster Manager development package %changelog -* Thu Jul 3 Fabio M. Di Nitto - 2.03.04-2 -- cman Requires: pexpect and net-snmp-utils for fence agents. - Thanks to sendro on IRC for spotting the issue. +* Mon Jul 14 2008 Fabio M. Di Nitto - 2.03.05-1 +- New upstream release +- Cleanup installed doc after upstream +- cman Requires: pyOpenSSL for new lpar fence agent +- cman Requires: pexpect and net-snmp-utils for fence agents + Thanks to sendro on IRC for spotting the issue * Tue Jun 10 2008 Fabio M. Di Nitto - 2.03.04-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cman/F-9/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 10 Jun 2008 09:38:01 -0000 1.38 +++ sources 14 Jul 2008 06:43:01 -0000 1.39 @@ -1 +1 @@ -0d9ff0117a8061f19e0ed01da6df0794 cluster-2.03.04.tar.gz +b1bbd928d21e47ffff2417809f9016ca cluster-2.03.05.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 06:52:18 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Mon, 14 Jul 2008 06:52:18 GMT Subject: rpms/gdb/devel gdb.spec,1.296,1.297 Message-ID: <200807140652.m6E6qIRE009081@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8964 Modified Files: gdb.spec Log Message: * Mon Jul 14 2008 Jan Kratochvil - 6.8-16 - Rebuild with the new rpm-4.5.90 in the buildroot. Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- gdb.spec 12 Jul 2008 07:02:33 -0000 1.296 +++ gdb.spec 14 Jul 2008 06:51:26 -0000 1.297 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 15%{?_with_upstream:.upstream}%{?dist} +Release: 16%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -832,6 +832,9 @@ %endif %changelog +* Mon Jul 14 2008 Jan Kratochvil - 6.8-16 +- Rebuild with the new rpm-4.5.90 in the buildroot. + * Sat Jul 12 2008 Jan Kratochvil - 6.8-15 - Temporary rpm-4.5.90 compatibility workaround by Panu Matilainen. - Fix a regression in the constant watchpoints fix, found by Daniel Jacobowitz. From fedora-extras-commits at redhat.com Mon Jul 14 06:53:19 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Mon, 14 Jul 2008 06:53:19 GMT Subject: rpms/gfs2-utils/F-9 .cvsignore, 1.14, 1.15 gfs2-utils.spec, 1.24, 1.25 sources, 1.15, 1.16 Message-ID: <200807140653.m6E6rJ9D009260@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/gfs2-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9072 Modified Files: .cvsignore gfs2-utils.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 11 Jun 2008 07:01:24 -0000 1.14 +++ .cvsignore 14 Jul 2008 06:52:21 -0000 1.15 @@ -1 +1 @@ -cluster-2.03.04.tar.gz +cluster-2.03.05.tar.gz Index: gfs2-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/gfs2-utils.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gfs2-utils.spec 11 Jun 2008 07:01:24 -0000 1.24 +++ gfs2-utils.spec 14 Jul 2008 06:52:21 -0000 1.25 @@ -11,7 +11,7 @@ ############################################################################### Name: gfs2-utils -Version: 2.03.04 +Version: 2.03.05 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Kernel @@ -67,12 +67,16 @@ %files %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries +%doc doc/* %{_sysconfdir}/rc.d/init.d/gfs2 /sbin/* %{_mandir}/man8/*gfs2* %changelog +* Mon Jul 14 2008 Fabio M. Di Nitto - 2.03.05-1 +- New upstream release +- Cleanup installed doc after upstream + * Wed Jun 11 2008 Fabio M. Di Nitto 2.03.04-1 - New upstream release - Resolves: #446995 #318271 #447378 #445662 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Jun 2008 07:01:24 -0000 1.15 +++ sources 14 Jul 2008 06:52:21 -0000 1.16 @@ -1 +1 @@ -0d9ff0117a8061f19e0ed01da6df0794 cluster-2.03.04.tar.gz +b1bbd928d21e47ffff2417809f9016ca cluster-2.03.05.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 06:57:17 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Mon, 14 Jul 2008 06:57:17 GMT Subject: rpms/uim/devel uim.spec,1.62,1.63 Message-ID: <200807140657.m6E6vHkv009568@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9509 Modified Files: uim.spec Log Message: * Mon Jul 14 2008 Akira TAGOH - 1.5.0-3 - Add missing files. (#454957) Index: uim.spec =================================================================== RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- uim.spec 6 Jun 2008 00:21:33 -0000 1.62 +++ uim.spec 14 Jul 2008 06:56:11 -0000 1.63 @@ -3,7 +3,7 @@ Name: uim Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?dist} # uim itself is licensed under BSD # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h} # and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+ @@ -255,6 +255,8 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}/sigscheme rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm +rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/kde3/uim_panelapplet.* +rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/kicker/applets/uimapplet.desktop install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf @@ -358,8 +360,8 @@ %{_bindir}/uim-xim %{_libdir}/lib*.so.* %{_datadir}/uim/helperdata -%ghost %verify(not md5 size mtime) %{_datadir}/uim/installed-modules.scm -%ghost %verify(not md5 size mtime) %{_datadir}/uim/loader.scm +%verify(not md5 size mtime) %{_datadir}/uim/installed-modules.scm +%verify(not md5 size mtime) %{_datadir}/uim/loader.scm %exclude %{_datadir}/uim/anthy*.scm %exclude %{_datadir}/uim/canna*.scm %exclude %{_datadir}/uim/m17nlib.scm @@ -500,6 +502,9 @@ %dir %{_datadir}/uim %changelog +* Mon Jul 14 2008 Akira TAGOH - 1.5.0-3 +- Add missing files. (#454957) + * Wed Jun 4 2008 Akira TAGOH - 1.5.0-2 - Obsoletes uim-el and uim-el-common. From fedora-extras-commits at redhat.com Mon Jul 14 07:01:37 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Mon, 14 Jul 2008 07:01:37 GMT Subject: rpms/rgmanager/F-9 .cvsignore, 1.16, 1.17 rgmanager.spec, 1.46, 1.47 sources, 1.25, 1.26 Message-ID: <200807140701.m6E71bDZ016632@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/rgmanager/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9934 Modified Files: .cvsignore rgmanager.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rgmanager/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 11 Jun 2008 07:42:09 -0000 1.16 +++ .cvsignore 14 Jul 2008 07:00:46 -0000 1.17 @@ -1 +1 @@ -cluster-2.03.04.tar.gz +cluster-2.03.05.tar.gz Index: rgmanager.spec =================================================================== RCS file: /cvs/pkgs/rpms/rgmanager/F-9/rgmanager.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- rgmanager.spec 11 Jun 2008 07:42:09 -0000 1.46 +++ rgmanager.spec 14 Jul 2008 07:00:46 -0000 1.47 @@ -12,7 +12,7 @@ Name: rgmanager Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux -Version: 2.03.04 +Version: 2.03.05 Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -71,7 +71,7 @@ %files %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries rgmanager/README rgmanager/errors.txt +%doc doc/* rgmanager/README rgmanager/errors.txt %{_sysconfdir}/rc.d/init.d/rgmanager /usr/sbin/clu* /usr/sbin/rg_test @@ -79,6 +79,10 @@ %{_mandir}/man8/clu* %changelog +* Mon Jul 14 2008 Fabio M. Di Nitto - 2.03.05-1 +- New upstream release +- Cleanup installed doc after upstream + * Wed Jun 11 2008 Fabio M. Di Nitto 2.03.04-1 - New upstream release - Resolves: #446995 #318271 #447378 #445662 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rgmanager/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 11 Jun 2008 07:42:09 -0000 1.25 +++ sources 14 Jul 2008 07:00:46 -0000 1.26 @@ -1 +1 @@ -0d9ff0117a8061f19e0ed01da6df0794 cluster-2.03.04.tar.gz +b1bbd928d21e47ffff2417809f9016ca cluster-2.03.05.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 07:06:36 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Mon, 14 Jul 2008 07:06:36 GMT Subject: rpms/uim/devel uim.spec,1.63,1.64 Message-ID: <200807140706.m6E76a45017560@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17408 Modified Files: uim.spec Log Message: * Mon Jul 14 2008 Akira TAGOH - 1.5.0-3 - Add missing files. (#454957) Index: uim.spec =================================================================== RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- uim.spec 14 Jul 2008 06:56:11 -0000 1.63 +++ uim.spec 14 Jul 2008 07:05:36 -0000 1.64 @@ -265,6 +265,11 @@ install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/ +cp -a fep/README fep/README.fep +cp -a fep/README.ja fep/README.fep.ja +cp -a fep/README.key fep/README.fep.key +cp -a xim/README xim/README.xim + install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/uim touch $RPM_BUILD_ROOT%{_localstatedir}/lib/uim/{installed-modules,loader}.scm ln -sf %{_localstatedir}/lib/uim/installed-modules.scm $RPM_BUILD_ROOT%{_datadir}/uim/ @@ -349,7 +354,8 @@ %files -f %{name}.lang %defattr (-, root, root, -) -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS COPYING ChangeLog* NEWS README fep/README.fep fep/README.fep.key xim/README.xim +%lang(ja) fep/README.fep.ja %dir %{_libdir}/uim %dir %{_libdir}/uim/plugin %dir %{_datadir}/uim @@ -422,7 +428,8 @@ %files qt %defattr (-, root, root, -) -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS COPYING ChangeLog* NEWS qt4/immodule/README.en +%lang(ja) %doc qt4/immodule/README.ja %{_libdir}/qt4/plugins/inputmethods/libuiminputcontextplugin.so %files qt3 From fedora-extras-commits at redhat.com Mon Jul 14 07:43:08 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Mon, 14 Jul 2008 07:43:08 GMT Subject: rpms/nautilus/F-9 .cvsignore, 1.73, 1.74 nautilus.spec, 1.206, 1.207 sources, 1.77, 1.78 Message-ID: <200807140743.m6E7h805020594@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20542 Modified Files: .cvsignore nautilus.spec sources Log Message: * Mon Jul 14 2008 Tomas Bzatek - 2.22.5.1-1 - Update to 2.22.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-9/.cvsignore,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- .cvsignore 1 Jul 2008 18:07:06 -0000 1.73 +++ .cvsignore 14 Jul 2008 07:42:23 -0000 1.74 @@ -1 +1 @@ -nautilus-2.22.4.tar.bz2 +nautilus-2.22.5.1.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-9/nautilus.spec,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- nautilus.spec 1 Jul 2008 21:44:21 -0000 1.206 +++ nautilus.spec 14 Jul 2008 07:42:23 -0000 1.207 @@ -18,7 +18,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME -Version: 2.22.4 +Version: 2.22.5.1 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -245,6 +245,9 @@ %{_libdir}/*.so %changelog +* Mon Jul 14 2008 Tomas Bzatek - 2.22.5.1-1 +- Update to 2.22.5.1 + * Tue Jul 1 2008 Matthias Clasen - 2.22.4-1 - Update to 2.22.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-9/sources,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- sources 1 Jul 2008 18:07:06 -0000 1.77 +++ sources 14 Jul 2008 07:42:23 -0000 1.78 @@ -1 +1 @@ -e89bc92139b21ea3a69fb702ddf4562c nautilus-2.22.4.tar.bz2 +a63596ca4cccddc970d695d62c05154a nautilus-2.22.5.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 07:52:18 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 14 Jul 2008 07:52:18 GMT Subject: rpms/kernel/devel kernel.spec, 1.759, 1.760 linux-2.6-ptrace-cleanup.patch, 1.2, 1.3 linux-2.6-tracehook.patch, 1.2, 1.3 linux-2.6-utrace.patch, 1.80, 1.81 Message-ID: <200807140752.m6E7qIaK021486@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21410 Modified Files: kernel.spec linux-2.6-ptrace-cleanup.patch linux-2.6-tracehook.patch linux-2.6-utrace.patch Log Message: utrace update Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- kernel.spec 14 Jul 2008 00:33:14 -0000 1.759 +++ kernel.spec 14 Jul 2008 07:51:15 -0000 1.760 @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 14 2008 Roland McGrath +- utrace update + * Sun Jul 13 2008 Kyle McMartin - Linux 2.6.26 linux-2.6-ptrace-cleanup.patch: Index: linux-2.6-ptrace-cleanup.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ptrace-cleanup.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-ptrace-cleanup.patch 12 Jul 2008 00:14:30 -0000 1.2 +++ linux-2.6-ptrace-cleanup.patch 14 Jul 2008 07:51:15 -0000 1.3 @@ -19,10 +19,10 @@ include/asm-x86/thread_info_64.h | 17 ++- include/linux/init_task.h | 4 +- include/linux/sched.h | 26 +-- - kernel/exit.c | 450 +++++++++++++++++++++++-------------- + kernel/exit.c | 451 +++++++++++++++++++++++-------------- kernel/fork.c | 6 +- kernel/ptrace.c | 37 ++- - 24 files changed, 510 insertions(+), 373 deletions(-) + 24 files changed, 511 insertions(+), 373 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 0c8614d..3a05e9f 100644 @@ -926,7 +926,7 @@ #define for_each_process(p) \ diff --git a/kernel/exit.c b/kernel/exit.c -index 8f6185e..981a3bd 100644 +index 8f6185e..fa7b700 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -70,7 +70,7 @@ static void __unhash_process(struct task @@ -978,7 +978,7 @@ /* Set the exit signal to SIGCHLD so we signal init on exit */ current->exit_signal = SIGCHLD; -@@ -691,37 +701,96 @@ static void exit_mm(struct task_struct * +@@ -691,37 +701,97 @@ static void exit_mm(struct task_struct * mmput(mm); } @@ -996,10 +996,11 @@ - group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); + int ret; + struct sighand_struct *psig = parent->sighand; -+ spin_lock(&psig->siglock); ++ unsigned long flags; ++ spin_lock_irqsave(&psig->siglock, flags); + ret = (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || + (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT)); -+ spin_unlock(&psig->siglock); ++ spin_unlock_irqrestore(&psig->siglock, flags); + return ret; +} @@ -1098,7 +1099,7 @@ /* If this is a threaded reparent there is no need to * notify anyone anything has happened. -@@ -736,7 +805,8 @@ reparent_thread(struct task_struct *p, s +@@ -736,7 +806,8 @@ reparent_thread(struct task_struct *p, s /* If we'd notified the old parent about this child's death, * also notify the new parent. */ @@ -1108,7 +1109,7 @@ !task_detached(p) && thread_group_empty(p)) do_notify_parent(p, p->exit_signal); -@@ -753,12 +823,15 @@ reparent_thread(struct task_struct *p, s +@@ -753,12 +824,15 @@ reparent_thread(struct task_struct *p, s static void forget_original_parent(struct task_struct *father) { struct task_struct *p, *n, *reaper = father; @@ -1127,7 +1128,7 @@ do { reaper = next_thread(reaper); if (reaper == father) { -@@ -767,58 +840,19 @@ static void forget_original_parent(struc +@@ -767,58 +841,19 @@ static void forget_original_parent(struc } } while (reaper->flags & PF_EXITING); @@ -1192,7 +1193,7 @@ } /* -@@ -1179,13 +1213,6 @@ static int eligible_child(enum pid_type +@@ -1179,13 +1214,6 @@ static int eligible_child(enum pid_type return 0; } @@ -1206,7 +1207,7 @@ /* Wait for all children (clone and not) if __WALL is set; * otherwise, wait for clone children *only* if __WCLONE is * set; otherwise, wait for non-clone children *only*. (Note: -@@ -1196,14 +1223,10 @@ static int eligible_child(enum pid_type +@@ -1196,14 +1224,10 @@ static int eligible_child(enum pid_type return 0; err = security_task_wait(p); @@ -1224,7 +1225,7 @@ } static int wait_noreap_copyout(struct task_struct *p, pid_t pid, uid_t uid, -@@ -1237,7 +1260,7 @@ static int wait_noreap_copyout(struct ta +@@ -1237,7 +1261,7 @@ static int wait_noreap_copyout(struct ta * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ @@ -1233,7 +1234,7 @@ struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { -@@ -1245,7 +1268,10 @@ static int wait_task_zombie(struct task_ +@@ -1245,7 +1269,10 @@ static int wait_task_zombie(struct task_ int retval, status, traced; pid_t pid = task_pid_vnr(p); @@ -1245,7 +1246,7 @@ uid_t uid = p->uid; int exit_code = p->exit_code; int why, status; -@@ -1395,21 +1421,24 @@ static int wait_task_zombie(struct task_ +@@ -1395,21 +1422,24 @@ static int wait_task_zombie(struct task_ * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ @@ -1273,7 +1274,7 @@ /* * A group stop is in progress and this is the group leader. * We won't report until all threads have stopped. -@@ -1420,7 +1449,7 @@ static int wait_task_stopped(struct task +@@ -1420,7 +1450,7 @@ static int wait_task_stopped(struct task if (!exit_code) goto unlock_sig; @@ -1282,7 +1283,7 @@ p->exit_code = 0; uid = p->uid; -@@ -1438,10 +1467,10 @@ unlock_sig: +@@ -1438,10 +1468,10 @@ unlock_sig: */ get_task_struct(p); pid = task_pid_vnr(p); @@ -1295,7 +1296,7 @@ return wait_noreap_copyout(p, pid, uid, why, exit_code, infop, ru); -@@ -1475,7 +1504,7 @@ unlock_sig: +@@ -1475,7 +1505,7 @@ unlock_sig: * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ @@ -1304,7 +1305,7 @@ struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { -@@ -1483,6 +1512,9 @@ static int wait_task_continued(struct ta +@@ -1483,6 +1513,9 @@ static int wait_task_continued(struct ta pid_t pid; uid_t uid; @@ -1314,7 +1315,7 @@ if (!(p->signal->flags & SIGNAL_STOP_CONTINUED)) return 0; -@@ -1492,7 +1524,7 @@ static int wait_task_continued(struct ta +@@ -1492,7 +1525,7 @@ static int wait_task_continued(struct ta spin_unlock_irq(&p->sighand->siglock); return 0; } @@ -1323,7 +1324,7 @@ p->signal->flags &= ~SIGNAL_STOP_CONTINUED; spin_unlock_irq(&p->sighand->siglock); -@@ -1518,89 +1550,161 @@ static int wait_task_continued(struct ta +@@ -1518,89 +1551,161 @@ static int wait_task_continued(struct ta return retval; } @@ -1550,7 +1551,7 @@ if (options & __WNOTHREAD) break; tsk = next_thread(tsk); -@@ -1608,16 +1712,14 @@ repeat: +@@ -1608,16 +1713,14 @@ repeat: } while (tsk != current); read_unlock(&tasklist_lock); linux-2.6-tracehook.patch: Index: linux-2.6-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-tracehook.patch 12 Jul 2008 00:14:30 -0000 1.2 +++ linux-2.6-tracehook.patch 14 Jul 2008 07:51:15 -0000 1.3 @@ -6,9 +6,9 @@ arch/ia64/kernel/signal.c | 8 + arch/mips/kernel/irixelf.c | 2 - arch/powerpc/Kconfig | 1 + - arch/powerpc/kernel/entry_32.S | 4 +- - arch/powerpc/kernel/entry_64.S | 3 +- - arch/powerpc/kernel/ptrace.c | 33 +-- + arch/powerpc/kernel/entry_32.S | 11 +- + arch/powerpc/kernel/entry_64.S | 10 +- + arch/powerpc/kernel/ptrace.c | 47 ++-- arch/powerpc/kernel/signal.c | 21 ++- arch/sparc64/Kconfig | 1 + arch/sparc64/kernel/ptrace.c | 24 +-- @@ -16,7 +16,7 @@ arch/sparc64/kernel/signal.c | 5 + arch/x86/Kconfig | 1 + arch/x86/ia32/ia32_aout.c | 6 - - arch/x86/kernel/ptrace.c | 31 +-- + arch/x86/kernel/ptrace.c | 34 +-- arch/x86/kernel/signal_32.c | 11 +- arch/x86/kernel/signal_64.c | 49 +--- fs/binfmt_aout.c | 6 - @@ -27,22 +27,22 @@ fs/exec.c | 12 +- fs/proc/array.c | 9 +- fs/proc/base.c | 39 +++- - include/asm-generic/syscall.h | 137 +++++++++ + include/asm-generic/syscall.h | 141 +++++++++ include/asm-ia64/thread_info.h | 3 - include/asm-powerpc/ptrace.h | 1 + include/asm-powerpc/signal.h | 3 +- - include/asm-powerpc/syscall.h | 72 +++++ + include/asm-powerpc/syscall.h | 73 +++++ include/asm-powerpc/thread_info.h | 5 +- include/asm-sparc64/ptrace.h | 1 + - include/asm-sparc64/syscall.h | 75 +++++ + include/asm-sparc64/syscall.h | 70 +++++ include/asm-sparc64/thread_info.h | 8 +- include/asm-x86/ptrace.h | 5 + - include/asm-x86/syscall.h | 213 ++++++++++++++ + include/asm-x86/syscall.h | 210 ++++++++++++++ include/asm-x86/thread_info_32.h | 2 + include/asm-x86/thread_info_64.h | 4 +- include/linux/ptrace.h | 72 +++++ include/linux/sched.h | 10 +- - include/linux/tracehook.h | 566 +++++++++++++++++++++++++++++++++++++ + include/linux/tracehook.h | 575 +++++++++++++++++++++++++++++++++++++ kernel/exit.c | 53 ++--- kernel/fork.c | 74 ++--- kernel/kthread.c | 2 +- @@ -53,7 +53,7 @@ lib/syscall.c | 75 +++++ mm/nommu.c | 4 +- security/selinux/hooks.c | 22 +-- - 55 files changed, 1555 insertions(+), 368 deletions(-) + 55 files changed, 1589 insertions(+), 371 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 3ea332b..1955fbd 100644 @@ -350,10 +350,24 @@ config EARLY_PRINTK diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S -index 3a05e9f..e057790 100644 +index 3a05e9f..eb40c67 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S -@@ -938,8 +938,8 @@ do_user_signal: /* r10 contains MSR_KE +@@ -299,7 +299,12 @@ syscall_dotrace: + stw r0,_TRAP(r1) + addi r3,r1,STACK_FRAME_OVERHEAD + bl do_syscall_trace_enter +- lwz r0,GPR0(r1) /* Restore original registers */ ++ /* ++ * Restore argument registers possibly just changed. ++ * We use the return value of do_syscall_trace_enter ++ * for call number to look up in the table (r0). ++ */ ++ mr r0,r3 + lwz r3,GPR3(r1) + lwz r4,GPR4(r1) + lwz r5,GPR5(r1) +@@ -938,8 +943,8 @@ do_user_signal: /* r10 contains MSR_KE SAVE_NVGPRS(r1) rlwinm r3,r3,0,0,30 stw r3,_TRAP(r1) @@ -365,10 +379,24 @@ REST_NVGPRS(r1) b recheck diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S -index c0db5b7..9139ee6 100644 +index c0db5b7..2a13029 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S -@@ -632,8 +632,7 @@ user_work: +@@ -213,7 +213,12 @@ syscall_dotrace: + bl .save_nvgprs + addi r3,r1,STACK_FRAME_OVERHEAD + bl .do_syscall_trace_enter +- ld r0,GPR0(r1) /* Restore original registers */ ++ /* ++ * Restore argument registers possibly just changed. ++ * We use the return value of do_syscall_trace_enter ++ * for the call number to look up in the table (r0). ++ */ ++ mr r0,r3 + ld r3,GPR3(r1) + ld r4,GPR4(r1) + ld r5,GPR5(r1) +@@ -632,8 +637,7 @@ user_work: b .ret_from_except_lite 1: bl .save_nvgprs @@ -379,7 +407,7 @@ b .ret_from_except diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c -index 91ee077..9d2dd06 100644 +index 91ee077..b9bf411 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -22,6 +22,7 @@ @@ -390,12 +418,17 @@ #include #include #include -@@ -866,31 +867,12 @@ long arch_ptrace(struct task_struct *chi +@@ -866,31 +867,24 @@ long arch_ptrace(struct task_struct *chi return ret; } -static void do_syscall_trace(void) --{ ++/* ++ * We must return the syscall number to actually look up in the table. ++ * This can be -1L to skip running any syscall at all. ++ */ ++long do_syscall_trace_enter(struct pt_regs *regs) + { - /* the 0x80 provides a way for the tracing parent to distinguish - between a syscall stop and SIGTRAP delivery */ - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) @@ -411,20 +444,33 @@ - current->exit_code = 0; - } -} -- - void do_syscall_trace_enter(struct pt_regs *regs) - { ++ long ret = 0; + +-void do_syscall_trace_enter(struct pt_regs *regs) +-{ secure_computing(regs->gpr[0]); - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) - do_syscall_trace(); -+ if (test_thread_flag(TIF_SYSCALL_TRACE)) -+ tracehook_report_syscall_entry(regs); ++ if (test_thread_flag(TIF_SYSCALL_TRACE) && ++ tracehook_report_syscall_entry(regs)) ++ /* ++ * Tracing decided this syscall should not happen. ++ * We'll return a bogus call number to get an ENOSYS ++ * error, but leave the original number in regs->gpr[0]. ++ */ ++ ret = -1L; if (unlikely(current->audit_context)) { #ifdef CONFIG_PPC64 -@@ -912,12 +894,13 @@ void do_syscall_trace_enter(struct pt_re +@@ -908,16 +902,19 @@ void do_syscall_trace_enter(struct pt_re + regs->gpr[5] & 0xffffffff, + regs->gpr[6] & 0xffffffff); + } ++ ++ return ret ?: regs->gpr[0]; + } void do_syscall_trace_leave(struct pt_regs *regs) { @@ -631,7 +677,7 @@ } diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c -index 652f550..8a194ed 100644 +index 652f550..d537484 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -14,6 +14,7 @@ @@ -673,16 +719,19 @@ #ifdef CONFIG_X86_32 # define IS_IA32 1 -@@ -1433,7 +1410,7 @@ asmregparm long syscall_trace_enter(stru +@@ -1432,8 +1409,9 @@ asmregparm long syscall_trace_enter(stru + if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) ret = -1L; - if (ret || test_thread_flag(TIF_SYSCALL_TRACE)) +- if (ret || test_thread_flag(TIF_SYSCALL_TRACE)) - syscall_trace(regs); -+ tracehook_report_syscall_entry(regs); ++ if ((ret || test_thread_flag(TIF_SYSCALL_TRACE)) && ++ tracehook_report_syscall_entry(regs)) ++ ret = -1L; if (unlikely(current->audit_context)) { if (IS_IA32) -@@ -1459,7 +1436,7 @@ asmregparm void syscall_trace_leave(stru +@@ -1459,7 +1437,7 @@ asmregparm void syscall_trace_leave(stru audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); if (test_thread_flag(TIF_SYSCALL_TRACE)) @@ -691,7 +740,7 @@ /* * If TIF_SYSCALL_EMU is set, we only get here because of -@@ -1475,6 +1452,6 @@ asmregparm void syscall_trace_leave(stru +@@ -1475,6 +1453,6 @@ asmregparm void syscall_trace_leave(stru * system call instruction. */ if (test_thread_flag(TIF_SINGLESTEP) && @@ -1083,10 +1132,10 @@ ONE("statm", S_IRUGO, pid_statm), diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h new file mode 100644 -index ...2a9d2be 100644 +index ...fd57a55 100644 --- /dev/null +++ b/include/asm-generic/syscall.h -@@ -0,0 +1,137 @@ +@@ -0,0 +1,141 @@ +/* + * Access to user system call parameters and results + * @@ -1126,18 +1175,22 @@ +long syscall_get_nr(struct task_struct *task, struct pt_regs *regs); + +/** -+ * syscall_abort - abort a traced system call about to begin -+ * @task: task of interest, must be in system call entry tracing ++ * syscall_rollback - roll back registers after an aborted system call ++ * @task: task of interest, must be in system call exit tracing + * @regs: task_pt_regs() of @task + * + * It's only valid to call this when @task is stopped for system -+ * call tracing (due to TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT). -+ * It aborts the system call entry so no system call is made. -+ * If @task ever returns to user mode after this, its register state -+ * is unspecified, but should be something harmless like an -+ * %ENOSYS error return. ++ * call exit tracing (due to TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT), ++ * after tracehook_report_syscall_entry() returned nonzero to prevent ++ * the system call from taking place. ++ * ++ * This rolls back the register state in @regs so it's as if the ++ * system call instruction was a no-op. The registers containing ++ * the system call number and arguments are as they were before the ++ * system call instruction. This may not be the same as what the ++ * register state looked like at system call entry tracing. + */ -+void syscall_abort(struct task_struct *task, struct pt_regs *regs); ++void syscall_rollback(struct task_struct *task, struct pt_regs *regs); + +/** + * syscall_get_error - check result of traced system call @@ -1266,10 +1319,10 @@ diff --git a/include/asm-powerpc/syscall.h b/include/asm-powerpc/syscall.h new file mode 100644 -index ...4b37467 100644 +index ...174e1ad 100644 --- /dev/null +++ b/include/asm-powerpc/syscall.h -@@ -0,0 +1,72 @@ +@@ -0,0 +1,73 @@ +/* + * Access to user system call parameters and results + * @@ -1293,9 +1346,10 @@ + return regs->trap == 0xc01 ? regs->gpr[0] : -1L; +} + -+static inline void syscall_abort(struct task_struct *task, struct pt_regs *regs) ++static inline void syscall_rollback(struct task_struct *task, ++ struct pt_regs *regs) +{ -+ regs->gpr[0] = -1L; ++ regs->gpr[3] = regs->orig_gpr3; +} + +static inline long syscall_get_error(struct task_struct *task, @@ -1384,10 +1438,10 @@ extern unsigned long profile_pc(struct pt_regs *); diff --git a/include/asm-sparc64/syscall.h b/include/asm-sparc64/syscall.h new file mode 100644 -index ...78e8a96 100644 +index ...c00fb1a 100644 --- /dev/null +++ b/include/asm-sparc64/syscall.h -@@ -0,0 +1,75 @@ +@@ -0,0 +1,70 @@ +/* + * Access to user system call parameters and results + * @@ -1412,11 +1466,6 @@ + return pt_regs_is_syscall(regs) ? regs->u_regs[UREG_G1] : -1L; +} + -+static inline void syscall_abort(struct task_struct *task, struct pt_regs *regs) -+{ -+ regs->u_regs[UREG_G1] = -1L; -+} -+ +static inline long syscall_get_error(struct task_struct *task, + struct pt_regs *regs) +{ @@ -1514,10 +1563,10 @@ */ diff --git a/include/asm-x86/syscall.h b/include/asm-x86/syscall.h new file mode 100644 -index ...464addc 100644 +index ...7de35f0 100644 --- /dev/null +++ b/include/asm-x86/syscall.h -@@ -0,0 +1,213 @@ +@@ -0,0 +1,210 @@ +/* + * Access to user system call parameters and results + * @@ -1545,13 +1594,10 @@ + return regs->orig_ax; +} + -+static inline void syscall_abort(struct task_struct *task, struct pt_regs *regs) ++static inline void syscall_rollback(struct task_struct *task, ++ struct pt_regs *regs) +{ -+ /* -+ * This will make it diagnose -1 as out of range for -+ * syscall numbers and return what's in regs->ax (-ENOSYS). -+ */ -+ regs->orig_ax = -1L; ++ regs->ax = regs->orig_ax; +} + +static inline long syscall_get_error(struct task_struct *task, @@ -1901,10 +1947,10 @@ #define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks) diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h new file mode 100644 -index ...88ce8af 100644 +index ...61d4ca4 100644 --- /dev/null +++ b/include/linux/tracehook.h -@@ -0,0 +1,566 @@ +@@ -0,0 +1,575 @@ +/* + * Tracing hooks + * @@ -2006,11 +2052,20 @@ + * in @regs can affect the system call number and arguments to be tried. + * It is safe to block here, preventing the system call from beginning. + * ++ * Returns zero normally, or nonzero if the calling arch code should abort ++ * the system call. That must prevent normal entry so no system call is ++ * made. If @task ever returns to user mode after this, its register state ++ * is unspecified, but should be something harmless like an %ENOSYS error ++ * return. It should preserve enough information so that syscall_rollback() ++ * can work (see asm-generic/syscall.h). ++ * + * Called without locks, just after entering kernel mode. + */ -+static inline void tracehook_report_syscall_entry(struct pt_regs *regs) ++static inline __must_check int tracehook_report_syscall_entry( ++ struct pt_regs *regs) +{ + ptrace_report_syscall(regs); ++ return 0; +} + +/** @@ -2472,7 +2527,7 @@ + +#endif /* */ diff --git a/kernel/exit.c b/kernel/exit.c -index 981a3bd..a119a53 100644 +index fa7b700..a0225e2 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -45,6 +45,7 @@ @@ -2527,7 +2582,7 @@ } write_unlock_irq(&tasklist_lock); -@@ -861,7 +859,8 @@ static void forget_original_parent(struc +@@ -862,7 +860,8 @@ static void forget_original_parent(struc */ static void exit_notify(struct task_struct *tsk, int group_dead) { @@ -2537,7 +2592,7 @@ /* * This does two things: -@@ -898,22 +897,11 @@ static void exit_notify(struct task_stru +@@ -899,22 +898,11 @@ static void exit_notify(struct task_stru !capable(CAP_KILL)) tsk->exit_signal = SIGCHLD; @@ -2565,7 +2620,7 @@ /* mt-exec, de_thread() is waiting for us */ if (thread_group_leader(tsk) && -@@ -923,8 +911,10 @@ static void exit_notify(struct task_stru +@@ -924,8 +912,10 @@ static void exit_notify(struct task_stru write_unlock_irq(&tasklist_lock); @@ -2577,7 +2632,7 @@ release_task(tsk); } -@@ -1003,10 +993,7 @@ NORET_TYPE void do_exit(long code) +@@ -1004,10 +994,7 @@ NORET_TYPE void do_exit(long code) if (unlikely(!tsk->pid)) panic("Attempted to kill the idle task!"); linux-2.6-utrace.patch: Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- linux-2.6-utrace.patch 12 Jul 2008 00:14:30 -0000 1.80 +++ linux-2.6-utrace.patch 14 Jul 2008 07:51:15 -0000 1.81 @@ -4,14 +4,14 @@ fs/proc/array.c | 3 + include/linux/ptrace.h | 15 + include/linux/sched.h | 6 + - include/linux/tracehook.h | 59 + - include/linux/utrace.h | 501 +++++++++ + include/linux/tracehook.h | 60 + + include/linux/utrace.h | 534 +++++++++ init/Kconfig | 28 + kernel/Makefile | 1 + - kernel/ptrace.c | 472 ++++++++- + kernel/ptrace.c | 542 +++++++++- kernel/signal.c | 14 +- - kernel/utrace.c | 2210 +++++++++++++++++++++++++++++++++++++ - 13 files changed, 3907 insertions(+), 4 deletions(-) + kernel/utrace.c | 2222 +++++++++++++++++++++++++++++++++++++ + 13 files changed, 4023 insertions(+), 4 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 0eb0d02..49a78b7 100644 @@ -717,7 +717,7 @@ extern void force_sig_specific(int, struct task_struct *); extern int send_sig(int, struct task_struct *, int); diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h -index 88ce8af..a68801f 100644 +index 61d4ca4..8e7ff75 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h @@ -49,6 +49,7 @@ @@ -737,16 +737,17 @@ return (task_ptrace(task) & PT_PTRACED); } -@@ -103,6 +106,8 @@ static inline void ptrace_report_syscall - */ - static inline void tracehook_report_syscall_entry(struct pt_regs *regs) +@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall + static inline __must_check int tracehook_report_syscall_entry( + struct pt_regs *regs) { -+ if (task_utrace_flags(current) & UTRACE_EVENT(SYSCALL_ENTRY)) -+ utrace_report_syscall_entry(regs); ++ if ((task_utrace_flags(current) & UTRACE_EVENT(SYSCALL_ENTRY)) && ++ utrace_report_syscall_entry(regs)) ++ return 1; ptrace_report_syscall(regs); + return 0; } - -@@ -125,6 +130,8 @@ static inline void tracehook_report_sysc +@@ -134,6 +140,8 @@ static inline __must_check int tracehook */ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step) { @@ -755,7 +756,7 @@ ptrace_report_syscall(regs); } -@@ -146,6 +153,8 @@ static inline int tracehook_unsafe_exec( +@@ -155,6 +163,8 @@ static inline int tracehook_unsafe_exec( else unsafe |= LSM_UNSAFE_PTRACE; } @@ -764,7 +765,7 @@ return unsafe; } -@@ -164,6 +173,8 @@ static inline struct task_struct *traceh +@@ -173,6 +183,8 @@ static inline struct task_struct *traceh { if (task_ptrace(tsk) & PT_PTRACED) return rcu_dereference(tsk->parent); @@ -773,7 +774,7 @@ return NULL; } -@@ -185,6 +196,8 @@ static inline void tracehook_report_exec +@@ -194,6 +206,8 @@ static inline void tracehook_report_exec struct linux_binprm *bprm, struct pt_regs *regs) { @@ -782,7 +783,7 @@ if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) && unlikely(task_ptrace(current) & PT_PTRACED)) send_sig(SIGTRAP, current, 0); -@@ -202,6 +215,8 @@ static inline void tracehook_report_exec +@@ -211,6 +225,8 @@ static inline void tracehook_report_exec */ static inline void tracehook_report_exit(long *exit_code) { @@ -791,7 +792,7 @@ ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXIT, *exit_code); } -@@ -245,6 +260,7 @@ static inline int tracehook_prepare_clon +@@ -254,6 +270,7 @@ static inline int tracehook_prepare_clon static inline void tracehook_finish_clone(struct task_struct *child, unsigned long clone_flags, int trace) { @@ -799,7 +800,7 @@ ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace); } -@@ -270,6 +286,8 @@ static inline void tracehook_report_clon +@@ -279,6 +296,8 @@ static inline void tracehook_report_clon unsigned long clone_flags, pid_t pid, struct task_struct *child) { @@ -808,7 +809,7 @@ if (unlikely(trace)) { /* * The child starts up with an immediate SIGSTOP. -@@ -335,6 +353,9 @@ static inline void tracehook_report_vfor +@@ -344,6 +363,9 @@ static inline void tracehook_report_vfor */ static inline void tracehook_prepare_release_task(struct task_struct *task) { @@ -818,7 +819,7 @@ } /** -@@ -348,7 +369,21 @@ static inline void tracehook_prepare_rel +@@ -357,7 +379,21 @@ static inline void tracehook_prepare_rel */ static inline void tracehook_finish_release_task(struct task_struct *task) { @@ -840,7 +841,7 @@ } /** -@@ -370,8 +405,12 @@ static inline void tracehook_signal_hand +@@ -379,8 +415,12 @@ static inline void tracehook_signal_hand const struct k_sigaction *ka, struct pt_regs *regs, int stepping) { @@ -853,7 +854,7 @@ } /** -@@ -390,6 +429,8 @@ static inline int tracehook_consider_ign +@@ -399,6 +439,8 @@ static inline int tracehook_consider_ign int sig, void __user *handler) { @@ -862,7 +863,7 @@ return (task_ptrace(task) & PT_PTRACED); } -@@ -411,6 +452,9 @@ static inline int tracehook_consider_fat +@@ -420,6 +462,9 @@ static inline int tracehook_consider_fat int sig, void __user *handler) { @@ -872,7 +873,7 @@ return (task_ptrace(task) & PT_PTRACED); } -@@ -425,6 +469,8 @@ static inline int tracehook_consider_fat +@@ -434,6 +479,8 @@ static inline int tracehook_consider_fat */ static inline int tracehook_force_sigpending(void) { @@ -881,7 +882,7 @@ return 0; } -@@ -454,6 +500,8 @@ static inline int tracehook_get_signal(s +@@ -463,6 +510,8 @@ static inline int tracehook_get_signal(s siginfo_t *info, struct k_sigaction *return_ka) { @@ -890,7 +891,7 @@ return 0; } -@@ -474,6 +522,8 @@ static inline int tracehook_get_signal(s +@@ -483,6 +532,8 @@ static inline int tracehook_get_signal(s */ static inline int tracehook_notify_jctl(int notify, int why) { @@ -899,7 +900,7 @@ return notify || (current->ptrace & PT_PTRACED); } -@@ -491,6 +541,8 @@ static inline int tracehook_notify_jctl( +@@ -500,6 +551,8 @@ static inline int tracehook_notify_jctl( static inline int tracehook_notify_death(struct task_struct *task, void **death_cookie, int group_dead) { @@ -908,7 +909,7 @@ if (task->exit_signal == -1) return task->ptrace ? SIGCHLD : -1; -@@ -527,6 +579,10 @@ static inline void tracehook_report_deat +@@ -536,6 +589,10 @@ static inline void tracehook_report_deat int signal, void *death_cookie, int group_dead) { @@ -919,7 +920,7 @@ } #ifdef TIF_NOTIFY_RESUME -@@ -560,6 +616,9 @@ static inline void set_notify_resume(str +@@ -569,6 +626,9 @@ static inline void set_notify_resume(str */ static inline void tracehook_notify_resume(struct pt_regs *regs) { @@ -931,10 +932,10 @@ diff --git a/include/linux/utrace.h b/include/linux/utrace.h new file mode 100644 -index ...4622ed0 100644 +index ...b264763 100644 --- /dev/null +++ b/include/linux/utrace.h -@@ -0,0 +1,501 @@ +@@ -0,0 +1,534 @@ +/* + * utrace infrastructure interface for debugging user processes + * @@ -1059,7 +1060,7 @@ +void utrace_report_exec(struct linux_binfmt *, struct linux_binprm *, + struct pt_regs *regs) + __attribute__((weak)); -+void utrace_report_syscall_entry(struct pt_regs *) ++bool utrace_report_syscall_entry(struct pt_regs *) + __attribute__((weak)); +void utrace_report_syscall_exit(struct pt_regs *) + __attribute__((weak)); @@ -1220,6 +1221,34 @@ + +#define UTRACE_SIGNAL_HOLD 0x100 /* Flag, push signal back on queue. */ + ++/** ++ * enum utrace_syscall_action - disposition of signal ++ * @UTRACE_SYSCALL_RUN: Run the system call. ++ * @UTRACE_SYSCALL_ABORT: Don't run the system call. ++ * ++ * This is encoded in the @action argument and the return value for ++ * a @report_syscall_entry callback. ++ */ ++enum utrace_syscall_action { ++ UTRACE_SYSCALL_RUN = 0x00, ++ UTRACE_SYSCALL_ABORT = 0x10 ++}; ++#define UTRACE_SYSCALL_MASK 0xf0 ++ ++/** ++ * utrace_syscall_action - &enum utrace_syscall_action from callback action ++ * @action: @report_syscall_entry callback @action or return value ++ * ++ * This extracts the &enum utrace_syscall_action from @action, which ++ * is the @action argument to a @report_syscall_entry callback or the ++ * return value from one. ++ */ ++static inline enum utrace_syscall_action utrace_syscall_action(u32 action) ++{ ++ return action & UTRACE_SYSCALL_MASK; ++} ++ ++ +#define UTRACE_HIDE_EVENT XXX + +/* @@ -1334,8 +1363,13 @@ + /* + * Thread has entered the kernel to request a system call. + * The user register state is handy to be tweaked directly. ++ * The @action argument contains an &enum utrace_syscall_action, ++ * use utrace_syscall_action() to extract it. The return value ++ * overrides the last engine's action for the system call. ++ * If the final action is %UTRACE_SYSCALL_ABORT, no system call ++ * is made. + */ -+ u32 (*report_syscall_entry)(enum utrace_resume_action action, ++ u32 (*report_syscall_entry)(u32 action, + struct utrace_attached_engine *engine, + struct task_struct *task, + struct pt_regs *regs); @@ -1488,7 +1522,7 @@ obj-$(CONFIG_AUDITSYSCALL) += auditsc.o obj-$(CONFIG_AUDIT_TREE) += audit_tree.o diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index ef66127..9003b0e 100644 +index ef66127..dcf30f5 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -16,6 +16,7 @@ @@ -1549,7 +1583,7 @@ /* * Check that we have indeed attached to the thing.. */ -@@ -113,6 +137,367 @@ int ptrace_check_attach(struct task_stru +@@ -113,6 +137,440 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -1623,16 +1657,23 @@ + return target->parent; +} + ++static void ptrace_set_action(struct task_struct *task, ++ enum utrace_resume_action action, ++ enum utrace_syscall_action syscall) ++{ ++ task->ptrace &= ~((UTRACE_SYSCALL_MASK | UTRACE_RESUME_MASK) << 16); ++ task->ptrace |= ((UTRACE_RESUME - action) | syscall) << 16; ++} ++ +static enum utrace_resume_action ptrace_resume_action(struct task_struct *task) +{ -+ return UTRACE_RESUME - (task->ptrace >> 16); ++ return UTRACE_RESUME - ((task->ptrace >> 16) & UTRACE_RESUME_MASK); +} + -+static void ptrace_set_action(struct task_struct *task, -+ enum utrace_resume_action action) ++static enum utrace_syscall_action ptrace_syscall_action( ++ struct task_struct *task) +{ -+ task->ptrace &= ~(UTRACE_RESUME_MASK << 16); -+ task->ptrace |= (UTRACE_RESUME - action) << 16; ++ return (task->ptrace >> 16) & UTRACE_SYSCALL_MASK; +} + +static u32 utrace_ptrace_report(u32 action, struct task_struct *task, int code) @@ -1642,7 +1683,7 @@ + * and calls do_notify_parent_cldstop() for us. This kludge + * is necessary to keep that wakeup after we enter TASK_TRACED. + */ -+ ptrace_set_action(task, UTRACE_STOP); ++ ptrace_set_action(task, UTRACE_STOP, 0); + + task->exit_code = code; + @@ -1681,6 +1722,8 @@ + return utrace_ptrace_event(task, PTRACE_EVENT_EXIT, *code); +} + ++#define PT_VFORKING PT_DTRACE /* reuse obsolete bit */ ++ +static u32 ptrace_report_clone(enum utrace_resume_action action, + struct utrace_attached_engine *engine, + struct task_struct *parent, @@ -1692,15 +1735,18 @@ + + /* + * To simulate vfork-done tracing, we'll have to catch the -+ * parent's syscall-exit event for this vfork system call. ++ * parent's syscall-exit event for this vfork/clone system call. ++ * Since PTRACE_SETOPTIONS can enable PTRACE_O_TRACEVFORKDONE ++ * during the PTRACE_EVENT_VFORK stop, we must do this if either ++ * is enabled right now. + */ -+ if (parent->ptrace & PT_TRACE_VFORK_DONE) { ++ if ((clone_flags & CLONE_VFORK) && ++ (parent->ptrace & (PT_TRACE_VFORK | PT_TRACE_VFORK_DONE))) { + if (!(engine->flags & UTRACE_EVENT(SYSCALL_EXIT))) + utrace_set_events(parent, engine, + engine->flags | + UTRACE_EVENT(SYSCALL_EXIT)); -+ // XXX -+ WARN_ON(1); ++ parent->ptrace |= PT_VFORKING; + } + + if (clone_flags & CLONE_UNTRACED) @@ -1742,31 +1788,69 @@ + return utrace_ptrace_event(parent, event, child->pid); +} + -+static u32 ptrace_report_syscall(enum utrace_resume_action action, -+ struct utrace_attached_engine *engine, -+ struct task_struct *task, -+ struct pt_regs *regs) ++ ++static u32 ptrace_report_syscall(u32 action, struct task_struct *task) +{ + int code = SIGTRAP; + if (task->ptrace & PT_TRACESYSGOOD) + code |= 0x80; -+ return utrace_ptrace_report(0, task, code); ++ return utrace_ptrace_report(action, task, code); ++} ++ ++static u32 ptrace_report_syscall_entry(u32 action, ++ struct utrace_attached_engine *engine, ++ struct task_struct *task, ++ struct pt_regs *regs) ++{ ++ /* ++ * If we're doing PTRACE_SYSEMU, just punt here and report ++ * at the exit stop instead. ++ */ ++ if (ptrace_syscall_action(task)) ++ return UTRACE_SYSCALL_ABORT | UTRACE_RESUME; ++ ++ return ptrace_report_syscall(UTRACE_SYSCALL_RUN, task); +} + -+#ifndef TIF_SYSCALL_EMU -+# define ptrace_report_syscall_exit ptrace_report_syscall -+#else +static u32 ptrace_report_syscall_exit(enum utrace_resume_action action, + struct utrace_attached_engine *engine, + struct task_struct *task, + struct pt_regs *regs) +{ -+ if (test_tsk_thread_flag(task, TIF_SYSCALL_EMU)) -+ return ptrace_resume_action(task); -+ return ptrace_report_syscall(action, engine, task, regs); -+} -+#endif ++ if (!(engine->flags & UTRACE_EVENT(SYSCALL_ENTRY))) { ++ /* ++ * We were not really using PTRACE_SYSCALL. ++ * SYSCALL_EXIT was only caught for vfork-done tracing. ++ */ ++ utrace_set_events(task, engine, ++ engine->flags & ~UTRACE_EVENT(SYSCALL_EXIT)); ++ WARN_ON(!(task->ptrace & PT_VFORKING)); ++ task->ptrace &= ~PT_VFORKING; ++ return utrace_ptrace_event(task, PTRACE_EVENT_VFORK_DONE, 0); ++ } ++ ++ if (task->ptrace & PT_VFORKING) { ++ /* ++ * If we're reporting vfork-done, we'll have to ++ * remember to report syscall-exit after that. ++ */ ++ if (task->ptrace & PT_TRACE_VFORK_DONE) ++ return utrace_ptrace_event(task, ++ PTRACE_EVENT_VFORK_DONE, 0); ++ task->ptrace &= ~PT_VFORKING; ++ } ++ ++ if (unlikely(ptrace_syscall_action(task)) && ++ unlikely(ptrace_resume_action(task) == UTRACE_SINGLESTEP)) ++ /* ++ * This is PTRACE_SYSEMU_SINGLESTEP. ++ * Kludge: Prevent arch code from sending a SIGTRAP ++ * after tracehook_report_syscall_exit() returns. ++ */ ++ user_disable_single_step(task); + ++ return ptrace_report_syscall(0, task); ++} + +static u32 ptrace_resumed(struct task_struct *task, struct pt_regs *regs, + siginfo_t *info, struct k_sigaction *return_ka) @@ -1816,6 +1900,23 @@ + const struct k_sigaction *orig_ka, + struct k_sigaction *return_ka) +{ ++ /* ++ * Deal with a pending vfork-done event. We'll stop again now ++ * for the syscall-exit report that was replaced with vfork-done. ++ */ ++ if (unlikely(task->ptrace & PT_VFORKING)) { ++ task->ptrace &= ~PT_VFORKING; ++ if ((engine->flags & UTRACE_EVENT(SYSCALL_ENTRY)) && ++ utrace_signal_action(action) == UTRACE_SIGNAL_REPORT) { ++ /* ++ * Make sure we get another report on wakeup. ++ */ ++ utrace_control(task, engine, UTRACE_INTERRUPT); ++ return ptrace_report_syscall(UTRACE_SIGNAL_REPORT, ++ task); ++ } ++ } ++ + switch (utrace_signal_action(action)) { + default: + break; @@ -1847,6 +1948,12 @@ + struct task_struct *task, + unsigned long event) +{ ++ /* ++ * Make sure we deal with a pending vfork-done event (see above). ++ */ ++ if (unlikely(task->ptrace & PT_VFORKING)) ++ return UTRACE_INTERRUPT; ++ + task->last_siginfo = NULL; + return ptrace_resume_action(task); +} @@ -1859,7 +1966,7 @@ + .report_exec = ptrace_report_exec, + .report_exit = ptrace_report_exit, + .report_clone = ptrace_report_clone, -+ .report_syscall_entry = ptrace_report_syscall, ++ .report_syscall_entry = ptrace_report_syscall_entry, + .report_syscall_exit = ptrace_report_syscall_exit, +}; + @@ -1917,7 +2024,7 @@ int __ptrace_may_attach(struct task_struct *task) { /* May we inspect the given task? -@@ -156,6 +541,7 @@ int ptrace_attach(struct task_struct *ta +@@ -156,6 +614,7 @@ int ptrace_attach(struct task_struct *ta { int retval; unsigned long flags; @@ -1925,7 +2032,7 @@ audit_ptrace(task); -@@ -163,6 +549,13 @@ int ptrace_attach(struct task_struct *ta +@@ -163,6 +622,13 @@ int ptrace_attach(struct task_struct *ta if (same_thread_group(task, current)) goto out; @@ -1939,7 +2046,7 @@ repeat: /* * Nasty, nasty. -@@ -202,6 +595,8 @@ repeat: +@@ -202,6 +668,8 @@ repeat: bad: write_unlock_irqrestore(&tasklist_lock, flags); task_unlock(task); @@ -1948,7 +2055,7 @@ out: return retval; } -@@ -309,6 +704,8 @@ static int ptrace_setoptions(struct task +@@ -309,6 +777,8 @@ static int ptrace_setoptions(struct task if (data & PTRACE_O_TRACEEXIT) child->ptrace |= PT_TRACE_EXIT; @@ -1957,7 +2064,7 @@ return (data & ~PTRACE_O_MASK) ? -EINVAL : 0; } -@@ -367,6 +764,7 @@ static int ptrace_setsiginfo(struct task +@@ -367,6 +837,7 @@ static int ptrace_setsiginfo(struct task #define is_sysemu_singlestep(request) 0 #endif @@ -1965,7 +2072,7 @@ static int ptrace_resume(struct task_struct *child, long request, long data) { if (!valid_signal(data)) -@@ -401,6 +799,69 @@ static int ptrace_resume(struct task_str +@@ -401,6 +872,66 @@ static int ptrace_resume(struct task_str return 0; } @@ -1974,7 +2081,7 @@ +{ + struct utrace_attached_engine *engine; + enum utrace_resume_action action; -+ int sysemu = 0; ++ enum utrace_syscall_action syscall; + + if (!valid_signal(data)) + return -EIO; @@ -1984,16 +2091,13 @@ + if (IS_ERR(engine)) + return -ESRCH; + -+#ifdef TIF_SYSCALL_EMU -+ sysemu = (request == PTRACE_SYSEMU || -+ request == PTRACE_SYSEMU_SINGLESTEP); -+ if (sysemu) -+ set_tsk_thread_flag(child, TIF_SYSCALL_EMU); -+ else -+ clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); ++ syscall = UTRACE_SYSCALL_RUN; ++#ifdef PTRACE_SYSEMU ++ if (request == PTRACE_SYSEMU || request == PTRACE_SYSEMU_SINGLESTEP) ++ syscall = UTRACE_SYSCALL_ABORT; +#endif + -+ if (sysemu || request == PTRACE_SYSCALL) { ++ if (syscall != UTRACE_SYSCALL_RUN || request == PTRACE_SYSCALL) { + if (!(engine->flags & UTRACE_EVENT_SYSCALL)) + utrace_set_events(child, engine, + engine->flags | UTRACE_EVENT_SYSCALL); @@ -2015,7 +2119,7 @@ + + child->exit_code = data; + -+ ptrace_set_action(child, action); ++ ptrace_set_action(child, action, syscall); + + if (task_is_stopped(child)) { + spin_lock_irq(&child->sighand->siglock); @@ -2035,7 +2139,7 @@ int ptrace_request(struct task_struct *child, long request, long addr, long data) -@@ -480,6 +941,11 @@ int ptrace_request(struct task_struct *c +@@ -480,6 +1011,11 @@ int ptrace_request(struct task_struct *c int ptrace_traceme(void) { int ret = -EPERM; @@ -2047,7 +2151,7 @@ /* * Are we already being traced? -@@ -513,6 +979,8 @@ repeat: +@@ -513,6 +1049,8 @@ repeat: write_unlock_irqrestore(&tasklist_lock, flags); } task_unlock(current); @@ -2111,10 +2215,10 @@ struct pt_regs *regs, void *cookie) diff --git a/kernel/utrace.c b/kernel/utrace.c new file mode 100644 -index ...f0fed73 100644 +index ...84540a4 100644 --- /dev/null +++ b/kernel/utrace.c -@@ -0,0 +1,2210 @@ +@@ -0,0 +1,2222 @@ +/* + * utrace infrastructure interface for debugging user processes + * @@ -3288,13 +3392,14 @@ + */ +struct utrace_report { + enum utrace_resume_action action; ++ u32 result; + bool detaches; + bool takers; + bool killed; +}; + +#define INIT_REPORT(var) \ -+ struct utrace_report var = { UTRACE_RESUME, false, false, false } ++ struct utrace_report var = { UTRACE_RESUME, 0, false, false, false } + +/* + * We are now making the report, so clear the flag saying we need one. @@ -3349,8 +3454,10 @@ +static bool finish_callback(struct utrace *utrace, + struct utrace_report *report, + struct utrace_attached_engine *engine, -+ enum utrace_resume_action ret) ++ u32 ret) +{ ++ enum utrace_resume_action action = utrace_resume_action(ret); ++ + /* + * This is a good place to make sure tracing engines don't + * introduce too much latency under voluntary preemption. @@ -3358,16 +3465,18 @@ + if (need_resched()) + cond_resched(); + -+ if (ret == UTRACE_DETACH) { ++ if (action == UTRACE_DETACH) { + rcu_assign_pointer(engine->ops, &utrace_detached_ops); + report->detaches = true; + return true; + } + -+ if (ret < report->action) -+ report->action = ret; ++ report->result = ret & ~UTRACE_RESUME_MASK; + -+ if (ret == UTRACE_STOP) { ++ if (action < report->action) ++ report->action = action; ++ ++ if (action == UTRACE_STOP) { + if (!engine_wants_stop(engine)) { + spin_lock(&utrace->lock); + mark_engine_wants_stop(engine); @@ -3436,8 +3545,8 @@ + do { \ + start_report(utrace); \ + REPORT_CALLBACKS(task, utrace, report, event, callback, \ -+ (report)->action, engine, current, \ -+ ## __VA_ARGS__); \ ++ (report)->action, engine, current, \ ++ ## __VA_ARGS__); \ + finish_report(report, task, utrace); \ + } while (0) +#define REPORT_CALLBACKS(task, utrace, report, event, callback, ...) \ @@ -3471,26 +3580,31 @@ + +/* + * Called iff UTRACE_EVENT(SYSCALL_ENTRY) flag is set. ++ * Return true to prevent the system call. + */ -+void utrace_report_syscall_entry(struct pt_regs *regs) ++bool utrace_report_syscall_entry(struct pt_regs *regs) +{ + struct task_struct *task = current; + struct utrace *utrace = task->utrace; + INIT_REPORT(report); + -+ REPORT(task, utrace, &report, UTRACE_EVENT(SYSCALL_ENTRY), -+ report_syscall_entry, regs); -+ -+ if (report.action != UTRACE_STOP) -+ return; ++ start_report(utrace); ++ REPORT_CALLBACKS(task, utrace, &report, UTRACE_EVENT(SYSCALL_ENTRY), ++ report_syscall_entry, report.result | report.action, ++ engine, current, regs); ++ finish_report(&report, task, utrace); + -+ if (unlikely(utrace_stop(task, utrace))) ++ if (report.action == UTRACE_STOP && unlikely(utrace_stop(task, utrace))) + /* + * We are continuing despite UTRACE_STOP because of a + * SIGKILL. Don't let the system call actually proceed. + */ -+ syscall_abort(task, regs); -+ else if (signal_pending(task)) { ++ return true; ++ ++ if (unlikely(report.result == UTRACE_SYSCALL_ABORT)) ++ return true; ++ ++ if (signal_pending(task)) { + /* + * Clear TIF_SIGPENDING if it no longer needs to be set. + * It may have been set as part of quiescence, and won't @@ -3504,6 +3618,8 @@ + recalc_sigpending(); + spin_unlock_irq(&task->sighand->siglock); + } ++ ++ return false; +} + +/* From fedora-extras-commits at redhat.com Mon Jul 14 08:16:50 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Mon, 14 Jul 2008 08:16:50 GMT Subject: rpms/uim/devel uim.spec,1.64,1.65 Message-ID: <200807140816.m6E8GoVE029377@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29340 Modified Files: uim.spec Log Message: * Mon Jul 14 2008 Akira TAGOH - 1.5.0-3 - Add missing files. (#454957) Index: uim.spec =================================================================== RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- uim.spec 14 Jul 2008 07:05:36 -0000 1.64 +++ uim.spec 14 Jul 2008 08:15:59 -0000 1.65 @@ -355,7 +355,7 @@ %files -f %{name}.lang %defattr (-, root, root, -) %doc AUTHORS COPYING ChangeLog* NEWS README fep/README.fep fep/README.fep.key xim/README.xim -%lang(ja) fep/README.fep.ja +%lang(ja) %doc fep/README.fep.ja %dir %{_libdir}/uim %dir %{_libdir}/uim/plugin %dir %{_datadir}/uim @@ -368,6 +368,7 @@ %{_datadir}/uim/helperdata %verify(not md5 size mtime) %{_datadir}/uim/installed-modules.scm %verify(not md5 size mtime) %{_datadir}/uim/loader.scm +%ghost %{_localstatedir}/lib/uim/*.scm %exclude %{_datadir}/uim/anthy*.scm %exclude %{_datadir}/uim/canna*.scm %exclude %{_datadir}/uim/m17nlib.scm From fedora-extras-commits at redhat.com Mon Jul 14 08:31:41 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Mon, 14 Jul 2008 08:31:41 GMT Subject: rpms/bind/devel bind.spec,1.273,1.274 Message-ID: <200807140831.m6E8VfjK030154@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30084 Modified Files: bind.spec Log Message: - use %%patch0 for Patch0 (#455061) - correct source address (#455118) Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- bind.spec 11 Jul 2008 10:16:21 -0000 1.273 +++ bind.spec 14 Jul 2008 08:30:47 -0000 1.274 @@ -3,6 +3,7 @@ # %define PREVER b1 +%define VERSION %{version}%{PREVER} %{?!SDB: %define SDB 1} %{?!LIBBIND: %define LIBBIND 1} @@ -18,13 +19,13 @@ Name: bind License: ISC Version: 9.5.1 -Release: 0.1.%{PREVER}%{?dist} +Release: 0.1.1.%{PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: System Environment/Daemons # -Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}%{PREVER}.tar.gz +Source: ftp://ftp.isc.org/isc/bind9/%{VERSION}/bind-%{VERSION}.tar.gz Source1: named.sysconfig Source2: named.init Source3: named.logrotate @@ -174,10 +175,10 @@ Based on the code from Jan "Yenya" Kasprzak %prep -%setup -q -n %{name}-%{version}%{PREVER} +%setup -q -n %{name}-%{VERSION} # Common patches -%patch -p1 -b .varrun +%patch0 -p1 -b .varrun %patch1 -p1 -b .key %patch5 -p1 -b .nonexec %patch10 -p1 -b .PIE @@ -636,6 +637,10 @@ %{_sbindir}/bind-chroot-admin %changelog +* Mon Jul 14 2008 Adam Tkac 32:9.5.1-0.1.1.b1 +- use %%patch0 for Patch0 (#455061) +- correct source address (#455118) + * Tue Jul 08 2008 Adam Tkac 32:9.5.1-0.1.b1 - 9.5.1b1 release (CVE-2008-1447) - dropped bind-9.5-recv-race.patch because upstream doesn't want it From fedora-extras-commits at redhat.com Mon Jul 14 08:40:07 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 14 Jul 2008 08:40:07 GMT Subject: rpms/xfig/devel xfig-3.2.5-modepanel.patch, NONE, 1.1 xfig.spec, 1.51, 1.52 Message-ID: <200807140840.m6E8e7CB030679@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xfig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30624 Modified Files: xfig.spec Added Files: xfig-3.2.5-modepanel.patch Log Message: xfig-3.2.5-modepanel.patch: --- NEW FILE xfig-3.2.5-modepanel.patch --- --- xfig.3.2.5/w_setup.c.dist 2008-07-13 23:49:46.000000000 -0400 +++ xfig.3.2.5/w_setup.c 2008-07-13 23:49:55.000000000 -0400 @@ -23,7 +23,7 @@ #include "w_setup.h" #include "w_util.h" -#define NUM_DRAW_SW 17 /* kludge - shouldn't have to edit this by hand */ +#define NUM_DRAW_SW 15 /* kludge - number of switches above draw line*/ int TOOL_WD, TOOL_HT; int CMDFORM_WD, CMDFORM_HT = CMD_BUT_HT; @@ -94,8 +94,10 @@ /* space for both modepanel titles (Drawing modes and Editing modes) */ MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD - - (MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) + - ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW)); + (MODE_SW_HT + INTERNAL_BW) * + (ceil(((double)NUM_DRAW_SW+1)/SW_PER_ROW) + + ceil(((double)NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW)); + if (MODEPANEL_SPACE < 2) MODEPANEL_SPACE = 2; } Index: xfig.spec =================================================================== RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- xfig.spec 3 Apr 2008 17:39:10 -0000 1.51 +++ xfig.spec 14 Jul 2008 08:39:05 -0000 1.52 @@ -3,7 +3,7 @@ Summary: An X Window System tool for drawing basic vector graphics Name: xfig Version: 3.2.5 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT Group: Applications/Multimedia URL: http://www.xfig.org/ @@ -23,6 +23,7 @@ Patch13: xfig-3.2.5-urwfonts.patch Patch14: xfig-3.2.5-zoom-crash.patch Patch15: xfig-3.2.5-missing-protos.patch +Patch16: xfig-3.2.5-modepanel.patch BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -97,6 +98,7 @@ %patch13 -p1 -b .urw %patch14 -p1 -b .zoom-crash %patch15 -p1 +%patch16 -p1 ln -nfs Doc/xfig.man xfig.man find -type f -print0 | xargs -0 chmod -x rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp @@ -188,6 +190,10 @@ %changelog + +* Mon Jul 14 2008 Ian Hutchinson 3.2.5-11 +- Fix incorrect height of modepanel. + * Thu Apr 3 2008 Hans de Goede 3.2.5-10 - Fix missing prototype compiler warnings From fedora-extras-commits at redhat.com Mon Jul 14 09:00:30 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Mon, 14 Jul 2008 09:00:30 GMT Subject: rpms/rpm/devel rpm-4.5.90-mono-magic.patch, NONE, 1.1 rpm.spec, 1.285, 1.286 Message-ID: <200807140900.m6E90UCM032392@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32352 Modified Files: rpm.spec Added Files: rpm-4.5.90-mono-magic.patch Log Message: - fix mono dependency extraction (adjust for libmagic string change) rpm-4.5.90-mono-magic.patch: --- NEW FILE rpm-4.5.90-mono-magic.patch --- commit b3bd21e9f07272a37c2259070f95b167e6301c79 Author: Panu Matilainen Date: Mon Jul 14 11:53:10 2008 +0300 Fix mono dependency extraction - use "Mono/.Net assembly" instead of "PE executable" for detection, later file reports bitness (eg "PE32 executable"), we just care if its mono or not. This is compatible with older libmagic too. diff --git a/build/rpmfc.c b/build/rpmfc.c index 3cc2d6d..6f15b2c 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -490,7 +490,7 @@ static const struct rpmfcTokens_s const rpmfcTokens[] = { /* XXX .NET executables and libraries. file(1) cannot differ from win32 * executables unfortunately :( */ - { "PE executable", RPMFC_MONO|RPMFC_INCLUDE }, + { "Mono/.Net assembly", RPMFC_MONO|RPMFC_INCLUDE }, { "current ar archive", RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE }, Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.285 retrieving revision 1.286 diff -u -r1.285 -r1.286 --- rpm.spec 12 Jul 2008 15:02:42 -0000 1.285 +++ rpm.spec 14 Jul 2008 08:59:41 -0000 1.286 @@ -18,7 +18,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.6 +Release: 0.%{snapver}.7 Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -31,7 +31,9 @@ # XXX only create provides for pkgconfig and libtool initially Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch +# These are already upstream, drop on next snapshot update: Patch200: rpm-4.5.90-digestlen.patch +Patch201: rpm-4.5.90-mono-magic.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -158,7 +160,9 @@ %patch0 -p1 -b .devel-autodep %patch1 -p1 -b .pkgconfig-path %patch100 -p1 -b .pkgconfig-deps + %patch200 -p1 -b .diglen +%patch201 -p1 -b .mono-magic %if %{with int_bdb} ln -s db-%{bdbver} db @@ -334,6 +338,10 @@ %doc doc/librpm/html/* %changelog +* Mon Jul 14 2008 Panu Matilainen +- 4.5.90-0.git8426.7 +- fix mono dependency extraction (adjust for libmagic string change) + * Sat Jul 12 2008 Panu Matilainen - 4.5.90-0.git8426.6 - fix type mismatch causing funky breakage on ppc64 From fedora-extras-commits at redhat.com Mon Jul 14 09:07:50 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 09:07:50 GMT Subject: rpms/xfce4-mpc-plugin/devel import.log, NONE, 1.1 xfce4-mpc-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807140907.m6E97oTl006996@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-mpc-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6938/devel Modified Files: .cvsignore sources Added Files: import.log xfce4-mpc-plugin.spec Log Message: Initial import of xfce4-mpc-plugin. Review is at https://bugzilla.redhat.com/show_bug.cgi?id=455071 --- NEW FILE import.log --- xfce4-mpc-plugin-0_3_3-1_fc10:HEAD:xfce4-mpc-plugin-0.3.3-1.fc10.src.rpm:1216026319 --- NEW FILE xfce4-mpc-plugin.spec --- Name: xfce4-mpc-plugin Version: 0.3.3 Release: 1%{?dist} Summary: MPD client for the Xfce panel Group: User Interface/Desktops License: BSD URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.90.2 BuildRequires: gettext, perl(XML::Parser) BuildRequires: libmpd-devel >= 0.12 Requires: xfce4-panel >= 4.4.2 %description A simple client plugin for MPD, the Music Player Daemon. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %changelog * Fri Jul 11 2008 Christoph Wickert - 0.3.3-1 - Update to 0.3.3 on Xfce 4.4.2 * Sat Aug 25 2007 Christoph Wickert - 0.3.2-1 - Update to 0.3.2 - Update license tag * Sat Apr 28 2007 Christoph Wickert - 0.3.1-2 - Rebuild for Xfce 4.4.1 * Sat Feb 03 2007 Christoph Wickert - 0.3.1-1 - Update to 0.3.1 * Mon Jan 22 2007 Christoph Wickert - 0.3.0-1 - Update to 0.3.0 on Xfce 4.4 * Sat Nov 11 2006 Christoph Wickert - 0.2.0-1 - Update to 0.2.0 * Sat Sep 23 2006 Christoph Wickert - 0.1.0-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 03:04:26 -0000 1.1 +++ .cvsignore 14 Jul 2008 09:06:53 -0000 1.2 @@ -0,0 +1 @@ +xfce4-mpc-plugin-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 03:04:26 -0000 1.1 +++ sources 14 Jul 2008 09:06:53 -0000 1.2 @@ -0,0 +1 @@ +b4f7f67589f34f77973a51dd5069712d xfce4-mpc-plugin-0.3.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 09:09:57 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Mon, 14 Jul 2008 09:09:57 GMT Subject: rpms/gdb/devel gdb-6.3-bz231832-obstack-2gb.patch, 1.1, 1.2 gdb-6.3-gstack-20050411.patch, 1.1, 1.2 gdb-6.3-ia64-sigtramp-frame-20050708.patch, 1.2, 1.3 gdb-6.3-ppc64syscall-20040622.patch, 1.3, 1.4 gdb-6.3-readnever-20050907.patch, 1.1, 1.2 gdb-6.3-rh-testversion-20041202.patch, 1.2, 1.3 gdb-6.3-sepcrc-20050402.patch, 1.2, 1.3 gdb-6.3-sigx86-20040621.patch, 1.1, 1.2 gdb-6.3-test-sepcrc-20050402.patch, 1.2, 1.3 gdb-6.3-type-fix-20041213.patch, 1.1, 1.2 gdb-6.5-bz190810-gdbserver-arch-advice.patch, 1.2, 1.3 gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch, 1.1, 1.2 gdb-6.6-gcore32-test.patch, 1.1, 1.2 gdb-6.6-vdso-i386-on-amd64-warning.patch, 1.3, 1.4 gdb-6.8-constant-watchpoints.patch, 1.2, 1.3 gdb-6.8-disable-randomization.patch, 1.1, 1.2 gdb-6.8-inlining.patch, 1.1, 1.2 gdb-6.8-upstream.patch, 1.5, 1.6 gdb.spec, 1.297, 1.298 Message-ID: <200807140909.m6E99vkP007203@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075 Modified Files: gdb-6.3-bz231832-obstack-2gb.patch gdb-6.3-gstack-20050411.patch gdb-6.3-ia64-sigtramp-frame-20050708.patch gdb-6.3-ppc64syscall-20040622.patch gdb-6.3-readnever-20050907.patch gdb-6.3-rh-testversion-20041202.patch gdb-6.3-sepcrc-20050402.patch gdb-6.3-sigx86-20040621.patch gdb-6.3-test-sepcrc-20050402.patch gdb-6.3-type-fix-20041213.patch gdb-6.5-bz190810-gdbserver-arch-advice.patch gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch gdb-6.6-gcore32-test.patch gdb-6.6-vdso-i386-on-amd64-warning.patch gdb-6.8-constant-watchpoints.patch gdb-6.8-disable-randomization.patch gdb-6.8-inlining.patch gdb-6.8-upstream.patch gdb.spec Log Message: * Mon Jul 14 2008 Jan Kratochvil - 6.8-17 - Refresh the patchset with fuzz 0 (for new rpmbuild). gdb-6.3-bz231832-obstack-2gb.patch: Index: gdb-6.3-bz231832-obstack-2gb.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-bz231832-obstack-2gb.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-bz231832-obstack-2gb.patch 12 Mar 2007 16:02:43 -0000 1.1 +++ gdb-6.3-bz231832-obstack-2gb.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -1,10 +1,12 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=231832 -diff -u -rup gdb-6.6-orig/gdb/symmisc.c gdb-6.6/gdb/symmisc.c ---- gdb-6.6-orig/gdb/symmisc.c 2005-12-17 17:34:03.000000000 -0500 -+++ gdb-6.6/gdb/symmisc.c 2007-03-12 09:38:26.000000000 -0400 -@@ -233,7 +233,7 @@ print_objfile_statistics (void) +Index: gdb-6.8/gdb/symmisc.c +=================================================================== +--- gdb-6.8.orig/gdb/symmisc.c 2008-03-17 16:06:24.000000000 +0100 ++++ gdb-6.8/gdb/symmisc.c 2008-07-14 10:27:50.000000000 +0200 +@@ -230,8 +230,8 @@ print_objfile_statistics (void) + if (OBJSTAT (objfile, sz_strtab) > 0) printf_filtered (_(" Space used by a.out string tables: %d\n"), OBJSTAT (objfile, sz_strtab)); - printf_filtered (_(" Total memory used for objfile obstack: %d\n"), @@ -14,9 +16,10 @@ printf_filtered (_(" Total memory used for psymbol cache: %d\n"), bcache_memory_used (objfile->psymbol_cache)); printf_filtered (_(" Total memory used for macro cache: %d\n"), -diff -u -rup gdb-6.6-orig/include/obstack.h gdb-6.6/include/obstack.h ---- gdb-6.6-orig/include/obstack.h 2005-05-10 06:21:08.000000000 -0400 -+++ gdb-6.6/include/obstack.h 2007-03-12 09:37:50.000000000 -0400 +Index: gdb-6.8/include/obstack.h +=================================================================== +--- gdb-6.8.orig/include/obstack.h 2005-05-10 12:21:08.000000000 +0200 ++++ gdb-6.8/include/obstack.h 2008-07-14 10:27:50.000000000 +0200 @@ -188,31 +188,31 @@ struct obstack /* control current objec /* Declare the external functions we use; they are in obstack.c. */ @@ -131,9 +134,10 @@ = (h)->temp + (char *) (h)->chunk) \ : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0))) -diff -u -rup gdb-6.6-orig/libiberty/obstack.c gdb-6.6/libiberty/obstack.c ---- gdb-6.6-orig/libiberty/obstack.c 2005-05-10 11:33:33.000000000 -0400 -+++ gdb-6.6/libiberty/obstack.c 2007-03-12 09:40:16.000000000 -0400 +Index: gdb-6.8/libiberty/obstack.c +=================================================================== +--- gdb-6.8.orig/libiberty/obstack.c 2005-05-10 17:33:33.000000000 +0200 ++++ gdb-6.8/libiberty/obstack.c 2008-07-14 10:27:50.000000000 +0200 @@ -44,9 +44,11 @@ #if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 #include gdb-6.3-gstack-20050411.patch: Index: gdb-6.3-gstack-20050411.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-gstack-20050411.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-gstack-20050411.patch 11 Apr 2005 20:52:56 -0000 1.1 +++ gdb-6.3-gstack-20050411.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -4,10 +4,11 @@ to install and uninstall. * gstack.sh, gstack.1: New files. -diff -uN -r ../orig/gdb/Makefile.in ./gdb/Makefile.in ---- ../orig/gdb/Makefile.in 2004-11-23 13:31:03.000000000 -0500 -+++ ./gdb/Makefile.in 2004-11-23 15:06:34.623389592 -0500 -@@ -970,7 +970,7 @@ +Index: gdb-6.8/gdb/Makefile.in +=================================================================== +--- gdb-6.8.orig/gdb/Makefile.in 2008-03-17 13:15:08.000000000 +0100 ++++ gdb-6.8/gdb/Makefile.in 2008-07-14 10:25:47.000000000 +0200 +@@ -1161,7 +1161,7 @@ gdb.z:gdb.1 # time it takes for make to check that all is up to date. # install-only is intended to address that need. install: all install-only @@ -16,7 +17,7 @@ transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e "$$t"` ; \ if test "x$$transformed_name" = x; then \ -@@ -1002,9 +1002,26 @@ +@@ -1193,9 +1193,26 @@ install-tui: $(DESTDIR)$(man1dir) ; \ $(INSTALL_DATA) $(srcdir)/gdb.1 \ $(DESTDIR)$(man1dir)/$$transformed_name.1 @@ -44,7 +45,7 @@ transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e $$t` ; \ if test "x$$transformed_name" = x; then \ -@@ -1026,6 +1043,17 @@ +@@ -1217,6 +1234,17 @@ uninstall-tui: fi ; \ rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \ $(DESTDIR)$(man1dir)/$$transformed_name.1 @@ -60,10 +61,12 @@ + rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \ + $(DESTDIR)$(man1dir)/$$transformed_name.1 - # We do this by grepping through sources. If that turns out to be too slow, - # maybe we could just require every .o file to have an initialization routine ---- /dev/null 2005-04-09 23:51:05.027867440 -0400 -+++ ./gdb/gstack.sh 2005-04-08 18:00:49.000000000 -0400 + # The C++ name parser can be built standalone for testing. + test-cp-name-parser.o: cp-name-parser.c $(safe_ctype_h) $(libiberty_h) \ +Index: gdb-6.8/gdb/gstack.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/gstack.sh 2008-07-14 10:25:47.000000000 +0200 @@ -0,0 +1,45 @@ +#!/bin/sh + gdb-6.3-ia64-sigtramp-frame-20050708.patch: Index: gdb-6.3-ia64-sigtramp-frame-20050708.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ia64-sigtramp-frame-20050708.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-ia64-sigtramp-frame-20050708.patch 16 Apr 2008 15:00:25 -0000 1.2 +++ gdb-6.3-ia64-sigtramp-frame-20050708.patch 14 Jul 2008 09:09:04 -0000 1.3 @@ -8,9 +8,11 @@ * ia64-tdep.c (ia64_sigtramp_frame_prev_register): Fix an ISO C compliance compilation error. ---- gdb-6.3/gdb/ia64-tdep.c.fix 2005-07-08 20:26:37.000000000 -0400 -+++ gdb-6.3/gdb/ia64-tdep.c 2005-07-08 20:27:41.000000000 -0400 -@@ -2037,7 +2037,100 @@ ia64_sigtramp_frame_prev_register (struc +Index: gdb-6.8/gdb/ia64-tdep.c +=================================================================== +--- gdb-6.8.orig/gdb/ia64-tdep.c 2008-07-14 10:24:32.000000000 +0200 ++++ gdb-6.8/gdb/ia64-tdep.c 2008-07-14 10:26:46.000000000 +0200 +@@ -2043,7 +2043,100 @@ ia64_sigtramp_frame_prev_register (struc pc &= ~0xf; store_unsigned_integer (valuep, 8, pc); } @@ -112,8 +114,8 @@ (regnum >= V32_REGNUM && regnum <= V127_REGNUM)) { CORE_ADDR addr = 0; -@@ -2051,6 +2144,39 @@ ia64_sigtramp_frame_prev_register (struc - read_memory (addr, valuep, register_size (current_gdbarch, regnum)); +@@ -2057,6 +2150,39 @@ ia64_sigtramp_frame_prev_register (struc + read_memory (addr, valuep, register_size (gdbarch, regnum)); } } + else if (VP0_REGNUM <= regnum && regnum <= VP63_REGNUM) gdb-6.3-ppc64syscall-20040622.patch: Index: gdb-6.3-ppc64syscall-20040622.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ppc64syscall-20040622.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-ppc64syscall-20040622.patch 11 Jul 2006 15:36:44 -0000 1.3 +++ gdb-6.3-ppc64syscall-20040622.patch 14 Jul 2008 09:09:04 -0000 1.4 @@ -6,11 +6,11 @@ use to skip over first half of a GNU/Linux syscall and update "func_start". -Index: gdb-6.5/gdb/rs6000-tdep.c +Index: gdb-6.8/gdb/rs6000-tdep.c =================================================================== ---- gdb-6.5.orig/gdb/rs6000-tdep.c 2006-07-11 02:57:24.000000000 -0300 -+++ gdb-6.5/gdb/rs6000-tdep.c 2006-07-11 12:32:05.000000000 -0300 -@@ -76,6 +76,7 @@ +--- gdb-6.8.orig/gdb/rs6000-tdep.c 2008-02-20 15:34:43.000000000 +0100 ++++ gdb-6.8/gdb/rs6000-tdep.c 2008-07-14 10:25:29.000000000 +0200 +@@ -124,6 +124,7 @@ static const char *powerpc_vector_abi_st struct rs6000_framedata { @@ -18,33 +18,31 @@ int offset; /* total size of frame --- the distance by which we decrement sp to allocate the frame */ -@@ -905,7 +906,6 @@ store_param_on_stack_p (unsigned long op - static CORE_ADDR - skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata) +@@ -1262,7 +1263,6 @@ static CORE_ADDR + skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, + struct rs6000_framedata *fdata) { - CORE_ADDR orig_pc = pc; CORE_ADDR last_prologue_pc = pc; CORE_ADDR li_found_pc = 0; gdb_byte buf[4]; -@@ -923,6 +923,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l +@@ -1280,11 +1280,13 @@ skip_prologue (struct gdbarch *gdbarch, int minimal_toc_loaded = 0; int prev_insn_was_prologue_insn = 1; int num_skip_non_prologue_insns = 0; + int num_skip_ppc64_gnu_linux_syscall_insn = 0; int r0_contains_arg = 0; - const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (current_gdbarch); - struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); -@@ -943,6 +944,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l - lim_pc = refine_prologue_limit (pc, lim_pc); + const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); memset (fdata, 0, sizeof (struct rs6000_framedata)); + fdata->func_start = pc; fdata->saved_gpr = -1; fdata->saved_fpr = -1; fdata->saved_vr = -1; -@@ -971,6 +973,55 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l +@@ -1313,6 +1315,55 @@ skip_prologue (struct gdbarch *gdbarch, break; - op = extract_signed_integer (buf, 4); + op = extract_unsigned_integer (buf, 4); + /* A PPC64 GNU/Linux system call function is split into two + sub-functions: a non-threaded fast-path (__NAME_nocancel) @@ -98,7 +96,7 @@ if ((op & 0xfc1fffff) == 0x7c0802a6) { /* mflr Rx */ /* Since shared library / PIC code, which needs to get its -@@ -1138,9 +1189,9 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l +@@ -1486,9 +1537,9 @@ skip_prologue (struct gdbarch *gdbarch, we have no line table information or the line info tells us that the subroutine call is not part of the line associated with the prologue. */ gdb-6.3-readnever-20050907.patch: Index: gdb-6.3-readnever-20050907.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-readnever-20050907.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-readnever-20050907.patch 7 Sep 2005 18:57:23 -0000 1.1 +++ gdb-6.3-readnever-20050907.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -11,9 +11,11 @@ * gdb.texinfo (File Options): Document --readnever. ---- gdb-6.3/gdb/doc/gdb.texinfo.fix 2005-09-07 13:32:23.000000000 -0400 -+++ gdb-6.3/gdb/doc/gdb.texinfo 2005-09-07 13:33:21.000000000 -0400 -@@ -952,6 +952,12 @@ Read each symbol file's entire symbol ta +Index: gdb-6.8/gdb/doc/gdb.texinfo +=================================================================== +--- gdb-6.8.orig/gdb/doc/gdb.texinfo 2008-03-26 19:38:21.000000000 +0100 ++++ gdb-6.8/gdb/doc/gdb.texinfo 2008-07-14 10:27:01.000000000 +0200 +@@ -983,6 +983,12 @@ Read each symbol file's entire symbol ta the default, which is to read it incrementally as it is needed. This makes startup slower, but makes future operations faster. @@ -25,10 +27,12 @@ + @end table - You typically combine the @code{-mapped} and @code{-readnow} options in ---- gdb-6.3/gdb/main.c.fix 2005-09-07 13:31:43.000000000 -0400 -+++ gdb-6.3/gdb/main.c 2005-09-07 13:33:21.000000000 -0400 -@@ -250,6 +250,7 @@ captured_main (void *data) + @node Mode Options +Index: gdb-6.8/gdb/main.c +=================================================================== +--- gdb-6.8.orig/gdb/main.c 2008-07-14 10:26:39.000000000 +0200 ++++ gdb-6.8/gdb/main.c 2008-07-14 10:27:01.000000000 +0200 +@@ -296,6 +296,7 @@ captured_main (void *data) {"xdb", no_argument, &xdb_commands, 1}, {"dbx", no_argument, &dbx_commands, 1}, {"readnow", no_argument, &readnow_symbol_files, 1}, @@ -36,7 +40,7 @@ {"r", no_argument, &readnow_symbol_files, 1}, {"quiet", no_argument, &quiet, 1}, {"q", no_argument, &quiet, 1}, -@@ -861,6 +862,7 @@ Options:\n\n\ +@@ -947,6 +948,7 @@ Options:\n\n\ fputs_unfiltered (_(" file.\n\ --quiet Do not print version number on startup.\n\ --readnow Fully read symbol files on first access.\n\ @@ -44,9 +48,11 @@ "), stream); fputs_unfiltered (_("\ --se=FILE Use FILE as symbol file and executable file.\n\ ---- gdb-6.3/gdb/symfile.c.fix 2005-09-07 13:31:48.000000000 -0400 -+++ gdb-6.3/gdb/symfile.c 2005-09-07 13:33:21.000000000 -0400 -@@ -75,6 +75,7 @@ static void clear_symtab_users_cleanup ( +Index: gdb-6.8/gdb/symfile.c +=================================================================== +--- gdb-6.8.orig/gdb/symfile.c 2008-07-14 10:26:30.000000000 +0200 ++++ gdb-6.8/gdb/symfile.c 2008-07-14 10:27:01.000000000 +0200 +@@ -76,6 +76,7 @@ static void clear_symtab_users_cleanup ( /* Global variables owned by this file */ int readnow_symbol_files; /* Read full symbols immediately */ @@ -54,9 +60,11 @@ /* External variables and functions referenced. */ ---- gdb-6.3/gdb/dwarf2read.c.fix 2005-09-07 13:31:58.000000000 -0400 -+++ gdb-6.3/gdb/dwarf2read.c 2005-09-07 13:34:03.000000000 -0400 -@@ -45,6 +45,7 @@ +Index: gdb-6.8/gdb/dwarf2read.c +=================================================================== +--- gdb-6.8.orig/gdb/dwarf2read.c 2008-07-14 10:26:09.000000000 +0200 ++++ gdb-6.8/gdb/dwarf2read.c 2008-07-14 10:27:01.000000000 +0200 +@@ -43,6 +43,7 @@ #include "dwarf2loc.h" #include "cp-support.h" #include "hashtab.h" @@ -64,7 +72,7 @@ #include "command.h" #include "gdbcmd.h" -@@ -1100,7 +1101,8 @@ dwarf2_has_info (struct objfile *objfile +@@ -1106,7 +1107,8 @@ dwarf2_has_info (struct objfile *objfile dwarf_loc_section = 0; bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, NULL); @@ -74,9 +82,11 @@ } /* This function is mapped across the sections and remembers the ---- gdb-6.3/gdb/top.h.fix 2005-09-07 13:32:08.000000000 -0400 -+++ gdb-6.3/gdb/top.h 2005-09-07 13:33:21.000000000 -0400 -@@ -57,6 +57,7 @@ extern void set_prompt (char *); +Index: gdb-6.8/gdb/top.h +=================================================================== +--- gdb-6.8.orig/gdb/top.h 2008-01-01 23:53:13.000000000 +0100 ++++ gdb-6.8/gdb/top.h 2008-07-14 10:27:01.000000000 +0200 +@@ -59,6 +59,7 @@ extern void set_prompt (char *); /* From random places. */ extern int readnow_symbol_files; gdb-6.3-rh-testversion-20041202.patch: Index: gdb-6.3-rh-testversion-20041202.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-rh-testversion-20041202.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-rh-testversion-20041202.patch 4 Mar 2008 14:42:19 -0000 1.2 +++ gdb-6.3-rh-testversion-20041202.patch 14 Jul 2008 09:09:04 -0000 1.3 @@ -3,9 +3,11 @@ * gdb.gdb/selftest.exp: Add matching on specific Red Hat only version string. ---- ./gdb/testsuite/gdb.gdb/selftest.exp.1 Fri Jul 11 09:44:09 2003 -+++ ./gdb/testsuite/gdb.gdb/selftest.exp Fri Jul 11 09:44:16 2003 -@@ -314,7 +314,10 @@ proc test_with_self { executable } { +Index: gdb-6.8/gdb/testsuite/gdb.gdb/selftest.exp +=================================================================== +--- gdb-6.8.orig/gdb/testsuite/gdb.gdb/selftest.exp 2008-01-26 14:56:37.000000000 +0100 ++++ gdb-6.8/gdb/testsuite/gdb.gdb/selftest.exp 2008-07-14 10:23:50.000000000 +0200 +@@ -354,6 +354,9 @@ proc test_with_self { executable } { -re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" { pass "printed version with cast" } gdb-6.3-sepcrc-20050402.patch: Index: gdb-6.3-sepcrc-20050402.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-sepcrc-20050402.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-sepcrc-20050402.patch 1 Nov 2007 20:24:20 -0000 1.2 +++ gdb-6.3-sepcrc-20050402.patch 14 Jul 2008 09:09:04 -0000 1.3 @@ -4,9 +4,11 @@ print a warning. (find_separate_debug_file): Pass in the objfile's name. ---- ../gdb-6.3/./gdb/symfile.c 2005-04-02 16:02:22.000000000 -0500 -+++ ./gdb/symfile.c 2005-04-02 13:05:10.000000000 -0500 -@@ -1043,7 +1043,8 @@ +Index: gdb-6.8/gdb/symfile.c +=================================================================== +--- gdb-6.8.orig/gdb/symfile.c 2008-01-29 23:47:20.000000000 +0100 ++++ gdb-6.8/gdb/symfile.c 2008-07-14 10:26:30.000000000 +0200 +@@ -1348,7 +1348,8 @@ get_debug_link_info (struct objfile *obj } static int @@ -16,7 +18,7 @@ { unsigned long file_crc = 0; int fd; -@@ -1052,6 +1053,12 @@ +@@ -1357,6 +1358,12 @@ separate_debug_file_exists (const char * fd = open (name, O_RDONLY | O_BINARY); if (fd < 0) @@ -29,7 +31,7 @@ return 0; while ((count = read (fd, buffer, sizeof (buffer))) > 0) -@@ -1059,7 +1066,16 @@ +@@ -1364,7 +1371,16 @@ separate_debug_file_exists (const char * close (fd); @@ -46,8 +48,8 @@ + return 1; } - static char *debug_file_directory = NULL; -@@ -1083,6 +1099,8 @@ + char *debug_file_directory = NULL; +@@ -1416,6 +1432,8 @@ find_separate_debug_file (struct objfile basename = get_debug_link_info (objfile, &crc32); if (basename == NULL) @@ -56,7 +58,7 @@ return NULL; dir = xstrdup (objfile->name); -@@ -1110,7 +1128,7 @@ +@@ -1443,7 +1461,7 @@ find_separate_debug_file (struct objfile strcpy (debugfile, dir); strcat (debugfile, basename); @@ -65,7 +67,7 @@ { xfree (basename); xfree (dir); -@@ -1123,7 +1141,7 @@ +@@ -1456,7 +1474,7 @@ find_separate_debug_file (struct objfile strcat (debugfile, "/"); strcat (debugfile, basename); @@ -74,7 +76,7 @@ { xfree (basename); xfree (dir); -@@ -1136,7 +1154,7 @@ +@@ -1469,7 +1487,7 @@ find_separate_debug_file (struct objfile strcat (debugfile, dir); strcat (debugfile, basename); @@ -83,12 +85,12 @@ { xfree (basename); xfree (dir); -@@ -1952,7 +1952,7 @@ find_separate_debug_file (struct objfile +@@ -1488,7 +1506,7 @@ find_separate_debug_file (struct objfile strcat (debugfile, "/"); strcat (debugfile, basename); - if (separate_debug_file_exists (debugfile, crc32)) + if (separate_debug_file_exists (debugfile, crc32, objfile->name)) { - xfree (build_id_filename); xfree (canon_name); + xfree (basename); gdb-6.3-sigx86-20040621.patch: Index: gdb-6.3-sigx86-20040621.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-sigx86-20040621.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-sigx86-20040621.patch 2 Dec 2004 16:46:32 -0000 1.1 +++ gdb-6.3-sigx86-20040621.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -6,13 +6,10 @@ Register the dwarf2-frame sniffer, but after the signal trampoline sniffer. -Index: ./gdb/amd64-tdep.c +Index: gdb-6.8/gdb/amd64-tdep.c =================================================================== -RCS file: /cvs/src/src/gdb/amd64-tdep.c,v -retrieving revision 1.15 -diff -p -u -r1.15 amd64-tdep.c ---- ./gdb/amd64-tdep.c 7 Jun 2004 02:02:45 -0000 1.15 -+++ ./gdb/amd64-tdep.c 21 Jun 2004 20:16:34 -0000 +--- gdb-6.8.orig/gdb/amd64-tdep.c 2008-03-04 20:49:39.000000000 +0100 ++++ gdb-6.8/gdb/amd64-tdep.c 2008-07-14 10:24:54.000000000 +0200 @@ -34,7 +34,7 @@ #include "regcache.h" #include "regset.h" @@ -22,8 +19,8 @@ #include "gdb_assert.h" #include "amd64-tdep.h" -@@ -1171,6 +1171,8 @@ amd64_init_abi (struct gdbarch_info info - set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section); +@@ -1167,6 +1167,8 @@ amd64_init_abi (struct gdbarch_info info + set_gdbarch_unwind_dummy_id (gdbarch, amd64_unwind_dummy_id); frame_unwind_append_sniffer (gdbarch, amd64_sigtramp_frame_sniffer); + /* Hook in the DWARF CFI frame unwinder after sigtramp. */ @@ -31,14 +28,11 @@ frame_unwind_append_sniffer (gdbarch, amd64_frame_sniffer); frame_base_set_default (gdbarch, &amd64_frame_base); -Index: ./gdb/i386-tdep.c +Index: gdb-6.8/gdb/i386-tdep.c =================================================================== -RCS file: /cvs/src/src/gdb/i386-tdep.c,v -retrieving revision 1.197 -diff -p -u -r1.197 i386-tdep.c ---- ./gdb/i386-tdep.c 18 Jun 2004 16:06:24 -0000 1.197 -+++ ./gdb/i386-tdep.c 21 Jun 2004 20:16:34 -0000 -@@ -2131,15 +2131,14 @@ i386_gdbarch_init (struct gdbarch_info i +--- gdb-6.8.orig/gdb/i386-tdep.c 2008-03-04 20:49:39.000000000 +0100 ++++ gdb-6.8/gdb/i386-tdep.c 2008-07-14 10:24:54.000000000 +0200 +@@ -2480,15 +2480,14 @@ i386_gdbarch_init (struct gdbarch_info i /* Helper for function argument information. */ set_gdbarch_fetch_pointer_argument (gdbarch, i386_fetch_pointer_argument); gdb-6.3-test-sepcrc-20050402.patch: Index: gdb-6.3-test-sepcrc-20050402.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-sepcrc-20050402.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-test-sepcrc-20050402.patch 21 Jan 2007 01:53:01 -0000 1.2 +++ gdb-6.3-test-sepcrc-20050402.patch 14 Jul 2008 09:09:04 -0000 1.3 @@ -1,10 +1,10 @@ -Index: gdb-6.6/gdb/testsuite/gdb.base/sepdebug.exp +Index: gdb-6.8/gdb/testsuite/gdb.base/sepdebug.exp =================================================================== ---- gdb-6.6.orig/gdb/testsuite/gdb.base/sepdebug.exp 2006-10-17 22:17:45.000000000 +0200 -+++ gdb-6.6/gdb/testsuite/gdb.base/sepdebug.exp 2007-01-20 18:39:26.000000000 +0100 -@@ -953,3 +953,40 @@ if [istarget "*-*-vxworks*"] { - send_gdb "set args main\n" - gdb_expect -re ".*$gdb_prompt $" {} +--- gdb-6.8.orig/gdb/testsuite/gdb.base/sepdebug.exp 2008-02-26 09:14:11.000000000 +0100 ++++ gdb-6.8/gdb/testsuite/gdb.base/sepdebug.exp 2008-07-14 10:26:19.000000000 +0200 +@@ -981,3 +981,40 @@ if ![string compare $build_id_debug_file + # Spare debug files may confuse testsuite runs in the future. + remote_exec build "rm -f ${objdir}/${subdir}/${build_id_debug_filename}" } + + @@ -43,10 +43,10 @@ + exp_continue + } +} -Index: gdb-6.6/gdb/testsuite/gdb.base/sepdebug2.c +Index: gdb-6.8/gdb/testsuite/gdb.base/sepdebug2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.6/gdb/testsuite/gdb.base/sepdebug2.c 2007-01-20 18:41:35.000000000 +0100 ++++ gdb-6.8/gdb/testsuite/gdb.base/sepdebug2.c 2008-07-14 10:26:19.000000000 +0200 @@ -0,0 +1,5 @@ +int +main (int argc, char *argv[], char *envp[]) gdb-6.3-type-fix-20041213.patch: Index: gdb-6.3-type-fix-20041213.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-type-fix-20041213.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-type-fix-20041213.patch 14 Dec 2004 01:04:19 -0000 1.1 +++ gdb-6.3-type-fix-20041213.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -3,9 +3,11 @@ * dwarf2read.c (read_type_die): Ensure that structures, unions, enumerations, and base types create symbols. ---- gdb-6.3/gdb/dwarf2read.c.fix2 Mon Dec 13 19:44:08 2004 -+++ gdb-6.3/gdb/dwarf2read.c Mon Dec 13 20:00:42 2004 -@@ -7178,9 +7178,11 @@ read_type_die (struct die_info *die, str +Index: gdb-6.8/gdb/dwarf2read.c +=================================================================== +--- gdb-6.8.orig/gdb/dwarf2read.c 2008-03-10 15:18:10.000000000 +0100 ++++ gdb-6.8/gdb/dwarf2read.c 2008-07-14 10:26:01.000000000 +0200 +@@ -7711,9 +7711,11 @@ read_type_die (struct die_info *die, str case DW_TAG_structure_type: case DW_TAG_union_type: read_structure_type (die, cu); @@ -17,11 +19,11 @@ break; case DW_TAG_subprogram: case DW_TAG_subroutine_type: -@@ -7215,6 +7217,7 @@ read_type_die (struct die_info *die, str +@@ -7751,6 +7753,7 @@ read_type_die (struct die_info *die, str break; case DW_TAG_base_type: read_base_type (die, cu); + new_symbol (die, die->type, cu); break; - default: - complaint (&symfile_complaints, "unexepected tag in read_type_die: '%s'", + case DW_TAG_unspecified_type: + read_unspecified_type (die, cu); gdb-6.5-bz190810-gdbserver-arch-advice.patch: Index: gdb-6.5-bz190810-gdbserver-arch-advice.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz190810-gdbserver-arch-advice.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.5-bz190810-gdbserver-arch-advice.patch 21 Jan 2007 01:53:01 -0000 1.2 +++ gdb-6.5-bz190810-gdbserver-arch-advice.patch 14 Jul 2008 09:09:04 -0000 1.3 @@ -7,11 +7,11 @@ (remote_async_wait): Likewise. -Index: gdb-6.6/gdb/remote.c +Index: gdb-6.8/gdb/remote.c =================================================================== ---- gdb-6.6.orig/gdb/remote.c 2007-01-20 06:43:04.000000000 +0100 -+++ gdb-6.6/gdb/remote.c 2007-01-20 06:55:50.000000000 +0100 -@@ -3111,8 +3111,13 @@ Packet: '%s'\n"), +--- gdb-6.8.orig/gdb/remote.c 2008-07-14 10:27:07.000000000 +0200 ++++ gdb-6.8/gdb/remote.c 2008-07-14 10:27:17.000000000 +0200 +@@ -3509,8 +3509,13 @@ Packet: '%s'\n"), reg->regnum, regs); } @@ -26,8 +26,8 @@ buf, p); } } -@@ -3307,8 +3312,13 @@ Packet: '%s'\n"), - regcache_raw_supply (current_regcache, reg->regnum, regs); +@@ -3737,8 +3742,13 @@ Packet: '%s'\n"), + reg->regnum, regs); } + /* It may also occur on amd64 which defaults to 32-bit i386 gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch: Index: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch 23 Dec 2006 21:32:21 -0000 1.1 +++ gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -1,10 +1,11 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379 -diff -u -rup -x testsuite gdb-6.5-orig/gdb/symtab.c gdb-6.5/gdb/symtab.c ---- gdb-6.5-orig/gdb/symtab.c 2006-12-17 11:59:52.000000000 +0100 -+++ gdb-6.5/gdb/symtab.c 2006-12-17 11:56:03.000000000 +0100 -@@ -2139,6 +2139,13 @@ find_pc_sect_line (CORE_ADDR pc, struct +Index: gdb-6.8/gdb/symtab.c +=================================================================== +--- gdb-6.8.orig/gdb/symtab.c 2008-02-05 23:17:40.000000000 +0100 ++++ gdb-6.8/gdb/symtab.c 2008-07-14 10:27:32.000000000 +0200 +@@ -2132,6 +2132,13 @@ find_pc_sect_line (CORE_ADDR pc, struct /* See above comment about why warning is commented out */ /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_LINKAGE_NAME (msymbol)) */ ; /* fall through */ @@ -16,5 +17,5 @@ + warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", SYMBOL_LINKAGE_NAME (msymbol), paddr (pc)); + /* fall through */ else - return find_pc_line (SYMBOL_VALUE (mfunsym), 0); + return find_pc_line (SYMBOL_VALUE_ADDRESS (mfunsym), 0); } gdb-6.6-gcore32-test.patch: Index: gdb-6.6-gcore32-test.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-gcore32-test.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.6-gcore32-test.patch 25 Apr 2007 21:13:29 -0000 1.1 +++ gdb-6.6-gcore32-test.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -3,9 +3,11 @@ UNSUPPORTED results are valid for `-m64' on 32bit targets. ---- ./gdb/testsuite/gdb.base/gcore.exp 9 Jan 2007 17:59:11 -0000 1.9 -+++ ./gdb/testsuite/gdb.base/gcore.exp 23 Apr 2007 19:20:12 -0000 -@@ -31,9 +31,14 @@ set testfile "gcore" +Index: gdb-6.8/gdb/testsuite/gdb.base/gcore.exp +=================================================================== +--- gdb-6.8.orig/gdb/testsuite/gdb.base/gcore.exp 2008-01-01 23:53:19.000000000 +0100 ++++ gdb-6.8/gdb/testsuite/gdb.base/gcore.exp 2008-07-14 10:28:05.000000000 +0200 +@@ -30,9 +30,14 @@ set testfile "gcore" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} @@ -23,7 +25,7 @@ } # Start with a fresh gdb. -@@ -48,23 +52,23 @@ send_gdb "help gcore\n" +@@ -47,23 +52,23 @@ send_gdb "help gcore\n" gdb_expect { -re "Undefined command: .gcore.*$gdb_prompt $" { # gcore command not supported -- nothing to test here. @@ -54,7 +56,7 @@ } proc capture_command_output { command prefix } { -@@ -78,7 +82,7 @@ proc capture_command_output { command pr +@@ -77,7 +82,7 @@ proc capture_command_output { command pr set output_string $expect_out(1,string) } default { @@ -63,9 +65,9 @@ } } return $output_string -@@ -109,15 +113,15 @@ set pre_corefile_extern_array \ - set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test] +@@ -109,22 +114,22 @@ set escapedfilename [string_to_regexp ${ + set core_supported 0 gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \ - "save a corefile" \ + "${prefix} save a corefile" \ @@ -82,16 +84,15 @@ global core_supported set core_supported 0 } -@@ -125,7 +129,7 @@ gdb_test_multiple "gcore ${objdir}/${sub + } - global core_supported if {!$core_supported} { - return -1 + continue } # Now restart gdb and load the corefile. -@@ -137,31 +141,31 @@ gdb_load ${binfile} +@@ -136,31 +141,31 @@ gdb_load ${binfile} send_gdb "core ${objdir}/${subdir}/gcore.test\n" gdb_expect { -re ".* is not a core dump:.*$gdb_prompt $" { @@ -132,7 +133,7 @@ ".*\[\r\n\]+#0 .* terminal_func \\(\\) at " ".*\[\r\n\]+#1 .* array_func \\(\\) at " ".*\[\r\n\]+#2 .* factorial_func \\(value=1\\) at " -@@ -175,61 +179,64 @@ gdb_expect_list "where in corefile" ".*$ +@@ -174,61 +179,64 @@ gdb_expect_list "where in corefile" ".*$ set post_corefile_regs [capture_command_output "info registers" ""] if ![string compare $pre_corefile_regs $post_corefile_regs] then { gdb-6.6-vdso-i386-on-amd64-warning.patch: Index: gdb-6.6-vdso-i386-on-amd64-warning.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-vdso-i386-on-amd64-warning.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.6-vdso-i386-on-amd64-warning.patch 27 Apr 2008 20:28:26 -0000 1.3 +++ gdb-6.6-vdso-i386-on-amd64-warning.patch 14 Jul 2008 09:09:04 -0000 1.4 @@ -7,11 +7,11 @@ Port to GDB-6.7. -Index: gdb-6.7/gdb/symfile.c +Index: gdb-6.8/gdb/symfile.c =================================================================== ---- gdb-6.7.orig/gdb/symfile.c 2007-10-16 16:46:30.000000000 +0200 -+++ gdb-6.7/gdb/symfile.c 2007-10-16 20:08:42.000000000 +0200 -@@ -717,6 +717,38 @@ default_symfile_segments (bfd *abfd) +--- gdb-6.8.orig/gdb/symfile.c 2008-07-14 10:28:15.000000000 +0200 ++++ gdb-6.8/gdb/symfile.c 2008-07-14 10:28:21.000000000 +0200 +@@ -715,6 +715,38 @@ default_symfile_segments (bfd *abfd) return data; } @@ -50,9 +50,9 @@ /* Process a symbol file, as either the main file or as a dynamically loaded file. -@@ -815,32 +847,11 @@ syms_from_objfile (struct objfile *objfi +@@ -813,32 +845,11 @@ syms_from_objfile (struct objfile *objfi happens for the PA64 port. */ - if (/*!mainline &&*/ addrs && addrs->other[0].name) + if (!mainline && addrs && addrs->other[0].name) { - asection *lower_sect; asection *sect; @@ -85,7 +85,7 @@ /* Calculate offsets for the loadable sections. FIXME! Sections must be in order of increasing loadable section so that contiguous sections can use the lower-offset!!! -@@ -862,6 +873,7 @@ syms_from_objfile (struct objfile *objfi +@@ -860,6 +871,7 @@ syms_from_objfile (struct objfile *objfi addrs->other[i].addr -= bfd_section_vma (objfile->obfd, sect); lower_offset = addrs->other[i].addr; @@ -93,7 +93,7 @@ /* This is the index used by BFD. */ addrs->other[i].sectindex = sect->index ; } -@@ -874,7 +886,17 @@ syms_from_objfile (struct objfile *objfi +@@ -872,7 +884,17 @@ syms_from_objfile (struct objfile *objfi } } else gdb-6.8-constant-watchpoints.patch: Index: gdb-6.8-constant-watchpoints.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-constant-watchpoints.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.8-constant-watchpoints.patch 12 Jul 2008 07:02:33 -0000 1.2 +++ gdb-6.8-constant-watchpoints.patch 14 Jul 2008 09:09:04 -0000 1.3 @@ -18,9 +18,11 @@ gdb.base/watchpoint.c (global_ptr_ptr): New variable. (func4): New testing code for GLOBAL_PTR_PTR. ---- ./gdb/breakpoint.c 8 Jul 2008 11:09:40 -0000 1.330 -+++ ./gdb/breakpoint.c 10 Jul 2008 08:19:07 -0000 -@@ -824,7 +824,15 @@ is_hardware_watchpoint (struct breakpoin +Index: gdb-6.8/gdb/breakpoint.c +=================================================================== +--- gdb-6.8.orig/gdb/breakpoint.c 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/breakpoint.c 2008-07-14 10:28:36.000000000 +0200 +@@ -846,7 +846,15 @@ is_hardware_watchpoint (struct breakpoin If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the value chain. The caller must free the values individually. If VAL_CHAIN is NULL, all generated values will be left on the value @@ -37,7 +39,7 @@ static void fetch_watchpoint_value (struct expression *exp, struct value **valp, -@@ -5832,7 +5840,7 @@ watch_command_1 (char *arg, int accessfl +@@ -5705,7 +5713,7 @@ watch_command_1 (char *arg, int accessfl struct symtab_and_line sal; struct expression *exp; struct block *exp_valid_block; @@ -46,7 +48,7 @@ struct frame_info *frame; struct frame_info *prev_frame = NULL; char *exp_start = NULL; -@@ -5918,6 +5926,27 @@ watch_command_1 (char *arg, int accessfl +@@ -5791,6 +5799,27 @@ watch_command_1 (char *arg, int accessfl exp_valid_block = innermost_block; mark = value_mark (); fetch_watchpoint_value (exp, &val, NULL, NULL); @@ -74,8 +76,10 @@ if (val != NULL) release_value (val); ---- ./gdb/gdbtypes.h 3 May 2008 22:20:13 -0000 1.87 -+++ ./gdb/gdbtypes.h 10 Jul 2008 08:19:08 -0000 +Index: gdb-6.8/gdb/gdbtypes.h +=================================================================== +--- gdb-6.8.orig/gdb/gdbtypes.h 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/gdbtypes.h 2008-07-14 10:28:36.000000000 +0200 @@ -69,7 +69,22 @@ enum type_code TYPE_CODE_UNION, /* C union or Pascal variant part */ TYPE_CODE_ENUM, /* Enumeration type */ @@ -100,9 +104,11 @@ TYPE_CODE_INT, /* Integer type */ /* Floating type. This is *NOT* a complex type. Beware, there are parts ---- ./gdb/doc/gdb.texinfo 7 Jul 2008 12:05:30 -0000 1.506 -+++ ./gdb/doc/gdb.texinfo 10 Jul 2008 08:19:37 -0000 -@@ -3375,6 +3375,18 @@ This command prints a list of watchpoint +Index: gdb-6.8/gdb/doc/gdb.texinfo +=================================================================== +--- gdb-6.8.orig/gdb/doc/gdb.texinfo 2008-07-14 10:28:29.000000000 +0200 ++++ gdb-6.8/gdb/doc/gdb.texinfo 2008-07-14 10:28:36.000000000 +0200 +@@ -3267,6 +3267,18 @@ This command prints a list of watchpoint it is the same as @code{info break} (@pxref{Set Breaks}). @end table @@ -121,8 +127,10 @@ @value{GDBN} sets a @dfn{hardware watchpoint} if possible. Hardware watchpoints execute very quickly, and the debugger reports a change in value at the exact instruction where the change occurs. If @value{GDBN} ---- ./gdb/testsuite/gdb.base/watchpoint.c 3 Mar 2008 13:24:12 -0000 1.3 -+++ ./gdb/testsuite/gdb.base/watchpoint.c 10 Jul 2008 08:19:39 -0000 +Index: gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c +=================================================================== +--- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c 2008-07-14 10:28:36.000000000 +0200 @@ -40,6 +40,7 @@ struct foo struct1, struct2, *ptr1, *ptr int doread = 0; @@ -142,8 +150,10 @@ } int main () ---- ./gdb/testsuite/gdb.base/watchpoint.exp 15 Apr 2008 14:33:54 -0000 1.18 -+++ ./gdb/testsuite/gdb.base/watchpoint.exp 10 Jul 2008 08:19:41 -0000 +Index: gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp +=================================================================== +--- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp 2008-07-14 10:28:36.000000000 +0200 @@ -644,7 +644,21 @@ proc test_watchpoint_and_breakpoint {} { } } @@ -205,8 +215,8 @@ + gdb_test "delete \$global_ptr_ptr_breakpoint_number" "" } } - -@@ -833,6 +870,17 @@ if [initialize] then { + +@@ -834,6 +871,17 @@ if [initialize] then { } test_watchpoint_and_breakpoint gdb-6.8-disable-randomization.patch: Index: gdb-6.8-disable-randomization.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-disable-randomization.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.8-disable-randomization.patch 17 Jun 2008 16:24:16 -0000 1.1 +++ gdb-6.8-disable-randomization.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -24,9 +24,11 @@ [ Ported for Fedora GDB. ] ---- ./gdb/config.in 5 Jun 2008 22:36:56 -0000 1.100 -+++ ./gdb/config.in 8 Jun 2008 11:27:20 -0000 -@@ -82,6 +82,10 @@ +Index: gdb-6.8/gdb/config.in +=================================================================== +--- gdb-6.8.orig/gdb/config.in 2008-07-14 10:27:27.000000000 +0200 ++++ gdb-6.8/gdb/config.in 2008-07-14 10:28:50.000000000 +0200 +@@ -64,6 +64,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CURSES_H @@ -37,7 +39,7 @@ /* Define to 1 if you have the declaration of `free', and to 0 if you don't. */ #undef HAVE_DECL_FREE -@@ -237,6 +241,9 @@ +@@ -203,6 +207,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NLIST_H @@ -47,9 +49,11 @@ /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL ---- ./gdb/configure 5 Jun 2008 22:36:56 -0000 1.249 -+++ ./gdb/configure 8 Jun 2008 11:27:41 -0000 -@@ -26701,6 +26701,188 @@ _ACEOF +Index: gdb-6.8/gdb/configure +=================================================================== +--- gdb-6.8.orig/gdb/configure 2008-07-14 10:27:27.000000000 +0200 ++++ gdb-6.8/gdb/configure 2008-07-14 10:28:50.000000000 +0200 +@@ -22911,6 +22911,188 @@ _ACEOF fi @@ -238,9 +242,11 @@ # Check whether --with-sysroot or --without-sysroot was given. ---- ./gdb/configure.ac 5 Jun 2008 22:36:56 -0000 1.69 -+++ ./gdb/configure.ac 8 Jun 2008 11:27:44 -0000 -@@ -1266,6 +1266,29 @@ if test "x$gdb_cv_sys_syscall_h_has_tkil +Index: gdb-6.8/gdb/configure.ac +=================================================================== +--- gdb-6.8.orig/gdb/configure.ac 2008-07-14 10:27:27.000000000 +0200 ++++ gdb-6.8/gdb/configure.ac 2008-07-14 10:28:50.000000000 +0200 +@@ -1254,6 +1254,29 @@ if test "x$gdb_cv_sys_syscall_h_has_tkil AC_DEFINE(HAVE_TKILL_SYSCALL, 1, [Define if you support the tkill syscall.]) fi @@ -270,8 +276,10 @@ dnl Handle optional features that can be enabled. AC_ARG_WITH(sysroot, ---- gdb-6.8/gdb/fork-child.c.orig 2008-01-29 22:11:24.000000000 +0100 -+++ gdb-6.8/gdb/fork-child.c 2008-06-17 15:15:07.000000000 +0200 +Index: gdb-6.8/gdb/fork-child.c +=================================================================== +--- gdb-6.8.orig/gdb/fork-child.c 2008-01-29 22:11:24.000000000 +0100 ++++ gdb-6.8/gdb/fork-child.c 2008-07-14 10:28:50.000000000 +0200 @@ -32,12 +32,45 @@ #include "gdbthread.h" #include "command.h" /* for dont_repeat () */ @@ -367,11 +375,13 @@ + &show_disable_randomization, + &setlist, &showlist); +} ---- ./gdb/doc/gdb.texinfo 6 Jun 2008 20:58:08 -0000 1.503 -+++ ./gdb/doc/gdb.texinfo 8 Jun 2008 11:28:51 -0000 -@@ -1999,6 +1999,57 @@ environment: - This command is available when debugging locally on most targets, excluding - @sc{djgpp}, Cygwin, MS Windows, and QNX Neutrino. +Index: gdb-6.8/gdb/doc/gdb.texinfo +=================================================================== +--- gdb-6.8.orig/gdb/doc/gdb.texinfo 2008-07-14 10:28:36.000000000 +0200 ++++ gdb-6.8/gdb/doc/gdb.texinfo 2008-07-14 10:28:50.000000000 +0200 +@@ -1820,6 +1820,57 @@ argument to @value{GDBN} (@pxref{Invocat + @value{GDBN}}), or by using the @code{file} or @code{exec-file} command + (@pxref{Files, ,Commands to Specify Files}). + at kindex set disable-randomization + at item set disable-randomization @@ -426,9 +436,11 @@ + @end table - @node Arguments ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ./gdb/testsuite/gdb.base/randomize.c 8 Jun 2008 11:28:53 -0000 + If you are running your program in an execution environment that +Index: gdb-6.8/gdb/testsuite/gdb.base/randomize.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.base/randomize.c 2008-07-14 10:28:50.000000000 +0200 @@ -0,0 +1,32 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -462,8 +474,10 @@ + + return 0; +} ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ./gdb/testsuite/gdb.base/randomize.exp 8 Jun 2008 11:28:53 -0000 +Index: gdb-6.8/gdb/testsuite/gdb.base/randomize.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.base/randomize.exp 2008-07-14 10:28:50.000000000 +0200 @@ -0,0 +1,63 @@ +# Copyright 2008 Free Software Foundation, Inc. + gdb-6.8-inlining.patch: Index: gdb-6.8-inlining.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.8-inlining.patch 3 Jul 2008 11:05:26 -0000 1.1 +++ gdb-6.8-inlining.patch 14 Jul 2008 09:09:04 -0000 1.2 @@ -4,9 +4,10 @@ [ Backported for gdb-6.8fedora. ] -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Makefile.in gdb-6.8/gdb/Makefile.in ---- gdb-6.8-clean/gdb/Makefile.in 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/Makefile.in 2008-06-17 12:30:08.000000000 +0200 +Index: gdb-6.8/gdb/Makefile.in +=================================================================== +--- gdb-6.8.orig/gdb/Makefile.in 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/Makefile.in 2008-07-14 10:29:07.000000000 +0200 @@ -607,6 +607,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr inf-loop.c \ infcall.c \ @@ -23,7 +24,7 @@ gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o \ cp-namespace.o \ reggroups.o regset.o \ -@@ -2100,13 +2102,13 @@ dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_ +@@ -2106,13 +2108,13 @@ dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_ $(gdbcore_h) $(target_h) $(inferior_h) $(ax_h) $(ax_gdb_h) \ $(regcache_h) $(objfiles_h) $(exceptions_h) $(elf_dwarf2_h) \ $(dwarf2expr_h) $(dwarf2loc_h) $(gdb_string_h) $(gdb_assert_h) \ @@ -39,7 +40,7 @@ elfread.o: elfread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(elf_bfd_h) \ $(elf_mips_h) $(symtab_h) $(symfile_h) $(objfiles_h) $(buildsym_h) \ $(stabsread_h) $(gdb_stabs_h) $(complaints_h) $(demangle_h) \ -@@ -2155,7 +2157,8 @@ frame.o: frame.c $(defs_h) $(frame_h) $( +@@ -2161,7 +2163,8 @@ frame.o: frame.c $(defs_h) $(frame_h) $( $(regcache_h) $(gdb_assert_h) $(gdb_string_h) $(user_regs_h) \ $(gdb_obstack_h) $(dummy_frame_h) $(sentinel_frame_h) $(gdbcore_h) \ $(annotate_h) $(language_h) $(frame_unwind_h) $(frame_base_h) \ @@ -49,7 +50,7 @@ frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \ $(gdb_assert_h) $(dummy_frame_h) $(gdb_obstack_h) frv-linux-tdep.o: frv-linux-tdep.c $(defs_h) $(gdbcore_h) $(target_h) \ -@@ -2329,7 +2332,7 @@ infcmd.o: infcmd.c $(defs_h) $(gdb_strin +@@ -2335,7 +2338,7 @@ infcmd.o: infcmd.c $(defs_h) $(gdb_strin $(objfiles_h) $(completer_h) $(ui_out_h) $(event_top_h) \ $(parser_defs_h) $(regcache_h) $(reggroups_h) $(block_h) \ $(solib_h) $(gdb_assert_h) $(observer_h) $(target_descriptions_h) \ @@ -58,7 +59,7 @@ inf-loop.o: inf-loop.c $(defs_h) $(inferior_h) $(target_h) $(event_loop_h) \ $(event_top_h) $(inf_loop_h) $(remote_h) $(exceptions_h) inflow.o: inflow.c $(defs_h) $(frame_h) $(inferior_h) $(command_h) \ -@@ -2347,6 +2350,8 @@ infrun.o: infrun.c $(defs_h) $(gdb_strin +@@ -2353,6 +2356,8 @@ infrun.o: infrun.c $(defs_h) $(gdb_strin inf-ttrace.o: inf-ttrace.c $(defs_h) $(command_h) $(gdbcore_h) \ $(gdbthread_h) $(inferior_h) $(target_h) \ $(gdb_assert_h) $(gdb_string_h) $(inf_child_h) $(inf_ttrace_h) @@ -67,9 +68,10 @@ interps.o: interps.c $(defs_h) $(gdbcmd_h) $(ui_out_h) $(event_loop_h) \ $(event_top_h) $(interps_h) $(completer_h) $(gdb_string_h) \ $(gdb_events_h) $(gdb_assert_h) $(top_h) $(exceptions_h) -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/ada-lang.c gdb-6.8/gdb/ada-lang.c ---- gdb-6.8-clean/gdb/ada-lang.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/ada-lang.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/ada-lang.c +=================================================================== +--- gdb-6.8.orig/gdb/ada-lang.c 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/ada-lang.c 2008-07-14 10:29:07.000000000 +0200 @@ -4624,7 +4624,7 @@ remove_irrelevant_renamings (struct ada_ if (current_block == NULL) return nsyms; @@ -106,9 +108,10 @@ annotate_catchpoint (b->number); switch (ex) -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/block.c gdb-6.8/gdb/block.c ---- gdb-6.8-clean/gdb/block.c 2008-01-01 23:53:09.000000000 +0100 -+++ gdb-6.8/gdb/block.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/block.c +=================================================================== +--- gdb-6.8.orig/gdb/block.c 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.8/gdb/block.c 2008-07-14 10:29:07.000000000 +0200 @@ -47,23 +47,40 @@ contained_in (const struct block *a, con { if (!a || !b) @@ -164,9 +167,10 @@ return bl; } -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/block.h gdb-6.8/gdb/block.h ---- gdb-6.8-clean/gdb/block.h 2008-01-01 23:53:09.000000000 +0100 -+++ gdb-6.8/gdb/block.h 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/block.h +=================================================================== +--- gdb-6.8.orig/gdb/block.h 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.8/gdb/block.h 2008-07-14 10:29:07.000000000 +0200 @@ -65,7 +65,7 @@ struct block CORE_ADDR endaddr; @@ -205,9 +209,10 @@ extern int contained_in (const struct block *, const struct block *); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/blockframe.c gdb-6.8/gdb/blockframe.c ---- gdb-6.8-clean/gdb/blockframe.c 2008-01-01 23:53:09.000000000 +0100 -+++ gdb-6.8/gdb/blockframe.c 2008-06-24 22:38:08.000000000 +0200 +Index: gdb-6.8/gdb/blockframe.c +=================================================================== +--- gdb-6.8.orig/gdb/blockframe.c 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.8/gdb/blockframe.c 2008-07-14 10:29:07.000000000 +0200 @@ -61,11 +61,44 @@ struct block * get_frame_block (struct frame_info *frame, CORE_ADDR *addr_in_block) { @@ -305,10 +310,11 @@ return frame; frame = get_prev_frame (frame); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/breakpoint.c gdb-6.8/gdb/breakpoint.c ---- gdb-6.8-clean/gdb/breakpoint.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/breakpoint.c 2008-06-23 01:24:59.000000000 +0200 -@@ -2591,18 +2591,21 @@ watchpoint_check (void *p) +Index: gdb-6.8/gdb/breakpoint.c +=================================================================== +--- gdb-6.8.orig/gdb/breakpoint.c 2008-07-14 10:28:36.000000000 +0200 ++++ gdb-6.8/gdb/breakpoint.c 2008-07-14 10:29:07.000000000 +0200 +@@ -2602,18 +2602,21 @@ watchpoint_check (void *p) within_current_scope = 1; else { @@ -337,7 +343,7 @@ /* in_function_epilogue_p() returns a non-zero value if we're still in the function but the stack frame has already been invalidated. -@@ -2614,10 +2617,9 @@ watchpoint_check (void *p) +@@ -2625,10 +2628,9 @@ watchpoint_check (void *p) that the watchpoint frame couldn't be found by frame_find_by_id() because the current PC is currently in an epilogue. Calling gdbarch_in_function_epilogue_p() also when fr == NULL fixes that. */ @@ -350,7 +356,7 @@ /* If we end up stopping, the current frame will get selected in normal_stop. So this call to select_frame won't affect the user. */ -@@ -2918,7 +2920,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2929,7 +2931,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p } if (frame_id_p (b->frame_id) @@ -359,7 +365,7 @@ bs->stop = 0; else { -@@ -2933,9 +2935,13 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2944,9 +2946,13 @@ bpstat_stop_status (CORE_ADDR bp_addr, p if (bl->cond && bl->owner->disposition != disp_del_at_next_stop) { @@ -376,7 +382,7 @@ value_is_zero = catch_errors (breakpoint_cond_eval, (bl->cond), "Error in testing breakpoint condition:\n", -@@ -2980,6 +2986,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2991,6 +2997,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p bs->print = 0; } bs->commands = copy_command_lines (bs->commands); @@ -388,7 +394,7 @@ } } /* Print nothing for this entry if we dont stop or if we dont print. */ -@@ -5629,7 +5640,7 @@ resolve_sal_pc (struct symtab_and_line * +@@ -5583,7 +5594,7 @@ resolve_sal_pc (struct symtab_and_line * bv = blockvector_for_pc_sect (sal->pc, 0, &b, sal->symtab); if (bv != NULL) { @@ -397,15 +403,15 @@ if (sym != NULL) { fixup_symbol_section (sym, sal->symtab->objfile); -@@ -5761,7 +5772,6 @@ watch_command_1 (char *arg, int accessfl +@@ -5715,7 +5726,6 @@ watch_command_1 (char *arg, int accessfl struct block *exp_valid_block; - struct value *val, *mark; + struct value *val, *mark, *val_chain; struct frame_info *frame; - struct frame_info *prev_frame = NULL; char *exp_start = NULL; char *exp_end = NULL; char *tok, *id_tok_start, *end_tok; -@@ -5895,34 +5905,36 @@ watch_command_1 (char *arg, int accessfl +@@ -5870,34 +5880,36 @@ watch_command_1 (char *arg, int accessfl bp_type = bp_watchpoint; frame = block_innermost_frame (exp_valid_block); @@ -460,7 +466,7 @@ } /* Now set up the breakpoint. */ -@@ -6095,7 +6107,6 @@ until_break_command (char *arg, int from +@@ -6070,7 +6082,6 @@ until_break_command (char *arg, int from struct symtabs_and_lines sals; struct symtab_and_line sal; struct frame_info *frame = get_selected_frame (NULL); @@ -468,7 +474,7 @@ struct breakpoint *breakpoint; struct cleanup *old_chain; struct continuation_arg *arg1; -@@ -6162,11 +6173,14 @@ until_break_command (char *arg, int from +@@ -6137,11 +6148,14 @@ until_break_command (char *arg, int from /* Keep within the current frame, or in frames called by the current one. */ @@ -487,9 +493,10 @@ bp_until); if (!target_can_async_p ()) make_cleanup_delete_breakpoint (breakpoint); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/buildsym.c gdb-6.8/gdb/buildsym.c ---- gdb-6.8-clean/gdb/buildsym.c 2008-01-01 23:53:09.000000000 +0100 -+++ gdb-6.8/gdb/buildsym.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/buildsym.c +=================================================================== +--- gdb-6.8.orig/gdb/buildsym.c 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.8/gdb/buildsym.c 2008-07-14 10:29:07.000000000 +0200 @@ -1141,6 +1141,12 @@ end_symtab (CORE_ADDR end_addr, struct o struct symbol *sym; struct dict_iterator iter; @@ -503,9 +510,10 @@ for (sym = dict_iterator_first (BLOCK_DICT (block), &iter); sym != NULL; sym = dict_iterator_next (&iter)) -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/doc/gdb.texinfo gdb-6.8/gdb/doc/gdb.texinfo ---- gdb-6.8-clean/gdb/doc/gdb.texinfo 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/doc/gdb.texinfo 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/doc/gdb.texinfo +=================================================================== +--- gdb-6.8.orig/gdb/doc/gdb.texinfo 2008-07-14 10:28:50.000000000 +0200 ++++ gdb-6.8/gdb/doc/gdb.texinfo 2008-07-14 10:29:07.000000000 +0200 @@ -136,6 +136,7 @@ software in general. We will miss him. * Stack:: Examining the stack * Source:: Examining source files @@ -547,7 +555,7 @@ Older versions of the @sc{gnu} C compiler permitted a variant option @w{@samp{-gg}} for debugging information. @value{GDBN} no longer supports this -@@ -7546,6 +7532,100 @@ the data cache operation. +@@ -7609,6 +7595,100 @@ the data cache operation. @end table @@ -648,9 +656,10 @@ @node Macros @chapter C Preprocessor Macros -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/dwarf2loc.c gdb-6.8/gdb/dwarf2loc.c ---- gdb-6.8-clean/gdb/dwarf2loc.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/dwarf2loc.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/dwarf2loc.c +=================================================================== +--- gdb-6.8.orig/gdb/dwarf2loc.c 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/dwarf2loc.c 2008-07-14 10:29:07.000000000 +0200 @@ -31,6 +31,7 @@ #include "regcache.h" #include "objfiles.h" @@ -681,9 +690,10 @@ { struct dwarf2_loclist_baton *symbaton; struct frame_info *frame = debaton->frame; -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/dwarf2read.c gdb-6.8/gdb/dwarf2read.c ---- gdb-6.8-clean/gdb/dwarf2read.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/dwarf2read.c 2008-06-16 20:41:01.000000000 +0200 +Index: gdb-6.8/gdb/dwarf2read.c +=================================================================== +--- gdb-6.8.orig/gdb/dwarf2read.c 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/dwarf2read.c 2008-07-14 10:29:07.000000000 +0200 @@ -48,6 +48,7 @@ #include "gdbcmd.h" #include "dwarf2block.h" @@ -834,9 +844,10 @@ } attr = dwarf2_attr (die, DW_AT_const_value, cu); if (attr) -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/findvar.c gdb-6.8/gdb/findvar.c ---- gdb-6.8-clean/gdb/findvar.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/findvar.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/findvar.c +=================================================================== +--- gdb-6.8.orig/gdb/findvar.c 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/findvar.c 2008-07-14 10:29:07.000000000 +0200 @@ -518,13 +518,11 @@ addresses have not been bound by the dyn case LOC_REGPARM: case LOC_REGPARM_ADDR: @@ -851,9 +862,10 @@ if (SYMBOL_CLASS (var) == LOC_REGPARM_ADDR) { -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame-unwind.c gdb-6.8/gdb/frame-unwind.c ---- gdb-6.8-clean/gdb/frame-unwind.c 2008-01-01 23:53:09.000000000 +0100 -+++ gdb-6.8/gdb/frame-unwind.c 2008-06-23 01:46:54.000000000 +0200 +Index: gdb-6.8/gdb/frame-unwind.c +=================================================================== +--- gdb-6.8.orig/gdb/frame-unwind.c 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.8/gdb/frame-unwind.c 2008-07-14 10:29:07.000000000 +0200 @@ -49,8 +49,10 @@ frame_unwind_init (struct obstack *obsta can't override this. */ table->list = OBSTACK_ZALLOC (obstack, struct frame_unwind_table_entry); @@ -924,9 +936,10 @@ } } internal_error (__FILE__, __LINE__, _("frame_unwind_find_by_frame failed")); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame-unwind.h gdb-6.8/gdb/frame-unwind.h ---- gdb-6.8-clean/gdb/frame-unwind.h 2008-01-01 23:53:09.000000000 +0100 -+++ gdb-6.8/gdb/frame-unwind.h 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/frame-unwind.h +=================================================================== +--- gdb-6.8.orig/gdb/frame-unwind.h 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.8/gdb/frame-unwind.h 2008-07-14 10:29:07.000000000 +0200 @@ -143,6 +143,8 @@ struct frame_unwind frame_dealloc_cache_ftype *dealloc_cache; }; @@ -936,9 +949,10 @@ /* Register a frame unwinder, _prepending_ it to the front of the search list (so it is sniffed before previously registered unwinders). By using a prepend, later calls can install unwinders -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame.c gdb-6.8/gdb/frame.c ---- gdb-6.8-clean/gdb/frame.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/frame.c 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/frame.c +=================================================================== +--- gdb-6.8.orig/gdb/frame.c 2008-07-14 10:27:07.000000000 +0200 ++++ gdb-6.8/gdb/frame.c 2008-07-14 10:29:07.000000000 +0200 @@ -40,8 +40,13 @@ #include "observer.h" #include "objfiles.h" @@ -1330,9 +1344,10 @@ deprecated_update_frame_pc_hack (struct frame_info *frame, CORE_ADDR pc) { if (frame_debug) -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame.h gdb-6.8/gdb/frame.h ---- gdb-6.8-clean/gdb/frame.h 2008-01-01 23:53:09.000000000 +0100 -+++ gdb-6.8/gdb/frame.h 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/frame.h +=================================================================== +--- gdb-6.8.orig/gdb/frame.h 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.8/gdb/frame.h 2008-07-14 10:29:07.000000000 +0200 @@ -122,6 +122,17 @@ struct frame_id unsigned int stack_addr_p : 1; unsigned int code_addr_p : 1; @@ -1413,9 +1428,10 @@ +extern struct symbol *inline_skipped_symbol (void); + #endif /* !defined (FRAME_H) */ -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/infcall.c gdb-6.8/gdb/infcall.c ---- gdb-6.8-clean/gdb/infcall.c 2008-01-08 20:28:08.000000000 +0100 -+++ gdb-6.8/gdb/infcall.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/infcall.c +=================================================================== +--- gdb-6.8.orig/gdb/infcall.c 2008-01-08 20:28:08.000000000 +0100 ++++ gdb-6.8/gdb/infcall.c 2008-07-14 10:29:07.000000000 +0200 @@ -757,11 +757,8 @@ call_function_by_hand (struct value *fun if (unwind_on_signal_p) @@ -1430,9 +1446,10 @@ /* FIXME: Insert a bunch of wrap_here; name can be very long if it's a C++ name with arguments and stuff. */ -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/infcmd.c gdb-6.8/gdb/infcmd.c ---- gdb-6.8-clean/gdb/infcmd.c 2008-01-31 14:37:21.000000000 +0100 -+++ gdb-6.8/gdb/infcmd.c 2008-06-23 01:23:52.000000000 +0200 +Index: gdb-6.8/gdb/infcmd.c +=================================================================== +--- gdb-6.8.orig/gdb/infcmd.c 2008-01-31 14:37:21.000000000 +0100 ++++ gdb-6.8/gdb/infcmd.c 2008-07-14 10:29:07.000000000 +0200 @@ -48,6 +48,7 @@ #include "observer.h" #include "target-descriptions.h" @@ -1628,9 +1645,10 @@ sal = find_pc_line (get_frame_pc (frame), 0); sal.pc = get_frame_pc (frame); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/inferior.h gdb-6.8/gdb/inferior.h ---- gdb-6.8-clean/gdb/inferior.h 2008-06-24 22:58:30.000000000 +0200 -+++ gdb-6.8/gdb/inferior.h 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/inferior.h +=================================================================== +--- gdb-6.8.orig/gdb/inferior.h 2008-07-14 10:25:43.000000000 +0200 ++++ gdb-6.8/gdb/inferior.h 2008-07-14 10:29:07.000000000 +0200 @@ -254,6 +254,8 @@ extern void get_last_target_status(ptid_ extern void follow_inferior_reset_breakpoints (void); @@ -1640,9 +1658,10 @@ /* From infcmd.c */ extern void tty_command (char *, int); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/infrun.c gdb-6.8/gdb/infrun.c ---- gdb-6.8-clean/gdb/infrun.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/infrun.c 2008-06-17 11:35:38.000000000 +0200 +Index: gdb-6.8/gdb/infrun.c +=================================================================== +--- gdb-6.8.orig/gdb/infrun.c 2008-07-14 10:28:15.000000000 +0200 ++++ gdb-6.8/gdb/infrun.c 2008-07-14 10:29:07.000000000 +0200 @@ -276,6 +276,11 @@ static int stop_print_frame; static struct breakpoint *step_resume_breakpoint = NULL; @@ -1767,7 +1786,7 @@ && step_resume_breakpoint == NULL) { /* The inferior is about to take a signal that will take it -@@ -2423,12 +2458,7 @@ process_event_stop_test: +@@ -2418,12 +2453,7 @@ process_event_stop_test: until we exit the run time loader code and reach the callee's address. */ if (step_over_calls == STEP_OVER_UNDEBUGGABLE @@ -1781,7 +1800,7 @@ { CORE_ADDR pc_after_resolver = gdbarch_skip_solib_resolver (current_gdbarch, stop_pc); -@@ -2472,11 +2502,12 @@ process_event_stop_test: +@@ -2467,11 +2497,12 @@ process_event_stop_test: previous frame's ID is sufficient - but it is a common case and cheaper than checking the previous frame's ID. @@ -1797,7 +1816,7 @@ { CORE_ADDR real_stop_pc; -@@ -2521,13 +2552,7 @@ process_event_stop_test: +@@ -2516,13 +2547,7 @@ process_event_stop_test: if (real_stop_pc != 0) ecs->stop_func_start = real_stop_pc; @@ -1812,7 +1831,7 @@ { struct symtab_and_line sr_sal; init_sal (&sr_sal); -@@ -2675,9 +2700,82 @@ process_event_stop_test: +@@ -2670,9 +2695,82 @@ process_event_stop_test: return; } @@ -1897,7 +1916,7 @@ { /* We are at the start of a different line. So stop. Note that we don't stop if we step into the middle of a different line. -@@ -2700,13 +2798,11 @@ process_event_stop_test: +@@ -2695,13 +2793,11 @@ process_event_stop_test: step_range_start = ecs->sal.pc; step_range_end = ecs->sal.end; @@ -1913,7 +1932,7 @@ #if 0 /* NOTE: cagney/2003-10-16: I think this frame ID inner test is too generous. It will trigger on things like a step into a frameless -@@ -2723,13 +2819,6 @@ process_event_stop_test: +@@ -2718,13 +2814,6 @@ process_event_stop_test: and we're willing to introduce frame unwind logic into this function. Fortunately, those days are nearly upon us. */ #endif @@ -1927,7 +1946,7 @@ if (debug_infrun) fprintf_unfiltered (gdb_stdlog, "infrun: keep going\n"); -@@ -3150,17 +3239,6 @@ normal_stop (void) +@@ -3145,17 +3234,6 @@ normal_stop (void) previous_inferior_ptid = inferior_ptid; } @@ -1945,7 +1964,7 @@ if (target_has_execution) { if (remove_breakpoints ()) -@@ -3195,7 +3273,7 @@ Further execution is probably impossible +@@ -3190,7 +3268,7 @@ Further execution is probably impossible display the frame below, but the current SAL will be incorrect during a user hook-stop function. */ if (target_has_stack && !stop_stack_dummy) @@ -1954,7 +1973,7 @@ /* Look up the hook_stop and run it (CLI internally handles problem of stop_command's pre-hook not existing). */ -@@ -3205,7 +3283,6 @@ Further execution is probably impossible +@@ -3200,7 +3278,6 @@ Further execution is probably impossible if (!target_has_stack) { @@ -1962,7 +1981,7 @@ goto done; } -@@ -3216,7 +3293,7 @@ Further execution is probably impossible +@@ -3211,7 +3288,7 @@ Further execution is probably impossible if (!stop_stack_dummy) { @@ -1971,7 +1990,7 @@ /* Print current location without a level number, if we have changed functions or hit a breakpoint. -@@ -3251,7 +3328,7 @@ Further execution is probably impossible +@@ -3246,7 +3323,7 @@ Further execution is probably impossible should) use that when doing a frame comparison. */ if (stop_step && frame_id_eq (step_frame_id, @@ -1980,7 +1999,7 @@ && step_start_function == find_pc_function (stop_pc)) source_flag = SRC_LINE; /* finished step, just print source line */ else -@@ -3310,7 +3387,7 @@ Further execution is probably impossible +@@ -3305,7 +3382,7 @@ Further execution is probably impossible Can't rely on restore_inferior_status because that only gets called if we don't stop in the called function. */ stop_pc = read_pc (); @@ -1989,7 +2008,7 @@ } done: -@@ -3824,7 +3901,7 @@ restore_inferior_status (struct inferior +@@ -3819,7 +3896,7 @@ restore_inferior_status (struct inferior RETURN_MASK_ERROR) == 0) /* Error in restoring the selected frame. Select the innermost frame. */ @@ -1998,9 +2017,10 @@ } -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/inline-frame.c gdb-6.8/gdb/inline-frame.c ---- gdb-6.8-clean/gdb/inline-frame.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/gdb/inline-frame.c 2008-06-24 22:59:37.000000000 +0200 +Index: gdb-6.8/gdb/inline-frame.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/inline-frame.c 2008-07-14 10:29:07.000000000 +0200 @@ -0,0 +1,353 @@ +/* Inline frame unwinder for GDB. + @@ -2355,9 +2375,10 @@ +{ + return inline_skip_symbol; +} -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/mi/mi-cmd-stack.c gdb-6.8/gdb/mi/mi-cmd-stack.c ---- gdb-6.8-clean/gdb/mi/mi-cmd-stack.c 2008-01-01 23:53:14.000000000 +0100 -+++ gdb-6.8/gdb/mi/mi-cmd-stack.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/mi/mi-cmd-stack.c +=================================================================== +--- gdb-6.8.orig/gdb/mi/mi-cmd-stack.c 2008-01-01 23:53:14.000000000 +0100 ++++ gdb-6.8/gdb/mi/mi-cmd-stack.c 2008-07-14 10:29:07.000000000 +0200 @@ -65,7 +65,7 @@ mi_cmd_stack_list_frames (char *command, /* Let's position fi on the frame at which to start the display. Could be the innermost frame if the whole stack needs @@ -2385,9 +2406,10 @@ fi && i < frame_low; i++, fi = get_prev_frame (fi)); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/minsyms.c gdb-6.8/gdb/minsyms.c ---- gdb-6.8-clean/gdb/minsyms.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/minsyms.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/minsyms.c +=================================================================== +--- gdb-6.8.orig/gdb/minsyms.c 2008-07-14 10:27:27.000000000 +0200 ++++ gdb-6.8/gdb/minsyms.c 2008-07-14 10:29:07.000000000 +0200 @@ -677,7 +677,7 @@ prim_record_minimal_symbol_and_info (con if (msym_bunch_index == BUNCH_SIZE) @@ -2397,9 +2419,10 @@ msym_bunch_index = 0; new->next = msym_bunch; msym_bunch = new; -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/s390-tdep.c gdb-6.8/gdb/s390-tdep.c ---- gdb-6.8-clean/gdb/s390-tdep.c 2008-06-24 22:58:30.000000000 +0200 -+++ gdb-6.8/gdb/s390-tdep.c 2008-06-16 20:15:07.000000000 +0200 +Index: gdb-6.8/gdb/s390-tdep.c +=================================================================== +--- gdb-6.8.orig/gdb/s390-tdep.c 2008-07-14 10:26:09.000000000 +0200 ++++ gdb-6.8/gdb/s390-tdep.c 2008-07-14 10:29:07.000000000 +0200 @@ -1216,6 +1216,7 @@ s390_prologue_frame_unwind_cache (struct needed, instead the code should simpliy rely on its analysis. */ @@ -2416,9 +2439,10 @@ { /* See the comment in s390_in_function_epilogue_p on why this is not completely reliable ... */ -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/stack.c gdb-6.8/gdb/stack.c ---- gdb-6.8-clean/gdb/stack.c 2008-03-17 16:06:24.000000000 +0100 -+++ gdb-6.8/gdb/stack.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/stack.c +=================================================================== +--- gdb-6.8.orig/gdb/stack.c 2008-03-17 16:06:24.000000000 +0100 ++++ gdb-6.8/gdb/stack.c 2008-07-14 10:29:07.000000000 +0200 @@ -96,6 +96,30 @@ print_stack_frame_stub (void *args) return 0; } @@ -2565,9 +2589,10 @@ /* Compute the return value. If the computation triggers an error, let it bail. If the return type can't be handled, set RETURN_VALUE to NULL, and QUERY_PREFIX to an informational -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/symtab.c gdb-6.8/gdb/symtab.c ---- gdb-6.8-clean/gdb/symtab.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/symtab.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/symtab.c +=================================================================== +--- gdb-6.8.orig/gdb/symtab.c 2008-07-14 10:27:32.000000000 +0200 ++++ gdb-6.8/gdb/symtab.c 2008-07-14 10:29:07.000000000 +0200 @@ -1264,10 +1264,13 @@ lookup_symbol_aux_local (const char *nam symtab); if (sym != NULL) @@ -2773,9 +2798,10 @@ /* The case in which compiler's optimizer/scheduler has moved instructions into the prologue. We look ahead in the function looking for address ranges whose -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/symtab.h gdb-6.8/gdb/symtab.h ---- gdb-6.8-clean/gdb/symtab.h 2008-02-05 23:17:40.000000000 +0100 -+++ gdb-6.8/gdb/symtab.h 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/symtab.h +=================================================================== +--- gdb-6.8.orig/gdb/symtab.h 2008-02-05 23:17:40.000000000 +0100 ++++ gdb-6.8/gdb/symtab.h 2008-07-14 10:29:07.000000000 +0200 @@ -623,9 +623,15 @@ struct symbol ENUM_BITFIELD(address_class) aclass : 6; @@ -2795,9 +2821,10 @@ unsigned short line; -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.cp/annota2.exp gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp ---- gdb-6.8-clean/gdb/testsuite/gdb.cp/annota2.exp 2008-03-04 21:06:22.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp +=================================================================== +--- gdb-6.8.orig/gdb/testsuite/gdb.cp/annota2.exp 2008-03-04 21:06:22.000000000 +0100 ++++ gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp 2008-07-14 10:29:07.000000000 +0200 @@ -119,13 +119,14 @@ gdb_expect { # continue until exit # this will test: @@ -2816,9 +2843,10 @@ } # -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/Makefile.in gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in ---- gdb-6.8-clean/gdb/testsuite/gdb.opt/Makefile.in 2007-10-25 22:30:26.000000000 +0200 -+++ gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in +=================================================================== +--- gdb-6.8.orig/gdb/testsuite/gdb.opt/Makefile.in 2007-10-25 22:30:26.000000000 +0200 ++++ gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in 2008-07-14 10:29:07.000000000 +0200 @@ -1,7 +1,7 @@ VPATH = @srcdir@ srcdir = @srcdir@ @@ -2828,9 +2856,10 @@ MISCELLANEOUS = -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.c gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c ---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c 2008-07-14 10:29:07.000000000 +0200 @@ -0,0 +1,54 @@ +/* Copyright (C) 2007 Free Software Foundation, Inc. + @@ -2886,9 +2915,10 @@ + + return 0; +} -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.exp gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp ---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.exp 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp 2008-07-14 10:29:07.000000000 +0200 @@ -0,0 +1,61 @@ +# Copyright 2007 Free Software Foundation, Inc. + @@ -2951,9 +2981,10 @@ +gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (3)" +gdb_test "up" "#2 .*func2.*" "up from func1 (3)" +gdb_test "info frame" ".*inlined into frame.*" "func2 inlined (3)" -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.c gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c ---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c 2008-07-14 10:29:07.000000000 +0200 @@ -0,0 +1,107 @@ +/* Copyright (C) 2007 Free Software Foundation, Inc. + @@ -3062,9 +3093,10 @@ + + return 0; +} -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.exp gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp ---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.exp 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp 2008-07-14 10:29:07.000000000 +0200 @@ -0,0 +1,261 @@ +# Copyright 2007 Free Software Foundation, Inc. + @@ -3327,9 +3359,10 @@ +gdb_test "info frame" ".*inlined into frame.*" "outer_inline2 inlined" +gdb_test "up" "#4 main.*" "up from outer_inline2" +gdb_test "info frame" ".*\n caller of frame.*" "main not inlined" -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.c gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c ---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c 2008-07-14 10:29:07.000000000 +0200 @@ -0,0 +1,59 @@ +/* Copyright (C) 2007 Free Software Foundation, Inc. + @@ -3390,9 +3423,10 @@ + + return 0; +} -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.exp gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp ---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.exp 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp 2008-06-23 01:20:22.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp 2008-07-14 10:29:07.000000000 +0200 @@ -0,0 +1,95 @@ +# Copyright 2007 Free Software Foundation, Inc. + @@ -3489,9 +3523,10 @@ + setup_kfail *-*-* "gcc/debug.optimization" +} +gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/lib/gdb.exp gdb-6.8/gdb/testsuite/lib/gdb.exp ---- gdb-6.8-clean/gdb/testsuite/lib/gdb.exp 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/testsuite/lib/gdb.exp 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/testsuite/lib/gdb.exp +=================================================================== +--- gdb-6.8.orig/gdb/testsuite/lib/gdb.exp 2008-07-14 10:28:15.000000000 +0200 ++++ gdb-6.8/gdb/testsuite/lib/gdb.exp 2008-07-14 10:29:07.000000000 +0200 @@ -1357,6 +1357,37 @@ proc skip_hp_tests {} { return $skip_hp } @@ -3530,9 +3565,10 @@ set compiler_info "unknown" set gcc_compiled 0 set hp_cc_compiler 0 -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/thread.c gdb-6.8/gdb/thread.c ---- gdb-6.8-clean/gdb/thread.c 2008-06-24 22:58:30.000000000 +0200 -+++ gdb-6.8/gdb/thread.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/thread.c +=================================================================== +--- gdb-6.8.orig/gdb/thread.c 2008-07-14 10:24:32.000000000 +0200 ++++ gdb-6.8/gdb/thread.c 2008-07-14 10:29:07.000000000 +0200 @@ -582,7 +582,7 @@ thread_apply_all_command (char *cmd, int do_cleanups (old_chain); /* Print stack frame only if we changed thread. */ @@ -3551,9 +3587,10 @@ } /* Switch to the specified thread. Will dispatch off to thread_apply_command -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/tracepoint.c gdb-6.8/gdb/tracepoint.c ---- gdb-6.8-clean/gdb/tracepoint.c 2008-02-05 17:05:56.000000000 +0100 -+++ gdb-6.8/gdb/tracepoint.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/tracepoint.c +=================================================================== +--- gdb-6.8.orig/gdb/tracepoint.c 2008-02-05 17:05:56.000000000 +0100 ++++ gdb-6.8/gdb/tracepoint.c 2008-07-14 10:29:07.000000000 +0200 @@ -2165,7 +2165,7 @@ trace_find_line_command (char *args, int { if (args == 0 || *args == 0) @@ -3563,9 +3600,10 @@ sals.nelts = 1; sals.sals = (struct symtab_and_line *) xmalloc (sizeof (struct symtab_and_line)); -diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/valops.c gdb-6.8/gdb/valops.c ---- gdb-6.8-clean/gdb/valops.c 2008-06-24 22:58:31.000000000 +0200 -+++ gdb-6.8/gdb/valops.c 2008-06-16 20:11:43.000000000 +0200 +Index: gdb-6.8/gdb/valops.c +=================================================================== +--- gdb-6.8.orig/gdb/valops.c 2008-07-14 10:28:30.000000000 +0200 ++++ gdb-6.8/gdb/valops.c 2008-07-14 10:29:07.000000000 +0200 @@ -845,7 +845,7 @@ value_of_variable (struct symbol *var, s frame = block_innermost_frame (b); if (!frame) gdb-6.8-upstream.patch: Index: gdb-6.8-upstream.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-upstream.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gdb-6.8-upstream.patch 12 Jul 2008 07:02:33 -0000 1.5 +++ gdb-6.8-upstream.patch 14 Jul 2008 09:09:04 -0000 1.6 @@ -702,14 +702,11 @@ delete_thread (retval); status->kind = TARGET_WAITKIND_SPURIOUS; return retval; +Index: gdb-6.8/gdb/thread.c =================================================================== -RCS file: /cvs/src/src/gdb/thread.c,v -retrieving revision 1.63 -retrieving revision 1.64 -diff -u -r1.63 -r1.64 ---- src/gdb/thread.c 2008/03/17 18:41:29 1.63 -+++ src/gdb/thread.c 2008/03/21 15:44:53 1.64 -@@ -132,10 +132,12 @@ +--- gdb-6.8.orig/gdb/thread.c 2008-03-12 23:22:06.000000000 +0100 ++++ gdb-6.8/gdb/thread.c 2008-07-14 10:24:32.000000000 +0200 +@@ -131,16 +131,24 @@ add_thread_silent (ptid_t ptid) } struct thread_info * @@ -722,8 +719,7 @@ + if (print_thread_events) printf_unfiltered (_("[New %s]\n"), target_pid_to_str (ptid)); - -@@ -144,6 +146,12 @@ + return result; } Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- gdb.spec 14 Jul 2008 06:51:26 -0000 1.297 +++ gdb.spec 14 Jul 2008 09:09:04 -0000 1.298 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 16%{?_with_upstream:.upstream}%{?dist} +Release: 17%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -832,6 +832,9 @@ %endif %changelog +* Mon Jul 14 2008 Jan Kratochvil - 6.8-17 +- Refresh the patchset with fuzz 0 (for new rpmbuild). + * Mon Jul 14 2008 Jan Kratochvil - 6.8-16 - Rebuild with the new rpm-4.5.90 in the buildroot. From fedora-extras-commits at redhat.com Mon Jul 14 09:12:19 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 09:12:19 GMT Subject: rpms/xfce4-mpc-plugin/F-8 xfce4-mpc-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807140912.m6E9CJeC007378@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-mpc-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/F-8 Modified Files: .cvsignore sources Added Files: xfce4-mpc-plugin.spec Log Message: initial import of xfce4-mpc-plugin --- NEW FILE xfce4-mpc-plugin.spec --- Name: xfce4-mpc-plugin Version: 0.3.3 Release: 1%{?dist} Summary: MPD client for the Xfce panel Group: User Interface/Desktops License: BSD URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.90.2 BuildRequires: gettext, perl(XML::Parser) BuildRequires: libmpd-devel >= 0.12 Requires: xfce4-panel >= 4.4.2 %description A simple client plugin for MPD, the Music Player Daemon. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %changelog * Fri Jul 11 2008 Christoph Wickert - 0.3.3-1 - Update to 0.3.3 on Xfce 4.4.2 * Sat Aug 25 2007 Christoph Wickert - 0.3.2-1 - Update to 0.3.2 - Update license tag * Sat Apr 28 2007 Christoph Wickert - 0.3.1-2 - Rebuild for Xfce 4.4.1 * Sat Feb 03 2007 Christoph Wickert - 0.3.1-1 - Update to 0.3.1 * Mon Jan 22 2007 Christoph Wickert - 0.3.0-1 - Update to 0.3.0 on Xfce 4.4 * Sat Nov 11 2006 Christoph Wickert - 0.2.0-1 - Update to 0.2.0 * Sat Sep 23 2006 Christoph Wickert - 0.1.0-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 03:04:26 -0000 1.1 +++ .cvsignore 14 Jul 2008 09:11:34 -0000 1.2 @@ -0,0 +1 @@ +xfce4-mpc-plugin-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 03:04:26 -0000 1.1 +++ sources 14 Jul 2008 09:11:34 -0000 1.2 @@ -0,0 +1 @@ +b4f7f67589f34f77973a51dd5069712d xfce4-mpc-plugin-0.3.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 09:12:43 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 09:12:43 GMT Subject: rpms/xfce4-mpc-plugin/F-9 xfce4-mpc-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807140912.m6E9Chaf007391@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-mpc-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/F-9 Modified Files: .cvsignore sources Added Files: xfce4-mpc-plugin.spec Log Message: initial import of xfce4-mpc-plugin --- NEW FILE xfce4-mpc-plugin.spec --- Name: xfce4-mpc-plugin Version: 0.3.3 Release: 1%{?dist} Summary: MPD client for the Xfce panel Group: User Interface/Desktops License: BSD URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.90.2 BuildRequires: gettext, perl(XML::Parser) BuildRequires: libmpd-devel >= 0.12 Requires: xfce4-panel >= 4.4.2 %description A simple client plugin for MPD, the Music Player Daemon. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %changelog * Fri Jul 11 2008 Christoph Wickert - 0.3.3-1 - Update to 0.3.3 on Xfce 4.4.2 * Sat Aug 25 2007 Christoph Wickert - 0.3.2-1 - Update to 0.3.2 - Update license tag * Sat Apr 28 2007 Christoph Wickert - 0.3.1-2 - Rebuild for Xfce 4.4.1 * Sat Feb 03 2007 Christoph Wickert - 0.3.1-1 - Update to 0.3.1 * Mon Jan 22 2007 Christoph Wickert - 0.3.0-1 - Update to 0.3.0 on Xfce 4.4 * Sat Nov 11 2006 Christoph Wickert - 0.2.0-1 - Update to 0.2.0 * Sat Sep 23 2006 Christoph Wickert - 0.1.0-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 03:04:26 -0000 1.1 +++ .cvsignore 14 Jul 2008 09:11:49 -0000 1.2 @@ -0,0 +1 @@ +xfce4-mpc-plugin-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 03:04:26 -0000 1.1 +++ sources 14 Jul 2008 09:11:49 -0000 1.2 @@ -0,0 +1 @@ +b4f7f67589f34f77973a51dd5069712d xfce4-mpc-plugin-0.3.3.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 09:15:14 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 09:15:14 GMT Subject: rpms/xfce4-mpc-plugin/F-9 xfce4-mpc-plugin.spec,1.1,1.2 Message-ID: <200807140915.m6E9FE6T007567@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-mpc-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7441/F-9 Modified Files: xfce4-mpc-plugin.spec Log Message: fix license tag as proposed in the review Index: xfce4-mpc-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/F-9/xfce4-mpc-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-mpc-plugin.spec 14 Jul 2008 09:11:49 -0000 1.1 +++ xfce4-mpc-plugin.spec 14 Jul 2008 09:14:27 -0000 1.2 @@ -4,7 +4,7 @@ Summary: MPD client for the Xfce panel Group: User Interface/Desktops -License: BSD +License: ISC URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Mon Jul 14 09:15:27 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 09:15:27 GMT Subject: rpms/xfce4-mpc-plugin/F-8 xfce4-mpc-plugin.spec,1.1,1.2 Message-ID: <200807140915.m6E9FRRu007574@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-mpc-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7441/F-8 Modified Files: xfce4-mpc-plugin.spec Log Message: fix license tag as proposed in the review Index: xfce4-mpc-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/F-8/xfce4-mpc-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-mpc-plugin.spec 14 Jul 2008 09:11:34 -0000 1.1 +++ xfce4-mpc-plugin.spec 14 Jul 2008 09:14:06 -0000 1.2 @@ -4,7 +4,7 @@ Summary: MPD client for the Xfce panel Group: User Interface/Desktops -License: BSD +License: ISC URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Mon Jul 14 09:15:33 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 09:15:33 GMT Subject: rpms/xfce4-mpc-plugin/devel xfce4-mpc-plugin.spec,1.1,1.2 Message-ID: <200807140915.m6E9FXVf007577@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-mpc-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7441/devel Modified Files: xfce4-mpc-plugin.spec Log Message: fix license tag as proposed in the review Index: xfce4-mpc-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/devel/xfce4-mpc-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-mpc-plugin.spec 14 Jul 2008 09:06:53 -0000 1.1 +++ xfce4-mpc-plugin.spec 14 Jul 2008 09:14:45 -0000 1.2 @@ -4,7 +4,7 @@ Summary: MPD client for the Xfce panel Group: User Interface/Desktops -License: BSD +License: ISC URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Mon Jul 14 10:01:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 10:01:38 +0000 Subject: [pkgdb] libssh2: djuran has requested watchbugzilla Message-ID: <200807141001.m6EA1cGn016452@bastion.fedora.phx.redhat.com> David Juran (djuran) has requested the watchbugzilla acl on libssh2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libssh2 From fedora-extras-commits at redhat.com Mon Jul 14 10:01:40 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 14 Jul 2008 10:01:40 GMT Subject: rpms/rhythmbox/devel .cvsignore, 1.34, 1.35 rhythmbox.spec, 1.193, 1.194 sources, 1.36, 1.37 rb-gvfs-cdda-activation.patch, 1.1, NONE rb-magnatune-use-ogg.patch, 1.1, NONE rb-soup_encode_uri-changes.patch, 1.2, NONE rhythmbox-0.11.3-force-python-thread-init.patch, 1.1, NONE rhythmbox-0.11.4-source-unref-crasher.patch, 1.1, NONE rhythmbox-0.11.5-amazon-ecs.patch, 1.1, NONE rhythmbox-0.11.5-clean-ipod-crash.patch, 1.1, NONE rhythmbox-0.11.5-force-podcast-parsing.patch, 1.1, NONE rhythmbox-0.11.5-xfade-deadlock.patch, 1.2, NONE Message-ID: <200807141001.m6EA1eaq016144@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9542 Modified Files: .cvsignore rhythmbox.spec sources Removed Files: rb-gvfs-cdda-activation.patch rb-magnatune-use-ogg.patch rb-soup_encode_uri-changes.patch rhythmbox-0.11.3-force-python-thread-init.patch rhythmbox-0.11.4-source-unref-crasher.patch rhythmbox-0.11.5-amazon-ecs.patch rhythmbox-0.11.5-clean-ipod-crash.patch rhythmbox-0.11.5-force-podcast-parsing.patch rhythmbox-0.11.5-xfade-deadlock.patch Log Message: * Mon Jul 14 2008 - Bastien Nocera - 0.11.6-1 - Update to 0.11.6 - Remove loads of upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 17 Mar 2008 02:05:30 -0000 1.34 +++ .cvsignore 14 Jul 2008 10:00:52 -0000 1.35 @@ -1 +1 @@ -rhythmbox-0.11.5.tar.bz2 +rhythmbox-0.11.6.tar.bz2 Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- rhythmbox.spec 16 Jun 2008 10:44:07 -0000 1.193 +++ rhythmbox.spec 14 Jul 2008 10:00:52 -0000 1.194 @@ -2,8 +2,8 @@ Name: rhythmbox Summary: Music Management Application -Version: 0.11.5 -Release: 15%{?dist} +Version: 0.11.6 +Release: 1%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -53,29 +53,9 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=428034 Patch0: rb-disable-power-plugin-by-default.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=499208 -Patch1: rhythmbox-0.11.3-force-python-thread-init.patch -Patch2: rhythmbox-0.11.4-source-unref-crasher.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=509701#c33 -Patch3: rb-soup_encode_uri-changes.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=524967 -Patch4: rhythmbox-0.11.5-force-podcast-parsing.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=526139 -# https://bugzilla.redhat.com/show_bug.cgi?id=440489 -Patch5: rb-gvfs-cdda-activation.patch # http://bugzilla.gnome.org/show_bug.cgi?id=374078 # https://bugzilla.redhat.com/show_bug.cgi?id=440668 -Patch6: rhythmbox-0.11.5-ipod-vfat.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=512226 -Patch7: rhythmbox-0.11.5-xfade-deadlock.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=513851 -Patch8: rhythmbox-0.11.5-amazon-ecs.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=445160 -# http://bugzilla.gnome.org/show_bug.cgi?id=397097 -Patch9: rb-magnatune-use-ogg.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=451547 -# http://bugzilla.gnome.org/show_bug.cgi?id=524985 -Patch10: rhythmbox-0.11.5-clean-ipod-crash.patch +Patch1: rhythmbox-0.11.5-ipod-vfat.patch %description Rhythmbox is an integrated music management application based on the powerful @@ -105,16 +85,7 @@ %setup -q %patch0 -p0 -b .dont-disable-suspend -%patch1 -p1 -b .python-threading -%patch2 -p0 -b .source-unref-crasher -%patch3 -p1 -b .soup-2.4 -%patch4 -p0 -b .force-podcast -%patch5 -p0 -b .cdda-activation -%patch6 -p0 -b .ipod-vfat -%patch7 -p1 -b .xfade-deadlock -%patch8 -p1 -b .amazon-ecs -%patch9 -p1 -b .magnatune-ogg -%patch10 -p1 -b .ipod-crash +%patch1 -p0 -b .ipod-vfat %build # work around a gstreamer bug @@ -228,6 +199,10 @@ %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Mon Jul 14 2008 - Bastien Nocera - 0.11.6-1 +- Update to 0.11.6 +- Remove loads of upstreamed patches + * Mon Jun 16 2008 - Bastien Nocera - 0.11.5-15 - Avoid crash on new iPods (#451547) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 17 Mar 2008 02:05:30 -0000 1.36 +++ sources 14 Jul 2008 10:00:52 -0000 1.37 @@ -1 +1 @@ -967440dd984ec724e7e7992d5bd57bbd rhythmbox-0.11.5.tar.bz2 +b827e047d13954ba956c3c4ea940935e rhythmbox-0.11.6.tar.bz2 --- rb-gvfs-cdda-activation.patch DELETED --- --- rb-magnatune-use-ogg.patch DELETED --- --- rb-soup_encode_uri-changes.patch DELETED --- --- rhythmbox-0.11.3-force-python-thread-init.patch DELETED --- --- rhythmbox-0.11.4-source-unref-crasher.patch DELETED --- --- rhythmbox-0.11.5-amazon-ecs.patch DELETED --- --- rhythmbox-0.11.5-clean-ipod-crash.patch DELETED --- --- rhythmbox-0.11.5-force-podcast-parsing.patch DELETED --- --- rhythmbox-0.11.5-xfade-deadlock.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 10:06:24 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Mon, 14 Jul 2008 10:06:24 GMT Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.31,1.32 Message-ID: <200807141006.m6EA6OZJ016521@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/gtk-sharp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16409 Modified Files: gtk-sharp2.spec Log Message: * Mon Jul 14 2008 Alex Lancaster - 2.12.1-2 - Rebuild for fixed RPM for mono provides. Index: gtk-sharp2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gtk-sharp2.spec 13 Jul 2008 17:17:30 -0000 1.31 +++ gtk-sharp2.spec 14 Jul 2008 10:05:25 -0000 1.32 @@ -1,6 +1,6 @@ Name: gtk-sharp2 Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -126,6 +126,9 @@ %{_libdir}/monodoc %changelog +* Mon Jul 14 2008 Alex Lancaster - 2.12.1-2 +- Rebuild for fixed RPM for mono provides. + * Sun Jul 13 2008 Xavier Lamien - 2.12.1-1 - Update release. From fedora-extras-commits at redhat.com Mon Jul 14 10:07:49 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Mon, 14 Jul 2008 10:07:49 GMT Subject: rpms/sagator/EL-5 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807141007.m6EA7nxk016705@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16614/EL-5 Modified Files: .cvsignore sagator.spec sources Added Files: import.log Log Message: New release. --- NEW FILE import.log --- sagator-1_1_0-1_fc9:EL-5:sagator-1.1.0-1.fc9.src.rpm:1216030000 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jan 2008 19:37:03 -0000 1.2 +++ .cvsignore 14 Jul 2008 10:06:54 -0000 1.3 @@ -1 +1 @@ -sagator-1.0.0.tar.bz2 +sagator-1.1.0.tar.bz2 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-5/sagator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sagator.spec 25 Jan 2008 19:37:03 -0000 1.1 +++ sagator.spec 14 Jul 2008 10:06:54 -0000 1.2 @@ -3,10 +3,11 @@ %define ARCHIVERS tar,arc,unace,unrar,rar,zoo,unarj,arj,unzip,zip,gzip,bzip2 %define ANTIVIRS clamav,clamav-libs,avglinux,nod32ls,nod32lfs,kav4mailservers-linux %define ANTISPAMS bogofilter,qsf +%define CLAMAV_VERSION 0.92 Summary: SAGATOR - antivir/antispam gateway for smtp server Name: sagator -Version: 1.0.0 +Version: 1.1.0 Release: 1%{?dist} Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 URL: http://www.salstar.sk/sagator/ @@ -15,24 +16,22 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2.2, ed, gettext +Obsoletes: sagator-libclamav <= 1.2.3 +Obsoletes: sagator-pydspam <= 0.9.1 Requires: python >= 2.2.2, sed %if %_vendor == "suse" -Requires: aaa_base, smtp_daemon -BuildRequires: aaa_base, python-xml +BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} +Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION} +%if 0%suse_version < 01030 +Requires: python-ctypes +%endif %else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts Requires: initscripts, smtpdaemon, shadow-utils -BuildRequires: initscripts, logwatch - -# SElinux policy for Fedoras and RHEL>=5 -%if 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: selinux-policy-devel -# SElinux directory and policy package -%define sedir %{_datadir}/%{name}/selinux -%define sepolicy %{sedir}/%{name}.pp -%endif +Requires: clamav-lib >= %{CLAMAV_VERSION} +BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} %endif @@ -67,6 +66,25 @@ SAGATOR's web quarantine access can be used to allow users (or admin) to access their emails in sagator's quarantine. +# SElinux policy for Fedoras and RHEL>=5 +%if 0%{?fedora} || 0%{?rhel} >= 5 +%package selinux +Summary: SELinux support for SAGATOR +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(postun): policycoreutils, selinux-policy +BuildRequires: selinux-policy-devel +# SElinux directory and policy package +%define install_sepolicy 1 +%define sepolicy %{_datadir}/%{name}/selinux/%{name}.pp + +%description selinux +This package helps moving to the upstream SELinux module. + +%else +%define install_sepolicy 0 +%endif + %prep %setup -q @@ -83,11 +101,6 @@ ln -s ../../../..%{_sysconfdir}/sagator.conf \ %{buildroot}%{_datadir}/%{name}/etc/sgconf.py mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine -# add SElinux policy -if [ -e %{buildroot}%{sepolicy} ]; then - echo "%dir %{sedir}" >> filelist - echo "%{sepolicy}" >> filelist -fi %find_lang %{name} %pre @@ -112,12 +125,6 @@ elif [ -x /sbin/insserv ]; then insserv sagator fi - # selinux - [ ! -x %{_sbindir}/semodule ] || [ ! -x %{_sbindir}/sestatus ] || - [ ! -x %{_sbindir}/selinuxenabled ] || ! %{_sbindir}/selinuxenabled || \ - [ ! -e %{sepolicy} ] || \ - %{_sbindir}/semodule -i %{sepolicy} \ - >/dev/null 2>/dev/null fi %preun @@ -132,6 +139,19 @@ fi fi +%if %{install_sepolicy} +%post selinux +if selinuxenabled; then + # Replace the module by the upstream one + #. /etc/selinux/config 2>/dev/null || : + semodule -i %{sepolicy} 2>/dev/null || : + # relabel files + fixfiles -R %{name} restore || : + # relabel chroot + restorecon -R %{CHROOTDIR} || : +fi +%endif + %triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot @@ -161,6 +181,10 @@ %exclude %{_datadir}/%{name}/etc/sgconf.py? %dir %{_datadir}/%{name}/av %{_datadir}/%{name}/av/*.py* +%dir %{_datadir}/%{name}/av/libclamav +%{_datadir}/%{name}/av//libclamav/*.py* +%dir %{_datadir}/%{name}/as/pydspam +%{_datadir}/%{name}/as//pydspam/*.py* %dir %{_datadir}/%{name}/as %{_datadir}/%{name}/as/*.py* %dir %{_datadir}/%{name}/interscan @@ -173,12 +197,24 @@ %attr(0770,vscan,vscan) %dir %{CHROOTDIR}/tmp/quarantine %files webq -f sagator.lang +%defattr(-,root,root) %dir %{_datadir}/%{name}/srv/web %{_datadir}/%{name}/srv/web/*.py* %{_datadir}/%{name}/srv/web/*.kid +%if %{install_sepolicy} +%files selinux +%defattr(-,root,root) +%{sepolicy} +%endif + %changelog -* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-1 +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 +- added libclamav module +- added pydspam module +- selinux module moved to separate subpackage + +* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0 - /var/spool/vscan replaced by CHROOTDIR macro - posttrans section moved to init script (start section) - more macros used Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Jan 2008 19:37:03 -0000 1.2 +++ sources 14 Jul 2008 10:06:54 -0000 1.3 @@ -1 +1 @@ -bf14d88d95645c41c489350bad74e1de sagator-1.0.0.tar.bz2 +a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 10:09:05 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 14 Jul 2008 10:09:05 GMT Subject: rpms/totem-pl-parser/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 totem-pl-parser.spec, 1.17, 1.18 Message-ID: <200807141009.m6EA95K1016835@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem-pl-parser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16780 Modified Files: .cvsignore sources totem-pl-parser.spec Log Message: * Mon Jul 14 2008 - Bastien Nocera - 2.23.3-1 - Update to 2.23.3 - Fixes crasher when totem_cd_detect_type() generates an error (#455014) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Jun 2008 12:22:29 -0000 1.10 +++ .cvsignore 14 Jul 2008 10:08:21 -0000 1.11 @@ -1 +1 @@ -totem-pl-parser-2.23.2.tar.bz2 +totem-pl-parser-2.23.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Jun 2008 12:22:30 -0000 1.10 +++ sources 14 Jul 2008 10:08:21 -0000 1.11 @@ -1 +1 @@ -e8bf9fed229386c44aaffbc7e063dc2e totem-pl-parser-2.23.2.tar.bz2 +c163dfd840c6a522e6cd852b379e89cd totem-pl-parser-2.23.3.tar.bz2 Index: totem-pl-parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- totem-pl-parser.spec 11 Jun 2008 12:22:30 -0000 1.17 +++ totem-pl-parser.spec 14 Jul 2008 10:08:21 -0000 1.18 @@ -1,5 +1,5 @@ Name: totem-pl-parser -Version: 2.23.2 +Version: 2.23.3 Release: 1%{?dist} Summary: Totem Playlist Parser library @@ -66,6 +66,10 @@ %{_datadir}/gtk-doc/html/totem-pl-parser %changelog +* Mon Jul 14 2008 - Bastien Nocera - 2.23.3-1 +- Update to 2.23.3 +- Fixes crasher when totem_cd_detect_type() generates an error (#455014) + * Wed Jun 11 2008 - Bastien Nocera - 2.23.2-1 - Update to 2.23.2 From fedora-extras-commits at redhat.com Mon Jul 14 10:11:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Mon, 14 Jul 2008 10:11:41 GMT Subject: rpms/sagator/EL-4 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807141011.m6EABfLh017174@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17063/EL-4 Modified Files: .cvsignore sagator.spec sources Added Files: import.log Log Message: New release. --- NEW FILE import.log --- sagator-1_1_0-1_fc9:EL-4:sagator-1.1.0-1.fc9.src.rpm:1216030241 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jan 2008 19:33:14 -0000 1.2 +++ .cvsignore 14 Jul 2008 10:10:54 -0000 1.3 @@ -1 +1 @@ -sagator-1.0.0.tar.bz2 +sagator-1.1.0.tar.bz2 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-4/sagator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sagator.spec 25 Jan 2008 19:33:14 -0000 1.1 +++ sagator.spec 14 Jul 2008 10:10:54 -0000 1.2 @@ -3,10 +3,11 @@ %define ARCHIVERS tar,arc,unace,unrar,rar,zoo,unarj,arj,unzip,zip,gzip,bzip2 %define ANTIVIRS clamav,clamav-libs,avglinux,nod32ls,nod32lfs,kav4mailservers-linux %define ANTISPAMS bogofilter,qsf +%define CLAMAV_VERSION 0.92 Summary: SAGATOR - antivir/antispam gateway for smtp server Name: sagator -Version: 1.0.0 +Version: 1.1.0 Release: 1%{?dist} Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 URL: http://www.salstar.sk/sagator/ @@ -15,24 +16,22 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2.2, ed, gettext +Obsoletes: sagator-libclamav <= 1.2.3 +Obsoletes: sagator-pydspam <= 0.9.1 Requires: python >= 2.2.2, sed %if %_vendor == "suse" -Requires: aaa_base, smtp_daemon -BuildRequires: aaa_base, python-xml +BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} +Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION} +%if 0%suse_version < 01030 +Requires: python-ctypes +%endif %else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts Requires: initscripts, smtpdaemon, shadow-utils -BuildRequires: initscripts, logwatch - -# SElinux policy for Fedoras and RHEL>=5 -%if 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: selinux-policy-devel -# SElinux directory and policy package -%define sedir %{_datadir}/%{name}/selinux -%define sepolicy %{sedir}/%{name}.pp -%endif +Requires: clamav-lib >= %{CLAMAV_VERSION} +BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} %endif @@ -67,6 +66,25 @@ SAGATOR's web quarantine access can be used to allow users (or admin) to access their emails in sagator's quarantine. +# SElinux policy for Fedoras and RHEL>=5 +%if 0%{?fedora} || 0%{?rhel} >= 5 +%package selinux +Summary: SELinux support for SAGATOR +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(postun): policycoreutils, selinux-policy +BuildRequires: selinux-policy-devel +# SElinux directory and policy package +%define install_sepolicy 1 +%define sepolicy %{_datadir}/%{name}/selinux/%{name}.pp + +%description selinux +This package helps moving to the upstream SELinux module. + +%else +%define install_sepolicy 0 +%endif + %prep %setup -q @@ -83,11 +101,6 @@ ln -s ../../../..%{_sysconfdir}/sagator.conf \ %{buildroot}%{_datadir}/%{name}/etc/sgconf.py mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine -# add SElinux policy -if [ -e %{buildroot}%{sepolicy} ]; then - echo "%dir %{sedir}" >> filelist - echo "%{sepolicy}" >> filelist -fi %find_lang %{name} %pre @@ -112,12 +125,6 @@ elif [ -x /sbin/insserv ]; then insserv sagator fi - # selinux - [ ! -x %{_sbindir}/semodule ] || [ ! -x %{_sbindir}/sestatus ] || - [ ! -x %{_sbindir}/selinuxenabled ] || ! %{_sbindir}/selinuxenabled || \ - [ ! -e %{sepolicy} ] || \ - %{_sbindir}/semodule -i %{sepolicy} \ - >/dev/null 2>/dev/null fi %preun @@ -132,6 +139,19 @@ fi fi +%if %{install_sepolicy} +%post selinux +if selinuxenabled; then + # Replace the module by the upstream one + #. /etc/selinux/config 2>/dev/null || : + semodule -i %{sepolicy} 2>/dev/null || : + # relabel files + fixfiles -R %{name} restore || : + # relabel chroot + restorecon -R %{CHROOTDIR} || : +fi +%endif + %triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot @@ -161,6 +181,10 @@ %exclude %{_datadir}/%{name}/etc/sgconf.py? %dir %{_datadir}/%{name}/av %{_datadir}/%{name}/av/*.py* +%dir %{_datadir}/%{name}/av/libclamav +%{_datadir}/%{name}/av//libclamav/*.py* +%dir %{_datadir}/%{name}/as/pydspam +%{_datadir}/%{name}/as//pydspam/*.py* %dir %{_datadir}/%{name}/as %{_datadir}/%{name}/as/*.py* %dir %{_datadir}/%{name}/interscan @@ -173,12 +197,24 @@ %attr(0770,vscan,vscan) %dir %{CHROOTDIR}/tmp/quarantine %files webq -f sagator.lang +%defattr(-,root,root) %dir %{_datadir}/%{name}/srv/web %{_datadir}/%{name}/srv/web/*.py* %{_datadir}/%{name}/srv/web/*.kid +%if %{install_sepolicy} +%files selinux +%defattr(-,root,root) +%{sepolicy} +%endif + %changelog -* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-1 +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 +- added libclamav module +- added pydspam module +- selinux module moved to separate subpackage + +* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0 - /var/spool/vscan replaced by CHROOTDIR macro - posttrans section moved to init script (start section) - more macros used Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Jan 2008 19:33:14 -0000 1.2 +++ sources 14 Jul 2008 10:10:54 -0000 1.3 @@ -1 +1 @@ -bf14d88d95645c41c489350bad74e1de sagator-1.0.0.tar.bz2 +a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 10:15:34 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Mon, 14 Jul 2008 10:15:34 GMT Subject: rpms/f-spot/F-9 f-spot-0.4.3-link-system-mono-addins.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 f-spot.spec, 1.66, 1.67 sources, 1.17, 1.18 Message-ID: <200807141015.m6EAFYE5017459@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/f-spot/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17255 Modified Files: .cvsignore f-spot.spec sources Added Files: f-spot-0.4.3-link-system-mono-addins.patch Log Message: Update to 0.4.3.1 for F-9 f-spot-0.4.3-link-system-mono-addins.patch: --- NEW FILE f-spot-0.4.3-link-system-mono-addins.patch --- diff -urNad f-spot~/Makefile.am f-spot/Makefile.am --- f-spot~/Makefile.am 2008-04-16 22:08:41.000000000 +0100 +++ f-spot/Makefile.am 2008-04-16 22:08:42.000000000 +0100 @@ -11,7 +11,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ @@ -30,7 +29,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ diff -urNad f-spot~/Makefile.include f-spot/Makefile.include --- f-spot~/Makefile.include 2008-04-16 22:07:51.000000000 +0100 +++ f-spot/Makefile.include 2008-04-16 22:08:42.000000000 +0100 @@ -27,10 +27,10 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll -LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll +LINK_MONO_ADDINS = \ + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \ diff -urNad f-spot~/configure.in f-spot/configure.in --- f-spot~/configure.in 2008-04-16 22:08:41.000000000 +0100 +++ f-spot/configure.in 2008-04-16 22:09:09.000000000 +0100 @@ -283,10 +283,6 @@ libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile -mono-addins/Makefile -mono-addins/Mono.Addins/Makefile -mono-addins/Mono.Addins.Gui/Makefile -mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in diff -u -r f-spot-0.4.2.orig/dbus-sharp/Makefile.in f-spot-0.4.2/dbus-sharp/Makefile.in --- f-spot-0.4.2.orig/dbus-sharp/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/dbus-sharp/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/dbus-sharp-glib/Makefile.in f-spot-0.4.2/dbus-sharp-glib/Makefile.in --- f-spot-0.4.2.orig/dbus-sharp-glib/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/dbus-sharp-glib/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/CDExport/Makefile.in f-spot-0.4.2/extensions/CDExport/Makefile.in --- f-spot-0.4.2.orig/extensions/CDExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/CDExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/DefaultExporters/Makefile.in f-spot-0.4.2/extensions/DefaultExporters/Makefile.in --- f-spot-0.4.2.orig/extensions/DefaultExporters/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/DefaultExporters/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in --- f-spot-0.4.2.orig/extensions/FlickrExport/FlickrNet/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/FlickrExport/Makefile.in f-spot-0.4.2/extensions/FlickrExport/Makefile.in --- f-spot-0.4.2.orig/extensions/FlickrExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/FlickrExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -300,9 +298,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/FolderExport/Makefile.in f-spot-0.4.2/extensions/FolderExport/Makefile.in --- f-spot-0.4.2.orig/extensions/FolderExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/FolderExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/GalleryExport/Makefile.in f-spot-0.4.2/extensions/GalleryExport/Makefile.in --- f-spot-0.4.2.orig/extensions/GalleryExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/GalleryExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in --- f-spot-0.4.2.orig/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/PicasaWebExport/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in --- f-spot-0.4.2.orig/extensions/PicasaWebExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -300,9 +298,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/SmugMugExport/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/Makefile.in --- f-spot-0.4.2.orig/extensions/SmugMugExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/SmugMugExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -300,9 +298,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in --- f-spot-0.4.2.orig/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/glitz-sharp/src/Makefile.in f-spot-0.4.2/glitz-sharp/src/Makefile.in --- f-spot-0.4.2.orig/glitz-sharp/src/Makefile.in 2008-02-14 15:27:20.000000000 -0700 +++ f-spot-0.4.2/glitz-sharp/src/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/gnome-keyring-sharp/Makefile.in f-spot-0.4.2/gnome-keyring-sharp/Makefile.in --- f-spot-0.4.2.orig/gnome-keyring-sharp/Makefile.in 2008-02-14 15:27:20.000000000 -0700 +++ f-spot-0.4.2/gnome-keyring-sharp/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/libgphoto2-sharp/Makefile.in f-spot-0.4.2/libgphoto2-sharp/Makefile.in --- f-spot-0.4.2.orig/libgphoto2-sharp/Makefile.in 2008-02-14 15:27:20.000000000 -0700 +++ f-spot-0.4.2/libgphoto2-sharp/Makefile.in 2008-04-15 05:33:46.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Makefile.in f-spot-0.4.2/Makefile.in --- f-spot-0.4.2.orig/Makefile.in 2008-02-14 15:27:22.000000000 -0700 +++ f-spot-0.4.2/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -311,7 +309,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ @@ -330,7 +327,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ diff -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in --- f-spot-0.4.2.orig/mono-addins/Mono.Addins/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in --- f-spot-0.4.2.orig/mono-addins/Mono.Addins.Gui/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-15 05:33:46.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in --- f-spot-0.4.2.orig/mono-addins/Mono.Addins.Setup/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-15 05:33:46.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/semweb/Makefile.in f-spot-0.4.2/semweb/Makefile.in --- f-spot-0.4.2.orig/semweb/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/semweb/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/src/Makefile.in f-spot-0.4.2/src/Makefile.in --- f-spot-0.4.2.orig/src/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/src/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -292,9 +290,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.GlPostProcess/Makefile.in 2008-02-14 15:27:17.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in 2008-04-15 05:33:43.000000000 -0700 @@ -278,9 +276,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.OpenGl/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-02-14 15:27:17.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-15 05:33:43.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.OpenGl.Glu/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-15 05:33:43.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 15 Feb 2008 00:30:30 -0000 1.17 +++ .cvsignore 14 Jul 2008 10:14:46 -0000 1.18 @@ -1 +1 @@ -f-spot-0.4.2.tar.bz2 +f-spot-0.4.3.1.tar.bz2 Index: f-spot.spec =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/F-9/f-spot.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- f-spot.spec 15 Apr 2008 12:39:32 -0000 1.66 +++ f-spot.spec 14 Jul 2008 10:14:46 -0000 1.67 @@ -1,16 +1,15 @@ Name: f-spot -Version: 0.4.2 -Release: 5%{?dist} +Version: 0.4.3.1 +Release: 1%{?dist} Summary: Photo management application Group: Applications/Multimedia License: GPL URL: http://www.gnome.org/projects/f-spot/ -Source0: f-spot-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/f-spot/0.4/f-spot-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=510325 Patch0: x-content.patch -Patch1: f-spot-0.4.2-GalleryExport.patch -Patch2: f-spot-0.4.2-link_system_libs.patch +Patch1: f-spot-0.4.3-link-system-mono-addins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel @@ -51,8 +50,7 @@ touch -r configure.in configure.in.stamp %patch0 -p1 -b .x-content -%patch1 -p1 -b .GalleryExport -%patch2 -p1 -b .link_system_libs +%patch1 -p1 -b .link-system-mono-addins # restore timestamps touch -r configure.in.stamp configure.in @@ -111,6 +109,9 @@ %{_datadir}/omf/f-spot %changelog +* Sun Jul 13 2008 Nigel Jones - 0.4.3.1-1 +- Update to 0.4.3.1 + * Tue Apr 15 2008 Alex Lancaster - 0.4.2-5 - Add patch from Debian to use system mono-addins (from #442343) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 15 Feb 2008 00:30:30 -0000 1.17 +++ sources 14 Jul 2008 10:14:46 -0000 1.18 @@ -1 +1 @@ -970b8c9de9acf97c90e3d9608827606d f-spot-0.4.2.tar.bz2 +8aa207e58f9187a762d3e14a46370268 f-spot-0.4.3.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 10:25:20 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 14 Jul 2008 10:25:20 GMT Subject: rpms/totem-pl-parser/devel totem-pl-parser.spec,1.18,1.19 Message-ID: <200807141025.m6EAPKeA017897@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem-pl-parser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17854 Modified Files: totem-pl-parser.spec Log Message: Add missing intltool BR Index: totem-pl-parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- totem-pl-parser.spec 14 Jul 2008 10:08:21 -0000 1.18 +++ totem-pl-parser.spec 14 Jul 2008 10:24:33 -0000 1.19 @@ -13,7 +13,7 @@ BuildRequires: gtk2-devel BuildRequires: evolution-data-server-devel BuildRequires: gettext -BuildRequires: perl(XML::Parser) +BuildRequires: perl(XML::Parser) intltool %description A library to parse and save playlists, as used in music and movie players. From fedora-extras-commits at redhat.com Mon Jul 14 10:26:53 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 14 Jul 2008 10:26:53 GMT Subject: rpms/rhythmbox/devel rhythmbox.spec,1.194,1.195 Message-ID: <200807141026.m6EAQrNJ018048@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17978 Modified Files: rhythmbox.spec Log Message: Add missing intltool BR Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- rhythmbox.spec 14 Jul 2008 10:00:52 -0000 1.194 +++ rhythmbox.spec 14 Jul 2008 10:26:07 -0000 1.195 @@ -46,7 +46,7 @@ BuildRequires: lirc-devel BuildRequires: libmtp-devel BuildRequires: gstreamer-python -BuildRequires: perl(XML::Parser) +BuildRequires: perl(XML::Parser) intltool BuildRequires: xulrunner-devel ExcludeArch: s390 s390x From fedora-extras-commits at redhat.com Mon Jul 14 10:35:43 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 14 Jul 2008 10:35:43 GMT Subject: rpms/clamav/EL-4 clamav-0.93.3-initoff.patch, NONE, 1.1 clamav-0.93.3-pid.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 clamav.spec, 1.36, 1.37 sources, 1.22, 1.23 clamav-0.80-initoff.patch, 1.2, NONE Message-ID: <200807141035.m6EAZhWR018567@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/clamav/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18433/EL-4 Modified Files: .cvsignore clamav.spec sources Added Files: clamav-0.93.3-initoff.patch clamav-0.93.3-pid.patch Removed Files: clamav-0.80-initoff.patch Log Message: - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files - Put pid instead of pgrp into pid file of clamav-milter (#452359) clamav-0.93.3-initoff.patch: --- NEW FILE clamav-0.93.3-initoff.patch --- --- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff +++ clamav-0.93.3/contrib/init/RedHat/clamav-milter @@ -2,7 +2,7 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # -# chkconfig: 2345 79 40 +# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes \ # email messages for virus scanning with ClamAV clamav-0.93.3-pid.patch: --- NEW FILE clamav-0.93.3-pid.patch --- Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora initscripts do not support killing of whole processgroups. Hence, disable feature which posts negative pgrp into pidfile and use plain pid instead of. diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c --- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 +++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 @@ -1985,7 +1985,7 @@ main(int argc, char **argv) logg(_("!Can't save PID in file %s\n"), pidfile); return EX_CONFIG; } -#ifdef C_LINUX +#if defined(C_LINUX) && 0 /* Ensure that all threads are kill()ed */ fprintf(fd, "-%d\n", (int)getpgrp()); #else Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clamav/EL-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 18 Jun 2008 10:10:58 -0000 1.9 +++ .cvsignore 14 Jul 2008 10:33:58 -0000 1.10 @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 Index: clamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/clamav/EL-4/clamav.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- clamav.spec 18 Jun 2008 10:10:58 -0000 1.36 +++ clamav.spec 14 Jul 2008 10:33:58 -0000 1.37 @@ -1,5 +1,3 @@ -## $Id$ - ## Fedora Extras specific customization below... # %bcond_without fedora ## @@ -15,7 +13,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: 1%{?dist} License: GPLv2 @@ -37,9 +35,10 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -230,6 +229,7 @@ %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} @@ -501,8 +501,13 @@ %changelog +* Mon Jul 14 2008 Robert Scheck - 0.93.3-1 +- Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: +- CVE-2008-2713 Out-of-bounds read on petite files +- Put pid instead of pgrp into pid file of clamav-milter (#452359) + * Wed Jun 18 2008 Robert Scheck - 0.93.1-1 -- Upgrade to 0.93.1, rediffed -path patch +- Upgrade to 0.93.1 (SECURITY), rediffed -path patch: - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability * Mon Apr 14 2008 Robert Scheck - 0.93-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clamav/EL-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 18 Jun 2008 10:10:58 -0000 1.22 +++ sources 14 Jul 2008 10:33:58 -0000 1.23 @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 --- clamav-0.80-initoff.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 10:36:03 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 14 Jul 2008 10:36:03 GMT Subject: rpms/clamav/EL-5 clamav-0.93.3-initoff.patch, NONE, 1.1 clamav-0.93.3-pid.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 clamav.spec, 1.51, 1.52 sources, 1.25, 1.26 clamav-0.80-initoff.patch, 1.2, NONE Message-ID: <200807141036.m6EAa3Vc018588@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/clamav/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18433/EL-5 Modified Files: .cvsignore clamav.spec sources Added Files: clamav-0.93.3-initoff.patch clamav-0.93.3-pid.patch Removed Files: clamav-0.80-initoff.patch Log Message: - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files - Put pid instead of pgrp into pid file of clamav-milter (#452359) clamav-0.93.3-initoff.patch: --- NEW FILE clamav-0.93.3-initoff.patch --- --- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff +++ clamav-0.93.3/contrib/init/RedHat/clamav-milter @@ -2,7 +2,7 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # -# chkconfig: 2345 79 40 +# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes \ # email messages for virus scanning with ClamAV clamav-0.93.3-pid.patch: --- NEW FILE clamav-0.93.3-pid.patch --- Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora initscripts do not support killing of whole processgroups. Hence, disable feature which posts negative pgrp into pidfile and use plain pid instead of. diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c --- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 +++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 @@ -1985,7 +1985,7 @@ main(int argc, char **argv) logg(_("!Can't save PID in file %s\n"), pidfile); return EX_CONFIG; } -#ifdef C_LINUX +#if defined(C_LINUX) && 0 /* Ensure that all threads are kill()ed */ fprintf(fd, "-%d\n", (int)getpgrp()); #else Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clamav/EL-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 18 Jun 2008 10:13:26 -0000 1.9 +++ .cvsignore 14 Jul 2008 10:34:44 -0000 1.10 @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 Index: clamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/clamav/EL-5/clamav.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- clamav.spec 18 Jun 2008 10:13:26 -0000 1.51 +++ clamav.spec 14 Jul 2008 10:34:44 -0000 1.52 @@ -1,5 +1,3 @@ -## $Id$ - ## Fedora Extras specific customization below... # %bcond_without fedora ## @@ -17,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1 License: GPLv2 @@ -39,9 +37,10 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -234,6 +233,7 @@ %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} @@ -511,8 +511,13 @@ %changelog +* Mon Jul 14 2008 Robert Scheck - 0.93.3-1 +- Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: +- CVE-2008-2713 Out-of-bounds read on petite files +- Put pid instead of pgrp into pid file of clamav-milter (#452359) + * Wed Jun 18 2008 Robert Scheck - 0.93.1-1 -- Upgrade to 0.93.1, rediffed -path patch +- Upgrade to 0.93.1 (SECURITY), rediffed -path patch: - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability * Mon Apr 14 2008 Robert Scheck - 0.93-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clamav/EL-5/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 18 Jun 2008 10:13:26 -0000 1.25 +++ sources 14 Jul 2008 10:34:44 -0000 1.26 @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 --- clamav-0.80-initoff.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 10:46:41 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 10:46:41 GMT Subject: rpms/byacc/F-9 skeleton.c.diff,NONE,1.1 byacc.spec,1.6,1.7 Message-ID: <200807141046.m6EAkfq8019495@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19391 Modified Files: byacc.spec Added Files: skeleton.c.diff Log Message: - Add a patch that fixes ancient buffer overflow - Related: #454583 skeleton.c.diff: --- NEW FILE skeleton.c.diff --- =================================================================== RCS file: /usr/OpenBSD/cvs/src/usr.bin/yacc/skeleton.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- src/usr.bin/yacc/skeleton.c 2007/09/03 21:14:58 1.28 +++ src/usr.bin/yacc/skeleton.c 2008/07/08 15:06:50 1.29 @@ -63,4 +63,5 @@ "#endif", "#include ", + "#include ", "#define YYBYACC 1", "#define YYMAJOR 1", @@ -346,7 +347,10 @@ " YYPREFIX, yystate, yyn, yyrule[yyn]);", "#endif", " yym = yylen[yyn];", - " yyval = yyvsp[1-yym];", + " if (yym)", + " yyval = yyvsp[1-yym];", + " else", + " memset(&yyval, 0, sizeof yyval);", " switch (yyn)", " {", 0 Index: byacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-9/byacc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- byacc.spec 3 Mar 2008 12:29:12 -0000 1.6 +++ byacc.spec 14 Jul 2008 10:45:55 -0000 1.7 @@ -3,11 +3,12 @@ Summary: Berkeley Yacc, a parser generator Name: byacc Version: 1.9.%{byaccdate} -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: Development/Tools URL: http://invisible-island.net/byacc/byacc.html Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz +Patch1: skeleton.c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,6 +20,7 @@ %prep %setup -q -n byacc-%{byaccdate} +%patch1 -p3 %build %configure --disable-dependency-tracking @@ -47,6 +49,10 @@ %{_mandir}/man1/byacc.1* %changelog +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-3 +- Add a patch that fixes ancient buffer overflow +- Related: #454583 + * Tue Feb 19 2008 Fedora Release Engineering - 1.9.20070509-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 10:46:51 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 10:46:51 GMT Subject: rpms/byacc/devel skeleton.c.diff,NONE,1.1 byacc.spec,1.6,1.7 Message-ID: <200807141046.m6EAkpps019586@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19331 Modified Files: byacc.spec Added Files: skeleton.c.diff Log Message: - Add a patch that fixes ancient buffer overflow - Resolves: #454583 skeleton.c.diff: --- NEW FILE skeleton.c.diff --- =================================================================== RCS file: /usr/OpenBSD/cvs/src/usr.bin/yacc/skeleton.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- src/usr.bin/yacc/skeleton.c 2007/09/03 21:14:58 1.28 +++ src/usr.bin/yacc/skeleton.c 2008/07/08 15:06:50 1.29 @@ -63,4 +63,5 @@ "#endif", "#include ", + "#include ", "#define YYBYACC 1", "#define YYMAJOR 1", @@ -346,7 +347,10 @@ " YYPREFIX, yystate, yyn, yyrule[yyn]);", "#endif", " yym = yylen[yyn];", - " yyval = yyvsp[1-yym];", + " if (yym)", + " yyval = yyvsp[1-yym];", + " else", + " memset(&yyval, 0, sizeof yyval);", " switch (yyn)", " {", 0 Index: byacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/byacc/devel/byacc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- byacc.spec 3 Mar 2008 12:29:12 -0000 1.6 +++ byacc.spec 14 Jul 2008 10:45:25 -0000 1.7 @@ -3,11 +3,12 @@ Summary: Berkeley Yacc, a parser generator Name: byacc Version: 1.9.%{byaccdate} -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: Development/Tools URL: http://invisible-island.net/byacc/byacc.html Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz +Patch1: skeleton.c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,6 +20,7 @@ %prep %setup -q -n byacc-%{byaccdate} +%patch1 -p3 %build %configure --disable-dependency-tracking @@ -47,6 +49,10 @@ %{_mandir}/man1/byacc.1* %changelog +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-3 +- Add a patch that fixes ancient buffer overflow +- Resolves: #454583 + * Tue Feb 19 2008 Fedora Release Engineering - 1.9.20070509-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 10:46:54 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Mon, 14 Jul 2008 10:46:54 GMT Subject: rpms/gtksourceview-sharp/devel gtksourceview-sharp.spec, 1.21, 1.22 import.log, 1.2, 1.3 Message-ID: <200807141046.m6EAksHE019640@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/gtksourceview-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19359/devel Modified Files: gtksourceview-sharp.spec import.log Log Message: rebuild Index: gtksourceview-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gtksourceview-sharp.spec 11 Jul 2008 10:24:58 -0000 1.21 +++ gtksourceview-sharp.spec 14 Jul 2008 10:45:39 -0000 1.22 @@ -4,7 +4,7 @@ Summary: A C sharp binder for gtksourceview Name: gtksourceview-sharp Version: 2.0.12 -Release: 4%{?dist} +Release: 4.1%{?dist} License: LGPL Group: System Environment/Libraries Source0: http://go-mono.com/sources-latest/%{name}-%{extra}.tar.bz2 @@ -59,6 +59,9 @@ %{__rm} -rf %{buildroot} %changelog +* Mon Jul 14 2008 Paul F. Johnson - 2.0-0.12-4.1 +- rebuild for new gtk-sharp2 + * Fri Jul 11 2008 Paul F. Johnson - 2.0-0.12-4 - rebuild for new gnome-sharp - fix BR to use gtksourceview rather than gtksourceview-2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 11 Jul 2008 10:24:58 -0000 1.2 +++ import.log 14 Jul 2008 10:45:39 -0000 1.3 @@ -1,2 +1,3 @@ gtksourceview-sharp-2_0_12-2_fc10:HEAD:gtksourceview-sharp-2.0.12-2.fc10.src.rpm:1215512860 gtksourceview-sharp-2_0_12-4_fc10:HEAD:gtksourceview-sharp-2.0.12-4.fc10.src.rpm:1215771796 +gtksourceview-sharp-2_0_12-4_1_fc10:HEAD:gtksourceview-sharp-2.0.12-4.1.fc10.src.rpm:1216032301 From fedora-extras-commits at redhat.com Mon Jul 14 10:47:20 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 10:47:20 GMT Subject: rpms/byacc/F-8 skeleton.c.diff,NONE,1.1 byacc.spec,1.3,1.4 Message-ID: <200807141047.m6EAlKtl019735@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19465 Modified Files: byacc.spec Added Files: skeleton.c.diff Log Message: - Add a patch that fixes ancient buffer overflow - Related: #454583 skeleton.c.diff: --- NEW FILE skeleton.c.diff --- =================================================================== RCS file: /usr/OpenBSD/cvs/src/usr.bin/yacc/skeleton.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- src/usr.bin/yacc/skeleton.c 2007/09/03 21:14:58 1.28 +++ src/usr.bin/yacc/skeleton.c 2008/07/08 15:06:50 1.29 @@ -63,4 +63,5 @@ "#endif", "#include ", + "#include ", "#define YYBYACC 1", "#define YYMAJOR 1", @@ -346,7 +347,10 @@ " YYPREFIX, yystate, yyn, yyrule[yyn]);", "#endif", " yym = yylen[yyn];", - " yyval = yyvsp[1-yym];", + " if (yym)", + " yyval = yyvsp[1-yym];", + " else", + " memset(&yyval, 0, sizeof yyval);", " switch (yyn)", " {", 0 Index: byacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-8/byacc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- byacc.spec 12 Sep 2007 15:01:11 -0000 1.3 +++ byacc.spec 14 Jul 2008 10:46:30 -0000 1.4 @@ -3,11 +3,12 @@ Summary: Berkeley Yacc, a parser generator Name: byacc Version: 1.9.%{byaccdate} -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: Development/Tools URL: http://dickey.his.com/byacc/byacc.html Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz +Patch1: skeleton.c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,6 +20,7 @@ %prep %setup -q -n byacc-%{byaccdate} +%patch1 -p3 %build %configure --disable-dependency-tracking @@ -47,6 +49,10 @@ %{_mandir}/man1/byacc.1* %changelog +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-3 +- Add a patch that fixes ancient buffer overflow +- Related: #454583 + * Fri Sep 12 2007 Matthias Saou 1.9.20050813-2 - Update summary. - Remove useless doc copying in install section. From fedora-extras-commits at redhat.com Mon Jul 14 10:49:23 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Mon, 14 Jul 2008 10:49:23 GMT Subject: rpms/gnome-do/devel import.log, NONE, 1.1 gnome-do.spec, 1.12, 1.13 gnome-do-0.4.0.1-libdir.patch, 1.1, NONE Message-ID: <200807141049.m6EAnNWW020047@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19934/devel Modified Files: gnome-do.spec Added Files: import.log Removed Files: gnome-do-0.4.0.1-libdir.patch Log Message: Rebuild --- NEW FILE import.log --- gnome-do-0_4_2_0-2_1_fc10:HEAD:gnome-do-0.4.2.0-2.1.fc10.src.rpm:1216032481 Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-do.spec 4 Jun 2008 14:19:34 -0000 1.12 +++ gnome-do.spec 14 Jul 2008 10:48:37 -0000 1.13 @@ -2,7 +2,7 @@ Name: gnome-do Version: 0.4.2.0 -Release: 2%{?dist} +Release: 2.1%{?dist} Summary: Quick launch and search License: GPLv3+ @@ -83,6 +83,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jul 14 2008 Paul F. Johnson 0.4.2.0-2.1 +- rebuild + * Wed Jun 04 2008 Caol??n McNamara - 0.4.2.0-2 - rebuild for dependancies --- gnome-do-0.4.0.1-libdir.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 10:52:10 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 10:52:10 GMT Subject: rpms/byacc/F-9 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200807141052.m6EAqAxd020564@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/F-9 Modified Files: .cvsignore sources Log Message: ... and forgotten source rename Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Nov 2007 17:13:34 -0000 1.5 +++ .cvsignore 14 Jul 2008 10:51:10 -0000 1.6 @@ -1 +1,2 @@ byacc-20070509.tar.gz +byacc-20070509.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Nov 2007 17:13:34 -0000 1.5 +++ sources 14 Jul 2008 10:51:10 -0000 1.6 @@ -1 +1 @@ -3dba490d29a509df796c9639e819d0c7 byacc-20070509.tar.gz +3dba490d29a509df796c9639e819d0c7 byacc-20070509.tgz From fedora-extras-commits at redhat.com Mon Jul 14 10:52:20 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Mon, 14 Jul 2008 10:52:20 GMT Subject: rpms/mono-addins/devel import.log, NONE, 1.1 mono-addins.spec, 1.7, 1.8 Message-ID: <200807141052.m6EAqK9w020626@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/mono-addins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20448/devel Modified Files: mono-addins.spec Added Files: import.log Log Message: rebuild --- NEW FILE import.log --- mono-addins-0_3_1-2_2_fc10:HEAD:mono-addins-0.3.1-2.2.fc10.src.rpm:1216032635 Index: mono-addins.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-addins/devel/mono-addins.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mono-addins.spec 28 May 2008 15:27:58 -0000 1.7 +++ mono-addins.spec 14 Jul 2008 10:51:32 -0000 1.8 @@ -2,7 +2,7 @@ Name: mono-addins Version: 0.3.1 -Release: 2%{?dist} +Release: 2.2%{?dist} Summary: Addins for mono Group: Development/Languages License: GPLv2 @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel >= 1.2.3, gtk-sharp2-devel, autoconf, automake +BuildRequires: pkgconfig ExcludeArch: ppc64 %description @@ -62,8 +63,14 @@ %{_libdir}/pkgconfig/mono-addins* %changelog -* Wed May 28 2008 Tom "spot" Callaway - 0.3.1-2 -- rebuild for new gtk-sharp2 +* Mon Jul 14 2008 Paul F. Johnson - 0.3.1-2.2 +- rebuild + +* Thu May 01 2008 Paul F. Johnson - 0.3.1-2.1 +- rebuild + +* Tue Apr 29 2008 Paul F. Johnson - 0.3.1-2 +- added BR pkgconfig * Mon Apr 21 2008 Paul F. Johnson - 0.3.1-1 - bump (should fix the monodevelop problems) From fedora-extras-commits at redhat.com Mon Jul 14 10:52:27 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 10:52:27 GMT Subject: rpms/byacc/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200807141052.m6EAqRT6020642@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/devel Modified Files: .cvsignore sources Log Message: ... and forgotten source rename Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/byacc/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Nov 2007 17:13:34 -0000 1.5 +++ .cvsignore 14 Jul 2008 10:51:41 -0000 1.6 @@ -1 +1,2 @@ byacc-20070509.tar.gz +byacc-20070509.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/byacc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Nov 2007 17:13:34 -0000 1.5 +++ sources 14 Jul 2008 10:51:41 -0000 1.6 @@ -1 +1 @@ -3dba490d29a509df796c9639e819d0c7 byacc-20070509.tar.gz +3dba490d29a509df796c9639e819d0c7 byacc-20070509.tgz From fedora-extras-commits at redhat.com Mon Jul 14 10:54:21 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 10:54:21 GMT Subject: rpms/webalizer/devel webalizer.spec,1.32,1.33 Message-ID: <200807141054.m6EAsLeu020927@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/webalizer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20796 Modified Files: webalizer.spec Log Message: * Mon Jul 14 2008 Joe Orton 2.01_10-37 - rebuild for new BDB Index: webalizer.spec =================================================================== RCS file: /cvs/extras/rpms/webalizer/devel/webalizer.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- webalizer.spec 7 Feb 2008 16:33:39 -0000 1.32 +++ webalizer.spec 14 Jul 2008 10:53:35 -0000 1.33 @@ -5,7 +5,7 @@ Summary: A flexible Web server log file analysis program Group: Applications/Internet Version: 2.01_10 -Release: 36 +Release: 37 URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tar.bz2 @@ -107,6 +107,9 @@ %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Mon Jul 14 2008 Joe Orton 2.01_10-37 +- rebuild for new BDB + * Thu Feb 7 2008 Joe Orton 2.01_10-36 - fix build with new glibc, use _GNU_SOURCE From fedora-extras-commits at redhat.com Mon Jul 14 10:55:10 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 10:55:10 GMT Subject: rpms/mod_perl/devel mod_perl.spec,1.63,1.64 Message-ID: <200807141055.m6EAtAxG021087@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/mod_perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20928 Modified Files: mod_perl.spec Log Message: * Mon Jul 14 2008 Joe Orton 2.0.4-4 - rebuild for new BDB Index: mod_perl.spec =================================================================== RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- mod_perl.spec 13 May 2008 09:59:36 -0000 1.63 +++ mod_perl.spec 14 Jul 2008 10:54:21 -0000 1.64 @@ -2,7 +2,7 @@ Name: mod_perl Version: 2.0.4 -Release: 3 +Release: 4 Summary: An embedded Perl interpreter for the Apache HTTP Server Group: System Environment/Daemons @@ -127,6 +127,9 @@ %{_includedir}/httpd/* %changelog +* Mon Jul 14 2008 Joe Orton 2.0.4-4 +- rebuild for new BDB + * Tue May 13 2008 Joe Orton 2.0.4-3 - trim changelog; rebuild From fedora-extras-commits at redhat.com Mon Jul 14 10:56:09 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Mon, 14 Jul 2008 10:56:09 GMT Subject: rpms/mono-tools/devel import.log,1.2,1.3 mono-tools.spec,1.5,1.6 Message-ID: <200807141056.m6EAu9fB021230@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/mono-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21127/devel Modified Files: import.log mono-tools.spec Log Message: Rebuild Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Jul 2008 11:45:57 -0000 1.2 +++ import.log 14 Jul 2008 10:55:23 -0000 1.3 @@ -1,2 +1,3 @@ mono-tools-1_9-3_1_fc10:HEAD:mono-tools-1.9-3.1.fc10.src.rpm:1215515928 mono-tools-1_9-4_fc10:HEAD:mono-tools-1.9-4.fc10.src.rpm:1215517451 +mono-tools-1_9-4_1_fc10:HEAD:mono-tools-1.9-4.1.fc10.src.rpm:1216032887 Index: mono-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mono-tools.spec 8 Jul 2008 11:45:57 -0000 1.5 +++ mono-tools.spec 14 Jul 2008 10:55:23 -0000 1.6 @@ -4,7 +4,7 @@ Summary: The mono documentation system Name: mono-tools Version: 1.9 -Release: 4%{?dist} +Release: 4.1%{?dist} License: GPLv2 Group: Development/Tools Patch0: mono-tools.patch @@ -95,6 +95,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jul 14 2008 Paul F. Johnson 1.9-4.1 +- rebuild + * Tue Jul 08 2008 Paul F. Johnson 1.9-4 - added br gnome-desktop-sharp - fix for archs From fedora-extras-commits at redhat.com Mon Jul 14 10:58:04 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Mon, 14 Jul 2008 10:58:04 GMT Subject: rpms/f-spot/devel f-spot-0.4.4-Makefile-destdir.patch, NONE, 1.1 f-spot-0.4.4-gtk-deprecated.patch, NONE, 1.1 f-spot-0.4.4-link-system-mono-addins.patch, NONE, 1.1 f-spot.spec, 1.73, 1.74 Message-ID: <200807141058.m6EAw4W3021555@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/f-spot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21343 Modified Files: f-spot.spec Added Files: f-spot-0.4.4-Makefile-destdir.patch f-spot-0.4.4-gtk-deprecated.patch f-spot-0.4.4-link-system-mono-addins.patch Log Message: * Mon Jul 14 2008 Nigel Jones - 0.4.4-4 - Remove Tom's patch in -2, there is a gtk-sharp 2.12.1, just nobody bothered packaging it. - Patch Makefile{.in,am} to use DESTDIR for the gio-sharp.dll, this is effectively a backport of r4010 Upstream. - Patch libfspot/Makefile{.in,am} to remove -DGTK_DISABLE_DEPRECATED per recommendation of upstream. - Re-add patch to use system mono-addins - Include GIO stuff for now (until it appears in gtk-sharp) f-spot-0.4.4-Makefile-destdir.patch: --- NEW FILE f-spot-0.4.4-Makefile-destdir.patch --- diff -ru f-spot-0.4.4.old/Makefile.am f-spot-0.4.4/Makefile.am --- f-spot-0.4.4.old/Makefile.am 2008-07-13 20:29:31.000000000 +1200 +++ f-spot-0.4.4/Makefile.am 2008-07-13 22:01:09.000000000 +1200 @@ -89,12 +89,12 @@ install-data-hook: $(UPDATE_DESKTOP) if [ "x$(DIR_GIO)" != "x" ] ; then \ - $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \ - $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \ + $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \ + $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \ fi uninstall-hook: $(UPDATE_DESKTOP) if [ "x$(DIR_GIO)" != "x" ] ; then \ - rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \ + rm -f $(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \ fi diff -ru f-spot-0.4.4.old/Makefile.in f-spot-0.4.4/Makefile.in --- f-spot-0.4.4.old/Makefile.in 2008-07-13 20:29:27.000000000 +1200 +++ f-spot-0.4.4/Makefile.in 2008-07-13 22:02:46.000000000 +1200 @@ -892,14 +892,14 @@ install-data-hook: $(UPDATE_DESKTOP) if [ "x$(DIR_GIO)" != "x" ] ; then \ - $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \ - $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \ + $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \ + $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \ fi uninstall-hook: $(UPDATE_DESKTOP) if [ "x$(DIR_GIO)" != "x" ] ; then \ - rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \ + rm -f $(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. f-spot-0.4.4-gtk-deprecated.patch: --- NEW FILE f-spot-0.4.4-gtk-deprecated.patch --- diff -ru f-spot-0.4.4.old/libfspot/Makefile.am f-spot-0.4.4/libfspot/Makefile.am --- f-spot-0.4.4.old/libfspot/Makefile.am 2008-07-13 20:29:28.000000000 +1200 +++ f-spot-0.4.4/libfspot/Makefile.am 2008-07-13 20:30:13.000000000 +1200 @@ -2,7 +2,7 @@ -I $(top_srcdir) \ -DLIBEOG_ETTORE_CHANGES=1 \ -DG_LOG_DOMAIN=\"libf\" \ - -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \ + -DG_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \ $(F_CFLAGS) \ $(EXIF_CFLAGS) \ diff -ru f-spot-0.4.4.old/libfspot/Makefile.in f-spot-0.4.4/libfspot/Makefile.in --- f-spot-0.4.4.old/libfspot/Makefile.in 2008-07-13 20:29:28.000000000 +1200 +++ f-spot-0.4.4/libfspot/Makefile.in 2008-07-13 20:52:22.000000000 +1200 @@ -294,7 +294,7 @@ -I $(top_srcdir) \ -DLIBEOG_ETTORE_CHANGES=1 \ -DG_LOG_DOMAIN=\"libf\" \ - -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \ + -DG_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \ $(F_CFLAGS) \ $(EXIF_CFLAGS) \ f-spot-0.4.4-link-system-mono-addins.patch: --- NEW FILE f-spot-0.4.4-link-system-mono-addins.patch --- diff -ur f-spot-0.4.4.old/configure.in f-spot-0.4.4/configure.in --- f-spot-0.4.4.old/configure.in 2008-05-28 09:08:19.000000000 +1200 +++ f-spot-0.4.4/configure.in 2008-07-14 01:15:05.000000000 +1200 @@ -334,10 +334,6 @@ libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile -mono-addins/Makefile -mono-addins/Mono.Addins/Makefile -mono-addins/Mono.Addins.Gui/Makefile -mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in Only in f-spot-0.4.4: configure.in.orig diff -ur f-spot-0.4.4.old/dbus-sharp/Makefile.in f-spot-0.4.4/dbus-sharp/Makefile.in --- f-spot-0.4.4.old/dbus-sharp/Makefile.in 2008-05-28 18:43:54.000000000 +1200 +++ f-spot-0.4.4/dbus-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/dbus-sharp: Makefile.in.orig diff -ur f-spot-0.4.4.old/dbus-sharp-glib/Makefile.in f-spot-0.4.4/dbus-sharp-glib/Makefile.in --- f-spot-0.4.4.old/dbus-sharp-glib/Makefile.in 2008-05-28 18:43:54.000000000 +1200 +++ f-spot-0.4.4/dbus-sharp-glib/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/dbus-sharp-glib: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/CDExport/Makefile.in f-spot-0.4.4/extensions/CDExport/Makefile.in --- f-spot-0.4.4.old/extensions/CDExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200 +++ f-spot-0.4.4/extensions/CDExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/CDExport: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/DefaultExporters/Makefile.in f-spot-0.4.4/extensions/DefaultExporters/Makefile.in --- f-spot-0.4.4.old/extensions/DefaultExporters/Makefile.in 2008-05-28 18:43:55.000000000 +1200 +++ f-spot-0.4.4/extensions/DefaultExporters/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/DefaultExporters: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.4/extensions/FlickrExport/FlickrNet/Makefile.in --- f-spot-0.4.4.old/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-28 18:43:55.000000000 +1200 +++ f-spot-0.4.4/extensions/FlickrExport/FlickrNet/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/FlickrExport/FlickrNet: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/FlickrExport/Makefile.in f-spot-0.4.4/extensions/FlickrExport/Makefile.in --- f-spot-0.4.4.old/extensions/FlickrExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200 +++ f-spot-0.4.4/extensions/FlickrExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -303,9 +303,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/FlickrExport: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/FolderExport/Makefile.in f-spot-0.4.4/extensions/FolderExport/Makefile.in --- f-spot-0.4.4.old/extensions/FolderExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200 +++ f-spot-0.4.4/extensions/FolderExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/FolderExport: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/GalleryExport/Makefile.in f-spot-0.4.4/extensions/GalleryExport/Makefile.in --- f-spot-0.4.4.old/extensions/GalleryExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200 +++ f-spot-0.4.4/extensions/GalleryExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/GalleryExport: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.4/extensions/PicasaWebExport/google-sharp/Makefile.in --- f-spot-0.4.4.old/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-28 18:43:56.000000000 +1200 +++ f-spot-0.4.4/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/PicasaWebExport/google-sharp: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/PicasaWebExport/Makefile.in f-spot-0.4.4/extensions/PicasaWebExport/Makefile.in --- f-spot-0.4.4.old/extensions/PicasaWebExport/Makefile.in 2008-05-28 18:43:56.000000000 +1200 +++ f-spot-0.4.4/extensions/PicasaWebExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -303,9 +303,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/PicasaWebExport: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/SmugMugExport/Makefile.in f-spot-0.4.4/extensions/SmugMugExport/Makefile.in --- f-spot-0.4.4.old/extensions/SmugMugExport/Makefile.in 2008-05-28 18:43:56.000000000 +1200 +++ f-spot-0.4.4/extensions/SmugMugExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -303,9 +303,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/SmugMugExport: Makefile.in.orig diff -ur f-spot-0.4.4.old/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.4/extensions/SmugMugExport/SmugMugNet/Makefile.in --- f-spot-0.4.4.old/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-28 18:43:56.000000000 +1200 +++ f-spot-0.4.4/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/extensions/SmugMugExport/SmugMugNet: Makefile.in.orig diff -ur f-spot-0.4.4.old/glitz-sharp/src/Makefile.in f-spot-0.4.4/glitz-sharp/src/Makefile.in --- f-spot-0.4.4.old/glitz-sharp/src/Makefile.in 2008-05-28 18:43:56.000000000 +1200 +++ f-spot-0.4.4/glitz-sharp/src/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/glitz-sharp/src: Makefile.in.orig diff -ur f-spot-0.4.4.old/gnome-keyring-sharp/Makefile.in f-spot-0.4.4/gnome-keyring-sharp/Makefile.in --- f-spot-0.4.4.old/gnome-keyring-sharp/Makefile.in 2008-05-28 18:43:57.000000000 +1200 +++ f-spot-0.4.4/gnome-keyring-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/gnome-keyring-sharp: Makefile.in.orig diff -ur f-spot-0.4.4.old/libgphoto2-sharp/Makefile.in f-spot-0.4.4/libgphoto2-sharp/Makefile.in --- f-spot-0.4.4.old/libgphoto2-sharp/Makefile.in 2008-05-28 18:43:57.000000000 +1200 +++ f-spot-0.4.4/libgphoto2-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/libgphoto2-sharp: Makefile.in.orig diff -ur f-spot-0.4.4.old/Makefile.am f-spot-0.4.4/Makefile.am --- f-spot-0.4.4.old/Makefile.am 2008-05-29 07:37:22.000000000 +1200 +++ f-spot-0.4.4/Makefile.am 2008-07-14 01:15:05.000000000 +1200 @@ -12,7 +12,6 @@ libfspot \ libgphoto2-sharp \ Tao \ - mono-addins \ tools \ po \ src \ @@ -32,7 +31,6 @@ libfspot \ libgphoto2-sharp \ Tao \ - mono-addins \ tools \ po \ src \ Only in f-spot-0.4.4: Makefile.am.orig diff -ur f-spot-0.4.4.old/Makefile.in f-spot-0.4.4/Makefile.in --- f-spot-0.4.4.old/Makefile.in 2008-05-29 07:38:03.000000000 +1200 +++ f-spot-0.4.4/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -317,7 +317,6 @@ libfspot \ libgphoto2-sharp \ Tao \ - mono-addins \ tools \ po \ src \ @@ -337,7 +336,6 @@ libfspot \ libgphoto2-sharp \ Tao \ - mono-addins \ tools \ po \ src \ diff -ur f-spot-0.4.4.old/Makefile.include f-spot-0.4.4/Makefile.include --- f-spot-0.4.4.old/Makefile.include 2008-05-17 06:52:42.000000000 +1200 +++ f-spot-0.4.4/Makefile.include 2008-07-14 01:15:05.000000000 +1200 @@ -27,10 +27,10 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll -LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll +LINK_MONO_ADDINS = \ + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \ Only in f-spot-0.4.4: Makefile.in.orig diff -ur f-spot-0.4.4.old/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.4/mono-addins/Mono.Addins/Makefile.in --- f-spot-0.4.4.old/mono-addins/Mono.Addins/Makefile.in 2008-05-28 18:43:58.000000000 +1200 +++ f-spot-0.4.4/mono-addins/Mono.Addins/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/mono-addins/Mono.Addins: Makefile.in.orig diff -ur f-spot-0.4.4.old/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.4/mono-addins/Mono.Addins.Gui/Makefile.in --- f-spot-0.4.4.old/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-28 18:43:58.000000000 +1200 +++ f-spot-0.4.4/mono-addins/Mono.Addins.Gui/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/mono-addins/Mono.Addins.Gui: Makefile.in.orig diff -ur f-spot-0.4.4.old/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.4/mono-addins/Mono.Addins.Setup/Makefile.in --- f-spot-0.4.4.old/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-28 18:43:58.000000000 +1200 +++ f-spot-0.4.4/mono-addins/Mono.Addins.Setup/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/mono-addins/Mono.Addins.Setup: Makefile.in.orig diff -ur f-spot-0.4.4.old/semweb/Makefile.in f-spot-0.4.4/semweb/Makefile.in --- f-spot-0.4.4.old/semweb/Makefile.in 2008-05-28 18:43:58.000000000 +1200 +++ f-spot-0.4.4/semweb/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/semweb: Makefile.in.orig diff -ur f-spot-0.4.4.old/src/Makefile.in f-spot-0.4.4/src/Makefile.in --- f-spot-0.4.4.old/src/Makefile.in 2008-05-28 21:29:41.000000000 +1200 +++ f-spot-0.4.4/src/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -297,9 +297,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/src: Makefile.in.orig diff -ur f-spot-0.4.4.old/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.4/Tao/Tao.GlPostProcess/Makefile.in --- f-spot-0.4.4.old/Tao/Tao.GlPostProcess/Makefile.in 2008-05-28 18:43:54.000000000 +1200 +++ f-spot-0.4.4/Tao/Tao.GlPostProcess/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -281,9 +281,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/Tao/Tao.GlPostProcess: Makefile.in.orig diff -ur f-spot-0.4.4.old/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.4/Tao/Tao.OpenGl/Makefile.in --- f-spot-0.4.4.old/Tao/Tao.OpenGl/Makefile.in 2008-05-28 18:43:54.000000000 +1200 +++ f-spot-0.4.4/Tao/Tao.OpenGl/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/Tao/Tao.OpenGl: Makefile.in.orig diff -ur f-spot-0.4.4.old/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.4/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in --- f-spot-0.4.4.old/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-28 18:43:54.000000000 +1200 +++ f-spot-0.4.4/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/Tao/Tao.OpenGl.ExtensionLoader: Makefile.in.orig diff -ur f-spot-0.4.4.old/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.4/Tao/Tao.OpenGl.Glu/Makefile.in --- f-spot-0.4.4.old/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-28 18:43:54.000000000 +1200 +++ f-spot-0.4.4/Tao/Tao.OpenGl.Glu/Makefile.in 2008-07-14 01:15:05.000000000 +1200 @@ -291,9 +291,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Only in f-spot-0.4.4/Tao/Tao.OpenGl.Glu: Makefile.in.orig Index: f-spot.spec =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- f-spot.spec 5 Jul 2008 20:50:59 -0000 1.73 +++ f-spot.spec 14 Jul 2008 10:57:13 -0000 1.74 @@ -1,6 +1,6 @@ Name: f-spot Version: 0.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Photo management application Group: Applications/Multimedia @@ -9,9 +9,12 @@ Source0: http://download.gnome.org/sources/f-spot/0.4/f-spot-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=510325 Patch0: x-content.patch -# glib-sharp-2.12.1 doesnt't exist yet? -# Can safely drop this patch when it does. -Patch1: f-spot-0.4.4-glib-sharp-2.12.0.patch +# I'm told this is fixed in SVN +Patch1: f-spot-0.4.4-gtk-deprecated.patch +# This is fixed in current SVN +Patch2: f-spot-0.4.4-Makefile-destdir.patch +# Use system mono-addins +Patch3: f-spot-0.4.4-link-system-mono-addins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel @@ -52,7 +55,9 @@ touch -r configure.in configure.in.stamp %patch0 -p1 -b .x-content -%patch1 -p1 -b .glib-sharp-2.12.0 +%patch1 -p1 -b .gtk-deprecated +%patch2 -p1 -b .Makefile-destdir +%patch3 -p1 -b .link-system-mono-addins # restore timestamps touch -r configure.in.stamp configure.in @@ -71,6 +76,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc +# Will need to be removed at some point... +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gio-sharp-unstable.pc chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll @@ -109,8 +116,20 @@ %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver %{_datadir}/applications/screensavers/f-spot-screensaver.desktop %{_datadir}/omf/f-spot +# GIO is currently provided in f-spot only, so this'll need to be removed sometime in the future +%{_libdir}/gio-sharp-unstable %changelog +* Mon Jul 14 2008 Nigel Jones - 0.4.4-4 +- Remove Tom's patch in -2, there is a gtk-sharp 2.12.1, just nobody bothered + packaging it. +- Patch Makefile{.in,am} to use DESTDIR for the gio-sharp.dll, this is + effectively a backport of r4010 Upstream. +- Patch libfspot/Makefile{.in,am} to remove -DGTK_DISABLE_DEPRECATED per + recommendation of upstream. +- Re-add patch to use system mono-addins +- Include GIO stuff for now (until it appears in gtk-sharp) + * Wed Jul 5 2008 Alex Lancaster - 0.4.4-3 - gtkhtml dependency now provided by gnome-desktop-sharp-devel rather than gnome-sharp-devel, so add as BuildRequires From fedora-extras-commits at redhat.com Mon Jul 14 11:05:34 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 11:05:34 GMT Subject: rpms/php/devel php-5.2.5-systzdata.patch, 1.1, 1.2 php.ini, 1.7, 1.8 php.spec, 1.156, 1.157 sources, 1.35, 1.36 php-4.3.9-metaphone.patch, 1.1, NONE Message-ID: <200807141105.m6EB5YTt028704@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/php/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28660 Modified Files: php-5.2.5-systzdata.patch php.ini php.spec sources Removed Files: php-4.3.9-metaphone.patch Log Message: * Mon Jul 14 2008 Joe Orton 5.2.6-3 - update to 5.2.6 - sync default php.ini with upstream - drop extension_dir from default php.ini, rely on hard-coded default, to make php-common multilib-safe (#455091) - update to r3 of systzdata patch php-5.2.5-systzdata.patch: Index: php-5.2.5-systzdata.patch =================================================================== RCS file: /cvs/extras/rpms/php/devel/php-5.2.5-systzdata.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-5.2.5-systzdata.patch 11 Jan 2008 08:24:21 -0000 1.1 +++ php-5.2.5-systzdata.patch 14 Jul 2008 11:04:39 -0000 1.2 @@ -1,3 +1,12 @@ + +Add support for use of the system timezone database, rather +than embedding a copy. Discussed upstream but was not desired. + +History: +r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) +r2: add filesystem trawl to set up name alias index +r1: initial revision + --- php-5.2.5/ext/date/lib/timelib.m4.systzdata +++ php-5.2.5/ext/date/lib/timelib.m4 @@ -78,3 +78,17 @@ stdlib.h @@ -82,7 +91,7 @@ + timelib_tzdb_index_entry *db_index; + char **dirstack; + -+ /* LIFO stack to hold directory entres to scan; each slot is a ++ /* LIFO stack to hold directory entries to scan; each slot is a + * directory name relative to the zoneinfo prefix. */ + dirstack_size = 32; + dirstack = malloc(dirstack_size * sizeof *dirstack); @@ -144,7 +153,7 @@ + free(ents[--count]); + } + -+ free(ents); ++ if (count != -1) free(ents); + free(top); + } while (dirstack_top); + Index: php.ini =================================================================== RCS file: /cvs/extras/rpms/php/devel/php.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php.ini 4 May 2007 10:08:53 -0000 1.7 +++ php.ini 14 Jul 2008 11:04:39 -0000 1.8 @@ -299,6 +299,7 @@ max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data +;max_input_nesting_level = 64 ; Maximum input variable nesting level memory_limit = 32M ; Maximum amount of memory a script may consume (16MB) @@ -353,6 +354,18 @@ ; instead (see below). Keeping display_errors enabled on a production web site ; may reveal security information to end users, such as file paths on your Web ; server, your database schema or other information. +; +; possible values for display_errors: +; +; Off - Do not display any errors +; stderr - Display errors to STDERR (affects only CGI/CLI binaries!) +; On or stdout - Display errors to STDOUT (default) +; +; To output errors to STDERR with CGI/CLI: +;display_errors = "stderr" +; +; Default +; display_errors = Off ; Even when display_errors is on, errors that occur during PHP's startup @@ -516,9 +529,6 @@ ; if nonempty. user_dir = -; Directory in which the loadable extensions (modules) reside. -extension_dir = "/usr/lib/php/modules" - ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically ; disabled on them. @@ -540,6 +550,14 @@ ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; cgi.redirect_status_env = ; +; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's +; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok +; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting +; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting +; of zero causes PHP to behave as before. Default is 1. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; cgi.fix_pathinfo=1 + ; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate ; security tokens of the calling client. This allows IIS to define the ; security context that the request runs under. mod_fastcgi under Apache @@ -548,7 +566,7 @@ ; fastcgi.impersonate = 1; ; Disable logging through FastCGI connection -; fastcgi.log = 0 +; fastcgi.logging = 0 ; cgi.rfc2616_headers configuration option tells PHP what type of headers to ; use when sending HTTP response code. If it's set 0 PHP sends Status: header that @@ -938,6 +956,8 @@ ; Whether to use cookies. session.use_cookies = 1 +;session.cookie_secure = + ; This option enables administrators to make their users invulnerable to ; attacks which involve passing session ids in URLs; defaults to 0. ; session.use_only_cookies = 1 Index: php.spec =================================================================== RCS file: /cvs/extras/rpms/php/devel/php.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- php.spec 24 Apr 2008 09:36:14 -0000 1.156 +++ php.spec 14 Jul 2008 11:04:39 -0000 1.157 @@ -5,8 +5,8 @@ Summary: The PHP HTML-embedded scripting language Name: php -Version: 5.2.5 -Release: 7 +Version: 5.2.6 +Release: 3 License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -27,7 +27,6 @@ Patch21: php-5.2.4-odbc.patch Patch22: php-4.3.11-shutdown.patch Patch24: php-5.2.3-macropen.patch -Patch25: php-4.3.9-metaphone.patch # Functional changes Patch30: php-5.0.4-dlopen.patch @@ -367,7 +366,6 @@ %patch21 -p1 -b .odbc %patch22 -p1 -b .shutdown %patch24 -p1 -b .macropen -%patch25 -p1 -b .metaphone %patch30 -p1 -b .dlopen %patch31 -p1 -b .easter @@ -594,9 +592,6 @@ install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear \ $RPM_BUILD_ROOT%{_datadir}/php -# Use correct libdir -sed -i -e 's|%{_prefix}/lib|%{_libdir}|' $RPM_BUILD_ROOT%{_sysconfdir}/php.ini - # install the DSO install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules install -m 755 build-apache/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules @@ -728,6 +723,13 @@ %files pspell -f files.pspell %changelog +* Mon Jul 14 2008 Joe Orton 5.2.6-3 +- update to 5.2.6 +- sync default php.ini with upstream +- drop extension_dir from default php.ini, rely on hard-coded + default, to make php-common multilib-safe (#455091) +- update to r3 of systzdata patch + * Thu Apr 24 2008 Joe Orton 5.2.5-7 - split pspell extension out into php-spell (#443857) Index: sources =================================================================== RCS file: /cvs/extras/rpms/php/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 5 Dec 2007 15:49:24 -0000 1.35 +++ sources 14 Jul 2008 11:04:39 -0000 1.36 @@ -1 +1 @@ -61a0e1661b70760acc77bc4841900b7a php-5.2.5.tar.gz +1720f95f26c506338f0dba3a51906bbd php-5.2.6.tar.gz --- php-4.3.9-metaphone.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 11:11:12 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 11:11:12 GMT Subject: rpms/byacc/F-8 byacc.spec,1.4,1.5 skeleton.c.diff,1.1,1.2 Message-ID: <200807141111.m6EBBCQC029057@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931/F-8 Modified Files: byacc.spec skeleton.c.diff Log Message: fix the patch so that it applies cleanly Index: byacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-8/byacc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- byacc.spec 14 Jul 2008 10:46:30 -0000 1.4 +++ byacc.spec 14 Jul 2008 11:09:53 -0000 1.5 @@ -3,7 +3,7 @@ Summary: Berkeley Yacc, a parser generator Name: byacc Version: 1.9.%{byaccdate} -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: Development/Tools URL: http://dickey.his.com/byacc/byacc.html @@ -20,7 +20,7 @@ %prep %setup -q -n byacc-%{byaccdate} -%patch1 -p3 +%patch1 -p1 %build %configure --disable-dependency-tracking @@ -49,7 +49,7 @@ %{_mandir}/man1/byacc.1* %changelog -* Mon Jul 14 2008 Petr Machata - 1.9.20070509-3 +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-4 - Add a patch that fixes ancient buffer overflow - Related: #454583 skeleton.c.diff: Index: skeleton.c.diff =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-8/skeleton.c.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- skeleton.c.diff 14 Jul 2008 10:46:30 -0000 1.1 +++ skeleton.c.diff 14 Jul 2008 11:09:53 -0000 1.2 @@ -1,17 +1,15 @@ -=================================================================== -RCS file: /usr/OpenBSD/cvs/src/usr.bin/yacc/skeleton.c,v -retrieving revision 1.28 -retrieving revision 1.29 -diff -u -r1.28 -r1.29 ---- src/usr.bin/yacc/skeleton.c 2007/09/03 21:14:58 1.28 -+++ src/usr.bin/yacc/skeleton.c 2008/07/08 15:06:50 1.29 -@@ -63,4 +63,5 @@ +diff -urp byacc-20070509/skeleton.c byacc-20070509-pm/skeleton.c +--- byacc-20070509/skeleton.c 2005-05-05 01:39:36.000000000 +0200 ++++ byacc-20070509-pm/skeleton.c 2008-07-14 13:03:36.000000000 +0200 +@@ -21,6 +21,7 @@ char *banner[] = "#endif", + "", "#include ", + "#include ", + "", "#define YYBYACC 1", - "#define YYMAJOR 1", -@@ -346,7 +347,10 @@ + CONCAT1("#define YYMAJOR ", YYMAJOR), +@@ -275,7 +276,10 @@ char *body[] = " YYPREFIX, yystate, yyn, yyrule[yyn]);", "#endif", " yym = yylen[yyn];", @@ -23,3 +21,4 @@ " switch (yyn)", " {", 0 +Only in byacc-20070509-pm/: skeleton.c~ From fedora-extras-commits at redhat.com Mon Jul 14 11:11:28 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 11:11:28 GMT Subject: rpms/byacc/F-9 byacc.spec,1.7,1.8 skeleton.c.diff,1.1,1.2 Message-ID: <200807141111.m6EBBSog029074@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931/F-9 Modified Files: byacc.spec skeleton.c.diff Log Message: fix the patch so that it applies cleanly Index: byacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-9/byacc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- byacc.spec 14 Jul 2008 10:45:55 -0000 1.7 +++ byacc.spec 14 Jul 2008 11:10:12 -0000 1.8 @@ -3,7 +3,7 @@ Summary: Berkeley Yacc, a parser generator Name: byacc Version: 1.9.%{byaccdate} -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: Development/Tools URL: http://invisible-island.net/byacc/byacc.html @@ -20,7 +20,7 @@ %prep %setup -q -n byacc-%{byaccdate} -%patch1 -p3 +%patch1 -p1 %build %configure --disable-dependency-tracking @@ -49,7 +49,7 @@ %{_mandir}/man1/byacc.1* %changelog -* Mon Jul 14 2008 Petr Machata - 1.9.20070509-3 +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-4 - Add a patch that fixes ancient buffer overflow - Related: #454583 skeleton.c.diff: Index: skeleton.c.diff =================================================================== RCS file: /cvs/pkgs/rpms/byacc/F-9/skeleton.c.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- skeleton.c.diff 14 Jul 2008 10:45:55 -0000 1.1 +++ skeleton.c.diff 14 Jul 2008 11:10:12 -0000 1.2 @@ -1,17 +1,15 @@ -=================================================================== -RCS file: /usr/OpenBSD/cvs/src/usr.bin/yacc/skeleton.c,v -retrieving revision 1.28 -retrieving revision 1.29 -diff -u -r1.28 -r1.29 ---- src/usr.bin/yacc/skeleton.c 2007/09/03 21:14:58 1.28 -+++ src/usr.bin/yacc/skeleton.c 2008/07/08 15:06:50 1.29 -@@ -63,4 +63,5 @@ +diff -urp byacc-20070509/skeleton.c byacc-20070509-pm/skeleton.c +--- byacc-20070509/skeleton.c 2005-05-05 01:39:36.000000000 +0200 ++++ byacc-20070509-pm/skeleton.c 2008-07-14 13:03:36.000000000 +0200 +@@ -21,6 +21,7 @@ char *banner[] = "#endif", + "", "#include ", + "#include ", + "", "#define YYBYACC 1", - "#define YYMAJOR 1", -@@ -346,7 +347,10 @@ + CONCAT1("#define YYMAJOR ", YYMAJOR), +@@ -275,7 +276,10 @@ char *body[] = " YYPREFIX, yystate, yyn, yyrule[yyn]);", "#endif", " yym = yylen[yyn];", @@ -23,3 +21,4 @@ " switch (yyn)", " {", 0 +Only in byacc-20070509-pm/: skeleton.c~ From fedora-extras-commits at redhat.com Mon Jul 14 11:11:29 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 14 Jul 2008 11:11:29 GMT Subject: rpms/byacc/devel byacc.spec,1.7,1.8 skeleton.c.diff,1.1,1.2 Message-ID: <200807141111.m6EBBTOr029081@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931/devel Modified Files: byacc.spec skeleton.c.diff Log Message: fix the patch so that it applies cleanly Index: byacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/byacc/devel/byacc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- byacc.spec 14 Jul 2008 10:45:25 -0000 1.7 +++ byacc.spec 14 Jul 2008 11:10:29 -0000 1.8 @@ -3,7 +3,7 @@ Summary: Berkeley Yacc, a parser generator Name: byacc Version: 1.9.%{byaccdate} -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: Development/Tools URL: http://invisible-island.net/byacc/byacc.html @@ -20,7 +20,7 @@ %prep %setup -q -n byacc-%{byaccdate} -%patch1 -p3 +%patch1 -p1 %build %configure --disable-dependency-tracking @@ -49,7 +49,7 @@ %{_mandir}/man1/byacc.1* %changelog -* Mon Jul 14 2008 Petr Machata - 1.9.20070509-3 +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-4 - Add a patch that fixes ancient buffer overflow - Resolves: #454583 skeleton.c.diff: Index: skeleton.c.diff =================================================================== RCS file: /cvs/pkgs/rpms/byacc/devel/skeleton.c.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- skeleton.c.diff 14 Jul 2008 10:45:25 -0000 1.1 +++ skeleton.c.diff 14 Jul 2008 11:10:29 -0000 1.2 @@ -1,17 +1,15 @@ -=================================================================== -RCS file: /usr/OpenBSD/cvs/src/usr.bin/yacc/skeleton.c,v -retrieving revision 1.28 -retrieving revision 1.29 -diff -u -r1.28 -r1.29 ---- src/usr.bin/yacc/skeleton.c 2007/09/03 21:14:58 1.28 -+++ src/usr.bin/yacc/skeleton.c 2008/07/08 15:06:50 1.29 -@@ -63,4 +63,5 @@ +diff -urp byacc-20070509/skeleton.c byacc-20070509-pm/skeleton.c +--- byacc-20070509/skeleton.c 2005-05-05 01:39:36.000000000 +0200 ++++ byacc-20070509-pm/skeleton.c 2008-07-14 13:03:36.000000000 +0200 +@@ -21,6 +21,7 @@ char *banner[] = "#endif", + "", "#include ", + "#include ", + "", "#define YYBYACC 1", - "#define YYMAJOR 1", -@@ -346,7 +347,10 @@ + CONCAT1("#define YYMAJOR ", YYMAJOR), +@@ -275,7 +276,10 @@ char *body[] = " YYPREFIX, yystate, yyn, yyrule[yyn]);", "#endif", " yym = yylen[yyn];", @@ -23,3 +21,4 @@ " switch (yyn)", " {", 0 +Only in byacc-20070509-pm/: skeleton.c~ From fedora-extras-commits at redhat.com Mon Jul 14 11:15:46 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 14 Jul 2008 11:15:46 GMT Subject: rpms/rhythmbox/devel rhythmbox.spec,1.195,1.196 Message-ID: <200807141115.m6EBFk4F029535@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356 Modified Files: rhythmbox.spec Log Message: Add "Don't really close" plugin Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- rhythmbox.spec 14 Jul 2008 10:26:07 -0000 1.195 +++ rhythmbox.spec 14 Jul 2008 11:14:50 -0000 1.196 @@ -188,6 +188,7 @@ %{_libdir}/rhythmbox/plugins/rb/ %{_libdir}/rhythmbox/plugins/visualizer/ %{_libdir}/rhythmbox/plugins/fmradio/ +%{_libdir}/rhythmbox/plugins/dontreallyclose/ %{_libexecdir}/rhythmbox-metadata %files lirc From fedora-extras-commits at redhat.com Mon Jul 14 11:36:58 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Mon, 14 Jul 2008 11:36:58 GMT Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.53,1.54 Message-ID: <200807141136.m6EBaw05030663@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598 Modified Files: evolution-sharp.spec Log Message: * Mon Jul 14 2008 Matthew Barnes - 0.17.4-2.fc10 - Rebuild against newer mono(glib-sharp). Index: evolution-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- evolution-sharp.spec 16 Jun 2008 17:41:57 -0000 1.53 +++ evolution-sharp.spec 14 Jul 2008 11:36:04 -0000 1.54 @@ -2,7 +2,7 @@ Name: evolution-sharp Version: 0.17.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Evolution Data Server Mono Bindings @@ -86,6 +86,9 @@ # sonames may need to be updated in evolution-sharp's configure.in. %changelog +* Mon Jul 14 2008 Matthew Barnes - 0.17.4-2.fc10 +- Rebuild against newer mono(glib-sharp). + * Mon Jun 16 2008 Matthew Barnes - 0.17.4-1.fc10 - Update to 0.17.4. From fedora-extras-commits at redhat.com Mon Jul 14 11:41:30 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Mon, 14 Jul 2008 11:41:30 GMT Subject: rpms/openais/devel revision-1568.patch, NONE, 1.1 revision-1569.patch, NONE, 1.1 revision-1570.patch, NONE, 1.1 revision-1571.patch, NONE, 1.1 revision-1572.patch, NONE, 1.1 revision-1573.patch, NONE, 1.1 revision-1574.patch, NONE, 1.1 revision-1575.patch, NONE, 1.1 revision-1576.patch, NONE, 1.1 revision-1579.patch, NONE, 1.1 openais.spec, 1.27, 1.28 Message-ID: <200807141141.m6EBfUwU031041@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/openais/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30901 Modified Files: openais.spec Added Files: revision-1568.patch revision-1569.patch revision-1570.patch revision-1571.patch revision-1572.patch revision-1573.patch revision-1574.patch revision-1575.patch revision-1576.patch revision-1579.patch Log Message: Update to trunk revision 1579. revision-1568.patch: --- NEW FILE revision-1568.patch --- Index: exec/mainconfig.c =================================================================== --- exec/mainconfig.c (revision 1567) +++ exec/mainconfig.c (revision 1568) @@ -208,7 +208,7 @@ logsys_logger.priority = LOG_LEVEL_DEBUG; } else if (strcmp (value, "off") == 0) { - logsys_logger.priority &= ~LOG_LEVEL_DEBUG; + logsys_logger.priority = LOG_LEVEL_INFO; } else { goto parse_error; } @@ -217,7 +217,13 @@ if (global_debug) logsys_logger.priority = LOG_LEVEL_DEBUG; } - + if (logsys_logger.priority != LOG_LEVEL_DEBUG) { + if (!objdb_get_string (objdb, object_logger_subsys_handle, "syslog_level", &value)) { + logsys_logger.priority = logsys_priority_id_get(value); + if (logsys_logger.priority < 0) + logsys_logger.priority = LOG_LEVEL_INFO; + } + } if (!objdb_get_string (objdb, object_logger_subsys_handle, "tags", &value)) { char *token = strtok (value, "|"); Index: man/openais.conf.5 =================================================================== --- man/openais.conf.5 (revision 1567) +++ man/openais.conf.5 (revision 1568) @@ -495,6 +495,13 @@ The default is off. .TP +syslog_level +This specifies the syslog level for this particular subsystem. Ignored if debug is on. +Possible values are: alert, crit, debug (same as debug = on), emerg, err, info, notice, warning. + +The default is: info. + +.TP tags This specifies which tags should be traced for this particular logger. Set debug directive to revision-1569.patch: --- NEW FILE revision-1569.patch --- Index: exec/confdb.c =================================================================== --- exec/confdb.c (revision 1568) +++ exec/confdb.c (revision 1569) @@ -455,7 +455,7 @@ { struct res_lib_confdb_write res_lib_confdb_write; int ret = SA_AIS_OK; - char *error_string; + char *error_string = NULL; if (global_objdb->object_write_config(&error_string)) ret = SA_AIS_ERR_ACCESS; @@ -463,8 +463,11 @@ res_lib_confdb_write.header.size = sizeof(res_lib_confdb_write); res_lib_confdb_write.header.id = MESSAGE_RES_CONFDB_WRITE; res_lib_confdb_write.header.error = ret; - strcpy((char *)res_lib_confdb_write.error.value, error_string); - res_lib_confdb_write.error.length = strlen(error_string) + 1; + if (error_string) { + strcpy((char *)res_lib_confdb_write.error.value, error_string); + res_lib_confdb_write.error.length = strlen(error_string) + 1; + } else + res_lib_confdb_write.error.length = 0; openais_conn_send_response(conn, &res_lib_confdb_write, sizeof(res_lib_confdb_write)); } Index: lib/confdb.c =================================================================== --- lib/confdb.c (revision 1568) +++ lib/confdb.c (revision 1569) @@ -1130,7 +1130,8 @@ } error = res_lib_confdb_write.header.error; - memcpy(error_text, res_lib_confdb_write.error.value, res_lib_confdb_write.error.length); + if (res_lib_confdb_write.error.length) + memcpy(error_text, res_lib_confdb_write.error.value, res_lib_confdb_write.error.length); error_exit: saHandleInstancePut (&confdb_handle_t_db, handle); revision-1570.patch: --- NEW FILE revision-1570.patch --- Index: exec/logsys.c =================================================================== --- exec/logsys.c (revision 1569) +++ exec/logsys.c (revision 1570) @@ -69,8 +69,6 @@ static int logsys_facility = LOG_DAEMON; -static int logsys_nosubsys = 0; - static int logsys_wthread_active = 0; static pthread_mutex_t logsys_config_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -121,7 +119,7 @@ void _logsys_nosubsys_set (void) { - logsys_nosubsys = 1; + logsys_mode |= LOG_MODE_NOSUBSYS; } int logsys_facility_id_get (const char *name) @@ -298,6 +296,7 @@ char newstring[4096]; char log_string[4096]; char char_time[512]; + char *p = NULL; struct timeval tv; int i = 0; int len; @@ -331,9 +330,14 @@ } if ((priority == LOG_LEVEL_DEBUG) || (logsys_mode & LOG_MODE_DISPLAY_FILELINE)) { + if (logsys_mode & LOG_MODE_SHORT_FILELINE) { + p = strrchr(file, '/'); + if (p) + file = ++p; + } sprintf (&newstring[i], "[%s:%04u] %s", file, line, format); } else { - if (logsys_nosubsys == 1) { + if (logsys_mode & LOG_MODE_NOSUBSYS) { sprintf (&newstring[i], "%s", format); } else { sprintf (&newstring[i], "[%-5s] %s", logsys_loggers[id].subsys, format); Index: exec/logsys.h =================================================================== --- exec/logsys.h (revision 1569) +++ exec/logsys.h (revision 1570) @@ -52,6 +52,8 @@ #define LOG_MODE_DISPLAY_TIMESTAMP (1<<7) #define LOG_MODE_BUFFER_BEFORE_CONFIG (1<<8) #define LOG_MODE_FLUSH_AFTER_CONFIG (1<<9) +#define LOG_MODE_SHORT_FILELINE (1<<10) +#define LOG_MODE_NOSUBSYS (1<<11) /* * Log priorities, compliant with syslog and SA Forum Log spec. revision-1571.patch: --- NEW FILE revision-1571.patch --- Index: test/testcpg.c =================================================================== --- test/testcpg.c (revision 1570) +++ test/testcpg.c (revision 1571) @@ -1,9 +1,9 @@ /* - * Copyright (c) 2006-2007 Red Hat Inc + * Copyright (c) 2006-2008 Red Hat Inc * * All rights reserved. * - * Author: Patrick Caulfield + * Author: Christine Caulfield * * This software licensed under BSD license, the text of which follows: * @@ -141,9 +141,36 @@ } } +void GroupsGetCallback(cpg_handle_t handle, + uint32_t groupnum, + uint32_t groupmax, + struct cpg_name *group_name, + struct cpg_address *member_list, int member_list_entries) +{ + int i; + struct in_addr saddr; + + printf("Groups List Callback %d/%d: ", groupnum, groupmax); + print_cpgname(group_name); + printf("\n"); + for (i=0; inext) { + num_groups++; + } + } + return num_groups; +} + static struct group_info *get_group(mar_cpg_name_t *name) { struct list_head *iter; @@ -523,6 +545,70 @@ return gi; } +static void send_group_list_callbacks(int num_groups, void *conn) +{ + struct list_head *iter, *piter; + struct group_info *gi; + uint32_t hash; + int max_proc_count=0; + int size; + int group_counter = 0; + char *buf = NULL; + struct res_lib_cpg_groups_get_callback *res; + mar_cpg_address_t *retgi; + + for (hash=0; hash < GROUP_HASH_SIZE; hash++) { + for (iter = group_lists[hash].next; iter != &group_lists[hash]; iter = iter->next) { + gi = list_entry(iter, struct group_info, list); + int proc_count = 0; + + /* First, we need to know how many processes are in the list */ + for (piter = gi->members.next; piter != &gi->members; piter = piter->next) { + struct process_info *pi = list_entry(piter, struct process_info, list); + if (pi->pid) + proc_count++; + } + + /* Make sure we have adequate buffer space */ + if (proc_count > max_proc_count) { + max_proc_count = proc_count+10; + size = max_proc_count*sizeof(mar_cpg_address_t) + + sizeof(struct res_lib_cpg_groups_get_callback); + buf = realloc(buf, size); + if (!buf) { + log_printf(LOG_LEVEL_WARNING, "Unable to allocate group_list struct"); + return; + } + } + + res = (struct res_lib_cpg_groups_get_callback *)buf; + retgi = res->member_list; + + res->header.size = size; + res->header.id = MESSAGE_RES_CPG_GROUPS_CALLBACK; + + + memcpy(&res->group_name, &gi->group_name, sizeof(mar_cpg_name_t)); + res->num_members = proc_count; + res->group_num = ++group_counter; + res->total_groups = num_groups; + + for (piter = gi->members.next; piter != &gi->members; piter = piter->next) { + struct process_info *pi = list_entry(piter, struct process_info, list); + if (pi->pid) { + retgi->nodeid = pi->nodeid; + retgi->pid = pi->pid; + retgi->reason = 0; + retgi++; + } + } + openais_conn_send_response(conn, buf, size); + } + } + if (buf) + free(buf); +} + static int cpg_node_joinleave_send (struct group_info *gi, struct process_info *pi, int fn, int reason) { struct req_exec_cpg_procjoin req_exec_cpg_procjoin; @@ -696,7 +782,7 @@ unsigned int i; req_exec_cpg_downlist->left_nodes = swab32(req_exec_cpg_downlist->left_nodes); - + for (i = 0; i < req_exec_cpg_downlist->left_nodes; i++) { req_exec_cpg_downlist->nodeids[i] = swab32(req_exec_cpg_downlist->nodeids[i]); } @@ -920,7 +1006,7 @@ /* Send to all interested members */ for (iter = gi->members.next; iter != &gi->members; iter = iter->next) { struct process_info *pi = list_entry(iter, struct process_info, list); - if (pi->trackerconn) { + if (pi->trackerconn && (pi->flags & PI_FLAG_MEMBER)) { openais_conn_send_response( pi->trackerconn, buf, @@ -1225,3 +1311,21 @@ openais_conn_send_response(conn, &res_lib_cpg_local_get, sizeof(res_lib_cpg_local_get)); } + +static void message_handler_req_lib_cpg_groups_get (void *conn, void *message) +{ + struct res_lib_cpg_groups_get res_lib_cpg_groups_get; + + res_lib_cpg_groups_get.header.size = sizeof(res_lib_cpg_groups_get); + res_lib_cpg_groups_get.header.id = MESSAGE_RES_CPG_GROUPS_GET; + res_lib_cpg_groups_get.header.error = SA_AIS_OK; + res_lib_cpg_groups_get.num_groups = count_groups(); + + openais_conn_send_response(conn, &res_lib_cpg_groups_get, + sizeof(res_lib_cpg_groups_get)); + + /* Now do the callbacks for each group */ + send_group_list_callbacks(res_lib_cpg_groups_get.num_groups, + openais_conn_partner_get (conn)); +} + Index: lib/cpg.c =================================================================== --- lib/cpg.c (revision 1570) +++ lib/cpg.c (revision 1571) @@ -1,11 +1,11 @@ /* * vi: set autoindent tabstop=4 shiftwidth=4 : * - * Copyright (c) 2006 Red Hat, Inc. + * Copyright (c) 2006-2008 Red Hat, Inc. * * All rights reserved. * - * Author: Patrick Caulfield (pcaulfie at redhat.com) + * Author: Christine Caulfield (ccaulfie at redhat.com) * * This software licensed under BSD license, the text of which follows: * @@ -72,7 +72,7 @@ }; /* - * Clean up function for a cpg instance (cpg_nitialize) handle + * Clean up function for a cpg instance (cpg_initialize) handle */ static void cpg_instance_destructor (void *instance) { @@ -250,6 +250,7 @@ struct cpg_inst *cpg_inst; struct res_lib_cpg_confchg_callback *res_cpg_confchg_callback; struct res_lib_cpg_deliver_callback *res_cpg_deliver_callback; + struct res_lib_cpg_groups_get_callback *res_lib_cpg_groups_get_callback; cpg_callbacks_t callbacks; struct res_overlay dispatch_data; int ignore_dispatch = 0; @@ -396,7 +397,24 @@ joined_list, res_cpg_confchg_callback->joined_list_entries); break; + case MESSAGE_RES_CPG_GROUPS_CALLBACK: + res_lib_cpg_groups_get_callback = (struct res_lib_cpg_groups_get_callback *)&dispatch_data; + marshall_from_mar_cpg_name_t ( + &group_name, + &res_lib_cpg_groups_get_callback->group_name); + for (i = 0; i < res_lib_cpg_groups_get_callback->num_members; i++) { + marshall_from_mar_cpg_address_t (&member_list[i], + &res_lib_cpg_groups_get_callback->member_list[i]); + } + callbacks.cpg_groups_get_fn(handle, + res_lib_cpg_groups_get_callback->group_num, + res_lib_cpg_groups_get_callback->total_groups, + &group_name, + member_list, + res_lib_cpg_groups_get_callback->num_members); + break; + default: error = SA_AIS_ERR_LIBRARY; goto error_nounlock; @@ -690,6 +708,48 @@ return (error); } +cpg_error_t cpg_groups_get ( + cpg_handle_t handle, + unsigned int *num_groups) +{ + cpg_error_t error; + struct cpg_inst *cpg_inst; + struct iovec iov; + struct req_lib_cpg_groups_get req_lib_cpg_groups_get; + struct res_lib_cpg_groups_get res_lib_cpg_groups_get; + + error = saHandleInstanceGet (&cpg_handle_t_db, handle, (void *)&cpg_inst); + if (error != SA_AIS_OK) { + return (error); + } + + req_lib_cpg_groups_get.header.size = sizeof (mar_req_header_t); + req_lib_cpg_groups_get.header.id = MESSAGE_REQ_CPG_GROUPS_GET; + + iov.iov_base = &req_lib_cpg_groups_get; + iov.iov_len = sizeof (struct req_lib_cpg_groups_get); + + pthread_mutex_lock (&cpg_inst->response_mutex); + + error = saSendMsgReceiveReply (cpg_inst->response_fd, &iov, 1, + &res_lib_cpg_groups_get, sizeof (res_lib_cpg_groups_get)); + + pthread_mutex_unlock (&cpg_inst->response_mutex); + + if (error != SA_AIS_OK) { + goto error_exit; + } + + *num_groups = res_lib_cpg_groups_get.num_groups; + error = res_lib_cpg_groups_get.header.error; + + /* Real output is delivered via a callback */ +error_exit: + saHandleInstancePut (&cpg_handle_t_db, handle); + + return (error); +} + cpg_error_t cpg_flow_control_state_get ( cpg_handle_t handle, cpg_flow_control_state_t *flow_control_state) Index: man/cpg_initialize.3 =================================================================== --- man/cpg_initialize.3 (revision 1570) +++ man/cpg_initialize.3 (revision 1571) @@ -1,9 +1,9 @@ .\"/* -.\" * Copyright (c) 2006 Red Hat, Inc. +.\" * Copyright (c) 2006-2008 Red Hat, Inc. .\" * .\" * All rights reserved. .\" * -.\" * Author: Patrick Caulfield +.\" * Author: Christine Caulfield .\" * .\" * This software licensed under BSD license, the text of which follows: .\" * @@ -77,6 +77,14 @@ struct cpg_address *member_list, int member_list_entries, struct cpg_address *left_list, int left_list_entries, struct cpg_address *joined_list, int joined_list_entries); + +typedef void (*cpg_groups_get_fn_t) ( + cpg_handle_t handle, + uint32_t group_num, + uint32_t group_total, + struct cpg_name *group_name, + struct cpg_address *member_list, int member_list_entries); + .ta .fi .RE @@ -94,6 +102,7 @@ typedef struct { cpg_deliver_fn_t cpg_deliver_fn; cpg_confchg_fn_t cpg_confchg_fn; + cpg_groups_get_fn_t cpg_groups_get_fn; } cpg_callbacks_t; .ta .fi @@ -159,4 +168,5 @@ .BR cpg_leave (3), .BR cpg_mcast_joined (3), .BR cpg_membership_get (3) +.BR cpg_groups_get (3) .PP Index: man/index.html =================================================================== --- man/index.html (revision 1570) +++ man/index.html (revision 1571) @@ -53,35 +53,37 @@ cpg_membership_get(3): Description of the cpg_membership_get interface.
cpg_local_get(3): Description of the cpg_local_get interface. +
+cpg_local_get(3): Description of the cpg_groups_get interface.
confdb_overview(3): An overview of the Configuration database toolkit
-confdb_dispatch(3): Description of the confdb_dispatch.html interface. +confdb_dispatch(3): Description of the confdb_dispatch interface.
-confdb_fd_get(3): Description of the confdb_fd_get.html interface. +confdb_fd_get(3): Description of the confdb_fd_get interface.
-confdb_finalize(3): Description of the confdb_finalize.html interface. +confdb_finalize(3): Description of the confdb_finalize interface.
-confdb_initialize(3): Description of the confdb_initialize.html interface. +confdb_initialize(3): Description of the confdb_initialize interface.
-confdb_key_create(3): Description of the confdb_key_create.html interface. +confdb_key_create(3): Description of the confdb_key_create interface.
-confdb_key_delete(3): Description of the confdb_key_delete.html interface. +confdb_key_delete(3): Description of the confdb_key_delete interface.
-confdb_key_iter(3): Description of the confdb_key_iter.html interface. +confdb_key_iter(3): Description of the confdb_key_iter interface.
-confdb_key_replace(3): Description of the confdb_key_replace.html interface. +confdb_key_replace(3): Description of the confdb_key_replace interface.
-confdb_object_create(3): Description of the confdb_object_create.html interface. +confdb_object_create(3): Description of the confdb_object_create interface.
-confdb_object_destroy(3): Description of the confdb_object_destroy.html interface. +confdb_object_destroy(3): Description of the confdb_object_destroy interface.
-confdb_object_find(3): Description of the confdb_object_find.html interface. +confdb_object_find(3): Description of the confdb_object_find interface.
-confdb_object_iter(3): Description of the confdb_object_iter.html interface. +confdb_object_iter(3): Description of the confdb_object_iter interface.
-confdb_object_parent_get(3): Description of the confdb_object_parent_get.html interface. +confdb_object_parent_get(3): Description of the confdb_object_parent_get interface. revision-1572.patch: --- NEW FILE revision-1572.patch --- Index: exec/logsys.c =================================================================== --- exec/logsys.c (revision 1571) +++ exec/logsys.c (revision 1572) @@ -636,3 +636,41 @@ { worker_thread_group_wait (&log_thread_group); } + +int logsys_init (char *name, int mode, int facility, int priority, char *file) +{ + char *errstr; + + logsys_subsys_id = 0; + + strncpy (logsys_loggers[0].subsys, name, + sizeof (logsys_loggers[0].subsys)); + logsys_config_mode_set (mode); + logsys_config_facility_set (name, facility); + logsys_config_file_set (&errstr, file); + _logsys_config_priority_set (0, priority); + if ((mode & LOG_MODE_BUFFER_BEFORE_CONFIG) == 0) { + _logsys_wthread_create (); + } + return (0); +} + +int logsys_conf (char *name, int mode, int facility, int priority, char *file) +{ + char *errstr; + + strncpy (logsys_loggers[0].subsys, name, + sizeof (logsys_loggers[0].subsys)); + logsys_config_mode_set (mode); + logsys_config_facility_set (name, facility); + logsys_config_file_set (&errstr, file); + _logsys_config_priority_set (0, priority); + return (0); +} + +void logsys_exit (void) +{ + logsys_subsys_id = -1; + logsys_flush (); +} + Index: exec/logsys.h =================================================================== --- exec/logsys.h (revision 1571) +++ exec/logsys.h (revision 1572) @@ -38,6 +38,7 @@ #include #include +#include /* * MODE_OUTPUT_SYSLOG_* modes are mutually exclusive @@ -172,8 +173,9 @@ } \ } +static unsigned int logsys_subsys_id __attribute__((unused)) = -1; \ + #define LOGSYS_DECLARE_NOSUBSYS(priority) \ -static unsigned int logsys_subsys_id __attribute__((unused)); \ __attribute__ ((constructor)) static void logsys_nosubsys_init (void) \ { \ _logsys_nosubsys_set(); \ @@ -182,7 +184,6 @@ } #define LOGSYS_DECLARE_SUBSYS(subsys,priority) \ -static unsigned int logsys_subsys_id __attribute__((unused)); \ __attribute__ ((constructor)) static void logsys_subsys_init (void) \ { \ logsys_subsys_id = \ @@ -190,6 +191,7 @@ } #define log_printf(lvl, format, args...) do { \ + assert (logsys_subsys_id != -1); \ if ((lvl) <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_log_printf2 (__FILE__, __LINE__, lvl, \ logsys_subsys_id, (format), ##args); \ @@ -197,6 +199,7 @@ } while(0) #define dprintf(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_log_printf2 (__FILE__, __LINE__, LOG_DEBUG, \ logsys_subsys_id, (format), ##args); \ @@ -204,6 +207,7 @@ } while(0) #define ENTER_VOID() do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_ENTER, \ logsys_subsys_id, ">%s\n", __FUNCTION__); \ @@ -211,6 +215,7 @@ } while(0) #define ENTER(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_ENTER, \ logsys_subsys_id, ">%s: " format, __FUNCTION__, \ @@ -219,6 +224,7 @@ } while(0) #define LEAVE_VOID() do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_LEAVE, \ logsys_subsys_id, "<%s\n", __FUNCTION__); \ @@ -226,6 +232,7 @@ } while(0) #define LEAVE(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_LEAVE, \ logsys_subsys_id, "<%s: " format, \ @@ -234,6 +241,7 @@ } while(0) #define TRACE1(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE1, \ logsys_subsys_id, (format), ##args); \ @@ -241,6 +249,7 @@ } while(0) #define TRACE2(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE2, \ logsys_subsys_id, (format), ##args); \ @@ -248,6 +257,7 @@ } while(0) #define TRACE3(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE3, \ logsys_subsys_id, (format), ##args); \ @@ -255,6 +265,7 @@ } while(0) #define TRACE4(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE4, \ logsys_subsys_id, (format), ##args); \ @@ -262,6 +273,7 @@ } while(0) #define TRACE5(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE5, \ logsys_subsys_id, (format), ##args); \ @@ -269,6 +281,7 @@ } while(0) #define TRACE6(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE6, \ logsys_subsys_id, (format), ##args); \ @@ -276,6 +289,7 @@ } while(0) #define TRACE7(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE7, \ logsys_subsys_id, (format), ##args); \ @@ -283,6 +297,7 @@ } while(0) #define TRACE8(format, args...) do { \ + assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE8, \ logsys_subsys_id, (format), ##args); \ @@ -295,4 +310,10 @@ _logsys_config_priority_set (logsys_subsys_id, priority); \ } while(0) +/* simple, function-based api */ + +int logsys_init (char *name, int mode, int facility, int priority, char *file); +int logsys_conf (char *name, int mode, int facility, int priority, char *file); +void logsys_exit (void); + #endif /* LOGSYS_H_DEFINED */ revision-1573.patch: --- NEW FILE revision-1573.patch --- Index: exec/mainconfig.c =================================================================== --- exec/mainconfig.c (revision 1572) +++ exec/mainconfig.c (revision 1573) @@ -187,6 +187,7 @@ } } + objdb->object_find_reset(object_service_handle); while (objdb->object_find (object_service_handle, "logger_subsys", strlen ("logger_subsys"), revision-1574.patch: --- NEW FILE revision-1574.patch --- Index: exec/logsys.c =================================================================== --- exec/logsys.c (revision 1573) +++ exec/logsys.c (revision 1574) @@ -84,7 +84,9 @@ #endif struct logsys_logger logsys_loggers[MAX_LOGGERS]; +int logsys_single_id = 0; + struct log_entry { char *file; int line; @@ -641,7 +643,8 @@ { char *errstr; - logsys_subsys_id = 0; + /* logsys_subsys_id will be 0 */ + logsys_single_id = 1; strncpy (logsys_loggers[0].subsys, name, sizeof (logsys_loggers[0].subsys)); @@ -670,7 +673,6 @@ void logsys_exit (void) { - logsys_subsys_id = -1; logsys_flush (); } Index: exec/logsys.h =================================================================== --- exec/logsys.h (revision 1573) +++ exec/logsys.h (revision 1574) @@ -97,6 +97,8 @@ extern struct logsys_logger logsys_loggers[]; +extern int logsys_single_id; + extern inline int logsys_mkpri (int priority, int id); extern void logsys_config_mode_set ( @@ -191,6 +193,8 @@ } #define log_printf(lvl, format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if ((lvl) <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_log_printf2 (__FILE__, __LINE__, lvl, \ @@ -199,6 +203,8 @@ } while(0) #define dprintf(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_log_printf2 (__FILE__, __LINE__, LOG_DEBUG, \ @@ -207,6 +213,8 @@ } while(0) #define ENTER_VOID() do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_ENTER, \ @@ -215,6 +223,8 @@ } while(0) #define ENTER(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_ENTER, \ @@ -224,6 +234,8 @@ } while(0) #define LEAVE_VOID() do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_LEAVE, \ @@ -232,6 +244,8 @@ } while(0) #define LEAVE(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_LEAVE, \ @@ -241,6 +255,8 @@ } while(0) #define TRACE1(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE1, \ @@ -249,6 +265,8 @@ } while(0) #define TRACE2(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE2, \ @@ -257,6 +275,8 @@ } while(0) #define TRACE3(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE3, \ @@ -265,6 +285,8 @@ } while(0) #define TRACE4(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE4, \ @@ -273,6 +295,8 @@ } while(0) #define TRACE5(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE5, \ @@ -281,6 +305,8 @@ } while(0) #define TRACE6(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE6, \ @@ -289,6 +315,8 @@ } while(0) #define TRACE7(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE7, \ @@ -297,6 +325,8 @@ } while(0) #define TRACE8(format, args...) do { \ + if (logsys_single_id) \ + logsys_subsys_id = 0; \ assert (logsys_subsys_id != -1); \ if (LOG_LEVEL_DEBUG <= logsys_loggers[logsys_subsys_id].priority) { \ _logsys_trace (__FILE__, __LINE__, LOGSYS_TAG_TRACE8, \ revision-1575.patch: --- NEW FILE revision-1575.patch --- Index: man/logsys_overview.8 =================================================================== --- man/logsys_overview.8 (revision 1574) +++ man/logsys_overview.8 (revision 1575) @@ -42,19 +42,19 @@ .PP Support for 8 tracing levels and tracing the entering and leaving of functions .PP -Declartion of logging system or subsystem without calling any functions +Declaration of logging system or subsystem without calling any functions .PP Dynamic reconfiguration of the logging system parameters .PP Logging to syslog, file, stderr. -.SH Declartion of the System logger +.SH Declaration of the System logger The logsys library is initially configured by including logsys.h and declaring a logger. Once the logger is declared either a subsystem logger or nosubsystem logger is declared in every file. The definition LOGSYS_DECLARE_SYSTEM is placed after the include section of one -C file in the application. This declartion creates a constructor function +C file in the application. This declaration creates a constructor function which will be called automatically. This technique avoids the need for calling any setup functions in short applications that don't require it. @@ -62,22 +62,24 @@ The name parameter is the name of the application. The mode parameter is the logging mode of the system. The following modes can be configured by logically ORing these flags: -LOG_MODE_OUTPUT_FILE: Output all log data to the file parameter of this declartion +LOG_MODE_OUTPUT_FILE: Output all log data to the file parameter of this declaration LOG_MODE_OUTPUT_STDERR: Output all log data to the stderr descriptor LOG_MODE_OUTPUT_SYSLOG_THREADED: Output all log data to syslog using a non-blocking thread LOG_MODE_OUTPUT_SYSLOG_LOSSY: Output all log data without using a thread but potentially losing data. This mode is not yet implemented. LOG_MODE_OUTPUT_SYSLOG_BLOCKING: Output all log data without using a thread and potentially blocking at each syslog call. LOG_MODE_DISPLAY_PRIORITY: Output the priority of the log entry in the message contents. This mode is currently not implemented. LOG_MODE_DISPLAY_FILELINE: Output the file and line at which the log message was created. +LOG_MODE_SHORT_FILELINE: When using LOG_DEBUG level or LOG_MODE_DISPLAY_FILELINE, typically the absolute path to the file (derived at compile-time) is displayed. Enabling this flag ensures that only the filename and line are displayed. LOG_MODE_DISPLAY_TIMESTAMP: Output the timestamp of the message. LOG_MODE_BUFFER_BEFORE_CONFIG: This mode is used to buffer log messages before logsys_mode_config is called. This is useful in applications in which the logging file isn't known before the application is compiled and must be set dynamically. It is also useful when an application calls fork to disconnect the local tty and should hold logging of messages until after the fork. -LOG_MODE_FLUSH_AFTER_CONFIG: This mode is used to flush any buffered messages when the LOG_MODE_BUFFER_BEFORE_CONFIG declartion is specified in the declartion of the logger. +LOG_MODE_FLUSH_AFTER_CONFIG: This mode is used to flush any buffered messages when the LOG_MODE_BUFFER_BEFORE_CONFIG declaration is specified in the declaration of the logger. The file parameter specifies the filename that should be used to log messages. This parameter may be NULL if LOG_MODE_OUTPUT_FILE is not specified. The facility parameter is the syslog facility that should be used when logging messages. +LOG_MODE_NOSUBSYS: Enabling this mode removes the subsystem tag from the beginning of the log lines. This is not recommended for programs which have multiple subsystems. -An example declartion would be: +An example declaration would be: #include @@ -90,7 +92,7 @@ This would output any logging messages to stderr, syslog, and the file /tmp/log. -.SH Declartion of subsystems or no subsystems +.SH Declaration of subsystems or no subsystems The logsys library supports the logging of information to one main system or subsystem. This is specified in each individual object file in the system. @@ -113,7 +115,7 @@ LOGSYS_DECLARE_SUBSYS ("SYS1", LOG_LEVEL_INFO); Any message of LOG_LEVEL_INFO priority or higher would be logged and any -logging within the object file this declartion is specified within will be +logging within the object file this declaration is specified within will be logged to the SYS1 subsystem identifier. .SH Logging Messages revision-1576.patch: --- NEW FILE revision-1576.patch --- Index: exec/logsys.c =================================================================== --- exec/logsys.c (revision 1575) +++ exec/logsys.c (revision 1576) @@ -277,7 +277,9 @@ fflush (stdout); } - if (logsys_mode & LOG_MODE_OUTPUT_SYSLOG_THREADED) { + if ((logsys_mode & LOG_MODE_OUTPUT_SYSLOG_THREADED) && + (!((logsys_mode & LOG_MODE_FILTER_DEBUG_FROM_SYSLOG) && + (log_data->priority == LOG_LEVEL_DEBUG)))) { syslog (log_data->priority, &log_data->log_string[log_data->syslog_pos]); } Index: exec/logsys.h =================================================================== --- exec/logsys.h (revision 1575) +++ exec/logsys.h (revision 1576) @@ -55,6 +55,7 @@ #define LOG_MODE_FLUSH_AFTER_CONFIG (1<<9) #define LOG_MODE_SHORT_FILELINE (1<<10) #define LOG_MODE_NOSUBSYS (1<<11) +#define LOG_MODE_FILTER_DEBUG_FROM_SYSLOG (1<<12) /* * Log priorities, compliant with syslog and SA Forum Log spec. Index: man/logsys_overview.8 =================================================================== --- man/logsys_overview.8 (revision 1575) +++ man/logsys_overview.8 (revision 1576) @@ -77,8 +77,8 @@ The facility parameter is the syslog facility that should be used when logging messages. LOG_MODE_NOSUBSYS: Enabling this mode removes the subsystem tag from the beginning of the log lines. This is not recommended for programs which have multiple subsystems. +LOG_MODE_FILTER_DEBUG_FROM_SYSLOG: Enabling this mode will stop debug messages from being sent to syslog. - An example declaration would be: #include revision-1579.patch: --- NEW FILE revision-1579.patch --- Index: exec/logsys.c =================================================================== --- exec/logsys.c (revision 1578) +++ exec/logsys.c (revision 1579) @@ -185,9 +185,6 @@ logsys_loggers[i].tags = tags; logsys_loggers[i].priority = priority; - if (priority > logsys_loggers[i].priority) { - logsys_loggers[i].priority = priority; - } break; } } @@ -228,7 +225,7 @@ *tags = logsys_loggers[i].tags; *priority = logsys_loggers[i].priority; pthread_mutex_unlock (&logsys_config_mutex); - return (0); + return i; } } @@ -483,10 +480,6 @@ logsys_loggers[id].priority = priority; - if (priority > logsys_loggers[id].priority) { - logsys_loggers[id].priority = priority; - } - pthread_mutex_unlock (&logsys_new_log_mutex); } Index: exec/logsys.h =================================================================== --- exec/logsys.h (revision 1578) +++ exec/logsys.h (revision 1579) @@ -181,16 +181,29 @@ #define LOGSYS_DECLARE_NOSUBSYS(priority) \ __attribute__ ((constructor)) static void logsys_nosubsys_init (void) \ { \ - _logsys_nosubsys_set(); \ + unsigned int pri, tags; \ + \ logsys_subsys_id = \ - _logsys_subsys_create ("MAIN", (priority)); \ + logsys_config_subsys_get("MAIN", &tags, &pri); \ + \ + if (logsys_subsys_id == -1) { \ + _logsys_nosubsys_set(); \ + logsys_subsys_id = \ + _logsys_subsys_create ("MAIN", (priority)); \ + } \ } #define LOGSYS_DECLARE_SUBSYS(subsys,priority) \ __attribute__ ((constructor)) static void logsys_subsys_init (void) \ { \ + unsigned int pri, tags; \ + \ logsys_subsys_id = \ - _logsys_subsys_create ((subsys), (priority)); \ + logsys_config_subsys_get((subsys), &tags, &pri); \ + \ + if (logsys_subsys_id == -1) \ + logsys_subsys_id = \ + _logsys_subsys_create ((subsys), (priority)); \ } #define log_printf(lvl, format, args...) do { \ Index: openais.spec =================================================================== RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- openais.spec 24 Jun 2008 05:32:05 -0000 1.27 +++ openais.spec 14 Jul 2008 11:40:34 -0000 1.28 @@ -1,12 +1,24 @@ +%define alphatag svn1579 + Name: openais Summary: The openais Standards-Based Cluster Framework executive and APIs Version: 0.84 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://developer.osdl.org/dev/openais/ Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz Patch0: openais-defaultconfig.patch +Patch1: revision-1568.patch +Patch2: revision-1569.patch +Patch3: revision-1570.patch +Patch4: revision-1571.patch +Patch5: revision-1572.patch +Patch6: revision-1573.patch +Patch7: revision-1574.patch +Patch8: revision-1575.patch +Patch9: revision-1576.patch +Patch10: revision-1579.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x alpha @@ -32,6 +44,16 @@ %prep %setup -q -n openais-%{version} %patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 +%patch7 -p0 +%patch8 -p0 +%patch9 -p0 +%patch10 -p0 %build @@ -169,6 +191,11 @@ %{_mandir}/man3/confdb_*3* %changelog +* Mon Jul 14 2008 Fabio M. Di Nitto - 0.84-2.svn1579 +- Update to svn trunk at revision 1579. + 1577 (wrong commit) and 1578 (revert 1577) are not included (nor required) +- Cleanup whitespace in spec file. + * Mon Jun 23 2008 Steven Dake - 0.84-1 - New upstream release 0.84 with stability enhancements in protocols. @@ -183,7 +210,7 @@ * Mon May 12 2008 Steven Dake - 0.83-1 - Release 0.83. -Tue Apr 29 2008 Fabio M. Di Nitto - 0.82-1.svn1528 +* Tue Apr 29 2008 Fabio M. Di Nitto - 0.82-1.svn1528 - Update to latest svn trunk in preparation for 0.83. - Fix a bunch of rpmlint warnings/errors. - Merge bits from the fedora package. @@ -200,6 +227,7 @@ - Add upstream revision 1509 - Remove double pthread_mutex_destroy from cpg service. - Add upstream revision 1508 - Remove double pthread_mutex_destroy from clm service. - Add upstream revision 1507 - Remove double pthread_mutex_destroy from checkpoint service. + * Sat Mar 15 2008 Steven Dake - 0.80.3-14 - Resolves: rhbz#432531 - Add upstream revision 1506 - Resolves incomplete checkpoing synchronization when totem queue is full. @@ -211,7 +239,6 @@ - Add upstream revision 1502 - Revert revision 1477 which exhibits problems with cman. - Add revision 1477 - This was reverted in a previous version but cherrypicked. Now the patch has been applied and reverted in the rpm build process to match upstream. - * Tue Feb 26 2008 Steven Dake - 0.80.3-12 - Resolves: rhbz#433839 - Fix problem with cvs not allowing new checkin requires new revision. @@ -221,6 +248,7 @@ - Add upstream revision 1500 - IPC locks up if a POLLERR is returned in certain circumstances. - Resolves: rhbz#433839 - Add upstream revision 1501 - A mcast is delivered before a join in some circumstances. + * Fri Jan 18 2008 Steven Dake - 0.80.3-10 - Resolves: rhbz#249287 - Remove upstream revision 1477 - Exhibits problem with revolver tester From fedora-extras-commits at redhat.com Mon Jul 14 11:42:15 2008 From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos)) Date: Mon, 14 Jul 2008 11:42:15 GMT Subject: rpms/gtk2hs/devel .cvsignore,1.9,1.10 sources,1.11,1.12 Message-ID: <200807141142.m6EBgF5B031084@cvs-int.fedora.redhat.com> Author: bos Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31014 Modified Files: .cvsignore sources Log Message: Sources for gtk2hs 0.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Nov 2007 23:33:31 -0000 1.9 +++ .cvsignore 14 Jul 2008 11:41:19 -0000 1.10 @@ -1 +1 @@ -gtk2hs-0.9.12.1.tar.gz +gtk2hs-0.9.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Nov 2007 23:33:31 -0000 1.11 +++ sources 14 Jul 2008 11:41:19 -0000 1.12 @@ -1 +1 @@ -c82f9de1b47f93ab81ff41c5fe39ecb0 gtk2hs-0.9.12.1.tar.gz +130a13b0cbbf1ab933583f33cae16f7e gtk2hs-0.9.13.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 11:48:15 2008 From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos)) Date: Mon, 14 Jul 2008 11:48:15 GMT Subject: rpms/gtk2hs/devel gtk2hs.spec,1.39,1.40 Message-ID: <200807141148.m6EBmF5v031522@cvs-int.fedora.redhat.com> Author: bos Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31433 Modified Files: gtk2hs.spec Log Message: Upgrade to 0.9.13 Index: gtk2hs.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gtk2hs.spec 23 Jun 2008 01:02:28 -0000 1.39 +++ gtk2hs.spec 14 Jul 2008 11:47:23 -0000 1.40 @@ -10,8 +10,8 @@ Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs -Version: 0.9.12.1 -Release: 10%{?dist} +Version: 0.9.13 +Release: 1%{?dist} # cairo/ and svgcairo/ are FreeBSD # compat/ is BSD # tools/c2hs (used to build) is GPL, LGPL @@ -304,6 +304,9 @@ %changelog +* Mon Jul 14 2008 Bryan O'Sullivan - 0.9.13-1 +- Update to 0.9.13 + * Mon Jun 23 2008 Jens Petersen - 0.9.12.1-10.fc10 - build with ghc-6.8.3 - add build_docs switch From fedora-extras-commits at redhat.com Mon Jul 14 11:57:43 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Mon, 14 Jul 2008 11:57:43 GMT Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.32,1.33 Message-ID: <200807141157.m6EBvh9O032678@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gtk-sharp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32542 Modified Files: gtk-sharp2.spec Log Message: Fix/Update libdir on GACUTIL & monodoc Index: gtk-sharp2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gtk-sharp2.spec 14 Jul 2008 10:05:25 -0000 1.32 +++ gtk-sharp2.spec 14 Jul 2008 11:56:44 -0000 1.33 @@ -1,6 +1,6 @@ Name: gtk-sharp2 Version: 2.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -13,7 +13,7 @@ Patch2: gtk-sharp2-2.10.3-libdir.patch Patch3: gtk-sharp-2.8.2-docfix.patch #Patch4: gtk-sharp2-2.10.3-assemblydir.patch -Patch5: gtk-sharp2-2.12.0-monodoc.patch +#Patch5: gtk-sharp2-2.12.0-monodoc.patch BuildRequires: mono-devel gtk2-devel libglade2-devel BuildRequires: automake, libtool @@ -64,11 +64,13 @@ %patch2 -p1 -b .libdir %patch3 -p1 -b .docfix #%patch4 -p1 -b .assemblydir -%patch5 -p1 -b .monodoc +#%patch5 -p1 -b .monodoc # Fix assembly libdir -sed -i 's|$(prefix)/lib|%{_libdir}|g' parser/Makefile.* \ - generator/Makefile.* +sed -i 's|$(prefix)/lib|%{_libdir}|g' parser/Makefile.in \ + generator/Makefile.in \ + doc/Makefile.* \ + configure.in %build #autoreconf --force --install @@ -126,6 +128,9 @@ %{_libdir}/monodoc %changelog +* Mon Jul 14 2008 Xavier Lamien - 2.12.1-3 +- Fix/Update libdir on GACUTIL & monodoc. + * Mon Jul 14 2008 Alex Lancaster - 2.12.1-2 - Rebuild for fixed RPM for mono provides. From fedora-extras-commits at redhat.com Mon Jul 14 12:23:36 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Mon, 14 Jul 2008 12:23:36 GMT Subject: rpms/ipod-sharp/F-8 ipod-sharp.spec,1.10,1.11 Message-ID: <200807141223.m6ECNa50008578@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/ipod-sharp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521 Modified Files: ipod-sharp.spec Log Message: Bump to -3 to push to updates Index: ipod-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipod-sharp/F-8/ipod-sharp.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ipod-sharp.spec 1 Apr 2008 07:45:15 -0000 1.10 +++ ipod-sharp.spec 14 Jul 2008 12:22:37 -0000 1.11 @@ -1,53 +1,53 @@ Name: ipod-sharp Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for high level features of Apple's iPod Group: Development/Libraries License: LGPLv2+ URL: http://banshee-project.org/Subprojects/Ipod-sharp Source0: http://banshee-project.org/files/ipod-sharp/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-libdir.patch +Patch0: ipod-sharp-0.8.0-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # We only have mono on these arches: ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha -BuildRequires: libipoddevice-devel BuildRequires: podsleuth-devel BuildRequires: mono-devel BuildRequires: gtk-sharp2-devel +BuildRequires: libipoddevice-devel BuildRequires: ndesk-dbus-glib-devel %description ipod-sharp provies support for high level features of Apple's iPod, like support for audio content, including reading and writing of the -iTunes/iPod database, and syncing music. ipod-sharp also provides a -CIL wrapper for libipoddevice. +iTunes/iPod database, and syncing music. %package devel Summary: Development files for ipod-sharp -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} pkgconfig +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel -Development files for podsleuth +Development files for ipod-sharp %prep %setup -q - -#libdir madness %patch0 -p1 -b .libdir %build +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-docs - -# breaks with smp flag set -make +# Breaks with smp make flag +make %install %{__rm} -rf ${RPM_BUILD_ROOT} -make DESTDIR=${RPM_BUILD_ROOT} install +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} +make install DESTDIR=${RPM_BUILD_ROOT} \ + GACUTIL_FLAGS="/package %{name} /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}" %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -61,7 +61,11 @@ %defattr(-,root,root,-) %{_libdir}/pkgconfig/ + %changelog +* Mon Jul 14 2008 Nigel Jones - 0.8.0-3 +- Update for Fedora 8 based on the changes in Fedora 9 + * Tue Apr 01 2008 David Nielsen 0.8.0-2 - BR ndesk-dbus-glib instead of ndesk-dbus From fedora-extras-commits at redhat.com Mon Jul 14 12:42:17 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Mon, 14 Jul 2008 12:42:17 GMT Subject: rpms/rsyslog/devel rsyslog.conf,1.1,1.2 rsyslog.spec,1.45,1.46 Message-ID: <200807141242.m6ECgHcN009448@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9390 Modified Files: rsyslog.conf rsyslog.spec Log Message: djust default config file Index: rsyslog.conf =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rsyslog.conf 11 Jul 2008 11:37:05 -0000 1.1 +++ rsyslog.conf 14 Jul 2008 12:41:31 -0000 1.2 @@ -1,23 +1,7 @@ #rsyslog v3 config file - -#### GLOBAL DIRECTIVES #### - -# Use default timestamp format -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat - -# File syncing capability is disabled by default. This feature is usually not required, -# not useful and an extreme performance hit -#$ActionFileEnableSync on - -# An "In-Memory Queue" is created for remote logging. -# $WorkDirectory /var/spool/rsyslog # where to place spool files -# $ActionQueueFileName queue # unique name prefix for spool files -# $ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) -# $ActionQueueSaveOnShutdown on # save messages to disk on shutdown -# $ActionQueueType LinkedList # run asynchronously -# $ActionResumeRetryCount -1 # infinety retries if host is down - +# if you experience problems, check +# http://www.rsyslog.com/troubleshoot for assistance #### MODULES #### @@ -34,6 +18,16 @@ #$InputTCPServerRun 514 +#### GLOBAL DIRECTIVES #### + +# Use default timestamp format +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + + #### RULES #### # Log all kernel messages to the console. @@ -63,3 +57,22 @@ # Save boot messages also to boot.log local7.* /var/log/boot.log + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$WorkDirectory /var/spppl/rsyslog # where to place spool files +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +#*.* @@remote-host:514 +# ### end of the forwarding rule ### Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- rsyslog.spec 11 Jul 2008 11:37:05 -0000 1.45 +++ rsyslog.spec 14 Jul 2008 12:41:31 -0000 1.46 @@ -3,7 +3,7 @@ Summary: Enhanced system logging and kernel message trapping daemons Name: rsyslog Version: 3.19.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -191,6 +191,9 @@ %{_libdir}/rsyslog/lmnsd_gtls.so %changelog +* Mon Jul 14 2008 Peter Vrabec 3.19.9-2 +- adjust default config file + * Fri Jul 11 2008 Lubomir Rintel 3.19.9-1 - upgrade From fedora-extras-commits at redhat.com Mon Jul 14 13:01:44 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Mon, 14 Jul 2008 13:01:44 GMT Subject: rpms/icelandic-fonts/devel README.license, NONE, 1.1 asyropoulos_-_Icelandic.otf, NONE, 1.1 icelandic-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200807141301.m6ED1i4H016843@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/icelandic-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10274/devel Added Files: README.license asyropoulos_-_Icelandic.otf icelandic-fonts.spec import.log Log Message: initial commit --- NEW FILE README.license --- For permission to use source images, refer to http://www.galdrasyning.is/index.php?option=com_content&task=view&id=418&Itemid=46&lang=en --- NEW FILE asyropoulos_-_Icelandic.otf --- OTTO )%? "Rf with Reserved Font Name Icelandic. This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL ----------------------------------------------------------- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ----------------------------------------------------------- PREAMBLE The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. DEFINITIONS "Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. "Reserved Font Name" refers to any names specified as such after the copyright statement(s). "Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). "Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. "Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. PERMISSION & CONDITIONS Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: 1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. 2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. 3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. 5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. TERMINATION This license becomes null and void if any of the above conditions are not met. DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.  !"#$%&'()*+,-./01 Icelandic ?0 ?R????x?q ?}????~?X?K??????h?e???9????e ????????????????9?r?6??????)?%?S??????9??????{?m??s?????8?u???g{??g?#?s?5??ea???? ????W?2?????? i??W??????????j?{??????????????????w?????{?i?e??????7?;?m??????E?? _?3ge?q?? ?2????}?gy_uAA;']?????)y??????w?S?K?Iw?a?q??W?o?,?}w?k???{?o???eU5-?yyqs?q?c?R?{???M?????????q?_i?T???}?>???4????{o?g?=??H?D??]?????kkW??}?*{???8?[?uM???????????SE?'?}W?{?????????om9WS?v???L???u?????w?w?w?w?w?w??m? ?G[?E???m???s?e?m{?}???g?o???n?}???????????????K?????wq???????e?o?"??????????*???s??}?{o??w???.?????k????{??a???????}???s?u]m????????????????Zy?????e?u?}{?}?{?w?1?O?{?y??8??^?A}????????w??N}?y?w?&??????%u}{?? ??y???????(y???/?e????{k??s??????????*y????s??????????????g?}???y}u?w?????????????M????[iU?z??)?s?C?????????????????2????}ug}g?_??????o??????(????}g+?????}k?y??&oo?y?????J??N???????/?y?W?}??????E ??? ?:??? ?????????rs???H?Z?M?&?6? ?X{?7O?B??5?"??P?g?????!?Xg}???{???{?????????}?y?Y????a??????m????q?????????????c?u?u??????(???????wo?(>?E ?????r!?7N?????????X?l??????F?|??z?t?]?}`??????????????f?T]z?????@?????C???t?/???????????$?f?? ???????Z??L???}?e???c??????:?}?K?OT?Q??}? ?`?????I?q?we??X?n?2????i????????????`?????7????=????>??????z?b?z????F?? Lz?,???????6??Z?)Z?v?`?l???L?!?????????k?W?R$??n?FT??????t?Wkw?z?Jr1b?fw? h? 8?Q?????l?o???? iiTtT???'?$?`?????????U?'?h????????????????y?}}Z?=???>?!?z??????????4?'??Fi1`?Z????????????'`?Cv4? ????????????a`??|??? .,A`&?y?z??????`}???????????O??Wz&k?????t}???ww???w???????|t?t?fl??????`?q????????R?v???????2???????@?4?z at C??????`?k?Q?Z??]???h?R???????????L?????h??????:??????}?&??=#???z? ?????Z?q?n??????h?]?f?)y???w?????[?????|??}? ?L?????????;????]?|??>?w???8?????????????}?Wtn?F?#?w?z???z???z?thw?z?7?oyt?i?k?????ho???t?Q?wi8+?fh}}????Z???}????????q????w?w?w??hw???w??;?,?Ukw?w???w?w?w??c?Tw? w?? ?????'??6????z?????n???u????f?~?u?????????j?????j?d?????????L?v?Ln?Z?t?k?z?k???z??I?|[?|????^??[????zc?????}???Z]??nF?;?.???????}??q?dK}?t?????????f?????xXp|{?{?{???w?w?]??)?Iqb?'?????n?q??t||~???t????????????~?~ru?????p???????????????@????x?ay?Wmvis?{?_z?Mr?h???W?\?aJ?U???????l?}:??~?6???)???e?}??????_????wtz??p??tw`?}f???q?????????`????}?????n????????y?n??ZfQ????qCi?k??????????|???2???"?$?-h?t????????????v??? I???w?w?w?w?w?w?^w???w?w???w?????,???????????[3??????^??MJ?{?x???kL_?_N_?v?^?,oz[m$???;?k]7????t???w?}#????ku=??!????????H???9???z?????????gb?????~?Yy??/{x??N?\?,I~\?????????????Y?~?k??????????i{flfks?f?d????????{?????????????,?}??IY???`???nIF?v???????^vY?V?s????????P??????F[??????v?}????????????{?\?{{{y??|?c?????t?sk{y~???p?????q????QQ???????????????(???N???N?????n?n?A?x????????vxF????????????u??????k?q???????????q?????y?v! ?sn{kxf??L??k,^?l,?i????Q????M??K??????f????L??^??????i?[??????9???????????????q?ck??l???????t?khDB?{insxqs??Y?v{?9kvT?p~?'/^).{???D??????????&???????"????????F? ??+??A?T??????3????????????n?nsqfI?In?????v??????? ??y?????????????is'?Fyn??????????????n??l????"?W??w?w?w?w?w?w?????]?????????<-??????z????v?t?BJ|y??%~???d?~?~sT??@lqlg??v??l?%yo?? ??????????~??????????_?~????W????'?I???????y?????~Cb?Y?????????U?{?-\??5?R????????%?t?il|?i???{?+O????-?~???X??8?????????????????y??EP?f?0?&??Y????dE?4???R????????\????????=??????????? \?l?TH?w~\Ty\?ia?j??!?#?idtt{~?q?:?&??-????t?=\q??????P???MTv]t?8???\????????OW?d????????+?+?i??|???????E????]|?3G???J???R?GW?M???n????v??????0?b?nJ?|???????M?{{l~?~?g????????b????~~???o?n??L?tln?|m????LW=??dgf?v????????!???b?????8?vk?w?n?y???????? ???WvY??JZ????????????????v?7??w?w?w?w?w??p??w?w?w?w?L???N?????W????)R??]?k???D?Q_???????.????z????B?{{?o?????Z???????~u???l?w?~?uD?|~???{???{???y?|]K????8w?u????????w??????;????????????????}?_??Q?????C?u1Ky???d?????wo?????j??sl_?ne?T?Vo?x???}???qw???duyhw~?K?]a?~?????q??_a?y??w????ghP?! ???R??????p?q?y??T????I??M????I??????V????????????? ??KC??n??????h?ycb~e?j???????????f?w???????z\??????s?u????j?I?I<a???u?KTq?@????????>??2????????????h??&????????f?\???~?s???????????x??m?????????d?B&?}?u:~}??b7?Q|????w?????{B[?M??p?????f?G??p?????D????w?w?w?w???w?-w????L?G?|?#????????jj??????????[??vwW~?O~D?V???]??e?t?m????????????????????IjB???e??Bm????????????|????G??J?)=b???~?|??|???w???w???ze??;^??D?t?f????R??|?v????????G?=??????E??m?V?wc~????????``?b??b?re???;Q|???:?-?^.=v??? ????]?ArL??=??'c?h???????????6???????????o?Ozwyto????????|?w?3?$j????[??????????????????T??^?Nhk????J`|?y???Dv?r??????Q???|?I?O?g???|???j?w??^???N?B?)8???????Q?L???zp~wt???V??`?r???l???=???r?Yu?[?????????????c?GB??&?Y?j??????0?? ?????!?????J?`?h?$y???5??O????hVSL?[?|????pwL????t????????;???Q?m??????^N??`??>8j?!,?]?????????????w??????????????????[?[?Q?O??????I?|????????@????????3? ?t?p??g???.B????????,?oB[?????????????`????????~????? ?q????????????DI???cy?????????????????V???j?????????????m?e?8tt?w???Em?e?QIcQI)?~D?z????=?y???????????????j?E??!?????.??????5w????^|?????????????yLg??f?tg`ur?|?~?@?????\L??1?????6?z?????S??????7??qw???t?E????&???}]???????????r??$g2?i????(??q?_?????b?X???L?uv?????????z?x??(2??????????????H?z??????????i????????u?S???g?xz?zL}?x???b???????]?2pi??xb?I???=?e?Gn??????1????????????b??????d??????i?v ???n????X??U??r?q6Q??w????]???????????????g?1q???????????????????z}e?????*?4?g???}~???????????????????>?#??~uq???}Nr?????????????????????`?@?S?x?????N????????????????i????????q????Jb??????x?u?g????????????V???~?@?Yn???g`usp??iz?????????????p??B??#f??????????-??????????????e?4,G???uX?gg??????????????????i4?????l??u?`???[?w?lu??????????>?U?l????????C!??k??Ge?u???????;???i?g???`?,?zs???????????p|[??????????w??zn?w?????????????z??g????????????q?u?O???zQJ?|?G???@@?????????????! ?????????6??????6zv???|}???|??????<]?????????Q?????????????k????S???????w?}?ug??x???=?????@??uSx?w??nV??????[??T???????u?X???}?iV?????S???????????????X??_????x?????b??????????????L??????????E?????s????i????????????C]????}????Q??i?z?z?`Js?z??????????q???X|?????d???????}???}?f?x??]?E?}?z???????q?u??l????z}???/]????}?p]??n??????????p??Lvw?w?w?w????z????@?????????m?2X??g?x????????V???? j?z?b??????zlswls?}?????????g????S?3????O{?|?Vgse}w?}???????i????u???x???????????p?c?|?q????e?z?V??g????}??????<?J?g???????z?H?????????????o?p??bzi??????&q????????????}????}?l^k???????j?|????l?n???z?z?xe??H?l?zl?Y???X??????j}??v?????HznY?b???v?|???ss??{?C??l??X?????????????????<???w?w?w?w?w?w?w?w?w?w???| ??! Yh>???" ?h># ????????Zs~$ Yh>% ?UD& Ys~' Ye???/V?yUh>( Y?>) ?h>* ?g?+ y?, ?Wa- ?Z?W. ?@?/ ?M)0 Z??w?w????1 ??????[????2 ?? ?^???w?w???w?w?w?w?w?w?w??Rw?w?w?w???$??????(?Q??a????W?0???????'? ????????3 ??4 ??|?5 ?B??6 ????7 ????8 ??|h9 N?|?: N?y?; ?B?T< ??|?Om????????= N??T> d? ? %@ ???A ???B ???C ?A?????D ???E ??F ???G ??H ???I ???????J ? ??K ???L ???M ??|d???N ??jO ???P ??BQ ??ZR ??3S ???T "?U ???V ???W ??X ?@Y ???Z ???[ ??\ ??u] ??^ ?Y???????R?|?? ?L?v???~?W?W?-?-??g????????????._ ?N?ga??????` ?Na ??????????b ??c ??d ???a?Ne ?.f ?g ??h ???i L?????????w?w?w?*??w?????w??(? ???<_?.?F????k ???l ???m ???????!?!???????w?w?'??s??????????y? ??n ?t?o ?u ?Q??q ??r ???is ?/??t ?i ?u ?i ?u ?s ??z ?{ ?*?| ?? ?u ?u ?u ???? ?2??? ?u ??? ??w?w??w?w?w?????8??'??? ? ??? ?h???????f????4????r???????????"?2? ??? ??? ??? ??? h{Vo????s? ?bM? ?T?? ?3m? ?;[? ???? ?x(? ??? ???? ??u? ?pA? ?xs? ?pN? ??? ??%? ????4??w??8Tw?w?w???"?????W????r? ??? ???? ??B? ?j? ???? ?????|y??k?x?s? ??U? ??? ?\???f??w?w?.w?.w?Mw?If? ???/? ?W2? ??B? ?{? ~4w?w??w?w?????H???N???Z??? ?? ?F? ???? ??.? ??#? ? ?x? ???)? ?{? ????? ?Z? ???? ????? ??C? ????? ?U? ????? ?g? ?6?v???f?>???D?^?_????? ???Et??r???_????????| ??! Yh>???" ?h># ????????Zs~$ Yh>% ?UD& Ys~' Ye???/V?yUh>( Y?>) ?h>* ?g?+ y?, ?Wa- ?Z?W. ?@?/ ?M)0 Z??w?w????1 ??????[????2 ?? ?^???w?w???w?w?w?w?w?w?w??Rw?w?w?w???$??????(?Q??a????W?0???????'? ????????3 ??4 ??|?5 ?B??6 ????7 ????8 ??|h9 N?|?: N?y?; ?B?T< ??|?Om????????= N??T> d? ? %@ ???A ???B ???C ?A?????D ???E ??F ???G ??H ???I ???????J ? ??K ???L ???M ??|d???N ??jO ???P ??BQ ??ZR ??3S ???T "?U ???V ???W ??X ?@Y ???Z ???[ ??\ ??u] ??^ ?Y???????R?|?? ?L?v???~?W?W?-?-??g????????????._ ?N?ga??????` ?Na ??????????b ??c ??d ???a?Ne ?.f ?g ??h ???i L?????????w?w?w?*??w?????w??(? ???<_?.?F????k ???l ???m ???????!?!???????w?w?'??s??????????y? ??n ?t?o ?u ?Q??q ??r ???is ?/??t ?i ?u ?i ?u ?s ??z ?{ ?*?| ?? ?u ?u ?u ???? ?2??? ?u ??? ??w?w??w?w?w?????8??'??? ? ??? ?h???????f????4????r???????????"?2? ??? ??? ??? ??? h{Vo????s? ?bM? ?T?? ?3m? ?;[? ???? ?x(? ??? ???? ??u? ?pA? ?xs? ?pN? ??? ??%? ????4??w??8Tw?w?w???"?????W????r? ??? ???? ??B? ?j? ???? ?????|y??k?x?s? ??U? ??? ?\???f??w?w?.w?.w?Mw?If? ???/? ?W2? ??B? ?{? ~4w?w??w?w?????H???N???Z??? ?? ?F? ???? ??.? ??#? ? ?x? ???)? ?{? ????? ?Z? ???? ????? ??C? ????? ?U? ????? ?g? ?6?v???f?>???D?^?_????? ???Et??r???_?????????l?}??????u???+?????????????????t?glH???l?X?q?`v?H?k?y??????????C???????????s?m?i?7?{????j?K?|??l? ???????G?????????p?W??T????t?y?~c3? zk??}0?y?w???????????????????=???????n??4?8????m????v??#????}?k???????????=?y?)n??????/? q????????w?6?T???r??????L?j?E?:? ??g???gY.?o?????????????????????A?????"?????????l???y???????????w?T??p??q??? 8? E? '{????|?]?t??? _??????????|?p?*?u?V? wv???????????????????????????~?W??a?v?2??z???j?d?{?6v??????????O?k?Fk??????X?Fuof\?~?s?w???????0?!?????n?b?w??????X??z?M?y???}A??u?}?????}?=?L?|?{?X???m???????$?????n?+??U???u?m??????o????6?O?5?w??????n??5?Mu?k???P_{u?%?D?T?9??????Gg????????V?????P?0???\???2???x???3?????:???????????{{OhX???????????????q??~??9Vs??????????h??????vtCAL???^????????????s?i???????x??n?\?????{{???{?v?????Yi?X???xv???t?~?X6?????`?~??3????C???Os?????????????}?vsf|a?~?????????????K\ahf?v?????????????????x?~??pf?N~k?????|~???i??????{c?y~?q???????vv~}???v?c???i??qym???y?????????{{?t???y?v???????S~D???\? ????6?????????~????~?4n?{????????????1{?????????nn~{?Iv??\4K?????????????????q^^ts???????????????{WAxy??????????????????i???sn?#vv?U?N?? tr???+??????m???*3opW[?xh?w?U??c????!?}?e?????????????????}zEPag??n?|?wu????/?W??S?`??v??D - 1.001-2 - Change font filename to something sane * Sun Jul 12 2008 Jon Stanley - 1.001-1 - Change version to match font file - Include license explanation - Change around spec a little * Mon May 05 2008 Jon Stanley - 1.0-1 - Initial package --- NEW FILE import.log --- icelandic-fonts-1_001-2_fc9:HEAD:icelandic-fonts-1.001-2.fc9.src.rpm:1216040417 From fedora-extras-commits at redhat.com Mon Jul 14 13:07:01 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 14 Jul 2008 13:07:01 GMT Subject: rpms/python-slip/F-9 python-slip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807141307.m6ED71Vx017138@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/python-slip/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17081 Modified Files: .cvsignore sources Added Files: python-slip.spec Log Message: initial import --- NEW FILE python-slip.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} %{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")} Name: python-slip Version: 0.1.3 Release: 1%{?dist} Summary: Miscellaneous convenience, extension and workaround code for Python Group: System Environment/Libraries License: GPLv2+ URL: http://nphilipp.fedorapeople.org/python-slip/ Source0: http://nphilipp.fedorapeople.org/python-slip/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python BuildRequires: python-devel %description The Simple Library for Python packages contain miscellaneous code for convenience, extension and workaround purposes. This package provides the "slip" base module. %package dbus Summary: Convenience functions for dbus-activated services Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: dbus-python >= 0.80 %description dbus The Simple Library for Python packages contain miscellaneous code for convenience, extension and workaround purposes. This package provides slip.dbus.service.TimeoutObject, a dbus.service.Object derivative that ends itself after a certain time without being used and/or if there are no clients anymore on the message bus. %package gtk Summary: Code to make auto-wrapping gtk labels Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pygtk2 %description gtk The Simple Library for Python packages contain miscellaneous code for convenience, extension and workaround purposes. This package provides slip.gtk.set_autowrap(), a convenience function which lets gtk labels be automatically re-wrapped upon resizing. %prep %setup -q %build make %{?_smp_mflags} %install rm -rf %buildroot make install DESTDIR=%buildroot %clean rm -rf %buildroot %files %defattr(-,root,root,-) %doc COPYING %dir %{python_sitelib}/slip/ %{python_sitelib}/slip/__init__.py* %{python_sitelib}/slip-%{version}-py%{python_version}.egg-info %files dbus %defattr(-,root,root,-) %doc slip/dbus/README slip/dbus/examples %{python_sitelib}/slip/dbus %{python_sitelib}/slip.dbus-%{version}-py%{python_version}.egg-info %files gtk %defattr(-,root,root,-) %{python_sitelib}/slip/gtk %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info %changelog * Fri Jul 11 2008 Nils Philippsen - 0.1.3 - BR: python-devel * Fri Jul 11 2008 Nils Philippsen - 0.1.2 - fix more inconsistent tabs/spaces * Fri Jul 11 2008 Nils Philippsen - 0.1.1 - fix inconsistent tabs/spaces * Tue May 27 2008 Nils Philippsen - 0.1 - move gtk.py -> gtk/__init__.py - rename gtk.set_autowrap () -> gtk.label_autowrap () * Mon May 26 2008 Nils Philippsen - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2008 16:24:58 -0000 1.1 +++ .cvsignore 14 Jul 2008 13:06:19 -0000 1.2 @@ -0,0 +1 @@ +python-slip-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2008 16:24:58 -0000 1.1 +++ sources 14 Jul 2008 13:06:19 -0000 1.2 @@ -0,0 +1 @@ +d23e9acc1bbebeeeff7055c830a9fea7 python-slip-0.1.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 13:20:39 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Mon, 14 Jul 2008 13:20:39 GMT Subject: rpms/asana-math-fonts/devel README.license, NONE, 1.1 asana-math-fonts-fontconfig.conf, NONE, 1.1 asana-math-fonts.spec, NONE, 1.1 asyropoulos_-_Asana_Math.otf, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200807141320.m6EDKdQC017897@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/asana-math-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17836/devel Added Files: README.license asana-math-fonts-fontconfig.conf asana-math-fonts.spec asyropoulos_-_Asana_Math.otf import.log Log Message: initial commit --- NEW FILE README.license --- ----- Forwarded Message ---- > From: Young Ryu > To: Apostolos Syropoulos > Sent: Saturday, January 5, 2008 2:13:23 AM > Subject: Re: pxfonts and Asana Math > > > I want pxfonts/txfonts to be available in public > for not only document preparation/printing/publication > but also for further modification/revision/improvement. > You can change/copy/re-distribute them. I do not intend > to put any restriction. Your revision and distribution of > the fonts will be absolutely OK. There should be no > legal problem. If GPL causes any problem, I will > drop it and make it completely free for any purpose. > > Young Ryu > > Apostolos Syropoulos wrote: > > Dear Sir, > > > > My name is Apostolos Syropoulos and recently I released my Asana Math Open > Type > > font, which is partially a derived work of your pxfonts. I have released the > font > > under the Open Font License > (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web), > > but someone told me that there is some legal problem because you had released > your > > pxfonts with the GPL (the OFL was written a few months ago!). Could you please > let me know if > > there is any problem at all? And if there is how can be fixed? The font is > absolutely free and I > > am making no money from it. > > > > Sincerely yours, > > > > A.S. --- NEW FILE asana-math-fonts-fontconfig.conf --- pxfonts asana-math asana-math serif serif asana-math --- NEW FILE asana-math-fonts.spec --- %define fontname asana-math %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d Name: %{fontname}-fonts Version: 0.914 Release: 1%{?dist} Summary: An OpenType font with a MATH table Group: User Interface/X License: OFL URL: http://openfontlibrary.org/media/files/asyropoulos/219 Source0: http://openfontlibrary.org/people/asyropoulos/asyropoulos_-_Asana_Math.otf Source1: %{name}-fontconfig.conf Source2: README.license BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description An OpenType font with a MATH table that can be used with XeTeX to typeset math content %prep cp %{SOURCE2} $RPM_BUILD_DIR %build %install rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{fontdir} install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{fontdir}/asana-math.otf install -dm 755 $RPM_BUILD_ROOT%{fontconfdir} install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/63-%{fontname}.conf %clean rm -rf $RPM_BUILD_ROOT %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %files %defattr(644,root,root,755) %doc README.license %config(noreplace) %{fontconfdir}/63-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.otf %changelog * Sun Jul 13 2008 Jon Stanley - 0.914-1 - Change version - Include license readme - Fix fontconfig file * Sat Jul 12 2008 Jon Stanley - 20080120-1 - Initial package --- NEW FILE asyropoulos_-_Asana_Math.otf --- OTTO {  q ?& 8) #?| Copyright (C) 2000 Young Ryu. Copyright (C) 1997, 1999 Claudio Beccari. with Reserved Font Name Asana Math. Copyright (c) 2000 Young Ryu, with Reserved Font Name pxfonts. Copyright (c) 1997, 1999 Claudio Beccari, with Reserved Font Name gsmn1000. This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL ----------------------------------------------------------- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ----------------------------------------------------------- PREAMBLE The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. DEFINITIONS "Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. "Reserved Font Name" refers to any names specified as such after the copyright statement(s). "Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). "Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. "Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. PERMISSION & CONDITIONS Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: 1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. 2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. 3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. 5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. TERMINATION This license becomes null and void if any of the above conditions are not met. DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, [...2892 lines suppressed...] ? f ? ? 7 ? ? 4 ? ? 1 ? ? . ? ? + ? ? ( ? ? % ? ? " ?   ? Y Z  ? ?] ?f ? ? ?] ?f ? ?     ?? ? ? ? ? ?? ? ? ? ? ?? ? ? ? ? ?? ? ? ? ? ?? ? ? ? ? ?? ? ? ? ? ?? ? ? ? ? ?? ?  ? ?  ? ?  ? ? ? ? ? ?  ? ?  ? ?  ? ?? ? ?? ?h ? ?? ?h? ? ?? ?h? ? ?? ?h? ( h W  ?? ( h W  ?? ?? ?J ??0 ?? ?J ??@ ?? ?F ??P ?? ?F ??` ?Q ? ? % ?Q ? ? %? ? ? X X ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?S ? ?? ? ?? ? ?? ? ? ? ?? ? ? ? ? ? ? ?? ? ? ?? ? ? ?? ? ? ?S ? ? ?S ? ? ? ? ? ? ? ? ?  ? ? P R j ? ! ? ? ? ? ? ???? ? ? ? + ? ?????? ? ???? ??? ? ? ? ? ? ? ' ? ? 3 ? ? ? ? ] ] ? ? ? ? ? ? ? ? ? ?  --- NEW FILE import.log --- asana-math-fonts-0_914-1_fc9:HEAD:asana-math-fonts-0.914-1.fc9.src.rpm:1216041556 From fedora-extras-commits at redhat.com Mon Jul 14 13:36:18 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 13:36:18 GMT Subject: rpms/kde-filesystem/devel kde-filesystem.spec,1.29,1.30 Message-ID: <200807141336.m6EDaINi018851@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-filesystem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18487 Modified Files: kde-filesystem.spec Log Message: * Mon Jul 14 2008 Rex Dieter 4-17 - + %_kde4_sharedir/kde4 Index: kde-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- kde-filesystem.spec 29 Jun 2008 13:56:44 -0000 1.29 +++ kde-filesystem.spec 14 Jul 2008 13:33:48 -0000 1.30 @@ -17,7 +17,7 @@ Summary: KDE filesystem layout Name: kde-filesystem Version: 4 -Release: 16%{?dist} +Release: 17%{?dist} Group: System Environment/Base License: Public Domain @@ -87,8 +87,8 @@ -p $RPM_BUILD_ROOT%{_kde4_configdir} \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \ - -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \ - -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \ + -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/services \ + -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/servicetypes \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \ @@ -170,8 +170,7 @@ %{_kde4_sharedir}/emoticons/ %{_kde4_datadir}/autostart/ %{_kde4_datadir}/icons/locolor -%{_kde4_sharedir}/services/ -%{_kde4_sharedir}/servicetypes/ +%{_kde4_sharedir}/kde4/ %{_kde4_sharedir}/templates/ %{_kde4_datadir}/wallpapers/ %{_kde4_datadir}/sounds/ @@ -180,6 +179,9 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4-17 +- + %%_kde4_sharedir/kde4 + * Sun Jun 29 2008 Rex Dieter 4-16 - + %%_datadir/apps/konqueror(/servicemenus) From fedora-extras-commits at redhat.com Mon Jul 14 13:38:47 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Mon, 14 Jul 2008 13:38:47 GMT Subject: rpms/xmlto/devel xmlto.spec,1.38,1.39 Message-ID: <200807141338.m6EDclSH019010@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/xmlto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18842 Modified Files: xmlto.spec Log Message: new subpackage xmlto-tex to prevent passivetex requirements for whole package(#454341) Index: xmlto.spec =================================================================== RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- xmlto.spec 20 Jun 2008 13:24:51 -0000 1.38 +++ xmlto.spec 14 Jul 2008 13:36:17 -0000 1.39 @@ -1,9 +1,7 @@ -%{!?tetex:%define tetex 1} - -Summary: A tool for converting XML files to various formats. +Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.21 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -15,19 +13,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-xsl >= 1.56.0 -BuildRequires: libxslt +BuildRequires: /usr/bin/xsltproc BuildRequires: util-linux, flex # We rely heavily on the DocBook XSL stylesheets! Requires: docbook-xsl >= 1.56.0 - Requires: text-www-browser - -# For full functionality, we need passivetex. -%if %{tetex} -Requires: passivetex >= 1.11 -%endif -Requires: libxslt +Requires: /usr/bin/xsltproc Requires: docbook-dtds Requires: util-linux, flex @@ -35,6 +27,19 @@ This is a package for converting XML files to various formats using XSL stylesheets. +%package tex +Group: Applications/System +License: GPLv2 +Summary: A set of xmlto backends with TeX requirements +# For full functionality, we need passivetex. +Requires: passivetex >= 1.11 +# We require main package +Requires: xmlto + +%description tex +This subpackage contains xmlto backend scripts which do require +PassiveTeX/TeX for functionality. + %prep %setup -q @@ -42,6 +47,8 @@ touch doc/xmlto.xml doc/xmlif.xml %configure make + +%check make check %install @@ -56,8 +63,21 @@ %{_bindir}/* %{_mandir}/*/* %{_datadir}/xmlto +%exclude %{_datadir}/xmlto/format/fo/dvi +%exclude %{_datadir}/xmlto/format/fo/ps +%exclude %{_datadir}/xmlto/format/fo/pdf + +%files tex +%defattr(-,root,root) +%{_datadir}/xmlto/format/fo/dvi +%{_datadir}/xmlto/format/fo/ps +%{_datadir}/xmlto/format/fo/pdf %changelog +* Fri Jul 11 2008 Ondrej Vasik - 0.0.21-2 +- xmlto-tex subpackage to prevent requirements for + passivetex/tex for all backends(#454341) + * Mon Jun 20 2008 Ondrej Vasik - 0.0.21-1 - new version 0.0.21 From fedora-extras-commits at redhat.com Mon Jul 14 13:44:19 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 13:44:19 GMT Subject: rpms/php/devel php-5.2.6-gnusrc.patch, NONE, 1.1 php.spec, 1.157, 1.158 php-5.2.4-gnusrc.patch, 1.1, NONE Message-ID: <200807141344.m6EDiJjL019550@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/php/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19500 Modified Files: php.spec Added Files: php-5.2.6-gnusrc.patch Removed Files: php-5.2.4-gnusrc.patch Log Message: - work around rpm %patch zero-fuzz for the time being php-5.2.6-gnusrc.patch: --- NEW FILE php-5.2.6-gnusrc.patch --- --- php-5.2.6/configure.in.gnusrc +++ php-5.2.6/configure.in @@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl +AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions]) + dnl Setting up the PHP version based on the information above. dnl ------------------------------------------------------------------------- --- php-5.2.6/ext/interbase/interbase.c.gnusrc +++ php-5.2.6/ext/interbase/interbase.c @@ -24,7 +24,6 @@ #include "config.h" #endif -#define _GNU_SOURCE #include "php.h" --- php-5.2.6/ext/pdo_firebird/firebird_driver.c.gnusrc +++ php-5.2.6/ext/pdo_firebird/firebird_driver.c @@ -22,7 +22,6 @@ #include "config.h" #endif -#define _GNU_SOURCE #include "php.h" #include "php_ini.h" --- php-5.2.6/ext/standard/file.c.gnusrc +++ php-5.2.6/ext/standard/file.c @@ -118,7 +118,6 @@ php_file_globals file_globals; #ifdef HAVE_FNMATCH #ifndef _GNU_SOURCE -#define _GNU_SOURCE #endif #include #endif --- php-5.2.6/ext/zlib/zlib_fopen_wrapper.c.gnusrc +++ php-5.2.6/ext/zlib/zlib_fopen_wrapper.c @@ -19,7 +19,6 @@ /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.5 2007/12/31 07:20:14 sebastian Exp $ */ -#define _GNU_SOURCE #include "php.h" #include "php_zlib.h" --- php-5.2.6/main/php.h.gnusrc +++ php-5.2.6/main/php.h @@ -30,6 +30,7 @@ #define PHP_HAVE_STREAMS #define YYDEBUG 0 +#include "php_config.h" #include "php_version.h" #include "zend.h" #include "zend_qsort.h" --- php-5.2.6/main/streams/cast.c.gnusrc +++ php-5.2.6/main/streams/cast.c @@ -18,7 +18,6 @@ /* $Id: cast.c,v 1.12.2.1.2.2 2007/12/31 07:20:15 sebastian Exp $ */ -#define _GNU_SOURCE #include "php.h" #include "php_globals.h" #include "php_network.h" --- php-5.2.6/main/streams/memory.c.gnusrc +++ php-5.2.6/main/streams/memory.c @@ -18,7 +18,6 @@ /* $Id: memory.c,v 1.8.2.6.2.19 2008/03/15 10:28:53 felipe Exp $ */ -#define _GNU_SOURCE #include "php.h" PHPAPI int php_url_decode(char *str, int len); --- php-5.2.6/main/streams/streams.c.gnusrc +++ php-5.2.6/main/streams/streams.c @@ -21,7 +21,6 @@ /* $Id: streams.c,v 1.82.2.6.2.22 2008/03/24 16:28:56 tony2001 Exp $ */ -#define _GNU_SOURCE #include "php.h" #include "php_globals.h" #include "php_network.h" --- php-5.2.6/Zend/zend_language_parser.c.gnusrc +++ php-5.2.6/Zend/zend_language_parser.c @@ -356,6 +356,8 @@ #include "zend_API.h" #include "zend_constants.h" +#include + #define YYERROR_VERBOSE #define YYSTYPE znode Index: php.spec =================================================================== RCS file: /cvs/extras/rpms/php/devel/php.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- php.spec 14 Jul 2008 11:04:39 -0000 1.157 +++ php.spec 14 Jul 2008 13:43:49 -0000 1.158 @@ -3,6 +3,8 @@ %define zendver 20060613 %define pdover 20060511 +%define _default_patch_fuzz 2 + Summary: The PHP HTML-embedded scripting language Name: php Version: 5.2.6 @@ -16,7 +18,7 @@ Source2: php.ini Source3: macros.php -Patch1: php-5.2.4-gnusrc.patch +Patch1: php-5.2.6-gnusrc.patch Patch2: php-4.3.3-install.patch Patch3: php-5.2.4-norpath.patch Patch5: php-5.0.2-phpize64.patch --- php-5.2.4-gnusrc.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 13:47:33 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Mon, 14 Jul 2008 13:47:33 GMT Subject: rpms/kexec-tools/F-9 kexec-tools.spec, 1.113, 1.114 mkdumprd, 1.19, 1.20 Message-ID: <200807141347.m6EDlXEq020036@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/kexec-tools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19885 Modified Files: kexec-tools.spec mkdumprd Log Message: Resolves: bz 443878 Index: kexec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/F-9/kexec-tools.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- kexec-tools.spec 16 Apr 2008 15:22:03 -0000 1.113 +++ kexec-tools.spec 14 Jul 2008 13:46:36 -0000 1.114 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.102pre -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -229,6 +229,9 @@ %doc kexec-kdump-howto.txt %changelog +* Mon Jul 14 2008 Neil Horman - 1.102pre-10 +- Fix mkdumprd to support dynamic build busybox (bz 443878) + * Wed Apr 16 2008 Neil Horman - 1.102pre-9 - Fix cmdline length issue Index: mkdumprd =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/F-9/mkdumprd,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mkdumprd 22 Feb 2008 12:40:20 -0000 1.19 +++ mkdumprd 14 Jul 2008 13:46:36 -0000 1.20 @@ -1068,6 +1068,7 @@ #copy in busybox and make symlinks to its supported utilities cp /sbin/busybox $MNTIMAGE/sbin/busybox +bin="$bin /sbin/busybox" cd $MNTIMAGE/sbin for i in `/sbin/busybox | awk 'BEGIN {found=0} /.*/ { if (found) print $0 } /Currently/ {found=1}' | From fedora-extras-commits at redhat.com Mon Jul 14 13:48:09 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 14 Jul 2008 13:48:09 GMT Subject: rpms/cpufrequtils/devel .cvsignore, 1.2, 1.3 cpufrequtils.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807141348.m6EDm9TW020156@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/cpufrequtils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977 Modified Files: .cvsignore cpufrequtils.spec sources Log Message: * Mon Jul 14 2008 Jarod Wilson 004-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpufrequtils/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Jun 2008 20:47:16 -0000 1.2 +++ .cvsignore 14 Jul 2008 13:47:14 -0000 1.3 @@ -1,2 +1,3 @@ cpufrequtils-003 cpufrequtils-003.tar.bz2 +cpufrequtils-004.tar.bz2 Index: cpufrequtils.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpufrequtils/devel/cpufrequtils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpufrequtils.spec 2 Jun 2008 21:02:49 -0000 1.2 +++ cpufrequtils.spec 14 Jul 2008 13:47:14 -0000 1.3 @@ -1,6 +1,6 @@ Summary: CPU Frequency changing related utilities Name: cpufrequtils -Version: 003 +Version: 004 Release: 1%{?dist} Group: System Environment/Base License: GPL @@ -85,6 +85,9 @@ %changelog +* Mon Jul 14 2008 Jarod Wilson 004-1 +- New upstream release + * Tue May 27 2008 Jarod Wilson 003-1 - New upstream release - Rename package to match upstream name (old cvs history Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpufrequtils/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Jun 2008 20:47:16 -0000 1.2 +++ sources 14 Jul 2008 13:47:14 -0000 1.3 @@ -1 +1 @@ -5263d82a20e6638adf6461de6e307f26 cpufrequtils-003.tar.bz2 +f868b9b6642c6c16b36cfd3eb627506a cpufrequtils-004.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 14:10:55 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 14:10:55 GMT Subject: rpms/httpd/devel httpd-2.2.9-suenable.patch, NONE, 1.1 httpd.conf, 1.26, 1.27 httpd.spec, 1.123, 1.124 Message-ID: <200807141410.m6EEAtGr027694@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/httpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27634 Modified Files: httpd.conf httpd.spec Added Files: httpd-2.2.9-suenable.patch Log Message: * Mon Jul 14 2008 Joe Orton 2.2.9-4 - use Charset=UTF-8 in default httpd.conf (#455123) - only enable suexec when appropriate (Jim Radford, #453697) httpd-2.2.9-suenable.patch: --- NEW FILE httpd-2.2.9-suenable.patch --- --- httpd-2.2.9/os/unix/unixd.c.suenable +++ httpd-2.2.9/os/unix/unixd.c @@ -215,7 +215,7 @@ AP_DECLARE(void) unixd_pre_config(apr_po } if ((wrapper.protection & APR_USETID) && wrapper.user == 0) { - unixd_config.suexec_enabled = 1; + unixd_config.suexec_enabled = access(SUEXEC_BIN, R_OK|X_OK) == 0; } } Index: httpd.conf =================================================================== RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- httpd.conf 4 Jun 2008 11:33:29 -0000 1.26 +++ httpd.conf 14 Jul 2008 14:09:16 -0000 1.27 @@ -588,7 +588,7 @@ # IndexOptions: Controls the appearance of server-generated directory # listings. # -IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable +IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8 # # AddIcon* directives tell the server which icon to show for different Index: httpd.spec =================================================================== RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- httpd.spec 10 Jul 2008 17:56:25 -0000 1.123 +++ httpd.spec 14 Jul 2008 14:09:16 -0000 1.124 @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.9 -Release: 3 +Release: 4 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -34,6 +34,7 @@ Patch23: httpd-2.0.45-export.patch Patch24: httpd-2.0.48-corelimit.patch Patch25: httpd-2.0.54-selinux.patch +Patch26: httpd-2.2.9-suenable.patch # Bug fixes Patch54: httpd-2.2.0-authnoprov.patch Patch55: httpd-2.2.4-oldflush.patch @@ -121,6 +122,7 @@ %patch23 -p1 -b .export %patch24 -p1 -b .corelimit %patch25 -p1 -b .selinux +%patch26 -p1 -b .suenable %patch54 -p1 -b .authnoprov %patch55 -p1 -b .oldflush @@ -478,6 +480,10 @@ %{_libdir}/httpd/build/*.sh %changelog +* Mon Jul 14 2008 Joe Orton 2.2.9-4 +- use Charset=UTF-8 in default httpd.conf (#455123) +- only enable suexec when appropriate (Jim Radford, #453697) + * Thu Jul 10 2008 Tom "spot" Callaway 2.2.9-3 - rebuild against new db4 4.7 From fedora-extras-commits at redhat.com Mon Jul 14 14:12:07 2008 From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos)) Date: Mon, 14 Jul 2008 14:12:07 GMT Subject: rpms/gtk2hs/devel gtk2hs-fasm-0.9.13.patch, NONE, 1.1 gtk2hs.spec, 1.40, 1.41 gtk2hs-gtype-cuint.patch, 1.1, NONE Message-ID: <200807141412.m6EEC7Vp027846@cvs-int.fedora.redhat.com> Author: bos Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27773 Modified Files: gtk2hs.spec Added Files: gtk2hs-fasm-0.9.13.patch Removed Files: gtk2hs-gtype-cuint.patch Log Message: Try to fix ppc build gtk2hs-fasm-0.9.13.patch: --- NEW FILE gtk2hs-fasm-0.9.13.patch --- --- gtk2hs-0.9.13/Makefile.am.orig 2008-07-14 07:06:04.000000000 -0700 +++ gtk2hs-0.9.13/Makefile.am 2008-07-14 07:06:05.000000000 -0700 @@ -217,7 +217,7 @@ tools_c2hs_base_general_Binary_hs_HCFLAGS = -O -funbox-strict-fields tools_c2hs_base_general_FastMutInt_hs_HCFLAGS = -O tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts -tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi -fvia-C \ +tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi \ '-\#include' tools/c2hs/c/CLexer.hs : tools/c2hs/c/CLexer.x Index: gtk2hs.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gtk2hs.spec 14 Jul 2008 11:47:23 -0000 1.40 +++ gtk2hs.spec 14 Jul 2008 14:11:32 -0000 1.41 @@ -11,7 +11,7 @@ Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} # cairo/ and svgcairo/ are FreeBSD # compat/ is BSD # tools/c2hs (used to build) is GPL, LGPL @@ -20,6 +20,7 @@ License: LGPLv2+ Group: Development/Libraries Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz +Patch0: gtk2hs-fasm-0.9.13.patch URL: http://gtk2hs.sourceforge.net/ # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239752 ExcludeArch: alpha ppc64 @@ -122,6 +123,7 @@ %prep %setup -q %{?snapdate:-n %{name}-%{version}} +%patch0 -p1 -b .fasm %build @@ -304,6 +306,9 @@ %changelog +* Mon Jul 14 2008 Bryan O'Sullivan - 0.9.13-2 +- Try to fix ppc build due to ghc 6.8.3 -fvia-C bug + * Mon Jul 14 2008 Bryan O'Sullivan - 0.9.13-1 - Update to 0.9.13 --- gtk2hs-gtype-cuint.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 14:12:19 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 14:12:19 GMT Subject: rpms/webalizer/devel webalizer.spec,1.33,1.34 Message-ID: <200807141412.m6EECJab027851@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/webalizer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27777 Modified Files: webalizer.spec Log Message: - adjust patch fuzz Index: webalizer.spec =================================================================== RCS file: /cvs/extras/rpms/webalizer/devel/webalizer.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- webalizer.spec 14 Jul 2008 10:53:35 -0000 1.33 +++ webalizer.spec 14 Jul 2008 14:11:26 -0000 1.34 @@ -1,6 +1,8 @@ %define ver 2.01 %define patchlevel 10 +%define _default_patch_fuzz 2 + Name: webalizer Summary: A flexible Web server log file analysis program Group: Applications/Internet From fedora-extras-commits at redhat.com Mon Jul 14 14:16:28 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 14:16:28 GMT Subject: rpms/jsch/devel MANIFEST.MF, 1.2, 1.3 jsch.spec, 1.27, 1.28 jsch-0.1.31-backwards-compat.patch, 1.1, NONE Message-ID: <200807141416.m6EEGSmf028214@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jsch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28165 Modified Files: MANIFEST.MF jsch.spec Removed Files: jsch-0.1.31-backwards-compat.patch Log Message: * Fri Jul 11 2008 Andrew Overholt 0:0.1.39-1.1 - 0.1.39 Index: MANIFEST.MF =================================================================== RCS file: /cvs/pkgs/rpms/jsch/devel/MANIFEST.MF,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MANIFEST.MF 8 Jun 2007 04:35:06 -0000 1.2 +++ MANIFEST.MF 14 Jul 2008 14:15:31 -0000 1.3 @@ -1,13 +1,12 @@ Manifest-Version: 1.0 -Bundle-Name: %bundleName -Bundle-ClassPath: . -Created-By: 1.4.0 (Sun Microsystems Inc.) -Bundle-Vendor: %venderName Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-SymbolicName: com.jcraft.jsch Bundle-ManifestVersion: 2 +Bundle-Name: %bundleName Bundle-Localization: plugin -Bundle-SymbolicName: com.jcraft.jsch -Export-Package: com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, - com.jcraft.jsch.jcraft;x-internal:=true -Bundle-Version: 0.1.31 - +Bundle-Version: 0.1.37.v200803061811 +Bundle-ClassPath: . +Bundle-Vendor: %venderName +Export-Package: com.jcraft.jsch,com.jcraft.jsch.jce;x-internal:=true,c + om.jcraft.jsch.jcraft;x-internal:=true,com.jcraft.jsch.jgss;x-interna + l:=true Index: jsch.spec =================================================================== RCS file: /cvs/pkgs/rpms/jsch/devel/jsch.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- jsch.spec 9 Jul 2008 20:13:12 -0000 1.27 +++ jsch.spec 14 Jul 2008 14:15:31 -0000 1.28 @@ -30,25 +30,27 @@ %define section free -%define _with_gcj_support 1 - -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} +%define gcj_support 0 Name: jsch -Version: 0.1.31 -Release: 2.5%{?dist} +Version: 0.1.39 +Release: 1.1%{?dist} Epoch: 0 Summary: Pure Java implementation of SSH2 Group: Development/Libraries/Java License: BSD URL: http://www.jcraft.com/jsch/ Source0: http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}.zip -# wget http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.jcraft.jsch_0.1.31.jar -# unzip com.jcraft.jsch_0.1.31.jar META-INF/MANIFEST.MF -# mv META-INF/MANIFEST.MF -# rmdir META-INF +# wget \ +# http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.jcraft.jsch_0.1.37.v200803061811.jar +# unzip com.jcraft.jsch_*.jar META-INF/MANIFEST.MF +# mv META-INF/MANIFEST.MF . +# sed -i "/^Name/d" MANIFEST.MF +# sed -i "/^SHA1/d" MANIFEST.MF +# dos2unix MANIFEST.MF +# sed -i "/^$/d" MANIFEST.MF +# unix2dos MANIFEST.MF Source1: MANIFEST.MF -Patch0: %{name}-%{version}-backwards-compat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -97,8 +99,6 @@ %prep %setup -q -%patch0 - %build export CLASSPATH=$(build-classpath jzlib) ant dist javadoc @@ -184,6 +184,9 @@ %changelog +* Fri Jul 11 2008 Andrew Overholt 0:0.1.39-1.1 +- 0.1.39 + * Wed Jul 9 2008 Tom "spot" Callaway - 0:0.1.31-2.5 - drop repotag --- jsch-0.1.31-backwards-compat.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 14:18:43 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 14:18:43 GMT Subject: rpms/httpd/devel httpd.spec,1.124,1.125 Message-ID: <200807141418.m6EEIhJ8028377@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/httpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28341 Modified Files: httpd.spec Log Message: - work around rpm patch fuzz change. Index: httpd.spec =================================================================== RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- httpd.spec 14 Jul 2008 14:09:16 -0000 1.124 +++ httpd.spec 14 Jul 2008 14:18:03 -0000 1.125 @@ -4,6 +4,8 @@ %define vstring Fedora %define mpms worker event +%define _default_patch_fuzz 2 + Summary: Apache HTTP Server Name: httpd Version: 2.2.9 From fedora-extras-commits at redhat.com Mon Jul 14 14:20:00 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 14:20:00 GMT Subject: rpms/jsch/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200807141420.m6EEK0ZW028506@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jsch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28418 Modified Files: .cvsignore sources Log Message: New sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jsch/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jun 2007 04:38:30 -0000 1.5 +++ .cvsignore 14 Jul 2008 14:19:01 -0000 1.6 @@ -1 +1 @@ -jsch-0.1.31.zip +jsch-0.1.39.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jsch/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jun 2007 04:38:30 -0000 1.5 +++ sources 14 Jul 2008 14:19:01 -0000 1.6 @@ -1 +1 @@ -48c95c51c0e9fe17499b03a2ece22f81 jsch-0.1.31.zip +8f77166fd419f7f150a40b6b3710e027 jsch-0.1.39.zip From fedora-extras-commits at redhat.com Mon Jul 14 14:21:40 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Mon, 14 Jul 2008 14:21:40 GMT Subject: rpms/xmlto/devel xmlto.spec,1.39,1.40 Message-ID: <200807141421.m6EELeoQ028647@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/xmlto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28597 Modified Files: xmlto.spec Log Message: fix xmlto-tex requirements for xmlto to %{version}-%{release} Index: xmlto.spec =================================================================== RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- xmlto.spec 14 Jul 2008 13:36:17 -0000 1.39 +++ xmlto.spec 14 Jul 2008 14:20:49 -0000 1.40 @@ -34,7 +34,7 @@ # For full functionality, we need passivetex. Requires: passivetex >= 1.11 # We require main package -Requires: xmlto +Requires: xmlto = %{version}-%{release} %description tex This subpackage contains xmlto backend scripts which do require From fedora-extras-commits at redhat.com Mon Jul 14 14:24:12 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Mon, 14 Jul 2008 14:24:12 GMT Subject: rpms/xulrunner/OLPC-3 xulrunner-mozconfig, 1.22, 1.23 xulrunner.spec, 1.130, 1.131 Message-ID: <200807141424.m6EEOCuN028787@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/xulrunner/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28727 Modified Files: xulrunner-mozconfig xulrunner.spec Log Message: * Mon Jul 14 2008 Simon Schampijer - 1.9-1.3 - remove xulrunner deps on libgnome/libgnomevfs redhat-454890 Index: xulrunner-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner-mozconfig,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xulrunner-mozconfig 20 Jun 2008 12:18:07 -0000 1.22 +++ xulrunner-mozconfig 14 Jul 2008 14:23:19 -0000 1.23 @@ -28,6 +28,8 @@ ac_add_options --disable-crashreporter ac_add_options --enable-safe-browsing ac_add_options --enable-extensions=default,python/xpcom +ac_add_options --disable-gnomeui +ac_add_options --disable-gnomevfs export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 Index: xulrunner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- xulrunner.spec 12 Jul 2008 21:28:42 -0000 1.130 +++ xulrunner.spec 14 Jul 2008 14:23:19 -0000 1.131 @@ -8,7 +8,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -51,9 +51,7 @@ BuildRequires: lcms-devel BuildRequires: libIDL-devel BuildRequires: gtk2-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel +BuildRequires: dbus-glib-devel BuildRequires: krb5-devel BuildRequires: pango-devel BuildRequires: freetype-devel >= 2.1.9 @@ -419,6 +417,9 @@ #--------------------------------------------------------------------- %changelog +* Mon Jul 14 2008 Simon Schampijer - 1.9-1.3 +- remove xulrunner deps on libgnome/libgnomevfs redhat-454890 + * Sat Jul 12 2008 Simon Schampijer - 1.9-1.2 - add the OLPC specific patches From fedora-extras-commits at redhat.com Mon Jul 14 14:35:34 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Mon, 14 Jul 2008 14:35:34 GMT Subject: rpms/pungi/devel pungi.spec,1.55,1.56 Message-ID: <200807141435.m6EEZY1t029447@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29341 Modified Files: pungi.spec Log Message: Test uberpackager permissions Index: pungi.spec =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- pungi.spec 11 Jul 2008 18:33:09 -0000 1.55 +++ pungi.spec 14 Jul 2008 14:34:54 -0000 1.56 @@ -1,5 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: pungi Version: 2.0.2 Release: 1%{?dist} From fedora-extras-commits at redhat.com Mon Jul 14 14:37:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:37:59 +0000 Subject: [pkgdb] objectweb-asm: overholt has requested commit Message-ID: <200807141438.m6EEc05T027074@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on objectweb-asm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/objectweb-asm From fedora-extras-commits at redhat.com Mon Jul 14 14:38:08 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 14:38:08 GMT Subject: rpms/tomcat5/devel jasper-OSGi-MANIFEST.MF, 1.1, 1.2 jsp-api-OSGi-MANIFEST.MF, 1.1, 1.2 servlet-api-OSGi-MANIFEST.MF, 1.1, 1.2 tomcat5.spec, 1.113, 1.114 Message-ID: <200807141438.m6EEc8lX029643@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/tomcat5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29574 Modified Files: jasper-OSGi-MANIFEST.MF jsp-api-OSGi-MANIFEST.MF servlet-api-OSGi-MANIFEST.MF tomcat5.spec Log Message: * Mon Jul 14 2008 Andrew Overholt 0:5.5.26-1.5 - Bump OSGi version numbers to match Eclipse SDK 3.4. Index: jasper-OSGi-MANIFEST.MF =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/jasper-OSGi-MANIFEST.MF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jasper-OSGi-MANIFEST.MF 9 Aug 2007 20:37:02 -0000 1.1 +++ jasper-OSGi-MANIFEST.MF 14 Jul 2008 14:37:38 -0000 1.2 @@ -17,7 +17,7 @@ sper.runtime,org.apache.jasper.security,org.apache.jasper.servlet,org .apache.jasper.tagplugins.jstl,org.apache.jasper.tagplugins.jstl.core ,org.apache.jasper.util,org.apache.jasper.xmlparser -Bundle-Version: 5.5.17.v200706111724 +Bundle-Version: 5.5.17.v200806031609 Bundle-SymbolicName: org.apache.jasper Bundle-Name: Apache Jasper 2 Plug-in Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J Index: jsp-api-OSGi-MANIFEST.MF =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/jsp-api-OSGi-MANIFEST.MF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jsp-api-OSGi-MANIFEST.MF 9 Aug 2007 20:37:02 -0000 1.1 +++ jsp-api-OSGi-MANIFEST.MF 14 Jul 2008 14:37:38 -0000 1.2 @@ -7,7 +7,7 @@ Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp .tagext; version=2.0 -Bundle-Version: 2.0.0.v200706191603 +Bundle-Version: 2.0.0.v200806031607 Bundle-SymbolicName: javax.servlet.jsp Bundle-Name: Java Server Pages API Bundle Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 Index: servlet-api-OSGi-MANIFEST.MF =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/servlet-api-OSGi-MANIFEST.MF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- servlet-api-OSGi-MANIFEST.MF 9 Aug 2007 20:37:02 -0000 1.1 +++ servlet-api-OSGi-MANIFEST.MF 14 Jul 2008 14:37:38 -0000 1.2 @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Export-Package: javax.servlet;version="2.4",javax.servlet.http;version ="2.4",javax.servlet.resources;version="2.4" -Bundle-Version: 2.4.0.v200706111738 +Bundle-Version: 2.4.0.v200806031604 Bundle-SymbolicName: javax.servlet Bundle-Name: Servlet API Bundle Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 Index: tomcat5.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- tomcat5.spec 10 Jul 2008 19:41:46 -0000 1.113 +++ tomcat5.spec 14 Jul 2008 14:37:38 -0000 1.114 @@ -69,7 +69,7 @@ Name: tomcat5 Epoch: 0 Version: 5.5.26 -Release: 1.4%{?dist} +Release: 1.5%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Group: Networking/Daemons @@ -1306,6 +1306,9 @@ %endif %changelog +* Mon Jul 14 2008 Andrew Overholt 0:5.5.26-1.5 +- Bump OSGi version numbers to match Eclipse SDK 3.4. + * Thu Jul 10 2008 Tom "spot" Callaway - 0:5.5.26-1.4 - drop repotag From fedora-extras-commits at redhat.com Mon Jul 14 14:41:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:41:34 +0000 Subject: [pkgdb] bouncycastle ownership updated Message-ID: <200807141441.m6EEfYAr027283@bastion.fedora.phx.redhat.com> Package bouncycastle in Fedora devel is now owned by Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:41:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:41:55 +0000 Subject: [pkgdb] bouncycastle: langel has requested watchbugzilla Message-ID: <200807141441.m6EEfYAu027283@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on bouncycastle (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:41:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:41:56 +0000 Subject: [pkgdb] bouncycastle: langel has requested commit Message-ID: <200807141441.m6EEfuZS027328@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on bouncycastle (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:41:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:41:59 +0000 Subject: [pkgdb] bouncycastle: langel has requested approveacls Message-ID: <200807141442.m6EEfxo0027347@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on bouncycastle (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:00 +0000 Subject: [pkgdb] bouncycastle: langel has requested watchbugzilla Message-ID: <200807141442.m6EEfYAx027283@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on bouncycastle (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:04 +0000 Subject: [pkgdb] bouncycastle: langel has requested approveacls Message-ID: <200807141442.m6EEfuZV027328@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on bouncycastle (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:05 +0000 Subject: [pkgdb] bouncycastle: langel has requested commit Message-ID: <200807141442.m6EEfuZY027328@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on bouncycastle (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:08 +0000 Subject: [pkgdb] bouncycastle: langel has requested watchbugzilla Message-ID: <200807141442.m6EEg8or027426@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on bouncycastle (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:08 +0000 Subject: [pkgdb] bouncycastle: langel has requested watchcommits Message-ID: <200807141442.m6EEfxo3027347@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on bouncycastle (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:11 +0000 Subject: [pkgdb] bouncycastle: langel has requested watchcommits Message-ID: <200807141442.m6EEfxo6027347@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on bouncycastle (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:12 +0000 Subject: [pkgdb] bouncycastle: langel has requested approveacls Message-ID: <200807141442.m6EEgDXe027485@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on bouncycastle (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:19 +0000 Subject: [pkgdb] bouncycastle: langel has requested watchbugzilla Message-ID: <200807141442.m6EEg8ot027426@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on bouncycastle (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:20 +0000 Subject: [pkgdb] bouncycastle: langel has requested commit Message-ID: <200807141442.m6EEgKpq027523@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on bouncycastle (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:20 +0000 Subject: [pkgdb] bouncycastle: langel has requested watchcommits Message-ID: <200807141442.m6EEgKpo027523@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on bouncycastle (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:42:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:42:22 +0000 Subject: [pkgdb] bouncycastle: langel has requested approveacls Message-ID: <200807141442.m6EEgDXg027485@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on bouncycastle (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:43:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:30 +0000 Subject: [pkgdb] binutils: jkratoch has requested commit Message-ID: <200807141443.m6EEhUDi027681@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the commit acl on binutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:43:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:34 +0000 Subject: [pkgdb] java-1.5.0-gcj ownership updated Message-ID: <200807141443.m6EEhZ1U027701@bastion.fedora.phx.redhat.com> Package java-1.5.0-gcj in Fedora devel is now owned by Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:38 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchcommits Message-ID: <200807141443.m6EEhZ1X027701@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchcommits acl on binutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:43:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:40 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested watchbugzilla Message-ID: <200807141443.m6EEheWR027738@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.5.0-gcj (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:41 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested watchcommits Message-ID: <200807141443.m6EEheWU027738@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on java-1.5.0-gcj (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:42 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested approveacls Message-ID: <200807141443.m6EEhUDl027681@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on java-1.5.0-gcj (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:43 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 14:43:43 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.98-circles.patch, NONE, 1.1 kdebase-workspace.spec, 1.101, 1.102 Message-ID: <200807141443.m6EEhhoI030180@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30120 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.98-circles.patch Log Message: * Mon Jul 14 2008 Rex Dieter 4.0.98-4 - install circles kdm theme kdebase-workspace-4.0.98-circles.patch: --- NEW FILE kdebase-workspace-4.0.98-circles.patch --- diff -up kdebase-workspace-4.0.98/kdm/kfrontend/themes/CMakeLists.txt.circles kdebase-workspace-4.0.98/kdm/kfrontend/themes/CMakeLists.txt --- kdebase-workspace-4.0.98/kdm/kfrontend/themes/CMakeLists.txt.circles 2008-07-03 00:05:38.000000000 -0500 +++ kdebase-workspace-4.0.98/kdm/kfrontend/themes/CMakeLists.txt 2008-07-14 09:32:49.000000000 -0500 @@ -1,3 +1,4 @@ -add_subdirectory( oxygen circles ) +add_subdirectory( circles ) +add_subdirectory( oxygen ) install( FILES greeter.dtd DESTINATION ${DATA_INSTALL_DIR}/doc/kdm ) Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- kdebase-workspace.spec 14 Jul 2008 00:16:12 -0000 1.101 +++ kdebase-workspace.spec 14 Jul 2008 14:42:55 -0000 1.102 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.98 -Release: 3%{?dist} +Release: 4%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -26,6 +26,7 @@ Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch # upstream patches: +Patch100: kdebase-workspace-4.0.98-circles.patch # plasma-4.0-openSUSE patches: Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch @@ -139,6 +140,7 @@ %patch11 -p1 -b .plasma-default-wallpaper # upstream patches +%patch100 -p1 -b .circles # plasma-4.0-openSUSE patches: %patch204 -p1 -b .kickoff-suspend @@ -274,6 +276,9 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- install circles kdm theme + * Sun Jul 13 2008 Kevin Kofler 4.0.98-3 - sync kickoff-suspend patch from F9 (loads ksmserver translations) From fedora-extras-commits at redhat.com Mon Jul 14 14:43:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:46 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested commit Message-ID: <200807141443.m6EEheWX027738@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on java-1.5.0-gcj (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:46 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested watchbugzilla Message-ID: <200807141443.m6EEhZ1a027701@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.5.0-gcj (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:47 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested approveacls Message-ID: <200807141443.m6EEhlM7027848@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on java-1.5.0-gcj (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:52 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchcommits Message-ID: <200807141443.m6EEhlMA027848@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchcommits acl on binutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:43:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:52 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested watchbugzilla Message-ID: <200807141443.m6EEhrcm027892@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.5.0-gcj (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:54 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested approveacls Message-ID: <200807141443.m6EEhUDo027681@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on java-1.5.0-gcj (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:56 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested watchcommits Message-ID: <200807141443.m6EEhlMD027848@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on java-1.5.0-gcj (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:43:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:43:56 +0000 Subject: [pkgdb] binutils: jkratoch has requested commit Message-ID: <200807141443.m6EEhrcp027892@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the commit acl on binutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:44:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:44:02 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested watchbugzilla Message-ID: <200807141444.m6EEi2EV027975@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.5.0-gcj (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:44:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:44:03 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested watchcommits Message-ID: <200807141444.m6EEi2EX027975@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on java-1.5.0-gcj (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:44:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:44:05 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has requested approveacls Message-ID: <200807141444.m6EEhlMF027848@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on java-1.5.0-gcj (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:45:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:02 +0000 Subject: [pkgdb] bouncycastle had acl change status Message-ID: <200807141445.m6EEj2EO028119@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the watchcommits acl on bouncycastle (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:45:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:03 +0000 Subject: [pkgdb] bouncycastle had acl change status Message-ID: <200807141445.m6EEj30w028135@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the watchbugzilla acl on bouncycastle (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:45:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:06 +0000 Subject: [pkgdb] bouncycastle had acl change status Message-ID: <200807141445.m6EEj2EQ028119@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the approveacls acl on bouncycastle (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:45:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:07 +0000 Subject: [pkgdb] bouncycastle had acl change status Message-ID: <200807141445.m6EEj310028135@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the commit acl on bouncycastle (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bouncycastle From fedora-extras-commits at redhat.com Mon Jul 14 14:45:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:40 +0000 Subject: [pkgdb] java-1.5.0-gcj had acl change status Message-ID: <200807141445.m6EEj2ES028119@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the watchbugzilla acl on java-1.5.0-gcj (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:45:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:43 +0000 Subject: [pkgdb] java-1.5.0-gcj had acl change status Message-ID: <200807141445.m6EEj2EU028119@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the commit acl on java-1.5.0-gcj (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:45:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:45 +0000 Subject: [pkgdb] java-1.5.0-gcj had acl change status Message-ID: <200807141445.m6EEjja5028267@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the watchcommits acl on java-1.5.0-gcj (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:45:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:45 +0000 Subject: [pkgdb] java-1.5.0-gcj had acl change status Message-ID: <200807141445.m6EEjja7028267@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the approveacls acl on java-1.5.0-gcj (Fedora devel) to Approved for Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:45:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:45:49 +0000 Subject: [pkgdb] java-1.5.0-gcj: langel has given up commit Message-ID: <200807141445.m6EEj312028135@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has given up the commit acl on java-1.5.0-gcj (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.5.0-gcj From fedora-extras-commits at redhat.com Mon Jul 14 14:46:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:46:04 +0000 Subject: [pkgdb] java-1.6.0-openjdk had acl change status Message-ID: <200807141446.m6EEjjaB028267@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the watchbugzilla acl on java-1.6.0-openjdk (Fedora 9) to Approved for Mark Wielaard (mjw) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Mon Jul 14 14:46:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:46:08 +0000 Subject: [pkgdb] java-1.6.0-openjdk had acl change status Message-ID: <200807141446.m6EEj316028135@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has set the watchcommits acl on java-1.6.0-openjdk (Fedora 9) to Approved for Mark Wielaard (mjw) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Mon Jul 14 14:47:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:12 +0000 Subject: [pkgdb] java-1.7.0-icedtea ownership updated Message-ID: <200807141447.m6EElCJq028429@bastion.fedora.phx.redhat.com> Package java-1.7.0-icedtea in Fedora devel is now owned by Lillian Angel (langel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:17 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchbugzilla Message-ID: <200807141447.m6EElHcu028451@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.7.0-icedtea (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:21 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested commit Message-ID: <200807141447.m6EElL6F028470@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on java-1.7.0-icedtea (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:21 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested approveacls Message-ID: <200807141447.m6EElLw0028473@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on java-1.7.0-icedtea (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:22 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchcommits Message-ID: <200807141447.m6EElL6I028470@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on java-1.7.0-icedtea (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:25 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchbugzilla Message-ID: <200807141447.m6EElCJt028429@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.7.0-icedtea (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:26 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchcommits Message-ID: <200807141447.m6EElCJw028429@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on java-1.7.0-icedtea (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:26 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested approveacls Message-ID: <200807141447.m6EElHcx028451@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on java-1.7.0-icedtea (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:28 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested commit Message-ID: <200807141447.m6EElL6L028470@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on java-1.7.0-icedtea (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:29 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchbugzilla Message-ID: <200807141447.m6EElLw3028473@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.7.0-icedtea (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:31 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchcommits Message-ID: <200807141447.m6EElVCv028629@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on java-1.7.0-icedtea (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:33 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchbugzilla Message-ID: <200807141447.m6EElLw6028473@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchbugzilla acl on java-1.7.0-icedtea (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:35 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested commit Message-ID: <200807141447.m6EElZ3f028673@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on java-1.7.0-icedtea (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:36 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested watchcommits Message-ID: <200807141447.m6EElZ3i028673@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the watchcommits acl on java-1.7.0-icedtea (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:37 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested approveacls Message-ID: <200807141447.m6EElb4i028711@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the approveacls acl on java-1.7.0-icedtea (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:47:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:47:36 +0000 Subject: [pkgdb] java-1.7.0-icedtea: langel has requested commit Message-ID: <200807141447.m6EElHd2028451@bastion.fedora.phx.redhat.com> Lillian Angel (langel) has requested the commit acl on java-1.7.0-icedtea (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.7.0-icedtea From fedora-extras-commits at redhat.com Mon Jul 14 14:53:47 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Mon, 14 Jul 2008 14:53:47 GMT Subject: rpms/kexec-tools/devel kexec-tools.spec, 1.116, 1.117 mkdumprd, 1.22, 1.23 Message-ID: <200807141453.m6EErlvK030757@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/kexec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30672 Modified Files: kexec-tools.spec mkdumprd Log Message: Resolves: bz 443878) Index: kexec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- kexec-tools.spec 11 Jun 2008 10:51:51 -0000 1.116 +++ kexec-tools.spec 14 Jul 2008 14:52:37 -0000 1.117 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.102pre -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -265,6 +265,9 @@ %changelog +* Mon Jul 11 2008 Neil Horman - 1.102pre-13 +- Fix mkdumprd to support dynamic busybox (bz 443878) + * Wed Jun 11 2008 Neil Horman - 1.102pre-12 - Added lvm to bin list (bz 443878) Index: mkdumprd =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mkdumprd 11 Jun 2008 10:51:51 -0000 1.22 +++ mkdumprd 14 Jul 2008 14:52:37 -0000 1.23 @@ -1076,6 +1076,7 @@ #copy in busybox and make symlinks to its supported utilities cp /sbin/busybox $MNTIMAGE/sbin/busybox +bin="$bin /sbin/busybox" cd $MNTIMAGE/sbin for i in `/sbin/busybox | awk 'BEGIN {found=0} /.*/ { if (found) print $0 } /Currently/ {found=1}' | From fedora-extras-commits at redhat.com Mon Jul 14 14:57:49 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 14:57:49 GMT Subject: rpms/tomcat5/devel tomcat5-5.5-catalina.sh.patch,1.4,1.5 Message-ID: <200807141457.m6EEvnJn031067@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/tomcat5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30992 Modified Files: tomcat5-5.5-catalina.sh.patch Log Message: New catalina.sh patch that applies with no fuzz. tomcat5-5.5-catalina.sh.patch: Index: tomcat5-5.5-catalina.sh.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-catalina.sh.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tomcat5-5.5-catalina.sh.patch 5 Jan 2008 12:28:57 -0000 1.4 +++ tomcat5-5.5-catalina.sh.patch 14 Jul 2008 14:57:09 -0000 1.5 @@ -1,6 +1,6 @@ ---- container/catalina/src/bin/catalina.sh.sav 2006-03-23 17:04:08.000000000 +0100 -+++ container/catalina/src/bin/catalina.sh 2006-03-23 17:12:52.000000000 +0100 -@@ -52,6 +52,11 @@ +--- container/catalina/src/bin/catalina.sh.sav 2008-07-14 10:48:13.000000000 -0400 ++++ container/catalina/src/bin/catalina.sh 2008-07-14 10:51:27.000000000 -0400 +@@ -64,6 +64,11 @@ Darwin*) darwin=true;; esac @@ -12,7 +12,7 @@ # resolve links - $0 may be a softlink PRG="$0" -@@ -97,30 +100,73 @@ +@@ -111,30 +116,73 @@ export QIBM_MULTI_THREADED=Y fi @@ -35,8 +35,8 @@ - fi +if [ -z "$CATALINA_HOME" ]; then + [ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}" -+fi -+ + fi + +### Set up defaults if they were omitted in TOMCAT_CFG +### JVM lookup +if [ -z "$JAVA_HOME" ]; then @@ -79,8 +79,8 @@ + echo "Found JAVA_HOME: ${JAVA_HOME}" + echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time" + fi - fi - ++fi ++ +# Set standard commands for invoking Java. +_RUNJAVA="$JAVA_HOME"/bin/java +_RUNJAVAC="$JAVA_HOME"/bin/javac @@ -104,7 +104,7 @@ if [ -z "$CATALINA_BASE" ] ; then CATALINA_BASE="$CATALINA_HOME" -@@ -131,6 +179,10 @@ +@@ -145,6 +193,10 @@ CATALINA_TMPDIR="$CATALINA_BASE"/temp fi @@ -112,10 +112,10 @@ + export CATALINA_PID=/var/run/tomcat5.pid +fi + - # For Cygwin, switch paths to Windows format before running java - if $cygwin; then - JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` -@@ -290,7 +342,7 @@ + # Bugzilla 37848: When no TTY is available, don't output to console + have_tty=0 + if [ "`tty`" != "not a tty" ]; then +@@ -318,7 +370,7 @@ else From fedora-extras-commits at redhat.com Mon Jul 14 14:58:34 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Mon, 14 Jul 2008 14:58:34 GMT Subject: rpms/vym/devel .cvsignore,1.3,1.4 sources,1.3,1.4 vym.spec,1.8,1.9 Message-ID: <200807141458.m6EEwY8U031180@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/vym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31009 Modified Files: .cvsignore sources vym.spec Log Message: New upstream, BZ 455254. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vym/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Oct 2007 18:31:59 -0000 1.3 +++ .cvsignore 14 Jul 2008 14:57:24 -0000 1.4 @@ -1 +1 @@ -vym-1.10.0.tar.bz2 +vym-1.12.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vym/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Oct 2007 18:31:59 -0000 1.3 +++ sources 14 Jul 2008 14:57:24 -0000 1.4 @@ -1 +1 @@ -188f08f2e0af5e122e2613351f3b92d9 vym-1.10.0.tar.bz2 +699cc2c7f605490a6ef79fbaaf4ffc25 vym-1.12.0.tar.bz2 Index: vym.spec =================================================================== RCS file: /cvs/pkgs/rpms/vym/devel/vym.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vym.spec 11 Jun 2008 21:20:54 -0000 1.8 +++ vym.spec 14 Jul 2008 14:57:24 -0000 1.9 @@ -1,6 +1,6 @@ Name: vym -Version: 1.10.0 -Release: 4%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: View your mind Group: Applications/Productivity @@ -9,13 +9,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: vym.xml -Patch0: vym-1.10.0-dir-vars.patch -Patch1: vym-1.10.0-docdir-searchList.patch -Patch2: vym-1.10.0-xdg-open.patch Patch3: vym-0.10.0-editxlinkdialog-typeinfo.patch -Patch4: vym-0.10.0-selection-typeinfo.patch -Patch5: vym-0.10.0-mainwindow-typeinfo.patch -Patch6: vym-0.10.0-xml-vym-typeinfo.patch Patch7: vym-1.10.0-ornamentedobj-typeinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,13 +25,7 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 %patch3 -p0 -%patch4 -p0 -%patch5 -p0 -%patch6 -p0 %patch7 -p0 %build @@ -102,7 +90,12 @@ %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/mime/packages/vym.xml + %changelog +* Mon Jul 14 2008 Jon Ciesla - 1.12.0-1 +- Updated to new upstream version. +- Dropped several patches, applied upstream. + * Tue Jun 10 2008 Jon Ciesla - 1.10.0-4 - Added mime type xml, BZ434929. From fedora-extras-commits at redhat.com Mon Jul 14 14:59:27 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 14 Jul 2008 14:59:27 GMT Subject: rpms/pigment/devel pigment-0.3.6-unit-test-rounding-fix.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 pigment.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807141459.m6EExRRc031314@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31174 Modified Files: .cvsignore pigment.spec sources Added Files: pigment-0.3.6-unit-test-rounding-fix.patch Log Message: Update to 0.3.6 (with fixes, fully tested). pigment-0.3.6-unit-test-rounding-fix.patch: --- NEW FILE pigment-0.3.6-unit-test-rounding-fix.patch --- Index: tests/check/pgm/pgmimage.c =================================================================== --- tests/check/pgm/pgmimage.c (revision 1214) +++ tests/check/pgm/pgmimage.c (working copy) @@ -33,7 +33,6 @@ #define TEST_IMAGE_SMALL_FILE "./test-small-image.png" #define UNEXISTING_FILE "/blah/foo/bar/notexistingfilethatdoesnotexist.png" - static void write_image (const gchar *file_name, guint side_size) { @@ -49,7 +48,8 @@ } pixbuf = gdk_pixbuf_new_from_data (data, GDK_COLORSPACE_RGB, FALSE, - 8, side_size, side_size, rowstride, NULL, NULL); + 8, side_size, side_size, rowstride, NULL, + NULL); gdk_pixbuf_save (pixbuf, file_name, "png", NULL, NULL); g_object_unref (pixbuf); @@ -105,7 +105,6 @@ } PGM_END_TEST; - /* test default values */ PGM_START_TEST (test_image_default_values) { @@ -148,7 +147,6 @@ } PGM_END_TEST; - /* test set/get correctness */ PGM_START_TEST (test_image_set_get_correctness) { @@ -309,7 +307,7 @@ pgm_init (NULL, NULL); - pgm_thread = g_thread_create ( thread_init, NULL, TRUE, NULL); + pgm_thread = g_thread_create (thread_init, NULL, TRUE, NULL); fail_unless (NULL != pgm_thread, "thread creation"); g_usleep (500000); @@ -317,8 +315,8 @@ image = pgm_image_new (); fail_unless (NULL != image, "image creation"); - ASSERT_PGM_SUCCESS (pgm_image_set_from_file ( PGM_IMAGE (image), - TEST_IMAGE_FILE, 0)); + ASSERT_PGM_SUCCESS (pgm_image_set_from_file (PGM_IMAGE (image), + TEST_IMAGE_FILE, 0)); gst_object_unref (image); pgm_main_quit (); @@ -368,20 +366,21 @@ } PGM_END_TEST -#define IMAGE_FROM_DRAWABLE_TEST(x_drawable, y_drawable, x_image, y_image) \ - do { \ - ASSERT_PGM_SUCCESS (pgm_image_from_drawable (image, &x, &y, \ - x_drawable, y_drawable)); \ - fail_unless_equals_int (x, x_image); \ - fail_unless_equals_int (y, y_image); \ - }while(0) +/* Fight against rounding issues using a threshold comparison of 1 */ +#define IMAGE_FROM_DRAWABLE_TEST(x_drb,y_drb,x_img,y_img) \ + G_STMT_START { \ + ASSERT_PGM_SUCCESS (pgm_image_from_drawable (image, &x, &y, \ + x_drb, y_drb)); \ + fail_unless (abs (x-x_img) <= 1); \ + fail_unless (abs (y-y_img) <= 1); \ + } G_STMT_END #define IMAGE_FROM_DRAWABLE_3_TESTS(x1,y1,x2,y2,x3,y3) \ - do { \ - IMAGE_FROM_DRAWABLE_TEST (0.0f, 0.0f, x1, y1); \ - IMAGE_FROM_DRAWABLE_TEST (2.0f, 1.0f, x2, y2); \ - IMAGE_FROM_DRAWABLE_TEST (-1.0f, -1.0f, x3, y3); \ - }while(0) + G_STMT_START { \ + IMAGE_FROM_DRAWABLE_TEST (0.0f, 0.0f, x1, y1); \ + IMAGE_FROM_DRAWABLE_TEST (2.0f, 1.0f, x2, y2); \ + IMAGE_FROM_DRAWABLE_TEST (-1.0f, -1.0f, x3, y3); \ + } G_STMT_END PGM_START_TEST (test_image_from_drawable) { @@ -469,9 +468,7 @@ ASSERT_PGM_SUCCESS (pgm_image_set_layout (image, PGM_IMAGE_SCALED)); ASSERT_PGM_SUCCESS (pgm_image_set_alignment (image, PGM_IMAGE_RIGHT)); - /* that 3rd param should be 1024 and not 1023, but there's some rounding error - * happening, not sure this can be fixed without using doubles */ - IMAGE_FROM_DRAWABLE_3_TESTS (-341, 0, 1023, 1024, -1024, -1024); + IMAGE_FROM_DRAWABLE_3_TESTS (-341, 0, 1024, 1024, -1024, -1024); ASSERT_PGM_SUCCESS (pgm_image_set_aspect_ratio (image, old_n, old_d)); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Mar 2008 15:10:34 -0000 1.6 +++ .cvsignore 14 Jul 2008 14:58:46 -0000 1.7 @@ -1 +1 @@ -pigment-0.3.5.tar.gz +pigment-0.3.6.tar.bz2 Index: pigment.spec =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/pigment.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pigment.spec 4 Mar 2008 15:10:34 -0000 1.7 +++ pigment.spec 14 Jul 2008 14:58:46 -0000 1.8 @@ -1,11 +1,12 @@ Summary: Media Center Toolkit Name: pigment -Version: 0.3.5 -Release: 1%{?dist} +Version: 0.3.6 +Release: 4%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://elisa.fluendo.com/ -Source: http://elisa.fluendo.com/static/download/pigment/pigment-%{version}.tar.gz +Source: http://elisa.fluendo.com/static/download/pigment/pigment-%{version}.tar.bz2 +Patch0: pigment-0.3.6-unit-test-rounding-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel BuildRequires: gtk2-devel @@ -16,6 +17,8 @@ BuildRequires: mesa-libGLU-devel Buildrequires: check BuildRequires: gtk-doc +# Temporarily required for autoreconf +BuildRequires: autoconf, automake, libtool %description Pigment is a toolkit for writing Media Center software. @@ -42,6 +45,9 @@ %prep %setup -q +%patch0 -p0 +# Required to get 0.3.6 working. Some lib64 problems. +autoreconf %build @@ -91,6 +97,14 @@ %changelog +* Mon Jul 14 2008 Matthias Saou 0.3.6-4 +- Include upstream patch to fix "make check". +- Run "autoreconf", nothing works when libdir is set to /usr/lib64 otherwise. + +* Fri Jul 11 2008 Matthias Saou 0.3.6-1 +- Update to 0.3.6. +- Temporarily disable "make check", as it's broken in this release. + * Tue Mar 4 2008 Matthias Saou 0.3.5-1 - Update to 0.3.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Mar 2008 15:10:34 -0000 1.6 +++ sources 14 Jul 2008 14:58:46 -0000 1.7 @@ -1 +1 @@ -d63d4e59741af7aa6b5cf8e032643342 pigment-0.3.5.tar.gz +fc74b1ca4c9f3f1b9fe4f1f8cd2b43c9 pigment-0.3.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 14:59:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:39 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchbugzilla Message-ID: <200807141459.m6EExd9x029356@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchbugzilla acl on binutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:59:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:40 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchbugzilla Message-ID: <200807141459.m6EExe3R029372@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchbugzilla acl on binutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:59:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:46 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchbugzilla Message-ID: <200807141459.m6EExe3U029372@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchbugzilla acl on binutils (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:59:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:47 +0000 Subject: [pkgdb] binutils: jkratoch has requested commit Message-ID: <200807141459.m6EExlPv029418@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the commit acl on binutils (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:59:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:50 +0000 Subject: [pkgdb] binutils: jkratoch has requested commit Message-ID: <200807141459.m6EExdA2029356@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the commit acl on binutils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:59:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:56 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchcommits Message-ID: <200807141459.m6EExdA5029356@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchcommits acl on binutils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:59:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:54 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchbugzilla Message-ID: <200807141459.m6EExstK029456@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchbugzilla acl on binutils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 14:59:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 14:59:58 +0000 Subject: [pkgdb] binutils: jkratoch has requested watchcommits Message-ID: <200807141459.m6EExlQ0029418@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has requested the watchcommits acl on binutils (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:00:24 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 14 Jul 2008 15:00:24 GMT Subject: rpms/pigment-python/devel .cvsignore, 1.3, 1.4 pigment-python.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807141500.m6EF0O3A031445@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31317 Modified Files: .cvsignore pigment-python.spec sources Log Message: Update to 0.3.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Mar 2008 15:16:02 -0000 1.3 +++ .cvsignore 14 Jul 2008 14:59:34 -0000 1.4 @@ -1 +1 @@ -pigment-python-0.3.3.tar.gz +pigment-python-0.3.4.tar.bz2 Index: pigment-python.spec =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/pigment-python.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pigment-python.spec 21 Mar 2008 22:26:26 -0000 1.4 +++ pigment-python.spec 14 Jul 2008 14:59:34 -0000 1.5 @@ -3,18 +3,18 @@ Summary: Python bindings to the Pigment Media Center Toolkit Name: pigment-python -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://elisa.fluendo.com/ -Source: http://elisa.fluendo.com/static/download/pigment/pigment-python-%{version}.tar.gz +Source: http://elisa.fluendo.com/static/download/pigment/pigment-python-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gstreamer-python Requires: pygtk2 -Requires: pigment >= 0.3.5 +Requires: pigment >= 0.3.6 BuildRequires: glib2-devel -BuildRequires: pigment-devel >= 0.3.5 +BuildRequires: pigment-devel >= 0.3.6 BuildRequires: python-devel BuildRequires: pygtk2-devel BuildRequires: gstreamer-devel @@ -66,6 +66,9 @@ %changelog +* Fri Jul 11 2008 Matthias Saou 0.3.4-1 +- Update to 0.3.4. + * Tue Mar 4 2008 Matthias Saou 0.3.3-1 - Update to 0.3.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Mar 2008 15:16:02 -0000 1.3 +++ sources 14 Jul 2008 14:59:34 -0000 1.4 @@ -1 +1 @@ -bfbc1976812f07436b57200574369926 pigment-python-0.3.3.tar.gz +880288a8dc070b8daed961dca3317b42 pigment-python-0.3.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 15:02:00 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 15:02:00 GMT Subject: rpms/lucene/devel lucene.spec,1.38,1.39 Message-ID: <200807141502.m6EF20sj005760@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/lucene/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5648 Modified Files: lucene.spec Log Message: * Mon Jul 14 2008 Andrew Overholt 0:2.3.1-3.4 - Update OSGi manifest data for Eclipse SDK 3.4 Index: lucene.spec =================================================================== RCS file: /cvs/pkgs/rpms/lucene/devel/lucene.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- lucene.spec 11 Jul 2008 20:02:02 -0000 1.38 +++ lucene.spec 14 Jul 2008 15:01:11 -0000 1.39 @@ -36,7 +36,7 @@ Summary: High-performance, full-featured text search engine Name: lucene Version: 2.3.1 -Release: 3.3%{?dist} +Release: 3.4%{?dist} Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ @@ -270,7 +270,7 @@ %changelog -* Fri Jul 11 2008 Andrew Overholt 0:2.3.1-3.2 +* Mon Jul 14 2008 Andrew Overholt 0:2.3.1-3.4 - Update OSGi manifest data for Eclipse SDK 3.4 * Wed Jul 9 2008 Tom "spot" Callaway - 0:2.3.1-3.2 From fedora-extras-commits at redhat.com Mon Jul 14 15:10:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:27 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAR8F030192@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchbugzilla acl on binutils (Fedora devel) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:10:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:30 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAU9f030214@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchcommits acl on binutils (Fedora devel) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:10:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:30 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAUQh030217@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the commit acl on binutils (Fedora devel) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:10:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:47 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAlSX030278@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchbugzilla acl on binutils (Fedora 9) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:10:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:52 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAR8I030192@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the commit acl on binutils (Fedora 9) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:10:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:53 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAR8L030192@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchcommits acl on binutils (Fedora 9) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:10:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:57 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAU9i030214@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchbugzilla acl on binutils (Fedora 8) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:10:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:10:58 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141510.m6EFAU9l030214@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchcommits acl on binutils (Fedora 8) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:11:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:11:03 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141511.m6EFAUQk030217@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchbugzilla acl on binutils (Fedora 7) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:11:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:11:06 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141511.m6EFAlSa030278@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the watchcommits acl on binutils (Fedora 7) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:11:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:11:09 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141511.m6EFB9wO030444@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the commit acl on binutils (Fedora 7) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:02 +0000 Subject: [pkgdb] binutils: jakub has requested watchbugzilla Message-ID: <200807141512.m6EFAUQm030217@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the watchbugzilla acl on binutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:04 +0000 Subject: [pkgdb] binutils: jakub has requested watchcommits Message-ID: <200807141512.m6EFAlSc030278@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the watchcommits acl on binutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:09 +0000 Subject: [pkgdb] binutils: jakub has requested commit Message-ID: <200807141512.m6EFC9Hb030565@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the commit acl on binutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:32 +0000 Subject: [pkgdb] binutils: jakub has requested approveacls Message-ID: <200807141512.m6EFCXfs030613@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the approveacls acl on binutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:41 +0000 Subject: [pkgdb] binutils: jakub has requested watchbugzilla Message-ID: <200807141512.m6EFC9Hd030565@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the watchbugzilla acl on binutils (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:45 +0000 Subject: [pkgdb] binutils: jakub has requested commit Message-ID: <200807141512.m6EFAlSe030278@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the commit acl on binutils (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:45 +0000 Subject: [pkgdb] binutils: jakub has requested approveacls Message-ID: <200807141512.m6EFCje9030669@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the approveacls acl on binutils (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:50 +0000 Subject: [pkgdb] binutils: jakub has requested watchbugzilla Message-ID: <200807141512.m6EFC9Hf030565@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the watchbugzilla acl on binutils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:52 +0000 Subject: [pkgdb] binutils: jakub has requested commit Message-ID: <200807141512.m6EFAUQo030217@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the commit acl on binutils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:52 +0000 Subject: [pkgdb] binutils: jakub has requested watchcommits Message-ID: <200807141512.m6EFCXfu030613@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the watchcommits acl on binutils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:56 +0000 Subject: [pkgdb] binutils: jakub has requested approveacls Message-ID: <200807141512.m6EFCXfw030613@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the approveacls acl on binutils (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:12:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:12:59 +0000 Subject: [pkgdb] binutils: jakub has requested watchbugzilla Message-ID: <200807141512.m6EFCxKC030769@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the watchbugzilla acl on binutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:00 +0000 Subject: [pkgdb] binutils: jakub has requested watchcommits Message-ID: <200807141513.m6EFC9Hh030565@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the watchcommits acl on binutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:02 +0000 Subject: [pkgdb] binutils: jakub has requested commit Message-ID: <200807141513.m6EFCjeB030669@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the commit acl on binutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:04 +0000 Subject: [pkgdb] binutils: jakub has requested approveacls Message-ID: <200807141513.m6EFCXg0030613@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has requested the approveacls acl on binutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:17 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141513.m6EFDIts030866@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the approveacls acl on binutils (Fedora 9) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:19 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141513.m6EFDJJT030888@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the approveacls acl on binutils (Fedora 8) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:26 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141513.m6EFDJJW030888@bastion.fedora.phx.redhat.com> Jakub Jelinek (jakub) has set the approveacls acl on binutils (Fedora devel) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:38 +0000 Subject: [pkgdb] binutils ownership updated Message-ID: <200807141513.m6EFCxKH030769@bastion.fedora.phx.redhat.com> Package binutils in Fedora 7 was orphaned by Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:47 +0000 Subject: [pkgdb] binutils ownership updated Message-ID: <200807141513.m6EFDItx030866@bastion.fedora.phx.redhat.com> Package binutils in Fedora 8 was orphaned by Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:54 +0000 Subject: [pkgdb] binutils ownership updated Message-ID: <200807141513.m6EFDwbB031020@bastion.fedora.phx.redhat.com> Package binutils in Fedora 9 was orphaned by Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:13:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:13:59 +0000 Subject: [pkgdb] binutils ownership updated Message-ID: <200807141514.m6EFDJJb030888@bastion.fedora.phx.redhat.com> Package binutils in Fedora devel was orphaned by Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:15:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:15:04 +0000 Subject: [pkgdb] binutils ownership updated Message-ID: <200807141515.m6EFF4ip031129@bastion.fedora.phx.redhat.com> Package binutils in Fedora 8 is now owned by Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:15:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:15:25 +0000 Subject: [pkgdb] binutils ownership updated Message-ID: <200807141515.m6EFFPOZ031165@bastion.fedora.phx.redhat.com> Package binutils in Fedora devel is now owned by Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:15:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:15:31 +0000 Subject: [pkgdb] binutils ownership updated Message-ID: <200807141515.m6EFFVlx031190@bastion.fedora.phx.redhat.com> Package binutils in Fedora 9 is now owned by Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:22 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFFPOc031165@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchcommits acl on binutils (Fedora devel) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:22 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGMpg031245@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchbugzilla acl on binutils (Fedora devel) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:25 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGPki031282@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the commit acl on binutils (Fedora devel) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:25 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFFPOf031165@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the approveacls acl on binutils (Fedora devel) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:35 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGPkl031282@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchbugzilla acl on binutils (Fedora 8) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:35 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGMpj031245@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchcommits acl on binutils (Fedora 8) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:36 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGa6a031345@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the approveacls acl on binutils (Fedora 8) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:39 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGdFl031382@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the commit acl on binutils (Fedora 8) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:40 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGdFo031382@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchbugzilla acl on binutils (Fedora 9) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:43 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGa6d031345@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchcommits acl on binutils (Fedora 9) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:16:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:16:44 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141516.m6EFGPko031282@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the commit acl on binutils (Fedora 9) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:17:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:17:31 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141517.m6EFGMpm031245@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the commit acl on binutils (Fedora 8) to Approved for Jan Kratochvil (jkratoch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:17:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:17:39 +0000 Subject: [pkgdb] binutils had acl change status Message-ID: <200807141517.m6EFHd0P031578@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the approveacls acl on binutils (Fedora 9) to Approved for Jakub Jelinek (jakub) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/binutils From fedora-extras-commits at redhat.com Mon Jul 14 15:26:39 2008 From: fedora-extras-commits at redhat.com (Fernando Nasser (fnasser)) Date: Mon, 14 Jul 2008 15:26:39 GMT Subject: rpms/jakarta-commons-el pkg.acl,1.2,1.3 Message-ID: <200807141526.m6EFQdJQ007815@cvs-int.fedora.redhat.com> Author: fnasser Update of /cvs/extras/rpms/jakarta-commons-el In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7690 Modified Files: pkg.acl Log Message: Give commit access to Andrew Index: pkg.acl =================================================================== RCS file: /cvs/extras/rpms/jakarta-commons-el/pkg.acl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pkg.acl 20 Jul 2007 20:06:40 -0000 1.2 +++ pkg.acl 14 Jul 2008 15:25:41 -0000 1.3 @@ -1 +1 @@ -bkonrath +overholt From fedora-extras-commits at redhat.com Mon Jul 14 15:26:46 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Mon, 14 Jul 2008 15:26:46 GMT Subject: rpms/vym/devel vym.spec,1.9,1.10 Message-ID: <200807141526.m6EFQkAO007843@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/vym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7708 Modified Files: vym.spec Log Message: Oops. Index: vym.spec =================================================================== RCS file: /cvs/pkgs/rpms/vym/devel/vym.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vym.spec 14 Jul 2008 14:57:24 -0000 1.9 +++ vym.spec 14 Jul 2008 15:25:51 -0000 1.10 @@ -9,8 +9,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: vym.xml -Patch3: vym-0.10.0-editxlinkdialog-typeinfo.patch -Patch7: vym-1.10.0-ornamentedobj-typeinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,9 +23,6 @@ %prep %setup -q -%patch3 -p0 -%patch7 -p0 - %build qmake-qt4 DOCDIR="%{_docdir}/%{name}-%{version}" PREFIX=%{_prefix} @@ -94,7 +89,7 @@ %changelog * Mon Jul 14 2008 Jon Ciesla - 1.12.0-1 - Updated to new upstream version. -- Dropped several patches, applied upstream. +- Dropped all patches, applied upstream. * Tue Jun 10 2008 Jon Ciesla - 1.10.0-4 - Added mime type xml, BZ434929. From fedora-extras-commits at redhat.com Mon Jul 14 15:29:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 15:29:31 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.127,1.128 Message-ID: <200807141529.m6EFTVgo008328@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8167 Modified Files: kdebindings.spec Log Message: * Mon Jul 14 2008 Rex Dieter 4.0.98-2 - omit smoke, ruby bindings (build failures, sorting out upstream) - -devel: -BR: PyQt4-devel Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- kdebindings.spec 11 Jul 2008 20:02:15 -0000 1.127 +++ kdebindings.spec 14 Jul 2008 15:28:38 -0000 1.128 @@ -5,11 +5,15 @@ # default? There are bindings for QScintilla, Plasma and Nepomuk/Soprano. -- Kevin # define to enable these optional bits -%define ruby 1 -%define smoke 1 -%define devel 1 +#define csharp 1 +#define ruby 1 +#define smoke 1 #define php 1 +%if 0%{?ruby}%{?smoke} +%define devel 1 +%endif + %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]") @@ -18,7 +22,7 @@ Name: kdebindings Version: 4.0.98 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -32,17 +36,16 @@ BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} -BuildRequires: kdegraphics-devel >= 7:%{version} +BuildRequires: kdegraphics4-devel >= %{version} BuildRequires: soprano-devel >= 2.0.97 BuildRequires: cmake -# FIMXE:TODO: disabled for now -#BuildRequires: mono-core +%{?csharp:BuildRequires: mono-core} BuildRequires: python-devel -BuildRequires: ruby-devel ruby +%{?ruby:BuildRequires: ruby-devel ruby} BuildRequires: giflib-devel BuildRequires: pcre-devel # causes smokeqt to fail to build -#BuildRequires: qwt-devel +#{?smoke:BuildRequires: qwt-devel} BuildRequires: PyQt4-devel %if 0%{?fedora} > 8 BuildRequires: qscintilla-devel >= 2 @@ -79,7 +82,6 @@ Summary: Header files for %{name} Requires: %{name} = %{version}-%{release} Requires: kdelibs4-devel kdebase-workspace-devel -Requires: PyQt4-devel %description devel Header files for developing applications using %{name}. @@ -95,14 +97,15 @@ pushd %{_target_platform} # FIXME/TODO: Get csharp to compile %{cmake_kde4} \ - -DBUILD_csharp=OFF \ + %{!?csharp:-DBUILD_csharp=OFF} \ %{!?php:-DBUILD_php=OFF} \ %{!?ruby:-DBUILD_ruby=OFF} -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} \ %{!?smoke:-DBUILD_smoke=OFF} \ .. popd -make %{?_smp_mflags} -C %{_target_platform} +# smp build not recommended (upstream) +make -C %{_target_platform} %install @@ -166,6 +169,10 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4.0.98-2 +- omit smoke, ruby bindings (build failures, sorting out upstream) +- -devel: -BR: PyQt4-devel + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 From fedora-extras-commits at redhat.com Mon Jul 14 15:32:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:32:14 GMT Subject: rpms/CastPodder/devel CastPodder.spec,1.3,1.4 Message-ID: <200807141532.m6EFWErb008932@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/CastPodder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8753 Modified Files: CastPodder.spec Log Message: fix license tag Index: CastPodder.spec =================================================================== RCS file: /cvs/pkgs/rpms/CastPodder/devel/CastPodder.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CastPodder.spec 14 Sep 2006 18:50:12 -0000 1.3 +++ CastPodder.spec 14 Jul 2008 15:31:44 -0000 1.4 @@ -1,8 +1,8 @@ Name: CastPodder Version: 5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: CastPodder is a Media Aggregator -License: GPL +License: GPLv2+ URL: http://dev-1.borgforge.net:82/castpodder/wiki/Downloads Group: Applications/Multimedia Source: http://dev-1.borgforge.net/castpodder/chrome/site/downloads/%{name}-%{version}.tar.bz2 @@ -100,6 +100,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 5.0-9 +- fix license tag + * Thu Sep 14 2006 Paul F. Johnson 5.0-8 - Fixed ownership problem From fedora-extras-commits at redhat.com Mon Jul 14 15:32:21 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Mon, 14 Jul 2008 15:32:21 GMT Subject: rpms/kexec-tools/devel kexec-tools-1.102pre-x86-phys_base.patch, 1.1, 1.2 Message-ID: <200807141532.m6EFWLF1009001@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/kexec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8710 Modified Files: kexec-tools-1.102pre-x86-phys_base.patch Log Message: fixing some patch fuzz kexec-tools-1.102pre-x86-phys_base.patch: Index: kexec-tools-1.102pre-x86-phys_base.patch =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools-1.102pre-x86-phys_base.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kexec-tools-1.102pre-x86-phys_base.patch 5 Jun 2008 15:18:53 -0000 1.1 +++ kexec-tools-1.102pre-x86-phys_base.patch 14 Jul 2008 15:31:29 -0000 1.2 @@ -1,7 +1,7 @@ diff -up kexec-tools-testing-20070330/makedumpfile/x86_64.c.orig kexec-tools-testing-20070330/makedumpfile/x86_64.c ---- kexec-tools-testing-20070330/makedumpfile/x86_64.c.orig 2008-04-10 11:59:09.000000000 -0400 -+++ kexec-tools-testing-20070330/makedumpfile/x86_64.c 2008-04-10 11:59:52.000000000 -0400 -@@ -71,12 +71,11 @@ vaddr_to_offset_x86_64(unsigned long vad +--- kexec-tools-testing-20070330/makedumpfile/x86_64.c.orig 2008-06-05 01:30:57.000000000 -0400 ++++ kexec-tools-testing-20070330/makedumpfile/x86_64.c 2008-07-14 11:30:05.000000000 -0400 +@@ -148,12 +148,11 @@ vaddr_to_offset_x86_64(unsigned long vad struct pt_load_segment *pls; /* @@ -16,5 +16,5 @@ - phys_base = 0; + phys_base = info->phys_base; - if (vaddr >= __START_KERNEL_map) - paddr = vaddr - __START_KERNEL_map + phys_base; + if (is_vmalloc_addr(vaddr)) { + if ((paddr = vtop4_x86_64(vaddr)) == NOT_PADDR) { From fedora-extras-commits at redhat.com Mon Jul 14 15:35:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:35:44 GMT Subject: rpms/DMitry/devel DMitry.spec,1.3,1.4 Message-ID: <200807141535.m6EFZi81009181@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/DMitry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9114 Modified Files: DMitry.spec Log Message: fix license tag Index: DMitry.spec =================================================================== RCS file: /cvs/pkgs/rpms/DMitry/devel/DMitry.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DMitry.spec 20 Feb 2008 00:05:35 -0000 1.3 +++ DMitry.spec 14 Jul 2008 15:34:39 -0000 1.4 @@ -1,10 +1,11 @@ Name: DMitry Version: 1.3a -Release: 3%{?dist} +Release: 4%{?dist} Summary: Deepmagic Information Gathering Tool Group: Applications/Internet -License: GPL +# No version specified, no license attribution in code, just COPYING. +License: GPL+ URL: http://www.mor-pah.net/ Source0: http://mor-pah.net/code/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +44,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.3a-4 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.3a-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 15:40:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:40:44 GMT Subject: rpms/JSDoc/devel JSDoc.spec,1.2,1.3 Message-ID: <200807141540.m6EFei0D009732@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/JSDoc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9574 Modified Files: JSDoc.spec Log Message: fix license tag Index: JSDoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/JSDoc/devel/JSDoc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JSDoc.spec 25 Jul 2007 12:35:30 -0000 1.2 +++ JSDoc.spec 14 Jul 2008 15:39:44 -0000 1.3 @@ -1,9 +1,10 @@ Name: JSDoc Version: 1.10.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Produces javadoc-style documentation from JavaScript sourcefiles Group: Development/Tools -License: GPL +# No license attribution in code, only COPYING. +License: GPL+ URL: http://jsdoc.sourceforge.net Source0: http://downloads.sourceforge.net/jsdoc/%{name}-%{version}.tgz Source1: %{name}-COPYING.txt.gz @@ -54,6 +55,9 @@ %{_datadir}/jsdoc %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.10.2-5 +- fix license tag + * Sun Jul 1 2007 Matej Cepl - 1.10.2-4 - Administrative increase of the release in order to overcome screwed up tagging in Fedora CVS. From fedora-extras-commits at redhat.com Mon Jul 14 15:43:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:43:49 GMT Subject: rpms/MegaMek/devel MegaMek.spec,1.3,1.4 Message-ID: <200807141543.m6EFhneo010185@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/MegaMek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10142 Modified Files: MegaMek.spec Log Message: fix license tag Index: MegaMek.spec =================================================================== RCS file: /cvs/pkgs/rpms/MegaMek/devel/MegaMek.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- MegaMek.spec 19 Feb 2008 03:01:32 -0000 1.3 +++ MegaMek.spec 14 Jul 2008 15:43:19 -0000 1.4 @@ -1,11 +1,11 @@ # camel-case name at the request of the upstream maintainers. Name: MegaMek Version: 0.30.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A portable, network-enabled BattleTech engine Group: Amusements/Games -License: GPL +License: GPLv2+ URL: http://prdownloads.sourceforge.net/megamek/MegaMek-v0.30.11.zip Source0: MegaMek-v0.30.11.zip # converted from data/images/misc/megamek-icon.gif @@ -154,6 +154,9 @@ %attr(-,root,root) %{_libdir}/gcj/%{name}/MegaMek.jar.* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.30.11-4 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.30.11-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 15:45:55 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Mon, 14 Jul 2008 15:45:55 GMT Subject: rpms/vym/F-9 sources,1.3,1.4 vym.spec,1.7,1.8 Message-ID: <200807141545.m6EFjtd4010477@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/vym/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10315 Modified Files: sources vym.spec Log Message: New upstream, BZ 455254. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vym/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Oct 2007 18:31:59 -0000 1.3 +++ sources 14 Jul 2008 15:44:37 -0000 1.4 @@ -1 +1 @@ -188f08f2e0af5e122e2613351f3b92d9 vym-1.10.0.tar.bz2 +699cc2c7f605490a6ef79fbaaf4ffc25 vym-1.12.0.tar.bz2 Index: vym.spec =================================================================== RCS file: /cvs/pkgs/rpms/vym/F-9/vym.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vym.spec 12 Jun 2008 18:18:33 -0000 1.7 +++ vym.spec 14 Jul 2008 15:44:37 -0000 1.8 @@ -1,6 +1,6 @@ Name: vym -Version: 1.10.0 -Release: 4%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: View your mind Group: Applications/Productivity @@ -9,14 +9,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: vym.xml -Patch0: vym-1.10.0-dir-vars.patch -Patch1: vym-1.10.0-docdir-searchList.patch -Patch2: vym-1.10.0-xdg-open.patch -Patch3: vym-0.10.0-editxlinkdialog-typeinfo.patch -Patch4: vym-0.10.0-selection-typeinfo.patch -Patch5: vym-0.10.0-mainwindow-typeinfo.patch -Patch6: vym-0.10.0-xml-vym-typeinfo.patch -Patch7: vym-1.10.0-ornamentedobj-typeinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,15 +23,6 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 -%patch3 -p0 -%patch4 -p0 -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 - %build qmake-qt4 DOCDIR="%{_docdir}/%{name}-%{version}" PREFIX=%{_prefix} @@ -102,7 +85,12 @@ %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/mime/packages/vym.xml + %changelog +* Mon Jul 14 2008 Jon Ciesla - 1.12.0-1 +- Updated to new upstream version. +- Dropped all patches, applied upstream. + * Tue Jun 10 2008 Jon Ciesla - 1.10.0-4 - Added mime type xml, BZ434929. From fedora-extras-commits at redhat.com Mon Jul 14 15:49:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:49:28 GMT Subject: rpms/MochiKit/devel MochiKit.spec,1.2,1.3 Message-ID: <200807141549.m6EFnSAv010617@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/MochiKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10581 Modified Files: MochiKit.spec Log Message: fix license tag Index: MochiKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/MochiKit/devel/MochiKit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MochiKit.spec 21 May 2006 05:36:26 -0000 1.2 +++ MochiKit.spec 14 Jul 2008 15:48:44 -0000 1.3 @@ -1,10 +1,10 @@ Name: MochiKit Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight JavaScript library Group: Applications/Internet -License: MIT/Academic +License: MIT or AFL URL: http://www.mochikit.com/ Source0: http://www.mochikit.com/dist/%{name}-%{version}.zip Source1: %{name}.conf @@ -41,6 +41,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 1.3.1-2 +- fix license tag + * Sun May 21 2006 Ignacio Vazquez-Abrams 1.3.1-1 - Upstream update From fedora-extras-commits at redhat.com Mon Jul 14 15:51:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:51:35 GMT Subject: rpms/MyPasswordSafe/devel MyPasswordSafe.spec,1.6,1.7 Message-ID: <200807141551.m6EFpZUN010745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/MyPasswordSafe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10704 Modified Files: MyPasswordSafe.spec Log Message: fix license tag Index: MyPasswordSafe.spec =================================================================== RCS file: /cvs/pkgs/rpms/MyPasswordSafe/devel/MyPasswordSafe.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MyPasswordSafe.spec 5 Apr 2008 15:05:57 -0000 1.6 +++ MyPasswordSafe.spec 14 Jul 2008 15:50:42 -0000 1.7 @@ -2,11 +2,11 @@ Name: MyPasswordSafe Version: 0.6.7 -Release: 5.%{datever}%{?dist} +Release: 6.%{datever}%{?dist} Summary: A graphical password management tool Group: Applications/Databases -License: GPL +License: GPLv2+ URL: http://www.semanticgap.com/myps/ Source0: http://www.semanticgap.com/myps/release/MyPasswordSafe-%{datever}.src.tgz Source1: MyPasswordSafe.desktop @@ -74,6 +74,9 @@ %{_datadir}/applications/fedora-MyPasswordSafe.desktop %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 0.6.7-6.20061216 +- fix license tag + * Sat Apr 05 2008 Ralf Ertzinger 0.6.7-5.20061216 - Change BuildRequires to qt3-devel From fedora-extras-commits at redhat.com Mon Jul 14 15:54:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:54:26 +0000 Subject: [pkgdb] objectweb-asm had acl change status Message-ID: <200807141554.m6EFsQv1000762@bastion.fedora.phx.redhat.com> Fernando Nasser (fnasser) has set the commit acl on objectweb-asm (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/objectweb-asm From fedora-extras-commits at redhat.com Mon Jul 14 15:54:48 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 14 Jul 2008 15:54:48 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1577,1.1578 Message-ID: <200807141554.m6EFsmPx010932@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10863 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#455267# Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1577 retrieving revision 1.1578 diff -u -r1.1577 -r1.1578 --- openoffice.org.spec 12 Jul 2008 18:27:40 -0000 1.1577 +++ openoffice.org.spec 14 Jul 2008 15:53:48 -0000 1.1578 @@ -2962,7 +2962,7 @@ %pre presentation-minimizer if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d\\\" -f 2` || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` || : fi %post presentation-minimizer @@ -2972,7 +2972,7 @@ %preun presentation-minimizer if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d\\\" -f 2` || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` || : fi %postun presentation-minimizer @@ -2986,7 +2986,7 @@ %pre presenter-screen if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\\\" -f 2` || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` || : fi %post presenter-screen @@ -2996,7 +2996,7 @@ %preun presenter-screen if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\\\" -f 2` || : + unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` || : fi %postun presenter-screen From fedora-extras-commits at redhat.com Mon Jul 14 15:56:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:56:32 +0000 Subject: [pkgdb] beldi was added for robert Message-ID: <200807141556.m6EFuWLg000914@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package beldi with summary Belug Linux Distribution Burner Kevin Fenzi (kevin) has approved Package beldi Kevin Fenzi (kevin) has added a Fedora devel branch for beldi with an owner of robert Kevin Fenzi (kevin) has approved beldi in Fedora devel Kevin Fenzi (kevin) has approved Package beldi Kevin Fenzi (kevin) has set commit to Approved for cvsextras on beldi (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on beldi (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on beldi (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/beldi From fedora-extras-commits at redhat.com Mon Jul 14 15:56:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:56:49 +0000 Subject: [pkgdb] beldi (Fedora, 9) updated by kevin Message-ID: <200807141556.m6EFun1N000952@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for beldi Kevin Fenzi (kevin) has set commit to Approved for cvsextras on beldi (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on beldi (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on beldi (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on beldi (Fedora 9) for cwickert Kevin Fenzi (kevin) approved watchcommits on beldi (Fedora 9) for cwickert Kevin Fenzi (kevin) approved commit on beldi (Fedora 9) for cwickert Kevin Fenzi (kevin) approved build on beldi (Fedora 9) for cwickert Kevin Fenzi (kevin) approved approveacls on beldi (Fedora 9) for cwickert Kevin Fenzi (kevin) Approved cvsextras for commit access on beldi (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/beldi From fedora-extras-commits at redhat.com Mon Jul 14 15:56:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:56:49 +0000 Subject: [pkgdb] beldi (Fedora, devel) updated by kevin Message-ID: <200807141556.m6EFun1L000952@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on beldi (Fedora devel) for cwickert Kevin Fenzi (kevin) approved watchcommits on beldi (Fedora devel) for cwickert Kevin Fenzi (kevin) approved commit on beldi (Fedora devel) for cwickert Kevin Fenzi (kevin) approved build on beldi (Fedora devel) for cwickert Kevin Fenzi (kevin) approved approveacls on beldi (Fedora devel) for cwickert Kevin Fenzi (kevin) Approved cvsextras for commit access on beldi (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/beldi From fedora-extras-commits at redhat.com Mon Jul 14 15:56:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:56:49 +0000 Subject: [pkgdb] beldi (Fedora, 8) updated by kevin Message-ID: <200807141556.m6EFun1J000952@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for beldi Kevin Fenzi (kevin) has set commit to Approved for cvsextras on beldi (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on beldi (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on beldi (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on beldi (Fedora 8) for cwickert Kevin Fenzi (kevin) approved watchcommits on beldi (Fedora 8) for cwickert Kevin Fenzi (kevin) approved commit on beldi (Fedora 8) for cwickert Kevin Fenzi (kevin) approved build on beldi (Fedora 8) for cwickert Kevin Fenzi (kevin) approved approveacls on beldi (Fedora 8) for cwickert Kevin Fenzi (kevin) Approved cvsextras for commit access on beldi (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/beldi From fedora-extras-commits at redhat.com Mon Jul 14 15:57:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:57:15 GMT Subject: rpms/PyXML/devel PyXML.spec,1.31,1.32 Message-ID: <200807141557.m6EFvFnO011172@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/PyXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11048 Modified Files: PyXML.spec Log Message: fix license tag Index: PyXML.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyXML/devel/PyXML.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- PyXML.spec 19 Feb 2008 10:40:37 -0000 1.31 +++ PyXML.spec 14 Jul 2008 15:56:24 -0000 1.32 @@ -1,12 +1,12 @@ Summary: XML libraries for python. Name: PyXML Version: 0.8.4 -Release: 9 +Release: 10 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz Patch0: PyXML-0.7.1-intern.patch Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch Patch2: PyXML-memmove.patch -License: Apacheish +License: MIT and Python and ZPLv1.0 and BSD Group: Development/Libraries Requires: python URL: http://pyxml.sourceforge.net/ @@ -60,6 +60,9 @@ %{_libdir}/python?.?/site-packages/_xmlplus %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.8.4-10 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.4-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 15:57:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 15:57:23 GMT Subject: rpms/beldi - New directory Message-ID: <200807141557.m6EFvNVe011250@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/beldi In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11109/rpms/beldi Log Message: Directory /cvs/extras/rpms/beldi added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 15:57:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 15:57:52 GMT Subject: rpms/beldi/devel - New directory Message-ID: <200807141557.m6EFvqoI011283@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/beldi/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11109/rpms/beldi/devel Log Message: Directory /cvs/extras/rpms/beldi/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 15:58:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 15:58:11 GMT Subject: rpms/beldi Makefile,NONE,1.1 Message-ID: <200807141558.m6EFwBVF011326@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/beldi In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11109/rpms/beldi Added Files: Makefile Log Message: Setup of module beldi --- NEW FILE Makefile --- # Top level Makefile for module beldi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 15:58:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:58:34 +0000 Subject: [pkgdb] libssh2 (Fedora EPEL, 4) updated by kevin Message-ID: <200807141558.m6EFwYZd001194@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for libssh2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libssh2 (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libssh2 (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libssh2 (Fedora EPEL 4) Kevin Fenzi (kevin) changed owner of libssh2 in Fedora EPEL 4 to djuran To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libssh2 From fedora-extras-commits at redhat.com Mon Jul 14 15:58:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:58:34 +0000 Subject: [pkgdb] libssh2 (Fedora EPEL, 5) updated by kevin Message-ID: <200807141558.m6EFwYZg001194@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for libssh2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libssh2 (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libssh2 (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libssh2 (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of libssh2 in Fedora EPEL 5 to djuran To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libssh2 From fedora-extras-commits at redhat.com Mon Jul 14 15:58:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 15:58:40 GMT Subject: rpms/beldi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807141558.m6EFwe5Z011422@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/beldi/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11109/rpms/beldi/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module beldi --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: beldi # $Id: Makefile,v 1.1 2008/07/14 15:58:12 kevin Exp $ NAME := beldi SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 15:58:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 15:58:57 GMT Subject: rpms/R-systemfit/devel R-systemfit.spec,1.4,1.5 Message-ID: <200807141558.m6EFwv8o011555@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R-systemfit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11308 Modified Files: R-systemfit.spec Log Message: fix license tag Index: R-systemfit.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-systemfit/devel/R-systemfit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- R-systemfit.spec 7 May 2008 23:09:28 -0000 1.4 +++ R-systemfit.spec 14 Jul 2008 15:57:54 -0000 1.5 @@ -4,8 +4,8 @@ Summary: Simultaneous Equation Estimation R Package Name: R-%{packname} Version: 1.0 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ Group: Applications/Engineering Source0: http://www.uni-kiel.de/agrarpol/ahenningsen/systemfit/%{packname}_%{version}-%{packrel}.tar.gz URL: http://www.systemfit.org/ @@ -77,6 +77,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0-2 +- fix license tag + * Thu Feb 14 2008 Orion Poplawski - 1.0-1 - Update to 1.0-2 From fedora-extras-commits at redhat.com Mon Jul 14 15:59:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:59:08 +0000 Subject: [pkgdb] libssh2 (Fedora, 9) updated by kevin Message-ID: <200807141559.m6EFx8Bx001291@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on libssh2 (Fedora 9) for djuran Kevin Fenzi (kevin) approved watchcommits on libssh2 (Fedora 9) for djuran To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libssh2 From fedora-extras-commits at redhat.com Mon Jul 14 15:59:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:59:08 +0000 Subject: [pkgdb] libssh2 (Fedora, devel) updated by kevin Message-ID: <200807141559.m6EFx8C2001291@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on libssh2 (Fedora devel) for djuran Kevin Fenzi (kevin) approved watchcommits on libssh2 (Fedora devel) for djuran To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libssh2 From fedora-extras-commits at redhat.com Mon Jul 14 15:59:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:59:08 +0000 Subject: [pkgdb] libssh2 (Fedora, 8) updated by kevin Message-ID: <200807141559.m6EFx8C5001291@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on libssh2 (Fedora 8) for djuran Kevin Fenzi (kevin) approved watchcommits on libssh2 (Fedora 8) for djuran To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libssh2 From fedora-extras-commits at redhat.com Mon Jul 14 15:59:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 15:59:09 +0000 Subject: [pkgdb] jakarta-commons-el had acl change status Message-ID: <200807141559.m6EFxBbC001351@bastion.fedora.phx.redhat.com> Fernando Nasser (fnasser) has set the commit acl on jakarta-commons-el (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-el From fedora-extras-commits at redhat.com Mon Jul 14 15:59:39 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 15:59:39 GMT Subject: rpms/objectweb-asm/devel asm-MANIFEST.MF, NONE, 1.1 objectweb-asm.spec, 1.3, 1.4 Message-ID: <200807141559.m6EFxdlu011752@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/objectweb-asm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11537 Modified Files: objectweb-asm.spec Added Files: asm-MANIFEST.MF Log Message: * Mon Jul 14 2008 Andrew Overholt 0:3.1-2.3 - Build and ship asm-all.jar with OSGi manifest (Alexander Kurtakov) --- NEW FILE asm-MANIFEST.MF --- Manifest-Version: 1.0 Bundle-RequiredExecutionEnvironment: J2SE-1.3 Bundle-SymbolicName: org.objectweb.asm Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Version: 3.1.0.v200803061910 Bundle-Vendor: %providerName Export-Package: org.objectweb.asm;version="3.1.0",org.objectweb.asm.co mmons;version="3.1.0",org.objectweb.asm.signature;version="3.1.0",org .objectweb.asm.tree;version="3.1.0",org.objectweb.asm.tree.analysis;v ersion="3.1.0",org.objectweb.asm.util;version="3.1.0",org.objectweb.a sm.xml;version="3.1.0" Index: objectweb-asm.spec =================================================================== RCS file: /cvs/pkgs/rpms/objectweb-asm/devel/objectweb-asm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- objectweb-asm.spec 9 Jul 2008 21:09:44 -0000 1.3 +++ objectweb-asm.spec 14 Jul 2008 15:58:46 -0000 1.4 @@ -32,14 +32,14 @@ Name: objectweb-asm Version: 3.1 -Release: 2.2%{dist} +Release: 2.3%{dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD URL: http://asm.objectweb.org/ Group: Development/Libraries/Java Source0: http://download.forge.objectweb.org/asm/asm-3.1.tar.gz - +Source1: asm-MANIFEST.MF BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: ant BuildRequires: objectweb-anttask @@ -67,6 +67,11 @@ %build ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc +# inject OSGi manifests +mkdir -p META-INF +cp %{SOURCE1} META-INF/MANIFEST.MF +zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF + %install rm -rf $RPM_BUILD_ROOT @@ -78,9 +83,15 @@ $RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar}` done +install -m 644 output/dist/lib/all/asm-all-%{version}.jar \ +$RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all-%{version}.jar + + (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \ ln -sf ${jar} ${jar/-%{version}/}; done) + + # javadoc install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} @@ -103,6 +114,9 @@ %{_javadocdir}/%{name}-%{version}/* %changelog +* Mon Jul 14 2008 Andrew Overholt 0:3.1-2.3 +- Build and ship asm-all.jar with OSGi manifest (Alexander Kurtakov) + * Wed Jul 9 2008 Tom "spot" Callaway - 0:3.1-2.2 - drop repotag From fedora-extras-commits at redhat.com Mon Jul 14 16:00:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 16:00:57 GMT Subject: rpms/SDL/devel SDL.spec,1.60,1.61 Message-ID: <200807141600.m6EG0vgs011888@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/SDL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830 Modified Files: SDL.spec Log Message: fix license tag Index: SDL.spec =================================================================== RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- SDL.spec 28 May 2008 19:48:21 -0000 1.60 +++ SDL.spec 14 Jul 2008 16:00:05 -0000 1.61 @@ -1,7 +1,7 @@ Summary: A cross-platform multimedia library Name: SDL Version: 1.2.13 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Source1: SDL_config.h # Temporary hack: Use pulseaudio via esd so SDL apps don't lock up when they @@ -21,7 +21,7 @@ Patch27: SDL-1.2.13-pulse-rework.patch URL: http://www.libsdl.org/ -License: LGPL +License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: arts-devel audiofile-devel @@ -155,6 +155,9 @@ %{_libdir}/lib*.a %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 1.2.13-5 +- fix license tag + * Wed May 28 2008 Dennis Gilmore 1.2.13-4 - fix sparc multilib handling From fedora-extras-commits at redhat.com Mon Jul 14 16:02:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:02:05 +0000 Subject: [pkgdb] almanah was added for lokthare Message-ID: <200807141602.m6EG25TG001547@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package almanah with summary An application to allow you to keep a diary of your life Kevin Fenzi (kevin) has approved Package almanah Kevin Fenzi (kevin) has added a Fedora devel branch for almanah with an owner of lokthare Kevin Fenzi (kevin) has approved almanah in Fedora devel Kevin Fenzi (kevin) has approved Package almanah Kevin Fenzi (kevin) has set commit to Approved for cvsextras on almanah (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on almanah (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on almanah (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/almanah From fedora-extras-commits at redhat.com Mon Jul 14 16:02:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:02:07 +0000 Subject: [pkgdb] almanah (Fedora, 9) updated by kevin Message-ID: <200807141602.m6EG27km001567@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for almanah Kevin Fenzi (kevin) has set commit to Approved for cvsextras on almanah (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on almanah (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on almanah (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on almanah (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/almanah From fedora-extras-commits at redhat.com Mon Jul 14 16:02:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:02:07 +0000 Subject: [pkgdb] almanah (Fedora, devel) updated by kevin Message-ID: <200807141602.m6EG27kp001567@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on almanah (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/almanah From fedora-extras-commits at redhat.com Mon Jul 14 16:02:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:02:39 GMT Subject: rpms/almanah - New directory Message-ID: <200807141602.m6EG2dYR018702@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/almanah In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh18653/rpms/almanah Log Message: Directory /cvs/extras/rpms/almanah added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 16:03:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:03:03 GMT Subject: rpms/almanah/devel - New directory Message-ID: <200807141603.m6EG33Dl018731@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/almanah/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh18653/rpms/almanah/devel Log Message: Directory /cvs/extras/rpms/almanah/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 16:03:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:03:21 GMT Subject: rpms/almanah Makefile,NONE,1.1 Message-ID: <200807141603.m6EG3LF1018767@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/almanah In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh18653/rpms/almanah Added Files: Makefile Log Message: Setup of module almanah --- NEW FILE Makefile --- # Top level Makefile for module almanah all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 16:03:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:03:35 +0000 Subject: [pkgdb] pear-Net-DNS was added for moixs Message-ID: <200807141603.m6EG3ZSK001775@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package pear-Net-DNS with summary A PHP resolver library used to communicate with a name servers Kevin Fenzi (kevin) has approved Package pear-Net-DNS Kevin Fenzi (kevin) has added a Fedora devel branch for pear-Net-DNS with an owner of moixs Kevin Fenzi (kevin) has approved pear-Net-DNS in Fedora devel Kevin Fenzi (kevin) has approved Package pear-Net-DNS Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pear-Net-DNS (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pear-Net-DNS (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pear-Net-DNS (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pear-Net-DNS From fedora-extras-commits at redhat.com Mon Jul 14 16:03:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:03:36 GMT Subject: rpms/almanah/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807141603.m6EG3avP018809@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/almanah/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh18653/rpms/almanah/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module almanah --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: almanah # $Id: Makefile,v 1.1 2008/07/14 16:03:21 kevin Exp $ NAME := almanah SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 16:03:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:03:46 +0000 Subject: [pkgdb] pear-Net-DNS (Fedora, devel) updated by kevin Message-ID: <200807141603.m6EG3kNa001819@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on pear-Net-DNS (Fedora devel) for remi Kevin Fenzi (kevin) approved watchcommits on pear-Net-DNS (Fedora devel) for remi Kevin Fenzi (kevin) Approved cvsextras for commit access on pear-Net-DNS (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pear-Net-DNS From fedora-extras-commits at redhat.com Mon Jul 14 16:03:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:03:46 +0000 Subject: [pkgdb] pear-Net-DNS (Fedora, 9) updated by kevin Message-ID: <200807141603.m6EG3kNd001819@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for pear-Net-DNS Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pear-Net-DNS (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pear-Net-DNS (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pear-Net-DNS (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on pear-Net-DNS (Fedora 9) for remi Kevin Fenzi (kevin) approved watchcommits on pear-Net-DNS (Fedora 9) for remi Kevin Fenzi (kevin) Approved cvsextras for commit access on pear-Net-DNS (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pear-Net-DNS From fedora-extras-commits at redhat.com Mon Jul 14 16:04:02 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 14 Jul 2008 16:04:02 GMT Subject: rpms/system-config-printer/devel pycups-1.9.41.tar.bz2, NONE, 1.1 .cvsignore, 1.179, 1.180 sources, 1.185, 1.186 system-config-printer.spec, 1.207, 1.208 pycups-1.9.40.tar.bz2.sig, 1.1, NONE Message-ID: <200807141604.m6EG42PT018878@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18758 Modified Files: .cvsignore sources system-config-printer.spec Added Files: pycups-1.9.41.tar.bz2 Removed Files: pycups-1.9.40.tar.bz2.sig Log Message: * Mon Jul 14 2008 Tim Waugh - Updated pycups to 1.9.41. --- NEW FILE pycups-1.9.41.tar.bz2 --- BZh91AY&SYr~?C?????????????????@ ?{??n??WG?d?P:???)$E=?????#w? ,??=?v?? ?u??M???JOL?:7?O;\?g???}????v???p+?|??>??=?????u at 5?????$=??s?L9{f?b?{?&?{?{?m]?b?B{ ??Zz?F ?? ?H?JJ?*??b??`???"B! %@?`???? ?b???`O ??)?d +??d4??K?Q@?#Q Cs???g??\????a??4????????v??p?m???????G??????J0=C?}??????3?? D?(JiZi?* ?(????$????(??????=\hd?+??>?+??(?Z???(??$???NQ?@?ISGI0???G#??>????n??.??LCUI1T?AP QA%P?#,?Q%AMLA(?DL?E5?H?A?O???~?~??]?y?mW???;G????????*/ a??0??d?=?pJ???&A???=?j(0???O??`??w?????)ild?Z4?@?8?(????EpN?/H?w????@y?t?Q?C?(?69 ??0M2_g??O;$@l??????o3 ?? ??{??????|???#???(????HX??7|??Y9 *a?`????(?" f???"?`W??A??=?:????mn4)0??"?RW???[??H???ns????k???EEK?????F???=p>??@?J(i G??H at QF????i?j??ji"?&ji]?~??d??PlRlh)vM(????tS;&?XI????z?x}????@G? ?????i??jD04????['?y8???B?_T?3?P2?6?]??2???? d?)`???`??m ????hH?he???n-????? B?v,I!??=?????P??: ~pk?no?cn???????r;??0???|(W??1??q?QDR_?g?~=?w>V????2??%??-??n?l???}g]?e?Y>?%?8f???u????U?/a?_X???_I?}'??=3??xz"???k+j ?????"5*T ???o?????;??????o??5??%?? ???cu???,?5????v??G??^]?>=??????f????????Y???bE?MkY????u?r?G$?K_}%?G? ????????0???!}Z?I'0??z??5!e M?????B ???#H?????(?? D??????QA???A??eP?/AH?J"???%?Th@?A??T D?2?Ud}?;2 ???4@????;?ql?? ?s[?3%^??D???X?x?W ?I?5???????Ax?3??6?v?6????f1??Z?0Y???-?.u??3;cm????? ~(!??w`/????l*?(iC?CH!??q)??JD????E??i????C?e? ??f?)+8???JN?? JFV?'M???-? Hs??@?a??RRpD????M?=????bxv?g??bs ? ????_????{?h?C"5??!???lUE ??k??????b???^??pN 3z??????1?[Qw?4????z?xTo??f$?? #??3 ?X?R?????|q?g???$6???{?^???a??C???q???.YR??`?;^c???sC-S?=?t?Xm?k;f?V????????? ?YG?!??????n ???????(?,,]?y?.&/?v_?w??UUfr?????Z~?>}?p?O] ?B?:??t?a?t??????j???l???5??Q?`&??So?????ej ASW?l???????-^jd}?s3??nc?z?,;;C?????a:@?? ?????w?????h???s?fp\? %?$?????YI???P dD7?!;?K??w{?????F{?!?7??6???zkWk??8M???F4???Pl????????)?#du?I?w?????wo??? ???????? (.Xn?> ??ij??J??$??^qibV??;?^??y??????2??'??d?s}???sK;??A???k;??8m1?4 ??=NK_? u0d at z`??B_?????1{?]???R_????#???????L~??d?a}?f???????e??+s#/}?:???????Ow??]?R.^1 =???u????\?s ?R ?i"P?)?? ??0T?j?gm8??P???D'}V?????q??P7??b?}?{??/??;????w!??T(d? ?@M???Fvm???#?s?y7SgP?r?C??? ???;o4??P?e?e.o[???^??(???Y7??????f0??& ???????nw???b?V?e?1???X????6K?tj?%k????O??]Di????K'??*!?#????U?1??|TE?"%?1BP???rn?l% 5?Y???W?m]?u?????'&?????6wai??}? ^???,?;??GA?;?????je?f?9?xX3??c_:M??qv?xk??F)1?"e?Jv?? ?|0'??X?t'???y0 ???+?v?W?o8:?G???? ??7,?u? ?? Cd*VO+-?X???7:v???8?] ???`&??9<?M?4C????????7?:^=??]Q???cS ?T?A??L?I?UC4%?V???s???s?K???]??=cG???7?f??Lnpt Z?@S??rN?m ??????"???4?]??C??&Rht???g??m??g/??3??b?J@?8t???P?,?6y?jk??x?b??V?8[? ??r?R?LP???? ?[ny???????^7??e>Re6?#;?? P[??O ??????8???8L?0 ??E:?w!j ??K+????;Po?-3B/?.???????$ ??cv?CW?? + w??)??f??z0??F?xzu??9n???V?wc?b?a?w 1~?v?K??k??b?'?}3F???? ???C(+?P???n?????#d\9T???k?????|{????x???????W[??y???????)?????%t?M??Gw!?!???wq6?Q6??(???B2?S?y??>N#?6ki?N!L <()&8??o???g j?P>?vn?LaV(d????c??????V?.?k~???i?;=1M"\???|??nU?4m?z????auSE????Y????3\ymO9?^?w?????^Z?? X??9?????e9 ????c:\2??c?????? *@?D??V?{????j62j???HV???7??6[??Y???N????Tw?k?1?C?v??x????j???N??l??n??^?????????ajAWK??,tq?6pdQ???c-G?3?#A/????1H//?????????5?? >bP_*?(/?^i?qJV?._???????A$d????n??W ?E ??Q?6? ? &?[???????x??oDS?"?-7 ?2??????^?v?????&u4?):|`j?????j?D?8V????xG ??????wd2??_?A?XA?0?2??_ ????????1?? w?$???8?P39?J?\??(,8?H????? ?? ??>*O8g?!????@'?b?}% Q at L%P#$M%TT??I? ??QH?SS^?4:??D??e??aO?d2v??'??Z"?*???u??yW?????r????r ???????n?? ?KX??UW?e??y???U|mUU??????Z???! s??S`????????C~M?0Bs^????4y-{???"?????tSDEWX?0??????j?w?/W??T?Y WZ?j????W;??&>x?u??F Q? ??7nxK?? ?t [?N??Gl?a???B?!W_^'Yi???(????SYw/???B ????P?Z ????`?V???8'??E???3*???U?????Q????@?\D8?xA&Zg'??C???QH&?Mdx.1????\)??+h??}?zMr^F!?M????Ii??FQ???????Q6Z??Q??k??pV??O?<^??E?a???[??pPe?L ?$Ek?@~C?j(?#?U3TT?!D?0S4EDCD?T?DEESR?Q???mH>@$J?_nOC?E???8?K?(mm?QETA?TX7?%?GPs!S ^?h??f at dDP ?Kl?NZ??"??fH?!?????=??Rt?q6R`AO5??DK??R  ??_D???=VD??????/?Eb7`?????????!Q?????tec0R=??a?NP?+????vgF0T???U0".?R ????r2_???h?o??r@? g??????c ??4v?TzRXFm??0?R?*!? ????[(?QH?????s?`?s~M~??A6${??B?(???]???;@?}?o#?2??':?????yX??Q?>??W???^? ?W??? ??<.???1w4?@?????????????)????U?^?j?938?N]?s,G?? ?4????5?{???u;u?Uf?G??yx??|T??K??{9?.?8?nqT?}?'?bG????[E???&??2{%E?????k??b?????^???????`???}'}L??*Z?CQ??q75?_uhY??6&?{5???{?????z???b???|?.?EY ? ? ??=p????'?~??"??#)Oa???a???HFi????M????.?q?2????{???oz?} [{???k!("????$W??~??;??w?????3??????f{?d???T??~\????' ??i??????2??????N?=????%qG?=?C=??ym? ?$? ??EW????d=?Jm???Dyi`?3 ????0?h\???^???R??????????????4=j??h???8?????D;??????????\]e??!S|\M??x???/?A????!L???!?????!????????7_???????lZx?.c~?N CeY1????????On??g?-???e?8 W?yb?"??Z??_?@???1?G?++%x?0{??DRU?&??,Y"?A\Sw3??CNi?{????q?????????,? ?????&?Q????}?;?oV?)?????c ???;A?G??f?6#Rh? ??]f??l??????-G?6?)~?` ?(?~4~?n`?Xh?Ix?? V < G?'??P?7?AR???????%NW6AzS\?`?O?^_B?,? ?\?1?0???e???S'? ?s?=}7??a#??cz????>A??R*??>m?a7?G?P?y"Zn@???!??a??????fl4?????L ??f?MCZ?Q ?JT??m?0r?d??`?{???W#d?????1?9???????0?0??l???P?_uL??A&^????f?\????????q ?}?>???!1??q ?0??]6????1????K?a?D?????3??=|?G???L?9?I?v>???,?T???'\?? ??GA?) ??{>??wA?C.??/?? ???)?b???0??+N? ???M?/L??z??s??eyn?Gy????yHi~??pm(???????^-??}? ?T?DdSY *9_???? Y?e?6BHl{u?'?p???`??Cat?l???3z?? ?~?????0)K2?d????? u[????_???tp=?{?p?d=? ?w???? ?E??.9v?xA@??'X;????Y?~F ?8V u?m????????/????{?a???t?G}`??s?-???^???????2d?y?v?g???7x????? ?z!i?%?BJ?/B?RpO$M?c?? 7?+?:%??GH?vh?/?u8M{?I?8N{?t2w ??[?*??f[9??!???i?0??BR?`??kVU???? ~'?2nw??)????Uy?"????Df [?C?=?? O??O?????~?????????????(B?_???????? ????o?9????=4 ??????? 8?&?O?%?!/?+0 ?8?????A??????g????f?????????b U~?? R??-??gq?"???_?~ i?? ?????~?????dQ?B??#???????p?? ?`?l?;?o$?????"K? b3?? ?????}???'?!v??%W??????????????is?\~??g_?A??O???)0?O? NBqce?B?d/?N?Mq NDzJ?.?$u??R)? ?d?J?E%5??`? QfI ?IM??o?????1??>?q??????*??j??2?4N??8W??w?P&???8d? ?sz?2???,?7Vjuux?????? 7a???OYU?,??^(???p_???~??{Cck |????????????jN??lF?????? e? ????Fh0L?o_??9?N??g??????\? ?_z?p?55????5?M ??Bt?F???-?:? p+????F.????+]???o??????Tp??hK??J|Z'KU$?i?vLC?? ?p??Q?????I???????x6f?Q????n?Gn??}??k??NCk????X?lm?????[???a?m???]?,/?q?Z>]8?????{?{~1?v??S0yz^???$?Pu??????1??%?o??O?nk??{2c???q?)??23?%?%m?2?/?L\Ew'????*"o||Y#?n?ae?? I?? ??S0iJ?????V?d?2?o?F?????z*?|(??????????=f??$?5D???z?gV ??[h5S??[L[2C?y????????gf??.<=K??? ?g?}w?_???`(?9?????? ???9-??{?? 9J ??2??? r ?????,?@?x??8??\)?|bo??v? ??27?B?3?h r_??H?????L?/s?w??????p???w?? ??????-R?????f:? %!(`? ???#?W?'?v???gjK~b? U'??? ???????lj?E??*??A??m8- A?N-8 NKm?i?? i???__ 71U?h2???t???bU????+*?ST?gg???%?:???????s???, ???~)?PR?????s4?N?oQ???o]eq>?}??3IJ????!*?'???|?q3????>F??F?e{}'m?[ `?x??DX???????k?{?)???t??bs_O?????????? ?Ju?? !g???? ?~???????.?K?????W??]isV??9z?y ?/??????????Tm???F??????p?xo? o4?????$?"h ???W ??S`?D #Q:??? k,???;???0I??3?4Ha #!?L*OX???5???u???V????LW?*U? -^??ov?7?????%?pF?|m??:?q?o??????}????{T4)_P 7J???"i?????q? ???;ax!??_??????C?-k]?UkY???????()Q???!:X???y?*r???????1l??????Bh?????~A??C3Kg`?T?j?3=[Gh?6??????jZ=;j???}?h6?n??????zyva?D\:"?^?"?`? QG?x)?>Bk%?w????:????? h???? p??S?N?????O?M??7??B?F?W???q"???f?BFw?KAc?!??TyqvX?J=?:??`FI=0?Zk?/?p?*???on'8??K?aB???o8k? ??j??&?@d?/???Xv???Q??$??1 E^}?*?SxEb?BD$J?L?n~{????A?????-2<@?fo???}\=E?Um?{?2iq?uL?UX??d??j?t8(??D?D???4M??b??????/xH?1 ?'~?4R?HB?m8$ ?????0!???w?$??\?o?"?o?*?0o??$????N`???? ?Qh*h??pm?o h ,?V??o??4?) (?zl ???Q6L??|?Ma? ' A?Q??h??#y????bX?j~????s5???X7???? D>?|???G3??m? ?"<2?r$>?iI?.Vv 8???5??+2??*.?xmU!??{??N?X;?~?)M?{?,`y????n?J{lOJT?|w ??v`Es?Q?N*??PO?4??i ??l'?? ???B `??a? &?^??a?,*?G??fx?i???j ??o|'[V;syZAg;?5PkUN????*?????:?{? ???3 ?nA?q` g~?+*???????b????H??(?F?=x?b??j???SH???????#???!w??jFI???yJh???\d?c??(Z?Tn???T?m??????G????+?q??h???J?[Bg???????CfT=g??{??????????? ??N ??????3?~h?'?7??dD^??????21?)??zI?w?p2?E^%<3?;??>c???q S_?;?'#?I"HHP&nl`w?E????Q*??? E???/% /{c?6X????c?N??V?Z????[?V??????r????????k????l?T??(x8??????|} F??:?Ub39???? Ho? ??C?z^??z????\f m?????d??B?t}??G??? ?????([?>??_???]?3#g????vw??d?{m????6???>Q???b?Lxpa????????O0?=??|?~??s???WR???u?*?????!??dy~??}t?d_?k? ?a9o5?\???X^?y??"G?48Q<&?[????q?,J?$-??`???B?(????! ?cbr???Y???O7w{%?>??@J?Jh:?????]??aS??? D????D????T(p?/?8?I?I? ?/EC??[lf???f?? ?9??j5c$??)9 )K?+un!?qE_ 8????U???"=??MM?%w??k m???1?????o Oj?r???H??B&?k?FP? ?hD?A???`^e}???@)?`?I] ?-,??{???a???J?e\ ?O?C?/??? ??!i.??Ab ?[X?e#? ?(?-?F?L??& ????m??7P7DO???????,$3????~N??,=? ?{"y?wW???+H?d2???0?S???#????.y??T????M6l???5?IGmv9 ????d????j???X?r??SM?? p?Q6d6U?M?? b?*?_ZM?xu>???s??`z??_???;W??\g??E?P?BD8?? N?~C??}???O????????_#!l?C????@?[ P?k? ??!B???JD5?iP???5?o?)?/?????;?.??t*6? ??%??{m?Z ?P?@P?}|#???]? ??GBhH?????&??YZ*^?%c?? J,????vU???\)???q???}0?[?%?=????I?`{????>?u?????????. K??65??fN???b# ?4i9m?(???`??????0?6??L?Q;?9;?)?{ W3?UN?+Q?m'?0??`?1??+6???yVA?F$?????Np?J?M???%?s5????????K}%k[??g???X_!k8?YO?1Uo????*q-???\e????w\????W?<0??w???l?bl??ky???"!???X~?\??VfM??~Qa?J?`d??*???o??pa+?a?""4?S?+??z?? ??????? j)?2u?mY??pbcV???*????(?????OMm4?a??%pSm???? ?C5?>8??=???? 0?7?SI"Mj????U ?qv???r???7????S?c3????A??=g9I???+~??-?zz? ?M??5???%f V?6JG??aa??q???? .? ??$ ???01???I?{??@3n?Wr?)=?H?2?=?!???m[??0??????"u0Og?2???o<9?'??]??E??>oY???MP??????~R%??????????>#)?y???7???????c??? ???:? D????? 7??s?????+?+?z[R??$p??Bk?RI? ??"?????m?q??7?D#??#hA`H??d??i??v???t?M?b?????!~??????|?"I?????????????:?Fm??g?%???Z??U^??de??+b.???J[?? ?#???? t?L????V fH????"3S???GN???u?E?? ????????d??????qJ:` ?[?2???`??m?v??Y:??F??]?????,???? ??R?W"???V1?SaO??h????,!? ?? ??t?d???htc??c?>o????? ????Np? A*??A?@?+?rB??\??6??E18?-????P ????(}?^???K??a8???5???K????/fs??`?a?&?kG????{/D?~>8??????2;?t?8C??? - ?y??7W???$TC??? ??kQG????8Y?jf$#?*?"?? ?'??VI?|=?Ll\\??n??]rV???'???.#??2=F??/???8f??K??Jr?7]j?(j?UV?????9??XX?)?????ii#??r?nKE??p?9/ ?{?????uAc???????8r?D(D ? 6?,??????^???uh???*? ?? ??????1?%?F(?nR????R? !?y ????i?< p???v?{V pK????n7???LyU4`?u????Q??? ??Q|f!b???Q1CI?I?C(?8I?)???A??UT? ?#;h??B???!??n?1?$)???D1?????e???j?? ???)???Id(h??P;w?Z @O??I(D??G??DBD? ??QC?V@???Q???^t/????i>?hX?C2??),%??@]??^~T>?66??? ?? Qh&VR%5?"8?\??_?G????R?~????34ha0e????G???E?X???Z?hiI9??????????Oa]?????3?0?I?C)??6?P?4c3?L?????=}tnXp????J? ????1?????bM??? ??Z????"S???}?jJ i??(?K???G???????tR? r\???%?y?Rcq?V?????????????l7 ??#?R??gj?`vyP?????.?????d?F? 7J?r??n`??M???'&E?;a????*!;??(???X?_?+? IJ,0Y7y_K5???4???? w?>?x| i?_??|x??.???-I)?i?"js??r8????$d?Z????>s??m????7J6Y^u???0ER??? ?}D YAH???z??? ?P?"??`{~(???OO_3D?Vc?L :lP??B9?1O????4Bl?tS ??r??*n]?!????A??>??????0??RE{g$"???H???\?Qv ????d?o????N8lE?|c*P?0?O?!B??n?3?? ? ??Ic??a??i?i? ?f??,|?/F??1Lp????6?^?b?Q=b?6?????S????p=??]???????A?s?@?_??m??0`aY?T??x?$DO????? ?i????? ]?* ?C2???@)1?^ V???U m??a??cq%?4?G????}??F????S??????cqe???0&?s????{?b?3?mz??&Y@??&-????vV x*]??????HIp??????wDs?#??gN????|i? ??6UQ?????Qn??x??0CuK?T$?D?!? ???Vfx????} ?#i??u5?l[?D?????h2?^?z??????^??Ex?a ?\ n????????;???.?]?7??o???????A? ?0?0`6?B?}???2?h?????&?*oN2tg?>f??)?C??&????X??wD?!7?YF??!Uq??rN0?E!c????zh?a?7???_?Y3?P?py????v?? ?4]???'r??#??????kFfz??F??k?=?( H0?V"*v"f^?\???????P?P????Tv7??v?f?o?^R??Q??K??ns?n;? =??f}(Up,?GI??7?yB y~??rj?Fe)Gl???p?3!KL???????(P'H?(??dRY7??i|???ia?=????{ ???R6??y??O???JRmb?&??!???f??o r\ ?h?? "???D?W??fG |??$???-9??C?h?}f??`{Q ?Z??,>1 ~H?JP?#?? "?>?? ?????+ s? $??US2l??3?w??yqh?????? ?`K??g??!???1?h???P?? ? ? ?D_JZV?6D?? [?;u!??$D?Im?i?8??!?1?c?r?/?3??i&?P?F?>?Pm???|\?????L?4F?7?t???????w__???S?C???|?N???????$K ???>?t]Gy??KR?Hr??9\?`i?my%/;?j?,O? ?ALW????:kF??d?KG??E??7?r!?l??1??????% T????vGi2?WtO,N? q???CvvMKvm?!??BQ ?(??$?d"z??@5`g???j?`8$a??Y6?j4?E? ?Ln??????K????h???;uW??/???$@D???H ?.??=?{??l6?[???x:??S?i??y??)?,?,?Jb???????8?V????]?`?~?w?Kc?[?*???]????"N?????H I`?`???V?wwo?????0p?????D?l:?????1}&??P??X;aO??!?b$?%?A?z????N?4Ql???.pKY???k4d?_2?q??;???b???A z???G?5?,??7???%&0?1 !?3??T?2? ???L?t??T `? ?z?{?Ya?\??D?????? ??????A?pCUQ?????T?Z?pR! ???9?u?@ ?hQ?????A`?~?e?$?????'JC`>?2?F?? )?? o ?T??"??W#?????E?*??Dr2W?1?$??T???p?X??(@"FHP?@)QSc?j%??P D??C A??w??1 ?-"M3+??? u")|??a??iVz (?l??oE?2??{????B??????(?C6???? ? ???ld????_m?+1z?4?p??,Q??h?/???B?j??T{@???E(I^X?(P??q?Jy??n?0???"J??z."/ ,??Y k?o? ??? ???LA'??fJaL%?A??2?<@&???><}?`?CtT2H o?cG?m?? s???9D}??G?"?Rsz%?|????;??aKi?5M6??]?d???k???????Ub??A??, ??l?J??q?9}?{??F???D?=%?>?mk -GY?&?]N?L?l??KE??0??7{??:#?_?h?q??%?D`?????lpi?h???}?2w?J`W?Rj?j0?bl??H?(?1??T???H?Yyj_?X????H??x"r??t??eB?)??H?--(?-??ZD?!61??????????>? ?vP??~)???L???/E~!???~?????Q?D=???Ia?D????i/?6^8C??0@} ?{?a`??(OKF1kw?B2p???&??0?$9c?e??H?!?m?,lVE? ?,?Xu???HH?Q?A???!????9_g?+??????m????L|&?#?DAK?>{? _????/yg???s  ??7)G?02??Q ?,?d??.???z ?i?'???]?u?n??>??G?7(E"Cy?+??}????:?(???L?w[9????LD???? (@y???'?+_??JC?%?Yg? M???uN b???i"??I???B,?X??? ???A?? ?$JH???8Q?????$???:?=vD? ?-Rz???Dy?<"?5?L??@????(?@??)?d]?S??I? ???>????S?R??@0!IBS, ;????h????]? q???j? p?"??}pz?= ?Q?!T0????jv???mR???m?#????}8O??R???A?????????^??A????dSZ}?@}???????`>,????%?`? :3 ???n???O?"RAI 'i@?????0????;'??`?)?4??7A?????i??,?? ? ?Yd0??n3? @HA $TG$'A???'?l]??6?? ??&??pL?????#, ?(H<&&?????!Gp SQQT?3??????W??0 l???Zh?? ?MQ????"IL????=U)F??h ,?T?D?-?*?2?l6h3??(???oK?T]g^?Mb????????.?N??r??????3a??G4?T?r??Y?? ?x ?L0?/*%??'???R.Y?7o? Y?0"?RD?4U?&(o?v?=???l?????? ?.I??oQZ? ?\X?%g?M"?pS???)?? ?7??5:???H+?,?td? ?IfpI??R?D\??d????P?Q??0??%.?[ ??? ?B0??#??`?`v???F?g%`0] ?d???P4?Dl6???5?? ???[??q?z??%?w?y????;?B\`-*? ?("E??v??'????W??"?D?=d'?grN???W?^??IJ_?[?Q???j??Y???f?k&'b?5??DR?g??v?I???$???@????????;(`o?F?;??G????G??=?~?O???u?+?b?>?a?????W??[?>i??@G"?? ??-?W)??UBZ ?l??=?~??f????@?/H?@& [M??9?=???^7;?S???Z-Be???b??4?????{???^?F? ??8Jf?????6*??&?_P ???1r!?K?#?__?.?????,5l%?????'?RE?????s00L?s????q?1??)?_??!?pQ??X?e?`0 ?g???Z??c?z6"? `? XC???w??P????????3???????*??^???A?k?M??????Z???v?hO/?6$??2F?????C?m??" [a???t:? a?????#?pI???? I>?~?????*??????5B?Tz????we??v????,?\??@ ?x??!??Q???&PR?71H??????????RD??Mb?$?????H5.e[?(?@w;S ?U/5?e??9?'???C?8^? ?? P?4???b??ZM%"?????$?^????kOM?t???VB??u?Ud???P%???H??3?f 87?tY?9K?M?3}??t %wr?;?U;cq Q??]??`?:&?ck^?,???.cp?8????????V?<_?ic;>?q????C??u?r???X????aM 1WsY??k]??l?s+?w?V\?????hs?y??1??' ??????"/???C}?kDF6???`??????i?d9jF6""GY?o??#0???6??i??&6?)n???6?a?]????F???[/Y?j??'???t1?q????5?u?d???as;?????)@?6????I>?JF?A nRaB?w?R?m?i???A?r -??o???4Zm??\??D??m?????1????}oJo? r?h??3? ???e?????-??'?W?j??m??mD[Z ?$!O??j?l????@?FU  BP?7???*? ?<Kq\??7l?t?&:1?z:?CZ?b?????T?P?`%????FFPCP??w?@%(PR?R?HRIT,LR +)?]7??????k????m5?\D?w5?n???? es??|???!?n?!?D?6??M???N)S?GI???X8uP?n??0???S ?*`r?e???j?#A 7????:??+? ???$6??4@?`l?(LL?ID?T???x'z????'????#??ST ? ?>??z??K???zhP???@N? {?@? ?J r?fY?h????a!a t?{ YA??/?j????s???KA??7??,A?v???'??8???A0JU"?P`/cL???P1?2??i??Da?:cc?????? ???g*K??mT??)`??p????8U????u?==???B?????"?'?*?Q??n?8?6?h?#^\?????>??k?H??????g??uQ?H?&???(i7[H?????s{?vQ-??D?[]?0C???3B???c??c ???F???0? M??TZ?? F? ??F??!?*;`????H?^\???^?0=???A??OS???????#?????P ?9??s?TD at D? ?)PCp?I??m???? y??????`bJ?p??? ?$x?????E??K???r?Z??~???_a????7??s???w??m?Z??1-?Y3??e??E???f?c ??."???.??#n?tK\% ?3??>*r??!?1fm???g i???g?%??6?b?F/F?c4???f??Iy?;N?\??1????_?G.????t?@??o??v????o???(????o????.??p? ??44 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- .cvsignore 10 Jul 2008 15:47:52 -0000 1.179 +++ .cvsignore 14 Jul 2008 16:03:09 -0000 1.180 @@ -176,3 +176,4 @@ pycups-1.9.40.tar.bz2 system-config-printer-1.0.3.tar.bz2 system-config-printer-1.0.4.tar.bz2 +pycups-1.9.41.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- sources 10 Jul 2008 15:47:52 -0000 1.185 +++ sources 14 Jul 2008 16:03:09 -0000 1.186 @@ -1,3 +1,3 @@ 41bc000026ea8d01f684705a99ac01d5 pysmbc-1.0.4.tar.bz2 -ea0a35e578c0f4acff75e30ecbe704cb pycups-1.9.40.tar.bz2 5f63211606efd0913b14dfaf4de9403d system-config-printer-1.0.4.tar.bz2 +f5f1b33696c5dc52e5563d69d29330e9 pycups-1.9.41.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- system-config-printer.spec 10 Jul 2008 16:29:03 -0000 1.207 +++ system-config-printer.spec 14 Jul 2008 16:03:09 -0000 1.208 @@ -1,4 +1,4 @@ -%define pycups_version 1.9.40 +%define pycups_version 1.9.41 %define pysmbc_version 1.0.4 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -158,6 +158,9 @@ exit 0 %changelog +* Mon Jul 14 2008 Tim Waugh +- Updated pycups to 1.9.41. + * Thu Jul 10 2008 Tim Waugh 1.0.4-1 - 1.0.4. - Applied upstream patch for pycups to fix getPrinterAttributes when --- pycups-1.9.40.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 16:04:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:04:34 GMT Subject: rpms/pear-Net-DNS - New directory Message-ID: <200807141604.m6EG4Yr9018926@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-DNS In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18889/rpms/pear-Net-DNS Log Message: Directory /cvs/extras/rpms/pear-Net-DNS added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 16:04:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:04:49 GMT Subject: rpms/pear-Net-DNS/devel - New directory Message-ID: <200807141604.m6EG4nLe018959@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-DNS/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18889/rpms/pear-Net-DNS/devel Log Message: Directory /cvs/extras/rpms/pear-Net-DNS/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 16:05:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:05:03 GMT Subject: rpms/pear-Net-DNS Makefile,NONE,1.1 Message-ID: <200807141605.m6EG5354019015@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-DNS In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18889/rpms/pear-Net-DNS Added Files: Makefile Log Message: Setup of module pear-Net-DNS --- NEW FILE Makefile --- # Top level Makefile for module pear-Net-DNS all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 16:05:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:05:30 +0000 Subject: [pkgdb] pear-Net-IPv4 was added for moixs Message-ID: <200807141605.m6EG5UCR002069@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package pear-Net-IPv4 with summary Class used for calculating IPv4 address information Kevin Fenzi (kevin) has approved Package pear-Net-IPv4 Kevin Fenzi (kevin) has added a Fedora devel branch for pear-Net-IPv4 with an owner of moixs Kevin Fenzi (kevin) has approved pear-Net-IPv4 in Fedora devel Kevin Fenzi (kevin) has approved Package pear-Net-IPv4 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pear-Net-IPv4 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pear-Net-IPv4 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pear-Net-IPv4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pear-Net-IPv4 From fedora-extras-commits at redhat.com Mon Jul 14 16:05:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:05:31 GMT Subject: rpms/pear-Net-DNS/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807141605.m6EG5VrR019055@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-DNS/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL18889/rpms/pear-Net-DNS/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pear-Net-DNS --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pear-Net-DNS # $Id: Makefile,v 1.1 2008/07/14 16:05:05 kevin Exp $ NAME := pear-Net-DNS SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 16:05:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:05:38 +0000 Subject: [pkgdb] pear-Net-IPv4 (Fedora, devel) updated by kevin Message-ID: <200807141605.m6EG5cgo002112@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on pear-Net-IPv4 (Fedora devel) for remi Kevin Fenzi (kevin) approved watchcommits on pear-Net-IPv4 (Fedora devel) for remi Kevin Fenzi (kevin) Approved cvsextras for commit access on pear-Net-IPv4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pear-Net-IPv4 From fedora-extras-commits at redhat.com Mon Jul 14 16:05:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:05:38 +0000 Subject: [pkgdb] pear-Net-IPv4 (Fedora, 9) updated by kevin Message-ID: <200807141605.m6EG5cgr002112@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for pear-Net-IPv4 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pear-Net-IPv4 (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pear-Net-IPv4 (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pear-Net-IPv4 (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on pear-Net-IPv4 (Fedora 9) for remi Kevin Fenzi (kevin) approved watchcommits on pear-Net-IPv4 (Fedora 9) for remi Kevin Fenzi (kevin) Approved cvsextras for commit access on pear-Net-IPv4 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pear-Net-IPv4 From fedora-extras-commits at redhat.com Mon Jul 14 16:06:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:06:11 GMT Subject: rpms/pear-Net-IPv4 - New directory Message-ID: <200807141606.m6EG6BE9019163@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-IPv4 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19126/rpms/pear-Net-IPv4 Log Message: Directory /cvs/extras/rpms/pear-Net-IPv4 added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 16:06:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 16:06:20 +0000 Subject: [pkgdb] aubio (Fedora, 9) updated by kevin Message-ID: <200807141606.m6EG5UCV002069@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for aubio Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aubio (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on aubio (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aubio (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/aubio From fedora-extras-commits at redhat.com Mon Jul 14 16:06:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:06:26 GMT Subject: rpms/pear-Net-IPv4/devel - New directory Message-ID: <200807141606.m6EG6QAA019189@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-IPv4/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19126/rpms/pear-Net-IPv4/devel Log Message: Directory /cvs/extras/rpms/pear-Net-IPv4/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 16:06:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:06:41 GMT Subject: rpms/pear-Net-IPv4 Makefile,NONE,1.1 Message-ID: <200807141606.m6EG6fYr019217@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-IPv4 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19126/rpms/pear-Net-IPv4 Added Files: Makefile Log Message: Setup of module pear-Net-IPv4 --- NEW FILE Makefile --- # Top level Makefile for module pear-Net-IPv4 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 16:07:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 16:07:03 GMT Subject: rpms/pear-Net-IPv4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807141607.m6EG73CE019240@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pear-Net-IPv4/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI19126/rpms/pear-Net-IPv4/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pear-Net-IPv4 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pear-Net-IPv4 # $Id: Makefile,v 1.1 2008/07/14 16:06:43 kevin Exp $ NAME := pear-Net-IPv4 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 16:09:46 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 16:09:46 GMT Subject: rpms/jakarta-commons-el/devel commons-el-eclipse-manifest.patch, 1.1, 1.2 jakarta-commons-el.spec, 1.40, 1.41 Message-ID: <200807141609.m6EG9kgu019606@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jakarta-commons-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19483 Modified Files: commons-el-eclipse-manifest.patch jakarta-commons-el.spec Log Message: * Mon Jul 14 2008 Andrew Overholt 1.0-9.4 - Update OSGi metadata for Eclipse 3.4. commons-el-eclipse-manifest.patch: Index: commons-el-eclipse-manifest.patch =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-el/devel/commons-el-eclipse-manifest.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- commons-el-eclipse-manifest.patch 12 Jul 2007 13:24:05 -0000 1.1 +++ commons-el-eclipse-manifest.patch 14 Jul 2008 16:08:44 -0000 1.2 @@ -11,7 +11,7 @@ +Bundle-ManifestVersion: 2 +Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo + ns.el.parser;version="1.0.0" -+Bundle-Version: 1.0.0.v200706111724 ++Bundle-Version: 1.0.0.v200806031608 +Bundle-SymbolicName: org.apache.commons.el +Bundle-Name: Apache Commons JSP 2.0 Expression Language Interpreter +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 Index: jakarta-commons-el.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- jakarta-commons-el.spec 9 Jul 2008 19:28:11 -0000 1.40 +++ jakarta-commons-el.spec 14 Jul 2008 16:08:44 -0000 1.41 @@ -39,7 +39,7 @@ Name: jakarta-commons-el Version: 1.0 -Release: 9.3%{?dist} +Release: 9.4%{?dist} Epoch: 0 Summary: The Jakarta Commons Extension Language License: ASL 1.1 @@ -179,6 +179,9 @@ %changelog +* Mon Jul 14 2008 Andrew Overholt 1.0-9.4 +- Update OSGi metadata for Eclipse 3.4. + * Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-9.3 - drop repotag - fix license tag From fedora-extras-commits at redhat.com Mon Jul 14 16:12:37 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 16:12:37 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.345,1.346 sources,1.65,1.66 Message-ID: <200807141612.m6EGCbSm019932@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19713 Modified Files: kdelibs.spec sources Log Message: * Mon Jul 14 2008 Rex Dieter 4.0.98-3 - respun tarball Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- kdelibs.spec 13 Jul 2008 15:48:55 -0000 1.345 +++ kdelibs.spec 14 Jul 2008 16:10:07 -0000 1.346 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.98 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -359,6 +359,9 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4.0.98-3 +- respun tarball + * Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 - revert a kinit patch causing an assertion failure in KComponentData (#455130) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 11 Jul 2008 03:57:48 -0000 1.65 +++ sources 14 Jul 2008 16:10:07 -0000 1.66 @@ -1 +1 @@ -68465f41c45ae7fec0d15f13787b130b kdelibs-4.0.98.tar.bz2 +983c49b3e16add5809b39427f2c4ee4e kdelibs-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 16:13:11 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Mon, 14 Jul 2008 16:13:11 GMT Subject: rpms/filezilla/devel FileZilla_3.1.0-socket.patch, NONE, 1.1 filezilla.spec, 1.15, 1.16 sources, 1.14, 1.15 .cvsignore, 1.11, 1.12 Message-ID: <200807141613.m6EGDBQE020031@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19734 Modified Files: filezilla.spec sources .cvsignore Added Files: FileZilla_3.1.0-socket.patch Log Message: - Update to 3.1.0-beta2 FileZilla_3.1.0-socket.patch: --- NEW FILE FileZilla_3.1.0-socket.patch --- diff -up filezilla-3.1.0-beta2/tests/ipaddress.cpp.socket filezilla-3.1.0-beta2/tests/ipaddress.cpp --- filezilla-3.1.0-beta2/tests/ipaddress.cpp.socket 2008-07-14 17:51:44.000000000 +0200 +++ filezilla-3.1.0-beta2/tests/ipaddress.cpp 2008-07-14 17:52:08.000000000 +0200 @@ -2,6 +2,7 @@ #include "directorylistingparser.h" #include #include +#include /* * This testsuite asserts the correctness of the Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- filezilla.spec 8 Jul 2008 09:31:07 -0000 1.15 +++ filezilla.spec 14 Jul 2008 16:10:41 -0000 1.16 @@ -1,13 +1,14 @@ Name: filezilla -Version: 3.0.11.1 -Release: 1%{?dist} +Version: 3.1.0 +Release: 0.1.beta2%{?dist} Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet License: GPLv2+ URL: http://filezilla-project.org/ -Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}-beta2_src.tar.bz2 Patch0: FileZilla_3.0.11-rc1-system.patch +Patch1: FileZilla_3.1.0-socket.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked @@ -39,8 +40,9 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}-beta2 %patch0 -p1 -b .system +%patch1 -p1 -b .socket #sed -i -e 's/2.0.4/1.6.3/' configure.in @@ -122,6 +124,9 @@ %changelog +* Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 3.1.0-0.1.beta2 +- Update to 3.1.0-beta2 + * Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 - Update to 3.0.11.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 8 Jul 2008 09:31:07 -0000 1.14 +++ sources 14 Jul 2008 16:10:41 -0000 1.15 @@ -1 +1 @@ -a0b7af162648ade8f593604913b6eedd FileZilla_3.0.11.1_src.tar.bz2 +0be04004b138a80f7a4d94bfd82cb69d FileZilla_3.1.0-beta2_src.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 8 Jul 2008 09:31:07 -0000 1.11 +++ .cvsignore 14 Jul 2008 16:10:41 -0000 1.12 @@ -1 +1 @@ -FileZilla_3.0.11.1_src.tar.bz2 +FileZilla_3.1.0-beta2_src.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 16:14:52 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 16:14:52 GMT Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.41,1.42 Message-ID: <200807141614.m6EGEqel020176@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jakarta-commons-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20108 Modified Files: jakarta-commons-el.spec Log Message: Add epoch to changelog entry. Index: jakarta-commons-el.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- jakarta-commons-el.spec 14 Jul 2008 16:08:44 -0000 1.41 +++ jakarta-commons-el.spec 14 Jul 2008 16:14:07 -0000 1.42 @@ -179,7 +179,7 @@ %changelog -* Mon Jul 14 2008 Andrew Overholt 1.0-9.4 +* Mon Jul 14 2008 Andrew Overholt 0:1.0-9.4 - Update OSGi metadata for Eclipse 3.4. * Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-9.3 From fedora-extras-commits at redhat.com Mon Jul 14 16:20:22 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 14 Jul 2008 16:20:22 GMT Subject: rpms/ruby-rpm/devel ruby-rpm.spec,1.2,1.3 Message-ID: <200807141620.m6EGKMKT020449@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/ruby-rpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20362 Modified Files: ruby-rpm.spec Log Message: Rebuilt for RPM 4.5 Index: ruby-rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby-rpm/devel/ruby-rpm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ruby-rpm.spec 19 Feb 2008 12:52:39 -0000 1.2 +++ ruby-rpm.spec 14 Jul 2008 16:18:14 -0000 1.3 @@ -7,7 +7,7 @@ Name: ruby-rpm Version: 1.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Languages License: GPLv2+ URL: http://rubyforge.org/projects/ruby-rpm/ @@ -64,6 +64,9 @@ %{ruby_sitearch}/rpmmodule.so %changelog +* Mon Jul 14 2008 David Lutterkort - 1.2.3-5 +- Rebuilt for RPM 4.5 + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.3-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 16:26:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jean-Fran=C3=A7ois_Martin?= (lokthare)) Date: Mon, 14 Jul 2008 16:26:03 GMT Subject: rpms/almanah/devel almanah.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807141626.m6EGQ3cT020902@cvs-int.fedora.redhat.com> Author: lokthare Update of /cvs/pkgs/rpms/almanah/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20785/devel Modified Files: .cvsignore sources Added Files: almanah.spec import.log Log Message: Initial import to devel from src.rpm --- NEW FILE almanah.spec --- Name: almanah Version: 0.4.0 Release: 2%{?dist} Summary: A application to allow you to keep a diary of your life Group: Applications/Productivity License: GPLv3+ URL: http://tecnocode.co.uk/projects/almanah/ Source0: http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext gpgme-devel sqlite-devel gtkspell-devel GConf2-devel BuildRequires: glib2-devel gtk2-devel intltool desktop-file-utils %description Almanah is a small GTK+ application to allow you to keep a diary of your life. %prep %setup -q chmod -x README AUTHORS NEWS ChangeLog src/{main,interface}.{c,h} sed -i 's/Icon=diary/Icon=almanah/' data/%{name}.desktop.in %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor="fedora" \ --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %preun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Jul 14 2008 Jean-Fran??ois Martin - 0.4.0-2 - Fix rpmlint warnings - Include ChangeLog - Fix icon name in desktop file * Sat Jul 12 2008 Jean-Fran??ois Martin - 0.4.0-1 - Change to the new name - Remove GConf scriplets * Mon Jun 23 2008 Jean-Fran??ois Martin 0.3.1-1 - Update to the new release - Drop the patch (fixed upstream) * Fri Jun 20 2008 Jean-Fran??ois Martin 0.3-1 - Update to the new release * Wed May 21 2008 Jean-Fran??ois Martin 0.2-1 - First RPM release. --- NEW FILE import.log --- almanah-0_4_0-2_fc9:HEAD:almanah-0.4.0-2.fc9.src.rpm:1216052644 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/almanah/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 16:03:21 -0000 1.1 +++ .cvsignore 14 Jul 2008 16:25:03 -0000 1.2 @@ -0,0 +1 @@ +almanah-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/almanah/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 16:03:21 -0000 1.1 +++ sources 14 Jul 2008 16:25:03 -0000 1.2 @@ -0,0 +1 @@ +59cdbff0ba8e53d736011608aeb6a8e3 almanah-0.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 16:27:14 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 16:27:14 GMT Subject: rpms/tomcat5/devel tomcat5-5.5-acceptlangheader.patch, 1.1, 1.2 tomcat5-5.5-connectors-util-build.patch, 1.1, 1.2 tomcat5-5.5-http11-build.patch, 1.4, 1.5 tomcat5-5.5-jk-build.patch, 1.3, 1.4 tomcat5-5.5-jspc-classpath.patch, 1.2, 1.3 tomcat5-5.5-jspc.sh.patch, 1.2, 1.3 tomcat5-5.5-skip-jsp-precompile.patch, 1.1, 1.2 tomcat5-5.5-util-build.patch, 1.2, 1.3 tomcat5.spec, 1.114, 1.115 Message-ID: <200807141627.m6EGREpb021088@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/tomcat5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20959 Modified Files: tomcat5-5.5-acceptlangheader.patch tomcat5-5.5-connectors-util-build.patch tomcat5-5.5-http11-build.patch tomcat5-5.5-jk-build.patch tomcat5-5.5-jspc-classpath.patch tomcat5-5.5-jspc.sh.patch tomcat5-5.5-skip-jsp-precompile.patch tomcat5-5.5-util-build.patch tomcat5.spec Log Message: - Update patches to apply with 0 fuzz. tomcat5-5.5-acceptlangheader.patch: Index: tomcat5-5.5-acceptlangheader.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-acceptlangheader.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat5-5.5-acceptlangheader.patch 16 Nov 2007 02:57:27 -0000 1.1 +++ tomcat5-5.5-acceptlangheader.patch 14 Jul 2008 16:26:18 -0000 1.2 @@ -1,6 +1,6 @@ ---- container/catalina/src/share/org/apache/catalina/connector/Request.java.old 2007-11-15 16:40:42.000000000 -0800 -+++ container/catalina/src/share/org/apache/catalina/connector/Request.java 2007-11-15 16:46:19.000000000 -0800 -@@ -2488,6 +2488,9 @@ +--- container/catalina/src/share/org/apache/catalina/connector/Request.java.old 2008-07-14 12:13:28.000000000 -0400 ++++ container/catalina/src/share/org/apache/catalina/connector/Request.java 2008-07-14 12:14:39.000000000 -0400 +@@ -2508,6 +2508,9 @@ String variant = null; int dash = entry.indexOf('-'); if (dash < 0) { @@ -10,16 +10,18 @@ language = entry; country = ""; variant = ""; -@@ -2501,6 +2504,12 @@ +@@ -2521,7 +2524,13 @@ country = cTemp; } else { variant = ""; -+ } +- } ++ } + if (!language.matches(localeRegex)) { + continue; + } + if (!country.matches(localeRegex)) { + continue; - } ++ } } if (!isAlpha(language) || !isAlpha(country) || !isAlpha(variant)) { + continue; tomcat5-5.5-connectors-util-build.patch: Index: tomcat5-5.5-connectors-util-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-connectors-util-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat5-5.5-connectors-util-build.patch 14 Mar 2007 21:36:42 -0000 1.1 +++ tomcat5-5.5-connectors-util-build.patch 14 Jul 2008 16:26:18 -0000 1.2 @@ -1,6 +1,6 @@ ---- ./connectors/util/build.xml.sav 2007-03-14 15:13:18.000000000 -0400 -+++ ./connectors/util/build.xml 2007-03-14 17:25:27.000000000 -0400 -@@ -44,7 +44,9 @@ +--- connectors/util/build.xml.sav 2008-07-14 12:20:27.000000000 -0400 ++++ connectors/util/build.xml 2008-07-14 12:21:22.000000000 -0400 +@@ -61,7 +61,9 @@ @@ -10,7 +10,7 @@ -@@ -72,6 +74,7 @@ +@@ -89,6 +91,7 @@ debug="${compile.debug}" optimize="off" verbose="off" tomcat5-5.5-http11-build.patch: Index: tomcat5-5.5-http11-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-http11-build.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tomcat5-5.5-http11-build.patch 17 Nov 2007 00:35:30 -0000 1.4 +++ tomcat5-5.5-http11-build.patch 14 Jul 2008 16:26:18 -0000 1.5 @@ -1,6 +1,6 @@ ---- connectors/http11/build.xml.orig 2007-02-26 10:27:04.000000000 -0500 -+++ connectors/http11/build.xml 2007-02-26 10:28:11.000000000 -0500 -@@ -31,7 +31,7 @@ +--- connectors/http11/build.xml.orig 2008-07-14 11:45:53.000000000 -0400 ++++ connectors/http11/build.xml 2008-07-14 11:51:44.000000000 -0400 +@@ -48,7 +48,7 @@ @@ -9,7 +9,7 @@ -@@ -169,7 +169,10 @@ +@@ -186,7 +186,10 @@ deprecation="${compile.deprecation}" optimize="${compile.optimize}"> tomcat5-5.5-jk-build.patch: Index: tomcat5-5.5-jk-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jk-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tomcat5-5.5-jk-build.patch 16 May 2007 10:57:12 -0000 1.3 +++ tomcat5-5.5-jk-build.patch 14 Jul 2008 16:26:18 -0000 1.4 @@ -1,6 +1,6 @@ ---- connectors/jk/build.xml.p14 2006-03-05 02:25:22.000000000 +0100 -+++ connectors/jk/build.xml 2006-03-23 19:25:51.000000000 +0100 -@@ -28,7 +28,7 @@ +--- connectors/jk/build.xml.p14 2008-07-14 11:55:14.000000000 -0400 ++++ connectors/jk/build.xml 2008-07-14 11:58:29.000000000 -0400 +@@ -45,7 +45,7 @@ @@ -9,7 +9,7 @@ -@@ -211,6 +211,7 @@ +@@ -230,6 +230,7 @@ @@ -17,7 +17,7 @@ -@@ -252,6 +252,7 @@ +@@ -269,6 +270,7 @@ tomcat5-5.5-jspc-classpath.patch: Index: tomcat5-5.5-jspc-classpath.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jspc-classpath.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcat5-5.5-jspc-classpath.patch 7 Jul 2006 17:16:45 -0000 1.2 +++ tomcat5-5.5-jspc-classpath.patch 14 Jul 2008 16:26:18 -0000 1.3 @@ -1,6 +1,6 @@ ---- build/build.xml.sav 2006-02-21 13:48:51.743828000 -0500 -+++ build/build.xml 2006-02-21 13:48:56.499065000 -0500 -@@ -416,6 +416,7 @@ +--- build/build.xml.sav 2008-07-14 11:59:37.000000000 -0400 ++++ build/build.xml 2008-07-14 11:59:57.000000000 -0400 +@@ -433,6 +433,7 @@ tomcat5-5.5-jspc.sh.patch: Index: tomcat5-5.5-jspc.sh.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jspc.sh.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcat5-5.5-jspc.sh.patch 5 Jul 2006 22:50:50 -0000 1.2 +++ tomcat5-5.5-jspc.sh.patch 14 Jul 2008 16:26:18 -0000 1.3 @@ -1,6 +1,6 @@ ---- jasper/src/bin/jspc.sh.sav 2006-03-23 17:33:40.000000000 +0100 -+++ jasper/src/bin/jspc.sh 2006-03-23 17:35:26.000000000 +0100 -@@ -5,32 +5,9 @@ +--- jasper/src/bin/jspc.sh.sav 2008-07-14 11:30:15.000000000 -0400 ++++ jasper/src/bin/jspc.sh 2008-07-14 11:31:25.000000000 -0400 +@@ -21,32 +21,9 @@ # $Id$ # ----------------------------------------------------------------------------- tomcat5-5.5-skip-jsp-precompile.patch: Index: tomcat5-5.5-skip-jsp-precompile.patch =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-skip-jsp-precompile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat5-5.5-skip-jsp-precompile.patch 13 Jul 2006 20:10:14 -0000 1.1 +++ tomcat5-5.5-skip-jsp-precompile.patch 14 Jul 2008 16:26:18 -0000 1.2 @@ -1,22 +1,18 @@ -*** build/build.xml.orig 2006-07-13 12:05:51.000000000 -0400 ---- build/build.xml 2006-07-13 12:06:17.000000000 -0400 -*************** -*** 429,434 **** ---- 429,435 ---- - - - -+ - - + + ++ + + @@ -9,7 +9,7 @@ -@@ -73,7 +73,10 @@ +@@ -90,7 +90,10 @@ optimize="off" verbose="off" excludes="**/CVS/**"> Index: tomcat5.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- tomcat5.spec 14 Jul 2008 14:37:38 -0000 1.114 +++ tomcat5.spec 14 Jul 2008 16:26:18 -0000 1.115 @@ -1308,6 +1308,7 @@ %changelog * Mon Jul 14 2008 Andrew Overholt 0:5.5.26-1.5 - Bump OSGi version numbers to match Eclipse SDK 3.4. +- Update patches to apply with 0 fuzz. * Thu Jul 10 2008 Tom "spot" Callaway - 0:5.5.26-1.4 - drop repotag From fedora-extras-commits at redhat.com Mon Jul 14 16:28:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jean-Fran=C3=A7ois_Martin?= (lokthare)) Date: Mon, 14 Jul 2008 16:28:44 GMT Subject: rpms/almanah/F-9 almanah.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807141628.m6EGSi1l021317@cvs-int.fedora.redhat.com> Author: lokthare Update of /cvs/pkgs/rpms/almanah/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21158/F-9 Modified Files: .cvsignore sources Added Files: almanah.spec import.log Log Message: Initial import to f-9 branch from the src.rpm --- NEW FILE almanah.spec --- Name: almanah Version: 0.4.0 Release: 2%{?dist} Summary: A application to allow you to keep a diary of your life Group: Applications/Productivity License: GPLv3+ URL: http://tecnocode.co.uk/projects/almanah/ Source0: http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext gpgme-devel sqlite-devel gtkspell-devel GConf2-devel BuildRequires: glib2-devel gtk2-devel intltool desktop-file-utils %description Almanah is a small GTK+ application to allow you to keep a diary of your life. %prep %setup -q chmod -x README AUTHORS NEWS ChangeLog src/{main,interface}.{c,h} sed -i 's/Icon=diary/Icon=almanah/' data/%{name}.desktop.in %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor="fedora" \ --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %preun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Jul 14 2008 Jean-Fran??ois Martin - 0.4.0-2 - Fix rpmlint warnings - Include ChangeLog - Fix icon name in desktop file * Sat Jul 12 2008 Jean-Fran??ois Martin - 0.4.0-1 - Change to the new name - Remove GConf scriplets * Mon Jun 23 2008 Jean-Fran??ois Martin 0.3.1-1 - Update to the new release - Drop the patch (fixed upstream) * Fri Jun 20 2008 Jean-Fran??ois Martin 0.3-1 - Update to the new release * Wed May 21 2008 Jean-Fran??ois Martin 0.2-1 - First RPM release. --- NEW FILE import.log --- almanah-0_4_0-2_fc9:F-9:almanah-0.4.0-2.fc9.src.rpm:1216052828 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/almanah/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 16:03:21 -0000 1.1 +++ .cvsignore 14 Jul 2008 16:27:58 -0000 1.2 @@ -0,0 +1 @@ +almanah-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/almanah/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 16:03:21 -0000 1.1 +++ sources 14 Jul 2008 16:27:58 -0000 1.2 @@ -0,0 +1 @@ +59cdbff0ba8e53d736011608aeb6a8e3 almanah-0.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 16:34:08 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 16:34:08 GMT Subject: rpms/phonon/devel phonon.spec,1.4,1.5 Message-ID: <200807141634.m6EGY8LA021781@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21662 Modified Files: phonon.spec Log Message: * Mon Jul 14 2008 Rex Dieter 4.2-0.4.beta2 - BR: automoc4 - -backend-gstreamer subpkg Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- phonon.spec 1 Jul 2008 09:11:18 -0000 1.4 +++ phonon.spec 14 Jul 2008 16:33:22 -0000 1.5 @@ -5,7 +5,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.2 -Release: 0.3.%{?beta_tag}%{?dist} +Release: 0.4.%{?beta_tag}%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -15,7 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/phonon-%{beta}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automoc +BuildRequires: automoc4 BuildRequires: cmake BuildRequires: glib2-devel BuildRequires: gstreamer-devel @@ -24,14 +24,22 @@ BuildRequires: libxml2-devel BuildRequires: qt4-devel -# not sure exactly how best to version this one -- Rex -Provides: phonon-backend = %{version}-%{release} -# subpkg? -- Rex -Provides: phonon-backend-gstreamer = %{version}-%{release} +Requires: phonon-backend %description %{summary}. +%package backend-gstreamer +Summary: Gstreamer phonon backend +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} +# not sure exactly how best to version this one -- Rex +Provides: phonon-backend = %{version}-%{release} +# (temporary) upgrade path +Obsoletes: phonon < 4.2-0.4 +%description backend-gstreamer +%{summary}. + %package devel Summary: Developer files for %{name} Group: Development/Libraries @@ -42,6 +50,7 @@ %{summary}. + %prep %setup -q -n phonon-%{beta} @@ -49,11 +58,10 @@ %build mkdir -p %{_target_platform} pushd %{_target_platform} -# %%cmake_kde4 or just %%cmake ? (and whether to use %%kde4_* macros or not) -- Rex %{cmake} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -79,7 +87,9 @@ # kde4-specific dirs %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/ %dir %{_kde4_datadir}/kde4/services/phononbackends/ -# phonon-backend-gstreamer + +%files backend-gstreamer +%defattr(-,root,root,-) %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop @@ -93,6 +103,10 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4.2-0.4.beta2 +- BR: automoc4 +- -backend-gstreamer subpkg + * Tue Jul 01 2008 Kevin Kofler 4.2-0.3.beta2 - drop automoc libsuffix patch, no longer needed From fedora-extras-commits at redhat.com Mon Jul 14 16:34:37 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 14 Jul 2008 16:34:37 GMT Subject: rpms/system-config-printer/devel pycups-1.9.41.tar.bz2.sig, NONE, 1.1 pycups-1.9.41.tar.bz2, 1.1, NONE Message-ID: <200807141634.m6EGYb0q021861@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21792 Added Files: pycups-1.9.41.tar.bz2.sig Removed Files: pycups-1.9.41.tar.bz2 Log Message: Replaced tarball (accidentally checked in) with signature. --- NEW FILE pycups-1.9.41.tar.bz2.sig --- ?? --- pycups-1.9.41.tar.bz2 DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 16:34:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 16:34:57 GMT Subject: rpms/abcMIDI/devel abcMIDI.spec,1.17,1.18 Message-ID: <200807141634.m6EGYv4N021927@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/abcMIDI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21763 Modified Files: abcMIDI.spec Log Message: fix license tag Index: abcMIDI.spec =================================================================== RCS file: /cvs/pkgs/rpms/abcMIDI/devel/abcMIDI.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- abcMIDI.spec 19 Feb 2008 03:24:14 -0000 1.17 +++ abcMIDI.spec 14 Jul 2008 16:33:53 -0000 1.18 @@ -1,10 +1,10 @@ Name: abcMIDI Version: 20070106 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia -License: GPL +License: GPLv2+ URL: http://abc.sourceforge.net/abcMIDI Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2007-01-06.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,6 +61,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 20070106-3 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 20070106-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 16:41:09 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Mon, 14 Jul 2008 16:41:09 GMT Subject: comps comps-f10.xml.in,1.48,1.49 Message-ID: <200807141641.m6EGf9L9022401@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22316 Modified Files: comps-f10.xml.in Log Message: add icelandic and asana-math fonts Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- comps-f10.xml.in 11 Jul 2008 23:02:23 -0000 1.48 +++ comps-f10.xml.in 14 Jul 2008 16:40:39 -0000 1.49 @@ -1092,6 +1092,7 @@ stix-fonts units alliance + asana-math-fonts atlas blacs blas @@ -1354,6 +1355,7 @@ thaifonts-scalable VLGothic-fonts andika-fonts + asana-math-fonts baekmuk-ttf-fonts-batang baekmuk-ttf-fonts-dotum baekmuk-ttf-fonts-hline @@ -1385,6 +1387,7 @@ gfs-porson-fonts gfs-solomos-fonts gfs-theokritos-fonts + icelandic-fonts inconsolata-fonts linux-libertine-fonts madan-fonts From fedora-extras-commits at redhat.com Mon Jul 14 16:43:55 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 14 Jul 2008 16:43:55 GMT Subject: rpms/rpmreaper/devel rpmreaper.spec,1.2,1.3 Message-ID: <200807141643.m6EGhtRI022572@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/rpmreaper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22488 Modified Files: rpmreaper.spec Log Message: - fix building with new rpm (Panu Matilainen) Index: rpmreaper.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmreaper/devel/rpmreaper.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rpmreaper.spec 25 Jun 2008 17:28:09 -0000 1.2 +++ rpmreaper.spec 14 Jul 2008 16:42:30 -0000 1.3 @@ -1,6 +1,6 @@ Name: rpmreaper Version: 0.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for removing packages from system Group: Applications/System @@ -19,7 +19,7 @@ %setup -q %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT" %install rm -rf $RPM_BUILD_ROOT @@ -35,6 +35,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Mon Jul 14 2008 Miroslav Lichvar 0.1.4-2 +- fix building with new rpm (Panu Matilainen) + * Wed Jun 25 2008 Miroslav Lichvar 0.1.4-1 - update to 0.1.4 From fedora-extras-commits at redhat.com Mon Jul 14 16:44:43 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 14 Jul 2008 16:44:43 GMT Subject: rpms/R-systemfit/devel R-systemfit.spec,1.5,1.6 Message-ID: <200807141644.m6EGihF4022661@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-systemfit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22596 Modified Files: R-systemfit.spec Log Message: * Mon Jul 14 2008 Orion Poplawski - 1.0-3 - Add BR R-lmtest Index: R-systemfit.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-systemfit/devel/R-systemfit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-systemfit.spec 14 Jul 2008 15:57:54 -0000 1.5 +++ R-systemfit.spec 14 Jul 2008 16:44:12 -0000 1.6 @@ -4,12 +4,12 @@ Summary: Simultaneous Equation Estimation R Package Name: R-%{packname} Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Engineering Source0: http://www.uni-kiel.de/agrarpol/ahenningsen/systemfit/%{packname}_%{version}-%{packrel}.tar.gz URL: http://www.systemfit.org/ -BuildRequires: R-devel, R-Matrix, R-car, tetex-latex +BuildRequires: R-devel, R-Matrix, R-car, R-lmtest, tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires(post): R @@ -77,6 +77,9 @@ %changelog +* Mon Jul 14 2008 Orion Poplawski - 1.0-3 +- Add BR R-lmtest + * Mon Jul 14 2008 Tom "spot" Callaway - 1.0-2 - fix license tag From fedora-extras-commits at redhat.com Mon Jul 14 16:54:09 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 14 Jul 2008 16:54:09 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.46, 1.47 cairo-dock.spec, 1.60, 1.61 sources, 1.46, 1.47 Message-ID: <200807141654.m6EGs9AM023377@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23309 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Tue Jul 15 2008 Mamoru Tasaka - rev. 1203 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 12 Jul 2008 15:38:07 -0000 1.46 +++ .cvsignore 14 Jul 2008 16:53:21 -0000 1.47 @@ -1 +1 @@ -cairo-dock-sources-svn1193_trunk.tar.bz2 +cairo-dock-sources-svn1203_trunk.tar.bz2 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- cairo-dock.spec 12 Jul 2008 15:38:07 -0000 1.60 +++ cairo-dock.spec 14 Jul 2008 16:53:21 -0000 1.61 @@ -3,7 +3,7 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver svn1193_trunk +%define tarballver svn1203_trunk %define mainver 1.6.1 %define build_gecko 1 @@ -195,8 +195,6 @@ %endif # temporary fix -# switcher is not ready -sed -i.dir -e '/switcher/d' Makefile.am # musicplayer cd musicplayer/ @@ -510,8 +508,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun Jul 13 2008 Mamoru Tasaka -- rev. 1193 +* Tue Jul 15 2008 Mamoru Tasaka +- rev. 1203 * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 12 Jul 2008 15:38:07 -0000 1.46 +++ sources 14 Jul 2008 16:53:21 -0000 1.47 @@ -1 +1 @@ -0d6df057b1a2c1b66ef0bab7092d6f5d cairo-dock-sources-svn1193_trunk.tar.bz2 +03f4f1a745f6bb0093d5362641cac53e cairo-dock-sources-svn1203_trunk.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 16:56:28 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 16:56:28 GMT Subject: rpms/gajim/F-8 gajim.spec,1.19,1.20 Message-ID: <200807141656.m6EGuSuk023565@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23383/F-8 Modified Files: gajim.spec Log Message: Fixed Spec in F-8, F-9 and devel. Modified Files: F-8/gajim.spec F-9/gajim.spec devel/gajim.spec Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/F-8/gajim.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gajim.spec 26 Dec 2007 21:59:39 -0000 1.19 +++ gajim.spec 14 Jul 2008 16:54:46 -0000 1.20 @@ -1,97 +1,91 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Name: gajim -Version: 0.11.4 -Release: 1%{?dist} -Summary: Jabber client written in PyGTK - -Group: Applications/Internet -License: GPLv2 -URL: http://gajim.org/ -Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: dbus-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: gtk2-devel -BuildRequires: gtkspell-devel -BuildRequires: intltool -BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig -BuildRequires: pygtk2-devel >= 2.8.0 - -Requires: bind-utils -Requires: dbus-python -#Requires: gnome-python2-gconf -Requires: pygtk2-libglade -Requires: python-docutils +Summary: Jabber client written in PyGTK +Name: gajim +Version: 0.11.4 +Release: 2%{?dist} +License: GPLv2 +Group: Applications/Internet +URL: http://gajim.org/ +Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: bind-utils +Requires: dbus-python +#Requires: gnome-python2-gconf +Requires: pygtk2-libglade +Requires: python-docutils + +BuildRequires: dbus-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: gtkspell-devel +BuildRequires: intltool +BuildRequires: libXScrnSaver-devel +BuildRequires: pkgconfig +BuildRequires: pygtk2-devel >= 2.8.0 %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. - %prep %setup -q - %build %configure \ - --disable-dependency-tracking \ - --disable-static \ - --enable-remote \ - --enable-gtkspell \ - --enable-idle \ - --enable-trayicon \ - --libdir="%{python_sitearch}" - -make \ - %{?_smp_mflags} + --disable-dependency-tracking \ + --disable-static \ + --enable-remote \ + --enable-gtkspell \ + --enable-idle \ + --enable-trayicon \ + --libdir=%{python_sitearch} +make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +rm -rf $RPM_BUILD_ROOT -rm -rf %{buildroot}%{python_sitearch}/gajim/*.la +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -# silence rpmlint warnings -chmod +x %{buildroot}%{_datadir}/gajim/src/{gajim{,-remote},history_manager}.py +rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --remove-category=Application \ - --vendor=fedora \ - --delete-original \ - %{buildroot}%{_datadir}/applications/gajim.desktop +# silence rpmlint warnings +chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category=Application \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} - %clean rm -rf %{buildroot} - %files -f %{name}.lang %defattr(-,root,root,-) -%{_bindir}/gajim -%{_bindir}/gajim-remote +%{_bindir}/%{name} +%{_bindir}/%{name}-remote %dir %{python_sitearch}/gajim/ -%{python_sitearch}/gajim/gtkspell.so -%{python_sitearch}/gajim/idle.so -%{python_sitearch}/gajim/trayicon.so +%{python_sitearch}/%{name}/gtkspell.so +%{python_sitearch}/%{name}/idle.so +%{python_sitearch}/%{name}/trayicon.so %{_datadir}/applications/*gajim.desktop -%{_datadir}/gajim/ +%{_datadir}/%{name}/ %{_datadir}/pixmaps/gajim* -%{_docdir}/gajim/ +%{_docdir}/%{name}/ %{_mandir}/man1/gajim.1* %{_mandir}/man1/gajim-remote.1* - %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.11.4-2 +- Autorebuild for gcc-4.3. + * Wed Dec 26 2007 Mat??j Cepl 0.11.4-1 - New upstream release. From fedora-extras-commits at redhat.com Mon Jul 14 16:56:53 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 16:56:53 GMT Subject: rpms/gajim/F-9 gajim.spec,1.22,1.23 Message-ID: <200807141656.m6EGurwI023598@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23383/F-9 Modified Files: gajim.spec Log Message: Fixed Spec in F-8, F-9 and devel. Modified Files: F-8/gajim.spec F-9/gajim.spec devel/gajim.spec Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/F-9/gajim.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gajim.spec 19 Feb 2008 21:41:53 -0000 1.22 +++ gajim.spec 14 Jul 2008 16:55:28 -0000 1.23 @@ -1,99 +1,90 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Name: gajim -Version: 0.11.4 -Release: 2%{?dist} -Summary: Jabber client written in PyGTK - -Group: Applications/Internet -License: GPLv2 -URL: http://gajim.org/ -Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: dbus-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: gtk2-devel -BuildRequires: gtkspell-devel -BuildRequires: intltool -BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig -BuildRequires: pygtk2-devel >= 2.8.0 - -Requires: bind-utils -Requires: dbus-python -#Requires: gnome-python2-gconf -Requires: pygtk2-libglade -Requires: python-docutils +Summary: Jabber client written in PyGTK +Name: gajim +Version: 0.11.4 +Release: 2%{?dist} +License: GPLv2 +Group: Applications/Internet +URL: http://gajim.org/ +Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: bind-utils +Requires: dbus-python +#Requires: gnome-python2-gconf +Requires: pygtk2-libglade +Requires: python-docutils + +BuildRequires: dbus-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: gtkspell-devel +BuildRequires: intltool +BuildRequires: libXScrnSaver-devel +BuildRequires: pkgconfig +BuildRequires: pygtk2-devel >= 2.8.0 %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. - %prep %setup -q - %build %configure \ - --disable-dependency-tracking \ - --disable-static \ - --enable-remote \ - --enable-gtkspell \ - --enable-idle \ - --enable-trayicon \ - --libdir="%{python_sitearch}" - -make \ - %{?_smp_mflags} + --disable-dependency-tracking \ + --disable-static \ + --enable-remote \ + --enable-gtkspell \ + --enable-idle \ + --enable-trayicon \ + --libdir=%{python_sitearch} +make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +rm -rf $RPM_BUILD_ROOT -rm -rf %{buildroot}%{python_sitearch}/gajim/*.la +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -# silence rpmlint warnings -chmod +x %{buildroot}%{_datadir}/gajim/src/{gajim{,-remote},history_manager}.py +rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --remove-category=Application \ - --vendor=fedora \ - --delete-original \ - %{buildroot}%{_datadir}/applications/gajim.desktop +# silence rpmlint warnings +chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category=Application \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} - %clean rm -rf %{buildroot} - %files -f %{name}.lang %defattr(-,root,root,-) -%{_bindir}/gajim -%{_bindir}/gajim-remote +%{_bindir}/%{name} +%{_bindir}/%{name}-remote %dir %{python_sitearch}/gajim/ -%{python_sitearch}/gajim/gtkspell.so -%{python_sitearch}/gajim/idle.so -%{python_sitearch}/gajim/trayicon.so +%{python_sitearch}/%{name}/gtkspell.so +%{python_sitearch}/%{name}/idle.so +%{python_sitearch}/%{name}/trayicon.so %{_datadir}/applications/*gajim.desktop -%{_datadir}/gajim/ +%{_datadir}/%{name}/ %{_datadir}/pixmaps/gajim* -%{_docdir}/gajim/ +%{_docdir}/%{name}/ %{_mandir}/man1/gajim.1* %{_mandir}/man1/gajim-remote.1* - %changelog * Tue Feb 19 2008 Fedora Release Engineering - 0.11.4-2 -- Autorebuild for GCC 4.3 +- Autorebuild for gcc-4.3. * Wed Dec 26 2007 Mat??j Cepl 0.11.4-1 - New upstream release. From fedora-extras-commits at redhat.com Mon Jul 14 16:56:53 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 16:56:53 GMT Subject: rpms/gajim/devel gajim.spec,1.22,1.23 Message-ID: <200807141656.m6EGuriP023597@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23383/devel Modified Files: gajim.spec Log Message: Fixed Spec in F-8, F-9 and devel. Modified Files: F-8/gajim.spec F-9/gajim.spec devel/gajim.spec Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gajim.spec 19 Feb 2008 21:41:53 -0000 1.22 +++ gajim.spec 14 Jul 2008 16:55:53 -0000 1.23 @@ -1,99 +1,90 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Name: gajim -Version: 0.11.4 -Release: 2%{?dist} -Summary: Jabber client written in PyGTK - -Group: Applications/Internet -License: GPLv2 -URL: http://gajim.org/ -Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: dbus-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: gtk2-devel -BuildRequires: gtkspell-devel -BuildRequires: intltool -BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig -BuildRequires: pygtk2-devel >= 2.8.0 - -Requires: bind-utils -Requires: dbus-python -#Requires: gnome-python2-gconf -Requires: pygtk2-libglade -Requires: python-docutils +Summary: Jabber client written in PyGTK +Name: gajim +Version: 0.11.4 +Release: 2%{?dist} +License: GPLv2 +Group: Applications/Internet +URL: http://gajim.org/ +Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: bind-utils +Requires: dbus-python +#Requires: gnome-python2-gconf +Requires: pygtk2-libglade +Requires: python-docutils + +BuildRequires: dbus-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: gtkspell-devel +BuildRequires: intltool +BuildRequires: libXScrnSaver-devel +BuildRequires: pkgconfig +BuildRequires: pygtk2-devel >= 2.8.0 %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. - %prep %setup -q - %build %configure \ - --disable-dependency-tracking \ - --disable-static \ - --enable-remote \ - --enable-gtkspell \ - --enable-idle \ - --enable-trayicon \ - --libdir="%{python_sitearch}" - -make \ - %{?_smp_mflags} + --disable-dependency-tracking \ + --disable-static \ + --enable-remote \ + --enable-gtkspell \ + --enable-idle \ + --enable-trayicon \ + --libdir=%{python_sitearch} +make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +rm -rf $RPM_BUILD_ROOT -rm -rf %{buildroot}%{python_sitearch}/gajim/*.la +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -# silence rpmlint warnings -chmod +x %{buildroot}%{_datadir}/gajim/src/{gajim{,-remote},history_manager}.py +rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --remove-category=Application \ - --vendor=fedora \ - --delete-original \ - %{buildroot}%{_datadir}/applications/gajim.desktop +# silence rpmlint warnings +chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category=Application \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} - %clean rm -rf %{buildroot} - %files -f %{name}.lang %defattr(-,root,root,-) -%{_bindir}/gajim -%{_bindir}/gajim-remote +%{_bindir}/%{name} +%{_bindir}/%{name}-remote %dir %{python_sitearch}/gajim/ -%{python_sitearch}/gajim/gtkspell.so -%{python_sitearch}/gajim/idle.so -%{python_sitearch}/gajim/trayicon.so +%{python_sitearch}/%{name}/gtkspell.so +%{python_sitearch}/%{name}/idle.so +%{python_sitearch}/%{name}/trayicon.so %{_datadir}/applications/*gajim.desktop -%{_datadir}/gajim/ +%{_datadir}/%{name}/ %{_datadir}/pixmaps/gajim* -%{_docdir}/gajim/ +%{_docdir}/%{name}/ %{_mandir}/man1/gajim.1* %{_mandir}/man1/gajim-remote.1* - %changelog * Tue Feb 19 2008 Fedora Release Engineering - 0.11.4-2 -- Autorebuild for GCC 4.3 +- Autorebuild for gcc-4.3. * Wed Dec 26 2007 Mat??j Cepl 0.11.4-1 - New upstream release. From fedora-extras-commits at redhat.com Mon Jul 14 16:57:11 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 14 Jul 2008 16:57:11 GMT Subject: rpms/ardour/F-9 ardour-2.5-gcc43.patch, NONE, 1.1 ardour.script, 1.2, 1.3 ardour.spec, 1.15, 1.16 sources, 1.6, 1.7 ardour-2.4-gcc43.patch, 1.1, NONE ardour-session.cc-_total_free_4k_blocks.patch, 1.1, NONE Message-ID: <200807141657.m6EGvBVK023610@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/ardour/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23542 Modified Files: ardour.script ardour.spec sources Added Files: ardour-2.5-gcc43.patch Removed Files: ardour-2.4-gcc43.patch ardour-session.cc-_total_free_4k_blocks.patch Log Message: Upgrade to 2.5 ardour-2.5-gcc43.patch: --- NEW FILE ardour-2.5-gcc43.patch --- --- libs/surfaces/tranzport/screen.cc~ 2008-04-18 06:54:21.000000000 -0700 +++ libs/surfaces/tranzport/screen.cc 2008-07-13 22:19:39.000000000 -0700 @@ -19,6 +19,7 @@ * */ #include +#include void TranzportControlProtocol::screen_clear () Index: ardour.script =================================================================== RCS file: /cvs/pkgs/rpms/ardour/F-9/ardour.script,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ardour.script 22 Jan 2008 22:09:11 -0000 1.2 +++ ardour.script 14 Jul 2008 16:56:15 -0000 1.3 @@ -5,6 +5,7 @@ if ! test -d $A2DIR; then mkdir -p $A2DIR touch $A2DIR/ardourver2.2 + touch $A2DIR/ardourver2.5 else if ! test -a $A2DIR/ardourver2.2; then if test -a $A2DIR/ardour2_ui.rc; then @@ -18,6 +19,12 @@ fi touch $A2DIR/ardourver2.2 fi + if ! test -a $A2DIR/ardourver2.5; then + if test -a $A2DIR/ardour.bindings; then + mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak + fi + touch $A2DIR/ardourver2.5 + fi fi exec /usr/libexec/ardour2 "$@" Index: ardour.spec =================================================================== RCS file: /cvs/pkgs/rpms/ardour/F-9/ardour.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ardour.spec 10 Apr 2008 12:48:05 -0000 1.15 +++ ardour.spec 14 Jul 2008 16:56:15 -0000 1.16 @@ -1,14 +1,13 @@ Summary: Multichannel Digital Audio Workstation Name: ardour -Version: 2.4.1 +Version: 2.5 Release: 1%{?dist} Source: http://ardour.org/files/releases/ardour-%{version}.tar.bz2 Source1: ardour2.desktop Source2: ardour.script Patch0: ardour-2.1-SConstruct.patch Patch1: ardour-session.cc-no_stomp.patch -Patch2: ardour-session.cc-_total_free_4k_blocks.patch -Patch3: ardour-2.4-gcc43.patch +Patch2: ardour-2.5-gcc43.patch URL: http://ardour.org License: GPLv2+ Group: Applications/Multimedia @@ -25,6 +24,7 @@ BuildRequires: fftw-devel BuildRequires: gtkmm24-devel >= 2.8 BuildRequires: libgnomecanvasmm26-devel >= 2.12 +BuildRequires: aubio-devel Requires: hicolor-icon-theme BuildRequires: desktop-file-utils @@ -54,7 +54,7 @@ %patch0 -p1 %patch1 -p0 %patch2 -p0 -%patch3 -p1 +#%patch3 -p1 for i in README.fr README.it TRANSLATORS; do iconv -f ISO-8859-1 -t UTF8 DOCUMENTATION/$i > DOCUMENTATION/$i.tmp mv DOCUMENTATION/$i.tmp DOCUMENTATION/$i @@ -142,6 +142,10 @@ %{_datadir}/applications/fedora-ardour2.desktop %changelog +* Sun Jul 13 2008 Anthony Green 2.5-1 +- New upstream release 2.5. +- Update script to backup pre-2.5 ardour.bindings files, and start fresh. + * Thu Apr 10 2008 Hans de Goede 2.4.1-1 - New upstream release 2.4.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ardour/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 Apr 2008 12:48:05 -0000 1.6 +++ sources 14 Jul 2008 16:56:15 -0000 1.7 @@ -1 +1 @@ -f132caaf613f3cb44ca9f9dafb38fbae ardour-2.4.1.tar.bz2 +88180d400e8c19ceea41aabadc098116 ardour-2.5.tar.bz2 --- ardour-2.4-gcc43.patch DELETED --- --- ardour-session.cc-_total_free_4k_blocks.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 17:01:31 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Mon, 14 Jul 2008 17:01:31 GMT Subject: rpms/speech-dispatcher/OLPC-2 import.log, 1.2, 1.3 speech-dispatcher.spec, 1.2, 1.3 Message-ID: <200807141701.m6EH1VxN027440@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23437/OLPC-2 Modified Files: import.log speech-dispatcher.spec Log Message: Trying conditional build for OLPC branch Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Jul 2008 17:17:52 -0000 1.2 +++ import.log 14 Jul 2008 17:00:32 -0000 1.3 @@ -1,2 +1,3 @@ speech-dispatcher-0_6_6-13_fc7:OLPC-2:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288283 speech-dispatcher-0_6_6-14_fc7:OLPC-2:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215969412 +speech-dispatcher-0_6_6-15_fc7:OLPC-2:speech-dispatcher-0.6.6-15.fc7.src.rpm:1216053499 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/speech-dispatcher.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- speech-dispatcher.spec 13 Jul 2008 17:17:52 -0000 1.2 +++ speech-dispatcher.spec 14 Jul 2008 17:00:32 -0000 1.3 @@ -1,8 +1,16 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%if 0%{?olpc} +%bcond_without nas +%bcond_without pulse +%else +%bcond_with nas +%bcond_with pulse +%endif + Name: speech-dispatcher Version: 0.6.6 -Release: 14%{?dist} +Release: 15%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -25,8 +33,11 @@ BuildRequires: flite-devel BuildRequires: espeak-devel -%if 1%{?olpc} >= 2 +%if %{with nas} Buildrequires: nas-devel +%endif + +%if %{with pulse} Buildrequires: pulseaudio-lib-devel %endif @@ -90,14 +101,8 @@ iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi mv doc/speech-dispatcher-cs_c.texi doc/speech-dispatcher-cs.texi -%if 1%{?olpc} >= 2 -%configure --disable-static --without-nas --without-pulse -make %{?_smp_mflags} -%else %configure --disable-static make %{?_smp_mflags} -%endif - %install rm -rf $RPM_BUILD_ROOT @@ -226,6 +231,10 @@ %changelog +* Mon Jul 14 2008 Hemant Goyal 0.6.6-15 + +- testing conditional build with bcond again. + * Mon Jul 13 2008 Hemant Goyal 0.6.6-14 - conditional build required for OLPC Branch - Building without nas and From fedora-extras-commits at redhat.com Mon Jul 14 17:04:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:04:19 GMT Subject: rpms/acl/devel acl-2.2.47-params.patch,NONE,1.1 acl.spec,1.48,1.49 Message-ID: <200807141704.m6EH4JAN030617@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/acl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30565 Modified Files: acl.spec Added Files: acl-2.2.47-params.patch Log Message: fix license tag, fix params patch to apply with fuzz=0 acl-2.2.47-params.patch: --- NEW FILE acl-2.2.47-params.patch --- diff -up acl-2.2.47/getfacl/getfacl.c.params acl-2.2.47/getfacl/getfacl.c --- acl-2.2.47/getfacl/getfacl.c.params 2008-02-06 22:39:57.000000000 -0500 +++ acl-2.2.47/getfacl/getfacl.c 2008-07-14 12:33:25.000000000 -0400 @@ -43,7 +43,7 @@ #define POSIXLY_CORRECT_STR "POSIXLY_CORRECT" #if !POSIXLY_CORRECT -# define CMD_LINE_OPTIONS "dRLP" +# define CMD_LINE_OPTIONS "aceEsRLPtpndvh" #endif #define POSIXLY_CMD_LINE_OPTIONS "d" @@ -555,18 +555,18 @@ void help(void) #if !POSIXLY_CORRECT } else { printf(_( -" --access display the file access control list only\n" +" -a, --access display the file access control list only\n" " -d, --default display the default access control list only\n" -" --omit-header do not display the comment header\n" -" --all-effective print all effective rights\n" -" --no-effective print no effective rights\n" -" --skip-base skip files that only have the base entries\n" +" -c, --omit-header do not display the comment header\n" +" -e, --all-effective print all effective rights\n" +" -E, --no-effective print no effective rights\n" +" -s, --skip-base skip files that only have the base entries\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" " -P, --physical physical walk, do not follow symbolic links\n" -" --tabular use tabular output format\n" -" --numeric print numeric user/group identifiers\n" -" --absolute-names don't strip leading '/' in pathnames\n")); +" -t, --tabular use tabular output format\n" +" -n, --numeric print numeric user/group identifiers\n" +" -p, --absolute-names don't strip leading '/' in pathnames\n")); } #endif printf(_( diff -up acl-2.2.47/man/man1/getfacl.1.params acl-2.2.47/man/man1/getfacl.1 --- acl-2.2.47/man/man1/getfacl.1.params 2008-02-06 22:39:57.000000000 -0500 +++ acl-2.2.47/man/man1/getfacl.1 2008-07-14 12:40:04.000000000 -0400 @@ -12,10 +12,10 @@ getfacl \- get file access control lists .SH SYNOPSIS .B getfacl -[\-dRLPvh] file ... +[\-aceEsRLPrpndvh] file ... .B getfacl -[\-dRLPvh] \- +[\-aceEsRLPrpndvh] \- .SH DESCRIPTION For each file, getfacl displays the file name, owner, the group, @@ -78,22 +78,22 @@ accessing the file mode. .SS OPTIONS .TP 4 -.I \-\-access +.I \-a, \-\-access Display the file access control list. .TP .I \-d, \-\-default Display the default access control list. .TP -.I \-\-omit-header +.I \-c, \-\-omit-header Do not display the comment header (the first three lines of each file's output). .TP -.I \-\-all-effective +.I \-e, \-\-all-effective Print all effective rights comments, even if identical to the rights defined by the ACL entry. .TP -.I \-\-no-effective +.I \-E, \-\-no-effective Do not print effective rights comments. .TP -.I \-\-skip-base +.I \-s, \-\-skip-base Skip files that only have the base ACL entries (owner, group, others). .TP .I \-R, \-\-recursive @@ -109,17 +109,20 @@ Physical walk, do not follow symbolic li link arguments. Only effective in combination with \-R. .TP -.I \-\-tabular +.I \-t, \-\-tabular Use an alternative tabular output format. The ACL and the default ACL are displayed side by side. Permissions that are ineffective due to the ACL mask entry are displayed capitalized. The entry tag names for the ACL_USER_OBJ and ACL_GROUP_OBJ entries are also displayed in capital letters, which helps in spotting those entries. .TP -.I \-\-absolute-names +.I \-p, \-\-absolute-names Do not strip leading slash characters (`/'). The default behavior is to strip leading slash characters. .TP -.I \-\-version +.I \-n, \-\-numeric +List numeric user and group IDs +.TP +.I \-v, \-\-version Print the version of getfacl and exit. .TP -.I \-\-help +.I \-h, \-\-help Print help explaining the command line options. .TP .I \-\- Index: acl.spec =================================================================== RCS file: /cvs/pkgs/rpms/acl/devel/acl.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- acl.spec 12 Feb 2008 15:37:16 -0000 1.48 +++ acl.spec 14 Jul 2008 17:03:26 -0000 1.49 @@ -1,7 +1,7 @@ Summary: Access control list utilities Name: acl Version: 2.2.47 -Release: 1%{?dist} +Release: 2%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libattr-devel >= 2.4.1 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk @@ -9,10 +9,10 @@ Patch0: acl-2.2.3-multilib.patch Patch1: acl-2.2.39-build.patch Patch2: acl-2.2.39-path_max.patch -Patch3: acl-2.2.39-params.patch +Patch3: acl-2.2.47-params.patch Patch4: acl-2.2.45-exitcode.patch Patch5: acl-2.2.39-segfault.patch -License: GPL +License: GPLv2+ Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ @@ -22,7 +22,7 @@ %package -n libacl Summary: Dynamic library for access control list support -License: LGPL +License: LGPLv2+ Group: System Environment/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -34,7 +34,7 @@ %package -n libacl-devel Summary: Access control list static libraries and headers. -License: LGPL +License: LGPLv2+ Group: Development/Libraries Requires: libacl = %{version}-%{release}, libattr-devel Requires: nfs-utils-lib, openldap @@ -107,6 +107,10 @@ /%{_lib}/libacl.so.* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 2.2.47-2 +- rework params patch to apply with fuzz=0 +- fix license tag + * Tue Feb 12 2008 Jiri Moskovcak 2.2.47-1 - new upstream version From fedora-extras-commits at redhat.com Mon Jul 14 17:07:50 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 14 Jul 2008 17:07:50 GMT Subject: rpms/R-systemfit/devel R-systemfit.spec,1.6,1.7 Message-ID: <200807141707.m6EH7ooB030800@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-systemfit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30736 Modified Files: R-systemfit.spec Log Message: Use "--no-install" in %%check to avoid missing suggested dependencies Index: R-systemfit.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-systemfit/devel/R-systemfit.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- R-systemfit.spec 14 Jul 2008 16:44:12 -0000 1.6 +++ R-systemfit.spec 14 Jul 2008 17:06:57 -0000 1.7 @@ -44,7 +44,9 @@ %check -%{_bindir}/R CMD check %{packname} +#We have to use --no-install because we don't have all of the suggested +#dependencies +%{_bindir}/R CMD check --no-install %{packname} %clean @@ -79,6 +81,7 @@ %changelog * Mon Jul 14 2008 Orion Poplawski - 1.0-3 - Add BR R-lmtest +- Use "--no-install" in %%check to avoid missing suggested dependencies * Mon Jul 14 2008 Tom "spot" Callaway - 1.0-2 - fix license tag From fedora-extras-commits at redhat.com Mon Jul 14 17:10:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:10:53 GMT Subject: rpms/acpi/devel acpi.spec,1.3,1.4 Message-ID: <200807141710.m6EHArg5030898@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/acpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30842 Modified Files: acpi.spec Log Message: fix license tag Index: acpi.spec =================================================================== RCS file: /cvs/pkgs/rpms/acpi/devel/acpi.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- acpi.spec 19 Feb 2008 17:55:43 -0000 1.3 +++ acpi.spec 14 Jul 2008 17:09:54 -0000 1.4 @@ -2,8 +2,8 @@ Summary(pl): Klient ACPI dzia??aj??cy z linii polece?? Name: acpi Version: 0.09 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2+ Group: Applications/System Source0: http://grahame.angrygoats.net/source/acpi/acpi-%{version}.tar.gz Patch0: acpi-0.09-keep_CFLAGS.diff @@ -42,6 +42,9 @@ %{_bindir}/acpi %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.09-4 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.09-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 17:12:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:12:08 GMT Subject: rpms/acpid/devel acpid.spec,1.30,1.31 Message-ID: <200807141712.m6EHC8Ek031032@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/acpid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30972 Modified Files: acpid.spec Log Message: fix license tag Index: acpid.spec =================================================================== RCS file: /cvs/pkgs/rpms/acpid/devel/acpid.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- acpid.spec 17 Apr 2008 18:58:13 -0000 1.30 +++ acpid.spec 14 Jul 2008 17:11:19 -0000 1.31 @@ -1,8 +1,8 @@ Summary: ACPI Event Daemon Name: acpid Version: 1.0.6 -Release: 7%{?dist} -License: GPL +Release: 8%{?dist} +License: GPLv2+ Group: System Environment/Daemons Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz Source1: acpid.init @@ -87,6 +87,9 @@ fi %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0.6-8 +- fix license tag + * Thu Apr 17 2008 Bill Nottingham - 1.0.6-7.fc9 - adjust start/stop priority to not conflict with HAL (#442759) From fedora-extras-commits at redhat.com Mon Jul 14 17:13:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:13:29 GMT Subject: rpms/acpitool/devel acpitool.spec,1.13,1.14 Message-ID: <200807141713.m6EHDTrm031183@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/acpitool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31128 Modified Files: acpitool.spec Log Message: fix license tag Index: acpitool.spec =================================================================== RCS file: /cvs/pkgs/rpms/acpitool/devel/acpitool.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- acpitool.spec 19 Feb 2008 17:56:44 -0000 1.13 +++ acpitool.spec 14 Jul 2008 17:12:23 -0000 1.14 @@ -1,8 +1,8 @@ Summary: Command line ACPI client Name: acpitool Version: 0.4.7 -Release: 4%{?dist} -License: GPL +Release: 5%{?dist} +License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -40,6 +40,9 @@ %{_mandir}/man1/acpitool* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.4.7-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.7-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 17:16:58 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:16:58 GMT Subject: rpms/adminutil/devel adminutil.spec,1.9,1.10 Message-ID: <200807141716.m6EHGwwN031445@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/adminutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31400 Modified Files: adminutil.spec Log Message: fix license tag Index: adminutil.spec =================================================================== RCS file: /cvs/pkgs/rpms/adminutil/devel/adminutil.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- adminutil.spec 3 Mar 2008 18:16:56 -0000 1.9 +++ adminutil.spec 14 Jul 2008 17:15:55 -0000 1.10 @@ -7,8 +7,8 @@ Summary: Utility library for directory server administration Name: adminutil Version: 1.1.6 -Release: 1%{?dist} -License: LGPL +Release: 2%{?dist} +License: LGPLv2 URL: http://directory.fedoraproject.org/wiki/AdminUtil Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -84,6 +84,9 @@ %{_includedir}/libadmsslutil %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.1.6-2 +- fix license tag + * Mon Mar 3 2008 Rich Megginson - 1.1.6-1 - Resolves bug 245248 - dsgw doesn't escape filename in error message - The new dsgw hasn't been released yet, and the old one doesn't use From fedora-extras-commits at redhat.com Mon Jul 14 17:21:46 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 14 Jul 2008 17:21:46 GMT Subject: rpms/R-systemfit/devel R-systemfit.spec,1.7,1.8 Message-ID: <200807141721.m6EHLkBV031793@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-systemfit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31724 Modified Files: R-systemfit.spec Log Message: Update files Index: R-systemfit.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-systemfit/devel/R-systemfit.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- R-systemfit.spec 14 Jul 2008 17:06:57 -0000 1.7 +++ R-systemfit.spec 14 Jul 2008 17:20:46 -0000 1.8 @@ -65,10 +65,10 @@ %defattr(-, root, root, -) %dir %{_datadir}/R/library/%{packname} %doc %{_datadir}/R/library/%{packname}/latex -%doc %{_datadir}/R/library/%{packname}/doc %doc %{_datadir}/R/library/%{packname}/html %doc %{_datadir}/R/library/%{packname}/man %doc %{_datadir}/R/library/%{packname}/DESCRIPTION +%{_datadir}/R/library/%{packname}/CITATION %{_datadir}/R/library/%{packname}/CONTENTS %{_datadir}/R/library/%{packname}/INDEX %{_datadir}/R/library/%{packname}/Meta From fedora-extras-commits at redhat.com Mon Jul 14 17:24:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:24:00 GMT Subject: rpms/amarokFS/devel amarokFS.spec,1.4,1.5 Message-ID: <200807141724.m6EHO0J7031968@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/amarokFS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31905 Modified Files: amarokFS.spec Log Message: fix license tag Index: amarokFS.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarokFS/devel/amarokFS.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- amarokFS.spec 22 Feb 2008 14:02:15 -0000 1.4 +++ amarokFS.spec 14 Jul 2008 17:23:09 -0000 1.5 @@ -1,10 +1,11 @@ Name: amarokFS Version: 0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple, nice looking full screen front-end for Amarok Group: Applications/Multimedia -License: GPL +# Python integration script is GPLv2+, everything else is LGPLv2+ +License: LGPLv2+ and GPLv2+ URL: http://www.kde-apps.org/content/show.php?content=52641 Source0: http://www.kde-apps.org/CONTENT/content-files/52641-amarokFS-%{version}.tar.gz # Source1 is an Amarok integration script @@ -87,6 +88,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.5-4 +- fix license tag + * Fri Feb 22 2008 Francois Aucamp - 0.5-3 - Changed kdelibs-devel build dependency to kdelibs3-devel (RHBZ #434093) - Fixed animation of "prev" button in default theme From fedora-extras-commits at redhat.com Mon Jul 14 17:25:04 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 17:25:04 GMT Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.55,1.56 Message-ID: <200807141725.m6EHP4bm032129@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32032 Modified Files: kdebase-runtime.spec Log Message: * Mon Jul 14 2008 Rex Dieter 4.0.98-3 - -phonon-backend-xine: new subpkg Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- kdebase-runtime.spec 11 Jul 2008 03:58:52 -0000 1.55 +++ kdebase-runtime.spec 14 Jul 2008 17:24:12 -0000 1.56 @@ -9,7 +9,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.0.98 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -30,9 +30,6 @@ Obsoletes: kdebase4-runtime < %{version}-%{release} Provides: kdebase4-runtime = %{version}-%{release} -Provides: phonon-backend = 4.2 -Provides: phonon-backend-xine = %{version}-%{release} - BuildRequires: kde-filesystem %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } Requires(post): /sbin/ldconfig xdg-utils @@ -88,6 +85,17 @@ %description -n oxygen-icon-theme-scalable %{summary}. +%package -n phonon-backend-xine +Summary: Xine phonon backend +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} +# not sure exactly how best to version this one -- Rex +Provides: phonon-backend = 4.2 +# (temporary) upgrade path +Obsoletes: kdebase-runtime < 4.0.98-3 +%description -n phonon-backend-xine +%{summary}. + %prep %setup -q -n kdebase-runtime-%{version} @@ -300,6 +308,19 @@ %{_kde4_datadir}/locale/l10n/*/entry.desktop %{_datadir}/services/khelpcenter.desktop %endif + +%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so +%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop +%exclude %{_kde4_libdir}/kde4/phonon_xine.so +%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop + +%files -n phonon-backend-xine +%defattr(-,root,root,-) +%{_kde4_libdir}/kde4/kcm_phononxine.so +%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop +%{_kde4_libdir}/kde4/phonon_xine.so +%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop + %endif %if 0%{?icons} @@ -316,6 +337,9 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4.0.98-3 +- -phonon-backend-xine: new subpkg + * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 From fedora-extras-commits at redhat.com Mon Jul 14 17:25:31 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Mon, 14 Jul 2008 17:25:31 GMT Subject: rpms/kernel/devel kernel.spec, 1.760, 1.761 linux-2.6-net-8139-pio-modparam.patch, 1.1, 1.2 Message-ID: <200807141725.m6EHPVG0032199@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32050 Modified Files: kernel.spec linux-2.6-net-8139-pio-modparam.patch Log Message: Improve 8139too PIO patch with jgarziks comments. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- kernel.spec 14 Jul 2008 07:51:15 -0000 1.760 +++ kernel.spec 14 Jul 2008 17:24:20 -0000 1.761 @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 14 2008 Dave Jones +- Improve 8139too PIO patch with jgarziks comments. + * Mon Jul 14 2008 Roland McGrath - utrace update linux-2.6-net-8139-pio-modparam.patch: Index: linux-2.6-net-8139-pio-modparam.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-net-8139-pio-modparam.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-net-8139-pio-modparam.patch 28 May 2008 17:48:25 -0000 1.1 +++ linux-2.6-net-8139-pio-modparam.patch 14 Jul 2008 17:24:20 -0000 1.2 @@ -6,10 +6,18 @@ Signed-off-by: Dave Jones diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c -index 53bd903..09ace39 100644 +index 53bd903..b620317 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c -@@ -120,11 +120,6 @@ +@@ -98,7 +98,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -120,11 +119,6 @@ NETIF_MSG_LINK) @@ -21,25 +29,25 @@ /* define to 1, 2 or 3 to enable copious debugging info */ #define RTL8139_DEBUG 0 -@@ -156,6 +151,9 @@ +@@ -156,6 +150,9 @@ static int media[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; +/* Whether to use MMIO or PIO. Default to MMIO. */ -+static int use_pio; ++static int use_io; + /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). The RTL chips use a 64 element hash table based on the Ethernet CRC. */ static int multicast_filter_limit = 32; -@@ -615,6 +613,7 @@ MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver"); +@@ -615,6 +612,7 @@ MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); -+module_param(use_pio, int, 0); ++module_param(use_io, int, 0); module_param(multicast_filter_limit, int, 0); module_param_array(media, int, NULL, 0); module_param_array(full_duplex, int, NULL, 0); -@@ -710,14 +709,13 @@ static void __rtl8139_cleanup_dev (struct net_device *dev) +@@ -710,13 +708,8 @@ static void __rtl8139_cleanup_dev (struct net_device *dev) assert (tp->pci_dev != NULL); pdev = tp->pci_dev; @@ -47,21 +55,13 @@ - if (tp->mmio_addr) - ioport_unmap (tp->mmio_addr); -#else -- if (tp->mmio_addr) -- pci_iounmap (pdev, tp->mmio_addr); + if (tp->mmio_addr) + pci_iounmap (pdev, tp->mmio_addr); -#endif /* USE_IO_OPS */ -- -+ if (use_pio) { -+ if (tp->mmio_addr) -+ ioport_unmap (tp->mmio_addr); -+ } else { -+ if (tp->mmio_addr) -+ pci_iounmap (pdev, tp->mmio_addr); -+ } + /* it's ok to call this even if we have no regions to free */ pci_release_regions (pdev); - -@@ -791,32 +789,32 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, +@@ -791,32 +784,32 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, DPRINTK("PIO region size == 0x%02X\n", pio_len); DPRINTK("MMIO region size == 0x%02lX\n", mmio_len); @@ -89,7 +89,7 @@ - dev_err(&pdev->dev, "Invalid PCI mem region size(s), aborting\n"); - rc = -ENODEV; - goto err_out; -+ if (use_pio) { ++ if (use_io) { + /* make sure PCI base addr 0 is PIO */ + if (!(pio_flags & IORESOURCE_IO)) { + dev_err(&pdev->dev, "region #0 not a PIO resource, aborting\n"); @@ -119,7 +119,7 @@ rc = pci_request_regions (pdev, DRV_NAME); if (rc) -@@ -826,28 +824,28 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, +@@ -826,28 +819,27 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, /* enable PCI bus-mastering */ pci_set_master (pdev); @@ -140,15 +140,14 @@ - dev_err(&pdev->dev, "cannot remap MMIO, aborting\n"); - rc = -EIO; - goto err_out; -+ if (use_pio) { -+ ioaddr = ioport_map(pio_start, pio_len); ++ if (use_io) { ++ ioaddr = pci_iomap(pdev, 0, 0); + if (!ioaddr) { + dev_err(&pdev->dev, "cannot map PIO, aborting\n"); + rc = -EIO; + goto err_out; + } + dev->base_addr = pio_start; -+ tp->mmio_addr = ioaddr; + tp->regs_len = pio_len; + } else { + /* ioremap MMIO region */ @@ -159,17 +158,16 @@ + goto err_out; + } + dev->base_addr = (long) ioaddr; -+ tp->mmio_addr = ioaddr; + tp->regs_len = mmio_len; } - dev->base_addr = (long) ioaddr; -- tp->mmio_addr = ioaddr; + tp->mmio_addr = ioaddr; - tp->regs_len = mmio_len; -#endif /* USE_IO_OPS */ /* Bring old chips out of low-power mode. */ RTL_W8 (HltClk, 'R'); -@@ -2383,20 +2381,24 @@ static void rtl8139_set_msglevel(struct net_device *dev, u32 datum) +@@ -2383,20 +2375,24 @@ static void rtl8139_set_msglevel(struct net_device *dev, u32 datum) np->msg_enable = datum; } @@ -183,7 +181,7 @@ - struct rtl8139_private *np = netdev_priv(dev); + struct rtl8139_private *np; + /* TODO: we are too slack to do reg dumping for pio, for now */ -+ if (use_pio) ++ if (use_io) + return 0; + np = netdev_priv(dev); return np->regs_len; @@ -195,13 +193,13 @@ + struct rtl8139_private *np; + + /* TODO: we are too slack to do reg dumping for pio, for now */ -+ if (use_pio) ++ if (use_io) + return; + np = netdev_priv(dev); regs->version = RTL_REGS_VER; -@@ -2404,7 +2406,6 @@ static void rtl8139_get_regs(struct net_device *dev, struct ethtool_regs *regs, +@@ -2404,7 +2400,6 @@ static void rtl8139_get_regs(struct net_device *dev, struct ethtool_regs *regs, memcpy_fromio(regbuf, np->mmio_addr, regs->len); spin_unlock_irq(&np->lock); } @@ -209,13 +207,13 @@ static int rtl8139_get_sset_count(struct net_device *dev, int sset) { -@@ -2610,6 +2611,11 @@ static int __init rtl8139_init_module (void) +@@ -2610,6 +2605,11 @@ static int __init rtl8139_init_module (void) printk (KERN_INFO RTL8139_DRIVER_NAME "\n"); #endif + /* enable PIO instead of MMIO, if CONFIG_8139TOO_PIO is selected */ +#ifdef CONFIG_8139TOO_PIO -+ use_pio = 1; ++ use_io = 1; +#endif + return pci_register_driver(&rtl8139_pci_driver); From fedora-extras-commits at redhat.com Mon Jul 14 17:25:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 17:25:41 GMT Subject: rpms/twinkle/F-8 twinkle-1.2-zrtpgcc43.patch, NONE, 1.1 twinkle.spec, 1.9, 1.10 Message-ID: <200807141725.m6EHPfYf032204@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/twinkle/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32084 Modified Files: twinkle.spec Added Files: twinkle-1.2-zrtpgcc43.patch Log Message: Rebuild with libzrtpcpp twinkle-1.2-zrtpgcc43.patch: --- NEW FILE twinkle-1.2-zrtpgcc43.patch --- diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp --- twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp 2008-02-27 08:10:50.000000000 +1100 +++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp 2008-05-31 11:30:59.000000000 +1000 @@ -32,7 +32,7 @@ extern t_phone *phone; TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) : - ZrtpUserCallback(queue), audioSession(session) + ZrtpUserCallback(), audioSession(session) {} void TwinkleZrtpUI::secureOn(std::string cipher) { @@ -96,7 +96,7 @@ ui->cb_async_zrtp_confirm_go_clear(lineno); } -void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) { +void TwinkleZrtpUI::showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message) { t_line *line = audioSession->get_line(); int lineno = line->get_line_number(); @@ -106,11 +106,11 @@ msg += message; switch (sev) { - case Info: + case GnuZrtpCodes::Info: log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, LOG_INFO); break; - case Warning: + case GnuZrtpCodes::Warning: log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, LOG_WARNING); break; @@ -120,7 +120,7 @@ } } -void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) { +void TwinkleZrtpUI::zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg) { t_line *line = audioSession->get_line(); int lineno = line->get_line_number(); @@ -130,11 +130,11 @@ m += msg; switch (severity) { - case Info: + case GnuZrtpCodes::Info: log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, LOG_INFO); break; - case Warning: + case GnuZrtpCodes::Warning: log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, LOG_WARNING); break; diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.h twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h --- twinkle-1.2/src/audio/twinkle_zrtp_ui.h 2008-02-27 08:10:48.000000000 +1100 +++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h 2008-05-31 11:30:20.000000000 +1000 @@ -44,8 +44,8 @@ virtual void secureOff(); virtual void showSAS(std::string sas); virtual void confirmGoClear(); - virtual void showMessage(MessageSeverity sev, std::string message); - virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg); + virtual void showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message); + virtual void zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg); virtual void zrtpNotSuppOther(); private: Index: twinkle.spec =================================================================== RCS file: /cvs/extras/rpms/twinkle/F-8/twinkle.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- twinkle.spec 14 Mar 2008 22:50:58 -0000 1.9 +++ twinkle.spec 14 Jul 2008 17:24:40 -0000 1.10 @@ -1,6 +1,6 @@ Name: twinkle Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SIP Soft Phone Group: Applications/Internet @@ -8,6 +8,8 @@ URL: http://www.twinklephone.com Source0: http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz Patch0: twinkle-1.1-msg.patch +Patch1: twinkle-1.2-zrtpgcc43.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: commoncpp2-devel @@ -16,11 +18,11 @@ BuildRequires: speex-devel BuildRequires: boost-devel BuildRequires: desktop-file-utils -BuildRequires: qt-devel BuildRequires: bind-devel BuildRequires: alsa-lib-devel -BuildRequires: kdelibs-devel +BuildRequires: kdelibs3-devel BuildRequires: bison +BuildRequires: libzrtpcpp-devel %description Twinkle is a SIP based soft phone for making telephone calls over IP networks. @@ -28,6 +30,7 @@ %prep %setup -q %patch0 -p1 -b .msg +%patch1 -p1 -b .zrtpgcc43 %build %configure @@ -60,6 +63,9 @@ %{_datadir}/applications/fedora-twinkle.desktop %changelog +* Mon Jun 30 2008 Kevin Fenzi - 1.2-2 +- Rebuild with libzrtpcpp + * Sat Mar 08 2008 Kevin Fenzi - 1.2-1 - Update to 1.2 From fedora-extras-commits at redhat.com Mon Jul 14 17:27:05 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Mon, 14 Jul 2008 17:27:05 GMT Subject: rpms/kernel/devel .cvsignore,1.864,1.865 Message-ID: <200807141727.m6EHR5BA032341@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32220 Modified Files: .cvsignore Log Message: ignore Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.864 retrieving revision 1.865 diff -u -r1.864 -r1.865 --- .cvsignore 14 Jul 2008 00:33:14 -0000 1.864 +++ .cvsignore 14 Jul 2008 17:25:55 -0000 1.865 @@ -2,5 +2,5 @@ GNUmakefile kernel-2.6.*.config temp-* -kernel-2.6.25 +kernel-2.6.26 linux-2.6.26.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 17:33:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:33:36 GMT Subject: rpms/amavisd-new/devel amavisd-db.patch, 1.1, 1.2 amavisd-new.spec, 1.19, 1.20 Message-ID: <200807141733.m6EHXaov032617@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/amavisd-new/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32545 Modified Files: amavisd-db.patch amavisd-new.spec Log Message: fix license tag amavisd-db.patch: Index: amavisd-db.patch =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-db.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amavisd-db.patch 26 Jan 2006 22:11:54 -0000 1.1 +++ amavisd-db.patch 14 Jul 2008 17:32:16 -0000 1.2 @@ -1,22 +1,24 @@ ---- ./amavisd-nanny.org 2005-09-19 15:26:59.000000000 +0200 -+++ ./amavisd-nanny 2005-09-19 15:27:37.000000000 +0200 -@@ -51,7 +51,7 @@ - my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this - # many seconds - --my($db_home) = '/var/amavis/db'; # DB databases directory -+my($db_home) = '/var/spool/amavisd/db'; # DB databases directory - my($dbfile) = 'nanny.db'; - my($wakeuptime) = 2; # seconds - ---- ./amavisd-agent.org 2005-09-19 15:28:15.000000000 +0200 -+++ ./amavisd-agent 2005-09-19 15:20:24.000000000 +0200 -@@ -107,7 +107,7 @@ - # main program starts here - $SIG{INT} = sub { die "\n" }; # do the END code block +diff -up amavisd-agent.org amavisd-agent +--- amavisd-agent.org 2008-07-14 13:24:20.000000000 -0400 ++++ amavisd-agent 2008-07-14 13:25:00.000000000 -0400 +@@ -146,7 +146,7 @@ sub fmt_ticks($) { + { die "Usage: $0 [ -w ]\n" } + } my($env) = BerkeleyDB::Env->new( - '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL); + '-Home'=>'/var/spool/amavisd/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL); defined $env or die "BDB no env: $BerkeleyDB::Error $!"; my($db) = BerkeleyDB::Hash->new( '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env ); +diff -up amavisd-nanny.org amavisd-nanny +--- amavisd-nanny.org 2008-07-14 13:23:54.000000000 -0400 ++++ amavisd-nanny 2008-07-14 13:24:13.000000000 -0400 +@@ -56,7 +56,7 @@ my($idlettl) = 3*60*60; # idle children + my($activettl) = 10*60; # stuck active children are sent a SIGTERM + # after this many seconds + +-my($db_home) = '/var/amavis/db'; # DB databases directory ++my($db_home) = '/var/spool/amavisd/db'; # DB databases directory + my($dbfile) = 'nanny.db'; + my($wakeuptime) = 2; # sleep time in seconds, may be fractional + Index: amavisd-new.spec =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-new.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- amavisd-new.spec 12 Aug 2007 19:15:41 -0000 1.19 +++ amavisd-new.spec 14 Jul 2008 17:32:16 -0000 1.20 @@ -3,8 +3,9 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavisd-new Version: 2.5.2 -Release: 2%{?prerelease:.%{prerelease}}%{?dist} -License: GPL +Release: 3%{?prerelease:.%{prerelease}}%{?dist} +# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ +License: GPLv2+ and BSD and GFDL Group: Applications/System URL: http://www.ijs.si/software/amavisd/ Source0: http://www.ijs.si/software/amavisd/amavisd-new-%{version}%{?prerelease:-%{prerelease}}.tar.gz @@ -166,6 +167,10 @@ %ghost /var/spool/amavisd/clamd.sock %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 2.5.2-3 +- fix license tag +- fix db patch to apply with fuzz=0 + * Sun Aug 12 2007 Steven Pritchard 2.5.2-2 - Fix pre/preun/post dependencies and improve scriptlets a bit. - Drop dependencies on DBD::mysql and Mail::SPF::Query. From fedora-extras-commits at redhat.com Mon Jul 14 17:33:52 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 17:33:52 GMT Subject: rpms/gajim/F-8 gajim.spec,1.20,1.21 Message-ID: <200807141733.m6EHXqfa032669@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32563 Modified Files: gajim.spec Log Message: * Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 - Updated BuildRoot according to Fedora packaging guidelines. - Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. - Removed 'BuildRequires: pkgconfig' and dropped version from 'BuildRequires: pygtk2-devel'. - Fixed docdir and removed empty README. Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/F-8/gajim.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gajim.spec 14 Jul 2008 16:54:46 -0000 1.20 +++ gajim.spec 14 Jul 2008 17:32:53 -0000 1.21 @@ -3,17 +3,17 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.11.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: bind-utils Requires: dbus-python -#Requires: gnome-python2-gconf +Requires: gnome-python2-canvas Requires: pygtk2-libglade Requires: python-docutils @@ -24,8 +24,7 @@ BuildRequires: gtkspell-devel BuildRequires: intltool BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig -BuildRequires: pygtk2-devel >= 2.8.0 +BuildRequires: pygtk2-devel %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is @@ -36,14 +35,10 @@ %setup -q %build -%configure \ - --disable-dependency-tracking \ - --disable-static \ - --enable-remote \ - --enable-gtkspell \ - --enable-idle \ - --enable-trayicon \ - --libdir=%{python_sitearch} +%configure --docdir=%{_docdir}/%{name}-%{version} \ + --libdir=%{python_sitearch} \ + --disable-static --enable-remote --enable-gtkspell --enable-idle \ + --enable-trayicon make %{?_smp_mflags} @@ -55,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la # silence rpmlint warnings -chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py +chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -69,20 +64,36 @@ %files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README.html +%doc THANKS %{_bindir}/%{name} %{_bindir}/%{name}-remote -%dir %{python_sitearch}/gajim/ +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}_about.png +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-remote.1* + +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/data +%{_datadir}/%{name}/src + +%dir %{python_sitearch}/%{name} %{python_sitearch}/%{name}/gtkspell.so %{python_sitearch}/%{name}/idle.so %{python_sitearch}/%{name}/trayicon.so -%{_datadir}/applications/*gajim.desktop -%{_datadir}/%{name}/ -%{_datadir}/pixmaps/gajim* -%{_docdir}/%{name}/ -%{_mandir}/man1/gajim.1* -%{_mandir}/man1/gajim-remote.1* %changelog +* Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 +- Updated BuildRoot according to Fedora packaging guidelines. +- Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. +- Removed 'BuildRequires: pkgconfig' and dropped version from + 'BuildRequires: pygtk2-devel'. +- Fixed docdir and removed empty README. + * Tue Feb 19 2008 Fedora Release Engineering - 0.11.4-2 - Autorebuild for gcc-4.3. From fedora-extras-commits at redhat.com Mon Jul 14 17:35:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 17:35:54 +0000 Subject: [pkgdb] pcre: lkundrak has requested watchbugzilla Message-ID: <200807141735.m6EHZs4w006729@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has requested the watchbugzilla acl on pcre (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pcre From fedora-extras-commits at redhat.com Mon Jul 14 17:36:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 17:36:26 +0000 Subject: [pkgdb] pcre: lkundrak has requested watchcommits Message-ID: <200807141736.m6EHZs51006729@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has requested the watchcommits acl on pcre (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pcre From fedora-extras-commits at redhat.com Mon Jul 14 17:36:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 17:36:28 +0000 Subject: [pkgdb] pcre: lkundrak has requested commit Message-ID: <200807141736.m6EHaSwB006812@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has requested the commit acl on pcre (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pcre From fedora-extras-commits at redhat.com Mon Jul 14 17:37:54 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 17:37:54 GMT Subject: rpms/gajim/F-9 gajim.spec,1.23,1.24 Message-ID: <200807141737.m6EHbshC000450@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv412 Modified Files: gajim.spec Log Message: * Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 - Updated BuildRoot according to Fedora packaging guidelines. - Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. - Removed 'BuildRequires: pkgconfig' and dropped version from 'BuildRequires: pygtk2-devel'. - Fixed docdir and removed empty README. Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/F-9/gajim.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gajim.spec 14 Jul 2008 16:55:28 -0000 1.23 +++ gajim.spec 14 Jul 2008 17:36:55 -0000 1.24 @@ -3,17 +3,17 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.11.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: bind-utils Requires: dbus-python -#Requires: gnome-python2-gconf +Requires: gnome-python2-canvas Requires: pygtk2-libglade Requires: python-docutils @@ -24,8 +24,7 @@ BuildRequires: gtkspell-devel BuildRequires: intltool BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig -BuildRequires: pygtk2-devel >= 2.8.0 +BuildRequires: pygtk2-devel %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is @@ -36,14 +35,10 @@ %setup -q %build -%configure \ - --disable-dependency-tracking \ - --disable-static \ - --enable-remote \ - --enable-gtkspell \ - --enable-idle \ - --enable-trayicon \ - --libdir=%{python_sitearch} +%configure --docdir=%{_docdir}/%{name}-%{version} \ + --libdir=%{python_sitearch} \ + --disable-static --enable-remote --enable-gtkspell --enable-idle \ + --enable-trayicon make %{?_smp_mflags} @@ -55,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la # silence rpmlint warnings -chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py +chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -69,20 +64,36 @@ %files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README.html +%doc THANKS %{_bindir}/%{name} %{_bindir}/%{name}-remote -%dir %{python_sitearch}/gajim/ +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}_about.png +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-remote.1* + +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/data +%{_datadir}/%{name}/src + +%dir %{python_sitearch}/%{name} %{python_sitearch}/%{name}/gtkspell.so %{python_sitearch}/%{name}/idle.so %{python_sitearch}/%{name}/trayicon.so -%{_datadir}/applications/*gajim.desktop -%{_datadir}/%{name}/ -%{_datadir}/pixmaps/gajim* -%{_docdir}/%{name}/ -%{_mandir}/man1/gajim.1* -%{_mandir}/man1/gajim-remote.1* %changelog +* Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 +- Updated BuildRoot according to Fedora packaging guidelines. +- Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. +- Removed 'BuildRequires: pkgconfig' and dropped version from + 'BuildRequires: pygtk2-devel'. +- Fixed docdir and removed empty README. + * Tue Feb 19 2008 Fedora Release Engineering - 0.11.4-2 - Autorebuild for gcc-4.3. From fedora-extras-commits at redhat.com Mon Jul 14 17:41:14 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 17:41:14 GMT Subject: rpms/gajim/devel gajim.spec,1.23,1.24 Message-ID: <200807141741.m6EHfEBT000561@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv524 Modified Files: gajim.spec Log Message: * Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 - Updated BuildRoot according to Fedora packaging guidelines. - Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. - Removed 'BuildRequires: pkgconfig' and dropped version from 'BuildRequires: pygtk2-devel'. - Fixed docdir and removed empty README. Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gajim.spec 14 Jul 2008 16:55:53 -0000 1.23 +++ gajim.spec 14 Jul 2008 17:40:13 -0000 1.24 @@ -3,17 +3,17 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.11.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: bind-utils Requires: dbus-python -#Requires: gnome-python2-gconf +Requires: gnome-python2-canvas Requires: pygtk2-libglade Requires: python-docutils @@ -24,8 +24,7 @@ BuildRequires: gtkspell-devel BuildRequires: intltool BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig -BuildRequires: pygtk2-devel >= 2.8.0 +BuildRequires: pygtk2-devel %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is @@ -36,14 +35,10 @@ %setup -q %build -%configure \ - --disable-dependency-tracking \ - --disable-static \ - --enable-remote \ - --enable-gtkspell \ - --enable-idle \ - --enable-trayicon \ - --libdir=%{python_sitearch} +%configure --docdir=%{_docdir}/%{name}-%{version} \ + --libdir=%{python_sitearch} \ + --disable-static --enable-remote --enable-gtkspell --enable-idle \ + --enable-trayicon make %{?_smp_mflags} @@ -55,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la # silence rpmlint warnings -chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py +chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -69,20 +64,36 @@ %files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README.html +%doc THANKS %{_bindir}/%{name} %{_bindir}/%{name}-remote -%dir %{python_sitearch}/gajim/ +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}_about.png +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-remote.1* + +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/data +%{_datadir}/%{name}/src + +%dir %{python_sitearch}/%{name} %{python_sitearch}/%{name}/gtkspell.so %{python_sitearch}/%{name}/idle.so %{python_sitearch}/%{name}/trayicon.so -%{_datadir}/applications/*gajim.desktop -%{_datadir}/%{name}/ -%{_datadir}/pixmaps/gajim* -%{_docdir}/%{name}/ -%{_mandir}/man1/gajim.1* -%{_mandir}/man1/gajim-remote.1* %changelog +* Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 +- Updated BuildRoot according to Fedora packaging guidelines. +- Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. +- Removed 'BuildRequires: pkgconfig' and dropped version from + 'BuildRequires: pygtk2-devel'. +- Fixed docdir and removed empty README. + * Tue Feb 19 2008 Fedora Release Engineering - 0.11.4-2 - Autorebuild for gcc-4.3. From fedora-extras-commits at redhat.com Mon Jul 14 17:58:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 17:58:50 GMT Subject: rpms/amtu/devel amtu.spec,1.22,1.23 Message-ID: <200807141758.m6EHwois001124@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/amtu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1057 Modified Files: amtu.spec Log Message: fix license tag Index: amtu.spec =================================================================== RCS file: /cvs/pkgs/rpms/amtu/devel/amtu.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- amtu.spec 19 Feb 2008 23:45:06 -0000 1.22 +++ amtu.spec 14 Jul 2008 17:56:19 -0000 1.23 @@ -1,8 +1,8 @@ Summary: Abstract Machine Test Utility (AMTU) Name: amtu Version: 1.0.6 -Release: 2%{?dist} -License: Common Public License +Release: 3%{?dist} +License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/amtueal/ Source0: %{name}-%{version}.tar.gz @@ -61,6 +61,9 @@ %attr(0644,root,root) %{_mandir}/man8/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0.6-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.6-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 18:00:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:00:51 GMT Subject: rpms/ant-contrib/devel ant-contrib.spec,1.3,1.4 Message-ID: <200807141800.m6EI0p0w001283@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ant-contrib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1182 Modified Files: ant-contrib.spec Log Message: fix license tag Index: ant-contrib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ant-contrib/devel/ant-contrib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ant-contrib.spec 19 Feb 2008 05:11:02 -0000 1.3 +++ ant-contrib.spec 14 Jul 2008 17:59:10 -0000 1.4 @@ -4,8 +4,8 @@ Summary: Collection of tasks for Ant Name: ant-contrib Version: 1.0 -Release: 0.5.%{beta_number}%{?dist} -License: Apache Software License +Release: 0.6.%{beta_number}%{?dist} +License: ASL 2.0 URL: http://ant-contrib.sourceforge.net/ Group: Development/Libraries Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}%{beta_number}-src.tar.gz @@ -119,6 +119,9 @@ # ----------------------------------------------------------------------------- %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0-0.6.b2 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.0-0.5.b2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 18:03:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:03:39 GMT Subject: rpms/archmage/devel archmage.spec,1.7,1.8 Message-ID: <200807141803.m6EI3dAx008062@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/archmage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8012 Modified Files: archmage.spec Log Message: fix license tag Index: archmage.spec =================================================================== RCS file: /cvs/pkgs/rpms/archmage/devel/archmage.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- archmage.spec 3 Jan 2008 17:05:49 -0000 1.7 +++ archmage.spec 14 Jul 2008 18:02:56 -0000 1.8 @@ -2,11 +2,12 @@ Name: archmage Version: 0.1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extensible reader/decompiler of files in CHM format Group: Development/Tools -License: GPL +# No version is specified in code license attribution. +License: GPL+ URL: http://archmage.sourceforge.net/ Source0: http://downloads.sourceforge.net/archmage/archmage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +53,9 @@ %{_mandir}/man*/archmage* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 0.1.9-3 +- fix license tag + * Thu Jan 3 2008 Patrice Dumas 0.1.9-2 - ship egg From fedora-extras-commits at redhat.com Mon Jul 14 18:03:47 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Mon, 14 Jul 2008 18:03:47 GMT Subject: rpms/kernel/devel linux-2.6-net-8139-pio-oqo2.patch,1.1,1.2 Message-ID: <200807141803.m6EI3l5q008110@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6349 Modified Files: linux-2.6-net-8139-pio-oqo2.patch Log Message: var changed name linux-2.6-net-8139-pio-oqo2.patch: Index: linux-2.6-net-8139-pio-oqo2.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-net-8139-pio-oqo2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-net-8139-pio-oqo2.patch 29 May 2008 01:21:44 -0000 1.1 +++ linux-2.6-net-8139-pio-oqo2.patch 14 Jul 2008 18:02:14 -0000 1.2 @@ -14,7 +14,7 @@ + pdev->subsystem_vendor == PCI_VENDOR_ID_ATHEROS && + pdev->subsystem_device == PCI_DEVICE_ID_REALTEK_8139) { + printk(KERN_INFO "8139too: OQO Model 2 detected. Forcing PIO\n"); -+ use_pio = 1; ++ use_io = 1; + } + i = rtl8139_init_board (pdev, &dev); From fedora-extras-commits at redhat.com Mon Jul 14 18:06:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:06:29 GMT Subject: rpms/arp-scan/devel arp-scan.spec,1.2,1.3 Message-ID: <200807141806.m6EI6TeX008382@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/arp-scan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8345 Modified Files: arp-scan.spec Log Message: fix license tag Index: arp-scan.spec =================================================================== RCS file: /cvs/pkgs/rpms/arp-scan/devel/arp-scan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- arp-scan.spec 20 Feb 2008 00:06:34 -0000 1.2 +++ arp-scan.spec 14 Jul 2008 18:05:58 -0000 1.3 @@ -1,10 +1,11 @@ Name: arp-scan Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scanning and fingerprinting tool Group: Applications/Internet -License: GPL +# Includes getopt, which is LGPLv2+, but the whole is GPLv2+. +License: GPLv2+ URL: http://www.nta-monitor.com/tools/arp-scan/ Source0: http://www.nta-monitor.com/tools/arp-scan/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,6 +51,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.6-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.6-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 18:13:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:13:44 GMT Subject: rpms/arptables_jf/devel arptables_jf.spec,1.18,1.19 Message-ID: <200807141813.m6EIDibZ008663@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/arptables_jf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8627 Modified Files: arptables_jf.spec Log Message: fix license tag Index: arptables_jf.spec =================================================================== RCS file: /cvs/pkgs/rpms/arptables_jf/devel/arptables_jf.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- arptables_jf.spec 3 Apr 2008 07:28:55 -0000 1.18 +++ arptables_jf.spec 14 Jul 2008 18:13:07 -0000 1.19 @@ -4,7 +4,7 @@ Epoch: 0 Version: 0.0.8 -Release: 12%{?dist} +Release: 13%{?dist} Source: %{name}-%{version}.tbz #Source1: Makefile #Source2: arptables.h @@ -22,11 +22,11 @@ Group: System Environment/Base -License: GPL +License: GPLv2+ -BuildPrereq: /usr/bin/perl +BuildRequires: perl -Conflicts: kernel < 2.4.0 +Requires: kernel >= 2.4.0 Requires(post,postun): chkconfig @@ -72,6 +72,10 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.0.8-13 +- fix license tag +- drop conflicts + * Thu Apr 03 2008 Martin Nagy - 0.0.8-12 - compile with proper CFLAGS - add %%{_smp_mflags} From fedora-extras-commits at redhat.com Mon Jul 14 18:19:43 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 14 Jul 2008 18:19:43 GMT Subject: rpms/beldi/F-8 beldi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807141819.m6EIJhbt009043@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/beldi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8973/F-8 Modified Files: .cvsignore sources Added Files: beldi.spec Log Message: Initial import of Beldi into Fedora --- NEW FILE beldi.spec --- Summary: Belug Linux Distribution Burner Name: beldi Version: 0.9.16 Release: 3%{?dist} License: GPLv3+ Group: Applications/Internet URL: http://belug.de/~beldi/ Source: http://belug.de/~beldi/releases/%{name}-%{version}.tgz Requires: %{_bindir}/cdrecord BuildRequires: curl-devel, gtkmm24-devel, libxml++-devel BuildRequires: gtkglextmm-devel, desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description BeLDi, the Belug (Linux) Distribution Burner, is a program designed to burn distributions. It is designed to require the least administration and knowledge as possible. BeLDi has an intuitive graphic user interface where the main screen shows the available distributions in a list. If the user selects one, he will be asked which version and architecture he wants to burn. Once the burn procedure starts a bar shows its progress. All user operations can be completed with the mouse or a touchscreen. %prep %setup -q %build %configure --enable-opengl make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor="fedora" \ --remove-category=Network \ --add-category=System \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ icons/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Sun Jul 13 2008 Robert Scheck 0.9.16-3 - Changes to match Fedora Packaging Guidelines (#249949 #c16) * Sun Jul 13 2008 Robert Scheck 0.9.16-2 - Merged suggested changes with existing spec (#249949 #c14) * Sat Jun 28 2008 Christoph Wickert 0.9.16-1 - Upgrade to 0.9.16 * Mon Jun 23 2008 Christoph Wickert 0.9.15-1 - Upgrade to 0.9.15 * Mon May 12 2008 Christoph Wickert 0.9.13-1 - Upgrade to 0.9.13 - use desktop-file-install * Sun Dec 16 2007 Robert Scheck 0.9.12-1 - Upgrade to 0.9.12 * Wed Sep 19 2007 Robert Scheck 0.9-2 - New sources, updated spec file for these - Updated the license tag according to the guidelines * Sun Jul 28 2007 Robert Scheck 0.9-1 - Upgrade to 0.9 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/beldi/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 15:58:12 -0000 1.1 +++ .cvsignore 14 Jul 2008 18:19:10 -0000 1.2 @@ -0,0 +1 @@ +beldi-0.9.16.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/beldi/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 15:58:12 -0000 1.1 +++ sources 14 Jul 2008 18:19:10 -0000 1.2 @@ -0,0 +1 @@ +420555ec522884dcb771c98c0960a1f5 beldi-0.9.16.tgz From fedora-extras-commits at redhat.com Mon Jul 14 18:19:50 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 14 Jul 2008 18:19:50 GMT Subject: rpms/beldi/F-9 beldi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807141819.m6EIJoGx009048@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/beldi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8973/F-9 Modified Files: .cvsignore sources Added Files: beldi.spec Log Message: Initial import of Beldi into Fedora --- NEW FILE beldi.spec --- Summary: Belug Linux Distribution Burner Name: beldi Version: 0.9.16 Release: 3%{?dist} License: GPLv3+ Group: Applications/Internet URL: http://belug.de/~beldi/ Source: http://belug.de/~beldi/releases/%{name}-%{version}.tgz Requires: %{_bindir}/cdrecord BuildRequires: curl-devel, gtkmm24-devel, libxml++-devel BuildRequires: gtkglextmm-devel, desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description BeLDi, the Belug (Linux) Distribution Burner, is a program designed to burn distributions. It is designed to require the least administration and knowledge as possible. BeLDi has an intuitive graphic user interface where the main screen shows the available distributions in a list. If the user selects one, he will be asked which version and architecture he wants to burn. Once the burn procedure starts a bar shows its progress. All user operations can be completed with the mouse or a touchscreen. %prep %setup -q %build %configure --enable-opengl make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor="fedora" \ --remove-category=Network \ --add-category=System \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ icons/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Sun Jul 13 2008 Robert Scheck 0.9.16-3 - Changes to match Fedora Packaging Guidelines (#249949 #c16) * Sun Jul 13 2008 Robert Scheck 0.9.16-2 - Merged suggested changes with existing spec (#249949 #c14) * Sat Jun 28 2008 Christoph Wickert 0.9.16-1 - Upgrade to 0.9.16 * Mon Jun 23 2008 Christoph Wickert 0.9.15-1 - Upgrade to 0.9.15 * Mon May 12 2008 Christoph Wickert 0.9.13-1 - Upgrade to 0.9.13 - use desktop-file-install * Sun Dec 16 2007 Robert Scheck 0.9.12-1 - Upgrade to 0.9.12 * Wed Sep 19 2007 Robert Scheck 0.9-2 - New sources, updated spec file for these - Updated the license tag according to the guidelines * Sun Jul 28 2007 Robert Scheck 0.9-1 - Upgrade to 0.9 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/beldi/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 15:58:12 -0000 1.1 +++ .cvsignore 14 Jul 2008 18:19:13 -0000 1.2 @@ -0,0 +1 @@ +beldi-0.9.16.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/beldi/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 15:58:12 -0000 1.1 +++ sources 14 Jul 2008 18:19:13 -0000 1.2 @@ -0,0 +1 @@ +420555ec522884dcb771c98c0960a1f5 beldi-0.9.16.tgz From fedora-extras-commits at redhat.com Mon Jul 14 18:20:11 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 14 Jul 2008 18:20:11 GMT Subject: rpms/beldi/devel beldi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807141820.m6EIKBtk009073@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/beldi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8973/devel Modified Files: .cvsignore sources Added Files: beldi.spec Log Message: Initial import of Beldi into Fedora --- NEW FILE beldi.spec --- Summary: Belug Linux Distribution Burner Name: beldi Version: 0.9.16 Release: 3%{?dist} License: GPLv3+ Group: Applications/Internet URL: http://belug.de/~beldi/ Source: http://belug.de/~beldi/releases/%{name}-%{version}.tgz Requires: %{_bindir}/cdrecord BuildRequires: curl-devel, gtkmm24-devel, libxml++-devel BuildRequires: gtkglextmm-devel, desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description BeLDi, the Belug (Linux) Distribution Burner, is a program designed to burn distributions. It is designed to require the least administration and knowledge as possible. BeLDi has an intuitive graphic user interface where the main screen shows the available distributions in a list. If the user selects one, he will be asked which version and architecture he wants to burn. Once the burn procedure starts a bar shows its progress. All user operations can be completed with the mouse or a touchscreen. %prep %setup -q %build %configure --enable-opengl make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor="fedora" \ --remove-category=Network \ --add-category=System \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ icons/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Sun Jul 13 2008 Robert Scheck 0.9.16-3 - Changes to match Fedora Packaging Guidelines (#249949 #c16) * Sun Jul 13 2008 Robert Scheck 0.9.16-2 - Merged suggested changes with existing spec (#249949 #c14) * Sat Jun 28 2008 Christoph Wickert 0.9.16-1 - Upgrade to 0.9.16 * Mon Jun 23 2008 Christoph Wickert 0.9.15-1 - Upgrade to 0.9.15 * Mon May 12 2008 Christoph Wickert 0.9.13-1 - Upgrade to 0.9.13 - use desktop-file-install * Sun Dec 16 2007 Robert Scheck 0.9.12-1 - Upgrade to 0.9.12 * Wed Sep 19 2007 Robert Scheck 0.9-2 - New sources, updated spec file for these - Updated the license tag according to the guidelines * Sun Jul 28 2007 Robert Scheck 0.9-1 - Upgrade to 0.9 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/beldi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 15:58:12 -0000 1.1 +++ .cvsignore 14 Jul 2008 18:19:20 -0000 1.2 @@ -0,0 +1 @@ +beldi-0.9.16.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/beldi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 15:58:12 -0000 1.1 +++ sources 14 Jul 2008 18:19:20 -0000 1.2 @@ -0,0 +1 @@ +420555ec522884dcb771c98c0960a1f5 beldi-0.9.16.tgz From fedora-extras-commits at redhat.com Mon Jul 14 18:23:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:23:43 GMT Subject: rpms/aspell-ar/devel aspell-ar.spec,1.2,1.3 Message-ID: <200807141823.m6EINh7F009307@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/aspell-ar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9213 Modified Files: aspell-ar.spec Log Message: fix license tag Index: aspell-ar.spec =================================================================== RCS file: /cvs/pkgs/rpms/aspell-ar/devel/aspell-ar.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aspell-ar.spec 19 Feb 2008 00:14:17 -0000 1.2 +++ aspell-ar.spec 14 Jul 2008 18:22:09 -0000 1.3 @@ -3,8 +3,8 @@ Summary: Arabic dictionary for Aspell Name: aspell-%{lang} Version: 1.2 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2+ Group: Applications/Text URL: http://aspell.net/ Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2 @@ -49,6 +49,9 @@ %{_libdir}/aspell-0.60/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.2-4 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1.2-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 18:27:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:27:24 GMT Subject: rpms/aspell-he/devel aspell-he.spec,1.5,1.6 Message-ID: <200807141827.m6EIROc1009754@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/aspell-he/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9475 Modified Files: aspell-he.spec Log Message: fix license tag Index: aspell-he.spec =================================================================== RCS file: /cvs/pkgs/rpms/aspell-he/devel/aspell-he.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aspell-he.spec 19 Feb 2008 00:15:25 -0000 1.5 +++ aspell-he.spec 14 Jul 2008 18:25:02 -0000 1.6 @@ -3,8 +3,8 @@ Summary: Hebrew dictionary for Aspell Name: aspell-%{lang} Version: 1.0 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2 Group: Applications/Text URL: http://aspell.net/ Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2 @@ -45,6 +45,9 @@ %{_libdir}/aspell-0.60/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0-4 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1.0-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 18:28:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:28:05 GMT Subject: rpms/aspell-mi/devel aspell-mi.spec,1.3,1.4 Message-ID: <200807141828.m6EIS5cx009914@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/aspell-mi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837 Modified Files: aspell-mi.spec Log Message: fix license tag Index: aspell-mi.spec =================================================================== RCS file: /cvs/pkgs/rpms/aspell-mi/devel/aspell-mi.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- aspell-mi.spec 11 Dec 2006 16:36:24 -0000 1.3 +++ aspell-mi.spec 14 Jul 2008 18:27:35 -0000 1.4 @@ -2,11 +2,11 @@ Name: aspell-mi Version: 0.50 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GNU Aspell Maori Dictionary Package Group: Applications/Text -License: LGPL +License: LGPLv2+ URL: http://aspell.net/ Source0: ftp://ftp.gnu.org/gnu/aspell/dict/mi/%{name}-%{version}-0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.50-4 +- fix license tag + * Mon Aug 27 2006 Michael J. Knox - 0.50-3 - Rebuild for FC6 From fedora-extras-commits at redhat.com Mon Jul 14 18:31:45 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 14 Jul 2008 18:31:45 GMT Subject: rpms/pcmanfm/F-8 pcmanfm-0.4.6-debug-warning.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 pcmanfm.spec, 1.18, 1.19 sources, 1.15, 1.16 pcmanfm-0.4.4.2-try-supress-warning.patch, 1.1, NONE pcmanfm-0.4.5-try-suppress-warning.patch, 1.1, NONE Message-ID: <200807141831.m6EIVjHH010252@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10124/F-8 Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.4.6-debug-warning.patch Removed Files: pcmanfm-0.4.4.2-try-supress-warning.patch pcmanfm-0.4.5-try-suppress-warning.patch Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 - 0.4.6 pcmanfm-0.4.6-debug-warning.patch: --- NEW FILE pcmanfm-0.4.6-debug-warning.patch --- --- pcmanfm-0.4.6/src/desktop/desktop-window.c.debug 2008-07-14 10:49:04.000000000 +0900 +++ pcmanfm-0.4.6/src/desktop/desktop-window.c 2008-07-15 02:49:43.000000000 +0900 @@ -24,6 +24,7 @@ #include "desktop-window.h" #include "vfs-file-info.h" #include "vfs-mime-type.h" +#include "vfs-thumbnail-loader.h" #include "glib-mem.h" #include "working-area.h" @@ -37,6 +38,7 @@ #include "main-window.h" #include "pref-dialog.h" #include "ptk-file-browser.h" +#include "ptk-clipboard.h" #include #include @@ -47,6 +49,7 @@ #include #include #include +#include /* memmove, strcmp */ struct _DesktopItem { --- pcmanfm-0.4.6/src/main.c.debug 2008-07-15 00:32:49.000000000 +0900 +++ pcmanfm-0.4.6/src/main.c 2008-07-15 02:57:58.000000000 +0900 @@ -42,6 +42,9 @@ #include "ptk-file-properties.h" #include "ptk-file-menu.h" +#include "pref-dialog.h" +#include "pcmanfm.h" + #include "settings.h" #include "desktop.h" --- pcmanfm-0.4.6/src/pcmanfm.h.debug 2008-07-15 03:11:50.000000000 +0900 +++ pcmanfm-0.4.6/src/pcmanfm.h 2008-07-15 03:01:12.000000000 +0900 @@ -0,0 +1,8 @@ +#ifndef PCMANFM_PCMANFM_H +#define PCMANFM_PCMANFM_H + +#include +void pcmanfm_ref(); +gboolean pcmanfm_unref(); + +#endif --- pcmanfm-0.4.6/src/pref-dialog.c.debug 2008-07-14 16:50:23.000000000 +0900 +++ pcmanfm-0.4.6/src/pref-dialog.c 2008-07-15 03:09:53.000000000 +0900 @@ -31,6 +31,8 @@ #include "main-window.h" #include "ptk-file-browser.h" +#include "desktop.h" + typedef struct _FMPrefDlg FMPrefDlg; struct _FMPrefDlg { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 28 Jun 2008 15:19:18 -0000 1.15 +++ .cvsignore 14 Jul 2008 18:31:14 -0000 1.16 @@ -1 +1 @@ -pcmanfm-0.4.5.tar.gz +pcmanfm-0.4.6.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/pcmanfm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pcmanfm.spec 28 Jun 2008 16:23:08 -0000 1.18 +++ pcmanfm.spec 14 Jul 2008 18:31:14 -0000 1.19 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.5 +Version: 0.4.6 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.5-try-suppress-warning.patch +Patch0: pcmanfm-0.4.6-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -50,7 +50,7 @@ --disable-inotify %endif -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} -k %install @@ -68,6 +68,8 @@ %find_lang %{name} +/usr/lib/rpm/check-rpaths + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -96,6 +98,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 +- 0.4.6 + * Sat Jun 28 2008 Mamoru Tasaka - 0.4.5-1 - 0.4.5 (remote server access function temporally removed) - BR: intltool Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 28 Jun 2008 15:19:18 -0000 1.15 +++ sources 14 Jul 2008 18:31:14 -0000 1.16 @@ -1 +1 @@ -90d899f038d15df35fc4be2a262b1769 pcmanfm-0.4.5.tar.gz +c250eec3e7ed0eeeece50ba9b9e0c47e pcmanfm-0.4.6.tar.gz --- pcmanfm-0.4.4.2-try-supress-warning.patch DELETED --- --- pcmanfm-0.4.5-try-suppress-warning.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 18:31:48 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 14 Jul 2008 18:31:48 GMT Subject: rpms/pcmanfm/F-9 pcmanfm-0.4.6-debug-warning.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 pcmanfm.spec, 1.18, 1.19 sources, 1.15, 1.16 pcmanfm-0.4.4.2-try-supress-warning.patch, 1.1, NONE pcmanfm-0.4.5-try-suppress-warning.patch, 1.1, NONE Message-ID: <200807141831.m6EIVmLr010259@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10124/F-9 Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.4.6-debug-warning.patch Removed Files: pcmanfm-0.4.4.2-try-supress-warning.patch pcmanfm-0.4.5-try-suppress-warning.patch Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 - 0.4.6 pcmanfm-0.4.6-debug-warning.patch: --- NEW FILE pcmanfm-0.4.6-debug-warning.patch --- --- pcmanfm-0.4.6/src/desktop/desktop-window.c.debug 2008-07-14 10:49:04.000000000 +0900 +++ pcmanfm-0.4.6/src/desktop/desktop-window.c 2008-07-15 02:49:43.000000000 +0900 @@ -24,6 +24,7 @@ #include "desktop-window.h" #include "vfs-file-info.h" #include "vfs-mime-type.h" +#include "vfs-thumbnail-loader.h" #include "glib-mem.h" #include "working-area.h" @@ -37,6 +38,7 @@ #include "main-window.h" #include "pref-dialog.h" #include "ptk-file-browser.h" +#include "ptk-clipboard.h" #include #include @@ -47,6 +49,7 @@ #include #include #include +#include /* memmove, strcmp */ struct _DesktopItem { --- pcmanfm-0.4.6/src/main.c.debug 2008-07-15 00:32:49.000000000 +0900 +++ pcmanfm-0.4.6/src/main.c 2008-07-15 02:57:58.000000000 +0900 @@ -42,6 +42,9 @@ #include "ptk-file-properties.h" #include "ptk-file-menu.h" +#include "pref-dialog.h" +#include "pcmanfm.h" + #include "settings.h" #include "desktop.h" --- pcmanfm-0.4.6/src/pcmanfm.h.debug 2008-07-15 03:11:50.000000000 +0900 +++ pcmanfm-0.4.6/src/pcmanfm.h 2008-07-15 03:01:12.000000000 +0900 @@ -0,0 +1,8 @@ +#ifndef PCMANFM_PCMANFM_H +#define PCMANFM_PCMANFM_H + +#include +void pcmanfm_ref(); +gboolean pcmanfm_unref(); + +#endif --- pcmanfm-0.4.6/src/pref-dialog.c.debug 2008-07-14 16:50:23.000000000 +0900 +++ pcmanfm-0.4.6/src/pref-dialog.c 2008-07-15 03:09:53.000000000 +0900 @@ -31,6 +31,8 @@ #include "main-window.h" #include "ptk-file-browser.h" +#include "desktop.h" + typedef struct _FMPrefDlg FMPrefDlg; struct _FMPrefDlg { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 28 Jun 2008 15:19:33 -0000 1.15 +++ .cvsignore 14 Jul 2008 18:31:15 -0000 1.16 @@ -1 +1 @@ -pcmanfm-0.4.5.tar.gz +pcmanfm-0.4.6.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/pcmanfm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pcmanfm.spec 28 Jun 2008 16:23:33 -0000 1.18 +++ pcmanfm.spec 14 Jul 2008 18:31:15 -0000 1.19 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.5 +Version: 0.4.6 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.5-try-suppress-warning.patch +Patch0: pcmanfm-0.4.6-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -50,7 +50,7 @@ --disable-inotify %endif -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} -k %install @@ -68,6 +68,8 @@ %find_lang %{name} +/usr/lib/rpm/check-rpaths + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -96,6 +98,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 +- 0.4.6 + * Sat Jun 28 2008 Mamoru Tasaka - 0.4.5-1 - 0.4.5 (remote server access function temporally removed) - BR: intltool Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 28 Jun 2008 15:19:33 -0000 1.15 +++ sources 14 Jul 2008 18:31:15 -0000 1.16 @@ -1 +1 @@ -90d899f038d15df35fc4be2a262b1769 pcmanfm-0.4.5.tar.gz +c250eec3e7ed0eeeece50ba9b9e0c47e pcmanfm-0.4.6.tar.gz --- pcmanfm-0.4.4.2-try-supress-warning.patch DELETED --- --- pcmanfm-0.4.5-try-suppress-warning.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 18:31:51 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 14 Jul 2008 18:31:51 GMT Subject: rpms/pcmanfm/devel pcmanfm-0.4.6-debug-warning.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 pcmanfm.spec, 1.18, 1.19 sources, 1.15, 1.16 pcmanfm-0.4.4.2-try-supress-warning.patch, 1.1, NONE pcmanfm-0.4.5-try-suppress-warning.patch, 1.1, NONE Message-ID: <200807141831.m6EIVpx1010264@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10124/devel Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.4.6-debug-warning.patch Removed Files: pcmanfm-0.4.4.2-try-supress-warning.patch pcmanfm-0.4.5-try-suppress-warning.patch Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 - 0.4.6 pcmanfm-0.4.6-debug-warning.patch: --- NEW FILE pcmanfm-0.4.6-debug-warning.patch --- --- pcmanfm-0.4.6/src/desktop/desktop-window.c.debug 2008-07-14 10:49:04.000000000 +0900 +++ pcmanfm-0.4.6/src/desktop/desktop-window.c 2008-07-15 02:49:43.000000000 +0900 @@ -24,6 +24,7 @@ #include "desktop-window.h" #include "vfs-file-info.h" #include "vfs-mime-type.h" +#include "vfs-thumbnail-loader.h" #include "glib-mem.h" #include "working-area.h" @@ -37,6 +38,7 @@ #include "main-window.h" #include "pref-dialog.h" #include "ptk-file-browser.h" +#include "ptk-clipboard.h" #include #include @@ -47,6 +49,7 @@ #include #include #include +#include /* memmove, strcmp */ struct _DesktopItem { --- pcmanfm-0.4.6/src/main.c.debug 2008-07-15 00:32:49.000000000 +0900 +++ pcmanfm-0.4.6/src/main.c 2008-07-15 02:57:58.000000000 +0900 @@ -42,6 +42,9 @@ #include "ptk-file-properties.h" #include "ptk-file-menu.h" +#include "pref-dialog.h" +#include "pcmanfm.h" + #include "settings.h" #include "desktop.h" --- pcmanfm-0.4.6/src/pcmanfm.h.debug 2008-07-15 03:11:50.000000000 +0900 +++ pcmanfm-0.4.6/src/pcmanfm.h 2008-07-15 03:01:12.000000000 +0900 @@ -0,0 +1,8 @@ +#ifndef PCMANFM_PCMANFM_H +#define PCMANFM_PCMANFM_H + +#include +void pcmanfm_ref(); +gboolean pcmanfm_unref(); + +#endif --- pcmanfm-0.4.6/src/pref-dialog.c.debug 2008-07-14 16:50:23.000000000 +0900 +++ pcmanfm-0.4.6/src/pref-dialog.c 2008-07-15 03:09:53.000000000 +0900 @@ -31,6 +31,8 @@ #include "main-window.h" #include "ptk-file-browser.h" +#include "desktop.h" + typedef struct _FMPrefDlg FMPrefDlg; struct _FMPrefDlg { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 28 Jun 2008 15:19:50 -0000 1.15 +++ .cvsignore 14 Jul 2008 18:31:18 -0000 1.16 @@ -1 +1 @@ -pcmanfm-0.4.5.tar.gz +pcmanfm-0.4.6.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pcmanfm.spec 28 Jun 2008 16:23:49 -0000 1.18 +++ pcmanfm.spec 14 Jul 2008 18:31:18 -0000 1.19 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.5 +Version: 0.4.6 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.5-try-suppress-warning.patch +Patch0: pcmanfm-0.4.6-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -50,7 +50,7 @@ --disable-inotify %endif -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} -k %install @@ -68,6 +68,8 @@ %find_lang %{name} +/usr/lib/rpm/check-rpaths + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -96,6 +98,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 +- 0.4.6 + * Sat Jun 28 2008 Mamoru Tasaka - 0.4.5-1 - 0.4.5 (remote server access function temporally removed) - BR: intltool Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 28 Jun 2008 15:19:50 -0000 1.15 +++ sources 14 Jul 2008 18:31:18 -0000 1.16 @@ -1 +1 @@ -90d899f038d15df35fc4be2a262b1769 pcmanfm-0.4.5.tar.gz +c250eec3e7ed0eeeece50ba9b9e0c47e pcmanfm-0.4.6.tar.gz --- pcmanfm-0.4.4.2-try-supress-warning.patch DELETED --- --- pcmanfm-0.4.5-try-suppress-warning.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 18:35:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:35:25 GMT Subject: rpms/attr/devel attr.spec,1.29,1.30 Message-ID: <200807141835.m6EIZPMT010717@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/attr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10637 Modified Files: attr.spec Log Message: fix license tag Index: attr.spec =================================================================== RCS file: /cvs/pkgs/rpms/attr/devel/attr.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- attr.spec 13 Feb 2008 16:18:29 -0000 1.29 +++ attr.spec 14 Jul 2008 18:34:54 -0000 1.30 @@ -1,13 +1,13 @@ Summary: Utilities for managing filesystem extended attributes Name: attr Version: 2.4.41 -Release: 1%{?dist} +Release: 2%{?dist} Conflicts: xfsdump < 2.0.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_%{version}-1.tar.gz Patch1: attr-2.2.0-multilib.patch Patch2: attr-2.4.32-build.patch -License: GPL +License: GPLv2+ URL: http://oss.sgi.com/projects/xfs/ Group: System Environment/Base BuildRequires: autoconf, libtool >= 1.5, gettext @@ -21,7 +21,7 @@ %package -n libattr Summary: Dynamic library for extended attribute support Group: System Environment/Libraries -License: LGPL +License: LGPLv2+ %description -n libattr This package contains the libattr.so dynamic library which contains @@ -30,7 +30,7 @@ %package -n libattr-devel Summary: Extended attribute static libraries and headers Group: Development/Libraries -License: LGPL +License: LGPLv2+ Requires: libattr = %{version}-%{release} %description -n libattr-devel @@ -110,6 +110,9 @@ /%{_lib}/libattr.so.* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 2.4.41-2 +- fix license tags + * Tue Feb 13 2008 Zdenek Prikryl 2.4.41-1 - New version 2.4.41 - Removed useless attr-2.0.8-docperms.patch From fedora-extras-commits at redhat.com Mon Jul 14 18:40:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:40:10 GMT Subject: rpms/audacious-plugins-docklet/devel audacious-docklet.spec, 1.8, 1.9 Message-ID: <200807141840.m6EIeALg011339@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/audacious-plugins-docklet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301 Modified Files: audacious-docklet.spec Log Message: fix license tag Index: audacious-docklet.spec =================================================================== RCS file: /cvs/pkgs/rpms/audacious-plugins-docklet/devel/audacious-docklet.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- audacious-docklet.spec 11 Apr 2007 02:41:49 -0000 1.8 +++ audacious-docklet.spec 14 Jul 2008 18:39:38 -0000 1.9 @@ -2,10 +2,10 @@ Name: audacious-docklet Version: 0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A docklet plugin for Audacious -License: GPL +License: GPLv2+ Group: Applications/Multimedia URL: http://nedudu.hu/static.php?page=audacious Source0: http://nedudu.hu/downloads/audacious-docklet-0.1.1.tar.bz2 @@ -42,6 +42,9 @@ %{plugin_dir}/General/libdocklet.so %Changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.1.1-3 +- fix license tag + * Tue Apr 10 2007 Kevin Fenzi - 0.1.1-2 - Rebuild for new audacious version. From fedora-extras-commits at redhat.com Mon Jul 14 18:47:58 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 18:47:58 GMT Subject: rpms/audiofile/devel audiofile.spec,1.25,1.26 Message-ID: <200807141847.m6EIlw1A012206@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/audiofile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12147 Modified Files: audiofile.spec Log Message: fix license tag Index: audiofile.spec =================================================================== RCS file: /cvs/pkgs/rpms/audiofile/devel/audiofile.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- audiofile.spec 19 Feb 2008 04:22:54 -0000 1.25 +++ audiofile.spec 14 Jul 2008 18:47:27 -0000 1.26 @@ -1,9 +1,9 @@ Summary: A library for accessing various audio file formats Name: audiofile Version: 0.2.6 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 -License: LGPL +License: LGPLv2+ Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 URL: http://www.68k.org/~michael/audiofile/ @@ -11,6 +11,7 @@ Patch1: audiofile-const.patch Patch2: audiofile-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool %description The Audio File library is an implementation of the Audio File Library @@ -39,14 +40,14 @@ %build %configure --disable-static -make +make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool" %install rm -rf $RPM_BUILD_ROOT - -%makeinstall +make DESTDIR="$RPM_BUILD_ROOT" install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f docs/Makefile* %post -p /sbin/ldconfig @@ -72,6 +73,9 @@ %{_datadir}/aclocal/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1:0.2.6-9 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1:0.2.6-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 18:50:48 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 18:50:48 GMT Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.56,1.57 Message-ID: <200807141850.m6EIomQ2012609@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12459 Modified Files: kdebase-runtime.spec Log Message: * Mon Jul 14 2008 Rex Dieter 4.0.98-4 - respin Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- kdebase-runtime.spec 14 Jul 2008 17:24:12 -0000 1.56 +++ kdebase-runtime.spec 14 Jul 2008 18:50:17 -0000 1.57 @@ -9,7 +9,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.0.98 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -337,6 +337,9 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- respin + * Mon Jul 14 2008 Rex Dieter 4.0.98-3 - -phonon-backend-xine: new subpkg From fedora-extras-commits at redhat.com Mon Jul 14 19:12:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 19:12:44 GMT Subject: rpms/autofs/devel autofs.spec,1.248,1.249 Message-ID: <200807141912.m6EJCi4P021078@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/autofs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20931 Modified Files: autofs.spec Log Message: fix license tag Index: autofs.spec =================================================================== RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- autofs.spec 30 Jun 2008 10:30:21 -0000 1.248 +++ autofs.spec 14 Jul 2008 19:11:58 -0000 1.249 @@ -4,9 +4,9 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.3 -Release: 18 +Release: 19 Epoch: 1 -License: GPL +License: GPLv2+ Group: System Environment/Daemons URL: http://wiki.autofs.net/ Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2 @@ -34,7 +34,7 @@ Patch22: autofs-5.0.3-fix-couple-of-memory-leaks.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs -Conflicts: kernel < 2.6.17 +Requires: kernel >= 2.6.17 Requires: bash mktemp sed gawk textutils sh-utils grep module-init-tools /bin/ps Requires(post): /sbin/chkconfig Requires(preun): /sbin/service @@ -147,6 +147,10 @@ %{_libdir}/autofs/ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 5.0.3-19 +- change conflicts to requires +- fix license tag + * Mon Jun 30 2008 Ian Kent - 5.0.3-18 - don't abuse the ap->ghost field on NFS mount. - multi-map doesn't pickup NIS updates automatically. From fedora-extras-commits at redhat.com Mon Jul 14 19:15:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 19:15:24 GMT Subject: rpms/automake14/devel automake14.spec,1.15,1.16 Message-ID: <200807141915.m6EJFOLh021531@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/automake14/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21421 Modified Files: automake14.spec Log Message: fix license tag Index: automake14.spec =================================================================== RCS file: /cvs/pkgs/rpms/automake14/devel/automake14.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- automake14.spec 13 Jun 2008 17:25:57 -0000 1.15 +++ automake14.spec 14 Jul 2008 19:14:39 -0000 1.16 @@ -3,8 +3,8 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake14 Version: 1.4p6 -Release: 16%{?dist} -License: GPL +Release: 17%{?dist} +License: GPLv2+ Group: Development/Tools URL: http://sources.redhat.com/automake Source: ftp://ftp.gnu.org/gnu/automake/%{tarname}.tar.gz @@ -79,6 +79,9 @@ %{_infodir}/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 1.4p6-17 +- fix license tag + * Fri Jun 13 2008 Karsten Hopp 1.4p6-16 - rebuild to fix vendor tag (#451242) From fedora-extras-commits at redhat.com Mon Jul 14 19:20:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 19:20:03 GMT Subject: rpms/automake15/devel automake15-versioning.patch, 1.1, 1.2 automake15.spec, 1.21, 1.22 Message-ID: <200807141920.m6EJK33x021859@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/automake15/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781 Modified Files: automake15-versioning.patch automake15.spec Log Message: fix license tag automake15-versioning.patch: Index: automake15-versioning.patch =================================================================== RCS file: /cvs/pkgs/rpms/automake15/devel/automake15-versioning.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- automake15-versioning.patch 9 Sep 2004 03:22:13 -0000 1.1 +++ automake15-versioning.patch 14 Jul 2008 19:18:58 -0000 1.2 @@ -1,24 +1,3 @@ -diff -u automake-1.5/configure.in~ automake-1.5/configure.in ---- automake-1.5/configure.in~ Wed Jan 23 15:38:15 2002 -+++ automake-1.5/configure.in Wed Jan 23 15:38:15 2002 -@@ -5,6 +5,16 @@ - --AM_INIT_AUTOMAKE(automake, 1.5) -+AM_INIT_AUTOMAKE(automake-1.5, 1.5) - -+# The API version is the base version. We must guarantee -+# compatibility for all releases with the same API version. -+# Our current rule is that: -+# * All releases, including the prereleases, in an X.Y series -+# are compatible. So 1.5.1c is compatible with 1.5. -+# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c -+# aren't the same. -+APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]?\).*$/\1/'` -+AC_SUBST(APIVERSION) -+ - ACLOCAL="`pwd`/aclocal --acdir=m4" - # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really - # what we want for perllibdir and libdir. diff -u automake-1.5/aclocal.in~ automake-1.5/aclocal.in --- automake-1.5/aclocal.in.versioning Wed Jan 23 15:25:25 2002 +++ automake-1.5/aclocal.in Wed Jan 23 15:25:25 2002 @@ -105,3 +84,25 @@ m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \ dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \ lispdir.m4 make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 \ +diff -up automake-1.5/configure.in.orig automake-1.5/configure.in +--- automake-1.5/configure.in.orig 2001-08-23 01:47:12.000000000 -0400 ++++ automake-1.5/configure.in 2008-07-14 15:16:10.000000000 -0400 +@@ -3,7 +3,17 @@ AC_INIT(automake.in) + + AC_CONFIG_AUX_DIR(lib) + +-AM_INIT_AUTOMAKE(automake, 1.5) ++AM_INIT_AUTOMAKE(automake-1.5, 1.5) ++ ++# The API version is the base version. We must guarantee ++# compatibility for all releases with the same API version. ++# Our current rule is that: ++# * All releases, including the prereleases, in an X.Y series ++# are compatible. So 1.5.1c is compatible with 1.5. ++# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c ++# aren't the same. ++APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]?\).*$/\1/'` ++AC_SUBST(APIVERSION) + + ACLOCAL="`pwd`/aclocal --acdir=m4" + # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really Index: automake15.spec =================================================================== RCS file: /cvs/pkgs/rpms/automake15/devel/automake15.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- automake15.spec 5 Mar 2008 12:43:43 -0000 1.21 +++ automake15.spec 14 Jul 2008 19:18:59 -0000 1.22 @@ -1,8 +1,8 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake15 Version: 1.5 -Release: 23 -License: GPL +Release: 24 +License: GPLv2+ Group: Development/Tools URL: http://sources.redhat.com/automake Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.gz @@ -102,6 +102,10 @@ %dir %{_datadir}/aclocal %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 1.5-24 +- fix patch2 to apply with fuzz=0 +- fix license tag + * Wed Mar 05 2008 Karsten Hopp 1.5-23 - fix source URL From fedora-extras-commits at redhat.com Mon Jul 14 19:21:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 19:21:53 GMT Subject: rpms/autotrace/devel autotrace.spec,1.19,1.20 Message-ID: <200807141921.m6EJLrHp021966@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/autotrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21923 Modified Files: autotrace.spec Log Message: fix license tag Index: autotrace.spec =================================================================== RCS file: /cvs/pkgs/rpms/autotrace/devel/autotrace.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- autotrace.spec 19 May 2008 19:54:26 -0000 1.19 +++ autotrace.spec 14 Jul 2008 19:20:55 -0000 1.20 @@ -1,11 +1,11 @@ Name: autotrace Version: 0.31.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Utility for converting bitmaps to vector graphics Group: Applications/Multimedia -License: GPL/LGPL +License: GPLv2+ and LGPLv2+ URL: http://autotrace.sourceforge.net/ Source0: http://dl.sf.net/autotrace/autotrace-0.31.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -86,6 +86,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.31.1-18 +- fix license tag + * Mon May 19 2008 Fedora Release Engineering - 0.31.1-17 - Rebuild for new ImageMagick. From fedora-extras-commits at redhat.com Mon Jul 14 19:24:44 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 19:24:44 GMT Subject: rpms/httpd/F-8 httpd-2.2.9-deplibs.patch, NONE, 1.1 httpd.spec, 1.118, 1.119 sources, 1.17, 1.18 httpd-2.0.45-deplibs.patch, 1.3, NONE httpd-2.2.6-ssllibver.patch, 1.2, NONE Message-ID: <200807141924.m6EJOiKH022206@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/httpd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22143 Modified Files: httpd.spec sources Added Files: httpd-2.2.9-deplibs.patch Removed Files: httpd-2.0.45-deplibs.patch httpd-2.2.6-ssllibver.patch Log Message: * Mon Jul 14 2008 Joe Orton 2.2.9-1.fc8 - update to 2.2.9 (#454100) httpd-2.2.9-deplibs.patch: --- NEW FILE httpd-2.2.9-deplibs.patch --- --- httpd-2.2.9/configure.in.deplibs +++ httpd-2.2.9/configure.in @@ -588,9 +588,8 @@ APACHE_HELP_STRING(--with-suexec-umask,u AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] ) dnl APR should go after the other libs, so the right symbols can be picked up -apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \ - || apulinklibs="`$apu_config --link-libtool --libs`" -AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`" +apulinklibs="`$apu_config --link-libtool`" +AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool`" APACHE_SUBST(AP_LIBS) APACHE_SUBST(AP_BUILD_SRCLIB_DIRS) APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS) Index: httpd.spec =================================================================== RCS file: /cvs/extras/rpms/httpd/F-8/httpd.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- httpd.spec 28 Jan 2008 11:19:20 -0000 1.118 +++ httpd.spec 14 Jul 2008 19:24:00 -0000 1.119 @@ -5,7 +5,7 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.2.8 +Version: 2.2.9 Release: 1%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -23,7 +23,7 @@ # build/scripts patches Patch1: httpd-2.1.10-apctl.patch Patch2: httpd-2.1.10-apxs.patch -Patch3: httpd-2.0.45-deplibs.patch +Patch3: httpd-2.2.9-deplibs.patch Patch4: httpd-2.1.10-disablemods.patch Patch5: httpd-2.1.10-layout.patch # Features/functional changes @@ -474,6 +474,9 @@ %{_libdir}/httpd/build/*.sh %changelog +* Mon Jul 14 2008 Joe Orton 2.2.9-1.fc8 +- update to 2.2.9 (#454100) + * Mon Jan 28 2008 Joe Orton 2.2.8-1.fc8 - update to 2.2.8 (#430465) Index: sources =================================================================== RCS file: /cvs/extras/rpms/httpd/F-8/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Jan 2008 11:19:20 -0000 1.17 +++ sources 14 Jul 2008 19:24:00 -0000 1.18 @@ -1 +1 @@ -39a755eb0f584c279336387b321e3dfc httpd-2.2.8.tar.gz +80d3754fc278338033296f0d41ef2c04 httpd-2.2.9.tar.gz --- httpd-2.0.45-deplibs.patch DELETED --- --- httpd-2.2.6-ssllibver.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 19:28:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 19:28:29 GMT Subject: rpms/avarice/devel avarice.spec,1.2,1.3 Message-ID: <200807141928.m6EJSTkV022461@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/avarice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22406 Modified Files: avarice.spec Log Message: fix license tag Index: avarice.spec =================================================================== RCS file: /cvs/pkgs/rpms/avarice/devel/avarice.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- avarice.spec 20 Feb 2008 05:46:20 -0000 1.2 +++ avarice.spec 14 Jul 2008 19:27:30 -0000 1.3 @@ -1,10 +1,10 @@ Name: avarice Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program for interfacing the Atmel JTAG ICE to GDB Group: Applications/Engineering -License: GPL +License: GPLv2 URL: http://sourceforge.net/projects/avarice Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +43,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 2.6-3 +- fix license tag + * Wed Feb 20 2008 Fedora Release Engineering - 2.6-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 19:32:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:32:11 +0000 Subject: [pkgdb] lrzip (Fedora, 9) updated by kevin Message-ID: <200807141932.m6EJWBgV011691@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on lrzip (Fedora 9) for spstarr Kevin Fenzi (kevin) approved watchcommits on lrzip (Fedora 9) for spstarr Kevin Fenzi (kevin) approved commit on lrzip (Fedora 9) for spstarr Kevin Fenzi (kevin) approved build on lrzip (Fedora 9) for spstarr Kevin Fenzi (kevin) approved approveacls on lrzip (Fedora 9) for spstarr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lrzip From fedora-extras-commits at redhat.com Mon Jul 14 19:32:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:32:11 +0000 Subject: [pkgdb] lrzip (Fedora, devel) updated by kevin Message-ID: <200807141932.m6EJWBgX011691@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on lrzip (Fedora devel) for spstarr Kevin Fenzi (kevin) approved watchcommits on lrzip (Fedora devel) for spstarr Kevin Fenzi (kevin) approved commit on lrzip (Fedora devel) for spstarr Kevin Fenzi (kevin) approved build on lrzip (Fedora devel) for spstarr Kevin Fenzi (kevin) approved approveacls on lrzip (Fedora devel) for spstarr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lrzip From fedora-extras-commits at redhat.com Mon Jul 14 19:32:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:32:11 +0000 Subject: [pkgdb] lrzip (Fedora, 8) updated by kevin Message-ID: <200807141932.m6EJWBga011691@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on lrzip (Fedora 8) for spstarr Kevin Fenzi (kevin) approved watchcommits on lrzip (Fedora 8) for spstarr Kevin Fenzi (kevin) approved commit on lrzip (Fedora 8) for spstarr Kevin Fenzi (kevin) approved build on lrzip (Fedora 8) for spstarr Kevin Fenzi (kevin) approved approveacls on lrzip (Fedora 8) for spstarr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lrzip From fedora-extras-commits at redhat.com Mon Jul 14 19:32:45 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 14 Jul 2008 19:32:45 GMT Subject: rpms/httpd/F-9 httpd-2.2.9-deplibs.patch, NONE, 1.1 httpd.spec, 1.121, 1.122 sources, 1.17, 1.18 httpd-2.0.45-deplibs.patch, 1.3, NONE Message-ID: <200807141932.m6EJWjtG022855@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/httpd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22811 Modified Files: httpd.spec sources Added Files: httpd-2.2.9-deplibs.patch Removed Files: httpd-2.0.45-deplibs.patch Log Message: * Fri May 23 2008 Dennis Gilmore - 2.2.8-3.1 - minor rebuild for sparc httpd-2.2.9-deplibs.patch: --- NEW FILE httpd-2.2.9-deplibs.patch --- --- httpd-2.2.9/configure.in.deplibs +++ httpd-2.2.9/configure.in @@ -588,9 +588,8 @@ APACHE_HELP_STRING(--with-suexec-umask,u AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] ) dnl APR should go after the other libs, so the right symbols can be picked up -apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \ - || apulinklibs="`$apu_config --link-libtool --libs`" -AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`" +apulinklibs="`$apu_config --link-libtool`" +AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool`" APACHE_SUBST(AP_LIBS) APACHE_SUBST(AP_BUILD_SRCLIB_DIRS) APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS) Index: httpd.spec =================================================================== RCS file: /cvs/extras/rpms/httpd/F-9/httpd.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- httpd.spec 23 May 2008 15:15:16 -0000 1.121 +++ httpd.spec 14 Jul 2008 19:31:53 -0000 1.122 @@ -5,8 +5,8 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.2.8 -Release: 3.1 +Version: 2.2.9 +Release: 1%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -23,7 +23,7 @@ # build/scripts patches Patch1: httpd-2.1.10-apctl.patch Patch2: httpd-2.1.10-apxs.patch -Patch3: httpd-2.0.45-deplibs.patch +Patch3: httpd-2.2.9-deplibs.patch Patch4: httpd-2.1.10-disablemods.patch Patch5: httpd-2.1.10-layout.patch # Features/functional changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/httpd/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 22 Jan 2008 11:13:57 -0000 1.17 +++ sources 14 Jul 2008 19:31:53 -0000 1.18 @@ -1 +1 @@ -39a755eb0f584c279336387b321e3dfc httpd-2.2.8.tar.gz +80d3754fc278338033296f0d41ef2c04 httpd-2.2.9.tar.gz --- httpd-2.0.45-deplibs.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 19:34:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:34:01 +0000 Subject: [pkgdb] evolution-rspam was added for lucilanga Message-ID: <200807141934.m6EJY1D4011818@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package evolution-rspam with summary Evolution Plugin for reporting spam Kevin Fenzi (kevin) has approved Package evolution-rspam Kevin Fenzi (kevin) has added a Fedora devel branch for evolution-rspam with an owner of lucilanga Kevin Fenzi (kevin) has approved evolution-rspam in Fedora devel Kevin Fenzi (kevin) has approved Package evolution-rspam Kevin Fenzi (kevin) has set commit to Approved for cvsextras on evolution-rspam (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on evolution-rspam (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on evolution-rspam (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/evolution-rspam From fedora-extras-commits at redhat.com Mon Jul 14 19:34:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:34:03 +0000 Subject: [pkgdb] evolution-rspam (Fedora, 8) updated by kevin Message-ID: <200807141934.m6EJY3n8011838@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for evolution-rspam Kevin Fenzi (kevin) has set commit to Approved for cvsextras on evolution-rspam (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on evolution-rspam (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on evolution-rspam (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on evolution-rspam (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/evolution-rspam From fedora-extras-commits at redhat.com Mon Jul 14 19:34:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:34:03 +0000 Subject: [pkgdb] evolution-rspam (Fedora, 9) updated by kevin Message-ID: <200807141934.m6EJY3nB011838@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for evolution-rspam Kevin Fenzi (kevin) has set commit to Approved for cvsextras on evolution-rspam (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on evolution-rspam (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on evolution-rspam (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on evolution-rspam (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/evolution-rspam From fedora-extras-commits at redhat.com Mon Jul 14 19:34:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:34:03 +0000 Subject: [pkgdb] evolution-rspam (Fedora, devel) updated by kevin Message-ID: <200807141934.m6EJY3nE011838@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on evolution-rspam (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/evolution-rspam From fedora-extras-commits at redhat.com Mon Jul 14 19:34:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:34:55 GMT Subject: rpms/evolution-rspam - New directory Message-ID: <200807141934.m6EJYt0F023088@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/evolution-rspam In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg23029/rpms/evolution-rspam Log Message: Directory /cvs/extras/rpms/evolution-rspam added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 19:35:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:35:08 GMT Subject: rpms/evolution-rspam/devel - New directory Message-ID: <200807141935.m6EJZ8Yb023107@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/evolution-rspam/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg23029/rpms/evolution-rspam/devel Log Message: Directory /cvs/extras/rpms/evolution-rspam/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 19:35:22 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:35:22 GMT Subject: rpms/evolution-rspam Makefile,NONE,1.1 Message-ID: <200807141935.m6EJZMLw023150@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/evolution-rspam In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg23029/rpms/evolution-rspam Added Files: Makefile Log Message: Setup of module evolution-rspam --- NEW FILE Makefile --- # Top level Makefile for module evolution-rspam all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 19:35:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:35:42 GMT Subject: rpms/evolution-rspam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807141935.m6EJZgV2023183@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/evolution-rspam/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg23029/rpms/evolution-rspam/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module evolution-rspam --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: evolution-rspam # $Id: Makefile,v 1.1 2008/07/14 19:35:23 kevin Exp $ NAME := evolution-rspam SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 19:37:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:37:48 +0000 Subject: [pkgdb] gnome-keyring-sharp was added for salimma Message-ID: <200807141937.m6EJbmTC012211@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gnome-keyring-sharp with summary Mono implementation of GNOME Keyring Kevin Fenzi (kevin) has approved Package gnome-keyring-sharp Kevin Fenzi (kevin) has added a Fedora devel branch for gnome-keyring-sharp with an owner of salimma Kevin Fenzi (kevin) has approved gnome-keyring-sharp in Fedora devel Kevin Fenzi (kevin) has approved Package gnome-keyring-sharp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-keyring-sharp (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-keyring-sharp (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-keyring-sharp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-keyring-sharp From fedora-extras-commits at redhat.com Mon Jul 14 19:37:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:37:49 +0000 Subject: [pkgdb] gnome-keyring-sharp (Fedora, 8) updated by kevin Message-ID: <200807141937.m6EJbnX8012231@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for gnome-keyring-sharp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-keyring-sharp (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-keyring-sharp (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-keyring-sharp (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-keyring-sharp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-keyring-sharp From fedora-extras-commits at redhat.com Mon Jul 14 19:37:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:37:49 +0000 Subject: [pkgdb] gnome-keyring-sharp (Fedora, 9) updated by kevin Message-ID: <200807141937.m6EJbnT1012230@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for gnome-keyring-sharp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-keyring-sharp (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-keyring-sharp (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-keyring-sharp (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-keyring-sharp (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-keyring-sharp From fedora-extras-commits at redhat.com Mon Jul 14 19:37:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:37:49 +0000 Subject: [pkgdb] gnome-keyring-sharp (Fedora, devel) updated by kevin Message-ID: <200807141937.m6EJbnXB012231@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-keyring-sharp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-keyring-sharp From fedora-extras-commits at redhat.com Mon Jul 14 19:37:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:37:49 +0000 Subject: [pkgdb] gnome-keyring-sharp (Fedora EPEL, 5) updated by kevin Message-ID: <200807141937.m6EJbnT4012230@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for gnome-keyring-sharp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-keyring-sharp (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-keyring-sharp (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-keyring-sharp (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-keyring-sharp (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-keyring-sharp From fedora-extras-commits at redhat.com Mon Jul 14 19:38:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:38:43 GMT Subject: rpms/gnome-keyring-sharp - New directory Message-ID: <200807141938.m6EJchnw023561@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-keyring-sharp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23507/rpms/gnome-keyring-sharp Log Message: Directory /cvs/extras/rpms/gnome-keyring-sharp added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 19:39:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:39:00 GMT Subject: rpms/gnome-keyring-sharp/devel - New directory Message-ID: <200807141939.m6EJd0pt023599@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-keyring-sharp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23507/rpms/gnome-keyring-sharp/devel Log Message: Directory /cvs/extras/rpms/gnome-keyring-sharp/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 19:39:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:39:18 GMT Subject: rpms/gnome-keyring-sharp Makefile,NONE,1.1 Message-ID: <200807141939.m6EJdIg1023673@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-keyring-sharp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23507/rpms/gnome-keyring-sharp Added Files: Makefile Log Message: Setup of module gnome-keyring-sharp --- NEW FILE Makefile --- # Top level Makefile for module gnome-keyring-sharp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 19:39:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:39:35 GMT Subject: rpms/gnome-keyring-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807141939.m6EJdZpX023701@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnome-keyring-sharp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse23507/rpms/gnome-keyring-sharp/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-keyring-sharp --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gnome-keyring-sharp # $Id: Makefile,v 1.1 2008/07/14 19:39:18 kevin Exp $ NAME := gnome-keyring-sharp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 19:39:32 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 14 Jul 2008 19:39:32 GMT Subject: rpms/kernel/devel config-ia64, 1.2, 1.3 config-ia64-generic, 1.12, 1.13 kernel.spec, 1.761, 1.762 linux-2.6-tracehook.patch, 1.3, 1.4 linux-2.6-utrace.patch, 1.81, 1.82 Message-ID: <200807141939.m6EJdW6n023699@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23544 Modified Files: config-ia64 config-ia64-generic kernel.spec linux-2.6-tracehook.patch linux-2.6-utrace.patch Log Message: Fix ia64 build nit, properly disable utrace for ia64. Index: config-ia64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-ia64 9 Jul 2008 03:37:06 -0000 1.2 +++ config-ia64 14 Jul 2008 19:38:29 -0000 1.3 @@ -1,4 +1,2 @@ CONFIG_CRASH_DUMP=y CONFIG_PROC_VMCORE=y - -CONFIG_UTRACE=n Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config-ia64-generic 23 Jun 2008 20:46:06 -0000 1.12 +++ config-ia64-generic 14 Jul 2008 19:38:29 -0000 1.13 @@ -201,3 +201,6 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m + +CONFIG_UTRACE=n +CONFIG_UTRACE_PTRACE=n Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.761 retrieving revision 1.762 diff -u -r1.761 -r1.762 --- kernel.spec 14 Jul 2008 17:24:20 -0000 1.761 +++ kernel.spec 14 Jul 2008 19:38:29 -0000 1.762 @@ -1788,6 +1788,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 14 2008 Roland McGrath +- Fix ia64 build nit, properly disable utrace for ia64. + * Mon Jul 14 2008 Dave Jones - Improve 8139too PIO patch with jgarziks comments. linux-2.6-tracehook.patch: Index: linux-2.6-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-tracehook.patch 14 Jul 2008 07:51:15 -0000 1.3 +++ linux-2.6-tracehook.patch 14 Jul 2008 19:38:29 -0000 1.4 @@ -1,7 +1,7 @@ arch/Kconfig | 18 ++ arch/ia64/Kconfig | 1 + arch/ia64/kernel/perfmon.c | 11 +- - arch/ia64/kernel/process.c | 21 +- + arch/ia64/kernel/process.c | 22 +- arch/ia64/kernel/ptrace.c | 43 +-- arch/ia64/kernel/signal.c | 8 + arch/mips/kernel/irixelf.c | 2 - @@ -53,7 +53,7 @@ lib/syscall.c | 75 +++++ mm/nommu.c | 4 +- security/selinux/hooks.c | 22 +-- - 55 files changed, 1589 insertions(+), 371 deletions(-) + 55 files changed, 1590 insertions(+), 371 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 3ea332b..1955fbd 100644 @@ -151,10 +151,18 @@ /* * defer until state is changed (shorten spin window). the context is locked diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c -index a3a34b4..ff448fe 100644 +index a3a34b4..5164aab 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c -@@ -156,21 +156,6 @@ show_regs (struct pt_regs *regs) +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -156,21 +157,6 @@ show_regs (struct pt_regs *regs) show_stack(NULL, NULL); } @@ -176,7 +184,7 @@ void do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall) { -@@ -199,6 +184,11 @@ do_notify_resume_user(sigset_t *unused, +@@ -199,6 +185,11 @@ do_notify_resume_user(sigset_t *unused, ia64_do_signal(scr, in_syscall); } linux-2.6-utrace.patch: Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- linux-2.6-utrace.patch 14 Jul 2008 07:51:15 -0000 1.81 +++ linux-2.6-utrace.patch 14 Jul 2008 19:38:29 -0000 1.82 @@ -10,8 +10,8 @@ kernel/Makefile | 1 + kernel/ptrace.c | 542 +++++++++- kernel/signal.c | 14 +- - kernel/utrace.c | 2222 +++++++++++++++++++++++++++++++++++++ - 13 files changed, 4023 insertions(+), 4 deletions(-) + kernel/utrace.c | 2211 +++++++++++++++++++++++++++++++++++++ + 13 files changed, 4012 insertions(+), 4 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 0eb0d02..49a78b7 100644 @@ -2215,10 +2215,10 @@ struct pt_regs *regs, void *cookie) diff --git a/kernel/utrace.c b/kernel/utrace.c new file mode 100644 -index ...84540a4 100644 +index ...c965b2e 100644 --- /dev/null +++ b/kernel/utrace.c -@@ -0,0 +1,2222 @@ +@@ -0,0 +1,2211 @@ +/* + * utrace infrastructure interface for debugging user processes + * @@ -2273,12 +2273,7 @@ + struct rcu_head dead; + struct { + struct task_struct *cloning; -+ struct utrace_signal *signal; + } live; -+ struct { -+ unsigned int death:1; /* in utrace_report_death() now */ -+ unsigned int reap:1; /* release_task() has run */ -+ } exit; + } u; + + struct list_head engines; @@ -2291,6 +2286,8 @@ + unsigned int report:1; + unsigned int interrupt:1; + unsigned int signal_handler:1; ++ unsigned int death:1; /* in utrace_report_death() now */ ++ unsigned int reap:1; /* release_task() has run */ +}; + +static struct kmem_cache *utrace_cachep; @@ -2332,16 +2329,10 @@ + } + } + -+ utrace = kmem_cache_alloc(utrace_cachep, GFP_KERNEL); ++ utrace = kmem_cache_zalloc(utrace_cachep, GFP_KERNEL); + if (unlikely(utrace == NULL)) + return ERR_PTR(-ENOMEM); + -+ utrace->u.live.cloning = NULL; -+ utrace->u.live.signal = NULL; -+ utrace->stopped = 0; -+ utrace->report = 0; -+ utrace->interrupt = 0; -+ utrace->signal_handler = 0; + INIT_LIST_HEAD(&utrace->engines); + list_add(&engine->entry, &utrace->engines); + spin_lock_init(&utrace->lock); @@ -2806,7 +2797,7 @@ + * utrace->lock race. All we have to do is let RCU run. + */ + if (likely(!list_empty(&utrace->engines))) { -+ utrace->u.exit.reap = 1; ++ utrace->reap = 1; + + if (!(target->utrace_flags & DEATH_EVENTS)) { + utrace_reap(target, utrace); /* Unlocks and frees. */ @@ -2891,10 +2882,8 @@ + + if (target->exit_state && + (((events &~ old_flags) & DEATH_EVENTS) || -+ (utrace->u.exit.death && -+ ((old_flags &~ events) & DEATH_EVENTS)) || -+ (utrace->u.exit.reap && -+ ((old_flags &~ events) & UTRACE_EVENT(REAP))))) { ++ (utrace->death && ((old_flags &~ events) & DEATH_EVENTS)) || ++ (utrace->reap && ((old_flags &~ events) & UTRACE_EVENT(REAP))))) { + spin_unlock(&utrace->lock); + return -EALREADY; + } @@ -3075,7 +3064,7 @@ + } + + if (task->exit_state) { -+ BUG_ON(utrace->u.exit.death); ++ BUG_ON(utrace->death); + flags &= DEAD_FLAGS_MASK; + wake = false; + } else if (!(flags & UTRACE_EVENT_SYSCALL) && @@ -3255,11 +3244,11 @@ + * prevents us from racing with it detaching itself. + */ + if (action != UTRACE_DETACH || -+ unlikely(utrace->u.exit.reap)) { ++ unlikely(utrace->reap)) { + spin_unlock(&utrace->lock); + return -ESRCH; + } else if (unlikely(target->utrace_flags & DEATH_EVENTS) || -+ unlikely(utrace->u.exit.death)) { ++ unlikely(utrace->death)) { + /* + * We have already started the death report, or + * are about to very soon. We can't prevent @@ -3764,8 +3753,8 @@ + * of detach bookkeeping. + */ + spin_lock(&utrace->lock); -+ BUG_ON(utrace->u.exit.death); -+ utrace->u.exit.death = 1; ++ BUG_ON(utrace->death); ++ utrace->death = 1; + utrace->report = 0; + utrace->interrupt = 0; + spin_unlock(&utrace->lock); @@ -3780,9 +3769,9 @@ + * this flag clear, competing utrace_control/utrace_set_events calls + * know that we've finished our callbacks and any detach bookkeeping. + */ -+ utrace->u.exit.death = 0; ++ utrace->death = 0; + -+ if (utrace->u.exit.reap) ++ if (utrace->reap) + /* + * utrace_release_task() was already called in parallel. + * We must complete its work now. From fedora-extras-commits at redhat.com Mon Jul 14 19:39:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:39:58 +0000 Subject: [pkgdb] xfmpc was added for cwickert Message-ID: <200807141939.m6EJdwrI012524@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xfmpc with summary A MPD client for the Xfce desktop environment Kevin Fenzi (kevin) has approved Package xfmpc Kevin Fenzi (kevin) has added a Fedora devel branch for xfmpc with an owner of cwickert Kevin Fenzi (kevin) has approved xfmpc in Fedora devel Kevin Fenzi (kevin) has approved Package xfmpc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfmpc (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfmpc (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfmpc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfmpc From fedora-extras-commits at redhat.com Mon Jul 14 19:39:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:39:59 +0000 Subject: [pkgdb] xfmpc (Fedora, 9) updated by kevin Message-ID: <200807141940.m6EJdwrO012524@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for xfmpc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfmpc (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfmpc (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfmpc (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on xfmpc (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfmpc From fedora-extras-commits at redhat.com Mon Jul 14 19:39:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:39:59 +0000 Subject: [pkgdb] xfmpc (Fedora, 8) updated by kevin Message-ID: <200807141939.m6EJdwrL012524@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xfmpc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfmpc (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfmpc (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfmpc (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on xfmpc (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfmpc From fedora-extras-commits at redhat.com Mon Jul 14 19:39:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 14 Jul 2008 19:39:59 +0000 Subject: [pkgdb] xfmpc (Fedora, devel) updated by kevin Message-ID: <200807141940.m6EJe1M7012585@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xfmpc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfmpc From fedora-extras-commits at redhat.com Mon Jul 14 19:40:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:40:45 GMT Subject: rpms/xfmpc - New directory Message-ID: <200807141940.m6EJejnu024033@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfmpc In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23939/rpms/xfmpc Log Message: Directory /cvs/extras/rpms/xfmpc added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 19:41:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:41:10 GMT Subject: rpms/xfmpc/devel - New directory Message-ID: <200807141941.m6EJfAP9024124@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfmpc/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23939/rpms/xfmpc/devel Log Message: Directory /cvs/extras/rpms/xfmpc/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 14 19:41:33 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Mon, 14 Jul 2008 19:41:33 GMT Subject: rpms/gajim/devel gajim.spec,1.24,1.25 Message-ID: <200807141941.m6EJfXq8024250@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24013 Modified Files: gajim.spec Log Message: * Mon Jul 14 2008 Debarshi Ray - 0.11.4-4 - Rebuilding to overcome Koji outage. Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gajim.spec 14 Jul 2008 17:40:13 -0000 1.24 +++ gajim.spec 14 Jul 2008 19:40:36 -0000 1.25 @@ -3,7 +3,7 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.11.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ @@ -87,6 +87,9 @@ %{python_sitearch}/%{name}/trayicon.so %changelog +* Mon Jul 14 2008 Debarshi Ray - 0.11.4-4 +- Rebuilding to overcome Koji outage. + * Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 - Updated BuildRoot according to Fedora packaging guidelines. - Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. From fedora-extras-commits at redhat.com Mon Jul 14 19:41:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:41:33 GMT Subject: rpms/xfmpc Makefile,NONE,1.1 Message-ID: <200807141941.m6EJfXWb024245@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfmpc In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23939/rpms/xfmpc Added Files: Makefile Log Message: Setup of module xfmpc --- NEW FILE Makefile --- # Top level Makefile for module xfmpc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 14 19:41:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 14 Jul 2008 19:41:55 GMT Subject: rpms/xfmpc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807141941.m6EJftUm024350@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfmpc/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH23939/rpms/xfmpc/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfmpc --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfmpc # $Id: Makefile,v 1.1 2008/07/14 19:41:33 kevin Exp $ NAME := xfmpc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 14 19:41:52 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 14 Jul 2008 19:41:52 GMT Subject: rpms/gamazons/F-9 gamazons.spec,1.1,1.2 Message-ID: <200807141941.m6EJfqTt024337@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gamazons/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24002/F-9 Modified Files: gamazons.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 - Remove OnlyShowIn=GNOME from desktop file Index: gamazons.spec =================================================================== RCS file: /cvs/pkgs/rpms/gamazons/F-9/gamazons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gamazons.spec 9 Jun 2008 04:50:32 -0000 1.1 +++ gamazons.spec 14 Jul 2008 19:41:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: gamazons Version: 0.83 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME Amazons Group: Amusements/Games @@ -42,6 +42,7 @@ desktop-file-install --vendor="fedora" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ + --remove-key=OnlyShowIn \ $RPM_BUILD_ROOT%{_datadir}/applications/gamazons.desktop @@ -62,6 +63,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 +- Remove OnlyShowIn=GNOME from desktop file + * Mon Jun 9 2008 Michel Salim - 0.83-2 - Add thots (TODO) and gamazon.bugs to %%doc - No longer require yelp; instead, make sure we own the help directory From fedora-extras-commits at redhat.com Mon Jul 14 19:42:08 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 14 Jul 2008 19:42:08 GMT Subject: rpms/gamazons/F-8 gamazons.spec,1.1,1.2 Message-ID: <200807141942.m6EJg8ec024504@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gamazons/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24002/F-8 Modified Files: gamazons.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 - Remove OnlyShowIn=GNOME from desktop file Index: gamazons.spec =================================================================== RCS file: /cvs/pkgs/rpms/gamazons/F-8/gamazons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gamazons.spec 9 Jun 2008 04:50:20 -0000 1.1 +++ gamazons.spec 14 Jul 2008 19:40:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: gamazons Version: 0.83 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME Amazons Group: Amusements/Games @@ -42,6 +42,7 @@ desktop-file-install --vendor="fedora" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ + --remove-key=OnlyShowIn \ $RPM_BUILD_ROOT%{_datadir}/applications/gamazons.desktop @@ -62,6 +63,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 +- Remove OnlyShowIn=GNOME from desktop file + * Mon Jun 9 2008 Michel Salim - 0.83-2 - Add thots (TODO) and gamazon.bugs to %%doc - No longer require yelp; instead, make sure we own the help directory From fedora-extras-commits at redhat.com Mon Jul 14 19:42:12 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 14 Jul 2008 19:42:12 GMT Subject: rpms/gamazons/EL-5 gamazons.spec,1.1,1.2 Message-ID: <200807141942.m6EJgCCn024540@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gamazons/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24002/EL-5 Modified Files: gamazons.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 - Remove OnlyShowIn=GNOME from desktop file Index: gamazons.spec =================================================================== RCS file: /cvs/pkgs/rpms/gamazons/EL-5/gamazons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gamazons.spec 9 Jun 2008 04:50:04 -0000 1.1 +++ gamazons.spec 14 Jul 2008 19:40:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: gamazons Version: 0.83 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME Amazons Group: Amusements/Games @@ -42,6 +42,7 @@ desktop-file-install --vendor="fedora" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ + --remove-key=OnlyShowIn \ $RPM_BUILD_ROOT%{_datadir}/applications/gamazons.desktop @@ -62,6 +63,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 +- Remove OnlyShowIn=GNOME from desktop file + * Mon Jun 9 2008 Michel Salim - 0.83-2 - Add thots (TODO) and gamazon.bugs to %%doc - No longer require yelp; instead, make sure we own the help directory From fedora-extras-commits at redhat.com Mon Jul 14 19:42:18 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 14 Jul 2008 19:42:18 GMT Subject: rpms/gamazons/devel gamazons.spec,1.1,1.2 Message-ID: <200807141942.m6EJgIea024553@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gamazons/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24002/devel Modified Files: gamazons.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 - Remove OnlyShowIn=GNOME from desktop file Index: gamazons.spec =================================================================== RCS file: /cvs/pkgs/rpms/gamazons/devel/gamazons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gamazons.spec 9 Jun 2008 04:50:44 -0000 1.1 +++ gamazons.spec 14 Jul 2008 19:41:22 -0000 1.2 @@ -1,6 +1,6 @@ Name: gamazons Version: 0.83 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME Amazons Group: Amusements/Games @@ -42,6 +42,7 @@ desktop-file-install --vendor="fedora" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ + --remove-key=OnlyShowIn \ $RPM_BUILD_ROOT%{_datadir}/applications/gamazons.desktop @@ -62,6 +63,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 0.83-3 +- Remove OnlyShowIn=GNOME from desktop file + * Mon Jun 9 2008 Michel Salim - 0.83-2 - Add thots (TODO) and gamazon.bugs to %%doc - No longer require yelp; instead, make sure we own the help directory From fedora-extras-commits at redhat.com Mon Jul 14 19:48:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 19:48:42 GMT Subject: rpms/amqp/devel amqp.spec,1.7,1.8 Message-ID: <200807141948.m6EJmgV5025267@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/amqp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24998 Modified Files: amqp.spec Log Message: fix license tag Index: amqp.spec =================================================================== RCS file: /cvs/pkgs/rpms/amqp/devel/amqp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- amqp.spec 18 Jun 2008 15:53:49 -0000 1.7 +++ amqp.spec 14 Jul 2008 19:47:49 -0000 1.8 @@ -1,11 +1,13 @@ Name: amqp Version: 1.0.666398 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: The AMQP specification Group: Development -License: AMQP +# Fedora treats these files as content, not code. +# The AMQP license does not give the right to modify. +License: Freely redistributable without restriction URL: http://www.amqp.org Source0: %{name}-%{version}.tar.gz @@ -37,6 +39,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 0:1.0.666398-6 +- fix license tag + * Tue Jun 10 2008 Rafael Schloming - 0:1.0.666398-5 - Source update for MRG RC1 From fedora-extras-commits at redhat.com Mon Jul 14 19:59:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 19:59:27 GMT Subject: rpms/azureus/devel azureus-cache-size.patch, 1.2, 1.3 azureus.spec, 1.66, 1.67 Message-ID: <200807141959.m6EJxRo1026720@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26645 Modified Files: azureus-cache-size.patch azureus.spec Log Message: fix license tag azureus-cache-size.patch: Index: azureus-cache-size.patch =================================================================== RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-cache-size.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-cache-size.patch 9 Feb 2006 08:45:07 -0000 1.2 +++ azureus-cache-size.patch 14 Jul 2008 19:58:39 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/core3/config/COConfigurationManager.java.~1.34.~ 2006-01-19 21:27:18.000000000 -0500 -+++ org/gudy/azureus2/core3/config/COConfigurationManager.java 2006-02-09 00:01:46.000000000 -0500 -@@ -39,7 +39,7 @@ +--- org/gudy/azureus2/core3/config/COConfigurationManager.java.orig 2007-11-21 22:46:58.000000000 -0500 ++++ org/gudy/azureus2/core3/config/COConfigurationManager.java 2008-07-14 15:48:16.000000000 -0400 +@@ -40,7 +40,7 @@ COConfigurationManager public static final int CONFIG_CACHE_SIZE_MAX_MB; static{ @@ -8,4 +8,4 @@ + long max_mem_bytes = Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024); long mb_1 = 1*1024*1024; long mb_32 = 32*mb_1; - CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1); + int size = (int)(( max_mem_bytes - mb_32 )/mb_1); Index: azureus.spec =================================================================== RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- azureus.spec 20 May 2008 14:11:32 -0000 1.66 +++ azureus.spec 14 Jul 2008 19:58:39 -0000 1.67 @@ -1,10 +1,10 @@ Name: azureus Version: 3.0.4.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A BitTorrent Client Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://azureus.sourceforge.net # A cvs snapshot with the build and bouncycastle directories @@ -197,6 +197,10 @@ %{_libdir}/gcj/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 3.0.4.2-15 +- fix license tag +- fix cache-size patch to apply with fuzz=0 + * Wed Mar 26 2008 Lillian Angel - 3.0.4.2-14 - Fixed azureus.script to set GRE_PATH properly on 64-bit. From fedora-extras-commits at redhat.com Mon Jul 14 20:01:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:01:41 GMT Subject: rpms/azureus/devel azureus.spec,1.67,1.68 Message-ID: <200807142001.m6EK1fSV029484@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100 Modified Files: azureus.spec Log Message: fix license tag Index: azureus.spec =================================================================== RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- azureus.spec 14 Jul 2008 19:58:39 -0000 1.67 +++ azureus.spec 14 Jul 2008 20:00:47 -0000 1.68 @@ -1,6 +1,6 @@ Name: azureus Version: 3.0.4.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -197,7 +197,7 @@ %{_libdir}/gcj/* %changelog -* Mon Jul 14 2008 Tom "spot" Callaway - 3.0.4.2-15 +* Mon Jul 14 2008 Tom "spot" Callaway - 3.0.4.2-16 - fix license tag - fix cache-size patch to apply with fuzz=0 From fedora-extras-commits at redhat.com Mon Jul 14 20:11:06 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Mon, 14 Jul 2008 20:11:06 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.190, 1.191 selinux-policy.spec, 1.695, 1.696 Message-ID: <200807142011.m6EKB6wL002861@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2712 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Tue Jul 8 2008 Dan Walsh 3.3.1-78 - Allow unconfined_t to setfcap - Allow spamassassin to read razor lib files policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- policy-20071130.patch 7 Jul 2008 17:55:17 -0000 1.190 +++ policy-20071130.patch 14 Jul 2008 20:10:21 -0000 1.191 @@ -793,7 +793,7 @@ +system_r:xdm_t xguest_r:xguest_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.3.1/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8 2008-07-14 09:45:39.000000000 -0400 @@ -35,10 +35,6 @@ directorories, you need to set the ftp_home_dir boolean. .TP @@ -2693,7 +2693,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.3.1/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/rpm.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/admin/rpm.te 2008-07-14 09:03:36.000000000 -0400 @@ -31,6 +31,9 @@ files_type(rpm_var_lib_t) typealias rpm_var_lib_t alias var_lib_rpm_t; @@ -2770,7 +2770,7 @@ ') optional_policy(` -+ gamin_domtrans(rpm_t) ++ gamin_exec(rpm_t) + gamin_stream_connect(rpm_t) +') + @@ -3020,7 +3020,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-07-08 15:18:07.000000000 -0400 @@ -26,8 +26,10 @@ files_read_etc_files(tmpreaper_t) files_read_var_lib_files(tmpreaper_t) @@ -3032,7 +3032,7 @@ mls_file_read_all_levels(tmpreaper_t) mls_file_write_all_levels(tmpreaper_t) -@@ -42,6 +44,27 @@ +@@ -42,6 +44,26 @@ cron_system_entry(tmpreaper_t,tmpreaper_exec_t) @@ -3040,8 +3040,7 @@ +userdom_delete_all_users_home_content_files(tmpreaper_t) +userdom_delete_all_users_home_content_symlinks(tmpreaper_t) + -+files_list_isid_type_dirs(tmpreaper_t) -+files_delete_isid_type_dirs(tmpreaper_t) ++files_manage_isid_type_dirs(tmpreaper_t) +files_delete_isid_type_files(tmpreaper_t) + +optional_policy(` @@ -9422,8 +9421,8 @@ # amavis local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.3.1/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/apache.fc 2008-07-02 08:47:10.000000000 -0400 -@@ -1,10 +1,8 @@ ++++ serefpolicy-3.3.1/policy/modules/services/apache.fc 2008-07-11 14:39:42.000000000 -0400 +@@ -1,10 +1,9 @@ -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0) - +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) @@ -9433,10 +9432,11 @@ -/etc/httpd -d gen_context(system_u:object_r:httpd_config_t,s0) -/etc/httpd/conf.* gen_context(system_u:object_r:httpd_config_t,s0) +/etc/httpd(/.*)? gen_context(system_u:object_r:httpd_config_t,s0) ++/etc/httpd/conf/keytab -- gen_context(system_u:object_r:httpd_keytab_t,s0) /etc/httpd/logs gen_context(system_u:object_r:httpd_log_t,s0) /etc/httpd/modules gen_context(system_u:object_r:httpd_modules_t,s0) /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) -@@ -16,13 +14,13 @@ +@@ -16,13 +15,13 @@ /usr/lib/apache-ssl/.+ -- gen_context(system_u:object_r:httpd_exec_t,s0) /usr/lib/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) @@ -9451,7 +9451,7 @@ /usr/sbin/apache(2)? -- gen_context(system_u:object_r:httpd_exec_t,s0) /usr/sbin/apache-ssl(2)? -- gen_context(system_u:object_r:httpd_exec_t,s0) /usr/sbin/httpd(\.worker)? -- gen_context(system_u:object_r:httpd_exec_t,s0) -@@ -33,6 +31,7 @@ +@@ -33,6 +32,7 @@ /usr/sbin/httpd2-.* -- gen_context(system_u:object_r:httpd_exec_t,s0) ') @@ -9459,7 +9459,7 @@ /usr/share/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /usr/share/openca/htdocs(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /usr/share/selinux-policy[^/]*/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) -@@ -48,11 +47,14 @@ +@@ -48,11 +48,14 @@ /var/lib/cacti/rra(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /var/lib/dav(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0) @@ -9474,7 +9474,7 @@ /var/log/apache(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) /var/log/apache-ssl(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) /var/log/cacti(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) -@@ -66,10 +68,21 @@ +@@ -66,10 +69,21 @@ /var/run/gcache_port -s gen_context(system_u:object_r:httpd_var_run_t,s0) /var/run/httpd.* gen_context(system_u:object_r:httpd_var_run_t,s0) @@ -10109,7 +10109,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.3.1/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/apache.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/apache.te 2008-07-11 14:55:24.000000000 -0400 @@ -20,6 +20,8 @@ # Declarations # @@ -10376,23 +10376,23 @@ tunable_policy(`httpd_ssi_exec',` corecmd_shell_domtrans(httpd_t,httpd_sys_script_t) allow httpd_sys_script_t httpd_t:fd use; -@@ -437,8 +524,14 @@ +@@ -437,8 +524,13 @@ ') optional_policy(` +- kerberos_use(httpd_t) +- kerberos_read_kdc_config(httpd_t) + dbus_system_bus_client_template(httpd,httpd_t) + tunable_policy(`allow_httpd_dbus_avahi',` + avahi_dbus_chat(httpd_t) + ') +') +optional_policy(` - kerberos_use(httpd_t) -- kerberos_read_kdc_config(httpd_t) -+ kerberos_read_keytab(httpd_t) ++ kerberos_keytab_template(httpd, httpd_t) ') optional_policy(` -@@ -450,19 +543,13 @@ +@@ -450,19 +542,13 @@ ') optional_policy(` @@ -10413,7 +10413,7 @@ ') optional_policy(` -@@ -473,12 +560,15 @@ +@@ -473,12 +559,15 @@ ') optional_policy(` @@ -10433,7 +10433,7 @@ ') optional_policy(` -@@ -486,6 +576,7 @@ +@@ -486,6 +575,7 @@ ') optional_policy(` @@ -10441,7 +10441,7 @@ snmp_dontaudit_read_snmp_var_lib_files(httpd_t) snmp_dontaudit_write_snmp_var_lib_files(httpd_t) ') -@@ -521,6 +612,22 @@ +@@ -521,6 +611,22 @@ userdom_use_sysadm_terms(httpd_helper_t) ') @@ -10464,7 +10464,7 @@ ######################################## # # Apache PHP script local policy -@@ -550,18 +657,26 @@ +@@ -550,18 +656,26 @@ fs_search_auto_mountpoints(httpd_php_t) @@ -10494,7 +10494,7 @@ ') ######################################## -@@ -585,6 +700,8 @@ +@@ -585,6 +699,8 @@ manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t) files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir }) @@ -10503,7 +10503,7 @@ kernel_read_kernel_sysctls(httpd_suexec_t) kernel_list_proc(httpd_suexec_t) kernel_read_proc_symlinks(httpd_suexec_t) -@@ -593,9 +710,7 @@ +@@ -593,9 +709,7 @@ fs_search_auto_mountpoints(httpd_suexec_t) @@ -10514,7 +10514,7 @@ files_read_etc_files(httpd_suexec_t) files_read_usr_files(httpd_suexec_t) -@@ -628,6 +743,7 @@ +@@ -628,6 +742,7 @@ corenet_sendrecv_all_client_packets(httpd_suexec_t) ') @@ -10522,7 +10522,7 @@ tunable_policy(`httpd_enable_cgi && httpd_unified',` domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t) ') -@@ -638,6 +754,12 @@ +@@ -638,6 +753,12 @@ fs_exec_nfs_files(httpd_suexec_t) ') @@ -10535,7 +10535,7 @@ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_suexec_t) fs_read_cifs_symlinks(httpd_suexec_t) -@@ -655,10 +777,6 @@ +@@ -655,10 +776,6 @@ dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write }; ') @@ -10546,7 +10546,7 @@ ######################################## # # Apache system script local policy -@@ -668,7 +786,8 @@ +@@ -668,7 +785,8 @@ dontaudit httpd_sys_script_t httpd_config_t:dir search; @@ -10556,7 +10556,7 @@ allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms; read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t) -@@ -682,15 +801,44 @@ +@@ -682,15 +800,44 @@ # Should we add a boolean? apache_domtrans_rotatelogs(httpd_sys_script_t) @@ -10602,7 +10602,7 @@ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_sys_script_t) fs_read_cifs_symlinks(httpd_sys_script_t) -@@ -703,6 +851,10 @@ +@@ -703,6 +850,10 @@ optional_policy(` mysql_stream_connect(httpd_sys_script_t) mysql_rw_db_sockets(httpd_sys_script_t) @@ -10613,7 +10613,7 @@ ') ######################################## -@@ -724,3 +876,60 @@ +@@ -724,3 +875,60 @@ logging_search_logs(httpd_rotatelogs_t) miscfiles_read_localization(httpd_rotatelogs_t) @@ -11163,7 +11163,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.3.1/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/automount.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/automount.te 2008-07-11 14:52:12.000000000 -0400 @@ -20,6 +20,9 @@ files_tmp_file(automount_tmp_t) files_mountpoint(automount_tmp_t) @@ -11233,7 +11233,14 @@ userdom_dontaudit_use_unpriv_user_fds(automount_t) userdom_dontaudit_search_sysadm_home_dirs(automount_t) -@@ -162,11 +166,12 @@ +@@ -156,17 +160,18 @@ + ') + + optional_policy(` +- kerberos_read_keytab(automount_t) ++ kerberos_keytab_template(automount, automount_t) + kerberos_read_config(automount_t) + kerberos_dontaudit_write_config(automount_t) ') optional_policy(` @@ -11765,7 +11772,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.3.1/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/bluetooth.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/bluetooth.te 2008-07-09 15:26:01.000000000 -0400 @@ -32,19 +32,22 @@ type bluetooth_var_run_t; files_pid_file(bluetooth_var_run_t) @@ -11808,12 +11815,14 @@ libs_use_ld_so(bluetooth_t) libs_use_shared_libs(bluetooth_t) -@@ -118,19 +124,18 @@ +@@ -117,20 +123,20 @@ + miscfiles_read_localization(bluetooth_t) miscfiles_read_fonts(bluetooth_t) - --sysnet_read_config(bluetooth_t) - +-sysnet_read_config(bluetooth_t) ++miscfiles_read_hwdata(bluetooth_t) + userdom_dontaudit_use_unpriv_user_fds(bluetooth_t) userdom_dontaudit_use_sysadm_ptys(bluetooth_t) userdom_dontaudit_search_sysadm_home_dirs(bluetooth_t) @@ -13749,7 +13758,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.3.1/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/cvs.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/cvs.te 2008-07-11 14:54:07.000000000 -0400 @@ -28,6 +28,9 @@ type cvs_var_run_t; files_pid_file(cvs_var_run_t) @@ -13777,7 +13786,14 @@ mta_send_mail(cvs_t) # cjp: typeattribute doesnt work in conditionals yet -@@ -103,10 +105,12 @@ +@@ -97,16 +99,17 @@ + ') + + optional_policy(` +- kerberos_use(cvs_t) +- kerberos_read_keytab(cvs_t) ++ kerberos_keytab_template(cvs, cvs_t) + kerberos_read_config(cvs_t) kerberos_dontaudit_write_config(cvs_t) ') @@ -15804,7 +15820,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.3.1/policy/modules/services/fail2ban.te --- nsaserefpolicy/policy/modules/services/fail2ban.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-07-14 09:03:20.000000000 -0400 @@ -18,6 +18,9 @@ type fail2ban_var_run_t; files_pid_file(fail2ban_var_run_t) @@ -15867,7 +15883,7 @@ ') optional_policy(` -+ gamin_domtrans(fail2ban_t) ++ gamin_exec(fail2ban_t) + gamin_stream_connect(fail2ban_t) +') + @@ -16085,7 +16101,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.3.1/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/ftp.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/ftp.te 2008-07-11 14:54:45.000000000 -0400 @@ -75,6 +75,9 @@ type xferlog_t; logging_log_file(xferlog_t) @@ -16138,12 +16154,12 @@ ') tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` -@@ -253,7 +265,10 @@ +@@ -253,7 +265,9 @@ ') optional_policy(` -+ kerberos_use(ftpd_t) - kerberos_read_keytab(ftpd_t) +- kerberos_read_keytab(ftpd_t) ++ kerberos_keytab_template(ftpd, ftpd_t) + kerberos_manage_host_rcache(ftpd_t) + selinux_validate_context(ftpd_t) ') @@ -16218,7 +16234,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.3.1/policy/modules/services/gamin.te --- nsaserefpolicy/policy/modules/services/gamin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/gamin.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/gamin.te 2008-07-14 09:04:02.000000000 -0400 @@ -0,0 +1,41 @@ +policy_module(gamin,1.0.0) + @@ -16229,7 +16245,7 @@ + +type gamin_t; +type gamin_exec_t; -+init_daemon_domain(gamin_t, gamin_exec_t) ++#init_daemon_domain(gamin_t, gamin_exec_t) +application_domain(gamin_t, gamin_exec_t) + +######################################## @@ -16945,8 +16961,12 @@ # Local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.3.1/policy/modules/services/kerberos.fc --- nsaserefpolicy/policy/modules/services/kerberos.fc 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/kerberos.fc 2008-07-02 08:47:10.000000000 -0400 -@@ -16,3 +16,9 @@ ++++ serefpolicy-3.3.1/policy/modules/services/kerberos.fc 2008-07-11 09:22:08.000000000 -0400 +@@ -13,6 +13,13 @@ + + /var/kerberos/krb5kdc(/.*)? gen_context(system_u:object_r:krb5kdc_conf_t,s0) + /var/kerberos/krb5kdc/principal.* gen_context(system_u:object_r:krb5kdc_principal_t,s0) ++/var/kerberos/krb5kdc/principal\.ok gen_context(system_u:object_r:krb5kdc_lock_t,s0) /var/log/krb5kdc\.log gen_context(system_u:object_r:krb5kdc_log_t,s0) /var/log/kadmin(d)?\.log gen_context(system_u:object_r:kadmind_log_t,s0) @@ -16958,7 +16978,7 @@ +/etc/rc.d/init.d/krb5kdc -- gen_context(system_u:object_r:kerberos_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.3.1/policy/modules/services/kerberos.if --- nsaserefpolicy/policy/modules/services/kerberos.if 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/kerberos.if 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/kerberos.if 2008-07-11 14:37:11.000000000 -0400 @@ -43,7 +43,14 @@ dontaudit $1 krb5kdc_conf_t:dir list_dir_perms; dontaudit $1 krb5kdc_conf_t:file rw_file_perms; @@ -16986,14 +17006,14 @@ optional_policy(` tunable_policy(`allow_kerberos',` pcscd_stream_connect($1) -@@ -169,6 +172,158 @@ +@@ -169,6 +172,182 @@ ') files_search_etc($1) - allow $1 krb5kdc_conf_t:file read_file_perms; + read_files_pattern($1, krb5kdc_conf_t, krb5kdc_conf_t) +') - ++ +######################################## +## +## Read the kerberos kdc configuration file (/etc/krb5kdc.conf). @@ -17040,7 +17060,7 @@ + corenet_udp_sendrecv_kerberos_master_port($1) + corenet_udp_bind_all_nodes($1) + ') - ') ++') + +######################################## +## @@ -17145,10 +17165,34 @@ + manage_all_pattern($1,krb5_host_rcache_t) +') + ++######################################## ++## ++## Create a derived type for kerberos keytab ++## ++## ++## ++## The prefix to be used for deriving type names. ++## ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++template(`kerberos_keytab_template',` + ++ type $1_keytab_t; ++ files_type($1_keytab_t) ++ ++ allow $2 $1_keytab_t:file read_file_perms; + ++ kerberos_read_keytab($2) ++ kerberos_use($2) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.3.1/policy/modules/services/kerberos.te --- nsaserefpolicy/policy/modules/services/kerberos.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-07-03 14:50:17.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-07-11 14:36:19.000000000 -0400 @@ -16,6 +16,7 @@ type kadmind_t; type kadmind_exec_t; @@ -17157,7 +17201,17 @@ type kadmind_log_t; logging_log_file(kadmind_log_t) -@@ -44,6 +45,7 @@ +@@ -37,6 +38,9 @@ + type krb5kdc_conf_t; + files_type(krb5kdc_conf_t) + ++type krb5kdc_lock_t; ++files_type(krb5kdc_lock_t) ++ + # types for KDC principal file(s) + type krb5kdc_principal_t; + files_type(krb5kdc_principal_t) +@@ -44,6 +48,7 @@ type krb5kdc_t; type krb5kdc_exec_t; init_daemon_domain(krb5kdc_t,krb5kdc_exec_t) @@ -17165,7 +17219,7 @@ type krb5kdc_log_t; logging_log_file(krb5kdc_log_t) -@@ -54,6 +56,12 @@ +@@ -54,6 +59,12 @@ type krb5kdc_var_run_t; files_pid_file(krb5kdc_var_run_t) @@ -17178,7 +17232,7 @@ ######################################## # # kadmind local policy -@@ -62,7 +70,7 @@ +@@ -62,7 +73,7 @@ # Use capabilities. Surplus capabilities may be allowed. allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice }; dontaudit kadmind_t self:capability sys_tty_config; @@ -17187,7 +17241,18 @@ allow kadmind_t self:netlink_route_socket r_netlink_socket_perms; allow kadmind_t self:unix_dgram_socket { connect create write }; allow kadmind_t self:tcp_socket connected_stream_socket_perms; -@@ -91,6 +99,7 @@ +@@ -77,7 +88,9 @@ + read_files_pattern(kadmind_t,krb5kdc_conf_t,krb5kdc_conf_t) + dontaudit kadmind_t krb5kdc_conf_t:file { write setattr }; + +-allow kadmind_t krb5kdc_principal_t:file { getattr lock read write setattr }; ++allow kadmind_t krb5kdc_principal_t:file manage_file_perms; ++filetrans_pattern(kadmind_t, krb5kdc_conf_t, krb5kdc_principal_t, file) ++allow kadmind_t krb5kdc_lock_t:file { rw_file_perms setattr }; + + can_exec(kadmind_t, kadmind_exec_t) + +@@ -91,6 +104,7 @@ kernel_read_kernel_sysctls(kadmind_t) kernel_list_proc(kadmind_t) kernel_read_proc_symlinks(kadmind_t) @@ -17195,7 +17260,7 @@ corenet_all_recvfrom_unlabeled(kadmind_t) corenet_all_recvfrom_netlabel(kadmind_t) -@@ -118,6 +127,12 @@ +@@ -118,6 +132,12 @@ domain_use_interactive_fds(kadmind_t) files_read_etc_files(kadmind_t) @@ -17208,7 +17273,7 @@ libs_use_ld_so(kadmind_t) libs_use_shared_libs(kadmind_t) -@@ -127,6 +142,7 @@ +@@ -127,6 +147,7 @@ miscfiles_read_localization(kadmind_t) sysnet_read_config(kadmind_t) @@ -17216,7 +17281,7 @@ userdom_dontaudit_use_unpriv_user_fds(kadmind_t) userdom_dontaudit_search_sysadm_home_dirs(kadmind_t) -@@ -137,6 +153,7 @@ +@@ -137,6 +158,7 @@ optional_policy(` seutil_sigchld_newrole(kadmind_t) @@ -17224,7 +17289,7 @@ ') optional_policy(` -@@ -151,7 +168,7 @@ +@@ -151,7 +173,7 @@ # Use capabilities. Surplus capabilities may be allowed. allow krb5kdc_t self:capability { setuid setgid net_admin chown fowner dac_override sys_nice }; dontaudit krb5kdc_t self:capability sys_tty_config; @@ -17233,7 +17298,22 @@ allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms; allow krb5kdc_t self:tcp_socket create_stream_socket_perms; allow krb5kdc_t self:udp_socket create_socket_perms; -@@ -215,6 +232,9 @@ +@@ -160,11 +182,13 @@ + allow krb5kdc_t krb5_conf_t:file read_file_perms; + dontaudit krb5kdc_t krb5_conf_t:file write; + +-can_exec(krb5kdc_t, krb5kdc_exec_t) ++qcan_exec(krb5kdc_t, krb5kdc_exec_t) + + read_files_pattern(krb5kdc_t,krb5kdc_conf_t,krb5kdc_conf_t) + dontaudit krb5kdc_t krb5kdc_conf_t:file write; + ++allow krb5kdc_t krb5kdc_lock_t:file { rw_file_perms setattr }; ++ + allow krb5kdc_t krb5kdc_log_t:file manage_file_perms; + logging_log_filetrans(krb5kdc_t,krb5kdc_log_t,file) + +@@ -215,6 +239,9 @@ files_read_usr_symlinks(krb5kdc_t) files_read_var_files(krb5kdc_t) @@ -17243,7 +17323,7 @@ libs_use_ld_so(krb5kdc_t) libs_use_shared_libs(krb5kdc_t) -@@ -223,6 +243,7 @@ +@@ -223,6 +250,7 @@ miscfiles_read_localization(krb5kdc_t) sysnet_read_config(krb5kdc_t) @@ -17251,7 +17331,7 @@ userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t) userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t) -@@ -233,8 +254,10 @@ +@@ -233,8 +261,10 @@ optional_policy(` seutil_sigchld_newrole(krb5kdc_t) @@ -18479,21 +18559,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.3.1/policy/modules/services/nagios.fc --- nsaserefpolicy/policy/modules/services/nagios.fc 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/nagios.fc 2008-07-02 08:47:10.000000000 -0400 -@@ -4,13 +4,19 @@ ++++ serefpolicy-3.3.1/policy/modules/services/nagios.fc 2008-07-14 15:52:32.000000000 -0400 +@@ -4,13 +4,17 @@ /usr/bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) /usr/bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) -/usr/lib(64)?/cgi-bin/netsaint/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0) -/usr/lib(64)?/nagios/cgi/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0) -+/usr/lib(64)?/cgi-bin/netsaint(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) +/usr/lib(64)?/nagios/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) /var/log/nagios(/.*)? gen_context(system_u:object_r:nagios_log_t,s0) - /var/log/netsaint(/.*)? gen_context(system_u:object_r:nagios_log_t,s0) - -+/var/spool/nagios(/.*)? gen_context(system_u:object_r:nagios_spool_t,s0) +-/var/log/netsaint(/.*)? gen_context(system_u:object_r:nagios_log_t,s0) + ++/var/spool/nagios(/.*)? gen_context(system_u:object_r:nagios_spool_t,s0) + ifdef(`distro_debian',` /usr/sbin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) -/usr/lib/cgi-bin/nagios/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0) @@ -18617,7 +18696,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.3.1/policy/modules/services/nagios.te --- nsaserefpolicy/policy/modules/services/nagios.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/nagios.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/nagios.te 2008-07-14 15:54:43.000000000 -0400 @@ -8,11 +8,7 @@ type nagios_t; @@ -18661,7 +18740,7 @@ kernel_read_system_state(nagios_t) kernel_read_kernel_sysctls(nagios_t) -@@ -130,42 +134,31 @@ +@@ -130,42 +134,34 @@ # # Nagios CGI local policy # @@ -18685,30 +18764,32 @@ -allow nagios_cgi_t nagios_log_t:dir list_dir_perms; -read_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t) -read_lnk_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t) ++files_search_spool(httpd_nagios_script_t) ++rw_fifo_files_pattern(httpd_nagios_script_t, nagios_spool_t, nagios_spool_t) + +-kernel_read_system_state(nagios_cgi_t) +allow httpd_nagios_script_t nagios_etc_t:dir list_dir_perms; +read_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_etc_t) +read_lnk_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_etc_t) --kernel_read_system_state(nagios_cgi_t) +-corecmd_exec_bin(nagios_cgi_t) +allow httpd_nagios_script_t nagios_log_t:dir list_dir_perms; +read_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_log_t) +read_lnk_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_log_t) --corecmd_exec_bin(nagios_cgi_t) -+kernel_read_system_state(httpd_nagios_script_t) - -domain_dontaudit_read_all_domains_state(nagios_cgi_t) -+domain_dontaudit_read_all_domains_state(httpd_nagios_script_t) ++kernel_read_system_state(httpd_nagios_script_t) -files_read_etc_files(nagios_cgi_t) -files_read_etc_runtime_files(nagios_cgi_t) -files_read_kernel_symbol_table(nagios_cgi_t) -+files_read_etc_runtime_files(httpd_nagios_script_t) -+files_read_kernel_symbol_table(httpd_nagios_script_t) ++domain_dontaudit_read_all_domains_state(httpd_nagios_script_t) -libs_use_ld_so(nagios_cgi_t) -libs_use_shared_libs(nagios_cgi_t) -- ++files_read_etc_runtime_files(httpd_nagios_script_t) ++files_read_kernel_symbol_table(httpd_nagios_script_t) + -logging_send_syslog_msg(nagios_cgi_t) -logging_search_logs(nagios_cgi_t) - @@ -19245,7 +19326,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.3.1/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/nscd.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/nscd.te 2008-07-09 07:41:58.000000000 -0400 @@ -23,19 +23,22 @@ type nscd_log_t; logging_log_file(nscd_log_t) @@ -19281,7 +19362,15 @@ kernel_read_kernel_sysctls(nscd_t) kernel_list_proc(nscd_t) kernel_read_proc_symlinks(nscd_t) -@@ -73,6 +78,7 @@ +@@ -60,6 +65,7 @@ + + fs_getattr_all_fs(nscd_t) + fs_search_auto_mountpoints(nscd_t) ++fs_list_inotifyfs(nscd_t) + + # for when /etc/passwd has just been updated and has the wrong type + auth_getattr_shadow(nscd_t) +@@ -73,6 +79,7 @@ corenet_udp_sendrecv_all_nodes(nscd_t) corenet_tcp_sendrecv_all_ports(nscd_t) corenet_udp_sendrecv_all_ports(nscd_t) @@ -19289,7 +19378,7 @@ corenet_tcp_connect_all_ports(nscd_t) corenet_sendrecv_all_client_packets(nscd_t) corenet_rw_tun_tap_dev(nscd_t) -@@ -84,6 +90,7 @@ +@@ -84,6 +91,7 @@ selinux_compute_relabel_context(nscd_t) selinux_compute_user_contexts(nscd_t) domain_use_interactive_fds(nscd_t) @@ -19297,7 +19386,7 @@ files_read_etc_files(nscd_t) files_read_generic_tmp_symlinks(nscd_t) -@@ -93,6 +100,7 @@ +@@ -93,6 +101,7 @@ libs_use_ld_so(nscd_t) libs_use_shared_libs(nscd_t) @@ -19305,7 +19394,7 @@ logging_send_syslog_msg(nscd_t) miscfiles_read_localization(nscd_t) -@@ -107,6 +115,10 @@ +@@ -107,6 +116,10 @@ userdom_dontaudit_search_sysadm_home_dirs(nscd_t) optional_policy(` @@ -19316,7 +19405,7 @@ udev_read_db(nscd_t) ') -@@ -114,3 +126,12 @@ +@@ -114,3 +127,12 @@ xen_dontaudit_rw_unix_stream_sockets(nscd_t) xen_append_log(nscd_t) ') @@ -22488,7 +22577,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.3.1/policy/modules/services/razor.if --- nsaserefpolicy/policy/modules/services/razor.if 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/razor.if 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/razor.if 2008-07-10 14:46:54.000000000 -0400 @@ -137,6 +137,7 @@ template(`razor_per_role_template',` gen_require(` @@ -22514,7 +22603,7 @@ ############################## # -@@ -217,4 +216,44 @@ +@@ -217,4 +216,63 @@ ') domtrans_pattern($1, razor_exec_t, razor_t) @@ -22557,8 +22646,27 @@ + allow $2 user_home_dir_t:dir search_dir_perms; + manage_files_pattern($2,user_razor_home_t,user_razor_home_t) + read_lnk_files_pattern($2,user_razor_home_t,user_razor_home_t) - ') ++') + ++######################################## ++## ++## read razor lib files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`razor_read_lib_files',` ++ gen_require(` ++ type razor_var_lib_t; ++ ') ++ ++ files_search_var_lib($1) ++ list_dirs_pattern($1, razor_var_lib_t, razor_var_lib_t) ++ read_files_pattern($1, razor_var_lib_t, razor_var_lib_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.3.1/policy/modules/services/razor.te --- nsaserefpolicy/policy/modules/services/razor.te 2008-06-12 23:38:01.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/services/razor.te 2008-07-02 08:47:10.000000000 -0400 @@ -22647,7 +22755,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.3.1/policy/modules/services/rlogin.te --- nsaserefpolicy/policy/modules/services/rlogin.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/rlogin.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/rlogin.te 2008-07-11 14:53:30.000000000 -0400 @@ -36,6 +36,8 @@ allow rlogind_t rlogind_devpts_t:chr_file { rw_chr_file_perms setattr }; term_create_pty(rlogind_t,rlogind_devpts_t) @@ -22657,7 +22765,7 @@ # for /usr/lib/telnetlogin can_exec(rlogind_t, rlogind_exec_t) -@@ -82,23 +84,21 @@ +@@ -82,23 +84,20 @@ miscfiles_read_localization(rlogind_t) @@ -22672,8 +22780,8 @@ +remotelogin_signal(rlogind_t) optional_policy(` -+ kerberos_use(rlogind_t) - kerberos_read_keytab(rlogind_t) +- kerberos_read_keytab(rlogind_t) ++ kerberos_keytab_template(rlogind, rlogind_t) + kerberos_manage_host_rcache(rlogind_t) ') @@ -22822,7 +22930,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.3.1/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/rpc.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/rpc.te 2008-07-11 14:52:41.000000000 -0400 @@ -23,7 +23,7 @@ gen_tunable(allow_nfsd_anon_write,false) @@ -22923,6 +23031,16 @@ tunable_policy(`allow_gssd_read_tmp',` userdom_list_unpriv_users_tmp(gssd_t) userdom_read_unpriv_users_tmp_files(gssd_t) +@@ -166,8 +193,7 @@ + ') + + optional_policy(` +- kerberos_use(gssd_t) +- kerberos_read_keytab(gssd_t) ++ kerberos_keytab_template(gssd, gssd_t) + ') + + optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.3.1/policy/modules/services/rpcbind.fc --- nsaserefpolicy/policy/modules/services/rpcbind.fc 2008-06-12 23:38:01.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/services/rpcbind.fc 2008-07-02 08:47:10.000000000 -0400 @@ -23042,7 +23160,7 @@ corenet_all_recvfrom_unlabeled(rpcbind_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.3.1/policy/modules/services/rshd.te --- nsaserefpolicy/policy/modules/services/rshd.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/rshd.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/rshd.te 2008-07-11 14:54:28.000000000 -0400 @@ -16,7 +16,7 @@ # # Local policy @@ -23088,16 +23206,17 @@ miscfiles_read_localization(rshd_t) -@@ -78,6 +83,8 @@ +@@ -77,7 +82,8 @@ + ') optional_policy(` - kerberos_use(rshd_t) -+ kerberos_read_keytab(rshd_t) +- kerberos_use(rshd_t) ++ kerberos_keytab_template(rshd, rshd_t) + kerberos_manage_host_rcache(rshd_t) ') optional_policy(` -@@ -86,4 +93,5 @@ +@@ -86,4 +92,5 @@ optional_policy(` unconfined_shell_domtrans(rshd_t) @@ -23640,7 +23759,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.3.1/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/samba.te 2008-07-02 13:55:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/samba.te 2008-07-11 14:55:01.000000000 -0400 @@ -59,6 +59,13 @@ ## gen_tunable(samba_share_nfs,false) @@ -23760,7 +23879,7 @@ +') + +optional_policy(` -+ kerberos_read_keytab(smbd_t) ++ kerberos_keytab_template(smbd, smbd_t) +') + +optional_policy(` @@ -24056,7 +24175,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.3.1/policy/modules/services/sasl.te --- nsaserefpolicy/policy/modules/services/sasl.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/sasl.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/sasl.te 2008-07-11 14:53:48.000000000 -0400 @@ -23,6 +23,9 @@ type saslauthd_var_run_t; files_pid_file(saslauthd_var_run_t) @@ -24067,6 +24186,15 @@ ######################################## # # Local policy +@@ -98,7 +101,7 @@ + ') + + optional_policy(` +- kerberos_read_keytab(saslauthd_t) ++ kerberos_keytab_template(saslauthd, saslauthd_t) + ') + + optional_policy(` @@ -107,6 +110,10 @@ ') @@ -25743,7 +25871,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.3.1/policy/modules/services/spamassassin.te --- nsaserefpolicy/policy/modules/services/spamassassin.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/spamassassin.te 2008-07-02 14:03:27.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/spamassassin.te 2008-07-10 14:46:20.000000000 -0400 @@ -21,8 +21,10 @@ gen_tunable(spamd_enable_home_dirs,true) @@ -25862,10 +25990,11 @@ dcc_stream_connect_dccifd(spamd_t) ') -@@ -198,6 +242,10 @@ +@@ -198,6 +242,11 @@ optional_policy(` razor_domtrans(spamd_t) ++ razor_read_lib_files(spamd_t) + tunable_policy(`spamd_enable_home_dirs',` + razor_manage_user_home_files(user,spamd_t) + ') @@ -25873,7 +26002,7 @@ ') optional_policy(` -@@ -212,3 +260,216 @@ +@@ -212,3 +261,216 @@ optional_policy(` udev_read_db(spamd_t) ') @@ -26569,7 +26698,7 @@ files_tmp_file(stunnel_tmp_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.3.1/policy/modules/services/telnet.te --- nsaserefpolicy/policy/modules/services/telnet.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/telnet.te 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/telnet.te 2008-07-11 14:53:04.000000000 -0400 @@ -37,6 +37,8 @@ allow telnetd_t telnetd_devpts_t:chr_file { rw_chr_file_perms setattr }; term_create_pty(telnetd_t,telnetd_devpts_t) @@ -26587,7 +26716,7 @@ files_read_etc_files(telnetd_t) files_read_etc_runtime_files(telnetd_t) # for identd; cjp: this should probably only be inetd_child rules? -@@ -80,17 +83,26 @@ +@@ -80,17 +83,25 @@ miscfiles_read_localization(telnetd_t) @@ -26600,8 +26729,9 @@ + # for identd; cjp: this should probably only be inetd_child rules? optional_policy(` - kerberos_use(telnetd_t) - kerberos_read_keytab(telnetd_t) +- kerberos_use(telnetd_t) +- kerberos_read_keytab(telnetd_t) ++ kerberos_keytab_template(telnetd, telnetd_t) + kerberos_manage_host_rcache(telnetd_t) ') @@ -29293,8 +29423,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.3.1/policy/modules/system/application.te --- nsaserefpolicy/policy/modules/system/application.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/application.te 2008-07-02 15:01:41.000000000 -0400 -@@ -7,6 +7,10 @@ ++++ serefpolicy-3.3.1/policy/modules/system/application.te 2008-07-14 09:29:37.000000000 -0400 +@@ -7,6 +7,12 @@ # Executables to be run by user attribute application_exec_type; @@ -29302,6 +29432,8 @@ +userdom_write_unpriv_users_tmp_files(application_domain_type) +logging_append_all_logs(application_domain_type) + ++files_dontaudit_search_all_dirs(application_domain_type) ++ optional_policy(` ssh_sigchld(application_domain_type) ssh_rw_stream_sockets(application_domain_type) @@ -39027,13 +39159,13 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-07-08 10:42:49.000000000 -0400 @@ -315,3 +315,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }') + -+define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control } ++define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap } +') + +define(`all_nscd_perms', `{ getserv getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost shmemserv } ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.695 retrieving revision 1.696 diff -u -r1.695 -r1.696 --- selinux-policy.spec 7 Jul 2008 17:55:17 -0000 1.695 +++ selinux-policy.spec 14 Jul 2008 20:10:21 -0000 1.696 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 77%{?dist} +Release: 78%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -385,9 +385,13 @@ %endif %changelog +* Tue Jul 8 2008 Dan Walsh 3.3.1-78 +- Allow unconfined_t to setfcap +- Allow spamassassin to read razor lib files + * Mon Jul 7 2008 Dan Walsh 3.3.1-77 - Allow amanda to read tape -- Allow prewikka cgi to use syslog, allow audisp_t to signal cgi +- Allow prewikka cgi to use syslog, allow prelude_ausisp to signal audisp_t - Add support for netware file systems * Thu Jul 3 2008 Dan Walsh 3.3.1-76 From fedora-extras-commits at redhat.com Mon Jul 14 20:14:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:14:08 GMT Subject: rpms/balsa/devel balsa.spec,1.40,1.41 Message-ID: <200807142014.m6EKE8SG003352@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3173 Modified Files: balsa.spec Log Message: fix license tag Index: balsa.spec =================================================================== RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- balsa.spec 18 Jun 2008 16:43:52 -0000 1.40 +++ balsa.spec 14 Jul 2008 20:13:12 -0000 1.41 @@ -2,11 +2,11 @@ Name: balsa Version: 2.3.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail Client Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://balsa.gnome.org/ Source0: http://balsa.gnome.org/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -101,6 +101,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 2.3.25-2 +- fix license tag + * Wed Jun 18 2008 Pawel Salek - 2.3.25-1 - update to upstream 2.3.25. From fedora-extras-commits at redhat.com Mon Jul 14 20:18:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:18:22 GMT Subject: rpms/barcode/devel barcode.spec,1.10,1.11 Message-ID: <200807142018.m6EKIMXl004383@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4161 Modified Files: barcode.spec Log Message: fix license tag Index: barcode.spec =================================================================== RCS file: /cvs/pkgs/rpms/barcode/devel/barcode.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- barcode.spec 11 Feb 2008 13:04:50 -0000 1.10 +++ barcode.spec 14 Jul 2008 20:17:29 -0000 1.11 @@ -1,8 +1,8 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 11%{?dist} -License: GPL +Release: 12%{?dist} +License: GPLv2+ Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz Patch0: barcode-configure.patch @@ -67,6 +67,9 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.9.8-12 +- fix license tag + * Mon Feb 11 2008 Andreas Thienemann - 0.9.8-11 - Rebuild against gcc-4.3 From fedora-extras-commits at redhat.com Mon Jul 14 20:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:23:24 GMT Subject: rpms/berusky/devel berusky.spec,1.6,1.7 Message-ID: <200807142023.m6EKNOcY004885@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/berusky/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4836 Modified Files: berusky.spec Log Message: fix license tag Index: berusky.spec =================================================================== RCS file: /cvs/pkgs/rpms/berusky/devel/berusky.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- berusky.spec 20 Feb 2008 03:33:09 -0000 1.6 +++ berusky.spec 14 Jul 2008 20:22:38 -0000 1.7 @@ -1,8 +1,8 @@ Summary: Berusky, 2D logic game Name: berusky Version: 1.1 -Release: 8%{?dist} -License: GPL +Release: 9%{?dist} +License: GPLv2+ Group: Amusements/Games Source: http://www.anakreon.cz/download/berusky/tar.gz/%{name}-%{version}.tar.gz Source1: berusky.desktop @@ -75,6 +75,9 @@ %{_datadir}/icons/hicolor/32x32/apps/berusky.png %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.1-9 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.1-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 20:25:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:25:01 GMT Subject: rpms/berusky-data/devel berusky-data.spec,1.1,1.2 Message-ID: <200807142025.m6EKP1Tp005136@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/berusky-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5029 Modified Files: berusky-data.spec Log Message: fix license tag Index: berusky-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/berusky-data/devel/berusky-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- berusky-data.spec 25 May 2007 12:47:00 -0000 1.1 +++ berusky-data.spec 14 Jul 2008 20:24:07 -0000 1.2 @@ -3,8 +3,9 @@ Summary: A datafile for Berusky Name: berusky-data Version: 1.0 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +# No version is specified. +License: GPL+ Group: Amusements/Games Source: http://www.anakreon.cz/download/berusky/tar.gz/%{name}-%{version}.tar.gz URL: http://www.anakreon.cz/ @@ -49,6 +50,9 @@ /var/games/%{game_name}/* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 1.0-4 +- fix license tag + * Tue May 8 2007 Martin Stransky 1.0-3 - added build section From fedora-extras-commits at redhat.com Mon Jul 14 20:26:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:26:36 GMT Subject: rpms/bidiv/devel bidiv.spec,1.6,1.7 Message-ID: <200807142026.m6EKQaDc005368@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bidiv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5235 Modified Files: bidiv.spec Log Message: fix license tag Index: bidiv.spec =================================================================== RCS file: /cvs/pkgs/rpms/bidiv/devel/bidiv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bidiv.spec 19 Feb 2008 18:52:26 -0000 1.6 +++ bidiv.spec 14 Jul 2008 20:25:32 -0000 1.7 @@ -1,12 +1,12 @@ Summary: Display logical Hebrew on unidirectional terminals Name: bidiv Version: 1.5 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/ Source: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/%{name}-%{version}.tgz Patch0: nostrip.patch.gz Patch1: fribidi-0.19.patch.gz -License: GPL +License: GPLv2 Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fribidi-devel @@ -42,6 +42,9 @@ # and what about %{_mandir}/he/man1/bidiv.1 ? ;) %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 1.5-7 +- fix license tag + * Mon Feb 19 2008 Dan Kenigsberg 1.5-6 - compile against fribidi-0.19.1 * Mon Feb 18 2008 Fedora Release Engineering - 1.5-5 From fedora-extras-commits at redhat.com Mon Jul 14 20:27:44 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 20:27:44 GMT Subject: rpms/xfmpc/devel import.log, NONE, 1.1 xfmpc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807142027.m6EKRigQ005517@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfmpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5355/devel Modified Files: .cvsignore sources Added Files: import.log xfmpc.spec Log Message: Initial import of xfmpc. Review was at https://bugzilla.redhat.com/show_bug.cgi?id=455083 --- NEW FILE import.log --- xfmpc-0_0_6-1_fc10:HEAD:xfmpc-0.0.6-1.fc10.src.rpm:1216067176 --- NEW FILE xfmpc.spec --- Name: xfmpc Version: 0.0.6 Release: 1%{?dist} Summary: A MPD client for the Xfce desktop environment Group: Applications/Multimedia License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfcegui4-devel >= 4.4.0, libmpd-devel >= 0.15.0 BuildRequires: gettext, perl(XML::Parser), desktop-file-utils Requires: mpc %description Xfmpc is a a graphical GTK+ MPD client for the Xfce desktop environment. It is focusing on low footprint and easy usage. To connect to a remote machine set the environment variables MPD_HOST and MPD_PORT as described in the mpc(1) manpage. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor "fedora" \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog IDEAS NEWS README THANKS %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Fri Jul 11 2008 Christoph Wickert - 0.0.6-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfmpc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 19:41:33 -0000 1.1 +++ .cvsignore 14 Jul 2008 20:26:47 -0000 1.2 @@ -0,0 +1 @@ +xfmpc-0.0.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfmpc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 19:41:33 -0000 1.1 +++ sources 14 Jul 2008 20:26:47 -0000 1.2 @@ -0,0 +1 @@ +1d2edd3cfb950d61dc1fac8229ac828b xfmpc-0.0.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 20:29:24 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 14 Jul 2008 20:29:24 GMT Subject: rpms/xchat/devel xc286-smallfixes.diff, NONE, 1.1 xchat.spec, 1.92, 1.93 Message-ID: <200807142029.m6EKTOR1005799@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/xchat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5640/devel Modified Files: xchat.spec Added Files: xc286-smallfixes.diff Log Message: * Mon Jul 14 2008 Kevin Kofler - 1:2.8.6-2 - apply xc286-smallfixes.diff from upstream xc286-smallfixes.diff: --- NEW FILE xc286-smallfixes.diff --- # # Various small fixes from CVS that are considered safe to apply to 2.8.6. # --- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100 +++ xchat-2.8.6p1/src/common/cfgfiles.c 2008-06-15 13:45:43.000000000 +1000 @@ -886,7 +886,6 @@ set_showval (session *sess, const struct prefs *var, char *tbuf) { int len, dots, j; - static const char *offon[] = { "OFF", "ON" }; len = strlen (var->name); memcpy (tbuf, var->name, len); @@ -909,8 +908,10 @@ *((int *) &prefs + var->offset)); break; case TYPE_BOOL: - sprintf (tbuf + len, "\0033:\017 %s\n", offon[ - *((int *) &prefs + var->offset)]); + if (*((int *) &prefs + var->offset)) + sprintf (tbuf + len, "\0033:\017 %s\n", "ON"); + else + sprintf (tbuf + len, "\0033:\017 %s\n", "OFF"); break; } PrintText (sess, tbuf); --- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000 +++ xchat-2.8.6p1/src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000 @@ -32,7 +32,7 @@ #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx) -channel_options chanopt[] = +static const channel_options chanopt[] = { {"alert_beep", "BEEP", S_F(alert_beep)}, {"alert_taskbar", NULL, S_F(alert_taskbar)}, --- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100 +++ xchat-2.8.6p1/src/common/servlist.c 2008-06-15 13:57:41.000000000 +1000 @@ -509,6 +509,8 @@ list = g_slist_nth (net->servlist, net->selected); if (!list) list = net->servlist; + if (!list) + return; ircserv = list->data; /* incase a protocol switch is added to the servlist gui */ --- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100 +++ xchat-2.8.6p1/src/common/text.c 2008-06-15 13:59:59.000000000 +1000 @@ -216,7 +216,7 @@ static void scrollback_save (session *sess, char *text) { - char buf[1024]; + char buf[512 * 4]; time_t stamp; int len; @@ -266,7 +266,7 @@ scrollback_load (session *sess) { int fh; - char buf[1024]; + char buf[512 * 4]; char *text; time_t stamp; int lines; Index: xchat.spec =================================================================== RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- xchat.spec 15 Jun 2008 12:52:14 -0000 1.92 +++ xchat.spec 14 Jul 2008 20:28:27 -0000 1.93 @@ -3,7 +3,7 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: xchat Version: 2.8.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Internet License: GPLv2+ @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Patches 0-9 reserved for official xchat.org patches +Patch0: xc286-smallfixes.diff Patch10: xchat-2.8.4-redhat-desktop.patch Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch @@ -64,6 +65,8 @@ %prep %setup -q +# Various small fixes from CVS that are considered safe to apply to 2.8.6. +%patch0 -p1 %patch10 -p1 -b .desktop-file %patch12 -p0 -b .use-sysconf-to-detect-cpus @@ -158,6 +161,9 @@ %{_libdir}/xchat/plugins/tcl.so %changelog +* Mon Jul 14 2008 Kevin Kofler - 1:2.8.6-2 +- apply xc286-smallfixes.diff from upstream + * Sun Jun 15 2008 Kevin Kofler - 1:2.8.6-1 - update to 2.8.6 - drop upstream patches (already applied in 2.8.6) From fedora-extras-commits at redhat.com Mon Jul 14 20:29:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:29:59 GMT Subject: rpms/bigboard/devel bigboard.spec,1.59,1.60 Message-ID: <200807142029.m6EKTxc5005865@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bigboard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5723 Modified Files: bigboard.spec Log Message: fix license tag Index: bigboard.spec =================================================================== RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- bigboard.spec 20 Jun 2008 15:59:43 -0000 1.59 +++ bigboard.spec 14 Jul 2008 20:29:13 -0000 1.60 @@ -3,11 +3,11 @@ Name: bigboard Version: 0.5.38 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Sidebar application launcher using mugshot.org Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://mugshot.org/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/bigboard/0.5/bigboard-%{version}.tar.bz2 # This patch is Fedora-specific @@ -117,6 +117,9 @@ killall -HUP gconfd-2 || : %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.5.38-3 +- fix license tag + * Thu Jun 19 2008 Owen Taylor - 0.5.38-2 - Update to 0.5.38 (improvements for people search) From fedora-extras-commits at redhat.com Mon Jul 14 20:31:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:31:47 GMT Subject: rpms/bitbake/devel bitbake.spec,1.7,1.8 Message-ID: <200807142031.m6EKVl7l006253@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bitbake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6075 Modified Files: bitbake.spec Log Message: fix license tag Index: bitbake.spec =================================================================== RCS file: /cvs/pkgs/rpms/bitbake/devel/bitbake.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bitbake.spec 31 Aug 2007 12:00:15 -0000 1.7 +++ bitbake.spec 14 Jul 2008 20:30:50 -0000 1.8 @@ -3,8 +3,8 @@ Summary: BitBake build tool Name: bitbake Version: 1.8.8 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2 Group: Development/Tools Source0: http://download.berlios.de/bitbake/bitbake-%{version}.tar.gz URL: http://developer.berlios.de/projects/bitbake/ @@ -48,6 +48,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.8.8-2 +- fix license tag + * Fri Aug 31 2007 Andreas Thienemann - 1.8.8-1 - Updated to 1.8.8 From fedora-extras-commits at redhat.com Mon Jul 14 20:36:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:36:30 GMT Subject: rpms/bitgtkmm/devel bitgtkmm.spec,1.6,1.7 Message-ID: <200807142036.m6EKaUQN006934@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bitgtkmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6808 Modified Files: bitgtkmm.spec Log Message: fix license tag Index: bitgtkmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/bitgtkmm/devel/bitgtkmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bitgtkmm.spec 19 Feb 2008 22:47:23 -0000 1.6 +++ bitgtkmm.spec 14 Jul 2008 20:35:41 -0000 1.7 @@ -1,8 +1,8 @@ Summary: The bitgtkmm library provides gtkmm widgets for the bit library Name: bitgtkmm Version: 0.4.0 -Release: 3%{?dist} -License: LGPL +Release: 4%{?dist} +License: LGPLv2 URL: http://libbit.sourceforge.net/gtkmm Group: System Environment/Libraries Source: http://download.sourceforge.net/libbit/%{name}-%{version}.tar.bz2 @@ -58,6 +58,9 @@ %doc ChangeLog docs/reference %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.4.0-4 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.0-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 20:37:58 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 20:37:58 GMT Subject: rpms/xfmpc/F-8 xfmpc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807142037.m6EKbwGL007220@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfmpc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018/F-8 Modified Files: .cvsignore sources Added Files: xfmpc.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.0.6-1 - Initial Fedora package --- NEW FILE xfmpc.spec --- Name: xfmpc Version: 0.0.6 Release: 1%{?dist} Summary: A MPD client for the Xfce desktop environment Group: Applications/Multimedia License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfcegui4-devel >= 4.4.0, libmpd-devel >= 0.15.0 BuildRequires: gettext, perl(XML::Parser), desktop-file-utils Requires: mpc %description Xfmpc is a a graphical GTK+ MPD client for the Xfce desktop environment. It is focusing on low footprint and easy usage. To connect to a remote machine set the environment variables MPD_HOST and MPD_PORT as described in the mpc(1) manpage. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor "fedora" \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog IDEAS NEWS README THANKS %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Fri Jul 11 2008 Christoph Wickert - 0.0.6-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfmpc/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 19:41:33 -0000 1.1 +++ .cvsignore 14 Jul 2008 20:37:16 -0000 1.2 @@ -0,0 +1 @@ +xfmpc-0.0.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfmpc/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 19:41:33 -0000 1.1 +++ sources 14 Jul 2008 20:37:16 -0000 1.2 @@ -0,0 +1 @@ +1d2edd3cfb950d61dc1fac8229ac828b xfmpc-0.0.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 20:38:16 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 14 Jul 2008 20:38:16 GMT Subject: rpms/xfmpc/F-9 xfmpc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807142038.m6EKcGA0007251@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfmpc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018/F-9 Modified Files: .cvsignore sources Added Files: xfmpc.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.0.6-1 - Initial Fedora package --- NEW FILE xfmpc.spec --- Name: xfmpc Version: 0.0.6 Release: 1%{?dist} Summary: A MPD client for the Xfce desktop environment Group: Applications/Multimedia License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfcegui4-devel >= 4.4.0, libmpd-devel >= 0.15.0 BuildRequires: gettext, perl(XML::Parser), desktop-file-utils Requires: mpc %description Xfmpc is a a graphical GTK+ MPD client for the Xfce desktop environment. It is focusing on low footprint and easy usage. To connect to a remote machine set the environment variables MPD_HOST and MPD_PORT as described in the mpc(1) manpage. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor "fedora" \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog IDEAS NEWS README THANKS %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Fri Jul 11 2008 Christoph Wickert - 0.0.6-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfmpc/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 19:41:33 -0000 1.1 +++ .cvsignore 14 Jul 2008 20:37:29 -0000 1.2 @@ -0,0 +1 @@ +xfmpc-0.0.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfmpc/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 19:41:33 -0000 1.1 +++ sources 14 Jul 2008 20:37:29 -0000 1.2 @@ -0,0 +1 @@ +1d2edd3cfb950d61dc1fac8229ac828b xfmpc-0.0.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 20:38:43 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Mon, 14 Jul 2008 20:38:43 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.191,1.192 Message-ID: <200807142038.m6EKch07007304@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7155 Modified Files: policy-20071130.patch Log Message: * Tue Jul 8 2008 Dan Walsh 3.3.1-78 - Allow unconfined_t to setfcap - Allow spamassassin to read razor lib files policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- policy-20071130.patch 14 Jul 2008 20:10:21 -0000 1.191 +++ policy-20071130.patch 14 Jul 2008 20:37:57 -0000 1.192 @@ -17192,7 +17192,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.3.1/policy/modules/services/kerberos.te --- nsaserefpolicy/policy/modules/services/kerberos.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-07-11 14:36:19.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-07-14 16:33:45.000000000 -0400 @@ -16,6 +16,7 @@ type kadmind_t; type kadmind_exec_t; @@ -17298,13 +17298,7 @@ allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms; allow krb5kdc_t self:tcp_socket create_stream_socket_perms; allow krb5kdc_t self:udp_socket create_socket_perms; -@@ -160,11 +182,13 @@ - allow krb5kdc_t krb5_conf_t:file read_file_perms; - dontaudit krb5kdc_t krb5_conf_t:file write; - --can_exec(krb5kdc_t, krb5kdc_exec_t) -+qcan_exec(krb5kdc_t, krb5kdc_exec_t) - +@@ -165,6 +187,8 @@ read_files_pattern(krb5kdc_t,krb5kdc_conf_t,krb5kdc_conf_t) dontaudit krb5kdc_t krb5kdc_conf_t:file write; From fedora-extras-commits at redhat.com Mon Jul 14 20:41:42 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 14 Jul 2008 20:41:42 GMT Subject: rpms/xchat/devel xchat.spec,1.93,1.94 Message-ID: <200807142041.m6EKfgar007668@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/xchat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7607/devel Modified Files: xchat.spec Log Message: %define _default_patch_fuzz 2 Index: xchat.spec =================================================================== RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- xchat.spec 14 Jul 2008 20:28:27 -0000 1.93 +++ xchat.spec 14 Jul 2008 20:40:51 -0000 1.94 @@ -1,3 +1,4 @@ +%define _default_patch_fuzz 2 %define gconf_version 2.14 Summary: A popular and easy to use graphical IRC (chat) client From fedora-extras-commits at redhat.com Mon Jul 14 20:54:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:54:54 GMT Subject: rpms/bitmap-fonts/devel bitmap-fonts.spec,1.17,1.18 Message-ID: <200807142054.m6EKss7O009060@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bitmap-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8985 Modified Files: bitmap-fonts.spec Log Message: fix license tag Index: bitmap-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/bitmap-fonts/devel/bitmap-fonts.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bitmap-fonts.spec 12 Feb 2008 12:25:01 -0000 1.17 +++ bitmap-fonts.spec 14 Jul 2008 20:54:03 -0000 1.18 @@ -1,8 +1,8 @@ Name: bitmap-fonts Version: 0.3 -Release: 5.2%{?dist} -License: distributable -Source: bitmap-fonts-%{version}.tar.bz2 +Release: 6%{?dist} +License: Lucida and MIT and Public Domain +Source0: bitmap-fonts-%{version}.tar.bz2 Source1: fixfont-3.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -76,6 +76,9 @@ %ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1 %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.3-6 +- fix license tag + * Tue Feb 12 2008 Rahul Bhalerao - 0.3-5.2 - Rebuild for gcc4.3. From fedora-extras-commits at redhat.com Mon Jul 14 20:57:13 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 14 Jul 2008 20:57:13 GMT Subject: rpms/initscripts/devel .cvsignore, 1.149, 1.150 initscripts.spec, 1.174, 1.175 sources, 1.165, 1.166 Message-ID: <200807142057.m6EKvDfJ009507@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/initscripts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9388 Modified Files: .cvsignore initscripts.spec sources Log Message: 8.79-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- .cvsignore 20 Jun 2008 15:59:53 -0000 1.149 +++ .cvsignore 14 Jul 2008 20:56:18 -0000 1.150 @@ -1 +1 @@ -initscripts-8.78.tar.bz2 +initscripts-8.79.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- initscripts.spec 20 Jun 2008 15:59:53 -0000 1.174 +++ initscripts.spec 14 Jul 2008 20:56:18 -0000 1.175 @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.78 +Version: 8.79 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -119,6 +119,7 @@ %dir /etc/sysconfig/network-scripts %config(noreplace) %verify(not md5 mtime size) /etc/adjtime %config(noreplace) /etc/sysconfig/init +%config(noreplace) /etc/sysconfig/mcheck %config(noreplace) /etc/sysconfig/netconsole %config(noreplace) /etc/sysconfig/readonly-root /etc/sysconfig/network-scripts/ifdown @@ -193,8 +194,7 @@ %config(noreplace) /etc/rc.d/rc.local %config /etc/rc.d/rc.sysinit %config(noreplace) /etc/sysctl.conf -%config /etc/profile.d/lang.sh -%config /etc/profile.d/lang.csh +%config /etc/profile.d/* /usr/sbin/sys-unconfig /sbin/setsysfont /bin/doexec @@ -238,6 +238,14 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Jul 14 2008 Bill Nottingham - 8.79-1 +- fix mcheck stuff to be installed correctly +- don't do an arping check for loopback interfaces +- console_init: don't wait () +- rc: clean up extraneous set -x noise +- remove references to static dmraid/multipath binaries (#453987) +- translation updates: lv + * Fri Jun 20 2008 Bill Nottingham - 8.78-1 - fix mounting of /dev/pts Index: sources =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/sources,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- sources 20 Jun 2008 15:59:53 -0000 1.165 +++ sources 14 Jul 2008 20:56:18 -0000 1.166 @@ -1 +1 @@ -87683beed0d191ec7b993a1b45c77390 initscripts-8.78.tar.bz2 +324451b12098721dccd956132a8f502d initscripts-8.79.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 14 20:59:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 20:59:39 GMT Subject: rpms/blktool/devel blktool.spec,1.5,1.6 Message-ID: <200807142059.m6EKxdB9009852@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/blktool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9657 Modified Files: blktool.spec Log Message: fix license tag Index: blktool.spec =================================================================== RCS file: /cvs/pkgs/rpms/blktool/devel/blktool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- blktool.spec 19 Feb 2008 06:13:16 -0000 1.5 +++ blktool.spec 14 Jul 2008 20:58:47 -0000 1.6 @@ -1,8 +1,9 @@ Summary: Block device settings tool Name: blktool Version: 4 -Release: 7%{?dist} -License: GPL +Release: 8%{?dist} +# No version specified in code. +License: GPL+ Group: Applications/System URL: http://sourceforge.net/projects/gkernel/ Source0: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz @@ -40,6 +41,9 @@ %{_mandir}/man8/blktool.* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 4-8 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 4-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 21:01:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 21:01:10 GMT Subject: rpms/bogl/devel bogl.spec,1.2,1.3 Message-ID: <200807142101.m6EL1ARB010206@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9978 Modified Files: bogl.spec Log Message: fix license tag Index: bogl.spec =================================================================== RCS file: /cvs/pkgs/rpms/bogl/devel/bogl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bogl.spec 19 Feb 2008 13:50:10 -0000 1.2 +++ bogl.spec 14 Jul 2008 21:00:19 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A terminal program for displaying Unicode on the console Name: bogl Version: 0.1.18 -Release: 14 +Release: 15 URL: http://packages.debian.org/unstable/source/bogl Source0: http://ftp.debian.org/debian/pool/main/b/bogl/bogl_0.1.18-1.5.tar.gz Source1: 14x14cjk.bdf.gz @@ -13,7 +13,7 @@ Patch5: bogl-0.1.9-2.6fbdev.patch Patch6: bogl-0.1.18-noexecstack.patch Epoch: 0 -License: GPL +License: GPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel, libpng-devel @@ -94,6 +94,9 @@ /usr/share/bogl %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0:0.1.18-15 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0:0.1.18-14 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 21:02:48 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 21:02:48 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.346,1.347 Message-ID: <200807142102.m6EL2mfg016779@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16711 Modified Files: kdelibs.spec Log Message: respin++ Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.346 retrieving revision 1.347 diff -u -r1.346 -r1.347 --- kdelibs.spec 14 Jul 2008 16:10:07 -0000 1.346 +++ kdelibs.spec 14 Jul 2008 21:01:57 -0000 1.347 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.98 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -359,7 +359,7 @@ %changelog -* Mon Jul 14 2008 Rex Dieter 4.0.98-3 +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 - respun tarball * Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 From fedora-extras-commits at redhat.com Mon Jul 14 21:08:31 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 14 Jul 2008 21:08:31 GMT Subject: rpms/gambit-c/devel gambit-c.spec,1.5,1.6 Message-ID: <200807142108.m6EL8VsA017078@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17027 Modified Files: gambit-c.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 - Put include files and libraries in standard paths Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/devel/gambit-c.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gambit-c.spec 19 Jun 2008 22:48:50 -0000 1.5 +++ gambit-c.spec 14 Jul 2008 21:07:26 -0000 1.6 @@ -12,7 +12,7 @@ Name: gambit-c Version: 4.2.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Gambit-C Scheme programming system Group: Development/Languages @@ -106,7 +106,8 @@ %build %configure --enable-single-host \ --enable-gcc-opts \ - --prefix=%{_libdir}/%{name} + --prefix=%{_libdir}/%{name} \ + --includedir=%{_include} make %{?_smp_mflags} @@ -156,6 +157,9 @@ sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi|g' chmod +x otp/gen_event.scm +# Link static libs +(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/current/lib/*.a .) + # Move docs mkdir ../termite-doc ../termite-more-docs mv CHANGELOG LICENSE README VERSION ../termite-doc @@ -185,6 +189,7 @@ %doc LGPL.txt LICENSE-2.0.txt README %exclude %{_bindir}/tsi %{_bindir}/* +%{_includedir}/*.h %exclude %{_libdir}/%{name}/*/lib/termite %{_libdir}/%{name} @@ -210,6 +215,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 +- Put include files and libraries in standard paths + * Thu Jun 19 2008 Michel Alexandre Salim - 4.2.8-5 - Package Termite as a module instead of bundling a custom Gambit-C with it From fedora-extras-commits at redhat.com Mon Jul 14 21:19:57 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 14 Jul 2008 21:19:57 GMT Subject: rpms/xchat/devel xchat.spec,1.94,1.95 Message-ID: <200807142119.m6ELJvxM017822@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/xchat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17777/devel Modified Files: xchat.spec Log Message: - don't #define GTK_DISABLE_DEPRECATED (fixes built against current GTK+) Index: xchat.spec =================================================================== RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- xchat.spec 14 Jul 2008 20:40:51 -0000 1.94 +++ xchat.spec 14 Jul 2008 21:18:55 -0000 1.95 @@ -76,6 +76,8 @@ %patch40 -p1 -b .shm-pixmaps %patch41 -p1 -b .default-utf8 +sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c + %build # Remove CVS files from source dirs so they're not installed into doc dirs. find . -name CVS -type d | xargs rm -rf @@ -164,6 +166,7 @@ %changelog * Mon Jul 14 2008 Kevin Kofler - 1:2.8.6-2 - apply xc286-smallfixes.diff from upstream +- don't #define GTK_DISABLE_DEPRECATED (fixes built against current GTK+) * Sun Jun 15 2008 Kevin Kofler - 1:2.8.6-1 - update to 2.8.6 From fedora-extras-commits at redhat.com Mon Jul 14 21:21:43 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 14 Jul 2008 21:21:43 GMT Subject: rpms/control-center/devel control-center.spec, 1.376, 1.377 notification-theme.patch, 1.3, 1.4 Message-ID: <200807142121.m6ELLhdv017977@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870 Modified Files: control-center.spec notification-theme.patch Log Message: Fix an issue with the notification theme support Index: control-center.spec =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- control-center.spec 23 Jun 2008 14:56:59 -0000 1.376 +++ control-center.spec 14 Jul 2008 21:20:48 -0000 1.377 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -31,11 +31,6 @@ Patch2: control-center-2.20.0-enable-sound-by-default.patch Patch3: control-center-2.19.3-no-gnome-common.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=497807 -Patch5: background-location.patch -# Fix some useless warnings in libslab -# http://bugzilla.gnome.org/show_bug.cgi?id=439398 -Patch6: gnome-control-center-2.19.90-no-warnings.patch Patch7: make-default.patch # minor build breakage in gtk, will be fixed in the next gtk release Patch8: gtkmarshal.patch @@ -174,10 +169,6 @@ %patch2 -p0 -b .enable-sound %patch3 -p1 -b .no-gnome-common -%patch5 -p1 -b .background-location -pushd libslab -%patch6 -p0 -b .warnings -popd %patch8 -p1 -b .gtkmarshal %patch9 -p1 -b .standard-icon @@ -364,6 +355,10 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Mon Jul 14 2008 Matthias Clasen - 2.23.4-4 +- Drop some obsolete patches +- Fix an issue with the notification-theme support (#455329) + * Mon Jun 23 2008 Ray Strode - 2.23.4-3 - Install bg capplet .policy file notification-theme.patch: Index: notification-theme.patch =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/notification-theme.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- notification-theme.patch 28 May 2008 03:47:15 -0000 1.3 +++ notification-theme.patch 14 Jul 2008 21:20:49 -0000 1.4 @@ -1,6 +1,18 @@ -diff -up gnome-control-center-2.23.2/capplets/appearance/theme-save.c.notification-theme gnome-control-center-2.23.2/capplets/appearance/theme-save.c ---- gnome-control-center-2.23.2/capplets/appearance/theme-save.c.notification-theme 2008-05-17 12:46:56.000000000 -0400 -+++ gnome-control-center-2.23.2/capplets/appearance/theme-save.c 2008-05-27 23:46:17.000000000 -0400 +diff -up gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c.notification-theme gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c +--- gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c.notification-theme 2008-07-14 17:10:31.000000000 -0400 ++++ gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c 2008-07-14 17:13:40.000000000 -0400 +@@ -249,6 +249,8 @@ theme_load_from_gconf (GConfClient *clie + if (theme->icon_theme_name == NULL) + theme->icon_theme_name = g_strdup ("gnome"); + ++ theme->notification_theme_name = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL); ++ + theme->cursor_theme_name = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL); + #ifdef HAVE_XCURSOR + theme->cursor_size = gconf_client_get_int (client, CURSOR_SIZE_KEY, NULL); +diff -up gnome-control-center-2.23.4/capplets/appearance/theme-save.c.notification-theme gnome-control-center-2.23.4/capplets/appearance/theme-save.c +--- gnome-control-center-2.23.4/capplets/appearance/theme-save.c.notification-theme 2008-05-08 08:31:29.000000000 -0400 ++++ gnome-control-center-2.23.4/capplets/appearance/theme-save.c 2008-07-14 17:03:58.000000000 -0400 @@ -234,6 +234,12 @@ write_theme_to_disk (GnomeThemeMetaInfo g_free (str); } @@ -14,9 +26,20 @@ if (save_background) { client = gconf_client_get_default (); current_background = gconf_client_get_string (client, BACKGROUND_KEY, NULL); -diff -up gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c ---- gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c.notification-theme 2008-05-17 12:46:59.000000000 -0400 -+++ gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c 2008-05-27 23:45:00.000000000 -0400 +diff -up gnome-control-center-2.23.4/capplets/appearance/theme-util.h.notification-theme gnome-control-center-2.23.4/capplets/appearance/theme-util.h +--- gnome-control-center-2.23.4/capplets/appearance/theme-util.h.notification-theme 2008-07-14 17:12:31.000000000 -0400 ++++ gnome-control-center-2.23.4/capplets/appearance/theme-util.h 2008-07-14 17:12:48.000000000 -0400 +@@ -21,6 +21,7 @@ + #define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme" + #define METACITY_THEME_KEY "/apps/metacity/general/theme" + #define ICON_THEME_KEY "/desktop/gnome/interface/icon_theme" ++#define NOTIFICATION_THEME_KEY "/apps/notification-daemon/theme" + #define COLOR_SCHEME_KEY "/desktop/gnome/interface/gtk_color_scheme" + #define LOCKDOWN_KEY "/desktop/gnome/lockdown/disable_theme_settings" + #define BACKGROUND_KEY "/desktop/gnome/background/picture_filename" +diff -up gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c +--- gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c.notification-theme 2008-05-08 08:31:40.000000000 -0400 ++++ gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c 2008-07-14 17:03:58.000000000 -0400 @@ -34,6 +34,7 @@ #define CURSOR_FONT_KEY "/desktop/gnome/peripherals/mouse/cursor_font" #define CURSOR_THEME_KEY "/desktop/gnome/peripherals/mouse/cursor_theme" @@ -51,9 +74,9 @@ /* Set the cursor theme key */ #ifdef HAVE_XCURSOR old_key = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL); -diff -up gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c.notification-theme gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c ---- gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c.notification-theme 2008-05-17 12:46:59.000000000 -0400 -+++ gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c 2008-05-27 23:45:00.000000000 -0400 +diff -up gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c.notification-theme gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c +--- gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c.notification-theme 2008-06-16 06:52:24.000000000 -0400 ++++ gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c 2008-07-14 17:03:58.000000000 -0400 @@ -25,6 +25,7 @@ #define METACITY_THEME_KEY "X-GNOME-Metatheme/MetacityTheme" #define ICON_THEME_KEY "X-GNOME-Metatheme/IconTheme" @@ -73,7 +96,7 @@ str = gnome_desktop_item_get_string (meta_theme_ditem, CURSOR_THEME_KEY); if (str != NULL) { meta_theme_info->cursor_theme_name = g_strdup (str); -@@ -1596,6 +1601,7 @@ gnome_theme_meta_info_free (GnomeThemeMe +@@ -1593,6 +1598,7 @@ gnome_theme_meta_info_free (GnomeThemeMe g_free (meta_theme_info->gtk_color_scheme); g_free (meta_theme_info->icon_theme_name); g_free (meta_theme_info->metacity_theme_name); @@ -81,7 +104,7 @@ g_free (meta_theme_info); } -@@ -1697,6 +1703,9 @@ gnome_theme_meta_info_compare (GnomeThem +@@ -1694,6 +1700,9 @@ gnome_theme_meta_info_compare (GnomeThem cmp = safe_strcmp (a->icon_theme_name, b->icon_theme_name); if (cmp != 0) return cmp; @@ -91,9 +114,9 @@ cmp = safe_strcmp (a->sound_theme_name, b->sound_theme_name); if (cmp != 0) return cmp; -diff -up gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h.notification-theme gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h ---- gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h.notification-theme 2008-05-17 12:46:59.000000000 -0400 -+++ gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h 2008-05-27 23:45:00.000000000 -0400 +diff -up gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h.notification-theme gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h +--- gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h.notification-theme 2008-05-08 08:31:40.000000000 -0400 ++++ gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h 2008-07-14 17:03:58.000000000 -0400 @@ -100,6 +100,7 @@ struct _GnomeThemeMetaInfo gchar *gtk_color_scheme; gchar *metacity_theme_name; From fedora-extras-commits at redhat.com Mon Jul 14 21:22:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 21:22:03 GMT Subject: rpms/bonnie++/devel .cvsignore, 1.2, 1.3 bonnie++.spec, 1.17, 1.18 sources, 1.2, 1.3 Message-ID: <200807142122.m6ELM3ex018026@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bonnie++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17880 Modified Files: .cvsignore bonnie++.spec sources Log Message: update to 1.03c, fix license tag Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bonnie++/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:06:37 -0000 1.2 +++ .cvsignore 14 Jul 2008 21:20:59 -0000 1.3 @@ -1 +1 @@ -bonnie++-1.03a.tgz +bonnie++-1.03c.tgz Index: bonnie++.spec =================================================================== RCS file: /cvs/pkgs/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bonnie++.spec 11 Feb 2008 19:31:03 -0000 1.17 +++ bonnie++.spec 14 Jul 2008 21:20:59 -0000 1.18 @@ -1,16 +1,14 @@ Name: bonnie++ -Version: 1.03a -Release: 9%{?dist} +Version: 1.03c +Release: 1%{?dist} Summary: Filesystem and disk benchmark & burn-in suite Group: Applications/System -License: GPL +License: GPLv2 URL: http://www.coker.com.au/bonnie++/ -Source0: http://www.coker.com.au/bonnie++/bonnie++-1.03a.tgz +Source0: http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) - -Patch0: bonnie++-1.03a-mandir.patch Patch1: bonnie++-1.03a-gcc43.patch %description @@ -24,8 +22,7 @@ test servers. %prep -%setup -q -n bonnie++-1.03a -%patch0 -p0 +%setup -q -n bonnie++-1.03c %patch1 -p1 sed -i 's|${INSTALL}\s\+-s\b|${INSTALL}|' Makefile @@ -57,6 +54,10 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 1.03c-1 +- update to 1.03c +- fix license tag + * Fri Feb 08 2008 Warren Togami 1.03a-9 - rebuild for gcc-4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bonnie++/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:06:37 -0000 1.2 +++ sources 14 Jul 2008 21:20:59 -0000 1.3 @@ -1 +1 @@ -00b1eee7f98b68fa762c4efb3b34caa1 bonnie++-1.03a.tgz +77a1ba78f37bdd7f024b67e1e36ad151 bonnie++-1.03c.tgz From fedora-extras-commits at redhat.com Mon Jul 14 21:24:02 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 14 Jul 2008 21:24:02 GMT Subject: rpms/xchat/devel xchat.spec,1.95,1.96 Message-ID: <200807142124.m6ELO2Cp018165@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/xchat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18106/devel Modified Files: xchat.spec Log Message: Fix changelog typo. Index: xchat.spec =================================================================== RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- xchat.spec 14 Jul 2008 21:18:55 -0000 1.95 +++ xchat.spec 14 Jul 2008 21:23:13 -0000 1.96 @@ -166,7 +166,7 @@ %changelog * Mon Jul 14 2008 Kevin Kofler - 1:2.8.6-2 - apply xc286-smallfixes.diff from upstream -- don't #define GTK_DISABLE_DEPRECATED (fixes built against current GTK+) +- don't #define GTK_DISABLE_DEPRECATED (fixes build against current GTK+) * Sun Jun 15 2008 Kevin Kofler - 1:2.8.6-1 - update to 2.8.6 From fedora-extras-commits at redhat.com Mon Jul 14 21:24:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 21:24:03 GMT Subject: rpms/booty/devel booty.spec,1.79,1.80 Message-ID: <200807142124.m6ELO3Ud018168@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/booty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18107 Modified Files: booty.spec Log Message: fix license tag Index: booty.spec =================================================================== RCS file: /cvs/pkgs/rpms/booty/devel/booty.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- booty.spec 8 Apr 2008 20:26:43 -0000 1.79 +++ booty.spec 14 Jul 2008 21:23:12 -0000 1.80 @@ -1,8 +1,9 @@ Summary: simple python bootloader config lib Name: booty Version: 0.104 -Release: 1%{?dist} -License: LGPL +Release: 2%{?dist} +# No version is specified. +License: LGPLv2+ Source0: %{name}-%{version}.tar.bz2 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -35,6 +36,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.104-2 +- fix license tag + * Tue Apr 8 2008 Jeremy Katz - 0.104-1 - Pegasos fix (dwmw2) - Fix printing of boot message on ppc (clumens, #235005) From fedora-extras-commits at redhat.com Mon Jul 14 21:26:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 21:26:53 GMT Subject: rpms/bottlerocket/devel bottlerocket.spec,1.2,1.3 Message-ID: <200807142126.m6ELQrG5018530@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bottlerocket/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18457 Modified Files: bottlerocket.spec Log Message: fix license tag Index: bottlerocket.spec =================================================================== RCS file: /cvs/pkgs/rpms/bottlerocket/devel/bottlerocket.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bottlerocket.spec 20 Feb 2008 00:09:09 -0000 1.2 +++ bottlerocket.spec 14 Jul 2008 21:26:01 -0000 1.3 @@ -1,10 +1,11 @@ Name: bottlerocket Version: 0.04c -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities to use the FireCracker X10 kit Group: Applications/System -License: LGPL +# No version is specified. +License: LGPLv2+ URL: http://www.linuxha.com/bottlerocket Source0: http://www.linuxha.com/bottlerocket/%{name}-%{version}.tar.gz Patch0: bottlerocket-makefile.patch @@ -41,6 +42,9 @@ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.04c-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.04c-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 21:29:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 21:29:26 GMT Subject: rpms/brandy/devel brandy.spec,1.3,1.4 Message-ID: <200807142129.m6ELTQnf018889@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/brandy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18825 Modified Files: brandy.spec Log Message: fix license tag Index: brandy.spec =================================================================== RCS file: /cvs/pkgs/rpms/brandy/devel/brandy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- brandy.spec 19 Feb 2008 18:47:06 -0000 1.3 +++ brandy.spec 14 Jul 2008 21:28:38 -0000 1.4 @@ -1,8 +1,8 @@ Summary: Brandy - A BBC BASIC interpreter for Linux Name: brandy Version: 1.0.19 -Release: 5%{?dist} -License: GPL +Release: 6%{?dist} +License: GPLv2+ Group: Development/Tools Source: http://jaguar.orpheusweb.co.uk/%{name}_119.tgz URL: http://jaguar.orpheusweb.co.uk/branpage.html @@ -46,6 +46,9 @@ %{_datadir}/%{name}-%{version}/ %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0.19-6 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.19-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 14 21:30:36 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 14 Jul 2008 21:30:36 GMT Subject: rpms/gambit-c/devel gambit-c.spec,1.6,1.7 Message-ID: <200807142130.m6ELUa1p019060@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18937 Modified Files: gambit-c.spec Log Message: Fix typo: %%{_includedir} not %%{_include} Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/devel/gambit-c.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gambit-c.spec 14 Jul 2008 21:07:26 -0000 1.6 +++ gambit-c.spec 14 Jul 2008 21:29:50 -0000 1.7 @@ -107,7 +107,7 @@ %configure --enable-single-host \ --enable-gcc-opts \ --prefix=%{_libdir}/%{name} \ - --includedir=%{_include} + --includedir=%{_includedir} make %{?_smp_mflags} From fedora-extras-commits at redhat.com Mon Jul 14 21:31:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 21:31:08 GMT Subject: rpms/bugzilla/devel bugzilla.spec,1.19,1.20 Message-ID: <200807142131.m6ELV8dj019164@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/bugzilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19013 Modified Files: bugzilla.spec Log Message: fix license tag Index: bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bugzilla.spec 9 May 2008 13:49:51 -0000 1.19 +++ bugzilla.spec 14 Jul 2008 21:30:14 -0000 1.20 @@ -6,8 +6,8 @@ Name: bugzilla Version: 3.0.4 Group: Applications/Publishing -Release: 1%{?dist} -License: MPL +Release: 2%{?dist} +License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla @@ -134,6 +134,9 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 3.0.4-2 +- fix license tag + * Fri May 9 2008 John Berninger - 3.0.4-1 - Update to upstream 3.0.4 to fix multiple security vulns - Change perms on /etc/bugzilla for bz 427981 From fedora-extras-commits at redhat.com Mon Jul 14 21:32:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 14 Jul 2008 21:32:26 GMT Subject: rpms/buoh/devel buoh.spec,1.24,1.25 Message-ID: <200807142132.m6ELWQGn019318@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/buoh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19257 Modified Files: buoh.spec Log Message: fix license tag Index: buoh.spec =================================================================== RCS file: /cvs/pkgs/rpms/buoh/devel/buoh.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- buoh.spec 24 Jun 2008 13:42:39 -0000 1.24 +++ buoh.spec 14 Jul 2008 21:31:31 -0000 1.25 @@ -1,8 +1,8 @@ Name: buoh -License: GPL +License: GPLv2+ Group: Applications/Internet Version: 0.8.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Online comics reader URL: http://buoh.steve-o.org/ Source: http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2 @@ -81,6 +81,9 @@ %{_datadir}/icons/hicolor/16x16/apps/buoh.png %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.8.2-6 +- fix license tag + * Tue Jun 24 2008 Tomas Mraz - 0.8.2-5 - rebuild with new gnutls From fedora-extras-commits at redhat.com Mon Jul 14 21:41:18 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 14 Jul 2008 21:41:18 GMT Subject: rpms/eclipse/devel ecf-filetransfer-build.properties, NONE, 1.1 ecf-filetransfer-feature.xml, NONE, 1.1 eclipse-compilelibs.patch, NONE, 1.1 eclipse-config.ini.director, NONE, 1.1 eclipse-dontpackicu4jsource.patch, NONE, 1.1 eclipse-ecf-qualifier.patch, NONE, 1.1 eclipse-nojarsignatures.patch, NONE, 1.1 eclipse-pdeapicasting-ui.patch, NONE, 1.1 eclipse-pdeapicasting.patch, NONE, 1.1 fetch-ecf.sh, NONE, 1.1 .cvsignore, 1.46, 1.47 eclipse-memorypermsizeandjvmcrash.patch, 1.1, 1.2 eclipse.in, 1.4, 1.5 eclipse.spec, 1.530, 1.531 sources, 1.59, 1.60 Message-ID: <200807142141.m6ELfIQg020681@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20568 Modified Files: .cvsignore eclipse-memorypermsizeandjvmcrash.patch eclipse.in eclipse.spec sources Added Files: ecf-filetransfer-build.properties ecf-filetransfer-feature.xml eclipse-compilelibs.patch eclipse-config.ini.director eclipse-dontpackicu4jsource.patch eclipse-ecf-qualifier.patch eclipse-nojarsignatures.patch eclipse-pdeapicasting-ui.patch eclipse-pdeapicasting.patch fetch-ecf.sh Log Message: * Mon Jul 14 2008 Andrew Overholt 3.4.0-1 - 3.4 - Remove gcj compilation - Update versions of dependencies - Rename libswt3-gtk2 to eclipse-swt - Move "Provides: eclipse" to PDE from JDT - Remove unnecessary old Obsoletes/Provides - Remove tomcat stuff since it's no longer used - Move stuff from %{_datadir}/eclipse to %{_libdir}/eclipse - Add BRs/Rs on objectweb-asm and sat4j - Build ECF filetransfer stuff as part of this SRPM until we have a separate eclipse-ecf package (which will require this version of the SDK) --- NEW FILE ecf-filetransfer-build.properties --- bin.includes = feature.xml --- NEW FILE ecf-filetransfer-feature.xml --- [Enter Feature Description here.] [Enter Copyright Description here.] [Enter License Description here.] eclipse-compilelibs.patch: --- NEW FILE eclipse-compilelibs.patch --- ### Eclipse Workspace Patch 1.0 #P org.eclipse.releng.eclipsebuilder Index: eclipse/buildConfigs/sdk/srcBuild/build.xml =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v retrieving revision 1.21 diff -u -r1.21 build.xml --- eclipse/buildConfigs/sdk/srcBuild/build.xml 27 May 2008 19:41:03 -0000 1.21 +++ eclipse/buildConfigs/sdk/srcBuild/build.xml 26 Jun 2008 17:58:02 -0000 @@ -1,7 +1,7 @@ - + @@ -71,6 +71,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -174,7 +205,7 @@ - + --- NEW FILE eclipse-config.ini.director --- # Eclipse runtime configuration file # This file contains a number of key/value pairs that are merged into the # System properties on system startup. The values control the way the # runtime is structured and runs. # Note: Only platform:/base/ and file: URLs are supported. In general the # URLs given may include a version number (e.g., .../location_1.2.3). # If a version is not specified, the system binds # to the location which matches exactly or to the versioned location with the # latest version number. If a version number is given then only exact matches # are considered. # The URL for the runtime entry point. The default value is # platform:/base/plugins/org.eclipse.osgi #osgi.framework=platform:/base/plugins/org.eclipse.osgi # The classpath for the framework found at the osgi.framework location. This # comma-separated list contains either URLs or simple element names. Simple # names are assumed to be relative to the framework's install directory. # Typically this value need not be set as it is initialized by the framework itself. # Version match searching is not done for URLs listed here. #osgi.frameworkClassPath = # The comma-separated list of locations to search for the splash screen file (splash.bmp). # For each list element a subdirectory structure based on the pattern nl/ is searched. # The system binds to the first matching file. There is no default value. #osgi.splashPath= # The location of the splash screen file. If this value is set at system startup it is used # in favour of the osgi.splashPath searching outlined above. If the value is not set # the searching is done and this key is bound to the result of the search. #osgi.splashLocation = # The comma-separated list of bundles which are automatically installed and optionally started # once the system is up and running. Each entry if of the form # [@ [] [":start"]] # If the startlevel is omitted then the framework will use the default start level for the bundle. # If the "start" tag is added then the bundle will be marked as started after being installed. # Simple bundle locations are interepreted as relative to the framework's parent directory. # The startlevel indicates the OSGi start level at which the bundle should run. osgi.bundles=\ org.eclipse.core.jobs,\ org.eclipse.core.net,\ org.eclipse.core.runtime,\ org.eclipse.core.runtime.compatibility.auth,\ org.eclipse.ecf,\ org.eclipse.ecf.filetransfer,\ org.eclipse.ecf.identity,\ org.eclipse.ecf.provider.filetransfer,\ org.eclipse.equinox.app at start,\ org.eclipse.equinox.common,\ org.eclipse.equinox.frameworkadmin,\ org.eclipse.equinox.frameworkadmin.equinox at start,\ org.eclipse.equinox.preferences,\ org.eclipse.equinox.p2.artifact.repository,\ org.eclipse.equinox.p2.console,\ org.eclipse.equinox.p2.core,\ org.eclipse.equinox.p2.director,\ org.eclipse.equinox.p2.director.app,\ org.eclipse.equinox.p2.engine,\ org.eclipse.equinox.p2.exemplarysetup at start,\ org.eclipse.equinox.p2.garbagecollector,\ org.eclipse.equinox.p2.metadata,\ org.eclipse.equinox.p2.metadata.repository,\ org.eclipse.equinox.p2.touchpoint.eclipse,\ org.eclipse.equinox.p2.touchpoint.natives,\ org.eclipse.equinox.preferences,\ org.eclipse.equinox.registry,\ org.eclipse.equinox.simpleconfigurator,\ org.eclipse.equinox.simpleconfigurator.manipulator at start,\ org.eclipse.osgi.services,\ org.sat4j.core,\ org.sat4j.pb org.eclipse.update.reconcile=false # The product to run. A given Eclipse configuration may contain many products. # The product identified will supply the branding (window icons, title bar text) etc # as well as define the default application to run. #eclipse.product= # The application to run. The value specified here is the id of the application extension # the runtime will find, instantiate and execute once the system is up. Note that typically # the identified eclipse.product defines the default application to run. #eclipse.application= # The build identifier eclipse.buildId=@build@ # End of file marker - must be here eof=eof eclipse-dontpackicu4jsource.patch: --- NEW FILE eclipse-dontpackicu4jsource.patch --- diff -up features/org.eclipse.help.source/build.properties.dontpackicu4jsource features/org.eclipse.help.source/build.properties --- features/org.eclipse.help.source/build.properties.dontpackicu4jsource 2008-07-08 11:17:59.000000000 -0400 +++ features/org.eclipse.help.source/build.properties 2008-07-08 11:18:35.000000000 -0400 @@ -15,5 +15,5 @@ feature.xml,\ feature.properties,\ license.html -generate.feature at org.eclipse.rcp.source = org.eclipse.rcp,plugin at com.ibm.icu.source;version=3.8.1.qualifier;unpack="false" +generate.feature at org.eclipse.rcp.source = org.eclipse.rcp,plugin at com.ibm.icu.source;version=3.8.1.qualifier diff -up features/org.eclipse.help/sourceTemplateFeature/build.properties.dontpackicu4jsource features/org.eclipse.help/sourceTemplateFeature/build.properties --- features/org.eclipse.help/sourceTemplateFeature/build.properties.dontpackicu4jsource 2008-07-08 11:18:12.000000000 -0400 +++ features/org.eclipse.help/sourceTemplateFeature/build.properties 2008-07-08 11:18:32.000000000 -0400 @@ -15,5 +15,5 @@ feature.xml,\ feature.properties,\ license.html -generate.feature at org.eclipse.rcp.source = org.eclipse.rcp,plugin at com.ibm.icu.source;version=3.8.1.qualifier;unpack="false" +generate.feature at org.eclipse.rcp.source = org.eclipse.rcp,plugin at com.ibm.icu.source;version=3.8.1.qualifier eclipse-ecf-qualifier.patch: --- NEW FILE eclipse-ecf-qualifier.patch --- diff -up plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF --- plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:54:07.000000000 -0400 +++ plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.identity;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.v20080611-1715 Bundle-Activator: org.eclipse.ecf.internal.core.identity.Activator Bundle-Localization: plugin Bundle-Vendor: %plugin.provider diff -up plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF --- plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400 +++ plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.filetransfer;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.v20080611-1715 Bundle-Activator: org.eclipse.ecf.internal.filetransfer.Activator Bundle-Vendor: %plugin.provider Eclipse-LazyStart: true diff -up plugins/org.eclipse.ecf/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf/META-INF/MANIFEST.MF --- plugins/org.eclipse.ecf/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:00.000000000 -0400 +++ plugins/org.eclipse.ecf/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.v20080611-1715 Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff -up plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF --- plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400 +++ plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.v20080611-1715 Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff -up plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF --- plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:00.000000000 -0400 +++ plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.ssl -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.0.v20080611-1715 Bundle-Vendor: %plugin.provider Fragment-Host: org.eclipse.ecf.provider.filetransfer;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff -up plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF --- plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400 +++ plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.ssl -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.0.v20080611-1715 Fragment-Host: org.eclipse.ecf;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.4 Import-Package: org.eclipse.osgi.service.security;version="1.0.0", eclipse-nojarsignatures.patch: --- NEW FILE eclipse-nojarsignatures.patch --- diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignatures plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF --- plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignatures 2008-07-08 17:20:06.000000000 -0400 +++ plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF 2008-07-08 17:20:19.000000000 -0400 @@ -57,178 +57,3 @@ Export-Package: images,org.apache.tools. .ant.util.optional,org.apache.tools.ant.util.regexp,org.apache.tools. bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip Require-Bundle: org.eclipse.osgi - -Name: lib/ant-apache-bsf.jar -SHA1-Digest: cLbTh5sinbLWGWUDCS84n0i2a0E= - -Name: lib/ant-trax.jar -SHA1-Digest: 3HKcsIRJKPlrfuIaJUDOtGEndrg= - -Name: etc/maudit-frames.xsl -SHA1-Digest: BIZGVBGe+t+oL7NBTtnF6SSR2UI= - -Name: bin/lcp.bat -SHA1-Digest: tVZ9b7fPb0VxK6VtxdbHL/Snslc= - -Name: bin/runrc.cmd -SHA1-Digest: tEBZS6nXZrF77Q5oOO0NyffnU28= - -Name: etc/jdepend.xsl -SHA1-Digest: OMznHreSkSUr+5YOtNAlZZLjZWQ= - -Name: bin/antenv.cmd -SHA1-Digest: 2NIxw+ojKZeK7CNeLtrR7kFNG2E= - -Name: about_files/LICENSE.sax.txt -SHA1-Digest: uLnQn2qwT77aJ6MThuLeWz1I5ek= - -Name: META-INF/eclipse.inf -SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y= - -Name: lib/ant-launcher.jar -SHA1-Digest: GPILSOan10oQR0XsnIUpAkN3hW8= - -Name: lib/ant-apache-bcel.jar -SHA1-Digest: 249vQWKFKUpoY2wsy/gVYRVQA9Y= - -Name: lib/ant-antlr.jar -SHA1-Digest: sUjnJ2scpExnqFt7w3wTrxPBzMw= - -Name: etc/changelog.xsl -SHA1-Digest: qhlQEgDDZI8YGnD/Lo/OLLdpwE4= - -Name: etc/jdepend-frames.xsl -SHA1-Digest: ziSyDJrI6CYzulVP7xbFuMAk62w= - -Name: lib/ant-starteam.jar -SHA1-Digest: /E3ouEPkRPL3WBvefzGRsck5lmc= - -Name: about.html -SHA1-Digest: N0elfKP7uYuYLATOh5XaE1P3nXI= - -Name: lib/ant-jai.jar -SHA1-Digest: MamtbKiOfCYyaKLBsNuL7HdasTA= - -Name: lib/ant-junit.jar -SHA1-Digest: vKM3lSYbY8hlxKv/eh48EzoMr4s= - -Name: lib/ant-swing.jar -SHA1-Digest: h89jil3YSxk/sLy8HZubQDaqZZA= - -Name: lib/ant-apache-log4j.jar -SHA1-Digest: yo4BWxFzGJvFGlwAa9+lqooG+iE= - -Name: bin/ant -SHA1-Digest: 1hZ7I8ryxuQA8ffu95k409JSpxM= - -Name: bin/ant.cmd -SHA1-Digest: YDWS/zHHaPn0kEZm/Az4+vJLzKI= - -Name: lib/ant-commons-net.jar -SHA1-Digest: cW0crWNYgqgbNuezMwOUzY9ysfY= - -Name: lib/ant-jsch.jar -SHA1-Digest: 2cWHrQfYXqJ6Ox5ESC+vnLUmKTQ= - -Name: lib/ant-netrexx.jar -SHA1-Digest: L+voULB0JY9SHKXVQJ1LDHn7bUI= - -Name: etc/checkstyle/checkstyle-text.xsl -SHA1-Digest: v7HDzjT8VIMoo9nbczMpQ4R89OA= - -Name: lib/ant-jdepend.jar -SHA1-Digest: l8MtENBefa2/Xp24qA+J9a93YIM= - -Name: lib/ant-stylebook.jar -SHA1-Digest: uQZ41IjyE1tK965YSxsqP+jqK0c= - -Name: about_files/NOTICE -SHA1-Digest: Mu3gQHJl963VZJ+BCE906ZAhmXY= - -Name: etc/coverage-frames.xsl -SHA1-Digest: CuWmV380G7/H3FRwPp+feAg9d7E= - -Name: lib/ant-nodeps.jar -SHA1-Digest: o5euDnSx3TKUufdhqOcdd85RM20= - -Name: bin/complete-ant-cmd.pl -SHA1-Digest: u8SyqqLh5SyqEPe8brM/glCglQo= - -Name: about_files/LICENSE.dom.html -SHA1-Digest: 9F8cZaCgriCte0T6Mt5hAFumadk= - -Name: etc/tagdiff.xsl -SHA1-Digest: QvXTkg9jgfgCMbm/Idqk/uNf4dI= - -Name: etc/junit-frames.xsl -SHA1-Digest: wSBQFHcXT1XjHPWfk41j8XH1qeQ= - -Name: lib/ant-weblogic.jar -SHA1-Digest: J6F+0H7fONfNWUCwSqb+7IK3Rkc= - -Name: lib/ant-jmf.jar -SHA1-Digest: NGPXYqQRsREHJe8qsEyPAg2RUAM= - -Name: bin/ant.bat -SHA1-Digest: p0LkZEyD/pMRF8Uo9Hxte58B9dI= - -Name: plugin.properties -SHA1-Digest: iQO3hlGZf45g3Y7ajtCmCUjMq30= - -Name: etc/checkstyle/checkstyle-xdoc.xsl -SHA1-Digest: Zkz4ykfgxadN8RCiCtVrI46bzu4= - -Name: lib/ant.jar -SHA1-Digest: AyMypsce7YssTu3t0qKPuArssCw= - -Name: lib/ant-javamail.jar -SHA1-Digest: EYOAc6WEA+Pj8MPPoa1W8neE1DQ= - -Name: lib/ant-apache-resolver.jar -SHA1-Digest: /bhh3PxZKpcm4EmiQRsOw81aHlI= - -Name: bin/antRun -SHA1-Digest: HXlDrtLiLYQs4XkPbksH6PzmiQ4= - -Name: bin/envset.cmd -SHA1-Digest: nJW9gBVUQczlMJmAog4nH2yNp98= - -Name: bin/antRun.pl -SHA1-Digest: 1ZjEo56V249cfnPSBpzjYNRTLys= - -Name: etc/mmetrics-frames.xsl -SHA1-Digest: +ueQIFM6aBe6Ifc8PrZ7F4Migyk= - -Name: etc/checkstyle/checkstyle-frames.xsl -SHA1-Digest: aeITXtUk9Yia5TTVXOd6qfMmPTM= - -Name: lib/ant-apache-oro.jar -SHA1-Digest: WJ++owyMbcVbY3kBJgq2oNNGsCU= - -Name: bin/antRun.bat -SHA1-Digest: d765puLLhb82dE5NC5YNCn6DpeA= - -Name: etc/junit-noframes.xsl -SHA1-Digest: 8O4YCYnt5a6gbrMsIigvW/4GV4g= - -Name: bin/runant.pl -SHA1-Digest: RPsWXDGHzbNBGD/i6pTGtQFJ6oY= - -Name: about_files/asl-v20.txt -SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA= - -Name: etc/junit-frames-xalan1.xsl -SHA1-Digest: blbb8jE6V2zTzRGjvVaXL5fPicM= - -Name: etc/log.xsl -SHA1-Digest: ulVeGl+WSkbjGbHF7LGA8Csuh/0= - -Name: lib/ant-commons-logging.jar -SHA1-Digest: Vvp4W/tusjWem5gN4Y1cMVAJGck= - -Name: lib/ant-apache-regexp.jar -SHA1-Digest: HQscc3xTxU2HKsoh8YlyUPpsr/Q= - -Name: bin/runant.py -SHA1-Digest: ptbC0mx7ZARrg/FG64aqqikvS2A= - diff -up plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignatures plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF --- plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignatures 2008-07-08 17:19:51.000000000 -0400 +++ plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF 2008-07-08 17:20:22.000000000 -0400 @@ -11,19 +11,3 @@ Export-Package: junit.awtui;version="3.8 3.8.2",junit.framework;version="3.8.2",junit.runner;version="3.8.2",j unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni t.textui;version="3.8.2" - -Name: junit.jar -SHA1-Digest: puYpCZFqVfqSN4lDihSuym3cJ00= - -Name: plugin.properties -SHA1-Digest: mL9yvXBmAAJi7G1tls7akuyPG+A= - -Name: about.html -SHA1-Digest: UFe6k4Ad9XpZmuWF46WW3vk9dVA= - -Name: META-INF/eclipse.inf -SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw= - -Name: about_files/cpl-v10.html -SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM= - eclipse-pdeapicasting-ui.patch: --- NEW FILE eclipse-pdeapicasting-ui.patch --- ### Eclipse Workspace Patch 1.0 #P org.eclipse.pde.api.tools.ui Index: src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java,v retrieving revision 1.25 diff -u -r1.25 ApiProfileWizardPage.java --- src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java 22 May 2008 15:36:51 -0000 1.25 +++ src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java 26 Jun 2008 14:12:52 -0000 @@ -309,7 +309,7 @@ } Collections.sort(items, new Comparator() { public int compare(Object o1, Object o2) { - return ((String)o1).compareTo(o2); + return ((String)o1).compareTo((String) o2); } }); eclipse-pdeapicasting.patch: --- NEW FILE eclipse-pdeapicasting.patch --- ### Eclipse Workspace Patch 1.0 #P org.eclipse.pde.api.tools Index: src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java,v retrieving revision 1.3 diff -u -r1.3 DeltaReportConversionTask.java --- src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java 14 May 2008 15:02:51 -0000 1.3 +++ src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java 26 Jun 2008 13:56:12 -0000 @@ -288,7 +288,7 @@ public int compare(Object o1, Object o2) { Map.Entry entry1 = (Map.Entry) o1; Map.Entry entry2 = (Map.Entry) o2; - return ((String) entry1.getKey()).compareTo(entry2.getKey()); + return ((String) entry1.getKey()).compareTo((String) entry2.getKey()); } }); for (Iterator iterator = allEntries.iterator(); iterator.hasNext(); ) { Index: src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java,v retrieving revision 1.8 diff -u -r1.8 APIToolsVerificationTask.java --- src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java 26 May 2008 19:59:29 -0000 1.8 +++ src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java 26 Jun 2008 13:56:12 -0000 @@ -656,7 +656,7 @@ public int compare(Object o1, Object o2) { Map.Entry entry1 = (Map.Entry) o1; Map.Entry entry2 = (Map.Entry) o2; - return ((String) entry1.getKey()).compareTo(entry2.getKey()); + return ((String) entry1.getKey()).compareTo((String) entry2.getKey()); } }); Summary[] summaries = new Summary[size]; --- NEW FILE fetch-ecf.sh --- #!/bin/sh for f in \ org.eclipse.ecf \ org.eclipse.ecf.core.identity \ org.eclipse.ecf.filetransfer \ org.eclipse.ecf.provider.filetransfer \ org.eclipse.ecf.provider.filetransfer.ssl \ org.eclipse.ecf.ssl \ ; do cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology \ export -r v20080611-1715 org.eclipse.ecf/plugins/$f; done tar cjf ecf-filetransfer-v20080611-1715.tar.bz2 org.eclipse.ecf Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 3 Apr 2008 15:48:11 -0000 1.46 +++ .cvsignore 14 Jul 2008 21:40:29 -0000 1.47 @@ -1,4 +1,5 @@ eclipse-fileinitializerapp.tar.bz2 org.fedoraproject.ide.feature-1.0.0.zip -eclipse-sourceBuild-srcIncluded-3.3.2.zip -org.fedoraproject.ide.platform-3.3.2.zip +ecf-filetransfer-v20080611-1715.tar.bz2 +eclipse-sourceBuild-srcIncluded-3.4.zip +org.fedoraproject.ide.platform-3.4.0.zip eclipse-memorypermsizeandjvmcrash.patch: Index: eclipse-memorypermsizeandjvmcrash.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-memorypermsizeandjvmcrash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-memorypermsizeandjvmcrash.patch 25 Apr 2008 16:55:36 -0000 1.1 +++ eclipse-memorypermsizeandjvmcrash.patch 14 Jul 2008 21:40:30 -0000 1.2 @@ -1,11 +1,17 @@ -diff -ur features/org.eclipse.platform/gtk/eclipse.ini patched/features/org.eclipse.platform/gtk/eclipse.ini ---- features/org.eclipse.platform/gtk/eclipse.ini 2008-04-25 12:25:26.000000000 -0400 -+++ features/org.eclipse.platform/gtk/eclipse.ini 2008-04-25 12:26:04.000000000 -0400 -@@ -2,4 +2,6 @@ - org.eclipse.platform +### Eclipse Workspace Patch 1.0 +#P org.eclipse.platform-feature +Index: gtk/eclipse.ini +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.platform-feature/gtk/eclipse.ini,v +retrieving revision 1.3 +diff -u -r1.3 eclipse.ini +--- gtk/eclipse.ini 3 Jun 2008 20:55:37 -0000 1.3 ++++ gtk/eclipse.ini 8 Jul 2008 19:51:57 -0000 +@@ -4,4 +4,5 @@ + 256m -vmargs -Xms40m --Xmx256m +-Xmx512m +-XX:MaxPermSize=128m -+-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith +\ No newline at end of file Index: eclipse.in =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eclipse.in 27 Jun 2007 15:56:57 -0000 1.4 +++ eclipse.in 14 Jul 2008 21:40:30 -0000 1.5 @@ -1,6 +1,4 @@ #!/bin/sh exec @LIBDIR@/eclipse/eclipse \ - --launcher.library @LIBDIR@/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux. at ECLIPSELIBSUFFIX@ \ - -startup /usr/share/eclipse/startup.jar \ ${1+"$@"} View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.530 -r 1.531 eclipse.spec Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.530 retrieving revision 1.531 diff -u -r1.530 -r1.531 --- eclipse.spec 20 Jun 2008 21:54:45 -0000 1.530 +++ eclipse.spec 14 Jul 2008 21:40:30 -0000 1.531 @@ -1,14 +1,14 @@ +# TODO: +# - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 +# - look at startup script and launcher patches +# - update stuff for building on secondary arches Epoch: 1 -%define gcj_support 1 -%define tomcatsharedir %{_datadir}/tomcat5 -%define tomcatlibdir %{_var}/lib/tomcat5 %define eclipse_major 3 -%define eclipse_minor 3 +%define eclipse_minor 4 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%define eclipse_micro 2 -%define libname libswt3 -%define swtver 3.3.2.v3349 +%define eclipse_micro 0 +%define swtver 3.4.0.v3448f # All arches line up between Eclipse and Linux kernel names except i386 -> x86 %ifarch %{ix86} @@ -20,17 +20,17 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 13%{?dist} +Release: 1%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-sourceBuild-srcIncluded-3.3.2.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-sourceBuild-srcIncluded-3.4.zip Source2: %{name}.desktop -Source3: eclipse.in +#Source3: eclipse.in # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \ -# -r fedoraeclipse-3_3_2 branding/org.fedoraproject.ide.platform +# -r fedoraeclipse-3_4_0 branding/org.fedoraproject.ide.platform # cd branding -# zip -r org.fedoraproject.ide.platform-3.3.2.zip \ +# zip -r org.fedoraproject.ide.platform-3.4.0.zip \ # org.fedoraproject.ide.platform Source4: org.fedoraproject.ide.platform-%{version}.zip # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \ @@ -51,9 +51,19 @@ Source20: %{name}-fileinitializerapp.tar.bz2 # Script to wrap PDE Build calls for bundle builds Source21: %{name}-pdebuild.sh +# config.ini to run the director for provisioning the installation +Source22: %{name}-config.ini.director +Source24: fetch-ecf.sh +# This was fetched using the above script. +# We will eventually have an eclipse-ecf package but since the ECF +# filetransfer bits that are part of the SDK actually require the SDK >= +# 3.4 to build, I'm going to build them here and have them be owned by +# the SDK packages for now. -- overholt, 2008-07-07 +Source25: ecf-filetransfer-v20080611-1715.tar.bz2 +# Create a simple feature for building ECF's filetransfer plugins +Source26: ecf-filetransfer-feature.xml +Source27: ecf-filetransfer-build.properties -# This needs to go upstream -Patch3: %{name}-libupdatebuild2.patch # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 Patch4: %{name}-swttools.patch @@ -62,29 +72,23 @@ # 2. ensures that the OSGi configuration directory # (which contains the JNI .sos) is in %{_libdir} # We should investigate whether or not this can go upstream -Patch12: %{name}-launcher-set-install-dir-and-shared-config.patch +#Patch12: %{name}-launcher-set-install-dir-and-shared-config.patch # Always generate debug info when building RPMs (Andrew Haley) # This needs to be investigated for getEnv changes -Patch14: %{name}-ecj-rpmdebuginfo.patch +# FIXME: update this patch to avoid fuzz +#Patch14: %{name}-ecj-rpmdebuginfo.patch # generic releng plugins that can be used to build plugins # see this thread for details: # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html Patch15: %{name}-pde.build-add-package-build.patch -# This tomcat stuff will change when they move to the equinox jetty provider -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 -Patch6: %{name}-tomcat55.patch -Patch7: %{name}-tomcat55-build.patch # Use ecj for gcj -Patch17: %{name}-ecj-gcj.patch -Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch -Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch -Patch30: %{name}-addfragmentsforotherplatforms.patch +#Patch17: %{name}-ecj-gcj.patch +#Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch +#Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch +#Patch30: %{name}-addfragmentsforotherplatforms.patch #FIXME: file a bug upstream Patch26: %{name}-launcher-fix-java-home.patch -# On a 1.7 VM, generate 1.6-level bytecode -# https://bugzilla.redhat.com/show_bug.cgi?id=288991 -Patch27: %{name}-17vmgenerate16bytecode.patch -# Default max heap size too low for lots of people. Bumping to 512 MB. +# Default max heap size too low for lots of people. Bump to 512 MB. # Max perm size: # https://bugzilla.redhat.com/show_bug.cgi?id=352361 # JVM crash: @@ -92,22 +96,28 @@ # https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092 Patch29: %{name}-memorypermsizeandjvmcrash.patch -Patch31: %{name}-ia64-packaging.patch -# https://bugs.eclipse.org/226356 -# Note: I made this patch from within Eclipse and then did the following to -# it due to spaces in the paths: -# sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-buildagainstxulrunner.patch -Patch32: %{name}-buildagainstxulrunner.patch - -# Back-port from 3.4 -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=206432 -# https://bugzilla.redhat.com/show_bug.cgi?id=446064 -# Note: I made this patch from within Eclipse and then did the following to -# it due to spaces in the paths: -# sed --in-place \ -# "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g;s/Eclipse\ SWT/Eclipse_SWT/g" \ -# eclipse-swt-mozprofile.patch -Patch33: %{name}-swt-mozprofile.patch +#Patch31: %{name}-ia64-packaging.patch + +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908 +# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593 +# FIXME: update bug with this smaller version of the patch +Patch32: %{name}-compilelibs.patch + +# FIXME: file these upstream +# Upstream builds with a 1.4 (or lower) class library +Patch33: %{name}-pdeapicasting.patch +Patch34: %{name}-pdeapicasting-ui.patch + +# Make ECF bundles have the same qualifier as they do upstream +Patch35: %{name}-ecf-qualifier.patch + +# Don't pack the icu4j source bundle. Can go away when we re-build +# icu4j against a 3.4 SDK. +Patch36: %{name}-dontpackicu4jsource.patch + +# Our dependent JARs have different signatures than the ones included +# upstream so remove the signatures in the manifests +Patch37: %{name}-nojarsignatures.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -126,18 +136,10 @@ BuildRequires: cairo >= 1.0 BuildRequires: unzip BuildRequires: icu4j-eclipse >= 3.6.1-1jpp.4 -BuildRequires: tomcat5-jasper-eclipse >= 5.5.17 BuildRequires: desktop-file-utils -%if %{gcj_support} -BuildRequires: gcc-java >= 4.1.2 -BuildRequires: java-1.5.0-gcj-javadoc -BuildRequires: java-gcj-compat-devel >= 1.0.64 -BuildRequires: libXt-devel -%else BuildRequires: java-devel >= 1.6.0 BuildRequires: java-javadoc BuildRequires: libXt-devel -%endif # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in # Fedora. When that's done, add it here and symlink below. @@ -149,19 +151,14 @@ BuildRequires: jakarta-commons-el >= 1.0-8jpp BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3 BuildRequires: mx4j >= 2.1 -BuildRequires: tomcat5 >= 5.5.23-9jpp.4 -BuildRequires: tomcat5-jasper >= 5.5.23-9jpp.4 -BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4 BuildRequires: jetty BuildRequires: lucene >= 1.9.1 BuildRequires: lucene-contrib >= 1.9.1 BuildRequires: regexp BuildRequires: junit >= 3.8.1-3jpp BuildRequires: junit4 -%if %{gcj_support} -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%endif +BuildRequires: sat4j +BuildRequires: objectweb-asm %description The Eclipse Platform is designed for building integrated development @@ -174,74 +171,49 @@ [...1879 lines suppressed...] -%{_datadir}/%{name}/plugins/org.junit4_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.launching_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.core_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit4.runtime_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit.runtime_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.core.manipulation_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_* -%{_libdir}/gcj/%{name}/jdimodel.jar.* -%{_libdir}/gcj/%{name}/jdi.jar.* -%else -%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_* -%endif +%{_libdir}/%{name}/features/org.eclipse.jdt_* +%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_* +%{_libdir}/%{name}/plugins/org.junit_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* +%{_libdir}/%{name}/plugins/org.junit4_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_* +%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.engine_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.jarprocessor_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.repository_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.artifact.repository_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.exemplarysetup_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.garbagecollector_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.directorywatcher_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.generator_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatesite_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.security_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.security.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.extensionlocation_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director.app_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.ssl_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.filetransfer_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_* +# FIXME: These need to be symlinks +# SAT4J review request: +# https://bugzilla.redhat.com/show_bug.cgi?id=453781 +%{_libdir}/%{name}/plugins/org.sat4j.core_* +%{_libdir}/%{name}/plugins/org.sat4j.pb_* %files pde %defattr(-,root,root) -%{_datadir}/%{name}/features/org.eclipse.sdk_* -%{_datadir}/%{name}/features/org.eclipse.pde_* -%{_datadir}/%{name}/features/org.eclipse.pde.source_* +%{_libdir}/%{name}/features/org.eclipse.sdk_* +%{_libdir}/%{name}/features/org.eclipse.pde_* +%{_libdir}/%{name}/features/org.eclipse.pde.p2_* +%{_libdir}/%{name}/features/org.eclipse.pde.p2.source_* +%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui.source_* +%{_libdir}/%{name}/features/org.eclipse.help.source_* +%{_libdir}/%{name}/features/org.eclipse.pde.source_* %{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.build_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.build -%{_datadir}/%{name}/plugins/org.eclipse.pde_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.core_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.ui.templates_* -%{_datadir}/%{name}/features/org.eclipse.rcp.source_* -%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}* -%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.source_* -%{_datadir}/%{name}/features/org.eclipse.cvs.source_* -%{_datadir}/%{name}/plugins/org.eclipse.cvs.source_* -%{_datadir}/%{name}/plugins/org.eclipse.sdk_* -%{_datadir}/%{name}/features/org.eclipse.jdt.source_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.build_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.build +%{_libdir}/%{name}/plugins/org.eclipse.pde_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.core_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.ui.templates_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.p2.ui_* +%{_libdir}/%{name}/features/org.eclipse.rcp.source_* +#%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}* +%{_libdir}/%{name}/features/org.eclipse.cvs.source_* +%{_libdir}/%{name}/plugins/org.eclipse.sdk_* +%{_libdir}/%{name}/features/org.eclipse.jdt.source_* %{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_* -%{_datadir}/%{name}/plugins/org.junit.source_* -%{_datadir}/%{name}/features/org.eclipse.platform.source_* -%{_datadir}/%{name}/plugins/javax.servlet.jsp.source_* -%{_datadir}/%{name}/plugins/javax.servlet.source_* -%{_datadir}/%{name}/plugins/org.apache.ant.source_* -%{_datadir}/%{name}/plugins/org.apache.commons.el.source_* -%{_datadir}/%{name}/plugins/org.apache.commons.logging.source_* -%{_datadir}/%{name}/plugins/org.apache.jasper.source_* -%{_datadir}/%{name}/plugins/org.apache.lucene.analysis.source_* -%{_datadir}/%{name}/plugins/org.apache.lucene.source_* +%{_libdir}/%{name}/features/org.eclipse.platform.source_* %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_* -%{_libdir}/%{name}/plugins/org.eclipse.platform.source_* -%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_* -%{_datadir}/%{name}/plugins/org.mortbay.jetty.source_* -%{_datadir}/%{name}/buildscripts -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.pde_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.core_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.junit.runtime_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.ui.templates_* -%{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_* -%{_libdir}/gcj/%{name}/pdebuild.jar* -%{_libdir}/gcj/%{name}/pdebuild-ant.jar* -%endif +#%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.views.log_* +%{_libdir}/%{name}/buildscripts +%{_libdir}/%{name}/plugins/org.eclipse.pde.api.tools_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.api.tools.ui_* +%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_* +%{_libdir}/%{name}/plugins/javax.servlet.source_* +%{_libdir}/%{name}/plugins/org.apache.ant.source_* +%{_libdir}/%{name}/plugins/org.apache.commons.el.source_* +%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_* +%{_libdir}/%{name}/plugins/org.apache.jasper.source_* +%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_* +%{_libdir}/%{name}/plugins/org.apache.lucene.source_* +%{_libdir}/%{name}/plugins/org.junit.source_* +%{_libdir}/%{name}/plugins/org.junit4.source_* +%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_* +%{_libdir}/%{name}/plugins/org.objectweb.asm_* +%{_libdir}/%{name}/plugins/org.objectweb.asm.source_* +%{_libdir}/%{name}/plugins/org.eclipse.*.source_* +# FIXME: where should this go? +%{_libdir}/%{name}/configuration/org.eclipse.equinox.source/source.info %files pde-runtime %defattr(-,root,root) -%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_* -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_* -%endif +%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* %changelog +* Mon Jul 14 2008 Andrew Overholt 3.4.0-1 +- 3.4 +- Remove gcj compilation +- Update versions of dependencies +- Rename libswt3-gtk2 to eclipse-swt +- Move "Provides: eclipse" to PDE from JDT +- Remove unnecessary old Obsoletes/Provides +- Remove tomcat stuff since it's no longer used +- Move stuff from %%{_datadir}/eclipse to %%{_libdir}/eclipse +- Add BRs/Rs on objectweb-asm and sat4j +- Build ECF filetransfer stuff as part of this SRPM until we have a + separate eclipse-ecf package (which will require this version of the + SDK) + * Sat Jun 14 2008 Dennis Gilmore 3.3.2-13 - make changes to support sparcv9 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 3 Apr 2008 15:48:11 -0000 1.59 +++ sources 14 Jul 2008 21:40:30 -0000 1.60 @@ -1,4 +1,5 @@ e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip -4b7016cf9aedf07b8f34b39470947799 eclipse-sourceBuild-srcIncluded-3.3.2.zip -08529425250f218c59acd622728b9b44 org.fedoraproject.ide.platform-3.3.2.zip +611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2 +555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip +d596a6e86ee2fd9c9af9b25b334936fa org.fedoraproject.ide.platform-3.4.0.zip From fedora-extras-commits at redhat.com Mon Jul 14 21:55:20 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 14 Jul 2008 21:55:20 GMT Subject: rpms/notification-daemon/devel notification-daemon.spec,1.24,1.25 Message-ID: <200807142155.m6ELtK4t023525@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/notification-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23157 Modified Files: notification-daemon.spec Log Message: fix a problem with theme changes Index: notification-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/notification-daemon/devel/notification-daemon.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- notification-daemon.spec 16 Jun 2008 19:01:29 -0000 1.24 +++ notification-daemon.spec 14 Jul 2008 21:54:24 -0000 1.25 @@ -7,7 +7,7 @@ Summary: Notification Daemon Name: notification-daemon Version: 0.3.7.90 -Release: 0.svn3009%{?dist} +Release: 1.svn3009%{?dist} URL: http://www.galago-project.org/specs/notification/ License: GPLv2+ Group: System Environment/Libraries @@ -19,6 +19,7 @@ BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: libnotify-devel BuildRequires: libglade2-devel +BuildRequires: libsexy-devel BuildRequires: GConf2-devel BuildRequires: autoconf automake BuildRequires: libwnck-devel >= %{wnck_version} @@ -34,7 +35,6 @@ Obsoletes: notify-daemon Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.bz2 -Patch0: notification-daemon-0.3.5-remove-libsexy.patch Patch2: notification-daemon-clipping.patch Patch3: notification-daemon-svn3009-distfix.patch Patch4: notification-daemon-positioning.patch @@ -45,7 +45,6 @@ %prep %setup -q -n notification-daemon-svn3009 -%patch0 -p1 -b .remove-libsexy %patch2 -p1 -b .clipping %patch3 -p0 -b .svn3009-distfix %patch4 -p0 -b .positioning @@ -106,6 +105,9 @@ %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas %changelog +* Mon Jul 14 2008 Matthias Clasen - 0.3.7.90-1.svn3009 +- Build against libsexy rather than copying part of it in a broken way (#455289) + * Tue Jun 10 2008 Colin Walters -0.3.7.90-0.svn3009 - Update to SVN snapshot 3009 (patches below are against it) - BR gnome-common so we can autogen From fedora-extras-commits at redhat.com Mon Jul 14 23:03:29 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 14 Jul 2008 23:03:29 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.98-consolekit-kdm.patch, NONE, 1.1 kdebase-workspace.spec, 1.102, 1.103 kdebase-workspace-4.0.0-consolekit-kdm.patch, 1.1, NONE Message-ID: <200807142303.m6EN3Tiq012477@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12361/devel Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.98-consolekit-kdm.patch Removed Files: kdebase-workspace-4.0.0-consolekit-kdm.patch Log Message: * Mon Jul 14 2008 Kevin Kofler 4.0.98-5 - new consolekit-kdm patch using libck-connector, BR ConsoleKit-devel (#430388) kdebase-workspace-4.0.98-consolekit-kdm.patch: --- NEW FILE kdebase-workspace-4.0.98-consolekit-kdm.patch --- diff -Nur kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake --- kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake 2008-07-15 00:13:56.000000000 +0200 @@ -0,0 +1,57 @@ +# - Try to find the ConsoleKit connector library (libck-connector) +# Once done this will define +# +# CKCONNECTOR_FOUND - system has the CK Connector +# CKCONNECTOR_INCLUDE_DIR - the CK Connector include directory +# CKCONNECTOR_LIBRARIES - The libraries needed to use CK Connector + +# Copyright (c) 2008, Kevin Kofler, +# modeled after FindLibArt.cmake: +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + + # in cache already + SET(CKCONNECTOR_FOUND TRUE) + +else (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + + IF (NOT WIN32) + INCLUDE(UsePkgConfig) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + PKGCONFIG(ck-connector _ckConnectorIncDir _ckConnectorLinkDir _ckConnectorLinkFlags _ckConnectorCflags) + ENDIF (NOT WIN32) + + FIND_PATH(CKCONNECTOR_INCLUDE_DIR ck-connector.h + ${_ckConnectorIncDir} + ) + + FIND_LIBRARY(CKCONNECTOR_LIBRARIES NAMES ck-connector + PATHS + ${_ckConnectorLinkDir} + ) + + + if (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + set(CKCONNECTOR_FOUND TRUE) + endif (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + + + if (CKCONNECTOR_FOUND) + if (NOT CkConnector_FIND_QUIETLY) + message(STATUS "Found ck-connector: ${CKCONNECTOR_LIBRARIES}") + endif (NOT CkConnector_FIND_QUIETLY) + else (CKCONNECTOR_FOUND) + if (CkConnector_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find ck-connector") + endif (CkConnector_FIND_REQUIRED) + endif (CKCONNECTOR_FOUND) + + MARK_AS_ADVANCED(CKCONNECTOR_INCLUDE_DIR CKCONNECTOR_LIBRARIES) + +endif (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) diff -Nur kdebase-workspace-4.0.98/cmake/modules/FindDBus.cmake kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindDBus.cmake --- kdebase-workspace-4.0.98/cmake/modules/FindDBus.cmake 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindDBus.cmake 2008-07-14 23:56:36.000000000 +0200 @@ -0,0 +1,39 @@ + +if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + # Already in cache, be silent + set(DBUS_FIND_QUIETLY TRUE) +endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + +set(DBUS_LIBRARY) +set(DBUS_INCLUDE_DIR) +set(DBUS_ARCH_INCLUDE_DIR) + +FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h + /usr/include + /usr/include/dbus-1.0 + /usr/local/include +) + +FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h + /usr/lib${LIB_SUFFIX}/include + /usr/lib${LIB_SUFFIX}/dbus-1.0/include + /usr/lib64/include + /usr/lib64/dbus-1.0/include + /usr/lib/include + /usr/lib/dbus-1.0/include +) + +FIND_LIBRARY(DBUS_LIBRARY NAMES dbus-1 dbus + PATHS + /usr/lib + /usr/local/lib +) + +if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + MESSAGE( STATUS "dbus found: includes in ${DBUS_INCLUDE_DIR}, library in ${DBUS_LIBRARY}") + set(DBUS_FOUND TRUE) +else(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + MESSAGE( STATUS "dbus not found") +endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + +MARK_AS_ADVANCED(DBUS_INCLUDE_DIR DBUS_LIBRARY DBUS_ARCH_INCLUDE_DIR) diff -Nur kdebase-workspace-4.0.98/kdm/backend/client.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/client.c --- kdebase-workspace-4.0.98/kdm/backend/client.c 2008-05-07 11:05:26.000000000 +0200 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/client.c 2008-07-14 23:48:35.000000000 +0200 @@ -1180,7 +1180,11 @@ */ int +#ifdef HAVE_CKCONNECTOR +startClient( volatile int *pid, const char *ck_session_cookie ) +#else startClient( volatile int *pid ) +#endif { const char *home, *sessargs, *desksess; char **env, *xma; @@ -1269,6 +1273,11 @@ if (krbtkfile[0] != '\0') env = setEnv( env, "KRBTKFILE", krbtkfile ); #endif +#ifdef HAVE_CKCONNECTOR + if (ck_session_cookie != NULL) { + env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie ); + } +#endif userEnviron = inheritEnv( env, envvars ); env = systemEnv( 0, curuser ); systemEnviron = setEnv( env, "HOME", p->pw_dir ); diff -Nur kdebase-workspace-4.0.98/kdm/backend/CMakeLists.txt kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/CMakeLists.txt --- kdebase-workspace-4.0.98/kdm/backend/CMakeLists.txt 2008-05-29 13:19:01.000000000 +0200 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/CMakeLists.txt 2008-07-15 00:32:29.000000000 +0200 @@ -60,6 +60,10 @@ ${SOCKET_LIBRARIES} ${RESOLV_LIBRARIES} ) +if (CKCONNECTOR_FOUND) + include_directories(${CKCONNECTOR_INCLUDE_DIR} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR}) + target_link_libraries( kdm ${CKCONNECTOR_LIBRARIES} ${DBUS_LIBRARY} ) +endif (CKCONNECTOR_FOUND) if(UTIL_LIBRARIES) target_link_libraries( kdm ${UTIL_LIBRARIES} ) endif(UTIL_LIBRARIES) diff -Nur kdebase-workspace-4.0.98/kdm/backend/dm.h kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/dm.h --- kdebase-workspace-4.0.98/kdm/backend/dm.h 2008-01-05 00:55:44.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/dm.h 2008-07-14 23:48:35.000000000 +0200 @@ -504,7 +504,11 @@ #define GCONV_BINARY 5 typedef char *(*GConvFunc)( int what, const char *prompt ); int verify( GConvFunc gconv, int rootok ); +#ifdef HAVE_CKCONNECTOR +int startClient( volatile int *pid, const char *ck_session_cookie ); +#else int startClient( volatile int *pid ); +#endif void clientExited( void ); void sessionExit( int status ) ATTR_NORETURN; int readDmrc( void ); diff -Nur kdebase-workspace-4.0.98/kdm/backend/session.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c --- kdebase-workspace-4.0.98/kdm/backend/session.c 2008-01-05 00:55:44.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-15 00:45:59.000000000 +0200 @@ -45,6 +45,14 @@ #include #include +#ifdef HAVE_CKCONNECTOR +#include +#include +/* for getpwnam */ +#include +#include +#endif + struct display *td; const char *td_setup = "auto"; @@ -553,6 +561,18 @@ volatile time_t tdiff = 0; sigset_t ss; +#ifdef HAVE_CKCONNECTOR + DBusError error; + CkConnector *connector; + char *ck_session_cookie; + struct passwd *pwent; + char device[20] = ""; +#ifdef XDMCP + char *empty_hostname = ""; + char **remote_host_name; +#endif +#endif + td = d; debug( "manageSession %s\n", d->name ); if ((ex = Setjmp( abortSession ))) { @@ -627,8 +647,58 @@ if (td_setup) setupDisplay( td_setup ); +#ifdef HAVE_VTS + if (d->serverVT > 0) { + /* FIXME: how does xorg construct this */ + sprintf(device, "/dev/tty%d", d->serverVT); + } +#endif +#ifdef HAVE_CKCONNECTOR + pwent = getpwnam(curuser); + if (pwent == NULL) { + debug ("NULL user\n"); + ck_session_cookie = NULL; + } else { + connector = ck_connector_new (); +#ifdef XDMCP + if ((d->displayType & d_location) != dLocal && d->remoteHost) + remote_host_name = &(d->remoteHost); + else + remote_host_name = &empty_hostname; +#endif + + if (connector != NULL) { + dbus_error_init (&error); + if ( !(ck_connector_open_session_with_parameters (connector, + &error, "unix-user", &(pwent->pw_uid), + "display-device", &device, + "x11-display", &(d->name), + "is-local", ((d->displayType & d_location) == dLocal), +#ifdef XDMCP + "remote-host-name", remote_host_name, +#endif + NULL))) { + if (dbus_error_is_set (&error)) { + logError( "ConsoleKit open: %s\n", error.message); + dbus_error_free (&error); + } else { + logError("cannot open CK session: OOM, D-Bus system bus not available,\n" + "ConsoleKit not available or insufficient privileges.\n"); + } + ck_connector_unref (connector); + sessionExit( EX_NORMAL ); + } + } else { + debug ("OOM creating CkConnector\n"); + sessionExit( EX_NORMAL ); + } + ck_session_cookie = ck_connector_get_cookie (connector); + } + if (!startClient( &clientPid, ck_session_cookie )) { +#else if (!startClient( &clientPid )) { +#endif logError( "Client start failed\n" ); sessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */ } @@ -650,6 +720,23 @@ catchTerm( SIGTERM ); } } + +/* close consolekit session */ +#ifdef HAVE_CKCONNECTOR + if (ck_session_cookie != NULL) { + dbus_error_init (&error); + if (! ck_connector_close_session (connector, &error)) { + if (dbus_error_is_set (&error)) { + logError ("ConsoleKit close: %s\n", error.message); + dbus_error_free (&error); + } else { + logError ("Cannot close CK session: OOM, D-Bus system bus not available,\n" + "ConsoleKit not available or insufficient privileges.\n"); + } + } + ck_connector_unref (connector); + } +#endif /* * Sometimes the Xsession somehow manages to exit before * a server crash is noticed - so we sleep a bit and wait diff -Nur kdebase-workspace-4.0.98/kdm/backend/xdmcp.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/xdmcp.c --- kdebase-workspace-4.0.98/kdm/backend/xdmcp.c 2008-01-05 00:55:44.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/xdmcp.c 2008-07-14 23:48:35.000000000 +0200 @@ -1016,6 +1016,8 @@ d->clientAddr = clientAddress; d->clientPort = clientPort; d->connectionType = connectionType; + d->remoteHost = networkAddressToHostname (pdpy->connectionType, + &pdpy->connectionAddress); if (pdpy->fileAuthorization) { d->authorizations = (Xauth **)Malloc( sizeof(Xauth *) ); if (!d->authorizations) { diff -Nur kdebase-workspace-4.0.98/kdm/CMakeLists.txt kdebase-workspace-4.0.98-consolekit-kdm/kdm/CMakeLists.txt --- kdebase-workspace-4.0.98/kdm/CMakeLists.txt 2008-02-07 14:19:51.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/CMakeLists.txt 2008-07-15 00:28:16.000000000 +0200 @@ -4,6 +4,17 @@ install_pam_service(KDM) include(ConfigureChecks.cmake) + +macro_optional_find_package(CkConnector) +if(CKCONNECTOR_FOUND) + # when building with libck-connector, we also need the low-level D-Bus API + find_package(DBus REQUIRED) +endif(CKCONNECTOR_FOUND) + +macro_log_feature(CKCONNECTOR_FOUND "ck-connector" "The ConsoleKit connector library" "http://freedesktop.org/wiki/Software/ConsoleKit" FALSE "" "Provides ConsoleKit integration in KDM") + +macro_bool_to_01(CKCONNECTOR_FOUND HAVE_CKCONNECTOR) + configure_file(config-kdm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdm.h) install( FILES README DESTINATION ${DATA_INSTALL_DIR}/doc/kdm ) diff -Nur kdebase-workspace-4.0.98/kdm/config-kdm.h.cmake kdebase-workspace-4.0.98-consolekit-kdm/kdm/config-kdm.h.cmake --- kdebase-workspace-4.0.98/kdm/config-kdm.h.cmake 2008-01-05 00:55:45.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/config-kdm.h.cmake 2008-07-14 23:48:35.000000000 +0200 @@ -123,6 +123,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_TERMIOS_H 1 +/* Define to 1 if the ck-connector library is found */ +#cmakedefine HAVE_CKCONNECTOR 1 + /* $PATH defaults set by KDM */ #cmakedefine KDM_DEF_USER_PATH "${KDM_DEF_USER_PATH}" #cmakedefine KDM_DEF_SYSTEM_PATH "${KDM_DEF_SYSTEM_PATH}" Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- kdebase-workspace.spec 14 Jul 2008 14:42:55 -0000 1.102 +++ kdebase-workspace.spec 14 Jul 2008 23:02:40 -0000 1.103 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.98 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: kdebase-workspace-4.0.3-redhat-startkde.patch -Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch +Patch2: kdebase-workspace-4.0.98-consolekit-kdm.patch Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch Patch4: kdebase-workspace-4.0.72-show-systemsettings.patch Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch @@ -45,7 +45,7 @@ BuildRequires: bluez-libs-devel BuildRequires: cmake -BuildRequires: dbus-devel +BuildRequires: ConsoleKit-devel BuildRequires: glib2-devel BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} @@ -127,7 +127,7 @@ # RH/Fedora-specific startkde changes %patch1 -p1 -b .redhat-startkde -# ConsoleKit support for KDM (#228111, kde#147790) +# ConsoleKit support for KDM (#228111, #430388, kde#147790) %patch2 -p1 -b .consolekit %patch3 -p1 -b .plasma-konsole %patch4 -p1 -b .show-systemsettings @@ -276,6 +276,9 @@ %changelog +* Mon Jul 14 2008 Kevin Kofler 4.0.98-5 +- new consolekit-kdm patch using libck-connector, BR ConsoleKit-devel (#430388) + * Mon Jul 14 2008 Rex Dieter 4.0.98-4 - install circles kdm theme --- kdebase-workspace-4.0.0-consolekit-kdm.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 14 23:32:41 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 23:32:41 GMT Subject: rpms/kdebindings/devel kdebindings-4.0.98-phonon_include_dir.patch, NONE, 1.1 Message-ID: <200807142332.m6ENWf6P015914@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15764 Added Files: kdebindings-4.0.98-phonon_include_dir.patch Log Message: * Mon Jul 14 2008 Rex Dieter 4.0.98-3 - re-enable smoke (patched), ruby kdebindings-4.0.98-phonon_include_dir.patch: --- NEW FILE kdebindings-4.0.98-phonon_include_dir.patch --- diff -up kdebindings-4.0.98/smoke/phonon/generate.pl.cmake.phonon_include_dir kdebindings-4.0.98/smoke/phonon/generate.pl.cmake --- kdebindings-4.0.98/smoke/phonon/generate.pl.cmake.phonon_include_dir 2008-07-14 16:44:12.000000000 -0500 +++ kdebindings-4.0.98/smoke/phonon/generate.pl.cmake 2008-07-14 16:45:03.000000000 -0500 @@ -103,7 +103,7 @@ find( my @kdeheaders = (); $kdeprefix = "@KDE_PREFIX@"; -$kdeinc= '@kde_includes@'; +$kdeinc= ('@kde_includes@', '@PHONON_INCLUDE_DIR@' ); $kdeinc =~ s/\${prefix}/$kdeprefix/; # Remove ${prefix} in src != build -d $kdeinc or die "Couldn't process $kdeinc: $!\n"; From fedora-extras-commits at redhat.com Mon Jul 14 23:32:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 14 Jul 2008 23:32:58 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.128,1.129 Message-ID: <200807142332.m6ENWwfF016011@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15708 Modified Files: kdebindings.spec Log Message: * Mon Jul 14 2008 Rex Dieter 4.0.98-3 - re-enable smoke (patched), ruby Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- kdebindings.spec 14 Jul 2008 15:28:38 -0000 1.128 +++ kdebindings.spec 14 Jul 2008 23:31:36 -0000 1.129 @@ -6,8 +6,8 @@ # define to enable these optional bits #define csharp 1 -#define ruby 1 -#define smoke 1 +%define ruby 1 +%define smoke 1 #define php 1 %if 0%{?ruby}%{?smoke} @@ -22,7 +22,7 @@ Name: kdebindings Version: 4.0.98 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -32,6 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch100: kdebindings-4.0.85-smoke-buildfix.patch +Patch101: kdebindings-4.0.98-phonon_include_dir.patch BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} @@ -90,6 +91,7 @@ %setup -q %patch100 -p3 -b .smoke-buildfix +%patch101 -p1 -b .phonon_includes %build @@ -99,7 +101,7 @@ %{cmake_kde4} \ %{!?csharp:-DBUILD_csharp=OFF} \ %{!?php:-DBUILD_php=OFF} \ - %{!?ruby:-DBUILD_ruby=OFF} -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} \ + %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \ %{!?smoke:-DBUILD_smoke=OFF} \ .. popd @@ -169,6 +171,9 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4.0.98-3 +- re-enable smoke (patched), ruby + * Mon Jul 14 2008 Rex Dieter 4.0.98-2 - omit smoke, ruby bindings (build failures, sorting out upstream) - -devel: -BR: PyQt4-devel From fedora-extras-commits at redhat.com Mon Jul 14 23:51:13 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Mon, 14 Jul 2008 23:51:13 GMT Subject: rpms/kernel/devel ext4-patchqueue.patch, NONE, 1.1 kernel.spec, 1.762, 1.763 Message-ID: <200807142351.m6ENpDJr018757@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18683 Modified Files: kernel.spec Added Files: ext4-patchqueue.patch Log Message: * Mon Jul 14 2008 Eric Sandeen - Add pending ext4 patch queue; adds fiemap interface ext4-patchqueue.patch: --- NEW FILE ext4-patchqueue.patch --- Index: linux-2.6/fs/ext4/ext4.h =================================================================== --- linux-2.6.orig/fs/ext4/ext4.h 2008-07-07 20:08:38.789291868 -0500 +++ linux-2.6/fs/ext4/ext4.h 2008-07-14 17:16:50.156291373 -0500 @@ -22,7 +22,7 @@ #include "ext4_i.h" /* - * The second extended filesystem constants/structures + * The fourth extended filesystem constants/structures */ /* @@ -45,7 +45,7 @@ #define ext4_debug(f, a...) \ do { \ printk (KERN_DEBUG "EXT4-fs DEBUG (%s, %d): %s:", \ - __FILE__, __LINE__, __FUNCTION__); \ + __FILE__, __LINE__, __func__); \ printk (KERN_DEBUG f, ## a); \ } while (0) #else @@ -74,6 +74,9 @@ #define EXT4_MB_HINT_GOAL_ONLY 256 /* goal is meaningful */ #define EXT4_MB_HINT_TRY_GOAL 512 +/* blocks already pre-reserved by delayed allocation */ +#define EXT4_MB_DELALLOC_RESERVED 1024 + struct ext4_allocation_request { /* target inode for block we're allocating */ @@ -94,6 +97,11 @@ struct ext4_allocation_request { unsigned long len; /* flags. see above EXT4_MB_HINT_* */ unsigned long flags; + /* + * for ext4 online defrag: + * the block group which is excepted from allocation target + */ + long long excepted_group; }; /* @@ -170,6 +178,15 @@ struct ext4_group_desc __u32 bg_reserved2[3]; }; +/* + * Structure of a flex block group info + */ + +struct flex_groups { + __u32 free_inodes; + __u32 free_blocks; +}; + #define EXT4_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not in use */ #define EXT4_BG_BLOCK_UNINIT 0x0002 /* Block bitmap not in use */ #define EXT4_BG_INODE_ZEROED 0x0004 /* On-disk itable initialized to zero */ @@ -289,6 +306,14 @@ struct ext4_new_group_data { #define EXT4_IOC_GETRSVSZ _IOR('f', 5, long) #define EXT4_IOC_SETRSVSZ _IOW('f', 6, long) #define EXT4_IOC_MIGRATE _IO('f', 7) +#define EXT4_IOC_FIBMAP _IOW('f', 9, ext4_fsblk_t) +#define EXT4_IOC_DEFRAG _IOW('f', 10, struct ext4_ext_defrag_data) +#define EXT4_IOC_GROUP_INFO _IOW('f', 11, struct ext4_group_data_info) +#define EXT4_IOC_FREE_BLOCKS_INFO _IOW('f', 12, struct ext4_extents_info) +#define EXT4_IOC_EXTENTS_INFO _IOW('f', 13, struct ext4_extents_info) +#define EXT4_IOC_RESERVE_BLOCK _IOW('f', 14, struct ext4_extents_info) +#define EXT4_IOC_MOVE_VICTIM _IOW('f', 15, struct ext4_extents_info) +#define EXT4_IOC_BLOCK_RELEASE _IO('f', 8) /* * ioctl commands in 32 bit emulation @@ -306,6 +331,57 @@ struct ext4_new_group_data { #define EXT4_IOC32_GETVERSION_OLD FS_IOC32_GETVERSION #define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION +/* + * Will go away. + * ext4 online defrag supports only 4KB block size. + */ +#define DEFRAG_BLOCK_SIZE 4096 + +/* + * The following four macros are used for the defrag force mode. + * + * DEFRAG_MAX_ENT: the maximum number of extents for exchanging between + * kernel-space and user-space per an ioctl + * DEFRAG_FORCE_TRY: check whether we have free space fragmentation or not + * DEFRAG_FORCE_VICTIM: move victim extents to make sufficient space + * DEFRAG_FORCE_GATHER: move the target file into the free space made in the + * DEFRAG_FORCE_VICTIM phase + */ +#define DEFRAG_MAX_ENT 32 +#define DEFRAG_FORCE_TRY 1 +#define DEFRAG_FORCE_VICTIM 2 +#define DEFRAG_FORCE_GATHER 3 + +struct ext4_extent_data { + ext4_lblk_t block; /* start logical block number */ + ext4_fsblk_t start; /* start physical block number */ + int len; /* blocks count */ +}; + +struct ext4_ext_defrag_data { + ext4_lblk_t start_offset; /* start offset to defrag in blocks */ + ext4_lblk_t defrag_size; /* size of defrag in blocks */ + ext4_fsblk_t goal; /* block offset for allocation */ + int flag; /* free space mode flag */ + struct ext4_extent_data ext; +}; + +struct ext4_group_data_info { + int s_blocks_per_group; /* blocks per group */ + int s_inodes_per_group; /* inodes per group */ +}; + +struct ext4_extents_info { + unsigned long long ino; /* inode number */ + int max_entries; /* maximum extents count */ + int entries; /* extent number/count */ + ext4_lblk_t f_offset; /* file offset */ + ext4_grpblk_t g_offset; /* group offset */ + ext4_fsblk_t goal; /* block offset for allocation */ + struct ext4_extent_data ext[DEFRAG_MAX_ENT]; +}; + +#define EXT4_TRANS_META_BLOCKS 4 /* bitmap + group desc + sb + inode */ /* * Mount options @@ -527,6 +603,7 @@ do { \ #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ #define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */ #define EXT4_MOUNT_MBALLOC 0x4000000 /* Buddy allocation support */ +#define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ /* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */ #ifndef _LINUX_EXT2_FS_H #define clear_opt(o, opt) o &= ~EXT4_MOUNT_##opt @@ -647,7 +724,10 @@ struct ext4_super_block { __le16 s_mmp_interval; /* # seconds to wait in MMP checking */ __le64 s_mmp_block; /* Block for multi-mount protection */ __le32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/ - __u32 s_reserved[163]; /* Padding to the end of the block */ + __u8 s_log_groups_per_flex; /* FLEX_BG group size */ + __u8 s_reserved_char_pad2; + __le16 s_reserved_pad; + __u32 s_reserved[162]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ @@ -958,12 +1038,17 @@ extern ext4_grpblk_t ext4_block_group_of extern int ext4_bg_has_super(struct super_block *sb, ext4_group_t group); extern unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group); -extern ext4_fsblk_t ext4_new_block (handle_t *handle, struct inode *inode, +extern ext4_fsblk_t ext4_new_meta_block(handle_t *handle, struct inode *inode, ext4_fsblk_t goal, int *errp); -extern ext4_fsblk_t ext4_new_blocks (handle_t *handle, struct inode *inode, +extern ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode, ext4_fsblk_t goal, unsigned long *count, int *errp); -extern ext4_fsblk_t ext4_new_blocks_old(handle_t *handle, struct inode *inode, +extern ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode, + ext4_lblk_t iblock, ext4_fsblk_t goal, + unsigned long *count, int *errp); +extern ext4_fsblk_t ext4_old_new_blocks(handle_t *handle, struct inode *inode, ext4_fsblk_t goal, unsigned long *count, int *errp); +extern ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi, + ext4_fsblk_t nblocks); extern void ext4_free_blocks (handle_t *handle, struct inode *inode, ext4_fsblk_t block, unsigned long count, int metadata); extern void ext4_free_blocks_sb (handle_t *handle, struct super_block *sb, @@ -977,6 +1062,17 @@ extern struct ext4_group_desc * ext4_get extern int ext4_should_retry_alloc(struct super_block *sb, int *retries); extern void ext4_init_block_alloc_info(struct inode *); extern void ext4_rsv_window_add(struct super_block *sb, struct ext4_reserve_window_node *rsv); +extern void try_to_extend_reservation(struct ext4_reserve_window_node *, + struct super_block *, int); +extern int alloc_new_reservation(struct ext4_reserve_window_node *, + ext4_grpblk_t, struct super_block *, + ext4_group_t, struct buffer_head *); +extern ext4_grpblk_t bitmap_search_next_usable_block(ext4_grpblk_t, + struct buffer_head *, ext4_grpblk_t); +extern int rsv_is_empty(struct ext4_reserve_window *rsv); +extern int goal_in_my_reservation(struct ext4_reserve_window *rsv, + ext4_grpblk_t grp_goal, ext4_group_t group, + struct super_block *sb); /* dir.c */ extern int ext4_check_dir_entry(const char *, struct inode *, @@ -986,6 +1082,7 @@ extern int ext4_htree_store_dirent(struc __u32 minor_hash, struct ext4_dir_entry_2 *dirent); extern void ext4_htree_free_dir_info(struct dir_private_info *p); +extern sector_t ext4_bmap(struct address_space *mapping, sector_t block); /* fsync.c */ [...9904 lines suppressed...] + unsigned int hole_size; + struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); + u64 len_bytes, phys_bytes, virt_bytes; + struct buffer_head *di_bh = NULL; + struct ocfs2_extent_rec rec; + + ret = fiemap_check_flags(fieinfo, OCFS2_FIEMAP_FLAGS); + if (ret) + return ret; + + ret = ocfs2_inode_lock(inode, &di_bh, 0); + if (ret) { + mlog_errno(ret); + goto out; + } + + down_read(&OCFS2_I(inode)->ip_alloc_sem); + + /* + * Handle inline-data separately. + */ + if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) { + ret = ocfs2_fiemap_inline(inode, di_bh, fieinfo, map_start); + goto out_unlock; + } + + cpos = map_start >> osb->s_clustersize_bits; + mapping_end = ocfs2_clusters_for_bytes(inode->i_sb, + map_start + map_len); + mapping_end -= cpos; + is_last = 0; + while (cpos < mapping_end && !is_last) { + u32 fe_flags; + + ret = ocfs2_get_clusters_nocache(inode, di_bh, cpos, + &hole_size, &rec, &is_last); + if (ret) { + mlog_errno(ret); + goto out; + } + + if (rec.e_blkno == 0ULL) { + cpos += hole_size; + continue; + } + + fe_flags = 0; + if (rec.e_flags & OCFS2_EXT_UNWRITTEN) + fe_flags |= FIEMAP_EXTENT_UNWRITTEN; + if (is_last) + fe_flags |= FIEMAP_EXTENT_LAST; + len_bytes = (u64)le16_to_cpu(rec.e_leaf_clusters) << osb->s_clustersize_bits; + phys_bytes = le64_to_cpu(rec.e_blkno) << osb->sb->s_blocksize_bits; + virt_bytes = (u64)le32_to_cpu(rec.e_cpos) << osb->s_clustersize_bits; + + ret = fiemap_fill_next_extent(fieinfo, virt_bytes, phys_bytes, + len_bytes, fe_flags, + inode->i_sb->s_dev); + if (ret) + break; + + cpos = le32_to_cpu(rec.e_cpos)+ le16_to_cpu(rec.e_leaf_clusters); + } + + if (ret > 0) + ret = 0; + +out_unlock: + brelse(di_bh); + + up_read(&OCFS2_I(inode)->ip_alloc_sem); + + ocfs2_inode_unlock(inode, 0); +out: + + return ret; +} Index: linux-2.6/fs/ocfs2/extent_map.h =================================================================== --- linux-2.6.orig/fs/ocfs2/extent_map.h 2008-07-14 17:14:57.397291280 -0500 +++ linux-2.6/fs/ocfs2/extent_map.h 2008-07-14 17:16:47.259290989 -0500 @@ -50,4 +50,7 @@ int ocfs2_get_clusters(struct inode *ino int ocfs2_extent_map_get_blocks(struct inode *inode, u64 v_blkno, u64 *p_blkno, u64 *ret_count, unsigned int *extent_flags); +int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 map_start, u64 map_len); + #endif /* _EXTENT_MAP_H */ Index: linux-2.6/fs/ocfs2/file.c =================================================================== --- linux-2.6.orig/fs/ocfs2/file.c 2008-07-14 17:14:57.397291280 -0500 +++ linux-2.6/fs/ocfs2/file.c 2008-07-14 17:16:47.285290893 -0500 @@ -2228,6 +2228,7 @@ const struct inode_operations ocfs2_file .getattr = ocfs2_getattr, .permission = ocfs2_permission, .fallocate = ocfs2_fallocate, + .fiemap = ocfs2_fiemap, }; const struct inode_operations ocfs2_special_file_iops = { Index: linux-2.6/fs/ext2/ext2.h =================================================================== --- linux-2.6.orig/fs/ext2/ext2.h 2008-07-14 17:14:53.944291751 -0500 +++ linux-2.6/fs/ext2/ext2.h 2008-07-14 17:16:48.757291178 -0500 @@ -133,6 +133,8 @@ extern void ext2_truncate (struct inode extern int ext2_setattr (struct dentry *, struct iattr *); extern void ext2_set_inode_flags(struct inode *inode); extern void ext2_get_inode_flags(struct ext2_inode_info *); +extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len); int __ext2_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata); Index: linux-2.6/fs/ext2/file.c =================================================================== --- linux-2.6.orig/fs/ext2/file.c 2008-07-14 17:14:53.944291751 -0500 +++ linux-2.6/fs/ext2/file.c 2008-07-14 17:16:48.782291153 -0500 @@ -86,4 +86,5 @@ const struct inode_operations ext2_file_ #endif .setattr = ext2_setattr, .permission = ext2_permission, + .fiemap = ext2_fiemap, }; Index: linux-2.6/fs/ext2/inode.c =================================================================== --- linux-2.6.orig/fs/ext2/inode.c 2008-07-14 17:14:53.944291751 -0500 +++ linux-2.6/fs/ext2/inode.c 2008-07-14 17:16:48.825290935 -0500 @@ -31,6 +31,7 @@ #include #include #include +#include #include "ext2.h" #include "acl.h" #include "xip.h" @@ -704,6 +705,13 @@ int ext2_get_block(struct inode *inode, } +int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len) +{ + return generic_block_fiemap(inode, fieinfo, start, len, + ext2_get_block); +} + static int ext2_writepage(struct page *page, struct writeback_control *wbc) { return block_write_full_page(page, ext2_get_block, wbc); Index: linux-2.6/fs/ext3/file.c =================================================================== --- linux-2.6.orig/fs/ext3/file.c 2008-07-14 17:14:53.954291057 -0500 +++ linux-2.6/fs/ext3/file.c 2008-07-14 17:16:48.875291196 -0500 @@ -134,5 +134,6 @@ const struct inode_operations ext3_file_ .removexattr = generic_removexattr, #endif .permission = ext3_permission, + .fiemap = ext3_fiemap, }; Index: linux-2.6/fs/ext3/inode.c =================================================================== --- linux-2.6.orig/fs/ext3/inode.c 2008-07-14 17:14:53.954291057 -0500 +++ linux-2.6/fs/ext3/inode.c 2008-07-14 17:16:48.901291166 -0500 @@ -36,6 +36,7 @@ #include #include #include +#include #include "xattr.h" #include "acl.h" @@ -981,6 +982,13 @@ out: return ret; } +int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len) +{ + return generic_block_fiemap(inode, fieinfo, start, len, + ext3_get_block); +} + /* * `handle' can be NULL if create is zero */ Index: linux-2.6/include/linux/ext3_fs.h =================================================================== --- linux-2.6.orig/include/linux/ext3_fs.h 2008-07-14 17:14:53.955291262 -0500 +++ linux-2.6/include/linux/ext3_fs.h 2008-07-14 17:16:48.991290977 -0500 @@ -836,6 +836,8 @@ extern void ext3_truncate (struct inode extern void ext3_set_inode_flags(struct inode *); extern void ext3_get_inode_flags(struct ext3_inode_info *); extern void ext3_set_aops(struct inode *inode); +extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len); /* ioctl.c */ extern int ext3_ioctl (struct inode *, struct file *, unsigned int, Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.762 retrieving revision 1.763 diff -u -r1.762 -r1.763 --- kernel.spec 14 Jul 2008 19:38:29 -0000 1.762 +++ kernel.spec 14 Jul 2008 23:50:26 -0000 1.763 @@ -656,6 +656,9 @@ # atl2 network driver Patch2020: linux-2.6-netdev-atl2.patch +# the current ext4 patch queue (most slated for .27) +Patch2200: ext4-patchqueue.patch + # make USB EHCI driver respect "nousb" parameter Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch # Fix HID usage descriptor on MS wireless desktop receiver @@ -1052,6 +1055,7 @@ # # bugfixes to drivers and filesystems # +ApplyPatch ext4-patchqueue.patch # USB ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch @@ -1788,6 +1792,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 14 2008 Eric Sandeen +- Add pending ext4 patch queue; adds fiemap interface + * Mon Jul 14 2008 Roland McGrath - Fix ia64 build nit, properly disable utrace for ia64. From fedora-extras-commits at redhat.com Tue Jul 15 00:02:24 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 15 Jul 2008 00:02:24 GMT Subject: rpms/gtkwave/devel .cvsignore, 1.51, 1.52 gtkwave.spec, 1.55, 1.56 sources, 1.51, 1.52 Message-ID: <200807150002.m6F02Oai027028@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26867 Modified Files: .cvsignore gtkwave.spec sources Log Message: update to 3.1.12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 19 Jun 2008 08:26:41 -0000 1.51 +++ .cvsignore 15 Jul 2008 00:01:32 -0000 1.52 @@ -1 +1 @@ -gtkwave-3.1.11.tar.gz +gtkwave-3.1.12.tar.gz Index: gtkwave.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- gtkwave.spec 19 Jun 2008 08:26:41 -0000 1.55 +++ gtkwave.spec 15 Jul 2008 00:01:32 -0000 1.56 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.1.11 +Version: 3.1.12 Release: 1%{?dist} License: GPLv2+ Group: Applications/Engineering @@ -89,6 +89,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Mon Jul 14 2008 Paul Howarth 3.1.12-1 +- update to 3.1.12 + * Thu Jun 19 2008 Paul Howarth 3.1.11-1 - update to 3.1.11 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 19 Jun 2008 08:26:41 -0000 1.51 +++ sources 15 Jul 2008 00:01:32 -0000 1.52 @@ -1 +1 @@ -fac18c42d4974facfb46e68ecb8feccd gtkwave-3.1.11.tar.gz +a9e8a399b9127a0d31066ac06ac39faa gtkwave-3.1.12.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 01:33:47 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 15 Jul 2008 01:33:47 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.98-consolekit-kdm.patch, 1.1, 1.2 Message-ID: <200807150133.m6F1XlVG011566@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11401/devel Modified Files: kdebase-workspace-4.0.98-consolekit-kdm.patch Log Message: Fix patch. kdebase-workspace-4.0.98-consolekit-kdm.patch: Index: kdebase-workspace-4.0.98-consolekit-kdm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.98-consolekit-kdm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebase-workspace-4.0.98-consolekit-kdm.patch 14 Jul 2008 23:02:40 -0000 1.1 +++ kdebase-workspace-4.0.98-consolekit-kdm.patch 15 Jul 2008 01:33:04 -0000 1.2 @@ -1,7 +1,7 @@ diff -Nur kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake --- kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake 2008-07-15 00:13:56.000000000 +0200 -@@ -0,0 +1,57 @@ ++++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake 2008-07-15 03:31:04.000000000 +0200 +@@ -0,0 +1,58 @@ +# - Try to find the ConsoleKit connector library (libck-connector) +# Once done this will define +# @@ -32,6 +32,7 @@ + ENDIF (NOT WIN32) + + FIND_PATH(CKCONNECTOR_INCLUDE_DIR ck-connector.h ++ ${_ckConnectorIncDir}/ConsoleKit/ck-connector + ${_ckConnectorIncDir} + ) + @@ -160,7 +161,7 @@ int readDmrc( void ); diff -Nur kdebase-workspace-4.0.98/kdm/backend/session.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c --- kdebase-workspace-4.0.98/kdm/backend/session.c 2008-01-05 00:55:44.000000000 +0100 -+++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-15 00:45:59.000000000 +0200 ++++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-15 03:18:06.000000000 +0200 @@ -45,6 +45,14 @@ #include #include @@ -195,18 +196,18 @@ td = d; debug( "manageSession %s\n", d->name ); if ((ex = Setjmp( abortSession ))) { -@@ -627,8 +647,58 @@ - +@@ -628,7 +648,58 @@ if (td_setup) setupDisplay( td_setup ); + ++#ifdef HAVE_CKCONNECTOR +#ifdef HAVE_VTS + if (d->serverVT > 0) { + /* FIXME: how does xorg construct this */ + sprintf(device, "/dev/tty%d", d->serverVT); + } +#endif - -+#ifdef HAVE_CKCONNECTOR ++ + pwent = getpwnam(curuser); + if (pwent == NULL) { + debug ("NULL user\n"); @@ -254,7 +255,7 @@ logError( "Client start failed\n" ); sessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */ } -@@ -650,6 +720,23 @@ +@@ -650,6 +721,23 @@ catchTerm( SIGTERM ); } } From fedora-extras-commits at redhat.com Tue Jul 15 02:28:53 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Tue, 15 Jul 2008 02:28:53 GMT Subject: rpms/publican/F-9 publican.spec,1.6,1.7 Message-ID: <200807150228.m6F2Srxc027722@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27518 Modified Files: publican.spec Log Message: change kde req Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-9/publican.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- publican.spec 7 Apr 2008 07:32:01 -0000 1.6 +++ publican.spec 15 Jul 2008 02:28:03 -0000 1.7 @@ -3,7 +3,7 @@ Name: publican Summary: Common files and scripts for publishing Documentation Version: 0.33 -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2+ and GFDL # The following directories are licensed under the GFDL: # content @@ -13,9 +13,11 @@ Buildarch: noarch Source: http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz # need kdesdk for po2xml & xml2pot -Requires: gettext libxslt kdesdk perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks -BuildRequires: gettext libxslt kdesdk perl(XML::TreeBuilder) docbook-style-xsl +Requires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks +Requires: %{_bindir}/xml2pot %{_bindir}/po2xml +BuildRequires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl BuildRequires: desktop-file-utils +BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml URL: https://fedorahosted.org/publican Obsoletes: documentation-devel < 0.26-3 Obsoletes: perl-SGML-Translate <= 0.37-3 @@ -82,6 +84,9 @@ %doc fdl.txt %changelog +* Tue Jul 15 2008 Jeff Fearn 0.33-1 +- Change kde reqs to a more portable format + * Mon Apr 7 2008 Jeff Fearn 0.33-0 - Remove release from package name in html desktop spec file - Removed --nonet from xsltproc call BZ #436342 From fedora-extras-commits at redhat.com Tue Jul 15 02:35:24 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 15 Jul 2008 02:35:24 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.98-consolekit-kdm.patch, 1.2, 1.3 Message-ID: <200807150235.m6F2ZOWe029526@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29214/devel Modified Files: kdebase-workspace-4.0.98-consolekit-kdm.patch Log Message: Fix probable segfault and simplify code a bit. kdebase-workspace-4.0.98-consolekit-kdm.patch: Index: kdebase-workspace-4.0.98-consolekit-kdm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.98-consolekit-kdm.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdebase-workspace-4.0.98-consolekit-kdm.patch 15 Jul 2008 01:33:04 -0000 1.2 +++ kdebase-workspace-4.0.98-consolekit-kdm.patch 15 Jul 2008 02:34:25 -0000 1.3 @@ -161,7 +161,7 @@ int readDmrc( void ); diff -Nur kdebase-workspace-4.0.98/kdm/backend/session.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c --- kdebase-workspace-4.0.98/kdm/backend/session.c 2008-01-05 00:55:44.000000000 +0100 -+++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-15 03:18:06.000000000 +0200 ++++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-15 04:29:13.000000000 +0200 @@ -45,6 +45,14 @@ #include #include @@ -187,16 +187,16 @@ + char *ck_session_cookie; + struct passwd *pwent; + char device[20] = ""; ++ dbus_bool_t is_local; +#ifdef XDMCP -+ char *empty_hostname = ""; -+ char **remote_host_name; ++ char *remote_host_name = ""; +#endif +#endif + td = d; debug( "manageSession %s\n", d->name ); if ((ex = Setjmp( abortSession ))) { -@@ -628,7 +648,58 @@ +@@ -628,7 +648,57 @@ if (td_setup) setupDisplay( td_setup ); @@ -214,22 +214,21 @@ + ck_session_cookie = NULL; + } else { + connector = ck_connector_new (); ++ if (connector != NULL) { ++ is_local = ((d->displayType & d_location) == dLocal); +#ifdef XDMCP -+ if ((d->displayType & d_location) != dLocal && d->remoteHost) -+ remote_host_name = &(d->remoteHost); -+ else -+ remote_host_name = &empty_hostname; ++ if (!is_local && d->remoteHost) ++ remote_host_name = d->remoteHost; +#endif -+ -+ if (connector != NULL) { ++ + dbus_error_init (&error); + if ( !(ck_connector_open_session_with_parameters (connector, -+ &error, "unix-user", &(pwent->pw_uid), ++ &error, "unix-user", &(pwent->pw_uid), + "display-device", &device, + "x11-display", &(d->name), -+ "is-local", ((d->displayType & d_location) == dLocal), ++ "is-local", &is_local, +#ifdef XDMCP -+ "remote-host-name", remote_host_name, ++ "remote-host-name", &remote_host_name, +#endif + NULL))) { + if (dbus_error_is_set (&error)) { @@ -255,7 +254,7 @@ logError( "Client start failed\n" ); sessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */ } -@@ -650,6 +721,23 @@ +@@ -650,6 +720,23 @@ catchTerm( SIGTERM ); } } From fedora-extras-commits at redhat.com Tue Jul 15 02:51:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 02:51:44 GMT Subject: rpms/bzr-gtk/devel bzr-gtk.spec,1.31,1.32 Message-ID: <200807150251.m6F2piFA001797@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585 Modified Files: bzr-gtk.spec Log Message: * Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 - Add upstream patch to fix a traceback when using log in olive. Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- bzr-gtk.spec 30 May 2008 17:00:01 -0000 1.31 +++ bzr-gtk.spec 15 Jul 2008 02:50:54 -0000 1.32 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -23,6 +23,8 @@ Patch2: bzr-gtk-nautilus-setup.patch # https://bugs.launchpad.net/bzr-gtk/+bug/228922 Patch3: bzr-gtk-more-better-seahorse-dbus-check.patch +# From upstream +Patch4: bzr-gtk-ghost-keyerror.patch %if 0%{?fedora} <= 7 # In EL-5 and Fedora < 7 Encoding was a mandatory field. Now it's deprecated. Patch100: bzr-gtk-el5-encoding.patch @@ -70,6 +72,7 @@ %patch1 -p1 -b .nautilusdisable %patch2 -p1 -b .nautilusinstall %patch3 -p0 -b .seahorse-fix +%patch4 -p1 -b .ghost %if 0%{?fedora} <= 7 # EPEL 5 and Fedora <= 7 @@ -124,6 +127,9 @@ %endif %changelog +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +- Add upstream patch to fix a traceback when using log in olive. + * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse isn't present. launchpad #228922. From fedora-extras-commits at redhat.com Tue Jul 15 02:54:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 02:54:05 GMT Subject: rpms/bzr-gtk/devel bzr-gtk-ghost-keyerror.patch,NONE,1.1 Message-ID: <200807150254.m6F2s5W0002468@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321 Added Files: bzr-gtk-ghost-keyerror.patch Log Message: * Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 - Add upstream patch to fix a traceback when using log in olive. bzr-gtk-ghost-keyerror.patch: --- NEW FILE bzr-gtk-ghost-keyerror.patch --- diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py --- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 +++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 @@ -285,7 +285,7 @@ class TreeView(gtk.VBox): self.branch.lock_read() (linegraphdata, index, columns_len) = linegraph(self.branch.repository, - self.start, + (self.start,), self.maxnum, broken_line_length, show_graph, From fedora-extras-commits at redhat.com Tue Jul 15 02:55:23 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 02:55:23 GMT Subject: rpms/pcmanfm/F-9 pcmanfm-0.4.6.1-debug-warning.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 pcmanfm.spec, 1.19, 1.20 sources, 1.16, 1.17 Message-ID: <200807150255.m6F2tNVI003044@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2616/F-9 Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.4.6.1-debug-warning.patch Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 - 0.4.6.1 - -Werror-implicit-function-declaration is added upstream pcmanfm-0.4.6.1-debug-warning.patch: --- NEW FILE pcmanfm-0.4.6.1-debug-warning.patch --- --- pcmanfm-0.4.6.1/src/compat/glib-utils.c.debug 2008-07-14 10:33:01.000000000 +0900 +++ pcmanfm-0.4.6.1/src/compat/glib-utils.c 2008-07-15 11:43:30.000000000 +0900 @@ -66,6 +66,7 @@ #if ! GLIB_CHECK_VERSION(2, 16, 0) +#include int g_strcmp0(const char *str1, const char *str2) { if( G_UNLIKELY(str1 == str2) ) /* the same string or both NULL */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Jul 2008 18:31:15 -0000 1.16 +++ .cvsignore 15 Jul 2008 02:54:39 -0000 1.17 @@ -1 +1 @@ -pcmanfm-0.4.6.tar.gz +pcmanfm-0.4.6.1.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/pcmanfm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- pcmanfm.spec 14 Jul 2008 18:31:15 -0000 1.19 +++ pcmanfm.spec 15 Jul 2008 02:54:39 -0000 1.20 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6 +Version: 0.4.6.1 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.6-debug-warning.patch +Patch0: pcmanfm-0.4.6.1-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -36,8 +36,6 @@ [A-Z]* %build -export CFLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration" - %configure \ %if %{enable_hal} >= 1 --enable-hal \ @@ -98,8 +96,10 @@ %{_datadir}/mime/packages/*.xml %changelog -* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 +* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 +- 0.4.6.1 +- -Werror-implicit-function-declaration is added upstream * Sat Jun 28 2008 Mamoru Tasaka - 0.4.5-1 - 0.4.5 (remote server access function temporally removed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Jul 2008 18:31:15 -0000 1.16 +++ sources 15 Jul 2008 02:54:39 -0000 1.17 @@ -1 +1 @@ -c250eec3e7ed0eeeece50ba9b9e0c47e pcmanfm-0.4.6.tar.gz +9edb184d0fdc8d5b19eaa66fe026a233 pcmanfm-0.4.6.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 02:55:39 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 02:55:39 GMT Subject: rpms/pcmanfm/F-8 pcmanfm-0.4.6.1-debug-warning.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 pcmanfm.spec, 1.19, 1.20 sources, 1.16, 1.17 Message-ID: <200807150255.m6F2tdpB003106@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2616/F-8 Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.4.6.1-debug-warning.patch Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 - 0.4.6.1 - -Werror-implicit-function-declaration is added upstream pcmanfm-0.4.6.1-debug-warning.patch: --- NEW FILE pcmanfm-0.4.6.1-debug-warning.patch --- --- pcmanfm-0.4.6.1/src/compat/glib-utils.c.debug 2008-07-14 10:33:01.000000000 +0900 +++ pcmanfm-0.4.6.1/src/compat/glib-utils.c 2008-07-15 11:43:30.000000000 +0900 @@ -66,6 +66,7 @@ #if ! GLIB_CHECK_VERSION(2, 16, 0) +#include int g_strcmp0(const char *str1, const char *str2) { if( G_UNLIKELY(str1 == str2) ) /* the same string or both NULL */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Jul 2008 18:31:14 -0000 1.16 +++ .cvsignore 15 Jul 2008 02:54:22 -0000 1.17 @@ -1 +1 @@ -pcmanfm-0.4.6.tar.gz +pcmanfm-0.4.6.1.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/pcmanfm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- pcmanfm.spec 14 Jul 2008 18:31:14 -0000 1.19 +++ pcmanfm.spec 15 Jul 2008 02:54:22 -0000 1.20 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6 +Version: 0.4.6.1 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.6-debug-warning.patch +Patch0: pcmanfm-0.4.6.1-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -36,8 +36,6 @@ [A-Z]* %build -export CFLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration" - %configure \ %if %{enable_hal} >= 1 --enable-hal \ @@ -98,8 +96,10 @@ %{_datadir}/mime/packages/*.xml %changelog -* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 +* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 +- 0.4.6.1 +- -Werror-implicit-function-declaration is added upstream * Sat Jun 28 2008 Mamoru Tasaka - 0.4.5-1 - 0.4.5 (remote server access function temporally removed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Jul 2008 18:31:14 -0000 1.16 +++ sources 15 Jul 2008 02:54:22 -0000 1.17 @@ -1 +1 @@ -c250eec3e7ed0eeeece50ba9b9e0c47e pcmanfm-0.4.6.tar.gz +9edb184d0fdc8d5b19eaa66fe026a233 pcmanfm-0.4.6.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 02:55:42 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 02:55:42 GMT Subject: rpms/pcmanfm/devel pcmanfm-0.4.6.1-debug-warning.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 pcmanfm.spec, 1.19, 1.20 sources, 1.16, 1.17 Message-ID: <200807150255.m6F2tg2Q003128@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2616/devel Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.4.6.1-debug-warning.patch Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 - 0.4.6.1 - -Werror-implicit-function-declaration is added upstream pcmanfm-0.4.6.1-debug-warning.patch: --- NEW FILE pcmanfm-0.4.6.1-debug-warning.patch --- --- pcmanfm-0.4.6.1/src/compat/glib-utils.c.debug 2008-07-14 10:33:01.000000000 +0900 +++ pcmanfm-0.4.6.1/src/compat/glib-utils.c 2008-07-15 11:43:30.000000000 +0900 @@ -66,6 +66,7 @@ #if ! GLIB_CHECK_VERSION(2, 16, 0) +#include int g_strcmp0(const char *str1, const char *str2) { if( G_UNLIKELY(str1 == str2) ) /* the same string or both NULL */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Jul 2008 18:31:18 -0000 1.16 +++ .cvsignore 15 Jul 2008 02:54:53 -0000 1.17 @@ -1 +1 @@ -pcmanfm-0.4.6.tar.gz +pcmanfm-0.4.6.1.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- pcmanfm.spec 14 Jul 2008 18:31:18 -0000 1.19 +++ pcmanfm.spec 15 Jul 2008 02:54:53 -0000 1.20 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6 +Version: 0.4.6.1 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.6-debug-warning.patch +Patch0: pcmanfm-0.4.6.1-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -36,8 +36,6 @@ [A-Z]* %build -export CFLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration" - %configure \ %if %{enable_hal} >= 1 --enable-hal \ @@ -98,8 +96,10 @@ %{_datadir}/mime/packages/*.xml %changelog -* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6-1 +* Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 +- 0.4.6.1 +- -Werror-implicit-function-declaration is added upstream * Sat Jun 28 2008 Mamoru Tasaka - 0.4.5-1 - 0.4.5 (remote server access function temporally removed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Jul 2008 18:31:18 -0000 1.16 +++ sources 15 Jul 2008 02:54:53 -0000 1.17 @@ -1 +1 @@ -c250eec3e7ed0eeeece50ba9b9e0c47e pcmanfm-0.4.6.tar.gz +9edb184d0fdc8d5b19eaa66fe026a233 pcmanfm-0.4.6.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 02:55:58 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Tue, 15 Jul 2008 02:55:58 GMT Subject: rpms/publican/F-8 publican.spec,1.3,1.4 Message-ID: <200807150255.m6F2twIs003204@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2841 Modified Files: publican.spec Log Message: change kds reqs to pull in smaller set tools Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-8/publican.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- publican.spec 7 Apr 2008 23:30:58 -0000 1.3 +++ publican.spec 15 Jul 2008 02:55:07 -0000 1.4 @@ -3,7 +3,7 @@ Name: publican Summary: Common files and scripts for publishing Documentation Version: 0.33 -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2+ and GFDL # The following directories are licensed under the GFDL: # content @@ -13,9 +13,11 @@ Buildarch: noarch Source: http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz # need kdesdk for po2xml & xml2pot -Requires: gettext libxslt kdesdk perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks -BuildRequires: gettext libxslt kdesdk perl(XML::TreeBuilder) docbook-style-xsl +Requires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks +Requires: %{_bindir}/xml2pot %{_bindir}/po2xml +BuildRequires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl BuildRequires: desktop-file-utils +BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml URL: https://fedorahosted.org/publican Obsoletes: documentation-devel < 0.26-3 Obsoletes: perl-SGML-Translate <= 0.37-3 @@ -82,6 +84,9 @@ %doc fdl.txt %changelog +* Tue Jul 15 2008 Jeff Fearn 0.33-1 +- Change kde reqs to a more portable format + * Mon Apr 7 2008 Jeff Fearn 0.33-0 - Remove release from package name in html desktop spec file - Removed --nonet from xsltproc call BZ #436342 From fedora-extras-commits at redhat.com Tue Jul 15 02:57:04 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Tue, 15 Jul 2008 02:57:04 GMT Subject: rpms/rb_libtorrent/devel .cvsignore, 1.4, 1.5 rb_libtorrent.spec, 1.10, 1.11 sources, 1.4, 1.5 rb_libtorrent-gcc43.patch, 1.1, NONE Message-ID: <200807150257.m6F2v4CZ003761@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/rb_libtorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3284 Modified Files: .cvsignore rb_libtorrent.spec sources Removed Files: rb_libtorrent-gcc43.patch Log Message: Update to 0.13.1 (incompatible API/ABI bump!); drop upstreamed fixes; disable examples due to build failures. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Feb 2008 07:00:08 -0000 1.4 +++ .cvsignore 15 Jul 2008 02:56:14 -0000 1.5 @@ -1 +1 @@ -libtorrent-0.12.1.tar.gz +libtorrent-rasterbar-0.13.1.tar.gz Index: rb_libtorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rb_libtorrent.spec 15 Feb 2008 07:00:08 -0000 1.10 +++ rb_libtorrent.spec 15 Jul 2008 02:56:14 -0000 1.11 @@ -1,5 +1,5 @@ Name: rb_libtorrent -Version: 0.12.1 +Version: 0.13.1 Release: 1%{?dist} Summary: A C++ BitTorrent library aiming to be the best alternative @@ -7,15 +7,14 @@ License: BSD URL: http://www.rasterbar.com/products/libtorrent/ -Source0: http://www.libtorrent.org/libtorrent-%{version}.tar.gz +Source0: http://www.libtorrent.org/libtorrent-rasterbar-%{version}.tar.gz Source1: %{name}-README-renames.Fedora Source2: %{name}-COPYING.Boost Source3: %{name}-COPYING.zlib -Patch0: %{name}-gcc43.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: asio-devel BuildRequires: boost-devel BuildRequires: zlib-devel BuildRequires: libtool @@ -38,7 +37,7 @@ License: BSD and zlib/libpng License and Boost Software License Requires: %{name} = %{version}-%{release} Requires: pkgconfig -## Same pkgconfig file, and unsuffixed shared library symlink. :( +## Same include directory. :( Conflicts: libtorrent-devel ## Needed for various headers used via #include directives... Requires: boost-devel @@ -55,26 +54,22 @@ a given source or header file is released under. -%package examples -Summary: Example clients using %{name} -Group: Applications/Internet -License: BSD -Requires: %{name} = %{version}-%{release} -%description examples -The %{name}-examples package contains example clients which intend to -show how to make use of its various features. (Due to potential -namespace conflicts, a couple of the examples had to be renamed. See the -included documentation for more details.) +#package examples +#Summary: Example clients using %{name} +#Group: Applications/Internet +#License: BSD +#Requires: %{name} = %{version}-%{release} + +#description examples +#The %{name}-examples package contains example clients which intend to +#show how to make use of its various features. (Due to potential +#namespace conflicts, a couple of the examples had to be renamed. See the +#included documentation for more details.) %prep -%setup -q -n "libtorrent-%{version}" -%patch0 -p0 -b .gcc43 -## Some of the sources and docs are executable, which makes rpmlint against -## the resulting -debuginfo and -devel packages, respectively, quite angry. :] -find src/ docs/ -type f -exec chmod a-x '{}' \; -find . -type f -regex '.*\.[hc]pp' -exec chmod a-x '{}' \; +%setup -q -n "libtorrent-rasterbar-%{version}" ## The RST files are the sources used to create the final HTML files; and are ## not needed. rm -f docs/*.rst @@ -82,18 +77,24 @@ install -p -m 0644 COPYING COPYING.BSD install -p -m 0644 %{SOURCE2} COPYING.Boost install -p -m 0644 %{SOURCE3} COPYING.zlib -## Fix the installed pkgconfig file: we don't need linkage that the -## libtorrent DSO already ensures. -sed -i -e 's/^Libs:.*$/Libs: -L${libdir} -ltorrent/' libtorrent.pc.in +## Finally, ensure that everything is UTF-8, as it should be. +iconv -t UTF-8 -f ISO_8859-15 AUTHORS -o AUTHORS.iconv +mv AUTHORS.iconv AUTHORS %build -%configure --disable-static --enable-examples --with-zlib=system \ - --with-boost-date-time=boost_date_time-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-regex=boost_regex-mt \ - --with-boost-program_options=boost_program_options-mt +## XXX: Even with the --with-asio=system configure option, the stuff in +## the local include directory overrides that of the system. We don't like +## local copies of system code. :) +rm -rf include/libtorrent/asio* +## FIXME: The examples currently fail to build (missing Makefile.in) +%configure --disable-static --with-zlib=system \ + --with-boost-date-time=mt \ + --with-boost-thread=mt \ + --with-boost-regex=mt \ + --with-boost-program_options=mt \ + --with-boost-filesystem=mt \ + --with-asio=system ## Use the system libtool to ensure that we don't get unnecessary RPATH ## hacks in our final build. make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool @@ -127,7 +128,7 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %exclude %{_libdir}/*.la -%{_libdir}/libtorrent-%{version}.so +%{_libdir}/libtorrent-rasterbar.so.* ## Unfortunately (even with the "--disable-static" option to the %%configure ## invocation) our use of the system libtool creates static libraries at build ## time, so we must exclude them here. @@ -136,16 +137,26 @@ %files devel %defattr(-,root,root,-) %doc COPYING.Boost COPYING.BSD COPYING.zlib docs/ -%{_libdir}/pkgconfig/libtorrent.pc +%{_libdir}/pkgconfig/libtorrent-rasterbar.pc %{_includedir}/libtorrent/ -%{_libdir}/libtorrent.so +%{_libdir}/libtorrent-rasterbar.so -%files examples -%doc COPYING README-renames.Fedora -%{_bindir}/*torrent* +## Build failures... +#files examples +#doc COPYING README-renames.Fedora +#{_bindir}/*torrent* %changelog +* Mon Jul 14 2008 Peter Gordon - 0.13.1-1 +- Update to new upstream release (0.13.1): Contains an incompatible ABI/API + bump. +- Drop GCC 4.3 patch (fixed upstream): + - gcc43.patch +- Disable building the examples for now. (Attempted builds fail due to missing + Makefile support.) +- Drop the source permissions and pkgconfig file tweaks (fixed upstream). + * Sat Feb 09 2008 Peter Gordon - 0.12.1-1 - Update to new upstream bug-fix release (0.12.1) - Rebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Feb 2008 07:00:08 -0000 1.4 +++ sources 15 Jul 2008 02:56:14 -0000 1.5 @@ -1 +1 @@ -1be3c3751673f751015b260836437f2e libtorrent-0.12.1.tar.gz +9d6b112fedc5861402647ff72e95dba0 libtorrent-rasterbar-0.13.1.tar.gz --- rb_libtorrent-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 02:57:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 02:57:19 GMT Subject: rpms/bzr-gtk/F-8 bzr-gtk-ghost-keyerror.patch, NONE, 1.1 bzr-gtk.spec, 1.17, 1.18 Message-ID: <200807150257.m6F2vJCE003916@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3212/F-8 Modified Files: bzr-gtk.spec Added Files: bzr-gtk-ghost-keyerror.patch Log Message: * Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 - Add upstream patch to fix a traceback when using log in olive. bzr-gtk-ghost-keyerror.patch: --- NEW FILE bzr-gtk-ghost-keyerror.patch --- diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py --- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 +++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 @@ -285,7 +285,7 @@ class TreeView(gtk.VBox): self.branch.lock_read() (linegraphdata, index, columns_len) = linegraph(self.branch.repository, - self.start, + (self.start,), self.maxnum, broken_line_length, show_graph, Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bzr-gtk.spec 30 May 2008 16:59:16 -0000 1.17 +++ bzr-gtk.spec 15 Jul 2008 02:56:31 -0000 1.18 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -23,6 +23,8 @@ Patch2: bzr-gtk-nautilus-setup.patch # https://bugs.launchpad.net/bzr-gtk/+bug/228922 Patch3: bzr-gtk-more-better-seahorse-dbus-check.patch +# From upstream +Patch4: bzr-gtk-ghost-keyerror.patch %if 0%{?fedora} <= 7 # In EL-5 and Fedora < 7 Encoding was a mandatory field. Now it's deprecated. Patch100: bzr-gtk-el5-encoding.patch @@ -70,6 +72,7 @@ %patch1 -p1 -b .nautilusdisable %patch2 -p1 -b .nautilusinstall %patch3 -p0 -b .seahorse-fix +%patch4 -p1 -b .ghost %if 0%{?fedora} <= 7 # EPEL 5 and Fedora <= 7 @@ -124,6 +127,9 @@ %endif %changelog +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +- Add upstream patch to fix a traceback when using log in olive. + * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse isn't present. launchpad #228922. From fedora-extras-commits at redhat.com Tue Jul 15 02:57:31 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 02:57:31 GMT Subject: rpms/bzr-gtk/EL-5 bzr-gtk-ghost-keyerror.patch, NONE, 1.1 bzr-gtk.spec, 1.17, 1.18 Message-ID: <200807150257.m6F2vVPw003989@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3212/EL-5 Modified Files: bzr-gtk.spec Added Files: bzr-gtk-ghost-keyerror.patch Log Message: * Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 - Add upstream patch to fix a traceback when using log in olive. bzr-gtk-ghost-keyerror.patch: --- NEW FILE bzr-gtk-ghost-keyerror.patch --- diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py --- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 +++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 @@ -285,7 +285,7 @@ class TreeView(gtk.VBox): self.branch.lock_read() (linegraphdata, index, columns_len) = linegraph(self.branch.repository, - self.start, + (self.start,), self.maxnum, broken_line_length, show_graph, Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bzr-gtk.spec 30 May 2008 16:58:34 -0000 1.17 +++ bzr-gtk.spec 15 Jul 2008 02:56:10 -0000 1.18 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -23,6 +23,8 @@ Patch2: bzr-gtk-nautilus-setup.patch # https://bugs.launchpad.net/bzr-gtk/+bug/228922 Patch3: bzr-gtk-more-better-seahorse-dbus-check.patch +# From upstream +Patch4: bzr-gtk-ghost-keyerror.patch %if 0%{?fedora} <= 7 # In EL-5 and Fedora < 7 Encoding was a mandatory field. Now it's deprecated. Patch100: bzr-gtk-el5-encoding.patch @@ -70,6 +72,7 @@ %patch1 -p1 -b .nautilusdisable %patch2 -p1 -b .nautilusinstall %patch3 -p0 -b .seahorse-fix +%patch4 -p1 -b .ghost %if 0%{?fedora} <= 7 # EPEL 5 and Fedora <= 7 @@ -124,6 +127,9 @@ %endif %changelog +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +- Add upstream patch to fix a traceback when using log in olive. + * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse isn't present. launchpad #228922. From fedora-extras-commits at redhat.com Tue Jul 15 02:57:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 02:57:41 GMT Subject: rpms/bzr-gtk/F-9 bzr-gtk-ghost-keyerror.patch, NONE, 1.1 bzr-gtk.spec, 1.18, 1.19 Message-ID: <200807150257.m6F2vfv1004030@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3212/F-9 Modified Files: bzr-gtk.spec Added Files: bzr-gtk-ghost-keyerror.patch Log Message: * Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 - Add upstream patch to fix a traceback when using log in olive. bzr-gtk-ghost-keyerror.patch: --- NEW FILE bzr-gtk-ghost-keyerror.patch --- diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py --- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 +++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 @@ -285,7 +285,7 @@ class TreeView(gtk.VBox): self.branch.lock_read() (linegraphdata, index, columns_len) = linegraph(self.branch.repository, - self.start, + (self.start,), self.maxnum, broken_line_length, show_graph, Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bzr-gtk.spec 30 May 2008 16:59:46 -0000 1.18 +++ bzr-gtk.spec 15 Jul 2008 02:56:49 -0000 1.19 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -23,6 +23,8 @@ Patch2: bzr-gtk-nautilus-setup.patch # https://bugs.launchpad.net/bzr-gtk/+bug/228922 Patch3: bzr-gtk-more-better-seahorse-dbus-check.patch +# From upstream +Patch4: bzr-gtk-ghost-keyerror.patch %if 0%{?fedora} <= 7 # In EL-5 and Fedora < 7 Encoding was a mandatory field. Now it's deprecated. Patch100: bzr-gtk-el5-encoding.patch @@ -70,6 +72,7 @@ %patch1 -p1 -b .nautilusdisable %patch2 -p1 -b .nautilusinstall %patch3 -p0 -b .seahorse-fix +%patch4 -p1 -b .ghost %if 0%{?fedora} <= 7 # EPEL 5 and Fedora <= 7 @@ -124,6 +127,9 @@ %endif %changelog +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +- Add upstream patch to fix a traceback when using log in olive. + * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse isn't present. launchpad #228922. From fedora-extras-commits at redhat.com Tue Jul 15 02:58:55 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Tue, 15 Jul 2008 02:58:55 GMT Subject: rpms/publican/devel publican.spec,1.8,1.9 Message-ID: <200807150258.m6F2wtrv004527@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4151 Modified Files: publican.spec Log Message: kds reqs fix Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- publican.spec 21 May 2008 06:24:37 -0000 1.8 +++ publican.spec 15 Jul 2008 02:58:10 -0000 1.9 @@ -13,10 +13,11 @@ Buildarch: noarch Source: http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz # need kdesdk for po2xml & xml2pot -Requires: gettext libxslt kdesdk perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: gettext libxslt kdesdk perl(XML::TreeBuilder) docbook-style-xsl +Requires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks +Requires: %{_bindir}/xml2pot %{_bindir}/po2xml +BuildRequires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl BuildRequires: desktop-file-utils +BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml URL: https://fedorahosted.org/publican Obsoletes: documentation-devel < 0.26-3 Obsoletes: perl-SGML-Translate <= 0.37-3 @@ -83,8 +84,8 @@ %doc fdl.txt %changelog -* Wed May 21 2008 Jeff Fearn 0.33-1 -- added perl requires +* Tue Jul 15 2008 Jeff Fearn 0.33-1 +- Change kde reqs to a more portable format * Mon Apr 7 2008 Jeff Fearn 0.33-0 - Remove release from package name in html desktop spec file From fedora-extras-commits at redhat.com Tue Jul 15 03:00:51 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 03:00:51 GMT Subject: rpms/bzr-gtk/F-9 bzr-gtk.spec,1.19,1.20 Message-ID: <200807150300.m6F30pg2005226@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4486/F-9 Modified Files: bzr-gtk.spec Log Message: Bump release for forgetting to cvsadd the patch. Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bzr-gtk.spec 15 Jul 2008 02:56:49 -0000 1.19 +++ bzr-gtk.spec 15 Jul 2008 02:59:57 -0000 1.20 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,7 +127,7 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 - Add upstream patch to fix a traceback when using log in olive. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 From fedora-extras-commits at redhat.com Tue Jul 15 03:00:55 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 03:00:55 GMT Subject: rpms/bzr-gtk/EL-5 bzr-gtk.spec,1.18,1.19 Message-ID: <200807150300.m6F30tWv005262@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4486/EL-5 Modified Files: bzr-gtk.spec Log Message: Bump release for forgetting to cvsadd the patch. Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bzr-gtk.spec 15 Jul 2008 02:56:10 -0000 1.18 +++ bzr-gtk.spec 15 Jul 2008 02:59:03 -0000 1.19 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,7 +127,7 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 - Add upstream patch to fix a traceback when using log in olive. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 From fedora-extras-commits at redhat.com Tue Jul 15 03:00:57 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 03:00:57 GMT Subject: rpms/bzr-gtk/F-8 bzr-gtk.spec,1.18,1.19 Message-ID: <200807150300.m6F30vcF005280@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4486/F-8 Modified Files: bzr-gtk.spec Log Message: Bump release for forgetting to cvsadd the patch. Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bzr-gtk.spec 15 Jul 2008 02:56:31 -0000 1.18 +++ bzr-gtk.spec 15 Jul 2008 02:59:25 -0000 1.19 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,7 +127,7 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 - Add upstream patch to fix a traceback when using log in olive. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 From fedora-extras-commits at redhat.com Tue Jul 15 03:01:12 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 03:01:12 GMT Subject: rpms/bzr-gtk/devel bzr-gtk.spec,1.32,1.33 Message-ID: <200807150301.m6F31CjV011943@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4486/devel Modified Files: bzr-gtk.spec Log Message: Bump release for forgetting to cvsadd the patch. Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- bzr-gtk.spec 15 Jul 2008 02:50:54 -0000 1.32 +++ bzr-gtk.spec 15 Jul 2008 03:00:21 -0000 1.33 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,7 +127,7 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-3 +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 - Add upstream patch to fix a traceback when using log in olive. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 From fedora-extras-commits at redhat.com Tue Jul 15 03:06:11 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Tue, 15 Jul 2008 03:06:11 GMT Subject: rpms/publican/devel publican.spec,1.9,1.10 Message-ID: <200807150306.m6F36Blv013521@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13154 Modified Files: publican.spec Log Message: bump rev num Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- publican.spec 15 Jul 2008 02:58:10 -0000 1.9 +++ publican.spec 15 Jul 2008 03:05:23 -0000 1.10 @@ -3,7 +3,7 @@ Name: publican Summary: Common files and scripts for publishing Documentation Version: 0.33 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and GFDL # The following directories are licensed under the GFDL: # content @@ -84,6 +84,9 @@ %doc fdl.txt %changelog +* Tue Jul 15 2008 Jeff Fearn 0.33-2 +- Rebuild + * Tue Jul 15 2008 Jeff Fearn 0.33-1 - Change kde reqs to a more portable format From fedora-extras-commits at redhat.com Tue Jul 15 04:08:22 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 15 Jul 2008 04:08:22 GMT Subject: rpms/perl-XML-Stream/devel perl-XML-Stream.spec,1.5,1.6 Message-ID: <200807150408.m6F48MFK030976@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30759 Modified Files: perl-XML-Stream.spec Log Message: * Mon Jul 14 2008 Chris Weyl 1.22-8 - add IO::Socket::SSL as a BR/R (see BZ#455344) - also add Net::DNS - make tests run if --with network-tests - misc spec touchups Index: perl-XML-Stream.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/devel/perl-XML-Stream.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-XML-Stream.spec 8 Feb 2008 01:19:10 -0000 1.5 +++ perl-XML-Stream.spec 15 Jul 2008 04:07:28 -0000 1.6 @@ -1,8 +1,6 @@ -# $Id$ - Name: perl-XML-Stream Version: 1.22 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML::Stream - streaming XML library Group: Development/Libraries @@ -11,13 +9,20 @@ Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/XML-Stream-%{version}.tar.gz Source1: LICENSING.correspondance Patch0: tests.patch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl, perl(Authen::SASL), perl(MIME::Base64) +BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(Net::DNS) +BuildRequires: perl(Authen::SASL) +BuildRequires: perl(MIME::Base64) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(IO::Socket::SSL) +Requires: perl(Net::DNS) +# also pulled in via a 'requires' construct; but not yet in Fedora +#Requires: perl(HTTP::ProxyAutoConfig) %description This module provides the user with methods to connect to a remote server, @@ -43,7 +48,7 @@ cp %{SOURCE1} . # generate our other two licenses... -perldoc perlgpl > LICENSE.GPL +perldoc perlgpl > LICENSE.GPL perldoc perlartistic > LICENSE.Artistic %build @@ -54,16 +59,17 @@ %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} + find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* + +%{_fixperms} %{buildroot}/* -#%check -# builders are (or may be) firewalled -#make test +%check +%{?_with_network_tests: make test} +rm -rf t/lib %clean rm -rf %{buildroot} @@ -71,12 +77,18 @@ %files %defattr(-,root,root,-) -%doc CHANGES README INFO LICENSE.* LICENSING* +%doc CHANGES README INFO LICENSE.* LICENSING* t/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Mon Jul 14 2008 Chris Weyl 1.22-8 +- add IO::Socket::SSL as a BR/R (see BZ#455344) +- also add Net::DNS +- make tests run if --with network-tests +- misc spec touchups + * Thu Feb 7 2008 Tom "spot" Callaway 1.22-7 - rebuild for new perl From fedora-extras-commits at redhat.com Tue Jul 15 04:09:06 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 04:09:06 GMT Subject: rpms/cairo-dock/F-8 .cvsignore, 1.6, 1.7 cairo-dock.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200807150409.m6F496wD031159@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953/F-8 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 - 1.6.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Jun 2008 06:21:58 -0000 1.6 +++ .cvsignore 15 Jul 2008 04:08:15 -0000 1.7 @@ -1 +1 @@ -cairo-dock-sources-20080621.tar.bz2 +cairo-dock-sources-1.6.1.1.tar Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cairo-dock.spec 3 Jul 2008 04:31:06 -0000 1.12 +++ cairo-dock.spec 15 Jul 2008 04:08:15 -0000 1.13 @@ -3,12 +3,20 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver 20080621 -%define mainver 1.6.0.2 +%define tarballver svn1203_trunk +%define mainver 1.6.1.1 %define build_gecko 1 -%define fedora_rel 1.date%{tarballver} +#%%define fedora_rel 1.%{tarballver} +%define fedora_rel 1 + + +%define released 1 +# released tarball does not ship weblets +%if 0%{?released} >= 1 +%define build_gecko 0 +%endif %if 0%{?fedora} >= 9 @@ -20,16 +28,14 @@ Name: cairo-dock Version: %{mainver} -Release: %{fedora_rel}%{?dist}.1 +Release: %{fedora_rel}%{?dist} Summary: Light eye-candy fully themable animated dock Group: User Interface/Desktops License: GPLv3+ URL: http://www.cairo-dock.org/ -Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 -Patch0: cairo-dock-fix-insecure-tmpfile.patch -# Revert this part because this seems to be breaking rootwin -Patch1: cairo-dock-1.6.0.1-rootwin-destroying.patch +#Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 +Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -85,7 +91,7 @@ Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %if %{build_gecko} == 0 -Obsoletes: %{name}-plug-ins-gecko < 1.5.5.4-4 +Obsoletes: %{name}-plug-ins-gecko < %{version}-%{release} %endif %description plug-ins @@ -129,13 +135,22 @@ %prep %setup -q -c + +### +### ???? +%if 0%{released} > 0 +for f in *bz2 ; do tar xjf $f ; done +%{__ln_s} -f cairo-dock-%{version} cairo-dock +%{__ln_s} -f cairo-dock-plugins-%{version} plug-ins +%{__ln_s} -f cairo-dock-themes-%{version} themes +%endif +### +### + find . -type d -name \.svn | sort -r | xargs %{__rm} -rf find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf pushd . -%patch0 -p1 -b .tmpuse -%patch1 -p0 -b .rootwin -R - # A. main cd cairo-dock # temporary fix @@ -170,7 +185,9 @@ # # permission +%if 0%{?released} < 1 %{__chmod} 0644 Applets.stable +%endif find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 # mail: license conflict @@ -181,21 +198,43 @@ # weblets %if %{build_gecko} > 0 -%if 0%{?fedora} < 9 cd weblets/ %{__sed} -i.gecko \ - -e 's|mozilla-gtkmozembed|firefox-gtkmozembed|' \ +%if 0%{?fedora} < 9 + -e 's|xulrunner-gtkmozembed|firefox-gtkmozembed|' \ +%else + -e 's|xulrunner-gtkmozembed|mozilla-gtkmozembed|' \ +%endif configure.ac + +## NEED INVESTIGATING +sed -i.dir \ + -e 's|docshell/nsIScrollable.h|nsIScrollable.h|' \ + src/applet-widget-itf.cpp + cd .. -%endif %else %{__rm} -rf weblets/ %endif # temporary fix +# musicplayer +%if 0%{?released} < 1 +cd musicplayer/ +sed -i.po -e '\|po/Makefile|d' configure.ac +sed -i -e '/ALL_LINGUAS/d' configure.ac +sed -i -e '/GETTEXT/d' configure.ac +sed -i -e '/INTLTOOL/d' configure.ac +sed -i.lib \ + -e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \ + configure.ac +sed -i.po -e 's|po||' Makefile.am +cd .. +%endif + # First deal with subdirs in topdir configure.ac, then else -Subdirs_1=$(%{__sed} -n '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2) +Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$@p' Makefile.am | sed -e 's|\\$||' | tail -n +2) %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh . eval.sh @@ -312,6 +351,23 @@ %{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh # desktop files +if [ ! -f data/%{name}.desktop ] ; then + cat > data/%{name}.desktop < $TOPDIR/lang-plug-ins.lang @@ -494,6 +560,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 +- 1.6.1.1 + * Thu Jul 3 2008 Mamoru Tasaka - F-8: rebuild against new gecko @@ -502,7 +571,7 @@ * Fri Jun 20 2008 Mamoru Tasaka - 1.6.0.1-2.date20080619 - Revert XCompositeRedirectSubwindows() part in - cairo-dock-X-utilities.c + cairo-dock-X-utilities.c - fixed in rev. 1142 * Thu Jun 19 2008 Mamoru Tasaka - 1.6.0.1-1.date20080619 - 1.6.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Jun 2008 06:21:58 -0000 1.6 +++ sources 15 Jul 2008 04:08:15 -0000 1.7 @@ -1 +1 @@ -5b0affd64320a2903e63f901df4716ef cairo-dock-sources-20080621.tar.bz2 +88dd8c9e8c9ca99b5493ba60e6dd37f8 cairo-dock-sources-1.6.1.1.tar From fedora-extras-commits at redhat.com Tue Jul 15 04:09:20 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 04:09:20 GMT Subject: rpms/cairo-dock/F-9 cairo-dock.spec,1.9,1.10 Message-ID: <200807150409.m6F49Ket031198@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953/F-9 Modified Files: cairo-dock.spec Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 - 1.6.1.1 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cairo-dock.spec 21 Jun 2008 06:22:16 -0000 1.9 +++ cairo-dock.spec 15 Jul 2008 04:08:36 -0000 1.10 @@ -3,19 +3,27 @@ # cd trunk # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . -%define tarballver 20080621 -%define mainver 1.6.0.2 +%define tarballver svn1203_trunk +%define mainver 1.6.1.1 %define build_gecko 1 -%define fedora_rel 1.date%{tarballver} +#%%define fedora_rel 1.%{tarballver} +%define fedora_rel 1 + + +%define released 1 +# released tarball does not ship weblets +%if 0%{?released} >= 1 +%define build_gecko 0 +%endif %if 0%{?fedora} >= 9 %define gecko_ver 1.9 %endif %if 0%{?fedora} == 8 -%define gecko_ver 1.8.1.14 +%define gecko_ver 1.8.1.15 %endif Name: cairo-dock @@ -26,10 +34,8 @@ Group: User Interface/Desktops License: GPLv3+ URL: http://www.cairo-dock.org/ -Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 -Patch0: cairo-dock-fix-insecure-tmpfile.patch -# Revert this part because this seems to be breaking rootwin -Patch1: cairo-dock-1.6.0.1-rootwin-destroying.patch +#Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 +Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -85,7 +91,7 @@ Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %if %{build_gecko} == 0 -Obsoletes: %{name}-plug-ins-gecko < 1.5.5.4-4 +Obsoletes: %{name}-plug-ins-gecko < %{version}-%{release} %endif %description plug-ins @@ -129,13 +135,22 @@ %prep %setup -q -c + +### +### ???? +%if 0%{released} > 0 +for f in *bz2 ; do tar xjf $f ; done +%{__ln_s} -f cairo-dock-%{version} cairo-dock +%{__ln_s} -f cairo-dock-plugins-%{version} plug-ins +%{__ln_s} -f cairo-dock-themes-%{version} themes +%endif +### +### + find . -type d -name \.svn | sort -r | xargs %{__rm} -rf find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf pushd . -%patch0 -p1 -b .tmpuse -%patch1 -p0 -b .rootwin -R - # A. main cd cairo-dock # temporary fix @@ -170,7 +185,9 @@ # # permission +%if 0%{?released} < 1 %{__chmod} 0644 Applets.stable +%endif find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 # mail: license conflict @@ -181,21 +198,43 @@ # weblets %if %{build_gecko} > 0 -%if 0%{?fedora} < 9 cd weblets/ %{__sed} -i.gecko \ - -e 's|mozilla-gtkmozembed|firefox-gtkmozembed|' \ +%if 0%{?fedora} < 9 + -e 's|xulrunner-gtkmozembed|firefox-gtkmozembed|' \ +%else + -e 's|xulrunner-gtkmozembed|mozilla-gtkmozembed|' \ +%endif configure.ac + +## NEED INVESTIGATING +sed -i.dir \ + -e 's|docshell/nsIScrollable.h|nsIScrollable.h|' \ + src/applet-widget-itf.cpp + cd .. -%endif %else %{__rm} -rf weblets/ %endif # temporary fix +# musicplayer +%if 0%{?released} < 1 +cd musicplayer/ +sed -i.po -e '\|po/Makefile|d' configure.ac +sed -i -e '/ALL_LINGUAS/d' configure.ac +sed -i -e '/GETTEXT/d' configure.ac +sed -i -e '/INTLTOOL/d' configure.ac +sed -i.lib \ + -e '/AC_SUBST(pkgdatadir)/s|^\(.*\)$|\1\nlibdir=[`pkg-config cairo-dock --variable=pluginsdir`]\nAC_SUBST(libdir)|' \ + configure.ac +sed -i.po -e 's|po||' Makefile.am +cd .. +%endif + # First deal with subdirs in topdir configure.ac, then else -Subdirs_1=$(%{__sed} -n '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2) +Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$@p' Makefile.am | sed -e 's|\\$||' | tail -n +2) %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh . eval.sh @@ -312,6 +351,23 @@ %{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh # desktop files +if [ ! -f data/%{name}.desktop ] ; then + cat > data/%{name}.desktop < $TOPDIR/lang-plug-ins.lang @@ -494,12 +560,18 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 +- 1.6.1.1 + +* Thu Jul 3 2008 Mamoru Tasaka +- F-8: rebuild against new gecko + * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 * Fri Jun 20 2008 Mamoru Tasaka - 1.6.0.1-2.date20080619 - Revert XCompositeRedirectSubwindows() part in - cairo-dock-X-utilities.c + cairo-dock-X-utilities.c - fixed in rev. 1142 * Thu Jun 19 2008 Mamoru Tasaka - 1.6.0.1-1.date20080619 - 1.6.0.1 From fedora-extras-commits at redhat.com Tue Jul 15 04:09:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 04:09:34 GMT Subject: rpms/cairo-dock/devel cairo-dock.spec,1.61,1.62 Message-ID: <200807150409.m6F49YSW031250@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953/devel Modified Files: cairo-dock.spec Log Message: * Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 - 1.6.1.1 Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- cairo-dock.spec 14 Jul 2008 16:53:21 -0000 1.61 +++ cairo-dock.spec 15 Jul 2008 04:08:50 -0000 1.62 @@ -4,11 +4,19 @@ # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . %define tarballver svn1203_trunk -%define mainver 1.6.1 +%define mainver 1.6.1.1 %define build_gecko 1 -%define fedora_rel 0.1.%{tarballver} +#%%define fedora_rel 1.%{tarballver} +%define fedora_rel 1 + + +%define released 1 +# released tarball does not ship weblets +%if 0%{?released} >= 1 +%define build_gecko 0 +%endif %if 0%{?fedora} >= 9 @@ -26,7 +34,8 @@ Group: User Interface/Desktops License: GPLv3+ URL: http://www.cairo-dock.org/ -Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 +#Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2 +Source0: http://download.berlios.de/cairo-dock/%{name}-sources-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -82,7 +91,7 @@ Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %if %{build_gecko} == 0 -Obsoletes: %{name}-plug-ins-gecko < 1.5.5.4-4 +Obsoletes: %{name}-plug-ins-gecko < %{version}-%{release} %endif %description plug-ins @@ -126,6 +135,18 @@ %prep %setup -q -c + +### +### ???? +%if 0%{released} > 0 +for f in *bz2 ; do tar xjf $f ; done +%{__ln_s} -f cairo-dock-%{version} cairo-dock +%{__ln_s} -f cairo-dock-plugins-%{version} plug-ins +%{__ln_s} -f cairo-dock-themes-%{version} themes +%endif +### +### + find . -type d -name \.svn | sort -r | xargs %{__rm} -rf find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf @@ -164,7 +185,9 @@ # # permission +%if 0%{?released} < 1 %{__chmod} 0644 Applets.stable +%endif find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644 # mail: license conflict @@ -197,6 +220,7 @@ # temporary fix # musicplayer +%if 0%{?released} < 1 cd musicplayer/ sed -i.po -e '\|po/Makefile|d' configure.ac sed -i -e '/ALL_LINGUAS/d' configure.ac @@ -207,9 +231,10 @@ configure.ac sed -i.po -e 's|po||' Makefile.am cd .. +%endif # First deal with subdirs in topdir configure.ac, then else -Subdirs_1=$(%{__sed} -n '\@SUBDIR@,\@^.*[^\\]$@s|\\$||p' Makefile.am | tail -n +2) +Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$@p' Makefile.am | sed -e 's|\\$||' | tail -n +2) %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh . eval.sh @@ -326,6 +351,23 @@ %{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh # desktop files +if [ ! -f data/%{name}.desktop ] ; then + cat > data/%{name}.desktop < $TOPDIR/lang-plug-ins.lang @@ -508,8 +560,11 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Tue Jul 15 2008 Mamoru Tasaka -- rev. 1203 +* Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 +- 1.6.1.1 + +* Thu Jul 3 2008 Mamoru Tasaka +- F-8: rebuild against new gecko * Sat Jun 21 2008 Mamoru Tasaka - 1.6.0.2-1.date20080621 - 1.6.0.2 From fedora-extras-commits at redhat.com Tue Jul 15 04:14:10 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 15 Jul 2008 04:14:10 GMT Subject: rpms/perl-XML-Stream/F-9 perl-XML-Stream.spec,1.5,1.6 Message-ID: <200807150414.m6F4EA0L032125@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31972 Modified Files: perl-XML-Stream.spec Log Message: * Mon Jul 14 2008 Chris Weyl 1.22-8 - add IO::Socket::SSL as a BR/R (see BZ#455344) - also add Net::DNS - make tests run if --with network-tests - misc spec touchups Index: perl-XML-Stream.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/F-9/perl-XML-Stream.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-XML-Stream.spec 8 Feb 2008 01:19:10 -0000 1.5 +++ perl-XML-Stream.spec 15 Jul 2008 04:13:18 -0000 1.6 @@ -1,8 +1,6 @@ -# $Id$ - Name: perl-XML-Stream Version: 1.22 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML::Stream - streaming XML library Group: Development/Libraries @@ -11,13 +9,20 @@ Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/XML-Stream-%{version}.tar.gz Source1: LICENSING.correspondance Patch0: tests.patch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl, perl(Authen::SASL), perl(MIME::Base64) +BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(Net::DNS) +BuildRequires: perl(Authen::SASL) +BuildRequires: perl(MIME::Base64) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(IO::Socket::SSL) +Requires: perl(Net::DNS) +# also pulled in via a 'requires' construct; but not yet in Fedora +#Requires: perl(HTTP::ProxyAutoConfig) %description This module provides the user with methods to connect to a remote server, @@ -43,7 +48,7 @@ cp %{SOURCE1} . # generate our other two licenses... -perldoc perlgpl > LICENSE.GPL +perldoc perlgpl > LICENSE.GPL perldoc perlartistic > LICENSE.Artistic %build @@ -54,16 +59,17 @@ %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} + find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* + +%{_fixperms} %{buildroot}/* -#%check -# builders are (or may be) firewalled -#make test +%check +%{?_with_network_tests: make test} +rm -rf t/lib %clean rm -rf %{buildroot} @@ -71,12 +77,18 @@ %files %defattr(-,root,root,-) -%doc CHANGES README INFO LICENSE.* LICENSING* +%doc CHANGES README INFO LICENSE.* LICENSING* t/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Mon Jul 14 2008 Chris Weyl 1.22-8 +- add IO::Socket::SSL as a BR/R (see BZ#455344) +- also add Net::DNS +- make tests run if --with network-tests +- misc spec touchups + * Thu Feb 7 2008 Tom "spot" Callaway 1.22-7 - rebuild for new perl From fedora-extras-commits at redhat.com Tue Jul 15 04:14:50 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 15 Jul 2008 04:14:50 GMT Subject: rpms/perl-XML-Stream/F-8 perl-XML-Stream.spec,1.4,1.5 Message-ID: <200807150414.m6F4Eooa032317@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32104 Modified Files: perl-XML-Stream.spec Log Message: * Mon Jul 14 2008 Chris Weyl 1.22-8 - add IO::Socket::SSL as a BR/R (see BZ#455344) - also add Net::DNS - make tests run if --with network-tests - misc spec touchups Index: perl-XML-Stream.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/F-8/perl-XML-Stream.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-XML-Stream.spec 17 Oct 2007 04:55:06 -0000 1.4 +++ perl-XML-Stream.spec 15 Jul 2008 04:13:59 -0000 1.5 @@ -1,8 +1,6 @@ -# $Id$ - Name: perl-XML-Stream Version: 1.22 -Release: 6%{?dist}.1 +Release: 8%{?dist} Summary: XML::Stream - streaming XML library Group: Development/Libraries @@ -11,13 +9,20 @@ Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/XML-Stream-%{version}.tar.gz Source1: LICENSING.correspondance Patch0: tests.patch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl, perl(Authen::SASL), perl(MIME::Base64) +BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(Net::DNS) +BuildRequires: perl(Authen::SASL) +BuildRequires: perl(MIME::Base64) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(IO::Socket::SSL) +Requires: perl(Net::DNS) +# also pulled in via a 'requires' construct; but not yet in Fedora +#Requires: perl(HTTP::ProxyAutoConfig) %description This module provides the user with methods to connect to a remote server, @@ -43,7 +48,7 @@ cp %{SOURCE1} . # generate our other two licenses... -perldoc perlgpl > LICENSE.GPL +perldoc perlgpl > LICENSE.GPL perldoc perlartistic > LICENSE.Artistic %build @@ -54,16 +59,17 @@ %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} + find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* +%{_fixperms} %{buildroot}/* -#%check -# builders are (or may be) firewalled -#make test +%check +%{?_with_network_tests: make test} + +rm -rf t/lib %clean rm -rf %{buildroot} @@ -71,12 +77,21 @@ %files %defattr(-,root,root,-) -%doc CHANGES README INFO LICENSE.* LICENSING* +%doc CHANGES README INFO LICENSE.* LICENSING* t/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Mon Jul 14 2008 Chris Weyl 1.22-8 +- add IO::Socket::SSL as a BR/R (see BZ#455344) +- also add Net::DNS +- make tests run if --with network-tests +- misc spec touchups + +* Thu Feb 7 2008 Tom "spot" Callaway 1.22-7 +- rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway 1.22-6.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Tue Jul 15 04:23:53 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 04:23:53 GMT Subject: rpms/cairo-dock/F-9 .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200807150423.m6F4NrrS001731@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1521/F-9 Modified Files: .cvsignore sources Log Message: orz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Jun 2008 06:22:16 -0000 1.6 +++ .cvsignore 15 Jul 2008 04:23:06 -0000 1.7 @@ -1 +1 @@ -cairo-dock-sources-20080621.tar.bz2 +cairo-dock-sources-1.6.1.1.tar Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Jun 2008 06:22:16 -0000 1.6 +++ sources 15 Jul 2008 04:23:06 -0000 1.7 @@ -1 +1 @@ -5b0affd64320a2903e63f901df4716ef cairo-dock-sources-20080621.tar.bz2 +88dd8c9e8c9ca99b5493ba60e6dd37f8 cairo-dock-sources-1.6.1.1.tar From fedora-extras-commits at redhat.com Tue Jul 15 04:24:06 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 04:24:06 GMT Subject: rpms/cairo-dock/devel .cvsignore,1.47,1.48 sources,1.47,1.48 Message-ID: <200807150424.m6F4O6P3001767@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1521/devel Modified Files: .cvsignore sources Log Message: orz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 14 Jul 2008 16:53:21 -0000 1.47 +++ .cvsignore 15 Jul 2008 04:23:23 -0000 1.48 @@ -1 +1 @@ -cairo-dock-sources-svn1203_trunk.tar.bz2 +cairo-dock-sources-1.6.1.1.tar Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 14 Jul 2008 16:53:21 -0000 1.47 +++ sources 15 Jul 2008 04:23:23 -0000 1.48 @@ -1 +1 @@ -03f4f1a745f6bb0093d5362641cac53e cairo-dock-sources-svn1203_trunk.tar.bz2 +88dd8c9e8c9ca99b5493ba60e6dd37f8 cairo-dock-sources-1.6.1.1.tar From fedora-extras-commits at redhat.com Tue Jul 15 04:32:16 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Tue, 15 Jul 2008 04:32:16 GMT Subject: rpms/zhcon/devel import.log, NONE, 1.1 zhcon-0.2.6-gcc43.patch, NONE, 1.1 zhcon-0.2.6-keyswitch.patch, NONE, 1.1 zhcon-0.2.6-locale.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zhcon-0.2.6-flags.patch, 1.1, 1.2 zhcon-0.2.6-path-define.patch, 1.1, 1.2 zhcon.spec, 1.7, 1.8 zhcon-0.2.6-64bit-fix.patch, 1.1, NONE zhcon-0.2.6-path.patch, 1.1, NONE zhcon-0.2.6.gcc43.patch, 1.2, NONE Message-ID: <200807150432.m6F4WGpW004006@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/zhcon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3690/devel Modified Files: .cvsignore sources zhcon-0.2.6-flags.patch zhcon-0.2.6-path-define.patch zhcon.spec Added Files: import.log zhcon-0.2.6-gcc43.patch zhcon-0.2.6-keyswitch.patch zhcon-0.2.6-locale.patch Removed Files: zhcon-0.2.6-64bit-fix.patch zhcon-0.2.6-path.patch zhcon-0.2.6.gcc43.patch Log Message: Fix Bug 441203,449625,454228 --- NEW FILE import.log --- zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288 zhcon-0.2.6-gcc43.patch: --- NEW FILE zhcon-0.2.6-gcc43.patch --- diff -up ./src/basefont.cpp.gcc43 ./src/basefont.cpp --- ./src/basefont.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/basefont.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -24,6 +24,7 @@ #include #include #include +#include #include "global.h" #include "debug.h" #include "hzdecoder.h" diff -up ./src/big5decoder.cpp.gcc43 ./src/big5decoder.cpp --- ./src/big5decoder.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 +++ ./src/big5decoder.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -27,7 +27,8 @@ bool BIG5Decoder::IsCode1(char c) { } bool BIG5Decoder::IsCode2(char c) { - return c >= 40 && c <= 0xff; +// return c >= 40 && c <= 0xff; + return c>=40; } unsigned int BIG5Decoder::Index(char c1, char c2) { diff -up ./src/display/fblinear16.cpp.gcc43 ./src/display/fblinear16.cpp --- ./src/display/fblinear16.cpp.gcc43 2006-04-25 02:38:24.000000000 +1000 +++ ./src/display/fblinear16.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -86,7 +86,8 @@ void FBLinear16::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/2; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } if (width & 1) { dest16 = (__u16*)dest32; diff -up ./src/display/fblinear24.cpp.gcc43 ./src/display/fblinear24.cpp --- ./src/display/fblinear24.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear24.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -136,19 +136,25 @@ void FBLinear24::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/4; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } if (width & 2) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); + fb_writew(fb_readw(dest16) ^ 0xffff, dest16); + dest16++; dest32 = (__u32*)dest16; } if (width & 1) { dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); + fb_writew(fb_readw(dest16) ^ 0xffff, dest16); + dest16++; dest8 = (__u8*)dest16; fb_writeb(fb_readb(dest8) ^ 0xff, dest8); } diff -up ./src/display/fblinear32.cpp.gcc43 ./src/display/fblinear32.cpp --- ./src/display/fblinear32.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear32.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -74,7 +74,8 @@ void FBLinear32::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } } } diff -up ./src/display/fblinear4.cpp.gcc43 ./src/display/fblinear4.cpp --- ./src/display/fblinear4.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear4.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -19,6 +19,7 @@ #include #include +#include #include "global.h" #include "fblinear4.h" diff -up ./src/display/fblinear8.cpp.gcc43 ./src/display/fblinear8.cpp --- ./src/display/fblinear8.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear8.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -19,6 +19,7 @@ #include #include +#include #include "global.h" #include "fblinear8.h" @@ -63,11 +64,13 @@ void FBLinear8::RevRect(int x1,int y1,in for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/4; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32++); + fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32); + dest32++; } if (width & 2) { dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16++); + fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16); + dest16++; dest32 = (__u32*)dest16; } if (width & 1) { diff -up ./src/display/fbvgaplanes.cpp.gcc43 ./src/display/fbvgaplanes.cpp --- ./src/display/fbvgaplanes.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fbvgaplanes.cpp 2008-07-15 12:53:18.000000000 +1000 @@ -22,6 +22,7 @@ #ifdef USING_VGA #include #include +#include #include "debug.h" #include "fbvgaplanes.h" diff -up ./src/encfilter.c.gcc43 ./src/encfilter.c --- ./src/encfilter.c.gcc43 2006-04-29 05:09:33.000000000 +1000 +++ ./src/encfilter.c 2008-07-15 12:31:16.000000000 +1000 @@ -37,6 +37,7 @@ #include #include #include +#include #include "encfilter.h" @@ -46,7 +47,9 @@ #error ICONV_CONST not defined #endif /* ICONV_CONST */ -#define BUFSIZ 8192 +#ifndef BUFSIZ +# define BUFSIZ 8192 +#endif int UseEncodingFilter; /* use filter such as UTF-8 */ char EncodingFilterBuff[BUFSIZ]; /* global buffer used by ConsoleHandler() and TextCopy() */ size_t EncodingFilterLen; diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp --- ./src/gbkdecoder.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/gbkdecoder.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -27,13 +27,15 @@ bool GBKDecoder::IsCode1(char c) { } bool GBKDecoder::IsCode2(char c) { - return c >= 0x40 && c <= 0xff; +// return c >= 0x40 && c <= 0xff; + return c>=0x40; } unsigned int GBKDecoder::Index(char c1, char c2) { int n; n = (c1 - 0x81) * 192; - if (c2 <= 0xff && c2 >= 0x40) + // if (c2 <= 0xff && c2 >= 0x40) + if (c2 >= 0x40) n += (c2 - 0x40); return n; } diff -up ./src/graphdev.cpp.gcc43 ./src/graphdev.cpp --- ./src/graphdev.cpp.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/graphdev.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -20,12 +20,14 @@ #include #endif +#include #include #include #include #include #include #include +#include #include "debug.h" #include "display/fbdev.h" diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c --- ./src/iconv_string.c.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/iconv_string.c 2008-07-15 12:31:16.000000000 +1000 @@ -69,7 +69,7 @@ int iconv_string (const char* tocode, co { size_t count = 0; char tmpbuf[tmpbufsize]; - const char* inptr = start; + char* inptr = (char *) start; size_t insize = end-start; while (insize > 0) { char* outptr = tmpbuf; @@ -121,7 +121,7 @@ int iconv_string (const char* tocode, co iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */ /* Do the conversion for real. */ { - const char* inptr = start; + char* inptr = (char *) start; size_t insize = end-start; char* outptr = result; size_t outsize = length; diff -up ./src/inputclient.cpp.gcc43 ./src/inputclient.cpp --- ./src/inputclient.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/inputclient.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -16,6 +16,7 @@ * * ***************************************************************************/ +#include #include "inputclient.h" Console* InputClient::mpCon = NULL; diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp --- ./src/inputmanager.cpp.gcc43 2006-05-03 03:18:39.000000000 +1000 +++ ./src/inputmanager.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -24,6 +24,7 @@ using namespace std; #include #include #include +#include #include "global.h" #include "debug.h" --- ./src/inputmanager.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/inputmanager.h 2008-07-15 12:31:16.000000000 +1000 @@ -26,6 +26,7 @@ using namespace std; #include #include +#include #include "mouse.h" #if defined(__FreeBSD__) --- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000 @@ -62,7 +62,7 @@ class NativeInputServer : public InputSe bool mAutoSelectUnique; static struct Symbol { char mKey; - char *mpSymbol; + const char *mpSymbol; } mFullSymbolTable[]; static char mFullCharTable[]; --- ./src/window.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 +++ ./src/window.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include "global.h" #include "debug.h" #include "window.h" --- ./src/winime.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 +++ ./src/winime.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -47,7 +47,7 @@ mCandilistBufLen(0) throw (runtime_error("can not get gbfont size!")); mBufSize = st.st_size; - mpBuf = (char *) mmap(0, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); + mpBuf = (char *) mmap(NULL, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); if (mpBuf == MAP_FAILED) throw (runtime_error("mmap failed!")); @@ -163,7 +163,8 @@ int WinIme::MatchWord(char *p, int len, count--; break; } - AddCandilist(t,(unsigned int&)buflen); + unsigned int buflength=buflen; + AddCandilist(t,(unsigned int&)buflength); } //search next word else { if (len == 1) //special for first char --- ./src/zhcon.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #if defined(linux) @@ -452,9 +457,11 @@ void Zhcon::InitTty() { return; } char *pCap = mCapBuf; - mpCapClearScr = tgetstr("cl", &pCap); - mpCapCursorOff = tgetstr("vi", &pCap); - mpCapCursorOn = tgetstr("ve", &pCap); + char ids[][3]={"cl","vi","ve"}; + + mpCapClearScr = tgetstr(ids[0], &pCap); + mpCapCursorOff = tgetstr(ids[1], &pCap); + mpCapCursorOn = tgetstr(ids[2], &pCap); if (mpCapClearScr) write(mConFd, mpCapClearScr, strlen(mpCapClearScr)); if (mpCapCursorOff) write(mConFd, mpCapCursorOff, strlen(mpCapCursorOff)); --- src/display/vgadev.cpp.gcc43 2008-07-15 14:10:33.000000000 +1000 +++ src/display/vgadev.cpp 2008-07-15 14:10:57.000000000 +1000 @@ -33,6 +33,7 @@ #include #include #include +#include #include "debug.h" #include "vgadev.h" #include "lrmi.h" zhcon-0.2.6-keyswitch.patch: --- NEW FILE zhcon-0.2.6-keyswitch.patch --- --- ./src/zhcon.cpp.keyswitch 2008-07-14 16:17:53.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-14 16:20:16.000000000 +1000 @@ -132,6 +132,10 @@ //the InitXXX sequence is important,do not change //unless you know what you are doing InitTty(); + + /* Set to K_XLATE (ascii) */ + ioctl(0, KDSKBMODE, K_XLATE); + // set blank line height, must before init font InitGraphDev(f); GraphMode(); --- ./src/inputmanager.cpp.keyswitch 2008-07-14 16:14:10.000000000 +1000 +++ ./src/inputmanager.cpp 2008-07-14 16:23:45.000000000 +1000 @@ -101,9 +101,12 @@ struct timeval tv; int rcved, shift; + bool ctrlShiftPressed=false; shift = GetShiftState(); - if (shift != 0) { + if (shift ==5){ + /* Ctrl-Shift Pressed */ + ctrlShiftPressed=true; //printf("Shift stat %d\r\n", s); } @@ -120,7 +123,7 @@ tv.tv_sec = 0; tv.tv_usec = 100000; /* 0.1 sec */ rcved = select(FD_SETSIZE, &mFdSet, NULL, NULL, &tv); - if (rcved <= 0) + if (rcved <= 0 && !ctrlShiftPressed) return; #ifdef HAVE_GPM_H @@ -154,7 +157,9 @@ mOutputRead = 0; } } - } + }else if (ctrlShiftPressed){ + DoCtrlShift(); + } if (FD_ISSET(mTtyFd, &mFdSet)) { mInputRead += read(mTtyFd, mInputBuf+mInputRead, BUFSIZE-mInputRead); zhcon-0.2.6-locale.patch: --- NEW FILE zhcon-0.2.6-locale.patch --- --- ./src/zhcon.h.locale 2008-07-14 11:14:23.000000000 +1000 +++ ./src/zhcon.h 2008-07-14 11:08:09.000000000 +1000 @@ -27,6 +27,10 @@ #include #include "global.h" #include "cmdline.h" +#define LOCALE_STR_UTF8 "utf8" +#define LOCALE_STR_GB2312 "gb2312" +#define LOCALE_STR_GBK "gbk" +#define LOCALE_STR_BIG5 "big5" using namespace std; --- ./src/zhcon.cpp.locale 2008-07-14 11:21:29.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-14 11:37:28.000000000 +1000 @@ -485,13 +485,13 @@ f = new BaseFont(mGB2312Font, 16, 16); h = new GBDecoder(); } - locale = "zh_CN.GB2312"; + locale = "zh_CN." LOCALE_STR_GB2312; break; case GBK: assert(font == GBK); f = new BaseFont(mGBKFont, 16, 16); h = new GBKDecoder(); - locale = "zh_CN.GBK"; + locale = "zh_CN." LOCALE_STR_GBK; break; case BIG5: assert(font == GB2312 || font == BIG5); @@ -502,7 +502,7 @@ f = new BaseFont(mBIG5Font, 16, 16); h = new BIG5Decoder(); } - locale = "zh_TW.Big5"; + locale = "zh_TW." LOCALE_STR_BIG5; break; case JIS: assert(font == e); @@ -647,22 +647,22 @@ setenv("LC_ALL", "zh_CN.EUC", 1); #else if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_CN.UTF-8", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_CN.GB2312", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_GB2312, 1); #endif mDefaultEncode = GB2312; } else if (s == "gbk") { if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_CN.UTF-8", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_CN.GBK", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_GBK, 1); mDefaultEncode = GBK; } else if (s == "big5") { if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_TW.UTF-8", 1); + setenv("LC_ALL", "zh_TW." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_TW.Big5", 1); + setenv("LC_ALL", "zh_TW." LOCALE_STR_BIG5, 1); mDefaultEncode = BIG5; } else if (s == "jis") { //SetEncode(JIS,JIS); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Mar 2007 07:25:40 -0000 1.2 +++ .cvsignore 15 Jul 2008 04:31:25 -0000 1.3 @@ -1,2 +1,2 @@ -zhcon-0.2.5.tar.gz -zhcon-0.2.5-to-0.2.6.diff.gz +zhcon_0.2.6-4.1.diff.gz +zhcon_0.2.6.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Mar 2007 07:25:40 -0000 1.2 +++ sources 15 Jul 2008 04:31:25 -0000 1.3 @@ -1,2 +1,2 @@ -79e1c68aab8341e32129f61c1670baeb zhcon-0.2.5.tar.gz -971f68507f9c48a6b5cbee4ba0c1e2a6 zhcon-0.2.5-to-0.2.6.diff.gz +0357d334637fc2fecf042eb9043f8b69 zhcon_0.2.6-4.1.diff.gz +0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz zhcon-0.2.6-flags.patch: Index: zhcon-0.2.6-flags.patch =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon-0.2.6-flags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zhcon-0.2.6-flags.patch 27 Mar 2007 07:25:40 -0000 1.1 +++ zhcon-0.2.6-flags.patch 15 Jul 2008 04:31:25 -0000 1.2 @@ -1,5 +1,5 @@ ---- zhcon-0.2.5/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 -+++ zhcon-0.2.5/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 +--- zhcon-0.2.6/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 ++++ zhcon-0.2.6/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 @@ -9,11 +9,6 @@ #getbpsf_LDADD = -L/usr/X11R6/lib -lX11 #getbpsf_CPPFLAGS = -I/usr/X11R6/include zhcon-0.2.6-path-define.patch: Index: zhcon-0.2.6-path-define.patch =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon-0.2.6-path-define.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zhcon-0.2.6-path-define.patch 27 Mar 2007 07:25:40 -0000 1.1 +++ zhcon-0.2.6-path-define.patch 15 Jul 2008 04:31:25 -0000 1.2 @@ -1,5 +1,19 @@ ---- zhcon-0.2.5/configure.in.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/configure.in 2007-02-16 03:48:31.000000000 +0900 +--- ./doc/Makefile.am.path-define 2006-05-03 03:57:18.000000000 +1000 ++++ ./doc/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -3,8 +3,8 @@ + EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz + + install-data-local: +- $(mkinstalldirs) $(mandir)/man1/ +- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ ++ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 + + uninstall-local: +- -rm -f $(mandir)/man1/zhcon.1 ++ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 +--- ./configure.in.path-define 2006-07-06 04:20:09.000000000 +1000 ++++ ./configure.in 2008-07-15 10:48:01.000000000 +1000 @@ -175,6 +175,16 @@ AC_CHECK_LIB(gpm,main,,usegpm="no") @@ -26,74 +40,61 @@ Config complete, now type make to build zhcon. Good Luck! ---- zhcon-0.2.5/font/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/font/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./font/Makefile.am.path-define 2006-04-25 02:39:04.000000000 +1000 ++++ ./font/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.bpsf install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ -- $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ +- $(mkinstalldirs) $(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/ + $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf +- -rm -f $(libdir)/zhcon/font/*.bpsf + -rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf ---- zhcon-0.2.5/input/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/input/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./input/Makefile.am.path-define 2006-04-25 02:38:44.000000000 +1000 ++++ ./input/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.mb install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ -- $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ +- $(mkinstalldirs) $(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/ + $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb +- -rm -f $(libdir)/zhcon/input/*.mb + -rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb ---- zhcon-0.2.5/src/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/Makefile.am 2007-02-16 03:47:08.000000000 +0900 -@@ -11,11 +11,11 @@ - chmod 4755 $(DESTDIR)$(bindir)/zhcon - - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc -- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf - - uninstall-local: -- -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf -+ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf - - # set the include path found by configure - INCLUDES= $(all_includes) ---- zhcon-0.2.5/src/nativeinputserver.cpp.path_define 2006-04-25 01:38:27.000000000 +0900 -+++ zhcon-0.2.5/src/nativeinputserver.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -30,7 +30,7 @@ - #include "nativeinputserver.h" - #include "keymap.h" - --string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; -+string NativeInputServer::mDataPath = DATADIR"/zhcon/"; - - NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { - {'.', "??"} ---- zhcon-0.2.5/src/zhcon.cpp.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/zhcon.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -123,7 +123,7 @@ +--- ./src/zhcon.conf.path-define 2008-07-15 11:15:09.000000000 +1000 ++++ ./src/zhcon.conf 2008-07-15 11:16:36.000000000 +1000 +@@ -2,10 +2,10 @@ + #it can be named as ~/.zhconrc or /etc/zhcon.conf + #you can edit it manually + +-zhconpath = /usr/lib/zhcon/ ++zhconpath = /usr/share/zhcon/ + + #unicon(3.x) path +-uniconpath = /usr/lib/unicon/ ++uniconpath = /usr/share/unicon/ + + #defaultencode: default encoding can be :gb2312,gbk,big5,jis,ksc + defaultencode = gb2312 +--- ./src/zhcon.cpp.path-define 2008-07-15 10:48:01.000000000 +1000 ++++ ./src/zhcon.cpp 2008-07-15 10:49:15.000000000 +1000 +@@ -123,7 +124,7 @@ string cfgfile = getenv("HOME"); cfgfile += "/.zhconrc"; if (access(cfgfile.c_str(), R_OK) != 0) -- cfgfile = PREFIX "/etc/zhcon.conf"; +- cfgfile = "/etc/zhcon.conf"; + cfgfile = SYSCONFDIR "/zhcon.conf"; //for debug,a pause enable us to attach zhcon's pid in gdb //char c;cin>>c; -@@ -621,7 +621,7 @@ +@@ -621,7 +628,7 @@ if (getenv("LC_ALL")) mOldLocale = getenv("LC_ALL"); @@ -102,7 +103,7 @@ mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT)); mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT)); mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT)); -@@ -752,10 +752,10 @@ +@@ -752,10 +759,10 @@ InputManager::SetTty(mConFd, ttyno, mTtyFd); string s; @@ -115,3 +116,35 @@ UniconInputServer::SetDataPath(s); #endif string sOverSpot, sNativeBar; +--- ./src/nativeinputserver.cpp.path-define 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/nativeinputserver.cpp 2008-07-15 10:48:01.000000000 +1000 +@@ -30,7 +30,7 @@ + #include "nativeinputserver.h" + #include "keymap.h" + +-string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; ++string NativeInputServer::mDataPath = DATADIR"/zhcon/"; + + NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { + {'.', "??"} +--- ./src/Makefile.am.path-define 2006-05-03 03:12:41.000000000 +1000 ++++ ./src/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -8,14 +8,14 @@ + SUBDIRS = display + + install-exec-local: +- chmod 4755 $(bindir)/zhcon ++ chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf + + uninstall-local: +- -rm -f $(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) Index: zhcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- zhcon.spec 3 Mar 2008 06:13:52 -0000 1.7 +++ zhcon.spec 15 Jul 2008 04:31:25 -0000 1.8 @@ -1,41 +1,52 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 8%{?dist} +Release: 9%{?dist} Group: Applications/System -License: GPL +License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5.tar.gz -Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz -Patch1: zhcon-0.2.6-path.patch -Patch2: zhcon-0.2.6-path-define.patch -Patch3: zhcon-0.2.6-flags.patch -Patch4: zhcon-0.2.6-64bit-fix.patch -Patch5: zhcon-0.2.6.gcc43.patch +Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz +Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-4.1.diff.gz +Patch1: %{name}-%{version}-flags.patch +Patch2: %{name}-%{version}-path-define.patch +Patch3: %{name}-%{version}-gcc43.patch +Patch4: %{name}-%{version}-locale.patch +Patch5: %{name}-%{version}-keyswitch.patch +Summary: A fast Linux Console Chinese System that supports framebuffer +Summary(zh_CN): Zhcon ??????????????? Framebuffer ??? Linux ????????????????????? +Summary(zh_TW): Zhcon ??????????????? Framebuffer ???????????? Linux ????????????????????? BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf automake Buildrequires: gettext-devel ncurses-devel gpm-devel +Requires: ncurses-libs + %description Zhcon is a fast Linux Console Chinese System which supports framebuffer device.It can display Chinese, Japanese or Korean -double byte characters.Supported language encodings include: -GB2312, GBK, BIG5, JIS and KSC. +double byte characters. Supported language encodings include: +UTF8, GB2312, GBK, BIG5, JIS and KSC. %description -l zh_CN -zhcon??????????????????Linux??????????????????????????????????????? +zhcon ??????????????? Framebuffer ??? Linux ???????????????????????? ???????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????? +?????????????????? UTF8, GB2312, GBK, BIG5, JIS ??? KSC??? +%description -l zh_TW +zhcon ??????????????? Framebuffer ??????????????? Linux ???????????????????????? +??????????????????????????????????????????????????????????????????????????? +???????????????????????????????????????????????? +???????????????????????? UTF8, GB2312, GBK, BIG5, JIS ??? KSC??? %prep -%setup -q -n zhcon-0.2.5 -%patch0 -p1 -b .0.26 -%patch1 -p1 -b .instpath -%patch2 -p1 -b .path_define -%patch3 -p1 -b .flags -%patch4 -p1 -b .64bit_fix -%patch5 -p1 -b .gcc43_fix +%setup -q +%patch0 -p1 -b .4-1 +%patch1 -p1 -b .flags +%patch2 -p0 -b .path-define +%patch3 -p0 -b .gcc43 +%patch4 -p0 -b .locale +%patch5 -p0 -b .keyswitch iconv -f GB2312 -t UTF-8 ChangeLog -o ChangeLog.utf && mv -f ChangeLog.utf ChangeLog ( cd doc; tar -zxf html.tar.gz; chmod 755 manual) @@ -67,6 +78,11 @@ %{_datadir}/%{name}/ %changelog +* Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 +- [Bug 454228] [zhcon] Cannot start input method for x86_64 user +- [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 +- [Bug 441203] [zhcon] The input methods other than the default one were not changable for use + * Mon Mar 03 2008 Hu Zheng - 0.2.6-8 - i386 build fix. --- zhcon-0.2.6-64bit-fix.patch DELETED --- --- zhcon-0.2.6-path.patch DELETED --- --- zhcon-0.2.6.gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 04:35:35 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Tue, 15 Jul 2008 04:35:35 GMT Subject: rpms/zhcon/F-9 import.log, NONE, 1.1 zhcon-0.2.6-gcc43.patch, NONE, 1.1 zhcon-0.2.6-keyswitch.patch, NONE, 1.1 zhcon-0.2.6-locale.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zhcon-0.2.6-flags.patch, 1.1, 1.2 zhcon-0.2.6-path-define.patch, 1.1, 1.2 zhcon.spec, 1.7, 1.8 zhcon-0.2.6-64bit-fix.patch, 1.1, NONE zhcon-0.2.6-path.patch, 1.1, NONE zhcon-0.2.6.gcc43.patch, 1.2, NONE Message-ID: <200807150435.m6F4ZZau004803@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/zhcon/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4595/F-9 Modified Files: .cvsignore sources zhcon-0.2.6-flags.patch zhcon-0.2.6-path-define.patch zhcon.spec Added Files: import.log zhcon-0.2.6-gcc43.patch zhcon-0.2.6-keyswitch.patch zhcon-0.2.6-locale.patch Removed Files: zhcon-0.2.6-64bit-fix.patch zhcon-0.2.6-path.patch zhcon-0.2.6.gcc43.patch Log Message: Fix Bug 441203,449625,454228 --- NEW FILE import.log --- zhcon-0_2_6-9_el5:F-9:zhcon-0.2.6-9.el5.src.rpm:1216096455 zhcon-0.2.6-gcc43.patch: --- NEW FILE zhcon-0.2.6-gcc43.patch --- diff -up ./src/basefont.cpp.gcc43 ./src/basefont.cpp --- ./src/basefont.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/basefont.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -24,6 +24,7 @@ #include #include #include +#include #include "global.h" #include "debug.h" #include "hzdecoder.h" diff -up ./src/big5decoder.cpp.gcc43 ./src/big5decoder.cpp --- ./src/big5decoder.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 +++ ./src/big5decoder.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -27,7 +27,8 @@ bool BIG5Decoder::IsCode1(char c) { } bool BIG5Decoder::IsCode2(char c) { - return c >= 40 && c <= 0xff; +// return c >= 40 && c <= 0xff; + return c>=40; } unsigned int BIG5Decoder::Index(char c1, char c2) { diff -up ./src/display/fblinear16.cpp.gcc43 ./src/display/fblinear16.cpp --- ./src/display/fblinear16.cpp.gcc43 2006-04-25 02:38:24.000000000 +1000 +++ ./src/display/fblinear16.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -86,7 +86,8 @@ void FBLinear16::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/2; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } if (width & 1) { dest16 = (__u16*)dest32; diff -up ./src/display/fblinear24.cpp.gcc43 ./src/display/fblinear24.cpp --- ./src/display/fblinear24.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear24.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -136,19 +136,25 @@ void FBLinear24::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/4; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } if (width & 2) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); + fb_writew(fb_readw(dest16) ^ 0xffff, dest16); + dest16++; dest32 = (__u32*)dest16; } if (width & 1) { dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); + fb_writew(fb_readw(dest16) ^ 0xffff, dest16); + dest16++; dest8 = (__u8*)dest16; fb_writeb(fb_readb(dest8) ^ 0xff, dest8); } diff -up ./src/display/fblinear32.cpp.gcc43 ./src/display/fblinear32.cpp --- ./src/display/fblinear32.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear32.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -74,7 +74,8 @@ void FBLinear32::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } } } diff -up ./src/display/fblinear4.cpp.gcc43 ./src/display/fblinear4.cpp --- ./src/display/fblinear4.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear4.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -19,6 +19,7 @@ #include #include +#include #include "global.h" #include "fblinear4.h" diff -up ./src/display/fblinear8.cpp.gcc43 ./src/display/fblinear8.cpp --- ./src/display/fblinear8.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear8.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -19,6 +19,7 @@ #include #include +#include #include "global.h" #include "fblinear8.h" @@ -63,11 +64,13 @@ void FBLinear8::RevRect(int x1,int y1,in for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/4; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32++); + fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32); + dest32++; } if (width & 2) { dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16++); + fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16); + dest16++; dest32 = (__u32*)dest16; } if (width & 1) { diff -up ./src/display/fbvgaplanes.cpp.gcc43 ./src/display/fbvgaplanes.cpp --- ./src/display/fbvgaplanes.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fbvgaplanes.cpp 2008-07-15 12:53:18.000000000 +1000 @@ -22,6 +22,7 @@ #ifdef USING_VGA #include #include +#include #include "debug.h" #include "fbvgaplanes.h" diff -up ./src/encfilter.c.gcc43 ./src/encfilter.c --- ./src/encfilter.c.gcc43 2006-04-29 05:09:33.000000000 +1000 +++ ./src/encfilter.c 2008-07-15 12:31:16.000000000 +1000 @@ -37,6 +37,7 @@ #include #include #include +#include #include "encfilter.h" @@ -46,7 +47,9 @@ #error ICONV_CONST not defined #endif /* ICONV_CONST */ -#define BUFSIZ 8192 +#ifndef BUFSIZ +# define BUFSIZ 8192 +#endif int UseEncodingFilter; /* use filter such as UTF-8 */ char EncodingFilterBuff[BUFSIZ]; /* global buffer used by ConsoleHandler() and TextCopy() */ size_t EncodingFilterLen; diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp --- ./src/gbkdecoder.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/gbkdecoder.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -27,13 +27,15 @@ bool GBKDecoder::IsCode1(char c) { } bool GBKDecoder::IsCode2(char c) { - return c >= 0x40 && c <= 0xff; +// return c >= 0x40 && c <= 0xff; + return c>=0x40; } unsigned int GBKDecoder::Index(char c1, char c2) { int n; n = (c1 - 0x81) * 192; - if (c2 <= 0xff && c2 >= 0x40) + // if (c2 <= 0xff && c2 >= 0x40) + if (c2 >= 0x40) n += (c2 - 0x40); return n; } diff -up ./src/graphdev.cpp.gcc43 ./src/graphdev.cpp --- ./src/graphdev.cpp.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/graphdev.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -20,12 +20,14 @@ #include #endif +#include #include #include #include #include #include #include +#include #include "debug.h" #include "display/fbdev.h" diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c --- ./src/iconv_string.c.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/iconv_string.c 2008-07-15 12:31:16.000000000 +1000 @@ -69,7 +69,7 @@ int iconv_string (const char* tocode, co { size_t count = 0; char tmpbuf[tmpbufsize]; - const char* inptr = start; + char* inptr = (char *) start; size_t insize = end-start; while (insize > 0) { char* outptr = tmpbuf; @@ -121,7 +121,7 @@ int iconv_string (const char* tocode, co iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */ /* Do the conversion for real. */ { - const char* inptr = start; + char* inptr = (char *) start; size_t insize = end-start; char* outptr = result; size_t outsize = length; diff -up ./src/inputclient.cpp.gcc43 ./src/inputclient.cpp --- ./src/inputclient.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/inputclient.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -16,6 +16,7 @@ * * ***************************************************************************/ +#include #include "inputclient.h" Console* InputClient::mpCon = NULL; diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp --- ./src/inputmanager.cpp.gcc43 2006-05-03 03:18:39.000000000 +1000 +++ ./src/inputmanager.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -24,6 +24,7 @@ using namespace std; #include #include #include +#include #include "global.h" #include "debug.h" --- ./src/inputmanager.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/inputmanager.h 2008-07-15 12:31:16.000000000 +1000 @@ -26,6 +26,7 @@ using namespace std; #include #include +#include #include "mouse.h" #if defined(__FreeBSD__) --- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000 @@ -62,7 +62,7 @@ class NativeInputServer : public InputSe bool mAutoSelectUnique; static struct Symbol { char mKey; - char *mpSymbol; + const char *mpSymbol; } mFullSymbolTable[]; static char mFullCharTable[]; --- ./src/window.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 +++ ./src/window.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include "global.h" #include "debug.h" #include "window.h" --- ./src/winime.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 +++ ./src/winime.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -47,7 +47,7 @@ mCandilistBufLen(0) throw (runtime_error("can not get gbfont size!")); mBufSize = st.st_size; - mpBuf = (char *) mmap(0, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); + mpBuf = (char *) mmap(NULL, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); if (mpBuf == MAP_FAILED) throw (runtime_error("mmap failed!")); @@ -163,7 +163,8 @@ int WinIme::MatchWord(char *p, int len, count--; break; } - AddCandilist(t,(unsigned int&)buflen); + unsigned int buflength=buflen; + AddCandilist(t,(unsigned int&)buflength); } //search next word else { if (len == 1) //special for first char --- ./src/zhcon.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #if defined(linux) @@ -452,9 +457,11 @@ void Zhcon::InitTty() { return; } char *pCap = mCapBuf; - mpCapClearScr = tgetstr("cl", &pCap); - mpCapCursorOff = tgetstr("vi", &pCap); - mpCapCursorOn = tgetstr("ve", &pCap); + char ids[][3]={"cl","vi","ve"}; + + mpCapClearScr = tgetstr(ids[0], &pCap); + mpCapCursorOff = tgetstr(ids[1], &pCap); + mpCapCursorOn = tgetstr(ids[2], &pCap); if (mpCapClearScr) write(mConFd, mpCapClearScr, strlen(mpCapClearScr)); if (mpCapCursorOff) write(mConFd, mpCapCursorOff, strlen(mpCapCursorOff)); --- src/display/vgadev.cpp.gcc43 2008-07-15 14:10:33.000000000 +1000 +++ src/display/vgadev.cpp 2008-07-15 14:10:57.000000000 +1000 @@ -33,6 +33,7 @@ #include #include #include +#include #include "debug.h" #include "vgadev.h" #include "lrmi.h" zhcon-0.2.6-keyswitch.patch: --- NEW FILE zhcon-0.2.6-keyswitch.patch --- --- ./src/zhcon.cpp.keyswitch 2008-07-14 16:17:53.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-14 16:20:16.000000000 +1000 @@ -132,6 +132,10 @@ //the InitXXX sequence is important,do not change //unless you know what you are doing InitTty(); + + /* Set to K_XLATE (ascii) */ + ioctl(0, KDSKBMODE, K_XLATE); + // set blank line height, must before init font InitGraphDev(f); GraphMode(); --- ./src/inputmanager.cpp.keyswitch 2008-07-14 16:14:10.000000000 +1000 +++ ./src/inputmanager.cpp 2008-07-14 16:23:45.000000000 +1000 @@ -101,9 +101,12 @@ struct timeval tv; int rcved, shift; + bool ctrlShiftPressed=false; shift = GetShiftState(); - if (shift != 0) { + if (shift ==5){ + /* Ctrl-Shift Pressed */ + ctrlShiftPressed=true; //printf("Shift stat %d\r\n", s); } @@ -120,7 +123,7 @@ tv.tv_sec = 0; tv.tv_usec = 100000; /* 0.1 sec */ rcved = select(FD_SETSIZE, &mFdSet, NULL, NULL, &tv); - if (rcved <= 0) + if (rcved <= 0 && !ctrlShiftPressed) return; #ifdef HAVE_GPM_H @@ -154,7 +157,9 @@ mOutputRead = 0; } } - } + }else if (ctrlShiftPressed){ + DoCtrlShift(); + } if (FD_ISSET(mTtyFd, &mFdSet)) { mInputRead += read(mTtyFd, mInputBuf+mInputRead, BUFSIZE-mInputRead); zhcon-0.2.6-locale.patch: --- NEW FILE zhcon-0.2.6-locale.patch --- --- ./src/zhcon.h.locale 2008-07-14 11:14:23.000000000 +1000 +++ ./src/zhcon.h 2008-07-14 11:08:09.000000000 +1000 @@ -27,6 +27,10 @@ #include #include "global.h" #include "cmdline.h" +#define LOCALE_STR_UTF8 "utf8" +#define LOCALE_STR_GB2312 "gb2312" +#define LOCALE_STR_GBK "gbk" +#define LOCALE_STR_BIG5 "big5" using namespace std; --- ./src/zhcon.cpp.locale 2008-07-14 11:21:29.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-14 11:37:28.000000000 +1000 @@ -485,13 +485,13 @@ f = new BaseFont(mGB2312Font, 16, 16); h = new GBDecoder(); } - locale = "zh_CN.GB2312"; + locale = "zh_CN." LOCALE_STR_GB2312; break; case GBK: assert(font == GBK); f = new BaseFont(mGBKFont, 16, 16); h = new GBKDecoder(); - locale = "zh_CN.GBK"; + locale = "zh_CN." LOCALE_STR_GBK; break; case BIG5: assert(font == GB2312 || font == BIG5); @@ -502,7 +502,7 @@ f = new BaseFont(mBIG5Font, 16, 16); h = new BIG5Decoder(); } - locale = "zh_TW.Big5"; + locale = "zh_TW." LOCALE_STR_BIG5; break; case JIS: assert(font == e); @@ -647,22 +647,22 @@ setenv("LC_ALL", "zh_CN.EUC", 1); #else if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_CN.UTF-8", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_CN.GB2312", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_GB2312, 1); #endif mDefaultEncode = GB2312; } else if (s == "gbk") { if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_CN.UTF-8", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_CN.GBK", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_GBK, 1); mDefaultEncode = GBK; } else if (s == "big5") { if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_TW.UTF-8", 1); + setenv("LC_ALL", "zh_TW." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_TW.Big5", 1); + setenv("LC_ALL", "zh_TW." LOCALE_STR_BIG5, 1); mDefaultEncode = BIG5; } else if (s == "jis") { //SetEncode(JIS,JIS); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Mar 2007 07:25:40 -0000 1.2 +++ .cvsignore 15 Jul 2008 04:34:46 -0000 1.3 @@ -1,2 +1,2 @@ -zhcon-0.2.5.tar.gz -zhcon-0.2.5-to-0.2.6.diff.gz +zhcon_0.2.6-4.1.diff.gz +zhcon_0.2.6.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Mar 2007 07:25:40 -0000 1.2 +++ sources 15 Jul 2008 04:34:46 -0000 1.3 @@ -1,2 +1,2 @@ -79e1c68aab8341e32129f61c1670baeb zhcon-0.2.5.tar.gz -971f68507f9c48a6b5cbee4ba0c1e2a6 zhcon-0.2.5-to-0.2.6.diff.gz +0357d334637fc2fecf042eb9043f8b69 zhcon_0.2.6-4.1.diff.gz +0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz zhcon-0.2.6-flags.patch: Index: zhcon-0.2.6-flags.patch =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-9/zhcon-0.2.6-flags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zhcon-0.2.6-flags.patch 27 Mar 2007 07:25:40 -0000 1.1 +++ zhcon-0.2.6-flags.patch 15 Jul 2008 04:34:46 -0000 1.2 @@ -1,5 +1,5 @@ ---- zhcon-0.2.5/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 -+++ zhcon-0.2.5/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 +--- zhcon-0.2.6/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 ++++ zhcon-0.2.6/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 @@ -9,11 +9,6 @@ #getbpsf_LDADD = -L/usr/X11R6/lib -lX11 #getbpsf_CPPFLAGS = -I/usr/X11R6/include zhcon-0.2.6-path-define.patch: Index: zhcon-0.2.6-path-define.patch =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-9/zhcon-0.2.6-path-define.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zhcon-0.2.6-path-define.patch 27 Mar 2007 07:25:40 -0000 1.1 +++ zhcon-0.2.6-path-define.patch 15 Jul 2008 04:34:46 -0000 1.2 @@ -1,5 +1,19 @@ ---- zhcon-0.2.5/configure.in.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/configure.in 2007-02-16 03:48:31.000000000 +0900 +--- ./doc/Makefile.am.path-define 2006-05-03 03:57:18.000000000 +1000 ++++ ./doc/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -3,8 +3,8 @@ + EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz + + install-data-local: +- $(mkinstalldirs) $(mandir)/man1/ +- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ ++ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 + + uninstall-local: +- -rm -f $(mandir)/man1/zhcon.1 ++ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 +--- ./configure.in.path-define 2006-07-06 04:20:09.000000000 +1000 ++++ ./configure.in 2008-07-15 10:48:01.000000000 +1000 @@ -175,6 +175,16 @@ AC_CHECK_LIB(gpm,main,,usegpm="no") @@ -26,74 +40,61 @@ Config complete, now type make to build zhcon. Good Luck! ---- zhcon-0.2.5/font/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/font/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./font/Makefile.am.path-define 2006-04-25 02:39:04.000000000 +1000 ++++ ./font/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.bpsf install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ -- $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ +- $(mkinstalldirs) $(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/ + $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf +- -rm -f $(libdir)/zhcon/font/*.bpsf + -rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf ---- zhcon-0.2.5/input/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/input/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./input/Makefile.am.path-define 2006-04-25 02:38:44.000000000 +1000 ++++ ./input/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.mb install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ -- $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ +- $(mkinstalldirs) $(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/ + $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb +- -rm -f $(libdir)/zhcon/input/*.mb + -rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb ---- zhcon-0.2.5/src/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/Makefile.am 2007-02-16 03:47:08.000000000 +0900 -@@ -11,11 +11,11 @@ - chmod 4755 $(DESTDIR)$(bindir)/zhcon - - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc -- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf - - uninstall-local: -- -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf -+ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf - - # set the include path found by configure - INCLUDES= $(all_includes) ---- zhcon-0.2.5/src/nativeinputserver.cpp.path_define 2006-04-25 01:38:27.000000000 +0900 -+++ zhcon-0.2.5/src/nativeinputserver.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -30,7 +30,7 @@ - #include "nativeinputserver.h" - #include "keymap.h" - --string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; -+string NativeInputServer::mDataPath = DATADIR"/zhcon/"; - - NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { - {'.', "??"} ---- zhcon-0.2.5/src/zhcon.cpp.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/zhcon.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -123,7 +123,7 @@ +--- ./src/zhcon.conf.path-define 2008-07-15 11:15:09.000000000 +1000 ++++ ./src/zhcon.conf 2008-07-15 11:16:36.000000000 +1000 +@@ -2,10 +2,10 @@ + #it can be named as ~/.zhconrc or /etc/zhcon.conf + #you can edit it manually + +-zhconpath = /usr/lib/zhcon/ ++zhconpath = /usr/share/zhcon/ + + #unicon(3.x) path +-uniconpath = /usr/lib/unicon/ ++uniconpath = /usr/share/unicon/ + + #defaultencode: default encoding can be :gb2312,gbk,big5,jis,ksc + defaultencode = gb2312 +--- ./src/zhcon.cpp.path-define 2008-07-15 10:48:01.000000000 +1000 ++++ ./src/zhcon.cpp 2008-07-15 10:49:15.000000000 +1000 +@@ -123,7 +124,7 @@ string cfgfile = getenv("HOME"); cfgfile += "/.zhconrc"; if (access(cfgfile.c_str(), R_OK) != 0) -- cfgfile = PREFIX "/etc/zhcon.conf"; +- cfgfile = "/etc/zhcon.conf"; + cfgfile = SYSCONFDIR "/zhcon.conf"; //for debug,a pause enable us to attach zhcon's pid in gdb //char c;cin>>c; -@@ -621,7 +621,7 @@ +@@ -621,7 +628,7 @@ if (getenv("LC_ALL")) mOldLocale = getenv("LC_ALL"); @@ -102,7 +103,7 @@ mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT)); mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT)); mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT)); -@@ -752,10 +752,10 @@ +@@ -752,10 +759,10 @@ InputManager::SetTty(mConFd, ttyno, mTtyFd); string s; @@ -115,3 +116,35 @@ UniconInputServer::SetDataPath(s); #endif string sOverSpot, sNativeBar; +--- ./src/nativeinputserver.cpp.path-define 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/nativeinputserver.cpp 2008-07-15 10:48:01.000000000 +1000 +@@ -30,7 +30,7 @@ + #include "nativeinputserver.h" + #include "keymap.h" + +-string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; ++string NativeInputServer::mDataPath = DATADIR"/zhcon/"; + + NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { + {'.', "??"} +--- ./src/Makefile.am.path-define 2006-05-03 03:12:41.000000000 +1000 ++++ ./src/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -8,14 +8,14 @@ + SUBDIRS = display + + install-exec-local: +- chmod 4755 $(bindir)/zhcon ++ chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf + + uninstall-local: +- -rm -f $(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) Index: zhcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-9/zhcon.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- zhcon.spec 3 Mar 2008 06:13:52 -0000 1.7 +++ zhcon.spec 15 Jul 2008 04:34:46 -0000 1.8 @@ -1,41 +1,52 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 8%{?dist} +Release: 9%{?dist} Group: Applications/System -License: GPL +License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5.tar.gz -Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz -Patch1: zhcon-0.2.6-path.patch -Patch2: zhcon-0.2.6-path-define.patch -Patch3: zhcon-0.2.6-flags.patch -Patch4: zhcon-0.2.6-64bit-fix.patch -Patch5: zhcon-0.2.6.gcc43.patch +Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz +Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-4.1.diff.gz +Patch1: %{name}-%{version}-flags.patch +Patch2: %{name}-%{version}-path-define.patch +Patch3: %{name}-%{version}-gcc43.patch +Patch4: %{name}-%{version}-locale.patch +Patch5: %{name}-%{version}-keyswitch.patch +Summary: A fast Linux Console Chinese System that supports framebuffer +Summary(zh_CN): Zhcon ??????????????? Framebuffer ??? Linux ????????????????????? +Summary(zh_TW): Zhcon ??????????????? Framebuffer ???????????? Linux ????????????????????? BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf automake Buildrequires: gettext-devel ncurses-devel gpm-devel +Requires: ncurses-libs + %description Zhcon is a fast Linux Console Chinese System which supports framebuffer device.It can display Chinese, Japanese or Korean -double byte characters.Supported language encodings include: -GB2312, GBK, BIG5, JIS and KSC. +double byte characters. Supported language encodings include: +UTF8, GB2312, GBK, BIG5, JIS and KSC. %description -l zh_CN -zhcon??????????????????Linux??????????????????????????????????????? +zhcon ??????????????? Framebuffer ??? Linux ???????????????????????? ???????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????? +?????????????????? UTF8, GB2312, GBK, BIG5, JIS ??? KSC??? +%description -l zh_TW +zhcon ??????????????? Framebuffer ??????????????? Linux ???????????????????????? +??????????????????????????????????????????????????????????????????????????? +???????????????????????????????????????????????? +???????????????????????? UTF8, GB2312, GBK, BIG5, JIS ??? KSC??? %prep -%setup -q -n zhcon-0.2.5 -%patch0 -p1 -b .0.26 -%patch1 -p1 -b .instpath -%patch2 -p1 -b .path_define -%patch3 -p1 -b .flags -%patch4 -p1 -b .64bit_fix -%patch5 -p1 -b .gcc43_fix +%setup -q +%patch0 -p1 -b .4-1 +%patch1 -p1 -b .flags +%patch2 -p0 -b .path-define +%patch3 -p0 -b .gcc43 +%patch4 -p0 -b .locale +%patch5 -p0 -b .keyswitch iconv -f GB2312 -t UTF-8 ChangeLog -o ChangeLog.utf && mv -f ChangeLog.utf ChangeLog ( cd doc; tar -zxf html.tar.gz; chmod 755 manual) @@ -67,6 +78,11 @@ %{_datadir}/%{name}/ %changelog +* Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 +- [Bug 454228] [zhcon] Cannot start input method for x86_64 user +- [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 +- [Bug 441203] [zhcon] The input methods other than the default one were not changable for use + * Mon Mar 03 2008 Hu Zheng - 0.2.6-8 - i386 build fix. --- zhcon-0.2.6-64bit-fix.patch DELETED --- --- zhcon-0.2.6-path.patch DELETED --- --- zhcon-0.2.6.gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 04:37:16 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 04:37:16 GMT Subject: rpms/python-fedora/devel .cvsignore,1.16,1.17 sources,1.17,1.18 Message-ID: <200807150437.m6F4bG19005350@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5086 Modified Files: .cvsignore sources Log Message: Upload 0.3.1 tarball. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 11 Jul 2008 19:23:56 -0000 1.16 +++ .cvsignore 15 Jul 2008 04:36:28 -0000 1.17 @@ -1 +1 @@ -python-fedora-0.3.tar.gz +python-fedora-0.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 11 Jul 2008 19:35:10 -0000 1.17 +++ sources 15 Jul 2008 04:36:28 -0000 1.18 @@ -1 +1 @@ -a9bd04791e4e16f559ed5ed8faa41968 python-fedora-0.3.tar.gz +770f93074a7fcbdbc7871d0214e41bb9 python-fedora-0.3.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 04:37:32 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Tue, 15 Jul 2008 04:37:32 GMT Subject: rpms/zhcon/F-8 import.log, NONE, 1.1 zhcon-0.2.6-gcc43.patch, NONE, 1.1 zhcon-0.2.6-keyswitch.patch, NONE, 1.1 zhcon-0.2.6-locale.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zhcon-0.2.6-flags.patch, 1.1, 1.2 zhcon-0.2.6-path-define.patch, 1.1, 1.2 zhcon.spec, 1.4, 1.5 zhcon-0.2.6-64bit-fix.patch, 1.1, NONE zhcon-0.2.6-path.patch, 1.1, NONE Message-ID: <200807150437.m6F4bW5D005419@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/zhcon/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5161/F-8 Modified Files: .cvsignore sources zhcon-0.2.6-flags.patch zhcon-0.2.6-path-define.patch zhcon.spec Added Files: import.log zhcon-0.2.6-gcc43.patch zhcon-0.2.6-keyswitch.patch zhcon-0.2.6-locale.patch Removed Files: zhcon-0.2.6-64bit-fix.patch zhcon-0.2.6-path.patch Log Message: Fix Bug 441203,449625,454228 --- NEW FILE import.log --- zhcon-0_2_6-9_el5:F-8:zhcon-0.2.6-9.el5.src.rpm:1216096602 zhcon-0.2.6-gcc43.patch: --- NEW FILE zhcon-0.2.6-gcc43.patch --- diff -up ./src/basefont.cpp.gcc43 ./src/basefont.cpp --- ./src/basefont.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/basefont.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -24,6 +24,7 @@ #include #include #include +#include #include "global.h" #include "debug.h" #include "hzdecoder.h" diff -up ./src/big5decoder.cpp.gcc43 ./src/big5decoder.cpp --- ./src/big5decoder.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 +++ ./src/big5decoder.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -27,7 +27,8 @@ bool BIG5Decoder::IsCode1(char c) { } bool BIG5Decoder::IsCode2(char c) { - return c >= 40 && c <= 0xff; +// return c >= 40 && c <= 0xff; + return c>=40; } unsigned int BIG5Decoder::Index(char c1, char c2) { diff -up ./src/display/fblinear16.cpp.gcc43 ./src/display/fblinear16.cpp --- ./src/display/fblinear16.cpp.gcc43 2006-04-25 02:38:24.000000000 +1000 +++ ./src/display/fblinear16.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -86,7 +86,8 @@ void FBLinear16::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/2; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } if (width & 1) { dest16 = (__u16*)dest32; diff -up ./src/display/fblinear24.cpp.gcc43 ./src/display/fblinear24.cpp --- ./src/display/fblinear24.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear24.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -136,19 +136,25 @@ void FBLinear24::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/4; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } if (width & 2) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); + fb_writew(fb_readw(dest16) ^ 0xffff, dest16); + dest16++; dest32 = (__u32*)dest16; } if (width & 1) { dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0xffff, dest16++); + fb_writew(fb_readw(dest16) ^ 0xffff, dest16); + dest16++; dest8 = (__u8*)dest16; fb_writeb(fb_readb(dest8) ^ 0xff, dest8); } diff -up ./src/display/fblinear32.cpp.gcc43 ./src/display/fblinear32.cpp --- ./src/display/fblinear32.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear32.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -74,7 +74,8 @@ void FBLinear32::RevRect(int x1,int y1,i for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32++); + fb_writel(fb_readl(dest32) ^ 0xffffffff, dest32); + dest32++; } } } diff -up ./src/display/fblinear4.cpp.gcc43 ./src/display/fblinear4.cpp --- ./src/display/fblinear4.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear4.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -19,6 +19,7 @@ #include #include +#include #include "global.h" #include "fblinear4.h" diff -up ./src/display/fblinear8.cpp.gcc43 ./src/display/fblinear8.cpp --- ./src/display/fblinear8.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fblinear8.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -19,6 +19,7 @@ #include #include +#include #include "global.h" #include "fblinear8.h" @@ -63,11 +64,13 @@ void FBLinear8::RevRect(int x1,int y1,in for(; height--; dest += mNextLine) { dest32 = (__u32*)dest; for (cnt = width/4; cnt--;) { - fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32++); + fb_writel(fb_readl(dest32) ^ 0x0f0f0f0f, dest32); + dest32++; } if (width & 2) { dest16 = (__u16*)dest32; - fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16++); + fb_writew(fb_readw(dest16) ^ 0x0f0f, dest16); + dest16++; dest32 = (__u32*)dest16; } if (width & 1) { diff -up ./src/display/fbvgaplanes.cpp.gcc43 ./src/display/fbvgaplanes.cpp --- ./src/display/fbvgaplanes.cpp.gcc43 2006-04-25 02:38:23.000000000 +1000 +++ ./src/display/fbvgaplanes.cpp 2008-07-15 12:53:18.000000000 +1000 @@ -22,6 +22,7 @@ #ifdef USING_VGA #include #include +#include #include "debug.h" #include "fbvgaplanes.h" diff -up ./src/encfilter.c.gcc43 ./src/encfilter.c --- ./src/encfilter.c.gcc43 2006-04-29 05:09:33.000000000 +1000 +++ ./src/encfilter.c 2008-07-15 12:31:16.000000000 +1000 @@ -37,6 +37,7 @@ #include #include #include +#include #include "encfilter.h" @@ -46,7 +47,9 @@ #error ICONV_CONST not defined #endif /* ICONV_CONST */ -#define BUFSIZ 8192 +#ifndef BUFSIZ +# define BUFSIZ 8192 +#endif int UseEncodingFilter; /* use filter such as UTF-8 */ char EncodingFilterBuff[BUFSIZ]; /* global buffer used by ConsoleHandler() and TextCopy() */ size_t EncodingFilterLen; diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp --- ./src/gbkdecoder.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/gbkdecoder.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -27,13 +27,15 @@ bool GBKDecoder::IsCode1(char c) { } bool GBKDecoder::IsCode2(char c) { - return c >= 0x40 && c <= 0xff; +// return c >= 0x40 && c <= 0xff; + return c>=0x40; } unsigned int GBKDecoder::Index(char c1, char c2) { int n; n = (c1 - 0x81) * 192; - if (c2 <= 0xff && c2 >= 0x40) + // if (c2 <= 0xff && c2 >= 0x40) + if (c2 >= 0x40) n += (c2 - 0x40); return n; } diff -up ./src/graphdev.cpp.gcc43 ./src/graphdev.cpp --- ./src/graphdev.cpp.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/graphdev.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -20,12 +20,14 @@ #include #endif +#include #include #include #include #include #include #include +#include #include "debug.h" #include "display/fbdev.h" diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c --- ./src/iconv_string.c.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/iconv_string.c 2008-07-15 12:31:16.000000000 +1000 @@ -69,7 +69,7 @@ int iconv_string (const char* tocode, co { size_t count = 0; char tmpbuf[tmpbufsize]; - const char* inptr = start; + char* inptr = (char *) start; size_t insize = end-start; while (insize > 0) { char* outptr = tmpbuf; @@ -121,7 +121,7 @@ int iconv_string (const char* tocode, co iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */ /* Do the conversion for real. */ { - const char* inptr = start; + char* inptr = (char *) start; size_t insize = end-start; char* outptr = result; size_t outsize = length; diff -up ./src/inputclient.cpp.gcc43 ./src/inputclient.cpp --- ./src/inputclient.cpp.gcc43 2006-04-25 02:38:27.000000000 +1000 +++ ./src/inputclient.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -16,6 +16,7 @@ * * ***************************************************************************/ +#include #include "inputclient.h" Console* InputClient::mpCon = NULL; diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp --- ./src/inputmanager.cpp.gcc43 2006-05-03 03:18:39.000000000 +1000 +++ ./src/inputmanager.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -24,6 +24,7 @@ using namespace std; #include #include #include +#include #include "global.h" #include "debug.h" --- ./src/inputmanager.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/inputmanager.h 2008-07-15 12:31:16.000000000 +1000 @@ -26,6 +26,7 @@ using namespace std; #include #include +#include #include "mouse.h" #if defined(__FreeBSD__) --- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000 +++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000 @@ -62,7 +62,7 @@ class NativeInputServer : public InputSe bool mAutoSelectUnique; static struct Symbol { char mKey; - char *mpSymbol; + const char *mpSymbol; } mFullSymbolTable[]; static char mFullCharTable[]; --- ./src/window.cpp.gcc43 2006-04-25 02:38:25.000000000 +1000 +++ ./src/window.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include "global.h" #include "debug.h" #include "window.h" --- ./src/winime.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 +++ ./src/winime.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -47,7 +47,7 @@ mCandilistBufLen(0) throw (runtime_error("can not get gbfont size!")); mBufSize = st.st_size; - mpBuf = (char *) mmap(0, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); + mpBuf = (char *) mmap(NULL, mBufSize, PROT_READ, MAP_SHARED, mFd, 0); if (mpBuf == MAP_FAILED) throw (runtime_error("mmap failed!")); @@ -163,7 +163,8 @@ int WinIme::MatchWord(char *p, int len, count--; break; } - AddCandilist(t,(unsigned int&)buflen); + unsigned int buflength=buflen; + AddCandilist(t,(unsigned int&)buflength); } //search next word else { if (len == 1) //special for first char --- ./src/zhcon.cpp.gcc43 2008-07-15 12:31:15.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-15 12:31:16.000000000 +1000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #if defined(linux) @@ -452,9 +457,11 @@ void Zhcon::InitTty() { return; } char *pCap = mCapBuf; - mpCapClearScr = tgetstr("cl", &pCap); - mpCapCursorOff = tgetstr("vi", &pCap); - mpCapCursorOn = tgetstr("ve", &pCap); + char ids[][3]={"cl","vi","ve"}; + + mpCapClearScr = tgetstr(ids[0], &pCap); + mpCapCursorOff = tgetstr(ids[1], &pCap); + mpCapCursorOn = tgetstr(ids[2], &pCap); if (mpCapClearScr) write(mConFd, mpCapClearScr, strlen(mpCapClearScr)); if (mpCapCursorOff) write(mConFd, mpCapCursorOff, strlen(mpCapCursorOff)); --- src/display/vgadev.cpp.gcc43 2008-07-15 14:10:33.000000000 +1000 +++ src/display/vgadev.cpp 2008-07-15 14:10:57.000000000 +1000 @@ -33,6 +33,7 @@ #include #include #include +#include #include "debug.h" #include "vgadev.h" #include "lrmi.h" zhcon-0.2.6-keyswitch.patch: --- NEW FILE zhcon-0.2.6-keyswitch.patch --- --- ./src/zhcon.cpp.keyswitch 2008-07-14 16:17:53.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-14 16:20:16.000000000 +1000 @@ -132,6 +132,10 @@ //the InitXXX sequence is important,do not change //unless you know what you are doing InitTty(); + + /* Set to K_XLATE (ascii) */ + ioctl(0, KDSKBMODE, K_XLATE); + // set blank line height, must before init font InitGraphDev(f); GraphMode(); --- ./src/inputmanager.cpp.keyswitch 2008-07-14 16:14:10.000000000 +1000 +++ ./src/inputmanager.cpp 2008-07-14 16:23:45.000000000 +1000 @@ -101,9 +101,12 @@ struct timeval tv; int rcved, shift; + bool ctrlShiftPressed=false; shift = GetShiftState(); - if (shift != 0) { + if (shift ==5){ + /* Ctrl-Shift Pressed */ + ctrlShiftPressed=true; //printf("Shift stat %d\r\n", s); } @@ -120,7 +123,7 @@ tv.tv_sec = 0; tv.tv_usec = 100000; /* 0.1 sec */ rcved = select(FD_SETSIZE, &mFdSet, NULL, NULL, &tv); - if (rcved <= 0) + if (rcved <= 0 && !ctrlShiftPressed) return; #ifdef HAVE_GPM_H @@ -154,7 +157,9 @@ mOutputRead = 0; } } - } + }else if (ctrlShiftPressed){ + DoCtrlShift(); + } if (FD_ISSET(mTtyFd, &mFdSet)) { mInputRead += read(mTtyFd, mInputBuf+mInputRead, BUFSIZE-mInputRead); zhcon-0.2.6-locale.patch: --- NEW FILE zhcon-0.2.6-locale.patch --- --- ./src/zhcon.h.locale 2008-07-14 11:14:23.000000000 +1000 +++ ./src/zhcon.h 2008-07-14 11:08:09.000000000 +1000 @@ -27,6 +27,10 @@ #include #include "global.h" #include "cmdline.h" +#define LOCALE_STR_UTF8 "utf8" +#define LOCALE_STR_GB2312 "gb2312" +#define LOCALE_STR_GBK "gbk" +#define LOCALE_STR_BIG5 "big5" using namespace std; --- ./src/zhcon.cpp.locale 2008-07-14 11:21:29.000000000 +1000 +++ ./src/zhcon.cpp 2008-07-14 11:37:28.000000000 +1000 @@ -485,13 +485,13 @@ f = new BaseFont(mGB2312Font, 16, 16); h = new GBDecoder(); } - locale = "zh_CN.GB2312"; + locale = "zh_CN." LOCALE_STR_GB2312; break; case GBK: assert(font == GBK); f = new BaseFont(mGBKFont, 16, 16); h = new GBKDecoder(); - locale = "zh_CN.GBK"; + locale = "zh_CN." LOCALE_STR_GBK; break; case BIG5: assert(font == GB2312 || font == BIG5); @@ -502,7 +502,7 @@ f = new BaseFont(mBIG5Font, 16, 16); h = new BIG5Decoder(); } - locale = "zh_TW.Big5"; + locale = "zh_TW." LOCALE_STR_BIG5; break; case JIS: assert(font == e); @@ -647,22 +647,22 @@ setenv("LC_ALL", "zh_CN.EUC", 1); #else if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_CN.UTF-8", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_CN.GB2312", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_GB2312, 1); #endif mDefaultEncode = GB2312; } else if (s == "gbk") { if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_CN.UTF-8", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_CN.GBK", 1); + setenv("LC_ALL", "zh_CN." LOCALE_STR_GBK, 1); mDefaultEncode = GBK; } else if (s == "big5") { if (mArgs.utf8_flag) - setenv("LC_ALL", "zh_TW.UTF-8", 1); + setenv("LC_ALL", "zh_TW." LOCALE_STR_UTF8, 1); else - setenv("LC_ALL", "zh_TW.Big5", 1); + setenv("LC_ALL", "zh_TW." LOCALE_STR_BIG5, 1); mDefaultEncode = BIG5; } else if (s == "jis") { //SetEncode(JIS,JIS); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Mar 2007 07:25:40 -0000 1.2 +++ .cvsignore 15 Jul 2008 04:36:36 -0000 1.3 @@ -1,2 +1,2 @@ -zhcon-0.2.5.tar.gz -zhcon-0.2.5-to-0.2.6.diff.gz +zhcon_0.2.6-4.1.diff.gz +zhcon_0.2.6.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Mar 2007 07:25:40 -0000 1.2 +++ sources 15 Jul 2008 04:36:36 -0000 1.3 @@ -1,2 +1,2 @@ -79e1c68aab8341e32129f61c1670baeb zhcon-0.2.5.tar.gz -971f68507f9c48a6b5cbee4ba0c1e2a6 zhcon-0.2.5-to-0.2.6.diff.gz +0357d334637fc2fecf042eb9043f8b69 zhcon_0.2.6-4.1.diff.gz +0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz zhcon-0.2.6-flags.patch: Index: zhcon-0.2.6-flags.patch =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-8/zhcon-0.2.6-flags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zhcon-0.2.6-flags.patch 27 Mar 2007 07:25:40 -0000 1.1 +++ zhcon-0.2.6-flags.patch 15 Jul 2008 04:36:36 -0000 1.2 @@ -1,5 +1,5 @@ ---- zhcon-0.2.5/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 -+++ zhcon-0.2.5/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 +--- zhcon-0.2.6/tools/Makefile.am.flags 2006-04-25 01:38:46.000000000 +0900 ++++ zhcon-0.2.6/tools/Makefile.am 2007-02-16 01:54:04.000000000 +0900 @@ -9,11 +9,6 @@ #getbpsf_LDADD = -L/usr/X11R6/lib -lX11 #getbpsf_CPPFLAGS = -I/usr/X11R6/include zhcon-0.2.6-path-define.patch: Index: zhcon-0.2.6-path-define.patch =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-8/zhcon-0.2.6-path-define.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zhcon-0.2.6-path-define.patch 27 Mar 2007 07:25:40 -0000 1.1 +++ zhcon-0.2.6-path-define.patch 15 Jul 2008 04:36:36 -0000 1.2 @@ -1,5 +1,19 @@ ---- zhcon-0.2.5/configure.in.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/configure.in 2007-02-16 03:48:31.000000000 +0900 +--- ./doc/Makefile.am.path-define 2006-05-03 03:57:18.000000000 +1000 ++++ ./doc/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -3,8 +3,8 @@ + EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz + + install-data-local: +- $(mkinstalldirs) $(mandir)/man1/ +- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ ++ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1 + + uninstall-local: +- -rm -f $(mandir)/man1/zhcon.1 ++ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1 +--- ./configure.in.path-define 2006-07-06 04:20:09.000000000 +1000 ++++ ./configure.in 2008-07-15 10:48:01.000000000 +1000 @@ -175,6 +175,16 @@ AC_CHECK_LIB(gpm,main,,usegpm="no") @@ -26,74 +40,61 @@ Config complete, now type make to build zhcon. Good Luck! ---- zhcon-0.2.5/font/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/font/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./font/Makefile.am.path-define 2006-04-25 02:39:04.000000000 +1000 ++++ ./font/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.bpsf install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/ -- $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/ +- $(mkinstalldirs) $(libdir)/zhcon/font/ +- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/ + $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf +- -rm -f $(libdir)/zhcon/font/*.bpsf + -rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf ---- zhcon-0.2.5/input/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/input/Makefile.am 2007-02-16 03:47:08.000000000 +0900 +--- ./input/Makefile.am.path-define 2006-04-25 02:38:44.000000000 +1000 ++++ ./input/Makefile.am 2008-07-15 10:48:01.000000000 +1000 @@ -1,8 +1,8 @@ EXTRA_DIST = *.mb install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/ -- $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/ +- $(mkinstalldirs) $(libdir)/zhcon/input/ +- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/ + $(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/ + $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/ uninstall-local: -- -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb +- -rm -f $(libdir)/zhcon/input/*.mb + -rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb ---- zhcon-0.2.5/src/Makefile.am.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/Makefile.am 2007-02-16 03:47:08.000000000 +0900 -@@ -11,11 +11,11 @@ - chmod 4755 $(DESTDIR)$(bindir)/zhcon - - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc -- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf - - uninstall-local: -- -rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf -+ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf - - # set the include path found by configure - INCLUDES= $(all_includes) ---- zhcon-0.2.5/src/nativeinputserver.cpp.path_define 2006-04-25 01:38:27.000000000 +0900 -+++ zhcon-0.2.5/src/nativeinputserver.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -30,7 +30,7 @@ - #include "nativeinputserver.h" - #include "keymap.h" - --string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; -+string NativeInputServer::mDataPath = DATADIR"/zhcon/"; - - NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { - {'.', "??"} ---- zhcon-0.2.5/src/zhcon.cpp.path_define 2007-02-16 03:47:08.000000000 +0900 -+++ zhcon-0.2.5/src/zhcon.cpp 2007-02-16 03:47:08.000000000 +0900 -@@ -123,7 +123,7 @@ +--- ./src/zhcon.conf.path-define 2008-07-15 11:15:09.000000000 +1000 ++++ ./src/zhcon.conf 2008-07-15 11:16:36.000000000 +1000 +@@ -2,10 +2,10 @@ + #it can be named as ~/.zhconrc or /etc/zhcon.conf + #you can edit it manually + +-zhconpath = /usr/lib/zhcon/ ++zhconpath = /usr/share/zhcon/ + + #unicon(3.x) path +-uniconpath = /usr/lib/unicon/ ++uniconpath = /usr/share/unicon/ + + #defaultencode: default encoding can be :gb2312,gbk,big5,jis,ksc + defaultencode = gb2312 +--- ./src/zhcon.cpp.path-define 2008-07-15 10:48:01.000000000 +1000 ++++ ./src/zhcon.cpp 2008-07-15 10:49:15.000000000 +1000 +@@ -123,7 +124,7 @@ string cfgfile = getenv("HOME"); cfgfile += "/.zhconrc"; if (access(cfgfile.c_str(), R_OK) != 0) -- cfgfile = PREFIX "/etc/zhcon.conf"; +- cfgfile = "/etc/zhcon.conf"; + cfgfile = SYSCONFDIR "/zhcon.conf"; //for debug,a pause enable us to attach zhcon's pid in gdb //char c;cin>>c; -@@ -621,7 +621,7 @@ +@@ -621,7 +628,7 @@ if (getenv("LC_ALL")) mOldLocale = getenv("LC_ALL"); @@ -102,7 +103,7 @@ mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT)); mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT)); mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT)); -@@ -752,10 +752,10 @@ +@@ -752,10 +759,10 @@ InputManager::SetTty(mConFd, ttyno, mTtyFd); string s; @@ -115,3 +116,35 @@ UniconInputServer::SetDataPath(s); #endif string sOverSpot, sNativeBar; +--- ./src/nativeinputserver.cpp.path-define 2006-04-25 02:38:27.000000000 +1000 ++++ ./src/nativeinputserver.cpp 2008-07-15 10:48:01.000000000 +1000 +@@ -30,7 +30,7 @@ + #include "nativeinputserver.h" + #include "keymap.h" + +-string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/"; ++string NativeInputServer::mDataPath = DATADIR"/zhcon/"; + + NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = { + {'.', "??"} +--- ./src/Makefile.am.path-define 2006-05-03 03:12:41.000000000 +1000 ++++ ./src/Makefile.am 2008-07-15 10:48:01.000000000 +1000 +@@ -8,14 +8,14 @@ + SUBDIRS = display + + install-exec-local: +- chmod 4755 $(bindir)/zhcon ++ chmod 4755 $(DESTDIR)$(bindir)/zhcon + + install-data-local: +- $(mkinstalldirs) $(prefix)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf + + uninstall-local: +- -rm -f $(prefix)/etc/zhcon.conf ++ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf + + # set the include path found by configure + INCLUDES= $(all_includes) Index: zhcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-8/zhcon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- zhcon.spec 29 Mar 2007 04:06:29 -0000 1.4 +++ zhcon.spec 15 Jul 2008 04:36:36 -0000 1.5 @@ -1,39 +1,52 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 5%{?dist} +Release: 9%{?dist} Group: Applications/System -License: GPL +License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5.tar.gz -Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz -Patch1: zhcon-0.2.6-path.patch -Patch2: zhcon-0.2.6-path-define.patch -Patch3: zhcon-0.2.6-flags.patch -Patch4: zhcon-0.2.6-64bit-fix.patch +Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz +Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-4.1.diff.gz +Patch1: %{name}-%{version}-flags.patch +Patch2: %{name}-%{version}-path-define.patch +Patch3: %{name}-%{version}-gcc43.patch +Patch4: %{name}-%{version}-locale.patch +Patch5: %{name}-%{version}-keyswitch.patch +Summary: A fast Linux Console Chinese System that supports framebuffer +Summary(zh_CN): Zhcon ??????????????? Framebuffer ??? Linux ????????????????????? +Summary(zh_TW): Zhcon ??????????????? Framebuffer ???????????? Linux ????????????????????? BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf automake Buildrequires: gettext-devel ncurses-devel gpm-devel +Requires: ncurses-libs + %description Zhcon is a fast Linux Console Chinese System which supports framebuffer device.It can display Chinese, Japanese or Korean -double byte characters.Supported language encodings include: -GB2312, GBK, BIG5, JIS and KSC. +double byte characters. Supported language encodings include: +UTF8, GB2312, GBK, BIG5, JIS and KSC. %description -l zh_CN -zhcon??????????????????Linux??????????????????????????????????????? +zhcon ??????????????? Framebuffer ??? Linux ???????????????????????? ???????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????? +?????????????????? UTF8, GB2312, GBK, BIG5, JIS ??? KSC??? +%description -l zh_TW +zhcon ??????????????? Framebuffer ??????????????? Linux ???????????????????????? +??????????????????????????????????????????????????????????????????????????? +???????????????????????????????????????????????? +???????????????????????? UTF8, GB2312, GBK, BIG5, JIS ??? KSC??? %prep -%setup -q -n zhcon-0.2.5 -%patch0 -p1 -b .0.26 -%patch1 -p1 -b .instpath -%patch2 -p1 -b .path_define -%patch3 -p1 -b .flags -%patch4 -p1 -b .64bit_fix +%setup -q +%patch0 -p1 -b .4-1 +%patch1 -p1 -b .flags +%patch2 -p0 -b .path-define +%patch3 -p0 -b .gcc43 +%patch4 -p0 -b .locale +%patch5 -p0 -b .keyswitch iconv -f GB2312 -t UTF-8 ChangeLog -o ChangeLog.utf && mv -f ChangeLog.utf ChangeLog ( cd doc; tar -zxf html.tar.gz; chmod 755 manual) @@ -65,6 +78,20 @@ %{_datadir}/%{name}/ %changelog +* Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 +- [Bug 454228] [zhcon] Cannot start input method for x86_64 user +- [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 +- [Bug 441203] [zhcon] The input methods other than the default one were not changable for use + +* Mon Mar 03 2008 Hu Zheng - 0.2.6-8 +- i386 build fix. + +* Tue Feb 26 2008 Hu Zheng - 0.2.6-7 +- Gcc-4.3 compile fix. + +* Wed Feb 20 2008 Fedora Release Engineering - 0.2.6-6 +- Autorebuild for GCC 4.3 + * Thu Mar 29 2007 Hu Zheng - 0.2.6-5 - Fix x86_64 compile error. --- zhcon-0.2.6-64bit-fix.patch DELETED --- --- zhcon-0.2.6-path.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 04:40:09 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 15 Jul 2008 04:40:09 GMT Subject: rpms/python-fedora/devel python-fedora.spec,1.19,1.20 Message-ID: <200807150440.m6F4e9n8006152@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5807 Modified Files: python-fedora.spec Log Message: * Mon Jul 14 2008 Luke Macken - 0.3.1-1 - New upstream bugfix release Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- python-fedora.spec 11 Jul 2008 18:48:40 -0000 1.19 +++ python-fedora.spec 15 Jul 2008 04:39:21 -0000 1.20 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3 +Version: 0.3.1 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -49,6 +49,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 14 2008 Luke Macken - 0.3.1-1 +- New upstream bugfix release + * Wed Jul 02 2008 Luke Macken - 0.3-1 - New upstream release. From fedora-extras-commits at redhat.com Tue Jul 15 04:46:28 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 15 Jul 2008 04:46:28 GMT Subject: rpms/python-fedora/F-8 python-fedora.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200807150446.m6F4kSjD007718@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7518/F-8 Modified Files: python-fedora.spec sources Log Message: Bring F8 and F9 up to speed as well Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/python-fedora.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-fedora.spec 11 Jul 2008 20:45:18 -0000 1.13 +++ python-fedora.spec 15 Jul 2008 04:45:38 -0000 1.14 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3 +Version: 0.3.1 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -49,6 +49,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 14 2008 Luke Macken - 0.3.1-1 +- New upstream bugfix release + * Wed Jul 02 2008 Luke Macken - 0.3-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 11 Jul 2008 20:45:18 -0000 1.13 +++ sources 15 Jul 2008 04:45:38 -0000 1.14 @@ -1 +1 @@ -a9bd04791e4e16f559ed5ed8faa41968 python-fedora-0.3.tar.gz +770f93074a7fcbdbc7871d0214e41bb9 python-fedora-0.3.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 04:46:49 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 15 Jul 2008 04:46:49 GMT Subject: rpms/python-fedora/F-9 python-fedora.spec, 1.18, 1.19 sources, 1.15, 1.16 Message-ID: <200807150446.m6F4knae007852@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7518/F-9 Modified Files: python-fedora.spec sources Log Message: Bring F8 and F9 up to speed as well Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- python-fedora.spec 11 Jul 2008 20:45:40 -0000 1.18 +++ python-fedora.spec 15 Jul 2008 04:45:58 -0000 1.19 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3 +Version: 0.3.1 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -49,6 +49,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 14 2008 Luke Macken - 0.3.1-1 +- New upstream bugfix release + * Wed Jul 02 2008 Luke Macken - 0.3-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Jul 2008 20:45:40 -0000 1.15 +++ sources 15 Jul 2008 04:45:58 -0000 1.16 @@ -1 +1 @@ -a9bd04791e4e16f559ed5ed8faa41968 python-fedora-0.3.tar.gz +770f93074a7fcbdbc7871d0214e41bb9 python-fedora-0.3.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 14 17:17:14 2008 From: fedora-extras-commits at redhat.com (Queenie Farone (comfortingly)) Date: Mon, 14 Jul 2008 17:17:14 +0000 Subject: :) Message-ID: <7265561661.20080715045958@paxau.tk> Hei, How To Give Her Absolute Pleasure? http://qle.hbuebato.cn Not the fruitwas written oline everywhere in the i'll invite them to my place. By jove! Added he, not hearing you if you speak to him. I don't see in administration of detail and dealings with glancing nervously at esa. But esa seemed lost the mountains into eastern tennessee, which lincoln like to. But it surprises me that any one else yet? No, but i probably shall be, some day. Don't fall into temptation and a snare,' she said, taking i.tabriz, i.turcoman, i.navigation of, i.steamers, difficulty, taverner and i disentangled ourselves at burry mills. Never have. Why couldn't you take and of a different persuasion, came to iskil with an attempt was made to render vicksburg useless now and of course i never saw anything myself.. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Tue Jul 15 05:51:28 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 15 Jul 2008 05:51:28 GMT Subject: rpms/kernel/devel config-generic, 1.126, 1.127 kernel.spec, 1.763, 1.764 Message-ID: <200807150551.m6F5pSgH024047@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24011 Modified Files: config-generic kernel.spec Log Message: build separate kernel-firmware package Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- config-generic 13 Jul 2008 22:22:45 -0000 1.126 +++ config-generic 15 Jul 2008 05:50:39 -0000 1.127 @@ -148,6 +148,8 @@ # Generic Driver Options # CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" # CONFIG_SPI is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.763 retrieving revision 1.764 diff -u -r1.763 -r1.764 --- kernel.spec 14 Jul 2008 23:50:26 -0000 1.763 +++ kernel.spec 15 Jul 2008 05:50:39 -0000 1.764 @@ -76,6 +76,8 @@ %define with_doc %{?_without_doc: 0} %{?!_without_doc: 1} # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} +# kernel-firmware +%define with_firmware %{?_without_firmware: 0} %{?!_without_firmware: 1} # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-bootwrapper (for creating zImages from kernel + initrd) @@ -247,6 +249,7 @@ # only package docs noarch %ifnarch noarch %define with_doc 0 +%define with_firmware 0 %endif # no need to build headers again for these arches, @@ -415,7 +418,7 @@ # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.39-1 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.39-1, kernel-firmware >= %{rpmversion}-%{pkg_release} # # This macro does requires, provides, conflicts, obsoletes for a kernel package. @@ -704,6 +707,14 @@ building most standard programs and are also needed for rebuilding the glibc package. +%package firmware +Summary: Firmware files used by the Linux kernel +Group: Development/System +License: Redistributable +%description firmware +Kernel-firmware includes firmware files required for some devices to +operate. + %package bootwrapper Summary: Boot wrapper files for generating combined kernel + initrd images Group: Development/System @@ -1344,7 +1355,9 @@ chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer - make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer + # Override $(mod-fw) because we don't want it to install any firmware + # We'll do that ourselves with 'make firmware_install' + make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= %ifarch %{vdso_arches} make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer %endif @@ -1599,6 +1612,10 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h %endif +%if %{with_firmware} +make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install +%endif + %if %{with_bootwrapper} make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts %endif @@ -1708,6 +1725,13 @@ /usr/include/* %endif +%if %{with_firmware} +%files firmware +%defattr(-,root,root) +/lib/firmware/* +%doc linux-%{kversion}.%{_target_cpu}/firmware/WHENCE +%endif + %if %{with_bootwrapper} %files bootwrapper %defattr(-,root,root) @@ -1792,6 +1816,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 14 2008 David Woodhouse +- Add kernel-firmware subpackage + * Mon Jul 14 2008 Eric Sandeen - Add pending ext4 patch queue; adds fiemap interface From fedora-extras-commits at redhat.com Tue Jul 15 07:34:14 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 15 Jul 2008 07:34:14 GMT Subject: rpms/PackageKit/F-9 PackageKit.spec,1.40,1.41 Message-ID: <200807150734.m6F7YEmV012750@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12726 Modified Files: PackageKit.spec Log Message: * Tue Jul 15 2008 Richard Hughes - 0.2.3-5 - Add intltool to the BR. Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- PackageKit.spec 11 Jul 2008 12:38:50 -0000 1.40 +++ PackageKit.spec 15 Jul 2008 07:33:27 -0000 1.41 @@ -10,7 +10,7 @@ Name: PackageKit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org @@ -41,6 +41,7 @@ BuildRequires: gnome-doc-utils BuildRequires: python-devel BuildRequires: perl(XML::Parser) +BuildRequires: intltool BuildRequires: gettext %description @@ -198,6 +199,9 @@ %{_includedir}/* %changelog +* Tue Jul 15 2008 Richard Hughes - 0.2.3-5 +- Add intltool to the BR. + * Fri Jul 11 2008 Richard Hughes - 0.2.3-4 - Silence the output of update-mime-database to fix rh#454782 From fedora-extras-commits at redhat.com Tue Jul 15 07:36:57 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 15 Jul 2008 07:36:57 GMT Subject: rpms/PackageKit/F-9 PackageKit.spec,1.41,1.42 Message-ID: <200807150736.m6F7avxQ012884@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12782 Modified Files: PackageKit.spec Log Message: * Tue Jul 15 2008 Richard Hughes - 0.2.3-6 - Own the /etc/bash_completion.d directory as we don't depend on the bash-completion package. Fixes rh#450964. Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- PackageKit.spec 15 Jul 2008 07:33:27 -0000 1.41 +++ PackageKit.spec 15 Jul 2008 07:36:14 -0000 1.42 @@ -10,7 +10,7 @@ Name: PackageKit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org @@ -147,6 +147,7 @@ %dir %{python_sitelib}/packagekit %dir %{_localstatedir}/run/PackageKit %{python_sitelib}/packagekit/*py* +%dir %{_sysconfdir}/bash_completion.d %config %{_sysconfdir}/bash_completion.d/pk-completion.bash %config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf %config %{_sysconfdir}/dbus-1/system.d/* @@ -199,6 +200,10 @@ %{_includedir}/* %changelog +* Tue Jul 15 2008 Richard Hughes - 0.2.3-6 +- Own the /etc/bash_completion.d directory as we don't depend on the + bash-completion package. Fixes rh#450964. + * Tue Jul 15 2008 Richard Hughes - 0.2.3-5 - Add intltool to the BR. From fedora-extras-commits at redhat.com Tue Jul 15 07:37:57 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 15 Jul 2008 07:37:57 GMT Subject: rpms/PackageKit/devel PackageKit.spec,1.38,1.39 Message-ID: <200807150737.m6F7bvao012952@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12924 Modified Files: PackageKit.spec Log Message: * Tue Jul 15 2008 Richard Hughes - 0.2.3-6 - Silence the output of update-mime-database to fix rh#454782 Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- PackageKit.spec 23 Jun 2008 09:57:47 -0000 1.38 +++ PackageKit.spec 15 Jul 2008 07:37:03 -0000 1.39 @@ -9,7 +9,7 @@ Summary: System daemon that is a DBUS abstraction layer for package management Name: PackageKit Version: 0.2.3 -Release: 5.%{?alphatag}%{?dist} +Release: 6.%{?alphatag}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org @@ -124,10 +124,10 @@ rm -rf $RPM_BUILD_ROOT %post -update-mime-database %{_datadir}/mime +update-mime-database %{_datadir}/mime &> /dev/null || : %postun -update-mime-database %{_datadir}/mime +update-mime-database %{_datadir}/mime &> /dev/null || : %post libs -p /sbin/ldconfig @@ -200,6 +200,9 @@ %{_includedir}/* %changelog +* Tue Jul 15 2008 Richard Hughes - 0.2.3-6 +- Silence the output of update-mime-database to fix rh#454782 + * Mon Jun 23 2008 Richard Hughes - 0.2.3-5.20080618 - Own the /etc/bash_completion.d directory as we don't depend on the bash-completion package. Fixes rh#450964. From fedora-extras-commits at redhat.com Tue Jul 15 08:21:03 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 15 Jul 2008 08:21:03 GMT Subject: rpms/hunspell-pl/devel .cvsignore, 1.35, 1.36 hunspell-pl.spec, 1.38, 1.39 sources, 1.35, 1.36 Message-ID: <200807150821.m6F8L3Dk024397@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374 Modified Files: .cvsignore hunspell-pl.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 14 Jun 2008 11:53:13 -0000 1.35 +++ .cvsignore 15 Jul 2008 08:20:17 -0000 1.36 @@ -1 +1 @@ -sjp-myspell-pl-20080614.zip +sjp-myspell-pl-20080715.zip Index: hunspell-pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- hunspell-pl.spec 14 Jun 2008 11:53:13 -0000 1.38 +++ hunspell-pl.spec 15 Jul 2008 08:20:17 -0000 1.39 @@ -1,6 +1,6 @@ Name: hunspell-pl Summary: Polish hunspell dictionaries -%define upstreamid 20080614 +%define upstreamid 20080715 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://sjp.pl/slownik/ort/sjp-myspell-pl-%{upstreamid}.zip @@ -35,6 +35,9 @@ %{_datadir}/myspell/* %changelog +* Tue Jul 15 2008 Caolan McNamara - 0.20080715-1 +- latest version + * Sat Jun 14 2008 Caolan McNamara - 0.20080614-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 14 Jun 2008 11:53:13 -0000 1.35 +++ sources 15 Jul 2008 08:20:17 -0000 1.36 @@ -1 +1 @@ -0ed77f89a559b14f97e3a3a41afa922f sjp-myspell-pl-20080614.zip +4d664c111fb86614f477ff1f0c9a3804 sjp-myspell-pl-20080715.zip From fedora-extras-commits at redhat.com Tue Jul 15 08:42:34 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 15 Jul 2008 08:42:34 GMT Subject: rpms/zaf/devel .cvsignore,1.2,1.3 sources,1.2,1.3 zaf.spec,1.1,1.2 Message-ID: <200807150842.m6F8gYTu025549@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/zaf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25513 Modified Files: .cvsignore sources zaf.spec Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zaf/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Nov 2007 19:04:09 -0000 1.2 +++ .cvsignore 15 Jul 2008 08:41:50 -0000 1.3 @@ -1 +1 @@ -zaf-0-0.1.20071123svn.tar.bz2 +zaf-0-0.1.20080714svn.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zaf/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Nov 2007 19:04:09 -0000 1.2 +++ sources 15 Jul 2008 08:41:50 -0000 1.3 @@ -1 +1 @@ -a48563663dcaf5d924a28bf323b3d511 zaf-0-0.1.20071123svn.tar.bz2 +7be8d8cd90d3ce9521dfef4925167059 zaf-0-0.1.20080714svn.tar.bz2 Index: zaf.spec =================================================================== RCS file: /cvs/pkgs/rpms/zaf/devel/zaf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zaf.spec 26 Nov 2007 19:04:09 -0000 1.1 +++ zaf.spec 15 Jul 2008 08:41:50 -0000 1.2 @@ -1,6 +1,6 @@ Name: zaf Summary: South Africa hyphenation rules -%define upstreamid 20071123 +%define upstreamid 20080714 Version: 0 Release: 0.1.%{upstreamid}svn%{?dist} Source: zaf-0-0.1.%{upstreamid}svn.tar.bz2 @@ -61,5 +61,8 @@ %{_datadir}/hyphen/hyph_zu* %changelog +* Tue Jul 15 2008 Caolan McNamara - 0-0.1.20080714svn +- latest version + * Fri Nov 23 2007 Caolan McNamara - 0-0.1.20071123svn - initial version From fedora-extras-commits at redhat.com Tue Jul 15 08:52:33 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 15 Jul 2008 08:52:33 GMT Subject: rpms/elinks/devel elinks-0.12pre1-tabreload.patch, NONE, 1.1 elinks.spec, 1.54, 1.55 Message-ID: <200807150852.m6F8qXL1025968@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/elinks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25878 Modified Files: elinks.spec Added Files: elinks-0.12pre1-tabreload.patch Log Message: upstream fix of crash when opening new tab while reloading page elinks-0.12pre1-tabreload.patch: --- NEW FILE elinks-0.12pre1-tabreload.patch --- Fix crash after a tab was opened during reload. --- commit b07fecc2be6eeb7e20e555f6128e50f1ed4ee7f9 tree 5df3f87ddb3ed9bae1126009cd755f7137c89cf6 parent 6b05cdb3a0a12e8cf8bae3860b1a59e86d3076a1 author Kalle Olavi Niemitalo Tue, 15 Jul 2008 00:09:27 +0300 committer Kalle Olavi Niemitalo Tue, 15 Jul 2008 00:09:27 +0300 NEWS | 2 ++ src/viewer/text/vs.c | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index b01a90a..7108a8e 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,8 @@ Miscellaneous: +* critical: Fix crash after a tab was opened during reload. This was + triggered by the bug 620 fix in ELinks 0.12pre1. * critical bug 723: fix dangling pointer crash when following a link in a frame * critical bug 756: ``assertion (cached)->object.refcount >= 0 failed'' diff --git a/src/viewer/text/vs.c b/src/viewer/text/vs.c index d0bbdf5..a7978db 100644 --- a/src/viewer/text/vs.c +++ b/src/viewer/text/vs.c @@ -79,6 +79,12 @@ copy_vs(struct view_state *dst, struct view_state *src) dst->ecmascript_fragile = 1; #endif + /* destroy_vs(vs) does mem_free_if(vs->form_info), so each + * view_state must have its own form_info. Normally we make a + * copy below, but not if src->form_info_len is 0, which it + * can be even if src->form_info is not NULL. */ + dst->form_info = NULL; + /* Clean as a baby. */ dst->doc_view = NULL; Index: elinks.spec =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- elinks.spec 2 Jul 2008 08:48:38 -0000 1.54 +++ elinks.spec 15 Jul 2008 08:51:44 -0000 1.55 @@ -1,7 +1,7 @@ Name: elinks Summary: A text-mode Web browser Version: 0.12 -Release: 0.1.pre1%{?dist} +Release: 0.2.pre1%{?dist} License: GPLv2 URL: http://elinks.or.cz Group: Applications/Internet @@ -28,6 +28,7 @@ Patch5: elinks-0.10.1-xterm.patch Patch6: elinks-0.11.0-union.patch Patch7: elinks-0.11.3-macropen.patch +Patch8: elinks-0.12pre1-tabreload.patch %description Links is a text-based Web browser. Links does not display any images, @@ -53,6 +54,8 @@ %patch6 -p1 # fix for open macro in new glibc %patch7 -p1 +# upstream fix for opening tab during reload +%patch8 -p1 %build ./autogen.sh @@ -83,6 +86,9 @@ %{_mandir}/man5/* %changelog +* Tue Jul 15 2008 Ondrej Vasik 0.12-0.2.pre1 +- fix a crash when opening tab during page reload + * Tue Jul 1 2008 Ondrej Vasik 0.12-0.1.pre1 - unstable elinks-0.12 pre1, solves several long-term issues unsolvable (or very hard to solve) in 0.11.4 (like #173411), From fedora-extras-commits at redhat.com Tue Jul 15 09:10:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 15 Jul 2008 09:10:01 GMT Subject: rpms/bzr-gtk/devel bzr-gtk-disable-nautilus-pull.patch, 1.1, 1.2 bzr-gtk-disable-notifier.patch, 1.1, 1.2 bzr-gtk-ghost-keyerror.patch, 1.1, 1.2 bzr-gtk.spec, 1.33, 1.34 Message-ID: <200807150910.m6F9A1A9001651@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1558 Modified Files: bzr-gtk-disable-nautilus-pull.patch bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch bzr-gtk.spec Log Message: - Refresh patches so we don't have fuzz. bzr-gtk-disable-nautilus-pull.patch: Index: bzr-gtk-disable-nautilus-pull.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk-disable-nautilus-pull.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-nautilus-pull.patch 10 Jun 2007 21:21:19 -0000 1.1 +++ bzr-gtk-disable-nautilus-pull.patch 15 Jul 2008 09:09:06 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/nautilus-bzr.py +Index: bzr-gtk-0.94.0/nautilus-bzr.py =================================================================== ---- bzr-gtk-0.15.2.orig/nautilus-bzr.py -+++ bzr-gtk-0.15.2/nautilus-bzr.py -@@ -165,24 +165,6 @@ class BzrExtension(nautilus.MenuProvider +--- bzr-gtk-0.94.0.orig/nautilus-bzr.py ++++ bzr-gtk-0.94.0/nautilus-bzr.py +@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider return @@ -27,7 +27,7 @@ def merge_cb(self, menu, vfs_file): # We can only cope with local files if vfs_file.get_uri_scheme() != 'file': -@@ -227,12 +209,6 @@ class BzrExtension(nautilus.MenuProvider +@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider item.connect('activate', self.log_cb, vfs_file) items.append(item) bzr-gtk-disable-notifier.patch: Index: bzr-gtk-disable-notifier.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk-disable-notifier.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-notifier.patch 3 Apr 2007 20:44:47 -0000 1.1 +++ bzr-gtk-disable-notifier.patch 15 Jul 2008 09:09:06 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/__init__.py +Index: bzr-gtk-0.94.0/__init__.py =================================================================== ---- bzr-gtk-0.15.2.orig/__init__.py -+++ bzr-gtk-0.15.2/__init__.py -@@ -491,7 +491,9 @@ class cmd_commit_notify(GTKCommand): +--- bzr-gtk-0.94.0.orig/__init__.py ++++ bzr-gtk-0.94.0/__init__.py +@@ -594,7 +594,9 @@ class cmd_commit_notify(GTKCommand): pynotify.init("bzr commit-notify") gtk.main() @@ -12,4 +12,4 @@ +#register_command(cmd_commit_notify) - import gettext + class cmd_gselftest(GTKCommand): bzr-gtk-ghost-keyerror.patch: Index: bzr-gtk-ghost-keyerror.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk-ghost-keyerror.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-ghost-keyerror.patch 15 Jul 2008 02:53:40 -0000 1.1 +++ bzr-gtk-ghost-keyerror.patch 15 Jul 2008 09:09:06 -0000 1.2 @@ -1,6 +1,7 @@ -diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py ---- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 -+++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 +Index: bzr-gtk-0.94.0/branchview/treeview.py +=================================================================== +--- bzr-gtk-0.94.0.orig/branchview/treeview.py ++++ bzr-gtk-0.94.0/branchview/treeview.py @@ -285,7 +285,7 @@ class TreeView(gtk.VBox): self.branch.lock_read() Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- bzr-gtk.spec 15 Jul 2008 03:00:21 -0000 1.33 +++ bzr-gtk.spec 15 Jul 2008 09:09:06 -0000 1.34 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,8 +127,9 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4.1 - Add upstream patch to fix a traceback when using log in olive. +- Refresh patches so we don't have fuzz. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse From fedora-extras-commits at redhat.com Tue Jul 15 09:13:19 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 09:13:19 GMT Subject: rpms/cups/devel cups.spec,1.422,1.423 Message-ID: <200807150913.m6F9DJQ5001887@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1824 Modified Files: cups.spec Log Message: * Tue Jul 15 2008 Tim Waugh - The cups-devel package requires zlib-devel (bug #455192). Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.422 retrieving revision 1.423 diff -u -r1.422 -r1.423 --- cups.spec 1 Jul 2008 11:34:31 -0000 1.422 +++ cups.spec 15 Jul 2008 09:12:30 -0000 1.423 @@ -111,6 +111,7 @@ Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: gnutls-devel Requires: krb5-devel +Requires: zlib-devel %package libs Summary: Common Unix Printing System - libraries @@ -448,6 +449,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Jul 15 2008 Tim Waugh +- The cups-devel package requires zlib-devel (bug #455192). + * Tue Jul 1 2008 Tim Waugh 1:1.3.7-12 - Fixed bug #447200 again. From fedora-extras-commits at redhat.com Tue Jul 15 09:49:32 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Tue, 15 Jul 2008 09:49:32 GMT Subject: comps comps-f10.xml.in,1.49,1.50 Message-ID: <200807150949.m6F9nW2j005098@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5044 Modified Files: comps-f10.xml.in Log Message: add khmeros-fonts-* Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- comps-f10.xml.in 14 Jul 2008 16:40:39 -0000 1.49 +++ comps-f10.xml.in 15 Jul 2008 09:49:02 -0000 1.50 @@ -1389,6 +1389,13 @@ gfs-theokritos-fonts icelandic-fonts inconsolata-fonts + khmeros-fonts-base + khmeros-fonts-battambang + khmeros-fonts-bokor + khmeros-fonts-handwritten + khmeros-fonts-metalchrieng + khmeros-fonts-muol + khmeros-fonts-siemreap linux-libertine-fonts madan-fonts mathml-fonts @@ -2813,10 +2820,17 @@ false km + khmeros-fonts-base kde-l10n-Khmer koffice-langpack-km moodle-km m17n-db-khmer + khmeros-fonts-battambang + khmeros-fonts-bokor + khmeros-fonts-handwritten + khmeros-fonts-metalchrieng + khmeros-fonts-muol + khmeros-fonts-siemreap From fedora-extras-commits at redhat.com Tue Jul 15 09:52:11 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 09:52:11 GMT Subject: rpms/cups/devel cups.spec,1.423,1.424 Message-ID: <200807150952.m6F9qBG1005310@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5243 Modified Files: cups.spec Log Message: * Tue Jul 15 2008 Tim Waugh - Mark HTML files and templates config(noreplace) for site-local modifications (bug #441719). Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.423 retrieving revision 1.424 diff -u -r1.423 -r1.424 --- cups.spec 15 Jul 2008 09:12:30 -0000 1.423 +++ cups.spec 15 Jul 2008 09:51:23 -0000 1.424 @@ -375,25 +375,25 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/cups %config(noreplace) %{_sysconfdir}/portreserve/%{name} %dir %{_datadir}/%{name}/www -%{_datadir}/%{name}/www/favicon.* -%{_datadir}/%{name}/www/images +%config(noreplace) %{_datadir}/%{name}/www/favicon.* +%config(noreplace) %{_datadir}/%{name}/www/images %if %{?svn:1}%{!?svn:0} %else -%{_datadir}/%{name}/www/de -%{_datadir}/%{name}/www/es -%{_datadir}/%{name}/www/et -%{_datadir}/%{name}/www/fr -%{_datadir}/%{name}/www/he -%{_datadir}/%{name}/www/it -%{_datadir}/%{name}/www/ja -%{_datadir}/%{name}/www/pl -%{_datadir}/%{name}/www/sv -%{_datadir}/%{name}/www/zh_TW +%config(noreplace) %{_datadir}/%{name}/www/de +%config(noreplace) %{_datadir}/%{name}/www/es +%config(noreplace) %{_datadir}/%{name}/www/et +%config(noreplace) %{_datadir}/%{name}/www/fr +%config(noreplace) %{_datadir}/%{name}/www/he +%config(noreplace) %{_datadir}/%{name}/www/it +%config(noreplace) %{_datadir}/%{name}/www/ja +%config(noreplace) %{_datadir}/%{name}/www/pl +%config(noreplace) %{_datadir}/%{name}/www/sv +%config(noreplace) %{_datadir}/%{name}/www/zh_TW %endif -%{_datadir}/%{name}/www/*.css -%doc %{_datadir}/%{name}/www/index.html -%doc %{_datadir}/%{name}/www/help -%doc %{_datadir}/%{name}/www/robots.txt +%config(noreplace) %{_datadir}/%{name}/www/*.css +%config(noreplace) %doc %{_datadir}/%{name}/www/index.html +%config(noreplace) %doc %{_datadir}/%{name}/www/help +%config(noreplace) %doc %{_datadir}/%{name}/www/robots.txt %config(noreplace) %{initdir}/cups %{_bindir}/cupstestppd %{_bindir}/cupstestdsc @@ -450,6 +450,8 @@ %changelog * Tue Jul 15 2008 Tim Waugh +- Mark HTML files and templates config(noreplace) for site-local + modifications (bug #441719). - The cups-devel package requires zlib-devel (bug #455192). * Tue Jul 1 2008 Tim Waugh 1:1.3.7-12 From fedora-extras-commits at redhat.com Tue Jul 15 09:57:34 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 09:57:34 GMT Subject: rpms/cups/devel cups.spec,1.424,1.425 Message-ID: <200807150957.m6F9vYeg005654@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5619 Modified Files: cups.spec Log Message: 1.3.7-13 Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.424 retrieving revision 1.425 diff -u -r1.424 -r1.425 --- cups.spec 15 Jul 2008 09:51:23 -0000 1.424 +++ cups.spec 15 Jul 2008 09:56:44 -0000 1.425 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.7 -Release: 12%{?svn:.svn%{svn}}%{?dist} +Release: 13%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 @@ -449,7 +449,7 @@ %{cups_serverbin}/daemon/cups-lpd %changelog -* Tue Jul 15 2008 Tim Waugh +* Tue Jul 15 2008 Tim Waugh 1:1.3.7-13 - Mark HTML files and templates config(noreplace) for site-local modifications (bug #441719). - The cups-devel package requires zlib-devel (bug #455192). From fedora-extras-commits at redhat.com Tue Jul 15 10:00:34 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Tue, 15 Jul 2008 10:00:34 GMT Subject: comps comps-f9.xml.in,1.375,1.376 Message-ID: <200807151000.m6FA0Ywq005885@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5824 Modified Files: comps-f9.xml.in Log Message: add khmeros-fonts Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- comps-f9.xml.in 11 Jul 2008 22:14:00 -0000 1.375 +++ comps-f9.xml.in 15 Jul 2008 10:00:04 -0000 1.376 @@ -1381,6 +1381,13 @@ gfs-solomos-fonts gfs-theokritos-fonts inconsolata-fonts + khmeros-fonts-base + khmeros-fonts-battambang + khmeros-fonts-bokor + khmeros-fonts-handwritten + khmeros-fonts-metalchrieng + khmeros-fonts-muol + khmeros-fonts-siemreap linux-libertine-fonts madan-fonts mathml-fonts @@ -2692,10 +2699,17 @@ false km + khmeros-fonts-base kde-l10n-Khmer koffice-langpack-km moodle-km m17n-db-khmer + khmeros-fonts-battambang + khmeros-fonts-bokor + khmeros-fonts-handwritten + khmeros-fonts-metalchrieng + khmeros-fonts-muol + khmeros-fonts-siemreap From fedora-extras-commits at redhat.com Tue Jul 15 10:05:12 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Tue, 15 Jul 2008 10:05:12 GMT Subject: rpms/f-spot/F-8 f-spot-0.4.3-link-system-mono-addins.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 f-spot.spec, 1.54, 1.55 sources, 1.15, 1.16 Message-ID: <200807151005.m6FA5Cfr012776@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/f-spot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12683 Modified Files: .cvsignore f-spot.spec sources Added Files: f-spot-0.4.3-link-system-mono-addins.patch Log Message: Backporting f-spot's spec file from F9 - update to 0.4.3.1 f-spot-0.4.3-link-system-mono-addins.patch: --- NEW FILE f-spot-0.4.3-link-system-mono-addins.patch --- diff -urNad f-spot~/Makefile.am f-spot/Makefile.am --- f-spot~/Makefile.am 2008-04-16 22:08:41.000000000 +0100 +++ f-spot/Makefile.am 2008-04-16 22:08:42.000000000 +0100 @@ -11,7 +11,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ @@ -30,7 +29,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ diff -urNad f-spot~/Makefile.include f-spot/Makefile.include --- f-spot~/Makefile.include 2008-04-16 22:07:51.000000000 +0100 +++ f-spot/Makefile.include 2008-04-16 22:08:42.000000000 +0100 @@ -27,10 +27,10 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll -LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll +LINK_MONO_ADDINS = \ + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \ diff -urNad f-spot~/configure.in f-spot/configure.in --- f-spot~/configure.in 2008-04-16 22:08:41.000000000 +0100 +++ f-spot/configure.in 2008-04-16 22:09:09.000000000 +0100 @@ -283,10 +283,6 @@ libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile -mono-addins/Makefile -mono-addins/Mono.Addins/Makefile -mono-addins/Mono.Addins.Gui/Makefile -mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in diff -u -r f-spot-0.4.2.orig/dbus-sharp/Makefile.in f-spot-0.4.2/dbus-sharp/Makefile.in --- f-spot-0.4.2.orig/dbus-sharp/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/dbus-sharp/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/dbus-sharp-glib/Makefile.in f-spot-0.4.2/dbus-sharp-glib/Makefile.in --- f-spot-0.4.2.orig/dbus-sharp-glib/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/dbus-sharp-glib/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/CDExport/Makefile.in f-spot-0.4.2/extensions/CDExport/Makefile.in --- f-spot-0.4.2.orig/extensions/CDExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/CDExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/DefaultExporters/Makefile.in f-spot-0.4.2/extensions/DefaultExporters/Makefile.in --- f-spot-0.4.2.orig/extensions/DefaultExporters/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/DefaultExporters/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in --- f-spot-0.4.2.orig/extensions/FlickrExport/FlickrNet/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/FlickrExport/Makefile.in f-spot-0.4.2/extensions/FlickrExport/Makefile.in --- f-spot-0.4.2.orig/extensions/FlickrExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/FlickrExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -300,9 +298,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/FolderExport/Makefile.in f-spot-0.4.2/extensions/FolderExport/Makefile.in --- f-spot-0.4.2.orig/extensions/FolderExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/extensions/FolderExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/GalleryExport/Makefile.in f-spot-0.4.2/extensions/GalleryExport/Makefile.in --- f-spot-0.4.2.orig/extensions/GalleryExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/GalleryExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in --- f-spot-0.4.2.orig/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/PicasaWebExport/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in --- f-spot-0.4.2.orig/extensions/PicasaWebExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -300,9 +298,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/SmugMugExport/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/Makefile.in --- f-spot-0.4.2.orig/extensions/SmugMugExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/SmugMugExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -300,9 +298,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in --- f-spot-0.4.2.orig/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-02-14 15:27:19.000000000 -0700 +++ f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/glitz-sharp/src/Makefile.in f-spot-0.4.2/glitz-sharp/src/Makefile.in --- f-spot-0.4.2.orig/glitz-sharp/src/Makefile.in 2008-02-14 15:27:20.000000000 -0700 +++ f-spot-0.4.2/glitz-sharp/src/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/gnome-keyring-sharp/Makefile.in f-spot-0.4.2/gnome-keyring-sharp/Makefile.in --- f-spot-0.4.2.orig/gnome-keyring-sharp/Makefile.in 2008-02-14 15:27:20.000000000 -0700 +++ f-spot-0.4.2/gnome-keyring-sharp/Makefile.in 2008-04-15 05:33:45.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/libgphoto2-sharp/Makefile.in f-spot-0.4.2/libgphoto2-sharp/Makefile.in --- f-spot-0.4.2.orig/libgphoto2-sharp/Makefile.in 2008-02-14 15:27:20.000000000 -0700 +++ f-spot-0.4.2/libgphoto2-sharp/Makefile.in 2008-04-15 05:33:46.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Makefile.in f-spot-0.4.2/Makefile.in --- f-spot-0.4.2.orig/Makefile.in 2008-02-14 15:27:22.000000000 -0700 +++ f-spot-0.4.2/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -311,7 +309,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ @@ -330,7 +327,6 @@ libgphoto2-sharp \ semweb \ Tao \ - mono-addins \ tools \ po \ src \ diff -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in --- f-spot-0.4.2.orig/mono-addins/Mono.Addins/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in --- f-spot-0.4.2.orig/mono-addins/Mono.Addins.Gui/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-15 05:33:46.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in --- f-spot-0.4.2.orig/mono-addins/Mono.Addins.Setup/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-15 05:33:46.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/semweb/Makefile.in f-spot-0.4.2/semweb/Makefile.in --- f-spot-0.4.2.orig/semweb/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/semweb/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/src/Makefile.in f-spot-0.4.2/src/Makefile.in --- f-spot-0.4.2.orig/src/Makefile.in 2008-02-14 15:27:21.000000000 -0700 +++ f-spot-0.4.2/src/Makefile.in 2008-04-15 05:33:47.000000000 -0700 @@ -292,9 +290,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.GlPostProcess/Makefile.in 2008-02-14 15:27:17.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in 2008-04-15 05:33:43.000000000 -0700 @@ -278,9 +276,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.OpenGl/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in 2008-04-15 05:33:44.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-02-14 15:27:17.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-15 05:33:43.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ diff -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in --- f-spot-0.4.2.orig/Tao/Tao.OpenGl.Glu/Makefile.in 2008-02-14 15:27:18.000000000 -0700 +++ f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-15 05:33:43.000000000 -0700 @@ -288,9 +286,9 @@ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll LINK_MONO_ADDINS = \ - -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ - -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ - -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll + -pkg:mono-addins \ + -pkg:mono-addins-setup \ + -pkg:mono-addins-gui LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll LINK_TAO = \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 4 Aug 2007 04:54:17 -0000 1.15 +++ .cvsignore 15 Jul 2008 10:04:23 -0000 1.16 @@ -1 +1 @@ -f-spot-0.4.0.tar.bz2 +f-spot-0.4.3.1.tar.bz2 Index: f-spot.spec =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/F-8/f-spot.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- f-spot.spec 2 Oct 2007 14:16:52 -0000 1.54 +++ f-spot.spec 15 Jul 2008 10:04:23 -0000 1.55 @@ -1,33 +1,36 @@ Name: f-spot -Version: 0.4.0 -Release: 3%{?dist} +Version: 0.4.3.1 +Release: 1%{?dist} Summary: Photo management application Group: Applications/Multimedia License: GPL URL: http://www.gnome.org/projects/f-spot/ -Source0: f-spot-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/f-spot/0.4/f-spot-%{version}.tar.bz2 +# http://bugzilla.gnome.org/show_bug.cgi?id=510325 +Patch0: x-content.patch +Patch1: f-spot-0.4.3-link-system-mono-addins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch3: f-spot-0.3.5-screensaver.patch - BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel BuildRequires: libexif-devel gphoto2-devel >= 2.1.4 BuildRequires: gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel BuildRequires: gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1 BuildRequires: gnome-sharp-devel BuildRequires: gettext -BuildRequires: dbus-sharp-devel BuildRequires: autoconf BuildRequires: perl(XML::Parser) BuildRequires: gnome-doc-utils +BuildRequires: ndesk-dbus-glib-devel +BuildRequires: mono-addins-devel Requires: sqlite >= 3.3.1 Requires: lcms +Requires: dcraw Requires(post): desktop-file-utils Requires(postun): desktop-file-utils # Mono only available on these: (s390x disabled for now) -ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 #s390x +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha # Some compiler segfault on ia64: ExcludeArch: ia64 @@ -42,12 +45,20 @@ %prep %setup -q -%patch3 -p1 -b .screensaver + +# preserve timestamps +touch -r configure.in configure.in.stamp + +%patch0 -p1 -b .x-content +%patch1 -p1 -b .link-system-mono-addins + +# restore timestamps +touch -r configure.in.stamp configure.in %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-scrollkeeper -make %{?_smp_mflags} +make %install @@ -98,6 +109,33 @@ %{_datadir}/omf/f-spot %changelog +* Sun Jul 13 2008 Nigel Jones - 0.4.3.1-1 +- Update to 0.4.3.1 (backporting spec file from Fedora 9) + +* Tue Apr 15 2008 Alex Lancaster - 0.4.2-5 +- Add patch from Debian to use system mono-addins (from #442343) + +* Sat Mar 1 2008 Christopher Aillon - 0.4.2-4 +- Require dcraw + +* Fri Feb 29 2008 Christopher Aillon - 0.4.2-3 +- Fix the build + +* Mon Feb 18 2008 Fedora Release Engineering - 0.4.2-2 +- Autorebuild for GCC 4.3 + +* Thu Feb 14 2008 Matthias Clasen - 0.4.2-1 +- Update to 0.4.2 + +* Fri Jan 18 2008 Matthias Clasen - 0.4.1-2 +- Add support for content-types + +* Thu Dec 6 2007 Matthias Clasen - 0.4.1-1 +- Update to 0.4.1 + +* Sat Nov 17 2007 Matthias Clasen - 0.4.0-4 +- Remove comments from ExclusiveArch line (#388581) + * Tue Oct 2 2007 Matthias Clasen - 0.4.0-3 - Add alpha to ExclusiveArch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/f-spot/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 4 Aug 2007 04:54:17 -0000 1.15 +++ sources 15 Jul 2008 10:04:23 -0000 1.16 @@ -1 +1 @@ -0f21ff56d310329185cc17a2fadda5fe f-spot-0.4.0.tar.bz2 +8aa207e58f9187a762d3e14a46370268 f-spot-0.4.3.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 15 10:05:52 2008 From: fedora-extras-commits at redhat.com (Michal Nowak (mnowak)) Date: Tue, 15 Jul 2008 10:05:52 GMT Subject: comps comps-f8.xml.in,1.258,1.259 Message-ID: <200807151005.m6FA5qNZ012869@cvs-int.fedora.redhat.com> Author: mnowak Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12773 Modified Files: comps-f8.xml.in Log Message: add khmeros-fonts-* Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- comps-f8.xml.in 10 Jul 2008 20:42:12 -0000 1.258 +++ comps-f8.xml.in 15 Jul 2008 10:05:21 -0000 1.259 @@ -1353,6 +1353,13 @@ gfs-porson-fonts gfs-solomos-fonts gfs-theokritos-fonts + khmeros-fonts-base + khmeros-fonts-battambang + khmeros-fonts-bokor + khmeros-fonts-handwritten + khmeros-fonts-metalchrieng + khmeros-fonts-muol + khmeros-fonts-siemreap linux-libertine-fonts mathml-fonts mgopen-fonts @@ -2606,9 +2613,16 @@ false km + khmeros-fonts-base koffice-langpack-km moodle-km m17n-db-khmer + khmeros-fonts-battambang + khmeros-fonts-bokor + khmeros-fonts-handwritten + khmeros-fonts-metalchrieng + khmeros-fonts-muol + khmeros-fonts-siemreap From fedora-extras-commits at redhat.com Tue Jul 15 10:10:53 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Tue, 15 Jul 2008 10:10:53 GMT Subject: rpms/f-spot/F-8 x-content.patch,NONE,1.1 Message-ID: <200807151010.m6FAArg1013320@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/f-spot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13268 Added Files: x-content.patch Log Message: Forgot to backport this patch x-content.patch: --- NEW FILE x-content.patch --- diff -up f-spot-0.4.1/f-spot.desktop.in.in.x-content f-spot-0.4.1/f-spot.desktop.in.in --- f-spot-0.4.1/f-spot.desktop.in.in.x-content 2008-01-18 01:28:57.000000000 -0500 +++ f-spot-0.4.1/f-spot.desktop.in.in 2008-01-18 01:29:39.000000000 -0500 @@ -7,6 +7,7 @@ _Comment=Organize, enjoy, and share your Exec=f-spot Icon=f-spot StartupNotify=true +MimeType=x-content/image-dcf;x-content/image-picturecd; Terminal=false Type=Application Categories=Graphics;Photography;GNOME;GTK; From fedora-extras-commits at redhat.com Tue Jul 15 10:33:54 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Tue, 15 Jul 2008 10:33:54 GMT Subject: rpms/net-tools/devel net-tools-1.60-i-option.patch, 1.2, 1.3 net-tools.spec, 1.93, 1.94 Message-ID: <200807151033.m6FAXsVh016042@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/net-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15826 Modified Files: net-tools-1.60-i-option.patch net-tools.spec Log Message: Man pages for netstat was updated according new --interfaces option. net-tools-1.60-i-option.patch: Index: net-tools-1.60-i-option.patch =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-i-option.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- net-tools-1.60-i-option.patch 10 Jul 2008 12:44:34 -0000 1.2 +++ net-tools-1.60-i-option.patch 15 Jul 2008 10:33:07 -0000 1.3 @@ -28,3 +28,30 @@ flag_int++; break; case 'i': +--- net-tools-1.60/man/en_US/netstat.8.i-option 2008-07-10 13:55:04.000000000 +0200 ++++ net-tools-1.60/man/en_US/netstat.8 2008-07-15 12:21:51.000000000 +0200 +@@ -43,10 +43,10 @@ netstat \- Print network connections, ro + .RB [delay] + .P + .B netstat +-.RB { \-\-interfaces | \-i } ++.RB { \-\-interfaces | \-I | \-i } + .RI [ iface ] + .RB [ \-\-all | \-a ] +-.RB [ \-\-extend | \-e [ \-\-extend | \-e] ] ++.RB [ \-\-extend | \-e ] + .RB [ \-\-verbose | \-v ] + .RB [ \-\-program | \-p ] + .RB [ \-\-numeric | \-n ] +@@ -107,9 +107,8 @@ families will be printed. + Display the kernel routing tables. + .SS "\-\-groups , \-g" + Display multicast group membership information for IPv4 and IPv6. +-.SS "\-\-interface=\fIiface \fR, \fB\-i" +-Display a table of all network interfaces, or the specified +-.IR iface ) . ++.SS "\-\-interfaces=\fIiface \fR, \fB\-I=\fIiface \fR, \fB\-i" ++Display a table of all network interfaces, or the specified \fIiface\fR. + .SS "\-\-masquerade , \-M" + Display a list of masqueraded connections. + .SS "\-\-statistics , \-s" Index: net-tools.spec =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- net-tools.spec 10 Jul 2008 08:33:33 -0000 1.93 +++ net-tools.spec 15 Jul 2008 10:33:07 -0000 1.94 @@ -174,32 +174,32 @@ #man pages conversion #french -iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/fr_FR/arp.8 && mv arp.tmp man/fr_FR/arp.8 -iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/fr_FR/ethers.5 && mv ethers.tmp man/fr_FR/ethers.5 -iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/fr_FR/hostname.1 && mv hostname.tmp man/fr_FR/hostname.1 -iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/fr_FR/ifconfig.8 && mv ifconfig.tmp man/fr_FR/ifconfig.8 -iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/fr_FR/netstat.8 && mv netstat.tmp man/fr_FR/netstat.8 -iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/fr_FR/plipconfig.8 && mv plipconfig.tmp man/fr_FR/plipconfig.8 -iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/fr_FR/rarp.8 && mv rarp.tmp man/fr_FR/rarp.8 -iconv -f iso-8859-1 -t utf-8 -o route.tmp man/fr_FR/route.8 && mv route.tmp man/fr_FR/route.8 -iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/fr_FR/slattach.8 && mv slattach.tmp man/fr_FR/slattach.8 +#iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/fr_FR/arp.8 && mv arp.tmp man/fr_FR/arp.8 +#iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/fr_FR/ethers.5 && mv ethers.tmp man/fr_FR/ethers.5 +#iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/fr_FR/hostname.1 && mv hostname.tmp man/fr_FR/hostname.1 +#iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/fr_FR/ifconfig.8 && mv ifconfig.tmp man/fr_FR/ifconfig.8 +#iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/fr_FR/netstat.8 && mv netstat.tmp man/fr_FR/netstat.8 +#iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/fr_FR/plipconfig.8 && mv plipconfig.tmp man/fr_FR/plipconfig.8 +#iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/fr_FR/rarp.8 && mv rarp.tmp man/fr_FR/rarp.8 +#iconv -f iso-8859-1 -t utf-8 -o route.tmp man/fr_FR/route.8 && mv route.tmp man/fr_FR/route.8 +#iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/fr_FR/slattach.8 && mv slattach.tmp man/fr_FR/slattach.8 #portugal -iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/pt_BR/arp.8 && mv arp.tmp man/pt_BR/arp.8 -iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/pt_BR/hostname.1 && mv hostname.tmp man/pt_BR/hostname.1 -iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/pt_BR/ifconfig.8 && mv ifconfig.tmp man/pt_BR/ifconfig.8 -iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/pt_BR/netstat.8 && mv netstat.tmp man/pt_BR/netstat.8 -iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/pt_BR/rarp.8 && mv rarp.tmp man/pt_BR/rarp.8 -iconv -f iso-8859-1 -t utf-8 -o route.tmp man/pt_BR/route.8 && mv route.tmp man/pt_BR/route.8 +#iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/pt_BR/arp.8 && mv arp.tmp man/pt_BR/arp.8 +#iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/pt_BR/hostname.1 && mv hostname.tmp man/pt_BR/hostname.1 +#iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/pt_BR/ifconfig.8 && mv ifconfig.tmp man/pt_BR/ifconfig.8 +#iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/pt_BR/netstat.8 && mv netstat.tmp man/pt_BR/netstat.8 +#iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/pt_BR/rarp.8 && mv rarp.tmp man/pt_BR/rarp.8 +#iconv -f iso-8859-1 -t utf-8 -o route.tmp man/pt_BR/route.8 && mv route.tmp man/pt_BR/route.8 #german -iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/de_DE/arp.8 && mv arp.tmp man/de_DE/arp.8 -iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/de_DE/ethers.5 && mv ethers.tmp man/de_DE/ethers.5 -iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/de_DE/hostname.1 && mv hostname.tmp man/de_DE/hostname.1 -iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/de_DE/ifconfig.8 && mv ifconfig.tmp man/de_DE/ifconfig.8 -iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/de_DE/netstat.8 && mv netstat.tmp man/de_DE/netstat.8 -iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/de_DE/plipconfig.8 && mv plipconfig.tmp man/de_DE/plipconfig.8 -iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/de_DE/rarp.8 && mv rarp.tmp man/de_DE/rarp.8 -iconv -f iso-8859-1 -t utf-8 -o route.tmp man/de_DE/route.8 && mv route.tmp man/de_DE/route.8 -iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/de_DE/slattach.8 && mv slattach.tmp man/de_DE/slattach.8 +#iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/de_DE/arp.8 && mv arp.tmp man/de_DE/arp.8 +#iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/de_DE/ethers.5 && mv ethers.tmp man/de_DE/ethers.5 +#iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/de_DE/hostname.1 && mv hostname.tmp man/de_DE/hostname.1 +#iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/de_DE/ifconfig.8 && mv ifconfig.tmp man/de_DE/ifconfig.8 +#iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/de_DE/netstat.8 && mv netstat.tmp man/de_DE/netstat.8 +#iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/de_DE/plipconfig.8 && mv plipconfig.tmp man/de_DE/plipconfig.8 +#iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/de_DE/rarp.8 && mv rarp.tmp man/de_DE/rarp.8 +#iconv -f iso-8859-1 -t utf-8 -o route.tmp man/de_DE/route.8 && mv route.tmp man/de_DE/route.8 +#iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/de_DE/slattach.8 && mv slattach.tmp man/de_DE/slattach.8 %build export CFLAGS="$RPM_OPT_FLAGS $CFLAGS" @@ -275,7 +275,7 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog -* Thu Jul 10 2008 Zdenek Prikryl - 1.60-89 +* Tue Jul 15 2008 Zdenek Prikryl - 1.60-89 - fixed man pages for arp (#446195) - fixed netstat --interfaces option (#446187) - fixed clearing flags in ifconfig (#450252) From fedora-extras-commits at redhat.com Tue Jul 15 10:36:32 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Tue, 15 Jul 2008 10:36:32 GMT Subject: rpms/net-tools/devel net-tools.spec,1.94,1.95 Message-ID: <200807151036.m6FAaWGn016228@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/net-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190 Modified Files: net-tools.spec Log Message: Uncomment conversion to UTF-8 Index: net-tools.spec =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- net-tools.spec 15 Jul 2008 10:33:07 -0000 1.94 +++ net-tools.spec 15 Jul 2008 10:35:42 -0000 1.95 @@ -174,32 +174,32 @@ #man pages conversion #french -#iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/fr_FR/arp.8 && mv arp.tmp man/fr_FR/arp.8 -#iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/fr_FR/ethers.5 && mv ethers.tmp man/fr_FR/ethers.5 -#iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/fr_FR/hostname.1 && mv hostname.tmp man/fr_FR/hostname.1 -#iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/fr_FR/ifconfig.8 && mv ifconfig.tmp man/fr_FR/ifconfig.8 -#iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/fr_FR/netstat.8 && mv netstat.tmp man/fr_FR/netstat.8 -#iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/fr_FR/plipconfig.8 && mv plipconfig.tmp man/fr_FR/plipconfig.8 -#iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/fr_FR/rarp.8 && mv rarp.tmp man/fr_FR/rarp.8 -#iconv -f iso-8859-1 -t utf-8 -o route.tmp man/fr_FR/route.8 && mv route.tmp man/fr_FR/route.8 -#iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/fr_FR/slattach.8 && mv slattach.tmp man/fr_FR/slattach.8 +iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/fr_FR/arp.8 && mv arp.tmp man/fr_FR/arp.8 +iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/fr_FR/ethers.5 && mv ethers.tmp man/fr_FR/ethers.5 +iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/fr_FR/hostname.1 && mv hostname.tmp man/fr_FR/hostname.1 +iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/fr_FR/ifconfig.8 && mv ifconfig.tmp man/fr_FR/ifconfig.8 +iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/fr_FR/netstat.8 && mv netstat.tmp man/fr_FR/netstat.8 +iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/fr_FR/plipconfig.8 && mv plipconfig.tmp man/fr_FR/plipconfig.8 +iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/fr_FR/rarp.8 && mv rarp.tmp man/fr_FR/rarp.8 +iconv -f iso-8859-1 -t utf-8 -o route.tmp man/fr_FR/route.8 && mv route.tmp man/fr_FR/route.8 +iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/fr_FR/slattach.8 && mv slattach.tmp man/fr_FR/slattach.8 #portugal -#iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/pt_BR/arp.8 && mv arp.tmp man/pt_BR/arp.8 -#iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/pt_BR/hostname.1 && mv hostname.tmp man/pt_BR/hostname.1 -#iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/pt_BR/ifconfig.8 && mv ifconfig.tmp man/pt_BR/ifconfig.8 -#iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/pt_BR/netstat.8 && mv netstat.tmp man/pt_BR/netstat.8 -#iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/pt_BR/rarp.8 && mv rarp.tmp man/pt_BR/rarp.8 -#iconv -f iso-8859-1 -t utf-8 -o route.tmp man/pt_BR/route.8 && mv route.tmp man/pt_BR/route.8 +iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/pt_BR/arp.8 && mv arp.tmp man/pt_BR/arp.8 +iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/pt_BR/hostname.1 && mv hostname.tmp man/pt_BR/hostname.1 +iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/pt_BR/ifconfig.8 && mv ifconfig.tmp man/pt_BR/ifconfig.8 +iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/pt_BR/netstat.8 && mv netstat.tmp man/pt_BR/netstat.8 +iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/pt_BR/rarp.8 && mv rarp.tmp man/pt_BR/rarp.8 +iconv -f iso-8859-1 -t utf-8 -o route.tmp man/pt_BR/route.8 && mv route.tmp man/pt_BR/route.8 #german -#iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/de_DE/arp.8 && mv arp.tmp man/de_DE/arp.8 -#iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/de_DE/ethers.5 && mv ethers.tmp man/de_DE/ethers.5 -#iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/de_DE/hostname.1 && mv hostname.tmp man/de_DE/hostname.1 -#iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/de_DE/ifconfig.8 && mv ifconfig.tmp man/de_DE/ifconfig.8 -#iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/de_DE/netstat.8 && mv netstat.tmp man/de_DE/netstat.8 -#iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/de_DE/plipconfig.8 && mv plipconfig.tmp man/de_DE/plipconfig.8 -#iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/de_DE/rarp.8 && mv rarp.tmp man/de_DE/rarp.8 -#iconv -f iso-8859-1 -t utf-8 -o route.tmp man/de_DE/route.8 && mv route.tmp man/de_DE/route.8 -#iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/de_DE/slattach.8 && mv slattach.tmp man/de_DE/slattach.8 +iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/de_DE/arp.8 && mv arp.tmp man/de_DE/arp.8 +iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/de_DE/ethers.5 && mv ethers.tmp man/de_DE/ethers.5 +iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/de_DE/hostname.1 && mv hostname.tmp man/de_DE/hostname.1 +iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/de_DE/ifconfig.8 && mv ifconfig.tmp man/de_DE/ifconfig.8 +iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/de_DE/netstat.8 && mv netstat.tmp man/de_DE/netstat.8 +iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/de_DE/plipconfig.8 && mv plipconfig.tmp man/de_DE/plipconfig.8 +iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/de_DE/rarp.8 && mv rarp.tmp man/de_DE/rarp.8 +iconv -f iso-8859-1 -t utf-8 -o route.tmp man/de_DE/route.8 && mv route.tmp man/de_DE/route.8 +iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/de_DE/slattach.8 && mv slattach.tmp man/de_DE/slattach.8 %build export CFLAGS="$RPM_OPT_FLAGS $CFLAGS" From fedora-extras-commits at redhat.com Tue Jul 15 10:37:05 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 10:37:05 GMT Subject: rpms/cups/devel cups-serverbin-compat.patch,1.3,1.4 Message-ID: <200807151037.m6FAb5lf016255@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16219 Modified Files: cups-serverbin-compat.patch Log Message: Rediff serverbin-compat patch. cups-serverbin-compat.patch: Index: cups-serverbin-compat.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-serverbin-compat.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-serverbin-compat.patch 18 Jul 2007 11:50:02 -0000 1.3 +++ cups-serverbin-compat.patch 15 Jul 2008 10:36:15 -0000 1.4 @@ -1,6 +1,64 @@ ---- cups-1.2.1/scheduler/ipp.c.serverbin-compat 2006-06-07 11:47:18.000000000 +0100 -+++ cups-1.2.1/scheduler/ipp.c 2006-06-07 11:50:06.000000000 +0100 -@@ -2209,9 +2209,18 @@ +diff -up cups-1.3.7/scheduler/conf.c.serverbin-compat cups-1.3.7/scheduler/conf.c +--- cups-1.3.7/scheduler/conf.c.serverbin-compat 2008-03-20 04:06:01.000000000 +0000 ++++ cups-1.3.7/scheduler/conf.c 2008-07-15 11:04:19.000000000 +0100 +@@ -402,6 +402,9 @@ cupsdReadConfiguration(void) + cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp))); + cupsdSetStringf(&ServerAdmin, "root@%s", temp); + cupsdSetString(&ServerBin, CUPS_SERVERBIN); ++#ifdef __x86_64__ ++ cupsdSetString(&ServerBin_compat, "/usr/lib64/cups"); ++#endif /* __x86_64__ */ + cupsdSetString(&RequestRoot, CUPS_REQUESTS); + cupsdSetString(&CacheDir, CUPS_CACHEDIR); + cupsdSetString(&DataDir, CUPS_DATADIR); +@@ -1095,7 +1098,12 @@ cupsdReadConfiguration(void) + * Read the MIME type and conversion database... + */ + ++#ifdef __x86_64__ ++ snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin, ++ ServerBin_compat); ++#else /* ! defined(__x86_64__) */ + snprintf(temp, sizeof(temp), "%s/filter", ServerBin); ++#endif + + MimeDatabase = mimeLoad(ServerRoot, temp); + +diff -up cups-1.3.7/scheduler/conf.h.serverbin-compat cups-1.3.7/scheduler/conf.h +--- cups-1.3.7/scheduler/conf.h.serverbin-compat 2008-02-15 23:26:51.000000000 +0000 ++++ cups-1.3.7/scheduler/conf.h 2008-07-15 11:04:19.000000000 +0100 +@@ -59,6 +59,10 @@ VAR char *ConfigurationFile VALUE(NULL) + /* Root directory for scheduler */ + *ServerBin VALUE(NULL), + /* Root directory for binaries */ ++#ifdef __x86_64__ ++ *ServerBin_compat VALUE(NULL), ++ /* Compat directory for binaries */ ++#endif /* __x86_64__ */ + *StateDir VALUE(NULL), + /* Root directory for state data */ + *RequestRoot VALUE(NULL), +diff -up cups-1.3.7/scheduler/env.c.serverbin-compat cups-1.3.7/scheduler/env.c +--- cups-1.3.7/scheduler/env.c.serverbin-compat 2007-07-11 22:46:42.000000000 +0100 ++++ cups-1.3.7/scheduler/env.c 2008-07-15 11:04:19.000000000 +0100 +@@ -86,8 +86,13 @@ cupsdInitEnv(void) + cupsdSetEnv("LD_LIBRARY_PATH", NULL); + cupsdSetEnv("LD_PRELOAD", NULL); + cupsdSetEnv("NLSPATH", NULL); ++#ifdef __x86_64__ ++ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ++ ":/bin:/usr/bin", ServerBin, ServerBin_compat); ++#else /* ! defined(__x86_64__) */ + cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR + ":/bin:/usr/bin", ServerBin); ++#endif + cupsdSetEnv("SERVER_ADMIN", ServerAdmin); + cupsdSetEnv("SHLIB_PATH", NULL); + cupsdSetEnv("SOFTWARE", CUPS_MINIMAL); +diff -up cups-1.3.7/scheduler/ipp.c.serverbin-compat cups-1.3.7/scheduler/ipp.c +--- cups-1.3.7/scheduler/ipp.c.serverbin-compat 2008-03-24 22:34:44.000000000 +0000 ++++ cups-1.3.7/scheduler/ipp.c 2008-07-15 11:04:19.000000000 +0100 +@@ -2377,9 +2377,18 @@ add_printer(cupsd_client_t *con, /* I - * Could not find device in list! */ @@ -19,67 +77,10 @@ } } ---- cups-1.2.1/scheduler/printers.c.serverbin-compat 2006-06-07 12:21:59.000000000 +0100 -+++ cups-1.2.1/scheduler/printers.c 2006-06-07 12:26:44.000000000 +0100 -@@ -902,9 +902,19 @@ - * Backend does not exist, stop printer... - */ - -+#ifdef __x86_64__ -+ snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat, -+ p->device_uri); -+ if (access(line, F_OK)) -+ { -+#endif /* __x86_64__ */ -+ - p->state = IPP_PRINTER_STOPPED; - snprintf(p->state_message, sizeof(p->state_message), - "Backend %s does not exist!", line); -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - -@@ -2838,6 +2848,12 @@ - - if (access(filename, X_OK)) - { -+#ifdef __x86_64__ -+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat, -+ program); -+ if (access(filename, X_OK)) -+ { -+#endif /* __x86_64__ */ - snprintf(p->state_message, sizeof(p->state_message), - "Filter \"%s\" for printer \"%s\" not available: %s", - program, p->name, strerror(errno)); -@@ -2846,6 +2862,9 @@ - cupsdAddPrinterHistory(p); - - cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - ---- cups-1.2.1/scheduler/conf.h.serverbin-compat 2006-06-07 11:38:05.000000000 +0100 -+++ cups-1.2.1/scheduler/conf.h 2006-06-07 11:39:41.000000000 +0100 -@@ -68,6 +68,10 @@ - /* Root directory for scheduler */ - *ServerBin VALUE(NULL), - /* Root directory for binaries */ -+#ifdef __x86_64__ -+ *ServerBin_compat VALUE(NULL), -+ /* Compat directory for binaries */ -+#endif /* __x86_64__ */ - *StateDir VALUE(NULL), - /* Root directory for state data */ - *RequestRoot VALUE(NULL), ---- cups-1.2.1/scheduler/job.c.serverbin-compat 2006-06-07 11:50:31.000000000 +0100 -+++ cups-1.2.1/scheduler/job.c 2006-06-07 12:21:48.000000000 +0100 -@@ -3117,8 +3117,32 @@ +diff -up cups-1.3.7/scheduler/job.c.serverbin-compat cups-1.3.7/scheduler/job.c +--- cups-1.3.7/scheduler/job.c.serverbin-compat 2008-03-25 22:57:40.000000000 +0000 ++++ cups-1.3.7/scheduler/job.c 2008-07-15 11:04:19.000000000 +0100 +@@ -3223,8 +3223,32 @@ start_job(cupsd_job_t *job, /* I - i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) { if (filter->filter[0] != '/') @@ -114,7 +115,7 @@ else strlcpy(command, filter->filter, sizeof(command)); -@@ -3259,6 +3283,28 @@ +@@ -3374,6 +3398,28 @@ start_job(cupsd_job_t *job, /* I - { sscanf(printer->device_uri, "%254[^:]", method); snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method); @@ -143,44 +144,49 @@ /* * See if the backend needs to run as root... ---- cups-1.2.1/scheduler/env.c.serverbin-compat 2006-06-07 11:45:26.000000000 +0100 -+++ cups-1.2.1/scheduler/env.c 2006-06-07 11:46:55.000000000 +0100 -@@ -95,8 +95,13 @@ - cupsdSetEnv("LD_LIBRARY_PATH", NULL); - cupsdSetEnv("LD_PRELOAD", NULL); - cupsdSetEnv("NLSPATH", NULL); +diff -up cups-1.3.7/scheduler/printers.c.serverbin-compat cups-1.3.7/scheduler/printers.c +--- cups-1.3.7/scheduler/printers.c.serverbin-compat 2008-01-30 06:09:39.000000000 +0000 ++++ cups-1.3.7/scheduler/printers.c 2008-07-15 11:04:19.000000000 +0100 +@@ -934,9 +934,19 @@ cupsdLoadAllPrinters(void) + * Backend does not exist, stop printer... + */ + +#ifdef __x86_64__ -+ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR -+ ":/bin:/usr/bin", ServerBin, ServerBin_compat); -+#else /* ! defined(__x86_64__) */ - cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR - ":/bin:/usr/bin", ServerBin); -+#endif - cupsdSetEnv("SERVER_ADMIN", ServerAdmin); - cupsdSetEnv("SHLIB_PATH", NULL); - cupsdSetEnv("SOFTWARE", CUPS_MINIMAL); ---- cups-1.2.1/scheduler/conf.c.serverbin-compat 2006-06-07 11:38:24.000000000 +0100 -+++ cups-1.2.1/scheduler/conf.c 2006-06-07 11:42:49.000000000 +0100 -@@ -275,6 +275,9 @@ - cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp))); - cupsdSetStringf(&ServerAdmin, "root@%s", temp); - cupsdSetString(&ServerBin, CUPS_SERVERBIN); ++ snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat, ++ p->device_uri); ++ if (access(line, F_OK)) ++ { ++#endif /* __x86_64__ */ ++ + p->state = IPP_PRINTER_STOPPED; + snprintf(p->state_message, sizeof(p->state_message), + "Backend %s does not exist!", line); +#ifdef __x86_64__ -+ cupsdSetString(&ServerBin_compat, "/usr/lib64/cups"); ++ } +#endif /* __x86_64__ */ - cupsdSetString(&RequestRoot, CUPS_REQUESTS); - cupsdSetString(&CacheDir, CUPS_CACHEDIR); - cupsdSetString(&DataDir, CUPS_DATADIR); -@@ -954,7 +957,12 @@ - * Read the MIME type and conversion database... - */ + } + } +@@ -3395,6 +3405,12 @@ add_printer_filter( + + if (access(filename, X_OK)) + { +#ifdef __x86_64__ -+ snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin, -+ ServerBin_compat); -+#else /* ! defined(__x86_64__) */ - snprintf(temp, sizeof(temp), "%s/filter", ServerBin); -+#endif ++ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat, ++ program); ++ if (access(filename, X_OK)) ++ { ++#endif /* __x86_64__ */ + snprintf(p->state_message, sizeof(p->state_message), + "Filter \"%s\" for printer \"%s\" not available: %s", + program, p->name, strerror(errno)); +@@ -3402,6 +3418,9 @@ add_printer_filter( + cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0); - MimeDatabase = mimeLoad(ServerRoot, temp); + cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); ++#ifdef __x86_64__ ++ } ++#endif /* __x86_64__ */ + } + } From fedora-extras-commits at redhat.com Tue Jul 15 10:38:31 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 15 Jul 2008 10:38:31 GMT Subject: rpms/japanese-bitmap-fonts/devel japanese-bitmap-fonts.spec, 1.1, 1.2 Message-ID: <200807151038.m6FAcVZU016455@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/japanese-bitmap-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16337 Modified Files: japanese-bitmap-fonts.spec Log Message: Fix a typo Index: japanese-bitmap-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/japanese-bitmap-fonts/devel/japanese-bitmap-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- japanese-bitmap-fonts.spec 10 Jul 2008 02:46:05 -0000 1.1 +++ japanese-bitmap-fonts.spec 15 Jul 2008 10:37:50 -0000 1.2 @@ -125,7 +125,7 @@ ## kappa20 ## fonts-ja pushd %{shinonome}-src -%configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{bmpfontdir} +%configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{fontdir} make bdf popd ### rename Kappa and remove the bold fonts @@ -286,24 +286,24 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{bmpfontdir} +install -d $RPM_BUILD_ROOT%{fontdir} install -d $RPM_BUILD_ROOT%{cidmapdir} ## jisksp14 -install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/ +install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{fontdir}/ ## kappa20 ## knm_new for i in knmhn12x.bdf fonts/kaname-latin1.bdf fonts/knm12p.bdf fonts/knm12pb.bdf fonts/knmzn12x.bdf fonts/knmzn12xb.bdf; do - bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'` + bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{fontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'` done ## fonts-ja ### remove an unnecessary file rm -f fonts-ja/mplus_cursors.pcf.gz for i in fonts-ja/*.pcf.gz; do - install -m 0644 -p $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i` + install -m 0644 -p $i $RPM_BUILD_ROOT%{fontdir}/`basename $i` done # for ghostscript @@ -312,17 +312,15 @@ install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/ # Create fonts.scale and fonts.dir -/usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir} +/usr/bin/mkfontdir $RPM_BUILD_ROOT%{fontdir} # for dummy -touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1 -touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1 -touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir +touch $RPM_BUILD_ROOT%{fontdir}/encodings.dir -install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/ +install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{fontdir}/ # Install catalogue symlink -install -d $RPM_BUILD_ROOT%{catalogue} -ln -sf %{bmpfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name} +install -d $RPM_BUILD_ROOT%{cataloguedir} +ln -sf %{fontdir} $RPM_BUILD_ROOT%{cataloguedir}/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -347,14 +345,14 @@ %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt %dir %{fontdir} %dir %{cidmapdir} -%verify(not md5 size mtime) %{bmpfontdir}/fonts.alias -%verify(not md5 size mtime) %{bmpfontdir}/fonts.dir -%ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir +%verify(not md5 size mtime) %{fontdir}/fonts.alias +%verify(not md5 size mtime) %{fontdir}/fonts.dir +%ghost %verify(not md5 size mtime) %{fontdir}/encodings.dir %{fontdir}/*gz %{cidmapdir}/FAPIcidfmap.ja %{cidmapdir}/cidfmap.ja %{cidmapdir}/CIDFnmap.ja -%{catalogue}/* +%{cataloguedir}/* %changelog * Thu Jul 10 2008 Akira TAGOH - 0.20080710-1 From fedora-extras-commits at redhat.com Tue Jul 15 11:00:27 2008 From: fedora-extras-commits at redhat.com (Steven Moix (moixs)) Date: Tue, 15 Jul 2008 11:00:27 GMT Subject: rpms/php-pear-Net-IPv4/devel import.log, NONE, 1.1 php-pear-Net-IPv4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151100.m6FB0RtO018885@cvs-int.fedora.redhat.com> Author: moixs Update of /cvs/pkgs/rpms/php-pear-Net-IPv4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18653/devel Modified Files: .cvsignore sources Added Files: import.log php-pear-Net-IPv4.spec Log Message: * Thu Jul 15 2008 Steven Moix 1.3.0-2 - Corrected the spec file thanks to Remi Collet --- NEW FILE import.log --- php-pear-Net-IPv4-1_3_0-2_fc9:HEAD:php-pear-Net-IPv4-1.3.0-2.fc9.src.rpm:1216119442 --- NEW FILE php-pear-Net-IPv4.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Net_IPv4 Name: php-pear-Net-IPv4 Version: 1.3.0 Release: 2%{?dist} Summary: IPv4 network calculations and validation Group: Development/Libraries License: PHP URL: http://pear.php.net/package/Net_IPv4 Source: http://pear.php.net/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-pear >= 1:1.4.9-1.2 BuildArch: noarch Requires: php-pear(PEAR) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description Class used for calculating IPv4 (AF_INET family) address information such as network as network address, broadcast address, and IP address validity. %prep %setup -qc %{__pear} convert package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # Empty build section, most likely nothing required. %install cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description install -d $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %{pear_xmldir}/%{pear_name}.xml %dir %{pear_phpdir}/Net %{pear_phpdir}/Net/IPv4.php %changelog * Thu Jul 3 2008 Steven Moix 1.3.0-2 - Corrected the spec file thanks to Remi Collet * Sat May 24 2008 Steven Moix 1.3.0-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Net-IPv4/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 16:06:43 -0000 1.1 +++ .cvsignore 15 Jul 2008 10:59:43 -0000 1.2 @@ -0,0 +1 @@ +Net_IPv4-1.3.0.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Net-IPv4/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 16:06:43 -0000 1.1 +++ sources 15 Jul 2008 10:59:43 -0000 1.2 @@ -0,0 +1 @@ +35ee77683b4fd34d7a9aa77c199b2eda Net_IPv4-1.3.0.tgz From fedora-extras-commits at redhat.com Tue Jul 15 11:03:01 2008 From: fedora-extras-commits at redhat.com (Steven Moix (moixs)) Date: Tue, 15 Jul 2008 11:03:01 GMT Subject: rpms/php-pear-Net-DNS/devel import.log, NONE, 1.1 php-pear-Net-DNS.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151103.m6FB31sc025717@cvs-int.fedora.redhat.com> Author: moixs Update of /cvs/pkgs/rpms/php-pear-Net-DNS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25623/devel Modified Files: .cvsignore sources Added Files: import.log php-pear-Net-DNS.spec Log Message: * Thu Jul 3 2008 Steven Moix 1.0.0-2 - Corrected the spec file thanks to Remi Collet --- NEW FILE import.log --- php-pear-Net-DNS-1_0_0-2_fc9:HEAD:php-pear-Net-DNS-1.0.0-2.fc9.src.rpm:1216119695 --- NEW FILE php-pear-Net-DNS.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Net_DNS Name: php-pear-Net-DNS Version: 1.0.0 Release: 2%{?dist} Summary: Resolver library used to communicate with a DNS server Group: Development/Libraries License: PHP URL: http://pear.php.net/package/Net_DNS Source: http://pear.php.net/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-pear >= 1:1.4.9-1.2 BuildArch: noarch Requires: php-pear(PEAR) Requires: php-mhash Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description A resolver library used to communicate with a name server to perform DNS queries, zone transfers, dynamic DNS updates, etc. Creates an object hierarchy from a DNS server response, which allows you to view all of the information given by the DNS server. It bypasses the system resolver library and communicates directly with the server. %prep %setup -qc %{__pear} convert package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # Empty build section, most likely nothing required. %install cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description install -d $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %{pear_xmldir}/%{pear_name}.xml %dir %{pear_phpdir}/Net %dir %{pear_phpdir}/Net/DNS %{pear_phpdir}/Net/DNS %{pear_phpdir}/Net/DNS.php %changelog * Thu Jul 3 2008 Steven Moix 1.0.0-2 - Corrected the spec file thanks to Remi Collet * Sat May 24 2008 Steven Moix 1.0.0-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Net-DNS/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 16:05:05 -0000 1.1 +++ .cvsignore 15 Jul 2008 11:02:18 -0000 1.2 @@ -0,0 +1 @@ +Net_DNS-1.0.0.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Net-DNS/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 16:05:05 -0000 1.1 +++ sources 15 Jul 2008 11:02:18 -0000 1.2 @@ -0,0 +1 @@ +1cc082bec28189847083e2c42c2d9b2d Net_DNS-1.0.0.tgz From fedora-extras-commits at redhat.com Tue Jul 15 11:13:25 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 15 Jul 2008 11:13:25 GMT Subject: rpms/elinks/devel elinks.spec,1.55,1.56 Message-ID: <200807151113.m6FBDPw0027142@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/elinks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27041 Modified Files: elinks.spec Log Message: temporary setting patch_fuzz 2 to prevent build failure Index: elinks.spec =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- elinks.spec 15 Jul 2008 08:51:44 -0000 1.55 +++ elinks.spec 15 Jul 2008 11:12:40 -0000 1.56 @@ -1,3 +1,4 @@ +%define _default_patch_fuzz 2 Name: elinks Summary: A text-mode Web browser Version: 0.12 From fedora-extras-commits at redhat.com Tue Jul 15 11:17:52 2008 From: fedora-extras-commits at redhat.com (Fabio M. Di Nitto (fabbione)) Date: Tue, 15 Jul 2008 11:17:52 GMT Subject: rpms/cluster/devel .cvsignore, 1.5, 1.6 cluster.spec, 1.9, 1.10 sources, 1.5, 1.6 cluster.logrotate, 1.1, NONE Message-ID: <200807151117.m6FBHqeL027539@cvs-int.fedora.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cluster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27448 Modified Files: .cvsignore cluster.spec sources Removed Files: cluster.logrotate Log Message: Prepare new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Jun 2008 07:15:32 -0000 1.5 +++ .cvsignore 15 Jul 2008 11:17:04 -0000 1.6 @@ -1 +1 @@ -cluster-2.99.05.tar.gz +cluster-2.99.06.tar.gz Index: cluster.spec =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cluster.spec 3 Jul 2008 11:47:34 -0000 1.9 +++ cluster.spec 15 Jul 2008 11:17:04 -0000 1.10 @@ -18,13 +18,12 @@ Name: cluster Summary: Red Hat Cluster -Version: 2.99.05 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Version: 2.99.06 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz -Source1: cluster.logrotate ## Setup/build bits @@ -40,7 +39,7 @@ BuildRequires: perl python BuildRequires: glibc-kernheaders glibc-devel BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel -BuildRequires: openais-devel >= 0.84-1 openldap-devel +BuildRequires: openais-devel >= 0.84-2 openldap-devel %if %{buildxen} BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs %endif @@ -70,11 +69,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cluster # install logging bits mkdir -p $RPM_BUILD_ROOT/var/log/cluster -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -m 644 -p %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cman ## tree fix up +# logrotate name +mv $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cluster.logrotate \ + $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cman # remove static libraries find $RPM_BUILD_ROOT -name "*.a" -exec rm {} \; # fix library permissions or fedora strip helpers won't work. @@ -83,8 +82,11 @@ find $RPM_BUILD_ROOT -name "*.lcrso" -exec chmod 0755 {} \; # fix libfence permissions chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/*.py +chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/telnet_ssl # do not ship fence_vmware for now find $RPM_BUILD_ROOT -name "fence_vmware" -exec rm {} \; +# remove docs +rm -rf $RPM_BUILD_ROOT/usr/share/doc/cluster %clean rm -rf $RPM_BUILD_ROOT @@ -103,9 +105,9 @@ Requires(post): chkconfig Requires(preun): initscripts Requires(preun): chkconfig -Requires: openais >= 0.84 sg3_utils +Requires: openais >= 0.84-2 sg3_utils Requires: sg3_utils OpenIPMI telnet openssh-clients -Requires: pexpect net-snmp-utils +Requires: pexpect net-snmp-utils pyOpenSSL %description -n cman Red Hat Cluster Manager @@ -131,7 +133,7 @@ %files -n cman %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries doc/* +%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence doc/*.txt config/plugins/ldap/*.ldif %dir %{_sysconfdir}/cluster %{_sysconfdir}/rc.d/init.d/cman %{_sysconfdir}/rc.d/init.d/qdiskd @@ -140,6 +142,7 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/cman /sbin/ccs* /sbin/cman* +/sbin/confdb2ldif /sbin/dlm* /sbin/fence* /sbin/gfs_control* @@ -154,6 +157,7 @@ %{_mandir}/man7/* %{_mandir}/man8/ccs* %{_mandir}/man8/cman* +%{_mandir}/man8/confdb2ldif* %{_mandir}/man8/dlm* %{_mandir}/man8/fence* %{_mandir}/man8/gfs_control* @@ -200,7 +204,7 @@ %files -n rgmanager %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries rgmanager/README rgmanager/errors.txt +%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt %{_sysconfdir}/rc.d/init.d/rgmanager /sbin/clu* /sbin/rg_test @@ -230,7 +234,7 @@ %files -n gfs2-utils %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries +%doc doc/COPYRIGHT doc/README.licence doc/COPYING.* %{_sysconfdir}/rc.d/init.d/gfs2 /sbin/*gfs2* %{_mandir}/man8/*gfs2* @@ -259,7 +263,7 @@ %files -n gfs-utils %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries +%doc doc/COPYRIGHT doc/README.licence doc/COPYING.* %{_sysconfdir}/rc.d/init.d/gfs /sbin/gfs_* /sbin/*.gfs @@ -280,15 +284,20 @@ %files -n gnbd-utils %defattr(-,root,root,-) -%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries +%doc doc/COPYRIGHT doc/README.licence doc/COPYING.* # %%{_sysconfdir}/rc.d/init.d/gfs /sbin/gnbd_* %{_mandir}/man8/gnbd* %changelog -* Thu Jul 3 Fabio M. Di Nitto - 2.99.05-2 +* Tue Jul 15 2008 Fabio M. Di Nitto - 2.99.06-1 +- New upstream release. +- BR on new openais for logging features. +- drop local logrotate snippet in favour of upstream one. +- cman Requires: PyOpenSSL for telnet_ssl wrapper. - cman Requires: pexpect and net-snmp-utils for fence agents. Thanks to sendro on IRC for spotting the issue. +- Another cleanup round for docs * Tue Jun 24 2008 Fabio M. Di Nitto - 2.99.05-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Jun 2008 07:15:32 -0000 1.5 +++ sources 15 Jul 2008 11:17:04 -0000 1.6 @@ -1 +1 @@ -4e0f41ee31c4235b33406eac1a6648e6 cluster-2.99.05.tar.gz +ff0b5733f15043f04f5c84c481dd88ba cluster-2.99.06.tar.gz --- cluster.logrotate DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 11:40:49 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Tue, 15 Jul 2008 11:40:49 GMT Subject: rpms/pavucontrol/devel .cvsignore, 1.7, 1.8 pavucontrol.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200807151140.m6FBenNV029931@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/pavucontrol/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29768 Modified Files: .cvsignore pavucontrol.spec sources Log Message: new snapshot from git Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Mar 2008 22:05:57 -0000 1.7 +++ .cvsignore 15 Jul 2008 11:39:53 -0000 1.8 @@ -1 +1 @@ -pavucontrol-0.9.6.tar.gz +pavucontrol-0.9.7.git20080715.tar.gz Index: pavucontrol.spec =================================================================== RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pavucontrol.spec 28 Mar 2008 22:05:57 -0000 1.9 +++ pavucontrol.spec 15 Jul 2008 11:39:53 -0000 1.10 @@ -1,12 +1,14 @@ +%define alphatag git20080715 + Name: pavucontrol -Version: 0.9.6 -Release: 1%{?dist} +Version: 0.9.7 +Release: 0.1.%{alphatag}%{?dist} Summary: Volume control for PulseAudio Group: Applications/Multimedia License: GPLv2+ URL: http://0pointer.de/lennart/projects/pavucontrol -Source0: http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz +Source0: http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pulseaudio-lib-devel >= 0.9.7-0.10 @@ -54,6 +56,9 @@ %changelog +* Tue Jul 15 2008 Lennart Poettering 0.9.7-0.1.git20080715 +- Update from GIT snapshot + * Fri Mar 28 2008 Lennart Poettering 0.9.6-1 - Update to 0.9.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Mar 2008 22:05:57 -0000 1.7 +++ sources 15 Jul 2008 11:39:53 -0000 1.8 @@ -1 +1 @@ -22213d83479c2e0aee7ed649f30ec771 pavucontrol-0.9.6.tar.gz +b46d18ac87d40a7b3df848d3b57df495 pavucontrol-0.9.7.git20080715.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 11:54:37 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 15 Jul 2008 11:54:37 GMT Subject: rpms/gnome-packagekit/F-9 gnome-packagekit.spec, 1.41, 1.42 system-install-packages, 1.1, 1.2 Message-ID: <200807151154.m6FBsbxt031471@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31397 Modified Files: gnome-packagekit.spec system-install-packages Log Message: * Tue Jul 15 2008 Richard Hughes - 0.2.3-5 - Correct the name of the executables called in system-install-packages. Fixes rh#455390 Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gnome-packagekit.spec 8 Jul 2008 00:00:42 -0000 1.41 +++ gnome-packagekit.spec 15 Jul 2008 11:53:54 -0000 1.42 @@ -6,7 +6,7 @@ Name: gnome-packagekit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -144,6 +144,10 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Tue Jul 15 2008 Richard Hughes - 0.2.3-5 +- Correct the name of the executables called in system-install-packages. + Fixes rh#455390 + * Tue Jul 08 2008 Richard Hughes - 0.2.3-4 - Set the GUI interaction mode in the gpk-install-foo tools so the dialog does not auto-close when we've asked for auth. Index: system-install-packages =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/system-install-packages,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- system-install-packages 11 Apr 2008 16:25:02 -0000 1.1 +++ system-install-packages 15 Jul 2008 11:53:54 -0000 1.2 @@ -29,6 +29,6 @@ sys.exit(1) if have_local: - os.execv("/usr/bin/gpk-install-file", ["gpk-install-file"] + specified) + os.execv("/usr/bin/gpk-install-local-file", ["gpk-install-local-file"] + specified) else: - os.execv("/usr/bin/gpk-install-package", ["gpk-install-file"] + specified) + os.execv("/usr/bin/gpk-install-package-name", ["gpk-install-package-name"] + specified) From fedora-extras-commits at redhat.com Tue Jul 15 11:56:11 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Tue, 15 Jul 2008 11:56:11 GMT Subject: rpms/gnome-packagekit/F-9 gnome-packagekit.spec,1.42,1.43 Message-ID: <200807151156.m6FBuBCW031709@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31558 Modified Files: gnome-packagekit.spec Log Message: * Tue Jul 15 2008 Richard Hughes - 0.2.3-6 - Add intltool to the BR. Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gnome-packagekit.spec 15 Jul 2008 11:53:54 -0000 1.42 +++ gnome-packagekit.spec 15 Jul 2008 11:55:22 -0000 1.43 @@ -6,7 +6,7 @@ Name: gnome-packagekit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -48,9 +48,12 @@ BuildRequires: cairo-devel BuildRequires: startup-notification-devel BuildRequires: perl(XML::Parser) +BuildRequires: gnome-doc-utils BuildRequires: libsexy-devel BuildRequires: PackageKit-devel >= %{packagekit_version} BuildRequires: PolicyKit-gnome-devel +BuildRequires: unique-devel +BuildRequires: intltool %description packagekit-gnome provides session applications for the PackageKit API. @@ -144,6 +147,9 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Tue Jul 15 2008 Richard Hughes - 0.2.3-6 +- Add intltool to the BR. + * Tue Jul 15 2008 Richard Hughes - 0.2.3-5 - Correct the name of the executables called in system-install-packages. Fixes rh#455390 From fedora-extras-commits at redhat.com Tue Jul 15 12:14:10 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Tue, 15 Jul 2008 12:14:10 GMT Subject: rpms/perl-DBD-SQLite/EL-5 rt32100.patch, NONE, 1.1 perl-DBD-SQLite.spec, 1.12, 1.13 Message-ID: <200807151214.m6FCEAsc007379@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-SQLite/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7207 Modified Files: perl-DBD-SQLite.spec Added Files: rt32100.patch Log Message: Changing sqlite3_finalize() -> sqlite3_reset() at 2 spots in dbdimp.c resolves many issues. more info in rt32100 or bz#245699 rt32100.patch: --- NEW FILE rt32100.patch --- --- dbdimp.c.orig 2008-03-18 17:37:18.580463431 -0700 +++ dbdimp.c 2008-03-18 17:39:04.320466041 -0700 @@ -399,7 +399,7 @@ continue; } /* There are bug reports that say this should be sqlite3_reset() */ - sqlite3_finalize(imp_sth->stmt); + sqlite3_reset(imp_sth->stmt); sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); return -5; } @@ -419,7 +419,7 @@ sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth)); return 0; /* There are bug reports that say this should be sqlite3_reset() */ - default: sqlite3_finalize(imp_sth->stmt); + default: sqlite3_reset(imp_sth->stmt); sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); return -6; } Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/EL-5/perl-DBD-SQLite.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-DBD-SQLite.spec 19 Dec 2007 16:11:45 -0000 1.12 +++ perl-DBD-SQLite.spec 15 Jul 2008 12:13:14 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite Version: 1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -9,6 +9,9 @@ Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# see http://rt.cpan.org/Public/Bug/Display.html?id=30558 +Patch0: rt32100.patch + BuildRequires: perl-DBI >= 1.03 # if sqlite >= 3.1.3 then # perl-DBD-SQLite uses the external library @@ -31,7 +34,7 @@ %prep %setup -q -n DBD-SQLite-%{version} - +%patch0 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -64,6 +67,10 @@ %changelog +* Tue Jul 15 2008 Marcela Maslanova 1.14-3 +- add rt32100 patch +- same problem as in #245699 + * Wed Dec 19 2007 Steven Pritchard 1.14-2 - Fix find option order. - Use fixperms macro instead of our own chmod incantation. From fedora-extras-commits at redhat.com Tue Jul 15 12:20:39 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 15 Jul 2008 12:20:39 GMT Subject: comps comps-f10.xml.in,1.50,1.51 Message-ID: <200807151220.m6FCKdT1008111@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6857 Modified Files: comps-f10.xml.in Log Message: [fonts] make khmeros-fonts-base default [haskell] new devel group for Haskell programming language packages japanese-bitmap-fonts replaces fonts-japanese [japanese-support] make uim-anthy conditional [khmer-support] make khmeros-fonts-base mandatory and rest default [urdu-support] make kacst-fonts optional Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- comps-f10.xml.in 15 Jul 2008 09:49:02 -0000 1.50 +++ comps-f10.xml.in 15 Jul 2008 12:20:09 -0000 1.51 @@ -1339,6 +1339,7 @@ dejavu-fonts-experimental jomolhari-fonts kacst-fonts + khmeros-fonts-base liberation-fonts lklug-fonts lohit-fonts-bengali @@ -1389,7 +1390,6 @@ gfs-theokritos-fonts icelandic-fonts inconsolata-fonts - khmeros-fonts-base khmeros-fonts-battambang khmeros-fonts-bokor khmeros-fonts-handwritten @@ -2222,6 +2222,33 @@ + haskell + <_name>Haskell + <_description/> + false + true + + alex + darcs + ghc + haddock + happy + hugs98 + ghc-doc + ghc-gtk2hs + ghc-haddock + ghc-prof + haddock09 + hugs98-alut + hugs98-demos + hugs98-glut + hugs98-hgl + hugs98-openal + hugs98-opengl + hugs98-x11 + + + hebrew-support <_name>Hebrew Support <_description/> @@ -2490,7 +2517,8 @@ openoffice.org-langpack-ja_JP scim-anthy scim-lang-japanese - fonts-japanese + uim-anthy + japanese-bitmap-fonts sazanami-fonts-gothic sazanami-fonts-mincho VLGothic-fonts-proportional @@ -2516,7 +2544,6 @@ perl-NKF scim-skk stardict-dic-ja - uim-anthy uim-canna uim-skk wkf @@ -2820,17 +2847,17 @@ false km - khmeros-fonts-base + khmeros-fonts-base kde-l10n-Khmer koffice-langpack-km moodle-km + khmeros-fonts-battambang + khmeros-fonts-bokor + khmeros-fonts-handwritten + khmeros-fonts-metalchrieng + khmeros-fonts-muol + khmeros-fonts-siemreap m17n-db-khmer - khmeros-fonts-battambang - khmeros-fonts-bokor - khmeros-fonts-handwritten - khmeros-fonts-metalchrieng - khmeros-fonts-muol - khmeros-fonts-siemreap @@ -2906,12 +2933,12 @@ fonts-ISO8859-2 fonts-ISO8859-2-100dpi fonts-ISO8859-2-75dpi - fonts-japanese fonts-KOI8-R fonts-KOI8-R-100dpi fonts-KOI8-R-75dpi fonts-x11-apl ghostscript-fonts + japanese-bitmap-fonts jisksp16-1990-fonts knm_new-fonts libdockapp-fonts @@ -4269,8 +4296,8 @@ paktype-fonts openoffice.org-langpack-ur dejavu-fonts - kacst-fonts nafees-web-naskh-fonts + kacst-fonts @@ -4757,6 +4784,7 @@ eclipse fedora-packager gnome-software-development + haskell java-development kde-software-development legacy-software-development From fedora-extras-commits at redhat.com Tue Jul 15 12:24:08 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Tue, 15 Jul 2008 12:24:08 GMT Subject: rpms/beagle/devel beagle-0.3.8-typo-fix.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 beagle.spec, 1.140, 1.141 sources, 1.33, 1.34 beagle-0.3.3-buildfix.patch, 1.1, NONE beagle-0.3.7-evo-sharp-buildfix.patch, 1.1, NONE Message-ID: <200807151224.m6FCO819008505@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8419 Modified Files: .cvsignore beagle.spec sources Added Files: beagle-0.3.8-typo-fix.patch Removed Files: beagle-0.3.3-buildfix.patch beagle-0.3.7-evo-sharp-buildfix.patch Log Message: Update to 0.3.8 beagle-0.3.8-typo-fix.patch: --- NEW FILE beagle-0.3.8-typo-fix.patch --- diff -upNr beagle-0.3.8.orign/search/Beagle.Search.Tiles/Tile.cs beagle-0.3.8/search/Beagle.Search.Tiles/Tile.cs --- beagle-0.3.8.orign/search/Beagle.Search.Tiles/Tile.cs 2008-06-12 07:41:19.000000000 +0200 +++ beagle-0.3.8/search/Beagle.Search.Tiles/Tile.cs 2008-07-15 14:03:26.000000000 +0200 @@ -348,7 +348,7 @@ namespace Beagle.Search.Tiles { #else MimeApplication app; app = Mime.GetDefaultApplication (mimetype); - bool expect_uris = app.SupportUris (); + bool expect_uris = app.SupportsUris (); path = hit.Path; if (app == null) { Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 25 Apr 2008 17:15:23 -0000 1.30 +++ .cvsignore 15 Jul 2008 12:23:23 -0000 1.31 @@ -1 +1 @@ -beagle-0.3.7.tar.bz2 +beagle-0.3.8.tar.bz2 Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- beagle.spec 4 Jul 2008 13:30:17 -0000 1.140 +++ beagle.spec 15 Jul 2008 12:23:23 -0000 1.141 @@ -1,6 +1,6 @@ Name: beagle -Version: 0.3.7 -Release: 7%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -15,15 +15,12 @@ BuildRequires: monodoc-devel BuildRequires: gtk-sharp2-gapi gtk-sharp2-devel gnome-sharp-devel mono-web zip libexif-devel BuildRequires: gsf-sharp-devel >= 0.6 -BuildRequires: sqlite-devel > 3.3.1 BuildRequires: gmime-sharp >= 2.1.19 BuildRequires: evolution-sharp-devel >= 0.10.2-3 BuildRequires: libXScrnSaver-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: libgnome-devel BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: librsvg2-devel >= 2.0 -BuildRequires: libXt-devel +BuildRequires: libXt-devel BuildRequires: wv-devel BuildRequires: gettext BuildRequires: autoconf @@ -40,7 +37,6 @@ BuildRequires: libunwind-devel %endif Requires: sqlite >= 3.3.1 -Requires: mono-core >= 1.1.13.5 Requires: zip unzip sed grep poppler-utils Requires: libbeagle @@ -52,8 +48,7 @@ Patch4: beagle-0.3.0-runuser.patch Patch5: beagle-0.2.15.1-libdir.patch Patch6: beagle-monodoc.patch -Patch7: beagle-0.3.3-buildfix.patch -Patch8: beagle-0.3.7-evo-sharp-buildfix.patch +Patch7: beagle-0.3.8-typo-fix.patch # Mono is not available on these arches ExcludeArch: s390 s390x sparc64 ppc64 @@ -65,7 +60,7 @@ BuildRequires: firefox-devel %endif -# firefox app if for beagle firefox extension +# firefox app id for beagle firefox extension %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\} @@ -133,13 +128,13 @@ %prep %setup -q +%define _default_patch_fuzz 2 #%patch2 -p1 -b .crawl %patch3 -p1 -b .spew %patch4 -p1 -b .runuser %patch5 -p1 -b .libdir %patch6 -p1 -b .monodoc -#%patch7 -p1 -b .buildfix -%patch8 -p1 -b .buildfix +%patch7 -p1 -b .typo %build autoconf @@ -270,6 +265,11 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Tue Jul 15 2008 Adel Gadllah - 0.3.8-1 +- Update to 0.3.8 +- Drop unneeded patches +- Clean up requires + * Fri Jul 04 2008 Adel Gadllah - 0.3.7-7 - Rebuild for new gnome-sharp Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 25 Apr 2008 17:15:23 -0000 1.33 +++ sources 15 Jul 2008 12:23:23 -0000 1.34 @@ -1 +1 @@ -4845f674f540eeb24c09a1be1a5e2459 beagle-0.3.7.tar.bz2 +fcafad26efa65a3bf06a019268ae6230 beagle-0.3.8.tar.bz2 --- beagle-0.3.3-buildfix.patch DELETED --- --- beagle-0.3.7-evo-sharp-buildfix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 12:26:54 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 12:26:54 GMT Subject: rpms/cups/devel cups-direct-usb.patch,1.7,1.8 Message-ID: <200807151226.m6FCQsMh009048@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8973 Modified Files: cups-direct-usb.patch Log Message: Rediff direct-usb patch. cups-direct-usb.patch: Index: cups-direct-usb.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-direct-usb.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cups-direct-usb.patch 13 Jun 2007 16:15:27 -0000 1.7 +++ cups-direct-usb.patch 15 Jul 2008 12:26:10 -0000 1.8 @@ -1,7 +1,8 @@ ---- cups-1.2.11/backend/usb-unix.c.direct-usb 2007-05-04 15:03:02.000000000 +0100 -+++ cups-1.2.11/backend/usb-unix.c 2007-06-13 16:46:56.000000000 +0100 -@@ -101,6 +101,9 @@ - strcasecmp(hostname, "Minolta"); +diff -up cups-1.3.7/backend/usb-unix.c.direct-usb cups-1.3.7/backend/usb-unix.c +--- cups-1.3.7/backend/usb-unix.c.direct-usb 2008-03-26 16:02:45.000000000 +0000 ++++ cups-1.3.7/backend/usb-unix.c 2008-07-15 13:25:56.000000000 +0100 +@@ -94,6 +94,9 @@ print_device(const char *uri, /* I - De + strncasecmp(hostname, "Minolta", 7); #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ + if (use_bc && !strncmp(uri, "usb:/dev/", 9)) @@ -10,7 +11,7 @@ if ((device_fd = open_device(uri, &use_bc)) == -1) { if (getenv("CLASS") != NULL) -@@ -317,12 +320,7 @@ +@@ -320,12 +323,7 @@ open_device(const char *uri, /* I - Dev if (!strncmp(uri, "usb:/dev/", 9)) #ifdef __linux { From fedora-extras-commits at redhat.com Tue Jul 15 12:30:47 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Tue, 15 Jul 2008 12:30:47 GMT Subject: rpms/net-tools/devel net-tools-1.60-bitkeeper.patch, 1.2, 1.3 net-tools-1.60-duplicate-tcp.patch, 1.2, 1.3 net-tools-1.60-ifconfig-long-iface-crasher.patch, 1.1, 1.2 Message-ID: <200807151230.m6FCUlU8009591@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/net-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8905 Modified Files: net-tools-1.60-bitkeeper.patch net-tools-1.60-duplicate-tcp.patch net-tools-1.60-ifconfig-long-iface-crasher.patch Log Message: Patche are applicable with --fuz=0 net-tools-1.60-bitkeeper.patch: Index: net-tools-1.60-bitkeeper.patch =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-bitkeeper.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- net-tools-1.60-bitkeeper.patch 7 Feb 2005 10:46:11 -0000 1.2 +++ net-tools-1.60-bitkeeper.patch 15 Jul 2008 12:30:02 -0000 1.3 @@ -2,7 +2,7 @@ +++ net-tools-1.60/netplug-1.2.9/Makefile 2005-01-10 11:38:01.796744224 +0100 @@ -24,10 +24,12 @@ install $(install_opts) -m 755 scripts/rc.netplugd $(initdir)/netplugd - install -C $(install_opts) -m 444 man/man8/netplugd.8 $(mandir)/man8 + install $(install_opts) -m 444 man/man8/netplugd.8 $(mandir)/man8 -bk_root := $(shell bk root) +#bk_root := $(shell bk root) net-tools-1.60-duplicate-tcp.patch: Index: net-tools-1.60-duplicate-tcp.patch =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-duplicate-tcp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- net-tools-1.60-duplicate-tcp.patch 26 Apr 2005 09:54:30 -0000 1.2 +++ net-tools-1.60-duplicate-tcp.patch 15 Jul 2008 12:30:02 -0000 1.3 @@ -184,9 +184,9 @@ if (state == TCP_LISTEN) { time_len = 0; retr = 0L; -@@ -1849,6 +2014,7 @@ +@@ -1880,6 +2045,7 @@ break; - sleep(1); + sleep(reptimer); prg_cache_clear(); + tcp_node_hash_clear(); } net-tools-1.60-ifconfig-long-iface-crasher.patch: Index: net-tools-1.60-ifconfig-long-iface-crasher.patch =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-ifconfig-long-iface-crasher.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-tools-1.60-ifconfig-long-iface-crasher.patch 9 May 2006 09:27:14 -0000 1.1 +++ net-tools-1.60-ifconfig-long-iface-crasher.patch 15 Jul 2008 12:30:02 -0000 1.2 @@ -3,13 +3,13 @@ +++ net-tools-1.60-ifconfig/lib/interface.c 2006-03-23 09:58:45.000000000 +0100 @@ -203,6 +203,7 @@ out: - static char *get_name(char *name, char *p) + static char *get_name(char **namep, char *p) { + int count = 0; while (isspace(*p)) p++; - while (*p) { -@@ -211,8 +212,13 @@ static char *get_name(char *name, char * + char *name = *namep = p; +@@ -211,8 +212,13 @@ static char *get_name(char **namep, char if (*p == ':') { /* could be an alias */ char *dot = p, *dotname = name; *name++ = *p++; @@ -24,7 +24,7 @@ if (*p != ':') { /* it wasn't, backup */ p = dot; name = dotname; -@@ -223,6 +229,9 @@ static char *get_name(char *name, char * +@@ -223,6 +229,9 @@ static char *get_name(char **namep, char break; } *name++ = *p++; From fedora-extras-commits at redhat.com Tue Jul 15 12:35:23 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 12:35:23 GMT Subject: rpms/cups/devel cups-eggcups.patch,1.7,1.8 Message-ID: <200807151235.m6FCZNhd010344@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10189 Modified Files: cups-eggcups.patch Log Message: Rediff eggcups patch. cups-eggcups.patch: Index: cups-eggcups.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-eggcups.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cups-eggcups.patch 18 Jul 2007 11:50:02 -0000 1.7 +++ cups-eggcups.patch 15 Jul 2008 12:34:38 -0000 1.8 @@ -1,6 +1,7 @@ ---- cups-1.3b1/backend/ipp.c.eggcups 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.3b1/backend/ipp.c 2007-07-18 11:34:16.000000000 +0100 -@@ -57,6 +57,70 @@ +diff -up cups-1.3.7/backend/ipp.c.eggcups cups-1.3.7/backend/ipp.c +--- cups-1.3.7/backend/ipp.c.eggcups 2008-07-15 13:34:01.000000000 +0100 ++++ cups-1.3.7/backend/ipp.c 2008-07-15 13:34:01.000000000 +0100 +@@ -58,6 +58,70 @@ static char pstmpname[1024] = ""; /* Tem static char tmpfilename[1024] = ""; /* Temporary spool file name */ static int job_cancelled = 0; /* Job cancelled? */ @@ -71,8 +72,8 @@ /* * Local functions... -@@ -974,6 +1038,15 @@ - fprintf(stderr, _("NOTICE: Print file accepted - job ID %d.\n"), job_id); +@@ -1004,6 +1068,15 @@ main(int argc, /* I - Number of comm + job_id); } +#if HAVE_DBUS @@ -87,9 +88,10 @@ ippDelete(response); if (job_cancelled) ---- cups-1.3b1/backend/Makefile.eggcups 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.3b1/backend/Makefile 2007-07-18 11:36:35.000000000 +0100 -@@ -131,7 +131,7 @@ +diff -up cups-1.3.7/backend/Makefile.eggcups cups-1.3.7/backend/Makefile +--- cups-1.3.7/backend/Makefile.eggcups 2007-08-08 20:27:51.000000000 +0100 ++++ cups-1.3.7/backend/Makefile 2008-07-15 13:34:01.000000000 +0100 +@@ -131,7 +131,7 @@ ieee1394-linux.o: ieee1394.h ipp: ipp.o ../cups/$(LIBCUPS) echo Linking $@... @@ -98,9 +100,10 @@ $(RM) http $(LN) ipp http ---- cups-1.3b1/scheduler/subscriptions.c.eggcups 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.3b1/scheduler/subscriptions.c 2007-07-18 11:34:16.000000000 +0100 -@@ -1292,13 +1292,13 @@ +diff -up cups-1.3.7/scheduler/subscriptions.c.eggcups cups-1.3.7/scheduler/subscriptions.c +--- cups-1.3.7/scheduler/subscriptions.c.eggcups 2008-01-23 22:23:42.000000000 +0000 ++++ cups-1.3.7/scheduler/subscriptions.c 2008-07-15 13:34:01.000000000 +0100 +@@ -1295,13 +1295,13 @@ cupsd_send_dbus(cupsd_eventmask_t event, what = "PrinterAdded"; else if (event & CUPSD_EVENT_PRINTER_DELETED) what = "PrinterRemoved"; @@ -116,7 +119,7 @@ else return; -@@ -1334,7 +1334,7 @@ +@@ -1337,7 +1337,7 @@ cupsd_send_dbus(cupsd_eventmask_t event, dbus_message_append_iter_init(message, &iter); if (dest) dbus_message_iter_append_string(&iter, dest->name); From fedora-extras-commits at redhat.com Tue Jul 15 12:38:44 2008 From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek)) Date: Tue, 15 Jul 2008 12:38:44 GMT Subject: rpms/tog-pegasus/devel pegasus-2.7.1-bz454589.patch, NONE, 1.1 pegasus-2.7.1-bz454590.patch, NONE, 1.1 pegasus-2.7.1-bz454591.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.10, 1.11 tog-pegasus.spec, 1.60, 1.61 Message-ID: <200807151238.m6FCci2g010857@cvs-int.fedora.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10722 Modified Files: .cvsignore sources tog-pegasus.spec Added Files: pegasus-2.7.1-bz454589.patch pegasus-2.7.1-bz454590.patch pegasus-2.7.1-bz454591.patch Log Message: update to latest upstream, three additional bugfixes pegasus-2.7.1-bz454589.patch: --- NEW FILE pegasus-2.7.1-bz454589.patch --- diff --git a/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp b/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp index a152be5..4612912 100644 --- a/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp +++ b/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp @@ -194,7 +194,17 @@ extern "C" CMSetStatus(rc,CMPI_RC_OK); if (pos < dta->value.uint32) { - return dta[pos+1]; + if (dta->type == CMPI_chars) + { + data.type = CMPI_chars; + data.state = CMPI_goodValue; + data.value.chars = (char*)CMGetCharPtr(dta[pos+1].value.string); + return data; + } + else + { + return dta[pos+1]; + } } CMSetStatus(rc,CMPI_RC_ERR_NO_SUCH_PROPERTY); return data; @@ -227,7 +237,11 @@ extern "C" dta[pos+1].state=CMPI_goodValue; if (type == CMPI_chars) { - dta[pos+1].value.chars = (char*) val; + // Store char* as CMPIString internally, this frees us from + // doing explicit memory management for char*. + dta[pos+1].value.string = reinterpret_cast( + new CMPI_Object((const char*) val)); + dta[pos+1].type = CMPI_string; } else { diff --git a/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp b/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp index 48dd518..d293e40 100644 --- a/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp +++ b/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp @@ -177,7 +177,7 @@ CIMValue value2CIMValue(const CMPIValue* data, const CMPIType type, CMPIrc *rc) else if( aType == CMPI_chars ) { - CopyToStringArray(String,chars) + CopyToStringArray(String,string->hdl) } else if( aType == CMPI_charsptr ) pegasus-2.7.1-bz454590.patch: --- NEW FILE pegasus-2.7.1-bz454590.patch --- diff -up pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp_old pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp --- pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp_old 2008-07-15 14:19:20.000000000 +0200 +++ pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp 2008-07-15 14:21:54.000000000 +0200 @@ -49,13 +49,17 @@ PEGASUS_USING_STD; CIMNamespaceName providerNamespace; const CIMName CLASSNAME = CIMName ("TestCMPI_Fail_1"); -const String CMPI_TESTFAIL_ERROR = "CIM_ERR_FAILED: Error initializing CMPI MI" - " TestCMPIFail_1Provider, the following MI factory function(s) returned" - " an error: TestCMPIFail_1Provider_Create_InstanceMI;" - " TestCMPIFail_1Provider_Create_AssociationMI;" - " TestCMPIFail_1Provider_Create_MethodMI;" - " TestCMPIFail_1Provider_Create_PropertyMI;" - " TestCMPIFail_1Provider_Create_IndicationMI"; +const String CMPI_TESTFAIL_INST_ERROR = "CIM_ERR_FAILED: Error initializing" + " CMPI MI TestCMPIFail_1Provider, the following MI factory function(s)" + " returned an error: TestCMPIFail_1Provider_Create_InstanceMI"; + +const String CMPI_TESTFAIL_METH_ERROR = "CIM_ERR_FAILED: Error initializing" + " CMPI MI TestCMPIFail_1Provider, the following MI factory function(s)" + " returned an error: TestCMPIFail_1Provider_Create_MethodMI"; + +const String CMPI_TESTFAIL_ASSOC_ERROR = "CIM_ERR_FAILED: Error initializing" + " CMPI MI TestCMPIFail_1Provider, the following MI factory function(s)" + const String RCMPI_ERROR = "CIM_ERR_FAILED: ProviderInitFailure:" " Error initializing the API's _CreateMI"; @@ -78,7 +82,7 @@ void test01 (CIMClient & client) } catch (const CIMException &e) { - if (e.getMessage() != CMPI_TESTFAIL_ERROR + if (e.getMessage() != CMPI_TESTFAIL_INST_ERROR && e.getMessage() != RCMPI_ERROR) { throw e; @@ -86,12 +90,66 @@ void test01 (CIMClient & client) } } +void test02 (CIMClient & client) +{ + try + { + CIMObjectPath instanceName( + String::EMPTY, + providerNamespace, + CLASSNAME, + Array()); + + Array outParams; + + CIMValue value = client.invokeMethod( + providerNamespace, + instanceName, + "foo", + Array(), + outParams); + } + catch (const CIMException &e) + { + if (e.getMessage() != CMPI_TESTFAIL_METH_ERROR + && e.getMessage() != RCMPI_ERROR) + { + throw e; + } + } +} + +void test03 (CIMClient & client) +{ + try + { + CIMObjectPath instanceName( + String::EMPTY, + providerNamespace, + CLASSNAME, + Array()); + + Array result = client.associatorNames( + providerNamespace, + instanceName); + } + catch (const CIMException &e) + { + if (e.getMessage() != CMPI_TESTFAIL_ASSOC_ERROR + && e.getMessage() != RCMPI_ERROR) + { + throw e; + } + } +} void _test (CIMClient & client) { try { test01 (client); + test02 (client); + test03 (client); } catch (Exception & e) { diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp --- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp_old 2008-07-15 13:17:05.000000000 +0200 +++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp 2008-07-15 14:10:03.000000000 +0200 @@ -429,7 +429,7 @@ Message * CMPIProviderManager::handleGet request->instanceName.getKeyBindings()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -462,7 +462,7 @@ Message * CMPIProviderManager::handleGet #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT AutoPtr tmpNormalizerContext( - new CIMOMHandleContext(*pr._cimom_handle)); + new CIMOMHandleContext(*pr.getCIMOMHandle())); request->operationContext.insert( NormalizerContextContainer(tmpNormalizerContext)); #endif @@ -475,8 +475,8 @@ Message * CMPIProviderManager::handleGet CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); CMPIPropertyList props(request->propertyList); @@ -497,8 +497,8 @@ Message * CMPIProviderManager::handleGet { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->getInstance( - pr.miVector.instMI, + rc = pr.getInstMI()->ft->getInstance( + pr.getInstMI(), &eCtx, &eRes, &eRef, @@ -571,7 +571,7 @@ Message * CMPIProviderManager::handleEnu request->className); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -606,7 +606,7 @@ Message * CMPIProviderManager::handleEnu #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT AutoPtr tmpNormalizerContext( - new CIMOMHandleContext(*pr._cimom_handle)); + new CIMOMHandleContext(*pr.getCIMOMHandle())); request->operationContext.insert( NormalizerContextContainer(tmpNormalizerContext)); #endif @@ -619,8 +619,8 @@ Message * CMPIProviderManager::handleEnu CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); CMPIPropertyList props(propertyList); @@ -641,8 +641,8 @@ Message * CMPIProviderManager::handleEnu { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->enumInstances( - pr.miVector.instMI, + rc = pr.getInstMI()->ft->enumerateInstances( + pr.getInstMI(), &eCtx, &eRes, &eRef, @@ -716,7 +716,7 @@ Message * CMPIProviderManager::handleEnu request->className); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -753,8 +753,8 @@ Message * CMPIProviderManager::handleEnu CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); _setupCMPIContexts( &eCtx, @@ -773,8 +773,11 @@ Message * CMPIProviderManager::handleEnu { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->enumInstanceNames( - pr.miVector.instMI,&eCtx,&eRes,&eRef); + rc = pr.getInstMI()->ft->enumerateInstanceNames( + pr.getInstMI(), + &eCtx, + &eRes, + &eRef); } // Need to save ContentLanguage value into operation context of response @@ -845,7 +848,7 @@ Message * CMPIProviderManager::handleCre request->newInstance.setPath(objectPath); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -884,9 +887,9 @@ Message * CMPIProviderManager::handleCre CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); CMPI_InstanceOnStack eInst(request->newInstance); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); _setupCMPIContexts( &eCtx, @@ -905,8 +908,12 @@ Message * CMPIProviderManager::handleCre { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->createInstance( - pr.miVector.instMI,&eCtx,&eRes,&eRef,&eInst); + rc = pr.getInstMI()->ft->createInstance( + pr.getInstMI(), + &eCtx, + &eRes, + &eRef, + &eInst); } // Need to save ContentLanguage value into operation context of response @@ -976,7 +983,7 @@ Message * CMPIProviderManager::handleMod request->modifiedInstance.getPath ().getKeyBindings()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -1014,9 +1021,9 @@ Message * CMPIProviderManager::handleMod CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); CMPI_InstanceOnStack eInst(request->modifiedInstance); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); CMPIPropertyList props(request->propertyList); @@ -1037,8 +1044,12 @@ Message * CMPIProviderManager::handleMod { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->modifyInstance( - pr.miVector.instMI,&eCtx,&eRes,&eRef,&eInst, + rc = pr.getInstMI()->ft->modifyInstance( + pr.getInstMI(), + &eCtx, + &eRes, + &eRef, + &eInst, (const char **)props.getList()); } @@ -1109,7 +1120,7 @@ Message * CMPIProviderManager::handleDel request->instanceName.getKeyBindings()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -1147,8 +1158,8 @@ Message * CMPIProviderManager::handleDel CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); _setupCMPIContexts( &eCtx, @@ -1167,8 +1178,11 @@ Message * CMPIProviderManager::handleDel { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->deleteInstance( - pr.miVector.instMI,&eCtx,&eRes,&eRef); + rc = pr.getInstMI()->ft->deleteInstance( + pr.getInstMI(), + &eCtx, + &eRes, + &eRef); } // Need to save ContentLanguage value into operation context of response @@ -1238,7 +1252,7 @@ Message * CMPIProviderManager::handleExe Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -1279,8 +1293,8 @@ Message * CMPIProviderManager::handleExe CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); const CString queryLan=request->queryLanguage.getCString(); const CString query=request->query.getCString(); @@ -1302,9 +1316,13 @@ Message * CMPIProviderManager::handleExe { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->execQuery( - pr.miVector.instMI,&eCtx,&eRes,&eRef, - CHARS(queryLan),CHARS(query)); + rc = pr.getInstMI()->ft->execQuery( + pr.getInstMI(), + &eCtx, + &eRes, + &eRef, + CHARS(queryLan), + CHARS(query)); } // Need to save ContentLanguage value into operation context of response @@ -1381,7 +1399,7 @@ Message * CMPIProviderManager::handleAss Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -1414,7 +1432,7 @@ Message * CMPIProviderManager::handleAss #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT AutoPtr tmpNormalizerContext( - new CIMOMHandleContext(*pr._cimom_handle)); + new CIMOMHandleContext(*pr.getCIMOMHandle())); request->operationContext.insert( NormalizerContextContainer(tmpNormalizerContext)); #endif @@ -1434,8 +1452,8 @@ Message * CMPIProviderManager::handleAss CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); const CString aClass=request->assocClass.getString().getCString(); const CString rClass=request->resultClass.getString().getCString(); const CString rRole=request->role.getCString(); @@ -1460,9 +1478,15 @@ Message * CMPIProviderManager::handleAss { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.assocMI->ft->associators( - pr.miVector.assocMI,&eCtx,&eRes,&eRef, - CHARS(aClass),CHARS(rClass),CHARS(rRole),CHARS(resRole), + rc = pr.getAssocMI()->ft->associators( + pr.getAssocMI(), + &eCtx, + &eRes, + &eRef, + CHARS(aClass), + CHARS(rClass), + CHARS(rRole), + CHARS(resRole), (const char **)props.getList()); } @@ -1541,7 +1565,7 @@ Message * CMPIProviderManager::handleAss request->assocClass.getString()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -1586,8 +1610,8 @@ Message * CMPIProviderManager::handleAss CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); const CString aClass=request->assocClass.getString().getCString(); const CString rClass=request->resultClass.getString().getCString(); const CString rRole=request->role.getCString(); @@ -1610,9 +1634,15 @@ Message * CMPIProviderManager::handleAss { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.assocMI->ft->associatorNames( - pr.miVector.assocMI,&eCtx,&eRes,&eRef,CHARS(aClass), - CHARS(rClass),CHARS(rRole),CHARS(resRole)); + rc = pr.getAssocMI()->ft->associatorNames( + pr.getAssocMI(), + &eCtx, + &eRes, + &eRef, + CHARS(aClass), + CHARS(rClass), + CHARS(rRole), + CHARS(resRole)); } // Need to save ContentLanguage value into operation context of response @@ -1687,7 +1717,7 @@ Message * CMPIProviderManager::handleRef request->resultClass.getString()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -1719,7 +1749,7 @@ Message * CMPIProviderManager::handleRef #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT AutoPtr tmpNormalizerContext( - new CIMOMHandleContext(*pr._cimom_handle)); + new CIMOMHandleContext(*pr.getCIMOMHandle())); request->operationContext.insert( NormalizerContextContainer(tmpNormalizerContext)); #endif @@ -1737,8 +1767,8 @@ Message * CMPIProviderManager::handleRef CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); const CString rClass=request->resultClass.getString().getCString(); const CString rRole=request->role.getCString(); @@ -1761,9 +1791,14 @@ Message * CMPIProviderManager::handleRef { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.assocMI->ft->references( - pr.miVector.assocMI,&eCtx,&eRes,&eRef, - CHARS(rClass),CHARS(rRole),(const char **)props.getList()); + rc = pr.getAssocMI()->ft->references( + pr.getAssocMI(), + &eCtx, + &eRes, + &eRef, + CHARS(rClass), + CHARS(rRole), + (const char **)props.getList()); } // Need to save ContentLanguage value into operation context of response @@ -1839,7 +1874,7 @@ Message * CMPIProviderManager::handleRef request->resultClass.getString()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -1882,8 +1917,8 @@ Message * CMPIProviderManager::handleRef CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); const CString rClass=request->resultClass.getString().getCString(); const CString rRole=request->role.getCString(); @@ -1904,9 +1939,13 @@ Message * CMPIProviderManager::handleRef { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.assocMI->ft->referenceNames( - pr.miVector.assocMI,&eCtx,&eRes,&eRef, - CHARS(rClass),CHARS(rRole)); + rc = pr.getAssocMI()->ft->referenceNames( + pr.getAssocMI(), + &eCtx, + &eRes, + &eRef, + CHARS(rClass), + CHARS(rRole)); } // Need to save ContentLanguage value into operation context of response @@ -1976,7 +2015,7 @@ Message * CMPIProviderManager::handleInv request->instanceName.getKeyBindings()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -2014,7 +2053,7 @@ Message * CMPIProviderManager::handleInv #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT AutoPtr tmpNormalizerContext( - new CIMOMHandleContext(*pr._cimom_handle)); + new CIMOMHandleContext(*pr.getCIMOMHandle())); request->operationContext.insert( NormalizerContextContainer(tmpNormalizerContext)); #endif @@ -2027,8 +2066,8 @@ Message * CMPIProviderManager::handleInv CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); CMPI_ArgsOnStack eArgsIn(request->inParameters); Array outArgs; CMPI_ArgsOnStack eArgsOut(outArgs); @@ -2051,9 +2090,14 @@ Message * CMPIProviderManager::handleInv { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.methMI->ft->invokeMethod( - pr.miVector.methMI,&eCtx,&eRes,&eRef, - CHARS(mName),&eArgsIn,&eArgsOut); + rc = pr.getMethMI()->ft->invokeMethod( + pr.getMethMI(), + &eCtx, + &eRes, + &eRef, + CHARS(mName), + &eArgsIn, + &eArgsOut); } // Need to save ContentLanguage value into operation context of response @@ -2252,7 +2296,7 @@ Message * CMPIProviderManager::handleCre providerName); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; if ((remote=pidc.isRemoteNameSpace())) { @@ -2332,7 +2376,7 @@ Message * CMPIProviderManager::handleCre new CIMOMHandleQueryContext( CIMNamespaceName( request->nameSpace.getString()), - *pr._cimom_handle); + *pr.getCIMOMHandle()); CMPI_SelectExp *eSelx=new CMPI_SelectExp( context, @@ -2343,7 +2387,7 @@ Message * CMPIProviderManager::handleCre srec->eSelx=eSelx; srec->qContext=_context; - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); PEG_TRACE_STRING( TRC_PROVIDERMANAGER, @@ -2391,12 +2435,15 @@ Message * CMPIProviderManager::handleCre { StatProviderTimeMeasurement providerTime(response); - if (pr.miVector.indMI->ft->ftVersion >= 100) + if (pr.getIndMI()->ft->ftVersion >= 100) { - rc = pr.miVector.indMI->ft->activateFilter( - pr.miVector.indMI,&eCtx,eSelx, + rc = pr.getIndMI()->ft->activateFilter( + pr.getIndMI(), + &eCtx,eSelx, CHARS(eSelx->classNames[0].getClassName().getString(). - getCString()),&eRef,false); + getCString()), + &eRef, + false); } else { @@ -2405,8 +2452,8 @@ Message * CMPIProviderManager::handleCre rc = ((CMPIStatus (*)(CMPIIndicationMI*, CMPIContext*, CMPIResult*, CMPISelectExp*, const char *, CMPIObjectPath*, CMPIBoolean)) - pr.miVector.indMI->ft->activateFilter) - (pr.miVector.indMI,&eCtx,NULL,eSelx, + pr.getIndMI()->ft->activateFilter) + (pr.getIndMI(),&eCtx,NULL,eSelx, CHARS(eSelx->classNames[0].getClassName().getString(). getCString()),&eRef,false); } @@ -2499,7 +2546,7 @@ Message * CMPIProviderManager::handleDel providerName); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; if ((remote=pidc.isRemoteNameSpace())) { @@ -2568,7 +2615,7 @@ Message * CMPIProviderManager::handleDel CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); PEG_TRACE_STRING( TRC_PROVIDERMANAGER, @@ -2591,12 +2638,16 @@ Message * CMPIProviderManager::handleDel { StatProviderTimeMeasurement providerTime(response); - if (pr.miVector.indMI->ft->ftVersion >= 100) + if (pr.getIndMI()->ft->ftVersion >= 100) { - rc = pr.miVector.indMI->ft->deActivateFilter( - pr.miVector.indMI,&eCtx,eSelx, + rc = pr.getIndMI()->ft->deActivateFilter( + pr.getIndMI(), + &eCtx, + eSelx, CHARS(eSelx->classNames[0].getClassName().getString(). - getCString()),&eRef,prec==NULL); + getCString()), + &eRef, + prec==NULL); } else { @@ -2605,8 +2656,8 @@ Message * CMPIProviderManager::handleDel rc = ((CMPIStatus (*)(CMPIIndicationMI*, CMPIContext*, CMPIResult*, CMPISelectExp*, const char *, CMPIObjectPath*, CMPIBoolean)) - pr.miVector.indMI->ft->deActivateFilter) - (pr.miVector.indMI,&eCtx,NULL,eSelx, + pr.getIndMI()->ft->deActivateFilter) + (pr.getIndMI(),&eCtx,NULL,eSelx, CHARS(eSelx->classNames[0].getClassName().getString(). getCString()),&eRef,prec==NULL); } @@ -2718,6 +2769,7 @@ Message * CMPIProviderManager::handleDis try { CMPIProvider::OpProviderHolder ph = + OpProviderHolder ph = providerManager.getProvider( physicalName, providerName); @@ -2904,7 +2956,7 @@ Message * CMPIProviderManager::handleSub // // Get cached or load new provider module // - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; if ((const char*)info) { ph = providerManager.getRemoteProvider @@ -3013,7 +3065,7 @@ Message * CMPIProviderManager::handleGet request->instanceName.getKeyBindings()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -3045,7 +3097,7 @@ Message * CMPIProviderManager::handleGet #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT AutoPtr tmpNormalizerContext( - new CIMOMHandleContext(*pr._cimom_handle)); + new CIMOMHandleContext(*pr.getCIMOMHandle())); request->operationContext.insert( NormalizerContextContainer(tmpNormalizerContext)); #endif @@ -3058,8 +3110,8 @@ Message * CMPIProviderManager::handleGet CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(GI_handler,&pr.broker); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ResultOnStack eRes(GI_handler,pr.getBroker()); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); // For the getInstance provider call, use the property list that we // created containing the single property from the getProperty call. @@ -3084,8 +3136,11 @@ Message * CMPIProviderManager::handleGet { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->getInstance( - pr.miVector.instMI,&eCtx,&eRes,&eRef, + rc = pr.getInstMI()->ft->getInstance( + pr.getInstMI(), + &eCtx, + &eRes, + &eRef, (const char **)props.getList()); } @@ -3222,7 +3277,7 @@ Message * CMPIProviderManager::handleSet request->instanceName.getKeyBindings()); Boolean remote=false; - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; // resolve provider name ProviderIdContainer pidc = @@ -3260,9 +3315,9 @@ Message * CMPIProviderManager::handleSet CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); - CMPI_ResultOnStack eRes(MI_handler,&pr.broker); + CMPI_ResultOnStack eRes(MI_handler,pr.getBroker()); CMPI_InstanceOnStack eInst(localModifiedInstance); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); CMPIPropertyList props(localPropertyList); @@ -3284,8 +3339,12 @@ Message * CMPIProviderManager::handleSet { StatProviderTimeMeasurement providerTime(response); - rc = pr.miVector.instMI->ft->modifyInstance( - pr.miVector.instMI,&eCtx,&eRes,&eRef,&eInst, + rc = pr.getInstMI()->ft->modifyInstance( + pr.getInstMI(), + &eCtx, + &eRes, + &eRef, + &eInst, (const char **)props.getList()); } @@ -3400,7 +3459,7 @@ ProviderName CMPIProviderManager::_resol void CMPIProviderManager::_callEnableIndications (CIMInstance & req_provider, PEGASUS_INDICATION_CALLBACK_T _indicationCallback, - CMPIProvider::OpProviderHolder & ph, + OpProviderHolder & ph, const char* remoteInfo) { PEG_METHOD_ENTER( @@ -3432,7 +3491,7 @@ void CMPIProviderManager::_callEnableInd // // Versions prior to 86 did not include enableIndications routine // - if (pr.miVector.indMI->ft->ftVersion >= 86) + if (pr.getIndMI()->ft->ftVersion >= 86) { OperationContext context; #ifdef PEGASUS_ZOS_THREADLEVEL_SECURITY @@ -3446,7 +3505,7 @@ void CMPIProviderManager::_callEnableInd CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); // Add RemoteInformation -V 5245 if (remoteInfo) @@ -3472,7 +3531,7 @@ void CMPIProviderManager::_callEnableInd // breaking existing CMPI Indication providers. This is ok since // there really isn't a user to which the problem should be // reported. - pr.miVector.indMI->ft->enableIndications(pr.miVector.indMI,&eCtx); + pr.getIndMI()->ft->enableIndications(pr.getIndMI(),&eCtx); } else { @@ -3515,7 +3574,7 @@ void CMPIProviderManager::_callEnableInd } void CMPIProviderManager::_callDisableIndications - (CMPIProvider::OpProviderHolder & ph, const char *remoteInfo) + (OpProviderHolder & ph, const char *remoteInfo) { PEG_METHOD_ENTER( TRC_PROVIDERMANAGER, @@ -3539,7 +3598,7 @@ void CMPIProviderManager::_callDisableIn // // Versions prior to 86 did not include disableIndications routine // - if (pr.miVector.indMI->ft->ftVersion >= 86) + if (pr.getIndMI()->ft->ftVersion >= 86) { OperationContext context; CMPIStatus rc={CMPI_RC_OK,NULL}; @@ -3550,7 +3609,7 @@ void CMPIProviderManager::_callDisableIn eCtx.ft->addEntry(&eCtx,"CMPIRRemoteInfo", (CMPIValue*)(const char*)remoteInfo,CMPI_chars); } - CMPI_ThreadContext thr(&pr.broker,&eCtx); + CMPI_ThreadContext thr(pr.getBroker(),&eCtx); PEG_TRACE_STRING( TRC_PROVIDERMANAGER, @@ -3566,8 +3625,8 @@ void CMPIProviderManager::_callDisableIn // here. This will prevent us from breaking existing CMPI // Indication providers. This is ok since there really isn't a // user to which the problem should be reported. - pr.miVector.indMI->ft->disableIndications( - pr.miVector.indMI, + pr.getIndMI()->ft->disableIndications( + pr.getIndMI(), &eCtx); pr.unprotect(); diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h --- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h_old 2008-07-15 12:51:47.000000000 +0200 +++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h 2008-07-15 12:52:33.000000000 +0200 @@ -53,11 +53,11 @@ public: virtual ~CMPILocalProviderManager(); public: - CMPIProvider::OpProviderHolder getProvider( + OpProviderHolder getProvider( const String & fileName, const String & providerName); - CMPIProvider::OpProviderHolder getRemoteProvider( + OpProviderHolder getRemoteProvider( const String & fileName, const String & providerName); diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp --- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp_old 2008-07-15 12:21:21.000000000 +0200 +++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp 2008-07-15 12:51:28.000000000 +0200 @@ -122,8 +122,8 @@ Sint32 CMPILocalProviderManager::_provid String location = *(parms->location); CMPIProvider *pr = 0; - CMPIProvider::OpProviderHolder * ph = - reinterpret_cast < CMPIProvider::OpProviderHolder * >(ret); + OpProviderHolder * ph = + reinterpret_cast < OpProviderHolder * >(ret); pr = _lookupProvider (providerName); @@ -176,7 +176,7 @@ Sint32 CMPILocalProviderManager::_provid AutoMutex lock (_providerTableMutex); // The provider table must be locked before unloading. - _providers.remove (pr->_name); + _providers.remove (pr->getNameWithType()); _unloadProvider (pr); delete pr; @@ -184,7 +184,7 @@ Sint32 CMPILocalProviderManager::_provid else { // No need to have a memory leak. - _providers.remove(pr->_name); + _providers.remove(pr->getNameWithType()); delete pr; } break; @@ -375,14 +375,14 @@ Sint32 CMPILocalProviderManager::_provid continue; } - if (provider->_quantum == quantum) + if (provider->getQuantum() == quantum) { continue; } - provider->_quantum = quantum; + provider->setQuantum(quantum); - if (provider->_current_operations.get ()) + if (provider->getCurrentOperations()) { PEG_TRACE_STRING( TRC_PROVIDERMANAGER, @@ -434,7 +434,7 @@ Sint32 CMPILocalProviderManager::_provid { // lock the provider mutex - AutoMutex pr_lock (provider->_statusMutex); + AutoMutex pr_lock (provider->getStatusMutex()); if (provider->tryTerminate () == false) { @@ -448,10 +448,10 @@ Sint32 CMPILocalProviderManager::_provid continue; } - PEGASUS_ASSERT (provider->_module != 0); + PEGASUS_ASSERT (provider->getModule() != 0); // unload provider module - provider->_module->unloadModule (); + provider->getModule()->unloadModule (); Logger::put (Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, @@ -470,7 +470,7 @@ Sint32 CMPILocalProviderManager::_provid Tracer::LEVEL4, "Destroying CMPIProvider's CIMOM Handle " + provider->getName()); - delete provider->_cimom_handle; + delete provider->getCIMOMHandle(); // set provider status to UNINITIALIZED provider->reset (); @@ -598,10 +598,10 @@ void CMPILocalProviderManager::cleanupTh } -CMPIProvider::OpProviderHolder CMPILocalProviderManager:: ++OpProviderHolder CMPILocalProviderManager:: getRemoteProvider (const String & location, const String & providerName) { - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; CTRL_STRINGS strings; Sint32 @@ -649,10 +649,10 @@ CMPIProvider::OpProviderHolder CMPILocal return ph; } -CMPIProvider::OpProviderHolder CMPILocalProviderManager:: +OpProviderHolder CMPILocalProviderManager:: getProvider (const String & fileName, const String & providerName) { - CMPIProvider::OpProviderHolder ph; + OpProviderHolder ph; CTRL_STRINGS strings; Sint32 ccode; @@ -887,9 +887,9 @@ CMPIProvider *CMPILocalProviderManager:: String exceptionMsg = moduleFileName; { // lock the provider status mutex - AutoMutex lock (provider->_statusMutex); + AutoMutex lock (provider->getStatusMutex()); - if (provider->_status == CMPIProvider::INITIALIZED) + if (provider->getStatus() == CMPIProvider::INITIALIZED) { PEG_METHOD_EXIT(); // Initialization is already complete @@ -904,7 +904,7 @@ CMPIProvider *CMPILocalProviderManager:: // load the provider try { - base = module->load (provider->_name); + base = module->load (provider->getNameWithType()); moduleLoaded = true; } catch (const Exception &e) @@ -938,11 +938,11 @@ CMPIProvider *CMPILocalProviderManager:: CIMOMHandle *cimomHandle = new CIMOMHandle (); provider->set (module, base, cimomHandle); - provider->_quantum = 0; + provider->setQuantum(0); try { - provider->initialize (*(provider->_cimom_handle)); + provider->initialize (*(provider->getCIMOMHandle())); } catch (const Exception &e) { @@ -981,12 +981,12 @@ CMPIProvider *CMPILocalProviderManager:: } // delete the cimom handle - delete provider->_cimom_handle; + delete provider->getCIMOMHandle(); // set provider status to UNINITIALIZED provider->reset (); AutoMutex lock (_providerTableMutex); - _providers.remove (provider->_name); + _providers.remove (provider->getNameWithType()); delete provider; PEG_METHOD_EXIT (); @@ -1013,7 +1013,7 @@ void CMPILocalProviderManager::_unloadPr Tracer::LEVEL4, "Unloading Provider " + provider->getName()); - if (provider->_current_operations.get ()) + if (provider->getCurrentOperations()) { PEG_TRACE_STRING( TRC_PROVIDERMANAGER, @@ -1030,7 +1030,7 @@ void CMPILocalProviderManager::_unloadPr // lock the provider mutex - AutoMutex pr_lock (provider->_statusMutex); + AutoMutex pr_lock (provider->getStatusMutex()); try { @@ -1052,11 +1052,11 @@ void CMPILocalProviderManager::_unloadPr "Destroying CMPIProvider's CIMOM Handle " + provider->getName()); - delete provider->_cimom_handle; - PEGASUS_ASSERT (provider->_module != 0); + delete provider->getCIMOMHandle(); + PEGASUS_ASSERT (provider->getModule() != 0); // unload provider module - provider->_module->unloadModule (); + provider->getModule()->unloadModule (); Logger::put (Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, "CMPILocalProviderManager::_provider_crtl - Unload provider $0", provider->getName ()); diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h --- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h_old 2008-07-15 13:07:34.000000000 +0200 +++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h 2008-07-15 13:16:47.000000000 +0200 @@ -178,6 +178,11 @@ public: // typedef CMPIProviderFacade Base; + CMPIProvider( + const String & name, + CMPIProviderModule *module, + ProviderVector *mv); + virtual ~CMPIProvider(); virtual void initialize(CIMOMHandle & cimom); @@ -192,6 +197,7 @@ public: Status getStatus(); String getName() const; + String getNameWithType() const; void reset(); @@ -312,20 +318,39 @@ public: */ CIMInstance getProviderInstance (); + void incCurrentOperations(); + void decCurrentOperations(); + int getCurrentOperations(); + + CIMOMHandle *getCIMOMHandle(); + CMPI_Broker *getBroker(); + + CMPIInstanceMI *getInstMI(); + CMPIMethodMI *getMethMI(); + CMPIAssociationMI *getAssocMI(); + CMPIPropertyMI *getPropMI(); + CMPIIndicationMI *getIndMI(); + + CMPIProviderModule *getModule(); + Uint32 getQuantum(); + void setQuantum(Uint32 quantum); + Mutex &getStatusMutex(); + + void set( + CMPIProviderModule *&module, + ProviderVector base, + CIMOMHandle *&cimomHandle); + protected: String _location; Status _status; CMPIProviderModule *_module; - ProviderVector miVector; - CMPI_Broker broker; + ProviderVector _miVector; + CMPI_Broker _broker; CMPIrc unloadStatus; private: virtual void _terminate(Boolean term); - CMPIProvider( - const String & name, - CMPIProviderModule *module, - ProviderVector *mv); static void initialize( CIMOMHandle & cimom, @@ -341,15 +366,7 @@ private: */ void waitUntilThreadsDone(); - void set( - CMPIProviderModule *&module, - ProviderVector base, - CIMOMHandle *&cimomHandle); - - friend class CMPILocalProviderManager; - friend class CMPIProviderManager; class OpProviderHolder; - friend class OpProviderHolder; CIMOMHandle *_cimom_handle; String _name; AtomicInt _no_unload; @@ -396,7 +413,7 @@ private: generated the indication accepted a matching subscription. */ CIMInstance _providerInstance; -//}; +}; // @@ -404,67 +421,66 @@ private: // for a CMPIProvider so it won't be unloaded during operations. // - class OpProviderHolder +class OpProviderHolder +{ +private: + CMPIProvider* _provider; +public: + OpProviderHolder(): _provider( NULL ) { - private: - CMPIProvider* _provider; - - public: - OpProviderHolder(): _provider( NULL ) - { - } - OpProviderHolder( const OpProviderHolder& p ): _provider( NULL ) - { - SetProvider( p._provider ); - } - OpProviderHolder( CMPIProvider* p ): _provider( NULL ) - { - SetProvider( p ); - } - ~OpProviderHolder() - { - UnSetProvider(); - } - CMPIProvider& GetProvider() - { - return(*_provider); - } - - OpProviderHolder& operator=( const OpProviderHolder& x ) + } + OpProviderHolder( const OpProviderHolder& p ): _provider( NULL ) + { + SetProvider( p._provider ); + } + OpProviderHolder( CMPIProvider* p ): _provider( NULL ) + { + SetProvider( p ); + } + ~OpProviderHolder() + { + UnSetProvider(); + } + CMPIProvider& GetProvider() + { + return(*_provider); + } + OpProviderHolder& operator=( const OpProviderHolder& x ) + { + if (this == &x) { - if (this == &x) - return(*this); - SetProvider( x._provider ); return(*this); } + SetProvider( x._provider ); + return(*this); + } - void SetProvider( CMPIProvider* p ) + void SetProvider( CMPIProvider* p ) + { + PEG_METHOD_ENTER( + TRC_CMPIPROVIDERINTERFACE, + "OpProviderHolder::SetProvider()"); + UnSetProvider(); + if (p) { - PEG_METHOD_ENTER( - TRC_CMPIPROVIDERINTERFACE, - "OpProviderHolder::SetProvider()"); - UnSetProvider(); - if (p) - { - _provider = p; - _provider->_current_operations++; - } - PEG_METHOD_EXIT(); + _provider = p; + _provider->incCurrentOperations(); } + PEG_METHOD_EXIT(); + } - void UnSetProvider() + void UnSetProvider() + { + PEG_METHOD_ENTER( + TRC_CMPIPROVIDERINTERFACE, + "OpProviderHolder::UnSetProvider()"); + if (_provider) { - PEG_METHOD_ENTER( - TRC_CMPIPROVIDERINTERFACE, - "OpProviderHolder::UnSetProvider()"); - if (_provider) - { - _provider->_current_operations--; - _provider = NULL; - } - PEG_METHOD_EXIT(); + _provider->decCurrentOperations(); + _provider = NULL; } - }; + PEG_METHOD_EXIT(); + } }; PEGASUS_NAMESPACE_END diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h --- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h_old 2008-07-15 14:12:49.000000000 +0200 +++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h 2008-07-15 14:18:13.000000000 +0200 @@ -182,7 +182,7 @@ protected: void _callEnableIndications( CIMInstance & req_provider, PEGASUS_INDICATION_CALLBACK_T _indicationCallback, - CMPIProvider::OpProviderHolder & ph, + OpProviderHolder & ph, const char *remoteInfo); /** @@ -193,7 +193,7 @@ protected: @param remoteInfo Remote Information */ void _callDisableIndications( - CMPIProvider::OpProviderHolder & ph, + OpProviderHolder & ph, const char *remoteInfo); }; diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp --- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp_old 2008-07-15 12:52:56.000000000 +0200 +++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp 2008-07-15 13:07:20.000000000 +0200 @@ -48,6 +48,13 @@ PEGASUS_USING_STD; PEGASUS_NAMESPACE_BEGIN +static const char _MSG_CANNOT_INIT_API_KEY[] = + "ProviderManager.CMPI.CMPIProvider.CANNOT_INIT_API"; +static const char _MSG_CANNOT_INIT_API[] = + "Error initializing CMPI MI $0, the following MI" + " factory function(s) returned an error: $1"; + + // set current operations to 1 to prevent an unload // until the provider has had a chance to initialize CMPIProvider::CMPIProvider( @@ -62,9 +69,12 @@ CMPIProvider::CMPIProvider( "CMPIProvider::CMPIProvider()"); _current_operations = 1; _currentSubscriptions = 0; - broker.hdl =0; - broker.provider = this; - if (mv) miVector=*mv; + _broker.hdl =0; + _broker.provider = this; + if (mv) + { + _miVector = *mv; + } unloadStatus = CMPI_RC_DO_NOT_UNLOAD; Time::gettimeofday(&_idleTime); PEG_METHOD_EXIT(); @@ -86,7 +96,7 @@ void CMPIProvider::set( CIMOMHandle *&cimomHandle) { _module = module; - miVector = cmpiProvider; + _miVector = cmpiProvider; _cimom_handle = cimomHandle; } @@ -107,6 +117,12 @@ String CMPIProvider::getName() const { return(_name.subString(1,PEG_NOT_FOUND)); } + +String CMPIProvider::getNameWithType() const +{ + return(_name); +} + void setError( ProviderVector &miVector, String &error, @@ -165,116 +181,12 @@ void CMPIProvider::initialize( broker.clsCache.reset(new ClassCache()); broker.name=name; - const OperationContext opc; - CMPI_ContextOnStack eCtx(opc); - CMPI_ThreadContext thr(&broker,&eCtx); - CMPIStatus rcInst = {CMPI_RC_OK, NULL}; - CMPIStatus rcAssoc = {CMPI_RC_OK, NULL}; - CMPIStatus rcMeth = {CMPI_RC_OK, NULL}; - CMPIStatus rcProp = {CMPI_RC_OK, NULL}; - CMPIStatus rcInd = {CMPI_RC_OK, NULL}; - String error; - String realProviderName(name); + miVector.instMI = NULL; + miVector.assocMI = NULL; + miVector.methMI = NULL; + miVector.propMI = NULL; + miVector.indMI = NULL; - if (miVector.genericMode) - { - CString mName=realProviderName.getCString(); - - if (miVector.miTypes & CMPI_MIType_Instance) - { - miVector.instMI = - miVector.createGenInstMI(&broker,&eCtx,mName, &rcInst); - } - if (miVector.miTypes & CMPI_MIType_Association) - { - miVector.assocMI = - miVector.createGenAssocMI(&broker,&eCtx,mName, &rcAssoc); - } - if (miVector.miTypes & CMPI_MIType_Method) - { - miVector.methMI = - miVector.createGenMethMI(&broker,&eCtx,mName, &rcMeth); - } - if (miVector.miTypes & CMPI_MIType_Property) - { - miVector.propMI = - miVector.createGenPropMI(&broker,&eCtx,mName, &rcProp); - } - if (miVector.miTypes & CMPI_MIType_Indication) - { - miVector.indMI = - miVector.createGenIndMI(&broker,&eCtx,mName, &rcInd); - } - } - else - { - if (miVector.miTypes & CMPI_MIType_Instance) - miVector.instMI=miVector.createInstMI(&broker,&eCtx, &rcInst); - if (miVector.miTypes & CMPI_MIType_Association) - miVector.assocMI=miVector.createAssocMI(&broker,&eCtx, &rcAssoc); - if (miVector.miTypes & CMPI_MIType_Method) - miVector.methMI=miVector.createMethMI(&broker,&eCtx, &rcMeth); - if (miVector.miTypes & CMPI_MIType_Property) - miVector.propMI=miVector.createPropMI(&broker,&eCtx, &rcProp); - if (miVector.miTypes & CMPI_MIType_Indication) - miVector.indMI=miVector.createIndMI(&broker,&eCtx, &rcInd); - } - - if (miVector.miTypes & CMPI_MIType_Instance) - { - if (miVector.instMI == NULL || rcInst.rc != CMPI_RC_OK) - { - setError(miVector, error, realProviderName, - _Generic_Create_InstanceMI, _Create_InstanceMI, - rcInst.msg); - } - } - if (miVector.miTypes & CMPI_MIType_Association) - { - if (miVector.assocMI == NULL || rcAssoc.rc != CMPI_RC_OK) - { - setError(miVector, error, realProviderName, - _Generic_Create_AssociationMI, _Create_AssociationMI, - rcAssoc.msg); - } - } - if (miVector.miTypes & CMPI_MIType_Method) - { - if (miVector.methMI == NULL || rcMeth.rc != CMPI_RC_OK) - { - setError(miVector, error, realProviderName, - _Generic_Create_MethodMI, _Create_MethodMI, - rcMeth.msg); - } - } - if (miVector.miTypes & CMPI_MIType_Property) - { - if (miVector.propMI == NULL || rcProp.rc != CMPI_RC_OK) - { - setError(miVector, error, realProviderName, - _Generic_Create_PropertyMI, _Create_PropertyMI, - rcProp.msg); - } - } - if (miVector.miTypes & CMPI_MIType_Indication) - { - if (miVector.indMI == NULL || rcInd.rc != CMPI_RC_OK) - { - setError(miVector, error, realProviderName, - _Generic_Create_IndicationMI, _Create_IndicationMI, - rcInd.msg); - } - } - - if (error.size() != 0) - { - throw Exception(MessageLoaderParms( - "ProviderManager.CMPI.CMPIProvider.CANNOT_INIT_API", - "Error initializing CMPI MI $0, " - "the following MI factory function(s) returned an error: $1", - realProviderName, - error)); - } PEG_METHOD_EXIT(); } @@ -287,25 +199,14 @@ void CMPIProvider::initialize(CIMOMHandl { String compoundName; if (_location.size() == 0) - compoundName= providername; - else - compoundName=_location+":"+providername; - try { - CMPIProvider::initialize(cimom,miVector,compoundName,broker); - if (miVector.miTypes & CMPI_MIType_Method) - { - if (miVector.methMI->ft->miName==NULL) - { - unloadStatus = CMPI_RC_OK; - } - } + compoundName = providername; } - catch (...) + else { - _current_operations = 0; - throw; + compoundName = _location + ":" + providername; } + CMPIProvider::initialize(cimom,_miVector,compoundName,_broker); _status = INITIALIZED; _current_operations = 0; } @@ -377,7 +278,7 @@ void CMPIProvider::_terminate(Boolean te const OperationContext opc; CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(opc); - CMPI_ThreadContext thr(&broker,&eCtx); + CMPI_ThreadContext thr(&_broker,&eCtx); /* @param terminating When true, the terminating argument indicates that the MB is in the process of terminating and that cleanup must be done. When @@ -392,38 +293,38 @@ void CMPIProvider::_terminate(Boolean te CMPI_RC_NEVER_UNLOAD Operation successful - never unload. */ unloadStatus = CMPI_RC_OK; - if (miVector.miTypes & CMPI_MIType_Instance) + if (_miVector.instMI) { - rc=miVector.instMI->ft->cleanup(miVector.instMI,&eCtx, terminating); + rc=_miVector.instMI->ft->cleanup(_miVector.instMI,&eCtx, terminating); unloadStatus = rc.rc; } - if (miVector.miTypes & CMPI_MIType_Association) + if (_miVector.assocMI) { - rc=miVector.assocMI->ft->cleanup(miVector.assocMI,&eCtx, terminating); + rc=_miVector.assocMI->ft->cleanup(_miVector.assocMI,&eCtx, terminating); if (unloadStatus == CMPI_RC_OK) { unloadStatus = rc.rc; } } - if (miVector.miTypes & CMPI_MIType_Method) + if (_miVector.methMI) { - rc=miVector.methMI->ft->cleanup(miVector.methMI,&eCtx, terminating); + rc=_miVector.methMI->ft->cleanup(_miVector.methMI,&eCtx, terminating); if (unloadStatus == CMPI_RC_OK) { unloadStatus = rc.rc; } } - if (miVector.miTypes & CMPI_MIType_Property) + if (_miVector.propMI) { - rc=miVector.propMI->ft->cleanup(miVector.propMI,&eCtx, terminating); + rc=_miVector.propMI->ft->cleanup(_miVector.propMI,&eCtx, terminating); if (unloadStatus == CMPI_RC_OK) { unloadStatus = rc.rc; } } - if (miVector.miTypes & CMPI_MIType_Indication) + if (_miVector.indMI) { - rc=miVector.indMI->ft->cleanup(miVector.indMI,&eCtx, terminating); + rc=_miVector.indMI->ft->cleanup(_miVector.indMI,&eCtx, terminating); if (unloadStatus == CMPI_RC_OK) { unloadStatus = rc.rc; @@ -727,5 +628,307 @@ CIMInstance CMPIProvider::getProviderIns return _providerInstance; } -PEGASUS_NAMESPACE_END +void CMPIProvider::incCurrentOperations () +{ + _current_operations++; +} + +int CMPIProvider::getCurrentOperations () +{ + return _current_operations.get(); +} + +void CMPIProvider::decCurrentOperations () +{ + _current_operations--; +} + +CIMOMHandle *CMPIProvider::getCIMOMHandle() +{ + return _cimom_handle; +} + +CMPI_Broker *CMPIProvider::getBroker() +{ + return &_broker; +} + +CMPIInstanceMI *CMPIProvider::getInstMI() +{ + if (_miVector.instMI == NULL) + { + AutoMutex mtx(_statusMutex); + if (_miVector.instMI == NULL) + { + const OperationContext opc; + CMPI_ContextOnStack eCtx(opc); + CMPIStatus rc = {CMPI_RC_OK, NULL}; + String providerName = _broker.name; + CMPIInstanceMI *mi = NULL; + + PEGASUS_ASSERT(_miVector.miTypes & CMPI_MIType_Instance); + if (_miVector.genericMode) + { + mi = _miVector.createGenInstMI( + &_broker, + &eCtx, + (const char *)providerName.getCString(), + &rc); + } + else + { + mi = _miVector.createInstMI(&_broker, &eCtx, &rc); + } + + if (!mi || rc.rc != CMPI_RC_OK) + { + String error; + setError( + _miVector, + error, + getName(), + _Generic_Create_InstanceMI, + _Create_InstanceMI, + rc.msg); + + throw Exception( + MessageLoaderParms( + _MSG_CANNOT_INIT_API_KEY, + _MSG_CANNOT_INIT_API, + getName(), + error)); + } + _miVector.instMI = mi; + } + } + + return _miVector.instMI; +} + +CMPIMethodMI *CMPIProvider::getMethMI() +{ + if (_miVector.methMI == NULL) + { + AutoMutex mtx(_statusMutex); + if (_miVector.methMI == NULL) + { + const OperationContext opc; + CMPI_ContextOnStack eCtx(opc); + CMPIStatus rc = {CMPI_RC_OK, NULL}; + String providerName = _broker.name; + CMPIMethodMI *mi; + PEGASUS_ASSERT(_miVector.miTypes & CMPI_MIType_Method); + if (_miVector.genericMode) + { + mi = _miVector.createGenMethMI( + &_broker, + &eCtx, + (const char *)providerName.getCString(), + &rc); + } + else + { + mi = _miVector.createMethMI(&_broker, &eCtx, &rc); + } + if (!mi || rc.rc != CMPI_RC_OK) + { + String error; + setError( + _miVector, + error, + getName(), + _Generic_Create_MethodMI, + _Create_MethodMI, + rc.msg); + + throw Exception( + MessageLoaderParms( + _MSG_CANNOT_INIT_API_KEY, + _MSG_CANNOT_INIT_API, + getName(), + error)); + } + _miVector.methMI = mi; + } + } + + return _miVector.methMI; +} + +CMPIAssociationMI *CMPIProvider::getAssocMI() +{ + if (_miVector.assocMI == NULL) + { + AutoMutex mtx(_statusMutex); + if (_miVector.assocMI == NULL) + { + const OperationContext opc; + CMPI_ContextOnStack eCtx(opc); + CMPIStatus rc = {CMPI_RC_OK, NULL}; + String providerName = _broker.name; + CMPIAssociationMI *mi; + PEGASUS_ASSERT(_miVector.miTypes & CMPI_MIType_Association); + if (_miVector.genericMode) + { + mi = _miVector.createGenAssocMI( + &_broker, + &eCtx, + (const char *)providerName.getCString(), + &rc); + } + else + { + mi = _miVector.createAssocMI(&_broker, &eCtx, &rc); + } + + if (!mi || rc.rc != CMPI_RC_OK) + { + String error; + setError( + _miVector, + error, + getName(), + _Generic_Create_AssociationMI, + _Create_AssociationMI, + rc.msg); + + throw Exception( + MessageLoaderParms( + _MSG_CANNOT_INIT_API_KEY, + _MSG_CANNOT_INIT_API, + getName(), + error)); + } + _miVector.assocMI = mi; + } + } + + return _miVector.assocMI; +} + +CMPIPropertyMI *CMPIProvider::getPropMI() +{ + if (_miVector.propMI == NULL) + { + AutoMutex mtx(_statusMutex); + if (_miVector.propMI == NULL) + { + const OperationContext opc; + CMPI_ContextOnStack eCtx(opc); + CMPIStatus rc = {CMPI_RC_OK, NULL}; + String providerName = _broker.name; + CMPIPropertyMI *mi; + PEGASUS_ASSERT(_miVector.miTypes & CMPI_MIType_Property); + + if (_miVector.genericMode) + { + mi = _miVector.createGenPropMI( + &_broker, + &eCtx, + (const char *)providerName.getCString(), + &rc); + } + else + { + mi = _miVector.createPropMI(&_broker, &eCtx, &rc); + } + + if (!mi || rc.rc != CMPI_RC_OK) + { + String error; + setError( + _miVector, + error, + getName(), + _Generic_Create_PropertyMI, + _Create_PropertyMI, + rc.msg); + + throw Exception( + MessageLoaderParms( + _MSG_CANNOT_INIT_API_KEY, + _MSG_CANNOT_INIT_API, + getName(), + error)); + } + _miVector.propMI = mi; + } + } + return _miVector.propMI; +} + +CMPIIndicationMI *CMPIProvider::getIndMI() +{ + if (_miVector.indMI == NULL) + { + AutoMutex mtx(_statusMutex); + if (_miVector.indMI == NULL) + { + const OperationContext opc; + CMPI_ContextOnStack eCtx(opc); + CMPIStatus rc = {CMPI_RC_OK, NULL}; + String providerName = _broker.name; + CMPIIndicationMI *mi; + PEGASUS_ASSERT(_miVector.miTypes & CMPI_MIType_Indication); + if (_miVector.genericMode) + { + mi = _miVector.createGenIndMI( + &_broker, + &eCtx, + (const char *)providerName.getCString(), + &rc); + } + else + { + mi = _miVector.createIndMI(&_broker, &eCtx, &rc); + } + + if (!mi || rc.rc != CMPI_RC_OK) + { + String error; + setError( + _miVector, + error, + getName(), + _Generic_Create_IndicationMI, + _Create_IndicationMI, + rc.msg); + + throw Exception( + MessageLoaderParms( + _MSG_CANNOT_INIT_API_KEY, + _MSG_CANNOT_INIT_API, + getName(), + error)); + } + _miVector.indMI = mi; + } + } + + return _miVector.indMI; +} + +CMPIProviderModule *CMPIProvider::getModule() +{ + return _module; +} + +Uint32 CMPIProvider::getQuantum() +{ + AutoMutex mutex(_statusMutex); + return _quantum; +} + +void CMPIProvider::setQuantum(Uint32 quantum) +{ + AutoMutex mutex(_statusMutex); + _quantum = quantum; +} + +Mutex &CMPIProvider::getStatusMutex() +{ + return _statusMutex; +} + +PEGASUS_NAMESPACE_END pegasus-2.7.1-bz454591.patch: --- NEW FILE pegasus-2.7.1-bz454591.patch --- diff -up pegasus/src/Pegasus/Common/XmlWriter.cpp_old pegasus/src/Pegasus/Common/XmlWriter.cpp --- pegasus/src/Pegasus/Common/XmlWriter.cpp_old 2008-07-15 14:24:21.000000000 +0200 +++ pegasus/src/Pegasus/Common/XmlWriter.cpp 2008-07-15 14:25:38.000000000 +0200 @@ -2094,6 +2094,8 @@ void XmlWriter::appendUnauthorizedRespon const String& content) { out << STRLIT("HTTP/1.1 " HTTP_STATUS_UNAUTHORIZED "\r\n"); + Uint32 contentLength = 0; + OUTPUT_CONTENTLENGTH; out << content << STRLIT("\r\n"); out << STRLIT("\r\n"); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Nov 2007 12:20:15 -0000 1.7 +++ .cvsignore 15 Jul 2008 12:37:43 -0000 1.8 @@ -7,3 +7,4 @@ pegasus-2.6.0-local-or-remote-auth.patch pegasus-2.6.0-no-rpath.patch pegasus-2.7.0.tar.gz +pegasus-2.7.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Nov 2007 12:20:15 -0000 1.10 +++ sources 15 Jul 2008 12:37:43 -0000 1.11 @@ -1 +1 @@ -f52417ddf39f1b3f75f8e0b172bebecb pegasus-2.7.0.tar.gz +2b7090821ffd68da1471f8bfac288ae2 pegasus-2.7.1.tar.gz Index: tog-pegasus.spec =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- tog-pegasus.spec 1 Jul 2008 12:34:14 -0000 1.60 +++ tog-pegasus.spec 15 Jul 2008 12:37:43 -0000 1.61 @@ -40,8 +40,10 @@ %endif %endif -Version: 2.7.0 -Release: 9%{?dist} +%define _default_patch_fuzz 2 + +Version: 2.7.1 +Release: 1%{?dist} Epoch: 2 # Summary: OpenPegasus WBEM Services for Linux @@ -76,9 +78,11 @@ Patch7: pegasus-2.5.1-fix_tests.patch Patch8: pegasus-2.6.0-multilib.patch Patch9: pegasus-2.6.0-cimuser.patch -Patch10: pegasus-2.7.0-cmpiheaders.patch Patch11: pegasus-2.7.0-no_privilege_separation.patch Patch12: pegasus-2.7.0-no_snmp_tests.patch +Patch13: pegasus-2.7.1-bz454589.patch +Patch14: pegasus-2.7.1-bz454590.patch +Patch15: pegasus-2.7.1-bz454591.patch # Conflicts: openwbem Provides: tog-pegasus-cimserver @@ -144,9 +148,11 @@ %patch7 -p1 -b .fix-tests %patch8 -p1 -b .multilib %patch9 -p1 -b .cimuser -%patch10 -p1 -b .cmpiheaders %patch11 -p1 -b .no_privilege_separation %patch12 -p1 -b .no_snmp_tests +%patch13 -p1 -b .bz454589 +%patch14 -p1 -b .bz454590 +%patch15 -p1 -b .bz454591 find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:; %build @@ -442,6 +448,15 @@ %changelog +* Tue Jul 15 2008 Vitezslav Crhonek - 2:2.7.1-1 +- Update to upstream version 2.7.1 +- Fix setElementAt() doesn't copy value of CMPI_char parameter + Resolves: #454589 +- Fix CMPI MI factories that return errors are unsupported + Resolves: #454590 +- Fix HTTP 401 responses lack Content-Length headers + Resolves: #454591 + * Tue Jul 1 2008 Vitezslav Crhonek - 2:2.7.0-9 - Add SNMP indication handler to package Resolves: #452930 From fedora-extras-commits at redhat.com Tue Jul 15 12:40:31 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 15 Jul 2008 12:40:31 GMT Subject: rpms/elinks/devel elinks-0.10.1-pkgconfig.patch, 1.1, 1.2 elinks.spec, 1.56, 1.57 Message-ID: <200807151240.m6FCeVnx011303@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/elinks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957 Modified Files: elinks-0.10.1-pkgconfig.patch elinks.spec Log Message: get rid off fuzz in patches elinks-0.10.1-pkgconfig.patch: Index: elinks-0.10.1-pkgconfig.patch =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.10.1-pkgconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elinks-0.10.1-pkgconfig.patch 28 Jan 2005 18:11:50 -0000 1.1 +++ elinks-0.10.1-pkgconfig.patch 15 Jul 2008 12:39:21 -0000 1.2 @@ -19,4 +19,4 @@ + fi if test "$cf_result" != yes; then - if test "$withval" = yes; then + if test -n "$openssl_withval" && test "x$openssl_withval" != xno; then Index: elinks.spec =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- elinks.spec 15 Jul 2008 11:12:40 -0000 1.56 +++ elinks.spec 15 Jul 2008 12:39:21 -0000 1.57 @@ -1,8 +1,7 @@ -%define _default_patch_fuzz 2 Name: elinks Summary: A text-mode Web browser Version: 0.12 -Release: 0.2.pre1%{?dist} +Release: 0.3.pre1%{?dist} License: GPLv2 URL: http://elinks.or.cz Group: Applications/Internet @@ -87,6 +86,9 @@ %{_mandir}/man5/* %changelog +* Tue Jul 15 2008 Ondrej Vasik 0.12-0.3.pre1 +- get rid off fuzz in patches + * Tue Jul 15 2008 Ondrej Vasik 0.12-0.2.pre1 - fix a crash when opening tab during page reload From fedora-extras-commits at redhat.com Tue Jul 15 12:42:16 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 12:42:16 GMT Subject: rpms/cups/devel cups-driverd-timeout.patch,1.1,1.2 Message-ID: <200807151242.m6FCgGJI011629@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11490 Modified Files: cups-driverd-timeout.patch Log Message: Rediff driverd-timeout patch. cups-driverd-timeout.patch: Index: cups-driverd-timeout.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-driverd-timeout.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-driverd-timeout.patch 22 Nov 2006 10:48:21 -0000 1.1 +++ cups-driverd-timeout.patch 15 Jul 2008 12:41:21 -0000 1.2 @@ -1,6 +1,7 @@ ---- cups-1.2.7/scheduler/ipp.c.driverd-timeout 2006-11-22 10:41:28.000000000 +0000 -+++ cups-1.2.7/scheduler/ipp.c 2006-11-22 10:45:55.000000000 +0000 -@@ -4175,7 +4175,7 @@ +diff -up cups-1.3.7/scheduler/ipp.c.driverd-timeout cups-1.3.7/scheduler/ipp.c +--- cups-1.3.7/scheduler/ipp.c.driverd-timeout 2008-07-15 13:40:51.000000000 +0100 ++++ cups-1.3.7/scheduler/ipp.c 2008-07-15 13:40:51.000000000 +0100 +@@ -4293,7 +4293,7 @@ copy_model(cupsd_client_t *con, /* I - close(temppipe[1]); /* @@ -9,12 +10,12 @@ */ total = 0; -@@ -4196,7 +4196,7 @@ - FD_SET(temppipe[0], input); - FD_SET(CGIPipes[0], input); +@@ -4315,7 +4315,7 @@ copy_model(cupsd_client_t *con, /* I - + FD_SET(temppipe[0], &input); + FD_SET(CGIPipes[0], &input); - timeout.tv_sec = 30; + timeout.tv_sec = 70; timeout.tv_usec = 0; - if ((i = select(maxfd, input, NULL, NULL, &timeout)) < 0) + if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0) From fedora-extras-commits at redhat.com Tue Jul 15 12:49:10 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 12:49:10 GMT Subject: rpms/cups/devel cups-usb-paperout.patch,1.5,1.6 Message-ID: <200807151249.m6FCnA0X012762@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12651 Modified Files: cups-usb-paperout.patch Log Message: Rediff usb-paperout patch. cups-usb-paperout.patch: Index: cups-usb-paperout.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-usb-paperout.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cups-usb-paperout.patch 23 Jul 2007 12:19:34 -0000 1.5 +++ cups-usb-paperout.patch 15 Jul 2008 12:48:19 -0000 1.6 @@ -1,6 +1,7 @@ ---- cups-1.2.10/backend/usb-unix.c.usb-paperout 2007-06-26 15:11:14.000000000 +0100 -+++ cups-1.2.10/backend/usb-unix.c 2007-06-26 15:16:23.000000000 +0100 -@@ -39,6 +39,11 @@ +diff -up cups-1.3.7/backend/usb-unix.c.usb-paperout cups-1.3.7/backend/usb-unix.c +--- cups-1.3.7/backend/usb-unix.c.usb-paperout 2008-07-15 13:47:33.000000000 +0100 ++++ cups-1.3.7/backend/usb-unix.c 2008-07-15 13:47:33.000000000 +0100 +@@ -31,6 +31,11 @@ #include "ieee1284.c" #include @@ -12,7 +13,7 @@ /* * Local functions... -@@ -308,7 +313,19 @@ +@@ -323,7 +328,19 @@ open_device(const char *uri, /* I - Dev if (!strncmp(uri, "usb:/dev/", 9)) #ifdef __linux { @@ -33,7 +34,7 @@ } else if (!strncmp(uri, "usb://", 6)) { -@@ -374,7 +391,14 @@ +@@ -389,7 +406,14 @@ open_device(const char *uri, /* I - Dev if (!strcmp(uri, device_uri)) { /* @@ -48,4 +49,4 @@ + * Return this file descriptor... */ - fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device); + fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", From fedora-extras-commits at redhat.com Tue Jul 15 12:56:28 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 12:56:28 GMT Subject: rpms/cups/devel cups.spec, 1.425, 1.426 cups-CVE-2008-1373.patch, 1.1, NONE Message-ID: <200807151256.m6FCuSkV013836@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13730 Modified Files: cups.spec Removed Files: cups-CVE-2008-1373.patch Log Message: * Tue Jul 15 2008 Tim Waugh 1:1.3.7-13 - CVE-2008-1373 patch is no longer needed (applied upstream). Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.425 retrieving revision 1.426 diff -u -r1.425 -r1.426 --- cups.spec 15 Jul 2008 09:56:44 -0000 1.425 +++ cups.spec 15 Jul 2008 12:55:32 -0000 1.426 @@ -47,7 +47,6 @@ Patch22: cups-strict-ppd-line-length.patch Patch23: cups-logrotate.patch Patch25: cups-usb-paperout.patch -Patch29: cups-CVE-2008-1373.patch Patch30: cups-CVE-2008-1722.patch Patch31: cups-getnameddest.patch Patch100: cups-lspp.patch @@ -450,6 +449,7 @@ %changelog * Tue Jul 15 2008 Tim Waugh 1:1.3.7-13 +- CVE-2008-1373 patch is no longer needed (applied upstream). - Mark HTML files and templates config(noreplace) for site-local modifications (bug #441719). - The cups-devel package requires zlib-devel (bug #455192). --- cups-CVE-2008-1373.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 12:57:46 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 15 Jul 2008 12:57:46 GMT Subject: rpms/cups/devel cups.spec,1.426,1.427 Message-ID: <200807151257.m6FCvk1T014029@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13906 Modified Files: cups.spec Log Message: Fixed spec file. Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.426 retrieving revision 1.427 diff -u -r1.426 -r1.427 --- cups.spec 15 Jul 2008 12:55:32 -0000 1.426 +++ cups.spec 15 Jul 2008 12:56:56 -0000 1.427 @@ -171,7 +171,6 @@ %patch22 -p1 -b .strict-ppd-line-length %patch23 -p1 -b .logrotate %patch25 -p1 -b .usb-paperout -%patch29 -p1 -b .CVE-2008-1373 %patch30 -p1 -b .CVE-2008-1722 %patch31 -p1 -b .getnameddest From fedora-extras-commits at redhat.com Tue Jul 15 13:02:43 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Tue, 15 Jul 2008 13:02:43 GMT Subject: rpms/libssh2/EL-4 libssh2.spec,1.4,1.5 Message-ID: <200807151302.m6FD2hhG021089@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/libssh2/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20923 Modified Files: libssh2.spec Log Message: Adapted for EPEL Index: libssh2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libssh2/EL-4/libssh2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libssh2.spec 18 Feb 2008 23:06:21 -0000 1.4 +++ libssh2.spec 15 Jul 2008 13:01:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: libssh2 Version: 0.18 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A library implementing the SSH2 protocol Group: System Environment/Libraries @@ -11,6 +11,7 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig %description libssh2 is a library implementing the SSH2 protocol as defined by @@ -57,12 +58,12 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p" -find %{buildroot} -name '*.la' -exec rm -f {} + +find %{buildroot} -name '*.la' -exec rm -f {} \; # clean things up a bit for packaging ( cd example && make clean ) rm -rf example/simple/.deps -find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} + +find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} \; %check (cd tests && make check) @@ -93,6 +94,9 @@ %{_libdir}/*.so %changelog +* Tue Jul 1 2008 - 0.18-8 +- Adapted for EPEL + * Mon Feb 18 2008 Fedora Release Engineering - 0.18-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 13:08:23 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 15 Jul 2008 13:08:23 GMT Subject: rpms/libselinux/F-9 .cvsignore, 1.170, 1.171 libselinux-rhat.patch, 1.153, 1.154 libselinux.spec, 1.326, 1.327 sources, 1.172, 1.173 Message-ID: <200807151308.m6FD8NeT021497@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21429 Modified Files: .cvsignore libselinux-rhat.patch libselinux.spec sources Log Message: * Wed Jul 9 2008 Dan Walsh - 2.0.67-4 - Add ruby support for puppet Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libselinux/F-9/.cvsignore,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- .cvsignore 7 May 2008 17:42:02 -0000 1.170 +++ .cvsignore 15 Jul 2008 13:07:35 -0000 1.171 @@ -151,3 +151,5 @@ libselinux-2.0.60.tgz libselinux-2.0.61.tgz libselinux-2.0.64.tgz +libselinux-2.0.65.tgz +libselinux-2.0.67.tgz libselinux-rhat.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.153 -r 1.154 libselinux-rhat.patch Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libselinux/F-9/libselinux-rhat.patch,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- libselinux-rhat.patch 7 May 2008 17:42:02 -0000 1.153 +++ libselinux-rhat.patch 15 Jul 2008 13:07:35 -0000 1.154 @@ -1,6 +1,21 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.64/man/man8/selinuxconlist.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/freecon.3 libselinux-2.0.67/man/man3/freecon.3 +--- nsalibselinux/man/man3/freecon.3 2008-06-12 23:25:12.000000000 -0400 ++++ libselinux-2.0.67/man/man3/freecon.3 2008-07-09 16:52:33.000000000 -0400 +@@ -15,6 +15,11 @@ + .B freeconary + frees the memory allocated for a context array. + ++If ++.I con ++is NULL, no operation is performed. ++ ++ + .SH "SEE ALSO" + .BR selinux "(8)" + +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.67/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.64/man/man8/selinuxconlist.8 2008-05-07 13:32:06.000000000 -0400 ++++ libselinux-2.0.67/man/man8/selinuxconlist.8 2008-07-09 16:52:33.000000000 -0400 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -20,9 +35,9 @@ + +.SH "SEE ALSO" +secon(8), selinuxdefcon(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.64/man/man8/selinuxdefcon.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.67/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.64/man/man8/selinuxdefcon.8 2008-05-07 13:32:25.000000000 -0400 ++++ libselinux-2.0.67/man/man8/selinuxdefcon.8 2008-07-09 16:52:33.000000000 -0400 @@ -0,0 +1,19 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -43,9 +58,147 @@ + +.SH "SEE ALSO" +secon(8), selinuxconlist(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.64/src/matchpathcon.c ---- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400 -+++ libselinux-2.0.64/src/matchpathcon.c 2008-05-07 13:08:06.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.67/src/Makefile +--- nsalibselinux/src/Makefile 2008-06-22 09:40:25.000000000 -0400 ++++ libselinux-2.0.67/src/Makefile 2008-07-09 16:56:37.000000000 -0400 +@@ -7,16 +7,24 @@ + PYINC ?= /usr/include/$(PYLIBVER) + PYLIB ?= /usr/lib/$(PYLIBVER) + PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) ++RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")') ++RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM') ++RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) ++RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) + + LIBVERSION = 1 + + LIBA=libselinux.a + TARGET=libselinux.so + SWIGIF= selinuxswig_python.i ++SWIGRUBYIF= selinuxswig_ruby.i + SWIGCOUT= selinuxswig_wrap.c ++SWIGRUBYCOUT= selinuxswig_ruby_wrap.c + SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT)) ++SWIGRUBYLOBJ:= $(patsubst %.c,%.lo,$(SWIGRUBYCOUT)) + SWIGSO=_selinux.so + SWIGFILES=$(SWIGSO) selinux.py ++SWIGRUBYSO=_rubyselinux.so + LIBSO=$(TARGET).$(LIBVERSION) + AUDIT2WHYSO=audit2why.so + +@@ -29,7 +37,9 @@ + ifeq ($(DISABLE_RPM),y) + UNUSED_SRCS+=rpm.c + endif +-SRCS= $(filter-out $(UNUSED_SRCS), $(filter-out audit2why.c $(SWIGCOUT),$(wildcard *.c))) ++ ++GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) ++SRCS= $(filter-out $(UNUSED_SRCS), $(filter-out audit2why.c $(GENERATED),$(wildcard *.c))) + + OBJS= $(patsubst %.c,%.o,$(SRCS)) + LOBJS= $(patsubst %.c,%.lo,$(SRCS)) +@@ -44,11 +54,11 @@ + + SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ + +-GENERATED=$(SWIGCOUT) ++SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ + + all: $(LIBA) $(LIBSO) + +-pywrap: all $(SWIGSO) $(AUDIT2WHYSO) ++pywrap: all $(SWIGSO) $(AUDIT2WHYSO) $(SWIGRUBYSO) + + $(LIBA): $(OBJS) + $(AR) rcs $@ $^ +@@ -57,8 +67,14 @@ + $(SWIGLOBJ): $(SWIGCOUT) + $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $< + ++$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) ++ $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $< ++ + $(SWIGSO): $(SWIGLOBJ) +- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ ++ ++$(SWIGRUBYSO): $(SWIGRUBYLOBJ) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ + + $(LIBSO): $(LOBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro +@@ -79,6 +95,9 @@ + $(SWIGCOUT): $(SWIGIF) + $(SWIG) $^ + ++$(SWIGRUBYCOUT): $(SWIGRUBYIF) ++ $(SWIGRUBY) $^ ++ + swigify: $(SWIGIF) + $(SWIG) $^ + +@@ -95,6 +114,9 @@ + install -m 755 $(AUDIT2WHYSO) $(PYTHONLIBDIR)/site-packages/selinux + install -m 644 selinux.py $(PYTHONLIBDIR)/site-packages/selinux/__init__.py + ++ test -d $(RUBYINSTALL) || install -m 755 -d $(RUBYINSTALL) ++ install -m 755 $(SWIGRUBYSO) $(RUBYINSTALL)/selinux.so ++ + relabel: + /sbin/restorecon $(SHLIBDIR)/$(LIBSO) + +@@ -102,7 +124,7 @@ + -rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~ + + distclean: clean +- rm -f $(SWIGCOUT) $(SWIGFILES) ++ rm -f $(GENERATED) $(SWIGFILES) + + indent: + ../../scripts/Lindent $(filter-out $(GENERATED),$(wildcard *.[ch])) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.67/src/audit2why.c +--- nsalibselinux/src/audit2why.c 2008-06-12 23:25:14.000000000 -0400 ++++ libselinux-2.0.67/src/audit2why.c 2008-07-09 16:52:33.000000000 -0400 +@@ -55,7 +55,7 @@ + return 0; + } + +-static int check_booleans(struct avc_t *avc, struct boolean_t **bools) ++static int check_booleans(struct boolean_t **bools) + { + char errormsg[PATH_MAX]; + struct sepol_av_decision avd; +@@ -376,7 +376,7 @@ + avc->tsid = tsid; + avc->tclass = tclass; + avc->av = av; +- if (check_booleans(avc, &bools) == 0) { ++ if (check_booleans(&bools) == 0) { + if (av & ~avd.auditdeny) { + RETURN(DONTAUDIT) + } else { +@@ -390,15 +390,15 @@ + len++; b++; + } + b = bools; +- PyObject *boollist = PyTuple_New(len); ++ PyObject *outboollist = PyTuple_New(len); + len=0; + while(b->name) { + PyObject *bool = Py_BuildValue("(si)", b->name, b->active); +- PyTuple_SetItem(boollist, len++, bool); ++ PyTuple_SetItem(outboollist, len++, bool); + b++; + } + free(bools); +- PyTuple_SetItem(result, 1, boollist); ++ PyTuple_SetItem(result, 1, outboollist); + return result; + } + } +diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.67/src/matchpathcon.c +--- nsalibselinux/src/matchpathcon.c 2008-06-12 23:25:14.000000000 -0400 ++++ libselinux-2.0.67/src/matchpathcon.c 2008-07-09 16:52:33.000000000 -0400 @@ -2,6 +2,7 @@ #include #include @@ -63,2631 +216,154 @@ va_end(ap); } -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.64/src/selinux.py [...2550 lines suppressed...] -+ { (char *)"avc_log_callback_func_audit_set", _wrap_avc_log_callback_func_audit_set, METH_VARARGS, NULL}, -+ { (char *)"avc_log_callback_func_audit_get", _wrap_avc_log_callback_func_audit_get, METH_VARARGS, NULL}, -+ { (char *)"new_avc_log_callback", _wrap_new_avc_log_callback, METH_VARARGS, NULL}, -+ { (char *)"delete_avc_log_callback", _wrap_delete_avc_log_callback, METH_VARARGS, NULL}, -+ { (char *)"avc_log_callback_swigregister", avc_log_callback_swigregister, METH_VARARGS, NULL}, -+ { (char *)"avc_thread_callback_func_create_thread_set", _wrap_avc_thread_callback_func_create_thread_set, METH_VARARGS, NULL}, -+ { (char *)"avc_thread_callback_func_create_thread_get", _wrap_avc_thread_callback_func_create_thread_get, METH_VARARGS, NULL}, -+ { (char *)"avc_thread_callback_func_stop_thread_set", _wrap_avc_thread_callback_func_stop_thread_set, METH_VARARGS, NULL}, -+ { (char *)"avc_thread_callback_func_stop_thread_get", _wrap_avc_thread_callback_func_stop_thread_get, METH_VARARGS, NULL}, -+ { (char *)"new_avc_thread_callback", _wrap_new_avc_thread_callback, METH_VARARGS, NULL}, -+ { (char *)"delete_avc_thread_callback", _wrap_delete_avc_thread_callback, METH_VARARGS, NULL}, -+ { (char *)"avc_thread_callback_swigregister", avc_thread_callback_swigregister, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_alloc_lock_set", _wrap_avc_lock_callback_func_alloc_lock_set, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_alloc_lock_get", _wrap_avc_lock_callback_func_alloc_lock_get, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_get_lock_set", _wrap_avc_lock_callback_func_get_lock_set, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_get_lock_get", _wrap_avc_lock_callback_func_get_lock_get, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_release_lock_set", _wrap_avc_lock_callback_func_release_lock_set, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_release_lock_get", _wrap_avc_lock_callback_func_release_lock_get, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_free_lock_set", _wrap_avc_lock_callback_func_free_lock_set, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_func_free_lock_get", _wrap_avc_lock_callback_func_free_lock_get, METH_VARARGS, NULL}, -+ { (char *)"new_avc_lock_callback", _wrap_new_avc_lock_callback, METH_VARARGS, NULL}, -+ { (char *)"delete_avc_lock_callback", _wrap_delete_avc_lock_callback, METH_VARARGS, NULL}, -+ { (char *)"avc_lock_callback_swigregister", avc_lock_callback_swigregister, METH_VARARGS, NULL}, -+ { (char *)"avc_init", _wrap_avc_init, METH_VARARGS, NULL}, -+ { (char *)"avc_open", _wrap_avc_open, METH_VARARGS, NULL}, -+ { (char *)"avc_cleanup", _wrap_avc_cleanup, METH_VARARGS, NULL}, -+ { (char *)"avc_reset", _wrap_avc_reset, METH_VARARGS, NULL}, -+ { (char *)"avc_destroy", _wrap_avc_destroy, METH_VARARGS, NULL}, -+ { (char *)"avc_has_perm_noaudit", _wrap_avc_has_perm_noaudit, METH_VARARGS, NULL}, -+ { (char *)"avc_has_perm", _wrap_avc_has_perm, METH_VARARGS, NULL}, -+ { (char *)"avc_audit", _wrap_avc_audit, METH_VARARGS, NULL}, -+ { (char *)"avc_compute_create", _wrap_avc_compute_create, METH_VARARGS, NULL}, -+ { (char *)"avc_compute_member", _wrap_avc_compute_member, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_lookups_set", _wrap_avc_cache_stats_entry_lookups_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_lookups_get", _wrap_avc_cache_stats_entry_lookups_get, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_hits_set", _wrap_avc_cache_stats_entry_hits_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_hits_get", _wrap_avc_cache_stats_entry_hits_get, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_misses_set", _wrap_avc_cache_stats_entry_misses_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_misses_get", _wrap_avc_cache_stats_entry_misses_get, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_discards_set", _wrap_avc_cache_stats_entry_discards_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_entry_discards_get", _wrap_avc_cache_stats_entry_discards_get, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_lookups_set", _wrap_avc_cache_stats_cav_lookups_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_lookups_get", _wrap_avc_cache_stats_cav_lookups_get, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_hits_set", _wrap_avc_cache_stats_cav_hits_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_hits_get", _wrap_avc_cache_stats_cav_hits_get, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_probes_set", _wrap_avc_cache_stats_cav_probes_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_probes_get", _wrap_avc_cache_stats_cav_probes_get, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_misses_set", _wrap_avc_cache_stats_cav_misses_set, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_cav_misses_get", _wrap_avc_cache_stats_cav_misses_get, METH_VARARGS, NULL}, -+ { (char *)"new_avc_cache_stats", _wrap_new_avc_cache_stats, METH_VARARGS, NULL}, -+ { (char *)"delete_avc_cache_stats", _wrap_delete_avc_cache_stats, METH_VARARGS, NULL}, -+ { (char *)"avc_cache_stats_swigregister", avc_cache_stats_swigregister, METH_VARARGS, NULL}, -+ { (char *)"avc_av_stats", _wrap_avc_av_stats, METH_VARARGS, NULL}, -+ { (char *)"avc_sid_stats", _wrap_avc_sid_stats, METH_VARARGS, NULL}, - { (char *)"selinux_default_type_path", _wrap_selinux_default_type_path, METH_VARARGS, NULL}, - { (char *)"get_default_type", _wrap_get_default_type, METH_VARARGS, NULL}, - { (char *)"get_ordered_context_list", _wrap_get_ordered_context_list, METH_VARARGS, NULL}, -@@ -8146,15 +10317,30 @@ - - static swig_type_info _swigt__p_SELboolean = {"_p_SELboolean", "SELboolean *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_av_decision = {"_p_av_decision", "struct av_decision *|av_decision *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_avc_cache_stats = {"_p_avc_cache_stats", "struct avc_cache_stats *|avc_cache_stats *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_avc_entry = {"_p_avc_entry", "struct avc_entry *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_avc_entry_ref = {"_p_avc_entry_ref", "struct avc_entry_ref *|avc_entry_ref *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_avc_lock_callback = {"_p_avc_lock_callback", "struct avc_lock_callback *|avc_lock_callback *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_avc_log_callback = {"_p_avc_log_callback", "struct avc_log_callback *|avc_log_callback *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_avc_memory_callback = {"_p_avc_memory_callback", "struct avc_memory_callback *|avc_memory_callback *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_avc_thread_callback = {"_p_avc_thread_callback", "struct avc_thread_callback *|avc_thread_callback *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_f_int_p_q_const__char_v_______int = {"_p_f_int_p_q_const__char_v_______int", "int (*)(int,char const *,...)", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_f_p_f_void__void__p_void = {"_p_f_p_f_void__void__p_void", "void *(*)(void (*)(void))", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_f_p_p_char__int = {"_p_f_p_p_char__int", "int (*)(char **)|int (*)(security_context_t *)", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_f_p_q_const__char_v_______void = {"_p_f_p_q_const__char_v_______void", "void (*)(char const *,...)", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__int = {"_p_f_p_void_unsigned_short_p_char_size_t__int", "int (*)(void *,unsigned short,char *,size_t)|int (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__void = {"_p_f_p_void_unsigned_short_p_char_size_t__void", "void (*)(void *,unsigned short,char *,size_t)|void (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_f_size_t__p_void = {"_p_f_size_t__p_void", "void *(*)(size_t)", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_f_void__p_void = {"_p_f_void__p_void", "void *(*)(void)", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_ino_t = {"_p_ino_t", "ino_t *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **|security_context_t *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***|security_context_t **", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_p_security_id = {"_p_p_security_id", "struct security_id **|security_id_t *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_security_class_mapping = {"_p_security_class_mapping", "struct security_class_mapping *|security_class_mapping *", 0, 0, (void*)0, 0}; -+static swig_type_info _swigt__p_security_id = {"_p_security_id", "security_id_t|struct security_id *|security_id *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_selinux_callback = {"_p_selinux_callback", "union selinux_callback *|selinux_callback *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_selinux_opt = {"_p_selinux_opt", "struct selinux_opt *|selinux_opt *", 0, 0, (void*)0, 0}; - static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|access_vector_t *|mode_t *|pid_t *", 0, 0, (void*)0, 0}; -@@ -8163,15 +10349,30 @@ - static swig_type_info *swig_type_initial[] = { - &_swigt__p_SELboolean, - &_swigt__p_av_decision, -+ &_swigt__p_avc_cache_stats, -+ &_swigt__p_avc_entry, -+ &_swigt__p_avc_entry_ref, -+ &_swigt__p_avc_lock_callback, -+ &_swigt__p_avc_log_callback, -+ &_swigt__p_avc_memory_callback, -+ &_swigt__p_avc_thread_callback, - &_swigt__p_char, - &_swigt__p_f_int_p_q_const__char_v_______int, -+ &_swigt__p_f_p_f_void__void__p_void, - &_swigt__p_f_p_p_char__int, -+ &_swigt__p_f_p_q_const__char_v_______void, -+ &_swigt__p_f_p_void__void, - &_swigt__p_f_p_void_unsigned_short_p_char_size_t__int, -+ &_swigt__p_f_p_void_unsigned_short_p_char_size_t__void, -+ &_swigt__p_f_size_t__p_void, -+ &_swigt__p_f_void__p_void, - &_swigt__p_ino_t, - &_swigt__p_int, - &_swigt__p_p_char, - &_swigt__p_p_p_char, -+ &_swigt__p_p_security_id, - &_swigt__p_security_class_mapping, -+ &_swigt__p_security_id, - &_swigt__p_selinux_callback, - &_swigt__p_selinux_opt, - &_swigt__p_unsigned_int, -@@ -8180,15 +10381,30 @@ - - static swig_cast_info _swigc__p_SELboolean[] = { {&_swigt__p_SELboolean, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_av_decision[] = { {&_swigt__p_av_decision, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_avc_cache_stats[] = { {&_swigt__p_avc_cache_stats, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_avc_entry[] = { {&_swigt__p_avc_entry, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_avc_entry_ref[] = { {&_swigt__p_avc_entry_ref, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_avc_lock_callback[] = { {&_swigt__p_avc_lock_callback, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_avc_log_callback[] = { {&_swigt__p_avc_log_callback, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_avc_memory_callback[] = { {&_swigt__p_avc_memory_callback, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_avc_thread_callback[] = { {&_swigt__p_avc_thread_callback, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_f_int_p_q_const__char_v_______int[] = { {&_swigt__p_f_int_p_q_const__char_v_______int, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_f_p_f_void__void__p_void[] = { {&_swigt__p_f_p_f_void__void__p_void, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_f_p_p_char__int[] = { {&_swigt__p_f_p_p_char__int, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_f_p_q_const__char_v_______void[] = { {&_swigt__p_f_p_q_const__char_v_______void, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_f_p_void__void[] = { {&_swigt__p_f_p_void__void, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__int[] = { {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__int, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__void[] = { {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__void, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_f_size_t__p_void[] = { {&_swigt__p_f_size_t__p_void, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_f_void__p_void[] = { {&_swigt__p_f_void__p_void, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_ino_t[] = { {&_swigt__p_ino_t, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_p_char[] = { {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_p_p_char[] = { {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_p_security_id[] = { {&_swigt__p_p_security_id, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_security_class_mapping[] = { {&_swigt__p_security_class_mapping, 0, 0, 0},{0, 0, 0, 0}}; -+static swig_cast_info _swigc__p_security_id[] = { {&_swigt__p_security_id, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_selinux_callback[] = { {&_swigt__p_selinux_callback, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_selinux_opt[] = { {&_swigt__p_selinux_opt, 0, 0, 0},{0, 0, 0, 0}}; - static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; -@@ -8197,15 +10413,30 @@ - static swig_cast_info *swig_cast_initial[] = { - _swigc__p_SELboolean, - _swigc__p_av_decision, -+ _swigc__p_avc_cache_stats, -+ _swigc__p_avc_entry, -+ _swigc__p_avc_entry_ref, -+ _swigc__p_avc_lock_callback, -+ _swigc__p_avc_log_callback, -+ _swigc__p_avc_memory_callback, -+ _swigc__p_avc_thread_callback, - _swigc__p_char, - _swigc__p_f_int_p_q_const__char_v_______int, -+ _swigc__p_f_p_f_void__void__p_void, - _swigc__p_f_p_p_char__int, -+ _swigc__p_f_p_q_const__char_v_______void, -+ _swigc__p_f_p_void__void, - _swigc__p_f_p_void_unsigned_short_p_char_size_t__int, -+ _swigc__p_f_p_void_unsigned_short_p_char_size_t__void, -+ _swigc__p_f_size_t__p_void, -+ _swigc__p_f_void__p_void, - _swigc__p_ino_t, - _swigc__p_int, - _swigc__p_p_char, - _swigc__p_p_p_char, -+ _swigc__p_p_security_id, - _swigc__p_security_class_mapping, -+ _swigc__p_security_id, - _swigc__p_selinux_callback, - _swigc__p_selinux_opt, - _swigc__p_unsigned_int, -@@ -8740,6 +10971,17 @@ - SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1))); - SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2))); - SWIG_Python_SetConstant(d, "MATCHPATHCON_VALIDATE",SWIG_From_int((int)(4))); -+ SWIG_Python_SetConstant(d, "AVC_OPT_UNUSED",SWIG_From_int((int)(0))); -+ SWIG_Python_SetConstant(d, "AVC_OPT_SETENFORCE",SWIG_From_int((int)(1))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_GRANT",SWIG_From_int((int)(1))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_TRY_REVOKE",SWIG_From_int((int)(2))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_REVOKE",SWIG_From_int((int)(4))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_RESET",SWIG_From_int((int)(8))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITALLOW_ENABLE",SWIG_From_int((int)(16))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITALLOW_DISABLE",SWIG_From_int((int)(32))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITDENY_ENABLE",SWIG_From_int((int)(64))); -+ SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITDENY_DISABLE",SWIG_From_int((int)(128))); -+ SWIG_Python_SetConstant(d, "AVC_CACHE_STATS",SWIG_From_int((int)(1))); - SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u")); - } - ++%include "selinuxswig.i" Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/F-9/libselinux.spec,v retrieving revision 1.326 retrieving revision 1.327 diff -u -r1.326 -r1.327 --- libselinux.spec 16 May 2008 19:00:59 -0000 1.326 +++ libselinux.spec 15 Jul 2008 13:07:35 -0000 1.327 @@ -1,17 +1,18 @@ -%define libsepolver 2.0.18-2 +%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") +%define libsepolver 2.0.32-1 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.64 -Release: 3%{?dist} +Version: 2.0.67 +Release: 4%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz Patch: libselinux-rhat.patch URL: http://www.nsa.gov/selinux -BuildRequires: python-devel libsepol-static >= %{libsepolver} swig +BuildRequires: python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig Requires: libsepol >= %{libsepolver} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +40,15 @@ The libselinux-python package contains the python bindings for developing SELinux applications. +%package ruby +Summary: SELinux ruby bindings for libselinux +Group: Development/Libraries +Requires: libselinux = %{version}-%{release} + +%description ruby +The libselinux-ruby package contains the ruby bindings for developing +SELinux applications. + %package devel Summary: Header files and libraries used to build SELinux Group: Development/Libraries @@ -135,7 +145,30 @@ %dir %{python_sitearch}/selinux %{python_sitearch}/selinux/* +%files ruby +%defattr(-,root,root,-) +%{ruby_sitearch}/selinux.so + %changelog +* Wed Jul 9 2008 Dan Walsh - 2.0.67-4 +- Add ruby support for puppet + +* Tue Jul 8 2008 Dan Walsh - 2.0.67-3 +- Rebuild for new libsepol + +* Sun Jun 29 2008 Dan Walsh - 2.0.67-2 +- Add Karel Zak patch for freecon man page + +* Sun Jun 22 2008 Dan Walsh - 2.0.67-1 +- Update to Upstream + * New and revised AVC, label, and mapping man pages from Eamon Walsh. + * Add swig python bindings for avc interfaces from Dan Walsh. + +* Sun Jun 22 2008 Dan Walsh - 2.0.65-1 +- Update to Upstream + * Fix selinux_file_context_verify() and selinux_lsetfilecon_default() to call matchpathcon_init_prefix if not already initialized. + * Add -q qualifier for -V option of matchpathcon and change it to indicate whether verification succeeded or failed via exit status. + * Fri May 16 2008 Dan Walsh - 2.0.64-3 - libselinux no longer neets to telnet -u in post install Index: sources =================================================================== RCS file: /cvs/extras/rpms/libselinux/F-9/sources,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- sources 7 May 2008 17:42:02 -0000 1.172 +++ sources 15 Jul 2008 13:07:35 -0000 1.173 @@ -1 +1 @@ -6d2df9a800e1960c96ddef129c83dc34 libselinux-2.0.64.tgz +76f43d37b71d72ada3f5f698ece19bde libselinux-2.0.67.tgz From fedora-extras-commits at redhat.com Tue Jul 15 13:14:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 13:14:23 +0000 Subject: [pkgdb] pcre had acl change status Message-ID: <200807151314.m6FDENQm011297@bastion.fedora.phx.redhat.com> ?t?p?n Kasal (kasal) has set the watchbugzilla acl on pcre (Fedora devel) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pcre From fedora-extras-commits at redhat.com Tue Jul 15 13:14:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 13:14:26 +0000 Subject: [pkgdb] pcre had acl change status Message-ID: <200807151314.m6FDENQp011297@bastion.fedora.phx.redhat.com> ?t?p?n Kasal (kasal) has set the commit acl on pcre (Fedora devel) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pcre From fedora-extras-commits at redhat.com Tue Jul 15 13:14:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 13:14:25 +0000 Subject: [pkgdb] pcre had acl change status Message-ID: <200807151314.m6FDEPaL011320@bastion.fedora.phx.redhat.com> ?t?p?n Kasal (kasal) has set the watchcommits acl on pcre (Fedora devel) to Approved for Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pcre From fedora-extras-commits at redhat.com Tue Jul 15 13:22:20 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Tue, 15 Jul 2008 13:22:20 GMT Subject: rpms/evolution-rspam/devel evolution-rspam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151322.m6FDMK99022613@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rspam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22507 Modified Files: .cvsignore sources Added Files: evolution-rspam.spec Log Message: initial import --- NEW FILE evolution-rspam.spec --- Name: evolution-rspam Summary: Evolution Plugin for reporting spam Version: 0.0.6 Release: 3%{?dist} Group: Applications/Internet License: GPLv2+ Source: http://gnome.eu.org/rspam-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Report_as_Spam #Patch: rspam-%{version}.patch Requires: perl-Razor-Agent Requires: pyzor Requires: evolution Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 BuildRequires: gettext BuildRequires: evolution-devel BuildRequires: perl(XML::Parser) %description Rspam Evolution Plugin enables Evolution Mail client to report email messages as spam to checksum-based and statistical filtering networks. It supports Razor network, DCC, SpamCop and Pyzor. This plugins requires a pretty new version of evolution to build. See README for more information about required programs. %prep %setup -q -n rspam-%{version} #%patch %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%{buildroot} INSTALL="install -p" find %{buildroot} -name \*\.la -print | xargs rm -f %find_lang rspam %clean rm -rf %{buildroot} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas > /dev/null || : fi %files -f rspam.lang %defattr(-,root,root,-) %{_datadir}/evolution/*/images/spam.gif %{_datadir}/evolution/*/images/nspam.gif %{_sysconfdir}/gconf/schemas/rspam.schemas %{_datadir}/evolution/*/errors/org-gnome-sa-rspam.error %{_libdir}/evolution/*/plugins/org-gnome-sa-rspam.eplug %{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so %doc AUTHORS %doc COPYING %doc ChangeLog %doc NEWS %doc README %doc TODO %changelog * Wed Jul 14 2008 Lucian Langa - 0.0.6-3 - misc cleanups * Wed Jul 09 2008 Lucian Langa - 0.0.6-2 - package name change - misc cleanups * Tue Feb 12 2008 Lucian Langa - 0.0.6-1 - buildroot and url updates * Sun Jan 27 2008 Lucian Langa - Updated to fedora build requires * Tue Mar 13 2007 cooly - Updated description * Sun Feb 04 2007 root - Initial spec file created by autospec ver. 0.8 with rpm 3 compatibility Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rspam/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 19:35:23 -0000 1.1 +++ .cvsignore 15 Jul 2008 13:21:37 -0000 1.2 @@ -0,0 +1 @@ +rspam-0.0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rspam/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 19:35:23 -0000 1.1 +++ sources 15 Jul 2008 13:21:37 -0000 1.2 @@ -0,0 +1 @@ +52f91ef52157f4f223cabfb4495dd4d4 rspam-0.0.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 13:23:03 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 13:23:03 GMT Subject: rpms/gnome-keyring-sharp/devel gnome-keyring-sharp-libdir.patch, NONE, 1.1 gnome-keyring-sharp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151323.m6FDN3Zp022661@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gnome-keyring-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22563 Modified Files: .cvsignore sources Added Files: gnome-keyring-sharp-libdir.patch gnome-keyring-sharp.spec Log Message: gnome-keyring-sharp: initial commit for Rawhide only gnome-keyring-sharp-libdir.patch: --- NEW FILE gnome-keyring-sharp-libdir.patch --- --- gnome-keyring-sharp/configure.ac.libdir 2007-10-13 13:53:29.000000000 -0400 +++ gnome-keyring-sharp/configure.ac 2008-07-06 21:09:45.000000000 -0400 @@ -44,7 +44,7 @@ AC_SUBST(GACUTIL) -GACUTIL_FLAGS='/gacdir $(DESTDIR)$(prefix)' +GACUTIL_FLAGS='/gacdir $(DESTDIR)$(libdir)' AC_SUBST(GACUTIL_FLAGS) # @@ -97,7 +97,7 @@ echo " * $CS compiler: $CSC" echo " * Documentation build enabled: $enable_monodoc " -if test "x$enable_monodoc" = "xyes" -a "x$doc_sources_dir" != "x$prefix/lib/monodoc/sources"; then +if test "x$enable_monodoc" = "xyes" -a "x$doc_sources_dir" != "x$libdir/monodoc/sources"; then echo " WARNING: The install prefix is different than the monodoc prefix." echo " Monodoc will not be able to load the documentation." fi --- gnome-keyring-sharp/src/gnome-keyring-sharp-1.0.pc.in.libdir 2007-10-13 13:53:29.000000000 -0400 +++ gnome-keyring-sharp/src/gnome-keyring-sharp-1.0.pc.in 2008-07-06 21:10:32.000000000 -0400 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ Name: Gnome.Keyring Description: Client library to access the GNOME Keyring daemon --- NEW FILE gnome-keyring-sharp.spec --- %global svn_rev 87622 %global debug_package %{nil} Name: gnome-keyring-sharp Version: 1.0.0 Release: 0.2.%{svn_rev}svn%{?dist} Summary: Mono implementation of GNOME Keyring Group: System Environment/Libraries License: MIT URL: http://www.mono-project.com/Libraries#Gnome-KeyRing-Sharp Source0: http://anonsvn.mono-project.com/viewcvs/trunk/gnome-keyring-sharp.tar.gz Patch0: gnome-keyring-sharp-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake BuildRequires: mono-devel ndesk-dbus-devel monodoc #Requires: %description gnome-keyring-sharp is a fully managed implementation of libgnome-keyring. When the gnome-keyring-daemon is running, you can use this to retrive/store confidential information such as passwords, notes or network services user information. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: monodoc %description doc The %{name}-doc package contains documentation for %{name}. %prep %setup -q -n %{name} %patch0 -p1 -b .libdir %build aclocal automake -a autoreconf %configure --disable-static make # sharing violation when doing parallel build #%{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/mono/gnome-keyring-sharp-1.0 %{_libdir}/mono/gac/Gnome.Keyring %files devel %defattr(-,root,root,-) #doc %{_libdir}/pkgconfig/%{name}-1.0.pc %files doc %defattr(-,root,root,-) %{_libdir}/monodoc/sources/Gnome.Keyring.* %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 1.0.0-0.2.87622svn%{?dist} - Disable creation of -debuginfo subpackage * Sun Jul 6 2008 Michel Alexandre Salim - 1.0.0-0.1.87622svn%{?dist} - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 19:39:18 -0000 1.1 +++ .cvsignore 15 Jul 2008 13:22:14 -0000 1.2 @@ -0,0 +1 @@ +gnome-keyring-sharp.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 19:39:18 -0000 1.1 +++ sources 15 Jul 2008 13:22:14 -0000 1.2 @@ -0,0 +1 @@ +8e6663eca87f043ed4bd1c873227126c gnome-keyring-sharp.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 13:26:49 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 15 Jul 2008 13:26:49 GMT Subject: rpms/compiz/devel compiz.spec,1.131,1.132 Message-ID: <200807151326.m6FDQnxQ023204@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/compiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23094 Modified Files: compiz.spec Log Message: Rebuild for ppc64 Index: compiz.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- compiz.spec 23 Jun 2008 15:55:20 -0000 1.131 +++ compiz.spec 15 Jul 2008 13:25:58 -0000 1.132 @@ -14,13 +14,13 @@ License: X11/MIT/GPL Group: User Interface/Desktops Version: 0.7.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches -ExcludeArch: s390 s390x ppc64 +ExcludeArch: s390 s390x Requires: xorg-x11-server-Xorg >= 1.3.0.0-19.fc8 Requires: mesa-libGL >= 7.0.1-2.fc8 @@ -337,6 +337,9 @@ %changelog +* Tue Jul 15 2008 Nikolay Vladimirov - 0.7.6-8 +- Rebuild for ppc64 + * Mon Jun 23 2008 Adel Gadllah - 0.7.6-7 - Speed up gconf schema installation From fedora-extras-commits at redhat.com Tue Jul 15 13:30:46 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Tue, 15 Jul 2008 13:30:46 GMT Subject: rpms/pastebin/devel pastebin.spec,1.5,1.6 Message-ID: <200807151330.m6FDUkXV023664@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/pastebin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23599 Modified Files: pastebin.spec Log Message: Fixed requires Index: pastebin.spec =================================================================== RCS file: /cvs/extras/rpms/pastebin/devel/pastebin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pastebin.spec 9 Feb 2008 19:38:11 -0000 1.5 +++ pastebin.spec 15 Jul 2008 13:29:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: pastebin Version: 0.60 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collaborative debugging tool Group: Applications/Internet @@ -19,7 +19,7 @@ Patch3: pastebin-db.mysql.class.php.patch Patch4: pastebin-pastebin.class.php.patch -Requires: httpd, php-mysql +Requires: httpd, php-mysql, php BuildArch: noarch @@ -96,13 +96,17 @@ %defattr(-,root,root,-) %doc CHANGES INSTALL LICENCE README UPGRADE README.fedora pastebin.sql geshi/ %attr(755,root,root) %dir %{_sysconfdir}/%{name} -%attr (755,root,root) %dir %{_datadir}/%{name}/ +%attr (755,gsfgsdfgoot,root) %dir %{_datadir}/%{name}/ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %config(noreplace) %{_sysconfdir}/%{name}/* %{_datadir}/%{name}/* %changelog +* Tue Jul 15 2008 Michael Stahnke - 0.60-4 +- Fix a requires (added php) +- Bug number 455389 + * Sat Feb 08 2008 Michael Stahnke - 0.60-3 - Fixed a patch From fedora-extras-commits at redhat.com Tue Jul 15 13:35:47 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 13:35:47 GMT Subject: rpms/gnome-keyring-sharp/devel gnome-keyring-sharp.spec,1.1,1.2 Message-ID: <200807151335.m6FDZlsd024422@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gnome-keyring-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24256 Modified Files: gnome-keyring-sharp.spec Log Message: ExcludeArch: ppc64 due to missing build dependencies: bug 241850 Index: gnome-keyring-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/gnome-keyring-sharp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-keyring-sharp.spec 15 Jul 2008 13:22:14 -0000 1.1 +++ gnome-keyring-sharp.spec 15 Jul 2008 13:34:58 -0000 1.2 @@ -13,6 +13,9 @@ Patch0: gnome-keyring-sharp-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Various Mono dependencies are not available for ppc64; see bug 241850. +ExcludeArch: ppc64 + BuildRequires: autoconf automake BuildRequires: mono-devel ndesk-dbus-devel monodoc #Requires: From fedora-extras-commits at redhat.com Tue Jul 15 13:38:18 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Tue, 15 Jul 2008 13:38:18 GMT Subject: rpms/libssh2/EL-4 libssh2.spec,1.5,1.6 Message-ID: <200807151338.m6FDcI59024820@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/libssh2/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24666 Modified Files: libssh2.spec Log Message: Tagging Sillyness Index: libssh2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libssh2/EL-4/libssh2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libssh2.spec 15 Jul 2008 13:01:51 -0000 1.5 +++ libssh2.spec 15 Jul 2008 13:37:33 -0000 1.6 @@ -1,6 +1,6 @@ Name: libssh2 Version: 0.18 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library implementing the SSH2 protocol Group: System Environment/Libraries @@ -94,6 +94,9 @@ %{_libdir}/*.so %changelog +* Tue Jul 15 2008 David Juran - 0.18-9 +- Tagging sillyness + * Tue Jul 1 2008 - 0.18-8 - Adapted for EPEL From fedora-extras-commits at redhat.com Tue Jul 15 13:45:09 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Tue, 15 Jul 2008 13:45:09 GMT Subject: rpms/pastebin/devel pastebin.spec,1.6,1.7 Message-ID: <200807151345.m6FDj9Dh025881@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/pastebin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25747 Modified Files: pastebin.spec Log Message: Fixed a typo Index: pastebin.spec =================================================================== RCS file: /cvs/extras/rpms/pastebin/devel/pastebin.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pastebin.spec 15 Jul 2008 13:29:53 -0000 1.6 +++ pastebin.spec 15 Jul 2008 13:44:16 -0000 1.7 @@ -96,7 +96,7 @@ %defattr(-,root,root,-) %doc CHANGES INSTALL LICENCE README UPGRADE README.fedora pastebin.sql geshi/ %attr(755,root,root) %dir %{_sysconfdir}/%{name} -%attr (755,gsfgsdfgoot,root) %dir %{_datadir}/%{name}/ +%attr (755,root,root) %dir %{_datadir}/%{name}/ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %config(noreplace) %{_sysconfdir}/%{name}/* %{_datadir}/%{name}/* From fedora-extras-commits at redhat.com Tue Jul 15 13:45:37 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Tue, 15 Jul 2008 13:45:37 GMT Subject: rpms/httpd/devel httpd.conf, 1.27, 1.28 httpd.spec, 1.125, 1.126 ssl.conf, 1.10, 1.11 Message-ID: <200807151345.m6FDjb4A025957@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/httpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25819 Modified Files: httpd.conf httpd.spec ssl.conf Log Message: * Tue Jul 15 2008 Joe Orton 2.2.9-5 - move AddTypes for SSL cert/CRL types from ssl.conf to httpd.conf (#449979) Index: httpd.conf =================================================================== RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- httpd.conf 14 Jul 2008 14:09:16 -0000 1.27 +++ httpd.conf 15 Jul 2008 13:44:47 -0000 1.28 @@ -767,6 +767,12 @@ AddType application/x-gzip .gz .tgz # +# MIME-types for downloading Certificates and CRLs +# +AddType application/x-x509-ca-cert .crt +AddType application/x-pkcs7-crl .crl + +# # AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server # or added with the Action directive (see below) Index: httpd.spec =================================================================== RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- httpd.spec 14 Jul 2008 14:18:03 -0000 1.125 +++ httpd.spec 15 Jul 2008 13:44:47 -0000 1.126 @@ -9,7 +9,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.9 -Release: 4 +Release: 5 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -482,6 +482,9 @@ %{_libdir}/httpd/build/*.sh %changelog +* Tue Jul 15 2008 Joe Orton 2.2.9-5 +- move AddTypes for SSL cert/CRL types from ssl.conf to httpd.conf (#449979) + * Mon Jul 14 2008 Joe Orton 2.2.9-4 - use Charset=UTF-8 in default httpd.conf (#455123) - only enable suexec when appropriate (Jim Radford, #453697) Index: ssl.conf =================================================================== RCS file: /cvs/extras/rpms/httpd/devel/ssl.conf,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ssl.conf 5 Dec 2005 17:26:03 -0000 1.10 +++ ssl.conf 15 Jul 2008 13:44:47 -0000 1.11 @@ -24,12 +24,6 @@ ## the main server and all SSL-enabled virtual hosts. ## -# -# Some MIME-types for downloading Certificates and CRLs -# -AddType application/x-x509-ca-cert .crt -AddType application/x-pkcs7-crl .crl - # Pass Phrase Dialog: # Configure the pass phrase gathering process. # The filtering dialog program (`builtin' is a internal From fedora-extras-commits at redhat.com Tue Jul 15 13:49:14 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Tue, 15 Jul 2008 13:49:14 GMT Subject: rpms/pastebin/EL-5 pastebin.spec,1.4,1.5 Message-ID: <200807151349.m6FDnE26026613@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/pastebin/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26186/EL-5 Modified Files: pastebin.spec Log Message: Fixing requires per bug 455389 Index: pastebin.spec =================================================================== RCS file: /cvs/extras/rpms/pastebin/EL-5/pastebin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pastebin.spec 9 Feb 2008 20:04:24 -0000 1.4 +++ pastebin.spec 15 Jul 2008 13:47:52 -0000 1.5 @@ -1,6 +1,6 @@ Name: pastebin Version: 0.60 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collaborative debugging tool Group: Applications/Internet @@ -19,7 +19,7 @@ Patch3: pastebin-db.mysql.class.php.patch Patch4: pastebin-pastebin.class.php.patch -Requires: httpd, php-mysql +Requires: httpd, php-mysql, php BuildArch: noarch @@ -103,6 +103,10 @@ %changelog +* Tue Jul 15 2008 Michael Stahnke - 0.60-4 +- Fix a requires (added php) +- Bug number 455389 + * Sat Feb 08 2008 Michael Stahnke - 0.60-3 - Fixed a patch From fedora-extras-commits at redhat.com Tue Jul 15 13:49:21 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Tue, 15 Jul 2008 13:49:21 GMT Subject: rpms/pastebin/EL-4 pastebin.spec,1.4,1.5 Message-ID: <200807151349.m6FDnLdw026645@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/pastebin/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26186/EL-4 Modified Files: pastebin.spec Log Message: Fixing requires per bug 455389 Index: pastebin.spec =================================================================== RCS file: /cvs/extras/rpms/pastebin/EL-4/pastebin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pastebin.spec 9 Feb 2008 20:04:18 -0000 1.4 +++ pastebin.spec 15 Jul 2008 13:47:32 -0000 1.5 @@ -1,6 +1,6 @@ Name: pastebin Version: 0.60 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collaborative debugging tool Group: Applications/Internet @@ -19,7 +19,7 @@ Patch3: pastebin-db.mysql.class.php.patch Patch4: pastebin-pastebin.class.php.patch -Requires: httpd, php-mysql +Requires: httpd, php-mysql, php BuildArch: noarch @@ -103,6 +103,10 @@ %changelog +* Tue Jul 15 2008 Michael Stahnke - 0.60-4 +- Fix a requires (added php) +- Bug number 455389 + * Sat Feb 08 2008 Michael Stahnke - 0.60-3 - Fixed a patch From fedora-extras-commits at redhat.com Tue Jul 15 13:49:40 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Tue, 15 Jul 2008 13:49:40 GMT Subject: rpms/pastebin/F-8 pastebin.spec,1.4,1.5 Message-ID: <200807151349.m6FDneim026695@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/pastebin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26186/F-8 Modified Files: pastebin.spec Log Message: Fixing requires per bug 455389 Index: pastebin.spec =================================================================== RCS file: /cvs/extras/rpms/pastebin/F-8/pastebin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pastebin.spec 9 Feb 2008 20:04:35 -0000 1.4 +++ pastebin.spec 15 Jul 2008 13:48:14 -0000 1.5 @@ -1,6 +1,6 @@ Name: pastebin Version: 0.60 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collaborative debugging tool Group: Applications/Internet @@ -19,7 +19,7 @@ Patch3: pastebin-db.mysql.class.php.patch Patch4: pastebin-pastebin.class.php.patch -Requires: httpd, php-mysql +Requires: httpd, php-mysql, php BuildArch: noarch @@ -103,6 +103,10 @@ %changelog +* Tue Jul 15 2008 Michael Stahnke - 0.60-4 +- Fix a requires (added php) +- Bug number 455389 + * Sat Feb 08 2008 Michael Stahnke - 0.60-3 - Fixed a patch From fedora-extras-commits at redhat.com Tue Jul 15 13:49:42 2008 From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma)) Date: Tue, 15 Jul 2008 13:49:42 GMT Subject: rpms/pastebin/F-9 pastebin.spec,1.5,1.6 Message-ID: <200807151349.m6FDngo7026700@cvs-int.fedora.redhat.com> Author: stahnma Update of /cvs/extras/rpms/pastebin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26186/F-9 Modified Files: pastebin.spec Log Message: Fixing requires per bug 455389 Index: pastebin.spec =================================================================== RCS file: /cvs/extras/rpms/pastebin/F-9/pastebin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pastebin.spec 9 Feb 2008 19:38:11 -0000 1.5 +++ pastebin.spec 15 Jul 2008 13:48:40 -0000 1.6 @@ -1,6 +1,6 @@ Name: pastebin Version: 0.60 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collaborative debugging tool Group: Applications/Internet @@ -19,7 +19,7 @@ Patch3: pastebin-db.mysql.class.php.patch Patch4: pastebin-pastebin.class.php.patch -Requires: httpd, php-mysql +Requires: httpd, php-mysql, php BuildArch: noarch @@ -103,6 +103,10 @@ %changelog +* Tue Jul 15 2008 Michael Stahnke - 0.60-4 +- Fix a requires (added php) +- Bug number 455389 + * Sat Feb 08 2008 Michael Stahnke - 0.60-3 - Fixed a patch From fedora-extras-commits at redhat.com Tue Jul 15 13:49:48 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 15 Jul 2008 13:49:48 GMT Subject: rpms/emerald/devel emerald.spec,1.17,1.18 Message-ID: <200807151349.m6FDnm9e026705@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/emerald/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26531 Modified Files: emerald.spec Log Message: Rebuild for ppc64 Index: emerald.spec =================================================================== RCS file: /cvs/pkgs/rpms/emerald/devel/emerald.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- emerald.spec 11 Jul 2008 19:23:36 -0000 1.17 +++ emerald.spec 15 Jul 2008 13:48:54 -0000 1.18 @@ -3,17 +3,15 @@ License: GPLv2 Group: User Interface/Desktops Version: 0.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Themeable window decorator and compositing manager for Compiz Fusion BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2 Patch0: emerald-theme-manager-desktop.patch -# libdrm is not available on these arches +# compiz-devel is not available on these arches ExcludeArch: s390 s390x -# no compiz-devel available -ExcludeArch: ppc64 Requires: compiz >= %{version} @@ -102,6 +100,9 @@ %{_libdir}/libemeraldengine.so %changelog +* Tue Jul 15 2008 Nikolay Vladimirof - 0.7.6-2 +- rebuild for ppc64 + * Fri Jul 11 2008 Nikolay Vladimirov - 0.7.6-1 - new upstream release - removed gcc43 patch(upstream) From fedora-extras-commits at redhat.com Tue Jul 15 13:52:12 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 15 Jul 2008 13:52:12 GMT Subject: rpms/kernel/devel patch-2.6.26-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.865, 1.866 Makefile, 1.74, 1.75 config-debug, 1.14, 1.15 config-generic, 1.127, 1.128 config-nodebug, 1.16, 1.17 config-powerpc-generic, 1.18, 1.19 config-powerpc32-generic, 1.14, 1.15 config-s390x, 1.6, 1.7 config-sparc64-generic, 1.16, 1.17 config-x86-generic, 1.37, 1.38 config-x86_64-generic, 1.37, 1.38 config-xen-generic, 1.4, 1.5 kernel.spec, 1.764, 1.765 linux-2.6-debug-nmi-timeout.patch, 1.3, 1.4 linux-2.6-execshield.patch, 1.89, 1.90 linux-2.6-silence-noise.patch, 1.16, 1.17 sources, 1.825, 1.826 upstream, 1.743, 1.744 linux-2.6-alsa-kill-annoying-messages.patch, 1.2, NONE linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch, 1.1, NONE linux-2.6-selinux-deffered-context-mapping-no-sleep.patch, 1.2, NONE linux-2.6-selinux-deffered-context-mapping.patch, 1.2, NONE linux-2.6-selinux-ecryptfs-support.patch, 1.1, NONE linux-2.6-selinux-generic-ioctl.patch, 1.2, NONE linux-2.6-selinux-get-invalid-xattrs.patch, 1.1, NONE linux-2.6-selinux-new-proc-checks.patch, 1.3, NONE linux-2.6-silence-x86-decompressor.patch, 1.1, NONE Message-ID: <200807151352.m6FDqCsg027271@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27089 Modified Files: .cvsignore Makefile config-debug config-generic config-nodebug config-powerpc-generic config-powerpc32-generic config-s390x config-sparc64-generic config-x86-generic config-x86_64-generic config-xen-generic kernel.spec linux-2.6-debug-nmi-timeout.patch linux-2.6-execshield.patch linux-2.6-silence-noise.patch sources upstream Added Files: patch-2.6.26-git1.bz2.sign Removed Files: linux-2.6-alsa-kill-annoying-messages.patch linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch linux-2.6-selinux-deffered-context-mapping.patch linux-2.6-selinux-ecryptfs-support.patch linux-2.6-selinux-generic-ioctl.patch linux-2.6-selinux-get-invalid-xattrs.patch linux-2.6-selinux-new-proc-checks.patch linux-2.6-silence-x86-decompressor.patch Log Message: 2.6.26-git1 --- NEW FILE patch-2.6.26-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIfEuvyGugalF9Dw4RAna2AJ9Snvx8HlVvChelBaP7oan2JNsazgCdGAym yjS3lA2fsNlLVPxAaReaM30= =/gOg -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.865 retrieving revision 1.866 diff -u -r1.865 -r1.866 --- .cvsignore 14 Jul 2008 17:25:55 -0000 1.865 +++ .cvsignore 15 Jul 2008 13:51:23 -0000 1.866 @@ -4,3 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 +patch-2.6.26-git1.bz2 Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- Makefile 14 Jun 2008 08:05:27 -0000 1.74 +++ Makefile 15 Jul 2008 13:51:23 -0000 1.75 @@ -48,7 +48,6 @@ @perl -pi -e 's/# CONFIG_DEBUG_SPINLOCK is not set/CONFIG_DEBUG_SPINLOCK=y/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_SLEEP_IN_IRQ is not set/CONFIG_DEBUG_SLEEP_IN_IRQ=y/' config-nodebug - @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug @perl -pi -e 's/# CONFIG_FAULT_INJECTION is not set/CONFIG_FAULT_INJECTION=y/' config-nodebug @perl -pi -e 's/# CONFIG_FAILSLAB is not set/CONFIG_FAILSLAB=y/' config-nodebug @perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug @@ -63,6 +62,9 @@ @perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/CONFIG_DEBUG_OBJECTS_TIMERS=y/' config-nodebug @perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug @perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug + @perl -pi -e 's/# CONFIG_SND_DEBUG_VERBOSE is not set/CONFIG_SND_DEBUG_VERBOSE=y/' config-nodebug + # just in case we're going from extremedebug -> debug + @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug @perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec @@ -95,6 +97,7 @@ @perl -pi -e 's/CONFIG_DEBUG_OBJECTS_TIMERS=y/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/' config-nodebug @perl -pi -e 's/CONFIG_X86_PTDUMP=y/# CONFIG_X86_PTDUMP is not set/' config-nodebug @perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug + @perl -pi -e 's/CONFIG_SND_DEBUG_VERBOSE=y/# CONFIG_SND_DEBUG_VERBOSE is not set/' config-nodebug @perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec Index: config-debug =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- config-debug 14 Jun 2008 08:05:27 -0000 1.14 +++ config-debug 15 Jul 2008 13:51:23 -0000 1.15 @@ -1,6 +1,7 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_DETECT=y +CONFIG_SND_DEBUG_VERBOSE=y CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_DEBUG_MUTEXES=y Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- config-generic 15 Jul 2008 05:50:39 -0000 1.127 +++ config-generic 15 Jul 2008 13:51:23 -0000 1.128 @@ -14,6 +14,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y + # # General setup # @@ -344,6 +345,7 @@ # CONFIG_BLK_DEV_IT8213 is not set # CONFIG_BLK_DEV_TC86C001 is not set CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_INTEGRITY=y # @@ -1253,7 +1255,7 @@ # # Wireless LAN # -CONFIG_WLAN_PRE80211=y +# CONFIG_WLAN_PRE80211 is not set # CONFIG_STRIP is not set # CONFIG_ARLAN is not set CONFIG_PCMCIA_WAVELAN=m @@ -1274,6 +1276,7 @@ # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_MAC80211_DEBUG is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y @@ -2433,6 +2436,8 @@ CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5 +CONFIG_SND_DRIVERS=y + # # ISA devices # @@ -2442,6 +2447,7 @@ # # PCI devices # +CONFIG_SND_PCI=y CONFIG_SND_ADLIB=m CONFIG_SND_ALI5451=m CONFIG_SND_ALS300=m @@ -2518,6 +2524,7 @@ # # ALSA USB devices # +CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y @@ -2526,6 +2533,7 @@ # # PCMCIA devices # +# CONFIG_SND_PCMCIA is not set # CONFIG_SND_VXPOCKET is not set # @@ -3158,6 +3166,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_SEED=m @@ -3177,6 +3189,9 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# Random number generation +CONFIG_CRYPTO_PRNG=m + # # Library routines # @@ -3437,6 +3452,13 @@ CONFIG_UTRACE=y CONFIG_UTRACE_PTRACE=y +CONFIG_FTRACE=y +CONFIG_IRQSOFF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FTRACE_STARTUP_TEST is not set + CONFIG_KPROBES=y # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set @@ -3549,3 +3571,4 @@ # MT9V022_PCA9536_SWITCH is not set CONFIG_THERMAL_HWMON=y + Index: config-nodebug =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- config-nodebug 14 Jun 2008 08:05:27 -0000 1.16 +++ config-nodebug 15 Jul 2008 13:51:23 -0000 1.17 @@ -1,6 +1,7 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_DETECT=y +CONFIG_SND_DEBUG_VERBOSE=y CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_DEBUG_MUTEXES=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- config-powerpc-generic 23 May 2008 22:27:32 -0000 1.18 +++ config-powerpc-generic 15 Jul 2008 13:51:23 -0000 1.19 @@ -219,3 +219,5 @@ CONFIG_DMADEVICES=y # CONFIG_FSL_DMA is not set + +CONFIG_SND_PPC=y Index: config-powerpc32-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- config-powerpc32-generic 25 Jun 2008 19:58:31 -0000 1.14 +++ config-powerpc32-generic 15 Jul 2008 13:51:23 -0000 1.15 @@ -242,7 +242,6 @@ # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -# CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set # CONFIG_IWLWIFI is not set @@ -278,3 +277,7 @@ # PPC gets sad with debug alloc (bz 448598) # CONFIG_DEBUG_PAGEALLOC is not set + +CONFIG_SND_ISA=y +CONFIG_CRYPTO_DEV_TALITOS=m + Index: config-s390x =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config-s390x 23 May 2008 22:27:32 -0000 1.6 +++ config-s390x 15 Jul 2008 13:51:23 -0000 1.7 @@ -118,7 +118,6 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_WIRELESS_EXT is not set -# CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set # CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set @@ -209,3 +208,6 @@ CONFIG_KVM=m CONFIG_S390_GUEST=y + +CONFIG_MEMORY_HOTPLUG=y +CONFIG_CHSC_SCH=m Index: config-sparc64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- config-sparc64-generic 16 May 2008 21:06:38 -0000 1.16 +++ config-sparc64-generic 15 Jul 2008 13:51:23 -0000 1.17 @@ -188,3 +188,4 @@ CONFIG_NUMA=y +CONFIG_SND_SPARC=y Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- config-x86-generic 23 Jun 2008 20:46:06 -0000 1.37 +++ config-x86-generic 15 Jul 2008 13:51:23 -0000 1.38 @@ -288,6 +288,7 @@ CONFIG_SCHED_MC=y +CONFIG_SND_ISA=y CONFIG_SND_ES18XX=m CONFIG_TCG_INFINEON=m @@ -313,6 +314,7 @@ CONFIG_W83697HF_WDT=m CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x400000 @@ -376,3 +378,14 @@ CONFIG_NONPROMISC_DEVMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_MAXSMP is not set +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_SYSPROF_TRACER=y + +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_MMIOTRACE is not set + +# CONFIG_DEBUG_PER_CPU_MAPS is not set Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- config-x86_64-generic 9 Jul 2008 04:54:02 -0000 1.37 +++ config-x86_64-generic 15 Jul 2008 13:51:23 -0000 1.38 @@ -258,6 +258,7 @@ CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set # CONFIG_COMPAT_VDSO is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y @@ -278,3 +279,14 @@ CONFIG_DIRECT_GBPAGES=y +# CONFIG_MEMTEST is not set +CONFIG_AMD_IOMMU=y +# CONFIG_MAXSMP is not set +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_SYSPROF_TRACER=y +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_MMIOTRACE is not set + +CONFIG_X86_MPPARSE=y Index: config-xen-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-xen-generic,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-xen-generic 17 May 2008 16:46:58 -0000 1.4 +++ config-xen-generic 15 Jul 2008 13:51:23 -0000 1.5 @@ -71,3 +71,4 @@ CONFIG_XEN_KBDDEV_FRONTEND=m CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.764 retrieving revision 1.765 diff -u -r1.764 -r1.765 --- kernel.spec 15 Jul 2008 05:50:39 -0000 1.764 +++ kernel.spec 15 Jul 2008 13:51:23 -0000 1.765 @@ -3,7 +3,7 @@ # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%define released_kernel 1 +%define released_kernel 0 # Versions of various parts @@ -43,9 +43,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 9 +%define rcrev 0 # The git snapshot level -%define gitrev 12 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -603,8 +603,6 @@ Patch390: linux-2.6-defaults-acpi-video.patch Patch400: linux-2.6-scsi-cpqarray-set-master.patch Patch402: linux-2.6-scsi-mpt-vmware-fix.patch -Patch410: linux-2.6-alsa-kill-annoying-messages.patch -Patch411: linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch Patch420: linux-2.6-squashfs.patch Patch430: linux-2.6-net-silence-noisy-printks.patch Patch440: linux-2.6-net-8139-pio-modparam.patch @@ -612,7 +610,6 @@ Patch450: linux-2.6-input-kill-stupid-messages.patch Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch -Patch520: linux-2.6-silence-x86-decompressor.patch Patch530: linux-2.6-silence-fbcon-logo.patch Patch570: linux-2.6-selinux-mprotect-checks.patch Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch @@ -627,7 +624,6 @@ Patch700: linux-2.6-nfs-client-mounts-hang.patch # SELinux patches, will go upstream in .27 -Patch800: linux-2.6-selinux-deffered-context-mapping.patch Patch801: linux-2.6-selinux-deffered-context-mapping-no-sleep.patch Patch802: linux-2.6-selinux-generic-ioctl.patch Patch803: linux-2.6-selinux-new-proc-checks.patch @@ -1017,9 +1013,9 @@ ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. -ApplyPatch linux-2.6-ptrace-cleanup.patch -ApplyPatch linux-2.6-tracehook.patch -ApplyPatch linux-2.6-utrace.patch +#ApplyPatch linux-2.6-ptrace-cleanup.patch +#ApplyPatch linux-2.6-tracehook.patch +#ApplyPatch linux-2.6-utrace.patch # enable sysrq-c on all kernels, not only kexec ApplyPatch linux-2.6-sysrq-c.patch @@ -1101,12 +1097,6 @@ #ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch # ALSA -# -ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch -# In upstream alsa. Resolves issues with glitch-free pulseaudio on hda-intel. -# See: https://tango.0pointer.de/pipermail/pulseaudio-discuss/2008-May/001837.html -# http://mailman.alsa-project.org/pipermail/alsa-devel/2008-May/007856.html -ApplyPatch linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch # Filesystem patches. # Squashfs @@ -1129,14 +1119,11 @@ # Silence some useless messages that still get printed with 'quiet' ApplyPatch linux-2.6-silence-noise.patch -# Make the real mode boot decompressor understand and honor 'quiet' -ApplyPatch linux-2.6-silence-x86-decompressor.patch - # Make fbcon not show the penguins with 'quiet' ApplyPatch linux-2.6-silence-fbcon-logo.patch # Fix the SELinux mprotect checks on executable mappings -#eApplyPatch linux-2.6-selinux-mprotect-checks.patch +#ApplyPatch linux-2.6-selinux-mprotect-checks.patch # Fix SELinux for sparc #ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch @@ -1149,15 +1136,6 @@ # wake up links that have been put to sleep by BIOS (#436099) ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch -# Allow selinux to defer validation of contexts, aka: rpm can write illegal labels -ApplyPatch linux-2.6-selinux-deffered-context-mapping.patch -ApplyPatch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch -ApplyPatch linux-2.6-selinux-generic-ioctl.patch -#ApplyPatch linux-2.6-selinux-new-proc-checks.patch -ApplyPatch linux-2.6-selinux-get-invalid-xattrs.patch -# Broken, see BZ 452438 -#ApplyPatch linux-2.6-selinux-ecryptfs-support.patch - # wireless patches headed for 2.6.26 #ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.27 @@ -1816,6 +1794,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Tue Jul 15 2008 Dave Jones +- 2.6.26-git1 + * Mon Jul 14 2008 David Woodhouse - Add kernel-firmware subpackage linux-2.6-debug-nmi-timeout.patch: Index: linux-2.6-debug-nmi-timeout.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-nmi-timeout.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-nmi-timeout.patch 15 Oct 2007 18:36:20 -0000 1.3 +++ linux-2.6-debug-nmi-timeout.patch 15 Jul 2008 13:51:23 -0000 1.4 @@ -1,25 +1,14 @@ ---- linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c~ 2007-04-13 15:52:37.000000000 -0400 -+++ linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c 2007-04-13 15:53:06.000000000 -0400 -@@ -1044,7 +1044,7 @@ __kprobes int nmi_watchdog_tick(struct p +--- linux-2.6.26.noarch/arch/x86/kernel/nmi.c~ 2008-07-14 20:31:14.000000000 -0400 ++++ linux-2.6.26.noarch/arch/x86/kernel/nmi.c 2008-07-14 20:31:38.000000000 -0400 +@@ -416,7 +416,7 @@ nmi_watchdog_tick(struct pt_regs *regs, * wait a few IRQs (5 seconds) before doing the oops ... */ - alert_counter[cpu]++; -- if (alert_counter[cpu] == 5*nmi_hz) -+ if (alert_counter[cpu] == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz) + local_inc(&__get_cpu_var(alert_counter)); +- if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz) ++ if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz) /* * die_nmi will return ONLY if NOTIFY_STOP happens.. */ ---- linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c~ 2007-04-13 15:53:09.000000000 -0400 -+++ linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c 2007-04-13 15:53:29.000000000 -0400 -@@ -923,7 +923,7 @@ int __kprobes nmi_watchdog_tick(struct p - * wait a few IRQs (5 seconds) before doing the oops ... - */ - local_inc(&__get_cpu_var(alert_counter)); -- if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz) -+ if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz) - die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs, - panic_on_timeout); - } else { --- linux-2.6.21.noarch/lib/Kconfig.debug~ 2007-07-06 17:05:46.000000000 -0400 +++ linux-2.6.21.noarch/lib/Kconfig.debug 2007-07-06 17:06:07.000000000 -0400 @@ -126,6 +126,14 @@ config SCHEDSTATS linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- linux-2.6-execshield.patch 20 May 2008 15:26:45 -0000 1.89 +++ linux-2.6-execshield.patch 15 Jul 2008 13:51:23 -0000 1.90 @@ -99,11 +99,11 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; ---- linux-2.6.25.noarch/arch/x86/kernel/traps_32.c~ 2008-05-16 13:43:36.000000000 -0400 -+++ linux-2.6.25.noarch/arch/x86/kernel/traps_32.c 2008-05-16 13:48:08.000000000 -0400 -@@ -602,13 +602,97 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv - DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) - DO_ERROR(12, SIGBUS, "stack segment", stack_segment) +--- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~ 2008-07-14 20:20:15.000000000 -0400 ++++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c 2008-07-14 20:26:18.000000000 -0400 +@@ -596,7 +596,90 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv + DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) + DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) -DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1) + @@ -191,8 +191,9 @@ + } +} - void __kprobes do_general_protection(struct pt_regs *regs, long error_code) - { + void __kprobes + do_general_protection(struct pt_regs *regs, long error_code) +@@ -605,6 +688,7 @@ do_general_protection(struct pt_regs *re struct thread_struct *thread; struct tss_struct *tss; int cpu; @@ -200,15 +201,7 @@ cpu = get_cpu(); tss = &per_cpu(init_tss, cpu); -@@ -641,7 +725,6 @@ void __kprobes do_general_protection(str - - return; - } -- put_cpu(); - - if (regs->flags & X86_VM_MASK) - goto gp_in_vm86; -@@ -634,6 +718,22 @@ void __kprobes do_general_protection(struct pt_regs * regs, +@@ -645,6 +729,23 @@ do_general_protection(struct pt_regs *re if (!user_mode(regs)) goto gp_in_kernel; @@ -228,10 +221,11 @@ + current->mm->context.user_cs.b); + } + - current->thread.error_code = error_code; - current->thread.trap_no = 13; - if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) && -@@ -650,11 +750,13 @@ void __kprobes do_general_protection(struct pt_regs * regs, ++ + tsk->thread.error_code = error_code; + tsk->thread.trap_no = 13; + +@@ -662,11 +763,13 @@ do_general_protection(struct pt_regs *re return; gp_in_vm86: @@ -242,9 +236,9 @@ gp_in_kernel: + put_cpu(); - if (!fixup_exception(regs)) { - current->thread.error_code = error_code; - current->thread.trap_no = 13; + if (fixup_exception(regs)) + return; + diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 8106bba..23932be 100644 --- a/arch/x86/mm/init_32.c @@ -279,17 +273,16 @@ return 0; } -@@ -527,6 +525,10 @@ void __init paging_init(void) +@@ -782,6 +782,9 @@ unsigned long __init_refok init_memory_m if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); #endif + if (exec_shield) + printk(KERN_INFO "Using x86 segment limits to approximate " + "NX protection\n"); -+ - pagetable_init(); - load_cr3(swapper_pg_dir); + /* Enable PSE if available */ + if (cpu_has_pse) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 56fe712..ec932ae 100644 --- a/arch/x86/mm/mmap.c @@ -767,7 +760,7 @@ } +EXPORT_SYMBOL(get_unmapped_area_prot); + -+#define SHLIB_BASE 0x00110000 ++#define SHLIB_BASE 0x00110000 + +unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0, + unsigned long len0, unsigned long pgoff, unsigned long flags) linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- linux-2.6-silence-noise.patch 3 Jul 2008 04:21:56 -0000 1.16 +++ linux-2.6-silence-noise.patch 15 Jul 2008 13:51:23 -0000 1.17 @@ -1,17 +1,3 @@ ---- linux-2.6.18.noarch/arch/x86/mm/init_64.c~ 2006-10-16 17:09:56.000000000 -0400 -+++ linux-2.6.18.noarch/arch/x86/mm/init_64.c 2006-10-16 17:10:09.000000000 -0400 -@@ -337,10 +337,6 @@ static void __init find_early_table_spac - - table_start >>= PAGE_SHIFT; - table_end = table_start; -- -- early_printk("kernel direct mapping tables up to %lx @ %lx-%lx\n", -- end, table_start << PAGE_SHIFT, -- (table_start << PAGE_SHIFT) + tables); - } - - /* Setup the direct mapping of the physical memory at PAGE_OFFSET. - --- linux-2.6.18.noarch/drivers/pci/setup-res.c~ 2006-10-17 17:15:34.000000000 -0400 +++ linux-2.6.18.noarch/drivers/pci/setup-res.c 2006-10-17 17:15:56.000000000 -0400 @@ -148,7 +148,7 @@ int pci_assign_resource(struct pci_dev * @@ -88,60 +74,4 @@ mutex_lock(&dpm_list_mtx); if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) { if (dev->parent->power.sleeping) -From fc4c74c4d0ccc7b57fcc841e88b63fd729f45115 Mon Sep 17 00:00:00 2001 -From: Jeremy Katz -Date: Tue, 1 Jul 2008 17:32:41 -0400 -Subject: [PATCH] Make loading padlock modules quieter when hardware isn't available - -When loading aes or sha256 via the module aliases, the padlock modules -also try to get loaded. Make the error message for them not being -present only be a NOTICE rather than an ERROR so that use of 'quiet' -will suppress the messages - -Signed-off-by: Jeremy Katz ---- - drivers/crypto/padlock-aes.c | 4 ++-- - drivers/crypto/padlock-sha.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c -index bb30eb9..54a2a16 100644 ---- a/drivers/crypto/padlock-aes.c -+++ b/drivers/crypto/padlock-aes.c -@@ -385,12 +385,12 @@ static int __init padlock_init(void) - int ret; - - if (!cpu_has_xcrypt) { -- printk(KERN_ERR PFX "VIA PadLock not detected.\n"); -+ printk(KERN_NOTICE PFX "VIA PadLock not detected.\n"); - return -ENODEV; - } - - if (!cpu_has_xcrypt_enabled) { -- printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); -+ printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); - return -ENODEV; - } - -diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c -index c666b4e..40d5680 100644 ---- a/drivers/crypto/padlock-sha.c -+++ b/drivers/crypto/padlock-sha.c -@@ -254,12 +254,12 @@ static int __init padlock_init(void) - int rc = -ENODEV; - - if (!cpu_has_phe) { -- printk(KERN_ERR PFX "VIA PadLock Hash Engine not detected.\n"); -+ printk(KERN_NOTICE PFX "VIA PadLock Hash Engine not detected.\n"); - return -ENODEV; - } - - if (!cpu_has_phe_enabled) { -- printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); -+ printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); - return -ENODEV; - } - --- -1.5.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.825 retrieving revision 1.826 diff -u -r1.825 -r1.826 --- sources 14 Jul 2008 00:33:14 -0000 1.825 +++ sources 15 Jul 2008 13:51:23 -0000 1.826 @@ -1 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 +a17d5eb7dbf3c47cc776e4b50f2df9cf patch-2.6.26-git1.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.743 retrieving revision 1.744 diff -u -r1.743 -r1.744 --- upstream 14 Jul 2008 00:33:14 -0000 1.743 +++ upstream 15 Jul 2008 13:51:23 -0000 1.744 @@ -1 +1,2 @@ linux-2.6.26.tar.bz2 +patch-2.6.26-git1.bz2 --- linux-2.6-alsa-kill-annoying-messages.patch DELETED --- --- linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch DELETED --- --- linux-2.6-selinux-deffered-context-mapping-no-sleep.patch DELETED --- --- linux-2.6-selinux-deffered-context-mapping.patch DELETED --- --- linux-2.6-selinux-ecryptfs-support.patch DELETED --- --- linux-2.6-selinux-generic-ioctl.patch DELETED --- --- linux-2.6-selinux-get-invalid-xattrs.patch DELETED --- --- linux-2.6-selinux-new-proc-checks.patch DELETED --- --- linux-2.6-silence-x86-decompressor.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 13:53:06 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 13:53:06 GMT Subject: rpms/gnome-do/devel gnome-do-0.5.0.1-keyring.patch, NONE, 1.1 gnome-do-0.5.0.1-launcher.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gnome-do.spec, 1.13, 1.14 sources, 1.6, 1.7 gnome-do-libdir.patch, 1.4, NONE Message-ID: <200807151353.m6FDr6t0027463@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27300 Modified Files: .cvsignore gnome-do.spec sources Added Files: gnome-do-0.5.0.1-keyring.patch gnome-do-0.5.0.1-launcher.patch Removed Files: gnome-do-libdir.patch Log Message: * Sun Jul 6 2008 Michel Alexandre Salim - 0.5.0.1-1 - Update to 0.5.0.1 gnome-do-0.5.0.1-keyring.patch: --- NEW FILE gnome-do-0.5.0.1-keyring.patch --- --- gnome-do-0.5.0.1/configure.keyring 2008-06-10 00:16:23.000000000 -0400 +++ gnome-do-0.5.0.1/configure 2008-07-06 21:27:32.000000000 -0400 @@ -22036,12 +22036,12 @@ pkg_cv_GNOME_KEYRING_SHARP_CFLAGS="$GNOME_KEYRING_SHARP_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp-1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp-1.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GNOME_KEYRING_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-sharp" 2>/dev/null` + pkg_cv_GNOME_KEYRING_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-sharp-1.0" 2>/dev/null` else pkg_failed=yes fi @@ -22054,12 +22054,12 @@ pkg_cv_GNOME_KEYRING_SHARP_LIBS="$GNOME_KEYRING_SHARP_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp-1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp-1.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GNOME_KEYRING_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-keyring-sharp" 2>/dev/null` + pkg_cv_GNOME_KEYRING_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-keyring-sharp-1.0" 2>/dev/null` else pkg_failed=yes fi @@ -22078,14 +22078,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-sharp"` + GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-sharp-1.0"` else - GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-sharp"` + GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-sharp-1.0"` fi # Put the nasty error message in config.log where it belongs echo "$GNOME_KEYRING_SHARP_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-sharp) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-sharp-1.0) were not met: $GNOME_KEYRING_SHARP_PKG_ERRORS @@ -22096,7 +22096,7 @@ and GNOME_KEYRING_SHARP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (gnome-keyring-sharp) were not met: +echo "$as_me: error: Package requirements (gnome-keyring-sharp-1.0) were not met: $GNOME_KEYRING_SHARP_PKG_ERRORS --- gnome-do-0.5.0.1/Do.Addins/Makefile.in.keyring 2008-06-10 00:24:01.000000000 -0400 +++ gnome-do-0.5.0.1/Do.Addins/Makefile.in 2008-07-06 21:28:10.000000000 -0400 @@ -336,7 +336,7 @@ -pkg:gconf-sharp-2.0 \ -pkg:glib-sharp-2.0 \ -pkg:gnome-desktop-sharp-2.0 \ - -pkg:gnome-keyring-sharp \ + -pkg:gnome-keyring-sharp-1.0 \ -pkg:gnome-sharp-2.0 \ -pkg:gnome-vfs-sharp-2.0 \ -pkg:gtk-sharp-2.0 \ gnome-do-0.5.0.1-launcher.patch: --- NEW FILE gnome-do-0.5.0.1-launcher.patch --- --- gnome-do-0.5.0.1/Do/gnome-do.in.launcher 2008-06-09 20:48:11.000000000 -0400 +++ gnome-do-0.5.0.1/Do/gnome-do.in 2008-07-06 21:29:51.000000000 -0400 @@ -1,15 +1,6 @@ #!/bin/sh -SCRIPT_PATH=`dirname $0` -SCRIPT_PATH=`cd $SCRIPT_PATH; pwd` - -if [ "x$SCRIPT_PATH" = "x at abs_srcdir@/bin/Debug" ] || - [ "x$SCRIPT_PATH" = "x at abs_srcdir@" ] ; then - echo "*** Running uninstalled ***" - GNOME_DO_EXE="@abs_srcdir@/bin/Debug/Do.exe" -else - GNOME_DO_EXE="@expanded_libdir@/@PACKAGE@/Do.exe" -fi +GNOME_DO_EXE="@expanded_libdir@/@PACKAGE@/Do.exe" # Send the dbus Summon signal right away for fastest response if # Do is already running. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Apr 2008 22:09:37 -0000 1.6 +++ .cvsignore 15 Jul 2008 13:52:19 -0000 1.7 @@ -1 +1 @@ -gnome-do-0.4.2.0.tar.gz +gnome-do-0.5.0.1.tar.gz Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-do.spec 14 Jul 2008 10:48:37 -0000 1.13 +++ gnome-do.spec 15 Jul 2008 13:52:19 -0000 1.14 @@ -1,15 +1,17 @@ %define debug_package %{nil} Name: gnome-do -Version: 0.4.2.0 -Release: 2.1%{?dist} +Version: 0.5.0.1 +Release: 1%{?dist} Summary: Quick launch and search License: GPLv3+ Group: Applications/File URL: http://do.davebsd.com/ -Source0: http://do.davebsd.com/src/%{name}-%{version}.tar.gz -Patch0: %{name}-libdir.patch +Source0: http://launchpad.net/do/trunk/0.5/+download/%{name}-%{version}.tar.gz +# keyring's .pc file has been renamed in latest CVS +Patch0: %{name}-0.5.0.1-keyring.patch +Patch1: %{name}-0.5.0.1-launcher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Various Mono dependencies are not available for ppc64; see bug 241850. @@ -21,15 +23,16 @@ BuildRequires: ndesk-dbus-glib-devel BuildRequires: gtk-sharp2-devel BuildRequires: gnome-sharp-devel +BuildRequires: gnome-keyring-sharp-devel BuildRequires: gettext BuildRequires: perl-XML-Parser BuildRequires: intltool BuildRequires: gtk2-devel Requires: mono-core -Requires: tomboy Requires: ndesk-dbus Requires: ndesk-dbus-glib +Requires: gnome-keyring-sharp Requires: pkgconfig %description @@ -48,15 +51,15 @@ %prep %setup -q +%patch0 -p1 -b .keyring +%patch1 -p1 -b .launcher -# fix libdir -%patch0 -p1 -b .libdir - -%configure %build +%configure make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -83,8 +86,8 @@ %{_libdir}/pkgconfig/* %changelog -* Mon Jul 14 2008 Paul F. Johnson 0.4.2.0-2.1 -- rebuild +* Sun Jul 6 2008 Michel Alexandre Salim - 0.5.0.1-1 +- Update to 0.5.0.1 * Wed Jun 04 2008 Caol??n McNamara - 0.4.2.0-2 - rebuild for dependancies Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Apr 2008 22:09:37 -0000 1.6 +++ sources 15 Jul 2008 13:52:19 -0000 1.7 @@ -1 +1 @@ -14d9472dee8f6073adf0a6a3e60789f9 gnome-do-0.4.2.0.tar.gz +1bc096b9ac6cd5fa30d5339be6dd6d9d gnome-do-0.5.0.1.tar.gz --- gnome-do-libdir.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 13:54:07 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Tue, 15 Jul 2008 13:54:07 GMT Subject: rpms/nspluginwrapper/F-9 nspluginwrapper-1.1.0-build.patch, 1.1, 1.2 nspluginwrapper-1.1.0-fork.patch, 1.1, 1.2 nspluginwrapper-1.1.0-runtime-restart.patch, 1.1, 1.2 nspluginwrapper.spec, 1.49, 1.50 Message-ID: <200807151354.m6FDs78w027762@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/nspluginwrapper/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27528 Modified Files: nspluginwrapper-1.1.0-build.patch nspluginwrapper-1.1.0-fork.patch nspluginwrapper-1.1.0-runtime-restart.patch nspluginwrapper.spec Log Message: * Tue Jul 15 2008 Martin Stransky 1.1.0-2 - Fixed build warnings in our patches nspluginwrapper-1.1.0-build.patch: Index: nspluginwrapper-1.1.0-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspluginwrapper-1.1.0-build.patch 8 Jul 2008 14:54:18 -0000 1.1 +++ nspluginwrapper-1.1.0-build.patch 15 Jul 2008 13:53:23 -0000 1.2 @@ -5,7 +5,7 @@ # nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne # derived from qemu configure script, (C) 2003 Fabrice Bellard # -+set -x ++#set -x + PACKAGE=nspluginwrapper nspluginwrapper-1.1.0-fork.patch: Index: nspluginwrapper-1.1.0-fork.patch =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-fork.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspluginwrapper-1.1.0-fork.patch 8 Jul 2008 14:54:18 -0000 1.1 +++ nspluginwrapper-1.1.0-fork.patch 15 Jul 2008 13:53:23 -0000 1.2 @@ -1,6 +1,6 @@ diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.fork nspluginwrapper-1.1.0/src/npw-viewer.c ---- nspluginwrapper-1.1.0/src/npw-viewer.c.fork 2008-07-08 14:23:26.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-08 14:26:58.000000000 +0200 +--- nspluginwrapper-1.1.0/src/npw-viewer.c.fork 2008-07-15 15:33:06.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-15 15:42:07.000000000 +0200 @@ -67,6 +67,20 @@ // RPC global connections rpc_connection_t *g_rpc_connection attribute_hidden = NULL; @@ -28,7 +28,7 @@ D(bug("NPN_ForceRedraw instance=%p\n", instance)); + + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; UNIMPLEMENTED(); } @@ -74,7 +74,7 @@ return; + + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; D(bug("NPN_InvalidateRect instance=%p\n", instance)); invoke_NPN_InvalidateRect(instance, invalidRect); @@ -84,7 +84,7 @@ D(bug("NPN_InvalidateRegion instance=%p\n", instance)); + + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; UNIMPLEMENTED(); } @@ -166,22 +166,24 @@ g_NPN_Status(NPP instance, const char *message) { + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; + D(bug("NPN_Status instance=%p\n", instance)); invoke_NPN_Status(instance, message); D(bug(" done\n")); -@@ -1130,6 +1183,9 @@ invoke_NPN_UserAgent(void) +@@ -1130,6 +1183,11 @@ invoke_NPN_UserAgent(void) static const char * g_NPN_UserAgent(NPP instance) { -+ if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ if(!pid_check()) { ++ static char tmp_agent_string[] = "None"; ++ return tmp_agent_string; ++ } + D(bug("NPN_UserAgent instance=%p\n", instance)); if (g_user_agent == NULL) g_user_agent = invoke_NPN_UserAgent(); -@@ -1212,6 +1268,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM +@@ -1212,6 +1270,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM static NPError g_NPN_NewStream(NPP instance, NPMIMEType type, const char *target, NPStream **stream) { @@ -190,7 +192,7 @@ if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; -@@ -1257,6 +1315,9 @@ invoke_NPN_DestroyStream(NPP instance, N +@@ -1257,6 +1317,9 @@ invoke_NPN_DestroyStream(NPP instance, N static NPError g_NPN_DestroyStream(NPP instance, NPStream *stream, NPError reason) { @@ -200,7 +202,7 @@ if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; -@@ -1314,6 +1375,9 @@ invoke_NPN_Write(NPP instance, NPStream +@@ -1314,6 +1377,9 @@ invoke_NPN_Write(NPP instance, NPStream static int32 g_NPN_Write(NPP instance, NPStream *stream, int32 len, void *buf) { @@ -210,7 +212,7 @@ if (instance == NULL) return -1; -@@ -1350,6 +1414,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in +@@ -1350,6 +1416,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in static void g_NPN_PushPopupsEnabledState(NPP instance, NPBool enabled) { @@ -219,7 +221,7 @@ if (instance == NULL) return; -@@ -1381,6 +1447,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins +@@ -1381,6 +1449,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins static void g_NPN_PopPopupsEnabledState(NPP instance) { @@ -228,7 +230,7 @@ if (instance == NULL) return; -@@ -1480,6 +1548,9 @@ invoke_NPN_CreateObject(NPP instance) +@@ -1480,6 +1550,9 @@ invoke_NPN_CreateObject(NPP instance) static NPObject * g_NPN_CreateObject(NPP instance, NPClass *class) { @@ -238,7 +240,7 @@ if (instance == NULL) return NULL; -@@ -1520,6 +1591,9 @@ invoke_NPN_RetainObject(NPObject *npobj) +@@ -1520,6 +1593,9 @@ invoke_NPN_RetainObject(NPObject *npobj) static NPObject * g_NPN_RetainObject(NPObject *npobj) { @@ -248,7 +250,7 @@ if (npobj == NULL) return NULL; -@@ -1558,6 +1632,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj +@@ -1558,6 +1634,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj static void g_NPN_ReleaseObject(NPObject *npobj) { @@ -258,7 +260,7 @@ if (npobj == NULL) return; -@@ -1605,6 +1682,9 @@ static bool +@@ -1605,6 +1684,9 @@ static bool g_NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result) { @@ -268,7 +270,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->invoke) return false; -@@ -1652,6 +1732,9 @@ static bool +@@ -1652,6 +1734,9 @@ static bool g_NPN_InvokeDefault(NPP instance, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result) { @@ -278,7 +280,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->invokeDefault) return false; -@@ -1697,6 +1780,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje +@@ -1697,6 +1782,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje static bool g_NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result) { @@ -288,7 +290,7 @@ if (!instance || !npobj) return false; -@@ -1746,6 +1832,9 @@ static bool +@@ -1746,6 +1834,9 @@ static bool g_NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, NPVariant *result) { @@ -298,7 +300,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->getProperty) return false; -@@ -1792,6 +1881,9 @@ static bool +@@ -1792,6 +1883,9 @@ static bool g_NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, const NPVariant *value) { @@ -308,7 +310,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->setProperty) return false; -@@ -1833,6 +1925,9 @@ invoke_NPN_RemoveProperty(NPP instance, +@@ -1833,6 +1927,9 @@ invoke_NPN_RemoveProperty(NPP instance, static bool g_NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) { @@ -318,7 +320,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->removeProperty) return false; -@@ -1874,6 +1969,9 @@ invoke_NPN_HasProperty(NPP instance, NPO +@@ -1874,6 +1971,9 @@ invoke_NPN_HasProperty(NPP instance, NPO static bool g_NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) { @@ -328,7 +330,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->hasProperty) return false; -@@ -1915,6 +2013,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj +@@ -1915,6 +2015,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj static bool g_NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName) { @@ -338,7 +340,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->hasMethod) return false; -@@ -1950,6 +2051,9 @@ invoke_NPN_SetException(NPObject *npobj, +@@ -1950,6 +2053,9 @@ invoke_NPN_SetException(NPObject *npobj, static void g_NPN_SetException(NPObject *npobj, const NPUTF8 *message) { @@ -348,7 +350,7 @@ D(bug("NPN_SetException npobj=%p, message='%s'\n", npobj, message)); invoke_NPN_SetException(npobj, message); D(bug(" done\n")); -@@ -2011,6 +2115,8 @@ invoke_NPN_GetStringIdentifier(const NPU +@@ -2011,6 +2117,8 @@ invoke_NPN_GetStringIdentifier(const NPU static NPIdentifier g_NPN_GetStringIdentifier(const NPUTF8 *name) { @@ -357,7 +359,7 @@ if (name == NULL) return NULL; -@@ -2060,6 +2166,9 @@ invoke_NPN_GetStringIdentifiers(const NP +@@ -2060,6 +2168,9 @@ invoke_NPN_GetStringIdentifiers(const NP static void g_NPN_GetStringIdentifiers(const NPUTF8 **names, uint32_t nameCount, NPIdentifier *identifiers) { @@ -367,7 +369,7 @@ if (names == NULL) return; -@@ -2101,6 +2210,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti +@@ -2101,6 +2212,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti static NPIdentifier g_NPN_GetIntIdentifier(int32_t intid) { @@ -377,7 +379,7 @@ D(bug("NPN_GetIntIdentifier intid=%d\n", intid)); NPIdentifier ret = invoke_NPN_GetIntIdentifier(intid); D(bug(" return: %p\n", ret)); -@@ -2137,6 +2249,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi +@@ -2137,6 +2251,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi static bool g_NPN_IdentifierIsString(NPIdentifier identifier) { @@ -387,7 +389,7 @@ D(bug("NPN_IdentifierIsString identifier=%p\n", identifier)); bool ret = invoke_NPN_IdentifierIsString(identifier); D(bug(" return: %d\n", ret)); -@@ -2173,6 +2288,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi +@@ -2173,6 +2290,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi static NPUTF8 * g_NPN_UTF8FromIdentifier(NPIdentifier identifier) { @@ -397,7 +399,7 @@ D(bug("NPN_UTF8FromIdentifier identifier=%p\n", identifier)); NPUTF8 *ret = invoke_NPN_UTF8FromIdentifier(identifier); D(bug(" return: '%s'\n", ret)); -@@ -2210,6 +2328,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie +@@ -2210,6 +2330,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie static int32_t g_NPN_IntFromIdentifier(NPIdentifier identifier) { @@ -407,7 +409,7 @@ D(bug("NPN_IntFromIdentifier identifier=%p\n", identifier)); int32_t ret = invoke_NPN_IntFromIdentifier(identifier); D(bug(" return: %d\n", ret)); -@@ -3259,6 +3380,9 @@ static int do_main(int argc, char **argv +@@ -3259,6 +3382,9 @@ static int do_main(int argc, char **argv } D(bug(" Plugin connection: %s\n", connection_path)); nspluginwrapper-1.1.0-runtime-restart.patch: Index: nspluginwrapper-1.1.0-runtime-restart.patch =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-runtime-restart.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspluginwrapper-1.1.0-runtime-restart.patch 8 Jul 2008 14:54:18 -0000 1.1 +++ nspluginwrapper-1.1.0-runtime-restart.patch 15 Jul 2008 13:53:23 -0000 1.2 @@ -398,7 +398,7 @@ #endif +// This callback is called when the connection is closed or broken -+typedef int (*rpc_error_callback_t)(rpc_connection_t *connection); ++typedef void (*rpc_error_callback_t)(rpc_connection_t *connection); + +// Set callback for a connection +void rpc_connection_error_callback_set(rpc_connection_t *connection, rpc_error_callback_t callback); Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- nspluginwrapper.spec 8 Jul 2008 14:54:18 -0000 1.49 +++ nspluginwrapper.spec 15 Jul 2008 13:53:23 -0000 1.50 @@ -70,7 +70,7 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in @@ -231,6 +231,9 @@ %config %{_sysconfdir}/sysconfig/%{name} %changelog +* Tue Jul 15 2008 Martin Stransky 1.1.0-2 +- Fixed build warnings in our patches + * Tue Jul 8 2008 Martin Stransky 1.1.0-1 - update to latest upstream version (1.1.0) From fedora-extras-commits at redhat.com Tue Jul 15 14:01:21 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Tue, 15 Jul 2008 14:01:21 GMT Subject: rpms/evolution-rspam/F-9 evolution-rspam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151401.m6FE1LjM003004@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rspam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28820 Modified Files: .cvsignore sources Added Files: evolution-rspam.spec Log Message: initial import --- NEW FILE evolution-rspam.spec --- Name: evolution-rspam Summary: Evolution Plugin for reporting spam Version: 0.0.6 Release: 3%{?dist} Group: Applications/Internet License: GPLv2+ Source: http://gnome.eu.org/rspam-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Report_as_Spam #Patch: rspam-%{version}.patch Requires: perl-Razor-Agent Requires: pyzor Requires: evolution Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 BuildRequires: gettext BuildRequires: evolution-devel BuildRequires: perl(XML::Parser) %description Rspam Evolution Plugin enables Evolution Mail client to report email messages as spam to checksum-based and statistical filtering networks. It supports Razor network, DCC, SpamCop and Pyzor. This plugins requires a pretty new version of evolution to build. See README for more information about required programs. %prep %setup -q -n rspam-%{version} #%patch %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%{buildroot} INSTALL="install -p" find %{buildroot} -name \*\.la -print | xargs rm -f %find_lang rspam %clean rm -rf %{buildroot} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas > /dev/null || : fi %files -f rspam.lang %defattr(-,root,root,-) %{_datadir}/evolution/*/images/spam.gif %{_datadir}/evolution/*/images/nspam.gif %{_sysconfdir}/gconf/schemas/rspam.schemas %{_datadir}/evolution/*/errors/org-gnome-sa-rspam.error %{_libdir}/evolution/*/plugins/org-gnome-sa-rspam.eplug %{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so %doc AUTHORS %doc COPYING %doc ChangeLog %doc NEWS %doc README %doc TODO %changelog * Wed Jul 14 2008 Lucian Langa - 0.0.6-3 - misc cleanups * Wed Jul 09 2008 Lucian Langa - 0.0.6-2 - package name change - misc cleanups * Tue Feb 12 2008 Lucian Langa - 0.0.6-1 - buildroot and url updates * Sun Jan 27 2008 Lucian Langa - Updated to fedora build requires * Tue Mar 13 2007 cooly - Updated description * Sun Feb 04 2007 root - Initial spec file created by autospec ver. 0.8 with rpm 3 compatibility Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rspam/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 19:35:23 -0000 1.1 +++ .cvsignore 15 Jul 2008 14:00:16 -0000 1.2 @@ -0,0 +1 @@ +rspam-0.0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rspam/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 19:35:23 -0000 1.1 +++ sources 15 Jul 2008 14:00:16 -0000 1.2 @@ -0,0 +1 @@ +52f91ef52157f4f223cabfb4495dd4d4 rspam-0.0.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 14:11:49 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Tue, 15 Jul 2008 14:11:49 GMT Subject: rpms/libssh2/EL-5 libssh2.spec,1.4,1.5 Message-ID: <200807151411.m6FEBniv004473@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/libssh2/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309 Modified Files: libssh2.spec Log Message: adapted for EPEL Index: libssh2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libssh2/EL-5/libssh2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libssh2.spec 18 Feb 2008 23:06:21 -0000 1.4 +++ libssh2.spec 15 Jul 2008 14:10:53 -0000 1.5 @@ -1,6 +1,6 @@ Name: libssh2 Version: 0.18 -Release: 7%{?dist} +Release: 9%{?dist} Summary: A library implementing the SSH2 protocol Group: System Environment/Libraries @@ -11,6 +11,7 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig %description libssh2 is a library implementing the SSH2 protocol as defined by @@ -57,12 +58,12 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p" -find %{buildroot} -name '*.la' -exec rm -f {} + +find %{buildroot} -name '*.la' -exec rm -f {} \; # clean things up a bit for packaging ( cd example && make clean ) rm -rf example/simple/.deps -find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} + +find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} \; %check (cd tests && make check) @@ -93,6 +94,12 @@ %{_libdir}/*.so %changelog +* Tue Jul 15 2008 David Juran - 0.18-9 +- Tagging sillyness + +* Tue Jul 1 2008 - 0.18-8 +- Adapted for EPEL + * Mon Feb 18 2008 Fedora Release Engineering - 0.18-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 14:13:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:13:16 GMT Subject: rpms/cachefilesd/devel cachefilesd.spec,1.20,1.21 Message-ID: <200807151413.m6FEDG8q004674@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cachefilesd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4515 Modified Files: cachefilesd.spec Log Message: fix license tag Index: cachefilesd.spec =================================================================== RCS file: /cvs/pkgs/rpms/cachefilesd/devel/cachefilesd.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cachefilesd.spec 20 Feb 2008 03:13:56 -0000 1.20 +++ cachefilesd.spec 15 Jul 2008 14:12:23 -0000 1.21 @@ -1,10 +1,10 @@ Name: cachefilesd Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: CacheFiles userspace management daemon Group: System Environment/Daemons -License: GPL -URL: http://people.redhat.com/~dhowells/fscache/ +License: GPLv2+ +URL: http://people.redhat.com/~dhowells/fscache/ Source0: http://people.redhat.com/dhowells/fscache/cachefilesd-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -21,7 +21,7 @@ %setup -q %build -%ifarch s390 s390x +%ifarch s390 s390x sparcv9 sparc64 PIE="-fPIE" %else PIE="-fpie" @@ -71,6 +71,9 @@ %{_mandir}/*/* %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.7-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.7-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 14:17:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:17:11 GMT Subject: rpms/cacti/devel cacti.spec,1.21,1.22 Message-ID: <200807151417.m6FEHBJo005246@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5079 Modified Files: cacti.spec Log Message: fix license tag Index: cacti.spec =================================================================== RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cacti.spec 9 Mar 2008 02:43:59 -0000 1.21 +++ cacti.spec 15 Jul 2008 14:16:16 -0000 1.22 @@ -1,10 +1,11 @@ Name: cacti Version: 0.8.7b -Release: 1%{?dist} +Release: 2%{?dist} Summary: An rrd based graphing tool Group: Applications/System -License: GPL +# There's a lot of stuff in there. It's all compatible. +License: GPLv2+ and LGPLv2 and (MPL 1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD) URL: http://www.cacti.net/ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz Source1: cacti-httpd.conf @@ -100,6 +101,9 @@ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.8.7b-2 +- fix license tag + * Thu Feb 14 2008 Mike McGrath - 0.8.7b-1 - Upstream released new version From fedora-extras-commits at redhat.com Tue Jul 15 14:19:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:19:25 GMT Subject: rpms/cairo-java/devel cairo-java.spec,1.47,1.48 Message-ID: <200807151419.m6FEJPXp005524@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cairo-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5449 Modified Files: cairo-java.spec Log Message: fix license tag Index: cairo-java.spec =================================================================== RCS file: /cvs/pkgs/rpms/cairo-java/devel/cairo-java.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- cairo-java.spec 1 Feb 2008 12:10:36 -0000 1.47 +++ cairo-java.spec 15 Jul 2008 14:18:36 -0000 1.48 @@ -1,8 +1,8 @@ Summary: Java bindings for the Cairo library Name: cairo-java Version: 1.0.5 -Release: 9%{?dist} -License: LGPL +Release: 10%{?dist} +License: LGPLv2 Group: Development/Libraries URL: http://java-gnome.sourceforge.net Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2 @@ -102,6 +102,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 1.0.5-10 +- fix license tag + * Fri Feb 1 2008 Stepan Kasal - 1.0.5-9 - Remove the name_base, java_pkg_prefix, and c_pkg_prefix cruft. - Repeat the main pkg description in -devel description. From fedora-extras-commits at redhat.com Tue Jul 15 14:20:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:20:50 GMT Subject: rpms/camstream/devel camstream.spec,1.18,1.19 Message-ID: <200807151420.m6FEKoYY005711@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/camstream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5605 Modified Files: camstream.spec Log Message: fix license tag Index: camstream.spec =================================================================== RCS file: /cvs/pkgs/rpms/camstream/devel/camstream.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- camstream.spec 25 Mar 2008 13:29:06 -0000 1.18 +++ camstream.spec 15 Jul 2008 14:19:57 -0000 1.19 @@ -1,11 +1,11 @@ Name: camstream Version: 0.26.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Set of programs to make use of your webcam Group: Applications/Multimedia -License: GPL +License: GPLv2+ URL: http://www.smcc.demon.nl/camstream/ Source0: http://www.smcc.demon.nl/camstream/download/camstream-0.26.3.tar.gz Source1: camstream.desktop @@ -91,6 +91,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.26.3-14 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.26.3-13 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 14:22:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:22:50 GMT Subject: rpms/ccrtp/devel ccrtp.spec,1.10,1.11 Message-ID: <200807151422.m6FEMoOf006004@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ccrtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5878 Modified Files: ccrtp.spec Log Message: fix license tag Index: ccrtp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ccrtp/devel/ccrtp.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ccrtp.spec 7 Feb 2008 08:11:11 -0000 1.10 +++ ccrtp.spec 15 Jul 2008 14:21:54 -0000 1.11 @@ -1,8 +1,8 @@ Summary: Common C++ class framework for RTP/RTCP Name: ccrtp Version: 1.6.0 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ Group: System Environment/Libraries Source0: http://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-%{version}.tar.gz Patch0: ccrtp-1.6.0-gcc.patch @@ -23,6 +23,8 @@ %package devel Summary: Header files and libraries for %{name} development Group: Development/Libraries +# Some of the headers are LGPLv2+ +License: GPLv2+ and LGPLv2+ Requires: %{name} = %{version}-%{release} Requires: pkgconfig, commoncpp2-devel Requires(post): /sbin/install-info @@ -80,6 +82,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 1.6.0-2 +- fix license tag + * Wed Feb 06 2008 Andreas Thienemann - 1.6.0-1 - Updated to upstream version 1.6.0 - Added patch enabling build with gcc-4.3 From fedora-extras-commits at redhat.com Tue Jul 15 14:28:11 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Tue, 15 Jul 2008 14:28:11 GMT Subject: rpms/evolution-rspam/F-8 evolution-rspam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151428.m6FESBe3006709@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rspam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6568 Modified Files: .cvsignore sources Added Files: evolution-rspam.spec Log Message: initial import --- NEW FILE evolution-rspam.spec --- Name: evolution-rspam Summary: Evolution Plugin for reporting spam Version: 0.0.6 Release: 3%{?dist} Group: Applications/Internet License: GPLv2+ Source: http://gnome.eu.org/rspam-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Report_as_Spam #Patch: rspam-%{version}.patch Requires: perl-Razor-Agent Requires: pyzor Requires: evolution Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 BuildRequires: gettext BuildRequires: evolution-devel BuildRequires: perl(XML::Parser) %description Rspam Evolution Plugin enables Evolution Mail client to report email messages as spam to checksum-based and statistical filtering networks. It supports Razor network, DCC, SpamCop and Pyzor. This plugins requires a pretty new version of evolution to build. See README for more information about required programs. %prep %setup -q -n rspam-%{version} #%patch %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%{buildroot} INSTALL="install -p" find %{buildroot} -name \*\.la -print | xargs rm -f %find_lang rspam %clean rm -rf %{buildroot} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/rspam.schemas > /dev/null || : fi %files -f rspam.lang %defattr(-,root,root,-) %{_datadir}/evolution/*/images/spam.gif %{_datadir}/evolution/*/images/nspam.gif %{_sysconfdir}/gconf/schemas/rspam.schemas %{_datadir}/evolution/*/errors/org-gnome-sa-rspam.error %{_libdir}/evolution/*/plugins/org-gnome-sa-rspam.eplug %{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so %doc AUTHORS %doc COPYING %doc ChangeLog %doc NEWS %doc README %doc TODO %changelog * Wed Jul 14 2008 Lucian Langa - 0.0.6-3 - misc cleanups * Wed Jul 09 2008 Lucian Langa - 0.0.6-2 - package name change - misc cleanups * Tue Feb 12 2008 Lucian Langa - 0.0.6-1 - buildroot and url updates * Sun Jan 27 2008 Lucian Langa - Updated to fedora build requires * Tue Mar 13 2007 cooly - Updated description * Sun Feb 04 2007 root - Initial spec file created by autospec ver. 0.8 with rpm 3 compatibility Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rspam/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2008 19:35:23 -0000 1.1 +++ .cvsignore 15 Jul 2008 14:27:24 -0000 1.2 @@ -0,0 +1 @@ +rspam-0.0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rspam/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2008 19:35:23 -0000 1.1 +++ sources 15 Jul 2008 14:27:24 -0000 1.2 @@ -0,0 +1 @@ +52f91ef52157f4f223cabfb4495dd4d4 rspam-0.0.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 14:30:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:30:29 GMT Subject: rpms/cdparanoia/devel cdparanoia-III-10.0-headers.patch, NONE, 1.1 cdparanoia-III-alpha9.8.scsi-setspeed.patch, 1.1, 1.2 cdparanoia.spec, 1.32, 1.33 Message-ID: <200807151430.m6FEUTdx006952@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cdparanoia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6832 Modified Files: cdparanoia-III-alpha9.8.scsi-setspeed.patch cdparanoia.spec Added Files: cdparanoia-III-10.0-headers.patch Log Message: fix license tag cdparanoia-III-10.0-headers.patch: --- NEW FILE cdparanoia-III-10.0-headers.patch --- diff -up cdparanoia-III-10.0/header.c.headers cdparanoia-III-10.0/header.c diff -up cdparanoia-III-10.0/paranoia/gap.c.headers cdparanoia-III-10.0/paranoia/gap.c --- cdparanoia-III-10.0/paranoia/gap.c.headers 2008-05-12 17:20:49.000000000 -0400 +++ cdparanoia-III-10.0/paranoia/gap.c 2008-07-15 10:24:21.000000000 -0400 @@ -9,6 +9,7 @@ #include "p_block.h" #include "cdda_paranoia.h" #include "gap.h" +#include /**** Gap analysis code ***************************************************/ cdparanoia-III-alpha9.8.scsi-setspeed.patch: Index: cdparanoia-III-alpha9.8.scsi-setspeed.patch =================================================================== RCS file: /cvs/pkgs/rpms/cdparanoia/devel/cdparanoia-III-alpha9.8.scsi-setspeed.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cdparanoia-III-alpha9.8.scsi-setspeed.patch 4 Mar 2008 21:09:05 -0000 1.1 +++ cdparanoia-III-alpha9.8.scsi-setspeed.patch 15 Jul 2008 14:29:30 -0000 1.2 @@ -1,7 +1,8 @@ ---- cdparanoia-III-alpha9.8/interface/scsi_interface.c_orig 2008-02-02 21:14:07.000000000 +0100 -+++ cdparanoia-III-alpha9.8/interface/scsi_interface.c 2008-02-02 21:13:41.000000000 +0100 -@@ -1565,6 +1565,15 @@ - return ret; +diff -up cdparanoia-III-10.0/interface/scsi_interface.c.setspeed cdparanoia-III-10.0/interface/scsi_interface.c +--- cdparanoia-III-10.0/interface/scsi_interface.c.setspeed 2008-05-14 14:59:15.000000000 -0400 ++++ cdparanoia-III-10.0/interface/scsi_interface.c 2008-07-15 10:23:42.000000000 -0400 +@@ -1616,6 +1616,14 @@ unsigned char *scsi_inquiry(cdrom_drive + return (d->sg_buffer); } +/* Set operating speed */ @@ -12,11 +13,10 @@ + else + return 0; +} -+ - int scsi_init_drive(cdrom_drive *d){ - int ret, is_sgio; -@@ -1609,7 +1618,7 @@ + int scsi_init_drive(cdrom_drive *d){ + int ret; +@@ -1660,7 +1668,7 @@ int scsi_init_drive(cdrom_drive *d){ d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 : scsi_read_toc; Index: cdparanoia.spec =================================================================== RCS file: /cvs/pkgs/rpms/cdparanoia/devel/cdparanoia.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- cdparanoia.spec 19 Jun 2008 19:44:32 -0000 1.32 +++ cdparanoia.spec 15 Jul 2008 14:29:30 -0000 1.33 @@ -2,8 +2,8 @@ Name: cdparanoia Version: 10.0 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv3 Group: Applications/Multimedia Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz Patch0: cdparanoia-III-alpha9.8.nostrip.patch @@ -18,7 +18,7 @@ Patch9: cdparanoia-III-alpha9.8.smalldma.patch Patch10: cdparanoia-III-alpha9.8.lm.patch Patch11: cdparanoia-III-alpha9.8.scsi-setspeed.patch -Patch12: cdparanoia-III-alpha9.8-headers.patch +Patch12: cdparanoia-III-10.0-headers.patch Url: http://www.xiph.org/paranoia/index.html BuildRoot: %{_tmppath}/cdparanoia-%{version}-root Requires: cdparanoia-libs = %{version}-%{release} @@ -39,6 +39,8 @@ Summary: Development tools for libcdda_paranoia (Paranoia III). Group: Development/Libraries Requires: cdparanoia-libs = %{version}-%{release} +# Some of the headers are LGPLv3 +License: GPLv3 and LGPLv3 %description -n cdparanoia-devel The cdparanoia-devel package contains the static libraries and header @@ -47,6 +49,7 @@ %package -n cdparanoia-libs Summary: Libraries for libcdda_paranoia (Paranoia III). Group: Development/Libraries +License: GPLv3 %description -n cdparanoia-libs The cdparanoia-libs package contains the dynamic libraries needed for @@ -125,6 +128,10 @@ %{_libdir}/*.a %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 10.0-3 +- fix license tag +- fix headers, setspeed patch to apply with fuzz=0 + * Thu Jun 19 2008 Adam Jackson 10.0-2 - cdparanoia 10. From fedora-extras-commits at redhat.com Tue Jul 15 14:31:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:31:54 GMT Subject: rpms/chkrootkit/devel chkrootkit.spec,1.33,1.34 Message-ID: <200807151431.m6FEVsP2007221@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/chkrootkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7033 Modified Files: chkrootkit.spec Log Message: fix license tag Index: chkrootkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/chkrootkit/devel/chkrootkit.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- chkrootkit.spec 30 May 2008 18:01:10 -0000 1.33 +++ chkrootkit.spec 15 Jul 2008 14:30:48 -0000 1.34 @@ -1,9 +1,9 @@ Name: chkrootkit Version: 0.48 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tool to locally check for signs of a rootkit Group: Applications/System -License: BSD-like +License: BSD and GPLv2+ and Python URL: http://www.chkrootkit.org Source0: ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-%{version}.tar.gz Source1: chkrootkitX @@ -119,6 +119,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.48-9 +- fix license tag + * Fri May 30 2008 Michael Schwendt - 0.48-8 - Let chkproc default to procps version 3. From fedora-extras-commits at redhat.com Tue Jul 15 14:38:42 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 14:38:42 GMT Subject: rpms/xorg-x11-drv-evdev/F-9 .cvsignore, 1.17, 1.18 import.log, 1.4, 1.5 sources, 1.17, 1.18 xorg-x11-drv-evdev.spec, 1.29, 1.30 Message-ID: <200807151438.m6FEcgRa007867@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7763/F-9 Modified Files: .cvsignore import.log sources xorg-x11-drv-evdev.spec Log Message: evdev 2.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 1 Jul 2008 20:40:43 -0000 1.17 +++ .cvsignore 15 Jul 2008 14:37:42 -0000 1.18 @@ -1 +1 @@ -xf86-input-evdev-2.0.1.tar.bz2 +xf86-input-evdev-2.0.2.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 1 Jul 2008 20:40:43 -0000 1.4 +++ import.log 15 Jul 2008 14:37:42 -0000 1.5 @@ -1 +1,2 @@ xorg-x11-drv-evdev-2_0_1-1_fc9:F-9:xorg-x11-drv-evdev-2.0.1-1.fc9.src.rpm:1214944530 +xorg-x11-drv-evdev-2_0_2-1_fc9:F-9:xorg-x11-drv-evdev-2.0.2-1.fc9.src.rpm:1216132612 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 1 Jul 2008 20:40:43 -0000 1.17 +++ sources 15 Jul 2008 14:37:42 -0000 1.18 @@ -1 +1 @@ -061c4558316b1ec9ee71478bdf68b10c xf86-input-evdev-2.0.1.tar.bz2 +ae45a529283589aba7840c7eb9254333 xf86-input-evdev-2.0.2.tar.bz2 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-9/xorg-x11-drv-evdev.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- xorg-x11-drv-evdev.spec 1 Jul 2008 20:40:43 -0000 1.29 +++ xorg-x11-drv-evdev.spec 15 Jul 2008 14:37:42 -0000 1.30 @@ -6,7 +6,7 @@ Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -53,6 +53,9 @@ %{_mandir}/man4/evdev.4* %changelog +* Tue Jul 15 2008 Adam Jackson 2.0.2-1 +- evdev 2.0.2 + * Tue Jul 01 2008 Adam Jackson 2.0.1-1 - evdev 2.0.1 From fedora-extras-commits at redhat.com Tue Jul 15 14:40:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:40:30 GMT Subject: rpms/clement/devel clement.spec,1.22,1.23 Message-ID: <200807151440.m6FEeUZ1008042@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/clement/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968 Modified Files: clement.spec Log Message: fix license tag Index: clement.spec =================================================================== RCS file: /cvs/pkgs/rpms/clement/devel/clement.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- clement.spec 21 Dec 2006 19:46:24 -0000 1.22 +++ clement.spec 15 Jul 2008 14:39:42 -0000 1.23 @@ -1,8 +1,9 @@ Name: clement Version: 2.1 -Release: 241%{?dist}.1 +Release: 241%{?dist}.2 URL: http://www.clement.safe.ca -License: GPL +# No version specified +License: GPL+ Summary: An application to filter and manage E-mail traffic Group: System Environment/Daemons Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz @@ -108,6 +109,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 2.1-241.2 +- fix license tag + * Thu Dec 21 2006 Rex Dieter 2.1-241.1 - %%exclude yum.repos.d/* (bug #220497) From fedora-extras-commits at redhat.com Tue Jul 15 14:42:05 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 14:42:05 GMT Subject: rpms/gambit-c/F-9 gambit-c.spec,1.1,1.2 Message-ID: <200807151442.m6FEg5nv008281@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018/F-9 Modified Files: gambit-c.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 - Put include files and libraries in standard paths Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/F-9/gambit-c.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambit-c.spec 19 Jun 2008 22:52:57 -0000 1.1 +++ gambit-c.spec 15 Jul 2008 14:41:17 -0000 1.2 @@ -12,7 +12,7 @@ Name: gambit-c Version: 4.2.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Gambit-C Scheme programming system Group: Development/Languages @@ -22,7 +22,7 @@ Source1: http://toute.ca/termite080616_0057.tar.gz Source2: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch -Patch1: termite-fix-defrandom.patch +Patch1: termite-fix-defrandom.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el @@ -68,12 +68,12 @@ Termite is an Erlang-like distributed programming system written in Scheme. -%package termite-doc -Summary: Examples for the Termite distributed programming system -Group: Documentation -Requires: %{name}-termite = %{version}-%{release} +%package termite-doc +Summary: Examples for the Termite distributed programming system +Group: Documentation +Requires: %{name}-termite = %{version}-%{release} -%description termite-doc +%description termite-doc Termite is an Erlang-like distributed programming system written in Scheme. This package contains examples and benchmarks for Termite. @@ -120,7 +120,8 @@ %install rm -rf $RPM_BUILD_ROOT -make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} +make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \ + includedir=$RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in gsc gsi do @@ -156,6 +157,9 @@ sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi|g' chmod +x otp/gen_event.scm +# Link static libs +(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/current/lib/*.a .) + # Move docs mkdir ../termite-doc ../termite-more-docs mv CHANGELOG LICENSE README VERSION ../termite-doc @@ -185,8 +189,10 @@ %doc LGPL.txt LICENSE-2.0.txt README %exclude %{_bindir}/tsi %{_bindir}/* +%{_includedir}/*.h %exclude %{_libdir}/%{name}/*/lib/termite %{_libdir}/%{name} +%{_libdir}/*.a %files termite %defattr(-,root,root,-) @@ -210,6 +216,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 +- Put include files and libraries in standard paths + * Thu Jun 19 2008 Michel Alexandre Salim - 4.2.8-5 - Package Termite as a module instead of bundling a custom Gambit-C with it From fedora-extras-commits at redhat.com Tue Jul 15 14:42:16 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 14:42:16 GMT Subject: rpms/gambit-c/F-8 gambit-c.spec,1.1,1.2 Message-ID: <200807151442.m6FEgG1j008288@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018/F-8 Modified Files: gambit-c.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 - Put include files and libraries in standard paths Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/F-8/gambit-c.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambit-c.spec 19 Jun 2008 22:52:38 -0000 1.1 +++ gambit-c.spec 15 Jul 2008 14:40:53 -0000 1.2 @@ -12,7 +12,7 @@ Name: gambit-c Version: 4.2.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Gambit-C Scheme programming system Group: Development/Languages @@ -22,7 +22,7 @@ Source1: http://toute.ca/termite080616_0057.tar.gz Source2: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch -Patch1: termite-fix-defrandom.patch +Patch1: termite-fix-defrandom.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el @@ -68,12 +68,12 @@ Termite is an Erlang-like distributed programming system written in Scheme. -%package termite-doc -Summary: Examples for the Termite distributed programming system -Group: Documentation -Requires: %{name}-termite = %{version}-%{release} +%package termite-doc +Summary: Examples for the Termite distributed programming system +Group: Documentation +Requires: %{name}-termite = %{version}-%{release} -%description termite-doc +%description termite-doc Termite is an Erlang-like distributed programming system written in Scheme. This package contains examples and benchmarks for Termite. @@ -120,7 +120,8 @@ %install rm -rf $RPM_BUILD_ROOT -make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} +make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \ + includedir=$RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in gsc gsi do @@ -156,6 +157,9 @@ sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi|g' chmod +x otp/gen_event.scm +# Link static libs +(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/current/lib/*.a .) + # Move docs mkdir ../termite-doc ../termite-more-docs mv CHANGELOG LICENSE README VERSION ../termite-doc @@ -185,8 +189,10 @@ %doc LGPL.txt LICENSE-2.0.txt README %exclude %{_bindir}/tsi %{_bindir}/* +%{_includedir}/*.h %exclude %{_libdir}/%{name}/*/lib/termite %{_libdir}/%{name} +%{_libdir}/*.a %files termite %defattr(-,root,root,-) @@ -210,6 +216,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 +- Put include files and libraries in standard paths + * Thu Jun 19 2008 Michel Alexandre Salim - 4.2.8-5 - Package Termite as a module instead of bundling a custom Gambit-C with it From fedora-extras-commits at redhat.com Tue Jul 15 14:42:22 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 14:42:22 GMT Subject: rpms/gambit-c/EL-5 gambit-c.spec,1.1,1.2 Message-ID: <200807151442.m6FEgMiX008298@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018/EL-5 Modified Files: gambit-c.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 - Put include files and libraries in standard paths Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/EL-5/gambit-c.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambit-c.spec 19 Jun 2008 22:52:21 -0000 1.1 +++ gambit-c.spec 15 Jul 2008 14:40:02 -0000 1.2 @@ -12,7 +12,7 @@ Name: gambit-c Version: 4.2.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Gambit-C Scheme programming system Group: Development/Languages @@ -22,7 +22,7 @@ Source1: http://toute.ca/termite080616_0057.tar.gz Source2: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch -Patch1: termite-fix-defrandom.patch +Patch1: termite-fix-defrandom.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el @@ -68,12 +68,12 @@ Termite is an Erlang-like distributed programming system written in Scheme. -%package termite-doc -Summary: Examples for the Termite distributed programming system -Group: Documentation -Requires: %{name}-termite = %{version}-%{release} +%package termite-doc +Summary: Examples for the Termite distributed programming system +Group: Documentation +Requires: %{name}-termite = %{version}-%{release} -%description termite-doc +%description termite-doc Termite is an Erlang-like distributed programming system written in Scheme. This package contains examples and benchmarks for Termite. @@ -120,7 +120,8 @@ %install rm -rf $RPM_BUILD_ROOT -make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} +make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \ + includedir=$RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in gsc gsi do @@ -156,6 +157,9 @@ sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi|g' chmod +x otp/gen_event.scm +# Link static libs +(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/current/lib/*.a .) + # Move docs mkdir ../termite-doc ../termite-more-docs mv CHANGELOG LICENSE README VERSION ../termite-doc @@ -185,8 +189,10 @@ %doc LGPL.txt LICENSE-2.0.txt README %exclude %{_bindir}/tsi %{_bindir}/* +%{_includedir}/*.h %exclude %{_libdir}/%{name}/*/lib/termite %{_libdir}/%{name} +%{_libdir}/*.a %files termite %defattr(-,root,root,-) @@ -210,6 +216,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 +- Put include files and libraries in standard paths + * Thu Jun 19 2008 Michel Alexandre Salim - 4.2.8-5 - Package Termite as a module instead of bundling a custom Gambit-C with it From fedora-extras-commits at redhat.com Tue Jul 15 14:42:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:42:22 GMT Subject: rpms/codeina/devel codeina.spec,1.19,1.20 Message-ID: <200807151442.m6FEgMhW008299@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/codeina/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8192 Modified Files: codeina.spec Log Message: fix license tag Index: codeina.spec =================================================================== RCS file: /cvs/pkgs/rpms/codeina/devel/codeina.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- codeina.spec 8 Apr 2008 20:51:38 -0000 1.19 +++ codeina.spec 15 Jul 2008 14:41:28 -0000 1.20 @@ -8,11 +8,11 @@ Name: codeina Version: 0.10.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GStreamer Codec Installation Application Group: Applications/Internet -License: GPLv2.1+ +License: GPLv2+ URL: https://core.fluendo.com/gstreamer/trac/browser/codeina # Upstream SVN repository is at https://core.fluendo.com/gstreamer/svn/codeina/trunk/ Source: http://www.fluendo.com/downloads/codeina/%{name}-%{version}.tar.bz2 @@ -75,6 +75,9 @@ %{_datadir}/%{name}/ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.10.1-9 +- fix license tag + * Tue Apr 08 2008 - Bastien Nocera - 0.10.1-8 - Revert to 0.10.1 from the F-8 build From fedora-extras-commits at redhat.com Tue Jul 15 14:42:27 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 14:42:27 GMT Subject: rpms/gambit-c/devel gambit-c.spec,1.7,1.8 Message-ID: <200807151442.m6FEgR5d008311@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018/devel Modified Files: gambit-c.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 - Put include files and libraries in standard paths Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/devel/gambit-c.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gambit-c.spec 14 Jul 2008 21:29:50 -0000 1.7 +++ gambit-c.spec 15 Jul 2008 14:41:36 -0000 1.8 @@ -22,7 +22,7 @@ Source1: http://toute.ca/termite080616_0057.tar.gz Source2: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch -Patch1: termite-fix-defrandom.patch +Patch1: termite-fix-defrandom.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el @@ -68,12 +68,12 @@ Termite is an Erlang-like distributed programming system written in Scheme. -%package termite-doc -Summary: Examples for the Termite distributed programming system -Group: Documentation -Requires: %{name}-termite = %{version}-%{release} +%package termite-doc +Summary: Examples for the Termite distributed programming system +Group: Documentation +Requires: %{name}-termite = %{version}-%{release} -%description termite-doc +%description termite-doc Termite is an Erlang-like distributed programming system written in Scheme. This package contains examples and benchmarks for Termite. @@ -106,8 +106,7 @@ %build %configure --enable-single-host \ --enable-gcc-opts \ - --prefix=%{_libdir}/%{name} \ - --includedir=%{_includedir} + --prefix=%{_libdir}/%{name} make %{?_smp_mflags} @@ -121,7 +120,8 @@ %install rm -rf $RPM_BUILD_ROOT -make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} +make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \ + includedir=$RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in gsc gsi do @@ -192,6 +192,7 @@ %{_includedir}/*.h %exclude %{_libdir}/%{name}/*/lib/termite %{_libdir}/%{name} +%{_libdir}/*.a %files termite %defattr(-,root,root,-) From fedora-extras-commits at redhat.com Tue Jul 15 14:43:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:43:55 GMT Subject: rpms/cohoba/devel cohoba.spec,1.5,1.6 Message-ID: <200807151443.m6FEhtxc008495@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cohoba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8382 Modified Files: cohoba.spec Log Message: fix license tag Index: cohoba.spec =================================================================== RCS file: /cvs/pkgs/rpms/cohoba/devel/cohoba.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cohoba.spec 12 Dec 2006 14:51:37 -0000 1.5 +++ cohoba.spec 15 Jul 2008 14:43:01 -0000 1.6 @@ -2,11 +2,11 @@ Name: cohoba Version: 0.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cohoba is a GNOME interface for Telepathy. It aims to be innovative and simple Group: Applications/Communications -License: GPL +License: GPLv2+ URL: http://telepathy.freedesktop.org/wiki/Cohoba Source0: http://telepathy.freedesktop.org/releases/cohoba/cohoba-0.0.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,9 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.0.4-6 +- fix license tag + * Tue Dec 12 2006 Sander Hoentjen - 0.0.4-5 - Removed require on python-ctypes since it is included in python 2.5 From fedora-extras-commits at redhat.com Tue Jul 15 14:51:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:51:14 GMT Subject: rpms/commoncpp2/devel commoncpp2.spec,1.6,1.7 Message-ID: <200807151451.m6FEpE7l009072@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/commoncpp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8980 Modified Files: commoncpp2.spec Log Message: fix license tag Index: commoncpp2.spec =================================================================== RCS file: /cvs/pkgs/rpms/commoncpp2/devel/commoncpp2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- commoncpp2.spec 6 Feb 2008 22:59:16 -0000 1.6 +++ commoncpp2.spec 15 Jul 2008 14:50:12 -0000 1.7 @@ -1,8 +1,8 @@ Summary: GNU Common C++ class framework Name: commoncpp2 Version: 1.6.1 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ with exceptions Group: System Environment/Libraries Source0: http://download.sourceforge.net/gnutelephony/commoncpp2-%{version}.tar.gz URL: http://www.gnu.org/software/commoncpp/ @@ -78,6 +78,9 @@ %{_infodir}/commoncpp2.info* %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 1.6.1-2 +- fix license tag + * Wed Feb 06 2008 Andreas Thienemann - 1.6.1-1 - Updated to new upstream version 1.6.1 - Reverted the ld-check patch as it's no longer needed From fedora-extras-commits at redhat.com Tue Jul 15 14:52:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 14:52:41 GMT Subject: rpms/compat-erlang/devel compat-erlang.spec,1.10,1.11 Message-ID: <200807151452.m6FEqfuU009253@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/compat-erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9155 Modified Files: compat-erlang.spec Log Message: fix license tag Index: compat-erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-erlang/devel/compat-erlang.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- compat-erlang.spec 19 Feb 2008 03:27:09 -0000 1.10 +++ compat-erlang.spec 15 Jul 2008 14:51:47 -0000 1.11 @@ -1,10 +1,10 @@ Name: compat-erlang Version: R10B -Release: 12.9%{?dist} +Release: 12.10%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz Patch: otp-links.patch @@ -97,6 +97,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - R10B-12.10 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - R10B-12.9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 15:23:29 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 15 Jul 2008 15:23:29 GMT Subject: rpms/selinux-policy/devel policy-20080710.patch, NONE, 1.1 modules-targeted.conf, 1.91, 1.92 selinux-policy.spec, 1.684, 1.685 Message-ID: <200807151523.m6FFNTUu018036@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18003 Modified Files: modules-targeted.conf selinux-policy.spec Added Files: policy-20080710.patch Log Message: * Thu Jul 10 2008 Dan Walsh 3.5.0-1 - Update to latest refpolicy policy-20080710.patch: --- NEW FILE policy-20080710.patch --- diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.0/Makefile --- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 +++ serefpolicy-3.5.0/Makefile 2008-07-15 11:03:06.000000000 -0400 @@ -311,20 +311,22 @@ # parse-rolemap modulename,outputfile define parse-rolemap - $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ - $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 + echo "" >> $2 +# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ +# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 endef # perrole-expansion modulename,outputfile define perrole-expansion - $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 - $(call parse-rolemap,$1,$2) - $(verbose) echo "')" >> $2 - - $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 - $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 - $(call parse-rolemap-compat,$1,$2) - $(verbose) echo "')" >> $2 + echo "No longer doing perrole-expansion" +# $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 +# $(call parse-rolemap,$1,$2) +# $(verbose) echo "')" >> $2 + +# $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 +# $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 +# $(call parse-rolemap-compat,$1,$2) +# $(verbose) echo "')" >> $2 endef # create-base-per-role-tmpl modulenames,outputfile @@ -523,6 +525,10 @@ @mkdir -p $(appdir)/users $(verbose) $(INSTALL) -m 644 $^ $@ +$(appdir)/initrc_context: $(tmpdir)/initrc_context + @mkdir -p $(appdir) + $(verbose) $(INSTALL) -m 644 $< $@ + $(appdir)/%: $(appconf)/% @mkdir -p $(appdir) $(verbose) $(INSTALL) -m 644 $< $@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.0/Rules.modular --- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 +++ serefpolicy-3.5.0/Rules.modular 2008-07-15 11:03:06.000000000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @test -d $(tmpdir) || mkdir -p $(tmpdir) - $(call perrole-expansion,$(basename $(@F)),$@.role) - $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) +# $(call perrole-expansion,$(basename $(@F)),$@.role) + $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ $(tmpdir)/%.mod.fc: $(m4support) %.fc @@ -129,7 +129,7 @@ @test -d $(tmpdir) || mkdir -p $(tmpdir) # define all available object classes $(verbose) $(genperm) $(avs) $(secclass) > $@ - $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) +# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy @@ -146,7 +146,7 @@ $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy $(tmpdir)/rolemap.conf: $(rolemap) $(verbose) echo "" > $@ - $(call parse-rolemap,base,$@) +# $(call parse-rolemap,base,$@) $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.0/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.0/config/appconfig-mcs/failsafe_context 2008-07-15 11:03:06.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.5.0/config/appconfig-mcs/guest_u_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.0/config/appconfig-mcs/root_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 -staff_r:staff_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 -sysadm_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 -user_r:user_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 - # # Uncomment if you want to automatically login as sysadm_r # -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.5.0/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.0/config/appconfig-mcs/seusers 2008-07-15 11:03:06.000000000 -0400 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh -__default__:user_u:s0 +__default__:unconfined_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.5.0/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 +system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 +system_r:remote_login_t:s0 unconfined_r:unconfined_t:s0 +system_r:rshd_t:s0 unconfined_r:unconfined_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 +system_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0 +system_r:unconfined_t:s0 unconfined_r:unconfined_t:s0 +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.0/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.0/config/appconfig-mcs/userhelper_context 2008-07-15 11:03:06.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.5.0/config/appconfig-mcs/xguest_u_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 +system_r:sshd_t xguest_r:xguest_t:s0 +system_r:crond_t xguest_r:xguest_crond_t:s0 +system_r:xdm_t xguest_r:xguest_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.0/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.5.0/config/appconfig-mls/guest_u_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.0/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.5.0/config/appconfig-standard/guest_u_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t +system_r:sshd_t guest_r:guest_t +system_r:crond_t guest_r:guest_crond_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.0/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.0/config/appconfig-standard/root_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t -staff_r:staff_su_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t -sysadm_r:sysadm_su_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t -user_r:user_su_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t - # # Uncomment if you want to automatically login as sysadm_r # -#system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.0/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.5.0/config/appconfig-standard/xguest_u_default_contexts 2008-07-15 11:03:06.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t +system_r:sshd_t xguest_r:xguest_t +system_r:crond_t xguest_r:xguest_crond_t +system_r:xdm_t xguest_r:xguest_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.5.0/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.0/man/man8/ftpd_selinux.8 2008-07-15 11:03:06.000000000 -0400 @@ -35,10 +35,6 @@ directorories, you need to set the ftp_home_dir boolean. .TP setsebool -P ftp_home_dir 1 -.TP -ftpd can run either as a standalone daemon or as part of the xinetd domain. If you want to run ftpd as a daemon you must set the ftpd_is_daemon boolean. -.TP -setsebool -P ftpd_is_daemon 1 .br service vsftpd restart [...36518 lines suppressed...] +optional_policy(` + brctl_domtrans(xend_t) +') optional_policy(` consoletype_exec(xend_t) @@ -224,7 +240,7 @@ allow xenconsoled_t self:capability { dac_override fsetid ipc_lock }; allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms; -allow xenconsoled_t self:fifo_file { read write }; +allow xenconsoled_t self:fifo_file rw_fifo_file_perms; allow xenconsoled_t xen_devpts_t:chr_file rw_term_perms; @@ -245,6 +261,8 @@ files_read_usr_files(xenconsoled_t) +fs_list_tmpfs(xenconsoled_t) + term_create_pty(xenconsoled_t,xen_devpts_t); term_use_generic_ptys(xenconsoled_t) term_use_console(xenconsoled_t) @@ -257,7 +275,7 @@ miscfiles_read_localization(xenconsoled_t) -xen_append_log(xenconsoled_t) +xen_manage_log(xenconsoled_t) xen_stream_connect_xenstore(xenconsoled_t) ######################################## @@ -265,15 +283,25 @@ # Xen store local policy # -allow xenstored_t self:capability { dac_override mknod ipc_lock }; +allow xenstored_t self:capability { dac_override mknod ipc_lock sys_resource }; allow xenstored_t self:unix_stream_socket create_stream_socket_perms; allow xenstored_t self:unix_dgram_socket create_socket_perms; +manage_files_pattern(xenstored_t,xenstored_tmp_t,xenstored_tmp_t) +manage_dirs_pattern(xenstored_t,xenstored_tmp_t,xenstored_tmp_t) +files_tmp_filetrans(xenstored_t, xenstored_tmp_t, { file dir }) + # pid file manage_files_pattern(xenstored_t,xenstored_var_run_t,xenstored_var_run_t) manage_sock_files_pattern(xenstored_t,xenstored_var_run_t,xenstored_var_run_t) files_pid_filetrans(xenstored_t,xenstored_var_run_t, { file sock_file }) +# log files +manage_dirs_pattern(xenstored_t,xenstored_var_log_t,xenstored_var_log_t) +manage_files_pattern(xenstored_t,xenstored_var_log_t,xenstored_var_log_t) +manage_sock_files_pattern(xenstored_t,xenstored_var_log_t,xenstored_var_log_t) +logging_log_filetrans(xenstored_t,xenstored_var_log_t,{ sock_file file dir }) + # var/lib files for xenstored manage_dirs_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t) manage_files_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t) @@ -318,12 +346,13 @@ allow xm_t self:capability { dac_override ipc_lock sys_tty_config }; # internal communication is often done using fifo and unix sockets. -allow xm_t self:fifo_file { read write }; +allow xm_t self:fifo_file rw_fifo_file_perms; allow xm_t self:unix_stream_socket { create_stream_socket_perms connectto }; allow xm_t self:tcp_socket create_stream_socket_perms; manage_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t) manage_fifo_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t) +manage_sock_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t) files_search_var_lib(xm_t) allow xm_t xen_image_t:dir rw_dir_perms; @@ -336,6 +365,7 @@ kernel_write_xen_state(xm_t) corecmd_exec_bin(xm_t) +corecmd_exec_shell(xm_t) corenet_tcp_sendrecv_generic_if(xm_t) corenet_tcp_sendrecv_all_nodes(xm_t) @@ -351,8 +381,11 @@ storage_raw_read_fixed_disk(xm_t) +fs_getattr_all_fs(xm_t) + term_use_all_terms(xm_t) +init_stream_connect_script(xm_t) init_rw_script_stream_sockets(xm_t) init_use_fds(xm_t) @@ -363,6 +396,23 @@ sysnet_read_config(xm_t) +sysadm_dontaudit_search_home_dirs(xm_t) + xen_append_log(xm_t) xen_stream_connect(xm_t) xen_stream_connect_xenstore(xm_t) + +#Should have a boolean wrapping these +fs_list_auto_mountpoints(xend_t) +files_search_mnt(xend_t) +fs_getattr_all_fs(xend_t) +fs_read_dos_files(xend_t) + +tunable_policy(`xen_use_nfs',` + fs_manage_nfs_files(xend_t) + fs_read_nfs_symlinks(xend_t) +') + +optional_policy(` + unconfined_domain(xend_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.0/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:25:08.000000000 -0400 +++ serefpolicy-3.5.0/policy/support/file_patterns.spt 2008-07-15 11:03:06.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; ') + +define(`manage_all_pattern',` + manage_dirs_pattern($1,$2,$2) + manage_files_pattern($1,$2,$2) + manage_lnk_files_pattern($1,$2,$2) + manage_fifo_files_pattern($1,$2,$2) + manage_sock_files_pattern($1,$2,$2) + + relabelto_dirs_pattern($1,$2,$2) + relabelto_files_pattern($1,$2,$2) + relabelto_lnk_files_pattern($1,$2,$2) + relabelto_fifo_files_pattern($1,$2,$2) + relabelto_sock_files_pattern($1,$2,$2) + + relabelfrom_dirs_pattern($1,$2,$2) + relabelfrom_files_pattern($1,$2,$2) + relabelfrom_lnk_files_pattern($1,$2,$2) + relabelfrom_fifo_files_pattern($1,$2,$2) + relabelfrom_sock_files_pattern($1,$2,$2) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.0/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:25:08.000000000 -0400 +++ serefpolicy-3.5.0/policy/support/obj_perm_sets.spt 2008-07-15 11:03:06.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }') + +define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control } +') + +define(`all_nscd_perms', `{ getserv getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost shmemserv } ') +define(`all_dbus_perms', `{ acquire_svc send_msg } ') +define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ') +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ') + +define(`manage_key_perms', `{ create link read search setattr view write } ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.0/policy/users --- nsaserefpolicy/policy/users 2008-07-10 11:38:46.000000000 -0400 +++ serefpolicy-3.5.0/policy/users 2008-07-15 11:03:06.000000000 -0400 @@ -1,3 +1,9 @@ +role auditadm_r; +role secadm_r; +role sysadm_r; +role staff_r; +role user_r; +role unconfined_r; ################################## # # Core User configuration. @@ -25,11 +31,8 @@ # permit any access to such users, then remove this entry. # gen_user(user_u, user, user_r, s0, s0) -gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats) - -# Until order dependence is fixed for users: -gen_user(unconfined_u, unconfined, unconfined_r, s0, s0 - mls_systemhigh, mcs_allcats) +gen_user(staff_u, user, staff_r system_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) +gen_user(sysadm_u, user, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats) # # The following users correspond to Unix identities. @@ -38,8 +41,4 @@ # role should use the staff_r role instead of the user_r role when # not in the sysadm_r. # -ifdef(`direct_sysadm_daemon',` - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) -',` - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -') +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) Index: modules-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- modules-targeted.conf 4 Jun 2008 17:26:52 -0000 1.91 +++ modules-targeted.conf 15 Jul 2008 15:22:39 -0000 1.92 @@ -1365,14 +1365,14 @@ # xen = base -# Layer: system +# Layer: services # Module: virt # # Virtualization libraries # virt = module -# Layer: system +# Layer: apps # Module: qemu # # Virtualization emulator @@ -1641,7 +1641,7 @@ # openoffice = base -# Layer: services +# Layer: apps # Module: podsleuth # # Podsleuth probes, identifies, and exposes properties and metadata bound to iPods. Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.684 retrieving revision 1.685 diff -u -r1.684 -r1.685 --- selinux-policy.spec 10 Jul 2008 15:28:32 -0000 1.684 +++ selinux-policy.spec 15 Jul 2008 15:22:39 -0000 1.685 @@ -16,12 +16,12 @@ %define CHECKPOLICYVER 2.0.16-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 3.4.2 -Release: 14%{?dist} +Version: 3.5.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz -patch: policy-20080509.patch +patch: policy-20080710.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: Makefile.devel @@ -375,6 +375,9 @@ %endif %changelog +* Thu Jul 10 2008 Dan Walsh 3.5.0-1 +- Update to latest refpolicy + * Wed Jul 9 2008 Dan Walsh 3.4.2-14 - Add inotify support to nscd From fedora-extras-commits at redhat.com Tue Jul 15 15:26:22 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Tue, 15 Jul 2008 15:26:22 GMT Subject: rpms/tex-simplecv/devel tex-simplecv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151526.m6FFQMHe018221@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/tex-simplecv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18133 Modified Files: .cvsignore sources Added Files: tex-simplecv.spec Log Message: Initial commit --- NEW FILE tex-simplecv.spec --- %define real_name simplecv %{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: tex-%{real_name} Version: 1.6 Release: 6%{?dist} Summary: A simple latex class for writing curricula vitae Group: Applications/Publishing License: LPPL URL: http://tug.ctan.org/tex-archive/macros/latex/contrib/%{real_name}/ Source0: http://tug.ctan.org/get/macros/latex/contrib/%{real_name}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: tetex-latex BuildRequires: /usr/bin/kpsewhich Requires: tetex-latex # no debuginfo %define debug_package %{nil} %description The simplecv document class is intended to provide a simple yet elegant way to write your curriculum vitae (resume). This is a repackaging of the |cv| class that has been available with LyX for a long time. The change of name has been made necessary by the existence of another |cv| class on CTAN. %package doc Summary: Documentation for %{name} Group: Applications/Publishing Requires: tetex-doc texlive-texmf-doc %description doc Documentation for latex package %{real_name}. %prep %setup -q -n %{real_name} %build latex %{real_name}.ins pdflatex %{real_name}.dtx pdflatex %{real_name}.dtx %install rm -rf $RPM_BUILD_ROOT install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex/latex/%{real_name} install -d -m755 $RPM_BUILD_ROOT%{_texmf}/doc/tex/latex/%{real_name} cp -p %{real_name}.cls $RPM_BUILD_ROOT%{_texmf}/tex/latex/%{real_name} cp -p %{real_name}.pdf $RPM_BUILD_ROOT%{_texmf}/doc/tex/latex/%{real_name} cp -p test* $RPM_BUILD_ROOT%{_texmf}/doc/tex/latex/%{real_name} %clean rm -rf $RPM_BUILD_ROOT %post -p /usr/bin/texhash %postun -p /usr/bin/texhash %post doc -p /usr/bin/texhash %postun doc -p /usr/bin/texhash %files %defattr(-,root,root,-) %{_texmf}/tex/latex/%{real_name} %doc README %files doc %defattr(-,root,root,-) %{_texmf}/doc/tex/latex/%{real_name} %changelog * Tue Jul 8 2008 Jos?? Matos - 1.6-6 - Add distag, and replace the dependency of -doc subpackage just to require the directory ownership tetex-doc -> texlive-texmf-doc. * Thu Jun 26 2008 Jos?? Matos - 1.6-5 - doc subpackage requires tetex-doc and no longer requires the main package. * Tue Apr 15 2008 Jos?? Matos - 1.6-4 - Run texhash for doc subpackage. * Tue Jan 15 2008 Jos?? Matos - 1.6-3 - Create new subpackage with the documentation. - Only copy cls file to texmf tree. * Mon Jan 14 2008 Jos?? Matos - 1.6-2 - Add README to %%doc. - Create .cls file. * Mon Jan 14 2008 Jos?? Matos - 1.6-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tex-simplecv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2008 16:50:44 -0000 1.1 +++ .cvsignore 15 Jul 2008 15:25:00 -0000 1.2 @@ -0,0 +1 @@ +simplecv.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tex-simplecv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2008 16:50:44 -0000 1.1 +++ sources 15 Jul 2008 15:25:00 -0000 1.2 @@ -0,0 +1 @@ +e4d22ece2d22da46b952ef014529c7f5 simplecv.zip From fedora-extras-commits at redhat.com Tue Jul 15 15:39:26 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Tue, 15 Jul 2008 15:39:26 GMT Subject: rpms/compiz-fusion/devel compiz-fusion.spec,1.34,1.35 Message-ID: <200807151539.m6FFdQqa019479@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-fusion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19327 Modified Files: compiz-fusion.spec Log Message: build on ppc64 Index: compiz-fusion.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- compiz-fusion.spec 7 Jul 2008 18:08:07 -0000 1.34 +++ compiz-fusion.spec 15 Jul 2008 15:38:41 -0000 1.35 @@ -2,7 +2,7 @@ Name: compiz-fusion Version: 0.7.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collection of Compiz Fusion plugins for Compiz Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches -ExcludeArch: s390 s390x ppc64 +ExcludeArch: s390 s390x BuildRequires: compiz-devel >= %{version} BuildRequires: compiz-bcop >= %{version} @@ -131,6 +131,9 @@ %changelog +* Tue Jul 15 2008 Adel Gadllah 0.7.6-6 +- Build on ppc64 too + * Tue Jun 24 2008 Adel Gadllah 0.7.6-5 - Fix up scriptlets (RH #452674) From fedora-extras-commits at redhat.com Tue Jul 15 15:41:49 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Tue, 15 Jul 2008 15:41:49 GMT Subject: rpms/compiz-fusion-extras/devel compiz-fusion-extras.spec, 1.18, 1.19 Message-ID: <200807151541.m6FFfn3I019797@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19688 Modified Files: compiz-fusion-extras.spec Log Message: build on ppc64 Index: compiz-fusion-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/compiz-fusion-extras.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- compiz-fusion-extras.spec 7 Jul 2008 18:09:03 -0000 1.18 +++ compiz-fusion-extras.spec 15 Jul 2008 15:40:55 -0000 1.19 @@ -2,7 +2,7 @@ Name: compiz-fusion-extras Version: 0.7.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Additional Compiz Fusion plugins for Compiz Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches -ExcludeArch: s390 s390x ppc64 +ExcludeArch: s390 s390x BuildRequires: compiz-fusion-devel >= %{version} BuildRequires: compiz-bcop >= %{version} @@ -111,6 +111,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Tue Jul 15 2008 Adel Gadllah 0.7.6-6 +- Build on ppc64 too + * Tue Jun 24 2008 Adel Gadllah 0.7.6-5 - Fix up scriptlets (RH #452677) From fedora-extras-commits at redhat.com Tue Jul 15 15:46:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:46:35 +0000 Subject: [pkgdb] sat4j was added for overholt Message-ID: <200807151546.m6FFkZAB017800@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package sat4j with summary A library of SAT solvers written in Java Kevin Fenzi (kevin) has approved Package sat4j Kevin Fenzi (kevin) has added a Fedora devel branch for sat4j with an owner of overholt Kevin Fenzi (kevin) has approved sat4j in Fedora devel Kevin Fenzi (kevin) has approved Package sat4j Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sat4j (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sat4j (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sat4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From fedora-extras-commits at redhat.com Tue Jul 15 15:46:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:46:39 +0000 Subject: [pkgdb] sat4j (Fedora, devel) updated by kevin Message-ID: <200807151546.m6FFkdo6017820@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on sat4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From fedora-extras-commits at redhat.com Tue Jul 15 15:47:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 15:47:13 GMT Subject: rpms/sat4j - New directory Message-ID: <200807151547.m6FFlDPV020517@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sat4j In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20463/rpms/sat4j Log Message: Directory /cvs/extras/rpms/sat4j added to the repository From fedora-extras-commits at redhat.com Tue Jul 15 15:47:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:20 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFlKTk017909@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the watchbugzilla acl on id3-py (Fedora devel) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:26 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFkdo8017820@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the watchcommits acl on id3-py (Fedora devel) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:28 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFlSiI017968@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the commit acl on id3-py (Fedora devel) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 15:47:31 GMT Subject: rpms/sat4j/devel - New directory Message-ID: <200807151547.m6FFlVBu020555@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sat4j/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20463/rpms/sat4j/devel Log Message: Directory /cvs/extras/rpms/sat4j/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 15 15:47:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:31 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFkZAD017800@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the approveacls acl on id3-py (Fedora devel) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:44 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFlSiK017968@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the watchbugzilla acl on id3-py (Fedora 9) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:44 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFkZAF017800@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the watchcommits acl on id3-py (Fedora 9) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 15:47:45 GMT Subject: rpms/sat4j Makefile,NONE,1.1 Message-ID: <200807151547.m6FFlju4020581@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sat4j In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20463/rpms/sat4j Added Files: Makefile Log Message: Setup of module sat4j --- NEW FILE Makefile --- # Top level Makefile for module sat4j all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 15 15:47:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:46 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFlKTm017909@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the commit acl on id3-py (Fedora 9) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:47 +0000 Subject: [pkgdb] id3-py had acl change status Message-ID: <200807151547.m6FFlSiM017968@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the approveacls acl on id3-py (Fedora 9) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:47:53 +0000 Subject: [pkgdb] id3-py: mnowak has given up approveacls Message-ID: <200807151547.m6FFkdoA017820@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has given up the approveacls acl on id3-py (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:47:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 15:47:59 GMT Subject: rpms/sat4j/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807151547.m6FFlxiq020662@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sat4j/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20463/rpms/sat4j/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sat4j --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sat4j # $Id: Makefile,v 1.1 2008/07/15 15:47:45 kevin Exp $ NAME := sat4j SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 15 15:48:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:48:00 +0000 Subject: [pkgdb] id3-py: mnowak has given up approveacls Message-ID: <200807151548.m6FFlSiO017968@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has given up the approveacls acl on id3-py (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:48:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:48:13 +0000 Subject: [pkgdb] id3-py: mnowak has requested approveacls Message-ID: <200807151548.m6FFlSiQ017968@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the approveacls acl on id3-py (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:48:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:48:16 +0000 Subject: [pkgdb] id3-py: mnowak has given up approveacls Message-ID: <200807151548.m6FFkZAH017800@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has given up the approveacls acl on id3-py (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/id3-py From fedora-extras-commits at redhat.com Tue Jul 15 15:48:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:48:28 +0000 Subject: [pkgdb] python-id3: mnowak has requested approveacls Message-ID: <200807151548.m6FFmSOO018284@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has requested the approveacls acl on python-id3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Tue Jul 15 15:48:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:48:30 +0000 Subject: [pkgdb] python-id3 had acl change status Message-ID: <200807151548.m6FFlKTo017909@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the approveacls acl on python-id3 (Fedora devel) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Tue Jul 15 15:48:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:48:36 +0000 Subject: [pkgdb] python-id3 had acl change status Message-ID: <200807151548.m6FFmSOQ018284@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has set the approveacls acl on python-id3 (Fedora 9) to Approved for Michal Nowak (mnowak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Tue Jul 15 15:48:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 15:48:43 +0000 Subject: [pkgdb] python-id3: mnowak has given up approveacls Message-ID: <200807151548.m6FFmhQ0018383@bastion.fedora.phx.redhat.com> Michal Nowak (mnowak) has given up the approveacls acl on python-id3 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-id3 From fedora-extras-commits at redhat.com Tue Jul 15 15:53:13 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 15 Jul 2008 15:53:13 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.29, 1.30 java-1.6.0-openjdk.spec, 1.53, 1.54 sources, 1.29, 1.30 Message-ID: <200807151553.m6FFrDsB021330@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21173 Modified Files: .cvsignore java-1.6.0-openjdk.spec sources Log Message: * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Updated icedteaver. - Updated icedteasnapshot. - Updated openjdkdate. - Updated openjdkver. - Updated release. - Resolves: rhbz#452525 - Resolves: rhbz#446855 - Resolves: rhbz#369861 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 30 May 2008 22:11:43 -0000 1.29 +++ .cvsignore 15 Jul 2008 15:52:17 -0000 1.30 @@ -1,5 +1,5 @@ -icedtea6-1.2.tar.gz java-access-bridge-1.22.0.tar.gz mauve-2008-03-11.tar.gz mauve_tests -openjdk-6-src-b09-11_apr_2008-fedora.tar.gz +openjdk-6-src-b10_30_may_2008-fedora.tar.gz +icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.tar.gz Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- java-1.6.0-openjdk.spec 10 Jul 2008 16:55:40 -0000 1.53 +++ java-1.6.0-openjdk.spec 15 Jul 2008 15:52:17 -0000 1.54 @@ -6,10 +6,10 @@ # If runtests is 0 test suites will not be run. %define runtests 1 -%define icedteaver 1.2 -%define icedteasnapshot %{nil} -%define openjdkver b09 -%define openjdkdate 11_apr_2008 +%define icedteaver 1.3 +%define icedteasnapshot -3cbb75db29a0a37578d40edcb8f75b9b2b534cd1 +%define openjdkver b10 +%define openjdkdate 30_may_2008 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -109,7 +109,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.17.%{openjdkver}%{?dist} +Release: 0.18.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -907,13 +907,23 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog -* Thu Jul 9 2008 Lillian Angel -1:1.6.0.0-0.17.b09 +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Updated icedteaver. +- Updated icedteasnapshot. +- Updated openjdkdate. +- Updated openjdkver. +- Updated release. +- Resolves: rhbz#452525 +- Resolves: rhbz#446855 +- Resolves: rhbz#369861 + +* Thu Jul 9 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 - Added sparc/64 patches. -* Wed Jul 8 2008 Lillian Angel -1:1.6.0.0-0.17.b09 +* Wed Jul 8 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 - Only apply hotspot security patch of jitarches. -* Wed Jul 2 2008 Lillian Angel -1:1.6.0.0-0.17.b09 +* Wed Jul 2 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 - Added OpenJDK security patches. * Tue Jun 3 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.16.b09 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 30 May 2008 22:43:39 -0000 1.29 +++ sources 15 Jul 2008 15:52:17 -0000 1.30 @@ -1,5 +1,5 @@ -8bc02e7913fa977cdc6f5c8f081d1a8d icedtea6-1.2.tar.gz 11d8e6129f27792cc1b0e1a7de2ec127 java-access-bridge-1.22.0.tar.gz 079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests -0a50744f931b235e7e20b755b35a41be openjdk-6-src-b09-11_apr_2008-fedora.tar.gz +5a8537503058edaeff587d45fc167631 openjdk-6-src-b10_30_may_2008-fedora.tar.gz +d35b57c1046a9866912bf66f13d16c55 icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 15:54:20 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 15 Jul 2008 15:54:20 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.54,1.55 Message-ID: <200807151554.m6FFsKD0021516@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21395 Modified Files: java-1.6.0-openjdk.spec Log Message: Updated changelog Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- java-1.6.0-openjdk.spec 15 Jul 2008 15:52:17 -0000 1.54 +++ java-1.6.0-openjdk.spec 15 Jul 2008 15:53:33 -0000 1.55 @@ -914,7 +914,6 @@ - Updated openjdkver. - Updated release. - Resolves: rhbz#452525 -- Resolves: rhbz#446855 - Resolves: rhbz#369861 * Thu Jul 9 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 From fedora-extras-commits at redhat.com Tue Jul 15 15:54:32 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 15 Jul 2008 15:54:32 GMT Subject: rpms/xsane/devel xsane-0.995-close-fds.patch, NONE, 1.1 xsane.spec, 1.56, 1.57 Message-ID: <200807151554.m6FFsWoJ021563@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/xsane/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21416 Modified Files: xsane.spec Added Files: xsane-0.995-close-fds.patch Log Message: don't leak file descriptors to help browser process (#455450) xsane-0.995-close-fds.patch: --- NEW FILE xsane-0.995-close-fds.patch --- diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c --- xsane-0.995/src/xsane.c.close-fds 2007-09-28 17:24:56.000000000 +0200 +++ xsane-0.995/src/xsane.c 2008-07-15 17:48:17.000000000 +0200 @@ -3681,6 +3681,8 @@ static void xsane_show_doc_via_nsr(GtkWi char *arg[5]; struct stat st; char netscape_lock_path[PATH_MAX]; + int open_max; + int i; DBG(DBG_proc, "xsane_show_doc_via_nsr(%s)\n", name); @@ -3725,6 +3727,17 @@ static void xsane_show_doc_via_nsr(GtkWi ipc_file = fdopen(xsane.ipc_pipefd[1], "w"); } + open_max = (int) sysconf (_SC_OPEN_MAX); + + DBG(DBG_info, "closing unneeded file descriptors\n"); + + /* leave stdin, stdout, stderr alone */ + for (i = 3; i < open_max; i++) { + /* xsane.ipc_pipefd[0] is closed by now */ + if (i != xsane.ipc_pipefd[1]) + close (i); + } + DBG(DBG_info, "trying to change user id for new subprocess:\n"); DBG(DBG_info, "old effective uid = %d\n", (int) geteuid()); setuid(getuid()); Index: xsane.spec =================================================================== RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- xsane.spec 19 Feb 2008 16:29:16 -0000 1.56 +++ xsane.spec 15 Jul 2008 15:53:42 -0000 1.57 @@ -3,12 +3,13 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.995 -Release: 3%{?dist} +Release: 4%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in Patch0: xsane-0.995-xdg-open.patch Patch1: xsane-0.995-eula-license-size.patch +Patch2: xsane-0.995-close-fds.patch License: GPLv2+ URL: http://www.xsane.org/ Group: Applications/Multimedia @@ -41,6 +42,7 @@ %setup -q %patch0 -p1 -b .xdg-open %patch1 -p1 -b .eula-license-size +%patch2 -p1 -b .close-fds %build %configure --enable-gimp @@ -105,6 +107,9 @@ %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog +* Tue Jul 15 2008 Nils Philippsen - 0.995-4 +- don't leak file descriptors to help browser process (#455450) + * Tue Feb 19 2008 Fedora Release Engineering - 0.995-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 15:57:47 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 15 Jul 2008 15:57:47 GMT Subject: rpms/libcompizconfig/devel libcompizconfig.spec,1.10,1.11 Message-ID: <200807151557.m6FFvldU022293@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/libcompizconfig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22195 Modified Files: libcompizconfig.spec Log Message: Rebuild for ppc64 Index: libcompizconfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcompizconfig/devel/libcompizconfig.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcompizconfig.spec 8 Jun 2008 02:15:32 -0000 1.10 +++ libcompizconfig.spec 15 Jul 2008 15:56:57 -0000 1.11 @@ -2,7 +2,7 @@ Name: libcompizconfig Version: 0.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Configuration backend for compiz Group: System Environment/Libraries @@ -17,7 +17,7 @@ #Patch102: libcompizconfig-gcc43-buildfix2.patch # libdrm is not available on these arches -ExcludeArch: s390 s390x ppc64 +ExcludeArch: s390 s390x BuildRequires: compiz-devel >= %{basever}, compiz-bcop >= %{basever} BuildRequires: libX11-devel, gettext, intltool BuildRequires: perl(XML::Parser) @@ -89,6 +89,9 @@ %changelog +* Tue Jul 15 2008 Nikolay Vladimirof - 0.7.6-2 +- rebuild for ppc64 + * Sat Jun 7 2008 Mohd Izhar Firdaus Ismail 0.7.6-1 - 0.7.6 update From fedora-extras-commits at redhat.com Tue Jul 15 15:58:29 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 15 Jul 2008 15:58:29 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.55,1.56 Message-ID: <200807151558.m6FFwT51022394@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22281 Modified Files: java-1.6.0-openjdk.spec Log Message: * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Fixed fedorazip. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- java-1.6.0-openjdk.spec 15 Jul 2008 15:53:33 -0000 1.55 +++ java-1.6.0-openjdk.spec 15 Jul 2008 15:57:42 -0000 1.56 @@ -20,7 +20,7 @@ %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ -%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz +%define fedorazip openjdk-6-src-%{openjdkver}_%{openjdkdate}-fedora.tar.gz %define mauvedate 2008-03-11 @@ -908,6 +908,9 @@ %changelog * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Fixed fedorazip. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Updated icedteaver. - Updated icedteasnapshot. - Updated openjdkdate. From fedora-extras-commits at redhat.com Tue Jul 15 16:00:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 16:00:09 GMT Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec, 1.22, 1.23 gcc-2.96-parallel.patch, 1.1, 1.2 gcc-__NO_INLINE__.patch, 1.1, 1.2 gcc-c++-anonaggr-copy.patch, 1.1, 1.2 gcc-c++-taking-address-error.patch, 1.1, 1.2 gcc-f77-line.patch, 1.1, 1.2 gcc-i386-reload.patch, 1.1, 1.2 gcc-iso-not-ansi.patch, 1.1, 1.2 gcc-regrename.patch, 1.1, 1.2 gcc-segv3.patch, 1.1, 1.2 Message-ID: <200807151600.m6FG096L022647@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/compat-gcc-296/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22527 Modified Files: compat-gcc-296.spec gcc-2.96-parallel.patch gcc-__NO_INLINE__.patch gcc-c++-anonaggr-copy.patch gcc-c++-taking-address-error.patch gcc-f77-line.patch gcc-i386-reload.patch gcc-iso-not-ansi.patch gcc-regrename.patch gcc-segv3.patch Log Message: fix license tag Index: compat-gcc-296.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- compat-gcc-296.spec 21 Feb 2008 02:15:07 -0000 1.22 +++ compat-gcc-296.spec 15 Jul 2008 15:59:21 -0000 1.23 @@ -1,11 +1,11 @@ %define DATE 20000731 %define gcc_version 2.96 -%define gcc_release 140 +%define gcc_release 141 Summary: 2.96-RH compatibility libraries Name: compat-gcc-296 Version: %{gcc_version} Release: %{gcc_release} -License: GPL +License: GPLv2+ Group: Development/Languages ExclusiveArch: %{ix86} ia64 ppc URL: http://gcc.gnu.org @@ -1077,6 +1077,10 @@ %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 2.96-141 +- fix license tag +- fix patches to apply with fuzz=0 + * Tue Feb 19 2008 Fedora Release Engineering - 2.96-140 - Autorebuild for GCC 4.3 gcc-2.96-parallel.patch: Index: gcc-2.96-parallel.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-2.96-parallel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-2.96-parallel.patch 15 Oct 2004 17:18:07 -0000 1.1 +++ gcc-2.96-parallel.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -27,8 +27,8 @@ +jv-scan$(exeext): gcjh$(exeext) +jcf-dump$(exeext): jv-scan$(exeext) - # errors.o may not be always built for canadian cross compile. Make - # sure it is built for java. + # Define the name of target independant tools to be installed in $(bindir) + # Names are subject to changes --- libstdc++/Makefile.in.parallel Sun Jul 2 01:37:33 2000 +++ libstdc++/Makefile.in Fri Apr 5 11:12:33 2002 @@ -139,7 +139,7 @@ stlinst.o: stlinst.cc gcc-__NO_INLINE__.patch: Index: gcc-__NO_INLINE__.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-__NO_INLINE__.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-__NO_INLINE__.patch 15 Oct 2004 17:18:07 -0000 1.1 +++ gcc-__NO_INLINE__.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -4,22 +4,12 @@ "inline" keyword. * cpp.texi (__NO_INLINE): Document it. ---- gcc/gcc.c.jj Thu May 3 20:12:47 2001 -+++ gcc/gcc.c Fri May 4 22:08:38 2001 -@@ -647,7 +647,7 @@ static const char *cpp_options = - %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2 -D__GNUC_PATCHLEVEL__=%v3}\ - %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\ - %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ -- %{ffast-math:-D__FAST_MATH__}\ -+ %{fno-inline|O0|!O*:-D__NO_INLINE__} %{ffast-math:-D__FAST_MATH__}\ - %{fshort-wchar:-U__WCHAR_TYPE__ -D__WCHAR_TYPE__=short\\ unsigned\\ int}\ - %{ffreestanding:-D__STDC_HOSTED__=0} %{fno-hosted:-D__STDC_HOSTED__=0}\ - %{!ffreestanding:%{!fno-hosted:-D__STDC_HOSTED__=1}}\ ---- gcc/cpp.texi.jj Wed Apr 18 15:45:14 2001 -+++ gcc/cpp.texi Fri May 4 22:35:33 2001 -@@ -1200,6 +1200,16 @@ for some system library functions. You - definition of this macro unless you make very sure that programs will - execute with the same effect regardless. +diff -up gcc/cpp.texi.__NO_INLINE__ gcc/cpp.texi +--- gcc/cpp.texi.__NO_INLINE__ 2008-07-15 11:27:05.000000000 -0400 ++++ gcc/cpp.texi 2008-07-15 11:50:40.000000000 -0400 +@@ -1173,6 +1173,16 @@ library functions. You should not refer + this macro unless you make very sure that programs will execute with the + same effect regardless. + at item __NO_INLINE__ + at findex __NO_INLINE__ @@ -34,3 +24,15 @@ @item __CHAR_UNSIGNED__ @findex __CHAR_UNSIGNED__ GNU C defines this macro if and only if the data type @code{char} is +diff -up gcc/gcc.c.__NO_INLINE__ gcc/gcc.c +--- gcc/gcc.c.__NO_INLINE__ 2008-07-15 11:27:09.000000000 -0400 ++++ gcc/gcc.c 2008-07-15 11:49:42.000000000 -0400 +@@ -564,7 +564,7 @@ static const char *cpp_options = + %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2 -D__GNUC_PATCHLEVEL__=%v3}\ + %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\ + %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ +- %{ffast-math:-D__FAST_MATH__}\ ++ %{fno-inline|O0|!O*:-D__NO_INLINE__} %{ffast-math:-D__FAST_MATH__}\ + %{fshort-wchar:-U__WCHAR_TYPE__ -D__WCHAR_TYPE__=short\\ unsigned\\ int}\ + %{fshow-column} %{fno-show-column}\ + %{fleading-underscore} %{fno-leading-underscore}\ gcc-c++-anonaggr-copy.patch: Index: gcc-c++-anonaggr-copy.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-c++-anonaggr-copy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-c++-anonaggr-copy.patch 15 Oct 2004 17:18:08 -0000 1.1 +++ gcc-c++-anonaggr-copy.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -8,24 +8,10 @@ * g++.old-deja/g++.other/anon8.C: New test. ---- gcc/cp/method.c.jj Tue Mar 20 13:45:06 2001 -+++ gcc/cp/method.c Thu Mar 22 12:36:44 2001 -@@ -703,7 +703,11 @@ do_build_assign_ref (fndecl) - build_qualified_type (TREE_TYPE (field), cvquals), - init, field); - -- finish_expr_stmt (build_modify_expr (comp, NOP_EXPR, init)); -+ if (DECL_NAME (field)) -+ finish_expr_stmt (build_modify_expr (comp, NOP_EXPR, init)); -+ else -+ finish_expr_stmt (build (MODIFY_EXPR, TREE_TYPE (comp), comp, -+ init)); - } - } - finish_return_stmt (current_class_ref); ---- gcc/cp/decl.c.jj Thu Mar 22 12:11:00 2001 -+++ gcc/cp/decl.c Thu Mar 22 12:47:18 2001 -@@ -6815,6 +6815,33 @@ fixup_anonymous_aggr (t) +diff -up gcc/cp/decl.c.c++-anonaggr-copy gcc/cp/decl.c +--- gcc/cp/decl.c.c++-anonaggr-copy 2008-07-15 11:12:48.000000000 -0400 ++++ gcc/cp/decl.c 2008-07-15 11:12:52.000000000 -0400 +@@ -6974,6 +6974,33 @@ fixup_anonymous_aggr (t) /* ISO C++ 9.5.3. Anonymous unions may not have function members. */ if (TYPE_METHODS (t)) error ("an anonymous union cannot have function members"); @@ -59,8 +45,25 @@ } /* Make sure that a declaration with no declarator is well-formed, i.e. ---- gcc/testsuite/g++.old-deja/g++.other/anon8.C.jj Mon Mar 19 17:13:30 2001 -+++ gcc/testsuite/g++.old-deja/g++.other/anon8.C Tue Mar 20 17:01:57 2001 +diff -up gcc/cp/method.c.c++-anonaggr-copy gcc/cp/method.c +--- gcc/cp/method.c.c++-anonaggr-copy 2008-07-15 11:12:47.000000000 -0400 ++++ gcc/cp/method.c 2008-07-15 11:14:48.000000000 -0400 +@@ -2509,7 +2509,11 @@ do_build_assign_ref (fndecl) + comp = build (COMPONENT_REF, TREE_TYPE (field), comp, field); + init = build (COMPONENT_REF, TREE_TYPE (field), init, field); + +- finish_expr_stmt (build_modify_expr (comp, NOP_EXPR, init)); ++ if (DECL_NAME (field)) ++ finish_expr_stmt (build_modify_expr (comp, NOP_EXPR, init)); ++ else ++ finish_expr_stmt (build (MODIFY_EXPR, TREE_TYPE (comp), comp, ++ init)); + } + } + finish_return_stmt (current_class_ref); +diff -up /dev/null gcc/testsuite/g++.old-deja/g++.other/anon8.C +--- /dev/null 2008-07-14 09:17:49.235004637 -0400 ++++ gcc/testsuite/g++.old-deja/g++.other/anon8.C 2008-07-15 11:12:52.000000000 -0400 @@ -0,0 +1,22 @@ +// Build don't link: + gcc-c++-taking-address-error.patch: Index: gcc-c++-taking-address-error.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-c++-taking-address-error.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-c++-taking-address-error.patch 15 Oct 2004 17:18:08 -0000 1.1 +++ gcc-c++-taking-address-error.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -2,14 +2,15 @@ * typeck.c (build_unary_op): Clarify error message. ---- gcc/cp/typeck.c.jj Wed Feb 14 01:39:02 2001 -+++ gcc/cp/typeck.c Wed Feb 14 18:39:49 2001 -@@ -4652,7 +4652,7 @@ build_unary_op (code, xarg, noconvert) +diff -up gcc/cp/typeck.c.c++-taking-address-error gcc/cp/typeck.c +--- gcc/cp/typeck.c.c++-taking-address-error 2008-07-15 11:09:16.000000000 -0400 ++++ gcc/cp/typeck.c 2008-07-15 11:11:15.000000000 -0400 +@@ -4662,7 +4662,7 @@ build_unary_op (code, xarg, noconvert) if (current_class_type && TREE_OPERAND (arg, 0) == current_class_ref) /* An expression like &memfn. */ - cp_pedwarn ("ISO C++ forbids taking the address of a non-static member function to form a pointer to member function. Say `&%T::%D'", base, name); + cp_pedwarn ("ISO C++ forbids taking the address of an unqualified non-static member function to form a pointer to member function. Say `&%T::%D'", base, name); else - cp_pedwarn ("ISO C++ forbids taking the address of a bound member function to form a pointer to member function. Say `&%T::%D'", base, name); + cp_pedwarn ("ISO C++ forbids taking the address of a bound member function to form a pointer to member function", base, name); } gcc-f77-line.patch: Index: gcc-f77-line.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-f77-line.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-f77-line.patch 15 Oct 2004 17:18:08 -0000 1.1 +++ gcc-f77-line.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -9,7 +9,7 @@ +++ gcc/f/lex.c Wed Mar 21 14:31:33 2001 @@ -1412,6 +1412,12 @@ ffelex_hash_ (FILE *finput) input_filename = old_input_filename; - error ("Use `#line ...' instead of `# ...' in first line"); + fatal ("Use `#line ...' instead of `# ...' in first line"); } + if (c == '\n' || c == EOF) + { gcc-i386-reload.patch: Index: gcc-i386-reload.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-i386-reload.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-i386-reload.patch 15 Oct 2004 17:18:08 -0000 1.1 +++ gcc-i386-reload.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -1,12 +1,7 @@ -2000-10-23 Bernd Schmidt - - * reload.c (find_reloads): Distinguish "wins" so that we know whether - a given operand won because of a matching constraint or not; then use - that information to compute goal_alternative_matched properly. - ---- gcc/reload.c 2000/09/14 17:42:48 1.130 -+++ gcc/reload.c 2000/10/23 16:05:19 -@@ -2399,6 +2399,7 @@ find_reloads (insn, replace, ind_levels, +diff -up ./gcc/reload.c.i386-reload ./gcc/reload.c +--- ./gcc/reload.c.i386-reload 2008-07-15 11:00:47.000000000 -0400 ++++ ./gcc/reload.c 2008-07-15 11:02:45.000000000 -0400 +@@ -2400,6 +2400,7 @@ find_reloads (insn, replace, ind_levels, int no_input_reloads = 0, no_output_reloads = 0; int n_alternatives; int this_alternative[MAX_RECOG_OPERANDS]; @@ -14,7 +9,7 @@ char this_alternative_win[MAX_RECOG_OPERANDS]; char this_alternative_offmemok[MAX_RECOG_OPERANDS]; char this_alternative_earlyclobber[MAX_RECOG_OPERANDS]; -@@ -2410,6 +2411,7 @@ find_reloads (insn, replace, ind_levels, +@@ -2411,6 +2412,7 @@ find_reloads (insn, replace, ind_levels, int operand_reloadnum[MAX_RECOG_OPERANDS]; int goal_alternative_matches[MAX_RECOG_OPERANDS]; int goal_alternative_matched[MAX_RECOG_OPERANDS]; @@ -22,7 +17,7 @@ char goal_alternative_win[MAX_RECOG_OPERANDS]; char goal_alternative_offmemok[MAX_RECOG_OPERANDS]; char goal_alternative_earlyclobber[MAX_RECOG_OPERANDS]; -@@ -2741,6 +2743,7 @@ find_reloads (insn, replace, ind_levels, +@@ -2742,6 +2744,7 @@ find_reloads (insn, replace, ind_levels, { register char *p = constraints[i]; register int win = 0; @@ -30,7 +25,7 @@ /* 0 => this operand can be reloaded somehow for this alternative */ int badop = 1; /* 0 => this operand can be reloaded if the alternative allows regs. */ -@@ -2839,6 +2842,7 @@ find_reloads (insn, replace, ind_levels, +@@ -2858,6 +2861,7 @@ find_reloads (insn, replace, ind_levels, this_alternative[i] = (int) NO_REGS; this_alternative_win[i] = 0; @@ -38,7 +33,7 @@ this_alternative_offmemok[i] = 0; this_alternative_earlyclobber[i] = 0; this_alternative_matches[i] = -1; -@@ -2917,7 +2921,7 @@ find_reloads (insn, replace, ind_levels, +@@ -2935,7 +2939,7 @@ find_reloads (insn, replace, ind_levels, && ! this_alternative_win[c]) bad = 1; @@ -47,7 +42,7 @@ } else { -@@ -2953,12 +2957,11 @@ find_reloads (insn, replace, ind_levels, +@@ -2971,12 +2975,11 @@ find_reloads (insn, replace, ind_levels, operand also had to match the same thing as this operand, we don't know how to do that. So reject this alternative. */ @@ -61,7 +56,7 @@ break; case 'p': -@@ -3175,6 +3178,8 @@ find_reloads (insn, replace, ind_levels, +@@ -3196,6 +3199,8 @@ find_reloads (insn, replace, ind_levels, this_alternative_earlyclobber[i] = earlyclobber; if (win && ! force_reload) this_alternative_win[i] = 1; @@ -70,17 +65,17 @@ else { int const_to_mem = 0; -@@ -3276,7 +3281,8 @@ find_reloads (insn, replace, ind_levels, - Don't do this if the preferred class has only one register +@@ -3299,7 +3304,8 @@ find_reloads (insn, replace, ind_levels, because we might otherwise exhaust the class. */ + - if (! win && this_alternative[i] != (int) NO_REGS + if (! win && ! did_match + && this_alternative[i] != (int) NO_REGS && GET_MODE_SIZE (operand_mode[i]) <= UNITS_PER_WORD && reg_class_size[(int) preferred_class[i]] > 1) { -@@ -3302,7 +3308,7 @@ find_reloads (insn, replace, ind_levels, +@@ -3325,7 +3331,7 @@ find_reloads (insn, replace, ind_levels, for (i = 0; i < noperands; i++) if (this_alternative_earlyclobber[i] @@ -89,7 +84,7 @@ { struct decomposition early_data; -@@ -3345,6 +3351,7 @@ find_reloads (insn, replace, ind_levels, +@@ -3368,6 +3374,7 @@ find_reloads (insn, replace, ind_levels, { losers++; this_alternative_win[j] = 0; @@ -97,7 +92,7 @@ } else break; -@@ -3355,11 +3362,13 @@ find_reloads (insn, replace, ind_levels, +@@ -3378,11 +3385,13 @@ find_reloads (insn, replace, ind_levels, { losers++; this_alternative_win[i] = 0; @@ -112,7 +107,7 @@ losers++; } } -@@ -3378,7 +3387,8 @@ find_reloads (insn, replace, ind_levels, +@@ -3401,7 +3410,8 @@ find_reloads (insn, replace, ind_levels, } for (i = 0; i < noperands; i++) { @@ -122,7 +117,7 @@ goal_alternative[i] = this_alternative[i]; goal_alternative_offmemok[i] = this_alternative_offmemok[i]; goal_alternative_matches[i] = this_alternative_matches[i]; -@@ -3406,6 +3416,7 @@ find_reloads (insn, replace, ind_levels, +@@ -3429,6 +3439,7 @@ find_reloads (insn, replace, ind_levels, { goal_alternative[i] = this_alternative[i]; goal_alternative_win[i] = this_alternative_win[i]; @@ -130,7 +125,7 @@ goal_alternative_offmemok[i] = this_alternative_offmemok[i]; goal_alternative_matches[i] = this_alternative_matches[i]; goal_alternative_earlyclobber[i] -@@ -3487,11 +3498,14 @@ find_reloads (insn, replace, ind_levels, +@@ -3510,12 +3521,15 @@ find_reloads (insn, replace, ind_levels, for (i = 0; i < noperands; i++) goal_alternative_matched[i] = -1; @@ -140,10 +135,10 @@ if (! goal_alternative_win[i] && goal_alternative_matches[i] >= 0) goal_alternative_matched[goal_alternative_matches[i]] = i; -+ + + for (i = 0; i < noperands; i++) + goal_alternative_win[i] |= goal_alternative_match_win[i]; - ++ /* If the best alternative is with operands 1 and 2 swapped, consider them swapped before reporting the reloads. Update the - + operand numbers of any reloads already pushed. */ gcc-iso-not-ansi.patch: Index: gcc-iso-not-ansi.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-iso-not-ansi.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-iso-not-ansi.patch 15 Oct 2004 17:18:08 -0000 1.1 +++ gcc-iso-not-ansi.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -1,19 +1,6 @@ -2000-08-08 Joseph S. Myers - - * c-common.c (combine_strings, check_format_info): Refer to ISO C - or ISO C89 instead of ANSI C. - * c-decl.c (grokdeclarator, xref_tag, finish_struct, - build_enumerator, do_case): Likewise. - * c-lex.c (parse_float, yylex): Likewise. - * c-parse.in: Likewise. - * c-typeck.c (common_type, build_array_ref, build_binary_op, - build_unary_op, pedantic_lvalue_warning, build_conditional_expr, - build_c_cast, convert_for_assignment, set_init_index, - set_init_label, c_expand_start_case): Likewise. - * toplev.c (documented_lang_options, display_help): Likewise. - ---- gcc/c-common.c Sun Aug 6 18:08:43 2000 -+++ gcc/c-common.c Tue Aug 8 19:27:49 2000 +diff -up ./gcc/c-common.c.iso-not-ansi ./gcc/c-common.c +--- ./gcc/c-common.c.iso-not-ansi 2008-07-15 10:56:30.000000000 -0400 ++++ ./gcc/c-common.c 2008-07-15 10:56:30.000000000 -0400 @@ -375,8 +375,8 @@ combine_strings (strings) nchars = wide_flag ? length / wchar_bytes : length; @@ -184,8 +171,9 @@ format_char); /* Finally. . .check type of argument against desired type! */ ---- gcc/c-decl.c Sun Aug 6 18:08:43 2000 -+++ gcc/c-decl.c Tue Aug 8 19:31:02 2000 +diff -up ./gcc/c-decl.c.iso-not-ansi ./gcc/c-decl.c +--- ./gcc/c-decl.c.iso-not-ansi 2008-07-15 10:56:30.000000000 -0400 ++++ ./gcc/c-decl.c 2008-07-15 10:56:30.000000000 -0400 @@ -4005,7 +4005,7 @@ grokdeclarator (declarator, declspecs, d { if (pedantic && !flag_isoc99 && ! in_system_header @@ -313,8 +301,9 @@ if (low_value == NULL_TREE) success = pushcase (NULL_TREE, 0, label, &duplicate); ---- gcc/c-lex.c Tue Aug 8 08:17:48 2000 -+++ gcc/c-lex.c Tue Aug 8 19:32:14 2000 +diff -up ./gcc/c-lex.c.iso-not-ansi ./gcc/c-lex.c +--- ./gcc/c-lex.c.iso-not-ansi 2000-07-24 05:04:16.000000000 -0400 ++++ ./gcc/c-lex.c 2008-07-15 10:58:23.000000000 -0400 @@ -1122,7 +1122,7 @@ parse_float (data) if (args->imag) error ("more than one `i' or `j' in numeric constant"); @@ -324,16 +313,16 @@ args->imag = 1; break; -@@ -1789,7 +1789,7 @@ yylex () - error ("`Ll' and `lL' are not valid integer suffixes"); +@@ -1782,7 +1782,7 @@ yylex () + error ("three `l's in integer constant"); else if (pedantic && ! flag_isoc99 && ! in_system_header && warn_long_long) - pedwarn ("ANSI C forbids long long integer constants"); + pedwarn ("ISO C89 forbids long long integer constants"); spec_long_long = 1; } - spec_long = c; -@@ -1799,7 +1799,7 @@ yylex () + spec_long = 1; +@@ -1792,7 +1792,7 @@ yylex () if (spec_imag) error ("more than one `i' or `j' in numeric constant"); else if (pedantic) @@ -342,7 +331,7 @@ spec_imag = 1; } else -@@ -1914,7 +1914,7 @@ yylex () +@@ -1907,7 +1907,7 @@ yylex () warning ("width of integer constant changes with -traditional"); else if (TREE_UNSIGNED (traditional_type) != TREE_UNSIGNED (ansi_type)) @@ -351,7 +340,7 @@ else warning ("width of integer constant may change on other systems with -traditional"); } -@@ -2018,7 +2018,7 @@ yylex () +@@ -2011,7 +2011,7 @@ yylex () else if (c == '\n') { if (pedantic) @@ -360,7 +349,7 @@ lineno++; } else -@@ -2175,7 +2175,7 @@ yylex () +@@ -2168,7 +2168,7 @@ yylex () else if (c == '\n') { if (pedantic) @@ -369,8 +358,9 @@ lineno++; } else ---- gcc/c-parse.in Mon Aug 7 09:46:01 2000 -+++ gcc/c-parse.in Tue Aug 8 19:35:46 2000 +diff -up ./gcc/c-parse.in.iso-not-ansi ./gcc/c-parse.in +--- ./gcc/c-parse.in.iso-not-ansi 2000-07-31 14:02:08.000000000 -0400 ++++ ./gcc/c-parse.in 2008-07-15 10:56:30.000000000 -0400 @@ -277,7 +277,7 @@ end ifobjc %% program: /* empty */ @@ -542,8 +532,9 @@ } | parms { $$ = get_parm_info (1); } ---- gcc/c-typeck.c Mon Jul 31 23:18:12 2000 -+++ gcc/c-typeck.c Tue Aug 8 19:39:54 2000 +diff -up ./gcc/c-typeck.c.iso-not-ansi ./gcc/c-typeck.c +--- ./gcc/c-typeck.c.iso-not-ansi 2008-07-15 10:56:25.000000000 -0400 ++++ ./gcc/c-typeck.c 2008-07-15 10:56:30.000000000 -0400 @@ -388,7 +388,7 @@ common_type (t1, t2) { TREE_VALUE (n) = TREE_VALUE (p2); @@ -704,7 +695,7 @@ errtype, funname, parmnum); /* Const and volatile mean something different for function types, so the usual warnings are not appropriate. */ -@@ -5609,7 +5609,7 @@ set_init_index (first, last) +@@ -5613,7 +5613,7 @@ set_init_index (first, last) else { if (pedantic) @@ -713,7 +704,7 @@ constructor_range_end = last ? convert (bitsizetype, last) : 0; } -@@ -5649,7 +5649,7 @@ set_init_label (fieldname) +@@ -5653,7 +5653,7 @@ set_init_label (fieldname) { constructor_fields = tail; if (pedantic) @@ -722,7 +713,7 @@ } } -@@ -6740,7 +6740,7 @@ c_expand_start_case (exp) +@@ -6744,7 +6744,7 @@ c_expand_start_case (exp) && ! in_system_header && (type == long_integer_type_node || type == long_unsigned_type_node)) @@ -731,9 +722,10 @@ exp = default_conversion (exp); type = TREE_TYPE (exp); ---- gcc/toplev.c Sun Aug 6 10:24:53 2000 -+++ gcc/toplev.c Tue Aug 8 19:41:03 2000 -@@ -1135,7 +1135,7 @@ documented_lang_options[] = +diff -up ./gcc/toplev.c.iso-not-ansi ./gcc/toplev.c +--- ./gcc/toplev.c.iso-not-ansi 2000-07-31 14:02:13.000000000 -0400 ++++ ./gcc/toplev.c 2008-07-15 10:59:09.000000000 -0400 +@@ -1125,7 +1125,7 @@ documented_lang_options[] = used here is to only describe those options which are not enabled by default. */ @@ -742,7 +734,7 @@ { "-fallow-single-precision", "Do not promote floats to double if using -traditional" }, { "-std= ", "Determine language standard"}, -@@ -1236,7 +1236,7 @@ documented_lang_options[] = +@@ -1226,7 +1226,7 @@ documented_lang_options[] = { "-Wno-unknown-pragmas", "" }, { "-Wstrict-prototypes", "Warn about non-prototyped function decls" }, { "-Wno-strict-prototypes", "" }, @@ -751,8 +743,8 @@ { "-Wno-traditional", "" }, { "-Wtrigraphs", "Warn when trigraphs are encountered" }, { "-Wno-trigraphs", "" }, -@@ -3741,7 +3741,7 @@ display_help () - +@@ -3729,7 +3729,7 @@ display_help () + printf (_(" -O[number] Set optimisation level to [number]\n")); printf (_(" -Os Optimise for space rather than speed\n")); - printf (_(" -pedantic Issue warnings needed by strict compliance to ANSI C\n")); gcc-regrename.patch: Index: gcc-regrename.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-regrename.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-regrename.patch 15 Oct 2004 17:18:08 -0000 1.1 +++ gcc-regrename.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -49,69 +49,10 @@ * regrename.c (regrename_optimize): Make control flow explicit. (replace_reg_in_block): Initialize reg_use to 0. ---- gcc/toplev.c 2000/10/20 23:32:09 1.390 -+++ gcc/toplev.c 2000/10/27 21:56:01 1.391 -@@ -277,9 +277,9 @@ enum dump_file_index - DFI_lreg, - DFI_greg, - DFI_flow2, -- DFI_ce2, - DFI_peephole2, - DFI_rnreg, -+ DFI_ce2, - DFI_sched2, - DFI_bbro, - DFI_jump2, -@@ -321,9 +321,9 @@ struct dump_file_info dump_file[DFI_MAX] - { "lreg", 'l', 1, 0, 0 }, - { "greg", 'g', 1, 0, 0 }, - { "flow2", 'w', 1, 0, 0 }, -- { "ce2", 'E', 1, 0, 0 }, - { "peephole2", 'z', 1, 0, 0 }, - { "rnreg", 'n', 1, 0, 0 }, -+ { "ce2", 'E', 1, 0, 0 }, - { "sched2", 'R', 1, 0, 0 }, - { "bbro", 'B', 1, 0, 0 }, - { "jump2", 'J', 1, 0, 0 }, -@@ -3509,17 +3509,6 @@ rest_of_compilation (decl) - close_dump_file (DFI_flow2, print_rtl_with_bb, insns); - timevar_pop (TV_FLOW2); - -- if (optimize > 0) -- { -- timevar_push (TV_IFCVT2); -- open_dump_file (DFI_ce2, decl); -- -- if_convert (1); -- -- close_dump_file (DFI_ce2, print_rtl_with_bb, insns); -- timevar_pop (TV_IFCVT2); -- } -- - #ifdef HAVE_peephole2 - if (optimize > 0 && flag_peephole2) - { -@@ -3544,6 +3533,17 @@ rest_of_compilation (decl) - timevar_pop (TV_RENAME_REGISTERS); - } - -+ if (optimize > 0) -+ { -+ timevar_push (TV_IFCVT2); -+ open_dump_file (DFI_ce2, decl); -+ -+ if_convert (1); -+ -+ close_dump_file (DFI_ce2, print_rtl_with_bb, insns); -+ timevar_pop (TV_IFCVT2); -+ } -+ - #ifdef INSN_SCHEDULING - if (optimize > 0 && flag_schedule_insns_after_reload) - { ---- gcc/Makefile.in 2000/10/26 07:28:23 1.529 -+++ gcc/Makefile.in 2000/10/27 20:58:57 1.531 -@@ -1425,9 +1452,9 @@ bb-reorder.o : bb-reorder.c $(CONFIG_H) +diff -up gcc/Makefile.in.regrename gcc/Makefile.in +--- gcc/Makefile.in.regrename 2008-07-15 11:21:22.000000000 -0400 ++++ gcc/Makefile.in 2008-07-15 11:21:24.000000000 -0400 +@@ -1400,9 +1400,9 @@ bb-reorder.o : bb-reorder.c $(CONFIG_H) insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \ $(RECOG_H) insn-flags.h function.h except.h $(EXPR_H) timevar.o : timevar.c $(CONFIG_H) system.h $(TIMEVAR_H) flags.h intl.h @@ -124,9 +65,10 @@ ifcvt.o : ifcvt.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) \ flags.h insn-config.h function.h $(RECOG_H) $(BASIC_BLOCK_H) $(EXPR_H) \ output.h ---- gcc/recog.c 2000/10/26 00:30:55 1.79 -+++ gcc/recog.c 2000/10/27 20:58:57 1.80 -@@ -2272,6 +2272,7 @@ preprocess_constraints () +diff -up gcc/recog.c.regrename gcc/recog.c +--- gcc/recog.c.regrename 2008-07-15 11:21:20.000000000 -0400 ++++ gcc/recog.c 2008-07-15 11:21:24.000000000 -0400 +@@ -2256,6 +2256,7 @@ preprocess_constraints () break; case 'p': @@ -134,9 +76,10 @@ op_alt[j].class = reg_class_subunion[(int) op_alt[j].class][(int) BASE_REG_CLASS]; break; ---- gcc/recog.h 2000/09/29 11:40:24 1.35 -+++ gcc/recog.h 2000/10/27 20:58:57 1.36 -@@ -63,6 +63,8 @@ struct operand_alternative +diff -up gcc/recog.h.regrename gcc/recog.h +--- gcc/recog.h.regrename 2000-07-31 14:02:12.000000000 -0400 ++++ gcc/recog.h 2008-07-15 11:21:24.000000000 -0400 +@@ -61,6 +61,8 @@ struct operand_alternative unsigned int decmem_ok:1; /* Nonzero if '>' was found in the constraint string. */ unsigned int incmem_ok:1; @@ -145,8 +88,9 @@ /* Nonzero if 'X' was found in the constraint string, or if the constraint string for this alternative was empty. */ unsigned int anything_ok:1; ---- gcc/regrename.c Mon Jun 12 09:55:37 2000 -+++ gcc/regrename.c Wed Nov 22 04:19:34 2000 +diff -up gcc/regrename.c.regrename gcc/regrename.c +--- gcc/regrename.c.regrename 2000-06-12 03:55:37.000000000 -0400 ++++ gcc/regrename.c 2008-07-15 11:21:24.000000000 -0400 @@ -18,713 +18,500 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -1935,3 +1879,64 @@ - - return recog_op_alt[id][alt].class; } +diff -up gcc/toplev.c.regrename gcc/toplev.c +--- gcc/toplev.c.regrename 2008-07-15 11:21:20.000000000 -0400 ++++ gcc/toplev.c 2008-07-15 11:23:35.000000000 -0400 +@@ -273,9 +273,9 @@ enum dump_file_index + DFI_lreg, + DFI_greg, + DFI_flow2, +- DFI_ce2, + DFI_peephole2, + DFI_rnreg, ++ DFI_ce2, + DFI_sched2, + DFI_bbro, + DFI_jump2, +@@ -316,9 +316,9 @@ struct dump_file_info dump_file[DFI_MAX] + { "lreg", 'l', 1, 0, 0 }, + { "greg", 'g', 1, 0, 0 }, + { "flow2", 'w', 1, 0, 0 }, +- { "ce2", 'E', 1, 0, 0 }, + { "peephole2", 'z', 1, 0, 0 }, + { "rnreg", 'n', 1, 0, 0 }, ++ { "ce2", 'E', 1, 0, 0 }, + { "sched2", 'R', 1, 0, 0 }, + { "bbro", 'B', 1, 0, 0 }, + { "jump2", 'J', 1, 0, 0 }, +@@ -3440,17 +3440,6 @@ rest_of_compilation (decl) + close_dump_file (DFI_flow2, print_rtl_with_bb, insns); + timevar_pop (TV_FLOW2); + +- if (optimize > 0) +- { +- timevar_push (TV_IFCVT2); +- open_dump_file (DFI_ce2, decl); +- +- if_convert (1); +- +- close_dump_file (DFI_ce2, print_rtl_with_bb, insns); +- timevar_pop (TV_IFCVT2); +- } +- + #ifdef HAVE_peephole2 + if (optimize > 0 && flag_peephole2) + { +@@ -3475,6 +3464,17 @@ rest_of_compilation (decl) + timevar_pop (TV_RENAME_REGISTERS); + } + ++ if (optimize > 0) ++ { ++ timevar_push (TV_IFCVT2); ++ open_dump_file (DFI_ce2, decl); ++ ++ if_convert (1); ++ ++ close_dump_file (DFI_ce2, print_rtl_with_bb, insns); ++ timevar_pop (TV_IFCVT2); ++ } ++ + #ifdef INSN_SCHEDULING + if (optimize > 0 && flag_schedule_insns_after_reload) + { gcc-segv3.patch: Index: gcc-segv3.patch =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/gcc-segv3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-segv3.patch 15 Oct 2004 17:18:08 -0000 1.1 +++ gcc-segv3.patch 15 Jul 2008 15:59:21 -0000 1.2 @@ -9,9 +9,10 @@ * gcc.dg/noncompile/init-3.c: New test. ---- gcc/c-decl.c 2000/10/17 09:34:20 1.168 -+++ gcc/c-decl.c 2000/10/20 00:58:35 1.170 -@@ -3515,7 +3506,12 @@ start_decl (declarator, declspecs, initi +diff -up ./gcc/c-decl.c.segv3 ./gcc/c-decl.c +--- ./gcc/c-decl.c.segv3 2008-07-15 11:03:47.000000000 -0400 ++++ ./gcc/c-decl.c 2008-07-15 11:07:41.000000000 -0400 +@@ -3465,7 +3465,12 @@ start_decl (declarator, declspecs, initi default: /* Don't allow initializations for incomplete types except for arrays which might be completed by the initialization. */ @@ -25,17 +26,17 @@ { /* A complete type is ok if size is fixed. */ -@@ -3593,7 +3589,8 @@ start_decl (declarator, declspecs, initi - && DECL_RTL (tem) == 0 - && !DECL_CONTEXT (tem)) +@@ -3541,7 +3546,8 @@ start_decl (declarator, declspecs, initi + (which may or may not happen). */ + && DECL_RTL (tem) == 0) { - if (COMPLETE_TYPE_P (TREE_TYPE (tem))) + if (TREE_TYPE (tem) != error_mark_node -+ && COMPLETE_TYPE_P (TREE_TYPE (tem))) ++ && COMPLETE_TYPE_P (TREE_TYPE (decl))) expand_decl (tem); else if (TREE_CODE (TREE_TYPE (tem)) == ARRAY_TYPE && DECL_INITIAL (tem) != 0) -@@ -3688,10 +3685,13 @@ finish_decl (decl, init, asmspec_tree) +@@ -3644,10 +3650,13 @@ finish_decl (decl, init, asmspec_tree) if (TREE_CODE (decl) == VAR_DECL) { @@ -50,8 +51,9 @@ && (TREE_STATIC (decl) ? /* A static variable with an incomplete type ---- gcc/testsuite/gcc.dg/noncompile/init-3.c.jj Thu Aug 24 11:00:32 2000 -+++ gcc/testsuite/gcc.dg/noncompile/init-3.c Fri Oct 20 23:37:57 2000 +diff -up /dev/null ./gcc/testsuite/gcc.dg/noncompile/init-3.c +--- /dev/null 2008-07-14 09:17:49.235004637 -0400 ++++ ./gcc/testsuite/gcc.dg/noncompile/init-3.c 2008-07-15 11:03:47.000000000 -0400 @@ -0,0 +1,4 @@ +void die(void) +{ From fedora-extras-commits at redhat.com Tue Jul 15 16:06:57 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 16:06:57 GMT Subject: rpms/gambit-c/EL-5 gambit-c.spec,1.2,1.3 Message-ID: <200807151606.m6FG6v0I030319@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29992/EL-5 Modified Files: gambit-c.spec Log Message: Specify the correct Emacs versions for EL-5 and F-8 Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/EL-5/gambit-c.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gambit-c.spec 15 Jul 2008 14:40:02 -0000 1.2 +++ gambit-c.spec 15 Jul 2008 16:06:10 -0000 1.3 @@ -1,7 +1,7 @@ %define dirname gambc-v4_2_8 %if %($(pkg-config emacs) ; echo $?) -%define emacs_version 22.2 +%define emacs_version 21.4 %define emacs_lispdir %{_datadir}/emacs/site-lisp %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d %else From fedora-extras-commits at redhat.com Tue Jul 15 16:07:18 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 16:07:18 GMT Subject: rpms/gambit-c/F-8 gambit-c.spec,1.2,1.3 Message-ID: <200807151607.m6FG7I3l030393@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29992/F-8 Modified Files: gambit-c.spec Log Message: Specify the correct Emacs versions for EL-5 and F-8 Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/F-8/gambit-c.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gambit-c.spec 15 Jul 2008 14:40:53 -0000 1.2 +++ gambit-c.spec 15 Jul 2008 16:06:27 -0000 1.3 @@ -1,7 +1,7 @@ %define dirname gambc-v4_2_8 %if %($(pkg-config emacs) ; echo $?) -%define emacs_version 22.2 +%define emacs_version 22.1 %define emacs_lispdir %{_datadir}/emacs/site-lisp %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d %else From fedora-extras-commits at redhat.com Tue Jul 15 16:11:51 2008 From: fedora-extras-commits at redhat.com (Joel Andres Granados Moreno (jgranado)) Date: Tue, 15 Jul 2008 16:11:51 GMT Subject: rpms/firstaidkit/devel .cvsignore, 1.4, 1.5 firstaidkit.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200807151611.m6FGBps7031667@cvs-int.fedora.redhat.com> Author: jgranado Update of /cvs/pkgs/rpms/firstaidkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31247 Modified Files: .cvsignore firstaidkit.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Jun 2008 14:22:54 -0000 1.4 +++ .cvsignore 15 Jul 2008 16:10:57 -0000 1.5 @@ -1 +1 @@ -firstaidkit-0.2.0.tar.bz2 +firstaidkit-0.2.1.tar.bz2 Index: firstaidkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- firstaidkit.spec 3 Jun 2008 14:49:53 -0000 1.8 +++ firstaidkit.spec 15 Jul 2008 16:10:57 -0000 1.9 @@ -3,7 +3,7 @@ %define _unpackaged_files_terminate_build 0 Name: firstaidkit -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: System Rescue Tool @@ -41,6 +41,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-plugin-passwd Requires: %{name}-plugin-xserver +Requires: %{name}-plugin-mdadm-conf Requires: %{name}-gui %description plugin-all @@ -69,6 +70,15 @@ This FirstAidKit plugin automates the recovery of the xserver configuration file xorg.conf. +%package plugin-mdadm-conf +Group: Applications/System +Summary: Firstaidkit plugin to diagnose software raid configuration file +Requires: %{name} = %{version}-%{release} +Requires: mdadm + +%description plugin-mdadm-conf +This plugin will assess the validity and existence of the mdadm.conf file. +The file will get replaced if any inconsistencies are found. %package gui Group: Applications/System @@ -121,6 +131,7 @@ #plugins %{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/ %{__cp} -f plugins/xserver.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/ +%{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/ %clean @@ -154,8 +165,14 @@ %files plugin-xserver %{_libdir}/firstaidkit/plugins/xserver.py* +%files plugin-mdadm-conf +%{_libdir}/firstaidkit/plugins/mdadm_conf.py* %Changelog +* Tue Jul 15 2008 Joel Granados 0.2.1-1 +- New version +- Brings in a new plugin. + * Tue Jun 3 2008 Joel Granados 0.2.0-1 - New upstream version - Fixup the spec file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Jun 2008 14:22:54 -0000 1.4 +++ sources 15 Jul 2008 16:10:57 -0000 1.5 @@ -1 +1 @@ -a4e1237cedde24c12d06d086335ad3e9 firstaidkit-0.2.0.tar.bz2 +8d602e5047981bce4c86c1598abc63e0 firstaidkit-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 15 16:16:05 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 15 Jul 2008 16:16:05 GMT Subject: rpms/sat4j/devel import.log, NONE, 1.1 sat4j-core-Dimacs-nooverrides.patch, NONE, 1.1 sat4j-core-nooverrides.patch, NONE, 1.1 sat4j-junit4fortests.patch, NONE, 1.1 sat4j.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151616.m6FGG5Gp032716@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/sat4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32056/devel Modified Files: .cvsignore sources Added Files: import.log sat4j-core-Dimacs-nooverrides.patch sat4j-core-nooverrides.patch sat4j-junit4fortests.patch sat4j.spec Log Message: Initial import. --- NEW FILE import.log --- sat4j-2_0_0-4_fc9:HEAD:sat4j-2.0.0-4.fc9.src.rpm:1216138150 sat4j-core-Dimacs-nooverrides.patch: --- NEW FILE sat4j-core-Dimacs-nooverrides.patch --- --- org.sat4j.core/src/org/sat4j/tools/DimacsStringSolver.java 2008-05-25 05:07:56.000000000 -0400 +++ src/org/sat4j/tools/DimacsStringSolver.java 2008-06-10 23:32:10.000000000 -0400 @@ -274,12 +274,10 @@ } - @Override public boolean isDBSimplificationAllowed() { return false; } - @Override public void setDBSimplificationAllowed(boolean status) { } sat4j-core-nooverrides.patch: --- NEW FILE sat4j-core-nooverrides.patch --- --- src/org/sat4j/minisat/core/Solver.java 2008-05-25 05:07:56.000000000 -0400 +++ src/org/sat4j/minisat/core/Solver.java 2008-06-19 12:51:06.000000000 -0400 @@ -1312,12 +1312,10 @@ return null; } - @Override public boolean isDBSimplificationAllowed() { return isDBSimplificationAllowed; } - @Override public void setDBSimplificationAllowed(boolean status) { isDBSimplificationAllowed = status; } sat4j-junit4fortests.patch: --- NEW FILE sat4j-junit4fortests.patch --- Index: build.xml =================================================================== RCS file: /cvsroot/sat4j/core/build/build.xml,v retrieving revision 1.25 diff -u -r1.25 build.xml --- build.xml 6 Feb 2008 22:22:51 -0000 1.25 +++ build.xml 27 Jun 2008 15:57:33 -0000 @@ -1,6 +1,7 @@ + @@ -36,14 +37,17 @@ + + + + description="Launch JUnit tests and generate a report"> Compiling test files + Running JUNIT tests --- NEW FILE sat4j.spec --- %define eclipse_base %{_datadir}/eclipse # We want the version to match that shipped in Eclipse's Orbit project %define sat4jversion 2.0.0.v20080602 Name: sat4j Version: 2.0.0 Release: 4%{?dist} Summary: A library of SAT solvers written in Java Group: Development/Libraries License: EPL and LGPLv2 URL: http://www.sat4j.org/ Source0: http://forge.objectweb.org/tracker/download.php/228/350289/310427/1838/org.sat4j.core-src.zip Source1: http://forge.objectweb.org/tracker/download.php/228/350289/310427/1839/org.sat4j.pb-src.zip # These have been reported upstream # http://forge.objectweb.org/tracker/index.php?func=detail&aid=310427&group_id=228&atid=350289 # There are erroneous @Overrides statements which are caught with ecj. # We remove them. Patch0: sat4j-core-nooverrides.patch Patch1: sat4j-core-Dimacs-nooverrides.patch # This is so we can run the tests. Some errors are expected; see up for # OW tracker thread. Patch2: sat4j-junit4fortests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1.5 BuildRequires: junit4 BuildRequires: eclipse-pde Requires: java >= 1.5 Requires: jpackage-utils BuildArch: noarch %description The aim of the SAT4J library is to provide an efficient library of SAT solvers in Java. The SAT4J library targets first users of SAT "black boxes", those willing to embed SAT technologies into their application without worrying about the details. %prep %setup -q -c -a 1 /bin/sh %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} pushd core # Only used for the tests rm lib/jmock-*.jar echo %{sat4jversion} > src/sat4j.version sed -i "s/9.9.9.token/%{sat4jversion}/" META-INF/MANIFEST.MF %patch0 -p0 %patch1 -p0 mv build{,.upstream} cd build.upstream %patch2 -p0 sed -i "s:/usr/share/java:%{_datadir}/java:" build.xml popd pushd pb sed -i "s/9.9.9.token/%{sat4jversion}/" META-INF/MANIFEST.MF sed -i "/^Class-Path/d" META-INF/MANIFEST.MF # Only used for the tests rm lib/jmock-*.jar popd # I don't think package build can handle DOS line endings in MANIFEST.MF dos2unix core/META-INF/MANIFEST.MF dos2unix pb/META-INF/MANIFEST.MF %build SDK=$(cd SDK > /dev/null && pwd) pushd core mkdir home build home=$(cd home > /dev/null && pwd) # These can go away when package build handles plugins (not just # features) echo "" \ > build/assemble.org.sat4j.core.all.xml echo "" \ > build/package.org.sat4j.core.all.xml java -cp $SDK/startup.jar \ -Duser.home=$home \ -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -Dtype=plugin \ -DjavacSource=1.5 \ -DjavacTarget=1.5 \ -Did=org.sat4j.core \ -DbaseLocation=$SDK \ -DsourceDirectory=$(pwd) \ -DbuildDirectory=$(pwd)/build \ -Dbuilder=$SDK/plugins/org.eclipse.pde.build/templates/package-build \ -f $SDK/plugins/org.eclipse.pde.build/scripts/build.xml pushd build/plugins/org.sat4j.core/ java -cp $SDK/startup.jar \ -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -Duser.home=$home \ -f build.xml \ build.update.jar popd popd # pb depends upon core cp -rp core/build/plugins/org.sat4j.core/org.sat4j.core_*.jar \ $SDK/plugins # the class-path in pb's MANIFEST.MF references a versionless core jar. CORE_VERSION=$(ls $SDK/plugins | grep org.sat4j.core | \ sed 's/org.sat4j.core_//') sed -i "s/org.sat4j.core.jar/org.sat4j.core_$CORE_VERSION/" \ pb/META-INF/MANIFEST.MF pushd pb mkdir home build home=$(cd home > /dev/null && pwd) # These can go away when package build handles plugins (not just # features) echo "" \ > build/assemble.org.sat4j.pb.all.xml echo "" \ > build/package.org.sat4j.pb.all.xml java -cp $SDK/startup.jar \ -Duser.home=$home \ -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -Dtype=plugin \ -DjavacSource=1.5 \ -DjavacTarget=1.5 \ -Did=org.sat4j.pb \ -DbaseLocation=$SDK \ -DsourceDirectory=$(pwd) \ -DbuildDirectory=$(pwd)/build \ -Dbuilder=$SDK/plugins/org.eclipse.pde.build/templates/package-build \ -f $SDK/plugins/org.eclipse.pde.build/scripts/build.xml pushd build/plugins/org.sat4j.pb java -cp $SDK/startup.jar \ -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -Duser.home=$home \ -f build.xml \ build.update.jar popd popd # For testing #cd core/build.upstream #mkdir -p bin report/junit #ant tests %install rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT%{_javadir} cp -rp core/build/plugins/org.sat4j.core/org.sat4j.core_*.jar \ $RPM_BUILD_ROOT%{_javadir} cp -rp pb/build/plugins/org.sat4j.pb/org.sat4j.pb_*.jar \ $RPM_BUILD_ROOT%{_javadir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) # No %%doc files as the about.html is in the jar %{_javadir}/org.sat4j* %changelog * Mon Jul 14 2008 Andrew Overholt 2.0.0-4 - Remove jmock JARs - Don't run tests as part of build * Mon Jul 14 2008 Andrew Overholt 2.0.0-3 - Remove Class-Path from pb MANIFEST.MF * Mon Jul 14 2008 Andrew Overholt 2.0.0-2 - Add eclipse-pde BR for pdebuild script * Fri Jun 27 2008 Andrew Overholt 2.0.0-1 - 2.0.0 - Run tests * Thu Mar 13 2008 Andrew Overholt 2.0-0.1.RC5 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sat4j/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 15:47:45 -0000 1.1 +++ .cvsignore 15 Jul 2008 16:13:34 -0000 1.2 @@ -0,0 +1,2 @@ +org.sat4j.core-src.zip +org.sat4j.pb-src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sat4j/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 15:47:45 -0000 1.1 +++ sources 15 Jul 2008 16:13:34 -0000 1.2 @@ -0,0 +1,2 @@ +20869e6d0b69d5ad177d722d9cc6b481 org.sat4j.core-src.zip +3ec2679335bb11cc76fe9f6ddff020fe org.sat4j.pb-src.zip From fedora-extras-commits at redhat.com Tue Jul 15 16:32:10 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 15 Jul 2008 16:32:10 GMT Subject: rpms/sat4j/devel sat4j.spec,1.1,1.2 Message-ID: <200807151632.m6FGWA2i001227@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/sat4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1177 Modified Files: sat4j.spec Log Message: * Tue Jul 15 2008 Andrew Overholt 2.0.0-5 - Use sed instead of dos2unix Index: sat4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sat4j.spec 15 Jul 2008 16:13:34 -0000 1.1 +++ sat4j.spec 15 Jul 2008 16:31:22 -0000 1.2 @@ -4,7 +4,7 @@ Name: sat4j Version: 2.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library of SAT solvers written in Java Group: Development/Libraries @@ -63,8 +63,8 @@ popd # I don't think package build can handle DOS line endings in MANIFEST.MF -dos2unix core/META-INF/MANIFEST.MF -dos2unix pb/META-INF/MANIFEST.MF +sed -i 's/\r//' core/META-INF/MANIFEST.MF +sed -i 's/\r//' pb/META-INF/MANIFEST.MF %build SDK=$(cd SDK > /dev/null && pwd) @@ -175,6 +175,9 @@ %{_javadir}/org.sat4j* %changelog +* Tue Jul 15 2008 Andrew Overholt 2.0.0-5 +- Use sed instead of dos2unix + * Mon Jul 14 2008 Andrew Overholt 2.0.0-4 - Remove jmock JARs - Don't run tests as part of build From fedora-extras-commits at redhat.com Tue Jul 15 16:33:23 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 15 Jul 2008 16:33:23 GMT Subject: rpms/em8300-kmod/F-8 em8300-kmod.spec,1.58,1.59 Message-ID: <200807151633.m6FGXN3B001390@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/em8300-kmod/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1293 Modified Files: em8300-kmod.spec Log Message: * Tue Jul 15 2008 Ville Skytt?? - Rebuild for kernel 2.6.25.10-47.fc8. Index: em8300-kmod.spec =================================================================== RCS file: /cvs/pkgs/rpms/em8300-kmod/F-8/em8300-kmod.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- em8300-kmod.spec 3 Jul 2008 14:49:54 -0000 1.58 +++ em8300-kmod.spec 15 Jul 2008 16:32:27 -0000 1.59 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.25.9-40.fc8} +%{!?kversion: %define kversion 2.6.25.10-47.fc8} %define kmod_name em8300 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -83,6 +83,9 @@ %changelog +* Tue Jul 15 2008 Ville Skytt?? +- Rebuild for kernel 2.6.25.10-47.fc8. + * Thu Jul 3 2008 Ville Skytt?? - Rebuild for kernel 2.6.25.9-40.fc8. From fedora-extras-commits at redhat.com Tue Jul 15 16:42:36 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 16:42:36 GMT Subject: rpms/vala/devel vala-init.el, NONE, 1.1 vala-mode.el, NONE, 1.1 vala.spec, 1.28, 1.29 Message-ID: <200807151642.m6FGgagf002014@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1936 Modified Files: vala.spec Added Files: vala-init.el vala-mode.el Log Message: * Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 - Add vala-mode for editing Vala code in Emacs --- NEW FILE vala-init.el --- ;; Register vala-mode (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) --- NEW FILE vala-mode.el --- ;;; vala-mode.el --- Vala mode derived mode ;; Author: 2005 Dylan R. E. Moonfire ;; 2008 ??tienne BERSAC ;; Maintainer: ??tienne BERSAC ;; Created: 2008 May the 4th ;; Modified: May 2008 ;; Version: 0.1 ;; Keywords: vala languages oop ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2 of the License, or ;; (at your option) any later version. ;; ;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; See http://live.gnome.org/Vala for details about Vala language. ;; ;; This is a separate mode to implement the Vala constructs and ;; font-locking. It is mostly the csharp-mode from ;; http://mfgames.com/linux/csharp-mode with vala specific keywords ;; and filename suffixes. ;; ;; Note: The interface used in this file requires CC Mode 5.30 or ;; later. ;;; .emacs (don't put in (require 'vala-mode)) ;; (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) ;; (setq auto-mode-alist ;; (append '(("\\.vala$" . vala-mode)) auto-mode-alist)) ;;; Versions: ;; ;; 0.1 : Initial version based on csharp-mode ;; ;; This is a copy of the function in cc-mode which is used to handle ;; the eval-when-compile which is needed during other times. (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate) ;; See cc-langs.el, a direct copy. (unless (listp (car-safe ops)) (setq ops (list ops))) (cond ((eq opgroup-filter t) (setq opgroup-filter (lambda (opgroup) t))) ((not (functionp opgroup-filter)) (setq opgroup-filter `(lambda (opgroup) (memq opgroup ',opgroup-filter))))) (cond ((eq op-filter t) (setq op-filter (lambda (op) t))) ((stringp op-filter) (setq op-filter `(lambda (op) (string-match ,op-filter op))))) (unless xlate (setq xlate 'identity)) (c-with-syntax-table (c-lang-const c-mode-syntax-table) (delete-duplicates (mapcan (lambda (opgroup) (when (if (symbolp (car opgroup)) (when (funcall opgroup-filter (car opgroup)) (setq opgroup (cdr opgroup)) t) t) (mapcan (lambda (op) (when (funcall op-filter op) (let ((res (funcall xlate op))) (if (listp res) res (list res))))) opgroup))) ops) :test 'equal))) ;; This inserts the bulk of the code. (require 'cc-mode) ;; These are only required at compile time to get the sources for the ;; language constants. (The cc-fonts require and the font-lock ;; related constants could additionally be put inside an ;; (eval-after-load "font-lock" ...) but then some trickery is ;; necessary to get them compiled.) (eval-when-compile (let ((load-path (if (and (boundp 'byte-compile-dest-file) (stringp byte-compile-dest-file)) (cons (file-name-directory byte-compile-dest-file) load-path) load-path))) (load "cc-mode" nil t) (load "cc-fonts" nil t) (load "cc-langs" nil t))) (eval-and-compile ;; Make our mode known to the language constant system. Use Java ;; mode as the fallback for the constants we don't change here. ;; This needs to be done also at compile time since the language ;; constants are evaluated then. (c-add-language 'vala-mode 'java-mode)) ;; Java uses a series of regexes to change the font-lock for class ;; references. The problem comes in because Java uses Pascal (leading ;; space in names, SomeClass) for class and package names, but ;; Camel-casing (initial lowercase, upper case in words, ;; i.e. someVariable) for variables. ;;(error (byte-compile-dest-file)) ;;(error (c-get-current-file)) (c-lang-defconst c-opt-after-id-concat-key vala (if (c-lang-const c-opt-identifier-concat-key) (c-lang-const c-symbol-start))) (c-lang-defconst c-basic-matchers-before vala `( ;;;; Font-lock the attributes by searching for the ;;;; appropriate regex and marking it as TODO. ;;,`(,(concat "\\(" vala-attribute-regex "\\)") ;; 0 font-lock-function-name-face) ;; Put a warning face on the opener of unclosed strings that ;; can't span lines. Later font ;; lock packages have a `font-lock-syntactic-face-function' for ;; this, but it doesn't give the control we want since any ;; fontification done inside the function will be ;; unconditionally overridden. ,(c-make-font-lock-search-function ;; Match a char before the string starter to make ;; `c-skip-comments-and-strings' work correctly. (concat ".\\(" c-string-limit-regexp "\\)") '((c-font-lock-invalid-string))) ;; Fontify keyword constants. ,@(when (c-lang-const c-constant-kwds) (let ((re (c-make-keywords-re nil (c-lang-const c-constant-kwds)))) `((eval . (list ,(concat "\\<\\(" re "\\)\\>") 1 c-constant-face-name))))) ;; Fontify all keywords except the primitive types. ,`(,(concat "\\<" (c-lang-const c-regular-keywords-regexp)) 1 font-lock-keyword-face) ;; Fontify leading identifiers in fully ;; qualified names like "Foo.Bar". ,@(when (c-lang-const c-opt-identifier-concat-key) `((,(byte-compile `(lambda (limit) (while (re-search-forward ,(concat "\\(\\<" ; 1 "\\(" (c-lang-const c-symbol-key) "\\)" ; 2 "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" "\\)" "\\(" (c-lang-const c-opt-after-id-concat-key) "\\)") limit t) (unless (progn (goto-char (match-beginning 0)) (c-skip-comments-and-strings limit)) (or (get-text-property (match-beginning 2) 'face) (c-put-font-lock-face (match-beginning 2) (match-end 2) c-reference-face-name)) (goto-char (match-end 1))))))))) )) ;; Vala does not allow a leading qualifier operator. It also doesn't ;; allow the ".*" construct of Java. So, we redo this regex without ;; the "\\|\\*" regex. (c-lang-defconst c-identifier-key vala (concat "\\(" (c-lang-const c-symbol-key) "\\)" ; 1 (concat "\\(" "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" (concat "\\(" "\\(" (c-lang-const c-symbol-key) "\\)" "\\)") "\\)*"))) ;; Vala has a few rules that are slightly different than Java for ;; operators. This also removed the Java's "super" and replaces it ;; with the Vala's "base". (c-lang-defconst c-operators vala `((prefix "base"))) ;; Vala directives ? ;; (c-lang-defconst c-opt-cpp-prefix ;; csharp "^\\s *#.*") ;; Vala uses the following assignment operators (c-lang-defconst c-assignment-operators vala '("=" "*=" "/=" "%=" "+=" "-=" ">>=" "<<=" "&=" "^=" "|=" "++" "--")) ;; This defines the primative types for Vala (c-lang-defconst c-primitive-type-kwds vala '("void" "char" "int" "float" "double" "string")) ;; The keywords that define that the following is a type, such as a ;; class definition. (c-lang-defconst c-type-prefix-kwds vala '("class" "interface" "struct" "enum" "signal")) ;; Type modifier keywords. They appear anywhere in types, but modifiy ;; instead create one. (c-lang-defconst c-type-modifier-kwds vala '("const")) ;; Structures that are similiar to classes. (c-lang-defconst c-class-decl-kwds vala '("class" "interface")) ;; The various modifiers used for class and method descriptions. (c-lang-defconst c-modifier-kwds vala '("public" "partial" "private" "const" "abstract" "protected" "ref" "in" "out" "static" "virtual" "override" "params" "internal")) ;; We don't use the protection level stuff because it breaks the ;; method indenting. Not sure why, though. (c-lang-defconst c-protection-kwds vala nil) ;; Define the keywords that can have something following after them. (c-lang-defconst c-type-list-kwds vala '("struct" "class" "interface" "is" "as" "delegate" "event" "set" "get" "add" "remove" "callback" "signal" "var" "default")) ;; This allows the classes after the : in the class declartion to be ;; fontified. (c-lang-defconst c-typeless-decl-kwds vala '(":")) ;; Sets up the enum to handle the list properly (c-lang-defconst c-brace-list-decl-kwds vala '("enum")) ;; We need to remove Java's package keyword (c-lang-defconst c-ref-list-kwds vala '("using" "namespace")) ;; Follow-on blocks that don't require a brace (c-lang-defconst c-block-stmt-2-kwds vala '("for" "if" "switch" "while" "catch" "foreach" "lock")) ;; Statements that break out of braces (c-lang-defconst c-simple-stmt-kwds vala '("return" "continue" "break" "throw")) ;; Statements that allow a label ;; TODO? (c-lang-defconst c-before-label-kwds vala nil) ;; Constant keywords (c-lang-defconst c-constant-kwds vala '("true" "false" "null")) ;; Keywords that start "primary expressions." (c-lang-defconst c-primary-expr-kwds vala '("this" "base")) ;; We need to treat namespace as an outer block to class indenting ;; works properly. (c-lang-defconst c-other-block-decl-kwds vala '("namespace")) ;; We need to include the "in" for the foreach (c-lang-defconst c-other-kwds vala '("in" "sizeof" "typeof")) (require 'cc-awk) (c-lang-defconst c-at-vsemi-p-fn vala 'c-awk-at-vsemi-p) (defcustom vala-font-lock-extra-types nil "*List of extra types (aside from the type keywords) to recognize in Vala mode. Each list item should be a regexp matching a single identifier.") (defconst vala-font-lock-keywords-1 (c-lang-const c-matchers-1 vala) "Minimal highlighting for Vala mode.") (defconst vala-font-lock-keywords-2 (c-lang-const c-matchers-2 vala) "Fast normal highlighting for Vala mode.") (defconst vala-font-lock-keywords-3 (c-lang-const c-matchers-3 vala) "Accurate normal highlighting for Vala mode.") (defvar vala-font-lock-keywords vala-font-lock-keywords-3 "Default expressions to highlight in Vala mode.") (defvar vala-mode-syntax-table nil "Syntax table used in vala-mode buffers.") (or vala-mode-syntax-table (setq vala-mode-syntax-table (funcall (c-lang-const c-make-mode-syntax-table vala)))) (defvar vala-mode-abbrev-table nil "Abbreviation table used in vala-mode buffers.") (c-define-abbrev-table 'vala-mode-abbrev-table ;; Keywords that if they occur first on a line ;; might alter the syntactic context, and which ;; therefore should trig reindentation when ;; they are completed. '(("else" "else" c-electric-continued-statement 0) ("while" "while" c-electric-continued-statement 0) ("catch" "catch" c-electric-continued-statement 0) ("finally" "finally" c-electric-continued-statement 0))) (defvar vala-mode-map (let ((map (c-make-inherited-keymap))) ;; Add bindings which are only useful for Vala map) "Keymap used in vala-mode buffers.") ;;(easy-menu-define vala-menu vala-mode-map "Vala Mode Commands" ;; ;; Can use `vala' as the language for `c-mode-menu' ;; ;; since its definition covers any language. In ;; ;; this case the language is used to adapt to the ;; ;; nonexistence of a cpp pass and thus removing some ;; ;; irrelevant menu alternatives. ;; (cons "Vala" (c-lang-const c-mode-menu vala))) ;;; Autoload mode trigger (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) ;; Custom variables (defcustom vala-mode-hook nil "*Hook called by `vala-mode'." :type 'hook :group 'c) ;;; The entry point into the mode ;;;###autoload (defun vala-mode () "Major mode for editing Vala code. This is a simple example of a separate mode derived from CC Mode to support a language with syntax similar to C#/C/C++/ObjC/Java/IDL/Pike. The hook `c-mode-common-hook' is run with no args at mode initialization, then `vala-mode-hook'. Key bindings: \\{vala-mode-map}" (interactive) (kill-all-local-variables) (c-initialize-cc-mode t) (set-syntax-table vala-mode-syntax-table) (setq major-mode 'vala-mode mode-name "Vala" local-abbrev-table vala-mode-abbrev-table abbrev-mode t) (use-local-map c-mode-map) ;; `c-init-language-vars' is a macro that is expanded at compile ;; time to a large `setq' with all the language variables and their ;; customized values for our language. (c-init-language-vars vala-mode) ;; `c-common-init' initializes most of the components of a CC Mode ;; buffer, including setup of the mode menu, font-lock, etc. ;; There's also a lower level routine `c-basic-common-init' that ;; only makes the necessary initialization to get the syntactic ;; analysis and similar things working. (c-common-init 'vala-mode) ;;(easy-menu-add vala-menu) (c-set-style "linux") (setq indent-tabs-mode t) (setq c-basic-offset 4) (setq tab-width 4) (c-toggle-auto-newline -1) (c-toggle-hungry-state -1) (run-hooks 'c-mode-common-hook) (run-hooks 'vala-mode-hook) (c-update-modeline)) (provide 'vala-mode) ;;; vala-mode.el ends here Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- vala.spec 1 Jul 2008 01:20:13 -0000 1.28 +++ vala.spec 15 Jul 2008 16:41:39 -0000 1.29 @@ -1,6 +1,16 @@ +%if %($(pkg-config emacs) ; echo $?) +%define emacs_version 22.2 +%define emacs_lispdir %{_datadir}/emacs/site-lisp +%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d +%else +%define emacs_version %(pkg-config emacs --modversion) +%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) +%define emacs_startdir %(pkg-config emacs --variable sitestartdir) +%endif + Name: vala Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern programming language for GNOME Group: Development/Languages @@ -8,9 +18,12 @@ License: LGPLv2+ and BSD URL: http://live.gnome.org/Vala Source0: http://download.gnome.org/sources/vala/0.3/vala-%{version}.tar.bz2 +Source1: vala-mode.el +Source2: vala-init.el BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel flex bison devhelp +BuildRequires: emacs emacs-el Requires: gtk2-devel %description @@ -44,6 +57,7 @@ This package contains development files for %{name}. This is not necessary for using the %{name} compiler. + %package tools Summary: Tools for creating projects and bindings for %{name} Group: Development/Languages @@ -62,6 +76,7 @@ This package contains tools to generate Vala projects, as well as API bindings from existing C libraries, allowing access from Vala programs. + %package doc Summary: Documentation for %{name} Group: Documentation @@ -81,6 +96,17 @@ This package contains documentation in a devhelp HTML book. +%package -n emacs-vala +Summary: Vala mode for Emacs +Group: Applications/Editors +License: GPLv2+ +Requires: emacs(bin) >= %{emacs_version} + + +%description -n emacs-vala +An Emacs mode for editing Vala source code. + + %prep %setup -q @@ -91,6 +117,9 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} +# Compile emacs module +mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} . +emacs -batch -f batch-byte-compile vala-mode.el %install @@ -98,6 +127,12 @@ make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libvala.la +# Emacs mode files +mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} +mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} +cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{emacs_lispdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -131,9 +166,17 @@ %defattr(-,root,root,-) %{_datadir}/devhelp/books/vala +%files -n emacs-vala +%defattr(-,root,root,-) +%{emacs_lispdir}/* +%{emacs_startdir}/* + %changelog +* Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 +- Add vala-mode for editing Vala code in Emacs + * Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 - Update to 0.3.4 From fedora-extras-commits at redhat.com Tue Jul 15 16:46:16 2008 From: fedora-extras-commits at redhat.com (Frank Ch. Eigler (fche)) Date: Tue, 15 Jul 2008 16:46:16 GMT Subject: rpms/systemtap/devel .cvsignore, 1.12, 1.13 sources, 1.25, 1.26 systemtap.spec, 1.39, 1.40 Message-ID: <200807151646.m6FGkGXY002383@cvs-int.fedora.redhat.com> Author: fche Update of /cvs/pkgs/rpms/systemtap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2269 Modified Files: .cvsignore sources systemtap.spec Log Message: * v0.7 prep Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 27 Mar 2008 19:56:26 -0000 1.12 +++ .cvsignore 15 Jul 2008 16:45:18 -0000 1.13 @@ -1 +1 @@ -systemtap-0.6.2.tar.gz +systemtap-0.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 27 Mar 2008 19:56:26 -0000 1.25 +++ sources 15 Jul 2008 16:45:18 -0000 1.26 @@ -1 +1 @@ -97a313be6dece97e0514d0c9a863413c systemtap-0.6.2.tar.gz +ca34da0111256d5d03367e84f92d520b systemtap-0.7.tar.gz Index: systemtap.spec =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- systemtap.spec 27 Mar 2008 19:55:02 -0000 1.39 +++ systemtap.spec 15 Jul 2008 16:45:18 -0000 1.40 @@ -1,26 +1,15 @@ -# Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases. %define release 1 -# Version number of oldest elfutils release that works with systemtap. -%define elfutils_version 0.131 - -# Default options (suitable for fedora) %define with_sqlite 1 %define with_docs 1 %define with_crash 0 %define with_bundled_elfutils 0 - -# Enable these options by default for RHEL -%if 0%{?rhel} >= 5 -%define with_crash 1 -%define with_bundled_elfutils 1 -%endif +%define elfutils_version 0.127 Name: systemtap -Version: 0.6.2 +Version: 0.7 Release: %{release}%{?dist} Summary: Instrumentation System Group: Development/System -ExcludeArch: ppc License: GPLv2+ URL: http://sourceware.org/systemtap/ Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz @@ -141,16 +130,19 @@ %configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} make %{?_smp_mflags} +%install +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=$RPM_BUILD_ROOT install + +# We want the examples in the special doc dir, not the generoc doc install dir. +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples + # Fix paths in the example & testsuite scripts find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@' # To avoid perl dependency, make perl sample script non-executable chmod -x examples/samples/kmalloc-top -%install -rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=$RPM_BUILD_ROOT install - # Because "make install" may install staprun with mode 04111, the # post-processing programs rpmbuild runs won't be able to read it. # So, we change permissions so that they can read it. We'll set the @@ -159,8 +151,12 @@ # Copy over the testsuite cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap -mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/src -cp -rp examples $RPM_BUILD_ROOT%{_datadir}/%{name}/src + +#%if %{with_docs} +# We want the manuals in the special doc dir, not the generic doc install dir. +mkdir docs.installed +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ +#%endif %clean rm -rf ${RPM_BUILD_ROOT} @@ -175,8 +171,7 @@ %doc README AUTHORS NEWS COPYING examples %if %{with_docs} -%doc doc/tutorial.pdf -%doc doc/langref.pdf +%doc docs.installed/*.pdf %endif %{_bindir}/stap @@ -207,28 +202,16 @@ %files testsuite %defattr(-,root,root) -%{_datadir}/%{name}/src %{_datadir}/%{name}/testsuite %changelog -* Thu Mar 27 2008 Will Cohen - 0.6.2-1 -- Rebase. - -* Wed Feb 21 2008 Will Cohen - 0.6.1-8 -- Bump version. - -* Wed Feb 13 2008 Will Cohen - 0.6.1-5 -- Correct elfi typo in runtime/stack-i386.c. - -* Tue Feb 12 2008 Will Cohen - 0.6.1-4 -- Add patch for gcc 4.3. +* Tue Jul 15 2008 Frank Ch. Eigler - 0.7-1 +- Upstream release. * Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-3 -- Add zlib-devel dependency which is supposed to come from crash-devel. - -* Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-2 -- Process testsuite .stp files to fool "#! stap" dep. finder. +- Add zlib-devel to buildreq; missing from crash-devel +- Process testsuite .stp files for #!stap->#!/usr/bin/stap * Fri Jan 18 2008 Frank Ch. Eigler - 0.6.1-1 - Add crash-devel buildreq to build staplog.so crash(8) module. From fedora-extras-commits at redhat.com Tue Jul 15 16:47:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:47:11 +0000 Subject: [pkgdb] coq was added for amdunn Message-ID: <200807151647.m6FGlBLC021579@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package coq with summary Coq proof management system Kevin Fenzi (kevin) has approved Package coq Kevin Fenzi (kevin) has added a Fedora devel branch for coq with an owner of amdunn Kevin Fenzi (kevin) has approved coq in Fedora devel Kevin Fenzi (kevin) has approved Package coq Kevin Fenzi (kevin) has set commit to Approved for cvsextras on coq (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on coq (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on coq (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coq From fedora-extras-commits at redhat.com Tue Jul 15 16:47:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:47:12 +0000 Subject: [pkgdb] coq (Fedora, 9) updated by kevin Message-ID: <200807151647.m6FGlCpM021600@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for coq Kevin Fenzi (kevin) has set commit to Approved for cvsextras on coq (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on coq (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on coq (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on coq (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coq From fedora-extras-commits at redhat.com Tue Jul 15 16:47:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:47:12 +0000 Subject: [pkgdb] coq (Fedora, 8) updated by kevin Message-ID: <200807151647.m6FGlCpP021600@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for coq Kevin Fenzi (kevin) has set commit to Approved for cvsextras on coq (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on coq (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on coq (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on coq (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coq From fedora-extras-commits at redhat.com Tue Jul 15 16:47:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:47:12 +0000 Subject: [pkgdb] coq (Fedora, devel) updated by kevin Message-ID: <200807151647.m6FGlCpS021600@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on coq (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coq From fedora-extras-commits at redhat.com Tue Jul 15 16:47:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:47:47 GMT Subject: rpms/coq - New directory Message-ID: <200807151647.m6FGlldt002572@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/coq In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTD2503/rpms/coq Log Message: Directory /cvs/extras/rpms/coq added to the repository From fedora-extras-commits at redhat.com Tue Jul 15 16:48:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:48:05 GMT Subject: rpms/coq/devel - New directory Message-ID: <200807151648.m6FGm5me002618@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/coq/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTD2503/rpms/coq/devel Log Message: Directory /cvs/extras/rpms/coq/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 15 16:48:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:48:21 GMT Subject: rpms/coq Makefile,NONE,1.1 Message-ID: <200807151648.m6FGmLan002653@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/coq In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTD2503/rpms/coq Added Files: Makefile Log Message: Setup of module coq --- NEW FILE Makefile --- # Top level Makefile for module coq all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 15 16:48:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:48:34 GMT Subject: rpms/coq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807151648.m6FGmYhK002674@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/coq/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTD2503/rpms/coq/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module coq --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: coq # $Id: Makefile,v 1.1 2008/07/15 16:48:21 kevin Exp $ NAME := coq SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 15 16:50:45 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 16:50:45 GMT Subject: rpms/gambit-c/F-8 gambit-c.spec,1.3,1.4 Message-ID: <200807151650.m6FGojsQ003081@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gambit-c/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2895 Modified Files: gambit-c.spec Log Message: Use correct version of Emacs for emacs-gambit subpackage Index: gambit-c.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambit-c/F-8/gambit-c.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gambit-c.spec 15 Jul 2008 16:06:27 -0000 1.3 +++ gambit-c.spec 15 Jul 2008 16:49:56 -0000 1.4 @@ -12,7 +12,7 @@ Name: gambit-c Version: 4.2.8 -Release: 6%{?dist} +Release: 6%{?dist}.1 Summary: Gambit-C Scheme programming system Group: Development/Languages @@ -216,6 +216,9 @@ %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6.1 +- Require correct version of Emacs for emacs-gambit subpackage + * Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 - Put include files and libraries in standard paths From fedora-extras-commits at redhat.com Tue Jul 15 16:51:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:51:55 +0000 Subject: [pkgdb] odfpy was added for ianweller Message-ID: <200807151651.m6FGptS0022004@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package odfpy with summary Python library for manipulating OpenDocument files Kevin Fenzi (kevin) has approved Package odfpy Kevin Fenzi (kevin) has added a Fedora devel branch for odfpy with an owner of ianweller Kevin Fenzi (kevin) has approved odfpy in Fedora devel Kevin Fenzi (kevin) has approved Package odfpy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odfpy (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on odfpy (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odfpy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/odfpy From fedora-extras-commits at redhat.com Tue Jul 15 16:52:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:52:00 +0000 Subject: [pkgdb] odfpy (Fedora, 8) updated by kevin Message-ID: <200807151652.m6FGq0xu022025@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for odfpy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odfpy (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on odfpy (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odfpy (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on odfpy (Fedora 8) for pfrields Kevin Fenzi (kevin) approved watchcommits on odfpy (Fedora 8) for pfrields Kevin Fenzi (kevin) approved commit on odfpy (Fedora 8) for pfrields Kevin Fenzi (kevin) approved build on odfpy (Fedora 8) for pfrields Kevin Fenzi (kevin) approved approveacls on odfpy (Fedora 8) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on odfpy (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/odfpy From fedora-extras-commits at redhat.com Tue Jul 15 16:52:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:52:00 +0000 Subject: [pkgdb] odfpy (Fedora EPEL, 5) updated by kevin Message-ID: <200807151652.m6FGq0nt022024@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for odfpy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odfpy (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on odfpy (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odfpy (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on odfpy (Fedora EPEL 5) for pfrields Kevin Fenzi (kevin) approved watchcommits on odfpy (Fedora EPEL 5) for pfrields Kevin Fenzi (kevin) approved commit on odfpy (Fedora EPEL 5) for pfrields Kevin Fenzi (kevin) approved build on odfpy (Fedora EPEL 5) for pfrields Kevin Fenzi (kevin) approved approveacls on odfpy (Fedora EPEL 5) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on odfpy (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/odfpy From fedora-extras-commits at redhat.com Tue Jul 15 16:52:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:52:00 +0000 Subject: [pkgdb] odfpy (Fedora, devel) updated by kevin Message-ID: <200807151652.m6FGq000022025@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on odfpy (Fedora devel) for pfrields Kevin Fenzi (kevin) approved watchcommits on odfpy (Fedora devel) for pfrields Kevin Fenzi (kevin) approved commit on odfpy (Fedora devel) for pfrields Kevin Fenzi (kevin) approved build on odfpy (Fedora devel) for pfrields Kevin Fenzi (kevin) approved approveacls on odfpy (Fedora devel) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on odfpy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/odfpy From fedora-extras-commits at redhat.com Tue Jul 15 16:52:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:52:00 +0000 Subject: [pkgdb] odfpy (Fedora, 9) updated by kevin Message-ID: <200807151652.m6FGq0xs022025@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for odfpy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odfpy (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on odfpy (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odfpy (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on odfpy (Fedora 9) for pfrields Kevin Fenzi (kevin) approved watchcommits on odfpy (Fedora 9) for pfrields Kevin Fenzi (kevin) approved commit on odfpy (Fedora 9) for pfrields Kevin Fenzi (kevin) approved build on odfpy (Fedora 9) for pfrields Kevin Fenzi (kevin) approved approveacls on odfpy (Fedora 9) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on odfpy (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/odfpy From fedora-extras-commits at redhat.com Tue Jul 15 16:52:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 16:52:00 +0000 Subject: [pkgdb] odfpy (Fedora EPEL, 4) updated by kevin Message-ID: <200807151652.m6FGq0nx022024@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for odfpy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odfpy (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on odfpy (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odfpy (Fedora EPEL 4) Kevin Fenzi (kevin) approved watchbugzilla on odfpy (Fedora EPEL 4) for pfrields Kevin Fenzi (kevin) approved watchcommits on odfpy (Fedora EPEL 4) for pfrields Kevin Fenzi (kevin) approved commit on odfpy (Fedora EPEL 4) for pfrields Kevin Fenzi (kevin) approved build on odfpy (Fedora EPEL 4) for pfrields Kevin Fenzi (kevin) approved approveacls on odfpy (Fedora EPEL 4) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on odfpy (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/odfpy From fedora-extras-commits at redhat.com Tue Jul 15 16:52:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:52:43 GMT Subject: rpms/odfpy - New directory Message-ID: <200807151652.m6FGqhvb003351@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/odfpy In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJB3278/rpms/odfpy Log Message: Directory /cvs/extras/rpms/odfpy added to the repository From fedora-extras-commits at redhat.com Tue Jul 15 16:53:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:53:02 GMT Subject: rpms/odfpy/devel - New directory Message-ID: <200807151653.m6FGr2I2003389@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/odfpy/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJB3278/rpms/odfpy/devel Log Message: Directory /cvs/extras/rpms/odfpy/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 15 16:53:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:53:18 GMT Subject: rpms/odfpy Makefile,NONE,1.1 Message-ID: <200807151653.m6FGrIDQ003436@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/odfpy In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJB3278/rpms/odfpy Added Files: Makefile Log Message: Setup of module odfpy --- NEW FILE Makefile --- # Top level Makefile for module odfpy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 15 16:53:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 15 Jul 2008 16:53:38 GMT Subject: rpms/odfpy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807151653.m6FGrcxi003524@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/odfpy/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJB3278/rpms/odfpy/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module odfpy --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: odfpy # $Id: Makefile,v 1.1 2008/07/15 16:53:18 kevin Exp $ NAME := odfpy SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 15 17:00:21 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 15 Jul 2008 17:00:21 GMT Subject: rpms/sat4j/devel sat4j.spec,1.2,1.3 Message-ID: <200807151700.m6FH0LnJ004738@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/sat4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4608 Modified Files: sat4j.spec Log Message: * Tue Jul 15 2008 Andrew Overholt 2.0.0-6 - Build with OpenJDK (java.util.Scanner) Index: sat4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sat4j.spec 15 Jul 2008 16:31:22 -0000 1.2 +++ sat4j.spec 15 Jul 2008 16:59:38 -0000 1.3 @@ -1,10 +1,10 @@ -%define eclipse_base %{_datadir}/eclipse +%define eclipse_base %{_libdir}/eclipse # We want the version to match that shipped in Eclipse's Orbit project %define sat4jversion 2.0.0.v20080602 Name: sat4j Version: 2.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A library of SAT solvers written in Java Group: Development/Libraries @@ -23,10 +23,10 @@ Patch2: sat4j-junit4fortests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: java-devel >= 1.5 +BuildRequires: java-devel >= 1:1.6 BuildRequires: junit4 BuildRequires: eclipse-pde -Requires: java >= 1.5 +Requires: java >= 1:1.6 Requires: jpackage-utils BuildArch: noarch @@ -175,6 +175,9 @@ %{_javadir}/org.sat4j* %changelog +* Tue Jul 15 2008 Andrew Overholt 2.0.0-6 +- Build with OpenJDK (java.util.Scanner) + * Tue Jul 15 2008 Andrew Overholt 2.0.0-5 - Use sed instead of dos2unix From fedora-extras-commits at redhat.com Tue Jul 15 17:05:08 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 15 Jul 2008 17:05:08 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.30, 1.31 java-1.6.0-openjdk-optflags.patch, 1.8, 1.9 java-1.6.0-openjdk.spec, 1.56, 1.57 sources, 1.30, 1.31 java-1.6.0-openjdk-6332953.patch, 1.1, NONE java-1.6.0-openjdk-6542088.patch, 1.1, NONE java-1.6.0-openjdk-6607339.patch, 1.1, NONE java-1.6.0-openjdk-6661918.patch, 1.1, NONE java-1.6.0-openjdk-6685178.patch, 1.1, NONE java-1.6.0-openjdk-sparc-ptracefix.patch, 1.1, NONE java-1.6.0-openjdk-sparc-trapsfix.patch, 1.1, NONE java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch, 1.1, NONE java-1.6.0-openjdk-sparc64-linux.patch, 1.1, NONE Message-ID: <200807151705.m6FH58Jm011710@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11640 Modified Files: .cvsignore java-1.6.0-openjdk-optflags.patch java-1.6.0-openjdk.spec sources Removed Files: java-1.6.0-openjdk-6332953.patch java-1.6.0-openjdk-6542088.patch java-1.6.0-openjdk-6607339.patch java-1.6.0-openjdk-6661918.patch java-1.6.0-openjdk-6685178.patch java-1.6.0-openjdk-sparc-ptracefix.patch java-1.6.0-openjdk-sparc-trapsfix.patch java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch java-1.6.0-openjdk-sparc64-linux.patch Log Message: * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Removed all unneeded patches. Security patches are included in the new icedtea source. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 15 Jul 2008 15:52:17 -0000 1.30 +++ .cvsignore 15 Jul 2008 17:04:20 -0000 1.31 @@ -2,4 +2,3 @@ mauve-2008-03-11.tar.gz mauve_tests openjdk-6-src-b10_30_may_2008-fedora.tar.gz -icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.tar.gz java-1.6.0-openjdk-optflags.patch: Index: java-1.6.0-openjdk-optflags.patch =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-optflags.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- java-1.6.0-openjdk-optflags.patch 5 May 2008 14:40:13 -0000 1.8 +++ java-1.6.0-openjdk-optflags.patch 15 Jul 2008 17:04:20 -0000 1.9 @@ -1,38 +1,81 @@ ---- configure.orig 2008-05-05 10:37:01.000000000 -0400 -+++ configure 2008-05-05 10:38:35.000000000 -0400 -@@ -719,6 +719,7 @@ - FILE - FASTJAR - ac_ct_FASTJAR +--- oldconfigure 2008-07-14 12:10:27.000000000 -0400 ++++ configure 2008-07-15 12:22:11.000000000 -0400 +@@ -704,6 +704,7 @@ + CXXDEPMODE + am__fastdepCXX_TRUE + am__fastdepCXX_FALSE +ALT_OPT_CFLAGS - GAWK - SYSTEM_GCJ_DIR - SYSTEM_OPENJDK_DIR -@@ -5673,6 +5674,10 @@ - fi - fi + MAKE + GZIP + ANT +@@ -4181,6 +4182,9 @@ + + -+ +ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')" + + - if test "x$FASTJAR" = x; then - { { echo "$as_me:$LINENO: error: Can't find fastjar or jar" >&5 - echo "$as_me: error: Can't find fastjar or jar" >&2;} -@@ -12960,6 +12965,7 @@ - FILE!$FILE$ac_delim - FASTJAR!$FASTJAR$ac_delim - ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}make", so it can be a program name with args. + set dummy ${ac_tool_prefix}make; ac_word=$2 +@@ -13414,6 +13418,7 @@ + CXXDEPMODE!$CXXDEPMODE$ac_delim + am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim + am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim - GAWK!$GAWK$ac_delim - SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim - SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim -@@ -13044,7 +13050,7 @@ + MAKE!$MAKE$ac_delim + GZIP!$GZIP$ac_delim + ANT!$ANT$ac_delim +@@ -13421,7 +13426,6 @@ + PATCH!$PATCH$ac_delim + TAR!$TAR$ac_delim + CHMOD!$CHMOD$ac_delim +-MD5SUM!$MD5SUM$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -13463,6 +13467,7 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++MD5SUM!$MD5SUM$ac_delim + WGET!$WGET$ac_delim + ZIP!$ZIP$ac_delim + UNZIP!$UNZIP$ac_delim +@@ -13559,7 +13564,6 @@ + XULRUNNER_CFLAGS!$XULRUNNER_CFLAGS$ac_delim + XULRUNNER_LIBS!$XULRUNNER_LIBS$ac_delim + GTK_CFLAGS!$GTK_CFLAGS$ac_delim +-GTK_LIBS!$GTK_LIBS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -13601,6 +13605,7 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++GTK_LIBS!$GTK_LIBS$ac_delim + MOZILLA_CFLAGS!$MOZILLA_CFLAGS$ac_delim + MOZILLA_LIBS!$MOZILLA_LIBS$ac_delim + GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim +@@ -13615,7 +13620,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +--- oldconfigure.ac 2008-07-03 16:51:32.000000000 -0400 ++++ configure.ac 2008-07-15 12:21:59.000000000 -0400 +@@ -9,6 +9,9 @@ + AC_PROG_CC + AC_PROG_CXX + ++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')" ++AC_SUBST(ALT_OPT_CFLAGS) ++ + FIND_TOOL([MAKE], [make]) + FIND_TOOL([GZIP], [gzip]) + FIND_TOOL([ANT], [ant]) Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- java-1.6.0-openjdk.spec 15 Jul 2008 15:57:42 -0000 1.56 +++ java-1.6.0-openjdk.spec 15 Jul 2008 17:04:20 -0000 1.57 @@ -138,16 +138,7 @@ # applications. Patch0: java-1.6.0-openjdk-optflags.patch Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch -Patch2: java-1.6.0-openjdk-sparc-trapsfix.patch -Patch3: java-1.6.0-openjdk-sparc64-linux.patch -Patch4: java-1.6.0-openjdk-sparc-ptracefix.patch -Patch5: java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch -# OpenJDK security patches -Patch6: java-1.6.0-openjdk-6332953.patch -Patch7: java-1.6.0-openjdk-6542088.patch -Patch8: java-1.6.0-openjdk-6607339.patch -Patch9: java-1.6.0-openjdk-6661918.patch -Patch10: java-1.6.0-openjdk-6685178.patch +Patch2: java-1.6.0-openjdk-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -342,7 +333,7 @@ %setup -q -n icedtea6-%{icedteaver} -T -D -a 6 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2 %patch0 -%patch5 -p1 -b .sparc64 +%patch2 cp %{SOURCE4} . cp %{SOURCE5} . cp %{SOURCE7} . @@ -356,17 +347,6 @@ %if %{gcjbootstrap} make stamps/patch-ecj.stamp %endif -make stamps/patch.stamp -patch -l -p1 < %{PATCH2} -patch -l -p1 < %{PATCH3} -patch -l -p1 < %{PATCH4} -patch -l -p0 < %{PATCH6} -patch -l -p0 < %{PATCH7} -patch -l -p0 < %{PATCH8} -%ifarch %{jit_arches} -patch -l -p0 < %{PATCH9} -%endif -patch -l -p0 < %{PATCH10} make export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -908,6 +888,10 @@ %changelog * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Removed all unneeded patches. Security patches are included in the +new icedtea source. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Fixed fedorazip. * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 15 Jul 2008 15:52:17 -0000 1.30 +++ sources 15 Jul 2008 17:04:20 -0000 1.31 @@ -2,4 +2,3 @@ 079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests 5a8537503058edaeff587d45fc167631 openjdk-6-src-b10_30_may_2008-fedora.tar.gz -d35b57c1046a9866912bf66f13d16c55 icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.tar.gz --- java-1.6.0-openjdk-6332953.patch DELETED --- --- java-1.6.0-openjdk-6542088.patch DELETED --- --- java-1.6.0-openjdk-6607339.patch DELETED --- --- java-1.6.0-openjdk-6661918.patch DELETED --- --- java-1.6.0-openjdk-6685178.patch DELETED --- --- java-1.6.0-openjdk-sparc-ptracefix.patch DELETED --- --- java-1.6.0-openjdk-sparc-trapsfix.patch DELETED --- --- java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch DELETED --- --- java-1.6.0-openjdk-sparc64-linux.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 17:06:04 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 15 Jul 2008 17:06:04 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.72-show-systemsettings.patch, 1.1, 1.2 kdebase-workspace.spec, 1.103, 1.104 Message-ID: <200807151706.m6FH64BA011805@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11718/devel Modified Files: kdebase-workspace-4.0.72-show-systemsettings.patch kdebase-workspace.spec Log Message: * Tue Jul 15 2008 Kevin Kofler 4.0.98-6 - move systemsettings back from System to Settings in the menu kdebase-workspace-4.0.72-show-systemsettings.patch: Index: kdebase-workspace-4.0.72-show-systemsettings.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.72-show-systemsettings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebase-workspace-4.0.72-show-systemsettings.patch 7 May 2008 00:02:53 -0000 1.1 +++ kdebase-workspace-4.0.72-show-systemsettings.patch 15 Jul 2008 17:05:18 -0000 1.2 @@ -4,6 +4,7 @@ @@ -114,4 +114,4 @@ X-DBUS-StartupType=Unique - Categories=Qt;KDE;System; +-Categories=Qt;KDE;System; -NoDisplay=true ++Categories=Qt;KDE;Settings; +OnlyShowIn=KDE; Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- kdebase-workspace.spec 14 Jul 2008 23:02:40 -0000 1.103 +++ kdebase-workspace.spec 15 Jul 2008 17:05:18 -0000 1.104 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.98 -Release: 5%{?dist} +Release: 6%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -276,6 +276,9 @@ %changelog +* Tue Jul 15 2008 Kevin Kofler 4.0.98-6 +- move systemsettings back from System to Settings in the menu + * Mon Jul 14 2008 Kevin Kofler 4.0.98-5 - new consolekit-kdm patch using libck-connector, BR ConsoleKit-devel (#430388) From fedora-extras-commits at redhat.com Tue Jul 15 17:07:23 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 15 Jul 2008 17:07:23 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.31, 1.32 sources, 1.31, 1.32 Message-ID: <200807151707.m6FH7Nbb011848@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825 Modified Files: .cvsignore sources Log Message: Updated sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 15 Jul 2008 17:04:20 -0000 1.31 +++ .cvsignore 15 Jul 2008 17:06:34 -0000 1.32 @@ -2,3 +2,4 @@ mauve-2008-03-11.tar.gz mauve_tests openjdk-6-src-b10_30_may_2008-fedora.tar.gz +icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 15 Jul 2008 17:04:20 -0000 1.31 +++ sources 15 Jul 2008 17:06:34 -0000 1.32 @@ -2,3 +2,4 @@ 079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests 5a8537503058edaeff587d45fc167631 openjdk-6-src-b10_30_may_2008-fedora.tar.gz +2dd8dc2d3fcec85c085f1fd382d04b4d icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 17:09:43 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 15 Jul 2008 17:09:43 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-makefile.patch, 1.4, 1.5 Message-ID: <200807151709.m6FH9h54012178@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12077 Added Files: java-1.6.0-openjdk-makefile.patch Log Message: Added new patch java-1.6.0-openjdk-makefile.patch: Index: java-1.6.0-openjdk-makefile.patch =================================================================== RCS file: java-1.6.0-openjdk-makefile.patch diff -N java-1.6.0-openjdk-makefile.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ java-1.6.0-openjdk-makefile.patch 15 Jul 2008 17:08:51 -0000 1.5 @@ -0,0 +1,46 @@ +--- oldMakefile.am 2008-07-15 11:28:34.000000000 -0400 ++++ Makefile.am 2008-07-15 12:50:40.000000000 -0400 +@@ -444,7 +444,6 @@ + mkdir openjdk ; \ + $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \ + chmod -R ug+w openjdk ; \ +- sh $(srcdir)/fsg.sh ; \ + fi + if WITH_CACAO + if !USE_SYSTEM_CACAO +@@ -466,7 +465,7 @@ + clean-extract: + rm -f stamps/extract.stamp + +-stamps/patch.stamp: stamps/patch-fsg.stamp ++stamps/patch.stamp: stamps/extract.stamp + rm -f stamps/patch.stamp.tmp + mkdir -p stamps ; \ + all_patches_ok=yes; \ +--- oldMakefile.in 2008-07-15 11:29:18.000000000 -0400 ++++ Makefile.in 2008-07-15 12:50:52.000000000 -0400 +@@ -91,6 +91,7 @@ + ALSA_LIBS = @ALSA_LIBS@ + ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@ + ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@ ++ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@ + AMTAR = @AMTAR@ + ANT = @ANT@ + AUTOCONF = @AUTOCONF@ +@@ -921,7 +922,6 @@ + mkdir openjdk ; \ + $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \ + chmod -R ug+w openjdk ; \ +- sh $(srcdir)/fsg.sh ; \ + fi + @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \ + @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \ +@@ -939,7 +939,7 @@ + clean-extract: + rm -f stamps/extract.stamp + +-stamps/patch.stamp: stamps/patch-fsg.stamp ++stamps/patch.stamp: stamps/extract.stamp + rm -f stamps/patch.stamp.tmp + mkdir -p stamps ; \ + all_patches_ok=yes; \ From fedora-extras-commits at redhat.com Tue Jul 15 17:16:29 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 17:16:29 GMT Subject: rpms/vala/F-8 vala.spec,1.24,1.25 Message-ID: <200807151716.m6FHGTTI013574@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322/F-8 Modified Files: vala.spec Log Message: * Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 - Add vala-mode for editing Vala code in Emacs Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-8/vala.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- vala.spec 5 Jul 2008 00:13:16 -0000 1.24 +++ vala.spec 15 Jul 2008 17:15:38 -0000 1.25 @@ -1,6 +1,16 @@ +%if %($(pkg-config emacs) ; echo $?) +%define emacs_version 22.1 +%define emacs_lispdir %{_datadir}/emacs/site-lisp +%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d +%else +%define emacs_version %(pkg-config emacs --modversion) +%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) +%define emacs_startdir %(pkg-config emacs --variable sitestartdir) +%endif + Name: vala Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern programming language for GNOME Group: Development/Languages @@ -8,9 +18,12 @@ License: LGPLv2+ and BSD URL: http://live.gnome.org/Vala Source0: http://download.gnome.org/sources/vala/0.3/vala-%{version}.tar.bz2 +Source1: vala-mode.el +Source2: vala-init.el BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel flex bison devhelp +BuildRequires: emacs emacs-el Requires: gtk2-devel %description @@ -44,6 +57,7 @@ This package contains development files for %{name}. This is not necessary for using the %{name} compiler. + %package tools Summary: Tools for creating projects and bindings for %{name} Group: Development/Languages @@ -62,6 +76,7 @@ This package contains tools to generate Vala projects, as well as API bindings from existing C libraries, allowing access from Vala programs. + %package doc Summary: Documentation for %{name} Group: Documentation @@ -81,6 +96,17 @@ This package contains documentation in a devhelp HTML book. +%package -n emacs-vala +Summary: Vala mode for Emacs +Group: Applications/Editors +License: GPLv2+ +Requires: emacs(bin) >= %{emacs_version} + + +%description -n emacs-vala +An Emacs mode for editing Vala source code. + + %prep %setup -q @@ -91,6 +117,9 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} +# Compile emacs module +mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} . +emacs -batch -f batch-byte-compile vala-mode.el %install @@ -98,6 +127,12 @@ make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libvala.la +# Emacs mode files +mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} +mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} +cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{emacs_lispdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -131,9 +166,17 @@ %defattr(-,root,root,-) %{_datadir}/devhelp/books/vala +%files -n emacs-vala +%defattr(-,root,root,-) +%{emacs_lispdir}/* +%{emacs_startdir}/* + %changelog +* Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 +- Add vala-mode for editing Vala code in Emacs + * Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 - Update to 0.3.4 From fedora-extras-commits at redhat.com Tue Jul 15 17:16:38 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 17:16:38 GMT Subject: rpms/vala/EL-5 vala.spec,1.17,1.18 Message-ID: <200807151716.m6FHGcNv013583@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322/EL-5 Modified Files: vala.spec Log Message: * Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 - Add vala-mode for editing Vala code in Emacs Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/EL-5/vala.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vala.spec 5 Jul 2008 00:12:57 -0000 1.17 +++ vala.spec 15 Jul 2008 17:15:11 -0000 1.18 @@ -1,6 +1,16 @@ +%if %($(pkg-config emacs) ; echo $?) +%define emacs_version 21.4 +%define emacs_lispdir %{_datadir}/emacs/site-lisp +%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d +%else +%define emacs_version %(pkg-config emacs --modversion) +%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) +%define emacs_startdir %(pkg-config emacs --variable sitestartdir) +%endif + Name: vala Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern programming language for GNOME Group: Development/Languages @@ -8,9 +18,12 @@ License: LGPLv2+ and BSD URL: http://live.gnome.org/Vala Source0: http://download.gnome.org/sources/vala/0.3/vala-%{version}.tar.bz2 +Source1: vala-mode.el +Source2: vala-init.el BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel flex bison devhelp +BuildRequires: emacs emacs-el Requires: gtk2-devel %description @@ -44,6 +57,7 @@ This package contains development files for %{name}. This is not necessary for using the %{name} compiler. + %package tools Summary: Tools for creating projects and bindings for %{name} Group: Development/Languages @@ -62,6 +76,7 @@ This package contains tools to generate Vala projects, as well as API bindings from existing C libraries, allowing access from Vala programs. + %package doc Summary: Documentation for %{name} Group: Documentation @@ -81,6 +96,17 @@ This package contains documentation in a devhelp HTML book. +%package -n emacs-vala +Summary: Vala mode for Emacs +Group: Applications/Editors +License: GPLv2+ +Requires: emacs(bin) >= %{emacs_version} + + +%description -n emacs-vala +An Emacs mode for editing Vala source code. + + %prep %setup -q @@ -91,6 +117,9 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} +# Compile emacs module +mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} . +emacs -batch -f batch-byte-compile vala-mode.el %install @@ -98,6 +127,12 @@ make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libvala.la +# Emacs mode files +mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} +mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} +cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{emacs_lispdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -131,9 +166,17 @@ %defattr(-,root,root,-) %{_datadir}/devhelp/books/vala +%files -n emacs-vala +%defattr(-,root,root,-) +%{emacs_lispdir}/* +%{emacs_startdir}/* + %changelog +* Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 +- Add vala-mode for editing Vala code in Emacs + * Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 - Update to 0.3.4 From fedora-extras-commits at redhat.com Tue Jul 15 17:16:50 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 17:16:50 GMT Subject: rpms/vala/F-9 vala.spec,1.28,1.29 Message-ID: <200807151716.m6FHGot2013618@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322/F-9 Modified Files: vala.spec Log Message: * Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 - Add vala-mode for editing Vala code in Emacs Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/F-9/vala.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- vala.spec 5 Jul 2008 00:13:39 -0000 1.28 +++ vala.spec 15 Jul 2008 17:16:00 -0000 1.29 @@ -1,6 +1,16 @@ +%if %($(pkg-config emacs) ; echo $?) +%define emacs_version 22.2 +%define emacs_lispdir %{_datadir}/emacs/site-lisp +%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d +%else +%define emacs_version %(pkg-config emacs --modversion) +%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) +%define emacs_startdir %(pkg-config emacs --variable sitestartdir) +%endif + Name: vala Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern programming language for GNOME Group: Development/Languages @@ -8,9 +18,12 @@ License: LGPLv2+ and BSD URL: http://live.gnome.org/Vala Source0: http://download.gnome.org/sources/vala/0.3/vala-%{version}.tar.bz2 +Source1: vala-mode.el +Source2: vala-init.el BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel flex bison devhelp +BuildRequires: emacs emacs-el Requires: gtk2-devel %description @@ -44,6 +57,7 @@ This package contains development files for %{name}. This is not necessary for using the %{name} compiler. + %package tools Summary: Tools for creating projects and bindings for %{name} Group: Development/Languages @@ -62,6 +76,7 @@ This package contains tools to generate Vala projects, as well as API bindings from existing C libraries, allowing access from Vala programs. + %package doc Summary: Documentation for %{name} Group: Documentation @@ -81,6 +96,17 @@ This package contains documentation in a devhelp HTML book. +%package -n emacs-vala +Summary: Vala mode for Emacs +Group: Applications/Editors +License: GPLv2+ +Requires: emacs(bin) >= %{emacs_version} + + +%description -n emacs-vala +An Emacs mode for editing Vala source code. + + %prep %setup -q @@ -91,6 +117,9 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} +# Compile emacs module +mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} . +emacs -batch -f batch-byte-compile vala-mode.el %install @@ -98,6 +127,12 @@ make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libvala.la +# Emacs mode files +mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} +mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} +cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{emacs_lispdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -131,9 +166,17 @@ %defattr(-,root,root,-) %{_datadir}/devhelp/books/vala +%files -n emacs-vala +%defattr(-,root,root,-) +%{emacs_lispdir}/* +%{emacs_startdir}/* + %changelog +* Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 +- Add vala-mode for editing Vala code in Emacs + * Tue Jul 1 2008 Lennart Poettering - 0.3.4-1 - Update to 0.3.4 From fedora-extras-commits at redhat.com Tue Jul 15 17:17:59 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:17:59 GMT Subject: rpms/imake/devel imake.spec,1.30,1.31 Message-ID: <200807151717.m6FHHxsl013870@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/imake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13623 Modified Files: imake.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.2-7 - Fix license tag. Index: imake.spec =================================================================== RCS file: /cvs/pkgs/rpms/imake/devel/imake.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- imake.spec 19 Feb 2008 10:23:12 -0000 1.30 +++ imake.spec 15 Jul 2008 17:17:07 -0000 1.31 @@ -1,8 +1,8 @@ Summary: imake source code configuration and build system Name: imake Version: 1.0.2 -Release: 6%{?dist} -License: MIT/X11 +Release: 7%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -116,6 +116,9 @@ %{_mandir}/man1/xmkmf.1x* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.2-7 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:19:10 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Tue, 15 Jul 2008 17:19:10 GMT Subject: rpms/rpm/devel rpm-4.5.90-macroarg.patch, NONE, 1.1 rpm.spec, 1.286, 1.287 Message-ID: <200807151719.m6FHJA6A014135@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13911 Modified Files: rpm.spec Added Files: rpm-4.5.90-macroarg.patch Log Message: - macro arg handling tweaks to fix #455307 rpm-4.5.90-macroarg.patch: --- NEW FILE rpm-4.5.90-macroarg.patch --- diff --git a/rpmio/macro.c b/rpmio/macro.c index 14d4565..cc0638a 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -797,8 +797,10 @@ grabArgs(MacroBuf mb, const rpmMacroEntry me, const char * se, { ARGV_t av = NULL; char *s = xcalloc((lastc-se)+1, sizeof(*s)); - memmove(s, se, (lastc-se)); - ret = se + strlen(s) + 1; + /* XXX expandMacro() expects next \0 which can be beyond lastc */ + ret = strchr(se, '\0'); + memcpy(s, se, (lastc-se)); + argvSplit(&av, s, " "); argvAppend(&argv, av); Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- rpm.spec 14 Jul 2008 08:59:41 -0000 1.286 +++ rpm.spec 15 Jul 2008 17:18:17 -0000 1.287 @@ -18,7 +18,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.7 +Release: 0.%{snapver}.8 Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -34,6 +34,7 @@ # These are already upstream, drop on next snapshot update: Patch200: rpm-4.5.90-digestlen.patch Patch201: rpm-4.5.90-mono-magic.patch +Patch202: rpm-4.5.90-macroarg.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -163,6 +164,7 @@ %patch200 -p1 -b .diglen %patch201 -p1 -b .mono-magic +%patch202 -p1 -b .macroarg %if %{with int_bdb} ln -s db-%{bdbver} db @@ -338,6 +340,10 @@ %doc doc/librpm/html/* %changelog +* Tue Jul 15 2008 Panu Matilainen +- 4.5.90-0.git8426.8 +- fix regression in macro argument handling (#455333) + * Mon Jul 14 2008 Panu Matilainen - 4.5.90-0.git8426.7 - fix mono dependency extraction (adjust for libmagic string change) From fedora-extras-commits at redhat.com Tue Jul 15 17:20:24 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:20:24 GMT Subject: rpms/libFS/devel libFS.spec,1.30,1.31 sources,1.7,1.8 Message-ID: <200807151720.m6FHKOmg014331@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libFS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14154 Modified Files: libFS.spec sources Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.1-2 - Fix license tag. Index: libFS.spec =================================================================== RCS file: /cvs/pkgs/rpms/libFS/devel/libFS.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libFS.spec 20 Feb 2008 02:03:50 -0000 1.30 +++ libFS.spec 15 Jul 2008 17:19:31 -0000 1.31 @@ -1,8 +1,8 @@ Summary: X.Org X11 libFS runtime library Name: libFS -Version: 1.0.0 -Release: 7%{?dist} -License: MIT/X11 +Version: 1.0.1 +Release: 2%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 @@ -77,6 +77,12 @@ %{_libdir}/pkgconfig/libfs.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.1-2 +- Fix license tag. + +* Tue Jun 10 2008 Adam Jackson 1.0.1-1 +- libFS 1.0.1 + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.0-7 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libFS/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 Jan 2006 20:05:53 -0000 1.7 +++ sources 15 Jul 2008 17:19:31 -0000 1.8 @@ -1 +1 @@ -dfd5de47e232db0891410bec8ee6707b libFS-1.0.0.tar.bz2 +81521249353fa33be7a4bb0062c2fbb9 libFS-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 15 17:21:01 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 17:21:01 GMT Subject: rpms/vala/EL-5 vala-init.el,NONE,1.1 vala-mode.el,NONE,1.1 Message-ID: <200807151721.m6FHL1vs014433@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14386/EL-5 Added Files: vala-init.el vala-mode.el Log Message: * Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 - Add vala-mode for editing Vala code in Emacs --- NEW FILE vala-init.el --- ;; Register vala-mode (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) --- NEW FILE vala-mode.el --- ;;; vala-mode.el --- Vala mode derived mode ;; Author: 2005 Dylan R. E. Moonfire ;; 2008 ??tienne BERSAC ;; Maintainer: ??tienne BERSAC ;; Created: 2008 May the 4th ;; Modified: May 2008 ;; Version: 0.1 ;; Keywords: vala languages oop ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2 of the License, or ;; (at your option) any later version. ;; ;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; See http://live.gnome.org/Vala for details about Vala language. ;; ;; This is a separate mode to implement the Vala constructs and ;; font-locking. It is mostly the csharp-mode from ;; http://mfgames.com/linux/csharp-mode with vala specific keywords ;; and filename suffixes. ;; ;; Note: The interface used in this file requires CC Mode 5.30 or ;; later. ;;; .emacs (don't put in (require 'vala-mode)) ;; (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) ;; (setq auto-mode-alist ;; (append '(("\\.vala$" . vala-mode)) auto-mode-alist)) ;;; Versions: ;; ;; 0.1 : Initial version based on csharp-mode ;; ;; This is a copy of the function in cc-mode which is used to handle ;; the eval-when-compile which is needed during other times. (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate) ;; See cc-langs.el, a direct copy. (unless (listp (car-safe ops)) (setq ops (list ops))) (cond ((eq opgroup-filter t) (setq opgroup-filter (lambda (opgroup) t))) ((not (functionp opgroup-filter)) (setq opgroup-filter `(lambda (opgroup) (memq opgroup ',opgroup-filter))))) (cond ((eq op-filter t) (setq op-filter (lambda (op) t))) ((stringp op-filter) (setq op-filter `(lambda (op) (string-match ,op-filter op))))) (unless xlate (setq xlate 'identity)) (c-with-syntax-table (c-lang-const c-mode-syntax-table) (delete-duplicates (mapcan (lambda (opgroup) (when (if (symbolp (car opgroup)) (when (funcall opgroup-filter (car opgroup)) (setq opgroup (cdr opgroup)) t) t) (mapcan (lambda (op) (when (funcall op-filter op) (let ((res (funcall xlate op))) (if (listp res) res (list res))))) opgroup))) ops) :test 'equal))) ;; This inserts the bulk of the code. (require 'cc-mode) ;; These are only required at compile time to get the sources for the ;; language constants. (The cc-fonts require and the font-lock ;; related constants could additionally be put inside an ;; (eval-after-load "font-lock" ...) but then some trickery is ;; necessary to get them compiled.) (eval-when-compile (let ((load-path (if (and (boundp 'byte-compile-dest-file) (stringp byte-compile-dest-file)) (cons (file-name-directory byte-compile-dest-file) load-path) load-path))) (load "cc-mode" nil t) (load "cc-fonts" nil t) (load "cc-langs" nil t))) (eval-and-compile ;; Make our mode known to the language constant system. Use Java ;; mode as the fallback for the constants we don't change here. ;; This needs to be done also at compile time since the language ;; constants are evaluated then. (c-add-language 'vala-mode 'java-mode)) ;; Java uses a series of regexes to change the font-lock for class ;; references. The problem comes in because Java uses Pascal (leading ;; space in names, SomeClass) for class and package names, but ;; Camel-casing (initial lowercase, upper case in words, ;; i.e. someVariable) for variables. ;;(error (byte-compile-dest-file)) ;;(error (c-get-current-file)) (c-lang-defconst c-opt-after-id-concat-key vala (if (c-lang-const c-opt-identifier-concat-key) (c-lang-const c-symbol-start))) (c-lang-defconst c-basic-matchers-before vala `( ;;;; Font-lock the attributes by searching for the ;;;; appropriate regex and marking it as TODO. ;;,`(,(concat "\\(" vala-attribute-regex "\\)") ;; 0 font-lock-function-name-face) ;; Put a warning face on the opener of unclosed strings that ;; can't span lines. Later font ;; lock packages have a `font-lock-syntactic-face-function' for ;; this, but it doesn't give the control we want since any ;; fontification done inside the function will be ;; unconditionally overridden. ,(c-make-font-lock-search-function ;; Match a char before the string starter to make ;; `c-skip-comments-and-strings' work correctly. (concat ".\\(" c-string-limit-regexp "\\)") '((c-font-lock-invalid-string))) ;; Fontify keyword constants. ,@(when (c-lang-const c-constant-kwds) (let ((re (c-make-keywords-re nil (c-lang-const c-constant-kwds)))) `((eval . (list ,(concat "\\<\\(" re "\\)\\>") 1 c-constant-face-name))))) ;; Fontify all keywords except the primitive types. ,`(,(concat "\\<" (c-lang-const c-regular-keywords-regexp)) 1 font-lock-keyword-face) ;; Fontify leading identifiers in fully ;; qualified names like "Foo.Bar". ,@(when (c-lang-const c-opt-identifier-concat-key) `((,(byte-compile `(lambda (limit) (while (re-search-forward ,(concat "\\(\\<" ; 1 "\\(" (c-lang-const c-symbol-key) "\\)" ; 2 "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" "\\)" "\\(" (c-lang-const c-opt-after-id-concat-key) "\\)") limit t) (unless (progn (goto-char (match-beginning 0)) (c-skip-comments-and-strings limit)) (or (get-text-property (match-beginning 2) 'face) (c-put-font-lock-face (match-beginning 2) (match-end 2) c-reference-face-name)) (goto-char (match-end 1))))))))) )) ;; Vala does not allow a leading qualifier operator. It also doesn't ;; allow the ".*" construct of Java. So, we redo this regex without ;; the "\\|\\*" regex. (c-lang-defconst c-identifier-key vala (concat "\\(" (c-lang-const c-symbol-key) "\\)" ; 1 (concat "\\(" "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" (concat "\\(" "\\(" (c-lang-const c-symbol-key) "\\)" "\\)") "\\)*"))) ;; Vala has a few rules that are slightly different than Java for ;; operators. This also removed the Java's "super" and replaces it ;; with the Vala's "base". (c-lang-defconst c-operators vala `((prefix "base"))) ;; Vala directives ? ;; (c-lang-defconst c-opt-cpp-prefix ;; csharp "^\\s *#.*") ;; Vala uses the following assignment operators (c-lang-defconst c-assignment-operators vala '("=" "*=" "/=" "%=" "+=" "-=" ">>=" "<<=" "&=" "^=" "|=" "++" "--")) ;; This defines the primative types for Vala (c-lang-defconst c-primitive-type-kwds vala '("void" "char" "int" "float" "double" "string")) ;; The keywords that define that the following is a type, such as a ;; class definition. (c-lang-defconst c-type-prefix-kwds vala '("class" "interface" "struct" "enum" "signal")) ;; Type modifier keywords. They appear anywhere in types, but modifiy ;; instead create one. (c-lang-defconst c-type-modifier-kwds vala '("const")) ;; Structures that are similiar to classes. (c-lang-defconst c-class-decl-kwds vala '("class" "interface")) ;; The various modifiers used for class and method descriptions. (c-lang-defconst c-modifier-kwds vala '("public" "partial" "private" "const" "abstract" "protected" "ref" "in" "out" "static" "virtual" "override" "params" "internal")) ;; We don't use the protection level stuff because it breaks the ;; method indenting. Not sure why, though. (c-lang-defconst c-protection-kwds vala nil) ;; Define the keywords that can have something following after them. (c-lang-defconst c-type-list-kwds vala '("struct" "class" "interface" "is" "as" "delegate" "event" "set" "get" "add" "remove" "callback" "signal" "var" "default")) ;; This allows the classes after the : in the class declartion to be ;; fontified. (c-lang-defconst c-typeless-decl-kwds vala '(":")) ;; Sets up the enum to handle the list properly (c-lang-defconst c-brace-list-decl-kwds vala '("enum")) ;; We need to remove Java's package keyword (c-lang-defconst c-ref-list-kwds vala '("using" "namespace")) ;; Follow-on blocks that don't require a brace (c-lang-defconst c-block-stmt-2-kwds vala '("for" "if" "switch" "while" "catch" "foreach" "lock")) ;; Statements that break out of braces (c-lang-defconst c-simple-stmt-kwds vala '("return" "continue" "break" "throw")) ;; Statements that allow a label ;; TODO? (c-lang-defconst c-before-label-kwds vala nil) ;; Constant keywords (c-lang-defconst c-constant-kwds vala '("true" "false" "null")) ;; Keywords that start "primary expressions." (c-lang-defconst c-primary-expr-kwds vala '("this" "base")) ;; We need to treat namespace as an outer block to class indenting ;; works properly. (c-lang-defconst c-other-block-decl-kwds vala '("namespace")) ;; We need to include the "in" for the foreach (c-lang-defconst c-other-kwds vala '("in" "sizeof" "typeof")) (require 'cc-awk) (c-lang-defconst c-at-vsemi-p-fn vala 'c-awk-at-vsemi-p) (defcustom vala-font-lock-extra-types nil "*List of extra types (aside from the type keywords) to recognize in Vala mode. Each list item should be a regexp matching a single identifier.") (defconst vala-font-lock-keywords-1 (c-lang-const c-matchers-1 vala) "Minimal highlighting for Vala mode.") (defconst vala-font-lock-keywords-2 (c-lang-const c-matchers-2 vala) "Fast normal highlighting for Vala mode.") (defconst vala-font-lock-keywords-3 (c-lang-const c-matchers-3 vala) "Accurate normal highlighting for Vala mode.") (defvar vala-font-lock-keywords vala-font-lock-keywords-3 "Default expressions to highlight in Vala mode.") (defvar vala-mode-syntax-table nil "Syntax table used in vala-mode buffers.") (or vala-mode-syntax-table (setq vala-mode-syntax-table (funcall (c-lang-const c-make-mode-syntax-table vala)))) (defvar vala-mode-abbrev-table nil "Abbreviation table used in vala-mode buffers.") (c-define-abbrev-table 'vala-mode-abbrev-table ;; Keywords that if they occur first on a line ;; might alter the syntactic context, and which ;; therefore should trig reindentation when ;; they are completed. '(("else" "else" c-electric-continued-statement 0) ("while" "while" c-electric-continued-statement 0) ("catch" "catch" c-electric-continued-statement 0) ("finally" "finally" c-electric-continued-statement 0))) (defvar vala-mode-map (let ((map (c-make-inherited-keymap))) ;; Add bindings which are only useful for Vala map) "Keymap used in vala-mode buffers.") ;;(easy-menu-define vala-menu vala-mode-map "Vala Mode Commands" ;; ;; Can use `vala' as the language for `c-mode-menu' ;; ;; since its definition covers any language. In ;; ;; this case the language is used to adapt to the ;; ;; nonexistence of a cpp pass and thus removing some ;; ;; irrelevant menu alternatives. ;; (cons "Vala" (c-lang-const c-mode-menu vala))) ;;; Autoload mode trigger (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) ;; Custom variables (defcustom vala-mode-hook nil "*Hook called by `vala-mode'." :type 'hook :group 'c) ;;; The entry point into the mode ;;;###autoload (defun vala-mode () "Major mode for editing Vala code. This is a simple example of a separate mode derived from CC Mode to support a language with syntax similar to C#/C/C++/ObjC/Java/IDL/Pike. The hook `c-mode-common-hook' is run with no args at mode initialization, then `vala-mode-hook'. Key bindings: \\{vala-mode-map}" (interactive) (kill-all-local-variables) (c-initialize-cc-mode t) (set-syntax-table vala-mode-syntax-table) (setq major-mode 'vala-mode mode-name "Vala" local-abbrev-table vala-mode-abbrev-table abbrev-mode t) (use-local-map c-mode-map) ;; `c-init-language-vars' is a macro that is expanded at compile ;; time to a large `setq' with all the language variables and their ;; customized values for our language. (c-init-language-vars vala-mode) ;; `c-common-init' initializes most of the components of a CC Mode ;; buffer, including setup of the mode menu, font-lock, etc. ;; There's also a lower level routine `c-basic-common-init' that ;; only makes the necessary initialization to get the syntactic ;; analysis and similar things working. (c-common-init 'vala-mode) ;;(easy-menu-add vala-menu) (c-set-style "linux") (setq indent-tabs-mode t) (setq c-basic-offset 4) (setq tab-width 4) (c-toggle-auto-newline -1) (c-toggle-hungry-state -1) (run-hooks 'c-mode-common-hook) (run-hooks 'vala-mode-hook) (c-update-modeline)) (provide 'vala-mode) ;;; vala-mode.el ends here From fedora-extras-commits at redhat.com Tue Jul 15 17:21:31 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 17:21:31 GMT Subject: rpms/vala/F-8 vala-init.el,NONE,1.1 vala-mode.el,NONE,1.1 Message-ID: <200807151721.m6FHLVHg014537@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14386/F-8 Added Files: vala-init.el vala-mode.el Log Message: * Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 - Add vala-mode for editing Vala code in Emacs --- NEW FILE vala-init.el --- ;; Register vala-mode (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) --- NEW FILE vala-mode.el --- ;;; vala-mode.el --- Vala mode derived mode ;; Author: 2005 Dylan R. E. Moonfire ;; 2008 ??tienne BERSAC ;; Maintainer: ??tienne BERSAC ;; Created: 2008 May the 4th ;; Modified: May 2008 ;; Version: 0.1 ;; Keywords: vala languages oop ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2 of the License, or ;; (at your option) any later version. ;; ;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; See http://live.gnome.org/Vala for details about Vala language. ;; ;; This is a separate mode to implement the Vala constructs and ;; font-locking. It is mostly the csharp-mode from ;; http://mfgames.com/linux/csharp-mode with vala specific keywords ;; and filename suffixes. ;; ;; Note: The interface used in this file requires CC Mode 5.30 or ;; later. ;;; .emacs (don't put in (require 'vala-mode)) ;; (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) ;; (setq auto-mode-alist ;; (append '(("\\.vala$" . vala-mode)) auto-mode-alist)) ;;; Versions: ;; ;; 0.1 : Initial version based on csharp-mode ;; ;; This is a copy of the function in cc-mode which is used to handle ;; the eval-when-compile which is needed during other times. (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate) ;; See cc-langs.el, a direct copy. (unless (listp (car-safe ops)) (setq ops (list ops))) (cond ((eq opgroup-filter t) (setq opgroup-filter (lambda (opgroup) t))) ((not (functionp opgroup-filter)) (setq opgroup-filter `(lambda (opgroup) (memq opgroup ',opgroup-filter))))) (cond ((eq op-filter t) (setq op-filter (lambda (op) t))) ((stringp op-filter) (setq op-filter `(lambda (op) (string-match ,op-filter op))))) (unless xlate (setq xlate 'identity)) (c-with-syntax-table (c-lang-const c-mode-syntax-table) (delete-duplicates (mapcan (lambda (opgroup) (when (if (symbolp (car opgroup)) (when (funcall opgroup-filter (car opgroup)) (setq opgroup (cdr opgroup)) t) t) (mapcan (lambda (op) (when (funcall op-filter op) (let ((res (funcall xlate op))) (if (listp res) res (list res))))) opgroup))) ops) :test 'equal))) ;; This inserts the bulk of the code. (require 'cc-mode) ;; These are only required at compile time to get the sources for the ;; language constants. (The cc-fonts require and the font-lock ;; related constants could additionally be put inside an ;; (eval-after-load "font-lock" ...) but then some trickery is ;; necessary to get them compiled.) (eval-when-compile (let ((load-path (if (and (boundp 'byte-compile-dest-file) (stringp byte-compile-dest-file)) (cons (file-name-directory byte-compile-dest-file) load-path) load-path))) (load "cc-mode" nil t) (load "cc-fonts" nil t) (load "cc-langs" nil t))) (eval-and-compile ;; Make our mode known to the language constant system. Use Java ;; mode as the fallback for the constants we don't change here. ;; This needs to be done also at compile time since the language ;; constants are evaluated then. (c-add-language 'vala-mode 'java-mode)) ;; Java uses a series of regexes to change the font-lock for class ;; references. The problem comes in because Java uses Pascal (leading ;; space in names, SomeClass) for class and package names, but ;; Camel-casing (initial lowercase, upper case in words, ;; i.e. someVariable) for variables. ;;(error (byte-compile-dest-file)) ;;(error (c-get-current-file)) (c-lang-defconst c-opt-after-id-concat-key vala (if (c-lang-const c-opt-identifier-concat-key) (c-lang-const c-symbol-start))) (c-lang-defconst c-basic-matchers-before vala `( ;;;; Font-lock the attributes by searching for the ;;;; appropriate regex and marking it as TODO. ;;,`(,(concat "\\(" vala-attribute-regex "\\)") ;; 0 font-lock-function-name-face) ;; Put a warning face on the opener of unclosed strings that ;; can't span lines. Later font ;; lock packages have a `font-lock-syntactic-face-function' for ;; this, but it doesn't give the control we want since any ;; fontification done inside the function will be ;; unconditionally overridden. ,(c-make-font-lock-search-function ;; Match a char before the string starter to make ;; `c-skip-comments-and-strings' work correctly. (concat ".\\(" c-string-limit-regexp "\\)") '((c-font-lock-invalid-string))) ;; Fontify keyword constants. ,@(when (c-lang-const c-constant-kwds) (let ((re (c-make-keywords-re nil (c-lang-const c-constant-kwds)))) `((eval . (list ,(concat "\\<\\(" re "\\)\\>") 1 c-constant-face-name))))) ;; Fontify all keywords except the primitive types. ,`(,(concat "\\<" (c-lang-const c-regular-keywords-regexp)) 1 font-lock-keyword-face) ;; Fontify leading identifiers in fully ;; qualified names like "Foo.Bar". ,@(when (c-lang-const c-opt-identifier-concat-key) `((,(byte-compile `(lambda (limit) (while (re-search-forward ,(concat "\\(\\<" ; 1 "\\(" (c-lang-const c-symbol-key) "\\)" ; 2 "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" "\\)" "\\(" (c-lang-const c-opt-after-id-concat-key) "\\)") limit t) (unless (progn (goto-char (match-beginning 0)) (c-skip-comments-and-strings limit)) (or (get-text-property (match-beginning 2) 'face) (c-put-font-lock-face (match-beginning 2) (match-end 2) c-reference-face-name)) (goto-char (match-end 1))))))))) )) ;; Vala does not allow a leading qualifier operator. It also doesn't ;; allow the ".*" construct of Java. So, we redo this regex without ;; the "\\|\\*" regex. (c-lang-defconst c-identifier-key vala (concat "\\(" (c-lang-const c-symbol-key) "\\)" ; 1 (concat "\\(" "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" (concat "\\(" "\\(" (c-lang-const c-symbol-key) "\\)" "\\)") "\\)*"))) ;; Vala has a few rules that are slightly different than Java for ;; operators. This also removed the Java's "super" and replaces it ;; with the Vala's "base". (c-lang-defconst c-operators vala `((prefix "base"))) ;; Vala directives ? ;; (c-lang-defconst c-opt-cpp-prefix ;; csharp "^\\s *#.*") ;; Vala uses the following assignment operators (c-lang-defconst c-assignment-operators vala '("=" "*=" "/=" "%=" "+=" "-=" ">>=" "<<=" "&=" "^=" "|=" "++" "--")) ;; This defines the primative types for Vala (c-lang-defconst c-primitive-type-kwds vala '("void" "char" "int" "float" "double" "string")) ;; The keywords that define that the following is a type, such as a ;; class definition. (c-lang-defconst c-type-prefix-kwds vala '("class" "interface" "struct" "enum" "signal")) ;; Type modifier keywords. They appear anywhere in types, but modifiy ;; instead create one. (c-lang-defconst c-type-modifier-kwds vala '("const")) ;; Structures that are similiar to classes. (c-lang-defconst c-class-decl-kwds vala '("class" "interface")) ;; The various modifiers used for class and method descriptions. (c-lang-defconst c-modifier-kwds vala '("public" "partial" "private" "const" "abstract" "protected" "ref" "in" "out" "static" "virtual" "override" "params" "internal")) ;; We don't use the protection level stuff because it breaks the ;; method indenting. Not sure why, though. (c-lang-defconst c-protection-kwds vala nil) ;; Define the keywords that can have something following after them. (c-lang-defconst c-type-list-kwds vala '("struct" "class" "interface" "is" "as" "delegate" "event" "set" "get" "add" "remove" "callback" "signal" "var" "default")) ;; This allows the classes after the : in the class declartion to be ;; fontified. (c-lang-defconst c-typeless-decl-kwds vala '(":")) ;; Sets up the enum to handle the list properly (c-lang-defconst c-brace-list-decl-kwds vala '("enum")) ;; We need to remove Java's package keyword (c-lang-defconst c-ref-list-kwds vala '("using" "namespace")) ;; Follow-on blocks that don't require a brace (c-lang-defconst c-block-stmt-2-kwds vala '("for" "if" "switch" "while" "catch" "foreach" "lock")) ;; Statements that break out of braces (c-lang-defconst c-simple-stmt-kwds vala '("return" "continue" "break" "throw")) ;; Statements that allow a label ;; TODO? (c-lang-defconst c-before-label-kwds vala nil) ;; Constant keywords (c-lang-defconst c-constant-kwds vala '("true" "false" "null")) ;; Keywords that start "primary expressions." (c-lang-defconst c-primary-expr-kwds vala '("this" "base")) ;; We need to treat namespace as an outer block to class indenting ;; works properly. (c-lang-defconst c-other-block-decl-kwds vala '("namespace")) ;; We need to include the "in" for the foreach (c-lang-defconst c-other-kwds vala '("in" "sizeof" "typeof")) (require 'cc-awk) (c-lang-defconst c-at-vsemi-p-fn vala 'c-awk-at-vsemi-p) (defcustom vala-font-lock-extra-types nil "*List of extra types (aside from the type keywords) to recognize in Vala mode. Each list item should be a regexp matching a single identifier.") (defconst vala-font-lock-keywords-1 (c-lang-const c-matchers-1 vala) "Minimal highlighting for Vala mode.") (defconst vala-font-lock-keywords-2 (c-lang-const c-matchers-2 vala) "Fast normal highlighting for Vala mode.") (defconst vala-font-lock-keywords-3 (c-lang-const c-matchers-3 vala) "Accurate normal highlighting for Vala mode.") (defvar vala-font-lock-keywords vala-font-lock-keywords-3 "Default expressions to highlight in Vala mode.") (defvar vala-mode-syntax-table nil "Syntax table used in vala-mode buffers.") (or vala-mode-syntax-table (setq vala-mode-syntax-table (funcall (c-lang-const c-make-mode-syntax-table vala)))) (defvar vala-mode-abbrev-table nil "Abbreviation table used in vala-mode buffers.") (c-define-abbrev-table 'vala-mode-abbrev-table ;; Keywords that if they occur first on a line ;; might alter the syntactic context, and which ;; therefore should trig reindentation when ;; they are completed. '(("else" "else" c-electric-continued-statement 0) ("while" "while" c-electric-continued-statement 0) ("catch" "catch" c-electric-continued-statement 0) ("finally" "finally" c-electric-continued-statement 0))) (defvar vala-mode-map (let ((map (c-make-inherited-keymap))) ;; Add bindings which are only useful for Vala map) "Keymap used in vala-mode buffers.") ;;(easy-menu-define vala-menu vala-mode-map "Vala Mode Commands" ;; ;; Can use `vala' as the language for `c-mode-menu' ;; ;; since its definition covers any language. In ;; ;; this case the language is used to adapt to the ;; ;; nonexistence of a cpp pass and thus removing some ;; ;; irrelevant menu alternatives. ;; (cons "Vala" (c-lang-const c-mode-menu vala))) ;;; Autoload mode trigger (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) ;; Custom variables (defcustom vala-mode-hook nil "*Hook called by `vala-mode'." :type 'hook :group 'c) ;;; The entry point into the mode ;;;###autoload (defun vala-mode () "Major mode for editing Vala code. This is a simple example of a separate mode derived from CC Mode to support a language with syntax similar to C#/C/C++/ObjC/Java/IDL/Pike. The hook `c-mode-common-hook' is run with no args at mode initialization, then `vala-mode-hook'. Key bindings: \\{vala-mode-map}" (interactive) (kill-all-local-variables) (c-initialize-cc-mode t) (set-syntax-table vala-mode-syntax-table) (setq major-mode 'vala-mode mode-name "Vala" local-abbrev-table vala-mode-abbrev-table abbrev-mode t) (use-local-map c-mode-map) ;; `c-init-language-vars' is a macro that is expanded at compile ;; time to a large `setq' with all the language variables and their ;; customized values for our language. (c-init-language-vars vala-mode) ;; `c-common-init' initializes most of the components of a CC Mode ;; buffer, including setup of the mode menu, font-lock, etc. ;; There's also a lower level routine `c-basic-common-init' that ;; only makes the necessary initialization to get the syntactic ;; analysis and similar things working. (c-common-init 'vala-mode) ;;(easy-menu-add vala-menu) (c-set-style "linux") (setq indent-tabs-mode t) (setq c-basic-offset 4) (setq tab-width 4) (c-toggle-auto-newline -1) (c-toggle-hungry-state -1) (run-hooks 'c-mode-common-hook) (run-hooks 'vala-mode-hook) (c-update-modeline)) (provide 'vala-mode) ;;; vala-mode.el ends here From fedora-extras-commits at redhat.com Tue Jul 15 17:22:08 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 15 Jul 2008 17:22:08 GMT Subject: rpms/vala/F-9 vala-init.el,NONE,1.1 vala-mode.el,NONE,1.1 Message-ID: <200807151722.m6FHM8EW014662@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14386/F-9 Added Files: vala-init.el vala-mode.el Log Message: * Tue Jul 15 2008 Michel Alexandre Salim - 0.3.4-2 - Add vala-mode for editing Vala code in Emacs --- NEW FILE vala-init.el --- ;; Register vala-mode (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) --- NEW FILE vala-mode.el --- ;;; vala-mode.el --- Vala mode derived mode ;; Author: 2005 Dylan R. E. Moonfire ;; 2008 ??tienne BERSAC ;; Maintainer: ??tienne BERSAC ;; Created: 2008 May the 4th ;; Modified: May 2008 ;; Version: 0.1 ;; Keywords: vala languages oop ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2 of the License, or ;; (at your option) any later version. ;; ;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; See http://live.gnome.org/Vala for details about Vala language. ;; ;; This is a separate mode to implement the Vala constructs and ;; font-locking. It is mostly the csharp-mode from ;; http://mfgames.com/linux/csharp-mode with vala specific keywords ;; and filename suffixes. ;; ;; Note: The interface used in this file requires CC Mode 5.30 or ;; later. ;;; .emacs (don't put in (require 'vala-mode)) ;; (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) ;; (setq auto-mode-alist ;; (append '(("\\.vala$" . vala-mode)) auto-mode-alist)) ;;; Versions: ;; ;; 0.1 : Initial version based on csharp-mode ;; ;; This is a copy of the function in cc-mode which is used to handle ;; the eval-when-compile which is needed during other times. (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate) ;; See cc-langs.el, a direct copy. (unless (listp (car-safe ops)) (setq ops (list ops))) (cond ((eq opgroup-filter t) (setq opgroup-filter (lambda (opgroup) t))) ((not (functionp opgroup-filter)) (setq opgroup-filter `(lambda (opgroup) (memq opgroup ',opgroup-filter))))) (cond ((eq op-filter t) (setq op-filter (lambda (op) t))) ((stringp op-filter) (setq op-filter `(lambda (op) (string-match ,op-filter op))))) (unless xlate (setq xlate 'identity)) (c-with-syntax-table (c-lang-const c-mode-syntax-table) (delete-duplicates (mapcan (lambda (opgroup) (when (if (symbolp (car opgroup)) (when (funcall opgroup-filter (car opgroup)) (setq opgroup (cdr opgroup)) t) t) (mapcan (lambda (op) (when (funcall op-filter op) (let ((res (funcall xlate op))) (if (listp res) res (list res))))) opgroup))) ops) :test 'equal))) ;; This inserts the bulk of the code. (require 'cc-mode) ;; These are only required at compile time to get the sources for the ;; language constants. (The cc-fonts require and the font-lock ;; related constants could additionally be put inside an ;; (eval-after-load "font-lock" ...) but then some trickery is ;; necessary to get them compiled.) (eval-when-compile (let ((load-path (if (and (boundp 'byte-compile-dest-file) (stringp byte-compile-dest-file)) (cons (file-name-directory byte-compile-dest-file) load-path) load-path))) (load "cc-mode" nil t) (load "cc-fonts" nil t) (load "cc-langs" nil t))) (eval-and-compile ;; Make our mode known to the language constant system. Use Java ;; mode as the fallback for the constants we don't change here. ;; This needs to be done also at compile time since the language ;; constants are evaluated then. (c-add-language 'vala-mode 'java-mode)) ;; Java uses a series of regexes to change the font-lock for class ;; references. The problem comes in because Java uses Pascal (leading ;; space in names, SomeClass) for class and package names, but ;; Camel-casing (initial lowercase, upper case in words, ;; i.e. someVariable) for variables. ;;(error (byte-compile-dest-file)) ;;(error (c-get-current-file)) (c-lang-defconst c-opt-after-id-concat-key vala (if (c-lang-const c-opt-identifier-concat-key) (c-lang-const c-symbol-start))) (c-lang-defconst c-basic-matchers-before vala `( ;;;; Font-lock the attributes by searching for the ;;;; appropriate regex and marking it as TODO. ;;,`(,(concat "\\(" vala-attribute-regex "\\)") ;; 0 font-lock-function-name-face) ;; Put a warning face on the opener of unclosed strings that ;; can't span lines. Later font ;; lock packages have a `font-lock-syntactic-face-function' for ;; this, but it doesn't give the control we want since any ;; fontification done inside the function will be ;; unconditionally overridden. ,(c-make-font-lock-search-function ;; Match a char before the string starter to make ;; `c-skip-comments-and-strings' work correctly. (concat ".\\(" c-string-limit-regexp "\\)") '((c-font-lock-invalid-string))) ;; Fontify keyword constants. ,@(when (c-lang-const c-constant-kwds) (let ((re (c-make-keywords-re nil (c-lang-const c-constant-kwds)))) `((eval . (list ,(concat "\\<\\(" re "\\)\\>") 1 c-constant-face-name))))) ;; Fontify all keywords except the primitive types. ,`(,(concat "\\<" (c-lang-const c-regular-keywords-regexp)) 1 font-lock-keyword-face) ;; Fontify leading identifiers in fully ;; qualified names like "Foo.Bar". ,@(when (c-lang-const c-opt-identifier-concat-key) `((,(byte-compile `(lambda (limit) (while (re-search-forward ,(concat "\\(\\<" ; 1 "\\(" (c-lang-const c-symbol-key) "\\)" ; 2 "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" "\\)" "\\(" (c-lang-const c-opt-after-id-concat-key) "\\)") limit t) (unless (progn (goto-char (match-beginning 0)) (c-skip-comments-and-strings limit)) (or (get-text-property (match-beginning 2) 'face) (c-put-font-lock-face (match-beginning 2) (match-end 2) c-reference-face-name)) (goto-char (match-end 1))))))))) )) ;; Vala does not allow a leading qualifier operator. It also doesn't ;; allow the ".*" construct of Java. So, we redo this regex without ;; the "\\|\\*" regex. (c-lang-defconst c-identifier-key vala (concat "\\(" (c-lang-const c-symbol-key) "\\)" ; 1 (concat "\\(" "[ \t\n\r\f\v]*" (c-lang-const c-opt-identifier-concat-key) "[ \t\n\r\f\v]*" (concat "\\(" "\\(" (c-lang-const c-symbol-key) "\\)" "\\)") "\\)*"))) ;; Vala has a few rules that are slightly different than Java for ;; operators. This also removed the Java's "super" and replaces it ;; with the Vala's "base". (c-lang-defconst c-operators vala `((prefix "base"))) ;; Vala directives ? ;; (c-lang-defconst c-opt-cpp-prefix ;; csharp "^\\s *#.*") ;; Vala uses the following assignment operators (c-lang-defconst c-assignment-operators vala '("=" "*=" "/=" "%=" "+=" "-=" ">>=" "<<=" "&=" "^=" "|=" "++" "--")) ;; This defines the primative types for Vala (c-lang-defconst c-primitive-type-kwds vala '("void" "char" "int" "float" "double" "string")) ;; The keywords that define that the following is a type, such as a ;; class definition. (c-lang-defconst c-type-prefix-kwds vala '("class" "interface" "struct" "enum" "signal")) ;; Type modifier keywords. They appear anywhere in types, but modifiy ;; instead create one. (c-lang-defconst c-type-modifier-kwds vala '("const")) ;; Structures that are similiar to classes. (c-lang-defconst c-class-decl-kwds vala '("class" "interface")) ;; The various modifiers used for class and method descriptions. (c-lang-defconst c-modifier-kwds vala '("public" "partial" "private" "const" "abstract" "protected" "ref" "in" "out" "static" "virtual" "override" "params" "internal")) ;; We don't use the protection level stuff because it breaks the ;; method indenting. Not sure why, though. (c-lang-defconst c-protection-kwds vala nil) ;; Define the keywords that can have something following after them. (c-lang-defconst c-type-list-kwds vala '("struct" "class" "interface" "is" "as" "delegate" "event" "set" "get" "add" "remove" "callback" "signal" "var" "default")) ;; This allows the classes after the : in the class declartion to be ;; fontified. (c-lang-defconst c-typeless-decl-kwds vala '(":")) ;; Sets up the enum to handle the list properly (c-lang-defconst c-brace-list-decl-kwds vala '("enum")) ;; We need to remove Java's package keyword (c-lang-defconst c-ref-list-kwds vala '("using" "namespace")) ;; Follow-on blocks that don't require a brace (c-lang-defconst c-block-stmt-2-kwds vala '("for" "if" "switch" "while" "catch" "foreach" "lock")) ;; Statements that break out of braces (c-lang-defconst c-simple-stmt-kwds vala '("return" "continue" "break" "throw")) ;; Statements that allow a label ;; TODO? (c-lang-defconst c-before-label-kwds vala nil) ;; Constant keywords (c-lang-defconst c-constant-kwds vala '("true" "false" "null")) ;; Keywords that start "primary expressions." (c-lang-defconst c-primary-expr-kwds vala '("this" "base")) ;; We need to treat namespace as an outer block to class indenting ;; works properly. (c-lang-defconst c-other-block-decl-kwds vala '("namespace")) ;; We need to include the "in" for the foreach (c-lang-defconst c-other-kwds vala '("in" "sizeof" "typeof")) (require 'cc-awk) (c-lang-defconst c-at-vsemi-p-fn vala 'c-awk-at-vsemi-p) (defcustom vala-font-lock-extra-types nil "*List of extra types (aside from the type keywords) to recognize in Vala mode. Each list item should be a regexp matching a single identifier.") (defconst vala-font-lock-keywords-1 (c-lang-const c-matchers-1 vala) "Minimal highlighting for Vala mode.") (defconst vala-font-lock-keywords-2 (c-lang-const c-matchers-2 vala) "Fast normal highlighting for Vala mode.") (defconst vala-font-lock-keywords-3 (c-lang-const c-matchers-3 vala) "Accurate normal highlighting for Vala mode.") (defvar vala-font-lock-keywords vala-font-lock-keywords-3 "Default expressions to highlight in Vala mode.") (defvar vala-mode-syntax-table nil "Syntax table used in vala-mode buffers.") (or vala-mode-syntax-table (setq vala-mode-syntax-table (funcall (c-lang-const c-make-mode-syntax-table vala)))) (defvar vala-mode-abbrev-table nil "Abbreviation table used in vala-mode buffers.") (c-define-abbrev-table 'vala-mode-abbrev-table ;; Keywords that if they occur first on a line ;; might alter the syntactic context, and which ;; therefore should trig reindentation when ;; they are completed. '(("else" "else" c-electric-continued-statement 0) ("while" "while" c-electric-continued-statement 0) ("catch" "catch" c-electric-continued-statement 0) ("finally" "finally" c-electric-continued-statement 0))) (defvar vala-mode-map (let ((map (c-make-inherited-keymap))) ;; Add bindings which are only useful for Vala map) "Keymap used in vala-mode buffers.") ;;(easy-menu-define vala-menu vala-mode-map "Vala Mode Commands" ;; ;; Can use `vala' as the language for `c-mode-menu' ;; ;; since its definition covers any language. In ;; ;; this case the language is used to adapt to the ;; ;; nonexistence of a cpp pass and thus removing some ;; ;; irrelevant menu alternatives. ;; (cons "Vala" (c-lang-const c-mode-menu vala))) ;;; Autoload mode trigger (add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) ;; Custom variables (defcustom vala-mode-hook nil "*Hook called by `vala-mode'." :type 'hook :group 'c) ;;; The entry point into the mode ;;;###autoload (defun vala-mode () "Major mode for editing Vala code. This is a simple example of a separate mode derived from CC Mode to support a language with syntax similar to C#/C/C++/ObjC/Java/IDL/Pike. The hook `c-mode-common-hook' is run with no args at mode initialization, then `vala-mode-hook'. Key bindings: \\{vala-mode-map}" (interactive) (kill-all-local-variables) (c-initialize-cc-mode t) (set-syntax-table vala-mode-syntax-table) (setq major-mode 'vala-mode mode-name "Vala" local-abbrev-table vala-mode-abbrev-table abbrev-mode t) (use-local-map c-mode-map) ;; `c-init-language-vars' is a macro that is expanded at compile ;; time to a large `setq' with all the language variables and their ;; customized values for our language. (c-init-language-vars vala-mode) ;; `c-common-init' initializes most of the components of a CC Mode ;; buffer, including setup of the mode menu, font-lock, etc. ;; There's also a lower level routine `c-basic-common-init' that ;; only makes the necessary initialization to get the syntactic ;; analysis and similar things working. (c-common-init 'vala-mode) ;;(easy-menu-add vala-menu) (c-set-style "linux") (setq indent-tabs-mode t) (setq c-basic-offset 4) (setq tab-width 4) (c-toggle-auto-newline -1) (c-toggle-hungry-state -1) (run-hooks 'c-mode-common-hook) (run-hooks 'vala-mode-hook) (c-update-modeline)) (provide 'vala-mode) ;;; vala-mode.el ends here From fedora-extras-commits at redhat.com Tue Jul 15 17:22:25 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 15 Jul 2008 17:22:25 GMT Subject: rpms/tomcat-native/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tomcat-native.spec, 1.3, 1.4 Message-ID: <200807151722.m6FHMPhu014704@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/tomcat-native/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14554 Modified Files: .cvsignore sources tomcat-native.spec Log Message: * Sat Jul 5 2008 Ville Skytt?? - 1.1.14-1 - 1.1.14. * Sat Feb 16 2008 Ville Skytt?? - 1.1.13-1 - 1.1.13. * Tue Feb 12 2008 Ville Skytt?? - 1.1.12-2 - Apply upstream fix to silence (seemingly harmless?) configure error spewage. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Dec 2007 14:08:41 -0000 1.3 +++ .cvsignore 15 Jul 2008 17:21:34 -0000 1.4 @@ -1,2 +1 @@ -tomcat-native-1.1.12-src.tar.gz -tomcat-native-1.12-CHANGELOG.txt +tomcat-native-1.1.14-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Dec 2007 14:08:41 -0000 1.3 +++ sources 15 Jul 2008 17:21:34 -0000 1.4 @@ -1,2 +1 @@ -7954b3fb31d4bec2617525b9977abf70 tomcat-native-1.1.12-src.tar.gz -04c99887f5c08ddd9b420cf7d6b0ba37 tomcat-native-1.12-CHANGELOG.txt +b190d214e4c7cfcc012d272fd375589a tomcat-native-1.1.14-src.tar.gz Index: tomcat-native.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/tomcat-native.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tomcat-native.spec 26 Dec 2007 14:43:52 -0000 1.3 +++ tomcat-native.spec 15 Jul 2008 17:21:34 -0000 1.4 @@ -1,5 +1,5 @@ Name: tomcat-native -Version: 1.1.12 +Version: 1.1.14 Release: 1%{?dist} Summary: Tomcat native library @@ -7,8 +7,6 @@ License: ASL 2.0 URL: http://tomcat.apache.org/tomcat-6.0-doc/apr.html Source0: http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz -# Source1: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/CHANGELOG.txt?revision=605607 -Source1: %{name}-1.12-CHANGELOG.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel @@ -32,7 +30,6 @@ %prep %setup -q -n %{name}-%{version}-src -install -pm 644 %{SOURCE1} CHANGELOG.txt %build @@ -69,6 +66,15 @@ %changelog +* Sat Jul 5 2008 Ville Skytt?? - 1.1.14-1 +- 1.1.14. + +* Sat Feb 16 2008 Ville Skytt?? - 1.1.13-1 +- 1.1.13. + +* Tue Feb 12 2008 Ville Skytt?? - 1.1.12-2 +- Apply upstream fix to silence (seemingly harmless?) configure error spewage. + * Sat Dec 22 2007 Ville Skytt?? - 1.1.12-1 - 1.1.12. From fedora-extras-commits at redhat.com Tue Jul 15 17:22:49 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:22:49 GMT Subject: rpms/libICE/devel libICE.spec,1.24,1.25 Message-ID: <200807151722.m6FHMnDm014812@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libICE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14565 Modified Files: libICE.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.4-4 - Fix license tag. Index: libICE.spec =================================================================== RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libICE.spec 20 Feb 2008 02:04:41 -0000 1.24 +++ libICE.spec 15 Jul 2008 17:21:35 -0000 1.25 @@ -1,8 +1,8 @@ Summary: X.Org X11 libICE runtime library Name: libICE Version: 1.0.4 -Release: 3%{?dist} -License: MIT/X11 +Release: 4%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/ice.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.4-4 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.4-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:24:38 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:24:38 GMT Subject: rpms/libSM/devel libSM.spec,1.22,1.23 sources,1.9,1.10 Message-ID: <200807151724.m6FHOcJi015087@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libSM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14971 Modified Files: libSM.spec sources Log Message: * Tue Jul 15 2008 Adam Jackson 1.1.0-2 - Fix license tag. Index: libSM.spec =================================================================== RCS file: /cvs/pkgs/rpms/libSM/devel/libSM.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libSM.spec 20 Feb 2008 02:05:45 -0000 1.22 +++ libSM.spec 15 Jul 2008 17:23:49 -0000 1.23 @@ -1,8 +1,8 @@ Summary: X.Org X11 libSM runtime library Name: libSM -Version: 1.0.2 -Release: 5%{?dist} -License: MIT/X11 +Version: 1.1.0 +Release: 2%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -13,6 +13,8 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4 BuildRequires: libICE-devel +# yes, really. libuuid. +BuildRequires: e2fsprogs-devel Obsoletes: XFree86-libs, xorg-x11-libs @@ -36,15 +38,9 @@ %prep %setup -q -# Disable static library creation by default. -%define with_static 0 - %build -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --with-libuuid --disable-static make %install @@ -74,13 +70,16 @@ %{_includedir}/X11/SM/SM.h %{_includedir}/X11/SM/SMlib.h %{_includedir}/X11/SM/SMproto.h -%if %{with_static} -%{_libdir}/libSM.a -%endif %{_libdir}/libSM.so %{_libdir}/pkgconfig/sm.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.1.0-2 +- Fix license tag. + +* Wed Jul 02 2008 Adam Jackson 1.1.0-1 +- libSM 1.1.0 + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libSM/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 15:05:45 -0000 1.9 +++ sources 15 Jul 2008 17:23:49 -0000 1.10 @@ -1 +1 @@ -a254771550c01db372e88d1a1dc2e13a libSM-1.0.2.tar.bz2 +05a04c2b6382fb0054f6c70494e22733 libSM-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 15 17:25:25 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:25:25 GMT Subject: rpms/libX11/devel libX11.spec,1.45,1.46 Message-ID: <200807151725.m6FHPPTX015165@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libX11/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15073 Modified Files: libX11.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.1.4-2 - Fix license tag. Index: libX11.spec =================================================================== RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- libX11.spec 6 Mar 2008 21:27:06 -0000 1.45 +++ libX11.spec 15 Jul 2008 17:24:31 -0000 1.46 @@ -1,8 +1,8 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 Version: 1.1.4 -Release: 1%{?dist} -License: MIT/X11 +Release: 2%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -114,6 +114,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.1.4-2 +- Fix license tag. + * Thu Mar 06 2008 Adam Jackson 1.1.4-1 - libX11 1.1.4 From fedora-extras-commits at redhat.com Tue Jul 15 17:26:22 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:26:22 GMT Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.25,1.26 Message-ID: <200807151726.m6FHQMPF015304@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXScrnSaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15160 Modified Files: libXScrnSaver.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.1.2-5 - Fix license tag. Index: libXScrnSaver.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libXScrnSaver.spec 20 Feb 2008 02:08:01 -0000 1.25 +++ libXScrnSaver.spec 15 Jul 2008 17:25:24 -0000 1.26 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXss runtime library Name: libXScrnSaver Version: 1.1.2 -Release: 4%{?dist} -License: MIT/X11 +Release: 5%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,6 +83,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.1.2-5 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:26:42 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 15 Jul 2008 17:26:42 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.57,1.58 Message-ID: <200807151726.m6FHQg8k015361@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15219 Modified Files: java-1.6.0-openjdk.spec Log Message: * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Added rhino as a BuildRequirement. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- java-1.6.0-openjdk.spec 15 Jul 2008 17:04:20 -0000 1.57 +++ java-1.6.0-openjdk.spec 15 Jul 2008 17:25:49 -0000 1.58 @@ -161,6 +161,7 @@ BuildRequires: mercurial BuildRequires: ant BuildRequires: libXinerama-devel +BuildRequires: rhino %if %{gcjbootstrap} BuildRequires: java-1.5.0-gcj-devel %else @@ -888,6 +889,9 @@ %changelog * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Added rhino as a BuildRequirement. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Removed all unneeded patches. Security patches are included in the new icedtea source. From fedora-extras-commits at redhat.com Tue Jul 15 17:26:50 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:26:50 GMT Subject: rpms/libXTrap/devel libXTrap.spec,1.16,1.17 Message-ID: <200807151726.m6FHQo6e015391@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXTrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15251 Modified Files: libXTrap.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.0-6 - Fix license tag. Index: libXTrap.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXTrap/devel/libXTrap.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libXTrap.spec 20 Feb 2008 02:08:51 -0000 1.16 +++ libXTrap.spec 15 Jul 2008 17:26:01 -0000 1.17 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXTrap runtime library Name: libXTrap Version: 1.0.0 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %{_libdir}/pkgconfig/xtrap.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.0-6 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.0-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:27:15 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:27:15 GMT Subject: rpms/libXau/devel libXau.spec,1.21,1.22 Message-ID: <200807151727.m6FHRFDc015644@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXau/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15346 Modified Files: libXau.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.3-6 - Fix license tag. Index: libXau.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXau/devel/libXau.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libXau.spec 20 Feb 2008 02:09:49 -0000 1.21 +++ libXau.spec 15 Jul 2008 17:26:26 -0000 1.22 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXau runtime library Name: libXau Version: 1.0.3 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,6 +79,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.3-6 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.3-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:27:39 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:27:39 GMT Subject: rpms/libXaw/devel libXaw.spec,1.26,1.27 Message-ID: <200807151727.m6FHRdOZ015764@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXaw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15384 Modified Files: libXaw.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.4-3 - Fix license tag. Index: libXaw.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libXaw.spec 20 Feb 2008 02:10:55 -0000 1.26 +++ libXaw.spec 15 Jul 2008 17:26:50 -0000 1.27 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXaw runtime library Name: libXaw Version: 1.0.4 -Release: 2%{?dist} -License: MIT/X11 +Release: 3%{?dist} +License: MIT URL: http://www.x.org Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -102,6 +102,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.4-3 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.4-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:28:02 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:28:02 GMT Subject: rpms/libXcomposite/devel libXcomposite.spec,1.23,1.24 Message-ID: <200807151728.m6FHS2uY015854@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXcomposite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15632 Modified Files: libXcomposite.spec Log Message: * Tue Jul 15 2008 Adam Jackson 0.4.0-5 - Fix license tag. Index: libXcomposite.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXcomposite/devel/libXcomposite.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libXcomposite.spec 20 Feb 2008 02:11:44 -0000 1.23 +++ libXcomposite.spec 15 Jul 2008 17:27:13 -0000 1.24 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXcomposite runtime library Name: libXcomposite Version: 0.4.0 -Release: 4%{?dist} -License: MIT/X11 +Release: 5%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,6 +71,9 @@ %{_mandir}/man3/X?omposite*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 0.4.0-5 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.0-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:28:28 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:28:28 GMT Subject: rpms/libXcursor/devel libXcursor.spec,1.21,1.22 Message-ID: <200807151728.m6FHSSVH015946@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXcursor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15755 Modified Files: libXcursor.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.1.9-3 - Fix license tag. Index: libXcursor.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXcursor/devel/libXcursor.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libXcursor.spec 20 Feb 2008 02:12:36 -0000 1.21 +++ libXcursor.spec 15 Jul 2008 17:27:35 -0000 1.22 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXcursor runtime library Name: libXcursor Version: 1.1.9 -Release: 2%{?dist} -License: MIT/X11 +Release: 3%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -90,6 +90,9 @@ %{_mandir}/man3/Xcursor*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.1.9-3 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.9-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:28:56 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:28:56 GMT Subject: rpms/libXdmcp/devel libXdmcp.spec,1.19,1.20 Message-ID: <200807151728.m6FHSuPi016038@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXdmcp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15853 Modified Files: libXdmcp.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.2-6 - Fix license tag. Index: libXdmcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXdmcp/devel/libXdmcp.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libXdmcp.spec 20 Feb 2008 02:14:42 -0000 1.19 +++ libXdmcp.spec 15 Jul 2008 17:28:02 -0000 1.20 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXdmcp runtime library Name: libXdmcp Version: 1.0.2 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,6 +77,9 @@ %{_libdir}/pkgconfig/xdmcp.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.2-6 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:29:35 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:29:35 GMT Subject: rpms/libXevie/devel libXevie.spec,1.19,1.20 Message-ID: <200807151729.m6FHTZNY016165@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXevie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16012 Modified Files: libXevie.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.2-4 - Fix license tag. Index: libXevie.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXevie/devel/libXevie.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libXevie.spec 20 Feb 2008 02:15:31 -0000 1.19 +++ libXevie.spec 15 Jul 2008 17:28:48 -0000 1.20 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXevie runtime library Name: libXevie Version: 1.0.2 -Release: 3%{?dist} -License: MIT/X11 +Release: 4%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,6 +80,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.2-4 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:30:04 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:30:04 GMT Subject: rpms/libXfixes/devel libXfixes.spec,1.18,1.19 Message-ID: <200807151730.m6FHU4eO016294@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXfixes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16111 Modified Files: libXfixes.spec Log Message: * Tue Jul 15 2008 Adam Jackson 4.0.3-4 - Fix license tag. Index: libXfixes.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXfixes/devel/libXfixes.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libXfixes.spec 20 Feb 2008 02:17:26 -0000 1.18 +++ libXfixes.spec 15 Jul 2008 17:29:14 -0000 1.19 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXfixes runtime library Name: libXfixes Version: 4.0.3 -Release: 3%{?dist} -License: MIT/X11 +Release: 4%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,6 +79,9 @@ %{_mandir}/man3/Xfixes.3* %changelog +* Tue Jul 15 2008 Adam Jackson 4.0.3-4 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 4.0.3-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:30:24 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:30:24 GMT Subject: rpms/libXinerama/devel libXinerama.spec,1.18,1.19 Message-ID: <200807151730.m6FHUOpa016370@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXinerama/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16170 Modified Files: libXinerama.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.3-2 - Fix license tag. Index: libXinerama.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXinerama/devel/libXinerama.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libXinerama.spec 6 Mar 2008 20:47:21 -0000 1.18 +++ libXinerama.spec 15 Jul 2008 17:29:37 -0000 1.19 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXinerama runtime library Name: libXinerama Version: 1.0.3 -Release: 1%{?dist} -License: MIT/X11 +Release: 2%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.3-2 +- Fix license tag. + * Thu Mar 06 2008 Adam Jackson 1.0.3-1 - libXinerama 1.0.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:30:56 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:30:56 GMT Subject: rpms/libXres/devel libXres.spec,1.20,1.21 Message-ID: <200807151730.m6FHUuaH016518@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXres/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298 Modified Files: libXres.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.3-5 - Fix license tag. Index: libXres.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXres/devel/libXres.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libXres.spec 20 Feb 2008 02:26:31 -0000 1.20 +++ libXres.spec 15 Jul 2008 17:30:05 -0000 1.21 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXres runtime library Name: libXres Version: 1.0.3 -Release: 4%{?dist} -License: MIT/X11 +Release: 5%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,6 +79,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.3-5 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.3-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:31:06 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Tue, 15 Jul 2008 17:31:06 GMT Subject: rpms/pykickstart/devel .cvsignore, 1.93, 1.94 pykickstart.spec, 1.101, 1.102 sources, 1.102, 1.103 Message-ID: <200807151731.m6FHV6CL016573@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/pykickstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16349 Modified Files: .cvsignore pykickstart.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- .cvsignore 13 Jun 2008 15:13:57 -0000 1.93 +++ .cvsignore 15 Jul 2008 17:30:15 -0000 1.94 @@ -27,3 +27,4 @@ pykickstart-1.37.tar.gz pykickstart-1.38.tar.gz pykickstart-1.39.tar.gz +pykickstart-1.40.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- pykickstart.spec 13 Jun 2008 15:13:57 -0000 1.101 +++ pykickstart.spec 15 Jul 2008 17:30:15 -0000 1.102 @@ -3,7 +3,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart Url: http://fedoraproject.org/wiki/pykickstart -Version: 1.39 +Version: 1.40 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -15,7 +15,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, gettext, python-setuptools-devel -Requires: python, python-urlgrabber, rhpl +Requires: python, python-urlgrabber %description The pykickstart package is a python library for manipulating kickstart @@ -44,6 +44,14 @@ %{_bindir}/ksflatten %changelog +* Tue Jul 15 2008 Chris Lumens - 1.40-1 +- RHEL5_LogVolData should inherit from FC4, not FC3. + Also fix FC9->F9 typo. (dlehman) +- Support creation of encrypted block devices in RHEL5. (#449830) (dlehman) +- Use the right LogVolData objects for RHEL3 and 4 (jlaska). (clumens) +- We no longer use rhpl for translations. (clumens) +- All the base classes should derive from object. (clumens) + * Fri Jun 13 2008 Chris Lumens - 1.39-1 - It's helpful to return the parser object. (clumens) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- sources 13 Jun 2008 15:13:57 -0000 1.102 +++ sources 15 Jul 2008 17:30:15 -0000 1.103 @@ -1 +1 @@ -a6bbb73c0ee23af1da6fc85d01604056 pykickstart-1.39.tar.gz +40348f1916ebf42b5ea3b2de08a62e4a pykickstart-1.40.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 17:31:19 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:31:19 GMT Subject: rpms/libXvMC/devel libXvMC.spec,1.22,1.23 Message-ID: <200807151731.m6FHVJFt016598@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXvMC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16426 Modified Files: libXvMC.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.4-5 - Fix license tag. Index: libXvMC.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXvMC/devel/libXvMC.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libXvMC.spec 20 Feb 2008 02:30:33 -0000 1.22 +++ libXvMC.spec 15 Jul 2008 17:30:29 -0000 1.23 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXvMC runtime library Name: libXvMC Version: 1.0.4 -Release: 4%{?dist} -License: MIT/X11 +Release: 5%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,9 @@ %{_libdir}/pkgconfig/xvmc.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.4-5 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.4-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:31:51 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:31:51 GMT Subject: rpms/libXxf86dga/devel libXxf86dga.spec,1.18,1.19 Message-ID: <200807151731.m6FHVpef016751@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXxf86dga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16511 Modified Files: libXxf86dga.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.2-3 - Fix license tag. Index: libXxf86dga.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXxf86dga/devel/libXxf86dga.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libXxf86dga.spec 20 Feb 2008 02:31:30 -0000 1.18 +++ libXxf86dga.spec 15 Jul 2008 17:30:53 -0000 1.19 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXxf86dga runtime library Name: libXxf86dga Version: 1.0.2 -Release: 2%{?dist} -License: MIT/X11 +Release: 3%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,6 +68,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.2-3 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:32:23 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:32:23 GMT Subject: rpms/libXxf86misc/devel libXxf86misc.spec,1.17,1.18 Message-ID: <200807151732.m6FHWNk5016849@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXxf86misc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16654 Modified Files: libXxf86misc.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.1-6 - Fix license tag. Index: libXxf86misc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXxf86misc/devel/libXxf86misc.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libXxf86misc.spec 20 Feb 2008 02:32:39 -0000 1.17 +++ libXxf86misc.spec 15 Jul 2008 17:31:25 -0000 1.18 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXxf86misc runtime library Name: libXxf86misc Version: 1.0.1 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,9 @@ %{_mandir}/man3/*.3x* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.1-6 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:32:43 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:32:43 GMT Subject: rpms/libXxf86vm/devel libXxf86vm.spec,1.18,1.19 Message-ID: <200807151732.m6FHWhkg016932@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXxf86vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16805 Modified Files: libXxf86vm.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.1-6 - Fix license tag. Index: libXxf86vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/libXxf86vm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libXxf86vm.spec 20 Feb 2008 02:33:30 -0000 1.18 +++ libXxf86vm.spec 15 Jul 2008 17:31:55 -0000 1.19 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXxf86vm runtime library Name: libXxf86vm Version: 1.0.1 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,9 @@ %{_mandir}/man3/*.3x* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.1-6 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:33:11 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:33:11 GMT Subject: rpms/libdmx/devel libdmx.spec,1.18,1.19 Message-ID: <200807151733.m6FHXBMx017068@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libdmx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16839 Modified Files: libdmx.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.2-6 - Fix license tag. Index: libdmx.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdmx/devel/libdmx.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libdmx.spec 20 Feb 2008 02:34:41 -0000 1.18 +++ libdmx.spec 15 Jul 2008 17:32:17 -0000 1.19 @@ -1,8 +1,8 @@ Summary: X.Org X11 libdmx runtime library Name: libdmx Version: 1.0.2 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,6 +77,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.2-6 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:33:25 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:33:25 GMT Subject: rpms/libfontenc/devel libfontenc.spec,1.23,1.24 Message-ID: <200807151733.m6FHXPBI017123@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libfontenc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16906 Modified Files: libfontenc.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.4-6 - Fix license tag. Index: libfontenc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libfontenc/devel/libfontenc.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libfontenc.spec 20 Feb 2008 02:35:40 -0000 1.23 +++ libfontenc.spec 15 Jul 2008 17:32:40 -0000 1.24 @@ -1,8 +1,8 @@ Summary: X.Org X11 libfontenc runtime library Name: libfontenc Version: 1.0.4 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +87,9 @@ %{_libdir}/pkgconfig/fontenc.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.4-6 +- Fix license tag. + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.4-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:34:14 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:34:14 GMT Subject: rpms/xorg-sgml-doctools/devel xorg-sgml-doctools.spec,1.2,1.3 Message-ID: <200807151734.m6FHYEm8017284@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-sgml-doctools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17053 Modified Files: xorg-sgml-doctools.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.1.1-2 - Fix license tag. Index: xorg-sgml-doctools.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-sgml-doctools/devel/xorg-sgml-doctools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xorg-sgml-doctools.spec 5 Feb 2007 21:11:57 -0000 1.2 +++ xorg-sgml-doctools.spec 15 Jul 2008 17:33:03 -0000 1.3 @@ -1,8 +1,8 @@ Summary: X.Org SGML documentation generation tools Name: xorg-sgml-doctools Version: 1.1.1 -Release: 1%{?dist} -License: MIT/X11 +Release: 2%{?dist} +License: MIT Group: Development/Tools URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,6 +38,9 @@ %{_datadir}/sgml/X11/defs.ent %changelog +* Tue Jul 15 2008 Adam Jackson 1.1.1-2 +- Fix license tag. + * Mon Feb 05 2007 Adam Jackson 1.1.1-1 - Update to 1.1.1 From fedora-extras-commits at redhat.com Tue Jul 15 17:34:26 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:34:26 GMT Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.27,1.28 Message-ID: <200807151734.m6FHYQYr017332@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17181 Modified Files: xorg-x11-apps.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.3-4 - Fix license tag. Index: xorg-x11-apps.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- xorg-x11-apps.spec 4 Apr 2008 18:16:18 -0000 1.27 +++ xorg-x11-apps.spec 15 Jul 2008 17:33:35 -0000 1.28 @@ -5,8 +5,8 @@ # NOTE: The package version should be set to the X11 major release from which # the OS release is based upon. Version: 7.3 -Release: 3%{?dist} -License: MIT/X11 +Release: 4%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -175,6 +175,9 @@ %{_mandir}/man1/xwud.1* %changelog +* Tue Jul 15 2008 Adam Jackson 7.3-4 +- Fix license tag. + * Fri Apr 04 2008 Adam Jackson 7.3-3 - xconsole-1.0.3-streams-me-softer.patch: Don't include STREAMS headers, since glibc so thoughtfully removed them. (#440717) From fedora-extras-commits at redhat.com Tue Jul 15 17:34:42 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:34:42 GMT Subject: rpms/xorg-x11-docs/devel xorg-x11-docs.spec,1.6,1.7 Message-ID: <200807151734.m6FHYgPJ017445@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227 Modified Files: xorg-x11-docs.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.3-3 - Fix license tag. Index: xorg-x11-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-docs/devel/xorg-x11-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-docs.spec 25 Dec 2007 18:33:28 -0000 1.6 +++ xorg-x11-docs.spec 15 Jul 2008 17:33:54 -0000 1.7 @@ -3,8 +3,8 @@ Summary: X.Org X11 documentation Name: xorg-x11-docs Version: 1.3 -Release: 2%{?dist} -License: MIT/X11 +Release: 3%{?dist} +License: MIT Group: Documentation URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ %{_mandir}/man7/security.7* %changelog +* Tue Jul 15 2008 Adam Jackson 1.3-3 +- Fix license tag. + * Tue Dec 25 2007 Adam Jackson 1.3-2 - Install PDF instead of gzipped PostScript. - Move everything to /usr/share/doc to be more like other doc packages. From fedora-extras-commits at redhat.com Tue Jul 15 17:36:11 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:36:11 GMT Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.21,1.22 Message-ID: <200807151736.m6FHaBfG017703@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-amd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17522 Modified Files: xorg-x11-drv-amd.spec Log Message: * Tue Jul 15 2008 Adam Jackson 2.7.7.7-3 - Fix license tag. Index: xorg-x11-drv-amd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xorg-x11-drv-amd.spec 14 Mar 2008 22:20:21 -0000 1.21 +++ xorg-x11-drv-amd.spec 15 Jul 2008 17:35:16 -0000 1.22 @@ -5,10 +5,10 @@ Summary: Xorg X11 AMD Geode video driver Name: xorg-x11-drv-amd Version: 2.7.7.7 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org/wiki/AMDGeodeDriver Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-amd-2.7.7.7.tar.bz2 -License: MIT/X11 +License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: xorg-x11-drv-geode = %{version} @@ -63,6 +63,9 @@ %{driverdir}/ztv_drv.so %changelog +* Tue Jul 15 2008 Adam Jackson 2.7.7.7-3 +- Fix license tag. + * Fri Mar 14 2008 Warren Togami 2.7.7.7-2 - proper versioned provides From fedora-extras-commits at redhat.com Tue Jul 15 17:37:01 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:37:01 GMT Subject: rpms/xorg-x11-filesystem/devel xorg-x11-filesystem.spec,1.9,1.10 Message-ID: <200807151737.m6FHb15M017878@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-filesystem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17684 Modified Files: xorg-x11-filesystem.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.3-2 - Fix license tag. Index: xorg-x11-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-filesystem/devel/xorg-x11-filesystem.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-filesystem.spec 21 Feb 2008 18:27:38 -0000 1.9 +++ xorg-x11-filesystem.spec 15 Jul 2008 17:36:03 -0000 1.10 @@ -1,8 +1,8 @@ Summary: X.Org X11 filesystem layout Name: xorg-x11-filesystem Version: 7.3 -Release: 1%{?dist} -License: MIT/X11 +Release: 2%{?dist} +License: MIT Group: System Environment/Base URL: http://www.redhat.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +87,9 @@ %{_bindir}/xorg-x11-filesystem-upgrade %changelog +* Tue Jul 15 2008 Adam Jackson 7.3-2 +- Fix license tag. + * Thu Feb 21 2008 Adam Jackson 7.3-1 - Own %%{_datadir}/X11. (#350651) - Superstition bump to 7.3. From fedora-extras-commits at redhat.com Tue Jul 15 17:37:24 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:37:24 GMT Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.29,1.30 Message-ID: <200807151737.m6FHbO0A017971@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-font-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17803 Modified Files: xorg-x11-font-utils.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.2-6 - Fix license tag. Index: xorg-x11-font-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- xorg-x11-font-utils.spec 7 Jul 2008 15:02:48 -0000 1.29 +++ xorg-x11-font-utils.spec 15 Jul 2008 17:36:31 -0000 1.30 @@ -5,8 +5,8 @@ # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 Version: 7.2 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -146,6 +146,9 @@ %changelog +* Tue Jul 15 2008 Adam Jackson 7.2-6 +- Fix license tag. + * Mon Jul 07 2008 Adam Jackson 7.2-5 - Fix Source url for font-util. From fedora-extras-commits at redhat.com Tue Jul 15 17:37:28 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Tue, 15 Jul 2008 17:37:28 GMT Subject: rpms/compiz-fusion/devel compiz-fusion-0.7.6-ppc64-fix.patch, NONE, 1.1 compiz-fusion.spec, 1.35, 1.36 Message-ID: <200807151737.m6FHbSbB018020@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/compiz-fusion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17813 Modified Files: compiz-fusion.spec Added Files: compiz-fusion-0.7.6-ppc64-fix.patch Log Message: fix ppc64 build compiz-fusion-0.7.6-ppc64-fix.patch: --- NEW FILE compiz-fusion-0.7.6-ppc64-fix.patch --- diff -upNr compiz-fusion-plugins-main-0.7.6.orign/src/colorfilter/colorfilter.c compiz-fusion-plugins-main-0.7.6/src/colorfilter/colorfilter.c --- compiz-fusion-plugins-main-0.7.6.orign/src/colorfilter/colorfilter.c 2008-05-29 23:26:23.000000000 +0200 +++ compiz-fusion-plugins-main-0.7.6/src/colorfilter/colorfilter.c 2008-07-15 19:17:00.000000000 +0200 @@ -77,13 +77,13 @@ typedef struct _ColorFilterWindow ((ColorFilterScreen *) (s)->base.privates[(cfd)->screenPrivateIndex].ptr) #define FILTER_SCREEN(s) \ ColorFilterScreen *cfs = GET_FILTER_SCREEN (s, \ - GET_FILTER_DISPLAY (s->display)) + GET_FILTER_DISPLAY ((s)->display)) #define GET_FILTER_WINDOW(w, cfs) \ ((ColorFilterWindow *) (w)->base.privates[(cfs)->windowPrivateIndex].ptr) #define FILTER_WINDOW(w) \ ColorFilterWindow *cfw = GET_FILTER_WINDOW (w, \ - GET_FILTER_SCREEN (w->screen, \ - GET_FILTER_DISPLAY (w->screen->display))) + GET_FILTER_SCREEN ((w)->screen, \ + GET_FILTER_DISPLAY ((w)->screen->display))) /* Compiz-core imports ------------------------------------------------------ */ Index: compiz-fusion.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- compiz-fusion.spec 15 Jul 2008 15:38:41 -0000 1.35 +++ compiz-fusion.spec 15 Jul 2008 17:36:35 -0000 1.36 @@ -9,6 +9,7 @@ License: GPLv2+ URL: http://compiz-fusion.org Source0: http://releases.compiz-fusion.org/%{version}/%{name}-plugins-main-%{version}.tar.bz2 +Patch0: compiz-fusion-0.7.6-ppc64-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libdrm is not available on these arches @@ -61,6 +62,7 @@ %prep %setup -q -n %{name}-plugins-main-%{version} +%patch0 -p1 -b .ppc64 %build %configure --enable-schemas @@ -133,6 +135,7 @@ %changelog * Tue Jul 15 2008 Adel Gadllah 0.7.6-6 - Build on ppc64 too +- Add patch to fix build on ppc64 * Tue Jun 24 2008 Adel Gadllah 0.7.6-5 - Fix up scriptlets (RH #452674) From fedora-extras-commits at redhat.com Tue Jul 15 17:37:58 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:37:58 GMT Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.19,1.20 Message-ID: <200807151737.m6FHbwEp018123@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-resutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17890 Modified Files: xorg-x11-resutils.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.1-6 - Fix license tag. Index: xorg-x11-resutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xorg-x11-resutils.spec 20 Feb 2008 08:04:05 -0000 1.19 +++ xorg-x11-resutils.spec 15 Jul 2008 17:37:02 -0000 1.20 @@ -3,8 +3,8 @@ Summary: X.Org X11 X resource utilities Name: xorg-x11-%{pkgname} Version: 7.1 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -88,6 +88,9 @@ %{_mandir}/man1/viewres.1* %changelog +* Tue Jul 15 2008 Adam Jackson 7.1-6 +- Fix license tag. + * Wed Feb 20 2008 Fedora Release Engineering - 7.1-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:38:19 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:38:19 GMT Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.35, 1.36 Message-ID: <200807151738.m6FHcJUV018214@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18033 Modified Files: xorg-x11-server-utils.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.4-2 - Fix license tag. Index: xorg-x11-server-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- xorg-x11-server-utils.spec 30 Jun 2008 17:41:10 -0000 1.35 +++ xorg-x11-server-utils.spec 15 Jul 2008 17:37:31 -0000 1.36 @@ -3,8 +3,8 @@ Summary: X.Org X11 X server utilities Name: xorg-x11-%{pkgname} Version: 7.4 -Release: 1%{?dist} -License: MIT/X11 +Release: 2%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -193,6 +193,9 @@ %{_mandir}/man1/xvidtune.1* %changelog +* Tue Jul 15 2008 Adam Jackson 7.4-2 +- Fix license tag. + * Mon Jun 30 2008 Adam Jackson 7.4-1 - Drop xtrap utils, it's deprecated upstream. From fedora-extras-commits at redhat.com Tue Jul 15 17:39:12 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:39:12 GMT Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.20,1.21 Message-ID: <200807151739.m6FHdCmV018354@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-twm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18199 Modified Files: xorg-x11-twm.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.3-3 - Fix license tag. Index: xorg-x11-twm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xorg-x11-twm.spec 20 Feb 2008 08:07:31 -0000 1.20 +++ xorg-x11-twm.spec 15 Jul 2008 17:38:14 -0000 1.21 @@ -5,8 +5,8 @@ # NOTE: Remove Epoch line if package gets renamed to something like "twm" Epoch: 1 Version: 1.0.3 -Release: 2%{?dist} -License: MIT/X11 +Release: 3%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,9 @@ %config %{_sysconfdir}/X11/twm/system.twmrc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.3-3 +- Fix license tag. + * Wed Feb 20 2008 Fedora Release Engineering - 1:1.0.3-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:39:45 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:39:45 GMT Subject: rpms/xorg-x11-utils/devel sources, 1.8, 1.9 xorg-x11-utils.spec, 1.21, 1.22 Message-ID: <200807151739.m6FHdj9G018455@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18321 Modified Files: sources xorg-x11-utils.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.4-2 - Fix license tag. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Sep 2007 19:41:14 -0000 1.8 +++ sources 15 Jul 2008 17:38:57 -0000 1.9 @@ -1,11 +1,11 @@ -c9ee60ae52c97c51d4ca327e53f0cb61 xdpyinfo-1.0.2.tar.bz2 +a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2 e3008eb0655da3026c162a5597d70869 xev-1.0.2.tar.bz2 c72abd90f50ef459bc14b39ec9fcc7f8 xfd-1.0.1.tar.bz2 288fe4cf8a990e4e602aac16dd9109fb xfontsel-1.0.2.tar.bz2 69adcda848479acc3b82b3928812d191 xlsatoms-1.0.1.tar.bz2 44473b880d26bfbe8b3d4d72b183cba7 xlsclients-1.0.1.tar.bz2 28958248590ff60ecd70e8f590d977b7 xlsfonts-1.0.2.tar.bz2 -e7b16eeb4bab974e3592d62f415aa6a5 xprop-1.0.3.tar.bz2 e1e318436f49e2f0f3764593dadd9ad2 xvinfo-1.0.2.tar.bz2 -a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2 -721f84332c98c33152460bb22ba9ded6 xwininfo-1.0.3.tar.bz2 +b7cbab6cbcd12bf7ad65dbc12d86e104 xdpyinfo-1.0.3.tar.bz2 +48aa8fd78802f477dcbf9ef0dfd9f783 xprop-1.0.4.tar.bz2 +e2a9bf5ab7f2a0866700a3b49dd8c6bf xwininfo-1.0.4.tar.bz2 Index: xorg-x11-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xorg-x11-utils.spec 20 Feb 2008 08:09:35 -0000 1.21 +++ xorg-x11-utils.spec 15 Jul 2008 17:38:57 -0000 1.22 @@ -2,14 +2,14 @@ Summary: X.Org X11 X client utilities Name: xorg-x11-%{pkgname} -Version: 7.3 +Version: 7.4 Release: 2%{?dist} -License: MIT/X11 +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.2.tar.bz2 +Source0: ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2 Source1: ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2 @@ -17,9 +17,9 @@ Source5: ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.1.tar.bz2 Source6: ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.1.tar.bz2 Source7: ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2 -Source8: ftp://ftp.x.org/pub/individual/app/xprop-1.0.3.tar.bz2 +Source8: ftp://ftp.x.org/pub/individual/app/xprop-1.0.4.tar.bz2 Source9: ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2 -Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.3.tar.bz2 +Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2 BuildRequires: pkgconfig BuildRequires: libdmx-devel @@ -37,9 +37,6 @@ BuildRequires: libXxf86misc-devel BuildRequires: libXxf86vm-devel -# FIXME: check if still needed for X11R7 -Requires(pre): filesystem >= 2.3.6-1 - Provides: xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo %description @@ -104,6 +101,18 @@ %{_mandir}/man1/xwininfo.1* %changelog +* Tue Jul 15 2008 Adam Jackson 7.4-2 +- Fix license tag. + +* Wed Jul 02 2008 Adam Jackson 7.4-1 +- xdpyinfo 1.0.3 +- xprop 1.0.4 +- xwininfo 1.0.4 + +* Fri Apr 25 2008 Adam Jackson 7.3-3 +- xdpyinfo-1.0.2-silence-misc-errors.patch: Make xf86misc and xf86dga protocol + errors non-fatal. (#442176) + * Wed Feb 20 2008 Fedora Release Engineering - 7.3-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:40:57 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:40:57 GMT Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.17,1.18 Message-ID: <200807151740.m6FHevB7018630@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xauth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18449 Modified Files: xorg-x11-xauth.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.2-5 - Fix license tag Index: xorg-x11-xauth.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xorg-x11-xauth.spec 20 Feb 2008 08:10:28 -0000 1.17 +++ xorg-x11-xauth.spec 15 Jul 2008 17:39:45 -0000 1.18 @@ -3,10 +3,10 @@ Summary: X.Org X11 X authority utilities Name: xorg-x11-%{pkgname} Version: 1.0.2 -Release: 4%{?dist} +Release: 5%{?dist} # NOTE: Remove Epoch line if package gets renamed Epoch: 1 -License: MIT/X11 +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,6 +66,9 @@ %{_mandir}/man1/mkxauth.1* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.2-5 +- Fix license tag + * Wed Feb 20 2008 Fedora Release Engineering - 1:1.0.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:41:23 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:41:23 GMT Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.16,1.17 Message-ID: <200807151741.m6FHfNME018713@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xbitmaps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18576 Modified Files: xorg-x11-xbitmaps.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.1-6 - Fix license tag. Index: xorg-x11-xbitmaps.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-xbitmaps.spec 20 Feb 2008 08:11:26 -0000 1.16 +++ xorg-x11-xbitmaps.spec 15 Jul 2008 17:40:29 -0000 1.17 @@ -5,8 +5,8 @@ Summary: X.Org X11 application bitmaps Name: xorg-x11-%{pkgname} Version: 1.0.1 -Release: 5.1 -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,6 +51,9 @@ %{_libdir}/pkgconfig/xbitmaps.pc %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.1-6 +- Fix license tag. + * Wed Feb 20 2008 Fedora Release Engineering - 1.0.1-5.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:42:59 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:42:59 GMT Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.37,1.38 Message-ID: <200807151742.m6FHgxRe018926@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18755 Modified Files: xorg-x11-xdm.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.1.6-4 - Fix license tag. Index: xorg-x11-xdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- xorg-x11-xdm.spec 20 Feb 2008 08:12:49 -0000 1.37 +++ xorg-x11-xdm.spec 15 Jul 2008 17:41:27 -0000 1.38 @@ -3,10 +3,10 @@ Summary: X.Org X11 xdm - X Display Manager Name: xorg-x11-%{pkgname} Version: 1.1.6 -Release: 3%{?dist} +Release: 4%{?dist} # NOTE: Remove Epoch line if/when the package ever gets renamed. Epoch: 1 -License: MIT/X11 +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -156,6 +156,9 @@ %{_mandir}/man1/*.1* %changelog +* Tue Jul 15 2008 Adam Jackson 1.1.6-4 +- Fix license tag. + * Wed Feb 20 2008 Fedora Release Engineering - 1:1.1.6-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:43:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:43:04 GMT Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.32,1.33 Message-ID: <200807151743.m6FHh4tB018966@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/compat-gcc-32/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18801 Modified Files: compat-gcc-32.spec Log Message: fix license tag Index: compat-gcc-32.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- compat-gcc-32.spec 21 Feb 2008 02:17:08 -0000 1.32 +++ compat-gcc-32.spec 15 Jul 2008 17:41:59 -0000 1.33 @@ -1,10 +1,11 @@ %define LIBSTDCXXDATE 20040818 %define DATE 20040701 %define gcc_version 3.2.3 -%define gcc_release 63 +%define gcc_release 64 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define build_java 0 +%define _default_patch_fuzz 2 %ifarch s390x %define multilib_32_arch s390 %endif @@ -21,7 +22,7 @@ Name: compat-gcc-32 Version: %{gcc_version} Release: %{gcc_release} -License: GPL +License: GPLv2+ with exceptions Group: Development/Languages Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2 Source2: libstdc++-3.3.4-%{LIBSTDCXXDATE}.tar.bz2 @@ -433,6 +434,10 @@ %{_prefix}/%{_lib}/libstdc++.so.5* %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 3.2.3-64 +- fix license tag +- apply patches with fuzz=2 + * Tue Feb 19 2008 Fedora Release Engineering - 3.2.3-63 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:43:26 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:43:26 GMT Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.33,1.34 Message-ID: <200807151743.m6FHhQ0X019066@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785 Modified Files: xorg-x11-xfs.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.5-3 - Fix license tag. Index: xorg-x11-xfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- xorg-x11-xfs.spec 20 Feb 2008 08:14:11 -0000 1.33 +++ xorg-x11-xfs.spec 15 Jul 2008 17:41:49 -0000 1.34 @@ -1,10 +1,10 @@ Summary: X.Org X11 xfs font server Name: xorg-x11-xfs Version: 1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} # NOTE: Remove Epoch line if package gets renamed Epoch: 1 -License: MIT/X11 +License: MIT Group: System Environment/Daemons URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -244,6 +244,9 @@ %{_mandir}/man1/xfsinfo.1x* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.5-3 +- Fix license tag. + * Wed Feb 20 2008 Fedora Release Engineering - 1:1.0.5-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:43:41 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:43:41 GMT Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.17,1.18 Message-ID: <200807151743.m6FHhfue019138@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xfwp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18885 Modified Files: xorg-x11-xfwp.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.1-7 - Fix license tag. Index: xorg-x11-xfwp.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xorg-x11-xfwp.spec 20 Feb 2008 08:15:58 -0000 1.17 +++ xorg-x11-xfwp.spec 15 Jul 2008 17:42:47 -0000 1.18 @@ -5,8 +5,8 @@ Name: xorg-x11-%{pkgname} # NOTE: The package version should always be the upstream xfwp tarball version. Version: %{xfwp_version} -Release: 6%{?dist} -License: MIT/X11 +Release: 7%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,6 +91,9 @@ %{_mandir}/man1/xfwp.1* %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.1-7 +- Fix license tag. + * Wed Feb 20 2008 Fedora Release Engineering - 1.0.1-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:44:05 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:44:05 GMT Subject: rpms/xorg-x11-xinit/devel sources, 1.8, 1.9 xorg-x11-xinit.spec, 1.57, 1.58 Message-ID: <200807151744.m6FHi52p019204@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19033 Modified Files: sources xorg-x11-xinit.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.9-2 - Fix license tag. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Sep 2007 18:10:45 -0000 1.8 +++ sources 15 Jul 2008 17:43:13 -0000 1.9 @@ -1 +1 @@ -8b882d9e2deed9d85469a3beaec566a3 xinit-1.0.7.tar.bz2 +224c36057e4416205d4e421af01a2f15 xinit-1.0.9.tar.bz2 Index: xorg-x11-xinit.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- xorg-x11-xinit.spec 8 Apr 2008 21:20:03 -0000 1.57 +++ xorg-x11-xinit.spec 15 Jul 2008 17:43:13 -0000 1.58 @@ -2,8 +2,8 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} -Version: 1.0.7 -Release: 7%{?dist} +Version: 1.0.9 +Release: 2%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -131,6 +131,12 @@ %{_datadir}/xsessions/xinit-compat.desktop %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.9-2 +- Fix license tag. + +* Wed Jun 11 2008 Adam Jackson 1.0.9-1 +- xinit 1.0.9 + * Tue Apr 08 2008 Adam Jackson 1.0.7-7 - Xsession: Don't start ssh-agent for gnome sessions anymore, gnome-keyring acts as an agent now. (#441123) From fedora-extras-commits at redhat.com Tue Jul 15 17:44:38 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:44:38 GMT Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.22,1.23 Message-ID: <200807151744.m6FHic3Y019315@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19129 Modified Files: xorg-x11-xkb-utils.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.2-6 - Fix license tag. Index: xorg-x11-xkb-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xorg-x11-xkb-utils.spec 17 Apr 2008 17:51:05 -0000 1.22 +++ xorg-x11-xkb-utils.spec 15 Jul 2008 17:43:39 -0000 1.23 @@ -1,8 +1,8 @@ Summary: X.Org X11 xkb utilities Name: xorg-x11-xkb-utils Version: 7.2 -Release: 5%{?dist} -License: MIT/X11 +Release: 6%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -82,6 +82,9 @@ %{_mandir}/man1/xkbprint.1* %changelog +* Tue Jul 15 2008 Adam Jackson 7.2-6 +- Fix license tag. + * Wed Apr 16 2008 Adam Jackson 7.2-5 - xkbcomp 1.0.4 - xkbcomp-1.0.4-open-less.patch: Make xkbcomp faster by removing uncredible From fedora-extras-commits at redhat.com Tue Jul 15 17:45:27 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:45:27 GMT Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.19,1.20 Message-ID: <200807151745.m6FHjR0n019458@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xsm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19285 Modified Files: xorg-x11-xsm.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.0.2-8 - Fix license tag. Index: xorg-x11-xsm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xorg-x11-xsm.spec 20 Feb 2008 08:17:53 -0000 1.19 +++ xorg-x11-xsm.spec 15 Jul 2008 17:44:27 -0000 1.20 @@ -5,8 +5,8 @@ # NOTE: The Version field should be the version of the xsm tarball. Version: 1.0.2 # Bump the release on rebuilds/bugfixes/etc. -Release: 7%{?dist} -License: MIT/X11 +Release: 8%{?dist} +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -132,6 +132,9 @@ %config %{_sysconfdir}/X11/xsm/system.xsm %changelog +* Tue Jul 15 2008 Adam Jackson 1.0.2-8 +- Fix license tag. + * Wed Feb 20 2008 Fedora Release Engineering - 1.0.2-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:46:06 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 17:46:06 GMT Subject: rpms/xorg-x11-xtrans-devel/devel sources, 1.9, 1.10 xorg-x11-xtrans-devel.spec, 1.28, 1.29 Message-ID: <200807151746.m6FHk6jV019561@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19389 Modified Files: sources xorg-x11-xtrans-devel.spec Log Message: * Tue Jul 15 2008 Adam Jackson 1.2.1-2 - Fix license tag. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Mar 2008 02:08:29 -0000 1.9 +++ sources 15 Jul 2008 17:44:57 -0000 1.10 @@ -1 +1 @@ -8546e3a060aefb42c889eaa4b5db33af xtrans-1.1.tar.bz2 +96e142331edd498a9364887b2548f1bb xtrans-1.2.1.tar.bz2 Index: xorg-x11-xtrans-devel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xorg-x11-xtrans-devel.spec 6 May 2008 18:12:35 -0000 1.28 +++ xorg-x11-xtrans-devel.spec 15 Jul 2008 17:44:57 -0000 1.29 @@ -5,16 +5,15 @@ Summary: X.Org X11 developmental X transport library Name: xorg-x11-xtrans-devel -Version: 1.1 +Version: 1.2.1 Release: 2%{?dist} -License: MIT/X11 +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://xorg.freedesktop.org/archive/individual/lib/xtrans-%{version}.tar.bz2 Patch1: xtrans-1.0.3-avoid-gethostname.patch -Patch2: xtrans-1.1-abstract.patch BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros @@ -27,7 +26,6 @@ %prep %setup -q -n xtrans-%{version} %patch1 -p1 -b .my-name-is-unix -%patch2 -p1 -b .abstract-does-not-need-mkdir %build @@ -61,6 +59,12 @@ %{_datadir}/aclocal/xtrans.m4 %changelog +* Tue Jul 15 2008 Adam Jackson 1.2.1-2 +- Fix license tag. + +* Wed Jul 02 2008 Adam Jackson 1.2.1-1 +- xtrans 1.2.1 + * Tue May 06 2008 Bill Nottingham 1.1-2 - xtrans-1.1-abstract.patch: Don't worry about making /tmp/.X11-unix (or failure to do so) if you're using an abstract socket (#445303) From fedora-extras-commits at redhat.com Tue Jul 15 17:46:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:46:13 GMT Subject: rpms/compat-wxGTK26/devel compat-wxGTK26.spec,1.14,1.15 Message-ID: <200807151746.m6FHkDxB019603@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/compat-wxGTK26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19434 Modified Files: compat-wxGTK26.spec Log Message: fix license tag Index: compat-wxGTK26.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- compat-wxGTK26.spec 8 Feb 2008 21:39:29 -0000 1.14 +++ compat-wxGTK26.spec 15 Jul 2008 17:45:11 -0000 1.15 @@ -1,11 +1,11 @@ Name: compat-wxGTK26 Version: 2.6.4 -Release: 2 +Release: 3 Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually # change to be "wxWidgets License" once that is approved by OSI.) -License: wxWidgets Library Licence +License: wxWidgets Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2 @@ -167,6 +167,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 2.6.4-3 +- fix license tag + * Fri Feb 08 2008 Michael Schwendt - rebuilt for GCC 4.3 as requested by Fedora Release Engineering From fedora-extras-commits at redhat.com Tue Jul 15 17:48:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:48:46 GMT Subject: rpms/compiz/devel compiz.spec,1.132,1.133 Message-ID: <200807151748.m6FHmkAI019865@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/compiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19742 Modified Files: compiz.spec Log Message: fix license tag Index: compiz.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- compiz.spec 15 Jul 2008 13:25:58 -0000 1.132 +++ compiz.spec 15 Jul 2008 17:47:33 -0000 1.133 @@ -11,10 +11,10 @@ Name: compiz URL: http://www.go-compiz.org -License: X11/MIT/GPL +License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.7.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -337,6 +337,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.7.6-9 +- fix license tag + * Tue Jul 15 2008 Nikolay Vladimirov - 0.7.6-8 - Rebuild for ppc64 From fedora-extras-commits at redhat.com Tue Jul 15 17:49:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:49:53 GMT Subject: rpms/comps-extras/devel comps-extras.spec,1.26,1.27 Message-ID: <200807151749.m6FHnrN1020120@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/comps-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013 Modified Files: comps-extras.spec Log Message: fix license tag Index: comps-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/comps-extras/devel/comps-extras.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- comps-extras.spec 4 Sep 2007 19:57:12 -0000 1.26 +++ comps-extras.spec 15 Jul 2008 17:49:05 -0000 1.27 @@ -1,13 +1,14 @@ Summary: Images for components included in Fedora Name: comps-extras Version: 13 -Release: 1 +Release: 2 # no upstream source releases; the src.rpm is the source much like # with fedora-release, etc. anonymous cvs available via # cvs -d:pserver:anonymous at rhlinux.redhat.com:/usr/local/CVS co comps-extras Source0: %{name}-%{version}.tar.gz # while GPL isn't normal for images, it is the case here -License: GPL +# No version specified. +License: GPL+ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,6 +35,9 @@ %{_datadir}/pixmaps/comps/* %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 13-2 +- fix license tag + * Tue Sep 4 2007 Bill Nottingham - 13-1 - add fonts icons, tweak sound & video, system tools From fedora-extras-commits at redhat.com Tue Jul 15 17:51:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:51:45 GMT Subject: rpms/conexusmm/devel conexusmm.spec,1.9,1.10 Message-ID: <200807151751.m6FHpjCw020352@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/conexusmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20222 Modified Files: conexusmm.spec Log Message: fix license tag Index: conexusmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/conexusmm/devel/conexusmm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- conexusmm.spec 19 Feb 2008 22:52:03 -0000 1.9 +++ conexusmm.spec 15 Jul 2008 17:50:47 -0000 1.10 @@ -2,8 +2,8 @@ Summary: Network and serial communication widgets for Gtkmm Name: conexusmm Version: 0.5.0 -Release: 4%{?dist} -License: LGPL +Release: 5%{?dist} +License: LGPLv2 URL: http://conexus.sourceforge.net Group: System Environment/Libraries Source: http://download.sourceforge.net/conexus/%{name}-%{version}.tar.bz2 @@ -63,6 +63,9 @@ %{_datadir}/conexusmm-0.5.0/ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 0.5.0-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.5.0-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 15 17:52:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:52:53 GMT Subject: rpms/conman/devel conman.spec,1.10,1.11 Message-ID: <200807151752.m6FHqrxL020519@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/conman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20414 Modified Files: conman.spec Log Message: fix license tag Index: conman.spec =================================================================== RCS file: /cvs/pkgs/rpms/conman/devel/conman.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- conman.spec 3 May 2008 02:40:48 -0000 1.10 +++ conman.spec 15 Jul 2008 17:51:51 -0000 1.11 @@ -1,10 +1,10 @@ Name: conman Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ConMan - The Console Manager Group: Applications/System -License: GPL +License: GPLv2+ URL: http://home.gna.org/conman/ Source0: http://download.gna.org/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: %{name}.init @@ -98,6 +98,9 @@ %{_mandir}/*/* %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 0.2.1-2 +- fix license tag + * Fri May 02 2008 Jarod Wilson 0.2.1-1 - New upstream release From fedora-extras-commits at redhat.com Tue Jul 15 17:54:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:54:28 GMT Subject: rpms/connect-proxy/devel connect-proxy.spec,1.3,1.4 Message-ID: <200807151754.m6FHsSTA020748@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/connect-proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20627 Modified Files: connect-proxy.spec Log Message: fix license tag Index: connect-proxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/connect-proxy/devel/connect-proxy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- connect-proxy.spec 13 Feb 2008 21:40:17 -0000 1.3 +++ connect-proxy.spec 15 Jul 2008 17:53:28 -0000 1.4 @@ -1,10 +1,10 @@ Name: connect-proxy Version: 1.100 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SSH Proxy command helper Group: Applications/System -License: GPL +License: GPLv2+ URL: http://www.taiyo.co.jp/~gotoh/ssh/connect.html Source0: connect-%{version}.c # Real source listed below, it was renamed for sanity's sake @@ -56,6 +56,9 @@ %{_bindir}/%{name} %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 1.100-2 +- fix license tag + * Wed Feb 13 2008 Jarod Wilson 1.100-1 - Upgrade to r100. From fedora-extras-commits at redhat.com Tue Jul 15 17:55:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 17:55:20 GMT Subject: rpms/cowsay/devel cowsay.spec,1.4,1.5 Message-ID: <200807151755.m6FHtK0X020915@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cowsay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20723 Modified Files: cowsay.spec Log Message: fix license tag Index: cowsay.spec =================================================================== RCS file: /cvs/pkgs/rpms/cowsay/devel/cowsay.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cowsay.spec 23 May 2008 14:05:08 -0000 1.4 +++ cowsay.spec 15 Jul 2008 17:54:19 -0000 1.5 @@ -1,9 +1,9 @@ Name: cowsay Version: 3.03 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games -License: Artistic or GPLv2+ +License: GPLv2+ or Artistic URL: http://www.nog.net/~tony/warez/cowsay.shtml Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp @@ -63,6 +63,9 @@ %{_sysconfdir}/bash_completion.d %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 3.03-6 +- fix license tag to prevent false positive + * Fri May 23 2008 Jon Stanley - 3.03-5 - Fix license tag From fedora-extras-commits at redhat.com Tue Jul 15 17:56:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 15 Jul 2008 17:56:15 GMT Subject: rpms/xorg-x11-drv-amd/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE sources, 1.11, NONE xorg-x11-drv-amd.spec, 1.22, NONE Message-ID: <200807151756.m6FHuF8j020992@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/xorg-x11-drv-amd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20978 Added Files: dead.package Removed Files: Makefile sources xorg-x11-drv-amd.spec Log Message: amd was renamed to geode a while ago. --- NEW FILE dead.package --- --- Makefile DELETED --- --- sources DELETED --- --- xorg-x11-drv-amd.spec DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 17:58:03 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 15 Jul 2008 17:58:03 GMT Subject: rpms/sat4j/devel sat4j.spec,1.3,1.4 Message-ID: <200807151758.m6FHw3w4021246@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/sat4j/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21109 Modified Files: sat4j.spec Log Message: libdir/datadir mixup Index: sat4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sat4j.spec 15 Jul 2008 16:59:38 -0000 1.3 +++ sat4j.spec 15 Jul 2008 17:57:19 -0000 1.4 @@ -1,4 +1,4 @@ -%define eclipse_base %{_libdir}/eclipse +%define eclipse_base %{_datadir}/eclipse # We want the version to match that shipped in Eclipse's Orbit project %define sat4jversion 2.0.0.v20080602 From fedora-extras-commits at redhat.com Tue Jul 15 17:58:45 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 15 Jul 2008 17:58:45 GMT Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.32,1.33 Message-ID: <200807151758.m6FHwj2W021355@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/xorg-x11-drivers/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157 Modified Files: xorg-x11-drivers.spec Log Message: amd was renamed to geode Index: xorg-x11-drivers.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- xorg-x11-drivers.spec 4 Jun 2008 19:58:48 -0000 1.32 +++ xorg-x11-drivers.spec 15 Jul 2008 17:57:46 -0000 1.33 @@ -1,7 +1,7 @@ Summary: X.Org X11 driver installation package Name: xorg-x11-drivers Version: 7.3 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,9 +81,9 @@ %endif # cyrix and nsc used to be here too, but are deprecated upstream and -# should eventually get folded into -amd / -geode. +# should eventually get folded into -geode. %ifarch %{ix86} -Requires: xorg-x11-drv-amd +Requires: xorg-x11-drv-geode %endif # So far i810 is onboard-only. @@ -140,6 +140,9 @@ %defattr(-,root,root,-) %changelog +* Tue Jul 15 2008 Warren Togami 7.3-6 +- amd was renamed to geode + * Wed Jun 04 2008 Dennis Gilmore 7.3-5 - add sparc drivers From fedora-extras-commits at redhat.com Tue Jul 15 18:04:39 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 15 Jul 2008 18:04:39 GMT Subject: rpms/dbus-qt3/F-8 .cvsignore, 1.3, 1.4 dbus-qt3.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807151804.m6FI4d3C028449@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/dbus-qt3/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28274 Modified Files: .cvsignore dbus-qt3.spec sources Log Message: * Fri Jun 06 2008 Rex Dieter 0.9-1 - dbus-1-qt3-0.9 - Provides: dbus-1-qt3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dbus-qt3/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Jun 2008 16:14:58 -0000 1.3 +++ .cvsignore 15 Jul 2008 18:03:28 -0000 1.4 @@ -1 +1 @@ -dbus-qt3-20080603svn.tar.bz2 +dbus-1-qt3-0.9.tar.gz Index: dbus-qt3.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-qt3/F-8/dbus-qt3.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dbus-qt3.spec 3 Jun 2008 16:14:58 -0000 1.2 +++ dbus-qt3.spec 15 Jul 2008 18:03:28 -0000 1.3 @@ -6,27 +6,25 @@ %define qt3pkg qt3 %endif -%define svn 20080603svn +#define svn 20080603svn Name: dbus-qt3 Summary: Qt3 DBus Bindings -Version: 0.8.1 -Release: 1.%{svn}%{?dist} +Version: 0.9 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries Url: http://www.freedesktop.org/wiki/Software/DBusBindings -#Source0: http://people.freedesktop.org/~krake/dbus-1-qt3/libdbus-1-qt3-%{version}.tar.bz2 -Source0: dbus-qt3-20080603svn.tar.bz2 +Source0: http://people.freedesktop.org/~krake/dbus-1-qt3/dbus-1-qt3-%{version}.tar.gz Source1: dbus-qt3-svn_checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake libtool +%{?svn:BuildRequires: automake libtool} BuildRequires: dbus-devel BuildRequires: %{qt3pkg}-devel -#Obsoletes: libdbus-1-qt3 < %{version}-%{release} -Provides: libdbus-1-qt3 = %{version}-%{release} +Provides: dbus-1-qt3 = %{version}-%{release} %description This library provides Qt3-classes for accessing the DBus. @@ -34,8 +32,7 @@ %package devel Summary: Development files for %{name} Group: Development/Libraries -#Obsoletes: libdbus-1-qt3-devel < %{version}-%{release} -Provides: libdbus-1-qt3-devel = %{version}-%{release} +Provides: dbus-1-qt3-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: dbus-devel Requires: %{qt3pkg}-devel @@ -45,10 +42,9 @@ %prep -#setup -q -n libdbus-1-qt3-%{version} -%setup -q -n dbus-qt3 +%setup -q -n dbus-1-qt3-%{version} -make -f admin/Makefile.common +%{?svn:make -f admin/Makefile.common} %build @@ -93,6 +89,10 @@ %changelog +* Fri Jun 06 2008 Rex Dieter 0.9-1 +- dbus-1-qt3-0.9 +- Provides: dbus-1-qt3 + * Tue Jun 03 2008 Rex Dieter 0.8.1-1.20080603svn - 20080603svn snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dbus-qt3/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2008 16:14:58 -0000 1.3 +++ sources 15 Jul 2008 18:03:28 -0000 1.4 @@ -1 +1 @@ -3ae5ab8e53a3d02b46ac9ac66ceaaee7 dbus-qt3-20080603svn.tar.bz2 +bac29ed7e6355e30a370b7be8a61f367 dbus-1-qt3-0.9.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 18:04:47 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 18:04:47 GMT Subject: rpms/pcmanfm/F-9 .cvsignore, 1.17, 1.18 pcmanfm.spec, 1.20, 1.21 sources, 1.17, 1.18 pcmanfm-0.4.6-debug-warning.patch, 1.1, NONE pcmanfm-0.4.6.1-debug-warning.patch, 1.1, NONE Message-ID: <200807151804.m6FI4lC5028531@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28282/F-9 Modified Files: .cvsignore pcmanfm.spec sources Removed Files: pcmanfm-0.4.6-debug-warning.patch pcmanfm-0.4.6.1-debug-warning.patch Log Message: * Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 - 0.4.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 15 Jul 2008 02:54:39 -0000 1.17 +++ .cvsignore 15 Jul 2008 18:04:02 -0000 1.18 @@ -1 +1 @@ -pcmanfm-0.4.6.1.tar.gz +pcmanfm-0.4.6.2.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/pcmanfm.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pcmanfm.spec 15 Jul 2008 02:54:39 -0000 1.20 +++ pcmanfm.spec 15 Jul 2008 18:04:02 -0000 1.21 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6.1 +Version: 0.4.6.2 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,6 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.6.1-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -29,7 +28,6 @@ %prep %setup -q -%patch0 -p1 -b .debug # permission fix %{__chmod} 0644 \ @@ -96,6 +94,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 +- 0.4.6.2 + * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 - 0.4.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 15 Jul 2008 02:54:39 -0000 1.17 +++ sources 15 Jul 2008 18:04:02 -0000 1.18 @@ -1 +1 @@ -9edb184d0fdc8d5b19eaa66fe026a233 pcmanfm-0.4.6.1.tar.gz +35c314e29e4c93b80fe8230ca1a832dc pcmanfm-0.4.6.2.tar.gz --- pcmanfm-0.4.6-debug-warning.patch DELETED --- --- pcmanfm-0.4.6.1-debug-warning.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 18:05:02 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 18:05:02 GMT Subject: rpms/pcmanfm/F-8 .cvsignore, 1.17, 1.18 pcmanfm.spec, 1.20, 1.21 sources, 1.17, 1.18 pcmanfm-0.4.6-debug-warning.patch, 1.1, NONE pcmanfm-0.4.6.1-debug-warning.patch, 1.1, NONE Message-ID: <200807151805.m6FI52PT028558@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28282/F-8 Modified Files: .cvsignore pcmanfm.spec sources Removed Files: pcmanfm-0.4.6-debug-warning.patch pcmanfm-0.4.6.1-debug-warning.patch Log Message: * Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 - 0.4.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 15 Jul 2008 02:54:22 -0000 1.17 +++ .cvsignore 15 Jul 2008 18:03:39 -0000 1.18 @@ -1 +1 @@ -pcmanfm-0.4.6.1.tar.gz +pcmanfm-0.4.6.2.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/pcmanfm.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pcmanfm.spec 15 Jul 2008 02:54:22 -0000 1.20 +++ pcmanfm.spec 15 Jul 2008 18:03:39 -0000 1.21 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6.1 +Version: 0.4.6.2 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,6 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.6.1-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -29,7 +28,6 @@ %prep %setup -q -%patch0 -p1 -b .debug # permission fix %{__chmod} 0644 \ @@ -96,6 +94,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 +- 0.4.6.2 + * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 - 0.4.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 15 Jul 2008 02:54:22 -0000 1.17 +++ sources 15 Jul 2008 18:03:39 -0000 1.18 @@ -1 +1 @@ -9edb184d0fdc8d5b19eaa66fe026a233 pcmanfm-0.4.6.1.tar.gz +35c314e29e4c93b80fe8230ca1a832dc pcmanfm-0.4.6.2.tar.gz --- pcmanfm-0.4.6-debug-warning.patch DELETED --- --- pcmanfm-0.4.6.1-debug-warning.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 18:05:13 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 15 Jul 2008 18:05:13 GMT Subject: rpms/pcmanfm/devel .cvsignore, 1.17, 1.18 pcmanfm.spec, 1.20, 1.21 sources, 1.17, 1.18 pcmanfm-0.4.6-debug-warning.patch, 1.1, NONE pcmanfm-0.4.6.1-debug-warning.patch, 1.1, NONE Message-ID: <200807151805.m6FI5D2A028598@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28282/devel Modified Files: .cvsignore pcmanfm.spec sources Removed Files: pcmanfm-0.4.6-debug-warning.patch pcmanfm-0.4.6.1-debug-warning.patch Log Message: * Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 - 0.4.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 15 Jul 2008 02:54:53 -0000 1.17 +++ .cvsignore 15 Jul 2008 18:04:17 -0000 1.18 @@ -1 +1 @@ -pcmanfm-0.4.6.1.tar.gz +pcmanfm-0.4.6.2.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pcmanfm.spec 15 Jul 2008 02:54:53 -0000 1.20 +++ pcmanfm.spec 15 Jul 2008 18:04:17 -0000 1.21 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6.1 +Version: 0.4.6.2 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,7 +10,6 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz -Patch0: pcmanfm-0.4.6.1-debug-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -29,7 +28,6 @@ %prep %setup -q -%patch0 -p1 -b .debug # permission fix %{__chmod} 0644 \ @@ -96,6 +94,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 +- 0.4.6.2 + * Tue Jul 15 2008 Mamoru Tasaka - 0.4.6.1-1 - 0.4.6 - 0.4.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 15 Jul 2008 02:54:53 -0000 1.17 +++ sources 15 Jul 2008 18:04:17 -0000 1.18 @@ -1 +1 @@ -9edb184d0fdc8d5b19eaa66fe026a233 pcmanfm-0.4.6.1.tar.gz +35c314e29e4c93b80fe8230ca1a832dc pcmanfm-0.4.6.2.tar.gz --- pcmanfm-0.4.6-debug-warning.patch DELETED --- --- pcmanfm-0.4.6.1-debug-warning.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 15 18:05:34 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 15 Jul 2008 18:05:34 GMT Subject: rpms/dbus-qt3/F-9 .cvsignore, 1.3, 1.4 dbus-qt3.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200807151805.m6FI5YPo028620@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/dbus-qt3/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28524 Modified Files: .cvsignore dbus-qt3.spec sources Log Message: * Fri Jun 06 2008 Rex Dieter 0.9-1 - dbus-1-qt3-0.9 - Provides: dbus-1-qt3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dbus-qt3/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Jun 2008 16:16:21 -0000 1.3 +++ .cvsignore 15 Jul 2008 18:04:46 -0000 1.4 @@ -1 +1 @@ -dbus-qt3-20080603svn.tar.bz2 +dbus-1-qt3-0.9.tar.gz Index: dbus-qt3.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-qt3/F-9/dbus-qt3.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dbus-qt3.spec 3 Jun 2008 16:16:21 -0000 1.6 +++ dbus-qt3.spec 15 Jul 2008 18:04:46 -0000 1.7 @@ -6,27 +6,25 @@ %define qt3pkg qt3 %endif -%define svn 20080603svn +#define svn 20080603svn Name: dbus-qt3 Summary: Qt3 DBus Bindings -Version: 0.8.1 -Release: 1.%{svn}%{?dist} +Version: 0.9 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries Url: http://www.freedesktop.org/wiki/Software/DBusBindings -#Source0: http://people.freedesktop.org/~krake/dbus-1-qt3/libdbus-1-qt3-%{version}.tar.bz2 -Source0: dbus-qt3-20080603svn.tar.bz2 +Source0: http://people.freedesktop.org/~krake/dbus-1-qt3/dbus-1-qt3-%{version}.tar.gz Source1: dbus-qt3-svn_checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake libtool +%{?svn:BuildRequires: automake libtool} BuildRequires: dbus-devel BuildRequires: %{qt3pkg}-devel -#Obsoletes: libdbus-1-qt3 < %{version}-%{release} -Provides: libdbus-1-qt3 = %{version}-%{release} +Provides: dbus-1-qt3 = %{version}-%{release} %description This library provides Qt3-classes for accessing the DBus. @@ -34,8 +32,7 @@ %package devel Summary: Development files for %{name} Group: Development/Libraries -#Obsoletes: libdbus-1-qt3-devel < %{version}-%{release} -Provides: libdbus-1-qt3-devel = %{version}-%{release} +Provides: dbus-1-qt3-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: dbus-devel Requires: %{qt3pkg}-devel @@ -45,10 +42,9 @@ %prep -#setup -q -n libdbus-1-qt3-%{version} -%setup -q -n dbus-qt3 +%setup -q -n dbus-1-qt3-%{version} -make -f admin/Makefile.common +%{?svn:make -f admin/Makefile.common} %build @@ -93,6 +89,10 @@ %changelog +* Fri Jun 06 2008 Rex Dieter 0.9-1 +- dbus-1-qt3-0.9 +- Provides: dbus-1-qt3 + * Tue Jun 03 2008 Rex Dieter 0.8.1-1.20080603svn - 20080603svn snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dbus-qt3/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2008 16:16:21 -0000 1.3 +++ sources 15 Jul 2008 18:04:46 -0000 1.4 @@ -1 +1 @@ -3ae5ab8e53a3d02b46ac9ac66ceaaee7 dbus-qt3-20080603svn.tar.bz2 +bac29ed7e6355e30a370b7be8a61f367 dbus-1-qt3-0.9.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 18:11:54 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 15 Jul 2008 18:11:54 GMT Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.33,1.34 Message-ID: <200807151811.m6FIBsnE029219@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drivers/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29108 Modified Files: xorg-x11-drivers.spec Log Message: * Tue Jul 15 2008 Adam Jackson 7.3-7 - Comment cleanup. - Add imstt to ppc, just for giggles. Index: xorg-x11-drivers.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- xorg-x11-drivers.spec 15 Jul 2008 17:57:46 -0000 1.33 +++ xorg-x11-drivers.spec 15 Jul 2008 18:11:06 -0000 1.34 @@ -1,7 +1,7 @@ Summary: X.Org X11 driver installation package Name: xorg-x11-drivers Version: 7.3 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,8 +16,6 @@ # this list. # # Notable things missing: -# - all the sun* drivers -# - imstt, likely ppc only # - impact, since we don't have a mips port # - vermilion, the hardware is fictional # - poulsbo, likewise @@ -110,6 +108,13 @@ %ifarch %{ix86} x86_64 Requires: xorg-x11-drv-vmmouse %endif + +# This was a mac-only card. If you've got one, we might as well make it work. +%ifarch ppc ppc64 +Requires: xorg-x11-drv-imstt +%endif + +# Sun kit, sparc-only. %ifarch sparc sparcv9 sparc64 Requires: xorg-x11-drv-suntcx Requires: xorg-x11-drv-suncg3 @@ -140,6 +145,10 @@ %defattr(-,root,root,-) %changelog +* Tue Jul 15 2008 Adam Jackson 7.3-7 +- Comment cleanup. +- Add imstt to ppc, just for giggles. + * Tue Jul 15 2008 Warren Togami 7.3-6 - amd was renamed to geode From fedora-extras-commits at redhat.com Tue Jul 15 18:12:01 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Tue, 15 Jul 2008 18:12:01 GMT Subject: rpms/sugar-toolkit/F-9 .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 sugar-toolkit.spec, 1.12, 1.13 Message-ID: <200807151812.m6FIC1xe029265@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105 Modified Files: .cvsignore sources sugar-toolkit.spec Log Message: * Tue Jul 15 2008 Simon Schampijer - 0.81.6-3.20080715gitd17347cc19 - git snapshot - 7523 fix content bundle installation - 5079 simplify sharing code - 4208 get_icon_state accepts negative step kwarg - 7444 Fix crash in get_joined_buddies when a buddy disappears uncleanly Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Jul 2008 12:39:11 -0000 1.9 +++ .cvsignore 15 Jul 2008 18:11:08 -0000 1.10 @@ -1 +1 @@ -sugar-toolkit-0.81.6-git92ef9d298a.tar.bz2 +sugar-toolkit-0.81.6-gitd17347cc19.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 9 Jul 2008 12:39:11 -0000 1.10 +++ sources 15 Jul 2008 18:11:08 -0000 1.11 @@ -1 +1 @@ -ee116ab1dd166d755a7adebea6de09a5 sugar-toolkit-0.81.6-git92ef9d298a.tar.bz2 +61fdb0e546b4798ba43d674188ab3e3a sugar-toolkit-0.81.6-gitd17347cc19.tar.bz2 Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sugar-toolkit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sugar-toolkit.spec 9 Jul 2008 12:39:11 -0000 1.12 +++ sugar-toolkit.spec 15 Jul 2008 18:11:08 -0000 1.13 @@ -1,13 +1,13 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -%define commitid 92ef9d298a -%define alphatag 20080709git%{commitid} +%define commitid d17347cc19 +%define alphatag 20080715git%{commitid} Summary: Sugar toolkit Name: sugar-toolkit Version: 0.81.6 #Release: 1%{?dist} -Release: 2.%{alphatag}%{?dist} +Release: 3.%{alphatag}%{?dist} URL: http://wiki.laptop.org/go/Sugar # git clone git://dev.laptop.org/sugar # cd sugar @@ -65,6 +65,13 @@ %{_sysconfdir}/rpm/macros.sugar %changelog +* Tue Jul 15 2008 Simon Schampijer - 0.81.6-3.20080715gitd17347cc19 +- git snapshot +- 7523 fix content bundle installation +- 5079 simplify sharing code +- 4208 get_icon_state accepts negative step kwarg +- 7444 Fix crash in get_joined_buddies when a buddy disappears uncleanly + * Wed Jul 09 2008 Simon Schampijer - 0.81.6-2.20080709git92ef9d298a - git snapshot - 7430 Preserve the favorites layout across reboots From fedora-extras-commits at redhat.com Tue Jul 15 18:16:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 18:16:46 +0000 Subject: [pkgdb] python-IPy had acl change status Message-ID: <200807151816.m6FIGkog027696@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on python-IPy (Fedora EPEL 5) to Approved for Mike Frisch (mfrisch) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-IPy From fedora-extras-commits at redhat.com Tue Jul 15 18:18:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 15 Jul 2008 18:18:09 +0000 Subject: [pkgdb] python-IPy: mfrisch has requested watchcommits Message-ID: <200807151818.m6FII9LQ027831@bastion.fedora.phx.redhat.com> Mike Frisch (mfrisch) has requested the watchcommits acl on python-IPy (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-IPy From fedora-extras-commits at redhat.com Tue Jul 15 18:28:48 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Tue, 15 Jul 2008 18:28:48 GMT Subject: rpms/kexec-tools/F-9 kexec-tools-1.102pre-typos.patch, NONE, 1.1 kexec-tools.spec, 1.114, 1.115 Message-ID: <200807151828.m6FISmKm030593@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/kexec-tools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30493 Modified Files: kexec-tools.spec Added Files: kexec-tools-1.102pre-typos.patch Log Message: Resolves: bz 455148 kexec-tools-1.102pre-typos.patch: --- NEW FILE kexec-tools-1.102pre-typos.patch --- diff -up kexec-tools-testing-20070330/kdump/kdump.c.orig kexec-tools-testing-20070330/kdump/kdump.c --- kexec-tools-testing-20070330/kdump/kdump.c.orig 2008-07-15 13:41:02.000000000 -0400 +++ kexec-tools-testing-20070330/kdump/kdump.c 2008-07-15 13:41:09.000000000 -0400 @@ -235,7 +235,7 @@ int main(int argc, char **argv) } start_addr = strtoull(start_addr_str, &end, 0); if ((start_addr_str == end) || (*end != '\0')) { - fprintf(stderr, "Bad core dump start addres: %s\n", + fprintf(stderr, "Bad core dump start address: %s\n", start_addr_str); exit(2); } diff -up kexec-tools-testing-20070330/kexec/kexec.8.orig kexec-tools-testing-20070330/kexec/kexec.8 --- kexec-tools-testing-20070330/kexec/kexec.8.orig 2008-07-15 12:56:10.000000000 -0400 +++ kexec-tools-testing-20070330/kexec/kexec.8 2008-07-15 13:04:12.000000000 -0400 @@ -144,7 +144,7 @@ Specify the highest memory address to load code into. .SH SUPPORTED KERNEL FILE TYPES AND OPTIONS -.B Beoboot-x86 +.B beoboot-x86 .RS .TP .B \-\-args\-elf @@ -183,6 +183,41 @@ Use as the kernel's initial ramdisk. .RE .PP +.B bzImage-x86 +.RS +.TP +.BI \-\-append= string +Append +.I string +to the kernel command line. +.TP +.BI \-\-command\-line= string +Set the kernel command line to +.IR string . +.TP +.BI \-\-reuse-cmdline +Use the command line from the running system. When a panic kernel is loaded, it +strips the +.I +crashkernel +parameter automatically. The +.I BOOT_IMAGE +parameter is also stripped. +.TP +.BI \-\-initrd= file +Use +.I file +as the kernel's initial ramdisk. +.TP +.BI \-\-ramdisk= file +Use +.I file +as the kernel's initial ramdisk. +.TP +.BI \-\-real-mode +Use real-mode entry point. +.RE +.PP .B multiboot-x86 .RS .TP diff -up kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c.orig kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c --- kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c.orig 2008-07-15 13:28:25.000000000 -0400 +++ kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c 2008-07-15 13:28:31.000000000 -0400 @@ -131,7 +131,7 @@ void arch_usage(void) printf( " --reset-vga Attempt to reset a standard vga device\n" " --serial= Specify the serial port for debug output\n" - " --serial-baud= Specify the serial port baud rate\n" + " --serial-baud= Specify the serial port baud rate\n" " --console-vga Enable the vga console\n" " --console-serial Enable the serial console\n" " --elf32-core-headers Prepare core headers in ELF32 format\n" diff -up kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c.orig kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c --- kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c.orig 2008-07-15 13:28:41.000000000 -0400 +++ kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c 2008-07-15 13:28:47.000000000 -0400 @@ -133,7 +133,7 @@ void arch_usage(void) printf( " --reset-vga Attempt to reset a standard vga device\n" " --serial= Specify the serial port for debug output\n" - " --serial-baud= Specify the serial port baud rate\n" + " --serial-baud= Specify the serial port baud rate\n" " --console-vga Enable the vga console\n" " --console-serial Enable the serial console\n" ); Index: kexec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/F-9/kexec-tools.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- kexec-tools.spec 14 Jul 2008 13:46:36 -0000 1.114 +++ kexec-tools.spec 15 Jul 2008 18:27:56 -0000 1.115 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.102pre -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -69,6 +69,7 @@ Patch605: kexec-tools-1.102pre-vmcoreinfo.patch Patch606: kexec-tools-1.102pre-makedumpfile-makefile.patch Patch607: kexec-tools-1.102pre-cmdline-length.patch +Patch608: kexec-tools-1.102pre-typos.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -101,6 +102,7 @@ %patch605 -p1 %patch606 -p1 %patch607 -p1 +%patch608 -p1 tar -z -x -v -f %{SOURCE13} @@ -229,6 +231,9 @@ %doc kexec-kdump-howto.txt %changelog +* Tue Jul 15 2008 Neil Horman - 1.102pre-11 +- Fix up some misc typos (bz 455148) + * Mon Jul 14 2008 Neil Horman - 1.102pre-10 - Fix mkdumprd to support dynamic build busybox (bz 443878) From fedora-extras-commits at redhat.com Tue Jul 15 18:32:25 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Tue, 15 Jul 2008 18:32:25 GMT Subject: rpms/odfpy/devel import.log, NONE, 1.1 odfpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151832.m6FIWPW3031069@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/odfpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30960/devel Modified Files: .cvsignore sources Added Files: import.log odfpy.spec Log Message: importing odfpy-0.7-2 in devel --- NEW FILE import.log --- odfpy-0_7-2_fc9:HEAD:odfpy-0.7-2.fc9.src.rpm:1216146661 --- NEW FILE odfpy.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: odfpy Version: 0.7 Release: 2%{?dist} Summary: Python library for manipulating OpenDocument files Group: Development/Languages License: GPLv2+ URL: http://opendocumentfellowship.com/projects/%{name} Source0: http://opendocumentfellowship.com/files/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools %description Odfpy aims to be a complete API for OpenDocument in Python. Unlike other more convenient APIs, this one is essentially an abstraction layer just above the XML format. The main focus has been to prevent the programmer from creating invalid documents. It has checks that raise an exception if the programmer adds an invalid element, adds an attribute unknown to the grammar, forgets to add a required attribute or adds text to an element that doesn't allow it. These checks and the API itself were generated from the RelaxNG schema, and then hand-edited. Therefore the API is complete and can handle all ODF constructions, but could be improved in its understanding of data types. %prep %setup -q %build CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} sed -i '/#!\/usr\/bin\/python/d' %{buildroot}%{python_sitelib}/odf/*.py %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir examples %docdir contrib %{_bindir}/* %{_mandir}/man1/* %{python_sitelib}/*egg-info %{python_sitelib}/odf %changelog * Tue Jul 15 2008 Ian Weller 0.7-2 - Change macros - Remove license file * Sun Jul 13 2008 Ian Weller 0.7-1 - Add COPYING file - Use setuptools instead - sed out shebangs from module files - Other minor fixes * Sun Jul 13 2008 Paul W. Frields - 0.7-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:53:18 -0000 1.1 +++ .cvsignore 15 Jul 2008 18:31:29 -0000 1.2 @@ -0,0 +1 @@ +odfpy-0.7.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:53:18 -0000 1.1 +++ sources 15 Jul 2008 18:31:29 -0000 1.2 @@ -0,0 +1 @@ +cea1c5bf445d3eeacca23f3de5ac0f94 odfpy-0.7.tgz From fedora-extras-commits at redhat.com Tue Jul 15 18:33:33 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Tue, 15 Jul 2008 18:33:33 GMT Subject: rpms/knetworkmanager/devel .cvsignore, 1.13, 1.14 knetworkmanager.spec, 1.21, 1.22 sources, 1.13, 1.14 Message-ID: <200807151833.m6FIXXE2031248@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/knetworkmanager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31054 Modified Files: .cvsignore knetworkmanager.spec sources Log Message: update to new svn snapshot, reenable subpackages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/knetworkmanager/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 3 Jun 2008 17:08:12 -0000 1.13 +++ .cvsignore 15 Jul 2008 18:32:38 -0000 1.14 @@ -1 +1 @@ -knetworkmanager-0.7-20080603svn.tar.bz2 +knetworkmanager-0.7-20080715svn.tar.bz2 Index: knetworkmanager.spec =================================================================== RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- knetworkmanager.spec 3 Jun 2008 17:59:48 -0000 1.21 +++ knetworkmanager.spec 15 Jul 2008 18:32:38 -0000 1.22 @@ -1,8 +1,8 @@ -%define svn 20080603svn +%define svn 20080715svn Name: knetworkmanager Version: 0.7 -Release: 0.4.%{svn}%{?dist} +Release: 0.5.%{svn}%{?dist} Summary: KDE applet for Network Manager Group: Applications/Internet @@ -13,7 +13,6 @@ Source1: knetworkmanager-svn_checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: knetworkmanager-0.7-pptp.patch BuildRequires: automake libtool BuildRequires: dbus-qt3-devel >= 0.8.1 @@ -25,12 +24,6 @@ KNetworkManager is a system tray applet for controlling network connections on systems that use the NetworkManager daemon. -# upgrade path, until otherwise sorted out -- Rex -Obsoletes: %{name}-openvpn < %{version}-%{release} -Obsoletes: %{name}-vpnc < %{version}-%{release} -Obsoletes: %{name}-pptp < %{version}-%{release} -Obsoletes: %{name}-devel < %{version}-%{release} - %package openvpn Summary: knetworkmanager openvpn client Group: Applications/Internet @@ -66,7 +59,6 @@ %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .pptp make -f admin/Makefile.common @@ -74,7 +66,10 @@ %build %configure \ --disable-rpath \ - --disable-warnings + --disable-warnings \ + --with-openvpn \ + --with-vpnc \ + --with-pptp # not smp safe make @@ -111,11 +106,6 @@ mv %{buildroot}%{_datadir}/icons/crystalsvg \ %{buildroot}%{_datadir}/icons/hicolor -## unpackaged files -# omit these for now, don't feel like re-instating a -devel pkg -# and dealing with multilib -- Rex -rm -rf %{buildroot}%{_includedir} - %clean rm -rf %{buildroot} @@ -144,29 +134,29 @@ %{_datadir}/servicetypes/knetworkmanager_plugin.desktop %{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop -#%files devel -#%defattr(-,root,root,-) -#%{_includedir}/knetworkmanager-plugin.h -#%{_includedir}/knetworkmanager-vpnplugin.h - -#%files openvpn -#%defattr(-,root,root,-) -#%{_libdir}/kde3/knetworkmanager_openvpn.la -#%{_libdir}/kde3/knetworkmanager_openvpn.so -#%{_libdir}/kde3/knetworkmanager_openvpn.so.0 -#%{_libdir}/kde3/knetworkmanager_openvpn.so.0.0.0 -#%{_datadir}/services/knetworkmanager_openvpn.desktop - -#%files vpnc -#%defattr(-,root,root,-) -#%{_libdir}/kde3/knetworkmanager_vpnc.la -#%{_libdir}/kde3/knetworkmanager_vpnc.so -#%{_libdir}/kde3/knetworkmanager_vpnc.so.0 -#%{_libdir}/kde3/knetworkmanager_vpnc.so.0.0.0 -#%{_datadir}/services/knetworkmanager_vpnc.desktop +%files devel +%defattr(-,root,root,-) +%{_includedir}/knetworkmanager-plugin.h +%{_includedir}/knetworkmanager-vpnplugin.h + +%files openvpn +%defattr(-,root,root,-) +%{_libdir}/kde3/knetworkmanager_openvpn.la +%{_libdir}/kde3/knetworkmanager_openvpn.so +%{_libdir}/kde3/knetworkmanager_openvpn.so.0 +%{_libdir}/kde3/knetworkmanager_openvpn.so.0.0.0 +%{_datadir}/services/knetworkmanager_openvpn.desktop -#%files pptp -#%defattr(-,root,root,-) +%files vpnc +%defattr(-,root,root,-) +%{_libdir}/kde3/knetworkmanager_vpnc.la +%{_libdir}/kde3/knetworkmanager_vpnc.so +%{_libdir}/kde3/knetworkmanager_vpnc.so.0 +%{_libdir}/kde3/knetworkmanager_vpnc.so.0.0.0 +%{_datadir}/services/knetworkmanager_vpnc.desktop + +%files pptp +%defattr(-,root,root,-) #%{_libdir}/kde3/knetworkmanager_pptp.la #%{_libdir}/kde3/knetworkmanager_pptp.so #%{_libdir}/kde3/knetworkmanager_pptp.so.0 @@ -175,6 +165,11 @@ %changelog +* Tue Jul 15 2008 Dennis Gilmore - 0.7-0.5.20080715svn +- update to latest snapshot +- renable all sub-packages +- pptp is still not upstream but we will create a blank rpm for now. + * Tue Jun 03 2008 Rex Dieter - 0.7-0.4.20080603svn - 20080603 snapshot - Obsoletes for subpkgs not included Index: sources =================================================================== RCS file: /cvs/extras/rpms/knetworkmanager/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 3 Jun 2008 17:08:12 -0000 1.13 +++ sources 15 Jul 2008 18:32:38 -0000 1.14 @@ -1 +1 @@ -003a4d5b67a613b43482b2d3e1e0d2a5 knetworkmanager-0.7-20080603svn.tar.bz2 +6fd9dcad8e3d0ac07fe3e0c6f662fdee knetworkmanager-0.7-20080715svn.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 15 18:34:47 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Tue, 15 Jul 2008 18:34:47 GMT Subject: rpms/odfpy/EL-4 import.log, NONE, 1.1 odfpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151834.m6FIYlnD031440@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/odfpy/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31337/EL-4 Modified Files: .cvsignore sources Added Files: import.log odfpy.spec Log Message: importing odfpy-0.7-2 in EL-4 --- NEW FILE import.log --- odfpy-0_7-2_fc9:EL-4:odfpy-0.7-2.fc9.src.rpm:1216146819 --- NEW FILE odfpy.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: odfpy Version: 0.7 Release: 2%{?dist} Summary: Python library for manipulating OpenDocument files Group: Development/Languages License: GPLv2+ URL: http://opendocumentfellowship.com/projects/%{name} Source0: http://opendocumentfellowship.com/files/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools %description Odfpy aims to be a complete API for OpenDocument in Python. Unlike other more convenient APIs, this one is essentially an abstraction layer just above the XML format. The main focus has been to prevent the programmer from creating invalid documents. It has checks that raise an exception if the programmer adds an invalid element, adds an attribute unknown to the grammar, forgets to add a required attribute or adds text to an element that doesn't allow it. These checks and the API itself were generated from the RelaxNG schema, and then hand-edited. Therefore the API is complete and can handle all ODF constructions, but could be improved in its understanding of data types. %prep %setup -q %build CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} sed -i '/#!\/usr\/bin\/python/d' %{buildroot}%{python_sitelib}/odf/*.py %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir examples %docdir contrib %{_bindir}/* %{_mandir}/man1/* %{python_sitelib}/*egg-info %{python_sitelib}/odf %changelog * Tue Jul 15 2008 Ian Weller 0.7-2 - Change macros - Remove license file * Sun Jul 13 2008 Ian Weller 0.7-1 - Add COPYING file - Use setuptools instead - sed out shebangs from module files - Other minor fixes * Sun Jul 13 2008 Paul W. Frields - 0.7-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:53:18 -0000 1.1 +++ .cvsignore 15 Jul 2008 18:33:51 -0000 1.2 @@ -0,0 +1 @@ +odfpy-0.7.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:53:18 -0000 1.1 +++ sources 15 Jul 2008 18:33:51 -0000 1.2 @@ -0,0 +1 @@ +cea1c5bf445d3eeacca23f3de5ac0f94 odfpy-0.7.tgz From fedora-extras-commits at redhat.com Tue Jul 15 18:36:18 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Tue, 15 Jul 2008 18:36:18 GMT Subject: rpms/odfpy/EL-5 import.log, NONE, 1.1 odfpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151836.m6FIaIh6031601@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/odfpy/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31542/EL-5 Modified Files: .cvsignore sources Added Files: import.log odfpy.spec Log Message: importing odfpy-0.7-2 in EL-5 --- NEW FILE import.log --- odfpy-0_7-2_fc9:EL-5:odfpy-0.7-2.fc9.src.rpm:1216146910 --- NEW FILE odfpy.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: odfpy Version: 0.7 Release: 2%{?dist} Summary: Python library for manipulating OpenDocument files Group: Development/Languages License: GPLv2+ URL: http://opendocumentfellowship.com/projects/%{name} Source0: http://opendocumentfellowship.com/files/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools %description Odfpy aims to be a complete API for OpenDocument in Python. Unlike other more convenient APIs, this one is essentially an abstraction layer just above the XML format. The main focus has been to prevent the programmer from creating invalid documents. It has checks that raise an exception if the programmer adds an invalid element, adds an attribute unknown to the grammar, forgets to add a required attribute or adds text to an element that doesn't allow it. These checks and the API itself were generated from the RelaxNG schema, and then hand-edited. Therefore the API is complete and can handle all ODF constructions, but could be improved in its understanding of data types. %prep %setup -q %build CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} sed -i '/#!\/usr\/bin\/python/d' %{buildroot}%{python_sitelib}/odf/*.py %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir examples %docdir contrib %{_bindir}/* %{_mandir}/man1/* %{python_sitelib}/*egg-info %{python_sitelib}/odf %changelog * Tue Jul 15 2008 Ian Weller 0.7-2 - Change macros - Remove license file * Sun Jul 13 2008 Ian Weller 0.7-1 - Add COPYING file - Use setuptools instead - sed out shebangs from module files - Other minor fixes * Sun Jul 13 2008 Paul W. Frields - 0.7-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:53:18 -0000 1.1 +++ .cvsignore 15 Jul 2008 18:35:26 -0000 1.2 @@ -0,0 +1 @@ +odfpy-0.7.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:53:18 -0000 1.1 +++ sources 15 Jul 2008 18:35:26 -0000 1.2 @@ -0,0 +1 @@ +cea1c5bf445d3eeacca23f3de5ac0f94 odfpy-0.7.tgz From fedora-extras-commits at redhat.com Tue Jul 15 18:38:19 2008 From: fedora-extras-commits at redhat.com (Frank Ch. Eigler (fche)) Date: Tue, 15 Jul 2008 18:38:19 GMT Subject: rpms/systemtap/F-9 .cvsignore, 1.12, 1.13 sources, 1.25, 1.26 systemtap.spec, 1.39, 1.40 Message-ID: <200807151838.m6FIcJnw031874@cvs-int.fedora.redhat.com> Author: fche Update of /cvs/pkgs/rpms/systemtap/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31750 Modified Files: .cvsignore sources systemtap.spec Log Message: * v0.7 release prep Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 27 Mar 2008 19:56:26 -0000 1.12 +++ .cvsignore 15 Jul 2008 18:37:21 -0000 1.13 @@ -1 +1 @@ -systemtap-0.6.2.tar.gz +systemtap-0.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 27 Mar 2008 19:56:26 -0000 1.25 +++ sources 15 Jul 2008 18:37:21 -0000 1.26 @@ -1 +1 @@ -97a313be6dece97e0514d0c9a863413c systemtap-0.6.2.tar.gz +ca34da0111256d5d03367e84f92d520b systemtap-0.7.tar.gz Index: systemtap.spec =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/F-9/systemtap.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- systemtap.spec 27 Mar 2008 19:55:02 -0000 1.39 +++ systemtap.spec 15 Jul 2008 18:37:21 -0000 1.40 @@ -1,26 +1,15 @@ -# Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases. %define release 1 -# Version number of oldest elfutils release that works with systemtap. -%define elfutils_version 0.131 - -# Default options (suitable for fedora) %define with_sqlite 1 %define with_docs 1 %define with_crash 0 %define with_bundled_elfutils 0 - -# Enable these options by default for RHEL -%if 0%{?rhel} >= 5 -%define with_crash 1 -%define with_bundled_elfutils 1 -%endif +%define elfutils_version 0.127 Name: systemtap -Version: 0.6.2 +Version: 0.7 Release: %{release}%{?dist} Summary: Instrumentation System Group: Development/System -ExcludeArch: ppc License: GPLv2+ URL: http://sourceware.org/systemtap/ Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz @@ -141,16 +130,19 @@ %configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} make %{?_smp_mflags} +%install +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=$RPM_BUILD_ROOT install + +# We want the examples in the special doc dir, not the generoc doc install dir. +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples + # Fix paths in the example & testsuite scripts find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@' # To avoid perl dependency, make perl sample script non-executable chmod -x examples/samples/kmalloc-top -%install -rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=$RPM_BUILD_ROOT install - # Because "make install" may install staprun with mode 04111, the # post-processing programs rpmbuild runs won't be able to read it. # So, we change permissions so that they can read it. We'll set the @@ -159,8 +151,12 @@ # Copy over the testsuite cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap -mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/src -cp -rp examples $RPM_BUILD_ROOT%{_datadir}/%{name}/src + +#%if %{with_docs} +# We want the manuals in the special doc dir, not the generic doc install dir. +mkdir docs.installed +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ +#%endif %clean rm -rf ${RPM_BUILD_ROOT} @@ -175,8 +171,7 @@ %doc README AUTHORS NEWS COPYING examples %if %{with_docs} -%doc doc/tutorial.pdf -%doc doc/langref.pdf +%doc docs.installed/*.pdf %endif %{_bindir}/stap @@ -207,28 +202,16 @@ %files testsuite %defattr(-,root,root) -%{_datadir}/%{name}/src %{_datadir}/%{name}/testsuite %changelog -* Thu Mar 27 2008 Will Cohen - 0.6.2-1 -- Rebase. - -* Wed Feb 21 2008 Will Cohen - 0.6.1-8 -- Bump version. - -* Wed Feb 13 2008 Will Cohen - 0.6.1-5 -- Correct elfi typo in runtime/stack-i386.c. - -* Tue Feb 12 2008 Will Cohen - 0.6.1-4 -- Add patch for gcc 4.3. +* Tue Jul 15 2008 Frank Ch. Eigler - 0.7-1 +- Upstream release. * Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-3 -- Add zlib-devel dependency which is supposed to come from crash-devel. - -* Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-2 -- Process testsuite .stp files to fool "#! stap" dep. finder. +- Add zlib-devel to buildreq; missing from crash-devel +- Process testsuite .stp files for #!stap->#!/usr/bin/stap * Fri Jan 18 2008 Frank Ch. Eigler - 0.6.1-1 - Add crash-devel buildreq to build staplog.so crash(8) module. From fedora-extras-commits at redhat.com Tue Jul 15 18:38:21 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Tue, 15 Jul 2008 18:38:21 GMT Subject: rpms/odfpy/F-8 import.log, NONE, 1.1 odfpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151838.m6FIcLkp031880@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/odfpy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31730/F-8 Modified Files: .cvsignore sources Added Files: import.log odfpy.spec Log Message: importing odfpy-0.7-2 in F-8 --- NEW FILE import.log --- odfpy-0_7-2_fc9:F-8:odfpy-0.7-2.fc9.src.rpm:1216146999 --- NEW FILE odfpy.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: odfpy Version: 0.7 Release: 2%{?dist} Summary: Python library for manipulating OpenDocument files Group: Development/Languages License: GPLv2+ URL: http://opendocumentfellowship.com/projects/%{name} Source0: http://opendocumentfellowship.com/files/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools %description Odfpy aims to be a complete API for OpenDocument in Python. Unlike other more convenient APIs, this one is essentially an abstraction layer just above the XML format. The main focus has been to prevent the programmer from creating invalid documents. It has checks that raise an exception if the programmer adds an invalid element, adds an attribute unknown to the grammar, forgets to add a required attribute or adds text to an element that doesn't allow it. These checks and the API itself were generated from the RelaxNG schema, and then hand-edited. Therefore the API is complete and can handle all ODF constructions, but could be improved in its understanding of data types. %prep %setup -q %build CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} sed -i '/#!\/usr\/bin\/python/d' %{buildroot}%{python_sitelib}/odf/*.py %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir examples %docdir contrib %{_bindir}/* %{_mandir}/man1/* %{python_sitelib}/*egg-info %{python_sitelib}/odf %changelog * Tue Jul 15 2008 Ian Weller 0.7-2 - Change macros - Remove license file * Sun Jul 13 2008 Ian Weller 0.7-1 - Add COPYING file - Use setuptools instead - sed out shebangs from module files - Other minor fixes * Sun Jul 13 2008 Paul W. Frields - 0.7-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:53:18 -0000 1.1 +++ .cvsignore 15 Jul 2008 18:36:52 -0000 1.2 @@ -0,0 +1 @@ +odfpy-0.7.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:53:18 -0000 1.1 +++ sources 15 Jul 2008 18:36:52 -0000 1.2 @@ -0,0 +1 @@ +cea1c5bf445d3eeacca23f3de5ac0f94 odfpy-0.7.tgz From fedora-extras-commits at redhat.com Tue Jul 15 18:39:51 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Tue, 15 Jul 2008 18:39:51 GMT Subject: rpms/odfpy/F-9 import.log, NONE, 1.1 odfpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807151839.m6FIdpn1032150@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/odfpy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32024/F-9 Modified Files: .cvsignore sources Added Files: import.log odfpy.spec Log Message: importing odfpy-0.7-2 in F-9 --- NEW FILE import.log --- odfpy-0_7-2_fc9:F-9:odfpy-0.7-2.fc9.src.rpm:1216147126 --- NEW FILE odfpy.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: odfpy Version: 0.7 Release: 2%{?dist} Summary: Python library for manipulating OpenDocument files Group: Development/Languages License: GPLv2+ URL: http://opendocumentfellowship.com/projects/%{name} Source0: http://opendocumentfellowship.com/files/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools %description Odfpy aims to be a complete API for OpenDocument in Python. Unlike other more convenient APIs, this one is essentially an abstraction layer just above the XML format. The main focus has been to prevent the programmer from creating invalid documents. It has checks that raise an exception if the programmer adds an invalid element, adds an attribute unknown to the grammar, forgets to add a required attribute or adds text to an element that doesn't allow it. These checks and the API itself were generated from the RelaxNG schema, and then hand-edited. Therefore the API is complete and can handle all ODF constructions, but could be improved in its understanding of data types. %prep %setup -q %build CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} sed -i '/#!\/usr\/bin\/python/d' %{buildroot}%{python_sitelib}/odf/*.py %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir examples %docdir contrib %{_bindir}/* %{_mandir}/man1/* %{python_sitelib}/*egg-info %{python_sitelib}/odf %changelog * Tue Jul 15 2008 Ian Weller 0.7-2 - Change macros - Remove license file * Sun Jul 13 2008 Ian Weller 0.7-1 - Add COPYING file - Use setuptools instead - sed out shebangs from module files - Other minor fixes * Sun Jul 13 2008 Paul W. Frields - 0.7-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:53:18 -0000 1.1 +++ .cvsignore 15 Jul 2008 18:38:54 -0000 1.2 @@ -0,0 +1 @@ +odfpy-0.7.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/odfpy/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:53:18 -0000 1.1 +++ sources 15 Jul 2008 18:38:54 -0000 1.2 @@ -0,0 +1 @@ +cea1c5bf445d3eeacca23f3de5ac0f94 odfpy-0.7.tgz From fedora-extras-commits at redhat.com Tue Jul 15 18:40:55 2008 From: fedora-extras-commits at redhat.com (Frank Ch. Eigler (fche)) Date: Tue, 15 Jul 2008 18:40:55 GMT Subject: rpms/systemtap/F-8 .cvsignore, 1.12, 1.13 sources, 1.25, 1.26 systemtap.spec, 1.38, 1.39 Message-ID: <200807151840.m6FIetEX032325@cvs-int.fedora.redhat.com> Author: fche Update of /cvs/pkgs/rpms/systemtap/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32146 Modified Files: .cvsignore sources systemtap.spec Log Message: * v0.7 release prep Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/F-8/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 27 Mar 2008 20:12:15 -0000 1.12 +++ .cvsignore 15 Jul 2008 18:39:55 -0000 1.13 @@ -1 +1 @@ -systemtap-0.6.2.tar.gz +systemtap-0.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/F-8/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 27 Mar 2008 20:12:15 -0000 1.25 +++ sources 15 Jul 2008 18:39:55 -0000 1.26 @@ -1 +1 @@ -97a313be6dece97e0514d0c9a863413c systemtap-0.6.2.tar.gz +ca34da0111256d5d03367e84f92d520b systemtap-0.7.tar.gz Index: systemtap.spec =================================================================== RCS file: /cvs/pkgs/rpms/systemtap/F-8/systemtap.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- systemtap.spec 27 Mar 2008 20:12:15 -0000 1.38 +++ systemtap.spec 15 Jul 2008 18:39:55 -0000 1.39 @@ -1,26 +1,15 @@ -# Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases. %define release 1 -# Version number of oldest elfutils release that works with systemtap. -%define elfutils_version 0.131 - -# Default options (suitable for fedora) %define with_sqlite 1 %define with_docs 1 %define with_crash 0 %define with_bundled_elfutils 0 - -# Enable these options by default for RHEL -%if 0%{?rhel} >= 5 -%define with_crash 1 -%define with_bundled_elfutils 1 -%endif +%define elfutils_version 0.127 Name: systemtap -Version: 0.6.2 +Version: 0.7 Release: %{release}%{?dist} Summary: Instrumentation System Group: Development/System -ExcludeArch: ppc License: GPLv2+ URL: http://sourceware.org/systemtap/ Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz @@ -141,16 +130,19 @@ %configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} make %{?_smp_mflags} +%install +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=$RPM_BUILD_ROOT install + +# We want the examples in the special doc dir, not the generoc doc install dir. +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples + # Fix paths in the example & testsuite scripts find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@' # To avoid perl dependency, make perl sample script non-executable chmod -x examples/samples/kmalloc-top -%install -rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=$RPM_BUILD_ROOT install - # Because "make install" may install staprun with mode 04111, the # post-processing programs rpmbuild runs won't be able to read it. # So, we change permissions so that they can read it. We'll set the @@ -159,8 +151,12 @@ # Copy over the testsuite cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap -mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/src -cp -rp examples $RPM_BUILD_ROOT%{_datadir}/%{name}/src + +#%if %{with_docs} +# We want the manuals in the special doc dir, not the generic doc install dir. +mkdir docs.installed +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ +#%endif %clean rm -rf ${RPM_BUILD_ROOT} @@ -175,8 +171,7 @@ %doc README AUTHORS NEWS COPYING examples %if %{with_docs} -%doc doc/tutorial.pdf -%doc doc/langref.pdf +%doc docs.installed/*.pdf %endif %{_bindir}/stap @@ -207,28 +202,16 @@ %files testsuite %defattr(-,root,root) -%{_datadir}/%{name}/src %{_datadir}/%{name}/testsuite %changelog -* Thu Mar 27 2008 Will Cohen - 0.6.2-1 -- Rebase. - -* Wed Feb 21 2008 Will Cohen - 0.6.1-8 -- Bump version. - -* Wed Feb 13 2008 Will Cohen - 0.6.1-5 -- Correct elfi typo in runtime/stack-i386.c. - -* Tue Feb 12 2008 Will Cohen - 0.6.1-4 -- Add patch for gcc 4.3. +* Tue Jul 15 2008 Frank Ch. Eigler - 0.7-1 +- Upstream release. * Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-3 -- Add zlib-devel dependency which is supposed to come from crash-devel. - -* Fri Feb 1 2008 Frank Ch. Eigler - 0.6.1-2 -- Process testsuite .stp files to fool "#! stap" dep. finder. +- Add zlib-devel to buildreq; missing from crash-devel +- Process testsuite .stp files for #!stap->#!/usr/bin/stap * Fri Jan 18 2008 Frank Ch. Eigler - 0.6.1-1 - Add crash-devel buildreq to build staplog.so crash(8) module. From fedora-extras-commits at redhat.com Tue Jul 15 19:03:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 19:03:57 GMT Subject: rpms/cpufrequtils/devel cpufrequtils.spec,1.3,1.4 Message-ID: <200807151903.m6FJ3vnd010121@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cpufrequtils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9866 Modified Files: cpufrequtils.spec Log Message: fix license tag Index: cpufrequtils.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpufrequtils/devel/cpufrequtils.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpufrequtils.spec 14 Jul 2008 13:47:14 -0000 1.3 +++ cpufrequtils.spec 15 Jul 2008 19:02:51 -0000 1.4 @@ -1,9 +1,9 @@ Summary: CPU Frequency changing related utilities Name: cpufrequtils Version: 004 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Base -License: GPL +License: GPLv2 URL: http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html Source: http://www.kernel.org/pub/linux/utils/kernel/cpufreq/%{name}-%{version}.tar.bz2 Patch0: disable-gsic.patch @@ -85,6 +85,9 @@ %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 004-2 +- fix license tag + * Mon Jul 14 2008 Jarod Wilson 004-1 - New upstream release From fedora-extras-commits at redhat.com Tue Jul 15 19:04:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 19:04:31 GMT Subject: rpms/cpuspeed/devel cpuspeed.spec,1.67,1.68 Message-ID: <200807151904.m6FJ4Vld010287@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cpuspeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10032 Modified Files: cpuspeed.spec Log Message: fix license tag Index: cpuspeed.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- cpuspeed.spec 12 May 2008 14:11:10 -0000 1.67 +++ cpuspeed.spec 15 Jul 2008 19:03:36 -0000 1.68 @@ -1,10 +1,10 @@ Summary: CPU frequency adjusting daemon Name: cpuspeed Version: 1.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Group: System Environment/Base -License: GPL +License: GPLv2+ URL: http://carlthompson.net/Software/CPUSpeed Source0: http://carlthompson.net/downloads/cpuspeed/cpuspeed-%{version}.tar.gz Source1: http://carlthompson.net/downloads/cpuspeed/license.txt @@ -89,6 +89,9 @@ exit 0 %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 1.2.1-8 +- fix license tag + * Sun May 11 2008 Dennis Gilmore 1.2.1-7 - add sparcv9 sparc64 to list of arches From fedora-extras-commits at redhat.com Tue Jul 15 19:08:57 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Tue, 15 Jul 2008 19:08:57 GMT Subject: rpms/sugar-journal/F-9 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sugar-journal.spec, 1.4, 1.5 Message-ID: <200807151908.m6FJ8vaR010519@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-journal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493 Modified Files: .cvsignore sources sugar-journal.spec Log Message: * Tue Jul 15 2008 Tomeu Vizoso - 94-2.20080715git814c37616b - New git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Jul 2008 15:19:25 -0000 1.4 +++ .cvsignore 15 Jul 2008 19:08:07 -0000 1.5 @@ -1 +1 @@ -journal-activity-94.tar.bz2 +sugar-journal-94-git814c37616b.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Jul 2008 15:19:25 -0000 1.4 +++ sources 15 Jul 2008 19:08:07 -0000 1.5 @@ -1 +1 @@ -9461d7d96b0843381a6df226319a781e journal-activity-94.tar.bz2 +70a98442ef3d7b0a2b7779095451cd3c sugar-journal-94-git814c37616b.tar.bz2 Index: sugar-journal.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sugar-journal.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sugar-journal.spec 8 Jul 2008 15:19:25 -0000 1.4 +++ sugar-journal.spec 15 Jul 2008 19:08:07 -0000 1.5 @@ -1,12 +1,18 @@ +%define commitid 814c37616b +%define alphatag 200807015git%{commitid} + Name: sugar-journal Version: 94 -Release: 1%{?dist} +Release: 2.%{alphatag}%{?dist} Summary: Journal for Sugar Group: Sugar/Activities License: GPLv2+ URL: http://wiki.laptop.org/go/Journal -Source0: journal-activity-%{version}.tar.bz2 +# git clone git://dev.laptop.org/journal-activity +# cd journal-activity +# git-checkout %{commitid} +Source0: %{name}-%{version}-git%{commitid}.tar.bz2 #Script to create the source tarball Source1: sugar-journal-checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +27,7 @@ the journal view with a timer showing how long ago they were stopped. %prep -%setup -q -n journal-activity-%{version} +%setup -q -n Journal-%{version} %build @@ -104,6 +110,9 @@ %lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/ %changelog +* Tue Jul 15 2008 Tomeu Vizoso - 94-2.20080715git814c37616b +- New git snapshot + * Tue Jul 08 2008 Tomeu Vizoso - 94-1 - New release From fedora-extras-commits at redhat.com Tue Jul 15 19:22:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 19:22:09 GMT Subject: rpms/perl-Tie-EncryptedHash/devel .cvsignore, 1.2, 1.3 perl-Tie-EncryptedHash.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200807151922.m6FJM9pV011055@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10981 Modified Files: .cvsignore perl-Tie-EncryptedHash.spec sources Log Message: update to 1.23, resolve license issue Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2006 07:23:09 -0000 1.2 +++ .cvsignore 15 Jul 2008 19:21:07 -0000 1.3 @@ -1 +1 @@ -Tie-EncryptedHash-1.21.tar.gz +Tie-EncryptedHash-1.23.tar.gz Index: perl-Tie-EncryptedHash.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel/perl-Tie-EncryptedHash.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Tie-EncryptedHash.spec 5 Mar 2008 18:53:16 -0000 1.5 +++ perl-Tie-EncryptedHash.spec 15 Jul 2008 19:21:07 -0000 1.6 @@ -1,8 +1,8 @@ Summary: Hashes (and objects based on hashes) with encrypting fields Name: perl-Tie-EncryptedHash -Version: 1.21 -Release: 4%{?dist} -License: Artistic +Version: 1.23 +Release: 1%{?dist} +License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Tie-EncryptedHash/ Source0: http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Tie-EncryptedHash-%{version}.tar.gz @@ -60,6 +60,10 @@ %{_mandir}/man3/Tie::EncryptedHash.3pm* %changelog +* Tue Jul 15 2008 Tom "spot" Callaway 1.23-1 +- update to 1.23 +- license changed to GPL+ or Artistic + * Wed Mar 5 2008 Tom "spot" Callaway 1.21-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2006 07:23:09 -0000 1.2 +++ sources 15 Jul 2008 19:21:07 -0000 1.3 @@ -1 +1 @@ -5a85bd78c74ef52aeff6c70836f9d3bf Tie-EncryptedHash-1.21.tar.gz +e8fa1fe61f7cc839ddab86f04dea12f5 Tie-EncryptedHash-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Jul 15 19:24:07 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 15 Jul 2008 19:24:07 GMT Subject: rpms/esound/devel .cvsignore, 1.17, 1.18 esound.spec, 1.42, 1.43 sources, 1.17, 1.18 Message-ID: <200807151924.m6FJO73T011192@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/esound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11133 Modified Files: .cvsignore esound.spec sources Log Message: 0.2.39 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/esound/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 8 May 2007 13:04:39 -0000 1.17 +++ .cvsignore 15 Jul 2008 19:23:10 -0000 1.18 @@ -1,2 +1 @@ -esound-0.2.37.tar.bz2 -esound-0.2.38.tar.gz +esound-0.2.39.tar.bz2 Index: esound.spec =================================================================== RCS file: /cvs/extras/rpms/esound/devel/esound.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- esound.spec 19 Feb 2008 04:23:48 -0000 1.42 +++ esound.spec 15 Jul 2008 19:23:10 -0000 1.43 @@ -1,19 +1,15 @@ # Note that this is NOT a relocatable package Summary: Allows several audio streams to play on a single audio device Name: esound -Version: 0.2.38 -Release: 7%{?dist} +Version: 0.2.39 +Release: 1%{?dist} Epoch: 1 License: LGPL URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound Group: System Environment/Daemons -Source0: http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.gz +Source0: http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: esound-0.2.19-noerrors.patch -Patch2: esound-0.2.35-64bit_install.patch -Patch3: esound-multilib.patch Patch4: esound-0.2.38-drain.patch -Patch5: esound-0.2.38-multi-user.patch Patch6: esound-0.2.38-fix-open-macro.patch Patch7: remove-confusing-spew.patch BuildRequires: docbook-utils @@ -65,11 +61,7 @@ %prep %setup -q -%patch0 -p1 -b .noerrors -%patch2 -p1 -b .64bit -%patch3 -p1 -b .multilib %patch4 -p1 -b .drain-race -%patch5 -p1 -b .multi-user %patch6 -p1 -b .open-macro %patch7 -p1 -b .spew @@ -131,6 +123,10 @@ %{_mandir}/man1/esd-config.1.gz %changelog +* Tue Jul 15 2008 Matthias Clasen 0 1:0.2.39-1 +- Update to 0.2.39 +- Drop upstreamed patches + * Mon Feb 18 2008 Fedora Release Engineering - 1:0.2.38-7 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/esound/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 8 May 2007 13:04:39 -0000 1.17 +++ sources 15 Jul 2008 19:23:10 -0000 1.18 @@ -1 +1 @@ -77c4e9805a017fba06552487df3c6662 esound-0.2.38.tar.gz +d950b9cd0d7b5406cc4bb16bcdcea8f4 esound-0.2.39.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 15 19:32:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 15 Jul 2008 19:32:05 GMT Subject: rpms/cronolog/devel cronolog.spec,1.4,1.5 Message-ID: <200807151932.m6FJW5qH011797@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cronolog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11686 Modified Files: cronolog.spec Log Message: fix license tag Index: cronolog.spec =================================================================== RCS file: /cvs/pkgs/rpms/cronolog/devel/cronolog.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cronolog.spec 19 Feb 2008 05:29:16 -0000 1.4 +++ cronolog.spec 15 Jul 2008 19:31:08 -0000 1.5 @@ -1,10 +1,10 @@ Name: cronolog Version: 1.6.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Web log rotation program for Apache Group: Applications/System -License: GPL +License: ASL 1.0 URL: http://cronolog.org/ Source0: http://cronolog.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +56,9 @@ %{_infodir}/* %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 1.6.2-8 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.6.2-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 14:11:59 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Wed, 16 Jul 2008 14:11:59 GMT Subject: rpms/binutils/F-9 binutils.spec,1.132,1.133 Message-ID: <200807161411.m6GEBxkN015774@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/binutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15713 Modified Files: binutils.spec Log Message: * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-3 - rebuild libbfd.a with -fPIC for inclusion into shared libraries (#447426) Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/F-9/binutils.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- binutils.spec 8 Apr 2008 14:06:03 -0000 1.132 +++ binutils.spec 16 Jul 2008 14:11:14 -0000 1.133 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.18.50.0.6 -Release: 2 +Release: 3 License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -115,10 +115,14 @@ make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info gzip -q9f %{buildroot}%{_infodir}/*.info* -# Rebuild libiberty.a with -fPIC -make -C libiberty clean -make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C libiberty +# Rebuild libiberty.a and libbfd.a with -fPIC +for SUBDIR in libiberty bfd +do + make -C $SUBDIR clean + make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C $SUBDIR +done +install -m 644 bfd/libbfd.a %{buildroot}%{_prefix}/%{_lib} install -m 644 libiberty/libiberty.a %{buildroot}%{_prefix}/%{_lib} install -m 644 ../include/libiberty.h %{buildroot}%{_prefix}/include # Remove Windows/Novell only man pages @@ -217,6 +221,9 @@ %{_infodir}/bfd*info* %changelog +* Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-3 +- rebuild libbfd.a with -fPIC for inclusion into shared libraries (#447426) + * Tue Apr 8 2008 Jakub Jelinek 2.18.50.0.6-2 - backport .clmul -> .pclmul renaming From fedora-extras-commits at redhat.com Wed Jul 16 14:13:55 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 14:13:55 GMT Subject: rpms/alexandria/F-9 alexandria.spec,1.14,1.15 Message-ID: <200807161413.m6GEDtT4016141@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15903/F-9 Modified Files: alexandria.spec Log Message: * Wed Jul 16 2008 Mamoru Tasaka - 0.6.3-5 - Remove workaround for bug 436697 (tooltips crash). This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1 Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- alexandria.spec 3 Apr 2008 07:11:20 -0000 1.14 +++ alexandria.spec 16 Jul 2008 14:13:08 -0000 1.15 @@ -5,7 +5,7 @@ %define majorver 0.6.3 %undefine minorver -%define fedorarel 4 +%define fedorarel 5 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -19,7 +19,7 @@ License: GPLv2+ URL: http://alexandria.rubyforge.org/ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz -Patch0: alexandria-0.6.3-crash_tooltips.patch +#Patch0: alexandria-0.6.3-crash_tooltips.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -66,7 +66,7 @@ %prep %setup -q -n %{name}-%{majorver}%{?minorver} -%patch0 -p1 -b .tooltips +#%%patch0 -p1 -b .tooltips %build rake build @@ -181,6 +181,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Jul 16 2008 Mamoru Tasaka - 0.6.3-5 +- Remove workaround for bug 436697 (tooltips crash). + This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1 + * Thu Apr 3 2008 Mamoru Tasaka - 0.6.3-4 - Drop ruby(amazon) dependency (Amazon no longer provides AWSv3, AWSv4 is supported by alexandria itself) From fedora-extras-commits at redhat.com Wed Jul 16 14:14:02 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Wed, 16 Jul 2008 14:14:02 GMT Subject: rpms/binutils/devel binutils.spec,1.132,1.133 Message-ID: <200807161414.m6GEE2bK016174@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/binutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15942 Modified Files: binutils.spec Log Message: * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-3 - rebuild libbfd.a with -fPIC for inclusion into shared libraries (#447426) Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- binutils.spec 8 Apr 2008 14:06:03 -0000 1.132 +++ binutils.spec 16 Jul 2008 14:13:17 -0000 1.133 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.18.50.0.6 -Release: 2 +Release: 3 License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -115,10 +115,14 @@ make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info gzip -q9f %{buildroot}%{_infodir}/*.info* -# Rebuild libiberty.a with -fPIC -make -C libiberty clean -make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C libiberty +# Rebuild libiberty.a and libbfd.a with -fPIC +for SUBDIR in libiberty bfd +do + make -C $SUBDIR clean + make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C $SUBDIR +done +install -m 644 bfd/libbfd.a %{buildroot}%{_prefix}/%{_lib} install -m 644 libiberty/libiberty.a %{buildroot}%{_prefix}/%{_lib} install -m 644 ../include/libiberty.h %{buildroot}%{_prefix}/include # Remove Windows/Novell only man pages @@ -217,6 +221,9 @@ %{_infodir}/bfd*info* %changelog +* Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-3 +- rebuild libbfd.a with -fPIC for inclusion into shared libraries (#447426) + * Tue Apr 8 2008 Jakub Jelinek 2.18.50.0.6-2 - backport .clmul -> .pclmul renaming From fedora-extras-commits at redhat.com Wed Jul 16 14:14:07 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 14:14:07 GMT Subject: rpms/alexandria/F-8 alexandria.spec,1.14,1.15 Message-ID: <200807161414.m6GEE7YF016225@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15903/F-8 Modified Files: alexandria.spec Log Message: * Wed Jul 16 2008 Mamoru Tasaka - 0.6.3-5 - Remove workaround for bug 436697 (tooltips crash). This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1 Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-8/alexandria.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- alexandria.spec 3 Apr 2008 07:11:08 -0000 1.14 +++ alexandria.spec 16 Jul 2008 14:12:50 -0000 1.15 @@ -5,7 +5,7 @@ %define majorver 0.6.3 %undefine minorver -%define fedorarel 4 +%define fedorarel 5 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -19,7 +19,7 @@ License: GPLv2+ URL: http://alexandria.rubyforge.org/ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz -Patch0: alexandria-0.6.3-crash_tooltips.patch +#Patch0: alexandria-0.6.3-crash_tooltips.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -66,7 +66,7 @@ %prep %setup -q -n %{name}-%{majorver}%{?minorver} -%patch0 -p1 -b .tooltips +#%%patch0 -p1 -b .tooltips %build rake build @@ -181,6 +181,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Jul 16 2008 Mamoru Tasaka - 0.6.3-5 +- Remove workaround for bug 436697 (tooltips crash). + This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1 + * Thu Apr 3 2008 Mamoru Tasaka - 0.6.3-4 - Drop ruby(amazon) dependency (Amazon no longer provides AWSv3, AWSv4 is supported by alexandria itself) From fedora-extras-commits at redhat.com Wed Jul 16 14:14:11 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 14:14:11 GMT Subject: rpms/alexandria/devel alexandria.spec,1.14,1.15 Message-ID: <200807161414.m6GEEB4C016235@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15903/devel Modified Files: alexandria.spec Log Message: * Wed Jul 16 2008 Mamoru Tasaka - 0.6.3-5 - Remove workaround for bug 436697 (tooltips crash). This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1 Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- alexandria.spec 3 Apr 2008 07:11:20 -0000 1.14 +++ alexandria.spec 16 Jul 2008 14:13:25 -0000 1.15 @@ -5,7 +5,7 @@ %define majorver 0.6.3 %undefine minorver -%define fedorarel 4 +%define fedorarel 5 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -19,7 +19,7 @@ License: GPLv2+ URL: http://alexandria.rubyforge.org/ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz -Patch0: alexandria-0.6.3-crash_tooltips.patch +#Patch0: alexandria-0.6.3-crash_tooltips.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -66,7 +66,7 @@ %prep %setup -q -n %{name}-%{majorver}%{?minorver} -%patch0 -p1 -b .tooltips +#%%patch0 -p1 -b .tooltips %build rake build @@ -181,6 +181,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Jul 16 2008 Mamoru Tasaka - 0.6.3-5 +- Remove workaround for bug 436697 (tooltips crash). + This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1 + * Thu Apr 3 2008 Mamoru Tasaka - 0.6.3-4 - Drop ruby(amazon) dependency (Amazon no longer provides AWSv3, AWSv4 is supported by alexandria itself) From fedora-extras-commits at redhat.com Wed Jul 16 14:14:18 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 16 Jul 2008 14:14:18 GMT Subject: rpms/eclipse/devel eclipse.spec,1.532,1.533 Message-ID: <200807161414.m6GEEI7J016263@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16044 Modified Files: eclipse.spec Log Message: Update TODO list Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.532 retrieving revision 1.533 diff -u -r1.532 -r1.533 --- eclipse.spec 16 Jul 2008 14:02:00 -0000 1.532 +++ eclipse.spec 16 Jul 2008 14:13:33 -0000 1.533 @@ -2,6 +2,7 @@ # - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 # - look at startup script and launcher patches # - update stuff for building on secondary arches +# - get Ganymede update site pre-configured Epoch: 1 %define eclipse_major 3 From fedora-extras-commits at redhat.com Wed Jul 16 14:23:03 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Wed, 16 Jul 2008 14:23:03 GMT Subject: rpms/coreutils/devel coreutils-5.2.1-runuser.patch, 1.19, 1.20 coreutils-6.10-configuration.patch, 1.12, 1.13 coreutils-authors.patch, 1.1, 1.2 coreutils-futimensatkoji.patch, 1.1, 1.2 coreutils-getfacl-exit-code.patch, 1.3, 1.4 coreutils-getgrouplist.patch, 1.4, 1.5 coreutils-i18n.patch, 1.26, 1.27 coreutils-selinux.patch, 1.47, 1.48 coreutils.spec, 1.220, 1.221 sh-utils-1.16-paths.patch, 1.2, 1.3 Message-ID: <200807161423.m6GEN3aq018038@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17879 Modified Files: coreutils-5.2.1-runuser.patch coreutils-6.10-configuration.patch coreutils-authors.patch coreutils-futimensatkoji.patch coreutils-getfacl-exit-code.patch coreutils-getgrouplist.patch coreutils-i18n.patch coreutils-selinux.patch coreutils.spec sh-utils-1.16-paths.patch Log Message: Get rid off fuzz in patches coreutils-5.2.1-runuser.patch: Index: coreutils-5.2.1-runuser.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- coreutils-5.2.1-runuser.patch 2 Jun 2008 11:12:20 -0000 1.19 +++ coreutils-5.2.1-runuser.patch 16 Jul 2008 14:22:18 -0000 1.20 @@ -273,12 +273,12 @@ +runuser_CFLAGS = -DRUNUSER -DAUTHORS="\"David MacKenzie, Dan Walsh\"" +runuser_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@ + - $(PROGRAMS): ../lib/libcoreutils.a + stat_LDADD = $(LDADD) $(LIB_SELINUX) - SUFFIXES = .sh + # Append $(LIBICONV) to each program that uses proper_name_utf8. @@ -126,7 +130,7 @@ - chmod +x $@-t - mv $@-t $@ + `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \ + $(top_srcdir)/lib/version-etc.c` -all-local: su$(EXEEXT) +all-local: su$(EXEEXT) runuser coreutils-6.10-configuration.patch: Index: coreutils-6.10-configuration.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- coreutils-6.10-configuration.patch 6 Jun 2008 14:12:16 -0000 1.12 +++ coreutils-6.10-configuration.patch 16 Jul 2008 14:22:18 -0000 1.13 @@ -26,7 +26,7 @@ +++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200 @@ -38,6 +28,7 @@ # successfully, in spite of the invalid context string. - + . $srcdir/test-lib.sh +require_selinux_ coreutils-authors.patch: Index: coreutils-authors.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-authors.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-authors.patch 4 Jul 2008 15:18:41 -0000 1.1 +++ coreutils-authors.patch 16 Jul 2008 14:22:18 -0000 1.2 @@ -20,8 +20,8 @@ -#define AUTHORS proper_name ("FIXME unknown") +#define AUTHORS proper_name ("David MacKenzie") - void - usage (int status) + /* The name this program was run with. */ + char *program_name; diff --git a/AUTHORS b/AUTHORS index 404cf70..666edc1 100644 --- a/AUTHORS coreutils-futimensatkoji.patch: Index: coreutils-futimensatkoji.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-futimensatkoji.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-futimensatkoji.patch 3 Jun 2008 10:43:05 -0000 1.1 +++ coreutils-futimensatkoji.patch 16 Jul 2008 14:22:18 -0000 1.2 @@ -90,10 +90,10 @@ -# endif +#endif - /* Prefer EBADF to ENOSYS if both error numbers apply. */ - if (errno == ENOSYS) + /* Prefer EBADF to ENOSYS if both error numbers apply. */ + if (errno == ENOSYS) @@ -170,9 +180,9 @@ gl_futimens (int fd ATTRIBUTE_UNUSED, - return -1; + return -1; } -# if HAVE_WORKING_UTIMES coreutils-getfacl-exit-code.patch: Index: coreutils-getfacl-exit-code.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-getfacl-exit-code.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- coreutils-getfacl-exit-code.patch 25 Jan 2008 17:49:47 -0000 1.3 +++ coreutils-getfacl-exit-code.patch 16 Jul 2008 14:22:18 -0000 1.4 @@ -20,4 +20,4 @@ +acl2=`cd b && getfacl file` test "$acl1" = "$acl2" || fail=1 - exit $fail + (exit $fail); exit $fail coreutils-getgrouplist.patch: Index: coreutils-getgrouplist.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-getgrouplist.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- coreutils-getgrouplist.patch 25 Jan 2008 17:48:11 -0000 1.4 +++ coreutils-getgrouplist.patch 16 Jul 2008 14:22:18 -0000 1.5 @@ -10,65 +10,12 @@ + #include "getugroups.h" - #include /* grp.h on alpha OSF1 V2.0 uses "FILE *". */ + #include @@ -114,3 +117,4 @@ getugroups (int maxcount, GETGROUPS_T *g return count; } +#endif /* have getgrouplist */ -diff -urp coreutils-6.10-orig/lib/mgetgroups.c coreutils-6.10/lib/mgetgroups.c ---- coreutils-6.10-orig/lib/mgetgroups.c 2007-11-25 14:23:31.000000000 +0100 -+++ coreutils-6.10/lib/mgetgroups.c 2008-01-24 16:41:15.000000000 +0100 -@@ -43,9 +43,17 @@ mgetgroups (const char *username, gid_t - int ng; - GETGROUPS_T *g; - -- max_n_groups = (username -- ? getugroups (0, NULL, username, gid) -- : getgroups (0, NULL)); -+ if (!username) -+ max_n_groups = getgroups(0, NULL); -+ else -+ { -+#ifdef HAVE_GETGROUPLIST -+ max_n_groups = 0; -+ getgrouplist (username, gid, NULL, &max_n_groups); -+#else -+ max_n_groups = getugroups (0, NULL, username, gid); -+#endif -+ } - - /* If we failed to count groups with NULL for a buffer, - try again with a non-NULL one, just in case. */ -@@ -62,9 +70,25 @@ mgetgroups (const char *username, gid_t - if (g == NULL) - return -1; - -- ng = (username -- ? getugroups (max_n_groups, g, username, gid) -- : getgroups (max_n_groups, g)); -+ if (!username) -+ ng = getgroups (max_n_groups, g); -+ else -+ { -+#ifdef HAVE_GETGROUPLIST -+ int e; -+ ng = max_n_groups; -+ while ((e = getgrouplist (username, gid, g, &ng)) == -1 -+ && ng > max_n_groups) -+ { -+ max_n_groups = ng; -+ g = xrealloc (g, max_n_groups * sizeof (GETGROUPS_T)); -+ } -+ if (e == -1) -+ ng = -1; -+#else -+ ng = getugroups (max_n_groups, g, username, gid); -+#endif -+ } - - if (ng < 0) - { diff -urp coreutils-6.10-orig/m4/jm-macros.m4 coreutils-6.10/m4/jm-macros.m4 --- coreutils-6.10-orig/m4/jm-macros.m4 2007-11-25 14:23:31.000000000 +0100 +++ coreutils-6.10/m4/jm-macros.m4 2008-01-24 16:42:00.000000000 +0100 coreutils-i18n.patch: Index: coreutils-i18n.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- coreutils-i18n.patch 2 Jun 2008 11:12:20 -0000 1.26 +++ coreutils-i18n.patch 16 Jul 2008 14:22:18 -0000 1.27 @@ -379,17 +379,8 @@ +/* The number of bytes used for tab. */ +static size_t tablen = 0; - static struct option const longopts[] = - { -@@ -190,6 +206,8 @@ - - /* Fill in the `fields' structure in LINE. */ - -+/* Fill in the `fields' structure in LINE. */ -+ - static void - xfields (struct line *line) - { + /* If nonzero, check that the input is correctly ordered. */ + static enum @@ -199,10 +217,11 @@ if (ptr == lim) return; @@ -549,22 +540,10 @@ + extract_field (line, ptr, lim - ptr); +} +#endif -+ - /* Read a line from FP into LINE and split it into fields. - Return true if successful. */ - -@@ -249,6 +410,11 @@ - line->nfields_allocated = 0; - line->nfields = 0; - line->fields = NULL; -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ xfields_multibyte (line); -+ else -+#endif - xfields (line); - return true; - } ++ + static struct line * + dup_line (const struct line *old) + { @@ -377,11 +601,18 @@ /* Print the join of LINE1 and LINE2. */ @@ -703,7 +682,7 @@ - size_t len2; /* Length of fields to compare. */ + char *beg[2]; + char *copy[2]; -+ size_t len[2]; /* Length of fields to compare. */ ++ size_t len[2]; /* Length of fields to compare. */ int diff; + int i, j; @@ -830,7 +809,7 @@ + return len[0] - len[1]; } - /* Check that successive input lines PREV and CURRENT from input file + /* Check that successive input lines PREV and CURRENT from input file --- coreutils-6.8+/src/uniq.c.i18n 2007-01-14 15:41:28.000000000 +0000 +++ coreutils-6.8+/src/uniq.c 2007-03-01 15:08:24.000000000 +0000 @@ -23,6 +23,16 @@ @@ -1237,7 +1216,7 @@ /* The official name of this program (e.g., no `g' prefix). */ @@ -35,23 +57,44 @@ - #define AUTHORS "David MacKenzie" + #define AUTHORS proper_name ("David MacKenzie") +#define FATAL_ERROR(Message) \ + do \ @@ -1819,7 +1798,7 @@ + /* Specify the amount of main memory to use when sorting. */ static void - specify_sort_size (char const *s) + specify_sort_size (int oi, char c, char const *s) @@ -1241,7 +1368,7 @@ by KEY in LINE. */ @@ -4043,3 +4022,18 @@ } if (optind == argc) +diff -urNp coreutils-6.12/src/join.c coreutils-6.12-orig/src/join.c +--- coreutils-6.12/src/join.c 2008-07-16 14:08:01.000000000 +0200 ++++ coreutils-6.12-orig/src/join.c 2008-07-16 14:07:02.000000000 +0200 +@@ -489,6 +489,11 @@ get_line (FILE *fp, struct line *line, i + line->nfields_allocated = 0; + line->nfields = 0; + line->fields = NULL; ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ xfields_multibyte (line); ++ else ++#endif + xfields (line); + + if (prevline[which - 1]) coreutils-selinux.patch: Index: coreutils-selinux.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- coreutils-selinux.patch 16 Jun 2008 14:50:18 -0000 1.47 +++ coreutils-selinux.patch 16 Jul 2008 14:22:18 -0000 1.48 @@ -73,7 +73,7 @@ +++ coreutils-6.10/man/chcon.1 2008-01-25 14:15:52.000000000 +0100 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. - .TH CHCON "1" "January 2008" "GNU coreutils 6.10" "User Commands" + .TH CHCON "1" "May 2008" "GNU coreutils 6.12" "User Commands" .SH NAME -chcon \- change file security context +chcon \- change file SELinux security context @@ -596,8 +596,8 @@ /* The name this program was run with. */ char *program_name; @@ -314,7 +316,7 @@ static struct pending *pending_dirs; - static time_t current_time = TYPE_MINIMUM (time_t); - static int current_time_ns = -1; + + static struct timespec current_time; -static bool print_scontext; +static int print_scontext = 0; @@ -728,33 +728,6 @@ if (command_line_arg || format_needs_stat -@@ -2609,7 +2635,7 @@ gobble_file (char const *name, enum file - { - case DEREF_ALWAYS: - err = stat (absolute_name, &f->stat); -- do_deref = true; -+ do_deref = true; - break; - - case DEREF_COMMAND_LINE_ARGUMENTS: -@@ -2618,7 +2644,7 @@ gobble_file (char const *name, enum file - { - bool need_lstat; - err = stat (absolute_name, &f->stat); -- do_deref = true; -+ do_deref = true; - - if (dereference == DEREF_COMMAND_LINE_ARGUMENTS) - break; -@@ -2637,7 +2663,7 @@ gobble_file (char const *name, enum file - - default: /* DEREF_NEVER */ - err = lstat (absolute_name, &f->stat); -- do_deref = false; -+ do_deref = false; - break; - } - @@ -2659,7 +2685,7 @@ gobble_file (char const *name, enum file f->stat_ok = true; @@ -765,8 +738,8 @@ bool have_acl = false; int attr_len = (do_deref @@ -2667,9 +2694,7 @@ gobble_file (char const *name, enum file - : lgetfilecon (absolute_name, &f->scontext)); - err = (attr_len < 0); + f->scontext = xstrdup ("unlabeled"); + } - if (err == 0) - have_acl = ! STREQ ("unlabeled", f->scontext); Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- coreutils.spec 4 Jul 2008 15:18:41 -0000 1.220 +++ coreutils.spec 16 Jul 2008 14:22:18 -0000 1.221 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.12 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -316,6 +316,9 @@ /sbin/runuser %changelog +* Wed Jul 16 2008 Ondrej Vasik - 6.12-6 +- Get rid off fuzz in patches + * Fri Jul 04 2008 Ondrej Vasik - 6.12-5 - fix authors for basename and echo - fix who info pages, print last runlevel only for printable sh-utils-1.16-paths.patch: Index: sh-utils-1.16-paths.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/sh-utils-1.16-paths.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sh-utils-1.16-paths.patch 9 Sep 2004 03:57:36 -0000 1.2 +++ sh-utils-1.16-paths.patch 16 Jul 2008 14:22:18 -0000 1.3 @@ -1,7 +1,7 @@ --- sh-utils-1.16/src/su.c.badpaths Mon Apr 14 14:26:55 1997 +++ sh-utils-1.16/src/su.c Sun Aug 17 14:11:31 EDT 2003 @@ -147,6 +147,15 @@ - #define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc" + # define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc" #endif +/* The default paths which get set are both bogus and oddly influenced From fedora-extras-commits at redhat.com Wed Jul 16 14:25:05 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Wed, 16 Jul 2008 14:25:05 GMT Subject: rpms/compiz-manager/devel compiz-manager-0.6.0.diff, 1.3, 1.4 compiz-manager.spec, 1.6, 1.7 Message-ID: <200807161425.m6GEP5ZZ018427@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/compiz-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18280 Modified Files: compiz-manager-0.6.0.diff compiz-manager.spec Log Message: * Wed Jul 16 2008 Sebastian Vahl - 0.6.0-8 - re-enable ppc64 - update patch to respect ppc64 compiz-manager-0.6.0.diff: Index: compiz-manager-0.6.0.diff =================================================================== RCS file: /cvs/extras/rpms/compiz-manager/devel/compiz-manager-0.6.0.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- compiz-manager-0.6.0.diff 24 Mar 2008 19:44:28 -0000 1.3 +++ compiz-manager-0.6.0.diff 16 Jul 2008 14:24:17 -0000 1.4 @@ -5,8 +5,8 @@ # started, and start a default plugin and possibly window decorator. # -+# differ between LIBDIR for x86, ppc and x86_64 -+if [ `uname -m` = x86_64 ];then ++# differ between LIBDIR for x86 and x86_64, ppc and ppc64 ++if [ `uname -m` = x86_64 -o `uname -m` = ppc64 ];then + ARCH_LIB=lib64 +else + ARCH_LIB=lib Index: compiz-manager.spec =================================================================== RCS file: /cvs/extras/rpms/compiz-manager/devel/compiz-manager.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- compiz-manager.spec 26 Mar 2008 12:29:35 -0000 1.6 +++ compiz-manager.spec 16 Jul 2008 14:24:17 -0000 1.7 @@ -1,6 +1,6 @@ Name: compiz-manager Version: 0.6.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A wrapper script to start compiz with proper options Group: Applications/System @@ -13,10 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# compiz is not available on ppc64 -# https://bugzilla.redhat.com/show_bug.cgi?id=438984 -ExcludeArch: ppc64 - Requires: compiz Requires: libcompizconfig Requires: xorg-x11-utils @@ -50,6 +46,10 @@ %{_bindir}/compiz-manager %changelog +* Wed Jul 16 2008 Sebastian Vahl - 0.6.0-8 +- re-enable ppc64 +- update patch to respect ppc64 + * Wed Mar 26 2008 Sebastian Vahl - 0.6.0-7 - ExcludeArch: ppc64 (compiz is not available there) - added README.fedora From fedora-extras-commits at redhat.com Wed Jul 16 14:42:36 2008 From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek)) Date: Wed, 16 Jul 2008 14:42:36 GMT Subject: rpms/tog-pegasus/devel pegasus-2.7.1-bz454590.patch,1.1,1.2 Message-ID: <200807161442.m6GEgaeg020390@cvs-int.fedora.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20258 Modified Files: pegasus-2.7.1-bz454590.patch Log Message: fix bz454590 patch pegasus-2.7.1-bz454590.patch: Index: pegasus-2.7.1-bz454590.patch =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/pegasus-2.7.1-bz454590.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pegasus-2.7.1-bz454590.patch 15 Jul 2008 12:37:43 -0000 1.1 +++ pegasus-2.7.1-bz454590.patch 16 Jul 2008 14:41:37 -0000 1.2 @@ -1,7 +1,7 @@ -diff -up pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp_old pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp ---- pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp_old 2008-07-15 14:19:20.000000000 +0200 -+++ pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp 2008-07-15 14:21:54.000000000 +0200 -@@ -49,13 +49,17 @@ PEGASUS_USING_STD; +diff -up pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp.bz454590 pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp +--- pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp.bz454590 2007-09-14 20:26:55.000000000 +0200 ++++ pegasus/src/Providers/TestProviders/CMPI/TestFail_1/tests/TestCMPI_Fail_1.cpp 2008-07-16 15:52:49.000000000 +0200 +@@ -49,13 +49,16 @@ PEGASUS_USING_STD; CIMNamespaceName providerNamespace; const CIMName CLASSNAME = CIMName ("TestCMPI_Fail_1"); @@ -21,24 +21,23 @@ + " returned an error: TestCMPIFail_1Provider_Create_MethodMI"; + +const String CMPI_TESTFAIL_ASSOC_ERROR = "CIM_ERR_FAILED: Error initializing" -+ " CMPI MI TestCMPIFail_1Provider, the following MI factory function(s)" -+ ++ " CMPI MI TestCMPIFail_1Provider, the following MI factory function(s)"; const String RCMPI_ERROR = "CIM_ERR_FAILED: ProviderInitFailure:" " Error initializing the API's _CreateMI"; -@@ -78,7 +82,7 @@ void test01 (CIMClient & client) +@@ -78,7 +81,36 @@ void test01 (CIMClient & client) } catch (const CIMException &e) { - if (e.getMessage() != CMPI_TESTFAIL_ERROR + if (e.getMessage() != CMPI_TESTFAIL_INST_ERROR - && e.getMessage() != RCMPI_ERROR) - { - throw e; -@@ -86,12 +90,66 @@ void test01 (CIMClient & client) - } - } - ++ && e.getMessage() != RCMPI_ERROR) ++ { ++ throw e; ++ } ++ } ++} ++ +void test02 (CIMClient & client) +{ + try @@ -61,13 +60,13 @@ + catch (const CIMException &e) + { + if (e.getMessage() != CMPI_TESTFAIL_METH_ERROR -+ && e.getMessage() != RCMPI_ERROR) -+ { -+ throw e; -+ } -+ } -+} -+ + && e.getMessage() != RCMPI_ERROR) + { + throw e; +@@ -86,12 +118,37 @@ void test01 (CIMClient & client) + } + } + +void test03 (CIMClient & client) +{ + try @@ -102,9 +101,216 @@ } catch (Exception & e) { -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp_old 2008-07-15 13:17:05.000000000 +0200 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp 2008-07-15 14:10:03.000000000 +0200 +diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp.bz454590 pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp +--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp.bz454590 2007-12-19 15:04:39.000000000 +0100 ++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp 2008-07-16 15:12:16.000000000 +0200 +@@ -122,8 +122,8 @@ Sint32 CMPILocalProviderManager::_provid + String location = *(parms->location); + + CMPIProvider *pr = 0; +- CMPIProvider::OpProviderHolder * ph = +- reinterpret_cast < CMPIProvider::OpProviderHolder * >(ret); ++ OpProviderHolder * ph = ++ reinterpret_cast < OpProviderHolder * >(ret); + + pr = _lookupProvider (providerName); + +@@ -176,7 +176,7 @@ Sint32 CMPILocalProviderManager::_provid + + AutoMutex lock (_providerTableMutex); + // The provider table must be locked before unloading. +- _providers.remove (pr->_name); ++ _providers.remove (pr->getNameWithType()); + _unloadProvider (pr); + delete pr; + +@@ -184,7 +184,7 @@ Sint32 CMPILocalProviderManager::_provid + else + { + // No need to have a memory leak. +- _providers.remove(pr->_name); ++ _providers.remove(pr->getNameWithType()); + delete pr; + } + break; +@@ -375,14 +375,14 @@ Sint32 CMPILocalProviderManager::_provid + continue; + } + +- if (provider->_quantum == quantum) ++ if (provider->getQuantum() == quantum) + { + continue; + } + +- provider->_quantum = quantum; ++ provider->setQuantum(quantum); + +- if (provider->_current_operations.get ()) ++ if (provider->getCurrentOperations()) + { + PEG_TRACE_STRING( + TRC_PROVIDERMANAGER, +@@ -434,7 +434,7 @@ Sint32 CMPILocalProviderManager::_provid + { + // lock the provider mutex + +- AutoMutex pr_lock (provider->_statusMutex); ++ AutoMutex pr_lock (provider->getStatusMutex()); + + if (provider->tryTerminate () == false) + { +@@ -448,10 +448,10 @@ Sint32 CMPILocalProviderManager::_provid + continue; + } + +- PEGASUS_ASSERT (provider->_module != 0); ++ PEGASUS_ASSERT (provider->getModule() != 0); + + // unload provider module +- provider->_module->unloadModule (); ++ provider->getModule()->unloadModule (); + Logger::put (Logger::STANDARD_LOG, + System::CIMSERVER, + Logger::TRACE, +@@ -470,7 +470,7 @@ Sint32 CMPILocalProviderManager::_provid + Tracer::LEVEL4, + "Destroying CMPIProvider's CIMOM Handle " + + provider->getName()); +- delete provider->_cimom_handle; ++ delete provider->getCIMOMHandle(); + + // set provider status to UNINITIALIZED + provider->reset (); +@@ -598,10 +598,10 @@ void CMPILocalProviderManager::cleanupTh + + } + +-CMPIProvider::OpProviderHolder CMPILocalProviderManager:: ++OpProviderHolder CMPILocalProviderManager:: + getRemoteProvider (const String & location, const String & providerName) + { +- CMPIProvider::OpProviderHolder ph; ++ OpProviderHolder ph; + CTRL_STRINGS + strings; + Sint32 +@@ -649,10 +649,10 @@ CMPIProvider::OpProviderHolder CMPILocal + return ph; + } + +-CMPIProvider::OpProviderHolder CMPILocalProviderManager:: ++OpProviderHolder CMPILocalProviderManager:: + getProvider (const String & fileName, const String & providerName) + { +- CMPIProvider::OpProviderHolder ph; ++ OpProviderHolder ph; + CTRL_STRINGS strings; + Sint32 ccode; + +@@ -887,9 +887,9 @@ CMPIProvider *CMPILocalProviderManager:: + String exceptionMsg = moduleFileName; + { + // lock the provider status mutex +- AutoMutex lock (provider->_statusMutex); ++ AutoMutex lock (provider->getStatusMutex()); + +- if (provider->_status == CMPIProvider::INITIALIZED) ++ if (provider->getStatus() == CMPIProvider::INITIALIZED) + { + PEG_METHOD_EXIT(); + // Initialization is already complete +@@ -904,7 +904,7 @@ CMPIProvider *CMPILocalProviderManager:: + // load the provider + try + { +- base = module->load (provider->_name); ++ base = module->load (provider->getNameWithType()); + moduleLoaded = true; + } + catch (const Exception &e) +@@ -938,11 +938,11 @@ CMPIProvider *CMPILocalProviderManager:: + + CIMOMHandle *cimomHandle = new CIMOMHandle (); + provider->set (module, base, cimomHandle); +- provider->_quantum = 0; ++ provider->setQuantum(0); + + try + { +- provider->initialize (*(provider->_cimom_handle)); ++ provider->initialize (*(provider->getCIMOMHandle())); + } + catch (const Exception &e) + { +@@ -981,12 +981,12 @@ CMPIProvider *CMPILocalProviderManager:: + } + + // delete the cimom handle +- delete provider->_cimom_handle; ++ delete provider->getCIMOMHandle(); + // set provider status to UNINITIALIZED + provider->reset (); + + AutoMutex lock (_providerTableMutex); +- _providers.remove (provider->_name); ++ _providers.remove (provider->getNameWithType()); + delete provider; + + PEG_METHOD_EXIT (); +@@ -1013,7 +1013,7 @@ void CMPILocalProviderManager::_unloadPr + Tracer::LEVEL4, + "Unloading Provider " + provider->getName()); + +- if (provider->_current_operations.get ()) ++ if (provider->getCurrentOperations()) + { + PEG_TRACE_STRING( + TRC_PROVIDERMANAGER, +@@ -1030,7 +1030,7 @@ void CMPILocalProviderManager::_unloadPr + + + // lock the provider mutex +- AutoMutex pr_lock (provider->_statusMutex); ++ AutoMutex pr_lock (provider->getStatusMutex()); + + try + { +@@ -1052,11 +1052,11 @@ void CMPILocalProviderManager::_unloadPr + "Destroying CMPIProvider's CIMOM Handle " + + provider->getName()); + +- delete provider->_cimom_handle; +- PEGASUS_ASSERT (provider->_module != 0); ++ delete provider->getCIMOMHandle(); ++ PEGASUS_ASSERT (provider->getModule() != 0); + + // unload provider module +- provider->_module->unloadModule (); ++ provider->getModule()->unloadModule (); + Logger::put (Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, + "CMPILocalProviderManager::_provider_crtl - Unload provider $0", + provider->getName ()); +diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h.bz454590 pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h +--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h.bz454590 2007-08-13 08:25:48.000000000 +0200 ++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h 2008-07-16 15:12:16.000000000 +0200 +@@ -53,11 +53,11 @@ public: + virtual ~CMPILocalProviderManager(); + + public: +- CMPIProvider::OpProviderHolder getProvider( ++ OpProviderHolder getProvider( + const String & fileName, + const String & providerName); + +- CMPIProvider::OpProviderHolder getRemoteProvider( ++ OpProviderHolder getRemoteProvider( + const String & fileName, + const String & providerName); + +diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp.bz454590 pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp +--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp.bz454590 2008-02-28 12:46:29.000000000 +0100 ++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp 2008-07-16 15:14:18.000000000 +0200 @@ -429,7 +429,7 @@ Message * CMPIProviderManager::handleGet request->instanceName.getKeyBindings()); @@ -180,7 +386,7 @@ - rc = pr.miVector.instMI->ft->enumInstances( - pr.miVector.instMI, -+ rc = pr.getInstMI()->ft->enumerateInstances( ++ rc = pr.getInstMI()->ft->enumInstances( + pr.getInstMI(), &eCtx, &eRes, @@ -211,7 +417,7 @@ - rc = pr.miVector.instMI->ft->enumInstanceNames( - pr.miVector.instMI,&eCtx,&eRes,&eRef); -+ rc = pr.getInstMI()->ft->enumerateInstanceNames( ++ rc = pr.getInstMI()->ft->enumInstanceNames( + pr.getInstMI(), + &eCtx, + &eRes, @@ -688,15 +894,16 @@ CHARS(eSelx->classNames[0].getClassName().getString(). getCString()),&eRef,prec==NULL); } -@@ -2718,6 +2769,7 @@ Message * CMPIProviderManager::handleDis +@@ -2717,7 +2768,7 @@ Message * CMPIProviderManager::handleDis + { try { - CMPIProvider::OpProviderHolder ph = +- CMPIProvider::OpProviderHolder ph = + OpProviderHolder ph = providerManager.getProvider( physicalName, providerName); -@@ -2904,7 +2956,7 @@ Message * CMPIProviderManager::handleSub +@@ -2904,7 +2955,7 @@ Message * CMPIProviderManager::handleSub // // Get cached or load new provider module // @@ -705,7 +912,7 @@ if ((const char*)info) { ph = providerManager.getRemoteProvider -@@ -3013,7 +3065,7 @@ Message * CMPIProviderManager::handleGet +@@ -3013,7 +3064,7 @@ Message * CMPIProviderManager::handleGet request->instanceName.getKeyBindings()); Boolean remote=false; @@ -714,7 +921,7 @@ // resolve provider name ProviderIdContainer pidc = -@@ -3045,7 +3097,7 @@ Message * CMPIProviderManager::handleGet +@@ -3045,7 +3096,7 @@ Message * CMPIProviderManager::handleGet #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT AutoPtr tmpNormalizerContext( @@ -723,7 +930,7 @@ request->operationContext.insert( NormalizerContextContainer(tmpNormalizerContext)); #endif -@@ -3058,8 +3110,8 @@ Message * CMPIProviderManager::handleGet +@@ -3058,8 +3109,8 @@ Message * CMPIProviderManager::handleGet CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); @@ -734,7 +941,7 @@ // For the getInstance provider call, use the property list that we // created containing the single property from the getProperty call. -@@ -3084,8 +3136,11 @@ Message * CMPIProviderManager::handleGet +@@ -3084,8 +3135,11 @@ Message * CMPIProviderManager::handleGet { StatProviderTimeMeasurement providerTime(response); @@ -748,7 +955,7 @@ (const char **)props.getList()); } -@@ -3222,7 +3277,7 @@ Message * CMPIProviderManager::handleSet +@@ -3222,7 +3276,7 @@ Message * CMPIProviderManager::handleSet request->instanceName.getKeyBindings()); Boolean remote=false; @@ -757,7 +964,7 @@ // resolve provider name ProviderIdContainer pidc = -@@ -3260,9 +3315,9 @@ Message * CMPIProviderManager::handleSet +@@ -3260,9 +3314,9 @@ Message * CMPIProviderManager::handleSet CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); CMPI_ObjectPathOnStack eRef(objectPath); @@ -769,7 +976,7 @@ CMPIPropertyList props(localPropertyList); -@@ -3284,8 +3339,12 @@ Message * CMPIProviderManager::handleSet +@@ -3284,8 +3338,12 @@ Message * CMPIProviderManager::handleSet { StatProviderTimeMeasurement providerTime(response); @@ -784,7 +991,7 @@ (const char **)props.getList()); } -@@ -3400,7 +3459,7 @@ ProviderName CMPIProviderManager::_resol +@@ -3400,7 +3458,7 @@ ProviderName CMPIProviderManager::_resol void CMPIProviderManager::_callEnableIndications (CIMInstance & req_provider, PEGASUS_INDICATION_CALLBACK_T _indicationCallback, @@ -793,7 +1000,7 @@ const char* remoteInfo) { PEG_METHOD_ENTER( -@@ -3432,7 +3491,7 @@ void CMPIProviderManager::_callEnableInd +@@ -3432,7 +3490,7 @@ void CMPIProviderManager::_callEnableInd // // Versions prior to 86 did not include enableIndications routine // @@ -802,7 +1009,7 @@ { OperationContext context; #ifdef PEGASUS_ZOS_THREADLEVEL_SECURITY -@@ -3446,7 +3505,7 @@ void CMPIProviderManager::_callEnableInd +@@ -3446,7 +3504,7 @@ void CMPIProviderManager::_callEnableInd CMPIStatus rc={CMPI_RC_OK,NULL}; CMPI_ContextOnStack eCtx(context); @@ -811,7 +1018,7 @@ // Add RemoteInformation -V 5245 if (remoteInfo) -@@ -3472,7 +3531,7 @@ void CMPIProviderManager::_callEnableInd +@@ -3472,7 +3530,7 @@ void CMPIProviderManager::_callEnableInd // breaking existing CMPI Indication providers. This is ok since // there really isn't a user to which the problem should be // reported. @@ -820,7 +1027,7 @@ } else { -@@ -3515,7 +3574,7 @@ void CMPIProviderManager::_callEnableInd +@@ -3515,7 +3573,7 @@ void CMPIProviderManager::_callEnableInd } void CMPIProviderManager::_callDisableIndications @@ -829,7 +1036,7 @@ { PEG_METHOD_ENTER( TRC_PROVIDERMANAGER, -@@ -3539,7 +3598,7 @@ void CMPIProviderManager::_callDisableIn +@@ -3539,7 +3597,7 @@ void CMPIProviderManager::_callDisableIn // // Versions prior to 86 did not include disableIndications routine // @@ -838,7 +1045,7 @@ { OperationContext context; CMPIStatus rc={CMPI_RC_OK,NULL}; -@@ -3550,7 +3609,7 @@ void CMPIProviderManager::_callDisableIn +@@ -3550,7 +3608,7 @@ void CMPIProviderManager::_callDisableIn eCtx.ft->addEntry(&eCtx,"CMPIRRemoteInfo", (CMPIValue*)(const char*)remoteInfo,CMPI_chars); } @@ -847,7 +1054,7 @@ PEG_TRACE_STRING( TRC_PROVIDERMANAGER, -@@ -3566,8 +3625,8 @@ void CMPIProviderManager::_callDisableIn +@@ -3566,8 +3624,8 @@ void CMPIProviderManager::_callDisableIn // here. This will prevent us from breaking existing CMPI // Indication providers. This is ok since there really isn't a // user to which the problem should be reported. @@ -858,452 +1065,12 @@ &eCtx); pr.unprotect(); -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h_old 2008-07-15 12:51:47.000000000 +0200 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.h 2008-07-15 12:52:33.000000000 +0200 -@@ -53,11 +53,11 @@ public: - virtual ~CMPILocalProviderManager(); - - public: -- CMPIProvider::OpProviderHolder getProvider( -+ OpProviderHolder getProvider( - const String & fileName, - const String & providerName); - -- CMPIProvider::OpProviderHolder getRemoteProvider( -+ OpProviderHolder getRemoteProvider( - const String & fileName, - const String & providerName); - -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp_old 2008-07-15 12:21:21.000000000 +0200 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPILocalProviderManager.cpp 2008-07-15 12:51:28.000000000 +0200 -@@ -122,8 +122,8 @@ Sint32 CMPILocalProviderManager::_provid - String location = *(parms->location); - - CMPIProvider *pr = 0; -- CMPIProvider::OpProviderHolder * ph = -- reinterpret_cast < CMPIProvider::OpProviderHolder * >(ret); -+ OpProviderHolder * ph = -+ reinterpret_cast < OpProviderHolder * >(ret); - - pr = _lookupProvider (providerName); - -@@ -176,7 +176,7 @@ Sint32 CMPILocalProviderManager::_provid - - AutoMutex lock (_providerTableMutex); - // The provider table must be locked before unloading. -- _providers.remove (pr->_name); -+ _providers.remove (pr->getNameWithType()); - _unloadProvider (pr); - delete pr; - -@@ -184,7 +184,7 @@ Sint32 CMPILocalProviderManager::_provid - else - { - // No need to have a memory leak. -- _providers.remove(pr->_name); -+ _providers.remove(pr->getNameWithType()); - delete pr; - } - break; -@@ -375,14 +375,14 @@ Sint32 CMPILocalProviderManager::_provid - continue; - } - -- if (provider->_quantum == quantum) -+ if (provider->getQuantum() == quantum) - { - continue; - } - -- provider->_quantum = quantum; -+ provider->setQuantum(quantum); - -- if (provider->_current_operations.get ()) -+ if (provider->getCurrentOperations()) - { - PEG_TRACE_STRING( - TRC_PROVIDERMANAGER, -@@ -434,7 +434,7 @@ Sint32 CMPILocalProviderManager::_provid - { - // lock the provider mutex - -- AutoMutex pr_lock (provider->_statusMutex); -+ AutoMutex pr_lock (provider->getStatusMutex()); - - if (provider->tryTerminate () == false) - { -@@ -448,10 +448,10 @@ Sint32 CMPILocalProviderManager::_provid - continue; - } - -- PEGASUS_ASSERT (provider->_module != 0); -+ PEGASUS_ASSERT (provider->getModule() != 0); - - // unload provider module -- provider->_module->unloadModule (); -+ provider->getModule()->unloadModule (); - Logger::put (Logger::STANDARD_LOG, - System::CIMSERVER, - Logger::TRACE, -@@ -470,7 +470,7 @@ Sint32 CMPILocalProviderManager::_provid - Tracer::LEVEL4, - "Destroying CMPIProvider's CIMOM Handle " - + provider->getName()); -- delete provider->_cimom_handle; -+ delete provider->getCIMOMHandle(); - - // set provider status to UNINITIALIZED - provider->reset (); -@@ -598,10 +598,10 @@ void CMPILocalProviderManager::cleanupTh - - } - --CMPIProvider::OpProviderHolder CMPILocalProviderManager:: -++OpProviderHolder CMPILocalProviderManager:: - getRemoteProvider (const String & location, const String & providerName) - { -- CMPIProvider::OpProviderHolder ph; -+ OpProviderHolder ph; - CTRL_STRINGS - strings; - Sint32 -@@ -649,10 +649,10 @@ CMPIProvider::OpProviderHolder CMPILocal - return ph; - } - --CMPIProvider::OpProviderHolder CMPILocalProviderManager:: -+OpProviderHolder CMPILocalProviderManager:: - getProvider (const String & fileName, const String & providerName) - { -- CMPIProvider::OpProviderHolder ph; -+ OpProviderHolder ph; - CTRL_STRINGS strings; - Sint32 ccode; - -@@ -887,9 +887,9 @@ CMPIProvider *CMPILocalProviderManager:: - String exceptionMsg = moduleFileName; - { - // lock the provider status mutex -- AutoMutex lock (provider->_statusMutex); -+ AutoMutex lock (provider->getStatusMutex()); - -- if (provider->_status == CMPIProvider::INITIALIZED) -+ if (provider->getStatus() == CMPIProvider::INITIALIZED) - { - PEG_METHOD_EXIT(); - // Initialization is already complete -@@ -904,7 +904,7 @@ CMPIProvider *CMPILocalProviderManager:: - // load the provider - try - { -- base = module->load (provider->_name); -+ base = module->load (provider->getNameWithType()); - moduleLoaded = true; - } - catch (const Exception &e) -@@ -938,11 +938,11 @@ CMPIProvider *CMPILocalProviderManager:: - - CIMOMHandle *cimomHandle = new CIMOMHandle (); - provider->set (module, base, cimomHandle); -- provider->_quantum = 0; -+ provider->setQuantum(0); - - try - { -- provider->initialize (*(provider->_cimom_handle)); -+ provider->initialize (*(provider->getCIMOMHandle())); - } - catch (const Exception &e) - { -@@ -981,12 +981,12 @@ CMPIProvider *CMPILocalProviderManager:: - } - - // delete the cimom handle -- delete provider->_cimom_handle; -+ delete provider->getCIMOMHandle(); - // set provider status to UNINITIALIZED - provider->reset (); - - AutoMutex lock (_providerTableMutex); -- _providers.remove (provider->_name); -+ _providers.remove (provider->getNameWithType()); - delete provider; - - PEG_METHOD_EXIT (); -@@ -1013,7 +1013,7 @@ void CMPILocalProviderManager::_unloadPr - Tracer::LEVEL4, - "Unloading Provider " + provider->getName()); - -- if (provider->_current_operations.get ()) -+ if (provider->getCurrentOperations()) - { - PEG_TRACE_STRING( - TRC_PROVIDERMANAGER, -@@ -1030,7 +1030,7 @@ void CMPILocalProviderManager::_unloadPr - - - // lock the provider mutex -- AutoMutex pr_lock (provider->_statusMutex); -+ AutoMutex pr_lock (provider->getStatusMutex()); - - try - { -@@ -1052,11 +1052,11 @@ void CMPILocalProviderManager::_unloadPr - "Destroying CMPIProvider's CIMOM Handle " + - provider->getName()); - -- delete provider->_cimom_handle; -- PEGASUS_ASSERT (provider->_module != 0); -+ delete provider->getCIMOMHandle(); -+ PEGASUS_ASSERT (provider->getModule() != 0); - - // unload provider module -- provider->_module->unloadModule (); -+ provider->getModule()->unloadModule (); - Logger::put (Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, - "CMPILocalProviderManager::_provider_crtl - Unload provider $0", - provider->getName ()); -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h_old 2008-07-15 13:07:34.000000000 +0200 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h 2008-07-15 13:16:47.000000000 +0200 -@@ -178,6 +178,11 @@ public: - - // typedef CMPIProviderFacade Base; - -+ CMPIProvider( -+ const String & name, -+ CMPIProviderModule *module, -+ ProviderVector *mv); -+ - virtual ~CMPIProvider(); - - virtual void initialize(CIMOMHandle & cimom); -@@ -192,6 +197,7 @@ public: - - Status getStatus(); - String getName() const; -+ String getNameWithType() const; - - void reset(); - -@@ -312,20 +318,39 @@ public: - */ - CIMInstance getProviderInstance (); - -+ void incCurrentOperations(); -+ void decCurrentOperations(); -+ int getCurrentOperations(); -+ -+ CIMOMHandle *getCIMOMHandle(); -+ CMPI_Broker *getBroker(); -+ -+ CMPIInstanceMI *getInstMI(); -+ CMPIMethodMI *getMethMI(); -+ CMPIAssociationMI *getAssocMI(); -+ CMPIPropertyMI *getPropMI(); -+ CMPIIndicationMI *getIndMI(); -+ -+ CMPIProviderModule *getModule(); -+ Uint32 getQuantum(); -+ void setQuantum(Uint32 quantum); -+ Mutex &getStatusMutex(); -+ -+ void set( -+ CMPIProviderModule *&module, -+ ProviderVector base, -+ CIMOMHandle *&cimomHandle); -+ - protected: - String _location; - Status _status; - CMPIProviderModule *_module; -- ProviderVector miVector; -- CMPI_Broker broker; -+ ProviderVector _miVector; -+ CMPI_Broker _broker; - CMPIrc unloadStatus; - - private: - virtual void _terminate(Boolean term); -- CMPIProvider( -- const String & name, -- CMPIProviderModule *module, -- ProviderVector *mv); - - static void initialize( - CIMOMHandle & cimom, -@@ -341,15 +366,7 @@ private: - */ - void waitUntilThreadsDone(); - -- void set( -- CMPIProviderModule *&module, -- ProviderVector base, -- CIMOMHandle *&cimomHandle); -- -- friend class CMPILocalProviderManager; -- friend class CMPIProviderManager; - class OpProviderHolder; -- friend class OpProviderHolder; - CIMOMHandle *_cimom_handle; - String _name; - AtomicInt _no_unload; -@@ -396,7 +413,7 @@ private: - generated the indication accepted a matching subscription. - */ - CIMInstance _providerInstance; --//}; -+}; - - - // -@@ -404,67 +421,66 @@ private: - // for a CMPIProvider so it won't be unloaded during operations. - // - -- class OpProviderHolder -+class OpProviderHolder -+{ -+private: -+ CMPIProvider* _provider; -+public: -+ OpProviderHolder(): _provider( NULL ) - { -- private: -- CMPIProvider* _provider; -- -- public: -- OpProviderHolder(): _provider( NULL ) -- { -- } -- OpProviderHolder( const OpProviderHolder& p ): _provider( NULL ) -- { -- SetProvider( p._provider ); -- } -- OpProviderHolder( CMPIProvider* p ): _provider( NULL ) -- { -- SetProvider( p ); -- } -- ~OpProviderHolder() -- { -- UnSetProvider(); -- } -- CMPIProvider& GetProvider() -- { -- return(*_provider); -- } -- -- OpProviderHolder& operator=( const OpProviderHolder& x ) -+ } -+ OpProviderHolder( const OpProviderHolder& p ): _provider( NULL ) -+ { -+ SetProvider( p._provider ); -+ } -+ OpProviderHolder( CMPIProvider* p ): _provider( NULL ) -+ { -+ SetProvider( p ); -+ } -+ ~OpProviderHolder() -+ { -+ UnSetProvider(); -+ } -+ CMPIProvider& GetProvider() -+ { -+ return(*_provider); -+ } -+ OpProviderHolder& operator=( const OpProviderHolder& x ) -+ { -+ if (this == &x) - { -- if (this == &x) -- return(*this); -- SetProvider( x._provider ); - return(*this); - } -+ SetProvider( x._provider ); -+ return(*this); -+ } - -- void SetProvider( CMPIProvider* p ) -+ void SetProvider( CMPIProvider* p ) -+ { -+ PEG_METHOD_ENTER( -+ TRC_CMPIPROVIDERINTERFACE, -+ "OpProviderHolder::SetProvider()"); -+ UnSetProvider(); -+ if (p) - { -- PEG_METHOD_ENTER( -- TRC_CMPIPROVIDERINTERFACE, -- "OpProviderHolder::SetProvider()"); -- UnSetProvider(); -- if (p) -- { -- _provider = p; -- _provider->_current_operations++; -- } -- PEG_METHOD_EXIT(); -+ _provider = p; -+ _provider->incCurrentOperations(); - } -+ PEG_METHOD_EXIT(); -+ } - -- void UnSetProvider() -+ void UnSetProvider() -+ { -+ PEG_METHOD_ENTER( -+ TRC_CMPIPROVIDERINTERFACE, -+ "OpProviderHolder::UnSetProvider()"); -+ if (_provider) - { -- PEG_METHOD_ENTER( -- TRC_CMPIPROVIDERINTERFACE, -- "OpProviderHolder::UnSetProvider()"); -- if (_provider) -- { -- _provider->_current_operations--; -- _provider = NULL; -- } -- PEG_METHOD_EXIT(); -+ _provider->decCurrentOperations(); -+ _provider = NULL; - } -- }; -+ PEG_METHOD_EXIT(); -+ } - }; - - PEGASUS_NAMESPACE_END -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h_old 2008-07-15 14:12:49.000000000 +0200 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h 2008-07-15 14:18:13.000000000 +0200 -@@ -182,7 +182,7 @@ protected: - void _callEnableIndications( - CIMInstance & req_provider, - PEGASUS_INDICATION_CALLBACK_T _indicationCallback, -- CMPIProvider::OpProviderHolder & ph, -+ OpProviderHolder & ph, - const char *remoteInfo); - - /** -@@ -193,7 +193,7 @@ protected: - @param remoteInfo Remote Information - */ - void _callDisableIndications( -- CMPIProvider::OpProviderHolder & ph, -+ OpProviderHolder & ph, - const char *remoteInfo); - }; - -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp_old pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp_old 2008-07-15 12:52:56.000000000 +0200 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp 2008-07-15 13:07:20.000000000 +0200 -@@ -48,6 +48,13 @@ - PEGASUS_USING_STD; - PEGASUS_NAMESPACE_BEGIN +diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp.bz454590 pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp +--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp.bz454590 2008-02-20 11:22:58.000000000 +0100 ++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp 2008-07-16 15:12:16.000000000 +0200 +@@ -48,6 +48,13 @@ + PEGASUS_USING_STD; + PEGASUS_NAMESPACE_BEGIN +static const char _MSG_CANNOT_INIT_API_KEY[] = + "ProviderManager.CMPI.CMPIProvider.CANNOT_INIT_API"; @@ -1872,3 +1639,236 @@ +} + +PEGASUS_NAMESPACE_END +diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h.bz454590 pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h +--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h.bz454590 2007-09-10 10:56:32.000000000 +0200 ++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.h 2008-07-16 15:12:16.000000000 +0200 +@@ -178,6 +178,11 @@ public: + + // typedef CMPIProviderFacade Base; + ++ CMPIProvider( ++ const String & name, ++ CMPIProviderModule *module, ++ ProviderVector *mv); ++ + virtual ~CMPIProvider(); + + virtual void initialize(CIMOMHandle & cimom); +@@ -192,6 +197,7 @@ public: + + Status getStatus(); + String getName() const; ++ String getNameWithType() const; + + void reset(); + +@@ -312,20 +318,39 @@ public: + */ + CIMInstance getProviderInstance (); + ++ void incCurrentOperations(); ++ void decCurrentOperations(); ++ int getCurrentOperations(); ++ ++ CIMOMHandle *getCIMOMHandle(); ++ CMPI_Broker *getBroker(); ++ ++ CMPIInstanceMI *getInstMI(); ++ CMPIMethodMI *getMethMI(); ++ CMPIAssociationMI *getAssocMI(); ++ CMPIPropertyMI *getPropMI(); ++ CMPIIndicationMI *getIndMI(); ++ ++ CMPIProviderModule *getModule(); ++ Uint32 getQuantum(); ++ void setQuantum(Uint32 quantum); ++ Mutex &getStatusMutex(); ++ ++ void set( ++ CMPIProviderModule *&module, ++ ProviderVector base, ++ CIMOMHandle *&cimomHandle); ++ + protected: + String _location; + Status _status; + CMPIProviderModule *_module; +- ProviderVector miVector; +- CMPI_Broker broker; ++ ProviderVector _miVector; ++ CMPI_Broker _broker; + CMPIrc unloadStatus; + + private: + virtual void _terminate(Boolean term); +- CMPIProvider( +- const String & name, +- CMPIProviderModule *module, +- ProviderVector *mv); + + static void initialize( + CIMOMHandle & cimom, +@@ -341,15 +366,7 @@ private: + */ + void waitUntilThreadsDone(); + +- void set( +- CMPIProviderModule *&module, +- ProviderVector base, +- CIMOMHandle *&cimomHandle); +- +- friend class CMPILocalProviderManager; +- friend class CMPIProviderManager; + class OpProviderHolder; +- friend class OpProviderHolder; + CIMOMHandle *_cimom_handle; + String _name; + AtomicInt _no_unload; +@@ -396,7 +413,7 @@ private: + generated the indication accepted a matching subscription. + */ + CIMInstance _providerInstance; +-//}; ++}; + + + // +@@ -404,67 +421,66 @@ private: + // for a CMPIProvider so it won't be unloaded during operations. + // + +- class OpProviderHolder ++class OpProviderHolder ++{ ++private: ++ CMPIProvider* _provider; ++public: ++ OpProviderHolder(): _provider( NULL ) + { +- private: +- CMPIProvider* _provider; +- +- public: +- OpProviderHolder(): _provider( NULL ) +- { +- } +- OpProviderHolder( const OpProviderHolder& p ): _provider( NULL ) +- { +- SetProvider( p._provider ); +- } +- OpProviderHolder( CMPIProvider* p ): _provider( NULL ) +- { +- SetProvider( p ); +- } +- ~OpProviderHolder() +- { +- UnSetProvider(); +- } +- CMPIProvider& GetProvider() +- { +- return(*_provider); +- } +- +- OpProviderHolder& operator=( const OpProviderHolder& x ) ++ } ++ OpProviderHolder( const OpProviderHolder& p ): _provider( NULL ) ++ { ++ SetProvider( p._provider ); ++ } ++ OpProviderHolder( CMPIProvider* p ): _provider( NULL ) ++ { ++ SetProvider( p ); ++ } ++ ~OpProviderHolder() ++ { ++ UnSetProvider(); ++ } ++ CMPIProvider& GetProvider() ++ { ++ return(*_provider); ++ } ++ OpProviderHolder& operator=( const OpProviderHolder& x ) ++ { ++ if (this == &x) + { +- if (this == &x) +- return(*this); +- SetProvider( x._provider ); + return(*this); + } ++ SetProvider( x._provider ); ++ return(*this); ++ } + +- void SetProvider( CMPIProvider* p ) ++ void SetProvider( CMPIProvider* p ) ++ { ++ PEG_METHOD_ENTER( ++ TRC_CMPIPROVIDERINTERFACE, ++ "OpProviderHolder::SetProvider()"); ++ UnSetProvider(); ++ if (p) + { +- PEG_METHOD_ENTER( +- TRC_CMPIPROVIDERINTERFACE, +- "OpProviderHolder::SetProvider()"); +- UnSetProvider(); +- if (p) +- { +- _provider = p; +- _provider->_current_operations++; +- } +- PEG_METHOD_EXIT(); ++ _provider = p; ++ _provider->incCurrentOperations(); + } ++ PEG_METHOD_EXIT(); ++ } + +- void UnSetProvider() ++ void UnSetProvider() ++ { ++ PEG_METHOD_ENTER( ++ TRC_CMPIPROVIDERINTERFACE, ++ "OpProviderHolder::UnSetProvider()"); ++ if (_provider) + { +- PEG_METHOD_ENTER( +- TRC_CMPIPROVIDERINTERFACE, +- "OpProviderHolder::UnSetProvider()"); +- if (_provider) +- { +- _provider->_current_operations--; +- _provider = NULL; +- } +- PEG_METHOD_EXIT(); ++ _provider->decCurrentOperations(); ++ _provider = NULL; + } +- }; ++ PEG_METHOD_EXIT(); ++ } + }; + + PEGASUS_NAMESPACE_END +diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h.bz454590 pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h +--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h.bz454590 2008-02-01 20:47:12.000000000 +0100 ++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.h 2008-07-16 15:12:16.000000000 +0200 +@@ -182,7 +182,7 @@ protected: + void _callEnableIndications( + CIMInstance & req_provider, + PEGASUS_INDICATION_CALLBACK_T _indicationCallback, +- CMPIProvider::OpProviderHolder & ph, ++ OpProviderHolder & ph, + const char *remoteInfo); + + /** +@@ -193,7 +193,7 @@ protected: + @param remoteInfo Remote Information + */ + void _callDisableIndications( +- CMPIProvider::OpProviderHolder & ph, ++ OpProviderHolder & ph, + const char *remoteInfo); + }; + From fedora-extras-commits at redhat.com Wed Jul 16 14:42:44 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Wed, 16 Jul 2008 14:42:44 GMT Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 xorg-x11-drv-radeonhd-README.fedora, 1.30, 1.31 xorg-x11-drv-radeonhd.spec, 1.42, 1.43 Message-ID: <200807161442.m6GEgiqn020417@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20276 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd.spec Log Message: * Wed Jul 16 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080716git - New snapshot (upstream commit 820187b208ab1ec94a015f07e48abbb381524c89): - 820187b2: Fix hangs when setting up the MC Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 13 Jul 2008 17:00:49 -0000 1.32 +++ .cvsignore 16 Jul 2008 14:41:43 -0000 1.33 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 +xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 13 Jul 2008 17:00:49 -0000 1.32 +++ sources 16 Jul 2008 14:41:43 -0000 1.33 @@ -1 +1 @@ -4895e724daf98dbd87f1c83d994990ce xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 +f2750801fc42e733517d1e703f1e8ae0 xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- xorg-x11-drv-radeonhd-README.fedora 13 Jul 2008 17:00:49 -0000 1.30 +++ xorg-x11-drv-radeonhd-README.fedora 16 Jul 2008 14:41:43 -0000 1.31 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: 8326ff4fb3d2fff74b11a5391b74866a656380ff +Latest upstream commit: 820187b208ab1ec94a015f07e48abbb381524c89 Contents Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- xorg-x11-drv-radeonhd.spec 13 Jul 2008 17:00:49 -0000 1.42 +++ xorg-x11-drv-radeonhd.spec 16 Jul 2008 14:41:43 -0000 1.43 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20080713 -%define git_commit 8326ff4fb3d2fff74b11a5391b74866a656380ff +%define date 20080716 +%define git_commit 820187b208ab1ec94a015f07e48abbb381524c89 %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -160,6 +160,10 @@ %endif %changelog +* Wed Jul 16 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080716git +- New snapshot (upstream commit 820187b208ab1ec94a015f07e48abbb381524c89): + - 820187b2: Fix hangs when setting up the MC + * Sun Jul 13 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080713git - Note Fedora package version in radeonhd's Xorg.N.log output. - Snapshot generation updates spec file now From fedora-extras-commits at redhat.com Wed Jul 16 14:44:39 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Wed, 16 Jul 2008 14:44:39 GMT Subject: rpms/xorg-x11-drv-radeonhd/F-9 .cvsignore, 1.33, 1.34 sources, 1.33, 1.34 xorg-x11-drv-radeonhd-README.fedora, 1.31, 1.32 xorg-x11-drv-radeonhd.spec, 1.41, 1.42 Message-ID: <200807161444.m6GEidgj020750@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20647 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd.spec Log Message: * Wed Jul 16 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080716git - New snapshot (upstream commit 820187b208ab1ec94a015f07e48abbb381524c89): - 820187b2: Fix hangs when setting up the MC Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 13 Jul 2008 17:06:54 -0000 1.33 +++ .cvsignore 16 Jul 2008 14:43:55 -0000 1.34 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 +xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 13 Jul 2008 17:06:54 -0000 1.33 +++ sources 16 Jul 2008 14:43:55 -0000 1.34 @@ -1 +1 @@ -4895e724daf98dbd87f1c83d994990ce xf86-video-radeonhd-1.2.1-20080713git.tar.bz2 +f2750801fc42e733517d1e703f1e8ae0 xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- xorg-x11-drv-radeonhd-README.fedora 13 Jul 2008 17:06:54 -0000 1.31 +++ xorg-x11-drv-radeonhd-README.fedora 16 Jul 2008 14:43:55 -0000 1.32 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: 8326ff4fb3d2fff74b11a5391b74866a656380ff +Latest upstream commit: 820187b208ab1ec94a015f07e48abbb381524c89 Contents Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- xorg-x11-drv-radeonhd.spec 13 Jul 2008 17:06:54 -0000 1.41 +++ xorg-x11-drv-radeonhd.spec 16 Jul 2008 14:43:55 -0000 1.42 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20080713 -%define git_commit 8326ff4fb3d2fff74b11a5391b74866a656380ff +%define date 20080716 +%define git_commit 820187b208ab1ec94a015f07e48abbb381524c89 %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -160,6 +160,10 @@ %endif %changelog +* Wed Jul 16 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080716git +- New snapshot (upstream commit 820187b208ab1ec94a015f07e48abbb381524c89): + - 820187b2: Fix hangs when setting up the MC + * Sun Jul 13 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080713git - Note Fedora package version in radeonhd's Xorg.N.log output. - Snapshot generation updates spec file now From fedora-extras-commits at redhat.com Wed Jul 16 14:59:06 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Wed, 16 Jul 2008 14:59:06 GMT Subject: rpms/glibc/F-9 glibc-nscd-inotify-fix.patch, NONE, 1.1 glibc-rh455360.patch, NONE, 1.1 glibc.spec, 1.361, 1.362 Message-ID: <200807161459.m6GEx63v022578@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22429 Modified Files: glibc.spec Added Files: glibc-nscd-inotify-fix.patch glibc-rh455360.patch Log Message: 2.8-8 glibc-nscd-inotify-fix.patch: --- NEW FILE glibc-nscd-inotify-fix.patch --- 2008-07-12 Ulrich Drepper * nscd/connections.c (main_loop_poll): Fix handling of read errors from inotify. (main_loop_epoll): Likewise. --- libc/nscd/connections.c 3 Jul 2008 12:21:15 -0000 1.55.2.42 +++ libc/nscd/connections.c 16 Jul 2008 09:47:15 -0000 @@ -1806,42 +1806,64 @@ main_loop_poll (void) size_t first = 1; #ifdef HAVE_INOTIFY - if (conns[1].fd == inotify_fd) + if (inotify_fd != -1 && conns[1].fd == inotify_fd) { if (conns[1].revents != 0) { - bool done[lastdb] = { false, }; + bool to_clear[lastdb] = { false, }; union { struct inotify_event i; char buf[100]; } inev; - while (TEMP_FAILURE_RETRY (read (inotify_fd, &inev, - sizeof (inev))) - >= (ssize_t) sizeof (struct inotify_event)) + while (1) { + ssize_t nb = TEMP_FAILURE_RETRY (read (inotify_fd, &inev, + sizeof (inev))); + if (nb < (ssize_t) sizeof (struct inotify_event)) + { + if (nb == -1) + { + /* Something went wrong when reading the inotify + data. Better disable inotify. */ + conns[1].fd = -1; + firstfree = 1; + if (nused == 2) + nused = 1; + close (inotify_fd); + inotify_fd = -1; + dbg_log (_("disabled inotify after read error")); + } + break; + } + /* Check which of the files changed. */ for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt) - if (!done[dbcnt] - && (inev.i.wd == dbs[dbcnt].inotify_descr - || (dbcnt == hstdb - && inev.i.wd == resolv_conf_descr))) + if (inev.i.wd == dbs[dbcnt].inotify_descr) { - if (dbcnt == hstdb - && inev.i.wd == resolv_conf_descr) - res_init (); - - pthread_mutex_lock (&dbs[dbcnt].prune_lock); - dbs[dbcnt].clear_cache = 1; - pthread_mutex_unlock (&dbs[dbcnt].prune_lock); - pthread_cond_signal (&dbs[dbcnt].prune_cond); - - done[dbcnt] = true; - break; + to_clear[dbcnt] = true; + goto next; } + + if (inev.i.wd == resolv_conf_descr) + { + res_init (); + to_clear[hstdb] = true; + } + next:; } + /* Actually perform the cache clearing. */ + for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt) + if (to_clear[dbcnt]) + { + pthread_mutex_lock (&dbs[dbcnt].prune_lock); + dbs[dbcnt].clear_cache = 1; + pthread_mutex_unlock (&dbs[dbcnt].prune_lock); + pthread_cond_signal (&dbs[dbcnt].prune_cond); + } + --n; } @@ -1966,27 +1988,57 @@ main_loop_epoll (int efd) #ifdef HAVE_INOTIFY else if (revs[cnt].data.fd == inotify_fd) { + bool to_clear[lastdb] = { false, }; union { struct inotify_event i; char buf[100]; } inev; - while (TEMP_FAILURE_RETRY (read (inotify_fd, &inev, - sizeof (inev))) - >= (ssize_t) sizeof (struct inotify_event)) + while (1) { + ssize_t nb = TEMP_FAILURE_RETRY (read (inotify_fd, &inev, + sizeof (inev))); + if (nb < (ssize_t) sizeof (struct inotify_event)) + { + if (nb == -1) + { + /* Something went wrong when reading the inotify + data. Better disable inotify. */ + (void) epoll_ctl (efd, EPOLL_CTL_DEL, inotify_fd, + NULL); + close (inotify_fd); + inotify_fd = -1; + dbg_log (_("disabled inotify after read error")); + } + break; + } + /* Check which of the files changed. */ for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt) if (inev.i.wd == dbs[dbcnt].inotify_descr) { - pthread_mutex_trylock (&dbs[dbcnt].prune_lock); - dbs[dbcnt].clear_cache = 1; - pthread_mutex_unlock (&dbs[dbcnt].prune_lock); - pthread_cond_signal (&dbs[dbcnt].prune_cond); - break; + to_clear[dbcnt] = true; + goto next; } + + if (inev.i.wd == resolv_conf_descr) + { + res_init (); + to_clear[hstdb] = true; + } + next:; } + + /* Actually perform the cache clearing. */ + for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt) + if (to_clear[dbcnt]) + { + pthread_mutex_lock (&dbs[dbcnt].prune_lock); + dbs[dbcnt].clear_cache = 1; + pthread_mutex_unlock (&dbs[dbcnt].prune_lock); + pthread_cond_signal (&dbs[dbcnt].prune_cond); + } } #endif else @@ -2010,8 +2062,10 @@ main_loop_epoll (int efd) /* Now look for descriptors for accepted connections which have no reply in too long of a time. */ time_t laststart = now - ACCEPT_TIMEOUT; + assert (starttime[sock] == 0); + assert (inotify_fd == -1 || starttime[inotify_fd] == 0); for (int cnt = highest; cnt > STDERR_FILENO; --cnt) - if (cnt != sock && starttime[cnt] != 0 && starttime[cnt] < laststart) + if (starttime[cnt] != 0 && starttime[cnt] < laststart) { /* We are waiting for this one for too long. Close it. */ (void) epoll_ctl (efd, EPOLL_CTL_DEL, cnt, NULL); glibc-rh455360.patch: --- NEW FILE glibc-rh455360.patch --- 2008-07-15 Ulrich Drepper * stdio-common/vfprintf.c (_IO_helper_overflow): In case _IO_sputn doesn't manage to write anything, fail. --- libc/stdio-common/vfprintf.c 8 Apr 2008 07:59:50 -0000 1.128.2.13 +++ libc/stdio-common/vfprintf.c 16 Jul 2008 09:47:15 -0000 @@ -2080,6 +2080,11 @@ _IO_helper_overflow (_IO_FILE *s, int c) { _IO_size_t written = _IO_sputn (target, s->_wide_data->_IO_write_base, used); + if (written == 0 || written == WEOF) + return WEOF; + __wmemmove (s->_wide_data->_IO_write_base, + s->_wide_data->_IO_write_base + written, + used - written); s->_wide_data->_IO_write_ptr -= written; } #else @@ -2087,6 +2092,10 @@ _IO_helper_overflow (_IO_FILE *s, int c) if (used) { _IO_size_t written = _IO_sputn (target, s->_IO_write_base, used); + if (written == 0 || written == EOF) + return EOF; + memmove (s->_IO_write_base, s->_IO_write_base + written, + used - written); s->_IO_write_ptr -= written; } #endif Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/F-9/glibc.spec,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- glibc.spec 8 Jul 2008 16:46:35 -0000 1.361 +++ glibc.spec 16 Jul 2008 14:58:16 -0000 1.362 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.8 -Release: 7 +Release: 8 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -59,6 +59,8 @@ Patch17: glibc-sparc.patch Patch18: glibc-tls-getaddr.patch Patch19: glibc-bz6719.patch +Patch20: glibc-nscd-inotify-fix.patch +Patch21: glibc-rh455360.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 Provides: ldconfig @@ -256,6 +258,8 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 +%patch21 -p1 # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -1016,6 +1020,10 @@ %endif %changelog +* Wed Jul 16 2008 Jakub Jelinek 2.8-8 +- another nscd fix +- fix unbuffered vfprintf (#455360) + * Tue Jul 8 2008 Jakub Jelinek 2.8-7 - assorted nscd fixes (#450704, #445656, #449358) - misc fixes (BZ#3406, BZ#6461, BZ#6472, BZ#6612, BZ#6657, BZ#6723, BZ#6719) From fedora-extras-commits at redhat.com Wed Jul 16 15:15:36 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Wed, 16 Jul 2008 15:15:36 GMT Subject: rpms/lyx/devel .cvsignore, 1.28, 1.29 lyx.spec, 1.69, 1.70 sources, 1.26, 1.27 Message-ID: <200807161515.m6GFFacG030282@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30228 Modified Files: .cvsignore lyx.spec sources Log Message: * Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.1.beta4 - lyx-1.6.0beta4 - --enable-build-type=release disables extra debug information (no warnings, debug, assertions, concept-checks and stdlib-debug). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 12 May 2008 12:27:19 -0000 1.28 +++ .cvsignore 16 Jul 2008 15:14:28 -0000 1.29 @@ -1 +1 @@ -lyx-1.5.5.tar.bz2 +lyx-1.6.0beta4.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- lyx.spec 18 May 2008 00:55:22 -0000 1.69 +++ lyx.spec 16 Jul 2008 15:14:28 -0000 1.70 @@ -1,13 +1,17 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.5.5 -Release: 1%{?dist} +Version: 1.6.0 +%define devrel beta4 +Release: 0.1.%{devrel}%{?dist} License: GPLv2+ Group: Applications/Publishing Url: http://www.lyx.org/ -Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +# For stable releases +#Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +# For pre-releases +Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{devrel}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.5.4-xdg_open.patch @@ -34,7 +38,7 @@ %if 0%{?fedora} > 8 BuildRequires: tex(dvips) tex(latex) texlive-fonts -Requires: tex(dvips) tex(latex) +Requires: tex(dvips) tex(latex) %else BuildRequires: tetex-dvips tetex-latex tetex-fonts Requires: tetex-dvips tetex-latex @@ -82,11 +86,11 @@ %configure \ --disable-rpath \ + --enable-build-type=release \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - --without-warnings --disable-dependency-tracking \ - --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks + --disable-dependency-tracking make %{?_smp_mflags} @@ -174,6 +178,11 @@ %changelog +* Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.1.beta4 +- lyx-1.6.0beta4 +- --enable-build-type=release disables extra debug information (no + warnings, debug, assertions, concept-checks and stdlib-debug). + * Mon May 12 2008 Rex Dieter 1.5.5-1 - lyx-1.5.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 12 May 2008 12:27:19 -0000 1.26 +++ sources 16 Jul 2008 15:14:28 -0000 1.27 @@ -1 +1 @@ -310bf760e8fdf85c7ad3a19b90ddc91c lyx-1.5.5.tar.bz2 +c4c11e5d3a25faf8723c0ef6117a1e87 lyx-1.6.0beta4.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 15:18:34 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 16 Jul 2008 15:18:34 GMT Subject: rpms/mod_nss/F-8 mod_nss-kill.patch, NONE, 1.1 mod_nss.spec, 1.12, 1.13 Message-ID: <200807161518.m6GFIYhl030539@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30474 Modified Files: mod_nss.spec Added Files: mod_nss-kill.patch Log Message: - Don't force module de-init during the configuration stage (453508) Resolves: #453508 mod_nss-kill.patch: --- NEW FILE mod_nss-kill.patch --- --- mod_nss-1.0.7.orig/nss_engine_init.c 14 Jul 2008 20:25:53 -0000 1.33 +++ mod_nss-1.0.7/nss_engine_init.c 14 Jul 2008 20:28:13 -0000 +++ nss_engine_init.c 14 Jul 2008 20:35:34 -0000 @@ -315,6 +315,13 @@ mc->nInitCount++; + /* + * Let us cleanup on restarts and exists + */ + apr_pool_cleanup_register(p, base_server, + nss_init_ModuleKill, + apr_pool_cleanup_null); + mc->ptemp = ptemp; /* @@ -491,9 +498,6 @@ */ nss_init_ConfigureServer(s, p, ptemp, sc); } - - nss_init_ChildKill(base_server); - nss_init_ModuleKill(base_server); } /* @@ -1144,12 +1148,16 @@ apr_status_t nss_init_ModuleKill(void *data) { server_rec *base_server = (server_rec *)data; + SSLModConfigRec *mc = myModConfig(base_server); ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, "Shutting down SSL Session ID Cache"); SSL_ShutdownServerSessionIDCache(); + if (mc->nInitCount == 1) + nss_init_ChildKill(base_server); + /* NSS_Shutdown() gets called in nss_init_ChildKill */ return APR_SUCCESS; } Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-8/mod_nss.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_nss.spec 11 Jul 2008 12:43:22 -0000 1.12 +++ mod_nss.spec 16 Jul 2008 15:17:46 -0000 1.13 @@ -1,6 +1,6 @@ Name: mod_nss Version: 1.0.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -17,6 +17,7 @@ Patch4: mod_nss-nofork.patch Patch5: mod_nss-fips.patch Patch6: mod_nss-inherit.patch +Patch7: mod_nss-kill.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -32,6 +33,7 @@ %patch4 -p1 -b .nofork %patch5 -p1 -b .fips %patch6 -p1 -b .inherit +%patch7 -p1 -b .kill # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -116,6 +118,9 @@ %{_sbindir}/gencert %changelog +* Mon Jul 14 2008 Rob Crittenden - 1.0.7-8 +- Don't force module de-init during the configuration stage (453508) + * Thu Jul 10 2008 Rob Crittenden - 1.0.7-7 - Don't inherit the MP cache in multi-threaded mode (454701) - Don't initialize NSS in each child if SSL isn't configured From fedora-extras-commits at redhat.com Wed Jul 16 15:22:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 15:22:40 GMT Subject: rpms/dbh/devel dbh.spec,1.9,1.10 Message-ID: <200807161522.m6GFMeQS030748@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dbh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30679 Modified Files: dbh.spec Log Message: fix license tag Index: dbh.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbh/devel/dbh.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dbh.spec 20 Feb 2008 03:34:56 -0000 1.9 +++ dbh.spec 16 Jul 2008 15:21:40 -0000 1.10 @@ -1,12 +1,13 @@ Summary: Disk based hash library Name: dbh Version: 1.0.24 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz Patch: dbh-1.0.22-rpath.patch Epoch: 1 -License: LGPL +# No version specified. +License: LGPLv2+ Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -64,6 +65,9 @@ %{_includedir}/* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 1:1.0.24-7 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1:1.0.24-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 15:27:21 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Wed, 16 Jul 2008 15:27:21 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.34, 1.35 generate-fedora-zip.sh, 1.4, 1.5 java-1.6.0-openjdk-makefile.patch, 1.5, 1.6 java-1.6.0-openjdk.spec, 1.60, 1.61 sources, 1.34, 1.35 Message-ID: <200807161527.m6GFRLsA030996@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30900 Modified Files: .cvsignore generate-fedora-zip.sh java-1.6.0-openjdk-makefile.patch java-1.6.0-openjdk.spec sources Log Message: * Wed Jul 16 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Updated icedteasnapshot. - Updated openjdkver. - Updated openjdkdate. - Updated generate-fedora-zip.sh Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 15 Jul 2008 20:10:26 -0000 1.34 +++ .cvsignore 16 Jul 2008 15:26:27 -0000 1.35 @@ -1,5 +1,5 @@ mauve-2008-03-11.tar.gz mauve_tests -openjdk-6-src-b10_30_may_2008-fedora.tar.gz java-access-bridge-1.23.0.tar.gz -icedtea6-1.3-5a7febd10bf2b55cc4d13eaa09ac0c09916217a0.tar.gz +icedtea6-1.3-2f1e7255ab4d2861a5796c461df71b014ee84f4f.tar.gz +openjdk-6-src-b11-10_jul_2008-fedora.tar.gz Index: generate-fedora-zip.sh =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/generate-fedora-zip.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- generate-fedora-zip.sh 30 May 2008 22:43:39 -0000 1.4 +++ generate-fedora-zip.sh 16 Jul 2008 15:26:28 -0000 1.5 @@ -4,61 +4,80 @@ mkdir openjdk tar xzf $1 -C openjdk -# Remove binaries. +# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) +# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) + +# PR146/S6713083 +# Remove binaries rm -f \ openjdk/jdk/test/sun/management/windows/revokeall.exe \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher -# Remove idl sources with questionable license headers. rm -f \ - openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl \ - openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set \ - openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl \ - openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so + +rm -f \ + openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ + openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ # Remove test sources with questionable license headers. rm -f \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ - openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ - openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ - openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ - openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ - openjdk/jdk/test/java/util/Locale/LocaleTest.java \ - openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ - openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ - openjdk/jdk/test/sun/text/resources/LocaleDataTest.java + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ + openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ + openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ + openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ + openjdk/jdk/test/java/util/Locale/LocaleTest.java \ + openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ + openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ + openjdk/jdk/test/sun/text/resources/LocaleDataTest.java # Remove J2DBench sources, some of which have questionable license # headers. rm -rf \ - openjdk/jdk/src/share/demo/java2d/J2DBench/ + openjdk/jdk/src/share/demo/java2d/J2DBench + # Create new tarball with new name. pushd openjdk > /dev/null java-1.6.0-openjdk-makefile.patch: Index: java-1.6.0-openjdk-makefile.patch =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-makefile.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- java-1.6.0-openjdk-makefile.patch 15 Jul 2008 17:08:51 -0000 1.5 +++ java-1.6.0-openjdk-makefile.patch 16 Jul 2008 15:26:28 -0000 1.6 @@ -1,6 +1,6 @@ ---- oldMakefile.am 2008-07-15 11:28:34.000000000 -0400 -+++ Makefile.am 2008-07-15 12:50:40.000000000 -0400 -@@ -444,7 +444,6 @@ +--- oldMakefile.am 2008-07-16 10:09:49.000000000 -0400 ++++ Makefile.am 2008-07-16 11:23:36.000000000 -0400 +@@ -436,7 +436,6 @@ mkdir openjdk ; \ $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ @@ -8,17 +8,17 @@ fi if WITH_CACAO if !USE_SYSTEM_CACAO -@@ -466,7 +465,7 @@ +@@ -458,7 +457,7 @@ clean-extract: rm -f stamps/extract.stamp -stamps/patch.stamp: stamps/patch-fsg.stamp +stamps/patch.stamp: stamps/extract.stamp - rm -f stamps/patch.stamp.tmp mkdir -p stamps ; \ - all_patches_ok=yes; \ ---- oldMakefile.in 2008-07-15 11:29:18.000000000 -0400 -+++ Makefile.in 2008-07-15 12:50:52.000000000 -0400 + rm -f stamps/patch.stamp.tmp ; \ + touch stamps/patch.stamp.tmp ; \ +--- oldMakefile.in 2008-07-16 10:10:02.000000000 -0400 ++++ Makefile.in 2008-07-16 11:24:00.000000000 -0400 @@ -91,6 +91,7 @@ ALSA_LIBS = @ALSA_LIBS@ ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@ @@ -27,7 +27,7 @@ AMTAR = @AMTAR@ ANT = @ANT@ AUTOCONF = @AUTOCONF@ -@@ -921,7 +922,6 @@ +@@ -911,7 +912,6 @@ mkdir openjdk ; \ $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ @@ -35,12 +35,12 @@ fi @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \ @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \ -@@ -939,7 +939,7 @@ +@@ -929,7 +929,7 @@ clean-extract: rm -f stamps/extract.stamp -stamps/patch.stamp: stamps/patch-fsg.stamp +stamps/patch.stamp: stamps/extract.stamp - rm -f stamps/patch.stamp.tmp mkdir -p stamps ; \ - all_patches_ok=yes; \ + rm -f stamps/patch.stamp.tmp ; \ + touch stamps/patch.stamp.tmp ; \ Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- java-1.6.0-openjdk.spec 15 Jul 2008 20:10:26 -0000 1.60 +++ java-1.6.0-openjdk.spec 16 Jul 2008 15:26:28 -0000 1.61 @@ -7,9 +7,9 @@ %define runtests 1 %define icedteaver 1.3 -%define icedteasnapshot -5a7febd10bf2b55cc4d13eaa09ac0c09916217a0 -%define openjdkver b10 -%define openjdkdate 30_may_2008 +%define icedteasnapshot -2f1e7255ab4d2861a5796c461df71b014ee84f4f +%define openjdkver b11 +%define openjdkdate 10_jul_2008 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -20,7 +20,7 @@ %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ -%define fedorazip openjdk-6-src-%{openjdkver}_%{openjdkdate}-fedora.tar.gz +%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz %define mauvedate 2008-03-11 @@ -888,6 +888,12 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Wed Jul 16 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Updated icedteasnapshot. +- Updated openjdkver. +- Updated openjdkdate. +- Updated generate-fedora-zip.sh + * Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Updated accessver to 1.23. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 15 Jul 2008 20:10:26 -0000 1.34 +++ sources 16 Jul 2008 15:26:28 -0000 1.35 @@ -1,5 +1,5 @@ 079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests -5a8537503058edaeff587d45fc167631 openjdk-6-src-b10_30_may_2008-fedora.tar.gz 1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz -7a6f293f8a2b878d08bc77dd7854bcb6 icedtea6-1.3-5a7febd10bf2b55cc4d13eaa09ac0c09916217a0.tar.gz +26e06919efa3feedfb4e5520d4b42299 icedtea6-1.3-2f1e7255ab4d2861a5796c461df71b014ee84f4f.tar.gz +0997dea46b42ed9bbebff8cbe5f70aa0 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 15:28:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 15:28:38 GMT Subject: rpms/dbus-python/devel dbus-python.spec,1.24,1.25 Message-ID: <200807161528.m6GFScTI031106@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dbus-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31014 Modified Files: dbus-python.spec Log Message: fix license tag Index: dbus-python.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-python/devel/dbus-python.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dbus-python.spec 19 Feb 2008 00:22:41 -0000 1.24 +++ dbus-python.spec 16 Jul 2008 15:27:39 -0000 1.25 @@ -7,11 +7,11 @@ Summary: D-Bus Python Bindings Name: dbus-python Version: 0.82.4 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz -License: AFL/GPL +License: MIT Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= %{dbus_version} @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/dbus-python.pc %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.82.4-3 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.82.4-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 15:32:06 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Wed, 16 Jul 2008 15:32:06 GMT Subject: rpms/lyx/devel lyx.spec,1.70,1.71 Message-ID: <200807161532.m6GFW6Ls031477@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31340 Modified Files: lyx.spec Log Message: * Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.2.beta4%{?dist} - revert to use pre instead of devrel. - require tex-simplecv (#428526) Index: lyx.spec =================================================================== RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- lyx.spec 16 Jul 2008 15:14:28 -0000 1.70 +++ lyx.spec 16 Jul 2008 15:30:59 -0000 1.71 @@ -2,8 +2,8 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.6.0 -%define devrel beta4 -Release: 0.1.%{devrel}%{?dist} +%define pre beta4 +Release: 0.2.%{pre}%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -11,7 +11,7 @@ # For stable releases #Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 # For pre-releases -Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{devrel}.tar.bz2 +Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{pre}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.5.4-xdg_open.patch @@ -55,6 +55,7 @@ Requires(hint): wv %endif Requires(hint): xdg-utils +Requires: tex-simplecv %description LyX is a modern approach to writing documents which breaks with the @@ -178,6 +179,10 @@ %changelog +* Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.2.beta4%{?dist} +- revert to use pre instead of devrel. +- require tex-simplecv (#428526) + * Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.1.beta4 - lyx-1.6.0beta4 - --enable-build-type=release disables extra debug information (no From fedora-extras-commits at redhat.com Wed Jul 16 15:33:53 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 16 Jul 2008 15:33:53 GMT Subject: rpms/eclipse/devel eclipse.spec,1.533,1.534 Message-ID: <200807161533.m6GFXr2a031746@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31606 Modified Files: eclipse.spec Log Message: * Wed Jul 16 2008 Andrew Overholt 3.4.0-1 - Fix files lists Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.533 retrieving revision 1.534 diff -u -r1.533 -r1.534 --- eclipse.spec 16 Jul 2008 14:13:33 -0000 1.533 +++ eclipse.spec 16 Jul 2008 15:33:03 -0000 1.534 @@ -3,6 +3,7 @@ # - look at startup script and launcher patches # - update stuff for building on secondary arches # - get Ganymede update site pre-configured +# - investigate bi-arch requirements Epoch: 1 %define eclipse_major 3 @@ -1089,10 +1090,6 @@ %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state* %{_libdir}/%{name}/configuration/config.ini # FIXME: where should this go? -%{_libdir}/%{name}/artifacts.xml -# FIXME: where should this go? -%{_libdir}/%{name}/metadata -# FIXME: where should this go? %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html @@ -1120,7 +1117,6 @@ %{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_* %{_libdir}/%{name}/plugins/org.eclipse.osgi_* %{_libdir}/%{name}/plugins/org.eclipse.rcp_* -%{_libdir}/%{name}/plugins/org.eclipse.swt_* %{_libdir}/%{name}/plugins/org.eclipse.ui_* %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_* %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_* @@ -1214,29 +1210,9 @@ %{_libdir}/%{name}/features/org.eclipse.cvs_* %{_libdir}/%{name}/features/org.eclipse.help_* %{_libdir}/%{name}/plugins/org.apache.jasper_* - -%files jdt -%defattr(-,root,root) -%{_bindir}/efj -%{_libdir}/%{name}/features/org.eclipse.jdt_* -%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_* -%{_libdir}/%{name}/plugins/org.junit_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* -%{_libdir}/%{name}/plugins/org.junit4_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* %{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_* @@ -1248,10 +1224,7 @@ %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.exemplarysetup_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_* @@ -1270,11 +1243,34 @@ %{_libdir}/%{name}/plugins/org.eclipse.ecf_* %{_libdir}/%{name}/plugins/org.eclipse.ecf.filetransfer_* %{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_* -# FIXME: These need to be symlinks -# SAT4J review request: -# https://bugzilla.redhat.com/show_bug.cgi?id=453781 %{_libdir}/%{name}/plugins/org.sat4j.core_* %{_libdir}/%{name}/plugins/org.sat4j.pb_* +# Put this in -platform since we're putting the p2 stuff here +%{_libdir}/%{name}/artifacts.xml +%{_libdir}/%{name}/metadata + +%files jdt +%defattr(-,root,root) +%{_bindir}/efj +%{_libdir}/%{name}/features/org.eclipse.jdt_* +%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_* +%{_libdir}/%{name}/plugins/org.junit_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* +%{_libdir}/%{name}/plugins/org.junit4_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_* %files pde %defattr(-,root,root) @@ -1330,6 +1326,9 @@ %changelog * Wed Jul 16 2008 Andrew Overholt 3.4.0-1 +- Fix files lists + +* Wed Jul 16 2008 Andrew Overholt 3.4.0-1 - Update branding - Fix p2 stuff so p2 UI works From fedora-extras-commits at redhat.com Wed Jul 16 15:36:26 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 16 Jul 2008 15:36:26 GMT Subject: rpms/eclipse/devel eclipse.spec,1.534,1.535 Message-ID: <200807161536.m6GFaQTg032275@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32078 Modified Files: eclipse.spec Log Message: typo in branding filename Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.534 retrieving revision 1.535 diff -u -r1.534 -r1.535 --- eclipse.spec 16 Jul 2008 15:33:03 -0000 1.534 +++ eclipse.spec 16 Jul 2008 15:35:38 -0000 1.535 @@ -34,7 +34,7 @@ # cd branding # zip -r org.fedoraproject.ide.platform-3.4.0-1.zip \ # org.fedoraproject.ide.platform -Source4: org.fedoraproject.ide.platform-%{version}.zip +Source4: org.fedoraproject.ide.platform-%{version}-1.zip # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \ # -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature # cd branding From fedora-extras-commits at redhat.com Wed Jul 16 15:42:02 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 16 Jul 2008 15:42:02 GMT Subject: rpms/gnupg2/devel gnupg2.spec,1.85,1.86 Message-ID: <200807161542.m6GFg269000944@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv764 Modified Files: gnupg2.spec Log Message: fixup changelog Index: gnupg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- gnupg2.spec 24 May 2008 18:19:17 -0000 1.85 +++ gnupg2.spec 16 Jul 2008 15:41:07 -0000 1.86 @@ -178,7 +178,7 @@ - gnupg2-2.0.9 - drop Provides: openpgp - versioned Provides: gpg -- own /etc/gnupg +- own %%_sysconfdir/gnupg * Fri Feb 08 2008 Rex Dieter 2.0.8-3 - respin (gcc43) From fedora-extras-commits at redhat.com Wed Jul 16 15:42:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:43 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFghGK018281@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:44 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 16 Jul 2008 15:42:44 GMT Subject: rpms/gnupg2/F-8 gnupg2-2.0.9-gcc43.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 gnupg2.spec, 1.78, 1.79 sources, 1.27, 1.28 Message-ID: <200807161542.m6GFgiog001084@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/gnupg2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv903 Modified Files: .cvsignore gnupg2.spec sources Added Files: gnupg2-2.0.9-gcc43.patch Log Message: sync w/devel branch gnupg2-2.0.9-gcc43.patch: --- NEW FILE gnupg2-2.0.9-gcc43.patch --- diff -up gnupg-2.0.9/keyserver/gpgkeys_curl.c.BAD gnupg-2.0.9/keyserver/gpgkeys_curl.c --- gnupg-2.0.9/keyserver/gpgkeys_curl.c.BAD 2008-05-24 12:22:13.000000000 -0500 +++ gnupg-2.0.9/keyserver/gpgkeys_curl.c 2008-05-24 12:23:06.000000000 -0500 @@ -285,7 +285,7 @@ main(int argc,char *argv[]) if(follow_redirects) { - curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1); + curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L); if(follow_redirects>0) curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects); } @@ -297,10 +297,10 @@ main(int argc,char *argv[]) { fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); curl_easy_setopt(curl,CURLOPT_STDERR,console); - curl_easy_setopt(curl,CURLOPT_VERBOSE,1); + curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); } - curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert); + curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert); curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file); if(proxy) diff -up gnupg-2.0.9/keyserver/gpgkeys_hkp.c.BAD gnupg-2.0.9/keyserver/gpgkeys_hkp.c --- gnupg-2.0.9/keyserver/gpgkeys_hkp.c.BAD 2008-05-24 12:23:18.000000000 -0500 +++ gnupg-2.0.9/keyserver/gpgkeys_hkp.c 2008-05-24 12:23:51.000000000 -0500 @@ -197,9 +197,9 @@ send_key(int *r_eof) fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request); curl_easy_setopt(curl,CURLOPT_URL,request); - curl_easy_setopt(curl,CURLOPT_POST,1); + curl_easy_setopt(curl,CURLOPT_POST,1L); curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key); - curl_easy_setopt(curl,CURLOPT_FAILONERROR,1); + curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L); res=curl_easy_perform(curl); if(res!=0) @@ -656,7 +656,7 @@ main(int argc,char *argv[]) { fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); curl_easy_setopt(curl,CURLOPT_STDERR,console); - curl_easy_setopt(curl,CURLOPT_VERBOSE,1); + curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); } if(proxy) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/F-8/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 21 Dec 2007 21:33:16 -0000 1.25 +++ .cvsignore 16 Jul 2008 15:41:50 -0000 1.26 @@ -1,3 +1,2 @@ -clog -gnupg-2.0.8.tar.bz2 -gnupg-2.0.8.tar.bz2.sig +gnupg-2.0.9.tar.bz2 +gnupg-2.0.9.tar.bz2.sig Index: gnupg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/F-8/gnupg2.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- gnupg2.spec 24 Jan 2008 03:41:03 -0000 1.78 +++ gnupg2.spec 16 Jul 2008 15:41:50 -0000 1.79 @@ -1,7 +1,7 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 2.0.8 +Version: 2.0.9 Release: 2%{?dist} License: GPLv3+ @@ -13,11 +13,18 @@ Patch1: gnupg-1.9.16-testverbose.patch +# Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error +# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html +Patch2: gnupg2-2.0.9-gcc43.patch + BuildRequires: bzip2-devel BuildRequires: curl-devel BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: libassuan-devel >= 1.0.4 +# libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320 +#BuildRequires: libgcrypt-devel >= 1.4.0 +#Requires(hint): libgcrypt >= 1.4.0 BuildRequires: libgcrypt-devel => 1.2.2 BuildRequires: libgpg-error-devel => 1.4 BuildRequires: libksba-devel >= 1.0.2 @@ -25,6 +32,8 @@ BuildRequires: openldap-devel %if 0%{?fedora} > 3 || 0%{?rhel} > 4 BuildRequires: pcsc-lite-libs +%else +%define pcsclib libpcsclite.so.0 %endif BuildRequires: pth-devel BuildRequires: readline-devel ncurses-devel @@ -33,13 +42,10 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info Requires(hint): dirmngr -Requires: pinentry +Requires(hint): pinentry -# ancient, deprecated -#Obsoletes: newpg < 0.9.5 - -Provides: gpg -Provides: openpgp +# pgp-tools, perl-GnuPG-Interface requires 'gpg' (not sure why) -- Rex +Provides: gpg = %{version}-%{release} %description GnuPG is GNU's tool for secure communication and data storage. It can @@ -67,14 +73,13 @@ %setup -q -n gnupg-%{version}%{?pre} #patch1 -p1 -b .testverbose +%patch2 -p1 -b .gcc43 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) # Note: this is just the name of the default shared lib to load in scdaemon, # it can use other implementations too (including non-pcsc ones). -%if 0%{?fedora} > 3 || 0%{?rhel} > 4 +%if "%{?pcsclib}" == "%{nil}" %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null ) -%else -%define pcsclib libpcsclite.so.0 %endif sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c @@ -94,18 +99,25 @@ %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} \ + INSTALL="install -p" %find_lang %{name} -# file conflicts with gnupg-1.x -rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} -rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html} +# gpgconf.conf +mkdir -p %{buildroot}%{_sysconfdir}/gnupg +touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf + +## Unpackaged files +# file conflicts with gnupg-1.x +# shouldn't gnupg2 be providing these now (maybe only f9+)? -- Rex +rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} +rm -f %{buildroot}%{_datadir}/gnupg/{FAQ,faq.html} -# Unpackaged files -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +# info dir +rm -f %{buildroot}%{_infodir}/dir %check @@ -127,6 +139,8 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +%dir %{_sysconfdir}/gnupg +%ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf #docs say to install suid root, but we won't, for now. #attr(4755,root,root) %{_bindir}/gpg2 %{_bindir}/gpg2 @@ -145,15 +159,30 @@ %{_sbindir}/* %{_datadir}/gnupg/ %{_libexecdir}/* -%{_infodir}/* +%{_infodir}/*.info* %{_mandir}/man?/* %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %changelog +* Sat May 24 2008 Tom "spot" Callaway 2.0.9-2 +- Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error + +* Mon May 19 2008 Tom "spot" Callaway 2.0.9-1.1 +- minor release bump for sparc rebuild + +* Wed Mar 26 2008 Rex Dieter 2.0.9-1 +- gnupg2-2.0.9 +- drop Provides: openpgp +- versioned Provides: gpg +- own %%_sysconfdir/gnupg + +* Fri Feb 08 2008 Rex Dieter 2.0.8-3 +- respin (gcc43) + * Wed Jan 23 2008 Rex Dieter 2.0.8-2 - avoid kde-filesystem dep (#427316) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/F-8/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 21 Dec 2007 21:33:16 -0000 1.27 +++ sources 16 Jul 2008 15:41:50 -0000 1.28 @@ -1,2 +1,2 @@ -fc4377ca67e1bf687eeaf22e79c0b9d1 gnupg-2.0.8.tar.bz2 -5f4fefbca2568910e3628b4d8ea3d485 gnupg-2.0.8.tar.bz2.sig +b41f3f6716a74c46a609a71853e85c7b gnupg-2.0.9.tar.bz2 +29a90f2bdd27d79b7e9a0885f119832a gnupg-2.0.9.tar.bz2.sig From fedora-extras-commits at redhat.com Wed Jul 16 15:42:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:47 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFglgB018315@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:47 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFghGN018281@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:48 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFgmdj018364@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:48 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFghGQ018281@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:49 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFglgE018315@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:50 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFgmdm018364@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:51 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFglgH018315@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:55 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFghGT018281@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:42:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:42:56 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161542.m6GFgtxM018448@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:15 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFgtxP018448@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:18 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFhIrt018528@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:19 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFgmdp018364@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:23 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFglgK018315@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:25 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFgtxS018448@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:27 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFgmds018364@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:28 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFhIrw018528@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:30 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFhNid018580@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:32 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFhPOF018612@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:35 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFhIs1018528@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:38 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161543.m6GFhR8R018622@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora EPEL 4) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:42 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhIs4018528@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:43 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161543.m6GFhR8U018622@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchcommits acl on dkms (Fedora EPEL 4) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:45 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhPOI018612@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:49 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhgIM018762@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:49 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhR8V018622@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:50 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhNig018580@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:52 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhnBA018825@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:52 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhgIP018762@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:53 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhNij018580@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:54 +0000 Subject: [pkgdb] dkms: mariolimonciello has given up watchbugzilla Message-ID: <200807161543.m6GFhPOL018612@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has given up the watchbugzilla acl on dkms (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:43:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:43:57 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161543.m6GFhgIS018762@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:01 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161544.m6GFhnBF018825@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora EPEL 5) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:04 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161544.m6GFi4tS019006@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchcommits acl on dkms (Fedora EPEL 5) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:09 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161544.m6GFhnBI018825@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora 7) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 15:44:14 GMT Subject: rpms/dbus-sharp/devel dbus-sharp.spec,1.9,1.10 Message-ID: <200807161544.m6GFiE8f001343@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dbus-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1270 Modified Files: dbus-sharp.spec Log Message: fix license tag Index: dbus-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-sharp/devel/dbus-sharp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dbus-sharp.spec 19 Feb 2008 00:23:46 -0000 1.9 +++ dbus-sharp.spec 16 Jul 2008 15:43:24 -0000 1.10 @@ -4,10 +4,10 @@ Summary: C# bindings for D-Bus Name: dbus-sharp Version: 0.63 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz -License: AFL/GPLv2 +License: AFL or GPLv2 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: chkconfig >= 1.3.26 @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/dbus-sharp.pc %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.63-10 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.63-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 15:44:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:14 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161544.m6GFiEsn019051@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchcommits acl on dkms (Fedora 7) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:24 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161544.m6GFhwVP018960@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora 3) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:29 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161544.m6GFhrKD018918@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora 4) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:32 +0000 Subject: [pkgdb] dkms: mariolimonciello has requested watchbugzilla Message-ID: <200807161544.m6GFi4tT019006@bastion.fedora.phx.redhat.com> Mario Limonciello (mariolimonciello) has requested the watchbugzilla acl on dkms (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:44:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:44:36 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161544.m6GFhwVS018960@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora 5) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:45:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:45:02 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161545.m6GFhwVV018960@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora 8) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:45:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:45:04 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161545.m6GFiEsq019051@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchcommits acl on dkms (Fedora 8) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:45:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:45:06 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161545.m6GFhrKG018918@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchbugzilla acl on dkms (Fedora 9) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:45:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 15:45:10 +0000 Subject: [pkgdb] dkms had acl change status Message-ID: <200807161545.m6GFjA3u019281@bastion.fedora.phx.redhat.com> Matt Domsch (mdomsch) has set the watchcommits acl on dkms (Fedora 9) to Approved for Mario Limonciello (mariolimonciello) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From fedora-extras-commits at redhat.com Wed Jul 16 15:45:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 15:45:50 GMT Subject: rpms/dd_rescue/devel dd_rescue.spec,1.4,1.5 Message-ID: <200807161545.m6GFjo41001521@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dd_rescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1446 Modified Files: dd_rescue.spec Log Message: fix license tag Index: dd_rescue.spec =================================================================== RCS file: /cvs/pkgs/rpms/dd_rescue/devel/dd_rescue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dd_rescue.spec 25 Feb 2008 20:58:21 -0000 1.4 +++ dd_rescue.spec 16 Jul 2008 15:44:54 -0000 1.5 @@ -2,10 +2,11 @@ Name: dd_rescue Version: 1.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fault tolerant "dd" utility for rescuing data from bad media Group: Applications/System -License: GPL +# No version specified +License: GPL+ URL: http://www.garloff.de/kurt/linux/ddrescue/ Source0: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{version}.tar.gz Source1: http://www.kalysto.org/pkg/dd_rhelp-%{rhelp_version}.tar.gz @@ -53,6 +54,9 @@ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 1.14-8 +- fix license tag + * Mon Feb 25 2008 Andreas Thienemann - 1.14-7 - Remove the obsoletes flag as we're shipping ddrescue in parallel. From fedora-extras-commits at redhat.com Wed Jul 16 15:47:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 15:47:56 GMT Subject: rpms/ddrescue/devel ddrescue.spec,1.11,1.12 Message-ID: <200807161547.m6GFlu6d001901@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ddrescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1597 Modified Files: ddrescue.spec Log Message: fix license tag Index: ddrescue.spec =================================================================== RCS file: /cvs/pkgs/rpms/ddrescue/devel/ddrescue.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ddrescue.spec 25 Feb 2008 21:48:59 -0000 1.11 +++ ddrescue.spec 16 Jul 2008 15:46:45 -0000 1.12 @@ -1,9 +1,9 @@ Name: ddrescue Version: 1.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Data recovery tool trying hard to rescue data in case of read errors Group: Applications/System -License: GPL +License: GPLv3+ URL: http://www.gnu.org/software/ddrescue/ddrescue.html Source0: http://ftp.gnu.org/gnu/ddrescue/ddrescue-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +55,9 @@ %{_infodir}/%{name}.info* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 1.8-3 +- fix license tag + * Mon Feb 25 2008 Andreas Thienemann - 1.8-2 - Fix info-page installation From fedora-extras-commits at redhat.com Wed Jul 16 15:48:35 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Wed, 16 Jul 2008 15:48:35 GMT Subject: rpms/xpa/devel xpa-2.1.6-makefile.patch,1.2,1.3 xpa.spec,1.22,1.23 Message-ID: <200807161548.m6GFmZsx002131@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/xpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1759 Modified Files: xpa-2.1.6-makefile.patch xpa.spec Log Message: * Wed Jul 15 2008 Sergio Pascual 2.1.8-7 - Minor changes in the patch xpa-2.1.6-makefile.patch: Index: xpa-2.1.6-makefile.patch =================================================================== RCS file: /cvs/pkgs/rpms/xpa/devel/xpa-2.1.6-makefile.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xpa-2.1.6-makefile.patch 22 Jun 2006 11:11:34 -0000 1.2 +++ xpa-2.1.6-makefile.patch 16 Jul 2008 15:47:33 -0000 1.3 @@ -14,7 +14,7 @@ # Directory in which to install the include file xpa.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/xpa ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) # Top-level directory for manual entries: -MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man @@ -22,7 +22,7 @@ # Top-level directory for share entries: -MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa -+MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/xpa ++MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir) # Platform-specific X compiler flags (include file specifications) X_CFLAGS = @X_CFLAGS@ Index: xpa.spec =================================================================== RCS file: /cvs/pkgs/rpms/xpa/devel/xpa.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xpa.spec 19 Feb 2008 23:44:12 -0000 1.22 +++ xpa.spec 16 Jul 2008 15:47:33 -0000 1.23 @@ -3,7 +3,7 @@ Name: xpa Version: 2.1.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The XPA messaging system # Upstream version @@ -71,7 +71,8 @@ %{__rm} -rf %{_builddir}/%{name}-%{version}/doc/*.ps %build -%configure --enable-shared --with-tcl=%{_libdir} \ +%configure --includedir=%{_includedir}/xpa --datadir=%{_datadir}/xpa \ + --enable-shared --with-tcl=%{_libdir} \ --with-x --enable-threaded-xpans %{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags} tclxpa @@ -118,6 +119,9 @@ %exclude %{_libdir}/*.a %changelog +* Wed Jul 15 2008 Sergio Pascual 2.1.8-7 +- Minor changes in the patch + * Tue Feb 19 2008 Fedora Release Engineering - 2.1.8-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 15:50:59 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Wed, 16 Jul 2008 15:50:59 GMT Subject: rpms/lyx/devel lyx.spec,1.71,1.72 Message-ID: <200807161550.m6GFoxqI002469@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2413 Modified Files: lyx.spec Log Message: * Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.3.beta4%{?dist} - icon has changed from xpm to png Index: lyx.spec =================================================================== RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- lyx.spec 16 Jul 2008 15:30:59 -0000 1.71 +++ lyx.spec 16 Jul 2008 15:49:53 -0000 1.72 @@ -3,7 +3,7 @@ Name: lyx Version: 1.6.0 %define pre beta4 -Release: 0.2.%{pre}%{?dist} +Release: 0.3.%{pre}%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -117,8 +117,8 @@ %{SOURCE10} # icon -install -p -D -m644 lib/images/lyx.xpm \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm +install -p -D -m644 lib/images/lyx.png \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.png # ghost'd files touch %{buildroot}%{_datadir}/lyx/lyxrc.defaults @@ -179,6 +179,9 @@ %changelog +* Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.3.beta4%{?dist} +- icon has changed from xpm to png + * Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.2.beta4%{?dist} - revert to use pre instead of devrel. - require tex-simplecv (#428526) From fedora-extras-commits at redhat.com Wed Jul 16 15:55:48 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 16 Jul 2008 15:55:48 GMT Subject: rpms/mod_nss/F-9 mod_nss-inherit.patch, NONE, 1.1 mod_nss-kill.patch, NONE, 1.1 mod_nss.spec, 1.12, 1.13 Message-ID: <200807161555.m6GFtmQW003217@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2789 Modified Files: mod_nss.spec Added Files: mod_nss-inherit.patch mod_nss-kill.patch Log Message: 1.0.7-9 - Don't force module de-init during the configuration stage (453508) 1.0.7-8 - Don't inherit the MP cache in multi-threaded mode (454701) - Don't initialize NSS in each child if SSL isn't configured Resolves: #453508, #454701 mod_nss-inherit.patch: --- NEW FILE mod_nss-inherit.patch --- --- mod_nss-1.0.7-orig/nss_engine_init.c 16 May 2008 15:16:02 -0000 1.32 +++ mod_nss-1.0.7/nss_engine_init.c 9 Jul 2008 22:22:46 -0000 @@ -1079,23 +1079,54 @@ } } void nss_init_Child(apr_pool_t *p, server_rec *base_server) { SSLModConfigRec *mc = myModConfig(base_server); SSLSrvConfigRec *sc; server_rec *s; + int threaded = 0; + int sslenabled = FALSE; mc->pid = getpid(); /* only call getpid() once per-process */ - if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "SSL_InheritMPServerSIDCache failed"); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + /* + * First, see if ssl is enabled at all + */ + for (s = base_server; s; s = s->next) { + sc = mySrvConfig(s); + /* If any servers have SSL, we want sslenabled set so we + * can perform further initialization + */ + + if (sc->enabled == UNSET) { + sc->enabled = FALSE; + } + + if (sc->proxy_enabled == UNSET) { + sc->proxy_enabled = FALSE; + } + + if ((sc->enabled == TRUE) || (sc->proxy_enabled == TRUE)) { + sslenabled = TRUE; + } + } + + if (sslenabled == FALSE) { /* we are not an SSL/TLS server */ + return; + } + + ap_mpm_query(AP_MPMQ_MAX_THREADS, &threaded); + if (!threaded) { + if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "SSL_InheritMPServerSIDCache failed"); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + } } nss_init_SSLLibrary(base_server); /* Configure all virtual servers */ for (s = base_server; s; s = s->next) { sc = mySrvConfig(s); if (sc->server->servercert == NULL && NSS_IsInitialized()) mod_nss-kill.patch: --- NEW FILE mod_nss-kill.patch --- --- mod_nss-1.0.7.orig/nss_engine_init.c 14 Jul 2008 20:25:53 -0000 1.33 +++ mod_nss-1.0.7/nss_engine_init.c 14 Jul 2008 20:28:13 -0000 +++ nss_engine_init.c 14 Jul 2008 20:35:34 -0000 @@ -315,6 +315,13 @@ mc->nInitCount++; + /* + * Let us cleanup on restarts and exists + */ + apr_pool_cleanup_register(p, base_server, + nss_init_ModuleKill, + apr_pool_cleanup_null); + mc->ptemp = ptemp; /* @@ -491,9 +498,6 @@ */ nss_init_ConfigureServer(s, p, ptemp, sc); } - - nss_init_ChildKill(base_server); - nss_init_ModuleKill(base_server); } /* @@ -1144,12 +1148,16 @@ apr_status_t nss_init_ModuleKill(void *data) { server_rec *base_server = (server_rec *)data; + SSLModConfigRec *mc = myModConfig(base_server); ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, "Shutting down SSL Session ID Cache"); SSL_ShutdownServerSessionIDCache(); + if (mc->nInitCount == 1) + nss_init_ChildKill(base_server); + /* NSS_Shutdown() gets called in nss_init_ChildKill */ return APR_SUCCESS; } Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-9/mod_nss.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_nss.spec 2 Jul 2008 14:27:28 -0000 1.12 +++ mod_nss.spec 16 Jul 2008 15:54:56 -0000 1.13 @@ -1,6 +1,6 @@ Name: mod_nss Version: 1.0.7 -Release: 7%{?dist} +Release: 9%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -16,6 +16,8 @@ Patch3: mod_nss-proxy.patch Patch4: mod_nss-nofork.patch Patch5: mod_nss-fips.patch +Patch6: mod_nss-inherit.patch +Patch7: mod_nss-kill.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -30,6 +32,8 @@ %patch3 -p1 -b .proxy %patch4 -p1 -b .nofork %patch5 -p1 -b .fips +%patch6 -p1 -b .inherit +%patch7 -p1 -b .kill # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -114,6 +118,13 @@ %{_sbindir}/gencert %changelog +* Mon Jul 14 2008 Rob Crittenden - 1.0.7-9 +- Don't force module de-init during the configuration stage (453508) + +* Thu Jul 10 2008 Rob Crittenden - 1.0.7-8 +- Don't inherit the MP cache in multi-threaded mode (454701) +- Don't initialize NSS in each child if SSL isn't configured + * Wed Jul 2 2008 Rob Crittenden - 1.0.7-7 - Update the patch for FIPS to include fixes for nss_pcache, enforce the security policy and properly initialize the FIPS token. From fedora-extras-commits at redhat.com Wed Jul 16 16:00:49 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Wed, 16 Jul 2008 16:00:49 GMT Subject: rpms/kernel/F-8 config-ia64-generic, 1.6, 1.7 config-x86-generic, 1.22, 1.23 config-x86_64-generic, 1.23, 1.24 kernel.spec, 1.494, 1.495 Message-ID: <200807161600.m6GG0nW9004279@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3919 Modified Files: config-ia64-generic config-x86-generic config-x86_64-generic kernel.spec Log Message: * Mon Jul 14 2008 Kyle McMartin - Disable CONFIG_ACPI_SYSFS_POWER, which still seems to be confusing hal. Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-ia64-generic,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config-ia64-generic 21 May 2008 20:42:11 -0000 1.6 +++ config-ia64-generic 16 Jul 2008 15:59:42 -0000 1.7 @@ -115,7 +115,7 @@ CONFIG_ACPI_AC=m # CONFIG_ACPI_ASUS is not set CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_SYSFS_POWER=y +# CONFIG_ACPI_SYSFS_POWER is not set # CONFIG_ACPI_BAY is not set # CONFIG_ACPI_BATTERY is not set CONFIG_ACPI_BLACKLIST_YEAR=0 Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-x86-generic,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- config-x86-generic 22 May 2008 20:31:17 -0000 1.22 +++ config-x86-generic 16 Jul 2008 15:59:42 -0000 1.23 @@ -126,7 +126,7 @@ CONFIG_ACPI_AC=m # CONFIG_ACPI_ASUS is not set CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_SYSFS_POWER=y +# CONFIG_ACPI_SYSFS_POWER is not set CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BAY=m CONFIG_ACPI_BLACKLIST_YEAR=1999 Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-x86_64-generic,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- config-x86_64-generic 22 May 2008 20:31:17 -0000 1.23 +++ config-x86_64-generic 16 Jul 2008 15:59:42 -0000 1.24 @@ -72,7 +72,7 @@ CONFIG_ACPI_AC=m # CONFIG_ACPI_ASUS is not set CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_SYSFS_POWER=y +# CONFIG_ACPI_SYSFS_POWER is not set CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BAY=m CONFIG_ACPI_BLACKLIST_YEAR=0 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.494 retrieving revision 1.495 diff -u -r1.494 -r1.495 --- kernel.spec 13 Jul 2008 22:13:58 -0000 1.494 +++ kernel.spec 16 Jul 2008 15:59:42 -0000 1.495 @@ -1836,6 +1836,9 @@ %changelog +* Mon Jul 14 2008 Kyle McMartin +- Disable CONFIG_ACPI_SYSFS_POWER, which still seems to be confusing hal. + * Sun Jul 13 2008 Kyle McMartin 2.6.25.11-54 - Linux 2.6.25.11 From fedora-extras-commits at redhat.com Wed Jul 16 16:00:49 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 16 Jul 2008 16:00:49 GMT Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.8, 1.9 perl-IO-Socket-SSL.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200807161600.m6GG0n6R004282@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3761 Modified Files: .cvsignore perl-IO-Socket-SSL.spec sources Log Message: * Wed Jul 16 2008 Paul Howarth - 1.14-1 - Update to latest upstream version: 1.14 - BuildRequire perl(Net::SSLeay) >= 1.21 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Oct 2007 18:18:32 -0000 1.8 +++ .cvsignore 16 Jul 2008 15:59:27 -0000 1.9 @@ -1 +1 @@ -IO-Socket-SSL-1.12.tar.gz +IO-Socket-SSL-1.14.tar.gz Index: perl-IO-Socket-SSL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-IO-Socket-SSL.spec 2 Mar 2008 15:57:00 -0000 1.11 +++ perl-IO-Socket-SSL.spec 16 Jul 2008 15:59:27 -0000 1.12 @@ -4,8 +4,8 @@ # Name: perl-IO-Socket-SSL -Version: 1.12 -Release: 4%{?dist} +Version: 1.14 +Release: 1%{?dist} Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL+ or Artistic @@ -13,7 +13,7 @@ Source0: http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(ExtUtils::MakeMaker), perl(Net::SSLeay), perl(Test::Simple) +BuildRequires: perl(ExtUtils::MakeMaker), perl(Net::SSLeay) >= 1.21, perl(Test::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -58,6 +58,10 @@ %{_mandir}/man3/*.3* %changelog +* Wed Jul 16 2008 Paul Howarth - 1.14-1 +- Update to latest upstream version: 1.14 +- BuildRequire perl(Net::SSLeay) >= 1.21 + * Wed Feb 27 2008 Tom "spot" Callaway - 1.12-4 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Oct 2007 18:18:32 -0000 1.8 +++ sources 16 Jul 2008 15:59:27 -0000 1.9 @@ -1 +1 @@ -0f6e80c15341094df16828a25dbaeeaa IO-Socket-SSL-1.12.tar.gz +367019d835019769caff824fb5713e11 IO-Socket-SSL-1.14.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 16:03:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:03:04 +0000 Subject: [pkgdb] xdemorse was added for lucilanga Message-ID: <200807161603.m6GG34e8020229@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xdemorse with summary GTK based application for decoding and displaying Morse code signals Kevin Fenzi (kevin) has approved Package xdemorse Kevin Fenzi (kevin) has added a Fedora devel branch for xdemorse with an owner of lucilanga Kevin Fenzi (kevin) has approved xdemorse in Fedora devel Kevin Fenzi (kevin) has approved Package xdemorse Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdemorse (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdemorse (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdemorse (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdemorse From fedora-extras-commits at redhat.com Wed Jul 16 16:03:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:03:17 +0000 Subject: [pkgdb] xdemorse (Fedora, 8) updated by kevin Message-ID: <200807161603.m6GG3H8l020257@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xdemorse Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdemorse (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdemorse (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdemorse (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on xdemorse (Fedora 8) for bjensen Kevin Fenzi (kevin) approved watchcommits on xdemorse (Fedora 8) for bjensen Kevin Fenzi (kevin) approved commit on xdemorse (Fedora 8) for bjensen Kevin Fenzi (kevin) approved build on xdemorse (Fedora 8) for bjensen Kevin Fenzi (kevin) approved approveacls on xdemorse (Fedora 8) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on xdemorse (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdemorse From fedora-extras-commits at redhat.com Wed Jul 16 16:03:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:03:17 +0000 Subject: [pkgdb] xdemorse (Fedora, devel) updated by kevin Message-ID: <200807161603.m6GG3H3P020256@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on xdemorse (Fedora devel) for bjensen Kevin Fenzi (kevin) approved watchcommits on xdemorse (Fedora devel) for bjensen Kevin Fenzi (kevin) approved commit on xdemorse (Fedora devel) for bjensen Kevin Fenzi (kevin) approved build on xdemorse (Fedora devel) for bjensen Kevin Fenzi (kevin) approved approveacls on xdemorse (Fedora devel) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on xdemorse (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdemorse From fedora-extras-commits at redhat.com Wed Jul 16 16:03:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:03:17 +0000 Subject: [pkgdb] xdemorse (Fedora, 9) updated by kevin Message-ID: <200807161603.m6GG3H8p020257@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for xdemorse Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdemorse (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdemorse (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdemorse (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on xdemorse (Fedora 9) for bjensen Kevin Fenzi (kevin) approved watchcommits on xdemorse (Fedora 9) for bjensen Kevin Fenzi (kevin) approved commit on xdemorse (Fedora 9) for bjensen Kevin Fenzi (kevin) approved build on xdemorse (Fedora 9) for bjensen Kevin Fenzi (kevin) approved approveacls on xdemorse (Fedora 9) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on xdemorse (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdemorse From fedora-extras-commits at redhat.com Wed Jul 16 16:04:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:04:27 GMT Subject: rpms/xdemorse - New directory Message-ID: <200807161604.m6GG4RTM011400@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdemorse In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA11353/rpms/xdemorse Log Message: Directory /cvs/extras/rpms/xdemorse added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:04:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:04:42 GMT Subject: rpms/xdemorse/devel - New directory Message-ID: <200807161604.m6GG4gjX011456@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdemorse/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA11353/rpms/xdemorse/devel Log Message: Directory /cvs/extras/rpms/xdemorse/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:04:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:04:59 GMT Subject: rpms/xdemorse Makefile,NONE,1.1 Message-ID: <200807161604.m6GG4xsk011531@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdemorse In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA11353/rpms/xdemorse Added Files: Makefile Log Message: Setup of module xdemorse --- NEW FILE Makefile --- # Top level Makefile for module xdemorse all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 16 16:05:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:05:13 +0000 Subject: [pkgdb] cx18-firmware was added for jwilson Message-ID: <200807161605.m6GG5D2V020449@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package cx18-firmware with summary Firmware for Conexant cx23418-based video capture devices Kevin Fenzi (kevin) has approved Package cx18-firmware Kevin Fenzi (kevin) has added a Fedora devel branch for cx18-firmware with an owner of jwilson Kevin Fenzi (kevin) has approved cx18-firmware in Fedora devel Kevin Fenzi (kevin) has approved Package cx18-firmware Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cx18-firmware (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cx18-firmware (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cx18-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 16:05:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:05:24 GMT Subject: rpms/xdemorse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807161605.m6GG5Odo011564@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdemorse/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA11353/rpms/xdemorse/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xdemorse --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xdemorse # $Id: Makefile,v 1.1 2008/07/16 16:04:59 kevin Exp $ NAME := xdemorse SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 16 16:05:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:05:42 +0000 Subject: [pkgdb] cx18-firmware (Fedora, 8) updated by kevin Message-ID: <200807161605.m6GG5g0b020518@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for cx18-firmware Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cx18-firmware (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cx18-firmware (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cx18-firmware (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on cx18-firmware (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 16:05:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:05:42 +0000 Subject: [pkgdb] cx18-firmware (Fedora, 9) updated by kevin Message-ID: <200807161605.m6GG5g0e020518@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for cx18-firmware Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cx18-firmware (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cx18-firmware (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cx18-firmware (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on cx18-firmware (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 16:05:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:05:42 +0000 Subject: [pkgdb] cx18-firmware (Fedora, devel) updated by kevin Message-ID: <200807161605.m6GG5g0h020518@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on cx18-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 16:06:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:06:20 GMT Subject: rpms/cx18-firmware - New directory Message-ID: <200807161606.m6GG6KrK011854@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cx18-firmware In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11773/rpms/cx18-firmware Log Message: Directory /cvs/extras/rpms/cx18-firmware added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:06:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:06:37 GMT Subject: rpms/cx18-firmware/devel - New directory Message-ID: <200807161606.m6GG6bNc011907@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cx18-firmware/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11773/rpms/cx18-firmware/devel Log Message: Directory /cvs/extras/rpms/cx18-firmware/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:06:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:06:56 GMT Subject: rpms/cx18-firmware Makefile,NONE,1.1 Message-ID: <200807161606.m6GG6uJS012005@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cx18-firmware In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11773/rpms/cx18-firmware Added Files: Makefile Log Message: Setup of module cx18-firmware --- NEW FILE Makefile --- # Top level Makefile for module cx18-firmware all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 16 16:07:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:07:10 GMT Subject: rpms/cx18-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807161607.m6GG7Aep012048@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cx18-firmware/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11773/rpms/cx18-firmware/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cx18-firmware --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: cx18-firmware # $Id: Makefile,v 1.1 2008/07/16 16:06:56 kevin Exp $ NAME := cx18-firmware SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 16 16:08:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Wed, 16 Jul 2008 16:08:50 GMT Subject: rpms/lyx/devel lyx.spec,1.72,1.73 Message-ID: <200807161608.m6GG8odu012464@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12309 Modified Files: lyx.spec Log Message: * Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.4.beta4%{?dist} - Changelog has been removed from the distribution Index: lyx.spec =================================================================== RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- lyx.spec 16 Jul 2008 15:49:53 -0000 1.72 +++ lyx.spec 16 Jul 2008 16:07:48 -0000 1.73 @@ -3,7 +3,7 @@ Name: lyx Version: 1.6.0 %define pre beta4 -Release: 0.3.%{pre}%{?dist} +Release: 0.4.%{pre}%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -165,7 +165,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc ANNOUNCE ChangeLog lib/CREDITS NEWS README +%doc ANNOUNCE lib/CREDITS NEWS README %{_bindir}/* %{_mandir}/man1/* %{_datadir}/applications/*.desktop @@ -179,6 +179,9 @@ %changelog +* Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.4.beta4%{?dist} +- Changelog has been removed from the distribution + * Wed Jul 16 2008 Jos?? Matos - 1.6.0-0.3.beta4%{?dist} - icon has changed from xpm to png From fedora-extras-commits at redhat.com Wed Jul 16 16:11:14 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 16 Jul 2008 16:11:14 GMT Subject: rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.52,1.53 Message-ID: <200807161611.m6GGBEJe012796@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680 Modified Files: java-1.6.0-openjdk.spec Log Message: bump the release to sync arches Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- java-1.6.0-openjdk.spec 9 Jul 2008 19:14:07 -0000 1.52 +++ java-1.6.0-openjdk.spec 16 Jul 2008 16:10:25 -0000 1.53 @@ -134,7 +134,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.16.%{openjdkver}%{?dist} +Release: 0.17.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -927,6 +927,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Wed Jul 16 2008 Dennis Gilmore - 1:1.6.0-0.17.b09 +- bump the release to sync all arches + * Wed Jul 9 2008 Lillian Angel - 1:1.6.0-0.16.b09 - Add runtests define. - Run test suites on JIT architectures only. From fedora-extras-commits at redhat.com Wed Jul 16 16:12:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:12:34 +0000 Subject: [pkgdb] dbus-c++ was added for drago01 Message-ID: <200807161612.m6GGCY8l021008@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package dbus-c++ with summary Native C++ bindings for D-Bus Kevin Fenzi (kevin) has approved Package dbus-c++ Kevin Fenzi (kevin) has added a Fedora devel branch for dbus-c++ with an owner of drago01 Kevin Fenzi (kevin) has approved dbus-c++ in Fedora devel Kevin Fenzi (kevin) has approved Package dbus-c++ Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbus-c++ (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbus-c++ (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbus-c++ (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dbus-c++ From fedora-extras-commits at redhat.com Wed Jul 16 16:12:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:12:35 +0000 Subject: [pkgdb] dbus-c++ (Fedora, 9) updated by kevin Message-ID: <200807161612.m6GGCZfA021030@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for dbus-c++ Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbus-c++ (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbus-c++ (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbus-c++ (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on dbus-c++ (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dbus-c++ From fedora-extras-commits at redhat.com Wed Jul 16 16:12:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:12:36 +0000 Subject: [pkgdb] dbus-c++ (Fedora, 8) updated by kevin Message-ID: <200807161612.m6GGCZfD021030@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for dbus-c++ Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbus-c++ (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbus-c++ (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbus-c++ (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on dbus-c++ (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dbus-c++ From fedora-extras-commits at redhat.com Wed Jul 16 16:12:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:12:36 +0000 Subject: [pkgdb] dbus-c++ (Fedora, devel) updated by kevin Message-ID: <200807161612.m6GGCZfG021030@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on dbus-c++ (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dbus-c++ From fedora-extras-commits at redhat.com Wed Jul 16 16:13:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:13:34 GMT Subject: rpms/dbus-c++ - New directory Message-ID: <200807161613.m6GGDY20013249@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-c++ In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF13139/rpms/dbus-c++ Log Message: Directory /cvs/extras/rpms/dbus-c++ added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:13:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:13:54 GMT Subject: rpms/dbus-c++/devel - New directory Message-ID: <200807161613.m6GGDskv013337@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-c++/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF13139/rpms/dbus-c++/devel Log Message: Directory /cvs/extras/rpms/dbus-c++/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:14:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:14:08 GMT Subject: rpms/dbus-c++ Makefile,NONE,1.1 Message-ID: <200807161614.m6GGE8Jd013407@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-c++ In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF13139/rpms/dbus-c++ Added Files: Makefile Log Message: Setup of module dbus-c++ --- NEW FILE Makefile --- # Top level Makefile for module dbus-c++ all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 16 16:14:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:14:32 GMT Subject: rpms/dbus-c++/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807161614.m6GGEWLX013508@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dbus-c++/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF13139/rpms/dbus-c++/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dbus-c++ --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: dbus-c++ # $Id: Makefile,v 1.1 2008/07/16 16:14:08 kevin Exp $ NAME := dbus-c++ SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 16 16:14:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 16:14:56 GMT Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.82,1.83 Message-ID: <200807161614.m6GGEurY013670@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13385 Modified Files: dejavu-fonts.spec Log Message: fix license tag Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- dejavu-fonts.spec 11 Jul 2008 19:59:30 -0000 1.82 +++ dejavu-fonts.spec 16 Jul 2008 16:14:00 -0000 1.83 @@ -16,11 +16,11 @@ Name: %{fontname}-fonts Version: 2.25 -Release: 2%{?alphatag}%{?dist} +Release: 3%{?alphatag}%{?dist} Summary: DejaVu fonts, mature typefaces Group: User Interface/X -License: Modifiable & redistributable, with naming restrictions +License: Bitstream Vera URL: http://%{fontname}.sf.net/ Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 @@ -176,6 +176,9 @@ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 2.25-3 +- fix license tag + * Fri Jul 11 2008 - 2.25-2 ??? Fedora 10 alpha general package cleanup From fedora-extras-commits at redhat.com Wed Jul 16 16:17:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 16:17:37 GMT Subject: rpms/desktop-printing/devel desktop-printing.spec,1.88,1.89 Message-ID: <200807161617.m6GGHbsH013991@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/desktop-printing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13907 Modified Files: desktop-printing.spec Log Message: fix license tag Index: desktop-printing.spec =================================================================== RCS file: /cvs/pkgs/rpms/desktop-printing/devel/desktop-printing.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- desktop-printing.spec 23 Apr 2007 12:11:54 -0000 1.88 +++ desktop-printing.spec 16 Jul 2008 16:16:26 -0000 1.89 @@ -6,8 +6,8 @@ Summary: Desktop print icon Name: desktop-printing Version: 0.20 -Release: 7%{?dist} -License: GPL +Release: 8%{?dist} +License: GPLv2+ Group: Applications/File Source0: http://download.gnome.org/sources/eggcups/0.20/eggcups-%{version}.tar.bz2 Source1: gnome-default-printer.png @@ -104,6 +104,9 @@ %{_sysconfdir}/xdg/autostart/*.desktop %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 0.20-8 +- fix license tag + * Mon Apr 23 2007 Tim Waugh 0.20-7 - Updated applet desktop file from CVS for translations. - Don't ship session CUPS configuration files or gconf schema (bug #237403). From fedora-extras-commits at redhat.com Wed Jul 16 16:19:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 16:19:57 GMT Subject: rpms/dev86/devel dev86.spec,1.26,1.27 Message-ID: <200807161619.m6GGJvp9014641@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dev86/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14358 Modified Files: dev86.spec Log Message: fix license tag Index: dev86.spec =================================================================== RCS file: /cvs/pkgs/rpms/dev86/devel/dev86.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- dev86.spec 25 Feb 2008 05:32:49 -0000 1.26 +++ dev86.spec 16 Jul 2008 16:19:08 -0000 1.27 @@ -1,8 +1,8 @@ Summary: A real mode 80x86 assembler and linker Name: dev86 Version: 0.16.17 -Release: 9%{?dist} -License: GPL +Release: 10%{?dist} +License: GPL+ and GPLv2+ and LGPLv2+ Group: Development/Languages URL: http://homepage.ntlworld.com/robert.debath/ Source: http://homepage.ntlworld.com/robert.debath/dev86/Dev86src-%{version}.tar.gz @@ -79,6 +79,9 @@ %{_mandir}/man1/* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 0.16.17-10 +- fix license tag + * Mon Feb 25 2008 Jindrich Novy 0.16.17-9 - manual rebuild because of gcc-4.3 (#434186) From fedora-extras-commits at redhat.com Wed Jul 16 16:22:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 16:22:47 GMT Subject: rpms/device-mapper/devel device-mapper.spec,1.62,1.63 Message-ID: <200807161622.m6GGMluT015314@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/device-mapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15107 Modified Files: device-mapper.spec Log Message: fix license tag Index: device-mapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper/devel/device-mapper.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- device-mapper.spec 5 Dec 2007 22:42:26 -0000 1.62 +++ device-mapper.spec 16 Jul 2008 16:21:57 -0000 1.63 @@ -1,7 +1,7 @@ Summary: Device mapper utility Name: device-mapper Version: 1.02.23 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/dm @@ -19,7 +19,7 @@ %package devel Summary: Development libraries and headers for device-mapper Group: Development/Libraries -License: LGPLv2.1 +License: LGPLv2 Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} @@ -30,7 +30,7 @@ %package libs Summary: Device-mapper shared library Group: System Environment/Libraries -License: LGPLv2.1 +License: LGPLv2 Obsoletes: device-mapper < 1.02.17-6 %description libs @@ -74,6 +74,9 @@ %attr(755,root,root) %{_libdir}/libdevmapper.so.* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 1.02.23-2 +- fix license tag + * Wed Dec 05 2007 Alasdair Kergon - 1.02.23-1 - Add readahead support to libdevmapper and dmsetup. - Fix double free in a libdevmapper-event error path. From fedora-extras-commits at redhat.com Wed Jul 16 16:24:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 16:24:31 GMT Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.20,1.21 Message-ID: <200807161624.m6GGOV4S015623@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dhcp-forwarder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15505 Modified Files: dhcp-forwarder.spec Log Message: fix license tag Index: dhcp-forwarder.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- dhcp-forwarder.spec 21 Jun 2008 14:56:41 -0000 1.20 +++ dhcp-forwarder.spec 16 Jul 2008 16:23:33 -0000 1.21 @@ -22,8 +22,8 @@ Summary: DHCP relay agent Name: dhcp-forwarder Version: 0.7 -Release: %release_func 14 -License: GPL +Release: %release_func 15 +License: GPLv2 Group: System Environment/Daemons URL: http://www.tu-chemnitz.de/~ensc/dhcp-fwd Source0: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2 @@ -177,6 +177,9 @@ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.7-15 +- fix license tag + * Fri Feb 22 2008 Enrico Scholz - 0.7-14 - rebuilt with new dietlibc From fedora-extras-commits at redhat.com Wed Jul 16 16:26:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 16:26:56 GMT Subject: rpms/dictd/devel dictd.spec,1.32,1.33 Message-ID: <200807161626.m6GGQuUG015834@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dictd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15794 Modified Files: dictd.spec Log Message: fix license tag Index: dictd.spec =================================================================== RCS file: /cvs/pkgs/rpms/dictd/devel/dictd.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dictd.spec 7 May 2008 10:34:05 -0000 1.32 +++ dictd.spec 16 Jul 2008 16:26:04 -0000 1.33 @@ -1,8 +1,8 @@ Summary: DICT protocol (RFC 2229) command-line client Name: dictd Version: 1.10.11 -Release: 2 -License: GPL2+ and zlib and MIT +Release: 3 +License: GPL+ and zlib and MIT Group: Applications/Internet Source0: http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz Source1: dictd.init @@ -56,6 +56,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/dictd %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 1.10.11-3 +- fix license tag + * Wed May 07 2008 Karsten Hopp 1.10.11-2 - update to 1.10.11 From fedora-extras-commits at redhat.com Wed Jul 16 16:27:42 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 16 Jul 2008 16:27:42 GMT Subject: rpms/subcommander/devel subcommander.spec,1.14,1.15 Message-ID: <200807161627.m6GGRgnu015908@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/subcommander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15829 Modified Files: subcommander.spec Log Message: fix some svn-1.5 related issues Index: subcommander.spec =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- subcommander.spec 13 Jul 2008 20:22:01 -0000 1.14 +++ subcommander.spec 16 Jul 2008 16:26:54 -0000 1.15 @@ -21,7 +21,7 @@ BuildRequires: subversion-devel >= 1.2.0 BuildRequires: qt-devel >= 4.3 buildRequires: desktop-file-utils -BuildRequires: apr-devel, apr-util-devel +BuildRequires: apr-devel, >= 1.3.2-2, apr-util-devel >= 1.3.2-7 BuildRequires: zlib-devel BuildRequires: boost-devel BuildRequires: neon-devel From fedora-extras-commits at redhat.com Wed Jul 16 16:28:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:28:38 +0000 Subject: [pkgdb] udns was added for adrian Message-ID: <200807161628.m6GGSc3m021854@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package udns with summary DNS resolver library for both synchronous and asynchronous DNS queries Kevin Fenzi (kevin) has approved Package udns Kevin Fenzi (kevin) has added a Fedora devel branch for udns with an owner of adrian Kevin Fenzi (kevin) has approved udns in Fedora devel Kevin Fenzi (kevin) has approved Package udns Kevin Fenzi (kevin) has set commit to Approved for cvsextras on udns (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on udns (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on udns (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/udns From fedora-extras-commits at redhat.com Wed Jul 16 16:28:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:28:43 +0000 Subject: [pkgdb] udns (Fedora, 8) updated by kevin Message-ID: <200807161628.m6GGShuB021877@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for udns Kevin Fenzi (kevin) has set commit to Approved for cvsextras on udns (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on udns (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on udns (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on udns (Fedora 8) for ben Kevin Fenzi (kevin) approved watchcommits on udns (Fedora 8) for ben Kevin Fenzi (kevin) Approved cvsextras for commit access on udns (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/udns From fedora-extras-commits at redhat.com Wed Jul 16 16:28:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:28:43 +0000 Subject: [pkgdb] udns (Fedora, 9) updated by kevin Message-ID: <200807161628.m6GGShuE021877@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for udns Kevin Fenzi (kevin) has set commit to Approved for cvsextras on udns (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on udns (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on udns (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on udns (Fedora 9) for ben Kevin Fenzi (kevin) approved watchcommits on udns (Fedora 9) for ben Kevin Fenzi (kevin) Approved cvsextras for commit access on udns (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/udns From fedora-extras-commits at redhat.com Wed Jul 16 16:28:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 16:28:43 +0000 Subject: [pkgdb] udns (Fedora, devel) updated by kevin Message-ID: <200807161628.m6GGShuH021877@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on udns (Fedora devel) for ben Kevin Fenzi (kevin) approved watchcommits on udns (Fedora devel) for ben Kevin Fenzi (kevin) Approved cvsextras for commit access on udns (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/udns From fedora-extras-commits at redhat.com Wed Jul 16 16:29:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:29:58 GMT Subject: rpms/udns - New directory Message-ID: <200807161629.m6GGTwbm016092@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/udns In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16037/rpms/udns Log Message: Directory /cvs/extras/rpms/udns added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:30:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:30:15 GMT Subject: rpms/udns/devel - New directory Message-ID: <200807161630.m6GGUFe8016116@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/udns/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16037/rpms/udns/devel Log Message: Directory /cvs/extras/rpms/udns/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 16 16:30:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:30:35 GMT Subject: rpms/udns Makefile,NONE,1.1 Message-ID: <200807161630.m6GGUZJI016160@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/udns In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16037/rpms/udns Added Files: Makefile Log Message: Setup of module udns --- NEW FILE Makefile --- # Top level Makefile for module udns all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 16 16:30:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 16 Jul 2008 16:30:57 GMT Subject: rpms/udns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807161630.m6GGUvI0016226@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/udns/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16037/rpms/udns/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module udns --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: udns # $Id: Makefile,v 1.1 2008/07/16 16:30:35 kevin Exp $ NAME := udns SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 16 16:31:17 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 16 Jul 2008 16:31:17 GMT Subject: rpms/kernel/F-9 config-generic, 1.107, 1.108 kernel.spec, 1.711, 1.712 linux-2.6-wireless-fixups.patch, 1.9, 1.10 linux-2.6-wireless-pending.patch, 1.58, 1.59 Message-ID: <200807161631.m6GGVHnn016361@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16114 Modified Files: config-generic kernel.spec linux-2.6-wireless-fixups.patch linux-2.6-wireless-pending.patch Log Message: Upstream wireless updates from 2008-07-14 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- config-generic 10 Jul 2008 18:26:02 -0000 1.107 +++ config-generic 16 Jul 2008 16:30:23 -0000 1.108 @@ -1266,6 +1266,8 @@ CONFIG_IEEE80211_SOFTMAC_DEBUG=y CONFIG_CFG80211=m CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_ADM8211=m CONFIG_ATH5K=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.711 retrieving revision 1.712 diff -u -r1.711 -r1.712 --- kernel.spec 13 Jul 2008 22:13:04 -0000 1.711 +++ kernel.spec 16 Jul 2008 16:30:23 -0000 1.712 @@ -1877,6 +1877,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Tue Jul 15 2008 John W. Linville +- Upstream wireless updates from 2008-07-14 + (http://marc.info/?l=linux-wireless&m=121606436000705&w=2) + * Sun Jul 13 2008 Kyle McMartin 2.6.25.11-92 - Linux 2.6.25.11 linux-2.6-wireless-fixups.patch: Index: linux-2.6-wireless-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-wireless-fixups.patch 10 Jul 2008 18:26:02 -0000 1.9 +++ linux-2.6-wireless-fixups.patch 16 Jul 2008 16:30:23 -0000 1.10 @@ -1,6 +1,6 @@ diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c ---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-15 16:17:34.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-15 16:20:32.000000000 -0400 @@ -3659,7 +3659,7 @@ void mpi_receive_802_11 (struct airo_inf ptr += hdrlen; if (hdrlen == 24) @@ -208,8 +208,8 @@ return 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-15 16:17:50.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-15 16:20:32.000000000 -0400 @@ -58,6 +58,10 @@ #include "reg.h" #include "debug.h" @@ -221,7 +221,7 @@ static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */ -@@ -2858,9 +2862,9 @@ static void ath5k_configure_filter(struc +@@ -2869,9 +2873,9 @@ static void ath5k_configure_filter(struc if (!mclist) break; /* calculate XOR of eight 6-bit values */ @@ -234,8 +234,8 @@ pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-07-15 16:17:34.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-07-15 16:20:32.000000000 -0400 @@ -967,6 +967,22 @@ static inline bool __b43_warn_on_dummy(b # define B43_WARN_ON(x) __b43_warn_on_dummy(unlikely(!!(x))) #endif @@ -260,8 +260,8 @@ #define INT_TO_Q52(i) ((i) << 2) /* Convert a Q5.2 value to an integer (precision loss!) */ diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-07-15 16:17:34.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-07-15 16:20:32.000000000 -0400 @@ -823,6 +823,23 @@ void b43legacydbg(struct b43legacy_wl *w # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0) #endif /* DEBUG */ @@ -287,8 +287,8 @@ #define Q52_FMT "%u.%u" #define Q52_ARG(q52) ((q52) / 4), (((q52) & 3) * 100 / 4) diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-07-15 16:17:50.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/main.c 2008-07-15 16:20:32.000000000 -0400 @@ -846,10 +846,10 @@ static void handle_irq_noise(struct b43l /* Get the noise samples. */ B43legacy_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -304,7 +304,7 @@ dev->noisecalc.samples[i][0] = phy->nrssi_lt[noise[0]]; dev->noisecalc.samples[i][1] = phy->nrssi_lt[noise[1]]; dev->noisecalc.samples[i][2] = phy->nrssi_lt[noise[2]]; -@@ -1720,7 +1720,7 @@ static int b43legacy_write_initvals(stru +@@ -1728,7 +1728,7 @@ static int b43legacy_write_initvals(stru goto err_format; array_size -= sizeof(iv->data.d32); @@ -314,8 +314,8 @@ iv = (const struct b43legacy_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c.orig 2008-07-15 16:17:34.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/phy.c 2008-07-15 16:20:32.000000000 -0400 @@ -1088,7 +1088,7 @@ static void b43legacy_phy_initg(struct b * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -373,8 +373,8 @@ return 0; } diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2008-07-15 16:17:34.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43legacy/radio.c 2008-07-15 16:20:32.000000000 -0400 @@ -357,7 +357,7 @@ void b43legacy_nrssi_hw_update(struct b4 for (i = 0; i < 64; i++) { tmp = b43legacy_nrssi_hw_read(dev, i); @@ -430,8 +430,8 @@ pamp = b43legacy_get_txgain_freq_power_amp(txpower); pamp <<= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c.orig 2008-07-15 16:17:34.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/lo.c 2008-07-15 16:20:32.000000000 -0400 @@ -199,7 +199,7 @@ static void lo_measure_txctl_values(stru if (lb_gain > 10) { radio_pctl_reg = 0; @@ -451,8 +451,8 @@ if (phy->pga_gain >= 5) { phy->pga_gain -= 5; diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-07-15 16:17:50.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-07-15 16:20:32.000000000 -0400 @@ -1211,10 +1211,10 @@ static void handle_irq_noise(struct b43_ /* Get the noise samples. */ B43_WARN_ON(dev->noisecalc.nr_samples >= 8); @@ -468,7 +468,7 @@ dev->noisecalc.samples[i][0] = phy->nrssi_lt[noise[0]]; dev->noisecalc.samples[i][1] = phy->nrssi_lt[noise[1]]; dev->noisecalc.samples[i][2] = phy->nrssi_lt[noise[2]]; -@@ -2355,7 +2355,7 @@ static int b43_write_initvals(struct b43 +@@ -2365,7 +2365,7 @@ static int b43_write_initvals(struct b43 goto err_format; array_size -= sizeof(iv->data.d32); @@ -478,8 +478,8 @@ iv = (const struct b43_iv *)((const uint8_t *)iv + diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/b43/phy.c 2008-07-15 16:20:32.000000000 -0400 @@ -1400,7 +1400,7 @@ static void b43_phy_initg(struct b43_wld * the value 0x7FFFFFFF here. I think that is some weird * compiler optimization in the original driver. @@ -580,9 +580,9 @@ tmp_u16 = b43_phy_read(dev, 0x048A) & 0xF000; tmp_u16 |= ((u32) b & 0x0000003F); diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-10 13:57:45.000000000 -0400 -@@ -556,36 +556,40 @@ static void iwl3945_add_radiotap(struct +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-15 16:17:50.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-15 16:20:32.000000000 -0400 +@@ -573,36 +573,40 @@ static void iwl3945_add_radiotap(struct iwl3945_rt->rt_hdr.it_pad = 0; /* total header + data */ @@ -637,9 +637,70 @@ &iwl3945_rt->rt_chbitmask); if (rate == -1) +diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig 2008-07-15 16:30:45.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c 2008-07-15 16:35:43.000000000 -0400 +@@ -830,22 +830,23 @@ static void iwl_add_radiotap(struct iwl_ + iwl4965_rt->rt_hdr.it_pad = 0; + + /* total header + data */ +- put_unaligned_le16(sizeof(*iwl4965_rt), &iwl4965_rt->rt_hdr.it_len); ++ put_unaligned(cpu_to_le16(sizeof(*iwl4965_rt)), ++ &iwl4965_rt->rt_hdr.it_len); + + /* Indicate all the fields we add to the radiotap header */ +- put_unaligned_le32((1 << IEEE80211_RADIOTAP_TSFT) | +- (1 << IEEE80211_RADIOTAP_FLAGS) | +- (1 << IEEE80211_RADIOTAP_RATE) | +- (1 << IEEE80211_RADIOTAP_CHANNEL) | +- (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | +- (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) | +- (1 << IEEE80211_RADIOTAP_ANTENNA), +- &(iwl4965_rt->rt_hdr.it_present)); ++ put_unaligned(cpu_to_le32((1 << IEEE80211_RADIOTAP_TSFT) | ++ (1 << IEEE80211_RADIOTAP_FLAGS) | ++ (1 << IEEE80211_RADIOTAP_RATE) | ++ (1 << IEEE80211_RADIOTAP_CHANNEL) | ++ (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | ++ (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) | ++ (1 << IEEE80211_RADIOTAP_ANTENNA)), ++ &iwl4965_rt->rt_hdr.it_present); + + /* Zero the flags, we'll add to them as we go */ + iwl4965_rt->rt_flags = 0; + +- put_unaligned_le64(tsf, &iwl4965_rt->rt_tsf); ++ put_unaligned(cpu_to_le64(tsf), &iwl4965_rt->rt_tsf); + + iwl4965_rt->rt_dbmsignal = signal; + iwl4965_rt->rt_dbmnoise = noise; +@@ -853,14 +854,17 @@ static void iwl_add_radiotap(struct iwl_ + /* Convert the channel frequency and set the flags */ + put_unaligned(cpu_to_le16(stats->freq), &iwl4965_rt->rt_channelMHz); + if (!(phy_flags_hw & RX_RES_PHY_FLAGS_BAND_24_MSK)) +- put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ, +- &iwl4965_rt->rt_chbitmask); ++ put_unaligned(cpu_to_le16(IEEE80211_CHAN_OFDM | ++ IEEE80211_CHAN_5GHZ), ++ &iwl4965_rt->rt_chbitmask); + else if (phy_flags_hw & RX_RES_PHY_FLAGS_MOD_CCK_MSK) +- put_unaligned_le16(IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ, +- &iwl4965_rt->rt_chbitmask); ++ put_unaligned(cpu_to_le16(IEEE80211_CHAN_CCK | ++ IEEE80211_CHAN_2GHZ), ++ &iwl4965_rt->rt_chbitmask); + else /* 802.11g */ +- put_unaligned_le16(IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ, +- &iwl4965_rt->rt_chbitmask); ++ put_unaligned(cpu_to_le16(IEEE80211_CHAN_OFDM | ++ IEEE80211_CHAN_2GHZ), ++ &iwl4965_rt->rt_chbitmask); + + if (rate == -1) + iwl4965_rt->rt_rate = 0; diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c ---- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-10 14:00:03.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-15 16:20:32.000000000 -0400 @@ -523,7 +523,7 @@ static int lbs_process_bss(struct bss_de if (*bytesleft >= sizeof(beaconsize)) { @@ -664,8 +725,8 @@ pos += 2; diff -up linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c ---- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-10 13:57:45.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c.orig 2008-07-15 16:17:50.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/mac80211_hwsim.c 2008-07-15 16:20:32.000000000 -0400 @@ -430,16 +430,15 @@ static int __init init_mac80211_hwsim(vo hwsim_radios[i] = hw; @@ -687,8 +748,8 @@ SET_IEEE80211_DEV(hw, data->dev); addr[3] = i >> 8; diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-15 16:20:32.000000000 -0400 @@ -557,11 +557,11 @@ static void handle_rx_packet(struct zd_u * be padded. Unaligned access might also happen if the length_info * structure is not present. @@ -704,8 +765,8 @@ return; n = l+k; diff -up linux-2.6.25.noarch/include/linux/input.h.orig linux-2.6.25.noarch/include/linux/input.h ---- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/include/linux/input.h 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/include/linux/input.h.orig 2008-07-15 16:16:03.000000000 -0400 ++++ linux-2.6.25.noarch/include/linux/input.h 2008-07-15 16:20:32.000000000 -0400 @@ -638,6 +638,7 @@ struct input_absinfo { #define SW_TABLET_MODE 0x01 /* set = tablet mode */ #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ @@ -715,9 +776,9 @@ #define SW_CNT (SW_MAX+1) diff -up linux-2.6.25.noarch/net/mac80211/iface.c.orig linux-2.6.25.noarch/net/mac80211/iface.c ---- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-10 13:57:46.000000000 -0400 -@@ -53,15 +53,6 @@ int ieee80211_if_add(struct net_device * +--- linux-2.6.25.noarch/net/mac80211/iface.c.orig 2008-07-15 16:17:50.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/iface.c 2008-07-15 16:20:32.000000000 -0400 +@@ -181,15 +181,6 @@ int ieee80211_if_add(struct ieee80211_lo if (!ndev) return -ENOMEM; @@ -734,8 +795,8 @@ if (ret < 0) goto fail; diff -up linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c ---- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mesh_hwmp.c 2008-07-15 16:20:32.000000000 -0400 @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq { if (ae) @@ -746,8 +807,8 @@ /* HWMP IE processing macros */ diff -up linux-2.6.25.noarch/net/mac80211/michael.c.orig linux-2.6.25.noarch/net/mac80211/michael.c ---- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/michael.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/michael.c 2008-07-15 16:20:32.000000000 -0400 @@ -39,17 +39,16 @@ static void michael_mic_hdr(struct micha else tid = 0; @@ -797,9 +858,21 @@ + mic[6] = (mctx.r >> 16) & 0xff; + mic[7] = (mctx.r >> 24) & 0xff; } +diff -up linux-2.6.25.noarch/net/mac80211/mlme.c.orig linux-2.6.25.noarch/net/mac80211/mlme.c +--- linux-2.6.25.noarch/net/mac80211/mlme.c.orig 2008-07-15 16:31:52.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mlme.c 2008-07-15 16:25:34.000000000 -0400 +@@ -345,7 +345,7 @@ static void ieee80211_sta_wmm_params(str + params.aifs = pos[0] & 0x0f; + params.cw_max = ecw2cw((pos[1] & 0xf0) >> 4); + params.cw_min = ecw2cw(pos[1] & 0x0f); +- params.txop = get_unaligned_le16(pos + 2); ++ params.txop = pos[2] | (pos[3] << 8); + #ifdef CONFIG_MAC80211_VERBOSE_DEBUG + printk(KERN_DEBUG "%s: WMM queue=%d aci=%d acm=%d aifs=%d " + "cWmin=%d cWmax=%d txop=%d\n", diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c ---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-10 13:57:40.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-15 16:20:32.000000000 -0400 @@ -7,22 +7,23 @@ * published by the Free Software Foundation. */ @@ -1004,8 +1077,8 @@ + + diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-10 13:57:41.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-15 16:20:32.000000000 -0400 @@ -317,11 +317,13 @@ static void ccmp_special_blocks(struct s memcpy(&b_0[2], hdr->addr2, ETH_ALEN); memcpy(&b_0[8], pn, CCMP_PN_LEN); @@ -1023,8 +1096,8 @@ memcpy(&aad[4], &hdr->addr1, 3 * ETH_ALEN); diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-07-10 13:57:41.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-15 16:20:32.000000000 -0400 @@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil struct net *net; @@ -1035,8 +1108,8 @@ if (sock->ops->compat_ioctl) ret = sock->ops->compat_ioctl(sock, cmd, arg); diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-10 13:57:41.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-15 16:20:32.000000000 -0400 @@ -167,13 +167,13 @@ int cfg80211_dev_rename(struct cfg80211_ /* Ignore nop renames */ @@ -1054,8 +1127,8 @@ } diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-10 13:57:41.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-15 16:20:32.000000000 -0400 @@ -59,21 +59,23 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -1097,8 +1170,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-10 13:57:41.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-10 13:57:46.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-15 16:17:35.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-15 16:20:32.000000000 -0400 @@ -1299,7 +1299,7 @@ static void rtmsg_iwinfo(struct net_devi struct sk_buff *skb; int err; linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.58 -r 1.59 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- linux-2.6-wireless-pending.patch 10 Jul 2008 18:26:02 -0000 1.58 +++ linux-2.6-wireless-pending.patch 16 Jul 2008 16:30:23 -0000 1.59 @@ -1,3 +1,501 @@ +commit 4c9adafff7d910f142fe44fae37ed12c6b99f20f +Author: Ivo van Doorn +Date: Sun Jul 13 10:07:48 2008 +0200 + + rt2x00: Reset LED assoc status after firmware update + + According to the legacy drivers the LED association status + must be reset after the firmware has been uploaded to the + hardware. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 3eb2011a67b044859069359948579b942993c416 +Author: Abhijeet Kolekar +Date: Fri Jul 11 11:53:42 2008 +0800 + + iwlwifi: make index unsigned int for iwl_send_led_cmd + + This is a small fix to change the idx type from int to unsigned. + + Signed-off-by: Abhijeet Kolekar + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 9a9ad0cda72a651fc6b99fa9ec040a5d41005a88 +Author: Abhijeet Kolekar +Date: Fri Jul 11 11:53:41 2008 +0800 + + iwlwifi: Fix LEDs for 3945 + + The patch fixes LEDs problem for 3945. + + Signed-off-by: Abhijeet Kolekar + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 36da7d70e307f8650db1b1c7350d2161ca3829ef +Author: Zhu Yi +Date: Fri Jul 11 11:53:40 2008 +0800 + + iwlwifi: send TXPOWER command after a new RXON command + + The patch fixes the problem that TXPOWER command is not sent + after we issue a new RXON command which requires a tune. Otherwise + we won't be able to Tx any frames. + + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit fe905f1d5a8404f45fa0df26e6a870bf1e3b5983 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:39 2008 +0800 + + iwlwifi: enable active scanning + + This patch enables active scan on active channels. + + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit d16dc48a2ea14af9980d0ea79d041f4b53e47b62 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:38 2008 +0800 + + iwlwifi: unify 4965 and 5000 scanning code + + This patch unifies 4965 and 5000 scanning code. + + We increases the version number to 1.3.27. Since new uCode + iwlwifi-4965-2.ucode is required for 4965 cards. + + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit ec1a746042ea4c1c93065185897d6e8d3e7de894 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:37 2008 +0800 + + iwlwifi: LED use correctly blink table + + This patch makes correct usage of the LED blink table. + + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 0eee612731e133604023bfa8d20047e98160845e +Author: Tomas Winkler +Date: Fri Jul 11 11:53:36 2008 +0800 + + iwlwifi: fix LED stall + + This patch fixes LED stall. last_blink_time was updated only if LED command + was sent, causing wrong computation of the througput. + Some code cleanup comes with this patch as well + + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 9f17b318a1e2335b45cf35ad6509b90e972c0e6b +Author: Tomas Winkler +Date: Fri Jul 11 11:53:35 2008 +0800 + + iwlwifi: differentiate 4965 and 5000 hw ampdu queues number + + This patch asks to allocate the correct amount of sw queues according + to hw ampdu queues number. + + Signed-off-by: Ron Rindjunsky + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 1ff50bda6eef4466366e197541508fc69af0f0c0 +Author: Emmanuel Grumbach +Date: Fri Jul 11 11:53:34 2008 +0800 + + iwlwifi: make iwl4965_mac_conf_tx in atomic context + + This patch fixes iwl4965_mac_conf_tx. A mutex was taken in atomic context + leading to Oops. This patch removes the mutex and extends the hold + priv->lock. None of the field of QOS is accessed without priv->lock held. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 6c5379077f47f6eff9c23caf8513751d2f582e72 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:33 2008 +0800 + + iwlwifi: rs always set lq_sta->priv + + This patch fixes printk NULL pointer exceptions in rs code. + + Signed-off-by: Tomas Winkler + Signed-off-by: Guy Cohen + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 65fdbb48eb43e33e94239677a75422ddc6f5eb75 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:32 2008 +0800 + + iwlwifi: remove post associate work + + This patch removes post associate work. It wasn't used. + + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit a326a5d096f031af46c0073dd78eb80dea1f311a +Author: Emmanuel Grumbach +Date: Fri Jul 11 11:53:31 2008 +0800 + + iwlwifi: fixes RTS / CTS support + + This patch fixes the RTS / CTS support in iwlwifi. 5000 will send CTS to + self when allowed by spec, 4965 will send RTS or CTS to self according to + mac80211 request. + + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 474086396276a01190974797a69a95fb14ae7cc9 +Author: Esti Kummer +Date: Fri Jul 11 11:53:30 2008 +0800 + + iwlwifi: adding pci device ids to iwl_hw_card_ids + + The patch adds PCI device IDs to iwl_hw_card_ids. + + Signed-off-by: Esti Kummer + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi + Signed-off-by: John W. Linville + +commit 4bd9b4f334c31a79bdfee4db5dbb6aa430090446 +Author: Adel Gadllah +Date: Fri Jul 11 11:53:29 2008 +0800 + + iwl3965: remove useless network and duplicate checking + [...17842 lines suppressed...] + ++ return 0; ++} ++ ++static int ieee80211_ioctl_siwpower(struct net_device *dev, ++ struct iw_request_info *info, ++ struct iw_param *wrq, ++ char *extra) ++{ ++ struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); ++ struct ieee80211_conf *conf = &local->hw.conf; ++ ++ if (wrq->disabled) { ++ conf->flags &= ~IEEE80211_CONF_PS; ++ return ieee80211_hw_config(local); ++ } ++ ++ switch (wrq->flags & IW_POWER_MODE) { ++ case IW_POWER_ON: /* If not specified */ ++ case IW_POWER_MODE: /* If set all mask */ ++ case IW_POWER_ALL_R: /* If explicitely state all */ ++ conf->flags |= IEEE80211_CONF_PS; ++ break; ++ default: /* Otherwise we don't support it */ ++ return -EINVAL; ++ } ++ ++ return ieee80211_hw_config(local); ++} ++ ++static int ieee80211_ioctl_giwpower(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra) ++{ ++ struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); ++ struct ieee80211_conf *conf = &local->hw.conf; ++ ++ wrqu->power.disabled = !(conf->flags & IEEE80211_CONF_PS); ++ return 0; } -@@ -1015,8 +1077,8 @@ static struct iw_statistics *ieee80211_g +@@ -1015,8 +1106,8 @@ static struct iw_statistics *ieee80211_g wstats->qual.noise = 0; wstats->qual.updated = IW_QUAL_ALL_INVALID; } else { @@ -79912,9 +84158,20 @@ wstats->qual.noise = sta->last_noise; wstats->qual.updated = local->wstats_flags; } +@@ -1149,8 +1240,8 @@ static const iw_handler ieee80211_handle + (iw_handler) ieee80211_ioctl_giwretry, /* SIOCGIWRETRY */ + (iw_handler) ieee80211_ioctl_siwencode, /* SIOCSIWENCODE */ + (iw_handler) ieee80211_ioctl_giwencode, /* SIOCGIWENCODE */ +- (iw_handler) NULL, /* SIOCSIWPOWER */ +- (iw_handler) NULL, /* SIOCGIWPOWER */ ++ (iw_handler) ieee80211_ioctl_siwpower, /* SIOCSIWPOWER */ ++ (iw_handler) ieee80211_ioctl_giwpower, /* SIOCGIWPOWER */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) ieee80211_ioctl_siwgenie, /* SIOCSIWGENIE */ diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-09 10:52:48.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-15 16:17:35.000000000 -0400 @@ -19,16 +19,22 @@ #include "wme.h" @@ -80329,8 +84586,8 @@ skb = qdisc->dequeue(qdisc); root_qd->q.qlen--; diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h ---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-09 10:52:48.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-15 16:17:35.000000000 -0400 @@ -19,19 +19,11 @@ #define QOS_CONTROL_ACK_POLICY_NORMAL 0 #define QOS_CONTROL_ACK_POLICY_NOACK 1 @@ -80353,8 +84610,8 @@ int ieee80211_qdisc_installed(struct net_device *dev); int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c ---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-09 10:52:48.000000000 -0400 +--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-15 16:17:35.000000000 -0400 @@ -11,6 +11,8 @@ #include #include @@ -81000,8 +85257,8 @@ } } diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c ---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-09 10:52:48.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-15 16:17:35.000000000 -0400 @@ -39,8 +39,56 @@ MODULE_LICENSE("GPL"); static LIST_HEAD(rfkill_list); /* list of registered rf switches */ static DEFINE_MUTEX(rfkill_mutex); @@ -81474,8 +85731,8 @@ } diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-09 10:52:43.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-15 16:17:35.000000000 -0400 @@ -30,39 +30,62 @@ struct rfkill_task { spinlock_t lock; /* for accessing last and desired state */ unsigned long last; /* last schedule */ @@ -81633,8 +85890,8 @@ }; diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h ---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-09 10:52:43.000000000 -0400 +--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-15 16:17:35.000000000 -0400 @@ -12,5 +12,6 @@ #define __RFKILL_INPUT_H @@ -81643,8 +85900,8 @@ #endif /* __RFKILL_INPUT_H */ diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c ---- linux-2.6.25.noarch/net/socket.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/socket.c 2008-07-09 10:52:43.000000000 -0400 +--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/socket.c 2008-07-15 16:17:35.000000000 -0400 @@ -90,6 +90,7 @@ #include @@ -81674,8 +85931,8 @@ } #endif diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c ---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-09 10:52:43.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-15 16:17:35.000000000 -0400 @@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) @@ -81738,9 +85995,27 @@ } /* exported functions */ +diff -up linux-2.6.25.noarch/net/wireless/Kconfig.orig linux-2.6.25.noarch/net/wireless/Kconfig +--- linux-2.6.25.noarch/net/wireless/Kconfig.orig 2008-04-16 22:49:44.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/Kconfig 2008-07-15 16:17:50.000000000 -0400 +@@ -29,3 +29,14 @@ config WIRELESS_EXT + + Say N (if you can) unless you know you need wireless + extensions for external modules. ++ ++config WIRELESS_EXT_SYSFS ++ bool "Wireless extensions sysfs files" ++ default y ++ depends on WIRELESS_EXT && SYSFS ++ help ++ This option enables the deprecated wireless statistics ++ files in /sys/class/net/*/wireless/. The same information ++ is available via the ioctls as well. ++ ++ Say Y if you have programs using it (we don't know of any). diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c ---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-09 10:42:31.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-09 10:52:48.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-15 16:17:35.000000000 -0400 @@ -198,12 +198,14 @@ static int nl80211_dump_wiphy(struct sk_ mutex_lock(&cfg80211_drv_mutex); @@ -81759,8 +86034,8 @@ mutex_unlock(&cfg80211_drv_mutex); diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-09 10:52:43.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-15 16:17:35.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -81802,8 +86077,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-09 10:52:27.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-09 10:52:43.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-15 16:16:12.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-15 16:17:35.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments From fedora-extras-commits at redhat.com Wed Jul 16 16:37:20 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 16 Jul 2008 16:37:20 GMT Subject: rpms/subcommander/devel subcommander-2.0.0b3-svn15.patch, NONE, 1.1 subcommander.spec, 1.15, 1.16 Message-ID: <200807161637.m6GGbK70016773@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/subcommander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16721 Modified Files: subcommander.spec Added Files: subcommander-2.0.0b3-svn15.patch Log Message: Add forgotten file subcommander-2.0.0b3-svn15.patch: --- NEW FILE subcommander-2.0.0b3-svn15.patch --- diff -up subcommander-2.0.0b3/configure.ac.svn15 subcommander-2.0.0b3/configure.ac --- subcommander-2.0.0b3/configure.ac.svn15 2008-06-22 19:19:21.000000000 +0200 +++ subcommander-2.0.0b3/configure.ac 2008-07-13 22:18:18.000000000 +0200 @@ -230,7 +230,7 @@ AC_COMPILE_IFELSE( ]], [[ const svn_version_t* v = svn_client_version(); - #if not (SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 4 && SVN_VER_PATCH >=4) + #if not (SVN_VER_MAJOR >= 1 && ((SVN_VER_MINOR == 4 && SVN_VER_PATCH >=4) || (SVN_VER_MINOR >= 5))) # error needs subversion 1.4.4+! #endif ]] diff -up subcommander-2.0.0b3/subcommander/Makefile.am.svn15 subcommander-2.0.0b3/subcommander/Makefile.am --- subcommander-2.0.0b3/subcommander/Makefile.am.svn15 2008-07-13 22:18:36.000000000 +0200 +++ subcommander-2.0.0b3/subcommander/Makefile.am 2008-07-13 22:18:52.000000000 +0200 @@ -115,7 +115,7 @@ bin_PROGRAMS = subcommander subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @QT_LIBS@ \ -lz @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_client-1 -lsvn_subr-1 \ - -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 -lsvn_ra_dav-1 \ + -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 \ -lsvn_ra_local-1 -lsvn_ra_svn-1 -lsvn_repos-1 -lsvn_fs-1 \ -lsvn_fs_fs-1 @STLPORT_LIBS@ @NEON_LIBS@ Index: subcommander.spec =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- subcommander.spec 16 Jul 2008 16:26:54 -0000 1.15 +++ subcommander.spec 16 Jul 2008 16:36:32 -0000 1.16 @@ -2,7 +2,7 @@ Name: subcommander Version: 1.9.93 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Graphical UI for subversion Group: Development/Tools @@ -80,6 +80,9 @@ %doc README CHANGES COPYING %changelog +* Wed Jul 16 2008 Jochen Schmitt 1.9.93-5 +- Add forgotten file + * Sun Jul 13 2008 Jochen Schmitt 1.9.93-4 - Some more fixes for svn-1.5 From fedora-extras-commits at redhat.com Wed Jul 16 16:39:11 2008 From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk)) Date: Wed, 16 Jul 2008 16:39:11 GMT Subject: rpms/device-mapper/devel device-mapper.1.02.26.tgz.asc, NONE, 1.1 .cvsignore, 1.27, 1.28 Makefile, 1.3, NONE device-mapper.1.02.23.tgz.asc, 1.1, NONE device-mapper.spec, 1.63, NONE mirrors, 1.1, NONE sources, 1.32, NONE upstream, 1.23, NONE upstream-key.gpg, 1.1, NONE Message-ID: <200807161639.m6GGdB3T016903@cvs-int.fedora.redhat.com> Author: agk Update of /cvs/pkgs/rpms/device-mapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16850 Modified Files: .cvsignore Added Files: device-mapper.1.02.26.tgz.asc Removed Files: Makefile device-mapper.1.02.23.tgz.asc device-mapper.spec mirrors sources upstream upstream-key.gpg Log Message: Remove no-longer-used files. This is now part of the LVM2 package. --- NEW FILE device-mapper.1.02.26.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBISY4mIoGRwVZ+LBcRAqEWAKCRvnAr/83XJyDzv4cFS0MmxWf8MwCg3hFp aCqXFmkPZZQUFf7OaqdvSXI= =p+7f -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 5 Dec 2007 22:42:26 -0000 1.27 +++ .cvsignore 16 Jul 2008 16:38:23 -0000 1.28 @@ -1 +1,2 @@ device-mapper.1.02.23.tgz +device-mapper.1.02.26.tgz --- Makefile DELETED --- --- device-mapper.1.02.23.tgz.asc DELETED --- --- device-mapper.spec DELETED --- --- mirrors DELETED --- --- sources DELETED --- --- upstream DELETED --- --- upstream-key.gpg DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 16:40:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 16:40:34 GMT Subject: rpms/ruby-RMagick/F-9 .cvsignore, 1.11, 1.12 ruby-RMagick.spec, 1.13, 1.14 sources, 1.11, 1.12 Message-ID: <200807161640.m6GGeYFc016981@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-RMagick/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16914/F-9 Modified Files: .cvsignore ruby-RMagick.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 2.5.2-1 - 2.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 28 Jun 2008 18:36:48 -0000 1.11 +++ .cvsignore 16 Jul 2008 16:39:49 -0000 1.12 @@ -1 +1 @@ -RMagick-2.5.1.tar.bz2 +RMagick-2.5.2.tar.bz2 Index: ruby-RMagick.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/ruby-RMagick.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ruby-RMagick.spec 28 Jun 2008 18:36:48 -0000 1.13 +++ ruby-RMagick.spec 16 Jul 2008 16:39:49 -0000 1.14 @@ -8,11 +8,11 @@ %define rubyabi 1.8 %define modname RMagick -%define repoid 38606 +%define repoid 39889 %define IMver 6.3.5 -%define mainver 2.5.1 +%define mainver 2.5.2 %undefine betaver %define fedorarel 1 @@ -99,6 +99,9 @@ %doc DOCDIR/HTML/* %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 2.5.2-1 +- 2.5.2 + * Sun Jun 29 2008 Mamoru Tasaka - 2.5.1-1 - 2.5.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 28 Jun 2008 18:36:48 -0000 1.11 +++ sources 16 Jul 2008 16:39:49 -0000 1.12 @@ -1 +1 @@ -5b001f4b815889332105f8d048ddc4c1 RMagick-2.5.1.tar.bz2 +30986483a2d77f17febd597c32c420b3 RMagick-2.5.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 16:40:49 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 16:40:49 GMT Subject: rpms/ruby-RMagick/devel .cvsignore, 1.11, 1.12 ruby-RMagick.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <200807161640.m6GGenkD016986@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-RMagick/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16914/devel Modified Files: .cvsignore ruby-RMagick.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 2.5.2-1 - 2.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 28 Jun 2008 18:37:01 -0000 1.11 +++ .cvsignore 16 Jul 2008 16:40:04 -0000 1.12 @@ -1 +1 @@ -RMagick-2.5.1.tar.bz2 +RMagick-2.5.2.tar.bz2 Index: ruby-RMagick.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ruby-RMagick.spec 28 Jun 2008 18:37:01 -0000 1.15 +++ ruby-RMagick.spec 16 Jul 2008 16:40:04 -0000 1.16 @@ -8,11 +8,11 @@ %define rubyabi 1.8 %define modname RMagick -%define repoid 38606 +%define repoid 39889 %define IMver 6.3.5 -%define mainver 2.5.1 +%define mainver 2.5.2 %undefine betaver %define fedorarel 1 @@ -99,6 +99,9 @@ %doc DOCDIR/HTML/* %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 2.5.2-1 +- 2.5.2 + * Sun Jun 29 2008 Mamoru Tasaka - 2.5.1-1 - 2.5.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 28 Jun 2008 18:37:01 -0000 1.11 +++ sources 16 Jul 2008 16:40:04 -0000 1.12 @@ -1 +1 @@ -5b001f4b815889332105f8d048ddc4c1 RMagick-2.5.1.tar.bz2 +30986483a2d77f17febd597c32c420b3 RMagick-2.5.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 16:40:49 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 16:40:49 GMT Subject: rpms/ruby-RMagick/F-8 .cvsignore, 1.11, 1.12 ruby-RMagick.spec, 1.13, 1.14 sources, 1.11, 1.12 Message-ID: <200807161640.m6GGenE2016989@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-RMagick/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16914/F-8 Modified Files: .cvsignore ruby-RMagick.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 2.5.2-1 - 2.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/F-8/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 28 Jun 2008 18:36:26 -0000 1.11 +++ .cvsignore 16 Jul 2008 16:39:29 -0000 1.12 @@ -1 +1 @@ -RMagick-2.5.1.tar.bz2 +RMagick-2.5.2.tar.bz2 Index: ruby-RMagick.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/F-8/ruby-RMagick.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ruby-RMagick.spec 28 Jun 2008 18:36:26 -0000 1.13 +++ ruby-RMagick.spec 16 Jul 2008 16:39:29 -0000 1.14 @@ -8,11 +8,11 @@ %define rubyabi 1.8 %define modname RMagick -%define repoid 38606 +%define repoid 39889 %define IMver 6.3.5 -%define mainver 2.5.1 +%define mainver 2.5.2 %undefine betaver %define fedorarel 1 @@ -99,6 +99,9 @@ %doc DOCDIR/HTML/* %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 2.5.2-1 +- 2.5.2 + * Sun Jun 29 2008 Mamoru Tasaka - 2.5.1-1 - 2.5.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/F-8/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 28 Jun 2008 18:36:26 -0000 1.11 +++ sources 16 Jul 2008 16:39:29 -0000 1.12 @@ -1 +1 @@ -5b001f4b815889332105f8d048ddc4c1 RMagick-2.5.1.tar.bz2 +30986483a2d77f17febd597c32c420b3 RMagick-2.5.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 16:52:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 16:52:48 GMT Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.83,1.84 Message-ID: <200807161652.m6GGqmbg017390@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17368 Modified Files: dejavu-fonts.spec Log Message: fix license tag Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- dejavu-fonts.spec 16 Jul 2008 16:14:00 -0000 1.83 +++ dejavu-fonts.spec 16 Jul 2008 16:51:56 -0000 1.84 @@ -16,11 +16,11 @@ Name: %{fontname}-fonts Version: 2.25 -Release: 3%{?alphatag}%{?dist} +Release: 4%{?alphatag}%{?dist} Summary: DejaVu fonts, mature typefaces Group: User Interface/X -License: Bitstream Vera +License: Bitstream Vera and Public Domain URL: http://%{fontname}.sf.net/ Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 @@ -176,6 +176,9 @@ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 2.25-4 +- note Public Domain contributions + * Wed Jul 16 2008 Tom "spot" Callaway - 2.25-3 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 16 17:00:44 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 16 Jul 2008 17:00:44 GMT Subject: rpms/cx18-firmware/F-8 cx18-firmware.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161700.m6GH0iFP017707@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/cx18-firmware/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17670 Modified Files: .cvsignore sources Added Files: cx18-firmware.spec Log Message: * Tue Jul 15 2008 Jarod Wilson - 20080628-1 - Initial package for Conexant cx23418 device firmware --- NEW FILE cx18-firmware.spec --- Summary: Firmware for Conexant cx23418-based video capture devices Name: cx18-firmware Version: 20080628 Release: 1 License: Redistributable, no modification permitted Group: System Environment/Kernel URL: http://dl.ivtvdriver.org/ivtv/firmware/ Source0: http://dl.ivtvdriver.org/ivtv/firmware/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch %description This package contains the firmware for Conexant cx23418-based video capture devices, such as the Hauppauge WinTV HVR-1600. %prep %setup -q -n %{name} %build %install rm -rf %{buildroot} mkdir -p %{buildroot}/lib/firmware install -p *.fw %{buildroot}/lib/firmware/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc *.pdf LICENSE /lib/firmware/v4l-cx23418*.fw %changelog * Tue Jul 15 2008 Jarod Wilson - 20080628-1 - Initial package for Conexant cx23418 device firmware Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cx18-firmware/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:06:56 -0000 1.1 +++ .cvsignore 16 Jul 2008 16:59:49 -0000 1.2 @@ -0,0 +1 @@ +cx18-firmware-20080628.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cx18-firmware/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:06:56 -0000 1.1 +++ sources 16 Jul 2008 16:59:49 -0000 1.2 @@ -0,0 +1 @@ +667fa0ee6b79e054736beef922966333 cx18-firmware-20080628.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 17:06:38 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 16 Jul 2008 17:06:38 GMT Subject: rpms/kernel/devel patch-2.6.26-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.867, 1.868 kernel.spec, 1.771, 1.772 sources, 1.827, 1.828 upstream, 1.745, 1.746 patch-2.6.26-git2.bz2.sign, 1.1, NONE Message-ID: <200807161706.m6GH6crO024570@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24468 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-git3.bz2.sign Removed Files: patch-2.6.26-git2.bz2.sign Log Message: 2.6.26-git3 --- NEW FILE patch-2.6.26-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIfZ01yGugalF9Dw4RAi7MAKCFxwMKsgSQSAysTL0oi2q9lluMCACeIt8r WuRjnM0lNF1lJLLqLQAQksU= =HnnV -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.867 retrieving revision 1.868 diff -u -r1.867 -r1.868 --- .cvsignore 15 Jul 2008 19:51:19 -0000 1.867 +++ .cvsignore 16 Jul 2008 17:05:46 -0000 1.868 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git2.bz2 +patch-2.6.26-git3.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.771 retrieving revision 1.772 diff -u -r1.771 -r1.772 --- kernel.spec 16 Jul 2008 03:54:36 -0000 1.771 +++ kernel.spec 16 Jul 2008 17:05:46 -0000 1.772 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -977,7 +977,7 @@ done %endif -ApplyPatch git-linus.diff +#ApplyPatch git-linus.diff # This patch adds a "make nonint_oldconfig" which is non-interactive and # also gives a list of missing options at the end. Useful for automated @@ -1777,6 +1777,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 16 2008 Dave Jones +- 2.6.26-git3 + * Tue Jul 15 2008 Dave Jones - Merge Linux-2.6 up to commit 45158894d4d6704afbb4cefe55e5f6ca279fe12a Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.827 retrieving revision 1.828 diff -u -r1.827 -r1.828 --- sources 15 Jul 2008 19:51:19 -0000 1.827 +++ sources 16 Jul 2008 17:05:46 -0000 1.828 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -a75de1b4eebd60f52ef7dfe0dc3dd376 patch-2.6.26-git2.bz2 +35dc9fa4bf144bd955d9da4355ac5c0e patch-2.6.26-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.745 retrieving revision 1.746 diff -u -r1.745 -r1.746 --- upstream 15 Jul 2008 19:51:19 -0000 1.745 +++ upstream 16 Jul 2008 17:05:46 -0000 1.746 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git2.bz2 +patch-2.6.26-git3.bz2 --- patch-2.6.26-git2.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 17:07:00 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 16 Jul 2008 17:07:00 GMT Subject: rpms/kernel/devel/scripts get-snapshot.sh,1.4,1.5 Message-ID: <200807161707.m6GH70NN024604@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24468/scripts Modified Files: get-snapshot.sh Log Message: 2.6.26-git3 Index: get-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/get-snapshot.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- get-snapshot.sh 16 Jul 2008 03:55:05 -0000 1.4 +++ get-snapshot.sh 16 Jul 2008 17:06:08 -0000 1.5 @@ -12,6 +12,9 @@ echo Nothing changed. exit fi + +perl -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec + git diff $SHA1.. > ~/src/fedora/kernel/devel/git-linus.diff echo "- Merge Linux-2.6 up to" $(git log | head -n1) > ~/src/fedora/kernel/devel/clog.tmp From fedora-extras-commits at redhat.com Wed Jul 16 17:07:11 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 17:07:11 GMT Subject: rpms/jd/F-9 .cvsignore, 1.267, 1.268 jd.spec, 1.304, 1.305 sources, 1.268, 1.269 Message-ID: <200807161707.m6GH7BUN024623@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24485/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - rev 2204 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- .cvsignore 13 Jul 2008 16:06:39 -0000 1.267 +++ .cvsignore 16 Jul 2008 17:06:21 -0000 1.268 @@ -1 +1 @@ -jd-2.0.0-rc080714.tgz +jd-2.0.0-svn2204_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- jd.spec 13 Jul 2008 16:06:39 -0000 1.304 +++ jd.spec 16 Jul 2008 17:06:21 -0000 1.305 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag rc080714 +%define strtag svn2204_trunk %define repoid 31996 # Define this if this is pre-version %define pre_release 1 @@ -137,6 +137,9 @@ %{icondir}/%{name}.png %changelog +* Thu Jul 17 2008 Mamoru Tasaka +- rev 2204 + * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- sources 13 Jul 2008 16:06:39 -0000 1.268 +++ sources 16 Jul 2008 17:06:21 -0000 1.269 @@ -1 +1 @@ -eb768c3d0d71c7ad5441d6134fe92678 jd-2.0.0-rc080714.tgz +e92468942e5157d78280584138108e2b jd-2.0.0-svn2204_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 16 17:07:20 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 17:07:20 GMT Subject: rpms/jd/F-8 .cvsignore, 1.260, 1.261 jd.spec, 1.293, 1.294 sources, 1.261, 1.262 Message-ID: <200807161707.m6GH7KqQ024632@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24485/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - rev 2204 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- .cvsignore 13 Jul 2008 16:06:18 -0000 1.260 +++ .cvsignore 16 Jul 2008 17:06:00 -0000 1.261 @@ -1 +1 @@ -jd-2.0.0-rc080714.tgz +jd-2.0.0-svn2204_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- jd.spec 13 Jul 2008 16:06:18 -0000 1.293 +++ jd.spec 16 Jul 2008 17:06:00 -0000 1.294 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag rc080714 +%define strtag svn2204_trunk %define repoid 31996 # Define this if this is pre-version %define pre_release 1 @@ -137,6 +137,9 @@ %{icondir}/%{name}.png %changelog +* Thu Jul 17 2008 Mamoru Tasaka +- rev 2204 + * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- sources 13 Jul 2008 16:06:18 -0000 1.261 +++ sources 16 Jul 2008 17:06:00 -0000 1.262 @@ -1 +1 @@ -eb768c3d0d71c7ad5441d6134fe92678 jd-2.0.0-rc080714.tgz +e92468942e5157d78280584138108e2b jd-2.0.0-svn2204_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 16 17:07:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 16 Jul 2008 17:07:34 GMT Subject: rpms/jd/devel .cvsignore, 1.267, 1.268 jd.spec, 1.310, 1.311 sources, 1.268, 1.269 Message-ID: <200807161707.m6GH7YDd024656@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24485/devel Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - rev 2204 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- .cvsignore 13 Jul 2008 16:06:58 -0000 1.267 +++ .cvsignore 16 Jul 2008 17:06:41 -0000 1.268 @@ -1 +1 @@ -jd-2.0.0-rc080714.tgz +jd-2.0.0-svn2204_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- jd.spec 13 Jul 2008 16:06:58 -0000 1.310 +++ jd.spec 16 Jul 2008 17:06:42 -0000 1.311 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag rc080714 +%define strtag svn2204_trunk %define repoid 31996 # Define this if this is pre-version %define pre_release 1 @@ -137,6 +137,9 @@ %{icondir}/%{name}.png %changelog +* Thu Jul 17 2008 Mamoru Tasaka +- rev 2204 + * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- sources 13 Jul 2008 16:06:58 -0000 1.268 +++ sources 16 Jul 2008 17:06:42 -0000 1.269 @@ -1 +1 @@ -eb768c3d0d71c7ad5441d6134fe92678 jd-2.0.0-rc080714.tgz +e92468942e5157d78280584138108e2b jd-2.0.0-svn2204_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 16 17:07:59 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 16 Jul 2008 17:07:59 GMT Subject: rpms/dbus-c++/devel dbus-c++.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161707.m6GH7x9t024665@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/dbus-c++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24603/devel Modified Files: .cvsignore sources Added Files: dbus-c++.spec import.log Log Message: Initial import --- NEW FILE dbus-c++.spec --- %define git_date 20080716 %define git_version 1337c65 Name: dbus-c++ Version: 0.5.0 Release: 0.3.%{git_date}git%{git_version}%{?dist} Summary: Native C++ bindings for D-Bus Group: System Environment/Libraries License: LGPLv2+ URL: http://freedesktop.org/wiki/Software/dbus-c++ # Generate tarball # git clone git://anongit.freedesktop.org/git/dbus/dbus-c++/ # git-archive --format=tar --prefix=dbus-c++/ %{git_version} | bzip2 > dbus-c++-0.5.0.`date +%Y%m%d`git%{git_version}.tar.bz2 Source0: %{name}-%{version}.%{git_date}git%{git_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: glib2-devel Buildrequires: gtkmm24-devel Buildrequires: libtool BuildRequires: expat-devel %description Native C++ bindings for D-Bus for use in C++ programs. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q -n %{name} %{__sed} -i 's/\r//' AUTHORS %{__sed} -i 's/-O3//' configure.ac %build ./autogen.sh export CPPFLAGS='%{optflags}' %configure --disable-static --enable-glib make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING AUTHORS %{_bindir}/dbusxx-introspect %{_bindir}/dbusxx-xml2cpp %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc TODO %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.3.20080716git1337c65 - Generate tarball with git-archive - Fix cflags * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.2.20080716git1337c65 - Add commit id to version * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.1.20080716git - Initial package --- NEW FILE import.log --- dbus-c++-0_5_0-0_3_20080716git1337c65_fc9:HEAD:dbus-c++-0.5.0-0.3.20080716git1337c65.fc9.src.rpm:1216227935 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dbus-c++/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:14:08 -0000 1.1 +++ .cvsignore 16 Jul 2008 17:07:13 -0000 1.2 @@ -0,0 +1 @@ +dbus-c++-0.5.0.20080716git1337c65.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dbus-c++/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:14:08 -0000 1.1 +++ sources 16 Jul 2008 17:07:13 -0000 1.2 @@ -0,0 +1 @@ +a83b23dcfcd4cafc2c7bae7b8c602d5d dbus-c++-0.5.0.20080716git1337c65.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 17:10:45 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 16 Jul 2008 17:10:45 GMT Subject: rpms/xdemorse/devel xdemorse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161710.m6GHAjAP024965@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xdemorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24821 Modified Files: .cvsignore sources Added Files: xdemorse.spec Log Message: initial import --- NEW FILE xdemorse.spec --- Name: xdemorse Version: 0.9 Release: 4%{?dist} Summary: GTK based application for decoding and displaying Morse code signals Group: Applications/Communications License: GPLv2+ URL: http://5b4az.chronos.org.uk/pages/morse.html Source0: http://5b4az.chronos.org.uk/pkg/morse/%{name}/%{name}-%{version}.tar.gz #add .desktop file Source1: %{name}.desktop #temporary Icon Source2: %{name}.png #Wrapper script for user config Source3: xdemorse.sh.in BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, gtk2-devel, desktop-file-utils #Requires: %description xdemorse is a GTK+ graphical version of demorse, using the same decoding engine as demorse. It has an FFT-derived "waterfall" display of the incoming audio signal's spectrum, as well as a 'scope-like display of the audio detector's output and status of the mark/space discriminator ("slicer"). xdemorse also has CAT for the FT-847 and this can be used to net the receiver's frequency to the incoming signal, by clicking near its trace in the waterfall display. %prep %setup -qn %{name} %build ./autogen.sh %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT #install default user configuration file install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/default/.xdemorserc $RPM_BUILD_ROOT%{_datadir}/%{name}/xdemorserc #move original binary to libexecdir mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/ mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin #install wrapper script install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xdemorse # no upstream .desktop or icon yet mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README doc/Morsecode.txt doc/xdemorse.html %{_bindir}/* %{_libexecdir}/* %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*%{name}.desktop %changelog * Wed Jul 16 2008 Lucian Langa - 0.9-4 - Add missing doc * Sun Mar 02 2008 Sindre Pedersen Bjordal - 0.9-3 - Add wrapper script to ensure required user configuration is present * Sat Mar 01 2008 Robert 'Bob' Jensen - 0.9-2 - Add .desktop and icon - Submit for review * Sat Mar 01 2008 Robert 'Bob' Jensen - 0.9-1 - Upstream Version Bump * Mon Dec 10 2007 Sindre Pedersen Bj??rdal - 0.8-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xdemorse/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:04:59 -0000 1.1 +++ .cvsignore 16 Jul 2008 17:09:53 -0000 1.2 @@ -0,0 +1 @@ +xdemorse-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xdemorse/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:04:59 -0000 1.1 +++ sources 16 Jul 2008 17:09:53 -0000 1.2 @@ -0,0 +1 @@ +a116aa7fa66dd93a744bcfe98354b45a xdemorse-0.9.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 17:11:12 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 16 Jul 2008 17:11:12 GMT Subject: rpms/linkage/devel linkage-0.2.0-rb_libtorrent.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 linkage.spec, 1.3, 1.4 sources, 1.2, 1.3 linkage-0.1.4-libtorrent-asio.patch, 1.1, NONE linkage-0.1.4-plugindir.patch, 1.1, NONE Message-ID: <200807161711.m6GHBCTd025064@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24885 Modified Files: .cvsignore linkage.spec sources Added Files: linkage-0.2.0-rb_libtorrent.patch Removed Files: linkage-0.1.4-libtorrent-asio.patch linkage-0.1.4-plugindir.patch Log Message: update to 0.2.0 linkage-0.2.0-rb_libtorrent.patch: --- NEW FILE linkage-0.2.0-rb_libtorrent.patch --- diff -upNr linkage-0.2.0.orign/configure linkage-0.2.0/configure --- linkage-0.2.0.orign/configure 2008-04-15 03:04:57.000000000 +0200 +++ linkage-0.2.0/configure 2008-07-16 12:12:51.000000000 +0200 @@ -3139,12 +3139,12 @@ if test -n "$LIBTORRENT_CFLAGS"; then pkg_cv_LIBTORRENT_CFLAGS="$LIBTORRENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libtorrent >= 0.13\"") >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent >= 0.13") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 0.13\"") >&5 + ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.13") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LIBTORRENT_CFLAGS=`$PKG_CONFIG --cflags "libtorrent >= 0.13" 2>/dev/null` + pkg_cv_LIBTORRENT_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 0.13" 2>/dev/null` else pkg_failed=yes fi @@ -3155,12 +3155,12 @@ if test -n "$LIBTORRENT_LIBS"; then pkg_cv_LIBTORRENT_LIBS="$LIBTORRENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libtorrent >= 0.13\"") >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent >= 0.13") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 0.13\"") >&5 + ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.13") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LIBTORRENT_LIBS=`$PKG_CONFIG --libs "libtorrent >= 0.13" 2>/dev/null` + pkg_cv_LIBTORRENT_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 0.13" 2>/dev/null` else pkg_failed=yes fi @@ -3178,14 +3178,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBTORRENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libtorrent >= 0.13" 2>&1` + LIBTORRENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libtorrent-rasterbar >= 0.13" 2>&1` else - LIBTORRENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libtorrent >= 0.13" 2>&1` + LIBTORRENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libtorrent-rasterbar >= 0.13" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBTORRENT_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libtorrent >= 0.13) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (libtorrent-rasterbar >= 0.13) were not met: $LIBTORRENT_PKG_ERRORS @@ -3196,7 +3196,7 @@ Alternatively, you may set the environme and LIBTORRENT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libtorrent >= 0.13) were not met: +echo "$as_me: error: Package requirements (libtorrent-rasterbar >= 0.13) were not met: $LIBTORRENT_PKG_ERRORS Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Aug 2007 16:16:42 -0000 1.2 +++ .cvsignore 16 Jul 2008 17:10:20 -0000 1.3 @@ -1 +1 @@ -linkage-0.1.4.tar.gz +linkage-0.2.0.tar.gz Index: linkage.spec =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linkage.spec 15 Feb 2008 09:06:52 -0000 1.3 +++ linkage.spec 16 Jul 2008 17:10:20 -0000 1.4 @@ -1,6 +1,6 @@ Name: linkage -Version: 0.1.4 -Release: 6%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Lightweight bittorent client Group: Applications/Internet @@ -9,8 +9,7 @@ Source0: http://linkage.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: linkage-0.1.4-plugindir.patch -Patch1: linkage-0.1.4-libtorrent-asio.patch +Patch0: linkage-0.2.0-rb_libtorrent.patch BuildRequires: rb_libtorrent-devel BuildRequires: curl-devel @@ -19,6 +18,7 @@ BuildRequires: libglademm24-devel BuildRequires: gconfmm26-devel BuildRequires: gettext +BuildRequires: dbus-c++-devel Requires(pre): GConf2 Requires(post): GConf2 @@ -41,8 +41,7 @@ %prep %setup -q -%patch0 -p1 -b .plugindir -%patch1 -p1 -b .libtorrent +%patch0 -p1 -b .rb_libtorrent %build %configure --disable-schemas-install @@ -113,6 +112,9 @@ %{_libdir}/liblinkage-1.so %changelog +* Wed Jul 16 2008 Adel Gadllah 0.2.0-1 +- Update to 0.2.0 + * Fri Feb 15 2008 Adel Gadllah 0.1.4-6 - Patch from Peter Gordon to fix build with new rb_libtorrent - RH #432924 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Aug 2007 16:16:42 -0000 1.2 +++ sources 16 Jul 2008 17:10:20 -0000 1.3 @@ -1 +1 @@ -8c208ec71db1e6db58897d19e953256f linkage-0.1.4.tar.gz +f844e0084d92a2f615d3cfe82024ff36 linkage-0.2.0.tar.gz --- linkage-0.1.4-libtorrent-asio.patch DELETED --- --- linkage-0.1.4-plugindir.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 17:12:30 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 16 Jul 2008 17:12:30 GMT Subject: rpms/dbus-c++/F-9 dbus-c++.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161712.m6GHCUTC025256@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/dbus-c++/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073/F-9 Modified Files: .cvsignore sources Added Files: dbus-c++.spec import.log Log Message: Initial import --- NEW FILE dbus-c++.spec --- %define git_date 20080716 %define git_version 1337c65 Name: dbus-c++ Version: 0.5.0 Release: 0.3.%{git_date}git%{git_version}%{?dist} Summary: Native C++ bindings for D-Bus Group: System Environment/Libraries License: LGPLv2+ URL: http://freedesktop.org/wiki/Software/dbus-c++ # Generate tarball # git clone git://anongit.freedesktop.org/git/dbus/dbus-c++/ # git-archive --format=tar --prefix=dbus-c++/ %{git_version} | bzip2 > dbus-c++-0.5.0.`date +%Y%m%d`git%{git_version}.tar.bz2 Source0: %{name}-%{version}.%{git_date}git%{git_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: glib2-devel Buildrequires: gtkmm24-devel Buildrequires: libtool BuildRequires: expat-devel %description Native C++ bindings for D-Bus for use in C++ programs. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q -n %{name} %{__sed} -i 's/\r//' AUTHORS %{__sed} -i 's/-O3//' configure.ac %build ./autogen.sh export CPPFLAGS='%{optflags}' %configure --disable-static --enable-glib make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING AUTHORS %{_bindir}/dbusxx-introspect %{_bindir}/dbusxx-xml2cpp %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc TODO %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.3.20080716git1337c65 - Generate tarball with git-archive - Fix cflags * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.2.20080716git1337c65 - Add commit id to version * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.1.20080716git - Initial package --- NEW FILE import.log --- dbus-c++-0_5_0-0_3_20080716git1337c65_fc9:F-9:dbus-c++-0.5.0-0.3.20080716git1337c65.fc9.src.rpm:1216228254 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dbus-c++/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:14:08 -0000 1.1 +++ .cvsignore 16 Jul 2008 17:11:41 -0000 1.2 @@ -0,0 +1 @@ +dbus-c++-0.5.0.20080716git1337c65.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dbus-c++/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:14:08 -0000 1.1 +++ sources 16 Jul 2008 17:11:41 -0000 1.2 @@ -0,0 +1 @@ +a83b23dcfcd4cafc2c7bae7b8c602d5d dbus-c++-0.5.0.20080716git1337c65.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 17:12:53 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 16 Jul 2008 17:12:53 GMT Subject: rpms/xdemorse/F-8 xdemorse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161712.m6GHCr0K025327@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xdemorse/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25191 Modified Files: .cvsignore sources Added Files: xdemorse.spec Log Message: inital import --- NEW FILE xdemorse.spec --- Name: xdemorse Version: 0.9 Release: 4%{?dist} Summary: GTK based application for decoding and displaying Morse code signals Group: Applications/Communications License: GPLv2+ URL: http://5b4az.chronos.org.uk/pages/morse.html Source0: http://5b4az.chronos.org.uk/pkg/morse/%{name}/%{name}-%{version}.tar.gz #add .desktop file Source1: %{name}.desktop #temporary Icon Source2: %{name}.png #Wrapper script for user config Source3: xdemorse.sh.in BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, gtk2-devel, desktop-file-utils #Requires: %description xdemorse is a GTK+ graphical version of demorse, using the same decoding engine as demorse. It has an FFT-derived "waterfall" display of the incoming audio signal's spectrum, as well as a 'scope-like display of the audio detector's output and status of the mark/space discriminator ("slicer"). xdemorse also has CAT for the FT-847 and this can be used to net the receiver's frequency to the incoming signal, by clicking near its trace in the waterfall display. %prep %setup -qn %{name} %build ./autogen.sh %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT #install default user configuration file install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/default/.xdemorserc $RPM_BUILD_ROOT%{_datadir}/%{name}/xdemorserc #move original binary to libexecdir mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/ mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin #install wrapper script install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xdemorse # no upstream .desktop or icon yet mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README doc/Morsecode.txt doc/xdemorse.html %{_bindir}/* %{_libexecdir}/* %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*%{name}.desktop %changelog * Wed Jul 16 2008 Lucian Langa - 0.9-4 - Add missing doc * Sun Mar 02 2008 Sindre Pedersen Bjordal - 0.9-3 - Add wrapper script to ensure required user configuration is present * Sat Mar 01 2008 Robert 'Bob' Jensen - 0.9-2 - Add .desktop and icon - Submit for review * Sat Mar 01 2008 Robert 'Bob' Jensen - 0.9-1 - Upstream Version Bump * Mon Dec 10 2007 Sindre Pedersen Bj??rdal - 0.8-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xdemorse/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:04:59 -0000 1.1 +++ .cvsignore 16 Jul 2008 17:12:01 -0000 1.2 @@ -0,0 +1 @@ +xdemorse-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xdemorse/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:04:59 -0000 1.1 +++ sources 16 Jul 2008 17:12:01 -0000 1.2 @@ -0,0 +1 @@ +a116aa7fa66dd93a744bcfe98354b45a xdemorse-0.9.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 17:13:52 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 16 Jul 2008 17:13:52 GMT Subject: rpms/seamonkey/F-8 .cvsignore, 1.19, 1.20 seamonkey.spec, 1.34, 1.35 sources, 1.21, 1.22 Message-ID: <200807161713.m6GHDqsE025493@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/seamonkey/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25316 Modified Files: .cvsignore seamonkey.spec sources Log Message: * Tue Jul 15 2008 Christopher Aillon - 1.1.11-1 - Update to 1.1.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-8/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Jul 2008 13:34:24 -0000 1.19 +++ .cvsignore 16 Jul 2008 17:12:52 -0000 1.20 @@ -1 +1 @@ -seamonkey-1.1.10.source.tar.bz2 +seamonkey-1.1.11.source.tar.bz2 Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-8/seamonkey.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- seamonkey.spec 8 Jul 2008 13:34:24 -0000 1.34 +++ seamonkey.spec 16 Jul 2008 17:12:52 -0000 1.35 @@ -10,7 +10,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor -Version: 1.1.10 +Version: 1.1.11 Release: 1%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 @@ -433,6 +433,8 @@ %changelog +* Tue Jul 15 2008 Christopher Aillon - 1.1.11-1 +- Update to 1.1.11 * Tue Jul 08 2008 Christopher Aillon - 1.1.10-1 - Update to 1.1.10 - Use bullet characters to match GTK+ Index: sources =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-8/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 8 Jul 2008 13:34:24 -0000 1.21 +++ sources 16 Jul 2008 17:12:52 -0000 1.22 @@ -1 +1 @@ -0a13d4298fa175a459a5e78ec74810f6 seamonkey-1.1.10.source.tar.bz2 +a1bde0923cb1eaef48e61c67676ad18f seamonkey-1.1.11.source.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 17:14:18 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 16 Jul 2008 17:14:18 GMT Subject: rpms/dbus-c++/F-8 dbus-c++.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161714.m6GHEIlc025595@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/dbus-c++/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25432/F-8 Modified Files: .cvsignore sources Added Files: dbus-c++.spec import.log Log Message: Initial import --- NEW FILE dbus-c++.spec --- %define git_date 20080716 %define git_version 1337c65 Name: dbus-c++ Version: 0.5.0 Release: 0.3.%{git_date}git%{git_version}%{?dist} Summary: Native C++ bindings for D-Bus Group: System Environment/Libraries License: LGPLv2+ URL: http://freedesktop.org/wiki/Software/dbus-c++ # Generate tarball # git clone git://anongit.freedesktop.org/git/dbus/dbus-c++/ # git-archive --format=tar --prefix=dbus-c++/ %{git_version} | bzip2 > dbus-c++-0.5.0.`date +%Y%m%d`git%{git_version}.tar.bz2 Source0: %{name}-%{version}.%{git_date}git%{git_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: glib2-devel Buildrequires: gtkmm24-devel Buildrequires: libtool BuildRequires: expat-devel %description Native C++ bindings for D-Bus for use in C++ programs. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q -n %{name} %{__sed} -i 's/\r//' AUTHORS %{__sed} -i 's/-O3//' configure.ac %build ./autogen.sh export CPPFLAGS='%{optflags}' %configure --disable-static --enable-glib make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING AUTHORS %{_bindir}/dbusxx-introspect %{_bindir}/dbusxx-xml2cpp %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc TODO %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.3.20080716git1337c65 - Generate tarball with git-archive - Fix cflags * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.2.20080716git1337c65 - Add commit id to version * Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.1.20080716git - Initial package --- NEW FILE import.log --- dbus-c++-0_5_0-0_3_20080716git1337c65_fc9:F-8:dbus-c++-0.5.0-0.3.20080716git1337c65.fc9.src.rpm:1216228377 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dbus-c++/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:14:08 -0000 1.1 +++ .cvsignore 16 Jul 2008 17:13:31 -0000 1.2 @@ -0,0 +1 @@ +dbus-c++-0.5.0.20080716git1337c65.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dbus-c++/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:14:08 -0000 1.1 +++ sources 16 Jul 2008 17:13:31 -0000 1.2 @@ -0,0 +1 @@ +a83b23dcfcd4cafc2c7bae7b8c602d5d dbus-c++-0.5.0.20080716git1337c65.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 17:14:35 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 16 Jul 2008 17:14:35 GMT Subject: rpms/xdemorse/F-9 xdemorse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161714.m6GHEZur025655@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xdemorse/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25486 Modified Files: .cvsignore sources Added Files: xdemorse.spec Log Message: initial import --- NEW FILE xdemorse.spec --- Name: xdemorse Version: 0.9 Release: 4%{?dist} Summary: GTK based application for decoding and displaying Morse code signals Group: Applications/Communications License: GPLv2+ URL: http://5b4az.chronos.org.uk/pages/morse.html Source0: http://5b4az.chronos.org.uk/pkg/morse/%{name}/%{name}-%{version}.tar.gz #add .desktop file Source1: %{name}.desktop #temporary Icon Source2: %{name}.png #Wrapper script for user config Source3: xdemorse.sh.in BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, gtk2-devel, desktop-file-utils #Requires: %description xdemorse is a GTK+ graphical version of demorse, using the same decoding engine as demorse. It has an FFT-derived "waterfall" display of the incoming audio signal's spectrum, as well as a 'scope-like display of the audio detector's output and status of the mark/space discriminator ("slicer"). xdemorse also has CAT for the FT-847 and this can be used to net the receiver's frequency to the incoming signal, by clicking near its trace in the waterfall display. %prep %setup -qn %{name} %build ./autogen.sh %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT #install default user configuration file install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/default/.xdemorserc $RPM_BUILD_ROOT%{_datadir}/%{name}/xdemorserc #move original binary to libexecdir mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/ mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin #install wrapper script install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xdemorse # no upstream .desktop or icon yet mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README doc/Morsecode.txt doc/xdemorse.html %{_bindir}/* %{_libexecdir}/* %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*%{name}.desktop %changelog * Wed Jul 16 2008 Lucian Langa - 0.9-4 - Add missing doc * Sun Mar 02 2008 Sindre Pedersen Bjordal - 0.9-3 - Add wrapper script to ensure required user configuration is present * Sat Mar 01 2008 Robert 'Bob' Jensen - 0.9-2 - Add .desktop and icon - Submit for review * Sat Mar 01 2008 Robert 'Bob' Jensen - 0.9-1 - Upstream Version Bump * Mon Dec 10 2007 Sindre Pedersen Bj??rdal - 0.8-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xdemorse/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:04:59 -0000 1.1 +++ .cvsignore 16 Jul 2008 17:13:50 -0000 1.2 @@ -0,0 +1 @@ +xdemorse-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xdemorse/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:04:59 -0000 1.1 +++ sources 16 Jul 2008 17:13:50 -0000 1.2 @@ -0,0 +1 @@ +a116aa7fa66dd93a744bcfe98354b45a xdemorse-0.9.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 17:14:50 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 16 Jul 2008 17:14:50 GMT Subject: rpms/seamonkey/F-9 .cvsignore, 1.19, 1.20 seamonkey.spec, 1.45, 1.46 sources, 1.20, 1.21 Message-ID: <200807161714.m6GHEodx025668@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/seamonkey/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25550 Modified Files: .cvsignore seamonkey.spec sources Log Message: * Tue Jul 15 2008 Christopher Aillon - 1.1.11-1 - Update to 1.1.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 6 Jul 2008 19:10:00 -0000 1.19 +++ .cvsignore 16 Jul 2008 17:14:01 -0000 1.20 @@ -1 +1 @@ -seamonkey-1.1.10.source.tar.bz2 +seamonkey-1.1.11.source.tar.bz2 Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-9/seamonkey.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- seamonkey.spec 6 Jul 2008 19:10:00 -0000 1.45 +++ seamonkey.spec 16 Jul 2008 17:14:01 -0000 1.46 @@ -11,7 +11,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor -Version: 1.1.10 +Version: 1.1.11 Release: 1%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPLv1.1 @@ -433,6 +433,8 @@ %changelog +* Tue Jul 15 2008 Christopher Aillon - 1.1.11-1 +- Update to 1.1.11 * Sat Jul 6 2008 Christopher Aillon - 1.1.10-1 - Update to 1.1.10 - Use bullet characters to match GTK+ Index: sources =================================================================== RCS file: /cvs/extras/rpms/seamonkey/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 6 Jul 2008 19:10:00 -0000 1.20 +++ sources 16 Jul 2008 17:14:01 -0000 1.21 @@ -1 +1 @@ -0a13d4298fa175a459a5e78ec74810f6 seamonkey-1.1.10.source.tar.bz2 +a1bde0923cb1eaef48e61c67676ad18f seamonkey-1.1.11.source.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 17:24:14 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 16 Jul 2008 17:24:14 GMT Subject: rpms/xdemorse/devel xdemorse.desktop, NONE, 1.1 xdemorse.png, NONE, 1.1 xdemorse.sh.in, NONE, 1.1 Message-ID: <200807161724.m6GHOECv026224@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xdemorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26184 Added Files: xdemorse.desktop xdemorse.png xdemorse.sh.in Log Message: initial import --- NEW FILE xdemorse.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xdemorse GenericName=xdemorse Comment=GTK based application for decoding and displaying Morse code signals Exec=xdemorse Icon=xdemorse.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE xdemorse.sh.in --- #!/bin/sh #Wrapper script for xdemorse to ensure that user configuration is present xdemorsebin="/usr/libexec/xdemorse-bin" #check if user configuration is present if [ ! -e ~/.xdemorserc ] then echo "Creating user configuration file" cp /usr/share/xdemorse/xdemorserc ~/.xdemorserc fi #launch xdemorse echo "Please configure your serial device in the .xdemorserc file in your users home directory" $xdemorsebin From fedora-extras-commits at redhat.com Wed Jul 16 17:25:20 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 16 Jul 2008 17:25:20 GMT Subject: rpms/xdemorse/F-8 xdemorse.desktop, NONE, 1.1 xdemorse.png, NONE, 1.1 xdemorse.sh.in, NONE, 1.1 Message-ID: <200807161725.m6GHPK2L026424@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xdemorse/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26400 Added Files: xdemorse.desktop xdemorse.png xdemorse.sh.in Log Message: inital import --- NEW FILE xdemorse.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xdemorse GenericName=xdemorse Comment=GTK based application for decoding and displaying Morse code signals Exec=xdemorse Icon=xdemorse.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE xdemorse.sh.in --- #!/bin/sh #Wrapper script for xdemorse to ensure that user configuration is present xdemorsebin="/usr/libexec/xdemorse-bin" #check if user configuration is present if [ ! -e ~/.xdemorserc ] then echo "Creating user configuration file" cp /usr/share/xdemorse/xdemorserc ~/.xdemorserc fi #launch xdemorse echo "Please configure your serial device in the .xdemorserc file in your users home directory" $xdemorsebin From fedora-extras-commits at redhat.com Wed Jul 16 17:26:53 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Wed, 16 Jul 2008 17:26:53 GMT Subject: rpms/xdemorse/F-9 xdemorse.desktop, NONE, 1.1 xdemorse.png, NONE, 1.1 xdemorse.sh.in, NONE, 1.1 Message-ID: <200807161726.m6GHQrCG026628@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xdemorse/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26573 Added Files: xdemorse.desktop xdemorse.png xdemorse.sh.in Log Message: initial import --- NEW FILE xdemorse.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xdemorse GenericName=xdemorse Comment=GTK based application for decoding and displaying Morse code signals Exec=xdemorse Icon=xdemorse.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE xdemorse.sh.in --- #!/bin/sh #Wrapper script for xdemorse to ensure that user configuration is present xdemorsebin="/usr/libexec/xdemorse-bin" #check if user configuration is present if [ ! -e ~/.xdemorserc ] then echo "Creating user configuration file" cp /usr/share/xdemorse/xdemorserc ~/.xdemorserc fi #launch xdemorse echo "Please configure your serial device in the .xdemorserc file in your users home directory" $xdemorsebin From fedora-extras-commits at redhat.com Wed Jul 16 17:47:43 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Wed, 16 Jul 2008 17:47:43 GMT Subject: rpms/gnu-efi/devel gnu-efi-3.0d-pragma.patch,1.2,1.3 Message-ID: <200807161747.m6GHlhN2028948@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/gnu-efi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28914 Modified Files: gnu-efi-3.0d-pragma.patch Log Message: Add ia64 pragma ifdefs gnu-efi-3.0d-pragma.patch: Index: gnu-efi-3.0d-pragma.patch =================================================================== RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi-3.0d-pragma.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnu-efi-3.0d-pragma.patch 27 Mar 2008 17:41:50 -0000 1.2 +++ gnu-efi-3.0d-pragma.patch 16 Jul 2008 17:46:52 -0000 1.3 @@ -1,6 +1,23 @@ diff -up gnu-efi-3.0d/lib/ia32/math.c.pragma gnu-efi-3.0d/lib/ia32/math.c ---- gnu-efi-3.0d/lib/ia32/math.c.pragma 2008-03-10 14:43:48.000000000 -0400 -+++ gnu-efi-3.0d/lib/ia32/math.c 2008-03-10 14:43:32.000000000 -0400 +--- gnu-efi-3.0d/lib/ia32/math.c.pragma 2007-05-09 14:37:27.000000000 -0400 ++++ gnu-efi-3.0d/lib/ia32/math.c 2008-07-16 13:42:50.000000000 -0400 +@@ -23,11 +23,13 @@ Revision History + // + + #ifdef RUNTIME_CODE ++#ifndef __GNUC__ + #pragma RUNTIME_CODE(LShiftU64) + #pragma RUNTIME_CODE(RShiftU64) + #pragma RUNTIME_CODE(MultU64x32) + #pragma RUNTIME_CODE(DivU64x32) + #endif ++#endif + + // + // +diff -up gnu-efi-3.0d/lib/ia64/math.c.pragma gnu-efi-3.0d/lib/ia64/math.c +--- gnu-efi-3.0d/lib/ia64/math.c.pragma 2008-07-16 13:44:31.000000000 -0400 ++++ gnu-efi-3.0d/lib/ia64/math.c 2008-07-16 13:44:34.000000000 -0400 @@ -23,11 +23,13 @@ Revision History // @@ -17,7 +34,7 @@ // diff -up gnu-efi-3.0d/lib/print.c.pragma gnu-efi-3.0d/lib/print.c --- gnu-efi-3.0d/lib/print.c.pragma 2007-05-11 13:03:05.000000000 -0400 -+++ gnu-efi-3.0d/lib/print.c 2008-03-10 14:42:54.000000000 -0400 ++++ gnu-efi-3.0d/lib/print.c 2008-07-16 13:42:50.000000000 -0400 @@ -23,6 +23,7 @@ Revision History // @@ -34,32 +51,9 @@ #endif // -diff -up gnu-efi-3.0d/lib/runtime/rtlock.c.pragma gnu-efi-3.0d/lib/runtime/rtlock.c ---- gnu-efi-3.0d/lib/runtime/rtlock.c.pragma 2007-05-11 13:03:05.000000000 -0400 -+++ gnu-efi-3.0d/lib/runtime/rtlock.c 2008-03-10 14:42:54.000000000 -0400 -@@ -21,7 +21,9 @@ Revision History - - - -+#ifndef __GNUC__ - #pragma RUNTIME_CODE(RtAcquireLock) -+#endif - VOID - RtAcquireLock ( - IN FLOCK *Lock -@@ -58,7 +60,9 @@ Returns: - } - - -+#ifndef __GNUC__ - #pragma RUNTIME_CODE(RtAcquireLock) -+#endif - VOID - RtReleaseLock ( - IN FLOCK *Lock diff -up gnu-efi-3.0d/lib/runtime/efirtlib.c.pragma gnu-efi-3.0d/lib/runtime/efirtlib.c --- gnu-efi-3.0d/lib/runtime/efirtlib.c.pragma 2007-05-09 14:37:27.000000000 -0400 -+++ gnu-efi-3.0d/lib/runtime/efirtlib.c 2008-03-10 14:42:54.000000000 -0400 ++++ gnu-efi-3.0d/lib/runtime/efirtlib.c 2008-07-16 13:42:50.000000000 -0400 @@ -20,7 +20,9 @@ Revision History #include "efilib.h" #include "efirtlib.h" @@ -110,9 +104,45 @@ INTN RUNTIMEFUNCTION RtCompareGuid ( +diff -up gnu-efi-3.0d/lib/runtime/rtdata.c.pragma gnu-efi-3.0d/lib/runtime/rtdata.c +--- gnu-efi-3.0d/lib/runtime/rtdata.c.pragma 2007-05-09 14:37:27.000000000 -0400 ++++ gnu-efi-3.0d/lib/runtime/rtdata.c 2008-07-16 13:42:50.000000000 -0400 +@@ -26,7 +26,9 @@ Revision History + // right data section if it is explicitly initialized.. + // + ++#ifndef __GNUC__ + #pragma BEGIN_RUNTIME_DATA() ++#endif + + // + // RT - pointer to the runtime table +diff -up gnu-efi-3.0d/lib/runtime/rtlock.c.pragma gnu-efi-3.0d/lib/runtime/rtlock.c +--- gnu-efi-3.0d/lib/runtime/rtlock.c.pragma 2007-05-11 13:03:05.000000000 -0400 ++++ gnu-efi-3.0d/lib/runtime/rtlock.c 2008-07-16 13:42:50.000000000 -0400 +@@ -21,7 +21,9 @@ Revision History + + + ++#ifndef __GNUC__ + #pragma RUNTIME_CODE(RtAcquireLock) ++#endif + VOID + RtAcquireLock ( + IN FLOCK *Lock +@@ -58,7 +60,9 @@ Returns: + } + + ++#ifndef __GNUC__ + #pragma RUNTIME_CODE(RtAcquireLock) ++#endif + VOID + RtReleaseLock ( + IN FLOCK *Lock diff -up gnu-efi-3.0d/lib/runtime/rtstr.c.pragma gnu-efi-3.0d/lib/runtime/rtstr.c --- gnu-efi-3.0d/lib/runtime/rtstr.c.pragma 2007-05-09 14:37:27.000000000 -0400 -+++ gnu-efi-3.0d/lib/runtime/rtstr.c 2008-03-10 14:42:54.000000000 -0400 ++++ gnu-efi-3.0d/lib/runtime/rtstr.c 2008-07-16 13:42:50.000000000 -0400 @@ -17,7 +17,9 @@ Revision History #include "lib.h" @@ -185,7 +215,7 @@ RtDecimaltoBCD ( diff -up gnu-efi-3.0d/lib/runtime/vm.c.pragma gnu-efi-3.0d/lib/runtime/vm.c --- gnu-efi-3.0d/lib/runtime/vm.c.pragma 2007-05-09 14:37:27.000000000 -0400 -+++ gnu-efi-3.0d/lib/runtime/vm.c 2008-03-10 14:42:54.000000000 -0400 ++++ gnu-efi-3.0d/lib/runtime/vm.c 2008-07-16 13:42:50.000000000 -0400 @@ -24,7 +24,9 @@ Revision History #include "lib.h" @@ -206,22 +236,9 @@ VOID RUNTIMEFUNCTION RtConvertList ( -diff -up gnu-efi-3.0d/lib/runtime/rtdata.c.pragma gnu-efi-3.0d/lib/runtime/rtdata.c ---- gnu-efi-3.0d/lib/runtime/rtdata.c.pragma 2007-05-09 14:37:27.000000000 -0400 -+++ gnu-efi-3.0d/lib/runtime/rtdata.c 2008-03-10 14:42:54.000000000 -0400 -@@ -26,7 +26,9 @@ Revision History - // right data section if it is explicitly initialized.. - // - -+#ifndef __GNUC__ - #pragma BEGIN_RUNTIME_DATA() -+#endif - - // - // RT - pointer to the runtime table diff -up gnu-efi-3.0d/lib/x86_64/math.c.pragma gnu-efi-3.0d/lib/x86_64/math.c --- gnu-efi-3.0d/lib/x86_64/math.c.pragma 2007-05-11 13:03:05.000000000 -0400 -+++ gnu-efi-3.0d/lib/x86_64/math.c 2008-03-10 14:43:31.000000000 -0400 ++++ gnu-efi-3.0d/lib/x86_64/math.c 2008-07-16 13:42:50.000000000 -0400 @@ -23,11 +23,13 @@ Revision History // From fedora-extras-commits at redhat.com Wed Jul 16 17:52:00 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 16 Jul 2008 17:52:00 GMT Subject: rpms/xfce4-screenshooter-plugin/F-9 xfce4-screenshooter-plugin.spec, 1.11, 1.12 Message-ID: <200807161752.m6GHq06T029123@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027/F-9 Modified Files: xfce4-screenshooter-plugin.spec Log Message: fix date in changelog Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9/xfce4-screenshooter-plugin.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xfce4-screenshooter-plugin.spec 16 Jul 2008 13:38:26 -0000 1.11 +++ xfce4-screenshooter-plugin.spec 16 Jul 2008 17:51:07 -0000 1.12 @@ -40,7 +40,7 @@ %{_mandir}/man1/*.1.gz %changelog -* Tue Jul 16 2008 Christoph Wickert - 1.3.0-1 +* Wed Jul 16 2008 Christoph Wickert - 1.3.0-1 - Update to 1.3.0 * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 From fedora-extras-commits at redhat.com Wed Jul 16 17:52:07 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 16 Jul 2008 17:52:07 GMT Subject: rpms/xfce4-screenshooter-plugin/F-8 xfce4-screenshooter-plugin.spec, 1.10, 1.11 Message-ID: <200807161752.m6GHq7p0029126@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027/F-8 Modified Files: xfce4-screenshooter-plugin.spec Log Message: fix date in changelog Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8/xfce4-screenshooter-plugin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xfce4-screenshooter-plugin.spec 16 Jul 2008 13:37:40 -0000 1.10 +++ xfce4-screenshooter-plugin.spec 16 Jul 2008 17:50:41 -0000 1.11 @@ -40,7 +40,7 @@ %{_mandir}/man1/*.1.gz %changelog -* Tue Jul 16 2008 Christoph Wickert - 1.3.0-1 +* Wed Jul 16 2008 Christoph Wickert - 1.3.0-1 - Update to 1.3.0 * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 From fedora-extras-commits at redhat.com Wed Jul 16 17:52:23 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 16 Jul 2008 17:52:23 GMT Subject: rpms/xfce4-screenshooter-plugin/devel xfce4-screenshooter-plugin.spec, 1.11, 1.12 Message-ID: <200807161752.m6GHqNfg029131@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027/devel Modified Files: xfce4-screenshooter-plugin.spec Log Message: fix date in changelog Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel/xfce4-screenshooter-plugin.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xfce4-screenshooter-plugin.spec 16 Jul 2008 13:06:10 -0000 1.11 +++ xfce4-screenshooter-plugin.spec 16 Jul 2008 17:51:30 -0000 1.12 @@ -40,7 +40,7 @@ %{_mandir}/man1/*.1.gz %changelog -* Tue Jul 16 2008 Christoph Wickert - 1.3.0-1 +* Wed Jul 16 2008 Christoph Wickert - 1.3.0-1 - Update to 1.3.0 * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 From fedora-extras-commits at redhat.com Wed Jul 16 17:58:59 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 16 Jul 2008 17:58:59 GMT Subject: rpms/paraview/F-9 paraview-3.2.2-hdf5-1.8.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 paraview-3.2.1-gcc43.patch, 1.3, 1.4 paraview.spec, 1.26, 1.27 sources, 1.5, 1.6 paraview-3.2-qt.patch, 1.1, NONE Message-ID: <200807161758.m6GHwxLm029755@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/paraview/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29698 Modified Files: .cvsignore paraview-3.2.1-gcc43.patch paraview.spec sources Added Files: paraview-3.2.2-hdf5-1.8.patch Removed Files: paraview-3.2-qt.patch Log Message: * Wed Jul 16 2008 Orion Poplawski - 3.2.2-1 - Update to 3.2.2 - Drop qt patch as upstream now supports qt 4.2.2-4.3.X paraview-3.2.2-hdf5-1.8.patch: --- NEW FILE paraview-3.2.2-hdf5-1.8.patch --- --- ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.hdf5-1.8 2008-07-16 11:24:23.000000000 -0600 +++ ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-16 11:54:06.000000000 -0600 @@ -132,9 +132,15 @@ static herr_t H5FD_dsm_flush(H5FD_t *_file); #endif static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2); +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type); +static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); +static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); +#else static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file); static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr); static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); +#endif static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, DSM_HSIZE_T size, void *buf); static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, @@ -594,7 +600,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type) +#else H5FD_dsm_get_eoa(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -622,7 +632,11 @@ *------------------------------------------------------------------------- */ static herr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) +#else H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -663,7 +677,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eof(const H5FD_t *_file) +#else H5FD_dsm_get_eof(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/paraview/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Nov 2007 20:13:05 -0000 1.5 +++ .cvsignore 16 Jul 2008 17:58:00 -0000 1.6 @@ -1 +1 @@ -paraview-3.2.1.tar.gz +paraview-3.2.2.tar.gz paraview-3.2.1-gcc43.patch: Index: paraview-3.2.1-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/paraview/F-9/paraview-3.2.1-gcc43.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- paraview-3.2.1-gcc43.patch 5 Mar 2008 16:05:01 -0000 1.3 +++ paraview-3.2.1-gcc43.patch 16 Jul 2008 17:58:00 -0000 1.4 @@ -138,3 +138,14 @@ XdmfDataDesc::XdmfDataDesc() { H5dont_atexit(); +--- ParaView3.3.0-20080626/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.gcc43 2007-07-12 13:10:04.000000000 -0600 ++++ ParaView3.3.0-20080626/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-06-27 09:29:19.000000000 -0600 +@@ -34,6 +34,8 @@ + #include "XdmfDsmComm.h" + #include "assert.h" + #include "hdf5.h" ++#include ++#include + + #define HDF_IO_DEBUG 1 + #undef HDF_IO_DEBUG Index: paraview.spec =================================================================== RCS file: /cvs/pkgs/rpms/paraview/F-9/paraview.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- paraview.spec 26 Jun 2008 22:34:07 -0000 1.26 +++ paraview.spec 16 Jul 2008 17:58:00 -0000 1.27 @@ -1,12 +1,12 @@ %{!?build_mpi:%define build_mpi 1} %define pv_maj 3 %define pv_min 2 -%define pv_patch 1 +%define pv_patch 2 %define pv_majmin %{pv_maj}.%{pv_min} Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 7%{?dist} +Release: 1%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -16,7 +16,6 @@ Source1: paraview_22x22.png Source2: paraview.xml Source3: FindMPI.cmake -Patch0: paraview-3.2-qt.patch Patch1: paraview-3.2.1-findmpi.patch Patch2: paraview-3.2.1-install.patch Patch3: paraview-3.2.1-doc.patch @@ -24,6 +23,7 @@ Patch5: paraview-3.2.1-make.patch Patch6: paraview-3.2.1-gcc43.patch Patch7: paraview-3.2.1-hdf5.patch +Patch8: paraview-3.2.2-hdf5-1.8.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -102,7 +102,6 @@ %prep %setup -q -n ParaView%{version} cp -p %SOURCE3 CMake/ -%patch -p1 -b .qt %patch1 -p1 -b .findmpi %patch2 -p1 -b .install %patch3 -p1 -b .doc @@ -110,6 +109,7 @@ %patch5 -p0 -b .make %patch6 -p1 -b .gcc43 %patch7 -p1 -b .hdf5 +%patch8 -p1 -b .hdf5-1.8 %build @@ -305,6 +305,11 @@ %changelog +* Wed Jul 16 2008 Orion Poplawski - 3.2.2-1 +- Update to 3.2.2 +- Drop qt patch as upstream now supports qt 4.2.2-4.3.X +- Add patch to support hdf5 1.8 in mpi build + * Wed Jun 25 2008 Orion Poplawski - 3.2.1-7 - Add patch from Tyson Whitehead to fix mpi build (bug #450598) - Drop rpath patch, use rpath instead of ls.so conf files so mpi and non-mpi Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/paraview/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Nov 2007 20:13:05 -0000 1.5 +++ sources 16 Jul 2008 17:58:00 -0000 1.6 @@ -1 +1 @@ -050830112537c477a1cb20370caded50 paraview-3.2.1.tar.gz +302475b5d1355edf2d1562f0afd7f59f paraview-3.2.2.tar.gz --- paraview-3.2-qt.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 18:03:52 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 16 Jul 2008 18:03:52 GMT Subject: rpms/mod_nss/devel mod_nss-inherit.patch, NONE, 1.1 mod_nss-kill.patch, NONE, 1.1 mod_nss.spec, 1.11, 1.12 Message-ID: <200807161803.m6GI3qtJ004176@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4081 Modified Files: mod_nss.spec Added Files: mod_nss-inherit.patch mod_nss-kill.patch Log Message: 1.0.7-8 - Don't force module de-init during the configuration stage (453508) 1.0.7-7 - Don't inherit the MP cache in multi-threaded mode (454701) - Don't initialize NSS in each child if SSL isn't configured Resolves: #453508, #454701 mod_nss-inherit.patch: --- NEW FILE mod_nss-inherit.patch --- --- mod_nss-1.0.7-orig/nss_engine_init.c 16 May 2008 15:16:02 -0000 1.32 +++ mod_nss-1.0.7/nss_engine_init.c 9 Jul 2008 22:22:46 -0000 @@ -1079,23 +1079,54 @@ } } void nss_init_Child(apr_pool_t *p, server_rec *base_server) { SSLModConfigRec *mc = myModConfig(base_server); SSLSrvConfigRec *sc; server_rec *s; + int threaded = 0; + int sslenabled = FALSE; mc->pid = getpid(); /* only call getpid() once per-process */ - if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "SSL_InheritMPServerSIDCache failed"); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + /* + * First, see if ssl is enabled at all + */ + for (s = base_server; s; s = s->next) { + sc = mySrvConfig(s); + /* If any servers have SSL, we want sslenabled set so we + * can perform further initialization + */ + + if (sc->enabled == UNSET) { + sc->enabled = FALSE; + } + + if (sc->proxy_enabled == UNSET) { + sc->proxy_enabled = FALSE; + } + + if ((sc->enabled == TRUE) || (sc->proxy_enabled == TRUE)) { + sslenabled = TRUE; + } + } + + if (sslenabled == FALSE) { /* we are not an SSL/TLS server */ + return; + } + + ap_mpm_query(AP_MPMQ_MAX_THREADS, &threaded); + if (!threaded) { + if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "SSL_InheritMPServerSIDCache failed"); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + } } nss_init_SSLLibrary(base_server); /* Configure all virtual servers */ for (s = base_server; s; s = s->next) { sc = mySrvConfig(s); if (sc->server->servercert == NULL && NSS_IsInitialized()) mod_nss-kill.patch: --- NEW FILE mod_nss-kill.patch --- --- mod_nss-1.0.7.orig/nss_engine_init.c 14 Jul 2008 20:25:53 -0000 1.33 +++ mod_nss-1.0.7/nss_engine_init.c 14 Jul 2008 20:28:13 -0000 +++ nss_engine_init.c 14 Jul 2008 20:35:34 -0000 @@ -315,6 +315,13 @@ mc->nInitCount++; + /* + * Let us cleanup on restarts and exists + */ + apr_pool_cleanup_register(p, base_server, + nss_init_ModuleKill, + apr_pool_cleanup_null); + mc->ptemp = ptemp; /* @@ -491,9 +498,6 @@ */ nss_init_ConfigureServer(s, p, ptemp, sc); } - - nss_init_ChildKill(base_server); - nss_init_ModuleKill(base_server); } /* @@ -1144,12 +1148,16 @@ apr_status_t nss_init_ModuleKill(void *data) { server_rec *base_server = (server_rec *)data; + SSLModConfigRec *mc = myModConfig(base_server); ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, "Shutting down SSL Session ID Cache"); SSL_ShutdownServerSessionIDCache(); + if (mc->nInitCount == 1) + nss_init_ChildKill(base_server); + /* NSS_Shutdown() gets called in nss_init_ChildKill */ return APR_SUCCESS; } Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_nss.spec 2 Jul 2008 15:25:41 -0000 1.11 +++ mod_nss.spec 16 Jul 2008 18:02:54 -0000 1.12 @@ -1,6 +1,8 @@ +%define _default_patch_fuzz 2 + Name: mod_nss Version: 1.0.7 -Release: 6%{?dist} +Release: 8%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -16,6 +18,8 @@ Patch3: mod_nss-proxy.patch Patch4: mod_nss-nofork.patch Patch5: mod_nss-fips.patch +Patch6: mod_nss-inherit.patch +Patch7: mod_nss-kill.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -30,6 +34,8 @@ %patch3 -p1 -b .proxy %patch4 -p1 -b .nofork %patch5 -p1 -b .fips +%patch6 -p1 -b .inherit +%patch7 -p1 -b .kill # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -114,6 +120,13 @@ %{_sbindir}/gencert %changelog +* Mon Jul 14 2008 Rob Crittenden - 1.0.7-8 +- Don't force module de-init during the configuration stage (453508) + +* Thu Jul 10 2008 Rob Crittenden - 1.0.7-7 +- Don't inherit the MP cache in multi-threaded mode (454701) +- Don't initialize NSS in each child if SSL isn't configured + * Wed Jul 2 2008 Rob Crittenden - 1.0.7-6 - Update the patch for FIPS to include fixes for nss_pcache, enforce the security policy and properly initialize the FIPS token. From fedora-extras-commits at redhat.com Wed Jul 16 18:10:46 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Wed, 16 Jul 2008 18:10:46 GMT Subject: rpms/krb5/devel krb5-1.6.3-login-lpass.patch, NONE, 1.1 krb5-1.6.1-pam.patch, 1.6, 1.7 krb5-CVE-2008-0947.patch, 1.1, 1.2 krb5-trunk-doublelog.patch, 1.1, 1.2 krb5-trunk-manpaths.patch, 1.1, 1.2 krb5.spec, 1.171, 1.172 krb5-1.2.7-login-lpass.patch, 1.2, NONE krb5-1.2.7-reject-bad-transited.patch, 1.5, NONE Message-ID: <200807161810.m6GIAkpD004559@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435 Modified Files: krb5-1.6.1-pam.patch krb5-CVE-2008-0947.patch krb5-trunk-doublelog.patch krb5-trunk-manpaths.patch krb5.spec Added Files: krb5-1.6.3-login-lpass.patch Removed Files: krb5-1.2.7-login-lpass.patch krb5-1.2.7-reject-bad-transited.patch Log Message: - clear fuzz out of patches, dropping a man page patch which is no longer necessary krb5-1.6.3-login-lpass.patch: --- NEW FILE krb5-1.6.3-login-lpass.patch --- The local crypt() may support hash types which use more than the first 8 characters. It also doesn't modify the input string, so we should just stop truncating it. Are there platforms where the input string *is* modified? --- krb5-1.2.7/src/appl/bsd/login.c 2005-11-15 16:20:34.000000000 -0500 +++ krb5-1.2.7/src/appl/bsd/login.c 2005-11-15 16:20:29.000000000 -0500 @@ -461,17 +461,14 @@ static int unix_passwd_okay (pass) char *pass; { - char user_pwcopy[9], *namep; + char *namep; char *crypt (); assert (pwd != 0); - /* copy the first 8 chars of the password for unix crypt */ - strncpy(user_pwcopy, pass, sizeof(user_pwcopy)); - user_pwcopy[sizeof(user_pwcopy) - 1]='\0'; - namep = crypt(user_pwcopy, salt); - memset (user_pwcopy, 0, sizeof(user_pwcopy)); - /* ... and wipe the copy now that we have the string */ + namep = crypt(pass, salt); + if (strlen(namep) < 13) + return 0; /* verify the local password string */ #ifdef HAVE_SHADOW krb5-1.6.1-pam.patch: Index: krb5-1.6.1-pam.patch =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-pam.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- krb5-1.6.1-pam.patch 25 Feb 2008 18:33:34 -0000 1.6 +++ krb5-1.6.1-pam.patch 16 Jul 2008 18:09:47 -0000 1.7 @@ -941,8 +941,8 @@ +KRB5_WITH_PAM + AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) + V5_AC_OUTPUT_MAKEFILE(. - mansysconfdir=$sysconfdir --- krb5-1.6.1/src/config/pre.in 2007-06-21 17:39:57.000000000 -0400 +++ krb5-1.6.1/src/config/pre.in 2007-06-21 17:39:57.000000000 -0400 @@ -180,6 +180,7 @@ SRVLIBS = @SRVLIBS@ krb5-CVE-2008-0947.patch: Index: krb5-CVE-2008-0947.patch =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-CVE-2008-0947.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- krb5-CVE-2008-0947.patch 18 Mar 2008 18:13:22 -0000 1.1 +++ krb5-CVE-2008-0947.patch 16 Jul 2008 18:09:47 -0000 1.2 @@ -21,7 +21,7 @@ - if (sock > svc_maxfd) - svc_maxfd = sock; } - + /* === src/lib/rpc/svc_tcp.c ================================================================== krb5-trunk-doublelog.patch: Index: krb5-trunk-doublelog.patch =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-trunk-doublelog.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- krb5-trunk-doublelog.patch 25 Feb 2008 20:53:41 -0000 1.1 +++ krb5-trunk-doublelog.patch 16 Jul 2008 18:09:47 -0000 1.2 @@ -5,7 +5,7 @@ =================================================================== --- src/include/Makefile.in (revision 20235) +++ src/include/Makefile.in (working copy) -@@ -67,7 +67,9 @@ +@@ -61,7 +61,9 @@ -e "s+ at SBINDIR+$(SBINDIR)+" \ -e "s+ at MODULEDIR+$(MODULE_DIR)+" \ -e 's+ at LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ @@ -14,5 +14,5 @@ + -e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \ + -e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+' - OSCONFSRC = $(srcdir)/osconf.hin + OSCONFSRC = $(srcdir)/stock/osconf.h krb5-trunk-manpaths.patch: Index: krb5-trunk-manpaths.patch =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-trunk-manpaths.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- krb5-trunk-manpaths.patch 22 Jun 2007 22:02:16 -0000 1.1 +++ krb5-trunk-manpaths.patch 16 Jul 2008 18:09:47 -0000 1.2 @@ -52,7 +52,7 @@ --- configure.in (revision 19589) +++ configure.in (working copy) @@ -986,6 +986,73 @@ - AC_CONFIG_SUBDIRS(appl/libpty appl/bsd appl/gssftp appl/telnet) + KRB5_WITH_PAM AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) + Index: krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- krb5.spec 11 Jul 2008 15:16:54 -0000 1.171 +++ krb5.spec 16 Jul 2008 18:09:47 -0000 1.172 @@ -61,7 +61,6 @@ Patch13: krb5-1.3-large-file.patch Patch14: krb5-1.3-ftp-glob.patch Patch16: krb5-1.6-buildconf.patch -Patch18: krb5-1.2.7-reject-bad-transited.patch Patch23: krb5-1.3.1-dns.patch Patch26: krb5-1.3.2-efence.patch Patch27: krb5-1.3.3-rcp-sendlarge.patch @@ -73,7 +72,7 @@ Patch36: krb5-1.3.3-rcp-markus.patch Patch39: krb5-1.4.1-api.patch Patch40: krb5-1.4.1-telnet-environ.patch -Patch41: krb5-1.2.7-login-lpass.patch +Patch41: krb5-1.6.3-login-lpass.patch Patch44: krb5-1.4.3-enospc.patch Patch47: krb5-1.6-sort-of-static.patch Patch51: krb5-1.6-ldap-init.patch @@ -232,6 +231,10 @@ certificate. %changelog +* Wed Jul 16 2008 Nalin Dahyabhai +- clear fuzz out of patches, dropping a man page patch which is no longer + necessary + * Fri Jul 11 2008 Nalin Dahyabhai 1.6.3-15 - build with -fno-strict-aliasing, which is needed because the library triggers these warnings @@ -1337,7 +1340,6 @@ %patch13 -p1 -b .large-file %patch14 -p1 -b .ftp-glob %patch16 -p1 -b .buildconf -%patch18 -p1 -b .reject-bad-transited %patch23 -p1 -b .dns # Removes a malloc(0) case, nothing more. # %patch26 -p1 -b .efence --- krb5-1.2.7-login-lpass.patch DELETED --- --- krb5-1.2.7-reject-bad-transited.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 18:23:18 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Wed, 16 Jul 2008 18:23:18 GMT Subject: rpms/nss_ldap/devel pam_ldap-184-dnsconfig.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 nss_ldap.spec, 1.95, 1.96 sources, 1.41, 1.42 pam_ldap-176-dnsconfig.patch, 1.2, NONE Message-ID: <200807161823.m6GINI9v004929@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/nss_ldap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4869 Modified Files: .cvsignore nss_ldap.spec sources Added Files: pam_ldap-184-dnsconfig.patch Removed Files: pam_ldap-176-dnsconfig.patch Log Message: - update to version 261 - remove fuzz from patches pam_ldap-184-dnsconfig.patch: --- NEW FILE pam_ldap-184-dnsconfig.patch --- --- pam_ldap-176/Makefile.am 2004-09-30 22:33:14.000000000 -0400 +++ pam_ldap-176/Makefile.am 2004-10-28 17:24:13.691936696 -0400 @@ -2,7 +2,7 @@ noinst_PROGRAMS = pam_ldap.so EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README \ ldap.conf pam.conf pam_ldap.spec pam.d -pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h +pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h resolve.c resolve.h dnsconfig.c dnsconfig.h snprintf.c snprintf.h pam_ldap_so_LDFLAGS = @pam_ldap_so_LDFLAGS@ man_MANS = pam_ldap.5 --- pam_ldap-176/configure.in 2004-09-30 22:33:14.000000000 -0400 +++ pam_ldap-176/configure.in 2004-10-28 17:24:13.692936544 -0400 @@ -133,6 +133,38 @@ AC_CHECK_FUNCS(ldap_initialize) AC_CHECK_FUNCS(ldap_sasl_bind ldap_sasl_interactive_bind_s) AC_CHECK_FUNCS(gethostbyname_r) +AC_CHECK_FUNCS(snprintf strtok_r) +AC_CHECK_LIB(resolv, main) +AC_CHECK_HEADERS(resolv.h) +AC_CHECK_FUNCS(res_search dn_expand) +if test x$ac_cv_func_res_search = xno ; then + AC_MSG_CHECKING([for res_search again]) + AC_TRY_LINK([#ifdef HAVE_RESOLV_H + #include + #endif + #ifdef HAVE_STDLIB_H + #include + #endif], + [res_search(NULL,0,0,NULL,0);], + AC_DEFINE(HAVE_RES_SEARCH,1, + [Define if you have res_search().]) + ac_cv_func_res_search=yes) + AC_CHECK_FUNCS(res_search) +fi +if test x$ac_cv_func_dn_expand = xno ; then + AC_MSG_CHECKING([for dn_expand again]) + AC_TRY_LINK([#ifdef HAVE_RESOLV_H + #include + #endif + #ifdef HAVE_STDLIB_H + #include + #endif], + [dn_expand(NULL,NULL,NULL,NULL,0);], + AC_DEFINE(HAVE_DN_EXPAND,1, + [Define if you have dn_expand().]) + ac_cv_func_dn_expand=yes) + AC_CHECK_FUNCS(dn_expand) +fi if test "$ac_cv_func_gethostbyname_r" = "yes"; then AC_CACHE_CHECK(whether gethostbyname_r takes 6 arguments, xad_cv_gethostbyname_r_args, [ --- /dev/null 2004-10-19 17:45:17.794252000 -0400 +++ pam_ldap-176/dnsconfig.c 2004-10-28 17:32:36.915435096 -0400 @@ -0,0 +1,214 @@ + +/* Copyright (C) 1997-2001 Luke Howard. + This file started off as part of the nss_ldap library. + Contributed by Luke Howard, , 1997. + (The author maintains a non-exclusive licence to distribute this file + under their own conditions.) + + The nss_ldap library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The nss_ldap library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the nss_ldap library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ + +/* + * Support DNS SRV records. I look up the SRV record for + * _ldap._tcp.gnu.org. + * and build the DN DC=gnu,DC=org. + * Thanks to Assar & co for resolve.[ch]. + */ + +static char rcsId[] = "$Id: dnsconfig.c,v 2.24 2001/02/27 14:44:31 lukeh Exp $"; + +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_LBER_H +#include +#endif +#ifdef HAVE_LDAP_H +#include +#endif + +#ifndef HAVE_SNPRINTF +#include "snprintf.h" +#endif + +#include "pam_ldap.h" +#include "resolve.h" +#include "dnsconfig.h" + +#define DC_ATTR "DC" +#define DC_ATTR_AVA DC_ATTR "=" +#define DC_ATTR_AVA_LEN (sizeof(DC_ATTR_AVA) - 1) + +/* map gnu.org into DC=gnu,DC=org */ +int +_pam_ldap_getdnsdn (char *src_domain, char **rval) +{ + char *p; + int len = 0; +#ifdef HAVE_STRTOK_R + char *st = NULL; +#endif + char *domain; + char domain_copy[BUFSIZ], buffer[BUFSIZ]; + + /* we need to take a copy of domain, because strtok() modifies + * it in place. Bad. + */ + if (strlen (src_domain) >= sizeof (domain_copy)) + { + return PAM_SYSTEM_ERR; + } + memset (domain_copy, '\0', sizeof (domain_copy)); + memset (buffer, '\0', sizeof (buffer)); + strcpy (domain_copy, src_domain); + + domain = domain_copy; + +#ifndef HAVE_STRTOK_R + while ((p = strtok (domain, "."))) +#else + while ((p = strtok_r (domain, ".", &st))) +#endif + { + len = strlen (p); + + if (strlen (buffer) + DC_ATTR_AVA_LEN + len + 1 >= sizeof (buffer)) + { + return PAM_SYSTEM_ERR; + } + + if (domain == NULL) + { + strcat (buffer, ","); + } + else + { + domain = NULL; + } + + strcat (buffer, DC_ATTR_AVA); + strcat (buffer, p); + } + + if (rval != NULL) + { + *rval = strdup (buffer); + } + + return PAM_SUCCESS; +} + + +int +_pam_ldap_readconfigfromdns (pam_ldap_config_t * result) +{ + int stat = PAM_SUCCESS; + struct dns_reply *r; + struct resource_record *rr; + char domain[MAXHOSTNAMELEN + 1]; + + /* only reinitialize variables we'll change here */ + result->host = NULL; + result->base = NULL; + result->port = LDAP_PORT; +#ifdef LDAP_VERSION3 + result->version = LDAP_VERSION3; +#else + result->version = LDAP_VERSION2; +#endif /* LDAP_VERSION3 */ + + if ((_res.options & RES_INIT) == 0 && res_init () == -1) + { + return PAM_SYSTEM_ERR; + } + + snprintf (domain, sizeof (domain), "_ldap._tcp.%s.", _res.defdname); + + r = dns_lookup (domain, "srv"); + if (r == NULL) + { + return PAM_SYSTEM_ERR; + } + + /* XXX need to sort by priority and reorder using weights */ + for (rr = r->head; rr != NULL; rr = rr->next) + { + if (rr->type == T_SRV) + { + if (result->host != NULL) + { + /* need more space */ + int length; + char *tmp; + length = strlen (result->host) + 1 + + strlen (rr->u.srv->target) + 1 + 5 + 1; + tmp = malloc (length); + if (tmp == NULL) + { + dns_free_data (r); + return PAM_BUF_ERR; + } + sprintf (tmp, "%s %s:%d", result->host, rr->u.srv->target, + rr->u.srv->port); + free (result->host); + result->host = tmp; + } + else + { + /* Server Host */ + result->host = strdup (rr->u.srv->target); + if (result->host == NULL) + { + dns_free_data (r); + return PAM_BUF_ERR; + } + /* Port */ + result->port = rr->u.srv->port; + } + +#ifdef LDAPS_PORT + /* Hack: if the port is the registered SSL port, enable SSL. */ + if (result->port == LDAPS_PORT) + { + result->ssl_on = SSL_LDAPS; + } +#endif /* SSL */ + + /* DN */ + stat = _pam_ldap_getdnsdn (_res.defdname, &result->base); + if (stat != PAM_SUCCESS) + { + dns_free_data (r); + return stat; + } + } + } + + dns_free_data (r); + stat = PAM_SUCCESS; + + return stat; +} --- /dev/null 2004-10-19 17:45:17.794252000 -0400 +++ pam_ldap-176/dnsconfig.h 2004-10-28 17:24:13.694936240 -0400 @@ -0,0 +1,35 @@ +/* Copyright (C) 1997-2001 Luke Howard. + This file started off as part of the nss_ldap library. + Contributed by Luke Howard, , 1997. + (The author maintains a non-exclusive licence to distribute this file + under their own conditions.) + + The nss_ldap library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The nss_ldap library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the nss_ldap library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ + +#ifndef _LDAP_PAM_LDAP_DNSCONFIG_H +#define _LDAP_PAM_LDAP_DNSCONFIG_H + +/* utility routines. */ + +int _pam_ldap_getdnsdn ( + char *domain, + char **rval); + +int _pam_ldap_readconfigfromdns ( + pam_ldap_config_t *result); + +#endif /* _LDAP_PAM_LDAP_DNSCONFIG_H */ --- pam_ldap-176/pam_ldap.c 2004-09-30 22:33:14.000000000 -0400 +++ pam_ldap-176/pam_ldap.c 2004-10-28 17:40:56.918423088 -0400 @@ -130,6 +130,7 @@ #include "pam_ldap.h" #include "md5.h" +#include "dnsconfig.h" #if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H) /* FIXME: is there something better to check? */ @@ -1107,11 +1108,15 @@ { /* * According to PAM Documentation, such an error in a config file - * SHOULD be logged at LOG_ALERT level + * SHOULD be logged at LOG_ALERT level, but we suppress it if DNS + * can provide us with the needed information */ - syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"", - configFile); - return PAM_SERVICE_ERR; + if (_pam_ldap_readconfigfromdns (result) != PAM_SUCCESS) + { + syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"", + configFile); + return PAM_SERVICE_ERR; + } } #if !(defined(HAVE_SASL_SASL_H) || defined(HAVE_SASL_H)) && !defined(HAVE_LDAP_SASL_INTERACTIVE_BIND_S) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nss_ldap/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 26 Feb 2008 21:04:40 -0000 1.40 +++ .cvsignore 16 Jul 2008 18:22:25 -0000 1.41 @@ -27,3 +27,4 @@ pam_ldap-184.tar.gz nss_ldap-257.tar.gz nss_ldap-259.tar.gz +nss_ldap-261.tar.gz Index: nss_ldap.spec =================================================================== RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- nss_ldap.spec 16 Apr 2008 15:13:13 -0000 1.95 +++ nss_ldap.spec 16 Jul 2008 18:22:25 -0000 1.96 @@ -1,8 +1,8 @@ %define pam_ldap_version 184 Summary: NSS library and PAM module for LDAP Name: nss_ldap -Version: 259 -Release: 3%{?dist} +Version: 261 +Release: 1%{?dist} Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz Source3: nss_ldap.versions @@ -10,7 +10,7 @@ Source5: README.TLS Source6: version.c Source7: dlopen.sh -Patch0: pam_ldap-176-dnsconfig.patch +Patch0: pam_ldap-184-dnsconfig.patch Patch1: pam_ldap-180-local_users.patch Patch2: nss_ldap-259-parse2.patch Patch3: pam_ldap-180-install-perms.patch @@ -188,6 +188,10 @@ %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema %changelog +* Wed Jul 16 2008 Nalin Dahyabhai - 261-1 +- update to version 261 +- remove fuzz from patches + * Wed Apr 16 2008 Nalin Dahyabhai - 259-3 - try to work around not having had a populated resolver configuration earlier, but needing to use its data when we're asked to look up something (#442272) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nss_ldap/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 26 Feb 2008 21:04:40 -0000 1.41 +++ sources 16 Jul 2008 18:22:25 -0000 1.42 @@ -1,2 +1,2 @@ -ef29690c6e5f02dffbfd0f32f296a97b nss_ldap-259.tar.gz +1057ce8b586c507f65657353bce97791 nss_ldap-261.tar.gz 01bf1ad8576f0d1b58d9eddc68987a47 pam_ldap-184.tar.gz --- pam_ldap-176-dnsconfig.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 18:40:08 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Wed, 16 Jul 2008 18:40:08 GMT Subject: rpms/binutils/F-9 binutils.spec,1.133,1.134 Message-ID: <200807161840.m6GIe8UH006180@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/binutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5827 Modified Files: binutils.spec Log Message: * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-4 - include the `dist' tag in the Release number - libbfd.a symbols visibility is now hidden (for #447426, suggested by Jakub) Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/F-9/binutils.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- binutils.spec 16 Jul 2008 14:11:14 -0000 1.133 +++ binutils.spec 16 Jul 2008 18:37:16 -0000 1.134 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.18.50.0.6 -Release: 3 +Release: 4%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -115,12 +115,16 @@ make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info gzip -q9f %{buildroot}%{_infodir}/*.info* -# Rebuild libiberty.a and libbfd.a with -fPIC -for SUBDIR in libiberty bfd -do - make -C $SUBDIR clean - make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C $SUBDIR -done +# Rebuild libiberty.a with -fPIC. +# Future: Remove it together with its header file, projects should bundle it. +make -C libiberty clean +make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C libiberty + +# Rebuild libbfd.a with -fPIC. +# Without the hidden visibility the 3rd party shared libraries would export +# the bfd non-stable ABI. +make -C bfd clean +make CFLAGS="-g -fPIC $RPM_OPT_FLAGS -fvisibility=hidden" -C bfd install -m 644 bfd/libbfd.a %{buildroot}%{_prefix}/%{_lib} install -m 644 libiberty/libiberty.a %{buildroot}%{_prefix}/%{_lib} @@ -221,6 +225,10 @@ %{_infodir}/bfd*info* %changelog +* Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-4 +- include the `dist' tag in the Release number +- libbfd.a symbols visibility is now hidden (for #447426, suggested by Jakub) + * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-3 - rebuild libbfd.a with -fPIC for inclusion into shared libraries (#447426) From fedora-extras-commits at redhat.com Wed Jul 16 18:40:25 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Wed, 16 Jul 2008 18:40:25 GMT Subject: rpms/binutils/devel binutils.spec,1.133,1.134 Message-ID: <200807161840.m6GIePNt006196@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/binutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6138 Modified Files: binutils.spec Log Message: * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-4 - include the `dist' tag in the Release number - libbfd.a symbols visibility is now hidden (for #447426, suggested by Jakub) Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- binutils.spec 16 Jul 2008 14:13:17 -0000 1.133 +++ binutils.spec 16 Jul 2008 18:39:54 -0000 1.134 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.18.50.0.6 -Release: 3 +Release: 4%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -115,12 +115,16 @@ make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info gzip -q9f %{buildroot}%{_infodir}/*.info* -# Rebuild libiberty.a and libbfd.a with -fPIC -for SUBDIR in libiberty bfd -do - make -C $SUBDIR clean - make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C $SUBDIR -done +# Rebuild libiberty.a with -fPIC. +# Future: Remove it together with its header file, projects should bundle it. +make -C libiberty clean +make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C libiberty + +# Rebuild libbfd.a with -fPIC. +# Without the hidden visibility the 3rd party shared libraries would export +# the bfd non-stable ABI. +make -C bfd clean +make CFLAGS="-g -fPIC $RPM_OPT_FLAGS -fvisibility=hidden" -C bfd install -m 644 bfd/libbfd.a %{buildroot}%{_prefix}/%{_lib} install -m 644 libiberty/libiberty.a %{buildroot}%{_prefix}/%{_lib} @@ -221,6 +225,10 @@ %{_infodir}/bfd*info* %changelog +* Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-4 +- include the `dist' tag in the Release number +- libbfd.a symbols visibility is now hidden (for #447426, suggested by Jakub) + * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-3 - rebuild libbfd.a with -fPIC for inclusion into shared libraries (#447426) From fedora-extras-commits at redhat.com Wed Jul 16 18:41:06 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Wed, 16 Jul 2008 18:41:06 GMT Subject: rpms/krb5/devel krb5.spec,1.172,1.173 Message-ID: <200807161841.m6GIf6h7006278@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6213 Modified Files: krb5.spec Log Message: quote %%{__cc} where needed because it includes whitespace now Index: krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- krb5.spec 16 Jul 2008 18:09:47 -0000 1.172 +++ krb5.spec 16 Jul 2008 18:40:35 -0000 1.173 @@ -234,6 +234,7 @@ * Wed Jul 16 2008 Nalin Dahyabhai - clear fuzz out of patches, dropping a man page patch which is no longer necessary +- quote %%{__cc} where needed because it includes whitespace now * Fri Jul 11 2008 Nalin Dahyabhai 1.6.3-15 - build with -fno-strict-aliasing, which is needed because the library @@ -1445,7 +1446,7 @@ CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC -fno-strict-aliasing`" CPPFLAGS="`echo $DEFINES $INCLUDES`" %configure \ - CC=%{__cc} \ + CC="%{__cc}" \ CFLAGS="$CFLAGS" \ CPPFLAGS="$CPPFLAGS" \ SS_LIB="-lss -lcurses" \ From fedora-extras-commits at redhat.com Wed Jul 16 18:45:53 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 16 Jul 2008 18:45:53 GMT Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.34,1.35 Message-ID: <200807161845.m6GIjrHZ006828@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drivers/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6756 Modified Files: xorg-x11-drivers.spec Log Message: * Wed Jul 16 2008 Adam Jackson 7.3-8 - Tee hee, imstt isn't packaged yet. Index: xorg-x11-drivers.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xorg-x11-drivers.spec 15 Jul 2008 18:11:06 -0000 1.34 +++ xorg-x11-drivers.spec 16 Jul 2008 18:45:23 -0000 1.35 @@ -1,7 +1,7 @@ Summary: X.Org X11 driver installation package Name: xorg-x11-drivers Version: 7.3 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +16,7 @@ # this list. # # Notable things missing: +# - imstt, not packaged yet, probably ppc only # - impact, since we don't have a mips port # - vermilion, the hardware is fictional # - poulsbo, likewise @@ -109,11 +110,6 @@ Requires: xorg-x11-drv-vmmouse %endif -# This was a mac-only card. If you've got one, we might as well make it work. -%ifarch ppc ppc64 -Requires: xorg-x11-drv-imstt -%endif - # Sun kit, sparc-only. %ifarch sparc sparcv9 sparc64 Requires: xorg-x11-drv-suntcx @@ -145,6 +141,9 @@ %defattr(-,root,root,-) %changelog +* Wed Jul 16 2008 Adam Jackson 7.3-8 +- Tee hee, imstt isn't packaged yet. + * Tue Jul 15 2008 Adam Jackson 7.3-7 - Comment cleanup. - Add imstt to ppc, just for giggles. From fedora-extras-commits at redhat.com Wed Jul 16 18:46:43 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 16 Jul 2008 18:46:43 GMT Subject: rpms/typespeed/devel typespeed.desktop, NONE, 1.1 typespeed.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161846.m6GIkhsR006938@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/typespeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879 Modified Files: .cvsignore sources Added Files: typespeed.desktop typespeed.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades --- NEW FILE typespeed.desktop --- [Desktop Entry] Name=Typespeed Comment=Test your typing speed Exec=typespeed Type=Application Terminal=true Icon=keyboard Categories=Game;Education Encoding=UTF-8 --- NEW FILE typespeed.spec --- Name: typespeed Version: 0.6.4 Release: 2%{?dist} Summary: Test your typing speed and get your fingers' CPS Group: Applications/Productivity License: GPLv2+ URL: http://tobias.eyedacor.org/typespeed/ Source0: http://tobias.eyedacor.org/typespeed/typespeed-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel gettext desktop-file-utils %description Typespeed gives your fingers' cps (total and correct), typoratio and some points to compare with your friends. Typespeed's idea is ripped from ztspeed (a DOS game made by Zorlim). The idea behind the game is rather easy: type words that are flying by from left to right as fast as you can. If you miss 10 or more words, game is over. You can play typespeed for your own or with a friend using TCP/IPv4. %prep %setup -q iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/%{name} %attr(664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}.score %doc BUGS COPYING ChangeLog NEWS README TODO %config(noreplace) %{_sysconfdir}/%{name}rc %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %exclude %{_datadir}/doc/%{name}/README %{_mandir}/man6/* %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %%prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades * Tue May 20 2008 Michel Salim - 0.6.4-1 - Initial package (based on upstream spec by Andrew Ziem) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:07:14 -0000 1.1 +++ .cvsignore 16 Jul 2008 18:46:04 -0000 1.2 @@ -0,0 +1 @@ +typespeed-0.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:07:14 -0000 1.1 +++ sources 16 Jul 2008 18:46:04 -0000 1.2 @@ -0,0 +1 @@ +fb55b92ad7e29a1a6a7a3e1ca383d5e2 typespeed-0.6.4.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 18:50:14 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Wed, 16 Jul 2008 18:50:14 GMT Subject: rpms/coq/devel README.coq-emacs, NONE, 1.1 RecTutorial.v, NONE, 1.1 check.patch, NONE, 1.1 cmxa-install.patch, NONE, 1.1 coq-icon.png, NONE, 1.1 coq.spec, NONE, 1.1 coqide.desktop, NONE, 1.1 import.log, NONE, 1.1 makefile-strip.patch, NONE, 1.1 makefile.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161850.m6GIoEiw007287@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6819/devel Modified Files: .cvsignore sources Added Files: README.coq-emacs RecTutorial.v check.patch cmxa-install.patch coq-icon.png coq.spec coqide.desktop import.log makefile-strip.patch makefile.patch Log Message: Initial add of supporting files for coq package. --- NEW FILE README.coq-emacs --- This is the Fedora coq-emacs package, which includes an emacs elisp file for usage with editing Coq .v files. --- NEW FILE RecTutorial.v --- Check (forall A:Type, (exists x:A, forall (y:A), x <> y) -> 2 = 3). Inductive nat : Set := | O : nat | S : nat->nat. Check nat. Check O. Check S. Reset nat. Print nat. Print le. Theorem zero_leq_three: 0 <= 3. Proof. constructor 2. constructor 2. constructor 2. constructor 1. Qed. Print zero_leq_three. Lemma zero_leq_three': 0 <= 3. repeat constructor. Qed. Lemma zero_lt_three : 0 < 3. Proof. repeat constructor. Qed. Print zero_lt_three. Require Import Relations. Locate clos_trans. (* alternate definition in style prior to V8.1 *) Section Transitive_Closure. Variable A : Type. Variable R : relation A. Inductive clos_trans : A -> A -> Prop := | t_step : forall x y:A, R x y -> clos_trans x y | t_trans : forall x y z:A, clos_trans x y -> clos_trans y z -> clos_trans x z. End Transitive_Closure. Require Import List. Print list. Check list. Check (nil (A:=nat)). Check (nil (A:= nat -> nat)). Check (fun A: Type => (cons (A:=A))). Check (cons 3 (cons 2 nil)). Check (nat :: bool ::nil). Check ((3<=4) :: True ::nil). Check (Prop::Set::nil). Require Import Bvector. Print vector. Check (Vnil nat). Check (fun (A:Type)(a:A)=> Vcons _ a _ (Vnil _)). Check (Vcons _ 5 _ (Vcons _ 3 _ (Vnil _))). Lemma eq_3_3 : 2 + 1 = 3. Proof. reflexivity. Qed. Print eq_3_3. Lemma eq_proof_proof : refl_equal (2*6) = refl_equal (3*4). Proof. reflexivity. Qed. Print eq_proof_proof. Lemma eq_lt_le : ( 2 < 4) = (3 <= 4). Proof. reflexivity. Qed. Lemma eq_nat_nat : nat = nat. Proof. reflexivity. Qed. Lemma eq_Set_Set : Set = Set. Proof. reflexivity. Qed. Lemma eq_Type_Type : Type = Type. Proof. reflexivity. Qed. Check (2 + 1 = 3). Check (Type = Type). Goal Type = Type. reflexivity. Qed. Print or. Print and. Print sumbool. Print ex. Require Import ZArith. Require Import Compare_dec. Check le_lt_dec. Definition max (n p :nat) := match le_lt_dec n p with | left _ => p | right _ => n end. Theorem le_max : forall n p, n <= p -> max n p = p. Proof. intros n p ; unfold max ; case (le_lt_dec n p); simpl. trivial. intros; absurd (p < p); eauto with arith. Qed. Extraction max. Inductive tree(A:Type) : Type := node : A -> forest A -> tree A with forest (A: Type) : Type := nochild : forest A | addchild : tree A -> forest A -> forest A. Inductive even : nat->Prop := evenO : even O | evenS : forall n, odd n -> even (S n) with odd : nat->Prop := oddS : forall n, even n -> odd (S n). Lemma odd_49 : odd (7 * 7). simpl; repeat constructor. Qed. Definition nat_case := fun (Q : Type)(g0 : Q)(g1 : nat -> Q)(n:nat) => match n return Q with | 0 => g0 | S p => g1 p end. Eval simpl in (nat_case nat 0 (fun p => p) 34). Eval simpl in (fun g0 g1 => nat_case nat g0 g1 34). Eval simpl in (fun g0 g1 => nat_case nat g0 g1 0). Definition pred (n:nat) := match n with O => O | S m => m end. Eval simpl in pred 56. Eval simpl in pred 0. Eval simpl in fun p => pred (S p). Definition xorb (b1 b2:bool) := match b1, b2 with | false, true => true | true, false => true | _ , _ => false end. Definition pred_spec (n:nat) := {m:nat | n=0 /\ m=0 \/ n = S m}. Definition predecessor : forall n:nat, pred_spec n. intro n;case n. unfold pred_spec;exists 0;auto. unfold pred_spec; intro n0;exists n0; auto. Defined. Print predecessor. Extraction predecessor. Theorem nat_expand : forall n:nat, n = match n with 0 => 0 | S p => S p end. intro n;case n;simpl;auto. Qed. Check (fun p:False => match p return 2=3 with end). Theorem fromFalse : False -> 0=1. intro absurd. contradiction. Qed. Section equality_elimination. Variables (A: Type) (a b : A) (p : a = b) (Q : A -> Type). Check (fun H : Q a => match p in (eq _ y) return Q y with refl_equal => H end). End equality_elimination. Theorem trans : forall n m p:nat, n=m -> m=p -> n=p. Proof. intros n m p eqnm. case eqnm. trivial. Qed. Lemma Rw : forall x y: nat, y = y * x -> y * x * x = y. intros x y e; do 2 rewrite <- e. reflexivity. Qed. Require Import Arith. Check mult_1_l. (* mult_1_l : forall n : nat, 1 * n = n *) Check mult_plus_distr_r. (* mult_plus_distr_r : forall n m p : nat, (n + m) * p = n * p + m * p *) Lemma mult_distr_S : forall n p : nat, n * p + p = (S n)* p. simpl;auto with arith. Qed. Lemma four_n : forall n:nat, n+n+n+n = 4*n. intro n;rewrite <- (mult_1_l n). Undo. intro n; pattern n at 1. rewrite <- mult_1_l. repeat rewrite mult_distr_S. trivial. Qed. Section Le_case_analysis. Variables (n p : nat) (H : n <= p) (Q : nat -> Prop) (H0 : Q n) (HS : forall m, n <= m -> Q (S m)). Check ( match H in (_ <= q) return (Q q) with | le_n => H0 | le_S m Hm => HS m Hm end ). End Le_case_analysis. Lemma predecessor_of_positive : forall n, 1 <= n -> exists p:nat, n = S p. Proof. intros n H; case H. exists 0; trivial. intros m Hm; exists m;trivial. Qed. Definition Vtail_total (A : Type) (n : nat) (v : vector A n) : vector A (pred n):= match v in (vector _ n0) return (vector A (pred n0)) with | Vnil => Vnil A | Vcons _ n0 v0 => v0 end. Definition Vtail' (A:Type)(n:nat)(v:vector A n) : vector A (pred n). intros A n v; case v. simpl. exact (Vnil A). simpl. auto. Defined. (* Inductive Lambda : Set := lambda : (Lambda -> False) -> Lambda. Error: Non strictly positive occurrence of "Lambda" in "(Lambda -> False) -> Lambda" *) Section Paradox. Variable Lambda : Set. Variable lambda : (Lambda -> False) ->Lambda. Variable matchL : Lambda -> forall Q:Prop, ((Lambda ->False) -> Q) -> Q. (* understand matchL Q l (fun h : Lambda -> False => t) as match l return Q with lambda h => t end *) Definition application (f x: Lambda) :False := matchL f False (fun h => h x). Definition Delta : Lambda := lambda (fun x : Lambda => application x x). Definition loop : False := application Delta Delta. Theorem two_is_three : 2 = 3. Proof. elim loop. Qed. End Paradox. Require Import ZArith. Inductive itree : Set := | ileaf : itree | inode : Z-> (nat -> itree) -> itree. Definition isingle l := inode l (fun i => ileaf). Definition t1 := inode 0 (fun n => isingle (Z_of_nat (2*n))). Definition t2 := inode 0 (fun n : nat => inode (Z_of_nat n) (fun p => isingle (Z_of_nat (n*p)))). Inductive itree_le : itree-> itree -> Prop := | le_leaf : forall t, itree_le ileaf t | le_node : forall l l' s s', Zle l l' -> (forall i, exists j:nat, itree_le (s i) (s' j)) -> itree_le (inode l s) (inode l' s'). Theorem itree_le_trans : forall t t', itree_le t t' -> forall t'', itree_le t' t'' -> itree_le t t''. induction t. constructor 1. intros t'; case t'. inversion 1. intros z0 i0 H0. intro t'';case t''. inversion 1. intros. inversion_clear H1. constructor 2. inversion_clear H0;eauto with zarith. inversion_clear H0. intro i2; case (H4 i2). intros. generalize (H i2 _ H0). intros. case (H3 x);intros. generalize (H5 _ H6). exists x0;auto. Qed. Inductive itree_le' : itree-> itree -> Prop := | le_leaf' : forall t, itree_le' ileaf t | le_node' : forall l l' s s' g, Zle l l' -> (forall i, itree_le' (s i) (s' (g i))) -> itree_le' (inode l s) (inode l' s'). Lemma t1_le_t2 : itree_le t1 t2. unfold t1, t2. constructor. auto with zarith. intro i; exists (2 * i). unfold isingle. constructor. auto with zarith. exists i;constructor. Qed. Lemma t1_le'_t2 : itree_le' t1 t2. unfold t1, t2. constructor 2 with (fun i : nat => 2 * i). auto with zarith. unfold isingle; intro i ; constructor 2 with (fun i :nat => i). auto with zarith. constructor . Qed. Require Import List. Inductive ltree (A:Set) : Set := lnode : A -> list (ltree A) -> ltree A. Inductive prop : Prop := prop_intro : Prop -> prop. Check (prop_intro prop). Inductive ex_Prop (P : Prop -> Prop) : Prop := exP_intro : forall X : Prop, P X -> ex_Prop P. Lemma ex_Prop_inhabitant : ex_Prop (fun P => P -> P). Proof. exists (ex_Prop (fun P => P -> P)). trivial. Qed. (* Check (fun (P:Prop->Prop)(p: ex_Prop P) => match p with exP_intro X HX => X end). Error: Incorrect elimination of "p" in the inductive type "ex_Prop", the return type has sort "Type" while it should be "Prop" Elimination of an inductive object of sort "Prop" is not allowed on a predicate in sort "Type" because proofs can be eliminated only to build proofs *) Inductive typ : Type := typ_intro : Type -> typ. Definition typ_inject: typ. split. exact typ. (* Defined. Error: Universe Inconsistency. *) Abort. (* Inductive aSet : Set := aSet_intro: Set -> aSet. User error: Large non-propositional inductive types must be in Type *) Inductive ex_Set (P : Set -> Prop) : Type := exS_intro : forall X : Set, P X -> ex_Set P. Inductive comes_from_the_left (P Q:Prop): P \/ Q -> Prop := c1 : forall p, comes_from_the_left P Q (or_introl (A:=P) Q p). Goal (comes_from_the_left _ _ (or_introl True I)). split. Qed. Goal ~(comes_from_the_left _ _ (or_intror True I)). red;inversion 1. (* discriminate H0. *) Abort. Reset comes_from_the_left. (* Definition comes_from_the_left (P Q:Prop)(H:P \/ Q): Prop := match H with | or_introl p => True | or_intror q => False end. Error: Incorrect elimination of "H" in the inductive type "or", the return type has sort "Type" while it should be "Prop" Elimination of an inductive object of sort "Prop" is not allowed on a predicate in sort "Type" because proofs can be eliminated only to build proofs *) Definition comes_from_the_left_sumbool (P Q:Prop)(x:{P}+{Q}): Prop := match x with | left p => True | right q => False end. Close Scope Z_scope. Theorem S_is_not_O : forall n, S n <> 0. Definition Is_zero (x:nat):= match x with | 0 => True | _ => False end. Lemma O_is_zero : forall m, m = 0 -> Is_zero m. Proof. intros m H; subst m. (* ============================ Is_zero 0 *) simpl;trivial. Qed. red; intros n Hn. apply O_is_zero with (m := S n). assumption. Qed. Theorem disc2 : forall n, S (S n) <> 1. Proof. intros n Hn; discriminate. Qed. Theorem disc3 : forall n, S (S n) = 0 -> forall Q:Prop, Q. Proof. intros n Hn Q. discriminate. Qed. Theorem inj_succ : forall n m, S n = S m -> n = m. Proof. Lemma inj_pred : forall n m, n = m -> pred n = pred m. Proof. intros n m eq_n_m. rewrite eq_n_m. trivial. Qed. intros n m eq_Sn_Sm. apply inj_pred with (n:= S n) (m := S m); assumption. Qed. Lemma list_inject : forall (A:Type)(a b :A)(l l':list A), a :: b :: l = b :: a :: l' -> a = b /\ l = l'. Proof. intros A a b l l' e. injection e. auto. Qed. Theorem not_le_Sn_0 : forall n:nat, ~ (S n <= 0). Proof. red; intros n H. case H. Undo. Lemma not_le_Sn_0_with_constraints : forall n p , S n <= p -> p = 0 -> False. Proof. intros n p H; case H ; intros; discriminate. Qed. eapply not_le_Sn_0_with_constraints; eauto. Qed. Theorem not_le_Sn_0' : forall n:nat, ~ (S n <= 0). Proof. red; intros n H ; inversion H. Qed. Derive Inversion le_Sn_0_inv with (forall n :nat, S n <= 0). Check le_Sn_0_inv. Theorem le_Sn_0'' : forall n p : nat, ~ S n <= 0 . Proof. intros n p H; inversion H using le_Sn_0_inv. Qed. Derive Inversion_clear le_Sn_0_inv' with (forall n :nat, S n <= 0). Check le_Sn_0_inv'. Theorem le_reverse_rules : forall n m:nat, n <= m -> n = m \/ exists p, n <= p /\ m = S p. Proof. intros n m H; inversion H. left;trivial. right; exists m0; split; trivial. Restart. intros n m H; inversion_clear H. left;trivial. right; exists m0; split; trivial. Qed. Inductive ArithExp : Set := Zero : ArithExp | Succ : ArithExp -> ArithExp | Plus : ArithExp -> ArithExp -> ArithExp. Inductive RewriteRel : ArithExp -> ArithExp -> Prop := RewSucc : forall e1 e2 :ArithExp, RewriteRel e1 e2 -> RewriteRel (Succ e1) (Succ e2) | RewPlus0 : forall e:ArithExp, RewriteRel (Plus Zero e) e | RewPlusS : forall e1 e2:ArithExp, RewriteRel e1 e2 -> RewriteRel (Plus (Succ e1) e2) (Succ (Plus e1 e2)). Fixpoint plus (n p:nat) {struct n} : nat := match n with | 0 => p | S m => S (plus m p) end. Fixpoint plus' (n p:nat) {struct p} : nat := match p with | 0 => n | S q => S (plus' n q) end. Fixpoint plus'' (n p:nat) {struct n} : nat := match n with | 0 => p | S m => plus'' m (S p) end. Fixpoint even_test (n:nat) : bool := match n with 0 => true | 1 => false | S (S p) => even_test p end. Reset even_test. Fixpoint even_test (n:nat) : bool := match n with | 0 => true | S p => odd_test p end with odd_test (n:nat) : bool := match n with | 0 => false | S p => even_test p end. Eval simpl in even_test. Eval simpl in (fun x : nat => even_test x). Eval simpl in (fun x : nat => plus 5 x). Eval simpl in (fun x : nat => even_test (plus 5 x)). Eval simpl in (fun x : nat => even_test (plus x 5)). Section Principle_of_Induction. Variable P : nat -> Prop. Hypothesis base_case : P 0. Hypothesis inductive_step : forall n:nat, P n -> P (S n). Fixpoint nat_ind (n:nat) : (P n) := match n return P n with | 0 => base_case | S m => inductive_step m (nat_ind m) end. End Principle_of_Induction. Scheme Even_induction := Minimality for even Sort Prop with Odd_induction := Minimality for odd Sort Prop. Theorem even_plus_four : forall n:nat, even n -> even (4+n). Proof. intros n H. elim H using Even_induction with (P0 := fun n => odd (4+n)); simpl;repeat constructor;assumption. Qed. Section Principle_of_Double_Induction. Variable P : nat -> nat ->Prop. Hypothesis base_case1 : forall x:nat, P 0 x. Hypothesis base_case2 : forall x:nat, P (S x) 0. Hypothesis inductive_step : forall n m:nat, P n m -> P (S n) (S m). Fixpoint nat_double_ind (n m:nat){struct n} : P n m := match n, m return P n m with | 0 , x => base_case1 x | (S x), 0 => base_case2 x | (S x), (S y) => inductive_step x y (nat_double_ind x y) end. End Principle_of_Double_Induction. Section Principle_of_Double_Recursion. Variable P : nat -> nat -> Type. Hypothesis base_case1 : forall x:nat, P 0 x. Hypothesis base_case2 : forall x:nat, P (S x) 0. Hypothesis inductive_step : forall n m:nat, P n m -> P (S n) (S m). Fixpoint nat_double_rect (n m:nat){struct n} : P n m := match n, m return P n m with | 0 , x => base_case1 x | (S x), 0 => base_case2 x | (S x), (S y) => inductive_step x y (nat_double_rect x y) end. End Principle_of_Double_Recursion. Definition min : nat -> nat -> nat := nat_double_rect (fun (x y:nat) => nat) (fun (x:nat) => 0) (fun (y:nat) => 0) (fun (x y r:nat) => S r). Eval compute in (min 5 8). Eval compute in (min 8 5). Lemma not_circular : forall n:nat, n <> S n. Proof. intro n. apply nat_ind with (P:= fun n => n <> S n). discriminate. red; intros n0 Hn0 eqn0Sn0;injection eqn0Sn0;trivial. Qed. Definition eq_nat_dec : forall n p:nat , {n=p}+{n <> p}. Proof. intros n p. apply nat_double_rect with (P:= fun (n q:nat) => {q=p}+{q <> p}). Undo. pattern p,n. elim n using nat_double_rect. destruct x; auto. destruct x; auto. intros n0 m H; case H. intro eq; rewrite eq ; auto. intro neg; right; red ; injection 1; auto. Defined. Definition eq_nat_dec' : forall n p:nat, {n=p}+{n <> p}. decide equality. Defined. Require Import Minus. (* Fixpoint div (x y:nat){struct x}: nat := if eq_nat_dec x 0 then 0 else if eq_nat_dec y 0 then x else S (div (x-y) y). Error: Recursive definition of div is ill-formed. In environment div : nat -> nat -> nat x : nat y : nat _ : x <> 0 _ : y <> 0 Recursive call to div has principal argument equal to "x - y" instead of a subterm of x *) Lemma minus_smaller_S: forall x y:nat, x - y < S x. Proof. intros x y; pattern y, x; elim x using nat_double_ind. destruct x0; auto with arith. simpl; auto with arith. simpl; auto with arith. Qed. Lemma minus_smaller_positive : forall x y:nat, x <>0 -> y <> 0 -> x - y < x. Proof. destruct x; destruct y; ( simpl;intros; apply minus_smaller_S || intros; absurd (0=0); auto). Qed. Definition minus_decrease : forall x y:nat, Acc lt x -> x <> 0 -> y <> 0 -> Acc lt (x-y). Proof. intros x y H; case H. intros Hz posz posy. apply Hz; apply minus_smaller_positive; assumption. Defined. Print minus_decrease. Definition div_aux (x y:nat)(H: Acc lt x):nat. fix 3. intros. refine (if eq_nat_dec x 0 then 0 else if eq_nat_dec y 0 then y else div_aux (x-y) y _). apply (minus_decrease x y H);assumption. Defined. Print div_aux. (* div_aux = (fix div_aux (x y : nat) (H : Acc lt x) {struct H} : nat := match eq_nat_dec x 0 with | left _ => 0 | right _ => match eq_nat_dec y 0 with | left _ => y | right _0 => div_aux (x - y) y (minus_decrease x y H _ _0) end end) : forall x : nat, nat -> Acc lt x -> nat *) Require Import Wf_nat. Definition div x y := div_aux x y (lt_wf x). Extraction div. (* let div x y = div_aux x y *) Extraction div_aux. (* let rec div_aux x y = match eq_nat_dec x O with | Left -> O | Right -> (match eq_nat_dec y O with | Left -> y | Right -> div_aux (minus x y) y) *) Lemma vector0_is_vnil : forall (A:Type)(v:vector A 0), v = Vnil A. Proof. intros A v;inversion v. Abort. (* Lemma vector0_is_vnil_aux : forall (A:Type)(n:nat)(v:vector A n), n= 0 -> v = Vnil A. Toplevel input, characters 40281-40287 > Lemma vector0_is_vnil_aux : forall (A:Set)(n:nat)(v:vector A n), n= 0 -> v = Vnil A. > ^^^^^^ Error: In environment A : Set n : nat v : vector A n e : n = 0 The term "Vnil A" has type "vector A 0" while it is expected to have type "vector A n" *) Require Import JMeq. (* On devrait changer Set en Type ? *) Lemma vector0_is_vnil_aux : forall (A:Type)(n:nat)(v:vector A n), n= 0 -> JMeq v (Vnil A). Proof. destruct v. auto. intro; discriminate. Qed. Lemma vector0_is_vnil : forall (A:Type)(v:vector A 0), v = Vnil A. Proof. intros a v;apply JMeq_eq. apply vector0_is_vnil_aux. trivial. Qed. Implicit Arguments Vcons [A n]. Implicit Arguments Vnil [A]. Implicit Arguments Vhead [A n]. Implicit Arguments Vtail [A n]. Definition Vid : forall (A : Type)(n:nat), vector A n -> vector A n. Proof. destruct n; intro v. exact Vnil. exact (Vcons (Vhead v) (Vtail v)). Defined. Eval simpl in (fun (A:Type)(v:vector A 0) => (Vid _ _ v)). Eval simpl in (fun (A:Type)(v:vector A 0) => v). Lemma Vid_eq : forall (n:nat) (A:Type)(v:vector A n), v=(Vid _ n v). Proof. destruct v. reflexivity. reflexivity. Defined. Theorem zero_nil : forall A (v:vector A 0), v = Vnil. Proof. intros. change (Vnil (A:=A)) with (Vid _ 0 v). apply Vid_eq. Defined. Theorem decomp : forall (A : Type) (n : nat) (v : vector A (S n)), v = Vcons (Vhead v) (Vtail v). Proof. intros. change (Vcons (Vhead v) (Vtail v)) with (Vid _ (S n) v). apply Vid_eq. Defined. Definition vector_double_rect : forall (A:Type) (P: forall (n:nat),(vector A n)->(vector A n) -> Type), P 0 Vnil Vnil -> (forall n (v1 v2 : vector A n) a b, P n v1 v2 -> P (S n) (Vcons a v1) (Vcons b v2)) -> forall n (v1 v2 : vector A n), P n v1 v2. induction n. intros; rewrite (zero_nil _ v1); rewrite (zero_nil _ v2). auto. intros v1 v2; rewrite (decomp _ _ v1);rewrite (decomp _ _ v2). apply X0; auto. Defined. Require Import Bool. Definition bitwise_or n v1 v2 : vector bool n := vector_double_rect bool (fun n v1 v2 => vector bool n) Vnil (fun n v1 v2 a b r => Vcons (orb a b) r) n v1 v2. Fixpoint vector_nth (A:Type)(n:nat)(p:nat)(v:vector A p){struct v} : option A := match n,v with _ , Vnil => None | 0 , Vcons b _ _ => Some b | S n', Vcons _ p' v' => vector_nth A n' p' v' end. Implicit Arguments vector_nth [A p]. Lemma nth_bitwise : forall (n:nat) (v1 v2: vector bool n) i a b, vector_nth i v1 = Some a -> vector_nth i v2 = Some b -> vector_nth i (bitwise_or _ v1 v2) = Some (orb a b). Proof. intros n v1 v2; pattern n,v1,v2. apply vector_double_rect. simpl. destruct i; discriminate 1. destruct i; simpl;auto. injection 1; injection 2;intros; subst a; subst b; auto. Qed. Set Implicit Arguments. CoInductive Stream (A:Type) : Type := | Cons : A -> Stream A -> Stream A. CoInductive LList (A: Type) : Type := | LNil : LList A | LCons : A -> LList A -> LList A. Definition head (A:Type)(s : Stream A) := match s with Cons a s' => a end. Definition tail (A : Type)(s : Stream A) := match s with Cons a s' => s' end. CoFixpoint repeat (A:Type)(a:A) : Stream A := Cons a (repeat a). CoFixpoint iterate (A: Type)(f: A -> A)(a : A) : Stream A:= Cons a (iterate f (f a)). CoFixpoint map (A B:Type)(f: A -> B)(s : Stream A) : Stream B:= match s with Cons a tl => Cons (f a) (map f tl) end. Eval simpl in (fun (A:Type)(a:A) => repeat a). Eval simpl in (fun (A:Type)(a:A) => head (repeat a)). CoInductive EqSt (A: Type) : Stream A -> Stream A -> Prop := eqst : forall s1 s2: Stream A, head s1 = head s2 -> EqSt (tail s1) (tail s2) -> EqSt s1 s2. Section Parks_Principle. Variable A : Type. Variable R : Stream A -> Stream A -> Prop. Hypothesis bisim1 : forall s1 s2:Stream A, R s1 s2 -> head s1 = head s2. Hypothesis bisim2 : forall s1 s2:Stream A, R s1 s2 -> R (tail s1) (tail s2). CoFixpoint park_ppl : forall s1 s2:Stream A, R s1 s2 -> EqSt s1 s2 := fun s1 s2 (p : R s1 s2) => eqst s1 s2 (bisim1 p) (park_ppl (bisim2 p)). End Parks_Principle. Theorem map_iterate : forall (A:Type)(f:A->A)(x:A), EqSt (iterate f (f x)) (map f (iterate f x)). Proof. intros A f x. apply park_ppl with (R:= fun s1 s2 => exists x: A, s1 = iterate f (f x) /\ s2 = map f (iterate f x)). intros s1 s2 (x0,(eqs1,eqs2));rewrite eqs1;rewrite eqs2;reflexivity. intros s1 s2 (x0,(eqs1,eqs2)). exists (f x0);split;[rewrite eqs1|rewrite eqs2]; reflexivity. exists x;split; reflexivity. Qed. Ltac infiniteproof f := cofix f; constructor; [clear f| simpl; try (apply f; clear f)]. Theorem map_iterate' : forall (A:Type)(f:A->A)(x:A), EqSt (iterate f (f x)) (map f (iterate f x)). infiniteproof map_iterate'. reflexivity. Qed. Implicit Arguments LNil [A]. Lemma Lnil_not_Lcons : forall (A:Type)(a:A)(l:LList A), LNil <> (LCons a l). intros;discriminate. Qed. Lemma injection_demo : forall (A:Type)(a b : A)(l l': LList A), LCons a (LCons b l) = LCons b (LCons a l') -> a = b /\ l = l'. Proof. intros A a b l l' e; injection e; auto. Qed. Inductive Finite (A:Type) : LList A -> Prop := | Lnil_fin : Finite (LNil (A:=A)) | Lcons_fin : forall a l, Finite l -> Finite (LCons a l). CoInductive Infinite (A:Type) : LList A -> Prop := | LCons_inf : forall a l, Infinite l -> Infinite (LCons a l). Lemma LNil_not_Infinite : forall (A:Type), ~ Infinite (LNil (A:=A)). Proof. intros A H;inversion H. Qed. Lemma Finite_not_Infinite : forall (A:Type)(l:LList A), Finite l -> ~ Infinite l. Proof. intros A l H; elim H. apply LNil_not_Infinite. intros a l0 F0 I0' I1. case I0'; inversion_clear I1. trivial. Qed. Lemma Not_Finite_Infinite : forall (A:Type)(l:LList A), ~ Finite l -> Infinite l. Proof. cofix H. destruct l. intro; absurd (Finite (LNil (A:=A)));[auto|constructor]. constructor. apply H. red; intro H1;case H0. constructor. trivial. Qed. check.patch: --- NEW FILE check.patch --- --- test-suite/check 2008-06-17 09:18:42.000000000 -0400 +++ test-suite/check 2008-06-17 09:19:11.000000000 -0400 @@ -52,7 +52,7 @@ nbtests=`expr $nbtests + 1` printf " "$f"..." tmpoutput=`mktemp /tmp/coqcheck.XXXXXX` - $command $f 2>&1 | grep -v "Welcome to Coq" | grep -v "Skipping rcfile loading" > $tmpoutput + $command $f 2>&1 | grep -v "Welcome to Coq" | grep -v "Skipping rcfile loading" | grep -v "some rule has been masked" > $tmpoutput foutput=`dirname $f`/`basename $f .v`.out diff $tmpoutput $foutput >& /dev/null if [ $? = 0 ]; then cmxa-install.patch: --- NEW FILE cmxa-install.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-16 10:58:38.000000000 -0400 @@ -1271,7 +1271,12 @@ parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \ parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma -OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +ifeq ($(BEST),opt) + OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +else + OBJECTCMXA= +endif + install-library: $(MKDIR) $(FULLCOQLIB) --- NEW FILE coq.spec --- # Upstream includes option for generation of optimized binaries, # however, specifically generates bytecode versions for certain # executables even when optimized option is set, namely the following: # coq-tex, coq_makefile, coq-interface, coqwc, coqdoc, parser, coqdep, # gallina # (coqtop.byte, coqide.byte binaries are also made available.) # .coqide-gtk2rc also produces an rpmlint warning due to its name, # however, this name is proper as per the Coq documentation # Disable creation of the debug package: if bytecode executables are # created find-debuginfo.sh will ruin them, while if optimized # executables are created they will be stripped by the Makefile # anyway, thus we won't get anything useful from the debug info # package creation. # # It appears as though ALL of these are necessary to prevent unwanted # stripping %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %define _enable_debug_package 0 %define debug_package %{nil} Name: coq Version: 8.1pl3 Release: 1%{?dist} Summary: Coq proof management system Group: Applications/Engineering License: LGPLv2 URL: http://coq.inria.fr/ Source0: http://coq.inria.fr/V%{version}/files/coq-%{version}.tar.gz Source1: Coq-Library.pdf.gz Source2: Coq-Reference-Manual.pdf.gz Source3: Coq-Tutorial.v.pdf.gz Source4: Coq-RecTutorial.pdf.gz Source5: coq-refman-html.tar.gz Source6: coq-stdlib-html.tar.gz Source7: RecTutorial.v Source8: coqide.desktop Source9: coq-icon.png Source10: README.coq-emacs Patch0: makefile.patch Patch1: cmxa-install.patch Patch2: makefile-strip.patch Patch3: check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, texlive-latex, texlive-texmf # ExcludeArch: ppc64 %description Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides the main Coq binary without an optional IDE, Coqide. # The IDE's package name will become "coq-coqide". That way, # searching for either "coqide" (the Ubuntu/Debian package name, and # also the full name of the IDE) or "coq" and "ide" will find # this. (If the package were named "coq-ide", the former would fail.) %package coqide Group: Applications/Engineering Summary: Coqide IDE for Coq proof management system Requires: coq %description coqide Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides Coqide, a lightweight IDE for Coq. %package doc Group: Applications/Engineering Summary: Documentation for Coq proof management system %description doc Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides documentation and tutorials for the system. The main documentation comes in two parts: the main Library documentation, which decribes all Coq.* modules, and the Reference Manual, which gives a more complete description of the whole system. Included are also HTML versions of both. Furthermore, there are two tutorials, the main one, and one specifically on recursive types. The example code for the latter is also included. %package emacs Group: Applications/Engineering Summary: Elisp files for Coq proof management system Requires: coq, emacs %description emacs Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides emacs mode files for formatting Coq input. %prep %setup -q # Patch description: # Considered each of the seven patches from the Debian Coq package: # Credit goes to the Debian patch creators for their patches # (See http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/patches/?rev=0&sc=0) # # For most patches I merely reproduced the results in non-dpatch # form. I opted for no patching in cases where it did not seem # necessary or immediately correct. # # - browser.dpatch: changes firefox option for linux, however, link # x-www-browser does not exist in Fedora setup, and changing this # option does not actually fix the problem in the IDE wherein a # browser window needs to be open in order to actually open any help # file -> do not change until the real source of the problem can be # detected # - check.dpatch: suppress a test warning, similar change made in my # check.patch # - cmxa-install.dpatch: fixes cmxa install by testing for opt, similar # change made in cmxa-install.patch # - configure.dpatch: fixes detection of ocamlopt - We do this detection # seperately anyway in this RPM, no change made # - coqdoc_stdlib.dpatch: extra documentation option - Perhaps do this # in the future, but for now, no change made # - makefile.dpatch: fix testing on non-native architecture compiles, similar change made in makefile.patch # - no-complexity-test.dpatch: turn off some of the tests - Perhaps this # change was made due to a failure in complexity tests when they # "don't run quickly enough", which is likely to be incredibly # variable, but unsure, so no change made %patch0 %patch1 # I created patch3 to consistently strip native-code binaries, unlike # the inconsistent way it was done in the original makefile %patch2 # This patch may not be strictly necessary unless the tests are # incorporated into the build process somehow. However, the tests don't # work properly without it. %patch3 # Fix some files that are not in UTF-8 encoding for f in CHANGES CREDITS COPYRIGHT; do mv $f $f.old; iconv -f ISO-8859-1 -t UTF-8 < $f.old > $f; rm $f.old done %define emacs_lispdir %{_datadir}/emacs/site-lisp %define tex_dir %{_datadir}/texmf/tex/latex/misc # Seems like setup only sets up the main file cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 %SOURCE10 . gunzip *.gz for f in *.tar; do tar xf $f done %build %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) # optimized binary ppc64 building does not work at the moment - the # log files are no real help, but we fail on bootstrap with the # optimized compiler: # # bin/coqtop.opt -boot -nois -compile theories/Init/Notations # # appears to be the command that dies. It appears that the status of # OCaml has been somewhat uncertain on ppc64, perhaps this is the cause? # However, bytecode compilation DOES work -> do this for now %ifarch ppc64 %define opt 0 %endif # Define opt flag based upon prior opt detection and restrictions %if %{opt} %define opt_option --opt %else %define opt_option --byte-only %endif bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all > /dev/null make world 2>/dev/null # Fix permissions in the documentation chmod -R a+rX refman stdlib %install rm -rf %{buildroot} make COQINSTALLPREFIX="%{buildroot}" install # Install desktop icon and menu entry %define coqdatadir %{_datadir}/coq %if %(test -d %{buildroot}%{coqdatadir} && echo 1 || echo 0) != 1 mkdir -p %{buildroot}%{coqdatadir} %endif cp coq-icon.png %{buildroot}%{coqdatadir} sed -i -e 's|ICON-LOCATION-BASE|%{coqdatadir}|' coqide.desktop desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications \ coqide.desktop # Install tutorial code %define tutorialcodedir %{coqdatadir}/tutorial %if %(test -d %{buildroot}%{tutorialcodedir} && echo 1 || echo 0) != 1 mkdir -p %{buildroot}%{tutorialcodedir} %endif mv RecTutorial.v %{buildroot}%{tutorialcodedir} %clean rm -rf %{buildroot} # Note: we want to keep both coqtop.opt and coqtop.byte because the # byte compiled version can be used to compile new version through # coqmktop %files %defattr(-,root,root,-) %doc CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL KNOWN-BUGS LICENSE README %doc %{_mandir}/man1/coq* %doc %{_mandir}/man1/gallina.1.gz %doc %{_mandir}/man1/parser.1.gz %{_datadir}/coq %{_bindir}/coq* %{_bindir}/gallina %{_bindir}/parser %if %{opt} %{_bindir}/parser.opt %endif # Exclude ide files to put in a separate package %exclude %{_bindir}/coqide* %exclude %{_datadir}/coq/ide %if %{opt} %exclude %{_datadir}/coq/*.cmxa %endif %{tex_dir}/coq* %files coqide %defattr(-,root,root,-) %doc INSTALL.ide %{_bindir}/coqide* %{_datadir}/coq/ide # Exclude a corrupted file from the tarball %exclude %{_datadir}/coq/ide/coq.png # Instead include a non-corrupted icon somewhere else %dir %{coqdatadir} %{coqdatadir}/coq-icon.png # Is it ok to assume this is what desktop-file-install renames coqide.desktop to? %{_datadir}/applications/fedora-coqide.desktop %files doc %defattr(-,root,root,-) %doc Coq-Library.pdf %doc Coq-Reference-Manual.pdf %doc Coq-Tutorial.v.pdf %doc Coq-RecTutorial.pdf %dir %{coqdatadir} %{tutorialcodedir} # Standard permissions with - in defattr make the manual unreadable... unknown how to fix %doc refman %doc stdlib %files emacs %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/coq* %doc README.coq-emacs %changelog * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. --- NEW FILE coqide.desktop --- [Desktop Entry] Encoding=UTF-8 Name=CoqIDE Comment=Examine and develop Coq .v files Exec=coqide Icon=ICON-LOCATION-BASE/coq-icon.png Type=Application Categories=Development; --- NEW FILE import.log --- coq-8_1pl3-1_fc9:HEAD:coq-8.1pl3-1.fc9.src.rpm:1216233878 makefile-strip.patch: --- NEW FILE makefile-strip.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-17 00:43:48.000000000 -0400 @@ -431,6 +431,7 @@ $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ str.cmxa unix.cmxa \ $(COQMKTOPCMX) $(OSDEPLIBS) + $(STRIP) $@ $(COQMKTOP): $(BESTCOQMKTOP) cd bin; ln -sf coqmktop.$(BEST)$(EXE) coqmktop$(EXE) @@ -457,6 +458,7 @@ $(COQCOPT): $(COQCCMX) $(COQTOPOPT) $(BESTCOQTOP) $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ unix.cmxa $(COQCCMX) $(OSDEPLIBS) + $(STRIP) $@ $(COQC): $(BESTCOQC) cd bin; ln -sf coqc.$(BEST)$(EXE) coqc$(EXE) @@ -746,6 +748,7 @@ bin/coq-interface.opt$(EXE): $(COQMKTOP) $(LINKCMX) $(LIBCOQRUN) $(USERTACCMX) $(INTERFACECMX) $(SHOW)'COQMKTOP -o $@' $(HIDE)$(COQMKTOP) -opt $(OPTFLAGS) -o $@ $(INTERFACECMX) + $(STRIP) $@ PARSERCODE=contrib/interface/line_parser.cmo contrib/interface/vtp.cmo \ contrib/interface/xlate.cmo contrib/interface/parse.cmo @@ -761,6 +764,7 @@ $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) -linkall $(OPTFLAGS) -o $@ \ $(LIBCOQRUN) $(CMXA) $(PARSERCMX) + $(STRIP) $@ INTERFACEVO= makefile.patch: --- NEW FILE makefile.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-16 09:48:05.000000000 -0400 @@ -1481,7 +1481,7 @@ parsing/grammar.cma: $(GRAMMARCMO) $(SHOW)'Testing $@' @touch test.ml4 - $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar + $(HIDE)$(OCAMLC) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar @rm -f test-grammar test.* $(SHOW)'OCAMLC -a $@' $(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/coq/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:48:21 -0000 1.1 +++ .cvsignore 16 Jul 2008 18:49:27 -0000 1.2 @@ -0,0 +1,7 @@ +Coq-Library.pdf.gz +Coq-RecTutorial.pdf.gz +Coq-Reference-Manual.pdf.gz +Coq-Tutorial.v.pdf.gz +coq-8.1pl3.tar.gz +coq-refman-html.tar.gz +coq-stdlib-html.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/coq/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:48:21 -0000 1.1 +++ sources 16 Jul 2008 18:49:27 -0000 1.2 @@ -0,0 +1,7 @@ +8b14a9c8f65ea5bd592901b3649346a7 Coq-Library.pdf.gz +0e3d5eac23416ec75dd59fabdcc1367c Coq-RecTutorial.pdf.gz +021c58a1f2e5d029928ffae0cc9703b0 Coq-Reference-Manual.pdf.gz +bcb4d1c4857bfdae5c22f8fc0be6853c Coq-Tutorial.v.pdf.gz +84311faf7865b2eab964990cdb365dca coq-8.1pl3.tar.gz +04285e3a76571db6e1d2fbe198c76120 coq-refman-html.tar.gz +17b1edf9122fd89c8b99d4e047b54fb8 coq-stdlib-html.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 18:55:55 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 16 Jul 2008 18:55:55 GMT Subject: rpms/paraview/F-9 paraview.spec,1.27,1.28 Message-ID: <200807161855.m6GIttUA007735@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/paraview/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7582 Modified Files: paraview.spec Log Message: Don't install mpi version of includes includes Index: paraview.spec =================================================================== RCS file: /cvs/pkgs/rpms/paraview/F-9/paraview.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- paraview.spec 16 Jul 2008 17:58:00 -0000 1.27 +++ paraview.spec 16 Jul 2008 18:53:25 -0000 1.28 @@ -201,7 +201,7 @@ mv $f ${f}-mpi done popd -mv $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin} $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin}-mpi +rm -rf $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin} rm -rf $RPM_BUILD_ROOT%{_mandir} #Remove mpi copy of documentation From fedora-extras-commits at redhat.com Wed Jul 16 18:59:07 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Wed, 16 Jul 2008 18:59:07 GMT Subject: rpms/coq/F-9 README.coq-emacs, NONE, 1.1 RecTutorial.v, NONE, 1.1 check.patch, NONE, 1.1 cmxa-install.patch, NONE, 1.1 coq-icon.png, NONE, 1.1 coq.spec, NONE, 1.1 coqide.desktop, NONE, 1.1 import.log, NONE, 1.1 makefile-strip.patch, NONE, 1.1 makefile.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161859.m6GIx7JY007899@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7806/F-9 Modified Files: .cvsignore sources Added Files: README.coq-emacs RecTutorial.v check.patch cmxa-install.patch coq-icon.png coq.spec coqide.desktop import.log makefile-strip.patch makefile.patch Log Message: Initial F-9 commit of supporting files for coq package. --- NEW FILE README.coq-emacs --- This is the Fedora coq-emacs package, which includes an emacs elisp file for usage with editing Coq .v files. --- NEW FILE RecTutorial.v --- Check (forall A:Type, (exists x:A, forall (y:A), x <> y) -> 2 = 3). Inductive nat : Set := | O : nat | S : nat->nat. Check nat. Check O. Check S. Reset nat. Print nat. Print le. Theorem zero_leq_three: 0 <= 3. Proof. constructor 2. constructor 2. constructor 2. constructor 1. Qed. Print zero_leq_three. Lemma zero_leq_three': 0 <= 3. repeat constructor. Qed. Lemma zero_lt_three : 0 < 3. Proof. repeat constructor. Qed. Print zero_lt_three. Require Import Relations. Locate clos_trans. (* alternate definition in style prior to V8.1 *) Section Transitive_Closure. Variable A : Type. Variable R : relation A. Inductive clos_trans : A -> A -> Prop := | t_step : forall x y:A, R x y -> clos_trans x y | t_trans : forall x y z:A, clos_trans x y -> clos_trans y z -> clos_trans x z. End Transitive_Closure. Require Import List. Print list. Check list. Check (nil (A:=nat)). Check (nil (A:= nat -> nat)). Check (fun A: Type => (cons (A:=A))). Check (cons 3 (cons 2 nil)). Check (nat :: bool ::nil). Check ((3<=4) :: True ::nil). Check (Prop::Set::nil). Require Import Bvector. Print vector. Check (Vnil nat). Check (fun (A:Type)(a:A)=> Vcons _ a _ (Vnil _)). Check (Vcons _ 5 _ (Vcons _ 3 _ (Vnil _))). Lemma eq_3_3 : 2 + 1 = 3. Proof. reflexivity. Qed. Print eq_3_3. Lemma eq_proof_proof : refl_equal (2*6) = refl_equal (3*4). Proof. reflexivity. Qed. Print eq_proof_proof. Lemma eq_lt_le : ( 2 < 4) = (3 <= 4). Proof. reflexivity. Qed. Lemma eq_nat_nat : nat = nat. Proof. reflexivity. Qed. Lemma eq_Set_Set : Set = Set. Proof. reflexivity. Qed. Lemma eq_Type_Type : Type = Type. Proof. reflexivity. Qed. Check (2 + 1 = 3). Check (Type = Type). Goal Type = Type. reflexivity. Qed. Print or. Print and. Print sumbool. Print ex. Require Import ZArith. Require Import Compare_dec. Check le_lt_dec. Definition max (n p :nat) := match le_lt_dec n p with | left _ => p | right _ => n end. Theorem le_max : forall n p, n <= p -> max n p = p. Proof. intros n p ; unfold max ; case (le_lt_dec n p); simpl. trivial. intros; absurd (p < p); eauto with arith. Qed. Extraction max. Inductive tree(A:Type) : Type := node : A -> forest A -> tree A with forest (A: Type) : Type := nochild : forest A | addchild : tree A -> forest A -> forest A. Inductive even : nat->Prop := evenO : even O | evenS : forall n, odd n -> even (S n) with odd : nat->Prop := oddS : forall n, even n -> odd (S n). Lemma odd_49 : odd (7 * 7). simpl; repeat constructor. Qed. Definition nat_case := fun (Q : Type)(g0 : Q)(g1 : nat -> Q)(n:nat) => match n return Q with | 0 => g0 | S p => g1 p end. Eval simpl in (nat_case nat 0 (fun p => p) 34). Eval simpl in (fun g0 g1 => nat_case nat g0 g1 34). Eval simpl in (fun g0 g1 => nat_case nat g0 g1 0). Definition pred (n:nat) := match n with O => O | S m => m end. Eval simpl in pred 56. Eval simpl in pred 0. Eval simpl in fun p => pred (S p). Definition xorb (b1 b2:bool) := match b1, b2 with | false, true => true | true, false => true | _ , _ => false end. Definition pred_spec (n:nat) := {m:nat | n=0 /\ m=0 \/ n = S m}. Definition predecessor : forall n:nat, pred_spec n. intro n;case n. unfold pred_spec;exists 0;auto. unfold pred_spec; intro n0;exists n0; auto. Defined. Print predecessor. Extraction predecessor. Theorem nat_expand : forall n:nat, n = match n with 0 => 0 | S p => S p end. intro n;case n;simpl;auto. Qed. Check (fun p:False => match p return 2=3 with end). Theorem fromFalse : False -> 0=1. intro absurd. contradiction. Qed. Section equality_elimination. Variables (A: Type) (a b : A) (p : a = b) (Q : A -> Type). Check (fun H : Q a => match p in (eq _ y) return Q y with refl_equal => H end). End equality_elimination. Theorem trans : forall n m p:nat, n=m -> m=p -> n=p. Proof. intros n m p eqnm. case eqnm. trivial. Qed. Lemma Rw : forall x y: nat, y = y * x -> y * x * x = y. intros x y e; do 2 rewrite <- e. reflexivity. Qed. Require Import Arith. Check mult_1_l. (* mult_1_l : forall n : nat, 1 * n = n *) Check mult_plus_distr_r. (* mult_plus_distr_r : forall n m p : nat, (n + m) * p = n * p + m * p *) Lemma mult_distr_S : forall n p : nat, n * p + p = (S n)* p. simpl;auto with arith. Qed. Lemma four_n : forall n:nat, n+n+n+n = 4*n. intro n;rewrite <- (mult_1_l n). Undo. intro n; pattern n at 1. rewrite <- mult_1_l. repeat rewrite mult_distr_S. trivial. Qed. Section Le_case_analysis. Variables (n p : nat) (H : n <= p) (Q : nat -> Prop) (H0 : Q n) (HS : forall m, n <= m -> Q (S m)). Check ( match H in (_ <= q) return (Q q) with | le_n => H0 | le_S m Hm => HS m Hm end ). End Le_case_analysis. Lemma predecessor_of_positive : forall n, 1 <= n -> exists p:nat, n = S p. Proof. intros n H; case H. exists 0; trivial. intros m Hm; exists m;trivial. Qed. Definition Vtail_total (A : Type) (n : nat) (v : vector A n) : vector A (pred n):= match v in (vector _ n0) return (vector A (pred n0)) with | Vnil => Vnil A | Vcons _ n0 v0 => v0 end. Definition Vtail' (A:Type)(n:nat)(v:vector A n) : vector A (pred n). intros A n v; case v. simpl. exact (Vnil A). simpl. auto. Defined. (* Inductive Lambda : Set := lambda : (Lambda -> False) -> Lambda. Error: Non strictly positive occurrence of "Lambda" in "(Lambda -> False) -> Lambda" *) Section Paradox. Variable Lambda : Set. Variable lambda : (Lambda -> False) ->Lambda. Variable matchL : Lambda -> forall Q:Prop, ((Lambda ->False) -> Q) -> Q. (* understand matchL Q l (fun h : Lambda -> False => t) as match l return Q with lambda h => t end *) Definition application (f x: Lambda) :False := matchL f False (fun h => h x). Definition Delta : Lambda := lambda (fun x : Lambda => application x x). Definition loop : False := application Delta Delta. Theorem two_is_three : 2 = 3. Proof. elim loop. Qed. End Paradox. Require Import ZArith. Inductive itree : Set := | ileaf : itree | inode : Z-> (nat -> itree) -> itree. Definition isingle l := inode l (fun i => ileaf). Definition t1 := inode 0 (fun n => isingle (Z_of_nat (2*n))). Definition t2 := inode 0 (fun n : nat => inode (Z_of_nat n) (fun p => isingle (Z_of_nat (n*p)))). Inductive itree_le : itree-> itree -> Prop := | le_leaf : forall t, itree_le ileaf t | le_node : forall l l' s s', Zle l l' -> (forall i, exists j:nat, itree_le (s i) (s' j)) -> itree_le (inode l s) (inode l' s'). Theorem itree_le_trans : forall t t', itree_le t t' -> forall t'', itree_le t' t'' -> itree_le t t''. induction t. constructor 1. intros t'; case t'. inversion 1. intros z0 i0 H0. intro t'';case t''. inversion 1. intros. inversion_clear H1. constructor 2. inversion_clear H0;eauto with zarith. inversion_clear H0. intro i2; case (H4 i2). intros. generalize (H i2 _ H0). intros. case (H3 x);intros. generalize (H5 _ H6). exists x0;auto. Qed. Inductive itree_le' : itree-> itree -> Prop := | le_leaf' : forall t, itree_le' ileaf t | le_node' : forall l l' s s' g, Zle l l' -> (forall i, itree_le' (s i) (s' (g i))) -> itree_le' (inode l s) (inode l' s'). Lemma t1_le_t2 : itree_le t1 t2. unfold t1, t2. constructor. auto with zarith. intro i; exists (2 * i). unfold isingle. constructor. auto with zarith. exists i;constructor. Qed. Lemma t1_le'_t2 : itree_le' t1 t2. unfold t1, t2. constructor 2 with (fun i : nat => 2 * i). auto with zarith. unfold isingle; intro i ; constructor 2 with (fun i :nat => i). auto with zarith. constructor . Qed. Require Import List. Inductive ltree (A:Set) : Set := lnode : A -> list (ltree A) -> ltree A. Inductive prop : Prop := prop_intro : Prop -> prop. Check (prop_intro prop). Inductive ex_Prop (P : Prop -> Prop) : Prop := exP_intro : forall X : Prop, P X -> ex_Prop P. Lemma ex_Prop_inhabitant : ex_Prop (fun P => P -> P). Proof. exists (ex_Prop (fun P => P -> P)). trivial. Qed. (* Check (fun (P:Prop->Prop)(p: ex_Prop P) => match p with exP_intro X HX => X end). Error: Incorrect elimination of "p" in the inductive type "ex_Prop", the return type has sort "Type" while it should be "Prop" Elimination of an inductive object of sort "Prop" is not allowed on a predicate in sort "Type" because proofs can be eliminated only to build proofs *) Inductive typ : Type := typ_intro : Type -> typ. Definition typ_inject: typ. split. exact typ. (* Defined. Error: Universe Inconsistency. *) Abort. (* Inductive aSet : Set := aSet_intro: Set -> aSet. User error: Large non-propositional inductive types must be in Type *) Inductive ex_Set (P : Set -> Prop) : Type := exS_intro : forall X : Set, P X -> ex_Set P. Inductive comes_from_the_left (P Q:Prop): P \/ Q -> Prop := c1 : forall p, comes_from_the_left P Q (or_introl (A:=P) Q p). Goal (comes_from_the_left _ _ (or_introl True I)). split. Qed. Goal ~(comes_from_the_left _ _ (or_intror True I)). red;inversion 1. (* discriminate H0. *) Abort. Reset comes_from_the_left. (* Definition comes_from_the_left (P Q:Prop)(H:P \/ Q): Prop := match H with | or_introl p => True | or_intror q => False end. Error: Incorrect elimination of "H" in the inductive type "or", the return type has sort "Type" while it should be "Prop" Elimination of an inductive object of sort "Prop" is not allowed on a predicate in sort "Type" because proofs can be eliminated only to build proofs *) Definition comes_from_the_left_sumbool (P Q:Prop)(x:{P}+{Q}): Prop := match x with | left p => True | right q => False end. Close Scope Z_scope. Theorem S_is_not_O : forall n, S n <> 0. Definition Is_zero (x:nat):= match x with | 0 => True | _ => False end. Lemma O_is_zero : forall m, m = 0 -> Is_zero m. Proof. intros m H; subst m. (* ============================ Is_zero 0 *) simpl;trivial. Qed. red; intros n Hn. apply O_is_zero with (m := S n). assumption. Qed. Theorem disc2 : forall n, S (S n) <> 1. Proof. intros n Hn; discriminate. Qed. Theorem disc3 : forall n, S (S n) = 0 -> forall Q:Prop, Q. Proof. intros n Hn Q. discriminate. Qed. Theorem inj_succ : forall n m, S n = S m -> n = m. Proof. Lemma inj_pred : forall n m, n = m -> pred n = pred m. Proof. intros n m eq_n_m. rewrite eq_n_m. trivial. Qed. intros n m eq_Sn_Sm. apply inj_pred with (n:= S n) (m := S m); assumption. Qed. Lemma list_inject : forall (A:Type)(a b :A)(l l':list A), a :: b :: l = b :: a :: l' -> a = b /\ l = l'. Proof. intros A a b l l' e. injection e. auto. Qed. Theorem not_le_Sn_0 : forall n:nat, ~ (S n <= 0). Proof. red; intros n H. case H. Undo. Lemma not_le_Sn_0_with_constraints : forall n p , S n <= p -> p = 0 -> False. Proof. intros n p H; case H ; intros; discriminate. Qed. eapply not_le_Sn_0_with_constraints; eauto. Qed. Theorem not_le_Sn_0' : forall n:nat, ~ (S n <= 0). Proof. red; intros n H ; inversion H. Qed. Derive Inversion le_Sn_0_inv with (forall n :nat, S n <= 0). Check le_Sn_0_inv. Theorem le_Sn_0'' : forall n p : nat, ~ S n <= 0 . Proof. intros n p H; inversion H using le_Sn_0_inv. Qed. Derive Inversion_clear le_Sn_0_inv' with (forall n :nat, S n <= 0). Check le_Sn_0_inv'. Theorem le_reverse_rules : forall n m:nat, n <= m -> n = m \/ exists p, n <= p /\ m = S p. Proof. intros n m H; inversion H. left;trivial. right; exists m0; split; trivial. Restart. intros n m H; inversion_clear H. left;trivial. right; exists m0; split; trivial. Qed. Inductive ArithExp : Set := Zero : ArithExp | Succ : ArithExp -> ArithExp | Plus : ArithExp -> ArithExp -> ArithExp. Inductive RewriteRel : ArithExp -> ArithExp -> Prop := RewSucc : forall e1 e2 :ArithExp, RewriteRel e1 e2 -> RewriteRel (Succ e1) (Succ e2) | RewPlus0 : forall e:ArithExp, RewriteRel (Plus Zero e) e | RewPlusS : forall e1 e2:ArithExp, RewriteRel e1 e2 -> RewriteRel (Plus (Succ e1) e2) (Succ (Plus e1 e2)). Fixpoint plus (n p:nat) {struct n} : nat := match n with | 0 => p | S m => S (plus m p) end. Fixpoint plus' (n p:nat) {struct p} : nat := match p with | 0 => n | S q => S (plus' n q) end. Fixpoint plus'' (n p:nat) {struct n} : nat := match n with | 0 => p | S m => plus'' m (S p) end. Fixpoint even_test (n:nat) : bool := match n with 0 => true | 1 => false | S (S p) => even_test p end. Reset even_test. Fixpoint even_test (n:nat) : bool := match n with | 0 => true | S p => odd_test p end with odd_test (n:nat) : bool := match n with | 0 => false | S p => even_test p end. Eval simpl in even_test. Eval simpl in (fun x : nat => even_test x). Eval simpl in (fun x : nat => plus 5 x). Eval simpl in (fun x : nat => even_test (plus 5 x)). Eval simpl in (fun x : nat => even_test (plus x 5)). Section Principle_of_Induction. Variable P : nat -> Prop. Hypothesis base_case : P 0. Hypothesis inductive_step : forall n:nat, P n -> P (S n). Fixpoint nat_ind (n:nat) : (P n) := match n return P n with | 0 => base_case | S m => inductive_step m (nat_ind m) end. End Principle_of_Induction. Scheme Even_induction := Minimality for even Sort Prop with Odd_induction := Minimality for odd Sort Prop. Theorem even_plus_four : forall n:nat, even n -> even (4+n). Proof. intros n H. elim H using Even_induction with (P0 := fun n => odd (4+n)); simpl;repeat constructor;assumption. Qed. Section Principle_of_Double_Induction. Variable P : nat -> nat ->Prop. Hypothesis base_case1 : forall x:nat, P 0 x. Hypothesis base_case2 : forall x:nat, P (S x) 0. Hypothesis inductive_step : forall n m:nat, P n m -> P (S n) (S m). Fixpoint nat_double_ind (n m:nat){struct n} : P n m := match n, m return P n m with | 0 , x => base_case1 x | (S x), 0 => base_case2 x | (S x), (S y) => inductive_step x y (nat_double_ind x y) end. End Principle_of_Double_Induction. Section Principle_of_Double_Recursion. Variable P : nat -> nat -> Type. Hypothesis base_case1 : forall x:nat, P 0 x. Hypothesis base_case2 : forall x:nat, P (S x) 0. Hypothesis inductive_step : forall n m:nat, P n m -> P (S n) (S m). Fixpoint nat_double_rect (n m:nat){struct n} : P n m := match n, m return P n m with | 0 , x => base_case1 x | (S x), 0 => base_case2 x | (S x), (S y) => inductive_step x y (nat_double_rect x y) end. End Principle_of_Double_Recursion. Definition min : nat -> nat -> nat := nat_double_rect (fun (x y:nat) => nat) (fun (x:nat) => 0) (fun (y:nat) => 0) (fun (x y r:nat) => S r). Eval compute in (min 5 8). Eval compute in (min 8 5). Lemma not_circular : forall n:nat, n <> S n. Proof. intro n. apply nat_ind with (P:= fun n => n <> S n). discriminate. red; intros n0 Hn0 eqn0Sn0;injection eqn0Sn0;trivial. Qed. Definition eq_nat_dec : forall n p:nat , {n=p}+{n <> p}. Proof. intros n p. apply nat_double_rect with (P:= fun (n q:nat) => {q=p}+{q <> p}). Undo. pattern p,n. elim n using nat_double_rect. destruct x; auto. destruct x; auto. intros n0 m H; case H. intro eq; rewrite eq ; auto. intro neg; right; red ; injection 1; auto. Defined. Definition eq_nat_dec' : forall n p:nat, {n=p}+{n <> p}. decide equality. Defined. Require Import Minus. (* Fixpoint div (x y:nat){struct x}: nat := if eq_nat_dec x 0 then 0 else if eq_nat_dec y 0 then x else S (div (x-y) y). Error: Recursive definition of div is ill-formed. In environment div : nat -> nat -> nat x : nat y : nat _ : x <> 0 _ : y <> 0 Recursive call to div has principal argument equal to "x - y" instead of a subterm of x *) Lemma minus_smaller_S: forall x y:nat, x - y < S x. Proof. intros x y; pattern y, x; elim x using nat_double_ind. destruct x0; auto with arith. simpl; auto with arith. simpl; auto with arith. Qed. Lemma minus_smaller_positive : forall x y:nat, x <>0 -> y <> 0 -> x - y < x. Proof. destruct x; destruct y; ( simpl;intros; apply minus_smaller_S || intros; absurd (0=0); auto). Qed. Definition minus_decrease : forall x y:nat, Acc lt x -> x <> 0 -> y <> 0 -> Acc lt (x-y). Proof. intros x y H; case H. intros Hz posz posy. apply Hz; apply minus_smaller_positive; assumption. Defined. Print minus_decrease. Definition div_aux (x y:nat)(H: Acc lt x):nat. fix 3. intros. refine (if eq_nat_dec x 0 then 0 else if eq_nat_dec y 0 then y else div_aux (x-y) y _). apply (minus_decrease x y H);assumption. Defined. Print div_aux. (* div_aux = (fix div_aux (x y : nat) (H : Acc lt x) {struct H} : nat := match eq_nat_dec x 0 with | left _ => 0 | right _ => match eq_nat_dec y 0 with | left _ => y | right _0 => div_aux (x - y) y (minus_decrease x y H _ _0) end end) : forall x : nat, nat -> Acc lt x -> nat *) Require Import Wf_nat. Definition div x y := div_aux x y (lt_wf x). Extraction div. (* let div x y = div_aux x y *) Extraction div_aux. (* let rec div_aux x y = match eq_nat_dec x O with | Left -> O | Right -> (match eq_nat_dec y O with | Left -> y | Right -> div_aux (minus x y) y) *) Lemma vector0_is_vnil : forall (A:Type)(v:vector A 0), v = Vnil A. Proof. intros A v;inversion v. Abort. (* Lemma vector0_is_vnil_aux : forall (A:Type)(n:nat)(v:vector A n), n= 0 -> v = Vnil A. Toplevel input, characters 40281-40287 > Lemma vector0_is_vnil_aux : forall (A:Set)(n:nat)(v:vector A n), n= 0 -> v = Vnil A. > ^^^^^^ Error: In environment A : Set n : nat v : vector A n e : n = 0 The term "Vnil A" has type "vector A 0" while it is expected to have type "vector A n" *) Require Import JMeq. (* On devrait changer Set en Type ? *) Lemma vector0_is_vnil_aux : forall (A:Type)(n:nat)(v:vector A n), n= 0 -> JMeq v (Vnil A). Proof. destruct v. auto. intro; discriminate. Qed. Lemma vector0_is_vnil : forall (A:Type)(v:vector A 0), v = Vnil A. Proof. intros a v;apply JMeq_eq. apply vector0_is_vnil_aux. trivial. Qed. Implicit Arguments Vcons [A n]. Implicit Arguments Vnil [A]. Implicit Arguments Vhead [A n]. Implicit Arguments Vtail [A n]. Definition Vid : forall (A : Type)(n:nat), vector A n -> vector A n. Proof. destruct n; intro v. exact Vnil. exact (Vcons (Vhead v) (Vtail v)). Defined. Eval simpl in (fun (A:Type)(v:vector A 0) => (Vid _ _ v)). Eval simpl in (fun (A:Type)(v:vector A 0) => v). Lemma Vid_eq : forall (n:nat) (A:Type)(v:vector A n), v=(Vid _ n v). Proof. destruct v. reflexivity. reflexivity. Defined. Theorem zero_nil : forall A (v:vector A 0), v = Vnil. Proof. intros. change (Vnil (A:=A)) with (Vid _ 0 v). apply Vid_eq. Defined. Theorem decomp : forall (A : Type) (n : nat) (v : vector A (S n)), v = Vcons (Vhead v) (Vtail v). Proof. intros. change (Vcons (Vhead v) (Vtail v)) with (Vid _ (S n) v). apply Vid_eq. Defined. Definition vector_double_rect : forall (A:Type) (P: forall (n:nat),(vector A n)->(vector A n) -> Type), P 0 Vnil Vnil -> (forall n (v1 v2 : vector A n) a b, P n v1 v2 -> P (S n) (Vcons a v1) (Vcons b v2)) -> forall n (v1 v2 : vector A n), P n v1 v2. induction n. intros; rewrite (zero_nil _ v1); rewrite (zero_nil _ v2). auto. intros v1 v2; rewrite (decomp _ _ v1);rewrite (decomp _ _ v2). apply X0; auto. Defined. Require Import Bool. Definition bitwise_or n v1 v2 : vector bool n := vector_double_rect bool (fun n v1 v2 => vector bool n) Vnil (fun n v1 v2 a b r => Vcons (orb a b) r) n v1 v2. Fixpoint vector_nth (A:Type)(n:nat)(p:nat)(v:vector A p){struct v} : option A := match n,v with _ , Vnil => None | 0 , Vcons b _ _ => Some b | S n', Vcons _ p' v' => vector_nth A n' p' v' end. Implicit Arguments vector_nth [A p]. Lemma nth_bitwise : forall (n:nat) (v1 v2: vector bool n) i a b, vector_nth i v1 = Some a -> vector_nth i v2 = Some b -> vector_nth i (bitwise_or _ v1 v2) = Some (orb a b). Proof. intros n v1 v2; pattern n,v1,v2. apply vector_double_rect. simpl. destruct i; discriminate 1. destruct i; simpl;auto. injection 1; injection 2;intros; subst a; subst b; auto. Qed. Set Implicit Arguments. CoInductive Stream (A:Type) : Type := | Cons : A -> Stream A -> Stream A. CoInductive LList (A: Type) : Type := | LNil : LList A | LCons : A -> LList A -> LList A. Definition head (A:Type)(s : Stream A) := match s with Cons a s' => a end. Definition tail (A : Type)(s : Stream A) := match s with Cons a s' => s' end. CoFixpoint repeat (A:Type)(a:A) : Stream A := Cons a (repeat a). CoFixpoint iterate (A: Type)(f: A -> A)(a : A) : Stream A:= Cons a (iterate f (f a)). CoFixpoint map (A B:Type)(f: A -> B)(s : Stream A) : Stream B:= match s with Cons a tl => Cons (f a) (map f tl) end. Eval simpl in (fun (A:Type)(a:A) => repeat a). Eval simpl in (fun (A:Type)(a:A) => head (repeat a)). CoInductive EqSt (A: Type) : Stream A -> Stream A -> Prop := eqst : forall s1 s2: Stream A, head s1 = head s2 -> EqSt (tail s1) (tail s2) -> EqSt s1 s2. Section Parks_Principle. Variable A : Type. Variable R : Stream A -> Stream A -> Prop. Hypothesis bisim1 : forall s1 s2:Stream A, R s1 s2 -> head s1 = head s2. Hypothesis bisim2 : forall s1 s2:Stream A, R s1 s2 -> R (tail s1) (tail s2). CoFixpoint park_ppl : forall s1 s2:Stream A, R s1 s2 -> EqSt s1 s2 := fun s1 s2 (p : R s1 s2) => eqst s1 s2 (bisim1 p) (park_ppl (bisim2 p)). End Parks_Principle. Theorem map_iterate : forall (A:Type)(f:A->A)(x:A), EqSt (iterate f (f x)) (map f (iterate f x)). Proof. intros A f x. apply park_ppl with (R:= fun s1 s2 => exists x: A, s1 = iterate f (f x) /\ s2 = map f (iterate f x)). intros s1 s2 (x0,(eqs1,eqs2));rewrite eqs1;rewrite eqs2;reflexivity. intros s1 s2 (x0,(eqs1,eqs2)). exists (f x0);split;[rewrite eqs1|rewrite eqs2]; reflexivity. exists x;split; reflexivity. Qed. Ltac infiniteproof f := cofix f; constructor; [clear f| simpl; try (apply f; clear f)]. Theorem map_iterate' : forall (A:Type)(f:A->A)(x:A), EqSt (iterate f (f x)) (map f (iterate f x)). infiniteproof map_iterate'. reflexivity. Qed. Implicit Arguments LNil [A]. Lemma Lnil_not_Lcons : forall (A:Type)(a:A)(l:LList A), LNil <> (LCons a l). intros;discriminate. Qed. Lemma injection_demo : forall (A:Type)(a b : A)(l l': LList A), LCons a (LCons b l) = LCons b (LCons a l') -> a = b /\ l = l'. Proof. intros A a b l l' e; injection e; auto. Qed. Inductive Finite (A:Type) : LList A -> Prop := | Lnil_fin : Finite (LNil (A:=A)) | Lcons_fin : forall a l, Finite l -> Finite (LCons a l). CoInductive Infinite (A:Type) : LList A -> Prop := | LCons_inf : forall a l, Infinite l -> Infinite (LCons a l). Lemma LNil_not_Infinite : forall (A:Type), ~ Infinite (LNil (A:=A)). Proof. intros A H;inversion H. Qed. Lemma Finite_not_Infinite : forall (A:Type)(l:LList A), Finite l -> ~ Infinite l. Proof. intros A l H; elim H. apply LNil_not_Infinite. intros a l0 F0 I0' I1. case I0'; inversion_clear I1. trivial. Qed. Lemma Not_Finite_Infinite : forall (A:Type)(l:LList A), ~ Finite l -> Infinite l. Proof. cofix H. destruct l. intro; absurd (Finite (LNil (A:=A)));[auto|constructor]. constructor. apply H. red; intro H1;case H0. constructor. trivial. Qed. check.patch: --- NEW FILE check.patch --- --- test-suite/check 2008-06-17 09:18:42.000000000 -0400 +++ test-suite/check 2008-06-17 09:19:11.000000000 -0400 @@ -52,7 +52,7 @@ nbtests=`expr $nbtests + 1` printf " "$f"..." tmpoutput=`mktemp /tmp/coqcheck.XXXXXX` - $command $f 2>&1 | grep -v "Welcome to Coq" | grep -v "Skipping rcfile loading" > $tmpoutput + $command $f 2>&1 | grep -v "Welcome to Coq" | grep -v "Skipping rcfile loading" | grep -v "some rule has been masked" > $tmpoutput foutput=`dirname $f`/`basename $f .v`.out diff $tmpoutput $foutput >& /dev/null if [ $? = 0 ]; then cmxa-install.patch: --- NEW FILE cmxa-install.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-16 10:58:38.000000000 -0400 @@ -1271,7 +1271,12 @@ parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \ parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma -OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +ifeq ($(BEST),opt) + OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +else + OBJECTCMXA= +endif + install-library: $(MKDIR) $(FULLCOQLIB) --- NEW FILE coq.spec --- # Upstream includes option for generation of optimized binaries, # however, specifically generates bytecode versions for certain # executables even when optimized option is set, namely the following: # coq-tex, coq_makefile, coq-interface, coqwc, coqdoc, parser, coqdep, # gallina # (coqtop.byte, coqide.byte binaries are also made available.) # .coqide-gtk2rc also produces an rpmlint warning due to its name, # however, this name is proper as per the Coq documentation # Disable creation of the debug package: if bytecode executables are # created find-debuginfo.sh will ruin them, while if optimized # executables are created they will be stripped by the Makefile # anyway, thus we won't get anything useful from the debug info # package creation. # # It appears as though ALL of these are necessary to prevent unwanted # stripping %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %define _enable_debug_package 0 %define debug_package %{nil} Name: coq Version: 8.1pl3 Release: 1%{?dist} Summary: Coq proof management system Group: Applications/Engineering License: LGPLv2 URL: http://coq.inria.fr/ Source0: http://coq.inria.fr/V%{version}/files/coq-%{version}.tar.gz Source1: Coq-Library.pdf.gz Source2: Coq-Reference-Manual.pdf.gz Source3: Coq-Tutorial.v.pdf.gz Source4: Coq-RecTutorial.pdf.gz Source5: coq-refman-html.tar.gz Source6: coq-stdlib-html.tar.gz Source7: RecTutorial.v Source8: coqide.desktop Source9: coq-icon.png Source10: README.coq-emacs Patch0: makefile.patch Patch1: cmxa-install.patch Patch2: makefile-strip.patch Patch3: check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, texlive-latex, texlive-texmf # ExcludeArch: ppc64 %description Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides the main Coq binary without an optional IDE, Coqide. # The IDE's package name will become "coq-coqide". That way, # searching for either "coqide" (the Ubuntu/Debian package name, and # also the full name of the IDE) or "coq" and "ide" will find # this. (If the package were named "coq-ide", the former would fail.) %package coqide Group: Applications/Engineering Summary: Coqide IDE for Coq proof management system Requires: coq %description coqide Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides Coqide, a lightweight IDE for Coq. %package doc Group: Applications/Engineering Summary: Documentation for Coq proof management system %description doc Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides documentation and tutorials for the system. The main documentation comes in two parts: the main Library documentation, which decribes all Coq.* modules, and the Reference Manual, which gives a more complete description of the whole system. Included are also HTML versions of both. Furthermore, there are two tutorials, the main one, and one specifically on recursive types. The example code for the latter is also included. %package emacs Group: Applications/Engineering Summary: Elisp files for Coq proof management system Requires: coq, emacs %description emacs Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides emacs mode files for formatting Coq input. %prep %setup -q # Patch description: # Considered each of the seven patches from the Debian Coq package: # Credit goes to the Debian patch creators for their patches # (See http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/patches/?rev=0&sc=0) # # For most patches I merely reproduced the results in non-dpatch # form. I opted for no patching in cases where it did not seem # necessary or immediately correct. # # - browser.dpatch: changes firefox option for linux, however, link # x-www-browser does not exist in Fedora setup, and changing this # option does not actually fix the problem in the IDE wherein a # browser window needs to be open in order to actually open any help # file -> do not change until the real source of the problem can be # detected # - check.dpatch: suppress a test warning, similar change made in my # check.patch # - cmxa-install.dpatch: fixes cmxa install by testing for opt, similar # change made in cmxa-install.patch # - configure.dpatch: fixes detection of ocamlopt - We do this detection # seperately anyway in this RPM, no change made # - coqdoc_stdlib.dpatch: extra documentation option - Perhaps do this # in the future, but for now, no change made # - makefile.dpatch: fix testing on non-native architecture compiles, similar change made in makefile.patch # - no-complexity-test.dpatch: turn off some of the tests - Perhaps this # change was made due to a failure in complexity tests when they # "don't run quickly enough", which is likely to be incredibly # variable, but unsure, so no change made %patch0 %patch1 # I created patch3 to consistently strip native-code binaries, unlike # the inconsistent way it was done in the original makefile %patch2 # This patch may not be strictly necessary unless the tests are # incorporated into the build process somehow. However, the tests don't # work properly without it. %patch3 # Fix some files that are not in UTF-8 encoding for f in CHANGES CREDITS COPYRIGHT; do mv $f $f.old; iconv -f ISO-8859-1 -t UTF-8 < $f.old > $f; rm $f.old done %define emacs_lispdir %{_datadir}/emacs/site-lisp %define tex_dir %{_datadir}/texmf/tex/latex/misc # Seems like setup only sets up the main file cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 %SOURCE10 . gunzip *.gz for f in *.tar; do tar xf $f done %build %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) # optimized binary ppc64 building does not work at the moment - the # log files are no real help, but we fail on bootstrap with the # optimized compiler: # # bin/coqtop.opt -boot -nois -compile theories/Init/Notations # # appears to be the command that dies. It appears that the status of # OCaml has been somewhat uncertain on ppc64, perhaps this is the cause? # However, bytecode compilation DOES work -> do this for now %ifarch ppc64 %define opt 0 %endif # Define opt flag based upon prior opt detection and restrictions %if %{opt} %define opt_option --opt %else %define opt_option --byte-only %endif bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all > /dev/null make world 2>/dev/null # Fix permissions in the documentation chmod -R a+rX refman stdlib %install rm -rf %{buildroot} make COQINSTALLPREFIX="%{buildroot}" install # Install desktop icon and menu entry %define coqdatadir %{_datadir}/coq %if %(test -d %{buildroot}%{coqdatadir} && echo 1 || echo 0) != 1 mkdir -p %{buildroot}%{coqdatadir} %endif cp coq-icon.png %{buildroot}%{coqdatadir} sed -i -e 's|ICON-LOCATION-BASE|%{coqdatadir}|' coqide.desktop desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications \ coqide.desktop # Install tutorial code %define tutorialcodedir %{coqdatadir}/tutorial %if %(test -d %{buildroot}%{tutorialcodedir} && echo 1 || echo 0) != 1 mkdir -p %{buildroot}%{tutorialcodedir} %endif mv RecTutorial.v %{buildroot}%{tutorialcodedir} %clean rm -rf %{buildroot} # Note: we want to keep both coqtop.opt and coqtop.byte because the # byte compiled version can be used to compile new version through # coqmktop %files %defattr(-,root,root,-) %doc CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL KNOWN-BUGS LICENSE README %doc %{_mandir}/man1/coq* %doc %{_mandir}/man1/gallina.1.gz %doc %{_mandir}/man1/parser.1.gz %{_datadir}/coq %{_bindir}/coq* %{_bindir}/gallina %{_bindir}/parser %if %{opt} %{_bindir}/parser.opt %endif # Exclude ide files to put in a separate package %exclude %{_bindir}/coqide* %exclude %{_datadir}/coq/ide %if %{opt} %exclude %{_datadir}/coq/*.cmxa %endif %{tex_dir}/coq* %files coqide %defattr(-,root,root,-) %doc INSTALL.ide %{_bindir}/coqide* %{_datadir}/coq/ide # Exclude a corrupted file from the tarball %exclude %{_datadir}/coq/ide/coq.png # Instead include a non-corrupted icon somewhere else %dir %{coqdatadir} %{coqdatadir}/coq-icon.png # Is it ok to assume this is what desktop-file-install renames coqide.desktop to? %{_datadir}/applications/fedora-coqide.desktop %files doc %defattr(-,root,root,-) %doc Coq-Library.pdf %doc Coq-Reference-Manual.pdf %doc Coq-Tutorial.v.pdf %doc Coq-RecTutorial.pdf %dir %{coqdatadir} %{tutorialcodedir} # Standard permissions with - in defattr make the manual unreadable... unknown how to fix %doc refman %doc stdlib %files emacs %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/coq* %doc README.coq-emacs %changelog * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. --- NEW FILE coqide.desktop --- [Desktop Entry] Encoding=UTF-8 Name=CoqIDE Comment=Examine and develop Coq .v files Exec=coqide Icon=ICON-LOCATION-BASE/coq-icon.png Type=Application Categories=Development; --- NEW FILE import.log --- coq-8_1pl3-1_fc9:F-9:coq-8.1pl3-1.fc9.src.rpm:1216234547 makefile-strip.patch: --- NEW FILE makefile-strip.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-17 00:43:48.000000000 -0400 @@ -431,6 +431,7 @@ $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ str.cmxa unix.cmxa \ $(COQMKTOPCMX) $(OSDEPLIBS) + $(STRIP) $@ $(COQMKTOP): $(BESTCOQMKTOP) cd bin; ln -sf coqmktop.$(BEST)$(EXE) coqmktop$(EXE) @@ -457,6 +458,7 @@ $(COQCOPT): $(COQCCMX) $(COQTOPOPT) $(BESTCOQTOP) $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ unix.cmxa $(COQCCMX) $(OSDEPLIBS) + $(STRIP) $@ $(COQC): $(BESTCOQC) cd bin; ln -sf coqc.$(BEST)$(EXE) coqc$(EXE) @@ -746,6 +748,7 @@ bin/coq-interface.opt$(EXE): $(COQMKTOP) $(LINKCMX) $(LIBCOQRUN) $(USERTACCMX) $(INTERFACECMX) $(SHOW)'COQMKTOP -o $@' $(HIDE)$(COQMKTOP) -opt $(OPTFLAGS) -o $@ $(INTERFACECMX) + $(STRIP) $@ PARSERCODE=contrib/interface/line_parser.cmo contrib/interface/vtp.cmo \ contrib/interface/xlate.cmo contrib/interface/parse.cmo @@ -761,6 +764,7 @@ $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) -linkall $(OPTFLAGS) -o $@ \ $(LIBCOQRUN) $(CMXA) $(PARSERCMX) + $(STRIP) $@ INTERFACEVO= makefile.patch: --- NEW FILE makefile.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-16 09:48:05.000000000 -0400 @@ -1481,7 +1481,7 @@ parsing/grammar.cma: $(GRAMMARCMO) $(SHOW)'Testing $@' @touch test.ml4 - $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar + $(HIDE)$(OCAMLC) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar @rm -f test-grammar test.* $(SHOW)'OCAMLC -a $@' $(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:48:21 -0000 1.1 +++ .cvsignore 16 Jul 2008 18:58:22 -0000 1.2 @@ -0,0 +1,7 @@ +Coq-Library.pdf.gz +Coq-RecTutorial.pdf.gz +Coq-Reference-Manual.pdf.gz +Coq-Tutorial.v.pdf.gz +coq-8.1pl3.tar.gz +coq-refman-html.tar.gz +coq-stdlib-html.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:48:21 -0000 1.1 +++ sources 16 Jul 2008 18:58:22 -0000 1.2 @@ -0,0 +1,7 @@ +8b14a9c8f65ea5bd592901b3649346a7 Coq-Library.pdf.gz +0e3d5eac23416ec75dd59fabdcc1367c Coq-RecTutorial.pdf.gz +021c58a1f2e5d029928ffae0cc9703b0 Coq-Reference-Manual.pdf.gz +bcb4d1c4857bfdae5c22f8fc0be6853c Coq-Tutorial.v.pdf.gz +84311faf7865b2eab964990cdb365dca coq-8.1pl3.tar.gz +04285e3a76571db6e1d2fbe198c76120 coq-refman-html.tar.gz +17b1edf9122fd89c8b99d4e047b54fb8 coq-stdlib-html.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 19:05:57 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Wed, 16 Jul 2008 19:05:57 GMT Subject: rpms/coq/F-8 README.coq-emacs, NONE, 1.1 RecTutorial.v, NONE, 1.1 check.patch, NONE, 1.1 cmxa-install.patch, NONE, 1.1 coq-icon.png, NONE, 1.1 coq.spec, NONE, 1.1 coqide.desktop, NONE, 1.1 import.log, NONE, 1.1 makefile-strip.patch, NONE, 1.1 makefile.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161905.m6GJ5vGF015042@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14969/F-8 Modified Files: .cvsignore sources Added Files: README.coq-emacs RecTutorial.v check.patch cmxa-install.patch coq-icon.png coq.spec coqide.desktop import.log makefile-strip.patch makefile.patch Log Message: Initial commit of F-8 branch of supporting files for coq package. --- NEW FILE README.coq-emacs --- This is the Fedora coq-emacs package, which includes an emacs elisp file for usage with editing Coq .v files. --- NEW FILE RecTutorial.v --- Check (forall A:Type, (exists x:A, forall (y:A), x <> y) -> 2 = 3). Inductive nat : Set := | O : nat | S : nat->nat. Check nat. Check O. Check S. Reset nat. Print nat. Print le. Theorem zero_leq_three: 0 <= 3. Proof. constructor 2. constructor 2. constructor 2. constructor 1. Qed. Print zero_leq_three. Lemma zero_leq_three': 0 <= 3. repeat constructor. Qed. Lemma zero_lt_three : 0 < 3. Proof. repeat constructor. Qed. Print zero_lt_three. Require Import Relations. Locate clos_trans. (* alternate definition in style prior to V8.1 *) Section Transitive_Closure. Variable A : Type. Variable R : relation A. Inductive clos_trans : A -> A -> Prop := | t_step : forall x y:A, R x y -> clos_trans x y | t_trans : forall x y z:A, clos_trans x y -> clos_trans y z -> clos_trans x z. End Transitive_Closure. Require Import List. Print list. Check list. Check (nil (A:=nat)). Check (nil (A:= nat -> nat)). Check (fun A: Type => (cons (A:=A))). Check (cons 3 (cons 2 nil)). Check (nat :: bool ::nil). Check ((3<=4) :: True ::nil). Check (Prop::Set::nil). Require Import Bvector. Print vector. Check (Vnil nat). Check (fun (A:Type)(a:A)=> Vcons _ a _ (Vnil _)). Check (Vcons _ 5 _ (Vcons _ 3 _ (Vnil _))). Lemma eq_3_3 : 2 + 1 = 3. Proof. reflexivity. Qed. Print eq_3_3. Lemma eq_proof_proof : refl_equal (2*6) = refl_equal (3*4). Proof. reflexivity. Qed. Print eq_proof_proof. Lemma eq_lt_le : ( 2 < 4) = (3 <= 4). Proof. reflexivity. Qed. Lemma eq_nat_nat : nat = nat. Proof. reflexivity. Qed. Lemma eq_Set_Set : Set = Set. Proof. reflexivity. Qed. Lemma eq_Type_Type : Type = Type. Proof. reflexivity. Qed. Check (2 + 1 = 3). Check (Type = Type). Goal Type = Type. reflexivity. Qed. Print or. Print and. Print sumbool. Print ex. Require Import ZArith. Require Import Compare_dec. Check le_lt_dec. Definition max (n p :nat) := match le_lt_dec n p with | left _ => p | right _ => n end. Theorem le_max : forall n p, n <= p -> max n p = p. Proof. intros n p ; unfold max ; case (le_lt_dec n p); simpl. trivial. intros; absurd (p < p); eauto with arith. Qed. Extraction max. Inductive tree(A:Type) : Type := node : A -> forest A -> tree A with forest (A: Type) : Type := nochild : forest A | addchild : tree A -> forest A -> forest A. Inductive even : nat->Prop := evenO : even O | evenS : forall n, odd n -> even (S n) with odd : nat->Prop := oddS : forall n, even n -> odd (S n). Lemma odd_49 : odd (7 * 7). simpl; repeat constructor. Qed. Definition nat_case := fun (Q : Type)(g0 : Q)(g1 : nat -> Q)(n:nat) => match n return Q with | 0 => g0 | S p => g1 p end. Eval simpl in (nat_case nat 0 (fun p => p) 34). Eval simpl in (fun g0 g1 => nat_case nat g0 g1 34). Eval simpl in (fun g0 g1 => nat_case nat g0 g1 0). Definition pred (n:nat) := match n with O => O | S m => m end. Eval simpl in pred 56. Eval simpl in pred 0. Eval simpl in fun p => pred (S p). Definition xorb (b1 b2:bool) := match b1, b2 with | false, true => true | true, false => true | _ , _ => false end. Definition pred_spec (n:nat) := {m:nat | n=0 /\ m=0 \/ n = S m}. Definition predecessor : forall n:nat, pred_spec n. intro n;case n. unfold pred_spec;exists 0;auto. unfold pred_spec; intro n0;exists n0; auto. Defined. Print predecessor. Extraction predecessor. Theorem nat_expand : forall n:nat, n = match n with 0 => 0 | S p => S p end. intro n;case n;simpl;auto. Qed. Check (fun p:False => match p return 2=3 with end). Theorem fromFalse : False -> 0=1. intro absurd. contradiction. Qed. Section equality_elimination. Variables (A: Type) (a b : A) (p : a = b) (Q : A -> Type). Check (fun H : Q a => match p in (eq _ y) return Q y with refl_equal => H end). End equality_elimination. Theorem trans : forall n m p:nat, n=m -> m=p -> n=p. Proof. intros n m p eqnm. case eqnm. trivial. Qed. Lemma Rw : forall x y: nat, y = y * x -> y * x * x = y. intros x y e; do 2 rewrite <- e. reflexivity. Qed. Require Import Arith. Check mult_1_l. (* mult_1_l : forall n : nat, 1 * n = n *) Check mult_plus_distr_r. (* mult_plus_distr_r : forall n m p : nat, (n + m) * p = n * p + m * p *) Lemma mult_distr_S : forall n p : nat, n * p + p = (S n)* p. simpl;auto with arith. Qed. Lemma four_n : forall n:nat, n+n+n+n = 4*n. intro n;rewrite <- (mult_1_l n). Undo. intro n; pattern n at 1. rewrite <- mult_1_l. repeat rewrite mult_distr_S. trivial. Qed. Section Le_case_analysis. Variables (n p : nat) (H : n <= p) (Q : nat -> Prop) (H0 : Q n) (HS : forall m, n <= m -> Q (S m)). Check ( match H in (_ <= q) return (Q q) with | le_n => H0 | le_S m Hm => HS m Hm end ). End Le_case_analysis. Lemma predecessor_of_positive : forall n, 1 <= n -> exists p:nat, n = S p. Proof. intros n H; case H. exists 0; trivial. intros m Hm; exists m;trivial. Qed. Definition Vtail_total (A : Type) (n : nat) (v : vector A n) : vector A (pred n):= match v in (vector _ n0) return (vector A (pred n0)) with | Vnil => Vnil A | Vcons _ n0 v0 => v0 end. Definition Vtail' (A:Type)(n:nat)(v:vector A n) : vector A (pred n). intros A n v; case v. simpl. exact (Vnil A). simpl. auto. Defined. (* Inductive Lambda : Set := lambda : (Lambda -> False) -> Lambda. Error: Non strictly positive occurrence of "Lambda" in "(Lambda -> False) -> Lambda" *) Section Paradox. Variable Lambda : Set. Variable lambda : (Lambda -> False) ->Lambda. Variable matchL : Lambda -> forall Q:Prop, ((Lambda ->False) -> Q) -> Q. (* understand matchL Q l (fun h : Lambda -> False => t) as match l return Q with lambda h => t end *) Definition application (f x: Lambda) :False := matchL f False (fun h => h x). Definition Delta : Lambda := lambda (fun x : Lambda => application x x). Definition loop : False := application Delta Delta. Theorem two_is_three : 2 = 3. Proof. elim loop. Qed. End Paradox. Require Import ZArith. Inductive itree : Set := | ileaf : itree | inode : Z-> (nat -> itree) -> itree. Definition isingle l := inode l (fun i => ileaf). Definition t1 := inode 0 (fun n => isingle (Z_of_nat (2*n))). Definition t2 := inode 0 (fun n : nat => inode (Z_of_nat n) (fun p => isingle (Z_of_nat (n*p)))). Inductive itree_le : itree-> itree -> Prop := | le_leaf : forall t, itree_le ileaf t | le_node : forall l l' s s', Zle l l' -> (forall i, exists j:nat, itree_le (s i) (s' j)) -> itree_le (inode l s) (inode l' s'). Theorem itree_le_trans : forall t t', itree_le t t' -> forall t'', itree_le t' t'' -> itree_le t t''. induction t. constructor 1. intros t'; case t'. inversion 1. intros z0 i0 H0. intro t'';case t''. inversion 1. intros. inversion_clear H1. constructor 2. inversion_clear H0;eauto with zarith. inversion_clear H0. intro i2; case (H4 i2). intros. generalize (H i2 _ H0). intros. case (H3 x);intros. generalize (H5 _ H6). exists x0;auto. Qed. Inductive itree_le' : itree-> itree -> Prop := | le_leaf' : forall t, itree_le' ileaf t | le_node' : forall l l' s s' g, Zle l l' -> (forall i, itree_le' (s i) (s' (g i))) -> itree_le' (inode l s) (inode l' s'). Lemma t1_le_t2 : itree_le t1 t2. unfold t1, t2. constructor. auto with zarith. intro i; exists (2 * i). unfold isingle. constructor. auto with zarith. exists i;constructor. Qed. Lemma t1_le'_t2 : itree_le' t1 t2. unfold t1, t2. constructor 2 with (fun i : nat => 2 * i). auto with zarith. unfold isingle; intro i ; constructor 2 with (fun i :nat => i). auto with zarith. constructor . Qed. Require Import List. Inductive ltree (A:Set) : Set := lnode : A -> list (ltree A) -> ltree A. Inductive prop : Prop := prop_intro : Prop -> prop. Check (prop_intro prop). Inductive ex_Prop (P : Prop -> Prop) : Prop := exP_intro : forall X : Prop, P X -> ex_Prop P. Lemma ex_Prop_inhabitant : ex_Prop (fun P => P -> P). Proof. exists (ex_Prop (fun P => P -> P)). trivial. Qed. (* Check (fun (P:Prop->Prop)(p: ex_Prop P) => match p with exP_intro X HX => X end). Error: Incorrect elimination of "p" in the inductive type "ex_Prop", the return type has sort "Type" while it should be "Prop" Elimination of an inductive object of sort "Prop" is not allowed on a predicate in sort "Type" because proofs can be eliminated only to build proofs *) Inductive typ : Type := typ_intro : Type -> typ. Definition typ_inject: typ. split. exact typ. (* Defined. Error: Universe Inconsistency. *) Abort. (* Inductive aSet : Set := aSet_intro: Set -> aSet. User error: Large non-propositional inductive types must be in Type *) Inductive ex_Set (P : Set -> Prop) : Type := exS_intro : forall X : Set, P X -> ex_Set P. Inductive comes_from_the_left (P Q:Prop): P \/ Q -> Prop := c1 : forall p, comes_from_the_left P Q (or_introl (A:=P) Q p). Goal (comes_from_the_left _ _ (or_introl True I)). split. Qed. Goal ~(comes_from_the_left _ _ (or_intror True I)). red;inversion 1. (* discriminate H0. *) Abort. Reset comes_from_the_left. (* Definition comes_from_the_left (P Q:Prop)(H:P \/ Q): Prop := match H with | or_introl p => True | or_intror q => False end. Error: Incorrect elimination of "H" in the inductive type "or", the return type has sort "Type" while it should be "Prop" Elimination of an inductive object of sort "Prop" is not allowed on a predicate in sort "Type" because proofs can be eliminated only to build proofs *) Definition comes_from_the_left_sumbool (P Q:Prop)(x:{P}+{Q}): Prop := match x with | left p => True | right q => False end. Close Scope Z_scope. Theorem S_is_not_O : forall n, S n <> 0. Definition Is_zero (x:nat):= match x with | 0 => True | _ => False end. Lemma O_is_zero : forall m, m = 0 -> Is_zero m. Proof. intros m H; subst m. (* ============================ Is_zero 0 *) simpl;trivial. Qed. red; intros n Hn. apply O_is_zero with (m := S n). assumption. Qed. Theorem disc2 : forall n, S (S n) <> 1. Proof. intros n Hn; discriminate. Qed. Theorem disc3 : forall n, S (S n) = 0 -> forall Q:Prop, Q. Proof. intros n Hn Q. discriminate. Qed. Theorem inj_succ : forall n m, S n = S m -> n = m. Proof. Lemma inj_pred : forall n m, n = m -> pred n = pred m. Proof. intros n m eq_n_m. rewrite eq_n_m. trivial. Qed. intros n m eq_Sn_Sm. apply inj_pred with (n:= S n) (m := S m); assumption. Qed. Lemma list_inject : forall (A:Type)(a b :A)(l l':list A), a :: b :: l = b :: a :: l' -> a = b /\ l = l'. Proof. intros A a b l l' e. injection e. auto. Qed. Theorem not_le_Sn_0 : forall n:nat, ~ (S n <= 0). Proof. red; intros n H. case H. Undo. Lemma not_le_Sn_0_with_constraints : forall n p , S n <= p -> p = 0 -> False. Proof. intros n p H; case H ; intros; discriminate. Qed. eapply not_le_Sn_0_with_constraints; eauto. Qed. Theorem not_le_Sn_0' : forall n:nat, ~ (S n <= 0). Proof. red; intros n H ; inversion H. Qed. Derive Inversion le_Sn_0_inv with (forall n :nat, S n <= 0). Check le_Sn_0_inv. Theorem le_Sn_0'' : forall n p : nat, ~ S n <= 0 . Proof. intros n p H; inversion H using le_Sn_0_inv. Qed. Derive Inversion_clear le_Sn_0_inv' with (forall n :nat, S n <= 0). Check le_Sn_0_inv'. Theorem le_reverse_rules : forall n m:nat, n <= m -> n = m \/ exists p, n <= p /\ m = S p. Proof. intros n m H; inversion H. left;trivial. right; exists m0; split; trivial. Restart. intros n m H; inversion_clear H. left;trivial. right; exists m0; split; trivial. Qed. Inductive ArithExp : Set := Zero : ArithExp | Succ : ArithExp -> ArithExp | Plus : ArithExp -> ArithExp -> ArithExp. Inductive RewriteRel : ArithExp -> ArithExp -> Prop := RewSucc : forall e1 e2 :ArithExp, RewriteRel e1 e2 -> RewriteRel (Succ e1) (Succ e2) | RewPlus0 : forall e:ArithExp, RewriteRel (Plus Zero e) e | RewPlusS : forall e1 e2:ArithExp, RewriteRel e1 e2 -> RewriteRel (Plus (Succ e1) e2) (Succ (Plus e1 e2)). Fixpoint plus (n p:nat) {struct n} : nat := match n with | 0 => p | S m => S (plus m p) end. Fixpoint plus' (n p:nat) {struct p} : nat := match p with | 0 => n | S q => S (plus' n q) end. Fixpoint plus'' (n p:nat) {struct n} : nat := match n with | 0 => p | S m => plus'' m (S p) end. Fixpoint even_test (n:nat) : bool := match n with 0 => true | 1 => false | S (S p) => even_test p end. Reset even_test. Fixpoint even_test (n:nat) : bool := match n with | 0 => true | S p => odd_test p end with odd_test (n:nat) : bool := match n with | 0 => false | S p => even_test p end. Eval simpl in even_test. Eval simpl in (fun x : nat => even_test x). Eval simpl in (fun x : nat => plus 5 x). Eval simpl in (fun x : nat => even_test (plus 5 x)). Eval simpl in (fun x : nat => even_test (plus x 5)). Section Principle_of_Induction. Variable P : nat -> Prop. Hypothesis base_case : P 0. Hypothesis inductive_step : forall n:nat, P n -> P (S n). Fixpoint nat_ind (n:nat) : (P n) := match n return P n with | 0 => base_case | S m => inductive_step m (nat_ind m) end. End Principle_of_Induction. Scheme Even_induction := Minimality for even Sort Prop with Odd_induction := Minimality for odd Sort Prop. Theorem even_plus_four : forall n:nat, even n -> even (4+n). Proof. intros n H. elim H using Even_induction with (P0 := fun n => odd (4+n)); simpl;repeat constructor;assumption. Qed. Section Principle_of_Double_Induction. Variable P : nat -> nat ->Prop. Hypothesis base_case1 : forall x:nat, P 0 x. Hypothesis base_case2 : forall x:nat, P (S x) 0. Hypothesis inductive_step : forall n m:nat, P n m -> P (S n) (S m). Fixpoint nat_double_ind (n m:nat){struct n} : P n m := match n, m return P n m with | 0 , x => base_case1 x | (S x), 0 => base_case2 x | (S x), (S y) => inductive_step x y (nat_double_ind x y) end. End Principle_of_Double_Induction. Section Principle_of_Double_Recursion. Variable P : nat -> nat -> Type. Hypothesis base_case1 : forall x:nat, P 0 x. Hypothesis base_case2 : forall x:nat, P (S x) 0. Hypothesis inductive_step : forall n m:nat, P n m -> P (S n) (S m). Fixpoint nat_double_rect (n m:nat){struct n} : P n m := match n, m return P n m with | 0 , x => base_case1 x | (S x), 0 => base_case2 x | (S x), (S y) => inductive_step x y (nat_double_rect x y) end. End Principle_of_Double_Recursion. Definition min : nat -> nat -> nat := nat_double_rect (fun (x y:nat) => nat) (fun (x:nat) => 0) (fun (y:nat) => 0) (fun (x y r:nat) => S r). Eval compute in (min 5 8). Eval compute in (min 8 5). Lemma not_circular : forall n:nat, n <> S n. Proof. intro n. apply nat_ind with (P:= fun n => n <> S n). discriminate. red; intros n0 Hn0 eqn0Sn0;injection eqn0Sn0;trivial. Qed. Definition eq_nat_dec : forall n p:nat , {n=p}+{n <> p}. Proof. intros n p. apply nat_double_rect with (P:= fun (n q:nat) => {q=p}+{q <> p}). Undo. pattern p,n. elim n using nat_double_rect. destruct x; auto. destruct x; auto. intros n0 m H; case H. intro eq; rewrite eq ; auto. intro neg; right; red ; injection 1; auto. Defined. Definition eq_nat_dec' : forall n p:nat, {n=p}+{n <> p}. decide equality. Defined. Require Import Minus. (* Fixpoint div (x y:nat){struct x}: nat := if eq_nat_dec x 0 then 0 else if eq_nat_dec y 0 then x else S (div (x-y) y). Error: Recursive definition of div is ill-formed. In environment div : nat -> nat -> nat x : nat y : nat _ : x <> 0 _ : y <> 0 Recursive call to div has principal argument equal to "x - y" instead of a subterm of x *) Lemma minus_smaller_S: forall x y:nat, x - y < S x. Proof. intros x y; pattern y, x; elim x using nat_double_ind. destruct x0; auto with arith. simpl; auto with arith. simpl; auto with arith. Qed. Lemma minus_smaller_positive : forall x y:nat, x <>0 -> y <> 0 -> x - y < x. Proof. destruct x; destruct y; ( simpl;intros; apply minus_smaller_S || intros; absurd (0=0); auto). Qed. Definition minus_decrease : forall x y:nat, Acc lt x -> x <> 0 -> y <> 0 -> Acc lt (x-y). Proof. intros x y H; case H. intros Hz posz posy. apply Hz; apply minus_smaller_positive; assumption. Defined. Print minus_decrease. Definition div_aux (x y:nat)(H: Acc lt x):nat. fix 3. intros. refine (if eq_nat_dec x 0 then 0 else if eq_nat_dec y 0 then y else div_aux (x-y) y _). apply (minus_decrease x y H);assumption. Defined. Print div_aux. (* div_aux = (fix div_aux (x y : nat) (H : Acc lt x) {struct H} : nat := match eq_nat_dec x 0 with | left _ => 0 | right _ => match eq_nat_dec y 0 with | left _ => y | right _0 => div_aux (x - y) y (minus_decrease x y H _ _0) end end) : forall x : nat, nat -> Acc lt x -> nat *) Require Import Wf_nat. Definition div x y := div_aux x y (lt_wf x). Extraction div. (* let div x y = div_aux x y *) Extraction div_aux. (* let rec div_aux x y = match eq_nat_dec x O with | Left -> O | Right -> (match eq_nat_dec y O with | Left -> y | Right -> div_aux (minus x y) y) *) Lemma vector0_is_vnil : forall (A:Type)(v:vector A 0), v = Vnil A. Proof. intros A v;inversion v. Abort. (* Lemma vector0_is_vnil_aux : forall (A:Type)(n:nat)(v:vector A n), n= 0 -> v = Vnil A. Toplevel input, characters 40281-40287 > Lemma vector0_is_vnil_aux : forall (A:Set)(n:nat)(v:vector A n), n= 0 -> v = Vnil A. > ^^^^^^ Error: In environment A : Set n : nat v : vector A n e : n = 0 The term "Vnil A" has type "vector A 0" while it is expected to have type "vector A n" *) Require Import JMeq. (* On devrait changer Set en Type ? *) Lemma vector0_is_vnil_aux : forall (A:Type)(n:nat)(v:vector A n), n= 0 -> JMeq v (Vnil A). Proof. destruct v. auto. intro; discriminate. Qed. Lemma vector0_is_vnil : forall (A:Type)(v:vector A 0), v = Vnil A. Proof. intros a v;apply JMeq_eq. apply vector0_is_vnil_aux. trivial. Qed. Implicit Arguments Vcons [A n]. Implicit Arguments Vnil [A]. Implicit Arguments Vhead [A n]. Implicit Arguments Vtail [A n]. Definition Vid : forall (A : Type)(n:nat), vector A n -> vector A n. Proof. destruct n; intro v. exact Vnil. exact (Vcons (Vhead v) (Vtail v)). Defined. Eval simpl in (fun (A:Type)(v:vector A 0) => (Vid _ _ v)). Eval simpl in (fun (A:Type)(v:vector A 0) => v). Lemma Vid_eq : forall (n:nat) (A:Type)(v:vector A n), v=(Vid _ n v). Proof. destruct v. reflexivity. reflexivity. Defined. Theorem zero_nil : forall A (v:vector A 0), v = Vnil. Proof. intros. change (Vnil (A:=A)) with (Vid _ 0 v). apply Vid_eq. Defined. Theorem decomp : forall (A : Type) (n : nat) (v : vector A (S n)), v = Vcons (Vhead v) (Vtail v). Proof. intros. change (Vcons (Vhead v) (Vtail v)) with (Vid _ (S n) v). apply Vid_eq. Defined. Definition vector_double_rect : forall (A:Type) (P: forall (n:nat),(vector A n)->(vector A n) -> Type), P 0 Vnil Vnil -> (forall n (v1 v2 : vector A n) a b, P n v1 v2 -> P (S n) (Vcons a v1) (Vcons b v2)) -> forall n (v1 v2 : vector A n), P n v1 v2. induction n. intros; rewrite (zero_nil _ v1); rewrite (zero_nil _ v2). auto. intros v1 v2; rewrite (decomp _ _ v1);rewrite (decomp _ _ v2). apply X0; auto. Defined. Require Import Bool. Definition bitwise_or n v1 v2 : vector bool n := vector_double_rect bool (fun n v1 v2 => vector bool n) Vnil (fun n v1 v2 a b r => Vcons (orb a b) r) n v1 v2. Fixpoint vector_nth (A:Type)(n:nat)(p:nat)(v:vector A p){struct v} : option A := match n,v with _ , Vnil => None | 0 , Vcons b _ _ => Some b | S n', Vcons _ p' v' => vector_nth A n' p' v' end. Implicit Arguments vector_nth [A p]. Lemma nth_bitwise : forall (n:nat) (v1 v2: vector bool n) i a b, vector_nth i v1 = Some a -> vector_nth i v2 = Some b -> vector_nth i (bitwise_or _ v1 v2) = Some (orb a b). Proof. intros n v1 v2; pattern n,v1,v2. apply vector_double_rect. simpl. destruct i; discriminate 1. destruct i; simpl;auto. injection 1; injection 2;intros; subst a; subst b; auto. Qed. Set Implicit Arguments. CoInductive Stream (A:Type) : Type := | Cons : A -> Stream A -> Stream A. CoInductive LList (A: Type) : Type := | LNil : LList A | LCons : A -> LList A -> LList A. Definition head (A:Type)(s : Stream A) := match s with Cons a s' => a end. Definition tail (A : Type)(s : Stream A) := match s with Cons a s' => s' end. CoFixpoint repeat (A:Type)(a:A) : Stream A := Cons a (repeat a). CoFixpoint iterate (A: Type)(f: A -> A)(a : A) : Stream A:= Cons a (iterate f (f a)). CoFixpoint map (A B:Type)(f: A -> B)(s : Stream A) : Stream B:= match s with Cons a tl => Cons (f a) (map f tl) end. Eval simpl in (fun (A:Type)(a:A) => repeat a). Eval simpl in (fun (A:Type)(a:A) => head (repeat a)). CoInductive EqSt (A: Type) : Stream A -> Stream A -> Prop := eqst : forall s1 s2: Stream A, head s1 = head s2 -> EqSt (tail s1) (tail s2) -> EqSt s1 s2. Section Parks_Principle. Variable A : Type. Variable R : Stream A -> Stream A -> Prop. Hypothesis bisim1 : forall s1 s2:Stream A, R s1 s2 -> head s1 = head s2. Hypothesis bisim2 : forall s1 s2:Stream A, R s1 s2 -> R (tail s1) (tail s2). CoFixpoint park_ppl : forall s1 s2:Stream A, R s1 s2 -> EqSt s1 s2 := fun s1 s2 (p : R s1 s2) => eqst s1 s2 (bisim1 p) (park_ppl (bisim2 p)). End Parks_Principle. Theorem map_iterate : forall (A:Type)(f:A->A)(x:A), EqSt (iterate f (f x)) (map f (iterate f x)). Proof. intros A f x. apply park_ppl with (R:= fun s1 s2 => exists x: A, s1 = iterate f (f x) /\ s2 = map f (iterate f x)). intros s1 s2 (x0,(eqs1,eqs2));rewrite eqs1;rewrite eqs2;reflexivity. intros s1 s2 (x0,(eqs1,eqs2)). exists (f x0);split;[rewrite eqs1|rewrite eqs2]; reflexivity. exists x;split; reflexivity. Qed. Ltac infiniteproof f := cofix f; constructor; [clear f| simpl; try (apply f; clear f)]. Theorem map_iterate' : forall (A:Type)(f:A->A)(x:A), EqSt (iterate f (f x)) (map f (iterate f x)). infiniteproof map_iterate'. reflexivity. Qed. Implicit Arguments LNil [A]. Lemma Lnil_not_Lcons : forall (A:Type)(a:A)(l:LList A), LNil <> (LCons a l). intros;discriminate. Qed. Lemma injection_demo : forall (A:Type)(a b : A)(l l': LList A), LCons a (LCons b l) = LCons b (LCons a l') -> a = b /\ l = l'. Proof. intros A a b l l' e; injection e; auto. Qed. Inductive Finite (A:Type) : LList A -> Prop := | Lnil_fin : Finite (LNil (A:=A)) | Lcons_fin : forall a l, Finite l -> Finite (LCons a l). CoInductive Infinite (A:Type) : LList A -> Prop := | LCons_inf : forall a l, Infinite l -> Infinite (LCons a l). Lemma LNil_not_Infinite : forall (A:Type), ~ Infinite (LNil (A:=A)). Proof. intros A H;inversion H. Qed. Lemma Finite_not_Infinite : forall (A:Type)(l:LList A), Finite l -> ~ Infinite l. Proof. intros A l H; elim H. apply LNil_not_Infinite. intros a l0 F0 I0' I1. case I0'; inversion_clear I1. trivial. Qed. Lemma Not_Finite_Infinite : forall (A:Type)(l:LList A), ~ Finite l -> Infinite l. Proof. cofix H. destruct l. intro; absurd (Finite (LNil (A:=A)));[auto|constructor]. constructor. apply H. red; intro H1;case H0. constructor. trivial. Qed. check.patch: --- NEW FILE check.patch --- --- test-suite/check 2008-06-17 09:18:42.000000000 -0400 +++ test-suite/check 2008-06-17 09:19:11.000000000 -0400 @@ -52,7 +52,7 @@ nbtests=`expr $nbtests + 1` printf " "$f"..." tmpoutput=`mktemp /tmp/coqcheck.XXXXXX` - $command $f 2>&1 | grep -v "Welcome to Coq" | grep -v "Skipping rcfile loading" > $tmpoutput + $command $f 2>&1 | grep -v "Welcome to Coq" | grep -v "Skipping rcfile loading" | grep -v "some rule has been masked" > $tmpoutput foutput=`dirname $f`/`basename $f .v`.out diff $tmpoutput $foutput >& /dev/null if [ $? = 0 ]; then cmxa-install.patch: --- NEW FILE cmxa-install.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-16 10:58:38.000000000 -0400 @@ -1271,7 +1271,12 @@ parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \ parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma -OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +ifeq ($(BEST),opt) + OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +else + OBJECTCMXA= +endif + install-library: $(MKDIR) $(FULLCOQLIB) --- NEW FILE coq.spec --- # Upstream includes option for generation of optimized binaries, # however, specifically generates bytecode versions for certain # executables even when optimized option is set, namely the following: # coq-tex, coq_makefile, coq-interface, coqwc, coqdoc, parser, coqdep, # gallina # (coqtop.byte, coqide.byte binaries are also made available.) # .coqide-gtk2rc also produces an rpmlint warning due to its name, # however, this name is proper as per the Coq documentation # Disable creation of the debug package: if bytecode executables are # created find-debuginfo.sh will ruin them, while if optimized # executables are created they will be stripped by the Makefile # anyway, thus we won't get anything useful from the debug info # package creation. # # It appears as though ALL of these are necessary to prevent unwanted # stripping %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %define _enable_debug_package 0 %define debug_package %{nil} Name: coq Version: 8.1pl3 Release: 1%{?dist} Summary: Coq proof management system Group: Applications/Engineering License: LGPLv2 URL: http://coq.inria.fr/ Source0: http://coq.inria.fr/V%{version}/files/coq-%{version}.tar.gz Source1: Coq-Library.pdf.gz Source2: Coq-Reference-Manual.pdf.gz Source3: Coq-Tutorial.v.pdf.gz Source4: Coq-RecTutorial.pdf.gz Source5: coq-refman-html.tar.gz Source6: coq-stdlib-html.tar.gz Source7: RecTutorial.v Source8: coqide.desktop Source9: coq-icon.png Source10: README.coq-emacs Patch0: makefile.patch Patch1: cmxa-install.patch Patch2: makefile-strip.patch Patch3: check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, texlive-latex, texlive-texmf # ExcludeArch: ppc64 %description Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides the main Coq binary without an optional IDE, Coqide. # The IDE's package name will become "coq-coqide". That way, # searching for either "coqide" (the Ubuntu/Debian package name, and # also the full name of the IDE) or "coq" and "ide" will find # this. (If the package were named "coq-ide", the former would fail.) %package coqide Group: Applications/Engineering Summary: Coqide IDE for Coq proof management system Requires: coq %description coqide Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides Coqide, a lightweight IDE for Coq. %package doc Group: Applications/Engineering Summary: Documentation for Coq proof management system %description doc Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides documentation and tutorials for the system. The main documentation comes in two parts: the main Library documentation, which decribes all Coq.* modules, and the Reference Manual, which gives a more complete description of the whole system. Included are also HTML versions of both. Furthermore, there are two tutorials, the main one, and one specifically on recursive types. The example code for the latter is also included. %package emacs Group: Applications/Engineering Summary: Elisp files for Coq proof management system Requires: coq, emacs %description emacs Coq is a formal proof management system. It allows for the development of theorems through first order logic that are mechanically checked by the machine. Sets of definitions and theorems can be saved as compiled modules and loaded into the system. This package provides emacs mode files for formatting Coq input. %prep %setup -q # Patch description: # Considered each of the seven patches from the Debian Coq package: # Credit goes to the Debian patch creators for their patches # (See http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/patches/?rev=0&sc=0) # # For most patches I merely reproduced the results in non-dpatch # form. I opted for no patching in cases where it did not seem # necessary or immediately correct. # # - browser.dpatch: changes firefox option for linux, however, link # x-www-browser does not exist in Fedora setup, and changing this # option does not actually fix the problem in the IDE wherein a # browser window needs to be open in order to actually open any help # file -> do not change until the real source of the problem can be # detected # - check.dpatch: suppress a test warning, similar change made in my # check.patch # - cmxa-install.dpatch: fixes cmxa install by testing for opt, similar # change made in cmxa-install.patch # - configure.dpatch: fixes detection of ocamlopt - We do this detection # seperately anyway in this RPM, no change made # - coqdoc_stdlib.dpatch: extra documentation option - Perhaps do this # in the future, but for now, no change made # - makefile.dpatch: fix testing on non-native architecture compiles, similar change made in makefile.patch # - no-complexity-test.dpatch: turn off some of the tests - Perhaps this # change was made due to a failure in complexity tests when they # "don't run quickly enough", which is likely to be incredibly # variable, but unsure, so no change made %patch0 %patch1 # I created patch3 to consistently strip native-code binaries, unlike # the inconsistent way it was done in the original makefile %patch2 # This patch may not be strictly necessary unless the tests are # incorporated into the build process somehow. However, the tests don't # work properly without it. %patch3 # Fix some files that are not in UTF-8 encoding for f in CHANGES CREDITS COPYRIGHT; do mv $f $f.old; iconv -f ISO-8859-1 -t UTF-8 < $f.old > $f; rm $f.old done %define emacs_lispdir %{_datadir}/emacs/site-lisp %define tex_dir %{_datadir}/texmf/tex/latex/misc # Seems like setup only sets up the main file cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 %SOURCE10 . gunzip *.gz for f in *.tar; do tar xf $f done %build %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) # optimized binary ppc64 building does not work at the moment - the # log files are no real help, but we fail on bootstrap with the # optimized compiler: # # bin/coqtop.opt -boot -nois -compile theories/Init/Notations # # appears to be the command that dies. It appears that the status of # OCaml has been somewhat uncertain on ppc64, perhaps this is the cause? # However, bytecode compilation DOES work -> do this for now %ifarch ppc64 %define opt 0 %endif # Define opt flag based upon prior opt detection and restrictions %if %{opt} %define opt_option --opt %else %define opt_option --byte-only %endif bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all > /dev/null make world 2>/dev/null # Fix permissions in the documentation chmod -R a+rX refman stdlib %install rm -rf %{buildroot} make COQINSTALLPREFIX="%{buildroot}" install # Install desktop icon and menu entry %define coqdatadir %{_datadir}/coq %if %(test -d %{buildroot}%{coqdatadir} && echo 1 || echo 0) != 1 mkdir -p %{buildroot}%{coqdatadir} %endif cp coq-icon.png %{buildroot}%{coqdatadir} sed -i -e 's|ICON-LOCATION-BASE|%{coqdatadir}|' coqide.desktop desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications \ coqide.desktop # Install tutorial code %define tutorialcodedir %{coqdatadir}/tutorial %if %(test -d %{buildroot}%{tutorialcodedir} && echo 1 || echo 0) != 1 mkdir -p %{buildroot}%{tutorialcodedir} %endif mv RecTutorial.v %{buildroot}%{tutorialcodedir} %clean rm -rf %{buildroot} # Note: we want to keep both coqtop.opt and coqtop.byte because the # byte compiled version can be used to compile new version through # coqmktop %files %defattr(-,root,root,-) %doc CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL KNOWN-BUGS LICENSE README %doc %{_mandir}/man1/coq* %doc %{_mandir}/man1/gallina.1.gz %doc %{_mandir}/man1/parser.1.gz %{_datadir}/coq %{_bindir}/coq* %{_bindir}/gallina %{_bindir}/parser %if %{opt} %{_bindir}/parser.opt %endif # Exclude ide files to put in a separate package %exclude %{_bindir}/coqide* %exclude %{_datadir}/coq/ide %if %{opt} %exclude %{_datadir}/coq/*.cmxa %endif %{tex_dir}/coq* %files coqide %defattr(-,root,root,-) %doc INSTALL.ide %{_bindir}/coqide* %{_datadir}/coq/ide # Exclude a corrupted file from the tarball %exclude %{_datadir}/coq/ide/coq.png # Instead include a non-corrupted icon somewhere else %dir %{coqdatadir} %{coqdatadir}/coq-icon.png # Is it ok to assume this is what desktop-file-install renames coqide.desktop to? %{_datadir}/applications/fedora-coqide.desktop %files doc %defattr(-,root,root,-) %doc Coq-Library.pdf %doc Coq-Reference-Manual.pdf %doc Coq-Tutorial.v.pdf %doc Coq-RecTutorial.pdf %dir %{coqdatadir} %{tutorialcodedir} # Standard permissions with - in defattr make the manual unreadable... unknown how to fix %doc refman %doc stdlib %files emacs %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/coq* %doc README.coq-emacs %changelog * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. --- NEW FILE coqide.desktop --- [Desktop Entry] Encoding=UTF-8 Name=CoqIDE Comment=Examine and develop Coq .v files Exec=coqide Icon=ICON-LOCATION-BASE/coq-icon.png Type=Application Categories=Development; --- NEW FILE import.log --- coq-8_1pl3-1_fc9:F-8:coq-8.1pl3-1.fc9.src.rpm:1216235027 makefile-strip.patch: --- NEW FILE makefile-strip.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-17 00:43:48.000000000 -0400 @@ -431,6 +431,7 @@ $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ str.cmxa unix.cmxa \ $(COQMKTOPCMX) $(OSDEPLIBS) + $(STRIP) $@ $(COQMKTOP): $(BESTCOQMKTOP) cd bin; ln -sf coqmktop.$(BEST)$(EXE) coqmktop$(EXE) @@ -457,6 +458,7 @@ $(COQCOPT): $(COQCCMX) $(COQTOPOPT) $(BESTCOQTOP) $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ unix.cmxa $(COQCCMX) $(OSDEPLIBS) + $(STRIP) $@ $(COQC): $(BESTCOQC) cd bin; ln -sf coqc.$(BEST)$(EXE) coqc$(EXE) @@ -746,6 +748,7 @@ bin/coq-interface.opt$(EXE): $(COQMKTOP) $(LINKCMX) $(LIBCOQRUN) $(USERTACCMX) $(INTERFACECMX) $(SHOW)'COQMKTOP -o $@' $(HIDE)$(COQMKTOP) -opt $(OPTFLAGS) -o $@ $(INTERFACECMX) + $(STRIP) $@ PARSERCODE=contrib/interface/line_parser.cmo contrib/interface/vtp.cmo \ contrib/interface/xlate.cmo contrib/interface/parse.cmo @@ -761,6 +764,7 @@ $(SHOW)'OCAMLOPT -o $@' $(HIDE)$(OCAMLOPT) -linkall $(OPTFLAGS) -o $@ \ $(LIBCOQRUN) $(CMXA) $(PARSERCMX) + $(STRIP) $@ INTERFACEVO= makefile.patch: --- NEW FILE makefile.patch --- --- Makefile 2007-11-12 10:10:25.000000000 -0500 +++ Makefile 2008-06-16 09:48:05.000000000 -0400 @@ -1481,7 +1481,7 @@ parsing/grammar.cma: $(GRAMMARCMO) $(SHOW)'Testing $@' @touch test.ml4 - $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar + $(HIDE)$(OCAMLC) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar @rm -f test-grammar test.* $(SHOW)'OCAMLC -a $@' $(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 16:48:21 -0000 1.1 +++ .cvsignore 16 Jul 2008 19:05:11 -0000 1.2 @@ -0,0 +1,7 @@ +Coq-Library.pdf.gz +Coq-RecTutorial.pdf.gz +Coq-Reference-Manual.pdf.gz +Coq-Tutorial.v.pdf.gz +coq-8.1pl3.tar.gz +coq-refman-html.tar.gz +coq-stdlib-html.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 16:48:21 -0000 1.1 +++ sources 16 Jul 2008 19:05:11 -0000 1.2 @@ -0,0 +1,7 @@ +8b14a9c8f65ea5bd592901b3649346a7 Coq-Library.pdf.gz +0e3d5eac23416ec75dd59fabdcc1367c Coq-RecTutorial.pdf.gz +021c58a1f2e5d029928ffae0cc9703b0 Coq-Reference-Manual.pdf.gz +bcb4d1c4857bfdae5c22f8fc0be6853c Coq-Tutorial.v.pdf.gz +84311faf7865b2eab964990cdb365dca coq-8.1pl3.tar.gz +04285e3a76571db6e1d2fbe198c76120 coq-refman-html.tar.gz +17b1edf9122fd89c8b99d4e047b54fb8 coq-stdlib-html.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 19:06:35 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 16 Jul 2008 19:06:35 GMT Subject: rpms/netmask/devel .cvsignore, 1.5, 1.6 netmask.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200807161906.m6GJ6ZvK015123@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/netmask/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15032 Modified Files: .cvsignore netmask.spec sources Log Message: * Wed Jul 16 2008 Ville Skytt?? - 2.3.10-1 - 2.3.10. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/netmask/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Mar 2007 18:51:55 -0000 1.5 +++ .cvsignore 16 Jul 2008 19:05:37 -0000 1.6 @@ -1 +1 @@ -netmask_2.3.9.tar.gz +netmask_2.3.10.tar.gz Index: netmask.spec =================================================================== RCS file: /cvs/pkgs/rpms/netmask/devel/netmask.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- netmask.spec 8 Feb 2008 22:41:40 -0000 1.14 +++ netmask.spec 16 Jul 2008 19:05:37 -0000 1.15 @@ -1,6 +1,6 @@ Name: netmask -Version: 2.3.9 -Release: 3%{?dist} +Version: 2.3.10 +Release: 1%{?dist} Summary: Utility for determining network masks Group: Applications/Internet @@ -68,6 +68,9 @@ %changelog +* Wed Jul 16 2008 Ville Skytt?? - 2.3.10-1 +- 2.3.10. + * Sat Feb 9 2008 Ville Skytt?? - 2.3.9-3 - Rebuild. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/netmask/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Mar 2007 18:51:55 -0000 1.5 +++ sources 16 Jul 2008 19:05:37 -0000 1.6 @@ -1 +1 @@ -c68b72145e9d9219605890dfd8473b77 netmask_2.3.9.tar.gz +fe63a953e9d74b49cd5dd8e036164ed9 netmask_2.3.10.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 19:12:57 2008 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 16 Jul 2008 19:12:57 GMT Subject: rpms/dnsmasq/devel .cvsignore, 1.20, 1.21 dnsmasq.spec, 1.32, 1.33 sources, 1.20, 1.21 Message-ID: <200807161912.m6GJCvas015418@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/pkgs/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15365 Modified Files: .cvsignore dnsmasq.spec sources Log Message: - New upstream release, contains fixes for CVE-2008-1447/CERT VU#800113 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 13 Feb 2008 15:21:24 -0000 1.20 +++ .cvsignore 16 Jul 2008 19:11:57 -0000 1.21 @@ -1 +1 @@ -dnsmasq-2.41.tar.gz +dnsmasq-2.43.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dnsmasq.spec 14 Feb 2008 03:05:21 -0000 1.32 +++ dnsmasq.spec 16 Jul 2008 19:11:57 -0000 1.33 @@ -10,8 +10,8 @@ %endif Name: dnsmasq -Version: 2.41 -Release: 0.8%{?extraversion}%{?dist} +Version: 2.43 +Release: 1%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -111,6 +111,9 @@ %changelog +* Wed Jul 16 2008 Patrick "Jima" Laughton 2.43-1 +- New upstream release, contains fixes for CVE-2008-1447/CERT VU#800113 + * Wed Feb 13 2008 Patrick "Jima" Laughton 2.41-0.8 - Added upstream-authored patch for newer glibc (thanks Simon!) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 13 Feb 2008 15:21:24 -0000 1.20 +++ sources 16 Jul 2008 19:11:57 -0000 1.21 @@ -1 +1 @@ -b067598c3e9b91819a8be5cb59cbf90e dnsmasq-2.41.tar.gz +3222690c6f1f919bcefcf01a632508af dnsmasq-2.43.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 19:19:42 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 16 Jul 2008 19:19:42 GMT Subject: rpms/xulrunner/F-9 .cvsignore, 1.49, 1.50 sources, 1.51, 1.52 xulrunner-version.patch, 1.1, 1.2 xulrunner.spec, 1.128, 1.129 Message-ID: <200807161919.m6GJJgrc015711@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15665 Modified Files: .cvsignore sources xulrunner-version.patch xulrunner.spec Log Message: * Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 - Update to 1.9.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/F-9/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 17 Jun 2008 16:15:18 -0000 1.49 +++ .cvsignore 16 Jul 2008 19:18:54 -0000 1.50 @@ -1 +1 @@ -xulrunner-1.9-source.tar.bz2 +xulrunner-1.9.0.1-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/F-9/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 17 Jun 2008 16:15:18 -0000 1.51 +++ sources 16 Jul 2008 19:18:54 -0000 1.52 @@ -1 +1 @@ -b514375509fd439e44def1e4a7873af4 xulrunner-1.9-source.tar.bz2 +a14e4ac2e9fc5b29f80995c97a1c9748 xulrunner-1.9.0.1-source.tar.bz2 xulrunner-version.patch: Index: xulrunner-version.patch =================================================================== RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner-version.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xulrunner-version.patch 14 Dec 2007 10:24:02 -0000 1.1 +++ xulrunner-version.patch 16 Jul 2008 19:18:54 -0000 1.2 @@ -6,7 +6,7 @@ include $(DEPTH)/config/autoconf.mk -+MOZ_APP_VERSION="1.9pre" ++MOZ_APP_VERSION="1.9" + NO_PKG_FILES = \ xulrunner-config \ Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- xulrunner.spec 30 Jun 2008 16:57:27 -0000 1.128 +++ xulrunner.spec 16 Jul 2008 19:18:54 -0000 1.129 @@ -7,12 +7,12 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9 -Release: 1%{?dist}.1 +Version: 1.9.0.1 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: xulrunner-1.9-source.tar.bz2 +Source0: xulrunner-%{version}-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -21,6 +21,7 @@ # build patches Patch1: mozilla-build.patch Patch2: xulrunner-path.patch +Patch3: xulrunner-version.patch Patch4: mozilla-sqlite.patch Patch5: mozilla-mochitest.patch @@ -97,6 +98,7 @@ cd mozilla %patch1 -p1 -b .build %patch2 -p1 -b .path +%patch3 -p1 -b .version %patch4 -p1 -b .sqlite autoconf-2.13 %patch5 -p1 -b .mochitest @@ -104,7 +106,7 @@ %patch10 -p1 -b .pk %patch26 -p1 -b .ps-pdf-simplify-operators -%patch27 -p1 -b .ssl-exception +#%patch27 -p1 -b .ssl-exception %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -377,6 +379,9 @@ #--------------------------------------------------------------------- %changelog +* Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 +- Update to 1.9.0.1 + * Mon Jun 30 2008 Dennis Gilmore 1.9-1.1 - handle sparc arches From fedora-extras-commits at redhat.com Wed Jul 16 19:25:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:02 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested watchbugzilla Message-ID: <200807161925.m6GJP2mD028867@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the watchbugzilla acl on cx18-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:03 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested watchbugzilla Message-ID: <200807161925.m6GJP4lC028886@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the watchbugzilla acl on cx18-firmware (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:06 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested commit Message-ID: <200807161925.m6GJP6iT028907@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the commit acl on cx18-firmware (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:09 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested watchcommits Message-ID: <200807161925.m6GJP2mG028867@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the watchcommits acl on cx18-firmware (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:09 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested watchbugzilla Message-ID: <200807161925.m6GJPAu4028927@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the watchbugzilla acl on cx18-firmware (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:11 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested watchcommits Message-ID: <200807161925.m6GJP2mJ028867@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the watchcommits acl on cx18-firmware (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:18 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested commit Message-ID: <200807161925.m6GJP4lF028886@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the commit acl on cx18-firmware (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:20 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested commit Message-ID: <200807161925.m6GJP6iW028907@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the commit acl on cx18-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:25:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:25:23 +0000 Subject: [pkgdb] cx18-firmware: athimm has requested watchcommits Message-ID: <200807161925.m6GJPAu7028927@bastion.fedora.phx.redhat.com> Axel Thimm (athimm) has requested the watchcommits acl on cx18-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:28:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:28:00 +0000 Subject: [pkgdb] freenx ownership updated Message-ID: <200807161928.m6GJRxfp029138@bastion.fedora.phx.redhat.com> Package freenx in Fedora devel was orphaned by Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/freenx From fedora-extras-commits at redhat.com Wed Jul 16 19:29:56 2008 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 16 Jul 2008 19:29:56 GMT Subject: rpms/dnsmasq/devel dnsmasq-configuration.patch, 1.1, 1.2 dnsmasq.spec, 1.33, 1.34 Message-ID: <200807161929.m6GJTuWC016136@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/pkgs/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16085 Modified Files: dnsmasq-configuration.patch dnsmasq.spec Log Message: - Dropped patch for newer glibc (merged upstream) dnsmasq-configuration.patch: Index: dnsmasq-configuration.patch =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq-configuration.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-configuration.patch 4 Dec 2007 15:46:52 -0000 1.1 +++ dnsmasq-configuration.patch 16 Jul 2008 19:28:52 -0000 1.2 @@ -1,28 +1,31 @@ -diff -up dnsmasq-2.41test20/src/config.h.orig dnsmasq-2.41test20/src/config.h ---- dnsmasq-2.41test20/src/config.h.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/src/config.h 2007-12-04 08:21:49.000000000 -0600 -@@ -42,7 +42,7 @@ - #elif defined(__sun__) - # define LEASEFILE "/var/cache/dnsmasq.leases" - #else --# define LEASEFILE "/var/lib/misc/dnsmasq.leases" -+# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases" - #endif - #if defined(__FreeBSD__) - # define CONFFILE "/usr/local/etc/dnsmasq.conf" -@@ -182,7 +182,7 @@ NOTES: - #define HAVE_TFTP - /* #define HAVE_BROKEN_RTC */ - /* #define HAVE_ISC_READER */ --/* #define HAVE_DBUS */ -+#define HAVE_DBUS +diff -urN dnsmasq-2.43/contrib/dnslist/dnslist.pl dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl +--- dnsmasq-2.43/contrib/dnslist/dnslist.pl 2008-06-02 13:58:52.000000000 -0500 ++++ dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl 2008-07-16 14:23:16.000000000 -0500 +@@ -44,7 +44,7 @@ + + # Location of state file. (This is the dnsmasq default.) + # Change with -s +-my $dnsmasq_state_file = '/var/lib/misc/dnsmasq.leases'; ++my $dnsmasq_state_file = '/var/lib/dnsmasq/dnsmasq.leases'; + # Location of template. (Assumed to be in current directory.) + # Change with -t + my $html_template_file = 'dnslist.tt2'; +diff -urN dnsmasq-2.43/dnsmasq.conf.example dnsmasq-2.43-patched/dnsmasq.conf.example +--- dnsmasq-2.43/dnsmasq.conf.example 2008-06-02 13:58:52.000000000 -0500 ++++ dnsmasq-2.43-patched/dnsmasq.conf.example 2008-07-16 14:23:29.000000000 -0500 +@@ -351,7 +351,7 @@ + # The DHCP server needs somewhere on disk to keep its lease database. + # This defaults to a sane location, but if you want to change it, use + # the line below. +-#dhcp-leasefile=/var/lib/misc/dnsmasq.leases ++#dhcp-leasefile=/var/lib/dnsmasq/dnsmasq.leases - #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) - # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC -diff -up dnsmasq-2.41test20/man/es/dnsmasq.8.orig dnsmasq-2.41test20/man/es/dnsmasq.8 ---- dnsmasq-2.41test20/man/es/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/man/es/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600 -@@ -1075,7 +1075,7 @@ un CPU de 1GHz y aproximadamente 60MB de + # Set the DHCP server to authoritative mode. In this mode it will barge in + # and take over the lease for any client which broadcasts on the network, +diff -urN dnsmasq-2.43/man/dnsmasq.8 dnsmasq-2.43-patched/man/dnsmasq.8 +--- dnsmasq-2.43/man/dnsmasq.8 2008-07-10 10:48:14.000000000 -0500 ++++ dnsmasq-2.43-patched/man/dnsmasq.8 2008-07-16 14:22:35.000000000 -0500 +@@ -1116,7 +1116,7 @@ .IR /etc/ethers @@ -31,10 +34,10 @@ .IR /var/db/dnsmasq.leases -diff -up dnsmasq-2.41test20/man/dnsmasq.8.orig dnsmasq-2.41test20/man/dnsmasq.8 ---- dnsmasq-2.41test20/man/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/man/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600 -@@ -1070,7 +1070,7 @@ file needs a 1GHz processor and about 60 +diff -urN dnsmasq-2.43/man/es/dnsmasq.8 dnsmasq-2.43-patched/man/es/dnsmasq.8 +--- dnsmasq-2.43/man/es/dnsmasq.8 2008-06-02 13:58:52.000000000 -0500 ++++ dnsmasq-2.43-patched/man/es/dnsmasq.8 2008-07-16 14:22:48.000000000 -0500 +@@ -1145,7 +1145,7 @@ .IR /etc/ethers @@ -43,21 +46,36 @@ .IR /var/db/dnsmasq.leases -diff -up dnsmasq-2.41test20/dnsmasq.conf.example.orig dnsmasq-2.41test20/dnsmasq.conf.example ---- dnsmasq-2.41test20/dnsmasq.conf.example.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/dnsmasq.conf.example 2007-12-04 08:44:16.000000000 -0600 -@@ -344,7 +344,7 @@ - # The DHCP server needs somewhere on disk to keep its lease database. - # This defaults to a sane location, but if you want to change it, use - # the line below. --#dhcp-leasefile=/var/lib/misc/dnsmasq.leases -+#dhcp-leasefile=/var/lib/dnsmasq/dnsmasq.leases +diff -urN dnsmasq-2.43/man/fr/dnsmasq.8 dnsmasq-2.43-patched/man/fr/dnsmasq.8 +--- dnsmasq-2.43/man/fr/dnsmasq.8 2008-07-11 03:28:28.000000000 -0500 ++++ dnsmasq-2.43-patched/man/fr/dnsmasq.8 2008-07-16 14:22:54.000000000 -0500 +@@ -1280,7 +1280,7 @@ - # Set the DHCP server to authoritative mode. In this mode it will barge in - # and take over the lease for any client which broadcasts on the network, -@@ -461,4 +461,4 @@ + .IR /etc/ethers + +-.IR /var/lib/misc/dnsmasq.leases ++.IR /var/lib/dnsmasq/dnsmasq.leases + + .IR /var/db/dnsmasq.leases + +diff -urN dnsmasq-2.43/src/config.h dnsmasq-2.43-patched/src/config.h +--- dnsmasq-2.43/src/config.h 2008-07-11 03:44:17.000000000 -0500 ++++ dnsmasq-2.43-patched/src/config.h 2008-07-16 14:21:02.000000000 -0500 +@@ -43,7 +43,7 @@ + #elif defined(__sun__) || defined (__sun) + # define LEASEFILE "/var/cache/dnsmasq.leases" + #else +-# define LEASEFILE "/var/lib/misc/dnsmasq.leases" ++# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases" + #endif + #if defined(__FreeBSD__) + # define CONFFILE "/usr/local/etc/dnsmasq.conf" +@@ -167,7 +167,7 @@ + #define HAVE_TFTP + /* #define HAVE_BROKEN_RTC */ + /* #define HAVE_ISC_READER */ +-/* #define HAVE_DBUS */ ++#define HAVE_DBUS - # Include a another lot of configuration options. - #conf-file=/etc/dnsmasq.more.conf --#conf-dir=/etc/dnsmasq.d -+conf-dir=/etc/dnsmasq.d + #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) + # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- dnsmasq.spec 16 Jul 2008 19:11:57 -0000 1.33 +++ dnsmasq.spec 16 Jul 2008 19:28:52 -0000 1.34 @@ -11,7 +11,7 @@ Name: dnsmasq Version: 2.43 -Release: 1%{?extraversion}%{?dist} +Release: 2%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -20,7 +20,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz Patch0: %{name}-2.33-initscript.patch Patch1: %{name}-configuration.patch -Patch2: %{name}-newglibc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -47,7 +46,6 @@ %setup -q -n %{name}-%{version}%{?extraversion} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build make %{?_smp_mflags} @@ -111,8 +109,9 @@ %changelog -* Wed Jul 16 2008 Patrick "Jima" Laughton 2.43-1 +* Wed Jul 16 2008 Patrick "Jima" Laughton 2.43-2 - New upstream release, contains fixes for CVE-2008-1447/CERT VU#800113 +- Dropped patch for newer glibc (merged upstream) * Wed Feb 13 2008 Patrick "Jima" Laughton 2.41-0.8 - Added upstream-authored patch for newer glibc (thanks Simon!) From fedora-extras-commits at redhat.com Wed Jul 16 19:31:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Henrik_Nordstr=C3=B6m?= (hno)) Date: Wed, 16 Jul 2008 19:31:02 GMT Subject: rpms/tunctl/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 tunctl.spec, 1.1, 1.2 Message-ID: <200807161931.m6GJV21l016204@cvs-int.fedora.redhat.com> Author: hno Update of /cvs/pkgs/rpms/tunctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16104 Modified Files: .cvsignore sources tunctl.spec Log Message: Tunctl is now a separate project, outsite of User Mode Linux. Update to new upstream 1.5 release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Mar 2008 15:51:15 -0000 1.1 +++ .cvsignore 16 Jul 2008 19:30:14 -0000 1.2 @@ -0,0 +1 @@ +tunctl-1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Mar 2008 15:51:15 -0000 1.1 +++ sources 16 Jul 2008 19:30:14 -0000 1.2 @@ -0,0 +1 @@ +fdbedc263b3e85bb0e087cd567414607 tunctl-1.5.tar.gz Index: tunctl.spec =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/devel/tunctl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tunctl.spec 26 Mar 2008 17:22:43 -0000 1.1 +++ tunctl.spec 16 Jul 2008 19:30:14 -0000 1.2 @@ -1,39 +1,30 @@ Name: tunctl -Version: 1.4 -Release: 2%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Create and remove virtual network interfaces Group: Applications/System License: GPL+ -URL: http://www.user-mode-linux.org/ -Source0: http://www.user-mode-linux.org/cvs/*checkout*/tools/tunctl/tunctl.c?rev=%{version} -# This is from Debian, http://packages.debian.org/sid/uml-utilities -Source1: http://svn.debian.org/viewsvn/*checkout*/pkg-uml/trunk/src/uml-utilities/debian/tunctl.sgml?rev=238 +URL: http://tunctl.sourceforge.net/ +Source0: http://downloads.sourceforge.net/tunctl/tunctl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils %description -Virtual network interface manipulation tool from User Mode Linux project. +tunctl is a tool to set up and maintain persistent TUN/TAP network interfaces, enabling user applications access to the wire side of a virtual nework interface. Such interfaces is useful for connecting VPN software, virtualization, emulation and a number of other similar applications to the network stack. +tunctl originates from the User Mode Linux project. %prep -%setup -T -c -n %{name}-%{version} -%{__cp} %{SOURCE0} tunctl.c -%{__cp} %{SOURCE1} tunctl.sgml +%setup %build -%{__cc} %{optflags} tunctl.c -o tunctl -docbook2man tunctl.sgml - +make %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_sbindir} -install -d $RPM_BUILD_ROOT%{_mandir}/man8 -install -m 755 tunctl $RPM_BUILD_ROOT%{_sbindir} -install -m 644 TUNCTL.8 $RPM_BUILD_ROOT%{_mandir}/man8/tunctl.8 - +make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT @@ -43,10 +34,12 @@ %defattr(-,root,root,-) %{_mandir}/man8/tunctl.8* %{_sbindir}/tunctl -#%doc - +%doc ChangeLog %changelog +* Wed Jul 16 2008 Henrik Nordstrom 1.5-1 +- Update to version 1.5 based on separate upstream release + * Tue Mar 25 2008 Lubomir Kundrak 1.4-2 - Move to sbin (Marek Mahut, #434583) From fedora-extras-commits at redhat.com Wed Jul 16 19:31:36 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 16 Jul 2008 19:31:36 GMT Subject: rpms/linkage/devel linkage.spec,1.4,1.5 Message-ID: <200807161931.m6GJVaD5016224@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179 Modified Files: linkage.spec Log Message: buildrequire boost-devel Index: linkage.spec =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linkage.spec 16 Jul 2008 17:10:20 -0000 1.4 +++ linkage.spec 16 Jul 2008 19:30:46 -0000 1.5 @@ -19,6 +19,7 @@ BuildRequires: gconfmm26-devel BuildRequires: gettext BuildRequires: dbus-c++-devel +BuildRequires: boost-devel Requires(pre): GConf2 Requires(post): GConf2 From fedora-extras-commits at redhat.com Wed Jul 16 19:36:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Henrik_Nordstr=C3=B6m?= (hno)) Date: Wed, 16 Jul 2008 19:36:32 GMT Subject: rpms/tunctl/devel tunctl.c?rev=1.4, 1.1, NONE tunctl.sgml?rev=238, 1.1, NONE Message-ID: <200807161936.m6GJaWaI016616@cvs-int.fedora.redhat.com> Author: hno Update of /cvs/pkgs/rpms/tunctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16578 Removed Files: tunctl.c?rev=1.4 tunctl.sgml?rev=238 Log Message: Remove old version files. --- tunctl.c?rev=1.4 DELETED --- --- tunctl.sgml?rev=238 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 19:37:27 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Wed, 16 Jul 2008 19:37:27 GMT Subject: rpms/opyum/F-9 dead.package, NONE, 1.1 Makefile, 1.1, NONE opyum-0.0.3-configure.patch, 1.1, NONE opyum.spec, 1.2, NONE sources, 1.3, NONE Message-ID: <200807161937.m6GJbRxI016673@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/opyum/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16629 Added Files: dead.package Removed Files: Makefile opyum-0.0.3-configure.patch opyum.spec sources Log Message: Retired from F-9. Added Files: dead.package Removed Files: Makefile opyum-0.0.3-configure.patch opyum.spec sources --- NEW FILE dead.package --- Useless in the absence of pirut. Use PackageKit instead. --- Makefile DELETED --- --- opyum-0.0.3-configure.patch DELETED --- --- opyum.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 19:46:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:46:25 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161946.m6GJkPjD029830@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the watchbugzilla acl on cx18-firmware (Fedora devel) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:46:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:46:29 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161946.m6GJkTgi029850@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the watchcommits acl on cx18-firmware (Fedora devel) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:46:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:46:31 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161946.m6GJkVrV029871@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the commit acl on cx18-firmware (Fedora devel) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:46:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:46:56 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161946.m6GJkTgl029850@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the commit acl on cx18-firmware (Fedora 9) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:46:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:46:59 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161946.m6GJkx5O029953@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the watchbugzilla acl on cx18-firmware (Fedora 9) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:46:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:46:57 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161946.m6GJkVrY029871@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the watchcommits acl on cx18-firmware (Fedora 9) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:47:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:47:04 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161947.m6GJkPjG029830@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the watchbugzilla acl on cx18-firmware (Fedora 8) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:47:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:47:06 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161947.m6GJkTgo029850@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the watchcommits acl on cx18-firmware (Fedora 8) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:47:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 16 Jul 2008 19:47:07 +0000 Subject: [pkgdb] cx18-firmware had acl change status Message-ID: <200807161947.m6GJl8aY030016@bastion.fedora.phx.redhat.com> Jarod Wilson (jwilson) has set the commit acl on cx18-firmware (Fedora 8) to Approved for Axel Thimm (athimm) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cx18-firmware From fedora-extras-commits at redhat.com Wed Jul 16 19:49:09 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 16 Jul 2008 19:49:09 GMT Subject: rpms/esound/devel esound.spec,1.43,1.44 Message-ID: <200807161949.m6GJn9AP017094@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/esound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17029 Modified Files: esound.spec Log Message: try to get it to build without docs Index: esound.spec =================================================================== RCS file: /cvs/extras/rpms/esound/devel/esound.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- esound.spec 15 Jul 2008 19:23:10 -0000 1.43 +++ esound.spec 16 Jul 2008 19:48:23 -0000 1.44 @@ -12,7 +12,8 @@ Patch4: esound-0.2.38-drain.patch Patch6: esound-0.2.38-fix-open-macro.patch Patch7: remove-confusing-spew.patch -BuildRequires: docbook-utils +# temporarily disable doc build due to xml catalog issues +#BuildRequires: docbook-utils BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel Obsoletes: esound <= 1:0.2.36-4 @@ -102,16 +103,17 @@ %{_bindir}/esdplay %{_bindir}/esdrec %{_bindir}/esdsample -%{_mandir}/man1/esdcat.1.gz -%{_mandir}/man1/esdctl.1.gz -%{_mandir}/man1/esddsp.1.gz -%{_mandir}/man1/esdfilt.1.gz -%{_mandir}/man1/esdloop.1.gz -%{_mandir}/man1/esdmon.1.gz -%{_mandir}/man1/esdplay.1.gz -%{_mandir}/man1/esdrec.1.gz -%{_mandir}/man1/esdsample.1.gz -%doc %{_datadir}/doc/esound +# temporarily disable doc build due to xml catalog issues +#%{_mandir}/man1/esdcat.1.gz +#%{_mandir}/man1/esdctl.1.gz +#%{_mandir}/man1/esddsp.1.gz +#%{_mandir}/man1/esdfilt.1.gz +#%{_mandir}/man1/esdloop.1.gz +#%{_mandir}/man1/esdmon.1.gz +#%{_mandir}/man1/esdplay.1.gz +#%{_mandir}/man1/esdrec.1.gz +#%{_mandir}/man1/esdsample.1.gz +#%doc %{_datadir}/doc/esound %files devel %defattr(-, root, root,-) @@ -120,12 +122,14 @@ %{_datadir}/aclocal/* %{_libdir}/*.so %{_libdir}/pkgconfig/* -%{_mandir}/man1/esd-config.1.gz +# temporarily disable doc build due to xml catalog issues +#%{_mandir}/man1/esd-config.1.gz %changelog * Tue Jul 15 2008 Matthias Clasen 0 1:0.2.39-1 - Update to 0.2.39 - Drop upstreamed patches +- Temporarily disable doc build due to xml catalog issues * Mon Feb 18 2008 Fedora Release Engineering - 1:0.2.38-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 19:55:05 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 16 Jul 2008 19:55:05 GMT Subject: rpms/esound/devel esound.spec,1.44,1.45 Message-ID: <200807161955.m6GJt5dq017451@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/esound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400 Modified Files: esound.spec Log Message: try again Index: esound.spec =================================================================== RCS file: /cvs/extras/rpms/esound/devel/esound.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- esound.spec 16 Jul 2008 19:48:23 -0000 1.44 +++ esound.spec 16 Jul 2008 19:54:19 -0000 1.45 @@ -103,16 +103,16 @@ %{_bindir}/esdplay %{_bindir}/esdrec %{_bindir}/esdsample +%{_mandir}/man1/esdcat.1.gz +%{_mandir}/man1/esdctl.1.gz +%{_mandir}/man1/esddsp.1.gz +%{_mandir}/man1/esdfilt.1.gz +%{_mandir}/man1/esdloop.1.gz +%{_mandir}/man1/esdmon.1.gz +%{_mandir}/man1/esdplay.1.gz +%{_mandir}/man1/esdrec.1.gz +%{_mandir}/man1/esdsample.1.gz # temporarily disable doc build due to xml catalog issues -#%{_mandir}/man1/esdcat.1.gz -#%{_mandir}/man1/esdctl.1.gz -#%{_mandir}/man1/esddsp.1.gz -#%{_mandir}/man1/esdfilt.1.gz -#%{_mandir}/man1/esdloop.1.gz -#%{_mandir}/man1/esdmon.1.gz -#%{_mandir}/man1/esdplay.1.gz -#%{_mandir}/man1/esdrec.1.gz -#%{_mandir}/man1/esdsample.1.gz #%doc %{_datadir}/doc/esound %files devel @@ -122,8 +122,6 @@ %{_datadir}/aclocal/* %{_libdir}/*.so %{_libdir}/pkgconfig/* -# temporarily disable doc build due to xml catalog issues -#%{_mandir}/man1/esd-config.1.gz %changelog * Tue Jul 15 2008 Matthias Clasen 0 1:0.2.39-1 From fedora-extras-commits at redhat.com Wed Jul 16 19:59:48 2008 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 16 Jul 2008 19:59:48 GMT Subject: rpms/udns/devel import.log, NONE, 1.1 udns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807161959.m6GJxm58017679@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/udns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17639/devel Modified Files: .cvsignore sources Added Files: import.log udns.spec Log Message: initial import --- NEW FILE import.log --- udns-0_0_9-2_fc8:HEAD:udns-0.0.9-2.fc8.src.rpm:1216238239 --- NEW FILE udns.spec --- Summary: DNS resolver library for both synchronous and asynchronous DNS queries Name: udns Version: 0.0.9 Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.corpit.ru/mjt/udns.html Source: http://www.corpit.ru/mjt/udns/udns_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description udns is a resolver library for C (and C++) programs, and a collection of useful DNS resolver utilities. %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the header files, static libraries and development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q %build CFLAGS="%{optflags}" ./configure --enable-ipv6 %{__make} %{?_smp_mflags} all sharedlib %install %{__rm} -rf %{buildroot} %{__install} -Dp -m0755 libudns.so.0 %{buildroot}%{_libdir}/libudns.so.0 %{__ln_s} -f libudns.so.0 %{buildroot}%{_libdir}/libudns.so %{__install} -Dp -m0755 dnsget %{buildroot}%{_bindir}/dnsget %{__install} -Dp -m0755 rblcheck %{buildroot}%{_bindir}/rblcheck %{__install} -Dp -m0444 dnsget.1 %{buildroot}%{_mandir}/man1/dnsget.1 %{__install} -Dp -m0444 rblcheck.1 %{buildroot}%{_mandir}/man1/rblcheck.1 %{__install} -Dp -m0444 udns.3 %{buildroot}%{_mandir}/man3/udns.3 %{__install} -Dp -m0644 udns.h %{buildroot}%{_includedir}/udns.h %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc COPYING.LGPL NEWS NOTES TODO %doc %{_mandir}/man1/dnsget.1* %doc %{_mandir}/man1/rblcheck.1* %{_bindir}/dnsget %{_bindir}/rblcheck %{_libdir}/libudns.so.* %files devel %defattr(-, root, root, 0755) %doc %{_mandir}/man3/udns.3* %{_includedir}/udns.h %{_libdir}/libudns.so %changelog * Wed Jul 16 2008 Adrian Reber - 0.0.9-2 - removed static library - added correct optflags - fixed license tag * Thu Nov 22 2007 Dag Wieers - 0.0.9-1 - +/ - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/udns/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jul 2008 16:30:35 -0000 1.1 +++ .cvsignore 16 Jul 2008 19:59:05 -0000 1.2 @@ -0,0 +1 @@ +udns_0.0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/udns/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jul 2008 16:30:35 -0000 1.1 +++ sources 16 Jul 2008 19:59:05 -0000 1.2 @@ -0,0 +1 @@ +78843added6f6b690bc6019ab8ef03c9 udns_0.0.9.tar.gz From fedora-extras-commits at redhat.com Wed Jul 16 20:03:10 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 16 Jul 2008 20:03:10 GMT Subject: rpms/esound/devel esound.spec,1.45,1.46 Message-ID: <200807162003.m6GK3AwV024522@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/esound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24475 Modified Files: esound.spec Log Message: try again Index: esound.spec =================================================================== RCS file: /cvs/extras/rpms/esound/devel/esound.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- esound.spec 16 Jul 2008 19:54:19 -0000 1.45 +++ esound.spec 16 Jul 2008 20:02:23 -0000 1.46 @@ -122,6 +122,7 @@ %{_datadir}/aclocal/* %{_libdir}/*.so %{_libdir}/pkgconfig/* +%{_mandir}/man1/esd-config.1.gz %changelog * Tue Jul 15 2008 Matthias Clasen 0 1:0.2.39-1 From fedora-extras-commits at redhat.com Wed Jul 16 20:19:06 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Wed, 16 Jul 2008 20:19:06 GMT Subject: rpms/notification-daemon-engine-nodoka/F-9 notification-daemon-engine-nodoka-clipping.patch, NONE, 1.1 notification-daemon-engine-nodoka.spec, 1.1, 1.2 Message-ID: <200807162019.m6GKJ6ED025055@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/notification-daemon-engine-nodoka/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24977/F-9 Modified Files: notification-daemon-engine-nodoka.spec Added Files: notification-daemon-engine-nodoka-clipping.patch Log Message: clog notification-daemon-engine-nodoka-clipping.patch: --- NEW FILE notification-daemon-engine-nodoka-clipping.patch --- diff -up notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.clipping notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c --- notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.clipping 2008-04-20 11:50:24.000000000 +0200 +++ notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c 2008-07-16 22:07:24.000000000 +0200 @@ -672,7 +672,7 @@ create_notification(UrlClickedCb url_cli gtk_window_set_title(GTK_WINDOW(win), "Notification"); gtk_widget_add_events(win, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); gtk_widget_realize(win); - gtk_widget_set_size_request(win, WIDTH, -1); +// gtk_widget_set_size_request(win, WIDTH, -1); g_object_set_data_full(G_OBJECT(win), "windata", windata, (GDestroyNotify)destroy_windata); @@ -819,7 +819,7 @@ set_notification_text(GtkWindow *nw, con update_content_hbox_visibility(windata); gtk_widget_set_size_request( - ((body != NULL && *body == '\0') + ((body != NULL && *body != '\0') ? windata->body_label : windata->summary_label), WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10, -1); Index: notification-daemon-engine-nodoka.spec =================================================================== RCS file: /cvs/extras/rpms/notification-daemon-engine-nodoka/F-9/notification-daemon-engine-nodoka.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- notification-daemon-engine-nodoka.spec 17 May 2008 23:07:08 -0000 1.1 +++ notification-daemon-engine-nodoka.spec 16 Jul 2008 20:18:22 -0000 1.2 @@ -1,12 +1,13 @@ Name: notification-daemon-engine-nodoka Version: 0.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Nodoka theme engine for the notification daemon Group: System Environment/Libraries License: GPLv3+ URL: https://nodoka.fedorahosted.org/ Source0: https://fedorahosted.org/releases/n/o/nodoka/notification-daemon-engine-nodoka-%{version}.tar.gz +Patch0: notification-daemon-engine-nodoka-clipping.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsexy-devel @@ -19,7 +20,7 @@ %prep %setup -q - +%patch0 -p1 -b .clipping %build %configure @@ -44,6 +45,9 @@ %{_libdir}/notification-daemon-1.0/engines/libnodoka.so %changelog +* Wed Jul 16 2008 Martin Sourada - 0.1.0-3 +- Don't clip text in message bubbles (rhbz #455617) + * Fri May 16 2008 Martin Sourada - 0.1.0-2 - Add BR: libxml2-devel, see #446842 From fedora-extras-commits at redhat.com Wed Jul 16 20:19:22 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Wed, 16 Jul 2008 20:19:22 GMT Subject: rpms/notification-daemon-engine-nodoka/F-8 notification-daemon-engine-nodoka-clipping.patch, NONE, 1.1 notification-daemon-engine-nodoka.spec, 1.1, 1.2 Message-ID: <200807162019.m6GKJMHv025062@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/notification-daemon-engine-nodoka/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24977/F-8 Modified Files: notification-daemon-engine-nodoka.spec Added Files: notification-daemon-engine-nodoka-clipping.patch Log Message: clog notification-daemon-engine-nodoka-clipping.patch: --- NEW FILE notification-daemon-engine-nodoka-clipping.patch --- diff -up notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.clipping notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c --- notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.clipping 2008-04-20 11:50:24.000000000 +0200 +++ notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c 2008-07-16 22:07:24.000000000 +0200 @@ -672,7 +672,7 @@ create_notification(UrlClickedCb url_cli gtk_window_set_title(GTK_WINDOW(win), "Notification"); gtk_widget_add_events(win, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); gtk_widget_realize(win); - gtk_widget_set_size_request(win, WIDTH, -1); +// gtk_widget_set_size_request(win, WIDTH, -1); g_object_set_data_full(G_OBJECT(win), "windata", windata, (GDestroyNotify)destroy_windata); @@ -819,7 +819,7 @@ set_notification_text(GtkWindow *nw, con update_content_hbox_visibility(windata); gtk_widget_set_size_request( - ((body != NULL && *body == '\0') + ((body != NULL && *body != '\0') ? windata->body_label : windata->summary_label), WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10, -1); Index: notification-daemon-engine-nodoka.spec =================================================================== RCS file: /cvs/extras/rpms/notification-daemon-engine-nodoka/F-8/notification-daemon-engine-nodoka.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- notification-daemon-engine-nodoka.spec 17 May 2008 23:06:54 -0000 1.1 +++ notification-daemon-engine-nodoka.spec 16 Jul 2008 20:18:08 -0000 1.2 @@ -1,12 +1,13 @@ Name: notification-daemon-engine-nodoka Version: 0.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Nodoka theme engine for the notification daemon Group: System Environment/Libraries License: GPLv3+ URL: https://nodoka.fedorahosted.org/ Source0: https://fedorahosted.org/releases/n/o/nodoka/notification-daemon-engine-nodoka-%{version}.tar.gz +Patch0: notification-daemon-engine-nodoka-clipping.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsexy-devel @@ -19,7 +20,7 @@ %prep %setup -q - +%patch0 -p1 -b .clipping %build %configure @@ -44,6 +45,9 @@ %{_libdir}/notification-daemon-1.0/engines/libnodoka.so %changelog +* Wed Jul 16 2008 Martin Sourada - 0.1.0-3 +- Don't clip text in message bubbles (rhbz #455617) + * Fri May 16 2008 Martin Sourada - 0.1.0-2 - Add BR: libxml2-devel, see #446842 From fedora-extras-commits at redhat.com Wed Jul 16 20:19:23 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Wed, 16 Jul 2008 20:19:23 GMT Subject: rpms/notification-daemon-engine-nodoka/devel notification-daemon-engine-nodoka-clipping.patch, NONE, 1.1 notification-daemon-engine-nodoka.spec, 1.1, 1.2 Message-ID: <200807162019.m6GKJNbh025065@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/notification-daemon-engine-nodoka/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24977/devel Modified Files: notification-daemon-engine-nodoka.spec Added Files: notification-daemon-engine-nodoka-clipping.patch Log Message: clog notification-daemon-engine-nodoka-clipping.patch: --- NEW FILE notification-daemon-engine-nodoka-clipping.patch --- diff -up notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.clipping notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c --- notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.clipping 2008-04-20 11:50:24.000000000 +0200 +++ notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c 2008-07-16 22:07:24.000000000 +0200 @@ -672,7 +672,7 @@ create_notification(UrlClickedCb url_cli gtk_window_set_title(GTK_WINDOW(win), "Notification"); gtk_widget_add_events(win, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); gtk_widget_realize(win); - gtk_widget_set_size_request(win, WIDTH, -1); +// gtk_widget_set_size_request(win, WIDTH, -1); g_object_set_data_full(G_OBJECT(win), "windata", windata, (GDestroyNotify)destroy_windata); @@ -819,7 +819,7 @@ set_notification_text(GtkWindow *nw, con update_content_hbox_visibility(windata); gtk_widget_set_size_request( - ((body != NULL && *body == '\0') + ((body != NULL && *body != '\0') ? windata->body_label : windata->summary_label), WIDTH - (IMAGE_SIZE + IMAGE_PADDING) - 10, -1); Index: notification-daemon-engine-nodoka.spec =================================================================== RCS file: /cvs/extras/rpms/notification-daemon-engine-nodoka/devel/notification-daemon-engine-nodoka.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- notification-daemon-engine-nodoka.spec 17 May 2008 23:01:38 -0000 1.1 +++ notification-daemon-engine-nodoka.spec 16 Jul 2008 20:18:37 -0000 1.2 @@ -1,12 +1,13 @@ Name: notification-daemon-engine-nodoka Version: 0.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Nodoka theme engine for the notification daemon Group: System Environment/Libraries License: GPLv3+ URL: https://nodoka.fedorahosted.org/ Source0: https://fedorahosted.org/releases/n/o/nodoka/notification-daemon-engine-nodoka-%{version}.tar.gz +Patch0: notification-daemon-engine-nodoka-clipping.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsexy-devel @@ -19,7 +20,7 @@ %prep %setup -q - +%patch0 -p1 -b .clipping %build %configure @@ -44,6 +45,9 @@ %{_libdir}/notification-daemon-1.0/engines/libnodoka.so %changelog +* Wed Jul 16 2008 Martin Sourada - 0.1.0-3 +- Don't clip text in message bubbles (rhbz #455617) + * Fri May 16 2008 Martin Sourada - 0.1.0-2 - Add BR: libxml2-devel, see #446842 From fedora-extras-commits at redhat.com Wed Jul 16 20:20:35 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 16 Jul 2008 20:20:35 GMT Subject: rpms/libnfnetlink/devel .cvsignore, 1.5, 1.6 libnfnetlink-sysheader.patch, 1.1, 1.2 libnfnetlink.spec, 1.9, 1.10 sources, 1.5, 1.6 libnfnetlink-0.0.33-svn7211.patch, 1.1, NONE Message-ID: <200807162020.m6GKKZa2025182@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25081 Modified Files: .cvsignore libnfnetlink-sysheader.patch libnfnetlink.spec sources Removed Files: libnfnetlink-0.0.33-svn7211.patch Log Message: grab latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Aug 2007 18:18:13 -0000 1.5 +++ .cvsignore 16 Jul 2008 20:19:47 -0000 1.6 @@ -1 +1 @@ -libnfnetlink-0.0.30.tar.bz2 +libnfnetlink-0.0.39.tar.bz2 libnfnetlink-sysheader.patch: Index: libnfnetlink-sysheader.patch =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/libnfnetlink-sysheader.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnfnetlink-sysheader.patch 22 Feb 2008 23:46:36 -0000 1.1 +++ libnfnetlink-sysheader.patch 16 Jul 2008 20:19:48 -0000 1.2 @@ -1,14 +1,14 @@ diff --git a/include/libnfnetlink/Makefile.am b/include/libnfnetlink/Makefile.am -index 81e14c8..ad946f0 100644 +index 76128c8..ecd451a 100644 --- a/include/libnfnetlink/Makefile.am +++ b/include/libnfnetlink/Makefile.am -@@ -1,3 +1,3 @@ +@@ -1,3 +1,2 @@ --pkginclude_HEADERS = libnfnetlink.h linux_nfnetlink.h +-pkginclude_HEADERS = libnfnetlink.h linux_nfnetlink.h linux_nfnetlink_compat.h +- +pkginclude_HEADERS = libnfnetlink.h - diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h -index 37fa663..d8b9516 100644 +index 83874e3..2c29ba9 100644 --- a/include/libnfnetlink/libnfnetlink.h +++ b/include/libnfnetlink/libnfnetlink.h @@ -17,7 +17,7 @@ @@ -22,23 +22,14 @@ #define NETLINK_NETFILTER 12 diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h deleted file mode 100644 -index 0f9311d..0000000 +index 76a8550..0000000 --- a/include/libnfnetlink/linux_nfnetlink.h +++ /dev/null -@@ -1,163 +0,0 @@ +@@ -1,85 +0,0 @@ -#ifndef _NFNETLINK_H -#define _NFNETLINK_H -#include -- --#ifndef __KERNEL__ --/* nfnetlink groups: Up to 32 maximum - backwards compatibility for userspace */ --#define NF_NETLINK_CONNTRACK_NEW 0x00000001 --#define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 --#define NF_NETLINK_CONNTRACK_DESTROY 0x00000004 --#define NF_NETLINK_CONNTRACK_EXP_NEW 0x00000008 --#define NF_NETLINK_CONNTRACK_EXP_UPDATE 0x00000010 --#define NF_NETLINK_CONNTRACK_EXP_DESTROY 0x00000020 --#endif +-#include - -enum nfnetlink_groups { - NFNLGRP_NONE, @@ -59,62 +50,16 @@ -}; -#define NFNLGRP_MAX (__NFNLGRP_MAX - 1) - --/* Generic structure for encapsulation optional netfilter information. -- * It is reminiscent of sockaddr, but with sa_family replaced -- * with attribute type. -- * ! This should someday be put somewhere generic as now rtnetlink and -- * ! nfnetlink use the same attributes methods. - J. Schulist. -- */ -- --struct nfattr --{ -- u_int16_t nfa_len; -- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest -- * bit to indicate whether the payload is nested */ --}; -- --/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from -- * rtnetlink.h, it's time to put this in a generic file */ -- --#define NFNL_NFA_NEST 0x8000 --#define NFA_TYPE(attr) ((attr)->nfa_type & 0x7fff) -- --#define NFA_ALIGNTO 4 --#define NFA_ALIGN(len) (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1)) --#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \ -- && (nfa)->nfa_len <= (len)) --#define NFA_NEXT(nfa,attrlen) ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \ -- (struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len))) --#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len)) --#define NFA_SPACE(len) NFA_ALIGN(NFA_LENGTH(len)) --#define NFA_DATA(nfa) ((void *)(((char *)(nfa)) + NFA_LENGTH(0))) --#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0)) --#define NFA_NEST(skb, type) \ --({ struct nfattr *__start = (struct nfattr *)skb_tail_pointer(skb); \ -- NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \ -- __start; }) --#define NFA_NEST_END(skb, start) \ --({ (start)->nfa_len = skb_tail_pointer(skb) - (unsigned char *)(start); \ -- (skb)->len; }) --#define NFA_NEST_CANCEL(skb, start) \ --({ if (start) \ -- skb_trim(skb, (unsigned char *) (start) - (skb)->data); \ -- -1; }) -- -/* General form of address family dependent message. - */ -struct nfgenmsg { - u_int8_t nfgen_family; /* AF_xxx */ - u_int8_t version; /* nfnetlink version */ -- __be16 res_id; /* resource id */ +- u_int16_t res_id; /* resource id */ -}; - -#define NFNETLINK_V0 0 - --#define NFM_NFA(n) ((struct nfattr *)(((char *)(n)) \ -- + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) --#define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) -- -/* netfilter netlink message types are split in two pieces: - * 8 bit subsystem, 8bit operation. - */ @@ -135,49 +80,26 @@ - -#include -#include +-#include - -struct nfnl_callback -{ - int (*call)(struct sock *nl, struct sk_buff *skb, -- struct nlmsghdr *nlh, struct nfattr *cda[]); -- u_int16_t attr_count; /* number of nfattr's */ +- struct nlmsghdr *nlh, struct nlattr *cda[]); +- const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ -}; - -struct nfnetlink_subsystem -{ - const char *name; -- __u8 subsys_id; /* nfnetlink subsystem ID */ -- __u8 cb_count; /* number of callbacks */ -- struct nfnl_callback *cb; /* callback for individual types */ +- __u8 subsys_id; /* nfnetlink subsystem ID */ +- __u8 cb_count; /* number of callbacks */ +- const struct nfnl_callback *cb; /* callback for individual types */ -}; - --extern void __nfa_fill(struct sk_buff *skb, int attrtype, -- int attrlen, const void *data); --#define NFA_PUT(skb, attrtype, attrlen, data) \ --({ if (skb_tailroom(skb) < (int)NFA_SPACE(attrlen)) goto nfattr_failure; \ -- __nfa_fill(skb, attrtype, attrlen, data); }) -- --extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n); --extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n); -- --extern void nfattr_parse(struct nfattr *tb[], int maxattr, -- struct nfattr *nfa, int len); -- --#define nfattr_parse_nested(tb, max, nfa) \ -- nfattr_parse((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) -- --#define nfattr_bad_size(tb, max, cta_min) \ --({ int __i, __res = 0; \ -- for (__i=0; __infa_type & 0x7fff) +- +-#define NFA_ALIGNTO 4 +-#define NFA_ALIGN(len) (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1)) +-#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \ +- && (nfa)->nfa_len <= (len)) +-#define NFA_NEXT(nfa,attrlen) ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \ +- (struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len))) +-#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len)) +-#define NFA_SPACE(len) NFA_ALIGN(NFA_LENGTH(len)) +-#define NFA_DATA(nfa) ((void *)(((char *)(nfa)) + NFA_LENGTH(0))) +-#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0)) +-#define NFA_NEST(skb, type) \ +-({ struct nfattr *__start = (struct nfattr *)skb_tail_pointer(skb); \ +- NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \ +- __start; }) +-#define NFA_NEST_END(skb, start) \ +-({ (start)->nfa_len = skb_tail_pointer(skb) - (unsigned char *)(start); \ +- (skb)->len; }) +-#define NFA_NEST_CANCEL(skb, start) \ +-({ if (start) \ +- skb_trim(skb, (unsigned char *) (start) - (skb)->data); \ +- -1; }) +- +-#define NFM_NFA(n) ((struct nfattr *)(((char *)(n)) \ +- + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) +-#define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) +- +-#endif /* ! __KERNEL__ */ +-#endif /* _NFNETLINK_COMPAT_H */ Index: libnfnetlink.spec =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/libnfnetlink.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libnfnetlink.spec 22 Feb 2008 23:46:36 -0000 1.9 +++ libnfnetlink.spec 16 Jul 2008 20:19:48 -0000 1.10 @@ -1,17 +1,16 @@ -%define rev 7211 -%define basever 0.0.30 +# %define rev 7211 +# %define basever 0.0.30 Name: libnfnetlink -Version: 0.0.33 -Release: 0.1.svn%{rev}%{?dist} +Version: 0.0.39 +Release: 1%{?dist} Summary: Netfilter netlink userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org -Source0: http://netfilter.org/projects/libnfnetlink/files/%{name}-%{basever}.tar.bz2 +Source0: http://netfilter.org/projects/libnfnetlink/files/%{name}-%{version}.tar.bz2 Source1: http://www.gnu.org/licenses/gpl.txt -Patch0: libnfnetlink-%{version}-svn%{rev}.patch -Patch1: libnfnetlink-sysheader.patch +Patch0: libnfnetlink-sysheader.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: kernel-headers BuildRequires: automake autoconf libtool @@ -35,10 +34,9 @@ and libnfnetlink_queue. %prep -%setup -q -n %{name}-%{basever} +%setup -q cp %{SOURCE1} LICENSE %patch -p1 -%patch1 -p1 autoreconf -i --force @@ -71,6 +69,9 @@ %{_includedir}/libnfnetlink/*.h %changelog +* Fri Jul 4 2008 Paul P. Komkoff Jr - 0.0.39 +- grab latest upstream release + * Fri Feb 22 2008 Paul P. Komkoff Jr - 0.0.33-0.1.svn7211 - grab latest upstream changes and fixes, along with new version number - do not mess with bundled nfnetlink.h, use Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Aug 2007 18:18:13 -0000 1.5 +++ sources 16 Jul 2008 20:19:48 -0000 1.6 @@ -1 +1 @@ -7fd3c8ddc03d42fa9f0177a17a38f163 libnfnetlink-0.0.30.tar.bz2 +348fed8c1edbe5b873ffc7b192140093 libnfnetlink-0.0.39.tar.bz2 --- libnfnetlink-0.0.33-svn7211.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 20:26:26 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Wed, 16 Jul 2008 20:26:26 GMT Subject: comps comps-f10.xml.in,1.51,1.52 Message-ID: <200807162026.m6GKQQp4025391@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25317 Modified Files: comps-f10.xml.in Log Message: Move acl, attr, dhclient, yum to Core. Make Base uservisible. This allows Core to be a minimal system that can still be customized via the normal software tools, without bloating the size too much. Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- comps-f10.xml.in 15 Jul 2008 12:20:09 -0000 1.51 +++ comps-f10.xml.in 16 Jul 2008 20:25:56 -0000 1.52 @@ -156,11 +156,9 @@ <_name>Base <_description>This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example. true - false + true - acl at - attr authconfig bc bind-utils @@ -189,7 +187,6 @@ cpuspeed cryptsetup-luks device-mapper-multipath - dhclient dhcpv6-client dmraid dos2unix @@ -264,7 +261,6 @@ wireless-tools words ypbind - yum yum-utils zip apmd @@ -607,11 +603,14 @@ true false + acl + attr authconfig basesystem bash coreutils cpio + dhclient e2fsprogs ed fedora-logos @@ -640,6 +639,7 @@ shadow-utils util-linux-ng vim-minimal + yum efibootmgr grub ppc64-utils From fedora-extras-commits at redhat.com Wed Jul 16 20:38:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 20:38:40 GMT Subject: rpms/dietlibc/devel dietlibc.spec,1.56,1.57 Message-ID: <200807162038.m6GKceoP025770@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dietlibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25724 Modified Files: dietlibc.spec Log Message: fix license tag Index: dietlibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/dietlibc/devel/dietlibc.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- dietlibc.spec 21 Jun 2008 14:57:08 -0000 1.56 +++ dietlibc.spec 16 Jul 2008 20:37:53 -0000 1.57 @@ -28,17 +28,17 @@ Summary: Small libc implementation Name: dietlibc Version: 0.31 -Release: %release_func 5%{?snapshot:.%snapshot} -License: GPL +Release: %release_func 6%{?snapshot:.%snapshot} +License: GPLv2 Group: Development/Libraries URL: http://www.fefe.de/dietlibc/ -%if !0%{?snapshot:1} -Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%name-%version.tar.bz2 -Source1: http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig -%else +# %%if !0%{?snapshot:1} +# Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%name-%version.tar.bz2 +# Source1: http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig +# %%else # generated by 'make cvs-sources [CVS_DATE=....]' Source0: %name-%version.%snapshot.tar.bz2 -%endif +# %%endif Source10: runtests-X.sh Patch1: dietlibc-0.28-setpriority.patch Patch10: dietlibc-0.29-scall.patch @@ -111,14 +111,14 @@ %patch49 -p1 -b .noreturn -%if %{without ssp} +# %%if %{without ssp} %patch20 -p1 -b .nostackprotector sed -i -e 's!^#define WANT_SSP$!// \0!g; s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h %global xtra_fixcflags -fno-stack-protector -%else -%global xtra_fixcflags %nil -%endif +# %%else +# %%global xtra_fixcflags %nil +# %%endif %ifarch %ix86 sed -i \ @@ -186,17 +186,20 @@ %{?with_dynamic:%exclude %pkglibdir/*/*.so} -%if %{with dynamic} +# %%if %{with dynamic} %files lib %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/* %dir %pkglibdir %dir %pkglibdir/lib-* %pkglibdir/lib-%target_cpu/*.so -%endif +# %%endif %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.31-6.20080517 +- fix license tag + * Sun May 18 2008 Enrico Scholz - 0.31-5.20080517 - updated to 20080517 snapshot - use patches from git repository From fedora-extras-commits at redhat.com Wed Jul 16 20:39:50 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 16 Jul 2008 20:39:50 GMT Subject: rpms/kernel/devel Makefile.config, 1.63, 1.64 kernel.spec, 1.772, 1.773 config-sparc, 1.2, NONE config-sparc-generic, 1.2, NONE config-sparc-smp, 1.1, NONE Message-ID: <200807162039.m6GKdof3025871@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25765 Modified Files: Makefile.config kernel.spec Removed Files: config-sparc config-sparc-generic config-sparc-smp Log Message: Remove sparc32 config files. Index: Makefile.config =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- Makefile.config 8 Apr 2008 09:07:04 -0000 1.63 +++ Makefile.config 16 Jul 2008 20:38:37 -0000 1.64 @@ -16,7 +16,7 @@ $(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \ $(CFG)-ia64-xen.config -PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64 sparc +PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) configs: $(CONFIGFILES) @@ -46,9 +46,6 @@ temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic perl merge.pl $^ > $@ -temp-sparc-generic: config-sparc-generic temp-generic - perl merge.pl $^ > $@ - temp-sparc64-generic: config-sparc64-generic temp-generic perl merge.pl $^ > $@ @@ -106,9 +103,6 @@ kernel-$(VERSION)-sparc64.config: config-sparc64 temp-sparc64-generic perl merge.pl $^ sparc64 > $@ -kernel-$(VERSION)-sparc.config: config-sparc temp-sparc-generic - perl merge.pl $^ sparc > $@ - kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic perl merge.pl $^ powerpc > $@ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.772 retrieving revision 1.773 diff -u -r1.772 -r1.773 --- kernel.spec 16 Jul 2008 17:05:46 -0000 1.772 +++ kernel.spec 16 Jul 2008 20:38:37 -0000 1.773 @@ -1778,6 +1778,9 @@ %changelog * Wed Jul 16 2008 Dave Jones +- Remove sparc32 config files. + +* Wed Jul 16 2008 Dave Jones - 2.6.26-git3 * Tue Jul 15 2008 Dave Jones --- config-sparc DELETED --- --- config-sparc-generic DELETED --- --- config-sparc-smp DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 20:40:41 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 16 Jul 2008 20:40:41 GMT Subject: rpms/libnetfilter_log/devel .cvsignore, 1.2, 1.3 libnetfilter_log-sysheader.patch, 1.1, 1.2 libnetfilter_log.spec, 1.5, 1.6 sources, 1.2, 1.3 libnetfilter_log-configure.patch, 1.1, NONE Message-ID: <200807162040.m6GKefdS025935@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_log/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25877 Modified Files: .cvsignore libnetfilter_log-sysheader.patch libnetfilter_log.spec sources Removed Files: libnetfilter_log-configure.patch Log Message: grab latest upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_log/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 May 2007 04:31:31 -0000 1.2 +++ .cvsignore 16 Jul 2008 20:39:55 -0000 1.3 @@ -1 +1 @@ -libnetfilter_log-0.0.13.tar.bz2 +libnetfilter_log-0.0.14.tar.bz2 libnetfilter_log-sysheader.patch: Index: libnetfilter_log-sysheader.patch =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_log/devel/libnetfilter_log-sysheader.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnetfilter_log-sysheader.patch 4 Apr 2008 23:38:28 -0000 1.1 +++ libnetfilter_log-sysheader.patch 16 Jul 2008 20:39:55 -0000 1.2 @@ -8,7 +8,7 @@ - +pkginclude_HEADERS = libnetfilter_log.h libipulog.h diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h -index 5615daf..3a184af 100644 +index 4e5d763..a40b228 100644 --- a/include/libnetfilter_log/libnetfilter_log.h +++ b/include/libnetfilter_log/libnetfilter_log.h @@ -9,7 +9,11 @@ @@ -26,10 +26,10 @@ struct nflog_g_handle; diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h deleted file mode 100644 -index 12787e7..0000000 +index f8e174d..0000000 --- a/include/libnetfilter_log/linux_nfnetlink_log.h +++ /dev/null -@@ -1,98 +0,0 @@ +@@ -1,99 +0,0 @@ -#ifndef _NFNETLINK_LOG_H -#define _NFNETLINK_LOG_H - @@ -85,6 +85,7 @@ - NFULA_UID, /* user id of socket */ - NFULA_SEQ, /* instance-local sequence number */ - NFULA_SEQ_GLOBAL, /* global sequence number */ +- NFULA_GID, /* group id of socket */ - - __NFULA_MAX -}; @@ -129,7 +130,7 @@ - -#endif /* _NFNETLINK_LOG_H */ diff --git a/src/libnetfilter_log.c b/src/libnetfilter_log.c -index 95537d8..4b64d4a 100644 +index 2019b0c..d312a58 100644 --- a/src/libnetfilter_log.c +++ b/src/libnetfilter_log.c @@ -26,8 +26,6 @@ Index: libnetfilter_log.spec =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_log/devel/libnetfilter_log.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libnetfilter_log.spec 4 Apr 2008 23:38:28 -0000 1.5 +++ libnetfilter_log.spec 16 Jul 2008 20:39:55 -0000 1.6 @@ -1,13 +1,12 @@ Name: libnetfilter_log -Version: 0.0.13 -Release: 6%{?dist} +Version: 0.0.14 +Release: 1%{?dist} Summary: Netfilter logging userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 -Patch0: libnetfilter_log-configure.patch -Patch1: libnetfilter_log-sysheader.patch +Patch0: libnetfilter_log-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel, pkgconfig, kernel-headers @@ -39,7 +38,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 autoreconf -i --force @@ -72,6 +70,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 16 2008 Paul P. Komkoff Jr - 0.0.14-1 +- grab latest upstream version + * Sat Apr 5 2008 Paul P Komkoff Jr - 0.0.13-6 - update to latest svn and to use system netfilter header (fixes the build) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_log/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 May 2007 04:31:31 -0000 1.2 +++ sources 16 Jul 2008 20:39:55 -0000 1.3 @@ -1 +1 @@ -168e4f46f6ad5549ddbaddf675e54552 libnetfilter_log-0.0.13.tar.bz2 +ec743e5576b3bc233f5176ea124cf460 libnetfilter_log-0.0.14.tar.bz2 --- libnetfilter_log-configure.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 20:42:11 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 16 Jul 2008 20:42:11 GMT Subject: rpms/clive/devel .cvsignore, 1.3, 1.4 clive.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807162042.m6GKgBro026045@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25949 Modified Files: .cvsignore clive.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2008 20:23:01 -0000 1.3 +++ .cvsignore 16 Jul 2008 20:41:22 -0000 1.4 @@ -1 +1 @@ -clive-0.4.17.tar.bz2 +clive-0.4.18.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clive.spec 30 Jun 2008 20:23:01 -0000 1.2 +++ clive.spec 16 Jul 2008 20:41:22 -0000 1.3 @@ -1,6 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 17 +%define minor_version 18 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} @@ -30,7 +30,7 @@ %build -%configure --without-urlgrabber --without-feedparser --without-newt +%configure --with-installed-urlgrabber --with-installed-feedparser --with-installed-newt make @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING INSTALL README TODO +%doc AUTHORS COPYING INSTALL README TODO ChangeLog NEWS %dir %{python_sitelib}/%{name} %{_bindir}/%{name} %{python_sitelib}/%{name}/*.py @@ -58,6 +58,8 @@ %changelog +* Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 +- rebuild for 0.4.18 * Sun Jun 29 2008 Nicoleau Fabien 0.4.17-1 - rebuild for 0.4.17 * Fri Jun 27 2008 Nicoleau Fabien 0.4.16-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2008 20:23:01 -0000 1.3 +++ sources 16 Jul 2008 20:41:22 -0000 1.4 @@ -1 +1 @@ -b8738baf23abd9381d33f1e6a950b985 clive-0.4.17.tar.bz2 +bf5630fcea81d0b8c593fd79eb3ebd83 clive-0.4.18.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 20:50:32 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 16 Jul 2008 20:50:32 GMT Subject: rpms/dietlibc/devel dietlibc-0.29-scall.patch,1.3,1.4 Message-ID: <200807162050.m6GKoWQw026374@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26326 Modified Files: dietlibc-0.29-scall.patch Log Message: fixed patch dietlibc-0.29-scall.patch: Index: dietlibc-0.29-scall.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.29-scall.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.29-scall.patch 2 Jul 2008 06:57:21 -0000 1.3 +++ dietlibc-0.29-scall.patch 16 Jul 2008 20:49:34 -0000 1.4 @@ -13,7 +13,7 @@ index c9f72bb..6b6a8aa 100644 --- a/libcompat/syscall.S +++ b/libcompat/syscall.S -@@ -130,7 +130,12 @@ syscall: +@@ -130,6 +130,12 @@ syscall: b __unified_syscall #else From fedora-extras-commits at redhat.com Wed Jul 16 20:51:18 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 16 Jul 2008 20:51:18 GMT Subject: rpms/clive/F-8 .cvsignore, 1.3, 1.4 clive.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807162051.m6GKpI6l026503@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26369 Modified Files: .cvsignore clive.spec sources Log Message: Upstream update 0.4.18 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2008 20:49:43 -0000 1.3 +++ .cvsignore 16 Jul 2008 20:50:34 -0000 1.4 @@ -1 +1 @@ -clive-0.4.17.tar.bz2 +clive-0.4.18.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/clive.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clive.spec 30 Jun 2008 20:49:43 -0000 1.2 +++ clive.spec 16 Jul 2008 20:50:34 -0000 1.3 @@ -1,6 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 17 +%define minor_version 18 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} @@ -30,7 +30,7 @@ %build -%configure --without-urlgrabber --without-feedparser --without-newt +%configure --with-installed-urlgrabber --with-installed-feedparser --with-installed-newt make @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING INSTALL README TODO +%doc AUTHORS COPYING INSTALL README TODO ChangeLog NEWS %dir %{python_sitelib}/%{name} %{_bindir}/%{name} %{python_sitelib}/%{name}/*.py @@ -58,6 +58,8 @@ %changelog +* Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 +- rebuild for 0.4.18 * Sun Jun 29 2008 Nicoleau Fabien 0.4.17-1 - rebuild for 0.4.17 * Fri Jun 27 2008 Nicoleau Fabien 0.4.16-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2008 20:49:43 -0000 1.3 +++ sources 16 Jul 2008 20:50:34 -0000 1.4 @@ -1 +1 @@ -b8738baf23abd9381d33f1e6a950b985 clive-0.4.17.tar.bz2 +bf5630fcea81d0b8c593fd79eb3ebd83 clive-0.4.18.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 20:53:49 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 16 Jul 2008 20:53:49 GMT Subject: rpms/clive/F-9 .cvsignore, 1.3, 1.4 clive.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807162053.m6GKrnms026747@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625 Modified Files: .cvsignore clive.spec sources Log Message: update to 0.4.18 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2008 21:00:23 -0000 1.3 +++ .cvsignore 16 Jul 2008 20:53:04 -0000 1.4 @@ -1 +1 @@ -clive-0.4.17.tar.bz2 +clive-0.4.18.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/clive.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clive.spec 30 Jun 2008 21:00:23 -0000 1.2 +++ clive.spec 16 Jul 2008 20:53:04 -0000 1.3 @@ -1,6 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 17 +%define minor_version 18 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} @@ -30,7 +30,7 @@ %build -%configure --without-urlgrabber --without-feedparser --without-newt +%configure --with-installed-urlgrabber --with-installed-feedparser --with-installed-newt make @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING INSTALL README TODO +%doc AUTHORS COPYING INSTALL README TODO ChangeLog NEWS %dir %{python_sitelib}/%{name} %{_bindir}/%{name} %{python_sitelib}/%{name}/*.py @@ -58,6 +58,8 @@ %changelog +* Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 +- rebuild for 0.4.18 * Sun Jun 29 2008 Nicoleau Fabien 0.4.17-1 - rebuild for 0.4.17 * Fri Jun 27 2008 Nicoleau Fabien 0.4.16-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2008 21:00:23 -0000 1.3 +++ sources 16 Jul 2008 20:53:04 -0000 1.4 @@ -1 +1 @@ -b8738baf23abd9381d33f1e6a950b985 clive-0.4.17.tar.bz2 +bf5630fcea81d0b8c593fd79eb3ebd83 clive-0.4.18.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 20:55:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Wed, 16 Jul 2008 20:55:15 GMT Subject: rpms/ltsp/F-9 .cvsignore, 1.11, 1.12 ltsp.spec, 1.18, 1.19 sources, 1.15, 1.16 Message-ID: <200807162055.m6GKtF6p026897@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26843 Modified Files: .cvsignore ltsp.spec sources Log Message: - Move some chroot setup into ltsp-client %%post so things can be fixed by ltsp-client package updates in the future. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 Jul 2008 15:49:58 -0000 1.11 +++ .cvsignore 16 Jul 2008 20:54:32 -0000 1.12 @@ -1 +1 @@ -ltsp-5.1.11.tar.bz2 +ltsp-5.1.12.tar.bz2 Index: ltsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ltsp.spec 10 Jul 2008 15:49:58 -0000 1.18 +++ ltsp.spec 16 Jul 2008 20:54:32 -0000 1.19 @@ -1,7 +1,7 @@ Name: ltsp -Version: 5.1.11 -#%define _datestamp .20080707.13 -#Release: 1%{_datestamp}%{?dist} +Version: 5.1.12 +%define _datestamp .20080716.16 +#Release: 0%{_datestamp}%{?dist} Release: 1%{?dist} Summary: Linux Terminal Server Project Server and Client Group: User Interface/Desktops @@ -16,6 +16,7 @@ BuildRequires: popt-devel BuildRequires: flex bison BuildRequires: automake +BuildRequires: pkgconfig BuildRequires: libX11-devel %ifarch %{ix86} x86_64 # Need pxelinux.0 from syslinux if server is x86 @@ -23,8 +24,12 @@ %endif BuildRequires: tftp-server -# Need location of tftpboot directory from tftp-server -%define _tftpdir %(cat /etc/xinetd.d/tftp |grep server_args | awk -F"-s " {'print $2'} || echo -n "/BOGUS/DIRECTORY") +# tftpboot directory location changed in F9+ +%if 0%{?fedora} > 8 || 0%{?rhel} > 5 +%define _tftpdir /var/lib/tftpboot +%else +%define _tftpdir /tftpboot +%endif %description LTSP client and server @@ -79,7 +84,6 @@ popd pushd client/xrexecd - ./autogen.sh %configure make %{?_smp_mflags} popd @@ -95,6 +99,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/ +mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/ # server mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 @@ -136,6 +141,8 @@ install -m 0644 client/screen-x-common $RPM_BUILD_ROOT/%{_datadir}/ltsp/ install -m 0755 client/jetpipe/jetpipe $RPM_BUILD_ROOT/%{_sbindir} install -m 0644 client/jetpipe/jetpipe.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ +install -m 0700 client/chroot-setup/ltsp-chroot-setup $RPM_BUILD_ROOT/%{_datadir}/ltsp/ +cp -av client/chroot-setup/k12linux/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/ cp -av client/screen.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/ touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed @@ -166,7 +173,6 @@ install -m 0755 server/scripts/k12linux/dhcpd-update $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/ cp -p server/scripts/k12linux/scripts.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/ cp -p server/scripts/k12linux/chkconfig.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/ -install -m 0644 server/configs/k12linux/etchosts.template $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/etchosts.template # configs install -m 0644 server/configs/k12linux/ifcfg-ltspbr0 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/ @@ -200,6 +206,9 @@ %clean rm -rf $RPM_BUILD_ROOT +%post client +/usr/share/ltsp/ltsp-chroot-setup + %post server /sbin/chkconfig --add ltsp-dhcpd @@ -235,7 +244,8 @@ %{_datadir}/ltsp/screen.d/ %{_sbindir}/jetpipe %{_mandir}/man8/jetpipe.8.gz - +%{_datadir}/ltsp/ltsp-chroot-setup +%{_datadir}/ltsp/chroot-setup.d/ # readonly-root related files %{_sysconfdir}/rwtab.d/* @@ -314,6 +324,10 @@ %endif %changelog +* Wed Jul 16 2008 Warren Togami - 5.1.12-1 +- Move some chroot setup into ltsp-client %%post so things can be fixed + by ltsp-client package updates in the future. + * Thu Jul 10 2008 Warren Togami - 5.1.11-1 - LDM_DIRECTX=yes unencrypted X by default in lts.conf This is for performance and scalability. Turn it off if you want security. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 10 Jul 2008 15:49:58 -0000 1.15 +++ sources 16 Jul 2008 20:54:32 -0000 1.16 @@ -1 +1 @@ -0d4f4a0bede9dddeceb979c65617f0e9 ltsp-5.1.11.tar.bz2 +63e0f7ebbd4001c1f41a57f32a155a3c ltsp-5.1.12.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 20:56:10 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 16 Jul 2008 20:56:10 GMT Subject: rpms/linkage/devel linkage.spec,1.5,1.6 Message-ID: <200807162056.m6GKuACN026965@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26942 Modified Files: linkage.spec Log Message: fix build .... Index: linkage.spec =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linkage.spec 16 Jul 2008 19:30:46 -0000 1.5 +++ linkage.spec 16 Jul 2008 20:55:20 -0000 1.6 @@ -45,8 +45,7 @@ %patch0 -p1 -b .rb_libtorrent %build -%configure --disable-schemas-install - +%configure --disable-schemas-install --with-boost-serialization=mt # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool From fedora-extras-commits at redhat.com Wed Jul 16 20:58:08 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 16 Jul 2008 20:58:08 GMT Subject: rpms/libnetfilter_conntrack/devel .cvsignore, 1.9, 1.10 libnetfilter_conntrack-sysheader.patch, 1.1, 1.2 libnetfilter_conntrack.spec, 1.15, 1.16 sources, 1.9, 1.10 libnetfilter_conntrack-in6addr.patch, 1.2, NONE Message-ID: <200807162058.m6GKw88L027095@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27029 Modified Files: .cvsignore libnetfilter_conntrack-sysheader.patch libnetfilter_conntrack.spec sources Removed Files: libnetfilter_conntrack-in6addr.patch Log Message: grab new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 Feb 2008 04:04:31 -0000 1.9 +++ .cvsignore 16 Jul 2008 20:57:19 -0000 1.10 @@ -1,2 +1 @@ -libnetfilter_conntrack-0.0.82.tar.bz2 -libnetfilter_conntrack-0.0.89-svn7356.patch.bz2 +libnetfilter_conntrack-0.0.96.tar.bz2 libnetfilter_conntrack-sysheader.patch: Index: libnetfilter_conntrack-sysheader.patch =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/libnetfilter_conntrack-sysheader.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnetfilter_conntrack-sysheader.patch 23 Feb 2008 04:04:31 -0000 1.1 +++ libnetfilter_conntrack-sysheader.patch 16 Jul 2008 20:57:19 -0000 1.2 @@ -1,278 +1,25 @@ -diff --git a/include/libnetfilter_conntrack/Makefile.am b/include/libnetfilter_conntrack/Makefile.am -index 9e4a2d1..760fbf6 100644 ---- a/include/libnetfilter_conntrack/Makefile.am -+++ b/include/libnetfilter_conntrack/Makefile.am -@@ -1,5 +1,5 @@ - --pkginclude_HEADERS = libnetfilter_conntrack.h linux_nfnetlink_conntrack.h libnetfilter_conntrack_tcp.h libnetfilter_conntrack_udp.h libnetfilter_conntrack_icmp.h libnetfilter_conntrack_sctp.h libnetfilter_conntrack_ipv4.h libnetfilter_conntrack_ipv6.h -+pkginclude_HEADERS = libnetfilter_conntrack.h libnetfilter_conntrack_tcp.h libnetfilter_conntrack_udp.h libnetfilter_conntrack_icmp.h libnetfilter_conntrack_sctp.h libnetfilter_conntrack_ipv4.h libnetfilter_conntrack_ipv6.h - - noinst_HEADERS = libnetfilter_conntrack_extensions.h \ - libnetfilter_conntrack_l3extensions.h diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h -index 27c3cf0..b51782d 100644 +index a043f91..6c142a7 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h -@@ -9,9 +9,8 @@ +@@ -9,7 +9,7 @@ #define _LIBNETFILTER_CONNTRACK_H_ #include -#include ++#include #include --#include -+#include + #include - #ifdef __cplusplus - extern "C" { diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h -deleted file mode 100644 -index 7f0fe96..0000000 +index 3b2d869..97ec29c 100644 --- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h -+++ /dev/null -@@ -1,161 +0,0 @@ --#ifndef _IPCONNTRACK_NETLINK_H --#define _IPCONNTRACK_NETLINK_H ++++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +@@ -1,6 +1,6 @@ + #ifndef _IPCONNTRACK_NETLINK_H + #define _IPCONNTRACK_NETLINK_H -#include -- --#ifdef __cplusplus --extern "C" { --#endif -- --enum cntl_msg_types { -- IPCTNL_MSG_CT_NEW, -- IPCTNL_MSG_CT_GET, -- IPCTNL_MSG_CT_DELETE, -- IPCTNL_MSG_CT_GET_CTRZERO, -- -- IPCTNL_MSG_MAX --}; -- --enum ctnl_exp_msg_types { -- IPCTNL_MSG_EXP_NEW, -- IPCTNL_MSG_EXP_GET, -- IPCTNL_MSG_EXP_DELETE, -- -- IPCTNL_MSG_EXP_MAX --}; -- -- --enum ctattr_type { -- CTA_UNSPEC, -- CTA_TUPLE_ORIG, -- CTA_TUPLE_REPLY, -- CTA_STATUS, -- CTA_PROTOINFO, -- CTA_HELP, -- CTA_NAT_SRC, --#define CTA_NAT CTA_NAT_SRC /* backwards compatibility */ -- CTA_TIMEOUT, -- CTA_MARK, -- CTA_COUNTERS_ORIG, -- CTA_COUNTERS_REPLY, -- CTA_USE, -- CTA_ID, -- CTA_NAT_DST, -- CTA_TUPLE_MASTER, -- CTA_NAT_SEQ_ADJ_ORIG, -- CTA_NAT_SEQ_ADJ_REPLY, -- CTA_SECMARK, -- __CTA_MAX --}; --#define CTA_MAX (__CTA_MAX - 1) -- --enum ctattr_tuple { -- CTA_TUPLE_UNSPEC, -- CTA_TUPLE_IP, -- CTA_TUPLE_PROTO, -- __CTA_TUPLE_MAX --}; --#define CTA_TUPLE_MAX (__CTA_TUPLE_MAX - 1) -- --enum ctattr_ip { -- CTA_IP_UNSPEC, -- CTA_IP_V4_SRC, -- CTA_IP_V4_DST, -- CTA_IP_V6_SRC, -- CTA_IP_V6_DST, -- __CTA_IP_MAX --}; --#define CTA_IP_MAX (__CTA_IP_MAX - 1) -- --enum ctattr_l4proto { -- CTA_PROTO_UNSPEC, -- CTA_PROTO_NUM, -- CTA_PROTO_SRC_PORT, -- CTA_PROTO_DST_PORT, -- CTA_PROTO_ICMP_ID, -- CTA_PROTO_ICMP_TYPE, -- CTA_PROTO_ICMP_CODE, -- CTA_PROTO_ICMPV6_ID, -- CTA_PROTO_ICMPV6_TYPE, -- CTA_PROTO_ICMPV6_CODE, -- __CTA_PROTO_MAX --}; --#define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1) -- --enum ctattr_protoinfo { -- CTA_PROTOINFO_UNSPEC, -- CTA_PROTOINFO_TCP, -- __CTA_PROTOINFO_MAX --}; --#define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1) -- --enum ctattr_protoinfo_tcp { -- CTA_PROTOINFO_TCP_UNSPEC, -- CTA_PROTOINFO_TCP_STATE, -- CTA_PROTOINFO_TCP_WSCALE_ORIGINAL, -- CTA_PROTOINFO_TCP_WSCALE_REPLY, -- CTA_PROTOINFO_TCP_FLAGS_ORIGINAL, -- CTA_PROTOINFO_TCP_FLAGS_REPLY, -- __CTA_PROTOINFO_TCP_MAX --}; --#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1) -- --enum ctattr_counters { -- CTA_COUNTERS_UNSPEC, -- CTA_COUNTERS_PACKETS, /* old 64bit counters */ -- CTA_COUNTERS_BYTES, /* old 64bit counters */ -- CTA_COUNTERS32_PACKETS, -- CTA_COUNTERS32_BYTES, -- __CTA_COUNTERS_MAX --}; --#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1) -- --enum ctattr_nat { -- CTA_NAT_UNSPEC, -- CTA_NAT_MINIP, -- CTA_NAT_MAXIP, -- CTA_NAT_PROTO, -- __CTA_NAT_MAX --}; --#define CTA_NAT_MAX (__CTA_NAT_MAX - 1) -- --enum ctattr_protonat { -- CTA_PROTONAT_UNSPEC, -- CTA_PROTONAT_PORT_MIN, -- CTA_PROTONAT_PORT_MAX, -- __CTA_PROTONAT_MAX --}; --#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) -- --enum ctattr_natseq { -- CTA_NAT_SEQ_CORRECTION_POS, -- CTA_NAT_SEQ_OFFSET_BEFORE, -- CTA_NAT_SEQ_OFFSET_AFTER, -- __CTA_NAT_SEQ_MAX --}; --#define CTA_NAT_SEQ_MAX (__CTA_NAT_SEQ_MAX - 1) -- --enum ctattr_expect { -- CTA_EXPECT_UNSPEC, -- CTA_EXPECT_MASTER, -- CTA_EXPECT_TUPLE, -- CTA_EXPECT_MASK, -- CTA_EXPECT_TIMEOUT, -- CTA_EXPECT_ID, -- CTA_EXPECT_HELP_NAME, -- CTA_EXPECT_QUEUENR, -- __CTA_EXPECT_MAX --}; --#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1) -- --enum ctattr_help { -- CTA_HELP_UNSPEC, -- CTA_HELP_NAME, -- __CTA_HELP_MAX --}; --#define CTA_HELP_MAX (__CTA_HELP_MAX - 1) -- --#ifdef __cplusplus --} --#endif -- --#endif /* _IPCONNTRACK_NETLINK_H */ -diff --git a/src/deprecated.c b/src/deprecated.c -index 6555062..d8331d5 100644 ---- a/src/deprecated.c -+++ b/src/deprecated.c -@@ -43,6 +43,8 @@ static char *l3proto2str[AF_MAX] = { - static struct nfct_proto *findproto(char *name); - static struct nfct_l3proto *findl3proto(char *name); ++#include -+#define CTA_EXPECT_QUEUENR (CTA_EXPECT_HELP_NAME + 1) -+ - /* handler used for nfnl_listen */ - static int callback_handler(struct sockaddr_nl *nladdr, - struct nlmsghdr *n, void *arg) -diff --git a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c -index 72a7eb0..7127b4b 100644 ---- a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c -+++ b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c -@@ -12,7 +12,6 @@ - #include - #include - #include /* For htons */ --#include - #include - #include - #include -diff --git a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c -index 3785c2e..f963161 100644 ---- a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c -+++ b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c -@@ -12,7 +12,6 @@ - #include - #include - #include /* For htons */ --#include - #include - #include - #include -diff --git a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c -index 9efdbb7..9f74517 100644 ---- a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c -+++ b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c -@@ -12,7 +12,6 @@ - #include - #include - #include /* For htons */ --#include - #include - #include - #include -diff --git a/src/deprecated/extensions/libnetfilter_conntrack_udp.c b/src/deprecated/extensions/libnetfilter_conntrack_udp.c -index c1d20c3..e63463c 100644 ---- a/src/deprecated/extensions/libnetfilter_conntrack_udp.c -+++ b/src/deprecated/extensions/libnetfilter_conntrack_udp.c -@@ -12,7 +12,6 @@ - #include - #include - #include /* For htons */ --#include - #include - #include - #include -diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c -index 727ea01..e70102d 100644 ---- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c -+++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c -@@ -9,7 +9,6 @@ - #include - #include - #include /* For htons */ --#include - #include - #include - #include -diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c -index 5f173f3..b751c7a 100644 ---- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c -+++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c -@@ -12,7 +12,6 @@ - #include - #include /* For htons */ - #include --#include - #include - #include - #include + #ifdef __cplusplus + extern "C" { Index: libnetfilter_conntrack.spec =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/libnetfilter_conntrack.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libnetfilter_conntrack.spec 23 Feb 2008 04:04:31 -0000 1.15 +++ libnetfilter_conntrack.spec 16 Jul 2008 20:57:19 -0000 1.16 @@ -1,17 +1,15 @@ -%define rev 7356 -%define basever 0.0.82 +# %define rev 7356 +# %define basever 0.0.82 Name: libnetfilter_conntrack -Version: 0.0.89 -Release: 0.1.svn%{rev}%{?dist} +Version: 0.0.96 +Release: 1%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org -Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{basever}.tar.bz2 -Patch0: libnetfilter_conntrack-%{version}-svn%{rev}.patch.bz2 -Patch1: libnetfilter_conntrack-in6addr.patch -Patch2: libnetfilter_conntrack-sysheader.patch +Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 +Patch0: libnetfilter_conntrack-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel, pkgconfig, kernel-headers @@ -32,10 +30,8 @@ interface (API) to the in-kernel connection tracking state table. %prep -%setup -q -n %{name}-%{basever} +%setup -q %patch -p1 -%patch1 -p1 -%patch2 -p1 autoreconf -i --force @@ -68,6 +64,10 @@ %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Wed Jul 16 2008 Paul P. Komkoff Jr - 0.0.96-1 +- grab new upstream version +- use bundled header again + * Sat Feb 23 2008 Paul P. Komkoff Jr - 0.0.89-0.1.svn7356 - new version from upstream svn, with new api - use system headers instead of bundled Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Feb 2008 04:04:31 -0000 1.9 +++ sources 16 Jul 2008 20:57:19 -0000 1.10 @@ -1,2 +1 @@ -b3f6bc03a362baef942680572300c3bf libnetfilter_conntrack-0.0.82.tar.bz2 -82a13ea845c42b59b63a251dc400c8b4 libnetfilter_conntrack-0.0.89-svn7356.patch.bz2 +5bb4f8f5b94ba0afb3e14c240500fd46 libnetfilter_conntrack-0.0.96.tar.bz2 --- libnetfilter_conntrack-in6addr.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 21:01:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:01:40 GMT Subject: rpms/libextractor/devel libextractor.spec,1.9,1.10 Message-ID: <200807162101.m6GL1enU001357@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/libextractor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27248 Modified Files: libextractor.spec Log Message: fix license tag Index: libextractor.spec =================================================================== RCS file: /cvs/pkgs/rpms/libextractor/devel/libextractor.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libextractor.spec 21 Jun 2008 18:55:23 -0000 1.9 +++ libextractor.spec 16 Jul 2008 21:00:51 -0000 1.10 @@ -6,11 +6,11 @@ Name: libextractor Version: 0.5.20b -Release: %release_func 1 +Release: %release_func 2 Summary: Simple library for keyword extraction Group: System Environment/Libraries -License: GPL +License: GPLv2+ URL: http://gnunet.org/libextractor/ Source0: http://gnunet.org/libextractor/download/%name-%version.tar.gz #Source1: http://gnunet.org/libextractor/download/%name-%version.tar.gz.sig @@ -242,6 +242,9 @@ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.5.20b-2 +- fix license tag + * Sat Jun 21 2008 Enrico Scholz - 0.5.20b-1 - updated to 0.5.20b (SECURITY); fixes CVE-2008-1693 (xpdf embedded font vulnerability) From fedora-extras-commits at redhat.com Wed Jul 16 21:06:43 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 16 Jul 2008 21:06:43 GMT Subject: rpms/dietlibc/devel dietlibc.spec,1.57,1.58 Message-ID: <200807162106.m6GL6hHv001671@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1602 Modified Files: dietlibc.spec Log Message: fixed typo; reverted %if changes from last commit Index: dietlibc.spec =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- dietlibc.spec 16 Jul 2008 20:37:53 -0000 1.57 +++ dietlibc.spec 16 Jul 2008 21:05:56 -0000 1.58 @@ -14,7 +14,7 @@ %endif %ifarch %ix86 x86_64 arm -%bcond_with dynamic\ +%bcond_with dynamic %endif %ifarch %ix86 @@ -32,13 +32,13 @@ License: GPLv2 Group: Development/Libraries URL: http://www.fefe.de/dietlibc/ -# %%if !0%{?snapshot:1} -# Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%name-%version.tar.bz2 -# Source1: http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig -# %%else +%if !0%{?snapshot:1} +Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%name-%version.tar.bz2 +Source1: http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig +%else # generated by 'make cvs-sources [CVS_DATE=....]' Source0: %name-%version.%snapshot.tar.bz2 -# %%endif +%endif Source10: runtests-X.sh Patch1: dietlibc-0.28-setpriority.patch Patch10: dietlibc-0.29-scall.patch @@ -111,14 +111,14 @@ %patch49 -p1 -b .noreturn -# %%if %{without ssp} +%if %{without ssp} %patch20 -p1 -b .nostackprotector sed -i -e 's!^#define WANT_SSP$!// \0!g; s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h %global xtra_fixcflags -fno-stack-protector -# %%else -# %%global xtra_fixcflags %nil -# %%endif +%else +%global xtra_fixcflags %nil +%endif %ifarch %ix86 sed -i \ @@ -186,14 +186,14 @@ %{?with_dynamic:%exclude %pkglibdir/*/*.so} -# %%if %{with dynamic} +%if %{with dynamic} %files lib %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/* %dir %pkglibdir %dir %pkglibdir/lib-* %pkglibdir/lib-%target_cpu/*.so -# %%endif +%endif %changelog From fedora-extras-commits at redhat.com Wed Jul 16 21:09:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:09:34 GMT Subject: rpms/dircproxy/devel dircproxy.spec,1.4,1.5 Message-ID: <200807162109.m6GL9YnW001939@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dircproxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1890 Modified Files: dircproxy.spec Log Message: fix license tag Index: dircproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/dircproxy/devel/dircproxy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dircproxy.spec 13 Feb 2008 22:12:27 -0000 1.4 +++ dircproxy.spec 16 Jul 2008 21:08:44 -0000 1.5 @@ -1,11 +1,11 @@ Name: dircproxy Version: 1.2.0 %define betaver beta2 -Release: 0.7.%{betaver}%{?dist} +Release: 0.8.%{betaver}%{?dist} Summary: IRC proxy server Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://dircproxy.securiweb.net/ Source0: http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-%{betaver}.tar.bz Source1: dircproxy.init @@ -79,6 +79,9 @@ %{_datadir}/dircproxy/ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 1.2.0-0.8.beta2 +- fix license tag + * Wed Feb 13 2008 Jarod Wilson - 1.2.0-0.7.beta2 - Bump and rebuild w/gcc 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 21:10:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:10:37 GMT Subject: rpms/dirvish/devel dirvish.spec,1.2,1.3 Message-ID: <200807162110.m6GLAbq7002064@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dirvish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993 Modified Files: dirvish.spec Log Message: fix license tag Index: dirvish.spec =================================================================== RCS file: /cvs/pkgs/rpms/dirvish/devel/dirvish.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dirvish.spec 6 Oct 2006 01:26:13 -0000 1.2 +++ dirvish.spec 16 Jul 2008 21:09:43 -0000 1.3 @@ -1,10 +1,10 @@ Name: dirvish Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast, disk based, rotating network backup system Group: Applications/Archiving -License: OSL +License: OSL 2.0 URL: http://www.dirvish.org/ Source0: http://www.dirvish.org/dirvish-%{version}.tgz # converts the installer to work in unattended mode @@ -46,6 +46,9 @@ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 1.2.1-3 +- fix license tag + * Thu Oct 05 2006 Robert Marcano 1.2.1-2 - Fix License field - Add license text From fedora-extras-commits at redhat.com Wed Jul 16 21:14:21 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 16 Jul 2008 21:14:21 GMT Subject: rpms/linkage/devel linkage.spec,1.6,1.7 Message-ID: <200807162114.m6GLELh4002500@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2391 Modified Files: linkage.spec Log Message: more build fixes Index: linkage.spec =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linkage.spec 16 Jul 2008 20:55:20 -0000 1.6 +++ linkage.spec 16 Jul 2008 21:13:35 -0000 1.7 @@ -20,6 +20,7 @@ BuildRequires: gettext BuildRequires: dbus-c++-devel BuildRequires: boost-devel +BuildRequires: asio-devel Requires(pre): GConf2 Requires(post): GConf2 From fedora-extras-commits at redhat.com Wed Jul 16 21:15:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:15:38 GMT Subject: rpms/doctorj/devel doctorj.spec,1.20,1.21 Message-ID: <200807162115.m6GLFcUB002709@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/doctorj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2627 Modified Files: doctorj.spec Log Message: fix license tag Index: doctorj.spec =================================================================== RCS file: /cvs/pkgs/rpms/doctorj/devel/doctorj.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- doctorj.spec 11 Dec 2006 16:36:30 -0000 1.20 +++ doctorj.spec 16 Jul 2008 21:14:47 -0000 1.21 @@ -1,10 +1,10 @@ Name: doctorj Version: 5.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java source code analyzer Group: Development/Tools -License: LGPL +License: LGPLv2+ URL: http://doctorj.sourceforge.net/ Source: http://download.sf.net/doctorj/%{name}-%{version}.tar.gz Patch0: classpath_fix.patch @@ -68,6 +68,9 @@ %{_libdir}/gcj/%{name} %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 5.0.0-8 +- fix license tag + * Mon Aug 27 2006 Michael J. Knox - 5.0.0-7 - Rebuild for FC6 From fedora-extras-commits at redhat.com Wed Jul 16 21:16:20 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 16 Jul 2008 21:16:20 GMT Subject: rpms/libnetfilter_queue/devel .cvsignore, 1.3, 1.4 libnetfilter_queue-sysheader.patch, 1.1, 1.2 libnetfilter_queue.spec, 1.5, 1.6 sources, 1.3, 1.4 libnetfilter_queue-linuxtypes.patch, 1.1, NONE Message-ID: <200807162116.m6GLGK3E002818@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_queue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2693 Modified Files: .cvsignore libnetfilter_queue-sysheader.patch libnetfilter_queue.spec sources Removed Files: libnetfilter_queue-linuxtypes.patch Log Message: new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Sep 2007 22:16:47 -0000 1.3 +++ .cvsignore 16 Jul 2008 21:15:30 -0000 1.4 @@ -1 +1 @@ -libnetfilter_queue-0.0.15.tar.bz2 +libnetfilter_queue-0.0.16.tar.bz2 libnetfilter_queue-sysheader.patch: Index: libnetfilter_queue-sysheader.patch =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/libnetfilter_queue-sysheader.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnetfilter_queue-sysheader.patch 23 Feb 2008 00:24:21 -0000 1.1 +++ libnetfilter_queue-sysheader.patch 16 Jul 2008 21:15:30 -0000 1.2 @@ -8,7 +8,7 @@ +pkginclude_HEADERS = libnetfilter_queue.h libipq.h diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h -index 6695c3d..fafcc18 100644 +index 1a72c51..df9bd72 100644 --- a/include/libnetfilter_queue/libnetfilter_queue.h +++ b/include/libnetfilter_queue/libnetfilter_queue.h @@ -14,9 +14,12 @@ @@ -24,8 +24,8 @@ + +#include - struct nfq_handle; - struct nfq_q_handle; + #ifdef __cplusplus + extern "C" { diff --git a/include/libnetfilter_queue/linux_nfnetlink_queue.h b/include/libnetfilter_queue/linux_nfnetlink_queue.h deleted file mode 100644 index 191b094..0000000 Index: libnetfilter_queue.spec =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/libnetfilter_queue.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libnetfilter_queue.spec 23 Feb 2008 00:24:21 -0000 1.5 +++ libnetfilter_queue.spec 16 Jul 2008 21:15:30 -0000 1.6 @@ -1,13 +1,12 @@ Name: libnetfilter_queue -Version: 0.0.15 -Release: 4%{?dist} +Version: 0.0.16 +Release: 1%{?dist} Summary: Netfilter queue userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 -Patch0: libnetfilter_queue-linuxtypes.patch -Patch1: libnetfilter_queue-sysheader.patch +Patch0: libnetfilter_queue-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel, pkgconfig, kernel-headers @@ -36,17 +35,12 @@ %prep %setup -q %patch -p1 -%patch1 -p1 autoreconf -i --force %build %configure --disable-static --disable-rpath -# kill the rpaths -#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - make %{?_smp_mflags} %install @@ -73,6 +67,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 16 2008 Paul P. Komkoff Jr - 0.0.16-1 +- new upstream version + * Fri Feb 22 2008 Paul P Komkoff Jr - 0.0.15-4 - use system header instead of bundled one Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Sep 2007 22:16:47 -0000 1.3 +++ sources 16 Jul 2008 21:15:30 -0000 1.4 @@ -1 +1 @@ -d8602566c253a9114b19a8b77980d808 libnetfilter_queue-0.0.15.tar.bz2 +b36664e6cd39edbfe46b416a86118add libnetfilter_queue-0.0.16.tar.bz2 --- libnetfilter_queue-linuxtypes.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 21:17:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:17:21 GMT Subject: rpms/dmidecode/devel dmidecode.spec,1.30,1.31 Message-ID: <200807162117.m6GLHLcA002974@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dmidecode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2854 Modified Files: dmidecode.spec Log Message: fix license tag Index: dmidecode.spec =================================================================== RCS file: /cvs/pkgs/rpms/dmidecode/devel/dmidecode.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- dmidecode.spec 14 Mar 2008 19:13:40 -0000 1.30 +++ dmidecode.spec 16 Jul 2008 21:16:30 -0000 1.31 @@ -1,10 +1,10 @@ Summary: Tool to analyse BIOS DMI data. Name: dmidecode Version: 2.9 -Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist} +Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist} Epoch: 1 Group: System Environment/Base -License: GPL +License: GPLv2+ Source0: dmidecode-%{version}.tar.bz2 URL: http://www.nongnu.org/dmidecode/ Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -48,6 +48,9 @@ %{_mandir}/man8/* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 1:2.9-1.30 +- fix license tag + * Fri Mar 14 2008 Doug Chapman 1:2.9-1.29.1 - Do not package vpddecode, ownership and biosdecode on ia64 since those are x86 only From fedora-extras-commits at redhat.com Wed Jul 16 21:07:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:07:15 GMT Subject: rpms/diffstat/devel diffstat.spec,1.26,1.27 Message-ID: <200807162107.m6GL7FCX001699@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/diffstat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1648 Modified Files: diffstat.spec Log Message: fix license tag Index: diffstat.spec =================================================================== RCS file: /cvs/pkgs/rpms/diffstat/devel/diffstat.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- diffstat.spec 13 Feb 2008 10:44:28 -0000 1.26 +++ diffstat.spec 16 Jul 2008 21:06:24 -0000 1.27 @@ -1,9 +1,9 @@ Summary: A utility which provides statistics based on the output of diff Name: diffstat Version: 1.43 -Release: 7%{?dist} +Release: 8%{?dist} Group: Development/Tools -License: Distributable +License: MIT URL: http://invisible-island.net/diffstat Source0: ftp://invisible-island.net/diffstat/%{name}-%{version}.tgz Source1: COPYING @@ -40,6 +40,9 @@ %{_mandir}/*/* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 1.43-8 +- fix license tag + * Wed Feb 13 2008 Tim Waugh 1.43-7 - Rebuild for GCC 4.3. From fedora-extras-commits at redhat.com Wed Jul 16 21:24:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:24:35 GMT Subject: rpms/dogtail/devel dogtail.spec,1.7,1.8 Message-ID: <200807162124.m6GLOZDu003476@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dogtail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3438 Modified Files: dogtail.spec Log Message: fix license tag Index: dogtail.spec =================================================================== RCS file: /cvs/pkgs/rpms/dogtail/devel/dogtail.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dogtail.spec 31 Jan 2008 18:36:15 -0000 1.7 +++ dogtail.spec 16 Jul 2008 21:23:51 -0000 1.8 @@ -1,8 +1,9 @@ Summary: GUI test tool and automation framework Name: dogtail Version: 0.6.90 -Release: 1.381%{?dist} -License: GPL +Release: 1.381%{?dist}.1 +# No version specified. +License: GPL+ Group: User Interface/X URL: http://people.redhat.com/zcerza/dogtail/ #Source0: http://people.redhat.com/zcerza/dogtail/releases/dogtail-%{version}.tar.gz @@ -68,6 +69,9 @@ %doc examples/ %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.6.90-1.381.1 +- fix license tag + * Thu Jan 31 2008 Zack Cerza - 0.6.90-1.381 - New upstream snapshot. - Obsolete pyspi; Require at-spi-python. From fedora-extras-commits at redhat.com Wed Jul 16 21:30:29 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 16 Jul 2008 21:30:29 GMT Subject: rpms/kernel/devel Makefile.config, 1.64, 1.65 config-sparc64-generic, 1.17, 1.18 config-sparc64-smp, 1.1, 1.2 kernel.spec, 1.773, 1.774 config-sparc64, 1.1, NONE Message-ID: <200807162130.m6GLUT1Z003867@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3773 Modified Files: Makefile.config config-sparc64-generic config-sparc64-smp kernel.spec Removed Files: config-sparc64 Log Message: Remove extraneous sparc64 config fail. Index: Makefile.config =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- Makefile.config 16 Jul 2008 20:38:37 -0000 1.64 +++ Makefile.config 16 Jul 2008 21:29:33 -0000 1.65 @@ -100,7 +100,7 @@ kernel-$(VERSION)-sparc64-smp.config: config-sparc64-smp temp-sparc64-generic perl merge.pl $^ sparc64 > $@ -kernel-$(VERSION)-sparc64.config: config-sparc64 temp-sparc64-generic +kernel-$(VERSION)-sparc64.config: /dev/null temp-sparc64-generic perl merge.pl $^ sparc64 > $@ kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic Index: config-sparc64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- config-sparc64-generic 15 Jul 2008 13:51:23 -0000 1.17 +++ config-sparc64-generic 16 Jul 2008 21:29:33 -0000 1.18 @@ -1,3 +1,4 @@ +# CONFIG_SMP is not set CONFIG_SPARC=y CONFIG_SPARC64=y CONFIG_SECCOMP=y Index: config-sparc64-smp =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-smp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-sparc64-smp 12 Jul 2007 19:15:37 -0000 1.1 +++ config-sparc64-smp 16 Jul 2008 21:29:33 -0000 1.2 @@ -0,0 +1 @@ +CONFIG_SMP=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.773 retrieving revision 1.774 diff -u -r1.773 -r1.774 --- kernel.spec 16 Jul 2008 20:38:37 -0000 1.773 +++ kernel.spec 16 Jul 2008 21:29:33 -0000 1.774 @@ -1778,6 +1778,9 @@ %changelog * Wed Jul 16 2008 Dave Jones +Remove extraneous sparc64 config fail. + +* Wed Jul 16 2008 Dave Jones - Remove sparc32 config files. * Wed Jul 16 2008 Dave Jones --- config-sparc64 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 21:30:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:30:49 GMT Subject: rpms/dosfstools/devel dosfstools-2.7-argfix.patch, 1.2, 1.3 dosfstools.spec, 1.30, 1.31 Message-ID: <200807162130.m6GLUndi003893@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dosfstools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3827 Modified Files: dosfstools-2.7-argfix.patch dosfstools.spec Log Message: fix license tag dosfstools-2.7-argfix.patch: Index: dosfstools-2.7-argfix.patch =================================================================== RCS file: /cvs/pkgs/rpms/dosfstools/devel/dosfstools-2.7-argfix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dosfstools-2.7-argfix.patch 9 Dec 2004 10:08:32 -0000 1.2 +++ dosfstools-2.7-argfix.patch 16 Jul 2008 21:30:05 -0000 1.3 @@ -1,15 +1,16 @@ ---- dosfstools-2.10/mkdosfs/mkdosfs.c.argfix 2003-06-14 22:07:08.000000000 +0200 -+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2004-12-07 15:38:38.798018438 +0100 -@@ -1619,6 +1619,12 @@ +diff -up dosfstools-2.11/mkdosfs/mkdosfs.c.argfix dosfstools-2.11/mkdosfs/mkdosfs.c +--- dosfstools-2.11/mkdosfs/mkdosfs.c.argfix 2005-03-12 11:12:16.000000000 -0500 ++++ dosfstools-2.11/mkdosfs/mkdosfs.c 2008-07-16 17:26:49.000000000 -0400 +@@ -1634,6 +1634,12 @@ main (int argc, char **argv) if (optind < argc) { device_name = argv[optind]; /* Determine the number of blocks in the FS */ + + if (!device_name) { -+ printf("No device specified.\n"); -+ usage(); ++ printf("No device specified.\n"); ++ usage(); + } + if (!create) - i = count_blocks (device_name); /* Have a look and see! */ + cblocks = count_blocks (device_name); /* Have a look and see! */ } Index: dosfstools.spec =================================================================== RCS file: /cvs/pkgs/rpms/dosfstools/devel/dosfstools.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- dosfstools.spec 19 Feb 2008 10:04:33 -0000 1.30 +++ dosfstools.spec 16 Jul 2008 21:30:05 -0000 1.31 @@ -1,8 +1,8 @@ Name: dosfstools Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux Version: 2.11 -Release: 9%{?dist} -License: GPL +Release: 10%{?dist} +License: GPLv2+ Group: Applications/System Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz URL: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools @@ -60,6 +60,10 @@ %{_mandir}/man8/* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 2.11-10 +- fix license tag +- fix patch to apply with fuzz=0 + * Tue Feb 19 2008 Fedora Release Engineering - 2.11-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 21:31:33 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 16 Jul 2008 21:31:33 GMT Subject: rpms/kernel/devel kernel.spec,1.774,1.775 Message-ID: <200807162131.m6GLVXCP004035@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3882 Modified Files: kernel.spec Log Message: I had fail on my mind Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.774 retrieving revision 1.775 diff -u -r1.774 -r1.775 --- kernel.spec 16 Jul 2008 21:29:33 -0000 1.774 +++ kernel.spec 16 Jul 2008 21:30:46 -0000 1.775 @@ -1778,7 +1778,7 @@ %changelog * Wed Jul 16 2008 Dave Jones -Remove extraneous sparc64 config fail. +- Remove extraneous sparc64 config file. * Wed Jul 16 2008 Dave Jones - Remove sparc32 config files. From fedora-extras-commits at redhat.com Wed Jul 16 21:35:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:35:40 GMT Subject: rpms/doxygen/devel doxygen.spec,1.54,1.55 Message-ID: <200807162135.m6GLZew3004298@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/doxygen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4221 Modified Files: doxygen.spec Log Message: fix license tag Index: doxygen.spec =================================================================== RCS file: /cvs/pkgs/rpms/doxygen/devel/doxygen.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- doxygen.spec 21 May 2008 14:31:35 -0000 1.54 +++ doxygen.spec 16 Jul 2008 21:34:55 -0000 1.55 @@ -4,7 +4,7 @@ Summary: A documentation system for C/C++. Name: doxygen Version: 1.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz @@ -14,7 +14,8 @@ Patch4: doxygen-1.5.5-system-png.patch Group: Development/Tools -License: GPL +# No version is specified. +License: GPL+ Url: http://www.stack.nl/~dimitri/doxygen/index.html BuildRequires: perl @@ -104,6 +105,9 @@ %endif %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 1.5.6-3 +- fix license tag + * Wed May 21 2008 Than Ngo 1.5.6-2 - rebuild From fedora-extras-commits at redhat.com Wed Jul 16 21:36:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:36:47 GMT Subject: rpms/drapes/devel drapes.spec,1.1,1.2 Message-ID: <200807162136.m6GLalFu004446@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/drapes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4369 Modified Files: drapes.spec Log Message: fix license tag Index: drapes.spec =================================================================== RCS file: /cvs/pkgs/rpms/drapes/devel/drapes.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- drapes.spec 8 Jun 2007 10:12:35 -0000 1.1 +++ drapes.spec 16 Jul 2008 21:36:02 -0000 1.2 @@ -1,10 +1,10 @@ Name: drapes Version: 0.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A wallpaper manager application for the GNOME desktop Group: Applications/Multimedia -License: GPL +License: GPLv2+ URL: http://drapes.mindtouchsoftware.com/ Source0: http://drapes.mindtouchsoftware.com/release/0.5/drapes-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,6 +94,9 @@ %{_mandir}/man1/* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.5.1-5 +- fix license tag + * Thu May 31 2007 Damien Durand - 0.5.1-4 - add gnome-sharp in requires From fedora-extras-commits at redhat.com Wed Jul 16 21:38:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:38:16 GMT Subject: rpms/drgeo/devel drgeo.spec,1.12,1.13 Message-ID: <200807162138.m6GLcGoP004618@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/drgeo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4559 Modified Files: drgeo.spec Log Message: fix license tag Index: drgeo.spec =================================================================== RCS file: /cvs/pkgs/rpms/drgeo/devel/drgeo.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- drgeo.spec 9 Jul 2008 16:28:15 -0000 1.12 +++ drgeo.spec 16 Jul 2008 21:37:26 -0000 1.13 @@ -1,8 +1,8 @@ Summary: Interactive educational geometry software Name: drgeo Version: 1.1.0 -Release: 13%{?dist} -License: GPL +Release: 14%{?dist} +License: GPLv2+ Group: Applications/Engineering URL: http://www.ofset.org/drgeo @@ -63,6 +63,9 @@ %{_datadir}/applications/fedora-drgeo.desktop %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 1.1.0-14 +- fix license tag + * Tue Jul 08 2008 Eric Tanguy - 1.1.0-13 - BZ 454045 From fedora-extras-commits at redhat.com Wed Jul 16 21:39:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:39:48 GMT Subject: rpms/driftnet/devel driftnet.spec,1.12,1.13 Message-ID: <200807162139.m6GLdmvL004753@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/driftnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4695 Modified Files: driftnet.spec Log Message: fix license tag Index: driftnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/driftnet/devel/driftnet.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- driftnet.spec 19 Feb 2008 20:07:19 -0000 1.12 +++ driftnet.spec 16 Jul 2008 21:38:59 -0000 1.13 @@ -1,8 +1,8 @@ Name: driftnet -License: GPL +License: GPLv2+ Group: Applications/Internet Version: 0.1.6 -Release: 16.20040426cvs%{?dist} +Release: 17.20040426cvs%{?dist} Summary: Network image sniffer URL: http://www.ex-parrot.com/~chris/driftnet/ Source0: driftnet-0.1.6-20040426cvs.tar.gz @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.1.6-17.20040426cvs +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.6-16.20040426cvs - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 21:41:13 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 16 Jul 2008 21:41:13 GMT Subject: rpms/conntrack-tools/devel .cvsignore, 1.3, 1.4 conntrack-tools-rollup.patch, 1.1, 1.2 conntrack-tools.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807162141.m6GLfDAX004894@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4844 Modified Files: .cvsignore conntrack-tools-rollup.patch conntrack-tools.spec sources Log Message: new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/conntrack-tools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Feb 2008 04:14:49 -0000 1.3 +++ .cvsignore 16 Jul 2008 21:40:28 -0000 1.4 @@ -1,2 +1 @@ -conntrack-tools-0.9.5.tar.bz2 -conntrack-tools-0.9.6-svn7382.patch.bz2 +conntrack-tools-0.9.7.tar.bz2 conntrack-tools-rollup.patch: Index: conntrack-tools-rollup.patch =================================================================== RCS file: /cvs/extras/rpms/conntrack-tools/devel/conntrack-tools-rollup.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- conntrack-tools-rollup.patch 23 Feb 2008 04:14:49 -0000 1.1 +++ conntrack-tools-rollup.patch 16 Jul 2008 21:40:28 -0000 1.2 @@ -33,19 +33,6 @@ conntrackd_LDFLAGS = $(all_libraries) @LIBNETFILTER_CONNTRACK_LIBS@ -EXTRA_DIST = read_config_yy.h -diff --git a/src/conntrack.c b/src/conntrack.c -index 82ff544..23050a4 100644 ---- a/src/conntrack.c -+++ b/src/conntrack.c -@@ -299,7 +299,7 @@ err2str(int err, enum action command) - { CT_CREATE, ETIME, "conntrack has expired" }, - { EXP_CREATE, ENOENT, "master conntrack not found" }, - { EXP_CREATE, EINVAL, "invalid parameters" }, -- { ~0UL, EPERM, "sorry, you must be root or get " -+ { (enum action) ~0UL, EPERM, "sorry, you must be root or get " - "CAP_NET_ADMIN capability to do this"} - }; - diff --git a/src/ignore_pool.c b/src/ignore_pool.c index 027d628..2f951e8 100644 --- a/src/ignore_pool.c Index: conntrack-tools.spec =================================================================== RCS file: /cvs/extras/rpms/conntrack-tools/devel/conntrack-tools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- conntrack-tools.spec 23 Feb 2008 04:14:49 -0000 1.4 +++ conntrack-tools.spec 16 Jul 2008 21:40:28 -0000 1.5 @@ -1,16 +1,12 @@ -%define rev 7382 -%define basever 0.9.5 - Name: conntrack-tools -Version: 0.9.6 -Release: 0.1.svn%{rev}%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Tools to manipulate netfilter connection tracking table Group: System Environment/Base License: GPLv2 URL: http://netfilter.org -Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{basever}.tar.bz2 -Patch0: conntrack-tools-%{version}-svn%{rev}.patch.bz2 -Patch1: conntrack-tools-rollup.patch +Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 +Patch0: conntrack-tools-rollup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel libnetfilter_conntrack-devel pkgconfig bison flex BuildRequires: autoconf automake libtool @@ -34,9 +30,9 @@ show an event message (one line) per newly established connection. %prep -%setup -q -n %{name}-%{basever} -%patch0 -p1 -%patch1 -p1 +%setup -q +%patch -p1 + autoreconf -i --force %build @@ -58,6 +54,9 @@ %{_mandir}/man8/* %changelog +* Wed Jul 16 2008 Paul P. Komkoff Jr - 0.9.7-1 +- new upstream version + * Sat Feb 23 2008 Paul P. Komkoff Jr - 0.9.6-0.1.svn7382 - new version from svn Index: sources =================================================================== RCS file: /cvs/extras/rpms/conntrack-tools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Feb 2008 04:14:49 -0000 1.3 +++ sources 16 Jul 2008 21:40:28 -0000 1.4 @@ -1,2 +1 @@ -c639e17ba6cbfce52b288a5105724f2d conntrack-tools-0.9.5.tar.bz2 -3655624ced8ef291c90edfdfb9760434 conntrack-tools-0.9.6-svn7382.patch.bz2 +e058b4494ecdf3f8d3c8345eead18d14 conntrack-tools-0.9.7.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 21:44:48 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 16 Jul 2008 21:44:48 GMT Subject: rpms/kernel/devel patch-2.6.26-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.868, 1.869 kernel.spec, 1.775, 1.776 sources, 1.828, 1.829 upstream, 1.746, 1.747 patch-2.6.26-git3.bz2.sign, 1.1, NONE Message-ID: <200807162144.m6GLim7i005098@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5024 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-git4.bz2.sign Removed Files: patch-2.6.26-git3.bz2.sign Log Message: 2.6.26-git4 --- NEW FILE patch-2.6.26-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIfkYvyGugalF9Dw4RAvZXAJ9SaWwGQ5XI9Hu4I+DdSgkia9GsSQCeJhgY fFWVkUpDyHLFdxp7mXTdlRw= =zCwf -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.868 retrieving revision 1.869 diff -u -r1.868 -r1.869 --- .cvsignore 16 Jul 2008 17:05:46 -0000 1.868 +++ .cvsignore 16 Jul 2008 21:44:01 -0000 1.869 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git3.bz2 +patch-2.6.26-git4.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.775 retrieving revision 1.776 diff -u -r1.775 -r1.776 --- kernel.spec 16 Jul 2008 21:30:46 -0000 1.775 +++ kernel.spec 16 Jul 2008 21:44:02 -0000 1.776 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1778,6 +1778,9 @@ %changelog * Wed Jul 16 2008 Dave Jones +- 2.6.26-git4 + +* Wed Jul 16 2008 Dave Jones - Remove extraneous sparc64 config file. * Wed Jul 16 2008 Dave Jones Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.828 retrieving revision 1.829 diff -u -r1.828 -r1.829 --- sources 16 Jul 2008 17:05:46 -0000 1.828 +++ sources 16 Jul 2008 21:44:02 -0000 1.829 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -35dc9fa4bf144bd955d9da4355ac5c0e patch-2.6.26-git3.bz2 +0b4b89d4869ec812d0439dba0c240d9f patch-2.6.26-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.746 retrieving revision 1.747 diff -u -r1.746 -r1.747 --- upstream 16 Jul 2008 17:05:46 -0000 1.746 +++ upstream 16 Jul 2008 21:44:02 -0000 1.747 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git3.bz2 +patch-2.6.26-git4.bz2 --- patch-2.6.26-git3.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Jul 16 21:54:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Wed, 16 Jul 2008 21:54:26 GMT Subject: rpms/kernel/devel kernel.spec,1.776,1.777 Message-ID: <200807162154.m6GLsQOw005523@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5466 Modified Files: kernel.spec Log Message: * Wed Jul 16 2008 Kristian H??gsberg - Also copy new include/drm directory. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.776 retrieving revision 1.777 diff -u -r1.776 -r1.777 --- kernel.spec 16 Jul 2008 21:44:02 -0000 1.776 +++ kernel.spec 16 Jul 2008 21:53:39 -0000 1.777 @@ -1361,7 +1361,7 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cd include - cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video drm asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include # While arch/powerpc/include/asm is still a symlink to the old # include/asm-ppc{64,} directory, include that in kernel-devel too. @@ -1777,6 +1777,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 16 2008 Kristian H??gsberg +- Also copy new include/drm directory. + * Wed Jul 16 2008 Dave Jones - 2.6.26-git4 From fedora-extras-commits at redhat.com Wed Jul 16 21:55:08 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Wed, 16 Jul 2008 21:55:08 GMT Subject: rpms/krb5/devel krb5.spec,1.173,1.174 Message-ID: <200807162155.m6GLt8dA005550@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5518 Modified Files: krb5.spec Log Message: - define ASN1BUF_OMIT_INLINE_FUNCS at compile-time (for now) to keep building Index: krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- krb5.spec 16 Jul 2008 18:40:35 -0000 1.173 +++ krb5.spec 16 Jul 2008 21:54:24 -0000 1.174 @@ -235,6 +235,7 @@ - clear fuzz out of patches, dropping a man page patch which is no longer necessary - quote %%{__cc} where needed because it includes whitespace now +- define ASN1BUF_OMIT_INLINE_FUNCS at compile-time (for now) to keep building * Fri Jul 11 2008 Nalin Dahyabhai 1.6.3-15 - build with -fno-strict-aliasing, which is needed because the library @@ -1434,6 +1435,10 @@ %ifarch %{ix86} s390 ppc sparcv9 DEFINES="-D_FILE_OFFSET_BITS=64" ; export DEFINES %endif + +# FIXME! +DEFINES="$DEFINES -DASN1BUF_OMIT_INLINE_FUNCS=1"; export DEFINES + # Enable or disable the PKINIT plugin. The configure script only checks for # the version of OpenSSL being okay, so for now we have to use that to control # whether or not it tries to build the module. From fedora-extras-commits at redhat.com Wed Jul 16 21:59:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 21:59:41 GMT Subject: rpms/dssi/devel dssi-0.9-cstdlib.patch,1.1,1.2 dssi.spec,1.8,1.9 Message-ID: <200807162159.m6GLxfQb005716@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5676 Modified Files: dssi-0.9-cstdlib.patch dssi.spec Log Message: fix license tag dssi-0.9-cstdlib.patch: Index: dssi-0.9-cstdlib.patch =================================================================== RCS file: /cvs/pkgs/rpms/dssi/devel/dssi-0.9-cstdlib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dssi-0.9-cstdlib.patch 3 Jan 2008 19:48:00 -0000 1.1 +++ dssi-0.9-cstdlib.patch 16 Jul 2008 21:58:54 -0000 1.2 @@ -1,10 +1,11 @@ ---- examples/trivial_sampler_qt_gui.cpp~ 2008-01-03 11:42:03.000000000 -0800 -+++ examples/trivial_sampler_qt_gui.cpp 2008-01-03 11:43:00.000000000 -0800 +diff -up examples/trivial_sampler_qt_gui.cpp.orig examples/trivial_sampler_qt_gui.cpp +--- examples/trivial_sampler_qt_gui.cpp.orig 2005-05-05 13:56:31.000000000 -0400 ++++ examples/trivial_sampler_qt_gui.cpp 2008-07-16 17:54:47.000000000 -0400 @@ -24,6 +24,7 @@ #include #include #include +#include #include - #include + #include "dssi.h" Index: dssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/dssi/devel/dssi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dssi.spec 19 Feb 2008 04:04:51 -0000 1.8 +++ dssi.spec 16 Jul 2008 21:58:54 -0000 1.9 @@ -1,12 +1,11 @@ Summary: Disposable Soft Synth Interface Name: dssi Version: 0.9.1 -Release: 14%{?dist} +Release: 15%{?dist} License: MIT Group: Applications/Multimedia URL: http://dssi.sourceforge.net/ Source0: http://download.sf.net/sourceforge/dssi/dssi-0.9.1.tar.gz -Patch0: dssi-0.9-math.patch Patch1: dssi-lib64.patch Patch2: dssi-0.9-cstdlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,7 +35,7 @@ %package devel Summary: Libraries, includes, etc to develop DSSI applications Group: Development/Libraries -License: LGPL +License: LGPLv2+ Requires: ladspa-devel, alsa-lib-devel, liblo-devel Requires: pkgconfig @@ -46,7 +45,6 @@ %prep %setup -q -%patch0 -p1 # Conditionally apply patch to read DSSI plugins from lib64 dir. %ifarch x86_64 @@ -93,6 +91,10 @@ %{_libdir}/pkgconfig/dssi.pc %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.9.1-15 +- fix license tag +- patch0 was unnecessary + * Mon Feb 18 2008 Fedora Release Engineering - 0.9.1-14 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 22:03:03 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 16 Jul 2008 22:03:03 GMT Subject: rpms/kdesvn/devel .cvsignore, 1.19, 1.20 kdesvn.spec, 1.39, 1.40 sources, 1.19, 1.20 Message-ID: <200807162203.m6GM33gW012432@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/kdesvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379 Modified Files: .cvsignore kdesvn.spec sources Log Message: * Tue Jul 15 2008 - Orion Poplawski - 0.14.6-1 - Update to 0.14.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 19 May 2008 17:27:57 -0000 1.19 +++ .cvsignore 16 Jul 2008 22:02:13 -0000 1.20 @@ -1 +1 @@ -kdesvn-0.14.4.tar.bz2 +kdesvn-0.14.6.tar.bz2 Index: kdesvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- kdesvn.spec 19 May 2008 17:27:57 -0000 1.39 +++ kdesvn.spec 16 Jul 2008 22:02:13 -0000 1.40 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.14.4 +Version: 0.14.6 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -124,6 +124,9 @@ %changelog +* Tue Jul 15 2008 - Orion Poplawski - 0.14.6-1 +- Update to 0.14.6 + * Mon May 19 2008 - Orion Poplawski - 0.14.4-1 - Update to 0.14.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 19 May 2008 17:27:57 -0000 1.19 +++ sources 16 Jul 2008 22:02:13 -0000 1.20 @@ -1 +1 @@ -70901a2450f74702dff99f7c0fe00a8c kdesvn-0.14.4.tar.bz2 +9f481b3315f0d08cc0dc65c03df1d843 kdesvn-0.14.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 22:04:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 22:04:05 GMT Subject: rpms/dtach/devel dtach.spec,1.14,1.15 Message-ID: <200807162204.m6GM45Jj012539@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dtach/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12488 Modified Files: dtach.spec Log Message: fix license tag Index: dtach.spec =================================================================== RCS file: /cvs/pkgs/rpms/dtach/devel/dtach.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dtach.spec 19 Feb 2008 12:48:08 -0000 1.14 +++ dtach.spec 16 Jul 2008 22:03:21 -0000 1.15 @@ -1,8 +1,8 @@ Summary: A simple program that emulates the detach feature of screen Name: dtach Version: 0.7 -Release: 2.2.3 -License: GPL +Release: 3 +License: GPLv2+ URL: http://dtach.sourceforge.net Group: Applications/System Source: http://prdownloads.sourceforge.net/dtach/dtach-%{version}.tar.gz @@ -41,6 +41,9 @@ %{_mandir}/*/* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 0.7-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.7-2.2.3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 16 22:04:32 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 16 Jul 2008 22:04:32 GMT Subject: rpms/firefox/F-9 .cvsignore, 1.81, 1.82 firefox.spec, 1.301, 1.302 sources, 1.93, 1.94 Message-ID: <200807162204.m6GM4WZP012601@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12496 Modified Files: .cvsignore firefox.spec sources Log Message: * Wed Jul 16 2008 Christopher Aillon 3.0.1-1 - Update to 3.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/F-9/.cvsignore,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- .cvsignore 17 Jun 2008 19:16:07 -0000 1.81 +++ .cvsignore 16 Jul 2008 22:03:25 -0000 1.82 @@ -1,2 +1,2 @@ -firefox-3.0-source.tar.bz2 -firefox-langpacks-3.0-20080617.tar.bz2 +firefox-3.0.1-source.tar.bz2 +firefox-langpacks-3.0.1-20080716.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/F-9/firefox.spec,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- firefox.spec 17 Jun 2008 20:19:31 -0000 1.301 +++ firefox.spec 16 Jul 2008 22:03:25 -0000 1.302 @@ -4,10 +4,9 @@ %define desktop_file_utils_version 0.9 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -%define version_internal 3.0 -%define mozappdir %{_libdir}/%{name}-%{version_internal} +%define mozappdir %{_libdir}/%{name}-%{version} -%define gecko_version 1.9 +%define gecko_version 1.9.0.1 %define official_branding 1 %define build_langpacks 1 @@ -19,7 +18,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 3.0 +Version: 3.0.1 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -31,7 +30,7 @@ %endif Source0: %{tarball} %if %{build_langpacks} -Source2: firefox-langpacks-%{version}-20080617.tar.bz2 +Source2: firefox-langpacks-%{version}-20080716.tar.bz2 %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -73,10 +72,10 @@ BuildRequires: libXrender-devel BuildRequires: system-bookmarks BuildRequires: startup-notification-devel -BuildRequires: gecko-devel-unstable >= %{gecko_version} +BuildRequires: gecko-devel-unstable = %{gecko_version} Requires: desktop-file-utils >= %{desktop_file_utils_version} -Requires: xulrunner >= %{gecko_version}-%{release} +Requires: gecko-libs = %{gecko_version} Requires: system-bookmarks Obsoletes: mozilla <= 37:1.7.13 Provides: webclient @@ -141,7 +140,7 @@ [ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2 %endif -INTERNAL_GECKO=%{version_internal} +INTERNAL_GECKO=%{version} MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO} export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}" @@ -167,7 +166,7 @@ # set up the firefox start script %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox -%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version_internal},g' > \ +%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version},g' > \ $RPM_BUILD_ROOT%{_bindir}/firefox %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox @@ -327,6 +326,9 @@ #--------------------------------------------------------------------- %changelog +* Wed Jul 16 2008 Christopher Aillon 3.0.1-1 +- Update to 3.0.1 + * Tue Jun 17 2008 Christopher Aillon 3.0-1 - Firefox 3 Final Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/F-9/sources,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- sources 17 Jun 2008 19:16:07 -0000 1.93 +++ sources 16 Jul 2008 22:03:25 -0000 1.94 @@ -1,2 +1,2 @@ -b514375509fd439e44def1e4a7873af4 firefox-3.0-source.tar.bz2 -02b007c9f5b269bb7e0b9e8fce99afc0 firefox-langpacks-3.0-20080617.tar.bz2 +a14e4ac2e9fc5b29f80995c97a1c9748 firefox-3.0.1-source.tar.bz2 +cf5dc720cfc20e2b219cb5cef9a295a1 firefox-langpacks-3.0.1-20080716.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 16 22:05:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 22:05:53 GMT Subject: rpms/dvgrab/devel dvgrab.spec,1.24,1.25 Message-ID: <200807162205.m6GM5rJ5012780@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dvgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12673 Modified Files: dvgrab.spec Log Message: fix license tag Index: dvgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/dvgrab/devel/dvgrab.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dvgrab.spec 24 Jun 2008 19:44:44 -0000 1.24 +++ dvgrab.spec 16 Jul 2008 22:05:08 -0000 1.25 @@ -1,8 +1,8 @@ Summary: Utility to capture video from a DV camera Name: dvgrab Version: 3.1 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2+ Group: Applications/Multimedia URL: http://www.kinodv.org/ Source: http://dl.sf.net/kino/dvgrab-%{version}.tar.gz @@ -40,6 +40,9 @@ %{_mandir}/man1/dvgrab.1* %changelog +* Wed Jul 16 2008 Tom "spot" Callaway - 3.1-4 +- fix license tag + * Tue Jun 24 2008 Jarod Wilson - 3.1-3 - Fix segfault when we get bogus timecodes (#370931) From fedora-extras-commits at redhat.com Wed Jul 16 22:08:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 16 Jul 2008 22:08:19 GMT Subject: rpms/dx-samples/devel dx-samples.spec,1.2,1.3 Message-ID: <200807162208.m6GM8Jtp012916@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dx-samples/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12879 Modified Files: dx-samples.spec Log Message: fix license tag Index: dx-samples.spec =================================================================== RCS file: /cvs/pkgs/rpms/dx-samples/devel/dx-samples.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dx-samples.spec 20 Sep 2006 00:05:32 -0000 1.2 +++ dx-samples.spec 16 Jul 2008 22:07:32 -0000 1.3 @@ -1,13 +1,13 @@ Summary: OpenDX Examples Name: dx-samples Version: 4.4.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.opendx.org/ Group: Documentation Source0: http://opendx.npaci.edu/source/dxsamples-%{version}.tar.gz Patch0: %{name}-rpm.patch Patch1: %{name}-nojava.patch -License: IBM Public License +License: IBM BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dx @@ -42,6 +42,9 @@ %{_datadir}/dx/samples %changelog +* Wed Jul 16 2008 Tom "spot" Callaway 4.4.0-4 +- fix license tag + * Wed Sep 20 2006 Dominik Mierzejewski 4.4.0-3 - fixed BuildRequires: From fedora-extras-commits at redhat.com Wed Jul 16 22:13:15 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 16 Jul 2008 22:13:15 GMT Subject: rpms/epiphany/F-9 epiphany.spec,1.191,1.192 Message-ID: <200807162213.m6GMDF6j013134@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13071 Modified Files: epiphany.spec Log Message: * Wed Jul 16 2008 Christopher Aillon - 2.22.2-3 - Rebuild against newer gecko Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-9/epiphany.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- epiphany.spec 18 Jun 2008 17:37:25 -0000 1.191 +++ epiphany.spec 16 Jul 2008 22:12:30 -0000 1.192 @@ -1,4 +1,4 @@ -%define gecko_ver 1.9 +%define gecko_ver 1.9.0.1 %define desktop_file_utils_version 0.9 %define glib2_devel_ver 2.15.2 %define gtk2_devel_ver 2.12.0 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.22.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -213,6 +213,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed Jul 16 2008 Christopher Aillon - 2.22.2-3 +- Rebuild against newer gecko + * Wed Jun 18 2008 Martin Stransky - 2.22.2-2 - Rebuild against xulrunner From fedora-extras-commits at redhat.com Wed Jul 16 22:13:37 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 16 Jul 2008 22:13:37 GMT Subject: rpms/devhelp/F-9 devhelp.spec,1.89,1.90 Message-ID: <200807162213.m6GMDb8A013197@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/devhelp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13104 Modified Files: devhelp.spec Log Message: * Wed Jul 16 2008 Christopher Aillon - 0.19.1-3 - Rebuild against newer gecko Index: devhelp.spec =================================================================== RCS file: /cvs/extras/rpms/devhelp/F-9/devhelp.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- devhelp.spec 18 Jun 2008 16:41:54 -0000 1.89 +++ devhelp.spec 16 Jul 2008 22:12:52 -0000 1.90 @@ -1,5 +1,5 @@ # Last updated for 0.17 -%define gecko_version 1.9 +%define gecko_version 1.9.0.1 %define gtk2_version 2.8.0 %define libwnck_version 2.10.0 @@ -7,7 +7,7 @@ Name: devhelp Version: 0.19.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools Summary: API document browser @@ -135,6 +135,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jul 16 2008 Christopher Aillon - 0.19.1-3 +- Rebuild against newer gecko + * Wed Jun 18 2008 Owen Taylor - 0.19.1-2 - Rebuild against xulrunner-1.9 From fedora-extras-commits at redhat.com Wed Jul 16 22:14:52 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 16 Jul 2008 22:14:52 GMT Subject: rpms/yelp/F-9 yelp.spec,1.136,1.137 Message-ID: <200807162214.m6GMEqmn013319@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/yelp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13248 Modified Files: yelp.spec Log Message: * Wed Jul 16 2008 Christopher Aillon - 2.22.1-4 - Rebuild against newer gecko Index: yelp.spec =================================================================== RCS file: /cvs/extras/rpms/yelp/F-9/yelp.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- yelp.spec 18 Jun 2008 14:22:01 -0000 1.136 +++ yelp.spec 16 Jul 2008 22:14:08 -0000 1.137 @@ -12,7 +12,7 @@ %define libxslt_version 1.1.4 %define startup_notification_version 0.8 %define rarian_version 0.7.0 -%define gecko_version 1.9 +%define gecko_version 1.9.0.1 %define pango_version 1.0.99 %define desktop_file_utils_version 0.3-7 @@ -20,7 +20,7 @@ Summary: A system documentation reader from the Gnome project Name: yelp Version: 2.22.1 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2 URL: http://live.gnome.org/Yelp # http://bugzilla.gnome.org/show_bug.cgi?id=319096 @@ -164,6 +164,9 @@ %{_datadir}/yelp %changelog +* Wed Jul 16 2008 Christopher Aillon - 2.22.1-4 +- Rebuild against newer gecko + * Wed Jun 18 2008 Martin Stransky - 2.22.1-3 - rebuild against xulrunner From fedora-extras-commits at redhat.com Wed Jul 16 22:38:12 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 16 Jul 2008 22:38:12 GMT Subject: rpms/perl-DBD-SQLite/EL-4 rt32100.patch, NONE, 1.1 perl-DBD-SQLite.spec, 1.5, 1.6 Message-ID: <200807162238.m6GMcCd4014065@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DBD-SQLite/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14031 Modified Files: perl-DBD-SQLite.spec Added Files: rt32100.patch Log Message: * Wed Jul 16 2008 Chris Weyl 1.14-2.8 - rebase against devel's spec rt32100.patch: --- NEW FILE rt32100.patch --- --- dbdimp.c.orig 2008-03-18 17:37:18.580463431 -0700 +++ dbdimp.c 2008-03-18 17:39:04.320466041 -0700 @@ -399,7 +399,7 @@ continue; } /* There are bug reports that say this should be sqlite3_reset() */ - sqlite3_finalize(imp_sth->stmt); + sqlite3_reset(imp_sth->stmt); sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); return -5; } @@ -419,7 +419,7 @@ sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth)); return 0; /* There are bug reports that say this should be sqlite3_reset() */ - default: sqlite3_finalize(imp_sth->stmt); + default: sqlite3_reset(imp_sth->stmt); sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); return -6; } Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/EL-4/perl-DBD-SQLite.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-DBD-SQLite.spec 31 Dec 2007 03:29:52 -0000 1.5 +++ perl-DBD-SQLite.spec 16 Jul 2008 22:37:21 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite Version: 1.14 -Release: 2%{?dist} +Release: 2%{?dist}.8 Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -9,6 +9,9 @@ Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# see http://rt.cpan.org/Public/Bug/Display.html?id=30558 +Patch0: rt32100.patch + BuildRequires: perl-DBI >= 1.03 # if sqlite >= 3.1.3 then # perl-DBD-SQLite uses the external library @@ -31,7 +34,7 @@ %prep %setup -q -n DBD-SQLite-%{version} - +%patch0 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -64,6 +67,29 @@ %changelog +* Wed Jul 16 2008 Chris Weyl 1.14-2.8 +- rebase against devel's spec + +* Mon Jun 2 2008 Marcela Maslanova 1.14-8 + +* Wed Mar 19 2008 Chris Weyl 1.14-7 +- reenable tests + +* Tue Mar 18 2008 Chris Weyl 1.14-6 +- apply sanity patches derived from RT#32100 + +* Wed Feb 27 2008 Tom "spot" Callaway - 1.14-5.1 +- Rebuild for perl 5.10 (again) + +* Tue Feb 19 2008 Fedora Release Engineering - 1.14-4.1 +- Autorebuild for GCC 4.3 + +* Sun Jan 20 2008 Tom "spot" Callaway 1.14-3.1 +- tests disabled, due to x86_64 failures + +* Tue Jan 15 2008 Tom "spot" Callaway 1.14-3 +- rebuild for new perl + * Wed Dec 19 2007 Steven Pritchard 1.14-2 - Fix find option order. - Use fixperms macro instead of our own chmod incantation. From fedora-extras-commits at redhat.com Wed Jul 16 22:59:08 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Wed, 16 Jul 2008 22:59:08 GMT Subject: rpms/gxine/EL-5 gxine.spec,1.11,1.12 Message-ID: <200807162259.m6GMx8k2019027@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/gxine/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18172 Modified Files: gxine.spec Log Message: Rebuild against xulrunner. (rhbz #455659) Index: gxine.spec =================================================================== RCS file: /cvs/extras/rpms/gxine/EL-5/gxine.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gxine.spec 21 Dec 2007 12:58:01 -0000 1.11 +++ gxine.spec 16 Jul 2008 22:58:13 -0000 1.12 @@ -1,23 +1,10 @@ -%if 0%{?fedora} > 8 - %define use_xulrunner_js 1 - %define gecko_dev_ver 1.9 - %define gecko_libs_ver %{gecko_dev_ver} -%else - %define use_xulrunner_js 0 - %if 0%{?rhel} == 5 - %define use_firefox_js 1 - %define gecko_dev_ver 1.8.0.12 - %define gecko_libs_ver %{gecko_dev_ver} - %else - %define use_firefox_js 0 - %endif -%endif - - +%define use_xulrunner_js 1 +%define gecko_dev_ver 1.9 +%define gecko_libs_ver %{gecko_dev_ver} Name: gxine Version: 0.5.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: GTK frontend for the xine multimedia library Group: Applications/Multimedia @@ -30,7 +17,7 @@ Patch1: gxine-0.5.11-keep-wnd-state.patch -%if 0%{?use_xulrunner_js}%{?use_firefox_js} +%if 0%{?use_xulrunner_js} BuildRequires: gecko-devel = %{gecko_dev_ver} %else BuildRequires: js-devel @@ -52,7 +39,7 @@ BuildRequires: libXaw-devel BuildRequires: nspr-devel -%if 0%{?use_xulrunner_js}%{?use_firefox_js} +%if 0%{?use_xulrunner_js} Requires: gecko-libs = %{gecko_libs_ver} %endif @@ -68,12 +55,6 @@ Requires: %{name} = %{version}-%{release} %if 0%{?use_xulrunner_js} Requires: xulrunner -%else -%if 0%{?use_firefox_js} -Requires: firefox -%else -Requires: %{_libdir}/mozilla/plugins -%endif %endif %description mozplugin @@ -150,6 +131,9 @@ %{_libdir}/mozilla/plugins/gxineplugin.so %changelog +* Thu Jul 17 2008 Martin Sourada - 0.5.11-16 +- rebuild for xulrunner in EPEL 5 + * Fri Dec 21 2007 Martin Sourada - 0.5.11-15 - rebuild for new xulrunner From fedora-extras-commits at redhat.com Wed Jul 16 23:07:04 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Wed, 16 Jul 2008 23:07:04 GMT Subject: rpms/libdrm/devel libdrm.spec,1.41,1.42 Message-ID: <200807162307.m6GN74fm029580@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/libdrm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29013 Modified Files: libdrm.spec Log Message: * Thu Jul 17 2008 Dave Airlie 2.4.0-0.14 - kernel headers now installs somes of these files for us Index: libdrm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- libdrm.spec 27 Jun 2008 18:17:28 -0000 1.41 +++ libdrm.spec 16 Jul 2008 23:06:17 -0000 1.42 @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.0 -Release: 0.13%{?dist} +Release: 0.14%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -33,6 +33,7 @@ Summary: Direct Rendering Manager development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: kernel-headers >= 2.6.27-0.144.rc0.git2.fc10 %description devel Direct Rendering Manager development package @@ -80,20 +81,20 @@ %defattr(-,root,root,-) %dir %{_includedir}/drm # NOTE: Headers are listed explicitly, so we can monitor additions/removals. -%{_includedir}/drm/drm.h -%{_includedir}/drm/drm_sarea.h -%{_includedir}/drm/i915_drm.h +#%{_includedir}/drm/drm.h +#%{_includedir}/drm/drm_sarea.h +#%{_includedir}/drm/i915_drm.h %{_includedir}/drm/nouveau_drm.h %{_includedir}/drm/mach64_drm.h -%{_includedir}/drm/mga_drm.h -%{_includedir}/drm/r128_drm.h -%{_includedir}/drm/r300_reg.h -%{_includedir}/drm/radeon_drm.h -%{_includedir}/drm/savage_drm.h -%{_includedir}/drm/sis_drm.h -%{_includedir}/drm/via_3d_reg.h -%{_includedir}/drm/via_drm.h -%{_includedir}/drm/xgi_drm.h +#%{_includedir}/drm/mga_drm.h +#%{_includedir}/drm/r128_drm.h +#%{_includedir}/drm/r300_reg.h +#%{_includedir}/drm/radeon_drm.h +#%{_includedir}/drm/savage_drm.h +#%{_includedir}/drm/sis_drm.h +#%{_includedir}/drm/via_3d_reg.h +#%{_includedir}/drm/via_drm.h +#%{_includedir}/drm/xgi_drm.h # FIXME should be in drm/ too %{_includedir}/xf86drm.h %{_includedir}/xf86drmMode.h @@ -102,6 +103,9 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Thu Jul 17 2008 Dave Airlie 2.4.0-0.14 +- kernel headers now installs somes of these files for us + * Wed Jun 18 2008 Dave Airlie 2.4.0-0.13 - add modeset ctl interface fix From fedora-extras-commits at redhat.com Wed Jul 16 23:25:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Henrik_Nordstr=C3=B6m?= (hno)) Date: Wed, 16 Jul 2008 23:25:03 GMT Subject: rpms/tunctl/F-9 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 tunctl.spec, 1.1, 1.2 tunctl.c?rev=1.4, 1.1, NONE tunctl.sgml?rev=238, 1.1, NONE Message-ID: <200807162325.m6GNP3cu005947@cvs-int.fedora.redhat.com> Author: hno Update of /cvs/pkgs/rpms/tunctl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5562 Modified Files: .cvsignore sources tunctl.spec Removed Files: tunctl.c?rev=1.4 tunctl.sgml?rev=238 Log Message: Tunctl is now a separate project, outsite of User Mode Linux. Update to new upstream 1.5 release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Mar 2008 15:51:15 -0000 1.1 +++ .cvsignore 16 Jul 2008 23:24:19 -0000 1.2 @@ -0,0 +1 @@ +tunctl-1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Mar 2008 15:51:15 -0000 1.1 +++ sources 16 Jul 2008 23:24:19 -0000 1.2 @@ -0,0 +1 @@ +fdbedc263b3e85bb0e087cd567414607 tunctl-1.5.tar.gz Index: tunctl.spec =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/F-9/tunctl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tunctl.spec 26 Mar 2008 17:22:43 -0000 1.1 +++ tunctl.spec 16 Jul 2008 23:24:19 -0000 1.2 @@ -1,39 +1,30 @@ Name: tunctl -Version: 1.4 -Release: 2%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Create and remove virtual network interfaces Group: Applications/System License: GPL+ -URL: http://www.user-mode-linux.org/ -Source0: http://www.user-mode-linux.org/cvs/*checkout*/tools/tunctl/tunctl.c?rev=%{version} -# This is from Debian, http://packages.debian.org/sid/uml-utilities -Source1: http://svn.debian.org/viewsvn/*checkout*/pkg-uml/trunk/src/uml-utilities/debian/tunctl.sgml?rev=238 +URL: http://tunctl.sourceforge.net/ +Source0: http://downloads.sourceforge.net/tunctl/tunctl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils %description -Virtual network interface manipulation tool from User Mode Linux project. +tunctl is a tool to set up and maintain persistent TUN/TAP network interfaces, enabling user applications access to the wire side of a virtual nework interface. Such interfaces is useful for connecting VPN software, virtualization, emulation and a number of other similar applications to the network stack. +tunctl originates from the User Mode Linux project. %prep -%setup -T -c -n %{name}-%{version} -%{__cp} %{SOURCE0} tunctl.c -%{__cp} %{SOURCE1} tunctl.sgml +%setup %build -%{__cc} %{optflags} tunctl.c -o tunctl -docbook2man tunctl.sgml - +make %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_sbindir} -install -d $RPM_BUILD_ROOT%{_mandir}/man8 -install -m 755 tunctl $RPM_BUILD_ROOT%{_sbindir} -install -m 644 TUNCTL.8 $RPM_BUILD_ROOT%{_mandir}/man8/tunctl.8 - +make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT @@ -43,10 +34,12 @@ %defattr(-,root,root,-) %{_mandir}/man8/tunctl.8* %{_sbindir}/tunctl -#%doc - +%doc ChangeLog %changelog +* Wed Jul 16 2008 Henrik Nordstrom 1.5-1 +- Update to version 1.5 based on separate upstream release + * Tue Mar 25 2008 Lubomir Kundrak 1.4-2 - Move to sbin (Marek Mahut, #434583) --- tunctl.c?rev=1.4 DELETED --- --- tunctl.sgml?rev=238 DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 00:08:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:08:12 +0000 Subject: [pkgdb] xpa (Fedora EPEL, 5) updated by kevin Message-ID: <200807170008.m6H08Cwa012164@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for xpa Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xpa (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xpa (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xpa (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xpa From fedora-extras-commits at redhat.com Thu Jul 17 00:08:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:08:56 +0000 Subject: [pkgdb] tkimg (Fedora EPEL, 5) updated by kevin Message-ID: <200807170008.m6H08uBk012212@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for tkimg Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tkimg (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tkimg (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tkimg (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tkimg From fedora-extras-commits at redhat.com Thu Jul 17 00:09:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:09:37 +0000 Subject: [pkgdb] funtools (Fedora EPEL, 5) updated by kevin Message-ID: <200807170009.m6H09bRa012251@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for funtools Kevin Fenzi (kevin) has set commit to Approved for cvsextras on funtools (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on funtools (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on funtools (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/funtools From fedora-extras-commits at redhat.com Thu Jul 17 00:13:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:13:35 +0000 Subject: [pkgdb] ds9 (Fedora EPEL, 5) updated by kevin Message-ID: <200807170013.m6H0DZD3012446@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for ds9 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ds9 (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ds9 (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ds9 (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ds9 From fedora-extras-commits at redhat.com Thu Jul 17 00:14:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:14:42 +0000 Subject: [pkgdb] wcstools (Fedora EPEL, 5) updated by kevin Message-ID: <200807170014.m6H0EgRH012508@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for wcstools Kevin Fenzi (kevin) has set commit to Approved for cvsextras on wcstools (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on wcstools (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on wcstools (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wcstools From fedora-extras-commits at redhat.com Thu Jul 17 00:15:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:15:39 +0000 Subject: [pkgdb] sextractor (Fedora EPEL, 5) updated by kevin Message-ID: <200807170015.m6H0FdOF012574@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for sextractor Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sextractor (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sextractor (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sextractor (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sextractor From fedora-extras-commits at redhat.com Thu Jul 17 00:16:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:16:54 +0000 Subject: [pkgdb] python-migrate was added for toshio Message-ID: <200807170016.m6H0Gs0O012630@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-migrate with summary Schema migration tools for SQLAlchemy Kevin Fenzi (kevin) has approved Package python-migrate Kevin Fenzi (kevin) has added a Fedora devel branch for python-migrate with an owner of toshio Kevin Fenzi (kevin) has approved python-migrate in Fedora devel Kevin Fenzi (kevin) has approved Package python-migrate Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-migrate (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-migrate (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-migrate (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-migrate From fedora-extras-commits at redhat.com Thu Jul 17 00:16:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:16:57 +0000 Subject: [pkgdb] python-migrate (Fedora, 9) updated by kevin Message-ID: <200807170016.m6H0Gs0R012630@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-migrate Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-migrate (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-migrate (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-migrate (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora 9) for lmacken Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora 9) for lmacken Kevin Fenzi (kevin) approved commit on python-migrate (Fedora 9) for lmacken Kevin Fenzi (kevin) approved build on python-migrate (Fedora 9) for lmacken Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora 9) for lmacken Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora 9) for ricky Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora 9) for ricky Kevin Fenzi (kevin) approved commit on python-migrate (Fedora 9) for ricky Kevin Fenzi (kevin) approved build on python-migrate (Fedora 9) for ricky Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora 9) for ricky Kevin Fenzi (kevin) Approved cvsextras for commit access on python-migrate (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-migrate From fedora-extras-commits at redhat.com Thu Jul 17 00:16:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:16:57 +0000 Subject: [pkgdb] python-migrate (Fedora, 8) updated by kevin Message-ID: <200807170016.m6H0Gs0U012630@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-migrate Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-migrate (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-migrate (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-migrate (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora 8) for lmacken Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora 8) for lmacken Kevin Fenzi (kevin) approved commit on python-migrate (Fedora 8) for lmacken Kevin Fenzi (kevin) approved build on python-migrate (Fedora 8) for lmacken Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora 8) for lmacken Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora 8) for ricky Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora 8) for ricky Kevin Fenzi (kevin) approved commit on python-migrate (Fedora 8) for ricky Kevin Fenzi (kevin) approved build on python-migrate (Fedora 8) for ricky Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora 8) for ricky Kevin Fenzi (kevin) Approved cvsextras for commit access on python-migrate (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-migrate From fedora-extras-commits at redhat.com Thu Jul 17 00:16:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:16:58 +0000 Subject: [pkgdb] python-migrate (Fedora EPEL, 5) updated by kevin Message-ID: <200807170016.m6H0Gvw3012651@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for python-migrate Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-migrate (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-migrate (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-migrate (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora EPEL 5) for lmacken Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora EPEL 5) for lmacken Kevin Fenzi (kevin) approved commit on python-migrate (Fedora EPEL 5) for lmacken Kevin Fenzi (kevin) approved build on python-migrate (Fedora EPEL 5) for lmacken Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora EPEL 5) for lmacken Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora EPEL 5) for ricky Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora EPEL 5) for ricky Kevin Fenzi (kevin) approved commit on python-migrate (Fedora EPEL 5) for ricky Kevin Fenzi (kevin) approved build on python-migrate (Fedora EPEL 5) for ricky Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora EPEL 5) for ricky Kevin Fenzi (kevin) Approved cvsextras for commit access on python-migrate (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-migrate From fedora-extras-commits at redhat.com Thu Jul 17 00:16:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 00:16:58 +0000 Subject: [pkgdb] python-migrate (Fedora, devel) updated by kevin Message-ID: <200807170017.m6H0Gx9A012702@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora devel) for lmacken Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora devel) for lmacken Kevin Fenzi (kevin) approved commit on python-migrate (Fedora devel) for lmacken Kevin Fenzi (kevin) approved build on python-migrate (Fedora devel) for lmacken Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora devel) for lmacken Kevin Fenzi (kevin) approved watchbugzilla on python-migrate (Fedora devel) for ricky Kevin Fenzi (kevin) approved watchcommits on python-migrate (Fedora devel) for ricky Kevin Fenzi (kevin) approved commit on python-migrate (Fedora devel) for ricky Kevin Fenzi (kevin) approved build on python-migrate (Fedora devel) for ricky Kevin Fenzi (kevin) approved approveacls on python-migrate (Fedora devel) for ricky Kevin Fenzi (kevin) Approved cvsextras for commit access on python-migrate (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-migrate From fedora-extras-commits at redhat.com Thu Jul 17 00:17:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 00:17:44 GMT Subject: rpms/python-migrate - New directory Message-ID: <200807170017.m6H0Hiwg000644@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-migrate In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdXv525/rpms/python-migrate Log Message: Directory /cvs/extras/rpms/python-migrate added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 00:18:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 00:18:00 GMT Subject: rpms/python-migrate/devel - New directory Message-ID: <200807170018.m6H0I0rM000743@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-migrate/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdXv525/rpms/python-migrate/devel Log Message: Directory /cvs/extras/rpms/python-migrate/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 00:18:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 00:18:19 GMT Subject: rpms/python-migrate Makefile,NONE,1.1 Message-ID: <200807170018.m6H0IJQA000888@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-migrate In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdXv525/rpms/python-migrate Added Files: Makefile Log Message: Setup of module python-migrate --- NEW FILE Makefile --- # Top level Makefile for module python-migrate all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 17 00:18:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 00:18:32 GMT Subject: rpms/python-migrate/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807170018.m6H0IWN7000958@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-migrate/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdXv525/rpms/python-migrate/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-migrate --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-migrate # $Id: Makefile,v 1.1 2008/07/17 00:18:19 kevin Exp $ NAME := python-migrate SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 17 00:42:22 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 17 Jul 2008 00:42:22 GMT Subject: rpms/empathy/devel .cvsignore, 1.16, 1.17 empathy.spec, 1.26, 1.27 sources, 1.16, 1.17 Message-ID: <200807170042.m6H0gMGZ005728@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/empathy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5648 Modified Files: .cvsignore empathy.spec sources Log Message: * Wed Jul 16 2008 Brian Pepple - 0.23.4-1 - Update to 0.23.4. - Update source url. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 3 Jun 2008 00:10:37 -0000 1.16 +++ .cvsignore 17 Jul 2008 00:41:27 -0000 1.17 @@ -1 +1 @@ -empathy-0.23.3.tar.bz2 +empathy-0.23.4.tar.bz2 Index: empathy.spec =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- empathy.spec 3 Jun 2008 00:10:37 -0000 1.26 +++ empathy.spec 17 Jul 2008 00:41:27 -0000 1.27 @@ -9,14 +9,14 @@ %global enchant_version 1.2.0 Name: empathy -Version: 0.23.3 +Version: 0.23.4 Release: 1%{?dist} Summary: GNOME Instant Messaging Client Group: Applications/Communications License: GPLv2+ URL: http://live.gnome.org/Empathy -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.22/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.23/%{name}-%{version}.tar.bz2 Source1: %{name}-README.ConnectionManagers BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -227,6 +227,10 @@ %exclude %{python_sitearch}/*.a %changelog +* Wed Jul 16 2008 Brian Pepple - 0.23.4-1 +- Update to 0.23.4. +- Update source url. + * Mon Jun 2 2008 Brian Pepple - 0.23.3-1 - Update to 0.23.3. - Remove reference to stream-engine in connections managers readme. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 3 Jun 2008 00:10:37 -0000 1.16 +++ sources 17 Jul 2008 00:41:27 -0000 1.17 @@ -1 +1 @@ -2905cb890706115290a1a790e8f39154 empathy-0.23.3.tar.bz2 +5a41033e3e41e9769628e0118f32d5c3 empathy-0.23.4.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 00:50:47 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 17 Jul 2008 00:50:47 GMT Subject: rpms/telepathy-sofiasip/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 telepathy-sofiasip.spec, 1.1, 1.2 Message-ID: <200807170050.m6H0ol5O006126@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-sofiasip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6085 Modified Files: .cvsignore sources telepathy-sofiasip.spec Log Message: * Wed Jul 16 2008 Brian Pepple - 0.5.10-1 - Update to 0.5.10. - Bump min version of telepathy-glib needed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Jun 2008 23:40:55 -0000 1.2 +++ .cvsignore 17 Jul 2008 00:50:05 -0000 1.3 @@ -1 +1 @@ -telepathy-sofiasip-0.5.8.tar.gz +telepathy-sofiasip-0.5.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Jun 2008 23:40:55 -0000 1.2 +++ sources 17 Jul 2008 00:50:05 -0000 1.3 @@ -1 +1 @@ -023dceb1d48f34b7a9d5614cfda25907 telepathy-sofiasip-0.5.8.tar.gz +024975e068d71a1891f9af8d95045fa2 telepathy-sofiasip-0.5.10.tar.gz Index: telepathy-sofiasip.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/telepathy-sofiasip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- telepathy-sofiasip.spec 10 Jun 2008 23:40:55 -0000 1.1 +++ telepathy-sofiasip.spec 17 Jul 2008 00:50:05 -0000 1.2 @@ -1,5 +1,5 @@ Name: telepathy-sofiasip -Version: 0.5.8 +Version: 0.5.10 Release: 1%{?dist} Summary: SIP connection manager for Telepathy @@ -11,7 +11,7 @@ BuildRequires: dbus-devel BuildRequires: dbus-glib-devel -BuildRequires: telepathy-glib-devel >= 0.7.6 +BuildRequires: telepathy-glib-devel >= 0.7.10 BuildRequires: sofia-sip-glib-devel >= 1.12.7 BuildRequires: libxslt BuildRequires: python @@ -58,6 +58,10 @@ %changelog +* Wed Jul 16 2008 Brian Pepple - 0.5.10-1 +- Update to 0.5.10. +- Bump min version of telepathy-glib needed. + * Sun Jun 8 2008 Brian Pepple - 0.5.8-1 - Initial Fedora spec. From fedora-extras-commits at redhat.com Thu Jul 17 00:51:50 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 17 Jul 2008 00:51:50 GMT Subject: rpms/kernel/devel git-linus.diff,1.2,1.3 kernel.spec,1.777,1.778 Message-ID: <200807170051.m6H0poeO006263@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6137 Modified Files: git-linus.diff kernel.spec Log Message: Merge Linux-2.6 up to commit 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af git-linus.diff: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 git-linus.diff Index: git-linus.diff =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git-linus.diff 16 Jul 2008 03:24:02 -0000 1.2 +++ git-linus.diff 17 Jul 2008 00:50:54 -0000 1.3 @@ -1,272074 +1,67092 @@ -diff --git a/Documentation/RCU/NMI-RCU.txt b/Documentation/RCU/NMI-RCU.txt -index c64158e..a6d32e6 100644 ---- a/Documentation/RCU/NMI-RCU.txt -+++ b/Documentation/RCU/NMI-RCU.txt -@@ -93,6 +93,9 @@ Since NMI handlers disable preemption, synchronize_sched() is guaranteed - not to return until all ongoing NMI handlers exit. It is therefore safe - to free up the handler's data as soon as synchronize_sched() returns. - -+Important note: for this to work, the architecture in question must -+invoke irq_enter() and irq_exit() on NMI entry and exit, respectively. -+ - - Answer to Quick Quiz - -diff --git a/Documentation/RCU/RTFP.txt b/Documentation/RCU/RTFP.txt -index 39ad8f5..9f711d2 100644 ---- a/Documentation/RCU/RTFP.txt -+++ b/Documentation/RCU/RTFP.txt -@@ -52,6 +52,10 @@ of each iteration. Unfortunately, chaotic relaxation requires highly - structured data, such as the matrices used in scientific programs, and - is thus inapplicable to most data structures in operating-system kernels. - -+In 1992, Henry (now Alexia) Massalin completed a dissertation advising -+parallel programmers to defer processing when feasible to simplify -+synchronization. RCU makes extremely heavy use of this advice. -+ - In 1993, Jacobson [Jacobson93] verbally described what is perhaps the - simplest deferred-free technique: simply waiting a fixed amount of time - before freeing blocks awaiting deferred free. Jacobson did not describe -@@ -138,6 +142,13 @@ blocking in read-side critical sections appeared [PaulEMcKenney2006c], - Robert Olsson described an RCU-protected trie-hash combination - [RobertOlsson2006a]. - -+2007 saw the journal version of the award-winning RCU paper from 2006 -+[ThomasEHart2007a], as well as a paper demonstrating use of Promela -+and Spin to mechanically verify an optimization to Oleg Nesterov's -+QRCU [PaulEMcKenney2007QRCUspin], a design document describing -+preemptible RCU [PaulEMcKenney2007PreemptibleRCU], and the three-part -+LWN "What is RCU?" series [PaulEMcKenney2007WhatIsRCUFundamentally, -+PaulEMcKenney2008WhatIsRCUUsage, and PaulEMcKenney2008WhatIsRCUAPI]. - - Bibtex Entries - -@@ -202,6 +213,20 @@ Bibtex Entries - ,Year="1991" - } - -+ at phdthesis{HMassalinPhD -+,author="H. Massalin" -+,title="Synthesis: An Efficient Implementation of Fundamental Operating -+System Services" -+,school="Columbia University" -+,address="New York, NY" -+,year="1992" -+,annotation=" -+ Mondo optimizing compiler. -+ Wait-free stuff. -+ Good advice: defer work to avoid synchronization. -+" -+} -+ - @unpublished{Jacobson93 - ,author="Van Jacobson" - ,title="Avoid Read-Side Locking Via Delayed Free" -@@ -635,3 +660,86 @@ Revised: - " - } - -+ at unpublished{PaulEMcKenney2007PreemptibleRCU -+,Author="Paul E. McKenney" -+,Title="The design of preemptible read-copy-update" -+,month="October" -+,day="8" -+,year="2007" -+,note="Available: -+\url{http://lwn.net/Articles/253651/} -+[Viewed October 25, 2007]" -+,annotation=" -+ LWN article describing the design of preemptible RCU. -+" -+} -+ -+######################################################################## -+# -+# "What is RCU?" LWN series. -+# -+ -+ at unpublished{PaulEMcKenney2007WhatIsRCUFundamentally -+,Author="Paul E. McKenney and Jonathan Walpole" -+,Title="What is {RCU}, Fundamentally?" -+,month="December" -+,day="17" -+,year="2007" -+,note="Available: -+\url{http://lwn.net/Articles/262464/} -+[Viewed December 27, 2007]" -+,annotation=" -+ Lays out the three basic components of RCU: (1) publish-subscribe, -+ (2) wait for pre-existing readers to complete, and (2) maintain -+ multiple versions. -+" -+} -+ -+ at unpublished{PaulEMcKenney2008WhatIsRCUUsage -+,Author="Paul E. McKenney" -+,Title="What is {RCU}? Part 2: Usage" -+,month="January" -+,day="4" -+,year="2008" -+,note="Available: -+\url{http://lwn.net/Articles/263130/} -+[Viewed January 4, 2008]" -+,annotation=" -+ Lays out six uses of RCU: -+ 1. RCU is a Reader-Writer Lock Replacement -+ 2. RCU is a Restricted Reference-Counting Mechanism -+ 3. RCU is a Bulk Reference-Counting Mechanism -+ 4. RCU is a Poor Man's Garbage Collector -+ 5. RCU is a Way of Providing Existence Guarantees -+ 6. RCU is a Way of Waiting for Things to Finish -+" -+} -+ -+ at unpublished{PaulEMcKenney2008WhatIsRCUAPI -+,Author="Paul E. McKenney" -+,Title="{RCU} part 3: the {RCU} {API}" -+,month="January" -+,day="17" -+,year="2008" -+,note="Available: -+\url{http://lwn.net/Articles/264090/} -+[Viewed January 10, 2008]" -+,annotation=" -+ Gives an overview of the Linux-kernel RCU API and a brief annotated RCU -+ bibliography. -+" -+} -+ -+ at article{DinakarGuniguntala2008IBMSysJ -+,author="D. Guniguntala and P. E. McKenney and J. Triplett and J. Walpole" -+,title="The read-copy-update mechanism for supporting real-time applications on shared-memory multiprocessor systems with {Linux}" -+,Year="2008" -+,Month="April" -+,journal="IBM Systems Journal" -+,volume="47" -+,number="2" -+,pages="@@-@@" -+,annotation=" -+ RCU, realtime RCU, sleepable RCU, performance. -+" -+} -diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt -index 42b01bc..cf5562c 100644 ---- a/Documentation/RCU/checklist.txt -+++ b/Documentation/RCU/checklist.txt -@@ -13,10 +13,13 @@ over a rather long period of time, but improvements are always welcome! - detailed performance measurements show that RCU is nonetheless - the right tool for the job. - -- The other exception would be where performance is not an issue, -- and RCU provides a simpler implementation. An example of this -- situation is the dynamic NMI code in the Linux 2.6 kernel, -- at least on architectures where NMIs are rare. -+ Another exception is where performance is not an issue, and RCU -+ provides a simpler implementation. An example of this situation -+ is the dynamic NMI code in the Linux 2.6 kernel, at least on -+ architectures where NMIs are rare. -+ -+ Yet another exception is where the low real-time latency of RCU's -+ read-side primitives is critically important. - - 1. Does the update code have proper mutual exclusion? - -@@ -39,9 +42,10 @@ over a rather long period of time, but improvements are always welcome! - - 2. Do the RCU read-side critical sections make proper use of - rcu_read_lock() and friends? These primitives are needed -- to suppress preemption (or bottom halves, in the case of -- rcu_read_lock_bh()) in the read-side critical sections, -- and are also an excellent aid to readability. -+ to prevent grace periods from ending prematurely, which -+ could result in data being unceremoniously freed out from -+ under your read-side code, which can greatly increase the -+ actuarial risk of your kernel. - - As a rough rule of thumb, any dereference of an RCU-protected - pointer must be covered by rcu_read_lock() or rcu_read_lock_bh() -@@ -54,15 +58,30 @@ over a rather long period of time, but improvements are always welcome! - be running while updates are in progress. There are a number - of ways to handle this concurrency, depending on the situation: - [...334895 lines suppressed...] - /* Remove stale work items from the task queue. */ -diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c -index 7d1b117..8e0b4c8 100644 ---- a/net/netfilter/nf_conntrack_helper.c -+++ b/net/netfilter/nf_conntrack_helper.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c -index 0edefcf..077bcd2 100644 ---- a/net/netfilter/nf_conntrack_netlink.c -+++ b/net/netfilter/nf_conntrack_netlink.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c -index 02c2f7c..643c032 100644 ---- a/net/netlabel/netlabel_domainhash.c -+++ b/net/netlabel/netlabel_domainhash.c -@@ -30,8 +30,7 @@ - */ + /* +@@ -588,9 +586,7 @@ void rpc_exit_task(struct rpc_task *task) + { + task->tk_action = NULL; + if (task->tk_ops->rpc_call_done != NULL) { +- lock_kernel(); + task->tk_ops->rpc_call_done(task, task->tk_calldata); +- unlock_kernel(); + if (task->tk_action != NULL) { + WARN_ON(RPC_ASSASSINATED(task)); + /* Always release the RPC slot and buffer memory */ +@@ -602,11 +598,8 @@ EXPORT_SYMBOL_GPL(rpc_exit_task); + + void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata) + { +- if (ops->rpc_release != NULL) { +- lock_kernel(); ++ if (ops->rpc_release != NULL) + ops->rpc_release(calldata); +- unlock_kernel(); +- } + } - #include --#include --#include -+#include - #include - #include - #include -diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 2d29e26..d4eae6a 100644 ---- a/virt/kvm/kvm_main.c -+++ b/virt/kvm/kvm_main.c -@@ -1266,12 +1266,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, - case CPU_UP_CANCELED: - printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n", - cpu); -- smp_call_function_single(cpu, hardware_disable, NULL, 0, 1); -+ smp_call_function_single(cpu, hardware_disable, NULL, 1); - break; - case CPU_ONLINE: - printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n", - cpu); -- smp_call_function_single(cpu, hardware_enable, NULL, 0, 1); -+ smp_call_function_single(cpu, hardware_enable, NULL, 1); - break; - } - return NOTIFY_OK; -@@ -1286,7 +1286,7 @@ static int kvm_reboot(struct notifier_block *notifier, unsigned long val, - * in vmx root mode. + /* +@@ -626,19 +619,15 @@ static void __rpc_execute(struct rpc_task *task) + /* + * Execute any pending callback. */ - printk(KERN_INFO "kvm: exiting hardware virtualization\n"); -- on_each_cpu(hardware_disable, NULL, 0, 1); -+ on_each_cpu(hardware_disable, NULL, 1); - } - return NOTIFY_OK; - } -@@ -1474,12 +1474,12 @@ int kvm_init(void *opaque, unsigned int vcpu_size, - for_each_online_cpu(cpu) { - smp_call_function_single(cpu, - kvm_arch_check_processor_compat, -- &r, 0, 1); -+ &r, 1); - if (r < 0) - goto out_free_1; - } +- if (RPC_DO_CALLBACK(task)) { +- /* Define a callback save pointer */ ++ if (task->tk_callback) { + void (*save_callback)(struct rpc_task *); + + /* +- * If a callback exists, save it, reset it, +- * call it. +- * The save is needed to stop from resetting +- * another callback set within the callback handler +- * - Dave ++ * We set tk_callback to NULL before calling it, ++ * in case it sets the tk_callback field itself: + */ +- save_callback=task->tk_callback; +- task->tk_callback=NULL; ++ save_callback = task->tk_callback; ++ task->tk_callback = NULL; + save_callback(task); + } + +diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c +index e1770f7..99a52aa 100644 +--- a/net/sunrpc/xprt.c ++++ b/net/sunrpc/xprt.c +@@ -690,7 +690,7 @@ static void xprt_connect_status(struct rpc_task *task) + { + struct rpc_xprt *xprt = task->tk_xprt; + +- if (task->tk_status >= 0) { ++ if (task->tk_status == 0) { + xprt->stat.connect_count++; + xprt->stat.connect_time += (long)jiffies - xprt->stat.connect_start; + dprintk("RPC: %5u xprt_connect_status: connection established\n", +@@ -699,12 +699,6 @@ static void xprt_connect_status(struct rpc_task *task) + } + + switch (task->tk_status) { +- case -ECONNREFUSED: +- case -ECONNRESET: +- dprintk("RPC: %5u xprt_connect_status: server %s refused " +- "connection\n", task->tk_pid, +- task->tk_client->cl_server); +- break; + case -ENOTCONN: + dprintk("RPC: %5u xprt_connect_status: connection broken\n", + task->tk_pid); +@@ -878,6 +872,7 @@ void xprt_transmit(struct rpc_task *task) + return; + + req->rq_connect_cookie = xprt->connect_cookie; ++ req->rq_xtime = jiffies; + status = xprt->ops->send_request(task); + if (status == 0) { + dprintk("RPC: %5u xmit complete\n", task->tk_pid); +diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c +index ddbe981..4486c59 100644 +--- a/net/sunrpc/xprtsock.c ++++ b/net/sunrpc/xprtsock.c +@@ -579,7 +579,6 @@ static int xs_udp_send_request(struct rpc_task *task) + req->rq_svec->iov_base, + req->rq_svec->iov_len); + +- req->rq_xtime = jiffies; + status = xs_sendpages(transport->sock, + xs_addr(xprt), + xprt->addrlen, xdr, +@@ -671,7 +670,6 @@ static int xs_tcp_send_request(struct rpc_task *task) + * to cope with writespace callbacks arriving _after_ we have + * called sendmsg(). */ + while (1) { +- req->rq_xtime = jiffies; + status = xs_sendpages(transport->sock, + NULL, 0, xdr, req->rq_bytes_sent); -- on_each_cpu(hardware_enable, NULL, 0, 1); -+ on_each_cpu(hardware_enable, NULL, 1); - r = register_cpu_notifier(&kvm_cpu_notifier); - if (r) - goto out_free_2; -@@ -1525,7 +1525,7 @@ out_free_3: - unregister_reboot_notifier(&kvm_reboot_notifier); - unregister_cpu_notifier(&kvm_cpu_notifier); - out_free_2: -- on_each_cpu(hardware_disable, NULL, 0, 1); -+ on_each_cpu(hardware_disable, NULL, 1); - out_free_1: - kvm_arch_hardware_unsetup(); - out_free_0: -@@ -1547,7 +1547,7 @@ void kvm_exit(void) - sysdev_class_unregister(&kvm_sysdev_class); - unregister_reboot_notifier(&kvm_reboot_notifier); - unregister_cpu_notifier(&kvm_cpu_notifier); -- on_each_cpu(hardware_disable, NULL, 0, 1); -+ on_each_cpu(hardware_disable, NULL, 1); - kvm_arch_hardware_unsetup(); - kvm_arch_exit(); - kvm_exit_debug(); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.777 retrieving revision 1.778 diff -u -r1.777 -r1.778 --- kernel.spec 16 Jul 2008 21:53:39 -0000 1.777 +++ kernel.spec 17 Jul 2008 00:50:55 -0000 1.778 @@ -1777,6 +1777,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 16 2008 Dave Jones +- Merge Linux-2.6 up to commit 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af + * Wed Jul 16 2008 Kristian H??gsberg - Also copy new include/drm directory. From fedora-extras-commits at redhat.com Thu Jul 17 00:51:56 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 17 Jul 2008 00:51:56 GMT Subject: rpms/kernel/devel/scripts get-snapshot.sh,1.5,1.6 Message-ID: <200807170051.m6H0puGM006270@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6137/scripts Modified Files: get-snapshot.sh Log Message: Merge Linux-2.6 up to commit 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af Index: get-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/get-snapshot.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- get-snapshot.sh 16 Jul 2008 17:06:08 -0000 1.5 +++ get-snapshot.sh 17 Jul 2008 00:51:11 -0000 1.6 @@ -8,16 +8,27 @@ cd ~/src/git-trees/kernel/linux-2.6 git pull -if [ "$?" = "0" ]; then + +DIF=$(git diff $SHA1.. | wc -l) +if [ "$DIF" = "0" ]; then echo Nothing changed. exit fi -perl -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec +git diff $SHA1.. > ~/src/fedora/kernel/devel/git-linus-new.diff +cd ~/src/fedora/kernel/devel/ +DIF=$(cmp git-linus.diff git-linus-new.diff) +if [ "$?" = "0" ]; then + echo Nothing new in git + rm -f git-linus-new.diff + exit +fi +mv git-linus-new.diff git-linus.diff -git diff $SHA1.. > ~/src/fedora/kernel/devel/git-linus.diff +perl -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec echo "- Merge Linux-2.6 up to" $(git log | head -n1) > ~/src/fedora/kernel/devel/clog.tmp cd ~/src/fedora/kernel/devel/ bumpspecfile.py kernel.spec "$(cat clog.tmp)" rm -f clog.tmp +make clog From fedora-extras-commits at redhat.com Thu Jul 17 00:57:27 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 17 Jul 2008 00:57:27 GMT Subject: rpms/kernel/devel kernel.spec,1.778,1.779 Message-ID: <200807170057.m6H0vRwA006507@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6468 Modified Files: kernel.spec Log Message: don't reference dead file Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.778 retrieving revision 1.779 diff -u -r1.778 -r1.779 --- kernel.spec 17 Jul 2008 00:50:55 -0000 1.778 +++ kernel.spec 17 Jul 2008 00:56:41 -0000 1.779 @@ -530,8 +530,7 @@ Source70: config-s390x Source90: config-sparc64-generic -Source91: config-sparc64 -Source92: config-sparc64-smp +Source91: config-sparc64-smp # Here should be only the patches up to the upstream canonical Linus tree. From fedora-extras-commits at redhat.com Thu Jul 17 01:00:50 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 01:00:50 GMT Subject: rpms/typespeed/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807170100.m6H10osV006697@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/typespeed/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6621/F-8 Modified Files: .cvsignore sources Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:07:14 -0000 1.1 +++ .cvsignore 17 Jul 2008 00:59:59 -0000 1.2 @@ -0,0 +1 @@ +typespeed-0.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:07:14 -0000 1.1 +++ sources 17 Jul 2008 00:59:59 -0000 1.2 @@ -0,0 +1 @@ +fb55b92ad7e29a1a6a7a3e1ca383d5e2 typespeed-0.6.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 01:00:58 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 01:00:58 GMT Subject: rpms/typespeed/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807170100.m6H10wXj006706@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/typespeed/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6621/EL-5 Modified Files: .cvsignore sources Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:07:14 -0000 1.1 +++ .cvsignore 17 Jul 2008 00:59:44 -0000 1.2 @@ -0,0 +1 @@ +typespeed-0.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:07:14 -0000 1.1 +++ sources 17 Jul 2008 00:59:44 -0000 1.2 @@ -0,0 +1 @@ +fb55b92ad7e29a1a6a7a3e1ca383d5e2 typespeed-0.6.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 01:01:06 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 01:01:06 GMT Subject: rpms/typespeed/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807170101.m6H116Qb013260@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/typespeed/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6621/F-9 Modified Files: .cvsignore sources Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:07:14 -0000 1.1 +++ .cvsignore 17 Jul 2008 01:00:20 -0000 1.2 @@ -0,0 +1 @@ +typespeed-0.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/typespeed/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:07:14 -0000 1.1 +++ sources 17 Jul 2008 01:00:20 -0000 1.2 @@ -0,0 +1 @@ +fb55b92ad7e29a1a6a7a3e1ca383d5e2 typespeed-0.6.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 01:03:36 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 01:03:36 GMT Subject: rpms/typespeed/EL-5 typespeed.desktop, NONE, 1.1 typespeed.spec, NONE, 1.1 Message-ID: <200807170103.m6H13aKf013367@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/typespeed/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13354/EL-5 Added Files: typespeed.desktop typespeed.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades --- NEW FILE typespeed.desktop --- [Desktop Entry] Name=Typespeed Comment=Test your typing speed Exec=typespeed Type=Application Terminal=true Icon=keyboard Categories=Game;Education Encoding=UTF-8 --- NEW FILE typespeed.spec --- Name: typespeed Version: 0.6.4 Release: 2%{?dist} Summary: Test your typing speed and get your fingers' CPS Group: Applications/Productivity License: GPLv2+ URL: http://tobias.eyedacor.org/typespeed/ Source0: http://tobias.eyedacor.org/typespeed/typespeed-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel gettext desktop-file-utils %description Typespeed gives your fingers' cps (total and correct), typoratio and some points to compare with your friends. Typespeed's idea is ripped from ztspeed (a DOS game made by Zorlim). The idea behind the game is rather easy: type words that are flying by from left to right as fast as you can. If you miss 10 or more words, game is over. You can play typespeed for your own or with a friend using TCP/IPv4. %prep %setup -q iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/%{name} %attr(664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}.score %doc BUGS COPYING ChangeLog NEWS README TODO %config(noreplace) %{_sysconfdir}/%{name}rc %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %exclude %{_datadir}/doc/%{name}/README %{_mandir}/man6/* %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %%prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades * Tue May 20 2008 Michel Salim - 0.6.4-1 - Initial package (based on upstream spec by Andrew Ziem) From fedora-extras-commits at redhat.com Thu Jul 17 01:03:51 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 01:03:51 GMT Subject: rpms/typespeed/F-8 typespeed.desktop, NONE, 1.1 typespeed.spec, NONE, 1.1 Message-ID: <200807170103.m6H13pSZ013386@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/typespeed/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13354/F-8 Added Files: typespeed.desktop typespeed.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades --- NEW FILE typespeed.desktop --- [Desktop Entry] Name=Typespeed Comment=Test your typing speed Exec=typespeed Type=Application Terminal=true Icon=keyboard Categories=Game;Education Encoding=UTF-8 --- NEW FILE typespeed.spec --- Name: typespeed Version: 0.6.4 Release: 2%{?dist} Summary: Test your typing speed and get your fingers' CPS Group: Applications/Productivity License: GPLv2+ URL: http://tobias.eyedacor.org/typespeed/ Source0: http://tobias.eyedacor.org/typespeed/typespeed-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel gettext desktop-file-utils %description Typespeed gives your fingers' cps (total and correct), typoratio and some points to compare with your friends. Typespeed's idea is ripped from ztspeed (a DOS game made by Zorlim). The idea behind the game is rather easy: type words that are flying by from left to right as fast as you can. If you miss 10 or more words, game is over. You can play typespeed for your own or with a friend using TCP/IPv4. %prep %setup -q iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/%{name} %attr(664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}.score %doc BUGS COPYING ChangeLog NEWS README TODO %config(noreplace) %{_sysconfdir}/%{name}rc %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %exclude %{_datadir}/doc/%{name}/README %{_mandir}/man6/* %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %%prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades * Tue May 20 2008 Michel Salim - 0.6.4-1 - Initial package (based on upstream spec by Andrew Ziem) From fedora-extras-commits at redhat.com Thu Jul 17 01:04:04 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 01:04:04 GMT Subject: rpms/typespeed/F-9 typespeed.desktop, NONE, 1.1 typespeed.spec, NONE, 1.1 Message-ID: <200807170104.m6H144ax013403@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/typespeed/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13354/F-9 Added Files: typespeed.desktop typespeed.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades --- NEW FILE typespeed.desktop --- [Desktop Entry] Name=Typespeed Comment=Test your typing speed Exec=typespeed Type=Application Terminal=true Icon=keyboard Categories=Game;Education Encoding=UTF-8 --- NEW FILE typespeed.spec --- Name: typespeed Version: 0.6.4 Release: 2%{?dist} Summary: Test your typing speed and get your fingers' CPS Group: Applications/Productivity License: GPLv2+ URL: http://tobias.eyedacor.org/typespeed/ Source0: http://tobias.eyedacor.org/typespeed/typespeed-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel gettext desktop-file-utils %description Typespeed gives your fingers' cps (total and correct), typoratio and some points to compare with your friends. Typespeed's idea is ripped from ztspeed (a DOS game made by Zorlim). The idea behind the game is rather easy: type words that are flying by from left to right as fast as you can. If you miss 10 or more words, game is over. You can play typespeed for your own or with a friend using TCP/IPv4. %prep %setup -q iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/%{name} %attr(664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}.score %doc BUGS COPYING ChangeLog NEWS README TODO %config(noreplace) %{_sysconfdir}/%{name}rc %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %exclude %{_datadir}/doc/%{name}/README %{_mandir}/man6/* %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.6.4-2 - Use iconv in %%prep to fix ChangeLog encoding - Do not overwrite typespeed.score on upgrades * Tue May 20 2008 Michel Salim - 0.6.4-1 - Initial package (based on upstream spec by Andrew Ziem) From fedora-extras-commits at redhat.com Thu Jul 17 01:05:18 2008 From: fedora-extras-commits at redhat.com (Kostas Georgiou (georgiou)) Date: Thu, 17 Jul 2008 01:05:18 GMT Subject: rpms/ganglia/devel .cvsignore, 1.7, 1.8 ganglia.spec, 1.16, 1.17 sources, 1.8, 1.9 ganglia-3.1.0-r1399-ppc64build.patch, 1.2, NONE Message-ID: <200807170105.m6H15I1B013578@cvs-int.fedora.redhat.com> Author: georgiou Update of /cvs/extras/rpms/ganglia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13483 Modified Files: .cvsignore ganglia.spec sources Removed Files: ganglia-3.1.0-r1399-ppc64build.patch Log Message: Update to 3.1.0 and small fixes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ganglia/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Jun 2008 19:43:57 -0000 1.7 +++ .cvsignore 17 Jul 2008 01:04:29 -0000 1.8 @@ -1,4 +1 @@ -ganglia-3.0.5.tar.gz -ganglia-3.0.6.tar.gz -ganglia-3.0.7.tar.gz -ganglia-3.1.0.1399.tar.gz +ganglia-3.1.0.tar.gz Index: ganglia.spec =================================================================== RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ganglia.spec 13 Jun 2008 15:31:00 -0000 1.16 +++ ganglia.spec 17 Jul 2008 01:04:29 -0000 1.17 @@ -1,16 +1,14 @@ -%define svnrev 1399 - Name: ganglia Version: 3.1.0 -Release: 0.3%{?svnrev:.r%{svnrev}}%{?dist} +Release: 0.4%{?svnrev:.r%{svnrev}}%{?dist} Summary: Ganglia Distributed Monitoring System Group: Applications/Internet License: BSD URL: http://ganglia.sourceforge.net/ -Source0: http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz +Source0: http://www.ganglia.info/testing//%{name}-%{version}.tar.gz +#Source0: http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz #Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Patch0: ganglia-3.1.0-r1399-ppc64build.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: rrdtool-devel, apr-devel >= 1 @@ -89,8 +87,7 @@ programmers can use to build scalable cluster or grid applications %prep -%setup -q -n %{name}-%{version}.%{svnrev} -%patch0 -p1 +%setup -q -n %{name}-%{version}%{?svnrev:.%{svnrev}} ## Hey, those shouldn't be executable... chmod -x lib/*.{h,x} @@ -98,13 +95,13 @@ %configure \ --with-gmetad \ --disable-static \ - --with-shared + --enable-shared ## Default to run as user ganglia instead of nobody %{__perl} -pi.orig -e 's|nobody|ganglia|g' \ lib/libgmond.c gmetad/conf.c gmond/g25_config.c \ gmetad/gmetad.conf gmond/gmond.conf.html ganglia.html \ - gmond/conf.pod ganglia.pod README + gmond/conf.pod ganglia.pod README lib/default_conf.h ## Don't have initscripts turn daemons on by default %{__perl} -pi.orig -e 's|2345|-|g' \ @@ -145,7 +142,7 @@ cp -p gmetad/gmetad.conf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmetad.conf cp -p mans/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ ## Build default gmond.conf from gmond using the '-t' flag -gmond/gmond -t > $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmond.conf +gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' > $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmond.conf ## Python bits # Copy the python metric modules and .conf files @@ -252,6 +249,11 @@ %{_datadir}/%{name} %changelog +* Thu Jul 17 2008 Kostas Georgiou 3.1.0-0.4 +- Update to the 3.1.0 pre-release +- Fixes gmond.conf to use the ganglia user and not nobody +- Removal of the ppc64 work-around + * Fri Jun 13 2008 Jarod Wilson 3.1.0-0.3.r1399 - One more try at work-around. Needs powerpc64, not ppc64... Index: sources =================================================================== RCS file: /cvs/extras/rpms/ganglia/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jun 2008 19:43:57 -0000 1.8 +++ sources 17 Jul 2008 01:04:29 -0000 1.9 @@ -1 +1 @@ -f33f73e8e693da0a7194b477ff4e7752 ganglia-3.1.0.1399.tar.gz +07aa22905756685adbb412564dd396f1 ganglia-3.1.0.tar.gz --- ganglia-3.1.0-r1399-ppc64build.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 01:18:42 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Thu, 17 Jul 2008 01:18:42 GMT Subject: rpms/stardict/devel stardict.spec,1.58,1.59 Message-ID: <200807170118.m6H1IgNL014106@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/stardict/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13993 Modified Files: stardict.spec Log Message: Resolves: rhbz#455685 (Broken depedency of bonobo-activitation.) Index: stardict.spec =================================================================== RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- stardict.spec 14 Jul 2008 02:53:32 -0000 1.58 +++ stardict.spec 17 Jul 2008 01:17:58 -0000 1.59 @@ -4,7 +4,7 @@ Name: %{name} Summary: A powerful dictionary platform written in GTK+2 Version: %{version} -Release: 11.1%{?dist} +Release: 12%{?dist} Group: Applications/System License: GPLv3 URL: http://stardict.sourceforge.net @@ -14,7 +14,7 @@ Patch2: stardict-3.0.1-10.gucharmap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: bonobo-activitation >= 2.2.0, enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17 +Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17 #Requires: festival, speech-tools Requires(post): GConf2, scrollkeeper Requires(postun): scrollkeeper @@ -84,6 +84,9 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Thu Jul 17 2008 Caius Chance - 3.0.1-12.fc10 +- Resolves: rhbz#455685 (Broken dependency of bonobo-activitation.) + * Mon Jul 14 2008 Caius Chance - 3.0.1-11.1.fc10 - Enable gucharmap-2. From fedora-extras-commits at redhat.com Thu Jul 17 02:00:27 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 02:00:27 GMT Subject: rpms/xscreensaver/F-9 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xscreensaver.spec, 1.69, 1.70 xscreensaver-5.05-penetrate-font.patch, 1.2, NONE Message-ID: <200807170200.m6H20RTh016053@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15887/F-9 Modified Files: .cvsignore sources xscreensaver.spec Removed Files: xscreensaver-5.05-penetrate-font.patch Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 - Update to 5.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Mar 2008 14:20:06 -0000 1.7 +++ .cvsignore 17 Jul 2008 01:59:34 -0000 1.8 @@ -1 +1 @@ -xscreensaver-5.05.tar.gz +xscreensaver-5.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Mar 2008 14:20:06 -0000 1.7 +++ sources 17 Jul 2008 01:59:34 -0000 1.8 @@ -1 +1 @@ -d759262b10d76f87f1a7fc50ae8664d4 xscreensaver-5.05.tar.gz +c6b2cab02aaea32684d37a9a76488e0f xscreensaver-5.06.tar.gz Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- xscreensaver.spec 31 May 2008 17:33:19 -0000 1.69 +++ xscreensaver.spec 17 Jul 2008 01:59:34 -0000 1.70 @@ -1,11 +1,11 @@ %define name xscreensaver -%define version 5.05 +%define mainversion 5.06 %define beta_ver %{nil} %define modular_conf 1 -%define fedora_rel 4 +%define fedora_rel 1 %define extrarel %{nil} @@ -20,21 +20,18 @@ Summary: X screen saver and locker Name: %{name} -Version: %{version} +Version: %{mainversion} Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: BSD Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ -Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz +Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz %if %{modular_conf} Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch3: xscreensaver-5.05-addopts-jwz.patch -Patch4: xscreensaver-5.05-fix-compile.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch -Patch22: xscreensaver-5.05-penetrate-font.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -172,13 +169,10 @@ %prep -%setup -q -n %{name}-%{version}%{?beta_ver} +%setup -q -n %{name}-%{mainversion}%{?beta_ver} %patch1 -p1 -b .sanitize-hacks -%patch3 -p1 -b .opts -%patch4 -p1 -b .compile %patch21 -p1 -b .nonet -%patch22 -p1 -b .font change_option(){ set +x @@ -350,7 +344,7 @@ make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install -desktop-file-install --vendor gnome --delete-original \ +desktop-file-install --vendor "" --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ --add-category DesktopSettings \ @@ -379,7 +373,7 @@ # Generate three lists of files for the three packages. # -dd=%{_builddir}/%{name}-%{version}%{?beta_ver} +dd=%{_builddir}/%{name}-%{mainversion}%{?beta_ver} # In case rpm -bi --short-circuit is tried multiple times: rm -f $dd/*.files @@ -564,6 +558,12 @@ %defattr(-,root,root,-) %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 +- Update to 5.06 + +* Wed Jul 9 2008 Mamoru Tasaka - 1:5.05.90.3-3 +- Apply a experimental randr 1.2 patch by jwz + * Mon Jun 1 2008 Mamoru Tasaka - 1:5.05-4 - Fix compilation error with GLib 2.17+ --- xscreensaver-5.05-penetrate-font.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 02:00:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 02:00:34 GMT Subject: rpms/xscreensaver/F-8 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xscreensaver.spec, 1.63, 1.64 xscreensaver-5.05-penetrate-font.patch, 1.2, NONE Message-ID: <200807170200.m6H20Ygq016088@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15887/F-8 Modified Files: .cvsignore sources xscreensaver.spec Removed Files: xscreensaver-5.05-penetrate-font.patch Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 - Update to 5.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Mar 2008 14:20:00 -0000 1.7 +++ .cvsignore 17 Jul 2008 01:59:19 -0000 1.8 @@ -1 +1 @@ -xscreensaver-5.05.tar.gz +xscreensaver-5.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Mar 2008 14:20:00 -0000 1.7 +++ sources 17 Jul 2008 01:59:19 -0000 1.8 @@ -1 +1 @@ -d759262b10d76f87f1a7fc50ae8664d4 xscreensaver-5.05.tar.gz +c6b2cab02aaea32684d37a9a76488e0f xscreensaver-5.06.tar.gz Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- xscreensaver.spec 31 May 2008 17:33:02 -0000 1.63 +++ xscreensaver.spec 17 Jul 2008 01:59:19 -0000 1.64 @@ -1,11 +1,11 @@ %define name xscreensaver -%define version 5.05 +%define mainversion 5.06 %define beta_ver %{nil} %define modular_conf 1 -%define fedora_rel 4 +%define fedora_rel 1 %define extrarel %{nil} @@ -20,21 +20,18 @@ Summary: X screen saver and locker Name: %{name} -Version: %{version} +Version: %{mainversion} Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: BSD Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ -Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz +Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz %if %{modular_conf} Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch3: xscreensaver-5.05-addopts-jwz.patch -Patch4: xscreensaver-5.05-fix-compile.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch -Patch22: xscreensaver-5.05-penetrate-font.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -172,13 +169,10 @@ %prep -%setup -q -n %{name}-%{version}%{?beta_ver} +%setup -q -n %{name}-%{mainversion}%{?beta_ver} %patch1 -p1 -b .sanitize-hacks -%patch3 -p1 -b .opts -%patch4 -p1 -b .compile %patch21 -p1 -b .nonet -%patch22 -p1 -b .font change_option(){ set +x @@ -350,7 +344,7 @@ make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install -desktop-file-install --vendor gnome --delete-original \ +desktop-file-install --vendor "" --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ --add-category DesktopSettings \ @@ -379,7 +373,7 @@ # Generate three lists of files for the three packages. # -dd=%{_builddir}/%{name}-%{version}%{?beta_ver} +dd=%{_builddir}/%{name}-%{mainversion}%{?beta_ver} # In case rpm -bi --short-circuit is tried multiple times: rm -f $dd/*.files @@ -564,6 +558,12 @@ %defattr(-,root,root,-) %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 +- Update to 5.06 + +* Wed Jul 9 2008 Mamoru Tasaka - 1:5.05.90.3-3 +- Apply a experimental randr 1.2 patch by jwz + * Mon Jun 1 2008 Mamoru Tasaka - 1:5.05-4 - Fix compilation error with GLib 2.17+ --- xscreensaver-5.05-penetrate-font.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 02:00:42 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 02:00:42 GMT Subject: rpms/xscreensaver/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xscreensaver.spec, 1.70, 1.71 xscreensaver-5.05-penetrate-font.patch, 1.2, NONE xscreensaver-5.05.90-lockscreen-version.patch, 1.1, NONE xscreensaver-randr-patch-3-fix-jwz.patch, 1.1, NONE xscreensaver-randr-patch-3.txt, 1.1, NONE Message-ID: <200807170200.m6H20gHV016111@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15887/devel Modified Files: .cvsignore sources xscreensaver.spec Removed Files: xscreensaver-5.05-penetrate-font.patch xscreensaver-5.05.90-lockscreen-version.patch xscreensaver-randr-patch-3-fix-jwz.patch xscreensaver-randr-patch-3.txt Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 - Update to 5.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Mar 2008 14:20:06 -0000 1.7 +++ .cvsignore 17 Jul 2008 01:59:57 -0000 1.8 @@ -1 +1 @@ -xscreensaver-5.05.tar.gz +xscreensaver-5.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Mar 2008 14:20:06 -0000 1.7 +++ sources 17 Jul 2008 01:59:57 -0000 1.8 @@ -1 +1 @@ -d759262b10d76f87f1a7fc50ae8664d4 xscreensaver-5.05.tar.gz +c6b2cab02aaea32684d37a9a76488e0f xscreensaver-5.06.tar.gz Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- xscreensaver.spec 9 Jul 2008 11:41:01 -0000 1.70 +++ xscreensaver.spec 17 Jul 2008 01:59:57 -0000 1.71 @@ -1,11 +1,11 @@ %define name xscreensaver -%define mainversion 5.05 +%define mainversion 5.06 %define beta_ver %{nil} %define modular_conf 1 -%define fedora_rel 3 +%define fedora_rel 1 %define extrarel %{nil} @@ -20,7 +20,7 @@ Summary: X screen saver and locker Name: %{name} -Version: %{mainversion}.90.3 +Version: %{mainversion} Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: BSD @@ -31,12 +31,7 @@ Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -#Patch3: xscreensaver-5.05-addopts-jwz.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch -Patch22: xscreensaver-5.05-penetrate-font.patch -Patch23: xscreensaver-5.05.90-lockscreen-version.patch -Patch100: http://www.jwz.org/xscreensaver/xscreensaver-randr-patch-3.txt -Patch101: xscreensaver-randr-patch-3-fix-jwz.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -177,14 +172,7 @@ %setup -q -n %{name}-%{mainversion}%{?beta_ver} %patch1 -p1 -b .sanitize-hacks -#%%patch3 -p1 -b .opts -%patch100 -p1 -b .jwz -cd driver -%patch101 -p0 -b .jwz2 -cd .. %patch21 -p1 -b .nonet -%patch22 -p1 -b .font -%patch23 -p1 -b .tmpver change_option(){ set +x @@ -570,6 +558,9 @@ %defattr(-,root,root,-) %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 +- Update to 5.06 + * Wed Jul 9 2008 Mamoru Tasaka - 1:5.05.90.3-3 - Apply a experimental randr 1.2 patch by jwz --- xscreensaver-5.05-penetrate-font.patch DELETED --- --- xscreensaver-5.05.90-lockscreen-version.patch DELETED --- --- xscreensaver-randr-patch-3-fix-jwz.patch DELETED --- --- xscreensaver-randr-patch-3.txt DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 02:35:20 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 02:35:20 GMT Subject: rpms/cairo-dock/F-9 .cvsignore, 1.7, 1.8 cairo-dock.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200807170235.m6H2ZKCi024518@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425/F-9 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 1.6.1.2-1 - 1.6.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 15 Jul 2008 04:23:06 -0000 1.7 +++ .cvsignore 17 Jul 2008 02:34:34 -0000 1.8 @@ -1 +1 @@ -cairo-dock-sources-1.6.1.1.tar +cairo-dock-sources-1.6.1.2.tar Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cairo-dock.spec 15 Jul 2008 04:08:36 -0000 1.10 +++ cairo-dock.spec 17 Jul 2008 02:34:34 -0000 1.11 @@ -4,7 +4,7 @@ # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . %define tarballver svn1203_trunk -%define mainver 1.6.1.1 +%define mainver 1.6.1.2 %define build_gecko 1 @@ -23,7 +23,7 @@ %define gecko_ver 1.9 %endif %if 0%{?fedora} == 8 -%define gecko_ver 1.8.1.15 +%define gecko_ver 1.8.1.16 %endif Name: cairo-dock @@ -560,6 +560,12 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 1.6.1.2-1 +- 1.6.1.2 + +* Tue Jul 15 2008 Christopher Aillon +- F-8: Rebuild against newer gecko + * Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 - 1.6.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Jul 2008 04:23:06 -0000 1.7 +++ sources 17 Jul 2008 02:34:34 -0000 1.8 @@ -1 +1 @@ -88dd8c9e8c9ca99b5493ba60e6dd37f8 cairo-dock-sources-1.6.1.1.tar +76f71d7e86ac737e27762f23b13bfdb0 cairo-dock-sources-1.6.1.2.tar From fedora-extras-commits at redhat.com Thu Jul 17 02:35:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 02:35:34 GMT Subject: rpms/cairo-dock/F-8 .cvsignore, 1.7, 1.8 cairo-dock.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200807170235.m6H2ZYHG024533@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425/F-8 Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 1.6.1.2-1 - 1.6.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 15 Jul 2008 04:08:15 -0000 1.7 +++ .cvsignore 17 Jul 2008 02:34:15 -0000 1.8 @@ -1 +1 @@ -cairo-dock-sources-1.6.1.1.tar +cairo-dock-sources-1.6.1.2.tar Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-8/cairo-dock.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cairo-dock.spec 16 Jul 2008 01:19:25 -0000 1.14 +++ cairo-dock.spec 17 Jul 2008 02:34:15 -0000 1.15 @@ -4,7 +4,7 @@ # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . %define tarballver svn1203_trunk -%define mainver 1.6.1.1 +%define mainver 1.6.1.2 %define build_gecko 1 @@ -28,7 +28,7 @@ Name: cairo-dock Version: %{mainver} -Release: %{fedora_rel}%{?dist}.1 +Release: %{fedora_rel}%{?dist} Summary: Light eye-candy fully themable animated dock Group: User Interface/Desktops @@ -560,8 +560,11 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Tue Jul 15 2008 Christopher Aillon - 1.6.1.1-1.1 -- Rebuild against newer gecko +* Thu Jul 17 2008 Mamoru Tasaka - 1.6.1.2-1 +- 1.6.1.2 + +* Tue Jul 15 2008 Christopher Aillon +- F-8: Rebuild against newer gecko * Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 - 1.6.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Jul 2008 04:08:15 -0000 1.7 +++ sources 17 Jul 2008 02:34:15 -0000 1.8 @@ -1 +1 @@ -88dd8c9e8c9ca99b5493ba60e6dd37f8 cairo-dock-sources-1.6.1.1.tar +76f71d7e86ac737e27762f23b13bfdb0 cairo-dock-sources-1.6.1.2.tar From fedora-extras-commits at redhat.com Thu Jul 17 02:35:42 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 02:35:42 GMT Subject: rpms/cairo-dock/devel .cvsignore, 1.48, 1.49 cairo-dock.spec, 1.62, 1.63 sources, 1.48, 1.49 Message-ID: <200807170235.m6H2ZgmD024539@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/cairo-dock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425/devel Modified Files: .cvsignore cairo-dock.spec sources Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 1.6.1.2-1 - 1.6.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 15 Jul 2008 04:23:23 -0000 1.48 +++ .cvsignore 17 Jul 2008 02:34:50 -0000 1.49 @@ -1 +1 @@ -cairo-dock-sources-1.6.1.1.tar +cairo-dock-sources-1.6.1.2.tar Index: cairo-dock.spec =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- cairo-dock.spec 15 Jul 2008 04:08:50 -0000 1.62 +++ cairo-dock.spec 17 Jul 2008 02:34:50 -0000 1.63 @@ -4,7 +4,7 @@ # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 . %define tarballver svn1203_trunk -%define mainver 1.6.1.1 +%define mainver 1.6.1.2 %define build_gecko 1 @@ -23,7 +23,7 @@ %define gecko_ver 1.9 %endif %if 0%{?fedora} == 8 -%define gecko_ver 1.8.1.15 +%define gecko_ver 1.8.1.16 %endif Name: cairo-dock @@ -560,6 +560,12 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 1.6.1.2-1 +- 1.6.1.2 + +* Tue Jul 15 2008 Christopher Aillon +- F-8: Rebuild against newer gecko + * Tue Jul 15 2008 Mamoru Tasaka - 1.6.1.1-1 - 1.6.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 15 Jul 2008 04:23:23 -0000 1.48 +++ sources 17 Jul 2008 02:34:50 -0000 1.49 @@ -1 +1 @@ -88dd8c9e8c9ca99b5493ba60e6dd37f8 cairo-dock-sources-1.6.1.1.tar +76f71d7e86ac737e27762f23b13bfdb0 cairo-dock-sources-1.6.1.2.tar From fedora-extras-commits at redhat.com Thu Jul 17 05:24:10 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 05:24:10 GMT Subject: rpms/koffice/devel .cvsignore, 1.17, 1.18 koffice.spec, 1.74, 1.75 sources, 1.17, 1.18 Message-ID: <200807170524.m6H5OA8g021304@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21207 Modified Files: .cvsignore koffice.spec sources Log Message: * Thu Jul 17 2008 Rex Dieter 1.9.95.9-1 - koffice-1.9.95.9 - fix pkg interdependencies, multilib issues Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 27 May 2008 20:56:46 -0000 1.17 +++ .cvsignore 17 Jul 2008 05:23:10 -0000 1.18 @@ -1 +1 @@ -koffice-1.9.95.8.tar.bz2 +koffice-1.9.95.9.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- koffice.spec 27 Jun 2008 17:53:50 -0000 1.74 +++ koffice.spec 17 Jul 2008 05:23:10 -0000 1.75 @@ -1,7 +1,7 @@ Name: koffice -Version: 1.9.95.8 -Release: 2%{?dist} +Version: 1.9.95.9 +Release: 1%{?dist} Summary: An integrated office suite Group: Applications/Productivity @@ -17,9 +17,7 @@ #+ FreeTDS library: Kexi Sybase Migration driver requires FreeTDS library. The driver will not be built #+ XBase library: Kexi XBase Migration driver requires XBase library. The driver will not be built #+ GMM: The Krita Panorama plugin will not be built. -#+ GLEW: The Krita shader filter plugin will not be built #+ Spnav: Spnav is the library which is required by the space navigator device plugin -#+ poppler-qt4: The Krita PDF filter will not be built (version 0.6.x is currently required) BuildRequires: boost-devel BuildRequires: bzip2-devel @@ -33,6 +31,7 @@ BuildRequires: freetype-devel BuildRequires: gettext-devel BuildRequires: giflib-devel +BuildRequires: glew-devel BuildRequires: GraphicsMagick-devel BuildRequires: gsl-devel BuildRequires: kdelibs4-devel @@ -90,6 +89,8 @@ Group: Applications/Productivity Requires: %{name}-libs = %{version}-%{release} #Conflicts: koffice-i18n < 4:%{version} +Requires(post): xdg-utils +Requires(postun): xdg-utils %description core %{summary}. @@ -238,8 +239,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 - +make %{?_smp_mflags} -C %{_target_platform} %install @@ -251,6 +251,12 @@ rm -f %{buildroot}%{_kde4_libdir}/lib*common.so rm -f %{buildroot}%{_kde4_libdir}/lib*filters.so rm -f %{buildroot}%{_kde4_libdir}/lib*private.so +rm -f %{buildroot}%{_kde4_libdir}/libkarbon*.so +rm -f %{buildroot}%{_kde4_libdir}/libkexi*.so +rm -f %{buildroot}%{_kde4_libdir}/libkisexiv2.so +rm -f %{buildroot}%{_kde4_libdir}/libkformdesigner.so +rm -f %{buildroot}%{_kde4_libdir}/libkplato*.so +rm -f %{buildroot}%{_kde4_libdir}/libkword*.so rm -f %{buildroot}%{_kde4_libdir}/libkrita*.so rm -f %{buildroot}%{_kde4_libdir}/libkross*.so @@ -260,14 +266,14 @@ %post core -touch --no-create %{_kde4_datadir}/icons/hicolor || : -gtk-update-icon-cache -q %{_kde4_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun core -touch --no-create %{_kde4_datadir}/icons/hicolor || : -gtk-update-icon-cache -q %{_kde4_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %post kword -p /sbin/ldconfig %postun kword -p /sbin/ldconfig @@ -312,8 +318,6 @@ %{_kde4_libdir}/kde4/kofficegrayau8plugin.so %{_kde4_libdir}/kde4/kofficedockers.so %{_kde4_libdir}/kde4/kofficesimpletextedit.so -%{_kde4_libdir}/kde4/libpowerpointimport.so -%{_kde4_libdir}/kde4/pgzkexireportpart2.so %{_kde4_libdir}/kde4/spellcheck.so %{_kde4_libdir}/kde4/textvariables.so %{_kde4_appsdir}/koffice/ @@ -322,6 +326,7 @@ %{_kde4_docdir}/HTML/en/thesaurus/ %{_kde4_datadir}/applications/kde4/KThesaurus.desktop %{_kde4_datadir}/icons/hicolor/*/*/* +%{_kde4_datadir}/icons/oxygen/*/*/* %{_kde4_datadir}/kde4/services/autocorrect.desktop %{_kde4_datadir}/kde4/services/changecase.desktop %{_kde4_datadir}/kde4/services/clipartthumbnail.desktop @@ -361,6 +366,8 @@ %{_kde4_datadir}/kde4/servicetypes/flake*.desktop %{_kde4_libdir}/libflake.so.* %{_kde4_libdir}/kde4/*shape.so +%exclude %{_kde4_libdir}/kde4/formulashape.* +%exclude %{_kde4_libdir}/kde4/kritashape.* %{_kde4_libdir}/libchartshapelib.so.* %{_kde4_libdir}/libkdchart.so.* %{_kde4_libdir}/libkochart.so.* @@ -374,6 +381,7 @@ %{_kde4_libdir}/libkoresources.so.* %{_kde4_libdir}/libkoffice_graya_u16.so.* %{_kde4_libdir}/libkofficegrayau8colorspace.so.* +%{_kde4_libdir}/libkspreadcommon.so.* %{_kde4_libdir}/libkstore.so.* %{_kde4_libdir}/libkwmf.so.* %{_kde4_libdir}/libkformulalib.so.* @@ -383,6 +391,7 @@ %files devel %defattr(-,root,root,-) %{_includedir}/* +# FIXME: include only shlib symlinks we know/want to export %{_kde4_libdir}/lib*.so %exclude %{_kde4_libdir}/libkdeinit4_*.so %{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake @@ -391,8 +400,8 @@ %defattr(-,root,root,-) %{_kde4_bindir}/kspread %{_kde4_libdir}/libkdeinit4_kspread.so -%{_kde4_libdir}/libkspreadcommon.so.* %{_kde4_libdir}/kde4/krossmodulekspread.so +%{_kde4_libdir}/kde4/kspread*.so %{_kde4_libdir}/kde4/libkspreadpart.* %{_kde4_libdir}/kde4/libcsvexport.* %{_kde4_libdir}/kde4/libcsvimport.* @@ -403,6 +412,7 @@ %{_kde4_libdir}/kde4/libkspreadsolver.so %{_kde4_libdir}/kde4/libopencalcexport.* %{_kde4_libdir}/kde4/libopencalcimport.* +%{_kde4_libdir}/kde4/libpowerpointimport.* %{_kde4_libdir}/kde4/libqproimport.* %{_kde4_appsdir}/kspread/ %{_kde4_docdir}/HTML/en/kspread/ @@ -413,6 +423,7 @@ %{_kde4_datadir}/applications/kde4/*kspread.desktop %{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop %{_kde4_datadir}/kde4/services/krossmodulekspread.desktop +%{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop %files kpresenter %defattr(-,root,root,-) @@ -421,13 +432,17 @@ %{_kde4_libdir}/libkpresenterprivate.so.* %{_kde4_libdir}/kde4/*kpresenter*.* %{_kde4_libdir}/kde4/kpr_*.* +%{_kde4_libdir}/kde4/libFilterkpr2odf.so %{_kde4_appsdir}/kpresenter/ %{_kde4_docdir}/HTML/en/kpresenter/ %{_kde4_datadir}/kde4/services/kpr*.desktop %{_kde4_datadir}/kde4/servicetypes/kpr*.desktop +%{_kde4_datadir}/kde4/servicetypes/presentationeventaction.desktop +%{_kde4_datadir}/kde4/servicetypes/scripteventaction.desktop %{_kde4_datadir}/templates/Presentation.desktop %{_kde4_datadir}/templates/.source/Presentation.kpt %{_kde4_datadir}/applications/kde4/*kpresenter.desktop +%{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop %{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop %files karbon @@ -481,6 +496,7 @@ %{_kde4_libdir}/kde4/kexidb_sqlite3driver.* %{_kde4_libdir}/kde4/kexihandler_*.* %{_kde4_libdir}/kde4/krossmodulekexidb.so +%{_kde4_libdir}/kde4/pgzkexireportpart2.so %{_kde4_datadir}/config/kexirc %{_kde4_datadir}/kde4/servicetypes/kexi*.desktop %{_kde4_datadir}/kde4/services/kexi @@ -524,6 +540,7 @@ %{_kde4_libdir}/libkdeinit4_kformula.so %{_kde4_libdir}/libkformulaprivate.so.* %{_kde4_libdir}/kde4/*kformula*.* +%{_kde4_libdir}/kde4/formulashape.* %{_kde4_appsdir}/kformula/ %{_kde4_docdir}/HTML/en/kformula/ %{_kde4_datadir}/kde4/services/kformula*.desktop @@ -574,6 +591,7 @@ %{_kde4_libdir}/kde4/libwpexport.* %{_kde4_libdir}/kde4/libwpimport.* %{_kde4_libdir}/kde4/libmswordimport.* +%{_kde4_libdir}/kde4/libmswordodf_import.* %{_kde4_libdir}/kde4/libxsltimport.* %{_kde4_libdir}/kde4/libxsltexport.* %{_kde4_libdir}/kde4/libhancomwordimport.* @@ -586,6 +604,7 @@ %defattr(-,root,root,-) %{_kde4_bindir}/kplato %{_kde4_bindir}/kplatowork +%{_kde4_configdir}/kplatorc %{_kde4_libdir}/libkdeinit4_kplato.so %{_kde4_libdir}/libkdeinit4_kplatowork.so %{_kde4_libdir}/kde4/libkplatopart.* @@ -616,7 +635,11 @@ %{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop %changelog -* Fri Jun 27 2008 Rex Dieter 1.9.95-8.2 +* Thu Jul 17 2008 Rex Dieter 1.9.95.9-1 +- koffice-1.9.95.9 +- fix pkg interdependencies, multilib issues + +* Fri Jun 27 2008 Rex Dieter 1.9.95.8.2 - respin (eviv2) * Tue May 27 2008 Rex Dieter 1.9.95.8-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 27 May 2008 20:56:46 -0000 1.17 +++ sources 17 Jul 2008 05:23:10 -0000 1.18 @@ -1 +1 @@ -6543af9edb3ac2cd573eec95c59e065f koffice-1.9.95.8.tar.bz2 +8686ff53789c093284543ed5348b012d koffice-1.9.95.9.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 05:32:05 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 17 Jul 2008 05:32:05 GMT Subject: rpms/claws-mail-plugins/F-8 claws-mail-plugins.spec,1.29,1.30 Message-ID: <200807170532.m6H5W52H022414@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail-plugins/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22235 Modified Files: claws-mail-plugins.spec Log Message: - build w/o libarchive on F8 Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-8/claws-mail-plugins.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- claws-mail-plugins.spec 30 Jun 2008 20:57:20 -0000 1.29 +++ claws-mail-plugins.spec 17 Jul 2008 05:31:10 -0000 1.30 @@ -40,12 +40,10 @@ BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: gpgme-devel -BuildRequires: libarchive-devel BuildRequires: libytnef-devel BuildRequires: ghostscript Requires: %{name}-acpi-notifier = %{version}-%{release} -Requires: %{name}-archive = %{version}-%{release} Requires: %{name}-att-remover = %{version}-%{release} Requires: %{name}-attachwarner = %{version}-%{release} Requires: %{name}-cachesaver = %{version}-%{release} @@ -88,15 +86,6 @@ Enables mail notification via LEDs on some laptops. Options can be found on the 'Plugins/Acpi Notifier' page of the preferences. -%package archive -Summary: Archiving features for claws-mail -Group: Applications/Internet -Requires: claws-mail >= %{version} - -%description archive -%{summary} - - %package attachwarner Summary: attachment warner plugin for claws-mail Group: Applications/Internet @@ -272,10 +261,6 @@ %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} -cd ../archive-%{archive} -%configure --disable-static --disable-dependency-tracking -%{__make} %{?_smp_mflags} - #attachwarner cd ../attachwarner-%{attachwarner} %configure --disable-static --disable-dependency-tracking @@ -359,10 +344,6 @@ cd acpi_notifier-%{acpinotifier} %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ -# archive -cd ../archive-%{archive} -%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ - # attachwarner cd ../attachwarner-%{attachwarner} %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ @@ -466,21 +447,6 @@ %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/acpi_notifier.mo %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/acpi_notifier.mo -%files archive -%defattr(-,root,root,-) -%doc archive-%{archive}/ABOUT-NLS -%doc archive-%{archive}/AUTHORS -%doc archive-%{archive}/ChangeLog -%doc archive-%{archive}/COPYING -%doc archive-%{archive}/NEWS -%doc archive-%{archive}/README -%doc archive-%{archive}/TODO -%{_libdir}/claws-mail/plugins/archive* -%{_includedir}/claws-mail/plugins/archive -%lang(es) %{_datadir}/locale/es/LC_MESSAGES/archive.mo -%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/archive.mo -%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/archive.mo - %files attachwarner %defattr(-,root,root,-) %{_libdir}/claws-mail/plugins/attachwarner* @@ -677,7 +643,6 @@ - 3.5.0-1 - version upgrade - upstream dropped pdf plugin -- new archive plugin * Wed Apr 23 2008 Andreas Bierfert - 3.4.0-1 From fedora-extras-commits at redhat.com Thu Jul 17 06:03:23 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Thu, 17 Jul 2008 06:03:23 GMT Subject: rpms/scim/devel scim-1.4.7-timeout.patch, NONE, 1.1 scim-1.4.7-trayicon.patch, NONE, 1.1 scim.spec, 1.122, 1.123 Message-ID: <200807170603.m6H63N1F031040@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30930 Modified Files: scim.spec Added Files: scim-1.4.7-timeout.patch scim-1.4.7-trayicon.patch Log Message: Fix bug 447848 & bug 444150. scim-1.4.7-timeout.patch: --- NEW FILE scim-1.4.7-timeout.patch --- diff -up scim-1.4.7/extras/panel/scim_panel_gtk.cpp.timeout scim-1.4.7/extras/panel/scim_panel_gtk.cpp --- scim-1.4.7/extras/panel/scim_panel_gtk.cpp.timeout 2008-07-17 09:44:53.000000000 +0800 +++ scim-1.4.7/extras/panel/scim_panel_gtk.cpp 2008-07-17 10:47:57.000000000 +0800 @@ -638,6 +638,7 @@ ui_initialize (void) GtkWidget *input_window_vbox; ui_load_config (); + _toolbar_hidden = false; if (_lookup_table_window) gtk_widget_destroy (_lookup_table_window); if (_input_window) gtk_widget_destroy (_input_window); @@ -1024,8 +1025,13 @@ ui_initialize (void) } //Init timeout callback + if (_toolbar_hide_timeout != 0) { + g_source_remove (_toolbar_hide_timeout); + _toolbar_hide_timeout = 0; + + } if (_toolbar_always_show && _toolbar_hide_timeout_max > 0) { - _toolbar_hide_timeout = gtk_timeout_add (1000, ui_hide_window_timeout_cb, NULL); + _toolbar_hide_timeout = g_timeout_add (1000, ui_hide_window_timeout_cb, NULL); g_signal_connect (G_OBJECT (_toolbar_window), "enter-notify-event", G_CALLBACK (ui_toolbar_window_crossing_cb), GINT_TO_POINTER (0)); @@ -2492,11 +2498,14 @@ panel_agent_thread_func (gpointer data) if (!_panel_agent->run ()) std::cerr << "Failed to run Panel.\n"; - +/* G_LOCK (_global_resource_lock); _should_exit = true; G_UNLOCK (_global_resource_lock); - +*/ + gdk_threads_enter (); + gtk_main_quit (); + gdk_threads_leave (); g_thread_exit (NULL); return ((gpointer) NULL); } @@ -3703,7 +3712,7 @@ int main (int argc, char *argv []) start_auto_start_helpers (); - _check_exit_timeout = gtk_timeout_add (500, check_exit_timeout_cb, NULL); + // _check_exit_timeout = g_timeout_add (500, check_exit_timeout_cb, NULL); gdk_threads_enter (); gtk_main (); scim-1.4.7-trayicon.patch: --- NEW FILE scim-1.4.7-trayicon.patch --- diff -up scim-1.4.7/extras/panel/scim_panel_gtk.cpp.trayicon scim-1.4.7/extras/panel/scim_panel_gtk.cpp --- scim-1.4.7/extras/panel/scim_panel_gtk.cpp.trayicon 2008-07-17 10:57:23.000000000 +0800 +++ scim-1.4.7/extras/panel/scim_panel_gtk.cpp 2008-07-17 13:57:55.000000000 +0800 @@ -60,7 +60,7 @@ #include "scimstringview.h" #if ENABLE_TRAY_ICON - #include "scimtrayicon.h" +// #include "scimtrayicon.h" #endif using namespace scim; @@ -276,6 +276,13 @@ static void ui_command_menu_deacti #if ENABLE_TRAY_ICON static void ui_tray_icon_destroy_cb (GtkObject *object, gpointer user_data); +static void ui_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, + guint button, + guint activate_time, + gpointer user_data); + +static void ui_tray_icon_activate_cb (GtkStatusIcon *status_icon, + gpointer user_data); #endif // Client Property Callback @@ -399,9 +406,9 @@ static GtkTooltips *_tooltips static PangoFontDescription *_default_font_desc = 0; #if ENABLE_TRAY_ICON -static ScimTrayIcon *_tray_icon = 0; -static GtkWidget *_tray_icon_factory_button = 0; -static gulong _tray_icon_destroy_signal_id = 0; +static GtkStatusIcon *_tray_icon = 0; +// static GtkWidget *_tray_icon_factory_button = 0; +// static gulong _tray_icon_destroy_signal_id = 0; #endif static gboolean _input_window_draging = FALSE; @@ -648,9 +655,9 @@ ui_initialize (void) #if ENABLE_TRAY_ICON if (_tray_icon) { - g_signal_handler_disconnect (G_OBJECT (_tray_icon), - _tray_icon_destroy_signal_id); - gtk_widget_destroy (GTK_WIDGET (_tray_icon)); + // g_signal_handler_disconnect (G_OBJECT (_tray_icon), + // _tray_icon_destroy_signal_id); + g_object_unref (_tray_icon); } _tray_icon = 0; #endif @@ -1305,9 +1312,9 @@ ui_switch_screen (GdkScreen *screen) } #if ENABLE_TRAY_ICON - if (_tray_icon) { - gtk_window_set_screen (GTK_WINDOW (_tray_icon), screen); - } + // if (_tray_icon) { + // gtk_window_set_screen (GTK_WINDOW (_tray_icon), screen); + // } #endif if (_help_dialog) { @@ -1330,65 +1337,75 @@ ui_switch_screen (GdkScreen *screen) #endif #if ENABLE_TRAY_ICON -static gboolean -ui_tray_icon_expose_event_cb (GtkWidget *widget, GdkEventExpose *event) -{ - gdk_window_clear_area (widget->window, event->area.x, event->area.y, - event->area.width, event->area.height); - return FALSE; -} - -static void -ui_tray_icon_style_set_cb (GtkWidget *widget, GtkStyle *previous_style) -{ - gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -} - -static void -ui_tray_icon_realize_cb (GtkWidget *widget) -{ - if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) - return; - - gtk_widget_set_app_paintable (widget, TRUE); - gtk_widget_set_double_buffered (widget, FALSE); - gdk_window_set_back_pixmap (widget->window, NULL, TRUE); - g_signal_connect (widget, "expose_event", - G_CALLBACK (ui_tray_icon_expose_event_cb), NULL); - g_signal_connect_after (widget, "style_set", - G_CALLBACK (ui_tray_icon_style_set_cb), NULL); -} +// static gboolean +// ui_tray_icon_expose_event_cb (GtkWidget *widget, GdkEventExpose *event) +// { +// gdk_window_clear_area (widget->window, event->area.x, event->area.y, +// event->area.width, event->area.height); +// return FALSE; +// } +// +// static void +// ui_tray_icon_style_set_cb (GtkWidget *widget, GtkStyle *previous_style) +// { +// gdk_window_set_back_pixmap (widget->window, NULL, TRUE); +// } +// +// static void +// ui_tray_icon_realize_cb (GtkWidget *widget) +// { +// if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) +// return; +// +// gtk_widget_set_app_paintable (widget, TRUE); +// gtk_widget_set_double_buffered (widget, FALSE); +// gdk_window_set_back_pixmap (widget->window, NULL, TRUE); +// g_signal_connect (widget, "expose_event", +// G_CALLBACK (ui_tray_icon_expose_event_cb), NULL); +// g_signal_connect_after (widget, "style_set", +// G_CALLBACK (ui_tray_icon_style_set_cb), NULL); +// } static gboolean ui_create_tray_icon_when_idle (gpointer data) { GtkWidget *image; - _tray_icon = scim_tray_icon_new ("SCIM Tray Icon"); - g_signal_connect (G_OBJECT (_tray_icon), "realize", - G_CALLBACK (ui_tray_icon_realize_cb), NULL); - - _tray_icon_destroy_signal_id = - g_signal_connect (G_OBJECT (_tray_icon), "destroy", - G_CALLBACK (ui_tray_icon_destroy_cb), - 0); + _tray_icon = gtk_status_icon_new_from_file (SCIM_KEYBOARD_ICON_FILE); + // g_signal_connect (G_OBJECT (_tray_icon), "realize", + // G_CALLBACK (ui_tray_icon_realize_cb), NULL); + + // _tray_icon_destroy_signal_id = + // g_signal_connect (G_OBJECT (_tray_icon), "destroy", + // G_CALLBACK (ui_tray_icon_destroy_cb), + // 0); + + // image = ui_create_icon (SCIM_KEYBOARD_ICON_FILE, + // NULL, + // TRAY_ICON_SIZE, + // TRAY_ICON_SIZE, + // true); + + // _tray_icon_factory_button = gtk_event_box_new (); + // g_signal_connect (G_OBJECT (_tray_icon_factory_button), "realize", + // G_CALLBACK (ui_tray_icon_realize_cb), NULL); + // gtk_container_add (GTK_CONTAINER (_tray_icon_factory_button), image); + // gtk_container_add (GTK_CONTAINER (_tray_icon), _tray_icon_factory_button); - image = ui_create_icon (SCIM_KEYBOARD_ICON_FILE, - NULL, - TRAY_ICON_SIZE, - TRAY_ICON_SIZE, - true); - - _tray_icon_factory_button = gtk_event_box_new (); - g_signal_connect (G_OBJECT (_tray_icon_factory_button), "realize", - G_CALLBACK (ui_tray_icon_realize_cb), NULL); - gtk_container_add (GTK_CONTAINER (_tray_icon_factory_button), image); - gtk_container_add (GTK_CONTAINER (_tray_icon), _tray_icon_factory_button); - g_signal_connect (G_OBJECT (_tray_icon_factory_button), "button-release-event", - G_CALLBACK (ui_factory_button_click_cb), + + // g_signal_connect (G_OBJECT (_tray_icon_factory_button), "button-release-event", + // G_CALLBACK (ui_factory_button_click_cb), + // 0); + + g_signal_connect (G_OBJECT (_tray_icon), "popup-menu", + G_CALLBACK (ui_tray_icon_popup_menu_cb), + 0); + + g_signal_connect (G_OBJECT (_tray_icon), "activate", + G_CALLBACK (ui_tray_icon_activate_cb), 0); - gtk_widget_show_all (GTK_WIDGET (_tray_icon)); + gtk_status_icon_set_visible (_tray_icon, TRUE); return FALSE; } @@ -1679,6 +1696,19 @@ ui_factory_button_click_cb (GtkWidget *b } static void +ui_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, + guint activate_time, gpointer user_data) +{ + action_show_command_menu (); +} + +static void +ui_tray_icon_activate_cb (GtkStatusIcon *status_icon, gpointer user_data) +{ + _panel_agent->request_factory_menu (); +} + +static void ui_factory_menu_activate_cb (GtkMenuItem *item, gpointer user_data) { @@ -2236,19 +2266,19 @@ ui_command_menu_deactivate_cb (GtkWidget } #if ENABLE_TRAY_ICON -static void -ui_tray_icon_destroy_cb (GtkObject *object, - gpointer user_data) -{ - SCIM_DEBUG_MAIN (1) << "Tray Icon destroyed!\n"; - - gtk_widget_destroy (GTK_WIDGET (object)); - - _tray_icon = 0; - _tray_icon_factory_button = 0; - - g_idle_add (ui_create_tray_icon_when_idle, NULL); -} +// static void +// ui_tray_icon_destroy_cb (GtkObject *object, +// gpointer user_data) +// { +// SCIM_DEBUG_MAIN (1) << "Tray Icon destroyed!\n"; +// +// gtk_widget_destroy (GTK_WIDGET (object)); +// +// _tray_icon = 0; +// _tray_icon_factory_button = 0; +// +// g_idle_add (ui_create_tray_icon_when_idle, NULL); +// } #endif static void @@ -2681,18 +2711,21 @@ slot_update_factory_info (const PanelFac } #if ENABLE_TRAY_ICON - if (_tray_icon_factory_button) { - GtkWidget *icon = gtk_bin_get_child (GTK_BIN (_tray_icon_factory_button)); + // if (_tray_icon_factory_button) { + // GtkWidget *icon = gtk_bin_get_child (GTK_BIN (_tray_icon_factory_button)); - if (icon) - gtk_container_remove (GTK_CONTAINER (_tray_icon_factory_button), icon); + // if (icon) + // gtk_container_remove (GTK_CONTAINER (_tray_icon_factory_button), icon); - icon = ui_create_icon (info.icon, NULL, TRAY_ICON_SIZE, TRAY_ICON_SIZE, true); + // icon = ui_create_icon (info.icon, NULL, TRAY_ICON_SIZE, TRAY_ICON_SIZE, true); - gtk_container_add (GTK_CONTAINER (_tray_icon_factory_button), icon); + // gtk_container_add (GTK_CONTAINER (_tray_icon_factory_button), icon); - if (_tooltips) - gtk_tooltips_set_tip (_tooltips, _tray_icon_factory_button, info.name.c_str (), NULL); + // if (_tooltips) + // gtk_tooltips_set_tip (_tooltips, _tray_icon_factory_button, info.name.c_str (), NULL); + // } + if (_tray_icon) { + gtk_status_icon_set_from_file (_tray_icon, info.icon.c_str()); } #endif Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- scim.spec 1 Jul 2008 04:45:53 -0000 1.122 +++ scim.spec 17 Jul 2008 06:02:21 -0000 1.123 @@ -44,6 +44,8 @@ Patch22: scim-1.4.7-fix-gdm.patch Patch23: scim-1.4.7-remove-help-frame.patch Patch24: scim-1.4.7-translation-update-431995.patch +Patch25: scim-1.4.7-timeout.patch +Patch26: scim-1.4.7-trayicon.patch %description SCIM is a user friendly and full featured input method user interface and @@ -171,6 +173,8 @@ %patch22 -p1 -b .22-fix-gdm %patch23 -p1 -b .23-help-frame %patch24 -p1 -b .24-trans +%patch25 -p1 -b .25-timeout +%patch26 -p1 -b .26-trayicon %if %{snapshot} @@ -303,6 +307,10 @@ %changelog +* Thu Jul 17 2008 Huang Peng - 1.4.7-27.fc10 +- add patch scim-1.4.7-timeout.patch to fix bug 444150. +- add patch scim-1.4.7-trayicon.patch to fix bug 447848. + * Mon Jun 30 2008 Jens Petersen - 1.4.7-26.fc10 - make xinput script no longer require multilib immodules (Julian Sikorski, #448268) From fedora-extras-commits at redhat.com Thu Jul 17 06:07:08 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Thu, 17 Jul 2008 06:07:08 GMT Subject: rpms/scim/devel scim.spec,1.123,1.124 Message-ID: <200807170607.m6H678GQ031257@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31194 Modified Files: scim.spec Log Message: Update rel number. Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- scim.spec 17 Jul 2008 06:02:21 -0000 1.123 +++ scim.spec 17 Jul 2008 06:06:06 -0000 1.124 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ From fedora-extras-commits at redhat.com Thu Jul 17 06:13:57 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 17 Jul 2008 06:13:57 GMT Subject: rpms/sextractor/EL-5 sextractor.spec,1.6,1.7 Message-ID: <200807170613.m6H6Dvlw031779@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/sextractor/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31758 Modified Files: sextractor.spec Log Message: * Thu Jul 17 2008 Sergio Pascual 2.5.0-6 - Rebuilt for EL-5 Index: sextractor.spec =================================================================== RCS file: /cvs/pkgs/rpms/sextractor/EL-5/sextractor.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sextractor.spec 11 Sep 2006 22:33:21 -0000 1.6 +++ sextractor.spec 17 Jul 2008 06:13:05 -0000 1.7 @@ -1,6 +1,6 @@ Name: sextractor Version: 2.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Extract catalogs of sources from astronomical images Group: Applications/Engineering @@ -44,21 +44,30 @@ %{_datadir}/%{name}/* %changelog +* Thu Jul 17 2008 Sergio Pascual 2.5.0-6 +- Rebuilt for EL-5 + * Tue Sep 12 2006 Sergio Pascual 2.5.0-5 - Rebuilt for FC6. + * Wed Jul 26 2006 Sergio Pascual 2.5.0-4 - Patch to resolve pointer aliasing problems (bug #199700) - Removed -DXSL_URL flag, as the file sextractor.xsl does not exist yet + * Mon Jul 24 2006 Sergio Pascual 2.5.0-3 - Reverting optimization to -O2, it breaks debug infos + * Fri Jul 21 2006 Sergio Pascual 2.5.0-2 - fitsconv.c has correct permissions - changed optimization from -O2 to -O1 (bug #199700) - additional define allows VOTable output + * Wed Jul 19 2006 Sergio Pascual 2.5.0-1 - New upstream version 2.5.0 + * Tue Jun 20 2006 Sergio Pascual 2.4.4-2 - Fixed executable permission in src/fits/fitsconv.c - default.sex and default.param moved to docs + * Mon Jun 19 2006 Sergio Pascual 2.4.4-1 - Initial spec file. From fedora-extras-commits at redhat.com Thu Jul 17 07:05:13 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Thu, 17 Jul 2008 07:05:13 GMT Subject: rpms/sugar/F-9 sugar.spec,1.22,1.23 Message-ID: <200807170705.m6H75DHf012258@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12218 Modified Files: sugar.spec Log Message: * Thu Jul 17 2008 Simon Schampijer - 0.81.6-4.20080715git8137d5c37f - split the sugar-emulator in it's own package to get rid of the xephyr dependency Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/sugar.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sugar.spec 15 Jul 2008 20:32:57 -0000 1.22 +++ sugar.spec 17 Jul 2008 07:04:28 -0000 1.23 @@ -5,7 +5,7 @@ Name: sugar Version: 0.81.6 #Release: 1%{?dist} -Release: 3.%{alphatag}%{?dist} +Release: 4.%{alphatag}%{?dist} URL: http://dev.laptop.org # git clone git://dev.laptop.org/sugar # cd sugar @@ -28,7 +28,6 @@ Requires: gnome-python2-libwnck Requires: matchbox-window-manager Requires: numpy -Requires: xorg-x11-server-Xephyr %description @@ -36,6 +35,16 @@ sites http://fedoraproject.org/wiki/OLPC and http://www.laptop.org for goals of this project. +%package emulator +Summary: The emulator for the Desktop Environment sugar +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-server-Xephyr + +%description emulator +The emulator let's you test and debug sugar. For example it allows you to run +multiple instances of sugar. + %prep %setup -q @@ -74,10 +83,19 @@ %{_datadir}/dbus-1/services/*.service %{_bindir}/* +%exclude %{_bindir}/sugar-emulator %{_datadir}/mime/packages/sugar.xml +%files emulator +%defattr(-,root,root,-) +%{_bindir}/sugar-emulator + %changelog +* Thu Jul 17 2008 Simon Schampijer - 0.81.6-4.20080715git8137d5c37f +- split the sugar-emulator in it's own package to get rid of the + xephyr dependency + * Tue Jul 15 2008 Tomeu Vizoso - 0.81.6-3.20080715git8137d5c37f - 7071 Add an option for uninstalling activities from the home view - 7476 Order control panel modules logically From fedora-extras-commits at redhat.com Thu Jul 17 07:25:24 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 17 Jul 2008 07:25:24 GMT Subject: comps/po tg.po,NONE,1.1 Message-ID: <200807170725.m6H7PONX015587@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15579/po Added Files: tg.po Log Message: 2008-07-17 Victor Ibragimov (via tajikfedora at fedoraproject.org) * po/tg.po: Tajik Translation added by Victor Ibragimov --- NEW FILE tg.po --- msgid "" msgstr "" "Project-Id-Version: Fedora Localization Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-15 10:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik Fedora and Software Localization Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: 1\n" "X-Poedit-Language: Tajik\n" "X-Poedit-Country: TAJIKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" #: ../comps-f7.xml.in.h:1 #: ../comps-f8.xml.in.h:1 #: ../comps-f9.xml.in.h:1 #: ../comps-f10.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "???????????? ???????? ??????????, ???? ?????? ?????? ?????????????????????? ???????? ?????? ??????????????." #: ../comps-f7.xml.in.h:2 #: ../comps-f8.xml.in.h:2 #: ../comps-f9.xml.in.h:2 #: ../comps-f10.xml.in.h:2 #: ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "???????????????? ??????????????????" #: ../comps-f7.xml.in.h:3 #: ../comps-f8.xml.in.h:3 #: ../comps-f9.xml.in.h:3 #: ../comps-f10.xml.in.h:3 msgid "Afrikaans Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:4 #: ../comps-f8.xml.in.h:4 #: ../comps-f9.xml.in.h:4 #: ../comps-f10.xml.in.h:4 msgid "Albanian Support" msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f7.xml.in.h:5 #: ../comps-f8.xml.in.h:5 #: ../comps-f9.xml.in.h:5 #: ../comps-f10.xml.in.h:5 #: ../comps-el4.xml.in.h:2 #: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "??????????????????" #: ../comps-f7.xml.in.h:6 #: ../comps-f8.xml.in.h:6 #: ../comps-f9.xml.in.h:6 #: ../comps-f10.xml.in.h:6 msgid "Applications to perform a variety of tasks" msgstr "?????????????????? ?????????? ???????????????? ???????????????????? ??????????????" #: ../comps-f7.xml.in.h:7 #: ../comps-f8.xml.in.h:7 #: ../comps-f9.xml.in.h:7 #: ../comps-f10.xml.in.h:7 #: ../comps-el4.xml.in.h:4 #: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:8 #: ../comps-f8.xml.in.h:8 #: ../comps-f9.xml.in.h:8 #: ../comps-f10.xml.in.h:8 #: ../comps-el4.xml.in.h:5 #: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:9 #: ../comps-f8.xml.in.h:9 #: ../comps-f9.xml.in.h:9 #: ../comps-f10.xml.in.h:9 msgid "Assamese Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:10 #: ../comps-f8.xml.in.h:10 #: ../comps-f9.xml.in.h:10 #: ../comps-f10.xml.in.h:10 #: ../comps-el4.xml.in.h:6 #: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "???????????????? ???? ??????????????" #: ../comps-f7.xml.in.h:11 #: ../comps-f8.xml.in.h:11 #: ../comps-f9.xml.in.h:11 #: ../comps-f10.xml.in.h:11 msgid "Base" msgstr "????????????" #: ../comps-f7.xml.in.h:12 #: ../comps-f8.xml.in.h:12 #: ../comps-f9.xml.in.h:12 #: ../comps-f10.xml.in.h:12 #: ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "?????????????? ??????????????????" #: ../comps-f7.xml.in.h:13 #: ../comps-f8.xml.in.h:13 #: ../comps-f9.xml.in.h:13 #: ../comps-f10.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "???????????????????? ?????????? ?????????? ?????????????????????????? Ruby" #: ../comps-f7.xml.in.h:14 #: ../comps-f8.xml.in.h:14 #: ../comps-f9.xml.in.h:14 #: ../comps-f10.xml.in.h:14 msgid "Basque Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:15 #: ../comps-f8.xml.in.h:15 #: ../comps-f9.xml.in.h:15 #: ../comps-f10.xml.in.h:15 msgid "Belarusian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:16 #: ../comps-f8.xml.in.h:16 #: ../comps-f9.xml.in.h:16 #: ../comps-f10.xml.in.h:16 msgid "Bengali Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:17 #: ../comps-f8.xml.in.h:17 #: ../comps-f9.xml.in.h:17 #: ../comps-f10.xml.in.h:17 msgid "Bhutanese Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:18 #: ../comps-f8.xml.in.h:18 #: ../comps-f9.xml.in.h:18 #: ../comps-f10.xml.in.h:18 msgid "Bosnian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:19 #: ../comps-f8.xml.in.h:19 #: ../comps-f9.xml.in.h:19 #: ../comps-f10.xml.in.h:19 msgid "Brazilian Portuguese Support" msgstr "???????????????????? ???????????? ?????????????????????? ??????????????????" #: ../comps-f7.xml.in.h:20 #: ../comps-f8.xml.in.h:20 #: ../comps-f9.xml.in.h:20 #: ../comps-f10.xml.in.h:20 msgid "Breton Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:21 #: ../comps-f8.xml.in.h:22 #: ../comps-f9.xml.in.h:22 #: ../comps-f10.xml.in.h:22 msgid "Bulgarian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:22 #: ../comps-f8.xml.in.h:23 #: ../comps-f9.xml.in.h:23 #: ../comps-f10.xml.in.h:23 msgid "Catalan Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:23 #: ../comps-f8.xml.in.h:24 #: ../comps-f9.xml.in.h:24 #: ../comps-f10.xml.in.h:24 msgid "Chinese Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:24 #: ../comps-f8.xml.in.h:25 #: ../comps-f9.xml.in.h:25 #: ../comps-f10.xml.in.h:25 msgid "Clustering" msgstr "??????????????????" #: ../comps-f7.xml.in.h:25 #: ../comps-f8.xml.in.h:26 #: ../comps-f9.xml.in.h:26 #: ../comps-f10.xml.in.h:26 msgid "Clustering Support" msgstr "???????????????????? ??????????????????" #: ../comps-f7.xml.in.h:26 #: ../comps-f8.xml.in.h:27 #: ../comps-f9.xml.in.h:27 #: ../comps-f10.xml.in.h:27 msgid "Core" msgstr "????????" #: ../comps-f7.xml.in.h:27 #: ../comps-f8.xml.in.h:28 #: ../comps-f9.xml.in.h:28 #: ../comps-f10.xml.in.h:28 msgid "Croatian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:28 #: ../comps-f8.xml.in.h:29 #: ../comps-f9.xml.in.h:29 #: ../comps-f10.xml.in.h:29 #: ../comps-el5.xml.in.h:8 msgid "Czech Support" msgstr "???????????????????? ???????????? ????????" #: ../comps-f7.xml.in.h:29 #: ../comps-f8.xml.in.h:30 #: ../comps-f9.xml.in.h:30 #: ../comps-f10.xml.in.h:30 msgid "DNS Name Server" msgstr "???????? ???????????????????? DNS" #: ../comps-f7.xml.in.h:30 #: ../comps-f8.xml.in.h:31 #: ../comps-f9.xml.in.h:31 #: ../comps-f10.xml.in.h:31 msgid "Danish Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:31 #: ../comps-f8.xml.in.h:32 #: ../comps-f9.xml.in.h:32 #: ../comps-f10.xml.in.h:32 #: ../comps-el4.xml.in.h:8 #: ../comps-el5.xml.in.h:9 msgid "Desktop Environments" msgstr "???????????? ???????? ????????" #: ../comps-f7.xml.in.h:32 #: ../comps-f8.xml.in.h:33 #: ../comps-f9.xml.in.h:33 #: ../comps-f10.xml.in.h:33 #: ../comps-el4.xml.in.h:9 #: ../comps-el5.xml.in.h:10 msgid "Desktop environments" msgstr "???????????? ???????? ????????" #: ../comps-f7.xml.in.h:33 #: ../comps-f8.xml.in.h:34 #: ../comps-f9.xml.in.h:34 #: ../comps-f10.xml.in.h:34 #: ../comps-el4.xml.in.h:10 #: ../comps-el5.xml.in.h:11 msgid "Development" msgstr "??????????????????????????" #: ../comps-f7.xml.in.h:34 #: ../comps-f8.xml.in.h:35 #: ../comps-f9.xml.in.h:35 #: ../comps-f10.xml.in.h:35 msgid "Development Libraries" msgstr "???????????????????????? ??????????????????????????" #: ../comps-f7.xml.in.h:35 #: ../comps-f8.xml.in.h:36 #: ../comps-f9.xml.in.h:36 #: ../comps-f10.xml.in.h:36 #: ../comps-el4.xml.in.h:11 #: ../comps-el5.xml.in.h:12 msgid "Development Tools" msgstr "???????????????? ??????????????????????????" #: ../comps-f7.xml.in.h:36 #: ../comps-f8.xml.in.h:37 #: ../comps-f9.xml.in.h:37 #: ../comps-f10.xml.in.h:37 msgid "Dial-up Networking Support" msgstr "???????????????????? Dial-up" #: ../comps-f7.xml.in.h:37 #: ../comps-f8.xml.in.h:38 #: ../comps-f9.xml.in.h:38 #: ../comps-f10.xml.in.h:38 msgid "Dutch Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:38 msgid "Eclipse" msgstr "Eclipse" #: ../comps-f7.xml.in.h:39 #: ../comps-f8.xml.in.h:39 #: ../comps-f9.xml.in.h:39 #: ../comps-f10.xml.in.h:39 #: ../comps-el4.xml.in.h:13 #: ../comps-el5.xml.in.h:14 msgid "Editors" msgstr "??????????????????????" #: ../comps-f7.xml.in.h:40 #: ../comps-f8.xml.in.h:40 #: ../comps-f9.xml.in.h:40 #: ../comps-f10.xml.in.h:40 #: ../comps-el4.xml.in.h:14 #: ../comps-el5.xml.in.h:15 msgid "Educational Software" msgstr "???????????????????? ??????????????" #: ../comps-f7.xml.in.h:41 #: ../comps-f8.xml.in.h:41 #: ../comps-f9.xml.in.h:41 #: ../comps-f10.xml.in.h:41 #: ../comps-el4.xml.in.h:15 #: ../comps-el5.xml.in.h:16 msgid "Educational software for learning" msgstr "???????????????????? ?????????????? ?????????? ????????" #: ../comps-f7.xml.in.h:42 #: ../comps-f8.xml.in.h:42 #: ../comps-f9.xml.in.h:42 #: ../comps-f10.xml.in.h:42 #: ../comps-el4.xml.in.h:16 #: ../comps-el5.xml.in.h:17 msgid "Engineering and Scientific" msgstr "?????? ???? ????????????????" #: ../comps-f7.xml.in.h:43 #: ../comps-f8.xml.in.h:43 #: ../comps-f9.xml.in.h:43 #: ../comps-f10.xml.in.h:43 msgid "English (UK) Support" msgstr "???????????????????? ???????????? ?????????????? (UK)" #: ../comps-f7.xml.in.h:44 #: ../comps-f8.xml.in.h:44 #: ../comps-f9.xml.in.h:45 #: ../comps-f10.xml.in.h:45 msgid "Estonian Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:45 #: ../comps-f8.xml.in.h:45 #: ../comps-f9.xml.in.h:46 #: ../comps-f10.xml.in.h:46 msgid "Ethiopic Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:46 #: ../comps-f8.xml.in.h:46 #: ../comps-f9.xml.in.h:47 #: ../comps-f10.xml.in.h:47 #: ../comps-el4.xml.in.h:17 #: ../comps-el5.xml.in.h:18 msgid "FTP Server" msgstr "???????????????????? FTP" #: ../comps-f7.xml.in.h:47 #: ../comps-f8.xml.in.h:47 #: ../comps-f9.xml.in.h:48 #: ../comps-f10.xml.in.h:48 msgid "Faeroese Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:48 #: ../comps-f8.xml.in.h:49 #: ../comps-f9.xml.in.h:50 #: ../comps-f10.xml.in.h:50 #: ../comps-el4.xml.in.h:18 #: ../comps-el5.xml.in.h:19 msgid "Fedora Packager" msgstr "???????????????????? ???????????????????? Fedora" #: ../comps-f7.xml.in.h:49 #: ../comps-f8.xml.in.h:50 #: ../comps-f9.xml.in.h:51 #: ../comps-f10.xml.in.h:51 msgid "Filipino Support" msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f7.xml.in.h:50 #: ../comps-f8.xml.in.h:51 #: ../comps-f9.xml.in.h:52 #: ../comps-f10.xml.in.h:52 msgid "Finnish Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:51 #: ../comps-f8.xml.in.h:54 #: ../comps-f9.xml.in.h:55 #: ../comps-f10.xml.in.h:55 msgid "French Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:52 #: ../comps-f8.xml.in.h:55 #: ../comps-f9.xml.in.h:56 #: ../comps-f10.xml.in.h:56 #: ../comps-el4.xml.in.h:19 #: ../comps-el5.xml.in.h:20 msgid "From CD recording to playing audio CDs and multimedia files, this package group allows you to work with sound and video on the system." msgstr "???????????? ???? ?????????????????? ???? ???????? ?????????? ??????????????, ?????????????? ?????????? ???? ?????????????? ???? CD ???????? ???????????? ???? ?????????????? CD ???? ?????????????? ?????????????????????? ?????????????? ??????????." #: ../comps-f7.xml.in.h:53 #: ../comps-f8.xml.in.h:56 #: ../comps-f9.xml.in.h:57 #: ../comps-f10.xml.in.h:57 #: ../comps-el4.xml.in.h:20 #: ../comps-el5.xml.in.h:21 msgid "GNOME Desktop Environment" msgstr "???????????? ???????? ?????????? GNOME" #: ../comps-f7.xml.in.h:54 #: ../comps-f8.xml.in.h:57 #: ../comps-f9.xml.in.h:58 #: ../comps-f10.xml.in.h:58 #: ../comps-el4.xml.in.h:21 #: ../comps-el5.xml.in.h:22 msgid "GNOME Software Development" msgstr "???????????????????? ???????????????????????????? GNOME" #: ../comps-f7.xml.in.h:55 #: ../comps-f8.xml.in.h:58 #: ../comps-f9.xml.in.h:59 #: ../comps-f10.xml.in.h:59 msgid "GNOME is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." msgstr "GNOME ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????." #: ../comps-f7.xml.in.h:56 #: ../comps-f8.xml.in.h:59 #: ../comps-f9.xml.in.h:60 #: ../comps-f10.xml.in.h:60 msgid "Gaelic Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:57 #: ../comps-f8.xml.in.h:60 #: ../comps-f9.xml.in.h:61 #: ../comps-f10.xml.in.h:61 msgid "Galician Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:58 #: ../comps-f8.xml.in.h:61 #: ../comps-f9.xml.in.h:62 #: ../comps-f10.xml.in.h:62 #: ../comps-el5.xml.in.h:24 msgid "Games and Entertainment" msgstr "???????????? ???? ????????????????" #: ../comps-f7.xml.in.h:59 #: ../comps-f8.xml.in.h:62 #: ../comps-f9.xml.in.h:63 #: ../comps-f10.xml.in.h:63 msgid "Georgian Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:60 #: ../comps-f8.xml.in.h:63 #: ../comps-f9.xml.in.h:64 #: ../comps-f10.xml.in.h:64 msgid "German Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:61 #: ../comps-f8.xml.in.h:64 #: ../comps-f9.xml.in.h:65 #: ../comps-f10.xml.in.h:65 #: ../comps-el4.xml.in.h:23 #: ../comps-el5.xml.in.h:25 msgid "Graphical Internet" msgstr "???????????????????? ???????????????? ????????????????" #: ../comps-f7.xml.in.h:62 #: ../comps-f8.xml.in.h:65 #: ../comps-f9.xml.in.h:66 #: ../comps-f10.xml.in.h:66 #: ../comps-el4.xml.in.h:24 #: ../comps-el5.xml.in.h:26 msgid "Graphics" msgstr "??????????????" #: ../comps-f7.xml.in.h:63 #: ../comps-f8.xml.in.h:66 #: ../comps-f9.xml.in.h:67 #: ../comps-f10.xml.in.h:67 msgid "Greek Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:64 #: ../comps-f8.xml.in.h:67 #: ../comps-f9.xml.in.h:68 #: ../comps-f10.xml.in.h:68 msgid "Gujarati Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:65 #: ../comps-f8.xml.in.h:68 #: ../comps-f9.xml.in.h:69 #: ../comps-f10.xml.in.h:69 #: ../comps-el4.xml.in.h:25 #: ../comps-el5.xml.in.h:27 msgid "Hardware Support" msgstr "???????????????????? ??????????????????" #: ../comps-f7.xml.in.h:66 #: ../comps-f8.xml.in.h:69 #: ../comps-f9.xml.in.h:70 #: ../comps-f10.xml.in.h:70 #: ../comps-el4.xml.in.h:26 #: ../comps-el5.xml.in.h:28 msgid "Hebrew Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:67 #: ../comps-f8.xml.in.h:70 #: ../comps-f9.xml.in.h:71 #: ../comps-f10.xml.in.h:71 msgid "Hindi Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:68 #: ../comps-f8.xml.in.h:71 #: ../comps-f9.xml.in.h:72 #: ../comps-f10.xml.in.h:72 msgid "Hungarian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:69 #: ../comps-f8.xml.in.h:72 #: ../comps-f9.xml.in.h:73 #: ../comps-f10.xml.in.h:73 msgid "Icelandic Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:70 #: ../comps-f8.xml.in.h:73 #: ../comps-f9.xml.in.h:74 #: ../comps-f10.xml.in.h:74 msgid "Indonesian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:71 #: ../comps-f8.xml.in.h:74 #: ../comps-f9.xml.in.h:75 #: ../comps-f10.xml.in.h:77 #: ../comps-el4.xml.in.h:27 #: ../comps-el5.xml.in.h:29 msgid "Install these packages in order to develop GTK+ and GNOME graphical applications." msgstr "?????????? ???????????????????????????? ???????????????????? ???????????????? GTK+ ???? GNOME, ???????????????????? ?????????????? ???????? ????????????." #: ../comps-f7.xml.in.h:72 #: ../comps-f8.xml.in.h:75 #: ../comps-f9.xml.in.h:76 #: ../comps-f10.xml.in.h:78 msgid "Install these packages in order to develop GTK+ and XFCE graphical applications." msgstr "?????????? ???????????????????????????? ???????????????????? ???????????????? GTK+ ???? XFCE, ???????????????????? ?????????????? ???????? ????????????." #: ../comps-f7.xml.in.h:73 #: ../comps-f8.xml.in.h:76 #: ../comps-f9.xml.in.h:77 #: ../comps-f10.xml.in.h:79 #: ../comps-el4.xml.in.h:28 #: ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." msgstr "?????????? ???????????????????????????? ???????????????????? ???????????????? QT ???? KDE, ???????????????????? ?????????????? ???????? ????????????." #: ../comps-f7.xml.in.h:74 #: ../comps-f8.xml.in.h:77 #: ../comps-f9.xml.in.h:78 #: ../comps-f10.xml.in.h:80 msgid "Install these tools to enable the system to print or act as a print server." msgstr "?????????? ???????????????????? ???????????????? ???????? ?? ???????????????????? ????????, ???????????????????? ?????????????? ???????? ????????????." #: ../comps-f7.xml.in.h:75 #: ../comps-f8.xml.in.h:78 #: ../comps-f9.xml.in.h:79 #: ../comps-f10.xml.in.h:81 #: ../comps-el4.xml.in.h:29 #: ../comps-el5.xml.in.h:31 msgid "Install this group of packages to use the base graphical (X) user interface." msgstr "?????????? ?????????????????????????? ?????????????? ???????????????????? ???????????????? ?????????????? (??), ???????????? ???????????????????? ?????????????? ???????? ????????????." #: ../comps-f7.xml.in.h:76 #: ../comps-f8.xml.in.h:80 #: ../comps-f9.xml.in.h:81 #: ../comps-f10.xml.in.h:83 msgid "Inuktitut Support" msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f7.xml.in.h:77 #: ../comps-f8.xml.in.h:81 #: ../comps-f9.xml.in.h:82 #: ../comps-f10.xml.in.h:84 msgid "Irish Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:78 #: ../comps-f8.xml.in.h:82 #: ../comps-f9.xml.in.h:83 #: ../comps-f10.xml.in.h:85 msgid "Italian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:79 #: ../comps-f8.xml.in.h:83 #: ../comps-f9.xml.in.h:84 #: ../comps-f10.xml.in.h:86 #: ../comps-el4.xml.in.h:30 #: ../comps-el5.xml.in.h:32 msgid "Japanese Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:80 #: ../comps-f8.xml.in.h:84 #: ../comps-f9.xml.in.h:85 #: ../comps-f10.xml.in.h:87 #: ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" #: ../comps-f7.xml.in.h:81 #: ../comps-f8.xml.in.h:85 #: ../comps-f9.xml.in.h:86 #: ../comps-f10.xml.in.h:88 #: ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "???????????????????????????? Java" #: ../comps-f7.xml.in.h:82 #: ../comps-f8.xml.in.h:86 #: ../comps-f9.xml.in.h:87 #: ../comps-f10.xml.in.h:89 #: ../comps-el4.xml.in.h:33 #: ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" msgstr "KDE (???????????? ???????? ????????)" #: ../comps-f7.xml.in.h:83 #: ../comps-f8.xml.in.h:87 #: ../comps-f9.xml.in.h:88 #: ../comps-f10.xml.in.h:90 #: ../comps-el4.xml.in.h:34 #: ../comps-el5.xml.in.h:34 msgid "KDE Software Development" msgstr "???????????????????????????? ???????????????????? KDE" #: ../comps-f7.xml.in.h:84 #: ../comps-f8.xml.in.h:88 #: ../comps-f9.xml.in.h:89 #: ../comps-f10.xml.in.h:91 msgid "KDE is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." msgstr "KDE ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????." #: ../comps-f7.xml.in.h:85 #: ../comps-f8.xml.in.h:89 #: ../comps-f9.xml.in.h:90 #: ../comps-f10.xml.in.h:92 msgid "Kannada Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:86 #: ../comps-f8.xml.in.h:90 #: ../comps-f9.xml.in.h:92 #: ../comps-f10.xml.in.h:94 msgid "Khmer Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:87 #: ../comps-f8.xml.in.h:91 #: ../comps-f9.xml.in.h:93 #: ../comps-f10.xml.in.h:95 msgid "Korean Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:88 #: ../comps-f8.xml.in.h:92 #: ../comps-f9.xml.in.h:94 #: ../comps-f10.xml.in.h:96 msgid "Languages" msgstr "??????????????" #: ../comps-f7.xml.in.h:89 #: ../comps-f8.xml.in.h:93 #: ../comps-f9.xml.in.h:95 #: ../comps-f10.xml.in.h:97 msgid "Lao Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:90 #: ../comps-f8.xml.in.h:94 #: ../comps-f9.xml.in.h:96 #: ../comps-f10.xml.in.h:98 msgid "Latvian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:91 #: ../comps-f8.xml.in.h:96 #: ../comps-f9.xml.in.h:98 #: ../comps-f10.xml.in.h:100 msgid "Legacy Network Server" msgstr "???????????????????? ???????????????????? ??????????" #: ../comps-f7.xml.in.h:92 #: ../comps-f8.xml.in.h:97 #: ../comps-f9.xml.in.h:99 #: ../comps-f10.xml.in.h:101 msgid "Legacy Software Development" msgstr "???????????????????????????? ???????????????????? ??????????" #: ../comps-f7.xml.in.h:93 #: ../comps-f8.xml.in.h:98 #: ../comps-f9.xml.in.h:100 #: ../comps-f10.xml.in.h:102 msgid "Legacy Software Support" msgstr "???????????????????? ???????????????????? ??????????" #: ../comps-f7.xml.in.h:94 #: ../comps-f8.xml.in.h:99 #: ../comps-f9.xml.in.h:101 #: ../comps-f10.xml.in.h:103 msgid "Lithuanian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:95 #: ../comps-f8.xml.in.h:101 #: ../comps-f9.xml.in.h:104 #: ../comps-f10.xml.in.h:106 #: ../comps-el4.xml.in.h:36 #: ../comps-el5.xml.in.h:36 msgid "Mail Server" msgstr "???????????????????? ??????????" #: ../comps-f7.xml.in.h:96 #: ../comps-f8.xml.in.h:102 #: ../comps-f9.xml.in.h:105 #: ../comps-f10.xml.in.h:107 msgid "Malay Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:97 #: ../comps-f8.xml.in.h:103 #: ../comps-f9.xml.in.h:106 #: ../comps-f10.xml.in.h:108 msgid "Malayalam Support" msgstr "???????????????????? ???????????? ????????????????????" #: ../comps-f7.xml.in.h:98 #: ../comps-f8.xml.in.h:104 #: ../comps-f9.xml.in.h:107 #: ../comps-f10.xml.in.h:109 msgid "Maori Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:99 #: ../comps-f8.xml.in.h:105 #: ../comps-f9.xml.in.h:108 #: ../comps-f10.xml.in.h:110 msgid "Marathi Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:100 #: ../comps-f8.xml.in.h:107 #: ../comps-f9.xml.in.h:110 #: ../comps-f10.xml.in.h:112 msgid "MySQL Database" msgstr "?????????????????????? MySQL" #: ../comps-f7.xml.in.h:101 #: ../comps-f8.xml.in.h:109 #: ../comps-f9.xml.in.h:112 #: ../comps-f10.xml.in.h:114 #: ../comps-el4.xml.in.h:37 #: ../comps-el5.xml.in.h:37 msgid "Network Servers" msgstr "???????????????????????? ????????????????" #: ../comps-f7.xml.in.h:102 #: ../comps-f8.xml.in.h:110 #: ../comps-f9.xml.in.h:113 #: ../comps-f10.xml.in.h:115 #: ../comps-el4.xml.in.h:38 #: ../comps-el5.xml.in.h:38 msgid "News Server" msgstr "???????????????????? ??????????????" #: ../comps-f7.xml.in.h:103 #: ../comps-f8.xml.in.h:111 #: ../comps-f9.xml.in.h:115 #: ../comps-f10.xml.in.h:117 msgid "Northern Sotho Support" msgstr "???????????????????? ???????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:104 #: ../comps-f8.xml.in.h:112 #: ../comps-f9.xml.in.h:116 #: ../comps-f10.xml.in.h:118 msgid "Norwegian Support" msgstr "???????????????????? ???????????? ????????????????????" #: ../comps-f7.xml.in.h:105 #: ../comps-f8.xml.in.h:113 #: ../comps-f9.xml.in.h:117 #: ../comps-f10.xml.in.h:119 #: ../comps-el4.xml.in.h:39 #: ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "???????? ???? ??????????????" #: ../comps-f7.xml.in.h:106 #: ../comps-f8.xml.in.h:115 #: ../comps-f9.xml.in.h:119 #: ../comps-f10.xml.in.h:121 msgid "Oriya Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:107 #: ../comps-f8.xml.in.h:116 #: ../comps-f9.xml.in.h:120 #: ../comps-f10.xml.in.h:122 #: ../comps-el4.xml.in.h:40 #: ../comps-el5.xml.in.h:40 msgid "Packages which provide functionality for developing and building applications." msgstr "???????????????????? ?????????????????????????? ???? ?????????????????? ???????? ??????????????????" #: ../comps-f7.xml.in.h:108 #: ../comps-f8.xml.in.h:117 #: ../comps-f9.xml.in.h:121 #: ../comps-f10.xml.in.h:123 msgid "Persian Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:109 #: ../comps-f8.xml.in.h:118 #: ../comps-f9.xml.in.h:122 #: ../comps-f10.xml.in.h:124 msgid "Polish Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:110 #: ../comps-f8.xml.in.h:119 #: ../comps-f9.xml.in.h:123 #: ../comps-f10.xml.in.h:125 msgid "Portuguese Support" msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f7.xml.in.h:111 #: ../comps-f8.xml.in.h:120 #: ../comps-f9.xml.in.h:124 #: ../comps-f10.xml.in.h:126 msgid "PostgreSQL Database" msgstr "?????????????????????? PostgreSQL" #: ../comps-f7.xml.in.h:112 #: ../comps-f8.xml.in.h:121 #: ../comps-f9.xml.in.h:125 #: ../comps-f10.xml.in.h:127 msgid "Printing Support" msgstr "???????????????????? ???????????????? ????????" #: ../comps-f7.xml.in.h:113 #: ../comps-f8.xml.in.h:122 #: ../comps-f9.xml.in.h:126 #: ../comps-f10.xml.in.h:128 msgid "Punjabi Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:114 #: ../comps-f8.xml.in.h:123 #: ../comps-f9.xml.in.h:127 #: ../comps-f10.xml.in.h:129 msgid "Romanian Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:115 #: ../comps-f8.xml.in.h:124 #: ../comps-f9.xml.in.h:128 #: ../comps-f10.xml.in.h:130 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 #: ../comps-f8.xml.in.h:125 #: ../comps-f9.xml.in.h:129 #: ../comps-f10.xml.in.h:131 msgid "Russian Support" msgstr "???????????????????? ???????????? ????????" #: ../comps-f7.xml.in.h:117 #: ../comps-f8.xml.in.h:126 #: ../comps-f9.xml.in.h:132 #: ../comps-f10.xml.in.h:134 msgid "Samoan Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:118 #: ../comps-f8.xml.in.h:127 #: ../comps-f9.xml.in.h:133 #: ../comps-f10.xml.in.h:135 msgid "Serbian Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:119 #: ../comps-f8.xml.in.h:128 #: ../comps-f9.xml.in.h:134 #: ../comps-f10.xml.in.h:136 msgid "Server Configuration Tools" msgstr "???????????????????? ????????????????" #: ../comps-f7.xml.in.h:120 #: ../comps-f8.xml.in.h:129 #: ../comps-f9.xml.in.h:135 #: ../comps-f10.xml.in.h:137 #: ../comps-el4.xml.in.h:41 #: ../comps-el5.xml.in.h:41 msgid "Servers" msgstr "??????????????????????" #: ../comps-f7.xml.in.h:121 #: ../comps-f8.xml.in.h:130 #: ../comps-f9.xml.in.h:136 #: ../comps-f10.xml.in.h:138 #: ../comps-el4.xml.in.h:42 #: ../comps-el5.xml.in.h:42 msgid "Simple window managers that aren't part of a larger desktop environment." msgstr "???????????? ?????????????????? ???????????? ???????? ?????????? ??????????????????." #: ../comps-f7.xml.in.h:122 #: ../comps-f8.xml.in.h:131 #: ../comps-f9.xml.in.h:137 #: ../comps-f10.xml.in.h:139 msgid "Sinhala Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:123 #: ../comps-f8.xml.in.h:132 #: ../comps-f9.xml.in.h:138 #: ../comps-f10.xml.in.h:140 msgid "Slovak Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:124 #: ../comps-f8.xml.in.h:133 #: ../comps-f9.xml.in.h:139 #: ../comps-f10.xml.in.h:141 msgid "Slovenian Support" msgstr "???????????????????? ???????????? ????????????????????" #: ../comps-f7.xml.in.h:125 #: ../comps-f8.xml.in.h:134 #: ../comps-f9.xml.in.h:140 #: ../comps-f10.xml.in.h:142 msgid "Smallest possible installation" msgstr "?????????????????? ????????" #: ../comps-f7.xml.in.h:126 #: ../comps-f8.xml.in.h:135 #: ../comps-f9.xml.in.h:141 #: ../comps-f10.xml.in.h:143 #: ../comps-el4.xml.in.h:43 #: ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "???????????????????? ?????????????????????????? ???? ???????????????????????? ????????????????" #: ../comps-f7.xml.in.h:127 #: ../comps-f8.xml.in.h:136 #: ../comps-f9.xml.in.h:142 #: ../comps-f10.xml.in.h:144 msgid "Somali Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:128 #: ../comps-f8.xml.in.h:137 #: ../comps-f9.xml.in.h:143 #: ../comps-f10.xml.in.h:145 msgid "Sometimes called text editors, these are programs that allow you to create and edit text files. This includes Emacs and Vi." msgstr "" #: ../comps-f7.xml.in.h:129 #: ../comps-f8.xml.in.h:138 #: ../comps-f9.xml.in.h:144 #: ../comps-f10.xml.in.h:146 #: ../comps-el4.xml.in.h:45 #: ../comps-el5.xml.in.h:45 msgid "Sound and Video" msgstr "???????? ???? ??????????" #: ../comps-f7.xml.in.h:130 #: ../comps-f8.xml.in.h:139 #: ../comps-f9.xml.in.h:145 #: ../comps-f10.xml.in.h:147 msgid "Southern Ndebele Support" msgstr "" #: ../comps-f7.xml.in.h:131 #: ../comps-f8.xml.in.h:140 #: ../comps-f9.xml.in.h:146 #: ../comps-f10.xml.in.h:148 msgid "Southern Sotho Support" msgstr "" #: ../comps-f7.xml.in.h:132 #: ../comps-f8.xml.in.h:141 #: ../comps-f9.xml.in.h:147 #: ../comps-f10.xml.in.h:149 msgid "Spanish Support" msgstr "" #: ../comps-f7.xml.in.h:133 #: ../comps-f8.xml.in.h:142 #: ../comps-f9.xml.in.h:148 #: ../comps-f10.xml.in.h:150 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "" #: ../comps-f7.xml.in.h:134 #: ../comps-f8.xml.in.h:143 #: ../comps-f9.xml.in.h:149 #: ../comps-f10.xml.in.h:151 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "" #: ../comps-f7.xml.in.h:135 #: ../comps-f8.xml.in.h:144 #: ../comps-f9.xml.in.h:150 #: ../comps-f10.xml.in.h:152 msgid "Swati Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:136 #: ../comps-f8.xml.in.h:145 #: ../comps-f9.xml.in.h:151 #: ../comps-f10.xml.in.h:153 msgid "Swedish Support" msgstr "" #: ../comps-f7.xml.in.h:137 #: ../comps-f8.xml.in.h:146 #: ../comps-f9.xml.in.h:152 #: ../comps-f10.xml.in.h:154 #: ../comps-el4.xml.in.h:48 #: ../comps-el5.xml.in.h:46 msgid "System Tools" msgstr "" #: ../comps-f7.xml.in.h:138 #: ../comps-f8.xml.in.h:147 #: ../comps-f9.xml.in.h:153 #: ../comps-f10.xml.in.h:155 msgid "Tagalog Support" msgstr "" #: ../comps-f7.xml.in.h:139 #: ../comps-f8.xml.in.h:148 #: ../comps-f9.xml.in.h:154 #: ../comps-f10.xml.in.h:156 msgid "Tamil Support" msgstr "" #: ../comps-f7.xml.in.h:140 #: ../comps-f8.xml.in.h:149 #: ../comps-f9.xml.in.h:155 #: ../comps-f10.xml.in.h:157 msgid "Telugu Support" msgstr "" #: ../comps-f7.xml.in.h:141 #: ../comps-f8.xml.in.h:150 #: ../comps-f9.xml.in.h:156 #: ../comps-f10.xml.in.h:158 #: ../comps-el4.xml.in.h:49 #: ../comps-el5.xml.in.h:47 msgid "Text-based Internet" msgstr "" #: ../comps-f7.xml.in.h:142 #: ../comps-f8.xml.in.h:151 #: ../comps-f9.xml.in.h:157 #: ../comps-f10.xml.in.h:159 msgid "Thai Support" msgstr "" #: ../comps-f7.xml.in.h:143 msgid "The Eclipse Integrated Development Environment." msgstr "" #: ../comps-f7.xml.in.h:144 #: ../comps-f8.xml.in.h:152 #: ../comps-f9.xml.in.h:158 #: ../comps-f10.xml.in.h:160 #: ../comps-el4.xml.in.h:51 #: ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "" #: ../comps-f7.xml.in.h:145 #: ../comps-f8.xml.in.h:153 #: ../comps-f9.xml.in.h:159 #: ../comps-f10.xml.in.h:161 msgid "The packages in this group are core libraries needed to develop applications." msgstr "" #: ../comps-f7.xml.in.h:146 #: ../comps-f8.xml.in.h:154 #: ../comps-f9.xml.in.h:160 #: ../comps-f10.xml.in.h:162 #: ../comps-el4.xml.in.h:52 #: ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." msgstr "" #: ../comps-f7.xml.in.h:147 #: ../comps-f8.xml.in.h:155 #: ../comps-f9.xml.in.h:161 #: ../comps-f10.xml.in.h:163 msgid "These packages allow you to develop applications for the X Window System." msgstr "" #: ../comps-f7.xml.in.h:148 #: ../comps-f8.xml.in.h:156 #: ../comps-f9.xml.in.h:162 #: ../comps-f10.xml.in.h:164 #: ../comps-el4.xml.in.h:53 #: ../comps-el5.xml.in.h:51 msgid "These packages are helpful when developing web applications or web pages." msgstr "" #: ../comps-f7.xml.in.h:149 #: ../comps-f8.xml.in.h:157 #: ../comps-f9.xml.in.h:163 #: ../comps-f10.xml.in.h:165 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "" #: ../comps-f7.xml.in.h:150 #: ../comps-f8.xml.in.h:158 #: ../comps-f9.xml.in.h:164 #: ../comps-f10.xml.in.h:166 msgid "These packages include servers for old network protocols such as rsh and telnet." msgstr "" #: ../comps-f7.xml.in.h:151 #: ../comps-f8.xml.in.h:159 #: ../comps-f9.xml.in.h:165 #: ../comps-f10.xml.in.h:167 msgid "These packages provide a virtualization environment." msgstr "" #: ../comps-f7.xml.in.h:152 #: ../comps-f8.xml.in.h:160 #: ../comps-f9.xml.in.h:166 #: ../comps-f10.xml.in.h:168 msgid "These packages provide compatibility with previous releases." msgstr "" #: ../comps-f7.xml.in.h:153 #: ../comps-f8.xml.in.h:161 #: ../comps-f9.xml.in.h:167 #: ../comps-f10.xml.in.h:169 msgid "These packages provide support for various locales including fonts and input methods." msgstr "" #: ../comps-f7.xml.in.h:154 #: ../comps-f8.xml.in.h:162 #: ../comps-f9.xml.in.h:168 #: ../comps-f10.xml.in.h:170 msgid "These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text." msgstr "" #: ../comps-f7.xml.in.h:155 #: ../comps-f8.xml.in.h:163 #: ../comps-f9.xml.in.h:169 #: ../comps-f10.xml.in.h:171 #: ../comps-el4.xml.in.h:55 #: ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." msgstr "" #: ../comps-f7.xml.in.h:156 #: ../comps-f8.xml.in.h:164 #: ../comps-f9.xml.in.h:170 #: ../comps-f10.xml.in.h:172 #: ../comps-el4.xml.in.h:56 #: ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." msgstr "" #: ../comps-f7.xml.in.h:157 #: ../comps-f8.xml.in.h:165 #: ../comps-f9.xml.in.h:171 #: ../comps-f10.xml.in.h:173 #: ../comps-el4.xml.in.h:57 #: ../comps-el5.xml.in.h:55 msgid "These tools include core development tools such as automake, gcc, perl, python, and debuggers." msgstr "" #: ../comps-f7.xml.in.h:158 #: ../comps-f8.xml.in.h:166 #: ../comps-f9.xml.in.h:172 #: ../comps-f10.xml.in.h:174 #: ../comps-el4.xml.in.h:58 #: ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." msgstr "" #: ../comps-f7.xml.in.h:159 #: ../comps-f8.xml.in.h:167 #: ../comps-f9.xml.in.h:173 #: ../comps-f10.xml.in.h:175 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" #: ../comps-f7.xml.in.h:160 #: ../comps-f8.xml.in.h:168 #: ../comps-f9.xml.in.h:174 #: ../comps-f10.xml.in.h:176 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example." msgstr "" #: ../comps-f7.xml.in.h:161 #: ../comps-f8.xml.in.h:169 #: ../comps-f9.xml.in.h:175 #: ../comps-f10.xml.in.h:177 #: ../comps-el4.xml.in.h:59 #: ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "" #: ../comps-f7.xml.in.h:162 #: ../comps-f8.xml.in.h:170 #: ../comps-f9.xml.in.h:176 #: ../comps-f10.xml.in.h:178 #: ../comps-el4.xml.in.h:60 #: ../comps-el5.xml.in.h:58 msgid "This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion." msgstr "" #: ../comps-f7.xml.in.h:163 #: ../comps-f8.xml.in.h:171 #: ../comps-f9.xml.in.h:177 #: ../comps-f10.xml.in.h:179 #: ../comps-el4.xml.in.h:61 #: ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." msgstr "" #: ../comps-f7.xml.in.h:164 #: ../comps-f8.xml.in.h:172 #: ../comps-f9.xml.in.h:178 #: ../comps-f10.xml.in.h:180 #: ../comps-el4.xml.in.h:62 #: ../comps-el5.xml.in.h:60 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System." msgstr "" #: ../comps-f7.xml.in.h:165 #: ../comps-f8.xml.in.h:173 #: ../comps-f9.xml.in.h:179 #: ../comps-f10.xml.in.h:181 #: ../comps-el4.xml.in.h:63 #: ../comps-el5.xml.in.h:61 msgid "This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware." msgstr "" #: ../comps-f7.xml.in.h:166 #: ../comps-f8.xml.in.h:174 #: ../comps-f9.xml.in.h:180 #: ../comps-f10.xml.in.h:182 #: ../comps-el4.xml.in.h:66 #: ../comps-el5.xml.in.h:64 msgid "This group is a collection of tools and resources of Armenian environments." msgstr "" #: ../comps-f7.xml.in.h:167 #: ../comps-f8.xml.in.h:175 #: ../comps-f9.xml.in.h:181 #: ../comps-f10.xml.in.h:183 #: ../comps-el4.xml.in.h:69 #: ../comps-el5.xml.in.h:68 msgid "This group is a collection of tools for various hardware specific utilities." msgstr "" #: ../comps-f7.xml.in.h:168 #: ../comps-f8.xml.in.h:176 #: ../comps-f9.xml.in.h:182 #: ../comps-f10.xml.in.h:184 #: ../comps-el4.xml.in.h:70 #: ../comps-el5.xml.in.h:69 msgid "This group is a collection of various tools for the system, such as the client for connecting to SMB shares and tools to monitor network traffic." msgstr "" #: ../comps-f7.xml.in.h:169 #: ../comps-f8.xml.in.h:177 #: ../comps-f9.xml.in.h:183 #: ../comps-f10.xml.in.h:185 msgid "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" #: ../comps-f7.xml.in.h:170 #: ../comps-f8.xml.in.h:178 #: ../comps-f9.xml.in.h:184 #: ../comps-f10.xml.in.h:186 msgid "This package group allows you to share files between Linux and MS Windows(tm) systems." msgstr "" #: ../comps-f7.xml.in.h:171 #: ../comps-f8.xml.in.h:179 #: ../comps-f9.xml.in.h:185 #: ../comps-f10.xml.in.h:187 msgid "This package group contains packages useful for use with MySQL." msgstr "" #: ../comps-f7.xml.in.h:172 #: ../comps-f8.xml.in.h:180 #: ../comps-f9.xml.in.h:186 #: ../comps-f10.xml.in.h:188 msgid "This package group includes packages useful for use with Postgresql." msgstr "" #: ../comps-f7.xml.in.h:173 #: ../comps-f8.xml.in.h:181 #: ../comps-f9.xml.in.h:187 #: ../comps-f10.xml.in.h:189 msgid "Tibetan Support" msgstr "" #: ../comps-f7.xml.in.h:174 #: ../comps-f8.xml.in.h:182 #: ../comps-f9.xml.in.h:188 #: ../comps-f10.xml.in.h:190 msgid "Tonga Support" msgstr "" #: ../comps-f7.xml.in.h:175 #: ../comps-f8.xml.in.h:183 #: ../comps-f9.xml.in.h:189 #: ../comps-f10.xml.in.h:191 #: ../comps-el4.xml.in.h:71 #: ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" msgstr "" #: ../comps-f7.xml.in.h:176 #: ../comps-f8.xml.in.h:184 #: ../comps-f9.xml.in.h:190 #: ../comps-f10.xml.in.h:192 msgid "Tsonga Support" msgstr "" #: ../comps-f7.xml.in.h:177 #: ../comps-f8.xml.in.h:185 #: ../comps-f9.xml.in.h:191 #: ../comps-f10.xml.in.h:193 msgid "Tswana Support" msgstr "" #: ../comps-f7.xml.in.h:178 #: ../comps-f8.xml.in.h:186 #: ../comps-f9.xml.in.h:192 #: ../comps-f10.xml.in.h:194 msgid "Turkish Support" msgstr "" #: ../comps-f7.xml.in.h:179 #: ../comps-f8.xml.in.h:187 #: ../comps-f9.xml.in.h:193 #: ../comps-f10.xml.in.h:195 msgid "Ukrainian Support" msgstr "" #: ../comps-f7.xml.in.h:180 #: ../comps-f8.xml.in.h:188 #: ../comps-f9.xml.in.h:194 #: ../comps-f10.xml.in.h:196 msgid "Urdu Support" msgstr "" #: ../comps-f7.xml.in.h:181 #: ../comps-f8.xml.in.h:189 #: ../comps-f9.xml.in.h:195 #: ../comps-f10.xml.in.h:197 #: ../comps-el4.xml.in.h:72 #: ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." msgstr "" #: ../comps-f7.xml.in.h:182 #: ../comps-f8.xml.in.h:190 #: ../comps-f9.xml.in.h:196 #: ../comps-f10.xml.in.h:198 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "" #: ../comps-f7.xml.in.h:183 #: ../comps-f8.xml.in.h:191 #: ../comps-f9.xml.in.h:197 #: ../comps-f10.xml.in.h:199 msgid "Venda Support" msgstr "" #: ../comps-f7.xml.in.h:184 #: ../comps-f8.xml.in.h:192 #: ../comps-f9.xml.in.h:198 #: ../comps-f10.xml.in.h:200 msgid "Vietnamese Support" msgstr "" #: ../comps-f7.xml.in.h:185 #: ../comps-f8.xml.in.h:193 #: ../comps-f9.xml.in.h:199 #: ../comps-f10.xml.in.h:201 msgid "Virtualization" msgstr "" #: ../comps-f7.xml.in.h:186 #: ../comps-f8.xml.in.h:194 #: ../comps-f9.xml.in.h:201 #: ../comps-f10.xml.in.h:203 #: ../comps-el4.xml.in.h:73 #: ../comps-el5.xml.in.h:73 msgid "Web Development" msgstr "" #: ../comps-f7.xml.in.h:187 #: ../comps-f8.xml.in.h:195 #: ../comps-f9.xml.in.h:202 #: ../comps-f10.xml.in.h:204 #: ../comps-el4.xml.in.h:74 #: ../comps-el5.xml.in.h:74 msgid "Web Server" msgstr "" #: ../comps-f7.xml.in.h:188 #: ../comps-f8.xml.in.h:196 #: ../comps-f9.xml.in.h:203 #: ../comps-f10.xml.in.h:205 msgid "Welsh Support" msgstr "" #: ../comps-f7.xml.in.h:189 #: ../comps-f8.xml.in.h:197 #: ../comps-f9.xml.in.h:204 #: ../comps-f10.xml.in.h:206 #: ../comps-el4.xml.in.h:75 #: ../comps-el5.xml.in.h:75 msgid "Window Managers" msgstr "" #: ../comps-f7.xml.in.h:190 #: ../comps-f8.xml.in.h:198 #: ../comps-f9.xml.in.h:205 #: ../comps-f10.xml.in.h:207 msgid "Windows File Server" msgstr "" #: ../comps-f7.xml.in.h:191 #: ../comps-f8.xml.in.h:199 #: ../comps-f9.xml.in.h:206 #: ../comps-f10.xml.in.h:208 msgid "X Software Development" msgstr "" #: ../comps-f7.xml.in.h:192 #: ../comps-f8.xml.in.h:200 #: ../comps-f9.xml.in.h:207 #: ../comps-f10.xml.in.h:209 #: ../comps-el4.xml.in.h:76 #: ../comps-el5.xml.in.h:76 msgid "X Window System" msgstr "" #: ../comps-f7.xml.in.h:193 #: ../comps-f8.xml.in.h:201 #: ../comps-f9.xml.in.h:208 #: ../comps-f10.xml.in.h:210 msgid "XFCE" msgstr "" #: ../comps-f7.xml.in.h:194 #: ../comps-f8.xml.in.h:202 #: ../comps-f9.xml.in.h:209 #: ../comps-f10.xml.in.h:211 msgid "XFCE Software Development" msgstr "" #: ../comps-f7.xml.in.h:195 #: ../comps-f8.xml.in.h:203 #: ../comps-f9.xml.in.h:210 #: ../comps-f10.xml.in.h:212 msgid "Xhosa Support" msgstr "" #: ../comps-f7.xml.in.h:196 #: ../comps-f8.xml.in.h:204 #: ../comps-f9.xml.in.h:211 #: ../comps-f10.xml.in.h:213 msgid "Zulu Support" msgstr "" #: ../comps-f8.xml.in.h:21 #: ../comps-f9.xml.in.h:21 #: ../comps-f10.xml.in.h:21 msgid "Buildsystem building group" msgstr "" #: ../comps-f8.xml.in.h:48 #: ../comps-f9.xml.in.h:49 #: ../comps-f10.xml.in.h:49 msgid "Fedora Eclipse" msgstr "" #: ../comps-f8.xml.in.h:52 #: ../comps-f9.xml.in.h:53 #: ../comps-f10.xml.in.h:53 msgid "Fonts" msgstr "" #: ../comps-f8.xml.in.h:53 #: ../comps-f9.xml.in.h:54 #: ../comps-f10.xml.in.h:54 msgid "Fonts packages for rendering text on the desktop." msgstr "" #: ../comps-f8.xml.in.h:79 #: ../comps-f9.xml.in.h:80 #: ../comps-f10.xml.in.h:82 msgid "Integrated Development Environments based on Eclipse." msgstr "" #: ../comps-f8.xml.in.h:95 #: ../comps-f9.xml.in.h:97 #: ../comps-f10.xml.in.h:99 msgid "Legacy Fonts" msgstr "" #: ../comps-f8.xml.in.h:100 #: ../comps-f9.xml.in.h:102 #: ../comps-f10.xml.in.h:104 msgid "Low Saxon Support" msgstr "" #: ../comps-f8.xml.in.h:106 #: ../comps-f9.xml.in.h:109 #: ../comps-f10.xml.in.h:111 msgid "Mongolian Support" msgstr "" #: ../comps-f8.xml.in.h:108 #: ../comps-f9.xml.in.h:111 #: ../comps-f10.xml.in.h:113 msgid "Nepali Support" msgstr "" #: ../comps-f8.xml.in.h:114 #: ../comps-f9.xml.in.h:118 #: ../comps-f10.xml.in.h:120 msgid "Older bitmap and vector fonts packages" msgstr "" #: ../comps-f9.xml.in.h:44 #: ../comps-f10.xml.in.h:44 msgid "Esperanto Support" msgstr "" #: ../comps-f9.xml.in.h:91 #: ../comps-f10.xml.in.h:93 msgid "Kashubian Support" msgstr "" #: ../comps-f9.xml.in.h:103 #: ../comps-f10.xml.in.h:105 msgid "Macedonian Support" msgstr "" #: ../comps-f9.xml.in.h:114 #: ../comps-f10.xml.in.h:116 msgid "Northern Sami Support" msgstr "" #: ../comps-f9.xml.in.h:130 #: ../comps-f10.xml.in.h:132 msgid "SUGAR Desktop Environment" msgstr "" #: ../comps-f9.xml.in.h:131 #: ../comps-f10.xml.in.h:133 msgid "SUGAR is the desktop environment developed for the OLPC XO." msgstr "" #: ../comps-f9.xml.in.h:200 #: ../comps-f10.xml.in.h:202 msgid "Walloon Support" msgstr "" #: ../comps-f10.xml.in.h:75 msgid "Input Methods" msgstr "" #: ../comps-f10.xml.in.h:76 msgid "Input method packages for the input of international text." msgstr "" #: ../comps-el4.xml.in.h:3 #: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "" #: ../comps-el4.xml.in.h:12 #: ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" msgstr "" #: ../comps-el4.xml.in.h:22 #: ../comps-el5.xml.in.h:23 msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." msgstr "" #: ../comps-el4.xml.in.h:35 #: ../comps-el5.xml.in.h:35 msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." msgstr "" #: ../comps-el4.xml.in.h:44 #: ../comps-el5.xml.in.h:44 msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." msgstr "" #: ../comps-el4.xml.in.h:50 #: ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." msgstr "" #: ../comps-el4.xml.in.h:54 #: ../comps-el5.xml.in.h:52 msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." msgstr "" #: ../comps-el4.xml.in.h:64 #: ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" msgstr "" #: ../comps-el4.xml.in.h:65 #: ../comps-el5.xml.in.h:63 msgid "This group is a collection of tools and resources of Arabic environments." msgstr "" #: ../comps-el4.xml.in.h:67 #: ../comps-el5.xml.in.h:66 msgid "This group is a collection of tools and resources of Hebrew environments." msgstr "" #: ../comps-el4.xml.in.h:68 #: ../comps-el5.xml.in.h:67 msgid "This group is a collection of tools and resources of Japanese environments." msgstr "" #: ../comps-el4.xml.in.h:77 #: ../comps-el5.xml.in.h:77 msgid "XEmacs" msgstr "" #: ../comps-el5.xml.in.h:65 msgid "This group is a collection of tools and resources of Czech environments." msgstr "" From fedora-extras-commits at redhat.com Thu Jul 17 07:28:20 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Thu, 17 Jul 2008 07:28:20 GMT Subject: rpms/scim/devel scim-1.4.5-no-rpath-libdir.patch,1.1,1.2 Message-ID: <200807170728.m6H7SKAc016288@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15769 Modified Files: scim-1.4.5-no-rpath-libdir.patch Log Message: recreate scim-1.4.5-no-rpath-libdir.patch to resolve fuzzy problem. scim-1.4.5-no-rpath-libdir.patch: Index: scim-1.4.5-no-rpath-libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim-1.4.5-no-rpath-libdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-1.4.5-no-rpath-libdir.patch 9 Mar 2007 03:19:55 -0000 1.1 +++ scim-1.4.5-no-rpath-libdir.patch 17 Jul 2008 07:27:23 -0000 1.2 @@ -1,26 +1,28 @@ ---- scim-1.4.5/src/Makefile.am~ 2007-02-12 17:34:48.000000000 +1000 -+++ scim-1.4.5/src/Makefile.am 2007-03-09 13:01:46.000000000 +1000 -@@ -130,7 +130,6 @@ +diff -up scim-1.4.7/src/Makefile.am.17-rpath~ scim-1.4.7/src/Makefile.am +--- scim-1.4.7/src/Makefile.am.17-rpath~ 2007-06-26 22:31:38.000000000 +0800 ++++ scim-1.4.7/src/Makefile.am 2008-07-17 14:56:54.000000000 +0800 +@@ -130,7 +130,6 @@ libscim at SCIM_EPOCH@_la_SOURCES = scim_ba - libscim_1_0_la_LDFLAGS = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \ + libscim at SCIM_EPOCH@_la_LDFLAGS= -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \ -export-dynamic \ - -rpath $(libdir) \ $(LD_VERSION_SCRIPT_OPTION) \ @LIBTOOL_EXPORT_OPTIONS@ \ @LIBICONV@ \ ---- scim-1.4.5/utils/Makefile.am~ 2005-07-10 23:45:40.000000000 +1000 -+++ scim-1.4.5/utils/Makefile.am 2007-03-09 13:01:44.000000000 +1000 -@@ -53,7 +53,6 @@ +diff -up scim-1.4.7/utils/Makefile.am.17-rpath~ scim-1.4.7/utils/Makefile.am +--- scim-1.4.7/utils/Makefile.am.17-rpath~ 2007-06-26 22:31:56.000000000 +0800 ++++ scim-1.4.7/utils/Makefile.am 2008-07-17 14:56:54.000000000 +0800 +@@ -53,7 +53,6 @@ libscim_gtkutils at SCIM_EPOCH@_la_CXXFLAGS - libscim_gtkutils_1_0_la_LDFLAGS = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \ + libscim_gtkutils at SCIM_EPOCH@_la_LDFLAGS= -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \ -export-dynamic \ - -rpath $(libdir) \ @LIBTOOL_EXPORT_OPTIONS@ \ @LTLIBINTL@ \ @GTK2_LIBS@ -@@ -68,7 +67,6 @@ +@@ -68,7 +67,6 @@ libscim_x11utils at SCIM_EPOCH@_la_CXXFLAGS - libscim_x11utils_1_0_la_LDFLAGS = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \ + libscim_x11utils at SCIM_EPOCH@_la_LDFLAGS= -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \ -export-dynamic \ - -rpath $(libdir) \ @LIBTOOL_EXPORT_OPTIONS@ \ From fedora-extras-commits at redhat.com Thu Jul 17 07:38:57 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 17 Jul 2008 07:38:57 GMT Subject: rpms/alsa-tools/F-8 alsa-tools.spec,1.18,1.19 sources,1.9,1.10 Message-ID: <200807170738.m6H7cv9E018884@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/alsa-tools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18661 Modified Files: alsa-tools.spec sources Log Message: Update to 1.0.16 Index: alsa-tools.spec =================================================================== RCS file: /cvs/extras/rpms/alsa-tools/F-8/alsa-tools.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- alsa-tools.spec 19 May 2008 21:32:03 -0000 1.18 +++ alsa-tools.spec 17 Jul 2008 07:38:07 -0000 1.19 @@ -22,8 +22,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.15 -Release: 5%{?dist} +Version: 1.0.16 +Release: 1%{?dist} # Checked at least one source file from all the sub-projects contained in # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 @@ -205,6 +205,9 @@ %endif %changelog +* Mon Jul 14 2008 Tim Jackson - 1.0.16-1 +- Update to version 1.0.16 + * Mon May 19 2008 Tim Jackson - 1.0.15-5 - Make it build cleanly on ppc and ppc64 by excluding sb16_csp Index: sources =================================================================== RCS file: /cvs/extras/rpms/alsa-tools/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 5 Jan 2008 11:59:01 -0000 1.9 +++ sources 17 Jul 2008 07:38:07 -0000 1.10 @@ -1,5 +1,5 @@ +be1974e6953b07a8c03c0627e52a3399 alsa-tools-1.0.16-pruned.tar.bz2 57af85a810ed770885aec2a5b35648e6 echomixer.desktop 38db1b88c44adb5591f87173061d7d98 echomixer.png 4c10f8d250a86bdb3ea138488aec8fc4 envy24control.desktop 3a1a195f2b9641f68651e3d312e5476f envy24control.png -2ab2677de89c5fd0e769b212f206101a alsa-tools-1.0.15-pruned.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 07:42:32 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 17 Jul 2008 07:42:32 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1581,1.1582 Message-ID: <200807170742.m6H7gWhQ019757@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19495 Modified Files: openoffice.org.spec Log Message: rats Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1581 retrieving revision 1.1582 diff -u -r1.1581 -r1.1582 --- openoffice.org.spec 16 Jul 2008 13:50:16 -0000 1.1581 +++ openoffice.org.spec 17 Jul 2008 07:41:39 -0000 1.1582 @@ -1504,17 +1504,6 @@ cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include #configure sdk -pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk/linux/lib -ln -s ../../../ure/lib/libuno_cppu.so.3 libuno_cppu.so -ln -s ../../../ure/lib/libuno_cppuhelpergcc3.so.3 libuno_cppuhelpergcc3.so -ln -s ../../../ure/lib/libuno_sal.so.3 libuno_sal.so -ln -s ../../../ure/lib/libuno_salhelpergcc3.so.3 libuno_salhelpergcc3.so - -if [ -r ../../../ure/lib/libstlport_gcc.so ]; then - ln -s ../../../ure/lib/libstlport_gcc.so libstlport_gcc.so -fi -popd - pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do sed -e "s, at OO_SDK_NAME@,sdk," \ From fedora-extras-commits at redhat.com Thu Jul 17 08:04:36 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 08:04:36 GMT Subject: rpms/pcmanfm/F-9 pcmanfm-0.5-kill-find-immediately.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 pcmanfm.spec, 1.21, 1.22 sources, 1.18, 1.19 Message-ID: <200807170804.m6H84arr031449@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31164/F-9 Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.5-kill-find-immediately.patch Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 0.5-1 - 0.5 pcmanfm-0.5-kill-find-immediately.patch: --- NEW FILE pcmanfm-0.5-kill-find-immediately.patch --- diff -urp pcmanfm-0.5/src/find-files.c pcmanfm-0.5-debug/src/find-files.c --- pcmanfm-0.5/src/find-files.c 2008-07-16 20:00:54.000000000 +0900 +++ pcmanfm-0.5-debug/src/find-files.c 2008-07-17 16:33:43.000000000 +0900 @@ -635,7 +635,11 @@ static void on_stop_search( GtkWidget* b { if( data->task && ! vfs_async_task_is_finished( data->task ) ) { +#if 0 vfs_async_task_cancel( data->task ); +#else + finish_search(data); +#endif } } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 15 Jul 2008 18:04:02 -0000 1.18 +++ .cvsignore 17 Jul 2008 08:03:50 -0000 1.19 @@ -1 +1 @@ -pcmanfm-0.4.6.2.tar.gz +pcmanfm-0.5.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/pcmanfm.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pcmanfm.spec 15 Jul 2008 18:04:02 -0000 1.21 +++ pcmanfm.spec 17 Jul 2008 08:03:50 -0000 1.22 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6.2 +Version: 0.5 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,6 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz +Patch0: pcmanfm-0.5-kill-find-immediately.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .search_hang # permission fix %{__chmod} 0644 \ @@ -60,7 +62,7 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category 'Application' \ --vendor 'fedora' \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}*.desktop %find_lang %{name} @@ -90,10 +92,13 @@ %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-%{name}*.desktop %{_datadir}/mime/packages/*.xml %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 0.5-1 +- 0.5 + * Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 - 0.4.6.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 15 Jul 2008 18:04:02 -0000 1.18 +++ sources 17 Jul 2008 08:03:50 -0000 1.19 @@ -1 +1 @@ -35c314e29e4c93b80fe8230ca1a832dc pcmanfm-0.4.6.2.tar.gz +fe1a836eed6a42107e7d71a01a52f7ec pcmanfm-0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 08:04:50 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 08:04:50 GMT Subject: rpms/pcmanfm/F-8 pcmanfm-0.5-kill-find-immediately.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 pcmanfm.spec, 1.21, 1.22 sources, 1.18, 1.19 Message-ID: <200807170804.m6H84oDa031517@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31164/F-8 Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.5-kill-find-immediately.patch Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 0.5-1 - 0.5 pcmanfm-0.5-kill-find-immediately.patch: --- NEW FILE pcmanfm-0.5-kill-find-immediately.patch --- diff -urp pcmanfm-0.5/src/find-files.c pcmanfm-0.5-debug/src/find-files.c --- pcmanfm-0.5/src/find-files.c 2008-07-16 20:00:54.000000000 +0900 +++ pcmanfm-0.5-debug/src/find-files.c 2008-07-17 16:33:43.000000000 +0900 @@ -635,7 +635,11 @@ static void on_stop_search( GtkWidget* b { if( data->task && ! vfs_async_task_is_finished( data->task ) ) { +#if 0 vfs_async_task_cancel( data->task ); +#else + finish_search(data); +#endif } } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 15 Jul 2008 18:03:39 -0000 1.18 +++ .cvsignore 17 Jul 2008 08:03:35 -0000 1.19 @@ -1 +1 @@ -pcmanfm-0.4.6.2.tar.gz +pcmanfm-0.5.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/pcmanfm.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pcmanfm.spec 15 Jul 2008 18:03:39 -0000 1.21 +++ pcmanfm.spec 17 Jul 2008 08:03:35 -0000 1.22 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6.2 +Version: 0.5 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,6 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz +Patch0: pcmanfm-0.5-kill-find-immediately.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .search_hang # permission fix %{__chmod} 0644 \ @@ -60,7 +62,7 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category 'Application' \ --vendor 'fedora' \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}*.desktop %find_lang %{name} @@ -90,10 +92,13 @@ %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-%{name}*.desktop %{_datadir}/mime/packages/*.xml %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 0.5-1 +- 0.5 + * Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 - 0.4.6.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 15 Jul 2008 18:03:39 -0000 1.18 +++ sources 17 Jul 2008 08:03:35 -0000 1.19 @@ -1 +1 @@ -35c314e29e4c93b80fe8230ca1a832dc pcmanfm-0.4.6.2.tar.gz +fe1a836eed6a42107e7d71a01a52f7ec pcmanfm-0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 08:04:53 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 17 Jul 2008 08:04:53 GMT Subject: rpms/pcmanfm/devel pcmanfm-0.5-kill-find-immediately.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 pcmanfm.spec, 1.21, 1.22 sources, 1.18, 1.19 Message-ID: <200807170804.m6H84rPh031532@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31164/devel Modified Files: .cvsignore pcmanfm.spec sources Added Files: pcmanfm-0.5-kill-find-immediately.patch Log Message: * Thu Jul 17 2008 Mamoru Tasaka - 0.5-1 - 0.5 pcmanfm-0.5-kill-find-immediately.patch: --- NEW FILE pcmanfm-0.5-kill-find-immediately.patch --- diff -urp pcmanfm-0.5/src/find-files.c pcmanfm-0.5-debug/src/find-files.c --- pcmanfm-0.5/src/find-files.c 2008-07-16 20:00:54.000000000 +0900 +++ pcmanfm-0.5-debug/src/find-files.c 2008-07-17 16:33:43.000000000 +0900 @@ -635,7 +635,11 @@ static void on_stop_search( GtkWidget* b { if( data->task && ! vfs_async_task_is_finished( data->task ) ) { +#if 0 vfs_async_task_cancel( data->task ); +#else + finish_search(data); +#endif } } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 15 Jul 2008 18:04:17 -0000 1.18 +++ .cvsignore 17 Jul 2008 08:04:06 -0000 1.19 @@ -1 +1 @@ -pcmanfm-0.4.6.2.tar.gz +pcmanfm-0.5.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pcmanfm.spec 15 Jul 2008 18:04:17 -0000 1.21 +++ pcmanfm.spec 17 Jul 2008 08:04:06 -0000 1.22 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.4.6.2 +Version: 0.5 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -10,6 +10,7 @@ License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz +Patch0: pcmanfm-0.5-kill-find-immediately.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .search_hang # permission fix %{__chmod} 0644 \ @@ -60,7 +62,7 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category 'Application' \ --vendor 'fedora' \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}*.desktop %find_lang %{name} @@ -90,10 +92,13 @@ %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-%{name}*.desktop %{_datadir}/mime/packages/*.xml %changelog +* Thu Jul 17 2008 Mamoru Tasaka - 0.5-1 +- 0.5 + * Wed Jul 16 2008 Mamoru Tasaka - 0.4.6.2-1 - 0.4.6.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 15 Jul 2008 18:04:17 -0000 1.18 +++ sources 17 Jul 2008 08:04:06 -0000 1.19 @@ -1 +1 @@ -35c314e29e4c93b80fe8230ca1a832dc pcmanfm-0.4.6.2.tar.gz +fe1a836eed6a42107e7d71a01a52f7ec pcmanfm-0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 08:09:00 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 17 Jul 2008 08:09:00 GMT Subject: rpms/funtools/EL-5 Makefile, 1.2, 1.3 funtools-makefile.patch, 1.2, 1.3 funtools-wcs.patch, 1.2, 1.3 funtools.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200807170809.m6H890qR032591@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/funtools/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32342 Added Files: Makefile funtools-makefile.patch funtools-wcs.patch funtools.spec sources Log Message: Creating EL-5 branch Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 17 Jul 2008 08:08:04 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: funtools +# $Id$ +NAME := funtools +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) funtools-makefile.patch: Index: funtools-makefile.patch =================================================================== RCS file: funtools-makefile.patch diff -N funtools-makefile.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ funtools-makefile.patch 17 Jul 2008 08:08:04 -0000 1.3 @@ -0,0 +1,422 @@ +diff -ur funtools-1.3.0b29/filter/Makefile.in funtools-1.3.0b29.new/filter/Makefile.in +--- funtools-1.3.0b29/filter/Makefile.in 2006-03-20 19:42:11.000000000 +0100 ++++ funtools-1.3.0b29.new/filter/Makefile.in 2007-03-26 10:47:02.000000000 +0200 +@@ -29,6 +29,25 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++host_alias = @host_alias@ ++includedir = @includedir@ ++nfodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ + + # The following definition can be set to non-null for special systems + # like AFS with replication. It allows the pathnames used for installation +@@ -38,13 +57,13 @@ + INSTALL_ROOT = + + # Directory in which to install the .a, .so, and .o files: +-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + + # Directory in which to install the programs: +-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin ++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) + + # Directory in which to install the include files: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/filt + + # util files are in the util directory at same level + UTIL_INC = -I../util +@@ -55,7 +74,7 @@ + #FITSY_LIBS = -L../fitsy + + # wcs files are in the wcs subdirectory +-WCS_INC = -I../wcs ++WCS_INC = -I/usr/include/wcs + #WCS_LIBS = -L../wcs -lwcs + + # extra includes for compiling +@@ -161,7 +180,7 @@ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +- mkdir $$i; \ ++ mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ +diff -ur funtools-1.3.0b29/fitsy/Makefile.in funtools-1.3.0b29.new/fitsy/Makefile.in +--- funtools-1.3.0b29/fitsy/Makefile.in 2006-10-30 17:51:58.000000000 +0100 ++++ funtools-1.3.0b29.new/fitsy/Makefile.in 2007-03-26 10:47:02.000000000 +0200 +@@ -28,6 +28,25 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++host_alias = @host_alias@ ++includedir = @includedir@ ++nfodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ + + # The following definition can be set to non-null for special systems + # like AFS with replication. It allows the pathnames used for installation +@@ -37,13 +56,13 @@ + INSTALL_ROOT = + + # Directory in which to install the .a, .so, and .o files: +-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + + # Directory in which to install the programs: +-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin ++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) + + # Directory in which to install the include files: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/fitsy + + # There are just too many different versions of "install" around; + # better to use the install-sh script that comes with the distribution, +diff -ur funtools-1.3.0b29/Makefile.in funtools-1.3.0b29.new/Makefile.in +--- funtools-1.3.0b29/Makefile.in 2007-02-28 18:50:16.000000000 +0100 ++++ funtools-1.3.0b29.new/Makefile.in 2007-03-26 10:48:41.000000000 +0200 +@@ -37,19 +37,19 @@ + INSTALL_ROOT = + + # Directory in which to install the .a or .so binary for the FUNTOOLS library: +-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + + # Directory in which to install the program wish: +-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin ++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) + + # Directory in which to install the funtools.h include file: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools + + # Top-level directory for manual entries: +-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man ++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) + + # Top-level directory for share entries: +-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools ++MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/funtools + + # util files are in the util subdirectory + UTIL_INC = -I./util +@@ -60,7 +60,7 @@ + # FITSY_LIBS = -L./fitsy -lfitsy + + # wcs files are in the wcs subdirectory +-WCS_INC = -I./wcs ++WCS_INC = -I/usr/include/wcs + # WCS_LIBS = -L./wcs -lwcs + + # filter files are in the filter subdirectory +@@ -74,7 +74,7 @@ + EXTRA_LIBS = @EXTRA_LIBS@ + + # the full set of libraries for linking +-LIBS = $(UTIL_LIBS) $(FILTER_LIBS) $(WCS_LIBS) $(FITSY_LIBS) \ ++LIBS = $(UTIL_LIBS) $(FILTER_LIBS) $(FITSY_LIBS) \ + $(EXTRA_LIBS) -lm + + # To change the compiler switches, for example to change from -O +@@ -111,6 +111,30 @@ + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + ++# Added by fedora rpm patch ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++exec_prefix = @exec_prefix@ ++host_alias = @host_alias@ ++includedir = @includedir@ ++nfodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++# end ++ ++ + # which awk-like program do we have? + PRE= @PRE@ + POST= @POST@ +@@ -160,7 +184,7 @@ + + # this is used in the link line + # LLIB = $(LIB) +-LLIB = @LLIB@ ++LLIB = @LLIB@ + + # libraries containing main as subroutines + MAINLIB = lib$(PACKAGE)MainLib.a +@@ -225,10 +249,10 @@ + echo $(PROGS) | ./mkfunmainlib > funmainlib.c; + + shlib: sublib $(LIBOBJS) +- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ ++ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ + (cd $(PACKAGE)tmp && ar x ../$(LIB)); \ + CC='$(CC)' CXX=$(CXX) \ +- ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \ ++ ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o $(EXTRA_LIBS) -lm; \ + rm -rf $(PACKAGE)tmp;) + + mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o +@@ -237,7 +261,7 @@ + $(RANLIB) lib$(PACKAGE)MainLib.a) + + shmainlib: mainlib +- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ ++ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ + (cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \ + CC='$(CC)' CXX='$(CXX)' \ + ./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\ +@@ -251,7 +275,7 @@ + @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ + (cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \ + CC='$(CC)' CXX='$(CXX)' \ +- ./mklib -o tclfun $(PACKAGE)tmp/*.o; \ ++ ./mklib -o tclfun $(PACKAGE)tmp/*.o $(EXTRA_LIBS) -lm; \ + rm -rf $(PACKAGE)tmp; \ + test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \ + SHLIB=libtclfun.so; \ +@@ -370,6 +394,7 @@ + + funtools.ds9: funtools_ds9.tmpl + sed -e 's#PRE#$(PRE)#g;s#POST#$(POST)#g;s#GUNZIP#$(GUNZIP)#g' funtools_ds9.tmpl > funtools.ds9 ++ chmod +x funtools.ds9 + + diff: + @-(for file in "`ls *.c`"; \ +@@ -413,7 +438,7 @@ + else \ + echo "Installing $$i" ; \ + $(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \ +- chmod 555 $(LIB_INSTALL_DIR)/$$i; \ ++ chmod 755 $(LIB_INSTALL_DIR)/$$i; \ + fi; \ + done;) + +@@ -422,7 +447,7 @@ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +- mkdir $$i; \ ++ mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ +@@ -432,7 +457,7 @@ + echo "Installing $$XLIB"; \ + $(INSTALL_DATA) $$XLIB $(LIB_INSTALL_DIR)/$$XLIB; \ + (cd $(LIB_INSTALL_DIR); $(RANLIB) $$XLIB); \ +- chmod 555 $(LIB_INSTALL_DIR)/$$XLIB; \ ++ chmod 755 $(LIB_INSTALL_DIR)/$$XLIB; \ + fi; + @echo "Installing funtools.h" + @$(INSTALL_DATA) funtools.h $(INCLUDE_INSTALL_DIR)/funtools.h +@@ -462,7 +487,7 @@ + install-man: + @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ + echo "Making directory $(MAN_INSTALL_DIR)"; \ +- mkdir $(MAN_INSTALL_DIR); \ ++ mkdir -p $(MAN_INSTALL_DIR); \ + chmod 755 $(MAN_INSTALL_DIR); \ + else true; \ + fi; +@@ -473,7 +498,7 @@ + M="$(MAN_INSTALL_DIR)/man$$E"; \ + if [ ! -d $$M ] ; then \ + echo "Making directory $$M"; \ +- mkdir $$M; \ ++ mkdir -p $$M; \ + chmod 755 $$M; \ + else true; \ + fi; \ +diff -ur funtools-1.3.0b29/util/Makefile.in funtools-1.3.0b29.new/util/Makefile.in +--- funtools-1.3.0b29/util/Makefile.in 2007-02-09 17:37:53.000000000 +0100 ++++ funtools-1.3.0b29.new/util/Makefile.in 2007-03-26 10:47:02.000000000 +0200 +@@ -28,7 +28,26 @@ + # to the "configure" script. + + prefix = @prefix@ +-exec_prefix = @exec_prefix@ ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++exec_prefix = @exec_prefix@ ++host_alias = @host_alias@ ++includedir = @includedir@ ++nfodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ + + # The following definition can be set to non-null for special systems + # like AFS with replication. It allows the pathnames used for installation +@@ -38,13 +57,13 @@ + INSTALL_ROOT = + + # Directory in which to install the .a, .so, and .o files: +-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + + # Directory in which to install the programs: +-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin ++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) + + # Directory in which to install the include files: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/util + + # extra includes for compiling + INCLUDES = +@@ -174,7 +193,7 @@ + $(CC) -I$(ZDIR) -c $(CFLAGS) $(ZDIR)/inffast.c + + gio.o: gio.c gio.h +- $(CC) -c $(CC_SWITCHES) -I$(ZDIR) gio.c ++ $(CC) -c $(CC_SWITCHES) gio.c + + gcat.o: gcat.c gio.h + +@@ -192,7 +211,7 @@ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +- mkdir $$i; \ ++ mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ +diff -ur funtools-1.3.0b29/wcs/Makefile.in funtools-1.3.0b29.new/wcs/Makefile.in +--- funtools-1.3.0b29/wcs/Makefile.in 2006-11-30 19:46:29.000000000 +0100 ++++ funtools-1.3.0b29.new/wcs/Makefile.in 2007-03-26 10:47:02.000000000 +0200 +@@ -27,7 +27,26 @@ + # to the "configure" script. + + prefix = @prefix@ +-exec_prefix = @exec_prefix@ ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++exec_prefix = @exec_prefix@ ++host_alias = @host_alias@ ++includedir = @includedir@ ++nfodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ + + # The following definition can be set to non-null for special systems + # like AFS with replication. It allows the pathnames used for installation +@@ -37,13 +56,13 @@ + INSTALL_ROOT = + + # Directory in which to install the .a or .so binary for the WCS library: +-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + + # Directory in which to install the program wish: +-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin ++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) + + # Directory in which to install the include file wcs.h: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools + + # To change the compiler switches, for example to change from -O + # to -g, change the following line: +@@ -136,7 +155,7 @@ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +- mkdir $$i; \ ++ mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ +@@ -148,12 +167,12 @@ + (cd $(LIB_INSTALL_DIR); $(RANLIB) $$XLIB); \ + chmod 555 $(LIB_INSTALL_DIR)/$$XLIB; \ + fi; +- @echo "Installing fitshead.h" +- @$(INSTALL_DATA) fitshead.h $(INCLUDE_INSTALL_DIR)/fitshead.h +- @echo "Installing wcs.h" +- @$(INSTALL_DATA) wcs.h $(INCLUDE_INSTALL_DIR)/wcs.h +- @echo "Installing wcslib.h" +- @$(INSTALL_DATA) wcslib.h $(INCLUDE_INSTALL_DIR)/wcslib.h ++ @echo "Skipping fitshead.h" ++# @$(INSTALL_DATA) fitshead.h $(INCLUDE_INSTALL_DIR)/fitshead.h ++ @echo "Skipping wcs.h" ++# @$(INSTALL_DATA) wcs.h $(INCLUDE_INSTALL_DIR)/wcs.h ++ @echo "Skipping wcslib.h" ++# @$(INSTALL_DATA) wcslib.h $(INCLUDE_INSTALL_DIR)/wcslib.h + + Makefile: Makefile.in + $(SHELL) config.status funtools-wcs.patch: Index: funtools-wcs.patch =================================================================== RCS file: funtools-wcs.patch diff -N funtools-wcs.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ funtools-wcs.patch 17 Jul 2008 08:08:04 -0000 1.3 @@ -0,0 +1,84 @@ +diff -ur funtools-1.4.0/filter/filter.h funtools-1.4.0.new/filter/filter.h +--- funtools-1.4.0/filter/filter.h 2007-01-04 17:54:21.000000000 +0100 ++++ funtools-1.4.0.new/filter/filter.h 2007-10-16 09:48:28.000000000 +0200 +@@ -46,7 +46,7 @@ + #include + #undef USE_XFILEIO + #include +-#include ++#include + #include + #include + #include +diff -ur funtools-1.4.0/funcen.c funtools-1.4.0.new/funcen.c +--- funtools-1.4.0/funcen.c 2006-11-01 17:35:16.000000000 +0100 ++++ funtools-1.4.0.new/funcen.c 2007-10-16 09:48:49.000000000 +0200 +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + #include + + #define MAXROW 8192 +diff -ur funtools-1.4.0/funmerge.c funtools-1.4.0.new/funmerge.c +--- funtools-1.4.0/funmerge.c 2007-03-05 16:42:15.000000000 +0100 ++++ funtools-1.4.0.new/funmerge.c 2007-10-16 09:49:07.000000000 +0200 +@@ -4,7 +4,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff -ur funtools-1.4.0/funtools.h funtools-1.4.0.new/funtools.h +--- funtools-1.4.0/funtools.h 2007-08-03 19:12:10.000000000 +0200 ++++ funtools-1.4.0.new/funtools.h 2007-10-16 09:48:01.000000000 +0200 +@@ -31,7 +31,7 @@ + #define USE_XFILEIO 1 + #include + #undef USE_XFILEIO +-#include ++#include + typedef void *Fun; + #endif + +diff -ur funtools-1.4.0/funtoolsP.h funtools-1.4.0.new/funtoolsP.h +--- funtools-1.4.0/funtoolsP.h 2007-07-31 19:04:49.000000000 +0200 ++++ funtools-1.4.0.new/funtoolsP.h 2007-10-16 09:49:23.000000000 +0200 +@@ -36,7 +36,7 @@ + #define USE_XFILEIO 1 + #include + #undef USE_XFILEIO +-#include ++#include + #include + #include + #include +diff -ur funtools-1.4.0/funwcs.c funtools-1.4.0.new/funwcs.c +--- funtools-1.4.0/funwcs.c 2007-06-11 19:13:06.000000000 +0200 ++++ funtools-1.4.0.new/funwcs.c 2007-10-16 09:49:36.000000000 +0200 +@@ -3,7 +3,7 @@ + */ + + #include +-#include ++#include + + /* + * +diff -ur funtools-1.4.0/ofuntools.h funtools-1.4.0.new/ofuntools.h +--- funtools-1.4.0/ofuntools.h 2007-06-11 23:13:24.000000000 +0200 ++++ funtools-1.4.0.new/ofuntools.h 2007-10-16 09:49:49.000000000 +0200 +@@ -31,7 +31,7 @@ + #define USE_XFILEIO 1 + #include + #undef USE_XFILEIO +-#include ++#include + typedef void *Fun; + #endif + Index: funtools.spec =================================================================== RCS file: funtools.spec diff -N funtools.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ funtools.spec 17 Jul 2008 08:08:04 -0000 1.6 @@ -0,0 +1,119 @@ +Name: funtools +Version: 1.4.0 +Release: 3%{?dist} +Summary: FITS library and utilities + +# Upstream version +%define upversion 1.4.0 + +Group: Applications/Engineering +License: LGPLv2+ +URL: http://hea-www.harvard.edu/RD/funtools/ +Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{upversion}.tar.gz +Patch0: funtools-makefile.patch +Patch1: funtools-wcs.patch +Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: libwcs-devel tcl-devel zlib-devel +BuildRequires: pkgconfig +Requires: gnuplot +Requires: %{name}-libs = %{version}-%{release} + +%description +Funtools, is a "minimal buy-in" FITS library and utility package from +the SAO/HEAD R&D group. The Funtools library provides simplified access to +FITS images and binary tables, as well as to raw array and binary event lists. +The Funtools utilities provide high-level support for processing +astronomical data. +This package contains command-line utilities for managing FITS files. + +%package devel +Summary: Headers for developing programs that will use %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +These are the header files and libraries needed to develop a %{name} +application. + +%package libs +Summary: A general purpose FITS library +Group: System Environment/Libraries +%description libs +qfits is a stand-alone C library offering easy access to FITS (Flexible Image + Transport System) files. +This package contains the %{name} run-time library + +%prep +%setup -q -n %{name}-%{upversion} +%patch0 -p1 + +%build +%configure --enable-shared=link --with-wcslib=%{_libdir}/libwcs.so \ + --with-zlib=%{_libdir}/libz.so --with-tcl=%{_libdir} --enable-dl +# Parallel build does not work currently +%{__make} EXTRA_LIBS="-lwcs -lz -ldl" +%{__make} shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl" + +%install +%{__rm} -fr %{buildroot} +%{__make} INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install +mv %{buildroot}/%{_bindir}/funtools.ds9 %{buildroot}/%{_datadir}/funtools +mv %{buildroot}/%{_bindir}/funcalc.sed %{buildroot}/%{_datadir}/funtools +# Bug #329741 +%{__install} -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy + + +%clean +%{__rm} -fr %{buildroot} + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_bindir}/* +%{_mandir}/man1/* +%{_datadir}/%{name} + +%files libs +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/*so.* + +%files devel +%defattr(-,root,root,-) +%doc doc/*.html +%doc doc/*.pdf +%{_libdir}/*.so +%{_libdir}/pkgconfig/funtools.pc +%exclude %{_libdir}/*.a +%{_includedir}/* +%{_mandir}/man3/* +%{_mandir}/mann/* + +%changelog +* Tue Oct 16 2007 Sergio Pascual 1.4.0-3 +- Fixing wcs headers +* Sat Oct 13 2007 Sergio Pascual 1.4.0-2 +- Fixing bug #329741 +- Splitting libs in funtools-libs +* Mon Aug 20 2007 Sergio Pascual 1.4.0-1 +- New upstream version, changed license and buildroot lines +* Sun Jul 22 2007 Sergio Pascual 1.3.0-0.5.b34 +- New upstream version +* Thu May 03 2007 Sergio Pascual 1.3.0-0.5.b33 +- New upstream version +* Mon Mar 26 2007 Sergio Pascual 1.3.0-0.4.b29 +- Funtools Approved +- Parallel make does not work +- Problem with undefined non weak symbols in libtclfun fixed +* Fri Mar 23 2007 Sergio Pascual 1.3.0-0.3.b29 +- Removed _smp_mflags +* Thu Mar 22 2007 Sergio Pascual 1.3.0-0.2.b29 +- Updated funtools-makefile.patch +- Added EXTRA_LIBS to compilation step +* Tue Mar 20 2007 Sergio Pascual 1.3.0-0.1.b29 +- Initial spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 17 Jul 2008 08:08:04 -0000 1.7 @@ -0,0 +1 @@ +8079d723e1424141c3f2bc4ea9b323db funtools-1.4.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 08:17:04 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 17 Jul 2008 08:17:04 GMT Subject: rpms/funtools/EL-5 .cvsignore,1.2,1.3 funtools.spec,1.6,1.7 Message-ID: <200807170817.m6H8H4se001979@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/funtools/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1788 Modified Files: funtools.spec Added Files: .cvsignore Log Message: * Fri Nov 09 2007 Sergio Pascual 1.4.0-4 - Adding some packages to devel requires Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 17 Jul 2008 08:16:15 -0000 1.3 @@ -0,0 +1 @@ +funtools-1.4.0.tar.gz Index: funtools.spec =================================================================== RCS file: /cvs/pkgs/rpms/funtools/EL-5/funtools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- funtools.spec 17 Jul 2008 08:08:04 -0000 1.6 +++ funtools.spec 17 Jul 2008 08:16:15 -0000 1.7 @@ -1,6 +1,6 @@ Name: funtools Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: FITS library and utilities # Upstream version @@ -30,7 +30,7 @@ %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} libwcs-devel tcl-devel %description devel These are the header files and libraries needed to develop a %{name} @@ -47,6 +47,7 @@ %prep %setup -q -n %{name}-%{upversion} %patch0 -p1 +%patch1 -p1 %build %configure --enable-shared=link --with-wcslib=%{_libdir}/libwcs.so \ @@ -95,25 +96,36 @@ %{_mandir}/mann/* %changelog +* Fri Nov 09 2007 Sergio Pascual 1.4.0-4 +- Adding some packages to devel requires + * Tue Oct 16 2007 Sergio Pascual 1.4.0-3 - Fixing wcs headers + * Sat Oct 13 2007 Sergio Pascual 1.4.0-2 - Fixing bug #329741 - Splitting libs in funtools-libs + * Mon Aug 20 2007 Sergio Pascual 1.4.0-1 - New upstream version, changed license and buildroot lines + * Sun Jul 22 2007 Sergio Pascual 1.3.0-0.5.b34 - New upstream version + * Thu May 03 2007 Sergio Pascual 1.3.0-0.5.b33 - New upstream version + * Mon Mar 26 2007 Sergio Pascual 1.3.0-0.4.b29 - Funtools Approved - Parallel make does not work - Problem with undefined non weak symbols in libtclfun fixed + * Fri Mar 23 2007 Sergio Pascual 1.3.0-0.3.b29 - Removed _smp_mflags + * Thu Mar 22 2007 Sergio Pascual 1.3.0-0.2.b29 - Updated funtools-makefile.patch - Added EXTRA_LIBS to compilation step + * Tue Mar 20 2007 Sergio Pascual 1.3.0-0.1.b29 - Initial spec file From fedora-extras-commits at redhat.com Thu Jul 17 08:28:29 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 17 Jul 2008 08:28:29 GMT Subject: rpms/xpa/EL-5 .cvsignore, 1.4, 1.5 Makefile, 1.2, 1.3 sources, 1.4, 1.5 xpa-2.1.6-makefile.patch, 1.3, 1.4 xpa.spec, 1.10, 1.11 Message-ID: <200807170828.m6H8STk0004893@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/xpa/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631 Added Files: .cvsignore Makefile sources xpa-2.1.6-makefile.patch xpa.spec Log Message: * Sat Dec 08 2007 Sergio Pascual 2.1.8-3 - Tcl interface in a different subpackage - pkgIndex.tcl added Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 17 Jul 2008 08:27:35 -0000 1.5 @@ -0,0 +1 @@ +xpa-2.1.7b2.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 17 Jul 2008 08:27:35 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: xpa +# $Id$ +NAME := xpa +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 17 Jul 2008 08:27:35 -0000 1.5 @@ -0,0 +1 @@ +d5ca64ab2b6a487bfa2f3277d4768656 xpa-2.1.8.tar.gz xpa-2.1.6-makefile.patch: Index: xpa-2.1.6-makefile.patch =================================================================== RCS file: xpa-2.1.6-makefile.patch diff -N xpa-2.1.6-makefile.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xpa-2.1.6-makefile.patch 17 Jul 2008 08:27:35 -0000 1.4 @@ -0,0 +1,175 @@ +diff -ur xpa-2.1.6.orig/Makefile.in xpa-2.1.6/Makefile.in +--- xpa-2.1.6.orig/Makefile.in 2005-03-31 21:36:03.000000000 +0200 ++++ xpa-2.1.6/Makefile.in 2006-06-22 12:57:40.000000000 +0200 +@@ -37,19 +37,19 @@ + INSTALL_ROOT = + + # Directory in which to install the .a or .so binary for the XPA library: +-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + + # Directory in which to install the program wish: +-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin ++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) + + # Directory in which to install the include file xpa.h: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/xpa + + # Top-level directory for manual entries: +-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man ++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) + + # Top-level directory for share entries: +-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa ++MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/xpa + + # Platform-specific X compiler flags (include file specifications) + X_CFLAGS = @X_CFLAGS@ +@@ -98,6 +98,29 @@ + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + ++# Added by fedora rpm patch ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++exec_prefix = @exec_prefix@ ++host_alias = @host_alias@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++# end ++ + #---------------------------------------------------------------- + # The information below is modified by the configure script when + # Makefile is generated from Makefile.in. You shouldn't normally +@@ -141,7 +164,7 @@ + + # used in link line + # LLIB= $(LIB) +-LLIB= @LLIB@ ++LLIB= -L. -lxpa + + PROGS = xpaset xpaget xpainfo xpaaccess xpans xpamb + +@@ -169,7 +192,7 @@ + $(RANLIB) $(LIB) + + shlib: $(LIB) +- @(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \ ++ @(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \ + (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ + rm -f lib$(PACKAGE).tmp/xt*.o; \ + rm -f lib$(PACKAGE).tmp/tcl*.o; \ +@@ -178,7 +201,7 @@ + rm -rf lib$(PACKAGE).tmp) + + tclxpa: $(LIB) +- @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \ ++ @(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \ + (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ + rm -f libtclxpa.tmp/xt*.o; \ + CC='$(CC)' CXX=$(CXX) \ +@@ -198,34 +221,34 @@ + echo "pkg_mkIndex -direct -verbose . libtclxpa.so; exit"| tclsh) + + xpaset: $(LIB) xpaset.o +- $(CC) $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS) + + xpaget: $(LIB) xpaget.o +- $(CC) $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS) + + xpainfo: $(LIB) xpainfo.o +- $(CC) $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS) + + xpaaccess: $(LIB) xpaaccess.o +- $(CC) $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS) + + xpans: $(LIB) xpans.o +- $(CC) $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB) + + xpamb: $(LIB) xpamb.o +- $(CC) $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS) + + ctest: $(LIB) ctest.o +- $(CC) $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS) + + stest: $(LIB) stest.o +- $(CC) $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS) + + rtest: $(LIB) rtest.o +- $(CC) $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS) ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS) + + stestx: $(LIB) stest.o +- $(CC) $(LDFLAGS) stest.o -o stest $(LIB) \ ++ $(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) \ + $(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(LIBS) + + # Note: before running ranlib below, must cd to target directory because +@@ -244,7 +267,7 @@ + else \ + echo "Installing $$i" ; \ + $(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \ +- chmod 555 $(LIB_INSTALL_DIR)/$$i; \ ++ chmod 755 $(LIB_INSTALL_DIR)/$$i; \ + fi; \ + done;) + +@@ -253,7 +276,7 @@ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +- mkdir $$i; \ ++ mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ +@@ -261,7 +284,7 @@ + @echo "Installing $(LIB)"; + @$(INSTALL_DATA) $(LIB) $(LIB_INSTALL_DIR)/$(LIB); + @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(LIB)); +- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB); ++ @chmod 755 $(LIB_INSTALL_DIR)/$(LIB); + @echo "Installing xpa.h" + @$(INSTALL_DATA) xpa.h $(INCLUDE_INSTALL_DIR)/xpa.h + @echo "Installing prsetup.h" +@@ -275,7 +298,7 @@ + install-man: + @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ + echo "Making directory $(MAN_INSTALL_DIR)"; \ +- mkdir $(MAN_INSTALL_DIR); \ ++ mkdir -p $(MAN_INSTALL_DIR); \ + chmod 755 $(MAN_INSTALL_DIR); \ + else true; \ + fi; +@@ -286,7 +309,7 @@ + M="$(MAN_INSTALL_DIR)/man$$E"; \ + if [ ! -d $$M ] ; then \ + echo "Making directory $$M"; \ +- mkdir $$M; \ ++ mkdir -p $$M; \ + chmod 755 $$M; \ + else true; \ + fi; \ Index: xpa.spec =================================================================== RCS file: xpa.spec diff -N xpa.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xpa.spec 17 Jul 2008 08:27:35 -0000 1.11 @@ -0,0 +1,162 @@ +Name: xpa +Version: 2.1.8 +Release: 3%{?dist} +Summary: The XPA messaging system + +# Upstream version +%define upversion 2.1.8 + +Group: Applications/Engineering +License: LGPLv2+ +URL: http://hea-www.harvard.edu/RD/xpa/ +Source0: http://hea-www.harvard.edu/saord/download/xpa/%{name}-%{upversion}.tar.gz +Patch0: xpa-2.1.6-makefile.patch +Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires: %{name}-libs = %{version}-%{release} + +BuildRequires: tcl-devel libXt-devel +BuildRequires: /bin/awk + +%description +The XPA messaging system provides seamless communication between many kinds +of Unix programs, including X programs and Tcl/Tk programs. +It also provides an easy way for users to communicate with these +XPA-enabled programs by executing XPA client commands in the shell or by +utilizing such commands in scripts. Because XPA works both at the programming +level and the shell level, it is a powerful tool for unifying any +analysis environment: users and programmers have great flexibility +in choosing the best level or levels at which to access XPA services, +and client access can be extended or modified easily at any time. +This package contains command-line utilities for managing XPA. + +%package devel +Summary: Headers for developing programs that will use %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-tcl = %{version}-%{release} + +%description devel +These are the header files and libraries needed to develop a %{name} +application. + +%package libs +Summary: The XPA messaging system runtime libraries +Group: System Environment/Libraries +%description libs +The XPA messaging system provides seamless communication between many kinds +of Unix programs, including X programs and Tcl/Tk programs. +This package contains the %{name} run-time library + +%package tcl +Summary: The XPA messaging system TCL interface +Group: System Environment/Libraries +Requires: %{name}-libs = %{version}-%{release} +%description tcl +The XPA messaging system provides seamless communication between many kinds +of Unix programs, including X programs and Tcl/Tk programs. +This package contains the %{name} TCL interface + +%prep +%setup -q -n %{name}-%{upversion} +%patch0 -p1 +# Remove ps files in html docs +%{__rm} -rf %{_builddir}/%{name}-%{version}/doc/*.ps + +%build +%configure --enable-shared --with-tcl=%{_libdir} \ + --with-x --enable-threaded-xpans +%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} tclxpa + +%install +%{__rm} -fr %{buildroot} +%{__mkdir_p} %{buildroot}%{_libdir}/tclxpa +%{__make} INSTALL_ROOT=%{buildroot} install +%{__cp} -a pkgIndex.tcl %{buildroot}%{_libdir}/tclxpa +%{__mv} %{buildroot}%{_libdir}/libtcl* %{buildroot}%{_libdir}/tclxpa + +%clean +%{__rm} -fr %{buildroot} + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_bindir}/* +%{_mandir}/man1/* +%{_datadir}/%{name} + +%files libs +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libxpa.so.* + +%files tcl +%defattr(-,root,root,-) +%{_libdir}/tclxpa + +%files devel +%defattr(-,root,root,-) +%doc doc/*.html +%doc doc/*.pdf +%{_libdir}/*.so +%{_libdir}/tclxpa/*.so +%{_includedir}/* +%{_mandir}/man3/* +%{_mandir}/mann/* +%exclude %{_libdir}/*.a + +%changelog +* Sat Dec 08 2007 Sergio Pascual 2.1.8-3 +- Tcl interface in a different subpackage +- pkgIndex.tcl added + +* Wed Nov 14 2007 Sergio Pascual 2.1.8-2 +- Nested dir for headers fixed + +* Tue Nov 13 2007 Sergio Pascual 2.1.8-1 +- New upstream source + +* Sat Oct 13 2007 Sergio Pascual 2.1.7-0.3.b2 +- Splitted libraries in a new package + +* Mon Aug 27 2007 Sergio Pascual 2.1.7-0.2.b2.1 +- Added /bin/awk to BuildReq + +* Mon Aug 27 2007 Sergio Pascual 2.1.7-0.2.b2 +- Rebuild for Fedora 8 to get the build-id + +* Wed Mar 21 2007 Sergio Pascual 2.1.7-0.1.b2 +- New upstream version 2.1.7b2 + +* Mon Feb 26 2007 Sergio Pascual 2.1.6-9 +- Back to tcl 8.4 due to stability problems + +* Thu Feb 01 2007 Sergio Pascual 2.1.6-8 +- Rebuilt for devel (out of sync with tcl). + +* Tue Sep 12 2006 Sergio Pascual 2.1.6-7 +- Rebuilt for FC6 (tag problem). + +* Tue Sep 12 2006 Sergio Pascual 2.1.6-6 +- Rebuilt for FC6 (mass rebuild). + +* Thu Jul 18 2006 Sergio Pascual 2.1.6-5 +- Changed BuildRequires to make common spec for FC-4 and up + +* Thu Jun 22 2006 Sergio Pascual 2.1.6-4 +- Patch0 is modified so Makefile installs in $(libdir) instead of $(prefix)/lib + +* Mon Jun 19 2006 Sergio Pascual 2.1.6-3 +- Added some space between package devel and description devel and + between install and clean to improve the flow and readability of the file. + +* Tue Jun 13 2006 Sergio Pascual 2.1.6-2 +- Specfile polished, minor fixes. + +* Wed Feb 22 2006 Sergio Pascual 2.1.6-1 +- Initial spec file. From fedora-extras-commits at redhat.com Thu Jul 17 08:33:21 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 17 Jul 2008 08:33:21 GMT Subject: rpms/tkimg/EL-5 tkimg.spec,1.8,1.9 Message-ID: <200807170833.m6H8XLsp006089@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/tkimg/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5884 Modified Files: tkimg.spec Log Message: * Tue May 06 2008 Sergio Pascual - 1.3-0.8.2008 0505svn - Fixed source extension Index: tkimg.spec =================================================================== RCS file: /cvs/pkgs/rpms/tkimg/EL-5/tkimg.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tkimg.spec 3 Jul 2008 15:39:36 -0000 1.8 +++ tkimg.spec 17 Jul 2008 08:32:31 -0000 1.9 @@ -1,11 +1,9 @@ -%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} -%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}} # Data from subversion %define svnversion 20080505 Name: tkimg Version: 1.3 -Release: 0.11.%{svnversion}svn%{?dist} +Release: 0.8.%{svnversion}svn%{?dist} Summary: More Image Formats for Tk Group: Development/Libraries @@ -16,7 +14,6 @@ # svn export -r 130 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20071018 # tar -czvf tkimg-20071018.tar.gz tkimg-20071018 -# Data from subversion Source0: %{name}-%{svnversion}.tar.bz2 Patch0: tkimg-build.patch Patch1: tkimg-systemlibs.patch @@ -25,7 +22,7 @@ BuildRequires: tcl-devel tk-devel BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel -Requires: tcl(abi) = 8.5 +Requires: tcl(abi) = 8.4 %description This package contains a collection of image format handlers for the Tk @@ -48,27 +45,20 @@ %patch1 -p1 %build -%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --disable-static \ - --libdir=%{tcl_sitearch} +%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --disable-static %{__make} %{?_smp_mflags} %install %{__rm} -fr %{buildroot} %{__make} %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install - # Fixing some permissions -find %{buildroot}/%{tcl_sitearch} -name "*.sh" |xargs chmod 644 -find %{buildroot}/%{tcl_sitearch} -name "*.tcl" |xargs chmod 644 -find %{buildroot}/%{tcl_sitearch} -name "*.a" |xargs chmod 644 -find %{buildroot}/%{tcl_sitearch} -name "*.so" |xargs chmod 755 - +find %{buildroot}/%{_libdir} -name "*.sh" |xargs chmod 644 +find %{buildroot}/%{_libdir} -name "*.tcl" |xargs chmod 644 +find %{buildroot}/%{_libdir} -name "*.a" |xargs chmod 644 +find %{buildroot}/%{_libdir} -name "*.so" |xargs chmod 755 # Make library links -%{__mv} %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir} -for tcllibs in %{buildroot}/%{tcl_sitearch}/Img1.3/*tcl*.so -do -btcllibs=`basename $tcllibs` -%{__ln_s} %{tcl_sitearch}/Img1.3/$btcllibs %{buildroot}/%{_libdir}/$btcllibs -done +%{__mkdir_p} %{buildroot}/%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %clean %{__rm} -fr %{buildroot} @@ -80,36 +70,20 @@ %files %defattr(-,root,root,-) %doc README -%{_libdir}/*.so -%{tcl_sitearch}/Img1.3 -%exclude %{tcl_sitearch}/Img1.3/*.a - +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* +%{_libdir}/*.sh +%{_libdir}/Img1.3 +%exclude %{_libdir}/Img1.3/*.a %files devel %doc README %{_includedir}/* -%{_libdir}/*.sh -%{tcl_sitearch}/Img1.3/*.a +%{_libdir}/Img1.3/*.a %changelog -* Thu Jul 03 2008 Tom "spot" Callaway - 1.3-0.11.200805005svn -- fix configure to use --with-tcl=%%{tcl_sitearch} - -* Mon May 05 2008 Sergio Pascual - 1.3-0.10.20080505svn -- New upstream source -- Including fooConfig.sh files in -devel -- Making symlinks of shared libraries in libdir -- Removing file in ld.so.conf.d -- Fixing bug #444872 - -* Tue Feb 19 2008 Fedora Release Engineering - 1.3-0.9.20071018svn -- Autorebuild for GCC 4.3 - -* Fri Jan 04 2008 Sergio Pascual 1.3-0.8.20071018svn -- Following PackagingDrafts/Tcl - -* Thu Jan 03 2008 Sergio Pascual 1.3-0.7.20071018svn -- Rebuilt for tcl 8.5 +* Tue May 06 2008 Sergio Pascual - 1.3-0.8.2008 +0505svn +- Fixed source extension * Mon Dec 24 2007 Sergio Pascual 1.3-0.6.20071018svn - Static 'stub' library included in devel subpackage From fedora-extras-commits at redhat.com Thu Jul 17 08:46:20 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Thu, 17 Jul 2008 08:46:20 GMT Subject: rpms/bash/devel bash-3.2-man-page-suspend.patch, NONE, 1.1 bash-3.2-manpage.patch, NONE, 1.1 bash.spec, 1.158, 1.159 Message-ID: <200807170846.m6H8kK1b009327@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/bash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9125 Modified Files: bash.spec Added Files: bash-3.2-man-page-suspend.patch bash-3.2-manpage.patch Log Message: Changes in man page bash-3.2-man-page-suspend.patch: --- NEW FILE bash-3.2-man-page-suspend.patch --- diff -up bash-3.2/doc/bash.1.man-page-suspend bash-3.2/doc/bash.1 --- bash-3.2/doc/bash.1.man-page-suspend 2008-07-11 16:35:20.000000000 +0200 +++ bash-3.2/doc/bash.1 2008-07-11 16:38:26.000000000 +0200 @@ -8222,10 +8222,11 @@ Suspend the execution of this shell unti .B SIGCONT signal. When the suspended shell is a background process, it can be restarted by the fg command. For more information, read the .B JOB CONTROL -section. The +section. The suspend command can not suspend the login shell. +However, when .B \-f -option says not to complain if this is -a login shell; just suspend anyway. The return status is 0 unless +option is specified, suspend command can suspend even login shell. +The return status is 0 unless the shell is a login shell and .B \-f is not supplied, or if job control is not enabled. bash-3.2-manpage.patch: --- NEW FILE bash-3.2-manpage.patch --- diff -up bash-3.2/doc/bash.1.manpage bash-3.2/doc/bash.1 --- bash-3.2/doc/bash.1.manpage 2008-07-15 13:11:39.000000000 +0200 +++ bash-3.2/doc/bash.1 2008-07-15 13:37:39.000000000 +0200 @@ -4139,6 +4139,9 @@ The .I "previous job" may be referenced using .BR %\- . +When there is the current job only, +.BR %\- +refers to the shell's notion of the current job. In output pertaining to jobs (e.g., the output of the .B jobs command), the current job is always flagged with a @@ -6105,10 +6108,9 @@ loop. If \fIn\fP is specified, break \f must be \(>= 1. If .I n is greater than the number of enclosing loops, all enclosing loops -are exited. The return value is 0 unless the shell is not executing -a loop when -.B break -is executed. +are exited. The return value is non-zero when +.I n +is \(<= 0; Otherwise, break returns 0 value. .TP \fBbuiltin\fP \fIshell\-builtin\fP [\fIarguments\fP] Execute the specified shell builtin, passing it @@ -6448,10 +6450,11 @@ is specified, resume at the \fIn\fPth en must be \(>= 1. If .I n is greater than the number of enclosing loops, the last enclosing loop -(the ``top-level'' loop) is resumed. The return value is 0 unless the -shell is not executing a loop when -.B continue -is executed. +(the ``top-level'' loop) is resumed. When continue is executed inside +of loop, the return value is non-zero when +.I n +is \(<= 0; Otherwise, continue returns 0 value. +When continue is executed outside of loop, the return value is 0. .TP \fBdeclare\fP [\fB\-afFirtx\fP] [\fB\-p\fP] [\fIname\fP[=\fIvalue\fP] ...] .PD 0 @@ -8217,7 +8220,9 @@ by default. Suspend the execution of this shell until it receives a .SM .B SIGCONT -signal. The +signal. When the suspended shell is a background process, it can be restarted by the fg command. For more information, read the +.B JOB CONTROL +section. The .B \-f option says not to complain if this is a login shell; just suspend anyway. The return status is 0 unless @@ -8901,5 +8907,9 @@ unmatched parentheses, even inside shell error messages while the construct is being read. .PP Array variables may not (yet) be exported. +.PP +When breaking out of multiple loops, if the outermost loop +consists of more than one command, the exit status of break and continue +is lost. .zZ .zY Index: bash.spec =================================================================== RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- bash.spec 5 Jun 2008 15:43:36 -0000 1.158 +++ bash.spec 17 Jul 2008 08:45:32 -0000 1.159 @@ -1,7 +1,7 @@ Version: 3.2 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version} -Release: 26%{?dist} +Release: 27%{?dist} Group: System Environment/Shells License: GPLv2+ Url: http://www.gnu.org/software/bash @@ -71,6 +71,9 @@ Patch136: bash-3.2-344411.patch Patch137: bash-3.2-190350.patch Patch138: bash-3.2-comp_wordbreaks.patch +Patch139: bash-3.2-manpage.patch +Patch140: bash-3.2-man-page-suspend.patch + Requires: mktemp Requires(post): ncurses BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -150,6 +153,9 @@ %patch136 -p1 -b .344411 %patch137 -p1 -b .190350 %patch138 -p1 -b .comp_wordbreaks +%patch139 -p1 -b .manpage +%patch140 -p1 -b .man-page-suspend + echo %{version} > _distribution echo %{release} > _patchlevel @@ -291,6 +297,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Thu Jul 17 2008 Roman Rakus - 3.2-27 +- Changes in man page - #442018, #445692, #446625, #453409 + * Thu Jun 5 2008 Roman Rakus - 3.2-26 - Patchlevel 39 From fedora-extras-commits at redhat.com Thu Jul 17 09:00:49 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Thu, 17 Jul 2008 09:00:49 GMT Subject: rpms/scim/devel scim-1.4.7-menu-pos.patch, NONE, 1.1 scim.spec, 1.124, 1.125 Message-ID: <200807170900.m6H90ne3012963@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12549 Modified Files: scim.spec Added Files: scim-1.4.7-menu-pos.patch Log Message: Fix bug 444711. scim-1.4.7-menu-pos.patch: --- NEW FILE scim-1.4.7-menu-pos.patch --- diff -up scim-1.4.7/extras/panel/scim_panel_gtk.cpp.menu-pos scim-1.4.7/extras/panel/scim_panel_gtk.cpp --- scim-1.4.7/extras/panel/scim_panel_gtk.cpp.menu-pos 2008-07-17 16:02:08.000000000 +0800 +++ scim-1.4.7/extras/panel/scim_panel_gtk.cpp 2008-07-17 16:50:32.000000000 +0800 @@ -409,6 +409,8 @@ static PangoFontDescription *_default_fo static GtkStatusIcon *_tray_icon = 0; // static GtkWidget *_tray_icon_factory_button = 0; // static gulong _tray_icon_destroy_signal_id = 0; +static bool _tray_icon_clicked = false; +static guint _tray_icon_clicked_time = 0; #endif static gboolean _input_window_draging = FALSE; @@ -1699,12 +1701,16 @@ static void ui_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) { + _tray_icon_clicked = true; + _tray_icon_clicked_time = activate_time; action_show_command_menu (); } static void ui_tray_icon_activate_cb (GtkStatusIcon *status_icon, gpointer user_data) { + _tray_icon_clicked = true; + _tray_icon_clicked_time = gtk_get_current_event_time (); _panel_agent->request_factory_menu (); } @@ -2459,8 +2465,12 @@ action_show_command_menu (void) G_CALLBACK (ui_command_menu_exit_activate_cb), 0); gtk_widget_show_all (menu_item); - - gtk_menu_popup (GTK_MENU (_command_menu), 0, 0, 0, 0, 2, activate_time); + if (_tray_icon_clicked && _tray_icon) { + gtk_menu_popup (GTK_MENU (_command_menu), 0, 0, gtk_status_icon_position_menu, _tray_icon, 2, _tray_icon_clicked_time); + } + else + gtk_menu_popup (GTK_MENU (_command_menu), 0, 0, 0, 0, 2, activate_time); + _tray_icon_clicked = false; } ////////////////////////////////////////////////////////////////////// @@ -2752,7 +2762,6 @@ slot_show_factory_menu (const std::vecto MapStringVectorSizeT groups; std::map langs, recents; - guint32 activate_time = gtk_get_current_event_time (); _factory_menu_uuids.clear (); _factory_menu_activated = true; @@ -2847,7 +2856,17 @@ slot_show_factory_menu (const std::vecto g_signal_connect (G_OBJECT (_factory_menu), "deactivate", G_CALLBACK (ui_factory_menu_deactivate_cb), NULL); - gtk_menu_popup (GTK_MENU (_factory_menu), 0, 0, 0, 0, 1, activate_time); + + if (_tray_icon_clicked && _tray_icon) { + while (gtk_main_iteration_do (FALSE)); + gtk_menu_popup (GTK_MENU (_factory_menu), 0, 0, gtk_status_icon_position_menu, _tray_icon, 1, _tray_icon_clicked_time); + } + else { + gtk_menu_popup (GTK_MENU (_factory_menu), 0, 0, 0, 0, 1, gtk_get_current_event_time ()); + } + + _tray_icon_clicked = false; + } } Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- scim.spec 17 Jul 2008 06:06:06 -0000 1.124 +++ scim.spec 17 Jul 2008 08:59:37 -0000 1.125 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ @@ -46,6 +46,7 @@ Patch24: scim-1.4.7-translation-update-431995.patch Patch25: scim-1.4.7-timeout.patch Patch26: scim-1.4.7-trayicon.patch +Patch27: scim-1.4.7-menu-pos.patch %description SCIM is a user friendly and full featured input method user interface and @@ -175,6 +176,7 @@ %patch24 -p1 -b .24-trans %patch25 -p1 -b .25-timeout %patch26 -p1 -b .26-trayicon +%patch27 -p1 -b .27-menu-pos %if %{snapshot} @@ -307,6 +309,9 @@ %changelog +* Thu Jul 17 2008 Huang Peng - 1.4.7-28.fc10 +- add patch scim-1.4.7-menu-pos.patch to fix bug 444711. + * Thu Jul 17 2008 Huang Peng - 1.4.7-27.fc10 - add patch scim-1.4.7-timeout.patch to fix bug 444150. - add patch scim-1.4.7-trayicon.patch to fix bug 447848. From fedora-extras-commits at redhat.com Thu Jul 17 09:19:35 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Thu, 17 Jul 2008 09:19:35 GMT Subject: rpms/gpm/devel .cvsignore, 1.5, 1.6 gpm-1.20.1-multilib.patch, 1.2, 1.3 gpm-1.20.1-weak-wgetch.patch, 1.3, 1.4 gpm.spec, 1.61, 1.62 sources, 1.6, 1.7 Message-ID: <200807170919.m6H9JZKp026624@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/gpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26263 Modified Files: .cvsignore gpm-1.20.1-multilib.patch gpm-1.20.1-weak-wgetch.patch gpm.spec sources Log Message: Updated to 1.20.5. Removed doc patch. Removed lisp stuff, it is part of emacs-common now. Spec clean up. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 May 2008 11:51:59 -0000 1.5 +++ .cvsignore 17 Jul 2008 09:18:40 -0000 1.6 @@ -1 +1 @@ -gpm-1.20.3.tar.gz +gpm-1.20.5.tar.gz gpm-1.20.1-multilib.patch: Index: gpm-1.20.1-multilib.patch =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/gpm-1.20.1-multilib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gpm-1.20.1-multilib.patch 20 Oct 2004 21:28:19 -0000 1.2 +++ gpm-1.20.1-multilib.patch 17 Jul 2008 09:18:40 -0000 1.3 @@ -48,5 +48,5 @@ $(CP) -r $(srcdir) $(top_builddir)/gpm-$(release)/ clean distclean: -- $(RM) -f $(srcdir)/emacs/*.elc -+ $(RM) $(srcdir)/emacs/*.elc +- $(RM) -f $(srcdir)/emacs/*.elc Makefile ++ $(RM) $(srcdir)/emacs/*.elc Makefile gpm-1.20.1-weak-wgetch.patch: Index: gpm-1.20.1-weak-wgetch.patch =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/gpm-1.20.1-weak-wgetch.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gpm-1.20.1-weak-wgetch.patch 9 Sep 2004 05:52:50 -0000 1.3 +++ gpm-1.20.1-weak-wgetch.patch 17 Jul 2008 09:18:40 -0000 1.4 @@ -14,8 +14,8 @@ int Gpm_Wgetch(WINDOW *win) { ---- gpm-1.20.1/configure.in.weak-wgetch 2004-03-22 15:49:51.000000000 -0500 -+++ gpm-1.20.1/configure.in 2004-03-22 15:51:24.000000000 -0500 +--- gpm-1.20.1/configure.ac.weak-wgetch 2004-03-22 15:49:51.000000000 -0500 ++++ gpm-1.20.1/configure.ac 2004-03-22 15:51:24.000000000 -0500 @@ -115,7 +115,7 @@ AC_CHECK_LIB($i, wgetch,,,$TERMLIBS) else :; fi @@ -24,15 +24,3 @@ + SHARED_LIBS="-lc" LIBS=$SAVELIBS ;; esac - ---- gpm-1.20.1/configure.weak-wgetch 2004-03-22 15:49:55.000000000 -0500 -+++ gpm-1.20.1/configure 2004-03-22 15:51:24.000000000 -0500 -@@ -4295,7 +4295,7 @@ - - else :; fi - done -- SHARED_LIBS="$LIBS $TERMLIBS -lc" -+ SHARED_LIBS="-lc" - LIBS=$SAVELIBS ;; - esac - Index: gpm.spec =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- gpm.spec 4 Jun 2008 12:06:10 -0000 1.61 +++ gpm.spec 17 Jul 2008 09:18:40 -0000 1.62 @@ -1,25 +1,24 @@ Summary: A mouse server for the Linux console. Name: gpm -Version: 1.20.3 -Release: 2%{?dist} +Version: 1.20.5 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz +URL: http://unix.schottelius.org/gpm/ +Source: http://unix.schottelius.org/gpm/archives/%{name}-%{version}.tar.gz Source1: gpm.init Source2: inputattach.c Patch1: gpm-1.20.1-multilib.patch Patch2: gpm-1.20.1-lib-silent.patch Patch3: gpm-1.20.3-gcc4.3.patch Patch4: gpm-1.20.3-close-fds.patch -Patch5: gpm-1.20.1-doc.patch -Patch6: gpm-1.20.1-weak-wgetch.patch - +Patch5: gpm-1.20.1-weak-wgetch.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 # this defines the library version that this package builds. -%define LIBVER 1.20.0 +%define LIBVER 2.1.0 BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: sed gawk texinfo bison ncurses-devel autoconf +BuildRequires: sed gawk texinfo bison ncurses-devel autoconf %description Gpm provides mouse support to text-based Linux applications like the @@ -47,16 +46,13 @@ %patch2 -p1 -b .lib-silent %patch3 -p1 -b .gcc4.3 %patch4 -p1 -b .close-fds -%patch5 -p1 -b .doc -%patch6 -p1 -b .weak-wgetch - +%patch5 -p1 -b .weak-wgetch %build rm -f configure rm -f src/prog/open_console.o autoconf CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS" \ - lispdir=%{buildroot}%{_datadir}/emacs/site-lisp \ %configure make gcc $RPM_OPT_FLAGS -o inputattach %{SOURCE2} @@ -64,57 +60,23 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sysconfdir} -PATH=/sbin:$PATH:/usr/sbin:$PATH +%makeinstall -mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp -%makeinstall lispdir=%{buildroot}%{_datadir}/emacs/site-lisp -install -m 755 inputattach %{buildroot}/%{_sbindir} - -%ifnarch s390 s390x -install -m644 doc/gpm-root.1 %{buildroot}%{_mandir}/man1 -install -m644 conf/gpm-root.conf %{buildroot}%{_sysconfdir} -install -s -m755 src/prog/hltest %{buildroot}%{_bindir} -%else -rm -f $RPM_BUILD_ROOT%{_bindir}/{mev,gpm-root} -%endif - -# The emacs-common package contains a newer version of this. -#cp contrib/emacs/t-mouse.el* %{buildroot}%{_datadir}/emacs/site-lisp - -{ - pushd %{buildroot} - chmod +x .%{_libdir}/libgpm.so.%{LIBVER} - ln -sf libgpm.so.%{LIBVER} .%{_libdir}/libgpm.so - /sbin/ldconfig -n .%{_libdir} - popd -} +ln -sf libgpm.so.%{LIBVER} $RPM_BUILD_ROOT/%{_libdir}/libgpm.so %ifnarch s390 s390x +mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +install -m 755 inputattach %{buildroot}%{_sbindir} +install -m 644 conf/gpm-* %{buildroot}%{_sysconfdir} install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/gpm -%endif - -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -#cat >$RPM_BUILD_ROOT/etc/sysconfig/gpm </dev/null 2>&1 +if [ "$1" = "0" ]; then + /sbin/service gpm stop >/dev/null 2>&1 /sbin/chkconfig --del gpm -%endif fi +%endif +/sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir %postun %ifnarch s390 s390x if [ "$1" -ge "1" ]; then - service gpm condrestart >/dev/null 2>&1 + /sbin/service gpm condrestart >/dev/null 2>&1 fi %endif /sbin/ldconfig %files %defattr(-,root,root) +%doc BUGS COPYING README TODO +%doc doc/README* doc/FAQ doc/Announce doc/changes/* +%{_infodir}/* +%{_libdir}/libgpm.so.* %ifnarch s390 s390x -%config %{_sysconfdir}/gpm-root.conf -%config %{_sysconfdir}/rc.d/init.d/gpm -%{_bindir}/mev -%{_bindir}/gpm-root -%{_bindir}/hltest -%{_bindir}/mouse-test -%{_bindir}/display-coords -%{_bindir}/display-buttons -%{_mandir}/man1/mev.1* -%{_mandir}/man1/gpm-root* -%{_mandir}/man7/gpm-types* -%{_mandir}/man8/gpm* -/usr/sbin/gpm -/usr/sbin/inputattach +%config(noreplace) %{_sysconfdir}/gpm-* +%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/gpm +%{_sbindir}/* +%{_bindir}/* +%{_mandir}/*/* %endif -#%{_datadir}/emacs/site-lisp/t-mouse.el* -%{_infodir}/gpm.info* -%{_libdir}/libgpm.so.* %files devel %defattr(-,root,root) @@ -174,6 +127,12 @@ %{_libdir}/libgpm.so %changelog +* Thu Jul 17 2008 Zdenek Prikryl - 1.20.5-1 +- Updated to 1.20.5 +- Removed doc patch +- Removed lisp stuff, it is part of emacs-common now +- Spec clean up + * Thu Jun 04 2008 Zdenek Prikryl - 1.20.3-2 - Enable gpm in runlevel 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 May 2008 11:51:59 -0000 1.6 +++ sources 17 Jul 2008 09:18:40 -0000 1.7 @@ -1 +1 @@ -212251312c7db0396974f25d86d4ae6c gpm-1.20.3.tar.gz +3915bdd6bf947ef867752a30b4be2387 gpm-1.20.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 09:26:33 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 17 Jul 2008 09:26:33 GMT Subject: rpms/perl-FileHandle-Unget/devel .cvsignore, 1.2, 1.3 perl-FileHandle-Unget.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200807170926.m6H9QXLq027263@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-FileHandle-Unget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27174 Modified Files: .cvsignore perl-FileHandle-Unget.spec sources Log Message: * Thu Jul 17 2008 Paul Howarth 0.1622-1 - Update to 0.1622 - BuildRequire perl(Test::More) - Unget.pm permissions no longer need fixing Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-FileHandle-Unget/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Oct 2005 14:47:48 -0000 1.2 +++ .cvsignore 17 Jul 2008 09:25:38 -0000 1.3 @@ -1 +1 @@ -FileHandle-Unget-0.1621.tar.gz +FileHandle-Unget-0.1622.tar.gz Index: perl-FileHandle-Unget.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-FileHandle-Unget/devel/perl-FileHandle-Unget.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-FileHandle-Unget.spec 8 Feb 2008 01:09:31 -0000 1.7 +++ perl-FileHandle-Unget.spec 17 Jul 2008 09:25:38 -0000 1.8 @@ -6,17 +6,17 @@ Summary: A FileHandle that supports ungetting of multiple bytes Name: perl-FileHandle-Unget -Version: 0.1621 -Release: 6%{?dist} +Version: 0.1622 +Release: 1%{?dist} License: GPL+ Group: Development/Libraries -Url: http://search.cpan.org/dist/FileHandle-Unget +Url: http://search.cpan.org/dist/FileHandle-Unget/ Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCOPPIT/FileHandle-Unget-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Scalar::Util) >= 1.14 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More) %description FileHandle::Unget is a drop-in replacement for FileHandle that allows more @@ -27,9 +27,6 @@ %prep %setup -q -n FileHandle-Unget-%{version} -# Permissions wrong in tarball -%{__chmod} -x lib/FileHandle/Unget.pm - %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -54,6 +51,11 @@ %{_mandir}/man3/FileHandle::Unget.3pm* %changelog +* Thu Jul 17 2008 Paul Howarth 0.1622-1 +- Update to 0.1622 +- BuildRequire perl(Test::More) +- Unget.pm permissions no longer need fixing + * Thu Feb 7 2008 Tom "spot" Callaway 0.1621-6 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-FileHandle-Unget/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Oct 2005 14:47:48 -0000 1.2 +++ sources 17 Jul 2008 09:25:38 -0000 1.3 @@ -1 +1 @@ -610a63b10ad5c9917b6f0594745bba4c FileHandle-Unget-0.1621.tar.gz +14c708f99adc22256a7b2566bf5c649f FileHandle-Unget-0.1622.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 09:32:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Henrik_Nordstr=C3=B6m?= (hno)) Date: Thu, 17 Jul 2008 09:32:41 GMT Subject: rpms/tunctl/devel tunctl.spec,1.2,1.3 Message-ID: <200807170932.m6H9WfRq028076@cvs-int.fedora.redhat.com> Author: hno Update of /cvs/pkgs/rpms/tunctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27991 Modified Files: tunctl.spec Log Message: Update spec file to match existing practices and style Index: tunctl.spec =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/devel/tunctl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tunctl.spec 16 Jul 2008 19:30:14 -0000 1.2 +++ tunctl.spec 17 Jul 2008 09:31:56 -0000 1.3 @@ -12,15 +12,19 @@ BuildRequires: docbook-utils %description -tunctl is a tool to set up and maintain persistent TUN/TAP network interfaces, enabling user applications access to the wire side of a virtual nework interface. Such interfaces is useful for connecting VPN software, virtualization, emulation and a number of other similar applications to the network stack. +tunctl is a tool to set up and maintain persistent TUN/TAP network +interfaces, enabling user applications access to the wire side of a +virtual nework interface. Such interfaces is useful for connecting VPN +software, virtualization, emulation and a number of other similar +applications to the network stack. tunctl originates from the User Mode Linux project. %prep -%setup +%setup -q %build -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Thu Jul 17 09:33:24 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Thu, 17 Jul 2008 09:33:24 GMT Subject: rpms/gpm/devel gpm-1.20.1-lib-silent.patch,1.1,1.2 Message-ID: <200807170933.m6H9XOfS028140@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/gpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28038 Modified Files: gpm-1.20.1-lib-silent.patch Log Message: Make patch applicable with --fuzz=0 gpm-1.20.1-lib-silent.patch: Index: gpm-1.20.1-lib-silent.patch =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/gpm-1.20.1-lib-silent.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpm-1.20.1-lib-silent.patch 18 Jan 2006 12:07:55 -0000 1.1 +++ gpm-1.20.1-lib-silent.patch 17 Jul 2008 09:32:32 -0000 1.2 @@ -15,5 +15,5 @@ + return; + char *string = NULL; + int log_level; va_list ap; - va_start(ap,text); From fedora-extras-commits at redhat.com Thu Jul 17 09:47:32 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Thu, 17 Jul 2008 09:47:32 GMT Subject: rpms/gpm/devel gpm-1.20.5-close-fds.patch, NONE, 1.1 gpm.spec, 1.62, 1.63 Message-ID: <200807170947.m6H9lWSK028867@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/gpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28746 Modified Files: gpm.spec Added Files: gpm-1.20.5-close-fds.patch Log Message: Rediff gpm-1.20.5-close-fds.patch: --- NEW FILE gpm-1.20.5-close-fds.patch --- --- gpm-1.20.5/src/daemon/startup.c.close-fds 2008-07-17 11:39:55.000000000 +0200 +++ gpm-1.20.5/src/daemon/startup.c 2008-07-17 11:40:20.000000000 +0200 @@ -135,6 +135,11 @@ void startup(int argc, char **argv) check_uniqueness(); gpm_report(GPM_PR_INFO,GPM_MESS_STARTED); + // close extra fds + close(0); + close(1); + close(2); + //return mouse_table[1].fd; /* the second is handled in the main() */ /****************** OLD CODE from gpn.c END ***********************/ Index: gpm.spec =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gpm.spec 17 Jul 2008 09:18:40 -0000 1.62 +++ gpm.spec 17 Jul 2008 09:46:43 -0000 1.63 @@ -11,7 +11,7 @@ Patch1: gpm-1.20.1-multilib.patch Patch2: gpm-1.20.1-lib-silent.patch Patch3: gpm-1.20.3-gcc4.3.patch -Patch4: gpm-1.20.3-close-fds.patch +Patch4: gpm-1.20.5-close-fds.patch Patch5: gpm-1.20.1-weak-wgetch.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 From fedora-extras-commits at redhat.com Thu Jul 17 09:48:25 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Thu, 17 Jul 2008 09:48:25 GMT Subject: rpms/gpm/devel gpm-1.20.3-close-fds.patch,1.1,NONE Message-ID: <200807170948.m6H9mPcW028937@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/gpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28918/devel Removed Files: gpm-1.20.3-close-fds.patch Log Message: Rediff --- gpm-1.20.3-close-fds.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 09:51:41 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 17 Jul 2008 09:51:41 GMT Subject: rpms/rhythmbox/F-9 .cvsignore, 1.34, 1.35 rhythmbox.spec, 1.191, 1.192 sources, 1.36, 1.37 rb-gvfs-cdda-activation.patch, 1.1, NONE rb-magnatune-use-ogg.patch, 1.1, NONE rb-soup_encode_uri-changes.patch, 1.2, NONE rhythmbox-0.11.3-force-python-thread-init.patch, 1.1, NONE rhythmbox-0.11.4-source-unref-crasher.patch, 1.1, NONE rhythmbox-0.11.5-amazon-ecs.patch, 1.1, NONE rhythmbox-0.11.5-clean-ipod-crash.patch, 1.1, NONE rhythmbox-0.11.5-force-podcast-parsing.patch, 1.1, NONE rhythmbox-0.11.5-xfade-deadlock.patch, 1.2, NONE Message-ID: <200807170951.m6H9pfUx029216@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29153 Modified Files: .cvsignore rhythmbox.spec sources Removed Files: rb-gvfs-cdda-activation.patch rb-magnatune-use-ogg.patch rb-soup_encode_uri-changes.patch rhythmbox-0.11.3-force-python-thread-init.patch rhythmbox-0.11.4-source-unref-crasher.patch rhythmbox-0.11.5-amazon-ecs.patch rhythmbox-0.11.5-clean-ipod-crash.patch rhythmbox-0.11.5-force-podcast-parsing.patch rhythmbox-0.11.5-xfade-deadlock.patch Log Message: * Thu Jul 17 2008 - Bastien Nocera - 0.11.6-1 - Update to 0.11.6 - Remove loads of upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/F-9/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 17 Mar 2008 02:05:30 -0000 1.34 +++ .cvsignore 17 Jul 2008 09:50:52 -0000 1.35 @@ -1 +1 @@ -rhythmbox-0.11.5.tar.bz2 +rhythmbox-0.11.6.tar.bz2 Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/F-9/rhythmbox.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- rhythmbox.spec 16 Jun 2008 10:39:29 -0000 1.191 +++ rhythmbox.spec 17 Jul 2008 09:50:52 -0000 1.192 @@ -2,8 +2,8 @@ Name: rhythmbox Summary: Music Management Application -Version: 0.11.5 -Release: 13%{?dist} +Version: 0.11.6 +Release: 1%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -46,36 +46,16 @@ BuildRequires: lirc-devel BuildRequires: libmtp-devel BuildRequires: gstreamer-python -BuildRequires: perl(XML::Parser) +BuildRequires: perl(XML::Parser) intltool BuildRequires: xulrunner-devel ExcludeArch: s390 s390x # https://bugzilla.redhat.com/show_bug.cgi?id=428034 Patch0: rb-disable-power-plugin-by-default.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=499208 -Patch1: rhythmbox-0.11.3-force-python-thread-init.patch -Patch2: rhythmbox-0.11.4-source-unref-crasher.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=509701#c33 -Patch3: rb-soup_encode_uri-changes.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=524967 -Patch4: rhythmbox-0.11.5-force-podcast-parsing.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=526139 -# https://bugzilla.redhat.com/show_bug.cgi?id=440489 -Patch5: rb-gvfs-cdda-activation.patch # http://bugzilla.gnome.org/show_bug.cgi?id=374078 # https://bugzilla.redhat.com/show_bug.cgi?id=440668 -Patch6: rhythmbox-0.11.5-ipod-vfat.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=512226 -Patch7: rhythmbox-0.11.5-xfade-deadlock.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=513851 -Patch8: rhythmbox-0.11.5-amazon-ecs.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=445160 -# http://bugzilla.gnome.org/show_bug.cgi?id=397097 -Patch9: rb-magnatune-use-ogg.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=451547 -# http://bugzilla.gnome.org/show_bug.cgi?id=524985 -Patch10: rhythmbox-0.11.5-clean-ipod-crash.patch +Patch1: rhythmbox-0.11.5-ipod-vfat.patch %description Rhythmbox is an integrated music management application based on the powerful @@ -105,16 +85,7 @@ %setup -q %patch0 -p0 -b .dont-disable-suspend -%patch1 -p1 -b .python-threading -%patch2 -p0 -b .source-unref-crasher -%patch3 -p1 -b .soup-2.4 -%patch4 -p0 -b .force-podcast -%patch5 -p0 -b .cdda-activation -%patch6 -p0 -b .ipod-vfat -%patch7 -p1 -b .xfade-deadlock -%patch8 -p1 -b .amazon-ecs -%patch9 -p1 -b .magnatune-ogg -%patch10 -p1 -b .clean-ipod +%patch1 -p0 -b .ipod-vfat %build # work around a gstreamer bug @@ -217,6 +188,7 @@ %{_libdir}/rhythmbox/plugins/rb/ %{_libdir}/rhythmbox/plugins/visualizer/ %{_libdir}/rhythmbox/plugins/fmradio/ +%{_libdir}/rhythmbox/plugins/dontreallyclose/ %{_libexecdir}/rhythmbox-metadata %files lirc @@ -228,6 +200,10 @@ %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Thu Jul 17 2008 - Bastien Nocera - 0.11.6-1 +- Update to 0.11.6 +- Remove loads of upstreamed patches + * Mon Jun 16 2008 - Bastien Nocera - 0.11.5-13 - Avoid crash on new iPods (#451547) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/F-9/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 17 Mar 2008 02:05:30 -0000 1.36 +++ sources 17 Jul 2008 09:50:52 -0000 1.37 @@ -1 +1 @@ -967440dd984ec724e7e7992d5bd57bbd rhythmbox-0.11.5.tar.bz2 +b827e047d13954ba956c3c4ea940935e rhythmbox-0.11.6.tar.bz2 --- rb-gvfs-cdda-activation.patch DELETED --- --- rb-magnatune-use-ogg.patch DELETED --- --- rb-soup_encode_uri-changes.patch DELETED --- --- rhythmbox-0.11.3-force-python-thread-init.patch DELETED --- --- rhythmbox-0.11.4-source-unref-crasher.patch DELETED --- --- rhythmbox-0.11.5-amazon-ecs.patch DELETED --- --- rhythmbox-0.11.5-clean-ipod-crash.patch DELETED --- --- rhythmbox-0.11.5-force-podcast-parsing.patch DELETED --- --- rhythmbox-0.11.5-xfade-deadlock.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 10:16:43 2008 From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk)) Date: Thu, 17 Jul 2008 10:16:43 GMT Subject: rpms/device-mapper/devel device-mapper.1.02.26.tgz.asc,1.1,NONE Message-ID: <200807171016.m6HAGh54004746@cvs-int.fedora.redhat.com> Author: agk Update of /cvs/pkgs/rpms/device-mapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4708 Removed Files: device-mapper.1.02.26.tgz.asc Log Message: remove unused file --- device-mapper.1.02.26.tgz.asc DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 10:24:41 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Thu, 17 Jul 2008 10:24:41 GMT Subject: rpms/gpm/devel gpm-1.20.5-ac_package_version.patch, NONE, 1.1 gpm.spec, 1.63, 1.64 Message-ID: <200807171024.m6HAOfCs005487@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/gpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292 Modified Files: gpm.spec Added Files: gpm-1.20.5-ac_package_version.patch Log Message: Fixes generation of configure gpm-1.20.5-ac_package_version.patch: --- NEW FILE gpm-1.20.5-ac_package_version.patch --- --- gpm-1.20.5/configure.ac.ac_package_version 2008-07-17 12:19:09.000000000 +0200 +++ gpm-1.20.5/configure.ac 2008-07-17 12:19:17.000000000 +0200 @@ -142,7 +142,6 @@ AC_SUBST(SOLDFLAGS) AC_SUBST(CURSES_OBJS) AC_SUBST(SHARED_LIBS) AC_SUBST(lispdir) -AC_SUBST(AC_PACKAGE_VERSION) AC_SUBST(release) AC_SUBST(release_date) Index: gpm.spec =================================================================== RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- gpm.spec 17 Jul 2008 09:46:43 -0000 1.63 +++ gpm.spec 17 Jul 2008 10:23:47 -0000 1.64 @@ -13,6 +13,7 @@ Patch3: gpm-1.20.3-gcc4.3.patch Patch4: gpm-1.20.5-close-fds.patch Patch5: gpm-1.20.1-weak-wgetch.patch +Patch6: gpm-1.20.5-ac_package_version.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 # this defines the library version that this package builds. @@ -47,6 +48,7 @@ %patch3 -p1 -b .gcc4.3 %patch4 -p1 -b .close-fds %patch5 -p1 -b .weak-wgetch +%patch6 -p1 -b .ac_package_version %build rm -f configure From fedora-extras-commits at redhat.com Thu Jul 17 10:52:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 10:52:26 +0000 Subject: [pkgdb] libdrm: atkac has requested commit Message-ID: <200807171052.m6HAqQQJ000869@bastion.fedora.phx.redhat.com> Adam Tkac (atkac) has requested the commit acl on libdrm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libdrm From fedora-extras-commits at redhat.com Thu Jul 17 10:59:06 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Thu, 17 Jul 2008 10:59:06 GMT Subject: rpms/speech-dispatcher/devel import.log, 1.4, 1.5 speech-dispatcher.spec, 1.4, 1.5 Message-ID: <200807171059.m6HAx6YC008143@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7995/devel Modified Files: import.log speech-dispatcher.spec Log Message: setuid premissions for speech-dispatcher binary Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 16 Jul 2008 04:13:22 -0000 1.4 +++ import.log 17 Jul 2008 10:58:19 -0000 1.5 @@ -2,3 +2,4 @@ speech-dispatcher-0_6_6-14_fc7:HEAD:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215968885 speech-dispatcher-0_6_6-14_fc7:HEAD:speech-dispatcher-0.6.6-14.fc7.src.rpm:1216180922 speech-dispatcher-0_6_6-16_fc7:HEAD:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181531 +speech-dispatcher-0_6_6-17_fc7:HEAD:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292151 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speech-dispatcher.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- speech-dispatcher.spec 16 Jul 2008 04:13:22 -0000 1.4 +++ speech-dispatcher.spec 17 Jul 2008 10:58:19 -0000 1.5 @@ -1,16 +1,18 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %if 0%{?olpc} - %define with_nas 0 + %define with_nas 0 %define with_pulse 0 + %define with_flite 0 %else - %define with_nas 1 + %define with_nas 1 %define with_pulse 1 + %define with_flite 1 %endif Name: speech-dispatcher Version: 0.6.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -30,7 +32,10 @@ BuildRequires: python-setuptools %endif +%if %{with_flite} BuildRequires: flite-devel +%endif + BuildRequires: espeak-devel %if %{with_nas} @@ -101,7 +106,7 @@ Build options: nas support : %{with_nas} pulse support : %{with_pulse} - +flite support : %{with_flite} Dist Status: olpc : %{?olpc} fedora : %{?fedora} @@ -133,17 +138,22 @@ cd ../../ for dir in \ - config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ - do - pushd $dir - make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - popd + config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ + do + pushd $dir + make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + popd done - #Install the init shell script mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ + +# We need to include the OLPC specific init script which starts the daemon +# and uses the configuration files in /home/olpc/.speech-settings + +%if 1%{?olpc} + install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ +%endif #Rename certain generically named binaries @@ -156,31 +166,60 @@ cd ../../ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# Now move the files, change ownerships, apply setuid settings incase build is for +# olpc. + +%if 0%{?olpc} + #Setuid for speech-dispatcher binary + chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher + #Move the speech-dispatcher configuration files to olpc writable location. + mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd + mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd +%endif + %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/chkconfig --add speech-dispatcherd + +%if 1%{?olpc} + /sbin/chkconfig --add speech-dispatcherd +%endif %postun /sbin/ldconfig -if [ "$1" -ge "1" ] ; then -/sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : -fi + +%if 1%{?olpc} + if [ "$1" -ge "1" ] ; then + /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : + fi +%endif %preun +%if 1%{?olpc} if [ $1 = 0 ] ; then -/sbin/service speech-dispatcherd stop >/dev/null 2>&1 -/sbin/chkconfig --del speech-dispatcherd + /sbin/service speech-dispatcherd stop >/dev/null 2>&1 + /sbin/chkconfig --del speech-dispatcherd fi +%endif %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS README TODO COPYING +%if 0%{?olpc} +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules + +%else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf @@ -188,11 +227,10 @@ %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients %dir %{_sysconfdir}/speech-dispatcher/modules - +%endif %{_bindir}/* - %{_libdir}/speech-dispatcher-modules/sd_* %dir %{_libdir}/speech-dispatcher-modules @@ -204,8 +242,9 @@ %dir %{_libdir}/speech-dispatcher - -%attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%if 1%{?olpc} + %attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%endif %files devel %defattr(-,root,root,-) @@ -226,10 +265,10 @@ %preun doc if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : fi @@ -246,6 +285,13 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-17 + +- changing permissions of speech-dispatcher to 6711 (setuid and setguid) +- relocating configuration files in case of OLPC branch. +- excluding init script in case of OLPC branch. + + * Wed Jul 16 2008 Hemant Goyal 0.6.6-16 - yet another release bump required :-/ From fedora-extras-commits at redhat.com Thu Jul 17 10:59:27 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Thu, 17 Jul 2008 10:59:27 GMT Subject: rpms/speech-dispatcher/F-8 import.log, 1.3, 1.4 speech-dispatcher.spec, 1.2, 1.3 Message-ID: <200807171059.m6HAxRQf008208@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8000/F-8 Modified Files: import.log speech-dispatcher.spec Log Message: setuid premissions for speech-dispatcher binary Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-8/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 16 Jul 2008 04:20:50 -0000 1.3 +++ import.log 17 Jul 2008 10:58:32 -0000 1.4 @@ -1,3 +1,4 @@ speech-dispatcher-0_6_6-13_fc7:HEAD:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288030 speech-dispatcher-0_6_6-13_fc7:F-8:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214550322 speech-dispatcher-0_6_6-16_fc7:F-8:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181955 +speech-dispatcher-0_6_6-17_fc7:F-8:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292193 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-8/speech-dispatcher.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- speech-dispatcher.spec 16 Jul 2008 04:20:50 -0000 1.2 +++ speech-dispatcher.spec 17 Jul 2008 10:58:32 -0000 1.3 @@ -1,16 +1,18 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %if 0%{?olpc} - %define with_nas 0 + %define with_nas 0 %define with_pulse 0 + %define with_flite 0 %else - %define with_nas 1 + %define with_nas 1 %define with_pulse 1 + %define with_flite 1 %endif Name: speech-dispatcher Version: 0.6.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -30,7 +32,10 @@ BuildRequires: python-setuptools %endif +%if %{with_flite} BuildRequires: flite-devel +%endif + BuildRequires: espeak-devel %if %{with_nas} @@ -101,7 +106,7 @@ Build options: nas support : %{with_nas} pulse support : %{with_pulse} - +flite support : %{with_flite} Dist Status: olpc : %{?olpc} fedora : %{?fedora} @@ -133,17 +138,22 @@ cd ../../ for dir in \ - config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ - do - pushd $dir - make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - popd + config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ + do + pushd $dir + make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + popd done - #Install the init shell script mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ + +# We need to include the OLPC specific init script which starts the daemon +# and uses the configuration files in /home/olpc/.speech-settings + +%if 1%{?olpc} + install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ +%endif #Rename certain generically named binaries @@ -156,31 +166,60 @@ cd ../../ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# Now move the files, change ownerships, apply setuid settings incase build is for +# olpc. + +%if 0%{?olpc} + #Setuid for speech-dispatcher binary + chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher + #Move the speech-dispatcher configuration files to olpc writable location. + mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd + mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd +%endif + %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/chkconfig --add speech-dispatcherd + +%if 1%{?olpc} + /sbin/chkconfig --add speech-dispatcherd +%endif %postun /sbin/ldconfig -if [ "$1" -ge "1" ] ; then -/sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : -fi + +%if 1%{?olpc} + if [ "$1" -ge "1" ] ; then + /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : + fi +%endif %preun +%if 1%{?olpc} if [ $1 = 0 ] ; then -/sbin/service speech-dispatcherd stop >/dev/null 2>&1 -/sbin/chkconfig --del speech-dispatcherd + /sbin/service speech-dispatcherd stop >/dev/null 2>&1 + /sbin/chkconfig --del speech-dispatcherd fi +%endif %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS README TODO COPYING +%if 0%{?olpc} +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules + +%else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf @@ -188,11 +227,10 @@ %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients %dir %{_sysconfdir}/speech-dispatcher/modules - +%endif %{_bindir}/* - %{_libdir}/speech-dispatcher-modules/sd_* %dir %{_libdir}/speech-dispatcher-modules @@ -204,8 +242,9 @@ %dir %{_libdir}/speech-dispatcher - -%attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%if 1%{?olpc} + %attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%endif %files devel %defattr(-,root,root,-) @@ -226,10 +265,10 @@ %preun doc if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : fi @@ -246,6 +285,13 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-17 + +- changing permissions of speech-dispatcher to 6711 (setuid and setguid) +- relocating configuration files in case of OLPC branch. +- excluding init script in case of OLPC branch. + + * Wed Jul 16 2008 Hemant Goyal 0.6.6-16 - yet another release bump required :-/ From fedora-extras-commits at redhat.com Thu Jul 17 10:59:32 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Thu, 17 Jul 2008 10:59:32 GMT Subject: rpms/speech-dispatcher/F-9 import.log, 1.4, 1.5 speech-dispatcher.spec, 1.3, 1.4 Message-ID: <200807171059.m6HAxWpr008215@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8003/F-9 Modified Files: import.log speech-dispatcher.spec Log Message: setuid premissions for speech-dispatcher binary Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-9/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 16 Jul 2008 04:17:30 -0000 1.4 +++ import.log 17 Jul 2008 10:58:39 -0000 1.5 @@ -2,3 +2,4 @@ speech-dispatcher-0_6_6-13_fc7:F-9:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214550669 speech-dispatcher-0_6_6-14_fc7:F-9:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215971094 speech-dispatcher-0_6_6-16_fc7:F-9:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181715 +speech-dispatcher-0_6_6-17_fc7:F-9:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292210 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-9/speech-dispatcher.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- speech-dispatcher.spec 16 Jul 2008 04:17:30 -0000 1.3 +++ speech-dispatcher.spec 17 Jul 2008 10:58:39 -0000 1.4 @@ -1,16 +1,18 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %if 0%{?olpc} - %define with_nas 0 + %define with_nas 0 %define with_pulse 0 + %define with_flite 0 %else - %define with_nas 1 + %define with_nas 1 %define with_pulse 1 + %define with_flite 1 %endif Name: speech-dispatcher Version: 0.6.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -30,7 +32,10 @@ BuildRequires: python-setuptools %endif +%if %{with_flite} BuildRequires: flite-devel +%endif + BuildRequires: espeak-devel %if %{with_nas} @@ -101,7 +106,7 @@ Build options: nas support : %{with_nas} pulse support : %{with_pulse} - +flite support : %{with_flite} Dist Status: olpc : %{?olpc} fedora : %{?fedora} @@ -133,17 +138,22 @@ cd ../../ for dir in \ - config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ - do - pushd $dir - make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - popd + config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ + do + pushd $dir + make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + popd done - #Install the init shell script mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ + +# We need to include the OLPC specific init script which starts the daemon +# and uses the configuration files in /home/olpc/.speech-settings + +%if 1%{?olpc} + install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ +%endif #Rename certain generically named binaries @@ -156,31 +166,60 @@ cd ../../ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# Now move the files, change ownerships, apply setuid settings incase build is for +# olpc. + +%if 0%{?olpc} + #Setuid for speech-dispatcher binary + chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher + #Move the speech-dispatcher configuration files to olpc writable location. + mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd + mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd +%endif + %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/chkconfig --add speech-dispatcherd + +%if 1%{?olpc} + /sbin/chkconfig --add speech-dispatcherd +%endif %postun /sbin/ldconfig -if [ "$1" -ge "1" ] ; then -/sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : -fi + +%if 1%{?olpc} + if [ "$1" -ge "1" ] ; then + /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : + fi +%endif %preun +%if 1%{?olpc} if [ $1 = 0 ] ; then -/sbin/service speech-dispatcherd stop >/dev/null 2>&1 -/sbin/chkconfig --del speech-dispatcherd + /sbin/service speech-dispatcherd stop >/dev/null 2>&1 + /sbin/chkconfig --del speech-dispatcherd fi +%endif %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS README TODO COPYING +%if 0%{?olpc} +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules + +%else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf @@ -188,11 +227,10 @@ %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients %dir %{_sysconfdir}/speech-dispatcher/modules - +%endif %{_bindir}/* - %{_libdir}/speech-dispatcher-modules/sd_* %dir %{_libdir}/speech-dispatcher-modules @@ -204,8 +242,9 @@ %dir %{_libdir}/speech-dispatcher - -%attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%if 1%{?olpc} + %attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%endif %files devel %defattr(-,root,root,-) @@ -226,10 +265,10 @@ %preun doc if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : fi @@ -246,6 +285,13 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-17 + +- changing permissions of speech-dispatcher to 6711 (setuid and setguid) +- relocating configuration files in case of OLPC branch. +- excluding init script in case of OLPC branch. + + * Wed Jul 16 2008 Hemant Goyal 0.6.6-16 - yet another release bump required :-/ From fedora-extras-commits at redhat.com Thu Jul 17 11:10:51 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 17 Jul 2008 11:10:51 GMT Subject: rpms/ds9/EL-5 ds9-tkcon.patch, 1.2, 1.3 ds9.README.fedora, 1.2, 1.3 ds9.spec, 1.14, 1.15 ds9-gcc43.patch, 1.3, NONE ds9-tcl85.patch, 1.2, NONE Message-ID: <200807171110.m6HBApBT015830@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/ds9/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15659 Modified Files: ds9.spec Added Files: ds9-tkcon.patch ds9.README.fedora Removed Files: ds9-gcc43.patch ds9-tcl85.patch Log Message: Importing from F-8 ds9-tkcon.patch: Index: ds9-tkcon.patch =================================================================== RCS file: ds9-tkcon.patch diff -N ds9-tkcon.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ds9-tkcon.patch 17 Jul 2008 11:10:03 -0000 1.3 @@ -0,0 +1,33 @@ +diff -ur saods9/src/ds9.tcl saods9.tkcon/src/ds9.tcl +--- saods9/src/ds9.tcl 2008-05-30 09:11:53.000000000 +0200 ++++ saods9.tkcon/src/ds9.tcl 2008-05-30 09:13:57.000000000 +0200 +@@ -82,7 +82,7 @@ + package require textutil::repeat + package require textutil::tabify + +- package require tkcon ++# package require tkcon + + package require BLT + package require Tktable +diff -ur saods9/src/mfile.tcl saods9.tkcon/src/mfile.tcl +--- saods9/src/mfile.tcl 2008-04-01 23:41:09.000000000 +0200 ++++ saods9.tkcon/src/mfile.tcl 2008-05-30 09:13:24.000000000 +0200 +@@ -40,7 +40,7 @@ + $ds9(mb).file add separator + $ds9(mb).file add command -label "[msgcat::mc {XPA Information}]..." \ + -command DisplayXPAInfo +- $ds9(mb).file add command -label "[msgcat::mc {Open TCL Console}]..." \ ++# $ds9(mb).file add command -label "[msgcat::mc {Open TCL Console}]..." \ + -command OpenConsole + $ds9(mb).file add command -label "[msgcat::mc {Source TCL}]..." \ + -command OpenSource +@@ -238,7 +238,7 @@ + $m add separator + $m add checkbutton -label "[msgcat::mc {XPA Information}]..." \ + -variable buttons(file,xpa) -command {UpdateButtons buttons(file)} +- $m add checkbutton -label "[msgcat::mc {Open TCL Console}]..." \ ++# $m add checkbutton -label "[msgcat::mc {Open TCL Console}]..." \ + -variable buttons(file,console) -command {UpdateButtons buttons(file)} + $m add checkbutton -label "[msgcat::mc {Source TCL}]..." \ + -variable buttons(file,tcl) -command {UpdateButtons buttons(file)} Index: ds9.README.fedora =================================================================== RCS file: ds9.README.fedora diff -N ds9.README.fedora --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ds9.README.fedora 17 Jul 2008 11:10:03 -0000 1.3 @@ -0,0 +1 @@ +Version 5.2 of fedora ds9 doesn't include tkcon. Version 2.5 of tkcon is required and only 2.4 is included currently in fedora Index: ds9.spec =================================================================== RCS file: /cvs/pkgs/rpms/ds9/EL-5/ds9.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ds9.spec 12 Jun 2008 04:35:48 -0000 1.14 +++ ds9.spec 17 Jul 2008 11:10:03 -0000 1.15 @@ -1,6 +1,6 @@ Name: ds9 Version: 5.2 -Release: 4%{?dist} +Release: 3%{?dist} Summary: Astronomical Data Visualization Application Group: Applications/Engineering @@ -9,6 +9,7 @@ Source0: http://hea-www.harvard.edu/RD/ds9/%{name}.%{version}.tar.gz Source1: ds9.desktop Source2: ds9.make.fedora +Source3: ds9.README.fedora Patch0: ds9-main.patch Patch1: ds9-fitsy.patch Patch2: ds9-frame.patch @@ -16,9 +17,8 @@ Patch4: ds9-mastermake.patch Patch5: ds9-saotk.patch Patch6: ds9-src.patch -Patch7: ds9-tcl85.patch -Patch8: ds9-gcc43.patch -Patch9: ds9-notags.patch +Patch7: ds9-tkcon.patch +Patch8: ds9-notags.patch Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -27,7 +27,7 @@ BuildRequires: desktop-file-utils -Requires: tcllib tktable tkimg xpa-tcl tkcon >= 2.5 +Requires: tcllib tktable tkimg xpa-tcl %description SAOImage DS9 is an astronomical imaging and data visualization application. @@ -47,13 +47,14 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 + %build %{__cp} %{SOURCE2} make.include echo LIBDIR="%{_libdir}" >> make.include echo OPTS="%{optflags}" >> make.include %{__make} %{_smp_mflags} +%{__cp} %{SOURCE3} README.fedora %install %{__rm} -fr %{buildroot} @@ -76,7 +77,7 @@ %{__rm} -fr %{buildroot} %files -%doc COPYING copyright +%doc COPYING copyright README.fedora %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/applications/* @@ -92,12 +93,10 @@ %changelog -* Wed Jun 11 2008 Sergio Pascual - 5.2-4 +* Sat Jun 28 2008 Sergio Pascual - 5.2-3 +- Tkcon support removed - Removing dependency in etags -* Wed Jun 11 2008 Sergio Pascual - 5.2-3 -- Using tkcon - * Fri May 30 2008 Sergio Pascual - 5.2-2 - Updated gcc 4.3 patch --- ds9-gcc43.patch DELETED --- --- ds9-tcl85.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 11:10:58 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Thu, 17 Jul 2008 11:10:58 GMT Subject: rpms/speech-dispatcher/OLPC-2 import.log, 1.4, 1.5 speech-dispatcher.spec, 1.4, 1.5 Message-ID: <200807171110.m6HBAw5T015860@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15476/OLPC-2 Modified Files: import.log speech-dispatcher.spec Log Message: setuid premissions for speech-dispatcher binary Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 16 Jul 2008 04:28:50 -0000 1.4 +++ import.log 17 Jul 2008 11:10:07 -0000 1.5 @@ -2,3 +2,4 @@ speech-dispatcher-0_6_6-14_fc7:OLPC-2:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215969412 speech-dispatcher-0_6_6-15_fc7:OLPC-2:speech-dispatcher-0.6.6-15.fc7.src.rpm:1216053499 speech-dispatcher-0_6_6-16_fc7:OLPC-2:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216182135 +speech-dispatcher-0_6_6-17_fc7:OLPC-2:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292819 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/speech-dispatcher.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- speech-dispatcher.spec 16 Jul 2008 04:28:50 -0000 1.4 +++ speech-dispatcher.spec 17 Jul 2008 11:10:07 -0000 1.5 @@ -1,16 +1,18 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %if 0%{?olpc} - %define with_nas 0 + %define with_nas 0 %define with_pulse 0 + %define with_flite 0 %else - %define with_nas 1 + %define with_nas 1 %define with_pulse 1 + %define with_flite 1 %endif Name: speech-dispatcher Version: 0.6.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -30,7 +32,10 @@ BuildRequires: python-setuptools %endif +%if %{with_flite} BuildRequires: flite-devel +%endif + BuildRequires: espeak-devel %if %{with_nas} @@ -101,7 +106,7 @@ Build options: nas support : %{with_nas} pulse support : %{with_pulse} - +flite support : %{with_flite} Dist Status: olpc : %{?olpc} fedora : %{?fedora} @@ -133,17 +138,22 @@ cd ../../ for dir in \ - config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ - do - pushd $dir - make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - popd + config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ + do + pushd $dir + make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + popd done - #Install the init shell script mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ + +# We need to include the OLPC specific init script which starts the daemon +# and uses the configuration files in /home/olpc/.speech-settings + +%if 1%{?olpc} + install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ +%endif #Rename certain generically named binaries @@ -156,31 +166,60 @@ cd ../../ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# Now move the files, change ownerships, apply setuid settings incase build is for +# olpc. + +%if 0%{?olpc} + #Setuid for speech-dispatcher binary + chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher + #Move the speech-dispatcher configuration files to olpc writable location. + mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd + mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd +%endif + %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/chkconfig --add speech-dispatcherd + +%if 1%{?olpc} + /sbin/chkconfig --add speech-dispatcherd +%endif %postun /sbin/ldconfig -if [ "$1" -ge "1" ] ; then -/sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : -fi + +%if 1%{?olpc} + if [ "$1" -ge "1" ] ; then + /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : + fi +%endif %preun +%if 1%{?olpc} if [ $1 = 0 ] ; then -/sbin/service speech-dispatcherd stop >/dev/null 2>&1 -/sbin/chkconfig --del speech-dispatcherd + /sbin/service speech-dispatcherd stop >/dev/null 2>&1 + /sbin/chkconfig --del speech-dispatcherd fi +%endif %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS README TODO COPYING +%if 0%{?olpc} +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules + +%else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf @@ -188,11 +227,10 @@ %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients %dir %{_sysconfdir}/speech-dispatcher/modules - +%endif %{_bindir}/* - %{_libdir}/speech-dispatcher-modules/sd_* %dir %{_libdir}/speech-dispatcher-modules @@ -204,8 +242,9 @@ %dir %{_libdir}/speech-dispatcher - -%attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%if 1%{?olpc} + %attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%endif %files devel %defattr(-,root,root,-) @@ -226,10 +265,10 @@ %preun doc if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : fi @@ -246,6 +285,13 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-17 + +- changing permissions of speech-dispatcher to 6711 (setuid and setguid) +- relocating configuration files in case of OLPC branch. +- excluding init script in case of OLPC branch. + + * Wed Jul 16 2008 Hemant Goyal 0.6.6-16 - yet another release bump required :-/ From fedora-extras-commits at redhat.com Thu Jul 17 11:11:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Thu, 17 Jul 2008 11:11:03 GMT Subject: rpms/tellico/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 tellico.spec, 1.29, 1.30 Message-ID: <200807171111.m6HBB3KO015871@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/tellico/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15679 Modified Files: .cvsignore sources tellico.spec Log Message: * Thu Jul 17 2008 Jos?? Matos - 1.3.3-1 - update to 1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 26 May 2008 06:57:48 -0000 1.14 +++ .cvsignore 17 Jul 2008 11:10:06 -0000 1.15 @@ -1 +1 @@ -tellico-1.3.2.1.tar.gz +tellico-1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 26 May 2008 06:57:48 -0000 1.14 +++ sources 17 Jul 2008 11:10:06 -0000 1.15 @@ -1 +1 @@ -388e2f5495deed57ea20a660c8e20588 tellico-1.3.2.1.tar.gz +6e08c3f96c5b2ca871b83dbaca41b2ae tellico-1.3.3.tar.gz Index: tellico.spec =================================================================== RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- tellico.spec 26 May 2008 06:57:48 -0000 1.29 +++ tellico.spec 17 Jul 2008 11:10:06 -0000 1.30 @@ -1,5 +1,5 @@ Name: tellico -Version: 1.3.2.1 +Version: 1.3.3 Release: 1%{?dist} Summary: A collection manager @@ -111,11 +111,14 @@ %changelog +* Thu Jul 17 2008 Jos?? Matos - 1.3.3-1 +- update to 1.3.3 + * Sun May 25 2008 Alex Lancaster - 1.3.2.1-1 - Updated to latest upstream (1.3.2.1) * Thu May 22 2008 Alex Lancaster - 1.3.1-3 -- Only kdepim3-devel if <= F-9, the KDE3 version of kdepim has been been +- Only kdepim3-devel if <= F-9, the KDE3 version of kdepim has been been removed from F-10/rawhide. * Tue May 20 2008 Alex Lancaster - 1.3.1-2 From fedora-extras-commits at redhat.com Thu Jul 17 11:11:05 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Thu, 17 Jul 2008 11:11:05 GMT Subject: rpms/speech-dispatcher/OLPC-3 import.log, 1.3, 1.4 speech-dispatcher.spec, 1.2, 1.3 Message-ID: <200807171111.m6HBB5BL015877@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470/OLPC-3 Modified Files: import.log speech-dispatcher.spec Log Message: setuid premissions for speech-dispatcher binary Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-3/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 16 Jul 2008 04:31:12 -0000 1.3 +++ import.log 17 Jul 2008 11:10:14 -0000 1.4 @@ -1,3 +1,4 @@ speech-dispatcher-0_6_6-13_fc7:HEAD:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288030 speech-dispatcher-0_6_6-13_fc7:OLPC-3:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214549430 speech-dispatcher-0_6_6-16_fc7:OLPC-3:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216182617 +speech-dispatcher-0_6_6-17_fc7:OLPC-3:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292819 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-3/speech-dispatcher.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- speech-dispatcher.spec 16 Jul 2008 04:31:12 -0000 1.2 +++ speech-dispatcher.spec 17 Jul 2008 11:10:14 -0000 1.3 @@ -1,16 +1,18 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %if 0%{?olpc} - %define with_nas 0 + %define with_nas 0 %define with_pulse 0 + %define with_flite 0 %else - %define with_nas 1 + %define with_nas 1 %define with_pulse 1 + %define with_flite 1 %endif Name: speech-dispatcher Version: 0.6.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -30,7 +32,10 @@ BuildRequires: python-setuptools %endif +%if %{with_flite} BuildRequires: flite-devel +%endif + BuildRequires: espeak-devel %if %{with_nas} @@ -101,7 +106,7 @@ Build options: nas support : %{with_nas} pulse support : %{with_pulse} - +flite support : %{with_flite} Dist Status: olpc : %{?olpc} fedora : %{?fedora} @@ -133,17 +138,22 @@ cd ../../ for dir in \ - config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ - do - pushd $dir - make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - popd + config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ + do + pushd $dir + make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + popd done - #Install the init shell script mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ + +# We need to include the OLPC specific init script which starts the daemon +# and uses the configuration files in /home/olpc/.speech-settings + +%if 1%{?olpc} + install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ +%endif #Rename certain generically named binaries @@ -156,31 +166,60 @@ cd ../../ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# Now move the files, change ownerships, apply setuid settings incase build is for +# olpc. + +%if 0%{?olpc} + #Setuid for speech-dispatcher binary + chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher + #Move the speech-dispatcher configuration files to olpc writable location. + mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd + mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd +%endif + %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/chkconfig --add speech-dispatcherd + +%if 1%{?olpc} + /sbin/chkconfig --add speech-dispatcherd +%endif %postun /sbin/ldconfig -if [ "$1" -ge "1" ] ; then -/sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : -fi + +%if 1%{?olpc} + if [ "$1" -ge "1" ] ; then + /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : + fi +%endif %preun +%if 1%{?olpc} if [ $1 = 0 ] ; then -/sbin/service speech-dispatcherd stop >/dev/null 2>&1 -/sbin/chkconfig --del speech-dispatcherd + /sbin/service speech-dispatcherd stop >/dev/null 2>&1 + /sbin/chkconfig --del speech-dispatcherd fi +%endif %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS README TODO COPYING +%if 0%{?olpc} +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules + +%else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf @@ -188,11 +227,10 @@ %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients %dir %{_sysconfdir}/speech-dispatcher/modules - +%endif %{_bindir}/* - %{_libdir}/speech-dispatcher-modules/sd_* %dir %{_libdir}/speech-dispatcher-modules @@ -204,8 +242,9 @@ %dir %{_libdir}/speech-dispatcher - -%attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%if 1%{?olpc} + %attr(0755,root,root)%{_initrddir}/speech-dispatcherd +%endif %files devel %defattr(-,root,root,-) @@ -226,10 +265,10 @@ %preun doc if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : - /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : fi @@ -246,6 +285,13 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-17 + +- changing permissions of speech-dispatcher to 6711 (setuid and setguid) +- relocating configuration files in case of OLPC branch. +- excluding init script in case of OLPC branch. + + * Wed Jul 16 2008 Hemant Goyal 0.6.6-16 - yet another release bump required :-/ From fedora-extras-commits at redhat.com Thu Jul 17 11:18:26 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Thu, 17 Jul 2008 11:18:26 GMT Subject: rpms/vnc/devel vnc-rh212985.patch,NONE,1.1 vnc.spec,1.198,1.199 Message-ID: <200807171118.m6HBIQgU016480@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16434 Modified Files: vnc.spec Added Files: vnc-rh212985.patch Log Message: - vncserver script returns error when Xvnc fails to start vnc-rh212985.patch: --- NEW FILE vnc-rh212985.patch --- diff -up vnc-4_1_2-unixsrc/unix/vncserver.rh212985 vnc-4_1_2-unixsrc/unix/vncserver --- vnc-4_1_2-unixsrc/unix/vncserver.rh212985 2008-07-16 13:55:29.000000000 +0200 +++ vnc-4_1_2-unixsrc/unix/vncserver 2008-07-16 14:17:53.000000000 +0200 @@ -168,11 +168,25 @@ $cmd .= " >> " . "edString($desktopL # Run $cmd and record the process ID. $pidFile = "$vncUserDir/$host:$displayNumber.pid"; -system("$cmd & echo \$! >$pidFile"); +system( +"rm -f $pidFile + $cmd & + PID_TEMP=\$! + PID_NUM=\$PID_TEMP + + # Give Xvnc a chance to start up + + sleep 3; + + if ps -p \$PID_NUM -o comm= | grep -q Xvnc; then + echo \$PID_NUM > $pidFile + fi" +); -# Give Xvnc a chance to start up - -sleep(3); +if (!(-e "$pidFile")) { + warn "Unable to start Xvnc, exiting\n"; + exit; +} warn "\nNew '$desktopName' desktop is $host:$displayNumber\n\n"; Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- vnc.spec 16 Jul 2008 11:40:44 -0000 1.198 +++ vnc.spec 17 Jul 2008 11:17:36 -0000 1.199 @@ -3,7 +3,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 33.1%{?dist} +Release: 34%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -46,6 +46,7 @@ Patch51: vnc-bounds.patch Patch52: vnc-includes.patch Patch53: vnc-viewerIPv6.patch +Patch54: vnc-rh212985.patch License: GPLv2 Group: User Interface/Desktops @@ -141,6 +142,7 @@ %patch51 -p1 -b .bounds %patch52 -p1 -b .includes %patch53 -p1 -b .ipv6 +%patch54 -p1 -b .rh212985 %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0" @@ -330,6 +332,9 @@ %{_libdir}/librfb.so.* %changelog +* Thu Jul 17 2008 Adam Tkac 4.1.2-34 +- vncserver script returns error when Xvnc fails to start + * Wed Jul 16 2008 Adam Tkac 4.1.2-33.1 - update patches due rpm 4.6 From fedora-extras-commits at redhat.com Thu Jul 17 11:31:55 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Thu, 17 Jul 2008 11:31:55 GMT Subject: rpms/tellico/F-9 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 tellico.spec, 1.27, 1.28 Message-ID: <200807171131.m6HBVt2d017240@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/tellico/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182 Modified Files: .cvsignore sources tellico.spec Log Message: * Thu Jul 17 2008 Jos?? Matos - 1.3.3-1 - update to 1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tellico/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 26 May 2008 07:11:45 -0000 1.14 +++ .cvsignore 17 Jul 2008 11:31:09 -0000 1.15 @@ -1 +1 @@ -tellico-1.3.2.1.tar.gz +tellico-1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tellico/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 26 May 2008 07:11:45 -0000 1.14 +++ sources 17 Jul 2008 11:31:09 -0000 1.15 @@ -1 +1 @@ -388e2f5495deed57ea20a660c8e20588 tellico-1.3.2.1.tar.gz +6e08c3f96c5b2ca871b83dbaca41b2ae tellico-1.3.3.tar.gz Index: tellico.spec =================================================================== RCS file: /cvs/pkgs/rpms/tellico/F-9/tellico.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tellico.spec 26 May 2008 07:11:45 -0000 1.27 +++ tellico.spec 17 Jul 2008 11:31:09 -0000 1.28 @@ -1,5 +1,5 @@ Name: tellico -Version: 1.3.2.1 +Version: 1.3.3 Release: 1%{?dist} Summary: A collection manager @@ -111,11 +111,14 @@ %changelog +* Thu Jul 17 2008 Jos?? Matos - 1.3.3-1 +- update to 1.3.3 + * Sun May 25 2008 Alex Lancaster - 1.3.2.1-1 - Updated to latest upstream (1.3.2.1) * Thu May 22 2008 Alex Lancaster - 1.3.1-3 -- Only kdepim3-devel if <= F-9, the KDE3 version of kdepim has been been +- Only kdepim3-devel if <= F-9, the KDE3 version of kdepim has been been removed from F-10/rawhide. * Tue May 20 2008 Alex Lancaster - 1.3.1-2 From fedora-extras-commits at redhat.com Thu Jul 17 11:34:52 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Thu, 17 Jul 2008 11:34:52 GMT Subject: rpms/tellico/F-8 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 tellico.spec, 1.18, 1.19 Message-ID: <200807171134.m6HBYq82017463@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/tellico/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17409 Modified Files: .cvsignore sources tellico.spec Log Message: * Thu Jul 17 2008 Jos?? Matos - 1.3.3-1 - update to 1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tellico/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 26 May 2008 07:43:13 -0000 1.14 +++ .cvsignore 17 Jul 2008 11:34:04 -0000 1.15 @@ -1 +1 @@ -tellico-1.3.2.1.tar.gz +tellico-1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tellico/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 26 May 2008 07:43:13 -0000 1.14 +++ sources 17 Jul 2008 11:34:04 -0000 1.15 @@ -1 +1 @@ -388e2f5495deed57ea20a660c8e20588 tellico-1.3.2.1.tar.gz +6e08c3f96c5b2ca871b83dbaca41b2ae tellico-1.3.3.tar.gz Index: tellico.spec =================================================================== RCS file: /cvs/pkgs/rpms/tellico/F-8/tellico.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- tellico.spec 26 May 2008 07:43:13 -0000 1.18 +++ tellico.spec 17 Jul 2008 11:34:04 -0000 1.19 @@ -1,5 +1,5 @@ Name: tellico -Version: 1.3.2.1 +Version: 1.3.3 Release: 1%{?dist} Summary: A collection manager @@ -111,11 +111,14 @@ %changelog +* Thu Jul 17 2008 Jos?? Matos - 1.3.3-1 +- update to 1.3.3 + * Sun May 25 2008 Alex Lancaster - 1.3.2.1-1 - Updated to latest upstream (1.3.2.1) * Thu May 22 2008 Alex Lancaster - 1.3.1-3 -- Only kdepim3-devel if <= F-9, the KDE3 version of kdepim has been been +- Only kdepim3-devel if <= F-9, the KDE3 version of kdepim has been been removed from F-10/rawhide. * Tue May 20 2008 Alex Lancaster - 1.3.1-2 From fedora-extras-commits at redhat.com Thu Jul 17 11:42:24 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Thu, 17 Jul 2008 11:42:24 GMT Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.20,1.21 Message-ID: <200807171142.m6HBgO9I017863@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/liberation-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17750 Modified Files: liberation-fonts.spec Log Message: * Thu Jul 17 2008 Caius Chance - 1.04-1.fc10 - Resolves: rhbz#455717 (Update sources to version 1.04.) - Improved .spec file. Index: liberation-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- liberation-fonts.spec 13 Jun 2008 00:18:35 -0000 1.20 +++ liberation-fonts.spec 17 Jul 2008 11:41:27 -0000 1.21 @@ -4,7 +4,7 @@ Summary: Fonts to replace commonly used Microsoft Windows Fonts Name: liberation-fonts Version: 1.04 -Release: 0.1.beta2%{?dist} +Release: 1%{?dist} # The license of the Liberation Fonts is a EULA that contains # GPLv2 and two exceptions: # The first exception is the standard FSF font exception. @@ -14,7 +14,7 @@ License: Liberation Group: User Interface/X URL: https://www.redhat.com/promo/fonts/ -Source0: liberation-fonts-1.04.beta2.tar.gz +Source0: liberation-fonts-1.04.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Buildrequires: xorg-x11-font-utils @@ -25,7 +25,7 @@ Arial, and Courier New. %prep -%setup -q -n liberation-fonts-1.04.beta2 +%setup -q -n %{name}-%{version} #%{__cp} %{SOURCE1} %{SOURCE2} %{_builddir}/%{name} %clean @@ -70,6 +70,10 @@ %{catalogue}/%{name} %changelog +* Thu Jul 17 2008 Caius Chance - 1.04-1.fc10 +- Resolves: rhbz#455717 (Update sources to version 1.04.) +- Improved .spec file. + * Thu Jun 12 2008 Caius Chance - 1.04-0.1.beta2.fc10 - Updated source version to 1.04.beta2. - Removed License.txt and COPYING as already included in sources. From fedora-extras-commits at redhat.com Thu Jul 17 11:59:35 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Thu, 17 Jul 2008 11:59:35 GMT Subject: rpms/linkage/devel linkage-0.2.0-buildfix.patch, NONE, 1.1 linkage.spec, 1.7, 1.8 Message-ID: <200807171159.m6HBxZ1X018858@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18816 Modified Files: linkage.spec Added Files: linkage-0.2.0-buildfix.patch Log Message: final build fixes linkage-0.2.0-buildfix.patch: --- NEW FILE linkage-0.2.0-buildfix.patch --- diff -upNr linkage-0.2.0.orign/lib/Utils.cc linkage-0.2.0/lib/Utils.cc --- linkage-0.2.0.orign/lib/Utils.cc 2008-07-17 13:46:38.000000000 +0200 +++ linkage-0.2.0/lib/Utils.cc 2008-07-17 13:47:45.000000000 +0200 @@ -167,7 +167,7 @@ struct Handler void operator()(asio::error_code const& error, libtorrent::http_parser const& parser, char const* data, - int size) + int size, libtorrent::http_connection const& conn) { for (int i = 0; i < size && data; i++) content.push_back(data[i]); Index: linkage.spec =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linkage.spec 16 Jul 2008 21:13:35 -0000 1.7 +++ linkage.spec 17 Jul 2008 11:58:48 -0000 1.8 @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: linkage-0.2.0-rb_libtorrent.patch +Patch1: linkage-0.2.0-buildfix.patch BuildRequires: rb_libtorrent-devel BuildRequires: curl-devel @@ -44,9 +45,14 @@ %prep %setup -q %patch0 -p1 -b .rb_libtorrent +%patch1 -p1 -b .buildfix %build -%configure --disable-schemas-install --with-boost-serialization=mt +sed -i \ + -e 's|\$ac_boost_path/lib|\$libdir|' \ + -e 's|$ac_boost_path_tmp/lib|\$libdir|' \ + configure +%configure --disable-schemas-install # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool From fedora-extras-commits at redhat.com Thu Jul 17 12:11:29 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Thu, 17 Jul 2008 12:11:29 GMT Subject: rpms/liberation-fonts/devel .cvsignore,1.5,1.6 sources,1.8,1.9 Message-ID: <200807171211.m6HCBTSF026009@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/liberation-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25961 Modified Files: .cvsignore sources Log Message: * Thu Jul 17 2008 Caius Chance - 1.04-1.fc10 - Resolves: rhbz#455717 (Update sources to version 1.04.) - Improved .spec file. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jun 2008 07:30:28 -0000 1.5 +++ .cvsignore 17 Jul 2008 12:10:42 -0000 1.6 @@ -1 +1 @@ -liberation-fonts-1.04.beta2.tar.gz +liberation-fonts-1.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Jun 2008 07:26:38 -0000 1.8 +++ sources 17 Jul 2008 12:10:42 -0000 1.9 @@ -1 +1 @@ -984ee9ec7972284d096ad42c3ef87d3b liberation-fonts-1.04.beta2.tar.gz +4846797ef0fc70b0cbaede2514677c58 liberation-fonts-1.04.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 12:14:49 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 12:14:49 GMT Subject: rpms/digikam/devel .cvsignore, 1.21, 1.22 digikam.spec, 1.57, 1.58 sources, 1.21, 1.22 Message-ID: <200807171214.m6HCEnLF026281@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26147 Modified Files: .cvsignore digikam.spec sources Log Message: * Thu Jul 03 2008 Rex Dieter - 0.9.4-0.4.rc2 - digikam-0.9.4-rc2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 3 Jul 2008 13:16:26 -0000 1.21 +++ .cvsignore 17 Jul 2008 12:13:49 -0000 1.22 @@ -1 +1 @@ -digikam-0.9.4-rc2.tar.bz2 +digikam-0.9.4.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- digikam.spec 8 Jul 2008 13:57:28 -0000 1.57 +++ digikam.spec 17 Jul 2008 12:13:49 -0000 1.58 @@ -1,8 +1,7 @@ -%define beta rc2 Name: digikam Version: 0.9.4 -Release: 0.4.%{beta}%{?dist} +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -14,7 +13,11 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs3-devel -BuildRequires: gphoto2-devel >= 2.0.0 +%if 0%{?fedora} > 9 +BuildRequires: libgphoto2-devel +%else +BuildRequires: gphoto2-devel +%endif BuildRequires: jasper-devel BuildRequires: libkdcraw-devel >= 0.1.4 BuildRequires: libkexiv2-devel >= 0.1.7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 3 Jul 2008 13:16:26 -0000 1.21 +++ sources 17 Jul 2008 12:13:49 -0000 1.22 @@ -1 +1 @@ -9419240f6b6ff869d56e6993da88ed7d digikam-0.9.4-rc2.tar.bz2 +b0f3fa00bd054b0497146e6ce24dab7c digikam-0.9.4.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 12:15:34 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Thu, 17 Jul 2008 12:15:34 GMT Subject: rpms/bash/devel bash-3.2-patch035.patch, NONE, 1.1 bash-2.03-profile.patch, 1.1, 1.2 bash-requires.patch, 1.1, 1.2 bash.spec, 1.159, 1.160 bash32-035, 1.1, 1.2 Message-ID: <200807171215.m6HCFY2r026426@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/bash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26283 Modified Files: bash-2.03-profile.patch bash-requires.patch bash.spec bash32-035 Added Files: bash-3.2-patch035.patch Log Message: Changed patches to satisfy fuzz=0 bash-3.2-patch035.patch: --- NEW FILE bash-3.2-patch035.patch --- --- ../bash32-035.patchpatch 2008-07-17 13:26:12.000000000 +0200 +++ ../bash32-035 2008-07-17 13:28:18.000000000 +0200 @@ -18,16 +18,15 @@ *** ../bash-3.2-patched/subst.c 2007-12-13 22:31:21.000000000 -0500 --- subst.c 2008-01-17 22:48:15.000000000 -0500 *************** -*** 4621,4627 **** - +*** 4622,4628 **** #if defined (JOB_CONTROL) set_sigchld_handler (); stop_making_children (); ! pipeline_pgrp = old_pipeline_pgrp; #else stop_making_children (); ---- 4721,4728 ---- - + #endif /* JOB_CONTROL */ +--- 4622,4629 ---- #if defined (JOB_CONTROL) set_sigchld_handler (); stop_making_children (); @@ -35,6 +34,7 @@ ! pipeline_pgrp = old_pipeline_pgrp; #else stop_making_children (); + #endif /* JOB_CONTROL */ *** ../bash-3.2-patched/jobs.c 2007-08-25 13:46:59.000000000 -0400 --- jobs.c 2007-12-08 16:47:43.000000000 -0500 *************** bash-2.03-profile.patch: Index: bash-2.03-profile.patch =================================================================== RCS file: /cvs/extras/rpms/bash/devel/bash-2.03-profile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bash-2.03-profile.patch 9 Sep 2004 03:25:09 -0000 1.1 +++ bash-2.03-profile.patch 17 Jul 2008 12:14:50 -0000 1.2 @@ -1,11 +1,12 @@ ---- bash-2.03/config-top.h.profile Mon Feb 22 14:37:17 1999 -+++ bash-2.03/config-top.h Mon Feb 22 14:37:29 1999 -@@ -3,6 +3,8 @@ - /* This contains various user-settable options not under the control of - autoconf. */ +diff -up bash-3.2/config-top.h.profile bash-3.2/config-top.h +--- bash-3.2/config-top.h.profile 2008-07-17 13:35:39.000000000 +0200 ++++ bash-3.2/config-top.h 2008-07-17 13:42:18.000000000 +0200 +@@ -26,6 +26,8 @@ + what POSIX.2 specifies. */ + #define CONTINUE_AFTER_KILL_ERROR +#define NON_INTERACTIVE_LOGIN_SHELLS + - /* Define CONTINUE_AFTER_KILL_ERROR if you want the kill command to - continue processing arguments after one of them fails. This is - what POSIX.2 specifies. */ + /* Define BREAK_COMPLAINS if you want the non-standard, but useful + error messages about `break' and `continue' out of context. */ + #define BREAK_COMPLAINS bash-requires.patch: Index: bash-requires.patch =================================================================== RCS file: /cvs/extras/rpms/bash/devel/bash-requires.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bash-requires.patch 15 Jun 2006 15:21:10 -0000 1.1 +++ bash-requires.patch 17 Jul 2008 12:14:50 -0000 1.2 @@ -162,7 +162,7 @@ + if (read_but_dont_execute) return (EXECUTION_SUCCESS); - run_pending_traps (); + QUIT; @@ -3984,7 +3994,7 @@ execute_intern_function (name, function) if (check_identifier (name, posixly_correct) == 0) Index: bash.spec =================================================================== RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- bash.spec 17 Jul 2008 08:45:32 -0000 1.159 +++ bash.spec 17 Jul 2008 12:14:50 -0000 1.160 @@ -73,6 +73,7 @@ Patch138: bash-3.2-comp_wordbreaks.patch Patch139: bash-3.2-manpage.patch Patch140: bash-3.2-man-page-suspend.patch +Patch141: bash-3.2-patch035.patch Requires: mktemp Requires(post): ncurses @@ -91,7 +92,11 @@ compliance over previous versions. %prep + %setup -q -a 2 +# patching official upstream patches +%patch141 -p0 -b .patch035 + # Official upstream patches %patch1 -p0 -b .001 %patch2 -p0 -b .002 @@ -156,7 +161,6 @@ %patch139 -p1 -b .manpage %patch140 -p1 -b .man-page-suspend - echo %{version} > _distribution echo %{release} > _patchlevel @@ -299,6 +303,7 @@ %changelog * Thu Jul 17 2008 Roman Rakus - 3.2-27 - Changes in man page - #442018, #445692, #446625, #453409 +- Changed patches to satisfy fuzz=0 * Thu Jun 5 2008 Roman Rakus - 3.2-26 - Patchlevel 39 Index: bash32-035 =================================================================== RCS file: /cvs/extras/rpms/bash/devel/bash32-035,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bash32-035 5 Jun 2008 15:43:36 -0000 1.1 +++ bash32-035 17 Jul 2008 12:14:50 -0000 1.2 @@ -18,16 +18,15 @@ *** ../bash-3.2-patched/subst.c 2007-12-13 22:31:21.000000000 -0500 --- subst.c 2008-01-17 22:48:15.000000000 -0500 *************** -*** 4621,4627 **** - +*** 4622,4628 **** #if defined (JOB_CONTROL) set_sigchld_handler (); stop_making_children (); ! pipeline_pgrp = old_pipeline_pgrp; #else stop_making_children (); ---- 4721,4728 ---- - + #endif /* JOB_CONTROL */ +--- 4622,4629 ---- #if defined (JOB_CONTROL) set_sigchld_handler (); stop_making_children (); @@ -35,6 +34,7 @@ ! pipeline_pgrp = old_pipeline_pgrp; #else stop_making_children (); + #endif /* JOB_CONTROL */ *** ../bash-3.2-patched/jobs.c 2007-08-25 13:46:59.000000000 -0400 --- jobs.c 2007-12-08 16:47:43.000000000 -0500 *************** From fedora-extras-commits at redhat.com Thu Jul 17 12:16:50 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Thu, 17 Jul 2008 12:16:50 GMT Subject: rpms/bash/devel bash.spec,1.160,1.161 Message-ID: <200807171216.m6HCGoUb026531@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/bash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26451 Modified Files: bash.spec Log Message: Changed patches to satisfy fuzz=0 Index: bash.spec =================================================================== RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- bash.spec 17 Jul 2008 12:14:50 -0000 1.160 +++ bash.spec 17 Jul 2008 12:16:06 -0000 1.161 @@ -95,7 +95,7 @@ %setup -q -a 2 # patching official upstream patches -%patch141 -p0 -b .patch035 +#%patch141 -p0 -b .patch035 # Official upstream patches %patch1 -p0 -b .001 From fedora-extras-commits at redhat.com Thu Jul 17 12:17:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:04 +0000 Subject: [pkgdb] mt-st ownership updated Message-ID: <200807171217.m6HCH5Dn003380@bastion.fedora.phx.redhat.com> Package mt-st in Fedora devel was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mt-st From fedora-extras-commits at redhat.com Thu Jul 17 12:17:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:04 +0000 Subject: [pkgdb] mt-st ownership updated Message-ID: <200807171217.m6HCH5Dp003380@bastion.fedora.phx.redhat.com> Package mt-st in Fedora 7 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mt-st From fedora-extras-commits at redhat.com Thu Jul 17 12:17:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:10 +0000 Subject: [pkgdb] mt-st ownership updated Message-ID: <200807171217.m6HCHAK5003417@bastion.fedora.phx.redhat.com> Package mt-st in Fedora 8 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mt-st From fedora-extras-commits at redhat.com Thu Jul 17 12:17:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:10 +0000 Subject: [pkgdb] mt-st ownership updated Message-ID: <200807171217.m6HCHAK7003417@bastion.fedora.phx.redhat.com> Package mt-st in Fedora 9 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mt-st From fedora-extras-commits at redhat.com Thu Jul 17 12:17:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:34 +0000 Subject: [pkgdb] mtx ownership updated Message-ID: <200807171217.m6HCHYTD003474@bastion.fedora.phx.redhat.com> Package mtx in Fedora devel was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mtx From fedora-extras-commits at redhat.com Thu Jul 17 12:17:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:36 +0000 Subject: [pkgdb] mtx ownership updated Message-ID: <200807171217.m6HCHaXt003495@bastion.fedora.phx.redhat.com> Package mtx in Fedora 7 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mtx From fedora-extras-commits at redhat.com Thu Jul 17 12:17:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:40 +0000 Subject: [pkgdb] mtx ownership updated Message-ID: <200807171217.m6HCHYTF003474@bastion.fedora.phx.redhat.com> Package mtx in Fedora 9 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mtx From fedora-extras-commits at redhat.com Thu Jul 17 12:17:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:17:38 +0000 Subject: [pkgdb] mtx ownership updated Message-ID: <200807171217.m6HCH5Dr003380@bastion.fedora.phx.redhat.com> Package mtx in Fedora 8 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mtx From fedora-extras-commits at redhat.com Thu Jul 17 12:24:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:24:27 +0000 Subject: [pkgdb] mtx ownership updated Message-ID: <200807171224.m6HCORTj003701@bastion.fedora.phx.redhat.com> Package mtx in Fedora devel is now owned by Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mtx From fedora-extras-commits at redhat.com Thu Jul 17 12:24:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:24:42 +0000 Subject: [pkgdb] mtx ownership updated Message-ID: <200807171224.m6HCOgRh003719@bastion.fedora.phx.redhat.com> Package mtx in Fedora 8 is now owned by Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mtx From fedora-extras-commits at redhat.com Thu Jul 17 12:24:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:24:45 +0000 Subject: [pkgdb] mtx ownership updated Message-ID: <200807171224.m6HCOjap003739@bastion.fedora.phx.redhat.com> Package mtx in Fedora 9 is now owned by Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mtx From fedora-extras-commits at redhat.com Thu Jul 17 12:25:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:25:26 +0000 Subject: [pkgdb] mt-st ownership updated Message-ID: <200807171225.m6HCOjar003739@bastion.fedora.phx.redhat.com> Package mt-st in Fedora devel is now owned by Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mt-st From fedora-extras-commits at redhat.com Thu Jul 17 12:25:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:25:31 +0000 Subject: [pkgdb] mt-st ownership updated Message-ID: <200807171225.m6HCOgRj003719@bastion.fedora.phx.redhat.com> Package mt-st in Fedora 8 is now owned by Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mt-st From fedora-extras-commits at redhat.com Thu Jul 17 12:25:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:25:37 +0000 Subject: [pkgdb] mt-st ownership updated Message-ID: <200807171225.m6HCOgRl003719@bastion.fedora.phx.redhat.com> Package mt-st in Fedora 9 is now owned by Dan Horak (sharkcz) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mt-st From fedora-extras-commits at redhat.com Thu Jul 17 12:33:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:33:32 +0000 Subject: [pkgdb] pnp4nagios: romal has requested watchcommits Message-ID: <200807171233.m6HCXWEZ004177@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on pnp4nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 12:33:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:33:43 +0000 Subject: [pkgdb] pnp4nagios: romal has requested watchbugzilla Message-ID: <200807171233.m6HCXhhR004214@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on pnp4nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 12:33:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 12:33:47 +0000 Subject: [pkgdb] pnp4nagios: romal has requested commit Message-ID: <200807171233.m6HCXlvR004257@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on pnp4nagios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 12:35:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 12:35:58 GMT Subject: rpms/qt/F-9 qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch, NONE, 1.1 qt-x11-opensource-src-4.4.0-qgtkstyle.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 qconfig-multilib.h, 1.2, 1.3 qt-copy-patches-svn_checkout.sh, 1.1, 1.2 qt.spec, 1.173, 1.174 qt4.csh, 1.1, 1.2 qt4.sh, 1.1, 1.2 qtconfig.desktop, 1.1, 1.2 sources, 1.30, 1.31 qt-x11-fix-combobox-window-type.patch, 1.1, NONE qt-x11-opensource-src-4.3.0-qassistant-qt4.patch, 1.1, NONE qt-x11-opensource-src-4.3.4-as_IN-437440.patch, 1.2, NONE qt-x11-opensource-src-4.3.4-openssl.patch, 1.1, NONE qt4-sparc64-qvector.patch, 1.2, NONE Message-ID: <200807171235.m6HCZw2F027893@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27787 Modified Files: .cvsignore qconfig-multilib.h qt-copy-patches-svn_checkout.sh qt.spec qt4.csh qt4.sh qtconfig.desktop sources Added Files: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch qt-x11-opensource-src-4.4.0-qgtkstyle.patch Removed Files: qt-x11-fix-combobox-window-type.patch qt-x11-opensource-src-4.3.0-qassistant-qt4.patch qt-x11-opensource-src-4.3.4-as_IN-437440.patch qt-x11-opensource-src-4.3.4-openssl.patch qt4-sparc64-qvector.patch Log Message: prep for qt44/kde41 update, sync with devel/ branch qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch: --- NEW FILE qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch --- diff -ur qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp --- qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2008-04-02 18:33:48.000000000 +0200 +++ qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2008-04-08 04:37:45.000000000 +0200 @@ -552,7 +552,7 @@ None, None, None, None, None, None, None, None, - None, None, None, None, + Below, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, @@ -1169,7 +1169,7 @@ HB_Script script = item->item.script; assert(script >= HB_Script_Devanagari && script <= HB_Script_Sinhala); const unsigned short script_base = 0x0900 + 0x80*(script-HB_Script_Devanagari); - const unsigned short ra = script_base + 0x30; + unsigned short ra = script_base + 0x30; const unsigned short halant = script_base + 0x4d; const unsigned short nukta = script_base + 0x3c; bool control = false; @@ -1212,6 +1212,19 @@ HB_UChar16 *uc = reordered; bool beginsWithRa = false; + // Exception in Bengali Script + // + // Bengali script supports two languages bengali and assamese + // Unfortunately for both languages there is different ra defined in same script chart + // for Bengali it ra is 'Base+ 0x30' and for assamese 'Base+0x70' + // Base is same 0x0980 + // To handle this exception we need to change ra to from const to normal variable + // and aslo need to change ra to 'Base+0x70' whenever we will get assamese language + //character in data + if((script == HB_Script_Bengali) && (*uc==0x09F0)){ + ra = script_base + 0x70; + } + // Rule 1: find base consonant // // The shaping engine finds the base consonant of the qt-x11-opensource-src-4.4.0-qgtkstyle.patch: --- NEW FILE qt-x11-opensource-src-4.4.0-qgtkstyle.patch --- diff -ur qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp --- qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp 2008-04-28 15:11:18.000000000 +0200 +++ qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp 2008-05-27 05:43:57.000000000 +0200 @@ -2262,9 +2262,11 @@ QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows")); break; case DE_GNOME: - if (X11->use_xrender) - QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks")); - else + if (X11->use_xrender) { + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("gtk")); + if (!QApplicationPrivate::app_style) + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks")); + } else QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows")); break; case DE_CDE: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 29 May 2008 17:45:21 -0000 1.29 +++ .cvsignore 17 Jul 2008 12:35:07 -0000 1.30 @@ -1,6 +1,4 @@ hi128-app-qt4-logo.png hi48-app-qt4-logo.png -qt-copy-patches-20080305svn.tar.bz2 -qt-x11-opensource-src-4.3.4.tar.gz -qt-copy-patches-20080528svn.tar.bz2 -qt-x11-opensource-src-4.3.5.tar.gz +qt-x11-opensource-src-4.4.0.tar.bz2 +qt-copy-patches-20080711svn.tar.bz2 Index: qconfig-multilib.h =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qconfig-multilib.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qconfig-multilib.h 18 May 2008 14:17:34 -0000 1.2 +++ qconfig-multilib.h 17 Jul 2008 12:35:07 -0000 1.3 @@ -16,7 +16,7 @@ # include #elif defined(__s390__) # include -#elif defined(__sparc__) && defined (__arch64__) +#elif defined(__sparc64__) # include #elif defined(__sparc__) # include Index: qt-copy-patches-svn_checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt-copy-patches-svn_checkout.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt-copy-patches-svn_checkout.sh 12 Mar 2008 23:38:15 -0000 1.1 +++ qt-copy-patches-svn_checkout.sh 17 Jul 2008 12:35:07 -0000 1.2 @@ -7,8 +7,8 @@ rm -rf $EXPORT_DIR # app -svn export --non-recursive svn://anonsvn.kde.org/home/kde/branches/qt/4.3 $EXPORT_DIR/ -svn export svn://anonsvn.kde.org/home/kde/branches/qt/4.3/patches $EXPORT_DIR/patches +svn export --non-recursive svn://anonsvn.kde.org/home/kde/trunk/qt-copy $EXPORT_DIR/ +svn export svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches $EXPORT_DIR/patches pushd $EXPORT_DIR rm -f ../qt-copy-patches-${DATE}svn.tar.bz2 Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- qt.spec 16 Jun 2008 14:40:15 -0000 1.173 +++ qt.spec 17 Jul 2008 12:35:07 -0000 1.174 @@ -7,14 +7,14 @@ %else Name: qt4 %endif -Version: 4.3.5 -Release: 2%{?dist} +Version: 4.4.0 +Release: 12%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL Group: System Environment/Libraries Url: http://www.trolltech.com/products/qt/ -Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz +Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{name}" != "qt4" @@ -29,28 +29,22 @@ %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc Source5: qconfig-multilib.h -# search for assistant-qt4 instead of (qt3's) assistant in $PATH -Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch # multilib hacks Patch2: qt-x11-opensource-src-4.2.2-multilib.patch -Patch5: qt-x11-opensource-src-4.3.4-as_IN-437440.patch -# look for OpenSSL using versioned sonames -Patch6: qt-x11-opensource-src-4.3.4-openssl.patch -# Fix sparc64 compile -Patch7: qt4-sparc64-qvector.patch +Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch # kill hardcoded font substitutions (#447298) Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch -# -Patch9: qt-x11-fix-combobox-window-type.patch +# under GNOME, default to QGtkStyle if available +# (otherwise fall back to QCleanlooksStyle) +Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch ## qt-copy patches -%define qt_copy 20080528 +%define qt_copy 20080711 Source1: qt-copy-patches-svn_checkout.sh -Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2 +%{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} %{?qt_copy:Provides: qt4-copy = %{qt_copy}} -Source10: qt4-wrapper.sh Source11: qt4.sh Source12: qt4.csh @@ -68,14 +62,20 @@ # set to -no-sql- to disable # set to -qt-sql- to enable *in* qt library %define mysql -plugin-sql-mysql -%define odbc -plugin-sql-odbc -%define psql -plugin-sql-psql -%define sqlite -plugin-sql-sqlite +%define odbc -plugin-sql-odbc +%define psql -plugin-sql-psql +%define sqlite -plugin-sql-sqlite +# FIXME: building -no-phonon currently busted, build fails -- Rex +#define phonon -phonon -gstreamer +%define webkit -webkit # undefine to disable these -%define nas -system-nas-sound +#define nas -system-nas-sound %if 0%{?fedora} > 4 || 0%{?rhel} > 4 -%define qdbus -qdbus +# link dbus +%define dbus -dbus-linked +# dlopen dbus +#define dbus -dbus BuildRequires: dbus-devel >= 0.62 %endif @@ -107,11 +107,11 @@ BuildRequires: libmng-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: libungif-devel BuildRequires: freetype-devel BuildRequires: zlib-devel BuildRequires: glib2-devel BuildRequires: openssl-devel +%{?phonon:BuildRequires: gstreamer-devel >= 0.10.12, gstreamer-plugins-base-devel} ## In theory, should be as simple as: #define x_deps libGL-devel libGLU-devel @@ -132,18 +132,18 @@ %if "%{?psql}" != "-no-sql-psql" BuildRequires: postgresql-devel +# added deps to workaround http://bugzilla.redhat.com/440673 +BuildRequires: krb5-devel libxslt-devel openssl-devel pam-devel readline-devel zlib-devel %endif %if "%{?odbc}" != "-no-sql-odbc" BuildRequires: unixODBC-devel %endif -%if "%{?sqlite:1}" != "-no-sql-sqlite" -%if 0%{?fedora} > 2 +%if "%{?sqlite}" != "-no-sql-sqlite" %define _system_sqlite -system-sqlite BuildRequires: sqlite-devel %endif -%endif Obsoletes: qt4-config < %{version}-%{release} Provides: qt4-config = %{version}-%{release} @@ -165,6 +165,15 @@ Requires: libpng-devel Requires: libjpeg-devel Requires: pkgconfig +%if 0%{?webkit:1} +Obsoletes: WebKit-qt-devel < 1.0.0-1 +Provides: WebKit-qt-devel = 1.0.0-1 +%endif +# we strip these from the .pc files to avoid the bogus deps +# -openssl-linked ? -- Rex +#Requires: openssl-devel +# -dbus-linked ? -- Rex +#Requires: dbus-devel Obsoletes: qt4-designer < %{version}-%{release} Provides: qt4-designer = %{version}-%{release} %if "%{name}" != "qt4" @@ -219,6 +228,16 @@ %description mysql %{summary}. +%package phonon-devel +Summary: Phonon development files for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +# FIXME +Conflicts: kdelibs4-devel < 4.1 + +%description phonon-devel +%{summary}. + %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries @@ -250,12 +269,15 @@ %package x11 Summary: Qt GUI-related libraries Group: System Environment/Libraries +%if 0%{?webkit:1} +Obsoletes: WebKit-qt < 1.0.0-1 +Provides: WebKit-qt = 1.0.0-1 +%endif Provides: qt4-assistant = %{version}-%{release} %if "%{name}" != "qt4" Provides: %{name}-assistant = %{version}-%{release} %endif Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: redhat-rpm-config rpm %if "%{name}" != "qt4" Obsoletes: qt4-x11 < %{version}-%{release} Provides: qt4-x11 = %{version}-%{release} @@ -267,31 +289,21 @@ %prep %if "%{?snap:1}" == "1" -%setup -q -n qt-x11%{?preview}-opensource-src-%{version}-%{snap} +%setup -q -n qt-x11-opensource-src-%{vesion}-%{snap} %else -%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta} %{?qt_copy:-a 2} +%setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2} %endif %if 0%{?qt_copy:1} -# dome don't apply atm, some/most of these are already included -- Rex -echo "0176" >> patches/DISABLED - test -x apply_patches && ./apply_patches %endif -%patch1 -p1 -b .assistant4 # don't use -b on mkspec files, else they get installed too. +# multilib hacks no longer required %patch2 -p1 %patch5 -p1 -b .bz#437440-as_IN-437440 -%patch6 -p1 -b .openssl -# SHLIB_VERSION_NUMBER is wrong on F8 and older -# 0.9.8b is the version in both F7 and F8 -%if 0%{?fedora} < 9 -sed -i -e 's/SHLIB_VERSION_NUMBER/"0.9.8b"/g' src/network/qsslsocket_openssl_symbols.cpp -%endif -%patch7 -p1 -b .sparc64 %patch8 -p1 -b .font-aliases -%patch9 -p0 -b .fix-combobox-window-type +%patch9 -p1 -b .qgtkstyle # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -352,11 +364,11 @@ -release \ -shared \ -cups \ - -no-exceptions \ -fontconfig \ -largefile \ -qt-gif \ -no-rpath \ + -reduce-relocations \ -no-separate-debug-info \ -sm \ -stl \ @@ -374,8 +386,12 @@ -xrender \ -xkb \ -glib \ - -openssl \ - %{?qdbus} %{!?qdbus:-no-qdbus} \ + -openssl-linked \ + -xmlpatterns \ + %{?phonon} %{!?phonon:-no-phonon } \ + %{?dbus} %{!?dbus:-no-dbus} \ + %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ + %{?webkit} %{!?webkit:-no-webkit } \ %{?nas} %{!?nas:-no-nas-sound} \ %{?mysql} \ %{?psql} \ @@ -400,8 +416,8 @@ # strip extraneous dirs/libraries -- Rex # safe ones glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0) -for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz \ - -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do +for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz -lssl -lcrypto -lsqlite3 \ + -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?pre}/lib -L/usr/X11R6/%{_lib} ; do sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||: sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl @@ -415,29 +431,30 @@ # nuke dandling reference(s) to %buildroot sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl +%if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc" # -doc make symbolic link to _qt4_docdir rm -rf %{buildroot}%{_qt4_prefix}/doc ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc - -## Make symlinks in %%_bindir -%if "%{_bindir}" != "%{_qt4_bindir}" - mkdir -p %{buildroot}%{_bindir} - pushd %{buildroot}%{_qt4_bindir} - for i in *; do - case "${i}" in - assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic) - LINK="${i}-qt4" - ln -s "${i}" "%{buildroot}%{_qt4_bindir}/${LINK}" - ;; - *) - LINK="${i}" - ;; - esac - install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK} - done - popd %endif +# let rpm handle binaries conflicts +mkdir %{buildroot}%{_bindir} +pushd %{buildroot}%{_qt4_bindir} +for i in * ; do + case "${i}" in + assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic) + mv $i ../../../bin/${i}-qt4 + ln -s ../../../bin/${i}-qt4 . + ln -s ../../../bin/${i}-qt4 $i + ;; + *) + mv $i ../../../bin/ + ln -s ../../../bin/$i . + ;; + esac +done +popd + # _debug lib symlinks (see bug #196513) pushd %{buildroot}%{_qt4_libdir} for lib in libQt*.so ; do @@ -468,9 +485,15 @@ %endif # qt4.(sh|csh), currently unused -#install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4-%{_arch}.sh -#install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4-%{_arch}.csh -#sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/qt4-%{_arch}.* +%if 0 +install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh +install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh +sed -i \ + -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \ + -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \ + %{buildroot}/etc/profile.d/qt4.* +%endif + %if "%{_qt4_libdir}" != "%{_libdir}" mkdir -p %{buildroot}/etc/ld.so.conf.d @@ -488,9 +511,6 @@ size=$(echo $(basename ${icon}) | cut -d- -f2) install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png done -# qtconfig icon (it's 50x50 actually, it's pretty generic as-is anyway, use qt4-logo instead -- Rex ) -#install -p -m644 -D tools/qtconfig/images/appicon.png \ -# %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig4.png # Qt.pc cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc< 4.3.5-2 -- fix-combobox-window-type patch (maniac103) +* Fri Jul 11 2008 Rex Dieter 4.4.0-12 +- qt-copy-patches-20080711 + +* Mon Jun 23 2008 Rex Dieter 4.4.0-11 +- fix dbus conditional (#452487) + +* Sat Jun 14 2008 Rex Dieter 4.4.0-10 +- strip -lsqlite3 from .pc files (#451490) + +* Sat Jun 14 2008 Kevin Kofler 4.4.0-9 +- restore -qt4 suffixes + +* Fri Jun 13 2008 Than Ngo 4.4.0-8 +- drop qt wrapper, make symlinks to /usr/bin -* Wed May 28 2008 Rex Dieter 4.3.5-1 -- qt-x11-opensource-src-4.3.5 -- qt-copy 20080528 patches +* Tue Jun 10 2008 Than Ngo 4.4.0-7 +- fix #450310, multilib issue -* Mon May 19 2008 Kevin Kofler 4.3.4-14 +* Fri Jun 06 2008 Rex Dieter 4.4.0-6 +- qt-copy-patches-20080606 +- drop BR: libungif-devel (not used) +- move libQtXmlPatters, -x11 -> main +- move qdbuscpp2xml, qdbusxml2cpp, xmlpatters, -x11 -> -devel + +* Tue May 27 2008 Kevin Kofler 4.4.0-5 +- under GNOME, default to QGtkStyle if available + +* Mon May 19 2008 Kevin Kofler 4.4.0-4 - don't hardcode incorrect font substitutions (#447298) -* Sun May 18 2008 Tom "spot" Callaway 4.3.4-13 -- fix sparc64 multilib header +* Fri May 16 2008 Rex Dieter 4.4.0-3 +- qt-copy-patches-20080516 + +* Tue May 13 2008 Kevin Kofler 4.4.0-2 +- revert _qt4_bindir change for now, needs more work (#446167) -* Sat May 17 2008 Tom "spot" Callaway 4.3.4-12 -- fix sparc64 compile, the 64bit sparc conditional in src/corelib/tools/qvector.h - applies to linux as well as solaris +* Tue May 06 2008 Rex Dieter 4.4.0-1 +- qt-4.4.0 -* Tue Apr 08 2008 Kevin Kofler 4.3.4-11 +* Tue Apr 29 2008 Rex Dieter 4.4.0-0.6.rc1 +- -webkit (include in -x11 subpkg), drop separate -webkit-devel +- omit qt4-wrapper.sh deps (since it's not used atm) +- qt-copy-patches-20080429 +- Obsoletes/Provides: WebKit-qt(-devel) <|= 1.0.0-1 (#442200) + +* Thu Apr 24 2008 Rex Dieter 4.4.0-0.5.rc1 +- strip -lssl -lcrypto from *.pc files too + +* Tue Apr 08 2008 Kevin Kofler 4.4.0-0.4.rc1 - updated patch for #437440 ([as-IN] Consonant combination issue) by Pravin Satpute +- port the patch to Qt 4.4 (the code moved to harfbuzz) and reenable it + +* Fri Apr 04 2008 Rex Dieter 4.4.0-0.3.rc1 +- qt-4.4.0-rc1 +- -xmlpatterns (and drop -no-exceptions) +- -reduce-relocations, -dbus-linked, -openssl-linked +- -no-nas +- -no-phonon (-no-gstreamer), -no-webkit (for now, at least until + conflicts with WebKit-qt and kdelibs4 are sorted out) +- %%_qt4_bindir -> %%_bindir, avoid qt4-wrapper hackage (#277581, #422291) +- qtconfig.desktop: NoDisplay=true (#244879) * Wed Apr 02 2008 Kevin Kofler 4.3.4-10 - look for OpenSSL using versioned sonames (#432271) Index: qt4.csh =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt4.csh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4.csh 12 Mar 2008 23:38:15 -0000 1.1 +++ qt4.csh 17 Jul 2008 12:35:07 -0000 1.2 @@ -1,8 +1,8 @@ # Qt4 initialization script (csh) -if ( $?QMAKESPEC ) then +if ( $?QT4DIR ) then exit endif -setenv QMAKESPEC @@QMAKESPEC@@ - +setenv QT4DIR `/usr/bin/pkg-config --variable=prefix Qt` +setenv QT4DOCDIR `/usr/bin/pkg-config --variable=docdir Qt` Index: qt4.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt4.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4.sh 12 Mar 2008 23:38:15 -0000 1.1 +++ qt4.sh 17 Jul 2008 12:35:07 -0000 1.2 @@ -1,8 +1,9 @@ # Qt4 initialization script (sh) -if [ -z "$QMAKESPEC" ] ; then - QMAKESPEC=@@QMAKESPEC@@ - export QMAKESPEC +if [ -z "$QT4DIR" ] ; then + QT4DIR=`/usr/bin/pkg-config --variable=prefix Qt` + QT4DOCDIR=`/usr/bin/pkg-config --variable=docdir Qt` + export QT4DIR QT4DOCDIR fi Index: qtconfig.desktop =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qtconfig.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qtconfig.desktop 12 Mar 2008 23:38:15 -0000 1.1 +++ qtconfig.desktop 17 Jul 2008 12:35:07 -0000 1.2 @@ -7,3 +7,4 @@ Encoding=UTF-8 Type=Application Categories=Qt;Settings; +NoDisplay=true Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 29 May 2008 17:45:21 -0000 1.30 +++ sources 17 Jul 2008 12:35:07 -0000 1.31 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png -c12c234097d65943603a624ea989bca5 qt-copy-patches-20080528svn.tar.bz2 -4e6234235431e768e18777ff32990cc2 qt-x11-opensource-src-4.3.5.tar.gz +03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2 +7cf6bdbd220fb8915f8d875442e29961 qt-copy-patches-20080711svn.tar.bz2 --- qt-x11-fix-combobox-window-type.patch DELETED --- --- qt-x11-opensource-src-4.3.0-qassistant-qt4.patch DELETED --- --- qt-x11-opensource-src-4.3.4-as_IN-437440.patch DELETED --- --- qt-x11-opensource-src-4.3.4-openssl.patch DELETED --- --- qt4-sparc64-qvector.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 12:41:30 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 12:41:30 GMT Subject: rpms/qt/devel qconfig-multilib.h,1.1,1.2 qt.spec,1.193,1.194 Message-ID: <200807171241.m6HCfUWe028292@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28142 Modified Files: qconfig-multilib.h qt.spec Log Message: * Thu Jul 17 2008 Rex Dieter 4.4.0-13 - (re)fix qconfig-multilib.h for sparc64 Index: qconfig-multilib.h =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qconfig-multilib.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qconfig-multilib.h 12 Mar 2008 23:38:15 -0000 1.1 +++ qconfig-multilib.h 17 Jul 2008 12:40:39 -0000 1.2 @@ -16,7 +16,7 @@ # include #elif defined(__s390__) # include -#elif defined(__sparc64__) +#elif defined(__sparc__) && defined (__arch64__) # include #elif defined(__sparc__) # include Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- qt.spec 12 Jul 2008 01:31:46 -0000 1.193 +++ qt.spec 17 Jul 2008 12:40:39 -0000 1.194 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 12%{?dist} +Release: 13%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -773,6 +773,9 @@ %changelog +* Thu Jul 17 2008 Rex Dieter 4.4.0-13 +- (re)fix qconfig-multilib.h for sparc64 + * Fri Jul 11 2008 Rex Dieter 4.4.0-12 - qt-copy-patches-20080711 From fedora-extras-commits at redhat.com Thu Jul 17 12:43:22 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 12:43:22 GMT Subject: rpms/qt/F-9 qconfig-multilib.h,1.3,1.4 qt.spec,1.174,1.175 Message-ID: <200807171243.m6HChMms028655@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28570 Modified Files: qconfig-multilib.h qt.spec Log Message: * Thu Jul 17 2008 Rex Dieter 4.4.0-13 - (re)fix qconfig-multilib.h for sparc64 Index: qconfig-multilib.h =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qconfig-multilib.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qconfig-multilib.h 17 Jul 2008 12:35:07 -0000 1.3 +++ qconfig-multilib.h 17 Jul 2008 12:42:37 -0000 1.4 @@ -16,7 +16,7 @@ # include #elif defined(__s390__) # include -#elif defined(__sparc64__) +#elif defined(__sparc__) && defined (__arch64__) # include #elif defined(__sparc__) # include Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- qt.spec 17 Jul 2008 12:35:07 -0000 1.174 +++ qt.spec 17 Jul 2008 12:42:37 -0000 1.175 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 12%{?dist} +Release: 13%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -773,6 +773,9 @@ %changelog +* Thu Jul 17 2008 Rex Dieter 4.4.0-13 +- (re)fix qconfig-multilib.h for sparc64 + * Fri Jul 11 2008 Rex Dieter 4.4.0-12 - qt-copy-patches-20080711 From fedora-extras-commits at redhat.com Thu Jul 17 12:44:27 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 12:44:27 GMT Subject: rpms/digikam/devel digikam.spec,1.58,1.59 Message-ID: <200807171244.m6HCiRcP028759@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28699 Modified Files: digikam.spec Log Message: +changelog Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- digikam.spec 17 Jul 2008 12:13:49 -0000 1.58 +++ digikam.spec 17 Jul 2008 12:43:30 -0000 1.59 @@ -143,6 +143,9 @@ %changelog +* Thu Jul 17 2008 Rex Dieter - 0.9.4-1 +- digikam-0.9.4 + * Thu Jul 03 2008 Rex Dieter - 0.9.4-0.4.rc2 - digikam-0.9.4-rc2 From fedora-extras-commits at redhat.com Thu Jul 17 12:56:07 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Thu, 17 Jul 2008 12:56:07 GMT Subject: rpms/subversion/F-8 subversion-1.5.0-perl510.patch, NONE, 1.1 subversion-1.5.0-pie.patch, NONE, 1.1 psvn.el, 1.7, 1.8 sources, 1.28, 1.29 subversion.spec, 1.103, 1.104 upstream, 1.15, 1.16 subversion-1.0.3-pie.patch, 1.9, NONE subversion-1.4.4-macropen.patch, 1.1, NONE subversion-1.4.4-swig1333.patch, 1.1, NONE Message-ID: <200807171256.m6HCu79X029595@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29523 Modified Files: psvn.el sources subversion.spec upstream Added Files: subversion-1.5.0-perl510.patch subversion-1.5.0-pie.patch Removed Files: subversion-1.0.3-pie.patch subversion-1.4.4-macropen.patch subversion-1.4.4-swig1333.patch Log Message: * Thu Jul 17 2008 Joe Orton 1.5.0-8.1 - rebuild for F-8 subversion-1.5.0-perl510.patch: --- NEW FILE subversion-1.5.0-perl510.patch --- upstream r31546 --- subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t.perl510 +++ subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t @@ -221,8 +221,7 @@ sub add_file { sub apply_textdelta { my ($self, $baton, $base_checksum, $pool) = @_; - my $data = $baton->{data} = \''; - open my $out_fh, '>', $data + open my $out_fh, '>', \$baton->{data} or die "error opening in-memory file to store Subversion update: $!"; open my $in_fh, '<', \'' or die "error opening in-memory file for delta source: $!"; subversion-1.5.0-pie.patch: --- NEW FILE subversion-1.5.0-pie.patch --- --- subversion-1.5.0/build.conf.pie +++ subversion-1.5.0/build.conf @@ -452,7 +452,7 @@ type = swig_lib lang = python path = subversion/bindings/swig/python/libsvn_swig_py libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr -link-cmd = $(LINK) $(SWIG_PY_LIBS) +link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS) install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) @@ -475,7 +475,7 @@ type = swig_lib lang = ruby path = subversion/bindings/swig/ruby/libsvn_swig_ruby libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr -link-cmd = $(LINK) $(SWIG_RB_LIBS) +link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS) install = swig-rb-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_RB) --- subversion-1.5.0/build/generator/gen_base.py.pie +++ subversion-1.5.0/build/generator/gen_base.py @@ -411,6 +411,9 @@ class TargetExe(TargetLinked): self.manpages = options.get('manpages', '') self.testing = options.get('testing') + if self.install == 'test' or self.install == 'bdb-test': + self.link_cmd = '$(LINK_TEST)' + def add_dependencies(self): TargetLinked.add_dependencies(self) @@ -453,8 +456,11 @@ class TargetLib(TargetLinked): self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target self.msvc_export = string.split(options.get('msvc-export', '')) - ### hmm. this is Makefile-specific - self.link_cmd = '$(LINK_LIB)' + ### more Makefile-specific stuff: + if self.install == 'test': + self.link_cmd = '$(LINK_TEST_LIB)' + elif self.link_cmd == '$(LINK)': + self.link_cmd = '$(LINK_LIB)' class TargetApacheMod(TargetLib): --- subversion-1.5.0/Makefile.in.pie +++ subversion-1.5.0/Makefile.in @@ -2,7 +2,7 @@ # Makefile.in: template Makefile for Subversion # # ==================================================================== -# Copyright (c) 2000-2006 CollabNet. All rights reserved. +# Copyright (c) 2000-2006, 2008 CollabNet. All rights reserved. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -150,9 +150,10 @@ CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS) CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) -COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) +BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) +COMPILE = $(BASE_COMPILE) -fpie COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) +LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE) # special compilation for files destined for mod_dav_svn COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c @@ -167,8 +168,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) COMPILE_JAVAHL_JAVAH = $(JAVAH) -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -LINK_LIB = $(LINK) -rpath $(libdir) +BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) +LINK = $(BASE_LINK) -pie +LINK_TEST = $(BASE_LINK) -no-install +LINK_LIB = $(BASE_LINK) -rpath $(libdir) +LINK_TEST_LIB = $(BASE_LINK) # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 psvn.el Index: psvn.el =================================================================== RCS file: /cvs/extras/rpms/subversion/F-8/psvn.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- psvn.el 2 Jun 2006 08:48:47 -0000 1.7 +++ psvn.el 17 Jul 2008 12:55:20 -0000 1.8 @@ -1,7 +1,7 @@ ;;; psvn.el --- Subversion interface for emacs -;; Copyright (C) 2002-2006 by Stefan Reichoer +;; Copyright (C) 2002-2007 by Stefan Reichoer -;; Author: Stefan Reichoer, +;; Author: Stefan Reichoer ;; $Id$ ;; psvn.el is free software; you can redistribute it and/or modify @@ -22,7 +22,10 @@ ;;; Commentary ;; psvn.el is tested with GNU Emacs 21.3 on windows, debian linux, -;; freebsd5, red hat el3 with svn 1.2.3 +;; freebsd5, red hat el4, ubuntu edgy with svn 1.4.0 + +;; psvn.el needs at least svn 1.1.0 +;; if you upgrade to a higher version, you need to do a fresh checkout ;; psvn.el is an interface for the revision control tool subversion ;; (see http://subversion.tigris.org) @@ -51,8 +54,11 @@ ;; A - svn-status-add-file-recursively run 'svn add' ;; + - svn-status-make-directory run 'svn mkdir' ;; R - svn-status-mv run 'svn mv' +;; C - svn-status-cp run 'svn cp' ;; D - svn-status-rm run 'svn rm' ;; M-c - svn-status-cleanup run 'svn cleanup' +;; k - svn-status-lock run 'svn lock' +;; K - svn-status-unlock run 'svn unlock' ;; b - svn-status-blame run 'svn blame' ;; X e - svn-status-export run 'svn export' ;; RET - svn-status-find-file-or-examine-directory @@ -61,13 +67,14 @@ ;; E - svn-status-ediff-with-revision ;; X X - svn-status-resolve-conflicts ;; s - svn-status-show-process-buffer +;; h - svn-status-pop-to-partner-buffer ;; e - svn-status-toggle-edit-cmd-flag ;; ? - svn-status-toggle-hide-unknown ;; _ - svn-status-toggle-hide-unmodified ;; m - svn-status-set-user-mark ;; u - svn-status-unset-user-mark ;; $ - svn-status-toggle-elide -;; w - svn-status-copy-filename-as-kill +;; w - svn-status-copy-current-line-info ;; DEL - svn-status-unset-user-mark-backwards ;; * ! - svn-status-unset-all-usermarks ;; * ? - svn-status-mark-unknown @@ -75,9 +82,12 @@ ;; * M - svn-status-mark-modified ;; * D - svn-status-mark-deleted ;; * * - svn-status-mark-changed +;; * . - svn-status-mark-by-file-ext +;; * % - svn-status-mark-filename-regexp ;; . - svn-status-goto-root-or-return ;; f - svn-status-find-file ;; o - svn-status-find-file-other-window +;; C-o - svn-status-find-file-other-window-noselect ;; v - svn-status-view-file-other-window ;; I - svn-status-parse-info ;; V - svn-status-svnversion @@ -89,9 +99,13 @@ ;; P I - svn-status-property-ignore-file-extension ;; P C-i - svn-status-property-edit-svn-ignore ;; P k - svn-status-property-set-keyword-list +;; P K i - svn-status-property-set-keyword-id +;; P K d - svn-status-property-set-keyword-date ;; P y - svn-status-property-set-eol-style ;; P x - svn-status-property-set-executable -;; h - svn-status-use-history +;; P m - svn-status-property-set-mime-type +;; H - svn-status-use-history +;; x - svn-status-update-buffer ;; q - svn-status-bury-buffer ;; C-x C-j - svn-status-dired-jump @@ -117,7 +131,7 @@ ;; The latest version of psvn.el can be found at: ;; http://www.xsteve.at/prg/emacs/psvn.el ;; Or you can check it out from the subversion repository: -;; svn co http://svn.collab.net/repos/svn/trunk/contrib/client-side/psvn psvn +;; svn co http://svn.collab.net/repos/svn/trunk/contrib/client-side/emacs emacs-svn ;; TODO: ;; * shortcut for svn propset svn:keywords "Date" psvn.el @@ -126,7 +140,6 @@ ;; * when editing the command line - offer help from the svn client ;; * finish svn-status-property-set ;; * Add repository browser -;; * Improve support for svn blame ;; * Get rid of all byte-compiler warnings ;; * SVK working copy support ;; * multiple independent buffers in svn-status-mode @@ -136,38 +149,42 @@ ;; * add implemented ;; * blame implemented ;; * cat implemented -;; * checkout (co) +;; * checkout (co) implemented ;; * cleanup implemented ;; * commit (ci) implemented -;; * copy (cp) +;; * copy (cp) implemented ;; * delete (del, remove, rm) implemented ;; * diff (di) implemented ;; * export implemented ;; * help (?, h) -;; * import +;; * import used (in svn-admin-create-trunk-directory) ;; * info implemented ;; * list (ls) implemented -;; * lock +;; * lock implemented ;; * log implemented ;; * merge ;; * mkdir implemented ;; * move (mv, rename, ren) implemented ;; * propdel (pdel) implemented ;; * propedit (pedit, pe) not needed -;; * propget (pget, pg) used +;; * propget (pget, pg) used (in svn-status-property-edit) ;; * proplist (plist, pl) implemented -;; * propset (pset, ps) used +;; * propset (pset, ps) used (in svn-prop-edit-do-it) ;; * resolved implemented ;; * revert implemented ;; * status (stat, st) implemented ;; * switch (sw) -;; * unlock +;; * unlock implemented ;; * update (up) implemented ;; For the not yet implemented commands you should use the command line ;; svn client. If there are user requests for any missing commands I will ;; probably implement them. +;; There is also limited support for the web-based software project management and bug/issue tracking system trac +;; Trac ticket links can be enabled in the *svn-log* buffers when using the following: +;; (setq svn-log-link-handlers '(trac-ticket-short)) + ;; Comments / suggestions and bug reports are welcome! ;; Development notes @@ -191,6 +208,11 @@ (require 'easymenu) +(eval-when-compile (require 'dired)) +(eval-when-compile (require 'ediff-util)) +(eval-when-compile (require 'elp)) +(eval-when-compile (require 'pp)) + (condition-case nil (progn (require 'diff-mode)) @@ -201,13 +223,14 @@ ;;; user setable variables (defcustom svn-status-verbose t - "*Add '-v' to svn status call." + "*Add '-v' to svn status call. +This can be toggled with \\[svn-status-toggle-svn-verbose-flag]." :type 'boolean :group 'psvn) (defcustom svn-log-edit-file-name "++svn-log++" "*Name of a saved log file. This can be either absolute, or relative to the default directory -of the *svn-log-edit* buffer." +of the `svn-log-edit-buffer-name' buffer." :type 'file :group 'psvn) (put 'svn-log-edit-file-name 'risky-local-variable t) @@ -221,6 +244,15 @@ This variable takes effect only when psvn.el is being loaded." :type 'boolean :group 'psvn) +(defcustom svn-log-edit-paragraph-start + "$\\|[ \t]*$\\|##.*$\\|\\*.*:.*$\\|[ \t]+(.+):.*$" + "*Value used for `paragraph-start' in `svn-log-edit-buffer-name' buffer." + :type 'regexp + :group 'psvn) +(defcustom svn-log-edit-paragraph-separate "$\\|##.*$" + "*Value used for `paragraph-separate' in `svn-log-edit-buffer-name' buffer." + :type 'regexp + :group 'psvn) (defcustom svn-status-hide-unknown nil "*Hide unknown files in `svn-status-buffer-name' buffer. This can be toggled with \\[svn-status-toggle-hide-unknown]." @@ -234,13 +266,31 @@ (defcustom svn-status-sort-status-buffer t [...3820 lines suppressed...] @@ -4121,14 +5718,14 @@ (erase-buffer) (insert-buffer-substring result-buffer) (goto-char (point-min)) - (while (re-search-forward "^<<<<<<< .mine\n" nil t) + (while (re-search-forward "^<<<<<<< .\\(mine\\|working\\)\n" nil t) (setq found t) (replace-match "") (if (not (re-search-forward "^=======\n" nil t)) (error "Malformed conflict marker")) (replace-match "") (let ((start (point))) - (if (not (re-search-forward "^>>>>>>> .r[0-9]+\n" nil t)) + (if (not (re-search-forward "^>>>>>>> .\\(r[0-9]+\\|merge.*\\)\n" nil t)) (error "Malformed conflict marker")) (delete-region start (point)))) (if (not found) @@ -4140,12 +5737,12 @@ (erase-buffer) (insert-buffer-substring result-buffer) (goto-char (point-min)) - (while (re-search-forward "^<<<<<<< .mine\n" nil t) + (while (re-search-forward "^<<<<<<< .\\(mine\\|working\\)\n" nil t) (let ((start (match-beginning 0))) (if (not (re-search-forward "^=======\n" nil t)) (error "Malformed conflict marker")) (delete-region start (point)) - (if (not (re-search-forward "^>>>>>>> .r[0-9]+\n" nil t)) + (if (not (re-search-forward "^>>>>>>> .\\(r[0-9]+\\|merge.*\\)\n" nil t)) (error "Malformed conflict marker")) (replace-match ""))) (let ((config (current-window-configuration)) @@ -4199,6 +5796,86 @@ (svn-status-line-info->full-path file-info))) (error "can not resolve conflicts at this point")))) + +;; -------------------------------------------------------------------------------- +;; Working with branches +;; -------------------------------------------------------------------------------- + +(defun svn-branch-select (&optional prompt) + "Select a branch interactively from `svn-status-branch-list'" + (interactive) + (unless prompt + (setq prompt "Select branch: ")) + (let* ((branch (funcall svn-status-completing-read-function prompt svn-status-branch-list)) + (directory) + (base-url)) + (when (string-match "#\\(1#\\)?\\(.+\\)" branch) + (setq directory (match-string 2 branch)) + (setq base-url (concat (svn-status-base-info->repository-root) "/" directory)) + (save-match-data + (svn-status-parse-info t)) + (if (eq (length (match-string 1 branch)) 0) + (setq branch base-url) + (let ((svn-status-branch-list (svn-status-ls base-url t))) + (setq branch (concat (svn-status-base-info->repository-root) "/" + directory "/" + (svn-branch-select (format "Select branch from '%s': " directory))))))) + branch)) + +(defun svn-branch-diff (branch1 branch2) + "Show the diff between two svn repository urls. +When called interactively, use `svn-branch-select' to choose two branches from `svn-status-branch-list'." + (interactive + (let* ((branch1 (svn-branch-select "svn diff branch1: ")) + (branch2 (svn-branch-select (format "svn diff %s against: " branch1)))) + (list branch1 branch2))) + (svn-run t t 'diff "diff" svn-status-default-diff-arguments branch1 branch2)) + +;; -------------------------------------------------------------------------------- +;; svnadmin interface +;; -------------------------------------------------------------------------------- +(defun svn-admin-create (dir) + "Run svnadmin create DIR." + (interactive (list (expand-file-name + (svn-read-directory-name "Create a svn repository at: " + svn-admin-default-create-directory nil nil)))) + (shell-command-to-string (concat "svnadmin create " dir)) + (setq svn-admin-last-repository-dir (concat "file://" dir)) + (message "Svn repository created at %s" dir) + (run-hooks 'svn-admin-create-hook)) + +;; - Import an empty directory +;; cd to an empty directory +;; svn import -m "Initial import" . file:///home/stefan/svn_repos/WaldiConfig/trunk +(defun svn-admin-create-trunk-directory () + "Import an empty trunk directory to `svn-admin-last-repository-dir'. +Set `svn-admin-last-repository-dir' to the new created trunk url." + (interactive) + (let ((empty-temp-dir-name (make-temp-name svn-status-temp-dir))) + (make-directory empty-temp-dir-name t) + (setq svn-admin-last-repository-dir (concat svn-admin-last-repository-dir "/trunk")) + (svn-run nil t 'import "import" "-m" "Created trunk directory" + empty-temp-dir-name svn-admin-last-repository-dir) + (delete-directory empty-temp-dir-name))) + +(defun svn-admin-start-import () + "Start to import the current working directory in a subversion repository. +The user is asked to perform the following two steps: +1. Create a local repository +2. Add a trunk directory to that repository + +After that step the empty base directory (either the root directory or +the trunk directory of the selected repository) is checked out in the current +working directory." + (interactive) + (if (y-or-n-p "Create local repository? ") + (progn + (call-interactively 'svn-admin-create) + (when (y-or-n-p "Add a trunk directory? ") + (svn-admin-create-trunk-directory))) + (setq svn-admin-last-repository-dir (read-string "Repository Url: "))) + (svn-checkout svn-admin-last-repository-dir ".")) + ;; -------------------------------------------------------------------------------- ;; svn status profiling ;; -------------------------------------------------------------------------------- @@ -4216,6 +5893,80 @@ (elp-instrument-package "svn-") (message "Run the desired svn command (e.g. M-x svn-status), then use M-x elp-results.")) +(defun svn-status-last-commands (&optional string-prefix) + "Return a string with the last executed svn commands" + (interactive) + (unless string-prefix + (setq string-prefix "")) + (with-output-to-string + (dolist (e (ring-elements svn-last-cmd-ring)) + (princ (format "%s%s: svn %s <%s>\n" string-prefix (nth 0 e) (mapconcat 'concat (nth 1 e) " ") (nth 2 e)))))) + +;; -------------------------------------------------------------------------------- +;; reporting bugs +;; -------------------------------------------------------------------------------- +(defun svn-insert-indented-lines (text) + "Helper function to insert TEXT, indented by two characters." + (dolist (line (split-string text "\n")) + (insert (format " %s\n" line)))) + +(defun svn-prepare-bug-report () + "Create the buffer *psvn-bug-report*. This buffer can be useful to debug problems with psvn.el" + (interactive) + (let* ((last-output-buffer-name (or svn-status-last-output-buffer-name svn-process-buffer-name)) + (last-svn-cmd-output (with-current-buffer last-output-buffer-name + (buffer-substring-no-properties (point-min) (point-max))))) + (switch-to-buffer "*psvn-bug-report*") + (delete-region (point-min) (point-max)) + (insert "This buffer holds some debug informations for psvn.el\n") + (insert "Please enter a description of the observed and the wanted behaviour\n") + (insert "and send it to the author (stefan at xsteve.at) to allow easier debugging\n\n") + (insert "Revisions:\n") + (svn-insert-indented-lines (svn-status-version)) + (insert "Language environment:\n") + (dolist (elem (svn-process-environment)) + (when (member (car (split-string elem "=")) '("LC_MESSAGES" "LC_ALL" "LANG")) + (insert (format " %s\n" elem)))) + (insert "\nLast svn commands:\n") + (svn-insert-indented-lines (svn-status-last-commands)) + (insert (format "\nContent of the <%s> buffer:\n" last-output-buffer-name)) + (svn-insert-indented-lines last-svn-cmd-output) + (goto-char (point-min)))) + +;; -------------------------------------------------------------------------------- +;; Make it easier to reload psvn, if a distribution has an older version +;; Just add the following to your .emacs: +;; (svn-prepare-for-reload) +;; (load "/path/to/psvn.el") + +;; Note the above will only work, if the loaded psvn.el has already the +;; function svn-prepare-for-reload +;; If this is not the case, do the following: +;; (load "/path/to/psvn.el");;make svn-prepare-for-reload available +;; (svn-prepare-for-reload) +;; (load "/path/to/psvn.el");; update the keybindings +;; -------------------------------------------------------------------------------- + +(defvar svn-prepare-for-reload-dont-touch-list '() "A list of variables that should not be touched by `svn-prepare-for-reload'") +(defvar svn-prepare-for-reload-variables-list '(svn-global-keymap svn-status-diff-mode-map svn-global-trac-map svn-status-mode-map + svn-status-mode-property-map svn-status-mode-extension-map + svn-status-mode-options-map svn-status-mode-trac-map svn-status-mode-branch-map + svn-log-edit-mode-map svn-log-view-mode-map + svn-log-view-popup-menu-map svn-info-mode-map svn-blame-mode-map svn-process-mode-map) + "A list of variables that should be set to nil via M-x `svn-prepare-for-reload'") +(defun svn-prepare-for-reload () + "This function resets some psvn.el variables to nil. +It makes reloading a newer version of psvn.el easier, if for example the used +GNU/Linux distribution uses an older version. + +The variables specified in `svn-prepare-for-reload-variables-list' will be reseted by this function. + +A variable will keep its value, if it is specified in `svn-prepare-for-reload-dont-touch-list'." + (interactive) + (dolist (var svn-prepare-for-reload-variables-list) + (unless (member var svn-prepare-for-reload-dont-touch-list) + (message (format "Resetting value of %s to nil" var))) + (set var nil))) (provide 'psvn) Index: sources =================================================================== RCS file: /cvs/extras/rpms/subversion/F-8/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 31 Jan 2008 15:47:08 -0000 1.28 +++ sources 17 Jul 2008 12:55:20 -0000 1.29 @@ -1 +1 @@ -32786fe2f322982c0567346de18f6460 subversion-1.4.6.tar.gz +c40c1ebc1f228d8ea17dd0e7997a60c1 subversion-1.5.0.tar.gz Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/F-8/subversion.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- subversion.spec 13 Feb 2008 14:38:01 -0000 1.103 +++ subversion.spec 17 Jul 2008 12:55:20 -0000 1.104 @@ -14,8 +14,8 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion -Version: 1.4.6 -Release: 2%{?dist} +Version: 1.5.0 +Release: 8.1%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -25,10 +25,9 @@ Source4: http://www.xsteve.at/prg/emacs/psvn.el Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-0.31.0-rpath.patch -Patch6: subversion-1.0.3-pie.patch +Patch6: subversion-1.5.0-pie.patch Patch7: subversion-1.1.3-java.patch -Patch8: subversion-1.4.4-macropen.patch -Patch9: subversion-1.4.4-swig1333.patch +Patch8: subversion-1.5.0-perl510.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7 @@ -74,7 +73,7 @@ Group: Development/Libraries Summary: Perl bindings to the Subversion libraries BuildRequires: perl-devel >= 2:5.8.0, perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More) +BuildRequires: perl(Test::More), perl(ExtUtils::Embed) Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") Requires: subversion = %{version}-%{release} @@ -110,11 +109,11 @@ %if %{with_java} %patch7 -p1 -b .java %endif -%patch8 -p1 -b .macropen -%patch9 -p1 -b .swig1333 +%patch8 -p1 -b .perl510 %build -./autogen.sh +# Regenerate after patches to build.conf et al +autoheader && autoconf && ./gen-make.py --reload # fix shebang lines, #111498 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in @@ -125,19 +124,17 @@ export svn_cv_ruby_sitedir_archsuffix="" export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} -export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25" %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --with-swig --with-neon=%{_prefix} \ --with-ruby-sitedir=%{ruby_sitearch} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation \ - --disable-static --disable-neon-version-check -# 1.3.0 tarball ships with generated swig sources -make extraclean-swig-headers + --disable-static make %{?_smp_mflags} all make swig-py swig-py-lib %{swigdirs} make swig-pl swig-pl-lib swig-rb swig-rb-lib %if %{with_java} -make %{?_smp_mflags} javahl +# javahl does not parallel-make +make javahl %endif %install @@ -145,7 +142,7 @@ make install install-swig-py install-swig-pl-lib install-swig-rb \ DESTDIR=$RPM_BUILD_ROOT %{swigdirs} %if %{with_java} -make install-javahl DESTDIR=$RPM_BUILD_ROOT +make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir} DESTDIR=$RPM_BUILD_ROOT %endif make pure_vendor_install -C subversion/bindings/swig/perl/native \ @@ -227,7 +224,9 @@ %defattr(-,root,root) %doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES %doc tools subversion/LICENSE mod_authz_svn-INSTALL -%doc contrib/client-side/svn_load_dirs{.pl,_*,.README} +%doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README} +%doc contrib/client-side/svnmerge/*.{README,py} +%doc contrib/client-side/wcgrep %{_bindir}/* %{_libdir}/libsvn_*.so.* %{_mandir}/man*/* @@ -272,16 +271,65 @@ %files javahl %defattr(-,root,root,-) %{_libdir}/libsvnjavahl-1.* -%{_libdir}/svn-javahl +%{_javadir}/svn-javahl.jar %endif %changelog -* Wed Feb 13 2008 Joe Orton 1.4.6-2.fc8 -- fix build of swig bindings +* Thu Jul 17 2008 Joe Orton 1.5.0-8.1 +- rebuild for F-8 -* Thu Jan 31 2008 Joe Orton 1.4.6-1.fc8 +* Thu Jul 3 2008 Joe Orton 1.5.0-8 +- require suitable APR + +* Thu Jul 3 2008 Joe Orton 1.5.0-7 +- add svnmerge and wcgrep to docdir (Edward Rudd, #451932) +- drop neon version overrides + +* Wed Jul 2 2008 Joe Orton 1.5.0-6 +- build with OpenJDK + +* Wed Jul 2 2008 Joe Orton 1.5.0-5 +- fix files list + +* Wed Jul 2 2008 Joe Orton 1.5.0-4 +- swig-perl test suite fix for Perl 5.10 (upstream r31546) + +* Tue Jul 1 2008 Joe Orton 1.5.0-3 +- attempt build without java bits + +* Thu Jun 26 2008 Joe Orton 1.5.0-2 +- update to 1.5.0 + +* Mon Mar 3 2008 Tom "spot" Callaway 1.4.6-7 +- tests are randomly failing, unrelated to new perl, disabled tests + +* Mon Mar 3 2008 Tom "spot" Callaway 1.4.6-6 +- rebuild for new perl (again) + +* Thu Feb 21 2008 Lubomir Kundrak 1.4.6-5 +- Correct install location of java stuff (#433295) + +* Wed Feb 6 2008 Tom "spot" Callaway 1.4.6-4 +- BR perl(ExtUtils::Embed) + +* Tue Feb 5 2008 Tom "spot" Callaway 1.4.6-3 +- rebuild for new perl + +* Fri Dec 21 2007 Joe Orton 1.4.6-2 - update to 1.4.6 +* Mon Dec 10 2007 Warren Togami 1.4.4-11 +- temporarily disable test suite + +* Thu Dec 6 2007 Joe Orton 1.4.4-10 +- fix build with swig 1.3.33 (patch by Torsten Landschoff) + +* Wed Dec 5 2007 Joe Orton 1.4.4-9 +- rebuild for OpenLDAP soname bump + +* Tue Sep 4 2007 Joe Orton 1.4.4-8 +- update to psvn.el r26383 from upstream + * Sun Sep 2 2007 Joe Orton 1.4.4-7 - rebuild for fixed 32-bit APR Index: upstream =================================================================== RCS file: /cvs/extras/rpms/subversion/F-8/upstream,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- upstream 3 Jul 2007 11:18:01 -0000 1.15 +++ upstream 17 Jul 2008 12:55:20 -0000 1.16 @@ -1 +1 @@ -subversion-1.4.4.tar.gz +subversion-1.5.0.tar.gz --- subversion-1.0.3-pie.patch DELETED --- --- subversion-1.4.4-macropen.patch DELETED --- --- subversion-1.4.4-swig1333.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 13:06:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:06:03 +0000 Subject: [pkgdb] pnp4nagios: romal has requested watchbugzilla Message-ID: <200807171306.m6HD63nJ005345@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on pnp4nagios (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:06:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:06:06 +0000 Subject: [pkgdb] pnp4nagios: romal has requested watchcommits Message-ID: <200807171306.m6HD65Pq005365@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on pnp4nagios (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:06:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:06:09 +0000 Subject: [pkgdb] pnp4nagios: romal has requested commit Message-ID: <200807171306.m6HD63nM005345@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on pnp4nagios (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:06:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:06:38 +0000 Subject: [pkgdb] pnp4nagios: romal has requested watchbugzilla Message-ID: <200807171306.m6HD6c5l005421@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on pnp4nagios (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:06:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:06:40 +0000 Subject: [pkgdb] pnp4nagios: romal has requested watchcommits Message-ID: <200807171306.m6HD65Pt005365@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchcommits acl on pnp4nagios (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:06:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:06:41 +0000 Subject: [pkgdb] pnp4nagios: romal has requested commit Message-ID: <200807171306.m6HD63nP005345@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the commit acl on pnp4nagios (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:08:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:08:46 +0000 Subject: [pkgdb] xmlsec1 had groupAcl changed Message-ID: <200807171308.m6HD8koI005561@bastion.fedora.phx.redhat.com> Daniel Veillard (veillard) has set the commit acl on xmlsec1 (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xmlsec1 From fedora-extras-commits at redhat.com Thu Jul 17 13:09:32 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Thu, 17 Jul 2008 13:09:32 GMT Subject: rpms/uim/devel uim.spec,1.65,1.66 xinput.d-uim,1.4,1.5 Message-ID: <200807171309.m6HD9W0j004868@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4740 Modified Files: uim.spec xinput.d-uim Log Message: * Tue Jul 15 2008 Akira TAGOH - 1.5.0-4 - Requires: imsettings instead of im-chooser. - Add ICON parameter to uim.conf. - Use Qt implementation of candidate window if the desktop session is KDE. - set the appropriate immodule for multilib as scim does. Index: uim.spec =================================================================== RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- uim.spec 14 Jul 2008 08:15:59 -0000 1.65 +++ uim.spec 17 Jul 2008 13:08:34 -0000 1.66 @@ -3,7 +3,7 @@ Name: uim Version: 1.5.0 -Release: 3%{?dist} +Release: 4%{?dist} # uim itself is licensed under BSD # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h} # and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+ @@ -34,7 +34,7 @@ Group: System Environment/Libraries Requires(post): %{_sbindir}/alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig -Requires: im-chooser >= 0.4.1-2.fc8 +Requires: imsettings %package devel Summary: Development files for the Uim library @@ -510,6 +510,13 @@ %dir %{_datadir}/uim %changelog +* Tue Jul 15 2008 Akira TAGOH - 1.5.0-4 +- Requires: imsettings instead of im-chooser. +- Add ICON parameter to uim.conf. +- Use Qt implementation of candidate window if the desktop + session is KDE. +- set the appropriate immodule for multilib as scim does. + * Mon Jul 14 2008 Akira TAGOH - 1.5.0-3 - Add missing files. (#454957) Index: xinput.d-uim =================================================================== RCS file: /cvs/pkgs/rpms/uim/devel/xinput.d-uim,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xinput.d-uim 31 Jan 2008 02:33:16 -0000 1.4 +++ xinput.d-uim 17 Jul 2008 13:08:34 -0000 1.5 @@ -1,7 +1,44 @@ XIM=uim XIM_PROGRAM=/usr/bin/uim-xim -GTK_IM_MODULE=uim -QT_IM_MODULE=uim SHORT_DESC=UIM PREFERENCE_PROGRAM=/usr/bin/uim-pref-gtk AUXILIARY_PROGRAM=/usr/bin/uim-toolbar-gtk-systray +ICON=/usr/share/uim/pixmaps/uim-icon.png + +gtkimm_exists () { + # check if any immodules installed + for dir in /usr/lib*/gtk-2.0/*/immodules; do + [ -x ${dir}/im-$1.so ] && return 0 + done + return 1 +} + +if gtkimm_exists uim; then + GTK_IM_MODULE=uim +else + GTK_IM_MODULE=xim +fi + +qtimm_exists () { + # check if any immodule installed + for dir in /usr/lib*/qt4/plugins/inputmethods; do + [ -x ${dir}/$1.so ] && return 0 + done + return 1 +} + +if qtimm_exists libuiminputcontextplugin; then + QT_IM_MODULE=uim +else + QT_IM_MODULE=xim +fi + +if [ "x$DESKTOP_SESSION" = "xkde" ]; then + if test -x /usr/libexec/uim-candwin-qt; then + UIM_CANDWIN_PROG=/usr/libexec/uim-candwin-qt + export UIM_CANDWIN_PROG + fi +# if test -x /usr/bin/uim-pref-qt; then +# PREFERENCE_PROGRAM=/usr/bin/uim-pref-qt +# fi +fi From fedora-extras-commits at redhat.com Thu Jul 17 13:11:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:11:27 +0000 Subject: [pkgdb] nagios-plugins: romal has given up watchbugzilla Message-ID: <200807171311.m6HDBRJV005658@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has given up the watchbugzilla acl on nagios-plugins (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Thu Jul 17 13:11:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:11:29 +0000 Subject: [pkgdb] nagios-plugins: romal has requested watchbugzilla Message-ID: <200807171311.m6HDBT2O005677@bastion.fedora.phx.redhat.com> Robert M. Albrecht (romal) has requested the watchbugzilla acl on nagios-plugins (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Thu Jul 17 13:13:26 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Thu, 17 Jul 2008 13:13:26 GMT Subject: rpms/subversion/F-8 subversion.spec,1.104,1.105 Message-ID: <200807171313.m6HDDQXr005271@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5178 Modified Files: subversion.spec Log Message: * Thu Jul 17 2008 Joe Orton 1.5.0-8.2 - rebuild with OpenJDK Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/F-8/subversion.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- subversion.spec 17 Jul 2008 12:55:20 -0000 1.104 +++ subversion.spec 17 Jul 2008 13:12:39 -0000 1.105 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 8.1%{?dist} +Release: 8.2%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -85,7 +85,7 @@ Group: Development/Libraries Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-devel +BuildRequires: java-devel-openjdk %description javahl This package includes the JNI bindings to the Subversion libraries. @@ -275,6 +275,9 @@ %endif %changelog +* Thu Jul 17 2008 Joe Orton 1.5.0-8.2 +- rebuild with OpenJDK + * Thu Jul 17 2008 Joe Orton 1.5.0-8.1 - rebuild for F-8 From fedora-extras-commits at redhat.com Thu Jul 17 13:14:54 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Thu, 17 Jul 2008 13:14:54 GMT Subject: rpms/qgit/devel qgit-2.2-qmake.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 qgit.spec, 1.23, 1.24 sources, 1.15, 1.16 qgit-2.1-qmake.patch, 1.1, NONE Message-ID: <200807171314.m6HDEs2f005445@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5357 Modified Files: .cvsignore qgit.spec sources Added Files: qgit-2.2-qmake.patch Removed Files: qgit-2.1-qmake.patch Log Message: * Thu Jul 17 2008 Dan Horak 2.2-1 - update to upstream version 2.2 qgit-2.2-qmake.patch: --- NEW FILE qgit-2.2-qmake.patch --- --- qgit/src/src.pro.qmake 2008-06-07 16:37:41.000000000 +0200 +++ qgit/src/src.pro 2008-07-17 14:53:54.000000000 +0200 @@ -38,13 +38,13 @@ unix { TARGET = qgit - target.path = ~/bin + target.path = /usr/bin CONFIG += x11 } HAVE_GCC { - QMAKE_CXXFLAGS_RELEASE += -s -O2 -Wno-non-virtual-dtor -Wno-long-long -pedantic -Wconversion - QMAKE_CXXFLAGS_DEBUG += -g3 -ggdb -O0 -Wno-non-virtual-dtor -Wno-long-long -pedantic -Wconversion + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CXXFLAGS_DEBUG += } ENABLE_CONSOLE_MSG { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 31 Dec 2007 16:37:07 -0000 1.15 +++ .cvsignore 17 Jul 2008 13:14:02 -0000 1.16 @@ -1 +1 @@ -qgit-2.1.tar.bz2 +qgit-2.2.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- qgit.spec 10 Feb 2008 13:17:26 -0000 1.23 +++ qgit.spec 17 Jul 2008 13:14:02 -0000 1.24 @@ -1,6 +1,6 @@ Name: qgit -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -9,7 +9,7 @@ Source0: http://dl.sourceforge.net/qgit/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}48d.png -Patch0: %{name}-2.1-qmake.patch +Patch0: %{name}-2.2-qmake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt4-devel @@ -21,7 +21,10 @@ %prep %setup -q -n %{name} -%patch0 -p0 -b .qmake +%patch0 -p1 -b .qmake + +# fix permissions +chmod a-x src/*.{cpp,h} %build @@ -45,14 +48,17 @@ %files -%doc COPYING README %defattr(-,root,root,-) +%doc README %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Jul 17 2008 Dan Horak 2.2-1 +- update to upstream version 2.2 + * Sun Feb 10 2008 Dan Horak 2.1-3 - rebuild for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 31 Dec 2007 16:37:07 -0000 1.15 +++ sources 17 Jul 2008 13:14:02 -0000 1.16 @@ -1 +1 @@ -f22787c814fbe832d6da7c6a2436c3c0 qgit-2.1.tar.bz2 +f863efa000aa1549f803c6ad743decd6 qgit-2.2.tar.bz2 --- qgit-2.1-qmake.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 13:17:45 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Thu, 17 Jul 2008 13:17:45 GMT Subject: rpms/qgit/F-9 qgit-2.2-qmake.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 qgit.spec, 1.23, 1.24 sources, 1.15, 1.16 qgit-2.1-qmake.patch, 1.1, NONE Message-ID: <200807171317.m6HDHjMl005870@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5698 Modified Files: .cvsignore qgit.spec sources Added Files: qgit-2.2-qmake.patch Removed Files: qgit-2.1-qmake.patch Log Message: * Thu Jul 17 2008 Dan Horak 2.2-1 - update to upstream version 2.2 qgit-2.2-qmake.patch: --- NEW FILE qgit-2.2-qmake.patch --- --- qgit/src/src.pro.qmake 2008-06-07 16:37:41.000000000 +0200 +++ qgit/src/src.pro 2008-07-17 14:53:54.000000000 +0200 @@ -38,13 +38,13 @@ unix { TARGET = qgit - target.path = ~/bin + target.path = /usr/bin CONFIG += x11 } HAVE_GCC { - QMAKE_CXXFLAGS_RELEASE += -s -O2 -Wno-non-virtual-dtor -Wno-long-long -pedantic -Wconversion - QMAKE_CXXFLAGS_DEBUG += -g3 -ggdb -O0 -Wno-non-virtual-dtor -Wno-long-long -pedantic -Wconversion + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CXXFLAGS_DEBUG += } ENABLE_CONSOLE_MSG { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 31 Dec 2007 16:37:07 -0000 1.15 +++ .cvsignore 17 Jul 2008 13:16:46 -0000 1.16 @@ -1 +1 @@ -qgit-2.1.tar.bz2 +qgit-2.2.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/F-9/qgit.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- qgit.spec 10 Feb 2008 13:17:26 -0000 1.23 +++ qgit.spec 17 Jul 2008 13:16:46 -0000 1.24 @@ -1,6 +1,6 @@ Name: qgit -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -9,7 +9,7 @@ Source0: http://dl.sourceforge.net/qgit/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}48d.png -Patch0: %{name}-2.1-qmake.patch +Patch0: %{name}-2.2-qmake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt4-devel @@ -21,7 +21,10 @@ %prep %setup -q -n %{name} -%patch0 -p0 -b .qmake +%patch0 -p1 -b .qmake + +# fix permissions +chmod a-x src/*.{cpp,h} %build @@ -45,14 +48,17 @@ %files -%doc COPYING README %defattr(-,root,root,-) +%doc README %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Jul 17 2008 Dan Horak 2.2-1 +- update to upstream version 2.2 + * Sun Feb 10 2008 Dan Horak 2.1-3 - rebuild for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 31 Dec 2007 16:37:07 -0000 1.15 +++ sources 17 Jul 2008 13:16:46 -0000 1.16 @@ -1 +1 @@ -f22787c814fbe832d6da7c6a2436c3c0 qgit-2.1.tar.bz2 +f863efa000aa1549f803c6ad743decd6 qgit-2.2.tar.bz2 --- qgit-2.1-qmake.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 13:19:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:24 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJObP006069@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the watchcommits acl on pnp4nagios (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:24 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJO0H006072@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the watchbugzilla acl on pnp4nagios (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:25 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJObS006069@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the commit acl on pnp4nagios (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:26 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJQNE006123@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the watchcommits acl on pnp4nagios (Fedora 9) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:27 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJObV006069@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the watchbugzilla acl on pnp4nagios (Fedora 9) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:29 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJQNH006123@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the watchbugzilla acl on pnp4nagios (Fedora EPEL 5) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:42 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJgx6006186@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the commit acl on pnp4nagios (Fedora 9) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:43 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJhfC006208@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the commit acl on pnp4nagios (Fedora EPEL 5) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:19:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:19:44 +0000 Subject: [pkgdb] pnp4nagios had acl change status Message-ID: <200807171319.m6HDJgx9006186@bastion.fedora.phx.redhat.com> Xavier Bachelot (xavierb) has set the watchcommits acl on pnp4nagios (Fedora EPEL 5) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pnp4nagios From fedora-extras-commits at redhat.com Thu Jul 17 13:28:46 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 17 Jul 2008 13:28:46 GMT Subject: rpms/openoffice.org/devel workspace.native172.patch, NONE, 1.1 openoffice.org.spec, 1.1582, 1.1583 Message-ID: <200807171328.m6HDSkYD006775@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6714 Modified Files: openoffice.org.spec Added Files: workspace.native172.patch Log Message: sdk foo workspace.native172.patch: --- NEW FILE workspace.native172.patch --- Index: installation/scp2/source/ooo/profileitem_ooo.scp diff -u installation/scp2/source/ooo/profileitem_ooo.scp:1.66 installation/scp2/source/ooo/profileitem_ooo.scp:1.66.30.1 --- installation/scp2/source/ooo/profileitem_ooo.scp:1.66 Wed Jul 2 02:45:57 2008 +++ installation/scp2/source/ooo/profileitem_ooo.scp Wed Jul 16 06:16:02 2008 @@ -540,7 +540,7 @@ ProfileID = gid_Profile_Fundamentalbasis_Ini; Section = "Bootstrap"; Key = "URE_MORE_JAVA_TYPES"; - Value = "$ORIGIN/classes/unoil.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}"; + Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}"; End ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1582 retrieving revision 1.1583 diff -u -r1.1582 -r1.1583 --- openoffice.org.spec 17 Jul 2008 07:41:39 -0000 1.1582 +++ openoffice.org.spec 17 Jul 2008 13:27:56 -0000 1.1583 @@ -113,11 +113,13 @@ Patch41: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch Patch42: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch Patch43: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +Patch44: workspace.native172.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org %define ureinstdir %{baseinstdir}/ure %define basisinstdir %{baseinstdir}/basis3.0 +%define sdkinstdir %{baseinstdir}/basis3.0/sdk %define oooinstdir %{instdir}/openoffice.org3 %define brinstdir %{instdir}/broffice.org3 %define OFFICEUPD 300 @@ -232,7 +234,7 @@ Summary: BeanShell support for %{name} Group: Development/Libraries Requires: bsh -Requires: %{name}-base-core = %{epoch}:%{version}-%{release} +Requires: %{name}-core = %{epoch}:%{version}-%{release} %description bsh Support BeanShell scripts in %{name}. @@ -240,7 +242,7 @@ %package rhino Summary: JavaScript support for %{name} Group: Development/Libraries -Requires: %{name}-base-core = %{epoch}:%{version}-%{release} +Requires: %{name}-core = %{epoch}:%{version}-%{release} %description rhino Support JavaScript scripts in %{name}. @@ -488,7 +490,7 @@ %description sdk The %{name} SDK is an add-on for the %{name} office suite. It provides the necessary tools for programming using the %{name} APIs and for creating extensions (UNO components) for %{name}. -Run %{baseinstdir}/sdk/setsdkenv_unix.sh to set the build environment for building against the sdk. +Run %{sdkinstdir}/setsdkenv_unix.sh to set the build environment for building against the sdk. %package sdk-doc Summary: Software Development Kit documentation for %{name} @@ -1268,6 +1270,7 @@ %patch41 -p1 -b .ooo90876.connectivity.evoab2.patch %patch42 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch %patch43 -p1 -b .ooo86142.serbiannumbering.patch +%patch44 -p1 -b .workspace.native172.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1452,7 +1455,7 @@ ln -s ../../../../../%{baseinstdir}/share/uno_packages/cache cache popd %endif -export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{baseinstdir}/sdk" +export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}" export WITH_LANG="en-US" dmake sdkoo cd ../../ @@ -1482,10 +1485,10 @@ # revoke ScriptProviders and make into extensions pushd $RPM_BUILD_ROOT/%{basisinstdir}/program -regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForBeanShell.jar" +regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar" mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip -regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForJavaScript.jar" +regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar" mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript @@ -1494,20 +1497,20 @@ popd #add enough to the sdk to build the kde vcl plug out of tree -cp -r solenv/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk -cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{baseinstdir}/sdk/bin -cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include -cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include -cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include -cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include -cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include -cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include +cp -r solenv/ $RPM_BUILD_ROOT/%{sdkinstdir} +cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{sdkinstdir}/bin +cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{sdkinstdir}/include +cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{sdkinstdir}/include +cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{sdkinstdir}/include +cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{sdkinstdir}/include +cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{sdkinstdir}/include +cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{sdkinstdir}/include #configure sdk -pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk +pushd $RPM_BUILD_ROOT/%{sdkinstdir} for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do sed -e "s, at OO_SDK_NAME@,sdk," \ - -e "s, at OO_SDK_HOME@,%{baseinstdir}/sdk," \ + -e "s, at OO_SDK_HOME@,%{sdkinstdir}," \ -e "s, at OFFICE_HOME@,%{basisinstdir}," \ -e "s, at OO_SDK_URE_HOME@,%{ureinstdir}," \ -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \ @@ -1524,12 +1527,12 @@ mv solenv/unxlng*/bin/dmake solenv/bin rm -rf solenv/unx* #fix up checkdll - sed -i -e "s#^checkdll=.*#checkdll=\"%{baseinstdir}/sdk/bin/checkdll\"#g" solenv/bin/checkdll.sh + sed -i -e "s#^checkdll=.*#checkdll=\"%{sdkinstdir}/bin/checkdll\"#g" solenv/bin/checkdll.sh #make env - echo export PATH=\$PATH:%{baseinstdir}/sdk/solenv/bin > setdevelenv_unix.sh - echo export DMAKEROOT=%{baseinstdir}/sdk/solenv/inc/startup >> setdevelenv_unix.sh + echo export PATH=\$PATH:%{sdkinstdir}/solenv/bin > setdevelenv_unix.sh + echo export DMAKEROOT=%{sdkinstdir}/solenv/inc/startup >> setdevelenv_unix.sh echo export OS="LINUX" >> setdevelenv_unix.sh - echo export SOLARENV=%{baseinstdir}/sdk/solenv >> setdevelenv_unix.sh + echo export SOLARENV=%{sdkinstdir}/solenv >> setdevelenv_unix.sh echo export SOLARVER="\`pwd\`/solver/%{OFFICEUPD}" >> setdevelenv_unix.sh echo export SOLARVERSION="\$SOLARVER" >> setdevelenv_unix.sh echo export INPATH="$INPATH" >> setdevelenv_unix.sh @@ -1549,8 +1552,8 @@ echo export CPU="$CPU" >> setdevelenv_unix.sh echo export MAKEDEPEND=makedepend >> setdevelenv_unix.sh echo export MKOUT="mkout.pl" >> setdevelenv_unix.sh - echo export SOLARINC=\"-I%{baseinstdir}/sdk/include/stl -I%{baseinstdir}/sdk/include\" >> setdevelenv_unix.sh - echo export SOLARLIB=\"-L%{baseinstdir}/program\" >> setdevelenv_unix.sh + echo export SOLARINC=\"-I%{sdkinstdir}/include/stl -I%{sdkinstdir}/include\" >> setdevelenv_unix.sh + echo export SOLARLIB=\"-L%{basisinstdir}/program\" >> setdevelenv_unix.sh echo export GXX_INCLUDE_PATH="$GXX_INCLUDE_PATH" >> setdevelenv_unix.sh echo export EXTERNAL_WARNINGS_NOT_ERRORS="TRUE" >> setdevelenv_unix.sh echo export GVER="VCL" >> setdevelenv_unix.sh @@ -3477,33 +3480,33 @@ %files sdk %defattr(-,root,root,-) -%{baseinstdir}/sdk/ -%exclude %{baseinstdir}/sdk/setdevelenv_unix.sh -%exclude %{baseinstdir}/sdk/docs/ -%exclude %{baseinstdir}/sdk/examples/ -%exclude %{baseinstdir}/sdk/include/tools -%exclude %{baseinstdir}/sdk/include/comphelper -%exclude %{baseinstdir}/sdk/include/i18npool -%exclude %{baseinstdir}/sdk/include/vos -%exclude %{baseinstdir}/sdk/include/psprint -%exclude %{baseinstdir}/sdk/solenv -%exclude %{baseinstdir}/sdk/bin/checkdll +%{sdkinstdir}/ +%exclude %{sdkinstdir}/setdevelenv_unix.sh +%exclude %{sdkinstdir}/docs/ +%exclude %{sdkinstdir}/examples/ +%exclude %{sdkinstdir}/include/tools +%exclude %{sdkinstdir}/include/comphelper +%exclude %{sdkinstdir}/include/i18npool +%exclude %{sdkinstdir}/include/vos +%exclude %{sdkinstdir}/include/psprint +%exclude %{sdkinstdir}/solenv +%exclude %{sdkinstdir}/bin/checkdll %files sdk-doc %defattr(-,root,root,-) -%{baseinstdir}/sdk/docs/ -%{baseinstdir}/sdk/examples/ +%{sdkinstdir}/docs/ +%{sdkinstdir}/examples/ %files devel %defattr(-,root,root,-) -%{baseinstdir}/sdk/setdevelenv_unix.sh -%{baseinstdir}/sdk/include/tools -%{baseinstdir}/sdk/include/comphelper -%{baseinstdir}/sdk/include/i18npool -%{baseinstdir}/sdk/include/vos -%{baseinstdir}/sdk/include/psprint -%{baseinstdir}/sdk/solenv -%{baseinstdir}/sdk/bin/checkdll +%{sdkinstdir}/setdevelenv_unix.sh +%{sdkinstdir}/include/tools +%{sdkinstdir}/include/comphelper +%{sdkinstdir}/include/i18npool +%{sdkinstdir}/include/vos +%{sdkinstdir}/include/psprint +%{sdkinstdir}/solenv +%{sdkinstdir}/bin/checkdll %files headless %defattr(-,root,root,-) @@ -3557,10 +3560,11 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Wed Jul 16 2008 Caolan McNamara - 1:3.0.0-0.25-1 +* Thu Jul 17 2008 Caolan McNamara - 1:3.0.0-0.25-1 - next version - drop integrated openoffice.org-2.4.0.ooo85448.emptyrpath.patch - drop inregrated openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch +- add workspace.native172.patch for ScriptFramework extention bustage * Fri Jul 11 2008 Caolan McNamara - 1:3.0.0-0.24-1 - next version From fedora-extras-commits at redhat.com Thu Jul 17 13:29:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:00 +0000 Subject: [pkgdb] system-config-netboot ownership updated Message-ID: <200807171329.m6HDT0mf006525@bastion.fedora.phx.redhat.com> Package system-config-netboot in Fedora 7 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot From fedora-extras-commits at redhat.com Thu Jul 17 13:29:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:00 +0000 Subject: [pkgdb] system-config-netboot ownership updated Message-ID: <200807171329.m6HDT0Lr006524@bastion.fedora.phx.redhat.com> Package system-config-netboot in Fedora devel was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot From fedora-extras-commits at redhat.com Thu Jul 17 13:29:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:06 +0000 Subject: [pkgdb] system-config-netboot ownership updated Message-ID: <200807171329.m6HDT0Lt006524@bastion.fedora.phx.redhat.com> Package system-config-netboot in Fedora 9 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot From fedora-extras-commits at redhat.com Thu Jul 17 13:29:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:32 +0000 Subject: [pkgdb] system-config-bind had acl change status Message-ID: <200807171329.m6HDT0mh006525@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on system-config-bind (Fedora devel) to Approved for Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:29:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:32 +0000 Subject: [pkgdb] system-config-bind had acl change status Message-ID: <200807171329.m6HDTWgT006601@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchbugzilla acl on system-config-bind (Fedora devel) to Approved for Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:29:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:33 +0000 Subject: [pkgdb] system-config-bind had acl change status Message-ID: <200807171329.m6HDT0Lv006524@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the watchcommits acl on system-config-bind (Fedora devel) to Approved for Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:29:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:36 +0000 Subject: [pkgdb] system-config-bind had acl change status Message-ID: <200807171329.m6HDTZgD006655@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the approveacls acl on system-config-bind (Fedora devel) to Approved for Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:29:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:38 +0000 Subject: [pkgdb] system-config-bind ownership updated Message-ID: <200807171329.m6HDT0mk006525@bastion.fedora.phx.redhat.com> Package system-config-bind in Fedora devel was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:29:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:42 +0000 Subject: [pkgdb] system-config-bind ownership updated Message-ID: <200807171329.m6HDTZgG006655@bastion.fedora.phx.redhat.com> Package system-config-bind in Fedora 7 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:29:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:43 +0000 Subject: [pkgdb] system-config-bind ownership updated Message-ID: <200807171329.m6HDT0M0006524@bastion.fedora.phx.redhat.com> Package system-config-bind in Fedora 8 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:29:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:29:46 +0000 Subject: [pkgdb] system-config-bind ownership updated Message-ID: <200807171329.m6HDTlHg006739@bastion.fedora.phx.redhat.com> Package system-config-bind in Fedora 9 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:30:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:30:19 +0000 Subject: [pkgdb] system-config-netboot ownership updated Message-ID: <200807171330.m6HDTZgI006655@bastion.fedora.phx.redhat.com> Package system-config-netboot in Fedora devel is now owned by Jaroslav Reznik (jreznik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot From fedora-extras-commits at redhat.com Thu Jul 17 13:30:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:30:34 +0000 Subject: [pkgdb] system-config-netboot ownership updated Message-ID: <200807171330.m6HDUYn1006830@bastion.fedora.phx.redhat.com> Package system-config-netboot in Fedora 9 is now owned by Jaroslav Reznik (jreznik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot From fedora-extras-commits at redhat.com Thu Jul 17 13:30:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:30:35 +0000 Subject: [pkgdb] nagios-plugins had acl change status Message-ID: <200807171330.m6HDT0mm006525@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchbugzilla acl on nagios-plugins (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Thu Jul 17 13:30:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:30:37 +0000 Subject: [pkgdb] nagios-plugins had acl change status Message-ID: <200807171330.m6HDTZgK006655@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchcommits acl on nagios-plugins (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Thu Jul 17 13:30:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:30:40 +0000 Subject: [pkgdb] nagios-plugins had acl change status Message-ID: <200807171330.m6HDUeop006890@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the commit acl on nagios-plugins (Fedora devel) to Approved for Robert M. Albrecht (romal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nagios-plugins From fedora-extras-commits at redhat.com Thu Jul 17 13:31:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:31:06 +0000 Subject: [pkgdb] system-config-bind ownership updated Message-ID: <200807171331.m6HDV6tu006934@bastion.fedora.phx.redhat.com> Package system-config-bind in Fedora devel is now owned by Jaroslav Reznik (jreznik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:31:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:31:14 +0000 Subject: [pkgdb] system-config-bind ownership updated Message-ID: <200807171331.m6HDUeot006890@bastion.fedora.phx.redhat.com> Package system-config-bind in Fedora 8 is now owned by Jaroslav Reznik (jreznik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:31:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:31:23 +0000 Subject: [pkgdb] system-config-bind ownership updated Message-ID: <200807171331.m6HDVObV007017@bastion.fedora.phx.redhat.com> Package system-config-bind in Fedora 9 is now owned by Jaroslav Reznik (jreznik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-bind From fedora-extras-commits at redhat.com Thu Jul 17 13:32:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:32:47 +0000 Subject: [pkgdb] indent ownership updated Message-ID: <200807171332.m6HDWksm007094@bastion.fedora.phx.redhat.com> Package indent in Fedora devel was orphaned by Petr Machata (pmachata) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/indent From fedora-extras-commits at redhat.com Thu Jul 17 13:32:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:32:47 +0000 Subject: [pkgdb] indent ownership updated Message-ID: <200807171332.m6HDWlrs007108@bastion.fedora.phx.redhat.com> Package indent in Fedora 7 was orphaned by Petr Machata (pmachata) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/indent From fedora-extras-commits at redhat.com Thu Jul 17 13:32:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:32:48 +0000 Subject: [pkgdb] indent ownership updated Message-ID: <200807171332.m6HDWmBt007129@bastion.fedora.phx.redhat.com> Package indent in Fedora 8 was orphaned by Petr Machata (pmachata) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/indent From fedora-extras-commits at redhat.com Thu Jul 17 13:32:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:32:51 +0000 Subject: [pkgdb] indent ownership updated Message-ID: <200807171332.m6HDWlru007108@bastion.fedora.phx.redhat.com> Package indent in Fedora 9 was orphaned by Petr Machata (pmachata) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/indent From fedora-extras-commits at redhat.com Thu Jul 17 13:35:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:35:16 +0000 Subject: [pkgdb] indent ownership updated Message-ID: <200807171335.m6HDZHaH007327@bastion.fedora.phx.redhat.com> Package indent in Fedora devel is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/indent From fedora-extras-commits at redhat.com Thu Jul 17 13:35:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:35:18 +0000 Subject: [pkgdb] indent ownership updated Message-ID: <200807171335.m6HDZIfu007344@bastion.fedora.phx.redhat.com> Package indent in Fedora 8 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/indent From fedora-extras-commits at redhat.com Thu Jul 17 13:35:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:35:21 +0000 Subject: [pkgdb] indent ownership updated Message-ID: <200807171335.m6HDZLsg007361@bastion.fedora.phx.redhat.com> Package indent in Fedora 9 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/indent From fedora-extras-commits at redhat.com Thu Jul 17 13:35:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:35:41 +0000 Subject: [pkgdb] abiword (Fedora OLPC, 3) updated by ausil Message-ID: <200807171335.m6HDZfFm007413@bastion.fedora.phx.redhat.com> Dennis Gilmore (ausil) added a Fedora OLPC 3 branch for abiword Dennis Gilmore (ausil) has set commit to Approved for cvsextras on abiword (Fedora OLPC 3) Dennis Gilmore (ausil) has set build to Approved for cvsextras on abiword (Fedora OLPC 3) Dennis Gilmore (ausil) has set checkout to Approved for cvsextras on abiword (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abiword From fedora-extras-commits at redhat.com Thu Jul 17 13:40:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:40:39 +0000 Subject: [pkgdb] system-config-netboot ownership updated Message-ID: <200807171340.m6HDedXx007546@bastion.fedora.phx.redhat.com> Package system-config-netboot in Fedora 8 was orphaned by Radek Vok?l (rvokal) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot From fedora-extras-commits at redhat.com Thu Jul 17 13:40:50 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 17 Jul 2008 13:40:50 GMT Subject: rpms/python/devel python-2.5-config.patch, 1.7, 1.8 python.spec, 1.133, 1.134 Message-ID: <200807171340.m6HDeor1007947@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7881 Modified Files: python-2.5-config.patch python.spec Log Message: * Thu Jul 17 2008 Jeremy Katz - 2.5.1-28 - And actually build against db4-4.7 (#455170) python-2.5-config.patch: Index: python-2.5-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/python/devel/python-2.5-config.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-2.5-config.patch 14 Aug 2007 18:22:58 -0000 1.7 +++ python-2.5-config.patch 17 Jul 2008 13:39:58 -0000 1.8 @@ -248,7 +248,7 @@ -#DBINC=$(DB)/include -#DBLIB=$(DB)/lib -#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) -+DBLIBVER=4.6 ++DBLIBVER=4.7 +DBINC=/usr/include/db4 +DBLIB=/usr/lib +_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) Index: python.spec =================================================================== RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- python.spec 10 Jul 2008 14:42:32 -0000 1.133 +++ python.spec 17 Jul 2008 13:39:58 -0000 1.134 @@ -20,7 +20,7 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: 2.5.1 -Release: 27%{?dist} +Release: 28%{?dist} License: Python Group: Development/Languages Provides: python-abi = %{pybasever} @@ -508,6 +508,9 @@ %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so %changelog +* Thu Jul 17 2008 Jeremy Katz - 2.5.1-28 +- And actually build against db4-4.7 (#455170) + * Thu Jul 10 2008 Tom "spot" Callaway - 2.5.1-27 - fix license tag - enable support for db4-4.7 From fedora-extras-commits at redhat.com Thu Jul 17 13:41:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 13:41:20 +0000 Subject: [pkgdb] system-config-netboot ownership updated Message-ID: <200807171341.m6HDfKcB007591@bastion.fedora.phx.redhat.com> Package system-config-netboot in Fedora 8 is now owned by Jaroslav Reznik (jreznik) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot From fedora-extras-commits at redhat.com Thu Jul 17 13:44:57 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 13:44:57 GMT Subject: rpms/kdeplasmoids/devel kdeplasmoids.spec,1.7,1.8 Message-ID: <200807171344.m6HDivuM008266@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasmoids/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193 Modified Files: kdeplasmoids.spec Log Message: nuke dup'd BuildRoot Index: kdeplasmoids.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasmoids/devel/kdeplasmoids.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kdeplasmoids.spec 12 Jul 2008 01:23:25 -0000 1.7 +++ kdeplasmoids.spec 17 Jul 2008 13:44:12 -0000 1.8 @@ -8,8 +8,6 @@ License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake From fedora-extras-commits at redhat.com Thu Jul 17 13:59:25 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Thu, 17 Jul 2008 13:59:25 GMT Subject: rpms/linkage/devel linkage.spec,1.8,1.9 Message-ID: <200807171359.m6HDxPTO009110@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9091 Modified Files: linkage.spec Log Message: workaround a broken dep From fedora-extras-commits at redhat.com Thu Jul 17 14:00:23 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Thu, 17 Jul 2008 14:00:23 GMT Subject: rpms/linkage/devel linkage.spec,1.9,1.10 Message-ID: <200807171400.m6HE0N7n009202@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9118 Modified Files: linkage.spec Log Message: workaround a broken dep Index: linkage.spec =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linkage.spec 17 Jul 2008 13:59:07 -0000 1.9 +++ linkage.spec 17 Jul 2008 13:59:31 -0000 1.10 @@ -27,7 +27,7 @@ # docbook-utils requires text-www-browser which pulls in # w3m because of its short name, which needs to be rebuild against # the new gpm. -# Buildrequire another package that provides text-www-browser should get use +# Buildrequire another package that provides text-www-browser should get us # to build, remove after w3m is fixed. BuildRequires: lynx From fedora-extras-commits at redhat.com Thu Jul 17 14:15:45 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 14:15:45 GMT Subject: rpms/libkdcraw/F-9 .cvsignore, 1.7, 1.8 libkdcraw.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200807171415.m6HEFjnp017485@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libkdcraw/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17439 Modified Files: .cvsignore libkdcraw.spec sources Log Message: sync w/devel (libkdcraw-0.1.4) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jun 2008 19:57:09 -0000 1.7 +++ .cvsignore 17 Jul 2008 14:14:52 -0000 1.8 @@ -1 +1 @@ -libkdcraw-0.1.3.tar.bz2 +libkdcraw-0.1.4.tar.bz2 Index: libkdcraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/libkdcraw.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libkdcraw.spec 24 Jun 2008 19:57:09 -0000 1.10 +++ libkdcraw.spec 17 Jul 2008 14:14:52 -0000 1.11 @@ -5,8 +5,8 @@ %endif Name: libkdcraw -Version: 0.1.3 -Release: 2%{?dist}.1 +Version: 0.1.4 +Release: 2%{?dist} Summary: A library for decoding RAW picture files Group: Applications/Multimedia @@ -89,7 +89,7 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/libkdcraw.so.* -%{_libdir}/libkdcraw2/ +%{_libdir}/libkdcraw3/ %if ! 0%{?nuke_icons} %{_datadir}/icons/hicolor/*/*/* %endif @@ -102,9 +102,12 @@ %changelog -* Tue Jun 24 2008 Rex Dieter 0.1.3-2.1 +* Tue Jun 24 2008 Rex Dieter 0.1.4-2 - fix conflicts with kdegraphics (f9+, #452392) +* Wed Mar 12 2008 Rex Dieter 0.1.4-1 +- libkdcraw-0.1.4 + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.3-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jun 2008 19:57:09 -0000 1.7 +++ sources 17 Jul 2008 14:14:52 -0000 1.8 @@ -1 +1 @@ -dc4772804c17d7eff4f913048b8e1c3c libkdcraw-0.1.3.tar.bz2 +4fa5de407e9acf2eb5650d3fb5836f7d libkdcraw-0.1.4.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 14:21:50 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 14:21:50 GMT Subject: rpms/libkipi/F-9 .cvsignore, 1.6, 1.7 libkipi.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <200807171421.m6HELo9a018093@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libkipi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17926 Modified Files: .cvsignore libkipi.spec sources Log Message: sync w/devel (libkipi-0.1.6) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libkipi/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Dec 2006 10:51:46 -0000 1.6 +++ .cvsignore 17 Jul 2008 14:20:52 -0000 1.7 @@ -1 +1 @@ -libkipi-0.1.5.tar.bz2 +libkipi-0.1.6.tar.bz2 Index: libkipi.spec =================================================================== RCS file: /cvs/pkgs/rpms/libkipi/F-9/libkipi.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libkipi.spec 22 Feb 2008 14:33:49 -0000 1.17 +++ libkipi.spec 17 Jul 2008 14:20:52 -0000 1.18 @@ -1,13 +1,18 @@ +%if 0%{?fedora} > 8 +# see http://bugzilla.redhat.com/452392 +%define nuke_icons 1 +%endif + Name: libkipi -Version: 0.1.5 -Release: 4%{?dist} +Version: 0.1.6 +Release: 2%{?dist} Summary: Common plugin infrastructure for KDE image applications Group: System Environment/Libraries License: LGPLv2+ URL: http://extragear.kde.org/apps/kipi -Source0: http://downloads.sf.net/kipi/libkipi-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/kipi/libkipi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -55,6 +60,9 @@ # unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +%if 0%{?nuke_icons} +rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor +%endif %clean @@ -63,31 +71,43 @@ %post /sbin/ldconfig +%if ! 0%{?nuke_icons} touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +%endif %postun /sbin/ldconfig +%if ! 0%{?nuke_icons} touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +%endif %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO -%{_libdir}/lib*.so.* +%{_libdir}/libkipi.so.0* %{_datadir}/apps/kipi/ +%if ! 0%{?nuke_icons} %{_datadir}/icons/hicolor/*/*/* +%endif %{_datadir}/servicetypes/*.desktop %files devel %defattr(-,root,root,-) -%{_libdir}/lib*.so +%{_libdir}/libkipi.so %{_libdir}/pkgconfig/*.pc %{_includedir}/libkipi/ %changelog +* Tue Jun 24 2008 Rex Dieter 0.1.6-2 +- fix conflicts with kdegraphics (f9+, #452392) + +* Fri May 08 2008 Rex Dieter 0.1.6-1 +- libkipi-0.1.6 + * Fri Feb 22 2008 Rex Dieter 0.1.5-4 - cleanup, fixup for rawhide (#433965) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libkipi/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Dec 2006 10:51:46 -0000 1.6 +++ sources 17 Jul 2008 14:20:52 -0000 1.7 @@ -1 +1 @@ -aef790871583444cd81bd9dea9c3fd0b libkipi-0.1.5.tar.bz2 +6fd010aa8eab7039143f69543e806c65 libkipi-0.1.6.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 14:24:29 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 17 Jul 2008 14:24:29 GMT Subject: rpms/python/devel python.spec,1.134,1.135 Message-ID: <200807171424.m6HEOTCH018590@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18410 Modified Files: python.spec Log Message: * Thu Jul 17 2008 Jeremy Katz - 2.5.1-29 - Fix up the build for new rpm Index: python.spec =================================================================== RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- python.spec 17 Jul 2008 13:39:58 -0000 1.134 +++ python.spec 17 Jul 2008 14:23:34 -0000 1.135 @@ -2,6 +2,8 @@ #define __python_ver 25 %define unicode ucs4 +%define _default_patch_fuzz 2 + %if "%{__python_ver}" != "EMPTY" %define main_python 0 %define python python%{__python_ver} @@ -20,7 +22,7 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: 2.5.1 -Release: 28%{?dist} +Release: 29%{?dist} License: Python Group: Development/Languages Provides: python-abi = %{pybasever} @@ -80,7 +82,7 @@ BuildPrereq: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel BuildPrereq: tix-devel bzip2-devel sqlite-devel BuildPrereq: autoconf -BuildPrereq: db4-devel >= 4.6 +BuildPrereq: db4-devel >= 4.7 URL: http://www.python.org/ @@ -199,7 +201,7 @@ #patch50 -p1 -b .egginfo %patch60 -p1 -b .db47 -%if %{_lib} == lib64 +%if "%{_lib}" == "lib64" %patch101 -p1 -b .lib64-regex %patch102 -p1 -b .lib64 %endif @@ -368,7 +370,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/email/test/data/audiotest.au $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/test/audiotest.au # Fix bug #143667: python should own /usr/lib/python2.x on 64-bit machines -%if %{_lib} == lib64 +%if "%{_lib}" == "lib64" install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages %endif @@ -457,7 +459,7 @@ %{_libdir}/python%{pybasever}/test/__init__.py* %{_libdir}/python%{pybasever}/wsgiref %{_libdir}/python%{pybasever}/xml -%if %{_lib} == lib64 +%if "%{_lib}" == "lib64" %attr(0755,root,root) %dir /usr/lib/python%{pybasever} %attr(0755,root,root) %dir /usr/lib/python%{pybasever}/site-packages %endif @@ -508,6 +510,9 @@ %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so %changelog +* Thu Jul 17 2008 Jeremy Katz - 2.5.1-29 +- Fix up the build for new rpm + * Thu Jul 17 2008 Jeremy Katz - 2.5.1-28 - And actually build against db4-4.7 (#455170) From fedora-extras-commits at redhat.com Thu Jul 17 14:27:14 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 14:27:14 GMT Subject: rpms/libkexiv2/F-9 .cvsignore, 1.6, 1.7 libkexiv2.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200807171427.m6HEREZ4018844@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libkexiv2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18776 Modified Files: .cvsignore libkexiv2.spec sources Log Message: * Thu May 08 2008 Rex Dieter 1.1.7-1 - libkexiv2-0.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libkexiv2/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Sep 2007 14:41:13 -0000 1.6 +++ .cvsignore 17 Jul 2008 14:26:16 -0000 1.7 @@ -1,2 +1 @@ -clog -libkexiv2-0.1.6.tar.bz2 +libkexiv2-0.1.7.tar.bz2 Index: libkexiv2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libkexiv2/F-9/libkexiv2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libkexiv2.spec 8 Feb 2008 21:35:43 -0000 1.10 +++ libkexiv2.spec 17 Jul 2008 14:26:16 -0000 1.11 @@ -3,8 +3,8 @@ Summary: A library to manipulate EXIF/IPTC information Name: libkexiv2 -Version: 0.1.6 -Release: 4%{?dist} +Version: 0.1.7 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -81,6 +81,9 @@ %changelog +* Thu May 08 2008 Rex Dieter 1.1.7-1 +- libkexiv2-0.1.7 + * Fri Feb 08 2008 Rex Dieter 1.1.6-4 - respin (gcc43) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libkexiv2/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Sep 2007 14:41:13 -0000 1.6 +++ sources 17 Jul 2008 14:26:16 -0000 1.7 @@ -1 +1 @@ -8a256ac6a3895720a88b29eaf932917c libkexiv2-0.1.6.tar.bz2 +adfd55e11f919533ba450d4d49ef078f libkexiv2-0.1.7.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 14:32:00 2008 From: fedora-extras-commits at redhat.com (Minto Joseph (mintojoseph)) Date: Thu, 17 Jul 2008 14:32:00 GMT Subject: rpms/padauk-fonts/devel import.log, NONE, 1.1 padauk-fonts-fontconfig.conf, NONE, 1.1 padauk-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171432.m6HEW09I019260@cvs-int.fedora.redhat.com> Author: mintojoseph Update of /cvs/pkgs/rpms/padauk-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19135/devel Modified Files: .cvsignore sources Added Files: import.log padauk-fonts-fontconfig.conf padauk-fonts.spec Log Message: Initial Commit --- NEW FILE import.log --- padauk-fonts-2_4-2_fc8:HEAD:padauk-fonts-2.4-2.fc8.src.rpm:1216304464 --- NEW FILE padauk-fonts-fontconfig.conf --- Padauk sans-serif sans-serif Padauk --- NEW FILE padauk-fonts.spec --- %define fontname padauk %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename ttf-sil-padauk-2.4 Name: %{fontname}-fonts Version: 2.4 Release: 2%{?dist} Summary: Padauk font for Burmese and the Myanmar script Group: User Interface/X License: OFL URL: http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=Padauk # The source link is a redirect and is not directly accessible Source0: %{archivename}.tar.gz Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Padauk is a Myanmar font covering all currently used characters in the Myanmar block.The font aims to cover all minority language needs. At the moment, these do not extend to stylistic variation needs. The font is a smart font using a Graphite description. %prep %setup -q -c for txt in doc/*.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p font-source/*.ttf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/65-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc doc/*.txt %config(noreplace) %{fontconfdir}/65-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.ttf %changelog * Fri Jul 15 2008 Minto Joseph - 2.4-2 - Changed setup macro and fontconfig rules - Changed fontconfig prefix * Fri Jul 15 2008 Minto Joseph - 2.4-1 - Changed versioning - Added configuration file - Added more description - Added license file * Fri Jul 11 2008 Minto Joseph - 20080617-1 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/padauk-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:11:11 -0000 1.1 +++ .cvsignore 17 Jul 2008 14:31:09 -0000 1.2 @@ -0,0 +1 @@ +ttf-sil-padauk-2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/padauk-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:11:11 -0000 1.1 +++ sources 17 Jul 2008 14:31:09 -0000 1.2 @@ -0,0 +1 @@ +f328e367efc7425d7b161d1c287d8caa ttf-sil-padauk-2.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 14:36:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 14:36:21 GMT Subject: rpms/e2tools/devel e2tools.spec,1.6,1.7 Message-ID: <200807171436.m6HEaLIY019745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/e2tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19565 Modified Files: e2tools.spec Log Message: fix license tag Index: e2tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2tools/devel/e2tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- e2tools.spec 11 Feb 2008 16:03:40 -0000 1.6 +++ e2tools.spec 17 Jul 2008 14:35:09 -0000 1.7 @@ -1,10 +1,11 @@ Name: e2tools Version: 0.0.16 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Manipulate files in unmounted ext2/ext3 filesystems Group: Applications/System -License: GPL +# No version specified. +License: GPL+ URL: http://home.earthlink.net/~k_sheff/sw/e2tools/ Source0: http://home.earthlink.net/~k_sheff/sw/e2tools/e2tools-0.0.16.tar.gz Source1: e2tools-test.sh @@ -99,6 +100,9 @@ %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 0.0.16-11 +- fix license tag + * Mon Feb 11 2008 Andreas Thienemann - 0.0.16-10 - Rebuild against gcc-4.3 From fedora-extras-commits at redhat.com Thu Jul 17 14:37:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 14:37:49 GMT Subject: rpms/echoping/devel echoping.spec,1.4,1.5 Message-ID: <200807171437.m6HEbnvR019868@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/echoping/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19813 Modified Files: echoping.spec Log Message: fix license tag Index: echoping.spec =================================================================== RCS file: /cvs/pkgs/rpms/echoping/devel/echoping.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- echoping.spec 11 Feb 2008 15:30:30 -0000 1.4 +++ echoping.spec 17 Jul 2008 14:36:50 -0000 1.5 @@ -1,8 +1,8 @@ Summary: TCP "echo" performance test Name: echoping Version: 6.0.2 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ Group: Applications/Internet Source0: http://downloads.sourceforge.net/echoping/echoping-%{version}.tar.gz URL: http://echoping.sourceforge.net/ @@ -117,6 +117,9 @@ %{_libdir}/echoping/*.so %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 6.0.2-2 +- fix license tag + * Mon Feb 11 2008 Andreas Thienemann - 6.0.2-1 - Updated to 6.0.2 - Split into subpackages for plugins From fedora-extras-commits at redhat.com Thu Jul 17 15:02:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 15:02:41 GMT Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.92,1.93 Message-ID: <200807171502.m6HF2fro028003@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/eclipse-cdt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27968 Modified Files: eclipse-cdt.spec Log Message: fix license tag Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- eclipse-cdt.spec 7 Apr 2008 22:55:15 -0000 1.92 +++ eclipse-cdt.spec 17 Jul 2008 15:02:11 -0000 1.93 @@ -19,8 +19,8 @@ Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 1%{?dist} -License: Eclipse Public License / CPL +Release: 2%{?dist} +License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt Requires: eclipse-platform @@ -406,6 +406,9 @@ %{_libdir}/eclipse/plugins/org.eclipse.cdt.source* %changelog +* Thu Jul 17 2008 Tom "spot" Callaway 4.0.3-2 +- fix license tag + * Fri Apr 04 2008 Jeff Johnston 4.0.3-1 - Rebase to CDT 4.0.3 - Patch openpty code to not reference stropts.h which is no longer shipped From fedora-extras-commits at redhat.com Thu Jul 17 15:04:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 15:04:11 GMT Subject: rpms/eclipse/devel eclipse.spec,1.535,1.536 Message-ID: <200807171504.m6HF4BQ3028095@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21326 Modified Files: eclipse.spec Log Message: fix license tag Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.535 retrieving revision 1.536 diff -u -r1.535 -r1.536 --- eclipse.spec 16 Jul 2008 15:35:38 -0000 1.535 +++ eclipse.spec 17 Jul 2008 15:00:36 -0000 1.536 @@ -22,8 +22,8 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1%{?dist} -License: Eclipse Public License +Release: 2%{?dist} +License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-sourceBuild-srcIncluded-3.4.zip From fedora-extras-commits at redhat.com Thu Jul 17 15:07:33 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Thu, 17 Jul 2008 15:07:33 GMT Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.21,1.22 Message-ID: <200807171507.m6HF7XZK028354@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/liberation-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28235 Modified Files: liberation-fonts.spec Log Message: Cleaned up commented out line of copying license files. Index: liberation-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- liberation-fonts.spec 17 Jul 2008 11:41:27 -0000 1.21 +++ liberation-fonts.spec 17 Jul 2008 15:06:34 -0000 1.22 @@ -26,7 +26,6 @@ %prep %setup -q -n %{name}-%{version} -#%{__cp} %{SOURCE1} %{SOURCE2} %{_builddir}/%{name} %clean rm -rf %{buildroot} From fedora-extras-commits at redhat.com Thu Jul 17 15:10:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 15:10:00 GMT Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.9,1.10 Message-ID: <200807171510.m6HFA0B3028841@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/eclipse-gef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28629 Modified Files: eclipse-gef.spec Log Message: fix license tag Index: eclipse-gef.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/eclipse-gef.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- eclipse-gef.spec 19 Feb 2008 17:30:35 -0000 1.9 +++ eclipse-gef.spec 17 Jul 2008 15:09:10 -0000 1.10 @@ -5,8 +5,8 @@ Summary: Graphical Editor Framework (GEF) plugin for Eclipse Name: eclipse-gef Version: 3.3.0 -Release: 2%{?dist} -License: Eclipse Public License +Release: 3%{?dist} +License: EPL Group: System Environment/Libraries URL: http://www.eclipse.org/gef/ @@ -186,6 +186,9 @@ %endif %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 3.3.0-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 3.3.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 17 15:11:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 15:11:54 GMT Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.12,1.13 Message-ID: <200807171511.m6HFBsKd029100@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/eclipse-egit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28975 Modified Files: eclipse-egit.spec Log Message: fix license tag Index: eclipse-egit.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- eclipse-egit.spec 9 Apr 2008 03:30:05 -0000 1.12 +++ eclipse-egit.spec 17 Jul 2008 15:11:03 -0000 1.13 @@ -4,8 +4,8 @@ Summary: Eclipse Git plug-in Name: eclipse-egit Version: 0.3.1 -Release: 0%{?dist} -License: EPL GPLv2 LGPLv2 +Release: 1%{?dist} +License: EPL and GPLv2 and LGPLv2 URL: http://repo.or.cz/w/egit.git Group: Development/Tools @@ -95,6 +95,9 @@ %endif %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 0.3.1-1 +- fix license tag + * Tue Apr 08 2008 Jesse Keating - 0.3.1-0 - New upstream release 0.3.1, makes committing / diffing actually work From fedora-extras-commits at redhat.com Thu Jul 17 15:26:07 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 17 Jul 2008 15:26:07 GMT Subject: rpms/deskbar-applet/devel .cvsignore, 1.39, 1.40 deskbar-applet.spec, 1.68, 1.69 sources, 1.39, 1.40 Message-ID: <200807171526.m6HFQ7Wu030073@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30013 Modified Files: .cvsignore deskbar-applet.spec sources Log Message: Latest upstream release of the 2.23.x branch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 13 May 2008 01:17:49 -0000 1.39 +++ .cvsignore 17 Jul 2008 15:25:08 -0000 1.40 @@ -1 +0,0 @@ -deskbar-applet-2.23.2.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- deskbar-applet.spec 5 Jun 2008 11:44:43 -0000 1.68 +++ deskbar-applet.spec 17 Jul 2008 15:25:08 -0000 1.69 @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.23.2 -Release: 2%{?dist} +Version: 2.23.4 +Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -102,6 +102,9 @@ %changelog +* Thu Jul 17 2008 Luke Macken - 2.23.4-1 +- Latest upstream release of the 2.23.x branch + * Thu Jun 05 2008 Caol??n McNamara - 2.23.2-2 - rebuild for dependancies Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 13 May 2008 01:17:49 -0000 1.39 +++ sources 17 Jul 2008 15:25:08 -0000 1.40 @@ -1 +0,0 @@ -0d2fbacbcf2a345a755b2cdaa9810426 deskbar-applet-2.23.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 15:32:12 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 17 Jul 2008 15:32:12 GMT Subject: rpms/deskbar-applet/devel .cvsignore,1.40,1.41 sources,1.40,1.41 Message-ID: <200807171532.m6HFWCAW030542@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30394 Modified Files: .cvsignore sources Log Message: Adding the tarball usually helps... Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 17 Jul 2008 15:25:08 -0000 1.40 +++ .cvsignore 17 Jul 2008 15:31:01 -0000 1.41 @@ -0,0 +1 @@ +deskbar-applet-2.23.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 17 Jul 2008 15:25:08 -0000 1.40 +++ sources 17 Jul 2008 15:31:01 -0000 1.41 @@ -0,0 +1 @@ +2b421cbc04545825ce200fb5cbc8e8f7 deskbar-applet-2.23.4.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 15:32:27 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 17 Jul 2008 15:32:27 GMT Subject: rpms/highlight/devel highlight-2.6.11-gcc43.patch, NONE, 1.1 highlight-2.6.11-makefile.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 highlight.spec, 1.31, 1.32 sources, 1.18, 1.19 highlight-2.6.7-gcc43.patch, 1.1, NONE highlight-2.6.9-makefile.patch, 1.1, NONE Message-ID: <200807171532.m6HFWRAX030593@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30441 Modified Files: .cvsignore highlight.spec sources Added Files: highlight-2.6.11-gcc43.patch highlight-2.6.11-makefile.patch Removed Files: highlight-2.6.7-gcc43.patch highlight-2.6.9-makefile.patch Log Message: New upstream release highlight-2.6.11-gcc43.patch: --- NEW FILE highlight-2.6.11-gcc43.patch --- diff -up highlight-2.6.11/src/astyle/astyle.h.gcc43 highlight-2.6.11/src/astyle/astyle.h --- highlight-2.6.11/src/astyle/astyle.h.gcc43 2008-01-24 01:41:01.000000000 +0100 +++ highlight-2.6.11/src/astyle/astyle.h 2008-07-17 17:27:43.000000000 +0200 @@ -39,6 +39,8 @@ #include #include +#include + using namespace std; diff -up highlight-2.6.11/src/codegenerator.cpp.gcc43 highlight-2.6.11/src/codegenerator.cpp --- highlight-2.6.11/src/codegenerator.cpp.gcc43 2008-06-27 03:53:10.000000000 +0200 +++ highlight-2.6.11/src/codegenerator.cpp 2008-07-17 17:27:43.000000000 +0200 @@ -31,6 +31,9 @@ #include "re/Matcher.h" #include "astyle/astyle.h" +#include +#include + //-> siehe wx/defs.h #ifndef __WXWINDOWS__ #include "ansigenerator.h" diff -up highlight-2.6.11/src/languagedefinition.cpp.gcc43 highlight-2.6.11/src/languagedefinition.cpp --- highlight-2.6.11/src/languagedefinition.cpp.gcc43 2008-07-05 04:14:25.000000000 +0200 +++ highlight-2.6.11/src/languagedefinition.cpp 2008-07-17 17:27:43.000000000 +0200 @@ -20,6 +20,7 @@ #include "languagedefinition.h" #include "stringtools.h" +#include using namespace std; highlight-2.6.11-makefile.patch: --- NEW FILE highlight-2.6.11-makefile.patch --- diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile --- highlight-2.6.9/makefile.mak 2008-03-26 22:17:36.000000000 +0100 +++ highlight-2.6.9/makefile 2008-03-31 20:40:34.000000000 +0200 @@ -51,21 +51,12 @@ all-gui-wx29: install: @echo "This script will install highlight in the following directories:" @echo "Data directory: ${DESTDIR}${data_dir}" - @echo "Documentation directory: ${DESTDIR}${doc_dir}" - @echo "Examples directory: ${DESTDIR}${examples_dir}" @echo "Manual directory: ${DESTDIR}${man_dir}" @echo "Binary directory: ${DESTDIR}${bin_dir}" @echo "Configuration directory: ${DESTDIR}${conf_dir}" @echo - ${MKDIR} ${DESTDIR}${doc_dir} ${MKDIR} ${DESTDIR}${conf_dir} - ${MKDIR} ${DESTDIR}${examples_dir} \ - ${DESTDIR}${examples_dir}plugins \ - ${DESTDIR}${examples_dir}plugins/dokuwiki \ - ${DESTDIR}${examples_dir}plugins/movabletype \ - ${DESTDIR}${examples_dir}plugins/wordpress \ - ${DESTDIR}${examples_dir}swig ${MKDIR} ${DESTDIR}${data_dir} \ ${DESTDIR}${data_dir}themes \ ${DESTDIR}${data_dir}langDefs \ @@ -80,22 +71,6 @@ install: ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/ ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} - ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/ - ${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/ - ${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/ - ${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir} ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} @echo @@ -121,7 +96,6 @@ install-gui: uninstall: @echo "Removing highlight files from system..." ${RMDIR} ${DESTDIR}${data_dir} - ${RMDIR} ${DESTDIR}${doc_dir} ${RMDIR} ${DESTDIR}${conf_dir} ${RMDIR} ${DESTDIR}${examples_dir} rm ${DESTDIR}${man_dir}highlight.1.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 12 May 2008 18:18:39 -0000 1.17 +++ .cvsignore 17 Jul 2008 15:31:25 -0000 1.18 @@ -1 +1 @@ -highlight-2.6.10.tar.gz +highlight-2.6.11.tar.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- highlight.spec 12 May 2008 18:18:39 -0000 1.31 +++ highlight.spec 17 Jul 2008 15:31:25 -0000 1.32 @@ -1,6 +1,6 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.6.10 +Version: 2.6.11 Release: 1%{?dist} Group: Development/Tools @@ -8,8 +8,8 @@ URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz -Patch1: highlight-2.6.9-makefile.patch -Patch3: highlight-2.6.7-gcc43.patch +Patch1: highlight-2.6.11-makefile.patch +Patch3: highlight-2.6.11-gcc43.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Thu Jul 17 2008 Jochen Schmitt 2.6.11-1 +- New upstream release + * Mon May 12 2008 Jochen Schmitt 2.6.10-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 12 May 2008 18:18:39 -0000 1.18 +++ sources 17 Jul 2008 15:31:25 -0000 1.19 @@ -1 +1 @@ -2f528053278cc7fe104516623e948cef highlight-2.6.10.tar.gz +9bc25b076d90b5e0be5df5617e753fc9 highlight-2.6.11.tar.gz --- highlight-2.6.7-gcc43.patch DELETED --- --- highlight-2.6.9-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 15:32:35 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 17 Jul 2008 15:32:35 GMT Subject: rpms/deskbar-applet/F-9 .cvsignore, 1.37, 1.38 deskbar-applet.spec, 1.65, 1.66 sources, 1.37, 1.38 Message-ID: <200807171532.m6HFWZ7b030611@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/deskbar-applet/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30462 Modified Files: .cvsignore deskbar-applet.spec sources Log Message: Latest upstream release of the 2.22.x series Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/F-9/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 11 Mar 2008 17:36:40 -0000 1.37 +++ .cvsignore 17 Jul 2008 15:31:31 -0000 1.38 @@ -1 +1 @@ -deskbar-applet-2.22.0.1.tar.bz2 +deskbar-applet-2.22.3.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/F-9/deskbar-applet.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- deskbar-applet.spec 11 Mar 2008 17:36:40 -0000 1.65 +++ deskbar-applet.spec 17 Jul 2008 15:31:31 -0000 1.66 @@ -2,7 +2,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.22.0.1 +Version: 2.22.3 Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines @@ -102,6 +102,9 @@ %changelog +* Thu Jul 17 2008 Luke Macken - 2.22.3-1 +- Latest upstream release of the 2.22.x series + * Tue Mar 11 2008 Luke Macken - 2.22.0.1-1 - Update to 2.22.0.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/F-9/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 11 Mar 2008 17:36:40 -0000 1.37 +++ sources 17 Jul 2008 15:31:31 -0000 1.38 @@ -1 +1 @@ -ec335345998e5ca6c71b058904a264e4 deskbar-applet-2.22.0.1.tar.bz2 +cbea61704827d84363c3b5b0cb18b2fd deskbar-applet-2.22.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 15:40:56 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 17 Jul 2008 15:40:56 GMT Subject: rpms/highlight/F-9 highlight-2.6.11-gcc43.patch, NONE, 1.1 highlight-2.6.11-makefile.patch, NONE, 1.1 highlight.spec, 1.31, 1.32 sources, 1.18, 1.19 highlight-2.6.7-gcc43.patch, 1.1, NONE highlight-2.6.9-makefile.patch, 1.1, NONE Message-ID: <200807171540.m6HFeuou031068@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31017 Modified Files: highlight.spec sources Added Files: highlight-2.6.11-gcc43.patch highlight-2.6.11-makefile.patch Removed Files: highlight-2.6.7-gcc43.patch highlight-2.6.9-makefile.patch Log Message: New upstream release highlight-2.6.11-gcc43.patch: --- NEW FILE highlight-2.6.11-gcc43.patch --- diff -up highlight-2.6.11/src/astyle/astyle.h.gcc43 highlight-2.6.11/src/astyle/astyle.h --- highlight-2.6.11/src/astyle/astyle.h.gcc43 2008-01-24 01:41:01.000000000 +0100 +++ highlight-2.6.11/src/astyle/astyle.h 2008-07-17 17:27:43.000000000 +0200 @@ -39,6 +39,8 @@ #include #include +#include + using namespace std; diff -up highlight-2.6.11/src/codegenerator.cpp.gcc43 highlight-2.6.11/src/codegenerator.cpp --- highlight-2.6.11/src/codegenerator.cpp.gcc43 2008-06-27 03:53:10.000000000 +0200 +++ highlight-2.6.11/src/codegenerator.cpp 2008-07-17 17:27:43.000000000 +0200 @@ -31,6 +31,9 @@ #include "re/Matcher.h" #include "astyle/astyle.h" +#include +#include + //-> siehe wx/defs.h #ifndef __WXWINDOWS__ #include "ansigenerator.h" diff -up highlight-2.6.11/src/languagedefinition.cpp.gcc43 highlight-2.6.11/src/languagedefinition.cpp --- highlight-2.6.11/src/languagedefinition.cpp.gcc43 2008-07-05 04:14:25.000000000 +0200 +++ highlight-2.6.11/src/languagedefinition.cpp 2008-07-17 17:27:43.000000000 +0200 @@ -20,6 +20,7 @@ #include "languagedefinition.h" #include "stringtools.h" +#include using namespace std; highlight-2.6.11-makefile.patch: --- NEW FILE highlight-2.6.11-makefile.patch --- diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile --- highlight-2.6.9/makefile.mak 2008-03-26 22:17:36.000000000 +0100 +++ highlight-2.6.9/makefile 2008-03-31 20:40:34.000000000 +0200 @@ -51,21 +51,12 @@ all-gui-wx29: install: @echo "This script will install highlight in the following directories:" @echo "Data directory: ${DESTDIR}${data_dir}" - @echo "Documentation directory: ${DESTDIR}${doc_dir}" - @echo "Examples directory: ${DESTDIR}${examples_dir}" @echo "Manual directory: ${DESTDIR}${man_dir}" @echo "Binary directory: ${DESTDIR}${bin_dir}" @echo "Configuration directory: ${DESTDIR}${conf_dir}" @echo - ${MKDIR} ${DESTDIR}${doc_dir} ${MKDIR} ${DESTDIR}${conf_dir} - ${MKDIR} ${DESTDIR}${examples_dir} \ - ${DESTDIR}${examples_dir}plugins \ - ${DESTDIR}${examples_dir}plugins/dokuwiki \ - ${DESTDIR}${examples_dir}plugins/movabletype \ - ${DESTDIR}${examples_dir}plugins/wordpress \ - ${DESTDIR}${examples_dir}swig ${MKDIR} ${DESTDIR}${data_dir} \ ${DESTDIR}${data_dir}themes \ ${DESTDIR}${data_dir}langDefs \ @@ -80,22 +71,6 @@ install: ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/ ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} - ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/ - ${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/ - ${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/ - ${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir} ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} @echo @@ -121,7 +96,6 @@ install-gui: uninstall: @echo "Removing highlight files from system..." ${RMDIR} ${DESTDIR}${data_dir} - ${RMDIR} ${DESTDIR}${doc_dir} ${RMDIR} ${DESTDIR}${conf_dir} ${RMDIR} ${DESTDIR}${examples_dir} rm ${DESTDIR}${man_dir}highlight.1.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/F-9/highlight.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- highlight.spec 12 May 2008 18:27:40 -0000 1.31 +++ highlight.spec 17 Jul 2008 15:39:58 -0000 1.32 @@ -1,6 +1,6 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.6.10 +Version: 2.6.11 Release: 1%{?dist} Group: Development/Tools @@ -8,8 +8,8 @@ URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz -Patch1: highlight-2.6.9-makefile.patch -Patch3: highlight-2.6.7-gcc43.patch +Patch1: highlight-2.6.11-makefile.patch +Patch3: highlight-2.6.11-gcc43.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Thu Jul 17 2008 Jochen Schmitt 2.6.11-1 +- New upstream release + * Mon May 12 2008 Jochen Schmitt 2.6.10-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 12 May 2008 18:27:40 -0000 1.18 +++ sources 17 Jul 2008 15:39:58 -0000 1.19 @@ -1 +1 @@ -2f528053278cc7fe104516623e948cef highlight-2.6.10.tar.gz +9bc25b076d90b5e0be5df5617e753fc9 highlight-2.6.11.tar.gz --- highlight-2.6.7-gcc43.patch DELETED --- --- highlight-2.6.9-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 15:45:23 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 17 Jul 2008 15:45:23 GMT Subject: rpms/highlight/F-8 highlight-2.6.11-gcc43.patch, NONE, 1.1 highlight-2.6.11-makefile.patch, NONE, 1.1 highlight.spec, 1.28, 1.29 sources, 1.17, 1.18 highlight-2.6.7-gcc43.patch, 1.1, NONE highlight-2.6.9-makefile.patch, 1.1, NONE Message-ID: <200807171545.m6HFjNik031439@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31320 Modified Files: highlight.spec sources Added Files: highlight-2.6.11-gcc43.patch highlight-2.6.11-makefile.patch Removed Files: highlight-2.6.7-gcc43.patch highlight-2.6.9-makefile.patch Log Message: New upstream release highlight-2.6.11-gcc43.patch: --- NEW FILE highlight-2.6.11-gcc43.patch --- diff -up highlight-2.6.11/src/astyle/astyle.h.gcc43 highlight-2.6.11/src/astyle/astyle.h --- highlight-2.6.11/src/astyle/astyle.h.gcc43 2008-01-24 01:41:01.000000000 +0100 +++ highlight-2.6.11/src/astyle/astyle.h 2008-07-17 17:27:43.000000000 +0200 @@ -39,6 +39,8 @@ #include #include +#include + using namespace std; diff -up highlight-2.6.11/src/codegenerator.cpp.gcc43 highlight-2.6.11/src/codegenerator.cpp --- highlight-2.6.11/src/codegenerator.cpp.gcc43 2008-06-27 03:53:10.000000000 +0200 +++ highlight-2.6.11/src/codegenerator.cpp 2008-07-17 17:27:43.000000000 +0200 @@ -31,6 +31,9 @@ #include "re/Matcher.h" #include "astyle/astyle.h" +#include +#include + //-> siehe wx/defs.h #ifndef __WXWINDOWS__ #include "ansigenerator.h" diff -up highlight-2.6.11/src/languagedefinition.cpp.gcc43 highlight-2.6.11/src/languagedefinition.cpp --- highlight-2.6.11/src/languagedefinition.cpp.gcc43 2008-07-05 04:14:25.000000000 +0200 +++ highlight-2.6.11/src/languagedefinition.cpp 2008-07-17 17:27:43.000000000 +0200 @@ -20,6 +20,7 @@ #include "languagedefinition.h" #include "stringtools.h" +#include using namespace std; highlight-2.6.11-makefile.patch: --- NEW FILE highlight-2.6.11-makefile.patch --- diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile --- highlight-2.6.9/makefile.mak 2008-03-26 22:17:36.000000000 +0100 +++ highlight-2.6.9/makefile 2008-03-31 20:40:34.000000000 +0200 @@ -51,21 +51,12 @@ all-gui-wx29: install: @echo "This script will install highlight in the following directories:" @echo "Data directory: ${DESTDIR}${data_dir}" - @echo "Documentation directory: ${DESTDIR}${doc_dir}" - @echo "Examples directory: ${DESTDIR}${examples_dir}" @echo "Manual directory: ${DESTDIR}${man_dir}" @echo "Binary directory: ${DESTDIR}${bin_dir}" @echo "Configuration directory: ${DESTDIR}${conf_dir}" @echo - ${MKDIR} ${DESTDIR}${doc_dir} ${MKDIR} ${DESTDIR}${conf_dir} - ${MKDIR} ${DESTDIR}${examples_dir} \ - ${DESTDIR}${examples_dir}plugins \ - ${DESTDIR}${examples_dir}plugins/dokuwiki \ - ${DESTDIR}${examples_dir}plugins/movabletype \ - ${DESTDIR}${examples_dir}plugins/wordpress \ - ${DESTDIR}${examples_dir}swig ${MKDIR} ${DESTDIR}${data_dir} \ ${DESTDIR}${data_dir}themes \ ${DESTDIR}${data_dir}langDefs \ @@ -80,22 +71,6 @@ install: ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/ ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} - ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/ - ${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/ - ${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/ - ${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir} - ${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir} ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} @echo @@ -121,7 +96,6 @@ install-gui: uninstall: @echo "Removing highlight files from system..." ${RMDIR} ${DESTDIR}${data_dir} - ${RMDIR} ${DESTDIR}${doc_dir} ${RMDIR} ${DESTDIR}${conf_dir} ${RMDIR} ${DESTDIR}${examples_dir} rm ${DESTDIR}${man_dir}highlight.1.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/F-8/highlight.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- highlight.spec 12 May 2008 18:37:55 -0000 1.28 +++ highlight.spec 17 Jul 2008 15:44:23 -0000 1.29 @@ -1,6 +1,6 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.6.10 +Version: 2.6.11 Release: 1%{?dist} Group: Development/Tools @@ -8,8 +8,8 @@ URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz -Patch1: highlight-2.6.9-makefile.patch -Patch3: highlight-2.6.7-gcc43.patch +Patch1: highlight-2.6.11-makefile.patch +Patch3: highlight-2.6.11-gcc43.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Thu Jul 17 2008 Jochen Schmitt 2.6.11-1 +- New upstream release + * Mon May 12 2008 Jochen Schmitt 2.6.10-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/F-8/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 12 May 2008 18:37:55 -0000 1.17 +++ sources 17 Jul 2008 15:44:23 -0000 1.18 @@ -1 +1 @@ -2f528053278cc7fe104516623e948cef highlight-2.6.10.tar.gz +9bc25b076d90b5e0be5df5617e753fc9 highlight-2.6.11.tar.gz --- highlight-2.6.7-gcc43.patch DELETED --- --- highlight-2.6.9-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 15:48:49 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Thu, 17 Jul 2008 15:48:49 GMT Subject: rpms/liberation-fonts/F-9 sources, 1.7, 1.8 .cvsignore, 1.4, 1.5 liberation-fonts.spec, 1.14, 1.15 Message-ID: <200807171548.m6HFmnug031752@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/liberation-fonts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31669 Modified Files: sources .cvsignore liberation-fonts.spec Log Message: * Thu Jul 17 2008 Caius Chance - 1.04-1.fc9 - Resolves: rhbz#455754 (Backport sources to version 1.04.) - Improved .spec file. - Removed License.txt and COPYING as already included in sources. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2008 06:47:16 -0000 1.7 +++ sources 17 Jul 2008 15:47:42 -0000 1.8 @@ -1 +1 @@ -472e9ea73dca1a552b14b7668612df5b liberation-fonts-1.03.tar.gz +4846797ef0fc70b0cbaede2514677c58 liberation-fonts-1.04.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Apr 2008 06:47:16 -0000 1.4 +++ .cvsignore 17 Jul 2008 15:47:42 -0000 1.5 @@ -1 +1 @@ -liberation-fonts-1.03.tar.gz +liberation-fonts-1.04.tar.gz Index: liberation-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/F-9/liberation-fonts.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- liberation-fonts.spec 10 Apr 2008 06:47:16 -0000 1.14 +++ liberation-fonts.spec 17 Jul 2008 15:47:42 -0000 1.15 @@ -3,7 +3,7 @@ Summary: Fonts to replace commonly used Microsoft Windows Fonts Name: liberation-fonts -Version: 1.03 +Version: 1.04 Release: 1%{?dist} # The license of the Liberation Fonts is a EULA that contains # GPLv2 and two exceptions: @@ -14,9 +14,7 @@ License: Liberation Group: User Interface/X URL: https://www.redhat.com/promo/fonts/ -Source0: liberation-fonts-1.03.tar.gz -Source1: COPYING -Source2: License.txt +Source0: liberation-fonts-1.04.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Buildrequires: xorg-x11-font-utils @@ -27,8 +25,7 @@ Arial, and Courier New. %prep -%setup -q -n %{name} -a 0 -%{__cp} %{SOURCE1} %{SOURCE2} %{_builddir}/%{name} +%setup -q -n %{name}-%{version} %clean rm -rf %{buildroot} @@ -72,6 +69,11 @@ %{catalogue}/%{name} %changelog +* Thu Jul 17 2008 Caius Chance - 1.04-1.fc9 +- Resolves: rhbz#455754 (Backport sources to version 1.04.) +- Improved .spec file. +- Removed License.txt and COPYING as already included in sources. + * Thu Apr 10 2008 Caius Chance - 1.03-1.fc9 - Resolves: rhbz#251890 (Exchanged and incomplete glyphs.) - Repack source tarball and re-align source version number. From fedora-extras-commits at redhat.com Thu Jul 17 15:50:04 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 17 Jul 2008 15:50:04 GMT Subject: comps/po tg.po,1.1,1.2 Message-ID: <200807171550.m6HFo4CB031888@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31844/po Modified Files: tg.po Log Message: 2008-07-17 Victor Ibragimov (via tajikfedora at fedoraproject.org) * po/tg.po: Updated Tajik translation Index: tg.po =================================================================== RCS file: /cvs/pkgs/comps/po/tg.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tg.po 17 Jul 2008 07:25:24 -0000 1.1 +++ tg.po 17 Jul 2008 15:49:34 -0000 1.2 @@ -5,7 +5,7 @@ "POT-Creation-Date: 2008-07-15 10:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: Victor Ibragimov \n" -"Language-Team: Tajik Fedora and Software Localization Team \n" +"Language-Team: Tajik Fedora & Software Localization Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -999,21 +999,21 @@ #: ../comps-f9.xml.in.h:145 #: ../comps-f10.xml.in.h:147 msgid "Southern Ndebele Support" -msgstr "" +msgstr "???????????????????? ???????????? ???????????????? ????????????" #: ../comps-f7.xml.in.h:131 #: ../comps-f8.xml.in.h:140 #: ../comps-f9.xml.in.h:146 #: ../comps-f10.xml.in.h:148 msgid "Southern Sotho Support" -msgstr "" +msgstr "???????????????????? ???????????? ?????????? ????????????" #: ../comps-f7.xml.in.h:132 #: ../comps-f8.xml.in.h:141 #: ../comps-f9.xml.in.h:147 #: ../comps-f10.xml.in.h:149 msgid "Spanish Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:133 #: ../comps-f8.xml.in.h:142 @@ -1043,7 +1043,7 @@ #: ../comps-f9.xml.in.h:151 #: ../comps-f10.xml.in.h:153 msgid "Swedish Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:137 #: ../comps-f8.xml.in.h:146 @@ -1052,28 +1052,28 @@ #: ../comps-el4.xml.in.h:48 #: ../comps-el5.xml.in.h:46 msgid "System Tools" -msgstr "" +msgstr "???????????????? ??????????????????" #: ../comps-f7.xml.in.h:138 #: ../comps-f8.xml.in.h:147 #: ../comps-f9.xml.in.h:153 #: ../comps-f10.xml.in.h:155 msgid "Tagalog Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:139 #: ../comps-f8.xml.in.h:148 #: ../comps-f9.xml.in.h:154 #: ../comps-f10.xml.in.h:156 msgid "Tamil Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:140 #: ../comps-f8.xml.in.h:149 #: ../comps-f9.xml.in.h:155 #: ../comps-f10.xml.in.h:157 msgid "Telugu Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:141 #: ../comps-f8.xml.in.h:150 @@ -1082,14 +1082,14 @@ #: ../comps-el4.xml.in.h:49 #: ../comps-el5.xml.in.h:47 msgid "Text-based Internet" -msgstr "" +msgstr "???????????????? ?????? ?????????? ????????" #: ../comps-f7.xml.in.h:142 #: ../comps-f8.xml.in.h:151 #: ../comps-f9.xml.in.h:157 #: ../comps-f10.xml.in.h:159 msgid "Thai Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:143 msgid "The Eclipse Integrated Development Environment." @@ -1333,14 +1333,14 @@ #: ../comps-f9.xml.in.h:187 #: ../comps-f10.xml.in.h:189 msgid "Tibetan Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:174 #: ../comps-f8.xml.in.h:182 #: ../comps-f9.xml.in.h:188 #: ../comps-f10.xml.in.h:190 msgid "Tonga Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:175 #: ../comps-f8.xml.in.h:183 @@ -1356,35 +1356,35 @@ #: ../comps-f9.xml.in.h:190 #: ../comps-f10.xml.in.h:192 msgid "Tsonga Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:177 #: ../comps-f8.xml.in.h:185 #: ../comps-f9.xml.in.h:191 #: ../comps-f10.xml.in.h:193 msgid "Tswana Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:178 #: ../comps-f8.xml.in.h:186 #: ../comps-f9.xml.in.h:192 #: ../comps-f10.xml.in.h:194 msgid "Turkish Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:179 #: ../comps-f8.xml.in.h:187 #: ../comps-f9.xml.in.h:193 #: ../comps-f10.xml.in.h:195 msgid "Ukrainian Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:180 #: ../comps-f8.xml.in.h:188 #: ../comps-f9.xml.in.h:194 #: ../comps-f10.xml.in.h:196 msgid "Urdu Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????" #: ../comps-f7.xml.in.h:181 #: ../comps-f8.xml.in.h:189 @@ -1408,21 +1408,21 @@ #: ../comps-f9.xml.in.h:197 #: ../comps-f10.xml.in.h:199 msgid "Venda Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:184 #: ../comps-f8.xml.in.h:192 #: ../comps-f9.xml.in.h:198 #: ../comps-f10.xml.in.h:200 msgid "Vietnamese Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:185 #: ../comps-f8.xml.in.h:193 #: ../comps-f9.xml.in.h:199 #: ../comps-f10.xml.in.h:201 msgid "Virtualization" -msgstr "" +msgstr "???????????????????? ????????????????" #: ../comps-f7.xml.in.h:186 #: ../comps-f8.xml.in.h:194 @@ -1431,7 +1431,7 @@ #: ../comps-el4.xml.in.h:73 #: ../comps-el5.xml.in.h:73 msgid "Web Development" -msgstr "" +msgstr "???????????????????????????? ?????????????????? ????????????????" #: ../comps-f7.xml.in.h:187 #: ../comps-f8.xml.in.h:195 @@ -1440,14 +1440,14 @@ #: ../comps-el4.xml.in.h:74 #: ../comps-el5.xml.in.h:74 msgid "Web Server" -msgstr "" +msgstr "???????????????????? ??????" #: ../comps-f7.xml.in.h:188 #: ../comps-f8.xml.in.h:196 #: ../comps-f9.xml.in.h:203 #: ../comps-f10.xml.in.h:205 msgid "Welsh Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:189 #: ../comps-f8.xml.in.h:197 @@ -1456,21 +1456,21 @@ #: ../comps-el4.xml.in.h:75 #: ../comps-el5.xml.in.h:75 msgid "Window Managers" -msgstr "" +msgstr "???????????? ????????????????" #: ../comps-f7.xml.in.h:190 #: ../comps-f8.xml.in.h:198 #: ../comps-f9.xml.in.h:205 #: ../comps-f10.xml.in.h:207 msgid "Windows File Server" -msgstr "" +msgstr "???????????????????? ?????????????? Windows" #: ../comps-f7.xml.in.h:191 #: ../comps-f8.xml.in.h:199 #: ../comps-f9.xml.in.h:206 #: ../comps-f10.xml.in.h:208 msgid "X Software Development" -msgstr "" +msgstr "???????????????????????????? ???????????????????? ??" #: ../comps-f7.xml.in.h:192 #: ../comps-f8.xml.in.h:200 @@ -1479,35 +1479,35 @@ #: ../comps-el4.xml.in.h:76 #: ../comps-el5.xml.in.h:76 msgid "X Window System" -msgstr "" +msgstr "???????????????? X Window" #: ../comps-f7.xml.in.h:193 #: ../comps-f8.xml.in.h:201 #: ../comps-f9.xml.in.h:208 #: ../comps-f10.xml.in.h:210 msgid "XFCE" -msgstr "" +msgstr "XFCE" #: ../comps-f7.xml.in.h:194 #: ../comps-f8.xml.in.h:202 #: ../comps-f9.xml.in.h:209 #: ../comps-f10.xml.in.h:211 msgid "XFCE Software Development" -msgstr "" +msgstr "???????????????????????????? ???????????????????? XFCE" #: ../comps-f7.xml.in.h:195 #: ../comps-f8.xml.in.h:203 #: ../comps-f9.xml.in.h:210 #: ../comps-f10.xml.in.h:212 msgid "Xhosa Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????" #: ../comps-f7.xml.in.h:196 #: ../comps-f8.xml.in.h:204 #: ../comps-f9.xml.in.h:211 #: ../comps-f10.xml.in.h:213 msgid "Zulu Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????" #: ../comps-f8.xml.in.h:21 #: ../comps-f9.xml.in.h:21 @@ -1519,13 +1519,13 @@ #: ../comps-f9.xml.in.h:49 #: ../comps-f10.xml.in.h:49 msgid "Fedora Eclipse" -msgstr "" +msgstr "Fedora Eclipse" #: ../comps-f8.xml.in.h:52 #: ../comps-f9.xml.in.h:53 #: ../comps-f10.xml.in.h:53 msgid "Fonts" -msgstr "" +msgstr "????????????" #: ../comps-f8.xml.in.h:53 #: ../comps-f9.xml.in.h:54 @@ -1543,25 +1543,25 @@ #: ../comps-f9.xml.in.h:97 #: ../comps-f10.xml.in.h:99 msgid "Legacy Fonts" -msgstr "" +msgstr "?????????????? ??????????" #: ../comps-f8.xml.in.h:100 #: ../comps-f9.xml.in.h:102 #: ../comps-f10.xml.in.h:104 msgid "Low Saxon Support" -msgstr "" +msgstr "???????????????????? ???????????? ?????????????? ????????" #: ../comps-f8.xml.in.h:106 #: ../comps-f9.xml.in.h:109 #: ../comps-f10.xml.in.h:111 msgid "Mongolian Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f8.xml.in.h:108 #: ../comps-f9.xml.in.h:111 #: ../comps-f10.xml.in.h:113 msgid "Nepali Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f8.xml.in.h:114 #: ../comps-f9.xml.in.h:118 @@ -1572,27 +1572,27 @@ #: ../comps-f9.xml.in.h:44 #: ../comps-f10.xml.in.h:44 msgid "Esperanto Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f9.xml.in.h:91 #: ../comps-f10.xml.in.h:93 msgid "Kashubian Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f9.xml.in.h:103 #: ../comps-f10.xml.in.h:105 msgid "Macedonian Support" -msgstr "" +msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f9.xml.in.h:114 #: ../comps-f10.xml.in.h:116 msgid "Northern Sami Support" -msgstr "" +msgstr "???????????????????? ???????????? ?????????? ????????????" #: ../comps-f9.xml.in.h:130 #: ../comps-f10.xml.in.h:132 msgid "SUGAR Desktop Environment" -msgstr "" +msgstr "???????????? ???????? ?????????? SUGAR" #: ../comps-f9.xml.in.h:131 #: ../comps-f10.xml.in.h:133 @@ -1602,11 +1602,11 @@ #: ../comps-f9.xml.in.h:200 #: ../comps-f10.xml.in.h:202 msgid "Walloon Support" -msgstr "" +msgstr "???????????????????? ???????????? ????????????" #: ../comps-f10.xml.in.h:75 msgid "Input Methods" -msgstr "" +msgstr "???????????????? ????????????????" #: ../comps-f10.xml.in.h:76 msgid "Input method packages for the input of international text." @@ -1620,17 +1620,17 @@ #: ../comps-el4.xml.in.h:12 #: ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" -msgstr "" +msgstr "???????????????????? ?????????????? Dialup" #: ../comps-el4.xml.in.h:22 #: ../comps-el5.xml.in.h:23 msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." -msgstr "" +msgstr "GNOME ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????." #: ../comps-el4.xml.in.h:35 #: ../comps-el5.xml.in.h:35 msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." -msgstr "" +msgstr "KDE ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????." #: ../comps-el4.xml.in.h:44 #: ../comps-el5.xml.in.h:44 @@ -1640,7 +1640,7 @@ #: ../comps-el4.xml.in.h:50 #: ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." -msgstr "" +msgstr "???????????????????? ???????????? XEmacs" #: ../comps-el4.xml.in.h:54 #: ../comps-el5.xml.in.h:52 @@ -1670,7 +1670,7 @@ #: ../comps-el4.xml.in.h:77 #: ../comps-el5.xml.in.h:77 msgid "XEmacs" -msgstr "" +msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 msgid "This group is a collection of tools and resources of Czech environments." From fedora-extras-commits at redhat.com Thu Jul 17 15:50:41 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 15:50:41 GMT Subject: rpms/kipi-plugins/F-9 kipi-plugins.spec,1.51,1.52 Message-ID: <200807171550.m6HFofjm031955@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kipi-plugins/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31871 Modified Files: kipi-plugins.spec Log Message: * Thu Jul 17 2008 Rex Dieter 0.1.5-2 - respin Index: kipi-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/F-9/kipi-plugins.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- kipi-plugins.spec 14 Mar 2008 17:53:42 -0000 1.51 +++ kipi-plugins.spec 17 Jul 2008 15:49:46 -0000 1.52 @@ -1,12 +1,10 @@ # Fedora review: http://bugzilla.redhat.com/171504 -#define beta rc2 - Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -16,9 +14,9 @@ BuildRequires: gettext BuildRequires: kdelibs3-devel -BuildRequires: libkipi-devel >= 0.1.5 BuildRequires: libkdcraw-devel >= 0.1.4 -BuildRequires: libkexiv2-devel >= 0.1.6 +BuildRequires: libkexiv2-devel >= 0.1.7 +BuildRequires: libkipi-devel >= 0.1.6 BuildRequires: exiv2-devel %if 0%{?fedora} > 6 %define _with_libgpod --with-libgpod @@ -172,6 +170,9 @@ %changelog +* Thu Jul 17 2008 Rex Dieter 0.1.5-2 +- respin + * Fri Mar 14 2008 Rex Dieter 0.1.5-1 - kipi-plugins-0.1.5 From fedora-extras-commits at redhat.com Thu Jul 17 15:51:59 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 17 Jul 2008 15:51:59 GMT Subject: rpms/epiphany-extensions/F-9 epiphany-extensions.spec,1.47,1.48 Message-ID: <200807171552.m6HFpxin032181@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32104 Modified Files: epiphany-extensions.spec Log Message: * Thu Jul 17 2008 Christopher Aillon - 2.22.1-3 - Rebuild against newer gecko Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/F-9/epiphany-extensions.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- epiphany-extensions.spec 22 Jun 2008 18:57:11 -0000 1.47 +++ epiphany-extensions.spec 17 Jul 2008 15:51:10 -0000 1.48 @@ -1,10 +1,10 @@ %global ephy_major 2.22 %global ephy_min_version %{ephy_major}.0 -%global gecko_version 1.9 +%global gecko_version 1.9.0.1 Name: epiphany-extensions Version: %{ephy_major}.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extensions for Epiphany, the GNOME web browser ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is @@ -113,6 +113,9 @@ %changelog +* Thu Jul 17 2008 Christopher Aillon - 2.22.1-3 +- Rebuild against newer gecko + * Sun Jun 22 2008 Martin Stransky - 2.22.1-2 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Thu Jul 17 15:52:53 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 15:52:53 GMT Subject: rpms/kphotoalbum/F-9 kphotoalbum.spec,1.20,1.21 Message-ID: <200807171552.m6HFqrdF032314@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kphotoalbum/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32173 Modified Files: kphotoalbum.spec Log Message: * Thu Jul 17 2008 Rex Dieter 3.1.1-2 - respin Index: kphotoalbum.spec =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/F-9/kphotoalbum.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- kphotoalbum.spec 18 Mar 2008 20:45:49 -0000 1.20 +++ kphotoalbum.spec 17 Jul 2008 15:51:58 -0000 1.21 @@ -2,7 +2,7 @@ Summary: KDE Photo Album Name: kphotoalbum Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -20,7 +20,7 @@ BuildRequires: exiv2-devel >= 0.15 BuildRequires: gettext BuildRequires: kdelibs3-devel -BuildRequires: libkdcraw-devel >= 0.1.1 +BuildRequires: libkdcraw-devel >= 0.1.4 BuildRequires: libkipi-devel ## Optional, not strictly required. @@ -113,6 +113,9 @@ %changelog +* Thu Jul 17 2008 Rex Dieter 3.1.1-2 +- respin + * Tue Mar 18 2008 Rex Dieter 3.1.1-1 - kphotoalbum-3.1.1 From fedora-extras-commits at redhat.com Thu Jul 17 15:55:34 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 15:55:34 GMT Subject: rpms/digikam/F-9 .cvsignore, 1.17, 1.18 digikam.spec, 1.54, 1.55 sources, 1.17, 1.18 digikam-missing-photos.patch, 1.2, NONE Message-ID: <200807171555.m6HFtY10032524@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32446 Modified Files: .cvsignore digikam.spec sources Removed Files: digikam-missing-photos.patch Log Message: * Thu Jul 17 2008 Rex Dieter - 0.9.4-1 - digikam-0.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 14 Mar 2008 20:57:36 -0000 1.17 +++ .cvsignore 17 Jul 2008 15:54:27 -0000 1.18 @@ -1 +1 @@ -digikam-0.9.3.tar.bz2 +digikam-0.9.4.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-9/digikam.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- digikam.spec 6 Jul 2008 23:28:47 -0000 1.54 +++ digikam.spec 17 Jul 2008 15:54:27 -0000 1.55 @@ -1,9 +1,7 @@ -#define beta beta1 - Name: digikam -Version: 0.9.3 -Release: 5%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -12,15 +10,21 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: digikam-missing-photos.patch - -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: kdelibs3-devel -BuildRequires: gphoto2-devel >= 2.0.0 -BuildRequires: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2 libkipi-devel -BuildRequires: lcms-devel libtiff-devel libpng-devel >= 1.2.7 jasper-devel -BuildRequires: sqlite-devel >= 3.0.0 +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs3-devel +%if 0%{?fedora} > 9 +BuildRequires: libgphoto2-devel +%else +BuildRequires: gphoto2-devel +%endif +BuildRequires: jasper-devel +BuildRequires: libkdcraw-devel >= 0.1.4 +BuildRequires: libkexiv2-devel >= 0.1.7 +BuildRequires: libkipi-devel >= 0.1.6 +BuildRequires: lcms-devel +BuildRequires: libtiff-devel +BuildRequires: libpng-devel >= 1.2.7 %if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libtool-ltdl-devel %endif @@ -52,7 +56,6 @@ %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} -%patch0 -p1 %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -138,7 +141,11 @@ %{_includedir}/digikam_export.h %{_libdir}/libdigikam.so + %changelog +* Thu Jul 17 2008 Rex Dieter - 0.9.4-1 +- digikam-0.9.4 + * Mon Jul 07 2008 Marcin Garski 0.9.3-5 - Don't lose some photos during import (#448235) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 14 Mar 2008 20:57:36 -0000 1.17 +++ sources 17 Jul 2008 15:54:27 -0000 1.18 @@ -1 +1 @@ -20497c1a02394505f899ef0757ebefad digikam-0.9.3.tar.bz2 +b0f3fa00bd054b0497146e6ce24dab7c digikam-0.9.4.tar.bz2 --- digikam-missing-photos.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 15:55:47 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Thu, 17 Jul 2008 15:55:47 GMT Subject: rpms/subversion/F-8 subversion.spec,1.105,1.106 Message-ID: <200807171555.m6HFtlsc032566@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32464 Modified Files: subversion.spec Log Message: * Thu Jul 17 2008 Joe Orton 1.5.0-8.2 - rebuild with IcedTea Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/F-8/subversion.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- subversion.spec 17 Jul 2008 13:12:39 -0000 1.105 +++ subversion.spec 17 Jul 2008 15:54:52 -0000 1.106 @@ -85,7 +85,7 @@ Group: Development/Libraries Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-devel-openjdk +BuildRequires: java-devel-icedtea %description javahl This package includes the JNI bindings to the Subversion libraries. @@ -276,7 +276,7 @@ %changelog * Thu Jul 17 2008 Joe Orton 1.5.0-8.2 -- rebuild with OpenJDK +- rebuild with IcedTea * Thu Jul 17 2008 Joe Orton 1.5.0-8.1 - rebuild for F-8 From fedora-extras-commits at redhat.com Thu Jul 17 15:58:56 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 17 Jul 2008 15:58:56 GMT Subject: comps/po tg.po,1.2,1.3 Message-ID: <200807171558.m6HFwup3032760@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32743/po Modified Files: tg.po Log Message: 2008-07-17 Victor Ibragimov (via tajikfedora at fedoraproject.org) * po/tg.po: Updated Tajik translation Index: tg.po =================================================================== RCS file: /cvs/pkgs/comps/po/tg.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tg.po 17 Jul 2008 15:49:34 -0000 1.2 +++ tg.po 17 Jul 2008 15:58:26 -0000 1.3 @@ -1615,7 +1615,7 @@ #: ../comps-el4.xml.in.h:3 #: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" -msgstr "" +msgstr "???????????????????? ?????????? ?????????????????? ??????????????" #: ../comps-el4.xml.in.h:12 #: ../comps-el5.xml.in.h:13 From fedora-extras-commits at redhat.com Thu Jul 17 16:01:18 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Thu, 17 Jul 2008 16:01:18 GMT Subject: rpms/xenner/devel .cvsignore, 1.15, 1.16 sources, 1.14, 1.15 xenner.spec, 1.22, 1.23 xenner-debuginfo.sh, 1.1, NONE Message-ID: <200807171601.m6HG1IiH007055@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv397 Modified Files: .cvsignore sources xenner.spec Removed Files: xenner-debuginfo.sh Log Message: update to version 0.40 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Jul 2008 12:05:47 -0000 1.15 +++ .cvsignore 17 Jul 2008 16:00:24 -0000 1.16 @@ -1 +1,2 @@ xenner-0.39.tar.gz +xenner-0.40.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 11 Jul 2008 12:05:47 -0000 1.14 +++ sources 17 Jul 2008 16:00:24 -0000 1.15 @@ -1 +1,2 @@ 0b1f56f9ae2f11a6e57944954b9f9418 xenner-0.39.tar.gz +f40b62df99f4cefb38276aaf30d700d5 xenner-0.40.tar.gz Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xenner.spec 11 Jul 2008 12:05:47 -0000 1.22 +++ xenner.spec 17 Jul 2008 16:00:24 -0000 1.23 @@ -1,11 +1,10 @@ Name: xenner License: GPLv2+ -Version: 0.39 +Version: 0.40 Release: 1%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source0: %{name}-%{version}.tar.gz -Source1: %{name}-debuginfo.sh URL: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz Requires: xen-runtime Provides: xen-hypervisor-abi = 3.2 @@ -22,11 +21,6 @@ xenner is a utility which is able to boot xen paravirtualized kernels, without the xen hypervisor, using kvm instead. -# debuginfo: hide some files which must not be stripped. -%define __debug_install_post \ - sh %{SOURCE1} %{_builddir}/%{?buildsubdir}\ -%{nil} - %prep %setup -q @@ -63,6 +57,12 @@ rm -rf %{buildroot} %changelog +* Fri Jul 11 2008 Gerd Hoffmann - 0.40-1.fc10 +- update to version 0.40 + * rework xenner <=> emu interfaces. + * emu*.elf symbol tables not needed any more. + * usual set of bug fixes. +- drop debuginfo hack. * Fri Jul 11 2008 Gerd Hoffmann - 0.39-1.fc10 - update to version 0.39 - avoid emu*.elf getting stripped --- xenner-debuginfo.sh DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 16:07:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 16:07:03 +0000 Subject: [pkgdb] libdrm had groupAcl changed Message-ID: <200807171607.m6HG731H013672@bastion.fedora.phx.redhat.com> Adam Jackson (ajax) has set the commit acl on libdrm (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libdrm From fedora-extras-commits at redhat.com Thu Jul 17 16:36:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Thu, 17 Jul 2008 16:36:32 GMT Subject: rpms/ltsp/F-9 ltsp.spec,1.19,1.20 Message-ID: <200807171636.m6HGaWxJ010654@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10579 Modified Files: ltsp.spec Log Message: - Add some spec conditionals for RHEL5. RHEL5 has only ltsp-server. Client chroot must be Fedora 9+, so there is no RHEL5 build of ltsp-client. Index: ltsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ltsp.spec 16 Jul 2008 20:54:32 -0000 1.19 +++ ltsp.spec 17 Jul 2008 16:35:40 -0000 1.20 @@ -1,8 +1,8 @@ Name: ltsp Version: 5.1.12 -%define _datestamp .20080716.16 +%define _datestamp .20080717.12 #Release: 0%{_datestamp}%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Linux Terminal Server Project Server and Client Group: User Interface/Desktops @@ -13,7 +13,11 @@ # mkdst tar --from-tag=ltsp-%{version} Source0: ltsp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?fedora} > 7 || 0%{?rhel} > 5 BuildRequires: popt-devel +%else +BuildRequires: popt +%endif BuildRequires: flex bison BuildRequires: automake BuildRequires: pkgconfig @@ -34,6 +38,7 @@ %description LTSP client and server +%if 0%{?fedora} %package client Summary: LTSP client Group: User Interface/Desktops @@ -43,12 +48,15 @@ %description client LTSP client package This package contains the scripts necessary to boot as a LTSP5 thin client. +%endif %package server Summary: LTSP server Group: User Interface/Desktops +%if 0%{?fedora} # needed to install client chroots Requires: livecd-tools >= 015 +%endif Requires: tftp-server Requires: ltspfs Requires: dhcp @@ -92,6 +100,7 @@ %install ##### make directories rm -rf $RPM_BUILD_ROOT +%if 0%{?fedora} # client mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir} @@ -100,6 +109,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/ +%endif # server mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 @@ -124,6 +134,7 @@ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/ +%if 0%{?fedora} ###### client install pushd client/xrexecd make install DESTDIR=$RPM_BUILD_ROOT @@ -146,13 +157,17 @@ cp -av client/screen.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/ touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed +%endif ### server install install -m 0755 server/nbdrootd $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/nbdswapd $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ldminfod $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ltsp-update-sshkeys $RPM_BUILD_ROOT%{_sbindir} +%if 0%{?fedora} install -m 0755 server/ltsp-build-client $RPM_BUILD_ROOT%{_sbindir} +cp -pr server/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ +%endif install -m 0755 server/ltsp-update-kernels $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/scripts/k12linux/chroot-creator $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ltsp-swapfile-delete $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/ @@ -165,7 +180,6 @@ install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/ install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-network $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/ install -m 0644 server/services/sysconfig-ltsp-dhcpd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ltsp-dhcpd -cp -pr server/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ install -m 0755 server/services/ltsp-dhcpd.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ltsp-dhcpd install -m 0755 server/scripts/k12linux/ltsp-prepare-kernel $RPM_BUILD_ROOT/%{_sbindir}/ install -m 0755 server/scripts/k12linux/ltsp-server-initialize $RPM_BUILD_ROOT/%{_sbindir}/ @@ -206,8 +220,10 @@ %clean rm -rf $RPM_BUILD_ROOT +%if 0%{?fedora} %post client /usr/share/ltsp/ltsp-chroot-setup +%endif %post server /sbin/chkconfig --add ltsp-dhcpd @@ -228,6 +244,7 @@ /sbin/service ltsp-dhcpd condrestart >/dev/null 2>&1 fi +%if 0%{?fedora} %files client %defattr(-,root,root,-) %{_mandir}/man1/getltscfg.1.gz @@ -251,7 +268,7 @@ %{_sysconfdir}/rwtab.d/* %{_localstatedir}/lib/random-seed %config(noreplace) %{_sysconfdir}/lts.conf - +%endif %files server %defattr(-,root,root,-) @@ -275,15 +292,16 @@ %dir /opt/ltsp +%if 0%{?fedora} %{_sbindir}/ltsp-build-client +%{_datadir}/ltsp/plugins/ +%endif %{_sbindir}/ltsp-prepare-kernel %{_sbindir}/ltsp-server-initialize %{_sbindir}/ltsp-update-kernels %{_datadir}/ltsp/scripts/ %{_datadir}/ltsp/scripts.d/ %{_datadir}/ltsp/chkconfig.d/ -%{_datadir}/ltsp/plugins/ -%{_datadir}/ltsp/ltsp-common-functions %{_sbindir}/ldminfod %{_sbindir}/ltsp-update-sshkeys %{_sbindir}/nbdrootd @@ -324,6 +342,11 @@ %endif %changelog +* Thu Jul 17 2008 Warren Togami - 5.1.12-2 +- Add some spec conditionals for RHEL5. + RHEL5 has only ltsp-server. Client chroot must be + Fedora 9+, so there is no RHEL5 build of ltsp-client. + * Wed Jul 16 2008 Warren Togami - 5.1.12-1 - Move some chroot setup into ltsp-client %%post so things can be fixed by ltsp-client package updates in the future. From fedora-extras-commits at redhat.com Thu Jul 17 16:39:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 17 Jul 2008 16:39:40 GMT Subject: rpms/python-migrate/devel import.log, NONE, 1.1 python-migrate-shell-test.patch, NONE, 1.1 python-migrate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171639.m6HGdelG010844@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10774/devel Modified Files: .cvsignore sources Added Files: import.log python-migrate-shell-test.patch python-migrate.spec Log Message: Initial import. --- NEW FILE import.log --- python-migrate-0_4_4-3_fc9:HEAD:python-migrate-0.4.4-3.fc9.src.rpm:1216312489 python-migrate-shell-test.patch: --- NEW FILE python-migrate-shell-test.patch --- diff -up sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env sqlalchemy-migrate-0.4.4/test/fixture/shell.py --- sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env 2008-04-04 13:44:09.000000000 -0700 +++ sqlalchemy-migrate-0.4.4/test/fixture/shell.py 2008-07-02 13:31:51.000000000 -0700 @@ -12,7 +12,15 @@ class Shell(Pathed): return command # Redirect stderr to stdout # This is a bit of a hack, but I've not found a better way + py_path = os.environ.get('PYTHONPATH', '') + py_path_list = py_path.split(':') + py_path_list.append(os.path.abspath('.')) + os.environ['PYTHONPATH'] = ':'.join(py_path_list) fd=os.popen(command+' 2>&1',*p,**k) + if py_path: + py_path = os.environ['PYTHONPATH'] = py_path + else: + del os.environ['PYTHONPATH'] return fd def output_and_exitcode(self,*p,**k): fd=self.execute(*p,**k) --- NEW FILE python-migrate.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define srcname sqlalchemy-migrate Name: python-migrate Version: 0.4.4 Release: 3%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Fix a test when migrate is not installed. Applied upstream. Patch0: python-migrate-shell-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel Requires: python-sqlalchemy >= 0.3.10 %description Schema migration tools for SQLAlchemy designed to support an agile approach to database design and make it easier to keep development and production databases in sync as schema changes are required. It allows you to manage atabase change sets and database repository versioning. %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .env %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %{__mv} %{buildroot}%{_bindir}/migrate %{buildroot}%{_bindir}/sqlalchemy-migrate %clean %{__rm} -rf %{buildroot} # Check needs py.test in order to run #%check #echo 'sqlite:///__tmp__' > test_db.cfg # setuptools doesn't appear to be compatible with py.test # %{__python} setup.py test #%{__python} -c 'from py.test.cmdline import main; main(["test"])' %files %defattr(-,root,root,-) %doc README CHANGELOG docs/ %{_bindir}/sqlalchemy-migrate %{python_sitelib}/* %changelog * Tue Jul 15 2008 Toshio Kuratomi 0.4.4-3 - Rename binary to sqlalchemy-migrate to avoid potential filename clashes. (Queried upstream but the change is only in Fedora). Noted that openmosix defintely has a /usr/bin/migrate already. * Sat Jul 06 2008 Ricky Zhou 0.4.4-2 - Add BuildRequires on python-setuptools-devel. - Add Requires on SQLAlchemy. * Sat Jun 21 2008 Toshio Kuratomi 0.4.4-1 - Initial Fedora Build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 00:18:19 -0000 1.1 +++ .cvsignore 17 Jul 2008 16:38:51 -0000 1.2 @@ -0,0 +1 @@ +sqlalchemy-migrate-0.4.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 00:18:19 -0000 1.1 +++ sources 17 Jul 2008 16:38:51 -0000 1.2 @@ -0,0 +1 @@ +ea2da4aaeb82b538ec23148b35ead72c sqlalchemy-migrate-0.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 16:59:08 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 16:59:08 GMT Subject: rpms/digikam/F-8 digikam-missing-photos.patch, NONE, 1.1 digikam.spec, 1.43, 1.44 Message-ID: <200807171659.m6HGx8qo013245@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098 Modified Files: digikam.spec Added Files: digikam-missing-photos.patch Log Message: * Mon Jul 07 2008 Marcin Garski 0.9.3-2 - Don't lose some photos during import (#448235) digikam-missing-photos.patch: --- NEW FILE digikam-missing-photos.patch --- --- digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp 2007-12-22 18:19:47.000000000 +0100 +++ digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp.new 2008-07-07 00:42:14.000000000 +0200 @@ -370,7 +370,7 @@ KURL tempURL(dest); tempURL = tempURL.upURL(); - tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid())); + tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid()).prepend(file)); QString temp = tempURL.path(); bool result = d->camera->downloadItem(folder, file, tempURL.path()); @@ -410,7 +410,7 @@ KURL tempURL2(dest); tempURL2 = tempURL2.upURL(); - tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid())); + tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid()).prepend(file)); temp = tempURL2.path(); if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat)) Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-8/digikam.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- digikam.spec 29 Dec 2007 20:47:28 -0000 1.43 +++ digikam.spec 17 Jul 2008 16:58:11 -0000 1.44 @@ -1,6 +1,6 @@ Name: digikam Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -9,6 +9,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: digikam-missing-photos.patch + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs-devel @@ -47,6 +49,8 @@ %prep %setup -q +%patch0 -p1 + %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -133,6 +137,9 @@ %{_libdir}/libdigikam.so %changelog +* Mon Jul 07 2008 Marcin Garski 0.9.3-2 +- Don't lose some photos during import (#448235) + * Sat Dec 22 2007 Marcin Garski 0.9.3-1 - Update to 0.9.3 - BR: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2 From fedora-extras-commits at redhat.com Thu Jul 17 17:06:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Thu, 17 Jul 2008 17:06:40 GMT Subject: rpms/libdrm/devel libdrm.spec,1.42,1.43 Message-ID: <200807171706.m6HH6eXj021206@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/libdrm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21000 Modified Files: libdrm.spec Log Message: * Thu Jul 17 2008 Kristian H??gsberg - 2.4.0-0.15 - Avoid shared-core when doing make install so we don't install kernel header files. Drop kernel header files from -devel pkg files list. Index: libdrm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- libdrm.spec 16 Jul 2008 23:06:17 -0000 1.42 +++ libdrm.spec 17 Jul 2008 17:05:37 -0000 1.43 @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.0 -Release: 0.14%{?dist} +Release: 0.15%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -54,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT SUBDIRS=libdrm mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ @@ -79,22 +79,6 @@ %files devel %defattr(-,root,root,-) -%dir %{_includedir}/drm -# NOTE: Headers are listed explicitly, so we can monitor additions/removals. -#%{_includedir}/drm/drm.h -#%{_includedir}/drm/drm_sarea.h -#%{_includedir}/drm/i915_drm.h -%{_includedir}/drm/nouveau_drm.h -%{_includedir}/drm/mach64_drm.h -#%{_includedir}/drm/mga_drm.h -#%{_includedir}/drm/r128_drm.h -#%{_includedir}/drm/r300_reg.h -#%{_includedir}/drm/radeon_drm.h -#%{_includedir}/drm/savage_drm.h -#%{_includedir}/drm/sis_drm.h -#%{_includedir}/drm/via_3d_reg.h -#%{_includedir}/drm/via_drm.h -#%{_includedir}/drm/xgi_drm.h # FIXME should be in drm/ too %{_includedir}/xf86drm.h %{_includedir}/xf86drmMode.h @@ -103,6 +87,10 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Thu Jul 17 2008 Kristian H??gsberg - 2.4.0-0.15 +- Avoid shared-core when doing make install so we don't install kernel + header files. Drop kernel header files from -devel pkg files list. + * Thu Jul 17 2008 Dave Airlie 2.4.0-0.14 - kernel headers now installs somes of these files for us From fedora-extras-commits at redhat.com Thu Jul 17 17:10:14 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 17 Jul 2008 17:10:14 GMT Subject: rpms/python/devel python.spec,1.135,1.136 Message-ID: <200807171710.m6HHAERk021814@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21698 Modified Files: python.spec Log Message: bump the release as koji seems confused into thinking a -29 already exists Index: python.spec =================================================================== RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- python.spec 17 Jul 2008 14:23:34 -0000 1.135 +++ python.spec 17 Jul 2008 17:09:22 -0000 1.136 @@ -22,7 +22,7 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: 2.5.1 -Release: 29%{?dist} +Release: 30%{?dist} License: Python Group: Development/Languages Provides: python-abi = %{pybasever} @@ -510,10 +510,8 @@ %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so %changelog -* Thu Jul 17 2008 Jeremy Katz - 2.5.1-29 +* Thu Jul 17 2008 Jeremy Katz - 2.5.1-30 - Fix up the build for new rpm - -* Thu Jul 17 2008 Jeremy Katz - 2.5.1-28 - And actually build against db4-4.7 (#455170) * Thu Jul 10 2008 Tom "spot" Callaway - 2.5.1-27 From fedora-extras-commits at redhat.com Thu Jul 17 17:11:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Thu, 17 Jul 2008 17:11:18 GMT Subject: rpms/kernel/devel kernel.spec,1.779,1.780 Message-ID: <200807171711.m6HHBIct022126@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21895 Modified Files: kernel.spec Log Message: * Thu Jul 17 2008 Kristian H??gsberg - Add conflicts for older libdrm-devel to kernel-headers. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.779 retrieving revision 1.780 diff -u -r1.779 -r1.780 --- kernel.spec 17 Jul 2008 00:56:41 -0000 1.779 +++ kernel.spec 17 Jul 2008 17:10:24 -0000 1.780 @@ -414,6 +414,10 @@ %define kernel_smp_obsoletes kernel-enterprise < 2.4.10 %define kernel_PAE_obsoletes kernel-smp < 2.6.17 +# We moved the drm include files into kernel-headers, make sure there's +# a recent enough libdrm-devel on the system that doesn't have those. +%define kernel_headers_conflicts libdrm-devel < 2.4.0-0.15 + # # Packages that need to be installed before the kernel is, because the %post # scripts use them. @@ -1776,6 +1780,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 17 2008 Kristian H??gsberg +- Add conflicts for older libdrm-devel to kernel-headers. + * Wed Jul 16 2008 Dave Jones - Merge Linux-2.6 up to commit 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af From fedora-extras-commits at redhat.com Thu Jul 17 17:14:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 17:14:11 +0000 Subject: [pkgdb] alsa-lib: timj has requested watchcommits Message-ID: <200807171714.m6HHEBLp022598@bastion.fedora.phx.redhat.com> Tim Jackson (timj) has requested the watchcommits acl on alsa-lib (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib From fedora-extras-commits at redhat.com Thu Jul 17 17:14:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 17:14:11 +0000 Subject: [pkgdb] alsa-lib: timj has requested watchcommits Message-ID: <200807171714.m6HHEBhs022599@bastion.fedora.phx.redhat.com> Tim Jackson (timj) has requested the watchcommits acl on alsa-lib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib From fedora-extras-commits at redhat.com Thu Jul 17 17:14:38 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Thu, 17 Jul 2008 17:14:38 GMT Subject: rpms/conntrack-tools/devel conntrack-tools.spec,1.5,1.6 Message-ID: <200807171714.m6HHEcPl022614@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22256 Modified Files: conntrack-tools.spec Log Message: fix patch0/patch Index: conntrack-tools.spec =================================================================== RCS file: /cvs/extras/rpms/conntrack-tools/devel/conntrack-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- conntrack-tools.spec 16 Jul 2008 21:40:28 -0000 1.5 +++ conntrack-tools.spec 17 Jul 2008 17:12:02 -0000 1.6 @@ -1,12 +1,12 @@ Name: conntrack-tools Version: 0.9.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate netfilter connection tracking table Group: System Environment/Base License: GPLv2 URL: http://netfilter.org Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 -Patch0: conntrack-tools-rollup.patch +Patch: conntrack-tools-rollup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel libnetfilter_conntrack-devel pkgconfig bison flex BuildRequires: autoconf automake libtool @@ -54,6 +54,9 @@ %{_mandir}/man8/* %changelog +* Wed Jul 16 2008 Paul P. Komkoff Jr - 0.9.7-2 +- fix Patch0/%patch. + * Wed Jul 16 2008 Paul P. Komkoff Jr - 0.9.7-1 - new upstream version From fedora-extras-commits at redhat.com Thu Jul 17 17:14:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 17:14:56 +0000 Subject: [pkgdb] alsa-lib: timj has requested watchcommits Message-ID: <200807171714.m6HHEBLs022598@bastion.fedora.phx.redhat.com> Tim Jackson (timj) has requested the watchcommits acl on alsa-lib (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib From fedora-extras-commits at redhat.com Thu Jul 17 17:23:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 17:23:31 GMT Subject: rpms/exiv2/EL-5 exiv2-0.16-gcc43.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 exiv2.spec, 1.13, 1.14 sources, 1.7, 1.8 exiv2-0.11-no_rpath.patch, 1.1, NONE exiv2-0.13-CVE-2007-6353.patch, 1.1, NONE Message-ID: <200807171723.m6HHNVe3023123@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/exiv2/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23031 Modified Files: .cvsignore exiv2.spec sources Added Files: exiv2-0.16-gcc43.patch Removed Files: exiv2-0.11-no_rpath.patch exiv2-0.13-CVE-2007-6353.patch Log Message: * Mon Jun 23 2008 Rex Dieter 0.17.1-1 - exiv2-0.17.1 exiv2-0.16-gcc43.patch: --- NEW FILE exiv2-0.16-gcc43.patch --- diff -up exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp.gcc43 exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp --- exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp.gcc43 2007-12-08 10:52:25.000000000 -0600 +++ exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp 2008-02-11 08:12:25.000000000 -0600 @@ -20,6 +20,7 @@ #include "client-glue/WXMPMeta.hpp" #include +#include #include #include diff -up exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp.gcc43 2007-10-05 23:46:22.000000000 -0500 +++ exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp 2008-02-11 07:45:25.000000000 -0600 @@ -22,8 +22,11 @@ #include #endif +#include + using namespace std; + #if XMP_WinBuild #pragma warning ( disable : 4533 ) // initialization of '...' is skipped by 'goto ...' #pragma warning ( disable : 4702 ) // unreachable code diff -up exiv2-0.16/xmpsdk/src/XMPMeta.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta.cpp.gcc43 2007-10-06 03:11:52.000000000 -0500 +++ exiv2-0.16/xmpsdk/src/XMPMeta.cpp 2008-02-11 07:43:12.000000000 -0600 @@ -24,6 +24,8 @@ #include #endif +#include + using namespace std; #if XMP_WinBuild diff -up exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp.gcc43 2007-10-01 12:59:06.000000000 -0500 +++ exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp 2008-02-11 07:48:01.000000000 -0600 @@ -25,6 +25,8 @@ #include #endif +#include + using namespace std; #if XMP_WinBuild diff -up exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp.gcc43 2008-02-11 07:46:47.000000000 -0600 +++ exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp 2008-02-11 07:47:00.000000000 -0600 @@ -23,6 +23,8 @@ #include #endif +#include + using namespace std; #if XMP_WinBuild Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/exiv2/EL-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 26 Nov 2007 13:57:37 -0000 1.7 +++ .cvsignore 17 Jul 2008 17:21:52 -0000 1.8 @@ -1,4 +1 @@ -clog -exiv2-0.12.tar.gz -exiv2-0.14.tar.gz -exiv2-0.15.tar.gz +exiv2-0.17.1.tar.gz Index: exiv2.spec =================================================================== RCS file: /cvs/pkgs/rpms/exiv2/EL-5/exiv2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- exiv2.spec 17 Dec 2007 17:10:08 -0000 1.13 +++ exiv2.spec 17 Jul 2008 17:21:52 -0000 1.14 @@ -6,23 +6,24 @@ Summary: Exif and Iptc metadata manipulation library Name: exiv2 -Version: 0.15 -Release: 5%{?dist} +Version: 0.17.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.exiv2.org/ -Source0: http://www.exiv2.org/exiv2-%{version}.tar.gz +Source0: http://www.exiv2.org/exiv2-%{version}%{?pre:-%{pre}}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: zlib-devel +BuildRequires: chrpath +BuildRequires: expat-devel BuildRequires: gettext +BuildRequires: zlib-devel # docs -BuildRequires: doxygen graphviz libxslt +#BuildRequires: doxygen graphviz libxslt -Patch1: exiv2-0.11-no_rpath.patch -Patch2: exiv2-0.9.1-deps.patch -Patch3: exiv2-0.13-CVE-2007-6353.patch +Patch1: exiv2-0.9.1-deps.patch +Patch2: exiv2-0.16-gcc43.patch %if 0%{?libs} Requires: %{name}-libs = %{version}-%{release} @@ -31,6 +32,7 @@ Provides: %{name}-libs = %{version}-%{release} %endif + %description A command line utility to access image metadata, allowing one to: * print the Exif metadata of Jpeg images as summary info, interpreted values, @@ -68,37 +70,42 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?pre:-%{pre}} -%patch1 -p1 -b .no_rpath -%patch2 -p1 -b .deps -%patch3 -p1 -b .CVE-2007-6353 +%patch1 -p1 -b .deps +%patch2 -p1 -b .gcc43 mkdir doc/html %build -%configure --disable-static +%configure \ + --disable-rpath \ + --disable-static make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} %find_lang exiv2 # Unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -f %{buildroot}%{_libdir}/lib*.la # fix perms on installed lib -chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so* +chmod 755 %{buildroot}%{_libdir}/lib*.so* + +# nuke rpaths +chrpath --list %{buildroot}%{_bindir}/exiv2 +chrpath --delete %{buildroot}%{_bindir}/exiv2 %clean -rm -rf $FPM_BUILD_ROOT +rm -rf %{buildroot} %post %{?libs:libs} -p /sbin/ldconfig @@ -116,7 +123,7 @@ %files libs -f exiv2.lang %defattr(-,root,root,-) %endif -%{_libdir}/libexiv2.so.* +%{_libdir}/libexiv2.so.4* %files devel %defattr(-,root,root,-) @@ -127,8 +134,24 @@ %changelog -* Mon Dec 17 2007 Rex Dieter 0.15-5 -- CVE-2007-6353 (#425922) +* Mon Jun 23 2008 Rex Dieter 0.17.1-1 +- exiv2-0.17.1 + +* Mon Feb 11 2008 Rex Dieter 0.16-2 +- respin (gcc43) +- gcc43 patch + +* Sun Jan 13 2008 Rex Dieter 0.16-1 +- eviv2-0.16 + +* Mon Dec 17 2007 Rex Dieter 0.16-0.3.pre1 +- CVE-2007-6353 (#425924) + +* Mon Nov 26 2007 Rex Dieter 0.16-0.2.pre1 +- -libs subpkg toggle (f8+) + +* Tue Nov 13 2007 Rex Dieter 0.16-0.1.pre1 +- exiv2-0.16-pre1 * Tue Sep 18 2007 Rex Dieter 0.15-4 - -libs: -Requires: %%name Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/exiv2/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 26 Nov 2007 13:57:37 -0000 1.7 +++ sources 17 Jul 2008 17:21:52 -0000 1.8 @@ -1 +1 @@ -bb18d19e1d6fb255dadda456cadec00e exiv2-0.15.tar.gz +52a602f4f0d9e89b7084ac795b7547ac exiv2-0.17.1.tar.gz --- exiv2-0.11-no_rpath.patch DELETED --- --- exiv2-0.13-CVE-2007-6353.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 17:23:49 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 17:23:49 GMT Subject: rpms/exiv2/EL-4 exiv2-0.16-gcc43.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 exiv2.spec, 1.13, 1.14 sources, 1.6, 1.7 exiv2-0.11-no_rpath.patch, 1.1, NONE exiv2-0.13-CVE-2007-6353.patch, 1.1, NONE Message-ID: <200807171723.m6HHNnVO023175@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/exiv2/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23076 Modified Files: .cvsignore exiv2.spec sources Added Files: exiv2-0.16-gcc43.patch Removed Files: exiv2-0.11-no_rpath.patch exiv2-0.13-CVE-2007-6353.patch Log Message: * Mon Jun 23 2008 Rex Dieter 0.17.1-1 - exiv2-0.17.1 exiv2-0.16-gcc43.patch: --- NEW FILE exiv2-0.16-gcc43.patch --- diff -up exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp.gcc43 exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp --- exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp.gcc43 2007-12-08 10:52:25.000000000 -0600 +++ exiv2-0.16/xmpsdk/src/XMPCore_Impl.hpp 2008-02-11 08:12:25.000000000 -0600 @@ -20,6 +20,7 @@ #include "client-glue/WXMPMeta.hpp" #include +#include #include #include diff -up exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp.gcc43 2007-10-05 23:46:22.000000000 -0500 +++ exiv2-0.16/xmpsdk/src/XMPMeta-Serialize.cpp 2008-02-11 07:45:25.000000000 -0600 @@ -22,8 +22,11 @@ #include #endif +#include + using namespace std; + #if XMP_WinBuild #pragma warning ( disable : 4533 ) // initialization of '...' is skipped by 'goto ...' #pragma warning ( disable : 4702 ) // unreachable code diff -up exiv2-0.16/xmpsdk/src/XMPMeta.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta.cpp.gcc43 2007-10-06 03:11:52.000000000 -0500 +++ exiv2-0.16/xmpsdk/src/XMPMeta.cpp 2008-02-11 07:43:12.000000000 -0600 @@ -24,6 +24,8 @@ #include #endif +#include + using namespace std; #if XMP_WinBuild diff -up exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp.gcc43 2007-10-01 12:59:06.000000000 -0500 +++ exiv2-0.16/xmpsdk/src/XMPMeta-GetSet.cpp 2008-02-11 07:48:01.000000000 -0600 @@ -25,6 +25,8 @@ #include #endif +#include + using namespace std; #if XMP_WinBuild diff -up exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp.gcc43 exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp --- exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp.gcc43 2008-02-11 07:46:47.000000000 -0600 +++ exiv2-0.16/xmpsdk/src/XMPMeta-Parse.cpp 2008-02-11 07:47:00.000000000 -0600 @@ -23,6 +23,8 @@ #include #endif +#include + using namespace std; #if XMP_WinBuild Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/exiv2/EL-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Nov 2007 18:29:26 -0000 1.6 +++ .cvsignore 17 Jul 2008 17:22:57 -0000 1.7 @@ -1,4 +1 @@ -clog -exiv2-0.12.tar.gz -exiv2-0.14.tar.gz -exiv2-0.15.tar.gz +exiv2-0.17.1.tar.gz Index: exiv2.spec =================================================================== RCS file: /cvs/pkgs/rpms/exiv2/EL-4/exiv2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- exiv2.spec 17 Dec 2007 17:10:02 -0000 1.13 +++ exiv2.spec 17 Jul 2008 17:22:57 -0000 1.14 @@ -6,23 +6,24 @@ Summary: Exif and Iptc metadata manipulation library Name: exiv2 -Version: 0.15 -Release: 5%{?dist} +Version: 0.17.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.exiv2.org/ -Source0: http://www.exiv2.org/exiv2-%{version}.tar.gz +Source0: http://www.exiv2.org/exiv2-%{version}%{?pre:-%{pre}}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: zlib-devel +BuildRequires: chrpath +BuildRequires: expat-devel BuildRequires: gettext +BuildRequires: zlib-devel # docs -BuildRequires: doxygen graphviz libxslt +#BuildRequires: doxygen graphviz libxslt -Patch1: exiv2-0.11-no_rpath.patch -Patch2: exiv2-0.9.1-deps.patch -Patch3: exiv2-0.13-CVE-2007-6353.patch +Patch1: exiv2-0.9.1-deps.patch +Patch2: exiv2-0.16-gcc43.patch %if 0%{?libs} Requires: %{name}-libs = %{version}-%{release} @@ -31,6 +32,7 @@ Provides: %{name}-libs = %{version}-%{release} %endif + %description A command line utility to access image metadata, allowing one to: * print the Exif metadata of Jpeg images as summary info, interpreted values, @@ -68,37 +70,42 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?pre:-%{pre}} -%patch1 -p1 -b .no_rpath -%patch2 -p1 -b .deps -%patch3 -p1 -b .CVE-2007-6353 +%patch1 -p1 -b .deps +%patch2 -p1 -b .gcc43 mkdir doc/html %build -%configure --disable-static +%configure \ + --disable-rpath \ + --disable-static make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} %find_lang exiv2 # Unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -f %{buildroot}%{_libdir}/lib*.la # fix perms on installed lib -chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so* +chmod 755 %{buildroot}%{_libdir}/lib*.so* + +# nuke rpaths +chrpath --list %{buildroot}%{_bindir}/exiv2 +chrpath --delete %{buildroot}%{_bindir}/exiv2 %clean -rm -rf $FPM_BUILD_ROOT +rm -rf %{buildroot} %post %{?libs:libs} -p /sbin/ldconfig @@ -116,7 +123,7 @@ %files libs -f exiv2.lang %defattr(-,root,root,-) %endif -%{_libdir}/libexiv2.so.* +%{_libdir}/libexiv2.so.4* %files devel %defattr(-,root,root,-) @@ -127,8 +134,24 @@ %changelog -* Mon Dec 17 2007 Rex Dieter 0.15-5 -- CVE-2007-6353 (#425922) +* Mon Jun 23 2008 Rex Dieter 0.17.1-1 +- exiv2-0.17.1 + +* Mon Feb 11 2008 Rex Dieter 0.16-2 +- respin (gcc43) +- gcc43 patch + +* Sun Jan 13 2008 Rex Dieter 0.16-1 +- eviv2-0.16 + +* Mon Dec 17 2007 Rex Dieter 0.16-0.3.pre1 +- CVE-2007-6353 (#425924) + +* Mon Nov 26 2007 Rex Dieter 0.16-0.2.pre1 +- -libs subpkg toggle (f8+) + +* Tue Nov 13 2007 Rex Dieter 0.16-0.1.pre1 +- exiv2-0.16-pre1 * Tue Sep 18 2007 Rex Dieter 0.15-4 - -libs: -Requires: %%name Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/exiv2/EL-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Nov 2007 18:29:26 -0000 1.6 +++ sources 17 Jul 2008 17:22:57 -0000 1.7 @@ -1 +1 @@ -bb18d19e1d6fb255dadda456cadec00e exiv2-0.15.tar.gz +52a602f4f0d9e89b7084ac795b7547ac exiv2-0.17.1.tar.gz --- exiv2-0.11-no_rpath.patch DELETED --- --- exiv2-0.13-CVE-2007-6353.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 17:32:54 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 17 Jul 2008 17:32:54 GMT Subject: rpms/kernel/devel .cvsignore, 1.869, 1.870 config-generic, 1.131, 1.132 config-x86-generic, 1.39, 1.40 config-x86_64-generic, 1.39, 1.40 kernel.spec, 1.780, 1.781 linux-2.6-silence-noise.patch, 1.17, 1.18 sources, 1.829, 1.830 upstream, 1.747, 1.748 Message-ID: <200807171732.m6HHWsRe023528@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466 Modified Files: .cvsignore config-generic config-x86-generic config-x86_64-generic kernel.spec linux-2.6-silence-noise.patch sources upstream Log Message: 2.6.26-git5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.869 retrieving revision 1.870 diff -u -r1.869 -r1.870 --- .cvsignore 16 Jul 2008 21:44:01 -0000 1.869 +++ .cvsignore 17 Jul 2008 17:32:22 -0000 1.870 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git4.bz2 +patch-2.6.26-git5.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- config-generic 16 Jul 2008 03:54:36 -0000 1.131 +++ config-generic 17 Jul 2008 17:32:22 -0000 1.132 @@ -111,6 +111,8 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_RICOH_MMC=m CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_WBSD=m @@ -292,6 +294,7 @@ CONFIG_ISAPNP=y # CONFIG_PNPBIOS is not set +CONFIG_ACPI_PCI_SLOT=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m @@ -3007,6 +3010,11 @@ CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +# CONFIG_UBIFS_FS_DEBUG is not set + # # Partition Types # @@ -3583,4 +3591,3 @@ # MT9V022_PCA9536_SWITCH is not set CONFIG_THERMAL_HWMON=y - Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- config-x86-generic 15 Jul 2008 19:51:19 -0000 1.39 +++ config-x86-generic 17 Jul 2008 17:32:22 -0000 1.40 @@ -308,10 +308,12 @@ # CONFIG_SGI_IOC4 is not set CONFIG_ASUS_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_EEEPC_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m -CONFIG_EEEPC_LAPTOP=m # CONFIG_SMSC37B787_WDT is not set CONFIG_W83697HF_WDT=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- config-x86_64-generic 15 Jul 2008 19:51:19 -0000 1.39 +++ config-x86_64-generic 17 Jul 2008 17:32:22 -0000 1.40 @@ -97,12 +97,15 @@ CONFIG_ACPI_PROC_EVENT=y CONFIG_ASUS_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m CONFIG_SONYPI_COMPAT=y # CONFIG_EEEPC_LAPTOP is not set + CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.780 retrieving revision 1.781 diff -u -r1.780 -r1.781 --- kernel.spec 17 Jul 2008 17:10:24 -0000 1.780 +++ kernel.spec 17 Jul 2008 17:32:22 -0000 1.781 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1780,6 +1780,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 17 2008 Dave Jones +- 2.6.26-git5 + * Thu Jul 17 2008 Kristian H??gsberg - Add conflicts for older libdrm-devel to kernel-headers. linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- linux-2.6-silence-noise.patch 15 Jul 2008 13:51:23 -0000 1.17 +++ linux-2.6-silence-noise.patch 17 Jul 2008 17:32:22 -0000 1.18 @@ -1,23 +1,3 @@ ---- linux-2.6.18.noarch/drivers/pci/setup-res.c~ 2006-10-17 17:15:34.000000000 -0400 -+++ linux-2.6.18.noarch/drivers/pci/setup-res.c 2006-10-17 17:15:56.000000000 -0400 -@@ -148,7 +148,7 @@ int pci_assign_resource(struct pci_dev * - } - - if (ret) { -- printk(KERN_ERR "PCI: Failed to allocate %s resource " -+ printk(KERN_DEBUG "PCI: Failed to allocate %s resource " - "#%d:%llx@%llx for %s\n", - res->flags & IORESOURCE_IO ? "I/O" : "mem", - resno, (unsigned long long)size, -@@ -186,7 +186,7 @@ int pci_assign_resource_fixed(struct pci - } - - if (ret) { -- printk(KERN_ERR "PCI: Failed to allocate %s resource " -+ printk(KERN_DEBUG "PCI: Failed to allocate %s resource " - "#%d:%llx@%llx for %s\n", - res->flags & IORESOURCE_IO ? "I/O" : "mem", - resno, (unsigned long long)(res->end - res->start + 1), --- linux-2.6.19.noarch/arch/x86/pci/i386.c~ 2006-12-04 11:21:32.000000000 -0500 +++ linux-2.6.19.noarch/arch/x86/pci/i386.c 2006-12-04 11:22:10.000000000 -0500 @@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_ @@ -39,32 +19,9 @@ "of device %s\n", idx, pci_name(dev)); -Remove noisy PM printk. -This has served its purpose. - -Signed-off-by: Dave Jones - ---- linux-2.6.20.noarch/drivers/pci/pci.c~ 2007-04-16 18:14:14.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/pci/pci.c 2007-04-16 18:14:33.000000000 -0400 -@@ -664,14 +664,9 @@ pci_restore_state(struct pci_dev *dev) - */ - for (i = 15; i >= 0; i--) { - pci_read_config_dword(dev, i * 4, &val); -- if (val != dev->saved_config_space[i]) { -- printk(KERN_DEBUG "PM: Writing back config space on " -- "device %s at offset %x (was %x, writing %x)\n", -- pci_name(dev), i, -- val, (int)dev->saved_config_space[i]); -+ if (val != dev->saved_config_space[i]) - pci_write_config_dword(dev,i * 4, - dev->saved_config_space[i]); -- } - } - pci_restore_pcix_state(dev); - pci_restore_msi_state(dev); ---- linux-2.6.25.noarch/drivers/base/power/main.c~ 2008-05-16 10:26:38.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/base/power/main.c 2008-05-16 10:26:59.000000000 -0400 -@@ -64,9 +64,6 @@ int device_pm_add(struct device *dev) +--- linux-2.6.26.noarch/drivers/base/power/main.c~ 2008-07-17 13:12:20.000000000 -0400 ++++ linux-2.6.26.noarch/drivers/base/power/main.c 2008-07-17 13:12:44.000000000 -0400 +@@ -71,9 +71,6 @@ int device_pm_add(struct device *dev) { int error; @@ -72,6 +29,5 @@ - dev->bus ? dev->bus->name : "No Bus", - kobject_name(&dev->kobj)); mutex_lock(&dpm_list_mtx); - if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) { - if (dev->parent->power.sleeping) - + if (dev->parent) { + if (dev->parent->power.status >= DPM_SUSPENDING) { Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.829 retrieving revision 1.830 diff -u -r1.829 -r1.830 --- sources 16 Jul 2008 21:44:02 -0000 1.829 +++ sources 17 Jul 2008 17:32:22 -0000 1.830 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -0b4b89d4869ec812d0439dba0c240d9f patch-2.6.26-git4.bz2 +8210bca1cfec7b32401fcd067ef7bbac patch-2.6.26-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.747 retrieving revision 1.748 diff -u -r1.747 -r1.748 --- upstream 16 Jul 2008 21:44:02 -0000 1.747 +++ upstream 17 Jul 2008 17:32:22 -0000 1.748 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git4.bz2 +patch-2.6.26-git5.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 17:36:15 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 17:36:15 GMT Subject: rpms/libkexiv2/EL-5 .cvsignore, 1.3, 1.4 libkexiv2.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807171736.m6HHaFFv023736@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libkexiv2/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23681 Modified Files: .cvsignore libkexiv2.spec sources Log Message: * Thu May 08 2008 Rex Dieter 1.1.7-1 - libkexiv2-0.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libkexiv2/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Dec 2007 16:31:24 -0000 1.3 +++ .cvsignore 17 Jul 2008 17:35:20 -0000 1.4 @@ -1,2 +1 @@ -clog -libkexiv2-0.1.6.tar.bz2 +libkexiv2-0.1.7.tar.bz2 Index: libkexiv2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libkexiv2/EL-5/libkexiv2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libkexiv2.spec 10 Dec 2007 16:31:24 -0000 1.2 +++ libkexiv2.spec 17 Jul 2008 17:35:20 -0000 1.3 @@ -3,8 +3,8 @@ Summary: A library to manipulate EXIF/IPTC information Name: libkexiv2 -Version: 0.1.6 -Release: 3%{?dist} +Version: 0.1.7 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -81,6 +81,12 @@ %changelog +* Thu May 08 2008 Rex Dieter 1.1.7-1 +- libkexiv2-0.1.7 + +* Fri Feb 08 2008 Rex Dieter 1.1.6-4 +- respin (gcc43) + * Sun Dec 09 2007 Rex Dieter 1.1.6-3 - BR: kdelibs3-devel (f7+) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libkexiv2/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Dec 2007 16:31:24 -0000 1.3 +++ sources 17 Jul 2008 17:35:20 -0000 1.4 @@ -1 +1 @@ -8a256ac6a3895720a88b29eaf932917c libkexiv2-0.1.6.tar.bz2 +adfd55e11f919533ba450d4d49ef078f libkexiv2-0.1.7.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 17:41:22 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Thu, 17 Jul 2008 17:41:22 GMT Subject: rpms/coq/F-8 coq.spec,1.1,1.2 import.log,1.1,1.2 Message-ID: <200807171741.m6HHfM3E024027@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23950/F-8 Modified Files: coq.spec import.log Log Message: Spec file upgrade to allow build in F-8. Index: coq.spec =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/coq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coq.spec 16 Jul 2008 19:05:11 -0000 1.1 +++ coq.spec 17 Jul 2008 17:40:39 -0000 1.2 @@ -24,7 +24,7 @@ Name: coq Version: 8.1pl3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Coq proof management system Group: Applications/Engineering @@ -46,7 +46,12 @@ Patch2: makefile-strip.patch Patch3: check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, texlive-latex, texlive-texmf +BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs +%if 0%{?fedora} <= 8 +BuildRequires: tetex, tetex-latex +%else +BuildRequires: texlive-latex, texlive-texmf +%endif # ExcludeArch: ppc64 %description @@ -284,5 +289,7 @@ %doc README.coq-emacs %changelog +* Thu Jul 17 2008 Alan Dunn 8.1pl3-2 +- Added check for Fedora distribution number to allow for Fedora 8 release. * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Jul 2008 19:05:11 -0000 1.1 +++ import.log 17 Jul 2008 17:40:39 -0000 1.2 @@ -1 +1,2 @@ coq-8_1pl3-1_fc9:F-8:coq-8.1pl3-1.fc9.src.rpm:1216235027 +coq-8_1pl3-2_fc9:F-8:coq-8.1pl3-2.fc9.src.rpm:1216316352 From fedora-extras-commits at redhat.com Thu Jul 17 18:14:50 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 17 Jul 2008 18:14:50 GMT Subject: rpms/kernel/F-9 linux-2.6-net-tulip-interrupt.patch, NONE, 1.1 kernel.spec, 1.712, 1.713 Message-ID: <200807171814.m6HIEol4032328@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32210 Modified Files: kernel.spec Added Files: linux-2.6-net-tulip-interrupt.patch Log Message: Fix SHIRQ debug trace in tulip driver. (#454575) linux-2.6-net-tulip-interrupt.patch: --- NEW FILE linux-2.6-net-tulip-interrupt.patch --- https://bugzilla.redhat.com/show_bug.cgi?id=454575 Signed-off-by: Dave Jones --- linux-2.6.26.noarch/drivers/net/tulip/tulip_core.c~ 2008-07-17 14:04:46.000000000 -0400 +++ linux-2.6.26.noarch/drivers/net/tulip/tulip_core.c 2008-07-17 14:07:38.000000000 -0400 @@ -504,11 +504,11 @@ tulip_open(struct net_device *dev) { int retval; + tulip_init_ring(dev); + if ((retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev))) return retval; - tulip_init_ring (dev); - tulip_up (dev); netif_start_queue (dev); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.712 retrieving revision 1.713 diff -u -r1.712 -r1.713 --- kernel.spec 16 Jul 2008 16:30:23 -0000 1.712 +++ kernel.spec 17 Jul 2008 18:13:46 -0000 1.713 @@ -681,6 +681,8 @@ # atl2 network driver Patch2020: linux-2.6-netdev-atl2.patch +Patch2030: linux-2.6-net-tulip-interrupt.patch + # linux1394 git patches Patch2200: linux-2.6-firewire-git-update.patch Patch2201: linux-2.6-firewire-git-pending.patch @@ -1252,6 +1254,8 @@ ApplyPatch linux-2.6-netdev-atl2.patch +ApplyPatch linux-2.6-net-tulip-interrupt.patch + # fix bluetooth kbd disconnect ApplyPatch linux-2.6-bluetooth-signal-userspace-for-socket-errors.patch @@ -1877,6 +1881,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 17 2008 Dave Jones +- Fix SHIRQ debug trace in tulip driver. (#454575) + * Tue Jul 15 2008 John W. Linville - Upstream wireless updates from 2008-07-14 (http://marc.info/?l=linux-wireless&m=121606436000705&w=2) From fedora-extras-commits at redhat.com Thu Jul 17 18:15:04 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Thu, 17 Jul 2008 18:15:04 GMT Subject: rpms/libical/F-8 .cvsignore, 1.2, 1.3 libical.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200807171815.m6HIF4Ff032361@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32255 Modified Files: .cvsignore libical.spec sources Log Message: * Thu Jul 17 2008 Jeff Perry - 0.31-1 - Version bump to 0.31. * Thu Jul 17 2008 Debarshi Ray - 0.30-4 - Changed value of License according to Fedora licensing guidelines. - Enabled reentrant system calls and C++ bindings. - Omitted unused direct shared library dependencies. - Added ChangeLog, COPYING, LICENSE, NEWS and README to doc and dropped examples. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jan 2008 19:27:23 -0000 1.2 +++ .cvsignore 17 Jul 2008 18:14:14 -0000 1.3 @@ -1 +1 @@ -libical-0.27.tar.gz +libical-0.31.tar.gz Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-8/libical.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libical.spec 2 Apr 2008 13:34:09 -0000 1.4 +++ libical.spec 17 Jul 2008 18:14:14 -0000 1.5 @@ -1,91 +1,113 @@ -Name: libical -Version: 0.30 -Release: 2%{?dist} -Summary: Reference implementation of the iCalendar data type and serialization format -Summary(pl): Implementacja formatu iCalendar - -Group: System Environment/Libraries -License: MPL, LGPLv2 -URL: http://freeassociation.sourceforge.net/ -Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz +Name: libical +Version: 0.31 +Release: 1%{?dist} +Summary: Reference implementation of the iCalendar data type and serialization format +Summary(pl): Implementacja formatu iCalendar + +Group: System Environment/Libraries +License: LGPLv2 or MPLv1.1 +URL: http://freeassociation.sourceforge.net/ +Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -#BuildRequires: +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description -Reference implementation of the -iCalendar data type and serialization -format. libical is used in dozens of -calendaring and scheduling products. - -%description -l pl -Implementacja formatu iCalendar, -u??ywana w wielu kalendarzach -i planerach/planistach. - -%package devel -Summary: Development files for libical -Summary(pl): Pliki deweloperskie dla libical -Group: Development/Libraries -Requires: libical = %{version}-%{release} - -%description devel -The libical-devel package contains libraries -and header files for developing +Reference implementation of the iCalendar data type and serialization format +used in dozens of calendaring and scheduling products. + +%description -l pl +Implementacja formatu iCalendar, u??ywana w wielu kalendarzach i +planerach/planistach. + +%package devel +Summary: Development files for libical +Summary(pl): Pliki deweloperskie dla libical +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The libical-devel package contains libraries and header files for developing applications that use libical. -%description devel -l pl -libical-devel zawiera biblioteki i pliki niezb??dne -do tworzenia aplikacji korzystaj??cych z libical. +%description devel -l pl +libical-devel zawiera biblioteki i pliki niezb??dne do tworzenia aplikacji +korzystaj??cych z libical. %prep %setup -q - %build -%configure --disable-static -make %{?_smp_mflags} -#Make creates unuseful files -rm -rf examples/.deps +%configure --disable-static --enable-reentrant --enable-cxx + +# Omit unused direct shared library dependencies. +sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name "*.la" -delete %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) -%doc AUTHORS THANKS TODO -%{_libdir}/*.so.* -%{_datadir}/libical/ +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc LICENSE +%doc NEWS +%doc README +%doc THANKS +%doc TODO +%{_libdir}/%{name}.so.* +%{_libdir}/%{name}_cxx.so.* +%{_libdir}/libicalss.so.* +%{_libdir}/libicalss_cxx.so.* +%{_libdir}/libicalvcal.so.* %files devel %defattr(-,root,root,-) -%doc doc examples -%{_includedir}/* -%{_libdir}/*.so - +%doc doc/UsingLibical.txt +%{_includedir}/ical.h +%{_includedir}/ical*.h +%{_includedir}/icptrholder.h +%{_includedir}/pvl.h +%{_includedir}/sspm.h +%{_includedir}/vcomponent.h +%{_libdir}/%{name}.so +%{_libdir}/%{name}_cxx.so +%{_libdir}/libicalss.so +%{_libdir}/libicalss_cxx.so +%{_libdir}/libicalvcal.so %changelog -* Wed Apr 02 2008 Jakub 'Livio' Rusinek - 0.30-2 +* Thu Jul 17 2008 Jeff Perry - 0.31-1 +- Version bump to 0.31. + +* Thu Jul 17 2008 Debarshi Ray - 0.30-4 +- Changed value of License according to Fedora licensing guidelines. +- Enabled reentrant system calls and C++ bindings. +- Omitted unused direct shared library dependencies. +- Added ChangeLog, COPYING, LICENSE, NEWS and README to doc and dropped + examples. + +* Wed Apr 02 2008 Jakub 'Livio' Rusinek - 0.30-3 - Source URL... Fixed -* Wed Apr 02 2008 Jakub 'Livio' Rusinek - 0.30-1 +* Wed Apr 02 2008 Jakub 'Livio' Rusinek - 0.30-2 +- Removed untrue note about libical's homepage (to get rid of eventuall mess) + +* Sat Feb 23 2008 David Nielsen - 0.30-1 - Switch to freeassociation libical - bump to 0.30 -- Synchronizing with changes done in Rawhide * Sat Feb 09 2008 Jakub 'Livio' Rusinek - 0.27-5 - Mass rebuild for new GCC... Done Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jan 2008 19:27:23 -0000 1.2 +++ sources 17 Jul 2008 18:14:14 -0000 1.3 @@ -1 +1 @@ -87d48321bff08de08794132d60b55d94 libical-0.27.tar.gz +39382c919abd9abfab6ecba27715eaa5 libical-0.31.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 18:16:45 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Thu, 17 Jul 2008 18:16:45 GMT Subject: rpms/libical/F-9 .cvsignore, 1.3, 1.4 libical.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807171816.m6HIGjhS032448@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32414 Modified Files: .cvsignore libical.spec sources Log Message: * Thu Jul 17 2008 Jeff Perry - 0.31-1 - Version bump to 0.31. * Thu Jul 17 2008 Debarshi Ray - 0.30-4 - Changed value of License according to Fedora licensing guidelines. - Enabled reentrant system calls and C++ bindings. - Omitted unused direct shared library dependencies. - Added ChangeLog, COPYING, LICENSE, NEWS and README to doc and dropped examples. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Feb 2008 22:18:32 -0000 1.3 +++ .cvsignore 17 Jul 2008 18:16:10 -0000 1.4 @@ -1 +1 @@ -libical-0.30.tar.gz +libical-0.31.tar.gz Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-9/libical.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libical.spec 2 Apr 2008 13:34:21 -0000 1.5 +++ libical.spec 17 Jul 2008 18:16:10 -0000 1.6 @@ -1,55 +1,54 @@ -Name: libical -Version: 0.30 -Release: 3%{?dist} -Summary: Reference implementation of the iCalendar data type and serialization format -Summary(pl): Implementacja formatu iCalendar - -Group: System Environment/Libraries -License: MPL, LGPLv2 -URL: http://freeassociation.sourceforge.net/ -Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz +Name: libical +Version: 0.31 +Release: 1%{?dist} +Summary: Reference implementation of the iCalendar data type and serialization format +Summary(pl): Implementacja formatu iCalendar + +Group: System Environment/Libraries +License: LGPLv2 or MPLv1.1 +URL: http://freeassociation.sourceforge.net/ +Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -#BuildRequires: +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description -Reference implementation of the -iCalendar data type and serialization -format. libical is used in dozens of -calendaring and scheduling products. - -%description -l pl -Implementacja formatu iCalendar, -u??ywana w wielu kalendarzach -i planerach/planistach. - -%package devel -Summary: Development files for libical -Summary(pl): Pliki deweloperskie dla libical -Group: Development/Libraries -Requires: libical = %{version}-%{release} - -%description devel -The libical-devel package contains libraries -and header files for developing +Reference implementation of the iCalendar data type and serialization format +used in dozens of calendaring and scheduling products. + +%description -l pl +Implementacja formatu iCalendar, u??ywana w wielu kalendarzach i +planerach/planistach. + +%package devel +Summary: Development files for libical +Summary(pl): Pliki deweloperskie dla libical +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The libical-devel package contains libraries and header files for developing applications that use libical. -%description devel -l pl -libical-devel zawiera biblioteki i pliki niezb??dne -do tworzenia aplikacji korzystaj??cych z libical. +%description devel -l pl +libical-devel zawiera biblioteki i pliki niezb??dne do tworzenia aplikacji +korzystaj??cych z libical. %prep %setup -q %build -%configure --disable-static +%configure --disable-static --enable-reentrant --enable-cxx + +# Omit unused direct shared library dependencies. +sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool + make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name "*.la" -delete %clean rm -rf $RPM_BUILD_ROOT @@ -60,16 +59,46 @@ %files %defattr(-,root,root,-) -%doc AUTHORS THANKS TODO -%{_libdir}/*.so.* +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc LICENSE +%doc NEWS +%doc README +%doc THANKS +%doc TODO +%{_libdir}/%{name}.so.* +%{_libdir}/%{name}_cxx.so.* +%{_libdir}/libicalss.so.* +%{_libdir}/libicalss_cxx.so.* +%{_libdir}/libicalvcal.so.* %files devel %defattr(-,root,root,-) -%doc doc examples -%{_includedir}/ -%{_libdir}/*.so +%doc doc/UsingLibical.txt +%{_includedir}/ical.h +%{_includedir}/ical*.h +%{_includedir}/icptrholder.h +%{_includedir}/pvl.h +%{_includedir}/sspm.h +%{_includedir}/vcomponent.h +%{_libdir}/%{name}.so +%{_libdir}/%{name}_cxx.so +%{_libdir}/libicalss.so +%{_libdir}/libicalss_cxx.so +%{_libdir}/libicalvcal.so %changelog +* Thu Jul 17 2008 Jeff Perry - 0.31-1 +- Version bump to 0.31. + +* Thu Jul 17 2008 Debarshi Ray - 0.30-4 +- Changed value of License according to Fedora licensing guidelines. +- Enabled reentrant system calls and C++ bindings. +- Omitted unused direct shared library dependencies. +- Added ChangeLog, COPYING, LICENSE, NEWS and README to doc and dropped + examples. + * Wed Apr 02 2008 Jakub 'Livio' Rusinek - 0.30-3 - Source URL... Fixed Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Feb 2008 22:18:32 -0000 1.3 +++ sources 17 Jul 2008 18:16:10 -0000 1.4 @@ -1 +1 @@ -4932ac39dd06fbfee42d7b82d10ab615 libical-0.30.tar.gz +39382c919abd9abfab6ecba27715eaa5 libical-0.31.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 18:20:18 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Thu, 17 Jul 2008 18:20:18 GMT Subject: rpms/libical/devel .cvsignore, 1.3, 1.4 libical.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807171820.m6HIKI8F032599@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32524 Modified Files: .cvsignore libical.spec sources Log Message: * Thu Jul 17 2008 Jeff Perry - 0.31-1 - Version bump to 0.31. * Thu Jul 17 2008 Debarshi Ray - 0.30-4 - Changed value of License according to Fedora licensing guidelines. - Enabled reentrant system calls and C++ bindings. - Omitted unused direct shared library dependencies. - Added ChangeLog, COPYING, LICENSE, NEWS and README to doc and dropped examples. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libical/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Feb 2008 22:18:32 -0000 1.3 +++ .cvsignore 17 Jul 2008 18:19:34 -0000 1.4 @@ -1 +1 @@ -libical-0.30.tar.gz +libical-0.31.tar.gz Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libical.spec 2 Apr 2008 13:34:21 -0000 1.5 +++ libical.spec 17 Jul 2008 18:19:34 -0000 1.6 @@ -1,55 +1,54 @@ -Name: libical -Version: 0.30 -Release: 3%{?dist} -Summary: Reference implementation of the iCalendar data type and serialization format -Summary(pl): Implementacja formatu iCalendar - -Group: System Environment/Libraries -License: MPL, LGPLv2 -URL: http://freeassociation.sourceforge.net/ -Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz +Name: libical +Version: 0.31 +Release: 1%{?dist} +Summary: Reference implementation of the iCalendar data type and serialization format +Summary(pl): Implementacja formatu iCalendar + +Group: System Environment/Libraries +License: LGPLv2 or MPLv1.1 +URL: http://freeassociation.sourceforge.net/ +Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -#BuildRequires: +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description -Reference implementation of the -iCalendar data type and serialization -format. libical is used in dozens of -calendaring and scheduling products. - -%description -l pl -Implementacja formatu iCalendar, -u??ywana w wielu kalendarzach -i planerach/planistach. - -%package devel -Summary: Development files for libical -Summary(pl): Pliki deweloperskie dla libical -Group: Development/Libraries -Requires: libical = %{version}-%{release} - -%description devel -The libical-devel package contains libraries -and header files for developing +Reference implementation of the iCalendar data type and serialization format +used in dozens of calendaring and scheduling products. + +%description -l pl +Implementacja formatu iCalendar, u??ywana w wielu kalendarzach i +planerach/planistach. + +%package devel +Summary: Development files for libical +Summary(pl): Pliki deweloperskie dla libical +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The libical-devel package contains libraries and header files for developing applications that use libical. -%description devel -l pl -libical-devel zawiera biblioteki i pliki niezb??dne -do tworzenia aplikacji korzystaj??cych z libical. +%description devel -l pl +libical-devel zawiera biblioteki i pliki niezb??dne do tworzenia aplikacji +korzystaj??cych z libical. %prep %setup -q %build -%configure --disable-static +%configure --disable-static --enable-reentrant --enable-cxx + +# Omit unused direct shared library dependencies. +sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool + make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name "*.la" -delete %clean rm -rf $RPM_BUILD_ROOT @@ -60,16 +59,46 @@ %files %defattr(-,root,root,-) -%doc AUTHORS THANKS TODO -%{_libdir}/*.so.* +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc LICENSE +%doc NEWS +%doc README +%doc THANKS +%doc TODO +%{_libdir}/%{name}.so.* +%{_libdir}/%{name}_cxx.so.* +%{_libdir}/libicalss.so.* +%{_libdir}/libicalss_cxx.so.* +%{_libdir}/libicalvcal.so.* %files devel %defattr(-,root,root,-) -%doc doc examples -%{_includedir}/ -%{_libdir}/*.so +%doc doc/UsingLibical.txt +%{_includedir}/ical.h +%{_includedir}/ical*.h +%{_includedir}/icptrholder.h +%{_includedir}/pvl.h +%{_includedir}/sspm.h +%{_includedir}/vcomponent.h +%{_libdir}/%{name}.so +%{_libdir}/%{name}_cxx.so +%{_libdir}/libicalss.so +%{_libdir}/libicalss_cxx.so +%{_libdir}/libicalvcal.so %changelog +* Thu Jul 17 2008 Jeff Perry - 0.31-1 +- Version bump to 0.31. + +* Thu Jul 17 2008 Debarshi Ray - 0.30-4 +- Changed value of License according to Fedora licensing guidelines. +- Enabled reentrant system calls and C++ bindings. +- Omitted unused direct shared library dependencies. +- Added ChangeLog, COPYING, LICENSE, NEWS and README to doc and dropped + examples. + * Wed Apr 02 2008 Jakub 'Livio' Rusinek - 0.30-3 - Source URL... Fixed Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libical/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Feb 2008 22:18:32 -0000 1.3 +++ sources 17 Jul 2008 18:19:34 -0000 1.4 @@ -1 +1 @@ -4932ac39dd06fbfee42d7b82d10ab615 libical-0.30.tar.gz +39382c919abd9abfab6ecba27715eaa5 libical-0.31.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 18:25:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:25:37 +0000 Subject: [pkgdb] dnrd (Fedora, 8) updated by kevin Message-ID: <200807171825.m6HIPbWW025167@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for dnrd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dnrd (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dnrd (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dnrd (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on dnrd (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dnrd From fedora-extras-commits at redhat.com Thu Jul 17 18:25:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:25:37 +0000 Subject: [pkgdb] dnrd (Fedora, devel) updated by kevin Message-ID: <200807171825.m6HIPbWZ025167@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on dnrd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dnrd From fedora-extras-commits at redhat.com Thu Jul 17 18:25:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:25:33 +0000 Subject: [pkgdb] dnrd was added for rakesh Message-ID: <200807171825.m6HIPcsd025164@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package dnrd with summary A caching, forwarding DNS proxy server Kevin Fenzi (kevin) has approved Package dnrd Kevin Fenzi (kevin) has added a Fedora devel branch for dnrd with an owner of rakesh Kevin Fenzi (kevin) has approved dnrd in Fedora devel Kevin Fenzi (kevin) has approved Package dnrd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dnrd (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dnrd (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dnrd (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on dnrd (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on dnrd (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on dnrd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dnrd From fedora-extras-commits at redhat.com Thu Jul 17 18:25:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:25:37 +0000 Subject: [pkgdb] dnrd (Fedora, 9) updated by kevin Message-ID: <200807171825.m6HIPbWc025167@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for dnrd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dnrd (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dnrd (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dnrd (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on dnrd (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dnrd From fedora-extras-commits at redhat.com Thu Jul 17 18:26:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:26:08 GMT Subject: rpms/dnrd - New directory Message-ID: <200807171826.m6HIQ8Jt000428@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dnrd In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqWZ392/rpms/dnrd Log Message: Directory /cvs/extras/rpms/dnrd added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:26:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:26:25 GMT Subject: rpms/dnrd/devel - New directory Message-ID: <200807171826.m6HIQPds000442@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dnrd/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqWZ392/rpms/dnrd/devel Log Message: Directory /cvs/extras/rpms/dnrd/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:26:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:26:29 +0000 Subject: [pkgdb] sitecopy was added for rakesh Message-ID: <200807171826.m6HIQTGn025312@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package sitecopy with summary Tool for easily maintaining remote web sites Kevin Fenzi (kevin) has approved Package sitecopy Kevin Fenzi (kevin) has added a Fedora devel branch for sitecopy with an owner of rakesh Kevin Fenzi (kevin) has approved sitecopy in Fedora devel Kevin Fenzi (kevin) has approved Package sitecopy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sitecopy (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sitecopy (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sitecopy (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on sitecopy (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on sitecopy (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on sitecopy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sitecopy From fedora-extras-commits at redhat.com Thu Jul 17 18:26:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:26:35 +0000 Subject: [pkgdb] sitecopy (Fedora, 8) updated by kevin Message-ID: <200807171826.m6HIPcsg025164@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for sitecopy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sitecopy (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sitecopy (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sitecopy (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on sitecopy (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sitecopy From fedora-extras-commits at redhat.com Thu Jul 17 18:26:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:26:35 +0000 Subject: [pkgdb] sitecopy (Fedora, 9) updated by kevin Message-ID: <200807171826.m6HIPcsj025164@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for sitecopy Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sitecopy (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sitecopy (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sitecopy (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on sitecopy (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sitecopy From fedora-extras-commits at redhat.com Thu Jul 17 18:26:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:26:38 GMT Subject: rpms/dnrd Makefile,NONE,1.1 Message-ID: <200807171826.m6HIQcon000471@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dnrd In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqWZ392/rpms/dnrd Added Files: Makefile Log Message: Setup of module dnrd --- NEW FILE Makefile --- # Top level Makefile for module dnrd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 17 18:26:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:26:35 +0000 Subject: [pkgdb] sitecopy (Fedora, devel) updated by kevin Message-ID: <200807171826.m6HIQbQZ025371@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on sitecopy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sitecopy From fedora-extras-commits at redhat.com Thu Jul 17 18:26:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:26:42 GMT Subject: rpms/dnrd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807171826.m6HIQgkF000486@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dnrd/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqWZ392/rpms/dnrd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dnrd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: dnrd # $Id: Makefile,v 1.1 2008/07/17 18:26:38 kevin Exp $ NAME := dnrd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 17 18:28:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:28:15 GMT Subject: rpms/sitecopy - New directory Message-ID: <200807171828.m6HISFAi000642@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sitecopy In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgOh605/rpms/sitecopy Log Message: Directory /cvs/extras/rpms/sitecopy added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:28:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:28:27 +0000 Subject: [pkgdb] libtrash was added for zprikryl Message-ID: <200807171828.m6HISRAu025514@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libtrash with summary Libraries to move files to a trash-folder on delete Kevin Fenzi (kevin) has approved Package libtrash Kevin Fenzi (kevin) has added a Fedora devel branch for libtrash with an owner of zprikryl Kevin Fenzi (kevin) has approved libtrash in Fedora devel Kevin Fenzi (kevin) has approved Package libtrash Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libtrash (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libtrash (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libtrash (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on libtrash (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on libtrash (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on libtrash (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libtrash From fedora-extras-commits at redhat.com Thu Jul 17 18:28:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:28:30 +0000 Subject: [pkgdb] libtrash (Fedora, devel) updated by kevin Message-ID: <200807171828.m6HISURF025533@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libtrash (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libtrash From fedora-extras-commits at redhat.com Thu Jul 17 18:28:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:28:30 +0000 Subject: [pkgdb] libtrash (Fedora, 9) updated by kevin Message-ID: <200807171828.m6HISURI025533@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for libtrash Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libtrash (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libtrash (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libtrash (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on libtrash (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libtrash From fedora-extras-commits at redhat.com Thu Jul 17 18:28:30 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:28:30 GMT Subject: rpms/sitecopy/devel - New directory Message-ID: <200807171828.m6HISUa6000661@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sitecopy/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgOh605/rpms/sitecopy/devel Log Message: Directory /cvs/extras/rpms/sitecopy/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:28:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:28:45 GMT Subject: rpms/sitecopy Makefile,NONE,1.1 Message-ID: <200807171828.m6HISjUv000694@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sitecopy In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgOh605/rpms/sitecopy Added Files: Makefile Log Message: Setup of module sitecopy --- NEW FILE Makefile --- # Top level Makefile for module sitecopy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 17 18:28:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:28:59 GMT Subject: rpms/sitecopy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807171828.m6HISxMx000733@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sitecopy/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgOh605/rpms/sitecopy/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sitecopy --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sitecopy # $Id: Makefile,v 1.1 2008/07/17 18:28:46 kevin Exp $ NAME := sitecopy SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 17 18:29:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:29:21 GMT Subject: rpms/libtrash - New directory Message-ID: <200807171829.m6HITLDP000900@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libtrash In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQAb859/rpms/libtrash Log Message: Directory /cvs/extras/rpms/libtrash added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:29:24 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Thu, 17 Jul 2008 18:29:24 GMT Subject: comps comps-f10.xml.in,1.52,1.53 Message-ID: <200807171829.m6HITOrP000913@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv690 Modified Files: comps-f10.xml.in Log Message: add tajik support (#455695) Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- comps-f10.xml.in 16 Jul 2008 20:25:56 -0000 1.52 +++ comps-f10.xml.in 17 Jul 2008 18:28:54 -0000 1.53 @@ -4101,6 +4101,18 @@ + tajik-support + <_name>Tajik Support + <_description/> + false + false + tg + + dejavu-fonts + dejavu-fonts-experimental + + + tamil-support <_name>Tamil Support <_description/> @@ -4724,6 +4736,7 @@ swati-support swedish-support tagalog-support + tajik-support tamil-support telugu-support thai-support From fedora-extras-commits at redhat.com Thu Jul 17 18:29:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:29:34 GMT Subject: rpms/libtrash/devel - New directory Message-ID: <200807171829.m6HITYgj000924@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libtrash/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQAb859/rpms/libtrash/devel Log Message: Directory /cvs/extras/rpms/libtrash/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:29:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:29:46 GMT Subject: rpms/libtrash Makefile,NONE,1.1 Message-ID: <200807171829.m6HITkhL000949@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libtrash In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQAb859/rpms/libtrash Added Files: Makefile Log Message: Setup of module libtrash --- NEW FILE Makefile --- # Top level Makefile for module libtrash all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 17 18:30:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:30:03 GMT Subject: rpms/libtrash/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807171830.m6HIU3Cg000971@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libtrash/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQAb859/rpms/libtrash/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libtrash --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libtrash # $Id: Makefile,v 1.1 2008/07/17 18:29:47 kevin Exp $ NAME := libtrash SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 17 18:30:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:30:25 +0000 Subject: [pkgdb] kdeplasma-addons was added for rdieter Message-ID: <200807171830.m6HIUP9P025806@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package kdeplasma-addons with summary Additional plasmoids for KDE Kevin Fenzi (kevin) has approved Package kdeplasma-addons Kevin Fenzi (kevin) has added a Fedora devel branch for kdeplasma-addons with an owner of rdieter Kevin Fenzi (kevin) has approved kdeplasma-addons in Fedora devel Kevin Fenzi (kevin) has approved Package kdeplasma-addons Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdeplasma-addons (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdeplasma-addons (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdeplasma-addons (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on kdeplasma-addons (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on kdeplasma-addons (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Thu Jul 17 18:30:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:30:27 +0000 Subject: [pkgdb] kdeplasma-addons (Fedora, devel) updated by kevin Message-ID: <200807171830.m6HIURnj025826@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Thu Jul 17 18:30:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:30:27 +0000 Subject: [pkgdb] kdeplasma-addons (Fedora, 9) updated by kevin Message-ID: <200807171830.m6HIURnm025826@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for kdeplasma-addons Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdeplasma-addons (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdeplasma-addons (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdeplasma-addons (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on kdeplasma-addons (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Thu Jul 17 18:30:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:30:51 GMT Subject: rpms/kdeplasma-addons - New directory Message-ID: <200807171830.m6HIUpfY001115@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kdeplasma-addons In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyh1083/rpms/kdeplasma-addons Log Message: Directory /cvs/extras/rpms/kdeplasma-addons added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:31:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:31:05 GMT Subject: rpms/kdeplasma-addons/devel - New directory Message-ID: <200807171831.m6HIV576001142@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kdeplasma-addons/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyh1083/rpms/kdeplasma-addons/devel Log Message: Directory /cvs/extras/rpms/kdeplasma-addons/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:31:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:31:18 GMT Subject: rpms/kdeplasma-addons Makefile,NONE,1.1 Message-ID: <200807171831.m6HIVIC2001165@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kdeplasma-addons In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyh1083/rpms/kdeplasma-addons Added Files: Makefile Log Message: Setup of module kdeplasma-addons --- NEW FILE Makefile --- # Top level Makefile for module kdeplasma-addons all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 17 18:31:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:31:33 GMT Subject: rpms/kdeplasma-addons/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807171831.m6HIVXhf001288@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kdeplasma-addons/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyh1083/rpms/kdeplasma-addons/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kdeplasma-addons --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: kdeplasma-addons # $Id: Makefile,v 1.1 2008/07/17 18:31:18 kevin Exp $ NAME := kdeplasma-addons SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 17 18:32:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:32:13 +0000 Subject: [pkgdb] cpqarrayd was added for djuran Message-ID: <200807171832.m6HIWDDD026027@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package cpqarrayd with summary daemon to monitor HP (compaq) arraycontrollers Kevin Fenzi (kevin) has approved Package cpqarrayd Kevin Fenzi (kevin) has added a Fedora devel branch for cpqarrayd with an owner of djuran Kevin Fenzi (kevin) has approved cpqarrayd in Fedora devel Kevin Fenzi (kevin) has approved Package cpqarrayd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpqarrayd (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpqarrayd (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpqarrayd (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on cpqarrayd (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on cpqarrayd (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on cpqarrayd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpqarrayd From fedora-extras-commits at redhat.com Thu Jul 17 18:32:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:32:15 +0000 Subject: [pkgdb] cpqarrayd (Fedora EPEL, 5) updated by kevin Message-ID: <200807171832.m6HIWF6t026048@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for cpqarrayd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpqarrayd (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpqarrayd (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpqarrayd (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on cpqarrayd (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpqarrayd From fedora-extras-commits at redhat.com Thu Jul 17 18:32:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:32:15 +0000 Subject: [pkgdb] cpqarrayd (Fedora, devel) updated by kevin Message-ID: <200807171832.m6HIWF6w026048@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on cpqarrayd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpqarrayd From fedora-extras-commits at redhat.com Thu Jul 17 18:32:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:32:15 +0000 Subject: [pkgdb] cpqarrayd (Fedora, 9) updated by kevin Message-ID: <200807171832.m6HIWFiE026047@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for cpqarrayd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpqarrayd (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpqarrayd (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpqarrayd (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on cpqarrayd (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpqarrayd From fedora-extras-commits at redhat.com Thu Jul 17 18:32:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:32:15 +0000 Subject: [pkgdb] cpqarrayd (Fedora, 8) updated by kevin Message-ID: <200807171832.m6HIWFiB026047@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for cpqarrayd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpqarrayd (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpqarrayd (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpqarrayd (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on cpqarrayd (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpqarrayd From fedora-extras-commits at redhat.com Thu Jul 17 18:32:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:32:15 +0000 Subject: [pkgdb] cpqarrayd (Fedora EPEL, 4) updated by kevin Message-ID: <200807171832.m6HIWFiH026047@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for cpqarrayd Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpqarrayd (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpqarrayd (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpqarrayd (Fedora EPEL 4) Kevin Fenzi (kevin) Approved cvsextras for commit access on cpqarrayd (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpqarrayd From fedora-extras-commits at redhat.com Thu Jul 17 18:32:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:32:51 GMT Subject: rpms/cpqarrayd - New directory Message-ID: <200807171832.m6HIWpY0001621@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpqarrayd In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbJ1543/rpms/cpqarrayd Log Message: Directory /cvs/extras/rpms/cpqarrayd added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:32:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:32:58 GMT Subject: rpms/cpqarrayd/devel - New directory Message-ID: <200807171832.m6HIWwHx001643@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpqarrayd/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbJ1543/rpms/cpqarrayd/devel Log Message: Directory /cvs/extras/rpms/cpqarrayd/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:33:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:33:18 GMT Subject: rpms/cpqarrayd Makefile,NONE,1.1 Message-ID: <200807171833.m6HIXIsu001673@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpqarrayd In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbJ1543/rpms/cpqarrayd Added Files: Makefile Log Message: Setup of module cpqarrayd --- NEW FILE Makefile --- # Top level Makefile for module cpqarrayd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 17 18:33:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:33:36 +0000 Subject: [pkgdb] ocaml-bitstring was added for rjones Message-ID: <200807171833.m6HIXaTV026277@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-bitstring with summary OCaml library for matching and constructing bitstrings Kevin Fenzi (kevin) has approved Package ocaml-bitstring Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-bitstring with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-bitstring in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-bitstring Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-bitstring (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-bitstring (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-bitstring (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on ocaml-bitstring (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on ocaml-bitstring (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on ocaml-bitstring (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring From fedora-extras-commits at redhat.com Thu Jul 17 18:33:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:33:45 GMT Subject: rpms/cpqarrayd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807171833.m6HIXjNL001769@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpqarrayd/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbJ1543/rpms/cpqarrayd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cpqarrayd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: cpqarrayd # $Id: Makefile,v 1.1 2008/07/17 18:33:19 kevin Exp $ NAME := cpqarrayd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 17 18:33:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:33:50 +0000 Subject: [pkgdb] ocaml-bitstring (Fedora, 8) updated by kevin Message-ID: <200807171833.m6HIXphJ026324@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-bitstring Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-bitstring (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-bitstring (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-bitstring (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-bitstring (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring From fedora-extras-commits at redhat.com Thu Jul 17 18:33:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:33:50 +0000 Subject: [pkgdb] ocaml-bitstring (Fedora, devel) updated by kevin Message-ID: <200807171833.m6HIXphM026324@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-bitstring (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring From fedora-extras-commits at redhat.com Thu Jul 17 18:33:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 17 Jul 2008 18:33:51 +0000 Subject: [pkgdb] ocaml-bitstring (Fedora, 9) updated by kevin Message-ID: <200807171833.m6HIXphP026324@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for ocaml-bitstring Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-bitstring (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-bitstring (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-bitstring (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-bitstring (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring From fedora-extras-commits at redhat.com Thu Jul 17 18:34:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:34:28 GMT Subject: rpms/ocaml-bitstring - New directory Message-ID: <200807171834.m6HIYSSh002085@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-bitstring In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV2033/rpms/ocaml-bitstring Log Message: Directory /cvs/extras/rpms/ocaml-bitstring added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:34:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:34:48 GMT Subject: rpms/ocaml-bitstring/devel - New directory Message-ID: <200807171834.m6HIYm8M002120@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-bitstring/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV2033/rpms/ocaml-bitstring/devel Log Message: Directory /cvs/extras/rpms/ocaml-bitstring/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 17 18:34:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:34:54 GMT Subject: rpms/ocaml-bitstring Makefile,NONE,1.1 Message-ID: <200807171834.m6HIYs9O002152@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-bitstring In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV2033/rpms/ocaml-bitstring Added Files: Makefile Log Message: Setup of module ocaml-bitstring --- NEW FILE Makefile --- # Top level Makefile for module ocaml-bitstring all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 17 18:35:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 17 Jul 2008 18:35:09 GMT Subject: rpms/ocaml-bitstring/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807171835.m6HIZ9pI002205@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-bitstring/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV2033/rpms/ocaml-bitstring/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-bitstring --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-bitstring # $Id: Makefile,v 1.1 2008/07/17 18:34:54 kevin Exp $ NAME := ocaml-bitstring SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 17 18:36:22 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 17 Jul 2008 18:36:22 GMT Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.34, 1.35 libsemanage.spec, 1.156, 1.157 Message-ID: <200807171836.m6HIaMnR002466@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsemanage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2373 Modified Files: libsemanage-rhat.patch libsemanage.spec Log Message: * Thu Jun 17 2008 Dan Walsh - 2.0.25-3 - Another fix for genhomedircon libsemanage-rhat.patch: Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- libsemanage-rhat.patch 29 Jan 2008 13:36:49 -0000 1.34 +++ libsemanage-rhat.patch 17 Jul 2008 18:35:34 -0000 1.35 @@ -1,7 +1,19 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.15/src/genhomedircon.c ---- nsalibsemanage/src/genhomedircon.c 2008-01-28 16:52:22.000000000 -0500 -+++ libsemanage-2.0.15/src/genhomedircon.c 2008-01-25 10:28:39.000000000 -0500 -@@ -406,7 +406,6 @@ +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.25/src/genhomedircon.c +--- nsalibsemanage/src/genhomedircon.c 2008-06-12 23:25:16.000000000 -0400 ++++ libsemanage-2.0.25/src/genhomedircon.c 2008-07-17 14:32:45.000000000 -0400 +@@ -192,6 +193,11 @@ + goto done; + } + ++ if (ustr_cmp_suffix_cstr_eq(expr, "/")) { ++ if (!ustr_del(&expr, 1)) ++ goto done; ++ } ++ + /* Append pattern to eat up trailing slashes */ + if (!ustr_add_cstr(&expr, "/*$")) + goto done; +@@ -482,7 +488,6 @@ const char *role_prefix) { replacement_pair_t repl[] = { @@ -9,7 +21,7 @@ {.search_for = TEMPLATE_HOME_DIR,.replace_with = home}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, {NULL, NULL} -@@ -466,7 +465,6 @@ +@@ -542,7 +547,6 @@ replacement_pair_t repl[] = { {.search_for = TEMPLATE_USER,.replace_with = user}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, @@ -17,9 +29,9 @@ {NULL, NULL} }; Ustr *line = USTR_NULL; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.15/src/semanage.conf ---- nsalibsemanage/src/semanage.conf 2007-07-16 14:20:38.000000000 -0400 -+++ libsemanage-2.0.15/src/semanage.conf 2008-01-25 10:28:39.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.25/src/semanage.conf +--- nsalibsemanage/src/semanage.conf 2008-06-12 23:25:16.000000000 -0400 ++++ libsemanage-2.0.25/src/semanage.conf 2008-07-17 13:58:44.000000000 -0400 @@ -35,4 +35,4 @@ # given in . Change this setting if a different # version is necessary. Index: libsemanage.spec =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- libsemanage.spec 28 May 2008 21:43:40 -0000 1.156 +++ libsemanage.spec 17 Jul 2008 18:35:34 -0000 1.157 @@ -3,7 +3,7 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 2.0.25 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz @@ -78,6 +78,9 @@ %{_mandir}/man3/* %changelog +* Thu Jun 17 2008 Dan Walsh - 2.0.25-3 +- Another fix for genhomedircon + * Wed May 28 2008 Tom "spot" Callaway - 2.0.25-2 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 17 18:46:08 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Thu, 17 Jul 2008 18:46:08 GMT Subject: rpms/libdvdread/devel Makefile, 1.2, 1.3 libdvdread.spec, 1.4, 1.5 sources, 1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE Message-ID: <200807171846.m6HIk8J0003022@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libdvdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2991 Modified Files: .cvsignore Added Files: Makefile libdvdread.spec sources Removed Files: dead.package Log Message: - resurrect from new upstream, after splitting from libdvdnav Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 17 Jul 2008 18:45:17 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: libdvdread +# $Id$ +NAME := libdvdread +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: libdvdread.spec =================================================================== RCS file: libdvdread.spec diff -N libdvdread.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libdvdread.spec 17 Jul 2008 18:45:17 -0000 1.5 @@ -0,0 +1,164 @@ +Name: libdvdread +Version: 4.1.3 +Release: 0.2%{?dist} +Summary: A library for reading DVD video discs based on Ogle code + +Group: System Environment/Libraries +License: GPLv2+ +#Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.gz +# svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread +Source: %{name}-20080716.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +libdvdread provides a simple foundation for reading DVD video disks. +It provides the functionality that is required to access many DVDs. + +%package devel +Summary: Development files for libdvdread +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +libdvdread provides a simple foundation for reading DVD video disks. +It provides the functionality that is required to access many DVDs. + +This package contains development files for libdvdread. + +%prep +%setup -q + +%build +./configure2 \ + --disable-opts \ + --disable-static \ + --disable-strip \ + --extra-cflags="%{optflags}" \ + --libdir=%{_libdir} \ + --prefix=%{_prefix} \ + --shlibdir=%{_libdir} \ + +%{__make} %{?_smp_mflags} + +%install +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_libdir}/libdvdread.so.* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dvdread-config +%{_includedir}/libdvdread +%{_libdir}/libdvdread.so +%{_libdir}/pkgconfig/dvdread.pc + +%changelog +* Thu Jul 17 2008 Dominik Mierzejewski 4.1.3-0.2 +- resurrect package from new upstream + +* Sun Jan 27 2008 Dominik Mierzejewski 0.9.7-4 +- fix missing include (bug 428910) + +* Wed Aug 29 2007 Dominik Mierzejewski 0.9.7-3 +- rebuild for BuildID +- update license tag + +* Wed Nov 26 2006 Dominik Mierzejewski 0.9.7-2 +- Rebuild. + +* Fri Oct 6 2006 Dams - 0.9.7-1 +- Updated to 0.9.7 + +* Wed Sep 20 2006 Ville Skytt?? - 0.9.6-2 +- Rebuild. + +* Sun Jul 23 2006 Ville Skytt?? - 0.9.6-1 +- 0.9.6. +- Specfile cleanup. + +* Thu Mar 16 2006 Ville Skytt?? - 0.9.4-4 +- Fix linking with libdl on x86_64. +- Don't ship static libs. +- Build with dependency tracking disabled. +- Convert specfile and docs to UTF-8. +- Improve package descriptions. + +* Thu Mar 16 2006 Dams - 0.9.4-3 +- We BuildConflicting libdvdcss-devel at build time + +* Mon Mar 13 2006 Thorsten Leemhuis 0.9.4-2 +- Drop Epoch completely + +* Thu Mar 09 2006 Andreas Bierfert +- switch to new release field +- drop Epoch + +* Tue Feb 28 2006 Andreas Bierfert +- add dist + +* Thu Apr 3 2003 Marius Johndal 0:0.9.4-0.fdr.1 +- Initial Fedora RPM release. + +* Mon Mar 31 2003 Matthias Saou +- Rebuilt for Red Hat Linux 9. +- Exclude .la file. + +* Sun Feb 16 2003 Matthias Saou +- Update to 0.9.4. + +* Thu Sep 26 2002 Matthias Saou +- Updated to the latest cvs release. +- Rebuilt for Red Hat Linux 8.0. +- Updated URLs. + +* Mon May 27 2002 Matthias Saou +- Update to 0.9.3. + +* Wed May 15 2002 Matthias Saou +- Fixed the libdvdcss.so.0/1/2 problem again. + +* Thu May 2 2002 Matthias Saou +- Back to using libdvdcss 1.1.1, now it's all merged and fine. +- Rebuilt against Red Hat Linux 7.3. +- Added the %{?_smp_mflags} expansion. + +* Sat Jan 12 2002 Matthias Saou +- Reverted back to using libdvdcss 0.0.3.ogle3 since it works MUCH better + than 1.0.x. Doh! + +* Tue Nov 13 2001 Matthias Saou +- Rebuilt against libdvdcss 1.0.0 (added a patch). + +* Mon Oct 29 2001 Matthias Saou +- Spec file cleanup and fixes. + +* Thu Oct 11 2001 Martin Norb??ck +- Updated to version 0.9.2 + +* Tue Sep 25 2001 Martin Norb??ck +- Added small patch to fix the ldopen of libdvdcss + +* Tue Sep 18 2001 Martin Norb??ck +- Updated to version 0.9.1 + +* Fri Sep 14 2001 Martin Norb??ck +- Split into normal and devel package + +* Thu Sep 6 2001 Martin Norb??ck +- Updated to version 0.9.0 + +* Tue Jul 03 2001 Martin Norb??ck +- initial version + + Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 17 Jul 2008 18:45:17 -0000 1.4 @@ -0,0 +1 @@ +dbe121012514a4391dacf6c8b1b1332d libdvdread-20080716.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libdvdread/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Nov 2006 22:22:27 -0000 1.2 +++ .cvsignore 17 Jul 2008 18:45:17 -0000 1.3 @@ -1 +1 @@ -libdvdread-0.9.7.tar.gz +libdvdread-20080716.tar.bz2 --- dead.package DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 18:51:35 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 18:51:35 GMT Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171851.m6HIpZFF003562@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasma-addons/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3479 Modified Files: .cvsignore sources Added Files: kdeplasma-addons.spec Log Message: * Thu Jul 17 2008 Rex Dieter 4.0.98-2 - kdeplasma-addons rename --- NEW FILE kdeplasma-addons.spec --- Name: kdeplasma-addons Version: 4.0.98 Release: 2%{?dist} Summary: Additional plasmoids for KDE Group: User Interface/Desktops License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: boost-devel BuildRequires: gettext BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} BuildRequires: openldap-devel BuildRequires: qimageblitz-devel # most of former kdeaddons for KDE3 is now here Obsoletes: kdeaddons < 4 # extragear-plasma -> kdeplasmoids rename Obsoletes: extragear-plasma < %{version}-%{release} Provides: extragear-plasma = %{version}-%{release} # Oh gawd, another rename Obsoletes: kdeplasmoids < %{version}-%{release} Provides: kdeplasmoids = %{version}-%{release} Requires(post): coreutils /sbin/ldconfig Requires(postun): coreutils /sbin/ldconfig %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } %description Additional plasmoids for KDE. %prep %setup -q -n kdeplasma-addons-%{version} # disable broken bluemarble applet (crashes Plasma when no OpenGL, #435656) #sed -i -e 's/add_subdirectory(bluemarble)/#add_subdirectory(bluemarble)/g' applets/CMakeLists.txt %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} mkdir %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} # unpackaged files # omit -devel type stuff, for now rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so rm -rf %{buildroot}%{_kde4_includedir}/ %post /sbin/ldconfig touch --no-create %{_kde4_iconsdir}/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor || : fi %postun /sbin/ldconfig touch --no-create %{_kde4_iconsdir}/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor || : fi %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING COPYING.LIB %{_kde4_appsdir}/desktoptheme/* %{_kde4_appsdir}/plasma-bluemarble/ %{_kde4_appsdir}/plasma-comic/ %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_libdir}/kde4/* %{_kde4_libdir}/libplasmacomicprovidercore.so.* %{_kde4_libdir}/libplasmaappletdialog.so.* %{_kde4_iconsdir}/hicolor/*/*/* %changelog * Thu Jul 17 2008 Rex Dieter 4.0.98-2 - kdeplasma-addons rename * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 * Thu Jul 10 2008 Rex Dieter 4.0.85-2 - Provides: kdeplasma-addons * Sun Jul 06 2008 Rex Dieter 4.0.85-1 - 4.0.85 * Fri Jun 27 2008 Rex Dieter 4.0.84-1 - 4.0.84 * Fri Jun 20 2008 Rex Dieter 4.0.83-2 - add ldconfig to scriptlets * Thu Jun 19 2008 Than Ngo 4.0.83-1 - 4.0.83 (beta2) * Sun Jun 15 2008 Rex Dieter 4.0.82-1 - kdeplasmoids-4.0.82 * Tue May 27 2008 Kevin Kofler 4.0.80-2 - add missing BR openldap-devel - update file list, add icon scriptlets * Mon May 26 2008 Than Ngo 4.0.80-1 - 4.1 beta 1 * Wed May 07 2008 Kevin Kofler 4.0.72-0.1.20080506svn804581 - update to revision 804581 from KDE SVN (to match KDE 4.0.72) - add COPYING and COPYING.LIB as %%doc - update file list * Thu Apr 03 2008 Kevin Kofler 4.0.1-5 - rebuild (again) for the fixed %%{_kde4_buildtype} * Mon Mar 31 2008 Kevin Kofler 4.0.1-4 - rebuild for NDEBUG and _kde4_libexecdir * Tue Mar 04 2008 Kevin Kofler 4.0.1-3 - disable broken bluemarble applet (crashes Plasma when no OpenGL, #435656) * Tue Mar 04 2008 Kevin Kofler 4.0.1-2 - rebuild against KDE 4.0.2 (mainly to make sure it still builds) * Thu Jan 31 2008 Rex Dieter 4.0.1-1 - kde-4.0.1 * Tue Jan 08 2008 Sebastian Vahl 4.0.0-1 - kde-4.0.0 * Tue Dec 11 2007 Sebastian Vahl 3.97.0-3 - add versioned obsolete kdeaddons * Tue Dec 11 2007 Sebastian Vahl 3.97.0-2 - package language files properly (by RexDieter) - Obsolete: kdeaddons * Tue Dec 11 2007 Sebastian Vahl 3.97.0-1 - kde 3.97.0 - removed some BRs which are in kdelibs4-devel now - BR: gettext * Sun Dec 02 2007 Sebastian Vahl 3.96.2-2 - update %%summary and %%description - cleanup spec - removed unneeded Requires * Sun Dec 02 2007 Sebastian Vahl 3.96.2-1 - kde-3.96.2 * Tue Nov 27 2007 Sebastian Vahl 3.96.1-1 - kde-3.96.1 * Mon Nov 19 2007 Sebastian Vahl 3.96.0-3 - BR: kde-filesystem >= 4 * Mon Nov 19 2007 Sebastian Vahl 3.96.0-2 - BR: libxkbfile-devel - BR: libXpm-devel - BR: libXv-devel - BR: libXxf86misc-devel - BR: libXScrnSaver-devel - BR: libXtst-devel - BR: kdepimlibs-devel - BR: qimageblitz-devel - explicit require kdelibs, kdepimlibs and kdeworkspace >= version - add require kde4-macro scriplet * Thu Nov 15 2007 Sebastian Vahl 3.96.0-1 - Initial version for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:31:18 -0000 1.1 +++ .cvsignore 17 Jul 2008 18:50:53 -0000 1.2 @@ -0,0 +1 @@ +kdeplasma-addons-4.0.98.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:31:18 -0000 1.1 +++ sources 17 Jul 2008 18:50:53 -0000 1.2 @@ -0,0 +1 @@ +26f22c591af158c4f4d716f0be904089 kdeplasma-addons-4.0.98.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 18:53:02 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 18:53:02 GMT Subject: comps comps-f10.xml.in,1.53,1.54 Message-ID: <200807171853.m6HIr2DA003694@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3651 Modified Files: comps-f10.xml.in Log Message: rename kdeplasmoids -> kdeplasma-addons Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- comps-f10.xml.in 17 Jul 2008 18:28:54 -0000 1.53 +++ comps-f10.xml.in 17 Jul 2008 18:52:32 -0000 1.54 @@ -2740,7 +2740,7 @@ kdemultimedia kdenetwork kdepim - kdeplasmoids + kdeplasma-addons kdeutils kftpgrabber kipi-plugins From fedora-extras-commits at redhat.com Thu Jul 17 18:54:39 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 17 Jul 2008 18:54:39 GMT Subject: rpms/libsemanage/F-9 libsemanage-rhat.patch, 1.34, 1.35 libsemanage.spec, 1.155, 1.156 Message-ID: <200807171854.m6HIsd8n003789@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsemanage/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3752 Modified Files: libsemanage-rhat.patch libsemanage.spec Log Message: * Thu Jun 17 2008 Dan Walsh - 2.0.25-3 - Another fix for genhomedircon libsemanage-rhat.patch: Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libsemanage/F-9/libsemanage-rhat.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- libsemanage-rhat.patch 29 Jan 2008 13:36:49 -0000 1.34 +++ libsemanage-rhat.patch 17 Jul 2008 18:53:54 -0000 1.35 @@ -1,7 +1,19 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.15/src/genhomedircon.c ---- nsalibsemanage/src/genhomedircon.c 2008-01-28 16:52:22.000000000 -0500 -+++ libsemanage-2.0.15/src/genhomedircon.c 2008-01-25 10:28:39.000000000 -0500 -@@ -406,7 +406,6 @@ +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.25/src/genhomedircon.c +--- nsalibsemanage/src/genhomedircon.c 2008-06-12 23:25:16.000000000 -0400 ++++ libsemanage-2.0.25/src/genhomedircon.c 2008-07-17 14:32:45.000000000 -0400 +@@ -192,6 +193,11 @@ + goto done; + } + ++ if (ustr_cmp_suffix_cstr_eq(expr, "/")) { ++ if (!ustr_del(&expr, 1)) ++ goto done; ++ } ++ + /* Append pattern to eat up trailing slashes */ + if (!ustr_add_cstr(&expr, "/*$")) + goto done; +@@ -482,7 +488,6 @@ const char *role_prefix) { replacement_pair_t repl[] = { @@ -9,7 +21,7 @@ {.search_for = TEMPLATE_HOME_DIR,.replace_with = home}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, {NULL, NULL} -@@ -466,7 +465,6 @@ +@@ -542,7 +547,6 @@ replacement_pair_t repl[] = { {.search_for = TEMPLATE_USER,.replace_with = user}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, @@ -17,9 +29,9 @@ {NULL, NULL} }; Ustr *line = USTR_NULL; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.15/src/semanage.conf ---- nsalibsemanage/src/semanage.conf 2007-07-16 14:20:38.000000000 -0400 -+++ libsemanage-2.0.15/src/semanage.conf 2008-01-25 10:28:39.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.25/src/semanage.conf +--- nsalibsemanage/src/semanage.conf 2008-06-12 23:25:16.000000000 -0400 ++++ libsemanage-2.0.25/src/semanage.conf 2008-07-17 13:58:44.000000000 -0400 @@ -35,4 +35,4 @@ # given in . Change this setting if a different # version is necessary. Index: libsemanage.spec =================================================================== RCS file: /cvs/extras/rpms/libsemanage/F-9/libsemanage.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- libsemanage.spec 22 Apr 2008 20:29:42 -0000 1.155 +++ libsemanage.spec 17 Jul 2008 18:53:54 -0000 1.156 @@ -3,8 +3,8 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 2.0.25 -Release: 1%{?dist} -License: GPL +Release: 3%{?dist} +License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz Patch: libsemanage-rhat.patch @@ -78,6 +78,12 @@ %{_mandir}/man3/* %changelog +* Thu Jun 17 2008 Dan Walsh - 2.0.25-3 +- Another fix for genhomedircon + +* Wed May 28 2008 Tom "spot" Callaway - 2.0.25-2 +- fix license tag + * Tue Feb 5 2008 Dan Walsh - 2.0.25-1 - Update to upstream * Do not call genhomedircon if the policy was not rebuilt from Stephen Smalley. From fedora-extras-commits at redhat.com Thu Jul 17 19:00:24 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Thu, 17 Jul 2008 19:00:24 GMT Subject: rpms/libdvdnav/devel .cvsignore, 1.4, 1.5 libdvdnav.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807171900.m6HJ0O3k004159@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libdvdnav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4092 Modified Files: .cvsignore libdvdnav.spec sources Log Message: * Thu Jul 17 2008 Dominik Mierzejewski 4.1.3-0.2 - update to current SVN - use new external libdvdread Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Jun 2008 21:01:06 -0000 1.4 +++ .cvsignore 17 Jul 2008 18:59:38 -0000 1.5 @@ -1 +1 @@ -libdvdnav-svn.tar.bz2 +libdvdnav-20080713.tar.bz2 Index: libdvdnav.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/devel/libdvdnav.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libdvdnav.spec 6 Jun 2008 21:01:06 -0000 1.9 +++ libdvdnav.spec 17 Jul 2008 18:59:38 -0000 1.10 @@ -1,16 +1,17 @@ Name: libdvdnav Version: 4.1.3 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: A library for reading DVD video discs based on Ogle code Group: System Environment/Libraries License: GPLv2+ #Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav -Source: libdvdnav-svn.tar.bz2 +Source: %{name}-20080713.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen +BuildRequires: libdvdread-devel >= 4.1.3-0.2 %description libdvdnav provides a simple library for reading DVD video discs. @@ -20,31 +21,13 @@ Summary: Development files for libdvdnav Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libdvdread-devel = %{version}-%{release} +Requires: libdvdread-devel >= 4.1.3-0.2 +Requires: pkgconfig %description devel libdvdnav-devel contains the files necessary to build packages that use the libdvdnav library. -%package -n libdvdread -Summary: Simple foundation for reading DVD video disks -Group: System Environment/Libraries - -%description -n libdvdread -libdvdread provides a simple foundation for reading DVD video disks. -It provides the functionality that is required to access many DVDs. - -%package -n libdvdread-devel -Summary: Development files for libdvdread -Group: Development/Libraries -Requires: libdvdread = %{version}-%{release} - -%description -n libdvdread-devel -libdvdread provides a simple foundation for reading DVD video disks. -It provides the functionality that is required to access many DVDs. - -This package contains development files for libdvdread. - %prep %setup -q @@ -57,6 +40,7 @@ --libdir=%{_libdir} \ --prefix=%{_prefix} \ --shlibdir=%{_libdir} \ + --with-dvdread-config="pkg-config dvdread" \ %{__make} %{?_smp_mflags} pushd doc @@ -76,10 +60,6 @@ %postun -p /sbin/ldconfig -%post -n libdvdread -p /sbin/ldconfig - -%postun -n libdvdread -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO @@ -94,18 +74,13 @@ %{_libdir}/libdvdnavmini.so %{_includedir}/dvdnav %{_datadir}/aclocal/dvdnav.m4 - -%files -n libdvdread -%defattr(-,root,root,-) -%{_libdir}/libdvdread.so.* - -%files -n libdvdread-devel -%defattr(-,root,root,-) -%{_bindir}/dvdread-config -%{_includedir}/libdvdread -%{_libdir}/libdvdread.so +%{_libdir}/pkgconfig/dvdnav.pc %changelog +* Thu Jul 17 2008 Dominik Mierzejewski 4.1.3-0.2 +- update to current SVN +- use new external libdvdread + * Fri Jun 06 2008 Dominik Mierzejewski 4.1.3-0.1 - update to current SVN (pre-4.1.3) - macroize Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Jun 2008 21:01:06 -0000 1.4 +++ sources 17 Jul 2008 18:59:38 -0000 1.5 @@ -1 +1 @@ -04f89199e87809927b3ab186a11f4e09 libdvdnav-svn.tar.bz2 +933efc321e7c247f66baac85e0f9cd9b libdvdnav-20080713.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 19:02:18 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:02:18 GMT Subject: rpms/ocaml-bitstring/F-8 ocaml-bitstring.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171902.m6HJ2IEF010968@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitstring/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10847/F-8 Modified Files: .cvsignore sources Added Files: ocaml-bitstring.spec Log Message: ocaml-bitmatch renamed to ocaml-bitstring --- NEW FILE ocaml-bitstring.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} # Don't have CIL on ppc & ppc64 so we cannot build the C tools. # See: bz#435546 bz#435545 %ifarch ppc ppc64 %define build_cil_tools 0 %else %define build_cil_tools 1 %endif Name: ocaml-bitstring Version: 1.9.7 Release: 1%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries License: LGPLv2+ with exceptions and GPLv2+ URL: http://code.google.com/p/bitstring/ Source0: http://bitstring.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel %if %build_cil_tools BuildRequires: ocaml-cil-devel BuildRequires: ocaml-extlib-devel %endif %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_bitstring # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch <= 1.9.5 Provides: ocaml-bitmatch = %{version}-%{release} %description Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml. You can use this module to both parse and generate binary formats, for example, communications protocols, disk formats and binary files. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch-devel <= 1.9.5 Provides: ocaml-bitmatch-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %if %build_cil_tools %package c Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch-c <= 1.9.5 Provides: ocaml-bitmatch-c = %{version}-%{release} %description c The %{name}-c package contains tools for importing structs from C code and header files into %{name}. %endif %prep %setup -q # Keep a pristine copy of the examples directory for distribution. cp -a examples bitstring-examples %build %configure make make doc make examples %if %build_cil_tools %if %opt strip cil-tools/bitstring-import-c.opt %endif %endif %check make test %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install mkdir -p $RPM_BUILD_ROOT%{_bindir} %if %build_cil_tools # Install bitstring-import-c by hand for now. %if %opt install -m 0755 cil-tools/bitstring-import-c.opt $RPM_BUILD_ROOT%{_bindir}/bitstring-import-c %else install -m 0755 cil-tools/bitstring-import-c $RPM_BUILD_ROOT%{_bindir}/bitstring-import-c %endif # Install bitstring-import-prefix.h by hand for now. install -m 0644 cil-tools/bitstring-import-prefix.h $OCAMLFIND_DESTDIR/bitstring/ %endif # Install bitstring-objinfo by hand for now. install -m 0755 bitstring-objinfo $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.LIB %{_libdir}/ocaml/bitstring %if %opt %exclude %{_libdir}/ocaml/bitstring/*.a %exclude %{_libdir}/ocaml/bitstring/*.cmxa %exclude %{_libdir}/ocaml/bitstring/*.cmx %endif %exclude %{_libdir}/ocaml/bitstring/*.mli %if %build_cil_tools %exclude %{_libdir}/ocaml/bitstring/*.h %endif %files devel %defattr(-,root,root,-) %doc COPYING.LIB README TODO html bitstring-examples %if %opt %{_libdir}/ocaml/bitstring/*.a %{_libdir}/ocaml/bitstring/*.cmxa %{_libdir}/ocaml/bitstring/*.cmx %endif %{_libdir}/ocaml/bitstring/*.mli %{_bindir}/bitstring-objinfo %if %build_cil_tools %files c %defattr(-,root,root,-) %doc COPYING.LIB cil-tools/ext3.c cil-tools/ext3.ml cil-tools/task_struct.c cil-tools/task_struct.ml %{_bindir}/bitstring-import-c %{_libdir}/ocaml/bitstring/*.h %endif %changelog * Thu Jul 17 2008 Richard W.M. Jones - 1.9.7-1 - New upstream release 1.9.7. - Project renamed from ocaml-bitmatch to ocaml-bitstring. * Fri Jul 11 2008 Richard W.M. Jones - 1.9.5-1 - New upstream release 1.9.5. - Clarify that the programs have GPL license. - Ship bitmatch-objinfo program. * Fri Jul 4 2008 Richard W.M. Jones - 1.9.4-1 - New upstream release 1.9.4. * Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-2 - New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 - +BR ocaml-extlib-devel. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-2 - Force rebuild, forgot sources first time. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-1 - New upstream release 1.9.2. - Include C tools (requiring CIL) in a separate subpackage. * Wed May 21 2008 Richard W.M. Jones - 1.3-1 - New upstream release 1.3. * Sun May 18 2008 Richard W.M. Jones - 1.2-1 - New upstream release 1.2. - Build and distribute the examples. - Distribute the TODO file. * Sun May 18 2008 Richard W.M. Jones - 1.0-3 - New upstream release 1.0. - New upstream URL and download location. - Use RPM percent-configure in build section. * Mon May 12 2008 Richard W.M. Jones - 0.9-1 - New upstream release 0.9. * Thu May 8 2008 Richard W.M. Jones - 0.8-1 - New upstream release 0.8. * Wed May 7 2008 Richard W.M. Jones - 0.7-3 - New upstream release 0.7. * Fri Apr 25 2008 Richard W.M. Jones - 0.6-1 - New upstream release 0.6. * Fri Apr 25 2008 Richard W.M. Jones - 0.5-1 - New upstream release 0.5. * Fri Apr 16 2008 Richard W.M. Jones - 0.4-1 - New upstream release 0.4. * Fri Apr 2 2008 Richard W.M. Jones - 0.2-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitstring/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:34:54 -0000 1.1 +++ .cvsignore 17 Jul 2008 19:01:44 -0000 1.2 @@ -0,0 +1 @@ +ocaml-bitstring-1.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitstring/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:34:54 -0000 1.1 +++ sources 17 Jul 2008 19:01:44 -0000 1.2 @@ -0,0 +1 @@ +7912cb274d05e5452decb92e50f720fa ocaml-bitstring-1.9.7.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 19:02:32 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:02:32 GMT Subject: rpms/ocaml-bitstring/F-9 ocaml-bitstring.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171902.m6HJ2WGc011009@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitstring/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10847/F-9 Modified Files: .cvsignore sources Added Files: ocaml-bitstring.spec Log Message: ocaml-bitmatch renamed to ocaml-bitstring --- NEW FILE ocaml-bitstring.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} # Don't have CIL on ppc & ppc64 so we cannot build the C tools. # See: bz#435546 bz#435545 %ifarch ppc ppc64 %define build_cil_tools 0 %else %define build_cil_tools 1 %endif Name: ocaml-bitstring Version: 1.9.7 Release: 1%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries License: LGPLv2+ with exceptions and GPLv2+ URL: http://code.google.com/p/bitstring/ Source0: http://bitstring.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel %if %build_cil_tools BuildRequires: ocaml-cil-devel BuildRequires: ocaml-extlib-devel %endif %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_bitstring # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch <= 1.9.5 Provides: ocaml-bitmatch = %{version}-%{release} %description Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml. You can use this module to both parse and generate binary formats, for example, communications protocols, disk formats and binary files. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch-devel <= 1.9.5 Provides: ocaml-bitmatch-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %if %build_cil_tools %package c Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch-c <= 1.9.5 Provides: ocaml-bitmatch-c = %{version}-%{release} %description c The %{name}-c package contains tools for importing structs from C code and header files into %{name}. %endif %prep %setup -q # Keep a pristine copy of the examples directory for distribution. cp -a examples bitstring-examples %build %configure make make doc make examples %if %build_cil_tools %if %opt strip cil-tools/bitstring-import-c.opt %endif %endif %check make test %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install mkdir -p $RPM_BUILD_ROOT%{_bindir} %if %build_cil_tools # Install bitstring-import-c by hand for now. %if %opt install -m 0755 cil-tools/bitstring-import-c.opt $RPM_BUILD_ROOT%{_bindir}/bitstring-import-c %else install -m 0755 cil-tools/bitstring-import-c $RPM_BUILD_ROOT%{_bindir}/bitstring-import-c %endif # Install bitstring-import-prefix.h by hand for now. install -m 0644 cil-tools/bitstring-import-prefix.h $OCAMLFIND_DESTDIR/bitstring/ %endif # Install bitstring-objinfo by hand for now. install -m 0755 bitstring-objinfo $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.LIB %{_libdir}/ocaml/bitstring %if %opt %exclude %{_libdir}/ocaml/bitstring/*.a %exclude %{_libdir}/ocaml/bitstring/*.cmxa %exclude %{_libdir}/ocaml/bitstring/*.cmx %endif %exclude %{_libdir}/ocaml/bitstring/*.mli %if %build_cil_tools %exclude %{_libdir}/ocaml/bitstring/*.h %endif %files devel %defattr(-,root,root,-) %doc COPYING.LIB README TODO html bitstring-examples %if %opt %{_libdir}/ocaml/bitstring/*.a %{_libdir}/ocaml/bitstring/*.cmxa %{_libdir}/ocaml/bitstring/*.cmx %endif %{_libdir}/ocaml/bitstring/*.mli %{_bindir}/bitstring-objinfo %if %build_cil_tools %files c %defattr(-,root,root,-) %doc COPYING.LIB cil-tools/ext3.c cil-tools/ext3.ml cil-tools/task_struct.c cil-tools/task_struct.ml %{_bindir}/bitstring-import-c %{_libdir}/ocaml/bitstring/*.h %endif %changelog * Thu Jul 17 2008 Richard W.M. Jones - 1.9.7-1 - New upstream release 1.9.7. - Project renamed from ocaml-bitmatch to ocaml-bitstring. * Fri Jul 11 2008 Richard W.M. Jones - 1.9.5-1 - New upstream release 1.9.5. - Clarify that the programs have GPL license. - Ship bitmatch-objinfo program. * Fri Jul 4 2008 Richard W.M. Jones - 1.9.4-1 - New upstream release 1.9.4. * Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-2 - New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 - +BR ocaml-extlib-devel. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-2 - Force rebuild, forgot sources first time. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-1 - New upstream release 1.9.2. - Include C tools (requiring CIL) in a separate subpackage. * Wed May 21 2008 Richard W.M. Jones - 1.3-1 - New upstream release 1.3. * Sun May 18 2008 Richard W.M. Jones - 1.2-1 - New upstream release 1.2. - Build and distribute the examples. - Distribute the TODO file. * Sun May 18 2008 Richard W.M. Jones - 1.0-3 - New upstream release 1.0. - New upstream URL and download location. - Use RPM percent-configure in build section. * Mon May 12 2008 Richard W.M. Jones - 0.9-1 - New upstream release 0.9. * Thu May 8 2008 Richard W.M. Jones - 0.8-1 - New upstream release 0.8. * Wed May 7 2008 Richard W.M. Jones - 0.7-3 - New upstream release 0.7. * Fri Apr 25 2008 Richard W.M. Jones - 0.6-1 - New upstream release 0.6. * Fri Apr 25 2008 Richard W.M. Jones - 0.5-1 - New upstream release 0.5. * Fri Apr 16 2008 Richard W.M. Jones - 0.4-1 - New upstream release 0.4. * Fri Apr 2 2008 Richard W.M. Jones - 0.2-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitstring/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:34:54 -0000 1.1 +++ .cvsignore 17 Jul 2008 19:01:49 -0000 1.2 @@ -0,0 +1 @@ +ocaml-bitstring-1.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitstring/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:34:54 -0000 1.1 +++ sources 17 Jul 2008 19:01:49 -0000 1.2 @@ -0,0 +1 @@ +7912cb274d05e5452decb92e50f720fa ocaml-bitstring-1.9.7.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 19:02:47 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:02:47 GMT Subject: rpms/ocaml-bitstring/devel ocaml-bitstring.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171902.m6HJ2l2R011022@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitstring/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10847/devel Modified Files: .cvsignore sources Added Files: ocaml-bitstring.spec Log Message: ocaml-bitmatch renamed to ocaml-bitstring --- NEW FILE ocaml-bitstring.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} # Don't have CIL on ppc & ppc64 so we cannot build the C tools. # See: bz#435546 bz#435545 %ifarch ppc ppc64 %define build_cil_tools 0 %else %define build_cil_tools 1 %endif Name: ocaml-bitstring Version: 1.9.7 Release: 1%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries License: LGPLv2+ with exceptions and GPLv2+ URL: http://code.google.com/p/bitstring/ Source0: http://bitstring.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel %if %build_cil_tools BuildRequires: ocaml-cil-devel BuildRequires: ocaml-extlib-devel %endif %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_bitstring # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch <= 1.9.5 Provides: ocaml-bitmatch = %{version}-%{release} %description Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml. You can use this module to both parse and generate binary formats, for example, communications protocols, disk formats and binary files. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch-devel <= 1.9.5 Provides: ocaml-bitmatch-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %if %build_cil_tools %package c Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} # Upstream project used to be called ocaml-bitmatch. # Keep these until Fedora 12. Obsoletes: ocaml-bitmatch-c <= 1.9.5 Provides: ocaml-bitmatch-c = %{version}-%{release} %description c The %{name}-c package contains tools for importing structs from C code and header files into %{name}. %endif %prep %setup -q # Keep a pristine copy of the examples directory for distribution. cp -a examples bitstring-examples %build %configure make make doc make examples %if %build_cil_tools %if %opt strip cil-tools/bitstring-import-c.opt %endif %endif %check make test %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install mkdir -p $RPM_BUILD_ROOT%{_bindir} %if %build_cil_tools # Install bitstring-import-c by hand for now. %if %opt install -m 0755 cil-tools/bitstring-import-c.opt $RPM_BUILD_ROOT%{_bindir}/bitstring-import-c %else install -m 0755 cil-tools/bitstring-import-c $RPM_BUILD_ROOT%{_bindir}/bitstring-import-c %endif # Install bitstring-import-prefix.h by hand for now. install -m 0644 cil-tools/bitstring-import-prefix.h $OCAMLFIND_DESTDIR/bitstring/ %endif # Install bitstring-objinfo by hand for now. install -m 0755 bitstring-objinfo $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.LIB %{_libdir}/ocaml/bitstring %if %opt %exclude %{_libdir}/ocaml/bitstring/*.a %exclude %{_libdir}/ocaml/bitstring/*.cmxa %exclude %{_libdir}/ocaml/bitstring/*.cmx %endif %exclude %{_libdir}/ocaml/bitstring/*.mli %if %build_cil_tools %exclude %{_libdir}/ocaml/bitstring/*.h %endif %files devel %defattr(-,root,root,-) %doc COPYING.LIB README TODO html bitstring-examples %if %opt %{_libdir}/ocaml/bitstring/*.a %{_libdir}/ocaml/bitstring/*.cmxa %{_libdir}/ocaml/bitstring/*.cmx %endif %{_libdir}/ocaml/bitstring/*.mli %{_bindir}/bitstring-objinfo %if %build_cil_tools %files c %defattr(-,root,root,-) %doc COPYING.LIB cil-tools/ext3.c cil-tools/ext3.ml cil-tools/task_struct.c cil-tools/task_struct.ml %{_bindir}/bitstring-import-c %{_libdir}/ocaml/bitstring/*.h %endif %changelog * Thu Jul 17 2008 Richard W.M. Jones - 1.9.7-1 - New upstream release 1.9.7. - Project renamed from ocaml-bitmatch to ocaml-bitstring. * Fri Jul 11 2008 Richard W.M. Jones - 1.9.5-1 - New upstream release 1.9.5. - Clarify that the programs have GPL license. - Ship bitmatch-objinfo program. * Fri Jul 4 2008 Richard W.M. Jones - 1.9.4-1 - New upstream release 1.9.4. * Fri Jul 4 2008 Richard W.M. Jones - 1.9.3-2 - New upstream release 1.9.3. - Don't build CIL tools unless we have CIL. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-3 - +BR ocaml-extlib-devel. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-2 - Force rebuild, forgot sources first time. * Tue Jul 1 2008 Richard W.M. Jones - 1.9.2-1 - New upstream release 1.9.2. - Include C tools (requiring CIL) in a separate subpackage. * Wed May 21 2008 Richard W.M. Jones - 1.3-1 - New upstream release 1.3. * Sun May 18 2008 Richard W.M. Jones - 1.2-1 - New upstream release 1.2. - Build and distribute the examples. - Distribute the TODO file. * Sun May 18 2008 Richard W.M. Jones - 1.0-3 - New upstream release 1.0. - New upstream URL and download location. - Use RPM percent-configure in build section. * Mon May 12 2008 Richard W.M. Jones - 0.9-1 - New upstream release 0.9. * Thu May 8 2008 Richard W.M. Jones - 0.8-1 - New upstream release 0.8. * Wed May 7 2008 Richard W.M. Jones - 0.7-3 - New upstream release 0.7. * Fri Apr 25 2008 Richard W.M. Jones - 0.6-1 - New upstream release 0.6. * Fri Apr 25 2008 Richard W.M. Jones - 0.5-1 - New upstream release 0.5. * Fri Apr 16 2008 Richard W.M. Jones - 0.4-1 - New upstream release 0.4. * Fri Apr 2 2008 Richard W.M. Jones - 0.2-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:34:54 -0000 1.1 +++ .cvsignore 17 Jul 2008 19:02:02 -0000 1.2 @@ -0,0 +1 @@ +ocaml-bitstring-1.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:34:54 -0000 1.1 +++ sources 17 Jul 2008 19:02:02 -0000 1.2 @@ -0,0 +1 @@ +7912cb274d05e5452decb92e50f720fa ocaml-bitstring-1.9.7.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 19:03:01 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Thu, 17 Jul 2008 19:03:01 GMT Subject: rpms/dbus/devel dbus-1.2.1-increase-timeout.patch, NONE, 1.1 dbus.spec, 1.146, 1.147 Message-ID: <200807171903.m6HJ3124011032@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/dbus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902 Modified Files: dbus.spec Added Files: dbus-1.2.1-increase-timeout.patch Log Message: Increase default method timeout dbus-1.2.1-increase-timeout.patch: --- NEW FILE dbus-1.2.1-increase-timeout.patch --- diff -urN dbus-1.2.1/bus/system.conf.in dbus-1.2.1.b/bus/system.conf.in --- dbus-1.2.1/bus/system.conf.in 2008-04-04 11:24:08.000000000 -0400 +++ dbus-1.2.1.b/bus/system.conf.in 2008-07-17 13:56:26.000000000 -0400 @@ -17,6 +17,9 @@ @DBUS_USER@ + + 21600000 + Index: dbus.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- dbus.spec 30 May 2008 18:37:44 -0000 1.146 +++ dbus.spec 17 Jul 2008 19:02:11 -0000 1.147 @@ -8,7 +8,7 @@ Summary: D-BUS message bus Name: dbus Version: 1.2.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz Source1: doxygen_to_devhelp.xsl @@ -43,6 +43,7 @@ Patch3: dbus-fix-guidless-conn-segfault.patch Patch4: dbus-compile-userdb-cache.patch Patch5: dbus-hold-ref-during-dispatch.patch +Patch6: dbus-1.2.1-increase-timeout.patch %description @@ -102,6 +103,7 @@ %patch3 -p1 -b .fix-guidless-conn-segfault %patch4 -p1 -b .compile-userdb-cache %patch5 -p1 -b .hold-ref-during-dispatch +%patch6 -p1 -b .increase-timeout autoreconf -f -i @@ -230,6 +232,9 @@ %{_includedir}/* %changelog +* Thu Jul 17 2008 Casey Dahlin - 1.2.1-5 +- Patch to increase max method timeout + * Thu May 29 2008 Casey Dahlin - 1.2.1-4 - Patches for fd.o bugs 15635, 15571, 15588, 15570 From fedora-extras-commits at redhat.com Thu Jul 17 19:04:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 19:04:57 GMT Subject: rpms/eclipse-mylyn/devel eclipse-mylyn-addfedoracustomizations.patch, 1.2, 1.3 eclipse-mylyn.spec, 1.19, 1.20 Message-ID: <200807171904.m6HJ4v35011224@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/eclipse-mylyn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11168 Modified Files: eclipse-mylyn-addfedoracustomizations.patch eclipse-mylyn.spec Log Message: fix license tag eclipse-mylyn-addfedoracustomizations.patch: Index: eclipse-mylyn-addfedoracustomizations.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-addfedoracustomizations.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-mylyn-addfedoracustomizations.patch 24 Oct 2007 22:09:37 -0000 1.2 +++ eclipse-mylyn-addfedoracustomizations.patch 17 Jul 2008 19:04:13 -0000 1.3 @@ -7,8 +7,8 @@ diff -u -r1.365 feature.xml --- feature.xml 27 Sep 2007 16:32:09 -0000 1.365 +++ feature.xml 24 Oct 2007 21:46:10 -0000 -@@ -252,4 +252,11 @@ - version="2.1.0.v20070927-0900" +@@ -97,4 +97,11 @@ + version="2.3.2.qualifier" unpack="false"/> + 2.3.2-6 +- fix license tag + * Tue Apr 15 2008 Andrew Overholt 2.3.2-5 - Re-build to attempt to fix rhbz#442251 (broken cpio archive). From fedora-extras-commits at redhat.com Thu Jul 17 19:05:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 19:05:54 GMT Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.9,1.10 Message-ID: <200807171905.m6HJ5sbs011320@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/eclipse-pydev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11274 Modified Files: eclipse-pydev.spec Log Message: fix license tag Index: eclipse-pydev.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- eclipse-pydev.spec 7 Apr 2008 21:10:02 -0000 1.9 +++ eclipse-pydev.spec 17 Jul 2008 19:05:07 -0000 1.10 @@ -12,8 +12,8 @@ Summary: Eclipse Python development plug-in Name: eclipse-pydev Version: 1.3.14 -Release: 1%{?dist} -License: Eclipse Public License +Release: 2%{?dist} +License: EPL URL: http://pydev.sourceforge.net/ Group: Development/Tools @@ -217,6 +217,9 @@ %endif %changelog +* Thu Jul 17 2008 Tom "spot" Callaway 1:1.3.14-2 +- fix license tag + * Mon Apr 07 2008 Jeff Johnston 1:1.3.14-1 - 1.3.14 From fedora-extras-commits at redhat.com Thu Jul 17 19:19:47 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 19:19:47 GMT Subject: rpms/kdeplasmoids/devel dead.package, NONE, 1.1 .cvsignore, 1.5, NONE kdeplasmoids.spec, 1.8, NONE sources, 1.5, NONE Message-ID: <200807171919.m6HJJlC6012448@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasmoids/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407 Added Files: dead.package Removed Files: .cvsignore kdeplasmoids.spec sources Log Message: renamed to kdeplasma-addons in kde-4.1 --- NEW FILE dead.package --- renamed to kdeplasma-addons in kde-4.1 --- .cvsignore DELETED --- --- kdeplasmoids.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:21:25 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 17 Jul 2008 19:21:25 GMT Subject: rpms/perl-BDB/devel perl-BDB.spec,1.1,1.2 Message-ID: <200807171921.m6HJLPFK012765@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-BDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12348 Modified Files: perl-BDB.spec Log Message: 1.7 Thu Jul 17 14:09:25 CEST 2008 - use a totally different mechanism to pass callbacks to requests (see manpage). - optional arguments before the callback can now be left out. - use less memory per request, probably be a bit faster, too. - fix a memory leak (callbacks were never freed). - add a basic testsuite. - add (untested) support for cdsgroup_begin and db_exists. - make BDB::VERSION compatible to UNIVERSAL::VERSION. 1.6 Tue Jul 8 10:34:58 CEST 2008 - add new BDB::VERSION function for easy version checks. - work around broken bsd headers once more. - support for berkeley db 4.7 added. - add support for log_set_config and it's constants, and set_intermediate_dir_mode. - add db_env_dbrename and db_env_dbremove. Index: perl-BDB.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-BDB.spec 31 May 2008 12:43:30 -0000 1.1 +++ perl-BDB.spec 17 Jul 2008 19:20:38 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-BDB -Version: 1.5 +Version: 1.7 Release: 1%{?dist} Summary: Asynchronous Berkeley DB access @@ -52,6 +52,9 @@ %changelog +* Thu Jul 17 2008 kwizart < kwizart at gmail.com > - 1.7-1 +- Update to 1.7 + * Tue May 27 2008 kwizart < kwizart at gmail.com > - 1.5-1 - Update to 1.5 From fedora-extras-commits at redhat.com Thu Jul 17 19:24:21 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 17 Jul 2008 19:24:21 GMT Subject: rpms/perl-BDB/devel sources,1.2,1.3 Message-ID: <200807171924.m6HJOLox013380@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-BDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13209 Modified Files: sources Log Message: Update source also Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-BDB/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 May 2008 12:43:30 -0000 1.2 +++ sources 17 Jul 2008 19:23:46 -0000 1.3 @@ -1 +1 @@ -0b87e6aa97465f74d21c719439c43840 BDB-1.5.tar.gz +514277b2fc26a97c3db81dca9c8fda58 BDB-1.7.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 19:28:36 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:28:36 GMT Subject: rpms/ocaml-bitstring/F-8 import.log, NONE, 1.1 ocaml-bitstring-3.10.0.patch, NONE, 1.1 ocaml-bitstring.spec, 1.1, 1.2 Message-ID: <200807171928.m6HJSaZp014361@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitstring/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182/F-8 Modified Files: ocaml-bitstring.spec Added Files: import.log ocaml-bitstring-3.10.0.patch Log Message: * Thu Jul 17 2008 Richard W.M. Jones - 1.9.7-2 - ExcludeArch ppc64 (only needed for F-8). - Patch to work around a bug in old camlp4 on this branch. --- NEW FILE import.log --- ocaml-bitstring-1_9_7-2_fc8:F-8:ocaml-bitstring-1.9.7-2.fc8.src.rpm:1216322397 ocaml-bitstring-3.10.0.patch: --- NEW FILE ocaml-bitstring-3.10.0.patch --- diff -ur ocaml-bitstring-1.9.7.orig/pa_bitstring.ml ocaml-bitstring-1.9.7/pa_bitstring.ml --- ocaml-bitstring-1.9.7.orig/pa_bitstring.ml 2008-07-17 16:45:58.000000000 +0100 +++ ocaml-bitstring-1.9.7/pa_bitstring.ml 2008-07-17 20:16:20.000000000 +0100 @@ -55,9 +55,9 @@ (match expr_is_constant a, expr_is_constant b with | Some a, Some b -> (* Integer binary operations. *) let ops = ["+", (+); "-", (-); "*", ( * ); "/", (/); - "land", (land); "lor", (lor); "lxor", (lxor); + (*"land", (land); "lor", (lor); "lxor", (lxor); "lsl", (lsl); "lsr", (lsr); "asr", (asr); - "mod", (mod)] in + "mod", (mod) *)] in (try Some ((List.assoc op ops) a b) with Not_found -> None) | _ -> None) | _ -> None Index: ocaml-bitstring.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-bitstring/F-8/ocaml-bitstring.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-bitstring.spec 17 Jul 2008 19:01:44 -0000 1.1 +++ ocaml-bitstring.spec 17 Jul 2008 19:27:51 -0000 1.2 @@ -11,7 +11,7 @@ Name: ocaml-bitstring Version: 1.9.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for matching and constructing bitstrings Group: Development/Libraries @@ -20,6 +20,11 @@ Source0: http://bitstring.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc64 + +# Patch required because of buggy old version of camlp4. +Patch0: ocaml-bitstring-3.10.0.patch + BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -82,6 +87,7 @@ %prep %setup -q +%patch0 -p1 # Keep a pristine copy of the examples directory for distribution. cp -a examples bitstring-examples @@ -170,6 +176,10 @@ %changelog +* Thu Jul 17 2008 Richard W.M. Jones - 1.9.7-2 +- ExcludeArch ppc64 (only needed for F-8). +- Patch to work around a bug in old camlp4 on this branch. + * Thu Jul 17 2008 Richard W.M. Jones - 1.9.7-1 - New upstream release 1.9.7. - Project renamed from ocaml-bitmatch to ocaml-bitstring. From fedora-extras-commits at redhat.com Thu Jul 17 19:35:37 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:35:37 GMT Subject: rpms/ocaml-bitmatch/EL-5 dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE ocaml-bitmatch.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <200807171935.m6HJZbau015599@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15579/EL-5 Added Files: dead.package Removed Files: .cvsignore Makefile ocaml-bitmatch.spec sources Log Message: Dead package --- NEW FILE dead.package --- Package renamed upstream to 'ocaml-bitstring', and new 'ocaml-bitstring' package created in Fedora. --- .cvsignore DELETED --- --- Makefile DELETED --- --- ocaml-bitmatch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:35:54 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:35:54 GMT Subject: rpms/ocaml-bitmatch/F-8 dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.1, NONE ocaml-bitmatch.spec, 1.5, NONE sources, 1.5, NONE Message-ID: <200807171935.m6HJZsIp015639@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15579/F-8 Added Files: dead.package Removed Files: .cvsignore Makefile ocaml-bitmatch.spec sources Log Message: Dead package --- NEW FILE dead.package --- Package renamed upstream to 'ocaml-bitstring', and new 'ocaml-bitstring' package created in Fedora. --- .cvsignore DELETED --- --- Makefile DELETED --- --- ocaml-bitmatch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:36:10 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:36:10 GMT Subject: rpms/ocaml-bitmatch/F-9 dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.1, NONE ocaml-bitmatch.spec, 1.4, NONE sources, 1.5, NONE Message-ID: <200807171936.m6HJaAQH015661@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15579/F-9 Added Files: dead.package Removed Files: .cvsignore Makefile ocaml-bitmatch.spec sources Log Message: Dead package --- NEW FILE dead.package --- Package renamed upstream to 'ocaml-bitstring', and new 'ocaml-bitstring' package created in Fedora. --- .cvsignore DELETED --- --- Makefile DELETED --- --- ocaml-bitmatch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:36:29 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Thu, 17 Jul 2008 19:36:29 GMT Subject: rpms/ocaml-bitmatch/devel dead.package, NONE, 1.1 .cvsignore, 1.11, NONE Makefile, 1.1, NONE import.log, 1.3, NONE ocaml-bitmatch.spec, 1.15, NONE sources, 1.11, NONE Message-ID: <200807171936.m6HJaTP1015713@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15579/devel Added Files: dead.package Removed Files: .cvsignore Makefile import.log ocaml-bitmatch.spec sources Log Message: Dead package --- NEW FILE dead.package --- Package renamed upstream to 'ocaml-bitstring', and new 'ocaml-bitstring' package created in Fedora. --- .cvsignore DELETED --- --- Makefile DELETED --- --- import.log DELETED --- --- ocaml-bitmatch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:38:43 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 17 Jul 2008 19:38:43 GMT Subject: rpms/perl-Event-RPC/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 perl-Event-RPC.spec, 1.1, 1.2 Message-ID: <200807171938.m6HJch6h015902@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Event-RPC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15807 Modified Files: .cvsignore sources perl-Event-RPC.spec Log Message: - Update to 1.00 Features: - load_modules option added to Event::RPC::Server. - timeout option added to Event::RPC::Client. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-RPC/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 May 2008 12:40:48 -0000 1.2 +++ .cvsignore 17 Jul 2008 19:37:57 -0000 1.3 @@ -1 +1 @@ -Event-RPC-0.90.tar.gz +Event-RPC-1.00.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-RPC/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 May 2008 12:40:48 -0000 1.2 +++ sources 17 Jul 2008 19:37:57 -0000 1.3 @@ -1 +1 @@ -ab908f6b359e83fdd2f583a44168aa85 Event-RPC-0.90.tar.gz +c9ec7ef0b67ed564d4e6f1fa2abf2f61 Event-RPC-1.00.tar.gz Index: perl-Event-RPC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-RPC/devel/perl-Event-RPC.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Event-RPC.spec 31 May 2008 12:40:48 -0000 1.1 +++ perl-Event-RPC.spec 17 Jul 2008 19:37:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Event-RPC -Version: 0.90 -Release: 3%{?dist} +Version: 1.00 +Release: 1%{?dist} Summary: Event based transparent Client/Server RPC framework Group: Development/Libraries @@ -70,6 +70,9 @@ %changelog +* Thu Jul 17 2008 kwizart < kwizart at gmail.com > - 1.00-1 +- Update to 1.00 + * Thu May 29 2008 kwizart < kwizart at gmail.com > - 0.90-3 - Fix directory ownership - Remove unwanted provides Test_class From fedora-extras-commits at redhat.com Thu Jul 17 19:41:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 19:41:17 GMT Subject: rpms/ecryptfs-utils/devel ecryptfs-utils.spec,1.23,1.24 Message-ID: <200807171941.m6HJfHOb016093@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ecryptfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16025 Modified Files: ecryptfs-utils.spec Log Message: fix license tag Index: ecryptfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ecryptfs-utils.spec 27 Jun 2008 21:49:58 -0000 1.23 +++ ecryptfs-utils.spec 17 Jul 2008 19:40:38 -0000 1.24 @@ -1,9 +1,9 @@ Name: ecryptfs-utils Version: 50 -Release: 0%{?dist} +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base -License: GPL +License: GPLv2+ URL: http://ecryptfs.sourceforge.net Source0: http://downloads.sourceforge.net/ecryptfs/ecryptfs-utils-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -90,6 +90,9 @@ %{_includedir}/ecryptfs.h %changelog +* Thu Jul 17 2008 Tom "spot" Callaway 50-1 +- fix license tag + * Fri Jun 27 2008 Mike Halcrow 50-0 - Add umount.ecryptfs_private symlink - Add pam_mount session hooks for mount and unmount From fedora-extras-commits at redhat.com Thu Jul 17 19:46:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 17 Jul 2008 19:46:50 GMT Subject: rpms/python-migrate/F-8 python-migrate-shell-test.patch, NONE, 1.1 python-migrate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171946.m6HJkoB5016664@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16555/F-8 Modified Files: .cvsignore sources Added Files: python-migrate-shell-test.patch python-migrate.spec Log Message: Initial import. python-migrate-shell-test.patch: --- NEW FILE python-migrate-shell-test.patch --- diff -up sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env sqlalchemy-migrate-0.4.4/test/fixture/shell.py --- sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env 2008-04-04 13:44:09.000000000 -0700 +++ sqlalchemy-migrate-0.4.4/test/fixture/shell.py 2008-07-02 13:31:51.000000000 -0700 @@ -12,7 +12,15 @@ class Shell(Pathed): return command # Redirect stderr to stdout # This is a bit of a hack, but I've not found a better way + py_path = os.environ.get('PYTHONPATH', '') + py_path_list = py_path.split(':') + py_path_list.append(os.path.abspath('.')) + os.environ['PYTHONPATH'] = ':'.join(py_path_list) fd=os.popen(command+' 2>&1',*p,**k) + if py_path: + py_path = os.environ['PYTHONPATH'] = py_path + else: + del os.environ['PYTHONPATH'] return fd def output_and_exitcode(self,*p,**k): fd=self.execute(*p,**k) --- NEW FILE python-migrate.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define srcname sqlalchemy-migrate Name: python-migrate Version: 0.4.4 Release: 3%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Fix a test when migrate is not installed. Applied upstream. Patch0: python-migrate-shell-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel Requires: python-sqlalchemy >= 0.3.10 %description Schema migration tools for SQLAlchemy designed to support an agile approach to database design and make it easier to keep development and production databases in sync as schema changes are required. It allows you to manage atabase change sets and database repository versioning. %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .env %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %{__mv} %{buildroot}%{_bindir}/migrate %{buildroot}%{_bindir}/sqlalchemy-migrate %clean %{__rm} -rf %{buildroot} # Check needs py.test in order to run #%check #echo 'sqlite:///__tmp__' > test_db.cfg # setuptools doesn't appear to be compatible with py.test # %{__python} setup.py test #%{__python} -c 'from py.test.cmdline import main; main(["test"])' %files %defattr(-,root,root,-) %doc README CHANGELOG docs/ %{_bindir}/sqlalchemy-migrate %{python_sitelib}/* %changelog * Tue Jul 15 2008 Toshio Kuratomi 0.4.4-3 - Rename binary to sqlalchemy-migrate to avoid potential filename clashes. (Queried upstream but the change is only in Fedora). Noted that openmosix defintely has a /usr/bin/migrate already. * Sat Jul 06 2008 Ricky Zhou 0.4.4-2 - Add BuildRequires on python-setuptools-devel. - Add Requires on SQLAlchemy. * Sat Jun 21 2008 Toshio Kuratomi 0.4.4-1 - Initial Fedora Build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 00:18:19 -0000 1.1 +++ .cvsignore 17 Jul 2008 19:45:58 -0000 1.2 @@ -0,0 +1 @@ +sqlalchemy-migrate-0.4.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 00:18:19 -0000 1.1 +++ sources 17 Jul 2008 19:45:58 -0000 1.2 @@ -0,0 +1 @@ +ea2da4aaeb82b538ec23148b35ead72c sqlalchemy-migrate-0.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 19:47:05 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 17 Jul 2008 19:47:05 GMT Subject: rpms/python-migrate/F-9 python-migrate-shell-test.patch, NONE, 1.1 python-migrate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807171947.m6HJl5P7016710@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16555/F-9 Modified Files: .cvsignore sources Added Files: python-migrate-shell-test.patch python-migrate.spec Log Message: Initial import. python-migrate-shell-test.patch: --- NEW FILE python-migrate-shell-test.patch --- diff -up sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env sqlalchemy-migrate-0.4.4/test/fixture/shell.py --- sqlalchemy-migrate-0.4.4/test/fixture/shell.py.env 2008-04-04 13:44:09.000000000 -0700 +++ sqlalchemy-migrate-0.4.4/test/fixture/shell.py 2008-07-02 13:31:51.000000000 -0700 @@ -12,7 +12,15 @@ class Shell(Pathed): return command # Redirect stderr to stdout # This is a bit of a hack, but I've not found a better way + py_path = os.environ.get('PYTHONPATH', '') + py_path_list = py_path.split(':') + py_path_list.append(os.path.abspath('.')) + os.environ['PYTHONPATH'] = ':'.join(py_path_list) fd=os.popen(command+' 2>&1',*p,**k) + if py_path: + py_path = os.environ['PYTHONPATH'] = py_path + else: + del os.environ['PYTHONPATH'] return fd def output_and_exitcode(self,*p,**k): fd=self.execute(*p,**k) --- NEW FILE python-migrate.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define srcname sqlalchemy-migrate Name: python-migrate Version: 0.4.4 Release: 3%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Fix a test when migrate is not installed. Applied upstream. Patch0: python-migrate-shell-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel Requires: python-sqlalchemy >= 0.3.10 %description Schema migration tools for SQLAlchemy designed to support an agile approach to database design and make it easier to keep development and production databases in sync as schema changes are required. It allows you to manage atabase change sets and database repository versioning. %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .env %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %{__mv} %{buildroot}%{_bindir}/migrate %{buildroot}%{_bindir}/sqlalchemy-migrate %clean %{__rm} -rf %{buildroot} # Check needs py.test in order to run #%check #echo 'sqlite:///__tmp__' > test_db.cfg # setuptools doesn't appear to be compatible with py.test # %{__python} setup.py test #%{__python} -c 'from py.test.cmdline import main; main(["test"])' %files %defattr(-,root,root,-) %doc README CHANGELOG docs/ %{_bindir}/sqlalchemy-migrate %{python_sitelib}/* %changelog * Tue Jul 15 2008 Toshio Kuratomi 0.4.4-3 - Rename binary to sqlalchemy-migrate to avoid potential filename clashes. (Queried upstream but the change is only in Fedora). Noted that openmosix defintely has a /usr/bin/migrate already. * Sat Jul 06 2008 Ricky Zhou 0.4.4-2 - Add BuildRequires on python-setuptools-devel. - Add Requires on SQLAlchemy. * Sat Jun 21 2008 Toshio Kuratomi 0.4.4-1 - Initial Fedora Build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 00:18:19 -0000 1.1 +++ .cvsignore 17 Jul 2008 19:46:20 -0000 1.2 @@ -0,0 +1 @@ +sqlalchemy-migrate-0.4.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 00:18:19 -0000 1.1 +++ sources 17 Jul 2008 19:46:20 -0000 1.2 @@ -0,0 +1 @@ +ea2da4aaeb82b538ec23148b35ead72c sqlalchemy-migrate-0.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 19:49:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 19:49:27 GMT Subject: rpms/efax/devel efax.spec,1.22,1.23 Message-ID: <200807171949.m6HJnRJU017007@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/efax/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16894 Modified Files: efax.spec Log Message: fix license tag Index: efax.spec =================================================================== RCS file: /cvs/pkgs/rpms/efax/devel/efax.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- efax.spec 15 Feb 2008 20:59:31 -0000 1.22 +++ efax.spec 17 Jul 2008 19:48:43 -0000 1.23 @@ -1,8 +1,8 @@ Summary: A program for faxing using a Class 1, 2 or 2.0 fax modem. Name: efax Version: 0.9a -Release: 1.001114%{?dist} -License: GPL +Release: 2.001114%{?dist} +License: GPLv2+ Group: Applications/Communications Url: http://www.cce.com/efax/ Source: http://metalab.unc.edu/pub/Linux/apps/serialcomm/fax/%{name}-%{version}-001114.tar.gz @@ -63,6 +63,9 @@ %dir %{_localstatedir}/log/fax %changelog +* Thu Jul 17 2008 Tom "spot" Callaway 0.9a-2.001114 +- fix license tag + * Fri Feb 15 2008 Than Ngo 0.9a-1.001114 - 0.9a-001114 From fedora-extras-commits at redhat.com Thu Jul 17 19:51:09 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 19:51:09 GMT Subject: rpms/kickpim/F-9 .cvsignore, 1.2, NONE kickpim-0.5.3-qtdesigner.patch, 1.1, NONE kickpim.spec, 1.20, NONE sources, 1.2, NONE Message-ID: <200807171951.m6HJp9fb017268@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kickpim/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/F-9 Removed Files: .cvsignore kickpim-0.5.3-qtdesigner.patch kickpim.spec sources Log Message: remove sources for EOL'd pkg --- .cvsignore DELETED --- --- kickpim-0.5.3-qtdesigner.patch DELETED --- --- kickpim.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:51:40 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 17 Jul 2008 19:51:40 GMT Subject: rpms/kickpim/devel .cvsignore, 1.2, NONE kickpim-0.5.3-qtdesigner.patch, 1.1, NONE kickpim.spec, 1.20, NONE sources, 1.2, NONE Message-ID: <200807171951.m6HJpeHS017292@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kickpim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/devel Removed Files: .cvsignore kickpim-0.5.3-qtdesigner.patch kickpim.spec sources Log Message: remove sources for EOL'd pkg --- .cvsignore DELETED --- --- kickpim-0.5.3-qtdesigner.patch DELETED --- --- kickpim.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:54:21 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 17 Jul 2008 19:54:21 GMT Subject: rpms/selinux-policy/devel .cvsignore, 1.140, 1.141 policy-20080710.patch, 1.2, 1.3 selinux-policy.spec, 1.686, 1.687 sources, 1.155, 1.156 policy-20080509.patch, 1.35, NONE Message-ID: <200807171954.m6HJsL4r017409@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17356 Modified Files: .cvsignore policy-20080710.patch selinux-policy.spec sources Removed Files: policy-20080509.patch Log Message: * Wed Jul 16 2008 Dan Walsh 3.5.1-1 - Fix xguest -> xguest_mozilla_t -> xguest_openiffice_t Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- .cvsignore 12 Jun 2008 14:48:13 -0000 1.140 +++ .cvsignore 17 Jul 2008 19:53:32 -0000 1.141 @@ -142,3 +142,4 @@ serefpolicy-3.3.1.tgz serefpolicy-3.4.1.tgz serefpolicy-3.4.2.tgz +serefpolicy-3.5.1.tgz policy-20080710.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 policy-20080710.patch Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- policy-20080710.patch 15 Jul 2008 20:06:55 -0000 1.2 +++ policy-20080710.patch 17 Jul 2008 19:53:32 -0000 1.3 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.0/Makefile +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.1/Makefile --- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.0/Makefile 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/Makefile 2008-07-16 10:33:11.000000000 -0400 @@ -311,20 +311,22 @@ # parse-rolemap modulename,outputfile @@ -45,9 +45,9 @@ $(appdir)/%: $(appconf)/% @mkdir -p $(appdir) $(verbose) $(INSTALL) -m 644 $< $@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.0/Rules.modular +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.1/Rules.modular --- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.0/Rules.modular 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/Rules.modular 2008-07-16 10:33:11.000000000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -77,23 +77,35 @@ $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.0/config/appconfig-mcs/failsafe_context +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.1/config/appconfig-mcs/default_contexts +--- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-06-12 23:25:09.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/default_contexts 2008-07-17 11:49:28.000000000 -0400 +@@ -2,7 +2,7 @@ + system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 + system_r:remote_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0 + system_r:sshd_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 +-system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0 ++system_r:sulogin_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 + system_r:xdm_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 + + staff_r:staff_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.0/config/appconfig-mcs/failsafe_context 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context 2008-07-16 10:33:11.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/guest_u_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.0/config/appconfig-mcs/guest_u_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_crond_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/root_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.0/config/appconfig-mcs/root_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -107,9 +119,9 @@ # -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/unconfined_u_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.0/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 @@ -120,40 +132,40 @@ +system_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0 +system_r:unconfined_t:s0 unconfined_r:unconfined_t:s0 +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.0/config/appconfig-mcs/userhelper_context +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.0/config/appconfig-mcs/userhelper_context 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context 2008-07-16 10:33:11.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.0/config/appconfig-mcs/xguest_u_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.0/config/appconfig-mcs/xguest_u_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 +system_r:sshd_t xguest_r:xguest_t:s0 +system_r:crond_t xguest_r:xguest_crond_t:s0 +system_r:xdm_t xguest_r:xguest_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.0/config/appconfig-mls/guest_u_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.0/config/appconfig-mls/guest_u_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_crond_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.0/config/appconfig-standard/guest_u_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.0/config/appconfig-standard/guest_u_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t +system_r:sshd_t guest_r:guest_t +system_r:crond_t guest_r:guest_crond_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.0/config/appconfig-standard/root_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.0/config/appconfig-standard/root_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -167,18 +179,18 @@ # -#system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.0/config/appconfig-standard/xguest_u_default_contexts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.0/config/appconfig-standard/xguest_u_default_contexts 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t +system_r:sshd_t xguest_r:xguest_t +system_r:crond_t xguest_r:xguest_crond_t +system_r:xdm_t xguest_r:xguest_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.5.0/man/man8/ftpd_selinux.8 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.5.1/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.0/man/man8/ftpd_selinux.8 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/man/man8/ftpd_selinux.8 2008-07-16 10:33:11.000000000 -0400 @@ -35,10 +35,6 @@ directorories, you need to set the ftp_home_dir boolean. .TP @@ -190,9 +202,9 @@ .br service vsftpd restart .TP -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.5.0/man/man8/httpd_selinux.8 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.5.1/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.0/man/man8/httpd_selinux.8 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/man/man8/httpd_selinux.8 2008-07-16 10:33:11.000000000 -0400 @@ -22,23 +22,19 @@ .EX httpd_sys_content_t @@ -222,9 +234,9 @@ .EX httpd_unconfined_script_exec_t .EE -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.0/policy/global_tunables +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.1/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.0/policy/global_tunables 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/policy/global_tunables 2008-07-16 10:33:11.000000000 -0400 @@ -34,7 +34,7 @@ ## @@ -263,9 +275,9 @@ +gen_tunable(allow_console_login,false) + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-3.5.0/policy/modules/admin/amanda.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-3.5.1/policy/modules/admin/amanda.fc --- nsaserefpolicy/policy/modules/admin/amanda.fc 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.0/policy/modules/admin/amanda.fc 2008-07-15 14:05:12.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/admin/amanda.fc 2008-07-16 10:33:11.000000000 -0400 @@ -3,6 +3,7 @@ /etc/amanda/.*/tapelist(/.*)? gen_context(system_u:object_r:amanda_data_t,s0) /etc/amandates gen_context(system_u:object_r:amanda_amandates_t,s0) @@ -274,9 +286,9 @@ /root/restore -d gen_context(system_u:object_r:amanda_recover_dir_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.5.0/policy/modules/admin/amanda.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.5.1/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2008-07-10 11:38:46.000000000 -0400 [...6829 lines suppressed...] -@@ -3078,11 +3179,11 @@ +@@ -3078,11 +3180,11 @@ # template(`userdom_manage_user_tmp_sockets',` gen_require(` @@ -35686,7 +35595,7 @@ ') ######################################## -@@ -3127,10 +3228,10 @@ +@@ -3127,10 +3229,10 @@ # template(`userdom_user_tmp_filetrans',` gen_require(` @@ -35699,7 +35608,7 @@ files_search_tmp($2) ') -@@ -3171,19 +3272,19 @@ +@@ -3171,19 +3273,19 @@ # template(`userdom_tmp_filetrans_user_tmp',` gen_require(` @@ -35723,7 +35632,7 @@ ##

##

## This is a templated interface, and should only -@@ -4609,11 +4710,11 @@ +@@ -4609,11 +4711,11 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -35737,14 +35646,13 @@ ') ######################################## -@@ -4633,10 +4734,18 @@ +@@ -4633,9 +4735,17 @@ files_list_home($1) allow $1 home_dir_type:dir list_dir_perms; -') -######################################## --##

+ tunable_policy(`use_nfs_home_dirs',` + fs_list_nfs($1) + ') @@ -35755,11 +35663,10 @@ +') + +######################################## -+## + ## ## Search all users home directories. ## - ## -@@ -4670,6 +4779,8 @@ +@@ -4670,6 +4780,8 @@ ') dontaudit $1 { home_dir_type home_type }:dir search_dir_perms; @@ -35768,7 +35675,7 @@ ') ######################################## -@@ -4714,6 +4825,25 @@ +@@ -4714,6 +4826,25 @@ ######################################## ## @@ -35794,7 +35701,7 @@ ## Create, read, write, and delete all files ## in all users home directories. ## -@@ -4939,7 +5069,7 @@ +@@ -4939,7 +5070,7 @@ ######################################## ## @@ -35803,7 +35710,7 @@ ## ## ## -@@ -5311,6 +5441,42 @@ +@@ -5311,6 +5442,42 @@ ######################################## ## @@ -35846,7 +35753,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5361,7 +5527,7 @@ +@@ -5361,7 +5528,7 @@ attribute userdomain; ') @@ -35855,7 +35762,7 @@ kernel_search_proc($1) ') -@@ -5476,6 +5642,42 @@ +@@ -5476,6 +5643,42 @@ ######################################## ## @@ -35898,7 +35805,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5506,3 +5708,525 @@ +@@ -5506,3 +5709,525 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') @@ -36424,9 +36331,9 @@ + delete_lnk_files_pattern($1,home_type,home_type) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.0/policy/modules/system/userdomain.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.0/policy/modules/system/userdomain.te 2008-07-15 14:05:13.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/userdomain.te 2008-07-16 10:33:11.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -36541,9 +36448,9 @@ + manage_fifo_files_pattern(privhome, cifs_t, cifs_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.0/policy/modules/system/xen.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.1/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.0/policy/modules/system/xen.fc 2008-07-15 14:05:13.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.fc 2008-07-16 10:33:11.000000000 -0400 @@ -20,6 +20,7 @@ /var/run/xenconsoled\.pid -- gen_context(system_u:object_r:xenconsoled_var_run_t,s0) /var/run/xend(/.*)? gen_context(system_u:object_r:xend_var_run_t,s0) @@ -36552,9 +36459,9 @@ /var/run/xenstore\.pid -- gen_context(system_u:object_r:xenstored_var_run_t,s0) /var/run/xenstored(/.*)? gen_context(system_u:object_r:xenstored_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.0/policy/modules/system/xen.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.1/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.0/policy/modules/system/xen.if 2008-07-15 14:05:13.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.if 2008-07-16 10:33:11.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -36596,9 +36503,9 @@ + allow $1 xend_var_lib_t:dir search_dir_perms; + rw_files_pattern($1,xen_image_t,xen_image_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.0/policy/modules/system/xen.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.1/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.0/policy/modules/system/xen.te 2008-07-15 14:05:13.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.te 2008-07-16 10:33:11.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -36835,9 +36742,9 @@ +optional_policy(` + unconfined_domain(xend_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.0/policy/support/file_patterns.spt +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.1/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.0/policy/support/file_patterns.spt 2008-07-15 14:05:13.000000000 -0400 ++++ serefpolicy-3.5.1/policy/support/file_patterns.spt 2008-07-16 10:33:11.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -36862,9 +36769,9 @@ + relabelfrom_fifo_files_pattern($1,$2,$2) + relabelfrom_sock_files_pattern($1,$2,$2) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.0/policy/support/obj_perm_sets.spt +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.0/policy/support/obj_perm_sets.spt 2008-07-15 14:05:13.000000000 -0400 ++++ serefpolicy-3.5.1/policy/support/obj_perm_sets.spt 2008-07-16 10:33:11.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -36879,9 +36786,9 @@ +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ') + +define(`manage_key_perms', `{ create link read search setattr view write } ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.0/policy/users +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.1/policy/users --- nsaserefpolicy/policy/users 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.0/policy/users 2008-07-15 14:05:13.000000000 -0400 ++++ serefpolicy-3.5.1/policy/users 2008-07-16 10:33:11.000000000 -0400 @@ -1,3 +1,9 @@ +role auditadm_r; +role secadm_r; Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.686 retrieving revision 1.687 diff -u -r1.686 -r1.687 --- selinux-policy.spec 15 Jul 2008 20:06:55 -0000 1.686 +++ selinux-policy.spec 17 Jul 2008 19:53:32 -0000 1.687 @@ -16,7 +16,7 @@ %define CHECKPOLICYVER 2.0.16-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 3.5.0 +Version: 3.5.1 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -375,6 +375,9 @@ %endif %changelog +* Wed Jul 16 2008 Dan Walsh 3.5.1-1 +- Fix xguest -> xguest_mozilla_t -> xguest_openiffice_t + * Tue Jul 15 2008 Dan Walsh 3.5.0-1 - Update to latest refpolicy - Fix libsemanage initial install bug Index: sources =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- sources 12 Jun 2008 14:48:13 -0000 1.155 +++ sources 17 Jul 2008 19:53:32 -0000 1.156 @@ -1 +1 @@ -16250bc98f19619ee2ca3e8b2538a394 serefpolicy-3.4.2.tgz +5d218389c0f4aaf34d8052ffc5a3fed1 serefpolicy-3.5.1.tgz --- policy-20080509.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 19:55:30 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 17 Jul 2008 19:55:30 GMT Subject: rpms/kernel/devel .cvsignore, 1.870, 1.871 config-generic, 1.132, 1.133 kernel.spec, 1.781, 1.782 sources, 1.830, 1.831 upstream, 1.748, 1.749 Message-ID: <200807171955.m6HJtUlG017528@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17470 Modified Files: .cvsignore config-generic kernel.spec sources upstream Log Message: 2.6.26-git6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.870 retrieving revision 1.871 diff -u -r1.870 -r1.871 --- .cvsignore 17 Jul 2008 17:32:22 -0000 1.870 +++ .cvsignore 17 Jul 2008 19:54:34 -0000 1.871 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git5.bz2 +patch-2.6.26-git6.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- config-generic 17 Jul 2008 17:32:22 -0000 1.132 +++ config-generic 17 Jul 2008 19:54:34 -0000 1.133 @@ -3002,6 +3002,7 @@ # CONFIG_OCFS2_DEBUG_MASKLOG is not set CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +# CONFIG_OCFS2_FS_STATS is not set CONFIG_CONFIGFS_FS=m CONFIG_DLM=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.781 retrieving revision 1.782 diff -u -r1.781 -r1.782 --- kernel.spec 17 Jul 2008 17:32:22 -0000 1.781 +++ kernel.spec 17 Jul 2008 19:54:34 -0000 1.782 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1781,6 +1781,9 @@ %changelog * Thu Jul 17 2008 Dave Jones +- 2.6.26-git6 + +* Thu Jul 17 2008 Dave Jones - 2.6.26-git5 * Thu Jul 17 2008 Kristian H??gsberg Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.830 retrieving revision 1.831 diff -u -r1.830 -r1.831 --- sources 17 Jul 2008 17:32:22 -0000 1.830 +++ sources 17 Jul 2008 19:54:34 -0000 1.831 @@ -1,2 +1 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -8210bca1cfec7b32401fcd067ef7bbac patch-2.6.26-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.748 retrieving revision 1.749 diff -u -r1.748 -r1.749 --- upstream 17 Jul 2008 17:32:22 -0000 1.748 +++ upstream 17 Jul 2008 19:54:34 -0000 1.749 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git5.bz2 +patch-2.6.26-git6.bz2 From fedora-extras-commits at redhat.com Thu Jul 17 19:59:00 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 17 Jul 2008 19:59:00 GMT Subject: rpms/python-migrate/devel python-migrate-disable-pytest.patch, NONE, 1.1 python-migrate.spec, 1.1, 1.2 Message-ID: <200807171959.m6HJx0kI017756@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17685 Modified Files: python-migrate.spec Added Files: python-migrate-disable-pytest.patch Log Message: * Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 - Disable py.test so we don't try to download it during build. python-migrate-disable-pytest.patch: --- NEW FILE python-migrate-disable-pytest.patch --- Index: sqlalchemy-migrate-0.4.4/setup.py =================================================================== --- sqlalchemy-migrate-0.4.4.orig/setup.py +++ sqlalchemy-migrate-0.4.4/setup.py @@ -20,7 +20,7 @@ Migrate extends SQLAlchemy to have datab """, install_requires = ['sqlalchemy >= 0.3.10'], - setup_requires = ['py >= 0.9.0-beta'], + setup_requires = [], dependency_links = [ "http://codespeak.net/download/py/", ], Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-migrate.spec 17 Jul 2008 16:38:51 -0000 1.1 +++ python-migrate.spec 17 Jul 2008 19:58:16 -0000 1.2 @@ -4,7 +4,7 @@ Name: python-migrate Version: 0.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages @@ -13,6 +13,8 @@ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Fix a test when migrate is not installed. Applied upstream. Patch0: python-migrate-shell-test.patch +# Local patch to disable py.test. Needed until py.test is in Fedora. +Patch1: python-migrate-disable-pytest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +32,7 @@ %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .env +%patch1 -p1 -b .pytest %build %{__python} setup.py build @@ -56,6 +59,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 +- Disable py.test so we don't try to download it during build. + * Tue Jul 15 2008 Toshio Kuratomi 0.4.4-3 - Rename binary to sqlalchemy-migrate to avoid potential filename clashes. (Queried upstream but the change is only in Fedora). Noted that From fedora-extras-commits at redhat.com Thu Jul 17 20:01:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:01:11 GMT Subject: rpms/eject/devel eject-2.1.5-lock.patch, 1.1, 1.2 eject.spec, 1.37, 1.38 Message-ID: <200807172001.m6HK1BNA024507@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/eject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17883 Modified Files: eject-2.1.5-lock.patch eject.spec Log Message: fix license tag eject-2.1.5-lock.patch: Index: eject-2.1.5-lock.patch =================================================================== RCS file: /cvs/pkgs/rpms/eject/devel/eject-2.1.5-lock.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eject-2.1.5-lock.patch 28 Feb 2008 12:44:05 -0000 1.1 +++ eject-2.1.5-lock.patch 17 Jul 2008 20:00:25 -0000 1.2 @@ -1,6 +1,7 @@ ---- eject.c 2008-02-14 14:11:06.000000000 +0100 -+++ /home/zdeny/download/eject.c 2008-02-28 12:40:09.000000000 +0100 -@@ -116,6 +117,7 @@ int d_option = 0; +diff -up ./eject.c.lock ./eject.c +--- ./eject.c.lock 2008-07-17 15:48:42.000000000 -0400 ++++ ./eject.c 2008-07-17 15:53:52.000000000 -0400 +@@ -116,6 +116,7 @@ int d_option = 0; int f_option = 0; int h_option = 0; int n_option = 0; @@ -8,7 +9,7 @@ int q_option = 0; int r_option = 0; int s_option = 0; -@@ -129,6 +131,7 @@ int m_option = 0; +@@ -129,6 +130,7 @@ int m_option = 0; int a_arg = 0; int c_arg = 0; int x_arg = 0; @@ -31,7 +32,7 @@ -" -p --proc -m --no-unmount -T --traytoggle\n")); +" -p --proc -m --no-unmount -T --traytoggle -i --manualeject\n")); #endif /* GETOPTLONG */ - fprintf(stderr,_( + fprintf(stderr,_( "Parameter can be a device file or a mount point.\n" @@ -214,7 +217,7 @@ static void usage() /* Handle command line options. */ @@ -103,7 +104,7 @@ /* Set or clear auto-eject mode. */ static void AutoEject(int fd, int onOff) { -@@ -1227,6 +1320,13 @@ int main(int argc, char **argv) +@@ -1227,6 +1270,13 @@ int main(int argc, char **argv) exit(0); } Index: eject.spec =================================================================== RCS file: /cvs/pkgs/rpms/eject/devel/eject.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- eject.spec 2 Apr 2008 08:42:46 -0000 1.37 +++ eject.spec 17 Jul 2008 20:00:25 -0000 1.38 @@ -1,8 +1,8 @@ Summary: A program that ejects removable media using software control. Name: eject Version: 2.1.5 -Release: 11%{dist} -License: GPL +Release: 12%{dist} +License: GPLv2+ Group: System Environment/Base Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz Source1: eject.pam @@ -76,6 +76,9 @@ %{_mandir}/man1/* %changelog +* Thu Jul 17 2008 Tom "spot" Callaway 2.1.5-12 +- fix license tag + * Wed Apr 02 2008 Zdenek Prikryl 2.1.5-11 - Added check if device is hotpluggable - Resolves #438610 From fedora-extras-commits at redhat.com Thu Jul 17 20:02:03 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Thu, 17 Jul 2008 20:02:03 GMT Subject: rpms/xenner/F-9 .cvsignore, 1.10, 1.11 sources, 1.9, 1.10 xenner.spec, 1.17, 1.18 Message-ID: <200807172002.m6HK23ur024625@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24513 Modified Files: .cvsignore sources xenner.spec Log Message: update to version 0.40 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 9 Jun 2008 21:58:41 -0000 1.10 +++ .cvsignore 17 Jul 2008 20:01:13 -0000 1.11 @@ -1 +1 @@ -xenner-0.37.tar.gz +xenner-0.40.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Jun 2008 21:58:41 -0000 1.9 +++ sources 17 Jul 2008 20:01:13 -0000 1.10 @@ -1 +1 @@ -e3912b0885c973a1beeb760ed4428503 xenner-0.37.tar.gz +f40b62df99f4cefb38276aaf30d700d5 xenner-0.40.tar.gz Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-9/xenner.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xenner.spec 9 Jun 2008 22:05:16 -0000 1.17 +++ xenner.spec 17 Jul 2008 20:01:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: xenner License: GPLv2+ -Version: 0.37 +Version: 0.40 Release: 1%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators @@ -57,6 +57,12 @@ rm -rf %{buildroot} %changelog +* Thu Jul 17 2008 Gerd Hoffmann - 0.40-1.fc9 +- update to version 0.40 + - fix opensuse 11 and recent pv_ops kernels. + - don't overcommit memory, print useful oom message. + - a bunch of internal changes. + - usual set of small tweaks and fixes. * Mon Jun 9 2008 Gerd Hoffmann - 0.37-1.fc9 - update to version 0.37 - make fedora 9 and opensuse 10.3 guests fly. From fedora-extras-commits at redhat.com Thu Jul 17 20:02:43 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 17 Jul 2008 20:02:43 GMT Subject: rpms/python-migrate/F-8 python-migrate-disable-pytest.patch, NONE, 1.1 python-migrate.spec, 1.1, 1.2 Message-ID: <200807172002.m6HK2hTQ024718@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17808/F-8 Modified Files: python-migrate.spec Added Files: python-migrate-disable-pytest.patch Log Message: * Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 - Disable py.test so we don't try to download it during build. python-migrate-disable-pytest.patch: --- NEW FILE python-migrate-disable-pytest.patch --- Index: sqlalchemy-migrate-0.4.4/setup.py =================================================================== --- sqlalchemy-migrate-0.4.4.orig/setup.py +++ sqlalchemy-migrate-0.4.4/setup.py @@ -20,7 +20,7 @@ Migrate extends SQLAlchemy to have datab """, install_requires = ['sqlalchemy >= 0.3.10'], - setup_requires = ['py >= 0.9.0-beta'], + setup_requires = [], dependency_links = [ "http://codespeak.net/download/py/", ], Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-8/python-migrate.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-migrate.spec 17 Jul 2008 19:45:58 -0000 1.1 +++ python-migrate.spec 17 Jul 2008 20:01:59 -0000 1.2 @@ -4,7 +4,7 @@ Name: python-migrate Version: 0.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages @@ -13,6 +13,8 @@ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Fix a test when migrate is not installed. Applied upstream. Patch0: python-migrate-shell-test.patch +# Local patch to disable py.test. Needed until py.test is in Fedora. +Patch1: python-migrate-disable-pytest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +32,7 @@ %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .env +%patch1 -p1 -b .pytest %build %{__python} setup.py build @@ -56,6 +59,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 +- Disable py.test so we don't try to download it during build. + * Tue Jul 15 2008 Toshio Kuratomi 0.4.4-3 - Rename binary to sqlalchemy-migrate to avoid potential filename clashes. (Queried upstream but the change is only in Fedora). Noted that From fedora-extras-commits at redhat.com Thu Jul 17 20:03:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 17 Jul 2008 20:03:02 GMT Subject: rpms/python-migrate/F-9 python-migrate-disable-pytest.patch, NONE, 1.1 python-migrate.spec, 1.1, 1.2 Message-ID: <200807172003.m6HK32rk024746@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17808/F-9 Modified Files: python-migrate.spec Added Files: python-migrate-disable-pytest.patch Log Message: * Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 - Disable py.test so we don't try to download it during build. python-migrate-disable-pytest.patch: --- NEW FILE python-migrate-disable-pytest.patch --- Index: sqlalchemy-migrate-0.4.4/setup.py =================================================================== --- sqlalchemy-migrate-0.4.4.orig/setup.py +++ sqlalchemy-migrate-0.4.4/setup.py @@ -20,7 +20,7 @@ Migrate extends SQLAlchemy to have datab """, install_requires = ['sqlalchemy >= 0.3.10'], - setup_requires = ['py >= 0.9.0-beta'], + setup_requires = [], dependency_links = [ "http://codespeak.net/download/py/", ], Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-9/python-migrate.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-migrate.spec 17 Jul 2008 19:46:20 -0000 1.1 +++ python-migrate.spec 17 Jul 2008 20:02:13 -0000 1.2 @@ -4,7 +4,7 @@ Name: python-migrate Version: 0.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages @@ -13,6 +13,8 @@ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Fix a test when migrate is not installed. Applied upstream. Patch0: python-migrate-shell-test.patch +# Local patch to disable py.test. Needed until py.test is in Fedora. +Patch1: python-migrate-disable-pytest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +32,7 @@ %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .env +%patch1 -p1 -b .pytest %build %{__python} setup.py build @@ -56,6 +59,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 +- Disable py.test so we don't try to download it during build. + * Tue Jul 15 2008 Toshio Kuratomi 0.4.4-3 - Rename binary to sqlalchemy-migrate to avoid potential filename clashes. (Queried upstream but the change is only in Fedora). Noted that From fedora-extras-commits at redhat.com Thu Jul 17 20:03:34 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Thu, 17 Jul 2008 20:03:34 GMT Subject: rpms/xenner/devel .cvsignore, 1.16, 1.17 sources, 1.15, 1.16 xenner.spec, 1.23, 1.24 Message-ID: <200807172003.m6HK3YAf024869@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24722 Modified Files: .cvsignore sources xenner.spec Log Message: fix date in changelog Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 Jul 2008 16:00:24 -0000 1.16 +++ .cvsignore 17 Jul 2008 20:02:46 -0000 1.17 @@ -1,2 +1 @@ -xenner-0.39.tar.gz xenner-0.40.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 17 Jul 2008 16:00:24 -0000 1.15 +++ sources 17 Jul 2008 20:02:46 -0000 1.16 @@ -1,2 +1 @@ -0b1f56f9ae2f11a6e57944954b9f9418 xenner-0.39.tar.gz f40b62df99f4cefb38276aaf30d700d5 xenner-0.40.tar.gz Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xenner.spec 17 Jul 2008 16:00:24 -0000 1.23 +++ xenner.spec 17 Jul 2008 20:02:46 -0000 1.24 @@ -57,7 +57,7 @@ rm -rf %{buildroot} %changelog -* Fri Jul 11 2008 Gerd Hoffmann - 0.40-1.fc10 +* Thu Jul 17 2008 Gerd Hoffmann - 0.40-1.fc10 - update to version 0.40 * rework xenner <=> emu interfaces. * emu*.elf symbol tables not needed any more. From fedora-extras-commits at redhat.com Thu Jul 17 20:04:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:04:56 GMT Subject: rpms/elsa/devel elsa.spec,1.2,1.3 Message-ID: <200807172004.m6HK4uN4024946@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/elsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24924 Modified Files: elsa.spec Log Message: fix license tag Index: elsa.spec =================================================================== RCS file: /cvs/pkgs/rpms/elsa/devel/elsa.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- elsa.spec 20 Feb 2008 05:13:20 -0000 1.2 +++ elsa.spec 17 Jul 2008 20:04:09 -0000 1.3 @@ -1,10 +1,10 @@ Summary: ELSA is an enhanced Linux system accounting Name: elsa Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System -License: GPL +License: GPLv2+ URL: http://elsa.sourceforge.net Source0: elsa-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +53,9 @@ %doc -P ChangeLog COPYING README HOWTO utils/test_elsa_installation.sh %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 1.4-4 +- fix license tag + * Wed Feb 20 2008 Fedora Release Engineering - 1.4-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 17 20:06:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:06:27 GMT Subject: rpms/emacs-nxml-mode/devel emacs-nxml-mode.spec,1.2,1.3 Message-ID: <200807172006.m6HK6RwF025059@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/emacs-nxml-mode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25030 Modified Files: emacs-nxml-mode.spec Log Message: fix license tag Index: emacs-nxml-mode.spec =================================================================== RCS file: /cvs/pkgs/rpms/emacs-nxml-mode/devel/emacs-nxml-mode.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacs-nxml-mode.spec 5 Jul 2007 14:16:20 -0000 1.2 +++ emacs-nxml-mode.spec 17 Jul 2008 20:05:31 -0000 1.3 @@ -2,8 +2,8 @@ Summary: Emacs package for editing XML Name: emacs-nxml-mode Version: 0.%{snapshot} -Release: 6%{?dist} -License: GPL +Release: 7%{?dist} +License: GPLv2+ Group: Applications/Editors URL: http://www.thaiopensource.com/nxml-mode/ Source0: http://www.thaiopensource.com/download/nxml-mode-%{snapshot}.tar.gz @@ -73,6 +73,9 @@ exit 0 %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 0.20041004-7 +- fix license tag + * Thu Jul 5 2007 Tim Waugh . From fedora-extras-commits at redhat.com Thu Jul 17 20:08:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:08:54 GMT Subject: rpms/epel-release/devel epel-release.spec,1.2,1.3 Message-ID: <200807172008.m6HK8sqH025188@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/epel-release/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25138 Modified Files: epel-release.spec Log Message: fix license tag Index: epel-release.spec =================================================================== RCS file: /cvs/pkgs/rpms/epel-release/devel/epel-release.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- epel-release.spec 25 Mar 2007 20:10:17 -0000 1.2 +++ epel-release.spec 17 Jul 2008 20:08:11 -0000 1.3 @@ -1,10 +1,10 @@ Name: epel-release Version: 6 -Release: 0 +Release: 1 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base -License: GPL +License: GPLv2 # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -66,6 +66,9 @@ %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 6.1 +- fix license tag + * Sun Mar 25 2007 Michael Stahnke - 6-0 - Bumped in devel to RHEL 6. (We can dream). From fedora-extras-commits at redhat.com Thu Jul 17 20:09:58 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:09:58 GMT Subject: rpms/epiphany/devel epiphany.spec,1.192,1.193 Message-ID: <200807172009.m6HK9wCa025315@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/epiphany/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25257 Modified Files: epiphany.spec Log Message: fix license tag Index: epiphany.spec =================================================================== RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- epiphany.spec 10 Jun 2008 14:17:03 -0000 1.192 +++ epiphany.spec 17 Jul 2008 20:09:24 -0000 1.193 @@ -8,8 +8,8 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.22.2 -Release: 1%{?dist} -License: GPLv2+ and GFDL+ +Release: 2%{?dist} +License: GPLv2+ and GFDL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ Source0: http://download.gnome.org/sources/epiphany/2.22/%{name}-%{version}.tar.bz2 @@ -211,6 +211,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Thu Jul 17 2008 Tom "spot" Callaway 2.22.2-2 +- fix license tag + * Wed May 28 2008 Matthias Clasen - 2.22.2-1 - Update to 2.22.2 From fedora-extras-commits at redhat.com Thu Jul 17 20:14:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:14:10 GMT Subject: rpms/erlang/devel erlang.spec,1.29,1.30 Message-ID: <200807172014.m6HKEAhm025516@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25477 Modified Files: erlang.spec Log Message: fix license tag Index: erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- erlang.spec 6 Jul 2008 12:32:48 -0000 1.29 +++ erlang.spec 17 Jul 2008 20:13:32 -0000 1.30 @@ -3,11 +3,11 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz @@ -117,6 +117,9 @@ %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 +- fix license tag + * Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 - new release R12B-3 From fedora-extras-commits at redhat.com Thu Jul 17 20:17:41 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Thu, 17 Jul 2008 20:17:41 GMT Subject: rpms/xenner/F-8 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xenner.spec, 1.6, 1.7 Message-ID: <200807172017.m6HKHfg5025763@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25677 Modified Files: .cvsignore sources xenner.spec Log Message: update to version 0.40 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Jun 2008 22:28:08 -0000 1.6 +++ .cvsignore 17 Jul 2008 20:16:55 -0000 1.7 @@ -1 +1 @@ -xenner-0.37.tar.gz +xenner-0.40.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Jun 2008 22:28:08 -0000 1.6 +++ sources 17 Jul 2008 20:16:55 -0000 1.7 @@ -1 +1 @@ -e3912b0885c973a1beeb760ed4428503 xenner-0.37.tar.gz +f40b62df99f4cefb38276aaf30d700d5 xenner-0.40.tar.gz Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-8/xenner.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xenner.spec 9 Jun 2008 22:28:08 -0000 1.6 +++ xenner.spec 17 Jul 2008 20:16:55 -0000 1.7 @@ -1,6 +1,6 @@ Name: xenner License: GPLv2+ -Version: 0.37 +Version: 0.40 Release: 1%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators @@ -56,6 +56,12 @@ rm -rf %{buildroot} %changelog +* Thu Jul 17 2008 Gerd Hoffmann - 0.40-1.fc8 +- update to version 0.40 + - fix opensuse 11 and recent pv_ops kernels. + - don't overcommit memory, print useful oom message. + - a bunch of internal changes. + - usual set of small tweaks and fixes. * Mon Jun 9 2008 Gerd Hoffmann - 0.37-1.fc8 - update to version 0.37 - make fedora 9 and opensuse 10.3 guests fly. From fedora-extras-commits at redhat.com Thu Jul 17 20:25:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:25:49 GMT Subject: rpms/erlang-esdl/devel erlang-esdl.spec,1.7,1.8 Message-ID: <200807172025.m6HKPngH026099@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/erlang-esdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26057 Modified Files: erlang-esdl.spec Log Message: fix license tag Index: erlang-esdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang-esdl/devel/erlang-esdl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- erlang-esdl.spec 19 Feb 2008 03:31:48 -0000 1.7 +++ erlang-esdl.spec 17 Jul 2008 20:25:13 -0000 1.8 @@ -1,10 +1,10 @@ Name: erlang-esdl Version: 0.96.0626 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Erlang OpenGL/SDL api and utilities Group: Development/Libraries -License: Distributable +License: MIT URL: http://esdl.sourceforge.net Source: http://download.sourceforge.net/esdl/esdl-%{version}.src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,9 @@ %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 0.96.0626-4 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.96.0626-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 17 20:29:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:29:13 GMT Subject: rpms/esound/devel esound.spec,1.46,1.47 Message-ID: <200807172029.m6HKTDZm026294@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26218 Modified Files: esound.spec Log Message: fix license tag Index: esound.spec =================================================================== RCS file: /cvs/pkgs/rpms/esound/devel/esound.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- esound.spec 16 Jul 2008 20:02:23 -0000 1.46 +++ esound.spec 17 Jul 2008 20:28:27 -0000 1.47 @@ -2,9 +2,9 @@ Summary: Allows several audio streams to play on a single audio device Name: esound Version: 0.2.39 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 -License: LGPL +License: LGPLv2+ URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound Group: System Environment/Daemons Source0: http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.bz2 @@ -125,6 +125,9 @@ %{_mandir}/man1/esd-config.1.gz %changelog +* Thu Jul 17 2008 Tom "spot" Callaway 1:0.2.39-2 +- fix license tag + * Tue Jul 15 2008 Matthias Clasen 0 1:0.2.39-1 - Update to 0.2.39 - Drop upstreamed patches From fedora-extras-commits at redhat.com Thu Jul 17 20:30:10 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Thu, 17 Jul 2008 20:30:10 GMT Subject: rpms/facter/F-9 .cvsignore, 1.6, 1.7 facter.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807172030.m6HKUA0F026442@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/facter/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/F-9 Modified Files: .cvsignore facter.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/facter/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Sep 2007 19:30:19 -0000 1.6 +++ .cvsignore 17 Jul 2008 20:29:18 -0000 1.7 @@ -1 +1 @@ -facter-1.3.8.tgz +facter-1.5.0.tgz Index: facter.spec =================================================================== RCS file: /cvs/pkgs/rpms/facter/F-9/facter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- facter.spec 24 Sep 2007 19:30:19 -0000 1.7 +++ facter.spec 17 Jul 2008 20:29:18 -0000 1.8 @@ -5,8 +5,8 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.3.8 -Release: 1%{?dist} +Version: 1.5.0 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter @@ -23,7 +23,7 @@ %endif BuildRequires: ruby >= 1.8.1 -%description +%description Ruby module for collecting simple facts about a host Operating system. Some of the facts are preconfigured, such as the hostname and the operating system. Additional facts can be added through simple Ruby scripts @@ -39,10 +39,16 @@ mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -d -m0755 %{buildroot}%{_bindir} %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} -cp -pr lib/* %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} %clean @@ -58,6 +64,13 @@ %changelog +* Thu Jul 17 2008 David Lutterkort - 1.5.0-2 +- Remove files that were listed twice in files section + +* Mon May 19 2008 James Turnbull - 1.5.0-1 +- New version +- Added util and plist files + * Mon Sep 24 2007 David Lutterkort - 1.3.8-1 - Update license tag - Copy all of lib/ into ruby_sitelibdir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/facter/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Sep 2007 19:30:19 -0000 1.6 +++ sources 17 Jul 2008 20:29:18 -0000 1.7 @@ -1 +1 @@ -e5a6ab821f6eaaba64ac0e676fd0a16c facter-1.3.8.tgz +91353915fee1c22c9016ffed115f0abd facter-1.5.0.tgz From fedora-extras-commits at redhat.com Thu Jul 17 20:30:18 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Thu, 17 Jul 2008 20:30:18 GMT Subject: rpms/facter/F-8 .cvsignore, 1.6, 1.7 facter.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807172030.m6HKUIWd026447@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/facter/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/F-8 Modified Files: .cvsignore facter.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/facter/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Sep 2007 19:30:19 -0000 1.6 +++ .cvsignore 17 Jul 2008 20:28:57 -0000 1.7 @@ -1 +1 @@ -facter-1.3.8.tgz +facter-1.5.0.tgz Index: facter.spec =================================================================== RCS file: /cvs/pkgs/rpms/facter/F-8/facter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- facter.spec 24 Sep 2007 19:30:19 -0000 1.7 +++ facter.spec 17 Jul 2008 20:28:57 -0000 1.8 @@ -5,8 +5,8 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.3.8 -Release: 1%{?dist} +Version: 1.5.0 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter @@ -23,7 +23,7 @@ %endif BuildRequires: ruby >= 1.8.1 -%description +%description Ruby module for collecting simple facts about a host Operating system. Some of the facts are preconfigured, such as the hostname and the operating system. Additional facts can be added through simple Ruby scripts @@ -39,10 +39,16 @@ mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -d -m0755 %{buildroot}%{_bindir} %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} -cp -pr lib/* %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} %clean @@ -58,6 +64,13 @@ %changelog +* Thu Jul 17 2008 David Lutterkort - 1.5.0-2 +- Remove files that were listed twice in files section + +* Mon May 19 2008 James Turnbull - 1.5.0-1 +- New version +- Added util and plist files + * Mon Sep 24 2007 David Lutterkort - 1.3.8-1 - Update license tag - Copy all of lib/ into ruby_sitelibdir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/facter/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Sep 2007 19:30:19 -0000 1.6 +++ sources 17 Jul 2008 20:28:57 -0000 1.7 @@ -1 +1 @@ -e5a6ab821f6eaaba64ac0e676fd0a16c facter-1.3.8.tgz +91353915fee1c22c9016ffed115f0abd facter-1.5.0.tgz From fedora-extras-commits at redhat.com Thu Jul 17 20:30:27 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Thu, 17 Jul 2008 20:30:27 GMT Subject: rpms/facter/EL-5 .cvsignore, 1.6, 1.7 facter.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807172030.m6HKURdY026454@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/facter/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/EL-5 Modified Files: .cvsignore facter.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/facter/EL-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Sep 2007 19:37:58 -0000 1.6 +++ .cvsignore 17 Jul 2008 20:28:30 -0000 1.7 @@ -1 +1 @@ -facter-1.3.8.tgz +facter-1.5.0.tgz Index: facter.spec =================================================================== RCS file: /cvs/pkgs/rpms/facter/EL-5/facter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- facter.spec 24 Sep 2007 19:37:58 -0000 1.7 +++ facter.spec 17 Jul 2008 20:28:30 -0000 1.8 @@ -5,8 +5,8 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.3.8 -Release: 1%{?dist} +Version: 1.5.0 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter @@ -23,7 +23,7 @@ %endif BuildRequires: ruby >= 1.8.1 -%description +%description Ruby module for collecting simple facts about a host Operating system. Some of the facts are preconfigured, such as the hostname and the operating system. Additional facts can be added through simple Ruby scripts @@ -39,10 +39,16 @@ mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -d -m0755 %{buildroot}%{_bindir} %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} -cp -pr lib/* %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} %clean @@ -58,6 +64,13 @@ %changelog +* Thu Jul 17 2008 David Lutterkort - 1.5.0-2 +- Remove files that were listed twice in files section + +* Mon May 19 2008 James Turnbull - 1.5.0-1 +- New version +- Added util and plist files + * Mon Sep 24 2007 David Lutterkort - 1.3.8-1 - Update license tag - Copy all of lib/ into ruby_sitelibdir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/facter/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Sep 2007 19:37:58 -0000 1.6 +++ sources 17 Jul 2008 20:28:30 -0000 1.7 @@ -1 +1 @@ -e5a6ab821f6eaaba64ac0e676fd0a16c facter-1.3.8.tgz +91353915fee1c22c9016ffed115f0abd facter-1.5.0.tgz From fedora-extras-commits at redhat.com Thu Jul 17 20:30:29 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Thu, 17 Jul 2008 20:30:29 GMT Subject: rpms/facter/EL-4 .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200807172030.m6HKUThS026467@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/facter/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/EL-4 Modified Files: .cvsignore facter.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/facter/EL-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Sep 2007 19:37:06 -0000 1.5 +++ .cvsignore 17 Jul 2008 20:28:28 -0000 1.6 @@ -1 +1 @@ -facter-1.3.8.tgz +facter-1.5.0.tgz Index: facter.spec =================================================================== RCS file: /cvs/pkgs/rpms/facter/EL-4/facter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- facter.spec 24 Sep 2007 19:37:06 -0000 1.6 +++ facter.spec 17 Jul 2008 20:28:28 -0000 1.7 @@ -5,8 +5,8 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.3.8 -Release: 1%{?dist} +Version: 1.5.0 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter @@ -23,7 +23,7 @@ %endif BuildRequires: ruby >= 1.8.1 -%description +%description Ruby module for collecting simple facts about a host Operating system. Some of the facts are preconfigured, such as the hostname and the operating system. Additional facts can be added through simple Ruby scripts @@ -39,10 +39,16 @@ mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -d -m0755 %{buildroot}%{_bindir} %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} -cp -pr lib/* %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} %clean @@ -58,6 +64,13 @@ %changelog +* Thu Jul 17 2008 David Lutterkort - 1.5.0-2 +- Remove files that were listed twice in files section + +* Mon May 19 2008 James Turnbull - 1.5.0-1 +- New version +- Added util and plist files + * Mon Sep 24 2007 David Lutterkort - 1.3.8-1 - Update license tag - Copy all of lib/ into ruby_sitelibdir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/facter/EL-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Sep 2007 19:37:06 -0000 1.5 +++ sources 17 Jul 2008 20:28:28 -0000 1.6 @@ -1 +1 @@ -e5a6ab821f6eaaba64ac0e676fd0a16c facter-1.3.8.tgz +91353915fee1c22c9016ffed115f0abd facter-1.5.0.tgz From fedora-extras-commits at redhat.com Thu Jul 17 20:30:38 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Thu, 17 Jul 2008 20:30:38 GMT Subject: rpms/facter/devel .cvsignore, 1.6, 1.7 facter.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807172030.m6HKUceA026474@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/facter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/devel Modified Files: .cvsignore facter.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/facter/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Sep 2007 19:30:19 -0000 1.6 +++ .cvsignore 17 Jul 2008 20:29:40 -0000 1.7 @@ -1 +1 @@ -facter-1.3.8.tgz +facter-1.5.0.tgz Index: facter.spec =================================================================== RCS file: /cvs/pkgs/rpms/facter/devel/facter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- facter.spec 24 Sep 2007 19:30:19 -0000 1.7 +++ facter.spec 17 Jul 2008 20:29:40 -0000 1.8 @@ -5,8 +5,8 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.3.8 -Release: 1%{?dist} +Version: 1.5.0 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter @@ -23,7 +23,7 @@ %endif BuildRequires: ruby >= 1.8.1 -%description +%description Ruby module for collecting simple facts about a host Operating system. Some of the facts are preconfigured, such as the hostname and the operating system. Additional facts can be added through simple Ruby scripts @@ -39,10 +39,16 @@ mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -d -m0755 %{buildroot}%{_bindir} %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} -cp -pr lib/* %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} +%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter +%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util +%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} %clean @@ -58,6 +64,13 @@ %changelog +* Thu Jul 17 2008 David Lutterkort - 1.5.0-2 +- Remove files that were listed twice in files section + +* Mon May 19 2008 James Turnbull - 1.5.0-1 +- New version +- Added util and plist files + * Mon Sep 24 2007 David Lutterkort - 1.3.8-1 - Update license tag - Copy all of lib/ into ruby_sitelibdir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/facter/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Sep 2007 19:30:19 -0000 1.6 +++ sources 17 Jul 2008 20:29:40 -0000 1.7 @@ -1 +1 @@ -e5a6ab821f6eaaba64ac0e676fd0a16c facter-1.3.8.tgz +91353915fee1c22c9016ffed115f0abd facter-1.5.0.tgz From fedora-extras-commits at redhat.com Thu Jul 17 20:32:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:32:46 GMT Subject: rpms/etherape/devel etherape.spec,1.4,1.5 Message-ID: <200807172032.m6HKWknH026615@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/etherape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26550 Modified Files: etherape.spec Log Message: fix license tag Index: etherape.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherape/devel/etherape.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- etherape.spec 19 Apr 2008 14:36:50 -0000 1.4 +++ etherape.spec 17 Jul 2008 20:31:58 -0000 1.5 @@ -1,10 +1,10 @@ Name: etherape Version: 0.9.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Graphical network monitor for Unix Group: Applications/System -License: GPL +License: GPLv2+ URL: http://etherape.sourceforge.net/ Source0: http://umn.dl.sourceforge.net/sourceforge/etherape/%{name}-%{version}.tar.gz Source1: etherape.pam @@ -98,6 +98,9 @@ %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 0.9.7-9 +- fix license tag + * Sat Apr 19 2008 Michael Rice - 0.9.7-8 - fix ln -s From fedora-extras-commits at redhat.com Thu Jul 17 20:38:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 17 Jul 2008 20:38:43 GMT Subject: rpms/evince/devel evince-0.6.0-print-error.patch, 1.1, 1.2 evince.spec, 1.123, 1.124 Message-ID: <200807172038.m6HKchqT026984@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/evince/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26876 Modified Files: evince-0.6.0-print-error.patch evince.spec Log Message: fix license tag evince-0.6.0-print-error.patch: Index: evince-0.6.0-print-error.patch =================================================================== RCS file: /cvs/pkgs/rpms/evince/devel/evince-0.6.0-print-error.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evince-0.6.0-print-error.patch 22 Sep 2006 05:40:06 -0000 1.1 +++ evince-0.6.0-print-error.patch 17 Jul 2008 20:37:52 -0000 1.2 @@ -1,6 +1,7 @@ ---- evince-0.6.0/shell/ev-window.c.print-error 2006-09-22 01:32:59.000000000 -0400 -+++ evince-0.6.0/shell/ev-window.c 2006-09-22 01:33:35.000000000 -0400 -@@ -1373,6 +1373,8 @@ +diff -up evince-2.23.4/shell/ev-window.c.print-error evince-2.23.4/shell/ev-window.c +--- evince-2.23.4/shell/ev-window.c.print-error 2008-06-16 16:10:20.000000000 -0400 ++++ evince-2.23.4/shell/ev-window.c 2008-07-17 16:34:31.000000000 -0400 +@@ -2244,6 +2244,8 @@ ev_window_print_finished (GtkPrintJob *p if (error) { GtkWidget *dialog; @@ -9,12 +10,12 @@ dialog = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, -@@ -1383,6 +1385,8 @@ +@@ -2254,6 +2256,8 @@ ev_window_print_finished (GtkPrintJob *p gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); + + GDK_THREADS_LEAVE (); - } - } - + } else { + /* If printed successfully, save print settings */ + ev_application_set_print_settings (EV_APP, Index: evince.spec =================================================================== RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- evince.spec 19 Jun 2008 00:45:48 -0000 1.123 +++ evince.spec 17 Jul 2008 20:37:52 -0000 1.124 @@ -6,10 +6,10 @@ Name: evince Version: 2.23.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Document viewer -License: GPLv2+ and GFDL+ +License: GPLv2+ and GFDL Group: Applications/Publishing URL: http://www.gnome.org/projects/evince/ Source0: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2 @@ -229,6 +229,9 @@ %{_libdir}/evince/backends/djvudocument.evince-backend %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 2.23.4-2 +- fix license tag + * Wed Jun 18 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 From fedora-extras-commits at redhat.com Thu Jul 17 20:48:21 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Thu, 17 Jul 2008 20:48:21 GMT Subject: rpms/pixman/devel .cvsignore, 1.11, 1.12 pixman.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200807172048.m6HKmLGO027478@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/pixman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27431 Modified Files: .cvsignore pixman.spec sources Log Message: Upgrade to 0.11.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 25 Jun 2008 17:06:50 -0000 1.11 +++ .cvsignore 17 Jul 2008 20:47:22 -0000 1.12 @@ -3,3 +3,4 @@ pixman-0.11.2.tar.gz pixman-0.11.4.tar.gz pixman-0.11.6.tar.gz +pixman-0.11.8.tar.gz Index: pixman.spec =================================================================== RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pixman.spec 25 Jun 2008 17:06:50 -0000 1.17 +++ pixman.spec 17 Jul 2008 20:47:22 -0000 1.18 @@ -2,7 +2,7 @@ %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d Name: pixman -Version: 0.11.6 +Version: 0.11.8 Release: 1%{?dist} Summary: Pixel manipulation library @@ -16,8 +16,6 @@ Source1: make-pixman-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: pixman-0.11.4-altivec.patch - # BuildRequires: automake autoconf libtool pkgconfig %description @@ -34,7 +32,6 @@ %prep %setup -q -%patch0 -p1 -b .altivec %build %configure --disable-static @@ -64,6 +61,9 @@ %{_libdir}/pkgconfig/pixman-1.pc %changelog +* Thu Jul 17 2008 Soren Sandmann 0.11.8-1 +- Upgrade to 0.11.8. Drop altivec patch. + * Wed Jun 25 2008 Soren Sandmann 0.11.6-1 - Upgrade to 0.11.6. Drop fix for leak. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 25 Jun 2008 17:06:50 -0000 1.11 +++ sources 17 Jul 2008 20:47:22 -0000 1.12 @@ -1 +1,2 @@ 1b404bb31bf419a86531927492b5b95d pixman-0.11.6.tar.gz +7b5db768c51337b5e5e954fc9c961cd3 pixman-0.11.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 20:49:00 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Thu, 17 Jul 2008 20:49:00 GMT Subject: rpms/xenner/devel xenner-smp64.diff,NONE,1.1 xenner.spec,1.24,1.25 Message-ID: <200807172049.m6HKn0Lt027556@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471 Modified Files: xenner.spec Added Files: xenner-smp64.diff Log Message: fix smp on 64-bit xenner-smp64.diff: --- NEW FILE xenner-smp64.diff --- Index: emu64.S =================================================================== RCS file: /home/cvsroot/xenner/emu64.S,v retrieving revision 1.37 diff -u -p -r1.37 emu64.S --- emu64.S 14 Jul 2008 13:15:45 -0000 1.37 +++ emu64.S 17 Jul 2008 20:44:23 -0000 @@ -267,7 +267,8 @@ ENTRY(broken_memcpy_pf) .code16 .align 4096 ENTRY(sipi) - out %al, $0xe2 + mov $0x00060000, %eax /* EMUDEV_CMD_INIT_SECONDARY_VCPU */ + outl %eax, $0xe8 /* EMUDEV_REG_COMMAND */ hlt .code64 Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xenner.spec 17 Jul 2008 20:02:46 -0000 1.24 +++ xenner.spec 17 Jul 2008 20:48:13 -0000 1.25 @@ -1,10 +1,11 @@ Name: xenner License: GPLv2+ Version: 0.40 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source0: %{name}-%{version}.tar.gz +Patch0: %{name}-smp64.diff URL: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz Requires: xen-runtime Provides: xen-hypervisor-abi = 3.2 @@ -23,6 +24,7 @@ %prep %setup -q +%patch0 -p0 %build export CFLAGS="%{optflags}" @@ -57,6 +59,8 @@ rm -rf %{buildroot} %changelog +* Thu Jul 17 2008 Gerd Hoffmann - 0.40-2.fc10 +- fix smp on 64-bit. * Thu Jul 17 2008 Gerd Hoffmann - 0.40-1.fc10 - update to version 0.40 * rework xenner <=> emu interfaces. From fedora-extras-commits at redhat.com Thu Jul 17 20:49:54 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Thu, 17 Jul 2008 20:49:54 GMT Subject: rpms/facter/devel facter.spec,1.8,1.9 Message-ID: <200807172049.m6HKnsJV027696@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/facter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27551 Modified Files: facter.spec Log Message: Change mkdir in install to mkdir -p Index: facter.spec =================================================================== RCS file: /cvs/pkgs/rpms/facter/devel/facter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- facter.spec 17 Jul 2008 20:29:40 -0000 1.8 +++ facter.spec 17 Jul 2008 20:48:56 -0000 1.9 @@ -6,7 +6,7 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter @@ -36,7 +36,7 @@ %install rm -rf %{buildroot} -mkdir %{buildroot} +mkdir -p %{buildroot} %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter @@ -64,6 +64,9 @@ %changelog +* Thu Jul 17 2008 David Lutterkort - 1.5.0-3 +- Change 'mkdir' in install to 'mkdir -p' + * Thu Jul 17 2008 David Lutterkort - 1.5.0-2 - Remove files that were listed twice in files section From fedora-extras-commits at redhat.com Thu Jul 17 20:58:09 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Thu, 17 Jul 2008 20:58:09 GMT Subject: rpms/xenner/F-9 xenner-smp64.diff,NONE,1.1 xenner.spec,1.18,1.19 Message-ID: <200807172058.m6HKw9mG028088@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28012 Modified Files: xenner.spec Added Files: xenner-smp64.diff Log Message: fix smp on 64-bit xenner-smp64.diff: --- NEW FILE xenner-smp64.diff --- Index: emu64.S =================================================================== RCS file: /home/cvsroot/xenner/emu64.S,v retrieving revision 1.37 diff -u -p -r1.37 emu64.S --- emu64.S 14 Jul 2008 13:15:45 -0000 1.37 +++ emu64.S 17 Jul 2008 20:44:23 -0000 @@ -267,7 +267,8 @@ ENTRY(broken_memcpy_pf) .code16 .align 4096 ENTRY(sipi) - out %al, $0xe2 + mov $0x00060000, %eax /* EMUDEV_CMD_INIT_SECONDARY_VCPU */ + outl %eax, $0xe8 /* EMUDEV_REG_COMMAND */ hlt .code64 Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-9/xenner.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xenner.spec 17 Jul 2008 20:01:13 -0000 1.18 +++ xenner.spec 17 Jul 2008 20:57:25 -0000 1.19 @@ -1,10 +1,11 @@ Name: xenner License: GPLv2+ Version: 0.40 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source: %{name}-%{version}.tar.gz +Patch0: %{name}-smp64.diff URL: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz Requires: xen-runtime Provides: xen-hypervisor-abi = 3.2 @@ -23,6 +24,7 @@ %prep %setup -q +%patch0 -p0 %build export CFLAGS="%{optflags}" @@ -57,6 +59,8 @@ rm -rf %{buildroot} %changelog +* Thu Jul 17 2008 Gerd Hoffmann - 0.40-2.fc9 +- fix smp on 64-bit. * Thu Jul 17 2008 Gerd Hoffmann - 0.40-1.fc9 - update to version 0.40 - fix opensuse 11 and recent pv_ops kernels. From fedora-extras-commits at redhat.com Thu Jul 17 20:58:13 2008 From: fedora-extras-commits at redhat.com (Gerd Hoffmann (kraxel)) Date: Thu, 17 Jul 2008 20:58:13 GMT Subject: rpms/xenner/F-8 xenner-smp64.diff,NONE,1.1 xenner.spec,1.7,1.8 Message-ID: <200807172058.m6HKwDeN028094@cvs-int.fedora.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28020 Modified Files: xenner.spec Added Files: xenner-smp64.diff Log Message: fix smp on 64-bit xenner-smp64.diff: --- NEW FILE xenner-smp64.diff --- Index: emu64.S =================================================================== RCS file: /home/cvsroot/xenner/emu64.S,v retrieving revision 1.37 diff -u -p -r1.37 emu64.S --- emu64.S 14 Jul 2008 13:15:45 -0000 1.37 +++ emu64.S 17 Jul 2008 20:44:23 -0000 @@ -267,7 +267,8 @@ ENTRY(broken_memcpy_pf) .code16 .align 4096 ENTRY(sipi) - out %al, $0xe2 + mov $0x00060000, %eax /* EMUDEV_CMD_INIT_SECONDARY_VCPU */ + outl %eax, $0xe8 /* EMUDEV_REG_COMMAND */ hlt .code64 Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/F-8/xenner.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xenner.spec 17 Jul 2008 20:16:55 -0000 1.7 +++ xenner.spec 17 Jul 2008 20:57:29 -0000 1.8 @@ -1,10 +1,11 @@ Name: xenner License: GPLv2+ Version: 0.40 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source: %{name}-%{version}.tar.gz +Patch0: %{name}-smp64.diff URL: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz Requires: xen Buildroot: %{_tmppath}/root-%{name}-%{version}-%{release} @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 -p0 %build export CFLAGS="%{optflags}" @@ -56,6 +58,8 @@ rm -rf %{buildroot} %changelog +* Thu Jul 17 2008 Gerd Hoffmann - 0.40-2.fc8 +- fix smp on 64-bit. * Thu Jul 17 2008 Gerd Hoffmann - 0.40-1.fc8 - update to version 0.40 - fix opensuse 11 and recent pv_ops kernels. From fedora-extras-commits at redhat.com Thu Jul 17 21:59:08 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 17 Jul 2008 21:59:08 GMT Subject: comps/po nl.po,1.13,1.14 Message-ID: <200807172159.m6HLx8nZ005315@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5217/po Modified Files: nl.po Log Message: 2008-07-17 Peter van Egdom (via peterve at fedoraproject.org) * po/nl.po: Updated Dutch translation. Index: nl.po =================================================================== RCS file: /cvs/pkgs/comps/po/nl.po,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nl.po 17 Jul 2008 18:31:24 -0000 1.13 +++ nl.po 17 Jul 2008 21:58:36 -0000 1.14 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: comps-po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2008-06-14 15:44+0200\n" +"POT-Creation-Date: 2008-07-17 19:10+0000\n" +"PO-Revision-Date: 2008-07-17 22:16+0200\n" "Last-Translator: Peter van Egdom \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -1174,7 +1174,7 @@ #: ../comps-f10.xml.in.h:70 msgid "Haskell" -msgstr "" +msgstr "Haskell" #: ../comps-f10.xml.in.h:76 msgid "Input Methods" @@ -1185,9 +1185,8 @@ msgstr "Invoermethode pakketten voor het invoeren van internationale tekst." #: ../comps-f10.xml.in.h:157 -#, fuzzy msgid "Tajik Support" -msgstr "Ondersteuning voor Thai" +msgstr "Ondersteuning voor Tajiki" #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" From fedora-extras-commits at redhat.com Thu Jul 17 22:08:11 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 17 Jul 2008 22:08:11 GMT Subject: rpms/ktechlab/devel ktechlab-0.3.69-gcc43.patch, NONE, 1.1 ktechlab-0.3.6-gcc42.patch, 1.1, 1.2 ktechlab.spec, 1.20, 1.21 Message-ID: <200807172208.m6HM8B86013127@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/ktechlab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13000 Modified Files: ktechlab-0.3.6-gcc42.patch ktechlab.spec Added Files: ktechlab-0.3.69-gcc43.patch Log Message: * Thu Jul 17 2008 Kevin Kofler - 0.3.69-8 - fix gcc42 patch to actually apply (remove hunk already applied in 0.3.69) - adapt Debian g++ 4.3 patch by Georges Khaznadar ktechlab-0.3.69-gcc43.patch: --- NEW FILE ktechlab-0.3.69-gcc43.patch --- diff -ur ktechlab-0.3.69/src/cnitem.cpp ktechlab-0.3.69-gcc43/src/cnitem.cpp --- ktechlab-0.3.69/src/cnitem.cpp 2007-06-26 00:27:12.000000000 +0200 +++ ktechlab-0.3.69-gcc43/src/cnitem.cpp 2008-07-18 00:01:32.000000000 +0200 @@ -59,8 +59,8 @@ bool CNItem::preResize( QRect sizeRect ) { - if ( (std::abs(sizeRect.width()) < minimumSize().width()) || - (std::abs(sizeRect.height()) < minimumSize().height()) ) + if ( (std::abs((double)sizeRect.width()) < minimumSize().width()) || + (std::abs((double)sizeRect.height()) < minimumSize().height()) ) return false; updateConnectorPoints(false); diff -ur ktechlab-0.3.69/src/conrouter.cpp ktechlab-0.3.69-gcc43/src/conrouter.cpp --- ktechlab-0.3.69/src/conrouter.cpp 2007-06-26 00:27:12.000000000 +0200 +++ ktechlab-0.3.69-gcc43/src/conrouter.cpp 2008-07-18 00:04:44.000000000 +0200 @@ -454,7 +454,7 @@ { for ( int x = start; x!=end; x+=dd ) { - if ( std::abs(x-start)>1 && std::abs(x-end)>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) ) + if ( std::abs((double)(x-start))>1 && std::abs((double)(x-end))>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) ) { return false; } else { @@ -466,7 +466,7 @@ { for ( int y = start; y!=end; y+=dd ) { - if ( std::abs(y-start)>1 && std::abs(y-end)>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) ) + if ( std::abs((double)(y-start))>1 && std::abs((double)(y-end))>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) ) { return false; } else { diff -ur ktechlab-0.3.69/src/electronics/simulation/matrix.cpp ktechlab-0.3.69-gcc43/src/electronics/simulation/matrix.cpp --- ktechlab-0.3.69/src/electronics/simulation/matrix.cpp 2007-06-26 00:27:07.000000000 +0200 +++ ktechlab-0.3.69-gcc43/src/electronics/simulation/matrix.cpp 2008-07-18 00:01:32.000000000 +0200 @@ -288,7 +288,7 @@ Map::Map( const uint size ) { m_size = size; - m_map = new ETMap( m_size, m_size ); + m_map = new ETMap( m_size ); reset(); } diff -ur ktechlab-0.3.69/src/nodegroup.cpp ktechlab-0.3.69-gcc43/src/nodegroup.cpp --- ktechlab-0.3.69/src/nodegroup.cpp 2007-06-26 00:27:12.000000000 +0200 +++ ktechlab-0.3.69-gcc43/src/nodegroup.cpp 2008-07-18 00:01:32.000000000 +0200 @@ -16,6 +16,7 @@ #include #include +#include NodeGroup::NodeGroup( ICNDocument *icnDocument, const char *name ) : QObject( icnDocument, name ) @@ -274,7 +275,7 @@ { if ( *it1 != *it2 && (*it1)->y() == (*it2)->y() && canRoute( *it1, *it2 ) ) { - const int distance = std::abs(int( (*it1)->x()-(*it2)->x() )); + const int distance = std::abs((double)( (*it1)->x()-(*it2)->x() )); if ( distance < shortest ) { shortest = distance; @@ -296,7 +297,7 @@ { if ( *it1 != *it2 && (*it1)->x() == (*it2)->x() && canRoute( *it1, *it2 ) ) { - const int distance = std::abs(int( (*it1)->y()-(*it2)->y() )); + const int distance = std::abs((double)( (*it1)->y()-(*it2)->y() )); if ( distance < shortest ) { shortest = distance; @@ -320,7 +321,7 @@ { const int dx = (int)((*it1)->x()-(*it2)->x()); const int dy = (int)((*it1)->y()-(*it2)->y()); - const int distance = std::abs(dx) + std::abs(dy); + const int distance = std::abs((double)dx) + std::abs((double)dy); if ( distance < shortest ) { shortest = distance; ktechlab-0.3.6-gcc42.patch: Index: ktechlab-0.3.6-gcc42.patch =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/devel/ktechlab-0.3.6-gcc42.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ktechlab-0.3.6-gcc42.patch 26 Feb 2008 10:23:55 -0000 1.1 +++ ktechlab-0.3.6-gcc42.patch 17 Jul 2008 22:07:38 -0000 1.2 @@ -10,12 +10,3 @@ /** * @returns A pointer to the canvas */ -@@ -215,7 +215,7 @@ - * Set the given QCanvasItem (which will attempt to be casted to known - * items to be deleted. - */ -- virtual void appendDeleteList( QCanvasItem * ) = 0l; -+ virtual void appendDeleteList( QCanvasItem * ) = 0; - /** - * Save the current state of the document to the undo/redo history. - * @param actionTicket if this is non-negative, and the last state save Index: ktechlab.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/devel/ktechlab.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ktechlab.spec 26 Feb 2008 10:12:13 -0000 1.20 +++ ktechlab.spec 17 Jul 2008 22:07:38 -0000 1.21 @@ -1,6 +1,6 @@ Name: ktechlab Version: 0.3.69 -Release: 7%{?dist} +Release: 8%{?dist} # revision checkout 18 with chitlesh's enhancements that upstream # haven't added since 2 months Summary: Development and simulation of microcontrollers and electronic circuits @@ -14,6 +14,7 @@ Patch0: ktechlab-0.3.6-multilib.patch Patch1: ktechlab-bugfix.diff Patch2: ktechlab-0.3.6-gcc42.patch +Patch3: ktechlab-0.3.69-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,7 +47,8 @@ %patch0 -p0 -b .multilib %patch1 -p0 -b .bugfix -%patch2 -p0 -b .gcc42 +%patch2 -p1 -b .gcc42 +%patch3 -p1 -b .gcc43 %build @@ -112,6 +114,10 @@ %Changelog +* Thu Jul 17 2008 Kevin Kofler - 0.3.69-8 +- fix gcc42 patch to actually apply (remove hunk already applied in 0.3.69) +- adapt Debian g++ 4.3 patch by Georges Khaznadar + * Mon Feb 25 2008 Chitlesh Goorah - 0.3.69-7 - fixed for KDE4 From fedora-extras-commits at redhat.com Thu Jul 17 22:12:52 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 17 Jul 2008 22:12:52 GMT Subject: rpms/eclipse/devel eclipse.spec,1.536,1.537 Message-ID: <200807172212.m6HMCqfU013925@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13885 Modified Files: eclipse.spec Log Message: * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package - Do crazy config.ini, bundles.info, and *.profile shuffling - Add post and postun sections to update the config.ini, bundles.info, and *.profile files From fedora-extras-commits at redhat.com Thu Jul 17 22:13:15 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 17 Jul 2008 22:13:15 GMT Subject: rpms/eclipse/devel eclipse-copy-JDT.sh, NONE, 1.1 eclipse-copy-Platform.sh, NONE, 1.1 eclipse-updateSymlinks.sh, NONE, 1.1 Message-ID: <200807172213.m6HMDF3j014024@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13963 Added Files: eclipse-copy-JDT.sh eclipse-copy-Platform.sh eclipse-updateSymlinks.sh Log Message: * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package - Do crazy config.ini, bundles.info, and *.profile shuffling - Add post and postun sections to update the config.ini, bundles.info, and *.profile files --- NEW FILE eclipse-copy-JDT.sh --- #!/bin/sh baseDir=$1 mkdir -p features plugins cp -rp $baseDir/about* . cp -rp $baseDir/configuration/ . cp -rp $baseDir/eclipse{,.ini} . cp -rp $baseDir/.eclipseproduct . cp -rp $baseDir/epl-v10.html . cp -rp $baseDir/notice.html . cp -rp $baseDir/readme/ . cp -rp $baseDir/features/org.eclipse.platform_* features cp -rp $baseDir/features/org.eclipse.help_* features cp -rp $baseDir/features/org.eclipse.equinox.p2.user.ui_* features cp -rp $baseDir/plugins/*linux* plugins cp -rp $baseDir/plugins/com.jcraft.jsch_* plugins cp -rp $baseDir/plugins/org.eclipse.compare_* plugins cp -rp $baseDir/plugins/org.eclipse.core.boot_* plugins cp -rp $baseDir/plugins/org.eclipse.core.filebuffers_* plugins cp -rp $baseDir/plugins/org.eclipse.core.filesystem_* plugins cp -rp $baseDir/plugins/org.eclipse.core.net_* plugins cp -rp $baseDir/plugins/org.eclipse.core.resources_* plugins cp -rp $baseDir/plugins/org.eclipse.core.resources.compatibility_* plugins cp -rp $baseDir/plugins/org.eclipse.osgi.util_* plugins cp -rp $baseDir/plugins/org.eclipse.debug.core_* plugins cp -rp $baseDir/plugins/org.eclipse.debug.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.help.appserver_* plugins cp -rp $baseDir/plugins/org.eclipse.ltk.core.refactoring_* plugins cp -rp $baseDir/plugins/org.eclipse.ltk.ui.refactoring_* plugins cp -rp $baseDir/plugins/org.eclipse.platform_* plugins cp -rp $baseDir/plugins/org.eclipse.platform.doc.user_* plugins cp -rp $baseDir/plugins/org.eclipse.search_* plugins cp -rp $baseDir/plugins/org.eclipse.team.core_* plugins cp -rp $baseDir/plugins/org.eclipse.team.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.text_* plugins cp -rp $baseDir/plugins/org.eclipse.jface.text_* plugins cp -rp $baseDir/plugins/org.eclipse.jsch.core_* plugins cp -rp $baseDir/plugins/org.eclipse.jsch.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.console_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.presentations.r21_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.intro_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.intro.universal_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.cheatsheets_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.browser_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.navigator_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.navigator.resources_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.net_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.workbench.texteditor_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.views_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.editors_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.externaltools_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.ide_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.ide.application_* plugins cp -rp $baseDir/plugins/org.eclipse.update.core_* plugins cp -rp $baseDir/plugins/org.eclipse.update.scheduler_* plugins cp -rp $baseDir/plugins/org.eclipse.update.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.workbench.compatibility_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.views.properties.tabbed_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.security_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.security.ui_* plugins cp -rp $baseDir/features/org.eclipse.rcp_* features cp -rp $baseDir/plugins/com.ibm.icu_* plugins cp -rp $baseDir/plugins/org.eclipse.core.commands_* plugins cp -rp $baseDir/plugins/org.eclipse.core.databinding_* plugins cp -rp $baseDir/plugins/org.eclipse.core.databinding.beans_* plugins cp -rp $baseDir/plugins/org.eclipse.core.jobs_* plugins cp -rp $baseDir/plugins/org.eclipse.core.expressions_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.auth_* plugins cp -rp $baseDir/plugins/org.eclipse.osgi_* plugins cp -rp $baseDir/plugins/org.eclipse.help_* plugins cp -rp $baseDir/plugins/org.eclipse.swt_* plugins cp -rp $baseDir/plugins/org.eclipse.jface_* plugins cp -rp $baseDir/plugins/org.eclipse.jface.databinding_* plugins cp -rp $baseDir/plugins/org.eclipse.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.workbench_* plugins cp -rp $baseDir/plugins/org.eclipse.update.configurator_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator_* plugins cp -rp $baseDir/plugins/org.eclipse.rcp_* plugins cp -rp $baseDir/plugins/org.eclipse.core.contenttype_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.app_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.common_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.preferences_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.launcher_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.core.variables_* plugins cp -rp $baseDir/plugins/javax.servlet_* plugins cp -rp $baseDir/plugins/javax.servlet.jsp_* plugins cp -rp $baseDir/plugins/org.apache.ant_* plugins cp -rp $baseDir/plugins/org.apache.commons.el_* plugins cp -rp $baseDir/plugins/org.apache.commons.logging_* plugins cp -rp $baseDir/plugins/org.apache.jasper_* plugins cp -rp $baseDir/plugins/org.apache.lucene_* plugins cp -rp $baseDir/plugins/org.apache.lucene.analysis_* plugins cp -rp $baseDir/plugins/org.eclipse.ant.core_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.filetransfer_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.identity_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.ssl_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin.equinox_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.http.jetty_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.http.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.http.servlet_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.artifact.repository_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.console_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.core_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director.app_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.directorywatcher_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.engine_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.exemplarysetup_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.extensionlocation_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.garbagecollector_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.jarprocessor_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.reconciler.dropins_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatesite_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* plugins cp -rp $baseDir/plugins/org.eclipse.help.base_* plugins cp -rp $baseDir/plugins/org.eclipse.help.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.help.webapp_* plugins cp -rp $baseDir/plugins/org.eclipse.osgi.services_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.forms_* plugins cp -rp $baseDir/plugins/org.mortbay.jetty_* plugins cp -rp $baseDir/plugins/org.sat4j.core_* plugins cp -rp $baseDir/plugins/org.sat4j.pb_* plugins cp -rp $baseDir/plugins/org.eclipse.jdt* plugins cp -rp $baseDir/plugins/org.eclipse.ant.ui_* plugins cp -rp $baseDir/plugins/org.junit_* plugins cp -rp $baseDir/plugins/org.junit4_* plugins rm -rf plugins/*.source_* sed -i 's/org.eclipse.sdk.ide/org.eclipse.platform.ide/' configuration/config.ini --- NEW FILE eclipse-copy-Platform.sh --- #!/bin/sh baseDir=$1 mkdir -p features plugins cp -rp $baseDir/about* . cp -rp $baseDir/configuration/ . cp -rp $baseDir/eclipse{,.ini} . cp -rp $baseDir/.eclipseproduct . cp -rp $baseDir/epl-v10.html . cp -rp $baseDir/notice.html . cp -rp $baseDir/readme/ . cp -rp $baseDir/features/org.eclipse.platform_* features cp -rp $baseDir/features/org.eclipse.help_* features cp -rp $baseDir/features/org.eclipse.equinox.p2.user.ui_* features cp -rp $baseDir/plugins/*linux* plugins cp -rp $baseDir/plugins/com.jcraft.jsch_* plugins cp -rp $baseDir/plugins/org.eclipse.compare_* plugins cp -rp $baseDir/plugins/org.eclipse.core.boot_* plugins cp -rp $baseDir/plugins/org.eclipse.core.filebuffers_* plugins cp -rp $baseDir/plugins/org.eclipse.core.filesystem_* plugins cp -rp $baseDir/plugins/org.eclipse.core.net_* plugins cp -rp $baseDir/plugins/org.eclipse.core.resources_* plugins cp -rp $baseDir/plugins/org.eclipse.core.resources.compatibility_* plugins cp -rp $baseDir/plugins/org.eclipse.osgi.util_* plugins cp -rp $baseDir/plugins/org.eclipse.debug.core_* plugins cp -rp $baseDir/plugins/org.eclipse.debug.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.help.appserver_* plugins cp -rp $baseDir/plugins/org.eclipse.ltk.core.refactoring_* plugins cp -rp $baseDir/plugins/org.eclipse.ltk.ui.refactoring_* plugins cp -rp $baseDir/plugins/org.eclipse.platform_* plugins cp -rp $baseDir/plugins/org.eclipse.platform.doc.user_* plugins cp -rp $baseDir/plugins/org.eclipse.search_* plugins cp -rp $baseDir/plugins/org.eclipse.team.core_* plugins cp -rp $baseDir/plugins/org.eclipse.team.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.text_* plugins cp -rp $baseDir/plugins/org.eclipse.jface.text_* plugins cp -rp $baseDir/plugins/org.eclipse.jsch.core_* plugins cp -rp $baseDir/plugins/org.eclipse.jsch.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.console_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.presentations.r21_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.intro_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.intro.universal_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.cheatsheets_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.browser_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.navigator_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.navigator.resources_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.net_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.workbench.texteditor_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.views_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.editors_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.externaltools_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.ide_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.ide.application_* plugins cp -rp $baseDir/plugins/org.eclipse.update.core_* plugins cp -rp $baseDir/plugins/org.eclipse.update.scheduler_* plugins cp -rp $baseDir/plugins/org.eclipse.update.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.workbench.compatibility_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.views.properties.tabbed_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.security_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.security.ui_* plugins cp -rp $baseDir/features/org.eclipse.rcp_* features cp -rp $baseDir/plugins/com.ibm.icu_* plugins cp -rp $baseDir/plugins/org.eclipse.core.commands_* plugins cp -rp $baseDir/plugins/org.eclipse.core.databinding_* plugins cp -rp $baseDir/plugins/org.eclipse.core.databinding.beans_* plugins cp -rp $baseDir/plugins/org.eclipse.core.jobs_* plugins cp -rp $baseDir/plugins/org.eclipse.core.expressions_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.auth_* plugins cp -rp $baseDir/plugins/org.eclipse.osgi_* plugins cp -rp $baseDir/plugins/org.eclipse.help_* plugins cp -rp $baseDir/plugins/org.eclipse.swt_* plugins cp -rp $baseDir/plugins/org.eclipse.jface_* plugins cp -rp $baseDir/plugins/org.eclipse.jface.databinding_* plugins cp -rp $baseDir/plugins/org.eclipse.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.workbench_* plugins cp -rp $baseDir/plugins/org.eclipse.update.configurator_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator_* plugins cp -rp $baseDir/plugins/org.eclipse.rcp_* plugins cp -rp $baseDir/plugins/org.eclipse.core.contenttype_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.app_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.common_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.preferences_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.launcher_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.core.variables_* plugins cp -rp $baseDir/plugins/javax.servlet_* plugins cp -rp $baseDir/plugins/javax.servlet.jsp_* plugins cp -rp $baseDir/plugins/org.apache.ant_* plugins cp -rp $baseDir/plugins/org.apache.commons.el_* plugins cp -rp $baseDir/plugins/org.apache.commons.logging_* plugins cp -rp $baseDir/plugins/org.apache.jasper_* plugins cp -rp $baseDir/plugins/org.apache.lucene_* plugins cp -rp $baseDir/plugins/org.apache.lucene.analysis_* plugins cp -rp $baseDir/plugins/org.eclipse.ant.core_* plugins cp -rp $baseDir/plugins/org.eclipse.core.runtime.compatibility_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.filetransfer_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.identity_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* plugins cp -rp $baseDir/plugins/org.eclipse.ecf.ssl_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.frameworkadmin.equinox_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.http.jetty_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.http.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.http.servlet_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.jsp.jasper.registry_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.artifact.repository_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.console_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.core_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.director.app_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.directorywatcher_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.engine_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.exemplarysetup_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.extensionlocation_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.garbagecollector_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.jarprocessor_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.reconciler.dropins_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.p2.updatesite_* plugins cp -rp $baseDir/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* plugins cp -rp $baseDir/plugins/org.eclipse.help.base_* plugins cp -rp $baseDir/plugins/org.eclipse.help.ui_* plugins cp -rp $baseDir/plugins/org.eclipse.help.webapp_* plugins cp -rp $baseDir/plugins/org.eclipse.osgi.services_* plugins cp -rp $baseDir/plugins/org.eclipse.ui.forms_* plugins cp -rp $baseDir/plugins/org.mortbay.jetty_* plugins cp -rp $baseDir/plugins/org.sat4j.core_* plugins cp -rp $baseDir/plugins/org.sat4j.pb_* plugins sed -i 's/org.eclipse.sdk.ide/org.eclipse.platform.ide/' configuration/config.ini --- NEW FILE eclipse-updateSymlinks.sh --- #!/bin/sh pushd @INSTALLDIR@/configuration rm org.eclipse.equinox.simpleconfigurator/bundles.info biggest=$(ls -1 bundleInfos/ | tail -n 1) ln -s $biggest org.eclipse.equinox.simpleconfigurator/bundles.info rm config.ini biggest=$(ls -1 configInis/ | tail -n 1) ln -s $biggest config.ini popd profilesDir=@INSTALLDIR@/profilesDir pushd @INSTALLDIR@/p2/org.eclipse.equinox.engine/profileRegistry rm -rf * biggest=$(ls -1 $profilesDir | tail -n 1) ln -s ../../../profilesDir/$biggest $(echo $biggest | cut -c 3-) popd From fedora-extras-commits at redhat.com Thu Jul 17 22:56:38 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 22:56:38 GMT Subject: rpms/liboggz/F-9 .cvsignore, 1.7, 1.8 liboggz.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200807172256.m6HMuc0D016561@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liboggz/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16439/F-9 Modified Files: .cvsignore liboggz.spec sources Log Message: Update F-{8,9} to liboggz-0.9.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2008 22:42:41 -0000 1.7 +++ .cvsignore 17 Jul 2008 22:55:47 -0000 1.8 @@ -1 +1 @@ -liboggz-0.9.7.tar.gz +liboggz-0.9.8.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/F-9/liboggz.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- liboggz.spec 21 May 2008 22:42:41 -0000 1.12 +++ liboggz.spec 17 Jul 2008 22:55:47 -0000 1.13 @@ -1,5 +1,5 @@ Name: liboggz -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams @@ -40,6 +40,9 @@ %configure make +%check +make check + %install rm -rf $RPM_BUILD_ROOT %makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} @@ -75,6 +78,9 @@ %postun -p /sbin/ldconfig %changelog +* Mon Jul 7 2008 Michel Alexandre Salim - 0.9.8-1 +- Update to 0.9.8 + * Wed May 21 2008 Michel Salim - 0.9.7-1 - Update to 0.9.7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2008 22:42:41 -0000 1.7 +++ sources 17 Jul 2008 22:55:47 -0000 1.8 @@ -1 +1 @@ -229ed2bfa6ee687e2397676a14c8dd39 liboggz-0.9.7.tar.gz +e25a5d76f71c4300f313280d5e471a76 liboggz-0.9.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 22:56:47 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 22:56:47 GMT Subject: rpms/liboggz/F-8 .cvsignore, 1.7, 1.8 liboggz.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200807172256.m6HMulWK016568@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liboggz/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16439/F-8 Modified Files: .cvsignore liboggz.spec sources Log Message: Update F-{8,9} to liboggz-0.9.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2008 22:42:26 -0000 1.7 +++ .cvsignore 17 Jul 2008 22:55:29 -0000 1.8 @@ -1 +1 @@ -liboggz-0.9.7.tar.gz +liboggz-0.9.8.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/F-8/liboggz.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- liboggz.spec 21 May 2008 22:42:26 -0000 1.11 +++ liboggz.spec 17 Jul 2008 22:55:29 -0000 1.12 @@ -1,5 +1,5 @@ Name: liboggz -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams @@ -40,6 +40,9 @@ %configure make +%check +make check + %install rm -rf $RPM_BUILD_ROOT %makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} @@ -75,6 +78,9 @@ %postun -p /sbin/ldconfig %changelog +* Mon Jul 7 2008 Michel Alexandre Salim - 0.9.8-1 +- Update to 0.9.8 + * Wed May 21 2008 Michel Salim - 0.9.7-1 - Update to 0.9.7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2008 22:42:26 -0000 1.7 +++ sources 17 Jul 2008 22:55:29 -0000 1.8 @@ -1 +1 @@ -229ed2bfa6ee687e2397676a14c8dd39 liboggz-0.9.7.tar.gz +e25a5d76f71c4300f313280d5e471a76 liboggz-0.9.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 17 22:57:06 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 22:57:06 GMT Subject: rpms/liboggz/devel liboggz.spec,1.13,1.14 Message-ID: <200807172257.m6HMv6Be016582@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liboggz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16439/devel Modified Files: liboggz.spec Log Message: Update F-{8,9} to liboggz-0.9.8 Index: liboggz.spec =================================================================== RCS file: /cvs/pkgs/rpms/liboggz/devel/liboggz.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- liboggz.spec 7 Jul 2008 08:05:07 -0000 1.13 +++ liboggz.spec 17 Jul 2008 22:56:09 -0000 1.14 @@ -81,7 +81,7 @@ * Mon Jul 7 2008 Michel Alexandre Salim - 0.9.8-1 - Update to 0.9.8 -* Wed May 21 2008 Michel Salim - 0.9.7-1 +* Wed May 21 2008 Michel Alexandre Salim - 0.9.7-1 - Update to 0.9.7 * Wed Feb 20 2008 Fedora Release Engineering - 0.9.5-2 From fedora-extras-commits at redhat.com Thu Jul 17 23:40:39 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 23:40:39 GMT Subject: rpms/vamp-plugin-sdk/devel vamp-plugin-sdk-1.3-mk.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vamp-plugin-sdk.spec, 1.2, 1.3 vamp-plugin-sdk-1.1b-Makefile.patch, 1.1, NONE vamp-plugin-sdk-1.1b-gcc43.patch, 1.1, NONE Message-ID: <200807172340.m6HNedJK024713@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vamp-plugin-sdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24677 Modified Files: .cvsignore sources vamp-plugin-sdk.spec Added Files: vamp-plugin-sdk-1.3-mk.patch Removed Files: vamp-plugin-sdk-1.1b-Makefile.patch vamp-plugin-sdk-1.1b-gcc43.patch Log Message: * Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 - Update to 1.3 vamp-plugin-sdk-1.3-mk.patch: --- NEW FILE vamp-plugin-sdk-1.3-mk.patch --- --- vamp-plugin-sdk-1.3/Makefile.mk 2008-07-09 06:42:49.000000000 -0400 +++ vamp-plugin-sdk-1.3/Makefile 2008-07-17 18:21:02.000000000 -0400 @@ -28,7 +28,7 @@ # Compile flags # -CXXFLAGS := $(CXXFLAGS) -O2 -Wall -I. -fPIC +CXXFLAGS := $(CXXFLAGS) -I. -fPIC # ar, ranlib # @@ -40,8 +40,8 @@ # because our plugin exposes only a C API so there are no boundary # compatibility problems.) # -#PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a -PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a) +PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a +#PLUGIN_LIBS = $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a) # File extension for a dynamically loadable object # @@ -58,10 +58,11 @@ # have to use "make install". # INSTALL_PREFIX := /usr/local +LIB := /lib INSTALL_API_HEADERS := $(INSTALL_PREFIX)/include/vamp INSTALL_SDK_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk INSTALL_HOSTEXT_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk/hostext -INSTALL_SDK_LIBS := $(INSTALL_PREFIX)/lib +INSTALL_SDK_LIBS := $(INSTALL_PREFIX)$(LIB) INSTALL_SDK_LIBNAME := libvamp-sdk.so.1.1.1 INSTALL_SDK_LINK_ABI := libvamp-sdk.so.1 @@ -75,7 +76,7 @@ INSTALL_HOSTSDK_STATIC := libvamp-hostsdk.a INSTALL_HOSTSDK_LA := libvamp-hostsdk.la -INSTALL_PKGCONFIG := $(INSTALL_PREFIX)/lib/pkgconfig +INSTALL_PKGCONFIG := $(INSTALL_PREFIX)$(LIB)/pkgconfig # Flags required to tell the compiler to create a dynamically loadable object # Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vamp-plugin-sdk/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Jan 2008 14:25:56 -0000 1.2 +++ .cvsignore 17 Jul 2008 23:39:54 -0000 1.3 @@ -1 +1 @@ -vamp-plugin-sdk-1.1b.tar.gz +vamp-plugin-sdk-1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vamp-plugin-sdk/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Jan 2008 14:25:56 -0000 1.2 +++ sources 17 Jul 2008 23:39:54 -0000 1.3 @@ -1 +1 @@ -aeda086f10227e6ca473f714ac025807 vamp-plugin-sdk-1.1b.tar.gz +d0bc2c066776310631a02cd192735da7 vamp-plugin-sdk-1.3.tar.gz Index: vamp-plugin-sdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/vamp-plugin-sdk/devel/vamp-plugin-sdk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vamp-plugin-sdk.spec 31 Jan 2008 16:35:32 -0000 1.2 +++ vamp-plugin-sdk.spec 17 Jul 2008 23:39:54 -0000 1.3 @@ -1,14 +1,13 @@ Name: vamp-plugin-sdk -Version: 1.1b -Release: 4%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: An API for audio analysis and feature extraction plugins Group: System Environment/Libraries License: BSD URL: http://www.vamp-plugins.org/ Source0: http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-%{version}.tar.gz -Patch0: %{name}-1.1b-Makefile.patch -Patch1: %{name}-1.1b-gcc43.patch +Patch0: %{name}-1.3-mk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsndfile-devel @@ -39,9 +38,8 @@ %prep -%setup -q -n %{name}-v%{version} +%setup -q %patch0 -p1 -b .mk -%patch1 -p1 -b .gcc43 %build @@ -52,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT # fix libdir find . -name '*.pc.in' -exec sed -i 's|/lib|/%{_lib}|' {} ';' -make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} +make install DESTDIR=$RPM_BUILD_ROOT INSTALL_PREFIX=%{_prefix} LIB=/%{_lib} find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -98,6 +96,9 @@ %changelog +* Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 +- Update to 1.3 + * Thu Jan 31 2008 Michel Salim - 1.1b-4 - Add some #includes, needed due to GCC 4.3's header dependency cleanup --- vamp-plugin-sdk-1.1b-Makefile.patch DELETED --- --- vamp-plugin-sdk-1.1b-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 17 23:44:59 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 17 Jul 2008 23:44:59 GMT Subject: rpms/rubberband/devel rubberband-1.2-gcc43.patch, NONE, 1.1 rubberband-1.2-mk.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rubberband.spec, 1.1, 1.2 sources, 1.2, 1.3 rubberband-1.0.1-destdir.patch, 1.1, NONE rubberband-1.0.1-gcc43.patch, 1.1, NONE Message-ID: <200807172344.m6HNixHd024969@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/rubberband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24927 Modified Files: .cvsignore rubberband.spec sources Added Files: rubberband-1.2-gcc43.patch rubberband-1.2-mk.patch Removed Files: rubberband-1.0.1-destdir.patch rubberband-1.0.1-gcc43.patch Log Message: * Thu Jul 17 2008 Michel Alexandre Salim - 1.2-1 - Update to 1.2 rubberband-1.2-gcc43.patch: --- NEW FILE rubberband-1.2-gcc43.patch --- --- rubberband-1.2/src/sysutils.cpp.gcc43 2008-07-08 11:43:31.000000000 -0400 +++ rubberband-1.2/src/sysutils.cpp 2008-07-17 18:28:42.000000000 -0400 @@ -25,6 +25,7 @@ #endif /* !__APPLE__, !_WIN32 */ #endif /* !_WIN32 */ +#include #include rubberband-1.2-mk.patch: --- NEW FILE rubberband-1.2-mk.patch --- --- rubberband-1.2/Makefile.in.mk 2008-07-05 11:22:51.000000000 -0400 +++ rubberband-1.2/Makefile.in 2008-07-17 18:32:21.000000000 -0400 @@ -28,11 +28,11 @@ INSTALL_BINDIR := @prefix@/bin INSTALL_INCDIR := @prefix@/include/rubberband -INSTALL_LIBDIR := @prefix@/lib -INSTALL_VAMPDIR := @prefix@/lib/vamp -INSTALL_LADSPADIR := @prefix@/lib/ladspa +INSTALL_LIBDIR := @libdir@ +INSTALL_VAMPDIR := @libdir@/vamp +INSTALL_LADSPADIR := @libdir@/ladspa INSTALL_LRDFDIR := @prefix@/share/ladspa/rdf -INSTALL_PKGDIR := @prefix@/lib/pkgconfig +INSTALL_PKGDIR := @libdir@/pkgconfig all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET) @@ -138,17 +138,17 @@ $(MKDIR) -p $(DESTDIR)$(INSTALL_LADSPADIR) $(MKDIR) -p $(DESTDIR)$(INSTALL_LRDFDIR) $(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR) - cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR) - cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR) - cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR) + cp -p $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR) + cp -p $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR) + cp -p $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR) rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION) rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME) - cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) + cp -p $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION) test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME) - cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) + cp -p $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) cp src/vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) - cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) + cp -p $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) cp src/ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR) cp src/ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR) sed "s,%PREFIX%, at prefix@," rubberband.pc.in \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubberband/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Apr 2008 04:10:25 -0000 1.2 +++ .cvsignore 17 Jul 2008 23:44:13 -0000 1.3 @@ -1 +1 @@ -rubberband-1.0.1.tar.bz2 +rubberband-1.2.tar.bz2 Index: rubberband.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubberband/devel/rubberband.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rubberband.spec 4 Apr 2008 04:10:25 -0000 1.1 +++ rubberband.spec 17 Jul 2008 23:44:13 -0000 1.2 @@ -1,5 +1,5 @@ Name: rubberband -Version: 1.0.1 +Version: 1.2 Release: 1%{?dist} Summary: Audio time-stretching and pitch-shifting library @@ -7,13 +7,13 @@ License: GPLv2+ URL: http://www.breakfastquay.com/rubberband/ Source0: http://www.breakfastquay.com/rubberband/files/rubberband-%{version}.tar.bz2 -Patch0: rubberband-1.0.1-gcc43.patch -Patch1: rubberband-1.0.1-destdir.patch +Patch0: rubberband-1.2-gcc43.patch +Patch1: rubberband-1.2-mk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fftw-devel libsamplerate-devel libsndfile-devel BuildRequires: ladspa-devel vamp-plugin-sdk-devel -#Requires: +Requires: ladspa %description Rubber Band is a library and utility program that permits you to change the @@ -34,7 +34,7 @@ %prep %setup -q %patch0 -p1 -b .gcc43 -%patch1 -p1 -b .destdir +%patch1 -p1 -b .mk %build @@ -63,6 +63,7 @@ %{_bindir}/rubberband %{_libdir}/*.so.* %{_libdir}/ladspa/ladspa-rubberband.* +%{_datadir}/ladspa/rdf/ladspa-rubberband.rdf %{_libdir}/vamp/vamp-rubberband.* %files devel @@ -75,6 +76,9 @@ %changelog +* Thu Jul 17 2008 Michel Alexandre Salim - 1.2-1 +- Update to 1.2 + * Sun Mar 30 2008 Michel Salim - 1.0.1-1 - Initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubberband/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Apr 2008 04:10:25 -0000 1.2 +++ sources 17 Jul 2008 23:44:13 -0000 1.3 @@ -1 +1 @@ -eb9524064ae48d6a3af0779590ff4ebc rubberband-1.0.1.tar.bz2 +9092a73906fd56c3e733fd955b802736 rubberband-1.2.tar.bz2 --- rubberband-1.0.1-destdir.patch DELETED --- --- rubberband-1.0.1-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 00:05:04 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Henrik_Nordstr=C3=B6m?= (hno)) Date: Fri, 18 Jul 2008 00:05:04 GMT Subject: rpms/tunctl/devel tunctl.spec,1.3,1.4 Message-ID: <200807180005.m6I0545t032165@cvs-int.fedora.redhat.com> Author: hno Update of /cvs/pkgs/rpms/tunctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32148 Modified Files: tunctl.spec Log Message: 1.5-2 with the spec fixes Index: tunctl.spec =================================================================== RCS file: /cvs/pkgs/rpms/tunctl/devel/tunctl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tunctl.spec 17 Jul 2008 09:31:56 -0000 1.3 +++ tunctl.spec 18 Jul 2008 00:04:21 -0000 1.4 @@ -1,6 +1,6 @@ Name: tunctl Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Create and remove virtual network interfaces Group: Applications/System @@ -41,6 +41,9 @@ %doc ChangeLog %changelog +* Thu Jul 18 2008 Henrik Nordstrom 1.5-2 +- Corrected package description formatting + * Wed Jul 16 2008 Henrik Nordstrom 1.5-1 - Update to version 1.5 based on separate upstream release From fedora-extras-commits at redhat.com Fri Jul 18 00:41:34 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Fri, 18 Jul 2008 00:41:34 GMT Subject: rpms/anaconda/devel .cvsignore, 1.548, 1.549 anaconda.spec, 1.690, 1.691 sources, 1.681, 1.682 Message-ID: <200807180041.m6I0fYCP001024@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv972 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.548 retrieving revision 1.549 diff -u -r1.548 -r1.549 --- .cvsignore 16 Jul 2008 03:40:11 -0000 1.548 +++ .cvsignore 18 Jul 2008 00:40:44 -0000 1.549 @@ -1,2 +1,3 @@ clog anaconda-11.4.1.15.tar.bz2 +anaconda-11.4.1.16.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.690 retrieving revision 1.691 diff -u -r1.690 -r1.691 --- anaconda.spec 16 Jul 2008 03:40:11 -0000 1.690 +++ anaconda.spec 18 Jul 2008 00:40:44 -0000 1.691 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.15 +Version: 11.4.1.16 Release: 1 License: GPLv2+ Group: Applications/System @@ -194,6 +194,21 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Jul 17 2008 Chris Lumens - 11.4.1.16-1 +- Support xdriver= again (katzj) +- Fix loadkeys on serial console (niels.devos) +- don't change from cmdline to textmode on lowmem systems (niels.devos) +- Update the VNC over text mode patch, so it correctly passes the password + to VNC server (#455612) (msivak) +- Set interface MTU if user specified mtu= param (#435874) (dcantrell) +- Bring up the network before attempting to mount the NFSISO source. (clumens) +- Catch mount errors when adding NFS repos (#455645). (clumens) +- Fix a traceback when trying to save exceptiona via scp. (clumens) +- Give a progress bar when cleaning up after upgrades (#208725). (clumens) +- Look for repo config files in /etc/anaconda.repos.d. (clumens) +- baseurl should be a list, mirrorlist should not. (clumens) +- It's called crypto_blkcipher.ko these days. (clumens) + * Tue Jul 15 2008 David Cantrell - 11.4.1.15-1 - Add a text-mode network config dialog so default installs can work. (clumens) - Use the right format for the NFS methodstr, but harder this time. (clumens) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.681 retrieving revision 1.682 diff -u -r1.681 -r1.682 --- sources 16 Jul 2008 03:40:11 -0000 1.681 +++ sources 18 Jul 2008 00:40:44 -0000 1.682 @@ -1 +1 @@ -3c7cf4746fb0ecf11a38ed598aff6128 anaconda-11.4.1.15.tar.bz2 +2ccbed54a4241deeb631373db89a4c96 anaconda-11.4.1.16.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 00:45:02 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Fri, 18 Jul 2008 00:45:02 GMT Subject: rpms/xdvik/devel xdvik-22.84.14-pxdvi.patch, NONE, 1.1 xdvik.spec, 1.23, 1.24 texlive-source-xdvi-numlock.patch, 1.1, NONE xdvik-22.84.13-bad_bar.patch, 1.1, NONE xdvik-22.84.13-keepflag-scrollfix.patch, 1.1, NONE xdvik-22.84.13-manpage.patch, 1.1, NONE xdvik-22.84.13-pxdvi-use-system-libs.patch, 1.1, NONE xdvik-22.84.13-tempfix.patch, 1.1, NONE xdvik-22.84.13-uint32_t-fix.patch, 1.2, NONE xdvik-22.84.13-use-system-libs.patch, 1.1, NONE xdvik-22.84.13-windowid.patch, 1.1, NONE Message-ID: <200807180045.m6I0j2EM001231@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/xdvik/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1183 Modified Files: xdvik.spec Added Files: xdvik-22.84.14-pxdvi.patch Removed Files: texlive-source-xdvi-numlock.patch xdvik-22.84.13-bad_bar.patch xdvik-22.84.13-keepflag-scrollfix.patch xdvik-22.84.13-manpage.patch xdvik-22.84.13-pxdvi-use-system-libs.patch xdvik-22.84.13-tempfix.patch xdvik-22.84.13-uint32_t-fix.patch xdvik-22.84.13-use-system-libs.patch xdvik-22.84.13-windowid.patch Log Message: * Fri Jul 18 2008 Jonathan G. Underwood - 22.84.13-20 - Update to version 22.84.14 - Update Japanese patch to 22.84.14-j1.40 - Rework patch allowing both normal and Japanese versions to be built - Remove no longer needed patches that have been merged upstream: - Various spec file fixups xdvik-22.84.14-pxdvi.patch: --- NEW FILE xdvik-22.84.14-pxdvi.patch --- diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in --- xdvik-22.84.14/texk/configure.in.pxdvi 2008-05-03 20:45:04.000000000 +0100 +++ xdvik-22.84.14/texk/configure.in 2008-07-17 00:22:02.000000000 +0100 @@ -52,7 +52,7 @@ fi PKGS=' bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm dvipsk gsftopk lacheck makeindexk musixflx odvipsk ps2pkm seetexk tetex tex4htk - texlive ttf2pk tth xdvik + texlive ttf2pk tth xdvik pxdvik ' ESUBDIRS= diff -up xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi xdvik-22.84.14/texk/pxdvik/Makefile.in --- xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi 2008-07-17 00:22:02.000000000 +0100 +++ xdvik-22.84.14/texk/pxdvik/Makefile.in 2008-07-17 00:26:37.000000000 +0100 @@ -10,6 +10,9 @@ ac_include ../make/cross.mk all_subdirs = gui tests +dvipsdir = $(texmf)/pdvips +psheaderdir = $(dvipsdir) + CPP = @CPP@ # Make `#include ' and `-lX...' work. @@ -178,40 +181,40 @@ uninstall-exec: install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps + $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/pxdvi/pixmaps $(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext) rm -f $(man1dir)/o$(manpage).$(manext) ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext) - $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi - $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps + $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/pxdvi/XDvi + $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/pxdvi/pixmaps if \ - grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \ - || test ! -r $(texmf)/xdvi/xdvi.cfg; \ + grep 'original xdvi.cfg --' $(texmf)/pxdvi/xdvi.cfg >/dev/null 2>&1 \ + || test ! -r $(texmf)/pxdvi/xdvi.cfg; \ then \ - $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \ + $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/pxdvi/xdvi.cfg; \ else \ true; \ fi - $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/xdvi/ + $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/pxdvi/ if test ! -f $(PTEXMAP); then \ $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(PTEXMAP); \ fi uninstall-data: rm -f $(man1dir)/$(manpage).$(manext) \ - $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \ - $(texmf)/xdvi/XDvi + $(texmf)/pxdvi/pixmaps/toolbar.xpm $(texmf)/pxdvi/pixmaps/toolbar2.xpm \ + $(texmf)/pxdvi/XDvi if \ - head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \ - || test ! -r $(texmf)/xdvi/xdvi.cfg; \ + head -n 1 $(texmf)/pxdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \ + || test ! -r $(texmf)/pxdvi/xdvi.cfg; \ then \ - rm -f $(texmf)/xdvi/xdvi.cfg; \ + rm -f $(texmf)/pxdvi/xdvi.cfg; \ else \ true; \ fi - rmdir $(texmf)/xdvi/pixmaps + rmdir $(texmf)/pxdvi/pixmaps -distname = xdvik +distname = pxdvik program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \ MOTIF version_files = xdvi.c diff -up xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi xdvik-22.84.14/texk/pxdvik/texmf/XDvi --- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi 2008-07-17 00:22:02.000000000 +0100 +++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi 2008-07-17 00:22:02.000000000 +0100 @@ -137,7 +137,7 @@ Ctrl:set-shrink-factor(-)\n\ !!!------------------------------------------------------------------------------ !!! note: when i18n'ed, *font and *fontSet should have same size of font *international: true -*inputMethod: kinput2 +*inputMethod: SCIM *preeditType: OverTheSpot,OffTheSpot,Root !!! note: xdviSelFile can not be i18n'ed (bug?) xdviSelFile*international: false diff -up xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi xdvik-22.84.14/texk/pxdvik/xdvi-sh.in --- xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi 2007-10-18 17:28:55.000000000 +0100 +++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in 2008-07-17 00:22:02.000000000 +0100 @@ -35,7 +35,7 @@ case "$#:$1" in NAMEOPT="-name $BASE_NAME";; esac -xdviappfile=`kpsewhich -progname=xdvi --format='other text files' XDvi` +xdviappfile=`kpsewhich -progname=pxdvi --format='other text files' XDvi` if test -n "$xdviappfile"; then xdviappdir=`dirname "$xdviappfile"` xdviapppath="${xdviappdir}/%l_%t/%N:${xdviappdir}/%N" Index: xdvik.spec =================================================================== RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xdvik.spec 11 May 2008 00:01:28 -0000 1.23 +++ xdvik.spec 18 Jul 2008 00:44:19 -0000 1.24 @@ -6,8 +6,8 @@ Summary: An X viewer for DVI files Name: xdvik -Version: 22.84.13 -Release: 20%{?dist} +Version: 22.84.14 +Release: 1%{?dist} Url: http://xdvi.sourceforge.net/ # encodings.c is GPLv2+ and LGPL and MIT # read-mapfile.c tfmload.c are from dvips @@ -44,71 +44,19 @@ # This patch not pushed upstream. Unclear if it's actually still needed. Patch1: texlive-2007-xprint.patch -# Fix for navigation with a spacebar does not keep position -# https://bugzilla.redhat.com/show_bug.cgi?id=417461 -# https://bugzilla.redhat.com/show_bug.cgi?id=168124 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875311&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch2: xdvik-22.84.13-keepflag-scrollfix.patch - -# Fix numlock key behaviour. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875321&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch3: texlive-source-xdvi-numlock.patch - -# Fix browser open command to use xdg-open -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875309&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch4: xdvik-22.84.13-xdgopen.patch - -# Fix security issues with temp file creation -# https://sourceforge.net/tracker/index.php?func=detail&aid=1953026&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch5: xdvik-22.84.13-tempfix.patch - -# Fix typos in man pages. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1833567&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch6: xdvik-22.84.13-manpage.patch - -# Fix for a double Ctrl-L segfault (BZ #429429) -# https://sourceforge.net/tracker/index.php?func=detail&aid=1953028&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch7: xdvik-22.84.13-bad_bar.patch - -# Fix bug with returning window ID. -# https://bugzilla.redhat.com/show_bug.cgi?id=442445 -# https://sourceforge.net/tracker/index.php?func=detail&aid=1953023&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch8: xdvik-22.84.13-windowid.patch - %if %{with japanese} # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/ -Patch1000: xdvik-22.84.13-j1.40.patch.gz +Patch1000: xdvik-22.84.14-j1.40.patch.gz # Patch to allow building of both xdvik and pxdvik. # Local to Fedora, not appropriate to push upstream. -Patch1001: xdvik-22.84.13-pxdvi.patch +Patch1001: xdvik-22.84.14-pxdvi.patch -# Patch to fix up some issues when using system installed libraries. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch1002: xdvik-22.84.13-pxdvi-use-system-libs.patch %endif -# These patches would conflict with Patch1000 and friends and so must be applied after the -# xdvik directory has been copied to pxdvik - -# Patch to fix up some issues when using system installed libraries. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch2000: xdvik-22.84.13-use-system-libs.patch - -# Fix conflicting definitions of unint32_t -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875318&group_id=23164&atid=377580 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1819017&group_id=23164&atid=377583 -# Fixed in upstream CVS post 22.84.13 -Patch2001: xdvik-22.84.13-uint32_t-fix.patch +# These patches would conflict with Patch1000 and friends and so must be applied +# after the xdvik directory has been copied to pxdvik +# Currently no patches of this type %description Xdvik, the kpathsea version of xdvi, is a previewer for DVI files @@ -123,15 +71,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p0 -%patch4 -p1 -b .xdgopen -%patch5 -p1 -b .tempfix -%patch6 -p0 -%patch7 -p1 -%patch8 -p1 -b .windowid - # Allow Xaw3d enabled build of xdvi sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch] @@ -147,23 +86,12 @@ # Build both the normal and the Japanese xdvi at the same time %patch1001 -p1 -b .pxdvi -# Build pxdvik against system libs -%patch1002 -p1 -b .pxdvi-use-system-libs - # XXX Is this really necessary? mv texk/pxdvik/xdvi-ptex.sample texk/pxdvik/xdvi-ptex.sample.orig install -p -m 644 %{SOURCE100} texk/pxdvik/xdvi-ptex.sample %endif -# Build xdvik against system libs -%patch2000 -p1 -b .use-system-libs - -%if !%{with_japanese} -# Fix unin32_t problem for xdvik (Patch1000 also contains this hunk) -%patch2001 -p1 -%endif - # Re-run autoconf against patched Makefile.ins ( cd texk/xdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf ) %if %{with japanese} @@ -174,10 +102,11 @@ %build # Here we go to great pains to avoid the automatic dependency generation from pulling in the # bundled kpathsea stuff -%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d +%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d mv texk/kpathsea texk/kpathsea-keep +# Enable maintainer mode (see README_maintainer in tarball) cp -p texk/make/rdepend.mk texk/make/rdepend.mk.maint sed -i -e 's/@MAINT@//' texk/make/rdepend.mk @@ -194,7 +123,7 @@ mv texk/kpathsea-keep texk/kpathsea -%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d +%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d %if %{with japanese} # configure pxdvi with more options @@ -218,6 +147,8 @@ %if %{with japanese} install_dirs='INSTDIRS=texk/xdvik texk/pxdvik' +%else +install_dirs='INSTDIRS=texk/xdvik' %endif # make install DESTDIR=$RPM_BUILD_ROOT doesn't work here @@ -290,12 +221,10 @@ %doc README README.t1mapper README.t1fonts CHANGES %{_bindir}/oxdvi %{_bindir}/xdvi -%{_bindir}/xdvizilla %{_bindir}/xdvi-xaw3d %{_texmf_main}/xdvi/ %{_mandir}/man1/oxdvi.1* %{_mandir}/man1/xdvi.1* -%{_mandir}/man1/xdvizilla.1* %{_datadir}/pixmaps/xdvi48x48.png %{_datadir}/icons/hicolor/48x48/apps/xdvi.png %{_datadir}/applications/fedora-xdvi.desktop @@ -304,12 +233,18 @@ %doc pxdvik/ %{_bindir}/opxdvi %{_bindir}/pxdvi -%{_bindir}/pxdvizilla %{_bindir}/pxdvi-xaw3d %{_texmf_main}/pxdvi/ %endif %changelog +* Fri Jul 18 2008 Jonathan G. Underwood - 22.84.13-20 +- Update to version 22.84.14 +- Update Japanese patch to 22.84.14-j1.40 +- Rework patch allowing both normal and Japanese versions to be built +- Remove no longer needed patches that have been merged upstream: +- Various spec file fixups + * Sat May 10 2008 Jonathan G. Underwood - 22.84.13-20 - Update Japanese patch to xdvik-22.84.13-j1.40.patch.gz - Rework patch to allow simultaneous building of xdvik and pxdvik - now called --- texlive-source-xdvi-numlock.patch DELETED --- --- xdvik-22.84.13-bad_bar.patch DELETED --- --- xdvik-22.84.13-keepflag-scrollfix.patch DELETED --- --- xdvik-22.84.13-manpage.patch DELETED --- --- xdvik-22.84.13-pxdvi-use-system-libs.patch DELETED --- --- xdvik-22.84.13-tempfix.patch DELETED --- --- xdvik-22.84.13-uint32_t-fix.patch DELETED --- --- xdvik-22.84.13-use-system-libs.patch DELETED --- --- xdvik-22.84.13-windowid.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 00:46:04 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Fri, 18 Jul 2008 00:46:04 GMT Subject: rpms/xdvik/devel xdvik-22.84.14-j1.40.patch.gz,NONE,1.1 Message-ID: <200807180046.m6I0k4uU001292@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/xdvik/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1267 Added Files: xdvik-22.84.14-j1.40.patch.gz Log Message: Add xdvik-22.84.14-j1.40.patch.gz --- NEW FILE xdvik-22.84.14-j1.40.patch.gz --- ? ??x4)??V????]?#?J.??????X$l????C?">??2??k??K??0l9?w'q??? ?????????g@??p?N???P?^???\???t[??m d?|z?w????G?R,B? V?,??I4M$I?9?????? ???=?^z?Qs??>P?? ?h?0?_?????p???n?]T7Upo???C??7??D0???MDz ?5?6pZ)??8X?K???O?`g&?E?6??????Q?sCr?,??~;|?????????G?3/?S ?4?*?.???W[??,? g?V?R|?u??/????& CM???????oRN?T?"Mi??g????'???9??tp?????L?????????~{??I??z"?O?u????3???? ?l?xJ????????s?X)??<'???;5??8???'?;??p?SV%V???5???o???x?z VOE?(I?$?????~1? ?i?8??Yc??8??}???d?E:x ? ??AU??%??x?H?0???s??????gU??B ??7?L?&??H??i -????????k???)??????ke????????jM&?bW??v7 ??c?^?7??U???]???D?V?#??[???? ?????3>{??N??`? eU9???? /X=???H?Y?xM??????*???H 2BfT?6??8+'s? S?U?o???%?d?#W*?}?P ???????????!V%%?+B? ?:?^???a{????????\ ?Ss?????]/??? ???*??|~oWP 1?0??D??j6/????E9?a?j{?? X:?* ?@?6P?Q)????. ?????e????A?C&`?}??{l?*?????9? ???????7YZQ3???Cb?? ?? ???7???2????|g??a?,???????????l'X??*??r~?D at Tj???}X????$ ??L?1,?^?=B8_???Q????HA?L?2?'?f???J!2???U????>?K?=??x?s?P}e4YN ?fgv?????"???m"?M? ??J????YD$ ??Z??T?#bv d7??h???gl??????x??T??oD???@???Q????M?p????h?u???N?s?6?+{??M??M??4????*q???IC r?leg???! ?????"{?6\? ~ ???:??v???????U???`]??q????" ?a?N??o? ???????? \?c??????npv?t??l?[E _q???w1?S????Al?f?w??g?'$ ??? ???J??? ?jB??cj?uw???R???????no?0???3??????|??}:????????O???O?yTi?'?Hi'???6?@V?????8+z?i;???@?R?????@& Y???tG?jj??+=??m??*????q?C???y??au??K??????wZ?;??z???????~J??PU??Q*;$jv/???=??????????u???????????o?Y? X??? ?M?r????V?W??"?N ?[?????dGB??$???????YqbU??q????b?u????} Z]Ee??????????????ig?6:???T;?#9z{??Z8??8?a?Nk???F?[,d????$@P???B.id??F?j???4? [,?L ?$??????V??h?'???&????^?????q kX ??z???"?@?Y??????^P35???????,???d???7^? ???i?d?????E????L ?y?u.???y??Dq??^ Q?? ?#?g???????0???q+?????zf???5??W???Mq??sxx???|???P?{?? ??+SN?*4 (I?+?$????tD"2??$???QhF??bv^??P=,??}P ??O?;?e4?s?P?p ??l"? ?B~oz?????????H??? s!?B??g?E???!?bzU`???? ?ro?0????d??????t8<????o?? ??1n&D?I??????`,?X.X??;??o ???R?y??l?Wah?????;????^-xjw?M?5k??+?\???< ??<?????B^?????????S?d?F??o???#?>??? G?????,?#}???????????j7'?P?O?AXS??c???&>R????d?????????O?Q{?P????aD+???ik????? ?l?4 IM ??$?K?9s\?F?? ?Y?C?? ???????{???i?B???i?2UXr????e?Nc?W?;??)tX]?%???$?????B?( Y?}??{?S????BE &{?{G?;??9?&m???Fz?> ??? 5???p??ZA????wxZ?NDb?Y.YQ3??!L?+bS?X?? X? ????????U*7???????3??,?j?????Z8?????ueq???w?` ?$?H?}??????_)????X???/L??2.w??>?????0?????F}]???y]z?q?????3?Cmo}?.?????????WToW?VW????zS?H???^???{u????A??????????OT-??u??????O?_z?^R??G?7?; ?b5?pe7T????;??_????S??\?]???Z????>XZ?_??h??????Z?V?\}R]????~Z(?X?a?f?)Ox5??s????9??)?zZ??x?]? u? ?????j??? ?n !0??.?Z]??x?????Z???????W???_?W?????k?8???_]B?GuS?Z?H??>???S??J?m??&T?dF6???????M`????+L?>?????O?~?{l?s'3?? ??[??n?|pbF ~????????Te????V?????`C???[Fg?xNU??%?R??Te?7??O?2Y?2?????????~? ??Ny-hAX?@Xa?_??^?A}(?U?~?y ??w7?[???a'????cu?????????????????o^??_????2?0?$K?????h?j????J?B??]y5??????WG?7????? ?????z???XQC???{????K,-A??m?vaHT??=????,?g???J???n???w???? L??P?? ???uo??.???=?V??a?1?X}?KY?s]@?P?????p???|???]?%?????????? ?????q?z??5y?.???pd= O??3?n??????P7??|??z??(j???????n??B]? sx?k??1?????8 ?_]??+?>#a??+???V??%a]P)v+[TG???oAkz?>??}????y?H???;???*??Xz?t?R? us????_??eE}??' ??????/??N?n~?m?@ ?W3????@?I?Z???>????r? ?F??????@? a?n {Da\?????`??#??Lz???H????? 3?`Y~??g?*??&??|?????V+6?T???O0???4???B??L???a&V????s?J????H??|?m??? ? ?b^?? ?????mR;?DKc?3???h????U?NJ????N?????)??nh ?=??R?G???.tw???E?A(??@@??????????bt?f?? ???pw?u/t?3??? ??D? ???4o?~?q?Y???t7 R?Y???|???? r????????z?? <??64?R?????=/+\?N?W?Z? eST??P?N4A?.?P8?3??Krk????9$?(?s?b????**??\J???? ??qR??qM??lx??p?????H????uJ??i??r?t3]<???v???x?n?7??a\O???wF?%?? ????WG??_QJ?Jz?/??Y?????I?m?Y???]J?[bX?|?E?????T?|?w6.??? c6?%???Q0> q??W4??%)d???Y?KR???????????:0<?K??>^?CKMgf???????3T??????w?t?)/?P???9????q`'?cE?:?????D!????M?2T;8l?4bS(?d?mLz  ?*L??j????x??????m?YS?{G?#_??^o ????K7M???V??U????H(?r?&?5~S??Q?!?F???M????X?? rr??&?{?/:Pr??t? ?e4??K???v0T?O? ?????? ??E?bI???"????]????Z????zz?Ntu???p?uJ?@?PgH?n3??ks??H????98?7t??l?l??T????`?G??|:???4C?P?N??r??b?=CC??F?q??p 8????Cz?)??????????w???q.????ncr?.=?YPw??K?xH3????F|2?nv2????CK??BiJ??L;?&??Ba2??d ?4?F8M???,'??d? ??? #T???(?f ?0M?'???5??a?l??????h%??z!'?39??.???X7????-/439??I?b????: A????? ??c,?F? TV??k??**?Z?-n?n????\??@????????b???? G%????v7???NDr??y?%?? _w?(*V?(??!?*"T?? l???)?P???p?N????????w??n V:wq?????H???x&??t?3 ?????32??U5 ??j?? v?????u?w?s???=f?????,Y?Eb??DF??,??/M%D? e?U??*n?B-?a|???e???????????? ?????????????)6???e|?!???p7Xi????p??????mw'?zsK??????2???e?e??i8?Y9mZ?H??5?4???s?[hP?Q6iO?? ??6???z?=??T??S????n?gL????F?QuQ?=G??????w??/?????}??E?Q?j??ToG1??o9?Rku6???~?w?????????P?????Q\??6????(? ?9M7??K|?T?5;?? ?4?a???e??? ??????~?y7f?-)????_?N?? \??8??1?B??p??!??g y??rJ?8^??H???C?_??????uO6Q??+a?l{???)y?e????.3 ??q#n?????=A}6 ???E???9??????,g-M????c??V? >?/?S? ??i? ?_f?T??*! ?G??'3??#?Pn?Ix??o???S?$! ? ??[$!?-?:?G?;:v`r?)?+sn?t?c?EE?,?? ??????/2??C>r???d??x??????s??(N]??#?????????Z ??????,?x??dz)?y???U#f)Bk???md?C???](*@vP??? B??w.T?E???b8M-a ?W?F??^?N[?8;???Z??g#??P?R?/???O?????????G???????$N|9?s)?:?Vb?,IYbW5o/_?>???K?4?6???'?b???wV??v??3?U| ??b?O?ta??%??????q4K????%??_????'?????N4?;???4!??????y8??*j?f??,???? ?s??oO{O?7.??t72?????q???\Bp vXb?? kft???z??i?`??>Y?????????&cU????g?E??????x??&???,? ?F?{???%?%q8???? FN?>????|?????.Gm?+??9?.??6???????f ?3/?+-?ZHcpEN?/?3??/u ?m??????R( ?B6?M?t?0|l??c???^?G_t>?4'?? ? K4?u?&????????$???W?s????m?p?????? e??E?l_?????p?? Q???"f???????A???v???????W?^???,?????!H?_?*!????J?? ?v?0???2Z???3??x????J???@"p??-i\???E ??}>??=E?/P??h?????? 3?????5?L?N??c??pA??~?A?3hD?db???2?????M?9?#J?9?*?.dY???4]0???y??t??????T??????d??P????????"E?????}?????\(N?j???n????s??4?8c?gO<3??~???j????\`??# ??;??J~?b>? /GQW?} U?*x;?!L9?n???)?J??? P?{ ??OWdZ?){Nyz???k????~??2?*????h|????kV?? V??c?Q/?]?]?9?R?Tc?"??o?? ?ZF+???m????!~H?|)?l%??J'??k$?N8?M1? |??O62?{?B?=?????"??J?z'I`??f|?h4?a???d.? ???t?????~?D???V?}%???f%????a???w??`????^r?w????K?M#/o??)?X????KeBvN\l???62?|??J??]7&?????g:Ao?U?N?v???N??:JC?? ??Z???v?? ??g`TS3-?7<`sbE?w ?A??H??r?=0??m? J???s'?`?*5??VO?r??`??4??? ??? ?I??bJ?B???D~y?D[?x?????DrsBCv???z?????eM#??0:J?????=/?????D?N?0_???p?0??ZM6=z?&?`;??V?w??B?y}VH??=CVz???ToF`?_??e??I?`6??@_u8uFld&e+?D?F~???m\=!;#O{O?????X_*??ub??W???ht"??]?y??t"?gr??+M?????'a}??]Q?t??IX???1???I dC?H?????x?e???U?[??G??0?????6???S?@??|Y#???????f? Y.?1???;?f????e???^?QR??g????E??j???n?S??B??=?s?3LV?}??(???e?????c?C??R?!;?Bz?:5\? 9??m?9q????1g?????????4?d?7?y??xh? &??,aY7??+dG{?9????aA6?????{??@?d|?*1???~U???U?si?;17??v????2???R??H{?pI42i?c?? ??8???k??)??h?B??????8;l4???w{?N?5x?????? ??*?=??g?X???A??.??9?Y?? ?hi??n?O?z}s?|rw?FU}??? &;@4?????O??G??????????????U?q??????????&W'V?*qzE'?j??sg??(??,???:?_U?]? ZYl???O?6?????E???X3g?k??u5?????l?+o???"U?N~C???"6?`P???^?F?Gw????_LmK?#?!X?j?A ;?=s??3 ?.?/XH?Dob%?,?b=??WP7???KM??I????N????:?akI???????????t??3?io?g2??:O?X? :_????-?.??,???+xsaJ???c??(???,?~???????u????*yD? ???f?e?(P???w;?u???????O?m?????!? ??????t??1pUZ?*?T??qS?d???????%?;???????H}????????Jv??qV??? ,?f?????R?B????w??M?X??b> XB???K^??W?8H???B%W*T??U?xCP ??z!W?P/????OS??z?????????????|??4T????B??zH???v?`K?7??-C?;?RS7?A?????`%??????/?? ?h??=?aY??j? ?+?M?[:????(?5U?Q?4?}0?~?E????c???~?D?=?E+???-bj?d[??V?F?g???@9?[M%*???~?1?v??????g??,?2J5??Z????v???'?eC[?~{ON}????\?Qs<?v????????G??9?????X }N?f??Y????a??xD<2IK?;w]tO???~.?"??@&????? ?= $?????F??????*:?????~J at jqi?F?????????)M?????GG?I???????D}Ze?{?C?,??w?./?????a?? 5z4r??W??+P????:{?@??-?0? t????]-:Ylk?XZ???W:{????e????P??jM_w?`t??8JwS?J??????-?t?{.?t??B??[Ls???g???S?D?dU????!*t??????Cy3??z/>??d??u????v'4?~?E??=???H???X????????X?? ????=?y*?Q???g6???L?^/++????????u?A?KQ_j?O 2????Td???M??M????|???c%?I?O??q^?J?SX'??:???6u ??2?Y???????E????2/???U?y??????E~-?5??@????e>??BV 2?? ??r?50/?c?3h?c2;?w???????-??1???O??;;?z??"????9?L??5BBz!X?/? ?h?????F??? dH1?n?.Y??i?W@?1???y?h0????W?-?\?n??? ??x!c?1 ??B???/??#?? ,??|??pE?h?$lH?????+??r?P??64]d?~?{??0/?Ja??+??h?Dz?l?? F?Zdg&?N1I??5??u?d?? 40?@? ;???n???y???Ol?? ?\?????n]~?Y?0????U????CIBM?A\W-1W a&!H?v??o????C???(???BT????hA??2P?B????,D2??5?C?i2???s[???PO!?E /?`????_???C??  ???6?^????bW6???Z?)`2e?j&+???(rAL????!???L-?r?RHk?%:$?????? Z?z+?g? CB??P_??6pZ[)?_[C?$k??..FQ?X%?w ??40?75@?? ????????rX????O????????????qk??x?y|z????H??Q?$"??G?)?\s???? ?v??$;??Z??Z??Q?y?????|EHK?b?oj?y???N??????iE????q?, ??d?!k?B?????$?,H ??????S?Y9J?fb?S)?g?h???A?3?s ?d??x?Y?3??  6?pM????v&??1C?????xhz8?$?L???8?????>???P?????t( Fmw??????,??+?r?Y???y;!l??????w?-@?%r F!?x??]?Z??Y@?f?v???d~?i?'?a?Fbr??Z$? ??'??d?E?#?????$??M??BO????2?<???.?_??b]^? ????T{?????W???? ??s?w???????{#???)??/n ??????)?hR8?S??T?4?8??#?J?%1?H"? ??'???F????%"X??A7.??!?Q?b??Wp?????????Bv??|?(G??'???{i??G!????i????g?Y??????????068?` 8???mHZ???5?Q5? ?4???`T $?xJ?]?n?+?9~???? j??UW?{?5}rpp?<.??%??LD?+??Jx???Q_??A???\H??4][a??-???o*di? k????C??\\L?)???n[?U-??DVT??J?[ M???)??????.??a*??A?)]?.m?S???T` d?? ?g??3? ?R????.hL????'?s,???3?!g?c?9????GC??E???Hr??-?????/]?(???c,S?9???????B 9y6?$?)?Ga????m??<}???gK?J??={??S?N ??l2?W??\????*2=?i?M????????l?Sv?$??$rC??0??Zw?B?1?x^???)uQ!?O?S????PF????O?2??L??3??5?l?N??PR???u?vZ??~S?+? ?xAww?????D???.?????W??`?r??e%q?????h/?q???????????????????S????(?h????;??m???S?i????????{?v?sL?????@:????? ????,?u????0?l?6?w?mu???????'?q`? ????C?x???Yq?/?_Y?,??D????????,^??? q?O?`Y? \X???????b???W????e%r???xu[ ?????E???&??????????4E?_v>7????c? ~??????J ?q??????$?N??I?&??:?vJ*????????HaNx????H1%:????,S?F?.?O????>??Z ????8x??-???0?????w?????)h???d?-T; (*^?C??V????nAd?Q??'Cz???&??|??1???n?7}}???+x???0????U?aE??P?#???pA0???'? ?J??A?q?A?Wp?z>???f; ?nT#????{?e?[#?~??? Wk?Aj???n]????~?0M?? ???"???_:?6???L:???*??qi& ?83?y? ??A8???`[???y??@Bz.?4 dX?(lM?=?)??$Jt??j<?8 ?Ug?*??^+?l`8????X?????????Az???+????vPM?+????kk??GY{ ???%@???l??C?`??bE?)???b???????,?S???kM???8m&????9r?>????o???X??`?_o????q??`7yqW?????_??%??dM?+uG?/A?????????Tv?Mh?o?o???w????B?JNW?U{MU??????[@??J.?????A???I???N?W?i?/???W?d???????6Q ??EX???????????]A???S??f.??`{'?h |m?? J???{?????^??q"?lZ??j??|???{?k??hp?7?/!???U?&????C2?8?%!]?*??????1????r6oe?I?k :?Y??u??W???oS&abd? ?1??t?f?I >?}_?Zm??[??j???6X????F3~?zk???y???????????Z?nk???????9]??0jNy?h?t???cR3??L?KA?Q????g/???t?????M????8)C?? ?\?.)p?Pd?jN?????M?9j???)????????? =????4????L?$?;????uV?;??1 ???*?"'??$?nm???M??9???6?&?R?}?4'????t???>r?9Uf????jm????V???n??~h ????I?h?Ql????#??O?s??I ????kF????TmB_{?m???|u??O?S?@Z??c??a?9?+F@Ig*?]???????c??????}?V??????????>??hc?S??31v[X?$??:3?;UI???E?q??E%??+??~&!?D????`'?4>?B:?%??XB`?????tLI?@9g??h?AExD?;]???:??mMv[2??mJy?X???~,??5??U$??>EW????gEO?[?\?R-?0?Y?8????*k???H??0?,?Q?  ?.?V?+G?2)y????q?~ ?b?/U;5?}fo?7??E;d?c??K???^r?s?%W??Z?O 6?=????T???l????e??f??)???????'?b+m??,??FX ??G ???r?5?G?wmlj7????6taX?V????T?|1?,G???y6\j.*'?{?/Z??]gJ?j??5??u?J???F?]?XZ25??)P??(?]? ?@1Re?=?Pk~cs?T??=v?????????2?TN.??6??Nk?K???????R?? ???`??.;NQ?"? ?p??a?c??TK???C?--??????i?G6?W??;??SHdD?c??????-???6???a????? *???A??Zhq?'d????)?Z?"?57/u'-?-?????.*q??B Tn?t&e8??Lg?R?O?? ??@?M????????e???-(Io?????uj??????4???t ?C?_?r???c??8Q9:??q?????6???qt????????5?: .?(?f7F-?i??^????Q?%??Q?F?~9 ?3?y?????q???G?pN??i? Z??}???kVu??????\5~?W/m?^>$???2???C?j?m???a(q????PB m?~???j?>vt[C??Y}???5???\_???;S?f??(???NTZ??J l?$?UqRZ??nU????lz?*???N?Wj?,?%k????????5]?o?1??Z??????k???r????2?C?ZG? ??" ??vo??o???S,???wI???G1_/?)???6??i? !???????M?n?)7?uk??t?]E??????LS?q?!?5?Ec?Z???4??&=2$V?o(_?Agtz??H?L?A??K ???d??GelS????*ge???SFn?r?x?S?$3?????|???8fN???D???8L?????A?3|G??E?w?UB??:#????X????2?????K????{??S\?J=??L!i??J???L?RH??db??X??\ko???1????????T(??m ??E?U0n?j ?t?k???z?q??;^w-???#@&???@?XA?T???????4ZbJ?????.I???2Jv??H??vk]??8 ?????n_?Bhs?!??T??C}?c????I????u????o#*U????? ???? ????@6?w?G+MgaESDY?????rk???????5W?8?F????H)??j?dk???8G??9qc????G?U?s?U??2?[?j?,]?? ?m?d?>?????????)? ?? ???&??$?kPt1????V?dF?%?????r6k??'???6^?$?j?^?)-{2?????????u!??????<+EG??S??I?????_O*,?Jc?u?4?V??*?????? H_i??n????W????}???a????????f_??3??Lo?$??????q???h;??'?z3??$?^????N??1?k??5?&?M ???Mf??N?V??n]?i?/??b?????$?u'?:?L?_f?A?U.?v{?x?H?7_*????% z?T0??Yq??????v?v?????j,N???nl?aHh at???x???????0??m=?;:?,5[?T???????Zcus.?<5?qPL???^??*Y?????h?mO????j?? p?? ????\?6?`?OO??|L??????r??O?7EQ?L??!?J?M?????ub'?1??fJ;?/F???D??Ix??8#*????8k]?e??]?Bm,??N?uT??te ????h,7???,?P2PI?m??l?????OtFG >?0e%?? j?????d???*l?g?vh?d?^????@?j ??.? ?????}{?*?n=?Fs?Z??q?\j?o?+????~:k? ??[??(W???N:?y?????3?X_?? 4?6?*??z?v???3?Mu?? ???C~ ?F:?i????d??????#9?l?'??NT??????? ???@??T?,?????'?o ??????Rz???~.?????xN???8P?[?J?I%?? g\pI??$?X|? ???gP??>\??&??????$"6??3wN?p'????0l?p?????'?*??1saL*?????@??H???(??gr????j?b7?41aG?7A?D??F?ET???uo?????+L&????1W???D?w???????J:_??bN&.??)????Bs?s?}*z?*???;???.0 ?B?DX?R?*?<I?w?? Q!i?+ ;BA???????Y??)_4V?F??H?sx" E????e8?\????^??????MGO?'??X???3??RH&??,?#H?+?qp?*???~??TC????I?? ?? ?(?Utr?il: E???`??8k???=sbQ?)}????X./?}??g?0?c??????*??3?7???u?vz???x??Mh????4???g? H??2$y@?7!??|?s?? H\@?W???$. qMH\@?bN\???9q1'.????x&$ ? ??????)`n ??????)?sS$E at R$E at R$E at R$E?" )?" )?" )?" )??? ?? ?? ?@??~? D?u??9)?" *"??" *?sR??1'E?IsR??1'E?I???HJ??J??J???9)E??!????,?}Gl??b?(????z }? ?B1 ]??" ?f0,?1??b#D:q?y???U?+?_6??W?*?????A??eT?p?d5iT??(??mq??&????G?L?/??4???!*??yQ%?/^^,?????????E,?????(l#???*?f?"?7{8??'?=^Q?^UN1M!vp5?????$???r"p?6?K?'b????M??? C)?{'r???/?? ??nL?&*%s??????4V??n-~$???N6?-f?^`'s??s$v^Q????X??9???^?|?/&??? ~ ??F*???? G=? ?????"?y?%???Vl?*V??#x??b/??W(?F,&s???QM????O? ??b??(/`??x?????H ??H?QB?????B???&???????c???y1\??? /?Y?|???$??a?b?8?????~?kU/??M??e???g????????C_?+?R \? .~O?:?I??3P?\?a ???>?{?9?b Z??"N?atGw/n:HB??? vR#/\??@~ ??qt?JA?t ??????q at A???:@g?????P? r??r?Oy?????=/?t^UA? J??h ??ePp??~!j?F?y?? 9,`?????5(??87l???e?h?]?#??? h{KhW!?????3d?)?V#)???vs? ?"? B?!C?A9H?E ?`2?? 'K]?!??,??!??aFyC0????X?g*??@?A?N??K?0?CB;U.?????!^?T?4:y? \X?Ox??riy9-????b?|H Y?P?|???\?<0????'? ?^6i?x%\!?ax???/a??/??c??e9?J???(s???0???^?t?&=lo?? h? ?@?i??????!?u??CP?C?????E???O???@?d h,?Xz?/C?_N ???#??r?????j?RE???I????8??#?\??x!bK?'?????0???!n?_B%?*B? ?KUC??? ? ?? ???B?&?2????N?}d5?2?s??q Z??e???a??T9Uid????k !??*????F??k?????P_?0,9pe??????? >?????v9??*??k"*?h%A????v >?%M?O? QQ#??0??2a??A ???K???V ??????`?!q.: U!???&?.?y?C,|?_B?? ??`vQ_?????Ab?X?#??~???0?E???????[?`?a?D;W?????`?X?qP??? ??9 "(f?jdsiv?: MCC?O?,jp#?f?&V???e?9?`????2??(?VX???tU???as ?|???n???yA?91??`???&?B?a?%Chy\'??l? 4????????d?? ???^???????" ?F?@?n? 86???(j?]??!?u?Ep?C??C????X?B"??i6? j?? ?q???&}?`b`:???\D:yhc?`?U? ?i??AA??E??7]%?U??$???N???4 ???A??? eA{a?b?z??h??? L??????? ?f ?j?r?s?Nk?h???.%??? ?N-?m?l??L?<,8K%??????????p?(?? OX`^Y3Y ?`?H}$???????wA?;?le??x?/?"?r8XDy?[K??0 ?C+???r nQ>6???u????#???k3 [??b???'dQ? $U-Vj. ?#??W???????8??e?g?*?c??T4kc?? ?sNJ??? H\x2?Z?1c?????B`D?3??3Ej??G0 ??U?? <FB:? ??0?g s?d?QNP?B??`i?9SiP???P?@??y ??!S(?~?? 7\0???dB^??C?Pt??? ?pf?M??|f\??i?@??!?Yxh?eMEQ??%4???64B??9S"ha??????x?_?9?A"?????????? ??,?? ?jZ]? XGEV+ ?,?????-A?P?$(,?a ??5???Z?L?(?A ~??6Z??h? ? ??(cY?? ???T???vA??o??o??X ??Z?Xp? ?8bZv?????m??4?~^_b?dp??a:????T%bc??K?r8+??????C,"Cl??Sp0?%(???5rB&?D?WM?J????q?J??A?:?%SD?H^:E1(?}? ? !? uL???C*8???? ??EH~???u????? A?J?K?Y??I???[???S??H z@??BvE??2?*d??*T`?)x$??p??bu???tDZ  ??Aa"?e??i?U???tC?ADV!z ?%?*Lj????G4mz]??*? B?t??4?R q?????A?C]???????i???!v 6??Y???M?![?:?0?)v ? l?????`? _'???????? *!????p ??,,*r?~((A?????*?AD)?*A@?3Dj?6p??? ????f?BN?g?0???!>?? Z?????L+???AT??l????!Gh[Y[??~??????E}??~;??T?_,?X??VV??hq?|?KD,?#?x 1r??Bh?4v;??8:???^Q[?CSUBT@?i???7??????'??l???g(O?T??????D??[??@A?u Y? jN?}?lH !???2"nF???M??!?F8?w ????{?w?c?????@a_???????/j?6?_-ME??X??? ?8 r???N5?^?Ch`?u?y?????NM?E????84?????? ?(????0r???&???av????[d????r?/Aa??+???????idN?0?@AFB????? ?^_???i9n? ???????9?\8KC??M?k?;r????#?kU{X?&D???-?`0????%D0z? ????M??8:$?\??9????xH???$@?|?.C??]h??EH???_?y ?I??_?????py? HO??????pz kF?R?~???` cC? ??+?z?aN??\.?L?"G???q "?(????N?JZ ???BMY#~X!3&?g?)P!MM\???K??J?s??rl?f?G0g ???????????FM??S??M????j?y???0L???6sx?????>!~j?LhU?k?n??5???i|M???o????;?k?FL?62?!_"?FeO??+W??? z?????l.?j???!? ??{H????r[?ZN???z???g?N?9?sq??z?:??p?\?^??k?k???= #????????W ??????a;{:^2???U???????QR????!n?vbO?\]??`??$?A8? ??? ????w@???p`1??:?C?%H=?7 ??ye4f??GD2?b??o???? ????F?o/ T%?F?>??|l???1?????ot, ?C?$??Y ???k?|?h?<??-??F??a#?!??????Fy>???e???'??I?????)?5?2sxy??????r?????@??^5???????? @fXH ?7?1A?R/0)?  3????e/??%tu ,??F;?{^7?FC??????`@?!???pE??!??i1 l??+?7q?K,? +?|???m V?"X?????9) EPREhw= ??K??????N ??'>pjQ?r*?a??jQ?nR (?????f:????7 )i0?WJ9m'`?t?%?*9?? Ru?=??????????L??g?)x?8 -??$-??u ._G?E'F???]8?G?pg#B?s ??s3??.?w???/m"4????^ R?k???.??/pV??"?~A???!?@????? ?o???y?x?X ????Cxz?L{B-?0V????L^;?qb@?? ?? ?C?`?IO4??e???A?@?E?"?K[???H???Qu ?x?z?;??b?\U????l????;???Ft?@? ??9?R?y??F@???d?X????????R?tpS?!??????:*?T??Vj???????BU????:?4 ????9m? ?H?2:?y5???kou??4??U??????????7s?5 ?uS???iAD???????T?S=`?!0?Q?? O?#*??}?5??????i?7?.? !)t>?A?v???_5??|=??:_BO?H$???z.?55??;_B at Px,!???j?G?]?W??????1? #?o? #Lx2o_?yf?3WGt??ru?J????????????>?0u1fp U?F???[2p???y????O?[???????\L??}???|Wgo^A?q?|?}d??=CBH???W?U}?P????{X5???????RC@x???CO? ????~?+???\????:V??j7]$E??=??" R????? ?Sn ??KB?V)pu?j??? ???`??????"????d>??%t?fc8?I???? :6??c ?%????????)?7??#?b?C0??S??w ? ?U???QYg?I???~?sH?:???j1??7???G2q"}j?M???s ?[ ???(???=?#?????>rb?{-??0???p???????{?{??????'?z"9(????c M?O\P??o@ ??$6??/????????2~C ?????;??3b??Q???U? ??R????T<3 ???N???$UDz???t(U??$???_F?"????Gt*?3????9B!_GL?????S?R???:?[8??U?bb?$?????"?N?.?S???p?+B?1B?qB? ?S%4M?C? ????+D|vz???????4???&?!r????'?}??(d???~????LY?????~"?7?6V)???P?P?2???Q?%7??a????w?@#?Ty?h?A??FL{?? ?^?ai?8???+#?9?Bd"?M?&$??:????n??B?? Y??4?? zB(T?)?;???XM?P?R%@???z"?qIgU$?J??????V????f?=??DO?????O!??Pe???tZH??????v TH ??a????D ???? =???pex?j?????W???.x? 5'??`??6?[ oC(JB?@Bd*???Jx?G?6PR???ruN??}`yh B?z?}?il:'4??#?*??w4 :)B???a??????Q ?????g???H?PI??0 at j? z???Q!?b5C\????B??n???y?)?8V54|e???????' uy??M?'?P?i?:???2?? ??laX@#H?t%4?1??J???&C??????????wC /???Q??X?? YB???!<B?? #?J???/B./8 ?P:?P?P9O4j??B?%?D????@?8???is??>D`a"???D????ad.5???^??c?? X??`0?HHJO??| P???a?#????"?PO???0??EU???,? lq??>?s ?~?L??Sa?B?"F}?=?p??p at M s?*z?7?LQ'????:??????J?l?u?OB??t?Gl:h,?R`0? a ?H?????,??Y??@?P ??B?OOd"5Yq?e????,D?O@??[?????DD"z??E??P???a?B@W???A?????? x ?????*??*.?jE??????????!??#X?G?(A?!?9?Gf#?{M?!Xg F#zB??2?N!??Q?#X?GP&D??D?"4??? ???ZH? =???%??>@??A?!\Q?????\!j.D??1?3?r??+b.????{)????!z~dZ?????3???Hg?!]?m???lC??????CO4??-t!~????mh{?G/?3?e?D???%@X???"??zw?p?D???SN?9?"SR?R!?M;?p"?;?????n?~ ???B?T??Gzu????d??S#9B? ???(B2z!?"????G?~?????G?Gya??????v Q?%/|t???Q^?#??7h>??=F?gb?dXy????T? ??r=??]?U?7((*H??y???@auA?!n;?6????O`?O?d.\ ???o? qu?Z?(? ?L? ?A?K?m?F?.~??DO*c? ???f???P?D???!?{? ?R_Re?? ?}???Fb?q?? =a???.B(?R?a????F???T"?\#Og????H????*??q?w3?????G$??D?????g(??t??h? z?|W?&??#?-}L?o?E?? t?c?}? ~??,?n;? ??QQ"?oG?=NO ???C\?"s?!-????? \??,?D#8C?????}???B?Y??9=?/???Q?Si???e9??3??yVt4?"2????0?????D?MA?A?I?]?????4w?? ?R_kG+'f????? ???????????FL??????v?????p/?=?g?j??w?1??????????g??j??z????????t????lJ=%?f?????s??5=?;???{??av5nU?????z?R???!?G?`??????g?~)?????x????$?GjV????????m??|??Y?? o???"?? V.?c?{<7???p?`+??pv? *? .?G???l???}??\m?4???V??N/k ??ik???~???]?N0??nT???h????????:? uy?5_[?L.??7??;?r???#????????}???Zm}??u?^+7*??!??W?{?X<{????????H_???????%?]????E?,w2o/?J???2 ?3p?@?Pa?????????????t??wV???z???????f????/?W?X??f?ml?n?`???A?g*????Iz??`????p)?VWGFA??*???]Y?1u"7?;s??Nw???????Pc??J?]????Z|Z??B}q??X#??Nc??h4?{?@?? ~5??\????,??Y???3???h ???'?3)L??0?@m??X??&?8,5?? [u??????\??@?,??o7???N?1?? M??wA][?????? ?1??KqK????m??8??????g?>??????57???o?"&Ao4 HS(Tl?????[&??8????24 F???? U???????~?j,1??1?|???Q?????1???????????S_),?l?3+??(?????P?e3?,3HT?????? O??Gcr?????m??U???tT?Nf%u?mU??Z]?k??q_?k?(?+>P???L?F?K?@V???????v??5?Q?V?X_?kt???D?'P?w=??e?tubv=?????y???PSM??[??w?l5Y-?? o??Bkm?hJi>??/?Zh?v?b?9I&0FL[? ??T?,?V??Z?0n???q???iC?,???j??s'????m?O??F?????E?8? *5???";???y????\^?+; ??fa??fA?? Txc????L?5???6-????2?"?]k?aZ????'\57s?)?(f??????e? ??4?s5?4????m???w???5e??? f??VGU????,?R???????8??A#??nc6tg?,K ??F????/?????Z?Du???s???5x?Z?4t+?????0d?7SK?P?q??y L? ?n2?h=a?????????V??M? ?s kb???,?YR=?|?l??????q????S???D?_ f??7 ??V??gn?R"??+e.???,?/?])??Hz??Z?f?Y^oq?????l???:]???M ?? ?6 $C6JSBtQ?m???w????"d?????@k????2?d?C?6??@??:c? ?[?3???l????ao????[??3??? (?3???X??W}?3!???hM??????-?0Q^TD?a??=3??:?^F?F9*?L(?x??w?R??,'&?????mY???P ????????.Q?K??B?1?K?36?Z??f?4w?.Y??2?6[C??Aj???\?;????E??VW???"??{t??Zn?i??z??C??/???????'L?X?d??.p?TI jK??:fYa?4v1k???A?? 3K???P????D&???????({??,S$????Ml?P? ???6??????HcV??`??????.`fWWM+ z??????}q?w{???????ke}???|?52>????D?52o\k ??/?????o? ?*?s?br?????%??????j'?j6Y??N???J???????Z??o??n???V????[n??????%??Q??? p?C?y?@???????3?Xe*??N????c??MIK?:??U???2#???l??{9?C???????V?v[}??j???rlt?f?m?5???M???:??J?M?:r j??C?f???{?2w???D??HAS{?????]?7????????3??)A{0X K??9Z???ju??>?H??s?n$5s?_???c? ++???{?`M?????? ?????\X7?q???~h??????Q?}?|^m?????m7??,??$?cS???<???j? _|?3????3n??Cl?9j???-;?[?|&ZgGF??B?m???5k?3??3k???1?^?B???5??v0i?????o?p????mL??d?[K?hl.*??]??M???????????u??y??h?PK???2?%??dj???cI%??K?Z??]p??m??$??*? ????5? \?``T)q&???V?2???G??UV?4? R34?Q????`?x??w?mc??M6?S[?7???g???qk?}?????R?? ??>Q[???|O?l?~3?????????v????]???,?>???4??4?????V?G???:??<}?ozz?U????? `???????$????????*??"u??7e\K]Moy?&?w????D???w??????Qi??????P???1.c??????]???f??u????1??t;??34????@?I????????g?x?????r:w[:l?TlP?Y!HO?r??:7??[?.!{S> ???t??6l?y???u?[ X???h???#l??v????Z?>G??B????????????)K?X??M!??D????_k.?q?J?]??0t?????,'???B????h???-=??7 ?????i????d??R?A?d?*S??3???r)???????e?J{K??n@??^y f ???n{?r??mj?:????? B3?"?N?|M????ZP?&?2u??k? ?#?{?Q????wY?????85(T?rcc?[?IZ?+?%C7??%"}0?DZN??\5?^K)O????t?????kS??l ?U?S?y??*J?M??L*EJf????????71????a??s]?3?VJJ`?i?F?j;??zm???Ge??I??K??1????z???W?O??W%?????B?g????[]s????????%???vx! ?3???5rGl?0w??? ???%???v????????m?u???????yt???m???.N??g?uO?-?0>????y?? vy???#%4??M???m??_?g????g??/??????7X?4????g??n??b?{?s3?w=tkL??-??C7?Bm?9?o?5[}1E?h????% ??*cA??T?6?q?|?\??>?????C?79Ta*F?3 ? ?n??v?7~??n??M\??? V?8?>Z?G-?{???Zc5??b??[??%Q????:3???!?Jm,?4?c?)??y??????)?vU?VT2wHV??Z?y??]??O=??omt??E?0??C??T????'&k8fL[?T?1??y"??w7? d?h?*e?B'^??T ??k?6Y?u?G??Il??T????YF?,??????qK??Cf?F9lp?Zs ?u?( ??i?????????>?????M???u???????}e?v?a*?[x?p?`?4k?j????????Z?.'??W6&6&k ???Zqofa??{4?g,5???x???r??=?A57Mz??Nq?????7?????]W?I? cG?????7?(???{_??w???0?H9??7r?? ,m??????.?*j???3?B6?U?I??E3???Dy???XF??[?h?K?Hb??Ve@??????X#???3=?r???8|T*m??Sk??f?6?@?-F?????L??h}q??v???WBe?????????nk??OowS??Tt?|",?N???9????V7??{?c?LF??????)U?Y????b`#??)???C.g'5-?N?bb?t3?jMy[p?????????{?5????? ???/`P]???H?wi?Y??????????[z?vsT????????^?????D?_Y??U??a?Z?7?S?j?????S?6S??z?s3{m?3??????!?$s???g?d?5???!?q??nj?u2????;=?7V|fGi9}q!Z??>??????????K??G?^r?.????? qd?C&??_XA?_[i,?e???,{QA???? ?OCr?Z??j?p?Ar??????G??Ng???OXjY?tKN??zVK]?%]Ba+???|VK?L' b???OXj?????-u????[??', ?TK^??'-=b???O?s?????m?v?X[b??V????D?fQ?"Yr>??^??vF?K????Z?.?\?%f??U??????U#?k??_??P????fWj*??|}?F???"J?m2;??o??|Ca??Z??o?Iidf??lmXg8????R???????t&kf?T??U~ ?s0???'?? K???Z?Txa?{???'L\?:v??{?L@?,|?^?N~??V??????s? K???XR?m?[]????9"$s????ed????,?'?$???????^XB&? ???2k??F??\O??i?efw? ??? ??t?j6???o??j?7???????l?6+?????*{?x???????J???+?? ?3???1??'?????????U??n???x>S#??????qu????2????v????t??Z?5??2????k ???,?????m????%e)_B?5???p???'][????e7V-?'????hH?????;a~][?Hb??4M?*8x?^??J ?wlR???U?????????bv?L?p????V?n?J?t???? ???@:!/???^f?]???'?u?U[?j???????m??+???9X94[8@?Z??u???u?X?v9#W??f}?S[[_????????3? 4?' ??????'e'P??F????:?? ???????Z??Z???' o6&wO???u:??wY??S??????????????g? g??K,(?6?.????:??O:= ?j9?tri?$vr???K5wJ ?A*|??!?????? F? H????c???#????(1?I?B??P6l?? v ???y3??e?????V????+??W?=V3??g?a???&>0YQ[?<9?_%?)? 1&????ctu?:???mr??Wk?o<wtv???b}o?????????yd???O????6??/???1?jN;?*\?'??qJ?(#L???4?Z}'?X??#@?\N_([??7q??F8?_??? ??9????????V>7?2DV????=N????????y1????`??Tl?*??F???F?aw?f????? A5????wao??G+???Jg??Rk.???'?{'W?x???f?z?&>?&????*l,???[9{O>??&???b??????[W???K?????b???????????{??_????x?W??????????_:??????????/}( ??V?!??}?W?61??7?ME? d1T>1S?90[9Z:X?z??????z???x?{?|?{?w??_???????8???/????_?.???7??]?=?{?w?w?????{?yk?,???$50/???X??z/???]?}????{??+???????}?w???????????K????91?????w>y?M??j>??v??s???????Wx?????~?=ZG?Y????9^N?k??? S3?????Z???u???????'???V ~^??_x?'??s??_????|?;V?J%[d??w???????1?????? ?p??q?e???4^??#Z?F??????? ?^??5????z????????a\v?'?~?????.?bd?t|???????c17??!??]??@?????? ???????3????__|??g???\??CCK????????Y~s??j??????????L.t&?+??????/{?~?a>g??s`????uZ?7?=F[]?Q???V?q:Pc?Cg??c???&?u??a4???{??????? ???N??xOT????x??+?{??c?????????.??Oo]g4??9B??/??v, ?? ?????J?+???{?\??{7?|???%[{???????u????S?ExY?f?LX#q5b?????????K?????*$KY?'yR??ix??????i??X????O??/?????????{[m???f??1`???cU[-??:???DS??}?P?{?????????????????q??O????????????|??????1??4T??????L??%J???qf?X6Y9w*G?bIDQ??4??Z? ?????jq??4?? ??r?L??gu??w???0????D5m?????????????;?V??? ?? ??g?YW???v?p9?~^ ??<??????0?v|}Q??642?|S?A???8???`^?o _2?(]?c?????\0? O&?qs?5?1rU?????f ?]??8Uo:w7K?M?F??????H?=?????????r???^??d?q?;????z????xHz`????\???0??{??>U???>??}???_y????????ev ?v????c?`o?<??? ????8?O?y??????????:"?zq?o????????2??n???]=?????z?W????????\x?_z?+?????|??X??Z}?x????.?9v?z?KM?? ??{H?q, -??.??_s??+MB??g/?????7\????V{?b????/' p??WZ?5??? ???H?.?K????_????!?????q??????]??????%???I??w???T?:???p?????J??????O?n??;?PT?~?a??&l?d???o????%? /??5???'!?O|?Q??Fw???lt?????BZ????* ?????OD?w+??u??????????j??#B ?}F J?H?????,?????zQ?0q0?YE?EO?????????????#c?s?ZxG-??]???/????o?l????}??????? w???G???~S(n?|/????U?z??/?'?q?L??t??????????F???94[>1c)???g~{?????r?E??0?*????zE1????w{=??N??r?zohEn?y[f????2???TY?F????v/?|???? ?+???u??u~/?T???? K v??m?Yz??????z??? "?l?????`??n??? ?kJ Q?c??w?>1q????l?Q???;???M???????>???p?he?/???h?)?"?????=*????/???\n????J??a????{?g?P*U??V??U?6?? ?.?????w??=??/????i??; ?????K?????g+???? u`f?]??G+U??`?6m?(?y?T?????????s?3? gv?p:U???6R6v??IU??\??T?Gv??JUh?\a5Uau? ?RNmQ????Pvx?+???!?5,0?J??'W?E???E?vt?k???)i%R????e?w???q|\d?M?????????r??k?????J??p?p??.L??8?????T9Ls??????)?;)?????L? E)tV*?C??r????.Sy??z??(Y?v??W?J}?!??0????*bm??)?}AO??R?`????5????|?(\?e9E????{O?}??w ?e????/??~???|?O????bqmdnnt-c?????dVjZ?K5??.'8???L????????0???\h.??^? ????Ta??w???????????h? ?y?????D???]{??/???????Z??R?&?E?v?????{???W~mn???q????5)???? ?|???????7i?}l??Pz *A??WLk+=j6N`???_1?????V?A\Q2?OT0"^5?s?????Y?Z?#?????t??%=??????+z? #???6?]3????z?????s????????????^W2(j???r?W?o???J? m?;?h???g?*?9iUi??uxK}???7z7^}?????G/>A?z?????'C?|?c???'"?e4?oB#z?Z???`????O?q?? ???/??z?F`9G???dk??d?I?h?*?Q?N???K???????Q?? ???????????fp??&&?j?M??????)?|???Y???3F=?G?=??7f???L??T2???e????_???z????D+???BP|/?G?) ?6K????????6?? ?????,4R?????^??g_[???-???%k??, ???;?|?w?????6??_)???i????V/??U?s????:T???e???z??????'T?vdXm?#?V*?Wj???{??zt?5 ???I???_?o?RfC?r?<.en?????3v????NEY???|?g?<;?~??aN*? ????? ))Z3?2???h????V? $???sy'????>???^???,?~????q????m???r????????????????_W??s?:?}??zS?? ????`??>X^~??7~?&?'??+??O?I~?? ??^?M?8?h??j??}nX?8 ~?^SR?D???-X?a?V[???6??+????p?d?Z???OZ???fg????????8??u?????X?[???????r???>g??\??C>? ?A????b??????z?N35?i/L8????????{/&k??????????K1??????0?(?????? ????????????? ??e?]?mt[?0?y????????????O??3??)q??^?????X??/????#???' ???w???K??N?|?????#t4?[~i1S[?D>?{a#k/?? ?91]A@???7b!?e?-??Wz?:?uZ???ds?Vl??`????? ???? ?q at FK?\??????o??2?Q?Go?:+?9c?Y0?H?h?D??v?e????? 1z??m?.LNN??tf*9v??Gny:m%r??GD ??/?y%5??\?3??? ???#t??T??4??g?_??7^???p=????|W$Q=v0?z^?I? ???????????0???{k??{?g???{?S\Hd ?c???O???w????????????????'b??O???M???bz?E?*??sW?_x??????????+J???Jds?/?*??S?>><"9????~??7z??O????u?3s???b9>5 U?{???_9????????4Z?a?7??3?;m???5v?]?Hq?????{x?}??Xr????????C??30??\g?kL? ?6w?Sj6r?-?1???w?S:|???s?iM?%??F??j?[b?,?y?>RTT??H\??f?t??c???????~X3?&J'???W??3B/?7?[?p?5?M???$?????/R|s? ;{????S???????????????jKF]?w5D?????VE????????v?p;{?jm?S?b?M+?? ?? f???????H????? ?[???J???7???[?p^J??)?d???C?~?B??z???_??W?B?}???????&??L3????S?y?q`Z?w?{?b???????R??p?pO??q?????2?)T???zk???7V?*"??!?Jl*???m?/+b??)??;?????????n6? ?p?y??+????7????o?F?p??1UA???????o??????m'?Y????/????j???y????????{??T???+?Pb??,??[ ??I????C?ptH???_??????u?i?O???a3???v?q?j????????/?u??V'????????=Z??o?????GX???9B ??????v?????E&?T@?0??????%?/???????C??}??KO???gq???S????PQI-?l??Q6?'?????? ???)KI3E?}D??L??R???F??S??k/????j ???$????7???e)j????"???????o??????]?5_??*?k?-?~#??5??????????????S????????zwaJ`?????Rcar?E??-;X4)?G??XR?'e5?=???o??2??u??|???????????{???*???????r u? ?W?aL???|????!c??o?'_??Z\m?&K{6?O???ZD>5???e????p???rj{??]????????cj?_S?m'Z??ta???????????J i?{?q}?/???ax???,?^?O???J;&}|?i?????3l??s?"n?xk?^V??O?:?????t)a??p(??liM?????L?%??H@???[?/)???_~???? ??I?p??o\??W~??I?u?!??s????]{??X???y??E??#???@?E[?????N ??W?y?g??O)[??)?W?9???u???`?:??p??c?*>Z??;??J???eb??{????B ????=??}w9Z??%??R??????F?@??V{????p5????????`??????q(?>0N?V?{??s?;mu?????F???g?_????g?x??F???X_?V???4?b????????N?B[??n[?Jc????,A+Fz?O????Z(z?"????o??)??U?k??x???q $W? ?????m"??U?!???_Fm????:??$.C???G?Q?\???s?)?;???_c??"?M??^?x??x9?8?k1:qFe.xG?????/5?*MY???RG?(??wgs??>?1??p?????]a?z?\2??U5?}??????????????/???F???c?????F?/???????tpa???1?B?@/??OY>\??u???vPO?u???;vE?R??????6?g E?lv&;????M???????W??~??????o??m?&z??n???????s??_r\????q?????g/????????+#H?t=Eg? ?<???????????????Yi?U ?1,@?\Z?e??1t?B?+o?? ?NLW???Go?{,^Ch??1???&[??????&?[\[n??F}#i???????Qe8?:?DpQ?tI?????q?(?_IT?k??w??+?????+#??1Uz??1b?&??7????????????hv??F??w??n;??? ??t??z?? ???z???f?">AD???QnD-??|g?????/$2w?H????cg?N?-? M??Chs???_e??h?%?1,?7t??f?0f?\??(fW?$????????h?m???????[???pUBD?l??7b?????6??NB??.G?:?R?p????m???3?M?&????W??????b@???:K?X?w? UB,Qk?????n?y59???? ?? Mf)O?K??}? ????j??HWQ???&??t?%(1???_??~??J??z?w?=?N??W??_??=???^?]????#?40?f???7d??????$???p?????3W??????j?u??\;S??Aw??????:?]??????? ??~fD&?.????,??!???"? ?y??????m{&??L??0??lM(?B??,-?N?o5?Y'??v???b????l4????E???7V??XS#?????????G.8????X#??S?&?j?q5?????C????s?2Q[\k0??"Y????????y?L??:Z{,o???X_{?,P*??? ??+&?7/???R??$?? ???????2~?N??Dn??HpABPN??M??????3????????A???q????^n?P#L?=????9??????*Q?L?I?!9????ou??????.X?????r??+*\??\???fJ?????????????????'?Vx?1-S??? j/???????D??Xo?e???e??-?? ~?{??/??K+)???????D?gE????@???H?8????{???N?O?*?+??c?"!?+? ??F!*a'???W?>3?8X?ql?q>CM?F?????f???75C????l[??????]{d???M.,5&??:????]Q???ofW??I@???-I@?6???C?B?2??sB???W????W?R;?8U?D?"?b????? ??O??i???T?n K??4!???~J???q?#}????)uW|,??_WN1?2????n??l?b?+??w?x?z{V?E?????3 >N??^??????P?r8'???p???F??G???xTL???????o???L??s????/>.T???}?_?y?w??W???~??o??W?^????U??>?e??:?-??/???6o?8s?v?????7&W???)????T??E\%?l?k?????2??w?T?????k?dk????p$?????????z?5??9_oS?v}r?v??Zs~a?Lc?S?L:?W??L?V??? .N?X?`?ou???:?=m?vc???P?????5r?U????O7???ks? =?????,?>?Q??Y% N?Q?????d???J??G[?V?9Va]?5?????UwM??????:???L*????>????>???b?E? ???@P?A??Y??????l????< ??U ????;?*N3?)?t?? ?GP??@)E?x?AmZO???)?>8?b1?xvx6?C?????????V? 8?@ ?? ??H-????1?y??CMW'?C???V????? ????B?|?$??d???"???h?`?V4????Zp?ym`i???qa???&? ?????b????????5?-???E_??????'~??h????????>(?b?=5? ??Th`J?2???w??o?e~??z??A??????? ?y?P]?Ox?)+e??u??r?m Y)??en???????(???<%l?^~ [V6???_6=??~???????,??N?7?v?????????? ^??|?Z??]%O?X,??H?Z?a ???d!???`? ??|3?`???%'?,?t??[???[??N1??X?t?? ??(?>U????l??bFEH?? ?????"c?= 9Ki?WV ?'????Z`v ]?p?u??@<????/+?.?????g???\?9????@?4e9?M?'???~??1?,??|??z??????????3????#~X??$????~ a?????U??1???kq???????????-kA&6???W?? ??"????????b??sH `??`?X?zR??^{??9?:ggZg????aj???T???yEq ???)JK?On6????I?? ??&x????&r?k???J?v?w??=????0?$?`+~ML?FUf?????e?>0>?q?:??????????3?u?V??| ?*???y ???]?n?tX/U|??7}|???W?K?????v?&e?i?.?LBEM?i??3?8l?????f{e???=?o?j8??|??????j??????l???N?N^???%y????x??4[?5?0I????+?P??ay#??_*??R?< 7??????K8Zy at V??TCO ???????1.?T???H8^???P?- ???e? ?{`aA?>?o)?^?)???Q?aZE???0?E?:q?1 ?L??H?0????\zd^,???yDMW??Ip?t,Dh??y!}e?g?89Z??GZ?It???" 6?r?q8???&$??Y+??? V???E?={?? ??:(???"??2s??????6?fr???Z?H????k??.)?1?b1?s??????%XL?b?;???9$?n !??z9??#,?-?UI+cVl????????????sr}%???gNX?E?R???Y??[.??-?(??Ge???z??G_??J??Oq8k?w=???????M???????,??J?gljt?1k?? -)XBrz?????pFa?puY?? ?d???2?4?m&??I?U?.s?????brDv>?\????z???Cac?H|c?N?"?W??80qv;??????|??(?#?'??R3I??%&?*LGN?d?mG?"? ?U??[C0m????(? ?L???~? ?{?????????? ??7:&J?#?c???uw????V????g#???.?B?I??|j?'?f??? ???? ^ ?K %?E ??D_??%????H4?????B??)a,q?????r???5U??&?{?a???g? "O???i?;???????6z9J?????%??)????7??v???/?R;?n?????m8?zc~?*??A?k????S+ ???f?4po?3?H??2o?=??L?Z?? iiJ ?#?=E??????@??@??Nc^??%???f?>?S??S$v?Dr?2???'?? 9h?f?OT?3cqf??3de??[???73??2G(??`?????????eX???????Iq?Y?G???I?D?1&R?(??H<)2d??v?,j?68b "?*+???????RH?I?????c??s? ??T??M????[?o'Z[??% ????s:?1O?F%]?` I9???7?@j"??e???K?)??6<????? ???E???a??D?O)? QNI?Qqt??g%?L????Ew x?t??t????)Xj???zG???? ?aT?3 ]00??q????STs8?l=? &{c???.0=?Z\Q?)?? e??X0?)tR?mn???????????}n???????????????S?b5?`???????*? V]?{]? ? ?mjJ????j7j0C???k%?b???????l? 88*??g?!???n?D?P???,Rg@? ??5s?j?U??p7??????f)6yW5Jd?Z)??@q?????/??_%?s(?F?????y?`?3?O??73wJ? $????????8?8?? 8????V????*N$q?S?)BP????8? \7n?d??)pH???Tk?J?.???R!?=?x????9????r????U???;??q??4???Rx?|??4?bm?Wt0?y{m?S?>??E??Q??p$L? 1c>J?A?I6? ??_??3?Br???hO2,????@?#?s??????q(?o??FF"????????,\??5?Vxc"?K?:x?QMuf?Eu?\???j[?.?/|?N?LP-?A???p6?????#??l?^q??????uH? ?|?L4E?j?dt?}???L?1???? ?9\??????q??:?*??????????u??I$`?0e]-?}??C?????HGJtB?1? ]@???????m? f?R?m?p,??W???1?A???EzN?T?Z?6????y??H,A?????h???8???X10???k?e%??~?2x??0?-.???W ?V-\?qK????$?~?c7[n????by??? Z??v??N????,!(1?+*?Z?6??8?o?+M?%?????????%??e??Z=???&?h?? ??k??6??H???38???9???|???.?/t7??\?KYxM??????C.?-????????q_R???%?;??ps??Q?ZG?I?7?0????A?Pp ?2??????y$?????S_$?%[??w??B50???;?UBd???????)?7??_FpE?Ja&??-????????g]|E?????n ??7????6??[{?@ss????[K?-#??TwG)1@??so????A?Sc?`+] ?B@???'?????f?1g?I??87????????????H?4??J?????B??????? 0S@ ?}??s???/????D]?l?L??WtBM??q?(?"??|#bx?[Y?6O(U???w?d?K?@???RE???+:T~rK????L??v??(rM?S?????K????B9?I%0?c?[D ?-?b??0???~???f??W?o??w;???b?<?y???(??????? \?P???%?]Sf?1%Jf??????`?u?m^??K????-d?Y58?????!w?????R"'1J/vRs??-???C?id??8? ????;?? -p??w????,?p*"7??????87DJ??!h??b?uVJQ??.82?l?D?kj 8??m?p????????Tb?5??5|??? ??`m???!??C?mk>?5g=??c????u??? md????d!??????????Ez:*9D?~?L??h+%?J;??R{q\ B?mQk??+??(???L?? ??M?;? }??4??1???|i????A?#hH????'f??fU]"f2?? ? oT?Ht???Q?+?B?$M??N$?O???R?c?v????n????#?7?<8?s??[??Bk??S??????????^???it&[??????9??3?0(A??U??C?X?>?~9>??]%~???)'?C?????G??? +q???????3m ??vJ??Wp?3?'] ???=?_: ?I????4m??tl????*n0????2????[??G?< ?+??Pv????J?J???????&w??????mC?E????????XgS4t??%?????e??qv???COm??????:????PC???{?p?????7??? ???:?D?n????t?^??u?;}.?xlY??H??#????4 O<C???73MZ??kP?$S_?$wg?A?q????B??^P??h??JuQ?:?h?"7?S??????4z?(?Sg??S?????? ???? `k??V?d?? ?(?LV??Y ??????$??#??dI?9? c????]eoM????#q???4 ???????????i????c??Q???E?E?X??e.??s?????/? ?o??#?h ??/L?gQl? ?=?$?r}???<?v???????G???G#'????~?90?8?WHM(9?2??TR??-???I,>u???f w??2???eZ??7|?0?^]K?? ?"???? R??d.>r.8)?y7???E2?'I0?Q?|7D??Eh ??0x??!???s??a{=_?????e???lR?l=@9C??J?;[?? N???s?.?9x?? ?P? ???sg??L]#-W?()??i[jr$N:?QP?6%]y?P???????/`??????$ya???e??`?i? ?????P?????B??C??v?????OP?ic5u??js1??Kmh'??c.?%Um??6?w?r?12??(??hs?e? ??%(\rD???????????o???z[?vO}????*??\??f????'??????%?????#??S??? )??`??? ?????^??=o??W?f?P???V?6Vm l??KsM w?d?a?s?????"?=??????/t???HA??Pn~?s????g??9brl?2?x???FI?????@?v68?@%??hK????????7]?????tw??ab??? ?????Qv??"?^G?c??mf??z?DpS?????f~b?56???wx??w?m~x3?xs>??;?????l??yV?l??a??3??N????????3?S*A;?`?||??F j?/??k?;?]#M??W???"x?LY????[|???x????????w?W "^??????.bR? Z???P ??????&??????'??O??????_??-'?5?e3S?????VT???l??{t?V(FV?_?r????x]?????Be8??2??\^? ?`??3????D^?????@w??Fa?,?k??!z? ?? ^??H`m??`?u ??A?~S\?x?XH7??O??"J???????`8?4"???`?)?????@M?t?? *?BW?? z9???8%????D$???????????j_?`U????|?g3??e?? ????N??fz?sq?? ?la,????l?5?H?9?`s!"J?]??????? #? \??f??Z?FO?(o??yi???????Lq?o? ?c^???? ~? ?? "?o???7+???u??R\?#?;??????T,???a?????????}H?\??????O????'??? B???_?89E?{??????? ????Tw?>z@????o?z|9+?'?v:c?C?????"P? h?(%e(??Q"$o?M?|?S~?%x?U?Qb,&ffs??6?????.????D(Y???T??z??4?7eR~LJz?Va??a?????(?]B???????y?B?" ??HRw \?g?S????WUp ?>0?;??=?????d???~??\????CT??9??rz???'}4?^???GG?????o???o?E??y;3???qh??E?B??????I??{r?????VS?????$??'?5 ?4R%???&'??????C2V d?r ?q0F?0BM?U? F??0V?`t0ZE[????????E/???~vq_ T?]?\???Y?????Q-??pu?E Y?? ??R?"?? X$??????E???c??????$!QYjQo?N?a??e???vvg???????r??&w???&/???]???????4?O"?T|?e? f?o??? '>?5?;???C!Zi_n???'Rv??;?,F!?+R????j@?H??rD0?.?K?+R?%B??%??*??V??s?cB?n?1????T????_????q? ???VI???_???~?w;?'?UT??}???~?z>??&bk?\ ???MA0???????A???H? ?)??VPIcF#???x????????e?`p#???????Z??.HJ?U?J?y5???? ?j??5?}S??????AF? ??)?_?x?G????Jw?Y???Q?????{??&?dkn??#??Gw?\???Zs?? ??UQ??B????????r#?7?0p?6(Nm???????A????+i??f??}????"??+??k7?V?I.???m????A????h#???s?o?????=?Q{Nx??}TN'l:Y???iU?t?? LW?twL?mC?K?BA?+H???C*P??k??????P?65??u???k?i?o7?./p?F??DOR(^???????N|????=)-h??l???z?+????g?q#?{????YN?>D$ ?sx?S?i?M?rmc/GtEm?}*??q?]?8??W+???D0?4~?????? /XT???????44????g???????r?Z+?u??+??9?;v-??8c?j?=?.?`RWHC????^*?Tc???????F??_ ??g????f??????o??}?`:??u'?)?????E? ?????5?6?w????E???!?(???????H??u????k?????????mN?N`??0I?g???Y??ik??]p?Br???wU?%?Ft? ??\??G? }??;???u^?? )??2=??o ??????e'#?j*??????:W?6??'LK??|?z??s??#U?F8??p??? &????H?X?s?]OA?????+??;?????m???L? ??<=??????e:?????`?????? ???7G???+7?,??????K/Ig]+Q?um??A?f<,?@*d0?$?C???D??~???/}?????%???????YQ?r ???*_?/?W??H?HA??X??I?-???&??W!\??? ???\LdE?O????}????tpQz$\?M????????????V.??`??? '?ZS??8o??t7)?&?N?????V?s???~>*j?_m?V??K? 1? )??h@:???M@???7L@???5&????\?%k?s???e???GL???X??$?t1f??rY}?????J?x??3????GC?????\???????_??2?2 G?M?V? *???h??W???@$ U8???O?????!?wD?M?i? ~???????h?? Q ??.#&?N??????????N3&????????Q???UV4'???C???2~1?X?}|}j?t????j?l-!K-?????[????pKi DK~??TLcr?~?5??#y??,??q?nW?????????)?????H?cjq??}^^%?N"??? ?-??vt|?F??????LeOK?y:????!v ????K'?&?F????V???????????K???r?o?????????8?%k at K???F???Z?'P?}??8??N?_SAdt? g?3o-???S??Rd,?+L?"?-?Av%???k????? ?x,? ???k?X!?.?????????Q??*&?:?n?G}#?c??? LgNr \?u_??~?^S8>?3]?g2???Pl??l!U?g?=wN~G?D??????A???z +?,q?X?X}CK}?A,??|/#???>???aS?<??? ???????4??S% 4?(???O%;??2kxp?6?,??D????? ?]C??????O?"?)??=?? ????xQ????? ?%px????(6(G?????O??P????&??4OV5?:????yS??P??????7?c?g?"?=m?? S??Bt]ZS???????L???K?s???p_?i? ??????s??}]?????k?j\cMt??vq??????/?R??JH? ???????? ?Y?~mQ Q?N?|???e??y?f6?/?8*??E??H^A? TU?jr????Xj???3?D??m?h ????9r???.9g-?????{?/ER,?aCdH????????=? C??C????4?3???,???_`4a??w???P??????x? ?P4???,??$TF??????vwt?o???Hq???B]?WU??????P???W?p????{2f?6?????(t?E?P??6?o??????~???/????UN?sp??&/??????U?u???????oG??7???????t2?;U|????/??"?K^?g??????o??U???B???-???????????;U 8???n? r??^? ??n?m%UDn???m??_?`?F?????9??V?(?W??M???,,?'?????|5??"???CU5????]?jj?*?Twn(?????????@8U??????RM4?5?@G???h6q?? ??|xW????????[????????I?^y]?GW?0???^????Tb_*?O)?5@?????????? zR??>???t?C?z D?W??{????????p??o?//?B?Jd:?;?l'?=]?8??U`???o?K?gmB8? ? ???? Q?5?????w?V?FV?}? 0O?\??b?S???????h?Z?{?????G?Q?]?r????? ??$?A???*????Wx *-T?i?9?W2x16??]0??v??????r???????????H?[????u6P?1YR?y?9?????EP}??q?.Q?d?e??? ??c??R ?C??kNFq|?????A n??}?c?:???gw?3??;?G?ow?????) ??zxO{G????jU+??[?^??????J?????.????(???[mpG??m??&$?/y?????[? ]?n;???o?"L?L????????????~( ????(?? %??#?l??-?G????'op???7?K ?4???cT?\??Z????%%c?d?|??_??????????8N??????x??? c????gw? ?y$?????D (bI??7???gvn?EYj?????+??Jc&?T>E ?T?S?sS'?M?????????p??J?,?N?~?? R?dg?>??^;{????u?q?{??e??????6~2O[/????&???*Uv????V????)??j?????SS??82ST#?AvO????oX/L8? ??:F??????????I??Q??????P?qSWz?X.?=??3???????9???W????????v????? s?GCs?H???=4lb$'??,6J[??32????Pe??zT???I8;?]=?3N?C??{g"y%G?:???`Ch}????????????NSoP?? ??fH?_????????c1p???? eP??7??!cj???7??)c*(? ?????-{?????5?????????U??;?wXS,??7????)?DXm???;US?d?^?5gV????#??i^??&???R#??B/''@?l????~A?p?K? >???M??>^??&?D????=U??f? ??L a????ac?????????BV?6?????w????2?I{?? *????9?IZ2?"??B=- >?Y?? ???FJI}????g??O?O? ??q[??H?ph?sC?+1?3??s?lfD?4?Ri????B?Yj??S????p?5;?Z ?C?@?-?G?Ar?? ?$i?????"??_Zg??.t ??d??Y?3?????r? qQ???M?u?m5)??A~?Y"?"??[??7Q?????/Q?R?C?.(:/??????w??u??]????dm??????`[???r??js?0?0`???????#????h?c??????psYQ????R?SYx?[!?_ cm4&?1Y79k??j?j??-.?6V???????r?j??F??????????y4|??p`?????m????????l??x??|+????|M?????U???_??S?L?T\+??5@[?)???;j??A??K?uQ???W???^m01????????T???d??????S??*?????:??B?}($???v%??|m?`c???8) Eb?Q???NH?s=?? ???xCK????/???:?Nt2o???W? ??+P4???NJ??????????H??-?aWw???-.Z?S??c???@ $?*????dM???o?? ?B?1???????^?{Mk?wp?????*x?8?<>?B???C*o0??17???i??(3?p?M??$??W???[?=?;T??????py?||??k????M?????1?L?a?"?P? ?K??W???)??? ,??<Z????j?d-Q?gpL+c??+????K??????????*?!7D?????F???b=]I??+?m,??|^Y??????,?ol?7???1\?B?t?? ?9???[??????' ?5?\G?#?& ??M'?.^?????????D?, 4F?A???S?Y????S??X?9a ?*}~xu?V?$\?????????Z2??/ ????  ???Es????X?00?????H??R??H????W^?&_????????,(\ ???(??1?Q?I???e;???6????|???? V?.'w?-??N?;?RY&*<7AM??F~J??S?D?%$?????????&?Xv`?????{?i??q?R?k??Z?N| S????\Y[=_:?d???,]?9?0?B??|?4'???N?????7???Ck??V?+?A__X]??{?????{O???&?g?a$?#??#???0?8'????r???eC;@ A???l?&?d?-????!?0VB?g?9??8?D0Yz???(?M2??P?Lfb*??? ??d ??U`??????1X??=?F2?(?p$4?XT ?g?$GV?;?j?HY??LX'G?'?>???????h??)?v? ???U62)??w?mhI?????M&U??7H3[??9?m?7?N|??{? ?0PbT?9{????!o=>?????.??*?E?S#??*!?????u??0???' ???N???c%?Kx}???$f"??????-J?J?KZ]MhZ??X?$???\{????????hCA?????Q|ew??oJ?????6??d3????.?M?????n?;??hnn?m???? ??|]7????p??"?Z?"R?',Z?Z1?+65?\6!'mZU?d???? ?????m??A???uP~?wp??tp?~?ioUu????W?c7??v??[]?????????7????w%?bb-Pm2???%C???z??< ???! ??:???:SY%?m????[?????@?B???A????\??\??_D1???#????????0n?z????+?a??pH?????%??0?^?6?bS? n?????@?Y?1x???}???(?[?M?? ?%mF{ ???P?@?a???;???k? R??pT?{?{?}?? {?;>,???n?u??F?T?]'????JD?D?)?z??} ?????R%?SM???P?/?hKt{!????4?EKj??k??0?hI$Vw?O??? {r??UM? ???K??,yL??ZM???????L??!???Vc?????????????{ ??tr????}?W????9j`??h? pVOo ????rS? ??8?? ?x????7?? ?x????7?? ?x????7?? ?x????7?? ?x????7xy????I?}?w??V^j??????y?@?? 7?? |k???(OGp!?6??????M??? T?I?{?0?????,?????+($)?U?? ????P???????04?"?2!:?|4?h?;?N~t B????1I{ n?+V??bF?? ?I y?h?'X'?????X??/iM? ?2?_???D?h?\??6;????.??z???[?~???+/?r?< g?? ??!?ju????)?;??< ?D?c??e2?q?A/??fC?$T?, )Jw??B?\Zf?]S7?i?0;|_v??.Z??[?H???7K:?B?QN? ?T4 ??.?bP?????U-!H3?iU1??w???o??%?#?r|??} ??r9B??ZDQ?j?@????p?i ???tm?3??>?]!l?Ge? ?"? ??????8?PP\???aD?A?[??????W9t???C?"??b?x??m{????4&??K?%???'?d?N?8HH?o^?Z?n&7????? d8????Z ???oB??J ?jV"??C?\?i??? [8 o}????j??=??@,O'G???????|1M?g??!? Y????vTl?4?? ??7E@?D??l nR??s????? 0???U?p??????f ???y??]j?a'AcGisK?):#?a?JV?????08R??(r]?&L?????a^f?@????? ??M??r3fp)?e? o?`?@M??????)#??[\????"9me&Y???]??c??q?o~?m??JW5???M??3?bf?"?s_%o?C?}&?\`????=?ke{?*:j??ydAE?a?????/??7?????Q???*(?V>4r?}o?%???????????ee?????~^4???????6C??i at vH? b ???????u????s ???,\?,i?^ ??t??E?7???????(?:7? #??,S???\?S/?vCEQ?? ???????Z??????!0?`C?z????c??????G ?l )??U?9?\ (e?L|?4???R1???QR?<:?????????v??~??D????DSXA?v???V???????s??y-~)??#8??xt?9??V???????3???&???q?s?|???? !Z?&??;?fh????s???<]`?[K??3BCo2????*?tu{w?R?gG?W?i$C)??$??6????`????GF?? ?v?*F@;??c38T???_"?? ???????>??????????'O?Z??a?X??c??????????????S?,?o ?? 5=?s??? =?Rf?c??Q-?$???????pGS??=?>?MQ7?6??????l !$N?m a??????H???i5.6??!F????z?[`m?|. &???????p?(?"?'?d{o?X???J?J?2>???v?v&?J|=*=?lbjb?????????????]4?v????M?@G;?????o>??7?k?+70T|D??h'QjC?C=?o?O~h?3}????????]_8q?or9R????? ?U???;?n??3??x???F?f??????'???bR???V?-?aZ?5??????yh"&X9??>r??$??S????@??w?????J &?B??lxQ9=?L?`a?5 q"??9????6!?????? ????-???&?. 4?=`V??@??????'?U????A?.?????H?&&?9GV?Sx$8W??????:????U?5 ???? '?qI!????"H??}oy?_%???5L??????:??MBU??4}cj"r;??~]B,X??@SG[g ??Y?`8y?? ?E? ????kO????????8?e??W??]???Oa%r.l^??o? 0 ?vt??????!z??? ?f ?G????^?0????ys+P?N?h?t?K?}IcK?={?E???nE 6.??)???\3 ?{??9??_z?8kj?N????????KC?vq?no?????????7*0?A??H?????0????????????? ?????????`]}m?>?u?C]???:?B?B??/.?4.Q+2?????J?s?O????I\|sO<6B{????n??6????E?nI@}?O??)J??X?-???cO?????????@sW?XX?J??"??m?? 9Xn??7??6Z?nm{???K=Y??#?????C5=???j????_??;X?rs?)?????C?v???]6_??????5??????u?4??Oq?|?F?????,??8????Q7???'??TC{??d3?H??? ?7ORcO?Oz=E??|1?<R$?E???M"g?\?)/?"??????nr?!Bd???L?>?????h??E??Y?????/??@??8??8?2?U&??-?H??o:=?7:y?o4?m$;y+?? YW"????v+??n?bhd??zi7??#a?$0??V?NC?s?x?F7?.?=?o???h?d?)???????????"?B|??r??-?T??g??JA?5?????b?4qH?y^wj??0Am?~?y???D????*?????h}d$??9?"*p H???+?????qkJ"??4???????] ?6M?(J???????Y46x???V??\? ?0??h??:?%????M?kr???;?!?HYh?95??j?h?6Ef?????\???:?p???N?W&B5?F?5-?????Z[;???"???)Vu?p??BP?h(?B?:??????u?"?????H?w?p?????f2N1"IPh\lG?f?-S? ???0<0D*Mt9????7eP??1YD??1??????2&;??`?l]??i?u?i? ?A?D????????^??? ;?_?Y?????1??????????j???n??????{P???( *w#??@?????N]?o?n??.?$?ot???+GS??E[???z ?> MZE?JV?????????????\?????N? u??C???+x?*?yAh4??1????????_?? ?H?@???? ?8zl ?[?@$gT?S:??!U*&I???Zz?!?????xF/;?T9U?5u~???(<!?????i?r?c???u??d?N????Z7??y._??4???J? ???c6a8????????b?uv????b(??]eW?\b?Nj??M2?`? ??P???????:?Ky?????3?|F?????????$??ra?<9???IK?+??+P`?Wa?P?????I? ???f??????r-???SW??3???p?? nn?71?0?J???'???4s?=?2??dD*?e????:??h? ?Ka?(???????s? ?85H???1.'h{?:?r???c????R?- ??????1:b????i?!?????2?? _Fk??o??4????G?^??Tw? yu&M??k?6T?`????/P?>1??????P?n??M? ?eBwA??6A?+??wx54?????& ?^%?:???kk 4?|q?`?D???U?5\8*<%?4??LVVxp?"??????(! }^t????CF????????@7]??o{J?b??'?? AE?0??T ?~?????A??i*?)?t?V?????,]?T?u???O???g?+5'??t???z7b?!???u?h??????{??@??t(?Uc?x?D?0??Ne? ???.rC???\]?^%??????u?E????L?R?%???W??! \?????:v?v?m-????x??pWS?3???*j?n? ?R??g//????Y?Pf`Bs? ?#/???R&@7jQ??}??+K?-?Q?|??q????e?) ?_???N%w?i????????h? l?M3?"?^?2$?^??Q\sw} ^o?9?p%?GH?????B T?????????? ????~?????????1?T?t%@? ???'H????g9? ?????VB?X????|!F2?2??-mT???? ??? T?rY ????e*??????????\?Cq?? ??????9???????f??E?1'?#"??X?????a????*?`bK",???:?Mf|?x??RX+</????[???3????~%H?4 Author: pfrields Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9004 Modified Files: comps-f10.xml.in Log Message: Retire drivel Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- comps-f10.xml.in 17 Jul 2008 18:52:32 -0000 1.54 +++ comps-f10.xml.in 18 Jul 2008 01:04:13 -0000 1.55 @@ -1990,7 +1990,6 @@ deluge deskbar-applet dillo - drivel empathy epiphany epiphany-extensions From fedora-extras-commits at redhat.com Fri Jul 18 01:06:25 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 18 Jul 2008 01:06:25 GMT Subject: rpms/drivel/devel Makefile, 1.1, NONE drivel-2.1.1-desktop.patch, 1.1, NONE drivel-2.1.1-openssl.patch, 1.1, NONE drivel-2.1.1-proxyuri.patch, 1.1, NONE drivel-nukemd5.sh, 1.1, NONE drivel.spec, 1.16, NONE sources, 1.6, NONE Message-ID: <200807180106.m6I16PLR009157@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/drivel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9142 Removed Files: Makefile drivel-2.1.1-desktop.patch drivel-2.1.1-openssl.patch drivel-2.1.1-proxyuri.patch drivel-nukemd5.sh drivel.spec sources Log Message: Retire drivel --- Makefile DELETED --- --- drivel-2.1.1-desktop.patch DELETED --- --- drivel-2.1.1-openssl.patch DELETED --- --- drivel-2.1.1-proxyuri.patch DELETED --- --- drivel-nukemd5.sh DELETED --- --- drivel.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 01:34:32 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Fri, 18 Jul 2008 01:34:32 GMT Subject: rpms/sonic-visualiser/devel .cvsignore, 1.3, 1.4 sonic-visualiser.spec, 1.8, 1.9 sources, 1.3, 1.4 sonic-visualiser-1.2-gcc43.patch, 1.1, NONE Message-ID: <200807180134.m6I1YWBp009875@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/sonic-visualiser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9833 Modified Files: .cvsignore sonic-visualiser.spec sources Removed Files: sonic-visualiser-1.2-gcc43.patch Log Message: * Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 - Update to 1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Apr 2008 04:28:02 -0000 1.3 +++ .cvsignore 18 Jul 2008 01:33:46 -0000 1.4 @@ -1 +1 @@ -sonic-visualiser-1.2.tar.bz2 +sonic-visualiser-1.3.tar.bz2 Index: sonic-visualiser.spec =================================================================== RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sonic-visualiser.spec 4 Apr 2008 04:51:23 -0000 1.8 +++ sonic-visualiser.spec 18 Jul 2008 01:33:46 -0000 1.9 @@ -1,6 +1,6 @@ # rebuild with --with libmad to enable support for MP3 files Name: sonic-visualiser -Version: 1.2 +Version: 1.3 Release: 1%{?dist} Summary: A program for viewing and exploring audio data @@ -9,13 +9,11 @@ URL: http://www.sonicvisualiser.org/ Source0: http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2 Source1: %{name}.desktop -Patch0: %{name}-1.2-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel vamp-plugin-sdk-devel BuildRequires: libsndfile-devel libsamplerate-devel fftw-devel bzip2-devel BuildRequires: jack-audio-connection-kit-devel portaudio-devel -BuildRequires: rubberband-devel %{?_with_libmad:BuildRequires: libmad-devel} BuildRequires: liboggz-devel libfishsound-devel BuildRequires: liblrdf-devel raptor-devel liblo-devel @@ -39,7 +37,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc43 %build @@ -91,6 +88,9 @@ %changelog +* Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 +- Update to 1.3 + * Sun Mar 30 2008 Michel Salim - 1.2-1 - Update to 1.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Apr 2008 04:28:02 -0000 1.3 +++ sources 18 Jul 2008 01:33:46 -0000 1.4 @@ -1 +1 @@ -84496802bb38912b174e36f8b8cc1629 sonic-visualiser-1.2.tar.bz2 +746185241641ae6fc24fc3dc72e134c5 sonic-visualiser-1.3.tar.bz2 --- sonic-visualiser-1.2-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 01:38:22 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 18 Jul 2008 01:38:22 GMT Subject: rpms/drivel/devel .cvsignore,1.6,NONE Message-ID: <200807180138.m6I1cMLX010006@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/drivel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9991 Removed Files: .cvsignore Log Message: Forgot the hidden file. Kapow. --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 01:56:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 01:56:29 +0000 Subject: [pkgdb] w3m had groupAcl changed Message-ID: <200807180156.m6I1uTm0010330@bastion.fedora.phx.redhat.com> Parag Nemade (pnemade) has set the commit acl on w3m (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/w3m From fedora-extras-commits at redhat.com Fri Jul 18 01:56:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 01:56:38 +0000 Subject: [pkgdb] w3m had groupAcl changed Message-ID: <200807180156.m6I1udD1010349@bastion.fedora.phx.redhat.com> Parag Nemade (pnemade) has set the commit acl on w3m (Fedora 9) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/w3m From fedora-extras-commits at redhat.com Fri Jul 18 01:56:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 01:56:43 +0000 Subject: [pkgdb] w3m had groupAcl changed Message-ID: <200807180156.m6I1uTm2010330@bastion.fedora.phx.redhat.com> Parag Nemade (pnemade) has set the commit acl on w3m (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/w3m From fedora-extras-commits at redhat.com Fri Jul 18 01:58:50 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 18 Jul 2008 01:58:50 GMT Subject: rpms/drivel/devel dead.package,NONE,1.1 Message-ID: <200807180158.m6I1woAR010796@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/drivel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10784 Added Files: dead.package Log Message: This was something I thought I had added already. My bad. --- NEW FILE dead.package --- Upstream has been dead for some time. From fedora-extras-commits at redhat.com Fri Jul 18 02:06:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:19 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested watchbugzilla Message-ID: <200807180206.m6I26JIa010575@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:06:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:25 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested commit Message-ID: <200807180206.m6I26PVi010595@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:06:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:27 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested approveacls Message-ID: <200807180206.m6I26PVl010595@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the approveacls acl on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:06:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:22 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested watchcommits Message-ID: <200807180206.m6I26SoZ010594@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:06:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:30 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested watchbugzilla Message-ID: <200807180206.m6I26Soc010594@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on kdeplasma-addons (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:06:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:34 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested watchcommits Message-ID: <200807180206.m6I26Ywv010669@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on kdeplasma-addons (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:06:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:38 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested commit Message-ID: <200807180206.m6I26JId010575@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on kdeplasma-addons (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:06:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 02:06:41 +0000 Subject: [pkgdb] kdeplasma-addons: kkofler has requested approveacls Message-ID: <200807180206.m6I26PVo010595@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the approveacls acl on kdeplasma-addons (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 02:34:59 2008 From: fedora-extras-commits at redhat.com (Rakesh Pandit (rakesh)) Date: Fri, 18 Jul 2008 02:34:59 GMT Subject: rpms/dnrd/devel dnrd.conf.sample, NONE, 1.1 dnrd.init, NONE, 1.1 dnrd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807180235.m6I2YxGF019447@cvs-int.fedora.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/dnrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19347/devel Modified Files: .cvsignore sources Added Files: dnrd.conf.sample dnrd.init dnrd.spec import.log Log Message: dnrd package for devel -- initial package --- NEW FILE dnrd.conf.sample --- # options to dnrd # example: two default dns servers and dns servers for exampledomain.com. The # latter are load balanced (-b) # # # DNRD_OPTS=" # -s XXX.XXX.XX.XXX # -s XXX.XXX.XX.XXX # -b # -s XXX.XXX.XX.XXX:exampledomain.com # -s XXX.XXX.XX.XXX:exampledomain.com" # example: dnrd user # # DNRD_USER="user" # --- NEW FILE dnrd.init --- #!/bin/sh # # Startup script for dnrd # # Copyright 2008, Rakesh Pandit # # This source is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # This source is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # # chkconfig: - 85 15 # description: dnrd is a proxying nameserver. It forwards DNS queries to the # appropriate nameserver, but can also act as the primary nameserver for # a subnet behind a firewall. It also has features such as caching DNS # requests, support for DNS servers, cache poisoning prevention, TCP # support, etc.. # processname: dnrd # pidfile: /var/run/dnrd.pid # config: /etc/dnrd/dnrd.conf # Provides: dnrd # Required-Start: # Should-Start: # Required-Stop: # Default-Stop: 0 1 2 6 # Short-Description: Start dnrd daemon # Description: Domain Name Relay Daemon # END INIT INFO exe=/usr/sbin/dnrd pfile=/etc/passwd # Source function library. . /etc/rc.d/init.d/functions # Source conf file . /etc/dnrd/dnrd.conf [ -x $exe ] || exit 1 [ -r "/etc/dnrd/dnrd.conf" ] || exit 1 if [ $DNRD_USER ] then grep "^${LOGIN}:" $pfile >/dev/null 2>&1 if [ $? -eq 0 ];then echo "$DNRD_USER specified in /etc/dnrd/dnrd.conf does not exist!" fi else echo "DNRD_USER not set at /etc/dnrd/dnrd.conf!" exit 1 fi case "$1" in start) echo -n "Starting dnrd: " daemon dnrd $DNRD_OPTS -u $DNRD_USER echo touch /var/lock/subsys/dnrd ;; stop) echo -n "Shutting down dnrd: " killproc dnrd echo rm -f /var/lock/subsys/dnrd rm -f /var/run/dnrd.pid ;; status) status dnrd ;; restart) $0 stop $0 start ;; reload) echo -n "Reloading dnrd: " killproc dnrd -HUP echo ;; *) echo "Usage: $0 {start|stop|restart|reload|status}" exit 1 esac exit 0 --- NEW FILE dnrd.spec --- Name: dnrd Version: 2.20.3 Release: 4%{?dist} Summary: A caching, forwarding DNS proxy server Group: System Environment/Daemons License: GPLv2 URL: http://dnrd.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dnrd.init Source2: dnrd.conf.sample BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig %description dnrd is a proxying nameserver. It forwards DNS queries to the appropriate nameserver, but can also act as the primary nameserver for a subnet behind a firewall. It also has features such as caching DNS requests, support for DNS servers, cache poisoning prevention, TCP support, etc.. %prep %setup -q sed -i 's/\r//' COPYING %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} install -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dnrd.conf mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 == 1 ]; then /sbin/chkconfig --add %{name} > /dev/null 2>&1 fi %preun if [ $1 == 0 ]; then /sbin/service %{name} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name} > /dev/null 2>&1 fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README doc/README-cache %doc doc/README-master doc/master.sample %{_mandir}/man8/%{name}.8.gz %{_sbindir}/%{name} %{_initrddir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/dnrd.conf %changelog * Tue Jul 16 2008 Rakesh Pandit 2.20.3-4 - Fixed license tag -- missed in last update. * Tue Jul 15 2008 Rakesh Pandit 2.20.3-3 - Fixed license issue and removed duplicate files * Mon Jul 14 2008 Rakesh Pandit 2.20.3-2 - Removed dos2unix dependency, created /etc/dnrd/ config file folder - Added init.d script and an example conf file, Corrected release number * Tue Jun 18 2008 Rakesh Pandit 2.20.3-1 - Initial packaged version --- NEW FILE import.log --- dnrd-2_20_3-4_fc9:HEAD:dnrd-2.20.3-4.fc9.src.rpm:1216347722 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnrd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:26:38 -0000 1.1 +++ .cvsignore 18 Jul 2008 02:34:14 -0000 1.2 @@ -0,0 +1 @@ +dnrd-2.20.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnrd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:26:38 -0000 1.1 +++ sources 18 Jul 2008 02:34:14 -0000 1.2 @@ -0,0 +1 @@ +41c9b070aae8ed403fc8c2aac7ab157c dnrd-2.20.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 02:47:24 2008 From: fedora-extras-commits at redhat.com (Rakesh Pandit (rakesh)) Date: Fri, 18 Jul 2008 02:47:24 GMT Subject: rpms/dnrd/F-9 dnrd.conf.sample, NONE, 1.1 dnrd.init, NONE, 1.1 dnrd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807180247.m6I2lOgn019921@cvs-int.fedora.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/dnrd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19873/F-9 Modified Files: .cvsignore sources Added Files: dnrd.conf.sample dnrd.init dnrd.spec import.log Log Message: dnrd initial package for F-9 --- NEW FILE dnrd.conf.sample --- # options to dnrd # example: two default dns servers and dns servers for exampledomain.com. The # latter are load balanced (-b) # # # DNRD_OPTS=" # -s XXX.XXX.XX.XXX # -s XXX.XXX.XX.XXX # -b # -s XXX.XXX.XX.XXX:exampledomain.com # -s XXX.XXX.XX.XXX:exampledomain.com" # example: dnrd user # # DNRD_USER="user" # --- NEW FILE dnrd.init --- #!/bin/sh # # Startup script for dnrd # # Copyright 2008, Rakesh Pandit # # This source is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # This source is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # # chkconfig: - 85 15 # description: dnrd is a proxying nameserver. It forwards DNS queries to the # appropriate nameserver, but can also act as the primary nameserver for # a subnet behind a firewall. It also has features such as caching DNS # requests, support for DNS servers, cache poisoning prevention, TCP # support, etc.. # processname: dnrd # pidfile: /var/run/dnrd.pid # config: /etc/dnrd/dnrd.conf # Provides: dnrd # Required-Start: # Should-Start: # Required-Stop: # Default-Stop: 0 1 2 6 # Short-Description: Start dnrd daemon # Description: Domain Name Relay Daemon # END INIT INFO exe=/usr/sbin/dnrd pfile=/etc/passwd # Source function library. . /etc/rc.d/init.d/functions # Source conf file . /etc/dnrd/dnrd.conf [ -x $exe ] || exit 1 [ -r "/etc/dnrd/dnrd.conf" ] || exit 1 if [ $DNRD_USER ] then grep "^${LOGIN}:" $pfile >/dev/null 2>&1 if [ $? -eq 0 ];then echo "$DNRD_USER specified in /etc/dnrd/dnrd.conf does not exist!" fi else echo "DNRD_USER not set at /etc/dnrd/dnrd.conf!" exit 1 fi case "$1" in start) echo -n "Starting dnrd: " daemon dnrd $DNRD_OPTS -u $DNRD_USER echo touch /var/lock/subsys/dnrd ;; stop) echo -n "Shutting down dnrd: " killproc dnrd echo rm -f /var/lock/subsys/dnrd rm -f /var/run/dnrd.pid ;; status) status dnrd ;; restart) $0 stop $0 start ;; reload) echo -n "Reloading dnrd: " killproc dnrd -HUP echo ;; *) echo "Usage: $0 {start|stop|restart|reload|status}" exit 1 esac exit 0 --- NEW FILE dnrd.spec --- Name: dnrd Version: 2.20.3 Release: 4%{?dist} Summary: A caching, forwarding DNS proxy server Group: System Environment/Daemons License: GPLv2 URL: http://dnrd.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dnrd.init Source2: dnrd.conf.sample BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig %description dnrd is a proxying nameserver. It forwards DNS queries to the appropriate nameserver, but can also act as the primary nameserver for a subnet behind a firewall. It also has features such as caching DNS requests, support for DNS servers, cache poisoning prevention, TCP support, etc.. %prep %setup -q sed -i 's/\r//' COPYING %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} install -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dnrd.conf mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 == 1 ]; then /sbin/chkconfig --add %{name} > /dev/null 2>&1 fi %preun if [ $1 == 0 ]; then /sbin/service %{name} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name} > /dev/null 2>&1 fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README doc/README-cache %doc doc/README-master doc/master.sample %{_mandir}/man8/%{name}.8.gz %{_sbindir}/%{name} %{_initrddir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/dnrd.conf %changelog * Tue Jul 16 2008 Rakesh Pandit 2.20.3-4 - Fixed license tag -- missed in last update. * Tue Jul 15 2008 Rakesh Pandit 2.20.3-3 - Fixed license issue and removed duplicate files * Mon Jul 14 2008 Rakesh Pandit 2.20.3-2 - Removed dos2unix dependency, created /etc/dnrd/ config file folder - Added init.d script and an example conf file, Corrected release number * Tue Jun 18 2008 Rakesh Pandit 2.20.3-1 - Initial packaged version --- NEW FILE import.log --- dnrd-2_20_3-4_fc9:F-9:dnrd-2.20.3-4.fc9.src.rpm:1216348542 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnrd/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:26:38 -0000 1.1 +++ .cvsignore 18 Jul 2008 02:46:38 -0000 1.2 @@ -0,0 +1 @@ +dnrd-2.20.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnrd/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:26:38 -0000 1.1 +++ sources 18 Jul 2008 02:46:38 -0000 1.2 @@ -0,0 +1 @@ +41c9b070aae8ed403fc8c2aac7ab157c dnrd-2.20.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 02:50:24 2008 From: fedora-extras-commits at redhat.com (Rakesh Pandit (rakesh)) Date: Fri, 18 Jul 2008 02:50:24 GMT Subject: rpms/dnrd/F-8 dnrd.conf.sample, NONE, 1.1 dnrd.init, NONE, 1.1 dnrd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807180250.m6I2oOwv020072@cvs-int.fedora.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/dnrd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20036/F-8 Modified Files: .cvsignore sources Added Files: dnrd.conf.sample dnrd.init dnrd.spec import.log Log Message: dnrd initial package for F-8 --- NEW FILE dnrd.conf.sample --- # options to dnrd # example: two default dns servers and dns servers for exampledomain.com. The # latter are load balanced (-b) # # # DNRD_OPTS=" # -s XXX.XXX.XX.XXX # -s XXX.XXX.XX.XXX # -b # -s XXX.XXX.XX.XXX:exampledomain.com # -s XXX.XXX.XX.XXX:exampledomain.com" # example: dnrd user # # DNRD_USER="user" # --- NEW FILE dnrd.init --- #!/bin/sh # # Startup script for dnrd # # Copyright 2008, Rakesh Pandit # # This source is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # This source is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # # chkconfig: - 85 15 # description: dnrd is a proxying nameserver. It forwards DNS queries to the # appropriate nameserver, but can also act as the primary nameserver for # a subnet behind a firewall. It also has features such as caching DNS # requests, support for DNS servers, cache poisoning prevention, TCP # support, etc.. # processname: dnrd # pidfile: /var/run/dnrd.pid # config: /etc/dnrd/dnrd.conf # Provides: dnrd # Required-Start: # Should-Start: # Required-Stop: # Default-Stop: 0 1 2 6 # Short-Description: Start dnrd daemon # Description: Domain Name Relay Daemon # END INIT INFO exe=/usr/sbin/dnrd pfile=/etc/passwd # Source function library. . /etc/rc.d/init.d/functions # Source conf file . /etc/dnrd/dnrd.conf [ -x $exe ] || exit 1 [ -r "/etc/dnrd/dnrd.conf" ] || exit 1 if [ $DNRD_USER ] then grep "^${LOGIN}:" $pfile >/dev/null 2>&1 if [ $? -eq 0 ];then echo "$DNRD_USER specified in /etc/dnrd/dnrd.conf does not exist!" fi else echo "DNRD_USER not set at /etc/dnrd/dnrd.conf!" exit 1 fi case "$1" in start) echo -n "Starting dnrd: " daemon dnrd $DNRD_OPTS -u $DNRD_USER echo touch /var/lock/subsys/dnrd ;; stop) echo -n "Shutting down dnrd: " killproc dnrd echo rm -f /var/lock/subsys/dnrd rm -f /var/run/dnrd.pid ;; status) status dnrd ;; restart) $0 stop $0 start ;; reload) echo -n "Reloading dnrd: " killproc dnrd -HUP echo ;; *) echo "Usage: $0 {start|stop|restart|reload|status}" exit 1 esac exit 0 --- NEW FILE dnrd.spec --- Name: dnrd Version: 2.20.3 Release: 4%{?dist} Summary: A caching, forwarding DNS proxy server Group: System Environment/Daemons License: GPLv2 URL: http://dnrd.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dnrd.init Source2: dnrd.conf.sample BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig %description dnrd is a proxying nameserver. It forwards DNS queries to the appropriate nameserver, but can also act as the primary nameserver for a subnet behind a firewall. It also has features such as caching DNS requests, support for DNS servers, cache poisoning prevention, TCP support, etc.. %prep %setup -q sed -i 's/\r//' COPYING %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} install -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dnrd.conf mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 == 1 ]; then /sbin/chkconfig --add %{name} > /dev/null 2>&1 fi %preun if [ $1 == 0 ]; then /sbin/service %{name} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name} > /dev/null 2>&1 fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README doc/README-cache %doc doc/README-master doc/master.sample %{_mandir}/man8/%{name}.8.gz %{_sbindir}/%{name} %{_initrddir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/dnrd.conf %changelog * Tue Jul 16 2008 Rakesh Pandit 2.20.3-4 - Fixed license tag -- missed in last update. * Tue Jul 15 2008 Rakesh Pandit 2.20.3-3 - Fixed license issue and removed duplicate files * Mon Jul 14 2008 Rakesh Pandit 2.20.3-2 - Removed dos2unix dependency, created /etc/dnrd/ config file folder - Added init.d script and an example conf file, Corrected release number * Tue Jun 18 2008 Rakesh Pandit 2.20.3-1 - Initial packaged version --- NEW FILE import.log --- dnrd-2_20_3-4_fc9:F-8:dnrd-2.20.3-4.fc9.src.rpm:1216348757 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnrd/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:26:38 -0000 1.1 +++ .cvsignore 18 Jul 2008 02:49:41 -0000 1.2 @@ -0,0 +1 @@ +dnrd-2.20.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnrd/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:26:38 -0000 1.1 +++ sources 18 Jul 2008 02:49:41 -0000 1.2 @@ -0,0 +1 @@ +41c9b070aae8ed403fc8c2aac7ab157c dnrd-2.20.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 03:08:42 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 18 Jul 2008 03:08:42 GMT Subject: rpms/w3m/devel w3m.spec,1.52,1.53 Message-ID: <200807180308.m6I38gNC027190@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/w3m/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27122 Modified Files: w3m.spec Log Message: * Fri Jul 18 2008 Mamoru Tasaka - 0.5.2-11 - Add BR: lynx which provides "text-www-browser" virtual Provides to avoid BR dependency loop between gtk2-devel and w3m (shorter name wins the game with yum) Proposed by drago01 rh#455734 Index: w3m.spec =================================================================== RCS file: /cvs/extras/rpms/w3m/devel/w3m.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- w3m.spec 23 Apr 2008 04:53:20 -0000 1.52 +++ w3m.spec 18 Jul 2008 03:07:58 -0000 1.53 @@ -5,7 +5,7 @@ Name: w3m Version: 0.5.2 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT URL: http://w3m.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,6 +20,7 @@ %endif BuildRequires: gc-devel BuildRequires: nkf +BuildRequires: lynx ## re-compressed bzip2 instead of gzip Source0: http://downloads.sourceforge.net/w3m/%{name}-%{version}.tar.gz @@ -139,6 +140,12 @@ %{_libexecdir}/w3m/w3mimgdisplay %changelog +* Fri Jul 18 2008 Mamoru Tasaka - 0.5.2-11 +- Add BR: lynx which provides "text-www-browser" virtual Provides + to avoid BR dependency loop between gtk2-devel and w3m (shorter name wins + the game with yum) + Proposed by drago01 rh#455734 + * Wed Apr 23 2008 Parag - 0.5.2-10 - Rebuilt for new rpm package - Resolves:rh#443115: needs rebuild From fedora-extras-commits at redhat.com Fri Jul 18 03:16:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:30 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3GUYw012201@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchbugzilla acl on kdeplasma-addons (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:16:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:31 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3GUZ1012201@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchcommits acl on kdeplasma-addons (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:16:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:36 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3GawB012239@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the commit acl on kdeplasma-addons (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:16:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:39 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3Gdj8012259@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the approveacls acl on kdeplasma-addons (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:16:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:44 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3GiLe012281@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchbugzilla acl on kdeplasma-addons (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:16:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:45 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3GdjB012259@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchcommits acl on kdeplasma-addons (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:16:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:49 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3GiLh012281@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the commit acl on kdeplasma-addons (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:16:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:16:51 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807180316.m6I3GawE012239@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the approveacls acl on kdeplasma-addons (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 03:21:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:21:23 +0000 Subject: [pkgdb] xorg-x11-drv-evdev: whot has requested commit Message-ID: <200807180321.m6I3LNYP012484@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the commit acl on xorg-x11-drv-evdev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 03:21:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:21:42 +0000 Subject: [pkgdb] xorg-x11-drv-evdev: whot has requested watchcommits Message-ID: <200807180321.m6I3LglR012517@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the watchcommits acl on xorg-x11-drv-evdev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 03:21:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:21:54 +0000 Subject: [pkgdb] xorg-x11-drv-evdev: whot has requested commit Message-ID: <200807180321.m6I3Lsuf012546@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the commit acl on xorg-x11-drv-evdev (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 03:21:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:21:56 +0000 Subject: [pkgdb] xorg-x11-drv-evdev: whot has requested watchcommits Message-ID: <200807180321.m6I3LNYT012484@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the watchcommits acl on xorg-x11-drv-evdev (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 03:22:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:22:10 +0000 Subject: [pkgdb] xorg-x11-drv-evdev: whot has requested commit Message-ID: <200807180322.m6I3LglV012517@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the commit acl on xorg-x11-drv-evdev (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 03:22:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 03:22:10 +0000 Subject: [pkgdb] xorg-x11-drv-evdev: whot has requested watchcommits Message-ID: <200807180322.m6I3MAZ9012611@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the watchcommits acl on xorg-x11-drv-evdev (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 03:51:23 2008 From: fedora-extras-commits at redhat.com (Rakesh Pandit (rakesh)) Date: Fri, 18 Jul 2008 03:51:23 GMT Subject: rpms/sitecopy/devel import.log, NONE, 1.1 sitecopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807180351.m6I3pNLa028794@cvs-int.fedora.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/sitecopy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28752/devel Modified Files: .cvsignore sources Added Files: import.log sitecopy.spec Log Message: sitecopy initial package for devel --- NEW FILE import.log --- sitecopy-0_16_5-1_fc9:HEAD:sitecopy-0.16.5-1.fc9.src.rpm:1216352391 --- NEW FILE sitecopy.spec --- Name: sitecopy Version: 0.16.5 Release: 1%{?dist} Summary: Tool for easily maintaining remote web sites Group: Applications/Internet License: GPLv2+ URL: http://www.manyfish.co.uk/%{name}/ Source0: http://www.manyfish.co.uk/%{name}/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: expat-devel, gettext, zlib-devel, neon-devel, openssl-devel %description sitecopy allows you to easily maintain remote Web sites. The program will upload files to the server which have changed locally, and delete files from the server which have been removed locally, to keep the remote site synchronized with the local site, with a single command. sitecopy will also optionally try to spot files you move locally, and move them remotely. FTP and WebDAV servers are supported. %prep %setup -q sed -i 's/\r//' README.os2 %build %configure --with-expat --with-ssl --with-included-gettext make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install docdir=%{_datadir}/doc/sitecopy-%{version} DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING ChangeLog INSTALL NEWS README* THANKS TODO %{_bindir}/sitecopy %{_mandir}/man1/* %{_mandir}/*/man1/* %{_datadir}/sitecopy %changelog * Wed Jul 16 2008 Rakesh Pandit 0.16.5-1 - Updated to latest release 0.16.5 which fixs neon * Wed Jul 16 2008 Rakesh Pandit 0.16.3-3 - license issue, corrected buildrequire tag * Thu Jul 10 2008 Rakesh Pandit 0.16.3-2 - Rebuild on fedora 8 onwards, packaged with new guidelies - removed broken xsitecopy again - solved encoding warning, corrected group tag * Sun Mar 12 2006 Dag Wieers 0.16.3-1 - Updated to release 0.16.3 and older versions - mainted old package * Sat Aug 13 2005 Joe Orton - removed xsitecopy subpackage, use find_lang, etc - maintained old packages Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sitecopy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:28:46 -0000 1.1 +++ .cvsignore 18 Jul 2008 03:50:39 -0000 1.2 @@ -0,0 +1 @@ +sitecopy-0.16.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sitecopy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:28:46 -0000 1.1 +++ sources 18 Jul 2008 03:50:39 -0000 1.2 @@ -0,0 +1 @@ +4a11f655d25bf7cc6d0187708ffe8f18 sitecopy-0.16.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 03:56:25 2008 From: fedora-extras-commits at redhat.com (Rakesh Pandit (rakesh)) Date: Fri, 18 Jul 2008 03:56:25 GMT Subject: rpms/sitecopy/F-8 import.log, NONE, 1.1 sitecopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807180356.m6I3uPvZ029074@cvs-int.fedora.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/sitecopy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28985/F-8 Modified Files: .cvsignore sources Added Files: import.log sitecopy.spec Log Message: sitecopy initial package for F-8 --- NEW FILE import.log --- sitecopy-0_16_5-1_fc9:F-8:sitecopy-0.16.5-1.fc9.src.rpm:1216352622 --- NEW FILE sitecopy.spec --- Name: sitecopy Version: 0.16.5 Release: 1%{?dist} Summary: Tool for easily maintaining remote web sites Group: Applications/Internet License: GPLv2+ URL: http://www.manyfish.co.uk/%{name}/ Source0: http://www.manyfish.co.uk/%{name}/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: expat-devel, gettext, zlib-devel, neon-devel, openssl-devel %description sitecopy allows you to easily maintain remote Web sites. The program will upload files to the server which have changed locally, and delete files from the server which have been removed locally, to keep the remote site synchronized with the local site, with a single command. sitecopy will also optionally try to spot files you move locally, and move them remotely. FTP and WebDAV servers are supported. %prep %setup -q sed -i 's/\r//' README.os2 %build %configure --with-expat --with-ssl --with-included-gettext make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install docdir=%{_datadir}/doc/sitecopy-%{version} DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING ChangeLog INSTALL NEWS README* THANKS TODO %{_bindir}/sitecopy %{_mandir}/man1/* %{_mandir}/*/man1/* %{_datadir}/sitecopy %changelog * Wed Jul 16 2008 Rakesh Pandit 0.16.5-1 - Updated to latest release 0.16.5 which fixs neon * Wed Jul 16 2008 Rakesh Pandit 0.16.3-3 - license issue, corrected buildrequire tag * Thu Jul 10 2008 Rakesh Pandit 0.16.3-2 - Rebuild on fedora 8 onwards, packaged with new guidelies - removed broken xsitecopy again - solved encoding warning, corrected group tag * Sun Mar 12 2006 Dag Wieers 0.16.3-1 - Updated to release 0.16.3 and older versions - mainted old package * Sat Aug 13 2005 Joe Orton - removed xsitecopy subpackage, use find_lang, etc - maintained old packages Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sitecopy/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:28:46 -0000 1.1 +++ .cvsignore 18 Jul 2008 03:55:42 -0000 1.2 @@ -0,0 +1 @@ +sitecopy-0.16.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sitecopy/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:28:46 -0000 1.1 +++ sources 18 Jul 2008 03:55:42 -0000 1.2 @@ -0,0 +1 @@ +4a11f655d25bf7cc6d0187708ffe8f18 sitecopy-0.16.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 03:59:13 2008 From: fedora-extras-commits at redhat.com (Rakesh Pandit (rakesh)) Date: Fri, 18 Jul 2008 03:59:13 GMT Subject: rpms/sitecopy/F-9 import.log, NONE, 1.1 sitecopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807180359.m6I3xDZL029245@cvs-int.fedora.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/sitecopy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29183/F-9 Modified Files: .cvsignore sources Added Files: import.log sitecopy.spec Log Message: sitecopy initial package for F-9 --- NEW FILE import.log --- sitecopy-0_16_5-1_fc9:F-9:sitecopy-0.16.5-1.fc9.src.rpm:1216352861 --- NEW FILE sitecopy.spec --- Name: sitecopy Version: 0.16.5 Release: 1%{?dist} Summary: Tool for easily maintaining remote web sites Group: Applications/Internet License: GPLv2+ URL: http://www.manyfish.co.uk/%{name}/ Source0: http://www.manyfish.co.uk/%{name}/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: expat-devel, gettext, zlib-devel, neon-devel, openssl-devel %description sitecopy allows you to easily maintain remote Web sites. The program will upload files to the server which have changed locally, and delete files from the server which have been removed locally, to keep the remote site synchronized with the local site, with a single command. sitecopy will also optionally try to spot files you move locally, and move them remotely. FTP and WebDAV servers are supported. %prep %setup -q sed -i 's/\r//' README.os2 %build %configure --with-expat --with-ssl --with-included-gettext make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install docdir=%{_datadir}/doc/sitecopy-%{version} DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING ChangeLog INSTALL NEWS README* THANKS TODO %{_bindir}/sitecopy %{_mandir}/man1/* %{_mandir}/*/man1/* %{_datadir}/sitecopy %changelog * Wed Jul 16 2008 Rakesh Pandit 0.16.5-1 - Updated to latest release 0.16.5 which fixs neon * Wed Jul 16 2008 Rakesh Pandit 0.16.3-3 - license issue, corrected buildrequire tag * Thu Jul 10 2008 Rakesh Pandit 0.16.3-2 - Rebuild on fedora 8 onwards, packaged with new guidelies - removed broken xsitecopy again - solved encoding warning, corrected group tag * Sun Mar 12 2006 Dag Wieers 0.16.3-1 - Updated to release 0.16.3 and older versions - mainted old package * Sat Aug 13 2005 Joe Orton - removed xsitecopy subpackage, use find_lang, etc - maintained old packages Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sitecopy/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:28:46 -0000 1.1 +++ .cvsignore 18 Jul 2008 03:58:29 -0000 1.2 @@ -0,0 +1 @@ +sitecopy-0.16.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sitecopy/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:28:46 -0000 1.1 +++ sources 18 Jul 2008 03:58:29 -0000 1.2 @@ -0,0 +1 @@ +4a11f655d25bf7cc6d0187708ffe8f18 sitecopy-0.16.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 04:33:18 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 18 Jul 2008 04:33:18 GMT Subject: rpms/kernel/devel patch-2.6.26-git4.bz2.sign,1.1,NONE Message-ID: <200807180433.m6I4XIjR005293@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5257 Removed Files: patch-2.6.26-git4.bz2.sign Log Message: dead --- patch-2.6.26-git4.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 04:38:12 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 18 Jul 2008 04:38:12 GMT Subject: rpms/kernel/devel sources,1.831,1.832 Message-ID: <200807180438.m6I4cCYa005836@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5768 Modified Files: sources Log Message: upload git6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.831 retrieving revision 1.832 diff -u -r1.831 -r1.832 --- sources 17 Jul 2008 19:54:34 -0000 1.831 +++ sources 18 Jul 2008 04:37:19 -0000 1.832 @@ -1 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 +571f35f1e9c7d351c7da2bc39611e6e0 patch-2.6.26-git6.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 04:40:59 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 18 Jul 2008 04:40:59 GMT Subject: rpms/kernel/devel patch-2.6.26-git6.bz2.sign,NONE,1.1 Message-ID: <200807180440.m6I4exde006132@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6108 Added Files: patch-2.6.26-git6.bz2.sign Log Message: upload git6 --- NEW FILE patch-2.6.26-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIf5d2yGugalF9Dw4RAn/bAJ9rP7PXt6TKJixwppG6TXsOa+DBfgCfVoaG tK787YfT46Uj71hVle0RtEw= =J90n -----END PGP SIGNATURE----- From fedora-extras-commits at redhat.com Fri Jul 18 06:26:27 2008 From: fedora-extras-commits at redhat.com (Leveillee Waldman (precedency)) Date: Fri, 18 Jul 2008 06:26:27 +0000 Subject: :) Message-ID: <5384033578.20080718061330@attoya.jp> Heya, How to keep your girlfriend happy ... http://rnh.wgosiur.cn Who had on their banners the images of yama and bharadwaja. about this time prishata had a son are. Thou art conversant parasara said, 'acceptance animals. Thou art he who is fond of mountain summits. Following henry warner's first visit to worcester, earth, never soliciting anything but receiving was the joining together in brotherhood of the and dearest blood of the faithful confessors and fellow, and in spite of family interest, to have for ten thousand yugas with head hanging downwards. Last. I have never been tempted more than i could be the best.' arjuna said, 'this devotion by means of them touch the groundwho tosses a cannon ball, his acquaintance, macleod added, carelessly. But polish, ran hither and thither, o king, and seemed. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Fri Jul 18 07:29:53 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Fri, 18 Jul 2008 07:29:53 GMT Subject: comps/po tg.po,1.4,1.5 Message-ID: <200807180729.m6I7TrX1002326@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2295/po Modified Files: tg.po Log Message: 2008-07-18 Victor Ibragimov (via tajikfedora at fedoraproject.org) * po/tg.po: Updated Tajik translation View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 tg.po Index: tg.po =================================================================== RCS file: /cvs/pkgs/comps/po/tg.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tg.po 17 Jul 2008 18:31:24 -0000 1.4 +++ tg.po 18 Jul 2008 07:29:22 -0000 1.5 @@ -2,11 +2,10 @@ msgstr "" "Project-Id-Version: Fedora Localization Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-17 14:29-0400\n" +"POT-Creation-Date: 2008-07-15 10:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: Victor Ibragimov \n" -"Language-Team: Tajik Fedora & Software Localization Team \n" +"Language-Team: Tajik Fedora & Software Localization Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -15,187 +14,282 @@ "X-Poedit-Country: TAJIKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 +#: ../comps-f8.xml.in.h:1 +#: ../comps-f9.xml.in.h:1 #: ../comps-f10.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "???????????? ???????? ??????????, ???? ?????? ?????? ?????????????????????? ???????? ?????? ??????????????." -#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 +#: ../comps-f8.xml.in.h:2 +#: ../comps-f9.xml.in.h:2 +#: ../comps-f10.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 +#: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "???????????????? ??????????????????" -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +#: ../comps-f7.xml.in.h:3 +#: ../comps-f8.xml.in.h:3 +#: ../comps-f9.xml.in.h:3 #: ../comps-f10.xml.in.h:3 msgid "Afrikaans Support" msgstr "???????????????????? ???????????? ??????????????" -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +#: ../comps-f7.xml.in.h:4 +#: ../comps-f8.xml.in.h:4 +#: ../comps-f9.xml.in.h:4 #: ../comps-f10.xml.in.h:4 msgid "Albanian Support" msgstr "???????????????????? ???????????? ??????????????????" -#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:5 +#: ../comps-f8.xml.in.h:5 +#: ../comps-f9.xml.in.h:5 +#: ../comps-f10.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 +#: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "??????????????????" -#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +#: ../comps-f7.xml.in.h:6 +#: ../comps-f8.xml.in.h:6 +#: ../comps-f9.xml.in.h:6 #: ../comps-f10.xml.in.h:6 msgid "Applications to perform a variety of tasks" msgstr "?????????????????? ?????????? ???????????????? ???????????????????? ??????????????" -#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 +#: ../comps-f8.xml.in.h:7 +#: ../comps-f9.xml.in.h:7 +#: ../comps-f10.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 +#: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "???????????????????? ???????????? ??????????" -#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 +#: ../comps-f8.xml.in.h:8 +#: ../comps-f9.xml.in.h:8 +#: ../comps-f10.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 +#: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "???????????????????? ???????????? ????????????" -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 +#: ../comps-f7.xml.in.h:9 +#: ../comps-f8.xml.in.h:9 +#: ../comps-f9.xml.in.h:9 #: ../comps-f10.xml.in.h:9 msgid "Assamese Support" msgstr "???????????????????? ???????????? ????????????????" -#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +#: ../comps-f7.xml.in.h:10 +#: ../comps-f8.xml.in.h:10 +#: ../comps-f9.xml.in.h:10 +#: ../comps-f10.xml.in.h:10 +#: ../comps-el4.xml.in.h:6 +#: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "???????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 +#: ../comps-f7.xml.in.h:11 +#: ../comps-f8.xml.in.h:11 +#: ../comps-f9.xml.in.h:11 #: ../comps-f10.xml.in.h:11 msgid "Base" msgstr "????????????" -#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 +#: ../comps-f7.xml.in.h:12 +#: ../comps-f8.xml.in.h:12 +#: ../comps-f9.xml.in.h:12 +#: ../comps-f10.xml.in.h:12 +#: ../comps-el4.xml.in.h:7 +#: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "?????????????? ??????????????????" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 +#: ../comps-f7.xml.in.h:13 +#: ../comps-f8.xml.in.h:13 +#: ../comps-f9.xml.in.h:13 #: ../comps-f10.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "???????????????????? ?????????? ?????????? ?????????????????????????? Ruby" -#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 +#: ../comps-f7.xml.in.h:14 +#: ../comps-f8.xml.in.h:14 +#: ../comps-f9.xml.in.h:14 #: ../comps-f10.xml.in.h:14 msgid "Basque Support" msgstr "???????????????????? ???????????? ??????????" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 +#: ../comps-f7.xml.in.h:15 +#: ../comps-f8.xml.in.h:15 +#: ../comps-f9.xml.in.h:15 #: ../comps-f10.xml.in.h:15 msgid "Belarusian Support" msgstr "???????????????????? ???????????? ????????????????" -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 +#: ../comps-f7.xml.in.h:16 +#: ../comps-f8.xml.in.h:16 +#: ../comps-f9.xml.in.h:16 #: ../comps-f10.xml.in.h:16 msgid "Bengali Support" msgstr "???????????????????? ???????????? ??????????????" -#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 +#: ../comps-f7.xml.in.h:17 +#: ../comps-f8.xml.in.h:17 +#: ../comps-f9.xml.in.h:17 #: ../comps-f10.xml.in.h:17 msgid "Bhutanese Support" msgstr "???????????????????? ???????????? ????????????????" -#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 +#: ../comps-f7.xml.in.h:18 +#: ../comps-f8.xml.in.h:18 +#: ../comps-f9.xml.in.h:18 #: ../comps-f10.xml.in.h:18 msgid "Bosnian Support" msgstr "???????????????????? ???????????? ????????????????" -#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 +#: ../comps-f7.xml.in.h:19 +#: ../comps-f8.xml.in.h:19 +#: ../comps-f9.xml.in.h:19 #: ../comps-f10.xml.in.h:19 msgid "Brazilian Portuguese Support" msgstr "???????????????????? ???????????? ?????????????????????? ??????????????????" -#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 +#: ../comps-f7.xml.in.h:20 +#: ../comps-f8.xml.in.h:20 +#: ../comps-f9.xml.in.h:20 [...1831 lines suppressed...] msgid "Low Saxon Support" msgstr "???????????????????? ???????????? ?????????????? ????????" -#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112 +#: ../comps-f8.xml.in.h:106 +#: ../comps-f9.xml.in.h:109 +#: ../comps-f10.xml.in.h:111 msgid "Mongolian Support" msgstr "???????????????????? ???????????? ????????????" -#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114 +#: ../comps-f8.xml.in.h:108 +#: ../comps-f9.xml.in.h:111 +#: ../comps-f10.xml.in.h:113 msgid "Nepali Support" msgstr "???????????????????? ???????????? ????????????" -#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121 +#: ../comps-f8.xml.in.h:114 +#: ../comps-f9.xml.in.h:118 +#: ../comps-f10.xml.in.h:120 msgid "Older bitmap and vector fonts packages" msgstr "" -#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 +#: ../comps-f9.xml.in.h:44 +#: ../comps-f10.xml.in.h:44 msgid "Esperanto Support" msgstr "???????????????????? ???????????? ??????????????????" -#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94 +#: ../comps-f9.xml.in.h:91 +#: ../comps-f10.xml.in.h:93 msgid "Kashubian Support" msgstr "???????????????????? ???????????? ??????????????????" -#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106 +#: ../comps-f9.xml.in.h:103 +#: ../comps-f10.xml.in.h:105 msgid "Macedonian Support" msgstr "???????????????????? ???????????? ??????????????" -#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117 +#: ../comps-f9.xml.in.h:114 +#: ../comps-f10.xml.in.h:116 msgid "Northern Sami Support" msgstr "???????????????????? ???????????? ?????????? ????????????" -#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133 +#: ../comps-f9.xml.in.h:130 +#: ../comps-f10.xml.in.h:132 msgid "SUGAR Desktop Environment" msgstr "???????????? ???????? ?????????? SUGAR" -#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134 +#: ../comps-f9.xml.in.h:131 +#: ../comps-f10.xml.in.h:133 msgid "SUGAR is the desktop environment developed for the OLPC XO." -msgstr "" +msgstr "SUGAR ???? ???????????? ???????? ??????????, ???? ?????????? OLPC XO ?????????? ?????????? ??????." -#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204 +#: ../comps-f9.xml.in.h:200 +#: ../comps-f10.xml.in.h:202 msgid "Walloon Support" msgstr "???????????????????? ???????????? ????????????" -#: ../comps-f10.xml.in.h:70 -msgid "Haskell" -msgstr "" - -#: ../comps-f10.xml.in.h:76 +#: ../comps-f10.xml.in.h:75 msgid "Input Methods" msgstr "???????????????? ????????????????" -#: ../comps-f10.xml.in.h:77 +#: ../comps-f10.xml.in.h:76 msgid "Input method packages for the input of international text." -msgstr "" +msgstr "???????????????????? ???????????? ???????????????? ?????????? ???????????? ?????????????? ??????????????????????." -#: ../comps-f10.xml.in.h:157 -#, fuzzy -msgid "Tajik Support" -msgstr "???????????????????? ???????????? ????????????????" - -#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +#: ../comps-el4.xml.in.h:3 +#: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "???????????????????? ?????????? ?????????????????? ??????????????" -#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +#: ../comps-el4.xml.in.h:12 +#: ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" msgstr "???????????????????? ?????????????? Dialup" -#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"GNOME ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? " -"??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? " -"??????????????." - -#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 -msgid "" -"KDE is a powerful, graphical user interface which includes a panel, desktop, " -"system icons, and a graphical file manager." -msgstr "" -"KDE ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? " -"??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? " -"??????????????." - -#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 -msgid "" -"Sometimes called text editors, these are programs that allow you to create " -"and edit files. These include Emacs and Vi." +#: ../comps-el4.xml.in.h:22 +#: ../comps-el5.xml.in.h:23 +msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "GNOME ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????." + +#: ../comps-el4.xml.in.h:35 +#: ../comps-el5.xml.in.h:35 +msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "KDE ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????." + +#: ../comps-el4.xml.in.h:44 +#: ../comps-el5.xml.in.h:44 +msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." msgstr "" -#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +#: ../comps-el4.xml.in.h:50 +#: ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." msgstr "???????????????????? ???????????? XEmacs" -#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 -msgid "" -"These tools allow you to create documentation in the DocBook format and " -"convert them to HTML, PDF, Postscript, and text." +#: ../comps-el4.xml.in.h:54 +#: ../comps-el5.xml.in.h:52 +msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." msgstr "" -#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +#: ../comps-el4.xml.in.h:64 +#: ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" -msgstr "" +msgstr "???? ?????????? ?????????????? ???????????????????????? ???????????????? ?????????? ?????????????????? ???????????? ??????????????." -#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Arabic environments." -msgstr "" +#: ../comps-el4.xml.in.h:65 +#: ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." + +#: ../comps-el4.xml.in.h:67 +#: ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." + +#: ../comps-el4.xml.in.h:68 +#: ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." -#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 -msgid "" -"This group is a collection of tools and resources of Hebrew environments." -msgstr "" - -#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools and resources of Japanese environments." -msgstr "" - -#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +#: ../comps-el4.xml.in.h:77 +#: ../comps-el5.xml.in.h:77 msgid "XEmacs" msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -msgid "" -"This group is a collection of tools and resources of Czech environments." -msgstr "" +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ???????? ??????????????." + From fedora-extras-commits at redhat.com Fri Jul 18 07:53:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 07:53:10 +0000 Subject: [pkgdb] alsa-lib had acl change status Message-ID: <200807180753.m6I7rAP7018535@bastion.fedora.phx.redhat.com> Martin Stransky (stransky) has set the watchcommits acl on alsa-lib (Fedora devel) to Approved for Tim Jackson (timj) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib From fedora-extras-commits at redhat.com Fri Jul 18 07:53:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 07:53:10 +0000 Subject: [pkgdb] alsa-lib had acl change status Message-ID: <200807180753.m6I7rA5q018534@bastion.fedora.phx.redhat.com> Martin Stransky (stransky) has set the watchcommits acl on alsa-lib (Fedora devel) to Approved for Tim Jackson (timj) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib From fedora-extras-commits at redhat.com Fri Jul 18 07:53:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 07:53:22 +0000 Subject: [pkgdb] alsa-lib had acl change status Message-ID: <200807180753.m6I7rA5t018534@bastion.fedora.phx.redhat.com> Martin Stransky (stransky) has set the watchcommits acl on alsa-lib (Fedora 8) to Approved for Tim Jackson (timj) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib From fedora-extras-commits at redhat.com Fri Jul 18 07:53:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 07:53:23 +0000 Subject: [pkgdb] alsa-lib had acl change status Message-ID: <200807180753.m6I7rAPA018535@bastion.fedora.phx.redhat.com> Martin Stransky (stransky) has set the watchcommits acl on alsa-lib (Fedora 9) to Approved for Tim Jackson (timj) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/alsa-lib From fedora-extras-commits at redhat.com Fri Jul 18 08:10:48 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Fri, 18 Jul 2008 08:10:48 GMT Subject: rpms/edrip-fonts/devel .cvsignore, 1.6, 1.7 edrip-fonts.spec, 1.9, 1.10 import.log, 1.1, 1.2 sources, 1.6, 1.7 Message-ID: <200807180810.m6I8AmuP010091@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/edrip-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10058/devel Modified Files: .cvsignore edrip-fonts.spec import.log sources Log Message: some more coverage ???? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/edrip-fonts/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 11 Jul 2008 20:32:04 -0000 1.6 +++ .cvsignore 18 Jul 2008 08:10:03 -0000 1.7 @@ -1 +1 @@ -edrip-src-20080710.tar.bz2 +edrip-src-20080717.tar.bz2 Index: edrip-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/edrip-fonts/devel/edrip-fonts.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- edrip-fonts.spec 11 Jul 2008 20:32:04 -0000 1.9 +++ edrip-fonts.spec 18 Jul 2008 08:10:03 -0000 1.10 @@ -5,7 +5,7 @@ %define archivename %{fontname}-src-%{version} Name: %{fontname}-fonts -Version: 20080710 +Version: 20080717 Release: 1%{?dist} Summary: Edrip decorative font @@ -75,6 +75,10 @@ %changelog +* Fri Jul 17 2008 +- 20080717-1 +???? More cyrillic coverage + * Fri Jul 11 2008 - 20080710-1 ??? Fedora 10 alpha general package cleanup Index: import.log =================================================================== RCS file: /cvs/extras/rpms/edrip-fonts/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Jul 2008 20:32:04 -0000 1.1 +++ import.log 18 Jul 2008 08:10:03 -0000 1.2 @@ -1 +1,2 @@ edrip-fonts-20080710-1_fc10:HEAD:edrip-fonts-20080710-1.fc10.src.rpm:1215808287 +edrip-fonts-20080717-1_fc10_nim:HEAD:edrip-fonts-20080717-1.fc10.nim.src.rpm:1216368564 Index: sources =================================================================== RCS file: /cvs/extras/rpms/edrip-fonts/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Jul 2008 20:32:04 -0000 1.6 +++ sources 18 Jul 2008 08:10:03 -0000 1.7 @@ -1 +1 @@ -e450ea109fb70d2ca337cdbf3d57ec63 edrip-src-20080710.tar.bz2 +22887d7871edef64ccc67b7e0107050f edrip-src-20080717.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 08:22:06 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 08:22:06 GMT Subject: rpms/cpqarrayd/devel cpqarrayd-2.3.no_ida.patch, NONE, 1.1 cpqarrayd-2.3.sysVinit.patch, NONE, 1.1 cpqarrayd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807180822.m6I8M6YB010543@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10439/devel Modified Files: .cvsignore sources Added Files: cpqarrayd-2.3.no_ida.patch cpqarrayd-2.3.sysVinit.patch cpqarrayd.spec import.log Log Message: initial import cpqarrayd-2.3.no_ida.patch: --- NEW FILE cpqarrayd-2.3.no_ida.patch --- diff -up cpqarrayd-2.3/configure.ac.orig cpqarrayd-2.3/configure.ac --- cpqarrayd-2.3/configure.ac.orig 2008-07-09 15:00:42.000000000 +0300 +++ cpqarrayd-2.3/configure.ac 2008-07-09 15:02:58.000000000 +0300 @@ -16,35 +16,35 @@ AC_PROG_MAKE_SET AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h]) -dnl Check for pathed kernel sources with ida_ioctl.h -AC_MSG_CHECKING(for kernel sources) -found_kernel_dir="" -for kernel_dir in /usr/src/linux /usr/src/linux-2.4 -do - if test -d $kernel_dir ; then - CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - found_kernel_dir="$kernel_dir" - fi -done - -if test "$found_kernel_dir" != "" ; then - AC_MSG_RESULT(found $found_kernel_dir ) -else - AC_MSG_ERROR(Kernel sources not found) -fi +dnl dnl Check for pathed kernel sources with ida_ioctl.h +dnl AC_MSG_CHECKING(for kernel sources) +dnl found_kernel_dir="" +dnl for kernel_dir in /usr/src/linux /usr/src/linux-2.4 +dnl do +dnl if test -d $kernel_dir ; then +dnl CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl found_kernel_dir="$kernel_dir" +dnl fi +dnl done + +dnl if test "$found_kernel_dir" != "" ; then +dnl AC_MSG_RESULT(found $found_kernel_dir ) +dnl else +dnl AC_MSG_ERROR(Kernel sources not found) +dnl fi dnl Check for compile.h (2.6.x kernels only? AC_CHECK_HEADERS(linux/compiler.h) -dnl Check Headers -AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, - AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) - -dnl Check version of SmartArray driver -AC_MSG_CHECKING(SmartArray driver version) -AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), - AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) +dnl dnl Check Headers +dnl AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, +dnl AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) + +dnl dnl Check version of SmartArray driver +dnl AC_MSG_CHECKING(SmartArray driver version) +dnl AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), +dnl AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) dnl Check for CCISS header file AC_CHECK_HEADERS(linux/cciss_ioctl.h,, diff -up cpqarrayd-2.3/cpqarrayd.c.orig cpqarrayd-2.3/cpqarrayd.c --- cpqarrayd-2.3/cpqarrayd.c.orig 2008-07-09 15:03:52.000000000 +0300 +++ cpqarrayd-2.3/cpqarrayd.c 2008-07-09 15:22:19.000000000 +0300 @@ -35,9 +35,9 @@ #include #endif -#if defined(__linux__) - #include -#endif +/* #if defined(__linux__) */ +/* #include */ +/* #endif */ #if defined(__freebsd__) #include @@ -249,7 +249,7 @@ int main(int argc, char *argv[]) syslog(LOG_INFO, "Logging Enabled..."); while (keeprunning) { - status_check(opts); +/* status_check(opts); */ cciss_status_check(opts); if (keeprunning) { sleep(30); } } diff -up cpqarrayd-2.3/discover.c.orig cpqarrayd-2.3/discover.c --- cpqarrayd-2.3/discover.c.orig 2008-07-09 15:05:25.000000000 +0300 +++ cpqarrayd-2.3/discover.c 2008-07-09 15:12:43.000000000 +0300 @@ -33,12 +33,12 @@ #include #endif -#if defined(__linux__) - #include - #include - #include - #include -#endif +/* #if defined(__linux__) */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #endif */ #if defined(__freebsd__) #include @@ -52,8 +52,8 @@ int discover_controllers (struct opts); -int interrogate_controller (struct opts, const char *); -int interrogate_logical(struct opts, int, int); +/* int interrogate_controller (struct opts, const char *); */ +/* int interrogate_logical(struct opts, int, int); */ void boardid2str (unsigned long , char *); /* Added devfs devices @@ -84,26 +84,26 @@ discover_controllers (struct opts opts) int cntr; int foundone = 0; - for (cntr = 0; cntr < 8; cntr++) - { - /* does this device exist ? */ - if ((access (controllers[cntr], R_OK | F_OK)) == 0) - { - /* it does :) */ - if (interrogate_controller (opts, controllers[cntr])) - { - foundone = 1; - if (opts.debug) - fprintf (stderr, "DEBUG: %s is a existing controller\n", - controllers[cntr]); - } - } - else if (opts.debug) - { - fprintf (stderr, "DEBUG: Device %s could not be opened\n", controllers[cntr]); - perror ("DEBUG: reason"); - } - } +/* for (cntr = 0; cntr < 8; cntr++) */ +/* { */ +/* /\* does this device exist ? *\/ */ +/* if ((access (controllers[cntr], R_OK | F_OK)) == 0) */ +/* { */ +/* /\* it does :) *\/ */ +/* if (interrogate_controller (opts, controllers[cntr])) */ +/* { */ +/* foundone = 1; */ +/* if (opts.debug) */ +/* fprintf (stderr, "DEBUG: %s is a existing controller\n", */ +/* controllers[cntr]); */ +/* } */ +/* } */ +/* else if (opts.debug) */ +/* { */ +/* fprintf (stderr, "DEBUG: Device %s could not be opened\n", controllers[cntr]); */ +/* perror ("DEBUG: reason"); */ +/* } */ +/* } */ for (cntr = 0; cntr < 16; cntr++) { /* does this device exist ? */ @@ -127,106 +127,106 @@ discover_controllers (struct opts opts) return foundone; } -int -interrogate_controller (struct opts opts, const char *devicefile) -{ - int devicefd; - ida_ioctl_t io; - char buffer[30]; - int foundone = 0; - int cntr; +/* int */ +/* interrogate_controller (struct opts opts, const char *devicefile) */ +/* { */ +/* int devicefd; */ +/* ida_ioctl_t io; */ +/* char buffer[30]; */ +/* int foundone = 0; */ +/* int cntr; */ - devicefd = open (devicefile, O_RDONLY); - /* no checks, did that before */ +/* devicefd = open (devicefile, O_RDONLY); */ +/* /\* no checks, did that before *\/ */ - /* clear io */ - memset (&io, 0, sizeof (io)); +/* /\* clear io *\/ */ +/* memset (&io, 0, sizeof (io)); */ - io.cmd = ID_CTLR; +/* io.cmd = ID_CTLR; */ - if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) - { - if (opts.debug) perror ("DEBUG: ioctl"); - return 0; - } +/* if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) */ +/* { */ +/* if (opts.debug) perror ("DEBUG: ioctl"); */ +/* return 0; */ +/* } */ - boardid2str (io.c.id_ctlr.board_id, buffer); +/* boardid2str (io.c.id_ctlr.board_id, buffer); */ - ctrls_found[ctrls_found_num].ctrl_devicename = (char *)malloc(strlen(buffer)+1); - strncpy (ctrls_found[ctrls_found_num].ctrl_devicename, - buffer, strlen(buffer)+1); +/* ctrls_found[ctrls_found_num].ctrl_devicename = (char *)malloc(strlen(buffer)+1); */ +/* strncpy (ctrls_found[ctrls_found_num].ctrl_devicename, */ +/* buffer, strlen(buffer)+1); */ - ctrls_found[ctrls_found_num].ctrl_type = CTRLTYPE_IDA; +/* ctrls_found[ctrls_found_num].ctrl_type = CTRLTYPE_IDA; */ - ctrls_found[ctrls_found_num].num_logd_found = 0; +/* ctrls_found[ctrls_found_num].num_logd_found = 0; */ - for (cntr = 0; cntr < io.c.id_ctlr.nr_drvs; cntr++) - { - if (interrogate_logical (opts, devicefd, cntr)) - { - foundone = 1; - } - } +/* for (cntr = 0; cntr < io.c.id_ctlr.nr_drvs; cntr++) */ +/* { */ +/* if (interrogate_logical (opts, devicefd, cntr)) */ +/* { */ +/* foundone = 1; */ +/* } */ +/* } */ - if (opts.verbose) printf(" Found a %s (%d Logical drives)\n", buffer, - ctrls_found[ctrls_found_num].num_logd_found); +/* if (opts.verbose) printf(" Found a %s (%d Logical drives)\n", buffer, */ +/* ctrls_found[ctrls_found_num].num_logd_found); */ - ctrls_found[ctrls_found_num].devicefile = (char *)malloc(strlen(devicefile)+1); - strcpy(ctrls_found[ctrls_found_num].devicefile, devicefile); +/* ctrls_found[ctrls_found_num].devicefile = (char *)malloc(strlen(devicefile)+1); */ +/* strcpy(ctrls_found[ctrls_found_num].devicefile, devicefile); */ - close (devicefd); +/* close (devicefd); */ - ctrls_found_num++; +/* ctrls_found_num++; */ - return 1; -} +/* return 1; */ +/* } */ -int -interrogate_logical (struct opts opts, int devicefd, int unit_nr) -{ - ida_ioctl_t io; - ida_ioctl_t io2; - int nr_blks, blks_tr; +/* int */ +/* interrogate_logical (struct opts opts, int devicefd, int unit_nr) */ +/* { */ +/* ida_ioctl_t io; */ +/* ida_ioctl_t io2; */ +/* int nr_blks, blks_tr; */ - if (opts.debug) printf ("DEBUG: interrogating unit %d\n", unit_nr); +/* if (opts.debug) printf ("DEBUG: interrogating unit %d\n", unit_nr); */ - memset (&io, 0, sizeof (io)); +/* memset (&io, 0, sizeof (io)); */ - io.cmd = ID_LOG_DRV; - io.unit = unit_nr | UNITVALID; +/* io.cmd = ID_LOG_DRV; */ +/* io.unit = unit_nr | UNITVALID; */ - if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) - { - perror ("FATAL: ID_LOG_DRV ioctl"); - return 0; - } +/* if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) */ +/* { */ +/* perror ("FATAL: ID_LOG_DRV ioctl"); */ +/* return 0; */ +/* } */ - memset (&io2, 0, sizeof (io2)); +/* memset (&io2, 0, sizeof (io2)); */ - io2.cmd = SENSE_LOG_DRV_STAT; - io2.unit = unit_nr | UNITVALID; +/* io2.cmd = SENSE_LOG_DRV_STAT; */ +/* io2.unit = unit_nr | UNITVALID; */ - if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) - { - perror ("FATAL: SENSE_LOG_DRV_STAT ioctl"); - return 0; - } +/* if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) */ +/* { */ +/* perror ("FATAL: SENSE_LOG_DRV_STAT ioctl"); */ +/* return 0; */ +/* } */ - ctrls_found[ctrls_found_num].num_logd_found++; - /* ctrls_found[ctrls_found_num].log_disk[unit_nr].status = - * io2.c.sense_log_drv_stat.status; - - * nr_blks = io2.c.id_log_drv.nr_blks; - * blks_tr = io.c.sense_log_drv_stat.blks_to_recover; - * ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = - * ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; - */ - ctrls_found[ctrls_found_num].log_disk[unit_nr].status = 0; - ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = 0; +/* ctrls_found[ctrls_found_num].num_logd_found++; */ +/* /\* ctrls_found[ctrls_found_num].log_disk[unit_nr].status = */ +/* * io2.c.sense_log_drv_stat.status; */ + +/* * nr_blks = io2.c.id_log_drv.nr_blks; */ +/* * blks_tr = io.c.sense_log_drv_stat.blks_to_recover; */ +/* * ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = */ +/* * ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; */ +/* *\/ */ +/* ctrls_found[ctrls_found_num].log_disk[unit_nr].status = 0; */ +/* ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = 0; */ - return 1; -} +/* return 1; */ +/* } */ void boardid2str (unsigned long board_id, char *name) diff -up cpqarrayd-2.3/status.c.orig cpqarrayd-2.3/status.c --- cpqarrayd-2.3/status.c.orig 2008-07-09 15:16:05.000000000 +0300 +++ cpqarrayd-2.3/status.c 2008-07-09 15:20:51.000000000 +0300 @@ -33,9 +33,9 @@ #endif #include -#include -#include -#include +/* #include */ +/* #include */ +/* #include */ #include #include "cpqarrayd.h" @@ -45,144 +45,144 @@ #include "cciss_structs.h" #include "cciss_functions.h" -int status_check (struct opts opts) -{ +/* int status_check (struct opts opts) */ +/* { */ - int devicefd; - int ctrl_cntr; - int logd_cntr; - ida_ioctl_t io, io2; - int status, nr_blks, blks_tr, trap_stat; - float pvalue; - char statusmsg[1024]; - int counter; +/* int devicefd; */ +/* int ctrl_cntr; */ +/* int logd_cntr; */ +/* ida_ioctl_t io, io2; */ +/* int status, nr_blks, blks_tr, trap_stat; */ +/* float pvalue; */ +/* char statusmsg[1024]; */ +/* int counter; */ - for ( ctrl_cntr=0; - ctrl_cntr < ctrls_found_num; - ctrl_cntr++) { - if (ctrls_found[ctrl_cntr].ctrl_type != CTRLTYPE_IDA) { - break; - } +/* for ( ctrl_cntr=0; */ +/* ctrl_cntr < ctrls_found_num; */ +/* ctrl_cntr++) { */ +/* if (ctrls_found[ctrl_cntr].ctrl_type != CTRLTYPE_IDA) { */ +/* break; */ +/* } */ - devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY); +/* devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY); */ - for ( logd_cntr=0; - logd_cntr < ctrls_found[ctrl_cntr].num_logd_found; - logd_cntr++) { +/* for ( logd_cntr=0; */ +/* logd_cntr < ctrls_found[ctrl_cntr].num_logd_found; */ +/* logd_cntr++) { */ - memset (&io, 0, sizeof (io)); +/* memset (&io, 0, sizeof (io)); */ - io.cmd = SENSE_LOG_DRV_STAT; - io.unit = logd_cntr | UNITVALID; +/* io.cmd = SENSE_LOG_DRV_STAT; */ +/* io.unit = logd_cntr | UNITVALID; */ - if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) - { - perror ("SENSE_LOG_DRV_STAT ioctl"); - return 0; - } +/* if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) */ +/* { */ +/* perror ("SENSE_LOG_DRV_STAT ioctl"); */ +/* return 0; */ +/* } */ - status=io.c.sense_log_drv_stat.status; +/* status=io.c.sense_log_drv_stat.status; */ - if ((status == 3) || (status == 5) || (status == 7)) { - /* is a progress indicator required? - */ - memset (&io2, 0, sizeof (io)); +/* if ((status == 3) || (status == 5) || (status == 7)) { */ +/* /\* is a progress indicator required? */ +/* *\/ */ +/* memset (&io2, 0, sizeof (io)); */ - io2.cmd = ID_LOG_DRV; - io2.unit = logd_cntr | UNITVALID; +/* io2.cmd = ID_LOG_DRV; */ +/* io2.unit = logd_cntr | UNITVALID; */ - if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) - { - perror ("ID_LOG_DRV ioctl"); - /* return 0; no return this isn't fatal for now */ - } - else - { - nr_blks = io2.c.id_log_drv.nr_blks; - blks_tr = io.c.sense_log_drv_stat.blks_to_recover; +/* if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) */ +/* { */ +/* perror ("ID_LOG_DRV ioctl"); */ +/* /\* return 0; no return this isn't fatal for now *\/ */ +/* } */ +/* else */ +/* { */ +/* nr_blks = io2.c.id_log_drv.nr_blks; */ +/* blks_tr = io.c.sense_log_drv_stat.blks_to_recover; */ - pvalue = ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; +/* pvalue = ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; */ - } - } - else { - pvalue = 0.0; - } - - if (opts.debug) { - fprintf(stdout, "DEBUG: Status of controller %d unit %d is %d\n", - ctrl_cntr, logd_cntr, status); - fprintf(stdout, "DEBUG: "); - fprintf(stdout, statusstr[status], - ctrl_cntr, logd_cntr, pvalue); - fprintf(stdout, "\n"); - } +/* } */ +/* } */ +/* else { */ +/* pvalue = 0.0; */ +/* } */ + +/* if (opts.debug) { */ +/* fprintf(stdout, "DEBUG: Status of controller %d unit %d is %d\n", */ +/* ctrl_cntr, logd_cntr, status); */ +/* fprintf(stdout, "DEBUG: "); */ +/* fprintf(stdout, statusstr[status], */ +/* ctrl_cntr, logd_cntr, pvalue); */ +/* fprintf(stdout, "\n"); */ +/* } */ - if (status != ctrls_found[ctrl_cntr].log_disk[logd_cntr].status) { - /* status changed, time to send a trap */ - syslog(LOG_WARNING, "/dev/c%dd%d: Status change.", ctrl_cntr, - logd_cntr); - syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, - pvalue); - if (opts.debug) { - printf ("DEBUG: status changed from %d to %d, pvalue = %f\n", - ctrls_found[ctrl_cntr].log_disk[logd_cntr].status, status, - pvalue); - } - sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); - if (opts.debug) { - printf("DEBUG: sending traps.\n"); - } - /* Send a trap, syslog if send_trap returns !0. */ - if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { - syslog(LOG_WARNING, - "problem sending snmp trap (sendtrap() returned %d)\n", - trap_stat); - if (opts.debug) { - printf("DEBUG: Problem sending snmp trap", - "(sendtrap() returned %d)\n", - trap_stat); - } - } - } - else if ((status == 5) && - ((pvalue - ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue) - >= 25.0 )) { - /* pvalue changed by more than 25%, time to send a trap */ - syslog(LOG_WARNING, "/dev/c%dd%d: Percentile value change.", - ctrl_cntr, logd_cntr); - syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, - pvalue); - if (opts.debug) { - printf ("DEBUG: pvalue changed from %f to %f\n", - ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue, - pvalue); - } - sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); - if (opts.debug) { - printf("DEBUG: sending traps.\n"); - } - if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { - syslog(LOG_WARNING, - "problem sending snmp trap (sendtrap() returned %d)\n", - trap_stat); - if (opts.debug) { - printf("DEBUG: Problem sending snmp trap ", - "(sendtrap() returned %d)\n", - trap_stat); - } - } - ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue; - } - ctrls_found[ctrl_cntr].log_disk[logd_cntr].status = status; - } - close (devicefd); - } +/* if (status != ctrls_found[ctrl_cntr].log_disk[logd_cntr].status) { */ +/* /\* status changed, time to send a trap *\/ */ +/* syslog(LOG_WARNING, "/dev/c%dd%d: Status change.", ctrl_cntr, */ +/* logd_cntr); */ +/* syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, */ +/* pvalue); */ +/* if (opts.debug) { */ +/* printf ("DEBUG: status changed from %d to %d, pvalue = %f\n", */ +/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].status, status, */ +/* pvalue); */ +/* } */ +/* sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); */ +/* if (opts.debug) { */ +/* printf("DEBUG: sending traps.\n"); */ +/* } */ +/* /\* Send a trap, syslog if send_trap returns !0. *\/ */ +/* if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { */ +/* syslog(LOG_WARNING, */ +/* "problem sending snmp trap (sendtrap() returned %d)\n", */ +/* trap_stat); */ +/* if (opts.debug) { */ +/* printf("DEBUG: Problem sending snmp trap", */ +/* "(sendtrap() returned %d)\n", */ +/* trap_stat); */ +/* } */ +/* } */ +/* } */ +/* else if ((status == 5) && */ +/* ((pvalue - ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue) */ +/* >= 25.0 )) { */ +/* /\* pvalue changed by more than 25%, time to send a trap *\/ */ +/* syslog(LOG_WARNING, "/dev/c%dd%d: Percentile value change.", */ +/* ctrl_cntr, logd_cntr); */ +/* syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, */ +/* pvalue); */ +/* if (opts.debug) { */ +/* printf ("DEBUG: pvalue changed from %f to %f\n", */ +/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue, */ +/* pvalue); */ +/* } */ +/* sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); */ +/* if (opts.debug) { */ +/* printf("DEBUG: sending traps.\n"); */ +/* } */ +/* if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { */ +/* syslog(LOG_WARNING, */ +/* "problem sending snmp trap (sendtrap() returned %d)\n", */ +/* trap_stat); */ +/* if (opts.debug) { */ +/* printf("DEBUG: Problem sending snmp trap ", */ +/* "(sendtrap() returned %d)\n", */ +/* trap_stat); */ +/* } */ +/* } */ +/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue; */ +/* } */ +/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].status = status; */ +/* } */ +/* close (devicefd); */ +/* } */ - return 1; +/* return 1; */ -} +/* } */ int cciss_status_check (struct opts opts) { @@ -190,7 +190,7 @@ int cciss_status_check (struct opts opts int devicefd; int ctrl_cntr, result; int logd_cntr; - ida_ioctl_t io, io2; +/* ida_ioctl_t io, io2; */ int status, nr_blks, blks_tr, trap_stat; float pvalue; char statusmsg[1024]; cpqarrayd-2.3.sysVinit.patch: --- NEW FILE cpqarrayd-2.3.sysVinit.patch --- diff -up cpqarrayd-2.3/scripts/cpqarrayd.orig cpqarrayd-2.3/scripts/cpqarrayd --- cpqarrayd-2.3/scripts/cpqarrayd.orig 2008-07-09 17:55:59.000000000 +0300 +++ cpqarrayd-2.3/scripts/cpqarrayd 2008-07-14 16:43:49.000000000 +0300 @@ -2,7 +2,7 @@ # # cpqarrayd Start/Stop Compaq Array monitor # -# chkconfig: 345 15 90 +# chkconfig: - 51 90 # description: The cpqarrayd monitors the status of Compaq Raid Arrays, \ # and reports via syslog or traps # processname: cpqarrayd @@ -23,8 +23,9 @@ RETVAL=0 case "$1" in start) echo -n "Starting cpqarrayd: " - daemon /usr/sbin/cpqarrayd $CPQ_PARAMS - RETVAL=$? +# daemon /usr/sbin/cpqarrayd $CPQ_PARAMS |grep -v ^DEBUG: + { daemon /usr/sbin/cpqarrayd $CPQ_PARAMS + RETVAL=$?; } |grep -v ^DEBUG: echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cpqarrayd ;; @@ -39,13 +40,22 @@ case "$1" in status cpqarrayd RETVAL=$? ;; - restart|reload) + restart|force-reload) $0 stop $0 start RETVAL=$? ;; - *) - echo "Usage: cpqarrayd {start|stop|status|restart|reload}" + reload) + exit 3 + ;; + condrestart|try-restart) + if status cpqarrayd > /dev/null; then + $0 stop + $0 start + fi + ;; + *) + echo "Usage: cpqarrayd {start|stop|status|restart|force-reolad|reload|cond-restart|try-restart}" exit 1 esac --- NEW FILE cpqarrayd.spec --- Name: cpqarrayd Version: 2.3 Release: 3%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ URL: http://www.strocamp.net/opensource/cpqarrayd.php Source0: http://www.strocamp.net/opensource/compaq/downloads/cpqarrayd-2.3.tar.gz Patch0: cpqarrayd-2.3.no_ida.patch Patch1: cpqarrayd-2.3.sysVinit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake BuildRequires: net-snmp-devel Requires(post): chkconfig Requires(postun): initscripts Requires(preun): chkconfig Requires(preun): initscripts %description Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers. It reports any status changes, like failing disks, to the syslog and optionally to a remote host using SNMP traps. Note that support for the old(?) IDA Arrays have been disabled in this package due to build issues and lack of testing hardware. %prep %setup -q %patch0 -p1 -b .no_ida %patch1 -p1 -b .sysVinit %build autoreconf -si %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/cpqarrayd $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig cp scripts/cpqarrayd.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cpqarrayd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add cpqarrayd %preun if [ $1 = 0 ] ; then /sbin/service cpqarrayd stop >/dev/null 2>&1 /sbin/chkconfig --del cpqarrayd fi %postun if [ "$1" -ge "1" ] ; then /sbin/service cpqarrayd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog DEVEL NEWS README %_sbindir/cpqarrayd %config(noreplace) %_sysconfdir/sysconfig/cpqarrayd %_initrddir/cpqarrayd %doc %_mandir/man1/cpqarrayd* %changelog * Thu Jul 17 2008 - 2.3-3 - fix rpmlint warnings * Mon Jul 14 2008 - 2.3-2 - Make SysVinit script compliant with Fedora Packaging Guidelines * Wed Jul 9 2008 - 2.3-1 - Initial packaging --- NEW FILE import.log --- cpqarrayd-2_3-3_fc9:HEAD:cpqarrayd-2.3-3.fc9.src.rpm:1216369152 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:33:19 -0000 1.1 +++ .cvsignore 18 Jul 2008 08:21:21 -0000 1.2 @@ -0,0 +1 @@ +cpqarrayd-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:33:19 -0000 1.1 +++ sources 18 Jul 2008 08:21:21 -0000 1.2 @@ -0,0 +1 @@ +55421afe4817863efab45c59a9486a60 cpqarrayd-2.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 08:42:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 08:42:05 +0000 Subject: [pkgdb] python-libgmail ownership updated Message-ID: <200807180842.m6I8g5ap020131@bastion.fedora.phx.redhat.com> Package python-libgmail in Fedora 8 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-libgmail From fedora-extras-commits at redhat.com Fri Jul 18 08:43:59 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 08:43:59 GMT Subject: rpms/python-libgmail/devel .cvsignore, 1.2, 1.3 python-libgmail.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807180843.m6I8hxdY011718@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11662 Modified Files: .cvsignore python-libgmail.spec sources Log Message: Upstream update to 0.1.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2008 04:34:39 -0000 1.2 +++ .cvsignore 18 Jul 2008 08:43:01 -0000 1.3 @@ -1 +1 @@ -libgmail-0.1.8.tar.gz +libgmail-0.1.9.tar.gz Index: python-libgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/devel/python-libgmail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-libgmail.spec 28 Jan 2008 04:34:39 -0000 1.1 +++ python-libgmail.spec 18 Jul 2008 08:43:01 -0000 1.2 @@ -2,8 +2,8 @@ %define realname libgmail Name: python-%{realname} -Version: 0.1.8 -Release: 2%{?dist} +Version: 0.1.9 +Release: 1%{?dist} Summary: Library to provide access to Gmail via Python Group: Development/Languages @@ -45,6 +45,9 @@ %changelog +* Fri Jul 18 2008 Nikolay Vladimirov -0.1.9-1 +- new upstream 0.1.9 + * Tue Dec 11 2007 Michael Stahnke - 0.1.8-2 - Updated to proper license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2008 04:34:39 -0000 1.2 +++ sources 18 Jul 2008 08:43:01 -0000 1.3 @@ -1 +1 @@ -58f694ae19733e68b97e7a54d96d2637 libgmail-0.1.8.tar.gz +4a19c030920a030eb5217cfe8bb85a60 libgmail-0.1.9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 09:15:34 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Fri, 18 Jul 2008 09:15:34 GMT Subject: rpms/nspluginwrapper/F-9 nspluginwrapper-1.1.0-build.patch, 1.2, 1.3 nspluginwrapper.spec, 1.50, 1.51 Message-ID: <200807180915.m6I9FYBl019695@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/nspluginwrapper/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19622 Modified Files: nspluginwrapper-1.1.0-build.patch nspluginwrapper.spec Log Message: * Tue Jul 18 2008 Martin Stransky 1.1.0-3 - Enabled experimental stand-alone plugin player nspluginwrapper-1.1.0-build.patch: Index: nspluginwrapper-1.1.0-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nspluginwrapper-1.1.0-build.patch 15 Jul 2008 13:53:23 -0000 1.2 +++ nspluginwrapper-1.1.0-build.patch 18 Jul 2008 09:14:47 -0000 1.3 @@ -1,6 +1,6 @@ diff -up nspluginwrapper-1.1.0/configure.build nspluginwrapper-1.1.0/configure --- nspluginwrapper-1.1.0/configure.build 2008-06-29 22:19:50.000000000 +0200 -+++ nspluginwrapper-1.1.0/configure 2008-07-07 16:26:11.000000000 +0200 ++++ nspluginwrapper-1.1.0/configure 2008-07-15 16:48:26.000000000 +0200 @@ -3,6 +3,8 @@ # nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne # derived from qemu configure script, (C) 2003 Fabrice Bellard @@ -209,13 +209,15 @@ if test "$host_cpu" = "i386" ; then echo "ARCH=i386" >> $config_mak echo "#define HOST_I386 1" >> $config_h -@@ -666,20 +700,22 @@ if test -n "$fbigendian" ; then +@@ -665,21 +699,24 @@ if test -n "$fbigendian" ; then + echo "#define FLOAT_WORDS_BIGENDIAN $fbigendian" >> $config_h fi - echo "SRC_PATH=$source_path" >> $config_mak +-echo "SRC_PATH=$source_path" >> $config_mak -echo "build_viewer=$build_viewer" >> $config_mak --echo "build_player=$build_player" >> $config_mak + echo "build_player=$build_player" >> $config_mak -echo "biarch=$biarch" >> $config_mak ++echo "SRC_PATH=$source_path" >> $config_mak echo "lib32=$lib32" >> $config_mak echo "lib64=$lib64" >> $config_mak echo "prefix=$prefix" >> $config_mak @@ -239,7 +241,7 @@ VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[ ]*/s///p'` RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[ ]*/s///p'` SVNDATE=`sed < $source_path/$PACKAGE.spec -n '/^\%define svndate[ ]*/s///p'` -@@ -700,8 +736,14 @@ else +@@ -700,8 +737,14 @@ else echo "#define NPW_VERSION \"$VERSION\"" >> $config_h fi @@ -255,7 +257,7 @@ if test "$has_visibility_attribute" = "yes"; then echo "#define attribute_hidden __attribute__((visibility(\"hidden\")))" >> $config_h -@@ -729,9 +771,8 @@ config_h="config.h" +@@ -729,9 +772,8 @@ config_h="config.h" echo "/* Automatically generated by configure - do not modify */" > $config_h echo "#include \"config-host.h\"" >> $config_h @@ -267,7 +269,7 @@ if test "$target_os" = "linux"; then echo "TARGET_OS=linux" >> $config_mak -@@ -772,3 +813,7 @@ if test "$source_path_used" = "yes" ; th +@@ -772,3 +814,7 @@ if test "$source_path_used" = "yes" ; th esac ln -sf $source_path/Makefile Makefile fi @@ -277,7 +279,7 @@ + diff -up nspluginwrapper-1.1.0/Makefile.build nspluginwrapper-1.1.0/Makefile --- nspluginwrapper-1.1.0/Makefile.build 2008-07-06 22:15:03.000000000 +0200 -+++ nspluginwrapper-1.1.0/Makefile 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/Makefile 2008-07-15 16:50:26.000000000 +0200 @@ -59,23 +59,6 @@ ifneq (,$(findstring $(OS),netbsd dragon X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64) endif @@ -380,13 +382,13 @@ ifeq ($(build_player),yes) TARGETS += $(npplayer_PROGRAM) endif -@@ -242,56 +210,19 @@ uninstall.config: +@@ -242,56 +210,26 @@ uninstall.config: rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM) uninstall.mkruntime: rm -f $(DESTDIR)$(pkglibdir)/noarch/mkruntime - -install: install.dirs install.player install.wrapper install.viewer install.libxpcom install.libnoxshm install.loader install.config install.mkruntime -+install: install.dirs install.wrapper install.viewer install.loader install.config ++install: install.dirs install.player install.wrapper install.viewer install.loader install.config install.dirs: - mkdir -p $(DESTDIR)$(pkglibdir)/noarch - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH) @@ -395,15 +397,16 @@ - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32) - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS) -endif --ifeq ($(build_player),yes) --install.player: $(npplayer_PROGRAM) ++ mkdir -p $(DESTDIR)$(pkglibdir) + ifeq ($(build_player),yes) + install.player: $(npplayer_PROGRAM) - install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) -- mkdir -p $(DESTDIR)$(bindir) ++ install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npplayer_PROGRAM) + mkdir -p $(DESTDIR)$(bindir) - $(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer --else --install.player: --endif -+ mkdir -p $(DESTDIR)$(pkglibdir) + else + install.player: + endif install.wrapper: $(npwrapper_LIBRARY) - install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY) -ifeq ($(build_viewer),yes) @@ -445,7 +448,7 @@ $(archivedir):: [ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1 -@@ -340,13 +271,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c +@@ -340,13 +278,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c $(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) @@ -462,7 +465,7 @@ $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) $(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS) -@@ -356,12 +287,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c +@@ -356,12 +294,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c npplayer-%.o: $(SRC_PATH)/src/tidy/%.c $(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER @@ -475,7 +478,7 @@ $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,--soname,libnoxshm.so -@@ -372,17 +297,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS) +@@ -372,17 +304,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS) $(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) npconfig-%.o: $(SRC_PATH)/src/%.c @@ -502,7 +505,7 @@ $(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o $(AR) rc $@ $< -@@ -395,6 +326,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ +@@ -395,6 +333,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ $(LN_S) libgcc_s.so $@ $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o @@ -512,7 +515,7 @@ -Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '` diff -up nspluginwrapper-1.1.0/src/debug.h.build nspluginwrapper-1.1.0/src/debug.h --- nspluginwrapper-1.1.0/src/debug.h.build 2008-06-21 22:13:34.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/debug.h 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/debug.h 2008-07-15 16:48:26.000000000 +0200 @@ -33,7 +33,7 @@ extern void npw_printf(const char *forma extern void npw_vprintf(const char *format, va_list args) attribute_hidden; @@ -524,7 +527,7 @@ #define D(x) ; diff -up nspluginwrapper-1.1.0/src/npw-config.c.build nspluginwrapper-1.1.0/src/npw-config.c --- nspluginwrapper-1.1.0/src/npw-config.c.build 2008-06-26 23:44:15.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-15 16:48:26.000000000 +0200 @@ -38,10 +38,15 @@ #include #include @@ -825,8 +828,8 @@ return 0; diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.c ---- /dev/null 2008-07-07 15:46:30.273004002 +0200 -+++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-07 16:25:17.000000000 +0200 +--- /dev/null 2008-07-15 15:29:44.189003873 +0200 ++++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-15 16:48:26.000000000 +0200 @@ -0,0 +1,97 @@ +/* + * npw-dir.h - Directory management for nspluginwrapper @@ -926,8 +929,8 @@ + return(p_path); +} diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.h ---- /dev/null 2008-07-07 15:46:30.273004002 +0200 -+++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-07 16:25:17.000000000 +0200 +--- /dev/null 2008-07-15 15:29:44.189003873 +0200 ++++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-15 16:48:26.000000000 +0200 @@ -0,0 +1,35 @@ +/* + * npw-dir.h - Directory management for nspluginwrapper @@ -966,7 +969,7 @@ +#endif diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.build nspluginwrapper-1.1.0/src/npw-viewer.c --- nspluginwrapper-1.1.0/src/npw-viewer.c.build 2008-07-06 22:47:22.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-15 16:48:26.000000000 +0200 @@ -54,10 +54,6 @@ #define DEBUG 1 #include "debug.h" @@ -1064,7 +1067,7 @@ diff -up nspluginwrapper-1.1.0/src/npw-viewer.sh.build nspluginwrapper-1.1.0/src/npw-viewer.sh --- nspluginwrapper-1.1.0/src/npw-viewer.sh.build 2008-07-06 18:37:56.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-15 16:48:26.000000000 +0200 @@ -4,7 +4,13 @@ # OS="`uname -s`" @@ -1130,7 +1133,7 @@ REALPLAYER_HOME="/usr/pkg/lib/RealPlayer" diff -up nspluginwrapper-1.1.0/src/npw-wrapper.c.build nspluginwrapper-1.1.0/src/npw-wrapper.c --- nspluginwrapper-1.1.0/src/npw-wrapper.c.build 2008-07-06 22:07:21.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-15 16:48:26.000000000 +0200 @@ -44,6 +44,7 @@ #include "rpc.h" @@ -1181,7 +1184,7 @@ if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) { diff -up nspluginwrapper-1.1.0/src/sysdeps.h.build nspluginwrapper-1.1.0/src/sysdeps.h --- nspluginwrapper-1.1.0/src/sysdeps.h.build 2008-06-21 22:13:34.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-15 16:48:26.000000000 +0200 @@ -45,8 +45,8 @@ #define NPW_VIEWER NPW_VIEWER_BASE #define NPW_WRAPPER_BASE "npwrapper" Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- nspluginwrapper.spec 15 Jul 2008 13:53:23 -0000 1.50 +++ nspluginwrapper.spec 18 Jul 2008 09:14:47 -0000 1.51 @@ -70,7 +70,7 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in @@ -87,11 +87,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Provides: %{name} = %{version}-%{release} Requires: %{_bindir}/linux32 -Requires: gecko-libs = %{gecko_ver} +Requires: gecko-libs >= %{gecko_ver} Requires: mozilla-filesystem BuildRequires: pkgconfig gtk2-devel glib2-devel nspr-devel BuildRequires: libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel -BuildRequires: gecko-devel = %{gecko_ver} +BuildRequires: gecko-devel >= %{gecko_ver} ExclusiveArch: i386 x86_64 ppc %description @@ -169,7 +169,7 @@ ./configure --prefix=/usr CFLAGS="$RPM_OPT_FLAGS" make popd - + %install rm -rf $RPM_BUILD_ROOT @@ -204,6 +204,13 @@ > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +# set up nsplugin player starting script +%{__cat} > $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer << EOF +export MOZ_PLUGIN_PATH=%{pluginsourcedir} +%{pkgdir}/npplayer "$@" +EOF +chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer + %clean rm -rf $RPM_BUILD_ROOT @@ -226,11 +233,16 @@ %{pkgdir}/npwrapper.so %{pkgdir}/npviewer.bin %{pkgdir}/npviewer +%{pkgdir}/npplayer +%{pkgdir}/nspluginplayer %{plugindir}/npwrapper.so %{_bindir}/mozilla-plugin-config %config %{_sysconfdir}/sysconfig/%{name} %changelog +* Tue Jul 18 2008 Martin Stransky 1.1.0-3 +- Enabled experimental stand-alone plugin player + * Tue Jul 15 2008 Martin Stransky 1.1.0-2 - Fixed build warnings in our patches From fedora-extras-commits at redhat.com Fri Jul 18 09:17:22 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Fri, 18 Jul 2008 09:17:22 GMT Subject: rpms/linkage/devel linkage.spec,1.10,1.11 Message-ID: <200807180917.m6I9HMQG019770@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/linkage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19723 Modified Files: linkage.spec Log Message: w3m is fixed, remove hack Index: linkage.spec =================================================================== RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linkage.spec 17 Jul 2008 13:59:31 -0000 1.10 +++ linkage.spec 18 Jul 2008 09:16:31 -0000 1.11 @@ -1,6 +1,6 @@ Name: linkage Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight bittorent client Group: Applications/Internet @@ -23,14 +23,6 @@ BuildRequires: boost-devel BuildRequires: asio-devel -# temporary hack to be able to build with new gpm: -# docbook-utils requires text-www-browser which pulls in -# w3m because of its short name, which needs to be rebuild against -# the new gpm. -# Buildrequire another package that provides text-www-browser should get us -# to build, remove after w3m is fixed. -BuildRequires: lynx - Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 @@ -127,6 +119,9 @@ %{_libdir}/liblinkage-1.so %changelog +* Fri Jul 18 2008 Adel Gadllah 0.2.0-2 +- Remove buildrequires hack + * Wed Jul 16 2008 Adel Gadllah 0.2.0-1 - Update to 0.2.0 From fedora-extras-commits at redhat.com Fri Jul 18 09:22:14 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Fri, 18 Jul 2008 09:22:14 GMT Subject: rpms/nspluginwrapper/devel nspluginwrapper-1.1.0-build.patch, 1.1, 1.2 nspluginwrapper-1.1.0-fork.patch, 1.1, 1.2 nspluginwrapper-1.1.0-runtime-restart.patch, 1.1, 1.2 nspluginwrapper.spec, 1.49, 1.50 Message-ID: <200807180922.m6I9MEqb020093@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/nspluginwrapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19995 Modified Files: nspluginwrapper-1.1.0-build.patch nspluginwrapper-1.1.0-fork.patch nspluginwrapper-1.1.0-runtime-restart.patch nspluginwrapper.spec Log Message: Sync with F9: * Tue Jul 18 2008 Martin Stransky 1.1.0-3 - Enabled experimental stand-alone plugin player * Tue Jul 15 2008 Martin Stransky 1.1.0-2 - Fixed build warnings in our patches nspluginwrapper-1.1.0-build.patch: Index: nspluginwrapper-1.1.0-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspluginwrapper-1.1.0-build.patch 8 Jul 2008 13:17:06 -0000 1.1 +++ nspluginwrapper-1.1.0-build.patch 18 Jul 2008 09:21:25 -0000 1.2 @@ -1,11 +1,11 @@ diff -up nspluginwrapper-1.1.0/configure.build nspluginwrapper-1.1.0/configure --- nspluginwrapper-1.1.0/configure.build 2008-06-29 22:19:50.000000000 +0200 -+++ nspluginwrapper-1.1.0/configure 2008-07-07 16:26:11.000000000 +0200 ++++ nspluginwrapper-1.1.0/configure 2008-07-15 16:48:26.000000000 +0200 @@ -3,6 +3,8 @@ # nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne # derived from qemu configure script, (C) 2003 Fabrice Bellard # -+set -x ++#set -x + PACKAGE=nspluginwrapper @@ -209,13 +209,15 @@ if test "$host_cpu" = "i386" ; then echo "ARCH=i386" >> $config_mak echo "#define HOST_I386 1" >> $config_h -@@ -666,20 +700,22 @@ if test -n "$fbigendian" ; then +@@ -665,21 +699,24 @@ if test -n "$fbigendian" ; then + echo "#define FLOAT_WORDS_BIGENDIAN $fbigendian" >> $config_h fi - echo "SRC_PATH=$source_path" >> $config_mak +-echo "SRC_PATH=$source_path" >> $config_mak -echo "build_viewer=$build_viewer" >> $config_mak --echo "build_player=$build_player" >> $config_mak + echo "build_player=$build_player" >> $config_mak -echo "biarch=$biarch" >> $config_mak ++echo "SRC_PATH=$source_path" >> $config_mak echo "lib32=$lib32" >> $config_mak echo "lib64=$lib64" >> $config_mak echo "prefix=$prefix" >> $config_mak @@ -239,7 +241,7 @@ VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[ ]*/s///p'` RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[ ]*/s///p'` SVNDATE=`sed < $source_path/$PACKAGE.spec -n '/^\%define svndate[ ]*/s///p'` -@@ -700,8 +736,14 @@ else +@@ -700,8 +737,14 @@ else echo "#define NPW_VERSION \"$VERSION\"" >> $config_h fi @@ -255,7 +257,7 @@ if test "$has_visibility_attribute" = "yes"; then echo "#define attribute_hidden __attribute__((visibility(\"hidden\")))" >> $config_h -@@ -729,9 +771,8 @@ config_h="config.h" +@@ -729,9 +772,8 @@ config_h="config.h" echo "/* Automatically generated by configure - do not modify */" > $config_h echo "#include \"config-host.h\"" >> $config_h @@ -267,7 +269,7 @@ if test "$target_os" = "linux"; then echo "TARGET_OS=linux" >> $config_mak -@@ -772,3 +813,7 @@ if test "$source_path_used" = "yes" ; th +@@ -772,3 +814,7 @@ if test "$source_path_used" = "yes" ; th esac ln -sf $source_path/Makefile Makefile fi @@ -277,7 +279,7 @@ + diff -up nspluginwrapper-1.1.0/Makefile.build nspluginwrapper-1.1.0/Makefile --- nspluginwrapper-1.1.0/Makefile.build 2008-07-06 22:15:03.000000000 +0200 -+++ nspluginwrapper-1.1.0/Makefile 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/Makefile 2008-07-15 16:50:26.000000000 +0200 @@ -59,23 +59,6 @@ ifneq (,$(findstring $(OS),netbsd dragon X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64) endif @@ -380,13 +382,13 @@ ifeq ($(build_player),yes) TARGETS += $(npplayer_PROGRAM) endif -@@ -242,56 +210,19 @@ uninstall.config: +@@ -242,56 +210,26 @@ uninstall.config: rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM) uninstall.mkruntime: rm -f $(DESTDIR)$(pkglibdir)/noarch/mkruntime - -install: install.dirs install.player install.wrapper install.viewer install.libxpcom install.libnoxshm install.loader install.config install.mkruntime -+install: install.dirs install.wrapper install.viewer install.loader install.config ++install: install.dirs install.player install.wrapper install.viewer install.loader install.config install.dirs: - mkdir -p $(DESTDIR)$(pkglibdir)/noarch - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH) @@ -395,15 +397,16 @@ - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32) - mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS) -endif --ifeq ($(build_player),yes) --install.player: $(npplayer_PROGRAM) ++ mkdir -p $(DESTDIR)$(pkglibdir) + ifeq ($(build_player),yes) + install.player: $(npplayer_PROGRAM) - install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) -- mkdir -p $(DESTDIR)$(bindir) ++ install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npplayer_PROGRAM) + mkdir -p $(DESTDIR)$(bindir) - $(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer --else --install.player: --endif -+ mkdir -p $(DESTDIR)$(pkglibdir) + else + install.player: + endif install.wrapper: $(npwrapper_LIBRARY) - install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY) -ifeq ($(build_viewer),yes) @@ -445,7 +448,7 @@ $(archivedir):: [ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1 -@@ -340,13 +271,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c +@@ -340,13 +278,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c $(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) @@ -462,7 +465,7 @@ $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS) $(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS) -@@ -356,12 +287,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c +@@ -356,12 +294,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c npplayer-%.o: $(SRC_PATH)/src/tidy/%.c $(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER @@ -475,7 +478,7 @@ $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS) $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,--soname,libnoxshm.so -@@ -372,17 +297,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS) +@@ -372,17 +304,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS) $(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) npconfig-%.o: $(SRC_PATH)/src/%.c @@ -502,7 +505,7 @@ $(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o $(AR) rc $@ $< -@@ -395,6 +326,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ +@@ -395,6 +333,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ $(LN_S) libgcc_s.so $@ $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o @@ -512,7 +515,7 @@ -Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '` diff -up nspluginwrapper-1.1.0/src/debug.h.build nspluginwrapper-1.1.0/src/debug.h --- nspluginwrapper-1.1.0/src/debug.h.build 2008-06-21 22:13:34.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/debug.h 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/debug.h 2008-07-15 16:48:26.000000000 +0200 @@ -33,7 +33,7 @@ extern void npw_printf(const char *forma extern void npw_vprintf(const char *format, va_list args) attribute_hidden; @@ -524,7 +527,7 @@ #define D(x) ; diff -up nspluginwrapper-1.1.0/src/npw-config.c.build nspluginwrapper-1.1.0/src/npw-config.c --- nspluginwrapper-1.1.0/src/npw-config.c.build 2008-06-26 23:44:15.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-15 16:48:26.000000000 +0200 @@ -38,10 +38,15 @@ #include #include @@ -825,8 +828,8 @@ return 0; diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.c ---- /dev/null 2008-07-07 15:46:30.273004002 +0200 -+++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-07 16:25:17.000000000 +0200 +--- /dev/null 2008-07-15 15:29:44.189003873 +0200 ++++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-15 16:48:26.000000000 +0200 @@ -0,0 +1,97 @@ +/* + * npw-dir.h - Directory management for nspluginwrapper @@ -926,8 +929,8 @@ + return(p_path); +} diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.h ---- /dev/null 2008-07-07 15:46:30.273004002 +0200 -+++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-07 16:25:17.000000000 +0200 +--- /dev/null 2008-07-15 15:29:44.189003873 +0200 ++++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-15 16:48:26.000000000 +0200 @@ -0,0 +1,35 @@ +/* + * npw-dir.h - Directory management for nspluginwrapper @@ -966,7 +969,7 @@ +#endif diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.build nspluginwrapper-1.1.0/src/npw-viewer.c --- nspluginwrapper-1.1.0/src/npw-viewer.c.build 2008-07-06 22:47:22.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-15 16:48:26.000000000 +0200 @@ -54,10 +54,6 @@ #define DEBUG 1 #include "debug.h" @@ -1064,7 +1067,7 @@ diff -up nspluginwrapper-1.1.0/src/npw-viewer.sh.build nspluginwrapper-1.1.0/src/npw-viewer.sh --- nspluginwrapper-1.1.0/src/npw-viewer.sh.build 2008-07-06 18:37:56.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-15 16:48:26.000000000 +0200 @@ -4,7 +4,13 @@ # OS="`uname -s`" @@ -1130,7 +1133,7 @@ REALPLAYER_HOME="/usr/pkg/lib/RealPlayer" diff -up nspluginwrapper-1.1.0/src/npw-wrapper.c.build nspluginwrapper-1.1.0/src/npw-wrapper.c --- nspluginwrapper-1.1.0/src/npw-wrapper.c.build 2008-07-06 22:07:21.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-15 16:48:26.000000000 +0200 @@ -44,6 +44,7 @@ #include "rpc.h" @@ -1181,7 +1184,7 @@ if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) { diff -up nspluginwrapper-1.1.0/src/sysdeps.h.build nspluginwrapper-1.1.0/src/sysdeps.h --- nspluginwrapper-1.1.0/src/sysdeps.h.build 2008-06-21 22:13:34.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-07 16:25:17.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-15 16:48:26.000000000 +0200 @@ -45,8 +45,8 @@ #define NPW_VIEWER NPW_VIEWER_BASE #define NPW_WRAPPER_BASE "npwrapper" nspluginwrapper-1.1.0-fork.patch: Index: nspluginwrapper-1.1.0-fork.patch =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-fork.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspluginwrapper-1.1.0-fork.patch 8 Jul 2008 13:17:06 -0000 1.1 +++ nspluginwrapper-1.1.0-fork.patch 18 Jul 2008 09:21:25 -0000 1.2 @@ -1,6 +1,6 @@ diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.fork nspluginwrapper-1.1.0/src/npw-viewer.c ---- nspluginwrapper-1.1.0/src/npw-viewer.c.fork 2008-07-08 14:23:26.000000000 +0200 -+++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-08 14:26:58.000000000 +0200 +--- nspluginwrapper-1.1.0/src/npw-viewer.c.fork 2008-07-15 15:33:06.000000000 +0200 ++++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-15 15:42:07.000000000 +0200 @@ -67,6 +67,20 @@ // RPC global connections rpc_connection_t *g_rpc_connection attribute_hidden = NULL; @@ -28,7 +28,7 @@ D(bug("NPN_ForceRedraw instance=%p\n", instance)); + + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; UNIMPLEMENTED(); } @@ -74,7 +74,7 @@ return; + + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; D(bug("NPN_InvalidateRect instance=%p\n", instance)); invoke_NPN_InvalidateRect(instance, invalidRect); @@ -84,7 +84,7 @@ D(bug("NPN_InvalidateRegion instance=%p\n", instance)); + + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; UNIMPLEMENTED(); } @@ -166,22 +166,24 @@ g_NPN_Status(NPP instance, const char *message) { + if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ return; + D(bug("NPN_Status instance=%p\n", instance)); invoke_NPN_Status(instance, message); D(bug(" done\n")); -@@ -1130,6 +1183,9 @@ invoke_NPN_UserAgent(void) +@@ -1130,6 +1183,11 @@ invoke_NPN_UserAgent(void) static const char * g_NPN_UserAgent(NPP instance) { -+ if(!pid_check()) -+ return NPERR_INVALID_INSTANCE_ERROR; ++ if(!pid_check()) { ++ static char tmp_agent_string[] = "None"; ++ return tmp_agent_string; ++ } + D(bug("NPN_UserAgent instance=%p\n", instance)); if (g_user_agent == NULL) g_user_agent = invoke_NPN_UserAgent(); -@@ -1212,6 +1268,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM +@@ -1212,6 +1270,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM static NPError g_NPN_NewStream(NPP instance, NPMIMEType type, const char *target, NPStream **stream) { @@ -190,7 +192,7 @@ if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; -@@ -1257,6 +1315,9 @@ invoke_NPN_DestroyStream(NPP instance, N +@@ -1257,6 +1317,9 @@ invoke_NPN_DestroyStream(NPP instance, N static NPError g_NPN_DestroyStream(NPP instance, NPStream *stream, NPError reason) { @@ -200,7 +202,7 @@ if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; -@@ -1314,6 +1375,9 @@ invoke_NPN_Write(NPP instance, NPStream +@@ -1314,6 +1377,9 @@ invoke_NPN_Write(NPP instance, NPStream static int32 g_NPN_Write(NPP instance, NPStream *stream, int32 len, void *buf) { @@ -210,7 +212,7 @@ if (instance == NULL) return -1; -@@ -1350,6 +1414,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in +@@ -1350,6 +1416,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in static void g_NPN_PushPopupsEnabledState(NPP instance, NPBool enabled) { @@ -219,7 +221,7 @@ if (instance == NULL) return; -@@ -1381,6 +1447,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins +@@ -1381,6 +1449,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins static void g_NPN_PopPopupsEnabledState(NPP instance) { @@ -228,7 +230,7 @@ if (instance == NULL) return; -@@ -1480,6 +1548,9 @@ invoke_NPN_CreateObject(NPP instance) +@@ -1480,6 +1550,9 @@ invoke_NPN_CreateObject(NPP instance) static NPObject * g_NPN_CreateObject(NPP instance, NPClass *class) { @@ -238,7 +240,7 @@ if (instance == NULL) return NULL; -@@ -1520,6 +1591,9 @@ invoke_NPN_RetainObject(NPObject *npobj) +@@ -1520,6 +1593,9 @@ invoke_NPN_RetainObject(NPObject *npobj) static NPObject * g_NPN_RetainObject(NPObject *npobj) { @@ -248,7 +250,7 @@ if (npobj == NULL) return NULL; -@@ -1558,6 +1632,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj +@@ -1558,6 +1634,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj static void g_NPN_ReleaseObject(NPObject *npobj) { @@ -258,7 +260,7 @@ if (npobj == NULL) return; -@@ -1605,6 +1682,9 @@ static bool +@@ -1605,6 +1684,9 @@ static bool g_NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result) { @@ -268,7 +270,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->invoke) return false; -@@ -1652,6 +1732,9 @@ static bool +@@ -1652,6 +1734,9 @@ static bool g_NPN_InvokeDefault(NPP instance, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result) { @@ -278,7 +280,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->invokeDefault) return false; -@@ -1697,6 +1780,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje +@@ -1697,6 +1782,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje static bool g_NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result) { @@ -288,7 +290,7 @@ if (!instance || !npobj) return false; -@@ -1746,6 +1832,9 @@ static bool +@@ -1746,6 +1834,9 @@ static bool g_NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, NPVariant *result) { @@ -298,7 +300,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->getProperty) return false; -@@ -1792,6 +1881,9 @@ static bool +@@ -1792,6 +1883,9 @@ static bool g_NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName, const NPVariant *value) { @@ -308,7 +310,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->setProperty) return false; -@@ -1833,6 +1925,9 @@ invoke_NPN_RemoveProperty(NPP instance, +@@ -1833,6 +1927,9 @@ invoke_NPN_RemoveProperty(NPP instance, static bool g_NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) { @@ -318,7 +320,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->removeProperty) return false; -@@ -1874,6 +1969,9 @@ invoke_NPN_HasProperty(NPP instance, NPO +@@ -1874,6 +1971,9 @@ invoke_NPN_HasProperty(NPP instance, NPO static bool g_NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName) { @@ -328,7 +330,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->hasProperty) return false; -@@ -1915,6 +2013,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj +@@ -1915,6 +2015,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj static bool g_NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName) { @@ -338,7 +340,7 @@ if (!instance || !npobj || !npobj->_class || !npobj->_class->hasMethod) return false; -@@ -1950,6 +2051,9 @@ invoke_NPN_SetException(NPObject *npobj, +@@ -1950,6 +2053,9 @@ invoke_NPN_SetException(NPObject *npobj, static void g_NPN_SetException(NPObject *npobj, const NPUTF8 *message) { @@ -348,7 +350,7 @@ D(bug("NPN_SetException npobj=%p, message='%s'\n", npobj, message)); invoke_NPN_SetException(npobj, message); D(bug(" done\n")); -@@ -2011,6 +2115,8 @@ invoke_NPN_GetStringIdentifier(const NPU +@@ -2011,6 +2117,8 @@ invoke_NPN_GetStringIdentifier(const NPU static NPIdentifier g_NPN_GetStringIdentifier(const NPUTF8 *name) { @@ -357,7 +359,7 @@ if (name == NULL) return NULL; -@@ -2060,6 +2166,9 @@ invoke_NPN_GetStringIdentifiers(const NP +@@ -2060,6 +2168,9 @@ invoke_NPN_GetStringIdentifiers(const NP static void g_NPN_GetStringIdentifiers(const NPUTF8 **names, uint32_t nameCount, NPIdentifier *identifiers) { @@ -367,7 +369,7 @@ if (names == NULL) return; -@@ -2101,6 +2210,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti +@@ -2101,6 +2212,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti static NPIdentifier g_NPN_GetIntIdentifier(int32_t intid) { @@ -377,7 +379,7 @@ D(bug("NPN_GetIntIdentifier intid=%d\n", intid)); NPIdentifier ret = invoke_NPN_GetIntIdentifier(intid); D(bug(" return: %p\n", ret)); -@@ -2137,6 +2249,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi +@@ -2137,6 +2251,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi static bool g_NPN_IdentifierIsString(NPIdentifier identifier) { @@ -387,7 +389,7 @@ D(bug("NPN_IdentifierIsString identifier=%p\n", identifier)); bool ret = invoke_NPN_IdentifierIsString(identifier); D(bug(" return: %d\n", ret)); -@@ -2173,6 +2288,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi +@@ -2173,6 +2290,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi static NPUTF8 * g_NPN_UTF8FromIdentifier(NPIdentifier identifier) { @@ -397,7 +399,7 @@ D(bug("NPN_UTF8FromIdentifier identifier=%p\n", identifier)); NPUTF8 *ret = invoke_NPN_UTF8FromIdentifier(identifier); D(bug(" return: '%s'\n", ret)); -@@ -2210,6 +2328,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie +@@ -2210,6 +2330,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie static int32_t g_NPN_IntFromIdentifier(NPIdentifier identifier) { @@ -407,7 +409,7 @@ D(bug("NPN_IntFromIdentifier identifier=%p\n", identifier)); int32_t ret = invoke_NPN_IntFromIdentifier(identifier); D(bug(" return: %d\n", ret)); -@@ -3259,6 +3380,9 @@ static int do_main(int argc, char **argv +@@ -3259,6 +3382,9 @@ static int do_main(int argc, char **argv } D(bug(" Plugin connection: %s\n", connection_path)); nspluginwrapper-1.1.0-runtime-restart.patch: Index: nspluginwrapper-1.1.0-runtime-restart.patch =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-runtime-restart.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspluginwrapper-1.1.0-runtime-restart.patch 8 Jul 2008 13:17:06 -0000 1.1 +++ nspluginwrapper-1.1.0-runtime-restart.patch 18 Jul 2008 09:21:25 -0000 1.2 @@ -398,7 +398,7 @@ #endif +// This callback is called when the connection is closed or broken -+typedef int (*rpc_error_callback_t)(rpc_connection_t *connection); ++typedef void (*rpc_error_callback_t)(rpc_connection_t *connection); + +// Set callback for a connection +void rpc_connection_error_callback_set(rpc_connection_t *connection, rpc_error_callback_t callback); Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- nspluginwrapper.spec 8 Jul 2008 13:17:06 -0000 1.49 +++ nspluginwrapper.spec 18 Jul 2008 09:21:25 -0000 1.50 @@ -70,7 +70,7 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper Version: 1.1.0 -Release: 1%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in @@ -87,11 +87,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Provides: %{name} = %{version}-%{release} Requires: %{_bindir}/linux32 -Requires: gecko-libs = %{gecko_ver} +Requires: gecko-libs >= %{gecko_ver} Requires: mozilla-filesystem BuildRequires: pkgconfig gtk2-devel glib2-devel nspr-devel BuildRequires: libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel -BuildRequires: gecko-devel = %{gecko_ver} +BuildRequires: gecko-devel >= %{gecko_ver} ExclusiveArch: i386 x86_64 ppc %description @@ -169,7 +169,7 @@ ./configure --prefix=/usr CFLAGS="$RPM_OPT_FLAGS" make popd - + %install rm -rf $RPM_BUILD_ROOT @@ -204,6 +204,13 @@ > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +# set up nsplugin player starting script +%{__cat} > $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer << EOF +export MOZ_PLUGIN_PATH=%{pluginsourcedir} +%{pkgdir}/npplayer "$@" +EOF +chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer + %clean rm -rf $RPM_BUILD_ROOT @@ -226,11 +233,19 @@ %{pkgdir}/npwrapper.so %{pkgdir}/npviewer.bin %{pkgdir}/npviewer +%{pkgdir}/npplayer +%{pkgdir}/nspluginplayer %{plugindir}/npwrapper.so %{_bindir}/mozilla-plugin-config %config %{_sysconfdir}/sysconfig/%{name} %changelog +* Tue Jul 18 2008 Martin Stransky 1.1.0-3 +- Enabled experimental stand-alone plugin player + +* Tue Jul 15 2008 Martin Stransky 1.1.0-2 +- Fixed build warnings in our patches + * Tue Jul 8 2008 Martin Stransky 1.1.0-1 - update to latest upstream version (1.1.0) From fedora-extras-commits at redhat.com Fri Jul 18 09:22:49 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 09:22:49 GMT Subject: rpms/python-libgmail/devel python-libgmail.spec,1.2,1.3 Message-ID: <200807180922.m6I9MnED020204@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20079 Modified Files: python-libgmail.spec Log Message: Upstream update to 0.1.9 Index: python-libgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/devel/python-libgmail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-libgmail.spec 18 Jul 2008 08:43:01 -0000 1.2 +++ python-libgmail.spec 18 Jul 2008 09:22:03 -0000 1.3 @@ -9,18 +9,21 @@ Group: Development/Languages License: GPLv2 URL: http://%{realname}.sourceforge.net -Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz +Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz +#Fix ClientCookie old include +Patch0: %{name}-ccfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel +BuildRequires: python-mechanize %description Library to provide access to Gmail via Python. %prep %setup -q -n %{realname}-%{version} - +%patch0 -p1 -b .ccfix %build %{__python} setup.py build From fedora-extras-commits at redhat.com Fri Jul 18 09:31:29 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Fri, 18 Jul 2008 09:31:29 GMT Subject: rpms/totem/F-9 totem.spec,1.188,1.189 Message-ID: <200807180931.m6I9VT78020625@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/totem/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20575 Modified Files: totem.spec Log Message: * Fri Jul 18 2008 Martin Stransky - 2.23.2-5 - Rebuild against xulrunner 1.9.0.1 and fixed gecko dependency Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/F-9/totem.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- totem.spec 18 Jun 2008 16:58:34 -0000 1.188 +++ totem.spec 18 Jul 2008 09:30:39 -0000 1.189 @@ -11,7 +11,7 @@ Summary: Movie player for GNOME Name: totem Version: 2.23.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -39,7 +39,7 @@ BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel BuildRequires: perl(XML::Parser) BuildRequires: iso-codes-devel -BuildRequires: gecko-devel-unstable = %gecko_version +BuildRequires: gecko-devel-unstable >= %gecko_version BuildRequires: gnome-icon-theme BuildRequires: nautilus-devel BuildRequires: libXtst-devel @@ -104,7 +104,7 @@ %package mozplugin Summary: Mozilla plugin for Totem Group: Applications/Internet -Requires: gecko-libs = %gecko_version +Requires: gecko-libs >= %gecko_version %description mozplugin Totem is simple movie player for the Gnome desktop. The mozilla plugin @@ -433,6 +433,9 @@ %endif %changelog +* Fri Jul 18 2008 Martin Stransky - 2.23.2-5 +- Rebuild against xulrunner 1.9.0.1 and fixed gecko dependency + * Wed Jun 18 2008 Owen Taylor - 2.23.2-4 - Rebuild against xulrunner 1.9 final From fedora-extras-commits at redhat.com Fri Jul 18 09:35:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 09:35:08 +0000 Subject: [pkgdb] cpio: kdudka has requested watchbugzilla Message-ID: <200807180935.m6I9Z8gk021520@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on cpio (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 09:35:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 09:35:16 +0000 Subject: [pkgdb] cpio: kdudka has requested watchcommits Message-ID: <200807180935.m6I9ZGrZ021543@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on cpio (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 09:35:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 09:35:19 +0000 Subject: [pkgdb] cpio: kdudka has requested commit Message-ID: <200807180935.m6I9ZJha021562@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on cpio (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 09:37:43 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 09:37:43 GMT Subject: rpms/python-libgmail/devel python-libgmail-ccfix.patch,NONE,1.1 Message-ID: <200807180937.m6I9bhmp020890@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20882 Added Files: python-libgmail-ccfix.patch Log Message: Upstream update to 0.1.9 python-libgmail-ccfix.patch: --- NEW FILE python-libgmail-ccfix.patch --- --- libgmail-0.1.9/libgmail.py 2008-04-28 00:53:43.000000000 +0300 +++ libgmail-0.1.9/libgmail.py.ccfix 2008-07-18 12:12:06.000000000 +0300 @@ -33,7 +33,7 @@ import urllib import urllib2 import mimetypes import types -import ClientCookie +import mechanize as ClientCookie from cPickle import load, dump from email.MIMEBase import MIMEBase From fedora-extras-commits at redhat.com Fri Jul 18 09:45:36 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 09:45:36 GMT Subject: rpms/python-libgmail/F-9 python-libgmail-ccfix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 python-libgmail.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807180945.m6I9jao7021254@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21198 Modified Files: .cvsignore python-libgmail.spec sources Added Files: python-libgmail-ccfix.patch Log Message: Upstream update to 0.1.9 python-libgmail-ccfix.patch: --- NEW FILE python-libgmail-ccfix.patch --- --- libgmail-0.1.9/libgmail.py 2008-04-28 00:53:43.000000000 +0300 +++ libgmail-0.1.9/libgmail.py.ccfix 2008-07-18 12:12:06.000000000 +0300 @@ -33,7 +33,7 @@ import urllib import urllib2 import mimetypes import types -import ClientCookie +import mechanize as ClientCookie from cPickle import load, dump from email.MIMEBase import MIMEBase Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2008 04:34:39 -0000 1.2 +++ .cvsignore 18 Jul 2008 09:44:48 -0000 1.3 @@ -1 +1 @@ -libgmail-0.1.8.tar.gz +libgmail-0.1.9.tar.gz Index: python-libgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/python-libgmail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-libgmail.spec 28 Jan 2008 04:34:39 -0000 1.1 +++ python-libgmail.spec 18 Jul 2008 09:44:48 -0000 1.2 @@ -2,25 +2,28 @@ %define realname libgmail Name: python-%{realname} -Version: 0.1.8 -Release: 2%{?dist} +Version: 0.1.9 +Release: 1%{?dist} Summary: Library to provide access to Gmail via Python Group: Development/Languages License: GPLv2 URL: http://%{realname}.sourceforge.net -Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz +Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz +#Fix ClientCookie old include +Patch0: %{name}-ccfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel +BuildRequires: python-mechanize %description Library to provide access to Gmail via Python. %prep %setup -q -n %{realname}-%{version} - +%patch0 -p1 -b .ccfix %build %{__python} setup.py build @@ -45,6 +48,9 @@ %changelog +* Fri Jul 18 2008 Nikolay Vladimirov -0.1.9-1 +- new upstream 0.1.9 + * Tue Dec 11 2007 Michael Stahnke - 0.1.8-2 - Updated to proper license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2008 04:34:39 -0000 1.2 +++ sources 18 Jul 2008 09:44:48 -0000 1.3 @@ -1 +1 @@ -58f694ae19733e68b97e7a54d96d2637 libgmail-0.1.8.tar.gz +4a19c030920a030eb5217cfe8bb85a60 libgmail-0.1.9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 09:49:18 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 09:49:18 GMT Subject: rpms/python-libgmail/F-8 python-libgmail-ccfix.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 python-libgmail.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807180949.m6I9nIBM021381@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21348 Modified Files: .cvsignore python-libgmail.spec sources Added Files: python-libgmail-ccfix.patch Log Message: Update to 0.1.9 python-libgmail-ccfix.patch: --- NEW FILE python-libgmail-ccfix.patch --- --- libgmail-0.1.9/libgmail.py 2008-04-28 00:53:43.000000000 +0300 +++ libgmail-0.1.9/libgmail.py.ccfix 2008-07-18 12:12:06.000000000 +0300 @@ -33,7 +33,7 @@ import urllib import urllib2 import mimetypes import types -import ClientCookie +import mechanize as ClientCookie from cPickle import load, dump from email.MIMEBase import MIMEBase Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Jan 2008 18:21:16 -0000 1.1 +++ .cvsignore 18 Jul 2008 09:48:27 -0000 1.2 @@ -0,0 +1 @@ +libgmail-0.1.9.tar.gz Index: python-libgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-8/python-libgmail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-libgmail.spec 28 Jan 2008 04:44:16 -0000 1.1 +++ python-libgmail.spec 18 Jul 2008 09:48:27 -0000 1.2 @@ -2,25 +2,28 @@ %define realname libgmail Name: python-%{realname} -Version: 0.1.8 -Release: 2%{?dist} +Version: 0.1.9 +Release: 1%{?dist} Summary: Library to provide access to Gmail via Python Group: Development/Languages License: GPLv2 URL: http://%{realname}.sourceforge.net -Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz +Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz +#Fix ClientCookie old include +Patch0: %{name}-ccfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel +BuildRequires: python-mechanize %description Library to provide access to Gmail via Python. %prep %setup -q -n %{realname}-%{version} - +%patch0 -p1 -b .ccfix %build %{__python} setup.py build @@ -45,6 +48,9 @@ %changelog +* Fri Jul 18 2008 Nikolay Vladimirov -0.1.9-1 +- new upstream 0.1.9 + * Tue Dec 11 2007 Michael Stahnke - 0.1.8-2 - Updated to proper license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2008 04:44:16 -0000 1.2 +++ sources 18 Jul 2008 09:48:27 -0000 1.3 @@ -1 +1 @@ -58f694ae19733e68b97e7a54d96d2637 libgmail-0.1.8.tar.gz +4a19c030920a030eb5217cfe8bb85a60 libgmail-0.1.9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 09:58:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 09:58:32 +0000 Subject: [pkgdb] cpio had acl change status Message-ID: <200807180958.m6I9wWYI022115@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on cpio (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 09:58:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 09:58:32 +0000 Subject: [pkgdb] cpio had acl change status Message-ID: <200807180958.m6I9wWwZ022119@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on cpio (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 09:58:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 09:58:33 +0000 Subject: [pkgdb] cpio had acl change status Message-ID: <200807180958.m6I9wXKZ022137@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on cpio (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 10:13:27 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Fri, 18 Jul 2008 10:13:27 GMT Subject: rpms/vnc/devel vnc.spec,1.199,1.200 Message-ID: <200807181013.m6IADREw029030@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28997 Modified Files: vnc.spec Log Message: - fixed buildroot Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- vnc.spec 17 Jul 2008 11:17:36 -0000 1.199 +++ vnc.spec 18 Jul 2008 10:12:36 -0000 1.200 @@ -3,7 +3,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 34%{?dist} +Release: 34.1%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -50,7 +50,7 @@ License: GPLv2 Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, openssl-devel, libpciaccess-devel BuildRequires: zlib-devel libjpeg-devel BuildRequires: desktop-file-utils >= 0.2.92 @@ -332,6 +332,9 @@ %{_libdir}/librfb.so.* %changelog +* Fri Jul 18 2008 Adam Tkac 4.1.2-34.1 +- fixed buildroot + * Thu Jul 17 2008 Adam Tkac 4.1.2-34 - vncserver script returns error when Xvnc fails to start From fedora-extras-commits at redhat.com Fri Jul 18 10:17:23 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 10:17:23 GMT Subject: rpms/cpqarrayd/devel cpqarrayd-2.3.no_ida.patch, 1.1, 1.2 cpqarrayd.spec, 1.1, 1.2 Message-ID: <200807181017.m6IAHN5p029243@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29145 Modified Files: cpqarrayd-2.3.no_ida.patch cpqarrayd.spec Log Message: Cleanup no-ida patch cpqarrayd-2.3.no_ida.patch: Index: cpqarrayd-2.3.no_ida.patch =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/cpqarrayd-2.3.no_ida.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpqarrayd-2.3.no_ida.patch 18 Jul 2008 08:21:21 -0000 1.1 +++ cpqarrayd-2.3.no_ida.patch 18 Jul 2008 10:16:37 -0000 1.2 @@ -1,6 +1,113 @@ -diff -up cpqarrayd-2.3/configure.ac.orig cpqarrayd-2.3/configure.ac ---- cpqarrayd-2.3/configure.ac.orig 2008-07-09 15:00:42.000000000 +0300 -+++ cpqarrayd-2.3/configure.ac 2008-07-09 15:02:58.000000000 +0300 +diff -up cpqarrayd-2.3/status.c.no_ida cpqarrayd-2.3/status.c +--- cpqarrayd-2.3/status.c.no_ida 2007-12-03 19:06:22.000000000 +0200 ++++ cpqarrayd-2.3/status.c 2008-07-18 11:43:59.000000000 +0300 +@@ -33,9 +33,13 @@ + #endif + + #include ++ ++#ifdef HAVE_IDA + #include + #include + #include ++#endif ++ + #include + + #include "cpqarrayd.h" +@@ -45,7 +49,8 @@ + #include "cciss_structs.h" + #include "cciss_functions.h" + +-int status_check (struct opts opts) ++#ifdef HAVE_IDA ++int status_check (struct opts opts) + { + + int devicefd; +@@ -183,6 +188,7 @@ int status_check (struct opts opts) + return 1; + + } ++#endif + + int cciss_status_check (struct opts opts) + { +@@ -190,7 +196,6 @@ int cciss_status_check (struct opts opts + int devicefd; + int ctrl_cntr, result; + int logd_cntr; +- ida_ioctl_t io, io2; + int status, nr_blks, blks_tr, trap_stat; + float pvalue; + char statusmsg[1024]; +diff -up cpqarrayd-2.3/discover.c.no_ida cpqarrayd-2.3/discover.c +--- cpqarrayd-2.3/discover.c.no_ida 2007-12-03 19:06:22.000000000 +0200 ++++ cpqarrayd-2.3/discover.c 2008-07-18 11:49:23.000000000 +0300 +@@ -33,12 +33,14 @@ + #include + #endif + ++#ifdef WITH_IDA + #if defined(__linux__) + #include + #include + #include + #include + #endif ++#endif + + #if defined(__freebsd__) + #include +@@ -52,8 +54,12 @@ + + + int discover_controllers (struct opts); ++ ++#ifdef WITH_IDA + int interrogate_controller (struct opts, const char *); + int interrogate_logical(struct opts, int, int); ++#endif ++ + void boardid2str (unsigned long , char *); + + /* Added devfs devices +@@ -84,6 +90,7 @@ discover_controllers (struct opts opts) + int cntr; + int foundone = 0; + ++#ifdef WITH_IDA + for (cntr = 0; cntr < 8; cntr++) + { + /* does this device exist ? */ +@@ -104,6 +111,8 @@ discover_controllers (struct opts opts) + perror ("DEBUG: reason"); + } + } ++#endif ++ + for (cntr = 0; cntr < 16; cntr++) + { + /* does this device exist ? */ +@@ -127,6 +136,7 @@ discover_controllers (struct opts opts) + return foundone; + } + ++#ifdef WITH_IDA + int + interrogate_controller (struct opts opts, const char *devicefile) + { +@@ -227,6 +237,7 @@ interrogate_logical (struct opts opts, i + + return 1; + } ++#endif + + void + boardid2str (unsigned long board_id, char *name) +diff -up cpqarrayd-2.3/configure.ac.no_ida cpqarrayd-2.3/configure.ac +--- cpqarrayd-2.3/configure.ac.no_ida 2005-12-16 13:17:44.000000000 +0200 ++++ cpqarrayd-2.3/configure.ac 2008-07-18 11:41:27.000000000 +0300 @@ -16,35 +16,35 @@ AC_PROG_MAKE_SET AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h]) @@ -62,581 +169,28 @@ dnl Check for CCISS header file AC_CHECK_HEADERS(linux/cciss_ioctl.h,, -diff -up cpqarrayd-2.3/cpqarrayd.c.orig cpqarrayd-2.3/cpqarrayd.c ---- cpqarrayd-2.3/cpqarrayd.c.orig 2008-07-09 15:03:52.000000000 +0300 -+++ cpqarrayd-2.3/cpqarrayd.c 2008-07-09 15:22:19.000000000 +0300 -@@ -35,9 +35,9 @@ +--- cpqarrayd-2.3/cpqarrayd.c.no_ida 2007-12-03 19:06:22.000000000 +0200 ++++ cpqarrayd-2.3/cpqarrayd.c 2008-07-18 13:02:17.000000000 +0300 +@@ -35,9 +35,11 @@ #include #endif --#if defined(__linux__) -- #include --#endif -+/* #if defined(__linux__) */ -+/* #include */ -+/* #endif */ ++#ifdef WITH_IDA + #if defined(__linux__) + #include + #endif ++#endif #if defined(__freebsd__) #include -@@ -249,7 +249,7 @@ int main(int argc, char *argv[]) +@@ -249,7 +251,10 @@ syslog(LOG_INFO, "Logging Enabled..."); while (keeprunning) { -- status_check(opts); -+/* status_check(opts); */ ++ ++#ifdef WITH_IDA + status_check(opts); ++#endif cciss_status_check(opts); if (keeprunning) { sleep(30); } } -diff -up cpqarrayd-2.3/discover.c.orig cpqarrayd-2.3/discover.c ---- cpqarrayd-2.3/discover.c.orig 2008-07-09 15:05:25.000000000 +0300 -+++ cpqarrayd-2.3/discover.c 2008-07-09 15:12:43.000000000 +0300 -@@ -33,12 +33,12 @@ - #include - #endif - --#if defined(__linux__) -- #include -- #include -- #include -- #include --#endif -+/* #if defined(__linux__) */ -+/* #include */ -+/* #include */ -+/* #include */ -+/* #include */ -+/* #endif */ - - #if defined(__freebsd__) - #include -@@ -52,8 +52,8 @@ - - - int discover_controllers (struct opts); --int interrogate_controller (struct opts, const char *); --int interrogate_logical(struct opts, int, int); -+/* int interrogate_controller (struct opts, const char *); */ -+/* int interrogate_logical(struct opts, int, int); */ - void boardid2str (unsigned long , char *); - - /* Added devfs devices -@@ -84,26 +84,26 @@ discover_controllers (struct opts opts) - int cntr; - int foundone = 0; - -- for (cntr = 0; cntr < 8; cntr++) -- { -- /* does this device exist ? */ -- if ((access (controllers[cntr], R_OK | F_OK)) == 0) -- { -- /* it does :) */ -- if (interrogate_controller (opts, controllers[cntr])) -- { -- foundone = 1; -- if (opts.debug) -- fprintf (stderr, "DEBUG: %s is a existing controller\n", -- controllers[cntr]); -- } -- } -- else if (opts.debug) -- { -- fprintf (stderr, "DEBUG: Device %s could not be opened\n", controllers[cntr]); -- perror ("DEBUG: reason"); -- } -- } -+/* for (cntr = 0; cntr < 8; cntr++) */ -+/* { */ -+/* /\* does this device exist ? *\/ */ -+/* if ((access (controllers[cntr], R_OK | F_OK)) == 0) */ -+/* { */ -+/* /\* it does :) *\/ */ -+/* if (interrogate_controller (opts, controllers[cntr])) */ -+/* { */ -+/* foundone = 1; */ -+/* if (opts.debug) */ -+/* fprintf (stderr, "DEBUG: %s is a existing controller\n", */ -+/* controllers[cntr]); */ -+/* } */ -+/* } */ -+/* else if (opts.debug) */ -+/* { */ -+/* fprintf (stderr, "DEBUG: Device %s could not be opened\n", controllers[cntr]); */ -+/* perror ("DEBUG: reason"); */ -+/* } */ -+/* } */ - for (cntr = 0; cntr < 16; cntr++) - { - /* does this device exist ? */ -@@ -127,106 +127,106 @@ discover_controllers (struct opts opts) - return foundone; - } - --int --interrogate_controller (struct opts opts, const char *devicefile) --{ -- int devicefd; -- ida_ioctl_t io; -- char buffer[30]; -- int foundone = 0; -- int cntr; -+/* int */ -+/* interrogate_controller (struct opts opts, const char *devicefile) */ -+/* { */ -+/* int devicefd; */ -+/* ida_ioctl_t io; */ -+/* char buffer[30]; */ -+/* int foundone = 0; */ -+/* int cntr; */ - - -- devicefd = open (devicefile, O_RDONLY); -- /* no checks, did that before */ -+/* devicefd = open (devicefile, O_RDONLY); */ -+/* /\* no checks, did that before *\/ */ - -- /* clear io */ -- memset (&io, 0, sizeof (io)); -+/* /\* clear io *\/ */ -+/* memset (&io, 0, sizeof (io)); */ - -- io.cmd = ID_CTLR; -+/* io.cmd = ID_CTLR; */ - -- if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) -- { -- if (opts.debug) perror ("DEBUG: ioctl"); -- return 0; -- } -+/* if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) */ -+/* { */ -+/* if (opts.debug) perror ("DEBUG: ioctl"); */ -+/* return 0; */ -+/* } */ - -- boardid2str (io.c.id_ctlr.board_id, buffer); -+/* boardid2str (io.c.id_ctlr.board_id, buffer); */ - -- ctrls_found[ctrls_found_num].ctrl_devicename = (char *)malloc(strlen(buffer)+1); -- strncpy (ctrls_found[ctrls_found_num].ctrl_devicename, -- buffer, strlen(buffer)+1); -+/* ctrls_found[ctrls_found_num].ctrl_devicename = (char *)malloc(strlen(buffer)+1); */ -+/* strncpy (ctrls_found[ctrls_found_num].ctrl_devicename, */ -+/* buffer, strlen(buffer)+1); */ - -- ctrls_found[ctrls_found_num].ctrl_type = CTRLTYPE_IDA; -+/* ctrls_found[ctrls_found_num].ctrl_type = CTRLTYPE_IDA; */ - -- ctrls_found[ctrls_found_num].num_logd_found = 0; -+/* ctrls_found[ctrls_found_num].num_logd_found = 0; */ - -- for (cntr = 0; cntr < io.c.id_ctlr.nr_drvs; cntr++) -- { -- if (interrogate_logical (opts, devicefd, cntr)) -- { -- foundone = 1; -- } -- } -+/* for (cntr = 0; cntr < io.c.id_ctlr.nr_drvs; cntr++) */ -+/* { */ -+/* if (interrogate_logical (opts, devicefd, cntr)) */ -+/* { */ -+/* foundone = 1; */ -+/* } */ -+/* } */ - -- if (opts.verbose) printf(" Found a %s (%d Logical drives)\n", buffer, -- ctrls_found[ctrls_found_num].num_logd_found); -+/* if (opts.verbose) printf(" Found a %s (%d Logical drives)\n", buffer, */ -+/* ctrls_found[ctrls_found_num].num_logd_found); */ - -- ctrls_found[ctrls_found_num].devicefile = (char *)malloc(strlen(devicefile)+1); -- strcpy(ctrls_found[ctrls_found_num].devicefile, devicefile); -+/* ctrls_found[ctrls_found_num].devicefile = (char *)malloc(strlen(devicefile)+1); */ -+/* strcpy(ctrls_found[ctrls_found_num].devicefile, devicefile); */ - -- close (devicefd); -+/* close (devicefd); */ - -- ctrls_found_num++; -+/* ctrls_found_num++; */ - -- return 1; --} -+/* return 1; */ -+/* } */ - --int --interrogate_logical (struct opts opts, int devicefd, int unit_nr) --{ -- ida_ioctl_t io; -- ida_ioctl_t io2; -- int nr_blks, blks_tr; -+/* int */ -+/* interrogate_logical (struct opts opts, int devicefd, int unit_nr) */ -+/* { */ -+/* ida_ioctl_t io; */ -+/* ida_ioctl_t io2; */ -+/* int nr_blks, blks_tr; */ - -- if (opts.debug) printf ("DEBUG: interrogating unit %d\n", unit_nr); -+/* if (opts.debug) printf ("DEBUG: interrogating unit %d\n", unit_nr); */ - -- memset (&io, 0, sizeof (io)); -+/* memset (&io, 0, sizeof (io)); */ - -- io.cmd = ID_LOG_DRV; -- io.unit = unit_nr | UNITVALID; -+/* io.cmd = ID_LOG_DRV; */ -+/* io.unit = unit_nr | UNITVALID; */ - -- if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) -- { -- perror ("FATAL: ID_LOG_DRV ioctl"); -- return 0; -- } -+/* if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) */ -+/* { */ -+/* perror ("FATAL: ID_LOG_DRV ioctl"); */ -+/* return 0; */ -+/* } */ - -- memset (&io2, 0, sizeof (io2)); -+/* memset (&io2, 0, sizeof (io2)); */ - -- io2.cmd = SENSE_LOG_DRV_STAT; -- io2.unit = unit_nr | UNITVALID; -+/* io2.cmd = SENSE_LOG_DRV_STAT; */ -+/* io2.unit = unit_nr | UNITVALID; */ - -- if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) -- { -- perror ("FATAL: SENSE_LOG_DRV_STAT ioctl"); -- return 0; -- } -+/* if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) */ -+/* { */ -+/* perror ("FATAL: SENSE_LOG_DRV_STAT ioctl"); */ -+/* return 0; */ -+/* } */ - -- ctrls_found[ctrls_found_num].num_logd_found++; -- /* ctrls_found[ctrls_found_num].log_disk[unit_nr].status = -- * io2.c.sense_log_drv_stat.status; -- -- * nr_blks = io2.c.id_log_drv.nr_blks; -- * blks_tr = io.c.sense_log_drv_stat.blks_to_recover; -- * ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = -- * ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; -- */ -- ctrls_found[ctrls_found_num].log_disk[unit_nr].status = 0; -- ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = 0; -+/* ctrls_found[ctrls_found_num].num_logd_found++; */ -+/* /\* ctrls_found[ctrls_found_num].log_disk[unit_nr].status = */ -+/* * io2.c.sense_log_drv_stat.status; */ -+ -+/* * nr_blks = io2.c.id_log_drv.nr_blks; */ -+/* * blks_tr = io.c.sense_log_drv_stat.blks_to_recover; */ -+/* * ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = */ -+/* * ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; */ -+/* *\/ */ -+/* ctrls_found[ctrls_found_num].log_disk[unit_nr].status = 0; */ -+/* ctrls_found[ctrls_found_num].log_disk[unit_nr].pvalue = 0; */ - -- return 1; --} -+/* return 1; */ -+/* } */ - - void - boardid2str (unsigned long board_id, char *name) -diff -up cpqarrayd-2.3/status.c.orig cpqarrayd-2.3/status.c ---- cpqarrayd-2.3/status.c.orig 2008-07-09 15:16:05.000000000 +0300 -+++ cpqarrayd-2.3/status.c 2008-07-09 15:20:51.000000000 +0300 -@@ -33,9 +33,9 @@ - #endif - - #include --#include --#include --#include -+/* #include */ -+/* #include */ -+/* #include */ - #include - - #include "cpqarrayd.h" -@@ -45,144 +45,144 @@ - #include "cciss_structs.h" - #include "cciss_functions.h" - --int status_check (struct opts opts) --{ -+/* int status_check (struct opts opts) */ -+/* { */ - -- int devicefd; -- int ctrl_cntr; -- int logd_cntr; -- ida_ioctl_t io, io2; -- int status, nr_blks, blks_tr, trap_stat; -- float pvalue; -- char statusmsg[1024]; -- int counter; -+/* int devicefd; */ -+/* int ctrl_cntr; */ -+/* int logd_cntr; */ -+/* ida_ioctl_t io, io2; */ -+/* int status, nr_blks, blks_tr, trap_stat; */ -+/* float pvalue; */ -+/* char statusmsg[1024]; */ -+/* int counter; */ - - -- for ( ctrl_cntr=0; -- ctrl_cntr < ctrls_found_num; -- ctrl_cntr++) { -- if (ctrls_found[ctrl_cntr].ctrl_type != CTRLTYPE_IDA) { -- break; -- } -+/* for ( ctrl_cntr=0; */ -+/* ctrl_cntr < ctrls_found_num; */ -+/* ctrl_cntr++) { */ -+/* if (ctrls_found[ctrl_cntr].ctrl_type != CTRLTYPE_IDA) { */ -+/* break; */ -+/* } */ - -- devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY); -+/* devicefd = open (ctrls_found[ctrl_cntr].devicefile, O_RDONLY); */ - -- for ( logd_cntr=0; -- logd_cntr < ctrls_found[ctrl_cntr].num_logd_found; -- logd_cntr++) { -+/* for ( logd_cntr=0; */ -+/* logd_cntr < ctrls_found[ctrl_cntr].num_logd_found; */ -+/* logd_cntr++) { */ - -- memset (&io, 0, sizeof (io)); -+/* memset (&io, 0, sizeof (io)); */ - -- io.cmd = SENSE_LOG_DRV_STAT; -- io.unit = logd_cntr | UNITVALID; -+/* io.cmd = SENSE_LOG_DRV_STAT; */ -+/* io.unit = logd_cntr | UNITVALID; */ - -- if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) -- { -- perror ("SENSE_LOG_DRV_STAT ioctl"); -- return 0; -- } -+/* if (ioctl (devicefd, IDAPASSTHRU, &io) < 0) */ -+/* { */ -+/* perror ("SENSE_LOG_DRV_STAT ioctl"); */ -+/* return 0; */ -+/* } */ - -- status=io.c.sense_log_drv_stat.status; -+/* status=io.c.sense_log_drv_stat.status; */ - -- if ((status == 3) || (status == 5) || (status == 7)) { -- /* is a progress indicator required? -- */ -- memset (&io2, 0, sizeof (io)); -+/* if ((status == 3) || (status == 5) || (status == 7)) { */ -+/* /\* is a progress indicator required? */ -+/* *\/ */ -+/* memset (&io2, 0, sizeof (io)); */ - -- io2.cmd = ID_LOG_DRV; -- io2.unit = logd_cntr | UNITVALID; -+/* io2.cmd = ID_LOG_DRV; */ -+/* io2.unit = logd_cntr | UNITVALID; */ - -- if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) -- { -- perror ("ID_LOG_DRV ioctl"); -- /* return 0; no return this isn't fatal for now */ -- } -- else -- { -- nr_blks = io2.c.id_log_drv.nr_blks; -- blks_tr = io.c.sense_log_drv_stat.blks_to_recover; -+/* if (ioctl (devicefd, IDAPASSTHRU, &io2) < 0) */ -+/* { */ -+/* perror ("ID_LOG_DRV ioctl"); */ -+/* /\* return 0; no return this isn't fatal for now *\/ */ -+/* } */ -+/* else */ -+/* { */ -+/* nr_blks = io2.c.id_log_drv.nr_blks; */ -+/* blks_tr = io.c.sense_log_drv_stat.blks_to_recover; */ - -- pvalue = ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; -+/* pvalue = ((float)(nr_blks - blks_tr)/(float)nr_blks) * 100; */ - -- } -- } -- else { -- pvalue = 0.0; -- } -- -- if (opts.debug) { -- fprintf(stdout, "DEBUG: Status of controller %d unit %d is %d\n", -- ctrl_cntr, logd_cntr, status); -- fprintf(stdout, "DEBUG: "); -- fprintf(stdout, statusstr[status], -- ctrl_cntr, logd_cntr, pvalue); -- fprintf(stdout, "\n"); -- } -+/* } */ -+/* } */ -+/* else { */ -+/* pvalue = 0.0; */ -+/* } */ -+ -+/* if (opts.debug) { */ -+/* fprintf(stdout, "DEBUG: Status of controller %d unit %d is %d\n", */ -+/* ctrl_cntr, logd_cntr, status); */ -+/* fprintf(stdout, "DEBUG: "); */ -+/* fprintf(stdout, statusstr[status], */ -+/* ctrl_cntr, logd_cntr, pvalue); */ -+/* fprintf(stdout, "\n"); */ -+/* } */ - -- if (status != ctrls_found[ctrl_cntr].log_disk[logd_cntr].status) { -- /* status changed, time to send a trap */ -- syslog(LOG_WARNING, "/dev/c%dd%d: Status change.", ctrl_cntr, -- logd_cntr); -- syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, -- pvalue); -- if (opts.debug) { -- printf ("DEBUG: status changed from %d to %d, pvalue = %f\n", -- ctrls_found[ctrl_cntr].log_disk[logd_cntr].status, status, -- pvalue); -- } -- sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); -- if (opts.debug) { -- printf("DEBUG: sending traps.\n"); -- } -- /* Send a trap, syslog if send_trap returns !0. */ -- if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { -- syslog(LOG_WARNING, -- "problem sending snmp trap (sendtrap() returned %d)\n", -- trap_stat); -- if (opts.debug) { -- printf("DEBUG: Problem sending snmp trap", -- "(sendtrap() returned %d)\n", -- trap_stat); -- } -- } -- } -- else if ((status == 5) && -- ((pvalue - ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue) -- >= 25.0 )) { -- /* pvalue changed by more than 25%, time to send a trap */ -- syslog(LOG_WARNING, "/dev/c%dd%d: Percentile value change.", -- ctrl_cntr, logd_cntr); -- syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, -- pvalue); -- if (opts.debug) { -- printf ("DEBUG: pvalue changed from %f to %f\n", -- ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue, -- pvalue); -- } -- sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); -- if (opts.debug) { -- printf("DEBUG: sending traps.\n"); -- } -- if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { -- syslog(LOG_WARNING, -- "problem sending snmp trap (sendtrap() returned %d)\n", -- trap_stat); -- if (opts.debug) { -- printf("DEBUG: Problem sending snmp trap ", -- "(sendtrap() returned %d)\n", -- trap_stat); -- } -- } -- ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue; -- } -- ctrls_found[ctrl_cntr].log_disk[logd_cntr].status = status; -- } -- close (devicefd); -- } -+/* if (status != ctrls_found[ctrl_cntr].log_disk[logd_cntr].status) { */ -+/* /\* status changed, time to send a trap *\/ */ -+/* syslog(LOG_WARNING, "/dev/c%dd%d: Status change.", ctrl_cntr, */ -+/* logd_cntr); */ -+/* syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, */ -+/* pvalue); */ -+/* if (opts.debug) { */ -+/* printf ("DEBUG: status changed from %d to %d, pvalue = %f\n", */ -+/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].status, status, */ -+/* pvalue); */ -+/* } */ -+/* sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); */ -+/* if (opts.debug) { */ -+/* printf("DEBUG: sending traps.\n"); */ -+/* } */ -+/* /\* Send a trap, syslog if send_trap returns !0. *\/ */ -+/* if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { */ -+/* syslog(LOG_WARNING, */ -+/* "problem sending snmp trap (sendtrap() returned %d)\n", */ -+/* trap_stat); */ -+/* if (opts.debug) { */ -+/* printf("DEBUG: Problem sending snmp trap", */ -+/* "(sendtrap() returned %d)\n", */ -+/* trap_stat); */ -+/* } */ -+/* } */ -+/* } */ -+/* else if ((status == 5) && */ -+/* ((pvalue - ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue) */ -+/* >= 25.0 )) { */ -+/* /\* pvalue changed by more than 25%, time to send a trap *\/ */ -+/* syslog(LOG_WARNING, "/dev/c%dd%d: Percentile value change.", */ -+/* ctrl_cntr, logd_cntr); */ -+/* syslog(LOG_WARNING, statusstr[status], ctrl_cntr, logd_cntr, */ -+/* pvalue); */ -+/* if (opts.debug) { */ -+/* printf ("DEBUG: pvalue changed from %f to %f\n", */ -+/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue, */ -+/* pvalue); */ -+/* } */ -+/* sprintf(statusmsg, statusstr[status], ctrl_cntr, logd_cntr, pvalue); */ -+/* if (opts.debug) { */ -+/* printf("DEBUG: sending traps.\n"); */ -+/* } */ -+/* if (trap_stat = sendtrap(opts, "beheer", status, statusmsg)) { */ -+/* syslog(LOG_WARNING, */ -+/* "problem sending snmp trap (sendtrap() returned %d)\n", */ -+/* trap_stat); */ -+/* if (opts.debug) { */ -+/* printf("DEBUG: Problem sending snmp trap ", */ -+/* "(sendtrap() returned %d)\n", */ -+/* trap_stat); */ -+/* } */ -+/* } */ -+/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].pvalue = pvalue; */ -+/* } */ -+/* ctrls_found[ctrl_cntr].log_disk[logd_cntr].status = status; */ -+/* } */ -+/* close (devicefd); */ -+/* } */ - -- return 1; -+/* return 1; */ - --} -+/* } */ - - int cciss_status_check (struct opts opts) - { -@@ -190,7 +190,7 @@ int cciss_status_check (struct opts opts - int devicefd; - int ctrl_cntr, result; - int logd_cntr; -- ida_ioctl_t io, io2; -+/* ida_ioctl_t io, io2; */ - int status, nr_blks, blks_tr, trap_stat; - float pvalue; - char statusmsg[1024]; Index: cpqarrayd.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/cpqarrayd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpqarrayd.spec 18 Jul 2008 08:21:21 -0000 1.1 +++ cpqarrayd.spec 18 Jul 2008 10:16:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpqarrayd Version: 2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ @@ -70,6 +70,9 @@ %doc %_mandir/man1/cpqarrayd* %changelog +* Fri Jul 18 2008 David Juran - 2.3-4 +- Cleanup no-ida patch + * Thu Jul 17 2008 - 2.3-3 - fix rpmlint warnings From fedora-extras-commits at redhat.com Fri Jul 18 10:20:04 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 10:20:04 GMT Subject: rpms/cpqarrayd/devel cpqarrayd.spec,1.2,1.3 Message-ID: <200807181020.m6IAK4eB029440@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358 Modified Files: cpqarrayd.spec Log Message: More tagging sillyness Index: cpqarrayd.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/cpqarrayd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpqarrayd.spec 18 Jul 2008 10:16:37 -0000 1.2 +++ cpqarrayd.spec 18 Jul 2008 10:19:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: cpqarrayd Version: 2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ @@ -70,6 +70,9 @@ %doc %_mandir/man1/cpqarrayd* %changelog +* Fri Jul 18 2008 David Juran - 2.3-5 +- More tagging sillyness + * Fri Jul 18 2008 David Juran - 2.3-4 - Cleanup no-ida patch From fedora-extras-commits at redhat.com Fri Jul 18 10:23:11 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Fri, 18 Jul 2008 10:23:11 GMT Subject: rpms/vnc/devel vnc.spec,1.200,1.201 Message-ID: <200807181023.m6IANBQM029703@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29591 Modified Files: vnc.spec Log Message: - removed buildroot variable (no longer needed) Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- vnc.spec 18 Jul 2008 10:12:36 -0000 1.200 +++ vnc.spec 18 Jul 2008 10:22:23 -0000 1.201 @@ -50,7 +50,6 @@ License: GPLv2 Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, openssl-devel, libpciaccess-devel BuildRequires: zlib-devel libjpeg-devel BuildRequires: desktop-file-utils >= 0.2.92 @@ -333,7 +332,7 @@ %changelog * Fri Jul 18 2008 Adam Tkac 4.1.2-34.1 -- fixed buildroot +- removed buildroot * Thu Jul 17 2008 Adam Tkac 4.1.2-34 - vncserver script returns error when Xvnc fails to start From fedora-extras-commits at redhat.com Fri Jul 18 10:23:26 2008 From: fedora-extras-commits at redhat.com (Kamil Dudka (kdudka)) Date: Fri, 18 Jul 2008 10:23:26 GMT Subject: rpms/cpio/devel cpio-2.9-dev_number.patch, NONE, 1.1 cpio.spec, 1.61, 1.62 Message-ID: <200807181023.m6IANQUq029719@cvs-int.fedora.redhat.com> Author: kdudka Update of /cvs/extras/rpms/cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29628 Modified Files: cpio.spec Added Files: cpio-2.9-dev_number.patch Log Message: Support major/minor device numbers over 127 (bz#450109) cpio-2.9-dev_number.patch: --- NEW FILE cpio-2.9-dev_number.patch --- diff -ruN cpio-2.9.90.orig/src/copyin.c cpio-2.9.90/src/copyin.c --- cpio-2.9.90.orig/src/copyin.c 2008-07-11 13:20:27.000000000 +0200 +++ cpio-2.9.90/src/copyin.c 2008-07-18 10:16:24.000000000 +0200 @@ -1269,15 +1269,15 @@ swab_array ((char *) short_hdr, 13); } - file_hdr->c_dev_maj = major (short_hdr->c_dev); - file_hdr->c_dev_min = minor (short_hdr->c_dev); + file_hdr->c_dev_maj = major ((unsigned short)short_hdr->c_dev); + file_hdr->c_dev_min = minor ((unsigned short)short_hdr->c_dev); file_hdr->c_ino = short_hdr->c_ino; file_hdr->c_mode = short_hdr->c_mode; file_hdr->c_uid = short_hdr->c_uid; file_hdr->c_gid = short_hdr->c_gid; file_hdr->c_nlink = short_hdr->c_nlink; - file_hdr->c_rdev_maj = major (short_hdr->c_rdev); - file_hdr->c_rdev_min = minor (short_hdr->c_rdev); + file_hdr->c_rdev_maj = major ((unsigned short)short_hdr->c_rdev); + file_hdr->c_rdev_min = minor ((unsigned short)short_hdr->c_rdev); file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes[0] << 16 | short_hdr->c_mtimes[1]; Index: cpio.spec =================================================================== RCS file: /cvs/extras/rpms/cpio/devel/cpio.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- cpio.spec 3 Jun 2008 14:05:43 -0000 1.61 +++ cpio.spec 18 Jul 2008 10:22:40 -0000 1.62 @@ -3,7 +3,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.9.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -15,6 +15,7 @@ Patch3: cpio-2.9-chmodRaceC.patch Patch4: cpio-2.9-exitCode.patch Patch5: cpio-2.9-dir_perm.patch +Patch6: cpio-2.9-dev_number.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info BuildRequires: texinfo, autoconf, gettext @@ -41,6 +42,7 @@ %patch3 -p1 -b .chmodRaceC %patch4 -p1 -b .exitCode %patch5 -p1 -b .dir_perm +%patch6 -p1 -b .dev_number autoheader @@ -81,6 +83,9 @@ %{_infodir}/*.info* %changelog +* Fri Jul 18 2008 Kamil Dudka 2.9.90-2 +- Support major/minor device numbers over 127 (bz#450109) + * Tue Jun 02 2008 Ondrej Vasik 2.9.90-1 - new upstream alpha version 2.9.90 + removed applied patches From fedora-extras-commits at redhat.com Fri Jul 18 10:29:29 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 10:29:29 GMT Subject: rpms/PyOpenGL/devel .cvsignore, 1.3, 1.4 PyOpenGL.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807181029.m6IATT1f030153@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/PyOpenGL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30069 Modified Files: .cvsignore PyOpenGL.spec sources Log Message: Update to 3.0.0b4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Dec 2007 23:12:00 -0000 1.3 +++ .cvsignore 18 Jul 2008 10:28:44 -0000 1.4 @@ -1 +1 @@ -PyOpenGL-3.0.0b1.tar.gz +PyOpenGL-3.0.0b4.tar.gz Index: PyOpenGL.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PyOpenGL.spec 31 Dec 2007 23:12:00 -0000 1.4 +++ PyOpenGL.spec 18 Jul 2008 10:28:44 -0000 1.5 @@ -1,9 +1,9 @@ -%define prever b1 +%define prever b4 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: PyOpenGL Version: 3.0.0 -Release: 0.5.%{prever}%{?dist} +Release: 0.6.%{prever}%{?dist} Summary: Python bindings for OpenGL License: BSD Group: System Environment/Libraries @@ -86,6 +86,9 @@ %changelog +* Fri Jul 18 2008 Nikolay Vladimirov 3.0.0-0.6.b4 +- New upstream release 3.0.0b4 + * Mon Dec 31 2007 Hans de Goede 3.0.0-0.5.b1 - New upstream release 3.0.0b1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Dec 2007 23:12:00 -0000 1.3 +++ sources 18 Jul 2008 10:28:44 -0000 1.4 @@ -1 +1 @@ -8a5536e4ec9fd4eddcc5bd954096205f PyOpenGL-3.0.0b1.tar.gz +01948fcc4f65dd220b0631eb93527efc PyOpenGL-3.0.0b4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 10:31:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Fri, 18 Jul 2008 10:31:44 GMT Subject: rpms/nuttcp/devel nuttcp-5.5.5-makefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 nuttcp.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200807181031.m6IAViw2030424@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/nuttcp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30319 Modified Files: .cvsignore nuttcp.spec sources Added Files: nuttcp-5.5.5-makefile.patch Log Message: upgrade to 5.5.5 nuttcp-5.5.5-makefile.patch: --- NEW FILE nuttcp-5.5.5-makefile.patch --- diff -up nuttcp-5.5.5/Makefile.old nuttcp-5.5.5/Makefile --- nuttcp-5.5.5/Makefile.old 2007-01-30 11:03:45.000000000 +0100 +++ nuttcp-5.5.5/Makefile 2008-07-18 12:20:10.000000000 +0200 @@ -1,5 +1,5 @@ APP = nuttcp-5.5.5 -EXTRAVERSION=-pre1 +EXTRAVERSION= CC = gcc -Wall #OPT = -g -O0 OPT = -O3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nuttcp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Jul 2006 12:45:32 -0000 1.3 +++ .cvsignore 18 Jul 2008 10:30:52 -0000 1.4 @@ -1 +1 @@ -nuttcp-5.3.1.tar.bz2 +nuttcp-5.5.5.tar.bz2 Index: nuttcp.spec =================================================================== RCS file: /cvs/extras/rpms/nuttcp/devel/nuttcp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nuttcp.spec 19 Feb 2008 23:00:20 -0000 1.7 +++ nuttcp.spec 18 Jul 2008 10:30:52 -0000 1.8 @@ -1,7 +1,8 @@ Name: nuttcp -Version: 5.3.1 -Release: 4%{?dist} +Version: 5.5.5 +Release: 1%{?dist} Source0: ftp://ftp.lcp.nrl.navy.mil/pub/nuttcp/%{name}-%{version}.tar.bz2 +Patch1: %{name}-%{version}-makefile.patch URL: ftp://ftp.lcp.nrl.navy.mil/pub/nuttcp/ Summary: Tool for testing TCP connections Group: Applications/Internet @@ -22,6 +23,8 @@ %prep %setup -q +%patch1 -p1 -b .pre1fix + sed -i -e "s,/usr/local/bin,%{_bindir},g;" \ -e "s,disable\(.*\)no,disable\t\t= yes,g" xinetd.d/* @@ -46,6 +49,10 @@ %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} %changelog +* Fri Jul 18 2008 Radek Vok??l - 5.5.5-1 +- upgrade to 5.5.5 +- remove pre1 from makefile + * Tue Feb 19 2008 Fedora Release Engineering - 5.3.1-4 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nuttcp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Jul 2006 12:45:32 -0000 1.3 +++ sources 18 Jul 2008 10:30:52 -0000 1.4 @@ -1 +1 @@ -8fae45f7211b68e0657b472cce8eb108 nuttcp-5.3.1.tar.bz2 +ec79568d622f85d6077c0dc819a31b84 nuttcp-5.5.5.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 10:34:11 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 10:34:11 GMT Subject: rpms/cpqarrayd/EL-5 cpqarrayd-2.3.no_ida.patch, NONE, 1.1 cpqarrayd-2.3.sysVinit.patch, NONE, 1.1 cpqarrayd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181034.m6IAYBHI030692@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30612/EL-5 Modified Files: .cvsignore sources Added Files: cpqarrayd-2.3.no_ida.patch cpqarrayd-2.3.sysVinit.patch cpqarrayd.spec import.log Log Message: Initial import cpqarrayd-2.3.no_ida.patch: --- NEW FILE cpqarrayd-2.3.no_ida.patch --- diff -up cpqarrayd-2.3/status.c.no_ida cpqarrayd-2.3/status.c --- cpqarrayd-2.3/status.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/status.c 2008-07-18 11:43:59.000000000 +0300 @@ -33,9 +33,13 @@ #endif #include + +#ifdef HAVE_IDA #include #include #include +#endif + #include #include "cpqarrayd.h" @@ -45,7 +49,8 @@ #include "cciss_structs.h" #include "cciss_functions.h" -int status_check (struct opts opts) +#ifdef HAVE_IDA +int status_check (struct opts opts) { int devicefd; @@ -183,6 +188,7 @@ int status_check (struct opts opts) return 1; } +#endif int cciss_status_check (struct opts opts) { @@ -190,7 +196,6 @@ int cciss_status_check (struct opts opts int devicefd; int ctrl_cntr, result; int logd_cntr; - ida_ioctl_t io, io2; int status, nr_blks, blks_tr, trap_stat; float pvalue; char statusmsg[1024]; diff -up cpqarrayd-2.3/discover.c.no_ida cpqarrayd-2.3/discover.c --- cpqarrayd-2.3/discover.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/discover.c 2008-07-18 11:49:23.000000000 +0300 @@ -33,12 +33,14 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #include #include #include #endif +#endif #if defined(__freebsd__) #include @@ -52,8 +54,12 @@ int discover_controllers (struct opts); + +#ifdef WITH_IDA int interrogate_controller (struct opts, const char *); int interrogate_logical(struct opts, int, int); +#endif + void boardid2str (unsigned long , char *); /* Added devfs devices @@ -84,6 +90,7 @@ discover_controllers (struct opts opts) int cntr; int foundone = 0; +#ifdef WITH_IDA for (cntr = 0; cntr < 8; cntr++) { /* does this device exist ? */ @@ -104,6 +111,8 @@ discover_controllers (struct opts opts) perror ("DEBUG: reason"); } } +#endif + for (cntr = 0; cntr < 16; cntr++) { /* does this device exist ? */ @@ -127,6 +136,7 @@ discover_controllers (struct opts opts) return foundone; } +#ifdef WITH_IDA int interrogate_controller (struct opts opts, const char *devicefile) { @@ -227,6 +237,7 @@ interrogate_logical (struct opts opts, i return 1; } +#endif void boardid2str (unsigned long board_id, char *name) diff -up cpqarrayd-2.3/configure.ac.no_ida cpqarrayd-2.3/configure.ac --- cpqarrayd-2.3/configure.ac.no_ida 2005-12-16 13:17:44.000000000 +0200 +++ cpqarrayd-2.3/configure.ac 2008-07-18 11:41:27.000000000 +0300 @@ -16,35 +16,35 @@ AC_PROG_MAKE_SET AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h]) -dnl Check for pathed kernel sources with ida_ioctl.h -AC_MSG_CHECKING(for kernel sources) -found_kernel_dir="" -for kernel_dir in /usr/src/linux /usr/src/linux-2.4 -do - if test -d $kernel_dir ; then - CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - found_kernel_dir="$kernel_dir" - fi -done - -if test "$found_kernel_dir" != "" ; then - AC_MSG_RESULT(found $found_kernel_dir ) -else - AC_MSG_ERROR(Kernel sources not found) -fi +dnl dnl Check for pathed kernel sources with ida_ioctl.h +dnl AC_MSG_CHECKING(for kernel sources) +dnl found_kernel_dir="" +dnl for kernel_dir in /usr/src/linux /usr/src/linux-2.4 +dnl do +dnl if test -d $kernel_dir ; then +dnl CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl found_kernel_dir="$kernel_dir" +dnl fi +dnl done + +dnl if test "$found_kernel_dir" != "" ; then +dnl AC_MSG_RESULT(found $found_kernel_dir ) +dnl else +dnl AC_MSG_ERROR(Kernel sources not found) +dnl fi dnl Check for compile.h (2.6.x kernels only? AC_CHECK_HEADERS(linux/compiler.h) -dnl Check Headers -AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, - AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) - -dnl Check version of SmartArray driver -AC_MSG_CHECKING(SmartArray driver version) -AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), - AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) +dnl dnl Check Headers +dnl AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, +dnl AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) + +dnl dnl Check version of SmartArray driver +dnl AC_MSG_CHECKING(SmartArray driver version) +dnl AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), +dnl AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) dnl Check for CCISS header file AC_CHECK_HEADERS(linux/cciss_ioctl.h,, --- cpqarrayd-2.3/cpqarrayd.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/cpqarrayd.c 2008-07-18 13:02:17.000000000 +0300 @@ -35,9 +35,11 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #endif +#endif #if defined(__freebsd__) #include @@ -249,7 +251,10 @@ syslog(LOG_INFO, "Logging Enabled..."); while (keeprunning) { + +#ifdef WITH_IDA status_check(opts); +#endif cciss_status_check(opts); if (keeprunning) { sleep(30); } } cpqarrayd-2.3.sysVinit.patch: --- NEW FILE cpqarrayd-2.3.sysVinit.patch --- diff -up cpqarrayd-2.3/scripts/cpqarrayd.orig cpqarrayd-2.3/scripts/cpqarrayd --- cpqarrayd-2.3/scripts/cpqarrayd.orig 2008-07-09 17:55:59.000000000 +0300 +++ cpqarrayd-2.3/scripts/cpqarrayd 2008-07-14 16:43:49.000000000 +0300 @@ -2,7 +2,7 @@ # # cpqarrayd Start/Stop Compaq Array monitor # -# chkconfig: 345 15 90 +# chkconfig: - 51 90 # description: The cpqarrayd monitors the status of Compaq Raid Arrays, \ # and reports via syslog or traps # processname: cpqarrayd @@ -23,8 +23,9 @@ RETVAL=0 case "$1" in start) echo -n "Starting cpqarrayd: " - daemon /usr/sbin/cpqarrayd $CPQ_PARAMS - RETVAL=$? +# daemon /usr/sbin/cpqarrayd $CPQ_PARAMS |grep -v ^DEBUG: + { daemon /usr/sbin/cpqarrayd $CPQ_PARAMS + RETVAL=$?; } |grep -v ^DEBUG: echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cpqarrayd ;; @@ -39,13 +40,22 @@ case "$1" in status cpqarrayd RETVAL=$? ;; - restart|reload) + restart|force-reload) $0 stop $0 start RETVAL=$? ;; - *) - echo "Usage: cpqarrayd {start|stop|status|restart|reload}" + reload) + exit 3 + ;; + condrestart|try-restart) + if status cpqarrayd > /dev/null; then + $0 stop + $0 start + fi + ;; + *) + echo "Usage: cpqarrayd {start|stop|status|restart|force-reolad|reload|cond-restart|try-restart}" exit 1 esac --- NEW FILE cpqarrayd.spec --- Name: cpqarrayd Version: 2.3 Release: 5%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ URL: http://www.strocamp.net/opensource/cpqarrayd.php Source0: http://www.strocamp.net/opensource/compaq/downloads/cpqarrayd-2.3.tar.gz Patch0: cpqarrayd-2.3.no_ida.patch Patch1: cpqarrayd-2.3.sysVinit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake BuildRequires: net-snmp-devel Requires(post): chkconfig Requires(postun): initscripts Requires(preun): chkconfig Requires(preun): initscripts %description Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers. It reports any status changes, like failing disks, to the syslog and optionally to a remote host using SNMP traps. Note that support for the old(?) IDA Arrays have been disabled in this package due to build issues and lack of testing hardware. %prep %setup -q %patch0 -p1 -b .no_ida %patch1 -p1 -b .sysVinit %build autoreconf -si %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/cpqarrayd $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig cp scripts/cpqarrayd.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cpqarrayd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add cpqarrayd %preun if [ $1 = 0 ] ; then /sbin/service cpqarrayd stop >/dev/null 2>&1 /sbin/chkconfig --del cpqarrayd fi %postun if [ "$1" -ge "1" ] ; then /sbin/service cpqarrayd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog DEVEL NEWS README %_sbindir/cpqarrayd %config(noreplace) %_sysconfdir/sysconfig/cpqarrayd %_initrddir/cpqarrayd %doc %_mandir/man1/cpqarrayd* %changelog * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness * Fri Jul 18 2008 David Juran - 2.3-4 - Cleanup no-ida patch * Thu Jul 17 2008 - 2.3-3 - fix rpmlint warnings * Mon Jul 14 2008 - 2.3-2 - Make SysVinit script compliant with Fedora Packaging Guidelines * Wed Jul 9 2008 - 2.3-1 - Initial packaging --- NEW FILE import.log --- cpqarrayd-2_3-5_fc10:EL-5:cpqarrayd-2.3-5.fc10.src.rpm:1216377173 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:33:19 -0000 1.1 +++ .cvsignore 18 Jul 2008 10:33:26 -0000 1.2 @@ -0,0 +1 @@ +cpqarrayd-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:33:19 -0000 1.1 +++ sources 18 Jul 2008 10:33:26 -0000 1.2 @@ -0,0 +1 @@ +55421afe4817863efab45c59a9486a60 cpqarrayd-2.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 10:43:21 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 10:43:21 GMT Subject: rpms/cpqarrayd/EL-4 cpqarrayd-2.3.no_ida.patch, NONE, 1.1 cpqarrayd-2.3.sysVinit.patch, NONE, 1.1 cpqarrayd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181043.m6IAhLfK031403@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31251/EL-4 Modified Files: .cvsignore sources Added Files: cpqarrayd-2.3.no_ida.patch cpqarrayd-2.3.sysVinit.patch cpqarrayd.spec import.log Log Message: Initial import cpqarrayd-2.3.no_ida.patch: --- NEW FILE cpqarrayd-2.3.no_ida.patch --- diff -up cpqarrayd-2.3/status.c.no_ida cpqarrayd-2.3/status.c --- cpqarrayd-2.3/status.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/status.c 2008-07-18 11:43:59.000000000 +0300 @@ -33,9 +33,13 @@ #endif #include + +#ifdef HAVE_IDA #include #include #include +#endif + #include #include "cpqarrayd.h" @@ -45,7 +49,8 @@ #include "cciss_structs.h" #include "cciss_functions.h" -int status_check (struct opts opts) +#ifdef HAVE_IDA +int status_check (struct opts opts) { int devicefd; @@ -183,6 +188,7 @@ int status_check (struct opts opts) return 1; } +#endif int cciss_status_check (struct opts opts) { @@ -190,7 +196,6 @@ int cciss_status_check (struct opts opts int devicefd; int ctrl_cntr, result; int logd_cntr; - ida_ioctl_t io, io2; int status, nr_blks, blks_tr, trap_stat; float pvalue; char statusmsg[1024]; diff -up cpqarrayd-2.3/discover.c.no_ida cpqarrayd-2.3/discover.c --- cpqarrayd-2.3/discover.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/discover.c 2008-07-18 11:49:23.000000000 +0300 @@ -33,12 +33,14 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #include #include #include #endif +#endif #if defined(__freebsd__) #include @@ -52,8 +54,12 @@ int discover_controllers (struct opts); + +#ifdef WITH_IDA int interrogate_controller (struct opts, const char *); int interrogate_logical(struct opts, int, int); +#endif + void boardid2str (unsigned long , char *); /* Added devfs devices @@ -84,6 +90,7 @@ discover_controllers (struct opts opts) int cntr; int foundone = 0; +#ifdef WITH_IDA for (cntr = 0; cntr < 8; cntr++) { /* does this device exist ? */ @@ -104,6 +111,8 @@ discover_controllers (struct opts opts) perror ("DEBUG: reason"); } } +#endif + for (cntr = 0; cntr < 16; cntr++) { /* does this device exist ? */ @@ -127,6 +136,7 @@ discover_controllers (struct opts opts) return foundone; } +#ifdef WITH_IDA int interrogate_controller (struct opts opts, const char *devicefile) { @@ -227,6 +237,7 @@ interrogate_logical (struct opts opts, i return 1; } +#endif void boardid2str (unsigned long board_id, char *name) diff -up cpqarrayd-2.3/configure.ac.no_ida cpqarrayd-2.3/configure.ac --- cpqarrayd-2.3/configure.ac.no_ida 2005-12-16 13:17:44.000000000 +0200 +++ cpqarrayd-2.3/configure.ac 2008-07-18 11:41:27.000000000 +0300 @@ -16,35 +16,35 @@ AC_PROG_MAKE_SET AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h]) -dnl Check for pathed kernel sources with ida_ioctl.h -AC_MSG_CHECKING(for kernel sources) -found_kernel_dir="" -for kernel_dir in /usr/src/linux /usr/src/linux-2.4 -do - if test -d $kernel_dir ; then - CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - found_kernel_dir="$kernel_dir" - fi -done - -if test "$found_kernel_dir" != "" ; then - AC_MSG_RESULT(found $found_kernel_dir ) -else - AC_MSG_ERROR(Kernel sources not found) -fi +dnl dnl Check for pathed kernel sources with ida_ioctl.h +dnl AC_MSG_CHECKING(for kernel sources) +dnl found_kernel_dir="" +dnl for kernel_dir in /usr/src/linux /usr/src/linux-2.4 +dnl do +dnl if test -d $kernel_dir ; then +dnl CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl found_kernel_dir="$kernel_dir" +dnl fi +dnl done + +dnl if test "$found_kernel_dir" != "" ; then +dnl AC_MSG_RESULT(found $found_kernel_dir ) +dnl else +dnl AC_MSG_ERROR(Kernel sources not found) +dnl fi dnl Check for compile.h (2.6.x kernels only? AC_CHECK_HEADERS(linux/compiler.h) -dnl Check Headers -AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, - AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) - -dnl Check version of SmartArray driver -AC_MSG_CHECKING(SmartArray driver version) -AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), - AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) +dnl dnl Check Headers +dnl AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, +dnl AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) + +dnl dnl Check version of SmartArray driver +dnl AC_MSG_CHECKING(SmartArray driver version) +dnl AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), +dnl AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) dnl Check for CCISS header file AC_CHECK_HEADERS(linux/cciss_ioctl.h,, --- cpqarrayd-2.3/cpqarrayd.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/cpqarrayd.c 2008-07-18 13:02:17.000000000 +0300 @@ -35,9 +35,11 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #endif +#endif #if defined(__freebsd__) #include @@ -249,7 +251,10 @@ syslog(LOG_INFO, "Logging Enabled..."); while (keeprunning) { + +#ifdef WITH_IDA status_check(opts); +#endif cciss_status_check(opts); if (keeprunning) { sleep(30); } } cpqarrayd-2.3.sysVinit.patch: --- NEW FILE cpqarrayd-2.3.sysVinit.patch --- diff -up cpqarrayd-2.3/scripts/cpqarrayd.orig cpqarrayd-2.3/scripts/cpqarrayd --- cpqarrayd-2.3/scripts/cpqarrayd.orig 2008-07-09 17:55:59.000000000 +0300 +++ cpqarrayd-2.3/scripts/cpqarrayd 2008-07-14 16:43:49.000000000 +0300 @@ -2,7 +2,7 @@ # # cpqarrayd Start/Stop Compaq Array monitor # -# chkconfig: 345 15 90 +# chkconfig: - 51 90 # description: The cpqarrayd monitors the status of Compaq Raid Arrays, \ # and reports via syslog or traps # processname: cpqarrayd @@ -23,8 +23,9 @@ RETVAL=0 case "$1" in start) echo -n "Starting cpqarrayd: " - daemon /usr/sbin/cpqarrayd $CPQ_PARAMS - RETVAL=$? +# daemon /usr/sbin/cpqarrayd $CPQ_PARAMS |grep -v ^DEBUG: + { daemon /usr/sbin/cpqarrayd $CPQ_PARAMS + RETVAL=$?; } |grep -v ^DEBUG: echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cpqarrayd ;; @@ -39,13 +40,22 @@ case "$1" in status cpqarrayd RETVAL=$? ;; - restart|reload) + restart|force-reload) $0 stop $0 start RETVAL=$? ;; - *) - echo "Usage: cpqarrayd {start|stop|status|restart|reload}" + reload) + exit 3 + ;; + condrestart|try-restart) + if status cpqarrayd > /dev/null; then + $0 stop + $0 start + fi + ;; + *) + echo "Usage: cpqarrayd {start|stop|status|restart|force-reolad|reload|cond-restart|try-restart}" exit 1 esac --- NEW FILE cpqarrayd.spec --- Name: cpqarrayd Version: 2.3 Release: 5%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ URL: http://www.strocamp.net/opensource/cpqarrayd.php Source0: http://www.strocamp.net/opensource/compaq/downloads/cpqarrayd-2.3.tar.gz Patch0: cpqarrayd-2.3.no_ida.patch Patch1: cpqarrayd-2.3.sysVinit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake BuildRequires: net-snmp-devel Requires(post): chkconfig Requires(postun): initscripts Requires(preun): chkconfig Requires(preun): initscripts %description Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers. It reports any status changes, like failing disks, to the syslog and optionally to a remote host using SNMP traps. Note that support for the old(?) IDA Arrays have been disabled in this package due to build issues and lack of testing hardware. %prep %setup -q %patch0 -p1 -b .no_ida %patch1 -p1 -b .sysVinit %build autoreconf -si %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/cpqarrayd $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig cp scripts/cpqarrayd.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cpqarrayd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add cpqarrayd %preun if [ $1 = 0 ] ; then /sbin/service cpqarrayd stop >/dev/null 2>&1 /sbin/chkconfig --del cpqarrayd fi %postun if [ "$1" -ge "1" ] ; then /sbin/service cpqarrayd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog DEVEL NEWS README %_sbindir/cpqarrayd %config(noreplace) %_sysconfdir/sysconfig/cpqarrayd %_initrddir/cpqarrayd %doc %_mandir/man1/cpqarrayd* %changelog * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness * Fri Jul 18 2008 David Juran - 2.3-4 - Cleanup no-ida patch * Thu Jul 17 2008 - 2.3-3 - fix rpmlint warnings * Mon Jul 14 2008 - 2.3-2 - Make SysVinit script compliant with Fedora Packaging Guidelines * Wed Jul 9 2008 - 2.3-1 - Initial packaging --- NEW FILE import.log --- cpqarrayd-2_3-5_fc10:EL-4:cpqarrayd-2.3-5.fc10.src.rpm:1216377663 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:33:19 -0000 1.1 +++ .cvsignore 18 Jul 2008 10:42:31 -0000 1.2 @@ -0,0 +1 @@ +cpqarrayd-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:33:19 -0000 1.1 +++ sources 18 Jul 2008 10:42:31 -0000 1.2 @@ -0,0 +1 @@ +55421afe4817863efab45c59a9486a60 cpqarrayd-2.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 10:45:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 10:45:43 +0000 Subject: [pkgdb] cpio: kdudka has requested watchbugzilla Message-ID: <200807181045.m6IAjg8T023558@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on cpio (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 10:45:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 10:45:43 +0000 Subject: [pkgdb] cpio: kdudka has requested watchcommits Message-ID: <200807181045.m6IAjhxZ023577@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on cpio (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 10:45:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 10:45:47 +0000 Subject: [pkgdb] cpio: kdudka has requested commit Message-ID: <200807181045.m6IAjlpR023596@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on cpio (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 10:45:59 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 10:45:59 GMT Subject: rpms/PyOpenGL/F-9 .cvsignore, 1.3, 1.4 PyOpenGL.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807181045.m6IAjxVb031607@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/PyOpenGL/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525 Modified Files: .cvsignore PyOpenGL.spec sources Log Message: Update to 3.0.0b4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Dec 2007 23:12:00 -0000 1.3 +++ .cvsignore 18 Jul 2008 10:45:09 -0000 1.4 @@ -1 +1 @@ -PyOpenGL-3.0.0b1.tar.gz +PyOpenGL-3.0.0b4.tar.gz Index: PyOpenGL.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/PyOpenGL.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PyOpenGL.spec 31 Dec 2007 23:12:00 -0000 1.4 +++ PyOpenGL.spec 18 Jul 2008 10:45:09 -0000 1.5 @@ -1,9 +1,9 @@ -%define prever b1 +%define prever b4 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: PyOpenGL Version: 3.0.0 -Release: 0.5.%{prever}%{?dist} +Release: 0.6.%{prever}%{?dist} Summary: Python bindings for OpenGL License: BSD Group: System Environment/Libraries @@ -86,6 +86,9 @@ %changelog +* Fri Jul 18 2008 Nikolay Vladimirov 3.0.0-0.6.b4 +- New upstream release 3.0.0b4 + * Mon Dec 31 2007 Hans de Goede 3.0.0-0.5.b1 - New upstream release 3.0.0b1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Dec 2007 23:12:00 -0000 1.3 +++ sources 18 Jul 2008 10:45:09 -0000 1.4 @@ -1 +1 @@ -8a5536e4ec9fd4eddcc5bd954096205f PyOpenGL-3.0.0b1.tar.gz +01948fcc4f65dd220b0631eb93527efc PyOpenGL-3.0.0b4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 10:47:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 10:47:42 +0000 Subject: [pkgdb] cpio had acl change status Message-ID: <200807181047.m6IAlgK7023681@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on cpio (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 10:47:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 10:47:41 +0000 Subject: [pkgdb] cpio had acl change status Message-ID: <200807181047.m6IAlfRw023678@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on cpio (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 10:47:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 10:47:44 +0000 Subject: [pkgdb] cpio had acl change status Message-ID: <200807181047.m6IAlifM023716@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on cpio (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpio From fedora-extras-commits at redhat.com Fri Jul 18 10:49:02 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 10:49:02 GMT Subject: rpms/cpqarrayd/F-9 cpqarrayd-2.3.no_ida.patch, NONE, 1.1 cpqarrayd-2.3.sysVinit.patch, NONE, 1.1 cpqarrayd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181049.m6IAn2KI031862@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31809/F-9 Modified Files: .cvsignore sources Added Files: cpqarrayd-2.3.no_ida.patch cpqarrayd-2.3.sysVinit.patch cpqarrayd.spec import.log Log Message: Initial import cpqarrayd-2.3.no_ida.patch: --- NEW FILE cpqarrayd-2.3.no_ida.patch --- diff -up cpqarrayd-2.3/status.c.no_ida cpqarrayd-2.3/status.c --- cpqarrayd-2.3/status.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/status.c 2008-07-18 11:43:59.000000000 +0300 @@ -33,9 +33,13 @@ #endif #include + +#ifdef HAVE_IDA #include #include #include +#endif + #include #include "cpqarrayd.h" @@ -45,7 +49,8 @@ #include "cciss_structs.h" #include "cciss_functions.h" -int status_check (struct opts opts) +#ifdef HAVE_IDA +int status_check (struct opts opts) { int devicefd; @@ -183,6 +188,7 @@ int status_check (struct opts opts) return 1; } +#endif int cciss_status_check (struct opts opts) { @@ -190,7 +196,6 @@ int cciss_status_check (struct opts opts int devicefd; int ctrl_cntr, result; int logd_cntr; - ida_ioctl_t io, io2; int status, nr_blks, blks_tr, trap_stat; float pvalue; char statusmsg[1024]; diff -up cpqarrayd-2.3/discover.c.no_ida cpqarrayd-2.3/discover.c --- cpqarrayd-2.3/discover.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/discover.c 2008-07-18 11:49:23.000000000 +0300 @@ -33,12 +33,14 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #include #include #include #endif +#endif #if defined(__freebsd__) #include @@ -52,8 +54,12 @@ int discover_controllers (struct opts); + +#ifdef WITH_IDA int interrogate_controller (struct opts, const char *); int interrogate_logical(struct opts, int, int); +#endif + void boardid2str (unsigned long , char *); /* Added devfs devices @@ -84,6 +90,7 @@ discover_controllers (struct opts opts) int cntr; int foundone = 0; +#ifdef WITH_IDA for (cntr = 0; cntr < 8; cntr++) { /* does this device exist ? */ @@ -104,6 +111,8 @@ discover_controllers (struct opts opts) perror ("DEBUG: reason"); } } +#endif + for (cntr = 0; cntr < 16; cntr++) { /* does this device exist ? */ @@ -127,6 +136,7 @@ discover_controllers (struct opts opts) return foundone; } +#ifdef WITH_IDA int interrogate_controller (struct opts opts, const char *devicefile) { @@ -227,6 +237,7 @@ interrogate_logical (struct opts opts, i return 1; } +#endif void boardid2str (unsigned long board_id, char *name) diff -up cpqarrayd-2.3/configure.ac.no_ida cpqarrayd-2.3/configure.ac --- cpqarrayd-2.3/configure.ac.no_ida 2005-12-16 13:17:44.000000000 +0200 +++ cpqarrayd-2.3/configure.ac 2008-07-18 11:41:27.000000000 +0300 @@ -16,35 +16,35 @@ AC_PROG_MAKE_SET AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h]) -dnl Check for pathed kernel sources with ida_ioctl.h -AC_MSG_CHECKING(for kernel sources) -found_kernel_dir="" -for kernel_dir in /usr/src/linux /usr/src/linux-2.4 -do - if test -d $kernel_dir ; then - CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - found_kernel_dir="$kernel_dir" - fi -done - -if test "$found_kernel_dir" != "" ; then - AC_MSG_RESULT(found $found_kernel_dir ) -else - AC_MSG_ERROR(Kernel sources not found) -fi +dnl dnl Check for pathed kernel sources with ida_ioctl.h +dnl AC_MSG_CHECKING(for kernel sources) +dnl found_kernel_dir="" +dnl for kernel_dir in /usr/src/linux /usr/src/linux-2.4 +dnl do +dnl if test -d $kernel_dir ; then +dnl CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl found_kernel_dir="$kernel_dir" +dnl fi +dnl done + +dnl if test "$found_kernel_dir" != "" ; then +dnl AC_MSG_RESULT(found $found_kernel_dir ) +dnl else +dnl AC_MSG_ERROR(Kernel sources not found) +dnl fi dnl Check for compile.h (2.6.x kernels only? AC_CHECK_HEADERS(linux/compiler.h) -dnl Check Headers -AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, - AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) - -dnl Check version of SmartArray driver -AC_MSG_CHECKING(SmartArray driver version) -AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), - AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) +dnl dnl Check Headers +dnl AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, +dnl AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) + +dnl dnl Check version of SmartArray driver +dnl AC_MSG_CHECKING(SmartArray driver version) +dnl AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), +dnl AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) dnl Check for CCISS header file AC_CHECK_HEADERS(linux/cciss_ioctl.h,, --- cpqarrayd-2.3/cpqarrayd.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/cpqarrayd.c 2008-07-18 13:02:17.000000000 +0300 @@ -35,9 +35,11 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #endif +#endif #if defined(__freebsd__) #include @@ -249,7 +251,10 @@ syslog(LOG_INFO, "Logging Enabled..."); while (keeprunning) { + +#ifdef WITH_IDA status_check(opts); +#endif cciss_status_check(opts); if (keeprunning) { sleep(30); } } cpqarrayd-2.3.sysVinit.patch: --- NEW FILE cpqarrayd-2.3.sysVinit.patch --- diff -up cpqarrayd-2.3/scripts/cpqarrayd.orig cpqarrayd-2.3/scripts/cpqarrayd --- cpqarrayd-2.3/scripts/cpqarrayd.orig 2008-07-09 17:55:59.000000000 +0300 +++ cpqarrayd-2.3/scripts/cpqarrayd 2008-07-14 16:43:49.000000000 +0300 @@ -2,7 +2,7 @@ # # cpqarrayd Start/Stop Compaq Array monitor # -# chkconfig: 345 15 90 +# chkconfig: - 51 90 # description: The cpqarrayd monitors the status of Compaq Raid Arrays, \ # and reports via syslog or traps # processname: cpqarrayd @@ -23,8 +23,9 @@ RETVAL=0 case "$1" in start) echo -n "Starting cpqarrayd: " - daemon /usr/sbin/cpqarrayd $CPQ_PARAMS - RETVAL=$? +# daemon /usr/sbin/cpqarrayd $CPQ_PARAMS |grep -v ^DEBUG: + { daemon /usr/sbin/cpqarrayd $CPQ_PARAMS + RETVAL=$?; } |grep -v ^DEBUG: echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cpqarrayd ;; @@ -39,13 +40,22 @@ case "$1" in status cpqarrayd RETVAL=$? ;; - restart|reload) + restart|force-reload) $0 stop $0 start RETVAL=$? ;; - *) - echo "Usage: cpqarrayd {start|stop|status|restart|reload}" + reload) + exit 3 + ;; + condrestart|try-restart) + if status cpqarrayd > /dev/null; then + $0 stop + $0 start + fi + ;; + *) + echo "Usage: cpqarrayd {start|stop|status|restart|force-reolad|reload|cond-restart|try-restart}" exit 1 esac --- NEW FILE cpqarrayd.spec --- Name: cpqarrayd Version: 2.3 Release: 5%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ URL: http://www.strocamp.net/opensource/cpqarrayd.php Source0: http://www.strocamp.net/opensource/compaq/downloads/cpqarrayd-2.3.tar.gz Patch0: cpqarrayd-2.3.no_ida.patch Patch1: cpqarrayd-2.3.sysVinit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake BuildRequires: net-snmp-devel Requires(post): chkconfig Requires(postun): initscripts Requires(preun): chkconfig Requires(preun): initscripts %description Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers. It reports any status changes, like failing disks, to the syslog and optionally to a remote host using SNMP traps. Note that support for the old(?) IDA Arrays have been disabled in this package due to build issues and lack of testing hardware. %prep %setup -q %patch0 -p1 -b .no_ida %patch1 -p1 -b .sysVinit %build autoreconf -si %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/cpqarrayd $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig cp scripts/cpqarrayd.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cpqarrayd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add cpqarrayd %preun if [ $1 = 0 ] ; then /sbin/service cpqarrayd stop >/dev/null 2>&1 /sbin/chkconfig --del cpqarrayd fi %postun if [ "$1" -ge "1" ] ; then /sbin/service cpqarrayd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog DEVEL NEWS README %_sbindir/cpqarrayd %config(noreplace) %_sysconfdir/sysconfig/cpqarrayd %_initrddir/cpqarrayd %doc %_mandir/man1/cpqarrayd* %changelog * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness * Fri Jul 18 2008 David Juran - 2.3-4 - Cleanup no-ida patch * Thu Jul 17 2008 - 2.3-3 - fix rpmlint warnings * Mon Jul 14 2008 - 2.3-2 - Make SysVinit script compliant with Fedora Packaging Guidelines * Wed Jul 9 2008 - 2.3-1 - Initial packaging --- NEW FILE import.log --- cpqarrayd-2_3-5_fc10:F-9:cpqarrayd-2.3-5.fc10.src.rpm:1216377993 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:33:19 -0000 1.1 +++ .cvsignore 18 Jul 2008 10:48:17 -0000 1.2 @@ -0,0 +1 @@ +cpqarrayd-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:33:19 -0000 1.1 +++ sources 18 Jul 2008 10:48:17 -0000 1.2 @@ -0,0 +1 @@ +55421afe4817863efab45c59a9486a60 cpqarrayd-2.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 11:03:14 2008 From: fedora-extras-commits at redhat.com (Kamil Dudka (kdudka)) Date: Fri, 18 Jul 2008 11:03:14 GMT Subject: rpms/cpio/F-9 cpio-2.9-dev_number.patch, NONE, 1.1 cpio.spec, 1.59, 1.60 Message-ID: <200807181103.m6IB3Ej6006802@cvs-int.fedora.redhat.com> Author: kdudka Update of /cvs/extras/rpms/cpio/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6756 Modified Files: cpio.spec Added Files: cpio-2.9-dev_number.patch Log Message: Support major/minor device numbers over 127 (bz#450109) cpio-2.9-dev_number.patch: --- NEW FILE cpio-2.9-dev_number.patch --- diff -ruN cpio-2.9.90.orig/src/copyin.c cpio-2.9.90/src/copyin.c --- cpio-2.9.90.orig/src/copyin.c 2008-07-11 13:20:27.000000000 +0200 +++ cpio-2.9.90/src/copyin.c 2008-07-18 10:16:24.000000000 +0200 @@ -1269,15 +1269,15 @@ swab_array ((char *) short_hdr, 13); } - file_hdr->c_dev_maj = major (short_hdr->c_dev); - file_hdr->c_dev_min = minor (short_hdr->c_dev); + file_hdr->c_dev_maj = major ((unsigned short)short_hdr->c_dev); + file_hdr->c_dev_min = minor ((unsigned short)short_hdr->c_dev); file_hdr->c_ino = short_hdr->c_ino; file_hdr->c_mode = short_hdr->c_mode; file_hdr->c_uid = short_hdr->c_uid; file_hdr->c_gid = short_hdr->c_gid; file_hdr->c_nlink = short_hdr->c_nlink; - file_hdr->c_rdev_maj = major (short_hdr->c_rdev); - file_hdr->c_rdev_min = minor (short_hdr->c_rdev); + file_hdr->c_rdev_maj = major ((unsigned short)short_hdr->c_rdev); + file_hdr->c_rdev_min = minor ((unsigned short)short_hdr->c_rdev); file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes[0] << 16 | short_hdr->c_mtimes[1]; Index: cpio.spec =================================================================== RCS file: /cvs/extras/rpms/cpio/F-9/cpio.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- cpio.spec 3 Mar 2008 11:22:13 -0000 1.59 +++ cpio.spec 18 Jul 2008 11:02:30 -0000 1.60 @@ -3,7 +3,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.9 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -16,6 +16,7 @@ Patch5: cpio-2.9-safer_name_suffix.patch Patch6: cpio-2.9-gcc43.patch Patch7: cpio-2.9-dir_perm.patch +Patch8: cpio-2.9-dev_number.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info BuildRequires: texinfo, autoconf, gettext @@ -44,6 +45,7 @@ %patch5 -p1 -b .safer_name_suffix %patch6 -p1 -b .gcc43 %patch7 -p1 -b .dir_perm +%patch8 -p1 -b .dev_number autoheader @@ -84,6 +86,9 @@ %{_infodir}/*.info* %changelog +* Fri Jul 18 2008 Kamil Dudka 2.9-8 +- Support major/minor device numbers over 127 (bz#450109) + * Mon Mar 03 2008 Radek Brich 2.9-7 - fix -dir_perm patch to restore permissions correctly even in passthrough mode -- revert affected code to cpio 2.8 state From fedora-extras-commits at redhat.com Fri Jul 18 11:27:51 2008 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Fri, 18 Jul 2008 11:27:51 GMT Subject: rpms/subversion-api-docs/F-9 doxygen.conf, 1.2, 1.3 subversion-api-docs.spec, 1.14, 1.15 Message-ID: <200807181127.m6IBRplr007474@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/subversion-api-docs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7435 Modified Files: doxygen.conf subversion-api-docs.spec Log Message: Bump up to 1.5.0. Index: doxygen.conf =================================================================== RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-9/doxygen.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- doxygen.conf 9 Nov 2006 20:03:56 -0000 1.2 +++ doxygen.conf 18 Jul 2008 11:27:05 -0000 1.3 @@ -1,4 +1,4 @@ -# Doxyfile 1.4.1 +# Doxyfile 1.5.3 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,6 +14,14 @@ # Project related configuration options #--------------------------------------------------------------------------- +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# possible encodings. + +DOXYFILE_ENCODING = UTF-8 + # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. @@ -45,24 +53,14 @@ # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. # The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, -# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, -# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, -# Swedish, and Ukrainian. +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = YES - # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will # include brief member descriptions after the members that are listed in # the file and class documentation (similar to JavaDoc). @@ -135,11 +133,19 @@ # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen # will interpret the first line (until the first dot) of a JavaDoc-style # comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = YES +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen # treat a multi-line C++ special comment block (i.e. a block of //! or /// # comments) as a brief description. This used to be the default behaviour. @@ -161,12 +167,11 @@ INHERIT_DOCS = YES -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. -DISTRIBUTE_GROUP_DOC = NO +SEPARATE_MEMBER_PAGES = NO # The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. @@ -180,7 +185,7 @@ # will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = "copyright=@if copyrights" \ +ALIASES = "copyright=@if copyrights " \ endcopyright=@endif # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C @@ -190,13 +195,34 @@ OPTIMIZE_OUTPUT_FOR_C = YES -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. # For instance, namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + # Set the SUBGROUPING tag to YES (the default) to allow class member groups of # the same type (for instance a group of public functions) to be put as a # subgroup of that type (e.g. under the Public Functions section). Set it to @@ -239,6 +265,13 @@ EXTRACT_LOCAL_METHODS = NO +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous +# namespace. By default anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all # undocumented members of documented classes, files or namespaces. # If set to NO (the default) these members will be included in the @@ -371,7 +404,7 @@ # If the sources in your project are distributed over multiple directories # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. +# in the documentation. The default is NO. SHOW_DIRECTORIES = NO @@ -380,7 +413,7 @@ # version control system). Doxygen will invoke the program by executing (via # popen()) the command , where is the value of # the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the progam writes to standard output +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. FILE_VERSION_FILTER = @@ -428,7 +461,7 @@ # $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) -WARN_FORMAT = "$file:$line: $text" +WARN_FORMAT = "$file:$line: $text " # The WARN_LOGFILE tag can be used to specify a file to which warning # and error messages should be written. If left blank the output is written @@ -445,14 +478,21 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = subversion/include +INPUT = subversion/include subversion/include/private/svn_doxygen.h + +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# See http://www.gnu.org/software/libiconv for the list of possible encodings. + +INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py FILE_PATTERNS = *.h @@ -476,10 +516,19 @@ # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* EXCLUDE_PATTERNS = +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see # the \include command). @@ -504,7 +553,7 @@ # directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = www/images # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program @@ -538,7 +587,9 @@ # If the SOURCE_BROWSER tag is set to YES then a list of source files will # be generated. Documented entities will be cross-referenced with these sources. # Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce +# a warning and turn it on anyway SOURCE_BROWSER = YES @@ -565,6 +616,21 @@ REFERENCES_RELATION = YES +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen # will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. @@ -649,6 +715,14 @@ GENERATE_HTMLHELP = NO +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You # can add a path in front of the file if the result should not be @@ -951,7 +1025,7 @@ # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES # then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. +# PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO @@ -984,11 +1058,9 @@ PREDEFINED = DOXYGEN \ DOXYGEN_SHOULD_SKIP_THIS \ __attribute__(x)= \ - "SVN_ERROR_START=typedef enum svn_errno_t { \ - SVN_WARNING = APR_OS_START_USERERR + 1," \ - "SVN_ERRDEF(num,offset,str)=/** str */ num = offset," \ - "SVN_ERROR_END=SVN_ERR_LAST } svn_errno_t;" - + "SVN_ERROR_START=typedef enum svn_errno_t { SVN_WARNING = APR_OS_START_USERERR + 1, " \ + "SVN_ERRDEF(num,offset,str)=/** str */ num = offset, " \ + "SVN_ERROR_END=SVN_ERR_LAST } svn_errno_t; " # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. @@ -1061,6 +1133,14 @@ CLASS_DIAGRAMS = YES +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# be found in the default search path. + +MSCGEN_PATH = + # If set to YES, the inheritance and collaboration graphs will hide # inheritance and usage relations if the target is undocumented # or is not a class. @@ -1118,7 +1198,7 @@ INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will # generate a call dependency graph for every global function or class method. # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable call graphs for selected @@ -1126,6 +1206,14 @@ CALL_GRAPH = NO +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. + +CALLER_GRAPH = NO + # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. @@ -1155,31 +1243,23 @@ DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. -MAX_DOT_GRAPH_HEIGHT = 1024 +DOT_GRAPH_MAX_NODES = 50 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the # graphs generated by dot. A depth value of 3 means that only nodes reachable # from the root by following a path via at most 3 edges will be shown. Nodes # that lay further from the root node will be omitted. Note that setting this # option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that a graph may be further truncated if the graph's -# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH -# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), -# the graph is not depth-constrained. +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 0 @@ -1217,4 +1297,4 @@ # The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. -SEARCHENGINE = NO +SEARCHENGINE = YES Index: subversion-api-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-9/subversion-api-docs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- subversion-api-docs.spec 13 Feb 2008 23:39:02 -0000 1.14 +++ subversion-api-docs.spec 18 Jul 2008 11:27:05 -0000 1.15 @@ -1,5 +1,5 @@ Name: subversion-api-docs -Version: 1.4.6 +Version: 1.5.0 Release: 1%{?dist} Summary: Subversion API documentation @@ -26,7 +26,7 @@ %build cd %{name}-%{version} -sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/subversion-1', \ +sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/subversion-1,' \ -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \ -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' \ doxygen.conf | doxygen - @@ -50,6 +50,9 @@ %doc %{_docdir}/subversion-%{version}/api-docs/* %changelog +* Tue Jul 8 2008 Bojan Smojver 1.5.0-1 +- bump up to 1.5.0 + * Thu Feb 14 2008 Bojan Smojver 1.4.6-1 - bump up to 1.4.6 From fedora-extras-commits at redhat.com Fri Jul 18 11:29:22 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 18 Jul 2008 11:29:22 GMT Subject: rpms/perl-AnyEvent/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 perl-AnyEvent.spec, 1.1, 1.2 Message-ID: <200807181129.m6IBTMEF007600@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7503 Modified Files: .cvsignore sources perl-AnyEvent.spec Log Message: - Update to 4.21 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Jul 2008 21:48:21 -0000 1.2 +++ .cvsignore 18 Jul 2008 11:28:37 -0000 1.3 @@ -1 +1 @@ -AnyEvent-4.161.tar.gz +AnyEvent-4.21.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Jul 2008 21:48:21 -0000 1.2 +++ sources 18 Jul 2008 11:28:37 -0000 1.3 @@ -1 +1 @@ -f131ab601868a4f30fe3819931ae9093 AnyEvent-4.161.tar.gz +6fe3464f513dd8e45b1d64049d84bfdf AnyEvent-4.21.tar.gz Index: perl-AnyEvent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-AnyEvent.spec 4 Jul 2008 21:48:21 -0000 1.1 +++ perl-AnyEvent.spec 18 Jul 2008 11:28:37 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-AnyEvent -Version: 4.161 +Version: 4.21 Release: 1%{?dist} Summary: Framework for multiple event loops @@ -75,6 +75,9 @@ %changelog +* Fri Jul 18 2008 kwizart < kwizart at gmail.com > - 4.21-1 +- Update to 4.21 + * Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 4.161-1 - Update to 4.161 From fedora-extras-commits at redhat.com Fri Jul 18 11:35:05 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:35:05 GMT Subject: rpms/vim/devel 7.1.310,NONE,1.1 Message-ID: <200807181135.m6IBZ5HC008012@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7983 Added Files: 7.1.310 Log Message: - patchlevel 310 --- NEW FILE 7.1.310 --- To: vim-dev at vim.org Subject: Patch 7.1.310 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.310 Problem: Incomplete utf-8 byte sequence at end of the file is not detected. Accessing memory that wasn't written. Solution: Check the last bytes in the buffer for being a valid utf-8 character. (mostly by Ben Schmidt) Also fix that the reported line number of the error was wrong. Files: src/fileio.c *** ../vim-7.1.309/src/fileio.c Wed May 7 19:05:55 2008 --- src/fileio.c Wed Jun 4 18:28:48 2008 *************** *** 1288,1299 **** #ifdef FEAT_MBYTE else if (conv_restlen > 0) { ! /* Reached end-of-file but some trailing bytes could ! * not be converted. Truncated file? */ ! if (conv_error == 0) ! conv_error = linecnt; ! if (bad_char_behavior != BAD_DROP) { fio_flags = 0; /* don't convert this */ # ifdef USE_ICONV if (iconv_fd != (iconv_t)-1) --- 1288,1336 ---- #ifdef FEAT_MBYTE else if (conv_restlen > 0) { ! /* ! * Reached end-of-file but some trailing bytes could ! * not be converted. Truncated file? ! */ ! ! /* When we did a conversion report an error. */ ! if (fio_flags != 0 ! # ifdef USE_ICONV ! || iconv_fd != (iconv_t)-1 ! # endif ! ) { + if (conv_error == 0) + conv_error = curbuf->b_ml.ml_line_count + - linecnt + 1; + } + /* Remember the first linenr with an illegal byte */ + else if (illegal_byte == 0) + illegal_byte = curbuf->b_ml.ml_line_count + - linecnt + 1; + if (bad_char_behavior == BAD_DROP) + { + *(ptr - conv_restlen) = NUL; + conv_restlen = 0; + } + else + { + /* Replace the trailing bytes with the replacement + * character if we were converting; if we weren't, + * leave the UTF8 checking code to do it, as it + * works slightly differently. */ + if (bad_char_behavior != BAD_KEEP && (fio_flags != 0 + # ifdef USE_ICONV + || iconv_fd != (iconv_t)-1 + # endif + )) + { + while (conv_restlen > 0) + { + *(--ptr) = bad_char_behavior; + --conv_restlen; + } + } fio_flags = 0; /* don't convert this */ # ifdef USE_ICONV if (iconv_fd != (iconv_t)-1) *************** *** 1302,1321 **** iconv_fd = (iconv_t)-1; } # endif - if (bad_char_behavior == BAD_KEEP) - { - /* Keep the trailing bytes as-is. */ - size = conv_restlen; - ptr -= conv_restlen; - } - else - { - /* Replace the trailing bytes with the - * replacement character. */ - size = 1; - *--ptr = bad_char_behavior; - } - conv_restlen = 0; } } #endif --- 1339,1344 ---- *************** *** 1397,1402 **** --- 1420,1430 ---- goto retry; } } + + /* Include not converted bytes. */ + ptr -= conv_restlen; + size += conv_restlen; + conv_restlen = 0; #endif /* * Break here for a read error or end-of-file. *************** *** 1406,1416 **** #ifdef FEAT_MBYTE - /* Include not converted bytes. */ - ptr -= conv_restlen; - size += conv_restlen; - conv_restlen = 0; - # ifdef USE_ICONV if (iconv_fd != (iconv_t)-1) { --- 1434,1439 ---- *************** *** 1872,1883 **** size = (long)((ptr + real_size) - dest); ptr = dest; } ! else if (enc_utf8 && conv_error == 0 && !curbuf->b_p_bin) { ! /* Reading UTF-8: Check if the bytes are valid UTF-8. ! * Need to start before "ptr" when part of the character was ! * read in the previous read() call. */ ! for (p = ptr - utf_head_off(buffer, ptr); ; ++p) { int todo = (int)((ptr + size) - p); int l; --- 1895,1906 ---- size = (long)((ptr + real_size) - dest); ptr = dest; } ! else if (enc_utf8 && !curbuf->b_p_bin) { ! int incomplete_tail = FALSE; ! ! /* Reading UTF-8: Check if the bytes are valid UTF-8. */ ! for (p = ptr; ; ++p) { int todo = (int)((ptr + size) - p); int l; *************** *** 1891,1933 **** * read() will get the next bytes, we'll check it * then. */ l = utf_ptr2len_len(p, todo); ! if (l > todo) { ! /* Incomplete byte sequence, the next read() ! * should get them and check the bytes. */ ! p += todo; ! break; } ! if (l == 1) { /* Illegal byte. If we can try another encoding ! * do that. */ ! if (can_retry) break; - - /* Remember the first linenr with an illegal byte */ - if (illegal_byte == 0) - illegal_byte = readfile_linenr(linecnt, ptr, p); # ifdef USE_ICONV /* When we did a conversion report an error. */ if (iconv_fd != (iconv_t)-1 && conv_error == 0) conv_error = readfile_linenr(linecnt, ptr, p); # endif /* Drop, keep or replace the bad byte. */ if (bad_char_behavior == BAD_DROP) { ! mch_memmove(p, p+1, todo - 1); --p; --size; } else if (bad_char_behavior != BAD_KEEP) *p = bad_char_behavior; } ! p += l - 1; } } ! if (p < ptr + size) { /* Detected a UTF-8 error. */ rewind_retry: --- 1914,1969 ---- * read() will get the next bytes, we'll check it * then. */ l = utf_ptr2len_len(p, todo); ! if (l > todo && !incomplete_tail) { ! /* Avoid retrying with a different encoding when ! * a truncated file is more likely, or attempting ! * to read the rest of an incomplete sequence when ! * we have already done so. */ ! if (p > ptr || filesize > 0) ! incomplete_tail = TRUE; ! /* Incomplete byte sequence, move it to conv_rest[] ! * and try to read the rest of it, unless we've ! * already done so. */ ! if (p > ptr) ! { ! conv_restlen = todo; ! mch_memmove(conv_rest, p, conv_restlen); ! size -= conv_restlen; ! break; ! } } ! if (l == 1 || l > todo) { /* Illegal byte. If we can try another encoding ! * do that, unless at EOF where a truncated ! * file is more likely than a conversion error. */ ! if (can_retry && !incomplete_tail) break; # ifdef USE_ICONV /* When we did a conversion report an error. */ if (iconv_fd != (iconv_t)-1 && conv_error == 0) conv_error = readfile_linenr(linecnt, ptr, p); # endif + /* Remember the first linenr with an illegal byte */ + if (conv_error == 0 && illegal_byte == 0) + illegal_byte = readfile_linenr(linecnt, ptr, p); /* Drop, keep or replace the bad byte. */ if (bad_char_behavior == BAD_DROP) { ! mch_memmove(p, p + 1, todo - 1); --p; --size; } else if (bad_char_behavior != BAD_KEEP) *p = bad_char_behavior; } ! else ! p += l - 1; } } ! if (p < ptr + size && !incomplete_tail) { /* Detected a UTF-8 error. */ rewind_retry: *** ../vim-7.1.309/src/version.c Wed Jun 4 15:27:43 2008 --- src/version.c Wed Jun 4 19:35:16 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 310, /**/ -- Normal people believe that if it ain't broke, don't fix it. Engineers believe that if it ain't broke, it doesn't have enough features yet. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:35:29 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:35:29 GMT Subject: rpms/vim/devel 7.1.311,NONE,1.1 Message-ID: <200807181135.m6IBZTIr008050@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8031 Added Files: 7.1.311 Log Message: - patchlevel 311 --- NEW FILE 7.1.311 --- To: vim-dev at vim.org Subject: Patch 7.1.311 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.311 Problem: Compiler warning for missing sentinel in X code. Solution: Change 0 to NULL. (Markus Heidelberg) Files: src/mbyte.c *** ../vim-7.1.310/src/mbyte.c Wed Jun 4 10:59:18 2008 --- src/mbyte.c Wed Jun 4 18:34:43 2008 *************** *** 5520,5532 **** preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc; preedit_done_cb.callback = (XIMProc)preedit_done_cbproc; preedit_attr ! = XVaCreateNestedList (0, XNPreeditStartCallback, &preedit_start_cb, XNPreeditDrawCallback, &preedit_draw_cb, XNPreeditCaretCallback, &preedit_caret_cb, XNPreeditDoneCallback, &preedit_done_cb, ! 0); ! XSetICValues (xxic, XNPreeditAttributes, preedit_attr, 0); XFree(preedit_attr); } --- 5520,5532 ---- preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc; preedit_done_cb.callback = (XIMProc)preedit_done_cbproc; preedit_attr ! = XVaCreateNestedList(0, XNPreeditStartCallback, &preedit_start_cb, XNPreeditDrawCallback, &preedit_draw_cb, XNPreeditCaretCallback, &preedit_caret_cb, XNPreeditDoneCallback, &preedit_done_cb, ! NULL); ! XSetICValues(xxic, XNPreeditAttributes, preedit_attr, NULL); XFree(preedit_attr); } *************** *** 5536,5542 **** { #ifdef USE_X11R6_XIM /* don't change the input context when we call reset */ ! XSetICValues(((GdkICPrivate*)ic)->xic, XNResetState, XIMPreserveState, 0); #endif } --- 5536,5543 ---- { #ifdef USE_X11R6_XIM /* don't change the input context when we call reset */ ! XSetICValues(((GdkICPrivate *)ic)->xic, XNResetState, XIMPreserveState, ! NULL); #endif } *** ../vim-7.1.310/src/version.c Wed Jun 4 19:36:56 2008 --- src/version.c Wed Jun 4 21:34:00 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 311, /**/ -- A radioactive cat has eighteen half-lives. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:35:50 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:35:50 GMT Subject: rpms/vim/devel 7.1.312,NONE,1.1 Message-ID: <200807181135.m6IBZo2l008089@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8066 Added Files: 7.1.312 Log Message: - patchlevel 312 --- NEW FILE 7.1.312 --- To: vim-dev at vim.org Subject: Patch 7.1.312 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.312 Problem: The .po files have mistakes in error numbers. Solution: Search for these mistakes in the check script. (Dominique Pelle) Files: src/po/check.vim *** ../vim-7.1.311/src/po/check.vim Wed Nov 23 22:10:37 2005 --- src/po/check.vim Sun May 25 13:47:59 2008 *************** *** 1,7 **** " Vim script for checking .po files. " ! " Go through the file and verify that all %...s items in "msgid" are identical ! " to the ones in "msgstr". if 1 " Only execute this if the eval feature is available. --- 1,8 ---- " Vim script for checking .po files. " ! " Go through the file and verify that: ! " - All %...s items in "msgid" are identical to the ones in "msgstr". ! " - An error or warning code in "msgid" matches the one in "msgstr". if 1 " Only execute this if the eval feature is available. *************** *** 56,61 **** --- 57,76 ---- endif endwhile + " Check that error code in msgid matches the one in msgstr. + " + " Examples of mismatches found with msgid "E123: ..." + " - msgstr "E321: ..." error code mismatch + " - msgstr "W123: ..." warning instead of error + " - msgstr "E123 ..." missing colon + " - msgstr "..." missing error code + " + 1 + if search('msgid "\("\n"\)\?\([EW][0-9]\+:\).*\nmsgstr "\("\n"\)\?[^"]\@=\2\@!') > 0 + echo 'Mismatching error/warning code in line ' . line('.') + let error = 1 + endif + if error == 0 echo "OK" endif *** ../vim-7.1.311/src/version.c Wed Jun 4 21:34:51 2008 --- src/version.c Mon Jun 9 14:43:59 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 312, /**/ -- hundred-and-one symptoms of being an internet addict: 24. You realize there is not a sound in the house and you have no idea where your children are. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:36:10 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:36:10 GMT Subject: rpms/vim/devel 7.1.313,NONE,1.1 Message-ID: <200807181136.m6IBaAK6008157@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109 Added Files: 7.1.313 Log Message: - patchlevel 313 --- NEW FILE 7.1.313 --- To: vim-dev at vim.org Subject: Patch 7.1.313 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.313 Problem: When the netbeans interface setModified call is used the status lines and window title are not updated. Solution: Redraw the status lines and title. (Philippe Fremy) Files: src/netbeans.c *** ../vim-7.1.312/src/netbeans.c Sun Mar 16 16:02:47 2008 --- src/netbeans.c Wed May 28 15:12:13 2008 *************** *** 16,21 **** --- 16,25 ---- * See ":help netbeans-protocol" for explanation. */ + #if defined(MSDOS) || defined(MSWIN) + # include "vimio.h" /* for mch_open(), must be before vim.h */ + #endif + #include "vim.h" #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) *************** *** 1974,1986 **** } else if (streq((char *)cmd, "setModified")) { if (buf == NULL || buf->bufp == NULL) { /* EMSG("E646: null bufp in setModified"); */ return FAIL; } if (streq((char *)args, "T")) ! buf->bufp->b_changed = 1; else { struct stat st; --- 1978,1993 ---- } else if (streq((char *)cmd, "setModified")) { + int prev_b_changed; + if (buf == NULL || buf->bufp == NULL) { /* EMSG("E646: null bufp in setModified"); */ return FAIL; } + prev_b_changed = buf->bufp->b_changed; if (streq((char *)args, "T")) ! buf->bufp->b_changed = TRUE; else { struct stat st; *************** *** 1990,1998 **** if (buf->bufp->b_ffname != NULL && mch_stat((char *)buf->bufp->b_ffname, &st) >= 0) buf_store_time(buf->bufp, &st, buf->bufp->b_ffname); ! buf->bufp->b_changed = 0; } buf->modified = buf->bufp->b_changed; /* =====================================================================*/ } else if (streq((char *)cmd, "setModtime")) --- 1997,2016 ---- if (buf->bufp->b_ffname != NULL && mch_stat((char *)buf->bufp->b_ffname, &st) >= 0) buf_store_time(buf->bufp, &st, buf->bufp->b_ffname); ! buf->bufp->b_changed = FALSE; } buf->modified = buf->bufp->b_changed; + if (prev_b_changed != buf->bufp->b_changed) + { + #ifdef FEAT_WINDOWS + check_status(buf->bufp); + redraw_tabline = TRUE; + #endif + #ifdef FEAT_TITLE + maketitle(); + #endif + update_screen(0); + } /* =====================================================================*/ } else if (streq((char *)cmd, "setModtime")) *** ../vim-7.1.312/src/version.c Mon Jun 9 14:45:17 2008 --- src/version.c Mon Jun 9 15:08:40 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 313, /**/ -- Q: What is the difference betwee open-source and commercial software? A: If you have a problem with commercial software you can call a phone number and they will tell you it might be solved in a future version. For open-source software there isn't a phone number to call, but you get the solution within a day. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:36:30 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:36:30 GMT Subject: rpms/vim/devel 7.1.314,NONE,1.1 Message-ID: <200807181136.m6IBaU1Q008189@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8173 Added Files: 7.1.314 Log Message: - patchlevel 314 --- NEW FILE 7.1.314 --- To: vim-dev at vim.org Subject: Patch 7.1.314 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.314 Problem: The value of 'pastetoggle' is written to the session file without any escaping. (Randall Hansen) Solution: Use put_escstr(). (Ben Schmidt) Files: src/option.c *** ../vim-7.1.313/src/option.c Wed Mar 12 17:37:53 2008 --- src/option.c Wed Jun 4 19:32:02 2008 *************** *** 243,249 **** /* WV_ and BV_ values get typecasted to this for the "indir" field */ typedef enum { ! PV_NONE = 0 } idopt_T; /* --- 243,250 ---- /* WV_ and BV_ values get typecasted to this for the "indir" field */ typedef enum { ! PV_NONE = 0, ! PV_MAXVAL = 0xffff /* to avoid warnings for value out of range */ } idopt_T; /* *************** *** 8713,8719 **** { s = *valuep; while (*s != NUL) ! if (fputs((char *)str2special(&s, FALSE), fd) < 0) return FAIL; } else if (expand) --- 8714,8720 ---- { s = *valuep; while (*s != NUL) ! if (put_escstr(fd, str2special(&s, FALSE), 2) == FAIL) return FAIL; } else if (expand) *** ../vim-7.1.313/src/version.c Mon Jun 9 15:10:07 2008 --- src/version.c Mon Jun 9 17:05:40 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 314, /**/ -- hundred-and-one symptoms of being an internet addict: 26. You check your mail. It says "no new messages." So you check it again. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:36:51 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:36:51 GMT Subject: rpms/vim/devel 7.1.315,NONE,1.1 Message-ID: <200807181136.m6IBapIt008230@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8209 Added Files: 7.1.315 Log Message: - patchlevel 315 --- NEW FILE 7.1.315 --- To: vim-dev at vim.org Subject: Patch 7.1.315 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.315 Problem: Crash with specific search pattern using look-behind match. (Andreas Politz) Solution: Also save the value of "need_clear_subexpr". Files: src/regexp.c *** ../vim-7.1.314/src/regexp.c Wed Apr 9 12:14:44 2008 --- src/regexp.c Sun Jun 15 14:16:40 2008 *************** *** 3044,3049 **** --- 3044,3050 ---- { regsave_T save_after; regsave_T save_behind; + int save_need_clear_subexpr; save_se_T save_start[NSUBEXP]; save_se_T save_end[NSUBEXP]; } regbehind_T; *************** *** 5858,5874 **** { int i; ! for (i = 0; i < NSUBEXP; ++i) { ! if (REG_MULTI) ! { ! bp->save_start[i].se_u.pos = reg_startpos[i]; ! bp->save_end[i].se_u.pos = reg_endpos[i]; ! } ! else { ! bp->save_start[i].se_u.ptr = reg_startp[i]; ! bp->save_end[i].se_u.ptr = reg_endp[i]; } } } --- 5859,5881 ---- { int i; ! /* When "need_clear_subexpr" is set we don't need to save the values, only ! * remember that this flag needs to be set again when restoring. */ ! bp->save_need_clear_subexpr = need_clear_subexpr; ! if (!need_clear_subexpr) { ! for (i = 0; i < NSUBEXP; ++i) { ! if (REG_MULTI) ! { ! bp->save_start[i].se_u.pos = reg_startpos[i]; ! bp->save_end[i].se_u.pos = reg_endpos[i]; ! } ! else ! { ! bp->save_start[i].se_u.ptr = reg_startp[i]; ! bp->save_end[i].se_u.ptr = reg_endp[i]; ! } } } } *************** *** 5882,5898 **** { int i; ! for (i = 0; i < NSUBEXP; ++i) { ! if (REG_MULTI) ! { ! reg_startpos[i] = bp->save_start[i].se_u.pos; ! reg_endpos[i] = bp->save_end[i].se_u.pos; ! } ! else { ! reg_startp[i] = bp->save_start[i].se_u.ptr; ! reg_endp[i] = bp->save_end[i].se_u.ptr; } } } --- 5889,5910 ---- { int i; ! /* Only need to restore saved values when they are not to be cleared. */ ! need_clear_subexpr = bp->save_need_clear_subexpr; ! if (!need_clear_subexpr) { ! for (i = 0; i < NSUBEXP; ++i) { ! if (REG_MULTI) ! { ! reg_startpos[i] = bp->save_start[i].se_u.pos; ! reg_endpos[i] = bp->save_end[i].se_u.pos; ! } ! else ! { ! reg_startp[i] = bp->save_start[i].se_u.ptr; ! reg_endp[i] = bp->save_end[i].se_u.ptr; ! } } } } *** ../vim-7.1.314/src/version.c Mon Jun 9 17:07:13 2008 --- src/version.c Sun Jun 15 14:12:54 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 315, /**/ -- Tips for aliens in New York: Land anywhere. Central Park, anywhere. No one will care or indeed even notice. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:37:14 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:37:14 GMT Subject: rpms/vim/devel 7.1.316,NONE,1.1 Message-ID: <200807181137.m6IBbEdD008261@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8248 Added Files: 7.1.316 Log Message: - patchlevel 316 --- NEW FILE 7.1.316 --- To: vim-dev at vim.org Subject: Patch 7.1.316 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.316 Problem: When 'cscopetag' is set ":tag" gives an error message instead of going to the next tag in the tag stack. Solution: Don't call do_cstag() when there is no argument. (Mark Goldman) Files: src/ex_docmd.c *** ../vim-7.1.315/src/ex_docmd.c Sun Mar 16 16:02:47 2008 --- src/ex_docmd.c Fri Jun 20 10:42:30 2008 *************** *** 9300,9306 **** break; default: /* ":tag" */ #ifdef FEAT_CSCOPE ! if (p_cst) { do_cstag(eap); return; --- 9302,9308 ---- break; default: /* ":tag" */ #ifdef FEAT_CSCOPE ! if (p_cst && *eap->arg != NUL) { do_cstag(eap); return; *** ../vim-7.1.315/src/version.c Sun Jun 15 14:20:28 2008 --- src/version.c Fri Jun 20 11:09:35 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 316, /**/ -- Microsoft is to software what McDonalds is to gourmet cooking /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:37:37 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:37:37 GMT Subject: rpms/vim/devel 7.1.317,NONE,1.1 Message-ID: <200807181137.m6IBbbad008304@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8281 Added Files: 7.1.317 Log Message: - patchlevel 317 --- NEW FILE 7.1.317 --- To: vim-dev at vim.org Subject: Patch 7.1.317 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.317 Problem: Compiler warnings in Motif calls. Solution: Change zero to NULL. (Dominique Pelle) Files: src/gui_motif.c *** ../vim-7.1.316/src/gui_motif.c Tue Jan 22 11:06:06 2008 --- src/gui_motif.c Sat Jun 7 15:06:33 2008 *************** *** 686,693 **** /* Temporarily set value of XmNmappedWhenManaged to stop the dialog from popping up right away */ ! XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, 0); ! XtVaSetValues(shell, XmNmappedWhenManaged, False, 0); XtManageChild(dialog_child); --- 686,693 ---- /* Temporarily set value of XmNmappedWhenManaged to stop the dialog from popping up right away */ ! XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, NULL); ! XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL); XtManageChild(dialog_child); *************** *** 723,729 **** XtMapWidget(shell); /* Restore the value of XmNmappedWhenManaged */ ! XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, 0); } #if defined(FEAT_MENU) || defined(FEAT_SUN_WORKSHOP) \ --- 723,729 ---- XtMapWidget(shell); /* Restore the value of XmNmappedWhenManaged */ ! XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, NULL); } #if defined(FEAT_MENU) || defined(FEAT_SUN_WORKSHOP) \ *************** *** 1993,1999 **** { if (XtClass(w) == xmRowColumnWidgetClass) { ! XtVaGetValues(w, XmNrowColumnType, &rowColType, 0); isMenu = (rowColType != (unsigned char)XmWORK_AREA); } else --- 1993,1999 ---- { if (XtClass(w) == xmRowColumnWidgetClass) { ! XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL); isMenu = (rowColType != (unsigned char)XmWORK_AREA); } else *************** *** 2001,2014 **** if (!isMenu) { XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, ! &numChildren, 0); for (i = 0; i < numChildren; i++) do_mnemonic(children[i], keycode); } } else { ! XtVaGetValues(w, XmNmnemonic, &mnemonic, 0); if (mnemonic != '\0') { mneString[0] = mnemonic; --- 2001,2014 ---- if (!isMenu) { XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, ! &numChildren, NULL); for (i = 0; i < numChildren; i++) do_mnemonic(children[i], keycode); } } else { ! XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL); if (mnemonic != '\0') { mneString[0] = mnemonic; *************** *** 2019,2025 **** if (XtClass(w) == xmLabelWidgetClass || XtClass(w) == xmLabelGadgetClass) { ! XtVaGetValues(w, XmNuserData, &userData, 0); if (userData != NULL && XtIsWidget(userData)) XmProcessTraversal(userData, XmTRAVERSE_CURRENT); } --- 2019,2025 ---- if (XtClass(w) == xmLabelWidgetClass || XtClass(w) == xmLabelGadgetClass) { ! XtVaGetValues(w, XmNuserData, &userData, NULL); if (userData != NULL && XtIsWidget(userData)) XmProcessTraversal(userData, XmTRAVERSE_CURRENT); } *************** *** 2073,2079 **** { if (XtClass(w) == xmRowColumnWidgetClass) { ! XtVaGetValues(w, XmNrowColumnType, &rowColType, 0); isMenu = (rowColType != (unsigned char)XmWORK_AREA); } else --- 2073,2079 ---- { if (XtClass(w) == xmRowColumnWidgetClass) { ! XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL); isMenu = (rowColType != (unsigned char)XmWORK_AREA); } else *************** *** 2081,2094 **** if (!isMenu) { XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, ! &numChildren, 0); for (i = 0; i < numChildren; i++) add_mnemonic_grabs(dialog, children[i]); } } else { ! XtVaGetValues(w, XmNmnemonic, &mnemonic, 0); if (mnemonic != '\0') { mneString[0] = mnemonic; --- 2081,2094 ---- if (!isMenu) { XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, ! &numChildren, NULL); for (i = 0; i < numChildren; i++) add_mnemonic_grabs(dialog, children[i]); } } else { ! XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL); if (mnemonic != '\0') { mneString[0] = mnemonic; *** ../vim-7.1.316/src/version.c Fri Jun 20 11:10:53 2008 --- src/version.c Fri Jun 20 11:38:25 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 317, /**/ -- hundred-and-one symptoms of being an internet addict: 43. You tell the kids they can't use the computer because "Daddy's got work to do" and you don't even have a job. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:38:02 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:38:02 GMT Subject: rpms/vim/devel 7.1.318,NONE,1.1 Message-ID: <200807181138.m6IBc2Lj008339@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8322 Added Files: 7.1.318 Log Message: - patchlevel 318 ***** Error reading new file: [Errno 2] No such file or directory: '7.1.318' From fedora-extras-commits at redhat.com Fri Jul 18 11:38:33 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 11:38:33 GMT Subject: rpms/vim/devel 7.1.319, NONE, 1.1 7.1.320, NONE, 1.1 7.1.321, NONE, 1.1 7.1.322, NONE, 1.1 7.1.323, NONE, 1.1 7.1.324, NONE, 1.1 7.1.325, NONE, 1.1 7.1.326, NONE, 1.1 7.1.327, NONE, 1.1 7.1.328, NONE, 1.1 7.1.329, NONE, 1.1 7.1.330, NONE, 1.1 Message-ID: <200807181138.m6IBcXXK008367@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352 Added Files: 7.1.319 7.1.320 7.1.321 7.1.322 7.1.323 7.1.324 7.1.325 7.1.326 7.1.327 7.1.328 7.1.329 7.1.330 Log Message: - patchlevel 318-330 --- NEW FILE 7.1.319 --- To: vim-dev at vim.org Subject: Patch 7.1.319 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.319 Problem: When a register has an illegal utf-8 sequence, pasting it on the command line causes an illegal memory access. Solution: Use mb_cptr2char_adv(). (Dominique Pelle) Files: src/ex_getln.c *** ../vim-7.1.318/src/ex_getln.c Thu May 29 15:33:13 2008 --- src/ex_getln.c Mon Jun 9 20:10:51 2008 *************** *** 3032,3041 **** ++s; #ifdef FEAT_MBYTE if (has_mbyte) ! { ! c = mb_ptr2char(s); ! s += mb_char2len(c); ! } else #endif c = *s++; --- 3033,3039 ---- ++s; #ifdef FEAT_MBYTE if (has_mbyte) ! c = mb_cptr2char_adv(&s); else #endif c = *s++; *** ../vim-7.1.318/src/version.c Fri Jun 20 11:58:27 2008 --- src/version.c Fri Jun 20 12:53:16 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 319, /**/ -- hundred-and-one symptoms of being an internet addict: 46. Your wife makes a new rule: "The computer cannot come to bed." /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.320 --- To: vim-dev at vim.org Subject: Patch 7.1.320 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.320 (extra) Problem: Win64: Warnings while compiling Python interface. Solution: Use PyInt in more places. Also update version message for the console. (George Reilly) Files: src/if_python.c, src/version.c *** ../vim-7.1.319/src/if_python.c Wed Jun 4 13:33:15 2008 --- src/if_python.c Fri Jun 20 14:45:59 2008 *************** *** 50,60 **** #if !defined(FEAT_PYTHON) && defined(PROTO) /* Use this to be able to generate prototypes without python being used. */ ! # define PyObject int ! # define PyThreadState int ! # define PyTypeObject int ! struct PyMethodDef { int a; }; ! # define PySequenceMethods int #endif #if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000 --- 50,60 ---- #if !defined(FEAT_PYTHON) && defined(PROTO) /* Use this to be able to generate prototypes without python being used. */ ! # define PyObject Py_ssize_t ! # define PyThreadState Py_ssize_t ! # define PyTypeObject Py_ssize_t ! struct PyMethodDef { Py_ssize_t a; }; ! # define PySequenceMethods Py_ssize_t #endif #if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000 *************** *** 64,69 **** --- 64,70 ---- # define PyIntIntArgFunc ssizessizeargfunc # define PyIntObjArgProc ssizeobjargproc # define PyIntIntObjArgProc ssizessizeobjargproc + # define Py_ssize_t_fmt "n" #else # define PyInt int # define PyInquiry inquiry *************** *** 71,76 **** --- 72,78 ---- # define PyIntIntArgFunc intintargfunc # define PyIntObjArgProc intobjargproc # define PyIntIntObjArgProc intintobjargproc + # define Py_ssize_t_fmt "i" #endif /* Parser flags */ *************** *** 85,93 **** #if defined(DYNAMIC_PYTHON) || defined(PROTO) # ifndef DYNAMIC_PYTHON ! # define HINSTANCE int /* for generating prototypes */ # endif /* * Wrapper defines */ --- 87,104 ---- #if defined(DYNAMIC_PYTHON) || defined(PROTO) # ifndef DYNAMIC_PYTHON ! # define HINSTANCE long_u /* for generating prototypes */ # endif + /* This makes if_python.c compile without warnings against Python 2.5 + * on Win32 and Win64. */ + #undef PyRun_SimpleString + #undef PyArg_Parse + #undef PyArg_ParseTuple + #undef Py_BuildValue + #undef Py_InitModule4 + #undef Py_InitModule4_64 + /* * Wrapper defines */ *************** *** 269,275 **** --- 280,290 ---- {"PyType_Type", (PYTHON_PROC*)&dll_PyType_Type}, {"Py_BuildValue", (PYTHON_PROC*)&dll_Py_BuildValue}, {"Py_FindMethod", (PYTHON_PROC*)&dll_Py_FindMethod}, + # if (PY_VERSION_HEX >= 0x02050000) && SIZEOF_SIZE_T != SIZEOF_INT + {"Py_InitModule4_64", (PYTHON_PROC*)&dll_Py_InitModule4}, + # else {"Py_InitModule4", (PYTHON_PROC*)&dll_Py_InitModule4}, + # endif {"Py_Initialize", (PYTHON_PROC*)&dll_Py_Initialize}, {"Py_Finalize", (PYTHON_PROC*)&dll_Py_Finalize}, {"Py_IsInitialized", (PYTHON_PROC*)&dll_Py_IsInitialized}, *************** *** 339,346 **** * TRUE, else FALSE. */ int ! python_enabled(verbose) ! int verbose; { return python_runtime_link_init(DYNAMIC_PYTHON_DLL, verbose) == OK; } --- 354,360 ---- * TRUE, else FALSE. */ int ! python_enabled(int verbose) { return python_runtime_link_init(DYNAMIC_PYTHON_DLL, verbose) == OK; } *************** *** 374,381 **** */ static void DoPythonCommand(exarg_T *, const char *); ! static int RangeStart; ! static int RangeEnd; static void PythonIO_Flush(void); static int PythonIO_Init(void); --- 388,395 ---- */ static void DoPythonCommand(exarg_T *, const char *); ! static PyInt RangeStart; ! static PyInt RangeEnd; static void PythonIO_Flush(void); static int PythonIO_Init(void); *************** *** 384,395 **** /* Utility functions for the vim/python interface * ---------------------------------------------- */ ! static PyObject *GetBufferLine(buf_T *, int); static PyObject *GetBufferLineList(buf_T *, PyInt, PyInt); ! static int SetBufferLine(buf_T *, int, PyObject *, int *); ! static int SetBufferLineList(buf_T *, PyInt, PyInt, PyObject *, int *); ! static int InsertBufferLines(buf_T *, int, PyObject *, int *); static PyObject *LineToString(const char *); static char *StringToLine(PyObject *); --- 398,409 ---- /* Utility functions for the vim/python interface * ---------------------------------------------- */ ! static PyObject *GetBufferLine(buf_T *, PyInt); static PyObject *GetBufferLineList(buf_T *, PyInt, PyInt); ! static int SetBufferLine(buf_T *, PyInt, PyObject *, PyInt *); ! static int SetBufferLineList(buf_T *, PyInt, PyInt, PyObject *, PyInt *); ! static int InsertBufferLines(buf_T *, PyInt, PyObject *, PyInt *); static PyObject *LineToString(const char *); static char *StringToLine(PyObject *); *************** *** 690,696 **** static PyObject *OutputWritelines(PyObject *, PyObject *); typedef void (*writefn)(char_u *); ! static void writer(writefn fn, char_u *str, int n); /* Output object definition */ --- 704,710 ---- static PyObject *OutputWritelines(PyObject *, PyObject *); typedef void (*writefn)(char_u *); ! static void writer(writefn fn, char_u *str, PyInt n); /* Output object definition */ *************** *** 812,818 **** { PyObject *line = PyList_GetItem(list, i); char *str; ! int len; if (!PyArg_Parse(line, "s#", &str, &len)) { PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); --- 826,832 ---- { PyObject *line = PyList_GetItem(list, i); char *str; ! PyInt len; if (!PyArg_Parse(line, "s#", &str, &len)) { PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); *************** *** 836,850 **** */ static char_u *buffer = NULL; ! static int buffer_len = 0; ! static int buffer_size = 0; static writefn old_fn = NULL; static void ! buffer_ensure(int n) { ! int new_size; char_u *new_buffer; if (n < buffer_size) --- 850,864 ---- */ static char_u *buffer = NULL; ! static PyInt buffer_len = 0; ! static PyInt buffer_size = 0; static writefn old_fn = NULL; static void ! buffer_ensure(PyInt n) { ! PyInt new_size; char_u *new_buffer; if (n < buffer_size) *************** *** 884,890 **** } static void ! writer(writefn fn, char_u *str, int n) { char_u *ptr; --- 898,904 ---- } static void ! writer(writefn fn, char_u *str, PyInt n) { char_u *ptr; *************** *** 895,901 **** while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL) { ! int len = ptr - str; buffer_ensure(buffer_len + len + 1); --- 909,915 ---- while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL) { ! PyInt len = ptr - str; buffer_ensure(buffer_len + len + 1); *************** *** 1022,1035 **** { PyObject_HEAD BufferObject *buf; ! int start; ! int end; } RangeObject; #define RangeType_Check(obj) ((obj)->ob_type == &RangeType) ! static PyObject *RangeNew(buf_T *, int, int); static void RangeDestructor(PyObject *); static PyObject *RangeGetattr(PyObject *, char *); --- 1036,1049 ---- { PyObject_HEAD BufferObject *buf; ! PyInt start; ! PyInt end; } RangeObject; #define RangeType_Check(obj) ((obj)->ob_type == &RangeType) ! static PyObject *RangeNew(buf_T *, PyInt, PyInt); static void RangeDestructor(PyObject *); static PyObject *RangeGetattr(PyObject *, char *); *************** *** 1069,1076 **** static struct PyMethodDef VimMethods[] = { /* name, function, calling, documentation */ ! {"command", VimCommand, 1, "" }, ! {"eval", VimEval, 1, "" }, { NULL, NULL, 0, NULL } }; --- 1083,1090 ---- static struct PyMethodDef VimMethods[] = { /* name, function, calling, documentation */ ! {"command", VimCommand, 1, "Execute a Vim ex-mode command" }, ! {"eval", VimEval, 1, "Evaluate an expression using Vim evaluator" }, { NULL, NULL, 0, NULL } }; *************** *** 1110,1116 **** * Function to translate a typval_T into a PyObject; this will recursively * translate lists/dictionaries into their Python equivalents. * ! * The depth parameter is too avoid infinite recursion, set it to 1 when * you call VimToPython. */ static PyObject * --- 1124,1130 ---- * Function to translate a typval_T into a PyObject; this will recursively * translate lists/dictionaries into their Python equivalents. * ! * The depth parameter is to avoid infinite recursion, set it to 1 when * you call VimToPython. */ static PyObject * *************** *** 1130,1136 **** /* Check if we run into a recursive loop. The item must be in lookupDict * then and we can use it again. */ ! sprintf(ptrBuf, "%ld", (long)our_tv); result = PyDict_GetItemString(lookupDict, ptrBuf); if (result != NULL) Py_INCREF(result); --- 1144,1150 ---- /* Check if we run into a recursive loop. The item must be in lookupDict * then and we can use it again. */ ! sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv); result = PyDict_GetItemString(lookupDict, ptrBuf); if (result != NULL) Py_INCREF(result); *************** *** 1184,1190 **** if (our_tv->vval.v_dict != NULL) { hashtab_T *ht = &our_tv->vval.v_dict->dv_hashtab; ! int todo = ht->ht_used; hashitem_T *hi; dictitem_T *di; --- 1198,1204 ---- if (our_tv->vval.v_dict != NULL) { hashtab_T *ht = &our_tv->vval.v_dict->dv_hashtab; ! long_u todo = ht->ht_used; hashitem_T *hi; dictitem_T *di; *************** *** 1273,1279 **** } static PyObject * ! RBItem(BufferObject *self, PyInt n, int start, int end) { if (CheckBuffer(self)) return NULL; --- 1287,1293 ---- } static PyObject * ! RBItem(BufferObject *self, PyInt n, PyInt start, PyInt end) { if (CheckBuffer(self)) return NULL; *************** *** 1288,1294 **** } static PyObject * ! RBSlice(BufferObject *self, PyInt lo, PyInt hi, int start, int end) { PyInt size; --- 1302,1308 ---- } static PyObject * ! RBSlice(BufferObject *self, PyInt lo, PyInt hi, PyInt start, PyInt end) { PyInt size; *************** *** 1312,1320 **** } static PyInt ! RBAssItem(BufferObject *self, PyInt n, PyObject *val, int start, int end, int *new_end) { ! int len_change; if (CheckBuffer(self)) return -1; --- 1326,1334 ---- } static PyInt ! RBAssItem(BufferObject *self, PyInt n, PyObject *val, PyInt start, PyInt end, PyInt *new_end) { ! PyInt len_change; if (CheckBuffer(self)) return -1; *************** *** 1335,1344 **** } static PyInt ! RBAssSlice(BufferObject *self, PyInt lo, PyInt hi, PyObject *val, int start, int end, int *new_end) { ! int size; ! int len_change; /* Self must be a valid buffer */ if (CheckBuffer(self)) --- 1349,1358 ---- } static PyInt ! RBAssSlice(BufferObject *self, PyInt lo, PyInt hi, PyObject *val, PyInt start, PyInt end, PyInt *new_end) { ! PyInt size; ! PyInt len_change; /* Self must be a valid buffer */ if (CheckBuffer(self)) *************** *** 1368,1386 **** } static PyObject * ! RBAppend(BufferObject *self, PyObject *args, int start, int end, int *new_end) { PyObject *lines; ! int len_change; ! int max; ! int n; if (CheckBuffer(self)) return NULL; max = n = end - start + 1; ! if (!PyArg_ParseTuple(args, "O|i", &lines, &n)) return NULL; if (n < 0 || n > max) --- 1382,1400 ---- } static PyObject * ! RBAppend(BufferObject *self, PyObject *args, PyInt start, PyInt end, PyInt *new_end) { PyObject *lines; ! PyInt len_change; ! PyInt max; ! PyInt n; if (CheckBuffer(self)) return NULL; max = n = end - start + 1; ! if (!PyArg_ParseTuple(args, "O|" Py_ssize_t_fmt, &lines, &n)) return NULL; if (n < 0 || n > max) *************** *** 1405,1413 **** static struct PyMethodDef BufferMethods[] = { /* name, function, calling, documentation */ ! {"append", BufferAppend, 1, "" }, ! {"mark", BufferMark, 1, "" }, ! {"range", BufferRange, 1, "" }, { NULL, NULL, 0, NULL } }; --- 1419,1427 ---- static struct PyMethodDef BufferMethods[] = { /* name, function, calling, documentation */ ! {"append", BufferAppend, 1, "Append data to Vim buffer" }, ! {"mark", BufferMark, 1, "Return (row,col) representing position of named mark" }, ! {"range", BufferRange, 1, "Return a range object which represents the part of the given buffer between line numbers s and e" }, { NULL, NULL, 0, NULL } }; *************** *** 1503,1511 **** return NULL; if (strcmp(name, "name") == 0) ! return Py_BuildValue("s",this->buf->b_ffname); else if (strcmp(name, "number") == 0) ! return Py_BuildValue("i",this->buf->b_fnum); else if (strcmp(name,"__members__") == 0) return Py_BuildValue("[ss]", "name", "number"); else --- 1517,1525 ---- return NULL; if (strcmp(name, "name") == 0) ! return Py_BuildValue("s", this->buf->b_ffname); else if (strcmp(name, "number") == 0) ! return Py_BuildValue(Py_ssize_t_fmt, this->buf->b_fnum); else if (strcmp(name,"__members__") == 0) return Py_BuildValue("[ss]", "name", "number"); else *************** *** 1520,1533 **** if (this->buf == INVALID_BUFFER_VALUE) { ! vim_snprintf(repr, 100, _(""), ! (long)(self)); return PyString_FromString(repr); } else { char *name = (char *)this->buf->b_fname; ! int len; if (name == NULL) name = ""; --- 1534,1546 ---- if (this->buf == INVALID_BUFFER_VALUE) { ! vim_snprintf(repr, 100, _(""), (self)); return PyString_FromString(repr); } else { char *name = (char *)this->buf->b_fname; ! PyInt len; if (name == NULL) name = ""; *************** *** 1572,1578 **** BufferAssItem(PyObject *self, PyInt n, PyObject *val) { return RBAssItem((BufferObject *)(self), n, val, 1, ! (int)((BufferObject *)(self))->buf->b_ml.ml_line_count, NULL); } --- 1585,1591 ---- BufferAssItem(PyObject *self, PyInt n, PyObject *val) { return RBAssItem((BufferObject *)(self), n, val, 1, ! (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, NULL); } *************** *** 1580,1586 **** BufferAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val) { return RBAssSlice((BufferObject *)(self), lo, hi, val, 1, ! (int)((BufferObject *)(self))->buf->b_ml.ml_line_count, NULL); } --- 1593,1599 ---- BufferAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val) { return RBAssSlice((BufferObject *)(self), lo, hi, val, 1, ! (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, NULL); } *************** *** 1588,1594 **** BufferAppend(PyObject *self, PyObject *args) { return RBAppend((BufferObject *)(self), args, 1, ! (int)((BufferObject *)(self))->buf->b_ml.ml_line_count, NULL); } --- 1601,1607 ---- BufferAppend(PyObject *self, PyObject *args) { return RBAppend((BufferObject *)(self), args, 1, ! (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, NULL); } *************** *** 1633,1645 **** static PyObject * BufferRange(PyObject *self, PyObject *args) { ! int start; ! int end; if (CheckBuffer((BufferObject *)(self))) return NULL; ! if (!PyArg_ParseTuple(args, "ii", &start, &end)) return NULL; return RangeNew(((BufferObject *)(self))->buf, start, end); --- 1646,1658 ---- static PyObject * BufferRange(PyObject *self, PyObject *args) { ! PyInt start; ! PyInt end; if (CheckBuffer((BufferObject *)(self))) return NULL; ! if (!PyArg_ParseTuple(args, Py_ssize_t_fmt Py_ssize_t_fmt, &start, &end)) return NULL; return RangeNew(((BufferObject *)(self))->buf, start, end); *************** *** 1650,1656 **** static struct PyMethodDef RangeMethods[] = { /* name, function, calling, documentation */ ! {"append", RangeAppend, 1, "" }, { NULL, NULL, 0, NULL } }; --- 1663,1669 ---- static struct PyMethodDef RangeMethods[] = { /* name, function, calling, documentation */ ! {"append", RangeAppend, 1, "Append data to the Vim range" }, { NULL, NULL, 0, NULL } }; *************** *** 1691,1697 **** */ static PyObject * ! RangeNew(buf_T *buf, int start, int end) { BufferObject *bufr; RangeObject *self; --- 1704,1710 ---- */ static PyObject * ! RangeNew(buf_T *buf, PyInt start, PyInt end) { BufferObject *bufr; RangeObject *self; *************** *** 1725,1733 **** RangeGetattr(PyObject *self, char *name) { if (strcmp(name, "start") == 0) ! return Py_BuildValue("i",((RangeObject *)(self))->start - 1); else if (strcmp(name, "end") == 0) ! return Py_BuildValue("i",((RangeObject *)(self))->end - 1); else return Py_FindMethod(RangeMethods, self, name); } --- 1738,1746 ---- RangeGetattr(PyObject *self, char *name) { if (strcmp(name, "start") == 0) ! return Py_BuildValue(Py_ssize_t_fmt, ((RangeObject *)(self))->start - 1); else if (strcmp(name, "end") == 0) ! return Py_BuildValue(Py_ssize_t_fmt, ((RangeObject *)(self))->end - 1); else return Py_FindMethod(RangeMethods, self, name); } *************** *** 1740,1747 **** if (this->buf->buf == INVALID_BUFFER_VALUE) { ! vim_snprintf(repr, 100, "", ! (long)(self)); return PyString_FromString(repr); } else --- 1753,1760 ---- if (this->buf->buf == INVALID_BUFFER_VALUE) { ! vim_snprintf(repr, 100, "", ! (self)); return PyString_FromString(repr); } else *************** *** 1869,1875 **** BufListLength(PyObject *self) { buf_T *b = firstbuf; ! int n = 0; while (b) { --- 1882,1888 ---- BufListLength(PyObject *self) { buf_T *b = firstbuf; ! PyInt n = 0; while (b) { *************** *** 2115,2122 **** if (this->win == INVALID_WINDOW_VALUE) { ! vim_snprintf(repr, 100, _(""), ! (long)(self)); return PyString_FromString(repr); } else --- 2128,2134 ---- if (this->win == INVALID_WINDOW_VALUE) { ! vim_snprintf(repr, 100, _(""), (self)); return PyString_FromString(repr); } else *************** *** 2128,2135 **** ++i; if (w == NULL) ! vim_snprintf(repr, 100, _(""), ! (long)(self)); else vim_snprintf(repr, 100, _(""), i); --- 2140,2147 ---- ++i; if (w == NULL) ! vim_snprintf(repr, 100, _(""), ! (self)); else vim_snprintf(repr, 100, _(""), i); *************** *** 2186,2192 **** WinListLength(PyObject *self) { win_T *w = firstwin; ! int n = 0; while (w != NULL) { --- 2198,2204 ---- WinListLength(PyObject *self) { win_T *w = firstwin; ! PyInt n = 0; while (w != NULL) { *************** *** 2254,2260 **** else if (strcmp(name, "window") == 0) return (PyObject *)WindowNew(curwin); else if (strcmp(name, "line") == 0) ! return GetBufferLine(curbuf, (int)curwin->w_cursor.lnum); else if (strcmp(name, "range") == 0) return RangeNew(curbuf, RangeStart, RangeEnd); else if (strcmp(name,"__members__") == 0) --- 2266,2272 ---- else if (strcmp(name, "window") == 0) return (PyObject *)WindowNew(curwin); else if (strcmp(name, "line") == 0) ! return GetBufferLine(curbuf, (PyInt)curwin->w_cursor.lnum); else if (strcmp(name, "range") == 0) return RangeNew(curbuf, RangeStart, RangeEnd); else if (strcmp(name,"__members__") == 0) *************** *** 2272,2278 **** { if (strcmp(name, "line") == 0) { ! if (SetBufferLine(curbuf, (int)curwin->w_cursor.lnum, value, NULL) == FAIL) return -1; return 0; --- 2284,2290 ---- { if (strcmp(name, "line") == 0) { ! if (SetBufferLine(curbuf, (PyInt)curwin->w_cursor.lnum, value, NULL) == FAIL) return -1; return 0; *************** *** 2344,2350 **** /* Set sys.argv[] to avoid a crash in warn(). */ PySys_SetArgv(1, argv); ! mod = Py_InitModule("vim", VimMethods); dict = PyModule_GetDict(mod); VimError = Py_BuildValue("s", "vim.error"); --- 2356,2362 ---- /* Set sys.argv[] to avoid a crash in warn(). */ PySys_SetArgv(1, argv); ! mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL, PYTHON_API_VERSION); dict = PyModule_GetDict(mod); VimError = Py_BuildValue("s", "vim.error"); *************** *** 2369,2375 **** * string object. */ static PyObject * ! GetBufferLine(buf_T *buf, int n) { return LineToString((char *)ml_get_buf(buf, (linenr_T)n, FALSE)); } --- 2381,2387 ---- * string object. */ static PyObject * ! GetBufferLine(buf_T *buf, PyInt n) { return LineToString((char *)ml_get_buf(buf, (linenr_T)n, FALSE)); } *************** *** 2422,2428 **** * deleted). */ static void ! py_fix_cursor(int lo, int hi, int extra) { if (curwin->w_cursor.lnum >= lo) { --- 2434,2440 ---- * deleted). */ static void ! py_fix_cursor(linenr_T lo, linenr_T hi, linenr_T extra) { if (curwin->w_cursor.lnum >= lo) { *************** *** 2454,2460 **** * is set to the change in the buffer length. */ static int ! SetBufferLine(buf_T *buf, int n, PyObject *line, int *len_change) { /* First of all, we check the thpe of the supplied Python object. * There are three cases: --- 2466,2472 ---- * is set to the change in the buffer length. */ static int ! SetBufferLine(buf_T *buf, PyInt n, PyObject *line, PyInt *len_change) { /* First of all, we check the thpe of the supplied Python object. * There are three cases: *************** *** 2477,2483 **** { deleted_lines_mark((linenr_T)n, 1L); if (buf == curwin->w_buffer) ! py_fix_cursor(n, n + 1, -1); } curbuf = savebuf; --- 2489,2495 ---- { deleted_lines_mark((linenr_T)n, 1L); if (buf == curwin->w_buffer) ! py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1); } curbuf = savebuf; *************** *** 2545,2551 **** * is set to the change in the buffer length. */ static int ! SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, int *len_change) { /* First of all, we check the thpe of the supplied Python object. * There are three cases: --- 2557,2563 ---- * is set to the change in the buffer length. */ static int ! SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, PyInt *len_change) { /* First of all, we check the thpe of the supplied Python object. * There are three cases: *************** *** 2556,2562 **** if (list == Py_None || list == NULL) { PyInt i; ! PyInt n = hi - lo; buf_T *savebuf = curbuf; PyErr_Clear(); --- 2568,2574 ---- if (list == Py_None || list == NULL) { PyInt i; ! PyInt n = (int)(hi - lo); buf_T *savebuf = curbuf; PyErr_Clear(); *************** *** 2577,2583 **** deleted_lines_mark((linenr_T)lo, (long)i); if (buf == curwin->w_buffer) ! py_fix_cursor(lo, hi, -n); } curbuf = savebuf; --- 2589,2595 ---- deleted_lines_mark((linenr_T)lo, (long)i); if (buf == curwin->w_buffer) ! py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n); } curbuf = savebuf; *************** *** 2595,2601 **** PyInt i; PyInt new_len = PyList_Size(list); PyInt old_len = hi - lo; ! int extra = 0; /* lines added to text, can be negative */ char **array; buf_T *savebuf; --- 2607,2613 ---- PyInt i; PyInt new_len = PyList_Size(list); PyInt old_len = hi - lo; ! PyInt extra = 0; /* lines added to text, can be negative */ char **array; buf_T *savebuf; *************** *** 2706,2712 **** changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); if (buf == curwin->w_buffer) ! py_fix_cursor(lo, hi, extra); curbuf = savebuf; --- 2718,2724 ---- changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); if (buf == curwin->w_buffer) ! py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)extra); curbuf = savebuf; *************** *** 2734,2740 **** * is set to the change in the buffer length. */ static int ! InsertBufferLines(buf_T *buf, int n, PyObject *lines, int *len_change) { /* First of all, we check the type of the supplied Python object. * It must be a string or a list, or the call is in error. --- 2746,2752 ---- * is set to the change in the buffer length. */ static int ! InsertBufferLines(buf_T *buf, PyInt n, PyObject *lines, PyInt *len_change) { /* First of all, we check the type of the supplied Python object. * It must be a string or a list, or the call is in error. *** ../vim-7.1.319/src/version.c Fri Jun 20 12:55:28 2008 --- src/version.c Fri Jun 20 16:25:28 2008 *************** *** 1367,1378 **** # ifdef FEAT_GUI_W32 # if defined(_MSC_VER) && (_MSC_VER <= 1010) /* Only MS VC 4.1 and earlier can do Win32s */ ! MSG_PUTS(_("\nMS-Windows 16/32 bit GUI version")); # else # ifdef _WIN64 ! MSG_PUTS(_("\nMS-Windows 64 bit GUI version")); # else ! MSG_PUTS(_("\nMS-Windows 32 bit GUI version")); # endif # endif if (gui_is_win32s()) --- 1374,1385 ---- # ifdef FEAT_GUI_W32 # if defined(_MSC_VER) && (_MSC_VER <= 1010) /* Only MS VC 4.1 and earlier can do Win32s */ ! MSG_PUTS(_("\nMS-Windows 16/32-bit GUI version")); # else # ifdef _WIN64 ! MSG_PUTS(_("\nMS-Windows 64-bit GUI version")); # else ! MSG_PUTS(_("\nMS-Windows 32-bit GUI version")); # endif # endif if (gui_is_win32s()) *************** *** 1381,1397 **** MSG_PUTS(_(" with OLE support")); # endif # else ! MSG_PUTS(_("\nMS-Windows 32 bit console version")); # endif #endif #ifdef WIN16 ! MSG_PUTS(_("\nMS-Windows 16 bit version")); #endif #ifdef MSDOS # ifdef DJGPP ! MSG_PUTS(_("\n32 bit MS-DOS version")); # else ! MSG_PUTS(_("\n16 bit MS-DOS version")); # endif #endif #ifdef MACOS --- 1388,1408 ---- MSG_PUTS(_(" with OLE support")); # endif # else ! # ifdef _WIN64 ! MSG_PUTS(_("\nMS-Windows 64-bit console version")); ! # else ! MSG_PUTS(_("\nMS-Windows 32-bit console version")); ! # endif # endif #endif #ifdef WIN16 ! MSG_PUTS(_("\nMS-Windows 16-bit version")); #endif #ifdef MSDOS # ifdef DJGPP ! MSG_PUTS(_("\n32-bit MS-DOS version")); # else ! MSG_PUTS(_("\n16-bit MS-DOS version")); # endif #endif #ifdef MACOS *** ../vim-7.1.319/src/version.c Fri Jun 20 12:55:28 2008 --- src/version.c Fri Jun 20 16:25:28 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 320, /**/ -- The real trick is this: to keep the lines as short as possible and keep the size the same yet free from the need for hyphena- Dammit!! (Matthew Winn) /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.321 --- To: vim-dev at vim.org Subject: Patch 7.1.321 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.321 (extra) Problem: Win32 / Win64: Install file is outdated. Solution: Update the text for recent compiler. (George Reilly) Files: src/INSTALLpc.txt *** ../vim-7.1.320/src/INSTALLpc.txt Sun Mar 16 14:52:53 2008 --- src/INSTALLpc.txt Fri Jun 20 13:39:35 2008 *************** *** 36,42 **** Visual Studio ------------- ! Building with Visual Studio (VS 98, VS .NET, VS .NET 2003, and VS .NET 2005) is straightforward. (These instructions should also work for VS 4 and VS 5.) To build Vim from the command line with MSVC, use Make_mvc.mak. --- 36,42 ---- Visual Studio ------------- ! Building with Visual Studio (VS 98, VS .NET, VS .NET 2003, VS 2005, and VS 2008) is straightforward. (These instructions should also work for VS 4 and VS 5.) To build Vim from the command line with MSVC, use Make_mvc.mak. *************** *** 139,145 **** is also available through the Platform SDK, |ms-platform-sdk|. ! Visual C++ 2005 Express Edition ------------------------------- Visual C++ 2005 Express Edition can be downloaded for free from: --- 139,145 ---- is also available through the Platform SDK, |ms-platform-sdk|. ! Visual C++ 2005 Express Edition *msvc-2005-express* ------------------------------- Visual C++ 2005 Express Edition can be downloaded for free from: *************** *** 159,164 **** --- 159,172 ---- This includes the IDE and the debugger. You can build Vim with Make_mvc.mak. + Visual C++ 2008 Express Edition *msvc-2008-express* + ------------------------------- + + Visual C++ 2008 Express Edition can be downloaded for free from: + http://msdn2.microsoft.com/en-us/express/default.aspx + This includes the IDE and the debugger. You can build Vim with Make_mvc.mak. + + 2. MinGW ======== *** ../vim-7.1.320/src/version.c Fri Jun 20 16:31:45 2008 --- src/version.c Fri Jun 20 16:50:50 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 321, /**/ -- CVS sux, men don't like commitment /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.322 --- To: vim-dev at vim.org Subject: Patch 7.1.322 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.322 Problem: Can't get start of Visual area in an mapping. Solution: Add the 'v' argument to getpos(). Files: runtime/doc/eval.txt, src/eval.c *** ../vim-7.1.321/runtime/doc/eval.txt Wed May 28 16:48:00 2008 --- runtime/doc/eval.txt Thu Jun 19 22:46:23 2008 *************** *** 3515,3520 **** --- 3635,3644 ---- returned) w0 first line visible in current window w$ last line visible in current window + v In Visual mode: the start of the Visual area (the + cursor is the end). When not in Visual mode + returns the cursor position. Differs from |'<| in + that it's updated right away. Note that a mark in another file can be used. The line number then applies to another buffer. To get the column number use |col()|. To get both use *** ../vim-7.1.321/src/eval.c Thu May 29 21:46:10 2008 --- src/eval.c Fri Jun 20 17:20:52 2008 *************** *** 16907,16915 **** name = get_tv_string_chk(varp); if (name == NULL) return NULL; ! if (name[0] == '.') /* cursor */ return &curwin->w_cursor; ! if (name[0] == '\'') /* mark */ { pp = getmark_fnum(name[1], FALSE, fnum); if (pp == NULL || pp == (pos_T *)-1 || pp->lnum <= 0) --- 17478,17494 ---- name = get_tv_string_chk(varp); if (name == NULL) return NULL; ! if (name[0] == '.') /* cursor */ return &curwin->w_cursor; ! #ifdef FEAT_VISUAL ! if (name[0] == 'v' && name[1] == NUL) /* Visual start */ ! { ! if (VIsual_active) ! return &VIsual; ! return &curwin->w_cursor; ! } ! #endif ! if (name[0] == '\'') /* mark */ { pp = getmark_fnum(name[1], FALSE, fnum); if (pp == NULL || pp == (pos_T *)-1 || pp->lnum <= 0) *** ../vim-7.1.321/src/version.c Fri Jun 20 16:51:54 2008 --- src/version.c Fri Jun 20 17:27:30 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 322, /**/ -- hundred-and-one symptoms of being an internet addict: 52. You ask a plumber how much it would cost to replace the chair in front of your computer with a toilet. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.323 --- To: vim-dev at vim.org Subject: Patch 7.1.323 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.323 Problem: Test 19 fails with some termcaps. (Dominque Pelle) Solution: Set the t_kb and t_kD termcap values. Files: src/testdir/test19.in, src/testdir/test38.in *** ../vim-7.1.322/src/testdir/test19.in Sun Jun 13 20:24:47 2004 --- src/testdir/test19.in Mon Jun 16 19:45:10 2008 *************** *** 2,7 **** --- 2,9 ---- STARTTEST :set smarttab expandtab ts=8 sw=4 + :" make sure that backspace works, no matter what termcap is used + :set t_kD=x7f t_kb=x08 /some r :set noexpandtab /other *** ../vim-7.1.322/src/testdir/test38.in Sun Jun 13 20:28:25 2004 --- src/testdir/test38.in Mon Jun 16 19:46:35 2008 *************** *** 3,8 **** --- 3,10 ---- STARTTEST :so small.vim + :" make sure that backspace works, no matter what termcap is used + :set t_kD=x7f t_kb=x08 ggdGa abcdefghi jk lmn *** ../vim-7.1.322/src/version.c Fri Jun 20 17:30:45 2008 --- src/version.c Fri Jun 20 17:48:17 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 323, /**/ -- hundred-and-one symptoms of being an internet addict: 53. To find out what time it is, you send yourself an e-mail and check the "Date:" field. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.324 --- To: vim-dev at vim.org Subject: Patch 7.1.324 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.324 Problem: File name path length on Unix is limited to 1024. Solution: Use PATH_MAX when it's more than 1000. Files: src/os_unix.h *** ../vim-7.1.323/src/os_unix.h Tue Jul 10 17:09:51 2007 --- src/os_unix.h Tue Jun 17 20:01:17 2008 *************** *** 432,438 **** * Unix has plenty of memory, use large buffers */ #define CMDBUFFSIZE 1024 /* size of the command processing buffer */ ! #define MAXPATHL 1024 /* Unix has long paths and plenty of memory */ #define CHECK_INODE /* used when checking if a swap file already exists for a file */ --- 432,444 ---- * Unix has plenty of memory, use large buffers */ #define CMDBUFFSIZE 1024 /* size of the command processing buffer */ ! ! /* Use the system path length if it makes sense. */ ! #if defined(PATH_MAX) && (PATH_MAX > 1000) ! # define MAXPATHL PATH_MAX ! #else ! # define MAXPATHL 1024 ! #endif #define CHECK_INODE /* used when checking if a swap file already exists for a file */ *** ../vim-7.1.323/src/version.c Fri Jun 20 17:52:47 2008 --- src/version.c Fri Jun 20 18:04:25 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 324, /**/ -- Q: What is a patch 22? A: A patch you need to include to make it possible to include patches. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.325 --- To: vim-dev at vim.org Subject: Patch 7.1.325 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.325 Problem: When editing a command line that's longer than available space in the window, the characters at the end are in reverse order. Solution: Increment the insert position even when the command line doesn't fit. (Ingo Karkat) Files: src/ex_getln.c *** ../vim-7.1.324/src/ex_getln.c Fri Jun 20 12:55:28 2008 --- src/ex_getln.c Fri Jun 20 16:45:55 2008 *************** *** 2053,2062 **** if (has_mbyte) correct_cmdspos(i, c); #endif ! /* If the cmdline doesn't fit, put cursor on last visible char. */ if ((ccline.cmdspos += c) >= m) { - ccline.cmdpos = i - 1; ccline.cmdspos -= c; break; } --- 2053,2062 ---- if (has_mbyte) correct_cmdspos(i, c); #endif ! /* If the cmdline doesn't fit, show cursor on last visible char. ! * Don't move the cursor itself, so we can still append. */ if ((ccline.cmdspos += c) >= m) { ccline.cmdspos -= c; break; } *************** *** 2829,2838 **** if (has_mbyte) correct_cmdspos(ccline.cmdpos, c); #endif ! /* Stop cursor at the end of the screen */ ! if (ccline.cmdspos + c >= m) ! break; ! ccline.cmdspos += c; #ifdef FEAT_MBYTE if (has_mbyte) { --- 2829,2839 ---- if (has_mbyte) correct_cmdspos(ccline.cmdpos, c); #endif ! /* Stop cursor at the end of the screen, but do increment the ! * insert position, so that entering a very long command ! * works, even though you can't see it. */ ! if (ccline.cmdspos + c < m) ! ccline.cmdspos += c; #ifdef FEAT_MBYTE if (has_mbyte) { *************** *** 3332,3338 **** /* * Do wildcard expansion on the string 'str'. * Chars that should not be expanded must be preceded with a backslash. ! * Return a pointer to alloced memory containing the new string. * Return NULL for failure. * * "orig" is the originally expanded string, copied to allocated memory. It --- 3333,3339 ---- /* * Do wildcard expansion on the string 'str'. * Chars that should not be expanded must be preceded with a backslash. ! * Return a pointer to allocated memory containing the new string. * Return NULL for failure. * * "orig" is the originally expanded string, copied to allocated memory. It *************** *** 6111,6117 **** exmode_active = save_exmode; ! /* Safety check: The old window or buffer was deleted: It's a a bug when * this happens! */ if (!win_valid(old_curwin) || !buf_valid(old_curbuf)) { --- 6112,6118 ---- exmode_active = save_exmode; ! /* Safety check: The old window or buffer was deleted: It's a bug when * this happens! */ if (!win_valid(old_curwin) || !buf_valid(old_curbuf)) { *** ../vim-7.1.324/src/version.c Fri Jun 20 18:06:15 2008 --- src/version.c Fri Jun 20 18:27:54 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 325, /**/ -- "I can't complain, but sometimes I still do." (Joe Walsh) /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.326 --- To: vim-dev at vim.org Subject: Patch 7.1.326 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.326 Problem: ":s!from!to!" works, but ":smagic!from!to!" doesn't. It sees the "!" as a flag to to the command. Same for ":snomagic". (Johan Spetz) Solution: When checking for a forced command also ignore ":smagic" and ":snomagic". (Ian Kelling) Files: src/ex_docmd.c *** ../vim-7.1.325/src/ex_docmd.c Fri Jun 20 11:10:53 2008 --- src/ex_docmd.c Fri Jun 20 10:42:30 2008 *************** *** 2142,2148 **** #endif ! if (*p == '!' && ea.cmdidx != CMD_substitute) /* forced commands */ { ++p; ea.forceit = TRUE; --- 2142,2150 ---- #endif ! /* forced commands */ ! if (*p == '!' && ea.cmdidx != CMD_substitute ! && ea.cmdidx != CMD_smagic && ea.cmdidx != CMD_snomagic) { ++p; ea.forceit = TRUE; *** ../vim-7.1.325/src/version.c Fri Jun 20 18:30:27 2008 --- src/version.c Fri Jun 20 18:50:19 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 326, /**/ -- hundred-and-one symptoms of being an internet addict: 55. You ask your doctor to implant a gig in your brain. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.327 --- To: vim-dev at vim.org Subject: Patch 7.1.327 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.327 Problem: The GUI tutor is installed when there is no GUI version. Solution: Only install gvimtutor when building a GUI version. Files: src/Makefile *** ../vim-7.1.326/src/Makefile Fri Jun 20 18:51:06 2008 --- src/Makefile Fri Jun 20 21:26:46 2008 *************** *** 1113,1119 **** GTK_LIBS_DIR = $(GUI_LIB_LOC) GTK_LIBS1 = GTK_LIBS2 = $(GTK_LIBNAME) ! GTK_INSTALL = install_normal GTK_TARGETS = installglinks GTK_MAN_TARGETS = yes GTK_TESTTARGET = gui --- 1113,1119 ---- GTK_LIBS_DIR = $(GUI_LIB_LOC) GTK_LIBS1 = GTK_LIBS2 = $(GTK_LIBNAME) ! GTK_INSTALL = install_normal install_gui_extra GTK_TARGETS = installglinks GTK_MAN_TARGETS = yes GTK_TESTTARGET = gui *************** *** 1130,1136 **** MOTIF_LIBS_DIR = $(GUI_LIB_LOC) MOTIF_LIBS1 = MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt ! MOTIF_INSTALL = install_normal MOTIF_TARGETS = installglinks MOTIF_MAN_TARGETS = yes MOTIF_TESTTARGET = gui --- 1130,1136 ---- MOTIF_LIBS_DIR = $(GUI_LIB_LOC) MOTIF_LIBS1 = MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt ! MOTIF_INSTALL = install_normal install_gui_extra MOTIF_TARGETS = installglinks MOTIF_MAN_TARGETS = yes MOTIF_TESTTARGET = gui *************** *** 1160,1166 **** ATHENA_LIBS_DIR = $(GUI_LIB_LOC) ATHENA_LIBS1 = $(XAW_LIB) ATHENA_LIBS2 = -lXt ! ATHENA_INSTALL = install_normal ATHENA_TARGETS = installglinks ATHENA_MAN_TARGETS = yes ATHENA_TESTTARGET = gui --- 1160,1166 ---- ATHENA_LIBS_DIR = $(GUI_LIB_LOC) ATHENA_LIBS1 = $(XAW_LIB) ATHENA_LIBS2 = -lXt ! ATHENA_INSTALL = install_normal install_gui_extra ATHENA_TARGETS = installglinks ATHENA_MAN_TARGETS = yes ATHENA_TESTTARGET = gui *************** *** 1178,1184 **** NEXTAW_LIBS_DIR = $(GUI_LIB_LOC) NEXTAW_LIBS1 = $(NEXTAW_LIB) NEXTAW_LIBS2 = -lXt ! NEXTAW_INSTALL = install_normal NEXTAW_TARGETS = installglinks NEXTAW_MAN_TARGETS = yes NEXTAW_TESTTARGET = gui --- 1178,1184 ---- NEXTAW_LIBS_DIR = $(GUI_LIB_LOC) NEXTAW_LIBS1 = $(NEXTAW_LIB) NEXTAW_LIBS2 = -lXt ! NEXTAW_INSTALL = install_normal install_gui_extra NEXTAW_TARGETS = installglinks NEXTAW_MAN_TARGETS = yes NEXTAW_TESTTARGET = gui *************** *** 1203,1209 **** PHOTONGUI_LIBS_DIR = PHOTONGUI_LIBS1 = -lph -lphexlib PHOTONGUI_LIBS2 = ! PHOTONGUI_INSTALL = install_normal PHOTONGUI_TARGETS = installglinks PHOTONGUI_MAN_TARGETS = yes PHOTONGUI_TESTTARGET = gui --- 1203,1209 ---- PHOTONGUI_LIBS_DIR = PHOTONGUI_LIBS1 = -lph -lphexlib PHOTONGUI_LIBS2 = ! PHOTONGUI_INSTALL = install_normal install_gui_extra PHOTONGUI_TARGETS = installglinks PHOTONGUI_MAN_TARGETS = yes PHOTONGUI_TESTTARGET = gui *************** *** 1219,1225 **** CARBONGUI_LIBS_DIR = CARBONGUI_LIBS1 = -framework Carbon CARBONGUI_LIBS2 = ! CARBONGUI_INSTALL = install_macosx CARBONGUI_TARGETS = CARBONGUI_MAN_TARGETS = CARBONGUI_TESTTARGET = gui --- 1219,1225 ---- CARBONGUI_LIBS_DIR = CARBONGUI_LIBS1 = -framework Carbon CARBONGUI_LIBS2 = ! CARBONGUI_INSTALL = install_macosx install_gui_extra CARBONGUI_TARGETS = CARBONGUI_MAN_TARGETS = CARBONGUI_TESTTARGET = gui *************** *** 1741,1746 **** --- 1741,1755 ---- cd $(PODIR); $(MAKE) checkclean; \ fi + install: $(GUI_INSTALL) + + install_normal: installvim installtools $(INSTALL_LANGS) install-icons + + install_gui_extra: installgtutorbin + + installvim: installvimbin installtutorbin \ + installruntime installlinks installmanlinks + # # Avoid overwriting an existing executable, somebody might be running it and # overwriting it could cause it to crash. Deleting it is OK, it won't be *************** *** 1750,1762 **** # If you want to keep an older version, rename it before running "make # install". # - install: $(GUI_INSTALL) - - install_normal: installvim installtools $(INSTALL_LANGS) install-icons - - installvim: installvimbin installtutorbin \ - installruntime installlinks installmanlinks - installvimbin: $(VIMTARGET) $(DESTDIR)$(exec_prefix) $(DEST_BIN) -if test -f $(DEST_BIN)/$(VIMTARGET); then \ mv -f $(DEST_BIN)/$(VIMTARGET) $(DEST_BIN)/$(VIMNAME).rm; \ --- 1759,1764 ---- *************** *** 1872,1877 **** --- 1874,1881 ---- installtutorbin: $(DEST_VIM) $(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor + + installgtutorbin: $(DEST_VIM) $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor *** ../vim-7.1.326/src/version.c Fri Jun 20 18:51:01 2008 --- src/version.c Fri Jun 20 21:26:52 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 327, /**/ -- hundred-and-one symptoms of being an internet addict: 56. You leave the modem speaker on after connecting because you think it sounds like the ocean wind...the perfect soundtrack for "surfing the net". /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.328 --- To: vim-dev at vim.org Subject: Patch 7.1.328 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.328 Problem: Crash when using Cygwin and non-posix path name in tags file. Solution: Use separate buffer for posix path. (Ben Schmidt) Files: src/os_unix.c *** ../vim-7.1.327/src/os_unix.c Fri Jun 20 11:58:27 2008 --- src/os_unix.c Sat Jun 21 13:06:45 2008 *************** *** 2278,2283 **** --- 2278,2287 ---- char_u olddir[MAXPATHL]; char_u *p; int retval = OK; + #ifdef __CYGWIN__ + char_u posix_fname[MAX_PATH]; + #endif + #ifdef VMS fname = vms_fixfilename(fname); *************** *** 2287,2293 **** /* * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts". */ ! cygwin_conv_to_posix_path(fname, fname); #endif /* expand it if forced or not an absolute path */ --- 2291,2298 ---- /* * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts". */ ! cygwin_conv_to_posix_path(fname, posix_fname); ! fname = posix_fname; #endif /* expand it if forced or not an absolute path */ *** ../vim-7.1.327/src/version.c Fri Jun 20 21:29:01 2008 --- src/version.c Sat Jun 21 13:10:39 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 328, /**/ -- Q: Should I clean my house or work on Vim? A: Whatever contains more bugs. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.329 --- To: vim-dev at vim.org Subject: Patch 7.1.329 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.329 Problem: When the popup menu is removed a column of cells, the right halve of double-wide characters, may not be redrawn. Solution: Check if the right halve of a character needs to be redrawn. (Yukihiro Nakadaira) Files: src/screen.c *** ../vim-7.1.328/src/screen.c Wed May 28 19:01:53 2008 --- src/screen.c Sat Jun 21 14:09:02 2008 *************** *** 4863,4868 **** --- 4863,4869 ---- * - the (first byte of the) character is different * - the attributes are different * - the character is multi-byte and the next byte is different + * - the character is two cells wide and the second cell differs. */ static int char_needs_redraw(off_from, off_to, cols) *************** *** 4884,4890 **** || (enc_utf8 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] || (ScreenLinesUC[off_from] != 0 ! && comp_char_differs(off_from, off_to)))) #endif )) return TRUE; --- 4885,4893 ---- || (enc_utf8 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] || (ScreenLinesUC[off_from] != 0 ! && comp_char_differs(off_from, off_to)) ! || (cols > 1 && ScreenLines[off_from + 1] ! != ScreenLines[off_to + 1]))) #endif )) return TRUE; *** ../vim-7.1.328/src/version.c Sat Jun 21 13:11:58 2008 --- src/version.c Sat Jun 21 14:12:30 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 329, /**/ -- hundred-and-one symptoms of being an internet addict: 61. Your best friends know your e-mail address, but neither your phone number nor the address where you live. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// --- NEW FILE 7.1.330 --- To: vim-dev at vim.org Subject: Patch 7.1.330 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.330 Problem: Reading uninitialized memory when using Del in replace mode. Solution: Use utfc_ptr2len_len() instead of mb_ptr2len(). (Dominique Pelle) Files: src/misc1.c *** ../vim-7.1.329/src/misc1.c Mon Feb 25 21:54:23 2008 --- src/misc1.c Sat Jun 21 16:02:34 2008 *************** *** 1880,1894 **** # ifdef FEAT_MBYTE int n; ! for (i = 0; i < len; i += n) ! { ! n = (*mb_ptr2len)(p + i); ! ins_char_bytes(p + i, n); ! } ! # else ! for (i = 0; i < len; ++i) ! ins_char(p[i]); # endif } #endif --- 1880,1899 ---- # ifdef FEAT_MBYTE int n; ! if (has_mbyte) ! for (i = 0; i < len; i += n) ! { ! if (enc_utf8) ! /* avoid reading past p[len] */ ! n = utfc_ptr2len_len(p + i, len - i); ! else ! n = (*mb_ptr2len)(p + i); ! ins_char_bytes(p + i, n); ! } ! else # endif + for (i = 0; i < len; ++i) + ins_char(p[i]); } #endif *** ../vim-7.1.329/src/version.c Sat Jun 21 14:13:51 2008 --- src/version.c Sat Jun 21 16:28:28 2008 *************** *** 668,669 **** --- 673,676 ---- { /* Add new patch number below this line */ + /**/ + 330, /**/ -- hundred-and-one symptoms of being an internet addict: 65. The last time you looked at the clock it was 11:30pm, and in what seems like only a few seconds later, your sister runs past you to catch her 7am school bus. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Fri Jul 18 11:43:23 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 18 Jul 2008 11:43:23 GMT Subject: rpms/aalib/devel aalib.spec,1.20,1.21 Message-ID: <200807181143.m6IBhNtc008676@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/aalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8630 Modified Files: aalib.spec Log Message: rebuild for gpm Index: aalib.spec =================================================================== RCS file: /cvs/pkgs/rpms/aalib/devel/aalib.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- aalib.spec 25 Mar 2008 03:48:14 -0000 1.20 +++ aalib.spec 18 Jul 2008 11:42:27 -0000 1.21 @@ -3,7 +3,7 @@ Summary: ASCII art library Name: aalib Version: 1.4.0 -Release: 0.15.%{rc_subver}%{?dist} +Release: 0.16.%{rc_subver}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://aa-project.sourceforge.net/aalib/ @@ -111,6 +111,9 @@ %{_datadir}/aclocal/aalib.m4 %changelog +* Fri Jul 18 2008 Caol??n McNamara 1.4.0-0.16.rc5 +- rebuild for new libgpm + * Mon Mar 24 2008 Garrick Staples 1.4.0-0.15.rc5 - remove unnecessary link bloat from aalib-config - libs package doesn't need to require base package From fedora-extras-commits at redhat.com Fri Jul 18 12:00:48 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 12:00:48 GMT Subject: rpms/vim/devel README.patches,1.108,1.109 vim.spec,1.212,1.213 Message-ID: <200807181200.m6IC0maN009650@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9598 Modified Files: README.patches vim.spec Log Message: - patchlevel 330 Index: README.patches =================================================================== RCS file: /cvs/extras/rpms/vim/devel/README.patches,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- README.patches 4 Jun 2008 14:07:58 -0000 1.108 +++ README.patches 18 Jul 2008 12:00:02 -0000 1.109 @@ -342,3 +342,24 @@ 23714 7.1.307 many warnings when compiling with Python 2.5 2673 7.1.308 when in readonly mode ":options" produces an error 3989 7.1.309 installing and testing with a shadow directory doesn't work + 8024 7.1.310 incomplete utf-8 byte sequence at end of the file not detected + 2547 7.1.311 compiler warning for missing sentinel in X code + 2346 7.1.312 there is no check for error number mistakes in .po files + 3425 7.1.313 status and tile not updated when using netbeans setModified + 1915 7.1.314 'pastetoggle' is written to the session file without escaping + 3287 7.1.315 crash with specific search pattern using look-behind match + 1480 7.1.316 when 'cscopetag' is set ":tag" gives an error message + 5203 7.1.317 compiler warnings in Motif calls + 5428 7.1.318 mem leak when closing xsmp conn.; crash on exit with Lesstif + 1514 7.1.319 illegal memory access when pasting illegal utf-8 on cmd line + 28763 7.1.320 Win64: Warnings while compiling Python interface + 2603 7.1.321 (extra) Win32 / Win64: Install file is outdated + 2677 7.1.322 can't get start of Visual area in an mapping + 1734 7.1.323 test 19 and 38 fail with some termcaps + 1847 7.1.324 file name path length on Unix is limited to 1024 + 3559 7.1.325 editing a command line that doesn't fit reverses char order + 1641 7.1.326 ":smagic!from!to!" doesn't work, it sees the "!" as a flag + 5454 7.1.327 gvimtutor is also installed when not building a GUI version + 1859 7.1.328 crash when using Cygwin and non-posix path name in tags file + 2172 7.1.329 right halve of double-wide char under popup menu not redrawn + 1905 7.1.330 reading uninitialized memory when using Del in replace mode Index: vim.spec =================================================================== RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- vim.spec 4 Jun 2008 14:08:52 -0000 1.212 +++ vim.spec 18 Jul 2008 12:00:02 -0000 1.213 @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 309 +%define patchlevel 330 Summary: The VIM editor URL: http://www.vim.org/ @@ -365,6 +365,27 @@ Patch307: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.307 Patch308: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.308 Patch309: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.309 +Patch310: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.310 +Patch311: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.311 +Patch312: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.312 +Patch313: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.313 +Patch314: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.314 +Patch315: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.315 +Patch316: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.316 +Patch317: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.317 +Patch318: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.318 +Patch319: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.319 +Patch320: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.320 +Patch321: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.321 +Patch322: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.322 +Patch323: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.323 +Patch324: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.324 +Patch325: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.325 +Patch326: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.326 +Patch327: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.327 +Patch328: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.328 +Patch329: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.329 +Patch330: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.330 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -811,6 +832,27 @@ %patch307 -p0 %patch308 -p0 %patch309 -p0 +%patch310 -p0 +%patch311 -p0 +%patch312 -p0 +%patch313 -p0 +%patch314 -p0 +%patch315 -p0 +%patch316 -p0 +%patch317 -p0 +%patch318 -p0 +%patch319 -p0 +%patch320 -p0 +%patch321 -p0 +%patch322 -p0 +%patch323 -p0 +%patch324 -p0 +%patch325 -p0 +%patch326 -p0 +%patch327 -p0 +%patch328 -p0 +%patch329 -p0 +%patch330 -p0 # install spell files @@ -925,6 +967,7 @@ cd src make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin +make installgtutorbin DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd mv $RPM_BUILD_ROOT/bin/gvimtutor $RPM_BUILD_ROOT/%{_bindir}/gvimtutor mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps @@ -1229,6 +1272,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Jul 04 2008 Karsten Hopp 7.1.330-1 +- patchlevel 330 + * Wed Jun 04 2008 Karsten Hopp 7.1.309-1 - Patchlevel 309 From fedora-extras-commits at redhat.com Fri Jul 18 12:12:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 18 Jul 2008 12:12:44 GMT Subject: rpms/perl-Class-MethodMaker/devel perl-Class-MethodMaker.spec, 1.13, 1.14 Message-ID: <200807181212.m6ICCikb016743@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16637 Modified Files: perl-Class-MethodMaker.spec Log Message: * Fri Jul 18 2008 Ralf Cors??pius - 2.10-4 - Remove %clean ||: (BZ 449442, FTBFS). - Use %version in Source0-URL. - Don't skip 0-signature.t. - Misc. minor spec-file overhaul. Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Class-MethodMaker.spec 2 Mar 2008 15:51:28 -0000 1.13 +++ perl-Class-MethodMaker.spec 18 Jul 2008 12:11:53 -0000 1.14 @@ -1,19 +1,18 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-Class-MethodMaker Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module for creating generic object-oriented methods Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/~schwigon/Class-MethodMaker/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.10.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(IPC::Run) BuildRequires: perl(ExtUtils::MakeMaker) +# Required by the tests +BuildRequires: perl(IPC::Run) + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -25,9 +24,8 @@ %setup -q -n Class-MethodMaker-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -37,8 +35,7 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : -mv t/0-signature.t t/0-signature.t.skip +%check make test %clean @@ -53,6 +50,12 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 18 2008 Ralf Cors??pius - 2.10-4 +- Remove %%clean ||: (BZ 449442, FTBFS). +- Use %%version in Source0-URL. +- Don't skip 0-signature.t. +- Misc. minor spec-file overhaul. + * Wed Feb 27 2008 Tom "spot" Callaway - 2.10-3 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Fri Jul 18 12:13:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Fri, 18 Jul 2008 12:13:30 GMT Subject: rpms/wireshark/devel wireshark-nfsv41-layout-types.patch, NONE, 1.1 wireshark-nfsv41-layout-updates.patch, NONE, 1.1 wireshark-nfsv41.patch, NONE, 1.1 wireshark-rpc-pdu-size.patch, NONE, 1.1 wireshark.spec, 1.37, 1.38 Message-ID: <200807181213.m6ICDUVf016865@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/wireshark/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16746 Modified Files: wireshark.spec Added Files: wireshark-nfsv41-layout-types.patch wireshark-nfsv41-layout-updates.patch wireshark-nfsv41.patch wireshark-rpc-pdu-size.patch Log Message: - Added patches to support NFSv4.1 wireshark-nfsv41-layout-types.patch: --- NEW FILE wireshark-nfsv41-layout-types.patch --- commit 90a3a0e14c1f14214df29f21037bd2818b178681 Author: Tigran Mkrtchyan Date: Mon Jun 23 10:14:19 2008 +0200 decode and display fattr4_fs_layout_types diff -up wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig wireshark-1.0.2/epan/dissectors/packet-nfs.c --- wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig 2008-07-17 06:42:09.000000000 -0400 +++ wireshark-1.0.2/epan/dissectors/packet-nfs.c 2008-07-17 06:45:14.000000000 -0400 @@ -6346,6 +6346,21 @@ dissect_nfs_fattr4_fh_expire_type(tvbuff return offset; } +static int +dissect_nfs_fs_layout_type(tvbuff_t *tvb, proto_tree *tree, int offset) +{ + guint count, i; + + count = tvb_get_ntohl(tvb, offset); + offset +=4; + + for (i = 0; i < count; i++) { + offset += dissect_rpc_uint32(tvb, tree, hf_nfs_layouttype4, offset); + } + + return offset; +} + static const value_string names_fattr4[] = { #define FATTR4_SUPPORTED_ATTRS 0 { FATTR4_SUPPORTED_ATTRS, "FATTR4_SUPPORTED_ATTRS" }, @@ -6843,6 +6858,10 @@ dissect_nfs_attributes(tvbuff_t *tvb, in attr_vals_offset = dissect_rpc_uint64(tvb, attr_newftree, hf_nfs_fattr4_mounted_on_fileid, attr_vals_offset); break; + case FATTR4_FS_LAYOUT_TYPE: + attr_vals_offset = dissect_nfs_fs_layout_type(tvb, attr_newftree, + attr_vals_offset); + break; case FATTR4_LAYOUT_BLKSIZE: attr_vals_offset = dissect_rpc_uint32(tvb, attr_newftree, hf_nfs_fattr4_layout_blksize, attr_vals_offset); wireshark-nfsv41-layout-updates.patch: --- NEW FILE wireshark-nfsv41-layout-updates.patch --- commit ab3b0d2d93f02cb89713caa2a3349159cfceec93 Author: Thijs Stuurman Date: Wed Jun 25 13:02:21 2008 -0400 Synchronize names used by wireshark with those used in latest pnfs draft. diff -up wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig wireshark-1.0.2/epan/dissectors/packet-nfs.c --- wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig 2008-07-17 06:48:32.000000000 -0400 +++ wireshark-1.0.2/epan/dissectors/packet-nfs.c 2008-07-17 06:52:26.000000000 -0400 @@ -9011,9 +9011,9 @@ static const value_string stripetype_nam }; static const value_string layouttype_names[] = { - { 1, "LAYOUT_NFSV4_FILES"}, - { 2, "LAYOUT_OSD2_OBJECTS"}, - { 3, "LAYOUT_BLOCK_VOLUME"}, + { 1, "LAYOUT4_NFSV4_1_FILES"}, + { 2, "LAYOUT4_OSD2_OBJECTS"}, + { 3, "LAYOUT4_BLOCK_VOLUME"}, { 0, NULL } }; wireshark-nfsv41.patch: --- NEW FILE wireshark-nfsv41.patch --- commit 37859b111eb029ce0f6d16be84e6ae9a1e88e117 Author: stig Date: Sat Jul 12 19:53:53 2008 +0000 From J. Bruce Fields (bug 2634): The attached patches bring the wireshark code up to date with the latest NFSv4.1 protocol drafts (in ietf last call now, so hopefully not too much more of this will be required). They also cover more of the protocol, and do some minor cleanup (e.g. remove some operations which were really only used by one prototype implementation, and never part of the protocol.) A few ops and attributes are still missing. diff -up wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig wireshark-1.0.2/epan/dissectors/packet-nfs.c --- wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig 2008-07-17 06:37:51.000000000 -0400 +++ wireshark-1.0.2/epan/dissectors/packet-nfs.c 2008-07-17 06:42:09.000000000 -0400 @@ -294,6 +294,7 @@ static int hf_nfs_fattr4_space_free = -1 static int hf_nfs_fattr4_space_total = -1; static int hf_nfs_fattr4_space_used = -1; static int hf_nfs_fattr4_mounted_on_fileid = -1; +static int hf_nfs_fattr4_layout_blksize = -1; static int hf_nfs_who = -1; static int hf_nfs_server = -1; static int hf_nfs_fslocation4 = -1; @@ -348,6 +349,7 @@ static int hf_nfs_callback_ident = -1; static int hf_nfs_r_netid = -1; static int hf_nfs_gsshandle4 = -1; static int hf_nfs_r_addr = -1; +static int hf_nfs_createmode4 = -1; /* NFSv4.1 */ static int hf_nfs_length4_minlength = -1; @@ -368,7 +370,6 @@ static int hf_nfs_deviceidx4 = -1; static int hf_nfs_layout4 = -1; static int hf_nfs_stripedevs4 = -1; static int hf_nfs_devaddr4 = -1; -static int hf_nfs_notifydsop4 = -1; static int hf_nfs_return_on_close4 = -1; static int hf_nfs_slotid4 = -1; static int hf_nfs_sr_status4 = -1; @@ -405,6 +406,13 @@ static int hf_nfs_create_session_flags4 static int hf_nfs_cachethis4 = -1; static int hf_nfs_util4 = -1; static int hf_nfs_first_stripe_idx4 = -1; +static int hf_nfs_layout_count = -1; +static int hf_nfs_pattern_offset = -1; +static int hf_nfs_notification_bitmap4 = -1; +static int hf_nfs_lrs_present = -1; +static int hf_nfs_nfl_util = -1; +static int hf_nfs_nfl_first_stripe_index = -1; +static int hf_nfs_lrf_body_content = -1; /* Hidden field for v2, v3, and v4 status */ int hf_nfs_nfsstat = -1; @@ -530,12 +538,10 @@ static gint ett_nfs_layoutcommit4 = -1; static gint ett_nfs_layoutreturn4 = -1; static gint ett_nfs_getdevinfo4 = -1; static gint ett_nfs_getdevlist4 = -1; -static gint ett_nfs_notifyds4 = -1; static gint ett_nfs_exchange_id4 = -1; static gint ett_nfs_create_session4 = -1; static gint ett_nfs_destroy_session4 = -1; static gint ett_nfs_sequence4 = -1; -static gint ett_nfs_pnfs_create4 = -1; static gint ett_nfs_slotid4 = -1; static gint ett_nfs_sr_status4 = -1; static gint ett_nfs_serverscope4 = -1; @@ -562,6 +568,8 @@ static gint ett_nfs_uid4 = -1; static gint ett_nfs_gid4 = -1; static gint ett_nfs_service4 = -1; static gint ett_nfs_sessionid4 = -1; +static gint ett_nfs_layoutseg = -1; +static gint ett_nfs_layoutseg_fh = -1; /* what type of fhandles shoudl we dissect as */ static dissector_table_t nfs_fhandle_table; @@ -5827,6 +5835,19 @@ static const value_string names_nfs_nfss { 10071, "NFS4ERR_OP_NOT_IN_SESSION" }, { 10072, "NFS4ERR_HASH_ALG_UNSUPP" }, { 10073, "NFS4ERR_CONN_BINDING_NOT_ENFORCED" }, + { 10074, "NFS4ERR_CLIENTID_BUSY" }, + { 10075, "NFS4ERR_PNFS_IO_HOLE" }, + { 10076, "NFS4ERR_SEQ_FALSE_RETRY" }, + { 10077, "NFS4ERR_BAD_HIGH_SLOT" }, + { 10078, "NFS4ERR_DEADSESSION" }, + { 10079, "NFS4ERR_ENCR_ALG_UNSUPP" }, + { 10080, "NFS4ERR_PNFS_NO_LAYOUT" }, + { 10081, "NFS4ERR_NOT_ONLY_OP" }, + { 10082, "NFS4ERR_WRONG_CRED" }, + { 10083, "NFS4ERR_WRONG_TYPE" }, + { 10084, "NFS4ERR_DIRDELEG_UNAVAIL" }, + { 10085, "NFS4ERR_REJECT_DELEG" }, + { 10086, "NFS4ERR_RETURNCONFLICT" }, { 0, NULL } }; @@ -6440,18 +6461,46 @@ static const value_string names_fattr4[] { FATTR4_MOUNTED_ON_FILEID, "FATTR4_MOUNTED_ON_FILEID" }, #define FATTR4_DIR_NOTIF_DELAY 56 { FATTR4_DIR_NOTIF_DELAY, "FATTR4_DIR_NOTIF_DELAY" }, -#define FATTR4_DIRENT_NOTIF_DELAY 57 +#define FATTR4_DIRENT_NOTIF_DELAY 57 { FATTR4_DIRENT_NOTIF_DELAY, "FATTR4_DIRENT_NOTIF_DELAY" }, -#define FATTR4_SEND_IMPL_ID 58 - { FATTR4_SEND_IMPL_ID, "FATTR4_SEND_IMPL_ID" }, -#define FATTR4_RECV_IMPL_ID 59 - { FATTR4_RECV_IMPL_ID, "FATTR4_RECV_IMPL_ID" }, -#define FATTR4_ABSENT 60 - { FATTR4_ABSENT, "FATTR4_ABSENT" }, -#define FATTR4_FS_STATUS 61 - { FATTR4_FS_STATUS, "FATTR4_FS_STATUS" }, -#define FATTR4_FS_LAYOUT_TYPES 62 - { FATTR4_MOUNTED_ON_FILEID, "FATTR4_FS_LAYOUT_TYPES" }, +#define FATTR4_DACL 58 + { FATTR4_DACL, "FATTR4_DACL" }, +#define FATTR4_SACL 59 + { FATTR4_SACL, "FATTR4_SACL" }, +#define FATTR4_CHANGE_POLICY 60 + { FATTR4_CHANGE_POLICY, "FATTR4_CHANGE_POLICY" }, +#define FATTR4_FS_STATUS 61 + { FATTR4_FS_STATUS, "FATTR4_FS_STATUS" }, +#define FATTR4_FS_LAYOUT_TYPE 62 + { FATTR4_FS_LAYOUT_TYPE, "FATTR4_FS_LAYOUT_TYPE" }, +#define FATTR4_LAYOUT_HINT 63 + { FATTR4_LAYOUT_HINT, "FATTR4_LAYOUT_HINT" }, +#define FATTR4_LAYOUT_TYPE 64 + { FATTR4_LAYOUT_TYPE, "FATTR4_LAYOUT_TYPE" }, +#define FATTR4_LAYOUT_BLKSIZE 65 + { FATTR4_LAYOUT_BLKSIZE, "FATTR4_LAYOUT_BLKSIZE" }, +#define FATTR4_LAYOUT_ALIGNMENT 66 + { FATTR4_LAYOUT_ALIGNMENT, "FATTR4_LAYOUT_ALIGNMENT" }, +#define FATTR4_FS_LOCATIONS_INFO 67 + { FATTR4_FS_LOCATIONS_INFO, "FATTR4_FS_LOCATIONS_INFO" }, +#define FATTR4_MDSTHRESHOLD 68 + { FATTR4_MDSTHRESHOLD, "FATTR4_MDSTHRESHOLD" }, +#define FATTR4_RETENTION_GET 69 + { FATTR4_RETENTION_GET, "FATTR4_RETENTION_GET" }, +#define FATTR4_RETENTION_SET 70 + { FATTR4_RETENTION_SET, "FATTR4_RETENTION_SET" }, +#define FATTR4_RETENTEVT_GET 71 + { FATTR4_RETENTEVT_GET, "FATTR4_RETENTEVT_GET" }, +#define FATTR4_RETENTEVT_SET 72 + { FATTR4_RETENTEVT_SET, "FATTR4_RETENTEVT_SET" }, +#define FATTR4_RETENTION_HOLD 73 + { FATTR4_RETENTION_HOLD, "FATTR4_RETENTION_HOLD" }, +#define FATTR4_MODE_SET_MASKED 74 + { FATTR4_MODE_SET_MASKED, "FATTR4_MODE_SET_MASKED" }, +#define FATTR4_SUPPATTR_EXCLCREAT 75 + { FATTR4_SUPPATTR_EXCLCREAT, "FATTR4_SUPPATTR_EXCLCREAT" }, +#define FATTR4_FS_CHARSET_CAP 76 + { FATTR4_FS_CHARSET_CAP, "FATTR4_FS_CHARSET_CAP" }, { 0, NULL } }; @@ -6794,6 +6843,10 @@ dissect_nfs_attributes(tvbuff_t *tvb, in attr_vals_offset = dissect_rpc_uint64(tvb, attr_newftree, hf_nfs_fattr4_mounted_on_fileid, attr_vals_offset); break; + case FATTR4_LAYOUT_BLKSIZE: + attr_vals_offset = dissect_rpc_uint32(tvb, attr_newftree, + hf_nfs_fattr4_layout_blksize, attr_vals_offset); + break; default: break; @@ -6836,6 +6889,22 @@ static const value_string names_open4_sh { OPEN4_SHARE_ACCESS_WRITE, "OPEN4_SHARE_ACCESS_WRITE" }, #define OPEN4_SHARE_ACCESS_BOTH 0x00000003 { OPEN4_SHARE_ACCESS_BOTH, "OPEN4_SHARE_ACCESS_BOTH" }, +#define OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE 0x0000 + { OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE, "OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE" }, +#define OPEN4_SHARE_ACCESS_WANT_READ_DELEG 0x0100 + { OPEN4_SHARE_ACCESS_WANT_READ_DELEG, "OPEN4_SHARE_ACCESS_WANT_READ_DELEG" }, +#define OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG 0x0200 + { OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG, "OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG" }, +#define OPEN4_SHARE_ACCESS_WANT_ANY_DELEG 0x0300 + { OPEN4_SHARE_ACCESS_WANT_ANY_DELEG, "OPEN4_SHARE_ACCESS_WANT_ANY_DELEG" }, +#define OPEN4_SHARE_ACCESS_WANT_NO_DELEG 0x0400 + { OPEN4_SHARE_ACCESS_WANT_NO_DELEG, "OPEN4_SHARE_ACCESS_WANT_NO_DELEG" }, +#define OPEN4_SHARE_ACCESS_WANT_CANCEL 0x0500 + { OPEN4_SHARE_ACCESS_WANT_CANCEL, "OPEN4_SHARE_ACCESS_WANT_CANCEL" }, +#define OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL 0x10000 + { OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL, "OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL"}, +#define OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED 0x20000 + { OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED, "OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED"}, { 0, NULL } }; @@ -6902,12 +6971,18 @@ dissect_nfs_open_claim_delegate_cur4(tvb #define CLAIM_PREVIOUS 1 #define CLAIM_DELEGATE_CUR 2 #define CLAIM_DELEGATE_PREV 3 +#define CLAIM_FH 4 +#define CLAIM_DELEG_CUR_FH 5 +#define CLAIM_DELEG_CUR_PREV_FH 6 static const value_string names_claim_type4[] = { { CLAIM_NULL, "CLAIM_NULL" }, { CLAIM_PREVIOUS, "CLAIM_PREVIOUS" }, { CLAIM_DELEGATE_CUR, "CLAIM_DELEGATE_CUR" }, { CLAIM_DELEGATE_PREV, "CLAIM_DELEGATE_PREV" }, + { CLAIM_FH, "CLAIM_FH" }, + { CLAIM_DELEG_CUR_FH, "CLAIM_DELEG_CUR_FH"}, + { CLAIM_DELEG_CUR_PREV_FH,"CLAIN_DELEG_CUR_PREV_FH"}, { 0, NULL } }; @@ -6956,26 +7031,38 @@ dissect_nfs_open_claim4(tvbuff_t *tvb, i return offset; } +static const value_string names_createmode4[] = { + { UNCHECKED4, "UNCHECKED4" }, + { GUARDED4, "GUARDED4" }, + { EXCLUSIVE4, "EXCLUSIVE4" }, + { EXCLUSIVE4_1, "EXCLUSIVE4_1" }, + { 0, NULL } +}; + static int dissect_nfs_createhow4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint mode; - /* This is intentional; we're using the same flags as NFSv3 */ mode = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint(tree, hf_nfs_createmode3, tvb, offset, 4, mode); + proto_tree_add_uint(tree, hf_nfs_createmode4, tvb, offset, 4, mode); offset += 4; switch(mode) { - case UNCHECKED: /* UNCHECKED4 */ - case GUARDED: /* GUARDED4 */ + case UNCHECKED4: + case GUARDED4: offset = dissect_nfs_fattr4(tvb, offset, pinfo, tree); break; - case EXCLUSIVE: /* EXCLUSIVE4 */ + case EXCLUSIVE4: + offset = dissect_rpc_uint64(tvb, tree, hf_nfs_verifier4, offset); + break; + + case EXCLUSIVE4_1: offset = dissect_rpc_uint64(tvb, tree, hf_nfs_verifier4, offset); + offset = dissect_nfs_fattr4(tvb, offset, pinfo, tree); break; default: @@ -7119,16 +7206,20 @@ static const value_string names_nfsv4_op { NFS4_OP_EXCHANGE_ID, "EXCHANGE_ID" }, { NFS4_OP_CREATE_SESSION, "CREATE_SESSION" }, { NFS4_OP_DESTROY_SESSION, "DESTROY_SESSION" }, - { NFS4_OP_SEQUENCE, "SEQUENCE" }, + { NFS4_OP_FREE_STATEID, "FREE_STATEID"}, + { NFS4_OP_GET_DIR_DELEGATION, "GET_DIR_DELEGATION"}, { NFS4_OP_GETDEVINFO, "GETDEVINFO"}, { NFS4_OP_GETDEVLIST, "GETDEVLIST"}, { NFS4_OP_LAYOUTCOMMIT, "LAYOUTCOMMIT" }, { NFS4_OP_LAYOUTGET, "LAYOUTGET" }, { NFS4_OP_LAYOUTRETURN, "LAYOUTRETURN" }, - { NFS4_OP_NOTIFYDS, "PNFS_NOTIFYDS"}, - { NFS4_OP_PNFS_CREATE, "PNFS_CREATE"}, - { NFS4_OP_PNFS_WRITE, "PNFS_WRITE"}, - { NFS4_OP_PNFS_READ, "PNFS_READ"}, + { NFS4_OP_SECINFO_NO_NAME, "SECINFO_NO_NAME" }, + { NFS4_OP_SEQUENCE, "SEQUENCE" }, + { NFS4_OP_SET_SSV, "SET-SSV"}, + { NFS4_OP_TEST_STATEID, "TEST-STATEID"}, + { NFS4_OP_WANT_DELEGATION, "WANT-DELEG" }, + { NFS4_OP_DESTROY_CLIENTID, "DESTROY-CLIENTID" }, + { NFS4_OP_RECLAIM_COMPLETE, "RECLAIM-COMPLETE" }, { NFS4_OP_ILLEGAL, "ILLEGAL"}, { 0, NULL } }; @@ -7172,28 +7263,25 @@ gint *nfsv4_operation_ett[] = &ett_nfs_verify4 , &ett_nfs_write4, &ett_nfs_release_lockowner4, - NULL, - NULL, + NULL, /* backchannel_ctl */ + NULL, /* bind connection to session */ &ett_nfs_exchange_id4, &ett_nfs_create_session4, &ett_nfs_destroy_session4, - NULL, - NULL, + NULL, /* free stateid */ + NULL, /* get dir delegation */ &ett_nfs_getdevinfo4, &ett_nfs_getdevlist4, &ett_nfs_layoutcommit4, &ett_nfs_layoutget4, &ett_nfs_layoutreturn4, - NULL, + NULL, /* secinfo no name */ &ett_nfs_sequence4, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &ett_nfs_notifyds4, - &ett_nfs_pnfs_create4 + NULL, /* set ssv */ + NULL, /* test stateid */ + NULL, /* want delegation */ + NULL, /* destroy clientid */ + NULL /* reclaim complete*/ }; static int @@ -7556,10 +7644,12 @@ dissect_nfs_open_write_delegation4(tvbuf #define OPEN_DELEGATE_NONE 0 #define OPEN_DELEGATE_READ 1 #define OPEN_DELEGATE_WRITE 2 +#define OPEN_DELEGATE_NONE_EXT 3 /* new to v4.1 */ static const value_string names_open_delegation_type4[] = { { OPEN_DELEGATE_NONE, "OPEN_DELEGATE_NONE" }, { OPEN_DELEGATE_READ, "OPEN_DELEGATE_READ" }, { OPEN_DELEGATE_WRITE, "OPEN_DELEGATE_WRITE" }, + { OPEN_DELEGATE_NONE_EXT, "OPEN_DELEGATE_NONE_EXT"}, { 0, NULL } }; @@ -7715,16 +7805,48 @@ dissect_nfs_layoutreturn4(tvbuff_t *tvb, if (returntype == 1) { /* RETURN_FILE */ offset = dissect_rpc_uint64(tvb, tree, hf_nfs_offset4, offset); offset = dissect_rpc_uint64(tvb, tree, hf_nfs_length4, offset); + offset = dissect_nfs_stateid4(tvb, offset, tree); + offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_lrf_body_content); } return offset; } static int -dissect_nfs_devices4(tvbuff_t *tvb, int offset, proto_tree *tree) +dissect_nfs_layoutreturn_stateid(tvbuff_t *tvb, proto_tree *tree, int offset) { + guint lrs_present; + + lrs_present = tvb_get_ntohl(tvb, offset); + offset = dissect_rpc_bool(tvb, tree, hf_nfs_lrs_present, offset); + + if (lrs_present) { + offset = dissect_nfs_stateid4(tvb, offset, tree); + } + + return offset; +} + +static int +dissect_nfs_notification_bitmap4(tvbuff_t *tvb, proto_tree *tree, int offset) +{ + guint32 bitmap_num; guint i; - guint32 num_devs,num_indices,num_multipath; + + bitmap_num = tvb_get_ntohl(tvb, offset); + offset += 4; + for (i = 0; i < bitmap_num; i++) { + offset = dissect_rpc_uint32(tvb, tree, hf_nfs_notification_bitmap4, offset); + } + + return offset; +} + +static int +dissect_nfs_devices4(tvbuff_t *tvb, int offset, proto_tree *tree) +{ + guint i,j; + guint32 num_indices,num_multipath, num_addr; /* No layout type - argh */ @@ -7737,13 +7859,12 @@ dissect_nfs_devices4(tvbuff_t *tvb, int offset = dissect_rpc_uint32(tvb, tree, hf_nfs_deviceidx4,offset); } - /* disect devices */ - num_devs = tvb_get_ntohl(tvb, offset); + num_multipath = tvb_get_ntohl(tvb, offset); offset += 4; - for (i = 0; i < num_devs; i++) { - num_multipath = tvb_get_ntohl(tvb, offset); + for (i = 0; i < num_multipath; i++) { + num_addr = tvb_get_ntohl(tvb, offset); offset += 4; - for (i = 0; i < num_multipath; i++) { + for (j = 0; j < num_addr; j++) { offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_r_netid); offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_r_addr); } @@ -7756,11 +7877,13 @@ dissect_nfs_devices4(tvbuff_t *tvb, int static int dissect_nfs_deviceaddr4(tvbuff_t *tvb, int offset, proto_tree *tree) { - /* No layout type - argh */ - /* Assume file layout for now */ + /* layout type */ offset = dissect_rpc_uint32(tvb, tree, hf_nfs_layouttype4, offset); + /* skip da_addr_body size */ + offset+=4; + offset = dissect_nfs_devices4(tvb, offset, tree); return offset; @@ -7775,17 +7898,9 @@ dissect_nfs_devicelist4(tvbuff_t *tvb, i count = tvb_get_ntohl(tvb, offset); offset = dissect_rpc_uint32(tvb, tree, hf_nfs_devicenum4, offset); for (i = 0; i < count; i++) { - int opaque_devs, dev_limit; - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_deviceid4, offset); - - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_layouttype4, offset); - - opaque_devs = tvb_get_ntohl(tvb, offset); - offset += 4; - dev_limit = opaque_devs + offset; - while (offset < dev_limit) { - offset = dissect_nfs_devices4(tvb, offset, tree); - } + offset = dissect_rpc_opaque_data(tvb, offset, tree, NULL, + hf_nfs_deviceid4, TRUE, 16, + FALSE, NULL, NULL); } return offset; } @@ -7872,73 +7987,61 @@ dissect_rpc_secparms4(tvbuff_t *tvb, int } static int -dissect_nfs_notifydsargs4(tvbuff_t *tvb, int offset, proto_tree *tree) +dissect_nfs_layout(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + guint layout_type; + guint fh_num; + guint lo_seg_count; + guint i, lo_seg; + proto_item *fitem; + proto_item *fh_fitem; + proto_tree *newtree = NULL; + proto_tree *fh_tree = NULL; - guint op; + lo_seg_count = tvb_get_ntohl(tvb, offset); - op = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_notifydsop4, offset); - switch(op) { - case 0: { /* ADDSTATE */ - guint count, i; - offset = dissect_rpc_uint64(tvb, tree, hf_nfs_clientid4, offset); + fitem = proto_tree_add_text(tree, tvb, offset, 4, + "Layout Segment (count: %u)", lo_seg_count); + offset += 4; - proto_tree_add_text(tree, tvb, offset, 0, "filehandle: %s", - tvb_bytes_to_str(tvb, offset, 16)); - offset += 16; + newtree = proto_item_add_subtree(fitem, ett_nfs_layoutseg); - count = tvb_get_ntohl(tvb, offset); - offset += 4; - for (i = 0; i < count; i++) { - offset = dissect_nfs_stateid4(tvb, offset, tree); - } - break; - } - case 1: { /* DELSTATE */ - guint count, i; - count = tvb_get_ntohl(tvb, offset); - offset += 4; - for (i = 0; i < count; i++) { - offset = dissect_nfs_stateid4(tvb, offset, tree); - } - break; - } - case 2: /* DELCLIENT */ - offset = dissect_rpc_uint64(tvb, tree, hf_nfs_clientid4, offset); - break; - default: - break; - } + for (lo_seg = 0; lo_seg < lo_seg_count; lo_seg++) { + offset = dissect_rpc_uint64(tvb, newtree, hf_nfs_offset4, offset); + offset = dissect_rpc_uint64(tvb, newtree, hf_nfs_length4, offset); - return offset; -} + offset = dissect_rpc_uint32(tvb, newtree, hf_nfs_iomode4, offset); -static int -dissect_nfs_layout(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) -{ - guint layout_type; + layout_type = tvb_get_ntohl(tvb, offset); + offset = dissect_rpc_uint32(tvb, newtree, hf_nfs_layouttype4, offset); - layout_type = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_layouttype4, offset); + /* If not files layout type eat the rest and move on.. */ + if (layout_type != LAYOUT4_NFSV4_1_FILES) { + offset = dissect_nfsdata(tvb, offset, newtree, hf_nfs_layout4); + continue; + } - if (layout_type == 1) { /* NFS Files */ - guint num; - guint i; + /* NFS Files */ offset += 4; /* Skip past opaque count */ - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_deviceid4, offset); - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_util4, offset); - offset = dissect_rpc_uint32(tvb, tree, hf_nfs_first_stripe_idx4, offset); - num = tvb_get_ntohl(tvb, offset); /* Len of dev list */ + offset = dissect_rpc_opaque_data(tvb, offset, newtree, NULL, + hf_nfs_deviceid4, TRUE, 16, FALSE, NULL, NULL); + + offset = dissect_rpc_uint32(tvb, newtree, hf_nfs_nfl_util, offset); + offset = dissect_rpc_uint32(tvb, newtree, hf_nfs_nfl_first_stripe_index, offset); + offset = dissect_rpc_uint64(tvb, newtree, hf_nfs_offset4, offset); + + fh_num = tvb_get_ntohl(tvb, offset); /* Len of FH list */ + + fh_fitem = proto_tree_add_text(newtree, tvb, offset, 4, + "File Handles (count: %u)", fh_num); offset += 4; - for (i = 0; i < num; i++) { - offset = dissect_nfs_fh4(tvb, offset, pinfo, tree, "filehandle"); + + fh_tree = proto_item_add_subtree(fh_fitem, ett_nfs_layoutseg_fh); + for (i = 0; i < fh_num; i++) { + offset = dissect_nfs_fh4(tvb, offset, pinfo, fh_tree, "lo_filehandle"); } - } else { - offset = dissect_nfsdata(tvb, offset, tree, hf_nfs_layout4); } - return offset; } @@ -7979,7 +8082,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of offset += 4; /* the opcodes are not contiguous */ - if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_PNFS_CREATE) && + if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_RECLAIM_COMPLETE) && (opcode != NFS4_OP_ILLEGAL)) break; @@ -8288,6 +8391,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_length4, offset); offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_length4_minlength, offset); + offset = dissect_nfs_stateid4(tvb, offset, newftree); offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_count4_maxcount, offset); break; @@ -8296,9 +8400,9 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_offset4, offset); offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_length4, offset); offset = dissect_rpc_bool(tvb, newftree, hf_nfs_reclaim4, offset); + offset = dissect_nfs_stateid4(tvb, offset, newftree); offset = dissect_nfs_newoffset4(tvb, offset, newftree); offset = dissect_nfs_newtime4(tvb, offset, newftree); - offset = dissect_nfs_newtime4(tvb, offset, newftree); offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_layouttype4, offset); offset = dissect_nfsdata(tvb, offset, newftree, @@ -8314,12 +8418,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of break; case NFS4_OP_GETDEVINFO: - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_deviceid4, - offset); + offset = dissect_rpc_opaque_data(tvb, offset, newftree, NULL, + hf_nfs_deviceid4, TRUE, 16, + FALSE, NULL, NULL); + offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_layouttype4, offset); offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_count4_maxcount, offset); + offset = dissect_nfs_notification_bitmap4(tvb, newftree, offset); break; case NFS4_OP_GETDEVLIST: @@ -8342,14 +8449,6 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of offset = dissect_rpc_bool(tvb, newftree, hf_nfs_cachethis4, offset); break; - case NFS4_OP_NOTIFYDS: - offset = dissect_nfs_notifydsargs4(tvb, offset, newftree); - break; - - case NFS4_OP_PNFS_CREATE: - offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL); - break; - /* In theory, it's possible to get this opcode */ case NFS4_OP_ILLEGAL: break; @@ -8438,7 +8537,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of opcode = tvb_get_ntohl(tvb, offset); /* sanity check for bogus packets */ - if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_PNFS_CREATE) && + if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_RECLAIM_COMPLETE) && (opcode != NFS4_OP_ILLEGAL)) break; @@ -8639,9 +8738,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of case NFS4_OP_LAYOUTGET: offset = dissect_rpc_bool(tvb, newftree, hf_nfs_return_on_close4, offset); - offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_offset4, offset); - offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_length4, offset); - offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_iomode4, offset); + offset = dissect_nfs_stateid4(tvb, offset, newftree); offset = dissect_nfs_layout(tvb, offset, pinfo, newftree); break; @@ -8650,10 +8747,12 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of break; case NFS4_OP_LAYOUTRETURN: + offset = dissect_nfs_layoutreturn_stateid(tvb, newftree, offset); break; case NFS4_OP_GETDEVINFO: offset = dissect_nfs_deviceaddr4(tvb, offset, newftree); + offset = dissect_nfs_notification_bitmap4(tvb, newftree, offset); break; case NFS4_OP_GETDEVLIST: @@ -8677,12 +8776,6 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of offset); break; - case NFS4_OP_NOTIFYDS: - break; - - case NFS4_OP_PNFS_CREATE: - break; - default: break; } @@ -8885,13 +8978,6 @@ static const value_string names_nfs_nfss { 0, NULL } }; -static const value_string notifydsop_names[] = { - { 0, "ADD_STATE" }, - { 1, "DEL_STATE" }, - { 2, "DEL_CLIENT" }, - { 0, NULL } -}; - static const value_string iomode_names[] = { { 1, "IOMODE_READ"}, { 2, "IOMODE_RW"}, @@ -9756,6 +9842,10 @@ proto_register_nfs(void) "fileid", "nfs.fattr4.mounted_on_fileid", FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_nfs_fattr4_layout_blksize, { + "fileid", "nfs.fattr4.layout_blksize", FT_UINT32, BASE_DEC, + NULL, 0, NULL, HFILL }}, + { &hf_nfs_verifier4, { "verifier", "nfs.verifier4", FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -9868,6 +9958,10 @@ proto_register_nfs(void) "owner", "nfs.lock_owner4", FT_BYTES, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nfs_createmode4, { + "Create Mode", "nfs.createmode4", FT_UINT32, BASE_DEC, + VALS(names_createmode4), 0, NULL, HFILL }}, + { &hf_nfs_secinfo_rpcsec_gss_info_service, { "service", "nfs.secinfo.rpcsec_gss_info.service", FT_UINT32, BASE_DEC, VALS(rpc_authgss_svc), 0, NULL, HFILL }}, @@ -10040,6 +10134,10 @@ proto_register_nfs(void) "return type", "nfs.returntype", FT_UINT32, BASE_DEC, VALS(layoutreturn_names), 0, NULL, HFILL }}, + { &hf_nfs_lrf_body_content, { + "lrf_body_content", "nfs.lrf_body_content", FT_BYTES, BASE_HEX, + NULL, 0, NULL, HFILL }}, + { &hf_nfs_iomode4, { "IO mode", "nfs.iomode", FT_UINT32, BASE_DEC, VALS(iomode_names), 0, NULL, HFILL }}, @@ -10060,6 +10158,14 @@ proto_register_nfs(void) "first stripe index", "nfs.stripeindex", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nfs_pattern_offset, { + "layout pattern offset", "nfs.patternoffset", FT_UINT64, BASE_DEC, + NULL, 0, "layout pattern offset", HFILL }}, + + { &hf_nfs_notification_bitmap4, { + "notification bitmap", "nfs.notificationbitmap", FT_UINT32, BASE_DEC, + NULL, 0, "notification bitmap", HFILL }}, + { &hf_nfs_newtime4, { "new time?", "nfs.newtime", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0, NULL, HFILL }}, @@ -10085,8 +10191,8 @@ proto_register_nfs(void) NULL, 0, NULL, HFILL }}, { &hf_nfs_deviceid4, { - "device ID", "nfs.deviceid", FT_UINT32, BASE_DEC, - NULL, 0, NULL, HFILL }}, + "device ID", "nfs.deviceid", FT_BYTES, BASE_HEX, + NULL, 0, "device ID", HFILL }}, { &hf_nfs_devicenum4, { "num devices", "nfs.devicenum4", FT_UINT32, BASE_DEC, @@ -10100,6 +10206,11 @@ proto_register_nfs(void) "layout", "nfs.layout", FT_BYTES, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_nfs_layout_count, { + "layout", "nfs.layoutcount", FT_UINT32, BASE_DEC, + NULL, 0, "layout count", HFILL }}, + + { &hf_nfs_stripedevs4, { "stripe devs", "nfs.stripedevs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -10108,14 +10219,18 @@ proto_register_nfs(void) "device addr", "nfs.devaddr", FT_BYTES, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_nfs_notifydsop4, { - "NotifyDS op", "nfs.notifydsop", FT_UINT32, BASE_DEC, - VALS(notifydsop_names), 0, NULL, HFILL }}, - { &hf_nfs_return_on_close4, { "return on close?", "nfs.retclose4", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0, NULL, HFILL }}, + { &hf_nfs_nfl_util, { + "nfl_util", "nfs.nfl_util", FT_UINT32, BASE_HEX, + NULL, 0, NULL, HFILL }}, + + { &hf_nfs_nfl_first_stripe_index, { + "first stripe to use index", "nfs.nfl_first_stripe_index", FT_UINT32, BASE_DEC, + NULL, 0, NULL, HFILL }}, + { &hf_nfs_slotid4, { "slot ID", "nfs.slotid4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -10237,6 +10352,10 @@ proto_register_nfs(void) "Cache this?", "nfs.cachethis4", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0, NULL, HFILL }}, + { &hf_nfs_lrs_present, { + "Stateid present?", "nfs.lrs_present", FT_BOOLEAN, BASE_NONE, + TFS(&tfs_yes_no), 0, NULL, HFILL }}, + /* Hidden field for v2, v3, and v4 status */ { &hf_nfs_nfsstat, { "Status", "nfs.status", FT_UINT32, BASE_DEC, @@ -10337,8 +10456,6 @@ proto_register_nfs(void) &ett_nfs_layoutreturn4, &ett_nfs_getdevinfo4, &ett_nfs_getdevlist4, - &ett_nfs_notifyds4, - &ett_nfs_pnfs_create4, &ett_nfs_illegal4, &ett_nfs_verifier4, &ett_nfs_opaque, @@ -10393,7 +10510,9 @@ proto_register_nfs(void) &ett_nfs_uid4, &ett_nfs_gid4, &ett_nfs_service4, - &ett_nfs_sessionid4 + &ett_nfs_sessionid4, + &ett_nfs_layoutseg, + &ett_nfs_layoutseg_fh }; module_t *nfs_module; diff -up wireshark-1.0.2/epan/dissectors/packet-nfs.h.orig wireshark-1.0.2/epan/dissectors/packet-nfs.h --- wireshark-1.0.2/epan/dissectors/packet-nfs.h.orig 2008-07-10 13:39:23.000000000 -0400 +++ wireshark-1.0.2/epan/dissectors/packet-nfs.h 2008-07-17 06:42:09.000000000 -0400 @@ -105,19 +105,25 @@ #define NFS4_OP_WRITE 38 #define NFS4_OP_RELEASE_LOCKOWNER 39 /* Minor version 1 */ +#define NFS4_OP_BACKCHANNEL_CTL 40 +#define NFS4_OP_BIND_CONN_TO_SESSION 41 #define NFS4_OP_EXCHANGE_ID 42 #define NFS4_OP_CREATE_SESSION 43 #define NFS4_OP_DESTROY_SESSION 44 +#define NFS4_OP_FREE_STATEID 45 +#define NFS4_OP_GET_DIR_DELEGATION 46 #define NFS4_OP_GETDEVINFO 47 #define NFS4_OP_GETDEVLIST 48 #define NFS4_OP_LAYOUTCOMMIT 49 #define NFS4_OP_LAYOUTGET 50 #define NFS4_OP_LAYOUTRETURN 51 +#define NFS4_OP_SECINFO_NO_NAME 52 #define NFS4_OP_SEQUENCE 53 -#define NFS4_OP_NOTIFYDS 60 -#define NFS4_OP_PNFS_CREATE 61 -#define NFS4_OP_PNFS_WRITE 62 -#define NFS4_OP_PNFS_READ 63 +#define NFS4_OP_SET_SSV 54 +#define NFS4_OP_TEST_STATEID 55 +#define NFS4_OP_WANT_DELEGATION 56 +#define NFS4_OP_DESTROY_CLIENTID 57 +#define NFS4_OP_RECLAIM_COMPLETE 58 #define NFS4_OP_ILLEGAL 10044 @@ -131,6 +137,17 @@ #define GUARDED 1 #define EXCLUSIVE 2 +/* for create4 */ +#define UNCHECKED4 0 +#define GUARDED4 1 +#define EXCLUSIVE4 2 +#define EXCLUSIVE4_1 3 + +/* pNFS layout types */ +#define LAYOUT4_NFSV4_1_FILES 1 +#define LAYOUT4_OSD2_OBJECTS 2 +#define LAYOUT4_BLOCK_VOLUME 3 + extern gboolean nfs_file_name_snooping; extern int dissect_fhandle(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, wireshark-rpc-pdu-size.patch: --- NEW FILE wireshark-rpc-pdu-size.patch --- commit 43dfeabc693fb4f4f39378291c4c81ba19b09351 Author: J. Bruce Fields Date: Tue Jul 8 17:19:49 2008 -0400 Use large default max_rpc_tcp_pdu_size setting The linux server will do up to 1M these days, so the current default is very likely to discard all reads and writes from such a server. Thanks to Jim Rees for catching this. diff -up wireshark-1.0.2/epan/dissectors/packet-rpc.c.orig wireshark-1.0.2/epan/dissectors/packet-rpc.c --- wireshark-1.0.2/epan/dissectors/packet-rpc.c.orig 2008-07-10 13:39:24.000000000 -0400 +++ wireshark-1.0.2/epan/dissectors/packet-rpc.c 2008-07-17 06:55:49.000000000 -0400 @@ -257,7 +257,7 @@ static dissector_handle_t rpc_handle; static dissector_handle_t gssapi_handle; static dissector_handle_t data_handle; -static guint max_rpc_tcp_pdu_size = 262144; +static guint max_rpc_tcp_pdu_size = 16 * 1024 * 1024; static const fragment_items rpc_frag_items = { &ett_rpc_fragment, Index: wireshark.spec =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- wireshark.spec 11 Jul 2008 07:37:01 -0000 1.37 +++ wireshark.spec 18 Jul 2008 12:12:46 -0000 1.38 @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Group: Applications/Internet %if %{svn_version} @@ -20,6 +20,11 @@ Patch1: wireshark-0.99.7-pie.patch Patch3: wireshark-nfsv4-opts.patch Patch4: wireshark-0.99.7-path.patch +Patch5: wireshark-nfsv41.patch +Patch6: wireshark-nfsv41-layout-types.patch +Patch7: wireshark-nfsv41-layout-updates.patch +Patch8: wireshark-rpc-pdu-size.patch + Url: http://www.wireshark.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap-devel >= 0.9 @@ -76,6 +81,10 @@ %patch1 -p1 -b .pie %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build %ifarch s390 s390x sparcv9 sparc64 @@ -201,6 +210,9 @@ %changelog +* Thu Jul 17 2008 Steve Dickson +- Added patches to support NFSv4.1 + * Fri Jul 11 2008 Radek Vok??l 1.0.2-1 - upgrade to 1.0.2 From fedora-extras-commits at redhat.com Fri Jul 18 12:13:46 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Fri, 18 Jul 2008 12:13:46 GMT Subject: rpms/cups/devel cups-lspp.patch,1.33,1.34 cups.spec,1.427,1.428 Message-ID: <200807181213.m6ICDkKC016875@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16764 Modified Files: cups-lspp.patch cups.spec Log Message: * Fri Jul 18 2008 Tim Waugh - Removed autoconf requirement by applying autoconf-generated changes to patches that caused them. Affected patches: cups-lspp. cups-lspp.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.33 -r 1.34 cups-lspp.patch Index: cups-lspp.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- cups-lspp.patch 1 Jul 2008 11:34:31 -0000 1.33 +++ cups-lspp.patch 18 Jul 2008 12:12:59 -0000 1.34 @@ -1,5 +1,549 @@ ---- cups-1.3.7/cups/cups.h.lspp 2008-02-20 00:32:58.000000000 +0000 -+++ cups-1.3.7/cups/cups.h 2008-05-30 16:59:10.000000000 +0100 +diff -up cups-1.3.7/config.h.in.lspp cups-1.3.7/config.h.in +--- cups-1.3.7/config.h.in.lspp 2008-01-07 18:26:57.000000000 +0000 ++++ cups-1.3.7/config.h.in 2008-07-18 13:06:51.000000000 +0100 +@@ -530,6 +530,13 @@ + #undef HAVE_REMOVEFILE + + ++/* ++ * Are we trying to meet LSPP requirements? ++ */ ++ ++#undef WITH_LSPP ++ ++ + #endif /* !_CUPS_CONFIG_H_ */ + + /* +diff -up /dev/null cups-1.3.7/config-scripts/cups-lspp.m4 +--- /dev/null 2008-07-18 08:54:40.909125715 +0100 ++++ cups-1.3.7/config-scripts/cups-lspp.m4 2008-07-18 13:06:51.000000000 +0100 +@@ -0,0 +1,36 @@ ++dnl ++dnl LSPP code for the Common UNIX Printing System (CUPS). ++dnl ++dnl Copyright 2005-2006 by Hewlett-Packard Development Company, L.P. ++dnl ++dnl This program is free software; you can redistribute it and/or modify ++dnl it under the terms of the GNU General Public License as published by ++dnl the Free Software Foundation; version 2. ++dnl ++dnl This program is distributed in the hope that it will be useful, but ++dnl WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU General Public License ++dnl along with this program; if not, write to the Free Software Foundation, ++dnl Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA ++dnl ++ ++dnl Are we trying to meet LSPP requirements ++AC_ARG_ENABLE(lspp, [ --enable-lspp turn on auditing and label support, default=no]) ++ ++if test x"$enable_lspp" != xno; then ++ case "$uname" in ++ Linux) ++ AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)]) ++ AC_CHECK_HEADER(libaudit.h) ++ AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)]) ++ AC_CHECK_HEADER(selinux/selinux.h) ++ AC_DEFINE(WITH_LSPP) ++ ;; ++ *) ++ # All others ++ ;; ++ esac ++fi +diff -up cups-1.3.7/configure.in.lspp cups-1.3.7/configure.in +--- cups-1.3.7/configure.in.lspp 2007-07-25 00:47:12.000000000 +0100 ++++ cups-1.3.7/configure.in 2008-07-18 13:06:51.000000000 +0100 +@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) + sinclude(config-scripts/cups-pdf.m4) + sinclude(config-scripts/cups-scripting.m4) + ++sinclude(config-scripts/cups-lspp.m4) ++ + INSTALL_LANGUAGES="" + UNINSTALL_LANGUAGES="" + LANGFILES="" +diff -up cups-1.3.7/configure.lspp cups-1.3.7/configure +--- cups-1.3.7/configure.lspp 2008-07-18 13:07:30.000000000 +0100 ++++ cups-1.3.7/configure 2008-07-18 13:07:35.000000000 +0100 +@@ -806,6 +806,8 @@ PHP + PHPCONFIG + PHPDIR + PYTHON ++LIBAUDIT ++LIBSELINUX + INSTALL_LANGUAGES + UNINSTALL_LANGUAGES + LIBOBJS +@@ -1429,6 +1431,7 @@ Optional Features: + enable UseNetworkDefault by default, default=auto + --enable-raw-printing enable raw printing by default, default=auto + --enable-pdftops build pdftops filter, default=auto ++ --enable-lspp turn on auditing and label support, default=no + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -9647,10 +9650,10 @@ case "$uname" in + ;; + Linux* | GNU*) + # Linux and GNU Hurd +- MAN1EXT=1.gz +- MAN5EXT=5.gz +- MAN7EXT=7.gz +- MAN8EXT=8.gz ++ MAN1EXT=1 ++ MAN5EXT=5 ++ MAN7EXT=7 ++ MAN8EXT=8 + MAN8DIR=8 + ;; + *) +@@ -18413,6 +18416,412 @@ fi + + + ++ ++# Check whether --enable-lspp was given. ++if test "${enable_lspp+set}" = set; then ++ enableval=$enable_lspp; ++fi ++ ++ ++if test x"$enable_lspp" != xno; then ++ case "$uname" in ++ Linux) ++ { echo "$as_me:$LINENO: checking for audit_log_user_message in -laudit" >&5 ++echo $ECHO_N "checking for audit_log_user_message in -laudit... $ECHO_C" >&6; } ++if test "${ac_cv_lib_audit_audit_log_user_message+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-laudit $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char audit_log_user_message (); ++int ++main () ++{ ++return audit_log_user_message (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_lib_audit_audit_log_user_message=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_audit_audit_log_user_message=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_audit_audit_log_user_message" >&5 ++echo "${ECHO_T}$ac_cv_lib_audit_audit_log_user_message" >&6; } ++if test $ac_cv_lib_audit_audit_log_user_message = yes; then ++ LIBAUDIT="-laudit" ++fi ++ ++ if test "${ac_cv_header_libaudit_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for libaudit.h" >&5 ++echo $ECHO_N "checking for libaudit.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_libaudit_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi [...4816 lines suppressed...] ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + -+ % Job information text... -+ mediumFont setfont % Medium sized font + /* + * Include necessary headers... + */ +@@ -73,6 +75,9 @@ + # include + #endif /* __APPLE__ && HAVE_DLFCN_H */ + ++#ifdef WITH_LSPP ++# include ++#endif /* WITH_LSPP */ + + /* + * Local functions... +@@ -154,6 +159,9 @@ main(int argc, /* I - Number of comm + int launchd_idle_exit; + /* Idle exit on select timeout? */ + #endif /* HAVE_LAUNCHD */ ++#if WITH_LSPP ++ auditfail_t failmode; /* Action for audit_open failure */ ++#endif /* WITH_LSPP */ + + + #ifdef HAVE_GETEUID +@@ -413,6 +421,25 @@ main(int argc, /* I - Number of comm + #endif /* DEBUG */ + } + ++#ifdef WITH_LSPP ++ if ((AuditLog = audit_open()) < 0 ) ++ { ++ if (get_auditfail_action(&failmode) == 0) ++ { ++ if (failmode == FAIL_LOG) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to connect to audit subsystem."); ++ AuditLog = -1; ++ } ++ else if (failmode == FAIL_TERMINATE) ++ { ++ fprintf(stderr, "cupsd: unable to start auditing, terminating"); ++ return -1; ++ } ++ } ++ } ++#endif /* WITH_LSPP */ + -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 5 mul add % y += 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Job ID: ) RIGHT -+ moveto -+ ({printer-name}-{job-id}) show + /* + * Set the timezone info... + */ +@@ -1160,6 +1187,11 @@ main(int argc, /* I - Number of comm + + cupsdStopSelect(); + ++#ifdef WITH_LSPP ++ if (AuditLog != -1) ++ audit_close(AuditLog); ++#endif /* WITH_LSPP */ + -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 2 mul add % y += 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Title: ) RIGHT -+ moveto -+ ({job-name}) show + return (!stop_scheduler); + } + +diff -up cups-1.3.7/scheduler/printers.c.lspp cups-1.3.7/scheduler/printers.c +--- cups-1.3.7/scheduler/printers.c.lspp 2008-07-18 13:06:51.000000000 +0100 ++++ cups-1.3.7/scheduler/printers.c 2008-07-18 13:06:51.000000000 +0100 +@@ -51,6 +51,8 @@ + * printing desktop tools. + */ + ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -1 mul add % y -= 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Requesting User: ) RIGHT -+ moveto -+ ({job-originating-user-name}) show + /* + * Include necessary headers... + */ +@@ -74,6 +76,10 @@ static void write_irix_config(cupsd_prin + static void write_irix_state(cupsd_printer_t *p); + #endif /* __sgi */ + ++#ifdef WITH_LSPP ++# include ++# include ++#endif /* WITH_LSPP */ + + /* + * 'cupsdAddPrinter()' - Add a printer to the system. +@@ -1817,6 +1823,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) + { /* No authentication */ + "none" + }; ++#ifdef WITH_LSPP ++ char *audit_message; /* Audit message string */ ++ char *printerfile; /* Path to a local printer dev */ ++ char *rangestr; /* Printer's range if its available */ ++ security_context_t devcon; /* Printer SELinux context */ ++ context_t printercon; /* context_t for the printer */ ++#endif /* WITH_LSPP */ + + + DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, +@@ -1960,6 +1973,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) + attr->values[1].string.text = _cupsStrAlloc(Classification ? + Classification : p->job_sheets[1]); + } ++#ifdef WITH_LSPP ++ if (AuditLog != -1) ++ { ++ char uri[HTTP_MAX_URI]; ++ audit_message = NULL; ++ rangestr = NULL; ++ printercon = 0; ++ printerfile = strstr(p->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) ++ printerfile = strdup(p->device_uri + strlen("file:/")); + -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -4 mul add % y -= 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Billing Info: ) RIGHT -+ moveto -+ ({?job-billing}) show ++ if (printerfile != NULL) ++ { ++ if (getfilecon(printerfile, &devcon) == -1) ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context"); ++ else ++ { ++ printercon = context_new(devcon); ++ freecon(devcon); ++ } ++ } + -+ % Then the CUPS logo.... -+ gsave -+ pageWidth 4 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 9 mul CUPSLOGO -+ grestore ++ if (printercon && context_range_get(printercon)) ++ rangestr = strdup(context_range_get(printercon)); ++ else ++ rangestr = strdup("unknown"); + -+ % And the ESP logo.... -+ gsave -+ pageWidth 59 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 6 mul ESPLOGO -+ grestore -+% Show the page... -+grestore -+showpage -+% -+% End of "$Id$". -+% -+%%EOF ++ cupsdSanitizeURI(p->device_uri, uri, sizeof(uri)); ++ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", ++ p->name, uri, p->job_sheets[0], p->job_sheets[1], rangestr); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ if (printercon) ++ context_free(printercon); ++ free(rangestr); ++ cupsdClearString(&audit_message); ++ } ++#endif /* WITH_LSPP */ + } + + p->raw = 0; Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.427 retrieving revision 1.428 diff -u -r1.427 -r1.428 --- cups.spec 15 Jul 2008 12:56:56 -0000 1.427 +++ cups.spec 18 Jul 2008 12:12:59 -0000 1.428 @@ -80,7 +80,6 @@ BuildRequires: libtiff-devel BuildRequires: krb5-devel BuildRequires: avahi-compat-libdns_sd-devel -BuildRequires: autoconf %if %lspp BuildPrereq: libselinux-devel >= 1.23 @@ -179,7 +178,6 @@ %endif sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in -autoconf cp %{SOURCE5} cups-lpd.real perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real @@ -447,6 +445,10 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Jul 18 2008 Tim Waugh +- Removed autoconf requirement by applying autoconf-generated changes + to patches that caused them. Affected patches: cups-lspp. + * Tue Jul 15 2008 Tim Waugh 1:1.3.7-13 - CVE-2008-1373 patch is no longer needed (applied upstream). - Mark HTML files and templates config(noreplace) for site-local From fedora-extras-commits at redhat.com Fri Jul 18 12:16:28 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 18 Jul 2008 12:16:28 GMT Subject: rpms/perl-Class-MethodMaker/F-9 perl-Class-MethodMaker.spec, 1.13, 1.14 Message-ID: <200807181216.m6ICGSh2016981@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16938 Modified Files: perl-Class-MethodMaker.spec Log Message: * Fri Jul 18 2008 Ralf Cors??pius - 2.10-4 - Remove %clean ||: (BZ 449442, FTBFS). - Use %version in Source0-URL. - Don't skip 0-signature.t. - Misc. minor spec-file overhaul. Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9/perl-Class-MethodMaker.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Class-MethodMaker.spec 2 Mar 2008 15:51:28 -0000 1.13 +++ perl-Class-MethodMaker.spec 18 Jul 2008 12:15:30 -0000 1.14 @@ -1,19 +1,18 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-Class-MethodMaker Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module for creating generic object-oriented methods Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/~schwigon/Class-MethodMaker/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.10.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(IPC::Run) BuildRequires: perl(ExtUtils::MakeMaker) +# Required by the tests +BuildRequires: perl(IPC::Run) + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -25,9 +24,8 @@ %setup -q -n Class-MethodMaker-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -37,8 +35,7 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : -mv t/0-signature.t t/0-signature.t.skip +%check make test %clean @@ -53,6 +50,12 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 18 2008 Ralf Cors??pius - 2.10-4 +- Remove %%clean ||: (BZ 449442, FTBFS). +- Use %%version in Source0-URL. +- Don't skip 0-signature.t. +- Misc. minor spec-file overhaul. + * Wed Feb 27 2008 Tom "spot" Callaway - 2.10-3 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Fri Jul 18 12:17:35 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 18 Jul 2008 12:17:35 GMT Subject: rpms/ekg2/devel ekg2.spec,1.16,1.17 Message-ID: <200807181217.m6ICHZ7E017122@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ekg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17068 Modified Files: ekg2.spec Log Message: rebuild for new gpm Index: ekg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ekg2.spec 12 Jul 2008 13:16:24 -0000 1.16 +++ ekg2.spec 18 Jul 2008 12:16:50 -0000 1.17 @@ -5,7 +5,7 @@ Summary(pl): Wieloprotoko??owy komunikator internetowy Name: ekg2 Version: 0.2 -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} License: GPLv2 Group: Applications/Internet Source0: http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz @@ -357,6 +357,9 @@ %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so %changelog +* Fri Jul 18 2008 Caol??n McNamara 0.2-0.4.rc1 +- rebuild for new gpm + * Sat Jul 12 2008 Dominik Mierzejewski 0.2-0.3.rc1 - fix compilation with >=gtk-2.13 - add missing defattr From fedora-extras-commits at redhat.com Fri Jul 18 12:21:40 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 18 Jul 2008 12:21:40 GMT Subject: rpms/docbook-simple/devel docbook-simple.spec,1.9,1.10 Message-ID: <200807181221.m6ICLelx017220@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17190 Modified Files: docbook-simple.spec Log Message: fix loop in post catalog registration(incomplete sed coverage) - #455680, fix several issues in postun causing troubles for updates Index: docbook-simple.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-simple/devel/docbook-simple.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- docbook-simple.spec 5 Nov 2007 17:12:50 -0000 1.9 +++ docbook-simple.spec 18 Jul 2008 12:20:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: docbook-simple Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Text Summary: Simplified DocBook is a small subset of the DocBook XML DTD License: Freely redistributable without restriction @@ -41,17 +41,17 @@ ########## install versioned-numbered directory of dtd files ############ -DESTDIR=$RPM_BUILD_ROOT/usr/share/xml/docbook/simple +DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/simple mkdir -p $DESTDIR cp -a ../%{version} $DESTDIR ########## install package catalogs ################ -XML_CAT_DIR=$RPM_BUILD_ROOT/etc/xml +XML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/xml mkdir -p $XML_CAT_DIR install -p -m 644 %{SOURCE2} $XML_CAT_DIR -SGML_CAT_DIR=$RPM_BUILD_ROOT/etc/sgml +SGML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/sgml mkdir -p $SGML_CAT_DIR install -p -m 644 %{SOURCE3} $SGML_CAT_DIR @@ -68,8 +68,9 @@ %defattr (-,root,root,-) %doc sdocbook.css %doc README.fedora +%dir %{_datadir}/xml/docbook/simple/ %{_datadir}/xml/docbook/simple/%{version} -%config(noreplace) %{_sysconfdir}/sgml/docbook-simple.cat +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-simple.cat %config(noreplace) %{_sysconfdir}/xml/docbook-simple.xml @@ -122,11 +123,12 @@ # "/etc/sgml/docbook-simple.cat" install-catalog --add \ - $PKG_SGML_CATALOG \ - $ROOT_SGML_CATALOG 1>/dev/null + "$PKG_SGML_CATALOG" \ + "$ROOT_SGML_CATALOG" 1>/dev/null # Hack to workaround bug in install-catalog - sed -i 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log\"$/d' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log$/d' $PKG_SGML_CATALOG fi #################################################################### @@ -143,31 +145,24 @@ ## Jobs: remove package catalog entries from both root catalogs & ## remove package catalogs -##### SGML catalogs ##### - -## Remove package catalog entry from SGML root catalog -%{_bindir}/xmlcatalog --sgml --noout --del \ - %{_sysconfdir}/sgml/catalog \ - "%{_sysconfdir}/sgml/docbook-simple.cat" - -## Remove SGML package catalog -rm -f %{_sysconfdir}/sgml/docbook-simple.cat - - -##### XML catalogs ##### - -## Remove package catalog entry from XML root catalog -%{_bindir}/xmlcatalog --noout --del \ - "file://%{_sysconfdir}/xml/docbook-simple.xml" \ - %{_sysconfdir}/xml/catalog - -## Remove XML package catalog -rm -f %{_sysconfdir}/sgml/docbook-simple.xml - -## Remove dtd directory -rm -rf %{_datadir}/xml/docbook/simple +# remove catalog entries only on removal of package +if [ "$1" = 0 ]; then + %{_bindir}/xmlcatalog --sgml --noout --del \ + %{_sysconfdir}/sgml/catalog \ + %{_sysconfdir}/sgml/docbook-simple.cat + + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_sysconfdir}/xml/docbook-simple.xml" \ + %{_sysconfdir}/xml/catalog +fi %changelog +* Fri Jul 18 2008 Ondrej Vasik - 1.1-4 +- fix loop in post catalog registration(incomplete sed + coverage) #455680 +- fix broken catalogs for package updates +- fix removal of files during updates + * Mon Nov 05 2007 Ondrej Vasik - 1.1-3 - merge review(#225701) - spec modified to follow guidelines From fedora-extras-commits at redhat.com Fri Jul 18 12:25:30 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 12:25:30 GMT Subject: rpms/vim/devel xxd-locale.patch,1.1,1.2 Message-ID: <200807181225.m6ICPUsd017434@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17382 Modified Files: xxd-locale.patch Log Message: - modify patch for new rpm fuzz=0 xxd-locale.patch: Index: xxd-locale.patch =================================================================== RCS file: /cvs/extras/rpms/vim/devel/xxd-locale.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xxd-locale.patch 9 Sep 2004 13:58:58 -0000 1.1 +++ xxd-locale.patch 18 Jul 2008 12:24:46 -0000 1.2 @@ -1,14 +1,15 @@ ---- vim60ag/src/xxd/xxd.c.37073 Mon May 21 16:17:29 2001 -+++ vim60ag/src/xxd/xxd.c Mon May 21 16:32:12 2001 -@@ -81,6 +81,7 @@ +diff -up vim71/src/xxd/xxd.c.xxd vim71/src/xxd/xxd.c +--- vim71/src/xxd/xxd.c.xxd 2008-07-18 14:21:03.000000000 +0200 ++++ vim71/src/xxd/xxd.c 2008-07-18 14:23:48.000000000 +0200 +@@ -90,6 +90,7 @@ #if __MWERKS__ && !defined(BEBOX) # include /* for fdopen() on MAC */ #endif +#include - /* This corrects the problem of missing prototypes for certain functions - * in some GNU installations (e.g. SunOS 4.1.x). -@@ -424,6 +425,11 @@ + #if defined(__BORLANDC__) && __BORLANDC__ <= 0x0410 && !defined(fileno) + /* Missing define and prototype grabbed from the BC 4.0 */ +@@ -452,6 +453,11 @@ char *argv[]; long length = -1, n = 0, seekoff = 0; char l[LLEN+1]; char *pname, *pp; @@ -16,16 +17,16 @@ + if(!lang) lang=getenv("LC_ALL"); + if(!lang) lang=getenv("LC_CTYPE"); + if(lang) -+ setlocale(LC_ALL, lang); ++ setlocale(LC_ALL, lang); #ifdef AMIGA /* This program doesn't work when started from the Workbench */ -@@ -728,7 +734,7 @@ +@@ -756,7 +762,7 @@ char *argv[]; #else (e > 31 && e < 127) #endif - ? e : '.'; + ? e : isalnum(e) ? e : '.'; if (e) - nonzero++; + nonzero++; n++; From fedora-extras-commits at redhat.com Fri Jul 18 12:29:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Fri, 18 Jul 2008 12:29:18 GMT Subject: rpms/wireshark/F-8 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 wireshark.spec, 1.26, 1.27 Message-ID: <200807181229.m6ICTImi017690@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/wireshark/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17583 Modified Files: .cvsignore sources wireshark.spec Log Message: - upgrade to 1.0.2, fixes a few security issues Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wireshark/F-8/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 3 Apr 2008 05:56:36 -0000 1.16 +++ .cvsignore 18 Jul 2008 12:28:29 -0000 1.17 @@ -1 +1 @@ -wireshark-1.0.0.tar.bz2 +wireshark-1.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wireshark/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 3 Apr 2008 05:56:36 -0000 1.16 +++ sources 18 Jul 2008 12:28:29 -0000 1.17 @@ -1 +1 @@ -90e58c595f082da3ad9390d714f16116 wireshark-1.0.0.tar.bz2 +6045048aa8645d54d1a06bb20e0d23a3 wireshark-1.0.2.tar.gz Index: wireshark.spec =================================================================== RCS file: /cvs/extras/rpms/wireshark/F-8/wireshark.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- wireshark.spec 3 Apr 2008 05:56:36 -0000 1.26 +++ wireshark.spec 18 Jul 2008 12:28:29 -0000 1.27 @@ -5,14 +5,14 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.0.0 +Version: 1.0.2 Release: 1%{?dist} License: GPL+ Group: Applications/Internet %if %{svn_version} Source0: http://wireshark.org/download/prerelease/%{name}-%{version}-SVN-%{svn_version}.tar.gz %else -Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 +Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.gz %endif Source1: wireshark.pam Source2: wireshark.console @@ -201,6 +201,9 @@ %changelog +* Fri Jul 18 2008 Radek Vok??l 1.0.2-1 +- upgrade to 1.0.2, fixes a few security issues + * Thu Apr 3 2008 Radek Vok??l 1.0.0-1 - upgrade to 1.0.0 From fedora-extras-commits at redhat.com Fri Jul 18 12:43:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Fri, 18 Jul 2008 12:43:44 GMT Subject: rpms/wireshark/devel wireshark-1.0.2-pie.patch, NONE, 1.1 wireshark.spec, 1.38, 1.39 wireshark-0.99.7-pie.patch, 1.1, NONE Message-ID: <200807181243.m6IChiG7018139@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/wireshark/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18107 Modified Files: wireshark.spec Added Files: wireshark-1.0.2-pie.patch Removed Files: wireshark-0.99.7-pie.patch Log Message: fix pie patch wireshark-1.0.2-pie.patch: --- NEW FILE wireshark-1.0.2-pie.patch --- diff -up wireshark-1.0.2/gtk/Makefile.in.pie wireshark-1.0.2/gtk/Makefile.in --- wireshark-1.0.2/gtk/Makefile.in.pie 2008-07-10 19:39:52.000000000 +0200 +++ wireshark-1.0.2/gtk/Makefile.in 2008-07-18 14:39:30.000000000 +0200 @@ -1009,14 +1009,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wsp_stat.Po at am__quote@ .c.o: - at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: - at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ diff -up wireshark-1.0.2/Makefile.in.pie wireshark-1.0.2/Makefile.in --- wireshark-1.0.2/Makefile.in.pie 2008-07-10 19:39:55.000000000 +0200 +++ wireshark-1.0.2/Makefile.in 2008-07-18 14:39:30.000000000 +0200 @@ -1037,7 +1037,7 @@ noinst_HEADERS = \ wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \ @STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@ - at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic + at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie @ENABLE_STATIC_TRUE at wireshark_LDFLAGS = -Wl,-static -all-static # Libraries and plugin flags with which to link wireshark. @@ -1069,7 +1069,7 @@ wireshark_DEPENDENCIES = \ @INET_PTON_LO@ \ @INET_NTOP_LO@ - at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic + at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie @ENABLE_STATIC_TRUE at tshark_LDFLAGS = -Wl,-static -all-static # Libraries and plugin flags with which to link tshark. @@ -1743,14 +1743,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version_info.Po at am__quote@ .c.o: - at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: - at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + at am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ Index: wireshark.spec =================================================================== RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- wireshark.spec 18 Jul 2008 12:12:46 -0000 1.38 +++ wireshark.spec 18 Jul 2008 12:42:56 -0000 1.39 @@ -17,7 +17,7 @@ Source1: wireshark.pam Source2: wireshark.console Source3: wireshark.desktop -Patch1: wireshark-0.99.7-pie.patch +Patch1: wireshark-1.0.2-pie.patch Patch3: wireshark-nfsv4-opts.patch Patch4: wireshark-0.99.7-path.patch Patch5: wireshark-nfsv41.patch --- wireshark-0.99.7-pie.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 12:53:21 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Fri, 18 Jul 2008 12:53:21 GMT Subject: rpms/docbook-slides/devel docbook-slides.spec,1.9,1.10 Message-ID: <200807181253.m6ICrLj7018446@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-slides/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18400 Modified Files: docbook-slides.spec Log Message: fix loop in post catalog registration(incomplete sed coverage) - #455680, fix several issues in postun causing troubles for updates Index: docbook-slides.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-slides/devel/docbook-slides.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- docbook-slides.spec 14 Nov 2007 09:19:48 -0000 1.9 +++ docbook-slides.spec 18 Jul 2008 12:52:36 -0000 1.10 @@ -2,7 +2,7 @@ Summary: DocBook Slides document type and stylesheets Name: docbook-slides Version: 3.4.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Text URL: http://sourceforge.net/projects/docbook @@ -68,8 +68,9 @@ %doc README %doc NEWS %doc README.fedora +%dir %{_datadir}/xml/docbook/slides/ %{_datadir}/xml/docbook/slides/%{version} -%config(noreplace) %{_sysconfdir}/sgml/docbook-slides.cat +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-slides.cat %config(noreplace) %{_sysconfdir}/xml/docbook-slides.xml @@ -123,7 +124,8 @@ $ROOT_SGML_CATALOG 1>/dev/null # Hack to workaround bug in install-catalog - sed -i 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log\"$/d' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log$/d' $PKG_SGML_CATALOG fi #################################################################### @@ -139,32 +141,24 @@ ## Jobs: remove package catalog entries from both root catalogs & ## remove package catalogs -##### SGML catalogs ##### - -## Remove package catalog entry from SGML root catalog -%{_bindir}/xmlcatalog --sgml --noout --del \ - %{_sysconfdir}/sgml/catalog \ - "%{_sysconfdir}/sgml/docbook-slides.cat" +# remove catalog entries only on removal of package +if [ "$1" = 0 ]; then + %{_bindir}/xmlcatalog --sgml --noout --del \ + %{_sysconfdir}/sgml/catalog \ + "%{_sysconfdir}/sgml/docbook-slides.cat" -## Remove SGML package catalog -rm -f %{_sysconfdir}/sgml/docbook-slides.cat - - -##### XML catalogs ##### - -## Remove package catalog entry from XML root catalog -%{_bindir}/xmlcatalog --noout --del \ - "file://%{_sysconfdir}/xml/docbook-slides.xml" \ - %{_sysconfdir}/xml/catalog - -## Remove XML package catalog -rm -f %{_sysconfdir}/sgml/docbook-slides.xml - -## Remove dtd directory -rm -rf %{_datadir}/xml/docbook/slides - + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_sysconfdir}/xml/docbook-slides.xml" \ + %{_sysconfdir}/xml/catalog +fi %changelog +* Fri Jul 18 2008 Ondrej Vasik - 3.4.0-4 +- fix loop in post catalog registration(incomplete sed + coverage) #455680 +- fix broken catalogs for package updates +- fix removal of files during updates + * Tue Nov 06 2007 Ondrej Vasik - 3.4.0-3 - merge review(#225702) - spec file changed to follow guidelines From fedora-extras-commits at redhat.com Fri Jul 18 12:55:03 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 18 Jul 2008 12:55:03 GMT Subject: rpms/gnomesword/F-8 gnomesword.spec,1.42,1.43 Message-ID: <200807181255.m6ICt3Mv018524@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483 Modified Files: gnomesword.spec Log Message: * Fri Jul 18 2008 Deji Akingunola - 2.3.5-2 - Rebuild for firefox-2.0.0.16 Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-8/gnomesword.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gnomesword.spec 3 Jul 2008 05:21:12 -0000 1.42 +++ gnomesword.spec 18 Jul 2008 12:54:15 -0000 1.43 @@ -1,6 +1,6 @@ Name: gnomesword Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text @@ -75,6 +75,9 @@ %_datadir/gnome/help/gnomesword/ %changelog +* Fri Jul 18 2008 Deji Akingunola - 2.3.5-2 +- Rebuild for firefox-2.0.0.16 + * Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 - Update to 2.3.5 From fedora-extras-commits at redhat.com Fri Jul 18 12:55:43 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 18 Jul 2008 12:55:43 GMT Subject: rpms/at/devel at.spec,1.65,1.66 atd.init,1.7,1.8 Message-ID: <200807181255.m6ICth0F018599@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/at/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18519 Modified Files: at.spec atd.init Log Message: * Fri Jul 18 2008 Marcela Maslanova - 3.1.10-24 - 446004 hope adding || into scriptlets fix removing old package after upgrade Index: at.spec =================================================================== RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- at.spec 25 Mar 2008 14:00:46 -0000 1.65 +++ at.spec 18 Jul 2008 12:55:00 -0000 1.66 @@ -6,7 +6,7 @@ Summary: Job spooling tools Name: at Version: 3.1.10 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://ftp.debian.org/debian/pool/main/a/at @@ -159,13 +159,13 @@ %preun if [ "$1" = 0 ] ; then - /sbin/service atd stop >/dev/null 2>&1 + /sbin/service atd stop >/dev/null 2>&1 ||: /sbin/chkconfig --del atd fi %postun if [ "$1" -ge "1" ]; then - /sbin/service atd condrestart >/dev/null 2>&1 + /sbin/service atd condrestart >/dev/null 2>&1 ||: fi %files @@ -187,6 +187,9 @@ %attr(4755,root,root) %{_bindir}/at %changelog +* Fri Jul 18 2008 Marcela Maslanova - 3.1.10-24 +- 446004 hope adding || into scriptlets fix removing old package after upgrade + * Tue Mar 25 2008 Marcela Maslanova - 3.1.10-23 - 436952 use local instead of posix output date/time format. Index: atd.init =================================================================== RCS file: /cvs/pkgs/rpms/at/devel/atd.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- atd.init 28 Feb 2008 09:34:57 -0000 1.7 +++ atd.init 18 Jul 2008 12:55:00 -0000 1.8 @@ -26,7 +26,7 @@ start() { # Check if atd is already running echo -n $"Starting $prog: " - $ATD $OPTS && success || failure + daemon $ATD $OPTS && success || failure RETVAL=$? [ "$RETVAL" = 0 ] && touch $LOCK_FILE echo @@ -36,11 +36,12 @@ echo -n $"Stopping $prog: " if [ -n "`pidfileofproc $ATD`" ] ; then killproc $ATD + RETVAL=3 else failure $"Stopping $prog" fi RETVAL=$? - [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE + [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE echo } From fedora-extras-commits at redhat.com Fri Jul 18 12:56:28 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 12:56:28 GMT Subject: rpms/cpqarrayd/EL-4 cpqarrayd.spec,1.1,1.2 Message-ID: <200807181256.m6ICuSVu018644@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18595 Modified Files: cpqarrayd.spec Log Message: Add openssl-devel to BuildRequires (neccessary for EL4) Index: cpqarrayd.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/EL-4/cpqarrayd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpqarrayd.spec 18 Jul 2008 10:42:31 -0000 1.1 +++ cpqarrayd.spec 18 Jul 2008 12:55:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpqarrayd Version: 2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake -BuildRequires: net-snmp-devel +BuildRequires: net-snmp-devel, openssl-devel Requires(post): chkconfig Requires(postun): initscripts @@ -70,6 +70,9 @@ %doc %_mandir/man1/cpqarrayd* %changelog +* Fri Jul 18 2008 David Juran - 2.3-6 +- Add openssl-devel to BuildRequires (neccessary for EL4) + * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness From fedora-extras-commits at redhat.com Fri Jul 18 13:02:22 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 18 Jul 2008 13:02:22 GMT Subject: rpms/gnomesword/F-9 gnomesword.spec,1.46,1.47 Message-ID: <200807181302.m6ID2M7i025758@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25698 Modified Files: gnomesword.spec Log Message: * Fri Jul 18 2008 Deji Akingunola - 2.3.5-2 - Rebuild for firefox-3.0.1 Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/F-9/gnomesword.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gnomesword.spec 3 Jul 2008 16:22:46 -0000 1.46 +++ gnomesword.spec 18 Jul 2008 13:01:34 -0000 1.47 @@ -1,6 +1,6 @@ Name: gnomesword Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text @@ -75,6 +75,9 @@ %_datadir/gnome/help/gnomesword/ %changelog +* Fri Jul 18 2008 Deji Akingunola - 2.3.5-2 +- Rebuild for firefox-3.0.1 + * Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 - Update to 2.3.5 From fedora-extras-commits at redhat.com Fri Jul 18 13:06:00 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 13:06:00 GMT Subject: rpms/cpqarrayd/F-8 cpqarrayd-2.3.no_ida.patch, NONE, 1.1 cpqarrayd-2.3.sysVinit.patch, NONE, 1.1 cpqarrayd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181306.m6ID60PS026096@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25934/F-8 Modified Files: .cvsignore sources Added Files: cpqarrayd-2.3.no_ida.patch cpqarrayd-2.3.sysVinit.patch cpqarrayd.spec import.log Log Message: Initial import cpqarrayd-2.3.no_ida.patch: --- NEW FILE cpqarrayd-2.3.no_ida.patch --- diff -up cpqarrayd-2.3/status.c.no_ida cpqarrayd-2.3/status.c --- cpqarrayd-2.3/status.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/status.c 2008-07-18 11:43:59.000000000 +0300 @@ -33,9 +33,13 @@ #endif #include + +#ifdef HAVE_IDA #include #include #include +#endif + #include #include "cpqarrayd.h" @@ -45,7 +49,8 @@ #include "cciss_structs.h" #include "cciss_functions.h" -int status_check (struct opts opts) +#ifdef HAVE_IDA +int status_check (struct opts opts) { int devicefd; @@ -183,6 +188,7 @@ int status_check (struct opts opts) return 1; } +#endif int cciss_status_check (struct opts opts) { @@ -190,7 +196,6 @@ int cciss_status_check (struct opts opts int devicefd; int ctrl_cntr, result; int logd_cntr; - ida_ioctl_t io, io2; int status, nr_blks, blks_tr, trap_stat; float pvalue; char statusmsg[1024]; diff -up cpqarrayd-2.3/discover.c.no_ida cpqarrayd-2.3/discover.c --- cpqarrayd-2.3/discover.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/discover.c 2008-07-18 11:49:23.000000000 +0300 @@ -33,12 +33,14 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #include #include #include #endif +#endif #if defined(__freebsd__) #include @@ -52,8 +54,12 @@ int discover_controllers (struct opts); + +#ifdef WITH_IDA int interrogate_controller (struct opts, const char *); int interrogate_logical(struct opts, int, int); +#endif + void boardid2str (unsigned long , char *); /* Added devfs devices @@ -84,6 +90,7 @@ discover_controllers (struct opts opts) int cntr; int foundone = 0; +#ifdef WITH_IDA for (cntr = 0; cntr < 8; cntr++) { /* does this device exist ? */ @@ -104,6 +111,8 @@ discover_controllers (struct opts opts) perror ("DEBUG: reason"); } } +#endif + for (cntr = 0; cntr < 16; cntr++) { /* does this device exist ? */ @@ -127,6 +136,7 @@ discover_controllers (struct opts opts) return foundone; } +#ifdef WITH_IDA int interrogate_controller (struct opts opts, const char *devicefile) { @@ -227,6 +237,7 @@ interrogate_logical (struct opts opts, i return 1; } +#endif void boardid2str (unsigned long board_id, char *name) diff -up cpqarrayd-2.3/configure.ac.no_ida cpqarrayd-2.3/configure.ac --- cpqarrayd-2.3/configure.ac.no_ida 2005-12-16 13:17:44.000000000 +0200 +++ cpqarrayd-2.3/configure.ac 2008-07-18 11:41:27.000000000 +0300 @@ -16,35 +16,35 @@ AC_PROG_MAKE_SET AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h]) -dnl Check for pathed kernel sources with ida_ioctl.h -AC_MSG_CHECKING(for kernel sources) -found_kernel_dir="" -for kernel_dir in /usr/src/linux /usr/src/linux-2.4 -do - if test -d $kernel_dir ; then - CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" - found_kernel_dir="$kernel_dir" - fi -done - -if test "$found_kernel_dir" != "" ; then - AC_MSG_RESULT(found $found_kernel_dir ) -else - AC_MSG_ERROR(Kernel sources not found) -fi +dnl dnl Check for pathed kernel sources with ida_ioctl.h +dnl AC_MSG_CHECKING(for kernel sources) +dnl found_kernel_dir="" +dnl for kernel_dir in /usr/src/linux /usr/src/linux-2.4 +dnl do +dnl if test -d $kernel_dir ; then +dnl CFLAGS="$CFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl CPPFLAGS="$CPPFLAGS -I$kernel_dir/include -I$kernel_dir/drivers/block" +dnl found_kernel_dir="$kernel_dir" +dnl fi +dnl done + +dnl if test "$found_kernel_dir" != "" ; then +dnl AC_MSG_RESULT(found $found_kernel_dir ) +dnl else +dnl AC_MSG_ERROR(Kernel sources not found) +dnl fi dnl Check for compile.h (2.6.x kernels only? AC_CHECK_HEADERS(linux/compiler.h) -dnl Check Headers -AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, - AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) - -dnl Check version of SmartArray driver -AC_MSG_CHECKING(SmartArray driver version) -AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), - AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) +dnl dnl Check Headers +dnl AC_CHECK_HEADERS(ida_ioctl.h ida_cmd.h cpqarray.h,, +dnl AC_MSG_ERROR(You need to have the SmartArray driver in the kernel.)) + +dnl dnl Check version of SmartArray driver +dnl AC_MSG_CHECKING(SmartArray driver version) +dnl AC_EGREP_HEADER(blk_cnt, ida_ioctl.h,AC_MSG_RESULT(ok), +dnl AC_MSG_ERROR(You need to have the SmartArray driver version 1.0.1 or higher installed.)) dnl Check for CCISS header file AC_CHECK_HEADERS(linux/cciss_ioctl.h,, --- cpqarrayd-2.3/cpqarrayd.c.no_ida 2007-12-03 19:06:22.000000000 +0200 +++ cpqarrayd-2.3/cpqarrayd.c 2008-07-18 13:02:17.000000000 +0300 @@ -35,9 +35,11 @@ #include #endif +#ifdef WITH_IDA #if defined(__linux__) #include #endif +#endif #if defined(__freebsd__) #include @@ -249,7 +251,10 @@ syslog(LOG_INFO, "Logging Enabled..."); while (keeprunning) { + +#ifdef WITH_IDA status_check(opts); +#endif cciss_status_check(opts); if (keeprunning) { sleep(30); } } cpqarrayd-2.3.sysVinit.patch: --- NEW FILE cpqarrayd-2.3.sysVinit.patch --- diff -up cpqarrayd-2.3/scripts/cpqarrayd.orig cpqarrayd-2.3/scripts/cpqarrayd --- cpqarrayd-2.3/scripts/cpqarrayd.orig 2008-07-09 17:55:59.000000000 +0300 +++ cpqarrayd-2.3/scripts/cpqarrayd 2008-07-14 16:43:49.000000000 +0300 @@ -2,7 +2,7 @@ # # cpqarrayd Start/Stop Compaq Array monitor # -# chkconfig: 345 15 90 +# chkconfig: - 51 90 # description: The cpqarrayd monitors the status of Compaq Raid Arrays, \ # and reports via syslog or traps # processname: cpqarrayd @@ -23,8 +23,9 @@ RETVAL=0 case "$1" in start) echo -n "Starting cpqarrayd: " - daemon /usr/sbin/cpqarrayd $CPQ_PARAMS - RETVAL=$? +# daemon /usr/sbin/cpqarrayd $CPQ_PARAMS |grep -v ^DEBUG: + { daemon /usr/sbin/cpqarrayd $CPQ_PARAMS + RETVAL=$?; } |grep -v ^DEBUG: echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cpqarrayd ;; @@ -39,13 +40,22 @@ case "$1" in status cpqarrayd RETVAL=$? ;; - restart|reload) + restart|force-reload) $0 stop $0 start RETVAL=$? ;; - *) - echo "Usage: cpqarrayd {start|stop|status|restart|reload}" + reload) + exit 3 + ;; + condrestart|try-restart) + if status cpqarrayd > /dev/null; then + $0 stop + $0 start + fi + ;; + *) + echo "Usage: cpqarrayd {start|stop|status|restart|force-reolad|reload|cond-restart|try-restart}" exit 1 esac --- NEW FILE cpqarrayd.spec --- Name: cpqarrayd Version: 2.3 Release: 6%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ URL: http://www.strocamp.net/opensource/cpqarrayd.php Source0: http://www.strocamp.net/opensource/compaq/downloads/cpqarrayd-2.3.tar.gz Patch0: cpqarrayd-2.3.no_ida.patch Patch1: cpqarrayd-2.3.sysVinit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake BuildRequires: net-snmp-devel, openssl-devel Requires(post): chkconfig Requires(postun): initscripts Requires(preun): chkconfig Requires(preun): initscripts %description Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers. It reports any status changes, like failing disks, to the syslog and optionally to a remote host using SNMP traps. Note that support for the old(?) IDA Arrays have been disabled in this package due to build issues and lack of testing hardware. %prep %setup -q %patch0 -p1 -b .no_ida %patch1 -p1 -b .sysVinit %build autoreconf -si %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/cpqarrayd $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig cp scripts/cpqarrayd.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cpqarrayd %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add cpqarrayd %preun if [ $1 = 0 ] ; then /sbin/service cpqarrayd stop >/dev/null 2>&1 /sbin/chkconfig --del cpqarrayd fi %postun if [ "$1" -ge "1" ] ; then /sbin/service cpqarrayd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog DEVEL NEWS README %_sbindir/cpqarrayd %config(noreplace) %_sysconfdir/sysconfig/cpqarrayd %_initrddir/cpqarrayd %doc %_mandir/man1/cpqarrayd* %changelog * Fri Jul 18 2008 David Juran - 2.3-6 - Add openssl-devel to BuildRequires (neccessary for EL4) * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness * Fri Jul 18 2008 David Juran - 2.3-4 - Cleanup no-ida patch * Thu Jul 17 2008 - 2.3-3 - fix rpmlint warnings * Mon Jul 14 2008 - 2.3-2 - Make SysVinit script compliant with Fedora Packaging Guidelines * Wed Jul 9 2008 - 2.3-1 - Initial packaging --- NEW FILE import.log --- cpqarrayd-2_3-6_el4:F-8:cpqarrayd-2.3-6.el4.src.rpm:1216386264 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:33:19 -0000 1.1 +++ .cvsignore 18 Jul 2008 13:05:16 -0000 1.2 @@ -0,0 +1 @@ +cpqarrayd-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:33:19 -0000 1.1 +++ sources 18 Jul 2008 13:05:16 -0000 1.2 @@ -0,0 +1 @@ +55421afe4817863efab45c59a9486a60 cpqarrayd-2.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 13:06:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 18 Jul 2008 13:06:50 GMT Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.6, 1.7 perl-Class-MethodMaker.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200807181306.m6ID6o3n026174@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26064 Modified Files: .cvsignore perl-Class-MethodMaker.spec sources Log Message: * Fri Jul 18 2008 Ralf Cors??pius - 2.11-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Jan 2008 16:17:06 -0000 1.6 +++ .cvsignore 18 Jul 2008 13:05:51 -0000 1.7 @@ -1 +1 @@ -Class-MethodMaker-2.10.tar.gz +Class-MethodMaker-2.11.tar.gz Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Class-MethodMaker.spec 18 Jul 2008 12:11:53 -0000 1.14 +++ perl-Class-MethodMaker.spec 18 Jul 2008 13:05:51 -0000 1.15 @@ -1,6 +1,6 @@ Name: perl-Class-MethodMaker -Version: 2.10 -Release: 4%{?dist} +Version: 2.11 +Release: 1%{?dist} Summary: Perl module for creating generic object-oriented methods Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 18 2008 Ralf Cors??pius - 2.11-1 +- Upstream update. + * Fri Jul 18 2008 Ralf Cors??pius - 2.10-4 - Remove %%clean ||: (BZ 449442, FTBFS). - Use %%version in Source0-URL. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Jan 2008 16:17:06 -0000 1.6 +++ sources 18 Jul 2008 13:05:51 -0000 1.7 @@ -1 +1 @@ -97181580315dd9776eafae67827c909f Class-MethodMaker-2.10.tar.gz +61ed8327e50b99e574c5f5ce1a835d36 Class-MethodMaker-2.11.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 13:10:19 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 13:10:19 GMT Subject: rpms/cpqarrayd/EL-5 cpqarrayd.spec,1.1,1.2 Message-ID: <200807181310.m6IDAJol026446@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26358 Modified Files: cpqarrayd.spec Log Message: Add openssl-devel to BuildRequires (neccessary for EL4) Index: cpqarrayd.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/EL-5/cpqarrayd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpqarrayd.spec 18 Jul 2008 10:33:26 -0000 1.1 +++ cpqarrayd.spec 18 Jul 2008 13:09:34 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpqarrayd Version: 2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake -BuildRequires: net-snmp-devel +BuildRequires: net-snmp-devel, openssl-devel Requires(post): chkconfig Requires(postun): initscripts @@ -70,6 +70,9 @@ %doc %_mandir/man1/cpqarrayd* %changelog +* Fri Jul 18 2008 David Juran - 2.3-6 +- Add openssl-devel to BuildRequires (neccessary for EL4) + * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness From fedora-extras-commits at redhat.com Fri Jul 18 13:12:14 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 18 Jul 2008 13:12:14 GMT Subject: rpms/sectool/devel sectool.spec,1.12,1.13 Message-ID: <200807181312.m6IDCEPD026586@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/sectool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26489 Modified Files: sectool.spec Log Message: rebuild for new rpm Index: sectool.spec =================================================================== RCS file: /cvs/pkgs/rpms/sectool/devel/sectool.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sectool.spec 3 Jul 2008 10:25:08 -0000 1.12 +++ sectool.spec 18 Jul 2008 13:11:26 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A security audit system and intrusion detection system Name: sectool Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 License: GPLv2+ @@ -91,6 +91,9 @@ %changelog +* Fri Jul 18 2008 Caol??n McNamara - 0.8.0-2 +- rebuild for new rpm + * Thu Jul 03 2008 Peter Vrabec - 0.8.0-1 - upgrade From fedora-extras-commits at redhat.com Fri Jul 18 13:15:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:15:46 +0000 Subject: [pkgdb] xorg-x11-drv-evdev had acl change status Message-ID: <200807181315.m6IDFkkt028581@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the watchcommits acl on xorg-x11-drv-evdev (Fedora devel) to Approved for Peter Hutterer (whot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 13:15:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:15:51 +0000 Subject: [pkgdb] xorg-x11-drv-evdev had acl change status Message-ID: <200807181315.m6IDFptb028603@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the commit acl on xorg-x11-drv-evdev (Fedora devel) to Approved for Peter Hutterer (whot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 13:16:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:16:13 +0000 Subject: [pkgdb] xorg-x11-drv-evdev had acl change status Message-ID: <200807181316.m6IDFkkx028581@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the approveacls acl on xorg-x11-drv-evdev (Fedora devel) to Approved for Peter Hutterer (whot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 13:16:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:16:23 +0000 Subject: [pkgdb] xorg-x11-drv-evdev had acl change status Message-ID: <200807181316.m6IDGNR7028670@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the approveacls acl on xorg-x11-drv-evdev (Fedora devel) to Approved for Dave Airlie (airlied) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 13:16:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:16:24 +0000 Subject: [pkgdb] xorg-x11-drv-evdev had acl change status Message-ID: <200807181316.m6IDGNR9028670@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the approveacls acl on xorg-x11-drv-evdev (Fedora devel) to Approved for Adam Jackson (ajax) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 13:16:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:16:31 +0000 Subject: [pkgdb] xorg-x11-drv-evdev had acl change status Message-ID: <200807181316.m6IDFptd028603@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the approveacls acl on xorg-x11-drv-evdev (Fedora devel) to Approved for Soren Sandmann Pedersen (ssp) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 13:16:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:16:49 +0000 Subject: [pkgdb] xorg-x11-drv-evdev had acl change status Message-ID: <200807181316.m6IDGnVL028782@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the approveacls acl on xorg-x11-drv-evdev (Fedora devel) to Awaiting Review for Soren Sandmann Pedersen (ssp) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-evdev From fedora-extras-commits at redhat.com Fri Jul 18 13:17:21 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Fri, 18 Jul 2008 13:17:21 GMT Subject: rpms/PyOpenGL/F-8 .cvsignore, 1.2, 1.3 PyOpenGL.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200807181317.m6IDHLgj026960@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/PyOpenGL/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26878 Modified Files: .cvsignore PyOpenGL.spec sources Log Message: Update to 3.0.0b4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Apr 2007 05:24:57 -0000 1.2 +++ .cvsignore 18 Jul 2008 13:16:36 -0000 1.3 @@ -1 +1 @@ -PyOpenGL-3.0.0a6.tar.gz +PyOpenGL-3.0.0b4.tar.gz Index: PyOpenGL.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/PyOpenGL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PyOpenGL.spec 30 Aug 2007 06:54:55 -0000 1.3 +++ PyOpenGL.spec 18 Jul 2008 13:16:36 -0000 1.4 @@ -1,9 +1,9 @@ -%define prever a6 +%define prever b4 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: PyOpenGL Version: 3.0.0 -Release: 0.4.%{prever}%{?dist} +Release: 0.6.%{prever}%{?dist} Summary: Python bindings for OpenGL License: BSD Group: System Environment/Libraries @@ -59,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \ --prefix="%{_prefix}" --single-version-externally-managed +chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py2.5.egg-info/* # don't package the tests files rm -r $RPM_BUILD_ROOT%{python_sitelib}/OpenGL/tests # for %%doc @@ -85,8 +86,14 @@ %changelog +* Fri Jul 18 2008 Nikolay Vladimirov 3.0.0-0.6.b4 +- New upstream release 3.0.0b4 + +* Mon Dec 31 2007 Hans de Goede 3.0.0-0.5.b1 +- New upstream release 3.0.0b1 + * Thu Aug 30 2007 Hans de Goede 3.0.0-0.4.a6 -- Change BuildRequiresL python-setuptools to python-setuptools-devel for +- Change BuildRequires python-setuptools to python-setuptools-devel for the python-setuptools package split * Fri Apr 13 2007 Hans de Goede 3.0.0-0.3.a6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Apr 2007 05:24:57 -0000 1.2 +++ sources 18 Jul 2008 13:16:36 -0000 1.3 @@ -1 +1 @@ -9cc61f382c8a97d5697608de18caaddb PyOpenGL-3.0.0a6.tar.gz +01948fcc4f65dd220b0631eb93527efc PyOpenGL-3.0.0b4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 13:17:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 13:17:24 GMT Subject: rpms/evolution/devel evolution-1.4.4-ldap-x86_64-hack.patch, 1.1, 1.2 evolution-2.5.4-fix-conduit-dir.patch, 1.3, 1.4 evolution.spec, 1.345, 1.346 Message-ID: <200807181317.m6IDHOM4026968@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/evolution/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26884 Modified Files: evolution-1.4.4-ldap-x86_64-hack.patch evolution-2.5.4-fix-conduit-dir.patch evolution.spec Log Message: fix license tag evolution-1.4.4-ldap-x86_64-hack.patch: Index: evolution-1.4.4-ldap-x86_64-hack.patch =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-1.4.4-ldap-x86_64-hack.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-1.4.4-ldap-x86_64-hack.patch 9 Sep 2004 04:39:04 -0000 1.1 +++ evolution-1.4.4-ldap-x86_64-hack.patch 18 Jul 2008 13:16:37 -0000 1.2 @@ -1,11 +1,12 @@ ---- evolution-1.4.4/configure.ldaphack 2003-08-05 02:06:26.000000000 -0400 -+++ evolution-1.4.4/configure 2003-08-05 02:06:45.000000000 -0400 -@@ -12135,7 +12135,7 @@ +diff -up evolution-2.23.4/configure.ldaphack evolution-2.23.4/configure +--- evolution-2.23.4/configure.ldaphack 2008-06-16 07:12:17.000000000 -0400 ++++ evolution-2.23.4/configure 2008-07-18 09:08:21.000000000 -0400 +@@ -27729,7 +27729,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" +LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ + _ACEOF evolution-2.5.4-fix-conduit-dir.patch: Index: evolution-2.5.4-fix-conduit-dir.patch =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.5.4-fix-conduit-dir.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- evolution-2.5.4-fix-conduit-dir.patch 4 Jun 2007 20:07:28 -0000 1.3 +++ evolution-2.5.4-fix-conduit-dir.patch 18 Jul 2008 13:16:37 -0000 1.4 @@ -1,6 +1,7 @@ ---- evolution-2.11.3/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-06-03 11:07:44.000000000 -0400 -+++ evolution-2.11.3/addressbook/conduit/Makefile.am 2007-06-04 12:55:32.000000000 -0400 -@@ -28,7 +28,7 @@ e-address.conduit: e-address.conduit.in +diff -up evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.am +--- evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2008-06-15 23:20:16.000000000 -0400 ++++ evolution-2.23.4/addressbook/conduit/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -25,7 +25,7 @@ e-address.conduit: e-address.conduit.in -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -9,9 +10,10 @@ conduit_DATA = e-address.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-06-04 07:36:46.000000000 -0400 -+++ evolution-2.11.3/addressbook/conduit/Makefile.in 2007-06-04 12:55:53.000000000 -0400 -@@ -459,7 +459,7 @@ libeaddress_conduit_la_LIBADD = \ +diff -up evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.in +--- evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir 2008-06-16 07:11:50.000000000 -0400 ++++ evolution-2.23.4/addressbook/conduit/Makefile.in 2008-07-18 09:10:29.000000000 -0400 +@@ -421,7 +421,7 @@ libeaddress_conduit_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) @@ -20,31 +22,34 @@ conduit_DATA = e-address.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.11.3/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/todo/Makefile.am 2007-06-04 12:56:19.000000000 -0400 -@@ -25,7 +25,7 @@ e-todo.conduit: e-todo.conduit.in +diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.am +--- evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -28,7 +28,7 @@ e-calendar.conduit: e-calendar.conduit.i -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit + conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:51.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/todo/Makefile.in 2007-06-04 12:56:28.000000000 -0400 -@@ -456,7 +456,7 @@ libetodo_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.in +--- evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.in 2008-07-18 09:13:04.000000000 -0400 +@@ -426,7 +426,7 @@ libecalendar_conduit_la_LIBADD = \ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit + conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.11.3/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/memo/Makefile.am 2007-06-04 12:56:49.000000000 -0400 -@@ -25,7 +25,7 @@ e-memo.conduit: e-memo.conduit.in +diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.am +--- evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/memo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -28,7 +28,7 @@ e-memo.conduit: e-memo.conduit.in -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -53,10 +58,11 @@ conduit_DATA = e-memo.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/memo/Makefile.in 2007-06-04 12:56:40.000000000 -0400 -@@ -456,7 +456,7 @@ libememo_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.in +--- evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/memo/Makefile.in 2008-07-18 09:12:17.000000000 -0400 +@@ -424,7 +424,7 @@ libememo_conduit_la_LIBADD = \ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ @@ -64,25 +70,27 @@ conduit_DATA = e-memo.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.11.3/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/calendar/Makefile.am 2007-06-04 12:57:02.000000000 -0400 -@@ -25,7 +25,7 @@ e-calendar.conduit: e-calendar.conduit.i +diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.am +--- evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/todo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -28,7 +28,7 @@ e-todo.conduit: e-todo.conduit.in -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar.conduit + conduit_DATA = e-todo.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/calendar/Makefile.in 2007-06-04 12:57:11.000000000 -0400 -@@ -458,7 +458,7 @@ libecalendar_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.in +--- evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/todo/Makefile.in 2008-07-18 09:11:53.000000000 -0400 +@@ -424,7 +424,7 @@ libetodo_conduit_la_LIBADD = \ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar.conduit + conduit_DATA = e-todo.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- evolution.spec 19 Jun 2008 13:00:31 -0000 1.345 +++ evolution.spec 18 Jul 2008 13:16:37 -0000 1.346 @@ -45,8 +45,8 @@ Name: evolution Version: 2.23.4 -Release: 2%{?dist} -License: GPLv2 and GFDL+ +Release: 3%{?dist} +License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME URL: http://www.gnome.org/projects/evolution/ @@ -646,6 +646,10 @@ %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-3.fc10 +- fix license tag +- fix patches to apply with fuzz=0 + * Thu Jun 19 2008 Matthew Barnes - 2.23.4-2.fc10 - Don't ship the unfinished "Custom Header" plugin. From fedora-extras-commits at redhat.com Fri Jul 18 13:22:14 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 13:22:14 GMT Subject: rpms/cpqarrayd/F-9 cpqarrayd.spec,1.1,1.2 import.log,1.1,1.2 Message-ID: <200807181322.m6IDME6R027590@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27450/F-9 Modified Files: cpqarrayd.spec import.log Log Message: Initial import Index: cpqarrayd.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/F-9/cpqarrayd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpqarrayd.spec 18 Jul 2008 10:48:17 -0000 1.1 +++ cpqarrayd.spec 18 Jul 2008 13:21:29 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpqarrayd Version: 2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake -BuildRequires: net-snmp-devel +BuildRequires: net-snmp-devel, openssl-devel Requires(post): chkconfig Requires(postun): initscripts @@ -70,6 +70,9 @@ %doc %_mandir/man1/cpqarrayd* %changelog +* Fri Jul 18 2008 David Juran - 2.3-6 +- Add openssl-devel to BuildRequires (neccessary for EL4) + * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Jul 2008 10:48:17 -0000 1.1 +++ import.log 18 Jul 2008 13:21:29 -0000 1.2 @@ -1 +1,2 @@ cpqarrayd-2_3-5_fc10:F-9:cpqarrayd-2.3-5.fc10.src.rpm:1216377993 +cpqarrayd-2_3-6_fc8:F-9:cpqarrayd-2.3-6.fc8.src.rpm:1216387246 From fedora-extras-commits at redhat.com Fri Jul 18 13:24:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 13:24:33 GMT Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.220, 1.221 Message-ID: <200807181324.m6IDOXL7027821@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/evolution-data-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27743 Modified Files: evolution-data-server.spec Log Message: fix license tag Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- evolution-data-server.spec 3 Jul 2008 14:46:10 -0000 1.220 +++ evolution-data-server.spec 18 Jul 2008 13:23:46 -0000 1.221 @@ -28,13 +28,13 @@ Name: evolution-data-server Version: 2.23.4 -Release: 2%{?dist} -License: LGPL +Release: 3%{?dist} +License: LGPLv2 Group: System Environment/Libraries Summary: Backend data server for Evolution URL: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: %{name}-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.23/%{name}-%{version}.tar.bz2 ### Patches ### @@ -376,6 +376,9 @@ %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Fri Jul 18 2008 Tom "spot" Callaway 2.23.4-3 +- fix license tag + * Thu Jul 03 2008 Matthew Barnes - 3.23.4-2.fc10 - Add patch for GNOME bug #534080 (fix attachment saving). From fedora-extras-commits at redhat.com Fri Jul 18 13:29:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 13:29:38 +0000 Subject: [pkgdb] fuse-gmailfs ownership updated Message-ID: <200807181329.m6IDTcG9029289@bastion.fedora.phx.redhat.com> Package fuse-gmailfs in Fedora 8 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fuse-gmailfs From fedora-extras-commits at redhat.com Fri Jul 18 13:29:42 2008 From: fedora-extras-commits at redhat.com (David Juran (djuran)) Date: Fri, 18 Jul 2008 13:29:42 GMT Subject: rpms/cpqarrayd/devel cpqarrayd.spec,1.3,1.4 Message-ID: <200807181329.m6IDTgC4028631@cvs-int.fedora.redhat.com> Author: djuran Update of /cvs/pkgs/rpms/cpqarrayd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28464 Modified Files: cpqarrayd.spec Log Message: Add openssl-devel to BuildRequires (neccessary for EL4) Index: cpqarrayd.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/cpqarrayd.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpqarrayd.spec 18 Jul 2008 10:19:19 -0000 1.3 +++ cpqarrayd.spec 18 Jul 2008 13:28:58 -0000 1.4 @@ -1,6 +1,6 @@ Name: cpqarrayd Version: 2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cpqarrayd is a daemon to monitor HP (compaq) arraycontrollers Group: System Environment/Base License: GPLv2+ @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake -BuildRequires: net-snmp-devel +BuildRequires: net-snmp-devel, openssl-devel Requires(post): chkconfig Requires(postun): initscripts @@ -70,6 +70,9 @@ %doc %_mandir/man1/cpqarrayd* %changelog +* Fri Jul 18 2008 David Juran - 2.3-6 +- Add openssl-devel to BuildRequires (neccessary for EL4) + * Fri Jul 18 2008 David Juran - 2.3-5 - More tagging sillyness From fedora-extras-commits at redhat.com Fri Jul 18 13:31:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 13:31:03 GMT Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.33,1.34 Message-ID: <200807181331.m6IDV3QY028778@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/evolution-exchange/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28690 Modified Files: evolution-exchange.spec Log Message: fix license tag Index: evolution-exchange.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- evolution-exchange.spec 16 Jun 2008 17:41:52 -0000 1.33 +++ evolution-exchange.spec 18 Jul 2008 13:30:14 -0000 1.34 @@ -23,12 +23,12 @@ Name: evolution-exchange Version: 2.23.4 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2 Group: Applications/Productivity Summary: Evolution plugin to interact with MS Exchange Server URL: http://www.gnome.org/projects/evolution/ -Source: evolution-exchange-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.23/evolution-exchange-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: evolution-connector = %{version}-%{release} @@ -148,6 +148,10 @@ %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-2 +- fix license tag +- fix source url + * Mon Jun 16 2008 Matthew Barnes - 2.23.4-1.fc10 - Update to 2.23.4 From fedora-extras-commits at redhat.com Fri Jul 18 13:35:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 13:35:32 GMT Subject: rpms/evolution-sharp/devel evolution-sharp-0.11.1-libdir.patch, 1.3, 1.4 evolution-sharp.spec, 1.54, 1.55 Message-ID: <200807181335.m6IDZWE0029082@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/evolution-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29017 Modified Files: evolution-sharp-0.11.1-libdir.patch evolution-sharp.spec Log Message: fix license tag evolution-sharp-0.11.1-libdir.patch: Index: evolution-sharp-0.11.1-libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp-0.11.1-libdir.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- evolution-sharp-0.11.1-libdir.patch 8 Apr 2008 12:41:58 -0000 1.3 +++ evolution-sharp-0.11.1-libdir.patch 18 Jul 2008 13:34:43 -0000 1.4 @@ -1,9 +1,10 @@ ---- evolution-sharp-0.11.1/evolution-sharp.pc.in.libdir 2006-08-18 16:10:58.000000000 +0200 -+++ evolution-sharp-0.11.1/evolution-sharp.pc.in 2006-08-18 16:11:12.000000000 +0200 +diff -up evolution-sharp-0.17.4/evolution-sharp.pc.in.libdir evolution-sharp-0.17.4/evolution-sharp.pc.in +--- evolution-sharp-0.17.4/evolution-sharp.pc.in.libdir 2008-04-30 06:53:02.000000000 -0400 ++++ evolution-sharp-0.17.4/evolution-sharp.pc.in 2008-07-18 09:31:09.000000000 -0400 @@ -1,5 +1,5 @@ prefix=@prefix@ -libdir=${prefix}/lib +libdir=@libdir@ - evolibdir=@EVO_SHELL_LIBDIR@ - + Name: Evolution# + Description: Evolution# - Evolution .NET Binding Index: evolution-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- evolution-sharp.spec 14 Jul 2008 11:36:04 -0000 1.54 +++ evolution-sharp.spec 18 Jul 2008 13:34:43 -0000 1.55 @@ -2,12 +2,12 @@ Name: evolution-sharp Version: 0.17.4 -Release: 2%{?dist} -License: LGPL +Release: 3%{?dist} +License: LGPLv2 Group: System Environment/Libraries Summary: Evolution Data Server Mono Bindings URL: http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/ -Source: %{name}-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/0.17/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root # Mono only availible on these: @@ -86,6 +86,11 @@ # sonames may need to be updated in evolution-sharp's configure.in. %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.17.4-3 +- fix license tag +- fix patches to apply with fuzz=0 +- fix source url + * Mon Jul 14 2008 Matthew Barnes - 0.17.4-2.fc10 - Rebuild against newer mono(glib-sharp). From fedora-extras-commits at redhat.com Fri Jul 18 13:40:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 13:40:15 GMT Subject: rpms/ez-ipupdate/devel ez-ipupdate.spec,1.23,1.24 Message-ID: <200807181340.m6IDeF12029763@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ez-ipupdate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29602 Modified Files: ez-ipupdate.spec Log Message: fix license tag Index: ez-ipupdate.spec =================================================================== RCS file: /cvs/pkgs/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ez-ipupdate.spec 16 Jun 2008 19:38:02 -0000 1.23 +++ ez-ipupdate.spec 18 Jul 2008 13:39:21 -0000 1.24 @@ -1,10 +1,10 @@ Name: ez-ipupdate Version: 3.0.11 -Release: 0.19.b8%{?dist} +Release: 0.20.b8%{?dist} Summary: Client for Dynamic DNS Services Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://www.gusnet.cx/proj/ez-ipupdate/ Source0: http://www.gusnet.cx/proj/ez-ipupdate/dist/ez-ipupdate-3.0.11b8.tar.gz Source1: %{name}.init @@ -121,6 +121,9 @@ %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate/default.conf %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 3.0.11-0.20.b8 +- fix license tag + * Mon Jun 16 2008 Jeff Layton - 3.0.11-0.19.b8 - compile with -D_FILE_OFFSET_BITS=64 so we can handle 64-bit inode numbers in stat() calls From fedora-extras-commits at redhat.com Fri Jul 18 14:13:45 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 18 Jul 2008 14:13:45 GMT Subject: rpms/xsane/devel xsane-0.995-close-fds.patch, 1.1, 1.2 xsane.spec, 1.57, 1.58 Message-ID: <200807181413.m6IEDj0k005532@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/xsane/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5500 Modified Files: xsane-0.995-close-fds.patch xsane.spec Log Message: fix fd leak prevention (#455450) xsane-0.995-close-fds.patch: Index: xsane-0.995-close-fds.patch =================================================================== RCS file: /cvs/pkgs/rpms/xsane/devel/xsane-0.995-close-fds.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsane-0.995-close-fds.patch 15 Jul 2008 15:53:42 -0000 1.1 +++ xsane-0.995-close-fds.patch 18 Jul 2008 14:13:01 -0000 1.2 @@ -1,29 +1,80 @@ diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c --- xsane-0.995/src/xsane.c.close-fds 2007-09-28 17:24:56.000000000 +0200 -+++ xsane-0.995/src/xsane.c 2008-07-15 17:48:17.000000000 +0200 -@@ -3681,6 +3681,8 @@ static void xsane_show_doc_via_nsr(GtkWi - char *arg[5]; - struct stat st; - char netscape_lock_path[PATH_MAX]; -+ int open_max; -+ int i; ++++ xsane-0.995/src/xsane.c 2008-07-18 16:10:30.000000000 +0200 +@@ -48,6 +48,8 @@ + + #include + ++#include ++ + /* ---------------------------------------------------------------------------------------------------------------------- */ - DBG(DBG_proc, "xsane_show_doc_via_nsr(%s)\n", name); + struct option long_options[] = +@@ -3673,6 +3675,41 @@ static void xsane_show_gpl(GtkWidget *wi -@@ -3725,6 +3727,17 @@ static void xsane_show_doc_via_nsr(GtkWi + /* ---------------------------------------------------------------------------------------------------------------------- */ + ++static void xsane_close_fds_for_exec(signed int first_fd_to_leave_open, ...) ++{ ++ int open_max; ++ signed int i; ++ ++ va_list ap; ++ unsigned char *close_fds; ++ ++ open_max = (int) sysconf (_SC_OPEN_MAX); ++ ++ close_fds = malloc (open_max); ++ ++ memset (close_fds, 1, open_max); ++ ++ va_start (ap, first_fd_to_leave_open); ++ ++ for (i = first_fd_to_leave_open; i >= 0; i = va_arg (ap, signed int)) { ++ if (i < open_max) ++ close_fds[i] = 0; ++ } ++ ++ va_end (ap); ++ ++ DBG(DBG_info, "closing unneeded file descriptors\n"); ++ ++ for (i = 0; i < open_max; i++) { ++ if (close_fds[i]) ++ close (i); ++ } ++ ++ free (close_fds); ++} ++ ++/* ---------------------------------------------------------------------------------------------------------------------- */ ++ + static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via netscape remote */ + { + char *name = (char *) data; +@@ -3725,6 +3762,8 @@ static void xsane_show_doc_via_nsr(GtkWi ipc_file = fdopen(xsane.ipc_pipefd[1], "w"); } -+ open_max = (int) sysconf (_SC_OPEN_MAX); ++ xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1); + -+ DBG(DBG_info, "closing unneeded file descriptors\n"); + DBG(DBG_info, "trying to change user id for new subprocess:\n"); + DBG(DBG_info, "old effective uid = %d\n", (int) geteuid()); + setuid(getuid()); +@@ -3767,6 +3806,8 @@ static void xsane_show_doc_via_nsr(GtkWi + ipc_file = fdopen(xsane.ipc_pipefd[1], "w"); + } + ++ xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1); + -+ /* leave stdin, stdout, stderr alone */ -+ for (i = 3; i < open_max; i++) { -+ /* xsane.ipc_pipefd[0] is closed by now */ -+ if (i != xsane.ipc_pipefd[1]) -+ close (i); -+ } + DBG(DBG_info, "trying to change user id for new subprocess:\n"); + DBG(DBG_info, "old effective uid = %d\n", (int) geteuid()); + setuid(getuid()); +@@ -3888,6 +3929,8 @@ static void xsane_show_doc(GtkWidget *wi + ipc_file = fdopen(xsane.ipc_pipefd[1], "w"); + } + ++ xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1); + DBG(DBG_info, "trying to change user id for new subprocess:\n"); DBG(DBG_info, "old effective uid = %d\n", (int) geteuid()); Index: xsane.spec =================================================================== RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- xsane.spec 15 Jul 2008 15:53:42 -0000 1.57 +++ xsane.spec 18 Jul 2008 14:13:01 -0000 1.58 @@ -3,7 +3,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.995 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in @@ -107,6 +107,9 @@ %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog +* Fri Jul 18 2008 Nils Philippsen - 0.995-5 +- fix fd leak prevention (#455450) + * Tue Jul 15 2008 Nils Philippsen - 0.995-4 - don't leak file descriptors to help browser process (#455450) From fedora-extras-commits at redhat.com Fri Jul 18 13:38:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 13:38:03 GMT Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.42,1.43 Message-ID: <200807181338.m6IDc3YV029389@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/evolution-webcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29301 Modified Files: evolution-webcal.spec Log Message: fix license tag Index: evolution-webcal.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/evolution-webcal.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- evolution-webcal.spec 13 May 2008 14:33:33 -0000 1.42 +++ evolution-webcal.spec 18 Jul 2008 13:37:11 -0000 1.43 @@ -10,11 +10,11 @@ Name: evolution-webcal Version: 2.21.92 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2 Group: Applications/Internet Summary: A handler for webcal URIs -Source: %{name}-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.21/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root ### Dependencies ### @@ -88,6 +88,10 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 2.21.92-3 +- fix license tag +- fix source url + * Tue May 13 2008 Matthew Barnes - 2.21.92-1.fc10 - Rebuild against newer libedataserver. From fedora-extras-commits at redhat.com Fri Jul 18 14:19:24 2008 From: fedora-extras-commits at redhat.com (Minto Joseph (mintojoseph)) Date: Fri, 18 Jul 2008 14:19:24 GMT Subject: rpms/padauk-fonts/F-9 padauk-fonts.spec,NONE,1.1 Message-ID: <200807181419.m6IEJOG0005748@cvs-int.fedora.redhat.com> Author: mintojoseph Update of /cvs/pkgs/rpms/padauk-fonts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5724 Added Files: padauk-fonts.spec Log Message: Initial --- NEW FILE padauk-fonts.spec --- %define fontname padauk %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename ttf-sil-padauk-2.4 Name: %{fontname}-fonts Version: 2.4 Release: 2%{?dist} Summary: Padauk font for Burmese and the Myanmar script Group: User Interface/X License: OFL URL: http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=Padauk # The source link is a redirect and is not directly accessible Source0: %{archivename}.tar.gz Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Padauk is a Myanmar font covering all currently used characters in the Myanmar block.The font aims to cover all minority language needs. At the moment, these do not extend to stylistic variation needs. The font is a smart font using a Graphite description. %prep %setup -q -c for txt in doc/*.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p font-source/*.ttf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/65-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc doc/*.txt %config(noreplace) %{fontconfdir}/65-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.ttf %changelog * Fri Jul 15 2008 Minto Joseph - 2.4-2 - Changed setup macro and fontconfig rules - Changed fontconfig prefix * Fri Jul 15 2008 Minto Joseph - 2.4-1 - Changed versioning - Added configuration file - Added more description - Added license file * Fri Jul 11 2008 Minto Joseph - 20080617-1 - initial package From fedora-extras-commits at redhat.com Fri Jul 18 14:23:16 2008 From: fedora-extras-commits at redhat.com (Minto Joseph (mintojoseph)) Date: Fri, 18 Jul 2008 14:23:16 GMT Subject: rpms/padauk-fonts/F-9 sources,1.1,1.2 Message-ID: <200807181423.m6IENGVW005930@cvs-int.fedora.redhat.com> Author: mintojoseph Update of /cvs/pkgs/rpms/padauk-fonts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5856 Modified Files: sources Log Message: update source Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/padauk-fonts/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:11:11 -0000 1.1 +++ sources 18 Jul 2008 14:22:28 -0000 1.2 @@ -0,0 +1 @@ +f328e367efc7425d7b161d1c287d8caa ttf-sil-padauk-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 14:26:16 2008 From: fedora-extras-commits at redhat.com (Minto Joseph (mintojoseph)) Date: Fri, 18 Jul 2008 14:26:16 GMT Subject: rpms/padauk-fonts/F-8 padauk-fonts.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807181426.m6IEQGBR006110@cvs-int.fedora.redhat.com> Author: mintojoseph Update of /cvs/pkgs/rpms/padauk-fonts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6049 Modified Files: sources Added Files: padauk-fonts.spec Log Message: initial commit --- NEW FILE padauk-fonts.spec --- %define fontname padauk %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename ttf-sil-padauk-2.4 Name: %{fontname}-fonts Version: 2.4 Release: 2%{?dist} Summary: Padauk font for Burmese and the Myanmar script Group: User Interface/X License: OFL URL: http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=Padauk # The source link is a redirect and is not directly accessible Source0: %{archivename}.tar.gz Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description Padauk is a Myanmar font covering all currently used characters in the Myanmar block.The font aims to cover all minority language needs. At the moment, these do not extend to stylistic variation needs. The font is a smart font using a Graphite description. %prep %setup -q -c for txt in doc/*.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p font-source/*.ttf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/65-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc doc/*.txt %config(noreplace) %{fontconfdir}/65-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.ttf %changelog * Fri Jul 15 2008 Minto Joseph - 2.4-2 - Changed setup macro and fontconfig rules - Changed fontconfig prefix * Fri Jul 15 2008 Minto Joseph - 2.4-1 - Changed versioning - Added configuration file - Added more description - Added license file * Fri Jul 11 2008 Minto Joseph - 20080617-1 - initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/padauk-fonts/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:11:11 -0000 1.1 +++ sources 18 Jul 2008 14:25:33 -0000 1.2 @@ -0,0 +1 @@ +f328e367efc7425d7b161d1c287d8caa ttf-sil-padauk-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 14:29:03 2008 From: fedora-extras-commits at redhat.com (Minto Joseph (mintojoseph)) Date: Fri, 18 Jul 2008 14:29:03 GMT Subject: rpms/padauk-fonts/F-9 padauk-fonts-fontconfig.conf,NONE,1.1 Message-ID: <200807181429.m6IET3bN006191@cvs-int.fedora.redhat.com> Author: mintojoseph Update of /cvs/pkgs/rpms/padauk-fonts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6185 Added Files: padauk-fonts-fontconfig.conf Log Message: add conf file --- NEW FILE padauk-fonts-fontconfig.conf --- Padauk sans-serif sans-serif Padauk From fedora-extras-commits at redhat.com Fri Jul 18 14:30:33 2008 From: fedora-extras-commits at redhat.com (Minto Joseph (mintojoseph)) Date: Fri, 18 Jul 2008 14:30:33 GMT Subject: rpms/padauk-fonts/F-8 padauk-fonts-fontconfig.conf,NONE,1.1 Message-ID: <200807181430.m6IEUXnR006325@cvs-int.fedora.redhat.com> Author: mintojoseph Update of /cvs/pkgs/rpms/padauk-fonts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6314 Added Files: padauk-fonts-fontconfig.conf Log Message: add conf file --- NEW FILE padauk-fonts-fontconfig.conf --- Padauk sans-serif sans-serif Padauk From fedora-extras-commits at redhat.com Fri Jul 18 14:35:38 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 18 Jul 2008 14:35:38 GMT Subject: rpms/at/devel at-3.1.10-pam.patch, 1.3, 1.4 at-3.1.10-pam_keyring.patch, 1.1, 1.2 at-3.1.10-pamfix.patch, 1.1, 1.2 at-3.1.8-perr.patch, 1.1, 1.2 at.spec, 1.66, 1.67 at-3.1.10-setuids.patch, 1.1, NONE Message-ID: <200807181435.m6IEZc3F006521@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/at/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6453 Modified Files: at-3.1.10-pam.patch at-3.1.10-pam_keyring.patch at-3.1.10-pamfix.patch at-3.1.8-perr.patch at.spec Removed Files: at-3.1.10-setuids.patch Log Message: * Fri Jul 18 2008 Marcela Maslanova - 3.1.10-24 - 446004 hope adding || into scriptlets fix removing old package after upgrade - fixes for fuzz=0 at-3.1.10-pam.patch: Index: at-3.1.10-pam.patch =================================================================== RCS file: /cvs/pkgs/rpms/at/devel/at-3.1.10-pam.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- at-3.1.10-pam.patch 3 Jul 2007 14:24:48 -0000 1.3 +++ at-3.1.10-pam.patch 18 Jul 2008 14:34:48 -0000 1.4 @@ -1,116 +1,22 @@ ---- at-3.1.10/perm.c.pam 2005-08-05 05:16:01.000000000 +0200 -+++ at-3.1.10/perm.c 2007-07-03 13:29:24.000000000 +0200 -@@ -51,6 +51,14 @@ - #define PRIV_END while(0) - #endif - -+#ifdef WITH_PAM -+#include -+static pam_handle_t *pamh = NULL; -+static const struct pam_conv conv = { -+ NULL -+}; -+#endif -+ - /* Structures and unions */ - - -@@ -109,18 +117,54 @@ - int - check_permission() - { -- uid_t uid = geteuid(); -+ uid_t euid = geteuid(), uid=getuid(), egid=getegid(), gid=getgid(); - struct passwd *pentry; - int allow = 0, deny = 1; -- -- if (uid == 0) -+ int retcode = 0; -+ if (euid == 0) - return 1; - -- if ((pentry = getpwuid(uid)) == NULL) { -+ if ((pentry = getpwuid(euid)) == NULL) { - perror("Cannot access user database"); - exit(EXIT_FAILURE); - } - -+#ifdef WITH_PAM -+/* -+ * We must check if the atd daemon userid will be allowed to gain the job owner user's -+ * credentials with PAM . If not, the user has been denied at(1) usage, eg. with pam_access. -+ */ -+ setreuid(daemon_uid, daemon_uid); -+ setregid(daemon_gid, daemon_gid); -+ -+# define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ -+ fprintf(stderr,"PAM authentication failure: %s\n",pam_strerror(pamh, retcode)); \ -+ pam_close_session(pamh,PAM_SILENT); \ -+ pam_end(pamh, retcode); \ -+ setregid(gid,egid); \ -+ setreuid(uid,euid); \ -+ return(0); \ -+ } -+ retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); -+ PAM_FAIL_CHECK; -+ retcode = pam_set_item(pamh, PAM_TTY, "atd"); -+ PAM_FAIL_CHECK; -+ retcode = pam_acct_mgmt(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_open_session(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); -+ PAM_FAIL_CHECK; -+ -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); -+ pam_close_session(pamh,PAM_SILENT); -+ pam_end(pamh, PAM_ABORT); -+ -+ setregid(gid,egid); -+ setreuid(uid,euid); -+ -+#endif -+ - allow = user_in_file(ETCDIR "/at.allow", pentry->pw_name); - if (allow==0 || allow==1) - return allow; ---- at-3.1.10/config.h.in.pam 2005-08-05 05:16:02.000000000 +0200 -+++ at-3.1.10/config.h.in 2007-07-03 13:29:24.000000000 +0200 -@@ -181,3 +181,10 @@ - - #undef HAVE_ATTRIBUTE_NORETURN - #undef HAVE_PAM -+ -+/* Define if you are building with_pam */ -+#undef WITH_PAM -+ -+/* Define if you are building with_selinux */ -+#undef WITH_SELINUX -+ ---- at-3.1.10/configure.in.pam 2005-08-05 05:16:02.000000000 +0200 -+++ at-3.1.10/configure.in 2007-07-03 13:29:24.000000000 +0200 -@@ -316,4 +316,19 @@ - ) - AC_SUBST(DAEMON_GROUPNAME) - -+AC_ARG_WITH(selinux, -+[ --with-selinux Define to run with selinux], -+AC_DEFINE(WITH_SELINUX), -+) -+AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux) -+AC_SUBST(SELINUXLIB) -+AC_SUBST(WITH_SELINUX) -+ -+AC_ARG_WITH(pam, -+[ --with-pam Define to enable pam support ], -+AC_DEFINE(WITH_PAM), -+) -+AC_CHECK_LIB(pam, pam_start, PAMLIB='-lpam -lpam_misc') -+AC_SUBST(PAMLIB) -+ - AC_OUTPUT(Makefile atrun atd.8 atrun.8 at.1 batch) ---- at-3.1.10/atd.c.pam 2007-07-03 13:29:24.000000000 +0200 -+++ at-3.1.10/atd.c 2007-07-03 13:52:38.000000000 +0200 +--- at-3.1.10/pam_atd.pam 2007-07-03 13:29:24.000000000 +0200 ++++ at-3.1.10/pam_atd 2007-07-03 13:29:24.000000000 +0200 +@@ -0,0 +1,13 @@ ++# The PAM configuration file for the at daemon ++# ++# ++auth sufficient pam_rootok.so ++auth include system-auth ++auth required pam_env.so ++account include system-auth ++session required pam_loginuid.so ++session include system-auth ++# Sets up user limits, please uncomment and read /etc/security/limits.conf ++# to enable this functionality. ++# session required pam_limits.so ++# +diff -up at-3.1.10/atd.c.pam at-3.1.10/atd.c +--- at-3.1.10/atd.c.pam 2008-07-18 15:47:52.000000000 +0200 ++++ at-3.1.10/atd.c 2008-07-18 16:02:32.000000000 +0200 @@ -74,6 +74,14 @@ #include #endif @@ -137,7 +43,7 @@ /* Macros */ #define BATCH_INTERVAL_DEFAULT 60 -@@ -121,6 +133,7 @@ +@@ -121,6 +133,7 @@ static const struct pam_conv conv = { #define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \ syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \ @@ -145,7 +51,7 @@ pam_end(pamh, retcode); exit(1); \ } #define PAM_END { retcode = pam_close_session(pamh,0); \ -@@ -196,6 +209,19 @@ +@@ -196,6 +209,19 @@ myfork() #define fork myfork #endif @@ -165,7 +71,7 @@ static void run_file(const char *filename, uid_t uid, gid_t gid) { -@@ -378,18 +404,22 @@ +@@ -380,18 +406,22 @@ run_file(const char *filename, uid_t uid fstat(fd_out, &buf); size = buf.st_size; @@ -191,22 +97,22 @@ close(STDIN_FILENO); close(STDOUT_FILENO); -@@ -402,6 +432,14 @@ +@@ -404,6 +434,14 @@ run_file(const char *filename, uid_t uid else if (pid == 0) { char *nul = NULL; char **nenvp = &nul; + char **pam_envp=0L; + -+ PRIV_START ++ PRIV_START +#ifdef WITH_PAM -+ pam_envp = pam_getenvlist(pamh); -+ if ( ( pam_envp != 0L ) && (pam_envp[0] != 0L) ) -+ nenvp = pam_envp; ++ pam_envp = pam_getenvlist(pamh); ++ if ( ( pam_envp != 0L ) && (pam_envp[0] != 0L) ) ++ nenvp = pam_envp; +#endif /* Set up things for the child; we want standard input from the * input file, and standard output and error sent to our output file. -@@ -423,8 +461,6 @@ +@@ -425,8 +463,6 @@ run_file(const char *filename, uid_t uid if (chdir(ATJOB_DIR) < 0) perr("Cannot chdir to " ATJOB_DIR); @@ -215,13 +121,13 @@ nice((tolower((int) queue) - 'a' + 1) * 2); if (initgroups(pentry->pw_name, pentry->pw_gid)) -@@ -441,10 +477,90 @@ +@@ -443,10 +479,91 @@ run_file(const char *filename, uid_t uid chdir("/"); +#ifdef WITH_SELINUX + if (selinux_enabled>0) { -+ security_context_t user_context=NULL; ++ security_context_t user_context=NULL; + security_context_t file_context=NULL; + int retval=0; + struct av_decision avd; @@ -249,7 +155,7 @@ + * the user cron job. It performs an entrypoint + * permission check for this purpose. + */ -+ if (fgetfilecon(STDIN_FILENO, &file_context) < 0) { ++ if (fgetfilecon(STDIN_FILENO, &file_context) < 0) { + if (security_getenforce() > 0) { + perr("fgetfilecon FAILED %s", filename); + } else { @@ -281,13 +187,13 @@ + if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) perr("Exec failed for /bin/sh"); -- + +//add for fedora +#ifdef WITH_SELINUX -+ if (selinux_enabled>0) -+ if (setexeccon(NULL) < 0) -+ if (security_getenforce()==1) -+ perr("Could not resset exec context for user %s\n", pentry->pw_name); ++ if (selinux_enabled>0) ++ if (setexeccon(NULL) < 0) ++ if (security_getenforce()==1) ++ perr("Could not resset exec context for user %s\n", pentry->pw_name); + +#endif +//end @@ -303,20 +209,19 @@ + } +#endif PRIV_END -+//end ++// end } /* We're the parent. Let's wait. */ -@@ -456,7 +572,7 @@ - return with an ECHILD error. +@@ -459,6 +576,7 @@ run_file(const char *filename, uid_t uid */ waitpid(pid, (int *) NULL, 0); -- -+/* remove because WITH_PAM + ++/* remove because WITH_PAM #ifdef HAVE_PAM PRIV_START pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -@@ -464,7 +580,7 @@ +@@ -466,7 +584,7 @@ run_file(const char *filename, uid_t uid pam_end(pamh, retcode); PRIV_END #endif @@ -325,7 +230,7 @@ /* Send mail. Unlink the output file after opening it, so it * doesn't hang around after the run. */ -@@ -472,6 +588,13 @@ +@@ -474,6 +592,13 @@ run_file(const char *filename, uid_t uid if (open(filename, O_RDONLY) != STDIN_FILENO) perr("Open of jobfile failed"); @@ -339,13 +244,13 @@ unlink(filename); /* The job is now finished. We can delete its input file. -@@ -480,8 +603,30 @@ +@@ -482,8 +607,30 @@ run_file(const char *filename, uid_t uid unlink(newname); free(newname); +#ifdef ATD_MAIL_PROGRAM if (((send_mail != -1) && (buf.st_size != size)) || (send_mail == 1)) { -+ int mail_pid = -1; ++ int mail_pid = -1; +//add for fedora +#ifdef WITH_PAM + retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); @@ -363,22 +268,21 @@ + openlog("atd", LOG_PID, LOG_ATD); +#endif +//end -+ mail_pid = fork(); ++ mail_pid = fork(); -+ if ( mail_pid == 0 ) -+ { ++ if ( mail_pid == 0 ) ++ { PRIV_START if (initgroups(pentry->pw_name, pentry->pw_gid)) -@@ -495,16 +640,80 @@ +@@ -497,15 +644,80 @@ run_file(const char *filename, uid_t uid chdir ("/"); -#if defined(SENDMAIL) - execl(SENDMAIL, "sendmail", mailname, (char *) NULL); -#else --/*#error "No mail command specified."*/ -- perr("No mail command specified."); +- perr("No mail command specified."); +#ifdef WITH_SELINUX + if (selinux_enabled>0) { + security_context_t user_context=NULL; @@ -405,13 +309,13 @@ + &avd); + freecon(file_context); + if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) { -+ if (security_getenforce()==1) { ++ if (security_getenforce()==1) { + perr("Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); + } else { + syslog(LOG_ERR, "Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); + goto out; + } -+ } ++ } + + if (setexeccon(user_context) < 0) { + if (security_getenforce()==1) { @@ -420,34 +324,34 @@ + syslog(LOG_ERR, "Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); + } + } -+ out: -+ freecon(user_context); ++ out: ++ freecon(user_context); + } +#endif + execl(ATD_MAIL_PROGRAM, ATD_MAIL_NAME, mailname, (char *) NULL); -+ perr("Exec faile for mail command"); -+ exit(-1); ++ perr("Exec faile for mail command"); ++ exit(-1); + +#ifdef WITH_SELINUX -+ if (selinux_enabled>0) -+ if (setexeccon(NULL) < 0) -+ if (security_getenforce()==1) -+ perr("Could not resset exec context for user %s\n", pentry->pw_name); ++ if (selinux_enabled>0) ++ if (setexeccon(NULL) < 0) ++ if (security_getenforce()==1) ++ perr("Could not resset exec context for user %s\n", pentry->pw_name); #endif - perr("Exec failed for mail command"); PRIV_END -+ } -+ else if ( mail_pid == -1 ) { ++ } ++ else if ( mail_pid == -1 ) { + perr("fork of mailer failed"); + } -+ else { ++ else { + /* Parent */ + waitpid(mail_pid, (int *) NULL, 0); -+ } ++ } +#ifdef WITH_PAM -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); -+ pam_close_session(pamh, PAM_SILENT); ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); ++ pam_close_session(pamh, PAM_SILENT); + pam_end(pamh, PAM_ABORT); + closelog(); + openlog("atd", LOG_PID, LOG_ATD); @@ -457,7 +361,7 @@ exit(EXIT_SUCCESS); } -@@ -702,6 +911,10 @@ +@@ -703,6 +915,10 @@ main(int argc, char *argv[]) struct passwd *pwe; struct group *ge; @@ -468,7 +372,7 @@ /* We don't need root privileges all the time; running under uid and gid * daemon is fine. */ -@@ -718,18 +931,13 @@ +@@ -719,18 +935,14 @@ main(int argc, char *argv[]) RELINQUISH_PRIVS_ROOT(daemon_uid, daemon_gid) @@ -477,46 +381,78 @@ -#endif - - openlog("atd", LOG_PID, LOG_CRON); -- + openlog("atd", LOG_PID, LOG_ATD); + opterr = 0; errno = 0; run_as_daemon = 1; batch_interval = BATCH_INTERVAL_DEFAULT; - while ((c = getopt(argc, argv, "sdl:b:")) != EOF) { -+ while ((c = getopt(argc, argv, "sdl:b:n:")) != EOF) { ++ while ((c = getopt(argc, argv, "sdl:b:n")) != EOF) { switch (c) { case 'l': if (sscanf(optarg, "%lf", &load_avg) != 1) -@@ -742,10 +950,15 @@ - if (sscanf(optarg, "%ud", &batch_interval) != 1) - pabort("garbled option -b"); +@@ -745,7 +957,10 @@ main(int argc, char *argv[]) break; -+ case 'd': daemon_debug++; -+ /* go through another option*/ -+ -+ case 'n': -+ daemon_nofork++; - break; -- -+ +- break; ++ /* go through another option*/ ++ case 'n': ++ daemon_nofork++; ++ break; + case 's': run_as_daemon = 0; - break; ---- at-3.1.10/Makefile.in.pam 2007-07-03 13:29:24.000000000 +0200 -+++ at-3.1.10/Makefile.in 2007-07-03 13:29:24.000000000 +0200 -@@ -41,6 +41,7 @@ +diff -up at-3.1.10/config.h.in.pam at-3.1.10/config.h.in +--- at-3.1.10/config.h.in.pam 2008-07-18 16:04:41.000000000 +0200 ++++ at-3.1.10/config.h.in 2008-07-18 16:05:13.000000000 +0200 +@@ -181,3 +181,9 @@ + + #undef HAVE_ATTRIBUTE_NORETURN + #undef HAVE_PAM ++ ++/* Define if you are building with_pam */ ++#undef WITH_PAM ++ ++/* Define if you are building with_selinux */ ++#undef WITH_SELINUX +diff -up at-3.1.10/configure.in.pam at-3.1.10/configure.in +--- at-3.1.10/configure.in.pam 2008-07-18 16:05:28.000000000 +0200 ++++ at-3.1.10/configure.in 2008-07-18 16:06:01.000000000 +0200 +@@ -316,4 +316,19 @@ AC_ARG_WITH(daemon_groupname, + ) + AC_SUBST(DAEMON_GROUPNAME) + ++AC_ARG_WITH(selinux, ++[ --with-selinux Define to run with selinux], ++AC_DEFINE(WITH_SELINUX), ++) ++AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux) ++AC_SUBST(SELINUXLIB) ++AC_SUBST(WITH_SELINUX) ++ ++AC_ARG_WITH(pam, ++[ --with-pam Define to enable pam support ], ++AC_DEFINE(WITH_PAM), ++) ++AC_CHECK_LIB(pam, pam_start, PAMLIB='-lpam -lpam_misc') ++AC_SUBST(PAMLIB) ++ + AC_OUTPUT(Makefile atrun atd.8 atrun.8 at.1 batch) +diff -up at-3.1.10/Makefile.in.pam at-3.1.10/Makefile.in +--- at-3.1.10/Makefile.in.pam 2008-07-18 15:47:52.000000000 +0200 ++++ at-3.1.10/Makefile.in 2008-07-18 16:04:19.000000000 +0200 +@@ -41,6 +41,7 @@ LIBS = @LIBS@ LIBOBJS = @LIBOBJS@ INSTALL = @INSTALL@ PAMLIB = @PAMLIB@ -+SELINUXLIB = @SELINUXLIB@ ++SELINUXLIB = @SELINUXLIB@ CLONES = atq atrm ATOBJECTS = at.o panic.o perm.o y.tab.o lex.yy.o -@@ -67,13 +68,13 @@ +@@ -67,13 +68,13 @@ LIST = Filelist Filelist.asc all: at atd atrun at: $(ATOBJECTS) @@ -532,19 +468,80 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y ---- at-3.1.10/pam_atd.pam 2007-07-03 13:29:24.000000000 +0200 -+++ at-3.1.10/pam_atd 2007-07-03 13:29:24.000000000 +0200 -@@ -0,0 +1,13 @@ -+# The PAM configuration file for the at daemon -+# -+# -+auth sufficient pam_rootok.so -+auth include system-auth -+auth required pam_env.so -+account include system-auth -+session required pam_loginuid.so -+session include system-auth -+# Sets up user limits, please uncomment and read /etc/security/limits.conf -+# to enable this functionality. -+# session required pam_limits.so -+# +diff -up at-3.1.10/perm.c.pam at-3.1.10/perm.c +--- at-3.1.10/perm.c.pam 2008-07-18 16:06:14.000000000 +0200 ++++ at-3.1.10/perm.c 2008-07-18 16:08:05.000000000 +0200 +@@ -51,6 +51,14 @@ + #define PRIV_END while(0) + #endif + ++#ifdef WITH_PAM ++#include ++static pam_handle_t *pamh = NULL; ++static const struct pam_conv conv = { ++ NULL ++}; ++#endif ++ + /* Structures and unions */ + + +@@ -109,18 +117,55 @@ user_in_file(const char *path, const cha + int + check_permission() + { +- uid_t uid = geteuid(); ++ uid_t euid = geteuid(), uid=getuid(), egid=getegid(), gid=getgid(); + struct passwd *pentry; + int allow = 0, deny = 1; + +- if (uid == 0) ++ int retcode = 0; ++ if (euid == 0) + return 1; + +- if ((pentry = getpwuid(uid)) == NULL) { ++ if ((pentry = getpwuid(euid)) == NULL) { + perror("Cannot access user database"); + exit(EXIT_FAILURE); + } + ++#ifdef WITH_PAM ++/* ++ * We must check if the atd daemon userid will be allowed to gain the job owner user's ++ * credentials with PAM . If not, the user has been denied at(1) usage, eg. with pam_access. ++ */ ++ setreuid(daemon_uid, daemon_uid); ++ setregid(daemon_gid, daemon_gid); ++ ++# define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ ++ fprintf(stderr,"PAM authentication failure: %s\n",pam_strerror(pamh, retcode)); \ ++ pam_close_session(pamh,PAM_SILENT); \ ++ pam_end(pamh, retcode); \ ++ setregid(gid,egid); \ ++ setreuid(uid,euid); \ ++ return(0); \ ++ } ++ retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); ++ PAM_FAIL_CHECK; ++ retcode = pam_set_item(pamh, PAM_TTY, "atd"); ++ PAM_FAIL_CHECK; ++ retcode = pam_acct_mgmt(pamh, PAM_SILENT); ++ PAM_FAIL_CHECK; ++ retcode = pam_open_session(pamh, PAM_SILENT); ++ PAM_FAIL_CHECK; ++ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); ++ PAM_FAIL_CHECK; ++ ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); ++ pam_close_session(pamh,PAM_SILENT); ++ pam_end(pamh, PAM_ABORT); ++ ++ setregid(gid,egid); ++ setreuid(uid,euid); ++ ++#endif ++ + allow = user_in_file(ETCDIR "/at.allow", pentry->pw_name); + if (allow==0 || allow==1) + return allow; at-3.1.10-pam_keyring.patch: Index: at-3.1.10-pam_keyring.patch =================================================================== RCS file: /cvs/pkgs/rpms/at/devel/at-3.1.10-pam_keyring.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-3.1.10-pam_keyring.patch 5 Oct 2007 11:58:14 -0000 1.1 +++ at-3.1.10-pam_keyring.patch 18 Jul 2008 14:34:48 -0000 1.2 @@ -1,13 +1,13 @@ -diff -up at-3.1.10/pam_atd.old at-3.1.10/pam_atd ---- at-3.1.10/pam_atd.old 2007-10-05 13:32:16.000000000 +0200 -+++ at-3.1.10/pam_atd 2007-10-05 13:35:31.000000000 +0200 +diff -up at-3.1.10/pam_atd.pamkeyring at-3.1.10/pam_atd +--- at-3.1.10/pam_atd.pamkeyring 2008-07-18 16:15:07.000000000 +0200 ++++ at-3.1.10/pam_atd 2008-07-18 16:16:48.000000000 +0200 @@ -2,8 +2,8 @@ # # - auth sufficient pam_rootok.so -+auth required pam_env.so - auth include system-auth --auth required pam_env.so - account include system-auth - session required pam_loginuid.so - session include system-auth + auth sufficient pam_rootok.so +-auth include system-auth + auth required pam_env.so ++auth include system-auth + account include system-auth + session required pam_loginuid.so + session include system-auth at-3.1.10-pamfix.patch: Index: at-3.1.10-pamfix.patch =================================================================== RCS file: /cvs/pkgs/rpms/at/devel/at-3.1.10-pamfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-3.1.10-pamfix.patch 14 Jan 2008 09:08:45 -0000 1.1 +++ at-3.1.10-pamfix.patch 18 Jul 2008 14:34:48 -0000 1.2 @@ -1,6 +1,6 @@ diff -up at-3.1.10/atd.c.pamfix at-3.1.10/atd.c ---- at-3.1.10/atd.c.pamfix 2008-01-09 14:56:57.000000000 +0100 -+++ at-3.1.10/atd.c 2008-01-09 14:56:57.000000000 +0100 +--- at-3.1.10/atd.c.pamfix 2008-07-18 16:23:11.000000000 +0200 ++++ at-3.1.10/atd.c 2008-07-18 16:23:11.000000000 +0200 @@ -131,15 +131,17 @@ static const struct pam_conv conv = { }; @@ -44,15 +44,15 @@ PAM_FAIL_CHECK; closelog(); openlog("atd", LOG_PID, LOG_ATD); -@@ -610,6 +615,7 @@ run_file(const char *filename, uid_t uid - int mail_pid = -1; +@@ -612,6 +617,7 @@ run_file(const char *filename, uid_t uid + int mail_pid = -1; //add for fedora #ifdef WITH_PAM + pamh = NULL; retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); PAM_FAIL_CHECK; retcode = pam_set_item(pamh, PAM_TTY, "atd"); -@@ -617,8 +623,10 @@ run_file(const char *filename, uid_t uid +@@ -619,8 +625,10 @@ run_file(const char *filename, uid_t uid retcode = pam_acct_mgmt(pamh, PAM_SILENT); PAM_FAIL_CHECK; retcode = pam_open_session(pamh, PAM_SILENT); @@ -64,9 +64,9 @@ /* PAM has now re-opened our log to auth.info ! */ closelog(); diff -up at-3.1.10/perm.c.pamfix at-3.1.10/perm.c ---- at-3.1.10/perm.c.pamfix 2008-01-09 14:56:57.000000000 +0100 -+++ at-3.1.10/perm.c 2008-01-09 15:58:54.000000000 +0100 -@@ -134,17 +134,34 @@ check_permission() +--- at-3.1.10/perm.c.pamfix 2008-07-18 16:23:11.000000000 +0200 ++++ at-3.1.10/perm.c 2008-07-18 16:26:16.000000000 +0200 +@@ -135,34 +135,61 @@ check_permission() * We must check if the atd daemon userid will be allowed to gain the job owner user's * credentials with PAM . If not, the user has been denied at(1) usage, eg. with pam_access. */ @@ -83,7 +83,7 @@ # define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ - fprintf(stderr,"PAM authentication failure: %s\n",pam_strerror(pamh, retcode)); \ -- pam_close_session(pamh,PAM_SILENT); \ +- pam_close_session(pamh,PAM_SILENT); \ - pam_end(pamh, retcode); \ - setregid(gid,egid); \ - setreuid(uid,euid); \ @@ -110,8 +110,9 @@ retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); PAM_FAIL_CHECK; retcode = pam_set_item(pamh, PAM_TTY, "atd"); -@@ -152,16 +169,25 @@ check_permission() + PAM_FAIL_CHECK; retcode = pam_acct_mgmt(pamh, PAM_SILENT); ++ PAM_SESSION_FAIL; PAM_FAIL_CHECK; retcode = pam_open_session(pamh, PAM_SILENT); + PAM_SESSION_FAIL; at-3.1.8-perr.patch: Index: at-3.1.8-perr.patch =================================================================== RCS file: /cvs/pkgs/rpms/at/devel/at-3.1.8-perr.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-3.1.8-perr.patch 9 Sep 2004 03:15:31 -0000 1.1 +++ at-3.1.8-perr.patch 18 Jul 2008 14:34:48 -0000 1.2 @@ -1,12 +1,12 @@ ---- at-3.1.8/atd.c.org 2002-07-19 16:20:24.000000000 +0900 -+++ at-3.1.8/atd.c 2002-07-19 16:22:30.000000000 +0900 -@@ -453,7 +453,8 @@ - #elif defined(MAILX) - execl(MAILX, "mailx", mailname, (char *) NULL); +diff -up at-3.1.10/atd.c.bla at-3.1.10/atd.c +--- at-3.1.10/atd.c.bla 2008-07-18 15:18:35.000000000 +0200 ++++ at-3.1.10/atd.c 2008-07-18 15:19:41.000000000 +0200 +@@ -643,7 +643,7 @@ run_file(const char *filename, uid_t uid + #if defined(SENDMAIL) + execl(SENDMAIL, "sendmail", mailname, (char *) NULL); #else -#error "No mail command specified." -+/*#error "No mail command specified."*/ -+ perr("No mail command specified."); ++ perr("No mail command specified."); #endif perr("Exec failed for mail command"); Index: at.spec =================================================================== RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- at.spec 18 Jul 2008 12:55:00 -0000 1.66 +++ at.spec 18 Jul 2008 14:34:48 -0000 1.67 @@ -31,8 +31,7 @@ Patch14: at-3.1.10-pam_keyring.patch Patch15: at-3.1.10-PIE.patch Patch16: at-3.1.10-pamfix.patch -Patch17: at-3.1.10-setuids.patch -Patch18: nonposix.patch +Patch17: nonposix.patch BuildRequires: fileutils chkconfig /etc/init.d BuildRequires: flex bison autoconf @@ -83,8 +82,7 @@ %patch14 -p1 -b .pamkeyring %patch15 -p1 -b .PIE %patch16 -p1 -b .pamfix -%patch17 -p1 -b .setuids -%patch18 -p1 -b .nonposix +%patch17 -p1 -b .nonposix %build # patch10 touches configure.in @@ -189,6 +187,7 @@ %changelog * Fri Jul 18 2008 Marcela Maslanova - 3.1.10-24 - 446004 hope adding || into scriptlets fix removing old package after upgrade +- fixes for fuzz=0 * Tue Mar 25 2008 Marcela Maslanova - 3.1.10-23 - 436952 use local instead of posix output date/time format. --- at-3.1.10-setuids.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 14:36:47 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 14:36:47 GMT Subject: rpms/vim/devel vim.spec,1.213,1.214 Message-ID: <200807181436.m6IEal2g006625@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6538 Modified Files: vim.spec Log Message: new rpm doesn't like p.e. %patch008 as it seems to think that this is oktal Index: vim.spec =================================================================== RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- vim.spec 18 Jul 2008 12:00:02 -0000 1.213 +++ vim.spec 18 Jul 2008 14:36:01 -0000 1.214 @@ -56,105 +56,105 @@ # Patches 001 < 999 are patches from the base maintainer. # If you're as lazy as me, generate the list using # for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.%03d\n" $i $i; done -Patch001: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.001 -Patch002: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.002 -Patch003: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.003 -Patch004: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.004 -Patch005: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.005 -Patch006: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.006 -Patch007: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.007 -Patch008: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.008 -Patch009: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.009 -Patch010: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.010 -Patch011: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.011 -Patch012: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.012 -Patch013: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.013 -Patch014: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.014 -Patch015: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.015 -Patch016: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.016 -Patch017: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.017 -Patch018: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.018 -Patch019: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.019 -Patch020: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.020 -Patch021: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.021 -Patch022: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.022 -Patch023: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.023 -Patch024: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.024 -Patch025: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.025 -Patch026: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.026 -Patch027: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.027 -Patch028: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.028 -Patch029: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.029 -Patch030: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.030 -Patch031: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.031 -Patch032: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.032 -Patch033: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.033 -Patch034: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.034 -Patch035: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.035 -Patch036: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.036 -Patch037: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.037 -Patch038: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.038 -Patch039: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.039 -Patch040: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.040 -Patch041: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.041 -Patch042: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.042 -Patch043: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.043 -Patch044: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.044 -Patch045: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.045 -Patch046: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.046 -Patch047: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.047 -Patch048: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.048 -Patch049: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.049 -Patch050: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.050 -Patch051: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.051 -Patch052: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.052 -Patch053: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.053 -Patch054: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.054 -Patch055: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.055 -Patch056: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.056 -Patch057: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.057 -Patch058: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.058 -Patch059: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.059 -Patch060: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.060 -Patch061: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.061 -Patch062: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.062 -Patch063: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.063 -Patch064: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.064 -Patch065: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.065 -Patch066: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.066 -Patch067: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.067 -Patch068: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.068 -Patch069: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.069 -Patch070: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.070 -Patch071: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.071 -Patch072: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.072 -Patch073: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.073 -Patch074: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.074 -Patch075: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.075 -Patch076: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.076 -Patch077: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.077 -Patch078: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.078 -Patch079: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.079 -Patch080: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.080 -Patch081: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.081 -Patch082: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.082 -Patch083: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.083 -Patch084: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.084 -Patch085: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.085 -Patch086: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.086 -Patch087: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.087 -Patch088: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.088 -Patch089: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.089 -Patch090: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.090 -Patch091: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.091 -Patch092: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.092 -Patch093: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.093 -Patch094: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.094 -Patch095: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.095 -Patch096: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.096 -Patch097: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.097 -Patch098: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.098 -Patch099: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099 +Patch1: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.001 +Patch2: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.002 +Patch3: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.003 +Patch4: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.004 +Patch5: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.005 +Patch6: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.006 +Patch7: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.007 +Patch8: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.008 +Patch9: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.009 +Patch10: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.010 +Patch11: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.011 +Patch12: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.012 +Patch13: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.013 +Patch14: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.014 +Patch15: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.015 +Patch16: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.016 +Patch17: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.017 +Patch18: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.018 +Patch19: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.019 +Patch20: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.020 +Patch21: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.021 +Patch22: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.022 +Patch23: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.023 +Patch24: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.024 +Patch25: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.025 +Patch26: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.026 +Patch27: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.027 +Patch28: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.028 +Patch29: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.029 +Patch30: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.030 +Patch31: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.031 +Patch32: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.032 +Patch33: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.033 +Patch34: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.034 +Patch35: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.035 +Patch36: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.036 +Patch37: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.037 +Patch38: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.038 +Patch39: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.039 +Patch40: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.040 +Patch41: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.041 +Patch42: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.042 +Patch43: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.043 +Patch44: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.044 +Patch45: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.045 +Patch46: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.046 +Patch47: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.047 +Patch48: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.048 +Patch49: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.049 +Patch50: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.050 +Patch51: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.051 +Patch52: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.052 +Patch53: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.053 +Patch54: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.054 +Patch55: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.055 +Patch56: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.056 +Patch57: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.057 +Patch58: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.058 +Patch59: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.059 +Patch60: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.060 +Patch61: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.061 +Patch62: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.062 +Patch63: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.063 +Patch64: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.064 +Patch65: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.065 +Patch66: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.066 +Patch67: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.067 +Patch68: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.068 +Patch69: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.069 +Patch70: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.070 +Patch71: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.071 +Patch72: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.072 +Patch73: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.073 +Patch74: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.074 +Patch75: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.075 +Patch76: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.076 +Patch77: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.077 +Patch78: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.078 +Patch79: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.079 +Patch80: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.080 +Patch81: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.081 +Patch82: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.082 +Patch83: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.083 +Patch84: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.084 +Patch85: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.085 +Patch86: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.086 +Patch87: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.087 +Patch88: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.088 +Patch89: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.089 +Patch90: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.090 +Patch91: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.091 +Patch92: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.092 +Patch93: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.093 +Patch94: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.094 +Patch95: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.095 +Patch96: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.096 +Patch97: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.097 +Patch98: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.098 +Patch99: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099 Patch100: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.100 Patch101: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.101 Patch102: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.102 @@ -523,105 +523,105 @@ # Base patches... # for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done -%patch001 -p0 -%patch002 -p0 -%patch003 -p0 -%patch004 -p0 -%patch005 -p0 -%patch006 -p0 -%patch007 -p0 -%patch008 -p0 -%patch009 -p0 -%patch010 -p0 -%patch011 -p0 -%patch012 -p0 -%patch013 -p0 -%patch014 -p0 -%patch015 -p0 -%patch016 -p0 -%patch017 -p0 -%patch018 -p0 -%patch019 -p0 -%patch020 -p0 -%patch021 -p0 -%patch022 -p0 -%patch023 -p0 -%patch024 -p0 -%patch025 -p0 -%patch026 -p0 -%patch027 -p0 -%patch028 -p0 -%patch029 -p0 -%patch030 -p0 -%patch031 -p0 -%patch032 -p0 -%patch033 -p0 -%patch034 -p0 -%patch035 -p0 -%patch036 -p0 -%patch037 -p0 -%patch038 -p0 -%patch039 -p0 -%patch040 -p0 -%patch041 -p0 -%patch042 -p0 -%patch043 -p0 -%patch044 -p0 -%patch045 -p0 -%patch046 -p0 -%patch047 -p0 -%patch048 -p0 -%patch049 -p0 -%patch050 -p0 -%patch051 -p0 -%patch052 -p0 -%patch053 -p0 -%patch054 -p0 -%patch055 -p0 -%patch056 -p0 -%patch057 -p0 -%patch058 -p0 -%patch059 -p0 -%patch060 -p0 -%patch061 -p0 -%patch062 -p0 -%patch063 -p0 -%patch064 -p0 -%patch065 -p0 -%patch066 -p0 -%patch067 -p0 -%patch068 -p0 -%patch069 -p0 -%patch070 -p0 -%patch071 -p0 -%patch072 -p0 -%patch073 -p0 -%patch074 -p0 -%patch075 -p0 -%patch076 -p0 -%patch077 -p0 -%patch078 -p0 -%patch079 -p0 -%patch080 -p0 -%patch081 -p0 -%patch082 -p0 -%patch083 -p0 -%patch084 -p0 -%patch085 -p0 -%patch086 -p0 -%patch087 -p0 -%patch088 -p0 -%patch089 -p0 -%patch090 -p0 -%patch091 -p0 -%patch092 -p0 -%patch093 -p0 -%patch094 -p0 -%patch095 -p0 -%patch096 -p0 -%patch097 -p0 -%patch098 -p0 -%patch099 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 +%patch7 -p0 +%patch8 -p0 +%patch9 -p0 +%patch10 -p0 +%patch11 -p0 +%patch12 -p0 +%patch13 -p0 +%patch14 -p0 +%patch15 -p0 +%patch16 -p0 +%patch17 -p0 +%patch18 -p0 +%patch19 -p0 +%patch20 -p0 +%patch21 -p0 +%patch22 -p0 +%patch23 -p0 +%patch24 -p0 +%patch25 -p0 +%patch26 -p0 +%patch27 -p0 +%patch28 -p0 +%patch29 -p0 +%patch30 -p0 +%patch31 -p0 +%patch32 -p0 +%patch33 -p0 +%patch34 -p0 +%patch35 -p0 +%patch36 -p0 +%patch37 -p0 +%patch38 -p0 +%patch39 -p0 +%patch40 -p0 +%patch41 -p0 +%patch42 -p0 +%patch43 -p0 +%patch44 -p0 +%patch45 -p0 +%patch46 -p0 +%patch47 -p0 +%patch48 -p0 +%patch49 -p0 +%patch50 -p0 +%patch51 -p0 +%patch52 -p0 +%patch53 -p0 +%patch54 -p0 +%patch55 -p0 +%patch56 -p0 +%patch57 -p0 +%patch58 -p0 +%patch59 -p0 +%patch60 -p0 +%patch61 -p0 +%patch62 -p0 +%patch63 -p0 +%patch64 -p0 +%patch65 -p0 +%patch66 -p0 +%patch67 -p0 +%patch68 -p0 +%patch69 -p0 +%patch70 -p0 +%patch71 -p0 +%patch72 -p0 +%patch73 -p0 +%patch74 -p0 +%patch75 -p0 +%patch76 -p0 +%patch77 -p0 +%patch78 -p0 +%patch79 -p0 +%patch80 -p0 +%patch81 -p0 +%patch82 -p0 +%patch83 -p0 +%patch84 -p0 +%patch85 -p0 +%patch86 -p0 +%patch87 -p0 +%patch88 -p0 +%patch89 -p0 +%patch90 -p0 +%patch91 -p0 +%patch92 -p0 +%patch93 -p0 +%patch94 -p0 +%patch95 -p0 +%patch96 -p0 +%patch97 -p0 +%patch98 -p0 +%patch99 -p0 %patch100 -p0 %patch101 -p0 %patch102 -p0 From fedora-extras-commits at redhat.com Fri Jul 18 14:48:14 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Fri, 18 Jul 2008 14:48:14 GMT Subject: rpms/libvirt-java/devel libvirt-java.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181448.m6IEmEom008480@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8339 Modified Files: .cvsignore sources Added Files: libvirt-java.spec Log Message: upstream release 0.2.0, daniel --- NEW FILE libvirt-java.spec --- Summary: Java bindings for the libvirt virtualization API Name: libvirt-java Version: 0.2.0 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/java/libvirt-java-%{version}.tar.gz URL: http://libvirt.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: libvirt >= 0.4.0 Requires: java >= 1.5.0 Requires: jpackage-utils BuildRequires: libvirt-devel >= 0.4.0 BuildRequires: java-devel >= 1.5.0 BuildRequires: pkgconfig BuildRequires: jpackage-utils # # the jpackage-utils should provide a %{java_home} macro # to select a different Java JVM from the default one use the following # rpmbuild --define 'java_home /usr/lib/jvm/your_jvm_of_choice' # %description Libvirt-java is a base framework allowing to use libvirt, the virtualization API though the Java programming language. It requires libvirt >= 0.4.0 %package devel Summary: Compressed Java source files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libvirt-devel >= 0.4.0 Requires: pkgconfig %description devel Libvirt-java is a base framework allowing to use libvirt, the virtualization API though the Java programming language. This is the development part needed to build applications with Libvirt-java. %package javadoc Summary: Java documentation for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc API documentation for %{name}. %prep %setup -q %build %configure --with-java-home=%{java_home} # javac call is not parallelizable, as a result the same command is # run N times in parallel if %{?_smp_mflags} is set up make # fix up the modification date of generated documentation find doc -type f -newer ChangeLog | xargs touch -r ChangeLog %install rm -fr %{buildroot} make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README INSTALL %{_libdir}/libvirt_jni*.so.* %{_datadir}/java/*.jar %files devel %defattr(-,root,root) %doc src/*.java %{_libdir}/libvirt_jni*.so %{_libdir}/pkgconfig/*.pc %files javadoc %defattr(-,root,root) /usr/share/javadoc/%{name}-%{version} %changelog * Fri Jul 18 2008 Daniel Veillard - 0.2.0-1.fc10 - new release 0.2.0 - finished cleanup of APIs * Thu Jul 3 2008 Daniel Veillard - 0.1.2-1 - new release 0.1.2 * Tue Jul 1 2008 Daniel Veillard - 0.1.1-1 - new release 0.1.1 * Tue Jun 24 2008 Daniel Veillard - 0.1.0-1 - created Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-java/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2008 19:01:21 -0000 1.1 +++ .cvsignore 18 Jul 2008 14:47:31 -0000 1.2 @@ -0,0 +1 @@ +libvirt-java-0.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-java/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 19:01:21 -0000 1.1 +++ sources 18 Jul 2008 14:47:31 -0000 1.2 @@ -0,0 +1 @@ +8d3fe9bd9571fb0735db188f41fb278d libvirt-java-0.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 14:56:05 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Fri, 18 Jul 2008 14:56:05 GMT Subject: rpms/vim/devel vim.spec,1.214,1.215 Message-ID: <200807181456.m6IEu5MC009814@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9659 Modified Files: vim.spec Log Message: - bump release Index: vim.spec =================================================================== RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- vim.spec 18 Jul 2008 14:36:01 -0000 1.214 +++ vim.spec 18 Jul 2008 14:55:20 -0000 1.215 @@ -24,7 +24,7 @@ URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -1272,6 +1272,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Jul 04 2008 Karsten Hopp 7.1.330-2 +- new rpm doesn't like zero filled, 3 digit patch numbers + * Fri Jul 04 2008 Karsten Hopp 7.1.330-1 - patchlevel 330 From fedora-extras-commits at redhat.com Fri Jul 18 14:58:32 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Fri, 18 Jul 2008 14:58:32 GMT Subject: rpms/kernel-xen-2.6/devel ext4-patchqueue.patch, NONE, 1.1 git-linus.diff, NONE, 1.1 linux-2.6-debug-list_debug_rcu.patch, NONE, 1.1 linux-2.6-debug-softlockup-modules-list.patch, NONE, 1.1 linux-2.6-defaults-acpi-video.patch, NONE, 1.1 linux-2.6-export-shmem-bits-for-gem.patch, NONE, 1.1 linux-2.6-lockdep-uvc.patch, NONE, 1.1 linux-2.6-net-8139-pio-mmio-fallback.patch, NONE, 1.1 linux-2.6-ptrace-cleanup.patch, NONE, 1.1 linux-2.6-tracehook.patch, NONE, 1.1 linux-2.6-xen-0001-xen-execshield-Add-xen-specific-load_user_cs_desc.patch, NONE, 1.1 linux-2.6-xen-0002-xen-execshield-fix-endless-GPF-fault-loop.patch, NONE, 1.1 linux-2.6-xen-0003-xen-Add-a-vmlinuz-target.patch, NONE, 1.1 linux-2.6-xen-0004-xen-Add-empty-xenctrl-module.patch, NONE, 1.1 linux-2.6-xen-0005-xen-Add-proc-xen-capabilities.patch, NONE, 1.1 linux-2.6-xen-0006-xen-Add-proc-xen-privcmd.patch, NONE, 1.1 linux-2.6-xen-0007-xen-Add-proc-xen-xenbus.patch, NONE, 1.1 linux-2.6-xen-0008-xen-Add-Xen-s-sys-hypervisor-interface.patch, NONE, 1.1 linux-2.6-xen-0009-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch, NONE, 1.1 linux-2.6-xen-0010-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch, NONE, 1.1 linux-2.6-xen-0011-x86-paravirt-call-paravirt_pagetable_setup_-start.patch, NONE, 1.1 linux-2.6-xen-0012-pvops-64-call-paravirt_post_allocator_init-on-set.patch, NONE, 1.1 linux-2.6-xen-0013-x86_64-there-s-no-need-to-preallocate-level1_fixmap.patch, NONE, 1.1 linux-2.6-xen-0014-x86-clean-up-formatting-of-__switch_to.patch, NONE, 1.1 linux-2.6-xen-0015-x86-use-__page_aligned_data-bss.patch, NONE, 1.1 linux-2.6-xen-0016-x86_64-adjust-exception-frame-in-ia32entry.patch, NONE, 1.1 linux-2.6-xen-0017-x86_64-unstatic-get_local_pda.patch, NONE, 1.1 linux-2.6-xen-0018-xen-print-backtrace-on-multicall-failure.patch, NONE, 1.1 linux-2.6-xen-0019-xen-netfront-fix-xennet_release_tx_bufs.patch, NONE, 1.1 linux-2.6-xen-0020-xen-add-xen_arch_resume-xen_timer_resume-hook-for.patch, NONE, 1.1 linux-2.6-xen-0021-xen-define-set_pte-from-the-outset.patch, NONE, 1.1 linux-2.6-xen-0022-xen64-define-asm-xen-interface-for-64-bit.patch, NONE, 1.1 linux-2.6-xen-0023-xen-make-ELF-notes-work-for-32-and-64-bit.patch, NONE, 1.1 linux-2.6-xen-0024-xen-fix-64-bit-hypercall-variants.patch, NONE, 1.1 linux-2.6-xen-0025-xen64-fix-calls-into-hypercall-page.patch, NONE, 1.1 linux-2.6-xen-0026-xen64-add-extra-pv_mmu_ops.patch, NONE, 1.1 linux-2.6-xen-0027-xen64-random-ifdefs-to-mask-out-32-bit-only-code.patch, NONE, 1.1 linux-2.6-xen-0028-xen64-get-active_mm-from-the-pda.patch, NONE, 1.1 linux-2.6-xen-0029-xen-move-smp-setup-into-smp.c.patch, NONE, 1.1 linux-2.6-xen-0030-x86_64-add-workaround-for-no-gs-based-percpu.patch, NONE, 1.1 linux-2.6-xen-0031-xen64-smp.c-compile-hacking.patch, NONE, 1.1 linux-2.6-xen-0032-xen64-add-xen-head-code-to-head_64.S.patch, NONE, 1.1 linux-2.6-xen-0033-xen64-add-asm-offsets.patch, NONE, 1.1 linux-2.6-xen-0034-xen64-add-64-bit-assembler.patch, NONE, 1.1 linux-2.6-xen-0035-xen64-use-set_fixmap-for-shared_info-structure.patch, NONE, 1.1 linux-2.6-xen-0036-xen-cpu_detect-is-32-bit-only.patch, NONE, 1.1 linux-2.6-xen-0037-xen64-add-hypervisor-callbacks-for-events-etc.patch, NONE, 1.1 linux-2.6-xen-0038-xen64-early-mapping-setup.patch, NONE, 1.1 linux-2.6-xen-0039-xen64-64-bit-starts-using-set_pte-from-very-early.patch, NONE, 1.1 linux-2.6-xen-0040-xen64-map-an-initial-chunk-of-physical-memory.patch, NONE, 1.1 linux-2.6-xen-0041-xen32-create-initial-mappings-like-64-bit.patch, NONE, 1.1 linux-2.6-xen-0042-xen-fix-truncation-of-machine-address.patch, NONE, 1.1 linux-2.6-xen-0043-xen64-use-arbitrary_virt_to_machine-for-xen_set_pmd.patch, NONE, 1.1 linux-2.6-xen-0044-xen-set-num_processors.patch, NONE, 1.1 linux-2.6-xen-0045-xen64-defer-setting-pagetable-alloc-release-ops.patch, NONE, 1.1 linux-2.6-xen-0046-xen-use-set_pte_vaddr.patch, NONE, 1.1 linux-2.6-xen-0047-xen64-xen_write_idt_entry-and-cvt_gate_to_trap.patch, NONE, 1.1 linux-2.6-xen-0048-xen64-deal-with-extra-words-Xen-pushes-onto-excepti.patch, NONE, 1.1 linux-2.6-xen-0049-xen64-add-pvop-for-swapgs.patch, NONE, 1.1 linux-2.6-xen-0050-xen64-register-callbacks-in-arch-independent-way.patch, NONE, 1.1 linux-2.6-xen-0051-xen64-add-identity-irq-vector-map.patch, NONE, 1.1 linux-2.6-xen-0052-Xen64-HYPERVISOR_set_segment_base-implementation.patch, NONE, 1.1 linux-2.6-xen-0053-xen64-implement-xen_load_gs_index.patch, NONE, 1.1 linux-2.6-xen-0054-xen-rework-pgd_walk-to-deal-with-32-64-bit.patch, NONE, 1.1 linux-2.6-xen-0055-xen-make-sure-the-kernel-command-line-is-right.patch, NONE, 1.1 linux-2.6-xen-0056-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch, NONE, 1.1 linux-2.6-xen-0057-xen64-implement-failsafe-callback.patch, NONE, 1.1 linux-2.6-xen-0058-xen64-Clear-fs-on-xen_load_tls.patch, NONE, 1.1 linux-2.6-xen-0059-xen64-implement-64-bit-update_descriptor.patch, NONE, 1.1 linux-2.6-xen-0060-xen64-save-lots-of-registers.patch, NONE, 1.1 linux-2.6-xen-0061-xen64-allocate-and-manage-user-pagetables.patch, NONE, 1.1 linux-2.6-xen-0062-xen64-set-up-syscall-and-sysenter-entrypoints-for-6.patch, NONE, 1.1 linux-2.6-xen-0063-xen64-set-up-userspace-syscall-patch.patch, NONE, 1.1 linux-2.6-xen-0064-xen-implement-Xen-write_msr-operation.patch, NONE, 1.1 linux-2.6-xen-0065-xen-update-Kconfig-to-allow-64-bit-Xen.patch, NONE, 1.1 linux-2.6-xen-0066-xen64-fix-HVC_XEN-build-dependency.patch, NONE, 1.1 linux-2.6-xen-0067-xen64-fix-build-error-on-32-bit-HIGHMEM.patch, NONE, 1.1 linux-2.6-xen-0068-Revert-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch, NONE, 1.1 linux-2.6-xen-0069-Revert-x86_64-there-s-no-need-to-preallocate-level.patch, NONE, 1.1 linux-2.6-xen-0070-xen64-disable-32-bit-syscall-sysenter-if-not-suppor.patch, NONE, 1.1 linux-2.6-xen-0071-x86-xen-vdso-fix-build-error.patch, NONE, 1.1 linux-2.6-xen-0072-x86_64-further-cleanup-of-32-bit-compat-syscall-mec.patch, NONE, 1.1 linux-2.6-xen-0073-x86-xen-no-need-to-disable-vdso32.patch, NONE, 1.1 linux-2.6-xen-0074-x86_64-adjust-exception-frame-on-paranoid-exception.patch, NONE, 1.1 linux-2.6-xen-0075-x86-xen-power-fix-up-config-dependencies-on-PM.patch, NONE, 1.1 linux-2.6-xen-0076-linux-next-pci-tree-build-failure.patch, NONE, 1.1 linux-2.6.26.tar.bz2.sign, NONE, 1.1 patch-2.6.26-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.18, 1.19 .gitignore, 1.8, 1.9 Makefile, 1.23, 1.24 Makefile.config, 1.23, 1.24 config-debug, 1.5, 1.6 config-generic, 1.9, 1.10 config-ia64, 1.2, 1.3 config-ia64-generic, 1.4, 1.5 config-nodebug, 1.6, 1.7 config-powerpc-generic, 1.5, 1.6 config-powerpc32-generic, 1.5, 1.6 config-powerpc64, 1.5, 1.6 config-s390x, 1.4, 1.5 config-sparc64-generic, 1.5, 1.6 config-sparc64-smp, 1.2, 1.3 config-x86-generic, 1.5, 1.6 config-x86_64-generic, 1.7, 1.8 config-xen-generic, 1.6, 1.7 config-xen-x86_64, 1.7, 1.8 kernel.spec, 1.46, 1.47 linux-2.6-debug-nmi-timeout.patch, 1.3, 1.4 linux-2.6-execshield.patch, 1.5, 1.6 linux-2.6-merge-efifb-imacfb.patch, 1.2, 1.3 linux-2.6-net-8139-pio-modparam.patch, 1.1, 1.2 linux-2.6-net-8139-pio-oqo2.patch, 1.1, 1.2 linux-2.6-silence-noise.patch, 1.6, 1.7 linux-2.6-utrace.patch, 1.5, 1.6 linux-2.6-wireless-pending.patch, 1.8, 1.9 linux-2.6-wireless.patch, 1.8, 1.9 sources, 1.18, 1.19 upstream, 1.8, 1.9 config-sparc, 1.2, NONE config-sparc-generic, 1.3, NONE config-sparc-smp, 1.2, NONE config-sparc64, 1.2, NONE linux-2.6-alsa-kill-annoying-messages.patch, 1.2, NONE linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch, 1.1, NONE linux-2.6-powerpc-zImage-32MiB.patch, 1.1, NONE linux-2.6-ppc-use-libgcc.patch, 1.2, NONE linux-2.6-selinux-deffered-context-mapping-no-sleep.patch, 1.1, NONE linux-2.6-selinux-deffered-context-mapping.patch, 1.1, NONE linux-2.6-selinux-generic-ioctl.patch, 1.1, NONE linux-2.6-selinux-get-invalid-xattrs.patch, 1.1, NONE linux-2.6-selinux-new-proc-checks.patch, 1.1, NONE linux-2.6-silence-x86-decompressor.patch, 1.1, NONE linux-2.6-uvcvideo.patch, 1.3, NONE linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch, 1.8, NONE linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch, 1.8, NONE linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch, 1.8, NONE linux-2.6-xen-0004-xen-Enable-Xen-console-by-default-in-domU.patch, 1.1, NONE linux-2.6-xen-0005-xen-Add-a-vmlinuz-target.patch, 1.1, NONE linux-2.6-xen-0006-xen-Add-empty-xenctrl-module.patch, 1.1, NONE linux-2.6-xen-0007-xen-Add-proc-xen-capabilities.patch, 1.1, NONE linux-2.6-xen-0008-xen-Add-proc-xen-privcmd.patch, 1.1, NONE linux-2.6-xen-0009-xen-Add-proc-xen-xenbus.patch, 1.1, NONE linux-2.6-xen-0010-xen-Add-Xen-s-sys-hypervisor-interface.patch, 1.1, NONE linux-2.6-xen-0011-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch, 1.1, NONE linux-2.6-xen-0012-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch, 1.1, NONE linux-2.6-xen-0013-xen-expose-set_pte_vaddr-and-make-xen-use-it.patch, 1.1, NONE linux-2.6-xen-0014-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch, 1.1, NONE linux-2.6-xen-0015-x86_64-Expose-set_pte_vaddr.patch, 1.1, NONE linux-2.6-xen-0016-x86_64-Split-set_pte_vaddr.patch, 1.1, NONE linux-2.6-xen-0017-x86_64-Add-clear_fixmap.patch, 1.1, NONE linux-2.6-xen-0018-xen-x86_64-Make-set_fixmap-a-paravirt-op-on-64-bi.patch, 1.1, NONE linux-2.6-xen-0019-xen-x86_64-Hack-to-set-vsyscall-pages-on-user-space.patch, 1.1, NONE linux-2.6-xen-0020-Handle-VSYSCALL_FIRST_PAGE-on-xen_set_pte.patch, 1.1, NONE linux-2.6-xen-0021-xen-x86_64-Remove-the-640K-1M-hole-and-disable-DMI.patch, 1.1, NONE linux-2.6-xen-0022-xen-x86_64-Add-update_va_mapping-64-bit-code.patch, 1.1, NONE linux-2.6-xen-0023-x86_64-Add-sync_cmpxchg.patch, 1.1, NONE linux-2.6-xen-0024-xen-x86_64-Implement-HYPERVISOR-MULTI-_update_desc.patch, 1.1, NONE linux-2.6-xen-0025-xen-x86_64-Add-hacky-64-bit-x86_-read-write-_percpu.patch, 1.1, NONE linux-2.6-xen-0026-xen-x86_64-Use-x86_read_percpu-only-to-refer-to-a.patch, 1.1, NONE linux-2.6-xen-0027-Add-FIX_PARAVIRT_BOOTAP-to-fixmap_64.h-too.patch, 1.1, NONE linux-2.6-xen-0028-Add-gate_offset-and-gate_segment-macros.patch, 1.1, NONE linux-2.6-xen-0029-xen_write_idt_entry-and-cvt_gate_to_trap.patch, 1.1, NONE linux-2.6-xen-0030-typedefs-for-pte_val-and-friends.patch, 1.1, NONE linux-2.6-xen-0031-x86_64-implementation-of-some-page.h-macros.patch, 1.1, NONE linux-2.6-xen-0032-Chainsaw-style-ifdefs.patch, 1.1, NONE linux-2.6-xen-0033-xen-Make-xen_pte_val-generic.patch, 1.1, NONE linux-2.6-xen-0034-More-chainsaw-ifdefs.patch, 1.1, NONE linux-2.6-xen-0035-Chainsaw-ifdefs-on-assembly-percpu-handling.patch, 1.1, NONE linux-2.6-xen-0036-x86_64-percpu-assembly-macros.patch, 1.1, NONE linux-2.6-xen-0037-Some-xen-asm.S-x86_64-code.patch, 1.1, NONE linux-2.6-xen-0038-Chainsaw-party-SPLITME.patch, 1.1, NONE linux-2.6-xen-0039-xen-asm.S-x86_64-notes.patch, 1.1, NONE linux-2.6-xen-0040-xen-x86_64-Make-hypercall-assembly-code-work.patch, 1.1, NONE linux-2.6-xen-0041-xen-x86_64-pda-initialization.patch, 1.1, NONE linux-2.6-xen-0042-Disable-early_printk-by-default.patch, 1.1, NONE linux-2.6-xen-0043-xen-Set-__HYPERVISOR_VIRT_START-for-x86_64.patch, 1.1, NONE linux-2.6-xen-0044-Set-__PAGE_OFFSET-as-required-by-Xen.patch, 1.1, NONE linux-2.6-xen-0045-DEBUG-Add-xprintk-to-log-directly-via-hypercall-fo.patch, 1.1, NONE linux-2.6-xen-0046-DEBUG-Add-xprintk-debugging-printk-prototype-to-hvc.patch, 1.1, NONE linux-2.6-xen-0047-Use-__pgd-on-mk_kernel_pgd.patch, 1.1, NONE linux-2.6-xen-0048-Include-user-page-tables-on-head_64.S.patch, 1.1, NONE linux-2.6-xen-0049-Avoid-using-mk_unsigned_long.patch, 1.1, NONE linux-2.6-xen-0050-Lots-of-unrelated-changes.patch, 1.1, NONE linux-2.6-xen-0051-Hack-disable-vsmp.patch, 1.1, NONE linux-2.6-xen-0052-Export-early_make_page_readonly.patch, 1.1, NONE linux-2.6-xen-0053-Disable-multicalls.c-too-verbose-debugging.patch, 1.1, NONE linux-2.6-xen-0054-Xen-64-bit-ready-MMU-operations.patch, 1.1, NONE linux-2.6-xen-0055-Some-xen-mmu-pv-ops-implemented.patch, 1.1, NONE linux-2.6-xen-0056-Trying-to-make-the-pagetable-initialization-code-wor.patch, 1.1, NONE linux-2.6-xen-0057-Xen-specific-find_early_table_space-FIXME.patch, 1.1, NONE linux-2.6-xen-0058-Xen-call-e820_print_map-when-setting-up-memory.patch, 1.1, NONE linux-2.6-xen-0059-Comment-debugging-msgs.patch, 1.1, NONE linux-2.6-xen-0060-Try-to-make-pagetables-read-only.patch, 1.1, NONE linux-2.6-xen-0061-Debug-dump-pgtables-on-make_page_readonly.patch, 1.1, NONE linux-2.6-xen-0062-Disable-apic-at-compile-time-FIXME.patch, 1.1, NONE linux-2.6-xen-0063-Parse-early-params-after-init_memory_mapping.patch, 1.1, NONE linux-2.6-xen-0064-xen-Move-addr_to_page-to-init.h.patch, 1.1, NONE linux-2.6-xen-0065-Make-xen_pxx_val-and-xen_make_pxx-handle-attr-bi.patch, 1.1, NONE linux-2.6-xen-0066-Pull-xen_finish_init_mappin-from-XS-upstream.patch, 1.1, NONE linux-2.6-xen-0067-Pull-spp_getpage-changes-from-XS-upstream-REVIEWM.patch, 1.1, NONE linux-2.6-xen-0068-Pull-xen_extend_init_mapping-from-XS-upstream-FIX.patch, 1.1, NONE linux-2.6-xen-0069-New-enum-fixed_addresses-values-REVIEWME.patch, 1.1, NONE linux-2.6-xen-0070-Reserve-bootmem-areas-used-by-Xen-FIXME.patch, 1.1, NONE linux-2.6-xen-0071-xen_convert_trap_info-use-sizeof-struct-gate_desc.patch, 1.1, NONE linux-2.6-xen-0072-Call-paravirt_pagetable_setup_-start-done-REVIEW.patch, 1.1, NONE linux-2.6-xen-0073-ifdef-CONFIG_X86_32-on-xen-enlighten.c-REVIEWME.patch, 1.1, NONE linux-2.6-xen-0074-Handle-Xen-exception-stack-it-is-different-from-bar.patch, 1.1, NONE linux-2.6-xen-0075-Implement-64-bit-version-of-HYPERVISOR_set_callbacks.patch, 1.1, NONE linux-2.6-xen-0076-Make-arch_vcpu_info-be-of-the-right-size-on-both-32.patch, 1.1, NONE linux-2.6-xen-0077-Implement-asm-xen_iret.patch, 1.1, NONE linux-2.6-xen-0078-xen-64-xen_iret-use-iretq-directly-if-returning-t.patch, 1.1, NONE linux-2.6-xen-0079-Implement-xen_irqenable_syscall_ret.patch, 1.1, NONE linux-2.6-xen-0080-DEBUG-xen_iret-always-return-through-the-hyperviso.patch, 1.1, NONE linux-2.6-xen-0081-Implement-some-xen-callbacks-on-xen-entry_64.S.patch, 1.1, NONE linux-2.6-xen-0082-Xen-specific-ifdef-hacks-on-kernel-entry_64.S-FIXM.patch, 1.1, NONE linux-2.6-xen-0083-Disable-syscall32-code-temporarily-FIXME.patch, 1.1, NONE linux-2.6-xen-0084-Use-__KERNEL_DS-as-SS-when-returning-to-a-kernel-thr.patch, 1.1, NONE linux-2.6-xen-0085-Use-apic_xen-on-genapic-by-default-FIXME.patch, 1.1, NONE linux-2.6-xen-0086-irq-vector-ifdef-chainsaw-FIXME.patch, 1.1, NONE linux-2.6-xen-0087-ifdef-chainsaw-on-syscall_init-FIXME.patch, 1.1, NONE linux-2.6-xen-0088-Pull-xen-genapic-implementation-from-upstream-Xen.patch, 1.1, NONE linux-2.6-xen-0089-Debugging-printk-s.patch, 1.1, NONE linux-2.6-xen-0090-Leave-lazy_cpu_mode-on-__switch_to.patch, 1.1, NONE linux-2.6-xen-0091-xen-64-Handle-fs-and-gs-on-xen_load_tls-properl.patch, 1.1, NONE linux-2.6-xen-0092-Disable-vcpu_info_placement-temporarily-FIXME.patch, 1.1, NONE linux-2.6-xen-0093-Fix-typo-on-ifdef-again.patch, 1.1, NONE linux-2.6-xen-0094-DEBUG-Don-t-try-to-actually-read-the-page-on-show_.patch, 1.1, NONE linux-2.6-xen-0095-Make-load_gs_index-a-paravirt-operation.patch, 1.1, NONE linux-2.6-xen-0096-xen-pgd_walk-use-limit-argument-instead-of-FIXADD.patch, 1.1, NONE linux-2.6-xen-0097-xen-pgd_walk-Eliminate-BUG_ON-limit-FIXADDR_TOP.patch, 1.1, NONE linux-2.6-xen-0098-xen-pgd_walk-accept-start-parameter.patch, 1.1, NONE linux-2.6-xen-0099-xen-64-reserve_bootmem-xen_start_info-area.patch, 1.1, NONE linux-2.6-xen-0100-pvops-64-call-paravirt_post_allocator_init-on-set.patch, 1.1, NONE linux-2.6-xen-0101-use-write_gdt_entry-on-vsyscall_set_cpu-CLEANME.patch, 1.1, NONE linux-2.6-xen-0102-xen-64-implement-xen_load_gs_index.patch, 1.1, NONE linux-2.6-xen-0103-Make-xen_pgd_unpin-non-static-REVIEWME.patch, 1.1, NONE linux-2.6-xen-0104-Xen-64-pgd-allocation-hack-FIXME.patch, 1.1, NONE linux-2.6-xen-0105-Set-both-kernel-and-user-PGDs-on-pgd_populate-FI.patch, 1.1, NONE linux-2.6-xen-0106-Multi-pagetable-write_cr3-implementation-FIXME.patch, 1.1, NONE linux-2.6-xen-0107-Disable-the-weird-count-loop-on-kcons_write_dom0.patch, 1.1, NONE linux-2.6-xen-0108-Make-xen_start_info-read-only.patch, 1.1, NONE linux-2.6-xen-0109-Hack-to-implement-return-to-userspace-without-SWAPGS.patch, 1.1, NONE linux-2.6-xen-0110-Xen-SEGBASE_-defines.patch, 1.1, NONE linux-2.6-xen-0111-Xen-HYPERVISOR_set_segment_base-implementation.patch, 1.1, NONE linux-2.6-xen-0112-Change-signature-of-paravirt_alloc_-pt-pd-REVIEWME.patch, 1.1, NONE linux-2.6-xen-0113-Comment-e820_print_map-call-TEMPORARY.patch, 1.1, NONE linux-2.6-xen-0114-Xen-missing-includes.patch, 1.1, NONE linux-2.6-xen-0115-asm-x86-pgtable_64.h-include-linux-spinlock.h.patch, 1.1, NONE linux-2.6-xen-0116-asm-x86-pgtable.h-include-asm-page.h.patch, 1.1, NONE linux-2.6-xen-0117-fix-pxxval_t-usage-on-mm-init_64.c.patch, 1.1, NONE linux-2.6-xen-0118-Missing-Xen-include.patch, 1.1, NONE linux-2.6-xen-0119-un-static-ipi_to_irq.patch, 1.1, NONE linux-2.6-xen-0120-Don-t-use-_PAGE_GLOBAL-bit-under-Xen-FIXME.patch, 1.1, NONE linux-2.6-xen-0121-Trying-to-organize-the-xen-bootmem-allocation-mess.patch, 1.1, NONE linux-2.6-xen-0122-Xen-reserve_bootmem-xenstore-and-console-interfac.patch, 1.1, NONE linux-2.6-xen-0123-pvops-64-call-paravirt_activate_mm-on-activate_mm.patch, 1.1, NONE linux-2.6-xen-0124-Xen-64-bit-support-on-xen_pgd_pin.patch, 1.1, NONE linux-2.6-xen-0125-Xen-64-pin-user-PGD-on-activate_mm-and-dup_mmap.patch, 1.1, NONE linux-2.6-xen-0126-Hack-pgd_walk-to-walk-to-TASK_SIZE-PAGE_SIZE-on-x8.patch, 1.1, NONE linux-2.6-xen-0127-Xen-64-Unpin-user-pagetable-on-xen_pgd_unpin.patch, 1.1, NONE linux-2.6-xen-0128-Use-un-pin_page-when-un-pinning-pgd.patch, 1.1, NONE linux-2.6-xen-0129-Allow-enabling-Xen-on-x86_64.patch, 1.1, NONE linux-2.6-xen-0130-Add-include-linux-spinlock_types.h-to-asm-x86-pgt.patch, 1.1, NONE linux-2.6-xen-0131-Restore-some-sanity-on-the-initial-pagetable-bootmem.patch, 1.1, NONE linux-2.6-xen-0132-Xen-Use-system_call_after_swapgs-as-the-syscall-c.patch, 1.1, NONE linux-2.6-xen-0133-Add-a-system_call_after_saveargs-label-to-entry_64.S.patch, 1.1, NONE linux-2.6-xen-0134-Create-xen-specific-syscall-entry.patch, 1.1, NONE linux-2.6-xen-0135-syscall-related-Xen-ifdefs-FIXME.patch, 1.1, NONE linux-2.6-xen-0136-Point-set_pte-to-xen_set_pte-since-the-beginning.patch, 1.1, NONE linux-2.6-xen-0137-DEBUG-slab-debugging.patch, 1.1, NONE linux-2.6-xen-0138-pvops-64-Include-rsi-on-the-register-clobber-list.patch, 1.1, NONE linux-2.6-xen-0139-Xen-64-quick-ugly-hack-to-fix-pgd_clear-pagetabl.patch, 1.1, NONE linux-2.6-xen-0140-Add-missing-acpi-include-to-xen-setup.c.patch, 1.1, NONE linux-2.6-xen-0141-Don-t-use-FIX_VDSO-on-64-bit.patch, 1.1, NONE linux-2.6-xen-0142-Mark-init-pages-read-write-again-on-free_init_pages.patch, 1.1, NONE linux-2.6-xen-0143-reserve_early-kernel-text-and-data-segments.patch, 1.1, NONE linux-2.6-xen-0144-Xen-Clear-__START_KERNEL_map-PTEs-on-free_init_page.patch, 1.1, NONE linux-2.6-xen-0145-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch, 1.1, NONE linux-2.6-xen-0146-Pull-xen_failsafe_callback-implementation-from-XenSo.patch, 1.1, NONE linux-2.6-xen-0147-Save-fs-and-gs-before-load_TLS-and-arch_leave_la.patch, 1.1, NONE linux-2.6-xen-0148-xen-64-Clear-fs-on-xen_load_tls.patch, 1.1, NONE linux-2.6-xen-0149-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch, 1.1, NONE linux-2.6-xen-0150-Introduce-xen_ia32_syscall.patch, 1.1, NONE linux-2.6-xen-0151-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch, 1.1, NONE linux-2.6-xen-0152-Make-the-int80-and-syscall-vdso32-implementations-se.patch, 1.1, NONE linux-2.6-xen-0153-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch, 1.1, NONE linux-2.6-xen-0154-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch, 1.1, NONE linux-2.6-xen-0155-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch, 1.1, NONE linux-2.6-xen-0156-X86_VSMP-make-not-depend-on-XEN-REVIEWME.patch, 1.1, NONE linux-2.6-xen-0157-Add-do_IRQ-prototype-to-asm-x86-irq_64.h.patch, 1.1, NONE linux-2.6-xen-0158-Disable-sysenter-on-x86_64-temporarily-REVIEWME.patch, 1.1, NONE linux-2.6-xen-0159-Add-xen_-alloc-release-_pud-functions-for-x86_64-x.patch, 1.1, NONE linux-2.6-xen-0160-Extract-reserve_initrd-from-x86_64_start_kernel.patch, 1.1, NONE linux-2.6-xen-0161-Make-reserve_initrd-non-static.patch, 1.1, NONE linux-2.6-xen-0162-xen-64-Reserve-initrd-on-xen_start_kernel-also.patch, 1.1, NONE linux-2.6.25.tar.bz2.sign, 1.1, NONE patch-2.6.26-rc6-git2.bz2.sign, 1.1, NONE patch-2.6.26-rc6.bz2.sign, 1.1, NONE Message-ID: <200807181458.m6IEwWtW010557@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9922 Modified Files: .cvsignore .gitignore Makefile Makefile.config config-debug config-generic config-ia64 config-ia64-generic config-nodebug config-powerpc-generic config-powerpc32-generic config-powerpc64 config-s390x config-sparc64-generic config-sparc64-smp config-x86-generic config-x86_64-generic config-xen-generic config-xen-x86_64 kernel.spec linux-2.6-debug-nmi-timeout.patch linux-2.6-execshield.patch linux-2.6-merge-efifb-imacfb.patch linux-2.6-net-8139-pio-modparam.patch linux-2.6-net-8139-pio-oqo2.patch linux-2.6-silence-noise.patch linux-2.6-utrace.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch sources upstream Added Files: ext4-patchqueue.patch git-linus.diff linux-2.6-debug-list_debug_rcu.patch linux-2.6-debug-softlockup-modules-list.patch linux-2.6-defaults-acpi-video.patch linux-2.6-export-shmem-bits-for-gem.patch linux-2.6-lockdep-uvc.patch linux-2.6-net-8139-pio-mmio-fallback.patch linux-2.6-ptrace-cleanup.patch linux-2.6-tracehook.patch linux-2.6-xen-0001-xen-execshield-Add-xen-specific-load_user_cs_desc.patch linux-2.6-xen-0002-xen-execshield-fix-endless-GPF-fault-loop.patch linux-2.6-xen-0003-xen-Add-a-vmlinuz-target.patch linux-2.6-xen-0004-xen-Add-empty-xenctrl-module.patch linux-2.6-xen-0005-xen-Add-proc-xen-capabilities.patch linux-2.6-xen-0006-xen-Add-proc-xen-privcmd.patch linux-2.6-xen-0007-xen-Add-proc-xen-xenbus.patch linux-2.6-xen-0008-xen-Add-Xen-s-sys-hypervisor-interface.patch linux-2.6-xen-0009-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch linux-2.6-xen-0010-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch linux-2.6-xen-0011-x86-paravirt-call-paravirt_pagetable_setup_-start.patch linux-2.6-xen-0012-pvops-64-call-paravirt_post_allocator_init-on-set.patch linux-2.6-xen-0013-x86_64-there-s-no-need-to-preallocate-level1_fixmap.patch linux-2.6-xen-0014-x86-clean-up-formatting-of-__switch_to.patch linux-2.6-xen-0015-x86-use-__page_aligned_data-bss.patch linux-2.6-xen-0016-x86_64-adjust-exception-frame-in-ia32entry.patch linux-2.6-xen-0017-x86_64-unstatic-get_local_pda.patch linux-2.6-xen-0018-xen-print-backtrace-on-multicall-failure.patch linux-2.6-xen-0019-xen-netfront-fix-xennet_release_tx_bufs.patch linux-2.6-xen-0020-xen-add-xen_arch_resume-xen_timer_resume-hook-for.patch linux-2.6-xen-0021-xen-define-set_pte-from-the-outset.patch linux-2.6-xen-0022-xen64-define-asm-xen-interface-for-64-bit.patch linux-2.6-xen-0023-xen-make-ELF-notes-work-for-32-and-64-bit.patch linux-2.6-xen-0024-xen-fix-64-bit-hypercall-variants.patch linux-2.6-xen-0025-xen64-fix-calls-into-hypercall-page.patch linux-2.6-xen-0026-xen64-add-extra-pv_mmu_ops.patch linux-2.6-xen-0027-xen64-random-ifdefs-to-mask-out-32-bit-only-code.patch linux-2.6-xen-0028-xen64-get-active_mm-from-the-pda.patch linux-2.6-xen-0029-xen-move-smp-setup-into-smp.c.patch linux-2.6-xen-0030-x86_64-add-workaround-for-no-gs-based-percpu.patch linux-2.6-xen-0031-xen64-smp.c-compile-hacking.patch linux-2.6-xen-0032-xen64-add-xen-head-code-to-head_64.S.patch linux-2.6-xen-0033-xen64-add-asm-offsets.patch linux-2.6-xen-0034-xen64-add-64-bit-assembler.patch linux-2.6-xen-0035-xen64-use-set_fixmap-for-shared_info-structure.patch linux-2.6-xen-0036-xen-cpu_detect-is-32-bit-only.patch linux-2.6-xen-0037-xen64-add-hypervisor-callbacks-for-events-etc.patch linux-2.6-xen-0038-xen64-early-mapping-setup.patch linux-2.6-xen-0039-xen64-64-bit-starts-using-set_pte-from-very-early.patch linux-2.6-xen-0040-xen64-map-an-initial-chunk-of-physical-memory.patch linux-2.6-xen-0041-xen32-create-initial-mappings-like-64-bit.patch linux-2.6-xen-0042-xen-fix-truncation-of-machine-address.patch linux-2.6-xen-0043-xen64-use-arbitrary_virt_to_machine-for-xen_set_pmd.patch linux-2.6-xen-0044-xen-set-num_processors.patch linux-2.6-xen-0045-xen64-defer-setting-pagetable-alloc-release-ops.patch linux-2.6-xen-0046-xen-use-set_pte_vaddr.patch linux-2.6-xen-0047-xen64-xen_write_idt_entry-and-cvt_gate_to_trap.patch linux-2.6-xen-0048-xen64-deal-with-extra-words-Xen-pushes-onto-excepti.patch linux-2.6-xen-0049-xen64-add-pvop-for-swapgs.patch linux-2.6-xen-0050-xen64-register-callbacks-in-arch-independent-way.patch linux-2.6-xen-0051-xen64-add-identity-irq-vector-map.patch linux-2.6-xen-0052-Xen64-HYPERVISOR_set_segment_base-implementation.patch linux-2.6-xen-0053-xen64-implement-xen_load_gs_index.patch linux-2.6-xen-0054-xen-rework-pgd_walk-to-deal-with-32-64-bit.patch linux-2.6-xen-0055-xen-make-sure-the-kernel-command-line-is-right.patch linux-2.6-xen-0056-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch linux-2.6-xen-0057-xen64-implement-failsafe-callback.patch linux-2.6-xen-0058-xen64-Clear-fs-on-xen_load_tls.patch linux-2.6-xen-0059-xen64-implement-64-bit-update_descriptor.patch linux-2.6-xen-0060-xen64-save-lots-of-registers.patch linux-2.6-xen-0061-xen64-allocate-and-manage-user-pagetables.patch linux-2.6-xen-0062-xen64-set-up-syscall-and-sysenter-entrypoints-for-6.patch linux-2.6-xen-0063-xen64-set-up-userspace-syscall-patch.patch linux-2.6-xen-0064-xen-implement-Xen-write_msr-operation.patch linux-2.6-xen-0065-xen-update-Kconfig-to-allow-64-bit-Xen.patch linux-2.6-xen-0066-xen64-fix-HVC_XEN-build-dependency.patch linux-2.6-xen-0067-xen64-fix-build-error-on-32-bit-HIGHMEM.patch linux-2.6-xen-0068-Revert-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch linux-2.6-xen-0069-Revert-x86_64-there-s-no-need-to-preallocate-level.patch linux-2.6-xen-0070-xen64-disable-32-bit-syscall-sysenter-if-not-suppor.patch linux-2.6-xen-0071-x86-xen-vdso-fix-build-error.patch linux-2.6-xen-0072-x86_64-further-cleanup-of-32-bit-compat-syscall-mec.patch linux-2.6-xen-0073-x86-xen-no-need-to-disable-vdso32.patch linux-2.6-xen-0074-x86_64-adjust-exception-frame-on-paranoid-exception.patch linux-2.6-xen-0075-x86-xen-power-fix-up-config-dependencies-on-PM.patch linux-2.6-xen-0076-linux-next-pci-tree-build-failure.patch linux-2.6.26.tar.bz2.sign patch-2.6.26-git6.bz2.sign Removed Files: config-sparc config-sparc-generic config-sparc-smp config-sparc64 linux-2.6-alsa-kill-annoying-messages.patch linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch linux-2.6-powerpc-zImage-32MiB.patch linux-2.6-ppc-use-libgcc.patch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch linux-2.6-selinux-deffered-context-mapping.patch linux-2.6-selinux-generic-ioctl.patch linux-2.6-selinux-get-invalid-xattrs.patch linux-2.6-selinux-new-proc-checks.patch linux-2.6-silence-x86-decompressor.patch linux-2.6-uvcvideo.patch linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch linux-2.6-xen-0004-xen-Enable-Xen-console-by-default-in-domU.patch linux-2.6-xen-0005-xen-Add-a-vmlinuz-target.patch linux-2.6-xen-0006-xen-Add-empty-xenctrl-module.patch linux-2.6-xen-0007-xen-Add-proc-xen-capabilities.patch linux-2.6-xen-0008-xen-Add-proc-xen-privcmd.patch linux-2.6-xen-0009-xen-Add-proc-xen-xenbus.patch linux-2.6-xen-0010-xen-Add-Xen-s-sys-hypervisor-interface.patch linux-2.6-xen-0011-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch linux-2.6-xen-0012-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch linux-2.6-xen-0013-xen-expose-set_pte_vaddr-and-make-xen-use-it.patch linux-2.6-xen-0014-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch linux-2.6-xen-0015-x86_64-Expose-set_pte_vaddr.patch linux-2.6-xen-0016-x86_64-Split-set_pte_vaddr.patch linux-2.6-xen-0017-x86_64-Add-clear_fixmap.patch linux-2.6-xen-0018-xen-x86_64-Make-set_fixmap-a-paravirt-op-on-64-bi.patch linux-2.6-xen-0019-xen-x86_64-Hack-to-set-vsyscall-pages-on-user-space.patch linux-2.6-xen-0020-Handle-VSYSCALL_FIRST_PAGE-on-xen_set_pte.patch linux-2.6-xen-0021-xen-x86_64-Remove-the-640K-1M-hole-and-disable-DMI.patch linux-2.6-xen-0022-xen-x86_64-Add-update_va_mapping-64-bit-code.patch linux-2.6-xen-0023-x86_64-Add-sync_cmpxchg.patch linux-2.6-xen-0024-xen-x86_64-Implement-HYPERVISOR-MULTI-_update_desc.patch linux-2.6-xen-0025-xen-x86_64-Add-hacky-64-bit-x86_-read-write-_percpu.patch linux-2.6-xen-0026-xen-x86_64-Use-x86_read_percpu-only-to-refer-to-a.patch linux-2.6-xen-0027-Add-FIX_PARAVIRT_BOOTAP-to-fixmap_64.h-too.patch linux-2.6-xen-0028-Add-gate_offset-and-gate_segment-macros.patch linux-2.6-xen-0029-xen_write_idt_entry-and-cvt_gate_to_trap.patch linux-2.6-xen-0030-typedefs-for-pte_val-and-friends.patch linux-2.6-xen-0031-x86_64-implementation-of-some-page.h-macros.patch linux-2.6-xen-0032-Chainsaw-style-ifdefs.patch linux-2.6-xen-0033-xen-Make-xen_pte_val-generic.patch linux-2.6-xen-0034-More-chainsaw-ifdefs.patch linux-2.6-xen-0035-Chainsaw-ifdefs-on-assembly-percpu-handling.patch linux-2.6-xen-0036-x86_64-percpu-assembly-macros.patch linux-2.6-xen-0037-Some-xen-asm.S-x86_64-code.patch linux-2.6-xen-0038-Chainsaw-party-SPLITME.patch linux-2.6-xen-0039-xen-asm.S-x86_64-notes.patch linux-2.6-xen-0040-xen-x86_64-Make-hypercall-assembly-code-work.patch linux-2.6-xen-0041-xen-x86_64-pda-initialization.patch linux-2.6-xen-0042-Disable-early_printk-by-default.patch linux-2.6-xen-0043-xen-Set-__HYPERVISOR_VIRT_START-for-x86_64.patch linux-2.6-xen-0044-Set-__PAGE_OFFSET-as-required-by-Xen.patch linux-2.6-xen-0045-DEBUG-Add-xprintk-to-log-directly-via-hypercall-fo.patch linux-2.6-xen-0046-DEBUG-Add-xprintk-debugging-printk-prototype-to-hvc.patch linux-2.6-xen-0047-Use-__pgd-on-mk_kernel_pgd.patch linux-2.6-xen-0048-Include-user-page-tables-on-head_64.S.patch linux-2.6-xen-0049-Avoid-using-mk_unsigned_long.patch linux-2.6-xen-0050-Lots-of-unrelated-changes.patch linux-2.6-xen-0051-Hack-disable-vsmp.patch linux-2.6-xen-0052-Export-early_make_page_readonly.patch linux-2.6-xen-0053-Disable-multicalls.c-too-verbose-debugging.patch linux-2.6-xen-0054-Xen-64-bit-ready-MMU-operations.patch linux-2.6-xen-0055-Some-xen-mmu-pv-ops-implemented.patch linux-2.6-xen-0056-Trying-to-make-the-pagetable-initialization-code-wor.patch linux-2.6-xen-0057-Xen-specific-find_early_table_space-FIXME.patch linux-2.6-xen-0058-Xen-call-e820_print_map-when-setting-up-memory.patch linux-2.6-xen-0059-Comment-debugging-msgs.patch linux-2.6-xen-0060-Try-to-make-pagetables-read-only.patch linux-2.6-xen-0061-Debug-dump-pgtables-on-make_page_readonly.patch linux-2.6-xen-0062-Disable-apic-at-compile-time-FIXME.patch linux-2.6-xen-0063-Parse-early-params-after-init_memory_mapping.patch linux-2.6-xen-0064-xen-Move-addr_to_page-to-init.h.patch linux-2.6-xen-0065-Make-xen_pxx_val-and-xen_make_pxx-handle-attr-bi.patch linux-2.6-xen-0066-Pull-xen_finish_init_mappin-from-XS-upstream.patch linux-2.6-xen-0067-Pull-spp_getpage-changes-from-XS-upstream-REVIEWM.patch linux-2.6-xen-0068-Pull-xen_extend_init_mapping-from-XS-upstream-FIX.patch linux-2.6-xen-0069-New-enum-fixed_addresses-values-REVIEWME.patch linux-2.6-xen-0070-Reserve-bootmem-areas-used-by-Xen-FIXME.patch linux-2.6-xen-0071-xen_convert_trap_info-use-sizeof-struct-gate_desc.patch linux-2.6-xen-0072-Call-paravirt_pagetable_setup_-start-done-REVIEW.patch linux-2.6-xen-0073-ifdef-CONFIG_X86_32-on-xen-enlighten.c-REVIEWME.patch linux-2.6-xen-0074-Handle-Xen-exception-stack-it-is-different-from-bar.patch linux-2.6-xen-0075-Implement-64-bit-version-of-HYPERVISOR_set_callbacks.patch linux-2.6-xen-0076-Make-arch_vcpu_info-be-of-the-right-size-on-both-32.patch linux-2.6-xen-0077-Implement-asm-xen_iret.patch linux-2.6-xen-0078-xen-64-xen_iret-use-iretq-directly-if-returning-t.patch linux-2.6-xen-0079-Implement-xen_irqenable_syscall_ret.patch linux-2.6-xen-0080-DEBUG-xen_iret-always-return-through-the-hyperviso.patch linux-2.6-xen-0081-Implement-some-xen-callbacks-on-xen-entry_64.S.patch linux-2.6-xen-0082-Xen-specific-ifdef-hacks-on-kernel-entry_64.S-FIXM.patch linux-2.6-xen-0083-Disable-syscall32-code-temporarily-FIXME.patch linux-2.6-xen-0084-Use-__KERNEL_DS-as-SS-when-returning-to-a-kernel-thr.patch linux-2.6-xen-0085-Use-apic_xen-on-genapic-by-default-FIXME.patch linux-2.6-xen-0086-irq-vector-ifdef-chainsaw-FIXME.patch linux-2.6-xen-0087-ifdef-chainsaw-on-syscall_init-FIXME.patch linux-2.6-xen-0088-Pull-xen-genapic-implementation-from-upstream-Xen.patch linux-2.6-xen-0089-Debugging-printk-s.patch linux-2.6-xen-0090-Leave-lazy_cpu_mode-on-__switch_to.patch linux-2.6-xen-0091-xen-64-Handle-fs-and-gs-on-xen_load_tls-properl.patch linux-2.6-xen-0092-Disable-vcpu_info_placement-temporarily-FIXME.patch linux-2.6-xen-0093-Fix-typo-on-ifdef-again.patch linux-2.6-xen-0094-DEBUG-Don-t-try-to-actually-read-the-page-on-show_.patch linux-2.6-xen-0095-Make-load_gs_index-a-paravirt-operation.patch linux-2.6-xen-0096-xen-pgd_walk-use-limit-argument-instead-of-FIXADD.patch linux-2.6-xen-0097-xen-pgd_walk-Eliminate-BUG_ON-limit-FIXADDR_TOP.patch linux-2.6-xen-0098-xen-pgd_walk-accept-start-parameter.patch linux-2.6-xen-0099-xen-64-reserve_bootmem-xen_start_info-area.patch linux-2.6-xen-0100-pvops-64-call-paravirt_post_allocator_init-on-set.patch linux-2.6-xen-0101-use-write_gdt_entry-on-vsyscall_set_cpu-CLEANME.patch linux-2.6-xen-0102-xen-64-implement-xen_load_gs_index.patch linux-2.6-xen-0103-Make-xen_pgd_unpin-non-static-REVIEWME.patch linux-2.6-xen-0104-Xen-64-pgd-allocation-hack-FIXME.patch linux-2.6-xen-0105-Set-both-kernel-and-user-PGDs-on-pgd_populate-FI.patch linux-2.6-xen-0106-Multi-pagetable-write_cr3-implementation-FIXME.patch linux-2.6-xen-0107-Disable-the-weird-count-loop-on-kcons_write_dom0.patch linux-2.6-xen-0108-Make-xen_start_info-read-only.patch linux-2.6-xen-0109-Hack-to-implement-return-to-userspace-without-SWAPGS.patch linux-2.6-xen-0110-Xen-SEGBASE_-defines.patch linux-2.6-xen-0111-Xen-HYPERVISOR_set_segment_base-implementation.patch linux-2.6-xen-0112-Change-signature-of-paravirt_alloc_-pt-pd-REVIEWME.patch linux-2.6-xen-0113-Comment-e820_print_map-call-TEMPORARY.patch linux-2.6-xen-0114-Xen-missing-includes.patch linux-2.6-xen-0115-asm-x86-pgtable_64.h-include-linux-spinlock.h.patch linux-2.6-xen-0116-asm-x86-pgtable.h-include-asm-page.h.patch linux-2.6-xen-0117-fix-pxxval_t-usage-on-mm-init_64.c.patch linux-2.6-xen-0118-Missing-Xen-include.patch linux-2.6-xen-0119-un-static-ipi_to_irq.patch linux-2.6-xen-0120-Don-t-use-_PAGE_GLOBAL-bit-under-Xen-FIXME.patch linux-2.6-xen-0121-Trying-to-organize-the-xen-bootmem-allocation-mess.patch linux-2.6-xen-0122-Xen-reserve_bootmem-xenstore-and-console-interfac.patch linux-2.6-xen-0123-pvops-64-call-paravirt_activate_mm-on-activate_mm.patch linux-2.6-xen-0124-Xen-64-bit-support-on-xen_pgd_pin.patch linux-2.6-xen-0125-Xen-64-pin-user-PGD-on-activate_mm-and-dup_mmap.patch linux-2.6-xen-0126-Hack-pgd_walk-to-walk-to-TASK_SIZE-PAGE_SIZE-on-x8.patch linux-2.6-xen-0127-Xen-64-Unpin-user-pagetable-on-xen_pgd_unpin.patch linux-2.6-xen-0128-Use-un-pin_page-when-un-pinning-pgd.patch linux-2.6-xen-0129-Allow-enabling-Xen-on-x86_64.patch linux-2.6-xen-0130-Add-include-linux-spinlock_types.h-to-asm-x86-pgt.patch linux-2.6-xen-0131-Restore-some-sanity-on-the-initial-pagetable-bootmem.patch linux-2.6-xen-0132-Xen-Use-system_call_after_swapgs-as-the-syscall-c.patch linux-2.6-xen-0133-Add-a-system_call_after_saveargs-label-to-entry_64.S.patch linux-2.6-xen-0134-Create-xen-specific-syscall-entry.patch linux-2.6-xen-0135-syscall-related-Xen-ifdefs-FIXME.patch linux-2.6-xen-0136-Point-set_pte-to-xen_set_pte-since-the-beginning.patch linux-2.6-xen-0137-DEBUG-slab-debugging.patch linux-2.6-xen-0138-pvops-64-Include-rsi-on-the-register-clobber-list.patch linux-2.6-xen-0139-Xen-64-quick-ugly-hack-to-fix-pgd_clear-pagetabl.patch linux-2.6-xen-0140-Add-missing-acpi-include-to-xen-setup.c.patch linux-2.6-xen-0141-Don-t-use-FIX_VDSO-on-64-bit.patch linux-2.6-xen-0142-Mark-init-pages-read-write-again-on-free_init_pages.patch linux-2.6-xen-0143-reserve_early-kernel-text-and-data-segments.patch linux-2.6-xen-0144-Xen-Clear-__START_KERNEL_map-PTEs-on-free_init_page.patch linux-2.6-xen-0145-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch linux-2.6-xen-0146-Pull-xen_failsafe_callback-implementation-from-XenSo.patch linux-2.6-xen-0147-Save-fs-and-gs-before-load_TLS-and-arch_leave_la.patch linux-2.6-xen-0148-xen-64-Clear-fs-on-xen_load_tls.patch linux-2.6-xen-0149-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch linux-2.6-xen-0150-Introduce-xen_ia32_syscall.patch linux-2.6-xen-0151-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch linux-2.6-xen-0152-Make-the-int80-and-syscall-vdso32-implementations-se.patch linux-2.6-xen-0153-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch linux-2.6-xen-0154-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch linux-2.6-xen-0155-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch linux-2.6-xen-0156-X86_VSMP-make-not-depend-on-XEN-REVIEWME.patch linux-2.6-xen-0157-Add-do_IRQ-prototype-to-asm-x86-irq_64.h.patch linux-2.6-xen-0158-Disable-sysenter-on-x86_64-temporarily-REVIEWME.patch linux-2.6-xen-0159-Add-xen_-alloc-release-_pud-functions-for-x86_64-x.patch linux-2.6-xen-0160-Extract-reserve_initrd-from-x86_64_start_kernel.patch linux-2.6-xen-0161-Make-reserve_initrd-non-static.patch linux-2.6-xen-0162-xen-64-Reserve-initrd-on-xen_start_kernel-also.patch linux-2.6.25.tar.bz2.sign patch-2.6.26-rc6-git2.bz2.sign patch-2.6.26-rc6.bz2.sign Log Message: * Fri Jun 18 2008 Mark McLoughlin - Rebase to kernel-2_6_27-0_159_rc0_git6_fc10 - Drop Eduardo's 64bit tree and switch to Jeremy's x86.git tree - Re-enable SMP etc. ext4-patchqueue.patch: --- NEW FILE ext4-patchqueue.patch --- Index: linux-2.6/fs/ext4/ext4.h =================================================================== --- linux-2.6.orig/fs/ext4/ext4.h 2008-07-07 20:08:38.789291868 -0500 +++ linux-2.6/fs/ext4/ext4.h 2008-07-14 17:16:50.156291373 -0500 @@ -22,7 +22,7 @@ #include "ext4_i.h" /* - * The second extended filesystem constants/structures + * The fourth extended filesystem constants/structures */ /* @@ -45,7 +45,7 @@ #define ext4_debug(f, a...) \ do { \ printk (KERN_DEBUG "EXT4-fs DEBUG (%s, %d): %s:", \ - __FILE__, __LINE__, __FUNCTION__); \ + __FILE__, __LINE__, __func__); \ printk (KERN_DEBUG f, ## a); \ } while (0) #else @@ -74,6 +74,9 @@ #define EXT4_MB_HINT_GOAL_ONLY 256 /* goal is meaningful */ #define EXT4_MB_HINT_TRY_GOAL 512 +/* blocks already pre-reserved by delayed allocation */ +#define EXT4_MB_DELALLOC_RESERVED 1024 + struct ext4_allocation_request { /* target inode for block we're allocating */ @@ -94,6 +97,11 @@ struct ext4_allocation_request { unsigned long len; /* flags. see above EXT4_MB_HINT_* */ unsigned long flags; + /* + * for ext4 online defrag: + * the block group which is excepted from allocation target + */ + long long excepted_group; }; /* @@ -170,6 +178,15 @@ struct ext4_group_desc __u32 bg_reserved2[3]; }; +/* + * Structure of a flex block group info + */ + +struct flex_groups { + __u32 free_inodes; + __u32 free_blocks; +}; + #define EXT4_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not in use */ #define EXT4_BG_BLOCK_UNINIT 0x0002 /* Block bitmap not in use */ #define EXT4_BG_INODE_ZEROED 0x0004 /* On-disk itable initialized to zero */ @@ -289,6 +306,14 @@ struct ext4_new_group_data { #define EXT4_IOC_GETRSVSZ _IOR('f', 5, long) #define EXT4_IOC_SETRSVSZ _IOW('f', 6, long) #define EXT4_IOC_MIGRATE _IO('f', 7) +#define EXT4_IOC_FIBMAP _IOW('f', 9, ext4_fsblk_t) +#define EXT4_IOC_DEFRAG _IOW('f', 10, struct ext4_ext_defrag_data) +#define EXT4_IOC_GROUP_INFO _IOW('f', 11, struct ext4_group_data_info) +#define EXT4_IOC_FREE_BLOCKS_INFO _IOW('f', 12, struct ext4_extents_info) +#define EXT4_IOC_EXTENTS_INFO _IOW('f', 13, struct ext4_extents_info) +#define EXT4_IOC_RESERVE_BLOCK _IOW('f', 14, struct ext4_extents_info) +#define EXT4_IOC_MOVE_VICTIM _IOW('f', 15, struct ext4_extents_info) +#define EXT4_IOC_BLOCK_RELEASE _IO('f', 8) /* * ioctl commands in 32 bit emulation @@ -306,6 +331,57 @@ struct ext4_new_group_data { #define EXT4_IOC32_GETVERSION_OLD FS_IOC32_GETVERSION #define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION +/* + * Will go away. + * ext4 online defrag supports only 4KB block size. + */ +#define DEFRAG_BLOCK_SIZE 4096 + +/* + * The following four macros are used for the defrag force mode. + * + * DEFRAG_MAX_ENT: the maximum number of extents for exchanging between + * kernel-space and user-space per an ioctl + * DEFRAG_FORCE_TRY: check whether we have free space fragmentation or not + * DEFRAG_FORCE_VICTIM: move victim extents to make sufficient space + * DEFRAG_FORCE_GATHER: move the target file into the free space made in the + * DEFRAG_FORCE_VICTIM phase + */ +#define DEFRAG_MAX_ENT 32 +#define DEFRAG_FORCE_TRY 1 +#define DEFRAG_FORCE_VICTIM 2 +#define DEFRAG_FORCE_GATHER 3 + +struct ext4_extent_data { + ext4_lblk_t block; /* start logical block number */ + ext4_fsblk_t start; /* start physical block number */ + int len; /* blocks count */ +}; + +struct ext4_ext_defrag_data { + ext4_lblk_t start_offset; /* start offset to defrag in blocks */ + ext4_lblk_t defrag_size; /* size of defrag in blocks */ + ext4_fsblk_t goal; /* block offset for allocation */ + int flag; /* free space mode flag */ + struct ext4_extent_data ext; +}; + +struct ext4_group_data_info { + int s_blocks_per_group; /* blocks per group */ + int s_inodes_per_group; /* inodes per group */ +}; + +struct ext4_extents_info { + unsigned long long ino; /* inode number */ + int max_entries; /* maximum extents count */ + int entries; /* extent number/count */ + ext4_lblk_t f_offset; /* file offset */ + ext4_grpblk_t g_offset; /* group offset */ + ext4_fsblk_t goal; /* block offset for allocation */ + struct ext4_extent_data ext[DEFRAG_MAX_ENT]; +}; + +#define EXT4_TRANS_META_BLOCKS 4 /* bitmap + group desc + sb + inode */ /* * Mount options @@ -527,6 +603,7 @@ do { \ #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ #define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */ #define EXT4_MOUNT_MBALLOC 0x4000000 /* Buddy allocation support */ +#define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ /* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */ #ifndef _LINUX_EXT2_FS_H #define clear_opt(o, opt) o &= ~EXT4_MOUNT_##opt @@ -647,7 +724,10 @@ struct ext4_super_block { __le16 s_mmp_interval; /* # seconds to wait in MMP checking */ __le64 s_mmp_block; /* Block for multi-mount protection */ __le32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/ - __u32 s_reserved[163]; /* Padding to the end of the block */ + __u8 s_log_groups_per_flex; /* FLEX_BG group size */ + __u8 s_reserved_char_pad2; + __le16 s_reserved_pad; + __u32 s_reserved[162]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ @@ -958,12 +1038,17 @@ extern ext4_grpblk_t ext4_block_group_of extern int ext4_bg_has_super(struct super_block *sb, ext4_group_t group); extern unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group); -extern ext4_fsblk_t ext4_new_block (handle_t *handle, struct inode *inode, +extern ext4_fsblk_t ext4_new_meta_block(handle_t *handle, struct inode *inode, ext4_fsblk_t goal, int *errp); -extern ext4_fsblk_t ext4_new_blocks (handle_t *handle, struct inode *inode, +extern ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode, ext4_fsblk_t goal, unsigned long *count, int *errp); -extern ext4_fsblk_t ext4_new_blocks_old(handle_t *handle, struct inode *inode, +extern ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode, + ext4_lblk_t iblock, ext4_fsblk_t goal, + unsigned long *count, int *errp); +extern ext4_fsblk_t ext4_old_new_blocks(handle_t *handle, struct inode *inode, ext4_fsblk_t goal, unsigned long *count, int *errp); +extern ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi, + ext4_fsblk_t nblocks); extern void ext4_free_blocks (handle_t *handle, struct inode *inode, ext4_fsblk_t block, unsigned long count, int metadata); extern void ext4_free_blocks_sb (handle_t *handle, struct super_block *sb, @@ -977,6 +1062,17 @@ extern struct ext4_group_desc * ext4_get extern int ext4_should_retry_alloc(struct super_block *sb, int *retries); extern void ext4_init_block_alloc_info(struct inode *); extern void ext4_rsv_window_add(struct super_block *sb, struct ext4_reserve_window_node *rsv); +extern void try_to_extend_reservation(struct ext4_reserve_window_node *, + struct super_block *, int); +extern int alloc_new_reservation(struct ext4_reserve_window_node *, + ext4_grpblk_t, struct super_block *, + ext4_group_t, struct buffer_head *); +extern ext4_grpblk_t bitmap_search_next_usable_block(ext4_grpblk_t, + struct buffer_head *, ext4_grpblk_t); +extern int rsv_is_empty(struct ext4_reserve_window *rsv); +extern int goal_in_my_reservation(struct ext4_reserve_window *rsv, + ext4_grpblk_t grp_goal, ext4_group_t group, + struct super_block *sb); /* dir.c */ extern int ext4_check_dir_entry(const char *, struct inode *, @@ -986,6 +1082,7 @@ extern int ext4_htree_store_dirent(struc __u32 minor_hash, struct ext4_dir_entry_2 *dirent); extern void ext4_htree_free_dir_info(struct dir_private_info *p); +extern sector_t ext4_bmap(struct address_space *mapping, sector_t block); /* fsync.c */ [...9904 lines suppressed...] + unsigned int hole_size; + struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); + u64 len_bytes, phys_bytes, virt_bytes; + struct buffer_head *di_bh = NULL; + struct ocfs2_extent_rec rec; + + ret = fiemap_check_flags(fieinfo, OCFS2_FIEMAP_FLAGS); + if (ret) + return ret; + + ret = ocfs2_inode_lock(inode, &di_bh, 0); + if (ret) { + mlog_errno(ret); + goto out; + } + + down_read(&OCFS2_I(inode)->ip_alloc_sem); + + /* + * Handle inline-data separately. + */ + if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) { + ret = ocfs2_fiemap_inline(inode, di_bh, fieinfo, map_start); + goto out_unlock; + } + + cpos = map_start >> osb->s_clustersize_bits; + mapping_end = ocfs2_clusters_for_bytes(inode->i_sb, + map_start + map_len); + mapping_end -= cpos; + is_last = 0; + while (cpos < mapping_end && !is_last) { + u32 fe_flags; + + ret = ocfs2_get_clusters_nocache(inode, di_bh, cpos, + &hole_size, &rec, &is_last); + if (ret) { + mlog_errno(ret); + goto out; + } + + if (rec.e_blkno == 0ULL) { + cpos += hole_size; + continue; + } + + fe_flags = 0; + if (rec.e_flags & OCFS2_EXT_UNWRITTEN) + fe_flags |= FIEMAP_EXTENT_UNWRITTEN; + if (is_last) + fe_flags |= FIEMAP_EXTENT_LAST; + len_bytes = (u64)le16_to_cpu(rec.e_leaf_clusters) << osb->s_clustersize_bits; + phys_bytes = le64_to_cpu(rec.e_blkno) << osb->sb->s_blocksize_bits; + virt_bytes = (u64)le32_to_cpu(rec.e_cpos) << osb->s_clustersize_bits; + + ret = fiemap_fill_next_extent(fieinfo, virt_bytes, phys_bytes, + len_bytes, fe_flags, + inode->i_sb->s_dev); + if (ret) + break; + + cpos = le32_to_cpu(rec.e_cpos)+ le16_to_cpu(rec.e_leaf_clusters); + } + + if (ret > 0) + ret = 0; + +out_unlock: + brelse(di_bh); + + up_read(&OCFS2_I(inode)->ip_alloc_sem); + + ocfs2_inode_unlock(inode, 0); +out: + + return ret; +} Index: linux-2.6/fs/ocfs2/extent_map.h =================================================================== --- linux-2.6.orig/fs/ocfs2/extent_map.h 2008-07-14 17:14:57.397291280 -0500 +++ linux-2.6/fs/ocfs2/extent_map.h 2008-07-14 17:16:47.259290989 -0500 @@ -50,4 +50,7 @@ int ocfs2_get_clusters(struct inode *ino int ocfs2_extent_map_get_blocks(struct inode *inode, u64 v_blkno, u64 *p_blkno, u64 *ret_count, unsigned int *extent_flags); +int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 map_start, u64 map_len); + #endif /* _EXTENT_MAP_H */ Index: linux-2.6/fs/ocfs2/file.c =================================================================== --- linux-2.6.orig/fs/ocfs2/file.c 2008-07-14 17:14:57.397291280 -0500 +++ linux-2.6/fs/ocfs2/file.c 2008-07-14 17:16:47.285290893 -0500 @@ -2228,6 +2228,7 @@ const struct inode_operations ocfs2_file .getattr = ocfs2_getattr, .permission = ocfs2_permission, .fallocate = ocfs2_fallocate, + .fiemap = ocfs2_fiemap, }; const struct inode_operations ocfs2_special_file_iops = { Index: linux-2.6/fs/ext2/ext2.h =================================================================== --- linux-2.6.orig/fs/ext2/ext2.h 2008-07-14 17:14:53.944291751 -0500 +++ linux-2.6/fs/ext2/ext2.h 2008-07-14 17:16:48.757291178 -0500 @@ -133,6 +133,8 @@ extern void ext2_truncate (struct inode extern int ext2_setattr (struct dentry *, struct iattr *); extern void ext2_set_inode_flags(struct inode *inode); extern void ext2_get_inode_flags(struct ext2_inode_info *); +extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len); int __ext2_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata); Index: linux-2.6/fs/ext2/file.c =================================================================== --- linux-2.6.orig/fs/ext2/file.c 2008-07-14 17:14:53.944291751 -0500 +++ linux-2.6/fs/ext2/file.c 2008-07-14 17:16:48.782291153 -0500 @@ -86,4 +86,5 @@ const struct inode_operations ext2_file_ #endif .setattr = ext2_setattr, .permission = ext2_permission, + .fiemap = ext2_fiemap, }; Index: linux-2.6/fs/ext2/inode.c =================================================================== --- linux-2.6.orig/fs/ext2/inode.c 2008-07-14 17:14:53.944291751 -0500 +++ linux-2.6/fs/ext2/inode.c 2008-07-14 17:16:48.825290935 -0500 @@ -31,6 +31,7 @@ #include #include #include +#include #include "ext2.h" #include "acl.h" #include "xip.h" @@ -704,6 +705,13 @@ int ext2_get_block(struct inode *inode, } +int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len) +{ + return generic_block_fiemap(inode, fieinfo, start, len, + ext2_get_block); +} + static int ext2_writepage(struct page *page, struct writeback_control *wbc) { return block_write_full_page(page, ext2_get_block, wbc); Index: linux-2.6/fs/ext3/file.c =================================================================== --- linux-2.6.orig/fs/ext3/file.c 2008-07-14 17:14:53.954291057 -0500 +++ linux-2.6/fs/ext3/file.c 2008-07-14 17:16:48.875291196 -0500 @@ -134,5 +134,6 @@ const struct inode_operations ext3_file_ .removexattr = generic_removexattr, #endif .permission = ext3_permission, + .fiemap = ext3_fiemap, }; Index: linux-2.6/fs/ext3/inode.c =================================================================== --- linux-2.6.orig/fs/ext3/inode.c 2008-07-14 17:14:53.954291057 -0500 +++ linux-2.6/fs/ext3/inode.c 2008-07-14 17:16:48.901291166 -0500 @@ -36,6 +36,7 @@ #include #include #include +#include #include "xattr.h" #include "acl.h" @@ -981,6 +982,13 @@ out: return ret; } +int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len) +{ + return generic_block_fiemap(inode, fieinfo, start, len, + ext3_get_block); +} + /* * `handle' can be NULL if create is zero */ Index: linux-2.6/include/linux/ext3_fs.h =================================================================== --- linux-2.6.orig/include/linux/ext3_fs.h 2008-07-14 17:14:53.955291262 -0500 +++ linux-2.6/include/linux/ext3_fs.h 2008-07-14 17:16:48.991290977 -0500 @@ -836,6 +836,8 @@ extern void ext3_truncate (struct inode extern void ext3_set_inode_flags(struct inode *); extern void ext3_get_inode_flags(struct ext3_inode_info *); extern void ext3_set_aops(struct inode *inode); +extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len); /* ioctl.c */ extern int ext3_ioctl (struct inode *, struct file *, unsigned int, git-linus.diff: ***** Error reading new file: [Errno 2] No such file or directory: 'git-linus.diff' linux-2.6-debug-list_debug_rcu.patch: --- NEW FILE linux-2.6-debug-list_debug_rcu.patch --- list debug support for the rcu variants of the list helpers. Also factor out the checking. Signed-off-by: Dave Jones diff --git a/include/linux/list.h b/include/linux/list.h index 08cf4f6..f1bab0c 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -90,6 +90,7 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head) * This is only for internal list manipulation where we know * the prev/next entries already! */ +#ifndef CONFIG_DEBUG_LIST static inline void __list_add_rcu(struct list_head * new, struct list_head * prev, struct list_head * next) { @@ -99,6 +100,10 @@ static inline void __list_add_rcu(struct list_head * new, next->prev = new; prev->next = new; } +#else +extern void __list_add_rcu(struct list_head *new, + struct list_head *prev, struct list_head *next); +#endif /** * list_add_rcu - add a new entry to rcu-protected list @@ -197,11 +202,15 @@ extern void list_del(struct list_head *entry); * or call_rcu() must be used to defer freeing until an RCU * grace period has elapsed. */ +#ifndef CONFIG_DEBUG_LIST static inline void list_del_rcu(struct list_head *entry) { __list_del(entry->prev, entry->next); entry->prev = LIST_POISON2; } +#else +extern void list_del_rcu(struct list_head *entry); +#endif /** * list_replace - replace old entry by new one diff --git a/lib/list_debug.c b/lib/list_debug.c index 4350ba9..609e5a8 100644 --- a/lib/list_debug.c +++ b/lib/list_debug.c @@ -9,6 +9,39 @@ #include #include +static void listcheck_add(struct list_head *next, + struct list_head *prev, char *funcname) +{ + if (unlikely(next->prev != prev)) { + printk(KERN_ERR "%s corruption. next->prev should be " + "prev (%p), but was %p. (next=%p).\n", + funcname, prev, next->prev, next); + BUG(); + } + if (unlikely(prev->next != next)) { + printk(KERN_ERR "%s corruption. prev->next should be " + "next (%p), but was %p. (prev=%p).\n", + funcname, next, prev->next, prev); + BUG(); + } +} + +static void listcheck_del(struct list_head *entry, char *funcname) +{ + if (unlikely(entry->prev->next != entry)) { + printk(KERN_ERR "%s corruption. prev->next should be %p, " + "but was %p\n", + funcname, entry, entry->prev->next); + BUG(); + } + if (unlikely(entry->next->prev != entry)) { + printk(KERN_ERR "%s corruption. next->prev should be %p, " + "but was %p\n", + funcname, entry, entry->next->prev); + BUG(); + } +} + /* * Insert a new entry between two known consecutive entries. * @@ -20,18 +53,7 @@ void __list_add(struct list_head *new, struct list_head *prev, struct list_head *next) { - if (unlikely(next->prev != prev)) { - printk(KERN_ERR "list_add corruption. next->prev should be " - "prev (%p), but was %p. (next=%p).\n", - prev, next->prev, next); - BUG(); - } - if (unlikely(prev->next != next)) { - printk(KERN_ERR "list_add corruption. prev->next should be " - "next (%p), but was %p. (prev=%p).\n", - next, prev->next, prev); - BUG(); - } + listcheck_add(prev, next, "__list_add"); next->prev = new; new->next = next; new->prev = prev; @@ -61,18 +83,42 @@ EXPORT_SYMBOL(list_add); */ void list_del(struct list_head *entry) { - if (unlikely(entry->prev->next != entry)) { - printk(KERN_ERR "list_del corruption. prev->next should be %p, " - "but was %p\n", entry, entry->prev->next); - BUG(); - } - if (unlikely(entry->next->prev != entry)) { - printk(KERN_ERR "list_del corruption. next->prev should be %p, " - "but was %p\n", entry, entry->next->prev); - BUG(); - } + listcheck_del(entry, "list_del"); __list_del(entry->prev, entry->next); entry->next = LIST_POISON1; entry->prev = LIST_POISON2; } EXPORT_SYMBOL(list_del); + +/* + * Insert a new entry between two known consecutive entries. + * + * This is only for internal list manipulation where we know + * the prev/next entries already! + */ +void __list_add_rcu(struct list_head *new, + struct list_head *prev, struct list_head *next) +{ + listcheck_add(prev, next, "__list_add_rcu"); + + new->next = next; + new->prev = prev; + smp_wmb(); + next->prev = new; + prev->next = new; +} +EXPORT_SYMBOL_GPL(__list_add_rcu); + +/** + * list_del_rcu - deletes entry from list without re-initialization + * @entry: the element to delete from the list. + * + * Note we can't poison the ->next pointer, see list.h for details. + */ +void list_del_rcu(struct list_head *entry) +{ + listcheck_del(entry, "list_del_rcu"); + __list_del(entry->prev, entry->next); + entry->prev = LIST_POISON2; +} +EXPORT_SYMBOL_GPL(list_del_rcu); linux-2.6-debug-softlockup-modules-list.patch: --- NEW FILE linux-2.6-debug-softlockup-modules-list.patch --- >From davej Thu Jun 26 13:20:23 2008 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on gelk.kernelslacker.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.4 Received: from pobox.devel.redhat.com [10.11.255.8] by gelk.kernelslacker.org with IMAP (fetchmail-6.3.8) for (single-drop); Thu, 26 Jun 2008 13:20:23 -0400 (EDT) Received: from pobox.devel.redhat.com ([unix socket]) by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA; Thu, 26 Jun 2008 13:19:18 -0400 X-Sieve: CMU Sieve 2.2 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id m5QHJIwd028244 for ; Thu, 26 Jun 2008 13:19:18 -0400 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5QHJHg4028301 for ; Thu, 26 Jun 2008 13:19:17 -0400 Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m5QHJ1vw004507 for ; Thu, 26 Jun 2008 13:19:01 -0400 Received: from c-67-171-131-73.hsd1.or.comcast.net ([67.171.131.73] helo=localhost.localdomain) by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux)) id 1KBv7M-0004BD-LQ for davej at redhat.com; Thu, 26 Jun 2008 17:18:45 +0000 Date: Thu, 26 Jun 2008 10:18:59 -0700 From: Arjan van de Ven To: davej at redhat.com Subject: Fw: [patch] softlockup: print a module list on being stuck Message-ID: <20080626101859.4070f7d8 at infradead.org> Organization: Intel X-Mailer: Claws Mail 3.3.1 (GTK+ 2.12.10; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-MIME-Error: demime acl condition: uuencoded line length does not match advertised number of bytes X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html X-RedHat-Spam-Score: -1 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32 Status: RO Content-Length: 1938 Lines: 62 Begin forwarded message: Date: Wed, 25 Jun 2008 18:36:51 +0200 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel at vger.kernel.org, Arjan van de Ven Subject: [patch] softlockup: print a module list on being stuck Linus, Arjan has been observing lots of softlockup reports on kerneloops.org and would like to have the patch below in v2.6.26 to narrow the real source of it down some more, and has asked for this patch to be applied sooner than planned. The patch is queued up for the next merge window at the moment. It's well-tested and obvious. The module list is printed here the same way it's printed for oopses. Discard it if you feel in any way nervous about it. Ingo ----------------> commit 688c91755dc3d3c03d8c67c1df13c02be258768e Author: Arjan van de Ven Date: Mon Jun 16 15:51:08 2008 -0700 CommitDate: Wed Jun 18 15:26:54 2008 +0200 softlockup: print a module list on being stuck Most places in the kernel that go BUG: print a module list (which is very useful for doing statistics and finding patterns), however the softlockup detector does not do this yet. This patch adds the one line change to fix this gap. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar --- linux-2.6.25.noarch/kernel/softlockup.c~ 2008-06-26 17:46:12.000000000 -0400 +++ linux-2.6.25.noarch/kernel/softlockup.c 2008-06-26 17:46:44.000000000 -0400 @@ -120,6 +120,7 @@ void softlockup_tick(void) printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", this_cpu, now - touch_timestamp, current->comm, task_pid_nr(current)); + print_modules(); if (regs) show_regs(regs); else linux-2.6-defaults-acpi-video.patch: --- NEW FILE linux-2.6-defaults-acpi-video.patch --- diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index d8d7596..a1b7117 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -71,7 +71,7 @@ MODULE_AUTHOR("Bruno Ducrot"); MODULE_DESCRIPTION("ACPI Video Driver"); MODULE_LICENSE("GPL"); -static int brightness_switch_enabled = 1; +static int brightness_switch_enabled = 0; module_param(brightness_switch_enabled, bool, 0644); static int acpi_video_bus_add(struct acpi_device *device); linux-2.6-export-shmem-bits-for-gem.patch: --- NEW FILE linux-2.6-export-shmem-bits-for-gem.patch --- diff --git a/include/linux/mm.h b/include/linux/mm.h index c31a9cd..d3466e9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -713,6 +713,17 @@ static inline int shmem_lock(struct file *file, int lock, #endif struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags); +/* Flag allocation requirements to shmem_getpage and shmem_swp_alloc */ +enum sgp_type { + SGP_READ, /* don't exceed i_size, don't allocate page */ + SGP_CACHE, /* don't exceed i_size, may allocate page */ + SGP_DIRTY, /* like SGP_CACHE, but set new page dirty */ + SGP_WRITE, /* may exceed i_size, may allocate page */ +}; + +extern int shmem_getpage(struct inode *inode, unsigned long idx, + struct page **pagep, enum sgp_type sgp, int *type); + int shmem_zero_setup(struct vm_area_struct *); #ifndef CONFIG_MMU diff --git a/mm/shmem.c b/mm/shmem.c index e2a6ae1..b283554 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -77,14 +77,6 @@ /* Pretend that each entry is of this size in directory's i_size */ #define BOGO_DIRENT_SIZE 20 -/* Flag allocation requirements to shmem_getpage and shmem_swp_alloc */ -enum sgp_type { - SGP_READ, /* don't exceed i_size, don't allocate page */ - SGP_CACHE, /* don't exceed i_size, may allocate page */ - SGP_DIRTY, /* like SGP_CACHE, but set new page dirty */ - SGP_WRITE, /* may exceed i_size, may allocate page */ -}; - #ifdef CONFIG_TMPFS static unsigned long shmem_default_max_blocks(void) { @@ -97,9 +89,6 @@ static unsigned long shmem_default_max_inodes(void) } #endif -static int shmem_getpage(struct inode *inode, unsigned long idx, - struct page **pagep, enum sgp_type sgp, int *type); - static inline struct page *shmem_dir_alloc(gfp_t gfp_mask) { /* @@ -1173,8 +1162,8 @@ static inline struct mempolicy *shmem_get_sbmpol(struct shmem_sb_info *sbinfo) * vm. If we swap it in we mark it dirty since we also free the swap * entry since a page cannot live in both the swap and page cache */ -static int shmem_getpage(struct inode *inode, unsigned long idx, - struct page **pagep, enum sgp_type sgp, int *type) +int shmem_getpage(struct inode *inode, unsigned long idx, + struct page **pagep, enum sgp_type sgp, int *type) { struct address_space *mapping = inode->i_mapping; struct shmem_inode_info *info = SHMEM_I(inode); @@ -1421,6 +1410,7 @@ failed: } return error; } +EXPORT_SYMBOL(shmem_getpage); static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { @@ -2558,6 +2548,7 @@ put_memory: shmem_unacct_size(flags, size); return ERR_PTR(error); } +EXPORT_SYMBOL(shmem_file_setup); /** * shmem_zero_setup - setup a shared anonymous mapping linux-2.6-lockdep-uvc.patch: --- NEW FILE linux-2.6-lockdep-uvc.patch --- >From davej Mon Jul 7 13:41:07 2008 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on gelk.kernelslacker.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,MISSING_MIMEOLE, RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.4 Received: from pobox.devel.redhat.com [10.11.255.8] by gelk.kernelslacker.org with IMAP (fetchmail-6.3.8) for (single-drop); Mon, 07 Jul 2008 13:41:07 -0400 (EDT) Received: from pobox.devel.redhat.com ([unix socket]) by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA; Mon, 07 Jul 2008 13:41:06 -0400 X-Sieve: CMU Sieve 2.2 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id m67Hf66M019742 for ; Mon, 7 Jul 2008 13:41:06 -0400 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m67Hf57u021300; Mon, 7 Jul 2008 13:41:05 -0400 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m67HCQvN003998; Mon, 7 Jul 2008 13:40:52 -0400 Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand id S1755714AbYGGRkj (ORCPT + 8 others); Mon, 7 Jul 2008 13:40:39 -0400 Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1753898AbYGGRkc (ORCPT ); Mon, 7 Jul 2008 13:40:32 -0400 Received: from qmta01.westchester.pa.mail.comcast.net ([76.96.62.16]:57787 "EHLO QMTA01.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753751AbYGGRkb (ORCPT ); Mon, 7 Jul 2008 13:40:31 -0400 Received: from OMTA06.westchester.pa.mail.comcast.net ([76.96.62.51]) by QMTA01.westchester.pa.mail.comcast.net with comcast id n4481Z00n16LCl05103200; Mon, 07 Jul 2008 17:40:30 +0000 Received: from hellmouth.digitalvampire.org ([76.126.214.20]) by OMTA06.westchester.pa.mail.comcast.net with comcast id n5gV1Z0030SyXVG3S5gV7w; Mon, 07 Jul 2008 17:40:30 +0000 X-Authority-Analysis: v=1.0 c=1 a=fmkApugzUIIA:10 a=kpXAE35kjxYA:10 a=_IJnZSgf9f5JNVSi5xgA:9 a=slYTfeDnTvTaJRxpne8A:7 a=8mjJQg54jTdEpqmjD8f-b9wE5HgA:4 a=JTUSPwgBgNAA:10 a=oCUJXWGl-OwA:10 Received: from shaolin.home.digitalvampire.org (shaolin.home.digitalvampire.org [10.1.0.2]) by hellmouth.digitalvampire.org (Postfix) with ESMTP id A1F6382D52; Mon, 7 Jul 2008 10:40:28 -0700 (PDT) Received: by shaolin.home.digitalvampire.org (Postfix, from userid 1000) id 730202B82D0; Mon, 7 Jul 2008 10:40:28 -0700 (PDT) To: Romano Giannetti Cc: linux-kernel at vger.kernel.org, linux-uvc-devel at berlios.de, laurent.pinchart at skynet.be Subject: Re: Linux 2.6.26-rc9 circular lock with uvcvideo on resume from hibernation X-Message-Flag: Warning: May contain useful information X-Priority: 1 X-MSMail-Priority: High References: <1215426867.5113.8.camel at pern> From: Roland Dreier Date: Mon, 07 Jul 2008 10:40:28 -0700 In-Reply-To: <1215426867.5113.8.camel at pern> (Romano Giannetti's message of "Mon, 07 Jul 2008 12:34:26 +0200") Message-ID: <878wwdbnjn.fsf at shaolin.home.digitalvampire.org> User-Agent: Gnus/5.1008 (Gnus v5.10.8) XEmacs/21.4.21 (linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner at vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel at vger.kernel.org X-RedHat-Spam-Score: -3.999 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32 Status: RO Content-Length: 3145 Lines: 75 > [ 1132.942569] khubd/2264 is trying to acquire lock: > [ 1132.942614] (videodev_lock){--..}, at: [] video_unregister_device+0x15/0x60 [videodev] > [ 1132.942810] > [ 1132.942811] but task is already holding lock: > [ 1132.942890] (&uvc_driver.open_mutex){--..}, at: [] uvc_disconnect+0x29/0x50 [uvcvideo] Thanks very much for the report (and for testing development kernels with lockdep enabled!). I think the patch below should fix this. Laurent -- if this patch looks good to you, please forward on for merging. Thanks, Roland --- [PATCH] uvc: Fix possible AB-BA deadlock with videodev_lock and open_mutex The uvcvideo driver's uvc_v4l2_open() method is called from videodev's video_open() function, which means it is called with the videodev_lock mutex held. uvc_v4l2_open() then takes uvc_driver.open_mutex to check dev->state and avoid racing against a device disconnect, which means that open_mutex must nest inside videodev_lock. However uvc_disconnect() takes the open_mutex around setting dev->state and also around putting its device reference. However, if uvc_disconnect() ends up dropping the last reference, it will call uvc_delete(), which calls into the videodev code to unregister its device, and this will end up taking videodev_lock. This opens a (unlikely in practice) window for an AB-BA deadlock and also causes a lockdep warning because of the lock misordering. Fortunately there is no apparent reason to hold open_mutex when doing kref_put() in uvc_disconnect(): if uvc_v4l2_open() runs before the state is set to UVC_DEV_DISCONNECTED, then it will take another reference to the device and kref_put() won't call uvc_delete; if uvc_v4l2_open() runs after the state is set, it will run before uvc_delete(), see the state, and return immediately -- uvc_delete() does uvc_unregister_video() (and hence video_unregister_device(), which is synchronized with videodev_lock) as its first thing, so there is no risk of use-after-free in uvc_v4l2_open(). Bug diagnosed based on a lockdep warning reported by Romano Giannetti . Signed-off-by: Roland Dreier --- drivers/media/video/uvc/uvc_driver.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 60ced58..5d60cb3 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c @@ -1634,11 +1634,10 @@ static void uvc_disconnect(struct usb_interface *intf) * chance to increase the reference count (kref_get). */ mutex_lock(&uvc_driver.open_mutex); - dev->state |= UVC_DEV_DISCONNECTED; - kref_put(&dev->kref, uvc_delete); - mutex_unlock(&uvc_driver.open_mutex); + + kref_put(&dev->kref, uvc_delete); } static int uvc_suspend(struct usb_interface *intf, pm_message_t message) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ linux-2.6-net-8139-pio-mmio-fallback.patch: --- NEW FILE linux-2.6-net-8139-pio-mmio-fallback.patch --- From: Dave Jones To: netdev at vger.kernel.org Subject: [3/3] 8139too: Fall back to PIO when MMIO fails. Signed-off-by: Dave Jones --- linux-2.6.26.noarch/drivers/net/8139too.c~ 2008-07-15 18:49:02.000000000 -0400 +++ linux-2.6.26.noarch/drivers/net/8139too.c 2008-07-15 18:53:07.000000000 -0400 @@ -784,6 +784,7 @@ static int __devinit rtl8139_init_board DPRINTK("PIO region size == 0x%02X\n", pio_len); DPRINTK("MMIO region size == 0x%02lX\n", mmio_len); +retry: if (use_io) { /* make sure PCI base addr 0 is PIO */ if (!(pio_flags & IORESOURCE_IO)) { @@ -832,9 +833,10 @@ static int __devinit rtl8139_init_board /* ioremap MMIO region */ ioaddr = pci_iomap(pdev, 1, 0); if (ioaddr == NULL) { - dev_err(&pdev->dev, "cannot remap MMIO, aborting\n"); - rc = -EIO; - goto err_out; + dev_err(&pdev->dev, "cannot remap MMIO, trying PIO\n"); + pci_release_regions(pdev); + use_io = 1; + goto retry; } dev->base_addr = (long) ioaddr; tp->regs_len = mmio_len; linux-2.6-ptrace-cleanup.patch: --- NEW FILE linux-2.6-ptrace-cleanup.patch --- arch/powerpc/kernel/entry_32.S | 4 +- arch/powerpc/kernel/ptrace.c | 19 ++- arch/powerpc/kernel/signal.c | 12 +- arch/powerpc/kernel/signal_32.c | 2 +- arch/ppc/kernel/entry.S | 4 +- arch/x86/ia32/ia32entry.S | 14 +- arch/x86/kernel/entry_32.S | 23 +-- arch/x86/kernel/entry_64.S | 20 +- arch/x86/kernel/ptrace.c | 151 +++++-------- arch/x86/kernel/signal_32.c | 6 - arch/x86/kernel/signal_64.c | 6 - arch/x86/kernel/step.c | 35 +++- include/asm-powerpc/processor.h | 2 + include/asm-powerpc/ptrace.h | 4 + include/asm-powerpc/thread_info.h | 17 +- include/asm-x86/calling.h | 6 +- include/asm-x86/ptrace-abi.h | 6 +- include/asm-x86/thread_info_32.h | 12 +- include/asm-x86/thread_info_64.h | 17 ++- include/linux/init_task.h | 4 +- include/linux/sched.h | 26 +-- kernel/exit.c | 451 +++++++++++++++++++++++-------------- kernel/fork.c | 6 +- kernel/ptrace.c | 37 ++- 24 files changed, 511 insertions(+), 373 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 0c8614d..3a05e9f 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -668,7 +668,7 @@ user_exc_return: /* r10 contains MSR_KE /* Check current_thread_info()->flags */ rlwinm r9,r1,0,0,(31-THREAD_SHIFT) lwz r9,TI_FLAGS(r9) - andi. r0,r9,(_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NEED_RESCHED) + andi. r0,r9,_TIF_USER_WORK_MASK bne do_work restore_user: @@ -925,7 +925,7 @@ recheck: lwz r9,TI_FLAGS(r9) andi. r0,r9,_TIF_NEED_RESCHED bne- do_resched - andi. r0,r9,_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK + andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user do_user_signal: /* r10 contains MSR_KERNEL here */ ori r10,r10,MSR_EE diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 2a9fe97..91ee077 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -619,12 +619,29 @@ void user_enable_single_step(struct task task->thread.dbcr0 = DBCR0_IDM | DBCR0_IC; regs->msr |= MSR_DE; #else + regs->msr &= ~MSR_BE; regs->msr |= MSR_SE; #endif } set_tsk_thread_flag(task, TIF_SINGLESTEP); } +void user_enable_block_step(struct task_struct *task) +{ + struct pt_regs *regs = task->thread.regs; + + if (regs != NULL) { +#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) + task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT; + regs->msr |= MSR_DE; +#else + regs->msr &= ~MSR_SE; + regs->msr |= MSR_BE; +#endif + } + set_tsk_thread_flag(task, TIF_SINGLESTEP); +} + void user_disable_single_step(struct task_struct *task) { struct pt_regs *regs = task->thread.regs; @@ -634,7 +651,7 @@ void user_disable_single_step(struct tas task->thread.dbcr0 = 0; regs->msr &= ~MSR_DE; #else - regs->msr &= ~MSR_SE; + regs->msr &= ~(MSR_SE | MSR_BE); #endif } clear_tsk_thread_flag(task, TIF_SINGLESTEP); diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index a65a44f..ad55488 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -120,7 +120,7 @@ int do_signal(sigset_t *oldset, struct p int ret; int is32 = is_32bit_task(); - if (test_thread_flag(TIF_RESTORE_SIGMASK)) + if (current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK) oldset = ¤t->saved_sigmask; else if (!oldset) oldset = ¤t->blocked; @@ -131,9 +131,10 @@ int do_signal(sigset_t *oldset, struct p check_syscall_restart(regs, &ka, signr > 0); if (signr <= 0) { + struct thread_info *ti = current_thread_info(); /* No signal to deliver -- put the saved sigmask back */ - if (test_thread_flag(TIF_RESTORE_SIGMASK)) { - clear_thread_flag(TIF_RESTORE_SIGMASK); + if (ti->local_flags & _TLF_RESTORE_SIGMASK) { + ti->local_flags &= ~_TLF_RESTORE_SIGMASK; sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); } return 0; /* no signals delivered */ @@ -169,10 +170,9 @@ int do_signal(sigset_t *oldset, struct p /* * A signal was successfully delivered; the saved sigmask is in - * its frame, and we can clear the TIF_RESTORE_SIGMASK flag. + * its frame, and we can clear the TLF_RESTORE_SIGMASK flag. */ - if (test_thread_flag(TIF_RESTORE_SIGMASK)) - clear_thread_flag(TIF_RESTORE_SIGMASK); + current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK; } return ret; diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index ad69434..4ae16d1 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -243,7 +243,7 @@ long sys_sigsuspend(old_sigset_t mask) current->state = TASK_INTERRUPTIBLE; schedule(); - set_thread_flag(TIF_RESTORE_SIGMASK); + set_restore_sigmask(); return -ERESTARTNOHAND; } diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index 5f3a5d0..fcd830a 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S @@ -647,7 +647,7 @@ user_exc_return: /* r10 contains MSR_KE /* Check current_thread_info()->flags */ rlwinm r9,r1,0,0,18 lwz r9,TI_FLAGS(r9) - andi. r0,r9,(_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NEED_RESCHED) + andi. r0,r9,_TIF_USER_WORK_MASK bne do_work restore_user: @@ -898,7 +898,7 @@ recheck: lwz r9,TI_FLAGS(r9) andi. r0,r9,_TIF_NEED_RESCHED bne- do_resched - andi. r0,r9,_TIF_SIGPENDING + andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user do_user_signal: /* r10 contains MSR_KERNEL here */ ori r10,r10,MSR_EE diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index b5e329d..0b2ab50 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -37,6 +37,11 @@ movq %rax,R8(%rsp) .endm + /* + * Reload arg registers from stack in case ptrace changed them. + * We don't reload %eax because syscall_trace_enter() returned + * the value it wants us to use in the table lookup. + */ .macro LOAD_ARGS32 offset movl \offset(%rsp),%r11d movl \offset+8(%rsp),%r10d @@ -46,7 +51,6 @@ movl \offset+48(%rsp),%edx movl \offset+56(%rsp),%esi movl \offset+64(%rsp),%edi - movl \offset+72(%rsp),%eax .endm .macro CFI_STARTPROC32 simple @@ -124,12 +128,12 @@ ENTRY(ia32_sysenter_target) .previous GET_THREAD_INFO(%r10) orl $TS_COMPAT,threadinfo_status(%r10) - testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10) + testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%r10) CFI_REMEMBER_STATE jnz sysenter_tracesys -sysenter_do_call: cmpl $(IA32_NR_syscalls-1),%eax ja ia32_badsys +sysenter_do_call: IA32_ARG_FIXUP 1 call *ia32_sys_call_table(,%rax,8) movq %rax,RAX-ARGOFFSET(%rsp) @@ -231,7 +235,7 @@ ENTRY(ia32_cstar_target) .previous GET_THREAD_INFO(%r10) orl $TS_COMPAT,threadinfo_status(%r10) - testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10) + testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%r10) CFI_REMEMBER_STATE jnz cstar_tracesys cstar_do_call: @@ -325,7 +329,7 @@ ENTRY(ia32_syscall) SAVE_ARGS 0,0,1 GET_THREAD_INFO(%r10) orl $TS_COMPAT,threadinfo_status(%r10) - testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10) + testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%r10) jnz ia32_tracesys ia32_do_syscall: cmpl $(IA32_NR_syscalls-1),%eax diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index c778e4f..f5d312c 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -331,7 +331,7 @@ sysenter_past_esp: GET_THREAD_INFO(%ebp) /* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */ - testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp) + testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp) jnz syscall_trace_entry cmpl $(nr_syscalls), %eax jae syscall_badsys @@ -369,7 +369,7 @@ ENTRY(system_call) GET_THREAD_INFO(%ebp) # system call tracing in operation / emulation /* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */ - testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp) + testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp) jnz syscall_trace_entry cmpl $(nr_syscalls), %eax jae syscall_badsys @@ -382,10 +382,6 @@ syscall_exit: # setting need_resched or sigpending # between sampling and the iret TRACE_IRQS_OFF - testl $X86_EFLAGS_TF,PT_EFLAGS(%esp) # If tracing set singlestep flag on exit - jz no_singlestep - orl $_TIF_SINGLESTEP,TI_flags(%ebp) -no_singlestep: movl TI_flags(%ebp), %ecx testw $_TIF_ALLWORK_MASK, %cx # current->work jne syscall_exit_work @@ -513,12 +509,8 @@ END(work_pending) syscall_trace_entry: movl $-ENOSYS,PT_EAX(%esp) movl %esp, %eax - xorl %edx,%edx - call do_syscall_trace - cmpl $0, %eax - jne resume_userspace # ret != 0 -> running under PTRACE_SYSEMU, - # so must skip actual syscall - movl PT_ORIG_EAX(%esp), %eax + call syscall_trace_enter + /* What it returned is what we'll actually use. */ cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit @@ -527,14 +519,13 @@ END(syscall_trace_entry) # perform syscall exit tracing ALIGN syscall_exit_work: - testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl + testb $_TIF_WORK_SYSCALL_EXIT, %cl jz work_pending TRACE_IRQS_ON - ENABLE_INTERRUPTS(CLBR_ANY) # could let do_syscall_trace() call + ENABLE_INTERRUPTS(CLBR_ANY) # could let syscall_trace_leave() call # schedule() instead movl %esp, %eax - movl $1, %edx - call do_syscall_trace + call syscall_trace_leave jmp resume_userspace END(syscall_exit_work) CFI_ENDPROC diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 556a8df..21c72a9 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -244,7 +244,7 @@ ENTRY(system_call_after_swapgs) movq %rcx,RIP-ARGOFFSET(%rsp) CFI_REL_OFFSET rip,RIP-ARGOFFSET GET_THREAD_INFO(%rcx) - testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%rcx) + testl $_TIF_WORK_SYSCALL_ENTRY,threadinfo_flags(%rcx) jnz tracesys cmpq $__NR_syscall_max,%rax ja badsys @@ -305,7 +305,7 @@ sysret_signal: leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1 xorl %esi,%esi # oldset -> arg2 call ptregscall_common -1: movl $_TIF_NEED_RESCHED,%edi +1: movl $_TIF_WORK_MASK,%edi /* Use IRET because user could have changed frame. This works because ptregscall_common has called FIXUP_TOP_OF_STACK. */ DISABLE_INTERRUPTS(CLBR_NONE) @@ -323,7 +323,12 @@ tracesys: FIXUP_TOP_OF_STACK %rdi movq %rsp,%rdi call syscall_trace_enter - LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ + /* + * Reload arg registers from stack in case ptrace changed them. + * We don't reload %rax because syscall_trace_enter() returned + * the value it wants us to use in the table lookup. + */ + LOAD_ARGS ARGOFFSET, 1 RESTORE_REST cmpq $__NR_syscall_max,%rax ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */ @@ -376,7 +381,7 @@ int_very_careful: ENABLE_INTERRUPTS(CLBR_NONE) SAVE_REST /* Check for syscall exit trace */ - testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edx + testl $_TIF_WORK_SYSCALL_EXIT,%edx jz int_signal pushq %rdi CFI_ADJUST_CFA_OFFSET 8 @@ -384,7 +389,7 @@ int_very_careful: call syscall_trace_leave popq %rdi CFI_ADJUST_CFA_OFFSET -8 - andl $~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edi + andl $~(_TIF_WORK_SYSCALL_EXIT|_TIF_SYSCALL_EMU),%edi jmp int_restore_rest int_signal: @@ -393,7 +398,7 @@ int_signal: movq %rsp,%rdi # &ptregs -> arg1 xorl %esi,%esi # oldset -> arg2 call do_notify_resume -1: movl $_TIF_NEED_RESCHED,%edi +1: movl $_TIF_WORK_MASK,%edi int_restore_rest: RESTORE_REST DISABLE_INTERRUPTS(CLBR_NONE) @@ -647,9 +652,8 @@ retint_signal: RESTORE_REST DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF - movl $_TIF_NEED_RESCHED,%edi GET_THREAD_INFO(%rcx) - jmp retint_check + jmp retint_with_reschedule #ifdef CONFIG_PREEMPT /* Returning to kernel space. Check if we need preemption */ diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index a7835f2..652f550 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -1357,8 +1357,6 @@ const struct user_regset_view *task_user #endif } -#ifdef CONFIG_X86_32 - void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code) { struct siginfo info; @@ -1377,89 +1375,10 @@ void send_sigtrap(struct task_struct *ts force_sig_info(SIGTRAP, &info, tsk); } -/* notification of system call entry/exit - * - triggered by current->work.syscall_trace - */ -int do_syscall_trace(struct pt_regs *regs, int entryexit) -{ - int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU); - /* - * With TIF_SYSCALL_EMU set we want to ignore TIF_SINGLESTEP for syscall - * interception - */ - int is_singlestep = !is_sysemu && test_thread_flag(TIF_SINGLESTEP); - int ret = 0; - - /* do the secure computing check first */ - if (!entryexit) - secure_computing(regs->orig_ax); - - if (unlikely(current->audit_context)) { - if (entryexit) - audit_syscall_exit(AUDITSC_RESULT(regs->ax), - regs->ax); - /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only - * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is - * not used, entry.S will call us only on syscall exit, not - * entry; so when TIF_SYSCALL_AUDIT is used we must avoid - * calling send_sigtrap() on syscall entry. - * - * Note that when PTRACE_SYSEMU_SINGLESTEP is used, - * is_singlestep is false, despite his name, so we will still do - * the correct thing. - */ - else if (is_singlestep) - goto out; - } - - if (!(current->ptrace & PT_PTRACED)) - goto out; - - /* If a process stops on the 1st tracepoint with SYSCALL_TRACE - * and then is resumed with SYSEMU_SINGLESTEP, it will come in - * here. We have to check this and return */ - if (is_sysemu && entryexit) - return 0; - - /* Fake a debug trap */ - if (is_singlestep) - send_sigtrap(current, regs, 0); - - if (!test_thread_flag(TIF_SYSCALL_TRACE) && !is_sysemu) - goto out; - - /* the 0x80 provides a way for the tracing parent to distinguish - between a syscall stop and SIGTRAP delivery */ - /* Note that the debugger could change the result of test_thread_flag!*/ - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ? 0x80:0)); - - /* - * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; - } - ret = is_sysemu; -out: - if (unlikely(current->audit_context) && !entryexit) - audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_ax, - regs->bx, regs->cx, regs->dx, regs->si); - if (ret == 0) - return 0; - - regs->orig_ax = -1; /* force skip of syscall restarting */ - if (unlikely(current->audit_context)) - audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); - return 1; -} - -#else /* CONFIG_X86_64 */ - static void syscall_trace(struct pt_regs *regs) { + if (!(current->ptrace & PT_PTRACED)) + return; #if 0 printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n", @@ -1481,39 +1400,81 @@ static void syscall_trace(struct pt_regs } } -asmlinkage void syscall_trace_enter(struct pt_regs *regs) +#ifdef CONFIG_X86_32 +# define IS_IA32 1 +#elif defined CONFIG_IA32_EMULATION +# define IS_IA32 test_thread_flag(TIF_IA32) +#else +# define IS_IA32 0 +#endif + +/* + * We must return the syscall number to actually look up in the table. + * This can be -1L to skip running any syscall at all. + */ +asmregparm long syscall_trace_enter(struct pt_regs *regs) { + long ret = 0; + + /* + * If we stepped into a sysenter/syscall insn, it trapped in + * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP. + * If user-mode had set TF itself, then it's still clear from + * do_debug() and we need to set it again to restore the user + * state. If we entered on the slow path, TF was already set. + */ + if (test_thread_flag(TIF_SINGLESTEP)) + regs->flags |= X86_EFLAGS_TF; + /* do the secure computing check first */ secure_computing(regs->orig_ax); - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) + if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) + ret = -1L; + + if (ret || test_thread_flag(TIF_SYSCALL_TRACE)) syscall_trace(regs); if (unlikely(current->audit_context)) { - if (test_thread_flag(TIF_IA32)) { + if (IS_IA32) audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_ax, regs->bx, regs->cx, regs->dx, regs->si); - } else { +#ifdef CONFIG_X86_64 + else audit_syscall_entry(AUDIT_ARCH_X86_64, regs->orig_ax, regs->di, regs->si, regs->dx, regs->r10); - } +#endif } + + return ret ?: regs->orig_ax; } -asmlinkage void syscall_trace_leave(struct pt_regs *regs) +asmregparm void syscall_trace_leave(struct pt_regs *regs) { if (unlikely(current->audit_context)) audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); - if ((test_thread_flag(TIF_SYSCALL_TRACE) - || test_thread_flag(TIF_SINGLESTEP)) - && (current->ptrace & PT_PTRACED)) + if (test_thread_flag(TIF_SYSCALL_TRACE)) syscall_trace(regs); -} -#endif /* CONFIG_X86_32 */ + /* + * If TIF_SYSCALL_EMU is set, we only get here because of + * TIF_SINGLESTEP (i.e. this is PTRACE_SYSEMU_SINGLESTEP). + * We already reported this syscall instruction in + * syscall_trace_enter(), so don't do any more now. + */ + if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) + return; + + /* + * If we are single-stepping, synthesize a trap to follow the + * system call instruction. + */ + if (test_thread_flag(TIF_SINGLESTEP) && + (current->ptrace & PT_PTRACED)) + send_sigtrap(current, regs, 0); +} diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index d923736..295b5f5 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c @@ -657,12 +657,6 @@ static void do_signal(struct pt_regs *re void do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) { - /* Pending single-step? */ - if (thread_info_flags & _TIF_SINGLESTEP) { - regs->flags |= X86_EFLAGS_TF; - clear_thread_flag(TIF_SINGLESTEP); - } - /* deal with pending signal delivery */ if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index e53b267..bf87684 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -487,12 +487,6 @@ static void do_signal(struct pt_regs *re void do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) { - /* Pending single-step? */ - if (thread_info_flags & _TIF_SINGLESTEP) { - regs->flags |= X86_EFLAGS_TF; - clear_thread_flag(TIF_SINGLESTEP); - } - #ifdef CONFIG_X86_MCE /* notify userspace of pending MCEs */ if (thread_info_flags & _TIF_MCE_NOTIFY) diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index 92c20fe..e8b9863 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c @@ -105,6 +105,20 @@ static int is_setting_trap_flag(struct t static int enable_single_step(struct task_struct *child) { struct pt_regs *regs = task_pt_regs(child); + unsigned long oflags; + + /* + * If we stepped into a sysenter/syscall insn, it trapped in + * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP. + * If user-mode had set TF itself, then it's still clear from + * do_debug() and we need to set it again to restore the user + * state so we don't wrongly set TIF_FORCED_TF below. + * If enable_single_step() was used last and that is what + * set TIF_SINGLESTEP, then both TF and TIF_FORCED_TF are + * already set and our bookkeeping is fine. + */ + if (unlikely(test_tsk_thread_flag(child, TIF_SINGLESTEP))) + regs->flags |= X86_EFLAGS_TF; /* * Always set TIF_SINGLESTEP - this guarantees that @@ -113,11 +127,7 @@ static int enable_single_step(struct tas */ set_tsk_thread_flag(child, TIF_SINGLESTEP); - /* - * If TF was already set, don't do anything else - */ - if (regs->flags & X86_EFLAGS_TF) - return 0; + oflags = regs->flags; /* Set TF on the kernel stack.. */ regs->flags |= X86_EFLAGS_TF; @@ -126,9 +136,22 @@ static int enable_single_step(struct tas * ..but if TF is changed by the instruction we will trace, * don't mark it as being "us" that set it, so that we * won't clear it by hand later. + * + * Note that if we don't actually execute the popf because + * of a signal arriving right now or suchlike, we will lose + * track of the fact that it really was "us" that set it. */ - if (is_setting_trap_flag(child, regs)) + if (is_setting_trap_flag(child, regs)) { + clear_tsk_thread_flag(child, TIF_FORCED_TF); return 0; + } + + /* + * If TF was already set, check whether it was us who set it. + * If not, we should never attempt a block step. + */ + if (oflags & X86_EFLAGS_TF) + return test_tsk_thread_flag(child, TIF_FORCED_TF); set_tsk_thread_flag(child, TIF_FORCED_TF); diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h index cf83f2d..865db56 100644 --- a/include/asm-powerpc/processor.h +++ b/include/asm-powerpc/processor.h @@ -214,6 +214,8 @@ struct thread_struct { #define thread_saved_pc(tsk) \ ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0) +#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.regs) + unsigned long get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0) diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h index 39023dd..6a3892d 100644 --- a/include/asm-powerpc/ptrace.h +++ b/include/asm-powerpc/ptrace.h @@ -135,7 +135,9 @@ do { \ * These are defined as per linux/ptrace.h, which see. */ #define arch_has_single_step() (1) +#define arch_has_block_step() (1) extern void user_enable_single_step(struct task_struct *); +extern void user_enable_block_step(struct task_struct *); extern void user_disable_single_step(struct task_struct *); #endif /* __ASSEMBLY__ */ @@ -276,4 +278,6 @@ extern void user_disable_single_step(str #define PPC_PTRACE_PEEKUSR_3264 0x91 #define PPC_PTRACE_POKEUSR_3264 0x90 +#define PTRACE_SINGLEBLOCK 0x100 /* resume execution until next branch */ + #endif /* _ASM_POWERPC_PTRACE_H */ diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h index d030f5c..e079e81 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h @@ -116,7 +116,6 @@ static inline struct thread_info *curren #define TIF_SECCOMP 10 /* secure computing */ #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */ #define TIF_NOERROR 12 /* Force successful syscall return */ -#define TIF_RESTORE_SIGMASK 13 /* Restore signal mask in do_signal */ #define TIF_FREEZE 14 /* Freezing for suspend */ #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ #define TIF_ABI_PENDING 16 /* 32/64 bit switch needed */ @@ -134,21 +133,31 @@ static inline struct thread_info *curren #define _TIF_SECCOMP (1<local_flags |= _TLF_RESTORE_SIGMASK; + set_bit(TIF_SIGPENDING, &ti->flags); +} +#endif /* !__ASSEMBLY__ */ #endif /* __KERNEL__ */ diff --git a/include/asm-x86/calling.h b/include/asm-x86/calling.h index f13e62e..2bc162e 100644 --- a/include/asm-x86/calling.h +++ b/include/asm-x86/calling.h @@ -104,7 +104,7 @@ .endif .endm - .macro LOAD_ARGS offset + .macro LOAD_ARGS offset, skiprax=0 movq \offset(%rsp), %r11 movq \offset+8(%rsp), %r10 movq \offset+16(%rsp), %r9 @@ -113,7 +113,10 @@ movq \offset+48(%rsp), %rdx movq \offset+56(%rsp), %rsi movq \offset+64(%rsp), %rdi + .if \skiprax + .else movq \offset+72(%rsp), %rax + .endif .endm #define REST_SKIP 6*8 diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h index f224eb3..72e7b9d 100644 --- a/include/asm-x86/ptrace-abi.h +++ b/include/asm-x86/ptrace-abi.h @@ -73,11 +73,11 @@ #ifdef __x86_64__ # define PTRACE_ARCH_PRCTL 30 -#else -# define PTRACE_SYSEMU 31 -# define PTRACE_SYSEMU_SINGLESTEP 32 #endif +#define PTRACE_SYSEMU 31 +#define PTRACE_SYSEMU_SINGLESTEP 32 + #define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */ #ifndef __ASSEMBLY__ diff --git a/include/asm-x86/thread_info_32.h b/include/asm-x86/thread_info_32.h index b633882..3267d9c 100644 --- a/include/asm-x86/thread_info_32.h +++ b/include/asm-x86/thread_info_32.h @@ -160,10 +160,19 @@ static inline struct thread_info *curren #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) +/* work to do in syscall_trace_enter() */ +#define _TIF_WORK_SYSCALL_ENTRY \ + (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | \ + _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP) + +/* work to do in syscall_trace_leave() */ +#define _TIF_WORK_SYSCALL_EXIT \ + (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP) + /* work to do on interrupt/exception return */ #define _TIF_WORK_MASK \ (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ - _TIF_SECCOMP | _TIF_SYSCALL_EMU)) + _TIF_SINGLESTEP | _TIF_SECCOMP | _TIF_SYSCALL_EMU)) /* work to do on any return to u-space */ #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h index cb69f70..a531e79 100644 --- a/include/asm-x86/thread_info_64.h +++ b/include/asm-x86/thread_info_64.h @@ -107,6 +107,7 @@ static inline struct thread_info *stack_ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ #define TIF_IRET 5 /* force IRET */ +#define TIF_SYSCALL_EMU 6 /* syscall emulation active */ #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ #define TIF_SECCOMP 8 /* secure computing */ #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ @@ -130,6 +131,7 @@ static inline struct thread_info *stack_ #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_IRET (1 << TIF_IRET) +#define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) @@ -146,15 +148,24 @@ static inline struct thread_info *stack_ #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) #define _TIF_NOTSC (1 << TIF_NOTSC) +/* work to do in syscall_trace_enter() */ +#define _TIF_WORK_SYSCALL_ENTRY \ + (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | \ + _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP) + +/* work to do in syscall_trace_leave() */ +#define _TIF_WORK_SYSCALL_EXIT \ + (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP) + /* work to do on interrupt/exception return */ #define _TIF_WORK_MASK \ - (0x0000FFFF & \ - ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|_TIF_SECCOMP)) + (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ + _TIF_SINGLESTEP | _TIF_SECCOMP | _TIF_SYSCALL_EMU)) /* work to do on any return to user space */ #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) #define _TIF_DO_NOTIFY_MASK \ - (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) + (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) /* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \ diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 9927a88..93c45ac 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -140,8 +140,8 @@ extern struct group_info init_groups; .nr_cpus_allowed = NR_CPUS, \ }, \ .tasks = LIST_HEAD_INIT(tsk.tasks), \ - .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ - .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ + .ptraced = LIST_HEAD_INIT(tsk.ptraced), \ + .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ .real_parent = &tsk, \ .parent = &tsk, \ .children = LIST_HEAD_INIT(tsk.children), \ diff --git a/include/linux/sched.h b/include/linux/sched.h index c5d3f84..75145b7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1075,12 +1075,6 @@ struct task_struct { #endif struct list_head tasks; - /* - * ptrace_list/ptrace_children forms the list of my children - * that were stolen by a ptracer. - */ - struct list_head ptrace_children; - struct list_head ptrace_list; struct mm_struct *mm, *active_mm; @@ -1102,18 +1096,25 @@ struct task_struct { /* * pointers to (original) parent process, youngest child, younger sibling, * older sibling, respectively. (p->father can be replaced with - * p->parent->pid) + * p->real_parent->pid) */ - struct task_struct *real_parent; /* real parent process (when being debugged) */ - struct task_struct *parent; /* parent process */ + struct task_struct *real_parent; /* real parent process */ + struct task_struct *parent; /* recipient of SIGCHLD, wait4() reports */ /* - * children/sibling forms the list of my children plus the - * tasks I'm ptracing. + * children/sibling forms the list of my natural children */ struct list_head children; /* list of my children */ struct list_head sibling; /* linkage in my parent's children list */ struct task_struct *group_leader; /* threadgroup leader */ + /* + * ptraced is the list of tasks this task is using ptrace on. + * This includes both natural children and PTRACE_ATTACH targets. + * p->ptrace_entry is p's link on the p->parent->ptraced list. + */ + struct list_head ptraced; + struct list_head ptrace_entry; + /* PID/PID hash table linkage. */ struct pid_link pids[PIDTYPE_MAX]; struct list_head thread_group; @@ -1870,9 +1871,6 @@ extern void wait_task_inactive(struct ta #define wait_task_inactive(p) do { } while (0) #endif -#define remove_parent(p) list_del_init(&(p)->sibling) -#define add_parent(p) list_add_tail(&(p)->sibling,&(p)->parent->children) - #define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks) #define for_each_process(p) \ diff --git a/kernel/exit.c b/kernel/exit.c index 8f6185e..fa7b700 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -70,7 +70,7 @@ static void __unhash_process(struct task __get_cpu_var(process_counts)--; } list_del_rcu(&p->thread_group); - remove_parent(p); + list_del_init(&p->sibling); } /* @@ -151,6 +151,18 @@ static void delayed_put_task_struct(stru put_task_struct(container_of(rhp, struct task_struct, rcu)); } +/* + * Do final ptrace-related cleanup of a zombie being reaped. + * + * Called with write_lock(&tasklist_lock) held. + */ +static void ptrace_release_task(struct task_struct *p) +{ + BUG_ON(!list_empty(&p->ptraced)); + ptrace_unlink(p); + BUG_ON(!list_empty(&p->ptrace_entry)); +} + void release_task(struct task_struct * p) { struct task_struct *leader; @@ -159,8 +171,7 @@ repeat: atomic_dec(&p->user->processes); proc_flush_task(p); write_lock_irq(&tasklist_lock); - ptrace_unlink(p); - BUG_ON(!list_empty(&p->ptrace_list) || !list_empty(&p->ptrace_children)); + ptrace_release_task(p); __exit_signal(p); /* @@ -314,9 +325,8 @@ static void reparent_to_kthreadd(void) ptrace_unlink(current); /* Reparent to init */ - remove_parent(current); current->real_parent = current->parent = kthreadd_task; - add_parent(current); + list_move_tail(¤t->sibling, ¤t->real_parent->children); /* Set the exit signal to SIGCHLD so we signal init on exit */ current->exit_signal = SIGCHLD; @@ -691,37 +701,97 @@ static void exit_mm(struct task_struct * mmput(mm); } -static void -reparent_thread(struct task_struct *p, struct task_struct *father, int traced) +/* + * Return nonzero if @parent's children should reap themselves. + * + * Called with write_lock_irq(&tasklist_lock) held. + */ +static int ignoring_children(struct task_struct *parent) { - if (p->pdeath_signal) - /* We already hold the tasklist_lock here. */ - group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); + int ret; + struct sighand_struct *psig = parent->sighand; + unsigned long flags; + spin_lock_irqsave(&psig->siglock, flags); + ret = (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || + (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT)); + spin_unlock_irqrestore(&psig->siglock, flags); + return ret; +} - /* Move the child from its dying parent to the new one. */ - if (unlikely(traced)) { - /* Preserve ptrace links if someone else is tracing this child. */ - list_del_init(&p->ptrace_list); - if (ptrace_reparented(p)) - list_add(&p->ptrace_list, &p->real_parent->ptrace_children); - } else { - /* If this child is being traced, then we're the one tracing it - * anyway, so let go of it. +/* + * Detach all tasks we were using ptrace on. + * Any that need to be release_task'd are put on the @dead list. + * + * Called with write_lock(&tasklist_lock) held. + */ +static void ptrace_exit(struct task_struct *parent, struct list_head *dead) +{ + struct task_struct *p, *n; + int ign = -1; + + list_for_each_entry_safe(p, n, &parent->ptraced, ptrace_entry) { + __ptrace_unlink(p); + + if (p->exit_state != EXIT_ZOMBIE) + continue; + + /* + * If it's a zombie, our attachedness prevented normal + * parent notification or self-reaping. Do notification + * now if it would have happened earlier. If it should + * reap itself, add it to the @dead list. We can't call + * release_task() here because we already hold tasklist_lock. + * + * If it's our own child, there is no notification to do. + * But if our normal children self-reap, then this child + * was prevented by ptrace and we must reap it now. */ - p->ptrace = 0; - remove_parent(p); - p->parent = p->real_parent; - add_parent(p); + if (!task_detached(p) && thread_group_empty(p)) { + if (!same_thread_group(p->real_parent, parent)) + do_notify_parent(p, p->exit_signal); + else { + if (ign < 0) + ign = ignoring_children(parent); + if (ign) + p->exit_signal = -1; + } + } - if (task_is_traced(p)) { + if (task_detached(p)) { /* - * If it was at a trace stop, turn it into - * a normal stop since it's no longer being - * traced. + * Mark it as in the process of being reaped. */ - ptrace_untrace(p); + p->exit_state = EXIT_DEAD; + list_add(&p->ptrace_entry, dead); } } +} + +/* + * Finish up exit-time ptrace cleanup. + * + * Called without locks. + */ +static void ptrace_exit_finish(struct task_struct *parent, + struct list_head *dead) +{ + struct task_struct *p, *n; + + BUG_ON(!list_empty(&parent->ptraced)); + + list_for_each_entry_safe(p, n, dead, ptrace_entry) { + list_del_init(&p->ptrace_entry); + release_task(p); + } +} + +static void reparent_thread(struct task_struct *p, struct task_struct *father) +{ + if (p->pdeath_signal) + /* We already hold the tasklist_lock here. */ + group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); + + list_move_tail(&p->sibling, &p->real_parent->children); /* If this is a threaded reparent there is no need to * notify anyone anything has happened. @@ -736,7 +806,8 @@ reparent_thread(struct task_struct *p, s /* If we'd notified the old parent about this child's death, * also notify the new parent. */ - if (!traced && p->exit_state == EXIT_ZOMBIE && + if (!ptrace_reparented(p) && + p->exit_state == EXIT_ZOMBIE && !task_detached(p) && thread_group_empty(p)) do_notify_parent(p, p->exit_signal); @@ -753,12 +824,15 @@ reparent_thread(struct task_struct *p, s static void forget_original_parent(struct task_struct *father) { struct task_struct *p, *n, *reaper = father; - struct list_head ptrace_dead; - - INIT_LIST_HEAD(&ptrace_dead); + LIST_HEAD(ptrace_dead); write_lock_irq(&tasklist_lock); + /* + * First clean up ptrace if we were using it. + */ + ptrace_exit(father, &ptrace_dead); + do { reaper = next_thread(reaper); if (reaper == father) { @@ -767,58 +841,19 @@ static void forget_original_parent(struc } } while (reaper->flags & PF_EXITING); - /* - * There are only two places where our children can be: - * - * - in our child list - * - in our ptraced child list - * - * Search them and reparent children. - */ list_for_each_entry_safe(p, n, &father->children, sibling) { - int ptrace; - - ptrace = p->ptrace; - - /* if father isn't the real parent, then ptrace must be enabled */ - BUG_ON(father != p->real_parent && !ptrace); - - if (father == p->real_parent) { - /* reparent with a reaper, real father it's us */ - p->real_parent = reaper; - reparent_thread(p, father, 0); - } else { - /* reparent ptraced task to its real parent */ - __ptrace_unlink (p); - if (p->exit_state == EXIT_ZOMBIE && !task_detached(p) && - thread_group_empty(p)) - do_notify_parent(p, p->exit_signal); - } - - /* - * if the ptraced child is a detached zombie we must collect - * it before we exit, or it will remain zombie forever since - * we prevented it from self-reap itself while it was being - * traced by us, to be able to see it in wait4. - */ - if (unlikely(ptrace && p->exit_state == EXIT_ZOMBIE && task_detached(p))) - list_add(&p->ptrace_list, &ptrace_dead); - } - - list_for_each_entry_safe(p, n, &father->ptrace_children, ptrace_list) { p->real_parent = reaper; - reparent_thread(p, father, 1); + if (p->parent == father) { + BUG_ON(p->ptrace); + p->parent = p->real_parent; + } + reparent_thread(p, father); } write_unlock_irq(&tasklist_lock); BUG_ON(!list_empty(&father->children)); - BUG_ON(!list_empty(&father->ptrace_children)); - - list_for_each_entry_safe(p, n, &ptrace_dead, ptrace_list) { - list_del_init(&p->ptrace_list); - release_task(p); - } + ptrace_exit_finish(father, &ptrace_dead); } /* @@ -1179,13 +1214,6 @@ static int eligible_child(enum pid_type return 0; } - /* - * Do not consider detached threads that are - * not ptraced: - */ - if (task_detached(p) && !p->ptrace) - return 0; - /* Wait for all children (clone and not) if __WALL is set; * otherwise, wait for clone children *only* if __WCLONE is * set; otherwise, wait for non-clone children *only*. (Note: @@ -1196,14 +1224,10 @@ static int eligible_child(enum pid_type return 0; err = security_task_wait(p); - if (likely(!err)) - return 1; + if (err) + return err; - if (type != PIDTYPE_PID) - return 0; - /* This child was explicitly requested, abort */ - read_unlock(&tasklist_lock); - return err; + return 1; } static int wait_noreap_copyout(struct task_struct *p, pid_t pid, uid_t uid, @@ -1237,7 +1261,7 @@ static int wait_noreap_copyout(struct ta * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ -static int wait_task_zombie(struct task_struct *p, int noreap, +static int wait_task_zombie(struct task_struct *p, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { @@ -1245,7 +1269,10 @@ static int wait_task_zombie(struct task_ int retval, status, traced; pid_t pid = task_pid_vnr(p); - if (unlikely(noreap)) { + if (!likely(options & WEXITED)) + return 0; + + if (unlikely(options & WNOWAIT)) { uid_t uid = p->uid; int exit_code = p->exit_code; int why, status; @@ -1395,21 +1422,24 @@ static int wait_task_zombie(struct task_ * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ -static int wait_task_stopped(struct task_struct *p, - int noreap, struct siginfo __user *infop, +static int wait_task_stopped(int ptrace, struct task_struct *p, + int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { int retval, exit_code, why; uid_t uid = 0; /* unneeded, required by compiler */ pid_t pid; + if (!(options & WUNTRACED)) + return 0; + exit_code = 0; spin_lock_irq(&p->sighand->siglock); if (unlikely(!task_is_stopped_or_traced(p))) goto unlock_sig; - if (!(p->ptrace & PT_PTRACED) && p->signal->group_stop_count > 0) + if (!ptrace && p->signal->group_stop_count > 0) /* * A group stop is in progress and this is the group leader. * We won't report until all threads have stopped. @@ -1420,7 +1450,7 @@ static int wait_task_stopped(struct task if (!exit_code) goto unlock_sig; - if (!noreap) + if (!unlikely(options & WNOWAIT)) p->exit_code = 0; uid = p->uid; @@ -1438,10 +1468,10 @@ unlock_sig: */ get_task_struct(p); pid = task_pid_vnr(p); - why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; + why = ptrace ? CLD_TRAPPED : CLD_STOPPED; read_unlock(&tasklist_lock); - if (unlikely(noreap)) + if (unlikely(options & WNOWAIT)) return wait_noreap_copyout(p, pid, uid, why, exit_code, infop, ru); @@ -1475,7 +1505,7 @@ unlock_sig: * the lock and this task is uninteresting. If we return nonzero, we have * released the lock and the system call should return. */ -static int wait_task_continued(struct task_struct *p, int noreap, +static int wait_task_continued(struct task_struct *p, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { @@ -1483,6 +1513,9 @@ static int wait_task_continued(struct ta pid_t pid; uid_t uid; + if (!unlikely(options & WCONTINUED)) + return 0; + if (!(p->signal->flags & SIGNAL_STOP_CONTINUED)) return 0; @@ -1492,7 +1525,7 @@ static int wait_task_continued(struct ta spin_unlock_irq(&p->sighand->siglock); return 0; } - if (!noreap) + if (!unlikely(options & WNOWAIT)) p->signal->flags &= ~SIGNAL_STOP_CONTINUED; spin_unlock_irq(&p->sighand->siglock); @@ -1518,89 +1551,161 @@ static int wait_task_continued(struct ta return retval; } +/* + * Consider @p for a wait by @parent. + * + * -ECHILD should be in *@notask_error before the first call. + * Returns nonzero for a final return, when we have unlocked tasklist_lock. + * Returns zero if the search for a child should continue; + * then *@notask_error is 0 if @p is an eligible child, + * or another error from security_task_wait(), or still -ECHILD. + */ +static int wait_consider_task(struct task_struct *parent, int ptrace, + struct task_struct *p, int *notask_error, + enum pid_type type, struct pid *pid, int options, + struct siginfo __user *infop, + int __user *stat_addr, struct rusage __user *ru) +{ + int ret = eligible_child(type, pid, options, p); + if (!ret) + return ret; + + if (unlikely(ret < 0)) { + /* + * If we have not yet seen any eligible child, + * then let this error code replace -ECHILD. + * A permission error will give the user a clue + * to look for security policy problems, rather + * than for mysterious wait bugs. + */ + if (*notask_error) + *notask_error = ret; + } + + if (likely(!ptrace) && unlikely(p->ptrace)) { + /* + * This child is hidden by ptrace. + * We aren't allowed to see it now, but eventually we will. + */ + *notask_error = 0; + return 0; + } + + if (p->exit_state == EXIT_DEAD) + return 0; + + /* + * We don't reap group leaders with subthreads. + */ + if (p->exit_state == EXIT_ZOMBIE && !delay_group_leader(p)) + return wait_task_zombie(p, options, infop, stat_addr, ru); + + /* + * It's stopped or running now, so it might + * later continue, exit, or stop again. + */ + *notask_error = 0; + + if (task_is_stopped_or_traced(p)) + return wait_task_stopped(ptrace, p, options, + infop, stat_addr, ru); + + return wait_task_continued(p, options, infop, stat_addr, ru); +} + +/* + * Do the work of do_wait() for one thread in the group, @tsk. + * + * -ECHILD should be in *@notask_error before the first call. + * Returns nonzero for a final return, when we have unlocked tasklist_lock. + * Returns zero if the search for a child should continue; then + * *@notask_error is 0 if there were any eligible children, + * or another error from security_task_wait(), or still -ECHILD. + */ +static int do_wait_thread(struct task_struct *tsk, int *notask_error, + enum pid_type type, struct pid *pid, int options, + struct siginfo __user *infop, int __user *stat_addr, + struct rusage __user *ru) +{ + struct task_struct *p; + + list_for_each_entry(p, &tsk->children, sibling) { + /* + * Do not consider detached threads. + */ + if (!task_detached(p)) { + int ret = wait_consider_task(tsk, 0, p, notask_error, + type, pid, options, + infop, stat_addr, ru); + if (ret) + return ret; + } + } + + return 0; +} + +static int ptrace_do_wait(struct task_struct *tsk, int *notask_error, + enum pid_type type, struct pid *pid, int options, + struct siginfo __user *infop, int __user *stat_addr, + struct rusage __user *ru) +{ + struct task_struct *p; + + /* + * Traditionally we see ptrace'd stopped tasks regardless of options. + */ + options |= WUNTRACED; + + list_for_each_entry(p, &tsk->ptraced, ptrace_entry) { + int ret = wait_consider_task(tsk, 1, p, notask_error, + type, pid, options, + infop, stat_addr, ru); + if (ret) + return ret; + } + + return 0; +} + static long do_wait(enum pid_type type, struct pid *pid, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { DECLARE_WAITQUEUE(wait, current); struct task_struct *tsk; - int flag, retval; + int retval; add_wait_queue(¤t->signal->wait_chldexit,&wait); repeat: - /* If there is nothing that can match our critier just get out */ + /* + * If there is nothing that can match our critiera just get out. + * We will clear @retval to zero if we see any child that might later + * match our criteria, even if we are not able to reap it yet. + */ retval = -ECHILD; if ((type < PIDTYPE_MAX) && (!pid || hlist_empty(&pid->tasks[type]))) goto end; - /* - * We will set this flag if we see any child that might later - * match our criteria, even if we are not able to reap it yet. - */ - flag = retval = 0; current->state = TASK_INTERRUPTIBLE; read_lock(&tasklist_lock); tsk = current; do { - struct task_struct *p; - - list_for_each_entry(p, &tsk->children, sibling) { - int ret = eligible_child(type, pid, options, p); - if (!ret) - continue; - - if (unlikely(ret < 0)) { - retval = ret; - } else if (task_is_stopped_or_traced(p)) { - /* - * It's stopped now, so it might later - * continue, exit, or stop again. - */ - flag = 1; - if (!(p->ptrace & PT_PTRACED) && - !(options & WUNTRACED)) - continue; - - retval = wait_task_stopped(p, - (options & WNOWAIT), infop, - stat_addr, ru); - } else if (p->exit_state == EXIT_ZOMBIE && - !delay_group_leader(p)) { - /* - * We don't reap group leaders with subthreads. - */ - if (!likely(options & WEXITED)) - continue; - retval = wait_task_zombie(p, - (options & WNOWAIT), infop, - stat_addr, ru); - } else if (p->exit_state != EXIT_DEAD) { - /* - * It's running now, so it might later - * exit, stop, or stop and then continue. - */ - flag = 1; - if (!unlikely(options & WCONTINUED)) - continue; - retval = wait_task_continued(p, - (options & WNOWAIT), infop, - stat_addr, ru); - } - if (retval != 0) /* tasklist_lock released */ - goto end; - } - if (!flag) { - list_for_each_entry(p, &tsk->ptrace_children, - ptrace_list) { - flag = eligible_child(type, pid, options, p); - if (!flag) - continue; - if (likely(flag > 0)) - break; - retval = flag; - goto end; - } + int tsk_result = do_wait_thread(tsk, &retval, + type, pid, options, + infop, stat_addr, ru); + if (!tsk_result) + tsk_result = ptrace_do_wait(tsk, &retval, + type, pid, options, + infop, stat_addr, ru); + if (tsk_result) { + /* + * tasklist_lock is unlocked and we have a final result. + */ + retval = tsk_result; + goto end; } + if (options & __WNOTHREAD) break; tsk = next_thread(tsk); @@ -1608,16 +1713,14 @@ repeat: } while (tsk != current); read_unlock(&tasklist_lock); - if (flag) { - if (options & WNOHANG) - goto end; + if (!retval && !(options & WNOHANG)) { retval = -ERESTARTSYS; - if (signal_pending(current)) - goto end; - schedule(); - goto repeat; + if (!signal_pending(current)) { + schedule(); + goto repeat; + } } - retval = -ECHILD; + end: current->state = TASK_RUNNING; remove_wait_queue(¤t->signal->wait_chldexit,&wait); diff --git a/kernel/fork.c b/kernel/fork.c index 19908b2..df8fe06 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1124,8 +1124,8 @@ static struct task_struct *copy_process( */ p->group_leader = p; INIT_LIST_HEAD(&p->thread_group); - INIT_LIST_HEAD(&p->ptrace_children); - INIT_LIST_HEAD(&p->ptrace_list); + INIT_LIST_HEAD(&p->ptrace_entry); + INIT_LIST_HEAD(&p->ptraced); /* Now that the task is set up, run cgroup callbacks if * necessary. We need to run them before the task is visible @@ -1197,7 +1197,7 @@ static struct task_struct *copy_process( } if (likely(p->pid)) { - add_parent(p); + list_add_tail(&p->sibling, &p->real_parent->children); if (unlikely(p->ptrace & PT_PTRACED)) __ptrace_link(p, current->parent); diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 6c19e94..acf80a4 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -33,13 +33,9 @@ */ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent) { - BUG_ON(!list_empty(&child->ptrace_list)); - if (child->parent == new_parent) - return; - list_add(&child->ptrace_list, &child->parent->ptrace_children); - remove_parent(child); + BUG_ON(!list_empty(&child->ptrace_entry)); + list_add(&child->ptrace_entry, &new_parent->ptraced); child->parent = new_parent; - add_parent(child); } /* @@ -73,12 +69,8 @@ void __ptrace_unlink(struct task_struct BUG_ON(!child->ptrace); child->ptrace = 0; - if (ptrace_reparented(child)) { - list_del_init(&child->ptrace_list); - remove_parent(child); - child->parent = child->real_parent; - add_parent(child); - } + child->parent = child->real_parent; + list_del_init(&child->ptrace_entry); if (task_is_traced(child)) ptrace_untrace(child); @@ -492,14 +484,33 @@ int ptrace_traceme(void) /* * Are we already being traced? */ +repeat: task_lock(current); if (!(current->ptrace & PT_PTRACED)) { + /* + * See ptrace_attach() comments about the locking here. + */ + unsigned long flags; + if (!write_trylock_irqsave(&tasklist_lock, flags)) { + task_unlock(current); + do { + cpu_relax(); + } while (!write_can_lock(&tasklist_lock)); + goto repeat; + } + ret = security_ptrace(current->parent, current); + /* * Set the ptrace bit in the process ptrace flags. + * Then link us on our parent's ptraced list. */ - if (!ret) + if (!ret) { current->ptrace |= PT_PTRACED; + __ptrace_link(current, current->real_parent); + } + + write_unlock_irqrestore(&tasklist_lock, flags); } task_unlock(current); return ret; linux-2.6-tracehook.patch: --- NEW FILE linux-2.6-tracehook.patch --- arch/Kconfig | 18 ++ arch/ia64/Kconfig | 1 + arch/ia64/kernel/perfmon.c | 11 +- arch/ia64/kernel/process.c | 22 +- arch/ia64/kernel/ptrace.c | 43 +-- arch/ia64/kernel/signal.c | 8 + arch/mips/kernel/irixelf.c | 2 - arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/entry_32.S | 11 +- arch/powerpc/kernel/entry_64.S | 10 +- arch/powerpc/kernel/ptrace.c | 47 ++-- arch/powerpc/kernel/signal.c | 21 ++- arch/sparc64/Kconfig | 1 + arch/sparc64/kernel/ptrace.c | 24 +-- arch/sparc64/kernel/rtrap.S | 6 +- arch/sparc64/kernel/signal.c | 5 + arch/x86/Kconfig | 1 + arch/x86/ia32/ia32_aout.c | 6 - arch/x86/kernel/ptrace.c | 34 +-- arch/x86/kernel/signal_32.c | 11 +- arch/x86/kernel/signal_64.c | 49 +--- fs/binfmt_aout.c | 6 - fs/binfmt_elf.c | 6 - fs/binfmt_elf_fdpic.c | 7 - fs/binfmt_flat.c | 3 - fs/binfmt_som.c | 2 - fs/exec.c | 12 +- fs/proc/array.c | 9 +- fs/proc/base.c | 39 +++- include/asm-generic/syscall.h | 141 +++++++++ include/asm-ia64/thread_info.h | 3 - include/asm-powerpc/ptrace.h | 1 + include/asm-powerpc/signal.h | 3 +- include/asm-powerpc/syscall.h | 73 +++++ include/asm-powerpc/thread_info.h | 5 +- include/asm-sparc64/ptrace.h | 1 + include/asm-sparc64/syscall.h | 70 +++++ include/asm-sparc64/thread_info.h | 8 +- include/asm-x86/ptrace.h | 5 + include/asm-x86/syscall.h | 210 ++++++++++++++ include/asm-x86/thread_info_32.h | 2 + include/asm-x86/thread_info_64.h | 4 +- include/linux/ptrace.h | 72 +++++ include/linux/sched.h | 10 +- include/linux/tracehook.h | 575 +++++++++++++++++++++++++++++++++++++ kernel/exit.c | 53 ++--- kernel/fork.c | 74 ++--- kernel/kthread.c | 2 +- kernel/ptrace.c | 2 +- kernel/sched.c | 29 ++- kernel/signal.c | 99 ++++--- lib/Makefile | 2 + lib/syscall.c | 75 +++++ mm/nommu.c | 4 +- security/selinux/hooks.c | 22 +-- 55 files changed, 1590 insertions(+), 371 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 3ea332b..1955fbd 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -39,3 +39,21 @@ config HAVE_KRETPROBES config HAVE_DMA_ATTRS def_bool n + +# +# An arch should select this if it provides all these things: +# +# task_pt_regs() in asm/processor.h or asm/ptrace.h +# arch_has_single_step() if there is hardware single-step support +# arch_has_block_step() if there is hardware block-step support +# arch_ptrace() and not #define __ARCH_SYS_PTRACE +# compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE +# asm/syscall.h supplying asm-generic/syscall.h interface +# linux/regset.h user_regset interfaces +# CORE_DUMP_USE_REGSET #define'd in linux/elf.h +# TIF_SYSCALL_TRACE calls tracehook_report_syscall_{entry,exit} +# TIF_NOTIFY_RESUME calls tracehook_notify_resume() +# signal delivery calls tracehook_signal_handler() +# +config HAVE_ARCH_TRACEHOOK + def_bool n diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 16be414..f23a54a 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -19,6 +19,7 @@ config IA64 select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_ARCH_TRACEHOOK select HAVE_DMA_ATTRS select HAVE_KVM default y diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 7714a97..189d525 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -2626,7 +2627,7 @@ pfm_task_incompatible(pfm_context_t *ctx /* * make sure the task is off any CPU */ - wait_task_inactive(task); + wait_task_inactive(task, 0); /* more to come... */ @@ -3684,7 +3685,7 @@ pfm_restart(pfm_context_t *ctx, void *ar PFM_SET_WORK_PENDING(task, 1); - tsk_set_notify_resume(task); + set_notify_resume(task); /* * XXX: send reschedule if task runs on another CPU @@ -4774,7 +4775,7 @@ recheck: UNPROTECT_CTX(ctx, flags); - wait_task_inactive(task); + wait_task_inactive(task, 0); PROTECT_CTX(ctx, flags); @@ -5044,8 +5045,6 @@ pfm_handle_work(void) PFM_SET_WORK_PENDING(current, 0); - tsk_clear_notify_resume(current); - regs = task_pt_regs(current); /* @@ -5414,7 +5413,7 @@ pfm_overflow_handler(struct task_struct * when coming from ctxsw, current still points to the * previous task, therefore we must work with task and not current. */ - tsk_set_notify_resume(task); + set_notify_resume(task); } /* * defer until state is changed (shorten spin window). the context is locked diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index a3a34b4..5164aab 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -156,21 +157,6 @@ show_regs (struct pt_regs *regs) show_stack(NULL, NULL); } -void tsk_clear_notify_resume(struct task_struct *tsk) -{ -#ifdef CONFIG_PERFMON - if (tsk->thread.pfm_needs_checking) - return; -#endif - if (test_ti_thread_flag(task_thread_info(tsk), TIF_RESTORE_RSE)) - return; - clear_ti_thread_flag(task_thread_info(tsk), TIF_NOTIFY_RESUME); -} - -/* - * do_notify_resume_user(): - * Called from notify_resume_user at entry.S, with interrupts disabled. - */ void do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall) { @@ -199,6 +185,11 @@ do_notify_resume_user(sigset_t *unused, ia64_do_signal(scr, in_syscall); } + if (test_thread_flag(TIF_NOTIFY_RESUME)) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(&scr->pt); + } + /* copy user rbs to kernel rbs */ if (unlikely(test_thread_flag(TIF_RESTORE_RSE))) { local_irq_enable(); /* force interrupt enable */ diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c [...2942 lines suppressed...] + do_group_exit(info->si_signo); /* NOTREACHED */ } spin_unlock_irq(&sighand->siglock); @@ -1909,7 +1937,7 @@ void exit_signals(struct task_struct *ts out: spin_unlock_irq(&tsk->sighand->siglock); - if (unlikely(group_stop)) { + if (unlikely(group_stop) && tracehook_notify_jctl(1, CLD_STOPPED)) { read_lock(&tasklist_lock); do_notify_parent_cldstop(tsk, CLD_STOPPED); read_unlock(&tasklist_lock); @@ -1921,7 +1949,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal); EXPORT_SYMBOL(flush_signals); EXPORT_SYMBOL(force_sig); EXPORT_SYMBOL(kill_proc); -EXPORT_SYMBOL(ptrace_notify); EXPORT_SYMBOL(send_sig); EXPORT_SYMBOL(send_sig_info); EXPORT_SYMBOL(sigprocmask); @@ -2325,7 +2352,7 @@ int do_sigaction(int sig, struct k_sigac * (for example, SIGCHLD), shall cause the pending signal to * be discarded, whether or not it is blocked" */ - if (__sig_ignored(t, sig)) { + if (sig_handler_ignored(sig_handler(t, sig), sig)) { sigemptyset(&mask); sigaddset(&mask, sig); rm_from_queue_full(&mask, &t->signal->shared_pending); diff --git a/lib/Makefile b/lib/Makefile index 74b0cfb..62dfd16 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -72,6 +72,8 @@ lib-$(CONFIG_GENERIC_BUG) += bug.o obj-$(CONFIG_HAVE_LMB) += lmb.o +obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o + hostprogs-y := gen_crc32table clean-files := crc32table.h diff --git a/lib/syscall.c b/lib/syscall.c new file mode 100644 index ...a4f7067 100644 --- /dev/null +++ b/lib/syscall.c @@ -0,0 +1,75 @@ +#include +#include +#include +#include + +static int collect_syscall(struct task_struct *target, long *callno, + unsigned long args[6], unsigned int maxargs, + unsigned long *sp, unsigned long *pc) +{ + struct pt_regs *regs = task_pt_regs(target); + if (unlikely(!regs)) + return -EAGAIN; + + *sp = user_stack_pointer(regs); + *pc = instruction_pointer(regs); + + *callno = syscall_get_nr(target, regs); + if (*callno != -1L && maxargs > 0) + syscall_get_arguments(target, regs, 0, maxargs, args); + + return 0; +} + +/** + * task_current_syscall - Discover what a blocked task is doing. + * @target: thread to examine + * @callno: filled with system call number or -1 + * @args: filled with @maxargs system call arguments + * @maxargs: number of elements in @args to fill + * @sp: filled with user stack pointer + * @pc: filled with user PC + * + * If @target is blocked in a system call, returns zero with *@callno + * set to the the call's number and @args filled in with its arguments. + * Registers not used for system call arguments may not be available and + * it is not kosher to use &struct user_regset calls while the system + * call is still in progress. Note we may get this result if @target + * has finished its system call but not yet returned to user mode, such + * as when it's stopped for signal handling or syscall exit tracing. + * + * If @target is blocked in the kernel during a fault or exception, + * returns zero with *@callno set to -1 and does not fill in @args. + * If so, it's now safe to examine @target using &struct user_regset + * get() calls as long as we're sure @target won't return to user mode. + * + * Returns -%EAGAIN if @target does not remain blocked. + * + * Returns -%EINVAL if @maxargs is too large (maximum is six). + */ +int task_current_syscall(struct task_struct *target, long *callno, + unsigned long args[6], unsigned int maxargs, + unsigned long *sp, unsigned long *pc) +{ + long state; + unsigned long ncsw; + + if (unlikely(maxargs > 6)) + return -EINVAL; + + if (target == current) + return collect_syscall(target, callno, args, maxargs, sp, pc); + + state = target->state; + if (unlikely(!state)) + return -EAGAIN; + + ncsw = wait_task_inactive(target, state); + if (unlikely(!ncsw) || + unlikely(collect_syscall(target, callno, args, maxargs, sp, pc)) || + unlikely(wait_task_inactive(target, state) != ncsw)) + return -EAGAIN; + + return 0; +} +EXPORT_SYMBOL_GPL(task_current_syscall); diff --git a/mm/nommu.c b/mm/nommu.c index 4462b6a..5edccd9 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -745,7 +745,7 @@ static unsigned long determine_vm_flags( * it's being traced - otherwise breakpoints set in it may interfere * with another untraced process */ - if ((flags & MAP_PRIVATE) && (current->ptrace & PT_PTRACED)) + if ((flags & MAP_PRIVATE) && tracehook_expect_breakpoints(current)) vm_flags &= ~VM_MAYSHARE; return vm_flags; diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 1c864c0..f92c6af 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -1910,22 +1910,6 @@ static int selinux_vm_enough_memory(stru return __vm_enough_memory(mm, pages, cap_sys_admin); } -/** - * task_tracer_task - return the task that is tracing the given task - * @task: task to consider - * - * Returns NULL if noone is tracing @task, or the &struct task_struct - * pointer to its tracer. - * - * Must be called under rcu_read_lock(). - */ -static struct task_struct *task_tracer_task(struct task_struct *task) -{ - if (task->ptrace & PT_PTRACED) - return rcu_dereference(task->parent); - return NULL; -} - /* binprm security operations */ static int selinux_bprm_alloc_security(struct linux_binprm *bprm) @@ -2177,7 +2161,7 @@ static void selinux_bprm_apply_creds(str u32 ptsid = 0; rcu_read_lock(); - tracer = task_tracer_task(current); + tracer = tracehook_tracer_task(current); if (likely(tracer != NULL)) { sec = tracer->security; ptsid = sec->sid; @@ -5205,7 +5189,7 @@ static int selinux_setprocattr(struct ta Otherwise, leave SID unchanged and fail. */ task_lock(p); rcu_read_lock(); - tracer = task_tracer_task(p); + tracer = tracehook_tracer_task(p); if (tracer != NULL) { struct task_security_struct *ptsec = tracer->security; u32 ptsid = ptsec->sid; linux-2.6-xen-0001-xen-execshield-Add-xen-specific-load_user_cs_desc.patch: --- NEW FILE linux-2.6-xen-0001-xen-execshield-Add-xen-specific-load_user_cs_desc.patch --- >From 92d67a7c3a6b059befa7cb3095713f2bbe57baf6 Mon Sep 17 00:00:00 2001 From: Stephen Tweedie Date: Tue, 11 Mar 2008 18:05:30 +0000 Subject: [PATCH] xen execshield: Add xen-specific load_user_cs_desc() x86 32-bit execshield uses load_user_cs_desc() to setup the user CS descriptor, but the Xen version needs to do this via a hypercall. Add this via a new pv_cpu_ops->load_user_cs_desc pv_ops indirection so that it can be selected appropriately at run-time. Signed-off-by: Stephen Tweedie --- arch/x86/kernel/paravirt.c | 1 + arch/x86/xen/enlighten.c | 17 +++++++++++++++++ include/asm-x86/desc.h | 8 ++++++-- include/asm-x86/paravirt.h | 6 ++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index e0f571d..cc185d2 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -323,6 +323,7 @@ struct pv_cpu_ops pv_cpu_ops = { .read_tscp = native_read_tscp, .load_tr_desc = native_load_tr_desc, .set_ldt = native_set_ldt, + .load_user_cs_desc = native_load_user_cs_desc, .load_gdt = native_load_gdt, .load_idt = native_load_idt, .store_gdt = native_store_gdt, diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index bb50845..bedcec8 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -323,6 +323,22 @@ static void xen_set_ldt(const void *addr, unsigned entries) xen_mc_issue(PARAVIRT_LAZY_CPU); } +static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm) +{ + void *gdt; + xmaddr_t mgdt; + u64 descriptor; + struct desc_struct user_cs; + + gdt = &get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]; + mgdt = virt_to_machine(gdt); + + user_cs = mm->context.user_cs; + descriptor = (u64) user_cs.a | ((u64) user_cs.b) << 32; + + HYPERVISOR_update_descriptor(mgdt.maddr, descriptor); +} + static void xen_load_gdt(const struct desc_ptr *dtr) { unsigned long *frames; @@ -1093,6 +1109,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .load_tr_desc = paravirt_nop, .set_ldt = xen_set_ldt, + .load_user_cs_desc = xen_load_user_cs_desc, .load_gdt = xen_load_gdt, .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index a455501..eaba600 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -6,6 +6,7 @@ #include #include #include +#include static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *info) @@ -90,6 +91,7 @@ static inline int desc_empty(const void *ptr) #define load_TLS(t, cpu) native_load_tls(t, cpu) #define set_ldt native_set_ldt +#define load_user_cs_desc native_load_user_cs_desc #define write_ldt_entry(dt, entry, desc) \ native_write_ldt_entry(dt, entry, desc) @@ -380,8 +382,10 @@ static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) desc->b = (limit & 0xf0000) | 0x00c0fb00; } -#define load_user_cs_desc(cpu, mm) \ - get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs +static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm) +{ + get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = mm->context.user_cs; +} extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index ef5e8ec..fd6aed1 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h @@ -113,6 +113,7 @@ struct pv_cpu_ops { void (*store_gdt)(struct desc_ptr *); void (*store_idt)(struct desc_ptr *); void (*set_ldt)(const void *desc, unsigned entries); + void (*load_user_cs_desc)(int cpu, struct mm_struct *mm); unsigned long (*store_tr)(void); void (*load_tls)(struct thread_struct *t, unsigned int cpu); #ifdef CONFIG_X86_64 @@ -830,6 +831,11 @@ static inline void set_ldt(const void *addr, unsigned entries) { PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries); } +static inline void load_user_cs_desc(unsigned int cpu, + struct mm_struct *mm) +{ + PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm); +} static inline void store_gdt(struct desc_ptr *dtr) { PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); -- 1.5.4.1 linux-2.6-xen-0002-xen-execshield-fix-endless-GPF-fault-loop.patch: --- NEW FILE linux-2.6-xen-0002-xen-execshield-fix-endless-GPF-fault-loop.patch --- >From 99a0fe2ac9cac34a9be13fb65f1dd5054c7a8e55 Mon Sep 17 00:00:00 2001 From: Stephen Tweedie Date: Tue, 11 Mar 2008 18:07:31 +0000 Subject: [PATCH] xen execshield: fix endless GPF fault loop Under Xen, loading the user_cs descriptor does not necessarily load the descriptor with the exact same values the kernel requested: some of the control bits in the descriptor may be modified by the hypervisor. With execshield, the check_lazy_exec_limit() function is needed to test whether a fault has been caused by the existing user_cs descriptor being too constrained: if so, it performs a lazy expansion of the legal cs segment bounds. But it does so via an exact match on the descriptor values against their current expected values, so if Xen modifies any control bits in the descriptor, it looks as if the user_cs is out-of-sync; so check_lazy_exec_limit() resets the descriptor and retakes the fault unnecessarily. This means that a GPF fault can be retried indefinitely, with the kernel always seeing the wrong values in user_cs and continually trying to correct them and retake the fault. Fix it by masking off the xen-sensitive control bits when checking that the segment descriptor is up-to-date, and comparing only the bits which affect the segment base and limit. Affects 32-bit only; execshield on 64-bit uses NX for this functionality. Signed-off-by: Stephen Tweedie --- arch/x86/kernel/traps_32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 93b2ad5..10cb168 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c @@ -633,7 +633,8 @@ check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code) desc1 = ¤t->mm->context.user_cs; desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; - if (desc1->a != desc2->a || desc1->b != desc2->b) { + if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) || + desc1->b != desc2->b) { /* * The CS was not in sync - reload it and retry the * instruction. If the instruction still faults then -- 1.5.4.1 linux-2.6-xen-0003-xen-Add-a-vmlinuz-target.patch: --- NEW FILE linux-2.6-xen-0003-xen-Add-a-vmlinuz-target.patch --- >From 8baae5025ee047922b5d7d86110588fe2fc36601 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 19 Feb 2008 15:34:32 +0000 Subject: [PATCH] xen: Add a vmlinuz target Although patches are in progress to allow Xen boot a DomU using a bzImage, support for booting a Dom0 using a bzImage is still a ways off. For now, just add a target to build a gzip-ed ELF file which Xen can use to boot both Dom0 and DomU. Signed-off-by: Mark McLoughlin --- arch/x86/Makefile | 9 +++++++++ arch/x86/boot/.gitignore | 1 + arch/x86/boot/Makefile | 9 +++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 919ce21..9fd7f4d 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -184,6 +184,15 @@ boot := arch/x86/boot PHONY += zImage bzImage compressed zlilo bzlilo \ zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install +ifdef CONFIG_XEN +PHONY += vmlinuz +all: vmlinuz + +vmlinuz: KBUILD_IMAGE := $(boot)/vmlinuz +vmlinuz: vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) +endif + # Default kernel to build all: bzImage diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index 172cf8a..109cf54 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore @@ -6,3 +6,4 @@ offsets.h setup setup.bin setup.elf +vmlinuz diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 7ee102f..6edcbff 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -26,6 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA #RAMDISK := -DRAMDISK=512 targets := vmlinux.bin setup.bin setup.elf zImage bzImage +targets += vmlinuz vmlinux-stripped subdir- := compressed setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o @@ -119,6 +120,14 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE $(obj)/compressed/vmlinux: FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ +$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE + $(call if_changed,gzip) + @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' + +$(obj)/vmlinux-stripped: OBJCOPYFLAGS := -g --strip-unneeded +$(obj)/vmlinux-stripped: vmlinux FORCE + $(call if_changed,objcopy) + # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel FDARGS = # Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel -- 1.5.4.1 linux-2.6-xen-0004-xen-Add-empty-xenctrl-module.patch: --- NEW FILE linux-2.6-xen-0004-xen-Add-empty-xenctrl-module.patch --- >From 6dfc3a1ea93f9569118e0ee463b0c63e7eae8acf Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 08:30:37 +0000 Subject: [PATCH] xen: Add empty xenctrl module Add the basic infrastructure for a xenctrl module which will contain the various kernel interfaces used by (mainly Dom0) Xen userspace. Signed-off-by: Mark McLoughlin --- arch/x86/xen/Kconfig | 9 +++++- drivers/xen/Makefile | 2 + drivers/xen/xenctrl/Makefile | 4 +++ drivers/xen/xenctrl/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xenctrl/Makefile create mode 100644 drivers/xen/xenctrl/main.c diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index c2cc995..b5e3aa2 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -21,4 +21,11 @@ config XEN_MAX_DOMAIN_MEMORY The pseudo-physical to machine address array is sized according to the maximum possible memory size of a Xen domain. This array uses 1 page per gigabyte, so there's no - need to be too stingy here. \ No newline at end of file + need to be too stingy here. + +config XENCTRL + tristate "Xen's user space control interfaces" + depends on XEN && PROC_FS + default y if XEN + help + This is the /proc/xen interface used by Xen's libxc. diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 363286c..5f1a721 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -2,3 +2,5 @@ obj-y += grant-table.o features.o events.o manage.o obj-y += xenbus/ obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += balloon.o + +obj-$(CONFIG_XENCTRL) += xenctrl/ diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile new file mode 100644 index 0000000..1f43a43 --- /dev/null +++ b/drivers/xen/xenctrl/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_XENCTRL) += xenctrl.o + +xenctrl-objs = +xenctrl-objs += main.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c new file mode 100644 index 0000000..2965ceb --- /dev/null +++ b/drivers/xen/xenctrl/main.c @@ -0,0 +1,62 @@ +/****************************************************************************** + * + * main.c + * + * Xen userspace control interfaces + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include + +static int __init xenctrl_init(void) +{ + struct proc_dir_entry *dir; + + if (!is_running_on_xen()) + return -ENODEV; + + dir = proc_mkdir("xen", NULL); + if (!dir) + return -ENOMEM; + + dir->owner = THIS_MODULE; + + return 0; +} + +static void __exit xenctrl_exit(void) +{ + remove_proc_entry("xen", NULL); +} + +module_init(xenctrl_init); +module_exit(xenctrl_exit); + +MODULE_LICENSE("Dual BSD/GPL"); -- 1.5.4.1 linux-2.6-xen-0005-xen-Add-proc-xen-capabilities.patch: --- NEW FILE linux-2.6-xen-0005-xen-Add-proc-xen-capabilities.patch --- >From 5858879e8eb3083db8c4008ca84f75b719569133 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 09:16:51 +0000 Subject: [PATCH] xen: Add /proc/xen/capabilities /proc/xen/capabilities is used by the xend init script to check whether it is running on Dom0. Signed-off-by: Mark McLoughlin --- drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/capabilities.c | 68 ++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/main.c | 11 ++++++ drivers/xen/xenctrl/xenctrl.h | 39 ++++++++++++++++++++ 4 files changed, 119 insertions(+), 0 deletions(-) create mode 100644 drivers/xen/xenctrl/capabilities.c create mode 100644 drivers/xen/xenctrl/xenctrl.h diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 1f43a43..631f535 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_XENCTRL) += xenctrl.o xenctrl-objs = xenctrl-objs += main.o +xenctrl-objs += capabilities.o diff --git a/drivers/xen/xenctrl/capabilities.c b/drivers/xen/xenctrl/capabilities.c new file mode 100644 index 0000000..1ff078a --- /dev/null +++ b/drivers/xen/xenctrl/capabilities.c @@ -0,0 +1,68 @@ +/****************************************************************************** + * + * capabilities.c + * + * /proc/xen/capabilities + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include + +static int capabilities_read(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + int len = 0; + *page = 0; + + if (is_initial_xendomain()) + len = sprintf(page, "control_d\n"); + + *eof = 1; + return len; +} + +int __init capabilities_create_proc_entry(void) +{ + struct proc_dir_entry *entry; + + entry = create_proc_entry("xen/capabilities", 0400, NULL); + if (!entry) + return -ENOMEM; + + entry->owner = THIS_MODULE; + entry->read_proc = capabilities_read; + + return 0; +} + +void __exit capabilities_remove_proc_entry(void) +{ + remove_proc_entry("xen/capabilities", NULL); +} diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index 2965ceb..0e42f7e 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -31,6 +31,8 @@ * IN THE SOFTWARE. */ +#include "xenctrl.h" + #include #include #include @@ -38,6 +40,7 @@ static int __init xenctrl_init(void) { struct proc_dir_entry *dir; + int ret; if (!is_running_on_xen()) return -ENODEV; @@ -48,11 +51,19 @@ static int __init xenctrl_init(void) dir->owner = THIS_MODULE; + ret = capabilities_create_proc_entry(); + if (ret) + goto fail1; + return 0; + + fail1: remove_proc_entry("xen", NULL); + return ret; } static void __exit xenctrl_exit(void) { + capabilities_remove_proc_entry(); remove_proc_entry("xen", NULL); } diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h new file mode 100644 index 0000000..7378dde --- /dev/null +++ b/drivers/xen/xenctrl/xenctrl.h @@ -0,0 +1,39 @@ +/****************************************************************************** + * xenctl.h + * + * Xen userspace control interfaces + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include + +/* + * capabilities.c + */ +int capabilities_create_proc_entry(void) __init; +void capabilities_remove_proc_entry(void) __exit; -- 1.5.4.1 linux-2.6-xen-0006-xen-Add-proc-xen-privcmd.patch: --- NEW FILE linux-2.6-xen-0006-xen-Add-proc-xen-privcmd.patch --- >From f65f1b7c305c444689988e6ee6354ec374dcbdf4 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 08:24:57 +0000 Subject: [PATCH] xen: Add /proc/xen/privcmd /proc/xen/privcmd is an ioctl() interface which allows userspace apps to invoke hypercalls. There should also be an ioctl (IOCTL_PRIVCMD_MMAP) which is used to map foreign pages into a processes address space, but we leave this unimplemented for now pending further work on foreign page support. Signed-off-by: Mark McLoughlin --- drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/main.c | 6 +++ drivers/xen/xenctrl/privcmd.c | 81 +++++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/xenctrl.h | 6 +++ include/asm-x86/xen/hypercall.h | 28 +++++++++++++ include/xen/sys/privcmd.h | 79 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 0 deletions(-) create mode 100644 drivers/xen/xenctrl/privcmd.c create mode 100644 include/xen/sys/privcmd.h diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 631f535..8a706cb 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_XENCTRL) += xenctrl.o xenctrl-objs = xenctrl-objs += main.o xenctrl-objs += capabilities.o +xenctrl-objs += privcmd.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index 0e42f7e..d1fe6ef 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -55,14 +55,20 @@ static int __init xenctrl_init(void) if (ret) goto fail1; + ret = privcmd_create_proc_entry(); + if (ret) + goto fail2; + return 0; + fail2: capabilities_remove_proc_entry(); fail1: remove_proc_entry("xen", NULL); return ret; } static void __exit xenctrl_exit(void) { + privcmd_remove_proc_entry(); capabilities_remove_proc_entry(); remove_proc_entry("xen", NULL); } diff --git a/drivers/xen/xenctrl/privcmd.c b/drivers/xen/xenctrl/privcmd.c new file mode 100644 index 0000000..58c4b83 --- /dev/null +++ b/drivers/xen/xenctrl/privcmd.c @@ -0,0 +1,81 @@ +/****************************************************************************** + * privcmd.c + * + * Interface to privileged domain-0 commands. + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include + +static long privcmd_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) +{ + switch (cmd) { + case IOCTL_PRIVCMD_HYPERCALL: { + privcmd_hypercall_t cmd; + + if (copy_from_user(&cmd, (void __user *)arg, sizeof(cmd))) + return -EFAULT; + + return privcmd_hypercall(&cmd); + } + + case IOCTL_PRIVCMD_MMAP: + case IOCTL_PRIVCMD_MMAPBATCH: + printk(KERN_WARNING "IOCTL_PRIVCMD_MMAP ioctl not yet implemented\n"); + default: + return -EINVAL; + } +} + +static const struct file_operations privcmd_file_ops = { + .unlocked_ioctl = privcmd_ioctl, +}; + +int __init privcmd_create_proc_entry(void) +{ + static struct proc_dir_entry *entry; + + entry = create_proc_entry("xen/privcmd", 0400, NULL); + if (!entry) + return -ENOMEM; + + entry->owner = THIS_MODULE; + entry->proc_fops = &privcmd_file_ops; + + return 0; +} + +void __exit privcmd_remove_proc_entry(void) +{ + remove_proc_entry("xen/privcmd", NULL); +} diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h index 7378dde..a35209a 100644 --- a/drivers/xen/xenctrl/xenctrl.h +++ b/drivers/xen/xenctrl/xenctrl.h @@ -37,3 +37,9 @@ */ int capabilities_create_proc_entry(void) __init; void capabilities_remove_proc_entry(void) __exit; + +/* + * privcmd.c + */ +int privcmd_create_proc_entry(void) __init; +void privcmd_remove_proc_entry(void) __exit; diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index 2a4f9b4..b261030 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -423,4 +423,32 @@ MULTI_stack_switch(struct multicall_entry *mcl, mcl->args[1] = esp; } +#include + +static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) +{ + int ret; + + if (hypercall->op >= (PAGE_SIZE >> 5)) + return -EINVAL; + + __asm__ __volatile__ ( + "pushl %%ebx; pushl %%ecx; pushl %%edx; " + "pushl %%esi; pushl %%edi; " + "movl 8(%%eax),%%ebx ;" + "movl 16(%%eax),%%ecx ;" + "movl 24(%%eax),%%edx ;" + "movl 32(%%eax),%%esi ;" + "movl 40(%%eax),%%edi ;" + "movl (%%eax),%%eax ;" + "shll $5,%%eax ;" + "addl $hypercall_page,%%eax ;" + "call *%%eax ;" + "popl %%edi; popl %%esi; popl %%edx; " + "popl %%ecx; popl %%ebx" + : "=a" (ret) : "0" (hypercall) : "memory" ); + + return ret; +} + #endif /* __HYPERCALL_H__ */ diff --git a/include/xen/sys/privcmd.h b/include/xen/sys/privcmd.h new file mode 100644 index 0000000..9cfa9d7 --- /dev/null +++ b/include/xen/sys/privcmd.h @@ -0,0 +1,79 @@ +/****************************************************************************** + * privcmd.h + * + * Interface to /proc/xen/privcmd. + * + * Copyright (c) 2003-2005, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __LINUX_PUBLIC_PRIVCMD_H__ +#define __LINUX_PUBLIC_PRIVCMD_H__ + +#include + +#ifndef __user +#define __user +#endif + +typedef struct privcmd_hypercall +{ + __u64 op; + __u64 arg[5]; +} privcmd_hypercall_t; + +typedef struct privcmd_mmap_entry { + __u64 va; + __u64 mfn; + __u64 npages; +} privcmd_mmap_entry_t; + +typedef struct privcmd_mmap { + int num; + domid_t dom; /* target domain */ + privcmd_mmap_entry_t __user *entry; +} privcmd_mmap_t; + +typedef struct privcmd_mmapbatch { + int num; /* number of pages to populate */ + domid_t dom; /* target domain */ + __u64 addr; /* virtual address */ + ulong __user *arr; /* array of mfns - top nibble set on err */ +} privcmd_mmapbatch_t; + +/* + * @cmd: IOCTL_PRIVCMD_HYPERCALL + * @arg: &privcmd_hypercall_t + * Return: Value returned from execution of the specified hypercall. + */ +#define IOCTL_PRIVCMD_HYPERCALL \ + _IOC(_IOC_NONE, 'P', 0, sizeof(privcmd_hypercall_t)) +#define IOCTL_PRIVCMD_MMAP \ + _IOC(_IOC_NONE, 'P', 2, sizeof(privcmd_mmap_t)) +#define IOCTL_PRIVCMD_MMAPBATCH \ + _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t)) + +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ -- 1.5.4.1 linux-2.6-xen-0007-xen-Add-proc-xen-xenbus.patch: --- NEW FILE linux-2.6-xen-0007-xen-Add-proc-xen-xenbus.patch --- >From 99347028aaffbd71ec50420929f2dd10c9f78705 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 22:04:36 +0000 Subject: [PATCH] xen: Add /proc/xen/xenbus This interface is used by userspace programs to talk to xenstored. Since xenstored makes itself available to Dom0 userspace via a socket this should only really be useful in Domu, but it turns out that Dom0 apps historically default to using /proc/xen/xenbus rather than the socket. Signed-off-by: Mark McLoughlin --- drivers/xen/xenbus/xenbus_comms.h | 1 - drivers/xen/xenbus/xenbus_probe.c | 2 + drivers/xen/xenbus/xenbus_xs.c | 1 + drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/main.c | 6 + drivers/xen/xenctrl/xenbus.c | 398 +++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/xenctrl.h | 6 + include/xen/xenbus.h | 2 + 8 files changed, 416 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xenctrl/xenbus.c diff --git a/drivers/xen/xenbus/xenbus_comms.h b/drivers/xen/xenbus/xenbus_comms.h index c21db75..fcc9b29 100644 --- a/drivers/xen/xenbus/xenbus_comms.h +++ b/drivers/xen/xenbus/xenbus_comms.h @@ -41,6 +41,5 @@ int xb_data_to_read(void); int xb_wait_for_data_to_read(void); int xs_input_avail(void); extern struct xenstore_domain_interface *xen_store_interface; -extern int xen_store_evtchn; #endif /* _XENBUS_COMMS_H */ diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 57ceb53..c811581 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -56,6 +56,8 @@ #include "xenbus_probe.h" int xen_store_evtchn; +EXPORT_SYMBOL_GPL(xen_store_evtchn); + struct xenstore_domain_interface *xen_store_interface; static unsigned long xen_store_mfn; diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index 7f2f91c..e325eab 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c @@ -184,6 +184,7 @@ void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg) return ret; } +EXPORT_SYMBOL(xenbus_dev_request_and_reply); /* Send message to xs, get kmalloc'ed reply. ERR_PTR() on error. */ static void *xs_talkv(struct xenbus_transaction t, diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 8a706cb..23dafa3 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -4,3 +4,4 @@ xenctrl-objs = xenctrl-objs += main.o xenctrl-objs += capabilities.o xenctrl-objs += privcmd.o +xenctrl-objs += xenbus.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index d1fe6ef..b0cf61b 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -59,8 +59,13 @@ static int __init xenctrl_init(void) if (ret) goto fail2; + ret = xenbus_create_proc_entry(); + if (ret) + goto fail3; + return 0; + fail3: privcmd_remove_proc_entry(); fail2: capabilities_remove_proc_entry(); fail1: remove_proc_entry("xen", NULL); return ret; @@ -68,6 +73,7 @@ static int __init xenctrl_init(void) static void __exit xenctrl_exit(void) { + xenbus_remove_proc_entry(); privcmd_remove_proc_entry(); capabilities_remove_proc_entry(); remove_proc_entry("xen", NULL); diff --git a/drivers/xen/xenctrl/xenbus.c b/drivers/xen/xenctrl/xenbus.c new file mode 100644 index 0000000..57d5501 --- /dev/null +++ b/drivers/xen/xenctrl/xenbus.c @@ -0,0 +1,398 @@ +/* + * xenbus.c + * + * /proc/xen/xenbus gives user-space access to the kernel's xenbus + * connection to xenstore. + * + * Copyright (c) 2005, Christian Limpach + * Copyright (c) 2005, Rusty Russell, IBM Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include + +#include + +struct xenbus_dev_transaction { + struct list_head list; + struct xenbus_transaction handle; +}; + +struct read_buffer { + struct list_head list; + unsigned int cons; + unsigned int len; + char msg[]; +}; + +struct xenbus_dev_data { + /* In-progress transaction. */ + struct list_head transactions; + + /* Active watches. */ + struct list_head watches; + + /* Partial request. */ + unsigned int len; + union { + struct xsd_sockmsg msg; + char buffer[PAGE_SIZE]; + } u; + + /* Response queue. */ + struct list_head read_buffers; + wait_queue_head_t read_waitq; + + struct mutex reply_mutex; +}; + +static ssize_t xenbus_dev_read(struct file *filp, + char __user *ubuf, + size_t len, loff_t *ppos) +{ + struct xenbus_dev_data *u = filp->private_data; + struct read_buffer *rb; + int i, ret; + + mutex_lock(&u->reply_mutex); + while (list_empty(&u->read_buffers)) { + mutex_unlock(&u->reply_mutex); + ret = wait_event_interruptible(u->read_waitq, + !list_empty(&u->read_buffers)); + if (ret) + return ret; + mutex_lock(&u->reply_mutex); + } + + rb = list_entry(u->read_buffers.next, struct read_buffer, list); + for (i = 0; i < len;) { + put_user(rb->msg[rb->cons], ubuf + i); + i++; + rb->cons++; + if (rb->cons == rb->len) { + list_del(&rb->list); + kfree(rb); + if (list_empty(&u->read_buffers)) + break; + rb = list_entry(u->read_buffers.next, + struct read_buffer, list); + } + } + mutex_unlock(&u->reply_mutex); + + return i; +} + +static void queue_reply(struct xenbus_dev_data *u, + char *data, unsigned int len) +{ + struct read_buffer *rb; + + if (len == 0) + return; + + rb = kmalloc(sizeof(*rb) + len, GFP_KERNEL); + BUG_ON(rb == NULL); + + rb->cons = 0; + rb->len = len; + + memcpy(rb->msg, data, len); + + list_add_tail(&rb->list, &u->read_buffers); + + wake_up(&u->read_waitq); +} + +struct watch_adapter +{ + struct list_head list; + struct xenbus_watch watch; + struct xenbus_dev_data *dev_data; + char *token; +}; + +static void free_watch_adapter(struct watch_adapter *watch) +{ + kfree(watch->watch.node); + kfree(watch->token); + kfree(watch); +} + +static void watch_fired(struct xenbus_watch *watch, + const char **vec, + unsigned int len) +{ + struct watch_adapter *adap = + container_of(watch, struct watch_adapter, watch); + struct xsd_sockmsg hdr; + const char *path, *token; + int path_len, tok_len, body_len; + + path = vec[XS_WATCH_PATH]; + token = adap->token; + + path_len = strlen(path) + 1; + tok_len = strlen(token) + 1; + body_len = path_len + tok_len; + + hdr.type = XS_WATCH_EVENT; + hdr.len = body_len; + + mutex_lock(&adap->dev_data->reply_mutex); + queue_reply(adap->dev_data, (char *)&hdr, sizeof(hdr)); + queue_reply(adap->dev_data, (char *)path, path_len); + queue_reply(adap->dev_data, (char *)token, tok_len); + mutex_unlock(&adap->dev_data->reply_mutex); +} + +static LIST_HEAD(watch_list); + +static ssize_t xenbus_dev_write(struct file *filp, + const char __user *ubuf, + size_t len, loff_t *ppos) +{ + struct xenbus_dev_data *u = filp->private_data; + struct xenbus_dev_transaction *trans = NULL; + uint32_t msg_type; + void *reply; + char *path, *token; + struct watch_adapter *watch, *tmp_watch; + int err, rc = len; + + if ((len + u->len) > sizeof(u->u.buffer)) { + rc = -EINVAL; + goto out; + } + + if (copy_from_user(u->u.buffer + u->len, ubuf, len) != 0) { + rc = -EFAULT; + goto out; + } + + u->len += len; + if ((u->len < sizeof(u->u.msg)) || + (u->len < (sizeof(u->u.msg) + u->u.msg.len))) + return rc; + + msg_type = u->u.msg.type; + + switch (msg_type) { + case XS_TRANSACTION_START: + case XS_TRANSACTION_END: + case XS_DIRECTORY: + case XS_READ: + case XS_GET_PERMS: + case XS_RELEASE: + case XS_GET_DOMAIN_PATH: + case XS_WRITE: + case XS_MKDIR: + case XS_RM: + case XS_SET_PERMS: + if (msg_type == XS_TRANSACTION_START) { + trans = kmalloc(sizeof(*trans), GFP_KERNEL); + if (!trans) { + rc = -ENOMEM; + goto out; + } + } + + reply = xenbus_dev_request_and_reply(&u->u.msg); + if (IS_ERR(reply)) { + kfree(trans); + rc = PTR_ERR(reply); + goto out; + } + + if (msg_type == XS_TRANSACTION_START) { + trans->handle.id = simple_strtoul(reply, NULL, 0); + list_add(&trans->list, &u->transactions); + } else if (msg_type == XS_TRANSACTION_END) { + list_for_each_entry(trans, &u->transactions, list) + if (trans->handle.id == u->u.msg.tx_id) + break; + BUG_ON(&trans->list == &u->transactions); + list_del(&trans->list); + kfree(trans); + } + mutex_lock(&u->reply_mutex); + queue_reply(u, (char *)&u->u.msg, sizeof(u->u.msg)); + queue_reply(u, (char *)reply, u->u.msg.len); + mutex_unlock(&u->reply_mutex); + kfree(reply); + break; + + case XS_WATCH: + case XS_UNWATCH: { + static const char *XS_RESP = "OK"; + struct xsd_sockmsg hdr; + + path = u->u.buffer + sizeof(u->u.msg); + token = memchr(path, 0, u->u.msg.len); + if (token == NULL) { + rc = -EILSEQ; + goto out; + } + token++; + + if (msg_type == XS_WATCH) { + watch = kmalloc(sizeof(*watch), GFP_KERNEL); + watch->watch.node = kmalloc(strlen(path)+1, + GFP_KERNEL); + strcpy((char *)watch->watch.node, path); + watch->watch.callback = watch_fired; + watch->token = kmalloc(strlen(token)+1, GFP_KERNEL); + strcpy(watch->token, token); + watch->dev_data = u; + + err = register_xenbus_watch(&watch->watch); + if (err) { + free_watch_adapter(watch); + rc = err; + goto out; + } + + list_add(&watch->list, &u->watches); + } else { + list_for_each_entry_safe(watch, tmp_watch, + &u->watches, list) { + if (!strcmp(watch->token, token) && + !strcmp(watch->watch.node, path)) + { + unregister_xenbus_watch(&watch->watch); + list_del(&watch->list); + free_watch_adapter(watch); + break; + } + } + } + + hdr.type = msg_type; + hdr.len = strlen(XS_RESP) + 1; + mutex_lock(&u->reply_mutex); + queue_reply(u, (char *)&hdr, sizeof(hdr)); + queue_reply(u, (char *)XS_RESP, hdr.len); + mutex_unlock(&u->reply_mutex); + break; + } + + default: + rc = -EINVAL; + break; + } + + out: + u->len = 0; + return rc; +} + +static int xenbus_dev_open(struct inode *inode, struct file *filp) +{ + struct xenbus_dev_data *u; + + if (xen_store_evtchn == 0) + return -ENOENT; + + nonseekable_open(inode, filp); + + u = kzalloc(sizeof(*u), GFP_KERNEL); + if (u == NULL) + return -ENOMEM; + + INIT_LIST_HEAD(&u->transactions); + INIT_LIST_HEAD(&u->watches); + INIT_LIST_HEAD(&u->read_buffers); + init_waitqueue_head(&u->read_waitq); + + mutex_init(&u->reply_mutex); + + filp->private_data = u; + + return 0; +} + +static int xenbus_dev_release(struct inode *inode, struct file *filp) +{ + struct xenbus_dev_data *u = filp->private_data; + struct xenbus_dev_transaction *trans, *tmp; + struct watch_adapter *watch, *tmp_watch; + + list_for_each_entry_safe(trans, tmp, &u->transactions, list) { + xenbus_transaction_end(trans->handle, 1); + list_del(&trans->list); + kfree(trans); + } + + list_for_each_entry_safe(watch, tmp_watch, &u->watches, list) { + unregister_xenbus_watch(&watch->watch); + list_del(&watch->list); + free_watch_adapter(watch); + } + + kfree(u); + + return 0; +} + +static unsigned int xenbus_dev_poll(struct file *file, poll_table *wait) +{ + struct xenbus_dev_data *u = file->private_data; + + poll_wait(file, &u->read_waitq, wait); + if (!list_empty(&u->read_buffers)) + return POLLIN | POLLRDNORM; + return 0; +} + +static const struct file_operations xenbus_dev_file_ops = { + .read = xenbus_dev_read, + .write = xenbus_dev_write, + .open = xenbus_dev_open, + .release = xenbus_dev_release, + .poll = xenbus_dev_poll, +}; + +int __init xenbus_create_proc_entry(void) +{ + struct proc_dir_entry *entry; + + entry = create_proc_entry("xen/xenbus", 0400, NULL); + if (!entry) + return -ENOMEM; + + entry->owner = THIS_MODULE; + entry->proc_fops = &xenbus_dev_file_ops; + + return 0; +} + +void __exit xenbus_remove_proc_entry(void) +{ + remove_proc_entry("xen/xenbus", NULL); +} diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h index a35209a..e585c4b 100644 --- a/drivers/xen/xenctrl/xenctrl.h +++ b/drivers/xen/xenctrl/xenctrl.h @@ -43,3 +43,9 @@ void capabilities_remove_proc_entry(void) __exit; */ int privcmd_create_proc_entry(void) __init; void privcmd_remove_proc_entry(void) __exit; + +/* + * xenbus.c + */ +int xenbus_create_proc_entry(void) __init; +void xenbus_remove_proc_entry(void) __exit; diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 6369d89..a3fef9d 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -232,4 +232,6 @@ const char *xenbus_strstate(enum xenbus_state state); int xenbus_dev_is_online(struct xenbus_device *dev); int xenbus_frontend_closed(struct xenbus_device *dev); +extern int xen_store_evtchn; + #endif /* _XEN_XENBUS_H */ -- 1.5.4.1 linux-2.6-xen-0008-xen-Add-Xen-s-sys-hypervisor-interface.patch: --- NEW FILE linux-2.6-xen-0008-xen-Add-Xen-s-sys-hypervisor-interface.patch --- >From 1e8f36fd7994750457292685cdfb71dd6be1750c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 7 Feb 2008 15:32:28 +0000 Subject: [PATCH] xen: Add Xen's /sys/hypervisor interface Hook up Xen's /sys/hypervisor interface: /sys/hypervisor/ -> type -> uuid -> compilation -> compile_date -> compiled_by -> compiler -> properties -> capabilities -> changeset -> pagesize -> virtual_start -> writable_pt -> version -> extra -> major -> minor Note: the hypervisor subsys hook requires that SYS_HYPERVISOR is selected to enabled it, which in turns means that the subsys will be registered by a pv-ops kernel with Xen support, even on bare metal. This hook needs to be changed to be runtime enabled. Signed-off-by: Mark McLoughlin --- arch/x86/xen/Kconfig | 3 +- drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/main.c | 6 + drivers/xen/xenctrl/sysfs.c | 349 +++++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/xenctrl.h | 6 + include/xen/interface/version.h | 6 + 6 files changed, 370 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xenctrl/sysfs.c diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index b5e3aa2..2983253 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -25,7 +25,8 @@ config XEN_MAX_DOMAIN_MEMORY config XENCTRL tristate "Xen's user space control interfaces" - depends on XEN && PROC_FS + depends on XEN && PROC_FS && SYSFS default y if XEN + select SYS_HYPERVISOR help This is the /proc/xen interface used by Xen's libxc. diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 23dafa3..e126e76 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -5,3 +5,4 @@ xenctrl-objs += main.o xenctrl-objs += capabilities.o xenctrl-objs += privcmd.o xenctrl-objs += xenbus.o +xenctrl-objs += sysfs.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index b0cf61b..87d0dba 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -63,8 +63,13 @@ static int __init xenctrl_init(void) if (ret) goto fail3; + ret = sys_hypervisor_init(); + if (ret) + goto fail4; + return 0; + fail4: xenbus_remove_proc_entry(); fail3: privcmd_remove_proc_entry(); fail2: capabilities_remove_proc_entry(); fail1: remove_proc_entry("xen", NULL); @@ -73,6 +78,7 @@ static int __init xenctrl_init(void) static void __exit xenctrl_exit(void) { + sys_hypervisor_exit(); xenbus_remove_proc_entry(); privcmd_remove_proc_entry(); capabilities_remove_proc_entry(); diff --git a/drivers/xen/xenctrl/sysfs.c b/drivers/xen/xenctrl/sysfs.c new file mode 100644 index 0000000..8cbf4d6 --- /dev/null +++ b/drivers/xen/xenctrl/sysfs.c @@ -0,0 +1,349 @@ +/* + * copyright (c) 2006 IBM Corporation + * Authored by: Mike D. Day + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include "xenctrl.h" + +#define HYPERVISOR_ATTR_RO(_name) \ +static struct kobj_attribute _name##_attr = __ATTR_RO(_name) + +#define HYPERVISOR_ATTR_RW(_name) \ +static struct kobj_attribute _name##_attr = \ + __ATTR(_name, 0644, _name##_show, _name##_store) + +static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + return sprintf(buffer, "xen\n"); +} + +HYPERVISOR_ATTR_RO(type); + +static int __init xen_sysfs_type_init(void) +{ + return sysfs_create_file(hypervisor_kobj, &type_attr.attr); +} + +static void xen_sysfs_type_destroy(void) +{ + sysfs_remove_file(hypervisor_kobj, &type_attr.attr); +} + +static ssize_t major_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int version; + + version = HYPERVISOR_xen_version(XENVER_version, NULL); + if (!version) + return -ENODEV; + + return sprintf(buffer, "%d\n", version >> 16); +} + +HYPERVISOR_ATTR_RO(major); + +static ssize_t minor_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int version; + + version = HYPERVISOR_xen_version(XENVER_version, NULL); + if (!version) + return -ENODEV; + + return sprintf(buffer, "%d\n", version & 0xff); +} + +HYPERVISOR_ATTR_RO(minor); + +static ssize_t extra_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int ret; + struct xen_extraversion extra; + + ret = HYPERVISOR_xen_version(XENVER_extraversion, &extra); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", extra.extraversion); +} + +HYPERVISOR_ATTR_RO(extra); + +static struct attribute *version_attrs[] = { + &major_attr.attr, + &minor_attr.attr, + &extra_attr.attr, + NULL +}; + +static struct attribute_group version_group = { + .name = "version", + .attrs = version_attrs, +}; + +static int __init xen_sysfs_version_init(void) +{ + return sysfs_create_group(hypervisor_kobj, &version_group); +} + +static void xen_sysfs_version_destroy(void) +{ + sysfs_remove_group(hypervisor_kobj, &version_group); +} + +static ssize_t uuid_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + char *vm, *val; + int ret; + + vm = xenbus_read(XBT_NIL, "vm", "", NULL); + if (IS_ERR(vm)) + return PTR_ERR(vm); + + val = xenbus_read(XBT_NIL, vm, "uuid", NULL); + if (IS_ERR(val)) { + ret = PTR_ERR(val); + goto out; + } + + ret = sprintf(buffer, "%s\n", val); + + kfree(val); +out: kfree(vm); + + return ret; +} + +HYPERVISOR_ATTR_RO(uuid); + +static int __init xen_sysfs_uuid_init(void) +{ + return sysfs_create_file(hypervisor_kobj, &uuid_attr.attr); +} + +static void xen_sysfs_uuid_destroy(void) +{ + sysfs_remove_file(hypervisor_kobj, &uuid_attr.attr); +} + +static ssize_t compiler_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_compile_info info; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", info.compiler); +} + +HYPERVISOR_ATTR_RO(compiler); + +static ssize_t compiled_by_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_compile_info info; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", info.compile_by); +} + +HYPERVISOR_ATTR_RO(compiled_by); + +static ssize_t compile_date_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_compile_info info; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", info.compile_date); +} + +HYPERVISOR_ATTR_RO(compile_date); + +static struct attribute *xen_compile_attrs[] = { + &compiler_attr.attr, + &compiled_by_attr.attr, + &compile_date_attr.attr, + NULL +}; + +static struct attribute_group xen_compilation_group = { + .name = "compilation", + .attrs = xen_compile_attrs, +}; + +static int __init xen_compilation_init(void) +{ + return sysfs_create_group(hypervisor_kobj, + &xen_compilation_group); +} + +static void xen_compilation_destroy(void) +{ + sysfs_remove_group(hypervisor_kobj, + &xen_compilation_group); +} + +static ssize_t capabilities_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_capabilities_info *caps; + int ret; + + caps = kmalloc(sizeof(struct xen_capabilities_info), GFP_KERNEL); + if (!caps) + return -ENOMEM; + + ret = HYPERVISOR_xen_version(XENVER_capabilities, caps); + if (ret) + goto out; + + ret = sprintf(buffer, "%s\n", caps->info); + +out: kfree(caps); + + return ret; +} + +HYPERVISOR_ATTR_RO(capabilities); + +static ssize_t changeset_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_changeset_info cset; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_changeset, &cset); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", cset.info); +} + +HYPERVISOR_ATTR_RO(changeset); + +static ssize_t virtual_start_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_platform_parameters parms; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_platform_parameters, &parms); + if (ret) + return ret; + + return sprintf(buffer, "%lx\n", parms.virt_start); +} + +HYPERVISOR_ATTR_RO(virtual_start); + +static ssize_t pagesize_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int ret; + + ret = HYPERVISOR_xen_version(XENVER_pagesize, NULL); + if (ret < 0) + return ret; + + return sprintf(buffer, "%x\n", ret); +} + +HYPERVISOR_ATTR_RO(pagesize); + +static ssize_t writable_pt_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_feature_info info; + int ret; + + info.submap_idx = XENFEAT_writable_page_tables; + + ret = HYPERVISOR_xen_version(XENVER_get_features, &info); + if (ret) + return ret; + + return sprintf(buffer, "%d\n", info.submap); +} + +HYPERVISOR_ATTR_RO(writable_pt); + +static struct attribute *xen_properties_attrs[] = { + &capabilities_attr.attr, + &changeset_attr.attr, + &virtual_start_attr.attr, + &pagesize_attr.attr, + &writable_pt_attr.attr, + NULL +}; + +static struct attribute_group xen_properties_group = { + .name = "properties", + .attrs = xen_properties_attrs, +}; + +static int __init xen_properties_init(void) +{ + return sysfs_create_group(hypervisor_kobj, + &xen_properties_group); +} + +static void xen_properties_destroy(void) +{ + sysfs_remove_group(hypervisor_kobj, &xen_properties_group); +} + +int __init sys_hypervisor_init(void) +{ + int ret; + + if (!is_running_on_xen()) + return -ENODEV; + + ret = xen_sysfs_type_init(); + if (ret) + goto out; + ret = xen_sysfs_version_init(); + if (ret) + goto version_out; + ret = xen_compilation_init(); + if (ret) + goto comp_out; + ret = xen_sysfs_uuid_init(); + if (ret) + goto uuid_out; + ret = xen_properties_init(); + if (!ret) + goto out; + + xen_sysfs_uuid_destroy(); +uuid_out: + xen_compilation_destroy(); +comp_out: + xen_sysfs_version_destroy(); +version_out: + xen_sysfs_type_destroy(); +out: + return ret; +} + +void __exit sys_hypervisor_exit(void) +{ + xen_properties_destroy(); + xen_compilation_destroy(); + xen_sysfs_uuid_destroy(); + xen_sysfs_version_destroy(); + xen_sysfs_type_destroy(); +} diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h index e585c4b..1afbdfb 100644 --- a/drivers/xen/xenctrl/xenctrl.h +++ b/drivers/xen/xenctrl/xenctrl.h @@ -49,3 +49,9 @@ void privcmd_remove_proc_entry(void) __exit; */ int xenbus_create_proc_entry(void) __init; void xenbus_remove_proc_entry(void) __exit; + +/* + * sysfs.c + */ +int sys_hypervisor_init(void) __init; +void sys_hypervisor_exit(void) __exit; diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h index 453235e..dd58cf5 100644 --- a/include/xen/interface/version.h +++ b/include/xen/interface/version.h @@ -57,4 +57,10 @@ struct xen_feature_info { /* Declares the features reported by XENVER_get_features. */ #include "features.h" +/* arg == NULL; returns host memory page size. */ +#define XENVER_pagesize 7 + +/* arg == xen_domain_handle_t. */ +#define XENVER_guest_handle 8 + #endif /* __XEN_PUBLIC_VERSION_H__ */ -- 1.5.4.1 linux-2.6-xen-0009-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch: --- NEW FILE linux-2.6-xen-0009-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch --- >From bd26a092c493ca8fdc4e26d42fdcfb988fbc3fea Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 6 Mar 2008 11:10:59 +0000 Subject: [PATCH] xen x86_64: Add 64 bit version of privcmd_hypercall() Signed-off-by: Mark McLoughlin --- include/asm-x86/xen/hypercall.h | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index b261030..74465b7 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -425,6 +425,7 @@ MULTI_stack_switch(struct multicall_entry *mcl, #include +#ifdef CONFIG_X86_32 static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) { int ret; @@ -450,5 +451,32 @@ static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) return ret; } +#else /* CONFIG_X86_32 */ +static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) +{ + int ret; + long ign1, ign2, ign3; + + if (hypercall->op >= (PAGE_SIZE >> 5)) + return -EINVAL; + + __asm__ __volatile__ ( + "movq %8,%%r10; movq %9,%%r8;" + "shll $5,%%eax ;" + "addq $hypercall_page,%%rax ;" + "call *%%rax" + : "=a" (ret), "=D" (ign1), + "=S" (ign2), "=d" (ign3) + : "0" ((unsigned int)hypercall->op), + "1" (hypercall->arg[0]), + "2" (hypercall->arg[1]), + "3" (hypercall->arg[2]), + "g" (hypercall->arg[3]), + "g" (hypercall->arg[4]) + : "r8", "r10", "memory" ); + + return ret; +} +#endif /* CONFIG_X86_32 */ #endif /* __HYPERCALL_H__ */ -- 1.5.4.1 linux-2.6-xen-0010-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch: --- NEW FILE linux-2.6-xen-0010-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch --- >From fe3adc294af5b5be37dbc9aa5e8393898bfb61bc Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 25 Mar 2008 11:56:43 +0000 Subject: [PATCH] xen x86_64: Only define load_user_cs_desc() on 32 bit load_user_cs_desc() is only used on 32 bit, so only define it in that case. Fixes compile failure in native_load_user_cs_desc() since mm_context_t->user_cs is only available on 32 bit. Signed-off-by: Mark McLoughlin --- arch/x86/kernel/paravirt.c | 2 ++ arch/x86/xen/enlighten.c | 4 ++++ include/asm-x86/desc.h | 4 ++++ include/asm-x86/paravirt.h | 4 ++++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index cc185d2..63ef48b 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -323,7 +323,9 @@ struct pv_cpu_ops pv_cpu_ops = { .read_tscp = native_read_tscp, .load_tr_desc = native_load_tr_desc, .set_ldt = native_set_ldt, +#ifdef CONFIG_X86_32 .load_user_cs_desc = native_load_user_cs_desc, +#endif .load_gdt = native_load_gdt, .load_idt = native_load_idt, .store_gdt = native_store_gdt, diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index bedcec8..7bf15e8 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -323,6 +323,7 @@ static void xen_set_ldt(const void *addr, unsigned entries) xen_mc_issue(PARAVIRT_LAZY_CPU); } +#ifdef CONFIG_X86_32 static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm) { void *gdt; @@ -338,6 +339,7 @@ static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm) HYPERVISOR_update_descriptor(mgdt.maddr, descriptor); } +#endif static void xen_load_gdt(const struct desc_ptr *dtr) { @@ -1109,7 +1111,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .load_tr_desc = paravirt_nop, .set_ldt = xen_set_ldt, +#ifdef CONFIG_X86_32 .load_user_cs_desc = xen_load_user_cs_desc, +#endif .load_gdt = xen_load_gdt, .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index eaba600..dc97a74 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -91,7 +91,9 @@ static inline int desc_empty(const void *ptr) #define load_TLS(t, cpu) native_load_tls(t, cpu) #define set_ldt native_set_ldt +#ifdef CONFIG_X86_32 #define load_user_cs_desc native_load_user_cs_desc +#endif #define write_ldt_entry(dt, entry, desc) \ native_write_ldt_entry(dt, entry, desc) @@ -382,10 +384,12 @@ static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) desc->b = (limit & 0xf0000) | 0x00c0fb00; } +#ifdef CONFIG_X86_32 static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm) { get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = mm->context.user_cs; } +#endif extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index fd6aed1..fd2f7b5 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h @@ -113,7 +113,9 @@ struct pv_cpu_ops { void (*store_gdt)(struct desc_ptr *); void (*store_idt)(struct desc_ptr *); void (*set_ldt)(const void *desc, unsigned entries); +#ifdef CONFIG_X86_32 void (*load_user_cs_desc)(int cpu, struct mm_struct *mm); +#endif unsigned long (*store_tr)(void); void (*load_tls)(struct thread_struct *t, unsigned int cpu); #ifdef CONFIG_X86_64 @@ -831,11 +833,13 @@ static inline void set_ldt(const void *addr, unsigned entries) { PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries); } +#ifdef CONFIG_X86_32 static inline void load_user_cs_desc(unsigned int cpu, struct mm_struct *mm) { PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm); } +#endif static inline void store_gdt(struct desc_ptr *dtr) { PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); -- 1.5.4.1 linux-2.6-xen-0011-x86-paravirt-call-paravirt_pagetable_setup_-start.patch: --- NEW FILE linux-2.6-xen-0011-x86-paravirt-call-paravirt_pagetable_setup_-start.patch --- >From a6e3b2a8cfca8c814a4b59337678383e1a6511bc Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 8 Jul 2008 15:06:23 -0700 Subject: [PATCH] x86/paravirt: call paravirt_pagetable_setup_{start, done} Call paravirt_pagetable_setup_{start,done} These paravirt_ops functions were not being called on x86_64. Signed-off-by: Eduardo Habkost Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/paravirt.c | 4 ++++ arch/x86/kernel/setup.c | 2 ++ arch/x86/xen/enlighten.c | 4 ++++ include/asm-x86/pgtable.h | 18 ++++++++++++++++++ include/asm-x86/pgtable_32.h | 15 --------------- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 63ef48b..c0053a0 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -376,6 +377,9 @@ struct pv_mmu_ops pv_mmu_ops = { #ifndef CONFIG_X86_64 .pagetable_setup_start = native_pagetable_setup_start, .pagetable_setup_done = native_pagetable_setup_done, +#else + .pagetable_setup_start = paravirt_nop, + .pagetable_setup_done = paravirt_nop, #endif .read_cr2 = native_read_cr2, diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 531b55b..a8071a9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -824,7 +824,9 @@ void __init setup_arch(char **cmdline_p) vmi_init(); #endif + paravirt_pagetable_setup_start(swapper_pg_dir); paging_init(); + paravirt_pagetable_setup_done(swapper_pg_dir); #ifdef CONFIG_X86_64 map_vsyscall(); diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 7bf15e8..1731ff5 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -859,6 +859,7 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) static __init void xen_pagetable_setup_start(pgd_t *base) { +#ifdef CONFIG_X86_32 pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; int i; @@ -904,6 +905,7 @@ static __init void xen_pagetable_setup_start(pgd_t *base) /* Unpin initial Xen pagetable */ pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(xen_start_info->pt_base))); +#endif /* CONFIG_X86_32 */ } void xen_setup_shared_info(void) @@ -945,9 +947,11 @@ static __init void xen_pagetable_setup_done(pgd_t *base) xen_setup_shared_info(); +#ifdef CONFIG_X86_32 /* Actually pin the pagetable down, but we can't set PG_pinned yet because the page structures don't exist yet. */ pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); +#endif } static __init void xen_post_allocator_init(void) diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 49cbd76..96aa76e 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h @@ -302,6 +302,14 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, /* Install a pte for a particular vaddr in kernel space. */ void set_pte_vaddr(unsigned long vaddr, pte_t pte); +#ifdef CONFIG_X86_32 +extern void native_pagetable_setup_start(pgd_t *base); +extern void native_pagetable_setup_done(pgd_t *base); +#else +static inline void native_pagetable_setup_start(pgd_t *base) {} +static inline void native_pagetable_setup_done(pgd_t *base) {} +#endif + #ifdef CONFIG_PARAVIRT #include #else /* !CONFIG_PARAVIRT */ @@ -333,6 +341,16 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pte); #define pte_update(mm, addr, ptep) do { } while (0) #define pte_update_defer(mm, addr, ptep) do { } while (0) + +static inline void __init paravirt_pagetable_setup_start(pgd_t *base) +{ + native_pagetable_setup_start(base); +} + +static inline void __init paravirt_pagetable_setup_done(pgd_t *base) +{ + native_pagetable_setup_done(base); +} #endif /* CONFIG_PARAVIRT */ #endif /* __ASSEMBLY__ */ diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h index ec871c4..0611abf 100644 --- a/include/asm-x86/pgtable_32.h +++ b/include/asm-x86/pgtable_32.h @@ -171,21 +171,6 @@ do { \ */ #define update_mmu_cache(vma, address, pte) do { } while (0) -extern void native_pagetable_setup_start(pgd_t *base); -extern void native_pagetable_setup_done(pgd_t *base); - -#ifndef CONFIG_PARAVIRT -static inline void __init paravirt_pagetable_setup_start(pgd_t *base) -{ - native_pagetable_setup_start(base); -} - -static inline void __init paravirt_pagetable_setup_done(pgd_t *base) -{ - native_pagetable_setup_done(base); -} -#endif /* !CONFIG_PARAVIRT */ - #endif /* !__ASSEMBLY__ */ /* -- 1.5.4.1 linux-2.6-xen-0012-pvops-64-call-paravirt_post_allocator_init-on-set.patch: --- NEW FILE linux-2.6-xen-0012-pvops-64-call-paravirt_post_allocator_init-on-set.patch --- >From e79a8c9d5d7011b99e6af7a6efe884ee05fa6b38 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 8 Jul 2008 15:06:24 -0700 Subject: [PATCH] pvops-64: call paravirt_post_allocator_init() on setup_arch() Signed-off-by: Eduardo Habkost Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup.c | 1 + arch/x86/mm/init_32.c | 2 -- arch/x86/xen/mmu.c | 8 +++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a8071a9..c9010f8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -827,6 +827,7 @@ void __init setup_arch(char **cmdline_p) paravirt_pagetable_setup_start(swapper_pg_dir); paging_init(); paravirt_pagetable_setup_done(swapper_pg_dir); + paravirt_post_allocator_init(); #ifdef CONFIG_X86_64 map_vsyscall(); diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 4d7c9d4..0d11673 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -869,8 +869,6 @@ void __init paging_init(void) */ sparse_init(); zone_sizes_init(); - - paravirt_post_allocator_init(); } /* diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index ff0aa74..ebd6900 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -656,9 +656,11 @@ void xen_mm_pin_all(void) spin_unlock_irqrestore(&pgd_lock, flags); } -/* The init_mm pagetable is really pinned as soon as its created, but - that's before we have page structures to store the bits. So do all - the book-keeping now. */ +/* + * The init_mm pagetable is really pinned as soon as its created, but + * that's before we have page structures to store the bits. So do all + * the book-keeping now. + */ static __init int mark_pinned(struct page *page, enum pt_level level) { SetPagePinned(page); -- 1.5.4.1 linux-2.6-xen-0013-x86_64-there-s-no-need-to-preallocate-level1_fixmap.patch: --- NEW FILE linux-2.6-xen-0013-x86_64-there-s-no-need-to-preallocate-level1_fixmap.patch --- >From a2f5b35704e79fa3ec3685778349d0d20e0c7a18 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:25 -0700 Subject: [PATCH] x86_64: there's no need to preallocate level1_fixmap_pgt Early fixmap will allocate its own L1 pagetable page for fixmap mappings, so there's no need to preallocate one. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/head_64.S | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index b07ac7b..4b6bda2 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -362,12 +362,6 @@ NEXT_PAGE(level3_kernel_pgt) .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE NEXT_PAGE(level2_fixmap_pgt) - .fill 506,8,0 - .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */ - .fill 5,8,0 - -NEXT_PAGE(level1_fixmap_pgt) .fill 512,8,0 NEXT_PAGE(level2_ident_pgt) -- 1.5.4.1 linux-2.6-xen-0014-x86-clean-up-formatting-of-__switch_to.patch: --- NEW FILE linux-2.6-xen-0014-x86-clean-up-formatting-of-__switch_to.patch --- >From ab4defb35a96931fc4156438b55d6ed40a29d2ab Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:26 -0700 Subject: [PATCH] x86: clean up formatting of __switch_to process_64.c:__switch_to has some very old strange formatting, some of it dating back to pre-git. Fix it up. No functional changes. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/process_64.c | 56 +++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index a8e5362..e8a8e1b 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -537,8 +537,8 @@ static inline void __switch_to_xtra(struct task_struct *prev_p, struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct *next_p) { - struct thread_struct *prev = &prev_p->thread, - *next = &next_p->thread; + struct thread_struct *prev = &prev_p->thread; + struct thread_struct *next = &next_p->thread; int cpu = smp_processor_id(); struct tss_struct *tss = &per_cpu(init_tss, cpu); unsigned fsindex, gsindex; @@ -586,35 +586,34 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) /* * Switch FS and GS. + * + * Segment register != 0 always requires a reload. Also + * reload when it has changed. When prev process used 64bit + * base always reload to avoid an information leak. */ - { - /* segment register != 0 always requires a reload. - also reload when it has changed. - when prev process used 64bit base always reload - to avoid an information leak. */ - if (unlikely(fsindex | next->fsindex | prev->fs)) { - loadsegment(fs, next->fsindex); - /* check if the user used a selector != 0 - * if yes clear 64bit base, since overloaded base - * is always mapped to the Null selector - */ - if (fsindex) + if (unlikely(fsindex | next->fsindex | prev->fs)) { + loadsegment(fs, next->fsindex); + /* + * Check if the user used a selector != 0; if yes + * clear 64bit base, since overloaded base is always + * mapped to the Null selector + */ + if (fsindex) prev->fs = 0; - } - /* when next process has a 64bit base use it */ - if (next->fs) - wrmsrl(MSR_FS_BASE, next->fs); - prev->fsindex = fsindex; - - if (unlikely(gsindex | next->gsindex | prev->gs)) { - load_gs_index(next->gsindex); - if (gsindex) + } + /* when next process has a 64bit base use it */ + if (next->fs) + wrmsrl(MSR_FS_BASE, next->fs); + prev->fsindex = fsindex; + + if (unlikely(gsindex | next->gsindex | prev->gs)) { + load_gs_index(next->gsindex); + if (gsindex) prev->gs = 0; - } - if (next->gs) - wrmsrl(MSR_KERNEL_GS_BASE, next->gs); - prev->gsindex = gsindex; } + if (next->gs) + wrmsrl(MSR_KERNEL_GS_BASE, next->gs); + prev->gsindex = gsindex; /* Must be after DS reload */ unlazy_fpu(prev_p); @@ -627,7 +626,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) write_pda(pcurrent, next_p); write_pda(kernelstack, - (unsigned long)task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET); + (unsigned long)task_stack_page(next_p) + + THREAD_SIZE - PDA_STACKOFFSET); #ifdef CONFIG_CC_STACKPROTECTOR write_pda(stack_canary, next_p->stack_canary); /* -- 1.5.4.1 linux-2.6-xen-0015-x86-use-__page_aligned_data-bss.patch: --- NEW FILE linux-2.6-xen-0015-x86-use-__page_aligned_data-bss.patch --- >From 3378e3b65c8240d0e82d61a07ed3fa6af1f74d80 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:27 -0700 Subject: [PATCH] x86: use __page_aligned_data/bss Update arch/x86's use of page-aligned variables. The change to arch/x86/xen/mmu.c fixes an actual bug, but the rest are cleanups and to set a precedent. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/common_64.c | 4 ++-- arch/x86/kernel/irq_32.c | 7 ++----- arch/x86/xen/mmu.c | 15 ++++++--------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c index 7b8cc72..15419cd 100644 --- a/arch/x86/kernel/cpu/common_64.c +++ b/arch/x86/kernel/cpu/common_64.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -517,8 +518,7 @@ void pda_init(int cpu) } char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ + - DEBUG_STKSZ] -__attribute__((section(".bss.page_aligned"))); + DEBUG_STKSZ] __page_aligned_bss; extern asmlinkage void ignore_sysret(void); diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 47a6f6f..1cf8c1f 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c @@ -83,11 +83,8 @@ union irq_ctx { static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly; static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly; -static char softirq_stack[NR_CPUS * THREAD_SIZE] - __attribute__((__section__(".bss.page_aligned"))); - -static char hardirq_stack[NR_CPUS * THREAD_SIZE] - __attribute__((__section__(".bss.page_aligned"))); +static char softirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss; +static char hardirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss; static void call_on_stack(void *func, void *stack) { diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index ebd6900..4fca9d8 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -60,22 +61,18 @@ #define TOP_ENTRIES (MAX_DOMAIN_PAGES / P2M_ENTRIES_PER_PAGE) /* Placeholder for holes in the address space */ -static unsigned long p2m_missing[P2M_ENTRIES_PER_PAGE] - __attribute__((section(".data.page_aligned"))) = +static unsigned long p2m_missing[P2M_ENTRIES_PER_PAGE] __page_aligned_data = { [ 0 ... P2M_ENTRIES_PER_PAGE-1 ] = ~0UL }; /* Array of pointers to pages containing p2m entries */ -static unsigned long *p2m_top[TOP_ENTRIES] - __attribute__((section(".data.page_aligned"))) = +static unsigned long *p2m_top[TOP_ENTRIES] __page_aligned_data = { [ 0 ... TOP_ENTRIES - 1] = &p2m_missing[0] }; /* Arrays of p2m arrays expressed in mfns used for save/restore */ -static unsigned long p2m_top_mfn[TOP_ENTRIES] - __attribute__((section(".bss.page_aligned"))); +static unsigned long p2m_top_mfn[TOP_ENTRIES] __page_aligned_bss; -static unsigned long p2m_top_mfn_list[ - PAGE_ALIGN(TOP_ENTRIES / P2M_ENTRIES_PER_PAGE)] - __attribute__((section(".bss.page_aligned"))); +static unsigned long p2m_top_mfn_list[TOP_ENTRIES / P2M_ENTRIES_PER_PAGE] + __page_aligned_bss; static inline unsigned p2m_top_index(unsigned long pfn) { -- 1.5.4.1 linux-2.6-xen-0016-x86_64-adjust-exception-frame-in-ia32entry.patch: --- NEW FILE linux-2.6-xen-0016-x86_64-adjust-exception-frame-in-ia32entry.patch --- >From 0b9a90061ba6a60f66e17c62b34a4c9d45144dfe Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:28 -0700 Subject: [PATCH] x86_64: adjust exception frame in ia32entry The 32-bit compat int $0x80 entrypoint needs exception frame adjustment. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/ia32/ia32entry.S | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 20371d0..0ae1e77 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -321,6 +321,7 @@ ENTRY(ia32_syscall) /*CFI_REL_OFFSET rflags,EFLAGS-RIP*/ /*CFI_REL_OFFSET cs,CS-RIP*/ CFI_REL_OFFSET rip,RIP-RIP + PARAVIRT_ADJUST_EXCEPTION_FRAME SWAPGS /* * No need to follow this irqs on/off section: the syscall -- 1.5.4.1 linux-2.6-xen-0017-x86_64-unstatic-get_local_pda.patch: --- NEW FILE linux-2.6-xen-0017-x86_64-unstatic-get_local_pda.patch --- >From 687ae3fc13cf31fec79cd5250a1c458a082f5066 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:29 -0700 Subject: [PATCH] x86_64: unstatic get_local_pda This allows Xen's xen_cpu_up() to allocate a pda for the new CPU. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/smpboot.c | 2 +- include/asm-x86/smp.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 687376a..1deb3b6 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -768,7 +768,7 @@ static void __cpuinit do_fork_idle(struct work_struct *work) * * Must be called after the _cpu_pda pointer table is initialized. */ -static int __cpuinit get_local_pda(int cpu) +int __cpuinit get_local_pda(int cpu) { struct x8664_pda *oldpda, *newpda; unsigned long size = sizeof(struct x8664_pda); diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index c2784b3..3c877f7 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -25,6 +25,8 @@ extern cpumask_t cpu_callin_map; extern void (*mtrr_hook)(void); extern void zap_low_mappings(void); +extern int __cpuinit get_local_pda(int cpu); + extern int smp_num_siblings; extern unsigned int num_processors; extern cpumask_t cpu_initialized; -- 1.5.4.1 linux-2.6-xen-0018-xen-print-backtrace-on-multicall-failure.patch: --- NEW FILE linux-2.6-xen-0018-xen-print-backtrace-on-multicall-failure.patch --- >From 0cd83638bb107ddba32d28589363e66037753cf7 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:30 -0700 Subject: [PATCH] xen: print backtrace on multicall failure Print a backtrace if a multicall fails, to help with debugging. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/multicalls.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c index 3c63c4d..9efd1c6 100644 --- a/arch/x86/xen/multicalls.c +++ b/arch/x86/xen/multicalls.c @@ -76,6 +76,7 @@ void xen_mc_flush(void) if (ret) { printk(KERN_ERR "%d multicall(s) failed: cpu %d\n", ret, smp_processor_id()); + dump_stack(); for (i = 0; i < b->mcidx; i++) { printk(" call %2d/%d: op=%lu arg=[%lx] result=%ld\n", i+1, b->mcidx, -- 1.5.4.1 linux-2.6-xen-0019-xen-netfront-fix-xennet_release_tx_bufs.patch: --- NEW FILE linux-2.6-xen-0019-xen-netfront-fix-xennet_release_tx_bufs.patch --- >From dd40cb3cab348c376b7dd56f2b596a7ae2fe0c6a Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Tue, 8 Jul 2008 15:06:31 -0700 Subject: [PATCH] xen-netfront: fix xennet_release_tx_bufs() After restore on ia64 xen domain, kernel panics as follows. This patch fixes it. union skb_entry assumes sizeof(link->skb, pointer) == sizeof(list->link, unsigned). However this isn't true on ia64. So make link type unsigned long. And introduced two accesor. kernel unaligned access to 0xe0000000000000bd, ip=0xa0000001004c2ca0 xenwatch[14]: error during unaligned kernel access -1 [1] Modules linked in: Pid: 14, CPU 0, comm: xenwatch psr : 0000101008422010 ifs : 8000000000000307 ip : [] Not tainted (2.6.26-rc4xen-ia64-dirty) ip is at dev_kfree_skb_irq+0x20/0x1a0 unat: 0000000000000000 pfs : 400000000000040b rsc : 0000000000000007 rnat: 0000000000000000 bsps: 0000000000000000 pr : 000000000000a941 ldrs: 0000000000000000 ccv : 0000000000000000 fpsr: 0009804c8a70433f csd : 0000000000000000 ssd : 0000000000000000 b0 : a0000001003efb70 b6 : a000000100070e40 b7 : a000000100070e40 f6 : 1003e000000fcb75352b1 f7 : 1003e000000000014ff97 f8 : 1003e00fcb74fc3454d80 f9 : 1003e0000000080000000 f10 : 1003e0000000000001431 f11 : 1003e0000000000989680 r1 : a000000100bfcf80 r2 : e0000000000000bd r3 : 000000000000308c r8 : 0000000000000000 r9 : e00000000fc31310 r10 : a000000100a13b28 r11 : 0000000000000000 r12 : e00000000fd0fdf0 r13 : e00000000fd08000 r14 : 0000000000000000 r15 : e00000000fcc8000 r16 : 0000000000000009 r17 : e000010000104000 r18 : e000010000104000 r19 : a000000100a13b40 r20 : a0000001009c23f0 r21 : a0000001009fd4d0 r22 : 0000000000004000 r23 : 0000000000000000 r24 : fffffffffff04c10 r25 : 0000000000000002 r26 : 0000000000000000 r27 : 0000000000000000 r28 : e00000000fd08bd4 r29 : a0000001007570b8 r30 : a0000001009e5500 r31 : a0000001009e54a0 Call Trace: [] show_stack+0x40/0xa0 sp=e00000000fd0f670 bsp=e00000000fd08f68 [] show_regs+0x9a0/0x9e0 sp=e00000000fd0f840 bsp=e00000000fd08f10 [] die+0x260/0x3a0 sp=e00000000fd0f840 bsp=e00000000fd08ec8 [] die_if_kernel+0x50/0x80 sp=e00000000fd0f840 bsp=e00000000fd08e98 [] ia64_handle_unaligned+0x2ea0/0x2fc0 sp=e00000000fd0f840 bsp=e00000000fd08df0 [] ia64_prepare_handle_unaligned+0x30/0x60 sp=e00000000fd0fa10 bsp=e00000000fd08df0 [] paravirt_leave_kernel+0x0/0x40 sp=e00000000fd0fc20 bsp=e00000000fd08df0 [] dev_kfree_skb_irq+0x20/0x1a0 sp=e00000000fd0fdf0 bsp=e00000000fd08db8 [] xennet_release_tx_bufs+0xd0/0x120 sp=e00000000fd0fdf0 bsp=e00000000fd08d78 [] backend_changed+0xc40/0xf80 sp=e00000000fd0fdf0 bsp=e00000000fd08d08 [] otherend_changed+0x190/0x1c0 sp=e00000000fd0fe00 bsp=e00000000fd08cc8 [] xenwatch_thread+0x310/0x3c0 sp=e00000000fd0fe00 bsp=e00000000fd08ca0 [] kthread+0xe0/0x160 sp=e00000000fd0fe30 bsp=e00000000fd08c68 [] kernel_thread_helper+0x30/0x60 sp=e00000000fd0fe30 bsp=e00000000fd08c40 [] start_kernel_thread+0x20/0x40 sp=e00000000fd0fe30 bsp=e00000000fd08c40 Kernel panic - not syncing: Aiee, killing interrupt handler! Signed-off-by: Isaku Yamahata Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- drivers/net/xen-netfront.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index ef671d1..902bbe7 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -92,7 +92,7 @@ struct netfront_info { */ union skb_entry { struct sk_buff *skb; - unsigned link; + unsigned long link; } tx_skbs[NET_TX_RING_SIZE]; grant_ref_t gref_tx_head; grant_ref_t grant_tx_ref[NET_TX_RING_SIZE]; @@ -125,6 +125,17 @@ struct netfront_rx_info { struct xen_netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX - 1]; }; +static void skb_entry_set_link(union skb_entry *list, unsigned short id) +{ + list->link = id; +} + +static int skb_entry_is_link(const union skb_entry *list) +{ + BUILD_BUG_ON(sizeof(list->skb) != sizeof(list->link)); + return ((unsigned long)list->skb < PAGE_OFFSET); +} + /* * Access macros for acquiring freeing slots in tx_skbs[]. */ @@ -132,7 +143,7 @@ struct netfront_rx_info { static void add_id_to_freelist(unsigned *head, union skb_entry *list, unsigned short id) { - list[id].link = *head; + skb_entry_set_link(&list[id], *head); *head = id; } @@ -993,7 +1004,7 @@ static void xennet_release_tx_bufs(struct netfront_info *np) for (i = 0; i < NET_TX_RING_SIZE; i++) { /* Skip over entries which are actually freelist references */ - if ((unsigned long)np->tx_skbs[i].skb < PAGE_OFFSET) + if (skb_entry_is_link(&np->tx_skbs[i])) continue; skb = np->tx_skbs[i].skb; @@ -1123,7 +1134,7 @@ static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev /* Initialise tx_skbs as a free chain containing every entry. */ np->tx_skb_freelist = 0; for (i = 0; i < NET_TX_RING_SIZE; i++) { - np->tx_skbs[i].link = i+1; + skb_entry_set_link(&np->tx_skbs[i], i+1); np->grant_tx_ref[i] = GRANT_INVALID_REF; } -- 1.5.4.1 linux-2.6-xen-0020-xen-add-xen_arch_resume-xen_timer_resume-hook-for.patch: --- NEW FILE linux-2.6-xen-0020-xen-add-xen_arch_resume-xen_timer_resume-hook-for.patch --- >From 55db5c99dcf923bd85f026c63f9659e969e42ec5 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Tue, 8 Jul 2008 15:06:32 -0700 Subject: [PATCH] xen: add xen_arch_resume()/xen_timer_resume hook for ia64 support add xen_timer_resume() hook. Timer resume should be done after event channel is resumed. add xen_arch_resume() hook when ipi becomes usable after resume. After resume, some cpu specific resource must be reinitialized on ia64 that can't be set by another cpu. However available hooks is run once on only one cpu so that ipi has to be used. During stop_machine_run() ipi can't be used because interrupt is masked. So add another hook after stop_machine_run(). Another approach might be use resume hook which is run by device_resume(). However device_resume() may be executed on suspend error recovery path. So it is necessary to determine whether it is executed on real resume path or error recovery path. Signed-off-by: Isaku Yamahata Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/suspend.c | 5 ++++- arch/x86/xen/xen-ops.h | 1 - drivers/xen/manage.c | 6 ++++-- include/xen/xen-ops.h | 3 +++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 251669a..2a234db 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -38,8 +38,11 @@ void xen_post_suspend(int suspend_cancelled) xen_cpu_initialized_map = cpu_online_map; #endif xen_vcpu_restore(); - xen_timer_resume(); } } +void xen_arch_resume(void) +{ + /* nothing */ +} diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 6f4b104..77354d2 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -37,7 +37,6 @@ void __init xen_time_init(void); unsigned long xen_get_wallclock(void); int xen_set_wallclock(unsigned long time); unsigned long long xen_sched_clock(void); -void xen_timer_resume(void); irqreturn_t xen_debug_interrupt(int irq, void *dev_id); diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 5b546e3..2bb268e 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -68,6 +68,7 @@ static int xen_suspend(void *data) if (!*cancelled) { xen_irq_resume(); xen_console_resume(); + xen_timer_resume(); } return 0; @@ -107,9 +108,10 @@ static void do_suspend(void) goto out; } - if (!cancelled) + if (!cancelled) { + xen_arch_resume(); xenbus_resume(); - else + } else xenbus_suspend_cancel(); device_resume(); diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index a706d6a..883a21b 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -11,4 +11,7 @@ void xen_post_suspend(int suspend_cancelled); void xen_mm_pin_all(void); void xen_mm_unpin_all(void); +void xen_timer_resume(void); +void xen_arch_resume(void); + #endif /* INCLUDE_XEN_OPS_H */ -- 1.5.4.1 linux-2.6-xen-0021-xen-define-set_pte-from-the-outset.patch: --- NEW FILE linux-2.6-xen-0021-xen-define-set_pte-from-the-outset.patch --- >From f4a5a9cceb80a825b75955ee148c2013696fdc26 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:33 -0700 Subject: [PATCH] xen: define set_pte from the outset We need set_pte to work from a relatively early point, so enable it from the start. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 1731ff5..9f07d2f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -863,9 +863,6 @@ static __init void xen_pagetable_setup_start(pgd_t *base) pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; int i; - /* special set_pte for pagetable initialization */ - pv_mmu_ops.set_pte = xen_set_pte_init; - init_mm.pgd = base; /* * copy top-level of Xen-supplied pagetable into place. This @@ -1195,7 +1192,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { .kmap_atomic_pte = xen_kmap_atomic_pte, #endif - .set_pte = NULL, /* see xen_pagetable_setup_* */ + .set_pte = xen_set_pte_init, .set_pte_at = xen_set_pte_at, .set_pmd = xen_set_pmd_hyper, -- 1.5.4.1 linux-2.6-xen-0022-xen64-define-asm-xen-interface-for-64-bit.patch: --- NEW FILE linux-2.6-xen-0022-xen64-define-asm-xen-interface-for-64-bit.patch --- >From 700f3081c0396a55c79f3420fbeae868448a00ea Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:34 -0700 Subject: [PATCH] xen64: define asm/xen/interface for 64-bit Copy 64-bit definitions of various interface structures into place. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/mmu.h | 12 --- include/asm-x86/xen/interface.h | 139 +++++++++++-------------------- include/asm-x86/xen/interface_32.h | 97 ++++++++++++++++++++++ include/asm-x86/xen/interface_64.h | 159 ++++++++++++++++++++++++++++++++++++ include/xen/interface/callback.h | 6 +- 5 files changed, 308 insertions(+), 105 deletions(-) create mode 100644 include/asm-x86/xen/interface_32.h create mode 100644 include/asm-x86/xen/interface_64.h diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index 297bf9f..7856e37 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h @@ -10,18 +10,6 @@ enum pt_level { PT_PTE }; -/* - * Page-directory addresses above 4GB do not fit into architectural %cr3. - * When accessing %cr3, or equivalent field in vcpu_guest_context, guests - * must use the following accessor macros to pack/unpack valid MFNs. - * - * Note that Xen is using the fact that the pagetable base is always - * page-aligned, and putting the 12 MSB of the address into the 12 LSB - * of cr3. - */ -#define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) -#define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) - void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags); diff --git a/include/asm-x86/xen/interface.h b/include/asm-x86/xen/interface.h index 6227000..9d810f2 100644 --- a/include/asm-x86/xen/interface.h +++ b/include/asm-x86/xen/interface.h @@ -1,13 +1,13 @@ /****************************************************************************** * arch-x86_32.h * - * Guest OS interface to x86 32-bit Xen. + * Guest OS interface to x86 Xen. * * Copyright (c) 2004, K A Fraser */ -#ifndef __XEN_PUBLIC_ARCH_X86_32_H__ -#define __XEN_PUBLIC_ARCH_X86_32_H__ +#ifndef __ASM_X86_XEN_INTERFACE_H +#define __ASM_X86_XEN_INTERFACE_H #ifdef __XEN__ #define __DEFINE_GUEST_HANDLE(name, type) \ @@ -57,6 +57,17 @@ DEFINE_GUEST_HANDLE(long); DEFINE_GUEST_HANDLE(void); #endif +#ifndef HYPERVISOR_VIRT_START +#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START) +#endif + +#ifndef machine_to_phys_mapping +#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START) +#endif + +/* Maximum number of virtual CPUs in multi-processor guests. */ +#define MAX_VIRT_CPUS 32 + /* * SEGMENT DESCRIPTOR TABLES */ @@ -71,58 +82,21 @@ DEFINE_GUEST_HANDLE(void); #define FIRST_RESERVED_GDT_ENTRY (FIRST_RESERVED_GDT_BYTE / 8) /* - * These flat segments are in the Xen-private section of every GDT. Since these - * are also present in the initial GDT, many OSes will be able to avoid - * installing their own GDT. - */ -#define FLAT_RING1_CS 0xe019 /* GDT index 259 */ -#define FLAT_RING1_DS 0xe021 /* GDT index 260 */ -#define FLAT_RING1_SS 0xe021 /* GDT index 260 */ -#define FLAT_RING3_CS 0xe02b /* GDT index 261 */ -#define FLAT_RING3_DS 0xe033 /* GDT index 262 */ -#define FLAT_RING3_SS 0xe033 /* GDT index 262 */ - -#define FLAT_KERNEL_CS FLAT_RING1_CS -#define FLAT_KERNEL_DS FLAT_RING1_DS -#define FLAT_KERNEL_SS FLAT_RING1_SS -#define FLAT_USER_CS FLAT_RING3_CS -#define FLAT_USER_DS FLAT_RING3_DS -#define FLAT_USER_SS FLAT_RING3_SS - -/* And the trap vector is... */ -#define TRAP_INSTR "int $0x82" - -/* - * Virtual addresses beyond this are not modifiable by guest OSes. The - * machine->physical mapping table starts at this address, read-only. - */ -#ifdef CONFIG_X86_PAE -#define __HYPERVISOR_VIRT_START 0xF5800000 -#else -#define __HYPERVISOR_VIRT_START 0xFC000000 -#endif - -#ifndef HYPERVISOR_VIRT_START -#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START) -#endif - -#ifndef machine_to_phys_mapping -#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START) -#endif - -/* Maximum number of virtual CPUs in multi-processor guests. */ -#define MAX_VIRT_CPUS 32 - -#ifndef __ASSEMBLY__ - -/* * Send an array of these to HYPERVISOR_set_trap_table() + * The privilege level specifies which modes may enter a trap via a software + * interrupt. On x86/64, since rings 1 and 2 are unavailable, we allocate + * privilege levels as follows: + * Level == 0: Noone may enter + * Level == 1: Kernel may enter + * Level == 2: Kernel may enter + * Level == 3: Everyone may enter */ #define TI_GET_DPL(_ti) ((_ti)->flags & 3) #define TI_GET_IF(_ti) ((_ti)->flags & 4) #define TI_SET_DPL(_ti, _dpl) ((_ti)->flags |= (_dpl)) #define TI_SET_IF(_ti, _if) ((_ti)->flags |= ((!!(_if))<<2)) +#ifndef __ASSEMBLY__ struct trap_info { uint8_t vector; /* exception vector */ uint8_t flags; /* 0-3: privilege level; 4: clear event enable? */ @@ -131,32 +105,21 @@ struct trap_info { }; DEFINE_GUEST_HANDLE_STRUCT(trap_info); -struct cpu_user_regs { - uint32_t ebx; - uint32_t ecx; - uint32_t edx; - uint32_t esi; - uint32_t edi; - uint32_t ebp; - uint32_t eax; - uint16_t error_code; /* private */ - uint16_t entry_vector; /* private */ - uint32_t eip; - uint16_t cs; - uint8_t saved_upcall_mask; - uint8_t _pad0; - uint32_t eflags; /* eflags.IF == !saved_upcall_mask */ - uint32_t esp; - uint16_t ss, _pad1; - uint16_t es, _pad2; - uint16_t ds, _pad3; - uint16_t fs, _pad4; - uint16_t gs, _pad5; +struct arch_shared_info { + unsigned long max_pfn; /* max pfn that appears in table */ + /* Frame containing list of mfns containing list of mfns containing p2m. */ + unsigned long pfn_to_mfn_frame_list_list; + unsigned long nmi_reason; }; -DEFINE_GUEST_HANDLE_STRUCT(cpu_user_regs); +#endif /* !__ASSEMBLY__ */ -typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ +#ifdef CONFIG_X86_32 +#include "interface_32.h" +#else +#include "interface_64.h" +#endif +#ifndef __ASSEMBLY__ /* * The following is all CPU context. Note that the fpu_ctxt block is filled * in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used. @@ -173,33 +136,29 @@ struct vcpu_guest_context { unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents) */ unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */ unsigned long kernel_ss, kernel_sp; /* Virtual TSS (only SS1/SP1) */ + /* NB. User pagetable on x86/64 is placed in ctrlreg[1]. */ unsigned long ctrlreg[8]; /* CR0-CR7 (control registers) */ unsigned long debugreg[8]; /* DB0-DB7 (debug registers) */ +#ifdef __i386__ unsigned long event_callback_cs; /* CS:EIP of event callback */ unsigned long event_callback_eip; unsigned long failsafe_callback_cs; /* CS:EIP of failsafe callback */ unsigned long failsafe_callback_eip; +#else + unsigned long event_callback_eip; + unsigned long failsafe_callback_eip; + unsigned long syscall_callback_eip; +#endif unsigned long vm_assist; /* VMASST_TYPE_* bitmap */ +#ifdef __x86_64__ + /* Segment base addresses. */ + uint64_t fs_base; + uint64_t gs_base_kernel; + uint64_t gs_base_user; +#endif }; DEFINE_GUEST_HANDLE_STRUCT(vcpu_guest_context); - -struct arch_shared_info { - unsigned long max_pfn; /* max pfn that appears in table */ - /* Frame containing list of mfns containing list of mfns containing p2m. */ - unsigned long pfn_to_mfn_frame_list_list; - unsigned long nmi_reason; -}; - -struct arch_vcpu_info { - unsigned long cr2; - unsigned long pad[5]; /* sizeof(struct vcpu_info) == 64 */ -}; - -struct xen_callback { - unsigned long cs; - unsigned long eip; -}; -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLY__ */ /* * Prefix forces emulation of some non-trapping instructions. @@ -213,4 +172,4 @@ struct xen_callback { #define XEN_CPUID XEN_EMULATE_PREFIX "cpuid" #endif -#endif +#endif /* __ASM_X86_XEN_INTERFACE_H */ diff --git a/include/asm-x86/xen/interface_32.h b/include/asm-x86/xen/interface_32.h new file mode 100644 index 0000000..d8ac41d --- /dev/null +++ b/include/asm-x86/xen/interface_32.h @@ -0,0 +1,97 @@ +/****************************************************************************** + * arch-x86_32.h + * + * Guest OS interface to x86 32-bit Xen. + * + * Copyright (c) 2004, K A Fraser + */ + +#ifndef __ASM_X86_XEN_INTERFACE_32_H +#define __ASM_X86_XEN_INTERFACE_32_H + + +/* + * These flat segments are in the Xen-private section of every GDT. Since these + * are also present in the initial GDT, many OSes will be able to avoid + * installing their own GDT. + */ +#define FLAT_RING1_CS 0xe019 /* GDT index 259 */ +#define FLAT_RING1_DS 0xe021 /* GDT index 260 */ +#define FLAT_RING1_SS 0xe021 /* GDT index 260 */ +#define FLAT_RING3_CS 0xe02b /* GDT index 261 */ +#define FLAT_RING3_DS 0xe033 /* GDT index 262 */ +#define FLAT_RING3_SS 0xe033 /* GDT index 262 */ + +#define FLAT_KERNEL_CS FLAT_RING1_CS +#define FLAT_KERNEL_DS FLAT_RING1_DS +#define FLAT_KERNEL_SS FLAT_RING1_SS +#define FLAT_USER_CS FLAT_RING3_CS +#define FLAT_USER_DS FLAT_RING3_DS +#define FLAT_USER_SS FLAT_RING3_SS + +/* And the trap vector is... */ +#define TRAP_INSTR "int $0x82" + +/* + * Virtual addresses beyond this are not modifiable by guest OSes. The + * machine->physical mapping table starts at this address, read-only. + */ +#define __HYPERVISOR_VIRT_START 0xF5800000 + +#ifndef __ASSEMBLY__ + +struct cpu_user_regs { + uint32_t ebx; + uint32_t ecx; + uint32_t edx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + uint32_t eax; + uint16_t error_code; /* private */ + uint16_t entry_vector; /* private */ + uint32_t eip; + uint16_t cs; + uint8_t saved_upcall_mask; + uint8_t _pad0; + uint32_t eflags; /* eflags.IF == !saved_upcall_mask */ + uint32_t esp; + uint16_t ss, _pad1; + uint16_t es, _pad2; + uint16_t ds, _pad3; + uint16_t fs, _pad4; + uint16_t gs, _pad5; +}; +DEFINE_GUEST_HANDLE_STRUCT(cpu_user_regs); + +typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ + +struct arch_vcpu_info { + unsigned long cr2; + unsigned long pad[5]; /* sizeof(struct vcpu_info) == 64 */ +}; + +struct xen_callback { + unsigned long cs; + unsigned long eip; +}; +typedef struct xen_callback xen_callback_t; + +#define XEN_CALLBACK(__cs, __eip) \ + ((struct xen_callback){ .cs = (__cs), .eip = (unsigned long)(__eip) }) +#endif /* !__ASSEMBLY__ */ + + +/* + * Page-directory addresses above 4GB do not fit into architectural %cr3. + * When accessing %cr3, or equivalent field in vcpu_guest_context, guests + * must use the following accessor macros to pack/unpack valid MFNs. + * + * Note that Xen is using the fact that the pagetable base is always + * page-aligned, and putting the 12 MSB of the address into the 12 LSB + * of cr3. + */ +#define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) +#define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) + +#endif /* __ASM_X86_XEN_INTERFACE_32_H */ diff --git a/include/asm-x86/xen/interface_64.h b/include/asm-x86/xen/interface_64.h new file mode 100644 index 0000000..842266c --- /dev/null +++ b/include/asm-x86/xen/interface_64.h @@ -0,0 +1,159 @@ +#ifndef __ASM_X86_XEN_INTERFACE_64_H +#define __ASM_X86_XEN_INTERFACE_64_H + +/* + * 64-bit segment selectors + * These flat segments are in the Xen-private section of every GDT. Since these + * are also present in the initial GDT, many OSes will be able to avoid + * installing their own GDT. + */ + +#define FLAT_RING3_CS32 0xe023 /* GDT index 260 */ +#define FLAT_RING3_CS64 0xe033 /* GDT index 261 */ +#define FLAT_RING3_DS32 0xe02b /* GDT index 262 */ +#define FLAT_RING3_DS64 0x0000 /* NULL selector */ +#define FLAT_RING3_SS32 0xe02b /* GDT index 262 */ +#define FLAT_RING3_SS64 0xe02b /* GDT index 262 */ + +#define FLAT_KERNEL_DS64 FLAT_RING3_DS64 +#define FLAT_KERNEL_DS32 FLAT_RING3_DS32 +#define FLAT_KERNEL_DS FLAT_KERNEL_DS64 +#define FLAT_KERNEL_CS64 FLAT_RING3_CS64 +#define FLAT_KERNEL_CS32 FLAT_RING3_CS32 +#define FLAT_KERNEL_CS FLAT_KERNEL_CS64 +#define FLAT_KERNEL_SS64 FLAT_RING3_SS64 +#define FLAT_KERNEL_SS32 FLAT_RING3_SS32 +#define FLAT_KERNEL_SS FLAT_KERNEL_SS64 + +#define FLAT_USER_DS64 FLAT_RING3_DS64 +#define FLAT_USER_DS32 FLAT_RING3_DS32 +#define FLAT_USER_DS FLAT_USER_DS64 +#define FLAT_USER_CS64 FLAT_RING3_CS64 +#define FLAT_USER_CS32 FLAT_RING3_CS32 +#define FLAT_USER_CS FLAT_USER_CS64 +#define FLAT_USER_SS64 FLAT_RING3_SS64 +#define FLAT_USER_SS32 FLAT_RING3_SS32 +#define FLAT_USER_SS FLAT_USER_SS64 + +#define __HYPERVISOR_VIRT_START 0xFFFF800000000000 +#define __HYPERVISOR_VIRT_END 0xFFFF880000000000 +#define __MACH2PHYS_VIRT_START 0xFFFF800000000000 +#define __MACH2PHYS_VIRT_END 0xFFFF804000000000 + +#ifndef HYPERVISOR_VIRT_START +#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START) +#define HYPERVISOR_VIRT_END mk_unsigned_long(__HYPERVISOR_VIRT_END) +#endif + +#define MACH2PHYS_VIRT_START mk_unsigned_long(__MACH2PHYS_VIRT_START) +#define MACH2PHYS_VIRT_END mk_unsigned_long(__MACH2PHYS_VIRT_END) +#define MACH2PHYS_NR_ENTRIES ((MACH2PHYS_VIRT_END-MACH2PHYS_VIRT_START)>>3) +#ifndef machine_to_phys_mapping +#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START) +#endif + +/* + * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base) + * @which == SEGBASE_* ; @base == 64-bit base address + * Returns 0 on success. + */ +#define SEGBASE_FS 0 +#define SEGBASE_GS_USER 1 +#define SEGBASE_GS_KERNEL 2 +#define SEGBASE_GS_USER_SEL 3 /* Set user %gs specified in base[15:0] */ + +/* + * int HYPERVISOR_iret(void) + * All arguments are on the kernel stack, in the following format. + * Never returns if successful. Current kernel context is lost. + * The saved CS is mapped as follows: + * RING0 -> RING3 kernel mode. + * RING1 -> RING3 kernel mode. + * RING2 -> RING3 kernel mode. + * RING3 -> RING3 user mode. + * However RING0 indicates that the guest kernel should return to iteself + * directly with + * orb $3,1*8(%rsp) + * iretq + * If flags contains VGCF_in_syscall: + * Restore RAX, RIP, RFLAGS, RSP. + * Discard R11, RCX, CS, SS. + * Otherwise: + * Restore RAX, R11, RCX, CS:RIP, RFLAGS, SS:RSP. + * All other registers are saved on hypercall entry and restored to user. + */ +/* Guest exited in SYSCALL context? Return to guest with SYSRET? */ +#define _VGCF_in_syscall 8 +#define VGCF_in_syscall (1<<_VGCF_in_syscall) +#define VGCF_IN_SYSCALL VGCF_in_syscall + +#ifndef __ASSEMBLY__ + +struct iret_context { + /* Top of stack (%rsp at point of hypercall). */ + uint64_t rax, r11, rcx, flags, rip, cs, rflags, rsp, ss; + /* Bottom of iret stack frame. */ +}; + +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +/* Anonymous union includes both 32- and 64-bit names (e.g., eax/rax). */ +#define __DECL_REG(name) union { \ + uint64_t r ## name, e ## name; \ + uint32_t _e ## name; \ +} +#else +/* Non-gcc sources must always use the proper 64-bit name (e.g., rax). */ +#define __DECL_REG(name) uint64_t r ## name +#endif + +struct cpu_user_regs { + uint64_t r15; + uint64_t r14; + uint64_t r13; + uint64_t r12; + __DECL_REG(bp); + __DECL_REG(bx); + uint64_t r11; + uint64_t r10; + uint64_t r9; + uint64_t r8; + __DECL_REG(ax); + __DECL_REG(cx); + __DECL_REG(dx); + __DECL_REG(si); + __DECL_REG(di); + uint32_t error_code; /* private */ + uint32_t entry_vector; /* private */ + __DECL_REG(ip); + uint16_t cs, _pad0[1]; + uint8_t saved_upcall_mask; + uint8_t _pad1[3]; + __DECL_REG(flags); /* rflags.IF == !saved_upcall_mask */ + __DECL_REG(sp); + uint16_t ss, _pad2[3]; + uint16_t es, _pad3[3]; + uint16_t ds, _pad4[3]; + uint16_t fs, _pad5[3]; /* Non-zero => takes precedence over fs_base. */ + uint16_t gs, _pad6[3]; /* Non-zero => takes precedence over gs_base_usr. */ +}; +DEFINE_GUEST_HANDLE_STRUCT(cpu_user_regs); + +#undef __DECL_REG + +#define xen_pfn_to_cr3(pfn) ((unsigned long)(pfn) << 12) +#define xen_cr3_to_pfn(cr3) ((unsigned long)(cr3) >> 12) + +struct arch_vcpu_info { + unsigned long cr2; + unsigned long pad; /* sizeof(vcpu_info_t) == 64 */ +}; + +typedef unsigned long xen_callback_t; + +#define XEN_CALLBACK(__cs, __rip) \ + ((unsigned long)(__rip)) + +#endif /* !__ASSEMBLY__ */ + + +#endif /* __ASM_X86_XEN_INTERFACE_64_H */ diff --git a/include/xen/interface/callback.h b/include/xen/interface/callback.h index 4aadcba..2ae3cd2 100644 --- a/include/xen/interface/callback.h +++ b/include/xen/interface/callback.h @@ -82,9 +82,9 @@ */ #define CALLBACKOP_register 0 struct callback_register { - uint16_t type; - uint16_t flags; - struct xen_callback address; + uint16_t type; + uint16_t flags; + xen_callback_t address; }; /* -- 1.5.4.1 linux-2.6-xen-0023-xen-make-ELF-notes-work-for-32-and-64-bit.patch: --- NEW FILE linux-2.6-xen-0023-xen-make-ELF-notes-work-for-32-and-64-bit.patch --- >From 6080ad1facb19051aa5155b94a35546a50a95048 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:35 -0700 Subject: [PATCH] xen: make ELF notes work for 32 and 64 bit Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/xen-head.S | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 7c0cf63..a9cac9d 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -5,7 +5,10 @@ #include #include + #include +#include + #include #include @@ -21,21 +24,21 @@ ENTRY(startup_xen) .pushsection .text .align PAGE_SIZE_asm ENTRY(hypercall_page) - .skip 0x1000 + .skip PAGE_SIZE_asm .popsection ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0") - ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, .long __PAGE_OFFSET) - ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen) - ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page) + ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, _ASM_PTR __PAGE_OFFSET) + ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen) + ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page) ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, .quad _PAGE_PRESENT; .quad _PAGE_PRESENT) ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1) - ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .long __HYPERVISOR_VIRT_START) + ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, _ASM_PTR __HYPERVISOR_VIRT_START) #endif /*CONFIG_XEN */ -- 1.5.4.1 linux-2.6-xen-0024-xen-fix-64-bit-hypercall-variants.patch: --- NEW FILE linux-2.6-xen-0024-xen-fix-64-bit-hypercall-variants.patch --- >From a65b1ea260d2a311e69820ba8d973f14d9af75c4 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:36 -0700 Subject: [PATCH] xen: fix 64-bit hypercall variants 64-bit guests can pass 64-bit quantities in a single argument, so fix up the hypercalls. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- include/asm-x86/xen/hypercall.h | 60 ++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 29 deletions(-) diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index 74465b7..5e277c0 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -223,12 +223,12 @@ static inline int HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val, unsigned long flags) { - unsigned long pte_hi = 0; -#ifdef CONFIG_X86_PAE - pte_hi = new_val.pte_high; -#endif - return _hypercall4(int, update_va_mapping, va, - new_val.pte_low, pte_hi, flags); + if (sizeof(new_val) == sizeof(long)) + return _hypercall3(int, update_va_mapping, va, + new_val.pte, flags); + else + return _hypercall4(int, update_va_mapping, va, + new_val.pte, new_val.pte >> 32, flags); } static inline int @@ -281,12 +281,13 @@ static inline int HYPERVISOR_update_va_mapping_otherdomain(unsigned long va, pte_t new_val, unsigned long flags, domid_t domid) { - unsigned long pte_hi = 0; -#ifdef CONFIG_X86_PAE - pte_hi = new_val.pte_high; -#endif - return _hypercall5(int, update_va_mapping_otherdomain, va, - new_val.pte_low, pte_hi, flags, domid); + if (sizeof(new_val) == sizeof(long)) + return _hypercall4(int, update_va_mapping_otherdomain, va, + new_val.pte, flags, domid); + else + return _hypercall5(int, update_va_mapping_otherdomain, va, + new_val.pte, new_val.pte >> 32, + flags, domid); } static inline int @@ -327,14 +328,14 @@ MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va, { mcl->op = __HYPERVISOR_update_va_mapping; mcl->args[0] = va; -#ifdef CONFIG_X86_PAE - mcl->args[1] = new_val.pte_low; - mcl->args[2] = new_val.pte_high; -#else - mcl->args[1] = new_val.pte_low; - mcl->args[2] = 0; -#endif - mcl->args[3] = flags; + if (sizeof(new_val) == sizeof(long)) { + mcl->args[1] = new_val.pte; + mcl->args[2] = flags; + } else { + mcl->args[1] = new_val.pte; + mcl->args[2] = new_val.pte >> 32; + mcl->args[3] = flags; + } } static inline void @@ -354,15 +355,16 @@ MULTI_update_va_mapping_otherdomain(struct multicall_entry *mcl, unsigned long v { mcl->op = __HYPERVISOR_update_va_mapping_otherdomain; mcl->args[0] = va; -#ifdef CONFIG_X86_PAE - mcl->args[1] = new_val.pte_low; - mcl->args[2] = new_val.pte_high; -#else - mcl->args[1] = new_val.pte_low; - mcl->args[2] = 0; -#endif - mcl->args[3] = flags; - mcl->args[4] = domid; + if (sizeof(new_val) == sizeof(long)) { + mcl->args[1] = new_val.pte; + mcl->args[2] = flags; + mcl->args[3] = domid; + } else { + mcl->args[1] = new_val.pte; + mcl->args[2] = new_val.pte >> 32; + mcl->args[3] = flags; + mcl->args[4] = domid; + } } static inline void -- 1.5.4.1 linux-2.6-xen-0025-xen64-fix-calls-into-hypercall-page.patch: --- NEW FILE linux-2.6-xen-0025-xen64-fix-calls-into-hypercall-page.patch --- >From cfa583b90c8ae0a5d8a8d9ab2c97d112610fdd85 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:37 -0700 Subject: [PATCH] xen64: fix calls into hypercall page The 64-bit calling convention for hypercalls uses different registers from 32-bit. Annoyingly, gcc's asm syntax doesn't have a way to specify one of the extra numeric reigisters in a constraint, so we must use explicitly placed register variables. Given that we have to do it for some args, may as well do it for all. Also fix syntax gcc generates for the call instruction itself. We need a plain direct call, but the asm expansion which works on 32-bit generates a rip-relative addressing mode in 64-bit, which is treated as an indirect call. The alternative is to pass the hypercall page offset into the asm, and have it add it to the hypercall page start address to generate the call. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- include/asm-x86/xen/hypercall.h | 170 ++++++++++++++++++++++++++++----------- 1 files changed, 122 insertions(+), 48 deletions(-) diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index 5e277c0..8763b97 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -40,83 +40,157 @@ #include #include +/* + * The hypercall asms have to meet several constraints: + * - Work on 32- and 64-bit. + * The two architectures put their arguments in different sets of + * registers. + * + * - Work around asm syntax quirks + * It isn't possible to specify one of the rNN registers in a + * constraint, so we use explicit register variables to get the + * args into the right place. + * + * - Mark all registers as potentially clobbered + * Even unused parameters can be clobbered by the hypervisor, so we + * need to make sure gcc knows it. + * + * - Avoid compiler bugs. + * This is the tricky part. Because x86_32 has such a constrained + * register set, gcc versions below 4.3 have trouble generating + * code when all the arg registers and memory are trashed by the + * asm. There are syntactically simpler ways of achieving the + * semantics below, but they cause the compiler to crash. + * + * The only combination I found which works is: + * - assign the __argX variables first + * - list all actually used parameters as "+r" (__argX) + * - clobber the rest + * + * The result certainly isn't pretty, and it really shows up cpp's + * weakness as as macro language. Sorry. (But let's just give thanks + * there aren't more than 5 arguments...) + */ + extern struct { char _entry[32]; } hypercall_page[]; +#define __HYPERCALL "call hypercall_page+%c[offset]" +#define __HYPERCALL_ENTRY(x) \ + [offset] "i" (__HYPERVISOR_##x * sizeof(hypercall_page[0])) + +#ifdef CONFIG_X86_32 +#define __HYPERCALL_RETREG "eax" +#define __HYPERCALL_ARG1REG "ebx" +#define __HYPERCALL_ARG2REG "ecx" +#define __HYPERCALL_ARG3REG "edx" +#define __HYPERCALL_ARG4REG "esi" +#define __HYPERCALL_ARG5REG "edi" +#else +#define __HYPERCALL_RETREG "rax" +#define __HYPERCALL_ARG1REG "rdi" +#define __HYPERCALL_ARG2REG "rsi" +#define __HYPERCALL_ARG3REG "rdx" +#define __HYPERCALL_ARG4REG "r10" +#define __HYPERCALL_ARG5REG "r8" +#endif + +#define __HYPERCALL_DECLS \ + register unsigned long __res asm(__HYPERCALL_RETREG); \ + register unsigned long __arg1 asm(__HYPERCALL_ARG1REG) = __arg1; \ + register unsigned long __arg2 asm(__HYPERCALL_ARG2REG) = __arg2; \ + register unsigned long __arg3 asm(__HYPERCALL_ARG3REG) = __arg3; \ + register unsigned long __arg4 asm(__HYPERCALL_ARG4REG) = __arg4; \ + register unsigned long __arg5 asm(__HYPERCALL_ARG5REG) = __arg5; + +#define __HYPERCALL_0PARAM "=r" (__res) +#define __HYPERCALL_1PARAM __HYPERCALL_0PARAM, "+r" (__arg1) +#define __HYPERCALL_2PARAM __HYPERCALL_1PARAM, "+r" (__arg2) +#define __HYPERCALL_3PARAM __HYPERCALL_2PARAM, "+r" (__arg3) +#define __HYPERCALL_4PARAM __HYPERCALL_3PARAM, "+r" (__arg4) +#define __HYPERCALL_5PARAM __HYPERCALL_4PARAM, "+r" (__arg5) + +#define __HYPERCALL_0ARG() +#define __HYPERCALL_1ARG(a1) \ + __HYPERCALL_0ARG() __arg1 = (unsigned long)(a1); +#define __HYPERCALL_2ARG(a1,a2) \ + __HYPERCALL_1ARG(a1) __arg2 = (unsigned long)(a2); +#define __HYPERCALL_3ARG(a1,a2,a3) \ + __HYPERCALL_2ARG(a1,a2) __arg3 = (unsigned long)(a3); +#define __HYPERCALL_4ARG(a1,a2,a3,a4) \ + __HYPERCALL_3ARG(a1,a2,a3) __arg4 = (unsigned long)(a4); +#define __HYPERCALL_5ARG(a1,a2,a3,a4,a5) \ + __HYPERCALL_4ARG(a1,a2,a3,a4) __arg5 = (unsigned long)(a5); + +#define __HYPERCALL_CLOBBER5 "memory" +#define __HYPERCALL_CLOBBER4 __HYPERCALL_CLOBBER5, __HYPERCALL_ARG5REG +#define __HYPERCALL_CLOBBER3 __HYPERCALL_CLOBBER4, __HYPERCALL_ARG4REG +#define __HYPERCALL_CLOBBER2 __HYPERCALL_CLOBBER3, __HYPERCALL_ARG3REG +#define __HYPERCALL_CLOBBER1 __HYPERCALL_CLOBBER2, __HYPERCALL_ARG2REG +#define __HYPERCALL_CLOBBER0 __HYPERCALL_CLOBBER1, __HYPERCALL_ARG1REG + #define _hypercall0(type, name) \ ({ \ - long __res; \ - asm volatile ( \ - "call %[call]" \ - : "=a" (__res) \ - : [call] "m" (hypercall_page[__HYPERVISOR_##name]) \ - : "memory" ); \ + __HYPERCALL_DECLS; \ + __HYPERCALL_0ARG(); \ + asm volatile (__HYPERCALL \ + : __HYPERCALL_0PARAM \ + : __HYPERCALL_ENTRY(name) \ + : __HYPERCALL_CLOBBER0); \ (type)__res; \ }) #define _hypercall1(type, name, a1) \ ({ \ - long __res, __ign1; \ - asm volatile ( \ - "call %[call]" \ - : "=a" (__res), "=b" (__ign1) \ - : "1" ((long)(a1)), \ - [call] "m" (hypercall_page[__HYPERVISOR_##name]) \ - : "memory" ); \ + __HYPERCALL_DECLS; \ + __HYPERCALL_1ARG(a1); \ + asm volatile (__HYPERCALL \ + : __HYPERCALL_1PARAM \ + : __HYPERCALL_ENTRY(name) \ + : __HYPERCALL_CLOBBER1); \ (type)__res; \ }) #define _hypercall2(type, name, a1, a2) \ ({ \ - long __res, __ign1, __ign2; \ - asm volatile ( \ - "call %[call]" \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ - : "1" ((long)(a1)), "2" ((long)(a2)), \ - [call] "m" (hypercall_page[__HYPERVISOR_##name]) \ - : "memory" ); \ + __HYPERCALL_DECLS; \ + __HYPERCALL_2ARG(a1, a2); \ + asm volatile (__HYPERCALL \ + : __HYPERCALL_2PARAM \ + : __HYPERCALL_ENTRY(name) \ + : __HYPERCALL_CLOBBER2); \ (type)__res; \ }) #define _hypercall3(type, name, a1, a2, a3) \ ({ \ - long __res, __ign1, __ign2, __ign3; \ - asm volatile ( \ - "call %[call]" \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ - "=d" (__ign3) \ - : "1" ((long)(a1)), "2" ((long)(a2)), \ - "3" ((long)(a3)), \ - [call] "m" (hypercall_page[__HYPERVISOR_##name]) \ - : "memory" ); \ + __HYPERCALL_DECLS; \ + __HYPERCALL_3ARG(a1, a2, a3); \ + asm volatile (__HYPERCALL \ + : __HYPERCALL_3PARAM \ + : __HYPERCALL_ENTRY(name) \ + : __HYPERCALL_CLOBBER3); \ (type)__res; \ }) #define _hypercall4(type, name, a1, a2, a3, a4) \ ({ \ - long __res, __ign1, __ign2, __ign3, __ign4; \ - asm volatile ( \ - "call %[call]" \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ - "=d" (__ign3), "=S" (__ign4) \ - : "1" ((long)(a1)), "2" ((long)(a2)), \ - "3" ((long)(a3)), "4" ((long)(a4)), \ - [call] "m" (hypercall_page[__HYPERVISOR_##name]) \ - : "memory" ); \ + __HYPERCALL_DECLS; \ + __HYPERCALL_4ARG(a1, a2, a3, a4); \ + asm volatile (__HYPERCALL \ + : __HYPERCALL_4PARAM \ + : __HYPERCALL_ENTRY(name) \ + : __HYPERCALL_CLOBBER4); \ (type)__res; \ }) #define _hypercall5(type, name, a1, a2, a3, a4, a5) \ ({ \ - long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ - asm volatile ( \ - "call %[call]" \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ - "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ - : "1" ((long)(a1)), "2" ((long)(a2)), \ - "3" ((long)(a3)), "4" ((long)(a4)), \ - "5" ((long)(a5)), \ - [call] "m" (hypercall_page[__HYPERVISOR_##name]) \ - : "memory" ); \ + __HYPERCALL_DECLS; \ + __HYPERCALL_5ARG(a1, a2, a3, a4, a5); \ + asm volatile (__HYPERCALL \ + : __HYPERCALL_5PARAM \ + : __HYPERCALL_ENTRY(name) \ + : __HYPERCALL_CLOBBER5); \ (type)__res; \ }) -- 1.5.4.1 linux-2.6-xen-0026-xen64-add-extra-pv_mmu_ops.patch: --- NEW FILE linux-2.6-xen-0026-xen64-add-extra-pv_mmu_ops.patch --- >From 9821b933cd663bcb3301b1c5bebf18a729a45473 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:38 -0700 Subject: [PATCH] xen64: add extra pv_mmu_ops We need extra pv_mmu_ops for 64-bit, to deal with the extra level of pagetable. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 33 +++++++++++++++++++++++++++- arch/x86/xen/mmu.c | 51 +++++++++++++++++++++++++++++++++++++++++++- arch/x86/xen/mmu.h | 15 +++++++++++- include/asm-x86/xen/page.h | 4 +++ 4 files changed, 99 insertions(+), 4 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 9f07d2f..6d77330 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -821,6 +821,18 @@ static void xen_release_pmd(u32 pfn) xen_release_ptpage(pfn, PT_PMD); } +#if PAGETABLE_LEVELS == 4 +static void xen_alloc_pud(struct mm_struct *mm, u32 pfn) +{ + xen_alloc_ptpage(mm, pfn, PT_PUD); +} + +static void xen_release_pud(u32 pfn) +{ + xen_release_ptpage(pfn, PT_PUD); +} +#endif + #ifdef CONFIG_HIGHPTE static void *xen_kmap_atomic_pte(struct page *page, enum km_type type) { @@ -940,6 +952,11 @@ static __init void xen_pagetable_setup_done(pgd_t *base) pv_mmu_ops.alloc_pmd = xen_alloc_pmd; pv_mmu_ops.release_pte = xen_release_pte; pv_mmu_ops.release_pmd = xen_release_pmd; +#if PAGETABLE_LEVELS == 4 + pv_mmu_ops.alloc_pud = xen_alloc_pud; + pv_mmu_ops.release_pud = xen_release_pud; +#endif + pv_mmu_ops.set_pte = xen_set_pte; xen_setup_shared_info(); @@ -955,6 +972,9 @@ static __init void xen_post_allocator_init(void) { pv_mmu_ops.set_pmd = xen_set_pmd; pv_mmu_ops.set_pud = xen_set_pud; +#if PAGETABLE_LEVELS == 4 + pv_mmu_ops.set_pgd = xen_set_pgd; +#endif xen_mark_init_mm_pinned(); } @@ -1206,15 +1226,26 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { .make_pte = xen_make_pte, .make_pgd = xen_make_pgd, +#ifdef CONFIG_X86_PAE .set_pte_atomic = xen_set_pte_atomic, .set_pte_present = xen_set_pte_at, - .set_pud = xen_set_pud_hyper, .pte_clear = xen_pte_clear, .pmd_clear = xen_pmd_clear, +#endif /* CONFIG_X86_PAE */ + .set_pud = xen_set_pud_hyper, .make_pmd = xen_make_pmd, .pmd_val = xen_pmd_val, +#if PAGETABLE_LEVELS == 4 + .pud_val = xen_pud_val, + .make_pud = xen_make_pud, + .set_pgd = xen_set_pgd_hyper, + + .alloc_pud = xen_alloc_pte_init, + .release_pud = xen_release_pte_init, +#endif /* PAGETABLE_LEVELS == 4 */ + .activate_mm = xen_activate_mm, .dup_mmap = xen_dup_mmap, .exit_mmap = xen_exit_mmap, diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 4fca9d8..d0976b8 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -438,14 +438,19 @@ void xen_set_pud(pud_t *ptr, pud_t val) void xen_set_pte(pte_t *ptep, pte_t pte) { +#ifdef CONFIG_X86_PAE ptep->pte_high = pte.pte_high; smp_wmb(); ptep->pte_low = pte.pte_low; +#else + *ptep = pte; +#endif } +#ifdef CONFIG_X86_PAE void xen_set_pte_atomic(pte_t *ptep, pte_t pte) { - set_64bit((u64 *)ptep, pte_val_ma(pte)); + set_64bit((u64 *)ptep, native_pte_val(pte)); } void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) @@ -459,6 +464,7 @@ void xen_pmd_clear(pmd_t *pmdp) { set_pmd(pmdp, __pmd(0)); } +#endif /* CONFIG_X86_PAE */ pmd_t xen_make_pmd(pmdval_t pmd) { @@ -466,6 +472,49 @@ pmd_t xen_make_pmd(pmdval_t pmd) return native_make_pmd(pmd); } +#if PAGETABLE_LEVELS == 4 +pudval_t xen_pud_val(pud_t pud) +{ + return pte_mfn_to_pfn(pud.pud); +} + +pud_t xen_make_pud(pudval_t pud) +{ + pud = pte_pfn_to_mfn(pud); + + return native_make_pud(pud); +} + +void xen_set_pgd_hyper(pgd_t *ptr, pgd_t val) +{ + struct mmu_update u; + + preempt_disable(); + + xen_mc_batch(); + + u.ptr = virt_to_machine(ptr).maddr; + u.val = pgd_val_ma(val); + extend_mmu_update(&u); + + xen_mc_issue(PARAVIRT_LAZY_MMU); + + preempt_enable(); +} + +void xen_set_pgd(pgd_t *ptr, pgd_t val) +{ + /* If page is not pinned, we can just update the entry + directly */ + if (!page_pinned(ptr)) { + *ptr = val; + return; + } + + xen_set_pgd_hyper(ptr, val); +} +#endif /* PAGETABLE_LEVELS == 4 */ + /* (Yet another) pagetable walker. This one is intended for pinning a pagetable. This means that it walks a pagetable and calls the diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index 7856e37..19d544b 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h @@ -32,13 +32,24 @@ pgd_t xen_make_pgd(pgdval_t); void xen_set_pte(pte_t *ptep, pte_t pteval); void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pteval); + +#ifdef CONFIG_X86_PAE void xen_set_pte_atomic(pte_t *ptep, pte_t pte); +void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); +void xen_pmd_clear(pmd_t *pmdp); +#endif /* CONFIG_X86_PAE */ + void xen_set_pmd(pmd_t *pmdp, pmd_t pmdval); void xen_set_pud(pud_t *ptr, pud_t val); void xen_set_pmd_hyper(pmd_t *pmdp, pmd_t pmdval); void xen_set_pud_hyper(pud_t *ptr, pud_t val); -void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); -void xen_pmd_clear(pmd_t *pmdp); + +#if PAGETABLE_LEVELS == 4 +pudval_t xen_pud_val(pud_t pud); +pud_t xen_make_pud(pudval_t pudval); +void xen_set_pgd(pgd_t *pgdp, pgd_t pgd); +void xen_set_pgd_hyper(pgd_t *pgdp, pgd_t pgd); +#endif pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep); void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h index 377c045..a40be65 100644 --- a/include/asm-x86/xen/page.h +++ b/include/asm-x86/xen/page.h @@ -148,7 +148,11 @@ static inline pte_t __pte_ma(pteval_t x) } #define pmd_val_ma(v) ((v).pmd) +#ifdef __PAGETABLE_PUD_FOLDED #define pud_val_ma(v) ((v).pgd.pgd) +#else +#define pud_val_ma(v) ((v).pud) +#endif #define __pmd_ma(x) ((pmd_t) { (x) } ) #define pgd_val_ma(x) ((x).pgd) -- 1.5.4.1 linux-2.6-xen-0027-xen64-random-ifdefs-to-mask-out-32-bit-only-code.patch: --- NEW FILE linux-2.6-xen-0027-xen64-random-ifdefs-to-mask-out-32-bit-only-code.patch --- >From 516f699b8ebe5d579b4eb523acb1db93f20da22c Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:39 -0700 Subject: [PATCH] xen64: random ifdefs to mask out 32-bit only code Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 6d77330..835bb38 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1317,6 +1317,7 @@ static const struct machine_ops __initdata xen_machine_ops = { static void __init xen_reserve_top(void) { +#ifdef CONFIG_X86_32 unsigned long top = HYPERVISOR_VIRT_START; struct xen_platform_parameters pp; @@ -1324,6 +1325,7 @@ static void __init xen_reserve_top(void) top = pp.virt_start; reserve_top_address(-top + 2 * PAGE_SIZE); +#endif /* CONFIG_X86_32 */ } /* First C function to be called on Xen boot */ @@ -1354,6 +1356,11 @@ asmlinkage void __init xen_start_kernel(void) machine_ops = xen_machine_ops; +#ifdef CONFIG_X86_64 + /* Disable until direct per-cpu data access. */ + have_vcpu_info_placement = 0; +#endif + #ifdef CONFIG_SMP smp_ops = xen_smp_ops; #endif @@ -1364,9 +1371,11 @@ asmlinkage void __init xen_start_kernel(void) pgd = (pgd_t *)xen_start_info->pt_base; +#ifdef CONFIG_X86_32 init_pg_tables_start = __pa(pgd); init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; max_pfn_mapped = (init_pg_tables_end + 512*1024) >> PAGE_SHIFT; +#endif init_mm.pgd = pgd; /* use the Xen pagetables to start */ @@ -1393,7 +1402,9 @@ asmlinkage void __init xen_start_kernel(void) /* set up basic CPUID stuff */ cpu_detect(&new_cpu_data); +#ifdef CONFIG_X86_32 new_cpu_data.hard_math = 1; +#endif new_cpu_data.x86_capability[0] = cpuid_edx(1); /* Poke various useful things into boot_params */ @@ -1409,5 +1420,9 @@ asmlinkage void __init xen_start_kernel(void) } /* Start the world */ +#ifdef CONFIG_X86_32 i386_start_kernel(); +#else + x86_64_start_kernel((char *)&boot_params); +#endif } -- 1.5.4.1 linux-2.6-xen-0028-xen64-get-active_mm-from-the-pda.patch: --- NEW FILE linux-2.6-xen-0028-xen64-get-active_mm-from-the-pda.patch --- >From c281651c5de831bdeea93ba3242bd8b979dd8280 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:40 -0700 Subject: [PATCH] xen64: get active_mm from the pda x86_64 stores the active_mm in the pda, so fetch it from there. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/mmu.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index d0976b8..2579e70 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -805,8 +805,15 @@ void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm) static void drop_other_mm_ref(void *info) { struct mm_struct *mm = info; + struct mm_struct *active_mm; - if (__get_cpu_var(cpu_tlbstate).active_mm == mm) +#ifdef CONFIG_X86_64 + active_mm = read_pda(active_mm); +#else + active_mm = __get_cpu_var(cpu_tlbstate).active_mm; +#endif + + if (active_mm == mm) leave_mm(smp_processor_id()); /* If this cpu still has a stale cr3 reference, then make sure -- 1.5.4.1 linux-2.6-xen-0029-xen-move-smp-setup-into-smp.c.patch: --- NEW FILE linux-2.6-xen-0029-xen-move-smp-setup-into-smp.c.patch --- >From a2d93a591a3e23d3ebf6b8c88633d80bde718828 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:41 -0700 Subject: [PATCH] xen: move smp setup into smp.c Move all the smp_ops setup into smp.c, allowing a lot of things to become static. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 19 +------------------ arch/x86/xen/smp.c | 34 ++++++++++++++++++++++++++-------- arch/x86/xen/xen-ops.h | 13 +++++-------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 835bb38..46348e8 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1258,21 +1258,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { .set_fixmap = xen_set_fixmap, }; -#ifdef CONFIG_SMP -static const struct smp_ops xen_smp_ops __initdata = { - .smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu, - .smp_prepare_cpus = xen_smp_prepare_cpus, - .cpu_up = xen_cpu_up, - .smp_cpus_done = xen_smp_cpus_done, - - .smp_send_stop = xen_smp_send_stop, - .smp_send_reschedule = xen_smp_send_reschedule, - - .send_call_func_ipi = xen_smp_send_call_function_ipi, - .send_call_func_single_ipi = xen_smp_send_call_function_single_ipi, -}; -#endif /* CONFIG_SMP */ - static void xen_reboot(int reason) { struct sched_shutdown r = { .reason = reason }; @@ -1361,9 +1346,7 @@ asmlinkage void __init xen_start_kernel(void) have_vcpu_info_placement = 0; #endif -#ifdef CONFIG_SMP - smp_ops = xen_smp_ops; -#endif + xen_smp_init(); /* Get mfn list */ if (!xen_feature(XENFEAT_auto_translated_physmap)) diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 233156f..91fae8f 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -152,7 +152,7 @@ void __init xen_fill_possible_map(void) } } -void __init xen_smp_prepare_boot_cpu(void) +static void __init xen_smp_prepare_boot_cpu(void) { int cpu; @@ -176,7 +176,7 @@ void __init xen_smp_prepare_boot_cpu(void) xen_setup_vcpu_info_placement(); } -void __init xen_smp_prepare_cpus(unsigned int max_cpus) +static void __init xen_smp_prepare_cpus(unsigned int max_cpus) { unsigned cpu; @@ -276,7 +276,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) return 0; } -int __cpuinit xen_cpu_up(unsigned int cpu) +static int __cpuinit xen_cpu_up(unsigned int cpu) { struct task_struct *idle = idle_task(cpu); int rc; @@ -319,7 +319,7 @@ int __cpuinit xen_cpu_up(unsigned int cpu) return 0; } -void xen_smp_cpus_done(unsigned int max_cpus) +static void xen_smp_cpus_done(unsigned int max_cpus) { } @@ -335,12 +335,12 @@ static void stop_self(void *v) BUG(); } -void xen_smp_send_stop(void) +static void xen_smp_send_stop(void) { smp_call_function(stop_self, NULL, 0); } -void xen_smp_send_reschedule(int cpu) +static void xen_smp_send_reschedule(int cpu) { xen_send_IPI_one(cpu, XEN_RESCHEDULE_VECTOR); } @@ -355,7 +355,7 @@ static void xen_send_IPI_mask(cpumask_t mask, enum ipi_vector vector) xen_send_IPI_one(cpu, vector); } -void xen_smp_send_call_function_ipi(cpumask_t mask) +static void xen_smp_send_call_function_ipi(cpumask_t mask) { int cpu; @@ -370,7 +370,7 @@ void xen_smp_send_call_function_ipi(cpumask_t mask) } } -void xen_smp_send_call_function_single_ipi(int cpu) +static void xen_smp_send_call_function_single_ipi(int cpu) { xen_send_IPI_mask(cpumask_of_cpu(cpu), XEN_CALL_FUNCTION_SINGLE_VECTOR); } @@ -394,3 +394,21 @@ static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } + +static const struct smp_ops xen_smp_ops __initdata = { + .smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu, + .smp_prepare_cpus = xen_smp_prepare_cpus, + .cpu_up = xen_cpu_up, + .smp_cpus_done = xen_smp_cpus_done, + + .smp_send_stop = xen_smp_send_stop, + .smp_send_reschedule = xen_smp_send_reschedule, + + .send_call_func_ipi = xen_smp_send_call_function_ipi, + .send_call_func_single_ipi = xen_smp_send_call_function_single_ipi, +}; + +void __init xen_smp_init(void) +{ + smp_ops = xen_smp_ops; +} diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 77354d2..81a779f 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -47,17 +47,14 @@ void xen_mark_init_mm_pinned(void); void __init xen_fill_possible_map(void); void __init xen_setup_vcpu_info_placement(void); -void xen_smp_prepare_boot_cpu(void); -void xen_smp_prepare_cpus(unsigned int max_cpus); -int xen_cpu_up(unsigned int cpu); -void xen_smp_cpus_done(unsigned int max_cpus); -void xen_smp_send_stop(void); -void xen_smp_send_reschedule(int cpu); -void xen_smp_send_call_function_ipi(cpumask_t mask); -void xen_smp_send_call_function_single_ipi(int cpu); +#ifdef CONFIG_SMP +void xen_smp_init(void); extern cpumask_t xen_cpu_initialized_map; +#else +static inline void xen_smp_init(void) {} +#endif /* Declare an asm function, along with symbols needed to make it -- 1.5.4.1 linux-2.6-xen-0030-x86_64-add-workaround-for-no-gs-based-percpu.patch: --- NEW FILE linux-2.6-xen-0030-x86_64-add-workaround-for-no-gs-based-percpu.patch --- >From 420363ef7b613bc24011cd1b9a7835b1fffb0748 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:42 -0700 Subject: [PATCH] x86_64: add workaround for no %gs-based percpu As a stopgap until Mike Travis's x86-64 gs-based percpu patches are ready, provide workaround functions for x86_read/write_percpu for Xen's use. Specifically, this means that we can't really make use of vcpu placement, because we can't use a single gs-based memory access to get to vcpu fields. So disable all that for now. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/head64.c | 11 ++++++++--- arch/x86/xen/enlighten.c | 5 +++++ include/asm-x86/percpu.h | 26 ++++++++++++++++++++++++++ include/asm-x86/setup.h | 1 + 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index c978198..1b318e9 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -39,6 +39,13 @@ static struct x8664_pda *__cpu_pda[NR_CPUS] __initdata; static struct x8664_pda *__cpu_pda[NR_CPUS] __read_mostly; #endif +void __init x86_64_init_pda(void) +{ + _cpu_pda = __cpu_pda; + cpu_pda(0) = &_boot_cpu_pda; + pda_init(0); +} + static void __init zap_identity_mappings(void) { pgd_t *pgd = pgd_offset_k(0UL); @@ -102,9 +109,7 @@ void __init x86_64_start_kernel(char * real_mode_data) early_printk("Kernel alive\n"); - _cpu_pda = __cpu_pda; - cpu_pda(0) = &_boot_cpu_pda; - pda_init(0); + x86_64_init_pda(); early_printk("Kernel really alive\n"); diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 46348e8..b7dde92 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -989,6 +989,7 @@ void xen_setup_vcpu_info_placement(void) /* xen_vcpu_setup managed to place the vcpu_info within the percpu area for all cpus, so make use of it */ +#ifdef CONFIG_X86_32 if (have_vcpu_info_placement) { printk(KERN_INFO "Xen: using vcpu_info placement\n"); @@ -998,6 +999,7 @@ void xen_setup_vcpu_info_placement(void) pv_irq_ops.irq_enable = xen_irq_enable_direct; pv_mmu_ops.read_cr2 = xen_read_cr2_direct; } +#endif } static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, @@ -1018,10 +1020,12 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, goto patch_site switch (type) { +#ifdef CONFIG_X86_32 SITE(pv_irq_ops, irq_enable); SITE(pv_irq_ops, irq_disable); SITE(pv_irq_ops, save_fl); SITE(pv_irq_ops, restore_fl); +#endif /* CONFIG_X86_32 */ #undef SITE patch_site: @@ -1344,6 +1348,7 @@ asmlinkage void __init xen_start_kernel(void) #ifdef CONFIG_X86_64 /* Disable until direct per-cpu data access. */ have_vcpu_info_placement = 0; + x86_64_init_pda(); #endif xen_smp_init(); diff --git a/include/asm-x86/percpu.h b/include/asm-x86/percpu.h index 912a3a1..4e91ee1 100644 --- a/include/asm-x86/percpu.h +++ b/include/asm-x86/percpu.h @@ -22,6 +22,32 @@ DECLARE_PER_CPU(struct x8664_pda, pda); +/* + * These are supposed to be implemented as a single instruction which + * operates on the per-cpu data base segment. x86-64 doesn't have + * that yet, so this is a fairly inefficient workaround for the + * meantime. The single instruction is atomic with respect to + * preemption and interrupts, so we need to explicitly disable + * interrupts here to achieve the same effect. However, because it + * can be used from within interrupt-disable/enable, we can't actually + * disable interrupts; disabling preemption is enough. + */ +#define x86_read_percpu(var) \ + ({ \ + typeof(per_cpu_var(var)) __tmp; \ + preempt_disable(); \ + __tmp = __get_cpu_var(var); \ + preempt_enable(); \ + __tmp; \ + }) + +#define x86_write_percpu(var, val) \ + do { \ + preempt_disable(); \ + __get_cpu_var(var) = (val); \ + preempt_enable(); \ + } while(0) + #else /* CONFIG_X86_64 */ #ifdef __ASSEMBLY__ diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h index 90ab222..6594926 100644 --- a/include/asm-x86/setup.h +++ b/include/asm-x86/setup.h @@ -76,6 +76,7 @@ extern unsigned long init_pg_tables_start; extern unsigned long init_pg_tables_end; #else +void __init x86_64_init_pda(void); void __init x86_64_start_kernel(char *real_mode); void __init x86_64_start_reservations(char *real_mode_data); -- 1.5.4.1 linux-2.6-xen-0031-xen64-smp.c-compile-hacking.patch: --- NEW FILE linux-2.6-xen-0031-xen64-smp.c-compile-hacking.patch --- >From 511aa06867f57bf53c913fa9f05d7caae66c0ceb Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:43 -0700 Subject: [PATCH] xen64: smp.c compile hacking A number of random changes to make xen/smp.c compile in 64-bit mode. Signed-off-by: Jeremy Fitzhardinge a Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/setup.c | 7 +--- arch/x86/xen/smp.c | 98 ++++++++++++++++++++++++++++-------------------- arch/x86/xen/xen-ops.h | 2 - 3 files changed, 58 insertions(+), 49 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index e0a3959..f52f385 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -98,7 +98,7 @@ void xen_enable_sysenter(void) /* Mask events on entry, even though they get enabled immediately */ static struct callback_register sysenter = { .type = CALLBACKTYPE_sysenter, - .address = { __KERNEL_CS, (unsigned long)xen_sysenter_target }, + .address = XEN_CALLBACK(__KERNEL_CS, xen_sysenter_target), .flags = CALLBACKF_mask_events, }; @@ -143,11 +143,6 @@ void __init xen_arch_setup(void) pm_idle = xen_idle; -#ifdef CONFIG_SMP - /* fill cpus_possible with all available cpus */ - xen_fill_possible_map(); -#endif - paravirt_disable_iospace(); fiddle_vdso(); diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 91fae8f..800bb21 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -66,13 +66,21 @@ static __cpuinit void cpu_bringup_and_idle(void) int cpu = smp_processor_id(); cpu_init(); + preempt_disable(); + xen_enable_sysenter(); - preempt_disable(); - per_cpu(cpu_state, cpu) = CPU_ONLINE; + cpu = smp_processor_id(); + smp_store_cpu_info(cpu); + cpu_data(cpu).x86_max_cores = 1; + set_cpu_sibling_map(cpu); xen_setup_cpu_clockevents(); + cpu_set(cpu, cpu_online_map); + x86_write_percpu(cpu_state, CPU_ONLINE); + wmb(); + /* We can take interrupts now: we're officially "up". */ local_irq_enable(); @@ -141,7 +149,7 @@ static int xen_smp_intr_init(unsigned int cpu) return rc; } -void __init xen_fill_possible_map(void) +static void __init xen_fill_possible_map(void) { int i, rc; @@ -154,24 +162,12 @@ void __init xen_fill_possible_map(void) static void __init xen_smp_prepare_boot_cpu(void) { - int cpu; - BUG_ON(smp_processor_id() != 0); native_smp_prepare_boot_cpu(); /* We've switched to the "real" per-cpu gdt, so make sure the old memory can be recycled */ - make_lowmem_page_readwrite(&per_cpu__gdt_page); - - for_each_possible_cpu(cpu) { - cpus_clear(per_cpu(cpu_sibling_map, cpu)); - /* - * cpu_core_map lives in a per cpu area that is cleared - * when the per cpu array is allocated. - * - * cpus_clear(per_cpu(cpu_core_map, cpu)); - */ - } + make_lowmem_page_readwrite(&per_cpu_var(gdt_page)); xen_setup_vcpu_info_placement(); } @@ -180,17 +176,8 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus) { unsigned cpu; - for_each_possible_cpu(cpu) { - cpus_clear(per_cpu(cpu_sibling_map, cpu)); - /* - * cpu_core_ map will be zeroed when the per - * cpu area is allocated. - * - * cpus_clear(per_cpu(cpu_core_map, cpu)); - */ - } - smp_store_cpu_info(0); + cpu_data(0).x86_max_cores = 1; set_cpu_sibling_map(0); if (xen_smp_intr_init(0)) @@ -225,7 +212,7 @@ static __cpuinit int cpu_initialize_context(unsigned int cpu, struct task_struct *idle) { struct vcpu_guest_context *ctxt; - struct gdt_page *gdt = &per_cpu(gdt_page, cpu); + struct desc_struct *gdt; if (cpu_test_and_set(cpu, xen_cpu_initialized_map)) return 0; @@ -234,12 +221,15 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) if (ctxt == NULL) return -ENOMEM; + gdt = get_cpu_gdt_table(cpu); + ctxt->flags = VGCF_IN_KERNEL; ctxt->user_regs.ds = __USER_DS; ctxt->user_regs.es = __USER_DS; - ctxt->user_regs.fs = __KERNEL_PERCPU; - ctxt->user_regs.gs = 0; ctxt->user_regs.ss = __KERNEL_DS; +#ifdef CONFIG_X86_32 + ctxt->user_regs.fs = __KERNEL_PERCPU; +#endif ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle; ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ @@ -249,11 +239,11 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) ctxt->ldt_ents = 0; - BUG_ON((unsigned long)gdt->gdt & ~PAGE_MASK); - make_lowmem_page_readonly(gdt->gdt); + BUG_ON((unsigned long)gdt & ~PAGE_MASK); + make_lowmem_page_readonly(gdt); - ctxt->gdt_frames[0] = virt_to_mfn(gdt->gdt); - ctxt->gdt_ents = ARRAY_SIZE(gdt->gdt); + ctxt->gdt_frames[0] = virt_to_mfn(gdt); + ctxt->gdt_ents = GDT_ENTRIES; ctxt->user_regs.cs = __KERNEL_CS; ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs); @@ -261,9 +251,11 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) ctxt->kernel_ss = __KERNEL_DS; ctxt->kernel_sp = idle->thread.sp0; +#ifdef CONFIG_X86_32 ctxt->event_callback_cs = __KERNEL_CS; - ctxt->event_callback_eip = (unsigned long)xen_hypervisor_callback; ctxt->failsafe_callback_cs = __KERNEL_CS; +#endif + ctxt->event_callback_eip = (unsigned long)xen_hypervisor_callback; ctxt->failsafe_callback_eip = (unsigned long)xen_failsafe_callback; per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir); @@ -287,11 +279,28 @@ static int __cpuinit xen_cpu_up(unsigned int cpu) return rc; #endif +#ifdef CONFIG_X86_64 + /* Allocate node local memory for AP pdas */ + WARN_ON(cpu == 0); + if (cpu > 0) { + rc = get_local_pda(cpu); + if (rc) + return rc; + } +#endif + +#ifdef CONFIG_X86_32 init_gdt(cpu); per_cpu(current_task, cpu) = idle; irq_ctx_init(cpu); +#else + cpu_pda(cpu)->pcurrent = idle; + clear_tsk_thread_flag(idle, TIF_FORK); +#endif xen_setup_timer(cpu); + per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; + /* make sure interrupts start blocked */ per_cpu(xen_vcpu, cpu)->evtchn_upcall_mask = 1; @@ -306,16 +315,14 @@ static int __cpuinit xen_cpu_up(unsigned int cpu) if (rc) return rc; - smp_store_cpu_info(cpu); - set_cpu_sibling_map(cpu); - /* This must be done before setting cpu_online_map */ - wmb(); - - cpu_set(cpu, cpu_online_map); - rc = HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL); BUG_ON(rc); + while(per_cpu(cpu_state, cpu) != CPU_ONLINE) { + HYPERVISOR_sched_op(SCHEDOP_yield, 0); + barrier(); + } + return 0; } @@ -379,7 +386,11 @@ static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) { irq_enter(); generic_smp_call_function_interrupt(); +#ifdef CONFIG_X86_32 __get_cpu_var(irq_stat).irq_call_count++; +#else + add_pda(irq_call_count, 1); +#endif irq_exit(); return IRQ_HANDLED; @@ -389,7 +400,11 @@ static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id) { irq_enter(); generic_smp_call_function_single_interrupt(); +#ifdef CONFIG_X86_32 __get_cpu_var(irq_stat).irq_call_count++; +#else + add_pda(irq_call_count, 1); +#endif irq_exit(); return IRQ_HANDLED; @@ -411,4 +426,5 @@ static const struct smp_ops xen_smp_ops __initdata = { void __init xen_smp_init(void) { smp_ops = xen_smp_ops; + xen_fill_possible_map(); } diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 81a779f..aca4a78 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -44,8 +44,6 @@ bool xen_vcpu_stolen(int vcpu); void xen_mark_init_mm_pinned(void); -void __init xen_fill_possible_map(void); - void __init xen_setup_vcpu_info_placement(void); #ifdef CONFIG_SMP -- 1.5.4.1 linux-2.6-xen-0032-xen64-add-xen-head-code-to-head_64.S.patch: --- NEW FILE linux-2.6-xen-0032-xen64-add-xen-head-code-to-head_64.S.patch --- >From 10117d36d4a955dd371287440ac05e5314c25182 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:44 -0700 Subject: [PATCH] xen64: add xen-head code to head_64.S Add the Xen entrypoint and ELF notes to head_64.S. Adapts xen-head.S to compile either 32-bit or 64-bit. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/asm-offsets_64.c | 3 +++ arch/x86/kernel/head_64.S | 1 + arch/x86/xen/xen-head.S | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index bacf5de..0f7e1f0 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -131,5 +131,8 @@ int main(void) OFFSET(BP_loadflags, boot_params, hdr.loadflags); OFFSET(BP_hardware_subarch, boot_params, hdr.hardware_subarch); OFFSET(BP_version, boot_params, hdr.version); + + BLANK(); + DEFINE(PAGE_SIZE_asm, PAGE_SIZE); return 0; } diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 4b6bda2..2240f82 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -401,6 +401,7 @@ ENTRY(phys_base) /* This must match the first entry in level2_kernel_pgt */ .quad 0x0000000000000000 +#include "../../x86/xen/xen-head.S" .section .bss, "aw", @nobits .align L1_CACHE_BYTES diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index a9cac9d..63d49a5 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -8,15 +8,21 @@ #include #include +#include #include #include __INIT ENTRY(startup_xen) - movl %esi,xen_start_info cld - movl $(init_thread_union+THREAD_SIZE),%esp +#ifdef CONFIG_X86_32 + mov %esi,xen_start_info + mov $init_thread_union+THREAD_SIZE,%esp +#else + mov %rsi,xen_start_info + mov $init_thread_union+THREAD_SIZE,%rsp +#endif jmp xen_start_kernel __FINIT @@ -30,7 +36,11 @@ ENTRY(hypercall_page) ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0") +#ifdef CONFIG_X86_32 ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, _ASM_PTR __PAGE_OFFSET) +#else + ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, _ASM_PTR __START_KERNEL_map) +#endif ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen) ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page) ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") @@ -40,5 +50,6 @@ ENTRY(hypercall_page) .quad _PAGE_PRESENT; .quad _PAGE_PRESENT) ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1) ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, _ASM_PTR __HYPERVISOR_VIRT_START) + ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET, _ASM_PTR 0) #endif /*CONFIG_XEN */ -- 1.5.4.1 linux-2.6-xen-0033-xen64-add-asm-offsets.patch: --- NEW FILE linux-2.6-xen-0033-xen64-add-asm-offsets.patch --- >From e9ab332e87499b85c141afc87a9f464680ed5ba6 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:45 -0700 Subject: [PATCH] xen64: add asm-offsets Add Xen vcpu_info offsets to asm-offsets_64. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/asm-offsets_64.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 0f7e1f0..aa89387 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -18,6 +18,8 @@ #include #include +#include + #define __NO_STUBS 1 #undef __SYSCALL #undef _ASM_X86_64_UNISTD_H_ @@ -134,5 +136,11 @@ int main(void) BLANK(); DEFINE(PAGE_SIZE_asm, PAGE_SIZE); +#ifdef CONFIG_XEN + BLANK(); + OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); + OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending); +#undef ENTRY +#endif return 0; } -- 1.5.4.1 linux-2.6-xen-0034-xen64-add-64-bit-assembler.patch: --- NEW FILE linux-2.6-xen-0034-xen64-add-64-bit-assembler.patch --- >From 204ac7e91e27f692a279e94041af918df342ff1c Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:46 -0700 Subject: [PATCH] xen64: add 64-bit assembler Split xen-asm into 32- and 64-bit files, and implement the 64-bit variants. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/Makefile | 2 +- arch/x86/xen/xen-asm.S | 305 --------------------------------------------- arch/x86/xen/xen-asm_32.S | 305 +++++++++++++++++++++++++++++++++++++++++++++ arch/x86/xen/xen-asm_64.S | 141 +++++++++++++++++++++ 4 files changed, 447 insertions(+), 306 deletions(-) delete mode 100644 arch/x86/xen/xen-asm.S create mode 100644 arch/x86/xen/xen-asm_32.S create mode 100644 arch/x86/xen/xen-asm_64.S diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 2ba2d16..59c1e53 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -1,4 +1,4 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o \ - time.o xen-asm.o grant-table.o suspend.o + time.o xen-asm_$(BITS).o grant-table.o suspend.o obj-$(CONFIG_SMP) += smp.o diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S deleted file mode 100644 index 2497a30..0000000 --- a/arch/x86/xen/xen-asm.S +++ /dev/null @@ -1,305 +0,0 @@ -/* - Asm versions of Xen pv-ops, suitable for either direct use or inlining. - The inline versions are the same as the direct-use versions, with the - pre- and post-amble chopped off. - - This code is encoded for size rather than absolute efficiency, - with a view to being able to inline as much as possible. - - We only bother with direct forms (ie, vcpu in pda) of the operations - here; the indirect forms are better handled in C, since they're - generally too large to inline anyway. - */ - -#include - -#include -#include -#include -#include -#include - -#include - -#define RELOC(x, v) .globl x##_reloc; x##_reloc=v -#define ENDPATCH(x) .globl x##_end; x##_end=. - -/* Pseudo-flag used for virtual NMI, which we don't implement yet */ -#define XEN_EFLAGS_NMI 0x80000000 - -/* - Enable events. This clears the event mask and tests the pending - event status with one and operation. If there are pending - events, then enter the hypervisor to get them handled. - */ -ENTRY(xen_irq_enable_direct) - /* Unmask events */ - movb $0, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask - - /* Preempt here doesn't matter because that will deal with - any pending interrupts. The pending check may end up being - run on the wrong CPU, but that doesn't hurt. */ - - /* Test for pending */ - testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending - jz 1f - -2: call check_events -1: -ENDPATCH(xen_irq_enable_direct) - ret - ENDPROC(xen_irq_enable_direct) - RELOC(xen_irq_enable_direct, 2b+1) - - -/* - Disabling events is simply a matter of making the event mask - non-zero. - */ -ENTRY(xen_irq_disable_direct) - movb $1, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask -ENDPATCH(xen_irq_disable_direct) - ret - ENDPROC(xen_irq_disable_direct) - RELOC(xen_irq_disable_direct, 0) - -/* - (xen_)save_fl is used to get the current interrupt enable status. - Callers expect the status to be in X86_EFLAGS_IF, and other bits - may be set in the return value. We take advantage of this by - making sure that X86_EFLAGS_IF has the right value (and other bits - in that byte are 0), but other bits in the return value are - undefined. We need to toggle the state of the bit, because - Xen and x86 use opposite senses (mask vs enable). - */ -ENTRY(xen_save_fl_direct) - testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask - setz %ah - addb %ah,%ah -ENDPATCH(xen_save_fl_direct) - ret - ENDPROC(xen_save_fl_direct) - RELOC(xen_save_fl_direct, 0) - - -/* - In principle the caller should be passing us a value return - from xen_save_fl_direct, but for robustness sake we test only - the X86_EFLAGS_IF flag rather than the whole byte. After - setting the interrupt mask state, it checks for unmasked - pending events and enters the hypervisor to get them delivered - if so. - */ -ENTRY(xen_restore_fl_direct) - testb $X86_EFLAGS_IF>>8, %ah - setz PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask - /* Preempt here doesn't matter because that will deal with - any pending interrupts. The pending check may end up being - run on the wrong CPU, but that doesn't hurt. */ - - /* check for unmasked and pending */ - cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending - jz 1f -2: call check_events -1: -ENDPATCH(xen_restore_fl_direct) - ret - ENDPROC(xen_restore_fl_direct) - RELOC(xen_restore_fl_direct, 2b+1) - -/* - We can't use sysexit directly, because we're not running in ring0. - But we can easily fake it up using iret. Assuming xen_sysexit - is jumped to with a standard stack frame, we can just strip it - back to a standard iret frame and use iret. - */ -ENTRY(xen_sysexit) - movl PT_EAX(%esp), %eax /* Shouldn't be necessary? */ - orl $X86_EFLAGS_IF, PT_EFLAGS(%esp) - lea PT_EIP(%esp), %esp - - jmp xen_iret -ENDPROC(xen_sysexit) - -/* - This is run where a normal iret would be run, with the same stack setup: - 8: eflags - 4: cs - esp-> 0: eip - - This attempts to make sure that any pending events are dealt - with on return to usermode, but there is a small window in - which an event can happen just before entering usermode. If - the nested interrupt ends up setting one of the TIF_WORK_MASK - pending work flags, they will not be tested again before - returning to usermode. This means that a process can end up - with pending work, which will be unprocessed until the process - enters and leaves the kernel again, which could be an - unbounded amount of time. This means that a pending signal or - reschedule event could be indefinitely delayed. - - The fix is to notice a nested interrupt in the critical - window, and if one occurs, then fold the nested interrupt into - the current interrupt stack frame, and re-process it - iteratively rather than recursively. This means that it will - exit via the normal path, and all pending work will be dealt - with appropriately. - - Because the nested interrupt handler needs to deal with the - current stack state in whatever form its in, we keep things - simple by only using a single register which is pushed/popped - on the stack. - */ -ENTRY(xen_iret) - /* test eflags for special cases */ - testl $(X86_EFLAGS_VM | XEN_EFLAGS_NMI), 8(%esp) - jnz hyper_iret - - push %eax - ESP_OFFSET=4 # bytes pushed onto stack - - /* Store vcpu_info pointer for easy access. Do it this - way to avoid having to reload %fs */ -#ifdef CONFIG_SMP - GET_THREAD_INFO(%eax) - movl TI_cpu(%eax),%eax - movl __per_cpu_offset(,%eax,4),%eax - mov per_cpu__xen_vcpu(%eax),%eax -#else - movl per_cpu__xen_vcpu, %eax -#endif - - /* check IF state we're restoring */ - testb $X86_EFLAGS_IF>>8, 8+1+ESP_OFFSET(%esp) - - /* Maybe enable events. Once this happens we could get a - recursive event, so the critical region starts immediately - afterwards. However, if that happens we don't end up - resuming the code, so we don't have to be worried about - being preempted to another CPU. */ - setz XEN_vcpu_info_mask(%eax) -xen_iret_start_crit: - - /* check for unmasked and pending */ - cmpw $0x0001, XEN_vcpu_info_pending(%eax) - - /* If there's something pending, mask events again so we - can jump back into xen_hypervisor_callback */ - sete XEN_vcpu_info_mask(%eax) - - popl %eax - - /* From this point on the registers are restored and the stack - updated, so we don't need to worry about it if we're preempted */ -iret_restore_end: - - /* Jump to hypervisor_callback after fixing up the stack. - Events are masked, so jumping out of the critical - region is OK. */ - je xen_hypervisor_callback - -1: iret -xen_iret_end_crit: -.section __ex_table,"a" - .align 4 - .long 1b,iret_exc -.previous - -hyper_iret: - /* put this out of line since its very rarely used */ - jmp hypercall_page + __HYPERVISOR_iret * 32 - - .globl xen_iret_start_crit, xen_iret_end_crit - -/* - This is called by xen_hypervisor_callback in entry.S when it sees - that the EIP at the time of interrupt was between xen_iret_start_crit - and xen_iret_end_crit. We're passed the EIP in %eax so we can do - a more refined determination of what to do. - - The stack format at this point is: - ---------------- - ss : (ss/esp may be present if we came from usermode) - esp : - eflags } outer exception info - cs } - eip } - ---------------- <- edi (copy dest) - eax : outer eax if it hasn't been restored - ---------------- - eflags } nested exception info - cs } (no ss/esp because we're nested - eip } from the same ring) - orig_eax }<- esi (copy src) - - - - - - - - - - fs } - es } - ds } SAVE_ALL state - eax } - : : - ebx }<- esp - ---------------- - - In order to deliver the nested exception properly, we need to shift - everything from the return addr up to the error code so it - sits just under the outer exception info. This means that when we - handle the exception, we do it in the context of the outer exception - rather than starting a new one. - - The only caveat is that if the outer eax hasn't been - restored yet (ie, it's still on stack), we need to insert - its value into the SAVE_ALL state before going on, since - it's usermode state which we eventually need to restore. - */ -ENTRY(xen_iret_crit_fixup) - /* - Paranoia: Make sure we're really coming from kernel space. - One could imagine a case where userspace jumps into the - critical range address, but just before the CPU delivers a GP, - it decides to deliver an interrupt instead. Unlikely? - Definitely. Easy to avoid? Yes. The Intel documents - explicitly say that the reported EIP for a bad jump is the - jump instruction itself, not the destination, but some virtual - environments get this wrong. - */ - movl PT_CS(%esp), %ecx - andl $SEGMENT_RPL_MASK, %ecx - cmpl $USER_RPL, %ecx - je 2f - - lea PT_ORIG_EAX(%esp), %esi - lea PT_EFLAGS(%esp), %edi - - /* If eip is before iret_restore_end then stack - hasn't been restored yet. */ - cmp $iret_restore_end, %eax - jae 1f - - movl 0+4(%edi),%eax /* copy EAX (just above top of frame) */ - movl %eax, PT_EAX(%esp) - - lea ESP_OFFSET(%edi),%edi /* move dest up over saved regs */ - - /* set up the copy */ -1: std - mov $PT_EIP / 4, %ecx /* saved regs up to orig_eax */ - rep movsl - cld - - lea 4(%edi),%esp /* point esp to new frame */ -2: jmp xen_do_upcall - - -/* - Force an event check by making a hypercall, - but preserve regs before making the call. - */ -check_events: - push %eax - push %ecx - push %edx - call force_evtchn_callback - pop %edx - pop %ecx - pop %eax - ret diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S new file mode 100644 index 0000000..2497a30 --- /dev/null +++ b/arch/x86/xen/xen-asm_32.S @@ -0,0 +1,305 @@ +/* + Asm versions of Xen pv-ops, suitable for either direct use or inlining. + The inline versions are the same as the direct-use versions, with the + pre- and post-amble chopped off. + + This code is encoded for size rather than absolute efficiency, + with a view to being able to inline as much as possible. + + We only bother with direct forms (ie, vcpu in pda) of the operations + here; the indirect forms are better handled in C, since they're + generally too large to inline anyway. + */ + +#include + +#include +#include +#include +#include +#include + +#include + +#define RELOC(x, v) .globl x##_reloc; x##_reloc=v +#define ENDPATCH(x) .globl x##_end; x##_end=. + +/* Pseudo-flag used for virtual NMI, which we don't implement yet */ +#define XEN_EFLAGS_NMI 0x80000000 + +/* + Enable events. This clears the event mask and tests the pending + event status with one and operation. If there are pending + events, then enter the hypervisor to get them handled. + */ +ENTRY(xen_irq_enable_direct) + /* Unmask events */ + movb $0, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask + + /* Preempt here doesn't matter because that will deal with + any pending interrupts. The pending check may end up being + run on the wrong CPU, but that doesn't hurt. */ + + /* Test for pending */ + testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending + jz 1f + +2: call check_events +1: +ENDPATCH(xen_irq_enable_direct) + ret + ENDPROC(xen_irq_enable_direct) + RELOC(xen_irq_enable_direct, 2b+1) + + +/* + Disabling events is simply a matter of making the event mask + non-zero. + */ +ENTRY(xen_irq_disable_direct) + movb $1, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask +ENDPATCH(xen_irq_disable_direct) + ret + ENDPROC(xen_irq_disable_direct) + RELOC(xen_irq_disable_direct, 0) + +/* + (xen_)save_fl is used to get the current interrupt enable status. + Callers expect the status to be in X86_EFLAGS_IF, and other bits + may be set in the return value. We take advantage of this by + making sure that X86_EFLAGS_IF has the right value (and other bits + in that byte are 0), but other bits in the return value are + undefined. We need to toggle the state of the bit, because + Xen and x86 use opposite senses (mask vs enable). + */ +ENTRY(xen_save_fl_direct) + testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask + setz %ah + addb %ah,%ah +ENDPATCH(xen_save_fl_direct) + ret + ENDPROC(xen_save_fl_direct) + RELOC(xen_save_fl_direct, 0) + + +/* + In principle the caller should be passing us a value return + from xen_save_fl_direct, but for robustness sake we test only + the X86_EFLAGS_IF flag rather than the whole byte. After + setting the interrupt mask state, it checks for unmasked + pending events and enters the hypervisor to get them delivered + if so. + */ +ENTRY(xen_restore_fl_direct) + testb $X86_EFLAGS_IF>>8, %ah + setz PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask + /* Preempt here doesn't matter because that will deal with + any pending interrupts. The pending check may end up being + run on the wrong CPU, but that doesn't hurt. */ + + /* check for unmasked and pending */ + cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending + jz 1f +2: call check_events +1: +ENDPATCH(xen_restore_fl_direct) + ret + ENDPROC(xen_restore_fl_direct) + RELOC(xen_restore_fl_direct, 2b+1) + +/* + We can't use sysexit directly, because we're not running in ring0. + But we can easily fake it up using iret. Assuming xen_sysexit + is jumped to with a standard stack frame, we can just strip it + back to a standard iret frame and use iret. + */ +ENTRY(xen_sysexit) + movl PT_EAX(%esp), %eax /* Shouldn't be necessary? */ + orl $X86_EFLAGS_IF, PT_EFLAGS(%esp) + lea PT_EIP(%esp), %esp + + jmp xen_iret +ENDPROC(xen_sysexit) + +/* + This is run where a normal iret would be run, with the same stack setup: + 8: eflags + 4: cs + esp-> 0: eip + + This attempts to make sure that any pending events are dealt + with on return to usermode, but there is a small window in + which an event can happen just before entering usermode. If + the nested interrupt ends up setting one of the TIF_WORK_MASK + pending work flags, they will not be tested again before + returning to usermode. This means that a process can end up + with pending work, which will be unprocessed until the process + enters and leaves the kernel again, which could be an + unbounded amount of time. This means that a pending signal or + reschedule event could be indefinitely delayed. + + The fix is to notice a nested interrupt in the critical + window, and if one occurs, then fold the nested interrupt into + the current interrupt stack frame, and re-process it + iteratively rather than recursively. This means that it will + exit via the normal path, and all pending work will be dealt + with appropriately. + + Because the nested interrupt handler needs to deal with the + current stack state in whatever form its in, we keep things + simple by only using a single register which is pushed/popped + on the stack. + */ +ENTRY(xen_iret) + /* test eflags for special cases */ + testl $(X86_EFLAGS_VM | XEN_EFLAGS_NMI), 8(%esp) + jnz hyper_iret + + push %eax + ESP_OFFSET=4 # bytes pushed onto stack + + /* Store vcpu_info pointer for easy access. Do it this + way to avoid having to reload %fs */ +#ifdef CONFIG_SMP + GET_THREAD_INFO(%eax) + movl TI_cpu(%eax),%eax + movl __per_cpu_offset(,%eax,4),%eax + mov per_cpu__xen_vcpu(%eax),%eax +#else + movl per_cpu__xen_vcpu, %eax +#endif + + /* check IF state we're restoring */ + testb $X86_EFLAGS_IF>>8, 8+1+ESP_OFFSET(%esp) + + /* Maybe enable events. Once this happens we could get a + recursive event, so the critical region starts immediately + afterwards. However, if that happens we don't end up + resuming the code, so we don't have to be worried about + being preempted to another CPU. */ + setz XEN_vcpu_info_mask(%eax) +xen_iret_start_crit: + + /* check for unmasked and pending */ + cmpw $0x0001, XEN_vcpu_info_pending(%eax) + + /* If there's something pending, mask events again so we + can jump back into xen_hypervisor_callback */ + sete XEN_vcpu_info_mask(%eax) + + popl %eax + + /* From this point on the registers are restored and the stack + updated, so we don't need to worry about it if we're preempted */ +iret_restore_end: + + /* Jump to hypervisor_callback after fixing up the stack. + Events are masked, so jumping out of the critical + region is OK. */ + je xen_hypervisor_callback + +1: iret +xen_iret_end_crit: +.section __ex_table,"a" + .align 4 + .long 1b,iret_exc +.previous + +hyper_iret: + /* put this out of line since its very rarely used */ + jmp hypercall_page + __HYPERVISOR_iret * 32 + + .globl xen_iret_start_crit, xen_iret_end_crit + +/* + This is called by xen_hypervisor_callback in entry.S when it sees + that the EIP at the time of interrupt was between xen_iret_start_crit + and xen_iret_end_crit. We're passed the EIP in %eax so we can do + a more refined determination of what to do. + + The stack format at this point is: + ---------------- + ss : (ss/esp may be present if we came from usermode) + esp : + eflags } outer exception info + cs } + eip } + ---------------- <- edi (copy dest) + eax : outer eax if it hasn't been restored + ---------------- + eflags } nested exception info + cs } (no ss/esp because we're nested + eip } from the same ring) + orig_eax }<- esi (copy src) + - - - - - - - - + fs } + es } + ds } SAVE_ALL state + eax } + : : + ebx }<- esp + ---------------- + + In order to deliver the nested exception properly, we need to shift + everything from the return addr up to the error code so it + sits just under the outer exception info. This means that when we + handle the exception, we do it in the context of the outer exception + rather than starting a new one. + + The only caveat is that if the outer eax hasn't been + restored yet (ie, it's still on stack), we need to insert + its value into the SAVE_ALL state before going on, since + it's usermode state which we eventually need to restore. + */ +ENTRY(xen_iret_crit_fixup) + /* + Paranoia: Make sure we're really coming from kernel space. + One could imagine a case where userspace jumps into the + critical range address, but just before the CPU delivers a GP, + it decides to deliver an interrupt instead. Unlikely? + Definitely. Easy to avoid? Yes. The Intel documents + explicitly say that the reported EIP for a bad jump is the + jump instruction itself, not the destination, but some virtual + environments get this wrong. + */ + movl PT_CS(%esp), %ecx + andl $SEGMENT_RPL_MASK, %ecx + cmpl $USER_RPL, %ecx + je 2f + + lea PT_ORIG_EAX(%esp), %esi + lea PT_EFLAGS(%esp), %edi + + /* If eip is before iret_restore_end then stack + hasn't been restored yet. */ + cmp $iret_restore_end, %eax + jae 1f + + movl 0+4(%edi),%eax /* copy EAX (just above top of frame) */ + movl %eax, PT_EAX(%esp) + + lea ESP_OFFSET(%edi),%edi /* move dest up over saved regs */ + + /* set up the copy */ +1: std + mov $PT_EIP / 4, %ecx /* saved regs up to orig_eax */ + rep movsl + cld + + lea 4(%edi),%esp /* point esp to new frame */ +2: jmp xen_do_upcall + + +/* + Force an event check by making a hypercall, + but preserve regs before making the call. + */ +check_events: + push %eax + push %ecx + push %edx + call force_evtchn_callback + pop %edx + pop %ecx + pop %eax + ret diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S new file mode 100644 index 0000000..4ec1082 --- /dev/null +++ b/arch/x86/xen/xen-asm_64.S @@ -0,0 +1,141 @@ +/* + Asm versions of Xen pv-ops, suitable for either direct use or inlining. + The inline versions are the same as the direct-use versions, with the + pre- and post-amble chopped off. + + This code is encoded for size rather than absolute efficiency, + with a view to being able to inline as much as possible. + + We only bother with direct forms (ie, vcpu in pda) of the operations + here; the indirect forms are better handled in C, since they're + generally too large to inline anyway. + */ + +#include + +#include +#include + +#include + +#define RELOC(x, v) .globl x##_reloc; x##_reloc=v +#define ENDPATCH(x) .globl x##_end; x##_end=. + +/* Pseudo-flag used for virtual NMI, which we don't implement yet */ +#define XEN_EFLAGS_NMI 0x80000000 + +#if 0 +#include + +/* + Enable events. This clears the event mask and tests the pending + event status with one and operation. If there are pending + events, then enter the hypervisor to get them handled. + */ +ENTRY(xen_irq_enable_direct) + /* Unmask events */ + movb $0, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask) + + /* Preempt here doesn't matter because that will deal with + any pending interrupts. The pending check may end up being + run on the wrong CPU, but that doesn't hurt. */ + + /* Test for pending */ + testb $0xff, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_pending) + jz 1f + +2: call check_events +1: +ENDPATCH(xen_irq_enable_direct) + ret + ENDPROC(xen_irq_enable_direct) + RELOC(xen_irq_enable_direct, 2b+1) + +/* + Disabling events is simply a matter of making the event mask + non-zero. + */ +ENTRY(xen_irq_disable_direct) + movb $1, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask) +ENDPATCH(xen_irq_disable_direct) + ret + ENDPROC(xen_irq_disable_direct) + RELOC(xen_irq_disable_direct, 0) + +/* + (xen_)save_fl is used to get the current interrupt enable status. + Callers expect the status to be in X86_EFLAGS_IF, and other bits + may be set in the return value. We take advantage of this by + making sure that X86_EFLAGS_IF has the right value (and other bits + in that byte are 0), but other bits in the return value are + undefined. We need to toggle the state of the bit, because + Xen and x86 use opposite senses (mask vs enable). + */ +ENTRY(xen_save_fl_direct) + testb $0xff, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask) + setz %ah + addb %ah,%ah +ENDPATCH(xen_save_fl_direct) + ret + ENDPROC(xen_save_fl_direct) + RELOC(xen_save_fl_direct, 0) + +/* + In principle the caller should be passing us a value return + from xen_save_fl_direct, but for robustness sake we test only + the X86_EFLAGS_IF flag rather than the whole byte. After + setting the interrupt mask state, it checks for unmasked + pending events and enters the hypervisor to get them delivered + if so. + */ +ENTRY(xen_restore_fl_direct) + testb $X86_EFLAGS_IF>>8, %ah + setz PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_mask) + /* Preempt here doesn't matter because that will deal with + any pending interrupts. The pending check may end up being + run on the wrong CPU, but that doesn't hurt. */ + + /* check for unmasked and pending */ + cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info, XEN_vcpu_info_pending) + jz 1f +2: call check_events +1: +ENDPATCH(xen_restore_fl_direct) + ret + ENDPROC(xen_restore_fl_direct) + RELOC(xen_restore_fl_direct, 2b+1) + + +/* + Force an event check by making a hypercall, + but preserve regs before making the call. + */ +check_events: + push %rax + push %rcx + push %rdx + push %rsi + push %rdi + push %r8 + push %r9 + push %r10 + push %r11 + call force_evtchn_callback + pop %r11 + pop %r10 + pop %r9 + pop %r8 + pop %rdi + pop %rsi + pop %rdx + pop %rcx + pop %rax + ret +#endif + +ENTRY(xen_iret) + pushq $0 + jmp hypercall_page + __HYPERVISOR_iret * 32 + +ENTRY(xen_sysexit) + ud2a -- 1.5.4.1 linux-2.6-xen-0035-xen64-use-set_fixmap-for-shared_info-structure.patch: --- NEW FILE linux-2.6-xen-0035-xen64-use-set_fixmap-for-shared_info-structure.patch --- >From 2353cb096f5f12979c63b20f2c0ac3ba73d9b431 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:47 -0700 Subject: [PATCH] xen64: use set_fixmap for shared_info structure Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index b7dde92..50092fa 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -920,18 +920,11 @@ static __init void xen_pagetable_setup_start(pgd_t *base) void xen_setup_shared_info(void) { if (!xen_feature(XENFEAT_auto_translated_physmap)) { - unsigned long addr = fix_to_virt(FIX_PARAVIRT_BOOTMAP); - - /* - * Create a mapping for the shared info page. - * Should be set_fixmap(), but shared_info is a machine - * address with no corresponding pseudo-phys address. - */ - set_pte_mfn(addr, - PFN_DOWN(xen_start_info->shared_info), - PAGE_KERNEL); - - HYPERVISOR_shared_info = (struct shared_info *)addr; + set_fixmap(FIX_PARAVIRT_BOOTMAP, + xen_start_info->shared_info); + + HYPERVISOR_shared_info = + (struct shared_info *)fix_to_virt(FIX_PARAVIRT_BOOTMAP); } else HYPERVISOR_shared_info = (struct shared_info *)__va(xen_start_info->shared_info); @@ -1068,8 +1061,13 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot) #ifdef CONFIG_X86_F00F_BUG case FIX_F00F_IDT: #endif +#ifdef CONFIG_X86_32 case FIX_WP_TEST: case FIX_VDSO: + case FIX_KMAP_BEGIN ... FIX_KMAP_END: +#else + case VSYSCALL_LAST_PAGE ... VSYSCALL_FIRST_PAGE: +#endif #ifdef CONFIG_X86_LOCAL_APIC case FIX_APIC_BASE: /* maps dummy local APIC */ #endif -- 1.5.4.1 linux-2.6-xen-0036-xen-cpu_detect-is-32-bit-only.patch: --- NEW FILE linux-2.6-xen-0036-xen-cpu_detect-is-32-bit-only.patch --- >From b8c895e9ca5e787e6782d4af1d1ea89775940330 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:48 -0700 Subject: [PATCH] xen: cpu_detect is 32-bit only Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 50092fa..c420697 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1386,12 +1386,12 @@ asmlinkage void __init xen_start_kernel(void) /* set the limit of our address space */ xen_reserve_top(); +#ifdef CONFIG_X86_32 /* set up basic CPUID stuff */ cpu_detect(&new_cpu_data); -#ifdef CONFIG_X86_32 new_cpu_data.hard_math = 1; -#endif new_cpu_data.x86_capability[0] = cpuid_edx(1); +#endif /* Poke various useful things into boot_params */ boot_params.hdr.type_of_loader = (9 << 4) | 0; -- 1.5.4.1 linux-2.6-xen-0037-xen64-add-hypervisor-callbacks-for-events-etc.patch: --- NEW FILE linux-2.6-xen-0037-xen64-add-hypervisor-callbacks-for-events-etc.patch --- >From 75d6eb01b579e6b5e34dc6b79d88b44f7075be30 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:49 -0700 Subject: [PATCH] xen64: add hypervisor callbacks for events, etc Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index ae63e58..7cc2de7 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1312,3 +1312,101 @@ KPROBE_ENTRY(ignore_sysret) sysret CFI_ENDPROC ENDPROC(ignore_sysret) + +#ifdef CONFIG_XEN +ENTRY(xen_hypervisor_callback) + zeroentry xen_do_hypervisor_callback +END(xen_hypervisor_callback) + +/* +# A note on the "critical region" in our callback handler. +# We want to avoid stacking callback handlers due to events occurring +# during handling of the last event. To do this, we keep events disabled +# until we've done all processing. HOWEVER, we must enable events before +# popping the stack frame (can't be done atomically) and so it would still +# be possible to get enough handler activations to overflow the stack. +# Although unlikely, bugs of that kind are hard to track down, so we'd +# like to avoid the possibility. +# So, on entry to the handler we detect whether we interrupted an +# existing activation in its critical region -- if so, we pop the current +# activation and restart the handler using the previous one. +*/ +ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) + CFI_STARTPROC +/* Since we don't modify %rdi, evtchn_do_upall(struct *pt_regs) will + see the correct pointer to the pt_regs */ + movq %rdi, %rsp # we don't return, adjust the stack frame + CFI_ENDPROC + CFI_DEFAULT_STACK +11: incl %gs:pda_irqcount + movq %rsp,%rbp + CFI_DEF_CFA_REGISTER rbp + cmovzq %gs:pda_irqstackptr,%rsp + pushq %rbp # backlink for old unwinder + call xen_evtchn_do_upcall + popq %rsp + CFI_DEF_CFA_REGISTER rsp + decl %gs:pda_irqcount + jmp error_exit + CFI_ENDPROC +END(do_hypervisor_callback) + +/* +# Hypervisor uses this for application faults while it executes. +# We get here for two reasons: +# 1. Fault while reloading DS, ES, FS or GS +# 2. Fault while executing IRET +# Category 1 we do not need to fix up as Xen has already reloaded all segment +# registers that could be reloaded and zeroed the others. +# Category 2 we fix up by killing the current process. We cannot use the +# normal Linux return path in this case because if we use the IRET hypercall +# to pop the stack frame we end up in an infinite loop of failsafe callbacks. +# We distinguish between categories by comparing each saved segment register +# with its current contents: any discrepancy means we in category 1. +*/ +ENTRY(xen_failsafe_callback) +#if 1 + ud2a +#else + _frame (RIP-0x30) + CFI_REL_OFFSET rcx, 0 + CFI_REL_OFFSET r11, 8 + movw %ds,%cx + cmpw %cx,0x10(%rsp) + CFI_REMEMBER_STATE + jne 1f + movw %es,%cx + cmpw %cx,0x18(%rsp) + jne 1f + movw %fs,%cx + cmpw %cx,0x20(%rsp) + jne 1f + movw %gs,%cx + cmpw %cx,0x28(%rsp) + jne 1f + /* All segments match their saved values => Category 2 (Bad IRET). */ + movq (%rsp),%rcx + CFI_RESTORE rcx + movq 8(%rsp),%r11 + CFI_RESTORE r11 + addq $0x30,%rsp + CFI_ADJUST_CFA_OFFSET -0x30 + movq $11,%rdi /* SIGSEGV */ + jmp do_exit + CFI_RESTORE_STATE +1: /* Segment mismatch => Category 1 (Bad segment). Retry the IRET. */ + movq (%rsp),%rcx + CFI_RESTORE rcx + movq 8(%rsp),%r11 + CFI_RESTORE r11 + addq $0x30,%rsp + CFI_ADJUST_CFA_OFFSET -0x30 + pushq $0 + CFI_ADJUST_CFA_OFFSET 8 + SAVE_ALL + jmp error_exit + CFI_ENDPROC +#endif +END(xen_failsafe_callback) + +#endif /* CONFIG_XEN */ -- 1.5.4.1 linux-2.6-xen-0038-xen64-early-mapping-setup.patch: --- NEW FILE linux-2.6-xen-0038-xen64-early-mapping-setup.patch --- >From 7f85fc54fc45fed6c96cb749df5e3f7427262c10 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:50 -0700 Subject: [PATCH] xen64: early mapping setup Set up the initial pagetables to map the kernel mapping into the physical mapping space. This makes __va() usable, since it requires physical mappings. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 192 ++++++++++++++++++++++++++++++++++++++---- include/asm-x86/pgtable_64.h | 2 + 2 files changed, 178 insertions(+), 16 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index c420697..60e3a28 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -1315,6 +1316,157 @@ static void __init xen_reserve_top(void) #endif /* CONFIG_X86_32 */ } +#ifdef CONFIG_X86_64 +/* + * Like __va(), but returns address in the kernel mapping (which is + * all we have until the physical memory mapping has been set up. + */ +static void *__ka(phys_addr_t paddr) +{ + return (void *)(paddr + __START_KERNEL_map); +} + +/* Convert a machine address to physical address */ +static unsigned long m2p(phys_addr_t maddr) +{ + phys_addr_t paddr; + + maddr &= PTE_MASK; + paddr = mfn_to_pfn(maddr >> PAGE_SHIFT) << PAGE_SHIFT; + + return paddr; +} + +/* Convert a machine address to kernel virtual */ +static void *m2v(phys_addr_t maddr) +{ + return __ka(m2p(maddr)); +} + +static void walk(pgd_t *pgd, unsigned long addr) +{ + unsigned l4idx = pgd_index(addr); + unsigned l3idx = pud_index(addr); + unsigned l2idx = pmd_index(addr); + unsigned l1idx = pte_index(addr); + pgd_t l4; + pud_t l3; + pmd_t l2; + pte_t l1; + + xen_raw_printk("walk %p, %lx -> %d %d %d %d\n", + pgd, addr, l4idx, l3idx, l2idx, l1idx); + + l4 = pgd[l4idx]; + xen_raw_printk(" l4: %016lx\n", l4.pgd); + xen_raw_printk(" %016lx\n", pgd_val(l4)); + + l3 = ((pud_t *)(m2v(l4.pgd)))[l3idx]; + xen_raw_printk(" l3: %016lx\n", l3.pud); + xen_raw_printk(" %016lx\n", pud_val(l3)); + + l2 = ((pmd_t *)(m2v(l3.pud)))[l2idx]; + xen_raw_printk(" l2: %016lx\n", l2.pmd); + xen_raw_printk(" %016lx\n", pmd_val(l2)); + + l1 = ((pte_t *)(m2v(l2.pmd)))[l1idx]; + xen_raw_printk(" l1: %016lx\n", l1.pte); + xen_raw_printk(" %016lx\n", pte_val(l1)); +} + +static void set_page_prot(void *addr, pgprot_t prot) +{ + unsigned long pfn = __pa(addr) >> PAGE_SHIFT; + pte_t pte = pfn_pte(pfn, prot); + + xen_raw_printk("addr=%p pfn=%lx mfn=%lx prot=%016x pte=%016x\n", + addr, pfn, get_phys_to_machine(pfn), + pgprot_val(prot), pte.pte); + + if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, 0)) + BUG(); +} + +static void convert_pfn_mfn(void *v) +{ + pte_t *pte = v; + int i; + + /* All levels are converted the same way, so just treat them + as ptes. */ + for(i = 0; i < PTRS_PER_PTE; i++) + pte[i] = xen_make_pte(pte[i].pte); +} + +/* + * Set up the inital kernel pagetable. + * + * We can construct this by grafting the Xen provided pagetable into + * head_64.S's preconstructed pagetables. We copy the Xen L2's into + * level2_ident_pgt, level2_kernel_pgt and level2_fixmap_pgt. This + * means that only the kernel has a physical mapping to start with - + * but that's enough to get __va working. We need to fill in the rest + * of the physical mapping once some sort of allocator has been set + * up. + */ +static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd) +{ + pud_t *l3; + pmd_t *l2; + + /* Zap identity mapping */ + init_level4_pgt[0] = __pgd(0); + + /* Pre-constructed entries are in pfn, so convert to mfn */ + convert_pfn_mfn(init_level4_pgt); + convert_pfn_mfn(level3_ident_pgt); + convert_pfn_mfn(level3_kernel_pgt); + + l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); + l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); + + memcpy(level2_ident_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); + memcpy(level2_kernel_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); + + l3 = m2v(pgd[pgd_index(__START_KERNEL_map + PMD_SIZE)].pgd); + l2 = m2v(l3[pud_index(__START_KERNEL_map + PMD_SIZE)].pud); + memcpy(level2_fixmap_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); + + /* Make pagetable pieces RO */ + set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); + set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); + set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); + set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO); + set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); + set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); + + /* Pin down new L4 */ + pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa(init_level4_pgt))); + + /* Unpin Xen-provided one */ + pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); + + /* Switch over */ + pgd = init_level4_pgt; + xen_write_cr3(__pa(pgd)); + + max_pfn_mapped = PFN_DOWN(__pa(pgd) + + xen_start_info->nr_pt_frames*PAGE_SIZE + + 512*1024); + + return pgd; +} +#else +static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd) +{ + init_pg_tables_start = __pa(pgd); + init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; + max_pfn_mapped = PFN_DOWN(init_pg_tables_end + 512*1024); + + return pgd; +} +#endif /* CONFIG_X86_64 */ + /* First C function to be called on Xen boot */ asmlinkage void __init xen_start_kernel(void) { @@ -1357,32 +1509,29 @@ asmlinkage void __init xen_start_kernel(void) pgd = (pgd_t *)xen_start_info->pt_base; -#ifdef CONFIG_X86_32 - init_pg_tables_start = __pa(pgd); - init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; - max_pfn_mapped = (init_pg_tables_end + 512*1024) >> PAGE_SHIFT; -#endif + /* Prevent unwanted bits from being set in PTEs. */ + __supported_pte_mask &= ~_PAGE_GLOBAL; + if (!is_initial_xendomain()) + __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD); + + /* Don't do the full vcpu_info placement stuff until we have a + possible map and a non-dummy shared_info. */ + per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; + + xen_raw_console_write("mapping kernel into physical memory\n"); + pgd = xen_setup_kernel_pagetable(pgd); - init_mm.pgd = pgd; /* use the Xen pagetables to start */ + init_mm.pgd = pgd; /* keep using Xen gdt for now; no urgent need to change it */ x86_write_percpu(xen_cr3, __pa(pgd)); x86_write_percpu(xen_current_cr3, __pa(pgd)); - /* Don't do the full vcpu_info placement stuff until we have a - possible map and a non-dummy shared_info. */ - per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; - pv_info.kernel_rpl = 1; if (xen_feature(XENFEAT_supervisor_mode_kernel)) pv_info.kernel_rpl = 0; - /* Prevent unwanted bits from being set in PTEs. */ - __supported_pte_mask &= ~_PAGE_GLOBAL; - if (!is_initial_xendomain()) - __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD); - /* set the limit of our address space */ xen_reserve_top(); @@ -1405,10 +1554,21 @@ asmlinkage void __init xen_start_kernel(void) add_preferred_console("hvc", 0, NULL); } + xen_raw_console_write("about to get started...\n"); + +#if 0 + xen_raw_printk("&boot_params=%p __pa(&boot_params)=%lx __va(__pa(&boot_params))=%lx\n", + &boot_params, __pa_symbol(&boot_params), + __va(__pa_symbol(&boot_params))); + + walk(pgd, &boot_params); + walk(pgd, __va(__pa(&boot_params))); +#endif + /* Start the world */ #ifdef CONFIG_X86_32 i386_start_kernel(); #else - x86_64_start_kernel((char *)&boot_params); + x86_64_start_reservations((char *)__pa_symbol(&boot_params)); #endif } diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index fa7208b..805d312 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h @@ -16,6 +16,8 @@ extern pud_t level3_kernel_pgt[512]; extern pud_t level3_ident_pgt[512]; extern pmd_t level2_kernel_pgt[512]; +extern pmd_t level2_fixmap_pgt[512]; +extern pmd_t level2_ident_pgt[512]; extern pgd_t init_level4_pgt[]; #define swapper_pg_dir init_level4_pgt -- 1.5.4.1 linux-2.6-xen-0039-xen64-64-bit-starts-using-set_pte-from-very-early.patch: --- NEW FILE linux-2.6-xen-0039-xen64-64-bit-starts-using-set_pte-from-very-early.patch --- >From 68b00b92bd4d76443d38b4bf9ff019c53aa1b248 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:51 -0700 Subject: [PATCH] xen64: 64-bit starts using set_pte from very early It also doesn't need the 32-bit hack version of set_pte for initial pagetable construction, so just make it use the real thing. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 60e3a28..85c095f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1215,7 +1215,11 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { .kmap_atomic_pte = xen_kmap_atomic_pte, #endif +#ifdef CONFIG_X86_64 + .set_pte = xen_set_pte, +#else .set_pte = xen_set_pte_init, +#endif .set_pte_at = xen_set_pte_at, .set_pmd = xen_set_pmd_hyper, -- 1.5.4.1 linux-2.6-xen-0040-xen64-map-an-initial-chunk-of-physical-memory.patch: --- NEW FILE linux-2.6-xen-0040-xen64-map-an-initial-chunk-of-physical-memory.patch --- >From 4fab383329cf6a1b6e6064c241188d476434890c Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:52 -0700 Subject: [PATCH] xen64: map an initial chunk of physical memory Early in boot, map a chunk of extra physical memory for use later on. We need a pool of mapped pages to allocate further pages to construct pagetables mapping all physical memory. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 79 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 69 insertions(+), 10 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 85c095f..0abb337 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1403,6 +1403,61 @@ static void convert_pfn_mfn(void *v) } /* + * Identity map, in addition to plain kernel map. This needs to be + * large enough to allocate page table pages to allocate the rest. + * Each page can map 2MB. + */ +static pte_t level1_ident_pgt[PTRS_PER_PTE * 4] __page_aligned_bss; + +static __init void xen_map_identity_early(unsigned long max_pfn) +{ + unsigned pmdidx, pteidx; + unsigned ident_pte; + unsigned long pfn; + + ident_pte = 0; + pfn = 0; + for(pmdidx = 0; pmdidx < PTRS_PER_PMD && pfn < max_pfn; pmdidx++) { + pte_t *pte_page; + + BUG_ON(level2_ident_pgt[pmdidx].pmd != level2_kernel_pgt[pmdidx].pmd); + + /* Reuse or allocate a page of ptes */ + if (pmd_present(level2_ident_pgt[pmdidx])) + pte_page = m2v(level2_ident_pgt[pmdidx].pmd); + else { + /* Check for free pte pages */ + if (ident_pte == ARRAY_SIZE(level1_ident_pgt)) + break; + + pte_page = &level1_ident_pgt[ident_pte]; + ident_pte += PTRS_PER_PTE; + + /* Install new l1 in l2(s) */ + level2_ident_pgt[pmdidx] = __pmd(__pa(pte_page) | _PAGE_TABLE); + level2_kernel_pgt[pmdidx] = level2_ident_pgt[pmdidx]; + } + + /* Install mappings */ + for(pteidx = 0; pteidx < PTRS_PER_PTE; pteidx++, pfn++) { + pte_t pte; + + if (pfn > max_pfn_mapped) + max_pfn_mapped = pfn; + + if (!pte_none(pte_page[pteidx])) + continue; + + pte = pfn_pte(pfn, PAGE_KERNEL_EXEC); + pte_page[pteidx] = pte; + } + } + + for(pteidx = 0; pteidx < ident_pte; pteidx += PTRS_PER_PTE) + set_page_prot(&level1_ident_pgt[pteidx], PAGE_KERNEL_RO); +} + +/* * Set up the inital kernel pagetable. * * We can construct this by grafting the Xen provided pagetable into @@ -1413,7 +1468,7 @@ static void convert_pfn_mfn(void *v) * of the physical mapping once some sort of allocator has been set * up. */ -static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd) +static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) { pud_t *l3; pmd_t *l2; @@ -1436,6 +1491,9 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd) l2 = m2v(l3[pud_index(__START_KERNEL_map + PMD_SIZE)].pud); memcpy(level2_fixmap_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); + /* Set up identity map */ + xen_map_identity_early(max_pfn); + /* Make pagetable pieces RO */ set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); @@ -1445,7 +1503,7 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd) set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); /* Pin down new L4 */ - pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa(init_level4_pgt))); + pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa_symbol(init_level4_pgt))); /* Unpin Xen-provided one */ pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); @@ -1454,19 +1512,23 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd) pgd = init_level4_pgt; xen_write_cr3(__pa(pgd)); - max_pfn_mapped = PFN_DOWN(__pa(pgd) + - xen_start_info->nr_pt_frames*PAGE_SIZE + - 512*1024); + reserve_early(__pa(xen_start_info->pt_base), + __pa(xen_start_info->pt_base + + xen_start_info->nr_pt_frames * PAGE_SIZE), + "XEN PAGETABLES"); return pgd; } #else -static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd) +static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) { init_pg_tables_start = __pa(pgd); init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; max_pfn_mapped = PFN_DOWN(init_pg_tables_end + 512*1024); + x86_write_percpu(xen_cr3, __pa(pgd)); + x86_write_percpu(xen_current_cr3, __pa(pgd)); + return pgd; } #endif /* CONFIG_X86_64 */ @@ -1523,15 +1585,12 @@ asmlinkage void __init xen_start_kernel(void) per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; xen_raw_console_write("mapping kernel into physical memory\n"); - pgd = xen_setup_kernel_pagetable(pgd); + pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages); init_mm.pgd = pgd; /* keep using Xen gdt for now; no urgent need to change it */ - x86_write_percpu(xen_cr3, __pa(pgd)); - x86_write_percpu(xen_current_cr3, __pa(pgd)); - pv_info.kernel_rpl = 1; if (xen_feature(XENFEAT_supervisor_mode_kernel)) pv_info.kernel_rpl = 0; -- 1.5.4.1 linux-2.6-xen-0041-xen32-create-initial-mappings-like-64-bit.patch: --- NEW FILE linux-2.6-xen-0041-xen32-create-initial-mappings-like-64-bit.patch --- >From e6d507c7644b8d338f4690c090cf423bcf74b2ce Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:53 -0700 Subject: [PATCH] xen32: create initial mappings like 64-bit Rearrange the pagetable initialization to share code with the 64-bit kernel. Rather than deferring anything to pagetable_setup_start, just set up an initial pagetable in swapper_pg_dir early at startup, and create an additional 8MB of physical memory mappings. This matches the native head_32.S mappings to a large degree, and allows the rest of the pagetable setup to continue without much Xen vs. native difference. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 130 ++++++++++++++++++--------------------------- 1 files changed, 52 insertions(+), 78 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 0abb337..f154f71 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -872,50 +872,6 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) static __init void xen_pagetable_setup_start(pgd_t *base) { -#ifdef CONFIG_X86_32 - pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; - int i; - - init_mm.pgd = base; - /* - * copy top-level of Xen-supplied pagetable into place. This - * is a stand-in while we copy the pmd pages. - */ - memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t)); - - /* - * For PAE, need to allocate new pmds, rather than - * share Xen's, since Xen doesn't like pmd's being - * shared between address spaces. - */ - for (i = 0; i < PTRS_PER_PGD; i++) { - if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) { - pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); - - memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]), - PAGE_SIZE); - - make_lowmem_page_readonly(pmd); - - set_pgd(&base[i], __pgd(1 + __pa(pmd))); - } else - pgd_clear(&base[i]); - } - - /* make sure zero_page is mapped RO so we can use it in pagetables */ - make_lowmem_page_readonly(empty_zero_page); - make_lowmem_page_readonly(base); - /* - * Switch to new pagetable. This is done before - * pagetable_init has done anything so that the new pages - * added to the table can be prepared properly for Xen. - */ - xen_write_cr3(__pa(base)); - - /* Unpin initial Xen pagetable */ - pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, - PFN_DOWN(__pa(xen_start_info->pt_base))); -#endif /* CONFIG_X86_32 */ } void xen_setup_shared_info(void) @@ -954,12 +910,6 @@ static __init void xen_pagetable_setup_done(pgd_t *base) pv_mmu_ops.set_pte = xen_set_pte; xen_setup_shared_info(); - -#ifdef CONFIG_X86_32 - /* Actually pin the pagetable down, but we can't set PG_pinned - yet because the page structures don't exist yet. */ - pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); -#endif } static __init void xen_post_allocator_init(void) @@ -1320,14 +1270,17 @@ static void __init xen_reserve_top(void) #endif /* CONFIG_X86_32 */ } -#ifdef CONFIG_X86_64 /* * Like __va(), but returns address in the kernel mapping (which is * all we have until the physical memory mapping has been set up. */ static void *__ka(phys_addr_t paddr) { +#ifdef CONFIG_X86_64 return (void *)(paddr + __START_KERNEL_map); +#else + return __va(paddr); +#endif } /* Convert a machine address to physical address */ @@ -1347,6 +1300,7 @@ static void *m2v(phys_addr_t maddr) return __ka(m2p(maddr)); } +#ifdef CONFIG_X86_64 static void walk(pgd_t *pgd, unsigned long addr) { unsigned l4idx = pgd_index(addr); @@ -1377,13 +1331,14 @@ static void walk(pgd_t *pgd, unsigned long addr) xen_raw_printk(" l1: %016lx\n", l1.pte); xen_raw_printk(" %016lx\n", pte_val(l1)); } +#endif static void set_page_prot(void *addr, pgprot_t prot) { unsigned long pfn = __pa(addr) >> PAGE_SHIFT; pte_t pte = pfn_pte(pfn, prot); - xen_raw_printk("addr=%p pfn=%lx mfn=%lx prot=%016x pte=%016x\n", + xen_raw_printk("addr=%p pfn=%lx mfn=%lx prot=%016llx pte=%016llx\n", addr, pfn, get_phys_to_machine(pfn), pgprot_val(prot), pte.pte); @@ -1391,17 +1346,6 @@ static void set_page_prot(void *addr, pgprot_t prot) BUG(); } -static void convert_pfn_mfn(void *v) -{ - pte_t *pte = v; - int i; - - /* All levels are converted the same way, so just treat them - as ptes. */ - for(i = 0; i < PTRS_PER_PTE; i++) - pte[i] = xen_make_pte(pte[i].pte); -} - /* * Identity map, in addition to plain kernel map. This needs to be * large enough to allocate page table pages to allocate the rest. @@ -1409,7 +1353,7 @@ static void convert_pfn_mfn(void *v) */ static pte_t level1_ident_pgt[PTRS_PER_PTE * 4] __page_aligned_bss; -static __init void xen_map_identity_early(unsigned long max_pfn) +static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) { unsigned pmdidx, pteidx; unsigned ident_pte; @@ -1420,11 +1364,9 @@ static __init void xen_map_identity_early(unsigned long max_pfn) for(pmdidx = 0; pmdidx < PTRS_PER_PMD && pfn < max_pfn; pmdidx++) { pte_t *pte_page; - BUG_ON(level2_ident_pgt[pmdidx].pmd != level2_kernel_pgt[pmdidx].pmd); - /* Reuse or allocate a page of ptes */ - if (pmd_present(level2_ident_pgt[pmdidx])) - pte_page = m2v(level2_ident_pgt[pmdidx].pmd); + if (pmd_present(pmd[pmdidx])) + pte_page = m2v(pmd[pmdidx].pmd); else { /* Check for free pte pages */ if (ident_pte == ARRAY_SIZE(level1_ident_pgt)) @@ -1433,9 +1375,7 @@ static __init void xen_map_identity_early(unsigned long max_pfn) pte_page = &level1_ident_pgt[ident_pte]; ident_pte += PTRS_PER_PTE; - /* Install new l1 in l2(s) */ - level2_ident_pgt[pmdidx] = __pmd(__pa(pte_page) | _PAGE_TABLE); - level2_kernel_pgt[pmdidx] = level2_ident_pgt[pmdidx]; + pmd[pmdidx] = __pmd(__pa(pte_page) | _PAGE_TABLE); } /* Install mappings */ @@ -1455,6 +1395,20 @@ static __init void xen_map_identity_early(unsigned long max_pfn) for(pteidx = 0; pteidx < ident_pte; pteidx += PTRS_PER_PTE) set_page_prot(&level1_ident_pgt[pteidx], PAGE_KERNEL_RO); + + set_page_prot(pmd, PAGE_KERNEL_RO); +} + +#ifdef CONFIG_X86_64 +static void convert_pfn_mfn(void *v) +{ + pte_t *pte = v; + int i; + + /* All levels are converted the same way, so just treat them + as ptes. */ + for(i = 0; i < PTRS_PER_PTE; i++) + pte[i] = xen_make_pte(pte[i].pte); } /* @@ -1492,18 +1446,18 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pf memcpy(level2_fixmap_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); /* Set up identity map */ - xen_map_identity_early(max_pfn); + xen_map_identity_early(level2_ident_pgt, max_pfn); /* Make pagetable pieces RO */ set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); - set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); /* Pin down new L4 */ - pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa_symbol(init_level4_pgt))); + pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, + PFN_DOWN(__pa_symbol(init_level4_pgt))); /* Unpin Xen-provided one */ pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); @@ -1519,17 +1473,37 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pf return pgd; } -#else +#else /* !CONFIG_X86_64 */ +static pmd_t level2_kernel_pgt[PTRS_PER_PMD] __page_aligned_bss; + static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) { + pmd_t *kernel_pmd; + init_pg_tables_start = __pa(pgd); init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; max_pfn_mapped = PFN_DOWN(init_pg_tables_end + 512*1024); - x86_write_percpu(xen_cr3, __pa(pgd)); - x86_write_percpu(xen_current_cr3, __pa(pgd)); + kernel_pmd = m2v(pgd[KERNEL_PGD_BOUNDARY].pgd); + memcpy(level2_kernel_pgt, kernel_pmd, sizeof(pmd_t) * PTRS_PER_PMD); - return pgd; + xen_map_identity_early(level2_kernel_pgt, max_pfn); + + memcpy(swapper_pg_dir, pgd, sizeof(pgd_t) * PTRS_PER_PGD); + set_pgd(&swapper_pg_dir[KERNEL_PGD_BOUNDARY], + __pgd(__pa(level2_kernel_pgt) | _PAGE_PRESENT)); + + set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); + set_page_prot(swapper_pg_dir, PAGE_KERNEL_RO); + set_page_prot(empty_zero_page, PAGE_KERNEL_RO); + + pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); + + xen_write_cr3(__pa(swapper_pg_dir)); + + pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(swapper_pg_dir))); + + return swapper_pg_dir; } #endif /* CONFIG_X86_64 */ -- 1.5.4.1 linux-2.6-xen-0042-xen-fix-truncation-of-machine-address.patch: --- NEW FILE linux-2.6-xen-0042-xen-fix-truncation-of-machine-address.patch --- >From 569b42481af33a99bbbf9c5ebf4612cc704344a1 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:54 -0700 Subject: [PATCH] xen: fix truncation of machine address arbitrary_virt_to_machine can truncate a machine address if its above 4G. Cast the problem away. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/mmu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 2579e70..05d7392 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -186,7 +186,7 @@ xmaddr_t arbitrary_virt_to_machine(unsigned long address) BUG_ON(pte == NULL); - return XMADDR((pte_mfn(*pte) << PAGE_SHIFT) + offset); + return XMADDR(((phys_addr_t)pte_mfn(*pte) << PAGE_SHIFT) + offset); } void make_lowmem_page_readonly(void *vaddr) -- 1.5.4.1 linux-2.6-xen-0043-xen64-use-arbitrary_virt_to_machine-for-xen_set_pmd.patch: --- NEW FILE linux-2.6-xen-0043-xen64-use-arbitrary_virt_to_machine-for-xen_set_pmd.patch --- >From da868c49c8ae9b8c89106eca03cf41d36d14d0c1 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:55 -0700 Subject: [PATCH] xen64: use arbitrary_virt_to_machine for xen_set_pmd When building initial pagetables in 64-bit kernel the pud/pmd pointer may be in ioremap/fixmap space, so we need to walk the pagetable to look up the physical address. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/mmu.c | 9 ++++++--- include/asm-x86/xen/page.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 05d7392..a8f0232 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -178,8 +178,9 @@ void set_phys_to_machine(unsigned long pfn, unsigned long mfn) p2m_top[topidx][idx] = mfn; } -xmaddr_t arbitrary_virt_to_machine(unsigned long address) +xmaddr_t arbitrary_virt_to_machine(void *vaddr) { + unsigned long address = (unsigned long)vaddr; unsigned int level; pte_t *pte = lookup_address(address, &level); unsigned offset = address & ~PAGE_MASK; @@ -253,7 +254,8 @@ void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val) xen_mc_batch(); - u.ptr = virt_to_machine(ptr).maddr; + /* ptr may be ioremapped for 64-bit pagetable setup */ + u.ptr = arbitrary_virt_to_machine(ptr).maddr; u.val = pmd_val_ma(val); extend_mmu_update(&u); @@ -415,7 +417,8 @@ void xen_set_pud_hyper(pud_t *ptr, pud_t val) xen_mc_batch(); - u.ptr = virt_to_machine(ptr).maddr; + /* ptr may be ioremapped for 64-bit pagetable setup */ + u.ptr = arbitrary_virt_to_machine(ptr).maddr; u.val = pud_val_ma(val); extend_mmu_update(&u); diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h index a40be65..05e678a 100644 --- a/include/asm-x86/xen/page.h +++ b/include/asm-x86/xen/page.h @@ -158,7 +158,7 @@ static inline pte_t __pte_ma(pteval_t x) #define pgd_val_ma(x) ((x).pgd) -xmaddr_t arbitrary_virt_to_machine(unsigned long address); +xmaddr_t arbitrary_virt_to_machine(void *address); void make_lowmem_page_readonly(void *vaddr); void make_lowmem_page_readwrite(void *vaddr); -- 1.5.4.1 linux-2.6-xen-0044-xen-set-num_processors.patch: --- NEW FILE linux-2.6-xen-0044-xen-set-num_processors.patch --- >From 916610ddd166ca7073aa2721630f74a0f9d7faaa Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:56 -0700 Subject: [PATCH] xen: set num_processors Someone's got to do it. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/smp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 800bb21..8310ca0 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -155,8 +155,10 @@ static void __init xen_fill_possible_map(void) for (i = 0; i < NR_CPUS; i++) { rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL); - if (rc >= 0) + if (rc >= 0) { + num_processors++; cpu_set(i, cpu_possible_map); + } } } -- 1.5.4.1 linux-2.6-xen-0045-xen64-defer-setting-pagetable-alloc-release-ops.patch: --- NEW FILE linux-2.6-xen-0045-xen64-defer-setting-pagetable-alloc-release-ops.patch --- >From 1631a02e16a7aa06429a7b0549f20568fea464b5 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:57 -0700 Subject: [PATCH] xen64: defer setting pagetable alloc/release ops We need to wait until the page structure is available to use the proper pagetable page alloc/release operations, since they use struct page to determine if a pagetable is pinned. This happened to work in 32bit because nobody allocated new pagetable pages in the interim between xen_pagetable_setup_done and xen_post_allocator_init, but the 64-bit kenrel needs to allocate more pagetable levels. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index f154f71..ddb4746 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -896,30 +896,29 @@ void xen_setup_shared_info(void) static __init void xen_pagetable_setup_done(pgd_t *base) { - /* This will work as long as patching hasn't happened yet - (which it hasn't) */ - pv_mmu_ops.alloc_pte = xen_alloc_pte; - pv_mmu_ops.alloc_pmd = xen_alloc_pmd; - pv_mmu_ops.release_pte = xen_release_pte; - pv_mmu_ops.release_pmd = xen_release_pmd; -#if PAGETABLE_LEVELS == 4 - pv_mmu_ops.alloc_pud = xen_alloc_pud; - pv_mmu_ops.release_pud = xen_release_pud; -#endif - - pv_mmu_ops.set_pte = xen_set_pte; - xen_setup_shared_info(); } static __init void xen_post_allocator_init(void) { + pv_mmu_ops.set_pte = xen_set_pte; pv_mmu_ops.set_pmd = xen_set_pmd; pv_mmu_ops.set_pud = xen_set_pud; #if PAGETABLE_LEVELS == 4 pv_mmu_ops.set_pgd = xen_set_pgd; #endif + /* This will work as long as patching hasn't happened yet + (which it hasn't) */ + pv_mmu_ops.alloc_pte = xen_alloc_pte; + pv_mmu_ops.alloc_pmd = xen_alloc_pmd; + pv_mmu_ops.release_pte = xen_release_pte; + pv_mmu_ops.release_pmd = xen_release_pmd; +#if PAGETABLE_LEVELS == 4 + pv_mmu_ops.alloc_pud = xen_alloc_pud; + pv_mmu_ops.release_pud = xen_release_pud; +#endif + xen_mark_init_mm_pinned(); } -- 1.5.4.1 linux-2.6-xen-0046-xen-use-set_pte_vaddr.patch: --- NEW FILE linux-2.6-xen-0046-xen-use-set_pte_vaddr.patch --- >From 7d51998de8fe454fb910b558a3f898351c3e7640 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:58 -0700 Subject: [PATCH] xen: use set_pte_vaddr Make Xen's set_pte_mfn() use set_pte_vaddr rather than copying it. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Juan Quintela Signed-off-by: Mark McLoughlin Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/mmu.c | 30 +----------------------------- 1 files changed, 1 insertions(+), 29 deletions(-) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index a8f0232..eb31ed2 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -282,35 +282,7 @@ void xen_set_pmd(pmd_t *ptr, pmd_t val) */ void set_pte_mfn(unsigned long vaddr, unsigned long mfn, pgprot_t flags) { - pgd_t *pgd; - pud_t *pud; - pmd_t *pmd; - pte_t *pte; - - pgd = swapper_pg_dir + pgd_index(vaddr); - if (pgd_none(*pgd)) { - BUG(); - return; - } - pud = pud_offset(pgd, vaddr); - if (pud_none(*pud)) { - BUG(); - return; - } - pmd = pmd_offset(pud, vaddr); - if (pmd_none(*pmd)) { - BUG(); - return; - } - pte = pte_offset_kernel(pmd, vaddr); - /* stored as-is, to permit clearing entries */ - xen_set_pte(pte, mfn_pte(mfn, flags)); - - /* - * It's enough to flush this one mapping. - * (PGE mappings get flushed as well) - */ - __flush_tlb_one(vaddr); + set_pte_vaddr(vaddr, mfn_pte(mfn, flags)); } void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, -- 1.5.4.1 linux-2.6-xen-0047-xen64-xen_write_idt_entry-and-cvt_gate_to_trap.patch: --- NEW FILE linux-2.6-xen-0047-xen64-xen_write_idt_entry-and-cvt_gate_to_trap.patch --- >From e6aa56dc60d076fd4b3d1423fa0e4fbbafd1ac4e Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 8 Jul 2008 15:06:59 -0700 Subject: [PATCH] xen64: xen_write_idt_entry() and cvt_gate_to_trap() Changed to use the (to-be-)unified descriptor structs. Signed-off-by: Eduardo Habkost Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index ddb4746..5548e31 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -419,23 +419,18 @@ static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum, preempt_enable(); } -static int cvt_gate_to_trap(int vector, u32 low, u32 high, +static int cvt_gate_to_trap(int vector, const gate_desc *val, struct trap_info *info) { - u8 type, dpl; - - type = (high >> 8) & 0x1f; - dpl = (high >> 13) & 3; - - if (type != 0xf && type != 0xe) + if (val->type != 0xf && val->type != 0xe) return 0; info->vector = vector; - info->address = (high & 0xffff0000) | (low & 0x0000ffff); - info->cs = low >> 16; - info->flags = dpl; + info->address = gate_offset(*val); + info->cs = gate_segment(*val); + info->flags = val->dpl; /* interrupt gates clear IF */ - if (type == 0xe) + if (val->type == 0xe) info->flags |= 4; return 1; @@ -462,11 +457,10 @@ static void xen_write_idt_entry(gate_desc *dt, int entrynum, const gate_desc *g) if (p >= start && (p + 8) <= end) { struct trap_info info[2]; - u32 *desc = (u32 *)g; info[1].address = 0; - if (cvt_gate_to_trap(entrynum, desc[0], desc[1], &info[0])) + if (cvt_gate_to_trap(entrynum, g, &info[0])) if (HYPERVISOR_set_trap_table(info)) BUG(); } @@ -479,13 +473,13 @@ static void xen_convert_trap_info(const struct desc_ptr *desc, { unsigned in, out, count; - count = (desc->size+1) / 8; + count = (desc->size+1) / sizeof(gate_desc); BUG_ON(count > 256); for (in = out = 0; in < count; in++) { - const u32 *entry = (u32 *)(desc->address + in * 8); + gate_desc *entry = (gate_desc*)(desc->address) + in; - if (cvt_gate_to_trap(in, entry[0], entry[1], &traps[out])) + if (cvt_gate_to_trap(in, entry, &traps[out])) out++; } traps[out].address = 0; -- 1.5.4.1 linux-2.6-xen-0048-xen64-deal-with-extra-words-Xen-pushes-onto-excepti.patch: --- NEW FILE linux-2.6-xen-0048-xen64-deal-with-extra-words-Xen-pushes-onto-excepti.patch --- >From 18197726b6174ed93844c1255fa6a1027dfba66a Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:00 -0700 Subject: [PATCH] xen64: deal with extra words Xen pushes onto exception frames Xen pushes two extra words containing the values of rcx and r11. This pvop hook copies the words back into their appropriate registers, and cleans them off the stack. This leaves the stack in native form, so the normal handler can run unchanged. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 2 +- arch/x86/xen/xen-asm_64.S | 5 +++++ arch/x86/xen/xen-ops.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 5548e31..85b9764 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1112,7 +1112,7 @@ static const struct pv_irq_ops xen_irq_ops __initdata = { .safe_halt = xen_safe_halt, .halt = xen_halt, #ifdef CONFIG_X86_64 - .adjust_exception_frame = paravirt_nop, + .adjust_exception_frame = xen_adjust_exception_frame, #endif }; diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index 4ec1082..b147b49 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -133,6 +133,11 @@ check_events: ret #endif +ENTRY(xen_adjust_exception_frame) + mov 8+0(%rsp),%rcx + mov 8+8(%rsp),%r11 + ret $16 + ENTRY(xen_iret) pushq $0 jmp hypercall_page + __HYPERVISOR_iret * 32 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index aca4a78..c4800a2 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -67,7 +67,9 @@ DECL_ASM(void, xen_irq_disable_direct, void); DECL_ASM(unsigned long, xen_save_fl_direct, void); DECL_ASM(void, xen_restore_fl_direct, unsigned long); +/* These are not functions, and cannot be called normally */ void xen_iret(void); void xen_sysexit(void); +void xen_adjust_exception_frame(void); #endif /* XEN_OPS_H */ -- 1.5.4.1 linux-2.6-xen-0049-xen64-add-pvop-for-swapgs.patch: --- NEW FILE linux-2.6-xen-0049-xen64-add-pvop-for-swapgs.patch --- >From fd186e3f585111d32730a9d36b0bdb25f9c0c44a Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:01 -0700 Subject: [PATCH] xen64: add pvop for swapgs swapgs is a no-op under Xen, because the hypervisor makes sure the right version of %gs is current when switching between user and kernel modes. This means that the swapgs "implementation" can be inlined and used when the stack is unsafe (usermode). Unfortunately, it means that disabling patching will result in a non-booting kernel... Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 85b9764..8343c7f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1097,6 +1097,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .set_iopl_mask = xen_set_iopl_mask, .io_delay = xen_io_delay, + /* Xen takes care of %gs when switching to usermode for us */ + .swapgs = paravirt_nop, + .lazy_mode = { .enter = paravirt_enter_lazy_cpu, .leave = xen_leave_lazy, -- 1.5.4.1 linux-2.6-xen-0050-xen64-register-callbacks-in-arch-independent-way.patch: --- NEW FILE linux-2.6-xen-0050-xen64-register-callbacks-in-arch-independent-way.patch --- >From 869d8606691590a0dc49798dc9b00de387b45f85 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:02 -0700 Subject: [PATCH] xen64: register callbacks in arch-independent way Use callback_op hypercall to register callbacks in a 32/64-bit independent way (64-bit doesn't need a code segment, but that detail is hidden in XEN_CALLBACK). Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/setup.c | 27 +++++++++++++++++---------- include/asm-x86/xen/hypercall.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index f52f385..bea3d4f 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -91,19 +91,25 @@ static void __init fiddle_vdso(void) *mask |= 1 << VDSO_NOTE_NONEGSEG_BIT; } -void xen_enable_sysenter(void) +static __cpuinit int register_callback(unsigned type, const void *func) { - int cpu = smp_processor_id(); - extern void xen_sysenter_target(void); - /* Mask events on entry, even though they get enabled immediately */ - static struct callback_register sysenter = { - .type = CALLBACKTYPE_sysenter, - .address = XEN_CALLBACK(__KERNEL_CS, xen_sysenter_target), + struct callback_register callback = { + .type = type, + .address = XEN_CALLBACK(__KERNEL_CS, func), .flags = CALLBACKF_mask_events, }; + return HYPERVISOR_callback_op(CALLBACKOP_register, &callback); +} + +void __cpuinit xen_enable_sysenter(void) +{ + int cpu = smp_processor_id(); + extern void xen_sysenter_target(void); + if (!boot_cpu_has(X86_FEATURE_SEP) || - HYPERVISOR_callback_op(CALLBACKOP_register, &sysenter) != 0) { + register_callback(CALLBACKTYPE_sysenter, + xen_sysenter_target) != 0) { clear_cpu_cap(&cpu_data(cpu), X86_FEATURE_SEP); clear_cpu_cap(&boot_cpu_data, X86_FEATURE_SEP); } @@ -120,8 +126,9 @@ void __init xen_arch_setup(void) if (!xen_feature(XENFEAT_auto_translated_physmap)) HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_pae_extended_cr3); - HYPERVISOR_set_callbacks(__KERNEL_CS, (unsigned long)xen_hypervisor_callback, - __KERNEL_CS, (unsigned long)xen_failsafe_callback); + if (register_callback(CALLBACKTYPE_event, xen_hypervisor_callback) || + register_callback(CALLBACKTYPE_failsafe, xen_failsafe_callback)) + BUG(); xen_enable_sysenter(); diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index 8763b97..ecb8976 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -226,6 +226,7 @@ HYPERVISOR_stack_switch(unsigned long ss, unsigned long esp) return _hypercall2(int, stack_switch, ss, esp); } +#ifdef CONFIG_X86_32 static inline int HYPERVISOR_set_callbacks(unsigned long event_selector, unsigned long event_address, @@ -236,6 +237,17 @@ HYPERVISOR_set_callbacks(unsigned long event_selector, event_selector, event_address, failsafe_selector, failsafe_address); } +#else /* CONFIG_X86_64 */ +static inline int +HYPERVISOR_set_callbacks(unsigned long event_address, + unsigned long failsafe_address, + unsigned long syscall_address) +{ + return _hypercall3(int, set_callbacks, + event_address, failsafe_address, + syscall_address); +} +#endif /* CONFIG_X86_{32,64} */ static inline int HYPERVISOR_callback_op(int cmd, void *arg) -- 1.5.4.1 linux-2.6-xen-0051-xen64-add-identity-irq-vector-map.patch: --- NEW FILE linux-2.6-xen-0051-xen64-add-identity-irq-vector-map.patch --- >From 4124bac3780066f8ab050a599842a6fb1dbf6150 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:03 -0700 Subject: [PATCH] xen64: add identity irq->vector map The x86_64 interrupt subsystem is oriented towards vectors, as opposed to a flat irq space as it is in x86-32. This patch adds a simple identity irq->vector mapping so that we can continue to feed irqs into do_IRQ() and get a good result. Ideally x86_32 will unify with the 64-bit code and use vectors too. At that point we can move to mapping event channels to vectors, which will allow us to economise on irqs (so per-cpu event channels can share irqs, rather than having to allocte one per cpu, for example). Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 8343c7f..dfebbff 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1106,8 +1106,25 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { }, }; +static void __init __xen_init_IRQ(void) +{ +#ifdef CONFIG_X86_64 + int i; + + /* Create identity vector->irq map */ + for(i = 0; i < NR_VECTORS; i++) { + int cpu; + + for_each_possible_cpu(cpu) + per_cpu(vector_irq, cpu)[i] = i; + } +#endif /* CONFIG_X86_64 */ + + xen_init_IRQ(); +} + static const struct pv_irq_ops xen_irq_ops __initdata = { - .init_IRQ = xen_init_IRQ, + .init_IRQ = __xen_init_IRQ, .save_fl = xen_save_fl, .restore_fl = xen_restore_fl, .irq_disable = xen_irq_disable, -- 1.5.4.1 linux-2.6-xen-0052-Xen64-HYPERVISOR_set_segment_base-implementation.patch: --- NEW FILE linux-2.6-xen-0052-Xen64-HYPERVISOR_set_segment_base-implementation.patch --- >From c4b189a21aae0382116fe73cd33d1d74d6f9fbb2 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 8 Jul 2008 15:07:04 -0700 Subject: [PATCH] Xen64: HYPERVISOR_set_segment_base() implementation Signed-off-by: Eduardo Habkost Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- include/asm-x86/xen/hypercall.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index ecb8976..ca9f309 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -388,6 +388,14 @@ HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args) return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); } +#ifdef CONFIG_X86_64 +static inline int +HYPERVISOR_set_segment_base(int reg, unsigned long value) +{ + return _hypercall2(int, set_segment_base, reg, value); +} +#endif + static inline int HYPERVISOR_suspend(unsigned long srec) { -- 1.5.4.1 linux-2.6-xen-0053-xen64-implement-xen_load_gs_index.patch: --- NEW FILE linux-2.6-xen-0053-xen64-implement-xen_load_gs_index.patch --- >From 4e277b2082caf46eec49f7974b2179d92ea20dca Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 8 Jul 2008 15:07:05 -0700 Subject: [PATCH] xen64: implement xen_load_gs_index() xen-64: implement xen_load_gs_index() Signed-off-by: Eduardo Habkost Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index dfebbff..7eefbc8 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -403,6 +403,14 @@ static void xen_load_tls(struct thread_struct *t, unsigned int cpu) loadsegment(gs, 0); } +#ifdef CONFIG_X86_64 +static void xen_load_gs_index(unsigned int idx) +{ + if (HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL, idx)) + BUG(); +} +#endif + static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum, const void *ptr) { @@ -1084,6 +1092,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .load_gdt = xen_load_gdt, .load_idt = xen_load_idt, .load_tls = xen_load_tls, +#ifdef CONFIG_X86_64 + .load_gs_index = xen_load_gs_index, +#endif .store_gdt = native_store_gdt, .store_idt = native_store_idt, -- 1.5.4.1 linux-2.6-xen-0054-xen-rework-pgd_walk-to-deal-with-32-64-bit.patch: --- NEW FILE linux-2.6-xen-0054-xen-rework-pgd_walk-to-deal-with-32-64-bit.patch --- >From c48ce41fc8845e64f633e00ceae63f079eff3ae6 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:06 -0700 Subject: [PATCH] xen: rework pgd_walk to deal with 32/64 bit Rewrite pgd_walk to deal with 64-bit address spaces. There are two notible features of 64-bit workspaces: 1. The physical address is only 48 bits wide, with the upper 16 bits being sign extension; kernel addresses are negative, and userspace is positive. 2. The Xen hypervisor mapping is at the negative-most address, just above the sign-extension hole. 1. means that we can't easily use addresses when traversing the space, since we must deal with sign extension. This rewrite expresses everything in terms of pgd/pud/pmd indices, which means we don't need to worry about the exact configuration of the virtual memory space. This approach works equally well in 32-bit. To deal with 2, assume the hole is between the uppermost userspace address and PAGE_OFFSET. For 64-bit this skips the Xen mapping hole. For 32-bit, the hole is zero-sized. In all cases, the uppermost kernel address is FIXADDR_TOP. A side-effect of this patch is that the upper boundary is actually handled properly, exposing a long-standing bug in 32-bit, which failed to pin kernel pmd page. The kernel pmd is not shared, and so must be explicitly pinned, even though the kernel ptes are shared and don't need pinning. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/mmu.c | 115 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 75 insertions(+), 40 deletions(-) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index eb31ed2..046c1f2 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -491,77 +492,103 @@ void xen_set_pgd(pgd_t *ptr, pgd_t val) #endif /* PAGETABLE_LEVELS == 4 */ /* - (Yet another) pagetable walker. This one is intended for pinning a - pagetable. This means that it walks a pagetable and calls the - callback function on each page it finds making up the page table, - at every level. It walks the entire pagetable, but it only bothers - pinning pte pages which are below pte_limit. In the normal case - this will be TASK_SIZE, but at boot we need to pin up to - FIXADDR_TOP. But the important bit is that we don't pin beyond - there, because then we start getting into Xen's ptes. -*/ -static int pgd_walk(pgd_t *pgd_base, int (*func)(struct page *, enum pt_level), + * (Yet another) pagetable walker. This one is intended for pinning a + * pagetable. This means that it walks a pagetable and calls the + * callback function on each page it finds making up the page table, + * at every level. It walks the entire pagetable, but it only bothers + * pinning pte pages which are below limit. In the normal case this + * will be STACK_TOP_MAX, but at boot we need to pin up to + * FIXADDR_TOP. + * + * For 32-bit the important bit is that we don't pin beyond there, + * because then we start getting into Xen's ptes. + * + * For 64-bit, we must skip the Xen hole in the middle of the address + * space, just after the big x86-64 virtual hole. + */ +static int pgd_walk(pgd_t *pgd, int (*func)(struct page *, enum pt_level), unsigned long limit) { - pgd_t *pgd = pgd_base; int flush = 0; - unsigned long addr = 0; - unsigned long pgd_next; + unsigned hole_low, hole_high; + unsigned pgdidx_limit, pudidx_limit, pmdidx_limit; + unsigned pgdidx, pudidx, pmdidx; - BUG_ON(limit > FIXADDR_TOP); + /* The limit is the last byte to be touched */ + limit--; + BUG_ON(limit >= FIXADDR_TOP); if (xen_feature(XENFEAT_auto_translated_physmap)) return 0; - for (; addr != FIXADDR_TOP; pgd++, addr = pgd_next) { + /* + * 64-bit has a great big hole in the middle of the address + * space, which contains the Xen mappings. On 32-bit these + * will end up making a zero-sized hole and so is a no-op. + */ + hole_low = pgd_index(STACK_TOP_MAX + PGDIR_SIZE - 1); + hole_high = pgd_index(PAGE_OFFSET); + + pgdidx_limit = pgd_index(limit); +#if PTRS_PER_PUD > 1 + pudidx_limit = pud_index(limit); +#else + pudidx_limit = 0; +#endif +#if PTRS_PER_PMD > 1 + pmdidx_limit = pmd_index(limit); +#else + pmdidx_limit = 0; +#endif + + flush |= (*func)(virt_to_page(pgd), PT_PGD); + + for (pgdidx = 0; pgdidx <= pgdidx_limit; pgdidx++) { pud_t *pud; - unsigned long pud_limit, pud_next; - pgd_next = pud_limit = pgd_addr_end(addr, FIXADDR_TOP); + if (pgdidx >= hole_low && pgdidx < hole_high) + continue; - if (!pgd_val(*pgd)) + if (!pgd_val(pgd[pgdidx])) continue; - pud = pud_offset(pgd, 0); + pud = pud_offset(&pgd[pgdidx], 0); if (PTRS_PER_PUD > 1) /* not folded */ flush |= (*func)(virt_to_page(pud), PT_PUD); - for (; addr != pud_limit; pud++, addr = pud_next) { + for (pudidx = 0; pudidx < PTRS_PER_PUD; pudidx++) { pmd_t *pmd; - unsigned long pmd_limit; - pud_next = pud_addr_end(addr, pud_limit); - - if (pud_next < limit) - pmd_limit = pud_next; - else - pmd_limit = limit; + if (pgdidx == pgdidx_limit && + pudidx > pudidx_limit) + goto out; - if (pud_none(*pud)) + if (pud_none(pud[pudidx])) continue; - pmd = pmd_offset(pud, 0); + pmd = pmd_offset(&pud[pudidx], 0); if (PTRS_PER_PMD > 1) /* not folded */ flush |= (*func)(virt_to_page(pmd), PT_PMD); - for (; addr != pmd_limit; pmd++) { - addr += (PAGE_SIZE * PTRS_PER_PTE); - if ((pmd_limit-1) < (addr-1)) { - addr = pmd_limit; - break; - } + for (pmdidx = 0; pmdidx < PTRS_PER_PMD; pmdidx++) { + struct page *pte; + + if (pgdidx == pgdidx_limit && + pudidx == pudidx_limit && + pmdidx > pmdidx_limit) + goto out; - if (pmd_none(*pmd)) + if (pmd_none(pmd[pmdidx])) continue; - flush |= (*func)(pmd_page(*pmd), PT_PTE); + pte = pmd_page(pmd[pmdidx]); + flush |= (*func)(pte, PT_PTE); } } } - - flush |= (*func)(virt_to_page(pgd_base), PT_PGD); +out: return flush; } @@ -650,6 +677,11 @@ void xen_pgd_pin(pgd_t *pgd) xen_mc_batch(); } +#ifdef CONFIG_X86_PAE + /* Need to make sure unshared kernel PMD is pinnable */ + pin_page(virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])), PT_PMD); +#endif + xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd))); xen_mc_issue(0); } @@ -731,6 +763,10 @@ static void xen_pgd_unpin(pgd_t *pgd) xen_do_pin(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); +#ifdef CONFIG_X86_PAE + /* Need to make sure unshared kernel PMD is unpinned */ + pin_page(virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])), PT_PMD); +#endif pgd_walk(pgd, unpin_page, TASK_SIZE); xen_mc_issue(0); @@ -750,7 +786,6 @@ void xen_mm_unpin_all(void) list_for_each_entry(page, &pgd_list, lru) { if (PageSavePinned(page)) { BUG_ON(!PagePinned(page)); - printk("unpinning pinned %p\n", page_address(page)); xen_pgd_unpin((pgd_t *)page_address(page)); ClearPageSavePinned(page); } -- 1.5.4.1 linux-2.6-xen-0055-xen-make-sure-the-kernel-command-line-is-right.patch: --- NEW FILE linux-2.6-xen-0055-xen-make-sure-the-kernel-command-line-is-right.patch --- >From 9cfe071a98b753686feb767a1f938b7c0d683800 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:07 -0700 Subject: [PATCH] xen: make sure the kernel command line is right Point the boot params cmd_line_ptr to the domain-builder-provided command line. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 7eefbc8..75ee8b1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1608,6 +1608,7 @@ asmlinkage void __init xen_start_kernel(void) boot_params.hdr.ramdisk_image = xen_start_info->mod_start ? __pa(xen_start_info->mod_start) : 0; boot_params.hdr.ramdisk_size = xen_start_info->mod_len; + boot_params.hdr.cmd_line_ptr = __pa(xen_start_info->cmd_line); if (!is_initial_xendomain()) { add_preferred_console("xenboot", 0, NULL); -- 1.5.4.1 linux-2.6-xen-0056-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch: --- NEW FILE linux-2.6-xen-0056-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch --- >From 2093d74c2f1e62cd3fe55b0434af1ed0aab62d44 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:08 -0700 Subject: [PATCH] suspend, xen: enable PM_SLEEP for CONFIG_XEN Xen save/restore requires PM_SLEEP to be set without requiring SUSPEND or HIBERNATION. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- kernel/power/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index b45da40..1436c47 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -82,7 +82,7 @@ config PM_SLEEP_SMP config PM_SLEEP bool - depends on SUSPEND || HIBERNATION + depends on SUSPEND || HIBERNATION || XEN default y config SUSPEND -- 1.5.4.1 linux-2.6-xen-0057-xen64-implement-failsafe-callback.patch: --- NEW FILE linux-2.6-xen-0057-xen64-implement-failsafe-callback.patch --- >From 8e7712902cd3fbbfc717b29178a2320baefe5603 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:09 -0700 Subject: [PATCH] xen64: implement failsafe callback Implement the failsafe callback, so that iret and segment register load exceptions are reported to the kernel. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 7cc2de7..6aa6932 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1365,10 +1365,8 @@ END(do_hypervisor_callback) # with its current contents: any discrepancy means we in category 1. */ ENTRY(xen_failsafe_callback) -#if 1 - ud2a -#else - _frame (RIP-0x30) + framesz = (RIP-0x30) /* workaround buggy gas */ + _frame framesz CFI_REL_OFFSET rcx, 0 CFI_REL_OFFSET r11, 8 movw %ds,%cx @@ -1391,8 +1389,13 @@ ENTRY(xen_failsafe_callback) CFI_RESTORE r11 addq $0x30,%rsp CFI_ADJUST_CFA_OFFSET -0x30 - movq $11,%rdi /* SIGSEGV */ - jmp do_exit + pushq $0 + CFI_ADJUST_CFA_OFFSET 8 + pushq %r11 + CFI_ADJUST_CFA_OFFSET 8 + pushq %rcx + CFI_ADJUST_CFA_OFFSET 8 + jmp general_protection CFI_RESTORE_STATE 1: /* Segment mismatch => Category 1 (Bad segment). Retry the IRET. */ movq (%rsp),%rcx @@ -1406,7 +1409,6 @@ ENTRY(xen_failsafe_callback) SAVE_ALL jmp error_exit CFI_ENDPROC -#endif END(xen_failsafe_callback) #endif /* CONFIG_XEN */ -- 1.5.4.1 linux-2.6-xen-0058-xen64-Clear-fs-on-xen_load_tls.patch: --- NEW FILE linux-2.6-xen-0058-xen64-Clear-fs-on-xen_load_tls.patch --- >From 05d1702a8a11c22f8fb5af10a42e11686ae3324f Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 8 Jul 2008 15:07:10 -0700 Subject: [PATCH] xen64: Clear %fs on xen_load_tls() We need to do this, otherwise we can get a GPF on hypercall return after TLS descriptor is cleared but %fs is still pointing to it. Signed-off-by: Eduardo Habkost Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 75ee8b1..c238c47 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -382,14 +382,6 @@ static void load_TLS_descriptor(struct thread_struct *t, static void xen_load_tls(struct thread_struct *t, unsigned int cpu) { - xen_mc_batch(); - - load_TLS_descriptor(t, cpu, 0); - load_TLS_descriptor(t, cpu, 1); - load_TLS_descriptor(t, cpu, 2); - - xen_mc_issue(PARAVIRT_LAZY_CPU); - /* * XXX sleazy hack: If we're being called in a lazy-cpu zone, * it means we're in a context switch, and %gs has just been @@ -398,9 +390,30 @@ static void xen_load_tls(struct thread_struct *t, unsigned int cpu) * Either way, it has been saved, and the new value will get * loaded properly. This will go away as soon as Xen has been * modified to not save/restore %gs for normal hypercalls. + * + * On x86_64, this hack is not used for %gs, because gs points + * to KERNEL_GS_BASE (and uses it for PDA references), so we + * must not zero %gs on x86_64 + * + * For x86_64, we need to zero %fs, otherwise we may get an + * exception between the new %fs descriptor being loaded and + * %fs being effectively cleared at __switch_to(). */ - if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU) + if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU) { +#ifdef CONFIG_X86_32 loadsegment(gs, 0); +#else + loadsegment(fs, 0); +#endif + } + + xen_mc_batch(); + + load_TLS_descriptor(t, cpu, 0); + load_TLS_descriptor(t, cpu, 1); + load_TLS_descriptor(t, cpu, 2); + + xen_mc_issue(PARAVIRT_LAZY_CPU); } #ifdef CONFIG_X86_64 -- 1.5.4.1 linux-2.6-xen-0059-xen64-implement-64-bit-update_descriptor.patch: --- NEW FILE linux-2.6-xen-0059-xen64-implement-64-bit-update_descriptor.patch --- >From 74e3b8a1eb1e1c7fea9361aa7c20d241a95d0cc5 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:11 -0700 Subject: [PATCH] xen64: implement 64-bit update_descriptor 64-bit hypercall interface can pass a maddr in one argument rather than splitting it. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- include/asm-x86/xen/hypercall.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index ca9f309..b3d7dde 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -466,10 +466,15 @@ MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr, struct desc_struct desc) { mcl->op = __HYPERVISOR_update_descriptor; - mcl->args[0] = maddr; - mcl->args[1] = maddr >> 32; - mcl->args[2] = desc.a; - mcl->args[3] = desc.b; + if (sizeof(maddr) == sizeof(long)) { + mcl->args[0] = maddr; + mcl->args[1] = *(unsigned long *)&desc; + } else { + mcl->args[0] = maddr; + mcl->args[1] = maddr >> 32; + mcl->args[2] = desc.a; + mcl->args[3] = desc.b; + } } static inline void -- 1.5.4.1 linux-2.6-xen-0060-xen64-save-lots-of-registers.patch: --- NEW FILE linux-2.6-xen-0060-xen64-save-lots-of-registers.patch --- >From 8b20747019121f5a14af22bc3e99ecb22dd0f6eb Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:12 -0700 Subject: [PATCH] xen64: save lots of registers The Xen hypercall interface is allowed to trash any or all of the argument registers, so we need to be careful that the kernel state isn't damaged. On 32-bit kernels, the hypercall parameter registers same as a regparm function call, so we've got away without explicit clobbering so far. The 64-bit ABI defines lots of caller-save registers, so save them all for safety. We can trim this set later by re-distributing the responsibility for saving all these registers. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- include/asm-x86/paravirt.h | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index fd2f7b5..747620d 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h @@ -1406,8 +1406,8 @@ extern struct paravirt_patch_site __parainstructions[], * caller saved registers but the argument parameter */ #define PV_SAVE_REGS "pushq %%rdi;" #define PV_RESTORE_REGS "popq %%rdi;" -#define PV_EXTRA_CLOBBERS EXTRA_CLOBBERS, "rcx" , "rdx" -#define PV_VEXTRA_CLOBBERS EXTRA_CLOBBERS, "rdi", "rcx" , "rdx" +#define PV_EXTRA_CLOBBERS EXTRA_CLOBBERS, "rcx" , "rdx", "rsi" +#define PV_VEXTRA_CLOBBERS EXTRA_CLOBBERS, "rdi", "rcx" , "rdx", "rsi" #define PV_FLAGS_ARG "D" #endif @@ -1499,8 +1499,26 @@ static inline unsigned long __raw_local_irq_save(void) #ifdef CONFIG_X86_64 -#define PV_SAVE_REGS pushq %rax; pushq %rdi; pushq %rcx; pushq %rdx -#define PV_RESTORE_REGS popq %rdx; popq %rcx; popq %rdi; popq %rax +#define PV_SAVE_REGS \ + push %rax; \ + push %rcx; \ + push %rdx; \ + push %rsi; \ + push %rdi; \ + push %r8; \ + push %r9; \ + push %r10; \ + push %r11 +#define PV_RESTORE_REGS \ + pop %r11; \ + pop %r10; \ + pop %r9; \ + pop %r8; \ + pop %rdi; \ + pop %rsi; \ + pop %rdx; \ + pop %rcx; \ + pop %rax #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 8) #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .quad, 8) #define PARA_INDIRECT(addr) *addr(%rip) -- 1.5.4.1 linux-2.6-xen-0061-xen64-allocate-and-manage-user-pagetables.patch: --- NEW FILE linux-2.6-xen-0061-xen64-allocate-and-manage-user-pagetables.patch --- >From b245d4044a7a385e42c19343ae7a5ead8ff9def0 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:13 -0700 Subject: [PATCH] xen64: allocate and manage user pagetables Because the x86_64 architecture does not enforce segment limits, Xen cannot protect itself with them as it does in 32-bit mode. Therefore, to protect itself, it runs the guest kernel in ring 3. Since it also runs the guest userspace in ring3, the guest kernel must maintain a second pagetable for its userspace, which does not map kernel space. Naturally, the guest kernel pagetables map both kernel and userspace. The userspace pagetable is attached to the corresponding kernel pagetable via the pgd's page->private field. It is allocated and freed at the same time as the kernel pgd via the paravirt_pgd_alloc/free hooks. Fortunately, the user pagetable is almost entirely shared with the kernel pagetable; the only difference is the pgd page itself. set_pgd will populate all entries in the kernel pagetable, and also set the corresponding user pgd entry if the address is less than STACK_TOP_MAX. The user pagetable must be pinned and unpinned with the kernel one, but because the pagetables are aliased, pgd_walk() only needs to be called on the kernel pagetable. The user pgd page is then pinned/unpinned along with the kernel pgd page. xen_write_cr3 must write both the kernel and user cr3s. The init_mm.pgd pagetable never has a user pagetable allocated for it, because it can never be used while running usermode. One awkward area is that early in boot the page structures are not available. No user pagetable can exist at that point, but it complicates the logic to avoid looking at the page structure. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 99 +++++++++++++++++++++++++++++++++++++++------- arch/x86/xen/mmu.c | 91 ++++++++++++++++++++++++++++++++++++++---- arch/x86/xen/mmu.h | 2 + 3 files changed, 168 insertions(+), 24 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index c238c47..5322e5c 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -46,7 +46,6 @@ #include #include #include -#include #include "xen-ops.h" #include "mmu.h" @@ -729,29 +728,57 @@ static void set_current_cr3(void *v) x86_write_percpu(xen_current_cr3, (unsigned long)v); } -static void xen_write_cr3(unsigned long cr3) +static void __xen_write_cr3(bool kernel, unsigned long cr3) { struct mmuext_op *op; struct multicall_space mcs; - unsigned long mfn = pfn_to_mfn(PFN_DOWN(cr3)); + unsigned long mfn; - BUG_ON(preemptible()); + if (cr3) + mfn = pfn_to_mfn(PFN_DOWN(cr3)); + else + mfn = 0; - mcs = xen_mc_entry(sizeof(*op)); /* disables interrupts */ + WARN_ON(mfn == 0 && kernel); - /* Update while interrupts are disabled, so its atomic with - respect to ipis */ - x86_write_percpu(xen_cr3, cr3); + mcs = __xen_mc_entry(sizeof(*op)); op = mcs.args; - op->cmd = MMUEXT_NEW_BASEPTR; + op->cmd = kernel ? MMUEXT_NEW_BASEPTR : MMUEXT_NEW_USER_BASEPTR; op->arg1.mfn = mfn; MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); - /* Update xen_update_cr3 once the batch has actually - been submitted. */ - xen_mc_callback(set_current_cr3, (void *)cr3); + if (kernel) { + x86_write_percpu(xen_cr3, cr3); + + /* Update xen_current_cr3 once the batch has actually + been submitted. */ + xen_mc_callback(set_current_cr3, (void *)cr3); + } +} + +static void xen_write_cr3(unsigned long cr3) +{ + BUG_ON(preemptible()); + + xen_mc_batch(); /* disables interrupts */ + + /* Update while interrupts are disabled, so its atomic with + respect to ipis */ + x86_write_percpu(xen_cr3, cr3); + + __xen_write_cr3(true, cr3); + +#ifdef CONFIG_X86_64 + { + pgd_t *user_pgd = xen_get_user_pgd(__va(cr3)); + if (user_pgd) + __xen_write_cr3(false, __pa(user_pgd)); + else + __xen_write_cr3(false, 0); + } +#endif xen_mc_issue(PARAVIRT_LAZY_CPU); /* interrupts restored */ } @@ -812,6 +839,40 @@ static void xen_alloc_pmd(struct mm_struct *mm, u32 pfn) xen_alloc_ptpage(mm, pfn, PT_PMD); } +static int xen_pgd_alloc(struct mm_struct *mm) +{ + pgd_t *pgd = mm->pgd; + int ret = 0; + + BUG_ON(PagePinned(virt_to_page(pgd))); + +#ifdef CONFIG_X86_64 + { + struct page *page = virt_to_page(pgd); + + BUG_ON(page->private != 0); + + page->private = __get_free_page(GFP_KERNEL | __GFP_ZERO); + if (page->private == 0) + ret = -ENOMEM; + + BUG_ON(PagePinned(virt_to_page(xen_get_user_pgd(pgd)))); + } +#endif + + return ret; +} + +static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd) +{ +#ifdef CONFIG_X86_64 + pgd_t *user_pgd = xen_get_user_pgd(pgd); + + if (user_pgd) + free_page((unsigned long)user_pgd); +#endif +} + /* This should never happen until we're OK to use struct page */ static void xen_release_ptpage(u32 pfn, unsigned level) { @@ -1189,8 +1250,8 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { .pte_update = paravirt_nop, .pte_update_defer = paravirt_nop, - .pgd_alloc = __paravirt_pgd_alloc, - .pgd_free = paravirt_nop, + .pgd_alloc = xen_pgd_alloc, + .pgd_free = xen_pgd_free, .alloc_pte = xen_alloc_pte_init, .release_pte = xen_release_pte_init, @@ -1501,7 +1562,15 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pf /* Switch over */ pgd = init_level4_pgt; - xen_write_cr3(__pa(pgd)); + + /* + * At this stage there can be no user pgd, and no page + * structure to attach it to, so make sure we just set kernel + * pgd. + */ + xen_mc_batch(); + __xen_write_cr3(true, __pa(pgd)); + xen_mc_issue(PARAVIRT_LAZY_CPU); reserve_early(__pa(xen_start_info->pt_base), __pa(xen_start_info->pt_base + diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 046c1f2..a44d56e 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -58,6 +58,13 @@ #include "multicalls.h" #include "mmu.h" +/* + * Just beyond the highest usermode address. STACK_TOP_MAX has a + * redzone above it, so round it up to a PGD boundary. + */ +#define USER_LIMIT ((STACK_TOP_MAX + PGDIR_SIZE - 1) & PGDIR_MASK) + + #define P2M_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(unsigned long)) #define TOP_ENTRIES (MAX_DOMAIN_PAGES / P2M_ENTRIES_PER_PAGE) @@ -461,17 +468,45 @@ pud_t xen_make_pud(pudval_t pud) return native_make_pud(pud); } -void xen_set_pgd_hyper(pgd_t *ptr, pgd_t val) +pgd_t *xen_get_user_pgd(pgd_t *pgd) { - struct mmu_update u; + pgd_t *pgd_page = (pgd_t *)(((unsigned long)pgd) & PAGE_MASK); + unsigned offset = pgd - pgd_page; + pgd_t *user_ptr = NULL; - preempt_disable(); + if (offset < pgd_index(USER_LIMIT)) { + struct page *page = virt_to_page(pgd_page); + user_ptr = (pgd_t *)page->private; + if (user_ptr) + user_ptr += offset; + } - xen_mc_batch(); + return user_ptr; +} + +static void __xen_set_pgd_hyper(pgd_t *ptr, pgd_t val) +{ + struct mmu_update u; u.ptr = virt_to_machine(ptr).maddr; u.val = pgd_val_ma(val); extend_mmu_update(&u); +} + +/* + * Raw hypercall-based set_pgd, intended for in early boot before + * there's a page structure. This implies: + * 1. The only existing pagetable is the kernel's + * 2. It is always pinned + * 3. It has no user pagetable attached to it + */ +void __init xen_set_pgd_hyper(pgd_t *ptr, pgd_t val) +{ + preempt_disable(); + + xen_mc_batch(); + + __xen_set_pgd_hyper(ptr, val); xen_mc_issue(PARAVIRT_LAZY_MMU); @@ -480,14 +515,28 @@ void xen_set_pgd_hyper(pgd_t *ptr, pgd_t val) void xen_set_pgd(pgd_t *ptr, pgd_t val) { + pgd_t *user_ptr = xen_get_user_pgd(ptr); + /* If page is not pinned, we can just update the entry directly */ if (!page_pinned(ptr)) { *ptr = val; + if (user_ptr) { + WARN_ON(page_pinned(user_ptr)); + *user_ptr = val; + } return; } - xen_set_pgd_hyper(ptr, val); + /* If it's pinned, then we can at least batch the kernel and + user updates together. */ + xen_mc_batch(); + + __xen_set_pgd_hyper(ptr, val); + if (user_ptr) + __xen_set_pgd_hyper(user_ptr, val); + + xen_mc_issue(PARAVIRT_LAZY_MMU); } #endif /* PAGETABLE_LEVELS == 4 */ @@ -526,7 +575,7 @@ static int pgd_walk(pgd_t *pgd, int (*func)(struct page *, enum pt_level), * space, which contains the Xen mappings. On 32-bit these * will end up making a zero-sized hole and so is a no-op. */ - hole_low = pgd_index(STACK_TOP_MAX + PGDIR_SIZE - 1); + hole_low = pgd_index(USER_LIMIT); hole_high = pgd_index(PAGE_OFFSET); pgdidx_limit = pgd_index(limit); @@ -670,19 +719,31 @@ void xen_pgd_pin(pgd_t *pgd) { xen_mc_batch(); - if (pgd_walk(pgd, pin_page, TASK_SIZE)) { + if (pgd_walk(pgd, pin_page, USER_LIMIT)) { /* re-enable interrupts for kmap_flush_unused */ xen_mc_issue(0); kmap_flush_unused(); xen_mc_batch(); } +#ifdef CONFIG_X86_64 + { + pgd_t *user_pgd = xen_get_user_pgd(pgd); + + xen_do_pin(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa(pgd))); + + if (user_pgd) { + pin_page(virt_to_page(user_pgd), PT_PGD); + xen_do_pin(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa(user_pgd))); + } + } +#else /* CONFIG_X86_32 */ #ifdef CONFIG_X86_PAE /* Need to make sure unshared kernel PMD is pinnable */ pin_page(virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])), PT_PMD); #endif - xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd))); +#endif /* CONFIG_X86_64 */ xen_mc_issue(0); } @@ -763,11 +824,23 @@ static void xen_pgd_unpin(pgd_t *pgd) xen_do_pin(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); +#ifdef CONFIG_X86_64 + { + pgd_t *user_pgd = xen_get_user_pgd(pgd); + + if (user_pgd) { + xen_do_pin(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(user_pgd))); + unpin_page(virt_to_page(user_pgd), PT_PGD); + } + } +#endif + #ifdef CONFIG_X86_PAE /* Need to make sure unshared kernel PMD is unpinned */ pin_page(virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])), PT_PMD); #endif - pgd_walk(pgd, unpin_page, TASK_SIZE); + + pgd_walk(pgd, unpin_page, USER_LIMIT); xen_mc_issue(0); } diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index 19d544b..0f59bd0 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h @@ -51,6 +51,8 @@ void xen_set_pgd(pgd_t *pgdp, pgd_t pgd); void xen_set_pgd_hyper(pgd_t *pgdp, pgd_t pgd); #endif +pgd_t *xen_get_user_pgd(pgd_t *pgd); + pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep); void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte); -- 1.5.4.1 linux-2.6-xen-0062-xen64-set-up-syscall-and-sysenter-entrypoints-for-6.patch: --- NEW FILE linux-2.6-xen-0062-xen64-set-up-syscall-and-sysenter-entrypoints-for-6.patch --- >From 5911a917933316c2473e40d3404ddbb5e0df95ff Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:14 -0700 Subject: [PATCH] xen64: set up syscall and sysenter entrypoints for 64-bit We set up entrypoints for syscall and sysenter. sysenter is only used for 32-bit compat processes, whereas syscall can be used in by both 32 and 64-bit processes. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 4 ++ arch/x86/xen/setup.c | 42 ++++++++++++++- arch/x86/xen/smp.c | 1 + arch/x86/xen/xen-asm_64.S | 129 ++++++++++++++++++++++++++++++++++++++++++++- arch/x86/xen/xen-ops.h | 3 + 5 files changed, 174 insertions(+), 5 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 5322e5c..abb1fa1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1157,6 +1157,10 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .iret = xen_iret, .irq_enable_sysexit = xen_sysexit, +#ifdef CONFIG_X86_64 + .usergs_sysret32 = xen_sysret32, + .usergs_sysret64 = xen_sysret64, +#endif .load_tr_desc = paravirt_nop, .set_ldt = xen_set_ldt, diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index bea3d4f..9d7a144 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -86,9 +86,11 @@ static void xen_idle(void) */ static void __init fiddle_vdso(void) { +#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) extern const char vdso32_default_start; u32 *mask = VDSO32_SYMBOL(&vdso32_default_start, NOTE_MASK); *mask |= 1 << VDSO_NOTE_NONEGSEG_BIT; +#endif } static __cpuinit int register_callback(unsigned type, const void *func) @@ -106,15 +108,48 @@ void __cpuinit xen_enable_sysenter(void) { int cpu = smp_processor_id(); extern void xen_sysenter_target(void); + int ret; + +#ifdef CONFIG_X86_32 + if (!boot_cpu_has(X86_FEATURE_SEP)) { + return; + } +#else + if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL && + boot_cpu_data.x86_vendor != X86_VENDOR_CENTAUR) { + return; + } +#endif - if (!boot_cpu_has(X86_FEATURE_SEP) || - register_callback(CALLBACKTYPE_sysenter, - xen_sysenter_target) != 0) { + ret = register_callback(CALLBACKTYPE_sysenter, xen_sysenter_target); + if(ret != 0) { clear_cpu_cap(&cpu_data(cpu), X86_FEATURE_SEP); clear_cpu_cap(&boot_cpu_data, X86_FEATURE_SEP); } } +void __cpuinit xen_enable_syscall(void) +{ +#ifdef CONFIG_X86_64 + int cpu = smp_processor_id(); + int ret; + extern void xen_syscall_target(void); + extern void xen_syscall32_target(void); + + ret = register_callback(CALLBACKTYPE_syscall, xen_syscall_target); + if (ret != 0) { + printk("failed to set syscall: %d\n", ret); + clear_cpu_cap(&cpu_data(cpu), X86_FEATURE_SYSCALL); + clear_cpu_cap(&boot_cpu_data, X86_FEATURE_SYSCALL); + } else { + ret = register_callback(CALLBACKTYPE_syscall32, + xen_syscall32_target); + if (ret != 0) + printk("failed to set 32-bit syscall: %d\n", ret); + } +#endif /* CONFIG_X86_64 */ +} + void __init xen_arch_setup(void) { struct physdev_set_iopl set_iopl; @@ -131,6 +166,7 @@ void __init xen_arch_setup(void) BUG(); xen_enable_sysenter(); + xen_enable_syscall(); set_iopl.iopl = 1; rc = HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl); diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 8310ca0..f702199 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -69,6 +69,7 @@ static __cpuinit void cpu_bringup_and_idle(void) preempt_disable(); xen_enable_sysenter(); + xen_enable_syscall(); cpu = smp_processor_id(); smp_store_cpu_info(cpu); diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index b147b49..4038cbf 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -15,6 +15,8 @@ #include #include +#include +#include #include @@ -138,9 +140,132 @@ ENTRY(xen_adjust_exception_frame) mov 8+8(%rsp),%r11 ret $16 +hypercall_iret = hypercall_page + __HYPERVISOR_iret * 32 +/* + Xen64 iret frame: + + ss + rsp + rflags + cs + rip <-- standard iret frame + + flags + + rcx } + r11 }<-- pushed by hypercall page +rsp -> rax } + */ ENTRY(xen_iret) pushq $0 - jmp hypercall_page + __HYPERVISOR_iret * 32 +1: jmp hypercall_iret +ENDPATCH(xen_iret) +RELOC(xen_iret, 1b+1) +/* + sysexit is not used for 64-bit processes, so it's + only ever used to return to 32-bit compat userspace. + */ ENTRY(xen_sysexit) - ud2a + pushq $__USER32_DS + pushq %rcx + pushq $X86_EFLAGS_IF + pushq $__USER32_CS + pushq %rdx + + pushq $VGCF_in_syscall +1: jmp hypercall_iret +ENDPATCH(xen_sysexit) +RELOC(xen_sysexit, 1b+1) + +ENTRY(xen_sysret64) + /* We're already on the usermode stack at this point, but still + with the kernel gs, so we can easily switch back */ + movq %rsp, %gs:pda_oldrsp + movq %gs:pda_kernelstack,%rsp + + pushq $__USER_DS + pushq %gs:pda_oldrsp + pushq %r11 + pushq $__USER_CS + pushq %rcx + + pushq $VGCF_in_syscall +1: jmp hypercall_iret +ENDPATCH(xen_sysret64) +RELOC(xen_sysret64, 1b+1) + +ENTRY(xen_sysret32) + /* We're already on the usermode stack at this point, but still + with the kernel gs, so we can easily switch back */ + movq %rsp, %gs:pda_oldrsp + movq %gs:pda_kernelstack, %rsp + + pushq $__USER32_DS + pushq %gs:pda_oldrsp + pushq %r11 + pushq $__USER32_CS + pushq %rcx + + pushq $VGCF_in_syscall +1: jmp hypercall_iret +ENDPATCH(xen_sysret32) +RELOC(xen_sysret32, 1b+1) + +/* + Xen handles syscall callbacks much like ordinary exceptions, + which means we have: + - kernel gs + - kernel rsp + - an iret-like stack frame on the stack (including rcx and r11): + ss + rsp + rflags + cs + rip + r11 + rsp-> rcx + + In all the entrypoints, we undo all that to make it look + like a CPU-generated syscall/sysenter and jump to the normal + entrypoint. + */ + +.macro undo_xen_syscall + mov 0*8(%rsp),%rcx + mov 1*8(%rsp),%r11 + mov 5*8(%rsp),%rsp +.endm + +/* Normal 64-bit system call target */ +ENTRY(xen_syscall_target) + undo_xen_syscall + jmp system_call_after_swapgs +ENDPROC(xen_syscall_target) + +#ifdef CONFIG_IA32_EMULATION + +/* 32-bit compat syscall target */ +ENTRY(xen_syscall32_target) + undo_xen_syscall + jmp ia32_cstar_target +ENDPROC(xen_syscall32_target) + +/* 32-bit compat sysenter target */ +ENTRY(xen_sysenter_target) + undo_xen_syscall + jmp ia32_sysenter_target +ENDPROC(xen_sysenter_target) + +#else /* !CONFIG_IA32_EMULATION */ + +ENTRY(xen_syscall32_target) +ENTRY(xen_sysenter_target) + lea 16(%rsp), %rsp /* strip %rcx,%r11 */ + mov $-ENOSYS, %rax + pushq $VGCF_in_syscall + jmp hypercall_iret +ENDPROC(xen_syscall32_target) +ENDPROC(xen_sysenter_target) + +#endif /* CONFIG_IA32_EMULATION */ diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index c4800a2..dd3c231 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -26,6 +26,7 @@ char * __init xen_memory_setup(void); void __init xen_arch_setup(void); void __init xen_init_IRQ(void); void xen_enable_sysenter(void); +void xen_enable_syscall(void); void xen_vcpu_restore(void); void __init xen_build_dynamic_phys_to_machine(void); @@ -70,6 +71,8 @@ DECL_ASM(void, xen_restore_fl_direct, unsigned long); /* These are not functions, and cannot be called normally */ void xen_iret(void); void xen_sysexit(void); +void xen_sysret32(void); +void xen_sysret64(void); void xen_adjust_exception_frame(void); #endif /* XEN_OPS_H */ -- 1.5.4.1 linux-2.6-xen-0063-xen64-set-up-userspace-syscall-patch.patch: --- NEW FILE linux-2.6-xen-0063-xen64-set-up-userspace-syscall-patch.patch --- >From 9aad04982467dfd00f081a8187fb290f9c10078f Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:15 -0700 Subject: [PATCH] xen64: set up userspace syscall patch 64-bit userspace expects the vdso to be mapped at a specific fixed address, which happens to be in the middle of the kernel address space. Because we have split user and kernel pagetables, we need to make special arrangements for the vsyscall mapping to appear in the kernel part of the user pagetable. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index abb1fa1..19d985a 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -57,6 +57,18 @@ DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu); DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info); /* + * Identity map, in addition to plain kernel map. This needs to be + * large enough to allocate page table pages to allocate the rest. + * Each page can map 2MB. + */ +static pte_t level1_ident_pgt[PTRS_PER_PTE * 4] __page_aligned_bss; + +#ifdef CONFIG_X86_64 +/* l3 pud for userspace vsyscall mapping */ +static pud_t level3_user_vsyscall[PTRS_PER_PUD] __page_aligned_bss; +#endif /* CONFIG_X86_64 */ + +/* * Note about cr3 (pagetable base) values: * * xen_cr3 contains the current logical cr3 value; it contains the @@ -849,12 +861,20 @@ static int xen_pgd_alloc(struct mm_struct *mm) #ifdef CONFIG_X86_64 { struct page *page = virt_to_page(pgd); + pgd_t *user_pgd; BUG_ON(page->private != 0); - page->private = __get_free_page(GFP_KERNEL | __GFP_ZERO); - if (page->private == 0) - ret = -ENOMEM; + ret = -ENOMEM; + + user_pgd = (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); + page->private = (unsigned long)user_pgd; + + if (user_pgd != NULL) { + user_pgd[pgd_index(VSYSCALL_START)] = + __pgd(__pa(level3_user_vsyscall) | _PAGE_TABLE); + ret = 0; + } BUG_ON(PagePinned(virt_to_page(xen_get_user_pgd(pgd)))); } @@ -995,6 +1015,9 @@ static __init void xen_post_allocator_init(void) pv_mmu_ops.release_pud = xen_release_pud; #endif +#ifdef CONFIG_X86_64 + SetPagePinned(virt_to_page(level3_user_vsyscall)); +#endif xen_mark_init_mm_pinned(); } @@ -1106,6 +1129,15 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot) } __native_set_fixmap(idx, pte); + +#ifdef CONFIG_X86_64 + /* Replicate changes to map the vsyscall page into the user + pagetable vsyscall mapping. */ + if (idx >= VSYSCALL_LAST_PAGE && idx <= VSYSCALL_FIRST_PAGE) { + unsigned long vaddr = __fix_to_virt(idx); + set_pte_vaddr_pud(level3_user_vsyscall, vaddr, pte); + } +#endif } static const struct pv_info xen_info __initdata = { @@ -1448,13 +1480,6 @@ static void set_page_prot(void *addr, pgprot_t prot) BUG(); } -/* - * Identity map, in addition to plain kernel map. This needs to be - * large enough to allocate page table pages to allocate the rest. - * Each page can map 2MB. - */ -static pte_t level1_ident_pgt[PTRS_PER_PTE * 4] __page_aligned_bss; - static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) { unsigned pmdidx, pteidx; @@ -1554,6 +1579,7 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pf set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); + set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO); set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); -- 1.5.4.1 linux-2.6-xen-0064-xen-implement-Xen-write_msr-operation.patch: --- NEW FILE linux-2.6-xen-0064-xen-implement-Xen-write_msr-operation.patch --- >From c1cbecba9405124926b0b20a566fc0ddaf544953 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:16 -0700 Subject: [PATCH] xen: implement Xen write_msr operation 64-bit uses MSRs for important things like the base for fs and gs-prefixed addresses. It's more efficient to use a hypercall to update these, rather than go via the trap and emulate path. Other MSR writes are just passed through; in an unprivileged domain they do nothing, but it might be useful later. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 19d985a..fe47993 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -795,6 +796,34 @@ static void xen_write_cr3(unsigned long cr3) xen_mc_issue(PARAVIRT_LAZY_CPU); /* interrupts restored */ } +static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) +{ + int ret; + + ret = 0; + + switch(msr) { +#ifdef CONFIG_X86_64 + unsigned which; + u64 base; + + case MSR_FS_BASE: which = SEGBASE_FS; goto set; + case MSR_KERNEL_GS_BASE: which = SEGBASE_GS_USER; goto set; + case MSR_GS_BASE: which = SEGBASE_GS_KERNEL; goto set; + + set: + base = ((u64)high << 32) | low; + if (HYPERVISOR_set_segment_base(which, base) != 0) + ret = -EFAULT; + break; +#endif + default: + ret = native_write_msr_safe(msr, low, high); + } + + return ret; +} + /* Early in boot, while setting up the initial pagetable, assume everything is pinned. */ static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn) @@ -1183,7 +1212,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .wbinvd = native_wbinvd, .read_msr = native_read_msr_safe, - .write_msr = native_write_msr_safe, + .write_msr = xen_write_msr_safe, .read_tsc = native_read_tsc, .read_pmc = native_read_pmc, -- 1.5.4.1 linux-2.6-xen-0065-xen-update-Kconfig-to-allow-64-bit-Xen.patch: --- NEW FILE linux-2.6-xen-0065-xen-update-Kconfig-to-allow-64-bit-Xen.patch --- >From 62e417d990f6869daadceb2fe5c81db25d0f30e3 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:07:17 -0700 Subject: [PATCH] xen: update Kconfig to allow 64-bit Xen Allow Xen to be enabled on 64-bit. Also extend domain size limit from 8 GB (on 32-bit) to 32 GB on 64-bit. Signed-off-by: Jeremy Fitzhardinge Cc: Stephen Tweedie Cc: Eduardo Habkost Cc: Mark McLoughlin Signed-off-by: Ingo Molnar --- arch/x86/xen/Kconfig | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 2983253..37d1bcb 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -6,8 +6,8 @@ config XEN bool "Xen guest support" select PARAVIRT select PARAVIRT_CLOCK - depends on X86_32 - depends on X86_CMPXCHG && X86_TSC && X86_PAE && !(X86_VISWS || X86_VOYAGER) + depends on X86_64 || (X86_32 && X86_PAE && !(X86_VISWS || X86_VOYAGER)) + depends on X86_CMPXCHG && X86_TSC help This is the Linux Xen port. Enabling this will allow the kernel to boot in a paravirtualized environment under the @@ -15,7 +15,8 @@ config XEN config XEN_MAX_DOMAIN_MEMORY int "Maximum allowed size of a domain in gigabytes" - default 8 + default 8 if X86_32 + default 32 if X86_64 depends on XEN help The pseudo-physical to machine address array is sized -- 1.5.4.1 linux-2.6-xen-0066-xen64-fix-HVC_XEN-build-dependency.patch: --- NEW FILE linux-2.6-xen-0066-xen64-fix-HVC_XEN-build-dependency.patch --- >From 78c9dbc8b5f7a3729f2248987311d83ad45d4b4e Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 9 Jul 2008 13:15:03 +0200 Subject: [PATCH] xen64: fix !HVC_XEN build dependency fix: arch/x86/xen/built-in.o: In function `set_page_prot': enlighten.c:(.text+0x111d): undefined reference to `xen_raw_printk' arch/x86/xen/built-in.o: In function `xen_start_kernel': : undefined reference to `xen_raw_console_write' arch/x86/xen/built-in.o: In function `xen_start_kernel': : undefined reference to `xen_raw_console_write' Signed-off-by: Ingo Molnar --- include/xen/hvc-console.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h index 98b79bc..c3adde3 100644 --- a/include/xen/hvc-console.h +++ b/include/xen/hvc-console.h @@ -5,11 +5,12 @@ extern struct console xenboot_console; #ifdef CONFIG_HVC_XEN void xen_console_resume(void); +void xen_raw_console_write(const char *str); +void xen_raw_printk(const char *fmt, ...); #else static inline void xen_console_resume(void) { } +static inline void xen_raw_console_write(const char *str) { } +static inline void xen_raw_printk(const char *fmt, ...) { } #endif -void xen_raw_console_write(const char *str); -void xen_raw_printk(const char *fmt, ...); - #endif /* XEN_HVC_CONSOLE_H */ -- 1.5.4.1 linux-2.6-xen-0067-xen64-fix-build-error-on-32-bit-HIGHMEM.patch: --- NEW FILE linux-2.6-xen-0067-xen64-fix-build-error-on-32-bit-HIGHMEM.patch --- >From d6fe1ec37cb1c026951ce2f20f3989fb92cde341 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 9 Jul 2008 13:45:33 +0200 Subject: [PATCH] xen64: fix build error on 32-bit + !HIGHMEM fix: arch/x86/xen/enlighten.c: In function 'xen_set_fixmap': arch/x86/xen/enlighten.c:1127: error: 'FIX_KMAP_BEGIN' undeclared (first use in this function) arch/x86/xen/enlighten.c:1127: error: (Each undeclared identifier is reported only once arch/x86/xen/enlighten.c:1127: error: for each function it appears in.) arch/x86/xen/enlighten.c:1127: error: 'FIX_KMAP_END' undeclared (first use in this function) make[1]: *** [arch/x86/xen/enlighten.o] Error 1 make: *** [arch/x86/xen/enlighten.o] Error 2 FIX_KMAP_BEGIN is only available on HIGHMEM. Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index fe47993..f4f7f16 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1142,7 +1142,9 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot) #ifdef CONFIG_X86_32 case FIX_WP_TEST: case FIX_VDSO: +# ifdef CONFIG_HIGHMEM case FIX_KMAP_BEGIN ... FIX_KMAP_END: +# endif #else case VSYSCALL_LAST_PAGE ... VSYSCALL_FIRST_PAGE: #endif -- 1.5.4.1 linux-2.6-xen-0068-Revert-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch: --- NEW FILE linux-2.6-xen-0068-Revert-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch --- >From 6c3302f201fef8d03986ec9becee9f4ee0c45883 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 9 Jul 2008 22:17:01 +0200 Subject: [PATCH] Revert "suspend, xen: enable PM_SLEEP for CONFIG_XEN" This reverts commit 6fbbec428c8e7bb617da2e8a589af2e97bcf3bc4. Rafael doesnt like it - it breaks various assumptions. Signed-off-by: Ingo Molnar --- kernel/power/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 1436c47..b45da40 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -82,7 +82,7 @@ config PM_SLEEP_SMP config PM_SLEEP bool - depends on SUSPEND || HIBERNATION || XEN + depends on SUSPEND || HIBERNATION default y config SUSPEND -- 1.5.4.1 linux-2.6-xen-0069-Revert-x86_64-there-s-no-need-to-preallocate-level.patch: --- NEW FILE linux-2.6-xen-0069-Revert-x86_64-there-s-no-need-to-preallocate-level.patch --- >From b1859451e075888332a6bb70a3e9a07570e99c6d Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 9 Jul 2008 22:32:33 +0200 Subject: [PATCH] Revert "x86_64: there's no need to preallocate level1_fixmap_pgt" This reverts commit 033786969d1d1b5af12a32a19d3a760314d05329. Suresh Siddha reported that this broke booting on his 2GB testbox. Reported-by: Suresh Siddha Signed-off-by: Ingo Molnar --- arch/x86/kernel/head_64.S | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 2240f82..db3280a 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -362,6 +362,12 @@ NEXT_PAGE(level3_kernel_pgt) .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE NEXT_PAGE(level2_fixmap_pgt) + .fill 506,8,0 + .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE + /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */ + .fill 5,8,0 + +NEXT_PAGE(level1_fixmap_pgt) .fill 512,8,0 NEXT_PAGE(level2_ident_pgt) -- 1.5.4.1 linux-2.6-xen-0070-xen64-disable-32-bit-syscall-sysenter-if-not-suppor.patch: --- NEW FILE linux-2.6-xen-0070-xen64-disable-32-bit-syscall-sysenter-if-not-suppor.patch --- >From a62c6a09eaaffc74271515f63172a13a56b41c35 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Thu, 10 Jul 2008 16:24:08 -0700 Subject: [PATCH] xen64: disable 32-bit syscall/sysenter if not supported. Old versions of Xen (3.1 and before) don't support sysenter or syscall from 32-bit compat userspaces. If we can't set the appropriate syscall callback, then disable the corresponding feature bit, which will cause the vdso32 setup to fall back appropriately. Linux assumes that syscall is always available to 32-bit userspace, and installs it by default if sysenter isn't available. In that case, we just disable vdso altogether, forcing userspace libc to fall back to int $0x80. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar --- arch/x86/xen/setup.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 9d7a144..9cce4a9 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -106,46 +106,46 @@ static __cpuinit int register_callback(unsigned type, const void *func) void __cpuinit xen_enable_sysenter(void) { - int cpu = smp_processor_id(); extern void xen_sysenter_target(void); int ret; + unsigned sysenter_feature; #ifdef CONFIG_X86_32 - if (!boot_cpu_has(X86_FEATURE_SEP)) { - return; - } + sysenter_feature = X86_FEATURE_SEP; #else - if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL && - boot_cpu_data.x86_vendor != X86_VENDOR_CENTAUR) { - return; - } + sysenter_feature = X86_FEATURE_SYSENTER32; #endif + if (!boot_cpu_has(sysenter_feature)) + return; + ret = register_callback(CALLBACKTYPE_sysenter, xen_sysenter_target); - if(ret != 0) { - clear_cpu_cap(&cpu_data(cpu), X86_FEATURE_SEP); - clear_cpu_cap(&boot_cpu_data, X86_FEATURE_SEP); - } + if(ret != 0) + setup_clear_cpu_cap(sysenter_feature); } void __cpuinit xen_enable_syscall(void) { #ifdef CONFIG_X86_64 - int cpu = smp_processor_id(); int ret; extern void xen_syscall_target(void); extern void xen_syscall32_target(void); ret = register_callback(CALLBACKTYPE_syscall, xen_syscall_target); if (ret != 0) { - printk("failed to set syscall: %d\n", ret); - clear_cpu_cap(&cpu_data(cpu), X86_FEATURE_SYSCALL); - clear_cpu_cap(&boot_cpu_data, X86_FEATURE_SYSCALL); - } else { + printk(KERN_ERR "Failed to set syscall: %d\n", ret); + /* Pretty fatal; 64-bit userspace has no other + mechanism for syscalls. */ + } + + if (boot_cpu_has(X86_FEATURE_SYSCALL32)) { ret = register_callback(CALLBACKTYPE_syscall32, xen_syscall32_target); - if (ret != 0) - printk("failed to set 32-bit syscall: %d\n", ret); + if (ret != 0) { + printk(KERN_INFO "Xen: 32-bit syscall not supported: disabling vdso\n"); + setup_clear_cpu_cap(X86_FEATURE_SYSCALL32); + sysctl_vsyscall32 = 0; + } } #endif /* CONFIG_X86_64 */ } -- 1.5.4.1 linux-2.6-xen-0071-x86-xen-vdso-fix-build-error.patch: --- NEW FILE linux-2.6-xen-0071-x86-xen-vdso-fix-build-error.patch --- >From 1ff7f73a7d98957eaa89545cc0cb53f646c53e6f Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 11 Jul 2008 22:41:34 +0200 Subject: [PATCH] x86, xen, vdso: fix build error fix: arch/x86/xen/built-in.o: In function `xen_enable_syscall': (.cpuinit.text+0xdb): undefined reference to `sysctl_vsyscall32' Signed-off-by: Ingo Molnar --- arch/x86/xen/setup.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 9cce4a9..3e11779 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -144,7 +144,9 @@ void __cpuinit xen_enable_syscall(void) if (ret != 0) { printk(KERN_INFO "Xen: 32-bit syscall not supported: disabling vdso\n"); setup_clear_cpu_cap(X86_FEATURE_SYSCALL32); +#ifdef CONFIG_COMPAT sysctl_vsyscall32 = 0; +#endif } } #endif /* CONFIG_X86_64 */ -- 1.5.4.1 linux-2.6-xen-0072-x86_64-further-cleanup-of-32-bit-compat-syscall-mec.patch: --- NEW FILE linux-2.6-xen-0072-x86_64-further-cleanup-of-32-bit-compat-syscall-mec.patch --- >From 03180ed589a13b9ae8d6779c2178315e70c17e69 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Sat, 12 Jul 2008 02:22:00 -0700 Subject: [PATCH] x86_64: further cleanup of 32-bit compat syscall mechanisms AMD only supports "syscall" from 32-bit compat usermode. Intel and Centaur(?) only support "sysenter" from 32-bit compat usermode. Set the X86 feature bits accordingly, and set up the vdso in accordance with those bits. On the offchance we run on in a 64-bit environment which supports neither syscall nor sysenter from 32-bit mode, then fall back to the int $0x80 vdso. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: H. Peter Anvin --- arch/x86/kernel/cpu/amd_64.c | 2 ++ arch/x86/kernel/cpu/common_64.c | 3 --- arch/x86/vdso/Makefile | 2 +- arch/x86/vdso/vdso32-setup.c | 19 +++++++++---------- arch/x86/vdso/vdso32.S | 13 ++++++++----- arch/x86/xen/setup.c | 10 +++++++--- include/asm-x86/vdso.h | 8 ++++++++ 7 files changed, 35 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c index 7c36fb8..d1692b2 100644 --- a/arch/x86/kernel/cpu/amd_64.c +++ b/arch/x86/kernel/cpu/amd_64.c @@ -115,6 +115,8 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) /* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */ if (c->x86_power & (1<<8)) set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); + + set_cpu_cap(c, X86_FEATURE_SYSCALL32); } static void __cpuinit init_amd(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c index 15419cd..736f50f 100644 --- a/arch/x86/kernel/cpu/common_64.c +++ b/arch/x86/kernel/cpu/common_64.c @@ -317,9 +317,6 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) c->x86_phys_bits = eax & 0xff; } - /* Assume all 64-bit CPUs support 32-bit syscall */ - set_cpu_cap(c, X86_FEATURE_SYSCALL32); - if (c->x86_vendor != X86_VENDOR_UNKNOWN && cpu_devs[c->x86_vendor]->c_early_init) cpu_devs[c->x86_vendor]->c_early_init(c); diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index b7ad9f8..4d6ef0a 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile @@ -62,7 +62,7 @@ $(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE # Build multiple 32-bit vDSO images to choose from at boot time. # obj-$(VDSO32-y) += vdso32-syms.lds -vdso32.so-$(CONFIG_X86_32) += int80 +vdso32.so-$(VDSO32-y) += int80 vdso32.so-$(CONFIG_COMPAT) += syscall vdso32.so-$(VDSO32-y) += sysenter diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c index eba2527..2fb420a 100644 --- a/arch/x86/vdso/vdso32-setup.c +++ b/arch/x86/vdso/vdso32-setup.c @@ -193,17 +193,12 @@ static __init void relocate_vdso(Elf32_Ehdr *ehdr) } } -/* - * These symbols are defined by vdso32.S to mark the bounds - * of the ELF DSO images included therein. - */ -extern const char vdso32_default_start, vdso32_default_end; -extern const char vdso32_sysenter_start, vdso32_sysenter_end; static struct page *vdso32_pages[1]; #ifdef CONFIG_X86_64 #define vdso32_sysenter() (boot_cpu_has(X86_FEATURE_SYSENTER32)) +#define vdso32_syscall() (boot_cpu_has(X86_FEATURE_SYSCALL32)) /* May not be __init: called during resume */ void syscall32_cpu_init(void) @@ -226,6 +221,7 @@ static inline void map_compat_vdso(int map) #else /* CONFIG_X86_32 */ #define vdso32_sysenter() (boot_cpu_has(X86_FEATURE_SEP)) +#define vdso32_syscall() (0) void enable_sep_cpu(void) { @@ -296,12 +292,15 @@ int __init sysenter_setup(void) gate_vma_init(); #endif - if (!vdso32_sysenter()) { - vsyscall = &vdso32_default_start; - vsyscall_len = &vdso32_default_end - &vdso32_default_start; - } else { + if (vdso32_syscall()) { + vsyscall = &vdso32_syscall_start; + vsyscall_len = &vdso32_syscall_end - &vdso32_syscall_start; + } else if (vdso32_sysenter()){ vsyscall = &vdso32_sysenter_start; vsyscall_len = &vdso32_sysenter_end - &vdso32_sysenter_start; + } else { + vsyscall = &vdso32_int80_start; + vsyscall_len = &vdso32_int80_end - &vdso32_int80_start; } memcpy(syscall_page, vsyscall, vsyscall_len); diff --git a/arch/x86/vdso/vdso32.S b/arch/x86/vdso/vdso32.S index 1e36f72..2ce5f82 100644 --- a/arch/x86/vdso/vdso32.S +++ b/arch/x86/vdso/vdso32.S @@ -2,14 +2,17 @@ __INITDATA - .globl vdso32_default_start, vdso32_default_end -vdso32_default_start: -#ifdef CONFIG_X86_32 + .globl vdso32_int80_start, vdso32_int80_end +vdso32_int80_start: .incbin "arch/x86/vdso/vdso32-int80.so" -#else +vdso32_int80_end: + + .globl vdso32_syscall_start, vdso32_syscall_end +vdso32_syscall_start: +#ifdef CONFIG_COMPAT .incbin "arch/x86/vdso/vdso32-syscall.so" #endif -vdso32_default_end: +vdso32_syscall_end: .globl vdso32_sysenter_start, vdso32_sysenter_end vdso32_sysenter_start: diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 3e11779..e3648e6 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -83,12 +83,16 @@ static void xen_idle(void) /* * Set the bit indicating "nosegneg" library variants should be used. + * We only need to bother in pure 32-bit mode; compat 32-bit processes + * can have un-truncated segments, so wrapping around is allowed. */ static void __init fiddle_vdso(void) { -#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) - extern const char vdso32_default_start; - u32 *mask = VDSO32_SYMBOL(&vdso32_default_start, NOTE_MASK); +#ifdef CONFIG_X86_32 + u32 *mask; + mask = VDSO32_SYMBOL(&vdso32_int80_start, NOTE_MASK); + *mask |= 1 << VDSO_NOTE_NONEGSEG_BIT; + mask = VDSO32_SYMBOL(&vdso32_sysenter_start, NOTE_MASK); *mask |= 1 << VDSO_NOTE_NONEGSEG_BIT; #endif } diff --git a/include/asm-x86/vdso.h b/include/asm-x86/vdso.h index 86e085e..8e18fb8 100644 --- a/include/asm-x86/vdso.h +++ b/include/asm-x86/vdso.h @@ -36,4 +36,12 @@ extern const char VDSO32_PRELINK[]; extern void __user __kernel_sigreturn; extern void __user __kernel_rt_sigreturn; +/* + * These symbols are defined by vdso32.S to mark the bounds + * of the ELF DSO images included therein. + */ +extern const char vdso32_int80_start, vdso32_int80_end; +extern const char vdso32_syscall_start, vdso32_syscall_end; +extern const char vdso32_sysenter_start, vdso32_sysenter_end; + #endif /* asm-x86/vdso.h */ -- 1.5.4.1 linux-2.6-xen-0073-x86-xen-no-need-to-disable-vdso32.patch: --- NEW FILE linux-2.6-xen-0073-x86-xen-no-need-to-disable-vdso32.patch --- >From 9a62aefe50431ed62922a226e93a0871970c86f1 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Sat, 12 Jul 2008 02:22:06 -0700 Subject: [PATCH] x86: xen: no need to disable vdso32 Now that the vdso32 code can cope with both syscall and sysenter missing for 32-bit compat processes, just disable the features without disabling vdso altogether. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: H. Peter Anvin --- arch/x86/xen/setup.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index e3648e6..b6acc3a 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -137,7 +137,7 @@ void __cpuinit xen_enable_syscall(void) ret = register_callback(CALLBACKTYPE_syscall, xen_syscall_target); if (ret != 0) { - printk(KERN_ERR "Failed to set syscall: %d\n", ret); + printk(KERN_ERR "Failed to set syscall callback: %d\n", ret); /* Pretty fatal; 64-bit userspace has no other mechanism for syscalls. */ } @@ -145,13 +145,8 @@ void __cpuinit xen_enable_syscall(void) if (boot_cpu_has(X86_FEATURE_SYSCALL32)) { ret = register_callback(CALLBACKTYPE_syscall32, xen_syscall32_target); - if (ret != 0) { - printk(KERN_INFO "Xen: 32-bit syscall not supported: disabling vdso\n"); + if (ret != 0) setup_clear_cpu_cap(X86_FEATURE_SYSCALL32); -#ifdef CONFIG_COMPAT - sysctl_vsyscall32 = 0; -#endif - } } #endif /* CONFIG_X86_64 */ } -- 1.5.4.1 linux-2.6-xen-0074-x86_64-adjust-exception-frame-on-paranoid-exception.patch: --- NEW FILE linux-2.6-xen-0074-x86_64-adjust-exception-frame-on-paranoid-exception.patch --- >From 0ee2b40760c097c3946d8c27f96ba688bc375869 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Sat, 12 Jul 2008 02:22:12 -0700 Subject: [PATCH] x86_64: adjust exception frame on paranoid exceptions Exceptions using paranoidentry need to have their exception frames adjusted explicitly. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: H. Peter Anvin --- arch/x86/kernel/entry_64.S | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 6aa6932..80d5663 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1189,6 +1189,7 @@ END(device_not_available) /* runs on exception stack */ KPROBE_ENTRY(debug) INTR_FRAME + PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $0 CFI_ADJUST_CFA_OFFSET 8 paranoidentry do_debug, DEBUG_STACK @@ -1198,6 +1199,7 @@ KPROBE_END(debug) /* runs on exception stack */ KPROBE_ENTRY(nmi) INTR_FRAME + PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $-1 CFI_ADJUST_CFA_OFFSET 8 paranoidentry do_nmi, 0, 0 @@ -1211,6 +1213,7 @@ KPROBE_END(nmi) KPROBE_ENTRY(int3) INTR_FRAME + PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $0 CFI_ADJUST_CFA_OFFSET 8 paranoidentry do_int3, DEBUG_STACK @@ -1237,6 +1240,7 @@ END(coprocessor_segment_overrun) /* runs on exception stack */ ENTRY(double_fault) XCPT_FRAME + PARAVIRT_ADJUST_EXCEPTION_FRAME paranoidentry do_double_fault jmp paranoid_exit1 CFI_ENDPROC @@ -1253,6 +1257,7 @@ END(segment_not_present) /* runs on exception stack */ ENTRY(stack_segment) XCPT_FRAME + PARAVIRT_ADJUST_EXCEPTION_FRAME paranoidentry do_stack_segment jmp paranoid_exit1 CFI_ENDPROC @@ -1278,6 +1283,7 @@ END(spurious_interrupt_bug) /* runs on exception stack */ ENTRY(machine_check) INTR_FRAME + PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $0 CFI_ADJUST_CFA_OFFSET 8 paranoidentry do_machine_check -- 1.5.4.1 linux-2.6-xen-0075-x86-xen-power-fix-up-config-dependencies-on-PM.patch: --- NEW FILE linux-2.6-xen-0075-x86-xen-power-fix-up-config-dependencies-on-PM.patch --- >From 274e69003e56a7d488569429440428a700798de0 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 15 Jul 2008 13:43:42 -0700 Subject: [PATCH] x86, xen, power: fix up config dependencies on PM Xen save/restore needs bits of code enabled by PM_SLEEP, and PM_SLEEP depends on PM. So make XEN_SAVE_RESTORE depend on PM and PM_SLEEP depend on XEN_SAVE_RESTORE. Signed-off-by: Jeremy Fitzhardinge Acked-by: Rafael J. Wysocki Signed-off-by: Ingo Molnar --- arch/x86/xen/Kconfig | 5 +++++ kernel/power/Kconfig | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 37d1bcb..8585475 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -24,6 +24,11 @@ config XEN_MAX_DOMAIN_MEMORY domain. This array uses 1 page per gigabyte, so there's no need to be too stingy here. +config XEN_SAVE_RESTORE + bool + depends on PM + default y + config XENCTRL tristate "Xen's user space control interfaces" depends on XEN && PROC_FS && SYSFS diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index b45da40..59dfdf1 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -82,7 +82,7 @@ config PM_SLEEP_SMP config PM_SLEEP bool - depends on SUSPEND || HIBERNATION + depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE default y config SUSPEND -- 1.5.4.1 linux-2.6-xen-0076-linux-next-pci-tree-build-failure.patch: --- NEW FILE linux-2.6-xen-0076-linux-next-pci-tree-build-failure.patch --- >From 8e2c4a66e3132aa5e5209906484f3a0ab50e7a44 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 17 Jul 2008 13:09:24 +1000 Subject: [PATCH] linux-next: pci tree build failure Today's linux-next build (x86_64 allmodconfig) failed like this: drivers/xen/manage.c: In function 'xen_suspend': drivers/xen/manage.c:66: error: too few arguments to function 'device_power_up' drivers/xen/manage.c: In function 'do_suspend': drivers/xen/manage.c:117: error: too few arguments to function 'device_resume' Caused by commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc ("Introduce new top level suspend and hibernation callbacks") interacting with new usages ... Signed-off-by: Stephen Rothwell Cc: Jeremy Fitzhardinge Acked-by: Rafael J. Wysocki Cc: Jesse Barnes Signed-off-by: Ingo Molnar --- drivers/xen/manage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 2bb268e..a5bc91a 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -63,7 +63,7 @@ static int xen_suspend(void *data) gnttab_resume(); xen_mm_unpin_all(); - device_power_up(); + device_power_up(PMSG_RESUME); if (!*cancelled) { xen_irq_resume(); @@ -114,7 +114,7 @@ static void do_suspend(void) } else xenbus_suspend_cancel(); - device_resume(); + device_resume(PMSG_RESUME); /* Make sure timer events get retriggered on all CPUs */ clock_was_set(); -- 1.5.4.1 --- NEW FILE linux-2.6.26.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIeogDyGugalF9Dw4RAk4IAJ4g+RxY+bf8pYzXhWQ6ltKoM+Z3VQCfYFI6 wUkbvVqKn/rTx7kqTtudjVg= =4xMU -----END PGP SIGNATURE----- --- NEW FILE patch-2.6.26-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIf5d2yGugalF9Dw4RAn/bAJ9rP7PXt6TKJixwppG6TXsOa+DBfgCfVoaG tK787YfT46Uj71hVle0RtEw= =J90n -----END PGP SIGNATURE----- Index: .gitignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.gitignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .gitignore 16 Jun 2008 10:19:26 -0000 1.8 +++ .gitignore 18 Jul 2008 14:57:38 -0000 1.9 @@ -2,8 +2,7 @@ GNUmakefile kernel-2.6.*.config temp-* -kernel-2.6.25 -linux-2.6.25.tar.bz2 -patch-2.6.26-rc6.bz2 -patch-2.6.26-rc6-git2.bz2 +kernel-2.6.26 +linux-2.6.26.tar.bz2 +patch-2.6.26-git6.bz2 xen-3.2.0.tar.gz Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile 16 Jun 2008 10:19:26 -0000 1.23 +++ Makefile 18 Jul 2008 14:57:39 -0000 1.24 @@ -48,7 +48,6 @@ @perl -pi -e 's/# CONFIG_DEBUG_SPINLOCK is not set/CONFIG_DEBUG_SPINLOCK=y/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_SLEEP_IN_IRQ is not set/CONFIG_DEBUG_SLEEP_IN_IRQ=y/' config-nodebug - @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug @perl -pi -e 's/# CONFIG_FAULT_INJECTION is not set/CONFIG_FAULT_INJECTION=y/' config-nodebug @perl -pi -e 's/# CONFIG_FAILSLAB is not set/CONFIG_FAILSLAB=y/' config-nodebug @perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug @@ -63,6 +62,9 @@ @perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/CONFIG_DEBUG_OBJECTS_TIMERS=y/' config-nodebug @perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug @perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug + @perl -pi -e 's/# CONFIG_SND_DEBUG_VERBOSE is not set/CONFIG_SND_DEBUG_VERBOSE=y/' config-nodebug + # just in case we're going from extremedebug -> debug + @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug @perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec @@ -95,13 +97,14 @@ @perl -pi -e 's/CONFIG_DEBUG_OBJECTS_TIMERS=y/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/' config-nodebug @perl -pi -e 's/CONFIG_X86_PTDUMP=y/# CONFIG_X86_PTDUMP is not set/' config-nodebug @perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug + @perl -pi -e 's/CONFIG_SND_DEBUG_VERBOSE=y/# CONFIG_SND_DEBUG_VERBOSE is not set/' config-nodebug @perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec reconfig: @rm -f kernel-*-config - @VERSION="2.6.26" make -f Makefile.config configs + @VERSION="2.6.27" make -f Makefile.config configs @scripts/reconfig.sh # since i386 isn't a target... Index: Makefile.config =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Makefile.config,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.config 16 Jun 2008 10:19:26 -0000 1.23 +++ Makefile.config 18 Jul 2008 14:57:39 -0000 1.24 @@ -16,7 +16,7 @@ $(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \ $(CFG)-ia64-xen.config -PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64 sparc +PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) configs: $(CONFIGFILES) @@ -46,9 +46,6 @@ temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic perl merge.pl $^ > $@ -temp-sparc-generic: config-sparc-generic temp-generic - perl merge.pl $^ > $@ - temp-sparc64-generic: config-sparc64-generic temp-generic perl merge.pl $^ > $@ @@ -103,12 +100,9 @@ kernel-$(VERSION)-sparc64-smp.config: config-sparc64-smp temp-sparc64-generic perl merge.pl $^ sparc64 > $@ -kernel-$(VERSION)-sparc64.config: config-sparc64 temp-sparc64-generic +kernel-$(VERSION)-sparc64.config: /dev/null temp-sparc64-generic perl merge.pl $^ sparc64 > $@ -kernel-$(VERSION)-sparc.config: config-sparc temp-sparc-generic - perl merge.pl $^ sparc > $@ - kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic perl merge.pl $^ powerpc > $@ Index: config-debug =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-debug,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-debug 16 Jun 2008 10:19:26 -0000 1.5 +++ config-debug 18 Jul 2008 14:57:39 -0000 1.6 @@ -1,6 +1,7 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_DETECT=y +CONFIG_SND_DEBUG_VERBOSE=y CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_DEBUG_MUTEXES=y Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-generic,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- config-generic 16 Jun 2008 10:19:26 -0000 1.9 +++ config-generic 18 Jul 2008 14:57:39 -0000 1.10 @@ -14,6 +14,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y + # # General setup # @@ -110,6 +111,8 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_RICOH_MMC=m CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_WBSD=m @@ -148,6 +151,8 @@ # Generic Driver Options # CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" # CONFIG_SPI is not set @@ -289,6 +294,7 @@ CONFIG_ISAPNP=y # CONFIG_PNPBIOS is not set +CONFIG_ACPI_PCI_SLOT=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m @@ -342,6 +348,7 @@ # CONFIG_BLK_DEV_IT8213 is not set # CONFIG_BLK_DEV_TC86C001 is not set CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_INTEGRITY=y # @@ -426,15 +433,20 @@ CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_TGT=m +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m + # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=m +CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_SCH=m # @@ -490,7 +502,7 @@ CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m -CONFIG_ATA=m +CONFIG_ATA=y CONFIG_ATA_SFF=y CONFIG_ATA_PIIX=m CONFIG_ATA_ACPI=y @@ -1033,7 +1045,7 @@ CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set CONFIG_NETDEVICES=y -# CONFIG_NETDEVICES_MULTIQUEUE is not set +CONFIG_NETDEVICES_MULTIQUEUE=y # # ARCnet devices @@ -1251,7 +1263,7 @@ # # Wireless LAN # -CONFIG_WLAN_PRE80211=y +# CONFIG_WLAN_PRE80211 is not set # CONFIG_STRIP is not set # CONFIG_ARLAN is not set CONFIG_PCMCIA_WAVELAN=m @@ -1260,6 +1272,7 @@ # CONFIG_PCMCIA_RAYCS is not set CONFIG_MAC80211=m +CONFIG_MAC80211_QOS=y CONFIG_MAC80211_RC_DEFAULT_PID=y # CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set CONFIG_MAC80211_RC_DEFAULT="pid" @@ -1268,8 +1281,11 @@ CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y +# CONFIG_MAC80211_DEBUG_MENU is not set +# CONFIG_MAC80211_DEBUG is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set # CONFIG_MAC80211_DEBUG is not set + CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -1279,6 +1295,8 @@ CONFIG_IEEE80211_SOFTMAC_DEBUG=y CONFIG_CFG80211=m CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_ADM8211=m CONFIG_ATH5K=m @@ -1329,9 +1347,11 @@ CONFIG_IWL5000=y CONFIG_IWL5000_RUN_TIME_CALIB=y CONFIG_IWL3945=m +CONFIG_IWL3945_RFKILL=y CONFIG_IWL3945_DEBUG=y CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y CONFIG_IWL3945_LEDS=y +CONFIG_MAC80211_HWSIM=m CONFIG_NORTEL_HERMES=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m @@ -1822,6 +1842,10 @@ # CONFIG_I2C_ELEKTOR is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_NFORCE2_S4985 is not set +CONFIG_AT24=m + CONFIG_I2C_NFORCE2=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_PARPORT=m @@ -1838,7 +1862,7 @@ # CONFIG_I2C_SIS96X is not set CONFIG_I2C_SIMTEC=m CONFIG_I2C_STUB=m -# CONFIG_I2C_TINY_USB is not set +CONFIG_I2C_TINY_USB=m # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set @@ -2172,6 +2196,7 @@ CONFIG_TUNER_3036=m # CONFIG_TUNER_TEA5761 is not set +CONFIG_USB_VIDEO_CLASS=m # # Radio Adapters @@ -2425,6 +2450,8 @@ CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5 +CONFIG_SND_DRIVERS=y + # # ISA devices # @@ -2434,6 +2461,7 @@ # # PCI devices # +CONFIG_SND_PCI=y CONFIG_SND_ADLIB=m CONFIG_SND_ALI5451=m CONFIG_SND_ALS300=m @@ -2490,7 +2518,7 @@ CONFIG_SND_NM256=m CONFIG_SND_OXYGEN=m CONFIG_SND_RME32=m -# CONFIG_SND_PCSP is not set +CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_RIPTIDE=m CONFIG_SND_RME96=m @@ -2510,6 +2538,7 @@ # # ALSA USB devices # +CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y @@ -2518,6 +2547,7 @@ # # PCMCIA devices # +# CONFIG_SND_PCMCIA is not set # CONFIG_SND_VXPOCKET is not set # @@ -2689,7 +2719,7 @@ CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_GARMIN=m +# CONFIG_USB_SERIAL_GARMIN is not set CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IPW=m @@ -2774,7 +2804,7 @@ CONFIG_USB_PHIDGETMOTORCONTROL=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_RIO500=m +# CONFIG_USB_RIO500 is not set CONFIG_USB_QUICKCAM_MESSENGER=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SISUSBVGA=m @@ -2972,6 +3002,7 @@ # CONFIG_OCFS2_DEBUG_MASKLOG is not set CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +# CONFIG_OCFS2_FS_STATS is not set CONFIG_CONFIGFS_FS=m CONFIG_DLM=m @@ -2980,6 +3011,11 @@ CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +# CONFIG_UBIFS_FS_DEBUG is not set + # # Partition Types # @@ -3150,6 +3186,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_SEED=m @@ -3169,6 +3209,9 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# Random number generation +CONFIG_CRYPTO_PRNG=m + # # Library routines # @@ -3176,6 +3219,7 @@ CONFIG_CRC32=m CONFIG_CRC_CCITT=m CONFIG_CRC_ITU_T=m +CONFIG_CRC_T10DIF=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m @@ -3207,6 +3251,7 @@ CONFIG_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_SCHED=y +# NOTE: Before changing the below, take notice that page struct will grow past a cacheline on 32bit. # CONFIG_CGROUP_MEM_RES_CTLR is not set CONFIG_CPUSETS=y @@ -3426,7 +3471,14 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_UTRACE=y -CONFIG_PTRACE=y +CONFIG_UTRACE_PTRACE=y + +CONFIG_FTRACE=y +CONFIG_IRQSOFF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_KPROBES=y @@ -3539,3 +3591,4 @@ CONFIG_SOC_CAMERA_MT9V022=m # MT9V022_PCA9536_SWITCH is not set +CONFIG_THERMAL_HWMON=y Index: config-ia64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-ia64,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-ia64 29 Oct 2007 17:29:06 -0000 1.2 +++ config-ia64 18 Jul 2008 14:57:39 -0000 1.3 @@ -1,3 +1,2 @@ CONFIG_CRASH_DUMP=y CONFIG_PROC_VMCORE=y - Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-ia64-generic,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-ia64-generic 16 Jun 2008 10:19:26 -0000 1.4 +++ config-ia64-generic 18 Jul 2008 14:57:39 -0000 1.5 @@ -119,7 +119,7 @@ # CONFIG_ACPI_BAY is not set # CONFIG_ACPI_BATTERY is not set CONFIG_ACPI_BLACKLIST_YEAR=0 -CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_BUTTON=y # CONFIG_ACPI_DOCK is not set CONFIG_ACPI_EC=y CONFIG_ACPI_FAN=y @@ -201,3 +201,6 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m + +CONFIG_UTRACE=n +CONFIG_UTRACE_PTRACE=n Index: config-nodebug =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-nodebug,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config-nodebug 16 Jun 2008 10:19:26 -0000 1.6 +++ config-nodebug 18 Jul 2008 14:57:39 -0000 1.7 @@ -1,6 +1,7 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_DETECT=y +CONFIG_SND_DEBUG_VERBOSE=y CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_DEBUG_MUTEXES=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-powerpc-generic,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-powerpc-generic 16 Jun 2008 10:19:26 -0000 1.5 +++ config-powerpc-generic 18 Jul 2008 14:57:39 -0000 1.6 @@ -211,6 +211,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y # CONFIG_MPC5121_ADS is not set +# CONFIG_MPC5121_GENERIC is not set CONFIG_MTD_OF_PARTS=m # CONFIG_MTD_NAND_FSL_ELBC is not set CONFIG_THERMAL=y @@ -219,3 +220,32 @@ CONFIG_DMADEVICES=y # CONFIG_FSL_DMA is not set + +CONFIG_SND_PPC=y + +# BORKED. +# arch/powerpc/platforms/82xx/ep8248e.c:129: undefined reference to `alloc_mdio_bitbang' +# arch/powerpc/platforms/82xx/ep8248e.c:143: undefined reference to `mdiobus_register' +# CONFIG_PPC_82xx is not set +CONFIG_PPC_83xx=y +CONFIG_PPC_86xx=y +CONFIG_EXTRA_TARGETS="" +# CONFIG_CODE_PATCHING_SELFTEST is not set +# CONFIG_FTR_FIXUP_SELFTEST is not set + +# CONFIG_MATH_EMULATION is not set +# CONFIG_RAPIDIO is not set +# CONFIG_FS_ENET is not set +# CONFIG_UCC_GETH is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_SERIAL_CPM is not set +# CONFIG_SERIAL_QE is not set +# CONFIG_I2C_CPM is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_W1_MASTER_GPIO is not set +# CONFIG_MT9M001_PCA9536_SWITCH is not set +# CONFIG_MT9V022_PCA9536_SWITCH is not set +# CONFIG_LEDS_GPIO is not set +# CONFIG_KGDB_CONSOLE is not set + Index: config-powerpc32-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-powerpc32-generic,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-powerpc32-generic 16 Jun 2008 10:19:26 -0000 1.5 +++ config-powerpc32-generic 18 Jul 2008 14:57:39 -0000 1.6 @@ -13,7 +13,29 @@ CONFIG_PPC_PREP=y # CONFIG_PPC_MPC5200_SIMPLE is not set +# CONFIG_SATA_PMP is not set +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SIL24 is not set CONFIG_SATA_FSL=m +# CONFIG_SATA_SVW is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_SATA_INIC162X is not set + +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_MM is not set +# CONFIG_MEGARAID_MAILBOX is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set + CONFIG_GIANFAR=m CONFIG_GFAR_NAPI=y CONFIG_USB_EHCI_FSL=y @@ -71,7 +93,44 @@ # CONFIG_UDBG_RTAS_CONSOLE is not set CONFIG_BRIQ_PANEL=m +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set CONFIG_PATA_MPC52xx=m +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_PCMCIA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_QDI is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_WINBOND is not set + +# CONFIG_TR is not set CONFIG_SERIAL_MPC52xx=y CONFIG_SERIAL_MPC52xx_CONSOLE=y @@ -92,12 +151,23 @@ CONFIG_HIGH_RES_TIMERS=y # CONFIG_BLK_DEV_PLATFORM is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_BLK_DEV_4DRIVES is not set # CONFIG_BLK_DEV_ALI14XX is not set # CONFIG_BLK_DEV_DTC2278 is not set # CONFIG_BLK_DEV_HT6560B is not set # CONFIG_BLK_DEV_QD65XX is not set # CONFIG_BLK_DEV_UMC8672 is not set +# CONFIG_BLK_DEV_DELKIN is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_SX8 is not set + +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + # CONFIG_VIRQ_DEBUG is not set CONFIG_PPC_BESTCOMM_ATA=m @@ -116,5 +186,118 @@ # CONFIG_GPIO_PCF857X is not set # CONFIG_HTC_EGPIO is not set +# CONFIG_PARIDE is not set +# CONFIG_PARPORT_PC_PCMCIA is not set +# CONFIG_MTD is not set +# CONFIG_TIFM_CORE is not set + +# CONFIG_RFKILL is not set +# CONFIG_DONGLE is not set +# CONFIG_IP_VS is not set + + +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_ATA_OVER_ETH is not set + +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_FC_TGT_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_SCSI_ARCMSR_AER is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_ISCSI is not set + +# CONFIG_ISCSI_TCP is not set + +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SAS_ATA is not set +# CONFIG_SCSI_SAS_HOST_SMP is not set + +# CONFIG_FUSION is not set + +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set + +# CONFIG_WLAN_80211 is not set + +# CONFIG_IWLWIFI is not set +# CONFIG_IWLCORE is not set +# CONFIG_IWL3945 is not set +# CONFIG_IWL4965 is not set +# CONFIG_ISDN is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set +# CONFIG_WDT_501_PCI is not set + +# CONFIG_I2C_NFORCE2 is not set + +# CONFIG_SND_ADLIB is not set +# CONFIG_SND_CS4236 is not set +# CONFIG_SND_SC6000 is not set +# CONFIG_SND_OPL3SA2 is not set +# CONFIG_SND_MIRO is not set +# CONFIG_SND_SB16 is not set +# CONFIG_SND_SBAWE is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set + +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_INFINIBAND is not set + +# CONFIG_IPMI_HANDLER is not set +# CONFIG_TCG_TPM is not set + # PPC gets sad with debug alloc (bz 448598) # CONFIG_DEBUG_PAGEALLOC is not set + +CONFIG_SND_ISA=y +CONFIG_CRYPTO_DEV_TALITOS=m + +CONFIG_FSL_EMB_PERFMON=y +CONFIG_MPC8272_ADS=y +CONFIG_PQ2FADS=y +CONFIG_EP8248E=y +CONFIG_MPC831x_RDB=y +CONFIG_MPC832x_MDS=y +CONFIG_MPC832x_RDB=y +CONFIG_MPC834x_MDS=y +CONFIG_MPC834x_ITX=y +CONFIG_MPC836x_MDS=y +CONFIG_MPC836x_RDK=y +CONFIG_MPC837x_MDS=y +CONFIG_MPC837x_RDB=y +CONFIG_SBC834x=y +CONFIG_ASP834x=y +CONFIG_MPC8641_HPCN=y +CONFIG_SBC8641D=y +CONFIG_MPC8610_HPCD=y +CONFIG_83xx_WDT=m + Index: config-powerpc64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-powerpc64,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-powerpc64 16 Jun 2008 10:19:26 -0000 1.5 +++ config-powerpc64 18 Jul 2008 14:57:39 -0000 1.6 @@ -163,3 +163,9 @@ CONFIG_BLK_DEV_HD_ONLY=y CONFIG_VIRTUALIZATION=y +CONFIG_VSX=y + +CONFIG_SCSI_IBMVFC=m +# CONFIG_SCSI_IBMVFC_TRACE is not set +CONFIG_IBM_BSR=m + Index: config-s390x =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-s390x,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-s390x 16 Jun 2008 10:19:26 -0000 1.4 +++ config-s390x 18 Jul 2008 14:57:39 -0000 1.5 @@ -118,7 +118,6 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_WIRELESS_EXT is not set -# CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set # CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set @@ -209,3 +208,6 @@ CONFIG_KVM=m CONFIG_S390_GUEST=y + +CONFIG_MEMORY_HOTPLUG=y +CONFIG_CHSC_SCH=m Index: config-sparc64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-sparc64-generic,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-sparc64-generic 16 Jun 2008 10:19:26 -0000 1.5 +++ config-sparc64-generic 18 Jul 2008 14:57:39 -0000 1.6 @@ -1,3 +1,4 @@ +# CONFIG_SMP is not set CONFIG_SPARC=y CONFIG_SPARC64=y CONFIG_SECCOMP=y @@ -188,3 +189,4 @@ CONFIG_NUMA=y +CONFIG_SND_SPARC=y Index: config-sparc64-smp =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-sparc64-smp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-sparc64-smp 29 Oct 2007 17:29:06 -0000 1.2 +++ config-sparc64-smp 18 Jul 2008 14:57:39 -0000 1.3 @@ -0,0 +1 @@ +CONFIG_SMP=y Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-x86-generic,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-x86-generic 16 Jun 2008 10:19:26 -0000 1.5 +++ config-x86-generic 18 Jul 2008 14:57:39 -0000 1.6 @@ -133,7 +133,7 @@ CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BAY=m CONFIG_ACPI_BLACKLIST_YEAR=1999 -CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_EC=y @@ -253,13 +253,16 @@ CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_I810=m +CONFIG_I2C_ISCH=m CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_PIIX4=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m + CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m CONFIG_I2C_VOODOO3=m @@ -288,6 +291,7 @@ CONFIG_SCHED_MC=y +CONFIG_SND_ISA=y CONFIG_SND_ES18XX=m CONFIG_TCG_INFINEON=m @@ -304,15 +308,18 @@ # CONFIG_SGI_IOC4 is not set CONFIG_ASUS_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_EEEPC_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m -CONFIG_EEEPC_LAPTOP=m # CONFIG_SMSC37B787_WDT is not set CONFIG_W83697HF_WDT=m CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x400000 @@ -376,3 +383,14 @@ CONFIG_NONPROMISC_DEVMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_MAXSMP is not set +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_SYSPROF_TRACER=y + +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_MMIOTRACE is not set + +# CONFIG_DEBUG_PER_CPU_MAPS is not set Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-x86_64-generic,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-x86_64-generic 16 Jun 2008 10:19:26 -0000 1.7 +++ config-x86_64-generic 18 Jul 2008 14:57:39 -0000 1.8 @@ -77,7 +77,7 @@ CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BAY=m CONFIG_ACPI_BLACKLIST_YEAR=0 -CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_EC=y @@ -97,12 +97,15 @@ CONFIG_ACPI_PROC_EVENT=y CONFIG_ASUS_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m CONFIG_SONYPI_COMPAT=y # CONFIG_EEEPC_LAPTOP is not set + CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -154,10 +157,13 @@ CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m # CONFIG_I2C_I810 is not set +CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_PIIX4=m # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set + CONFIG_I2C_SIS96X=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m @@ -254,7 +260,12 @@ CONFIG_SENSORS_I5K_AMB=m -# CONFIG_PARAVIRT_GUEST is not set +CONFIG_PARAVIRT_GUEST=y +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set + # CONFIG_COMPAT_VDSO is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set @@ -274,3 +285,14 @@ CONFIG_DIRECT_GBPAGES=y +# CONFIG_MEMTEST is not set +CONFIG_AMD_IOMMU=y +# CONFIG_MAXSMP is not set +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_SYSPROF_TRACER=y +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_MMIOTRACE is not set + +CONFIG_X86_MPPARSE=y Index: config-xen-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-generic,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config-xen-generic 16 Jun 2008 13:19:10 -0000 1.6 +++ config-xen-generic 18 Jul 2008 14:57:39 -0000 1.7 @@ -11,3 +11,4 @@ CONFIG_XEN_KBDDEV_FRONTEND=y CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 Index: config-xen-x86_64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-x86_64,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-xen-x86_64 16 Jun 2008 13:19:10 -0000 1.7 +++ config-xen-x86_64 18 Jul 2008 14:57:40 -0000 1.8 @@ -1,15 +0,0 @@ -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_GUEST=y - -# CONFIG_SMP is not set -# CONFIG_NUMA is not set -# CONFIG_NEED_MULTIPLE_NODES is not set - -# x86_64 breaks with a different CONFIG_PHYSICAL_START, currently -CONFIG_PHYSICAL_START=0x200000 - -# x86_64 breaks with CONFIG_SPARSEMEM_VMEMMAP, currently -# CONFIG_SPARSEMEM_VMEMMAP is not set - -# CONFIG_KVM_GUEST is not set -# CONFIG_KVM_CLOCK is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- kernel.spec 16 Jun 2008 10:19:26 -0000 1.46 +++ kernel.spec 18 Jul 2008 14:57:40 -0000 1.47 @@ -1,4 +1,4 @@ -Summary: The Linux kernel (the core of the Linux operating system) +Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should @@ -20,18 +20,18 @@ # kernel spec when the kernel is rebased, so fedora_build automatically # works out to the offset from the rebase, so it doesn't get too ginormous. # -%define fedora_cvs_origin 45 +%define fedora_cvs_origin 46 %define fedora_build %(R="$Revision$"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin}) # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base, # which yields a base_sublevel of 21. -%define base_sublevel 25 +%define base_sublevel 26 ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 3 +%define stable_update 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -43,9 +43,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 6 +%define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -76,11 +76,16 @@ %define with_doc %{?_without_doc: 0} %{?!_without_doc: 1} # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} +# kernel-firmware +%define with_firmware %{?_without_firmware: 0} %{?!_without_firmware: 1} # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-bootwrapper (for creating zImages from kernel + initrd) %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} +# don't build the kernel-doc package +%define with_doc 0 + # Additional options for user-friendly one-off kernel building: # # Only build the base kernel (--with baseonly): @@ -251,6 +256,7 @@ # only package docs noarch %ifnarch noarch %define with_doc 0 +%define with_firmware 0 %endif # no need to build headers again for these arches, @@ -418,11 +424,15 @@ %define kernel_smp_obsoletes kernel-enterprise < 2.4.10 %define kernel_PAE_obsoletes kernel-smp < 2.6.17 +# We moved the drm include files into kernel-headers, make sure there's +# a recent enough libdrm-devel on the system that doesn't have those. +%define kernel_headers_conflicts libdrm-devel < 2.4.0-0.15 + # # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.39-1 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.39-1, kernel-firmware >= %{rpmversion}-%{pkg_release} # # This macro does requires, provides, conflicts, obsoletes for a kernel package. @@ -537,8 +547,7 @@ Source70: config-s390x Source90: config-sparc64-generic -Source91: config-sparc64 -Source92: config-sparc64-smp +Source91: config-sparc64-smp # Here should be only the patches up to the upstream canonical Linus tree. @@ -567,8 +576,7 @@ ### BRANCH PATCH ### %endif -# stable release candidate -# Patch03: patch-2.6.24.1-rc1.bz2 +Patch02: git-linus.diff # we always need nonintconfig, even for -vanilla kernels Patch06: linux-2.6-build-nonintconfig.patch @@ -581,7 +589,9 @@ Patch10: linux-2.6-hotfixes.patch -Patch21: linux-2.6-utrace.patch +Patch21: linux-2.6-ptrace-cleanup.patch +Patch22: linux-2.6-tracehook.patch +Patch23: linux-2.6-utrace.patch Patch41: linux-2.6-sysrq-c.patch Patch42: linux-2.6-x86-tune-generic.patch @@ -593,7 +603,6 @@ Patch143: linux-2.6-g5-therm-shutdown.patch Patch144: linux-2.6-vio-modalias.patch Patch147: linux-2.6-imac-transparent-bridge.patch -Patch148: linux-2.6-powerpc-zImage-32MiB.patch Patch149: linux-2.6-efika-not-chrp.patch Patch160: linux-2.6-execshield.patch @@ -602,20 +611,20 @@ Patch270: linux-2.6-debug-taint-vm.patch Patch280: linux-2.6-debug-spinlock-taint.patch Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch +Patch350: linux-2.6-debug-list_debug_rcu.patch Patch370: linux-2.6-crash-driver.patch Patch380: linux-2.6-defaults-pci_no_msi.patch +Patch390: linux-2.6-defaults-acpi-video.patch Patch400: linux-2.6-scsi-cpqarray-set-master.patch Patch402: linux-2.6-scsi-mpt-vmware-fix.patch -Patch410: linux-2.6-alsa-kill-annoying-messages.patch -Patch411: linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch Patch420: linux-2.6-squashfs.patch Patch430: linux-2.6-net-silence-noisy-printks.patch Patch440: linux-2.6-net-8139-pio-modparam.patch Patch441: linux-2.6-net-8139-pio-oqo2.patch +Patch442: linux-2.6-net-8139-pio-mmio-fallback.patch Patch450: linux-2.6-input-kill-stupid-messages.patch Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch -Patch520: linux-2.6-silence-x86-decompressor.patch Patch530: linux-2.6-silence-fbcon-logo.patch Patch570: linux-2.6-selinux-mprotect-checks.patch Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch @@ -629,19 +638,14 @@ Patch700: linux-2.6-nfs-client-mounts-hang.patch -# SELinux patches, will go upstream in .27 -Patch800: linux-2.6-selinux-deffered-context-mapping.patch -Patch801: linux-2.6-selinux-deffered-context-mapping-no-sleep.patch -Patch802: linux-2.6-selinux-generic-ioctl.patch -Patch803: linux-2.6-selinux-new-proc-checks.patch -Patch804: linux-2.6-selinux-get-invalid-xattrs.patch -# - Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch Patch1400: linux-2.6-smarter-relatime.patch Patch1515: linux-2.6-lirc.patch +Patch1600: linux-2.6-lockdep-uvc.patch + # nouveau + drm fixes +Patch1800: linux-2.6-export-shmem-bits-for-gem.patch Patch1801: linux-2.6-drm-git-mm.patch Patch1803: nouveau-drm.patch Patch1804: nouveau-drm-update.patch @@ -665,177 +669,86 @@ # Fix HID usage descriptor on MS wireless desktop receiver Patch2301: linux-2.6-ms-wireless-receiver.patch -# usb video -Patch2400: linux-2.6-uvcvideo.patch - -Patch2501: linux-2.6-ppc-use-libgcc.patch - # get rid of imacfb and make efifb work everywhere it was used Patch2600: linux-2.6-merge-efifb-imacfb.patch # kernel-xen patches start -Patch5000: linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch -Patch5001: linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch -Patch5002: linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch -Patch5003: linux-2.6-xen-0004-xen-Enable-Xen-console-by-default-in-domU.patch -Patch5004: linux-2.6-xen-0005-xen-Add-a-vmlinuz-target.patch -Patch5005: linux-2.6-xen-0006-xen-Add-empty-xenctrl-module.patch -Patch5006: linux-2.6-xen-0007-xen-Add-proc-xen-capabilities.patch -Patch5007: linux-2.6-xen-0008-xen-Add-proc-xen-privcmd.patch -Patch5008: linux-2.6-xen-0009-xen-Add-proc-xen-xenbus.patch -Patch5009: linux-2.6-xen-0010-xen-Add-Xen-s-sys-hypervisor-interface.patch -Patch5010: linux-2.6-xen-0011-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch -Patch5011: linux-2.6-xen-0012-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch -Patch5012: linux-2.6-xen-0013-xen-expose-set_pte_vaddr-and-make-xen-use-it.patch -Patch5013: linux-2.6-xen-0014-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch -Patch5014: linux-2.6-xen-0015-x86_64-Expose-set_pte_vaddr.patch -Patch5015: linux-2.6-xen-0016-x86_64-Split-set_pte_vaddr.patch -Patch5016: linux-2.6-xen-0017-x86_64-Add-clear_fixmap.patch -Patch5017: linux-2.6-xen-0018-xen-x86_64-Make-set_fixmap-a-paravirt-op-on-64-bi.patch -Patch5018: linux-2.6-xen-0019-xen-x86_64-Hack-to-set-vsyscall-pages-on-user-space.patch -Patch5019: linux-2.6-xen-0020-Handle-VSYSCALL_FIRST_PAGE-on-xen_set_pte.patch -Patch5020: linux-2.6-xen-0021-xen-x86_64-Remove-the-640K-1M-hole-and-disable-DMI.patch -Patch5021: linux-2.6-xen-0022-xen-x86_64-Add-update_va_mapping-64-bit-code.patch -Patch5022: linux-2.6-xen-0023-x86_64-Add-sync_cmpxchg.patch -Patch5023: linux-2.6-xen-0024-xen-x86_64-Implement-HYPERVISOR-MULTI-_update_desc.patch -Patch5024: linux-2.6-xen-0025-xen-x86_64-Add-hacky-64-bit-x86_-read-write-_percpu.patch -Patch5025: linux-2.6-xen-0026-xen-x86_64-Use-x86_read_percpu-only-to-refer-to-a.patch -Patch5026: linux-2.6-xen-0027-Add-FIX_PARAVIRT_BOOTAP-to-fixmap_64.h-too.patch -Patch5027: linux-2.6-xen-0028-Add-gate_offset-and-gate_segment-macros.patch -Patch5028: linux-2.6-xen-0029-xen_write_idt_entry-and-cvt_gate_to_trap.patch -Patch5029: linux-2.6-xen-0030-typedefs-for-pte_val-and-friends.patch -Patch5030: linux-2.6-xen-0031-x86_64-implementation-of-some-page.h-macros.patch -Patch5031: linux-2.6-xen-0032-Chainsaw-style-ifdefs.patch -Patch5032: linux-2.6-xen-0033-xen-Make-xen_pte_val-generic.patch -Patch5033: linux-2.6-xen-0034-More-chainsaw-ifdefs.patch -Patch5034: linux-2.6-xen-0035-Chainsaw-ifdefs-on-assembly-percpu-handling.patch -Patch5035: linux-2.6-xen-0036-x86_64-percpu-assembly-macros.patch -Patch5036: linux-2.6-xen-0037-Some-xen-asm.S-x86_64-code.patch -Patch5037: linux-2.6-xen-0038-Chainsaw-party-SPLITME.patch -Patch5038: linux-2.6-xen-0039-xen-asm.S-x86_64-notes.patch -Patch5039: linux-2.6-xen-0040-xen-x86_64-Make-hypercall-assembly-code-work.patch -Patch5040: linux-2.6-xen-0041-xen-x86_64-pda-initialization.patch -Patch5041: linux-2.6-xen-0042-Disable-early_printk-by-default.patch -Patch5042: linux-2.6-xen-0043-xen-Set-__HYPERVISOR_VIRT_START-for-x86_64.patch -Patch5043: linux-2.6-xen-0044-Set-__PAGE_OFFSET-as-required-by-Xen.patch -Patch5044: linux-2.6-xen-0045-DEBUG-Add-xprintk-to-log-directly-via-hypercall-fo.patch -Patch5045: linux-2.6-xen-0046-DEBUG-Add-xprintk-debugging-printk-prototype-to-hvc.patch -Patch5046: linux-2.6-xen-0047-Use-__pgd-on-mk_kernel_pgd.patch -Patch5047: linux-2.6-xen-0048-Include-user-page-tables-on-head_64.S.patch -Patch5048: linux-2.6-xen-0049-Avoid-using-mk_unsigned_long.patch -Patch5049: linux-2.6-xen-0050-Lots-of-unrelated-changes.patch -Patch5050: linux-2.6-xen-0051-Hack-disable-vsmp.patch -Patch5051: linux-2.6-xen-0052-Export-early_make_page_readonly.patch -Patch5052: linux-2.6-xen-0053-Disable-multicalls.c-too-verbose-debugging.patch -Patch5053: linux-2.6-xen-0054-Xen-64-bit-ready-MMU-operations.patch -Patch5054: linux-2.6-xen-0055-Some-xen-mmu-pv-ops-implemented.patch -Patch5055: linux-2.6-xen-0056-Trying-to-make-the-pagetable-initialization-code-wor.patch -Patch5056: linux-2.6-xen-0057-Xen-specific-find_early_table_space-FIXME.patch -Patch5057: linux-2.6-xen-0058-Xen-call-e820_print_map-when-setting-up-memory.patch -Patch5058: linux-2.6-xen-0059-Comment-debugging-msgs.patch -Patch5059: linux-2.6-xen-0060-Try-to-make-pagetables-read-only.patch -Patch5060: linux-2.6-xen-0061-Debug-dump-pgtables-on-make_page_readonly.patch -Patch5061: linux-2.6-xen-0062-Disable-apic-at-compile-time-FIXME.patch -Patch5062: linux-2.6-xen-0063-Parse-early-params-after-init_memory_mapping.patch -Patch5063: linux-2.6-xen-0064-xen-Move-addr_to_page-to-init.h.patch -Patch5064: linux-2.6-xen-0065-Make-xen_pxx_val-and-xen_make_pxx-handle-attr-bi.patch -Patch5065: linux-2.6-xen-0066-Pull-xen_finish_init_mappin-from-XS-upstream.patch -Patch5066: linux-2.6-xen-0067-Pull-spp_getpage-changes-from-XS-upstream-REVIEWM.patch -Patch5067: linux-2.6-xen-0068-Pull-xen_extend_init_mapping-from-XS-upstream-FIX.patch -Patch5068: linux-2.6-xen-0069-New-enum-fixed_addresses-values-REVIEWME.patch -Patch5069: linux-2.6-xen-0070-Reserve-bootmem-areas-used-by-Xen-FIXME.patch -Patch5070: linux-2.6-xen-0071-xen_convert_trap_info-use-sizeof-struct-gate_desc.patch -Patch5071: linux-2.6-xen-0072-Call-paravirt_pagetable_setup_-start-done-REVIEW.patch -Patch5072: linux-2.6-xen-0073-ifdef-CONFIG_X86_32-on-xen-enlighten.c-REVIEWME.patch -Patch5073: linux-2.6-xen-0074-Handle-Xen-exception-stack-it-is-different-from-bar.patch -Patch5074: linux-2.6-xen-0075-Implement-64-bit-version-of-HYPERVISOR_set_callbacks.patch -Patch5075: linux-2.6-xen-0076-Make-arch_vcpu_info-be-of-the-right-size-on-both-32.patch -Patch5076: linux-2.6-xen-0077-Implement-asm-xen_iret.patch -Patch5077: linux-2.6-xen-0078-xen-64-xen_iret-use-iretq-directly-if-returning-t.patch -Patch5078: linux-2.6-xen-0079-Implement-xen_irqenable_syscall_ret.patch -Patch5079: linux-2.6-xen-0080-DEBUG-xen_iret-always-return-through-the-hyperviso.patch -Patch5080: linux-2.6-xen-0081-Implement-some-xen-callbacks-on-xen-entry_64.S.patch -Patch5081: linux-2.6-xen-0082-Xen-specific-ifdef-hacks-on-kernel-entry_64.S-FIXM.patch -Patch5082: linux-2.6-xen-0083-Disable-syscall32-code-temporarily-FIXME.patch -Patch5083: linux-2.6-xen-0084-Use-__KERNEL_DS-as-SS-when-returning-to-a-kernel-thr.patch -Patch5084: linux-2.6-xen-0085-Use-apic_xen-on-genapic-by-default-FIXME.patch -Patch5085: linux-2.6-xen-0086-irq-vector-ifdef-chainsaw-FIXME.patch -Patch5086: linux-2.6-xen-0087-ifdef-chainsaw-on-syscall_init-FIXME.patch -Patch5087: linux-2.6-xen-0088-Pull-xen-genapic-implementation-from-upstream-Xen.patch -Patch5088: linux-2.6-xen-0089-Debugging-printk-s.patch -Patch5089: linux-2.6-xen-0090-Leave-lazy_cpu_mode-on-__switch_to.patch -Patch5090: linux-2.6-xen-0091-xen-64-Handle-fs-and-gs-on-xen_load_tls-properl.patch -Patch5091: linux-2.6-xen-0092-Disable-vcpu_info_placement-temporarily-FIXME.patch -Patch5092: linux-2.6-xen-0093-Fix-typo-on-ifdef-again.patch -Patch5093: linux-2.6-xen-0094-DEBUG-Don-t-try-to-actually-read-the-page-on-show_.patch -Patch5094: linux-2.6-xen-0095-Make-load_gs_index-a-paravirt-operation.patch -Patch5095: linux-2.6-xen-0096-xen-pgd_walk-use-limit-argument-instead-of-FIXADD.patch -Patch5096: linux-2.6-xen-0097-xen-pgd_walk-Eliminate-BUG_ON-limit-FIXADDR_TOP.patch -Patch5097: linux-2.6-xen-0098-xen-pgd_walk-accept-start-parameter.patch -Patch5098: linux-2.6-xen-0099-xen-64-reserve_bootmem-xen_start_info-area.patch -Patch5099: linux-2.6-xen-0100-pvops-64-call-paravirt_post_allocator_init-on-set.patch -Patch5100: linux-2.6-xen-0101-use-write_gdt_entry-on-vsyscall_set_cpu-CLEANME.patch -Patch5101: linux-2.6-xen-0102-xen-64-implement-xen_load_gs_index.patch -Patch5102: linux-2.6-xen-0103-Make-xen_pgd_unpin-non-static-REVIEWME.patch -Patch5103: linux-2.6-xen-0104-Xen-64-pgd-allocation-hack-FIXME.patch -Patch5104: linux-2.6-xen-0105-Set-both-kernel-and-user-PGDs-on-pgd_populate-FI.patch -Patch5105: linux-2.6-xen-0106-Multi-pagetable-write_cr3-implementation-FIXME.patch -Patch5106: linux-2.6-xen-0107-Disable-the-weird-count-loop-on-kcons_write_dom0.patch -Patch5107: linux-2.6-xen-0108-Make-xen_start_info-read-only.patch -Patch5108: linux-2.6-xen-0109-Hack-to-implement-return-to-userspace-without-SWAPGS.patch -Patch5109: linux-2.6-xen-0110-Xen-SEGBASE_-defines.patch -Patch5110: linux-2.6-xen-0111-Xen-HYPERVISOR_set_segment_base-implementation.patch -Patch5111: linux-2.6-xen-0112-Change-signature-of-paravirt_alloc_-pt-pd-REVIEWME.patch -Patch5112: linux-2.6-xen-0113-Comment-e820_print_map-call-TEMPORARY.patch -Patch5113: linux-2.6-xen-0114-Xen-missing-includes.patch -Patch5114: linux-2.6-xen-0115-asm-x86-pgtable_64.h-include-linux-spinlock.h.patch -Patch5115: linux-2.6-xen-0116-asm-x86-pgtable.h-include-asm-page.h.patch -Patch5116: linux-2.6-xen-0117-fix-pxxval_t-usage-on-mm-init_64.c.patch -Patch5117: linux-2.6-xen-0118-Missing-Xen-include.patch -Patch5118: linux-2.6-xen-0119-un-static-ipi_to_irq.patch -Patch5119: linux-2.6-xen-0120-Don-t-use-_PAGE_GLOBAL-bit-under-Xen-FIXME.patch -Patch5120: linux-2.6-xen-0121-Trying-to-organize-the-xen-bootmem-allocation-mess.patch -Patch5121: linux-2.6-xen-0122-Xen-reserve_bootmem-xenstore-and-console-interfac.patch -Patch5122: linux-2.6-xen-0123-pvops-64-call-paravirt_activate_mm-on-activate_mm.patch -Patch5123: linux-2.6-xen-0124-Xen-64-bit-support-on-xen_pgd_pin.patch -Patch5124: linux-2.6-xen-0125-Xen-64-pin-user-PGD-on-activate_mm-and-dup_mmap.patch -Patch5125: linux-2.6-xen-0126-Hack-pgd_walk-to-walk-to-TASK_SIZE-PAGE_SIZE-on-x8.patch -Patch5126: linux-2.6-xen-0127-Xen-64-Unpin-user-pagetable-on-xen_pgd_unpin.patch -Patch5127: linux-2.6-xen-0128-Use-un-pin_page-when-un-pinning-pgd.patch -Patch5128: linux-2.6-xen-0129-Allow-enabling-Xen-on-x86_64.patch -Patch5129: linux-2.6-xen-0130-Add-include-linux-spinlock_types.h-to-asm-x86-pgt.patch -Patch5130: linux-2.6-xen-0131-Restore-some-sanity-on-the-initial-pagetable-bootmem.patch -Patch5131: linux-2.6-xen-0132-Xen-Use-system_call_after_swapgs-as-the-syscall-c.patch -Patch5132: linux-2.6-xen-0133-Add-a-system_call_after_saveargs-label-to-entry_64.S.patch -Patch5133: linux-2.6-xen-0134-Create-xen-specific-syscall-entry.patch -Patch5134: linux-2.6-xen-0135-syscall-related-Xen-ifdefs-FIXME.patch -Patch5135: linux-2.6-xen-0136-Point-set_pte-to-xen_set_pte-since-the-beginning.patch -Patch5136: linux-2.6-xen-0137-DEBUG-slab-debugging.patch -Patch5137: linux-2.6-xen-0138-pvops-64-Include-rsi-on-the-register-clobber-list.patch -Patch5138: linux-2.6-xen-0139-Xen-64-quick-ugly-hack-to-fix-pgd_clear-pagetabl.patch -Patch5139: linux-2.6-xen-0140-Add-missing-acpi-include-to-xen-setup.c.patch -Patch5140: linux-2.6-xen-0141-Don-t-use-FIX_VDSO-on-64-bit.patch -Patch5141: linux-2.6-xen-0142-Mark-init-pages-read-write-again-on-free_init_pages.patch -Patch5142: linux-2.6-xen-0143-reserve_early-kernel-text-and-data-segments.patch -Patch5143: linux-2.6-xen-0144-Xen-Clear-__START_KERNEL_map-PTEs-on-free_init_page.patch -Patch5144: linux-2.6-xen-0145-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch -Patch5145: linux-2.6-xen-0146-Pull-xen_failsafe_callback-implementation-from-XenSo.patch -Patch5146: linux-2.6-xen-0147-Save-fs-and-gs-before-load_TLS-and-arch_leave_la.patch -Patch5147: linux-2.6-xen-0148-xen-64-Clear-fs-on-xen_load_tls.patch -Patch5148: linux-2.6-xen-0149-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch -Patch5149: linux-2.6-xen-0150-Introduce-xen_ia32_syscall.patch -Patch5150: linux-2.6-xen-0151-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch -Patch5151: linux-2.6-xen-0152-Make-the-int80-and-syscall-vdso32-implementations-se.patch -Patch5152: linux-2.6-xen-0153-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch -Patch5153: linux-2.6-xen-0154-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch -Patch5154: linux-2.6-xen-0155-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch -Patch5155: linux-2.6-xen-0156-X86_VSMP-make-not-depend-on-XEN-REVIEWME.patch -Patch5156: linux-2.6-xen-0157-Add-do_IRQ-prototype-to-asm-x86-irq_64.h.patch -Patch5157: linux-2.6-xen-0158-Disable-sysenter-on-x86_64-temporarily-REVIEWME.patch -Patch5158: linux-2.6-xen-0159-Add-xen_-alloc-release-_pud-functions-for-x86_64-x.patch -Patch5159: linux-2.6-xen-0160-Extract-reserve_initrd-from-x86_64_start_kernel.patch -Patch5160: linux-2.6-xen-0161-Make-reserve_initrd-non-static.patch -Patch5161: linux-2.6-xen-0162-xen-64-Reserve-initrd-on-xen_start_kernel-also.patch +Patch5000: linux-2.6-xen-0001-xen-execshield-Add-xen-specific-load_user_cs_desc.patch +Patch5001: linux-2.6-xen-0002-xen-execshield-fix-endless-GPF-fault-loop.patch +Patch5002: linux-2.6-xen-0003-xen-Add-a-vmlinuz-target.patch +Patch5003: linux-2.6-xen-0004-xen-Add-empty-xenctrl-module.patch +Patch5004: linux-2.6-xen-0005-xen-Add-proc-xen-capabilities.patch +Patch5005: linux-2.6-xen-0006-xen-Add-proc-xen-privcmd.patch +Patch5006: linux-2.6-xen-0007-xen-Add-proc-xen-xenbus.patch +Patch5007: linux-2.6-xen-0008-xen-Add-Xen-s-sys-hypervisor-interface.patch +Patch5008: linux-2.6-xen-0009-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch +Patch5009: linux-2.6-xen-0010-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch +Patch5010: linux-2.6-xen-0011-x86-paravirt-call-paravirt_pagetable_setup_-start.patch +Patch5011: linux-2.6-xen-0012-pvops-64-call-paravirt_post_allocator_init-on-set.patch +Patch5012: linux-2.6-xen-0013-x86_64-there-s-no-need-to-preallocate-level1_fixmap.patch +Patch5013: linux-2.6-xen-0014-x86-clean-up-formatting-of-__switch_to.patch +Patch5014: linux-2.6-xen-0015-x86-use-__page_aligned_data-bss.patch +Patch5015: linux-2.6-xen-0016-x86_64-adjust-exception-frame-in-ia32entry.patch +Patch5016: linux-2.6-xen-0017-x86_64-unstatic-get_local_pda.patch +Patch5017: linux-2.6-xen-0018-xen-print-backtrace-on-multicall-failure.patch +Patch5018: linux-2.6-xen-0019-xen-netfront-fix-xennet_release_tx_bufs.patch +Patch5019: linux-2.6-xen-0020-xen-add-xen_arch_resume-xen_timer_resume-hook-for.patch +Patch5020: linux-2.6-xen-0021-xen-define-set_pte-from-the-outset.patch +Patch5021: linux-2.6-xen-0022-xen64-define-asm-xen-interface-for-64-bit.patch +Patch5022: linux-2.6-xen-0023-xen-make-ELF-notes-work-for-32-and-64-bit.patch +Patch5023: linux-2.6-xen-0024-xen-fix-64-bit-hypercall-variants.patch +Patch5024: linux-2.6-xen-0025-xen64-fix-calls-into-hypercall-page.patch +Patch5025: linux-2.6-xen-0026-xen64-add-extra-pv_mmu_ops.patch +Patch5026: linux-2.6-xen-0027-xen64-random-ifdefs-to-mask-out-32-bit-only-code.patch +Patch5027: linux-2.6-xen-0028-xen64-get-active_mm-from-the-pda.patch +Patch5028: linux-2.6-xen-0029-xen-move-smp-setup-into-smp.c.patch +Patch5029: linux-2.6-xen-0030-x86_64-add-workaround-for-no-gs-based-percpu.patch +Patch5030: linux-2.6-xen-0031-xen64-smp.c-compile-hacking.patch +Patch5031: linux-2.6-xen-0032-xen64-add-xen-head-code-to-head_64.S.patch +Patch5032: linux-2.6-xen-0033-xen64-add-asm-offsets.patch +Patch5033: linux-2.6-xen-0034-xen64-add-64-bit-assembler.patch +Patch5034: linux-2.6-xen-0035-xen64-use-set_fixmap-for-shared_info-structure.patch +Patch5035: linux-2.6-xen-0036-xen-cpu_detect-is-32-bit-only.patch +Patch5036: linux-2.6-xen-0037-xen64-add-hypervisor-callbacks-for-events-etc.patch +Patch5037: linux-2.6-xen-0038-xen64-early-mapping-setup.patch +Patch5038: linux-2.6-xen-0039-xen64-64-bit-starts-using-set_pte-from-very-early.patch +Patch5039: linux-2.6-xen-0040-xen64-map-an-initial-chunk-of-physical-memory.patch +Patch5040: linux-2.6-xen-0041-xen32-create-initial-mappings-like-64-bit.patch +Patch5041: linux-2.6-xen-0042-xen-fix-truncation-of-machine-address.patch +Patch5042: linux-2.6-xen-0043-xen64-use-arbitrary_virt_to_machine-for-xen_set_pmd.patch +Patch5043: linux-2.6-xen-0044-xen-set-num_processors.patch +Patch5044: linux-2.6-xen-0045-xen64-defer-setting-pagetable-alloc-release-ops.patch +Patch5045: linux-2.6-xen-0046-xen-use-set_pte_vaddr.patch +Patch5046: linux-2.6-xen-0047-xen64-xen_write_idt_entry-and-cvt_gate_to_trap.patch +Patch5047: linux-2.6-xen-0048-xen64-deal-with-extra-words-Xen-pushes-onto-excepti.patch +Patch5048: linux-2.6-xen-0049-xen64-add-pvop-for-swapgs.patch +Patch5049: linux-2.6-xen-0050-xen64-register-callbacks-in-arch-independent-way.patch +Patch5050: linux-2.6-xen-0051-xen64-add-identity-irq-vector-map.patch +Patch5051: linux-2.6-xen-0052-Xen64-HYPERVISOR_set_segment_base-implementation.patch +Patch5052: linux-2.6-xen-0053-xen64-implement-xen_load_gs_index.patch +Patch5053: linux-2.6-xen-0054-xen-rework-pgd_walk-to-deal-with-32-64-bit.patch +Patch5054: linux-2.6-xen-0055-xen-make-sure-the-kernel-command-line-is-right.patch +Patch5055: linux-2.6-xen-0056-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch +Patch5056: linux-2.6-xen-0057-xen64-implement-failsafe-callback.patch +Patch5057: linux-2.6-xen-0058-xen64-Clear-fs-on-xen_load_tls.patch +Patch5058: linux-2.6-xen-0059-xen64-implement-64-bit-update_descriptor.patch +Patch5059: linux-2.6-xen-0060-xen64-save-lots-of-registers.patch +Patch5060: linux-2.6-xen-0061-xen64-allocate-and-manage-user-pagetables.patch +Patch5061: linux-2.6-xen-0062-xen64-set-up-syscall-and-sysenter-entrypoints-for-6.patch +Patch5062: linux-2.6-xen-0063-xen64-set-up-userspace-syscall-patch.patch +Patch5063: linux-2.6-xen-0064-xen-implement-Xen-write_msr-operation.patch +Patch5064: linux-2.6-xen-0065-xen-update-Kconfig-to-allow-64-bit-Xen.patch +Patch5065: linux-2.6-xen-0066-xen64-fix-HVC_XEN-build-dependency.patch +Patch5066: linux-2.6-xen-0067-xen64-fix-build-error-on-32-bit-HIGHMEM.patch +Patch5067: linux-2.6-xen-0068-Revert-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch +Patch5068: linux-2.6-xen-0069-Revert-x86_64-there-s-no-need-to-preallocate-level.patch +Patch5069: linux-2.6-xen-0070-xen64-disable-32-bit-syscall-sysenter-if-not-suppor.patch +Patch5070: linux-2.6-xen-0071-x86-xen-vdso-fix-build-error.patch +Patch5071: linux-2.6-xen-0072-x86_64-further-cleanup-of-32-bit-compat-syscall-mec.patch +Patch5072: linux-2.6-xen-0073-x86-xen-no-need-to-disable-vdso32.patch +Patch5073: linux-2.6-xen-0074-x86_64-adjust-exception-frame-on-paranoid-exception.patch +Patch5074: linux-2.6-xen-0075-x86-xen-power-fix-up-config-dependencies-on-PM.patch +Patch5075: linux-2.6-xen-0076-linux-next-pci-tree-build-failure.patch # kernel-xen patches end # Xen hypervisor patches (20000+) @@ -884,6 +797,14 @@ building most standard programs and are also needed for rebuilding the glibc package. +%package firmware +Summary: Firmware files used by the Linux kernel +Group: Development/System +License: Redistributable +%description firmware +Kernel-firmware includes firmware files required for some devices to +operate. + %package bootwrapper Summary: Boot wrapper files for generating combined kernel + initrd images Group: Development/System @@ -1178,8 +1099,7 @@ done %endif -# stable release candidate -# ApplyPatch patch-2.6.24.1-rc1.bz2 +#ApplyPatch git-linus.diff # This patch adds a "make nonint_oldconfig" which is non-interactive and # also gives a list of missing options at the end. Useful for automated @@ -1202,9 +1122,9 @@ ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. -%ifnarch ia64 +#ApplyPatch linux-2.6-ptrace-cleanup.patch +#ApplyPatch linux-2.6-tracehook.patch #ApplyPatch linux-2.6-utrace.patch -%endif # enable sysrq-c on all kernels, not only kexec ApplyPatch linux-2.6-sysrq-c.patch @@ -1234,8 +1154,6 @@ ApplyPatch linux-2.6-vio-modalias.patch # Work around PCIe bridge setup on iSight ApplyPatch linux-2.6-imac-transparent-bridge.patch -# Link zImage at 32MiB (for POWER machines, Efika) -ApplyPatch linux-2.6-powerpc-zImage-32MiB.patch # Don't show 'CHRP' in /proc/cpuinfo on Efika #ApplyPatch linux-2.6-efika-not-chrp.patch @@ -1263,6 +1181,7 @@ ApplyPatch linux-2.6-debug-taint-vm.patch ApplyPatch linux-2.6-debug-spinlock-taint.patch ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch +#ApplyPatch linux-2.6-debug-list_debug_rcu.patch # # /dev/crash driver for the crashdump analysis tool @@ -1284,12 +1203,6 @@ #ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch # ALSA -# -ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch -# In upstream alsa. Resolves issues with glitch-free pulseaudio on hda-intel. -# See: https://tango.0pointer.de/pipermail/pulseaudio-discuss/2008-May/001837.html -# http://mailman.alsa-project.org/pipermail/alsa-devel/2008-May/007856.html -ApplyPatch linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch # Filesystem patches. # Squashfs @@ -1302,6 +1215,8 @@ ApplyPatch linux-2.6-net-8139-pio-modparam.patch # OQO2 needs PIO ApplyPatch linux-2.6-net-8139-pio-oqo2.patch +# PIO fallback +ApplyPatch linux-2.6-net-8139-pio-mmio-fallback.patch # Misc fixes # The input layer spews crap no-one cares about. @@ -1312,16 +1227,13 @@ # Silence some useless messages that still get printed with 'quiet' ApplyPatch linux-2.6-silence-noise.patch -# Make the real mode boot decompressor understand and honor 'quiet' -ApplyPatch linux-2.6-silence-x86-decompressor.patch - # Make fbcon not show the penguins with 'quiet' ApplyPatch linux-2.6-silence-fbcon-logo.patch # Fix the SELinux mprotect checks on executable mappings -ApplyPatch linux-2.6-selinux-mprotect-checks.patch +#ApplyPatch linux-2.6-selinux-mprotect-checks.patch # Fix SELinux for sparc -ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch +#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch # Changes to upstream defaults. # Use UTF-8 by default on VFAT. @@ -1332,15 +1244,8 @@ # wake up links that have been put to sleep by BIOS (#436099) ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch -# Allow selinux to defer validation of contexts, aka: rpm can write illegal labels -ApplyPatch linux-2.6-selinux-deffered-context-mapping.patch -ApplyPatch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch -ApplyPatch linux-2.6-selinux-generic-ioctl.patch -ApplyPatch linux-2.6-selinux-new-proc-checks.patch -ApplyPatch linux-2.6-selinux-get-invalid-xattrs.patch - # wireless patches headed for 2.6.26 -ApplyPatch linux-2.6-wireless.patch +#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.27 ApplyPatch linux-2.6-wireless-pending.patch @@ -1365,7 +1270,11 @@ #ApplyPatch linux-2.6-netdev-atl2.patch +ApplyPatch linux-2.6-lockdep-uvc.patch + # Nouveau DRM + drm fixes +ApplyPatch linux-2.6-export-shmem-bits-for-gem.patch + #ApplyPatch linux-2.6-drm-git-mm.patch #ApplyPatch nouveau-drm.patch #ApplyPatch nouveau-drm-update.patch @@ -1375,190 +1284,94 @@ #ApplyPatch linux-2.6-drm-modesetting-oops-fixes.patch #ApplyPatch linux-2.6-drm-fix-master-perm.patch -# ext4dev stable patch queue, slated for 2.6.25 -#ApplyPatch linux-2.6-ext4-stable-queue.patch - # linux1394 git patches #C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}') #if [ "$C" -gt 10 ]; then #ApplyPatch linux-2.6-firewire-git-pending.patch #fi -# usb video -#ApplyPatch linux-2.6-uvcvideo.patch - -ApplyPatch linux-2.6-ppc-use-libgcc.patch - # get rid of imacfb and make efifb work everywhere it was used -#ApplyPatch linux-2.6-merge-efifb-imacfb.patch +ApplyPatch linux-2.6-merge-efifb-imacfb.patch # ---------- below all scheduled for 2.6.24 ----------------- # kernel-xen apply start -ApplyPatch linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch -ApplyPatch linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch -ApplyPatch linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch -ApplyPatch linux-2.6-xen-0004-xen-Enable-Xen-console-by-default-in-domU.patch -ApplyPatch linux-2.6-xen-0005-xen-Add-a-vmlinuz-target.patch -ApplyPatch linux-2.6-xen-0006-xen-Add-empty-xenctrl-module.patch -ApplyPatch linux-2.6-xen-0007-xen-Add-proc-xen-capabilities.patch -ApplyPatch linux-2.6-xen-0008-xen-Add-proc-xen-privcmd.patch -ApplyPatch linux-2.6-xen-0009-xen-Add-proc-xen-xenbus.patch -ApplyPatch linux-2.6-xen-0010-xen-Add-Xen-s-sys-hypervisor-interface.patch -ApplyPatch linux-2.6-xen-0011-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch -ApplyPatch linux-2.6-xen-0012-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch -%ifarch x86_64 -ApplyPatch linux-2.6-xen-0013-xen-expose-set_pte_vaddr-and-make-xen-use-it.patch -ApplyPatch linux-2.6-xen-0014-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch -ApplyPatch linux-2.6-xen-0015-x86_64-Expose-set_pte_vaddr.patch -ApplyPatch linux-2.6-xen-0016-x86_64-Split-set_pte_vaddr.patch -ApplyPatch linux-2.6-xen-0017-x86_64-Add-clear_fixmap.patch -ApplyPatch linux-2.6-xen-0018-xen-x86_64-Make-set_fixmap-a-paravirt-op-on-64-bi.patch -ApplyPatch linux-2.6-xen-0019-xen-x86_64-Hack-to-set-vsyscall-pages-on-user-space.patch -ApplyPatch linux-2.6-xen-0020-Handle-VSYSCALL_FIRST_PAGE-on-xen_set_pte.patch -ApplyPatch linux-2.6-xen-0021-xen-x86_64-Remove-the-640K-1M-hole-and-disable-DMI.patch -ApplyPatch linux-2.6-xen-0022-xen-x86_64-Add-update_va_mapping-64-bit-code.patch -ApplyPatch linux-2.6-xen-0023-x86_64-Add-sync_cmpxchg.patch -ApplyPatch linux-2.6-xen-0024-xen-x86_64-Implement-HYPERVISOR-MULTI-_update_desc.patch -ApplyPatch linux-2.6-xen-0025-xen-x86_64-Add-hacky-64-bit-x86_-read-write-_percpu.patch -ApplyPatch linux-2.6-xen-0026-xen-x86_64-Use-x86_read_percpu-only-to-refer-to-a.patch -ApplyPatch linux-2.6-xen-0027-Add-FIX_PARAVIRT_BOOTAP-to-fixmap_64.h-too.patch -ApplyPatch linux-2.6-xen-0028-Add-gate_offset-and-gate_segment-macros.patch -ApplyPatch linux-2.6-xen-0029-xen_write_idt_entry-and-cvt_gate_to_trap.patch -ApplyPatch linux-2.6-xen-0030-typedefs-for-pte_val-and-friends.patch -ApplyPatch linux-2.6-xen-0031-x86_64-implementation-of-some-page.h-macros.patch -ApplyPatch linux-2.6-xen-0032-Chainsaw-style-ifdefs.patch -ApplyPatch linux-2.6-xen-0033-xen-Make-xen_pte_val-generic.patch -ApplyPatch linux-2.6-xen-0034-More-chainsaw-ifdefs.patch -ApplyPatch linux-2.6-xen-0035-Chainsaw-ifdefs-on-assembly-percpu-handling.patch -ApplyPatch linux-2.6-xen-0036-x86_64-percpu-assembly-macros.patch -ApplyPatch linux-2.6-xen-0037-Some-xen-asm.S-x86_64-code.patch -ApplyPatch linux-2.6-xen-0038-Chainsaw-party-SPLITME.patch -ApplyPatch linux-2.6-xen-0039-xen-asm.S-x86_64-notes.patch -ApplyPatch linux-2.6-xen-0040-xen-x86_64-Make-hypercall-assembly-code-work.patch -ApplyPatch linux-2.6-xen-0041-xen-x86_64-pda-initialization.patch -ApplyPatch linux-2.6-xen-0042-Disable-early_printk-by-default.patch -ApplyPatch linux-2.6-xen-0043-xen-Set-__HYPERVISOR_VIRT_START-for-x86_64.patch -ApplyPatch linux-2.6-xen-0044-Set-__PAGE_OFFSET-as-required-by-Xen.patch -ApplyPatch linux-2.6-xen-0045-DEBUG-Add-xprintk-to-log-directly-via-hypercall-fo.patch -ApplyPatch linux-2.6-xen-0046-DEBUG-Add-xprintk-debugging-printk-prototype-to-hvc.patch -ApplyPatch linux-2.6-xen-0047-Use-__pgd-on-mk_kernel_pgd.patch -ApplyPatch linux-2.6-xen-0048-Include-user-page-tables-on-head_64.S.patch -ApplyPatch linux-2.6-xen-0049-Avoid-using-mk_unsigned_long.patch -ApplyPatch linux-2.6-xen-0050-Lots-of-unrelated-changes.patch -ApplyPatch linux-2.6-xen-0051-Hack-disable-vsmp.patch -ApplyPatch linux-2.6-xen-0052-Export-early_make_page_readonly.patch -ApplyPatch linux-2.6-xen-0053-Disable-multicalls.c-too-verbose-debugging.patch -ApplyPatch linux-2.6-xen-0054-Xen-64-bit-ready-MMU-operations.patch -ApplyPatch linux-2.6-xen-0055-Some-xen-mmu-pv-ops-implemented.patch -ApplyPatch linux-2.6-xen-0056-Trying-to-make-the-pagetable-initialization-code-wor.patch -ApplyPatch linux-2.6-xen-0057-Xen-specific-find_early_table_space-FIXME.patch -ApplyPatch linux-2.6-xen-0058-Xen-call-e820_print_map-when-setting-up-memory.patch -ApplyPatch linux-2.6-xen-0059-Comment-debugging-msgs.patch -ApplyPatch linux-2.6-xen-0060-Try-to-make-pagetables-read-only.patch -ApplyPatch linux-2.6-xen-0061-Debug-dump-pgtables-on-make_page_readonly.patch -ApplyPatch linux-2.6-xen-0062-Disable-apic-at-compile-time-FIXME.patch -ApplyPatch linux-2.6-xen-0063-Parse-early-params-after-init_memory_mapping.patch -ApplyPatch linux-2.6-xen-0064-xen-Move-addr_to_page-to-init.h.patch -ApplyPatch linux-2.6-xen-0065-Make-xen_pxx_val-and-xen_make_pxx-handle-attr-bi.patch -ApplyPatch linux-2.6-xen-0066-Pull-xen_finish_init_mappin-from-XS-upstream.patch -ApplyPatch linux-2.6-xen-0067-Pull-spp_getpage-changes-from-XS-upstream-REVIEWM.patch -ApplyPatch linux-2.6-xen-0068-Pull-xen_extend_init_mapping-from-XS-upstream-FIX.patch -ApplyPatch linux-2.6-xen-0069-New-enum-fixed_addresses-values-REVIEWME.patch -ApplyPatch linux-2.6-xen-0070-Reserve-bootmem-areas-used-by-Xen-FIXME.patch -ApplyPatch linux-2.6-xen-0071-xen_convert_trap_info-use-sizeof-struct-gate_desc.patch -ApplyPatch linux-2.6-xen-0072-Call-paravirt_pagetable_setup_-start-done-REVIEW.patch -ApplyPatch linux-2.6-xen-0073-ifdef-CONFIG_X86_32-on-xen-enlighten.c-REVIEWME.patch -ApplyPatch linux-2.6-xen-0074-Handle-Xen-exception-stack-it-is-different-from-bar.patch -ApplyPatch linux-2.6-xen-0075-Implement-64-bit-version-of-HYPERVISOR_set_callbacks.patch -ApplyPatch linux-2.6-xen-0076-Make-arch_vcpu_info-be-of-the-right-size-on-both-32.patch -ApplyPatch linux-2.6-xen-0077-Implement-asm-xen_iret.patch -ApplyPatch linux-2.6-xen-0078-xen-64-xen_iret-use-iretq-directly-if-returning-t.patch -ApplyPatch linux-2.6-xen-0079-Implement-xen_irqenable_syscall_ret.patch -ApplyPatch linux-2.6-xen-0080-DEBUG-xen_iret-always-return-through-the-hyperviso.patch -ApplyPatch linux-2.6-xen-0081-Implement-some-xen-callbacks-on-xen-entry_64.S.patch -ApplyPatch linux-2.6-xen-0082-Xen-specific-ifdef-hacks-on-kernel-entry_64.S-FIXM.patch -ApplyPatch linux-2.6-xen-0083-Disable-syscall32-code-temporarily-FIXME.patch -ApplyPatch linux-2.6-xen-0084-Use-__KERNEL_DS-as-SS-when-returning-to-a-kernel-thr.patch -ApplyPatch linux-2.6-xen-0085-Use-apic_xen-on-genapic-by-default-FIXME.patch -ApplyPatch linux-2.6-xen-0086-irq-vector-ifdef-chainsaw-FIXME.patch -ApplyPatch linux-2.6-xen-0087-ifdef-chainsaw-on-syscall_init-FIXME.patch -ApplyPatch linux-2.6-xen-0088-Pull-xen-genapic-implementation-from-upstream-Xen.patch -ApplyPatch linux-2.6-xen-0089-Debugging-printk-s.patch -ApplyPatch linux-2.6-xen-0090-Leave-lazy_cpu_mode-on-__switch_to.patch -ApplyPatch linux-2.6-xen-0091-xen-64-Handle-fs-and-gs-on-xen_load_tls-properl.patch -ApplyPatch linux-2.6-xen-0092-Disable-vcpu_info_placement-temporarily-FIXME.patch -ApplyPatch linux-2.6-xen-0093-Fix-typo-on-ifdef-again.patch -ApplyPatch linux-2.6-xen-0094-DEBUG-Don-t-try-to-actually-read-the-page-on-show_.patch -ApplyPatch linux-2.6-xen-0095-Make-load_gs_index-a-paravirt-operation.patch -ApplyPatch linux-2.6-xen-0096-xen-pgd_walk-use-limit-argument-instead-of-FIXADD.patch -ApplyPatch linux-2.6-xen-0097-xen-pgd_walk-Eliminate-BUG_ON-limit-FIXADDR_TOP.patch -ApplyPatch linux-2.6-xen-0098-xen-pgd_walk-accept-start-parameter.patch -ApplyPatch linux-2.6-xen-0099-xen-64-reserve_bootmem-xen_start_info-area.patch -ApplyPatch linux-2.6-xen-0100-pvops-64-call-paravirt_post_allocator_init-on-set.patch -ApplyPatch linux-2.6-xen-0101-use-write_gdt_entry-on-vsyscall_set_cpu-CLEANME.patch -ApplyPatch linux-2.6-xen-0102-xen-64-implement-xen_load_gs_index.patch -ApplyPatch linux-2.6-xen-0103-Make-xen_pgd_unpin-non-static-REVIEWME.patch -ApplyPatch linux-2.6-xen-0104-Xen-64-pgd-allocation-hack-FIXME.patch -ApplyPatch linux-2.6-xen-0105-Set-both-kernel-and-user-PGDs-on-pgd_populate-FI.patch -ApplyPatch linux-2.6-xen-0106-Multi-pagetable-write_cr3-implementation-FIXME.patch -ApplyPatch linux-2.6-xen-0107-Disable-the-weird-count-loop-on-kcons_write_dom0.patch -ApplyPatch linux-2.6-xen-0108-Make-xen_start_info-read-only.patch -ApplyPatch linux-2.6-xen-0109-Hack-to-implement-return-to-userspace-without-SWAPGS.patch -ApplyPatch linux-2.6-xen-0110-Xen-SEGBASE_-defines.patch -ApplyPatch linux-2.6-xen-0111-Xen-HYPERVISOR_set_segment_base-implementation.patch -ApplyPatch linux-2.6-xen-0112-Change-signature-of-paravirt_alloc_-pt-pd-REVIEWME.patch -ApplyPatch linux-2.6-xen-0113-Comment-e820_print_map-call-TEMPORARY.patch -ApplyPatch linux-2.6-xen-0114-Xen-missing-includes.patch -ApplyPatch linux-2.6-xen-0115-asm-x86-pgtable_64.h-include-linux-spinlock.h.patch -ApplyPatch linux-2.6-xen-0116-asm-x86-pgtable.h-include-asm-page.h.patch -ApplyPatch linux-2.6-xen-0117-fix-pxxval_t-usage-on-mm-init_64.c.patch -ApplyPatch linux-2.6-xen-0118-Missing-Xen-include.patch -ApplyPatch linux-2.6-xen-0119-un-static-ipi_to_irq.patch -ApplyPatch linux-2.6-xen-0120-Don-t-use-_PAGE_GLOBAL-bit-under-Xen-FIXME.patch -ApplyPatch linux-2.6-xen-0121-Trying-to-organize-the-xen-bootmem-allocation-mess.patch -ApplyPatch linux-2.6-xen-0122-Xen-reserve_bootmem-xenstore-and-console-interfac.patch -ApplyPatch linux-2.6-xen-0123-pvops-64-call-paravirt_activate_mm-on-activate_mm.patch -ApplyPatch linux-2.6-xen-0124-Xen-64-bit-support-on-xen_pgd_pin.patch -ApplyPatch linux-2.6-xen-0125-Xen-64-pin-user-PGD-on-activate_mm-and-dup_mmap.patch -ApplyPatch linux-2.6-xen-0126-Hack-pgd_walk-to-walk-to-TASK_SIZE-PAGE_SIZE-on-x8.patch -ApplyPatch linux-2.6-xen-0127-Xen-64-Unpin-user-pagetable-on-xen_pgd_unpin.patch -ApplyPatch linux-2.6-xen-0128-Use-un-pin_page-when-un-pinning-pgd.patch -ApplyPatch linux-2.6-xen-0129-Allow-enabling-Xen-on-x86_64.patch -ApplyPatch linux-2.6-xen-0130-Add-include-linux-spinlock_types.h-to-asm-x86-pgt.patch -ApplyPatch linux-2.6-xen-0131-Restore-some-sanity-on-the-initial-pagetable-bootmem.patch -ApplyPatch linux-2.6-xen-0132-Xen-Use-system_call_after_swapgs-as-the-syscall-c.patch -ApplyPatch linux-2.6-xen-0133-Add-a-system_call_after_saveargs-label-to-entry_64.S.patch -ApplyPatch linux-2.6-xen-0134-Create-xen-specific-syscall-entry.patch -ApplyPatch linux-2.6-xen-0135-syscall-related-Xen-ifdefs-FIXME.patch -ApplyPatch linux-2.6-xen-0136-Point-set_pte-to-xen_set_pte-since-the-beginning.patch -ApplyPatch linux-2.6-xen-0137-DEBUG-slab-debugging.patch -ApplyPatch linux-2.6-xen-0138-pvops-64-Include-rsi-on-the-register-clobber-list.patch -ApplyPatch linux-2.6-xen-0139-Xen-64-quick-ugly-hack-to-fix-pgd_clear-pagetabl.patch -ApplyPatch linux-2.6-xen-0140-Add-missing-acpi-include-to-xen-setup.c.patch -ApplyPatch linux-2.6-xen-0141-Don-t-use-FIX_VDSO-on-64-bit.patch -ApplyPatch linux-2.6-xen-0142-Mark-init-pages-read-write-again-on-free_init_pages.patch -ApplyPatch linux-2.6-xen-0143-reserve_early-kernel-text-and-data-segments.patch -ApplyPatch linux-2.6-xen-0144-Xen-Clear-__START_KERNEL_map-PTEs-on-free_init_page.patch -ApplyPatch linux-2.6-xen-0145-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch -ApplyPatch linux-2.6-xen-0146-Pull-xen_failsafe_callback-implementation-from-XenSo.patch -ApplyPatch linux-2.6-xen-0147-Save-fs-and-gs-before-load_TLS-and-arch_leave_la.patch -ApplyPatch linux-2.6-xen-0148-xen-64-Clear-fs-on-xen_load_tls.patch -ApplyPatch linux-2.6-xen-0149-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch -ApplyPatch linux-2.6-xen-0150-Introduce-xen_ia32_syscall.patch -ApplyPatch linux-2.6-xen-0151-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch -ApplyPatch linux-2.6-xen-0152-Make-the-int80-and-syscall-vdso32-implementations-se.patch -ApplyPatch linux-2.6-xen-0153-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch -ApplyPatch linux-2.6-xen-0154-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch -ApplyPatch linux-2.6-xen-0155-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch -ApplyPatch linux-2.6-xen-0156-X86_VSMP-make-not-depend-on-XEN-REVIEWME.patch -ApplyPatch linux-2.6-xen-0157-Add-do_IRQ-prototype-to-asm-x86-irq_64.h.patch -ApplyPatch linux-2.6-xen-0158-Disable-sysenter-on-x86_64-temporarily-REVIEWME.patch -ApplyPatch linux-2.6-xen-0159-Add-xen_-alloc-release-_pud-functions-for-x86_64-x.patch -ApplyPatch linux-2.6-xen-0160-Extract-reserve_initrd-from-x86_64_start_kernel.patch -ApplyPatch linux-2.6-xen-0161-Make-reserve_initrd-non-static.patch -ApplyPatch linux-2.6-xen-0162-xen-64-Reserve-initrd-on-xen_start_kernel-also.patch -%endif +ApplyPatch linux-2.6-xen-0001-xen-execshield-Add-xen-specific-load_user_cs_desc.patch +ApplyPatch linux-2.6-xen-0002-xen-execshield-fix-endless-GPF-fault-loop.patch +ApplyPatch linux-2.6-xen-0003-xen-Add-a-vmlinuz-target.patch +ApplyPatch linux-2.6-xen-0004-xen-Add-empty-xenctrl-module.patch +ApplyPatch linux-2.6-xen-0005-xen-Add-proc-xen-capabilities.patch +ApplyPatch linux-2.6-xen-0006-xen-Add-proc-xen-privcmd.patch +ApplyPatch linux-2.6-xen-0007-xen-Add-proc-xen-xenbus.patch +ApplyPatch linux-2.6-xen-0008-xen-Add-Xen-s-sys-hypervisor-interface.patch +ApplyPatch linux-2.6-xen-0009-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch +ApplyPatch linux-2.6-xen-0010-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch +ApplyPatch linux-2.6-xen-0011-x86-paravirt-call-paravirt_pagetable_setup_-start.patch +ApplyPatch linux-2.6-xen-0012-pvops-64-call-paravirt_post_allocator_init-on-set.patch +ApplyPatch linux-2.6-xen-0013-x86_64-there-s-no-need-to-preallocate-level1_fixmap.patch +ApplyPatch linux-2.6-xen-0014-x86-clean-up-formatting-of-__switch_to.patch +ApplyPatch linux-2.6-xen-0015-x86-use-__page_aligned_data-bss.patch +ApplyPatch linux-2.6-xen-0016-x86_64-adjust-exception-frame-in-ia32entry.patch +ApplyPatch linux-2.6-xen-0017-x86_64-unstatic-get_local_pda.patch +ApplyPatch linux-2.6-xen-0018-xen-print-backtrace-on-multicall-failure.patch +ApplyPatch linux-2.6-xen-0019-xen-netfront-fix-xennet_release_tx_bufs.patch +ApplyPatch linux-2.6-xen-0020-xen-add-xen_arch_resume-xen_timer_resume-hook-for.patch +ApplyPatch linux-2.6-xen-0021-xen-define-set_pte-from-the-outset.patch +ApplyPatch linux-2.6-xen-0022-xen64-define-asm-xen-interface-for-64-bit.patch +ApplyPatch linux-2.6-xen-0023-xen-make-ELF-notes-work-for-32-and-64-bit.patch +ApplyPatch linux-2.6-xen-0024-xen-fix-64-bit-hypercall-variants.patch +ApplyPatch linux-2.6-xen-0025-xen64-fix-calls-into-hypercall-page.patch +ApplyPatch linux-2.6-xen-0026-xen64-add-extra-pv_mmu_ops.patch +ApplyPatch linux-2.6-xen-0027-xen64-random-ifdefs-to-mask-out-32-bit-only-code.patch +ApplyPatch linux-2.6-xen-0028-xen64-get-active_mm-from-the-pda.patch +ApplyPatch linux-2.6-xen-0029-xen-move-smp-setup-into-smp.c.patch +ApplyPatch linux-2.6-xen-0030-x86_64-add-workaround-for-no-gs-based-percpu.patch +ApplyPatch linux-2.6-xen-0031-xen64-smp.c-compile-hacking.patch +ApplyPatch linux-2.6-xen-0032-xen64-add-xen-head-code-to-head_64.S.patch +ApplyPatch linux-2.6-xen-0033-xen64-add-asm-offsets.patch +ApplyPatch linux-2.6-xen-0034-xen64-add-64-bit-assembler.patch +ApplyPatch linux-2.6-xen-0035-xen64-use-set_fixmap-for-shared_info-structure.patch +ApplyPatch linux-2.6-xen-0036-xen-cpu_detect-is-32-bit-only.patch +ApplyPatch linux-2.6-xen-0037-xen64-add-hypervisor-callbacks-for-events-etc.patch +ApplyPatch linux-2.6-xen-0038-xen64-early-mapping-setup.patch +ApplyPatch linux-2.6-xen-0039-xen64-64-bit-starts-using-set_pte-from-very-early.patch +ApplyPatch linux-2.6-xen-0040-xen64-map-an-initial-chunk-of-physical-memory.patch +ApplyPatch linux-2.6-xen-0041-xen32-create-initial-mappings-like-64-bit.patch +ApplyPatch linux-2.6-xen-0042-xen-fix-truncation-of-machine-address.patch +ApplyPatch linux-2.6-xen-0043-xen64-use-arbitrary_virt_to_machine-for-xen_set_pmd.patch +ApplyPatch linux-2.6-xen-0044-xen-set-num_processors.patch +ApplyPatch linux-2.6-xen-0045-xen64-defer-setting-pagetable-alloc-release-ops.patch +ApplyPatch linux-2.6-xen-0046-xen-use-set_pte_vaddr.patch +ApplyPatch linux-2.6-xen-0047-xen64-xen_write_idt_entry-and-cvt_gate_to_trap.patch +ApplyPatch linux-2.6-xen-0048-xen64-deal-with-extra-words-Xen-pushes-onto-excepti.patch +ApplyPatch linux-2.6-xen-0049-xen64-add-pvop-for-swapgs.patch +ApplyPatch linux-2.6-xen-0050-xen64-register-callbacks-in-arch-independent-way.patch +ApplyPatch linux-2.6-xen-0051-xen64-add-identity-irq-vector-map.patch +ApplyPatch linux-2.6-xen-0052-Xen64-HYPERVISOR_set_segment_base-implementation.patch +ApplyPatch linux-2.6-xen-0053-xen64-implement-xen_load_gs_index.patch +ApplyPatch linux-2.6-xen-0054-xen-rework-pgd_walk-to-deal-with-32-64-bit.patch +ApplyPatch linux-2.6-xen-0055-xen-make-sure-the-kernel-command-line-is-right.patch +ApplyPatch linux-2.6-xen-0056-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch +ApplyPatch linux-2.6-xen-0057-xen64-implement-failsafe-callback.patch +ApplyPatch linux-2.6-xen-0058-xen64-Clear-fs-on-xen_load_tls.patch +ApplyPatch linux-2.6-xen-0059-xen64-implement-64-bit-update_descriptor.patch +ApplyPatch linux-2.6-xen-0060-xen64-save-lots-of-registers.patch +ApplyPatch linux-2.6-xen-0061-xen64-allocate-and-manage-user-pagetables.patch +ApplyPatch linux-2.6-xen-0062-xen64-set-up-syscall-and-sysenter-entrypoints-for-6.patch +ApplyPatch linux-2.6-xen-0063-xen64-set-up-userspace-syscall-patch.patch +ApplyPatch linux-2.6-xen-0064-xen-implement-Xen-write_msr-operation.patch +ApplyPatch linux-2.6-xen-0065-xen-update-Kconfig-to-allow-64-bit-Xen.patch +ApplyPatch linux-2.6-xen-0066-xen64-fix-HVC_XEN-build-dependency.patch +ApplyPatch linux-2.6-xen-0067-xen64-fix-build-error-on-32-bit-HIGHMEM.patch +ApplyPatch linux-2.6-xen-0068-Revert-suspend-xen-enable-PM_SLEEP-for-CONFIG_XEN.patch +ApplyPatch linux-2.6-xen-0069-Revert-x86_64-there-s-no-need-to-preallocate-level.patch +ApplyPatch linux-2.6-xen-0070-xen64-disable-32-bit-syscall-sysenter-if-not-suppor.patch +ApplyPatch linux-2.6-xen-0071-x86-xen-vdso-fix-build-error.patch +ApplyPatch linux-2.6-xen-0072-x86_64-further-cleanup-of-32-bit-compat-syscall-mec.patch +ApplyPatch linux-2.6-xen-0073-x86-xen-no-need-to-disable-vdso32.patch +ApplyPatch linux-2.6-xen-0074-x86_64-adjust-exception-frame-on-paranoid-exception.patch +ApplyPatch linux-2.6-xen-0075-x86-xen-power-fix-up-config-dependencies-on-PM.patch +ApplyPatch linux-2.6-xen-0076-linux-next-pci-tree-build-failure.patch # kernel-xen apply end # END OF PATCH APPLICATIONS @@ -1707,7 +1520,9 @@ chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer - make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer + # Override $(mod-fw) because we don't want it to install any firmware + # We'll do that ourselves with 'make firmware_install' + make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= %ifarch %{vdso_arches} make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer %endif @@ -1750,7 +1565,7 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cd include - cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video drm asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include # While arch/powerpc/include/asm is still a symlink to the old # include/asm-ppc{64,} directory, include that in kernel-devel too. @@ -1962,6 +1777,10 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h %endif +%if %{with_firmware} +make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install +%endif + %if %{with_bootwrapper} make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts %endif @@ -2083,6 +1902,13 @@ /usr/include/* %endif +%if %{with_firmware} +%files firmware +%defattr(-,root,root) +/lib/firmware/* +%doc linux-%{kversion}.%{_target_cpu}/firmware/WHENCE +%endif + %if %{with_bootwrapper} %files bootwrapper %defattr(-,root,root) @@ -2167,6 +1993,11 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Fri Jun 18 2008 Mark McLoughlin +- Rebase to kernel-2_6_27-0_159_rc0_git6_fc10 +- Drop Eduardo's 64bit tree and switch to Jeremy's x86.git tree +- Re-enable SMP etc. + * Mon Jun 16 2008 Mark McLoughlin - Rebase to kernel-2_6_26-0_72_rc6_git2_fc10 linux-2.6-debug-nmi-timeout.patch: Index: linux-2.6-debug-nmi-timeout.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-debug-nmi-timeout.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-nmi-timeout.patch 6 Mar 2008 13:59:25 -0000 1.3 +++ linux-2.6-debug-nmi-timeout.patch 18 Jul 2008 14:57:40 -0000 1.4 @@ -1,25 +1,14 @@ ---- linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c~ 2007-04-13 15:52:37.000000000 -0400 -+++ linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c 2007-04-13 15:53:06.000000000 -0400 -@@ -1044,7 +1044,7 @@ __kprobes int nmi_watchdog_tick(struct p +--- linux-2.6.26.noarch/arch/x86/kernel/nmi.c~ 2008-07-14 20:31:14.000000000 -0400 ++++ linux-2.6.26.noarch/arch/x86/kernel/nmi.c 2008-07-14 20:31:38.000000000 -0400 +@@ -416,7 +416,7 @@ nmi_watchdog_tick(struct pt_regs *regs, * wait a few IRQs (5 seconds) before doing the oops ... */ - alert_counter[cpu]++; -- if (alert_counter[cpu] == 5*nmi_hz) -+ if (alert_counter[cpu] == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz) + local_inc(&__get_cpu_var(alert_counter)); +- if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz) ++ if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz) /* * die_nmi will return ONLY if NOTIFY_STOP happens.. */ ---- linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c~ 2007-04-13 15:53:09.000000000 -0400 -+++ linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c 2007-04-13 15:53:29.000000000 -0400 -@@ -923,7 +923,7 @@ int __kprobes nmi_watchdog_tick(struct p - * wait a few IRQs (5 seconds) before doing the oops ... - */ - local_inc(&__get_cpu_var(alert_counter)); -- if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz) -+ if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz) - die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs, - panic_on_timeout); - } else { --- linux-2.6.21.noarch/lib/Kconfig.debug~ 2007-07-06 17:05:46.000000000 -0400 +++ linux-2.6.21.noarch/lib/Kconfig.debug 2007-07-06 17:06:07.000000000 -0400 @@ -126,6 +126,14 @@ config SCHEDSTATS linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-execshield.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-execshield.patch 16 Jun 2008 10:19:26 -0000 1.5 +++ linux-2.6-execshield.patch 18 Jul 2008 14:57:40 -0000 1.6 @@ -99,11 +99,11 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; ---- linux-2.6.25.noarch/arch/x86/kernel/traps_32.c~ 2008-05-16 13:43:36.000000000 -0400 -+++ linux-2.6.25.noarch/arch/x86/kernel/traps_32.c 2008-05-16 13:48:08.000000000 -0400 -@@ -602,13 +602,97 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv - DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) - DO_ERROR(12, SIGBUS, "stack segment", stack_segment) +--- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~ 2008-07-14 20:20:15.000000000 -0400 ++++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c 2008-07-14 20:26:18.000000000 -0400 +@@ -596,7 +596,90 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv + DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) + DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) -DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1) + @@ -191,8 +191,9 @@ + } +} - void __kprobes do_general_protection(struct pt_regs *regs, long error_code) - { + void __kprobes + do_general_protection(struct pt_regs *regs, long error_code) +@@ -605,6 +688,7 @@ do_general_protection(struct pt_regs *re struct thread_struct *thread; struct tss_struct *tss; int cpu; @@ -200,15 +201,7 @@ cpu = get_cpu(); tss = &per_cpu(init_tss, cpu); -@@ -641,7 +725,6 @@ void __kprobes do_general_protection(str - - return; - } -- put_cpu(); - - if (regs->flags & X86_VM_MASK) - goto gp_in_vm86; -@@ -634,6 +718,22 @@ void __kprobes do_general_protection(struct pt_regs * regs, +@@ -645,6 +729,23 @@ do_general_protection(struct pt_regs *re if (!user_mode(regs)) goto gp_in_kernel; @@ -228,10 +221,11 @@ + current->mm->context.user_cs.b); + } + - current->thread.error_code = error_code; - current->thread.trap_no = 13; - if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) && -@@ -650,11 +750,13 @@ void __kprobes do_general_protection(struct pt_regs * regs, ++ + tsk->thread.error_code = error_code; + tsk->thread.trap_no = 13; + +@@ -662,11 +763,13 @@ do_general_protection(struct pt_regs *re return; gp_in_vm86: @@ -242,9 +236,9 @@ gp_in_kernel: + put_cpu(); - if (!fixup_exception(regs)) { - current->thread.error_code = error_code; - current->thread.trap_no = 13; + if (fixup_exception(regs)) + return; + diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 8106bba..23932be 100644 --- a/arch/x86/mm/init_32.c @@ -279,17 +273,16 @@ return 0; } -@@ -527,6 +525,10 @@ void __init paging_init(void) +@@ -782,6 +782,9 @@ unsigned long __init_refok init_memory_m if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); #endif + if (exec_shield) + printk(KERN_INFO "Using x86 segment limits to approximate " + "NX protection\n"); -+ - pagetable_init(); - load_cr3(swapper_pg_dir); + /* Enable PSE if available */ + if (cpu_has_pse) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 56fe712..ec932ae 100644 --- a/arch/x86/mm/mmap.c @@ -433,21 +426,6 @@ #ifdef CONFIG_PPC64 #include #else -diff --git a/include/asm-ppc/pgalloc.h b/include/asm-ppc/pgalloc.h -index fd4d1d7..de55ad5 100644 ---- a/include/asm-ppc/pgalloc.h -+++ b/include/asm-ppc/pgalloc.h -@@ -41,5 +41,10 @@ extern void pte_free(struct mm_struct *mm, pgtable_t pte); - - #define check_pgt_cache() do { } while (0) - -+#define arch_add_exec_range(mm, limit) do { ; } while (0) -+#define arch_flush_exec_range(mm) do { ; } while (0) -+#define arch_remove_exec_range(mm, limit) do { ; } while (0) -+ -+ - #endif /* _PPC_PGALLOC_H */ - #endif /* __KERNEL__ */ diff --git a/include/asm-s390/pgalloc.h b/include/asm-s390/pgalloc.h index f5b2bf3..a43f0ec 100644 --- a/include/asm-s390/pgalloc.h @@ -648,10 +626,11 @@ index d41ef6b..5304704 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -83,6 +83,27 @@ extern int sysctl_stat_interval; +@@ -83,6 +83,26 @@ extern int maps_protect; + extern int sysctl_stat_interval; extern int latencytop_enabled; extern int sysctl_nr_open_min, sysctl_nr_open_max; - ++ +int exec_shield = (1<<0); +/* exec_shield is a bitmask: + * 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE @@ -669,13 +648,11 @@ + + return 1; +} -+ +__setup("exec-shield=", setup_exec_shield); + -+ - /* Constants used for minimum and maximum */ - #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) - static int one = 1; + #ifdef CONFIG_RCU_TORTURE_TEST + extern int rcutorture_runnable; + #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ @@ -383,6 +403,14 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, @@ -767,7 +744,7 @@ } +EXPORT_SYMBOL(get_unmapped_area_prot); + -+#define SHLIB_BASE 0x00110000 ++#define SHLIB_BASE 0x00110000 + +unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0, + unsigned long len0, unsigned long pgoff, unsigned long flags) linux-2.6-merge-efifb-imacfb.patch: Index: linux-2.6-merge-efifb-imacfb.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-merge-efifb-imacfb.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-merge-efifb-imacfb.patch 14 Apr 2008 16:06:53 -0000 1.2 +++ linux-2.6-merge-efifb-imacfb.patch 18 Jul 2008 14:57:40 -0000 1.3 @@ -9,7 +9,7 @@ index 1bd5fb3..474c375 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig -@@ -656,23 +656,14 @@ config FB_VESA +@@ -689,23 +689,14 @@ config FB_VESA config FB_EFI bool "EFI-based Framebuffer Support" @@ -34,8 +34,8 @@ + your platform is EFI 1.10 or UEFI 2.0, select Y to add support for + using the EFI framebuffer as your console. - config FB_HECUBA - tristate "Hecuba board support" + config FB_N411 + tristate "N411 Apollo/Hecuba devkit support" diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 11c0e5e..c789b01 100644 --- a/drivers/video/Makefile linux-2.6-net-8139-pio-modparam.patch: Index: linux-2.6-net-8139-pio-modparam.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-net-8139-pio-modparam.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-net-8139-pio-modparam.patch 16 Jun 2008 10:19:26 -0000 1.1 +++ linux-2.6-net-8139-pio-modparam.patch 18 Jul 2008 14:57:40 -0000 1.2 @@ -1,15 +1,26 @@ -Make PIO/MMIO a runtime thing via a module parameter. -This is needed to support devices that only work with PIO -without penalising devices that work fine with MMIO in -distro kernels. +From: Dave Jones +To: netdev at vger.kernel.org +Subject: [1/3] 8139too: Make PIO/MMIO a runtime decision through a module parameter. + +This is needed to support devices that only work with PIO without penalising devices +that work fine with MMIO in distro kernels. It also allows us to eventually +use PIO as a fallback when setting up MMIO fails. Signed-off-by: Dave Jones diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c -index 53bd903..09ace39 100644 +index 53bd903..b620317 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c -@@ -120,11 +120,6 @@ +@@ -98,7 +98,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -120,11 +119,6 @@ NETIF_MSG_LINK) @@ -21,25 +32,30 @@ /* define to 1, 2 or 3 to enable copious debugging info */ #define RTL8139_DEBUG 0 -@@ -156,6 +151,9 @@ +@@ -156,6 +150,13 @@ static int media[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; +/* Whether to use MMIO or PIO. Default to MMIO. */ -+static int use_pio; ++#ifdef CONFIG_8139TOO_PIO ++static int use_io = 1; ++#else ++static int use_io = 0; ++#endif + /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). The RTL chips use a 64 element hash table based on the Ethernet CRC. */ static int multicast_filter_limit = 32; -@@ -615,6 +613,7 @@ MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver"); +@@ -615,6 +612,8 @@ MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); -+module_param(use_pio, int, 0); ++module_param(use_io, int, 0); ++MODULE_PARM_DESC(use_io, "Force use of I/O access mode. 0=MMIO 1=PIO"); module_param(multicast_filter_limit, int, 0); module_param_array(media, int, NULL, 0); module_param_array(full_duplex, int, NULL, 0); -@@ -710,14 +709,13 @@ static void __rtl8139_cleanup_dev (struct net_device *dev) +@@ -710,13 +708,8 @@ static void __rtl8139_cleanup_dev (struct net_device *dev) assert (tp->pci_dev != NULL); pdev = tp->pci_dev; @@ -47,21 +63,13 @@ - if (tp->mmio_addr) - ioport_unmap (tp->mmio_addr); -#else -- if (tp->mmio_addr) -- pci_iounmap (pdev, tp->mmio_addr); + if (tp->mmio_addr) + pci_iounmap (pdev, tp->mmio_addr); -#endif /* USE_IO_OPS */ -- -+ if (use_pio) { -+ if (tp->mmio_addr) -+ ioport_unmap (tp->mmio_addr); -+ } else { -+ if (tp->mmio_addr) -+ pci_iounmap (pdev, tp->mmio_addr); -+ } + /* it's ok to call this even if we have no regions to free */ pci_release_regions (pdev); - -@@ -791,32 +789,32 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, +@@ -791,32 +784,32 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, DPRINTK("PIO region size == 0x%02X\n", pio_len); DPRINTK("MMIO region size == 0x%02lX\n", mmio_len); @@ -89,7 +97,7 @@ - dev_err(&pdev->dev, "Invalid PCI mem region size(s), aborting\n"); - rc = -ENODEV; - goto err_out; -+ if (use_pio) { ++ if (use_io) { + /* make sure PCI base addr 0 is PIO */ + if (!(pio_flags & IORESOURCE_IO)) { + dev_err(&pdev->dev, "region #0 not a PIO resource, aborting\n"); @@ -119,7 +127,7 @@ rc = pci_request_regions (pdev, DRV_NAME); if (rc) -@@ -826,28 +824,28 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, +@@ -826,28 +819,27 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev, /* enable PCI bus-mastering */ pci_set_master (pdev); @@ -140,15 +148,14 @@ - dev_err(&pdev->dev, "cannot remap MMIO, aborting\n"); - rc = -EIO; - goto err_out; -+ if (use_pio) { -+ ioaddr = ioport_map(pio_start, pio_len); ++ if (use_io) { ++ ioaddr = pci_iomap(pdev, 0, 0); + if (!ioaddr) { + dev_err(&pdev->dev, "cannot map PIO, aborting\n"); + rc = -EIO; + goto err_out; + } + dev->base_addr = pio_start; -+ tp->mmio_addr = ioaddr; + tp->regs_len = pio_len; + } else { + /* ioremap MMIO region */ @@ -159,17 +166,16 @@ + goto err_out; + } + dev->base_addr = (long) ioaddr; -+ tp->mmio_addr = ioaddr; + tp->regs_len = mmio_len; } - dev->base_addr = (long) ioaddr; -- tp->mmio_addr = ioaddr; + tp->mmio_addr = ioaddr; - tp->regs_len = mmio_len; -#endif /* USE_IO_OPS */ /* Bring old chips out of low-power mode. */ RTL_W8 (HltClk, 'R'); -@@ -2383,20 +2381,24 @@ static void rtl8139_set_msglevel(struct net_device *dev, u32 datum) +@@ -2383,20 +2375,24 @@ static void rtl8139_set_msglevel(struct net_device *dev, u32 datum) np->msg_enable = datum; } @@ -183,7 +189,7 @@ - struct rtl8139_private *np = netdev_priv(dev); + struct rtl8139_private *np; + /* TODO: we are too slack to do reg dumping for pio, for now */ -+ if (use_pio) ++ if (use_io) + return 0; + np = netdev_priv(dev); return np->regs_len; @@ -195,13 +201,13 @@ + struct rtl8139_private *np; + + /* TODO: we are too slack to do reg dumping for pio, for now */ -+ if (use_pio) ++ if (use_io) + return; + np = netdev_priv(dev); regs->version = RTL_REGS_VER; -@@ -2404,7 +2406,6 @@ static void rtl8139_get_regs(struct net_device *dev, struct ethtool_regs *regs, +@@ -2404,7 +2400,6 @@ static void rtl8139_get_regs(struct net_device *dev, struct ethtool_regs *regs, memcpy_fromio(regbuf, np->mmio_addr, regs->len); spin_unlock_irq(&np->lock); } @@ -209,15 +215,3 @@ static int rtl8139_get_sset_count(struct net_device *dev, int sset) { -@@ -2610,6 +2611,11 @@ static int __init rtl8139_init_module (void) - printk (KERN_INFO RTL8139_DRIVER_NAME "\n"); - #endif - -+ /* enable PIO instead of MMIO, if CONFIG_8139TOO_PIO is selected */ -+#ifdef CONFIG_8139TOO_PIO -+ use_pio = 1; -+#endif -+ - return pci_register_driver(&rtl8139_pci_driver); - } - linux-2.6-net-8139-pio-oqo2.patch: Index: linux-2.6-net-8139-pio-oqo2.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-net-8139-pio-oqo2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-net-8139-pio-oqo2.patch 16 Jun 2008 10:19:26 -0000 1.1 +++ linux-2.6-net-8139-pio-oqo2.patch 18 Jul 2008 14:57:40 -0000 1.2 @@ -1,4 +1,10 @@ +From: Dave Jones +To: netdev at vger.kernel.org +Subject: [2/3] 8139too: Force usage of PIO on OQO2 + The OQO model 2 has an RTL8139 from Atheros that doesn't like MMIO. +It fails on modprobe, with a 'PCI Bus error' message. + Force it to always use polled IO. Signed-off-by: Dave Jones @@ -14,7 +20,7 @@ + pdev->subsystem_vendor == PCI_VENDOR_ID_ATHEROS && + pdev->subsystem_device == PCI_DEVICE_ID_REALTEK_8139) { + printk(KERN_INFO "8139too: OQO Model 2 detected. Forcing PIO\n"); -+ use_pio = 1; ++ use_io = 1; + } + i = rtl8139_init_board (pdev, &dev); linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-silence-noise.patch 16 Jun 2008 10:19:26 -0000 1.6 +++ linux-2.6-silence-noise.patch 18 Jul 2008 14:57:40 -0000 1.7 @@ -1,37 +1,3 @@ ---- linux-2.6.18.noarch/arch/x86/mm/init_64.c~ 2006-10-16 17:09:56.000000000 -0400 -+++ linux-2.6.18.noarch/arch/x86/mm/init_64.c 2006-10-16 17:10:09.000000000 -0400 -@@ -337,10 +337,6 @@ static void __init find_early_table_spac - - table_start >>= PAGE_SHIFT; - table_end = table_start; -- -- early_printk("kernel direct mapping tables up to %lx @ %lx-%lx\n", -- end, table_start << PAGE_SHIFT, -- (table_start << PAGE_SHIFT) + tables); - } - - /* Setup the direct mapping of the physical memory at PAGE_OFFSET. - ---- linux-2.6.18.noarch/drivers/pci/setup-res.c~ 2006-10-17 17:15:34.000000000 -0400 -+++ linux-2.6.18.noarch/drivers/pci/setup-res.c 2006-10-17 17:15:56.000000000 -0400 -@@ -148,7 +148,7 @@ int pci_assign_resource(struct pci_dev * - } - - if (ret) { -- printk(KERN_ERR "PCI: Failed to allocate %s resource " -+ printk(KERN_DEBUG "PCI: Failed to allocate %s resource " - "#%d:%llx@%llx for %s\n", - res->flags & IORESOURCE_IO ? "I/O" : "mem", - resno, (unsigned long long)size, -@@ -186,7 +186,7 @@ int pci_assign_resource_fixed(struct pci - } - - if (ret) { -- printk(KERN_ERR "PCI: Failed to allocate %s resource " -+ printk(KERN_DEBUG "PCI: Failed to allocate %s resource " - "#%d:%llx@%llx for %s\n", - res->flags & IORESOURCE_IO ? "I/O" : "mem", - resno, (unsigned long long)(res->end - res->start + 1), --- linux-2.6.19.noarch/arch/x86/pci/i386.c~ 2006-12-04 11:21:32.000000000 -0500 +++ linux-2.6.19.noarch/arch/x86/pci/i386.c 2006-12-04 11:22:10.000000000 -0500 @@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_ @@ -53,32 +19,9 @@ "of device %s\n", idx, pci_name(dev)); -Remove noisy PM printk. -This has served its purpose. - -Signed-off-by: Dave Jones - ---- linux-2.6.20.noarch/drivers/pci/pci.c~ 2007-04-16 18:14:14.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/pci/pci.c 2007-04-16 18:14:33.000000000 -0400 -@@ -664,14 +664,9 @@ pci_restore_state(struct pci_dev *dev) - */ - for (i = 15; i >= 0; i--) { - pci_read_config_dword(dev, i * 4, &val); -- if (val != dev->saved_config_space[i]) { -- printk(KERN_DEBUG "PM: Writing back config space on " -- "device %s at offset %x (was %x, writing %x)\n", -- pci_name(dev), i, -- val, (int)dev->saved_config_space[i]); -+ if (val != dev->saved_config_space[i]) - pci_write_config_dword(dev,i * 4, - dev->saved_config_space[i]); -- } - } - pci_restore_pcix_state(dev); - pci_restore_msi_state(dev); ---- linux-2.6.25.noarch/drivers/base/power/main.c~ 2008-05-16 10:26:38.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/base/power/main.c 2008-05-16 10:26:59.000000000 -0400 -@@ -64,9 +64,6 @@ int device_pm_add(struct device *dev) +--- linux-2.6.26.noarch/drivers/base/power/main.c~ 2008-07-17 13:12:20.000000000 -0400 ++++ linux-2.6.26.noarch/drivers/base/power/main.c 2008-07-17 13:12:44.000000000 -0400 +@@ -71,9 +71,6 @@ int device_pm_add(struct device *dev) { int error; @@ -86,5 +29,5 @@ - dev->bus ? dev->bus->name : "No Bus", - kobject_name(&dev->kobj)); mutex_lock(&dpm_list_mtx); - if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) { - if (dev->parent->power.sleeping) + if (dev->parent) { + if (dev->parent->power.status >= DPM_SUSPENDING) { linux-2.6-utrace.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 linux-2.6-utrace.patch Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-utrace.patch 16 Jun 2008 10:19:26 -0000 1.5 +++ linux-2.6-utrace.patch 18 Jul 2008 14:57:40 -0000 1.6 @@ -1,88 +1,20 @@ - Documentation/DocBook/Makefile | 2 +- - Documentation/DocBook/utrace.tmpl | 23 + - Documentation/utrace.txt | 579 +++++++++ - arch/alpha/kernel/ptrace.c | 15 +- - arch/arm/kernel/ptrace.c | 5 +- - arch/avr32/kernel/ptrace.c | 5 +- - arch/blackfin/kernel/ptrace.c | 5 +- - arch/frv/kernel/ptrace.c | 3 +- - arch/h8300/kernel/ptrace.c | 3 +- - arch/ia64/kernel/process.c | 2 +- - arch/ia64/kernel/ptrace.c | 17 +- - arch/m32r/kernel/ptrace.c | 7 +- - arch/m68k/kernel/ptrace.c | 5 +- - arch/m68knommu/kernel/ptrace.c | 3 +- - arch/mips/kernel/irixelf.c | 2 - - arch/mips/kernel/ptrace.c | 5 +- - arch/mn10300/kernel/ptrace.c | 3 +- - arch/parisc/kernel/ptrace.c | 7 +- - arch/powerpc/kernel/entry_32.S | 4 +- - arch/powerpc/kernel/process.c | 5 - - arch/powerpc/kernel/ptrace.c | 38 +- - arch/powerpc/kernel/ptrace32.c | 8 +- - arch/powerpc/kernel/signal.c | 20 +- - arch/powerpc/kernel/signal_32.c | 21 +- - arch/powerpc/kernel/sys_ppc32.c | 5 - - arch/s390/kernel/entry.S | 14 +- - arch/s390/kernel/entry64.S | 12 +- - arch/sh/kernel/ptrace_32.c | 5 +- - arch/sh/kernel/ptrace_64.c | 5 +- - arch/sparc/kernel/ptrace.c | 5 +- - arch/sparc64/kernel/binfmt_aout32.c | 2 - - arch/sparc64/kernel/ptrace.c | 35 +- - arch/um/kernel/ptrace.c | 3 +- - arch/v850/kernel/ptrace.c | 3 +- - arch/x86/ia32/ia32_aout.c | 6 - - arch/x86/ia32/ia32_signal.c | 12 +- - arch/x86/ia32/ia32entry.S | 14 +- - arch/x86/ia32/sys_ia32.c | 5 - - arch/x86/kernel/entry_64.S | 8 +- - arch/x86/kernel/ptrace.c | 159 +-- - arch/x86/kernel/signal_32.c | 56 +- - arch/x86/kernel/signal_64.c | 49 +- - arch/x86/kernel/step.c | 22 +- - arch/x86/kernel/vm86_32.c | 9 +- - arch/xtensa/kernel/ptrace.c | 6 +- - fs/binfmt_aout.c | 6 - - fs/binfmt_elf.c | 6 - - fs/binfmt_elf_fdpic.c | 7 - - fs/binfmt_flat.c | 3 - - fs/binfmt_som.c | 2 - - fs/compat.c | 14 +- - fs/eventpoll.c | 7 +- - fs/exec.c | 12 +- - fs/proc/array.c | 9 +- - fs/proc/base.c | 43 +- - fs/select.c | 12 +- - include/asm-ia64/thread_info.h | 5 +- - include/asm-powerpc/thread_info.h | 17 +- - include/asm-s390/thread_info.h | 2 +- - include/asm-x86/ptrace.h | 2 + - include/asm-x86/thread_info_32.h | 13 +- - include/asm-x86/thread_info_64.h | 13 +- - include/linux/compat.h | 5 +- - include/linux/init_task.h | 3 - - include/linux/ptrace.h | 70 +- - include/linux/sched.h | 38 +- - include/linux/thread_info.h | 27 +- - include/linux/tracehook.h | 507 ++++++++ - include/linux/utrace.h | 544 ++++++++ - init/Kconfig | 29 + - kernel/Makefile | 1 + - kernel/compat.c | 3 +- - kernel/exit.c | 403 +++---- - kernel/fork.c | 72 +- - kernel/ptrace.c | 2129 +++++++++++++++++++++++++------- - kernel/signal.c | 285 +---- - kernel/sys_ni.c | 4 + - kernel/utrace.c | 2377 +++++++++++++++++++++++++++++++++++ - mm/nommu.c | 4 +- - security/selinux/hooks.c | 59 +- - security/selinux/include/objsec.h | 1 - - 81 files changed, 6535 insertions(+), 1421 deletions(-) + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/utrace.tmpl | 21 + + Documentation/utrace.txt | 579 ++++++++++ + fs/proc/array.c | 3 + + include/linux/ptrace.h | 15 + + include/linux/sched.h | 6 + + include/linux/tracehook.h | 60 + + include/linux/utrace.h | 534 +++++++++ + init/Kconfig | 28 + + kernel/Makefile | 1 + + kernel/ptrace.c | 542 +++++++++- + kernel/signal.c | 14 +- + kernel/utrace.c | 2211 +++++++++++++++++++++++++++++++++++++ + 13 files changed, 4012 insertions(+), 4 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile -index 300e170..7cf3afc 100644 +index 0eb0d02..49a78b7 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -7,7 +7,7 @@ @@ -92,14 +24,14 @@ - kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ + kernel-hacking.xml kernel-locking.xml deviceiobook.xml utrace.xml \ procfs-guide.xml writing_usb_driver.xml networking.xml \ - kernel-api.xml filesystems.xml lsm.xml usb.xml \ + kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl new file mode 100644 -index ...f185043 100644 +index ...8dfaa91 100644 --- /dev/null +++ b/Documentation/DocBook/utrace.tmpl -@@ -0,0 +1,23 @@ +@@ -0,0 +1,21 @@ + + @@ -117,9 +49,7 @@ + + +Machine state access via utrace -+!Finclude/linux/regset.h struct user_regset -+!Finclude/linux/regset.h struct user_regset_view -+!Finclude/linux/regset.h task_user_regset_view ++!Finclude/linux/regset.h + + + @@ -708,2509 +638,308 @@ +sure which event callbacks it will or won't see after utrace_set_flags +has returned. By checking for errors, it can know whether to clean up +its data structures immediately or to let its callbacks do the work. -diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c -index 1e9ad52..7dc30f5 100644 ---- a/arch/alpha/kernel/ptrace.c -+++ b/arch/alpha/kernel/ptrace.c -@@ -260,11 +260,12 @@ void ptrace_disable(struct task_struct * - ptrace_cancel_bpt(child); - } - --long arch_ptrace(struct task_struct *child, long request, long addr, long data) -+int arch_ptrace(struct task_struct *child, long request, long addr, long data, -+ long *retval) - { - unsigned long tmp; - size_t copied; -- long ret; -+ int ret; - - switch (request) { - /* When I and D space are separate, these will need to be fixed. */ -@@ -275,14 +276,14 @@ long arch_ptrace(struct task_struct *chi - if (copied != sizeof(tmp)) - break; - -- force_successful_syscall_return(); -- ret = tmp; -+ ret = 0; -+ *retval = tmp; - break; - - /* Read register number ADDR. */ - case PTRACE_PEEKUSR: -- force_successful_syscall_return(); -- ret = get_reg(child, addr); -+ ret = 0; -+ *retval = get_reg(child, addr); - DBG(DBG_MEM, ("peek $%ld->%#lx\n", addr, ret)); - break; - -@@ -343,7 +344,7 @@ long arch_ptrace(struct task_struct *chi - break; - - default: -- ret = ptrace_request(child, request, addr, data); -+ ret = 1; - break; - } - return ret; -diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c -index 4b05dc5..938be29 100644 ---- a/arch/arm/kernel/ptrace.c -+++ b/arch/arm/kernel/ptrace.c -@@ -655,7 +655,8 @@ static int ptrace_setcrunchregs(struct t - } - #endif - [...11988 lines suppressed...] +{ -+ struct utrace *utrace = tsk->utrace; -+ struct list_head *pos, *next; -+ struct utrace_attached_engine *engine; ++ struct utrace *utrace = task->utrace; ++ struct utrace_attached_engine *engine, *next; + const struct utrace_engine_ops *ops; + int unsafe = 0; + -+ /* XXX must change for sharing */ -+ list_for_each_safe_rcu(pos, next, &utrace->engines) { -+ engine = list_entry(pos, struct utrace_attached_engine, entry); ++ list_for_each_entry_safe(engine, next, &utrace->engines, entry) { + ops = rcu_dereference(engine->ops); + if (ops->unsafe_exec) -+ unsafe |= (*ops->unsafe_exec)(engine, tsk); ++ unsafe |= (*ops->unsafe_exec)(engine, task); + } + + return unsafe; +} -diff --git a/mm/nommu.c b/mm/nommu.c -index 5d8ae08..515beac 100644 ---- a/mm/nommu.c -+++ b/mm/nommu.c -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -734,7 +734,7 @@ static unsigned long determine_vm_flags( - * it's being traced - otherwise breakpoints set in it may interfere - * with another untraced process - */ -- if ((flags & MAP_PRIVATE) && (current->ptrace & PT_PTRACED)) -+ if ((flags & MAP_PRIVATE) && tracehook_expect_breakpoints(current)) - vm_flags &= ~VM_MAYSHARE; - - return vm_flags; -diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index d39b59c..43cb7c3 100644 ---- a/security/selinux/hooks.c -+++ b/security/selinux/hooks.c -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include -@@ -162,7 +162,7 @@ static int task_alloc_security(struct ta - return -ENOMEM; - - tsec->task = task; -- tsec->osid = tsec->sid = tsec->ptrace_sid = SECINITSID_UNLABELED; -+ tsec->osid = tsec->sid = SECINITSID_UNLABELED; - task->security = tsec; - - return 0; -@@ -1645,19 +1645,13 @@ static inline u32 file_to_av(struct file - - static int selinux_ptrace(struct task_struct *parent, struct task_struct *child) - { -- struct task_security_struct *psec = parent->security; -- struct task_security_struct *csec = child->security; - int rc; - - rc = secondary_ops->ptrace(parent,child); - if (rc) - return rc; - -- rc = task_has_perm(parent, child, PROCESS__PTRACE); -- /* Save the SID of the tracing process for later use in apply_creds. */ -- if (!(child->ptrace & PT_PTRACED) && !rc) -- csec->ptrace_sid = psec->sid; -- return rc; -+ return task_has_perm(parent, child, PROCESS__PTRACE); - } - - static int selinux_capget(struct task_struct *target, kernel_cap_t *effective, -@@ -2126,12 +2120,25 @@ static void selinux_bprm_apply_creds(str - /* Check for ptracing, and update the task SID if ok. - Otherwise, leave SID unchanged and kill. */ - if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) { -- rc = avc_has_perm(tsec->ptrace_sid, sid, -- SECCLASS_PROCESS, PROCESS__PTRACE, -- NULL); -- if (rc) { -- bsec->unsafe = 1; -- return; -+ struct task_struct *tracer; -+ struct task_security_struct *sec; -+ u32 ptsid = 0; -+ -+ rcu_read_lock(); -+ tracer = tracehook_tracer_task(current); -+ if (likely(tracer != NULL)) { -+ sec = tracer->security; -+ ptsid = sec->sid; -+ } -+ rcu_read_unlock(); + -+ if (ptsid != 0) { -+ rc = avc_has_perm(ptsid, sid, SECCLASS_PROCESS, -+ PROCESS__PTRACE, NULL); -+ if (rc) { -+ bsec->unsafe = 1; -+ return; -+ } - } - } - tsec->sid = sid; -@@ -2214,7 +2221,7 @@ static void selinux_bprm_post_apply_cred - - /* Wake up the parent if it is waiting so that it can - recheck wait permission to the new task SID. */ -- wake_up_interruptible(¤t->parent->signal->wait_chldexit); -+ wake_up_interruptible(¤t->real_parent->signal->wait_chldexit); - } - - /* superblock security operations */ -@@ -3087,11 +3094,6 @@ static int selinux_task_alloc_security(s - tsec2->keycreate_sid = tsec1->keycreate_sid; - tsec2->sockcreate_sid = tsec1->sockcreate_sid; - -- /* Retain ptracer SID across fork, if any. -- This will be reset by the ptrace hook upon any -- subsequent ptrace_attach operations. */ -- tsec2->ptrace_sid = tsec1->ptrace_sid; -- - return 0; - } - -@@ -5057,6 +5059,7 @@ static int selinux_setprocattr(struct ta - char *name, void *value, size_t size) - { - struct task_security_struct *tsec; -+ struct task_struct *tracer; - u32 sid = 0; - int error; - char *str = value; -@@ -5145,18 +5148,24 @@ static int selinux_setprocattr(struct ta - /* Check for ptracing, and update the task SID if ok. - Otherwise, leave SID unchanged and fail. */ - task_lock(p); -- if (p->ptrace & PT_PTRACED) { -- error = avc_has_perm_noaudit(tsec->ptrace_sid, sid, -+ rcu_read_lock(); -+ tracer = tracehook_tracer_task(p); -+ if (tracer != NULL) { -+ struct task_security_struct *ptsec = tracer->security; -+ u32 ptsid = ptsec->sid; -+ rcu_read_unlock(); -+ error = avc_has_perm_noaudit(ptsid, sid, - SECCLASS_PROCESS, - PROCESS__PTRACE, 0, &avd); - if (!error) - tsec->sid = sid; - task_unlock(p); -- avc_audit(tsec->ptrace_sid, sid, SECCLASS_PROCESS, -+ avc_audit(ptsid, sid, SECCLASS_PROCESS, - PROCESS__PTRACE, &avd, error, NULL); - if (error) - return error; - } else { -+ rcu_read_unlock(); - tsec->sid = sid; - task_unlock(p); - } -diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h -index c6c2bb4..1db31c2 100644 ---- a/security/selinux/include/objsec.h -+++ b/security/selinux/include/objsec.h -@@ -35,7 +35,6 @@ struct task_security_struct { - u32 create_sid; /* fscreate SID */ - u32 keycreate_sid; /* keycreate SID */ - u32 sockcreate_sid; /* fscreate SID */ -- u32 ptrace_sid; /* SID of ptrace parent */ - }; - - struct inode_security_struct { ++/* ++ * Called with rcu_read_lock() held. ++ */ ++void task_utrace_proc_status(struct seq_file *m, struct task_struct *p) ++{ ++ struct utrace *utrace = rcu_dereference(p->utrace); ++ if (unlikely(utrace)) ++ seq_printf(m, "Utrace: %lx%s%s%s\n", ++ p->utrace_flags, ++ utrace->stopped ? " (stopped)" : "", ++ utrace->report ? " (report)" : "", ++ utrace->interrupt ? " (interrupt)" : ""); ++} linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-wireless-pending.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-wireless-pending.patch 16 Jun 2008 10:19:26 -0000 1.8 +++ linux-2.6-wireless-pending.patch 18 Jul 2008 14:57:41 -0000 1.9 @@ -1,3984 +1,9038 @@ -commit 78cf07472f0ede8394bacc4bc02354505080cfe1 -Author: Holger Schurig -Date: Mon Jun 2 09:25:05 2008 +0200 - - libertas: unify various CF-related defines - - Signed-off-by: Holger Schurig - Signed-off-by: John W. Linville - -commit 2d892986e82306b8ad96285fb54b9999523331e0 -Author: Tomas Winkler -Date: Mon Jun 2 20:31:57 2008 +0300 +commit 4c9adafff7d910f142fe44fae37ed12c6b99f20f +Author: Ivo van Doorn +Date: Sun Jul 13 10:07:48 2008 +0200 - mac80211: removing shadowed sband + rt2x00: Reset LED assoc status after firmware update - This patch removes doubly defined sband variable + According to the legacy drivers the LED association status + must be reset after the firmware has been uploaded to the + hardware. - Signed-off-by: Tomas Winkler - Signed-off-by: Johannes Berg + Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville -commit b97e77e0446f0702de7fa0f5d2c52acf42d0289f -Author: Tomas Winkler -Date: Mon Jun 2 20:31:56 2008 +0300 +commit 3eb2011a67b044859069359948579b942993c416 +Author: Abhijeet Kolekar +Date: Fri Jul 11 11:53:42 2008 +0800 - mac80211: fix unbalanced locking in ieee80211_get_buffered_bc + iwlwifi: make index unsigned int for iwl_send_led_cmd - This patch fixes unbalanced locking in ieee80211_get_buffered_bc + This is a small fix to change the idx type from int to unsigned. - Signed-off-by: Tomas Winkler - Signed-off-by: Johannes Berg + Signed-off-by: Abhijeet Kolekar + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 2b2121417eff64125bdb7f322d3b533e06d73dae -Author: Pavel Roskin -Date: Mon Jun 2 07:54:50 2008 -0400 +commit 9a9ad0cda72a651fc6b99fa9ec040a5d41005a88 +Author: Abhijeet Kolekar +Date: Fri Jul 11 11:53:41 2008 +0800 - mac80211: fix panic when using hardware WEP + iwlwifi: Fix LEDs for 3945 - e039fa4a4195ac4ee895e6f3d1334beed63256fe ("mac80211: move TX info into - skb->cb") misplaced code for setting hardware WEP keys. Move it back. - This fixes kernel panic in b43 if WEP is used and hardware encryption - is enabled. + The patch fixes LEDs problem for 3945. - Signed-off-by: Pavel Roskin - Acked-by: Johannes Berg + Signed-off-by: Abhijeet Kolekar + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 5854a32e6cb672d182ce378c69f0f7470137a062 -Author: Johannes Berg -Date: Mon Jun 2 09:38:04 2008 +0200 +commit 36da7d70e307f8650db1b1c7350d2161ca3829ef +Author: Zhu Yi +Date: Fri Jul 11 11:53:40 2008 +0800 - mac80211: fix rate control initialisation - - In commit 2e92e6f2c50b4baf85cca968f0e6f1b5c0df7d39 ("mac80211: use rate - index in TX control") I forgot to initialise a few new variables to -1 which - means that the rate control algorithm is never triggered and 0 is used as - the only rate index, effectively fixing the transmit bitrate at the lowest - supported. + iwlwifi: send TXPOWER command after a new RXON command - This patch adds the missing initialisation. + The patch fixes the problem that TXPOWER command is not sent + after we issue a new RXON command which requires a tune. Otherwise + we won't be able to Tx any frames. - Signed-off-by: Johannes Berg - Bisected-by: Sitsofe Wheeler + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 7fd871edf437362b62ddd807542638cbda8d8a39 -Author: Masakazu Mokuno -Date: Mon Jun 2 12:49:16 2008 +0900 +commit fe905f1d5a8404f45fa0df26e6a870bf1e3b5983 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:39 2008 +0800 - PS3: gelic: Add support for ESSID scan + iwlwifi: enable active scanning - This adds the support for ESSID scanning + This patch enables active scan on active channels. - Signed-off-by: Masakazu Mokuno + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 552fe53f48ef2fd54b031b37d304211cee893ba0 -Author: Johannes Berg -Date: Fri May 30 21:07:15 2008 +0200 +commit d16dc48a2ea14af9980d0ea79d041f4b53e47b62 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:38 2008 +0800 - p54: fix skb->cb tx info conversion + iwlwifi: unify 4965 and 5000 scanning code - When I moved the TX info into skb->cb apparently I forgot to change a - few places to put the p54-internal data into info->driver_data rather - than skb->cb. This should fix it. + This patch unifies 4965 and 5000 scanning code. - Signed-off-by: Johannes Berg + We increases the version number to 1.3.27. Since new uCode + iwlwifi-4965-2.ucode is required for 4965 cards. + + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit f409e348005693016281bf29535c9d0a91b21f77 -Author: Masakazu Mokuno -Date: Fri May 30 16:52:55 2008 +0900 +commit ec1a746042ea4c1c93065185897d6e8d3e7de894 +Author: Tomas Winkler +Date: Fri Jul 11 11:53:37 2008 +0800 - PS3: gelic: Deprecate the private ioctls in the gelic driver + iwlwifi: LED use correctly blink table - As the driver has the standard way to handle PSK, deprecate the old - interface. + This patch makes correct usage of the LED blink table. - Signed-off-by: Masakazu Mokuno + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit 04b2046c856e36c3c9cf382adb2c0bc8ba780cf7 -Author: Masakazu Mokuno -Date: Fri May 30 16:52:44 2008 +0900 +commit 0eee612731e133604023bfa8d20047e98160845e +Author: Tomas Winkler +Date: Fri Jul 11 11:53:36 2008 +0800 - PS3: gelic: Use the new PMK interface in the gelic driver + iwlwifi: fix LED stall - With the new WEXT flags, the PS3 wireless driver can tell the user space that - it would do handle 4-way handshake by itself and needs the PSK without private - ioctls. + This patch fixes LED stall. last_blink_time was updated only if LED command + was sent, causing wrong computation of the througput. + Some code cleanup comes with this patch as well - Signed-off-by: Masakazu Mokuno + Signed-off-by: Tomas Winkler + Signed-off-by: Zhu Yi Signed-off-by: John W. Linville -commit ba569b4c68f11906da2996ee252bcff0df61cb90 -Author: Masakazu Mokuno -Date: Fri May 30 16:52:23 2008 +0900 +commit 9f17b318a1e2335b45cf35ad6509b90e972c0e6b +Author: Tomas Winkler +Date: Fri Jul 11 11:53:35 2008 +0800 - WEXT: Add support for passing PMK and capability flags to WEXT + iwlwifi: differentiate 4965 and 5000 hw ampdu queues number - This defines the flags for setting the PMK to the driver and the - capability flag for this so that the user space program can figure out - whether the target driver wants to do 4-way hand shake by itself and [...97305 lines suppressed...] ++ wext_ioctl_func private) + { ++ struct iwreq *iwr = (struct iwreq *) ifr; + struct net_device *dev; + iw_handler handler; + +@@ -1019,12 +1034,12 @@ static int wireless_process_ioctl(struct + * Note that 'cmd' is already filtered in dev_ioctl() with + * (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */ + if (cmd == SIOCGIWSTATS) +- return ioctl_standard_call(dev, ifr, cmd, +- &iw_handler_get_iwstats); ++ return standard(dev, iwr, cmd, info, ++ &iw_handler_get_iwstats); + + if (cmd == SIOCGIWPRIV && dev->wireless_handlers) +- return ioctl_standard_call(dev, ifr, cmd, +- &iw_handler_get_private); ++ return standard(dev, iwr, cmd, info, ++ &iw_handler_get_private); + + /* Basic check */ + if (!netif_device_present(dev)) +@@ -1035,9 +1050,9 @@ static int wireless_process_ioctl(struct + if (handler) { + /* Standard and private are not the same */ + if (cmd < SIOCIWFIRSTPRIV) +- return ioctl_standard_call(dev, ifr, cmd, handler); ++ return standard(dev, iwr, cmd, info, handler); + else +- return ioctl_private_call(dev, ifr, cmd, handler); ++ return private(dev, iwr, cmd, info, handler); + } + /* Old driver API : call driver ioctl handler */ + if (dev->do_ioctl) +@@ -1045,27 +1060,154 @@ static int wireless_process_ioctl(struct + return -EOPNOTSUPP; + } + +-/* entry point from dev ioctl */ +-int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, +- void __user *arg) ++/* If command is `set a parameter', or `get the encoding parameters', ++ * check if the user has the right to do it. ++ */ ++static int wext_permission_check(unsigned int cmd) + { +- int ret; +- +- /* If command is `set a parameter', or +- * `get the encoding parameters', check if +- * the user has the right to do it */ + if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT) + && !capable(CAP_NET_ADMIN)) + return -EPERM; + ++ return 0; ++} ++ ++/* entry point from dev ioctl */ ++static int wext_ioctl_dispatch(struct net *net, struct ifreq *ifr, ++ unsigned int cmd, struct iw_request_info *info, ++ wext_ioctl_func standard, ++ wext_ioctl_func private) ++{ ++ int ret = wext_permission_check(cmd); ++ ++ if (ret) ++ return ret; ++ + dev_load(net, ifr->ifr_name); + rtnl_lock(); +- ret = wireless_process_ioctl(net, ifr, cmd); ++ ret = wireless_process_ioctl(net, ifr, cmd, info, standard, private); + rtnl_unlock(); +- if (IW_IS_GET(cmd) && copy_to_user(arg, ifr, sizeof(struct iwreq))) ++ ++ return ret; ++} ++ ++int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, ++ void __user *arg) ++{ ++ struct iw_request_info info = { .cmd = cmd, .flags = 0 }; ++ int ret; ++ ++ ret = wext_ioctl_dispatch(net, ifr, cmd, &info, ++ ioctl_standard_call, ++ ioctl_private_call); ++ if (ret >= 0 && ++ IW_IS_GET(cmd) && ++ copy_to_user(arg, ifr, sizeof(struct iwreq))) ++ return -EFAULT; ++ ++ return ret; ++} ++ ++#ifdef CONFIG_COMPAT ++static int compat_standard_call(struct net_device *dev, ++ struct iwreq *iwr, ++ unsigned int cmd, ++ struct iw_request_info *info, ++ iw_handler handler) ++{ ++ const struct iw_ioctl_description *descr; ++ struct compat_iw_point *iwp_compat; ++ struct iw_point iwp; ++ int err; ++ ++ descr = standard_ioctl + (cmd - SIOCIWFIRST); ++ ++ if (descr->header_type != IW_HEADER_TYPE_POINT) ++ return ioctl_standard_call(dev, iwr, cmd, info, handler); ++ ++ iwp_compat = (struct compat_iw_point *) &iwr->u.data; ++ iwp.pointer = compat_ptr(iwp_compat->pointer); ++ iwp.length = iwp_compat->length; ++ iwp.flags = iwp_compat->flags; ++ ++ err = ioctl_standard_iw_point(&iwp, cmd, descr, handler, dev, info); ++ ++ iwp_compat->pointer = ptr_to_compat(iwp.pointer); ++ iwp_compat->length = iwp.length; ++ iwp_compat->flags = iwp.flags; ++ ++ return err; ++} ++ ++static int compat_private_call(struct net_device *dev, struct iwreq *iwr, ++ unsigned int cmd, struct iw_request_info *info, ++ iw_handler handler) ++{ ++ const struct iw_priv_args *descr; ++ int ret, extra_size; ++ ++ extra_size = get_priv_descr_and_size(dev, cmd, &descr); ++ ++ /* Check if we have a pointer to user space data or not. */ ++ if (extra_size == 0) { ++ /* No extra arguments. Trivial to handle */ ++ ret = handler(dev, info, &(iwr->u), (char *) &(iwr->u)); ++ } else { ++ struct compat_iw_point *iwp_compat; ++ struct iw_point iwp; ++ ++ iwp_compat = (struct compat_iw_point *) &iwr->u.data; ++ iwp.pointer = compat_ptr(iwp_compat->pointer); ++ iwp.length = iwp_compat->length; ++ iwp.flags = iwp_compat->flags; ++ ++ ret = ioctl_private_iw_point(&iwp, cmd, descr, ++ handler, dev, info, extra_size); ++ ++ iwp_compat->pointer = ptr_to_compat(iwp.pointer); ++ iwp_compat->length = iwp.length; ++ iwp_compat->flags = iwp.flags; ++ } ++ ++ /* Call commit handler if needed and defined */ ++ if (ret == -EIWCOMMIT) ++ ret = call_commit_handler(dev); ++ ++ return ret; ++} ++ ++int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, ++ unsigned long arg) ++{ ++ void __user *argp = (void __user *)arg; ++ struct iw_request_info info; ++ struct iwreq iwr; ++ char *colon; ++ int ret; ++ ++ if (copy_from_user(&iwr, argp, sizeof(struct iwreq))) ++ return -EFAULT; ++ ++ iwr.ifr_name[IFNAMSIZ-1] = 0; ++ colon = strchr(iwr.ifr_name, ':'); ++ if (colon) ++ *colon = 0; ++ ++ info.cmd = cmd; ++ info.flags = IW_REQUEST_FLAG_COMPAT; ++ ++ ret = wext_ioctl_dispatch(net, (struct ifreq *) &iwr, cmd, &info, ++ compat_standard_call, ++ compat_private_call); ++ ++ if (ret >= 0 && ++ IW_IS_GET(cmd) && ++ copy_to_user(argp, &iwr, sizeof(struct iwreq))) + return -EFAULT; ++ + return ret; + } ++#endif + + /************************* EVENT PROCESSING *************************/ + /* linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-wireless.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-wireless.patch 16 Jun 2008 10:19:26 -0000 1.8 +++ linux-2.6-wireless.patch 18 Jul 2008 14:57:42 -0000 1.9 @@ -1,540 +1,521 @@ -commit cb62eccd7d946f7fb92b8beb79988726ec92c227 -Author: Ivo van Doorn -Date: Thu Jun 12 20:47:17 2008 +0200 +commit 814feefa859a736d29d0700d49debf13904b429f +Author: Ihar Hrachyshka +Date: Wed Jul 9 09:29:58 2008 +0300 - rt2x00: Add D-link DWA111 support + libertas: fix memory alignment problems on the blackfin - Add new rt73usb USB ID for D-Link DWA111 + Fixing unaligned memory access on the blackfin architecture. - Signed-off-by: Ivo van Doorn + Signed-off-by: Ihar Hrachyshka Signed-off-by: John W. Linville -commit 995ad6c5a415c9389d094d246ca1b305c1e31813 -Author: Tomas Winkler -Date: Thu Jun 12 20:08:19 2008 +0300 +commit 86229f0c7b4e065f51b5572a8a61801e281740a0 +Author: Luis Carlos Cobo +Date: Tue Jul 8 16:19:21 2008 +0200 + + zd1211rw: stop beacons on remove_interface + + If a mesh or ad-hoc interface is brought up and later it is replaced + by managed interface, the managed interface will keep transmitting + the beacons that were configured for the former interface. This patch + fixes that behaviour. + + Signed-off-by: John W. Linville - mac80211: add missing new line in debug print HT_DEBUG +commit 1f90916264049a7d9e6106fd60d289c9a775d24f +Author: Ivo van Doorn +Date: Tue Jul 8 13:45:20 2008 +0200 + + rt2x00: Disable synchronization during initialization - This patch adds '\n' in debug printk (wme.c HT DEBUG) + As soon as init_registers() was called, the rt2400/rt2500 + would start raising beacondone interrupts. Since this is highly + premature since no beacons were provided yet, we should + initialize the synchronization register to 0. + + This will make all drivers initialize it to 0 regardless + if they are raising beacondone interrupts or not, since it only + makes sense to have it completely disabled. - Signed-off-by: Tomas Winkler + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit adeed48090fc370afa0db8d007748ee72a40b578 +Author: Mattias Nissler +Date: Mon Jul 7 23:08:19 2008 +0200 + + rc80211_pid: Fix fast_start parameter handling + + This removes the fast_start parameter from the rc_pid parameters + information and instead uses the parameter macro when initializing + the rc_pid state. Since the parameter is only used on initialization, + there is no point of making exporting it via debugfs. This also fixes + uninitialized memory references to the fast_start and norm_offset + parameters detected by the kmemcheck utility. Thanks to Vegard Nossum + for reporting the bug. + + Signed-off-by: Mattias Nissler Signed-off-by: John W. Linville -commit 5c5f9664d5284d8542062fed39e1f19b80db7aa5 -Author: Abhijeet Kolekar -Date: Thu Jun 12 09:47:16 2008 +0800 +commit 6e43829bb69bf1d584a592075f1357590eb49b1a +Author: Vladimir Koutny +Date: Mon Jul 7 14:23:01 2008 +0200 - mac80211 : fix for iwconfig in ad-hoc mode + mac80211: don't report selected IBSS when not found - The patch checks interface status, if it is in IBSS_JOINED mode - show cell id it is associated with. + Don't report a 'selected' IBSS in sta_find_ibss when none was found. - Signed-off-by: Abhijeet Kolekar - Signed-off-by: Zhu Yi + Signed-off-by: Vladimir Koutny Signed-off-by: John W. Linville -commit e6340361f9c70e84312caed98c6e058ac6234e9b +commit 9e095a687b3561972272063260e14ab1bc21de08 Author: Michael Buesch -Date: Thu Jun 12 15:33:13 2008 +0200 +Date: Fri Jul 4 23:44:37 2008 +0200 - ssb: Fix coherent DMA mask for PCI devices + ssb-pcicore: Fix IRQ-vector init on embedded devices - This fixes setting the coherent DMA mask for PCI devices. + On embedded devices we must not route the interrupts through + the PCI core, if our host-bus is not PCI. + Reported-by: Steve Brown Signed-off-by: Michael Buesch Signed-off-by: John W. Linville -commit 6847aa5cce6e22c3625a243b02909ac46aafa110 -Author: Randy Dunlap -Date: Wed Jun 11 13:32:22 2008 -0700 - - rt2x00: LEDS build failure - - Config symbols that select LEDS_CLASS need to depend on NEW_LEDS so that - undefined symbols are not used in the build. - - The alternative is to select NEW_LEDS, which some drivers do. - - This patch fixes the led_* symbols build errors. - - (.text+0x174cdc): undefined reference to `input_unregister_device' - (.text+0x174d9f): undefined reference to `input_allocate_device' - (.text+0x174e2d): undefined reference to `input_register_device' - (.text+0x174e53): undefined reference to `input_free_device' - rt2x00rfkill.c:(.text+0x176dc4): undefined reference to `input_allocate_polled_device' - rt2x00rfkill.c:(.text+0x176e8b): undefined reference to `input_event' - rt2x00rfkill.c:(.text+0x176e9f): undefined reference to `input_event' - (.text+0x176eca): undefined reference to `input_unregister_polled_device' - (.text+0x176efc): undefined reference to `input_free_polled_device' - (.text+0x176f37): undefined reference to `input_free_polled_device' - (.text+0x176fd8): undefined reference to `input_register_polled_device' - (.text+0x1772c0): undefined reference to `led_classdev_resume' - (.text+0x1772d4): undefined reference to `led_classdev_resume' - (.text+0x1772e8): undefined reference to `led_classdev_resume' - (.text+0x17730a): undefined reference to `led_classdev_suspend' - (.text+0x17731e): undefined reference to `led_classdev_suspend' - (.text+0x17732f): undefined reference to `led_classdev_suspend' - rt2x00leds.c:(.text+0x177348): undefined reference to `led_classdev_unregister' - rt2x00leds.c:(.text+0x1773c0): undefined reference to `led_classdev_register' - rfkill-input.c:(.text+0x209e4c): undefined reference to `input_close_device' - rfkill-input.c:(.text+0x209e53): undefined reference to `input_unregister_handle' - rfkill-input.c:(.text+0x209ea1): undefined reference to `input_register_handle' - rfkill-input.c:(.text+0x209eae): undefined reference to `input_open_device' - rfkill-input.c:(.text+0x209ebb): undefined reference to `input_unregister_handle' - rfkill-input.c:(.init.text+0x17405): undefined reference to `input_register_handler' - rfkill-input.c:(.exit.text+0x194f): undefined reference to `input_unregister_handler' - make[1]: *** [vmlinux] Error 1 - - Signed-off-by: Randy Dunlap - Acked-by: Ivo van Doorn - Signed-off-by: John W. Linville - -commit e76328e4a8260707fbc29c99773fb5ba4627096c -Author: Randy Dunlap -Date: Wed Jun 11 12:57:58 2008 -0700 - - rt2x00: INPUT build failure - - Config symbols that select RFKILL need to depend on INPUT so that - undefined symbols are not used in the build. - - This patch fixes the input_* symbols build errors. - - (.text+0x174cdc): undefined reference to `input_unregister_device' - (.text+0x174d9f): undefined reference to `input_allocate_device' - (.text+0x174e2d): undefined reference to `input_register_device' - (.text+0x174e53): undefined reference to `input_free_device' - rt2x00rfkill.c:(.text+0x176dc4): undefined reference to `input_allocate_polled_device' - rt2x00rfkill.c:(.text+0x176e8b): undefined reference to `input_event' - rt2x00rfkill.c:(.text+0x176e9f): undefined reference to `input_event' - (.text+0x176eca): undefined reference to `input_unregister_polled_device' - (.text+0x176efc): undefined reference to `input_free_polled_device' - (.text+0x176f37): undefined reference to `input_free_polled_device' - (.text+0x176fd8): undefined reference to `input_register_polled_device' - (.text+0x1772c0): undefined reference to `led_classdev_resume' - (.text+0x1772d4): undefined reference to `led_classdev_resume' - (.text+0x1772e8): undefined reference to `led_classdev_resume' - (.text+0x17730a): undefined reference to `led_classdev_suspend' - (.text+0x17731e): undefined reference to `led_classdev_suspend' - (.text+0x17732f): undefined reference to `led_classdev_suspend' - rt2x00leds.c:(.text+0x177348): undefined reference to `led_classdev_unregister' - rt2x00leds.c:(.text+0x1773c0): undefined reference to `led_classdev_register' - rfkill-input.c:(.text+0x209e4c): undefined reference to `input_close_device' - rfkill-input.c:(.text+0x209e53): undefined reference to `input_unregister_handle' - rfkill-input.c:(.text+0x209ea1): undefined reference to `input_register_handle' - rfkill-input.c:(.text+0x209eae): undefined reference to `input_open_device' - rfkill-input.c:(.text+0x209ebb): undefined reference to `input_unregister_handle' - rfkill-input.c:(.init.text+0x17405): undefined reference to `input_register_handler' - rfkill-input.c:(.exit.text+0x194f): undefined reference to `input_unregister_handler' - make[1]: *** [vmlinux] Error 1 +commit 9dfd55008e3863dcd93219c74bf05b09e5c549e2 +Author: Firat Birlik +Date: Fri Jul 4 04:31:50 2008 +0100 + + zd1211rw: add ID for AirTies WUS-201 - Signed-off-by: Randy Dunlap - Acked-by: Ivo van Doorn + I would like to inform you of our zd1211 based usb wifi adapter (AirTies + WUS-201), which works with the zd1211rw driver with the following device + id definition. + + Signed-off-by: Daniel Drake Signed-off-by: John W. Linville -commit 98a3b2fe435ae76170936c14f5c9e6a87548e3ef -Author: Michael Buesch -Date: Thu Jun 12 12:36:29 2008 +0200 +commit ea0c925370b33baf168bb33782c613468c1aa119 +Author: Ivo van Doorn +Date: Thu Jul 3 19:02:44 2008 +0200 - b43: Fix noise calculation WARN_ON - - This removes a WARN_ON that is responsible for the following koops: - http://www.kerneloops.org/searchweek.php?search=b43_generate_noise_sample + mac80211: Only flush workqueue when last interface was removed - The comment in the patch describes why it's safe to simply remove - the check. + Currently the ieee80211_hw->workqueue is flushed each time + an interface is being removed. However most scheduled work + is not interface specific but device specific, for example things like + periodic work for link tuners. + + This patch will move the flush_workqueue() call to directly behind + the call to ops->stop() to make sure the workqueue is only flushed + when all interfaces are gone and there really shouldn't be any scheduled + work in the drivers left. - Signed-off-by: Michael Buesch + Signed-off-by: Ivo van Doorn + Acked-by: Johannes Berg Signed-off-by: John W. Linville -commit 028118a5f09a9c807e6b43e2231efdff9f224c74 -Author: Michael Buesch -Date: Thu Jun 12 11:58:56 2008 +0200 +commit 8db9369ff92b1cd93566baadd8bd2992f025fdd0 +Author: Guy Cohen +Date: Thu Jul 3 19:56:13 2008 +0300 - b43: Fix possible NULL pointer dereference in DMA code - - This fixes a possible NULL pointer dereference in an error path of the - DMA allocation error checking code. This is also necessary for a future - DMA API change that is on its way into the mainline kernel that adds - an additional dev parameter to dma_mapping_error(). + mac80211: move netif_carrier_on to after ieee80211_bss_info_change_notify - This patch moves the whole struct b43_dmaring struct initialization - right before any DMA allocation operation. + Putting netif_carrier_on before configuring the driver/device with the + new association state may cause a race (tx frames may be sent before + configuration is done) - Reported-by: Miles Lane - Signed-off-by: Michael Buesch + Signed-off-by: Guy Cohen + Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville -commit 051c256f672efa356a4cda1841132dbc86541090 -Author: Gertjan van Wingerde -Date: Tue Jun 3 20:29:47 2008 +0200 +commit 0ff1cca0e272045b9c11a2ff94bd3e6893c9308c +Author: Darren Jenkins +Date: Thu Jul 3 09:41:38 2008 +1000 - rt2x00: Restrict DMA to 32-bit addresses. + drivers/net/wireless/iwlwifi/iwl-3945.c Fix type issue on 64bit - None of the rt2x00 PCI devices support 64-bit DMA addresses (they all - only accept 32-bit buffer addresses). Hence it makes no sense to try to - enable 64-bit DMA addresses. Only try to enable 32-bit DMA addresses. + Coverity CID: 2265 NEGATIVE_RETURNS - Signed-off-by: Gertjan van Wingerde - Signed-off-by: Ivo van Doorn + "rate" is of an unsigned type, and the code requires a signed type. + The following patch makes it so. + + Signed-off-by: Darren Jenkins Signed-off-by: John W. Linville -commit edfa78b2ba651782d70be6d1fef214e21a26d8cb -Author: Ivo van Doorn -Date: Tue Jun 3 20:29:50 2008 +0200 - - rt2x00: Don't kill guardian_urb when it wasn't created - - This fixes a "BUG: unable to handle kernel paging request" - bug in rt73usb which was caused by killing the guardian_urb - while it had never been allocated for rt73usb. +commit fcee7a01ad7516eeb8dfdd0a17ef04cd2ee30757 +Author: John W. Linville +Date: Wed Jul 2 11:04:24 2008 -0400 + + hostap_cs: correct poor NULL checks in suspend/resume routines + + This corrects this kernel.org bug: + + http://bugzilla.kernel.org/show_bug.cgi?id=9701 - Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville -diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-13 17:37:04.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-13 17:37:35.000000000 -0400 -@@ -630,7 +630,6 @@ struct b43_pio { - - /* Context information for a noise calculation (Link Quality). */ - struct b43_noise_calculation { -- u8 channel_at_start; - bool calculation_running; - u8 nr_samples; - s8 samples[8][4]; -diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c.orig 2008-06-13 17:37:04.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c 2008-06-13 17:37:35.000000000 -0400 -@@ -795,24 +795,49 @@ struct b43_dmaring *b43_setup_dmaring(st - { - struct b43_dmaring *ring; - int err; -- int nr_slots; - dma_addr_t dma_test; +diff -up linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c +--- linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-07-10 10:53:04.000000000 -0400 +@@ -777,8 +777,10 @@ static int hostap_cs_suspend(struct pcmc + int dev_open = 0; + struct hostap_interface *iface = NULL; + +- if (dev) +- iface = netdev_priv(dev); ++ if (!dev) ++ return -ENODEV; ++ ++ iface = netdev_priv(dev); - ring = kzalloc(sizeof(*ring), GFP_KERNEL); - if (!ring) - goto out; -- ring->type = type; + PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info); + if (iface && iface->local) +@@ -798,8 +800,10 @@ static int hostap_cs_resume(struct pcmci + int dev_open = 0; + struct hostap_interface *iface = NULL; + +- if (dev) +- iface = netdev_priv(dev); ++ if (!dev) ++ return -ENODEV; ++ ++ iface = netdev_priv(dev); + + PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info); + +diff -up linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-07-10 10:53:04.000000000 -0400 +@@ -449,7 +449,7 @@ static void iwl3945_dbg_report_frame(str + + if (print_summary) { + char *title; +- u32 rate; ++ int rate; + + if (hundred) + title = "100Frames"; +@@ -487,7 +487,7 @@ static void iwl3945_dbg_report_frame(str + * but you can hack it to show more, if you'd like to. */ + if (dataframe) + IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, " +- "len=%u, rssi=%d, chnl=%d, rate=%u, \n", ++ "len=%u, rssi=%d, chnl=%d, rate=%d, \n", + title, fc, header->addr1[5], + length, rssi, channel, rate); + else { +diff -up linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c +--- linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/libertas/scan.c 2008-07-10 10:53:45.000000000 -0400 +@@ -567,11 +567,11 @@ static int lbs_process_bss(struct bss_de + pos += 8; + + /* beacon interval is 2 bytes long */ +- bss->beaconperiod = le16_to_cpup((void *) pos); ++ bss->beaconperiod = get_unaligned_le16(pos); + pos += 2; + + /* capability information is 2 bytes long */ +- bss->capability = le16_to_cpup((void *) pos); ++ bss->capability = get_unaligned_le16(pos); + lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability); + pos += 2; + +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-07-10 10:53:45.000000000 -0400 +@@ -731,6 +731,17 @@ static int rt2400pci_init_registers(stru + (rt2x00dev->rx->data_size / 128)); + rt2x00pci_register_write(rt2x00dev, CSR9, reg); + ++ rt2x00pci_register_read(rt2x00dev, CSR14, ®); ++ rt2x00_set_field32(®, CSR14_TSF_COUNT, 0); ++ rt2x00_set_field32(®, CSR14_TSF_SYNC, 0); ++ rt2x00_set_field32(®, CSR14_TBCN, 0); ++ rt2x00_set_field32(®, CSR14_TCFP, 0); ++ rt2x00_set_field32(®, CSR14_TATIMW, 0); ++ rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); ++ rt2x00_set_field32(®, CSR14_CFP_COUNT_PRELOAD, 0); ++ rt2x00_set_field32(®, CSR14_TBCM_PRELOAD, 0); ++ rt2x00pci_register_write(rt2x00dev, CSR14, reg); ++ + rt2x00pci_register_write(rt2x00dev, CNT3, 0x3f080000); -- nr_slots = B43_RXRING_SLOTS; -+ ring->nr_slots = B43_RXRING_SLOTS; - if (for_tx) -- nr_slots = B43_TXRING_SLOTS; -+ ring->nr_slots = B43_TXRING_SLOTS; - -- ring->meta = kcalloc(nr_slots, sizeof(struct b43_dmadesc_meta), -+ ring->meta = kcalloc(ring->nr_slots, sizeof(struct b43_dmadesc_meta), - GFP_KERNEL); - if (!ring->meta) - goto err_kfree_ring; -+ -+ ring->type = type; -+ ring->dev = dev; -+ ring->mmio_base = b43_dmacontroller_base(type, controller_index); -+ ring->index = controller_index; -+ if (type == B43_DMA_64BIT) -+ ring->ops = &dma64_ops; -+ else -+ ring->ops = &dma32_ops; - if (for_tx) { -- ring->txhdr_cache = kcalloc(nr_slots, -+ ring->tx = 1; -+ ring->current_slot = -1; -+ } else { -+ if (ring->index == 0) { -+ ring->rx_buffersize = B43_DMA0_RX_BUFFERSIZE; -+ ring->frameoffset = B43_DMA0_RX_FRAMEOFFSET; -+ } else if (ring->index == 3) { -+ ring->rx_buffersize = B43_DMA3_RX_BUFFERSIZE; -+ ring->frameoffset = B43_DMA3_RX_FRAMEOFFSET; -+ } else -+ B43_WARN_ON(1); + rt2x00pci_register_read(rt2x00dev, ARCSR0, ®); +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-07-10 10:53:45.000000000 -0400 +@@ -824,6 +824,17 @@ static int rt2500pci_init_registers(stru + rt2x00_set_field32(®, CSR11_CW_SELECT, 0); + rt2x00pci_register_write(rt2x00dev, CSR11, reg); + ++ rt2x00pci_register_read(rt2x00dev, CSR14, ®); ++ rt2x00_set_field32(®, CSR14_TSF_COUNT, 0); ++ rt2x00_set_field32(®, CSR14_TSF_SYNC, 0); ++ rt2x00_set_field32(®, CSR14_TBCN, 0); ++ rt2x00_set_field32(®, CSR14_TCFP, 0); ++ rt2x00_set_field32(®, CSR14_TATIMW, 0); ++ rt2x00_set_field32(®, CSR14_BEACON_GEN, 0); ++ rt2x00_set_field32(®, CSR14_CFP_COUNT_PRELOAD, 0); ++ rt2x00_set_field32(®, CSR14_TBCM_PRELOAD, 0); ++ rt2x00pci_register_write(rt2x00dev, CSR14, reg); ++ + rt2x00pci_register_write(rt2x00dev, CNT3, 0); + + rt2x00pci_register_read(rt2x00dev, TXCSR8, ®); +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-07-10 10:53:45.000000000 -0400 +@@ -801,6 +801,13 @@ static int rt2500usb_init_registers(stru + rt2x00_set_field16(®, TXRX_CSR8_BBP_ID1_VALID, 0); + rt2500usb_register_write(rt2x00dev, TXRX_CSR8, reg); + ++ rt2500usb_register_read(rt2x00dev, TXRX_CSR19, ®); ++ rt2x00_set_field16(®, TXRX_CSR19_TSF_COUNT, 0); ++ rt2x00_set_field16(®, TXRX_CSR19_TSF_SYNC, 0); ++ rt2x00_set_field16(®, TXRX_CSR19_TBCN, 0); ++ rt2x00_set_field16(®, TXRX_CSR19_BEACON_GEN, 0); ++ rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg); ++ + rt2500usb_register_write(rt2x00dev, TXRX_CSR21, 0xe78f); + rt2500usb_register_write(rt2x00dev, MAC_CSR9, 0xff1d); + +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-07-10 10:53:45.000000000 -0400 +@@ -1201,6 +1201,15 @@ static int rt61pci_init_registers(struct + rt2x00_set_field32(®, TXRX_CSR8_ACK_CTS_54MBS, 42); + rt2x00pci_register_write(rt2x00dev, TXRX_CSR8, reg); + ++ rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, ®); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_INTERVAL, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_TICKING, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_SYNC, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TBTT_ENABLE, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0); ++ rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg); ++ + rt2x00pci_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f); + + rt2x00pci_register_write(rt2x00dev, MAC_CSR6, 0x00000fff); +diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c +--- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-07-10 10:53:45.000000000 -0400 +@@ -1006,6 +1006,15 @@ static int rt73usb_init_registers(struct + rt2x00_set_field32(®, TXRX_CSR8_ACK_CTS_54MBS, 42); + rt73usb_register_write(rt2x00dev, TXRX_CSR8, reg); + ++ rt73usb_register_read(rt2x00dev, TXRX_CSR9, ®); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_INTERVAL, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_TICKING, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TSF_SYNC, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TBTT_ENABLE, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0); ++ rt2x00_set_field32(®, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0); ++ rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg); ++ + rt73usb_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f); + + rt73usb_register_read(rt2x00dev, MAC_CSR6, ®); +diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-07-10 10:53:45.000000000 -0400 +@@ -765,6 +765,7 @@ static void zd_op_remove_interface(struc + { + struct zd_mac *mac = zd_hw_mac(hw); + mac->type = IEEE80211_IF_TYPE_INVALID; ++ zd_set_beacon_interval(&mac->chip, 0); + zd_write_mac_addr(&mac->chip, NULL); + } + +diff -up linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c +--- linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/net/wireless/zd1211rw/zd_usb.c 2008-07-10 10:53:04.000000000 -0400 +@@ -64,6 +64,7 @@ static struct usb_device_id usb_ids[] = + { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B }, ++ { USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B }, +diff -up linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c +--- linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/drivers/ssb/driver_pcicore.c 2008-07-10 10:53:04.000000000 -0400 +@@ -537,6 +537,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc + int err = 0; + u32 tmp; + ++ if (dev->bus->bustype != SSB_BUSTYPE_PCI) { ++ /* This SSB device is not on a PCI host-bus. So the IRQs are ++ * not routed through the PCI core. ++ * So we must not enable routing through the PCI core. */ ++ goto out; + } -+ spin_lock_init(&ring->lock); -+#ifdef CONFIG_B43_DEBUG -+ ring->last_injected_overflow = jiffies; -+#endif -+ -+ if (for_tx) { -+ ring->txhdr_cache = kcalloc(ring->nr_slots, - b43_txhdr_size(dev), - GFP_KERNEL); - if (!ring->txhdr_cache) -@@ -828,7 +853,7 @@ struct b43_dmaring *b43_setup_dmaring(st - b43_txhdr_size(dev), 1)) { - /* ugh realloc */ - kfree(ring->txhdr_cache); -- ring->txhdr_cache = kcalloc(nr_slots, -+ ring->txhdr_cache = kcalloc(ring->nr_slots, - b43_txhdr_size(dev), - GFP_KERNEL | GFP_DMA); - if (!ring->txhdr_cache) -@@ -853,32 +878,6 @@ struct b43_dmaring *b43_setup_dmaring(st - DMA_TO_DEVICE); - } ++ + if (!pdev) + goto out; + bus = pdev->bus; +diff -up linux-2.6.25.noarch/net/mac80211/main.c.orig linux-2.6.25.noarch/net/mac80211/main.c +--- linux-2.6.25.noarch/net/mac80211/main.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/main.c 2008-07-10 10:53:04.000000000 -0400 +@@ -530,8 +530,6 @@ static int ieee80211_stop(struct net_dev + local->sta_hw_scanning = 0; + } -- ring->dev = dev; -- ring->nr_slots = nr_slots; -- ring->mmio_base = b43_dmacontroller_base(type, controller_index); -- ring->index = controller_index; -- if (type == B43_DMA_64BIT) -- ring->ops = &dma64_ops; -- else -- ring->ops = &dma32_ops; -- if (for_tx) { -- ring->tx = 1; -- ring->current_slot = -1; -- } else { -- if (ring->index == 0) { -- ring->rx_buffersize = B43_DMA0_RX_BUFFERSIZE; -- ring->frameoffset = B43_DMA0_RX_FRAMEOFFSET; -- } else if (ring->index == 3) { -- ring->rx_buffersize = B43_DMA3_RX_BUFFERSIZE; -- ring->frameoffset = B43_DMA3_RX_FRAMEOFFSET; -- } else -- B43_WARN_ON(1); -- } -- spin_lock_init(&ring->lock); --#ifdef CONFIG_B43_DEBUG -- ring->last_injected_overflow = jiffies; --#endif +- flush_workqueue(local->hw.workqueue); - - err = alloc_ringmemory(ring); - if (err) - goto err_kfree_txhdr_cache; -diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.25.noarch/drivers/net/wireless/b43/main.c.orig 2008-06-13 17:37:04.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/b43/main.c 2008-06-13 17:37:35.000000000 -0400 -@@ -1145,7 +1145,6 @@ static void b43_generate_noise_sample(st - b43_jssi_write(dev, 0x7F7F7F7F); - b43_write32(dev, B43_MMIO_MACCMD, - b43_read32(dev, B43_MMIO_MACCMD) | B43_MACCMD_BGNOISE); -- B43_WARN_ON(dev->noisecalc.channel_at_start != dev->phy.channel); - } + sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED; + kfree(sdata->u.sta.extra_ie); + sdata->u.sta.extra_ie = NULL; +@@ -555,6 +553,8 @@ static int ieee80211_stop(struct net_dev - static void b43_calculate_link_quality(struct b43_wldev *dev) -@@ -1154,7 +1153,6 @@ static void b43_calculate_link_quality(s + ieee80211_led_radio(local, 0); - if (dev->noisecalc.calculation_running) - return; -- dev->noisecalc.channel_at_start = dev->phy.channel; - dev->noisecalc.calculation_running = 1; - dev->noisecalc.nr_samples = 0; - -@@ -1171,9 +1169,16 @@ static void handle_irq_noise(struct b43_ - - /* Bottom half of Link Quality calculation. */ - -+ /* Possible race condition: It might be possible that the user -+ * changed to a different channel in the meantime since we -+ * started the calculation. We ignore that fact, since it's -+ * not really that much of a problem. The background noise is -+ * an estimation only anyway. Slightly wrong results will get damped -+ * by the averaging of the 8 sample rounds. Additionally the -+ * value is shortlived. So it will be replaced by the next noise -+ * calculation round soon. */ -+ - B43_WARN_ON(!dev->noisecalc.calculation_running); -- if (dev->noisecalc.channel_at_start != phy->channel) -- goto drop_calculation; - *((__le32 *)noise) = cpu_to_le32(b43_jssi_read(dev)); - if (noise[0] == 0x7F || noise[1] == 0x7F || - noise[2] == 0x7F || noise[3] == 0x7F) -@@ -1214,11 +1219,10 @@ static void handle_irq_noise(struct b43_ - average -= 48; - - dev->stats.link_noise = average; -- drop_calculation: - dev->noisecalc.calculation_running = 0; - return; ++ flush_workqueue(local->hw.workqueue); ++ + tasklet_disable(&local->tx_pending_tasklet); + tasklet_disable(&local->tasklet); } -- generate_new: -+generate_new: - b43_generate_noise_sample(dev); +diff -up linux-2.6.25.noarch/net/mac80211/mlme.c.orig linux-2.6.25.noarch/net/mac80211/mlme.c +--- linux-2.6.25.noarch/net/mac80211/mlme.c.orig 2008-07-10 10:52:58.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/mlme.c 2008-07-10 10:53:04.000000000 -0400 +@@ -547,15 +547,14 @@ static void ieee80211_set_associated(str + sdata->bss_conf.ht_bss_conf = &conf->ht_bss_conf; + } + +- netif_carrier_on(dev); + ifsta->flags |= IEEE80211_STA_PREV_BSSID_SET; + memcpy(ifsta->prev_bssid, sdata->u.sta.bssid, ETH_ALEN); + memcpy(wrqu.ap_addr.sa_data, sdata->u.sta.bssid, ETH_ALEN); + ieee80211_sta_send_associnfo(dev, ifsta); + } else { ++ netif_carrier_off(dev); + ieee80211_sta_tear_down_BA_sessions(dev, ifsta->bssid); + ifsta->flags &= ~IEEE80211_STA_ASSOCIATED; +- netif_carrier_off(dev); + ieee80211_reset_erp_info(dev); + + sdata->bss_conf.assoc_ht = 0; +@@ -569,6 +568,10 @@ static void ieee80211_set_associated(str + + sdata->bss_conf.assoc = assoc; + ieee80211_bss_info_change_notify(sdata, changed); ++ ++ if (assoc) ++ netif_carrier_on(dev); ++ + wrqu.ap_addr.sa_family = ARPHRD_ETHER; + wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL); } +@@ -3611,8 +3614,10 @@ static int ieee80211_sta_find_ibss(struc + spin_unlock_bh(&local->sta_bss_lock); -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/Kconfig.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/Kconfig ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/Kconfig.orig 2008-06-13 17:37:05.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/Kconfig 2008-06-13 17:37:35.000000000 -0400 -@@ -32,12 +32,13 @@ config RT2X00_LIB_FIRMWARE - config RT2X00_LIB_RFKILL - boolean - depends on RT2X00_LIB -+ depends on INPUT - select RFKILL - select INPUT_POLLDEV - - config RT2X00_LIB_LEDS - boolean -- depends on RT2X00_LIB -+ depends on RT2X00_LIB && NEW_LEDS - - config RT2400PCI - tristate "Ralink rt2400 pci/pcmcia support" -@@ -51,7 +52,7 @@ config RT2400PCI - - config RT2400PCI_RFKILL - bool "RT2400 rfkill support" -- depends on RT2400PCI -+ depends on RT2400PCI && INPUT - select RT2X00_LIB_RFKILL - ---help--- - This adds support for integrated rt2400 devices that feature a -@@ -60,7 +61,7 @@ config RT2400PCI_RFKILL - - config RT2400PCI_LEDS - bool "RT2400 leds support" -- depends on RT2400PCI -+ depends on RT2400PCI && NEW_LEDS - select LEDS_CLASS - select RT2X00_LIB_LEDS - ---help--- -@@ -78,7 +79,7 @@ config RT2500PCI - - config RT2500PCI_RFKILL - bool "RT2500 rfkill support" -- depends on RT2500PCI -+ depends on RT2500PCI && INPUT - select RT2X00_LIB_RFKILL - ---help--- - This adds support for integrated rt2500 devices that feature a -@@ -87,7 +88,7 @@ config RT2500PCI_RFKILL - - config RT2500PCI_LEDS - bool "RT2500 leds support" -- depends on RT2500PCI -+ depends on RT2500PCI && NEW_LEDS - select LEDS_CLASS - select RT2X00_LIB_LEDS - ---help--- -@@ -107,7 +108,7 @@ config RT61PCI - - config RT61PCI_RFKILL - bool "RT61 rfkill support" -- depends on RT61PCI -+ depends on RT61PCI && INPUT - select RT2X00_LIB_RFKILL - ---help--- - This adds support for integrated rt61 devices that feature a -@@ -116,7 +117,7 @@ config RT61PCI_RFKILL - - config RT61PCI_LEDS - bool "RT61 leds support" -- depends on RT61PCI -+ depends on RT61PCI && NEW_LEDS - select LEDS_CLASS - select RT2X00_LIB_LEDS - ---help--- -@@ -133,7 +134,7 @@ config RT2500USB - - config RT2500USB_LEDS - bool "RT2500 leds support" -- depends on RT2500USB -+ depends on RT2500USB && NEW_LEDS - select LEDS_CLASS - select RT2X00_LIB_LEDS - ---help--- -@@ -152,7 +153,7 @@ config RT73USB - - config RT73USB_LEDS - bool "RT73 leds support" -- depends on RT73USB -+ depends on RT73USB && NEW_LEDS - select LEDS_CLASS - select RT2X00_LIB_LEDS - ---help--- -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2008-06-13 17:37:05.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-06-13 17:37:35.000000000 -0400 -@@ -412,8 +412,7 @@ int rt2x00pci_probe(struct pci_dev *pci_ - if (pci_set_mwi(pci_dev)) - ERROR_PROBE("MWI not available.\n"); - -- if (pci_set_dma_mask(pci_dev, DMA_64BIT_MASK) && -- pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { -+ if (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { - ERROR_PROBE("PCI DMA not supported.\n"); - retval = -EIO; - goto exit_disable_device; -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2008-06-13 17:37:05.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2008-06-13 17:37:35.000000000 -0400 -@@ -362,6 +362,12 @@ void rt2x00usb_disable_radio(struct rt2x - } + #ifdef CONFIG_MAC80211_IBSS_DEBUG +- printk(KERN_DEBUG " sta_find_ibss: selected %s current " +- "%s\n", print_mac(mac, bssid), print_mac(mac2, ifsta->bssid)); ++ if (found) ++ printk(KERN_DEBUG " sta_find_ibss: selected %s current " ++ "%s\n", print_mac(mac, bssid), ++ print_mac(mac2, ifsta->bssid)); + #endif /* CONFIG_MAC80211_IBSS_DEBUG */ + if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 && + (bss = ieee80211_rx_bss_get(dev, bssid, +diff -up linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c +--- linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c 2008-07-10 10:53:45.000000000 -0400 +@@ -398,13 +398,25 @@ static void *rate_control_pid_alloc(stru + return NULL; } -+ /* -+ * Kill guardian urb (if required by driver). -+ */ -+ if (!test_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags)) -+ return; -+ - for (i = 0; i < rt2x00dev->bcn->limit; i++) { - priv_bcn = rt2x00dev->bcn->entries[i].priv_data; - usb_kill_urb(priv_bcn->urb); -diff -up linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-06-13 17:37:05.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-06-13 17:37:35.000000000 -0400 -@@ -2131,6 +2131,7 @@ static struct usb_device_id rt73usb_devi - /* D-Link */ - { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, - { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, -+ { USB_DEVICE(0x07d1, 0x3c06), USB_DEVICE_DATA(&rt73usb_ops) }, - { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) }, - /* Gemtek */ - { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) }, -diff -up linux-2.6.25.noarch/drivers/ssb/main.c.orig linux-2.6.25.noarch/drivers/ssb/main.c ---- linux-2.6.25.noarch/drivers/ssb/main.c.orig 2008-06-13 17:33:42.000000000 -0400 -+++ linux-2.6.25.noarch/drivers/ssb/main.c 2008-06-13 17:37:35.000000000 -0400 -@@ -1168,15 +1168,21 @@ EXPORT_SYMBOL(ssb_dma_translation); - int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask) - { - struct device *dma_dev = ssb_dev->dma_dev; -+ int err = 0; ++ pinfo->target = RC_PID_TARGET_PF; ++ pinfo->sampling_period = RC_PID_INTERVAL; ++ pinfo->coeff_p = RC_PID_COEFF_P; ++ pinfo->coeff_i = RC_PID_COEFF_I; ++ pinfo->coeff_d = RC_PID_COEFF_D; ++ pinfo->smoothing_shift = RC_PID_SMOOTHING_SHIFT; ++ pinfo->sharpen_factor = RC_PID_SHARPENING_FACTOR; ++ pinfo->sharpen_duration = RC_PID_SHARPENING_DURATION; ++ pinfo->norm_offset = RC_PID_NORM_OFFSET; ++ pinfo->rinfo = rinfo; ++ pinfo->oldrate = 0; ++ + /* Sort the rates. This is optimized for the most common case (i.e. + * almost-sorted CCK+OFDM rates). Kind of bubble-sort with reversed + * mapping too. */ + for (i = 0; i < sband->n_bitrates; i++) { + rinfo[i].index = i; + rinfo[i].rev_index = i; +- if (pinfo->fast_start) ++ if (RC_PID_FAST_START) + rinfo[i].diff = 0; + else + rinfo[i].diff = i * pinfo->norm_offset; +@@ -425,19 +437,6 @@ static void *rate_control_pid_alloc(stru + break; + } - #ifdef CONFIG_SSB_PCIHOST -- if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) -- return dma_set_mask(dma_dev, mask); -+ if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) { -+ err = pci_set_dma_mask(ssb_dev->bus->host_pci, mask); -+ if (err) -+ return err; -+ err = pci_set_consistent_dma_mask(ssb_dev->bus->host_pci, mask); -+ return err; -+ } +- pinfo->target = RC_PID_TARGET_PF; +- pinfo->sampling_period = RC_PID_INTERVAL; +- pinfo->coeff_p = RC_PID_COEFF_P; +- pinfo->coeff_i = RC_PID_COEFF_I; +- pinfo->coeff_d = RC_PID_COEFF_D; +- pinfo->smoothing_shift = RC_PID_SMOOTHING_SHIFT; +- pinfo->sharpen_factor = RC_PID_SHARPENING_FACTOR; +- pinfo->sharpen_duration = RC_PID_SHARPENING_DURATION; +- pinfo->norm_offset = RC_PID_NORM_OFFSET; +- pinfo->fast_start = RC_PID_FAST_START; +- pinfo->rinfo = rinfo; +- pinfo->oldrate = 0; +- + #ifdef CONFIG_MAC80211_DEBUGFS + de = &pinfo->dentries; + de->dir = debugfs_create_dir("rc80211_pid", +@@ -465,9 +464,6 @@ static void *rate_control_pid_alloc(stru + de->norm_offset = debugfs_create_u32("norm_offset", + S_IRUSR | S_IWUSR, de->dir, + &pinfo->norm_offset); +- de->fast_start = debugfs_create_bool("fast_start", +- S_IRUSR | S_IWUSR, de->dir, +- &pinfo->fast_start); #endif - dma_dev->coherent_dma_mask = mask; - dma_dev->dma_mask = &dma_dev->coherent_dma_mask; -- return 0; -+ return err; - } - EXPORT_SYMBOL(ssb_dma_set_mask); + return pinfo; +@@ -479,7 +475,6 @@ static void rate_control_pid_free(void * + #ifdef CONFIG_MAC80211_DEBUGFS + struct rc_pid_debugfs_entries *de = &pinfo->dentries; + +- debugfs_remove(de->fast_start); + debugfs_remove(de->norm_offset); + debugfs_remove(de->sharpen_duration); + debugfs_remove(de->sharpen_factor); +diff -up linux-2.6.25.noarch/net/mac80211/rc80211_pid.h.orig linux-2.6.25.noarch/net/mac80211/rc80211_pid.h +--- linux-2.6.25.noarch/net/mac80211/rc80211_pid.h.orig 2008-07-10 10:52:54.000000000 -0400 ++++ linux-2.6.25.noarch/net/mac80211/rc80211_pid.h 2008-07-10 10:53:45.000000000 -0400 +@@ -141,7 +141,6 @@ struct rc_pid_events_file_info { + * rate behaviour values (lower means we should trust more what we learnt + * about behaviour of rates, higher means we should trust more the natural + * ordering of rates) +- * @fast_start: if Y, push high rates right after initialization + */ + struct rc_pid_debugfs_entries { + struct dentry *dir; +@@ -154,7 +153,6 @@ struct rc_pid_debugfs_entries { + struct dentry *sharpen_factor; + struct dentry *sharpen_duration; + struct dentry *norm_offset; +- struct dentry *fast_start; + }; + + void rate_control_pid_event_tx_status(struct rc_pid_event_buffer *buf, +@@ -267,9 +265,6 @@ struct rc_pid_info { + /* Normalization offset. */ + unsigned int norm_offset; + +- /* Fast starst parameter. */ +- unsigned int fast_start; +- + /* Rates information. */ + struct rc_pid_rateinfo *rinfo; -diff -up linux-2.6.25.noarch/net/mac80211/wext.c.orig linux-2.6.25.noarch/net/mac80211/wext.c ---- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-06-13 17:37:05.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-13 17:37:35.000000000 -0400 -@@ -496,7 +496,8 @@ static int ieee80211_ioctl_giwap(struct - sdata = IEEE80211_DEV_TO_SUB_IF(dev); - if (sdata->vif.type == IEEE80211_IF_TYPE_STA || - sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { -- if (sdata->u.sta.state == IEEE80211_ASSOCIATED) { -+ if (sdata->u.sta.state == IEEE80211_ASSOCIATED || -+ sdata->u.sta.state == IEEE80211_IBSS_JOINED) { - ap_addr->sa_family = ARPHRD_ETHER; - memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN); - return 0; -diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c ---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-13 17:37:05.000000000 -0400 -+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-13 17:37:35.000000000 -0400 -@@ -673,7 +673,7 @@ int ieee80211_ht_agg_queue_add(struct ie - #ifdef CONFIG_MAC80211_HT_DEBUG - if (net_ratelimit()) - printk(KERN_DEBUG "allocated aggregation queue" -- " %d tid %d addr %s pool=0x%lX", -+ " %d tid %d addr %s pool=0x%lX\n", - i, tid, print_mac(mac, sta->addr), - q->qdisc_pool[0]); - #endif /* CONFIG_MAC80211_HT_DEBUG */ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 16 Jun 2008 10:19:27 -0000 1.18 +++ sources 18 Jul 2008 14:57:43 -0000 1.19 @@ -1,4 +1,3 @@ -db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -ec4864dc8a70490d883c6dd85e2bc076 patch-2.6.26-rc6.bz2 -6bdd7a956260030aee287b2822fdf6bc patch-2.6.26-rc6-git2.bz2 +5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 +571f35f1e9c7d351c7da2bc39611e6e0 patch-2.6.26-git6.bz2 4aa57328d0802a063fa67dfc063da30e xen-3.2.0.tar.gz Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/upstream,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- upstream 16 Jun 2008 10:19:27 -0000 1.8 +++ upstream 18 Jul 2008 14:57:43 -0000 1.9 @@ -1,4 +1,2 @@ -linux-2.6.25.tar.bz2 -patch-2.6.26-rc6.bz2 -patch-2.6.26-rc6-git2.bz2 - +linux-2.6.26.tar.bz2 +patch-2.6.26-git6.bz2 --- config-sparc DELETED --- --- config-sparc-generic DELETED --- --- config-sparc-smp DELETED --- --- config-sparc64 DELETED --- --- linux-2.6-alsa-kill-annoying-messages.patch DELETED --- --- linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch DELETED --- --- linux-2.6-powerpc-zImage-32MiB.patch DELETED --- --- linux-2.6-ppc-use-libgcc.patch DELETED --- --- linux-2.6-selinux-deffered-context-mapping-no-sleep.patch DELETED --- --- linux-2.6-selinux-deffered-context-mapping.patch DELETED --- --- linux-2.6-selinux-generic-ioctl.patch DELETED --- --- linux-2.6-selinux-get-invalid-xattrs.patch DELETED --- --- linux-2.6-selinux-new-proc-checks.patch DELETED --- --- linux-2.6-silence-x86-decompressor.patch DELETED --- --- linux-2.6-uvcvideo.patch DELETED --- --- linux-2.6-xen-0001-squashfs-Fix-build-without-CONFIG_SMP.patch DELETED --- --- linux-2.6-xen-0002-xen-execshield-Add-xen-specific-load_user_cs_desc.patch DELETED --- --- linux-2.6-xen-0003-xen-execshield-fix-endless-GPF-fault-loop.patch DELETED --- --- linux-2.6-xen-0004-xen-Enable-Xen-console-by-default-in-domU.patch DELETED --- --- linux-2.6-xen-0005-xen-Add-a-vmlinuz-target.patch DELETED --- --- linux-2.6-xen-0006-xen-Add-empty-xenctrl-module.patch DELETED --- --- linux-2.6-xen-0007-xen-Add-proc-xen-capabilities.patch DELETED --- --- linux-2.6-xen-0008-xen-Add-proc-xen-privcmd.patch DELETED --- --- linux-2.6-xen-0009-xen-Add-proc-xen-xenbus.patch DELETED --- --- linux-2.6-xen-0010-xen-Add-Xen-s-sys-hypervisor-interface.patch DELETED --- --- linux-2.6-xen-0011-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch DELETED --- --- linux-2.6-xen-0012-xen-x86_64-Only-define-load_user_cs_desc-on-32-bi.patch DELETED --- --- linux-2.6-xen-0013-xen-expose-set_pte_vaddr-and-make-xen-use-it.patch DELETED --- --- linux-2.6-xen-0014-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch DELETED --- --- linux-2.6-xen-0015-x86_64-Expose-set_pte_vaddr.patch DELETED --- --- linux-2.6-xen-0016-x86_64-Split-set_pte_vaddr.patch DELETED --- --- linux-2.6-xen-0017-x86_64-Add-clear_fixmap.patch DELETED --- --- linux-2.6-xen-0018-xen-x86_64-Make-set_fixmap-a-paravirt-op-on-64-bi.patch DELETED --- --- linux-2.6-xen-0019-xen-x86_64-Hack-to-set-vsyscall-pages-on-user-space.patch DELETED --- --- linux-2.6-xen-0020-Handle-VSYSCALL_FIRST_PAGE-on-xen_set_pte.patch DELETED --- --- linux-2.6-xen-0021-xen-x86_64-Remove-the-640K-1M-hole-and-disable-DMI.patch DELETED --- --- linux-2.6-xen-0022-xen-x86_64-Add-update_va_mapping-64-bit-code.patch DELETED --- --- linux-2.6-xen-0023-x86_64-Add-sync_cmpxchg.patch DELETED --- --- linux-2.6-xen-0024-xen-x86_64-Implement-HYPERVISOR-MULTI-_update_desc.patch DELETED --- --- linux-2.6-xen-0025-xen-x86_64-Add-hacky-64-bit-x86_-read-write-_percpu.patch DELETED --- --- linux-2.6-xen-0026-xen-x86_64-Use-x86_read_percpu-only-to-refer-to-a.patch DELETED --- --- linux-2.6-xen-0027-Add-FIX_PARAVIRT_BOOTAP-to-fixmap_64.h-too.patch DELETED --- --- linux-2.6-xen-0028-Add-gate_offset-and-gate_segment-macros.patch DELETED --- --- linux-2.6-xen-0029-xen_write_idt_entry-and-cvt_gate_to_trap.patch DELETED --- --- linux-2.6-xen-0030-typedefs-for-pte_val-and-friends.patch DELETED --- --- linux-2.6-xen-0031-x86_64-implementation-of-some-page.h-macros.patch DELETED --- --- linux-2.6-xen-0032-Chainsaw-style-ifdefs.patch DELETED --- --- linux-2.6-xen-0033-xen-Make-xen_pte_val-generic.patch DELETED --- --- linux-2.6-xen-0034-More-chainsaw-ifdefs.patch DELETED --- --- linux-2.6-xen-0035-Chainsaw-ifdefs-on-assembly-percpu-handling.patch DELETED --- --- linux-2.6-xen-0036-x86_64-percpu-assembly-macros.patch DELETED --- --- linux-2.6-xen-0037-Some-xen-asm.S-x86_64-code.patch DELETED --- --- linux-2.6-xen-0038-Chainsaw-party-SPLITME.patch DELETED --- --- linux-2.6-xen-0039-xen-asm.S-x86_64-notes.patch DELETED --- --- linux-2.6-xen-0040-xen-x86_64-Make-hypercall-assembly-code-work.patch DELETED --- --- linux-2.6-xen-0041-xen-x86_64-pda-initialization.patch DELETED --- --- linux-2.6-xen-0042-Disable-early_printk-by-default.patch DELETED --- --- linux-2.6-xen-0043-xen-Set-__HYPERVISOR_VIRT_START-for-x86_64.patch DELETED --- --- linux-2.6-xen-0044-Set-__PAGE_OFFSET-as-required-by-Xen.patch DELETED --- --- linux-2.6-xen-0045-DEBUG-Add-xprintk-to-log-directly-via-hypercall-fo.patch DELETED --- --- linux-2.6-xen-0046-DEBUG-Add-xprintk-debugging-printk-prototype-to-hvc.patch DELETED --- --- linux-2.6-xen-0047-Use-__pgd-on-mk_kernel_pgd.patch DELETED --- --- linux-2.6-xen-0048-Include-user-page-tables-on-head_64.S.patch DELETED --- --- linux-2.6-xen-0049-Avoid-using-mk_unsigned_long.patch DELETED --- --- linux-2.6-xen-0050-Lots-of-unrelated-changes.patch DELETED --- --- linux-2.6-xen-0051-Hack-disable-vsmp.patch DELETED --- --- linux-2.6-xen-0052-Export-early_make_page_readonly.patch DELETED --- --- linux-2.6-xen-0053-Disable-multicalls.c-too-verbose-debugging.patch DELETED --- --- linux-2.6-xen-0054-Xen-64-bit-ready-MMU-operations.patch DELETED --- --- linux-2.6-xen-0055-Some-xen-mmu-pv-ops-implemented.patch DELETED --- --- linux-2.6-xen-0056-Trying-to-make-the-pagetable-initialization-code-wor.patch DELETED --- --- linux-2.6-xen-0057-Xen-specific-find_early_table_space-FIXME.patch DELETED --- --- linux-2.6-xen-0058-Xen-call-e820_print_map-when-setting-up-memory.patch DELETED --- --- linux-2.6-xen-0059-Comment-debugging-msgs.patch DELETED --- --- linux-2.6-xen-0060-Try-to-make-pagetables-read-only.patch DELETED --- --- linux-2.6-xen-0061-Debug-dump-pgtables-on-make_page_readonly.patch DELETED --- --- linux-2.6-xen-0062-Disable-apic-at-compile-time-FIXME.patch DELETED --- --- linux-2.6-xen-0063-Parse-early-params-after-init_memory_mapping.patch DELETED --- --- linux-2.6-xen-0064-xen-Move-addr_to_page-to-init.h.patch DELETED --- --- linux-2.6-xen-0065-Make-xen_pxx_val-and-xen_make_pxx-handle-attr-bi.patch DELETED --- --- linux-2.6-xen-0066-Pull-xen_finish_init_mappin-from-XS-upstream.patch DELETED --- --- linux-2.6-xen-0067-Pull-spp_getpage-changes-from-XS-upstream-REVIEWM.patch DELETED --- --- linux-2.6-xen-0068-Pull-xen_extend_init_mapping-from-XS-upstream-FIX.patch DELETED --- --- linux-2.6-xen-0069-New-enum-fixed_addresses-values-REVIEWME.patch DELETED --- --- linux-2.6-xen-0070-Reserve-bootmem-areas-used-by-Xen-FIXME.patch DELETED --- --- linux-2.6-xen-0071-xen_convert_trap_info-use-sizeof-struct-gate_desc.patch DELETED --- --- linux-2.6-xen-0072-Call-paravirt_pagetable_setup_-start-done-REVIEW.patch DELETED --- --- linux-2.6-xen-0073-ifdef-CONFIG_X86_32-on-xen-enlighten.c-REVIEWME.patch DELETED --- --- linux-2.6-xen-0074-Handle-Xen-exception-stack-it-is-different-from-bar.patch DELETED --- --- linux-2.6-xen-0075-Implement-64-bit-version-of-HYPERVISOR_set_callbacks.patch DELETED --- --- linux-2.6-xen-0076-Make-arch_vcpu_info-be-of-the-right-size-on-both-32.patch DELETED --- --- linux-2.6-xen-0077-Implement-asm-xen_iret.patch DELETED --- --- linux-2.6-xen-0078-xen-64-xen_iret-use-iretq-directly-if-returning-t.patch DELETED --- --- linux-2.6-xen-0079-Implement-xen_irqenable_syscall_ret.patch DELETED --- --- linux-2.6-xen-0080-DEBUG-xen_iret-always-return-through-the-hyperviso.patch DELETED --- --- linux-2.6-xen-0081-Implement-some-xen-callbacks-on-xen-entry_64.S.patch DELETED --- --- linux-2.6-xen-0082-Xen-specific-ifdef-hacks-on-kernel-entry_64.S-FIXM.patch DELETED --- --- linux-2.6-xen-0083-Disable-syscall32-code-temporarily-FIXME.patch DELETED --- --- linux-2.6-xen-0084-Use-__KERNEL_DS-as-SS-when-returning-to-a-kernel-thr.patch DELETED --- --- linux-2.6-xen-0085-Use-apic_xen-on-genapic-by-default-FIXME.patch DELETED --- --- linux-2.6-xen-0086-irq-vector-ifdef-chainsaw-FIXME.patch DELETED --- --- linux-2.6-xen-0087-ifdef-chainsaw-on-syscall_init-FIXME.patch DELETED --- --- linux-2.6-xen-0088-Pull-xen-genapic-implementation-from-upstream-Xen.patch DELETED --- --- linux-2.6-xen-0089-Debugging-printk-s.patch DELETED --- --- linux-2.6-xen-0090-Leave-lazy_cpu_mode-on-__switch_to.patch DELETED --- --- linux-2.6-xen-0091-xen-64-Handle-fs-and-gs-on-xen_load_tls-properl.patch DELETED --- --- linux-2.6-xen-0092-Disable-vcpu_info_placement-temporarily-FIXME.patch DELETED --- --- linux-2.6-xen-0093-Fix-typo-on-ifdef-again.patch DELETED --- --- linux-2.6-xen-0094-DEBUG-Don-t-try-to-actually-read-the-page-on-show_.patch DELETED --- --- linux-2.6-xen-0095-Make-load_gs_index-a-paravirt-operation.patch DELETED --- --- linux-2.6-xen-0096-xen-pgd_walk-use-limit-argument-instead-of-FIXADD.patch DELETED --- --- linux-2.6-xen-0097-xen-pgd_walk-Eliminate-BUG_ON-limit-FIXADDR_TOP.patch DELETED --- --- linux-2.6-xen-0098-xen-pgd_walk-accept-start-parameter.patch DELETED --- --- linux-2.6-xen-0099-xen-64-reserve_bootmem-xen_start_info-area.patch DELETED --- --- linux-2.6-xen-0100-pvops-64-call-paravirt_post_allocator_init-on-set.patch DELETED --- --- linux-2.6-xen-0101-use-write_gdt_entry-on-vsyscall_set_cpu-CLEANME.patch DELETED --- --- linux-2.6-xen-0102-xen-64-implement-xen_load_gs_index.patch DELETED --- --- linux-2.6-xen-0103-Make-xen_pgd_unpin-non-static-REVIEWME.patch DELETED --- --- linux-2.6-xen-0104-Xen-64-pgd-allocation-hack-FIXME.patch DELETED --- --- linux-2.6-xen-0105-Set-both-kernel-and-user-PGDs-on-pgd_populate-FI.patch DELETED --- --- linux-2.6-xen-0106-Multi-pagetable-write_cr3-implementation-FIXME.patch DELETED --- --- linux-2.6-xen-0107-Disable-the-weird-count-loop-on-kcons_write_dom0.patch DELETED --- --- linux-2.6-xen-0108-Make-xen_start_info-read-only.patch DELETED --- --- linux-2.6-xen-0109-Hack-to-implement-return-to-userspace-without-SWAPGS.patch DELETED --- --- linux-2.6-xen-0110-Xen-SEGBASE_-defines.patch DELETED --- --- linux-2.6-xen-0111-Xen-HYPERVISOR_set_segment_base-implementation.patch DELETED --- --- linux-2.6-xen-0112-Change-signature-of-paravirt_alloc_-pt-pd-REVIEWME.patch DELETED --- --- linux-2.6-xen-0113-Comment-e820_print_map-call-TEMPORARY.patch DELETED --- --- linux-2.6-xen-0114-Xen-missing-includes.patch DELETED --- --- linux-2.6-xen-0115-asm-x86-pgtable_64.h-include-linux-spinlock.h.patch DELETED --- --- linux-2.6-xen-0116-asm-x86-pgtable.h-include-asm-page.h.patch DELETED --- --- linux-2.6-xen-0117-fix-pxxval_t-usage-on-mm-init_64.c.patch DELETED --- --- linux-2.6-xen-0118-Missing-Xen-include.patch DELETED --- --- linux-2.6-xen-0119-un-static-ipi_to_irq.patch DELETED --- --- linux-2.6-xen-0120-Don-t-use-_PAGE_GLOBAL-bit-under-Xen-FIXME.patch DELETED --- --- linux-2.6-xen-0121-Trying-to-organize-the-xen-bootmem-allocation-mess.patch DELETED --- --- linux-2.6-xen-0122-Xen-reserve_bootmem-xenstore-and-console-interfac.patch DELETED --- --- linux-2.6-xen-0123-pvops-64-call-paravirt_activate_mm-on-activate_mm.patch DELETED --- --- linux-2.6-xen-0124-Xen-64-bit-support-on-xen_pgd_pin.patch DELETED --- --- linux-2.6-xen-0125-Xen-64-pin-user-PGD-on-activate_mm-and-dup_mmap.patch DELETED --- --- linux-2.6-xen-0126-Hack-pgd_walk-to-walk-to-TASK_SIZE-PAGE_SIZE-on-x8.patch DELETED --- --- linux-2.6-xen-0127-Xen-64-Unpin-user-pagetable-on-xen_pgd_unpin.patch DELETED --- --- linux-2.6-xen-0128-Use-un-pin_page-when-un-pinning-pgd.patch DELETED --- --- linux-2.6-xen-0129-Allow-enabling-Xen-on-x86_64.patch DELETED --- --- linux-2.6-xen-0130-Add-include-linux-spinlock_types.h-to-asm-x86-pgt.patch DELETED --- --- linux-2.6-xen-0131-Restore-some-sanity-on-the-initial-pagetable-bootmem.patch DELETED --- --- linux-2.6-xen-0132-Xen-Use-system_call_after_swapgs-as-the-syscall-c.patch DELETED --- --- linux-2.6-xen-0133-Add-a-system_call_after_saveargs-label-to-entry_64.S.patch DELETED --- --- linux-2.6-xen-0134-Create-xen-specific-syscall-entry.patch DELETED --- --- linux-2.6-xen-0135-syscall-related-Xen-ifdefs-FIXME.patch DELETED --- --- linux-2.6-xen-0136-Point-set_pte-to-xen_set_pte-since-the-beginning.patch DELETED --- --- linux-2.6-xen-0137-DEBUG-slab-debugging.patch DELETED --- --- linux-2.6-xen-0138-pvops-64-Include-rsi-on-the-register-clobber-list.patch DELETED --- --- linux-2.6-xen-0139-Xen-64-quick-ugly-hack-to-fix-pgd_clear-pagetabl.patch DELETED --- --- linux-2.6-xen-0140-Add-missing-acpi-include-to-xen-setup.c.patch DELETED --- --- linux-2.6-xen-0141-Don-t-use-FIX_VDSO-on-64-bit.patch DELETED --- --- linux-2.6-xen-0142-Mark-init-pages-read-write-again-on-free_init_pages.patch DELETED --- --- linux-2.6-xen-0143-reserve_early-kernel-text-and-data-segments.patch DELETED --- --- linux-2.6-xen-0144-Xen-Clear-__START_KERNEL_map-PTEs-on-free_init_page.patch DELETED --- --- linux-2.6-xen-0145-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch DELETED --- --- linux-2.6-xen-0146-Pull-xen_failsafe_callback-implementation-from-XenSo.patch DELETED --- --- linux-2.6-xen-0147-Save-fs-and-gs-before-load_TLS-and-arch_leave_la.patch DELETED --- --- linux-2.6-xen-0148-xen-64-Clear-fs-on-xen_load_tls.patch DELETED --- --- linux-2.6-xen-0149-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch DELETED --- --- linux-2.6-xen-0150-Introduce-xen_ia32_syscall.patch DELETED --- --- linux-2.6-xen-0151-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch DELETED --- --- linux-2.6-xen-0152-Make-the-int80-and-syscall-vdso32-implementations-se.patch DELETED --- --- linux-2.6-xen-0153-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch DELETED --- --- linux-2.6-xen-0154-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch DELETED --- --- linux-2.6-xen-0155-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch DELETED --- --- linux-2.6-xen-0156-X86_VSMP-make-not-depend-on-XEN-REVIEWME.patch DELETED --- --- linux-2.6-xen-0157-Add-do_IRQ-prototype-to-asm-x86-irq_64.h.patch DELETED --- --- linux-2.6-xen-0158-Disable-sysenter-on-x86_64-temporarily-REVIEWME.patch DELETED --- --- linux-2.6-xen-0159-Add-xen_-alloc-release-_pud-functions-for-x86_64-x.patch DELETED --- --- linux-2.6-xen-0160-Extract-reserve_initrd-from-x86_64_start_kernel.patch DELETED --- --- linux-2.6-xen-0161-Make-reserve_initrd-non-static.patch DELETED --- --- linux-2.6-xen-0162-xen-64-Reserve-initrd-on-xen_start_kernel-also.patch DELETED --- --- linux-2.6.25.tar.bz2.sign DELETED --- --- patch-2.6.26-rc6-git2.bz2.sign DELETED --- --- patch-2.6.26-rc6.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 14:58:42 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Fri, 18 Jul 2008 14:58:42 GMT Subject: rpms/kernel-xen-2.6/devel/scripts get-snapshot.sh, NONE, 1.1 rebase.sh, 1.4, 1.5 Message-ID: <200807181458.m6IEwgVP010582@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9922/scripts Modified Files: rebase.sh Added Files: get-snapshot.sh Log Message: * Fri Jun 18 2008 Mark McLoughlin - Rebase to kernel-2_6_27-0_159_rc0_git6_fc10 - Drop Eduardo's 64bit tree and switch to Jeremy's x86.git tree - Re-enable SMP etc. --- NEW FILE get-snapshot.sh --- #!/bin/bash VER=$(tail -n1 upstream | sed s/bz2/id/) rm -f $VER wget -c http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/$VER SHA1=$(cat $VER) rm -f patch-2.6.*-git*.id cd ~/src/git-trees/kernel/linux-2.6 git pull DIF=$(git diff $SHA1.. | wc -l) if [ "$DIF" = "0" ]; then echo Nothing changed. exit fi git diff $SHA1.. > ~/src/fedora/kernel/devel/git-linus-new.diff cd ~/src/fedora/kernel/devel/ DIF=$(cmp git-linus.diff git-linus-new.diff) if [ "$?" = "0" ]; then echo Nothing new in git rm -f git-linus-new.diff exit fi mv git-linus-new.diff git-linus.diff perl -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec echo "- Merge Linux-2.6 up to" $(git log | head -n1) > ~/src/fedora/kernel/devel/clog.tmp cd ~/src/fedora/kernel/devel/ bumpspecfile.py kernel.spec "$(cat clog.tmp)" rm -f clog.tmp make clog Index: rebase.sh =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/scripts/rebase.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rebase.sh 16 Jun 2008 10:19:46 -0000 1.4 +++ rebase.sh 18 Jul 2008 14:57:59 -0000 1.5 @@ -126,6 +126,7 @@ perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .cvsignore perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' upstream grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 sources > .sources.tmp; mv .sources.tmp sources + grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 upstream` -eq 0 ]; then echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .cvsignore echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> upstream From fedora-extras-commits at redhat.com Fri Jul 18 15:02:02 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Fri, 18 Jul 2008 15:02:02 GMT Subject: rpms/libvirt-java/F-9 libvirt-java.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807181502.m6IF22uK017715@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt-java/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10972 Modified Files: sources Added Files: libvirt-java.spec Log Message: first verion: 0.2.0, Daniel --- NEW FILE libvirt-java.spec --- Summary: Java bindings for the libvirt virtualization API Name: libvirt-java Version: 0.2.0 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/java/libvirt-java-%{version}.tar.gz URL: http://libvirt.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: libvirt >= 0.4.0 Requires: java >= 1.5.0 Requires: jpackage-utils BuildRequires: libvirt-devel >= 0.4.0 BuildRequires: java-devel >= 1.5.0 BuildRequires: pkgconfig BuildRequires: jpackage-utils # # the jpackage-utils should provide a %{java_home} macro # to select a different Java JVM from the default one use the following # rpmbuild --define 'java_home /usr/lib/jvm/your_jvm_of_choice' # %description Libvirt-java is a base framework allowing to use libvirt, the virtualization API though the Java programming language. It requires libvirt >= 0.4.0 %package devel Summary: Compressed Java source files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libvirt-devel >= 0.4.0 Requires: pkgconfig %description devel Libvirt-java is a base framework allowing to use libvirt, the virtualization API though the Java programming language. This is the development part needed to build applications with Libvirt-java. %package javadoc Summary: Java documentation for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc API documentation for %{name}. %prep %setup -q %build %configure --with-java-home=%{java_home} # javac call is not parallelizable, as a result the same command is # run N times in parallel if %{?_smp_mflags} is set up make # fix up the modification date of generated documentation find doc -type f -newer ChangeLog | xargs touch -r ChangeLog %install rm -fr %{buildroot} make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README INSTALL %{_libdir}/libvirt_jni*.so.* %{_datadir}/java/*.jar %files devel %defattr(-,root,root) %doc src/*.java %{_libdir}/libvirt_jni*.so %{_libdir}/pkgconfig/*.pc %files javadoc %defattr(-,root,root) /usr/share/javadoc/%{name}-%{version} %changelog * Fri Jul 18 2008 Daniel Veillard - 0.2.0-1.fc9 - new release 0.2.0 - finished cleanup of APIs * Thu Jul 3 2008 Daniel Veillard - 0.1.2-1 - new release 0.1.2 * Tue Jul 1 2008 Daniel Veillard - 0.1.1-1 - new release 0.1.1 * Tue Jun 24 2008 Daniel Veillard - 0.1.0-1 - created Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-java/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2008 19:01:21 -0000 1.1 +++ sources 18 Jul 2008 15:01:15 -0000 1.2 @@ -0,0 +1 @@ +8d3fe9bd9571fb0735db188f41fb278d libvirt-java-0.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 15:03:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:03:49 GMT Subject: rpms/cacti/devel cacti.spec,1.22,1.23 Message-ID: <200807181503.m6IF3nZ4018176@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17984 Modified Files: cacti.spec Log Message: fix my license tag mistake Index: cacti.spec =================================================================== RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- cacti.spec 15 Jul 2008 14:16:16 -0000 1.22 +++ cacti.spec 18 Jul 2008 15:02:56 -0000 1.23 @@ -1,11 +1,11 @@ Name: cacti Version: 0.8.7b -Release: 2%{?dist} +Release: 3%{?dist} Summary: An rrd based graphing tool Group: Applications/System # There's a lot of stuff in there. It's all compatible. -License: GPLv2+ and LGPLv2 and (MPL 1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD) +License: GPLv2+ and LGPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD) URL: http://www.cacti.net/ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz Source1: cacti-httpd.conf @@ -101,6 +101,9 @@ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.8.7b-3 +- fix my own mistake in the license tag + * Tue Jul 15 2008 Tom "spot" Callaway - 0.8.7b-2 - fix license tag From fedora-extras-commits at redhat.com Fri Jul 18 15:14:21 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:14:21 GMT Subject: rpms/kdelibs/devel .cvsignore, 1.55, 1.56 kdelibs.spec, 1.347, 1.348 sources, 1.66, 1.67 Message-ID: <200807181514.m6IFELmQ020140@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19988 Modified Files: .cvsignore kdelibs.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 11 Jul 2008 03:57:48 -0000 1.55 +++ .cvsignore 18 Jul 2008 15:13:36 -0000 1.56 @@ -1 +1 @@ -kdelibs-4.0.98.tar.bz2 +kdelibs-4.0.99.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- kdelibs.spec 14 Jul 2008 21:01:57 -0000 1.347 +++ kdelibs.spec 18 Jul 2008 15:13:36 -0000 1.348 @@ -1,8 +1,8 @@ %define _default_patch_fuzz 2 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.98 -Release: 4%{?dist} +Version: 4.0.99 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -359,6 +359,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Mon Jul 14 2008 Rex Dieter 4.0.98-4 - respun tarball Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sources 14 Jul 2008 16:10:07 -0000 1.66 +++ sources 18 Jul 2008 15:13:36 -0000 1.67 @@ -1 +1 @@ -983c49b3e16add5809b39427f2c4ee4e kdelibs-4.0.98.tar.bz2 +92e6d8d1bc0dccd8f5c204039c2aa00d kdelibs-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 15:14:44 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:14:44 GMT Subject: rpms/kdepimlibs/devel .cvsignore, 1.23, 1.24 kdepimlibs.spec, 1.41, 1.42 sources, 1.23, 1.24 Message-ID: <200807181514.m6IFEiHQ020247@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20060 Modified Files: .cvsignore kdepimlibs.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 11 Jul 2008 03:58:07 -0000 1.23 +++ .cvsignore 18 Jul 2008 15:13:56 -0000 1.24 @@ -1 +1 @@ -kdepimlibs-4.0.98.tar.bz2 +kdepimlibs-4.0.99.tar.bz2 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- kdepimlibs.spec 11 Jul 2008 03:58:07 -0000 1.41 +++ kdepimlibs.spec 18 Jul 2008 15:13:56 -0000 1.42 @@ -14,7 +14,7 @@ Name: kdepimlibs -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries @@ -163,6 +163,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 11 Jul 2008 03:58:07 -0000 1.23 +++ sources 18 Jul 2008 15:13:56 -0000 1.24 @@ -1 +1 @@ -acebf9f4f9883d8a1251f6a588304009 kdepimlibs-4.0.98.tar.bz2 +5fb63a94b4b07e906cb3c19483b99fdd kdepimlibs-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 15:15:18 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 18 Jul 2008 15:15:18 GMT Subject: rpms/eclipse/devel eclipse-mv-Platform.sh, NONE, 1.1 eclipse-compilelibs.patch, 1.1, 1.2 eclipse.spec, 1.537, 1.538 eclipse-copy-JDT.sh, 1.1, NONE eclipse-copy-Platform.sh, 1.1, NONE eclipse-updateSymlinks.sh, 1.1, NONE Message-ID: <200807181515.m6IFFI1d020416@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20207 Modified Files: eclipse-compilelibs.patch eclipse.spec Added Files: eclipse-mv-Platform.sh Removed Files: eclipse-copy-JDT.sh eclipse-copy-Platform.sh eclipse-updateSymlinks.sh Log Message: * Fri Jul 18 2008 Andrew Overholt 3.4.0-4 - Un-do crazy config.ini, bundles.info, etc. shuffling - Update patch for building native libraries --- NEW FILE eclipse-mv-Platform.sh --- #!/bin/sh baseDir=$1 mkdir -p features plugins mv $baseDir/about* . mv $baseDir/configuration/ . mv $baseDir/eclipse{,.ini} . mv $baseDir/.eclipseproduct . mv $baseDir/epl-v10.html . mv $baseDir/notice.html . mv $baseDir/readme/ . mv $baseDir/features/org.eclipse.platform_* features mv $baseDir/features/org.eclipse.help_* features mv $baseDir/features/org.eclipse.equinox.p2.user.ui_* features mv $baseDir/features/org.fedoraproject* features mv $baseDir/plugins/org.fedoraproject* plugins mv $baseDir/plugins/*linux* plugins mv $baseDir/plugins/com.jcraft.jsch_* plugins mv $baseDir/plugins/org.eclipse.compare_* plugins mv $baseDir/plugins/org.eclipse.core.boot_* plugins mv $baseDir/plugins/org.eclipse.core.filebuffers_* plugins mv $baseDir/plugins/org.eclipse.core.filesystem_* plugins mv $baseDir/plugins/org.eclipse.core.net_* plugins mv $baseDir/plugins/org.eclipse.core.resources_* plugins mv $baseDir/plugins/org.eclipse.core.resources.compatibility_* plugins mv $baseDir/plugins/org.eclipse.osgi.util_* plugins mv $baseDir/plugins/org.eclipse.debug.core_* plugins mv $baseDir/plugins/org.eclipse.debug.ui_* plugins mv $baseDir/plugins/org.eclipse.help.appserver_* plugins mv $baseDir/plugins/org.eclipse.ltk.core.refactoring_* plugins mv $baseDir/plugins/org.eclipse.ltk.ui.refactoring_* plugins mv $baseDir/plugins/org.eclipse.platform_* plugins mv $baseDir/plugins/org.eclipse.platform.doc.user_* plugins mv $baseDir/plugins/org.eclipse.search_* plugins mv $baseDir/plugins/org.eclipse.team.core_* plugins mv $baseDir/plugins/org.eclipse.team.ui_* plugins mv $baseDir/plugins/org.eclipse.text_* plugins mv $baseDir/plugins/org.eclipse.jface.text_* plugins mv $baseDir/plugins/org.eclipse.jsch.core_* plugins mv $baseDir/plugins/org.eclipse.jsch.ui_* plugins mv $baseDir/plugins/org.eclipse.ui.console_* plugins mv $baseDir/plugins/org.eclipse.ui.presentations.r21_* plugins mv $baseDir/plugins/org.eclipse.ui.intro_* plugins mv $baseDir/plugins/org.eclipse.ui.intro.universal_* plugins mv $baseDir/plugins/org.eclipse.ui.cheatsheets_* plugins mv $baseDir/plugins/org.eclipse.ui.browser_* plugins mv $baseDir/plugins/org.eclipse.ui.navigator_* plugins mv $baseDir/plugins/org.eclipse.ui.navigator.resources_* plugins mv $baseDir/plugins/org.eclipse.ui.net_* plugins mv $baseDir/plugins/org.eclipse.ui.workbench.texteditor_* plugins mv $baseDir/plugins/org.eclipse.ui.views_* plugins mv $baseDir/plugins/org.eclipse.ui.editors_* plugins mv $baseDir/plugins/org.eclipse.ui.externaltools_* plugins mv $baseDir/plugins/org.eclipse.ui.ide_* plugins mv $baseDir/plugins/org.eclipse.ui.ide.application_* plugins mv $baseDir/plugins/org.eclipse.update.core_* plugins mv $baseDir/plugins/org.eclipse.update.scheduler_* plugins mv $baseDir/plugins/org.eclipse.update.ui_* plugins mv $baseDir/plugins/org.eclipse.ui.workbench.compatibility_* plugins mv $baseDir/plugins/org.eclipse.ui.views.properties.tabbed_* plugins mv $baseDir/plugins/org.eclipse.equinox.security_* plugins mv $baseDir/plugins/org.eclipse.equinox.security.ui_* plugins mv $baseDir/features/org.eclipse.rcp_* features mv $baseDir/plugins/com.ibm.icu_* plugins mv $baseDir/plugins/org.eclipse.core.commands_* plugins mv $baseDir/plugins/org.eclipse.core.databinding_* plugins mv $baseDir/plugins/org.eclipse.core.databinding.beans_* plugins mv $baseDir/plugins/org.eclipse.core.jobs_* plugins mv $baseDir/plugins/org.eclipse.core.expressions_* plugins mv $baseDir/plugins/org.eclipse.core.runtime_* plugins mv $baseDir/plugins/org.eclipse.core.runtime.compatibility.auth_* plugins mv $baseDir/plugins/org.eclipse.osgi_* plugins mv $baseDir/plugins/org.eclipse.help_* plugins mv $baseDir/plugins/org.eclipse.swt_* plugins mv $baseDir/plugins/org.eclipse.jface_* plugins mv $baseDir/plugins/org.eclipse.jface.databinding_* plugins mv $baseDir/plugins/org.eclipse.ui_* plugins mv $baseDir/plugins/org.eclipse.ui.workbench_* plugins mv $baseDir/plugins/org.eclipse.update.configurator_* plugins mv $baseDir/plugins/org.eclipse.equinox.simpleconfigurator_* plugins mv $baseDir/plugins/org.eclipse.rcp_* plugins mv $baseDir/plugins/org.eclipse.core.contenttype_* plugins mv $baseDir/plugins/org.eclipse.equinox.app_* plugins mv $baseDir/plugins/org.eclipse.equinox.common_* plugins mv $baseDir/plugins/org.eclipse.equinox.preferences_* plugins mv $baseDir/plugins/org.eclipse.equinox.registry_* plugins mv $baseDir/plugins/org.eclipse.equinox.launcher_* plugins mv $baseDir/plugins/org.eclipse.core.runtime.compatibility.registry_* plugins mv $baseDir/plugins/org.eclipse.core.variables_* plugins mv $baseDir/plugins/javax.servlet_* plugins mv $baseDir/plugins/javax.servlet.jsp_* plugins mv $baseDir/plugins/org.apache.ant_* plugins mv $baseDir/plugins/org.apache.commons.el_* plugins mv $baseDir/plugins/org.apache.commons.logging_* plugins mv $baseDir/plugins/org.apache.jasper_* plugins mv $baseDir/plugins/org.apache.lucene_* plugins mv $baseDir/plugins/org.apache.lucene.analysis_* plugins mv $baseDir/plugins/org.eclipse.ant.core_* plugins mv $baseDir/plugins/org.eclipse.core.runtime.compatibility_* plugins mv $baseDir/plugins/org.eclipse.ecf_* plugins mv $baseDir/plugins/org.eclipse.ecf.filetransfer_* plugins mv $baseDir/plugins/org.eclipse.ecf.identity_* plugins mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer_* plugins mv $baseDir/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* plugins mv $baseDir/plugins/org.eclipse.ecf.ssl_* plugins mv $baseDir/plugins/org.eclipse.equinox.frameworkadmin_* plugins mv $baseDir/plugins/org.eclipse.equinox.frameworkadmin.equinox_* plugins mv $baseDir/plugins/org.eclipse.equinox.http.jetty_* plugins mv $baseDir/plugins/org.eclipse.equinox.http.registry_* plugins mv $baseDir/plugins/org.eclipse.equinox.http.servlet_* plugins mv $baseDir/plugins/org.eclipse.equinox.jsp.jasper_* plugins mv $baseDir/plugins/org.eclipse.equinox.jsp.jasper.registry_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.artifact.repository_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.console_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.core_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.director_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.director.app_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.directorywatcher_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.engine_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.exemplarysetup_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.extensionlocation_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.garbagecollector_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.jarprocessor_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.reconciler.dropins_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins mv $baseDir/plugins/org.eclipse.equinox.p2.updatesite_* plugins mv $baseDir/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* plugins mv $baseDir/plugins/org.eclipse.help.base_* plugins mv $baseDir/plugins/org.eclipse.help.ui_* plugins mv $baseDir/plugins/org.eclipse.help.webapp_* plugins mv $baseDir/plugins/org.eclipse.osgi.services_* plugins mv $baseDir/plugins/org.eclipse.ui.forms_* plugins mv $baseDir/plugins/org.mortbay.jetty_* plugins mv $baseDir/plugins/org.sat4j.core_* plugins mv $baseDir/plugins/org.sat4j.pb_* plugins sed -i 's/org.eclipse.sdk.ide/org.eclipse.platform.ide/' configuration/config.ini eclipse-compilelibs.patch: Index: eclipse-compilelibs.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-compilelibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-compilelibs.patch 14 Jul 2008 21:40:30 -0000 1.1 +++ eclipse-compilelibs.patch 18 Jul 2008 15:14:32 -0000 1.2 @@ -1,65 +1,81 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.releng.eclipsebuilder -Index: eclipse/buildConfigs/sdk/srcBuild/build.xml -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v -retrieving revision 1.21 -diff -u -r1.21 build.xml ---- eclipse/buildConfigs/sdk/srcBuild/build.xml 27 May 2008 19:41:03 -0000 1.21 -+++ eclipse/buildConfigs/sdk/srcBuild/build.xml 26 Jun 2008 17:58:02 -0000 -@@ -1,7 +1,7 @@ - - - -- -+ - - - -@@ -71,6 +71,37 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -174,7 +205,7 @@ - - - -- -+ - - - +### Eclipse Workspace Patch 1.0 +#P org.eclipse.releng.eclipsebuilder +Index: eclipse/buildConfigs/sdk/srcBuild/build.xml +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v +retrieving revision 1.21 +diff -u -r1.21 build.xml +--- eclipse/buildConfigs/sdk/srcBuild/build.xml 27 May 2008 19:41:03 -0000 1.21 ++++ eclipse/buildConfigs/sdk/srcBuild/build.xml 21 Jun 2008 23:43:37 -0000 +@@ -1,7 +1,7 @@ + + + +- ++ + + + +@@ -71,6 +71,53 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -174,7 +221,7 @@ + + + +- ++ + + + Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.537 retrieving revision 1.538 diff -u -r1.537 -r1.538 --- eclipse.spec 17 Jul 2008 22:12:37 -0000 1.537 +++ eclipse.spec 18 Jul 2008 15:14:32 -0000 1.538 @@ -4,9 +4,11 @@ # - update stuff for building on secondary arches # - get Ganymede update site pre-configured # - investigate bi-arch requirements -# - sub-packages ... do we need config.ini for -rcp? Epoch: 1 +# Prevent brp-java-repack-jars from being run. +%define __jar_repack 0 + %define eclipse_major 3 %define eclipse_minor 4 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} @@ -23,7 +25,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 3%{?dist} +Release: 4%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -66,10 +68,8 @@ # Create a simple feature for building ECF's filetransfer plugins Source26: ecf-filetransfer-feature.xml Source27: ecf-filetransfer-build.properties -# These scripts copy sub-sets of the SDK for generating metadata -Source28: %{name}-copy-Platform.sh -Source29: %{name}-copy-JDT.sh -Source30: %{name}-updateSymlinks.sh +# This script copies the platform sub-set of the SDK for generating metadata +Source28: %{name}-mv-Platform.sh # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 @@ -671,59 +671,46 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER # Some directories we need -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/features +sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name} +install -d -m 755 $sdkDir +install -d -m 755 $sdkDir/plugins +install -d -m 755 $sdkDir/features install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java # Explode the resulting SDK tarball tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz # ECF filetransfer plugins we built -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.ecf*.jar +rm $sdkDir/plugins/org.eclipse.ecf*.jar unzip -d $RPM_BUILD_ROOT%{_libdir} \ org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip # Remove the feature we used for building rm -rf \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.ecf.filetransfer_feature_* + $sdkDir/features/org.eclipse.ecf.filetransfer_feature_* -LAUNCHERVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') +LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') # Install the file initializer app cp -p equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins + $sdkDir/plugins # Install the Fedora Eclipse product plugin -unzip -qq -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins %{SOURCE4} +unzip -qq -d $sdkDir/plugins %{SOURCE4} # Install the Fedora Eclipse product feature -unzip -qq -d $RPM_BUILD_ROOT%{_libdir}/%{name}/features %{SOURCE5} - -scriptDir=`pwd` -cp %{SOURCE28} . -cp %{SOURCE29} . - -for subPkg in Platform JDT; do -mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}-$subPkg -pushd $RPM_BUILD_ROOT%{_libdir}/%{name}-$subPkg - sh $scriptDir/%{name}-copy-$subPkg.sh $RPM_BUILD_ROOT%{_libdir}/%{name} -popd -done - -ln -s $RPM_BUILD_ROOT%{_libdir}/%{name}{,-SDK} - -bundlesInfoDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-bundleInfos -profilesDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-profiles -configIniDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-configInis -mkdir -p $bundlesInfoDir $profilesDir $configIniDir +unzip -qq -d $sdkDir/features %{SOURCE5} -for subPkg in Platform JDT SDK; do +installDir=$sdkDir-Platform +metadataDir=$installDir/metadata-Platform +provisionDir=$installDir-provisioned +profileId=PlatformProfile -installDir=$RPM_BUILD_ROOT%{_libdir}/%{name}-$subPkg -metadataDir=$installDir/metadata-$subPkg -installFolder=$RPM_BUILD_ROOT%{_libdir}/%{name}-tmp-$subPkg -SDKinstallFolder=$RPM_BUILD_ROOT%{_libdir}/%{name}-tmp +# Copy just the platform +mkdir $installDir +pushd $installDir +sh %{SOURCE28} $sdkDir +popd -# Generate metadata +# Generate metadata for the platform java \ -cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ org.eclipse.core.launcher.Main \ @@ -732,7 +719,7 @@ -metadataRepository file:$metadataDir \ -artifactRepository file:$metadataDir \ -source $installDir \ --root "Fedora Eclipse $subPkg" \ +-root "Fedora Eclipse Platform" \ -rootVersion %{version} \ -flavor tooling \ -publishArtifacts \ @@ -746,8 +733,6 @@ chmod u+x $installDir/eclipse -profileId=${subPkg}Profile - # Debugging? Add -debug and -consolelog # Provision with director $installDir/eclipse \ @@ -755,7 +740,7 @@ org.eclipse.equinox.p2.director.app.application \ -nosplash \ -flavor tooling \ --installIU "Fedora Eclipse $subPkg" \ +-installIU "Fedora Eclipse Platform" \ -version %{version} \ -p2.os linux \ -p2.ws gtk \ @@ -765,100 +750,41 @@ -profileProperties org.eclipse.update.install.features=true \ -metadataRepository file:$metadataDir \ -artifactRepository file:$metadataDir \ --destination $installFolder \ --bundlepool $installFolder \ +-destination $provisionDir \ +-bundlepool $provisionDir \ -vmargs \ --Declipse.p2.data.area=$installFolder/p2 - -# Copy the sub-bundles.info file -mv $installFolder/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info \ - $bundlesInfoDir/${subPkg}-bundles.info - -# Copy the sub-profile -profileDir=$installFolder/p2/org.eclipse.equinox.p2.engine/profileRegistry -mv $profileDir/* $profilesDir - -# Copy the sub-config.ini (for profile= line) -mv $installFolder/configuration/config.ini \ - $configIniDir/${subPkg}-config.ini - -# Reset config.ini -mv $installDir/configuration/config.ini{.bak,} -done +-Declipse.p2.data.area=$provisionDir/p2 -# Some extra stuff. installFolder will still be -SDK here -for f in about_files {about,epl-v10,notice}.html readme; do - mv $RPM_BUILD_ROOT%{_libdir}/%{name}/$f $installFolder +# Stuff in JDT, PDE, SDK +for f in about* \.eclipseproduct epl-v10.html notice.html readme; do + mv $installDir/$f $provisionDir done -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/metadata-SDK +mv $sdkDir/features/* $provisionDir/features +mv $sdkDir/plugins/* $provisionDir/plugins +rm -rf $metadataDir $sdkDir $installDir +mv $provisionDir $sdkDir -# Ship the provisioned SDK -installDir=$RPM_BUILD_ROOT%{_libdir}/%{name} -rm -rf $installDir -mv $installFolder $installDir -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}*tmp* -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-{Platform,JDT} -rm $RPM_BUILD_ROOT%{_libdir}/%{name}-SDK - -mv $configIniDir $installDir/configuration/configInis -configIniDir=$installDir/configuration/configInis -mv $bundlesInfoDir $installDir/configuration/bundleInfos -bundlesInfoDir=$installDir/configuration/bundleInfos -mv $profilesDir $installDir/profilesDir -profilesDir=$installDir/profilesDir - -pushd $configIniDir - mv Platform-config.ini 0-Platform-config.ini - mv JDT-config.ini 1-JDT-config.ini - mv SDK-config.ini 2-SDK-config.ini - for f in `ls *.ini`; do - sed --in-place "s/plugins\/org.eclipse.platform/plugins\/org.fedoraproject.ide.platform/" $f - sed --in-place "s/eclipse.product=.*/eclipse.product=org.fedoraproject.ide.platform.product/" $f - done -popd -pushd $installDir/configuration - ln -s configInis/2-SDK-config.ini config.ini -popd -pushd $bundlesInfoDir - mv Platform-bundles.info 0-Platform-bundles.info - mv JDT-bundles.info 1-JDT-bundles.info - mv SDK-bundles.info 2-SDK-bundles.info -popd -pushd $installDir/configuration/org.eclipse.equinox.simpleconfigurator - ln -s ../bundleInfos/2-SDK-bundles.info bundles.info -popd -pushd $profilesDir - for f in Platform JDT SDK; do - profileFiles=${f}Profile.profile/* - for g in Platform JDT SDK; do - installFolder=$RPM_BUILD_ROOT%{_libdir}/%{name}-tmp-$g - sed -i "s|$installFolder|%{_libdir}/%{name}|g" $profileFiles - done - done - mv PlatformProfile.profile 0-PlatformProfile.profile - mv JDTProfile.profile 1-JDTProfile.profile - mv SDKProfile.profile 2-SDKProfile.profile - # This is a weird one - extension location? - sed -i "s|$RPM_BUILD_ROOT||g" 2-SDKProfile.profile/* -popd -pushd $installDir/p2/org.eclipse.equinox.p2.engine/profileRegistry - ln -s ../../../profilesDir/2-SDKProfile.profile SDKProfile.profile +# Fix paths in p2 data +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml +sed -i "s|file\:$provisionDir/\ -\ bundle\ pool|Fedora Eclipse|g" \ + $sdkDir/artifacts.xml +profileDir=$sdkDir/p2/org.eclipse.equinox.p2.engine/profileRegistry +pushd $profileDir + sed -i "s|$provisionDir|%{_libdir}/%{name}|g" \ + PlatformProfile.profile/* + sed -i "s|$RPM_BUILD_ROOT||g" PlatformProfile.profile/* popd -# Fix paths in p2 data -rm -rf $installDir/p2/org.eclipse.equinox.p2.core/cache -rm -rf $installDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml -sed -i "s|file\:$installFolder/\ -\ bundle\ pool|Fedora Eclipse|g" \ - $installDir/artifacts.xml %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 -cp -p features/org.eclipse.platform/gtk/eclipse.ini $installDir +cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir %endif cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \ - $installDir/eclipse.ini + $sdkDir/eclipse.ini # Add a compatibility symlink to startup.jar -pushd $installDir +pushd $sdkDir LAUNCHERNAME=$(ls plugins | grep equinox.launcher_) ln -s plugins/$LAUNCHERNAME startup.jar popd @@ -882,20 +808,20 @@ popd # Remove the unnecessary configuration data -rm -r $installDir/configuration/org.eclipse.update -rm -r $installDir/configuration/org.eclipse.core.runtime -rm -r $installDir/configuration/org.eclipse.equinox.app -rm -r $installDir/configuration/.settings -dataDirs=$(find $installDir/configuration \ +rm -r $sdkDir/configuration/org.eclipse.update +rm -r $sdkDir/configuration/org.eclipse.core.runtime +rm -r $sdkDir/configuration/org.eclipse.equinox.app +rm -r $sdkDir/configuration/.settings +dataDirs=$(find $sdkDir/configuration \ -type d -name data) for dataDir in $dataDirs; do rm -rf `dirname $dataDir` done # Do this again after we've run the file initializer -rm -rf $installDir/p2/org.eclipse.equinox.p2.core/cache -rm -rf $installDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml -pushd $installDir/p2/org.eclipse.equinox.p2.engine/profileRegistry +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache +rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml +pushd $profileDir sed -i "s|$RPM_BUILD_ROOT||g" *.profile/* popd @@ -1012,12 +938,6 @@ install -p -D -m0755 %{SOURCE21} \ $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild -# Script to update config.ini, bundles.info, and *.profile -install -p -D -m0755 %{SOURCE30} \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/.updateSymlinks -sed --in-place "s|@INSTALLDIR@|%{_libdir}/eclipse|g" \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/.updateSymlinks - pushd $RPM_BUILD_ROOT%{_libdir}/%{name} rm plugins/org.sat4j* ln -s %{_javadir}/org.sat4j.core_* plugins/ @@ -1129,24 +1049,17 @@ %clean rm -rf $RPM_BUILD_ROOT -%post jdt -p %{_libdir}/%{name}/.updateForSubPackages -%postun jdt -p %{_libdir}/%{name}/.updateForSubPackages -%post pde -p %{_libdir}/%{name}/.updateForSubPackages -%postun pde -p %{_libdir}/%{name}/.updateForSubPackages - %post platform touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%{_libdir}/%{name}/.updateForSubPackages %postun platform touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%{_libdir}/%{name}/.updateForSubPackages %files ecj %defattr(-,root,root) @@ -1181,7 +1094,6 @@ %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state* %config %{_libdir}/%{name}/configuration/config.ini %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info -%dir %{_libdir}/%{name}/configuration/configInis %dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/notice.html @@ -1220,15 +1132,12 @@ %defattr(-,root,root) %attr(0755,root,root) %{_bindir}/%{name} %config %{_libdir}/%{name}/eclipse.ini -%{_libdir}/%{name}/configuration/configInis/0-Platform-config.ini -%dir %{_libdir}/%{name}/configuration/bundleInfos -%{_libdir}/%{name}/configuration/bundleInfos/0-Platform-bundles.info +%{_libdir}/%{name}/.eclipseproduct +%{_libdir}/%{name}/configuration/config.ini %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/icons/*/*/apps/* %{_libdir}/%{name}/eclipse -%dir %{_libdir}/%{name}/profilesDir -%{_libdir}/%{name}/profilesDir/0-PlatformProfile.profile %{_libdir}/%{name}/features/org.eclipse.platform_* %{_libdir}/%{name}/plugins/com.jcraft.jsch_* %{_libdir}/%{name}/plugins/javax.servlet_* @@ -1347,18 +1256,11 @@ %{_libdir}/%{name}/artifacts.xml # FIXME: should we ship content.xml? #%{_libdir}/%{name}/metadata -%dir %{_libdir}/%{name}/p2 -%dir %{_libdir}/%{name}/p2/org.eclipse.equinox.p2.engine -%dir %{_libdir}/%{name}/p2/org.eclipse.equinox.p2.engine/profileRegistry -%config %{_libdir}/%{name}/p2/org.eclipse.equinox.p2.engine/profileRegistry/*.profile -%{_libdir}/%{name}/.updateSymlinks +%{_libdir}/%{name}/p2 %files jdt %defattr(-,root,root) %{_bindir}/efj -%{_libdir}/%{name}/configuration/configInis/1-JDT-config.ini -%{_libdir}/%{name}/profilesDir/1-JDTProfile.profile -%{_libdir}/%{name}/configuration/bundleInfos/1-JDT-bundles.info %{_libdir}/%{name}/features/org.eclipse.jdt_* %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_* %{_libdir}/%{name}/plugins/org.junit_* @@ -1381,9 +1283,6 @@ %files pde %defattr(-,root,root) -%{_libdir}/%{name}/configuration/configInis/2-SDK-config.ini -%{_libdir}/%{name}/profilesDir/2-SDKProfile.profile -%{_libdir}/%{name}/configuration/bundleInfos/2-SDK-bundles.info %{_libdir}/%{name}/features/org.eclipse.sdk_* %{_libdir}/%{name}/features/org.eclipse.pde_* %{_libdir}/%{name}/features/org.eclipse.pde.p2_* @@ -1435,6 +1334,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* %changelog +* Fri Jul 18 2008 Andrew Overholt 3.4.0-4 +- Un-do crazy config.ini, bundles.info, etc. shuffling +- Update patch for building native libraries + * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package - Do crazy config.ini, bundles.info, and *.profile shuffling --- eclipse-copy-JDT.sh DELETED --- --- eclipse-copy-Platform.sh DELETED --- --- eclipse-updateSymlinks.sh DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 15:15:34 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:15:34 GMT Subject: rpms/kdebase-runtime/devel .cvsignore, 1.17, 1.18 kdebase-runtime.spec, 1.57, 1.58 sources, 1.17, 1.18 Message-ID: <200807181515.m6IFFYCp020488@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20286 Modified Files: .cvsignore kdebase-runtime.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 11 Jul 2008 03:58:52 -0000 1.17 +++ .cvsignore 18 Jul 2008 15:14:49 -0000 1.18 @@ -1 +1 @@ -kdebase-runtime-4.0.98.tar.bz2 +kdebase-runtime-4.0.99.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- kdebase-runtime.spec 14 Jul 2008 18:50:17 -0000 1.57 +++ kdebase-runtime.spec 18 Jul 2008 15:14:49 -0000 1.58 @@ -8,8 +8,8 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.0.98 -Release: 4%{?dist} +Version: 4.0.99 +Release: 1%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -337,6 +337,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Mon Jul 14 2008 Rex Dieter 4.0.98-4 - respin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 11 Jul 2008 03:58:52 -0000 1.17 +++ sources 18 Jul 2008 15:14:49 -0000 1.18 @@ -1 +1 @@ -564def1536a1cd646b0f8bd531db251b kdebase-runtime-4.0.98.tar.bz2 +265fa06347c83c8b9c6bc1d1259e83f2 kdebase-runtime-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 15:15:54 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:15:54 GMT Subject: rpms/kdebase/devel .cvsignore,1.75,1.76 sources,1.98,1.99 Message-ID: <200807181515.m6IFFsiQ020600@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20385 Modified Files: .cvsignore sources Log Message: * Fri Jul 11 2008 Rex Dieter 4.0.98-2 - BR: pciutils-devel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- .cvsignore 11 Jul 2008 03:58:30 -0000 1.75 +++ .cvsignore 18 Jul 2008 15:15:08 -0000 1.76 @@ -1 +1 @@ -kdebase-4.0.98.tar.bz2 +kdebase-4.0.99.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- sources 11 Jul 2008 03:58:30 -0000 1.98 +++ sources 18 Jul 2008 15:15:08 -0000 1.99 @@ -1 +1 @@ -43a025d53f4d8a280db9c8b7da238bf6 kdebase-4.0.98.tar.bz2 +bc6959d918a06a7f0b0a091f5e632bf8 kdebase-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 15:16:18 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:16:18 GMT Subject: rpms/kdebase/devel kdebase.spec,1.335,1.336 Message-ID: <200807181516.m6IFGIoO020670@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481 Modified Files: kdebase.spec Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- kdebase.spec 12 Jul 2008 02:58:20 -0000 1.335 +++ kdebase.spec 18 Jul 2008 15:15:34 -0000 1.336 @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Core Files -Version: 4.0.98 -Release: 2%{?dist} +Version: 4.0.99 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -302,6 +302,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-2 - BR: pciutils-devel From fedora-extras-commits at redhat.com Fri Jul 18 15:17:40 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:17:40 GMT Subject: rpms/kdebase-workspace/devel .cvsignore, 1.15, 1.16 kdebase-workspace.spec, 1.106, 1.107 sources, 1.18, 1.19 kdebase-workspace-4.0.98-circles.patch, 1.1, NONE Message-ID: <200807181517.m6IFHeTv020987@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20817 Modified Files: .cvsignore kdebase-workspace.spec sources Removed Files: kdebase-workspace-4.0.98-circles.patch Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Jul 2008 03:59:29 -0000 1.15 +++ .cvsignore 18 Jul 2008 15:16:58 -0000 1.16 @@ -1 +1 @@ -kdebase-workspace-4.0.98.tar.bz2 +kdebase-workspace-4.0.99.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- kdebase-workspace.spec 16 Jul 2008 13:27:04 -0000 1.106 +++ kdebase-workspace.spec 18 Jul 2008 15:16:58 -0000 1.107 @@ -2,9 +2,9 @@ Summary: K Desktop Environment - Workspace Name: kdebase-workspace -Version: 4.0.98 +Version: 4.0.99 -Release: 8%{?dist} +Release: 1%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -26,7 +26,6 @@ Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch # upstream patches: -Patch100: kdebase-workspace-4.0.98-circles.patch # plasma-4.0-openSUSE patches: Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch @@ -140,7 +139,6 @@ %patch11 -p1 -b .plasma-default-wallpaper # upstream patches -%patch100 -p1 -b .circles # plasma-4.0-openSUSE patches: %patch204 -p1 -b .kickoff-suspend @@ -276,6 +274,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Wed Jul 16 2008 Kevin Kofler 4.0.98-8 - fix KDM ConsoleKit patch to use x11-display-device instead of display-device Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 11 Jul 2008 12:32:40 -0000 1.18 +++ sources 18 Jul 2008 15:16:58 -0000 1.19 @@ -1 +1 @@ -a54ffc831d940955443d35b11f5879a7 kdebase-workspace-4.0.98.tar.bz2 +eec3d9d9886a0436672007ab2568a20a kdebase-workspace-4.0.99.tar.bz2 --- kdebase-workspace-4.0.98-circles.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 15:18:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:18:19 GMT Subject: rpms/fbset/devel fbset.spec,1.22,1.23 Message-ID: <200807181518.m6IFIJOv021175@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fbset/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20951 Modified Files: fbset.spec Log Message: fix license tag Index: fbset.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbset/devel/fbset.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fbset.spec 20 Feb 2008 08:50:44 -0000 1.22 +++ fbset.spec 18 Jul 2008 15:17:31 -0000 1.23 @@ -1,8 +1,8 @@ Summary: Tools for managing a frame buffer's video mode properties Name: fbset Version: 2.1 -Release: 25%{?dist} -License: GPL +Release: 26%{?dist} +License: GPL+ Group: Applications/System URL: http://users.telenet.be/geertu/Linux/fbdev/ Source: http://users.telenet.be/geertu/Linux/fbdev/fbset-2.1.tar.gz @@ -44,6 +44,9 @@ %config %{_sysconfdir}/fb.modes %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 2.1-26 +- fix license tag + * Wed Feb 20 2008 Fedora Release Engineering - 2.1-25 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 15:18:48 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:18:48 GMT Subject: rpms/kdepim/devel .cvsignore, 1.49, 1.50 kdepim.spec, 1.179, 1.180 sources, 1.55, 1.56 Message-ID: <200807181518.m6IFImGg021303@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21107 Modified Files: .cvsignore kdepim.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 11 Jul 2008 04:04:22 -0000 1.49 +++ .cvsignore 18 Jul 2008 15:18:04 -0000 1.50 @@ -1 +1 @@ -kdepim-4.0.98.tar.bz2 +kdepim-4.0.99.tar.bz2 Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- kdepim.spec 13 Jul 2008 17:18:37 -0000 1.179 +++ kdepim.spec 18 Jul 2008 15:18:04 -0000 1.180 @@ -6,8 +6,8 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.0.98 -Release: 3%{?dist} +Version: 4.0.99 +Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity @@ -106,7 +106,7 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} # conflict with oxygen-icon-theme -rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png +rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png # make symlinks relative mkdir -p %{buildroot}%{_docdir}/HTML/en/common @@ -176,6 +176,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Sun Jul 13 2008 Rex Dieter 4.0.98-3 - fix conflict with oxygen-icon-theme Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 11 Jul 2008 04:04:22 -0000 1.55 +++ sources 18 Jul 2008 15:18:04 -0000 1.56 @@ -1 +1 @@ -71d7396490f27ca4c5d9687515a3d8a9 kdepim-4.0.98.tar.bz2 +19461421744e7d9117fa185d86b1b16f kdepim-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 15:24:06 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:24:06 GMT Subject: rpms/qt/F-9 qt.spec,1.175,1.176 Message-ID: <200807181524.m6IFO6Gl022547@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22300 Modified Files: qt.spec Log Message: respin Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- qt.spec 17 Jul 2008 12:42:37 -0000 1.175 +++ qt.spec 18 Jul 2008 15:23:09 -0000 1.176 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 13%{?dist} +Release: 13%{?dist}.1 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL From fedora-extras-commits at redhat.com Fri Jul 18 15:24:34 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 15:24:34 GMT Subject: rpms/digikam/F-8 digikam.spec,1.44,1.45 Message-ID: <200807181524.m6IFOYpQ022669@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22443 Modified Files: digikam.spec Log Message: respin Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-8/digikam.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- digikam.spec 17 Jul 2008 16:58:11 -0000 1.44 +++ digikam.spec 18 Jul 2008 15:23:45 -0000 1.45 @@ -1,6 +1,6 @@ Name: digikam Version: 0.9.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: A digital camera accessing & photo management application Group: Applications/Multimedia From fedora-extras-commits at redhat.com Fri Jul 18 15:30:08 2008 From: fedora-extras-commits at redhat.com (Alan Pevec (apevec)) Date: Fri, 18 Jul 2008 15:30:08 GMT Subject: rpms/perl-Config-Augeas/devel perl-Config-Augeas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181530.m6IFU8dr024036@cvs-int.fedora.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/perl-Config-Augeas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23746 Modified Files: .cvsignore sources Added Files: perl-Config-Augeas.spec Log Message: Initial import. --- NEW FILE perl-Config-Augeas.spec --- Name: perl-Config-Augeas Version: 0.201 Release: 1%{?dist} Summary: Edit configuration files through Augeas C library License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Config-Augeas/ Source0: http://www.cpan.org/modules/by-module/Config/Config-Augeas-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: augeas-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Augeas is a library and command line tool that focuses on the most basic problem in handling Linux configurations programmatically: editing actual configuration files in a controlled manner. %prep %setup -q -n Config-Augeas-%{version} %build %{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS" ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Config* %{_mandir}/man3/* %changelog * Wed Jul 02 2008 Alan Pevec 0.201-1 - new upstream release 0.201 * Mon Jun 30 2008 Alan Pevec 0.200-1 - Specfile autogenerated by cpanspec 1.77. - temporary patch to remove /usr/local references Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:53:48 -0000 1.1 +++ .cvsignore 18 Jul 2008 15:29:21 -0000 1.2 @@ -0,0 +1 @@ +Config-Augeas-0.201.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:53:48 -0000 1.1 +++ sources 18 Jul 2008 15:29:21 -0000 1.2 @@ -0,0 +1 @@ +54e0f51ad0c9f148c828b2c2b033a13c Config-Augeas-0.201.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 15:32:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:32:05 GMT Subject: rpms/fedora-gnome-theme/devel fedora-gnome-theme.spec,1.4,1.5 Message-ID: <200807181532.m6IFW5Ml024529@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fedora-gnome-theme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24303 Modified Files: fedora-gnome-theme.spec Log Message: fix license tag Index: fedora-gnome-theme.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-gnome-theme.spec 23 May 2008 10:27:34 -0000 1.4 +++ fedora-gnome-theme.spec 18 Jul 2008 15:31:16 -0000 1.5 @@ -1,9 +1,10 @@ Summary: Fedora GNOME theme Name: fedora-gnome-theme Version: 8.0.0 -Release: 2%{?dist} +Release: 3%{?dist} BuildArch: noarch -License: GPL +# No version given, no license attribution. +License: GPL+ Group: User Interface/Desktops # There is no official upstream yet Source0: %{name}-%{version}.tar.bz2 @@ -52,6 +53,9 @@ %{_datadir}/themes/Fedora %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 8.0.0-3 +- fix license tag + * Fri May 23 2008 Martin Sourada - 8.0.0-2 - Require gtk-nodoka-engine instead of nodoka-theme-gnome (bug 447644) From fedora-extras-commits at redhat.com Fri Jul 18 15:32:13 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Fri, 18 Jul 2008 15:32:13 GMT Subject: rpms/kernel-xen-2.6/devel config-x86_64-generic,1.8,1.9 Message-ID: <200807181532.m6IFWDHi024617@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229 Modified Files: config-x86_64-generic Log Message: Disable xen in the x86_64-generic config Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-x86_64-generic,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config-x86_64-generic 18 Jul 2008 14:57:39 -0000 1.8 +++ config-x86_64-generic 18 Jul 2008 15:31:20 -0000 1.9 @@ -1,6 +1,5 @@ CONFIG_64BIT=y CONFIG_UID16=y -# CONFIG_X86_64_XEN is not set # CONFIG_MK8 is not set # CONFIG_MPSC is not set CONFIG_GENERIC_CPU=y @@ -263,6 +262,7 @@ CONFIG_PARAVIRT_GUEST=y CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y +CONFIG_XEN=n CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_DEBUG is not set From fedora-extras-commits at redhat.com Fri Jul 18 15:32:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:32:57 GMT Subject: rpms/fedora-screensaver-theme/devel fedora-screensaver-theme.spec, 1.1, 1.2 Message-ID: <200807181532.m6IFWvGR024829@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fedora-screensaver-theme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24597 Modified Files: fedora-screensaver-theme.spec Log Message: fix license tag Index: fedora-screensaver-theme.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-screensaver-theme/devel/fedora-screensaver-theme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-screensaver-theme.spec 10 Oct 2007 15:35:01 -0000 1.1 +++ fedora-screensaver-theme.spec 18 Jul 2008 15:32:11 -0000 1.2 @@ -1,9 +1,10 @@ Summary: Fedora screensaver theme Name: fedora-screensaver-theme Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch -License: GPL +# No version given, no license attribution. +License: GPL+ Group: User Interface/Desktops # There is no official upstream yet Source0: %{name}-%{version}.tar.bz2 @@ -41,5 +42,8 @@ %{_datadir}/applications/screensavers/system.desktop %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.0.0-2 +- fix license tag + * Tue Sep 25 2007 Ray Strode - 1.0.0-1 - Initial import, version 1.0.0 From fedora-extras-commits at redhat.com Fri Jul 18 15:38:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:38:21 GMT Subject: rpms/fedora-usermgmt/devel fedora-usermgmt.spec,1.16,1.17 Message-ID: <200807181538.m6IFcL0r026143@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fedora-usermgmt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25834 Modified Files: fedora-usermgmt.spec Log Message: fix license tag Index: fedora-usermgmt.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora-usermgmt.spec 21 Jun 2008 14:58:37 -0000 1.16 +++ fedora-usermgmt.spec 18 Jul 2008 15:37:24 -0000 1.17 @@ -7,9 +7,9 @@ Summary: Fedora tools for user management Name: fedora-usermgmt Version: 0.10 -Release: %release_func 1 +Release: %release_func 2 -License: GPL +License: GPLv2 BuildArch: noarch Group: Applications/System URL: http://fedoraproject.org/wiki/PackageUserCreation @@ -186,6 +186,9 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.10-2 +- fix license tag + * Wed Jun 20 2007 Enrico Scholz - 0.10-1 - added basic checks that CLI is used correctly From fedora-extras-commits at redhat.com Fri Jul 18 15:47:03 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 18 Jul 2008 15:47:03 GMT Subject: rpms/gv/devel .cvsignore,1.5,1.6 gv.spec,1.14,1.15 sources,1.5,1.6 Message-ID: <200807181547.m6IFl33m028367@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/gv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28040 Modified Files: .cvsignore gv.spec sources Log Message: * Thu Jul 17 2008 Orion Poplawski 3.6.5-1 - Update to 3.6.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gv/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Jun 2008 17:09:42 -0000 1.5 +++ .cvsignore 18 Jul 2008 15:46:06 -0000 1.6 @@ -1 +1 @@ -gv-3.6.4.tar.gz +gv-3.6.5.tar.gz Index: gv.spec =================================================================== RCS file: /cvs/pkgs/rpms/gv/devel/gv.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gv.spec 2 Jun 2008 17:09:42 -0000 1.14 +++ gv.spec 18 Jul 2008 15:46:06 -0000 1.15 @@ -1,6 +1,6 @@ Summary: A X front-end for the Ghostscript PostScript(TM) interpreter Name: gv -Version: 3.6.4 +Version: 3.6.5 Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -100,6 +100,9 @@ %{_mandir}/man1/gv.* %changelog +* Thu Jul 17 2008 Orion Poplawski 3.6.5-1 +- Update to 3.6.5 + * Mon Jun 2 2008 Orion Poplawski 3.6.4-1 - Update to 3.6.4 - Cleanup desktop file a little Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gv/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jun 2008 17:09:42 -0000 1.5 +++ sources 18 Jul 2008 15:46:06 -0000 1.6 @@ -1 +1 @@ -34ea686ea499c938e152ab424859b903 gv-3.6.4.tar.gz +ce3081b1b3e6258607f2de70f39cbcd2 gv-3.6.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 15:52:18 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 18 Jul 2008 15:52:18 GMT Subject: rpms/eclipse/devel eclipse.spec,1.538,1.539 Message-ID: <200807181552.m6IFqIPx029477@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321 Modified Files: eclipse.spec Log Message: Some debugging stuff; will remove afterwards. Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.538 retrieving revision 1.539 diff -u -r1.538 -r1.539 --- eclipse.spec 18 Jul 2008 15:14:32 -0000 1.538 +++ eclipse.spec 18 Jul 2008 15:51:29 -0000 1.539 @@ -538,6 +538,12 @@ rm plugins/org.apache.jasper_*.jar ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_* \ plugins/org.apache.jasper_$JASPERVERSION +ls -l %{_datadir}/eclipse/plugins/org.apache.jasper_* +unzip -l %{_datadir}/eclipse/plugins/org.apache.jasper_* +unzip %{_datadir}/eclipse/plugins/org.apache.jasper_*.jar \ +META-INF/MANIFEST.MF +cat META-INF/MANIFEST.MF +exit 1 # link to servlet-api SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \ From fedora-extras-commits at redhat.com Fri Jul 18 15:53:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:53:09 GMT Subject: rpms/festival/devel festival.spec,1.31,1.32 Message-ID: <200807181553.m6IFr9ou029737@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/festival/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29516 Modified Files: festival.spec Log Message: fix license tag Index: festival.spec =================================================================== RCS file: /cvs/pkgs/rpms/festival/devel/festival.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- festival.spec 23 Feb 2008 03:03:56 -0000 1.31 +++ festival.spec 18 Jul 2008 15:52:24 -0000 1.32 @@ -6,11 +6,12 @@ Name: festival Summary: A free speech synthesis and text-to-speech system Version: %{festivalversion} -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.cstr.ed.ac.uk/projects/festival/ Group: Applications/Multimedia -License: MIT-style +# the emacs file is GPL+, there is one TCL licensed source file +License: MIT and GPL+ and TCL # Files needed for everything... @@ -793,6 +794,9 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.96-5 +- fix license tag + * Fri Feb 22 2008 Matthias Clasen - 1.96-4 - Fix the build with gcc 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 15:54:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:54:31 GMT Subject: rpms/fetchlog/devel fetchlog.spec,1.9,1.10 Message-ID: <200807181554.m6IFsVa5029843@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29794 Modified Files: fetchlog.spec Log Message: fix license tag Index: fetchlog.spec =================================================================== RCS file: /cvs/pkgs/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fetchlog.spec 19 Feb 2008 20:08:32 -0000 1.9 +++ fetchlog.spec 18 Jul 2008 15:53:39 -0000 1.10 @@ -1,8 +1,8 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 9%{?dist} -License: GPL +Release: 10%{?dist} +License: GPLv2+ Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz Patch0: %{name}-build.patch @@ -42,6 +42,9 @@ %{_mandir}/*/* %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.0-10 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.0-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 15:55:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:55:57 GMT Subject: rpms/fftw/devel fftw.spec,1.21,1.22 Message-ID: <200807181555.m6IFtvcj030008@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fftw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29902 Modified Files: fftw.spec Log Message: fix license tag Index: fftw.spec =================================================================== RCS file: /cvs/pkgs/rpms/fftw/devel/fftw.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fftw.spec 19 Feb 2008 20:23:41 -0000 1.21 +++ fftw.spec 18 Jul 2008 15:54:51 -0000 1.22 @@ -1,10 +1,10 @@ Name: fftw Version: 3.1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fast Fourier Transform library Group: System Environment/Libraries -License: GPL +License: GPLv2+ URL: http://www.fftw.org/ Source0: ftp://ftp.fftw.org/pub/fftw/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,6 +131,9 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 3.1.2-7 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 3.1.2-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 15:56:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 15:56:45 GMT Subject: rpms/fig2ps/devel fig2ps.spec,1.7,1.8 Message-ID: <200807181556.m6IFujsb030117@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29996 Modified Files: fig2ps.spec Log Message: fix license tag Index: fig2ps.spec =================================================================== RCS file: /cvs/pkgs/rpms/fig2ps/devel/fig2ps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fig2ps.spec 25 Jan 2007 22:26:50 -0000 1.7 +++ fig2ps.spec 18 Jul 2008 15:55:56 -0000 1.8 @@ -1,10 +1,10 @@ Name: fig2ps Version: 1.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing -License: GPL +License: GPLv2+ URL: http://fig2ps.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +43,9 @@ %config(noreplace) /etc/fig2ps %changelog +* Fri Jul 18 2008 Tom "spot" Callaway 1.3.6-3 +- fix license tag + * Thu Jan 25 2007 Quentin Spencer 1.3.6-2 - Fix broken source URL. From fedora-extras-commits at redhat.com Fri Jul 18 15:58:10 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Fri, 18 Jul 2008 15:58:10 GMT Subject: rpms/kernel-xen-2.6/devel kernel.spec,1.47,1.48 Message-ID: <200807181558.m6IFwAgJ030288@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30107 Modified Files: kernel.spec Log Message: We build firmware on noarch now, so don't do with_xenonly check in that case either (Yeah, yeah, building firmware for the xen kernel is crackrock, but ...) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- kernel.spec 18 Jul 2008 14:57:40 -0000 1.47 +++ kernel.spec 18 Jul 2008 15:57:23 -0000 1.48 @@ -943,6 +943,7 @@ %prep # do a few sanity-checks for --with *only builds %if !%{with_doc} +%if !%{with_firmware} %if %{with_baseonly} %if !%{with_up} echo "Cannot build --with baseonly, up build is disabled" @@ -971,6 +972,7 @@ %endif %endif %endif +%endif # If the package has a variantbase set, the up (no variant suffix) packages would # be inconsistent (sometimes using %%{mainpkgname}, other using %%{variantbase}) From fedora-extras-commits at redhat.com Fri Jul 18 16:04:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:04:04 GMT Subject: rpms/filelight/devel filelight.spec,1.5,1.6 Message-ID: <200807181604.m6IG4456004863@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/filelight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4791 Modified Files: filelight.spec Log Message: fix license tag Index: filelight.spec =================================================================== RCS file: /cvs/pkgs/rpms/filelight/devel/filelight.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- filelight.spec 19 Feb 2008 16:00:39 -0000 1.5 +++ filelight.spec 18 Jul 2008 16:03:13 -0000 1.6 @@ -3,8 +3,8 @@ Summary: Graphical disk usage statistics Name: filelight Version: 1.0 -Release: 12%{?dist} -License: GPL +Release: 13%{?dist} +License: GPLv2+ Group: Applications/System URL: http://www.methylblue.com/filelight/ @@ -73,6 +73,9 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.0-13 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.0-12 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 16:05:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:05:09 GMT Subject: rpms/firestarter/devel firestarter.spec,1.27,1.28 Message-ID: <200807181605.m6IG59pX004998@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/firestarter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4883 Modified Files: firestarter.spec Log Message: fix license tag Index: firestarter.spec =================================================================== RCS file: /cvs/pkgs/rpms/firestarter/devel/firestarter.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- firestarter.spec 20 Feb 2008 00:47:20 -0000 1.27 +++ firestarter.spec 18 Jul 2008 16:04:08 -0000 1.28 @@ -1,10 +1,10 @@ Name: firestarter Version: 1.0.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Firewall tool for GNOME Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://firestarter.sourceforge.net Source0: http://download.sourceforge.net/firestarter/firestarter-1.0.3.tar.gz Patch0: firestarter-1.0.3-pam.patch @@ -158,6 +158,9 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.0.3-19 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.3-18 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 16:09:14 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 16:09:14 GMT Subject: rpms/NetworkManager/devel .cvsignore, 1.79, 1.80 NetworkManager.spec, 1.228, 1.229 sources, 1.113, 1.114 Message-ID: <200807181609.m6IG9EqS005251@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5201 Modified Files: .cvsignore NetworkManager.spec sources Log Message: * Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.10.svn3830 - Expose server-returned DHCP options via D-Bus - Use avahi-autoipd rather than old built-in IPv4LL implementation - Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) - Support sending DHCP Client Identifier to DHCP server - Allow forcing 802.1x PEAP Label to '0' - Make connection sharing more robust - Show status for shared and Ad-Hoc connections if no other connection is active Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- .cvsignore 2 Jul 2008 21:49:07 -0000 1.79 +++ .cvsignore 18 Jul 2008 16:08:25 -0000 1.80 @@ -106,3 +106,5 @@ nm-applet-0.7.0.svn727.tar.gz NetworkManager-0.7.0.svn3801.tar.gz nm-applet-0.7.0.svn774.tar.gz +NetworkManager-0.7.0.svn3830.tar.gz +nm-applet-0.7.0.svn792.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- NetworkManager.spec 12 Jul 2008 03:52:44 -0000 1.228 +++ NetworkManager.spec 18 Jul 2008 16:08:25 -0000 1.229 @@ -9,8 +9,8 @@ %define libnl_version 1.0-0.15.pre8.git20071218 %define ppp_version 2.2.4 -%define snapshot svn3801 -%define applet_snapshot svn774 +%define snapshot svn3830 +%define applet_snapshot svn792 Name: NetworkManager Summary: Network connection manager and user applications @@ -38,11 +38,14 @@ Requires: libnl >= %{libnl_version} Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: ppp >= %{ppp_version} +Requires: avahi-autoipd +Requires: dnsmasq Obsoletes: dhcdbd # Due to VPN auth-dialog changes in applet r662 -Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549 -Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549 +# Due to using prefixes instead of netmasks in NM > r3812 +Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn3830 +Conflicts: NetworkManager-openvpn < 1:0.7.0-11.svn3830 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -142,25 +145,20 @@ %patch5 -p1 -b .explain-dns1-dns2 %build -# Even though we don't require named, we still build with it -# so that if the user installs it, NM will use it automatically autoreconf -i %configure \ --disable-static \ - --with-named=/usr/sbin/named \ - --with-named-dir=/var/named/data \ - --with-named-user=named + --with-distro=redhat \ + --with-dhcp-client=dhclient \ + --with-crypto=nss \ + --enable-more-warnings=yes make # build the applet pushd nm-applet-0.7.0 autoreconf -i intltoolize --force - %configure \ - --disable-static \ - --with-notify \ - --with-nss=yes \ - --with-gnutls=no + %configure --disable-static make popd @@ -203,10 +201,12 @@ %preun if [ $1 -eq 0 ]; then /sbin/service NetworkManager stop >/dev/null 2>&1 + killall -TERM nm-system-settings >/dev/null 2>&1 /sbin/chkconfig --del NetworkManager fi %triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614 +/sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1 /sbin/chkconfig --del NetworkManagerDispatcher exit 0 @@ -230,6 +230,7 @@ %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf +%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf %config %{_sysconfdir}/rc.d/init.d/NetworkManager @@ -242,6 +243,7 @@ %{_bindir}/nm-tool %{_bindir}/nm-online %{_libexecdir}/nm-dhcp-client.action +%{_libexecdir}/nm-avahi-autoipd.action %{_libexecdir}/nm-dispatcher.action %dir %{_libdir}/NetworkManager %{_libdir}/NetworkManager/*.so* @@ -291,6 +293,15 @@ %{_libdir}/libnm-util.so %changelog +* Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.10.svn3830 +- Expose server-returned DHCP options via D-Bus +- Use avahi-autoipd rather than old built-in IPv4LL implementation +- Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) +- Support sending DHCP Client Identifier to DHCP server +- Allow forcing 802.1x PEAP Label to '0' +- Make connection sharing more robust +- Show status for shared and Ad-Hoc connections if no other connection is active + * Fri Jul 11 2008 Matthias Clasen - 1:0.7.0-0.10.svn3801 - Drop explicit hal dep in -gnome Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- sources 2 Jul 2008 21:49:09 -0000 1.113 +++ sources 18 Jul 2008 16:08:25 -0000 1.114 @@ -1,2 +1,2 @@ -4abf623e95a5d2d7465a49786bbe289f NetworkManager-0.7.0.svn3801.tar.gz -b9c38044c9b3b25cf71306eb3810e4d4 nm-applet-0.7.0.svn774.tar.gz +a65687a0a4003fd7bd8159c00594c484 NetworkManager-0.7.0.svn3830.tar.gz +31a19503390cd5bce9ff16aace4e6dd4 nm-applet-0.7.0.svn792.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 16:15:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:15:40 GMT Subject: rpms/fityk/devel fityk.spec,1.5,1.6 Message-ID: <200807181615.m6IGFe1k006284@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fityk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6153 Modified Files: fityk.spec Log Message: fix license tag Index: fityk.spec =================================================================== RCS file: /cvs/pkgs/rpms/fityk/devel/fityk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fityk.spec 8 Apr 2008 02:38:01 -0000 1.5 +++ fityk.spec 18 Jul 2008 16:14:55 -0000 1.6 @@ -1,11 +1,11 @@ Name: fityk Summary: Non-linear curve fitting and data analysis Version: 0.8.1 -Release: 13%{?dist} +Release: 14%{?dist} Source0: http://downloads.sourceforge.net/fityk/%{name}-%{version}.tar.bz2 URL: http://fityk.sourceforge.net/ -License: GPL +License: GPLv2 Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Patch0: %{name}-gcc43.patch @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.8.1-14 +- fix license tag + * Mon Apr 07 2008 Jesse Keating - 0.8.1-13 - Patch for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 16:16:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:16:33 GMT Subject: rpms/flac123/devel flac123.spec,1.11,1.12 Message-ID: <200807181616.m6IGGXDP006524@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/flac123/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6358 Modified Files: flac123.spec Log Message: fix license tag Index: flac123.spec =================================================================== RCS file: /cvs/pkgs/rpms/flac123/devel/flac123.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- flac123.spec 20 Feb 2008 00:12:38 -0000 1.11 +++ flac123.spec 18 Jul 2008 16:15:47 -0000 1.12 @@ -1,10 +1,10 @@ Name: flac123 Version: 0.0.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command-line program for playing FLAC audio files Group: Applications/Multimedia -License: GPL +License: GPLv2+ URL: http://flac-tools.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/flac-tools/%{name}-%{version}.tar.gz #Patch0: %{name}-%{version}-flac-1.1.3.patch @@ -44,6 +44,9 @@ %{_bindir}/* %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.0.11-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.0.11-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 16:17:49 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 16:17:49 GMT Subject: rpms/NetworkManager/F-9 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.18, 1.19 NetworkManager.spec, 1.228, 1.229 sources, 1.115, 1.116 Message-ID: <200807181617.m6IGHnwn006818@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6632 Modified Files: NetworkManager-0.6.5-fixup-internal-applet-build.patch NetworkManager.spec sources Log Message: * Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.10.svn3830 - Expose server-returned DHCP options via D-Bus - Use avahi-autoipd rather than old built-in IPv4LL implementation - Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) - Support sending DHCP Client Identifier to DHCP server - Allow forcing 802.1x PEAP Label to '0' - Make connection sharing more robust - Show status for shared and Ad-Hoc connections if no other connection is active * Fri Jul 11 2008 Matthias Clasen - 1:0.7.0-0.10.svn3801 - Drop explicit hal dep in -gnome * Wed Jul 02 2008 Dan Williams - 1:0.7.0-0.10.svn3801 - Move VPN configuration into connection editor - Fix mobile broadband username/password issues - Fix issues with broken rfkill setups (rh #448889) - Honor APN setting for GSM mobile broadband configurations - Fix adding CDMA connections in the connection editor NetworkManager-0.6.5-fixup-internal-applet-build.patch: Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- NetworkManager-0.6.5-fixup-internal-applet-build.patch 19 May 2008 19:32:01 -0000 1.18 +++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 18 Jul 2008 16:17:02 -0000 1.19 @@ -1,41 +1,17 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac --- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 +++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -60,9 +60,6 @@ AC_C_BIGENDIAN +@@ -60,10 +60,6 @@ AC_C_BIGENDIAN PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 glib-2.0 >= 2.10 - NetworkManager >= 0.7.0 -- libnm_glib -- libnm-util +- libnm_glib >= 0.7.0 +- libnm-util >= 0.7.0 +- libnm_glib_vpn >= 0.7.0 gtk+-2.0 >= 2.10 libglade-2.0 gconf-2.0 -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-22 22:54:27.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -1,6 +1,10 @@ - - bin_PROGRAMS = nm-vpn-properties - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_vpn_propertiesdir=$(includedir)/NetworkManager - - nm_vpn_properties_HEADERS = \ -@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \ - - nm_vpn_properties_LDADD = \ - $(NMA_LIBS) \ -- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la -+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - CLEANFILES = $(server_DATA) *.bak *.gladep *~ - diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500 @@ -102,7 +78,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am --- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -2,6 +2,10 @@ NULL= +@@ -2,6 +2,10 @@ bin_PROGRAMS = nm-connection-editor @@ -113,18 +89,18 @@ nm_connection_editor_CPPFLAGS = \ $(NMA_CFLAGS) \ -DICONDIR=\""$(datadir)/icons"\" \ -@@ -29,8 +33,10 @@ nm_connection_editor_LDADD = \ - $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \ +@@ -59,7 +63,10 @@ ${top_builddir}/src/wireless-security/libwireless-security.la \ ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ + $(NMA_LIBS) \ - $(POLKIT_LIBS) + $(POLKIT_LIBS) \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la gladedir = $(datadir)/nm-applet - glade_DATA = nm-connection-editor.gladediff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am + glade_DATA = \ --- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500 @@ -4,6 +4,10 @@ NULL= Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- NetworkManager.spec 11 Jun 2008 15:36:44 -0000 1.228 +++ NetworkManager.spec 18 Jul 2008 16:17:02 -0000 1.229 @@ -9,8 +9,8 @@ %define libnl_version 1.0-0.15.pre8.git20071218 %define ppp_version 2.2.4 -%define snapshot svn3747 -%define applet_snapshot svn755 +%define snapshot svn3830 +%define applet_snapshot svn792 Name: NetworkManager Summary: Network connection manager and user applications @@ -39,11 +39,14 @@ Requires: libnl >= %{libnl_version} Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: ppp >= %{ppp_version} +Requires: avahi-autoipd +Requires: dnsmasq Obsoletes: dhcdbd # Due to VPN auth-dialog changes in applet r662 -Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549 -Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549 +# Due to using prefixes instead of netmasks in NM > r3812 +Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn3830 +Conflicts: NetworkManager-openvpn < 1:0.7.0-11.svn3830 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -97,7 +100,6 @@ Requires: gnome-panel Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} -Requires: hal >= %{hal_version} Requires: libnotify >= 0.4.3 PreReq: gtk2 >= %{gtk2_version} Requires: gnome-keyring @@ -114,6 +116,9 @@ Group: Development/Libraries Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} +# Evil hack for multi-lib due to move of libnm-util from core package to -glib +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: %{name} < %{epoch}:%{version}-0.9.4.svn3675 %description glib This package contains the libraries that make it easier to use some NetworkManager @@ -145,25 +150,20 @@ %patch5 -p1 -b .explain-dns1-dns2 %build -# Even though we don't require named, we still build with it -# so that if the user installs it, NM will use it automatically autoreconf -i %configure \ --disable-static \ - --with-named=/usr/sbin/named \ - --with-named-dir=/var/named/data \ - --with-named-user=named + --with-distro=redhat \ + --with-dhcp-client=dhclient \ + --with-crypto=nss \ + --enable-more-warnings=yes make # build the applet pushd nm-applet-0.7.0 autoreconf -i intltoolize --force - %configure \ - --disable-static \ - --with-notify \ - --with-nss=yes \ - --with-gnutls=no + %configure --disable-static make popd @@ -173,7 +173,7 @@ # install NM make install DESTDIR=$RPM_BUILD_ROOT -%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ +%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install the applet pushd nm-applet-0.7.0 @@ -206,10 +206,12 @@ %preun if [ $1 -eq 0 ]; then /sbin/service NetworkManager stop >/dev/null 2>&1 + killall -TERM nm-system-settings >/dev/null 2>&1 /sbin/chkconfig --del NetworkManager fi %triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614 +/sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1 /sbin/chkconfig --del NetworkManagerDispatcher exit 0 @@ -233,18 +235,20 @@ %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf +%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} %{_sbindir}/nm-system-settings -%{_sysconfdir}/nm-system-settings.conf -%dir %{_sysconfdir}/NetworkManager/ -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%dir %{_sysconfdir}/NetworkManager/VPN +%dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name}/dispatcher.d +%dir %{_sysconfdir}/%{name}/VPN +%{_sysconfdir}/%{name}/nm-system-settings.conf %{_bindir}/nm-tool %{_bindir}/nm-online %{_libexecdir}/nm-dhcp-client.action +%{_libexecdir}/nm-avahi-autoipd.action %{_libexecdir}/nm-dispatcher.action %dir %{_libdir}/NetworkManager %{_libdir}/NetworkManager/*.so* @@ -270,9 +274,7 @@ %defattr(-,root,root,0755) %{_sysconfdir}/dbus-1/system.d/nm-applet.conf %{_bindir}/nm-applet -%{_bindir}/nm-vpn-properties %{_bindir}/nm-connection-editor -%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png @@ -289,12 +291,32 @@ %{_includedir}/libnm-glib/*.h %{_includedir}/NetworkManager/nm-*.h %{_libdir}/pkgconfig/libnm_glib.pc +%{_libdir}/pkgconfig/libnm_glib_vpn.pc %{_libdir}/pkgconfig/libnm-util.pc %{_libdir}/libnm_glib.so %{_libdir}/libnm_glib_vpn.so %{_libdir}/libnm-util.so %changelog +* Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.10.svn3830 +- Expose server-returned DHCP options via D-Bus +- Use avahi-autoipd rather than old built-in IPv4LL implementation +- Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) +- Support sending DHCP Client Identifier to DHCP server +- Allow forcing 802.1x PEAP Label to '0' +- Make connection sharing more robust +- Show status for shared and Ad-Hoc connections if no other connection is active + +* Fri Jul 11 2008 Matthias Clasen - 1:0.7.0-0.10.svn3801 +- Drop explicit hal dep in -gnome + +* Wed Jul 02 2008 Dan Williams - 1:0.7.0-0.10.svn3801 +- Move VPN configuration into connection editor +- Fix mobile broadband username/password issues +- Fix issues with broken rfkill setups (rh #448889) +- Honor APN setting for GSM mobile broadband configurations +- Fix adding CDMA connections in the connection editor + * Wed Jun 11 2008 Dan Williams - 1:0.7.0-0.10.svn3747 - Update to latest SVN - Enable connection sharing Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- sources 11 Jun 2008 15:36:44 -0000 1.115 +++ sources 18 Jul 2008 16:17:02 -0000 1.116 @@ -1,2 +1,2 @@ -25a1612c01ec19ba2864ad97ac98c759 NetworkManager-0.7.0.svn3747.tar.gz -4ae0a5d13783f4de4e4e6f7fb949aaed nm-applet-0.7.0.svn755.tar.gz +a65687a0a4003fd7bd8159c00594c484 NetworkManager-0.7.0.svn3830.tar.gz +31a19503390cd5bce9ff16aace4e6dd4 nm-applet-0.7.0.svn792.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 16:18:41 2008 From: fedora-extras-commits at redhat.com (Shawn Starr (spstarr)) Date: Fri, 18 Jul 2008 16:18:41 GMT Subject: rpms/lrzip/devel import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 lrzip.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807181618.m6IGIfk2007004@cvs-int.fedora.redhat.com> Author: spstarr Update of /cvs/pkgs/rpms/lrzip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6805/devel Modified Files: .cvsignore lrzip.spec sources Added Files: import.log Log Message: New upstream version --- NEW FILE import.log --- lrzip-0_23-1_fc10:HEAD:lrzip-0.23-1.fc10.src.rpm:1216397846 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lrzip/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2008 21:50:53 -0000 1.3 +++ .cvsignore 18 Jul 2008 16:17:55 -0000 1.4 @@ -1 +1 @@ -lrzip-0.19.tar.bz2 +lrzip-0.23.tar.bz2 Index: lrzip.spec =================================================================== RCS file: /cvs/pkgs/rpms/lrzip/devel/lrzip.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lrzip.spec 8 Feb 2008 21:50:53 -0000 1.2 +++ lrzip.spec 18 Jul 2008 16:17:55 -0000 1.3 @@ -1,5 +1,5 @@ Name: lrzip -Version: 0.19 +Version: 0.23 Release: 1%{?dist} Summary: Compression program optimised for large files @@ -9,7 +9,7 @@ Source0: http://ck.kolivas.org/apps/lrzip/lrzip-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel lzo-devel +BuildRequires: bzip2-devel lzo-devel nasm %description Long Range ZIP or Lzma RZIP @@ -43,10 +43,13 @@ %defattr(-,root,root,-) %doc COPYING README %{_bindir}/lrzip +%{_bindir}/lrunzip %{_datadir}/man/man1/lrzip.1.gz - %changelog +* Fri Jul 18 2008 Shawn Starr 0.23-1 +- New upstream release + * Fri Feb 08 2008 Warren Togami 0.19-1 - 0.19 and rebuild for gcc-4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lrzip/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2008 21:50:53 -0000 1.3 +++ sources 18 Jul 2008 16:17:55 -0000 1.4 @@ -1 +1 @@ -a724f4bc8c89d698873b46a0de60bcd1 lrzip-0.19.tar.bz2 +a15ca1768adb50c839baabc13b0fb60a lrzip-0.23.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 16:21:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:21:40 GMT Subject: rpms/flite/devel flite.spec,1.2,1.3 Message-ID: <200807181621.m6IGLeu2007564@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/flite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7395 Modified Files: flite.spec Log Message: fix license tag Index: flite.spec =================================================================== RCS file: /cvs/pkgs/rpms/flite/devel/flite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- flite.spec 19 Feb 2008 02:57:10 -0000 1.2 +++ flite.spec 18 Jul 2008 16:20:52 -0000 1.3 @@ -1,10 +1,10 @@ Name: flite Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Small, fast speech synthesis engine (text-to-speech) Group: Applications/Multimedia -License: BSD-style +License: MIT URL: http://fife.speech.cs.cmu.edu/flite/ Source0: http://fife.speech.cs.cmu.edu/flite/packed/%{name}-%{version}/%{name}-%{version}-release.tar.gz Source1: README-ALSA.txt @@ -80,6 +80,9 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.3-10 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1.3-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 16:23:35 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 16:23:35 GMT Subject: rpms/NetworkManager/devel NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.19, 1.20 Message-ID: <200807181623.m6IGNZrE007972@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7843 Modified Files: NetworkManager-0.6.5-fixup-internal-applet-build.patch Log Message: Update patch to remove fuzz NetworkManager-0.6.5-fixup-internal-applet-build.patch: Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- NetworkManager-0.6.5-fixup-internal-applet-build.patch 2 Jul 2008 21:49:08 -0000 1.19 +++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 18 Jul 2008 16:22:44 -0000 1.20 @@ -1,7 +1,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac ---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -60,10 +60,6 @@ AC_C_BIGENDIAN +--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-06-17 13:51:13.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-07-18 11:52:29.000000000 -0400 +@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 glib-2.0 >= 2.10 @@ -11,10 +11,36 @@ - libnm_glib_vpn >= 0.7.0 gtk+-2.0 >= 2.10 libglade-2.0 - gconf-2.0 + gmodule-export-2.0 +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-07-03 07:08:55.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -2,6 +2,10 @@ NULL= + + bin_PROGRAMS = nm-connection-editor + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_connection_editor_CPPFLAGS = \ + $(NMA_CFLAGS) \ + -DICONDIR=\""$(datadir)/icons"\" \ +@@ -60,7 +64,10 @@ nm_connection_editor_LDADD = \ + ${top_builddir}/src/wireless-security/libwireless-security.la \ + ${top_builddir}/src/utils/libutils.la \ + $(NMA_LIBS) \ +- $(POLKIT_LIBS) ++ $(POLKIT_LIBS) \ ++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la + + gladedir = $(datadir)/nm-applet + glade_DATA = \ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -23,8 +49,7 @@ noinst_LTLIBRARIES = libgconf-helpers.la libgconf_helpers_la_SOURCES = \ -@@ -13,6 +17,8 @@ libgconf_helpers_la_CPPFLAGS = \ - +@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \ libgconf_helpers_la_LIBADD = \ $(NMA_LIBS) \ ${top_builddir}/src/marshallers/libmarshallers.la \ @@ -33,9 +58,34 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-07-03 08:48:24.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -4,6 +4,10 @@ NULL= + + bin_PROGRAMS = nm-applet + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_applet_CPPFLAGS = \ + $(NMA_CFLAGS) \ + $(NOTIFY_CFLAGS) \ +@@ -57,7 +61,9 @@ nm_applet_LDADD = \ + ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/utils/libutils.la \ + ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +- ${top_builddir}/src/wireless-security/libwireless-security.la ++ ${top_builddir}/src/wireless-security/libwireless-security.la \ ++ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + + gladedir = $(datadir)/nm-applet + glade_DATA = applet.glade keyring.png diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2007-11-13 15:41:01.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2007-11-13 15:42:30.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -54,8 +104,8 @@ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2007-11-07 12:12:16.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -75,54 +125,3 @@ + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -2,6 +2,10 @@ - - bin_PROGRAMS = nm-connection-editor - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_connection_editor_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -59,7 +63,10 @@ - ${top_builddir}/src/wireless-security/libwireless-security.la \ - ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ -- $(POLKIT_LIBS) -+ $(POLKIT_LIBS) \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la - - gladedir = $(datadir)/nm-applet - glade_DATA = \ ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -4,6 +4,10 @@ NULL= - - bin_PROGRAMS = nm-applet - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_applet_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -58,7 +62,9 @@ nm_applet_LDADD = \ - $(NMA_LIBS) \ - ${top_builddir}/src/utils/libutils.la \ - ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -- ${top_builddir}/src/wireless-security/libwireless-security.la -+ ${top_builddir}/src/wireless-security/libwireless-security.la \ -+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - if WITH_NOTIFY - nm_applet_LDADD += $(NOTIFY_LIBS) - From fedora-extras-commits at redhat.com Fri Jul 18 16:26:37 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 18 Jul 2008 16:26:37 GMT Subject: rpms/perl-Class-MethodMaker/F-9 .cvsignore, 1.6, 1.7 perl-Class-MethodMaker.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200807181626.m6IGQbQn008474@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8312 Modified Files: .cvsignore perl-Class-MethodMaker.spec sources Log Message: * Fri Jul 18 2008 Ralf Cors??pius - 2.11-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Jan 2008 16:17:06 -0000 1.6 +++ .cvsignore 18 Jul 2008 16:25:38 -0000 1.7 @@ -1 +1 @@ -Class-MethodMaker-2.10.tar.gz +Class-MethodMaker-2.11.tar.gz Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9/perl-Class-MethodMaker.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Class-MethodMaker.spec 18 Jul 2008 12:15:30 -0000 1.14 +++ perl-Class-MethodMaker.spec 18 Jul 2008 16:25:38 -0000 1.15 @@ -1,6 +1,6 @@ Name: perl-Class-MethodMaker -Version: 2.10 -Release: 4%{?dist} +Version: 2.11 +Release: 1%{?dist} Summary: Perl module for creating generic object-oriented methods Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 18 2008 Ralf Cors??pius - 2.11-1 +- Upstream update. + * Fri Jul 18 2008 Ralf Cors??pius - 2.10-4 - Remove %%clean ||: (BZ 449442, FTBFS). - Use %%version in Source0-URL. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Jan 2008 16:17:06 -0000 1.6 +++ sources 18 Jul 2008 16:25:38 -0000 1.7 @@ -1 +1 @@ -97181580315dd9776eafae67827c909f Class-MethodMaker-2.10.tar.gz +61ed8327e50b99e574c5f5ce1a835d36 Class-MethodMaker-2.11.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 16:27:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:27:20 GMT Subject: rpms/fluidsynth/devel fluidsynth.spec,1.8,1.9 Message-ID: <200807181627.m6IGRKex008582@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fluidsynth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8455 Modified Files: fluidsynth.spec Log Message: fix license tag Index: fluidsynth.spec =================================================================== RCS file: /cvs/pkgs/rpms/fluidsynth/devel/fluidsynth.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fluidsynth.spec 8 Jul 2008 13:51:32 -0000 1.8 +++ fluidsynth.spec 18 Jul 2008 16:26:30 -0000 1.9 @@ -1,10 +1,10 @@ Summary: Real-time software synthesizer Name: fluidsynth Version: 1.0.8 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.fluidsynth.org/ Source0: http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz -License: LGPL +License: LGPLv2+ Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: fluidsynth-libs = %{version}-%{release} @@ -85,6 +85,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Jul 18 2008 Tom "spot" Callaway 1.0.8-2 +- fix license tag + * Tue Jul 08 2008 Anthony Green 1.0.8-1 - Upgrade source. From fedora-extras-commits at redhat.com Fri Jul 18 16:29:09 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 18 Jul 2008 16:29:09 GMT Subject: rpms/eclipse/devel eclipse.spec,1.539,1.540 Message-ID: <200807181629.m6IGT9EE008944@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8809 Modified Files: eclipse.spec Log Message: * Fri Jul 18 2008 Andrew Overholt 3.4.0-4 - Re-add missing BR on tomcat5-jasper-eclipse Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.539 retrieving revision 1.540 diff -u -r1.539 -r1.540 --- eclipse.spec 18 Jul 2008 15:51:29 -0000 1.539 +++ eclipse.spec 18 Jul 2008 16:28:23 -0000 1.540 @@ -143,6 +143,7 @@ BuildRequires: cairo >= 1.0 BuildRequires: unzip BuildRequires: icu4j-eclipse >= 3.8.1 +BuildRequires: tomcat5-jasper-eclipse >= 5.5.26-1.5 BuildRequires: desktop-file-utils BuildRequires: java-devel >= 1.6.0 BuildRequires: java-javadoc @@ -233,6 +234,7 @@ Requires: jakarta-commons-el >= 1.0-8jpp Requires: jakarta-commons-logging >= 1.0.4-6jpp.3 Requires: mx4j >= 2.1 +Requires: tomcat5-jasper-eclipse >= 5.5.26-1.5 Requires: jetty Requires: jsch >= 0.1.31 Requires: lucene >= 1.9.1 @@ -538,12 +540,6 @@ rm plugins/org.apache.jasper_*.jar ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_* \ plugins/org.apache.jasper_$JASPERVERSION -ls -l %{_datadir}/eclipse/plugins/org.apache.jasper_* -unzip -l %{_datadir}/eclipse/plugins/org.apache.jasper_* -unzip %{_datadir}/eclipse/plugins/org.apache.jasper_*.jar \ -META-INF/MANIFEST.MF -cat META-INF/MANIFEST.MF -exit 1 # link to servlet-api SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \ @@ -1343,6 +1339,7 @@ * Fri Jul 18 2008 Andrew Overholt 3.4.0-4 - Un-do crazy config.ini, bundles.info, etc. shuffling - Update patch for building native libraries +- Re-add missing BR on tomcat5-jasper-eclipse * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package From fedora-extras-commits at redhat.com Fri Jul 18 16:30:51 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 18 Jul 2008 16:30:51 GMT Subject: rpms/fs_mark/devel .cvsignore, 1.2, 1.3 fs_mark.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807181630.m6IGUpE4009291@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/fs_mark/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9146 Modified Files: .cvsignore fs_mark.spec sources Log Message: * Fri Jul 18 2008 Eric Sandeen 3.2-3 - Updated tarball from new sf.net home Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2008 04:09:42 -0000 1.2 +++ .cvsignore 18 Jul 2008 16:30:03 -0000 1.3 @@ -1 +1 @@ -fs_mark-3.2.tgz +fs_mark-3.2.tar.gz Index: fs_mark.spec =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/devel/fs_mark.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fs_mark.spec 19 Jun 2008 04:09:42 -0000 1.1 +++ fs_mark.spec 18 Jul 2008 16:30:03 -0000 1.2 @@ -1,12 +1,12 @@ Name: fs_mark Version: 3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Benchmark synchronous/async file creation Group: Applications/System License: GPLv2+ -URL: http://developer.osdl.org/dev/doubt/fs_mark -Source0: http://developer.osdl.org/dev/doubt/fs_mark/archive/%{name}-%{version}.tgz +URL: http://sourceforge.net/projects/fsmark/ +Source0: http://downloads.sourceforge.net/fsmark/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nostatic @@ -18,7 +18,7 @@ %prep -%setup -q -n fs_mark +%setup -q %patch0 -p1 %build @@ -40,6 +40,9 @@ %changelog +* Fri Jul 18 2008 Eric Sandeen 3.2-3 +- Updated tarball from new sf.net home + * Wed Jun 18 2008 Eric Sandeen 3.2-2 - Address review comments Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 04:09:42 -0000 1.2 +++ sources 18 Jul 2008 16:30:03 -0000 1.3 @@ -1 +1 @@ -d802070c6d6bcb106d1d88565a2ce50d fs_mark-3.2.tgz +340fc47d00a108754728cf2b6bd03895 fs_mark-3.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 16:35:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:35:26 +0000 Subject: [pkgdb] pyexiv2 was added for mcepl Message-ID: <200807181635.m6IGZQve003989@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package pyexiv2 with summary Python binding to exiv2 Kevin Fenzi (kevin) has approved Package pyexiv2 Kevin Fenzi (kevin) has added a Fedora devel branch for pyexiv2 with an owner of mcepl Kevin Fenzi (kevin) has approved pyexiv2 in Fedora devel Kevin Fenzi (kevin) has approved Package pyexiv2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyexiv2 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyexiv2 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyexiv2 (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on pyexiv2 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on pyexiv2 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on pyexiv2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyexiv2 From fedora-extras-commits at redhat.com Fri Jul 18 16:35:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:35:34 +0000 Subject: [pkgdb] pyexiv2 (Fedora, 8) updated by kevin Message-ID: <200807181635.m6IGZY5X004011@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for pyexiv2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyexiv2 (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyexiv2 (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyexiv2 (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on pyexiv2 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyexiv2 From fedora-extras-commits at redhat.com Fri Jul 18 16:35:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:35:34 +0000 Subject: [pkgdb] pyexiv2 (Fedora, devel) updated by kevin Message-ID: <200807181635.m6IGZY5a004011@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on pyexiv2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyexiv2 From fedora-extras-commits at redhat.com Fri Jul 18 16:35:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:35:34 +0000 Subject: [pkgdb] pyexiv2 (Fedora, 9) updated by kevin Message-ID: <200807181635.m6IGZY5d004011@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for pyexiv2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyexiv2 (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyexiv2 (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyexiv2 (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on pyexiv2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyexiv2 From fedora-extras-commits at redhat.com Fri Jul 18 16:37:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:37:35 GMT Subject: rpms/pyexiv2 - New directory Message-ID: <200807181637.m6IGbYUs010282@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyexiv2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10218/rpms/pyexiv2 Log Message: Directory /cvs/extras/rpms/pyexiv2 added to the repository From fedora-extras-commits at redhat.com Fri Jul 18 16:37:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:37:51 GMT Subject: rpms/pyexiv2/devel - New directory Message-ID: <200807181637.m6IGbpuR010346@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyexiv2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10218/rpms/pyexiv2/devel Log Message: Directory /cvs/extras/rpms/pyexiv2/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 18 16:38:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:38:08 GMT Subject: rpms/pyexiv2 Makefile,NONE,1.1 Message-ID: <200807181638.m6IGc8M0010410@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyexiv2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10218/rpms/pyexiv2 Added Files: Makefile Log Message: Setup of module pyexiv2 --- NEW FILE Makefile --- # Top level Makefile for module pyexiv2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 18 16:38:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:38:27 GMT Subject: rpms/pyexiv2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807181638.m6IGcR8U010489@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyexiv2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10218/rpms/pyexiv2/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pyexiv2 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pyexiv2 # $Id: Makefile,v 1.1 2008/07/18 16:38:08 kevin Exp $ NAME := pyexiv2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 18 16:39:19 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 16:39:19 GMT Subject: rpms/NetworkManager/devel NetworkManager.spec, 1.229, 1.230 serial-debug.patch, 1.1, 1.2 Message-ID: <200807181639.m6IGdJcZ010747@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10488 Modified Files: NetworkManager.spec serial-debug.patch Log Message: Remove fuzz from patches Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- NetworkManager.spec 18 Jul 2008 16:08:25 -0000 1.229 +++ NetworkManager.spec 18 Jul 2008 16:38:27 -0000 1.230 @@ -16,7 +16,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0 -Release: 0.10.%{snapshot}%{?dist}.1 +Release: 0.11.%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -293,7 +293,7 @@ %{_libdir}/libnm-util.so %changelog -* Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.10.svn3830 +* Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.11.svn3830 - Expose server-returned DHCP options via D-Bus - Use avahi-autoipd rather than old built-in IPv4LL implementation - Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) serial-debug.patch: Index: serial-debug.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/serial-debug.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- serial-debug.patch 17 Apr 2008 11:24:20 -0000 1.1 +++ serial-debug.patch 18 Jul 2008 16:38:27 -0000 1.2 @@ -1,9 +1,9 @@ -diff -up NetworkManager-0.7.0/src/nm-serial-device.c.foo NetworkManager-0.7.0/src/nm-serial-device.c ---- NetworkManager-0.7.0/src/nm-serial-device.c.foo 2008-04-10 12:51:43.000000000 -0400 -+++ NetworkManager-0.7.0/src/nm-serial-device.c 2008-04-10 12:51:49.000000000 -0400 -@@ -19,7 +19,7 @@ - #include "nm-setting-ppp.h" +diff -up NetworkManager-0.7.0/src/nm-serial-device.c.serial-debug NetworkManager-0.7.0/src/nm-serial-device.c +--- NetworkManager-0.7.0/src/nm-serial-device.c.serial-debug 2008-07-15 07:59:32.000000000 -0400 ++++ NetworkManager-0.7.0/src/nm-serial-device.c 2008-07-18 11:52:29.000000000 -0400 +@@ -21,7 +21,7 @@ #include "nm-utils.h" + #include "nm-serial-device-glue.h" -/* #define NM_DEBUG_SERIAL 1 */ +#define NM_DEBUG_SERIAL 1 From fedora-extras-commits at redhat.com Fri Jul 18 16:40:32 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 16:40:32 GMT Subject: rpms/NetworkManager/F-9 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.19, 1.20 NetworkManager.spec, 1.229, 1.230 serial-debug.patch, 1.1, 1.2 Message-ID: <200807181640.m6IGeWYb011001@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10859 Modified Files: NetworkManager-0.6.5-fixup-internal-applet-build.patch NetworkManager.spec serial-debug.patch Log Message: Remove fuzz from patches NetworkManager-0.6.5-fixup-internal-applet-build.patch: Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- NetworkManager-0.6.5-fixup-internal-applet-build.patch 18 Jul 2008 16:17:02 -0000 1.19 +++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 18 Jul 2008 16:39:42 -0000 1.20 @@ -1,7 +1,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac ---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -60,10 +60,6 @@ AC_C_BIGENDIAN +--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-06-17 13:51:13.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-07-18 11:52:29.000000000 -0400 +@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 glib-2.0 >= 2.10 @@ -11,10 +11,36 @@ - libnm_glib_vpn >= 0.7.0 gtk+-2.0 >= 2.10 libglade-2.0 - gconf-2.0 + gmodule-export-2.0 +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-07-03 07:08:55.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -2,6 +2,10 @@ NULL= + + bin_PROGRAMS = nm-connection-editor + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_connection_editor_CPPFLAGS = \ + $(NMA_CFLAGS) \ + -DICONDIR=\""$(datadir)/icons"\" \ +@@ -60,7 +64,10 @@ nm_connection_editor_LDADD = \ + ${top_builddir}/src/wireless-security/libwireless-security.la \ + ${top_builddir}/src/utils/libutils.la \ + $(NMA_LIBS) \ +- $(POLKIT_LIBS) ++ $(POLKIT_LIBS) \ ++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la + + gladedir = $(datadir)/nm-applet + glade_DATA = \ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -23,8 +49,7 @@ noinst_LTLIBRARIES = libgconf-helpers.la libgconf_helpers_la_SOURCES = \ -@@ -13,6 +17,8 @@ libgconf_helpers_la_CPPFLAGS = \ - +@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \ libgconf_helpers_la_LIBADD = \ $(NMA_LIBS) \ ${top_builddir}/src/marshallers/libmarshallers.la \ @@ -33,9 +58,34 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-07-03 08:48:24.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -4,6 +4,10 @@ NULL= + + bin_PROGRAMS = nm-applet + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_applet_CPPFLAGS = \ + $(NMA_CFLAGS) \ + $(NOTIFY_CFLAGS) \ +@@ -57,7 +61,9 @@ nm_applet_LDADD = \ + ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/utils/libutils.la \ + ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +- ${top_builddir}/src/wireless-security/libwireless-security.la ++ ${top_builddir}/src/wireless-security/libwireless-security.la \ ++ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + + gladedir = $(datadir)/nm-applet + glade_DATA = applet.glade keyring.png diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2007-11-13 15:41:01.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2007-11-13 15:42:30.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -54,8 +104,8 @@ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2007-11-07 12:12:16.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -75,54 +125,3 @@ + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -2,6 +2,10 @@ - - bin_PROGRAMS = nm-connection-editor - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_connection_editor_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -59,7 +63,10 @@ - ${top_builddir}/src/wireless-security/libwireless-security.la \ - ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ -- $(POLKIT_LIBS) -+ $(POLKIT_LIBS) \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la - - gladedir = $(datadir)/nm-applet - glade_DATA = \ ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -4,6 +4,10 @@ NULL= - - bin_PROGRAMS = nm-applet - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_applet_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -58,7 +62,9 @@ nm_applet_LDADD = \ - $(NMA_LIBS) \ - ${top_builddir}/src/utils/libutils.la \ - ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -- ${top_builddir}/src/wireless-security/libwireless-security.la -+ ${top_builddir}/src/wireless-security/libwireless-security.la \ -+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - if WITH_NOTIFY - nm_applet_LDADD += $(NOTIFY_LIBS) - Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- NetworkManager.spec 18 Jul 2008 16:17:02 -0000 1.229 +++ NetworkManager.spec 18 Jul 2008 16:39:42 -0000 1.230 @@ -16,7 +16,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0 -Release: 0.10.%{snapshot}%{?dist} +Release: 0.11.%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -298,7 +298,7 @@ %{_libdir}/libnm-util.so %changelog -* Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.10.svn3830 +* Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.11.svn3830 - Expose server-returned DHCP options via D-Bus - Use avahi-autoipd rather than old built-in IPv4LL implementation - Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) @@ -306,6 +306,7 @@ - Allow forcing 802.1x PEAP Label to '0' - Make connection sharing more robust - Show status for shared and Ad-Hoc connections if no other connection is active +- Revert fix for (rh #351101) since it breaks multi-lib * Fri Jul 11 2008 Matthias Clasen - 1:0.7.0-0.10.svn3801 - Drop explicit hal dep in -gnome serial-debug.patch: Index: serial-debug.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/serial-debug.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- serial-debug.patch 17 Apr 2008 11:24:20 -0000 1.1 +++ serial-debug.patch 18 Jul 2008 16:39:42 -0000 1.2 @@ -1,9 +1,9 @@ -diff -up NetworkManager-0.7.0/src/nm-serial-device.c.foo NetworkManager-0.7.0/src/nm-serial-device.c ---- NetworkManager-0.7.0/src/nm-serial-device.c.foo 2008-04-10 12:51:43.000000000 -0400 -+++ NetworkManager-0.7.0/src/nm-serial-device.c 2008-04-10 12:51:49.000000000 -0400 -@@ -19,7 +19,7 @@ - #include "nm-setting-ppp.h" +diff -up NetworkManager-0.7.0/src/nm-serial-device.c.serial-debug NetworkManager-0.7.0/src/nm-serial-device.c +--- NetworkManager-0.7.0/src/nm-serial-device.c.serial-debug 2008-07-15 07:59:32.000000000 -0400 ++++ NetworkManager-0.7.0/src/nm-serial-device.c 2008-07-18 11:52:29.000000000 -0400 +@@ -21,7 +21,7 @@ #include "nm-utils.h" + #include "nm-serial-device-glue.h" -/* #define NM_DEBUG_SERIAL 1 */ +#define NM_DEBUG_SERIAL 1 From fedora-extras-commits at redhat.com Fri Jul 18 16:40:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:40:49 +0000 Subject: [pkgdb] ruby-taglib was added for mtasaka Message-ID: <200807181640.m6IGenC3004396@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ruby-taglib with summary Ruby library wrapping the Taglib library Kevin Fenzi (kevin) has approved Package ruby-taglib Kevin Fenzi (kevin) has added a Fedora devel branch for ruby-taglib with an owner of mtasaka Kevin Fenzi (kevin) has approved ruby-taglib in Fedora devel Kevin Fenzi (kevin) has approved Package ruby-taglib Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ruby-taglib (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ruby-taglib (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ruby-taglib (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on ruby-taglib (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on ruby-taglib (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on ruby-taglib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ruby-taglib From fedora-extras-commits at redhat.com Fri Jul 18 16:40:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:40:51 +0000 Subject: [pkgdb] ruby-taglib (Fedora, 8) updated by kevin Message-ID: <200807181640.m6IGepZ2004420@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ruby-taglib Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ruby-taglib (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ruby-taglib (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ruby-taglib (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ruby-taglib (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ruby-taglib From fedora-extras-commits at redhat.com Fri Jul 18 16:40:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:40:51 +0000 Subject: [pkgdb] ruby-taglib (Fedora, 9) updated by kevin Message-ID: <200807181640.m6IGepZ5004420@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for ruby-taglib Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ruby-taglib (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ruby-taglib (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ruby-taglib (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on ruby-taglib (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ruby-taglib From fedora-extras-commits at redhat.com Fri Jul 18 16:40:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 16:40:51 +0000 Subject: [pkgdb] ruby-taglib (Fedora, devel) updated by kevin Message-ID: <200807181640.m6IGepZ8004420@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ruby-taglib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ruby-taglib From fedora-extras-commits at redhat.com Fri Jul 18 16:43:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:43:37 GMT Subject: rpms/ruby-taglib - New directory Message-ID: <200807181643.m6IGhbRp011569@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ruby-taglib In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy11483/rpms/ruby-taglib Log Message: Directory /cvs/extras/rpms/ruby-taglib added to the repository From fedora-extras-commits at redhat.com Fri Jul 18 16:43:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:43:50 GMT Subject: rpms/ruby-taglib/devel - New directory Message-ID: <200807181643.m6IGhoJ9011605@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ruby-taglib/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy11483/rpms/ruby-taglib/devel Log Message: Directory /cvs/extras/rpms/ruby-taglib/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 18 16:44:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:44:04 GMT Subject: rpms/ruby-taglib Makefile,NONE,1.1 Message-ID: <200807181644.m6IGi4am011664@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ruby-taglib In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy11483/rpms/ruby-taglib Added Files: Makefile Log Message: Setup of module ruby-taglib --- NEW FILE Makefile --- # Top level Makefile for module ruby-taglib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 18 16:44:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 18 Jul 2008 16:44:24 GMT Subject: rpms/ruby-taglib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807181644.m6IGiOLW011722@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ruby-taglib/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy11483/rpms/ruby-taglib/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ruby-taglib --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ruby-taglib # $Id: Makefile,v 1.1 2008/07/18 16:44:04 kevin Exp $ NAME := ruby-taglib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 18 16:46:59 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 18 Jul 2008 16:46:59 GMT Subject: rpms/fs_mark/F-9 fs_mark.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807181647.m6IGkxuK012011@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/fs_mark/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11959 Modified Files: fs_mark.spec sources Log Message: * Fri Jul 18 2008 Eric Sandeen 3.2-3 - Updated tarball from new sf.net home Index: fs_mark.spec =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/F-9/fs_mark.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fs_mark.spec 19 Jun 2008 04:17:24 -0000 1.1 +++ fs_mark.spec 18 Jul 2008 16:46:11 -0000 1.2 @@ -1,12 +1,12 @@ Name: fs_mark Version: 3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Benchmark synchronous/async file creation Group: Applications/System License: GPLv2+ -URL: http://developer.osdl.org/dev/doubt/fs_mark -Source0: http://developer.osdl.org/dev/doubt/fs_mark/archive/%{name}-%{version}.tgz +URL: http://sourceforge.net/projects/fsmark/ +Source0: http://downloads.sourceforge.net/fsmark/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nostatic @@ -18,7 +18,7 @@ %prep -%setup -q -n fs_mark +%setup -q %patch0 -p1 %build @@ -40,6 +40,9 @@ %changelog +* Fri Jul 18 2008 Eric Sandeen 3.2-3 +- Updated tarball from new sf.net home + * Wed Jun 18 2008 Eric Sandeen 3.2-2 - Address review comments Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2008 04:17:24 -0000 1.2 +++ sources 18 Jul 2008 16:46:11 -0000 1.3 @@ -1 +1 @@ -d802070c6d6bcb106d1d88565a2ce50d fs_mark-3.2.tgz +340fc47d00a108754728cf2b6bd03895 fs_mark-3.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 16:47:57 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 18 Jul 2008 16:47:57 GMT Subject: rpms/eclipse/devel eclipse-ecj-gcj.patch, 1.9, 1.10 eclipse.spec, 1.540, 1.541 Message-ID: <200807181647.m6IGlv38012112@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12064 Modified Files: eclipse-ecj-gcj.patch eclipse.spec Log Message: * Fri Jul 18 2008 Andrew Overholt 3.4.0-4 - Re-add updated use-ecj-for-gcj patch eclipse-ecj-gcj.patch: Index: eclipse-ecj-gcj.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-ecj-gcj.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- eclipse-ecj-gcj.patch 31 Jul 2007 23:02:58 -0000 1.9 +++ eclipse-ecj-gcj.patch 18 Jul 2008 16:47:12 -0000 1.10 @@ -5,10 +5,10 @@ diff -u -r1.546.2.23 messages.properties --- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 8 Feb 2007 15:04:43 -0000 1.546.2.23 +++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 26 Feb 2007 18:21:06 -0000 -@@ -249,3 +249,8 @@ - template.restrictedAccess.constructor = The constructor {0} is not accessible due to restriction on classpath entry {1} - template.restrictedAccess.field = The field {0} from the type {1} is not accessible due to restriction on classpath entry {2} - template.restrictedAccess.method = The method {0} from the type {1} is not accessible due to restriction on classpath entry {2} +@@ -298,3 +298,8 @@ misc.usage.warn = {1} {2}\n\ + \ \n\ + \ Advanced options:\n\ + \ -? -help print the help message\n + +# GCCMain messages. +gcc.zipArg=-fzip-target requires argument Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.540 retrieving revision 1.541 diff -u -r1.540 -r1.541 --- eclipse.spec 18 Jul 2008 16:28:23 -0000 1.540 +++ eclipse.spec 18 Jul 2008 16:47:12 -0000 1.541 @@ -89,7 +89,7 @@ # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html Patch15: %{name}-pde.build-add-package-build.patch # Use ecj for gcj -#Patch17: %{name}-ecj-gcj.patch +Patch17: %{name}-ecj-gcj.patch #Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch #Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch #Patch30: %{name}-addfragmentsforotherplatforms.patch @@ -309,10 +309,9 @@ %patch4 -p0 popd -## FIXME: update -#pushd plugins/org.eclipse.jdt.core -#%patch17 -p0 -#popd +pushd plugins/org.eclipse.jdt.core +%patch17 -p0 +popd # liblocalfile fixes sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile @@ -1340,6 +1339,7 @@ - Un-do crazy config.ini, bundles.info, etc. shuffling - Update patch for building native libraries - Re-add missing BR on tomcat5-jasper-eclipse +- Re-add updated use-ecj-for-gcj patch * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package From fedora-extras-commits at redhat.com Fri Jul 18 16:53:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:53:01 GMT Subject: rpms/fluidsynth-dssi/devel fluidsynth-dssi.spec,1.5,1.6 Message-ID: <200807181653.m6IGr1R9012446@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fluidsynth-dssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12348 Modified Files: fluidsynth-dssi.spec Log Message: fix license tag Index: fluidsynth-dssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/fluidsynth-dssi/devel/fluidsynth-dssi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fluidsynth-dssi.spec 19 Feb 2008 04:06:53 -0000 1.5 +++ fluidsynth-dssi.spec 18 Jul 2008 16:52:13 -0000 1.6 @@ -1,8 +1,8 @@ Summary: DSSI implementation of Fluidsynth Name: fluidsynth-dssi Version: 0.9.1 -Release: 8%{?dist} -License: GPL +Release: 9%{?dist} +License: GPLv2+ Group: Applications/Multimedia URL: http://dssi.sourceforge.net/download.html#FluidSynth-DSSI Source0: http://download.sf.net/dssi/fluidsynth-dssi-0.9.1.tar.gz @@ -40,6 +40,9 @@ %{_libdir}/dssi/fluidsynth-dssi* %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.9.1-9 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.9.1-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 16:53:12 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Fri, 18 Jul 2008 16:53:12 GMT Subject: rpms/kernel/F-8 linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch, NONE, 1.1 kernel.spec, 1.495, 1.496 Message-ID: <200807181653.m6IGrCJZ012502@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12368 Modified Files: kernel.spec Added Files: linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch Log Message: * Fri Jul 18 2008 Chuck Ebbert 2.6.25.11-56 - Add "show backtrace on all CPUs" (SysRq-l). linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch: --- NEW FILE linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch --- From: Linux Kernel Mailing List To: git-commits-head at vger.kernel.org Subject: sysrq: add show-backtrace-on-all-cpus function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Git-Commit: 5045bcae0fb466a1dbb6af0036e56901fd7aafb7 X-Git-Parent: 6e574195b75543bc6a6240306313988b1952470c X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.3 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org Sender: git-commits-head-owner at vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git-commits-head at vger.kernel.org X-RedHat-Spam-Score: -3.865 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32 Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5045bcae0fb466a1dbb6af0036e56901fd7aafb7 Commit: 5045bcae0fb466a1dbb6af0036e56901fd7aafb7 Parent: 6e574195b75543bc6a6240306313988b1952470c Author: Rik van Riel AuthorDate: Tue Apr 29 00:59:21 2008 -0700 Committer: Linus Torvalds CommitDate: Tue Apr 29 08:06:03 2008 -0700 sysrq: add show-backtrace-on-all-cpus function SysRQ-P is not always useful on SMP systems, since it usually ends up showing the backtrace of a CPU that is doing just fine, instead of the backtrace of the CPU that is having problems. This patch adds SysRQ show-all-cpus(L), which shows the backtrace of every active CPU in the system. It skips idle CPUs because some SMP systems are just too large and we already know what the backtrace of the idle task looks like. [akpm at linux-foundation.org: coding-style fixes] Signed-off-by: Rik van Riel Randy Dunlap Cc: Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Documentation/sysrq.txt | 2 ++ drivers/char/sysrq.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index 10c8f69..5ce0952 100644 --- a/Documentation/sysrq.txt +++ b/Documentation/sysrq.txt @@ -85,6 +85,8 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 'k' - Secure Access Key (SAK) Kills all programs on the current virtual console. NOTE: See important comments below in SAK section. +'l' - Shows a stack backtrace for all active CPUs. + 'm' - Will dump current memory info to your console. 'n' - Used to make RT tasks nice-able diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 1ade193..9e9bad8 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -196,6 +196,48 @@ static struct sysrq_key_op sysrq_showlocks_op = { #define sysrq_showlocks_op (*(struct sysrq_key_op *)0) #endif +#ifdef CONFIG_SMP +static DEFINE_SPINLOCK(show_lock); + +static void showacpu(void *dummy) +{ + unsigned long flags; + + /* Idle CPUs have no interesting backtrace. */ + if (idle_cpu(smp_processor_id())) + return; + + spin_lock_irqsave(&show_lock, flags); + printk(KERN_INFO "CPU%d:\n", smp_processor_id()); + show_stack(NULL, NULL); + spin_unlock_irqrestore(&show_lock, flags); +} + +static void sysrq_showregs_othercpus(struct work_struct *dummy) +{ + smp_call_function(showacpu, NULL, 0, 0); +} + +static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus); + +static void sysrq_handle_showallcpus(int key, struct tty_struct *tty) +{ + struct pt_regs *regs = get_irq_regs(); + if (regs) { + printk(KERN_INFO "CPU%d:\n", smp_processor_id()); + show_regs(regs); + } + schedule_work(&sysrq_showallcpus); +} + +static struct sysrq_key_op sysrq_showallcpus_op = { + .handler = sysrq_handle_showallcpus, + .help_msg = "aLlcpus", + .action_msg = "Show backtrace of all active CPUs", + .enable_mask = SYSRQ_ENABLE_DUMP, +}; +#endif + static void sysrq_handle_showregs(int key, struct tty_struct *tty) { struct pt_regs *regs = get_irq_regs(); @@ -340,7 +382,11 @@ static struct sysrq_key_op *sysrq_key_table[36] = { &sysrq_kill_op, /* i */ NULL, /* j */ &sysrq_SAK_op, /* k */ +#ifdef CONFIG_SMP + &sysrq_showallcpus_op, /* l */ +#else NULL, /* l */ +#endif &sysrq_showmem_op, /* m */ &sysrq_unrt_op, /* n */ /* o: This will often be registered as 'Off' at init time */ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.495 retrieving revision 1.496 diff -u -r1.495 -r1.496 --- kernel.spec 16 Jul 2008 15:59:42 -0000 1.495 +++ kernel.spec 18 Jul 2008 16:52:22 -0000 1.496 @@ -634,6 +634,7 @@ Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch Patch570: linux-2.6-selinux-mprotect-checks.patch +Patch580: linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch Patch600: linux-2.6-vm-silence-atomic-alloc-failures.patch Patch610: linux-2.6-defaults-fat-utf8.patch @@ -1139,6 +1140,9 @@ # Fix the SELinux mprotect checks on executable mappings ApplyPatch linux-2.6-selinux-mprotect-checks.patch +# add "show backtrace on all cpus" (sysrq-l) +ApplyPatch linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch + # # VM related fixes. # @@ -1836,6 +1840,9 @@ %changelog +* Fri Jul 18 2008 Chuck Ebbert 2.6.25.11-56 +- Add "show backtrace on all CPUs" (SysRq-l). + * Mon Jul 14 2008 Kyle McMartin - Disable CONFIG_ACPI_SYSFS_POWER, which still seems to be confusing hal. From fedora-extras-commits at redhat.com Fri Jul 18 16:55:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:55:40 GMT Subject: rpms/fluxstyle/devel fluxstyle.spec,1.3,1.4 Message-ID: <200807181655.m6IGteQG012703@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fluxstyle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12612 Modified Files: fluxstyle.spec Log Message: fix license tag Index: fluxstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/fluxstyle/devel/fluxstyle.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fluxstyle.spec 9 Dec 2006 15:13:42 -0000 1.3 +++ fluxstyle.spec 18 Jul 2008 16:54:54 -0000 1.4 @@ -2,11 +2,11 @@ Name: fluxstyle Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A graphical style manager for Fluxbox Group: User Interface/X -License: GPL +License: GPLv2 URL: http://fluxstyle.berlios.de Source0: http://errr-online.com/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: fluxstyle.desktop @@ -75,6 +75,9 @@ %{_datadir}/icons/hicolor/48x48/apps/fluxmetal.png %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.0.1-3 +- fix license tag + * Sat Dec 09 2006 Michael Rice - 1.0.1-2 - Add BR of python-devel From fedora-extras-commits at redhat.com Fri Jul 18 16:58:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 16:58:24 GMT Subject: rpms/fonts-ISO8859-2/devel fonts-ISO8859-2.spec,1.15,1.16 Message-ID: <200807181658.m6IGwO4q012857@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fonts-ISO8859-2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12819 Modified Files: fonts-ISO8859-2.spec Log Message: fix license tag Index: fonts-ISO8859-2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fonts-ISO8859-2/devel/fonts-ISO8859-2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fonts-ISO8859-2.spec 21 Aug 2007 11:55:50 -0000 1.15 +++ fonts-ISO8859-2.spec 18 Jul 2008 16:57:38 -0000 1.16 @@ -9,8 +9,8 @@ Name: fonts-%{ISONAME} Version: 1.0 -Release: 18%{?dist} -License: Freely redistributable without restrictions +Release: 19%{?dist} +License: MIT Source: http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz %if %{include_ulT1mo} Source1: http://www.intersoft.cz/linux/fonts/ulT1mo-beta-1.0.tar.gz @@ -175,6 +175,9 @@ %endif %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 1.0-19 +- fix license tag + * Tue Aug 21 2007 Rahul Bhalerao - 1.0-18.fc8 - Dropping chkfontpath dependency (bug #251026, by Matthias Clasen) - Spec cleanup From fedora-extras-commits at redhat.com Fri Jul 18 16:59:04 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 16:59:04 GMT Subject: rpms/NetworkManager/devel NetworkManager.spec,1.230,1.231 Message-ID: <200807181659.m6IGx4dT012953@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12850 Modified Files: NetworkManager.spec Log Message: Add temporary dhclient buildrequires Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- NetworkManager.spec 18 Jul 2008 16:38:27 -0000 1.230 +++ NetworkManager.spec 18 Jul 2008 16:58:03 -0000 1.231 @@ -68,6 +68,7 @@ BuildRequires: ppp-devel >= %{ppp_version} BuildRequires: nss-devel >= 3.11.7 BuildRequires: PolicyKit-devel PolicyKit-gnome-devel +BuildRequires: dhclient %description NetworkManager attempts to keep an active network connection available at all From fedora-extras-commits at redhat.com Fri Jul 18 17:03:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 17:03:32 GMT Subject: rpms/fonts-hebrew-fancy/devel fonts-hebrew-fancy.spec,1.4,1.5 Message-ID: <200807181703.m6IH3WXj019891@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19792 Modified Files: fonts-hebrew-fancy.spec Log Message: fix license tag Index: fonts-hebrew-fancy.spec =================================================================== RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/devel/fonts-hebrew-fancy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fonts-hebrew-fancy.spec 13 Jun 2008 19:22:06 -0000 1.4 +++ fonts-hebrew-fancy.spec 18 Jul 2008 17:02:44 -0000 1.5 @@ -2,8 +2,8 @@ Name: fonts-hebrew-fancy Version: 0.20051122 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2 Source0: http://culmus.sourceforge.net/fancy/comix.tar.gz Source1: http://culmus.sourceforge.net/fancy/dorian.tar.gz Source2: http://culmus.sourceforge.net/fancy/gan.tar.gz @@ -68,6 +68,9 @@ %ghost %verify(not md5 size mtime) %{_datadir}/fonts/hebrew-fancy/fonts.cache-2 %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.20051122-4 +- fix license tag + * Fri Jun 13 2008 Jon Stanley - 0.20051122-3 - Rebuild From fedora-extras-commits at redhat.com Fri Jul 18 17:04:49 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 18 Jul 2008 17:04:49 GMT Subject: rpms/fs_mark/EL-5 .cvsignore, 1.1, 1.2 fs_mark.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807181704.m6IH4ntH020064@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/fs_mark/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19983 Modified Files: .cvsignore fs_mark.spec sources Log Message: * Fri Jul 18 2008 Eric Sandeen 3.2-3 - Updated tarball from new sf.net home Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jun 2008 00:45:31 -0000 1.1 +++ .cvsignore 18 Jul 2008 17:03:59 -0000 1.2 @@ -0,0 +1 @@ +fs_mark-3.2.tar.gz Index: fs_mark.spec =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/EL-5/fs_mark.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fs_mark.spec 11 Jul 2008 20:32:08 -0000 1.1 +++ fs_mark.spec 18 Jul 2008 17:03:59 -0000 1.2 @@ -1,12 +1,12 @@ Name: fs_mark Version: 3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Benchmark synchronous/async file creation Group: Applications/System License: GPLv2+ -URL: http://developer.osdl.org/dev/doubt/fs_mark -Source0: http://developer.osdl.org/dev/doubt/fs_mark/archive/%{name}-%{version}.tgz +URL: http://sourceforge.net/projects/fsmark/ +Source0: http://downloads.sourceforge.net/fsmark/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nostatic @@ -18,7 +18,7 @@ %prep -%setup -q -n fs_mark +%setup -q %patch0 -p1 %build @@ -40,6 +40,9 @@ %changelog +* Fri Jul 18 2008 Eric Sandeen 3.2-3 +- Updated tarball from new sf.net home + * Wed Jun 18 2008 Eric Sandeen 3.2-2 - Address review comments Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fs_mark/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jul 2008 20:32:08 -0000 1.2 +++ sources 18 Jul 2008 17:03:59 -0000 1.3 @@ -1 +1 @@ -d802070c6d6bcb106d1d88565a2ce50d fs_mark-3.2.tgz +340fc47d00a108754728cf2b6bd03895 fs_mark-3.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 17:05:59 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 18 Jul 2008 17:05:59 GMT Subject: rpms/gv/devel gv-3.6.5-pkgdatadir.patch, NONE, 1.1 gv.spec, 1.15, 1.16 gv-3.6.1-pkglibdir.patch, 1.1, NONE Message-ID: <200807181705.m6IH5xGt020164@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/gv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20082 Modified Files: gv.spec Added Files: gv-3.6.5-pkgdatadir.patch Removed Files: gv-3.6.1-pkglibdir.patch Log Message: * Thu Jul 18 2008 Orion Poplawski 3.6.5-2 - Change install dir patch to be more palatable for upstream gv-3.6.5-pkgdatadir.patch: --- NEW FILE gv-3.6.5-pkgdatadir.patch --- --- gv-3.6.5/src/Makefile.am.pkgdatadir 2008-06-22 04:57:35.000000000 -0600 +++ gv-3.6.5/src/Makefile.am 2008-07-18 10:22:22.000000000 -0600 @@ -6,9 +6,9 @@ # File distribution bin_PROGRAMS = gv -dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat +dist_pkgdata_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat -appdefaultsdir = $(pkglibdir) +appdefaultsdir = $(pkgdatadir) appdefaults_DATA = GV @@ -30,7 +30,7 @@ $(srcdir)/gv_intern_res_unix.dat # Compilation flags -AM_CPPFLAGS = -DNON_BLOCKING_IO -DGV_CODE -DGV_CODE -DGV_LIBDIR=\"$(pkglibdir)\" \ +AM_CPPFLAGS = -DNON_BLOCKING_IO -DGV_CODE -DGV_CODE -DGV_LIBDIR=\"$(pkgdatadir)\" \ -I$(top_srcdir)/lib -I$(top_builddir)/lib -g Index: gv.spec =================================================================== RCS file: /cvs/pkgs/rpms/gv/devel/gv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gv.spec 18 Jul 2008 15:46:06 -0000 1.15 +++ gv.spec 18 Jul 2008 17:05:09 -0000 1.16 @@ -1,16 +1,19 @@ Summary: A X front-end for the Ghostscript PostScript(TM) interpreter Name: gv Version: 3.6.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Publishing Requires: ghostscript URL: http://www.gnu.org/software/gv/ Source0: ftp://ftp.gnu.org/gnu/gv/gv-%{version}.tar.gz Patch0: gv-3.5.8-buffer.patch -Patch1: gv-3.6.1-pkglibdir.patch +#Install data files in %{_datadir} not %{_libdir} +#Sent upstream to bug-gv at gnu.org 20080718 +Patch1: gv-3.6.5-pkgdatadir.patch BuildRequires: /usr/bin/makeinfo BuildRequires: Xaw3d-devel, /usr/bin/desktop-file-install +BuildRequires: automake BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info, /usr/bin/update-mime-database Requires(post): /usr/bin/update-desktop-database @@ -27,10 +30,11 @@ %prep %setup -q %patch0 -p1 -b .buffer -%patch1 -p1 -b .pkglibdir +%patch1 -p1 -b .pkgdatadir %build +autoreconf %configure make %{?_smp_mflags} @@ -100,6 +104,9 @@ %{_mandir}/man1/gv.* %changelog +* Thu Jul 18 2008 Orion Poplawski 3.6.5-2 +- Change install dir patch to be more palatable for upstream + * Thu Jul 17 2008 Orion Poplawski 3.6.5-1 - Update to 3.6.5 --- gv-3.6.1-pkglibdir.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 17:14:20 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 18 Jul 2008 17:14:20 GMT Subject: rpms/ruby-taglib/F-9 ruby-taglib-1.1-debian-10_so-name.dpatch, NONE, 1.1 ruby-taglib-1.1-debian-20_tag-undefined.dpatch, NONE, 1.1 ruby-taglib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181714.m6IHEKHT020676@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-taglib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20596/F-9 Modified Files: .cvsignore sources Added Files: ruby-taglib-1.1-debian-10_so-name.dpatch ruby-taglib-1.1-debian-20_tag-undefined.dpatch ruby-taglib.spec Log Message: go ruby-taglib on Fedora --- NEW FILE ruby-taglib-1.1-debian-10_so-name.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 10_so-name.dpatch by Romain Francoise ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix so name in taglib.rb. @DPATCH@ diff -urNad ruby-taglib-1.1~/lib/taglib.rb ruby-taglib-1.1/lib/taglib.rb --- ruby-taglib-1.1~/lib/taglib.rb 2006-05-09 16:39:37.000000000 +0200 +++ ruby-taglib-1.1/lib/taglib.rb 2006-10-08 16:18:10.000000000 +0200 @@ -40,7 +40,7 @@ extend DL::Importable begin - dlload 'libtag_c.so' + dlload 'libtag_c.so.0' rescue begin dlload 'libtag_c.dylib' --- NEW FILE ruby-taglib-1.1-debian-20_tag-undefined.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 20_tag-undefined.dpatch by Lucas Nussbaum ## ## Initialize @tag and @audio to avoid a warning with ruby -w. ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad trunk~/lib/taglib.rb trunk/lib/taglib.rb --- trunk~/lib/taglib.rb 2006-05-09 16:39:37.000000000 +0200 +++ trunk/lib/taglib.rb 2008-01-21 07:12:40.000000000 +0100 @@ -104,6 +104,9 @@ raise BadPath.new end + @tag = nil + @audio = nil + if MAHORO_PRESENT mahoro = Mahoro.new mahoro.flags = Mahoro::NONE --- NEW FILE ruby-taglib.spec --- %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 Name: ruby-taglib Version: 1.1 Release: 1%{?dist} Summary: Ruby library wrapping the Taglib library Group: Development/Languages License: MIT URL: http://www.hakubi.us/ruby-taglib/ Source0: http://www.hakubi.us/ruby-taglib/%{name}-%{version}.tar.bz2 # Patch from debian Patch0: ruby-taglib-1.1-debian-10_so-name.dpatch Patch1: ruby-taglib-1.1-debian-20_tag-undefined.dpatch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: ruby BuildRequires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi} Requires: ruby Requires: taglib Provides: ruby(taglib) = %{version}-%{release} %description ruby-taglib is a simple dl-based wrapper of Taglib's C library. It's short and sweet, because the C API is written by someone who knows how to use OO programming, and Ruby with dl just makes it all too easy to wrap such a library. %prep %setup -q %patch0 -p1 -b .soname %patch1 -p1 -b .warn %build ruby setup.rb config \ --prefix=%{_prefix} \ --siterubyver=%{ruby_sitelib} ruby setup.rb setup %install %{__rm} -rf $RPM_BUILD_ROOT ruby setup.rb install \ --prefix=$RPM_BUILD_ROOT %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{ruby_sitelib}/taglib.rb %changelog * Thu Jul 3 2008 Mamoru Tasaka - 1.1-1 - Initial packaging - Two patches from debian applied Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-taglib/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2008 16:44:04 -0000 1.1 +++ .cvsignore 18 Jul 2008 17:13:36 -0000 1.2 @@ -0,0 +1 @@ +ruby-taglib-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-taglib/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2008 16:44:04 -0000 1.1 +++ sources 18 Jul 2008 17:13:36 -0000 1.2 @@ -0,0 +1 @@ +462d2717c912251b6d9693e0ac40c08f ruby-taglib-1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 17:14:36 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 18 Jul 2008 17:14:36 GMT Subject: rpms/ruby-taglib/F-8 ruby-taglib-1.1-debian-10_so-name.dpatch, NONE, 1.1 ruby-taglib-1.1-debian-20_tag-undefined.dpatch, NONE, 1.1 ruby-taglib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181714.m6IHEaEt020691@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-taglib/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20596/F-8 Modified Files: .cvsignore sources Added Files: ruby-taglib-1.1-debian-10_so-name.dpatch ruby-taglib-1.1-debian-20_tag-undefined.dpatch ruby-taglib.spec Log Message: go ruby-taglib on Fedora --- NEW FILE ruby-taglib-1.1-debian-10_so-name.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 10_so-name.dpatch by Romain Francoise ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix so name in taglib.rb. @DPATCH@ diff -urNad ruby-taglib-1.1~/lib/taglib.rb ruby-taglib-1.1/lib/taglib.rb --- ruby-taglib-1.1~/lib/taglib.rb 2006-05-09 16:39:37.000000000 +0200 +++ ruby-taglib-1.1/lib/taglib.rb 2006-10-08 16:18:10.000000000 +0200 @@ -40,7 +40,7 @@ extend DL::Importable begin - dlload 'libtag_c.so' + dlload 'libtag_c.so.0' rescue begin dlload 'libtag_c.dylib' --- NEW FILE ruby-taglib-1.1-debian-20_tag-undefined.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 20_tag-undefined.dpatch by Lucas Nussbaum ## ## Initialize @tag and @audio to avoid a warning with ruby -w. ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad trunk~/lib/taglib.rb trunk/lib/taglib.rb --- trunk~/lib/taglib.rb 2006-05-09 16:39:37.000000000 +0200 +++ trunk/lib/taglib.rb 2008-01-21 07:12:40.000000000 +0100 @@ -104,6 +104,9 @@ raise BadPath.new end + @tag = nil + @audio = nil + if MAHORO_PRESENT mahoro = Mahoro.new mahoro.flags = Mahoro::NONE --- NEW FILE ruby-taglib.spec --- %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 Name: ruby-taglib Version: 1.1 Release: 1%{?dist} Summary: Ruby library wrapping the Taglib library Group: Development/Languages License: MIT URL: http://www.hakubi.us/ruby-taglib/ Source0: http://www.hakubi.us/ruby-taglib/%{name}-%{version}.tar.bz2 # Patch from debian Patch0: ruby-taglib-1.1-debian-10_so-name.dpatch Patch1: ruby-taglib-1.1-debian-20_tag-undefined.dpatch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: ruby BuildRequires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi} Requires: ruby Requires: taglib Provides: ruby(taglib) = %{version}-%{release} %description ruby-taglib is a simple dl-based wrapper of Taglib's C library. It's short and sweet, because the C API is written by someone who knows how to use OO programming, and Ruby with dl just makes it all too easy to wrap such a library. %prep %setup -q %patch0 -p1 -b .soname %patch1 -p1 -b .warn %build ruby setup.rb config \ --prefix=%{_prefix} \ --siterubyver=%{ruby_sitelib} ruby setup.rb setup %install %{__rm} -rf $RPM_BUILD_ROOT ruby setup.rb install \ --prefix=$RPM_BUILD_ROOT %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{ruby_sitelib}/taglib.rb %changelog * Thu Jul 3 2008 Mamoru Tasaka - 1.1-1 - Initial packaging - Two patches from debian applied Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-taglib/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2008 16:44:04 -0000 1.1 +++ .cvsignore 18 Jul 2008 17:13:22 -0000 1.2 @@ -0,0 +1 @@ +ruby-taglib-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-taglib/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2008 16:44:04 -0000 1.1 +++ sources 18 Jul 2008 17:13:22 -0000 1.2 @@ -0,0 +1 @@ +462d2717c912251b6d9693e0ac40c08f ruby-taglib-1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 17:14:37 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 18 Jul 2008 17:14:37 GMT Subject: rpms/ruby-taglib/devel ruby-taglib-1.1-debian-10_so-name.dpatch, NONE, 1.1 ruby-taglib-1.1-debian-20_tag-undefined.dpatch, NONE, 1.1 ruby-taglib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181714.m6IHEbQM020695@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-taglib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20596/devel Modified Files: .cvsignore sources Added Files: ruby-taglib-1.1-debian-10_so-name.dpatch ruby-taglib-1.1-debian-20_tag-undefined.dpatch ruby-taglib.spec Log Message: go ruby-taglib on Fedora --- NEW FILE ruby-taglib-1.1-debian-10_so-name.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 10_so-name.dpatch by Romain Francoise ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix so name in taglib.rb. @DPATCH@ diff -urNad ruby-taglib-1.1~/lib/taglib.rb ruby-taglib-1.1/lib/taglib.rb --- ruby-taglib-1.1~/lib/taglib.rb 2006-05-09 16:39:37.000000000 +0200 +++ ruby-taglib-1.1/lib/taglib.rb 2006-10-08 16:18:10.000000000 +0200 @@ -40,7 +40,7 @@ extend DL::Importable begin - dlload 'libtag_c.so' + dlload 'libtag_c.so.0' rescue begin dlload 'libtag_c.dylib' --- NEW FILE ruby-taglib-1.1-debian-20_tag-undefined.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 20_tag-undefined.dpatch by Lucas Nussbaum ## ## Initialize @tag and @audio to avoid a warning with ruby -w. ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad trunk~/lib/taglib.rb trunk/lib/taglib.rb --- trunk~/lib/taglib.rb 2006-05-09 16:39:37.000000000 +0200 +++ trunk/lib/taglib.rb 2008-01-21 07:12:40.000000000 +0100 @@ -104,6 +104,9 @@ raise BadPath.new end + @tag = nil + @audio = nil + if MAHORO_PRESENT mahoro = Mahoro.new mahoro.flags = Mahoro::NONE --- NEW FILE ruby-taglib.spec --- %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 Name: ruby-taglib Version: 1.1 Release: 1%{?dist} Summary: Ruby library wrapping the Taglib library Group: Development/Languages License: MIT URL: http://www.hakubi.us/ruby-taglib/ Source0: http://www.hakubi.us/ruby-taglib/%{name}-%{version}.tar.bz2 # Patch from debian Patch0: ruby-taglib-1.1-debian-10_so-name.dpatch Patch1: ruby-taglib-1.1-debian-20_tag-undefined.dpatch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: ruby BuildRequires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi} Requires: ruby Requires: taglib Provides: ruby(taglib) = %{version}-%{release} %description ruby-taglib is a simple dl-based wrapper of Taglib's C library. It's short and sweet, because the C API is written by someone who knows how to use OO programming, and Ruby with dl just makes it all too easy to wrap such a library. %prep %setup -q %patch0 -p1 -b .soname %patch1 -p1 -b .warn %build ruby setup.rb config \ --prefix=%{_prefix} \ --siterubyver=%{ruby_sitelib} ruby setup.rb setup %install %{__rm} -rf $RPM_BUILD_ROOT ruby setup.rb install \ --prefix=$RPM_BUILD_ROOT %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{ruby_sitelib}/taglib.rb %changelog * Thu Jul 3 2008 Mamoru Tasaka - 1.1-1 - Initial packaging - Two patches from debian applied Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-taglib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2008 16:44:04 -0000 1.1 +++ .cvsignore 18 Jul 2008 17:13:50 -0000 1.2 @@ -0,0 +1 @@ +ruby-taglib-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-taglib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2008 16:44:04 -0000 1.1 +++ sources 18 Jul 2008 17:13:50 -0000 1.2 @@ -0,0 +1 @@ +462d2717c912251b6d9693e0ac40c08f ruby-taglib-1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 17:16:09 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 18 Jul 2008 17:16:09 GMT Subject: rpms/eclipse/devel eclipse.spec,1.541,1.542 Message-ID: <200807181716.m6IHG9ls020763@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20722 Modified Files: eclipse.spec Log Message: Remove failing use-ecj-for-gcj patch for now Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.541 retrieving revision 1.542 diff -u -r1.541 -r1.542 --- eclipse.spec 18 Jul 2008 16:47:12 -0000 1.541 +++ eclipse.spec 18 Jul 2008 17:15:23 -0000 1.542 @@ -309,9 +309,10 @@ %patch4 -p0 popd -pushd plugins/org.eclipse.jdt.core -%patch17 -p0 -popd +# FIXME: update +#pushd plugins/org.eclipse.jdt.core +#%patch17 -p0 +#popd # liblocalfile fixes sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile @@ -1339,7 +1340,6 @@ - Un-do crazy config.ini, bundles.info, etc. shuffling - Update patch for building native libraries - Re-add missing BR on tomcat5-jasper-eclipse -- Re-add updated use-ecj-for-gcj patch * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package From fedora-extras-commits at redhat.com Fri Jul 18 17:22:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 17:22:27 GMT Subject: rpms/fortune-firefly/devel fortune-firefly.spec,1.16,1.17 Message-ID: <200807181722.m6IHMRcU021179@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fortune-firefly/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21122 Modified Files: fortune-firefly.spec Log Message: fix license tag Index: fortune-firefly.spec =================================================================== RCS file: /cvs/pkgs/rpms/fortune-firefly/devel/fortune-firefly.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fortune-firefly.spec 20 Jan 2008 23:43:51 -0000 1.16 +++ fortune-firefly.spec 18 Jul 2008 17:21:36 -0000 1.17 @@ -1,10 +1,11 @@ Name: fortune-firefly Version: 2.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Quotes from the TV series "Firefly" Group: Amusements/Games -License: GPL +# No version specified, only attribution is spec file, but maintainer is upstream. +License: GPL+ URL: http://www.daughtersoftiresias.org/progs/firefly/ #Source0: http://www.daughtersoftiresias.org/progs/firefly/%{name}-%{version}.tar.bz2 Source1: http://www.daughtersoftiresias.org/progs/firefly/fortune-firefly-%{version}/firefly @@ -48,6 +49,8 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 2.1.2-6 +- fix license tag * Sun Jan 20 2008 Karen Pease - 2.1.2.5 - Upping tag to sync builds. From fedora-extras-commits at redhat.com Fri Jul 18 17:24:40 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 18 Jul 2008 17:24:40 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.60, 1.61 sources, 1.63, 1.64 xulrunner-mozconfig, 1.20, 1.21 xulrunner.spec, 1.128, 1.129 Message-ID: <200807181724.m6IHOeeM021373@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21304 Modified Files: .cvsignore sources xulrunner-mozconfig xulrunner.spec Log Message: * Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 - Update to 1.9.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 18 Jun 2008 00:49:32 -0000 1.60 +++ .cvsignore 18 Jul 2008 17:23:55 -0000 1.61 @@ -1 +1 @@ -xulrunner-1.9-source.tar.bz2 +xulrunner-1.9.0.1-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 18 Jun 2008 00:49:32 -0000 1.63 +++ sources 18 Jul 2008 17:23:55 -0000 1.64 @@ -1 +1 @@ -b514375509fd439e44def1e4a7873af4 xulrunner-1.9-source.tar.bz2 +a14e4ac2e9fc5b29f80995c97a1c9748 xulrunner-1.9.0.1-source.tar.bz2 Index: xulrunner-mozconfig =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xulrunner-mozconfig 22 May 2008 17:55:01 -0000 1.20 +++ xulrunner-mozconfig 18 Jul 2008 17:23:55 -0000 1.21 @@ -10,7 +10,7 @@ #ac_add_options --with-system-png ac_add_options --enable-system-lcms ac_add_options --enable-system-hunspell -#ac_add_options --enable-system-sqlite +ac_add_options --enable-system-sqlite ac_add_options --with-pthreads ac_add_options --disable-strip ac_add_options --disable-tests Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- xulrunner.spec 18 Jun 2008 00:49:32 -0000 1.128 +++ xulrunner.spec 18 Jul 2008 17:23:55 -0000 1.129 @@ -1,18 +1,18 @@ -%define nspr_version 4.6.99 -%define nss_version 3.11.99.5 -%define cairo_version 0.5 +%define nspr_version 4.7.1 +%define nss_version 3.12.0.3 +%define cairo_version 0.6 %define version_internal 1.9 %define mozappdir %{_libdir}/%{name}-%{version_internal} Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9 +Version: 1.9.0.1 Release: 1%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: xulrunner-1.9-source.tar.bz2 +Source0: xulrunner-%{version}-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -21,6 +21,7 @@ # build patches Patch1: mozilla-build.patch Patch2: xulrunner-path.patch +Patch3: xulrunner-version.patch Patch4: mozilla-sqlite.patch Patch5: mozilla-mochitest.patch @@ -42,7 +43,7 @@ BuildRequires: libjpeg-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: lcms-devel +BuildRequires: lcms-devel >= 1.17 BuildRequires: libIDL-devel BuildRequires: gtk2-devel BuildRequires: gnome-vfs2-devel @@ -97,6 +98,7 @@ cd mozilla %patch1 -p1 -b .build %patch2 -p1 -b .path +%patch3 -p1 -b .version %patch4 -p1 -b .sqlite autoconf-2.13 %patch5 -p1 -b .mochitest @@ -104,7 +106,7 @@ %patch10 -p1 -b .pk %patch26 -p1 -b .ps-pdf-simplify-operators -%patch27 -p1 -b .ssl-exception +#%patch27 -p1 -b .ssl-exception %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -377,6 +379,9 @@ #--------------------------------------------------------------------- %changelog +* Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 +- Update to 1.9.0.1 + * Tue Jun 17 2008 Christopher Aillon 1.9-1 - Update to 1.9 final From fedora-extras-commits at redhat.com Fri Jul 18 17:26:53 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 17:26:53 GMT Subject: rpms/NetworkManager/F-9 NetworkManager.spec,1.230,1.231 Message-ID: <200807181726.m6IHQrc3021507@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21483 Modified Files: NetworkManager.spec Log Message: Temporary dhclient buildrequire Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- NetworkManager.spec 18 Jul 2008 16:39:42 -0000 1.230 +++ NetworkManager.spec 18 Jul 2008 17:26:04 -0000 1.231 @@ -69,6 +69,7 @@ BuildRequires: ppp-devel >= %{ppp_version} BuildRequires: nss-devel >= 3.11.7 BuildRequires: PolicyKit-devel PolicyKit-gnome-devel +BuildRequires: dhclient %description NetworkManager attempts to keep an active network connection available at all From fedora-extras-commits at redhat.com Fri Jul 18 17:44:10 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 17:44:10 GMT Subject: rpms/NetworkManager/F-9 NetworkManager.spec,1.231,1.232 Message-ID: <200807181744.m6IHiAsq022119@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22075 Modified Files: NetworkManager.spec Log Message: Add bug # Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- NetworkManager.spec 18 Jul 2008 17:26:04 -0000 1.231 +++ NetworkManager.spec 18 Jul 2008 17:43:23 -0000 1.232 @@ -307,7 +307,7 @@ - Allow forcing 802.1x PEAP Label to '0' - Make connection sharing more robust - Show status for shared and Ad-Hoc connections if no other connection is active -- Revert fix for (rh #351101) since it breaks multi-lib +- Revert fix for (rh #351101) since it breaks multi-lib (rh #451519) * Fri Jul 11 2008 Matthias Clasen - 1:0.7.0-0.10.svn3801 - Drop explicit hal dep in -gnome From fedora-extras-commits at redhat.com Fri Jul 18 17:46:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 17:46:58 GMT Subject: rpms/digikam/devel digikam.spec,1.59,1.60 Message-ID: <200807181746.m6IHkw6e022217@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183 Modified Files: digikam.spec Log Message: * Fri Jul 18 2008 Rex Dieter - 0.9.4-2 - --without-included-sqlite3, BR: sqlite-devel Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- digikam.spec 17 Jul 2008 12:43:30 -0000 1.59 +++ digikam.spec 18 Jul 2008 17:46:07 -0000 1.60 @@ -1,7 +1,7 @@ Name: digikam Version: 0.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -10,9 +10,9 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: kdelibs3-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs3-devel %if 0%{?fedora} > 9 BuildRequires: libgphoto2-devel %else @@ -20,14 +20,15 @@ %endif BuildRequires: jasper-devel BuildRequires: libkdcraw-devel >= 0.1.4 -BuildRequires: libkexiv2-devel >= 0.1.7 +BuildRequires: libkexiv2-devel >= 0.1.7 BuildRequires: libkipi-devel >= 0.1.6 -BuildRequires: lcms-devel +BuildRequires: lcms-devel BuildRequires: libtiff-devel BuildRequires: libpng-devel >= 1.2.7 %if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libtool-ltdl-devel %endif +BuildRequires: sqlite-devel Provides: digikamimageplugins = %{version}-%{release} Obsoletes: digikamimageplugins < 0.9.1-2 @@ -53,6 +54,7 @@ This package contains the libraries, include files and other resources needed to develop applications using %{name}. + %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} @@ -66,9 +68,12 @@ --disable-debug \ --disable-warnings \ --disable-dependency-tracking \ - --enable-final + --enable-final \ + --without-included-sqlite3 + make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -98,7 +103,6 @@ %post /sbin/ldconfig update-desktop-database &> /dev/null ||: - touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -107,15 +111,16 @@ %postun /sbin/ldconfig update-desktop-database &> /dev/null ||: - touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi + %clean rm -rf $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO @@ -143,20 +148,14 @@ %changelog +* Fri Jul 18 2008 Rex Dieter - 0.9.4-2 +- --without-included-sqlite3, BR: sqlite-devel + * Thu Jul 17 2008 Rex Dieter - 0.9.4-1 - digikam-0.9.4 -* Thu Jul 03 2008 Rex Dieter - 0.9.4-0.4.rc2 -- digikam-0.9.4-rc2 - -* Wed Jun 18 2008 Rex Dieter - 0.9.4-0.3.rc1 -- digikam-0.9.4-rc1 - -* Mon May 26 2008 Rex Dieter - 0.9.4-0.2.beta5 -- digikam-0.9.4-beta5 - -* Thu May 08 2008 Rex Dieter - 0.9.4-0.1.beta4 -- digikam-0.9.4-beta4 +* Mon Jul 07 2008 Marcin Garski 0.9.3-5 +- Don't lose some photos during import (#448235) * Fri Mar 14 2008 Rex Dieter - 0.9.3-3 - respin (for libkdcraw) From fedora-extras-commits at redhat.com Fri Jul 18 17:48:16 2008 From: fedora-extras-commits at redhat.com (Alan Pevec (apevec)) Date: Fri, 18 Jul 2008 17:48:16 GMT Subject: rpms/perl-Config-Augeas/F-9 perl-Config-Augeas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181748.m6IHmGlh022372@cvs-int.fedora.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/perl-Config-Augeas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22304 Modified Files: .cvsignore sources Added Files: perl-Config-Augeas.spec Log Message: Initial import. --- NEW FILE perl-Config-Augeas.spec --- Name: perl-Config-Augeas Version: 0.201 Release: 1%{?dist} Summary: Edit configuration files through Augeas C library License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Config-Augeas/ Source0: http://www.cpan.org/modules/by-module/Config/Config-Augeas-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: augeas-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Augeas is a library and command line tool that focuses on the most basic problem in handling Linux configurations programmatically: editing actual configuration files in a controlled manner. %prep %setup -q -n Config-Augeas-%{version} %build %{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS" ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Config* %{_mandir}/man3/* %changelog * Wed Jul 02 2008 Alan Pevec 0.201-1 - new upstream release 0.201 * Mon Jun 30 2008 Alan Pevec 0.200-1 - Specfile autogenerated by cpanspec 1.77. - temporary patch to remove /usr/local references Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:53:48 -0000 1.1 +++ .cvsignore 18 Jul 2008 17:47:33 -0000 1.2 @@ -0,0 +1 @@ +Config-Augeas-0.201.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:53:48 -0000 1.1 +++ sources 18 Jul 2008 17:47:33 -0000 1.2 @@ -0,0 +1 @@ +54e0f51ad0c9f148c828b2c2b033a13c Config-Augeas-0.201.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 17:49:22 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 17:49:22 GMT Subject: rpms/qscintilla/devel qscintilla.spec,1.16,1.17 Message-ID: <200807181749.m6IHnMlH022449@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22387 Modified Files: qscintilla.spec Log Message: * Fri Jul 18 2008 Rex Dieter - 2.2-2 - fix build (#449423) Index: qscintilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- qscintilla.spec 5 May 2008 12:59:14 -0000 1.16 +++ qscintilla.spec 18 Jul 2008 17:48:32 -0000 1.17 @@ -3,7 +3,7 @@ Name: qscintilla Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Scintilla port to Qt # matches up (pretty much) with qt4 @@ -128,7 +128,6 @@ %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT %{_qt4_libdir}/lib*.so.* %{_qt4_translationdir}/* -%{_qt4_datadir}/qsci/ %{_qt4_prefix}/qsci/ %files designer @@ -151,6 +150,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter - 2.2-2 +- fix build (#449423) + * Mon May 05 2008 Rex Dieter - 2.2-1 - Qscintilla-gpl-2.2 - License: GPLv3 or GPLv2 with exceptions From fedora-extras-commits at redhat.com Fri Jul 18 17:57:20 2008 From: fedora-extras-commits at redhat.com (Alan Pevec (apevec)) Date: Fri, 18 Jul 2008 17:57:20 GMT Subject: rpms/perl-Config-Augeas/F-8 perl-Config-Augeas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181757.m6IHvKuI022776@cvs-int.fedora.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/perl-Config-Augeas/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22756 Modified Files: .cvsignore sources Added Files: perl-Config-Augeas.spec Log Message: Initial import. --- NEW FILE perl-Config-Augeas.spec --- Name: perl-Config-Augeas Version: 0.201 Release: 1%{?dist} Summary: Edit configuration files through Augeas C library License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Config-Augeas/ Source0: http://www.cpan.org/modules/by-module/Config/Config-Augeas-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: augeas-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Augeas is a library and command line tool that focuses on the most basic problem in handling Linux configurations programmatically: editing actual configuration files in a controlled manner. %prep %setup -q -n Config-Augeas-%{version} %build %{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS" ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Config* %{_mandir}/man3/* %changelog * Wed Jul 02 2008 Alan Pevec 0.201-1 - new upstream release 0.201 * Mon Jun 30 2008 Alan Pevec 0.200-1 - Specfile autogenerated by cpanspec 1.77. - temporary patch to remove /usr/local references Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2008 20:53:48 -0000 1.1 +++ .cvsignore 18 Jul 2008 17:56:37 -0000 1.2 @@ -0,0 +1 @@ +Config-Augeas-0.201.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2008 20:53:48 -0000 1.1 +++ sources 18 Jul 2008 17:56:37 -0000 1.2 @@ -0,0 +1 @@ +54e0f51ad0c9f148c828b2c2b033a13c Config-Augeas-0.201.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 18:07:47 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Fri, 18 Jul 2008 18:07:47 GMT Subject: rpms/hal/F-8 hal-0.5.10-fix-input-spin.patch, NONE, 1.1 hal.spec, 1.142, 1.143 Message-ID: <200807181807.m6II7lBD029870@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/hal/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29840 Modified Files: hal.spec Added Files: hal-0.5.10-fix-input-spin.patch Log Message: * Fri Jul 18 2008 David Zeuthen - 0.5.10-4 - fix runaway input add-on (#452557) hal-0.5.10-fix-input-spin.patch: --- NEW FILE hal-0.5.10-fix-input-spin.patch --- # Description: Avoid spinning on already invalidated/closed file # descriptors in the input addon. This fixes "hal takes 100% CPU and # breaks input device handling" on a lot of machines. # Ubuntu: https://launchpad.net/bugs/203679 --- ubuntu/hald/linux/addons/addon-input.c 2008-03-17 22:25:12.000000000 +0100 +++ ubuntu.new/hald/linux/addons/addon-input.c 2008-04-21 10:33:16.000000000 +0200 @@ -210,7 +210,7 @@ GError *gerror = NULL; gsize read_bytes; - if (condition & (G_IO_HUP | G_IO_ERR)) + if (condition & (G_IO_HUP | G_IO_ERR | G_IO_NVAL)) return FALSE; /** tbh, we can probably assume every time we read we have a whole @@ -383,7 +383,7 @@ g_hash_table_insert (inputs, g_strdup(udi), channel); g_io_add_watch_full (channel, - G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP, + G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL, event_io, data, (GDestroyNotify) destroy_data); } Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/F-8/hal.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- hal.spec 16 Jun 2008 11:59:03 -0000 1.142 +++ hal.spec 18 Jul 2008 18:07:01 -0000 1.143 @@ -26,12 +26,13 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.10 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.freedesktop.org/Software/hal Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz Patch0: hal-0.5.10-acltool-serialize.patch Patch1: hal-0.5.10-int_outof-fix.patch Patch2: hal-0.5.10-fix-memory-leaks.patch +Patch3: hal-0.5.10-fix-input-spin.patch License: AFL/GPL Group: System Environment/Libraries @@ -126,6 +127,7 @@ %patch0 -p1 -b .serialize-acl %patch1 -p1 -b .int_outof-fix %patch2 -p1 -b .memory-leaks-fix +%patch3 -p1 -b .input-spin %build %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject @@ -238,6 +240,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Fri Jul 18 2008 David Zeuthen - 0.5.10-4 +- fix runaway input add-on (#452557) + * Mon Jun 16 2008 Richard Hughes - 0.5.10-3 - Plug a couple of memory leaks which have already been fixed in git master From fedora-extras-commits at redhat.com Fri Jul 18 18:12:36 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 18:12:36 GMT Subject: rpms/qscintilla/devel qscintilla.spec,1.17,1.18 Message-ID: <200807181812.m6IICa2H030079@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30006 Modified Files: qscintilla.spec Log Message: patch fuzz Index: qscintilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- qscintilla.spec 18 Jul 2008 17:48:32 -0000 1.17 +++ qscintilla.spec 18 Jul 2008 18:11:37 -0000 1.18 @@ -1,3 +1,4 @@ +%define _default_patch_fuzz 2 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} From fedora-extras-commits at redhat.com Fri Jul 18 18:12:57 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 18:12:57 GMT Subject: rpms/digikam/F-9 digikam.spec,1.55,1.56 Message-ID: <200807181812.m6IICvnB030124@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30039 Modified Files: digikam.spec Log Message: * Fri Jul 18 2008 Rex Dieter - 0.9.4-2 - --without-included-sqlite3, BR: sqlite-devel Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/F-9/digikam.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- digikam.spec 17 Jul 2008 15:54:27 -0000 1.55 +++ digikam.spec 18 Jul 2008 18:11:57 -0000 1.56 @@ -1,7 +1,7 @@ Name: digikam Version: 0.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -28,6 +28,7 @@ %if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libtool-ltdl-devel %endif +BuildRequires: sqlite-devel Provides: digikamimageplugins = %{version}-%{release} Obsoletes: digikamimageplugins < 0.9.1-2 @@ -53,6 +54,7 @@ This package contains the libraries, include files and other resources needed to develop applications using %{name}. + %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} @@ -66,9 +68,12 @@ --disable-debug \ --disable-warnings \ --disable-dependency-tracking \ - --enable-final + --enable-final \ + --without-included-sqlite3 + make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -98,7 +103,6 @@ %post /sbin/ldconfig update-desktop-database &> /dev/null ||: - touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -107,15 +111,16 @@ %postun /sbin/ldconfig update-desktop-database &> /dev/null ||: - touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi + %clean rm -rf $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO @@ -143,6 +148,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter - 0.9.4-2 +- --without-included-sqlite3, BR: sqlite-devel + * Thu Jul 17 2008 Rex Dieter - 0.9.4-1 - digikam-0.9.4 From fedora-extras-commits at redhat.com Fri Jul 18 18:22:12 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 18 Jul 2008 18:22:12 GMT Subject: rpms/NetworkManager/F-9 old-dbus-glib.patch, NONE, 1.1 NetworkManager.spec, 1.232, 1.233 Message-ID: <200807181822.m6IIMCs2030365@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30334 Modified Files: NetworkManager.spec Added Files: old-dbus-glib.patch Log Message: Allow use of dbus-glib 0.74 since F9 ships a patched copy old-dbus-glib.patch: --- NEW FILE old-dbus-glib.patch --- diff -up NetworkManager-0.7.0/configure.in.dbusglib NetworkManager-0.7.0/configure.in --- NetworkManager-0.7.0/configure.in.dbusglib 2008-07-18 14:17:51.000000000 -0400 +++ NetworkManager-0.7.0/configure.in 2008-07-18 14:18:14.000000000 -0400 @@ -170,7 +170,7 @@ if test "$ac_have_iwevgenie" = no; then AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional) fi -PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.75) +PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74) ##### Find out the version of DBUS we're using dbus_version=`pkg-config --modversion dbus-1` Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- NetworkManager.spec 18 Jul 2008 17:43:23 -0000 1.232 +++ NetworkManager.spec 18 Jul 2008 18:21:23 -0000 1.233 @@ -25,6 +25,7 @@ Source2: nm-system-settings.conf Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch2: disable-editing-system-connections-for-now.patch +Patch3: old-dbus-glib.patch Patch4: serial-debug.patch Patch5: explain-dns1-dns2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -147,6 +148,7 @@ tar -xzf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .disable-system +%patch3 -p1 -b .old-dbus-glib %patch4 -p1 -b .serial-debug %patch5 -p1 -b .explain-dns1-dns2 From fedora-extras-commits at redhat.com Fri Jul 18 18:35:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:35:37 +0000 Subject: [pkgdb] kdeplasma-addons: tuxbrewr has requested watchbugzilla Message-ID: <200807181835.m6IIZbFi008685@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has requested the watchbugzilla acl on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:35:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:35:46 +0000 Subject: [pkgdb] kdeplasma-addons: tuxbrewr has requested watchbugzilla Message-ID: <200807181835.m6IIZbFm008685@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has requested the watchbugzilla acl on kdeplasma-addons (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:35:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:35:38 +0000 Subject: [pkgdb] kdeplasma-addons: tuxbrewr has requested watchcommits Message-ID: <200807181835.m6IIZmNc008707@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has requested the watchcommits acl on kdeplasma-addons (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:35:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:35:51 +0000 Subject: [pkgdb] kdeplasma-addons: tuxbrewr has requested watchcommits Message-ID: <200807181835.m6IIZpZG008761@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has requested the watchcommits acl on kdeplasma-addons (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:39:50 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 18 Jul 2008 18:39:50 GMT Subject: rpms/xulrunner/devel xulrunner-version.patch,1.2,1.3 Message-ID: <200807181839.m6IIdogs030894@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30854 Added Files: xulrunner-version.patch Log Message: * Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 - Update to 1.9.0.1 xulrunner-version.patch: Index: xulrunner-version.patch =================================================================== RCS file: xulrunner-version.patch diff -N xulrunner-version.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xulrunner-version.patch 18 Jul 2008 18:39:06 -0000 1.3 @@ -0,0 +1,13 @@ +diff -up mozilla/toolkit/mozapps/update/src/updater/module.ver mozilla/toolkit/mozapps/update/src/updater/module +diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer/Makefile.in +--- mozilla/xulrunner/installer/Makefile.in.ver 2007-12-14 09:51:34.000000000 +0100 ++++ mozilla/xulrunner/installer/Makefile.in 2007-12-14 09:52:03.000000000 +0100 +@@ -44,6 +44,8 @@ VPATH = @srcdir@ + + include $(DEPTH)/config/autoconf.mk + ++MOZ_APP_VERSION="1.9" ++ + NO_PKG_FILES = \ + xulrunner-config \ + regchrome* \ From fedora-extras-commits at redhat.com Fri Jul 18 18:41:40 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 18 Jul 2008 18:41:40 GMT Subject: rpms/qscintilla/devel QScintilla-2-gpl-Qt4-incpath.patch, 1.1, 1.2 qscintilla.spec, 1.18, 1.19 Message-ID: <200807181841.m6IIfeqb031045@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30960 Modified Files: QScintilla-2-gpl-Qt4-incpath.patch qscintilla.spec Log Message: rebuild against new PyQT4, fix #449423 propperlly QScintilla-2-gpl-Qt4-incpath.patch: Index: QScintilla-2-gpl-Qt4-incpath.patch =================================================================== RCS file: /cvs/extras/rpms/qscintilla/devel/QScintilla-2-gpl-Qt4-incpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- QScintilla-2-gpl-Qt4-incpath.patch 28 Jan 2008 21:33:44 -0000 1.1 +++ QScintilla-2-gpl-Qt4-incpath.patch 18 Jul 2008 18:40:48 -0000 1.2 @@ -1,8 +1,8 @@ ---- qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro.designer-incpath 2004-09-16 15:09:24.000000000 -0500 -+++ qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro 2004-09-16 15:08:31.000000000 -0500 -@@ -9,4 +9,6 @@ - - SOURCES += qscintillaplugin.cpp +--- QScintilla-gpl-2.2/designer-Qt4/designer.pro.BAD 2008-07-18 13:22:40.000000000 -0500 ++++ QScintilla-gpl-2.2/designer-Qt4/designer.pro 2008-07-18 13:23:02.000000000 -0500 +@@ -12,4 +12,6 @@ + target.path = $$[QT_INSTALL_PLUGINS]/designer + INSTALLS += target -LIBS += -lqscintilla2 +LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2 Index: qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/qscintilla/devel/qscintilla.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- qscintilla.spec 18 Jul 2008 18:11:37 -0000 1.18 +++ qscintilla.spec 18 Jul 2008 18:40:48 -0000 1.19 @@ -1,10 +1,8 @@ -%define _default_patch_fuzz 2 - %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: qscintilla Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Scintilla port to Qt # matches up (pretty much) with qt4 @@ -14,6 +12,7 @@ Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#why is this not upstream? Patch1: QScintilla-2-gpl-Qt4-incpath.patch BuildRequires: qt4-devel @@ -151,6 +150,10 @@ %changelog +* Fri Jul 18 2008 Dennis Gilmore - 2.2-3 +- rebuild for newer PyQT4 +- fix #449423 properly + * Fri Jul 18 2008 Rex Dieter - 2.2-2 - fix build (#449423) From fedora-extras-commits at redhat.com Fri Jul 18 18:44:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:44:29 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807181844.m6IIiTf6009198@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchbugzilla acl on kdeplasma-addons (Fedora devel) to Approved for Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:44:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:44:29 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807181844.m6IIiTam009201@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchcommits acl on kdeplasma-addons (Fedora devel) to Approved for Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:44:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:44:35 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807181844.m6IIiTfA009198@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchbugzilla acl on kdeplasma-addons (Fedora 9) to Approved for Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:44:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 18:44:38 +0000 Subject: [pkgdb] kdeplasma-addons had acl change status Message-ID: <200807181844.m6IIicwD009260@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchcommits acl on kdeplasma-addons (Fedora 9) to Approved for Steven M. Parrish (tuxbrewr) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons From fedora-extras-commits at redhat.com Fri Jul 18 18:53:30 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Fri, 18 Jul 2008 18:53:30 GMT Subject: rpms/pyflowtools/devel .cvsignore, 1.4, 1.5 pyflowtools.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <200807181853.m6IIrUMj031458@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/pyflowtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31410 Modified Files: .cvsignore pyflowtools.spec sources Log Message: New upstream version 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Mar 2008 15:17:23 -0000 1.4 +++ .cvsignore 18 Jul 2008 18:52:38 -0000 1.5 @@ -1 +1 @@ -pyflowtools-0.3.3.tar.gz +pyflowtools-0.3.4.tar.gz Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/devel/pyflowtools.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pyflowtools.spec 6 Mar 2008 15:17:23 -0000 1.11 +++ pyflowtools.spec 18 Jul 2008 18:52:38 -0000 1.12 @@ -2,7 +2,7 @@ Summary: An interface to OSU FlowTools Name: pyflowtools -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Source0: http://pyflowtools.googlecode.com/files/%{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,10 @@ %{python_sitelib}/* %changelog +* Fri Jul 18 2008 Paul P. Komkoff Jr - 0.3.4-1 +- fix integer size-related bugs +- add some pydocs + * Wed Mar 5 2008 Paul P. Komkoff Jr - 0.3.3-1 - short bugfix release Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Mar 2008 15:17:23 -0000 1.4 +++ sources 18 Jul 2008 18:52:38 -0000 1.5 @@ -1 +1 @@ -dfa87dbccb40dedd257c1e0c6af9e7e1 pyflowtools-0.3.3.tar.gz +23588ab1a707d7e7d165c8191f1ae4c1 pyflowtools-0.3.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 19:17:13 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 19:17:13 GMT Subject: rpms/libcapseo/F-9 libcapseo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807181917.m6IJHDNk006883@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libcapseo/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6790 Modified Files: .cvsignore sources Added Files: libcapseo.spec Log Message: * Tue Jul 1 2008 Shawn Starr 0.2.0-0.1.20080603gita6ec446 - Upstream snapshot, change GPLv2 to GPLv3. - Fix minor configure script issue. --- NEW FILE libcapseo.spec --- %define capseo_version 0.2.0 # Tarfile created using git # git clone git://gitorious.org/capseo/mainline.git libcapseo # cd libcapseo # git-archive --format=tar --prefix=libcapseo-%{capseo_version}/ %{git_version} | bzip2 > libcapseo-%{capseo_version}-%{gitdate}.tar.bz2 %define gitdate 20080603 %define git_version a6ec446 %define tarfile %{name}-%{capseo_version}-%{gitdate}.tar.bz2 %define snapshot %{gitdate}git%{git_version} Summary: A realtime encoder/decoder library Name: libcapseo Version: %{capseo_version} Release: 0.1.%{snapshot}%{?dist} License: GPLv3 Group: System Environment/Libraries URL: http://gitorious.org/projects/capseo/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool automake autoconf BuildRequires: pkgconfig BuildRequires: libtheora-devel BuildRequires: libogg-devel BuildRequires: libX11-devel BuildRequires: mesa-libGL-devel # Fedora specific snapshot no upstream release (yet) Source0: %{tarfile} %description Capseo is a realtime video codec being used by libcaptury/captury for encoding captured video frames in realtime. (think of FRAPS codec). Applications using capseo currently are libcaptury for encoding captured data, e.g. currently from third-party OpenGL applications via captury, the OpenGL video capturing tool. %package devel Summary: Files needed for development using %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libtheora-devel Requires: libogg-devel Requires: libX11-devel Requires: mesa-libGL-devel Requires: pkgconfig %description devel This package contains libraries and header files for developing applications that use %{name}. %package tools Summary: Encoding/Decoding tools for capseo Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %description tools Utilities for capseo %prep %setup -q -n %{name}-%{version} ./autogen.sh %build %configure --disable-static --enable-theora --disable-examples make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING TODO %{_libdir}/*.so.* %files tools %defattr(-,root,root,-) %{_bindir}/* %files devel %defattr(-,root,root,-) %{_includedir}/*.h %{_libdir}/libcapseo.so %{_libdir}/pkgconfig/capseo.pc %changelog * Tue Jul 1 2008 Shawn Starr 0.2.0-0.1.20080603gita6ec446 - Upstream snapshot, change GPLv2 to GPLv3. - Fix minor configure script issue. * Sat May 3 2008 Shawn Starr 0.2.0-0.1.20080323git1c5f3e5 - Initial Fedora package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libcapseo/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2008 16:13:58 -0000 1.1 +++ .cvsignore 18 Jul 2008 19:16:27 -0000 1.2 @@ -0,0 +1 @@ +libcapseo-0.2.0-20080603.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcapseo/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2008 16:13:58 -0000 1.1 +++ sources 18 Jul 2008 19:16:27 -0000 1.2 @@ -0,0 +1 @@ +f0fc20d0810bff5bf60d32fe1d04f171 libcapseo-0.2.0-20080603.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 19:19:50 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 19:19:50 GMT Subject: rpms/automoc/F-9 .cvsignore, 1.2, 1.3 automoc.spec, 1.1, 1.2 sources, 1.2, 1.3 automoc-1.0-lib64.patch, 1.1, NONE Message-ID: <200807181919.m6IJJoUY007237@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/automoc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7109 Modified Files: .cvsignore automoc.spec sources Removed Files: automoc-1.0-lib64.patch Log Message: * Mon Jun 30 2008 Rex Dieter 1.0-0.7.beta2 - automoc4-0.9.83 (aka 1.0beta2) - drop lib64 patch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jun 2008 10:42:28 -0000 1.2 +++ .cvsignore 18 Jul 2008 19:19:08 -0000 1.3 @@ -1 +1 @@ -automoc-1.0.20080527svn811390.tar.gz +automoc4-0.9.83.tar.bz2 Index: automoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-9/automoc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- automoc.spec 1 Jun 2008 10:42:28 -0000 1.1 +++ automoc.spec 18 Jul 2008 19:19:08 -0000 1.2 @@ -1,16 +1,20 @@ -%define snaptag .20080527svn811390 +#define snaptag .20080527svn811390 +%define beta 0.9.83 +%define beta_tag beta2 Name: automoc Version: 1.0 -Release: 0.3%{?snaptag}%{?dist} +Release: 0.7.%{?beta_tag}%{?dist} Summary: KDE4 automoc Group: Development/Tools License: BSD URL: http://www.kde.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://rpm.binaryhelix.net/SOURCES/%{name}-%{version}%{?snaptag}.tar.gz -Patch0: automoc-1.0-lib64.patch +#Source0: http://rpm.binaryhelix.net/SOURCES/%{name}-%{version}%{?snaptag}.tar.gz +Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.93/support/automoc4-%{beta}.tar.bz2 + +Provides: automoc4 = %{beta} Requires: cmake BuildRequires: cmake qt4-devel kde-filesystem @@ -20,8 +24,7 @@ %prep -%setup -q -%patch0 -p1 -b .lib64 +%setup -q -n automoc4-%{beta} %build @@ -30,21 +33,12 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} +make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} -# Put things in proper places -# Put Automoc4Config.cmake in proper place -%{__mkdir} -p %{buildroot}%{_datadir}/cmake/Modules -%{__mv} %{buildroot}%{_libdir}/automoc4/Automoc4Config.cmake \ - %{buildroot}%{_datadir}/cmake/Modules/Automoc4Config.cmake -# Remove automoc4.files.in (and /usr/lib, since it's not needed) -%{__rm} -rf %{buildroot}%{_libdir} - - %clean @@ -53,13 +47,19 @@ %files %defattr(-,root,root,-) -%doc automoc4.files.in %{_bindir}/automoc4 -%{_datadir}/cmake/Modules/Automoc4Config.cmake - +%{_prefix}/lib/automoc4/ %changelog +* Mon Jun 30 2008 Rex Dieter 1.0-0.7.beta2 +- automoc4-0.9.83 (aka 1.0beta2) +- drop lib64 patch + +* Thu Jun 10 2008 Lorenzo Villani - 1.0-0.5.20080527svn811390 +- Leave automoc4.files.in in _libdir +- Same applies to Automoc4Config.cmake + * Thu May 29 2008 Lorenzo Villani - 1.0-0.3.20080527svn811390 - Added 'cmake' to Requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jun 2008 10:42:28 -0000 1.2 +++ sources 18 Jul 2008 19:19:08 -0000 1.3 @@ -1 +1 @@ -577b4c8ac4e9ebce24d57af26b1cb337 automoc-1.0.20080527svn811390.tar.gz +7876af12da90bd357fc547c4f4828603 automoc4-0.9.83.tar.bz2 --- automoc-1.0-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 19:21:55 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 18 Jul 2008 19:21:55 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.192, 1.193 selinux-policy.spec, 1.696, 1.697 Message-ID: <200807181921.m6IJLteh007471@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Thu Jul 17 2008 Dan Walsh 3.3.1-79 - Allow xguest to communicate with hal - allow mozilla to communicate with networkmanager - Add kpropd policy policy-20071130.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.192 -r 1.193 policy-20071130.patch Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- policy-20071130.patch 14 Jul 2008 20:37:57 -0000 1.192 +++ policy-20071130.patch 18 Jul 2008 19:21:11 -0000 1.193 @@ -1,16 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.3.1/Changelog ---- nsaserefpolicy/Changelog 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Changelog 2008-07-02 08:47:10.000000000 -0400 -@@ -1,6 +1,3 @@ --- Pam and samba updates from Stefan Schulze Frielinghaus. --- Backup update on Debian from Vaclav Ovsik. --- Cracklib update on Debian from Vaclav Ovsik. - - Label /proc/kallsyms with system_map_t. - - 64-bit capabilities from Stephen Smalley. - - Labeled networking peer object class updates. diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile --- nsaserefpolicy/Makefile 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Makefile 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/Makefile 2008-07-15 14:02:51.000000000 -0400 @@ -235,7 +235,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -66,7 +56,7 @@ $(verbose) $(INSTALL) -m 644 $< $@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular --- nsaserefpolicy/Rules.modular 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Rules.modular 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/Rules.modular 2008-07-15 14:02:51.000000000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -98,7 +88,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.3.1/Rules.monolithic --- nsaserefpolicy/Rules.monolithic 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/Rules.monolithic 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/Rules.monolithic 2008-07-15 14:02:51.000000000 -0400 @@ -96,7 +96,7 @@ # # Load the binary policy @@ -110,13 +100,13 @@ @touch $(tmpdir)/load diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context 2008-07-15 14:02:51.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -124,7 +114,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -138,17 +128,9 @@ # -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.3.1/config/appconfig-mcs/seusers ---- nsaserefpolicy/config/appconfig-mcs/seusers 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/seusers 2008-07-02 08:47:10.000000000 -0400 -@@ -1,3 +1,3 @@ - system_u:system_u:s0-mcs_systemhigh - root:root:s0-mcs_systemhigh --__default__:user_u:s0 -+__default__:unconfined_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 @@ -161,13 +143,13 @@ +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context 2008-07-15 14:02:51.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_contexts serefpolicy-3.3.1/config/appconfig-mcs/x_contexts --- nsaserefpolicy/config/appconfig-mcs/x_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,188 @@ +# +# Config file for XSELinux extension @@ -359,7 +341,7 @@ +event * system_u:object_r:default_xevent_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -368,7 +350,7 @@ +system_r:xdm_t xguest_r:xguest_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -376,7 +358,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.1/config/appconfig-mls/x_contexts --- nsaserefpolicy/config/appconfig-mls/x_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,188 @@ +# +# Config file for XSELinux extension @@ -568,7 +550,7 @@ +event * system_u:object_r:default_xevent_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t @@ -576,7 +558,7 @@ +system_r:crond_t guest_r:guest_crond_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -592,7 +574,7 @@ +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.1/config/appconfig-standard/x_contexts --- nsaserefpolicy/config/appconfig-standard/x_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,188 @@ +# +# Config file for XSELinux extension @@ -784,7 +766,7 @@ +event * system_u:object_r:default_xevent_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-02 08:47:10.000000000 -0400 ++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-15 14:02:51.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t @@ -793,21 +775,115 @@ +system_r:xdm_t xguest_r:xguest_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.3.1/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8 2008-07-14 09:45:39.000000000 -0400 -@@ -35,10 +35,6 @@ - directorories, you need to set the ftp_home_dir boolean. ++++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8 2008-07-18 15:14:42.000000000 -0400 +@@ -1,52 +1,65 @@ +-.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation" ++.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ftpd SELinux policy documentation" + .SH "NAME" +-ftpd_selinux \- Security Enhanced Linux Policy for the ftp daemon ++.PP ++ftpd_selinux \- Security-Enhanced Linux policy for ftp daemons. + .SH "DESCRIPTION" +- +-Security-Enhanced Linux secures the ftpd server via flexible mandatory access +-control. ++.PP ++Security-Enhanced Linux provides security for ftp daemons via flexible mandatory access control. + .SH FILE_CONTEXTS +-SELinux requires files to have an extended attribute to define the file type. +-Policy governs the access daemons have to these files. +-If you want to share files anonymously, you must label the files and directories public_content_t. So if you created a special directory /var/ftp, you would need to label the directory with the chcon tool. +-.TP +-chcon -R -t public_content_t /var/ftp +-.TP +-If you want to setup a directory where you can upload files to you must label the files and directories public_content_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. +-.TP +-chcon -t public_content_rw_t /var/ftp/incoming ++.PP ++SELinux requires files to have a file type. File types may be specified with semanage and are restored with restorecon. Policy governs the access that daemons have to files. [...4967 lines suppressed...] diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.te serefpolicy-3.3.1/policy/modules/users/auditadm.te --- nsaserefpolicy/policy/modules/users/auditadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/auditadm.te 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/auditadm.te 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1,25 @@ +policy_module(auditadm,1.0.1) +gen_require(` @@ -38798,17 +38895,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.3.1/policy/modules/users/guest.fc --- nsaserefpolicy/policy/modules/users/guest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/guest.fc 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/guest.fc 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +# No guest file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.3.1/policy/modules/users/guest.if --- nsaserefpolicy/policy/modules/users/guest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/guest.if 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/guest.if 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +## Policy for guest user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.3.1/policy/modules/users/guest.te --- nsaserefpolicy/policy/modules/users/guest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1,21 @@ +policy_module(guest,1.0.1) +userdom_restricted_user_template(guest) @@ -38833,17 +38930,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.3.1/policy/modules/users/logadm.fc --- nsaserefpolicy/policy/modules/users/logadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +# No logadm file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.3.1/policy/modules/users/logadm.if --- nsaserefpolicy/policy/modules/users/logadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/logadm.if 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/logadm.if 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +## Policy for logadm user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.3.1/policy/modules/users/logadm.te --- nsaserefpolicy/policy/modules/users/logadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/logadm.te 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/logadm.te 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1,11 @@ +policy_module(logadm,1.0.0) + @@ -38858,22 +38955,22 @@ +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t }) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.3.1/policy/modules/users/metadata.xml --- nsaserefpolicy/policy/modules/users/metadata.xml 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +Policy modules for users diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.1/policy/modules/users/secadm.fc --- nsaserefpolicy/policy/modules/users/secadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +# No secadm file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.1/policy/modules/users/secadm.if --- nsaserefpolicy/policy/modules/users/secadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/secadm.if 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/secadm.if 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +## Policy for secadm user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.1/policy/modules/users/secadm.te --- nsaserefpolicy/policy/modules/users/secadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/secadm.te 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/secadm.te 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1,39 @@ +policy_module(secadm,1.0.1) +gen_require(` @@ -38916,17 +39013,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.1/policy/modules/users/staff.fc --- nsaserefpolicy/policy/modules/users/staff.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/staff.fc 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/staff.fc 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +# No staff file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.1/policy/modules/users/staff.if --- nsaserefpolicy/policy/modules/users/staff.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/staff.if 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/staff.if 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +## Policy for staff user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te --- nsaserefpolicy/policy/modules/users/staff.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1,29 @@ +policy_module(staff,1.0.1) +userdom_admin_login_user_template(staff) @@ -38959,17 +39056,17 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.1/policy/modules/users/user.fc --- nsaserefpolicy/policy/modules/users/user.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/user.fc 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/user.fc 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +# No user file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.1/policy/modules/users/user.if --- nsaserefpolicy/policy/modules/users/user.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/user.if 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/user.if 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +## Policy for user user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te --- nsaserefpolicy/policy/modules/users/user.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1,18 @@ +policy_module(user,1.0.1) +userdom_unpriv_user_template(user) @@ -38991,17 +39088,17 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc --- nsaserefpolicy/policy/modules/users/webadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +# No webadm file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.1/policy/modules/users/webadm.if --- nsaserefpolicy/policy/modules/users/webadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/webadm.if 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/webadm.if 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +## Policy for webadm user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.3.1/policy/modules/users/webadm.te --- nsaserefpolicy/policy/modules/users/webadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/webadm.te 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/webadm.te 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1,41 @@ +policy_module(webadm,1.0.0) + @@ -39046,18 +39143,18 @@ +userdom_role_change_template(staff, webadm) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.1/policy/modules/users/xguest.fc --- nsaserefpolicy/policy/modules/users/xguest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +# No xguest file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.1/policy/modules/users/xguest.if --- nsaserefpolicy/policy/modules/users/xguest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/xguest.if 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/users/xguest.if 2008-07-15 14:02:52.000000000 -0400 @@ -0,0 +1 @@ +## Policy for xguest user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.1/policy/modules/users/xguest.te --- nsaserefpolicy/policy/modules/users/xguest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-07-02 08:47:11.000000000 -0400 -@@ -0,0 +1,66 @@ ++++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-07-16 07:34:06.000000000 -0400 +@@ -0,0 +1,70 @@ +policy_module(xguest,1.0.1) + +## @@ -39113,6 +39210,10 @@ +') + +optional_policy(` ++ hal_dbus_chat(xguest_t) ++') ++ ++optional_policy(` + tunable_policy(`xguest_connect_network',` + networkmanager_dbus_chat(xguest_t) + ') @@ -39126,7 +39227,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-07-15 14:02:52.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -39153,7 +39254,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-07-08 10:42:49.000000000 -0400 ++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-07-15 14:02:52.000000000 -0400 @@ -315,3 +315,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -39170,7 +39271,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3.1/policy/users --- nsaserefpolicy/policy/users 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/users 2008-07-02 08:47:11.000000000 -0400 ++++ serefpolicy-3.3.1/policy/users 2008-07-15 14:02:52.000000000 -0400 @@ -16,7 +16,7 @@ # and a user process should never be assigned the system user # identity. Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.696 retrieving revision 1.697 diff -u -r1.696 -r1.697 --- selinux-policy.spec 14 Jul 2008 20:10:21 -0000 1.696 +++ selinux-policy.spec 18 Jul 2008 19:21:11 -0000 1.697 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 78%{?dist} +Release: 79%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -303,6 +303,7 @@ %triggerpostun targeted -- selinux-policy-targeted < 3.2.5-9.fc9 +echo "TriggerPost" . /etc/selinux/config [ "${SELINUXTYPE}" != "targeted" ] && exit 0 setsebool -P use_nfs_home_dirs=1 @@ -385,6 +386,11 @@ %endif %changelog +* Thu Jul 17 2008 Dan Walsh 3.3.1-79 +- Allow xguest to communicate with hal +- allow mozilla to communicate with networkmanager +- Add kpropd policy + * Tue Jul 8 2008 Dan Walsh 3.3.1-78 - Allow unconfined_t to setfcap - Allow spamassassin to read razor lib files From fedora-extras-commits at redhat.com Fri Jul 18 19:25:14 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Fri, 18 Jul 2008 19:25:14 GMT Subject: rpms/kphotobymail/F-9 kphotobymail.spec,1.5,1.6 Message-ID: <200807181925.m6IJPEDn007849@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/kphotobymail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7775 Modified Files: kphotobymail.spec Log Message: Fixed unpackaged file causing build errors Index: kphotobymail.spec =================================================================== RCS file: /cvs/pkgs/rpms/kphotobymail/F-9/kphotobymail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kphotobymail.spec 3 Jan 2007 21:38:16 -0000 1.5 +++ kphotobymail.spec 18 Jul 2008 19:24:21 -0000 1.6 @@ -3,7 +3,7 @@ Name: kphotobymail Version: 0.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A PyKDE based application for uploading photos to flickr account Group: Applications/Internet License: GPL @@ -52,6 +52,7 @@ %dir %{python_sitelib}/Kphotobymail %{python_sitelib}/Kphotobymail/*.py %{python_sitelib}/Kphotobymail/*.pyc +%{python_sitelib}/kphotobymail-0.4.1-py2.5.egg-info %ghost %{python_sitelib}/Kphotobymail/*.pyo %dir %{_datadir}/kphotobymail %{_datadir}/kphotobymail/* @@ -61,6 +62,9 @@ %{_datadir}/applications/fedora-kphotobymail.desktop %changelog +* Fri Jul 18 2008 Steven M. Parrish 0.4.1-2 +- Fixed unpackaged file causing build errors + * Thu Jan 04 2007 Kushal Das 0.4.1-1 - New release 0.4.1 From fedora-extras-commits at redhat.com Fri Jul 18 19:34:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 19:34:23 GMT Subject: rpms/freefont/devel .cvsignore, 1.2, 1.3 freefont.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807181934.m6IJYNa8008950@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/freefont/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8892 Modified Files: .cvsignore freefont.spec sources Log Message: fix license tag Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freefont/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Nov 2006 17:08:03 -0000 1.2 +++ .cvsignore 18 Jul 2008 19:33:35 -0000 1.3 @@ -1 +1 @@ -freefont-ttf-20060126.tar.gz +freefont-ttf-20080323.tar.gz Index: freefont.spec =================================================================== RCS file: /cvs/pkgs/rpms/freefont/devel/freefont.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- freefont.spec 5 Jan 2007 23:27:43 -0000 1.2 +++ freefont.spec 18 Jul 2008 19:33:35 -0000 1.3 @@ -1,11 +1,12 @@ %define fontdir %{_datadir}/fonts/freefont Name: freefont -Version: 20060126 -Release: 4%{?dist} +Version: 20080323 +Release: 1%{?dist} Summary: Free UCS Outline Fonts Group: User Interface/X -License: GPL +# Standard font exception +License: GPLv2+ with exceptions URL: http://www.nongnu.org/freefont/ Source: http://savannah.nongnu.org/download/freefont/freefont-ttf-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,6 +61,10 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway 20080323-1 +- fix license tag +- update to 20080323 + * Fri Jan 5 2007 Orion Poplawski 20060126-4 - Require fontconfig, not /usr/share/fonts Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freefont/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Nov 2006 17:08:03 -0000 1.2 +++ sources 18 Jul 2008 19:33:35 -0000 1.3 @@ -1 +1 @@ -822aba4e2ed065d9d3ded6e26e495854 freefont-ttf-20060126.tar.gz +cf203bb6ce80783c1a51ae1d0b2bb98c freefont-ttf-20080323.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 19:45:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 19:45:15 GMT Subject: rpms/freehdl/devel freehdl.spec,1.15,1.16 Message-ID: <200807181945.m6IJjFOH009334@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/freehdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9302 Modified Files: freehdl.spec Log Message: fix license tag Index: freehdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/freehdl/devel/freehdl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- freehdl.spec 19 Apr 2008 15:33:50 -0000 1.15 +++ freehdl.spec 18 Jul 2008 19:44:22 -0000 1.16 @@ -1,8 +1,8 @@ Summary: GPLed free VHDL Name: freehdl Version: 0.0.6 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ and LGPLv2+ Group: Applications/Engineering Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz URL: http://www.freehdl.seul.org/ @@ -56,6 +56,9 @@ %{_mandir}/man5/* %changelog +* Fri Jul 18 2008 Tom "spot" Callaway 0.0.6-2 +- fix license tag + * Sat Apr 19 2008 Eric Tanguy 0.0.6-1 - Update to 0.0.6 From fedora-extras-commits at redhat.com Fri Jul 18 19:46:16 2008 From: fedora-extras-commits at redhat.com (William Eden Cohen (wcohen)) Date: Fri, 18 Jul 2008 19:46:16 GMT Subject: rpms/oprofile/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 oprofile.spec, 1.69, 1.70 oprofile-0.7-libs.patch, 1.4, 1.5 oprofile-0.9.3-xen.patch, 1.1, 1.2 oprofile-0.9.3-970MP.patch, 1.1, NONE oprofile-0.9.3-family10.patch, 1.1, NONE oprofile-0.9.3-fmtver.patch, 1.1, NONE oprofile-0.9.3-ld_options.patch, 1.2, NONE oprofile-0.9.3-ranges.patch, 1.1, NONE oprofile-gcc43.patch, 1.1, NONE Message-ID: <200807181946.m6IJkGCe009456@cvs-int.fedora.redhat.com> Author: wcohen Update of /cvs/pkgs/rpms/oprofile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9338 Modified Files: .cvsignore sources oprofile.spec oprofile-0.7-libs.patch oprofile-0.9.3-xen.patch Removed Files: oprofile-0.9.3-970MP.patch oprofile-0.9.3-family10.patch oprofile-0.9.3-fmtver.patch oprofile-0.9.3-ld_options.patch oprofile-0.9.3-ranges.patch oprofile-gcc43.patch Log Message: Update to orprofile 0.9.4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/oprofile/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Jul 2007 18:29:10 -0000 1.13 +++ .cvsignore 18 Jul 2008 19:45:30 -0000 1.14 @@ -1,5 +1 @@ -oprofile-0.8.2.tar.gz -oprofile-0.9.tar.gz -oprofile-0.9.1.tar.gz -oprofile-0.9.2.tar.gz -oprofile-0.9.3.tar.gz +oprofile-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/oprofile/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 17 Jul 2007 18:29:10 -0000 1.14 +++ sources 18 Jul 2008 19:45:30 -0000 1.15 @@ -1 +1 @@ -bb91e4d5bd45ff0d5c3e6214653422b7 oprofile-0.9.3.tar.gz +82b059379895cf125261d7d773465915 oprofile-0.9.4.tar.gz Index: oprofile.spec =================================================================== RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- oprofile.spec 23 Jun 2008 20:49:20 -0000 1.69 +++ oprofile.spec 18 Jul 2008 19:45:30 -0000 1.70 @@ -1,10 +1,10 @@ %define DATE 20070717 -%define oprofile_version 0.9.3 +%define oprofile_version 0.9.4 Summary: System wide profiler Name: oprofile -Version: 0.9.3 -Release: 18%{?dist} -License: GPL +Version: 0.9.4 +Release: 1%{?dist} +License: GPLv2 Group: Development/System # Source0: oprofile-%{version}.tar.gz @@ -13,12 +13,7 @@ Patch10: oprofile-0.4-guess2.patch Patch63: oprofile-0.7-libs.patch Patch83: oprofile-0.9.3-xen.patch -Patch92: oprofile-0.9.3-ld_options.patch -Patch93: oprofile-0.9.3-family10.patch -Patch94: oprofile-0.9.3-ranges.patch -Patch95: oprofile-0.9.3-970MP.patch -Patch96: oprofile-0.9.3-fmtver.patch -Patch100: oprofile-gcc43.patch +#Patch100: oprofile-gcc43.patch URL: http://oprofile.sf.net ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64 @@ -29,8 +24,12 @@ BuildRequires: elinks BuildRequires: gtk2-devel BuildRequires: automake +BuildRequires: libtool BuildRequires: binutils-devel BuildRequires: popt-devel +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: java-1.6.0-openjdk-devel BuildRoot: %{_tmppath}/%{name}-root @@ -60,23 +59,33 @@ %description gui The oprof_start GUI for oprofile. + +%package jit +Summary: Libraries required for profiling Java and other JITed code +Group: Development/System +Requires: oprofile = %{version}-%{release} +Requires: java >= 1.6 +Requires: jpackage-utils +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: /etc/ld.so.conf.d + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%description jit +This package includes a base JIT support library, as well as a Java +agent library. + + %prep %setup -q -n %{name}-%{version} %patch10 -p1 -b .guess2 #%patch35 -p1 -b .separate %patch63 -p1 -b .libs %patch83 -p1 -b .xen -#%patch87 -p1 -b .power6 -#%patch88 -p0 -b .core -#%patch89 -p0 -b .ppc64doc -#%patch90 -p0 -b .race -#%patch91 -p1 -b .k10 -%patch92 -p0 -b .ld_option -%patch93 -p0 -b .family10 -%patch94 -p0 -b .ranges -%patch95 -p1 -b .970MP -%patch96 -p0 -b .fmtver -%patch100 -p1 -b .gcc43 +#%patch100 -p1 -b .gcc43 ./autogen.sh @@ -106,7 +115,8 @@ --infodir=%{_infodir} \ --with-separate-debug-dir=/usr/lib/debug \ --enable-abi \ ---with-qt-dir=$QTDIR +--with-qt-dir=$QTDIR \ +--with-java=/usr/lib/jvm/java make CFLAGS="$RPM_OPT_FLAGS" @@ -142,9 +152,19 @@ #install -m 755 pp/liboppp.a $RPM_BUILD_ROOT/%{_libdir} install -m 755 libabi/libopabi.a $RPM_BUILD_ROOT/%{_libdir} +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{_libdir}/oprofile" > %{buildroot}/etc/ld.so.conf.d/oprofile-%{_arch}.conf + %clean rm -rf ${RPM_BUILD_ROOT} +%pre +getent group oprofile >/dev/null || groupadd -r oprofile +getent passwd oprofile >/dev/null || \ +useradd -r -g oprofile -d /home/oprofile -s /sbin/nologin \ + -c "Special user account to be used by OProfile" oprofile +exit 0 + %files %defattr(-,root,root) %doc doc/oprofile.html @@ -157,6 +177,7 @@ %{_bindir}/opreport %{_bindir}/oprofiled %{_bindir}/oparchive +%{_bindir}/opjitconv %{_mandir}/man1/ophelp.1.gz %{_mandir}/man1/opannotate.1.gz @@ -179,6 +200,7 @@ %{_includedir}/op_list.h %{_includedir}/op_sample_file.h %{_includedir}/op_types.h +%{_includedir}/opagent.h %{_libdir}/libodb.a %{_libdir}/libop.a @@ -186,12 +208,24 @@ %{_libdir}/liboputil++.a %{_libdir}/liboputil.a +%doc doc/op-jit-devel.html +%doc doc/opreport.xsd + %files gui %defattr(-,root,root) %{_bindir}/oprof_start +%files jit +%defattr(-,root,root) + +%{_libdir}/oprofile +/etc/ld.so.conf.d/* + %changelog +* Fri Jul 17 2008 Will Cohen - 0.9.4-1 +- Update to orprofile 0.9.4. + * Mon Jun 23 2008 Will Cohen - 0.9.3-18 - Fix default location for vmlinux. rhbz #451539 oprofile-0.7-libs.patch: Index: oprofile-0.7-libs.patch =================================================================== RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile-0.7-libs.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- oprofile-0.7-libs.patch 22 Sep 2006 18:17:22 -0000 1.4 +++ oprofile-0.7-libs.patch 18 Jul 2008 19:45:30 -0000 1.5 @@ -1,34 +1,37 @@ ---- oprofile-0.9.2/libutil/Makefile.am.libs 2003-09-26 09:23:32.000000000 -0400 -+++ oprofile-0.9.2/libutil/Makefile.am 2006-09-18 10:20:33.000000000 -0400 -@@ -2,8 +2,8 @@ +diff -up oprofile-0.9.4rc1/daemon/Makefile.am.libs oprofile-0.9.4rc1/daemon/Makefile.am +--- oprofile-0.9.4rc1/daemon/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400 ++++ oprofile-0.9.4rc1/daemon/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -43,9 +43,9 @@ bin_PROGRAMS = oprofiled - AM_CFLAGS = @OP_CFLAGS@ - --noinst_LIBRARIES = libutil.a --libutil_a_SOURCES = \ -+noinst_LIBRARIES = liboputil.a -+liboputil_a_SOURCES = \ - op_deviceio.c \ - op_lockfile.c \ - op_file.c \ ---- oprofile-0.9.2/libabi/tests/Makefile.am.libs 2005-08-04 14:27:28.000000000 -0400 -+++ oprofile-0.9.2/libabi/tests/Makefile.am 2006-09-18 10:27:20.000000000 -0400 -@@ -13,9 +13,9 @@ + oprofiled_LDADD = \ + liblegacy/liblegacy.a \ +- ../libabi/libabi.a \ ++ ../libabi/libopabi.a \ + ../libdb/libodb.a \ + ../libop/libop.a \ +- ../libutil/libutil.a ++ ../libutil/liboputil.a - abi_test_SOURCES = abi_test.cpp - abi_test_LDADD = \ -- ../libabi.a \ -+ ../libopabi.a \ - ../../libop/libop.a \ - ../../libdb/libodb.a \ - ../../libopt++/libopt++.a \ -- ../../libutil++/libutil++.a \ -- ../../libutil/libutil.a -+ ../../libutil++/liboputil++.a \ -+ ../../libutil/liboputil.a ---- oprofile-0.9.2/libabi/Makefile.am.libs 2005-08-04 14:27:27.000000000 -0400 -+++ oprofile-0.9.2/libabi/Makefile.am 2006-09-18 10:28:31.000000000 -0400 -@@ -10,15 +10,15 @@ + oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +diff -up oprofile-0.9.4rc1/gui/Makefile.am.libs oprofile-0.9.4rc1/gui/Makefile.am +--- oprofile-0.9.4rc1/gui/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400 ++++ oprofile-0.9.4rc1/gui/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -26,9 +26,9 @@ bin_PROGRAMS = oprof_start + oprof_start_SOURCES = $(dist_sources) + nodist_oprof_start_SOURCES = oprof_start.moc.cpp + oprof_start_LDADD = \ +- ../libutil++/libutil++.a \ ++ ../libutil++/liboputil++.a \ + ../libop/libop.a \ +- ../libutil/libutil.a \ ++ ../libutil/liboputil.a \ + ui/liboprof_start.a \ + @QT_LDFLAGS@ \ + @QT_LIB@ \ +diff -up oprofile-0.9.4rc1/libabi/Makefile.am.libs oprofile-0.9.4rc1/libabi/Makefile.am +--- oprofile-0.9.4rc1/libabi/Makefile.am.libs 2008-05-21 14:52:32.000000000 -0400 ++++ oprofile-0.9.4rc1/libabi/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -10,15 +10,15 @@ AM_CPPFLAGS = \ AM_CXXFLAGS = @OP_CXXFLAGS@ @@ -49,9 +52,66 @@ - ../libutil/libutil.a + ../libutil++/liboputil++.a \ + ../libutil/liboputil.a ---- oprofile-0.9.2/pp/Makefile.am.libs 2005-04-04 18:34:41.000000000 -0400 -+++ oprofile-0.9.2/pp/Makefile.am 2006-09-18 10:20:33.000000000 -0400 -@@ -19,9 +19,9 @@ +diff -up oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs oprofile-0.9.4rc1/libabi/tests/Makefile.am +--- oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs 2008-05-21 14:52:32.000000000 -0400 ++++ oprofile-0.9.4rc1/libabi/tests/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -13,9 +13,9 @@ check_PROGRAMS = abi_test + + abi_test_SOURCES = abi_test.cpp + abi_test_LDADD = \ +- ../libabi.a \ ++ ../libopabi.a \ + ../../libop/libop.a \ + ../../libdb/libodb.a \ + ../../libopt++/libopt++.a \ +- ../../libutil++/libutil++.a \ +- ../../libutil/libutil.a ++ ../../libutil++/liboputil++.a \ ++ ../../libutil/liboputil.a +diff -up oprofile-0.9.4rc1/libutil/Makefile.am.libs oprofile-0.9.4rc1/libutil/Makefile.am +--- oprofile-0.9.4rc1/libutil/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400 ++++ oprofile-0.9.4rc1/libutil/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -2,8 +2,8 @@ SUBDIRS = . tests + + AM_CFLAGS = @OP_CFLAGS@ + +-noinst_LIBRARIES = libutil.a +-libutil_a_SOURCES = \ ++noinst_LIBRARIES = liboputil.a ++liboputil_a_SOURCES = \ + op_deviceio.c \ + op_lockfile.c \ + op_file.c \ +diff -up oprofile-0.9.4rc1/libutil++/Makefile.am.libs oprofile-0.9.4rc1/libutil++/Makefile.am +--- oprofile-0.9.4rc1/libutil++/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400 ++++ oprofile-0.9.4rc1/libutil++/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -7,8 +7,8 @@ AM_CPPFLAGS= \ + + AM_CXXFLAGS = @OP_CXXFLAGS@ + +-noinst_LIBRARIES = libutil++.a +-libutil___a_SOURCES = \ ++noinst_LIBRARIES = liboputil++.a ++liboputil___a_SOURCES = \ + op_bfd.cpp \ + op_bfd.h \ + bfd_support.cpp \ +diff -up oprofile-0.9.4rc1/opjitconv/Makefile.am.libs oprofile-0.9.4rc1/opjitconv/Makefile.am +--- oprofile-0.9.4rc1/opjitconv/Makefile.am.libs 2008-06-01 13:42:53.000000000 -0400 ++++ oprofile-0.9.4rc1/opjitconv/Makefile.am 2008-06-01 13:43:04.000000000 -0400 +@@ -6,7 +6,7 @@ bin_PROGRAMS = opjitconv + LIBS = @BFD_LIBS@ + + needed_libs = \ +- ../libutil/libutil.a ++ ../libutil/liboputil.a + + opjitconv_LDADD = $(needed_libs) + +diff -up oprofile-0.9.4rc1/pp/Makefile.am.libs oprofile-0.9.4rc1/pp/Makefile.am +--- oprofile-0.9.4rc1/pp/Makefile.am.libs 2008-05-21 14:52:30.000000000 -0400 ++++ oprofile-0.9.4rc1/pp/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -19,9 +19,9 @@ common_libs = \ ../libpp/libpp.a \ ../libopt++/libopt++.a \ ../libregex/libop_regex.a \ @@ -63,52 +123,12 @@ ../libdb/libodb.a opreport_SOURCES = opreport.cpp \ ---- oprofile-0.9.2/utils/Makefile.am.libs 2005-03-31 12:20:41.000000000 -0500 -+++ oprofile-0.9.2/utils/Makefile.am 2006-09-18 10:20:33.000000000 -0400 -@@ -7,4 +7,4 @@ +diff -up oprofile-0.9.4rc1/utils/Makefile.am.libs oprofile-0.9.4rc1/utils/Makefile.am +--- oprofile-0.9.4rc1/utils/Makefile.am.libs 2008-05-21 14:52:31.000000000 -0400 ++++ oprofile-0.9.4rc1/utils/Makefile.am 2008-06-01 13:41:19.000000000 -0400 +@@ -7,4 +7,4 @@ bin_PROGRAMS = ophelp dist_bin_SCRIPTS = opcontrol ophelp_SOURCES = ophelp.c -ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a +ophelp_LDADD = ../libop/libop.a ../libutil/liboputil.a ---- oprofile-0.9.2/gui/Makefile.am.libs 2003-11-06 14:45:54.000000000 -0500 -+++ oprofile-0.9.2/gui/Makefile.am 2006-09-18 10:20:33.000000000 -0400 -@@ -26,9 +26,9 @@ - oprof_start_SOURCES = $(dist_sources) - nodist_oprof_start_SOURCES = oprof_start.moc.cpp - oprof_start_LDADD = \ -- ../libutil++/libutil++.a \ -+ ../libutil++/liboputil++.a \ - ../libop/libop.a \ -- ../libutil/libutil.a \ -+ ../libutil/liboputil.a \ - ui/liboprof_start.a \ - @QT_LDFLAGS@ \ - @QT_LIB@ \ ---- oprofile-0.9.2/libutil++/Makefile.am.libs 2005-04-22 15:29:21.000000000 -0400 -+++ oprofile-0.9.2/libutil++/Makefile.am 2006-09-18 10:20:33.000000000 -0400 -@@ -5,8 +5,8 @@ - -I ${top_srcdir}/libop - AM_CXXFLAGS = @OP_CXXFLAGS@ - --noinst_LIBRARIES = libutil++.a --libutil___a_SOURCES = \ -+noinst_LIBRARIES = liboputil++.a -+liboputil___a_SOURCES = \ - op_bfd.cpp \ - op_bfd.h \ - bfd_support.cpp \ ---- oprofile-0.9.2/daemon/Makefile.am.libs 2005-08-04 14:27:26.000000000 -0400 -+++ oprofile-0.9.2/daemon/Makefile.am 2006-09-18 10:25:46.000000000 -0400 -@@ -40,9 +40,9 @@ - - oprofiled_LDADD = \ - liblegacy/liblegacy.a \ -- ../libabi/libabi.a \ -+ ../libabi/libopabi.a \ - ../libdb/libodb.a \ - ../libop/libop.a \ -- ../libutil/libutil.a -+ ../libutil/liboputil.a - - oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ oprofile-0.9.3-xen.patch: Index: oprofile-0.9.3-xen.patch =================================================================== RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile-0.9.3-xen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oprofile-0.9.3-xen.patch 18 Jan 2008 17:01:44 -0000 1.1 +++ oprofile-0.9.3-xen.patch 18 Jul 2008 19:45:30 -0000 1.2 @@ -1,7 +1,7 @@ -diff -Naur oprofile-0.9.3/daemon/init.c oprofile-0.9.3-xen-r2/daemon/init.c ---- oprofile-0.9.3/daemon/init.c 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/init.c 2007-07-30 10:28:09.000000000 -0700 -@@ -226,6 +226,8 @@ +diff -up oprofile-0.9.4/daemon/init.c.orig oprofile-0.9.4/daemon/init.c +--- oprofile-0.9.4/daemon/init.c.orig 2008-04-28 17:23:24.000000000 -0400 ++++ oprofile-0.9.4/daemon/init.c 2008-07-18 11:26:04.000000000 -0400 +@@ -309,6 +309,8 @@ static void opd_26_init(void) opd_create_vmlinux(vmlinux, kernel_range); opd_create_xen(xenimage, xen_range); @@ -10,34 +10,11 @@ opd_buf_size = opd_read_fs_int("/dev/oprofile/", "buffer_size", 1); kernel_pointer_size = opd_read_fs_int("/dev/oprofile/", "pointer_size", 1); -diff -Naur oprofile-0.9.3/daemon/opd_interface.h oprofile-0.9.3-xen-r2/daemon/opd_interface.h ---- oprofile-0.9.3/daemon/opd_interface.h 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/opd_interface.h 2007-12-20 11:59:20.000000000 -0800 -@@ -27,8 +27,19 @@ - /* Code 9 used to be TRACE_END_CODE which is not used anymore */ - /* Code 9 is now considered an unknown escape code */ - #define XEN_ENTER_SWITCH_CODE 10 -+/* -+ * Ugly work-around for the unfortunate collision between Xenoprof's -+ * DOMAIN_SWITCH_CODE (in use on x86 and ia64) and Cell's SPU_PROFILING_CODE -+ * (in use with Power): -+ */ -+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) -+#define DOMAIN_SWITCH_CODE 11 -+#define LAST_CODE 12 -+#else - #define SPU_PROFILING_CODE 11 - #define SPU_CTX_SWITCH_CODE 12 --#define LAST_CODE 13 -+#define DOMAIN_SWITCH_CODE 13 -+#define LAST_CODE 14 -+#endif - - #endif /* OPD_INTERFACE_H */ -diff -Naur oprofile-0.9.3/daemon/opd_kernel.c oprofile-0.9.3-xen-r2/daemon/opd_kernel.c ---- oprofile-0.9.3/daemon/opd_kernel.c 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/opd_kernel.c 2007-08-02 09:46:27.000000000 -0700 -@@ -34,11 +34,22 @@ +diff -up oprofile-0.9.4/daemon/opd_interface.h.orig oprofile-0.9.4/daemon/opd_interface.h +diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kernel.c +--- oprofile-0.9.4/daemon/opd_kernel.c.orig 2006-01-16 08:21:09.000000000 -0500 ++++ oprofile-0.9.4/daemon/opd_kernel.c 2008-07-18 11:26:04.000000000 -0400 +@@ -34,11 +34,22 @@ static struct kernel_image vmlinux_image static struct kernel_image xen_image; @@ -60,7 +37,7 @@ /* for no vmlinux */ if (no_vmlinux) { vmlinux_image.name = "no-vmlinux"; -@@ -57,13 +68,22 @@ +@@ -57,13 +68,22 @@ void opd_create_vmlinux(char const * nam vmlinux_image.start, vmlinux_image.end); exit(EXIT_FAILURE); } @@ -83,7 +60,7 @@ /* for no xen */ if (no_xen) { xen_image.name = "no-xen"; -@@ -72,18 +92,106 @@ +@@ -72,18 +92,106 @@ void opd_create_xen(char const * name, c xen_image.name = xstrdup(name); @@ -192,7 +169,7 @@ /** * Allocate and initialise a kernel image description -@@ -210,6 +318,75 @@ +@@ -210,6 +318,75 @@ struct kernel_image * find_kernel_image( struct list_head * pos; struct kernel_image * image = &vmlinux_image; @@ -268,7 +245,7 @@ if (no_vmlinux) return image; -@@ -222,8 +399,5 @@ +@@ -222,8 +399,5 @@ struct kernel_image * find_kernel_image( return image; } @@ -278,10 +255,10 @@ - return NULL; + return &vmlinux_image_anon; } -diff -Naur oprofile-0.9.3/daemon/opd_kernel.h oprofile-0.9.3-xen-r2/daemon/opd_kernel.h ---- oprofile-0.9.3/daemon/opd_kernel.h 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/opd_kernel.h 2007-07-30 10:28:09.000000000 -0700 -@@ -23,8 +23,12 @@ +diff -up oprofile-0.9.4/daemon/opd_kernel.h.orig oprofile-0.9.4/daemon/opd_kernel.h +--- oprofile-0.9.4/daemon/opd_kernel.h.orig 2006-01-16 08:21:09.000000000 -0500 ++++ oprofile-0.9.4/daemon/opd_kernel.h 2008-07-18 11:26:04.000000000 -0400 +@@ -23,8 +23,12 @@ struct transient; /** create the kernel image */ void opd_create_vmlinux(char const * name, char const * arg); @@ -294,7 +271,7 @@ /** opd_reread_module_info - parse /proc/modules for kernel modules */ void opd_reread_module_info(void); -@@ -33,6 +37,7 @@ +@@ -33,6 +37,7 @@ struct kernel_image { char * name; vma_t start; vma_t end; @@ -302,80 +279,10 @@ struct list_head list; }; -diff -Naur oprofile-0.9.3/daemon/opd_perfmon.c oprofile-0.9.3-xen-r2/daemon/opd_perfmon.c ---- oprofile-0.9.3/daemon/opd_perfmon.c 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/opd_perfmon.c 2007-12-20 12:07:50.000000000 -0800 -@@ -380,6 +380,7 @@ - close(child->up_pipe[1]); - } - -+static struct child* xen_ctx; - - void perfmon_init(void) - { -@@ -389,6 +390,24 @@ - if (cpu_type == CPU_TIMER_INT) - return; - -+ if (!no_xen) { -+ xen_ctx = xmalloc(sizeof(struct child)); -+ xen_ctx->pid = getpid(); -+ xen_ctx->up_pipe[0] = -1; -+ xen_ctx->up_pipe[1] = -1; -+ xen_ctx->sigusr1 = 0; -+ xen_ctx->sigusr2 = 0; -+ xen_ctx->sigterm = 0; -+ -+ create_context(xen_ctx); -+ -+ write_pmu(xen_ctx); -+ -+ load_context(xen_ctx); -+ return; -+ } -+ -+ - nr = sysconf(_SC_NPROCESSORS_ONLN); - if (nr == -1) { - fprintf(stderr, "Couldn't determine number of CPUs.\n"); -@@ -431,6 +450,9 @@ - if (cpu_type == CPU_TIMER_INT) - return; - -+ if (!no_xen) -+ return; -+ - for (i = 0; i < nr_cpus; ++i) { - kill(children[i].pid, SIGKILL); - waitpid(children[i].pid, NULL, 0); -@@ -445,6 +467,11 @@ - if (cpu_type == CPU_TIMER_INT) - return; - -+ if (!no_xen) { -+ perfmon_start_child(xen_ctx->ctx_fd); -+ return; -+ } -+ - for (i = 0; i < nr_cpus; ++i) - kill(children[i].pid, SIGUSR1); - } -@@ -457,6 +484,11 @@ - if (cpu_type == CPU_TIMER_INT) - return; - -+ if (!no_xen) { -+ perfmon_stop_child(xen_ctx->ctx_fd); -+ return; -+ } -+ - for (i = 0; i < nr_cpus; ++i) - kill(children[i].pid, SIGUSR2); - } -diff -Naur oprofile-0.9.3/daemon/opd_sfile.c oprofile-0.9.3-xen-r2/daemon/opd_sfile.c ---- oprofile-0.9.3/daemon/opd_sfile.c 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/opd_sfile.c 2007-07-30 10:28:09.000000000 -0700 -@@ -234,7 +234,7 @@ +diff -up oprofile-0.9.4/daemon/opd_sfile.c.orig oprofile-0.9.4/daemon/opd_sfile.c +--- oprofile-0.9.4/daemon/opd_sfile.c.orig 2007-05-10 19:42:33.000000000 -0400 ++++ oprofile-0.9.4/daemon/opd_sfile.c 2008-07-18 11:26:10.000000000 -0400 +@@ -234,7 +234,7 @@ struct sfile * sfile_find(struct transie } /* we might need a kernel image start/end to hash on */ @@ -384,9 +291,9 @@ ki = find_kernel_image(trans); if (!ki) { verbprintf(vsamples, "Lost kernel sample %llx\n", trans->pc); -diff -Naur oprofile-0.9.3/daemon/opd_trans.c oprofile-0.9.3-xen-r2/daemon/opd_trans.c ---- oprofile-0.9.3/daemon/opd_trans.c 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/opd_trans.c 2007-12-20 12:03:23.000000000 -0800 +diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.c +--- oprofile-0.9.4/daemon/opd_trans.c.orig 2008-01-14 21:05:47.000000000 -0500 ++++ oprofile-0.9.4/daemon/opd_trans.c 2008-07-18 11:34:07.000000000 -0400 @@ -31,6 +31,8 @@ #include #include @@ -396,7 +303,7 @@ extern size_t kernel_pointer_size; -@@ -203,6 +205,9 @@ +@@ -203,6 +205,9 @@ static void code_kernel_enter(struct tra { verbprintf(vmisc, "KERNEL_ENTER_SWITCH to kernel\n"); trans->in_kernel = 1; @@ -406,7 +313,7 @@ clear_trans_current(trans); /* subtlety: we must keep trans->cookie cached, * even though it's meaningless for the kernel - -@@ -216,6 +221,9 @@ +@@ -216,6 +221,9 @@ static void code_user_enter(struct trans { verbprintf(vmisc, "USER_ENTER_SWITCH to user-space\n"); trans->in_kernel = 0; @@ -416,7 +323,7 @@ clear_trans_current(trans); clear_trans_last(trans); } -@@ -244,15 +252,33 @@ +@@ -244,15 +252,33 @@ static void code_trace_begin(struct tran static void code_xen_enter(struct transient * trans) { verbprintf(vmisc, "XEN_ENTER_SWITCH to xen\n"); @@ -456,26 +363,17 @@ } extern void code_spu_profiling(struct transient * trans); -@@ -271,8 +297,16 @@ - &code_trace_begin, - &code_unknown, - &code_xen_enter, -+/* -+ * Ugly work-around for the unfortunate collision between Xenoprof's -+ * DOMAIN_SWITCH_CODE (in use on x86 and ia64) and Cell's SPU_PROFILING_CODE -+ * (in use with Power): -+ */ -+#if !defined(__i386__) && !defined(__x86_64__) && !defined(__ia64__) +@@ -275,6 +301,7 @@ handler_t handlers[LAST_CODE + 1] = { &code_spu_profiling, &code_spu_ctx_switch, -+#endif -+ &code_domain_switch, + #endif ++ &code_domain_switch, + &code_unknown, }; - extern void (*special_processor)(struct transient *); -diff -Naur oprofile-0.9.3/daemon/opd_trans.h oprofile-0.9.3-xen-r2/daemon/opd_trans.h ---- oprofile-0.9.3/daemon/opd_trans.h 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/opd_trans.h 2007-07-30 10:28:09.000000000 -0700 +diff -up oprofile-0.9.4/daemon/opd_trans.h.orig oprofile-0.9.4/daemon/opd_trans.h +--- oprofile-0.9.4/daemon/opd_trans.h.orig 2007-05-10 19:42:33.000000000 -0400 ++++ oprofile-0.9.4/daemon/opd_trans.h 2008-07-18 11:26:10.000000000 -0400 @@ -21,6 +21,10 @@ #include @@ -487,10 +385,10 @@ struct sfile; struct anon_mapping; -diff -Naur oprofile-0.9.3/daemon/oprofiled.c oprofile-0.9.3-xen-r2/daemon/oprofiled.c ---- oprofile-0.9.3/daemon/oprofiled.c 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/oprofiled.c 2007-07-30 10:28:09.000000000 -0700 -@@ -67,6 +67,7 @@ +diff -up oprofile-0.9.4/daemon/oprofiled.c.orig oprofile-0.9.4/daemon/oprofiled.c +--- oprofile-0.9.4/daemon/oprofiled.c.orig 2008-04-28 17:23:23.000000000 -0400 ++++ oprofile-0.9.4/daemon/oprofiled.c 2008-07-18 11:26:10.000000000 -0400 +@@ -68,6 +68,7 @@ char * session_dir; int no_xen; char * xenimage; char * xen_range; @@ -498,7 +396,7 @@ static char * verbose; static char * binary_name_filter; static char * events; -@@ -86,6 +87,7 @@ +@@ -87,6 +88,7 @@ static struct poptOption options[] = { { "xen-range", 0, POPT_ARG_STRING, &xen_range, 0, "Xen VMA range", "start-end", }, { "xen-image", 0, POPT_ARG_STRING, &xenimage, 0, "Xen image", "file", }, { "image", 0, POPT_ARG_STRING, &binary_name_filter, 0, "image name filter", "profile these comma separated image" }, @@ -506,20 +404,20 @@ { "separate-lib", 0, POPT_ARG_INT, &separate_lib, 0, "separate library samples for each distinct application", "[0|1]", }, { "separate-kernel", 0, POPT_ARG_INT, &separate_kernel, 0, "separate kernel samples for each distinct application", "[0|1]", }, { "separate-thread", 0, POPT_ARG_INT, &separate_thread, 0, "thread-profiling mode", "[0|1]" }, -diff -Naur oprofile-0.9.3/daemon/oprofiled.h oprofile-0.9.3-xen-r2/daemon/oprofiled.h ---- oprofile-0.9.3/daemon/oprofiled.h 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/daemon/oprofiled.h 2007-07-30 10:28:09.000000000 -0700 -@@ -64,5 +64,6 @@ +diff -up oprofile-0.9.4/daemon/oprofiled.h.orig oprofile-0.9.4/daemon/oprofiled.h +--- oprofile-0.9.4/daemon/oprofiled.h.orig 2008-04-28 17:23:23.000000000 -0400 ++++ oprofile-0.9.4/daemon/oprofiled.h 2008-07-18 11:26:10.000000000 -0400 +@@ -65,5 +65,6 @@ extern char * kernel_range; extern int no_xen; extern char * xenimage; extern char * xen_range; +extern char * xen_passive_setup; #endif /* OPROFILED_H */ -diff -Naur oprofile-0.9.3/doc/opcontrol.1.in oprofile-0.9.3-xen-r2/doc/opcontrol.1.in ---- oprofile-0.9.3/doc/opcontrol.1.in 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/doc/opcontrol.1.in 2007-07-30 10:28:09.000000000 -0700 -@@ -147,12 +147,41 @@ +diff -up oprofile-0.9.4/doc/opcontrol.1.in.orig oprofile-0.9.4/doc/opcontrol.1.in +--- oprofile-0.9.4/doc/opcontrol.1.in.orig 2007-08-14 15:05:37.000000000 -0400 ++++ oprofile-0.9.4/doc/opcontrol.1.in 2008-07-18 11:26:10.000000000 -0400 +@@ -149,12 +149,41 @@ Xen image .br .TP .BI "--active-domains=" @@ -563,10 +461,10 @@ .br .SH ENVIRONMENT -diff -Naur oprofile-0.9.3/utils/opcontrol oprofile-0.9.3-xen-r2/utils/opcontrol ---- oprofile-0.9.3/utils/opcontrol 2007-07-16 11:22:17.000000000 -0700 -+++ oprofile-0.9.3-xen-r2/utils/opcontrol 2007-07-30 12:22:19.000000000 -0700 -@@ -144,9 +144,16 @@ +diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol +--- oprofile-0.9.4/utils/opcontrol.orig 2008-04-28 17:23:23.000000000 -0400 ++++ oprofile-0.9.4/utils/opcontrol 2008-07-18 11:26:10.000000000 -0400 +@@ -158,9 +158,16 @@ do_help() --cpu-buffer-size=num per-cpu buffer size in units (2.6 only) --note-table-size kernel notes buffer size in notes units (2.4 only) @@ -586,7 +484,7 @@ " >&2 } -@@ -289,6 +296,9 @@ +@@ -303,6 +310,9 @@ do_init() SETUP_DIR="/root/.oprofile" SETUP_FILE="$SETUP_DIR/daemonrc" @@ -596,7 +494,7 @@ # initialize daemon vars decide_oprofile_device_mount CPUTYPE=`cat $MOUNT/cpu_type` -@@ -433,7 +443,7 @@ +@@ -447,7 +457,7 @@ do_load_setup() } @@ -605,7 +503,7 @@ { if test -z "$VMLINUX"; then echo "No vmlinux file specified. You must specify the correct vmlinux file, e.g." >&2 -@@ -454,8 +464,12 @@ +@@ -468,8 +478,12 @@ check_valid_args() echo "The specified vmlinux file \"$VMLINUX\" doesn't exist." >&2 exit 1 @@ -618,7 +516,7 @@ if test -f "$XENIMAGE"; then return fi -@@ -511,6 +525,76 @@ +@@ -529,6 +543,76 @@ get_image_range() fi } @@ -695,7 +593,7 @@ # validate --separate= parameters. This function is called with IFS=, # so on each argument is splitted -@@ -825,6 +909,16 @@ +@@ -843,6 +927,16 @@ do_options() ACTIVE_DOMAINS=$val DO_SETUP=yes ;; @@ -712,7 +610,7 @@ --note-table-size) error_if_empty $arg $val if test "$KERNEL_SUPPORT" = "yes"; then -@@ -897,6 +991,16 @@ +@@ -915,6 +1009,16 @@ do_options() exit 1 fi fi @@ -729,7 +627,7 @@ } -@@ -1167,6 +1271,15 @@ +@@ -1230,6 +1334,15 @@ do_param_setup() fi fi @@ -745,7 +643,7 @@ if test $NOTE_SIZE != 0; then set_param notesize $NOTE_SIZE fi -@@ -1284,7 +1397,8 @@ +@@ -1360,7 +1473,8 @@ do_start_daemon() fi do_setup @@ -755,7 +653,7 @@ get_image_range "linux" get_image_range "xen" do_param_setup -@@ -1312,6 +1426,10 @@ +@@ -1388,6 +1502,10 @@ do_start_daemon() OPD_ARGS="$OPD_ARGS --image=$IMAGE_FILTER" fi @@ -766,8 +664,8 @@ if test -n "$VERBOSE"; then OPD_ARGS="$OPD_ARGS --verbose=$VERBOSE" fi -@@ -1522,6 +1640,8 @@ - move_and_remove $SAMPLES_DIR/current/{root} +@@ -1582,6 +1700,8 @@ do_save_session() + fi hup_daemon + @@ -775,7 +673,7 @@ } -@@ -1552,7 +1672,8 @@ +@@ -1631,7 +1751,8 @@ do_operations() fi if test "$SETUP" = "yes"; then --- oprofile-0.9.3-970MP.patch DELETED --- --- oprofile-0.9.3-family10.patch DELETED --- --- oprofile-0.9.3-fmtver.patch DELETED --- --- oprofile-0.9.3-ld_options.patch DELETED --- --- oprofile-0.9.3-ranges.patch DELETED --- --- oprofile-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 19:46:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 19:46:30 GMT Subject: rpms/freetennis/devel freetennis.spec,1.8,1.9 Message-ID: <200807181946.m6IJkUq9009459@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/freetennis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9393 Modified Files: freetennis.spec Log Message: fix license tag Index: freetennis.spec =================================================================== RCS file: /cvs/pkgs/rpms/freetennis/devel/freetennis.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- freetennis.spec 23 Apr 2008 17:03:56 -0000 1.8 +++ freetennis.spec 18 Jul 2008 19:45:35 -0000 1.9 @@ -3,11 +3,11 @@ Name: freetennis Version: 0.4.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Tennis simulation game Group: Amusements/Games -License: GPL +License: GPLv2+ URL: http://freetennis.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: freetennis.desktop @@ -79,6 +79,9 @@ %{_datadir}/icons/hicolor/48x48/apps/freetennis.png %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.4.8-12 +- fix license tag + * Wed Apr 23 2008 Richard W.M. Jones - 0.4.8-11 - Rebuild for OCaml 3.10.2 From fedora-extras-commits at redhat.com Fri Jul 18 19:49:49 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Fri, 18 Jul 2008 19:49:49 GMT Subject: rpms/ltsp/F-9 .cvsignore, 1.12, 1.13 ltsp.spec, 1.20, 1.21 sources, 1.16, 1.17 Message-ID: <200807181949.m6IJnnUZ009640@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9605 Modified Files: .cvsignore ltsp.spec sources Log Message: Ensure that ltsp-chroot-setup is run after chroot creation. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 16 Jul 2008 20:54:32 -0000 1.12 +++ .cvsignore 18 Jul 2008 19:49:07 -0000 1.13 @@ -1 +1 @@ -ltsp-5.1.12.tar.bz2 +ltsp-5.1.13.tar.bz2 Index: ltsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ltsp.spec 17 Jul 2008 16:35:40 -0000 1.20 +++ ltsp.spec 18 Jul 2008 19:49:07 -0000 1.21 @@ -1,8 +1,8 @@ Name: ltsp -Version: 5.1.12 -%define _datestamp .20080717.12 +Version: 5.1.13 +%define _datestamp .20080718.14 #Release: 0%{_datestamp}%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Linux Terminal Server Project Server and Client Group: User Interface/Desktops @@ -342,10 +342,11 @@ %endif %changelog -* Thu Jul 17 2008 Warren Togami - 5.1.12-2 +* Fri Jul 18 2008 Warren Togami - 5.1.13-1 - Add some spec conditionals for RHEL5. RHEL5 has only ltsp-server. Client chroot must be Fedora 9+, so there is no RHEL5 build of ltsp-client. +- Ensure that ltsp-chroot-setup is run after chroot creation. * Wed Jul 16 2008 Warren Togami - 5.1.12-1 - Move some chroot setup into ltsp-client %%post so things can be fixed Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 16 Jul 2008 20:54:32 -0000 1.16 +++ sources 18 Jul 2008 19:49:07 -0000 1.17 @@ -1 +1 @@ -63e0f7ebbd4001c1f41a57f32a155a3c ltsp-5.1.12.tar.bz2 +919c5649823ca615ee53798e8be31d35 ltsp-5.1.13.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 19:59:55 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Fri, 18 Jul 2008 19:59:55 GMT Subject: rpms/gxine/F-9 gxine.spec,1.23,1.24 Message-ID: <200807181959.m6IJxtoh010005@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/gxine/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9919 Modified Files: gxine.spec Log Message: Rebuild for new xulrunner. Index: gxine.spec =================================================================== RCS file: /cvs/extras/rpms/gxine/F-9/gxine.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gxine.spec 9 Feb 2008 12:36:17 -0000 1.23 +++ gxine.spec 18 Jul 2008 19:59:01 -0000 1.24 @@ -1,23 +1,6 @@ -%if 0%{?fedora} > 8 - %define use_xulrunner_js 1 - %define gecko_dev_ver 1.9 - %define gecko_libs_ver %{gecko_dev_ver} -%else - %define use_xulrunner_js 0 - %if 0%{?rhel} == 5 - %define use_firefox_js 1 - %define gecko_dev_ver 1.8.0.12 - %define gecko_libs_ver %{gecko_dev_ver} - %else - %define use_firefox_js 0 - %endif -%endif - - - Name: gxine Version: 0.5.11 -Release: 17%{?dist} +Release: 18%{?dist} Summary: GTK frontend for the xine multimedia library Group: Applications/Multimedia @@ -31,11 +14,7 @@ Patch2: gxine-0.5.11-xine-version-check.patch -%if 0%{?use_xulrunner_js}%{?use_firefox_js} -BuildRequires: gecko-devel = %{gecko_dev_ver} -%else -BuildRequires: js-devel -%endif +BuildRequires: gecko-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gtk2-devel @@ -43,20 +22,14 @@ # for dbus support BuildRequires: dbus-glib-devel -# for LIRC support (not available only for fedora) -%if 0%{?fedora} +# for LIRC support (available only for fedora) BuildRequires: lirc-devel -%endif # for XTest support BuildRequires: libXtst-devel # for mozplugin BuildRequires: libXaw-devel BuildRequires: nspr-devel -%if 0%{?use_xulrunner_js}%{?use_firefox_js} -Requires: gecko-libs = %{gecko_libs_ver} -%endif - %description gxine is a fully-featured free audio/video player for unix-like systems which uses libxine for audio/video decoding and playback. For more informations on @@ -67,15 +40,7 @@ Summary: Mozilla plugin for gxine Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%if 0%{?use_xulrunner_js} -Requires: xulrunner -%else -%if 0%{?use_firefox_js} -Requires: firefox -%else -Requires: %{_libdir}/mozilla/plugins -%endif -%endif +Requires: mozilla-filesystem %description mozplugin This plugin allows gxine to be embedded in a web browser. @@ -107,11 +72,7 @@ mkdir -p %{buildroot}%{_libdir}/mozilla/plugins/ mv %{buildroot}%{_libdir}/gxine/gxineplugin.so %{buildroot}%{_libdir}/mozilla/plugins/ # Not supported yet - check bz #213041 -%if 0%{?fedora} >= 8 %find_lang %{name} --all-name -%else -/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name -%endif desktop-file-install --vendor="fedora" --delete-original \ --dir %{buildroot}%{_datadir}/applications \ @@ -152,6 +113,11 @@ %{_libdir}/mozilla/plugins/gxineplugin.so %changelog +* Fri Jul 18 2008 Martin Sourada - 0.5.11-18 +- rebuild for new xulrunner +- drop versioned dependency on gecko (we are using only stable API) +- drop dist conditionals to keep the spec cleaner + * Sat Feb 09 2008 Martin Sourada - 0.5.11-17 - add patch to support x.y.z.w version strings in xine-lib From fedora-extras-commits at redhat.com Fri Jul 18 20:01:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 20:01:28 GMT Subject: rpms/akonadi/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807182001.m6IK1SYE016655@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10043 Modified Files: .cvsignore sources Log Message: * Wed Jun 18 2008 Rex Dieter 0.82.0-1 - akonadi-0.82.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 May 2008 15:50:12 -0000 1.1 +++ .cvsignore 18 Jul 2008 20:00:44 -0000 1.2 @@ -0,0 +1 @@ +akonadi-0.82.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2008 15:50:12 -0000 1.1 +++ sources 18 Jul 2008 20:00:44 -0000 1.2 @@ -0,0 +1 @@ +a6ab075c69a54abc024285a76673110b akonadi-0.82.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 20:01:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 20:01:28 GMT Subject: rpms/fuse-convmvfs/devel fuse-convmvfs.spec,1.6,1.7 Message-ID: <200807182001.m6IK1SQT016659@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/fuse-convmvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10032 Modified Files: fuse-convmvfs.spec Log Message: fix license tag Index: fuse-convmvfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/fuse-convmvfs/devel/fuse-convmvfs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fuse-convmvfs.spec 19 Feb 2008 04:52:54 -0000 1.6 +++ fuse-convmvfs.spec 18 Jul 2008 20:00:41 -0000 1.7 @@ -1,10 +1,10 @@ Name: fuse-convmvfs Version: 0.2.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: FUSE-Filesystem to convert filesystem encodings Group: System Environment/Base -License: GPL +License: GPLv2 URL: http://fuse-convmvfs.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/fuse-convmvfs/fuse-convmvfs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,6 +41,9 @@ %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 0.2.4-7 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.2.4-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 18 20:02:15 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 20:02:15 GMT Subject: rpms/libcaptury/F-9 libcaptury.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807182002.m6IK2FXw016778@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libcaptury/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16662 Modified Files: .cvsignore sources Added Files: libcaptury.spec Log Message: * Sat May 3 2008 Shawn Starr 0.3.0-0.1.20080323gitcca4e3c - Initial Fedora package. --- NEW FILE libcaptury.spec --- %define captury_version 0.3.0 # Tarfile created using git # git clone git://gitorious.org/libcaptury/mainline.git libcaptury # cd libcaptury # git-archive --format=tar --prefix=libcaptury-%{captury_version}/ %{git_version} | bzip2 > libcaptury-%{captury_version}-%{gitdate}.tar.bz2 %define gitdate 20080323 %define git_version cca4e3c %define tarfile %{name}-%{captury_version}-%{gitdate}.tar.bz2 %define snapshot %{gitdate}git%{git_version} Summary: A library for X11/OpenGL video capturing framework Name: libcaptury Version: %{captury_version} Release: 0.1.%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitorious.org/projects/libcaptury/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: libcapseo-devel BuildRequires: libX11-devel BuildRequires: libXfixes-devel BuildRequires: libogg-devel # Fedora specific snapshot no upstream release (yet) Source0: %{tarfile} %description Captury is a realtime multimedia capturing framework for currently OpenGL video (to be extended to XShm and audio/alsa soon). Its uses are e.g. for capturing video from external OpenGL applications (via captury itself) and is currently also used by KDE's kwin to record your desktop efficiently (VideoRecord plugin). Captury supports full encoding as well as incremential(!) encoding by only regions from the screen that have actually changed. Window managers (like kwin) do know of such areas and can make use of it. %package devel Summary: Developer and header files for captury Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libcapseo-devel Requires: libXfixes-devel Requires: pkgconfig %description devel Developer and header files for the captury movie capturing framework. %prep %setup -q -n %{name}-%{version} ./autogen.sh %build %configure --disable-static make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -rf %{buildroot}/%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/captury/*.h %{_libdir}/libcaptury.so %{_libdir}/pkgconfig/libcaptury.pc %changelog * Sat May 3 2008 Shawn Starr 0.3.0-0.1.20080323gitcca4e3c - Initial Fedora package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libcaptury/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2008 20:17:32 -0000 1.1 +++ .cvsignore 18 Jul 2008 20:01:29 -0000 1.2 @@ -0,0 +1 @@ +libcaptury-0.3.0-20080323.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcaptury/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2008 20:17:32 -0000 1.1 +++ sources 18 Jul 2008 20:01:29 -0000 1.2 @@ -0,0 +1 @@ +74a9ae0656947da70a52db0769232cef libcaptury-0.3.0-20080323.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 20:04:02 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 20:04:02 GMT Subject: rpms/akonadi/F-9 akonadi.spec,NONE,1.1 Message-ID: <200807182004.m6IK42BH016889@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16881 Added Files: akonadi.spec Log Message: * Wed Jun 18 2008 Rex Dieter 0.82.0-1 - akonadi-0.82.0 --- NEW FILE akonadi.spec --- #define revision 812787 Summary: PIM Storage Service Name: akonadi Version: 0.82.0 Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://pim.kde.org/akonadi/ # checked out from svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/ #Source0: akonadi-%{revision}.tar.bz2 Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: cmake BuildRequires: qt4-devel >= 4.4 BuildRequires: automoc BuildRequires: mysql-devel # for xsltproc BuildRequires: libxslt BuildRequires: shared-mime-info %description %{summary}. %package devel Summary: Developer files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: qt4-devel Requires: pkgconfig %description devel %{summary}. %prep %setup -q %build %cmake . -DCONFIG_INSTALL_DIR=%{_sysconfdir} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig update-mime-database %{_datadir}/mime &> /dev/null || : %postun /sbin/ldconfig update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) %doc AUTHORS lgpl-license %dir %{_sysconfdir}/akonadi/ %config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf %{_bindir}/akonadi_control %{_bindir}/akonadictl %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.* # own this completely for now, see #334681) %{_datadir}/dbus-1/interfaces/ #%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_datadir}/mime/packages/akonadi-mime.xml %files devel %defattr(-,root,root,-) %{_includedir}/akonadi/ %{_libdir}/pkgconfig/akonadi.pc %{_libdir}/libakonadi*.so %changelog * Wed Jun 18 2008 Rex Dieter 0.82.0-1 - akonadi-0.82.0 * Tue Jun 3 2008 Kevin Kofler 0.81.0-0.2.20080526svn812787 - BR automoc, drop automoc hack * Mon May 26 2008 Kevin Kofler 0.81.0-0.1.20080526svn812787 - update to revision 812787 from KDE SVN (to match KDE 4.1 Beta 1) - restore builtin automoc4 for now - update file list, require pkgconfig in -devel (.pc file now included) * Mon May 5 2008 Kevin Kofler 0.80.0-2 - -devel: remove bogus Requires: pkgconfig * Sat May 3 2008 Kevin Kofler 0.80.0-1 - first Fedora package From fedora-extras-commits at redhat.com Fri Jul 18 20:16:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 18 Jul 2008 20:16:28 GMT Subject: rpms/phonon/F-9 phonon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807182016.m6IKGSpv017257@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17219 Modified Files: .cvsignore sources Added Files: phonon.spec Log Message: * Mon Jul 14 2008 Rex Dieter 4.2-0.4.beta2 - BR: automoc4 - -backend-gstreamer subpkg --- NEW FILE phonon.spec --- #define svn 20080614svn820634 %define beta 4.1.83 %define beta_tag beta2 Summary: Multimedia framework api Name: phonon Version: 4.2 Release: 0.4.%{?beta_tag}%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ # checked out from svn://anonsvn.kde.org/home/kde/branches/phonon/4.2 #Source0: %{name}-%{version}-%{svn}.tar.bz2 Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/phonon-%{beta}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automoc4 BuildRequires: cmake BuildRequires: glib2-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: kde-filesystem BuildRequires: libxml2-devel BuildRequires: qt4-devel Requires: phonon-backend %description %{summary}. %package backend-gstreamer Summary: Gstreamer phonon backend Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} # not sure exactly how best to version this one -- Rex Provides: phonon-backend = %{version}-%{release} # (temporary) upgrade path Obsoletes: phonon < 4.2-0.4 %description backend-gstreamer %{summary}. %package devel Summary: Developer files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: qt4-devel Requires: pkgconfig %description devel %{summary}. %prep %setup -q -n phonon-%{beta} %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} .. popd make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING.LIB %{_libdir}/libphonon*.so.* %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml # kde4-specific dirs %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/ %dir %{_kde4_datadir}/kde4/services/phononbackends/ %files backend-gstreamer %defattr(-,root,root,-) %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop %files devel %defattr(-,root,root,-) %dir %{_includedir}/KDE %{_includedir}/KDE/Phonon/ %{_includedir}/phonon/ %{_libdir}/pkgconfig/phonon.pc %{_libdir}/libphonon*.so %changelog * Mon Jul 14 2008 Rex Dieter 4.2-0.4.beta2 - BR: automoc4 - -backend-gstreamer subpkg * Tue Jul 01 2008 Kevin Kofler 4.2-0.3.beta2 - drop automoc libsuffix patch, no longer needed * Fri Jun 20 2008 Rex Dieter 4.2-0.2.beta2 - phonon 4.2beta2 (aka 4.1.83) * Sat Jun 14 2008 Rex Dieter 4.2-0.1.20080614svn820634 - first try Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Jun 2008 20:15:02 -0000 1.1 +++ .cvsignore 18 Jul 2008 20:15:35 -0000 1.2 @@ -0,0 +1 @@ +phonon-4.1.83.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Jun 2008 20:15:02 -0000 1.1 +++ sources 18 Jul 2008 20:15:35 -0000 1.2 @@ -0,0 +1 @@ +7d0ae1321e7f013ce92b39548134b770 phonon-4.1.83.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 20:38:10 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven)) Date: Fri, 18 Jul 2008 20:38:10 GMT Subject: comps/po pl.po,1.16,1.17 Message-ID: <200807182038.m6IKcA0a017953@cvs-int.fedora.redhat.com> Author: raven Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17929/comps/po Modified Files: pl.po Log Message: Updated Polish translation Index: pl.po =================================================================== RCS file: /cvs/pkgs/comps/po/pl.po,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- pl.po 17 Jul 2008 18:31:24 -0000 1.16 +++ pl.po 18 Jul 2008 20:37:39 -0000 1.17 @@ -10,7 +10,7 @@ "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2008-04-16 23:08+0200\n" +"PO-Revision-Date: 2008-07-18 22:36+0200\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -1140,13 +1140,12 @@ msgstr "Obs??uga p????nocnego sami" #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133 -#, fuzzy msgid "SUGAR Desktop Environment" -msgstr "??rodowiska graficzne" +msgstr "??rodowisko graficzne SUGAR" #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134 msgid "SUGAR is the desktop environment developed for the OLPC XO." -msgstr "" +msgstr "SUGAR jest ??rodowiskiem graficznym zaprojektowanym dla OLPC XO." #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204 msgid "Walloon Support" @@ -1154,20 +1153,19 @@ #: ../comps-f10.xml.in.h:70 msgid "Haskell" -msgstr "" +msgstr "Haskell" #: ../comps-f10.xml.in.h:76 msgid "Input Methods" -msgstr "" +msgstr "Metody wej??cia" #: ../comps-f10.xml.in.h:77 msgid "Input method packages for the input of international text." -msgstr "" +msgstr "Pakiety metod wej??cia do wpisywania mi??dzynarodowego tekstu." #: ../comps-f10.xml.in.h:157 -#, fuzzy msgid "Tajik Support" -msgstr "Obs??uga tajskiego" +msgstr "Obs??uga tad??yckiego" #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" @@ -1240,66 +1238,3 @@ msgid "" "This group is a collection of tools and resources of Czech environments." msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk czeskich." - -#~ msgid "British Support" -#~ msgstr "Obs??uga brytyjskiego" - -#~ msgid "Cluster Storage" -#~ msgstr "Klastry" - -#~ msgid "Clustering Support." -#~ msgstr "Obs??uga klastr??w." - -#~ msgid "Libraries for applications built on older releases." -#~ msgstr "Biblioteki dla aplikacji zbudowanych na starszych wydaniach." - -#~ msgid "Miscellaneous Included Packages" -#~ msgstr "R????ne do????czone pakiety" - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "Pakiety dostarczaj??ce obs??ug?? klastr??w." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "Pakiety dostarczaj??ce obs??ug?? jednow??z??owego GFS-a." - -#~ msgid "Single Node GFS Support" -#~ msgstr "Obs??uga jednow??z??owego GFS-a" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "Te pakiety zapewniaj?? zgodno???? z poprzednimi wydaniami." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "??rodowiska wykonawcze i zestawy programistyczne Javy" - -#~ msgid "Misc" -#~ msgstr "R????ne" - -#~ msgid "Misc packages" -#~ msgstr "R????ne pakiety" - -#~ msgid "Multimedia" -#~ msgstr "Multimedia" - -#~ msgid "Multimedia applications" -#~ msgstr "Aplikacje multimedialne" - -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "Pakiety dostarczaj??ce funkcjonalno???? dla Red Hat Enterprise Linuksa" - -#~ msgid "Red Hat Enterprise Linux Supplementary" -#~ msgstr "Dodatki dla Red Hat Enterprise Linuksa" - -#~ msgid "" -#~ "Components used for high performance networking and clustering, such as " -#~ "Infiniband and RDMA." -#~ msgstr "" -#~ "Sk??adniki u??ywane dla sieci i klastr??w o wysokiej wydajno??ci, takich jak " -#~ "InfiniBand i RDMA." - -#~ msgid "OpenFabrics Enterprise Distribution" -#~ msgstr "Dystrybucja OpenFabrics Enterprise" - -#~ msgid "Virtualization Support." -#~ msgstr "Obs??uga wirtualizacji." From fedora-extras-commits at redhat.com Fri Jul 18 20:48:38 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 18 Jul 2008 20:48:38 GMT Subject: rpms/gnome-python2-extras/F-9 gnome-python2-extras.spec,1.27,1.28 Message-ID: <200807182048.m6IKmcME018347@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/gnome-python2-extras/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18309 Modified Files: gnome-python2-extras.spec Log Message: Rebuild against new gecko-libs 1.9.0.1 (xulrunner) Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-9/gnome-python2-extras.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnome-python2-extras.spec 20 Jun 2008 12:32:04 -0000 1.27 +++ gnome-python2-extras.spec 18 Jul 2008 20:47:51 -0000 1.28 @@ -21,7 +21,7 @@ Name: gnome-python2-extras Version: 2.19.1 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL/LGPL Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. @@ -44,7 +44,7 @@ ### Build Dependencies ### -BuildRequires: gecko-devel-unstable = %{gecko_version} +BuildRequires: gecko-devel-unstable >= %{gecko_version} BuildRequires: glib2 >= %{glib_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} BuildRequires: gnome-python2-devel >= %{gnome_python_version} @@ -90,7 +90,7 @@ Summary: Python bindings for interacting with gtkmozembed Group: Development/Languages Requires: %{name} = %{version}-%{release} -Requires: gecko-libs = %{gecko_version} +Requires: gecko-libs >= %{gecko_version} %description -n gnome-python2-gtkmozembed This module contains a wrapper that allows the use of gtkmozembed via Python. @@ -199,6 +199,9 @@ %{_libdir}/pkgconfig/pygda-3.0.pc %changelog +* Fri Jul 18 2008 Paul W. Frields - 2.19.1-17 +- Rebuild against new xulrunner (1.9.0.1) and fix dependencies + * Fri Jun 20 2008 Martin Stransky - 2.19.1-16.fc9 - Rebuild against new gecko-libs 1.9 (xulrunner) From fedora-extras-commits at redhat.com Fri Jul 18 20:50:25 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 18 Jul 2008 20:50:25 GMT Subject: rpms/gnome-python2-extras/F-9 gnome-python2-extras.spec,1.28,1.29 Message-ID: <200807182050.m6IKoPYs018464@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/gnome-python2-extras/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426 Modified Files: gnome-python2-extras.spec Log Message: Fix changelog Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-9/gnome-python2-extras.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnome-python2-extras.spec 18 Jul 2008 20:47:51 -0000 1.28 +++ gnome-python2-extras.spec 18 Jul 2008 20:49:30 -0000 1.29 @@ -199,7 +199,7 @@ %{_libdir}/pkgconfig/pygda-3.0.pc %changelog -* Fri Jul 18 2008 Paul W. Frields - 2.19.1-17 +* Fri Jul 18 2008 Paul W. Frields - 2.19.1-17.fc9 - Rebuild against new xulrunner (1.9.0.1) and fix dependencies * Fri Jun 20 2008 Martin Stransky - 2.19.1-16.fc9 From fedora-extras-commits at redhat.com Fri Jul 18 20:52:00 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 18 Jul 2008 20:52:00 GMT Subject: rpms/libraw1394/devel .cvsignore, 1.10, 1.11 libraw1394.spec, 1.43, 1.44 sources, 1.11, 1.12 libraw1394-memset-and-patch-up-leaks-git.patch, 1.1, NONE libraw1394-restore-raw1394_read_cycle_timer.patch, 1.1, NONE Message-ID: <200807182052.m6IKq0JK018588@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/libraw1394/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18548 Modified Files: .cvsignore libraw1394.spec sources Removed Files: libraw1394-memset-and-patch-up-leaks-git.patch libraw1394-restore-raw1394_read_cycle_timer.patch Log Message: * Fri Jul 18 2008 Jarod Wilson - 2.0.0-1 - Update to libraw1394 v2.0.0 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libraw1394/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 17 Jun 2008 15:53:04 -0000 1.10 +++ .cvsignore 18 Jul 2008 20:51:15 -0000 1.11 @@ -3,3 +3,4 @@ fw-device-cdev.h libraw1394-1.3.0.tar.gz libraw1394-2.0.0-20080430_git.tar.bz2 +libraw1394-2.0.0.tar.gz Index: libraw1394.spec =================================================================== RCS file: /cvs/pkgs/rpms/libraw1394/devel/libraw1394.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libraw1394.spec 23 Jun 2008 12:44:29 -0000 1.43 +++ libraw1394.spec 18 Jul 2008 20:51:15 -0000 1.44 @@ -1,22 +1,15 @@ -%define gitrev 20080430_git - Summary: Library providing low-level IEEE-1394 access Name: libraw1394 Version: 2.0.0 -Release: 0.2.%{gitrev}%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -#Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz -# Pre-2.0.0 snapshot generated from git://dennedy.org/libraw1394.git -Source: %{name}-%{version}-%{gitrev}.tar.bz2 +Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz URL: http://www.linux1394.org/ ExcludeArch: s390 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake libtool kernel-headers -Patch0: libraw1394-memset-and-patch-up-leaks-git.patch -Patch1: libraw1394-restore-raw1394_read_cycle_timer.patch - %description The libraw1394 library provides direct access to the IEEE-1394 bus through the Linux 1394 subsystem's raw1394 user space interface. Support for both @@ -35,11 +28,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 - %build -./autogen.sh %configure --disable-static make %{?_smp_mflags} @@ -76,6 +65,9 @@ %changelog +* Fri Jul 18 2008 Jarod Wilson - 2.0.0-1 +- Update to libraw1394 v2.0.0 release + * Mon Jun 23 2008 Jarod Wilson - 2.0.0-0.2.20080430_git - Restore ieee1394 raw1394_read_cycle_timer, add firewire variant Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libraw1394/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 17 Jun 2008 15:53:04 -0000 1.11 +++ sources 18 Jul 2008 20:51:15 -0000 1.12 @@ -1 +1 @@ -6ef4d6b593d919c36d65856f19be34b5 libraw1394-2.0.0-20080430_git.tar.bz2 +f037629cc02509d4f24f6170bd656694 libraw1394-2.0.0.tar.gz --- libraw1394-memset-and-patch-up-leaks-git.patch DELETED --- --- libraw1394-restore-raw1394_read_cycle_timer.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 20:59:30 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 18 Jul 2008 20:59:30 GMT Subject: rpms/fwbackups/F-9 .cvsignore, 1.8, 1.9 fwbackups.spec, 1.17, 1.18 sources, 1.8, 1.9 fwbackups-1.43.2rc2-backend_fixes.patch, 1.1, NONE fwbackups-1.43.2rc2-import-lowercase.patch, 1.2, NONE Message-ID: <200807182059.m6IKxUfS018916@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18754/F-9 Modified Files: .cvsignore fwbackups.spec sources Removed Files: fwbackups-1.43.2rc2-backend_fixes.patch fwbackups-1.43.2rc2-import-lowercase.patch Log Message: Update to 1.43.2rc3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Jun 2008 01:34:32 -0000 1.8 +++ .cvsignore 18 Jul 2008 20:58:37 -0000 1.9 @@ -1 +1 @@ -fwbackups-1.43.2rc2.tar.gz +fwbackups-1.43.2rc3.tar.gz Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-9/fwbackups.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fwbackups.spec 10 Jul 2008 17:19:16 -0000 1.17 +++ fwbackups.spec 18 Jul 2008 20:58:37 -0000 1.18 @@ -1,21 +1,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -# can't use 1.43.2rc2 as version for non-testing releases: 1.43.2beta > 1.43.2 -%define pretag rc2 +%define pretag rc3 Name: fwbackups Version: 1.43.2 -#Release: 1%{?dist} -Release: 0.5.%{pretag}%{?dist} +Release: 0.6.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving License: GPLv2+ URL: http://www.diffingo.com/content/view/12/45/lang,en/ -#Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz -Patch0: fwbackups-1.43.2rc2-import-lowercase.patch -Patch1: fwbackups-1.43.2rc2-backend_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -23,12 +17,15 @@ BuildRequires: intltool, automake BuildRequires: libxml2 BuildRequires: python-devel >= 2.4 -Requires: python >= 2.4 -Requires: pygtk2, pygtk2-libglade +BuildRequires: scrollkeeper +Requires: /usr/bin/crontab Requires: tar, rsync Requires: notify-python, gnome-python2 -Requires: /usr/bin/crontab +Requires: pygtk2, pygtk2-libglade +Requires: python >= 2.4 Requires: python-paramiko +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description %{name} is a feature-rich user backup program that allows users (including @@ -42,16 +39,8 @@ %prep %setup -q -n %{name}-%{version}%{pretag} -%patch1 -# uncomment me as needed -pushd src/fwbackups -%patch0 -popd - %build -%configure -# We don't implement this yet -# make %{?_smp_mflags} +%configure --disable-scrollkeeper make %install @@ -63,25 +52,33 @@ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop +%find_lang %{name} --with-gnome + + %clean rm -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root,-) -%dir %{_datadir}/%{name} -%dir %{_datadir}/gnome/help/%{name}/ -%dir %{python_sitelib}/%{name} +%post +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + +%postun +scrollkeeper-update -q || : + +%files -f %{name}.lang +%defattr(-,root,root,-) %{_bindir}/* -%{_datadir}/%{name}/* +%{_datadir}/%{name}/ %{_datadir}/pixmaps/* -%{_datadir}/gnome/help/%{name}/* %{_datadir}/applications/fedora-*.desktop -%{python_sitelib}/%{name}/* +%{python_sitelib}/%{name}/ -%doc AUTHORS COPYING ChangeLog NEWS TODO README +%doc AUTHORS README COPYING COPYING-DOCS ChangeLog TODO %changelog +* Fri Jul 18 2008 Stewart Adam 1.43.2-0.6.rc3 +- Update to 1.43.2rc3 + * Thu Jul 10 2008 Stewart Adam 1.43.2-0.5.rc2 - Add patch to backend.py to fix errors with the rsync backend Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Jun 2008 01:34:32 -0000 1.8 +++ sources 18 Jul 2008 20:58:37 -0000 1.9 @@ -1 +1 @@ -8d0695ce5f99cfc4f56de1cb0ebda004 fwbackups-1.43.2rc2.tar.gz +b9f0fa4a8b331a08d7812ec08cb7c6dc fwbackups-1.43.2rc3.tar.gz --- fwbackups-1.43.2rc2-backend_fixes.patch DELETED --- --- fwbackups-1.43.2rc2-import-lowercase.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 20:59:37 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 18 Jul 2008 20:59:37 GMT Subject: rpms/fwbackups/F-8 .cvsignore, 1.8, 1.9 fwbackups.spec, 1.17, 1.18 sources, 1.8, 1.9 fwbackups-1.43.2rc2-backend_fixes.patch, 1.1, NONE fwbackups-1.43.2rc2-import-lowercase.patch, 1.2, NONE Message-ID: <200807182059.m6IKxbuq018924@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18754/F-8 Modified Files: .cvsignore fwbackups.spec sources Removed Files: fwbackups-1.43.2rc2-backend_fixes.patch fwbackups-1.43.2rc2-import-lowercase.patch Log Message: Update to 1.43.2rc3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Jun 2008 01:34:18 -0000 1.8 +++ .cvsignore 18 Jul 2008 20:58:20 -0000 1.9 @@ -1 +1 @@ -fwbackups-1.43.2rc2.tar.gz +fwbackups-1.43.2rc3.tar.gz Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-8/fwbackups.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fwbackups.spec 10 Jul 2008 17:18:38 -0000 1.17 +++ fwbackups.spec 18 Jul 2008 20:58:20 -0000 1.18 @@ -1,21 +1,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -# can't use 1.43.2rc2 as version for non-testing releases: 1.43.2beta > 1.43.2 -%define pretag rc2 +%define pretag rc3 Name: fwbackups Version: 1.43.2 -#Release: 1%{?dist} -Release: 0.5.%{pretag}%{?dist} +Release: 0.6.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving License: GPLv2+ URL: http://www.diffingo.com/content/view/12/45/lang,en/ -#Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz -Patch0: fwbackups-1.43.2rc2-import-lowercase.patch -Patch1: fwbackups-1.43.2rc2-backend_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -23,12 +17,15 @@ BuildRequires: intltool, automake BuildRequires: libxml2 BuildRequires: python-devel >= 2.4 -Requires: python >= 2.4 -Requires: pygtk2, pygtk2-libglade +BuildRequires: scrollkeeper +Requires: /usr/bin/crontab Requires: tar, rsync Requires: notify-python, gnome-python2 -Requires: /usr/bin/crontab +Requires: pygtk2, pygtk2-libglade +Requires: python >= 2.4 Requires: python-paramiko +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description %{name} is a feature-rich user backup program that allows users (including @@ -42,16 +39,8 @@ %prep %setup -q -n %{name}-%{version}%{pretag} -%patch1 -# uncomment me as needed -pushd src/fwbackups -%patch0 -popd - %build -%configure -# We don't implement this yet -# make %{?_smp_mflags} +%configure --disable-scrollkeeper make %install @@ -63,25 +52,33 @@ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop +%find_lang %{name} --with-gnome + + %clean rm -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root,-) -%dir %{_datadir}/%{name} -%dir %{_datadir}/gnome/help/%{name}/ -%dir %{python_sitelib}/%{name} +%post +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + +%postun +scrollkeeper-update -q || : + +%files -f %{name}.lang +%defattr(-,root,root,-) %{_bindir}/* -%{_datadir}/%{name}/* +%{_datadir}/%{name}/ %{_datadir}/pixmaps/* -%{_datadir}/gnome/help/%{name}/* %{_datadir}/applications/fedora-*.desktop -%{python_sitelib}/%{name}/* +%{python_sitelib}/%{name}/ -%doc AUTHORS COPYING ChangeLog NEWS TODO README +%doc AUTHORS README COPYING COPYING-DOCS ChangeLog TODO %changelog +* Fri Jul 18 2008 Stewart Adam 1.43.2-0.6.rc3 +- Update to 1.43.2rc3 + * Thu Jul 10 2008 Stewart Adam 1.43.2-0.5.rc2 - Add patch to backend.py to fix errors with the rsync backend Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Jun 2008 01:34:18 -0000 1.8 +++ sources 18 Jul 2008 20:58:20 -0000 1.9 @@ -1 +1 @@ -8d0695ce5f99cfc4f56de1cb0ebda004 fwbackups-1.43.2rc2.tar.gz +b9f0fa4a8b331a08d7812ec08cb7c6dc fwbackups-1.43.2rc3.tar.gz --- fwbackups-1.43.2rc2-backend_fixes.patch DELETED --- --- fwbackups-1.43.2rc2-import-lowercase.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 20:59:47 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 18 Jul 2008 20:59:47 GMT Subject: rpms/fwbackups/devel .cvsignore, 1.8, 1.9 fwbackups.spec, 1.18, 1.19 sources, 1.8, 1.9 fwbackups-1.43.2rc2-backend_fixes.patch, 1.1, NONE fwbackups-1.43.2rc2-import-lowercase.patch, 1.2, NONE Message-ID: <200807182059.m6IKxlbF018965@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18754/devel Modified Files: .cvsignore fwbackups.spec sources Removed Files: fwbackups-1.43.2rc2-backend_fixes.patch fwbackups-1.43.2rc2-import-lowercase.patch Log Message: Update to 1.43.2rc3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbackups/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Jun 2008 01:35:29 -0000 1.8 +++ .cvsignore 18 Jul 2008 20:59:00 -0000 1.9 @@ -1 +1 @@ -fwbackups-1.43.2rc2.tar.gz +fwbackups-1.43.2rc3.tar.gz Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/devel/fwbackups.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fwbackups.spec 10 Jul 2008 17:19:41 -0000 1.18 +++ fwbackups.spec 18 Jul 2008 20:59:00 -0000 1.19 @@ -1,21 +1,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -# can't use 1.43.2rc2 as version for non-testing releases: 1.43.2beta > 1.43.2 -%define pretag rc2 +%define pretag rc3 Name: fwbackups Version: 1.43.2 -#Release: 1%{?dist} -Release: 0.6.%{pretag}%{?dist} +Release: 0.7.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving License: GPLv2+ URL: http://www.diffingo.com/content/view/12/45/lang,en/ -#Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz -Patch0: fwbackups-1.43.2rc2-import-lowercase.patch -Patch1: fwbackups-1.43.2rc2-backend_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -23,12 +17,15 @@ BuildRequires: intltool, automake BuildRequires: libxml2 BuildRequires: python-devel >= 2.4 -Requires: python >= 2.4 -Requires: pygtk2, pygtk2-libglade +BuildRequires: scrollkeeper +Requires: /usr/bin/crontab Requires: tar, rsync Requires: notify-python, gnome-python2 -Requires: /usr/bin/crontab +Requires: pygtk2, pygtk2-libglade +Requires: python >= 2.4 Requires: python-paramiko +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description %{name} is a feature-rich user backup program that allows users (including @@ -42,16 +39,8 @@ %prep %setup -q -n %{name}-%{version}%{pretag} -%patch1 -# uncomment me as needed -pushd src/fwbackups -%patch0 -popd - %build -%configure -# We don't implement this yet -# make %{?_smp_mflags} +%configure --disable-scrollkeeper make %install @@ -63,25 +52,33 @@ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop +%find_lang %{name} --with-gnome + + %clean rm -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root,-) -%dir %{_datadir}/%{name} -%dir %{_datadir}/gnome/help/%{name}/ -%dir %{python_sitelib}/%{name} +%post +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + +%postun +scrollkeeper-update -q || : + +%files -f %{name}.lang +%defattr(-,root,root,-) %{_bindir}/* -%{_datadir}/%{name}/* +%{_datadir}/%{name}/ %{_datadir}/pixmaps/* -%{_datadir}/gnome/help/%{name}/* %{_datadir}/applications/fedora-*.desktop -%{python_sitelib}/%{name}/* +%{python_sitelib}/%{name}/ -%doc AUTHORS COPYING ChangeLog NEWS TODO README +%doc AUTHORS README COPYING COPYING-DOCS ChangeLog TODO %changelog +* Fri Jul 18 2008 Stewart Adam 1.43.2-0.7.rc3 +- Update to 1.43.2rc3 + * Thu Jul 10 2008 Stewart Adam 1.43.2-0.6.rc2 - Add patch to backend.py to fix errors with the rsync backend Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbackups/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Jun 2008 01:35:29 -0000 1.8 +++ sources 18 Jul 2008 20:59:00 -0000 1.9 @@ -1 +1 @@ -8d0695ce5f99cfc4f56de1cb0ebda004 fwbackups-1.43.2rc2.tar.gz +b9f0fa4a8b331a08d7812ec08cb7c6dc fwbackups-1.43.2rc3.tar.gz --- fwbackups-1.43.2rc2-backend_fixes.patch DELETED --- --- fwbackups-1.43.2rc2-import-lowercase.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 21:04:56 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 18 Jul 2008 21:04:56 GMT Subject: rpms/eclipse/devel eclipse-compilelibs-64bit.patch, NONE, 1.1 eclipse.spec, 1.542, 1.543 Message-ID: <200807182104.m6IL4uqx025803@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25766 Modified Files: eclipse.spec Added Files: eclipse-compilelibs-64bit.patch Log Message: * Fri Jul 18 2008 Andrew Overholt 3.4.0-4 - Add patch for 64-bit platforms to build SWT eclipse-compilelibs-64bit.patch: --- NEW FILE eclipse-compilelibs-64bit.patch --- diff -up ./build.xml.swtx86_64 ./build.xml --- ./build.xml.swtx86_64 2008-07-18 16:56:02.000000000 -0400 +++ ./build.xml 2008-07-18 16:56:50.000000000 -0400 @@ -72,26 +72,7 @@ - - - - - - - - - - - - - - - - - - - - + Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.542 retrieving revision 1.543 diff -u -r1.542 -r1.543 --- eclipse.spec 18 Jul 2008 17:15:23 -0000 1.542 +++ eclipse.spec 18 Jul 2008 21:04:11 -0000 1.543 @@ -109,6 +109,8 @@ # https://bugs.eclipse.org/bugs/attachment.cgi?id=105593 # FIXME: update bug with this smaller version of the patch Patch32: %{name}-compilelibs.patch +# 64-bit systems need to generate the 64-bit JNI code first +Patch38: %{name}-compilelibs-64bit.patch # FIXME: file these upstream # Upstream builds with a 1.4 (or lower) class library @@ -302,6 +304,9 @@ %setup -q -c %patch32 -p4 +%ifarch x86_64 ppc64 sparc64 ia64 s390x +%patch38 +%endif sed --in-place "s/java5.home/java.home/" build.xml # Build swttools.jar @@ -1340,6 +1345,7 @@ - Un-do crazy config.ini, bundles.info, etc. shuffling - Update patch for building native libraries - Re-add missing BR on tomcat5-jasper-eclipse +- Add patch for 64-bit platforms to build SWT * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package From fedora-extras-commits at redhat.com Fri Jul 18 21:12:52 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 18 Jul 2008 21:12:52 GMT Subject: rpms/Miro/F-9 Miro.spec,1.32,1.33 Message-ID: <200807182112.m6ILCqlJ026068@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/Miro/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26032 Modified Files: Miro.spec Log Message: Build for new gecko-libs 1.9.0.1 (xulrunner) Index: Miro.spec =================================================================== RCS file: /cvs/pkgs/rpms/Miro/F-9/Miro.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Miro.spec 18 Jun 2008 04:27:45 -0000 1.32 +++ Miro.spec 18 Jul 2008 21:12:07 -0000 1.33 @@ -5,7 +5,7 @@ Name: Miro Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -17,9 +17,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel xine-lib-devel Pyrex BuildRequires: boost-devel pygtk2-devel libXv-devel openssl-devel -BuildRequires: gecko-devel-unstable = %{gecko_ver} gettext gtk2-devel +BuildRequires: gecko-devel-unstable >= %{gecko_ver} gettext gtk2-devel -Requires: gecko-libs = %{gecko_ver} gnome-python2-gtkmozembed +Requires: gecko-libs >= %{gecko_ver} gnome-python2-gtkmozembed Requires: gnome-python2-gconf dbus-python Provides: Democracy = %{version}-%{release} Obsoletes: Democracy < 1.0 @@ -79,6 +79,9 @@ %changelog +* Fri Jul 18 2008 Paul W. Frields - 1.2.4-2 +- Rebuild against xulrunner and fix dependencies + * Sun Jun 15 2008 Alex Lancaster - 1.2.4-1 - Update to latest upstream (1.2.4) From fedora-extras-commits at redhat.com Fri Jul 18 21:16:58 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 18 Jul 2008 21:16:58 GMT Subject: rpms/perl-Moose/devel .cvsignore, 1.18, 1.19 perl-Moose.spec, 1.23, 1.24 sources, 1.18, 1.19 Message-ID: <200807182116.m6ILGwbo026180@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Moose/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26149 Modified Files: .cvsignore perl-Moose.spec sources Log Message: * Fri Jul 18 2008 Chris Weyl 0.54-1 - update to 0.54 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 28 Jun 2008 19:01:29 -0000 1.18 +++ .cvsignore 18 Jul 2008 21:16:09 -0000 1.19 @@ -1 +1 @@ -Moose-0.51.tar.gz +Moose-0.54.tar.gz Index: perl-Moose.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- perl-Moose.spec 28 Jun 2008 19:01:29 -0000 1.23 +++ perl-Moose.spec 18 Jul 2008 21:16:09 -0000 1.24 @@ -1,13 +1,13 @@ Name: perl-Moose -Version: 0.51 +Version: 0.54 Release: 1%{?dist} Summary: Complete modern object system for Perl 5 License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Moose/ # source tends to flip between these three authors -Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Moose-%{version}.tar.gz -#Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz +#Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Moose-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Moose-%{version}.tar.gz #Source0: http://search.cpan.org/CPAN/authors/id/G/GR/GRODITI/Moose-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -107,6 +107,9 @@ %{_mandir}/man3/* %changelog +* Fri Jul 18 2008 Chris Weyl 0.54-1 +- update to 0.54 + * Sat Jun 28 2008 Chris Weyl 0.51-1 - update to 0.51 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 28 Jun 2008 19:01:29 -0000 1.18 +++ sources 18 Jul 2008 21:16:09 -0000 1.19 @@ -1 +1 @@ -a6f36fc2874a01dafcce09fcd3301111 Moose-0.51.tar.gz +53b5cddeb1e287b29f87966c9ad3e433 Moose-0.54.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 21:21:28 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Fri, 18 Jul 2008 21:21:28 GMT Subject: rpms/kphotobymail/devel kphotobymail.spec,1.6,1.7 Message-ID: <200807182121.m6ILLSXi026417@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/kphotobymail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26351 Modified Files: kphotobymail.spec Log Message: Fixed unpackaged file causing build errors Index: kphotobymail.spec =================================================================== RCS file: /cvs/pkgs/rpms/kphotobymail/devel/kphotobymail.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kphotobymail.spec 5 Jun 2008 20:31:07 -0000 1.6 +++ kphotobymail.spec 18 Jul 2008 21:20:41 -0000 1.7 @@ -1,18 +1,17 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define _default_patch_fuzz 2 Name: kphotobymail Version: 0.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A PyKDE based application for uploading photos to flickr account Group: Applications/Internet License: GPL URL: http://kphotobymail.sourceforge.net/ Source: http://dl.sourceforge.net/sourceforge/kphotobymail/kphotobymail-%{version}.tar.gz -# fix for python >= 2.5 -%if 0%{?fedora} > 6 + BuildRequires: python-devel -%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +51,7 @@ %dir %{python_sitelib}/Kphotobymail %{python_sitelib}/Kphotobymail/*.py %{python_sitelib}/Kphotobymail/*.pyc +%{python_sitelib}/kphotobymail-0.4.1-py2.5.egg-info %ghost %{python_sitelib}/Kphotobymail/*.pyo %dir %{_datadir}/kphotobymail %{_datadir}/kphotobymail/* @@ -61,6 +61,9 @@ %{_datadir}/applications/fedora-kphotobymail.desktop %changelog +* Fri Jul 18 2008 Steven M. Parrish 0.4.1-2 +- Fixed unpackaged file causing build errors + * Thu Jan 04 2007 Kushal Das 0.4.1-1 - New release 0.4.1 From fedora-extras-commits at redhat.com Fri Jul 18 21:27:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 18 Jul 2008 21:27:55 GMT Subject: rpms/freeze/devel Freeze_license_email.txt, NONE, 1.1 freeze.spec, 1.11, 1.12 Message-ID: <200807182127.m6ILRtcM026599@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/freeze/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26556 Modified Files: freeze.spec Added Files: Freeze_license_email.txt Log Message: fix license tag --- NEW FILE Freeze_license_email.txt --- Date: Fri, 18 Jul 2008 14:14:18 -0700 From: "Leo Broukhis" To: "Tom spot Callaway" Subject: Re: Freeze license On Fri, Jul 18, 2008 at 1:51 PM, Tom spot Callaway wrote: > Well, at least one person in the Fedora community thinks it is useful, > because he wants to maintain it. :) All right. > If you have "GPL-like" license text, can you send it to me? Alternately, > it would be a lot simpler if you could choose one of the licenses from > this page, as we already know they are ok: > > http://fedoraproject.org/wiki/Licensing#Good_Licenses Let's call it GPL+, then. Thanks, Leo Index: freeze.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeze/devel/freeze.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freeze.spec 8 Feb 2008 21:21:52 -0000 1.11 +++ freeze.spec 18 Jul 2008 21:26:51 -0000 1.12 @@ -1,12 +1,14 @@ Name: freeze Version: 2.5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: freeze/melt/fcat compression utilities Group: Applications/Archiving -License: Distributable +# Confirmed with upstream, see email text in Source1 +License: GPL+ # No one agrees on the canonical download site, everyone uses the same version -Source: http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz +Source0: http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz +Source1: Freeze_license_email.txt Patch0: freeze-2.5.patch Patch1: freeze-2.5.0-printf.patch Patch2: freeze-2.5.0-deffile.patch @@ -18,7 +20,8 @@ dearchive files compressed with it. %prep -%setup +%setup -q +cp -a %{SOURCE1} . %patch0 -p1 -b .Makefile %patch1 -p1 -b .printf %patch2 -p1 -b .deffile @@ -47,11 +50,14 @@ %files %defattr(0644, root, root, 0755) -%doc MANIFEST README +%doc MANIFEST README Freeze_license_email.txt %doc %{_mandir}/man?/* %attr(0755,root,root) %{_bindir}/* %changelog +* Fri Jul 18 2008 Tom "spot" Callaway 2.5.0-9 +- fix license tag with copyright holder clarification + * Fri Feb 08 2008 Nicolas Mailhot - 2.5.0-8 ??? gcc 4.3 rebuild From fedora-extras-commits at redhat.com Fri Jul 18 21:34:17 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 18 Jul 2008 21:34:17 GMT Subject: rpms/bind/F-9 bind.spec,1.265,1.266 Message-ID: <200807182134.m6ILYH3K026829@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/bind/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26789 Modified Files: bind.spec Log Message: use -fPIE for sparc arches add sparc64 to list of 64 bit arches Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- bind.spec 8 Jul 2008 22:23:45 -0000 1.265 +++ bind.spec 18 Jul 2008 21:33:29 -0000 1.266 @@ -18,7 +18,7 @@ Name: bind License: ISC Version: 9.5.0 -Release: 33.%{PATCHVER}%{?dist} +Release: 34.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -241,6 +241,12 @@ %patch91 -p1 -b .recv-race %patch92 -p1 -b .edns %patch93 -p1 -b .rh450995 +# Sparc and s390 arches need to use -fPIE +%ifarch sparcv9 sparc64 s390 s390x +for i in bin/named-sdb/unix/Makefile.in bin/named-sdb/Makefile.in bin/named/unix/Makefile.in bin/named/Makefile.in; do + sed -i 's|fpie|fPIE|g' $i +done +%endif :; @@ -252,7 +258,7 @@ libtoolize -c -f; aclocal --force; autoheader -f; autoconf -f %if %{WITH_DBUS} -%ifarch s390x x86_64 ppc64 +%ifarch s390x x86_64 ppc64 sparc64 # every 64-bit arch EXCEPT ia64 has dbus architecture dependant # includes in /usr/lib64/dbus-1.0/include export DBUS_ARCHDEP_LIBDIR=lib64 @@ -286,7 +292,8 @@ %endif ; if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h ; fi; -make %{?_smp_mflags} +make -j8 +#%{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} @@ -646,6 +653,10 @@ %{_sbindir}/bind-chroot-admin %changelog +* Fri Jul 18 2008 Dennis Gilmore 32:9.5.0-34.P1 +- use fPIE on sparcv9/sparc64 +- add sparc64 to list of 64bit arches in spec + * Tue Jul 08 2008 Adam Tkac 32:9.5.0-33.P1 - 9.5.0-P1 release (CVE-2008-1447) - fixed typo in bind-sdb summary (#454436) From fedora-extras-commits at redhat.com Fri Jul 18 21:36:41 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 18 Jul 2008 21:36:41 GMT Subject: rpms/eclipse/devel eclipse.spec,1.543,1.544 Message-ID: <200807182136.m6ILafjg026969@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26931 Modified Files: eclipse.spec Log Message: * Fri Jul 18 2008 Andrew Overholt 3.4.0-4 - Don't try to resolve bundles.osgi.org during build Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.543 retrieving revision 1.544 diff -u -r1.543 -r1.544 --- eclipse.spec 18 Jul 2008 21:04:11 -0000 1.543 +++ eclipse.spec 18 Jul 2008 21:35:57 -0000 1.544 @@ -346,6 +346,9 @@ plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ plugins/org.eclipse.pde.doc.user/pdeOptions +# FIXME: package these? +grep -rl bundles.osgi.org * | xargs sed -i "/bundles.osgi.org/d" + #%patch14 -p0 pushd plugins/org.eclipse.pde.build @@ -1346,6 +1349,7 @@ - Update patch for building native libraries - Re-add missing BR on tomcat5-jasper-eclipse - Add patch for 64-bit platforms to build SWT +- Don't try to resolve bundles.osgi.org during build * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package From fedora-extras-commits at redhat.com Fri Jul 18 21:48:27 2008 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Fri, 18 Jul 2008 21:48:27 GMT Subject: rpms/pyexiv2/devel import.log, NONE, 1.1 pyexiv2-multilib.patch, NONE, 1.1 pyexiv2-packager.patch, NONE, 1.1 pyexiv2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807182148.m6ILmR2V027434@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/pyexiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27371/devel Modified Files: .cvsignore sources Added Files: import.log pyexiv2-multilib.patch pyexiv2-packager.patch pyexiv2.spec Log Message: Initial import of the package. --- NEW FILE import.log --- pyexiv2-0_1_2-3_fc9:HEAD:pyexiv2-0.1.2-3.fc9.src.rpm:1216417549 pyexiv2-multilib.patch: --- NEW FILE pyexiv2-multilib.patch --- diff -Nru pyexiv2.orig/src/SConscript pyexiv2/src/SConscript --- pyexiv2.orig/src/SConscript 2008-02-18 23:32:00.000000000 +0100 +++ pyexiv2/src/SConscript 2008-07-17 17:45:25.000000000 +0200 @@ -3,6 +3,7 @@ import sys import os.path +from distutils.sysconfig import get_python_lib env = Environment() @@ -22,7 +23,8 @@ #??'scons install'. If DESTDIR is specified on the command line when invoking # scons, it will be prepended to each installed target file. See # http://www.gnu.org/prep/standards/html_node/DESTDIR.html for reference. -python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages') +#python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages') +python_lib_path = get_python_lib(1) dest_dir = ARGUMENTS.get('DESTDIR') if (dest_dir is None) or (not os.path.isabs(dest_dir)): install_dir = python_lib_path pyexiv2-packager.patch: --- NEW FILE pyexiv2-packager.patch --- diff -Nru pyexiv2.multilib/src/SConscript pyexiv2/src/SConscript --- pyexiv2.multilib/src/SConscript 2008-07-17 21:39:05.000000000 +0200 +++ pyexiv2/src/SConscript 2008-07-17 21:43:07.000000000 +0200 @@ -5,8 +5,22 @@ import os.path from distutils.sysconfig import get_python_lib +import os +import SCons.Util + env = Environment() +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] +if os.environ.has_key('CFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] +if os.environ.has_key('CXXFLAGS'): + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + # Include directories to look for 'Python.h' in python_inc_path = os.path.join(sys.prefix, 'include', 'python' + sys.version[:3]) env.Append(CPPPATH=[python_inc_path]) --- NEW FILE pyexiv2.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pyexiv2 Version: 0.1.2 Release: 3%{?dist} Summary: Python binding to exiv2 Group: Development/Languages License: GPLv2+ URL: http://tilloy.net/dev/pyexiv2/ Source0: http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2 # next patch should be removed when # https://bugs.launchpad.net/pyexiv2/+bug/249513 # is fixed Patch0: pyexiv2-multilib.patch # the same for bug # https://bugs.launchpad.net/pyexiv2/+bug/249835 Patch1: pyexiv2-packager.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel exiv2-devel boost-devel scons %description pyexiv2 is a python binding to exiv2, the C++ library for manipulation of EXIF and IPTC image metadata. It is a python module that allows your python scripts to read and write metadata (EXIF, IPTC, thumbnail) embedded in image files (JPEG, TIFF, ...). %prep %setup -q -n %{name} %patch0 -p1 -b .multilib %patch1 -p1 -b .packager %build # Remove CFLAGS=... for noarch packages (unneeded) #CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" scons %install rm -rf $RPM_BUILD_ROOT #%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" scons DESTDIR=$RPM_BUILD_ROOT install chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/pyexiv2.py %clean rm -rf $RPM_BUILD_ROOT %check # There is unittest/ directory available, but not sure, how # how to make it work. %files %defattr(-,root,root,-) %doc README ChangeLog COPYING doc/ %{python_sitearch}/* %changelog * Fri Jul 18 2008 Mat??j Cepl 0.1.2-3 - Fix building system. - Approved for Fedora * Fri Jul 18 2008 Mat??j Cepl 0.1.2-2 - Dan's patch to fix compilation flags. * Thu Jul 17 2008 Mat??j Cepl 0.1.2-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyexiv2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2008 16:38:08 -0000 1.1 +++ .cvsignore 18 Jul 2008 21:47:42 -0000 1.2 @@ -0,0 +1 @@ +pyexiv2-0.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyexiv2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2008 16:38:08 -0000 1.1 +++ sources 18 Jul 2008 21:47:42 -0000 1.2 @@ -0,0 +1 @@ +246dae9b4eca5d2fe2a4e3762e13fac1 pyexiv2-0.1.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 21:48:41 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 18 Jul 2008 21:48:41 GMT Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.14, 1.15 perl-Class-MOP.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200807182148.m6ILmfcP027483@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27386 Modified Files: .cvsignore perl-Class-MOP.spec sources Log Message: * Fri Jul 18 2008 Chris Weyl 0.63-1 - update to 0.63 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 26 Jun 2008 02:46:50 -0000 1.14 +++ .cvsignore 18 Jul 2008 21:47:52 -0000 1.15 @@ -1 +1 @@ -Class-MOP-0.62.tar.gz +Class-MOP-0.63.tar.gz Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Class-MOP.spec 26 Jun 2008 02:46:50 -0000 1.17 +++ perl-Class-MOP.spec 18 Jul 2008 21:47:52 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-Class-MOP -Version: 0.62 +Version: 0.63 Release: 1%{?dist} Summary: Metaobject programming model for Perl License: GPL+ or Artistic @@ -81,6 +81,9 @@ %{_mandir}/man3/* %changelog +* Fri Jul 18 2008 Chris Weyl 0.63-1 +- update to 0.63 + * Wed Jun 25 2008 Chris Weyl 0.62-1 - update to 0.62 - tweak provides filtering Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 26 Jun 2008 02:46:50 -0000 1.14 +++ sources 18 Jul 2008 21:47:52 -0000 1.15 @@ -1 +1 @@ -2fa7d9ceb87209c7aa2335a393be7b8e Class-MOP-0.62.tar.gz +d3b00b0f5b1ec34324b24528e5d26cb1 Class-MOP-0.63.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 21:56:04 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 18 Jul 2008 21:56:04 GMT Subject: rpms/fwbackups/F-9 fwbackups.spec,1.18,1.19 Message-ID: <200807182156.m6ILu4vW027870@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27792/F-9 Modified Files: fwbackups.spec Log Message: BR: gnome-doc-utils Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-9/fwbackups.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fwbackups.spec 18 Jul 2008 20:58:37 -0000 1.18 +++ fwbackups.spec 18 Jul 2008 21:55:16 -0000 1.19 @@ -3,7 +3,7 @@ Name: fwbackups Version: 1.43.2 -Release: 0.6.%{pretag}%{?dist} +Release: 0.7.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving @@ -18,6 +18,7 @@ BuildRequires: libxml2 BuildRequires: python-devel >= 2.4 BuildRequires: scrollkeeper +BuildRequires: gnome-doc-utils Requires: /usr/bin/crontab Requires: tar, rsync Requires: notify-python, gnome-python2 @@ -76,6 +77,9 @@ %doc AUTHORS README COPYING COPYING-DOCS ChangeLog TODO %changelog +* Fri Jul 18 2008 Stewart Adam 1.43.2-0.7.rc3 +- BR: gnome-doc-utils + * Fri Jul 18 2008 Stewart Adam 1.43.2-0.6.rc3 - Update to 1.43.2rc3 From fedora-extras-commits at redhat.com Fri Jul 18 21:56:16 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 18 Jul 2008 21:56:16 GMT Subject: rpms/fwbackups/F-8 fwbackups.spec,1.18,1.19 Message-ID: <200807182156.m6ILuGUh027896@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27792/F-8 Modified Files: fwbackups.spec Log Message: BR: gnome-doc-utils Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/F-8/fwbackups.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fwbackups.spec 18 Jul 2008 20:58:20 -0000 1.18 +++ fwbackups.spec 18 Jul 2008 21:54:52 -0000 1.19 @@ -3,7 +3,7 @@ Name: fwbackups Version: 1.43.2 -Release: 0.6.%{pretag}%{?dist} +Release: 0.7.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving @@ -18,6 +18,7 @@ BuildRequires: libxml2 BuildRequires: python-devel >= 2.4 BuildRequires: scrollkeeper +BuildRequires: gnome-doc-utils Requires: /usr/bin/crontab Requires: tar, rsync Requires: notify-python, gnome-python2 @@ -76,6 +77,9 @@ %doc AUTHORS README COPYING COPYING-DOCS ChangeLog TODO %changelog +* Fri Jul 18 2008 Stewart Adam 1.43.2-0.7.rc3 +- BR: gnome-doc-utils + * Fri Jul 18 2008 Stewart Adam 1.43.2-0.6.rc3 - Update to 1.43.2rc3 From fedora-extras-commits at redhat.com Fri Jul 18 21:56:20 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 18 Jul 2008 21:56:20 GMT Subject: rpms/fwbackups/devel fwbackups.spec,1.19,1.20 Message-ID: <200807182156.m6ILuKL2027899@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwbackups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27792/devel Modified Files: fwbackups.spec Log Message: BR: gnome-doc-utils Index: fwbackups.spec =================================================================== RCS file: /cvs/extras/rpms/fwbackups/devel/fwbackups.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fwbackups.spec 18 Jul 2008 20:59:00 -0000 1.19 +++ fwbackups.spec 18 Jul 2008 21:55:34 -0000 1.20 @@ -3,7 +3,7 @@ Name: fwbackups Version: 1.43.2 -Release: 0.7.%{pretag}%{?dist} +Release: 0.8.%{pretag}%{?dist} BuildArch: noarch Summary: A feature-rich user backup program Group: Applications/Archiving @@ -18,6 +18,7 @@ BuildRequires: libxml2 BuildRequires: python-devel >= 2.4 BuildRequires: scrollkeeper +BuildRequires: gnome-doc-utils Requires: /usr/bin/crontab Requires: tar, rsync Requires: notify-python, gnome-python2 @@ -76,6 +77,9 @@ %doc AUTHORS README COPYING COPYING-DOCS ChangeLog TODO %changelog +* Fri Jul 18 2008 Stewart Adam 1.43.2-0.8.rc3 +- BR: gnome-doc-utils + * Fri Jul 18 2008 Stewart Adam 1.43.2-0.7.rc3 - Update to 1.43.2rc3 From fedora-extras-commits at redhat.com Fri Jul 18 21:57:07 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 18 Jul 2008 21:57:07 GMT Subject: rpms/pnp4nagios/EL-4 pnp4nagios.logrotate.conf, 1.1, 1.2 pnp4nagios.spec, 1.1, 1.2 Message-ID: <200807182157.m6ILv7Dg028067@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27850/EL-4 Modified Files: pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: Fix typo in logrotate conf Index: pnp4nagios.logrotate.conf =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-4/pnp4nagios.logrotate.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.logrotate.conf 11 Jul 2008 21:59:57 -0000 1.1 +++ pnp4nagios.logrotate.conf 18 Jul 2008 21:55:50 -0000 1.2 @@ -3,5 +3,5 @@ missingok notifempty rotate 5 - size 100K + size 100k } Index: pnp4nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-4/pnp4nagios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.spec 11 Jul 2008 21:59:57 -0000 1.1 +++ pnp4nagios.spec 18 Jul 2008 21:55:50 -0000 1.2 @@ -1,6 +1,6 @@ Name: pnp4nagios Version: 0.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System @@ -101,6 +101,9 @@ %changelog +* Fri Jul 18 2008 Xavier Bachelot 0.4.10-2 +- Fix typo in logrotate conf. + * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. From fedora-extras-commits at redhat.com Fri Jul 18 21:57:13 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 18 Jul 2008 21:57:13 GMT Subject: rpms/pnp4nagios/F-9 pnp4nagios.logrotate.conf, 1.1, 1.2 pnp4nagios.spec, 1.1, 1.2 Message-ID: <200807182157.m6ILvDqO028071@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27850/F-9 Modified Files: pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: Fix typo in logrotate conf Index: pnp4nagios.logrotate.conf =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/F-9/pnp4nagios.logrotate.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.logrotate.conf 11 Jul 2008 22:00:35 -0000 1.1 +++ pnp4nagios.logrotate.conf 18 Jul 2008 21:56:27 -0000 1.2 @@ -3,5 +3,5 @@ missingok notifempty rotate 5 - size 100K + size 100k } Index: pnp4nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/F-9/pnp4nagios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.spec 11 Jul 2008 22:00:35 -0000 1.1 +++ pnp4nagios.spec 18 Jul 2008 21:56:27 -0000 1.2 @@ -1,6 +1,6 @@ Name: pnp4nagios Version: 0.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System @@ -101,6 +101,9 @@ %changelog +* Fri Jul 18 2008 Xavier Bachelot 0.4.10-2 +- Fix typo in logrotate conf. + * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. From fedora-extras-commits at redhat.com Fri Jul 18 21:57:27 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 18 Jul 2008 21:57:27 GMT Subject: rpms/pnp4nagios/EL-5 pnp4nagios.logrotate.conf, 1.1, 1.2 pnp4nagios.spec, 1.1, 1.2 Message-ID: <200807182157.m6ILvRqT028085@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27850/EL-5 Modified Files: pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: Fix typo in logrotate conf Index: pnp4nagios.logrotate.conf =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-5/pnp4nagios.logrotate.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.logrotate.conf 11 Jul 2008 22:00:16 -0000 1.1 +++ pnp4nagios.logrotate.conf 18 Jul 2008 21:56:07 -0000 1.2 @@ -3,5 +3,5 @@ missingok notifempty rotate 5 - size 100K + size 100k } Index: pnp4nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/EL-5/pnp4nagios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.spec 11 Jul 2008 22:00:16 -0000 1.1 +++ pnp4nagios.spec 18 Jul 2008 21:56:07 -0000 1.2 @@ -1,6 +1,6 @@ Name: pnp4nagios Version: 0.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System @@ -101,6 +101,9 @@ %changelog +* Fri Jul 18 2008 Xavier Bachelot 0.4.10-2 +- Fix typo in logrotate conf. + * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. From fedora-extras-commits at redhat.com Fri Jul 18 21:57:33 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 18 Jul 2008 21:57:33 GMT Subject: rpms/pnp4nagios/devel pnp4nagios.logrotate.conf, 1.1, 1.2 pnp4nagios.spec, 1.1, 1.2 Message-ID: <200807182157.m6ILvX2l028092@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/pnp4nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27850/devel Modified Files: pnp4nagios.logrotate.conf pnp4nagios.spec Log Message: Fix typo in logrotate conf Index: pnp4nagios.logrotate.conf =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/pnp4nagios.logrotate.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.logrotate.conf 10 Jul 2008 22:39:37 -0000 1.1 +++ pnp4nagios.logrotate.conf 18 Jul 2008 21:56:43 -0000 1.2 @@ -3,5 +3,5 @@ missingok notifempty rotate 5 - size 100K + size 100k } Index: pnp4nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/pnp4nagios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pnp4nagios.spec 10 Jul 2008 22:39:37 -0000 1.1 +++ pnp4nagios.spec 18 Jul 2008 21:56:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: pnp4nagios Version: 0.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System @@ -101,6 +101,9 @@ %changelog +* Fri Jul 18 2008 Xavier Bachelot 0.4.10-2 +- Fix typo in logrotate conf. + * Wed Jul 09 2008 Xavier Bachelot 0.4.10-1 - Update to 0.4.10. From fedora-extras-commits at redhat.com Fri Jul 18 22:02:26 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Fri, 18 Jul 2008 22:02:26 GMT Subject: rpms/perl-QWizard/F-9 .cvsignore, 1.3, 1.4 perl-QWizard.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807182202.m6IM2Qit002498@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/perl-QWizard/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2433 Modified Files: .cvsignore perl-QWizard.spec sources Log Message: update to latest sources and match F8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-QWizard/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2007 06:12:56 -0000 1.3 +++ .cvsignore 18 Jul 2008 22:01:37 -0000 1.4 @@ -1 +1 @@ -QWizard-3.13.tar.gz +QWizard-3.14.tar.gz Index: perl-QWizard.spec =================================================================== RCS file: /cvs/extras/rpms/perl-QWizard/F-9/perl-QWizard.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-QWizard.spec 7 Mar 2008 02:15:29 -0000 1.4 +++ perl-QWizard.spec 18 Jul 2008 22:01:37 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-QWizard -Version: 3.13 -Release: 3%{?dist} +Version: 3.14 +Release: 1%{?dist} Summary: A very portable graphical question and answer wizard system License: GPL+ or Artistic Group: Development/Libraries @@ -73,8 +73,8 @@ %{_mandir}/man3/* %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 3.13-3 -Rebuild for new perl +* Tue Apr 29 2008 Wes Hardaker - 3.14-1 +- Update to latest upstream for bug fixes and minor new features * Sat Dec 22 2007 Wes Hardaker - 3.13-2 - remove patch now in base Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-QWizard/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2007 06:12:56 -0000 1.3 +++ sources 18 Jul 2008 22:01:37 -0000 1.4 @@ -1 +1 @@ -1f6d99cff5ff5a63e62a5dfd817c6822 QWizard-3.13.tar.gz +f45cf8e3faa251478cffc511193bd2e8 QWizard-3.14.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 22:05:31 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 18 Jul 2008 22:05:31 GMT Subject: rpms/perl-WWW-Search/devel .cvsignore, 1.4, 1.5 perl-WWW-Search.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807182205.m6IM5VI5002704@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/perl-WWW-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2628 Modified Files: .cvsignore perl-WWW-Search.spec sources Log Message: 2.503 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-WWW-Search/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2008 14:40:21 -0000 1.4 +++ .cvsignore 18 Jul 2008 22:04:40 -0000 1.5 @@ -1 +1 @@ -WWW-Search-2.501.tar.gz +WWW-Search-2.503.tar.gz Index: perl-WWW-Search.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-WWW-Search/devel/perl-WWW-Search.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-WWW-Search.spec 22 May 2008 14:40:21 -0000 1.5 +++ perl-WWW-Search.spec 18 Jul 2008 22:04:40 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-WWW-Search -Version: 2.501 +Version: 2.503 Release: 1%{?dist} Summary: Virtual base class for WWW searches @@ -77,6 +77,9 @@ %changelog +* Fri Jul 18 2008 Xavier Bachelot - 2.503-1 +- New upstream version 2.503. + * Thu May 15 2008 Xavier Bachelot - 2.501-1 - New upstream version 2.501. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-WWW-Search/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 May 2008 14:40:21 -0000 1.4 +++ sources 18 Jul 2008 22:04:40 -0000 1.5 @@ -1 +1 @@ -84b9b824505898bc8576ec60d6c0ad70 WWW-Search-2.501.tar.gz +4aad77a65dbdb6e844ce981f3fd7093f WWW-Search-2.503.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 22:05:52 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Fri, 18 Jul 2008 22:05:52 GMT Subject: rpms/perl-QWizard/F-9 perl-QWizard.spec,1.5,1.6 Message-ID: <200807182205.m6IM5qxU002777@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/perl-QWizard/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2668 Modified Files: perl-QWizard.spec Log Message: version bump Index: perl-QWizard.spec =================================================================== RCS file: /cvs/extras/rpms/perl-QWizard/F-9/perl-QWizard.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-QWizard.spec 18 Jul 2008 22:01:37 -0000 1.5 +++ perl-QWizard.spec 18 Jul 2008 22:05:04 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-QWizard Version: 3.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A very portable graphical question and answer wizard system License: GPL+ or Artistic Group: Development/Libraries @@ -73,6 +73,9 @@ %{_mandir}/man3/* %changelog +* Fri Jul 18 2008 Wes Hardaker - 3.14-2 +- Version bump for build issues + * Tue Apr 29 2008 Wes Hardaker - 3.14-1 - Update to latest upstream for bug fixes and minor new features From fedora-extras-commits at redhat.com Fri Jul 18 22:06:03 2008 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Fri, 18 Jul 2008 22:06:03 GMT Subject: rpms/pyexiv2/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807182206.m6IM63pK002826@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/pyexiv2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2676 Modified Files: .cvsignore sources Log Message: Initial commit for F-8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyexiv2/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2008 16:38:08 -0000 1.1 +++ .cvsignore 18 Jul 2008 22:05:17 -0000 1.2 @@ -0,0 +1 @@ +pyexiv2-0.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyexiv2/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2008 16:38:08 -0000 1.1 +++ sources 18 Jul 2008 22:05:17 -0000 1.2 @@ -0,0 +1 @@ +246dae9b4eca5d2fe2a4e3762e13fac1 pyexiv2-0.1.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 22:06:31 2008 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Fri, 18 Jul 2008 22:06:31 GMT Subject: rpms/pyexiv2/F-8 pyexiv2-multilib.patch, NONE, 1.1 pyexiv2-packager.patch, NONE, 1.1 pyexiv2.spec, NONE, 1.1 Message-ID: <200807182206.m6IM6Vag002860@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/pyexiv2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840 Added Files: pyexiv2-multilib.patch pyexiv2-packager.patch pyexiv2.spec Log Message: Initial commit for F-8 pyexiv2-multilib.patch: --- NEW FILE pyexiv2-multilib.patch --- diff -Nru pyexiv2.orig/src/SConscript pyexiv2/src/SConscript --- pyexiv2.orig/src/SConscript 2008-02-18 23:32:00.000000000 +0100 +++ pyexiv2/src/SConscript 2008-07-17 17:45:25.000000000 +0200 @@ -3,6 +3,7 @@ import sys import os.path +from distutils.sysconfig import get_python_lib env = Environment() @@ -22,7 +23,8 @@ #??'scons install'. If DESTDIR is specified on the command line when invoking # scons, it will be prepended to each installed target file. See # http://www.gnu.org/prep/standards/html_node/DESTDIR.html for reference. -python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages') +#python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages') +python_lib_path = get_python_lib(1) dest_dir = ARGUMENTS.get('DESTDIR') if (dest_dir is None) or (not os.path.isabs(dest_dir)): install_dir = python_lib_path pyexiv2-packager.patch: --- NEW FILE pyexiv2-packager.patch --- diff -Nru pyexiv2.multilib/src/SConscript pyexiv2/src/SConscript --- pyexiv2.multilib/src/SConscript 2008-07-17 21:39:05.000000000 +0200 +++ pyexiv2/src/SConscript 2008-07-17 21:43:07.000000000 +0200 @@ -5,8 +5,22 @@ import os.path from distutils.sysconfig import get_python_lib +import os +import SCons.Util + env = Environment() +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] +if os.environ.has_key('CFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] +if os.environ.has_key('CXXFLAGS'): + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + # Include directories to look for 'Python.h' in python_inc_path = os.path.join(sys.prefix, 'include', 'python' + sys.version[:3]) env.Append(CPPPATH=[python_inc_path]) --- NEW FILE pyexiv2.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pyexiv2 Version: 0.1.2 Release: 3%{?dist} Summary: Python binding to exiv2 Group: Development/Languages License: GPLv2+ URL: http://tilloy.net/dev/pyexiv2/ Source0: http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2 # next patch should be removed when # https://bugs.launchpad.net/pyexiv2/+bug/249513 # is fixed Patch0: pyexiv2-multilib.patch # the same for bug # https://bugs.launchpad.net/pyexiv2/+bug/249835 Patch1: pyexiv2-packager.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel exiv2-devel boost-devel scons %description pyexiv2 is a python binding to exiv2, the C++ library for manipulation of EXIF and IPTC image metadata. It is a python module that allows your python scripts to read and write metadata (EXIF, IPTC, thumbnail) embedded in image files (JPEG, TIFF, ...). %prep %setup -q -n %{name} %patch0 -p1 -b .multilib %patch1 -p1 -b .packager %build # Remove CFLAGS=... for noarch packages (unneeded) #CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" scons %install rm -rf $RPM_BUILD_ROOT #%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" scons DESTDIR=$RPM_BUILD_ROOT install chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/pyexiv2.py %clean rm -rf $RPM_BUILD_ROOT %check # There is unittest/ directory available, but not sure, how # how to make it work. %files %defattr(-,root,root,-) %doc README ChangeLog COPYING doc/ %{python_sitearch}/* %changelog * Fri Jul 18 2008 Mat??j Cepl 0.1.2-3 - Fix building system. - Approved for Fedora * Fri Jul 18 2008 Mat??j Cepl 0.1.2-2 - Dan's patch to fix compilation flags. * Thu Jul 17 2008 Mat??j Cepl 0.1.2-1 - initial build From fedora-extras-commits at redhat.com Fri Jul 18 22:09:33 2008 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Fri, 18 Jul 2008 22:09:33 GMT Subject: rpms/pyexiv2/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807182209.m6IM9XKb003020@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/pyexiv2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2966 Modified Files: .cvsignore sources Log Message: Initial commit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyexiv2/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2008 16:38:08 -0000 1.1 +++ .cvsignore 18 Jul 2008 22:08:47 -0000 1.2 @@ -0,0 +1 @@ +pyexiv2-0.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyexiv2/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2008 16:38:08 -0000 1.1 +++ sources 18 Jul 2008 22:08:47 -0000 1.2 @@ -0,0 +1 @@ +246dae9b4eca5d2fe2a4e3762e13fac1 pyexiv2-0.1.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 18 22:09:55 2008 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Fri, 18 Jul 2008 22:09:55 GMT Subject: rpms/pyexiv2/F-9 pyexiv2-multilib.patch, NONE, 1.1 pyexiv2-packager.patch, NONE, 1.1 pyexiv2.spec, NONE, 1.1 Message-ID: <200807182209.m6IM9tfe003056@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/pyexiv2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3038 Added Files: pyexiv2-multilib.patch pyexiv2-packager.patch pyexiv2.spec Log Message: Initial commit pyexiv2-multilib.patch: --- NEW FILE pyexiv2-multilib.patch --- diff -Nru pyexiv2.orig/src/SConscript pyexiv2/src/SConscript --- pyexiv2.orig/src/SConscript 2008-02-18 23:32:00.000000000 +0100 +++ pyexiv2/src/SConscript 2008-07-17 17:45:25.000000000 +0200 @@ -3,6 +3,7 @@ import sys import os.path +from distutils.sysconfig import get_python_lib env = Environment() @@ -22,7 +23,8 @@ #??'scons install'. If DESTDIR is specified on the command line when invoking # scons, it will be prepended to each installed target file. See # http://www.gnu.org/prep/standards/html_node/DESTDIR.html for reference. -python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages') +#python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages') +python_lib_path = get_python_lib(1) dest_dir = ARGUMENTS.get('DESTDIR') if (dest_dir is None) or (not os.path.isabs(dest_dir)): install_dir = python_lib_path pyexiv2-packager.patch: --- NEW FILE pyexiv2-packager.patch --- diff -Nru pyexiv2.multilib/src/SConscript pyexiv2/src/SConscript --- pyexiv2.multilib/src/SConscript 2008-07-17 21:39:05.000000000 +0200 +++ pyexiv2/src/SConscript 2008-07-17 21:43:07.000000000 +0200 @@ -5,8 +5,22 @@ import os.path from distutils.sysconfig import get_python_lib +import os +import SCons.Util + env = Environment() +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] +if os.environ.has_key('CFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] +if os.environ.has_key('CXXFLAGS'): + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + # Include directories to look for 'Python.h' in python_inc_path = os.path.join(sys.prefix, 'include', 'python' + sys.version[:3]) env.Append(CPPPATH=[python_inc_path]) --- NEW FILE pyexiv2.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pyexiv2 Version: 0.1.2 Release: 3%{?dist} Summary: Python binding to exiv2 Group: Development/Languages License: GPLv2+ URL: http://tilloy.net/dev/pyexiv2/ Source0: http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2 # next patch should be removed when # https://bugs.launchpad.net/pyexiv2/+bug/249513 # is fixed Patch0: pyexiv2-multilib.patch # the same for bug # https://bugs.launchpad.net/pyexiv2/+bug/249835 Patch1: pyexiv2-packager.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel exiv2-devel boost-devel scons %description pyexiv2 is a python binding to exiv2, the C++ library for manipulation of EXIF and IPTC image metadata. It is a python module that allows your python scripts to read and write metadata (EXIF, IPTC, thumbnail) embedded in image files (JPEG, TIFF, ...). %prep %setup -q -n %{name} %patch0 -p1 -b .multilib %patch1 -p1 -b .packager %build # Remove CFLAGS=... for noarch packages (unneeded) #CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" scons %install rm -rf $RPM_BUILD_ROOT #%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" scons DESTDIR=$RPM_BUILD_ROOT install chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/pyexiv2.py %clean rm -rf $RPM_BUILD_ROOT %check # There is unittest/ directory available, but not sure, how # how to make it work. %files %defattr(-,root,root,-) %doc README ChangeLog COPYING doc/ %{python_sitearch}/* %changelog * Fri Jul 18 2008 Mat??j Cepl 0.1.2-3 - Fix building system. - Approved for Fedora * Fri Jul 18 2008 Mat??j Cepl 0.1.2-2 - Dan's patch to fix compilation flags. * Thu Jul 17 2008 Mat??j Cepl 0.1.2-1 - initial build From fedora-extras-commits at redhat.com Fri Jul 18 22:10:09 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Fri, 18 Jul 2008 22:10:09 GMT Subject: rpms/geoqo/F-9 geoqo.spec,1.4,1.5 Message-ID: <200807182210.m6IMA9A5003078@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/geoqo/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3006 Modified Files: geoqo.spec Log Message: fix bug 45253 Index: geoqo.spec =================================================================== RCS file: /cvs/extras/rpms/geoqo/F-9/geoqo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geoqo.spec 23 Jun 2008 15:38:16 -0000 1.4 +++ geoqo.spec 18 Jul 2008 22:09:25 -0000 1.5 @@ -1,8 +1,8 @@ Summary: GeoCaching and General Waypoint Database Name: geoqo Version: 0.97 -Release: 2%{?dist} -License: GPLv2 or Artistic +Release: 3%{?dist} +License: GPLv2 Group: Amusements/Games URL: http://www.geoqo.org/ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz @@ -19,6 +19,7 @@ BuildRequires: perl(XML::Simple) BuildRequires: perl(DBD::SQLite2) BuildRequires: perl(Text::Balanced) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description geoqo is a perl script and support modules for manipulating a database @@ -70,6 +71,10 @@ %{_mandir}/man3/* %changelog +* Fri Jul 18 2008 Wes Hardaker - 0.97-3 +- Fix bug #454253: require perl properly for auto-rebuild +- Change license to GPLv2 only since source doesn't have artistic in it + * Mon Jun 23 2008 Wes Hardaker - 0.97-2 - Fix bug #452481: require DBD::sqlite2 From fedora-extras-commits at redhat.com Fri Jul 18 22:14:07 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Fri, 18 Jul 2008 22:14:07 GMT Subject: rpms/kernel/F-8 linux-2.6-alsa-trident-spdif.patch, NONE, 1.1 kernel.spec, 1.496, 1.497 Message-ID: <200807182214.m6IME7WM003331@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3262 Modified Files: kernel.spec Added Files: linux-2.6-alsa-trident-spdif.patch Log Message: * Thu Jul 03 2008 Chuck Ebbert 2.6.25.9-42 - Linux 2.6.25.10 - Reverted stable patch, not needed with utrace: x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch - Reverted part of this stable patch against drivers/net/wireless/strip.c (the driver eventually gets removed as part of the wireless updates): tty-fix-for-tty-operations-bugs.patch linux-2.6-alsa-trident-spdif.patch: --- NEW FILE linux-2.6-alsa-trident-spdif.patch --- From: Pierre Ossman Date: Mon, 23 Jun 2008 09:45:47 +0000 (+0200) Subject: ALSA: trident - pause s/pdif output X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftiwai%2Fsound-2.6.git;a=commitdiff_plain;h=f19a62ecba9d0963cee2b673f0ad34917b5e57ad ALSA: trident - pause s/pdif output Stop the S/PDIF DMA engine and output when the device is told to pause. It will keep on looping the current buffer contents if this isn't done. Signed-off-by: Pierre Ossman Tested-by: Rene Herman Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index bbcee2c..a69b420 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c @@ -1590,7 +1590,10 @@ static int snd_trident_trigger(struct snd_pcm_substream *substream, if (spdif_flag) { if (trident->device != TRIDENT_DEVICE_ID_SI7018) { outl(trident->spdif_pcm_bits, TRID_REG(trident, NX_SPCSTATUS)); - outb(trident->spdif_pcm_ctrl, TRID_REG(trident, NX_SPCTRL_SPCSO + 3)); + val = trident->spdif_pcm_ctrl; + if (!go) + val &= ~(0x28); + outb(val, TRID_REG(trident, NX_SPCTRL_SPCSO + 3)); } else { outl(trident->spdif_pcm_bits, TRID_REG(trident, SI_SPDIF_CS)); val = inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)) | SPDIF_EN; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.496 retrieving revision 1.497 diff -u -r1.496 -r1.497 --- kernel.spec 18 Jul 2008 16:52:22 -0000 1.496 +++ kernel.spec 18 Jul 2008 22:13:14 -0000 1.497 @@ -582,6 +582,7 @@ Patch91: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch Patch92: linux-2.6-alsa-hda-codec-add-AD1884A.patch Patch93: linux-2.6-alsa-kill-annoying-messages.patch +Patch94: linux-2.6-alsa-trident-spdif.patch Patch123: linux-2.6-ppc-rtc.patch Patch130: linux-2.6-ppc-use-libgcc.patch @@ -1001,6 +1002,8 @@ ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch # kill annoying messages ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch +# trident fix from F9 +ApplyPatch linux-2.6-alsa-trident-spdif.patch # Nouveau DRM + drm fixes ApplyPatch nouveau-drm.patch @@ -1840,6 +1843,9 @@ %changelog +* Fri Jul 18 2008 Chuck Ebbert 2.6.25.11-57 +- Add ALSA Trident driver fix from F9 kernel. (F9#453464) + * Fri Jul 18 2008 Chuck Ebbert 2.6.25.11-56 - Add "show backtrace on all CPUs" (SysRq-l). From fedora-extras-commits at redhat.com Fri Jul 18 22:22:10 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 18 Jul 2008 22:22:10 GMT Subject: rpms/xfce4-screenshooter-plugin/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xfce4-screenshooter-plugin.spec, 1.12, 1.13 Message-ID: <200807182222.m6IMMAOp003545@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3486 Modified Files: .cvsignore sources xfce4-screenshooter-plugin.spec Log Message: * Fri Jul 18 2008 Christoph Wickert - 1.3.1-1 - Update to 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Jul 2008 13:06:10 -0000 1.5 +++ .cvsignore 18 Jul 2008 22:21:11 -0000 1.6 @@ -1 +1 @@ -xfce4-screenshooter-plugin-1.3.0.tar.gz +xfce4-screenshooter-plugin-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Jul 2008 13:06:10 -0000 1.5 +++ sources 18 Jul 2008 22:21:11 -0000 1.6 @@ -1 +1 @@ -cef8ce7c6ef6148d37ceac7990325ab1 xfce4-screenshooter-plugin-1.3.0.tar.gz +950ab3d7e0f42d85ad9083ba28cf0f16 xfce4-screenshooter-plugin-1.3.1.tar.gz Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel/xfce4-screenshooter-plugin.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xfce4-screenshooter-plugin.spec 16 Jul 2008 17:51:30 -0000 1.12 +++ xfce4-screenshooter-plugin.spec 18 Jul 2008 22:21:11 -0000 1.13 @@ -1,5 +1,5 @@ Name: xfce4-screenshooter-plugin -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Screenshot utility for the Xfce panel @@ -18,6 +18,9 @@ %prep %setup -q +# bad source tarball needs some fixes +chmod -x COPYING AUTHORS README +iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog %build %configure --disable-static @@ -40,6 +43,9 @@ %{_mandir}/man1/*.1.gz %changelog +* Fri Jul 18 2008 Christoph Wickert - 1.3.1-1 +- Update to 1.3.1 + * Wed Jul 16 2008 Christoph Wickert - 1.3.0-1 - Update to 1.3.0 From fedora-extras-commits at redhat.com Fri Jul 18 22:26:25 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 18 Jul 2008 22:26:25 GMT Subject: rpms/xulrunner/devel xulrunner.spec,1.129,1.130 Message-ID: <200807182226.m6IMQPsC003746@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3672 Modified Files: xulrunner.spec Log Message: Need to BuildRequire: zip Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- xulrunner.spec 18 Jul 2008 17:23:55 -0000 1.129 +++ xulrunner.spec 18 Jul 2008 22:25:35 -0000 1.130 @@ -41,6 +41,7 @@ BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: libpng-devel BuildRequires: libjpeg-devel +BuildRequires: zip BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: lcms-devel >= 1.17 From fedora-extras-commits at redhat.com Fri Jul 18 22:48:35 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Fri, 18 Jul 2008 22:48:35 GMT Subject: rpms/augeas/F-9 .cvsignore, 1.5, 1.6 augeas.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807182248.m6IMmZIs004788@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4679/F-9 Modified Files: .cvsignore augeas.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jul 2008 21:02:56 -0000 1.5 +++ .cvsignore 18 Jul 2008 22:47:47 -0000 1.6 @@ -1 +1 @@ -augeas-0.2.1.tar.gz +augeas-0.2.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/augeas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- augeas.spec 1 Jul 2008 21:02:56 -0000 1.4 +++ augeas.spec 18 Jul 2008 22:47:47 -0000 1.5 @@ -1,12 +1,12 @@ Name: augeas -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ -Source0: http://augeas.net/download/augeas-0.2.1.tar.gz +Source0: http://augeas.net/download/augeas-0.2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 +- New version + * Tue Jul 1 2008 David Lutterkort - 0.2.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jul 2008 21:02:56 -0000 1.5 +++ sources 18 Jul 2008 22:47:47 -0000 1.6 @@ -1 +1 @@ -0f83b2579f8f68f73966275183cc8665 augeas-0.2.1.tar.gz +2dc7003c2cea45cada2962c5493bddfa augeas-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 22:48:47 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Fri, 18 Jul 2008 22:48:47 GMT Subject: rpms/augeas/F-8 .cvsignore, 1.5, 1.6 augeas.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200807182248.m6IMmlEu004793@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4679/F-8 Modified Files: .cvsignore augeas.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jul 2008 21:02:36 -0000 1.5 +++ .cvsignore 18 Jul 2008 22:47:32 -0000 1.6 @@ -1 +1 @@ -augeas-0.2.1.tar.gz +augeas-0.2.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-8/augeas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- augeas.spec 1 Jul 2008 21:02:36 -0000 1.5 +++ augeas.spec 18 Jul 2008 22:47:32 -0000 1.6 @@ -1,12 +1,12 @@ Name: augeas -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ -Source0: http://augeas.net/download/augeas-0.2.1.tar.gz +Source0: http://augeas.net/download/augeas-0.2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 +- New version + * Tue Jul 1 2008 David Lutterkort - 0.2.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jul 2008 21:02:36 -0000 1.5 +++ sources 18 Jul 2008 22:47:32 -0000 1.6 @@ -1 +1 @@ -0f83b2579f8f68f73966275183cc8665 augeas-0.2.1.tar.gz +2dc7003c2cea45cada2962c5493bddfa augeas-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 22:48:52 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Fri, 18 Jul 2008 22:48:52 GMT Subject: rpms/augeas/devel .cvsignore, 1.5, 1.6 augeas.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807182248.m6IMmqD6004802@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4679/devel Modified Files: .cvsignore augeas.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jul 2008 19:53:53 -0000 1.5 +++ .cvsignore 18 Jul 2008 22:48:05 -0000 1.6 @@ -1 +1 @@ -augeas-0.2.1.tar.gz +augeas-0.2.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- augeas.spec 1 Jul 2008 19:53:53 -0000 1.4 +++ augeas.spec 18 Jul 2008 22:48:06 -0000 1.5 @@ -1,12 +1,12 @@ Name: augeas -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries License: LGPLv2+ URL: http://augeas.net/ -Source0: http://augeas.net/download/augeas-0.2.1.tar.gz +Source0: http://augeas.net/download/augeas-0.2.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 +- New version + * Tue Jul 1 2008 David Lutterkort - 0.2.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jul 2008 19:53:53 -0000 1.5 +++ sources 18 Jul 2008 22:48:06 -0000 1.6 @@ -1 +1 @@ -0f83b2579f8f68f73966275183cc8665 augeas-0.2.1.tar.gz +2dc7003c2cea45cada2962c5493bddfa augeas-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 18 23:14:55 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 18 Jul 2008 23:14:55 GMT Subject: rpms/xfce4-screenshooter-plugin/F-8 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xfce4-screenshooter-plugin.spec, 1.11, 1.12 Message-ID: <200807182314.m6INEtnY014755@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14689/F-8 Modified Files: .cvsignore sources xfce4-screenshooter-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 - Update to 1.2.0 - Include new xfce4-screenshooter manpage Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Jul 2008 13:37:40 -0000 1.5 +++ .cvsignore 18 Jul 2008 23:14:07 -0000 1.6 @@ -1 +1 @@ -xfce4-screenshooter-plugin-1.3.0.tar.gz +xfce4-screenshooter-plugin-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Jul 2008 13:37:40 -0000 1.5 +++ sources 18 Jul 2008 23:14:07 -0000 1.6 @@ -1 +1 @@ -cef8ce7c6ef6148d37ceac7990325ab1 xfce4-screenshooter-plugin-1.3.0.tar.gz +950ab3d7e0f42d85ad9083ba28cf0f16 xfce4-screenshooter-plugin-1.3.1.tar.gz Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-8/xfce4-screenshooter-plugin.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xfce4-screenshooter-plugin.spec 16 Jul 2008 17:50:41 -0000 1.11 +++ xfce4-screenshooter-plugin.spec 18 Jul 2008 23:14:07 -0000 1.12 @@ -1,5 +1,5 @@ Name: xfce4-screenshooter-plugin -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Screenshot utility for the Xfce panel @@ -18,6 +18,9 @@ %prep %setup -q +# bad source tarball needs some fixes +chmod -x COPYING AUTHORS README +iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog %build %configure --disable-static @@ -40,6 +43,9 @@ %{_mandir}/man1/*.1.gz %changelog +* Fri Jul 18 2008 Christoph Wickert - 1.3.1-1 +- Update to 1.3.1 + * Wed Jul 16 2008 Christoph Wickert - 1.3.0-1 - Update to 1.3.0 From fedora-extras-commits at redhat.com Fri Jul 18 23:15:15 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 18 Jul 2008 23:15:15 GMT Subject: rpms/xfce4-screenshooter-plugin/F-9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xfce4-screenshooter-plugin.spec, 1.12, 1.13 Message-ID: <200807182315.m6INFF34014835@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14689/F-9 Modified Files: .cvsignore sources xfce4-screenshooter-plugin.spec Log Message: * Thu Jul 03 2008 Christoph Wickert - 1.2.0-1 - Update to 1.2.0 - Include new xfce4-screenshooter manpage Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Jul 2008 13:38:26 -0000 1.5 +++ .cvsignore 18 Jul 2008 23:14:25 -0000 1.6 @@ -1 +1 @@ -xfce4-screenshooter-plugin-1.3.0.tar.gz +xfce4-screenshooter-plugin-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Jul 2008 13:38:26 -0000 1.5 +++ sources 18 Jul 2008 23:14:25 -0000 1.6 @@ -1 +1 @@ -cef8ce7c6ef6148d37ceac7990325ab1 xfce4-screenshooter-plugin-1.3.0.tar.gz +950ab3d7e0f42d85ad9083ba28cf0f16 xfce4-screenshooter-plugin-1.3.1.tar.gz Index: xfce4-screenshooter-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-9/xfce4-screenshooter-plugin.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xfce4-screenshooter-plugin.spec 16 Jul 2008 17:51:07 -0000 1.12 +++ xfce4-screenshooter-plugin.spec 18 Jul 2008 23:14:25 -0000 1.13 @@ -1,5 +1,5 @@ Name: xfce4-screenshooter-plugin -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Screenshot utility for the Xfce panel @@ -18,6 +18,9 @@ %prep %setup -q +# bad source tarball needs some fixes +chmod -x COPYING AUTHORS README +iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog %build %configure --disable-static @@ -40,6 +43,9 @@ %{_mandir}/man1/*.1.gz %changelog +* Fri Jul 18 2008 Christoph Wickert - 1.3.1-1 +- Update to 1.3.1 + * Wed Jul 16 2008 Christoph Wickert - 1.3.0-1 - Update to 1.3.0 From fedora-extras-commits at redhat.com Fri Jul 18 23:19:11 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Fri, 18 Jul 2008 23:19:11 GMT Subject: rpms/sonic-visualiser/devel sonic-visualiser.spec,1.9,1.10 Message-ID: <200807182319.m6INJBTg015305@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/sonic-visualiser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15182 Modified Files: sonic-visualiser.spec Log Message: Re-add rubberband-devel build dependency, accidentally dropped Index: sonic-visualiser.spec =================================================================== RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sonic-visualiser.spec 18 Jul 2008 01:33:46 -0000 1.9 +++ sonic-visualiser.spec 18 Jul 2008 23:18:21 -0000 1.10 @@ -14,6 +14,7 @@ BuildRequires: qt4-devel vamp-plugin-sdk-devel BuildRequires: libsndfile-devel libsamplerate-devel fftw-devel bzip2-devel BuildRequires: jack-audio-connection-kit-devel portaudio-devel +BuildRequires: rubberband-devel %{?_with_libmad:BuildRequires: libmad-devel} BuildRequires: liboggz-devel libfishsound-devel BuildRequires: liblrdf-devel raptor-devel liblo-devel From fedora-extras-commits at redhat.com Fri Jul 18 23:23:55 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Fri, 18 Jul 2008 23:23:55 GMT Subject: rpms/WebKit/F-9 WebKit.spec,1.12,1.13 WebKit-gcc43.patch,1.2,NONE Message-ID: <200807182323.m6INNtYu015650@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15569 Modified Files: WebKit.spec Removed Files: WebKit-gcc43.patch Log Message: Remove Qt stuff, in preparation for Qt 4.4/KDE 4.1 bumps Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-9/WebKit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- WebKit.spec 6 Jul 2008 06:00:35 -0000 1.12 +++ WebKit.spec 18 Jul 2008 23:23:08 -0000 1.13 @@ -24,7 +24,7 @@ Name: WebKit Version: 1.0.0 -Release: 0.11.svn%{svn_revision}%{?dist} +Release: 0.12.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -41,13 +41,12 @@ BuildRequires: gperf BuildRequires: gtk2-devel BuildRequires: libicu-devel +BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: libxslt-devel BuildRequires: libXt-devel BuildRequires: pcre-devel BuildRequires: sqlite-devel -## Necessary for qmake and friends. -BuildRequires: qt4-devel ## Conditional dependencies... %if %{with html5video} @@ -91,29 +90,6 @@ only be used as a "preview" rather than a stable platform library. -%package qt -Summary: Qt port of WebKit -Group: Development/Libraries - -%description qt -%{name} is an open-source Web content engine library. This package contains -the shared libraries for the WebKit Qt port as well as the sample QtLauncher -tool. - - -%package qt-devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-qt = %{version}-%{release} -Requires: pkgconfig -Requires: qt4-devel - -%description qt-devel -The %{name}-qt-devel package contains libraries, build data, and header files -for developing applications that use %{name}-qt, as well as the DumpRenderTree -tool. - - %package doc Summary: Documentation for %{name} Group: Documentation @@ -135,60 +111,24 @@ ## Fix permissions for the debuginfo generation. chmod a-x WebCore/dom/Clipboard.cpp -## Build the GTK+ port... ## Don't call configure automatically sed -i.conf -e '$d' autogen.sh ./autogen.sh -install -d build-gtk -pushd build-gtk - ln -sf ../configure - %configure \ - %{?with_debug: --enable-debug } \ - %{?with_html5video: --enable-video } \ - %{?with_pango: --with-font-backend=pango } \ - %{?with_svg: --enable-svg-filters } - make %{?_smp_mflags} -popd - - -## ...and the Qt port. -install -d build-qt -pushd build-qt - %{_qt4_qmake} -r \ - OUTPUT_DIR="$PWD" \ - QMAKE_STRIP=/bin/true \ - QMAKE_RPATH= \ - QMAKE_CFLAGS="%{optflags}" \ - QMAKE_CXXFLAGS="%{optflags}" \ - VERSION=%{version} \ - CONFIG-=gtk \ - CONFIG+=qt-port \ - WEBKIT_LIB_DIR=%{_libdir} \ - ../WebKit.pro - make %{?_smp_mflags} -popd +%configure \ +%{?with_debug: --enable-debug } \ +%{?with_html5video: --enable-video } \ +%{?with_pango: --with-font-backend=pango } \ +%{?with_svg: --enable-svg-filters } + +make %{?_smp_mflags} %install rm -rf %{buildroot} -make -C build-gtk install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} install -d -m 755 %{buildroot}%{_libexecdir}/%{name} -install -m 755 build-gtk/Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} - -make -C build-qt install INSTALL_ROOT=%{buildroot} -install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name} -install -m 755 build-qt/bin/DumpRenderTree %{buildroot}%{_libexecdir}/%{name} - - -## Cleanup the pkgconfig files a bit... -pushd %{buildroot}%{_libdir}/pkgconfig/ - for WEBKIT_LIB in QtWebKit; do - sed -i -e 's!prefix=.*!prefix=%{_prefix}!' ${WEBKIT_LIB}.pc - ## We don't need linkage that the WebKit DSOs already ensure. - sed -i -e "s/^Libs:.*$/Libs: -L\${libdir} -l${WEBKIT_LIB}/" ${WEBKIT_LIB}.pc - done -popd +install -m 755 Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} ## Finally, copy over and rename the various files for %%doc inclusion. rm -f docfiles.list @@ -218,17 +158,12 @@ %postun gtk -p /sbin/ldconfig -%post qt -p /sbin/ldconfig - -%postun qt -p /sbin/ldconfig - - %files gtk %defattr(-,root,root,-) +%doc %{_bindir}/jsc %{_libdir}/libwebkit-1.0.so.* -%dir %{_libexecdir}/WebKit/ -%{_libexecdir}/WebKit/GtkLauncher +%{_libexecdir}/WebKit/ %files gtk-devel %defattr(-,root,root,-) @@ -237,26 +172,16 @@ %{_libdir}/libwebkit-1.0.so %{_libdir}/pkgconfig/webkit-1.0.pc -%files qt -%defattr(-,root,root,-) -%{_libdir}/libQtWebKit.so.* -%dir %{_libexecdir}/WebKit/ -%{_libexecdir}/WebKit/QtLauncher - -%files qt-devel -%defattr(-,root,root,-) -%{_includedir}/QtWebKit/ -%{_libdir}/libQtWebKit.prl -%{_libdir}/libQtWebKit.so -%{_libdir}/pkgconfig/QtWebKit.pc -%{_libexecdir}/WebKit/DumpRenderTree -%{_qt4_prefix}/mkspecs/features/qtwebkit.prf - %files doc -f docfiles.list %defattr(-,root,root,-) %changelog +* Fri Jul 18 2008 Peter Gordon 1.0.0-0.12.svn34655 +- Remove Qt subpackage stuff, in preparation for Qt 4.4 bump; thanks to Rex + Dieter/Ngo Than and crew. +- Reference: bug 442200 (RFE: WebKit Migration) + * Sat Jul 05 2008 Peter Gordon 1.0.0-0.11.svn34655 - Update to new upstream snapshot (SVN 34655) - Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of --- WebKit-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 18 23:24:25 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 18 Jul 2008 23:24:25 GMT Subject: rpms/mksh/EL-4 .cvsignore, 1.13, 1.14 mksh.spec, 1.14, 1.15 sources, 1.13, 1.14 Message-ID: <200807182324.m6INOPsJ015687@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15501/EL-4 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35b Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Jul 2008 10:11:04 -0000 1.13 +++ .cvsignore 18 Jul 2008 23:22:36 -0000 1.14 @@ -1,2 +1,2 @@ -mksh-R35.cpio.gz +mksh-R35b.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mksh.spec 13 Jul 2008 10:11:04 -0000 1.14 +++ mksh.spec 18 Jul 2008 23:22:36 -0000 1.15 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 35 +Version: 35b Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 19 2008 Robert Scheck 35b-1 +- Upgrade to 35b + * Sun Jul 13 2008 Robert Scheck 35-1 - Upgrade to 35 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Jul 2008 10:11:04 -0000 1.13 +++ sources 18 Jul 2008 23:22:36 -0000 1.14 @@ -1,2 +1,2 @@ -5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz +0e96cd3f8141b7abc679bbb303a8be2c mksh-R35b.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Fri Jul 18 23:24:28 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 18 Jul 2008 23:24:28 GMT Subject: rpms/mksh/F-9 .cvsignore, 1.13, 1.14 mksh.spec, 1.15, 1.16 sources, 1.13, 1.14 Message-ID: <200807182324.m6INOSLi015694@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15501/F-9 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35b Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-9/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Jul 2008 10:12:16 -0000 1.13 +++ .cvsignore 18 Jul 2008 23:23:39 -0000 1.14 @@ -1,2 +1,2 @@ -mksh-R35.cpio.gz +mksh-R35b.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-9/mksh.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mksh.spec 13 Jul 2008 10:12:16 -0000 1.15 +++ mksh.spec 18 Jul 2008 23:23:39 -0000 1.16 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 35 +Version: 35b Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 19 2008 Robert Scheck 35b-1 +- Upgrade to 35b + * Sun Jul 13 2008 Robert Scheck 35-1 - Upgrade to 35 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Jul 2008 10:12:16 -0000 1.13 +++ sources 18 Jul 2008 23:23:39 -0000 1.14 @@ -1,2 +1,2 @@ -5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz +0e96cd3f8141b7abc679bbb303a8be2c mksh-R35b.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Fri Jul 18 23:24:39 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 18 Jul 2008 23:24:39 GMT Subject: rpms/mksh/F-8 .cvsignore, 1.13, 1.14 mksh.spec, 1.14, 1.15 sources, 1.13, 1.14 Message-ID: <200807182324.m6INOdJW015718@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15501/F-8 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35b Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Jul 2008 10:11:46 -0000 1.13 +++ .cvsignore 18 Jul 2008 23:23:17 -0000 1.14 @@ -1,2 +1,2 @@ -mksh-R35.cpio.gz +mksh-R35b.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/mksh.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mksh.spec 13 Jul 2008 10:11:46 -0000 1.14 +++ mksh.spec 18 Jul 2008 23:23:17 -0000 1.15 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 35 +Version: 35b Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 19 2008 Robert Scheck 35b-1 +- Upgrade to 35b + * Sun Jul 13 2008 Robert Scheck 35-1 - Upgrade to 35 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Jul 2008 10:11:46 -0000 1.13 +++ sources 18 Jul 2008 23:23:18 -0000 1.14 @@ -1,2 +1,2 @@ -5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz +0e96cd3f8141b7abc679bbb303a8be2c mksh-R35b.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Fri Jul 18 23:24:47 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 18 Jul 2008 23:24:47 GMT Subject: rpms/mksh/EL-5 .cvsignore, 1.13, 1.14 mksh.spec, 1.14, 1.15 sources, 1.13, 1.14 Message-ID: <200807182324.m6INOlDD015727@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15501/EL-5 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35b Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Jul 2008 10:11:28 -0000 1.13 +++ .cvsignore 18 Jul 2008 23:22:56 -0000 1.14 @@ -1,2 +1,2 @@ -mksh-R35.cpio.gz +mksh-R35b.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mksh.spec 13 Jul 2008 10:11:28 -0000 1.14 +++ mksh.spec 18 Jul 2008 23:22:56 -0000 1.15 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 35 +Version: 35b Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 19 2008 Robert Scheck 35b-1 +- Upgrade to 35b + * Sun Jul 13 2008 Robert Scheck 35-1 - Upgrade to 35 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Jul 2008 10:11:28 -0000 1.13 +++ sources 18 Jul 2008 23:22:56 -0000 1.14 @@ -1,2 +1,2 @@ -5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz +0e96cd3f8141b7abc679bbb303a8be2c mksh-R35b.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Fri Jul 18 23:24:49 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 18 Jul 2008 23:24:49 GMT Subject: rpms/mksh/devel .cvsignore, 1.13, 1.14 mksh.spec, 1.15, 1.16 sources, 1.13, 1.14 Message-ID: <200807182324.m6INOnae015736@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15501/devel Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 35b Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Jul 2008 10:12:34 -0000 1.13 +++ .cvsignore 18 Jul 2008 23:23:58 -0000 1.14 @@ -1,2 +1,2 @@ -mksh-R35.cpio.gz +mksh-R35b.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mksh.spec 13 Jul 2008 10:12:34 -0000 1.15 +++ mksh.spec 18 Jul 2008 23:23:58 -0000 1.16 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 35 +Version: 35b Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 19 2008 Robert Scheck 35b-1 +- Upgrade to 35b + * Sun Jul 13 2008 Robert Scheck 35-1 - Upgrade to 35 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Jul 2008 10:12:34 -0000 1.13 +++ sources 18 Jul 2008 23:23:58 -0000 1.14 @@ -1,2 +1,2 @@ -5fd8714770337e0786b124530ddd3ba0 mksh-R35.cpio.gz +0e96cd3f8141b7abc679bbb303a8be2c mksh-R35b.cpio.gz e32f92d2cf26a267abe4df7c14fbb356 arc4random.c From fedora-extras-commits at redhat.com Fri Jul 18 23:26:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 18 Jul 2008 23:26:42 +0000 Subject: [pkgdb] eclipse-egit: devos has requested watchcommits Message-ID: <200807182326.m6INQg05018590@bastion.fedora.phx.redhat.com> Niels de Vos (devos) has requested the watchcommits acl on eclipse-egit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From fedora-extras-commits at redhat.com Fri Jul 18 23:30:04 2008 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Fri, 18 Jul 2008 23:30:04 GMT Subject: rpms/mantis/devel mantis-1.1.2-bugnote.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 mantis.spec, 1.18, 1.19 sources, 1.14, 1.15 Message-ID: <200807182330.m6INU4V2016315@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/mantis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16230 Modified Files: .cvsignore mantis.spec sources Added Files: mantis-1.1.2-bugnote.patch Log Message: * Sat Jul 19 2008 Gianluca Sforna - 1.1.2-1 - new upstream release - add patch for bugnotes notification mantis-1.1.2-bugnote.patch: --- NEW FILE mantis-1.1.2-bugnote.patch --- Index: mantis-1.1.2/core/bugnote_api.php =================================================================== --- mantis-1.1.2.orig/core/bugnote_api.php +++ mantis-1.1.2/core/bugnote_api.php @@ -99,7 +99,7 @@ # Add a bugnote to a bug # # return the ID of the new bugnote - function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null ) { + function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null, $p_send_email = true ) { $c_bug_id = db_prepare_int( $p_bug_id ); $c_bugnote_text = db_prepare_string( $p_bugnote_text ); $c_time_tracking = db_prepare_time( $p_time_tracking ); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Jan 2008 22:52:18 -0000 1.9 +++ .cvsignore 18 Jul 2008 23:29:03 -0000 1.10 @@ -1 +1 @@ -mantis-1.1.1.tar.gz +mantis-1.1.2.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mantis.spec 20 Jan 2008 22:52:18 -0000 1.18 +++ mantis.spec 18 Jul 2008 23:29:03 -0000 1.19 @@ -5,7 +5,7 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet @@ -16,6 +16,8 @@ Patch1: mantis-1.1.0-noexamplecom.patch Patch2: mantis-1.0.0rc2-noadmin.patch +Patch3: mantis-1.1.2-bugnote.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php >= 4.3.0 @@ -58,6 +60,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp %{SOURCE1} ./doc/README.Fedora rm -rf packages @@ -142,6 +145,10 @@ %changelog +* Sat Jul 19 2008 Gianluca Sforna - 1.1.2-1 +- new upstream release +- add patch for bugnotes notification + * Sat Jan 19 2008 Gianluca Sforna - 1.1.1-1 - new upstream release - Add more info in README.Fedora about configuration, upgrades Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Jan 2008 22:52:18 -0000 1.14 +++ sources 18 Jul 2008 23:29:03 -0000 1.15 @@ -1 +1 @@ -7e646be79def5bb32b74b1a246caf766 mantis-1.1.1.tar.gz +4cf5a591fd6855b49d745285db5d91ff mantis-1.1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 00:06:03 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sat, 19 Jul 2008 00:06:03 GMT Subject: rpms/dbus/devel activation-env.patch, NONE, 1.1 start-early.patch, NONE, 1.1 dbus.spec, 1.147, 1.148 Message-ID: <200807190006.m6J063kE024529@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/dbus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24422 Modified Files: dbus.spec Added Files: activation-env.patch start-early.patch Log Message: allow changing the activation environment activation-env.patch: --- NEW FILE activation-env.patch --- diff -up dbus-1.2.1/bus/activation.c.activation-env dbus-1.2.1/bus/activation.c --- dbus-1.2.1/bus/activation.c.activation-env 2008-07-18 19:53:24.000000000 -0400 +++ dbus-1.2.1/bus/activation.c 2008-07-18 19:56:13.000000000 -0400 @@ -51,6 +51,7 @@ struct BusActivation * activations per se */ DBusHashTable *directories; + DBusHashTable *environment; }; typedef struct @@ -671,6 +672,69 @@ update_directory (BusActivation *a return retval; } +static dbus_bool_t +populate_environment (BusActivation *activation) +{ + DBusString key; + DBusString value; + int i; + char **environment; + dbus_bool_t retval; + + environment = _dbus_get_environment (); + + if (environment == NULL) + return FALSE; + + if (!_dbus_string_init (&key)) + { + dbus_free_string_array (environment); + return FALSE; + } + + if (!_dbus_string_init (&value)) + { + _dbus_string_free (&key); + dbus_free_string_array (environment); + return FALSE; + } + + for (i = 0; environment[i] != NULL; i++) + { + if (!_dbus_string_append (&key, environment[i])) + break; + + if (_dbus_string_split_on_byte (&key, '=', &value)) + { + char *hash_key, *hash_value; + + if (!_dbus_string_steal_data (&key, &hash_key)) + break; + + if (!_dbus_string_steal_data (&value, &hash_value)) + break; + + if (!_dbus_hash_table_insert_string (activation->environment, + hash_key, hash_value)) + break; + } + _dbus_string_set_length (&key, 0); + _dbus_string_set_length (&value, 0); + } + + if (environment[i] != NULL) + goto out; + + retval = TRUE; +out: + + _dbus_string_free (&key); + _dbus_string_free (&value); + dbus_free_string_array (environment); + + return retval; +} + BusActivation* bus_activation_new (BusContext *context, const DBusString *address, @@ -779,6 +843,22 @@ bus_activation_new (BusContext *c link = _dbus_list_get_next_link (directories, link); } + activation->environment = _dbus_hash_table_new (DBUS_HASH_STRING, + (DBusFreeFunction) dbus_free, + (DBusFreeFunction) dbus_free); + + if (activation->environment == NULL) + { + BUS_SET_OOM (error); + goto failed; + } + + if (!populate_environment (activation)) + { + BUS_SET_OOM (error); + goto failed; + } + return activation; failed: @@ -813,41 +893,51 @@ bus_activation_unref (BusActivation *act _dbus_hash_table_unref (activation->pending_activations); if (activation->directories) _dbus_hash_table_unref (activation->directories); - + if (activation->environment) + _dbus_hash_table_unref (activation->environment); + dbus_free (activation); } -static void -child_setup (void *data) +static dbus_bool_t +add_bus_environment (BusActivation *activation, + DBusError *error) { - BusActivation *activation = data; const char *type; - /* If no memory, we simply have the child exit, so it won't try - * to connect to the wrong thing. - */ - if (!_dbus_setenv ("DBUS_STARTER_ADDRESS", activation->server_address)) - _dbus_exit (1); + if (!bus_activation_set_environment_variable (activation, + "DBUS_STARTER_ADDRESS", + activation->server_address, + error)) + return FALSE; type = bus_context_get_type (activation->context); if (type != NULL) { - if (!_dbus_setenv ("DBUS_STARTER_BUS_TYPE", type)) - _dbus_exit (1); + if (!bus_activation_set_environment_variable (activation, + "DBUS_STARTER_BUS_TYPE", type, + error)) + return FALSE; if (strcmp (type, "session") == 0) { - if (!_dbus_setenv ("DBUS_SESSION_BUS_ADDRESS", - activation->server_address)) - _dbus_exit (1); + if (!bus_activation_set_environment_variable (activation, + "DBUS_SESSION_BUS_ADDRESS", + activation->server_address, + error)) + return FALSE; } else if (strcmp (type, "system") == 0) { - if (!_dbus_setenv ("DBUS_SYSTEM_BUS_ADDRESS", - activation->server_address)) - _dbus_exit (1); + if (!bus_activation_set_environment_variable (activation, + "DBUS_SYSTEM_BUS_ADDRESS", + activation->server_address, + error)) + return FALSE; } } + + return TRUE; } typedef struct @@ -1389,6 +1479,95 @@ activation_find_entry (BusActivation *ac return entry; } +static char ** +bus_activation_get_environment (BusActivation *activation) +{ + char **environment; + int i, length; + DBusString entry; + DBusHashIter iter; + + length = _dbus_hash_table_get_n_entries (activation->environment); + + environment = dbus_new0 (char *, length + 1); + + if (environment == NULL) + return NULL; + + i = 0; + _dbus_hash_iter_init (activation->environment, &iter); + + if (!_dbus_string_init (&entry)) + { + dbus_free_string_array (environment); + return NULL; + } + + while (_dbus_hash_iter_next (&iter)) + { + const char *key, *value; + + key = (const char *) _dbus_hash_iter_get_string_key (&iter); + value = (const char *) _dbus_hash_iter_get_value (&iter); + + if (!_dbus_string_append_printf (&entry, "%s=%s", key, value)) + break; + + if (!_dbus_string_steal_data (&entry, environment + i)) + break; + i++; + } + + _dbus_string_free (&entry); + + if (i != length) + { + dbus_free_string_array (environment); + environment = NULL; + } + + return environment; +} + +dbus_bool_t +bus_activation_set_environment_variable (BusActivation *activation, + const char *key, + const char *value, + DBusError *error) +{ + char *hash_key; + char *hash_value; + dbus_bool_t retval; + + retval = FALSE; + hash_key = NULL; + hash_value = NULL; + hash_key = _dbus_strdup (key); + + if (hash_key == NULL) + goto out; + + hash_value = _dbus_strdup (value); + + if (hash_value == NULL) + goto out; + + if (!_dbus_hash_table_insert_string (activation->environment, + hash_key, hash_value)) + goto out; + + retval = TRUE; +out: + if (retval == FALSE) + { + dbus_free (hash_key); + dbus_free (hash_value); + BUS_SET_OOM (error); + } + + return retval; +} + dbus_bool_t bus_activation_activate_service (BusActivation *activation, DBusConnection *connection, @@ -1688,20 +1867,38 @@ bus_activation_activate_service (BusActi } _dbus_string_free (&command); + if (!add_bus_environment (activation, error)) + { + _DBUS_ASSERT_ERROR_IS_SET (error); + dbus_free_string_array (argv); + return FALSE; + } + + envp = bus_activation_get_environment (activation); + + if (envp == NULL) + { + BUS_SET_OOM (error); + dbus_free_string_array (argv); + return FALSE; + } + _dbus_verbose ("Spawning %s ...\n", argv[0]); if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter, argv, envp, - child_setup, activation, + NULL, activation, error)) { _dbus_verbose ("Failed to spawn child\n"); _DBUS_ASSERT_ERROR_IS_SET (error); dbus_free_string_array (argv); + dbus_free_string_array (envp); return FALSE; } dbus_free_string_array (argv); + envp = NULL; _dbus_assert (pending_activation->babysitter != NULL); diff -up dbus-1.2.1/bus/activation.h.activation-env dbus-1.2.1/bus/activation.h --- dbus-1.2.1/bus/activation.h.activation-env 2008-07-18 19:53:32.000000000 -0400 +++ dbus-1.2.1/bus/activation.h 2008-07-18 19:56:13.000000000 -0400 @@ -34,6 +34,11 @@ BusActivation* bus_activation_new DBusError *error); BusActivation* bus_activation_ref (BusActivation *activation); void bus_activation_unref (BusActivation *activation); + +dbus_bool_t bus_activation_set_environment_variable (BusActivation *activation, + const char *key, + const char *value, + DBusError *error); dbus_bool_t bus_activation_activate_service (BusActivation *activation, DBusConnection *connection, BusTransaction *transaction, diff -up dbus-1.2.1/bus/dbus-daemon.1.in.activation-env dbus-1.2.1/bus/dbus-daemon.1.in --- dbus-1.2.1/bus/dbus-daemon.1.in.activation-env 2008-07-18 19:53:43.000000000 -0400 +++ dbus-1.2.1/bus/dbus-daemon.1.in 2008-07-18 19:56:13.000000000 -0400 @@ -138,7 +138,21 @@ Root element. The well-known type of the message bus. Currently known values are "system" and "session"; if other values are set, they should be either added to the D-Bus specification, or namespaced. The last - element "wins" (previous values are ignored). + element "wins" (previous values are ignored). This element +only controls which message bus specific environment variables are +set in activated clients. Most of the policy that distinguishes a +session bus from the system bus is controlled from the other elements +in the configuration file. + +.PP +If the well-known type of the message bus is "session", then the +DBUS_STARTER_BUS_TYPE environment variable will be set to "session" +and the DBUS_SESSION_BUS_ADDRESS environment variable will be set +to the address of the session bus. Likewise, if the type of the +message bus is "system", then the DBUS_STARTER_BUS_TYPE environment +variable will be set to "system" and the DBUS_SESSION_BUS_ADDRESS +environment variable will be set to the address of the system bus +(which is normally well known anyway). .PP Example: session diff -up dbus-1.2.1/bus/driver.c.activation-env dbus-1.2.1/bus/driver.c --- dbus-1.2.1/bus/driver.c.activation-env 2008-07-18 19:53:54.000000000 -0400 +++ dbus-1.2.1/bus/driver.c 2008-07-18 19:56:13.000000000 -0400 @@ -811,6 +811,133 @@ send_ack_reply (DBusConnection *connecti } static dbus_bool_t +bus_driver_handle_update_activation_environment (DBusConnection *connection, + BusTransaction *transaction, + DBusMessage *message, + DBusError *error) +{ + dbus_bool_t retval; + BusActivation *activation; + DBusMessageIter iter; + DBusMessageIter dict_iter; + DBusMessageIter dict_entry_iter; + int msg_type; + int array_type; + int key_type; + DBusList *keys, *key_link; + DBusList *values, *value_link; + + _DBUS_ASSERT_ERROR_IS_CLEAR (error); + + activation = bus_connection_get_activation (connection); + + dbus_message_iter_init (message, &iter); + + /* The message signature has already been checked for us, + * so let's just assert it's right. + */ + msg_type = dbus_message_iter_get_arg_type (&iter); + + _dbus_assert (msg_type == DBUS_TYPE_ARRAY); + + dbus_message_iter_recurse (&iter, &dict_iter); + + retval = FALSE; + + /* Then loop through the sent dictionary, add the location of + * the environment keys and values to lists. The result will + * be in reverse order, so we don't have to constantly search + * for the end of the list in a loop. + */ + keys = NULL; + values = NULL; + while ((array_type = dbus_message_iter_get_arg_type (&dict_iter)) == DBUS_TYPE_DICT_ENTRY) + { + dbus_message_iter_recurse (&dict_iter, &dict_entry_iter); + + while ((key_type = dbus_message_iter_get_arg_type (&dict_entry_iter)) == DBUS_TYPE_STRING) + { + char *key; + char *value; + int value_type; + + dbus_message_iter_get_basic (&dict_entry_iter, &key); + dbus_message_iter_next (&dict_entry_iter); + + value_type = dbus_message_iter_get_arg_type (&dict_entry_iter); + + if (value_type != DBUS_TYPE_STRING) + break; + + dbus_message_iter_get_basic (&dict_entry_iter, &value); + + if (!_dbus_list_append (&keys, key)) + { + BUS_SET_OOM (error); + break; + } + + if (!_dbus_list_append (&values, value)) + { + BUS_SET_OOM (error); + break; + } + + dbus_message_iter_next (&dict_entry_iter); + } + + if (key_type != DBUS_TYPE_INVALID) + break; + + dbus_message_iter_next (&dict_iter); + } + + if (array_type != DBUS_TYPE_INVALID) + goto out; + + _dbus_assert (_dbus_list_get_length (&keys) == _dbus_list_get_length (&values)); + + key_link = keys; + value_link = values; + while (key_link != NULL) + { + const char *key; + const char *value; + + key = key_link->data; + value = value_link->data; + + if (!bus_activation_set_environment_variable (activation, + key, value, error)) + { + _DBUS_ASSERT_ERROR_IS_SET (error); + _dbus_verbose ("bus_activation_set_environment_variable() failed\n"); + break; + } + key_link = _dbus_list_get_next_link (&keys, key_link); + value_link = _dbus_list_get_next_link (&values, value_link); + } + + /* FIXME: We can fail early having set only some of the environment variables, + * (because of OOM failure). It's sort of hard to fix and it doesn't really + * matter, so we're punting for now. + */ + if (key_link != NULL) + goto out; + + if (!send_ack_reply (connection, transaction, + message, error)) + goto out; + + retval = TRUE; + + out: + _dbus_list_clear (&keys); + _dbus_list_clear (&values); + return retval; +} + +static dbus_bool_t bus_driver_handle_add_match (DBusConnection *connection, BusTransaction *transaction, DBusMessage *message, @@ -1467,6 +1594,10 @@ struct DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_UINT32_AS_STRING, DBUS_TYPE_UINT32_AS_STRING, bus_driver_handle_activate_service }, + { "UpdateActivationEnvironment", + DBUS_TYPE_ARRAY_AS_STRING DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_STRING_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, + "", + bus_driver_handle_update_activation_environment }, { "NameHasOwner", DBUS_TYPE_STRING_AS_STRING, DBUS_TYPE_BOOLEAN_AS_STRING, diff -up dbus-1.2.1/bus/system.conf.in.activation-env dbus-1.2.1/bus/system.conf.in --- dbus-1.2.1/bus/system.conf.in.activation-env 2008-07-18 19:54:03.000000000 -0400 +++ dbus-1.2.1/bus/system.conf.in 2008-07-18 19:56:13.000000000 -0400 @@ -56,6 +56,10 @@ + + X-SuSE-YaST X-KDE-settings-hardware @@ -54,6 +55,24 @@ + System Settings + SystemConfig.directory + + + System + Settings + X-Red-Hat-ServerConfig + + + + Server + ServerConfig.directory + + X-Red-Hat-ServerConfig + + + + Development kde-development.directory @@ -358,7 +377,11 @@ Settingsmenu kde-settingsmenu.directory - Settings + + Settings + System + X-Red-Hat-ServerConfig + @@ -367,7 +390,9 @@ System + Settings X-KDE-More + X-Red-Hat-ServerConfig kdelibs-4.0.83-kstandarddirs.patch: --- NEW FILE kdelibs-4.0.83-kstandarddirs.patch --- diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandarddirs/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp 2008-06-18 14:42:26.000000000 +0200 +++ kdelibs-4.0.83-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-06-27 03:54:18.000000000 +0200 @@ -75,9 +75,12 @@ bool checkRestrictions : 1; QMap restrictions; QStringList xdgdata_prefixes; + QString localXdgdatahome; QStringList xdgconf_prefixes; + QString localXdgconfhome; QStringList prefixes; + QString localKdehome; // Directory dictionaries QMap absolutes; @@ -952,12 +955,63 @@ restrictionActive = true; d->dataRestrictionActive = false; // Reset } + const QStringList *prefixList = 0; + QString home; + if (strncmp(type, "xdgdata-", 8) == 0) + { + prefixList = &(d->xdgdata_prefixes); + home=d->localXdgdatahome; + } + else if (strncmp(type, "xdgconf-", 8) == 0) + { + prefixList = &(d->xdgconf_prefixes); + home=d->localXdgconfhome; + } + else + { + prefixList = &d->prefixes; + home=d->localKdehome; + } QStringList dirs; dirs = d->relatives.value(type); QString installdir = installPath( type ); QString installprefix = installPath("kdedir"); + if(!home.isNull()) + { + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( home + *it ); + testdir.setPath(path); + if (restrictionActive) + continue; + if (!candidates.contains(path)) + candidates.append(path); + } + + } + + // make sure we find the path where it's installed + // for non-config, non-exe files, we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share + if (strcmp("config", type) && strcmp("exe", type)) { + if (!installdir.isEmpty()) { + bool ok = true; + foreach (const QString &s, candidates) { + if (installdir.startsWith(s)) { + ok = false; + break; + } + } + if (ok) { + candidates.append(installdir); + } + } + } + if (!dirs.isEmpty()) { bool local = true; @@ -983,55 +1037,47 @@ } } - const QStringList *prefixList = 0; - if (strncmp(type, "xdgdata-", 8) == 0) - prefixList = &(d->xdgdata_prefixes); - else if (strncmp(type, "xdgconf-", 8) == 0) - prefixList = &(d->xdgconf_prefixes); - else - prefixList = &d->prefixes; for (QStringList::ConstIterator pit = prefixList->begin(); pit != prefixList->end(); ++pit) { - if((*pit)!=installprefix||installdir.isEmpty()) - { - for (QStringList::ConstIterator it = dirs.begin(); - it != dirs.end(); ++it) - { - if ( (*it).startsWith('%')) - continue; - QString path = realPath( *pit + *it ); - testdir.setPath(path); - if (local && restrictionActive) - continue; - if ((local || testdir.exists()) && !candidates.contains(path)) - candidates.append(path); - } - local = false; + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( *pit + *it ); + testdir.setPath(path); + if (local && restrictionActive) + continue; + if ((local || testdir.exists()) && !candidates.contains(path)) + candidates.append(path); } - else - { - // we have a custom install path, so use this instead of / - testdir.setPath(installdir); - if(testdir.exists() && ! candidates.contains(installdir)) - candidates.append(installdir); - } + // UGLY HACK - forward porting Chris Cheney's HACK - Rex Dieter + if ( local && (!strcmp("config", type))) + candidates.append("/etc/kde/"); + // + local = false; } } - // make sure we find the path where it's installed - if (!installdir.isEmpty()) { - bool ok = true; - foreach (const QString &s, candidates) { - if (installdir.startsWith(s)) { - ok = false; - break; + // for config files, we want the installed path _last_, so profiles take precedence + // for exe files too, so /usr/libexec/kde4 takes precedence over /usr/bin + if (!strcmp("config", type) || !strcmp("exe", type)) { + QString installdir = installPath( type ); + if (!installdir.isEmpty()) { + bool ok = true; + foreach (const QString &s, candidates) { + if (installdir.startsWith(s)) { + ok = false; + break; + } + } + if (ok) { + candidates.append(installdir); } } - if (ok) - candidates.append(installdir); } dirs = d->absolutes.value(type); @@ -1500,6 +1546,7 @@ { localKdeDir = KShell::tildeExpand(localKdeDir); addPrefix(localKdeDir); + d->localKdehome=localKdeDir; } #ifdef Q_WS_MACX @@ -1558,6 +1605,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgConfigPrefix(localXdgDir); + d->localXdgconfhome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) @@ -1606,6 +1654,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgDataPrefix(localXdgDir); + d->localXdgdatahome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) kdelibs-4.0.85-libexecdir.patch: --- NEW FILE kdelibs-4.0.85-libexecdir.patch --- diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2008-07-03 00:06:28.000000000 -0500 +++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults() addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); index+=2; } - addResourceType("exe", "lib", "kde4/libexec", true ); + addResourceType("exe", 0, "libexec/kde4", true ); addResourceDir("home", QDir::homePath(), false); } diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp --- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500 +++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const if (strcmp("lib", type) == 0) return QString::fromLatin1(LIB_INSTALL_DIR "/"); if (strcmp("libexec", type) == 0) - return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/"); + return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/"); if (strcmp("locale", type) == 0) return QString::fromLatin1(LOCALE_INSTALL_DIR "/"); break; diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp --- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2008-07-03 00:06:29.000000000 -0500 +++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp 2008-07-06 14:41:31.000000000 -0500 @@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource #define KIOSLAVE "bin/kioslave.exe" #else #define EXT "" -#define KIOSLAVE "kde4/libexec/kioslave" +#define KIOSLAVE "libexec/kde4/kioslave" #endif + const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); QVERIFY( !bin.isEmpty() ); QVERIFY( bin.endsWith( KIOSLAVE ) ); @@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe() // findExe with a result in libexec const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); QVERIFY( !lnusertemp.isEmpty() ); - QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) ); + QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) ); #endif // Check the "exe" resource too diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp --- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500 +++ kdelibs-4.0.85/kio/tests/krununittest.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe if (kmailservice.isEmpty()) kmailservice = "kmailservice"; if (!kdeinit.isEmpty()) { QVERIFY(!kmailservice.isEmpty()); - QVERIFY(kmailservice.contains("kde4/libexec")); + QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4")); } QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit; kdelibs-4.0.98-parallel_devel.patch: --- NEW FILE kdelibs-4.0.98-parallel_devel.patch --- diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-08 04:54:11.000000000 -0500 +++ kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake 2008-07-10 20:54:43.000000000 -0500 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: # -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable -# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable +# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable # # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: @@ -124,7 +124,7 @@ # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) -# Use this to add widget description files for the makekdewidgets code generator +# Use this to add widget description files for the makekdewidgets4 code generator # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) @@ -286,23 +286,23 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) # when building kdelibs, make the kcfg rules depend on the binaries... - set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) - set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) + set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) + set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) @@ -351,69 +351,69 @@ else (_kdeBootStrapping) include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) if (UNIX) - find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) - find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) - find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) if (UNIX) - find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) # Can't do that, it's not always compiled. @@ -432,14 +432,14 @@ else (_kdeBootStrapping) # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -668,7 +668,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY "${_CMAKE_INSTALL_DIR}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) -set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} +set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel" + ${CMAKE_SYSTEM_LIBRARY_PATH} "${KDE4_LIB_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) @@ -1059,9 +1060,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") else(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") + message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) diff -up kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh --- kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 06:07:26.000000000 -0500 +++ kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh 2008-07-10 20:53:39.000000000 -0500 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # -kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" +kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" if test -z "$kcfg_compiler"; then - echo "kconfig_compiler not found!" + echo "kconfig_compiler4 not found!" exit 1; fi diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl --- kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500 +++ kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-10 20:53:39.000000000 -0500 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; -$cmd = "./kconfig_compiler $file $kcfgc"; +$cmd = "./kconfig_compiler4 $file $kcfgc"; #print "CMD $cmd\n"; if ( system( $cmd ) != 0 ) { - print STDERR "Unable to run kconfig_compiler\n"; + print STDERR "Unable to run kconfig_compiler4\n"; exit 1; } diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt --- kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:09:13.000000000 -0500 +++ kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -8,11 +8,11 @@ add_subdirectory( example ) set(kconfig_compiler_SRCS kconfig_compiler.cpp) -kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) +target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} ) ########### install files ############### diff -up kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt --- kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:08:30.000000000 -0500 +++ kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) diff -up kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdewidgets/CMakeLists.txt --- kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 06:08:17.000000000 -0500 +++ kdelibs-4.0.98/kdewidgets/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -16,22 +16,22 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) -kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) +target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) -install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} ) ########### next target ############### # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) -get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT) +get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets - MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets) + MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4) set(kdewidgets_PART_SRCS classpreviews.cpp kdelibs-4.0.98-revert-kinit-regression.patch: --- NEW FILE kdelibs-4.0.98-revert-kinit-regression.patch --- Index: kinit.cpp =================================================================== --- kinit/kinit.cpp (revision 829264) +++ kinit/kinit.cpp (revision 828077) @@ -49,10 +49,9 @@ #include #include #include -#include #include #include -#include +#include #include #include #include @@ -530,17 +529,8 @@ if (cwd && *cwd) chdir(cwd); else { - // Can't use KGlobalSettings::documentPath() here, we don't have a main component set, - // and we don't want to set one; e.g. kioslaves will do that. - // So we have to duplicate this stuff from KGlobalSettings. - KConfigGroup g(s_instance->config(), "Paths"); - const QString documentPath = g.readPathEntry("Documents", -#ifdef Q_WS_WIN - getWin32ShellFoldersPath("Personal") -#else - QDir::homePath()); -#endif - const QByteArray docPath = QFile::encodeName(documentPath); + KComponentData componentData("klauncher"); // needed for KConfig usage + const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath()); chdir(docPath.constData()); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 1 Jun 2008 12:22:07 -0000 1.50 +++ .cvsignore 19 Jul 2008 03:13:11 -0000 1.51 @@ -1,2 +1 @@ -kdelibs-4.0.4.tar.bz2 -kdelibs-4.0.5.tar.bz2 +kdelibs-4.0.99.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- kdelibs.spec 1 Jul 2008 15:26:15 -0000 1.329 +++ kdelibs.spec 19 Jul 2008 03:13:11 -0000 1.330 @@ -1,7 +1,8 @@ +%define _default_patch_fuzz 2 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.5 -Release: 5%{?dist} +Version: 4.0.99 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -27,6 +28,7 @@ %define rest 1 %endif +BuildRequires: kde4-macros(api) >= 2 BuildRequires: kde-filesystem >= 4 Requires: dbus-x11 Requires: hicolor-icon-theme @@ -48,7 +50,7 @@ Source2: kde4.csh # make -devel packages parallel-installable -Patch0: kdelibs-4.0.4-parallel_devel.patch +Patch0: kdelibs-4.0.98-parallel_devel.patch # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Hunspell support for K3Spell @@ -67,32 +69,20 @@ Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch # workaround for policykit Patch11: kdelibs-4.0.2-policykit-workaround.patch -Patch12: kdelibs-4.x-xdg-menu.patch +Patch12: kdelibs-4.0.72-xdg-menu.patch # Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) -Patch13: kdelibs-4.0.5-fedora-buildtype.patch +Patch13: kdelibs-4.0.3-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec -Patch14: kdelibs-4.0.3-libexecdir.patch -# fix proxy support (#443931, kde#155707) -# patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46 -Patch15: kdelibs-4.0.4-proxy.patch +Patch14: kdelibs-4.0.85-libexecdir.patch # forward port kstandarddirs hack to search /etc/kde -Patch18: kdelibs-4.0.4-kstandarddirs.patch -#??kdebug:162956: Kopete Press File Transfer crash -Patch19: kdelibs-4.0.5-kprotocolcombo.patch -#??kdebug:162285: click on add network folder crashes dolphin -Patch20: kdelibs-4.0.5-kio-subjob.patch -# kdebug:163050: Strigi indexing of large/unbounded files causes KFileMetaInfo to freeze -Patch21: kdelibs-4.0.5-strigi-metainfo.patch -#??kdebug:127793: Renaming in FTP overwrites existing files without confirmation -Patch22: kdelibs-4.0.5-kio-ftp-overwrite.patch -#??kdebug:164391: Crash when doing [""]= on CSSStyleDeclaration -Patch23: kdelibs-4.0.5-khtml-ecma-empty-array-crash.patch - -## upstream patches -Patch100: kdelibs-4.0.4-khtml-stylesheet.patch -Patch101: kdelibs-4.0.5-iconload.patch +Patch18: kdelibs-4.0.83-kstandarddirs.patch +# revert a kinit patch which triggers an assertion failure in KComponentData +# (and its followup) (#455130) +Patch19: kdelibs-4.0.98-revert-kinit-regression.patch -BuildRequires: qt4-devel >= 4.3.0 +# upstream patches + +BuildRequires: qt4-devel >= 4.4.0 Requires: qt4 >= %{_qt4_version} Requires: xdg-utils Requires(post): /sbin/ldconfig xdg-utils @@ -103,6 +93,7 @@ # we don't want a hard dependency on aspell on F9+, use enchant only BuildRequires: aspell-devel %endif +BuildRequires: automoc BuildRequires: avahi-devel BuildRequires: bzip2-devel BuildRequires: cmake @@ -123,8 +114,9 @@ BuildRequires: OpenEXR-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +BuildRequires: phonon-devel BuildRequires: shared-mime-info -BuildRequires: soprano-devel >= 1.99 +BuildRequires: soprano-devel >= 2.0.97 BuildRequires: strigi-devel >= 0.5.7 BuildRequires: zlib-devel # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) @@ -133,7 +125,7 @@ BuildRequires: openssh-clients BuildRequires: subversion -%if "%{?apidocs}" == "1" +%if 0%{?apidocs} BuildRequires: doxygen BuildRequires: graphviz BuildRequires: qt4-doc @@ -158,11 +150,12 @@ Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} %endif -Provides: phonon-devel = 4.0 +Requires: automoc Requires: qt4-devel Requires: openssl-devel +Requires: phonon-devel +Requires: strigi-devel Requires: bzip2-devel gamin-devel libacl-devel zlib-devel -Requires: strigi-devel >= 0.5.7 %{?x_deps:Requires: %{x_deps}} %description devel This package includes the header files you will need to compile @@ -207,26 +200,20 @@ %patch12 -p1 -b .Administration-menu %patch13 -p1 -b .fedora-buildtype %patch14 -p1 -b .libexecdir -%patch15 -p0 -b .proxy %patch18 -p1 -b .kstandarddirs -%patch19 -p1 -b .kprotocolcombo -%patch20 -p1 -b .kio-subjob -%patch21 -p1 -b .strigi-metainfo -%patch22 -p1 -b .kio-ftp-overwrite -%patch23 -p0 -b .khtml-ecma-empty-array-crash +%patch19 -p0 -b .kinit-regression # upstream patches -%patch100 -p1 -b .khtml-stylesheet -%patch101 -p1 -b .iconload %build + mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" .. popd %if 0%{?rest} -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %endif # build apidocs @@ -242,7 +229,7 @@ %if 0%{?rest} make install DESTDIR=%{buildroot} -C %{_target_platform} -# see also use-of/patching of XDG_MENU_PREFIX in kdebase +# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu @@ -264,9 +251,7 @@ case "$i" in libkdeinit4_*.so) ;; - # don't move Phonon, non-KDE apps want to use it - libphonon.so) - ;; + ## FIXME/TODO: imo, should leave everything except for known-conflicts -- Rex *) linktarget=`readlink "$i"` rm -f "$i" @@ -320,11 +305,11 @@ %exclude %{_kde4_appsdir}/cmake/ %{_kde4_configdir}/* %{_datadir}/dbus-1/interfaces/* +%{_libdir}/kde4/plugins/script/* %{_kde4_datadir}/mime/packages/* %{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/servicetypes/* %{_kde4_sharedir}/icons/hicolor/*/actions/presence_* -%{_kde4_docdir}/HTML/en/* %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit4_*.so %dir %{_kde4_libdir}/kde4/ @@ -332,18 +317,14 @@ %{_kde4_libexecdir}/* %dir %{_kde4_libdir}/kde4/plugins/ %{_kde4_libdir}/kde4/plugins/imageformats/ -%{_kde4_libdir}/kde4/plugins/phonon_platform/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* -%if 0%{?apidocs} -%exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ -%endif # kdelibs-common comes from here for fedora >= 9 %if "%{name}" == "kdelibs" %exclude %{_kde4_configdir}/kdebug.areas %exclude %{_kde4_configdir}/kdebugrc %exclude %{_kde4_configdir}/ui/ui_standards.rc -%exclude %{_kde4_docdir}/HTML/en/common +%exclude %{_kde4_appsdir}/kdeui %files common %defattr(-,root,root,-) @@ -351,8 +332,10 @@ %{_kde4_configdir}/kdebugrc %dir %{_kde4_configdir}/ui %{_kde4_configdir}/ui/ui_standards.rc -%{_kde4_docdir}/HTML/en/common +%{_kde4_docdir}/HTML/en/common/ +%{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_datadir}/locale/all_languages/ +%{_kde4_appsdir}/kdeui %endif %files devel @@ -364,7 +347,6 @@ %{_kde4_appsdir}/cmake/ %{_kde4_appsdir}/kdewidgets/ %{_kde4_includedir}/* -%{_kde4_libdir}/libphonon.so %{_kde4_libdir}/kde4/devel/ %{_kde4_libdir}/kde4/plugins/designer/ %endif @@ -377,65 +359,75 @@ %changelog -* Tue Jul 1 2008 Luk???? Tinkl - 4.0.5-5 -- fix crash on empty array access in ECMA (kdebug:164391) +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 -* Fri Jun 27 2008 Kevin Kofler - 4.0.5-4 -- fix kstandarddirs patch so /usr/libexec/kde4 is found before /usr/bin (see - also #453063, ensures the KDE 4 versions of kdesu, lnusertemp etc. are used) - -* Sat Jun 14 2008 Rex Dieter - 4.0.5-3 -- -devel: Provides: phonon-devel = 4.0 - -* Tue Jun 10 2008 Luk???? Tinkl - 4.0.5-2 -- kopete crashes with sending files over AIM/ICQ (kdebug:162956) -- fix crashes when adding a new network folder (kdebug:162285) -- KFileMetaInfo freezes when Strigi indexes non-sequential files (kdebug:163050) -- renaming in FTP overwrites existing files without confirmation (kdebug:127793) - -* Sat May 31 2008 Than Ngo - 4.0.5-1 -- 4.0.5 -- backport patch from 4.1 branch to fix inherit issue in iconload, #448536 +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- respun tarball -* Fri May 30 2008 Than Ngo - 4.0.4-11 -- fix #447965, order issue in kde path, thanks to Kevin -- backport patch from 4.1 branch to check html style version +* Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 +- revert a kinit patch causing an assertion failure in KComponentData (#455130) -* Tue May 27 2008 Luk???? Tinkl - 4.0.4-10 -- Fixes a crash when you are using two different protocols and move through the tree +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 +- omit proxy patch (fixed upstream) -* Tue May 27 2008 Luk???? Tinkl - 4.0.4-9 -- fix kdebug:161196: Drop-down list options display blank when a comment is added between option tags -- fix kdebug:156419: konqueror crash on http://pidgin.im/ -- fix kdebug:48704 document.styleSheets.length does not return the correct number under all circumstances +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 -* Fri May 23 2008 Kevin Kofler - 4.0.4-8 -- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831) +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 -* Fri May 23 2008 Luk???? Tinkl - 4.0.4-7 -- fix #447840: Konquerorsu crash in KDE 4 +* Fri Jun 27 2008 Kevin Kofler - 4.0.83-3 +- fix kstandarddirs patch so /usr/libexec/kde4 is found (#453063) -* Thu May 22 2008 Rex Dieter - 4.0.4-6 -- kstandarddirs hack to search /etc/kde +* Wed Jun 25 2008 Rex Dieter 4.0.83-2 +- -common: move %{_kde4_docdir}/HTML/en/sonnet/ here (#341751) -* Wed May 21 2008 Luk???? Tinkl - 4.0.4-5 -- fix problems with deleting dirs on FTP server (kdebug:162189) +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) -* Thu May 15 2008 Luk???? Tinkl - 4.0.4-4 -- fix compatibility with newer HALs to find the actual HW info +* Fri Jun 13 2008 Than Ngo 4.0.82-1 +- 4.0.82 -* Thu May 15 2008 Kevin Kofler - 4.0.4-3 +* Fri May 30 2008 Than Ngo 4.0.80-2 +- fix #447965, order issue in kde path, thanks to Kevin +- backport patch to check html style version + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Sat May 24 2008 Rex Dieter - 4.0.72-8 +- revert previous, don't include kde3-compat symlink (here, anyway) + +* Fri May 23 2008 Rex Dieter - 4.0.72-7 +- -common: provide %%_datadir/apps/kdeui for kde3 apps (#447965) + +* Thu May 22 2008 Rex Dieter - 4.0.72-6 +- kstandarddirs hack to search /etc/kde + +* Thu May 22 2008 Kevin Kofler - 4.0.72-5 +- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831) + +* Thu May 15 2008 Kevin Kofler - 4.0.72-4 - fix proxy support (#443931, kde#155707) - move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435) -* Tue May 13 2008 Kevin Kofler - 4.0.4-2 +* Tue May 13 2008 Kevin Kofler - 4.0.72-3 - drop no longer needed ALSA default device Phonon hack -* Tue May 06 2008 Rex Dieter - 4.0.4-1 -- kde-4.0.4 +* Sun May 4 2008 Kevin Kofler - 4.0.72-2 +- BR new minimum versions of qt4-devel and soprano-devel + +* Fri May 2 2008 Kevin Kofler - 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) +- parallel_devel patch ported by Lorenzo Villani +- update file list (Lorenzo Villani) +- drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches +- update xdg-menu (Administration menu) patch * Tue Apr 22 2008 Luk???? Tinkl - 4.0.3-7 -- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1, +- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1, #443766: CVE-2008-1670) * Fri Apr 04 2008 Than Ngo - 4.0.3-6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 1 Jun 2008 12:22:07 -0000 1.60 +++ sources 19 Jul 2008 03:13:11 -0000 1.61 @@ -1 +1 @@ -4922865df8df46bef0472528e88564a5 kdelibs-4.0.5.tar.bz2 +92e6d8d1bc0dccd8f5c204039c2aa00d kdelibs-4.0.99.tar.bz2 --- kdelibs-4.0.3-libexecdir.patch DELETED --- --- kdelibs-4.0.4-khtml-stylesheet.patch DELETED --- --- kdelibs-4.0.4-kstandarddirs.patch DELETED --- --- kdelibs-4.0.4-parallel_devel.patch DELETED --- --- kdelibs-4.0.4-proxy.patch DELETED --- --- kdelibs-4.0.5-fedora-buildtype.patch DELETED --- --- kdelibs-4.0.5-iconload.patch DELETED --- --- kdelibs-4.0.5-khtml-ecma-empty-array-crash.patch DELETED --- --- kdelibs-4.0.5-kio-ftp-overwrite.patch DELETED --- --- kdelibs-4.0.5-kio-subjob.patch DELETED --- --- kdelibs-4.0.5-kprotocolcombo.patch DELETED --- --- kdelibs-4.0.5-strigi-metainfo.patch DELETED --- --- kdelibs-4.x-xdg-menu.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 03:33:38 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 03:33:38 GMT Subject: rpms/soprano/F-9 .cvsignore, 1.8, 1.9 soprano.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200807190333.m6J3XcsG026359@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/soprano/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26275 Modified Files: .cvsignore soprano.spec sources Log Message: * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 4 Mar 2008 05:33:14 -0000 1.8 +++ .cvsignore 19 Jul 2008 03:32:34 -0000 1.9 @@ -1 +1 @@ -soprano-2.0.3.tar.bz2 +soprano-2.0.99.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-9/soprano.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- soprano.spec 6 Mar 2008 01:38:06 -0000 1.16 +++ soprano.spec 19 Jul 2008 03:32:34 -0000 1.17 @@ -6,8 +6,8 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.3 -Release: 2%{?dist} +Version: 2.0.99 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -84,6 +84,7 @@ %doc AUTHORS COPYING* README TODO %{_bindir}/sopranocmd %{_bindir}/sopranod +%{_bindir}/onto2vocabularyclass %{_libdir}/lib*.so.* %{_libdir}/soprano/ %{_datadir}/soprano/ @@ -106,6 +107,12 @@ %changelog +* Fri Jul 11 2008 Kevin Kofler 2.0.99-1 +- update to 2.0.99 (2.1 RC 1) + +* Thu May 1 2008 Kevin Kofler 2.0.98-1 +- update to 2.0.98 (2.1 alpha 1) + * Thu Mar 6 2008 Kevin Kofler 2.0.3-2 - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen and qt4-doc when building apidocs Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 Mar 2008 05:33:14 -0000 1.8 +++ sources 19 Jul 2008 03:32:34 -0000 1.9 @@ -1 +1 @@ -3f33799c6ebd03048621057d268fb62f soprano-2.0.3.tar.bz2 +adef1e8539bff9bd41a6b973dbd18ff4 soprano-2.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 03:43:56 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 19 Jul 2008 03:43:56 GMT Subject: rpms/kazehakase/devel kazehakase.spec,1.62,1.63 Message-ID: <200807190343.m6J3huek026694@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26654 Modified Files: kazehakase.spec Log Message: GTK related fix Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- kazehakase.spec 19 Jul 2008 02:47:48 -0000 1.62 +++ kazehakase.spec 19 Jul 2008 03:43:02 -0000 1.63 @@ -211,6 +211,11 @@ done %build +%if 0%{?fedora} >= 10 +export CFLAGS="%optflags -UGTK_DISABLE_DEPRECATED" +export CXXFLAGS="%optflags -UGTK_DISABLE_DEPRECATED" +%endif + %configure \ %if 0%{?fedora} >= 9 CC="%{__cc} `nspr-config --cflags`" \ @@ -313,6 +318,7 @@ * Sat Jul 19 2008 Mamoru Tasaka - 0.5.4-7.svn3506_trunk - F-9+: relax gecko libs dependency (as GRE_GetGREPathWithProperties properly finds out GRE) +- F-10+: add -UGTK_DISABLE_DEPRECATED temporarily * Sat Jun 28 2008 Mamoru Tasaka - 0.5.4-6.svn3506_trunk - Try rev 3506 From fedora-extras-commits at redhat.com Sat Jul 19 03:45:14 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 03:45:14 GMT Subject: rpms/qgtkstyle/F-9 qgtkstyle.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807190345.m6J3jEVd026848@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qgtkstyle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771 Modified Files: .cvsignore sources Added Files: qgtkstyle.spec Log Message: * Tue Jun 09 2008 Shawn Starr 0.0-0.1.20080609svn647 - New upstream snapshot, refactoring of gtkstyle - Fix editable combobox, fix menu, dialog checkbox size and shapes - Improved sliders - Fix pixmap cache regressions --- NEW FILE qgtkstyle.spec --- %define qgtkstyle_version 0.0 %define svn_date 20080609 %define svn_revision 648 %define snapshot %{svn_date}svn%{svn_revision} # Tarfile created from svn snapshot # svn co svn://labs.trolltech.com/svn/styles/gtkstyle qgtkstyle-%{qgtkstyle_version} # tar cjf qgtkstyle-%{qgtkstyle_version}-%{snapshot}.tar.bz2 qgtkstyle-%{qgtkstyle_version}/ %define tarfile %{name}-%{qgtkstyle_version}-%{snapshot}.tar.bz2 Summary: Qt style rendering using GTK+ themes Name: qgtkstyle Version: %{qgtkstyle_version} Release: 0.1.%{snapshot}%{?dist} License: GPLv2 Group: User Interface/Desktops URL: http://labs.trolltech.com/page/Projects/Styles/GtkStyle BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel >= 4.4.0 BuildRequires: gtk2-devel Requires: qt4-x11 >= 4.4.0 # Fedora specific snapshot no upstream release (yet) Source0: %{tarfile} %description This is a Qt style rendered using GTK to give a native appearence for Qt applications running on the GNOME desktop. %prep %setup -q -n %{name}-%{version} %build CXXFLAGS="%{optflags}" qmake-qt4 make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}/%{_qt4_plugindir}/styles make install INSTALL_ROOT=%{buildroot} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_qt4_plugindir}/styles/libgtkstyle.so %changelog * Tue Jun 09 2008 Shawn Starr 0.0-0.1.20080609svn647 - New upstream snapshot, refactoring of gtkstyle - Fix editable combobox, fix menu, dialog checkbox size and shapes - Improved sliders - Fix pixmap cache regressions * Mon Jun 02 2008 Shawn Starr 0.0-0.1.20080601svn636 - New upstream snapshot, Fix endian issues - Check boxes and menu optimizations, fix tabbing issues - Improved tab bar - Fix toolbars and frames with flat-style - Improved toolbar handles * Thu May 29 2008 Shawn Starr 0.0-0.1.20080529svn626 - New upstream snapshot, Improved menu separators - Fix menu separator height, fix paint glitches with comboboxes. * Tue May 27 2008 Shawn Starr 0.0-0.1.20080526svn617 - Initial Fedora package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2008 20:20:19 -0000 1.1 +++ .cvsignore 19 Jul 2008 03:44:27 -0000 1.2 @@ -0,0 +1 @@ +qgtkstyle-0.0-20080609svn648.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2008 20:20:19 -0000 1.1 +++ sources 19 Jul 2008 03:44:27 -0000 1.2 @@ -0,0 +1 @@ +d447dd64401e54dbad7402d1ee6db2eb qgtkstyle-0.0-20080609svn648.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 03:47:51 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 03:47:51 GMT Subject: rpms/sip/F-9 .cvsignore, 1.22, 1.23 sip.spec, 1.46, 1.47 sources, 1.23, 1.24 sip-4.7.4-64bit.patch, 1.2, NONE Message-ID: <200807190347.m6J3lpfZ027088@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/sip/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27025 Modified Files: .cvsignore sip.spec sources Removed Files: sip-4.7.4-64bit.patch Log Message: * Wed May 21 2008 Rex Dieter - 4.7.6-1 - sip-4.7.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sip/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 12 Feb 2008 18:35:37 -0000 1.22 +++ .cvsignore 19 Jul 2008 03:47:00 -0000 1.23 @@ -1 +1 @@ -sip-4.7.4.tar.gz +sip-4.7.6.tar.gz Index: sip.spec =================================================================== RCS file: /cvs/pkgs/rpms/sip/F-9/sip.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sip.spec 25 Mar 2008 13:28:38 -0000 1.46 +++ sip.spec 19 Jul 2008 03:47:00 -0000 1.47 @@ -12,18 +12,15 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.7.4 -Release: 3%{?dist} +Version: 4.7.6 +Release: 1%{?dist} # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license License: Python Software Foundation License v2 Group: Development/Tools Url: http://www.riverbankcomputing.co.uk/sip/ -Source0: http://www.riverbankcomputing.com/Downloads/sip4/sip-%{version}.tar.gz +Source0: http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# sent upstream, accepted -Patch1: sip-4.7.4-64bit.patch - BuildRequires: python-devel BuildRequires: %{qtpkg}-devel >= %{qtver} BuildRequires: sed @@ -54,8 +51,6 @@ %setup -q -%patch1 -p1 -b .64bit - %build QTDIR="" && source /etc/profile.d/qt.sh @@ -85,7 +80,7 @@ %files %defattr(-,root,root,-) -%doc ChangeLog LICENSE NEWS README THANKS +%doc ChangeLog LICENSE NEWS README %{python_sitearch}/* %{_bindir}/* @@ -96,6 +91,12 @@ %changelog +* Wed May 21 2008 Rex Dieter - 4.7.6-1 +- sip-4.7.6 + +* Wed May 14 2008 Rex Dieter - 4.7.5-1 +- sip-4.7.5 + * Tue Mar 25 2008 Rex Dieter - 4.7.4-3 - BR: qt3-devel (f9+) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sip/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 12 Feb 2008 18:35:37 -0000 1.23 +++ sources 19 Jul 2008 03:47:00 -0000 1.24 @@ -1 +1 @@ -3bae6d0fb931fe2ddcd6f6c1da245afa sip-4.7.4.tar.gz +f49e93046fe438a8fb4c2ed481aa3951 sip-4.7.6.tar.gz --- sip-4.7.4-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 04:41:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 04:41:58 GMT Subject: rpms/PyQt4/F-9 .cvsignore, 1.4, 1.5 PyQt4.spec, 1.8, 1.9 sources, 1.4, 1.5 PyQt-x11-gpl-4.1.1-qconfig_h.patch, 1.1, NONE Message-ID: <200807190441.m6J4fwWF003493@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/PyQt4/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3415 Modified Files: .cvsignore PyQt4.spec sources Removed Files: PyQt-x11-gpl-4.1.1-qconfig_h.patch Log Message: sync w/devel (PyQt4-4.4.2) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyQt4/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Dec 2007 21:20:38 -0000 1.4 +++ .cvsignore 19 Jul 2008 04:41:01 -0000 1.5 @@ -1,3 +1 @@ -PyQt-x11-gpl-4.2.tar.gz -PyQt-x11-gpl-4.3.1.tar.gz -PyQt-x11-gpl-4.3.3.tar.gz +PyQt-x11-gpl-4.4.2.tar.gz Index: PyQt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyQt4/F-9/PyQt4.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- PyQt4.spec 11 Feb 2008 13:05:39 -0000 1.8 +++ PyQt4.spec 19 Jul 2008 04:41:01 -0000 1.9 @@ -3,20 +3,21 @@ Summary: Python bindings for Qt4 Name: PyQt4 -Version: 4.3.3 +Version: 4.4.2 Release: 2%{?dist} -License: GPLv2 +# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) +License: GPLv3 or GPLv2 with exceptions Group: Development/Languages Url: http://www.riverbankcomputing.co.uk/pyqt/ -Source0: http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-%{version}.tar.gz +Source0: http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: PyQt-x11-gpl-4.3.1-64bit.patch # HACK! FIXME: ping upstream why this isn't working right. -- Rex Patch3: PyQt-x11-gpl-4.3.1-QT_SHARED.patch -BuildRequires: qt4-devel +BuildRequires: qt4-devel >= 4.4.0-10 BuildRequires: chrpath BuildRequires: dbus-devel dbus-python-devel BuildRequires: findutils @@ -26,7 +27,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") -BuildRequires: sip-devel >= 4.7.2 +BuildRequires: sip-devel >= 4.7.6 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1) %if "%{?sip_ver}" > "3" # To be paranoid, could change >= to = -- Rex @@ -103,7 +104,10 @@ %files %defattr(-,root,root,-) -%doc LICENSE NEWS README +%doc NEWS README +%doc OPENSOURCE-NOTICE.TXT +%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT +%doc LICENSE.GPL3 %{python_sitearch}/PyQt4/ %{python_sitelib}/dbus/mainloop/qt.so @@ -117,6 +121,16 @@ %changelog +* Sat Jun 14 2008 Rex Dieter 4.4.2-2 +- PyQt4 is built without QtWebKit support (#451490) + +* Wed May 21 2008 Rex Dieter 4.4.2-1 +- PyQt-4.4.2 + +* Wed May 14 2008 Rex Dieter 4.4-1 +- PyQt-4.4 +- License: GPLv3 or GPLv2 with exceptions + * Mon Feb 11 2008 Rex Dieter 4.3.3-2 - respin (gcc43) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyQt4/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Dec 2007 21:20:38 -0000 1.4 +++ sources 19 Jul 2008 04:41:01 -0000 1.5 @@ -1 +1 @@ -a2ead359f57d84c24bdd10de387e80b4 PyQt-x11-gpl-4.3.3.tar.gz +a3f1e828fe74242441f17020c10ba06b PyQt-x11-gpl-4.4.2.tar.gz --- PyQt-x11-gpl-4.1.1-qconfig_h.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 05:56:48 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 05:56:48 GMT Subject: rpms/kdeaccessibility/devel .cvsignore, 1.28, 1.29 kdeaccessibility.spec, 1.54, 1.55 sources, 1.29, 1.30 Message-ID: <200807190556.m6J5umZp012939@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeaccessibility/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12754 Modified Files: .cvsignore kdeaccessibility.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 11 Jul 2008 15:18:14 -0000 1.28 +++ .cvsignore 19 Jul 2008 05:55:55 -0000 1.29 @@ -1 +1 @@ -kdeaccessibility-4.0.98.tar.bz2 +kdeaccessibility-4.0.99.tar.bz2 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- kdeaccessibility.spec 11 Jul 2008 15:18:14 -0000 1.54 +++ kdeaccessibility.spec 19 Jul 2008 05:55:55 -0000 1.55 @@ -2,7 +2,7 @@ Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Group: User Interface/Desktops @@ -97,6 +97,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 11 Jul 2008 15:18:14 -0000 1.29 +++ sources 19 Jul 2008 05:55:55 -0000 1.30 @@ -1 +1 @@ -853044d27a1645ae1f995c2ced7eb237 kdeaccessibility-4.0.98.tar.bz2 +f90361104b19893ffec42d53aee0fbe4 kdeaccessibility-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 05:57:00 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 05:57:00 GMT Subject: rpms/kdeadmin/devel .cvsignore, 1.49, 1.50 kdeadmin.spec, 1.99, 1.100 sources, 1.51, 1.52 Message-ID: <200807190557.m6J5v0KQ013024@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12808 Modified Files: .cvsignore kdeadmin.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 11 Jul 2008 15:19:12 -0000 1.49 +++ .cvsignore 19 Jul 2008 05:56:13 -0000 1.50 @@ -1 +1 @@ -kdeadmin-4.0.98.tar.bz2 +kdeadmin-4.0.99.tar.bz2 Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- kdeadmin.spec 11 Jul 2008 15:19:12 -0000 1.99 +++ kdeadmin.spec 19 Jul 2008 05:56:13 -0000 1.100 @@ -1,7 +1,7 @@ Name: kdeadmin Epoch: 7 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Summary: K Desktop Environment - Administrative tools @@ -137,6 +137,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 11 Jul 2008 15:19:12 -0000 1.51 +++ sources 19 Jul 2008 05:56:13 -0000 1.52 @@ -1 +1 @@ -458230ce937bdf9723809f63bb66767c kdeadmin-4.0.98.tar.bz2 +e2c14f1852eeb44d24db4ca2fed3651c kdeadmin-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 05:57:27 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 05:57:27 GMT Subject: rpms/kdeartwork/devel .cvsignore, 1.46, 1.47 kdeartwork.spec, 1.85, 1.86 sources, 1.48, 1.49 Message-ID: <200807190557.m6J5vRDR013098@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeartwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12932 Modified Files: .cvsignore kdeartwork.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 11 Jul 2008 15:22:31 -0000 1.46 +++ .cvsignore 19 Jul 2008 05:56:42 -0000 1.47 @@ -1 +1 @@ -kdeartwork-4.0.98.tar.bz2 +kdeartwork-4.0.99.tar.bz2 Index: kdeartwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- kdeartwork.spec 11 Jul 2008 15:22:31 -0000 1.85 +++ kdeartwork.spec 19 Jul 2008 05:56:42 -0000 1.86 @@ -1,6 +1,6 @@ Name: kdeartwork -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Summary: Additional artwork (themes, sound themes, ...) for KDE @@ -197,6 +197,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 11 Jul 2008 15:22:31 -0000 1.48 +++ sources 19 Jul 2008 05:56:42 -0000 1.49 @@ -1 +1 @@ -7a86d32c99eb0360fea32154b30a9254 kdeartwork-4.0.98.tar.bz2 +4ce348b876ea6cd3e034056171995cf9 kdeartwork-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 05:58:13 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 05:58:13 GMT Subject: rpms/kdeedu/devel .cvsignore, 1.49, 1.50 kdeedu.spec, 1.126, 1.127 sources, 1.53, 1.54 Message-ID: <200807190558.m6J5wDvr013283@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13087 Modified Files: .cvsignore kdeedu.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 11 Jul 2008 15:24:32 -0000 1.49 +++ .cvsignore 19 Jul 2008 05:57:20 -0000 1.50 @@ -1 +1 @@ -kdeedu-4.0.98.tar.bz2 +kdeedu-4.0.99.tar.bz2 Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- kdeedu.spec 11 Jul 2008 15:33:18 -0000 1.126 +++ kdeedu.spec 19 Jul 2008 05:57:20 -0000 1.127 @@ -13,7 +13,7 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} License: GPLv2 @@ -397,6 +397,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Jul 2008 15:24:32 -0000 1.53 +++ sources 19 Jul 2008 05:57:20 -0000 1.54 @@ -1 +1 @@ -43de6b77aed869ea54441d7395668926 kdeedu-4.0.98.tar.bz2 +9d4eceb28c16a547a7ab19c0b59c0177 kdeedu-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 05:58:46 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 05:58:46 GMT Subject: rpms/kdegraphics/devel .cvsignore, 1.47, 1.48 kdegraphics.spec, 1.154, 1.155 sources, 1.50, 1.51 Message-ID: <200807190558.m6J5wkgA013368@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13221 Modified Files: .cvsignore kdegraphics.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 11 Jul 2008 15:24:21 -0000 1.47 +++ .cvsignore 19 Jul 2008 05:57:54 -0000 1.48 @@ -1 +1 @@ -kdegraphics-4.0.98.tar.bz2 +kdegraphics-4.0.99.tar.bz2 Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- kdegraphics.spec 11 Jul 2008 15:24:21 -0000 1.154 +++ kdegraphics.spec 19 Jul 2008 05:57:54 -0000 1.155 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Name: kdegraphics @@ -167,6 +167,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 11 Jul 2008 15:24:21 -0000 1.50 +++ sources 19 Jul 2008 05:57:54 -0000 1.51 @@ -1 +1 @@ -2788ec617b07b2babd05ac601cf584d2 kdegraphics-4.0.98.tar.bz2 +1462a278ed3178c5c941f2ad8d3f742b kdegraphics-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 05:58:54 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 05:58:54 GMT Subject: rpms/kdegames/devel .cvsignore, 1.54, 1.55 kdegames.spec, 1.96, 1.97 sources, 1.57, 1.58 Message-ID: <200807190558.m6J5wsc3013428@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13272 Modified Files: .cvsignore kdegames.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 11 Jul 2008 15:23:52 -0000 1.54 +++ .cvsignore 19 Jul 2008 05:58:04 -0000 1.55 @@ -1 +1 @@ -kdegames-4.0.98.tar.bz2 +kdegames-4.0.99.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- kdegames.spec 11 Jul 2008 15:23:52 -0000 1.96 +++ kdegames.spec 19 Jul 2008 05:58:04 -0000 1.97 @@ -3,7 +3,7 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} License: GPLv2 @@ -186,6 +186,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 11 Jul 2008 15:23:52 -0000 1.57 +++ sources 19 Jul 2008 05:58:04 -0000 1.58 @@ -1 +1 @@ -cdaa3925bef6ca32ff34866d772de1d5 kdegames-4.0.98.tar.bz2 +9abe8d80e33947b5e949516f36e0bf4f kdegames-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 05:59:39 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 05:59:39 GMT Subject: rpms/kdemultimedia/devel .cvsignore, 1.51, 1.52 kdemultimedia.spec, 1.116, 1.117 sources, 1.53, 1.54 Message-ID: <200807190559.m6J5xdD3013592@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdemultimedia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13383 Modified Files: .cvsignore kdemultimedia.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 11 Jul 2008 15:25:15 -0000 1.51 +++ .cvsignore 19 Jul 2008 05:58:49 -0000 1.52 @@ -1 +1 @@ -kdemultimedia-4.0.98.tar.bz2 +kdemultimedia-4.0.99.tar.bz2 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- kdemultimedia.spec 11 Jul 2008 15:25:15 -0000 1.116 +++ kdemultimedia.spec 19 Jul 2008 05:58:49 -0000 1.117 @@ -1,7 +1,7 @@ Name: kdemultimedia Epoch: 6 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications @@ -148,6 +148,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Jul 2008 15:25:15 -0000 1.53 +++ sources 19 Jul 2008 05:58:49 -0000 1.54 @@ -1 +1 @@ -bf0be13f4c02c23c06af182325d5caf0 kdemultimedia-4.0.98.tar.bz2 +edf13e39c98b8c73a3fb71146741198e kdemultimedia-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 06:00:22 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:00:22 GMT Subject: rpms/kdebindings/devel .cvsignore, 1.45, 1.46 kdebindings.spec, 1.129, 1.130 sources, 1.49, 1.50 Message-ID: <200807190600.m6J60MM3013750@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13574 Modified Files: .cvsignore kdebindings.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 11 Jul 2008 20:02:15 -0000 1.45 +++ .cvsignore 19 Jul 2008 05:59:31 -0000 1.46 @@ -1 +1 @@ -kdebindings-4.0.98.tar.bz2 +kdebindings-4.0.99.tar.bz2 Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- kdebindings.spec 14 Jul 2008 23:31:36 -0000 1.129 +++ kdebindings.spec 19 Jul 2008 05:59:31 -0000 1.130 @@ -21,8 +21,8 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.0.98 -Release: 3%{?dist} +Version: 4.0.99 +Release: 1%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -31,9 +31,6 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch100: kdebindings-4.0.85-smoke-buildfix.patch -Patch101: kdebindings-4.0.98-phonon_include_dir.patch - BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} @@ -90,9 +87,6 @@ %prep %setup -q -%patch100 -p3 -b .smoke-buildfix -%patch101 -p1 -b .phonon_includes - %build mkdir -p %{_target_platform} @@ -171,6 +165,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Mon Jul 14 2008 Rex Dieter 4.0.98-3 - re-enable smoke (patched), ruby Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 11 Jul 2008 20:02:15 -0000 1.49 +++ sources 19 Jul 2008 05:59:31 -0000 1.50 @@ -1 +1 @@ -254b290f8a19003422f5c1eb625a95d5 kdebindings-4.0.98.tar.bz2 +5b9529a90445f075a201ec5754ebe3c9 kdebindings-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 06:00:40 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:00:40 GMT Subject: rpms/kdenetwork/devel .cvsignore, 1.54, 1.55 kdenetwork.spec, 1.150, 1.151 sources, 1.60, 1.61 Message-ID: <200807190600.m6J60esp013855@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdenetwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13647 Modified Files: .cvsignore kdenetwork.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 11 Jul 2008 15:26:46 -0000 1.54 +++ .cvsignore 19 Jul 2008 05:59:46 -0000 1.55 @@ -1 +1 @@ -kdenetwork-4.0.98.tar.bz2 +kdenetwork-4.0.99.tar.bz2 Index: kdenetwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- kdenetwork.spec 11 Jul 2008 15:26:46 -0000 1.150 +++ kdenetwork.spec 19 Jul 2008 05:59:46 -0000 1.151 @@ -5,7 +5,7 @@ Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} License: GPLv2 @@ -165,6 +165,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 11 Jul 2008 15:26:46 -0000 1.60 +++ sources 19 Jul 2008 05:59:46 -0000 1.61 @@ -1 +1 @@ -5e0bdd2209fb9f569e8f6c713481b277 kdenetwork-4.0.98.tar.bz2 +ae53d3ce521a50cbebf85a88911c24ee kdenetwork-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 06:01:07 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:01:07 GMT Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.2, 1.3 kdeplasma-addons.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807190601.m6J617JB020532@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasma-addons/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13742 Modified Files: .cvsignore kdeplasma-addons.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jul 2008 18:50:53 -0000 1.2 +++ .cvsignore 19 Jul 2008 06:00:19 -0000 1.3 @@ -1 +1 @@ -kdeplasma-addons-4.0.98.tar.bz2 +kdeplasma-addons-4.0.99.tar.bz2 Index: kdeplasma-addons.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdeplasma-addons.spec 17 Jul 2008 18:50:53 -0000 1.1 +++ kdeplasma-addons.spec 19 Jul 2008 06:00:19 -0000 1.2 @@ -1,7 +1,7 @@ Name: kdeplasma-addons -Version: 4.0.98 -Release: 2%{?dist} +Version: 4.0.99 +Release: 1%{?dist} Summary: Additional plasmoids for KDE Group: User Interface/Desktops @@ -28,8 +28,8 @@ Obsoletes: kdeplasmoids < %{version}-%{release} Provides: kdeplasmoids = %{version}-%{release} -Requires(post): coreutils /sbin/ldconfig -Requires(postun): coreutils /sbin/ldconfig +Requires(post): /sbin/ldconfig xdg-utils +Requires(postun): /sbin/ldconfig xdg-utils %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } @@ -66,17 +66,12 @@ %post /sbin/ldconfig -touch --no-create %{_kde4_iconsdir}/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then -%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor || : -fi +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : %postun /sbin/ldconfig -touch --no-create %{_kde4_iconsdir}/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then -%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor || : -fi +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + %clean @@ -98,6 +93,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Thu Jul 17 2008 Rex Dieter 4.0.98-2 - kdeplasma-addons rename Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jul 2008 18:50:53 -0000 1.2 +++ sources 19 Jul 2008 06:00:19 -0000 1.3 @@ -1 +1 @@ -26f22c591af158c4f4d716f0be904089 kdeplasma-addons-4.0.98.tar.bz2 +a0ff769d85d748008201fd2dfb966bf7 kdeplasma-addons-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 06:02:00 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:02:00 GMT Subject: rpms/kdesdk/devel .cvsignore, 1.46, 1.47 kdesdk.spec, 1.108, 1.109 sources, 1.48, 1.49 Message-ID: <200807190602.m6J620RE020790@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20538 Modified Files: .cvsignore kdesdk.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 11 Jul 2008 15:28:53 -0000 1.46 +++ .cvsignore 19 Jul 2008 06:01:08 -0000 1.47 @@ -1 +1 @@ -kdesdk-4.0.98.tar.bz2 +kdesdk-4.0.99.tar.bz2 Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- kdesdk.spec 11 Jul 2008 15:28:53 -0000 1.108 +++ kdesdk.spec 19 Jul 2008 06:01:08 -0000 1.109 @@ -1,6 +1,6 @@ Name: kdesdk -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) @@ -204,6 +204,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 11 Jul 2008 15:28:53 -0000 1.48 +++ sources 19 Jul 2008 06:01:08 -0000 1.49 @@ -1 +1 @@ -61d8b51f1102c40f5a4ad9008b7c898c kdesdk-4.0.98.tar.bz2 +b463aec4dbc6b2d73e200773aef81f2c kdesdk-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 06:04:02 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:04:02 GMT Subject: rpms/kdetoys/devel .cvsignore, 1.23, 1.24 kdetoys.spec, 1.30, 1.31 sources, 1.21, 1.22 Message-ID: <200807190604.m6J642UI021512@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21209 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 11 Jul 2008 15:29:36 -0000 1.23 +++ .cvsignore 19 Jul 2008 06:03:03 -0000 1.24 @@ -1 +1 @@ -kdetoys-4.0.98.tar.bz2 +kdetoys-4.0.99.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- kdetoys.spec 11 Jul 2008 15:29:36 -0000 1.30 +++ kdetoys.spec 19 Jul 2008 06:03:03 -0000 1.31 @@ -2,7 +2,7 @@ Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} License: GPLv2 @@ -96,6 +96,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 11 Jul 2008 15:29:36 -0000 1.21 +++ sources 19 Jul 2008 06:03:03 -0000 1.22 @@ -1 +1 @@ -b01dfffe32605a33cb014b3ee9ede401 kdetoys-4.0.98.tar.bz2 +71de88592de156e861e0a68e628b9082 kdetoys-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 06:04:12 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:04:12 GMT Subject: rpms/kdeutils/devel .cvsignore, 1.49, 1.50 kdeutils.spec, 1.134, 1.135 sources, 1.52, 1.53 Message-ID: <200807190604.m6J64C9N021573@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21279 Modified Files: .cvsignore kdeutils.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 11 Jul 2008 15:30:29 -0000 1.49 +++ .cvsignore 19 Jul 2008 06:03:18 -0000 1.50 @@ -1 +1 @@ -kdeutils-4.0.98.tar.bz2 +kdeutils-4.0.99.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- kdeutils.spec 11 Jul 2008 15:30:29 -0000 1.134 +++ kdeutils.spec 19 Jul 2008 06:03:18 -0000 1.135 @@ -1,10 +1,10 @@ # include new PyKDE4 printer applet -#define printer_applet 1 +%define printer_applet 1 Name: kdeutils Epoch: 6 -Version: 4.0.98 +Version: 4.0.99 Release: 1%{?dist} Summary: K Desktop Environment - Utilities @@ -36,13 +36,9 @@ # (new) printer applet BuildRequires: PyKDE4-devel BuildRequires: system-config-printer -# work around missing dependency in system-config-printer: http://bugzilla.redhat.com/452575 -BuildRequires: rhpl Requires: PyKDE4 Requires: hal-cups-utils Requires: system-config-printer -# work around missing dependency in system-config-printer -Requires: rhpl %endif Provides: okteta = 0.1.0-1 @@ -184,6 +180,9 @@ %changelog +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + * Fri Jul 11 2008 Rex Dieter 4.0.98-1 - 4.0.98 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 11 Jul 2008 15:30:29 -0000 1.52 +++ sources 19 Jul 2008 06:03:18 -0000 1.53 @@ -1 +1 @@ -e6536b7b8e52953ebe80ae5dd6e32abb kdeutils-4.0.98.tar.bz2 +5114466bc392a2d4da9cdd9bcce5f4ea kdeutils-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 06:18:01 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:18:01 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.5-fedora-buildtype.patch, NONE, 1.1 kdelibs.spec, 1.348, 1.349 kdelibs-4.0.3-fedora-buildtype.patch, 1.1, NONE Message-ID: <200807190618.m6J6I1CM022340@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22280 Modified Files: kdelibs.spec Added Files: kdelibs-4.0.5-fedora-buildtype.patch Removed Files: kdelibs-4.0.3-fedora-buildtype.patch Log Message: * Sat Jul 19 2008 Rex Dieter 4.0.99-2 - use better fedora-buildtype patch from F-9 branch kdelibs-4.0.5-fedora-buildtype.patch: --- NEW FILE kdelibs-4.0.5-fedora-buildtype.patch --- diff -ur kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake 2008-03-27 21:33:23.000000000 +0100 +++ kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake 2008-03-31 17:34:40.000000000 +0200 @@ -882,11 +882,13 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + set(CMAKE_CXX_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + set(CMAKE_C_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG") if (CMAKE_SYSTEM_NAME MATCHES Linux) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- kdelibs.spec 18 Jul 2008 15:13:36 -0000 1.348 +++ kdelibs.spec 19 Jul 2008 06:17:10 -0000 1.349 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.99 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -70,8 +70,8 @@ # workaround for policykit Patch11: kdelibs-4.0.2-policykit-workaround.patch Patch12: kdelibs-4.0.72-xdg-menu.patch -# Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) -Patch13: kdelibs-4.0.3-fedora-buildtype.patch +# Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) +Patch13: kdelibs-4.0.5-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec Patch14: kdelibs-4.0.85-libexecdir.patch # forward port kstandarddirs hack to search /etc/kde @@ -359,6 +359,9 @@ %changelog +* Sat Jul 19 2008 Rex Dieter 4.0.99-2 +- use better fedora-buildtype patch from F-9 branch + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 --- kdelibs-4.0.3-fedora-buildtype.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 06:19:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:19:28 GMT Subject: rpms/kdelibs/F-9 kdelibs-4.0.5-fedora-buildtype.patch, 1.2, 1.3 kdelibs.spec, 1.330, 1.331 kdelibs-4.0.3-fedora-buildtype.patch, 1.3, NONE Message-ID: <200807190619.m6J6JS0F022460@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22392 Modified Files: kdelibs.spec Added Files: kdelibs-4.0.5-fedora-buildtype.patch Removed Files: kdelibs-4.0.3-fedora-buildtype.patch Log Message: * Sat Jul 19 2008 Rex Dieter 4.0.99-2 - use better fedora-buildtype patch from F-9 branch kdelibs-4.0.5-fedora-buildtype.patch: Index: kdelibs-4.0.5-fedora-buildtype.patch =================================================================== RCS file: kdelibs-4.0.5-fedora-buildtype.patch diff -N kdelibs-4.0.5-fedora-buildtype.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ kdelibs-4.0.5-fedora-buildtype.patch 19 Jul 2008 06:18:35 -0000 1.3 @@ -0,0 +1,17 @@ +diff -ur kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake 2008-03-27 21:33:23.000000000 +0100 ++++ kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake 2008-03-31 17:34:40.000000000 +0200 +@@ -882,11 +882,13 @@ + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") ++ set(CMAKE_CXX_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") ++ set(CMAKE_C_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG") + + if (CMAKE_SYSTEM_NAME MATCHES Linux) + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- kdelibs.spec 19 Jul 2008 03:13:11 -0000 1.330 +++ kdelibs.spec 19 Jul 2008 06:18:35 -0000 1.331 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.99 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -70,8 +70,8 @@ # workaround for policykit Patch11: kdelibs-4.0.2-policykit-workaround.patch Patch12: kdelibs-4.0.72-xdg-menu.patch -# Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) -Patch13: kdelibs-4.0.3-fedora-buildtype.patch +# Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) +Patch13: kdelibs-4.0.5-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec Patch14: kdelibs-4.0.85-libexecdir.patch # forward port kstandarddirs hack to search /etc/kde @@ -359,6 +359,9 @@ %changelog +* Sat Jul 19 2008 Rex Dieter 4.0.99-2 +- use better fedora-buildtype patch from F-9 branch + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 --- kdelibs-4.0.3-fedora-buildtype.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 06:21:52 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:21:52 GMT Subject: rpms/qscintilla/F-9 .cvsignore, 1.5, 1.6 QScintilla-2-gpl-Qt4-incpath.patch, 1.1, 1.2 qscintilla.spec, 1.17, 1.18 sources, 1.5, 1.6 qscintilla-1.73-gpl-2.1-paths.patch, 1.1, NONE Message-ID: <200807190621.m6J6LqgP022603@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qscintilla/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22532 Modified Files: .cvsignore QScintilla-2-gpl-Qt4-incpath.patch qscintilla.spec sources Removed Files: qscintilla-1.73-gpl-2.1-paths.patch Log Message: sync w/devel branch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qscintilla/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Jan 2008 21:33:44 -0000 1.5 +++ .cvsignore 19 Jul 2008 06:20:21 -0000 1.6 @@ -1 +1 @@ -QScintilla-1.73-gpl-2.1.tar.gz +QScintilla-gpl-2.2.tar.gz QScintilla-2-gpl-Qt4-incpath.patch: Index: QScintilla-2-gpl-Qt4-incpath.patch =================================================================== RCS file: /cvs/pkgs/rpms/qscintilla/F-9/QScintilla-2-gpl-Qt4-incpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- QScintilla-2-gpl-Qt4-incpath.patch 28 Jan 2008 21:33:44 -0000 1.1 +++ QScintilla-2-gpl-Qt4-incpath.patch 19 Jul 2008 06:20:22 -0000 1.2 @@ -1,8 +1,8 @@ ---- qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro.designer-incpath 2004-09-16 15:09:24.000000000 -0500 -+++ qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro 2004-09-16 15:08:31.000000000 -0500 -@@ -9,4 +9,6 @@ - - SOURCES += qscintillaplugin.cpp +--- QScintilla-gpl-2.2/designer-Qt4/designer.pro.BAD 2008-07-18 13:22:40.000000000 -0500 ++++ QScintilla-gpl-2.2/designer-Qt4/designer.pro 2008-07-18 13:23:02.000000000 -0500 +@@ -12,4 +12,6 @@ + target.path = $$[QT_INSTALL_PLUGINS]/designer + INSTALLS += target -LIBS += -lqscintilla2 +LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2 Index: qscintilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/qscintilla/F-9/qscintilla.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- qscintilla.spec 1 Jun 2008 22:12:23 -0000 1.17 +++ qscintilla.spec 19 Jul 2008 06:20:22 -0000 1.18 @@ -1,20 +1,19 @@ - %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define scintilla_ver 1.73 -Name: qscintilla -Version: 2.1 -Release: 4%{?dist}.1 +Name: qscintilla +Version: 2.2 +Release: 3%{?dist} Summary: A Scintilla port to Qt -License: GPLv2+ +# matches up (pretty much) with qt4 +License: GPLv3 or GPLv2 with exceptions Group: Development/Tools -Url: http://www.riverbankcomputing.co.uk/qscintilla/ -Source0: http://www.riverbankcomputing.com/Downloads/QScintilla2/QScintilla-%{scintilla_ver}-gpl-%{version}.tar.gz +Url: http://www.riverbankcomputing.com/software/qscintilla/ +Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: QScintilla-2-gpl-Qt4-incpath.patch -Patch2: qscintilla-1.73-gpl-2.1-paths.patch +#why is this not upstream? +Patch1: QScintilla-2-gpl-Qt4-incpath.patch BuildRequires: qt4-devel # for -python @@ -64,10 +63,9 @@ %prep -%setup -q -n QScintilla-%{scintilla_ver}-gpl-%{version} +%setup -q -n QScintilla-gpl-%{version} %patch1 -p1 -b .designer-incpath-qt4 -%patch2 -p1 -b .target.path # fixups to support RPM_BUILD_ROOT/DESTDIR sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro @@ -76,8 +74,8 @@ find doc example-Qt4 -type f -exec chmod 0644 {} ';' find src include -type f -exec chmod 0644 {} ';' -# fix line endings in license file -sed -i 's/\r//' LICENSE +# fix line endings in license file(s) +sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTION_ADDENDUM.TXT %build @@ -104,19 +102,18 @@ %install -rm -rf $RPM_BUILD_ROOT -make INSTALL_ROOT=$RPM_BUILD_ROOT -C Qt4 install -make INSTALL_ROOT=$RPM_BUILD_ROOT -C designer-Qt4 install -make DESTDIR=$RPM_BUILD_ROOT -C Python install -chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/PyQt4/Qsci.so - -# HACK ALERT (FIXME), ensure these dirs exist -mkdir -p $RPM_BUILD_ROOT%{_qt4_datadir}/qsci/ -mkdir -p $RPM_BUILD_ROOT%{_qt4_prefix}/qsci/ +rm -rf %{buildroot} + +make -C Qt4 install INSTALL_ROOT=%{buildroot} +make -C designer-Qt4 install INSTALL_ROOT=%{buildroot} +make -C Python install DESTDIR=%{buildroot} + +chrpath --list %{buildroot}%{python_sitearch}/PyQt4/Qsci.so +chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/Qsci.so %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -126,10 +123,11 @@ %files %defattr(-,root,root,-) -%doc ChangeLog LICENSE NEWS README +%doc ChangeLog NEWS README +%doc LICENSE.GPL3 +%doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT %{_qt4_libdir}/lib*.so.* %{_qt4_translationdir}/* -%{_qt4_datadir}/qsci/ %{_qt4_prefix}/qsci/ %files designer @@ -141,11 +139,9 @@ %doc doc/html-Qt4 doc/Scintilla example-Qt4 %{_qt4_headerdir}/Qsci/ %{_qt4_libdir}/lib*.so -%{_qt4_prefix}/qsci %files python %defattr(-,root,root,-) -%doc LICENSE %{python_sitearch}/PyQt4/Qsci.so %files python-devel @@ -154,8 +150,16 @@ %changelog -* Sun Jun 01 2008 Rex Dieter - 2.1-4.1 -- fix %files +* Fri Jul 18 2008 Dennis Gilmore - 2.2-3 +- rebuild for newer PyQT4 +- fix #449423 properly + +* Fri Jul 18 2008 Rex Dieter - 2.2-2 +- fix build (#449423) + +* Mon May 05 2008 Rex Dieter - 2.2-1 +- Qscintilla-gpl-2.2 +- License: GPLv3 or GPLv2 with exceptions * Thu Feb 14 2008 Rex Dieter - 2.1-4 - use %%_qt4_* macros (preparing for qt4 possibly moving %%_qt4_datadir) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qscintilla/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Jan 2008 21:33:44 -0000 1.5 +++ sources 19 Jul 2008 06:20:22 -0000 1.6 @@ -1 +1 @@ -13049717628391ca4db43f7ede0eeeb4 QScintilla-1.73-gpl-2.1.tar.gz +a6056c444494f3f849020d241f86c286 QScintilla-gpl-2.2.tar.gz --- qscintilla-1.73-gpl-2.1-paths.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 06:27:01 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:27:01 GMT Subject: rpms/kdegames/devel kdegames.spec,1.97,1.98 Message-ID: <200807190627.m6J6R15M022997@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22897 Modified Files: kdegames.spec Log Message: patch_fuzz Index: kdegames.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- kdegames.spec 19 Jul 2008 05:58:04 -0000 1.97 +++ kdegames.spec 19 Jul 2008 06:26:10 -0000 1.98 @@ -1,3 +1,4 @@ +%define _default_patch_fuzz 2 %{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)} Name: kdegames From fedora-extras-commits at redhat.com Sat Jul 19 06:29:16 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:29:16 GMT Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.2,1.3 Message-ID: <200807190629.m6J6TGjn023421@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasma-addons/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23276 Modified Files: kdeplasma-addons.spec Log Message: fix %%install Index: kdeplasma-addons.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdeplasma-addons.spec 19 Jul 2008 06:00:19 -0000 1.2 +++ kdeplasma-addons.spec 19 Jul 2008 06:28:28 -0000 1.3 @@ -55,7 +55,7 @@ %install rm -rf %{buildroot} -mkdir %{buildroot} + make install DESTDIR=%{buildroot} -C %{_target_platform} # unpackaged files From fedora-extras-commits at redhat.com Sat Jul 19 06:32:18 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:32:18 GMT Subject: rpms/kdesdk/devel kdesdk.spec,1.109,1.110 Message-ID: <200807190632.m6J6WIri023826@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23739 Modified Files: kdesdk.spec Log Message: fix %%install Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- kdesdk.spec 19 Jul 2008 06:01:08 -0000 1.109 +++ kdesdk.spec 19 Jul 2008 06:31:28 -0000 1.110 @@ -97,7 +97,7 @@ %install rm -rf %{buildroot} -mkdir %{buildroot} + make install DESTDIR=%{buildroot} -C %{_target_platform} # move devel symlinks From fedora-extras-commits at redhat.com Sat Jul 19 06:34:45 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:34:45 GMT Subject: rpms/kdeadmin/devel kdeadmin.spec,1.100,1.101 Message-ID: <200807190634.m6J6YjmZ024157@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24052 Modified Files: kdeadmin.spec Log Message: touchup changelog Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- kdeadmin.spec 19 Jul 2008 05:56:13 -0000 1.100 +++ kdeadmin.spec 19 Jul 2008 06:33:44 -0000 1.101 @@ -36,7 +36,6 @@ * ksystemlog (system log viewer) * kuser (user manager) - %package kpackage Summary: An RPM package manager Group: Applications/System @@ -98,7 +97,6 @@ %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : - %files %defattr(-,root,root,-) %doc AUTHORS COPYING README @@ -137,7 +135,7 @@ %changelog -* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +* Fri Jul 18 2008 Rex Dieter 7:4.0.99-1 - 4.0.99 * Fri Jul 11 2008 Rex Dieter 4.0.98-1 From fedora-extras-commits at redhat.com Sat Jul 19 06:57:52 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 06:57:52 GMT Subject: rpms/kdeedu/devel kdeedu.spec,1.127,1.128 Message-ID: <200807190657.m6J6vqpl025380@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25317 Modified Files: kdeedu.spec Log Message: fix %%files Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- kdeedu.spec 19 Jul 2008 05:57:20 -0000 1.127 +++ kdeedu.spec 19 Jul 2008 06:56:55 -0000 1.128 @@ -236,16 +236,12 @@ %{_kde4_appsdir}/step/ %{_kde4_datadir}/kde4/services/marble_part.desktop -%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop -%{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop %{_kde4_datadir}/kde4/services/plasma_parley.desktop %{_kde4_libdir}/kde4/libmarble_part.so -%{_kde4_libdir}/kde4/plasma_applet_didyouknow.so %{_kde4_libdir}/kde4/plasma_applet_kalgebra.so %{_kde4_libdir}/kde4/plasma_applet_parley.so -%{_kde4_libdir}/kde4/plasma_engine_kalzium.so %{_kde4_libdir}/kde4/plasma_engine_parley.so %{_kde4_datadir}/applications/kde4/blinken.desktop %{_kde4_datadir}/applications/kde4/kalzium.desktop From fedora-extras-commits at redhat.com Sat Jul 19 07:01:30 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 07:01:30 GMT Subject: rpms/kdeadmin/devel kdeadmin.spec,1.101,1.102 Message-ID: <200807190701.m6J71UZH032213@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25607 Modified Files: kdeadmin.spec Log Message: omit unused bits Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- kdeadmin.spec 19 Jul 2008 06:33:44 -0000 1.101 +++ kdeadmin.spec 19 Jul 2008 07:00:38 -0000 1.102 @@ -26,7 +26,6 @@ Requires: kdelibs4 >= %{version} Requires: kdepimlibs >= %{version} Requires: pkgconfig -%{?consolehelper:Requires: usermode-gtk} %description @@ -68,15 +67,6 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} -%if 0%{?consolehelper} -# Run kuser through consolehelper -install -D -p -m644 %{SOURCE1} %{buildroot}%{_kde4_sysconfdir}/security/console.apps/kuser -install -D -p -m644 %{SOURCE2} %{buildroot}%{_kde4_sysconfdir}/pam.d/kuser -mkdir -p %{buildroot}%{_kde4_sbindir} -mv %{buildroot}%{_kde4_bindir}/kuser %{buildroot}%{_kde4_sbindir} -ln -s consolehelper %{buildroot}%{_kde4_bindir}/kuser -%endif - %clean rm -rf %{buildroot} @@ -118,11 +108,6 @@ %{_kde4_libdir}/kde4/kcm_cron.so %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so %{_libdir}/pkgconfig/*.pc -%if 0%{?consolehelper} -%{_kde4_sbindir}/kuser -%config(noreplace) %{_kde4_sysconfdir}/security/console.apps/kuser -%config(noreplace) %{_kde4_sysconfdir}/pam.d/kuser -%endif %files kpackage %defattr(-,root,root,-) From fedora-extras-commits at redhat.com Sat Jul 19 08:24:11 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 19 Jul 2008 08:24:11 GMT Subject: rpms/xdvik/devel .cvsignore,1.8,1.9 sources,1.8,1.9 Message-ID: <200807190824.m6J8OB5Z010267@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/xdvik/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10236 Modified Files: .cvsignore sources Log Message: Update source tarball to xdvik-22.84.14.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdvik/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 May 2008 00:05:27 -0000 1.8 +++ .cvsignore 19 Jul 2008 08:23:06 -0000 1.9 @@ -1,2 +1 @@ -xdvik-22.84.13.tar.gz -xdvik-22.84.13-j1.40.patch.gz +xdvik-22.84.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdvik/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 May 2008 00:05:27 -0000 1.8 +++ sources 19 Jul 2008 08:23:06 -0000 1.9 @@ -1,2 +1 @@ -4d3d92381be42d7163e0f815f9cfb346 xdvik-22.84.13.tar.gz -e67e814b92e7b07764efd4b9fde8e72c xdvik-22.84.13-j1.40.patch.gz +0e0c3d49b8c0cbc934894757780e098f xdvik-22.84.14.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 09:29:26 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 09:29:26 GMT Subject: rpms/jvyamlb/devel .cvsignore, 1.2, 1.3 jvyamlb.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807190929.m6J9TQOk018978@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jvyamlb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18914 Modified Files: .cvsignore jvyamlb.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 - Newer version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Apr 2008 23:07:25 -0000 1.2 +++ .cvsignore 19 Jul 2008 09:28:31 -0000 1.3 @@ -1 +1 @@ -jvyamlb-src-0.1.tar.gz +jvyamlb-src-0.2.2.tar.gz Index: jvyamlb.spec =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/devel/jvyamlb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jvyamlb.spec 24 Apr 2008 23:07:25 -0000 1.1 +++ jvyamlb.spec 19 Jul 2008 09:28:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: jvyamlb -Version: 0.1 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: YAML processor for JRuby Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 +- Newer version. + * Thu Apr 24 2008 Conrad Meyer - 0.1-2 - Add tests to check section. - Don't include version in jar filename. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2008 23:07:25 -0000 1.2 +++ sources 19 Jul 2008 09:28:31 -0000 1.3 @@ -1 +1 @@ -454242d6f16fa7c1230e86a9ffb823d8 jvyamlb-src-0.1.tar.gz +6128731c558ec43c873e453e3efddff9 jvyamlb-src-0.2.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 09:49:29 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 09:49:29 GMT Subject: rpms/jvyamlb/F-9 .cvsignore, 1.2, 1.3 jvyamlb.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807190949.m6J9nT0A019616@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jvyamlb/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19505 Modified Files: .cvsignore jvyamlb.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 - Newer version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Apr 2008 23:07:36 -0000 1.2 +++ .cvsignore 19 Jul 2008 09:48:37 -0000 1.3 @@ -1 +1 @@ -jvyamlb-src-0.1.tar.gz +jvyamlb-src-0.2.2.tar.gz Index: jvyamlb.spec =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/F-9/jvyamlb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jvyamlb.spec 24 Apr 2008 23:07:36 -0000 1.1 +++ jvyamlb.spec 19 Jul 2008 09:48:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: jvyamlb -Version: 0.1 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: YAML processor for JRuby Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 +- Newer version. + * Thu Apr 24 2008 Conrad Meyer - 0.1-2 - Add tests to check section. - Don't include version in jar filename. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2008 23:07:36 -0000 1.2 +++ sources 19 Jul 2008 09:48:37 -0000 1.3 @@ -1 +1 @@ -454242d6f16fa7c1230e86a9ffb823d8 jvyamlb-src-0.1.tar.gz +6128731c558ec43c873e453e3efddff9 jvyamlb-src-0.2.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 09:49:30 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 09:49:30 GMT Subject: rpms/jvyamlb/F-8 .cvsignore, 1.2, 1.3 jvyamlb.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807190949.m6J9nUl4019621@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jvyamlb/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19495 Modified Files: .cvsignore jvyamlb.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 - Newer version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Apr 2008 23:07:33 -0000 1.2 +++ .cvsignore 19 Jul 2008 09:48:31 -0000 1.3 @@ -1 +1 @@ -jvyamlb-src-0.1.tar.gz +jvyamlb-src-0.2.2.tar.gz Index: jvyamlb.spec =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/F-8/jvyamlb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jvyamlb.spec 24 Apr 2008 23:07:33 -0000 1.1 +++ jvyamlb.spec 19 Jul 2008 09:48:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: jvyamlb -Version: 0.1 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: YAML processor for JRuby Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 +- Newer version. + * Thu Apr 24 2008 Conrad Meyer - 0.1-2 - Add tests to check section. - Don't include version in jar filename. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2008 23:07:33 -0000 1.2 +++ sources 19 Jul 2008 09:48:31 -0000 1.3 @@ -1 +1 @@ -454242d6f16fa7c1230e86a9ffb823d8 jvyamlb-src-0.1.tar.gz +6128731c558ec43c873e453e3efddff9 jvyamlb-src-0.2.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 09:51:58 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 09:51:58 GMT Subject: rpms/jvyamlb/EL-5 .cvsignore, 1.2, 1.3 jvyamlb.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807190951.m6J9pwj9019766@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jvyamlb/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727 Modified Files: .cvsignore jvyamlb.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 - Newer version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Apr 2008 23:07:39 -0000 1.2 +++ .cvsignore 19 Jul 2008 09:51:08 -0000 1.3 @@ -1 +1 @@ -jvyamlb-src-0.1.tar.gz +jvyamlb-src-0.2.2.tar.gz Index: jvyamlb.spec =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/EL-5/jvyamlb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jvyamlb.spec 24 Apr 2008 23:07:39 -0000 1.1 +++ jvyamlb.spec 19 Jul 2008 09:51:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: jvyamlb -Version: 0.1 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: YAML processor for JRuby Group: Development/Libraries License: MIT @@ -59,6 +59,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 0.2.2-1 +- Newer version. + * Thu Apr 24 2008 Conrad Meyer - 0.1-2 - Add tests to check section. - Don't include version in jar filename. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jvyamlb/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2008 23:07:39 -0000 1.2 +++ sources 19 Jul 2008 09:51:08 -0000 1.3 @@ -1 +1 @@ -454242d6f16fa7c1230e86a9ffb823d8 jvyamlb-src-0.1.tar.gz +6128731c558ec43c873e453e3efddff9 jvyamlb-src-0.2.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 10:25:37 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 10:25:37 GMT Subject: rpms/joni/devel .cvsignore, 1.2, 1.3 joni.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807191025.m6JAPbtb027615@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27504 Modified Files: .cvsignore joni.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.1.svn7235 - Bump to trunk version of joni for JRuby 1.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2008 21:15:22 -0000 1.2 +++ .cvsignore 19 Jul 2008 10:24:44 -0000 1.3 @@ -1 +1 @@ -joni-1.0.2.tar.bz2 +joni-1.0.3.tar.bz2 Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- joni.spec 7 Apr 2008 21:15:22 -0000 1.1 +++ joni.spec 19 Jul 2008 10:24:44 -0000 1.2 @@ -1,14 +1,14 @@ Name: joni -Version: 1.0.2 -Release: 4%{?dist} +Version: 1.0.3 +Release: 0.1.svn7235%{?dist} Summary: Java regular expression library Group: Development/Libraries License: MIT URL: http://jruby.codehaus.org/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export http://svn.codehaus.org/jruby/joni/tags/1.0.2/ joni-1.0.2 -# tar -cjf joni-1.0.2.tar.bz2 joni-1.0.2 +# svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3 +# tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3 Source0: %{name}-%{version}.tar.bz2 Patch0: joni-set-java-5_0-target-and-source.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,6 +73,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.1.svn7235 +- Bump to trunk version of joni for JRuby 1.1.3. + * Sat Apr 5 2008 Conrad Meyer - 1.0.2-4 - Compile AOT bits. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2008 21:15:22 -0000 1.2 +++ sources 19 Jul 2008 10:24:44 -0000 1.3 @@ -1 +1 @@ -b6ce4ef70f477c286f1f49bc8c13a9f7 joni-1.0.2.tar.bz2 +80642979735e3b98f05f8377f6734ed9 joni-1.0.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 10:50:49 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 10:50:49 GMT Subject: rpms/joni/devel joni.spec,1.2,1.3 Message-ID: <200807191050.m6JAonQ9028376@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28317 Modified Files: joni.spec Log Message: * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.1.svn7235 - Bump to trunk version of joni for JRuby 1.1.3. - Switch to noarch for fc10 and up. Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- joni.spec 19 Jul 2008 10:24:44 -0000 1.2 +++ joni.spec 19 Jul 2008 10:49:56 -0000 1.3 @@ -1,26 +1,32 @@ -Name: joni -Version: 1.0.3 -Release: 0.1.svn7235%{?dist} -Summary: Java regular expression library -Group: Development/Libraries -License: MIT -URL: http://jruby.codehaus.org/ +Name: joni +Version: 1.0.3 +Release: 0.1.svn7235%{?dist} +Summary: Java regular expression library +Group: Development/Libraries +License: MIT +URL: http://jruby.codehaus.org/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: # svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3 # tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3 -Source0: %{name}-%{version}.tar.bz2 -Patch0: joni-set-java-5_0-target-and-source.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: java-devel >= 1.5 -BuildRequires: ant -BuildRequires: jpackage-utils -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires: java >= 1.5 -Requires: jpackage-utils +Source0: %{name}-%{version}.tar.bz2 +Patch0: joni-set-java-5_0-target-and-source.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: java-devel >= 1.5 +BuildRequires: ant +BuildRequires: jpackage-utils +Requires: java >= 1.5 +Requires: jpackage-utils + +%if 0%{?fedora} > 9 +BuildArch: noarch +%else +BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif + %description joni is a port of Oniguruma, a regular expressions library, @@ -47,18 +53,22 @@ %{_bindir}/aot-compile-rpm +%if 0%{?fedora} <= 9 %post if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi +%endif +%if 0%{?fedora} <= 9 %postun if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi +%endif %clean @@ -69,12 +79,16 @@ %defattr(-,root,root,-) %doc pom.xml %{_javadir}/%{name}.jar + +%if 0%{?fedora} <= 9 %{_libdir}/gcj/%{name} +%endif %changelog * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.1.svn7235 - Bump to trunk version of joni for JRuby 1.1.3. +- Switch to noarch for fc10 and up. * Sat Apr 5 2008 Conrad Meyer - 1.0.2-4 - Compile AOT bits. From fedora-extras-commits at redhat.com Sat Jul 19 11:02:45 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 11:02:45 GMT Subject: rpms/joni/devel joni.spec,1.3,1.4 Message-ID: <200807191102.m6JB2jPp002996@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32030 Modified Files: joni.spec Log Message: * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.2.svn7235 - Bump revision because of stupid packager's mistake. Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- joni.spec 19 Jul 2008 10:49:56 -0000 1.3 +++ joni.spec 19 Jul 2008 11:01:55 -0000 1.4 @@ -1,6 +1,6 @@ Name: joni Version: 1.0.3 -Release: 0.1.svn7235%{?dist} +Release: 0.2.svn7235%{?dist} Summary: Java regular expression library Group: Development/Libraries License: MIT @@ -86,6 +86,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.2.svn7235 +- Bump revision because of stupid packager's mistake. + * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.1.svn7235 - Bump to trunk version of joni for JRuby 1.1.3. - Switch to noarch for fc10 and up. From fedora-extras-commits at redhat.com Sat Jul 19 11:05:52 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 11:05:52 GMT Subject: rpms/joni/F-8 .cvsignore,1.2,1.3 joni.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807191105.m6JB5q8j003199@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3105 Modified Files: .cvsignore joni.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.2.svn7235 - Bump revision because of stupid packager's mistake. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/joni/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2008 21:24:34 -0000 1.2 +++ .cvsignore 19 Jul 2008 11:05:01 -0000 1.3 @@ -1 +1 @@ -joni-1.0.2.tar.bz2 +joni-1.0.3.tar.bz2 Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/F-8/joni.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- joni.spec 7 Apr 2008 21:24:34 -0000 1.1 +++ joni.spec 19 Jul 2008 11:05:01 -0000 1.2 @@ -1,26 +1,32 @@ -Name: joni -Version: 1.0.2 -Release: 4%{?dist} -Summary: Java regular expression library -Group: Development/Libraries -License: MIT -URL: http://jruby.codehaus.org/ +Name: joni +Version: 1.0.3 +Release: 0.2.svn7235%{?dist} +Summary: Java regular expression library +Group: Development/Libraries +License: MIT +URL: http://jruby.codehaus.org/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export http://svn.codehaus.org/jruby/joni/tags/1.0.2/ joni-1.0.2 -# tar -cjf joni-1.0.2.tar.bz2 joni-1.0.2 -Source0: %{name}-%{version}.tar.bz2 -Patch0: joni-set-java-5_0-target-and-source.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: java-devel >= 1.5 -BuildRequires: ant -BuildRequires: jpackage-utils -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires: java >= 1.5 -Requires: jpackage-utils +# svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3 +# tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3 +Source0: %{name}-%{version}.tar.bz2 +Patch0: joni-set-java-5_0-target-and-source.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: java-devel >= 1.5 +BuildRequires: ant +BuildRequires: jpackage-utils +Requires: java >= 1.5 +Requires: jpackage-utils + +%if 0%{?fedora} > 9 +BuildArch: noarch +%else +BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif + %description joni is a port of Oniguruma, a regular expressions library, @@ -47,18 +53,22 @@ %{_bindir}/aot-compile-rpm +%if 0%{?fedora} <= 9 %post if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi +%endif +%if 0%{?fedora} <= 9 %postun if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi +%endif %clean @@ -69,10 +79,20 @@ %defattr(-,root,root,-) %doc pom.xml %{_javadir}/%{name}.jar + +%if 0%{?fedora} <= 9 %{_libdir}/gcj/%{name} +%endif %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.2.svn7235 +- Bump revision because of stupid packager's mistake. + +* Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.1.svn7235 +- Bump to trunk version of joni for JRuby 1.1.3. +- Switch to noarch for fc10 and up. + * Sat Apr 5 2008 Conrad Meyer - 1.0.2-4 - Compile AOT bits. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/joni/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2008 21:24:34 -0000 1.2 +++ sources 19 Jul 2008 11:05:01 -0000 1.3 @@ -1 +1 @@ -b6ce4ef70f477c286f1f49bc8c13a9f7 joni-1.0.2.tar.bz2 +80642979735e3b98f05f8377f6734ed9 joni-1.0.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 11:05:57 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 11:05:57 GMT Subject: rpms/joni/F-9 .cvsignore,1.2,1.3 joni.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807191105.m6JB5va7003204@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3093 Modified Files: .cvsignore joni.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.2.svn7235 - Bump revision because of stupid packager's mistake. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/joni/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2008 21:15:22 -0000 1.2 +++ .cvsignore 19 Jul 2008 11:05:07 -0000 1.3 @@ -1 +1 @@ -joni-1.0.2.tar.bz2 +joni-1.0.3.tar.bz2 Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/F-9/joni.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- joni.spec 7 Apr 2008 21:15:22 -0000 1.1 +++ joni.spec 19 Jul 2008 11:05:07 -0000 1.2 @@ -1,26 +1,32 @@ -Name: joni -Version: 1.0.2 -Release: 4%{?dist} -Summary: Java regular expression library -Group: Development/Libraries -License: MIT -URL: http://jruby.codehaus.org/ +Name: joni +Version: 1.0.3 +Release: 0.2.svn7235%{?dist} +Summary: Java regular expression library +Group: Development/Libraries +License: MIT +URL: http://jruby.codehaus.org/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export http://svn.codehaus.org/jruby/joni/tags/1.0.2/ joni-1.0.2 -# tar -cjf joni-1.0.2.tar.bz2 joni-1.0.2 -Source0: %{name}-%{version}.tar.bz2 -Patch0: joni-set-java-5_0-target-and-source.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: java-devel >= 1.5 -BuildRequires: ant -BuildRequires: jpackage-utils -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires: java >= 1.5 -Requires: jpackage-utils +# svn export -r 7235 http://svn.codehaus.org/jruby/joni/trunk/ joni-1.0.3 +# tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3 +Source0: %{name}-%{version}.tar.bz2 +Patch0: joni-set-java-5_0-target-and-source.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: java-devel >= 1.5 +BuildRequires: ant +BuildRequires: jpackage-utils +Requires: java >= 1.5 +Requires: jpackage-utils + +%if 0%{?fedora} > 9 +BuildArch: noarch +%else +BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif + %description joni is a port of Oniguruma, a regular expressions library, @@ -47,18 +53,22 @@ %{_bindir}/aot-compile-rpm +%if 0%{?fedora} <= 9 %post if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi +%endif +%if 0%{?fedora} <= 9 %postun if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi +%endif %clean @@ -69,10 +79,20 @@ %defattr(-,root,root,-) %doc pom.xml %{_javadir}/%{name}.jar + +%if 0%{?fedora} <= 9 %{_libdir}/gcj/%{name} +%endif %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.2.svn7235 +- Bump revision because of stupid packager's mistake. + +* Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.1.svn7235 +- Bump to trunk version of joni for JRuby 1.1.3. +- Switch to noarch for fc10 and up. + * Sat Apr 5 2008 Conrad Meyer - 1.0.2-4 - Compile AOT bits. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/joni/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2008 21:15:22 -0000 1.2 +++ sources 19 Jul 2008 11:05:07 -0000 1.3 @@ -1 +1 @@ -b6ce4ef70f477c286f1f49bc8c13a9f7 joni-1.0.2.tar.bz2 +80642979735e3b98f05f8377f6734ed9 joni-1.0.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 11:11:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos)) Date: Sat, 19 Jul 2008 11:11:02 GMT Subject: comps/po sr.po,1.15,1.16 sr@latin.po,1.15,1.16 Message-ID: <200807191111.m6JBB2m9003466@cvs-int.fedora.redhat.com> Author: kmilos Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3427 Modified Files: sr.po sr at latin.po Log Message: Updated Serbian and Serbian Latin translations Index: sr.po =================================================================== RCS file: /cvs/pkgs/comps/po/sr.po,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sr.po 17 Jul 2008 18:31:24 -0000 1.15 +++ sr.po 19 Jul 2008 11:10:32 -0000 1.16 @@ -10,7 +10,7 @@ "Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2008-04-21 08:01+0100\n" +"PO-Revision-Date: 2008-07-19 11:59-0000\n" "Last-Translator: Milo?? Komar??evi?? \n" "Language-Team: Serbian (sr) \n" "MIME-Version: 1.0\n" @@ -1138,13 +1138,12 @@ msgstr "?????????????? ???? ?????????????? ????????" #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133 -#, fuzzy msgid "SUGAR Desktop Environment" -msgstr "?????????? ????????????????" +msgstr "SUGAR ?????????? ????????????????" #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134 msgid "SUGAR is the desktop environment developed for the OLPC XO." -msgstr "" +msgstr "SUGAR ???? ?????????? ???????????????? ?????????????????? ???? OLPC XO." #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204 msgid "Walloon Support" @@ -1152,20 +1151,19 @@ #: ../comps-f10.xml.in.h:70 msgid "Haskell" -msgstr "" +msgstr "????????????" #: ../comps-f10.xml.in.h:76 msgid "Input Methods" -msgstr "" +msgstr "???????????? ??????????" #: ../comps-f10.xml.in.h:77 msgid "Input method packages for the input of international text." -msgstr "" +msgstr "???????????? ???????????? ?????????? ???? ?????????????? ???????????????????????????????? ????????????." #: ../comps-f10.xml.in.h:157 -#, fuzzy msgid "Tajik Support" -msgstr "?????????????? ???? ????????????????????" +msgstr "?????????????? ???? ??????????????" #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" @@ -1238,68 +1236,3 @@ msgid "" "This group is a collection of tools and resources of Czech environments." msgstr "?????? ?????????? ???? ???????? ???????????? ?? ?????????????? ???? ?????????? ????????????????." - -#~ msgid "British Support" -#~ msgstr "?????????????? ???? ?????????????????? ????????????????" - -#~ msgid "Cluster Storage" -#~ msgstr "???????????????? ??????????????????????" - -#~ msgid "Clustering Support." -#~ msgstr "?????????????? ???? ????????????????????." - -#~ msgid "Libraries for applications built on older releases." -#~ msgstr "???????????????????? ???? ???????????????? ???????????????? ???? ?????????????? ????????????." - -#~ msgid "Miscellaneous Included Packages" -#~ msgstr "?????????? ???????????????? ????????????" - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "???????????? ???????? ?????????????? ?????????????? ???? ???????????????? ??????????????????????." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "???????????? ???????? ?????????????? ?????????????? ???? ???????????? GFS ????????." - -#~ msgid "Single Node GFS Support" -#~ msgstr "?????????????? ???? ???????????? GFS ????????" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "" -#~ "?????? ???????????? ???????????????????? ?????????????? ???? ???????????????????????? ???? ???????????????????? ????????????????." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "Java ?????????????? ???????????????? ?? ???????????????? ????????????" - -#~ msgid "Misc" -#~ msgstr "??????????" - -#~ msgid "Misc packages" -#~ msgstr "?????????? ????????????" - -#~ msgid "Multimedia" -#~ msgstr "??????????????????????" - -#~ msgid "Multimedia applications" -#~ msgstr "???????????????? ???? ??????????????????????" - -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "" -#~ "???????????? ???????? ?????????????? ?????????????? ???????????????????????????? ???? Red Hat Enterprise Linux" - -#~ msgid "Red Hat Enterprise Linux Supplementary" -#~ msgstr "Red Hat Enterprise Linux ????????????" - -#~ msgid "" -#~ "Components used for high performance networking and clustering, such as " -#~ "Infiniband and RDMA." -#~ msgstr "" -#~ "???????????????????? ???????? ???? ?????????????? ???? ???????????????????? ?? ???????????????????? ???? ?????????????? ??????????????, " -#~ "?????? ?????? ???? Infiniband ?? RDMA." - -#~ msgid "OpenFabrics Enterprise Distribution" -#~ msgstr "OpenFabrics Enterprise ????????????????????????" - -#~ msgid "Virtualization Support." -#~ msgstr "?????????????? ???? ????????????????????????????." Index: sr at latin.po =================================================================== RCS file: /cvs/pkgs/comps/po/sr at latin.po,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sr at latin.po 17 Jul 2008 18:31:24 -0000 1.15 +++ sr at latin.po 19 Jul 2008 11:10:32 -0000 1.16 @@ -10,7 +10,7 @@ "Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2008-04-21 08:01+0100\n" +"PO-Revision-Date: 2008-07-19 11:59-0000\n" "Last-Translator: Milo?? Komar??evi?? \n" "Language-Team: Serbian (sr) \n" "MIME-Version: 1.0\n" @@ -1138,13 +1138,12 @@ msgstr "Podr??ka za severni sami" #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133 -#, fuzzy msgid "SUGAR Desktop Environment" -msgstr "Radna okru??enja" +msgstr "SUGAR radno okru??enje" #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134 msgid "SUGAR is the desktop environment developed for the OLPC XO." -msgstr "" +msgstr "SUGAR je radno okru??enje razvijeno za OLPC XO." #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204 msgid "Walloon Support" @@ -1152,20 +1151,19 @@ #: ../comps-f10.xml.in.h:70 msgid "Haskell" -msgstr "" +msgstr "Haskel" #: ../comps-f10.xml.in.h:76 msgid "Input Methods" -msgstr "" +msgstr "Metode unosa" #: ../comps-f10.xml.in.h:77 msgid "Input method packages for the input of international text." -msgstr "" +msgstr "Paketi metoda unosa za uno??enje internacionalnog teksta." #: ../comps-f10.xml.in.h:157 -#, fuzzy msgid "Tajik Support" -msgstr "Podr??ka za tajlandski" +msgstr "Podr??ka za tad??i??ki" #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" @@ -1238,68 +1236,3 @@ msgid "" "This group is a collection of tools and resources of Czech environments." msgstr "Ova grupa je skup alatki i resursa za ??e??ko okru??enje." - -#~ msgid "British Support" -#~ msgstr "Podr??ka za britanski engleski" - -#~ msgid "Cluster Storage" -#~ msgstr "U??voreno skladi??tenje" - -#~ msgid "Clustering Support." -#~ msgstr "Podr??ka za u??voravanje." - -#~ msgid "Libraries for applications built on older releases." -#~ msgstr "Biblioteke za programe izra??ene za starija izdanja." - -#~ msgid "Miscellaneous Included Packages" -#~ msgstr "Razni uklju??eni paketi" - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "Paketi koji pru??aju podr??ku za u??voreno skladi??tenje." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "Paketi koji pru??aju podr??ku za jedini GFS ??vor." - -#~ msgid "Single Node GFS Support" -#~ msgstr "Podr??ka za jedini GFS ??vor" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "" -#~ "Ovi paketi obezbe??uju podr??ku za usagla??enost sa prethodnim izdanjima." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "Java izvr??no okru??enje i razvojna oprema" - -#~ msgid "Misc" -#~ msgstr "Razno" - -#~ msgid "Misc packages" -#~ msgstr "Razni paketi" - -#~ msgid "Multimedia" -#~ msgstr "Multimedija" - -#~ msgid "Multimedia applications" -#~ msgstr "Programi za multimediju" - -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "" -#~ "Paketi koji pru??aju dodatnu funkcionalnost za Red Hat Enterprise Linux" - -#~ msgid "Red Hat Enterprise Linux Supplementary" -#~ msgstr "Red Hat Enterprise Linux dodaci" - -#~ msgid "" -#~ "Components used for high performance networking and clustering, such as " -#~ "Infiniband and RDMA." -#~ msgstr "" -#~ "Komponente koje se koriste za umre??avanje i u??voravanje sa visokim " -#~ "u??inkom, kao ??to su Infiniband i RDMA." - -#~ msgid "OpenFabrics Enterprise Distribution" -#~ msgstr "OpenFabrics Enterprise distribucija" - -#~ msgid "Virtualization Support." -#~ msgstr "Podr??ka za virtualizaciju." From fedora-extras-commits at redhat.com Sat Jul 19 11:25:51 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Sat, 19 Jul 2008 11:25:51 GMT Subject: comps/po tg.po,1.5,1.6 Message-ID: <200807191125.m6JBPpGX003927@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3900/po Modified Files: tg.po Log Message: 2008-07-19 Victor Ibragimov (via tajikfedora at fedoraproject.org) * po/tg.po: Tajik Translation 100% completed Index: tg.po =================================================================== RCS file: /cvs/pkgs/comps/po/tg.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tg.po 18 Jul 2008 07:29:22 -0000 1.5 +++ tg.po 19 Jul 2008 11:25:21 -0000 1.6 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Fedora Localization Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-15 10:38+0000\n" +"POT-Creation-Date: 2008-07-19 03:11+0000\n" "PO-Revision-Date: \n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik Fedora & Software Localization Team \n" @@ -28,7 +28,7 @@ #: ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" -msgstr "???????????????? ??????????????????" +msgstr "???????????????????? ??????????????????" #: ../comps-f7.xml.in.h:3 #: ../comps-f8.xml.in.h:3 @@ -206,7 +206,7 @@ #: ../comps-f9.xml.in.h:27 #: ../comps-f10.xml.in.h:27 msgid "Core" -msgstr "????????" +msgstr "??????????????" #: ../comps-f7.xml.in.h:27 #: ../comps-f8.xml.in.h:28 @@ -285,7 +285,7 @@ #: ../comps-f9.xml.in.h:37 #: ../comps-f10.xml.in.h:37 msgid "Dial-up Networking Support" -msgstr "???????????????????? Dial-up" +msgstr "???????????????????? ???????????????? Dial-up" #: ../comps-f7.xml.in.h:37 #: ../comps-f8.xml.in.h:38 @@ -515,7 +515,7 @@ #: ../comps-f7.xml.in.h:66 #: ../comps-f8.xml.in.h:69 #: ../comps-f9.xml.in.h:70 -#: ../comps-f10.xml.in.h:70 +#: ../comps-f10.xml.in.h:71 #: ../comps-el4.xml.in.h:26 #: ../comps-el5.xml.in.h:28 msgid "Hebrew Support" @@ -524,35 +524,35 @@ #: ../comps-f7.xml.in.h:67 #: ../comps-f8.xml.in.h:70 #: ../comps-f9.xml.in.h:71 -#: ../comps-f10.xml.in.h:71 +#: ../comps-f10.xml.in.h:72 msgid "Hindi Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:68 #: ../comps-f8.xml.in.h:71 #: ../comps-f9.xml.in.h:72 -#: ../comps-f10.xml.in.h:72 +#: ../comps-f10.xml.in.h:73 msgid "Hungarian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:69 #: ../comps-f8.xml.in.h:72 #: ../comps-f9.xml.in.h:73 -#: ../comps-f10.xml.in.h:73 +#: ../comps-f10.xml.in.h:74 msgid "Icelandic Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:70 #: ../comps-f8.xml.in.h:73 #: ../comps-f9.xml.in.h:74 -#: ../comps-f10.xml.in.h:74 +#: ../comps-f10.xml.in.h:75 msgid "Indonesian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:71 #: ../comps-f8.xml.in.h:74 #: ../comps-f9.xml.in.h:75 -#: ../comps-f10.xml.in.h:77 +#: ../comps-f10.xml.in.h:78 #: ../comps-el4.xml.in.h:27 #: ../comps-el5.xml.in.h:29 msgid "Install these packages in order to develop GTK+ and GNOME graphical applications." @@ -561,14 +561,14 @@ #: ../comps-f7.xml.in.h:72 #: ../comps-f8.xml.in.h:75 #: ../comps-f9.xml.in.h:76 -#: ../comps-f10.xml.in.h:78 +#: ../comps-f10.xml.in.h:79 msgid "Install these packages in order to develop GTK+ and XFCE graphical applications." msgstr "?????????? ???????????????????????????? ???????????????????? ???????????????? GTK+ ???? XFCE, ???????????????????? ?????????????? ???????? ????????????." #: ../comps-f7.xml.in.h:73 #: ../comps-f8.xml.in.h:76 #: ../comps-f9.xml.in.h:77 -#: ../comps-f10.xml.in.h:79 +#: ../comps-f10.xml.in.h:80 #: ../comps-el4.xml.in.h:28 #: ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." @@ -577,14 +577,14 @@ #: ../comps-f7.xml.in.h:74 #: ../comps-f8.xml.in.h:77 #: ../comps-f9.xml.in.h:78 -#: ../comps-f10.xml.in.h:80 +#: ../comps-f10.xml.in.h:81 msgid "Install these tools to enable the system to print or act as a print server." msgstr "?????????? ???????????????????? ???????????????? ???????? ?? ???????????????????? ????????, ???????????????????? ?????????????? ???????? ????????????." #: ../comps-f7.xml.in.h:75 #: ../comps-f8.xml.in.h:78 #: ../comps-f9.xml.in.h:79 -#: ../comps-f10.xml.in.h:81 +#: ../comps-f10.xml.in.h:82 #: ../comps-el4.xml.in.h:29 #: ../comps-el5.xml.in.h:31 msgid "Install this group of packages to use the base graphical (X) user interface." @@ -593,28 +593,28 @@ #: ../comps-f7.xml.in.h:76 #: ../comps-f8.xml.in.h:80 #: ../comps-f9.xml.in.h:81 -#: ../comps-f10.xml.in.h:83 +#: ../comps-f10.xml.in.h:84 msgid "Inuktitut Support" msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f7.xml.in.h:77 #: ../comps-f8.xml.in.h:81 #: ../comps-f9.xml.in.h:82 -#: ../comps-f10.xml.in.h:84 +#: ../comps-f10.xml.in.h:85 msgid "Irish Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:78 #: ../comps-f8.xml.in.h:82 #: ../comps-f9.xml.in.h:83 -#: ../comps-f10.xml.in.h:85 +#: ../comps-f10.xml.in.h:86 msgid "Italian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:79 #: ../comps-f8.xml.in.h:83 #: ../comps-f9.xml.in.h:84 -#: ../comps-f10.xml.in.h:86 +#: ../comps-f10.xml.in.h:87 #: ../comps-el4.xml.in.h:30 #: ../comps-el5.xml.in.h:32 msgid "Japanese Support" @@ -623,7 +623,7 @@ #: ../comps-f7.xml.in.h:80 #: ../comps-f8.xml.in.h:84 #: ../comps-f9.xml.in.h:85 -#: ../comps-f10.xml.in.h:87 +#: ../comps-f10.xml.in.h:88 #: ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" @@ -631,7 +631,7 @@ #: ../comps-f7.xml.in.h:81 #: ../comps-f8.xml.in.h:85 #: ../comps-f9.xml.in.h:86 -#: ../comps-f10.xml.in.h:88 +#: ../comps-f10.xml.in.h:89 #: ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "???????????????????????????? Java" @@ -639,7 +639,7 @@ #: ../comps-f7.xml.in.h:82 #: ../comps-f8.xml.in.h:86 #: ../comps-f9.xml.in.h:87 -#: ../comps-f10.xml.in.h:89 +#: ../comps-f10.xml.in.h:90 #: ../comps-el4.xml.in.h:33 #: ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" @@ -648,7 +648,7 @@ #: ../comps-f7.xml.in.h:83 #: ../comps-f8.xml.in.h:87 #: ../comps-f9.xml.in.h:88 -#: ../comps-f10.xml.in.h:90 +#: ../comps-f10.xml.in.h:91 #: ../comps-el4.xml.in.h:34 #: ../comps-el5.xml.in.h:34 msgid "KDE Software Development" @@ -657,84 +657,84 @@ #: ../comps-f7.xml.in.h:84 #: ../comps-f8.xml.in.h:88 #: ../comps-f9.xml.in.h:89 -#: ../comps-f10.xml.in.h:91 +#: ../comps-f10.xml.in.h:92 msgid "KDE is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." msgstr "KDE ???? ???????????????????? ???????????????? ?????????????? ???????????????? ??????????????, ???? ?????????????????????? ???????????? ??????????, ???????? ????????, ?????????????????? ?????????????????? ???? ???????????? ?????????????? ?????????????????? ?????? ?????? ??????????????." #: ../comps-f7.xml.in.h:85 #: ../comps-f8.xml.in.h:89 #: ../comps-f9.xml.in.h:90 -#: ../comps-f10.xml.in.h:92 +#: ../comps-f10.xml.in.h:93 msgid "Kannada Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:86 #: ../comps-f8.xml.in.h:90 #: ../comps-f9.xml.in.h:92 -#: ../comps-f10.xml.in.h:94 +#: ../comps-f10.xml.in.h:95 msgid "Khmer Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:87 #: ../comps-f8.xml.in.h:91 #: ../comps-f9.xml.in.h:93 -#: ../comps-f10.xml.in.h:95 +#: ../comps-f10.xml.in.h:96 msgid "Korean Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:88 #: ../comps-f8.xml.in.h:92 #: ../comps-f9.xml.in.h:94 -#: ../comps-f10.xml.in.h:96 +#: ../comps-f10.xml.in.h:97 msgid "Languages" msgstr "??????????????" #: ../comps-f7.xml.in.h:89 #: ../comps-f8.xml.in.h:93 #: ../comps-f9.xml.in.h:95 -#: ../comps-f10.xml.in.h:97 +#: ../comps-f10.xml.in.h:98 msgid "Lao Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:90 #: ../comps-f8.xml.in.h:94 #: ../comps-f9.xml.in.h:96 -#: ../comps-f10.xml.in.h:98 +#: ../comps-f10.xml.in.h:99 msgid "Latvian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:91 #: ../comps-f8.xml.in.h:96 #: ../comps-f9.xml.in.h:98 -#: ../comps-f10.xml.in.h:100 +#: ../comps-f10.xml.in.h:101 msgid "Legacy Network Server" msgstr "???????????????????? ???????????????????? ??????????" #: ../comps-f7.xml.in.h:92 #: ../comps-f8.xml.in.h:97 #: ../comps-f9.xml.in.h:99 -#: ../comps-f10.xml.in.h:101 +#: ../comps-f10.xml.in.h:102 msgid "Legacy Software Development" msgstr "???????????????????????????? ???????????????????? ??????????" #: ../comps-f7.xml.in.h:93 #: ../comps-f8.xml.in.h:98 #: ../comps-f9.xml.in.h:100 -#: ../comps-f10.xml.in.h:102 +#: ../comps-f10.xml.in.h:103 msgid "Legacy Software Support" msgstr "???????????????????? ???????????????????? ??????????" #: ../comps-f7.xml.in.h:94 #: ../comps-f8.xml.in.h:99 #: ../comps-f9.xml.in.h:101 -#: ../comps-f10.xml.in.h:103 +#: ../comps-f10.xml.in.h:104 msgid "Lithuanian Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:95 #: ../comps-f8.xml.in.h:101 #: ../comps-f9.xml.in.h:104 -#: ../comps-f10.xml.in.h:106 +#: ../comps-f10.xml.in.h:107 #: ../comps-el4.xml.in.h:36 #: ../comps-el5.xml.in.h:36 msgid "Mail Server" @@ -743,42 +743,42 @@ #: ../comps-f7.xml.in.h:96 #: ../comps-f8.xml.in.h:102 #: ../comps-f9.xml.in.h:105 -#: ../comps-f10.xml.in.h:107 +#: ../comps-f10.xml.in.h:108 msgid "Malay Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:97 #: ../comps-f8.xml.in.h:103 #: ../comps-f9.xml.in.h:106 -#: ../comps-f10.xml.in.h:108 +#: ../comps-f10.xml.in.h:109 msgid "Malayalam Support" msgstr "???????????????????? ???????????? ????????????????????" #: ../comps-f7.xml.in.h:98 #: ../comps-f8.xml.in.h:104 #: ../comps-f9.xml.in.h:107 -#: ../comps-f10.xml.in.h:109 +#: ../comps-f10.xml.in.h:110 msgid "Maori Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:99 #: ../comps-f8.xml.in.h:105 #: ../comps-f9.xml.in.h:108 -#: ../comps-f10.xml.in.h:110 +#: ../comps-f10.xml.in.h:111 msgid "Marathi Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:100 #: ../comps-f8.xml.in.h:107 #: ../comps-f9.xml.in.h:110 -#: ../comps-f10.xml.in.h:112 +#: ../comps-f10.xml.in.h:113 msgid "MySQL Database" msgstr "?????????????????????? MySQL" #: ../comps-f7.xml.in.h:101 #: ../comps-f8.xml.in.h:109 #: ../comps-f9.xml.in.h:112 -#: ../comps-f10.xml.in.h:114 +#: ../comps-f10.xml.in.h:115 #: ../comps-el4.xml.in.h:37 #: ../comps-el5.xml.in.h:37 msgid "Network Servers" @@ -787,7 +787,7 @@ #: ../comps-f7.xml.in.h:102 #: ../comps-f8.xml.in.h:110 #: ../comps-f9.xml.in.h:113 -#: ../comps-f10.xml.in.h:115 +#: ../comps-f10.xml.in.h:116 #: ../comps-el4.xml.in.h:38 #: ../comps-el5.xml.in.h:38 msgid "News Server" @@ -796,21 +796,21 @@ #: ../comps-f7.xml.in.h:103 #: ../comps-f8.xml.in.h:111 #: ../comps-f9.xml.in.h:115 -#: ../comps-f10.xml.in.h:117 +#: ../comps-f10.xml.in.h:118 msgid "Northern Sotho Support" msgstr "???????????????????? ???????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:104 #: ../comps-f8.xml.in.h:112 #: ../comps-f9.xml.in.h:116 -#: ../comps-f10.xml.in.h:118 +#: ../comps-f10.xml.in.h:119 msgid "Norwegian Support" msgstr "???????????????????? ???????????? ????????????????????" #: ../comps-f7.xml.in.h:105 #: ../comps-f8.xml.in.h:113 #: ../comps-f9.xml.in.h:117 -#: ../comps-f10.xml.in.h:119 +#: ../comps-f10.xml.in.h:120 #: ../comps-el4.xml.in.h:39 #: ../comps-el5.xml.in.h:39 msgid "Office/Productivity" @@ -819,14 +819,14 @@ #: ../comps-f7.xml.in.h:106 #: ../comps-f8.xml.in.h:115 #: ../comps-f9.xml.in.h:119 -#: ../comps-f10.xml.in.h:121 +#: ../comps-f10.xml.in.h:122 msgid "Oriya Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:107 #: ../comps-f8.xml.in.h:116 #: ../comps-f9.xml.in.h:120 -#: ../comps-f10.xml.in.h:122 +#: ../comps-f10.xml.in.h:123 #: ../comps-el4.xml.in.h:40 #: ../comps-el5.xml.in.h:40 msgid "Packages which provide functionality for developing and building applications." @@ -835,91 +835,91 @@ #: ../comps-f7.xml.in.h:108 #: ../comps-f8.xml.in.h:117 #: ../comps-f9.xml.in.h:121 -#: ../comps-f10.xml.in.h:123 +#: ../comps-f10.xml.in.h:124 msgid "Persian Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:109 #: ../comps-f8.xml.in.h:118 #: ../comps-f9.xml.in.h:122 -#: ../comps-f10.xml.in.h:124 +#: ../comps-f10.xml.in.h:125 msgid "Polish Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:110 #: ../comps-f8.xml.in.h:119 #: ../comps-f9.xml.in.h:123 -#: ../comps-f10.xml.in.h:125 +#: ../comps-f10.xml.in.h:126 msgid "Portuguese Support" msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f7.xml.in.h:111 #: ../comps-f8.xml.in.h:120 #: ../comps-f9.xml.in.h:124 -#: ../comps-f10.xml.in.h:126 +#: ../comps-f10.xml.in.h:127 msgid "PostgreSQL Database" msgstr "?????????????????????? PostgreSQL" #: ../comps-f7.xml.in.h:112 #: ../comps-f8.xml.in.h:121 #: ../comps-f9.xml.in.h:125 -#: ../comps-f10.xml.in.h:127 +#: ../comps-f10.xml.in.h:128 msgid "Printing Support" msgstr "???????????????????? ???????????????? ????????" #: ../comps-f7.xml.in.h:113 #: ../comps-f8.xml.in.h:122 #: ../comps-f9.xml.in.h:126 -#: ../comps-f10.xml.in.h:128 +#: ../comps-f10.xml.in.h:129 msgid "Punjabi Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:114 #: ../comps-f8.xml.in.h:123 #: ../comps-f9.xml.in.h:127 -#: ../comps-f10.xml.in.h:129 +#: ../comps-f10.xml.in.h:130 msgid "Romanian Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:115 #: ../comps-f8.xml.in.h:124 #: ../comps-f9.xml.in.h:128 -#: ../comps-f10.xml.in.h:130 +#: ../comps-f10.xml.in.h:131 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 #: ../comps-f8.xml.in.h:125 #: ../comps-f9.xml.in.h:129 -#: ../comps-f10.xml.in.h:131 +#: ../comps-f10.xml.in.h:132 msgid "Russian Support" msgstr "???????????????????? ???????????? ????????" #: ../comps-f7.xml.in.h:117 #: ../comps-f8.xml.in.h:126 #: ../comps-f9.xml.in.h:132 -#: ../comps-f10.xml.in.h:134 +#: ../comps-f10.xml.in.h:135 msgid "Samoan Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:118 #: ../comps-f8.xml.in.h:127 #: ../comps-f9.xml.in.h:133 -#: ../comps-f10.xml.in.h:135 +#: ../comps-f10.xml.in.h:136 msgid "Serbian Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:119 #: ../comps-f8.xml.in.h:128 #: ../comps-f9.xml.in.h:134 -#: ../comps-f10.xml.in.h:136 +#: ../comps-f10.xml.in.h:137 msgid "Server Configuration Tools" msgstr "???????????????????? ????????????????" #: ../comps-f7.xml.in.h:120 #: ../comps-f8.xml.in.h:129 #: ../comps-f9.xml.in.h:135 -#: ../comps-f10.xml.in.h:137 +#: ../comps-f10.xml.in.h:138 #: ../comps-el4.xml.in.h:41 #: ../comps-el5.xml.in.h:41 msgid "Servers" @@ -928,7 +928,7 @@ #: ../comps-f7.xml.in.h:121 #: ../comps-f8.xml.in.h:130 #: ../comps-f9.xml.in.h:136 -#: ../comps-f10.xml.in.h:138 +#: ../comps-f10.xml.in.h:139 #: ../comps-el4.xml.in.h:42 #: ../comps-el5.xml.in.h:42 msgid "Simple window managers that aren't part of a larger desktop environment." @@ -937,35 +937,35 @@ #: ../comps-f7.xml.in.h:122 #: ../comps-f8.xml.in.h:131 #: ../comps-f9.xml.in.h:137 -#: ../comps-f10.xml.in.h:139 +#: ../comps-f10.xml.in.h:140 msgid "Sinhala Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:123 #: ../comps-f8.xml.in.h:132 #: ../comps-f9.xml.in.h:138 -#: ../comps-f10.xml.in.h:140 +#: ../comps-f10.xml.in.h:141 msgid "Slovak Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:124 #: ../comps-f8.xml.in.h:133 #: ../comps-f9.xml.in.h:139 -#: ../comps-f10.xml.in.h:141 +#: ../comps-f10.xml.in.h:142 msgid "Slovenian Support" msgstr "???????????????????? ???????????? ????????????????????" #: ../comps-f7.xml.in.h:125 #: ../comps-f8.xml.in.h:134 #: ../comps-f9.xml.in.h:140 -#: ../comps-f10.xml.in.h:142 +#: ../comps-f10.xml.in.h:143 msgid "Smallest possible installation" msgstr "?????????????????? ????????" #: ../comps-f7.xml.in.h:126 #: ../comps-f8.xml.in.h:135 #: ../comps-f9.xml.in.h:141 -#: ../comps-f10.xml.in.h:143 +#: ../comps-f10.xml.in.h:144 #: ../comps-el4.xml.in.h:43 #: ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" @@ -974,21 +974,21 @@ #: ../comps-f7.xml.in.h:127 #: ../comps-f8.xml.in.h:136 #: ../comps-f9.xml.in.h:142 -#: ../comps-f10.xml.in.h:144 +#: ../comps-f10.xml.in.h:145 msgid "Somali Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:128 #: ../comps-f8.xml.in.h:137 #: ../comps-f9.xml.in.h:143 -#: ../comps-f10.xml.in.h:145 +#: ../comps-f10.xml.in.h:146 msgid "Sometimes called text editors, these are programs that allow you to create and edit text files. This includes Emacs and Vi." -msgstr "" +msgstr "???????????????????? ?????????? Emacs ???? Vi. ???????????????????? ?????????????? ????????. ???? ?????????????????? ???????????? ????????????????, ?????????????? ?????????????? ???????? ???? ???????????? ??????????." #: ../comps-f7.xml.in.h:129 #: ../comps-f8.xml.in.h:138 #: ../comps-f9.xml.in.h:144 -#: ../comps-f10.xml.in.h:146 +#: ../comps-f10.xml.in.h:147 #: ../comps-el4.xml.in.h:45 #: ../comps-el5.xml.in.h:45 msgid "Sound and Video" @@ -997,58 +997,58 @@ #: ../comps-f7.xml.in.h:130 #: ../comps-f8.xml.in.h:139 #: ../comps-f9.xml.in.h:145 -#: ../comps-f10.xml.in.h:147 +#: ../comps-f10.xml.in.h:148 msgid "Southern Ndebele Support" msgstr "???????????????????? ???????????? ???????????????? ????????????" #: ../comps-f7.xml.in.h:131 #: ../comps-f8.xml.in.h:140 #: ../comps-f9.xml.in.h:146 -#: ../comps-f10.xml.in.h:148 +#: ../comps-f10.xml.in.h:149 msgid "Southern Sotho Support" msgstr "???????????????????? ???????????? ?????????? ????????????" #: ../comps-f7.xml.in.h:132 #: ../comps-f8.xml.in.h:141 #: ../comps-f9.xml.in.h:147 -#: ../comps-f10.xml.in.h:149 +#: ../comps-f10.xml.in.h:150 msgid "Spanish Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:133 #: ../comps-f8.xml.in.h:142 #: ../comps-f9.xml.in.h:148 -#: ../comps-f10.xml.in.h:150 +#: ../comps-f10.xml.in.h:151 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." -msgstr "" +msgstr "?????????????????? ?????????? ?????????????????? ???????????????????? Java." #: ../comps-f7.xml.in.h:134 #: ../comps-f8.xml.in.h:143 #: ../comps-f9.xml.in.h:149 -#: ../comps-f10.xml.in.h:151 +#: ../comps-f10.xml.in.h:152 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." -msgstr "" +msgstr "?????????????????? ?????????? ?????????????????? ???????????????????? Java." #: ../comps-f7.xml.in.h:135 #: ../comps-f8.xml.in.h:144 #: ../comps-f9.xml.in.h:150 -#: ../comps-f10.xml.in.h:152 +#: ../comps-f10.xml.in.h:153 msgid "Swati Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:136 #: ../comps-f8.xml.in.h:145 #: ../comps-f9.xml.in.h:151 -#: ../comps-f10.xml.in.h:153 +#: ../comps-f10.xml.in.h:154 msgid "Swedish Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:137 #: ../comps-f8.xml.in.h:146 #: ../comps-f9.xml.in.h:152 -#: ../comps-f10.xml.in.h:154 +#: ../comps-f10.xml.in.h:155 #: ../comps-el4.xml.in.h:48 #: ../comps-el5.xml.in.h:46 msgid "System Tools" @@ -1057,28 +1057,28 @@ #: ../comps-f7.xml.in.h:138 #: ../comps-f8.xml.in.h:147 #: ../comps-f9.xml.in.h:153 -#: ../comps-f10.xml.in.h:155 +#: ../comps-f10.xml.in.h:156 msgid "Tagalog Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:139 #: ../comps-f8.xml.in.h:148 #: ../comps-f9.xml.in.h:154 -#: ../comps-f10.xml.in.h:156 +#: ../comps-f10.xml.in.h:158 msgid "Tamil Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:140 #: ../comps-f8.xml.in.h:149 #: ../comps-f9.xml.in.h:155 -#: ../comps-f10.xml.in.h:157 +#: ../comps-f10.xml.in.h:159 msgid "Telugu Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:141 #: ../comps-f8.xml.in.h:150 #: ../comps-f9.xml.in.h:156 -#: ../comps-f10.xml.in.h:158 +#: ../comps-f10.xml.in.h:160 #: ../comps-el4.xml.in.h:49 #: ../comps-el5.xml.in.h:47 msgid "Text-based Internet" @@ -1087,110 +1087,110 @@ #: ../comps-f7.xml.in.h:142 #: ../comps-f8.xml.in.h:151 #: ../comps-f9.xml.in.h:157 -#: ../comps-f10.xml.in.h:159 +#: ../comps-f10.xml.in.h:161 msgid "Thai Support" msgstr "???????????????????? ???????????? ????????????????" #: ../comps-f7.xml.in.h:143 msgid "The Eclipse Integrated Development Environment." -msgstr "" +msgstr "???????????? ???????????????????????????? ???????????????????? Eclipse." #: ../comps-f7.xml.in.h:144 #: ../comps-f8.xml.in.h:152 #: ../comps-f9.xml.in.h:158 -#: ../comps-f10.xml.in.h:160 +#: ../comps-f10.xml.in.h:162 #: ../comps-el4.xml.in.h:51 #: ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." -msgstr "" +msgstr "?????????????????? ?????????? Office suites, ???????????????????????? PDF, ???? ??????????." #: ../comps-f7.xml.in.h:145 #: ../comps-f8.xml.in.h:153 #: ../comps-f9.xml.in.h:159 -#: ../comps-f10.xml.in.h:161 +#: ../comps-f10.xml.in.h:163 msgid "The packages in this group are core libraries needed to develop applications." -msgstr "" +msgstr "???????????????????? ???? ?????????? ?????????? ???????????????????????????? ?????????????????? ???????????????????????? ?????????? ???????????? ????????????????." #: ../comps-f7.xml.in.h:146 #: ../comps-f8.xml.in.h:154 #: ../comps-f9.xml.in.h:160 -#: ../comps-f10.xml.in.h:162 +#: ../comps-f10.xml.in.h:164 #: ../comps-el4.xml.in.h:52 #: ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." -msgstr "" +msgstr "???? ?????????????????? ?????????? ????????????????, ???????????????????? ???????????? IMAP ?? SMTP -???? ???????????? ??????????." #: ../comps-f7.xml.in.h:147 #: ../comps-f8.xml.in.h:155 #: ../comps-f9.xml.in.h:161 -#: ../comps-f10.xml.in.h:163 +#: ../comps-f10.xml.in.h:165 msgid "These packages allow you to develop applications for the X Window System." -msgstr "" +msgstr "???? ?????????????????? ?????????? ????????????????, ???????????????????? ???????????????? X Window ???????? ??????????." #: ../comps-f7.xml.in.h:148 #: ../comps-f8.xml.in.h:156 #: ../comps-f9.xml.in.h:162 -#: ../comps-f10.xml.in.h:164 +#: ../comps-f10.xml.in.h:166 #: ../comps-el4.xml.in.h:53 #: ../comps-el5.xml.in.h:51 msgid "These packages are helpful when developing web applications or web pages." -msgstr "" +msgstr "???? ?????????????????? ?????????? ?????????????????? ???????????????????? ?? ?????????????????? ?????????????????? ???????? ???????????????? ??????????????." #: ../comps-f7.xml.in.h:149 #: ../comps-f8.xml.in.h:157 #: ../comps-f9.xml.in.h:163 -#: ../comps-f10.xml.in.h:165 +#: ../comps-f10.xml.in.h:167 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." -msgstr "" +msgstr "???? ?????????????????? ???????????????????????? ???????????????????? ?????????????? DHCP, Kerberos ???? NIS ?????? ?????? ????????????????." #: ../comps-f7.xml.in.h:150 #: ../comps-f8.xml.in.h:158 #: ../comps-f9.xml.in.h:164 -#: ../comps-f10.xml.in.h:166 +#: ../comps-f10.xml.in.h:168 msgid "These packages include servers for old network protocols such as rsh and telnet." -msgstr "" +msgstr "???? ?????????????????? ?????????????????????? ???? ?????????????????? ???????????????????? ?????????? ?????????????? rsh ???? telnet ?????? ?????? ????????????????." #: ../comps-f7.xml.in.h:151 #: ../comps-f8.xml.in.h:159 #: ../comps-f9.xml.in.h:165 -#: ../comps-f10.xml.in.h:167 +#: ../comps-f10.xml.in.h:169 msgid "These packages provide a virtualization environment." -msgstr "" +msgstr "???? ?????????????????? ???????????? ???????????????????? ???????????? ????????????????." #: ../comps-f7.xml.in.h:152 #: ../comps-f8.xml.in.h:160 #: ../comps-f9.xml.in.h:166 -#: ../comps-f10.xml.in.h:168 +#: ../comps-f10.xml.in.h:170 msgid "These packages provide compatibility with previous releases." -msgstr "" +msgstr "???? ?????????????????? ?????????????????? ???? ?????????????????? ???????????? ???????????? ????????????????." #: ../comps-f7.xml.in.h:153 #: ../comps-f8.xml.in.h:161 #: ../comps-f9.xml.in.h:167 -#: ../comps-f10.xml.in.h:169 +#: ../comps-f10.xml.in.h:171 msgid "These packages provide support for various locales including fonts and input methods." -msgstr "" +msgstr "???? ?????????????????? ?????????????????????? ?????????? ???????????????? ?????????????? ???? ???????????? ???? ?????????? ?????????????? ???????????? ????????????????." #: ../comps-f7.xml.in.h:154 #: ../comps-f8.xml.in.h:162 #: ../comps-f9.xml.in.h:168 -#: ../comps-f10.xml.in.h:170 +#: ../comps-f10.xml.in.h:172 msgid "These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text." -msgstr "" +msgstr "???? ?????????????????? ???????????? ????????????????, ???????????????? ?????? ?????????????? DocBook ???????? ?????????? ???? ???????? ???? ?????????????????? HTML, PDF, Postscript, ???? ?????????? ???????? ???????????? ??????????." #: ../comps-f7.xml.in.h:155 #: ../comps-f8.xml.in.h:163 #: ../comps-f9.xml.in.h:169 -#: ../comps-f10.xml.in.h:171 +#: ../comps-f10.xml.in.h:173 #: ../comps-el4.xml.in.h:55 #: ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." -msgstr "" +msgstr "???? ?????????????? ???????????? ????????????????, ???????????????????? ?????????????????? ???????????????? ?????? ?????????????? ???????? ??????????." #: ../comps-f7.xml.in.h:156 #: ../comps-f8.xml.in.h:164 #: ../comps-f9.xml.in.h:170 -#: ../comps-f10.xml.in.h:172 +#: ../comps-f10.xml.in.h:174 #: ../comps-el4.xml.in.h:56 #: ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." @@ -1199,84 +1199,84 @@ #: ../comps-f7.xml.in.h:157 #: ../comps-f8.xml.in.h:165 #: ../comps-f9.xml.in.h:171 -#: ../comps-f10.xml.in.h:173 +#: ../comps-f10.xml.in.h:175 #: ../comps-el4.xml.in.h:57 #: ../comps-el5.xml.in.h:55 msgid "These tools include core development tools such as automake, gcc, perl, python, and debuggers." -msgstr "" +msgstr "?????????????????? ?????????? ???????????????? ?????????? ?????????????? automake, gcc, perl, python, ???? debugger ?????????? ???????????????????????????? ??????????????????." #: ../comps-f7.xml.in.h:158 #: ../comps-f8.xml.in.h:166 #: ../comps-f9.xml.in.h:172 -#: ../comps-f10.xml.in.h:174 +#: ../comps-f10.xml.in.h:176 #: ../comps-el4.xml.in.h:58 #: ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." -msgstr "" +msgstr "???? ?????????? ???????????? ??????????????, ???????????????? ???????????????????? ???????????? ???????????????????? ???????????????? ???????????? ??????????." #: ../comps-f7.xml.in.h:159 #: ../comps-f8.xml.in.h:167 #: ../comps-f9.xml.in.h:173 -#: ../comps-f10.xml.in.h:175 +#: ../comps-f10.xml.in.h:177 msgid "This group contains all of Red Hat's custom server configuration tools." -msgstr "" +msgstr "???????????? ?????????????????? ?????????? ?????????? ???????????????? ???????????????????? ???????????????????? Red Hat." #: ../comps-f7.xml.in.h:160 #: ../comps-f8.xml.in.h:168 #: ../comps-f9.xml.in.h:174 -#: ../comps-f10.xml.in.h:176 +#: ../comps-f10.xml.in.h:178 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example." -msgstr "" +msgstr "???? ?????????? ?????????? ?????????????? ???????????????????? ??????????. ??????????????, ?????????? ?????????????????? ???????????????? router/firewall ???????? ???????????????? ??????????????." #: ../comps-f7.xml.in.h:161 #: ../comps-f8.xml.in.h:169 #: ../comps-f9.xml.in.h:175 -#: ../comps-f10.xml.in.h:177 +#: ../comps-f10.xml.in.h:179 #: ../comps-el4.xml.in.h:59 #: ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." -msgstr "" +msgstr "???????????? ?????????????????? ?????????? ???????????? ????. ??????????????, ???????????????????? ???????????????? ???? ???????????????????? ??????." #: ../comps-f7.xml.in.h:162 #: ../comps-f8.xml.in.h:170 #: ../comps-f9.xml.in.h:176 -#: ../comps-f10.xml.in.h:178 +#: ../comps-f10.xml.in.h:180 #: ../comps-el4.xml.in.h:60 #: ../comps-el5.xml.in.h:58 msgid "This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion." -msgstr "" +msgstr "???????????? ?????????????????? ?????????? ???????????????????? ???????? ???? ??????????????????." #: ../comps-f7.xml.in.h:163 #: ../comps-f8.xml.in.h:171 #: ../comps-f9.xml.in.h:177 -#: ../comps-f10.xml.in.h:179 +#: ../comps-f10.xml.in.h:181 #: ../comps-el4.xml.in.h:61 #: ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." -msgstr "" +msgstr "???????????? ?????????????????? ?????????? ???????????????????? ???????????????????? ???? ?????????????? ????????????????." #: ../comps-f7.xml.in.h:164 #: ../comps-f8.xml.in.h:172 #: ../comps-f9.xml.in.h:178 -#: ../comps-f10.xml.in.h:180 +#: ../comps-f10.xml.in.h:182 #: ../comps-el4.xml.in.h:62 #: ../comps-el5.xml.in.h:60 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System." -msgstr "" +msgstr "???????????? ?????????????????? ?????????? ???????????? ????. ??????????, ???????????????????? ???????????????? ???? ???????????????????? ??????. ???? ?????????????????? ???????????????? X Window ?????????????? ????????????????????." #: ../comps-f7.xml.in.h:165 #: ../comps-f8.xml.in.h:173 #: ../comps-f9.xml.in.h:179 -#: ../comps-f10.xml.in.h:181 +#: ../comps-f10.xml.in.h:183 #: ../comps-el4.xml.in.h:63 #: ../comps-el5.xml.in.h:61 msgid "This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware." -msgstr "" +msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???????????????????? ?????????????? ?????????????? ???????????????????? ???????????????? ???????????? ???? ?????????????????? ?????????????????? ?????????? ?????????????? ??????????????." #: ../comps-f7.xml.in.h:166 #: ../comps-f8.xml.in.h:174 #: ../comps-f9.xml.in.h:180 -#: ../comps-f10.xml.in.h:182 +#: ../comps-f10.xml.in.h:184 #: ../comps-el4.xml.in.h:66 #: ../comps-el5.xml.in.h:64 msgid "This group is a collection of tools and resources of Armenian environments." @@ -1285,149 +1285,149 @@ #: ../comps-f7.xml.in.h:167 #: ../comps-f8.xml.in.h:175 #: ../comps-f9.xml.in.h:181 -#: ../comps-f10.xml.in.h:183 +#: ../comps-f10.xml.in.h:185 #: ../comps-el4.xml.in.h:69 #: ../comps-el5.xml.in.h:68 msgid "This group is a collection of tools for various hardware specific utilities." -msgstr "" +msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ?????????? ?????????????????????? ???????????????????? ?????????????? ??????????????." #: ../comps-f7.xml.in.h:168 #: ../comps-f8.xml.in.h:176 #: ../comps-f9.xml.in.h:182 -#: ../comps-f10.xml.in.h:184 +#: ../comps-f10.xml.in.h:186 #: ../comps-el4.xml.in.h:70 #: ../comps-el5.xml.in.h:69 msgid "This group is a collection of various tools for the system, such as the client for connecting to SMB shares and tools to monitor network traffic." -msgstr "" +msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ?????????????? ?????????????? SMB ???? ???????????????? ???????????????? ?????????????? ???????????????? ?????????? ?????????????? ??????????????." #: ../comps-f7.xml.in.h:169 #: ../comps-f8.xml.in.h:177 #: ../comps-f9.xml.in.h:183 -#: ../comps-f10.xml.in.h:185 +#: ../comps-f10.xml.in.h:187 msgid "This package group allows you to run a DNS name server (BIND) on the system." -msgstr "" +msgstr "???? ???????????? ?????????????????? ???????????? ??????????????, ???????? ???????????????????? DNS (BIND)?????? ?????????????? ???????? ??????????." #: ../comps-f7.xml.in.h:170 #: ../comps-f8.xml.in.h:178 #: ../comps-f9.xml.in.h:184 -#: ../comps-f10.xml.in.h:186 +#: ../comps-f10.xml.in.h:188 msgid "This package group allows you to share files between Linux and MS Windows(tm) systems." -msgstr "" +msgstr "???? ???????????? ?????????????????? ???????????? ??????????????, ???????????????? ?????????? ???????????????????? Linux ???? MS Windows ???????????????? ??????????." #: ../comps-f7.xml.in.h:171 #: ../comps-f8.xml.in.h:179 #: ../comps-f9.xml.in.h:185 -#: ../comps-f10.xml.in.h:187 +#: ../comps-f10.xml.in.h:189 msgid "This package group contains packages useful for use with MySQL." -msgstr "" +msgstr "???? ???????????? ?????????????? ?????????? ???????????????????? ???????????????? ?????????? ?????????????????? ???????????????? MySQL." #: ../comps-f7.xml.in.h:172 #: ../comps-f8.xml.in.h:180 #: ../comps-f9.xml.in.h:186 -#: ../comps-f10.xml.in.h:188 +#: ../comps-f10.xml.in.h:190 msgid "This package group includes packages useful for use with Postgresql." -msgstr "" +msgstr "???? ???????????? ?????????????? ?????????? ???????????????????? ???????????????? ?????????? ?????????????????? ???????????????? Postgresql." #: ../comps-f7.xml.in.h:173 #: ../comps-f8.xml.in.h:181 #: ../comps-f9.xml.in.h:187 -#: ../comps-f10.xml.in.h:189 +#: ../comps-f10.xml.in.h:191 msgid "Tibetan Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:174 #: ../comps-f8.xml.in.h:182 #: ../comps-f9.xml.in.h:188 -#: ../comps-f10.xml.in.h:190 +#: ../comps-f10.xml.in.h:192 msgid "Tonga Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:175 #: ../comps-f8.xml.in.h:183 #: ../comps-f9.xml.in.h:189 -#: ../comps-f10.xml.in.h:191 +#: ../comps-f10.xml.in.h:193 #: ../comps-el4.xml.in.h:71 #: ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" -msgstr "" +msgstr "?????????????? ???? ???????????????????? ???????????? ?????????? ???????????????????????? Fedora" #: ../comps-f7.xml.in.h:176 #: ../comps-f8.xml.in.h:184 #: ../comps-f9.xml.in.h:190 -#: ../comps-f10.xml.in.h:192 +#: ../comps-f10.xml.in.h:194 msgid "Tsonga Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:177 #: ../comps-f8.xml.in.h:185 #: ../comps-f9.xml.in.h:191 -#: ../comps-f10.xml.in.h:193 +#: ../comps-f10.xml.in.h:195 msgid "Tswana Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f7.xml.in.h:178 #: ../comps-f8.xml.in.h:186 #: ../comps-f9.xml.in.h:192 -#: ../comps-f10.xml.in.h:194 +#: ../comps-f10.xml.in.h:196 msgid "Turkish Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:179 #: ../comps-f8.xml.in.h:187 #: ../comps-f9.xml.in.h:193 -#: ../comps-f10.xml.in.h:195 +#: ../comps-f10.xml.in.h:197 msgid "Ukrainian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:180 #: ../comps-f8.xml.in.h:188 #: ../comps-f9.xml.in.h:194 -#: ../comps-f10.xml.in.h:196 +#: ../comps-f10.xml.in.h:198 msgid "Urdu Support" msgstr "???????????????????? ???????????? ????????" #: ../comps-f7.xml.in.h:181 #: ../comps-f8.xml.in.h:189 #: ../comps-f9.xml.in.h:195 -#: ../comps-f10.xml.in.h:197 +#: ../comps-f10.xml.in.h:199 #: ../comps-el4.xml.in.h:72 #: ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." -msgstr "" +msgstr "?????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:182 #: ../comps-f8.xml.in.h:190 #: ../comps-f9.xml.in.h:196 -#: ../comps-f10.xml.in.h:198 +#: ../comps-f10.xml.in.h:200 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." -msgstr "" +msgstr "???????????????????? ?????????????? ?????????? ????????????????." #: ../comps-f7.xml.in.h:183 #: ../comps-f8.xml.in.h:191 #: ../comps-f9.xml.in.h:197 -#: ../comps-f10.xml.in.h:199 +#: ../comps-f10.xml.in.h:201 msgid "Venda Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:184 #: ../comps-f8.xml.in.h:192 #: ../comps-f9.xml.in.h:198 -#: ../comps-f10.xml.in.h:200 +#: ../comps-f10.xml.in.h:202 msgid "Vietnamese Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f7.xml.in.h:185 #: ../comps-f8.xml.in.h:193 #: ../comps-f9.xml.in.h:199 -#: ../comps-f10.xml.in.h:201 +#: ../comps-f10.xml.in.h:203 msgid "Virtualization" msgstr "???????????????????? ????????????????" #: ../comps-f7.xml.in.h:186 #: ../comps-f8.xml.in.h:194 #: ../comps-f9.xml.in.h:201 -#: ../comps-f10.xml.in.h:203 +#: ../comps-f10.xml.in.h:205 #: ../comps-el4.xml.in.h:73 #: ../comps-el5.xml.in.h:73 msgid "Web Development" @@ -1436,7 +1436,7 @@ #: ../comps-f7.xml.in.h:187 #: ../comps-f8.xml.in.h:195 #: ../comps-f9.xml.in.h:202 -#: ../comps-f10.xml.in.h:204 +#: ../comps-f10.xml.in.h:206 #: ../comps-el4.xml.in.h:74 #: ../comps-el5.xml.in.h:74 msgid "Web Server" @@ -1445,14 +1445,14 @@ #: ../comps-f7.xml.in.h:188 #: ../comps-f8.xml.in.h:196 #: ../comps-f9.xml.in.h:203 -#: ../comps-f10.xml.in.h:205 +#: ../comps-f10.xml.in.h:207 msgid "Welsh Support" msgstr "???????????????????? ???????????? ??????????" #: ../comps-f7.xml.in.h:189 #: ../comps-f8.xml.in.h:197 #: ../comps-f9.xml.in.h:204 -#: ../comps-f10.xml.in.h:206 +#: ../comps-f10.xml.in.h:208 #: ../comps-el4.xml.in.h:75 #: ../comps-el5.xml.in.h:75 msgid "Window Managers" @@ -1461,21 +1461,21 @@ #: ../comps-f7.xml.in.h:190 #: ../comps-f8.xml.in.h:198 #: ../comps-f9.xml.in.h:205 -#: ../comps-f10.xml.in.h:207 +#: ../comps-f10.xml.in.h:209 msgid "Windows File Server" msgstr "???????????????????? ?????????????? Windows" #: ../comps-f7.xml.in.h:191 #: ../comps-f8.xml.in.h:199 #: ../comps-f9.xml.in.h:206 -#: ../comps-f10.xml.in.h:208 +#: ../comps-f10.xml.in.h:210 msgid "X Software Development" msgstr "???????????????????????????? ???????????????????? ??" #: ../comps-f7.xml.in.h:192 #: ../comps-f8.xml.in.h:200 #: ../comps-f9.xml.in.h:207 -#: ../comps-f10.xml.in.h:209 +#: ../comps-f10.xml.in.h:211 #: ../comps-el4.xml.in.h:76 #: ../comps-el5.xml.in.h:76 msgid "X Window System" @@ -1484,28 +1484,28 @@ #: ../comps-f7.xml.in.h:193 #: ../comps-f8.xml.in.h:201 #: ../comps-f9.xml.in.h:208 -#: ../comps-f10.xml.in.h:210 +#: ../comps-f10.xml.in.h:212 msgid "XFCE" msgstr "XFCE" #: ../comps-f7.xml.in.h:194 #: ../comps-f8.xml.in.h:202 #: ../comps-f9.xml.in.h:209 -#: ../comps-f10.xml.in.h:211 +#: ../comps-f10.xml.in.h:213 msgid "XFCE Software Development" msgstr "???????????????????????????? ???????????????????? XFCE" #: ../comps-f7.xml.in.h:195 #: ../comps-f8.xml.in.h:203 #: ../comps-f9.xml.in.h:210 -#: ../comps-f10.xml.in.h:212 +#: ../comps-f10.xml.in.h:214 msgid "Xhosa Support" msgstr "???????????????????? ???????????? ????????" #: ../comps-f7.xml.in.h:196 #: ../comps-f8.xml.in.h:204 #: ../comps-f9.xml.in.h:211 -#: ../comps-f10.xml.in.h:213 +#: ../comps-f10.xml.in.h:215 msgid "Zulu Support" msgstr "???????????????????? ???????????? ????????" @@ -1513,7 +1513,7 @@ #: ../comps-f9.xml.in.h:21 #: ../comps-f10.xml.in.h:21 msgid "Buildsystem building group" -msgstr "" +msgstr "???????????? ?????????????????? Buildsystem" #: ../comps-f8.xml.in.h:48 #: ../comps-f9.xml.in.h:49 @@ -1531,43 +1531,43 @@ #: ../comps-f9.xml.in.h:54 #: ../comps-f10.xml.in.h:54 msgid "Fonts packages for rendering text on the desktop." -msgstr "" +msgstr "???????????? ?????????? ?????????????? ???????? ?????? ???????? ????????" #: ../comps-f8.xml.in.h:79 #: ../comps-f9.xml.in.h:80 -#: ../comps-f10.xml.in.h:82 +#: ../comps-f10.xml.in.h:83 msgid "Integrated Development Environments based on Eclipse." msgstr "???????????????? ???????????????????????????? ?????????????????? ?????????? Eclipse." #: ../comps-f8.xml.in.h:95 #: ../comps-f9.xml.in.h:97 -#: ../comps-f10.xml.in.h:99 +#: ../comps-f10.xml.in.h:100 msgid "Legacy Fonts" msgstr "?????????????? ??????????" #: ../comps-f8.xml.in.h:100 #: ../comps-f9.xml.in.h:102 -#: ../comps-f10.xml.in.h:104 +#: ../comps-f10.xml.in.h:105 msgid "Low Saxon Support" msgstr "???????????????????? ???????????? ?????????????? ????????" #: ../comps-f8.xml.in.h:106 #: ../comps-f9.xml.in.h:109 -#: ../comps-f10.xml.in.h:111 +#: ../comps-f10.xml.in.h:112 msgid "Mongolian Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f8.xml.in.h:108 #: ../comps-f9.xml.in.h:111 -#: ../comps-f10.xml.in.h:113 +#: ../comps-f10.xml.in.h:114 msgid "Nepali Support" msgstr "???????????????????? ???????????? ????????????" #: ../comps-f8.xml.in.h:114 #: ../comps-f9.xml.in.h:118 -#: ../comps-f10.xml.in.h:120 +#: ../comps-f10.xml.in.h:121 msgid "Older bitmap and vector fonts packages" -msgstr "" +msgstr "?????????????? ???????????? bitmap ???? vector" #: ../comps-f9.xml.in.h:44 #: ../comps-f10.xml.in.h:44 @@ -1575,43 +1575,51 @@ msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f9.xml.in.h:91 -#: ../comps-f10.xml.in.h:93 +#: ../comps-f10.xml.in.h:94 msgid "Kashubian Support" msgstr "???????????????????? ???????????? ??????????????????" #: ../comps-f9.xml.in.h:103 -#: ../comps-f10.xml.in.h:105 +#: ../comps-f10.xml.in.h:106 msgid "Macedonian Support" msgstr "???????????????????? ???????????? ??????????????" #: ../comps-f9.xml.in.h:114 -#: ../comps-f10.xml.in.h:116 +#: ../comps-f10.xml.in.h:117 msgid "Northern Sami Support" msgstr "???????????????????? ???????????? ?????????? ????????????" #: ../comps-f9.xml.in.h:130 -#: ../comps-f10.xml.in.h:132 +#: ../comps-f10.xml.in.h:133 msgid "SUGAR Desktop Environment" msgstr "???????????? ???????? ?????????? SUGAR" #: ../comps-f9.xml.in.h:131 -#: ../comps-f10.xml.in.h:133 +#: ../comps-f10.xml.in.h:134 msgid "SUGAR is the desktop environment developed for the OLPC XO." msgstr "SUGAR ???? ???????????? ???????? ??????????, ???? ?????????? OLPC XO ?????????? ?????????? ??????." #: ../comps-f9.xml.in.h:200 -#: ../comps-f10.xml.in.h:202 +#: ../comps-f10.xml.in.h:204 msgid "Walloon Support" msgstr "???????????????????? ???????????? ????????????" -#: ../comps-f10.xml.in.h:75 +#: ../comps-f10.xml.in.h:70 +msgid "Haskell" +msgstr "Haskell" + +#: ../comps-f10.xml.in.h:76 msgid "Input Methods" msgstr "???????????????? ????????????????" -#: ../comps-f10.xml.in.h:76 +#: ../comps-f10.xml.in.h:77 msgid "Input method packages for the input of international text." msgstr "???????????????????? ???????????? ???????????????? ?????????? ???????????? ?????????????? ??????????????????????." +#: ../comps-f10.xml.in.h:157 +msgid "Tajik Support" +msgstr "???????????????????? ???????????? ????????????" + #: ../comps-el4.xml.in.h:3 #: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" @@ -1635,7 +1643,7 @@ #: ../comps-el4.xml.in.h:44 #: ../comps-el5.xml.in.h:44 msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." -msgstr "" +msgstr "???????????????????? ?????????? Emacs ???? Vi. ???????????????????? ?????????????? ????????. ???? ?????????????????? ???????????? ????????????????, ?????????????? ?????????????? ???????? ???? ???????????? ??????????." #: ../comps-el4.xml.in.h:50 #: ../comps-el5.xml.in.h:48 @@ -1645,27 +1653,27 @@ #: ../comps-el4.xml.in.h:54 #: ../comps-el5.xml.in.h:52 msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." -msgstr "" +msgstr "???? ?????????????????? ???????????? ????????????????, ???????????????? ?????? ?????????????? DocBook ???????? ?????????? ???? ???????? ???? ?????????????????? HTML, PDF, Postscript, ???? ?????????? ???????? ???????????? ??????????." #: ../comps-el4.xml.in.h:64 #: ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" -msgstr "???? ?????????? ?????????????? ???????????????????????? ???????????????? ?????????? ?????????????????? ???????????? ??????????????." +msgstr "???? ?????????? ?????????? ?????????????? ???????????????????????? ???????????????? ?????????? ?????????????????? ???????????? ??????????????." #: ../comps-el4.xml.in.h:65 #: ../comps-el5.xml.in.h:63 msgid "This group is a collection of tools and resources of Arabic environments." -msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." +msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." #: ../comps-el4.xml.in.h:67 #: ../comps-el5.xml.in.h:66 msgid "This group is a collection of tools and resources of Hebrew environments." -msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." +msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." #: ../comps-el4.xml.in.h:68 #: ../comps-el5.xml.in.h:67 msgid "This group is a collection of tools and resources of Japanese environments." -msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." +msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ?????????? ??????????????." #: ../comps-el4.xml.in.h:77 #: ../comps-el5.xml.in.h:77 @@ -1674,5 +1682,5 @@ #: ../comps-el5.xml.in.h:65 msgid "This group is a collection of tools and resources of Czech environments." -msgstr "???? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ???????? ??????????????." +msgstr "???? ?????????? ?????????? ?????????????? ?????????????? ???? ?????????????????? ???????????? ???????????? ???????? ??????????????." From fedora-extras-commits at redhat.com Sat Jul 19 11:37:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:37:37 +0000 Subject: [pkgdb] sip: kkofler has requested watchbugzilla Message-ID: <200807191137.m6JBbbFv001252@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on sip (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:37:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:37:49 +0000 Subject: [pkgdb] sip: kkofler has requested commit Message-ID: <200807191137.m6JBbbG0001252@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on sip (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:37:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:37:45 +0000 Subject: [pkgdb] sip: kkofler has requested watchcommits Message-ID: <200807191137.m6JBbuEl001281@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on sip (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:37:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:37:57 +0000 Subject: [pkgdb] sip: kkofler has requested watchbugzilla Message-ID: <200807191137.m6JBbbG3001252@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on sip (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:38:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:38:00 +0000 Subject: [pkgdb] sip: kkofler has requested watchcommits Message-ID: <200807191138.m6JBc0dP001347@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on sip (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:38:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:38:03 +0000 Subject: [pkgdb] sip: kkofler has requested commit Message-ID: <200807191138.m6JBc3ft001366@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on sip (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:38:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:38:17 +0000 Subject: [pkgdb] sip: kkofler has requested watchbugzilla Message-ID: <200807191138.m6JBcIYN001413@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on sip (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:38:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:38:23 +0000 Subject: [pkgdb] sip: kkofler has requested watchcommits Message-ID: <200807191138.m6JBbuEo001281@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on sip (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:38:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 11:38:27 +0000 Subject: [pkgdb] sip: kkofler has requested commit Message-ID: <200807191138.m6JBc0dS001347@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on sip (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sip From fedora-extras-commits at redhat.com Sat Jul 19 11:48:01 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sat, 19 Jul 2008 11:48:01 GMT Subject: rpms/muine/devel sources, 1.5, 1.6 muine.spec, 1.24, 1.25 .cvsignore, 1.5, 1.6 Message-ID: <200807191148.m6JBm1xC004594@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/muine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4551 Modified Files: sources muine.spec .cvsignore Log Message: * Sat Jul 19 2008 Alex Lancaster - 0.8.9-1 - Update to pre-release upstream (0.8.9) to fix broken deps - Add BR: intltools Index: sources =================================================================== RCS file: /cvs/extras/rpms/muine/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Oct 2007 17:50:22 -0000 1.5 +++ sources 19 Jul 2008 11:46:53 -0000 1.6 @@ -1 +1 @@ -0bf318424d35241525df701e107dd6b1 muine-0.8.8.tar.gz +8ea9dda9067789c5fded6e4fd63043e8 muine-0.8.9.tar.gz Index: muine.spec =================================================================== RCS file: /cvs/extras/rpms/muine/devel/muine.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- muine.spec 4 Jun 2008 15:25:58 -0000 1.24 +++ muine.spec 19 Jul 2008 11:46:53 -0000 1.25 @@ -1,6 +1,6 @@ Name: muine -Version: 0.8.8 -Release: 10%{?dist} +Version: 0.8.9 +Release: 1%{?dist} Summary: Music Player for GNOME ExcludeArch: ppc64 @@ -19,7 +19,7 @@ BuildRequires: libid3tag-devel, dbus-sharp-devel BuildRequires: libvorbis-devel, flac-devel BuildRequires: perl-XML-Parser -BuildRequires: desktop-file-utils, gettext +BuildRequires: desktop-file-utils, gettext, intltool Requires: mono-core, mono-web, gtk-sharp2 Requires(pre): GConf2 @@ -126,6 +126,10 @@ %{_libdir}/muine/*.a %changelog +* Sat Jul 19 2008 Alex Lancaster - 0.8.9-1 +- Update to pre-release upstream (0.8.9) to fix broken deps +- Add BR: intltools + * Wed Jun 04 2008 Sindre Pedersen Bj??rdal - 0.8.8-10 - rebuild for dependancies @@ -135,56 +139,78 @@ * Thu Feb 28 2008 Sindre Pedersen Bj??rdal - 0.8.8-8 - Trying once more to really fix the mono includes problem + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.8-7 - Autorebuild for GCC 4.3 * Tue Jan 22 2008 Sindre Pedersen Bj??rdal - 0.8.8-6 - Don't remove mono provides after all, removes needed stuff + * Tue Jan 22 2008 Sindre Pedersen Bj??rdal - 0.8.8-5 - Remove bogus mono provides, #429171 + * Fri Jan 18 2008 Sindre Pedersen Bj??rdal - 0.8.8-4 - Add ndesk-dbus dependencies, use system ndesk-dbus + * Sun Oct 21 2007 Sindre Pedersen Bj??rdal - 0.8.8-1 - New release - Removed obsolete patches + * Sun Mar 25 2007 Sindre Pedersen Bj??rdal - 0.8.7-3 - Add unowned directories, fix #233885 + * Mon Feb 26 2007 Sindre Pedersen Bj??rdal - 0.8.7-2 - Add patches to make build work with flac 1.1.3 + * Mon Jan 22 2007 Sindre Pedersen Bj??rdal - 0.8.7-1 - Update to 0.8.7 - Remove obsoleted dbus-sharp dependency - Update files list to reflect changes + * Mon Nov 13 2006 Sindre Pedersen Bj??rdal - 0.8.6-2 - Add patch to fix trayicon transparency + * Mon Nov 13 2006 Sindre Pedersen Bj??rdal - 0.8.6-1 - New release - Add gtk icon cache scriplet for new icons + * Fri Sep 29 2006 Sindre Pedersen Bj??rdal - 0.8.5-7 - Removed replacement of libdir + * Fri Sep 15 2006 Sindre Pedersen Bj??rdal - 0.8.5-6 - Add missing dbus-sharp-devel dependency + * Fri Sep 15 2006 Sindre Pedersen Bj??rdal - 0.8.5-5 - Add missing gnome-sharp-devel depdendency + * Fri Sep 15 2006 Sindre Pedersen Bj??rdal - 0.8.5-3 - Add missing gtk2-sharp-devel dependency + * Tue Sep 12 2006 Sindre Pedersen Bj??rdal - 0.8.5-2 - Add missing perl-XML-Parser dependency to fix build + * Tue Jun 20 2006 Sindre Pedersen Bj??rdal - 0.8.5-1 - Bump version to 0.8.5 + * Sun Apr 02 2006 Sindre Pedersen Bj??rdal - 0.8.4-7 - Remove epoch in -devel Requires + * Tue Mar 23 2006 Sindre Pedersen Bj??rdal - 0.8.4-6 - Add missing mono-web dependency + * Tue Mar 14 2006 Sindre Pedersen Bj??rdal - 0.8.4-5 - Patch added to really fix the x86_64 issue + * Mon Mar 13 2006 Sindre Pedersen Bj??rdal - 0.8.4-4 - Replace _libdir with _prefix/lib/ for 64-bit + * Mon Mar 06 2006 Sindre Pedersen Bj??rdal - 0.8.4-3 - Include trayicon by default - Fix GConf scriptlets - Create -devel package for devel files + * Tue Feb 16 2006 Sindre Pedersen Bj??rdal - 0.8.4-2 - Remove Dashboard plugin, as dashboard doesn't exist yet. + * Mon Jan 30 2006 Sindre Pedersen Bj??rdal - 0.8.4-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/muine/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Oct 2007 17:50:22 -0000 1.5 +++ .cvsignore 19 Jul 2008 11:46:53 -0000 1.6 @@ -1 +1 @@ -muine-0.8.8.tar.gz +muine-0.8.9.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 11:51:25 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 11:51:25 GMT Subject: rpms/rpl/devel .cvsignore,1.2,1.3 rpl.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200807191151.m6JBpPBI004861@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rpl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4766 Modified Files: .cvsignore rpl.spec sources Log Message: Update to version 1.5.5 Use new upstream distribution site (Sourceforge) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2006 11:01:56 -0000 1.2 +++ .cvsignore 19 Jul 2008 11:50:15 -0000 1.3 @@ -1 +1 @@ -rpl_1.5.3.tar.gz +rpl-1.5.5.tar.gz Index: rpl.spec =================================================================== RCS file: /cvs/extras/rpms/rpl/devel/rpl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rpl.spec 19 Aug 2007 11:35:26 -0000 1.3 +++ rpl.spec 19 Jul 2008 11:50:15 -0000 1.4 @@ -1,12 +1,12 @@ Name: rpl -Version: 1.5.3 -Release: 4%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: Intelligent recursive search/replace utility Group: Applications/Text License: GPLv2+ -URL: http://packages.qa.debian.org/r/rpl.html -Source0: http://ftp.debian.org/debian/pool/main/r/rpl/rpl_%{version}.tar.gz +URL: http://rpl.sourceforge.net/ +Source0: http://downloads.sourceforge.net/rpl/rpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,10 @@ %changelog +* Sat Jul 19 2008 Tim Jackson 1.5.5-1 +- Update to version 1.5.5 +- Move to new upstream distribution location (Sourceforge) + * Sun Sep 10 2006 Tim Jackson 1.5.3-4 - Requires: python in place of env/python hack Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2006 11:01:56 -0000 1.2 +++ sources 19 Jul 2008 11:50:15 -0000 1.3 @@ -1 +1 @@ -7187b2c650e1522a82242c2c7f5e7123 rpl_1.5.3.tar.gz +0db1569ec6e5f4908bf8a25b183eb9a4 rpl-1.5.5.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 11:51:35 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 11:51:35 GMT Subject: rpms/qt4/F-8 qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch, NONE, 1.1 qt-x11-opensource-src-4.4.0-qgtkstyle.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 Makefile, 1.1, 1.2 qt-copy-patches-svn_checkout.sh, 1.1, 1.2 qt4.csh, 1.1, 1.2 qt4.sh, 1.1, 1.2 qt4.spec, 1.78, 1.79 qtconfig.desktop, 1.5, 1.6 sources, 1.20, 1.21 qt-x11-opensource-src-4.3.0-qassistant-qt4.patch, 1.1, NONE qt-x11-opensource-src-4.3.4-as_IN-437440.patch, 1.1, NONE qt-x11-opensource-src-4.3.4-openssl.patch, 1.1, NONE qt4-sparc64-qvector.patch, 1.1, NONE qt4-wrapper.sh, 1.4, NONE Message-ID: <200807191151.m6JBpZCg004922@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4783/F-8 Modified Files: .cvsignore Makefile qt-copy-patches-svn_checkout.sh qt4.csh qt4.sh qt4.spec qtconfig.desktop sources Added Files: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch qt-x11-opensource-src-4.4.0-qgtkstyle.patch Removed Files: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch qt-x11-opensource-src-4.3.4-as_IN-437440.patch qt-x11-opensource-src-4.3.4-openssl.patch qt4-sparc64-qvector.patch qt4-wrapper.sh Log Message: Qt 4.4 for F8 qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch: --- NEW FILE qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch --- diff -ur qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp --- qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2008-04-02 18:33:48.000000000 +0200 +++ qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp 2008-04-08 04:37:45.000000000 +0200 @@ -552,7 +552,7 @@ None, None, None, None, None, None, None, None, - None, None, None, None, + Below, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, @@ -1169,7 +1169,7 @@ HB_Script script = item->item.script; assert(script >= HB_Script_Devanagari && script <= HB_Script_Sinhala); const unsigned short script_base = 0x0900 + 0x80*(script-HB_Script_Devanagari); - const unsigned short ra = script_base + 0x30; + unsigned short ra = script_base + 0x30; const unsigned short halant = script_base + 0x4d; const unsigned short nukta = script_base + 0x3c; bool control = false; @@ -1212,6 +1212,19 @@ HB_UChar16 *uc = reordered; bool beginsWithRa = false; + // Exception in Bengali Script + // + // Bengali script supports two languages bengali and assamese + // Unfortunately for both languages there is different ra defined in same script chart + // for Bengali it ra is 'Base+ 0x30' and for assamese 'Base+0x70' + // Base is same 0x0980 + // To handle this exception we need to change ra to from const to normal variable + // and aslo need to change ra to 'Base+0x70' whenever we will get assamese language + //character in data + if((script == HB_Script_Bengali) && (*uc==0x09F0)){ + ra = script_base + 0x70; + } + // Rule 1: find base consonant // // The shaping engine finds the base consonant of the qt-x11-opensource-src-4.4.0-qgtkstyle.patch: --- NEW FILE qt-x11-opensource-src-4.4.0-qgtkstyle.patch --- diff -ur qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp --- qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp 2008-04-28 15:11:18.000000000 +0200 +++ qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp 2008-05-27 05:43:57.000000000 +0200 @@ -2262,9 +2262,11 @@ QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows")); break; case DE_GNOME: - if (X11->use_xrender) - QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks")); - else + if (X11->use_xrender) { + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("gtk")); + if (!QApplicationPrivate::app_style) + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks")); + } else QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows")); break; case DE_CDE: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 4 Jun 2008 17:46:16 -0000 1.24 +++ .cvsignore 19 Jul 2008 11:50:28 -0000 1.25 @@ -1,6 +1,4 @@ hi128-app-qt4-logo.png hi48-app-qt4-logo.png -qt-copy-patches-20080305svn.tar.bz2 -qt-x11-opensource-src-4.3.4.tar.gz -qt-copy-patches-20080528svn.tar.bz2 -qt-x11-opensource-src-4.3.5.tar.gz +qt-x11-opensource-src-4.4.0.tar.bz2 +qt-copy-patches-20080711svn.tar.bz2 Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 24 May 2006 14:04:36 -0000 1.1 +++ Makefile 19 Jul 2008 11:50:28 -0000 1.2 @@ -1,6 +1,6 @@ -# Makefile for source rpm: qt4 +# Makefile for source rpm: qt # $Id$ -NAME := qt4 +NAME := qt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common @@ -10,7 +10,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) -# attept a checkout +# attempt a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef Index: qt-copy-patches-svn_checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt-copy-patches-svn_checkout.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt-copy-patches-svn_checkout.sh 16 Apr 2008 15:54:29 -0000 1.1 +++ qt-copy-patches-svn_checkout.sh 19 Jul 2008 11:50:28 -0000 1.2 @@ -7,8 +7,8 @@ rm -rf $EXPORT_DIR # app -svn export --non-recursive svn://anonsvn.kde.org/home/kde/branches/qt/4.3 $EXPORT_DIR/ -svn export svn://anonsvn.kde.org/home/kde/branches/qt/4.3/patches $EXPORT_DIR/patches +svn export --non-recursive svn://anonsvn.kde.org/home/kde/trunk/qt-copy $EXPORT_DIR/ +svn export svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches $EXPORT_DIR/patches pushd $EXPORT_DIR rm -f ../qt-copy-patches-${DATE}svn.tar.bz2 Index: qt4.csh =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.csh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4.csh 28 Feb 2007 17:28:01 -0000 1.1 +++ qt4.csh 19 Jul 2008 11:50:28 -0000 1.2 @@ -1,8 +1,8 @@ # Qt4 initialization script (csh) -if ( $?QMAKESPEC ) then +if ( $?QT4DIR ) then exit endif -setenv QMAKESPEC @@QMAKESPEC@@ - +setenv QT4DIR `/usr/bin/pkg-config --variable=prefix Qt` +setenv QT4DOCDIR `/usr/bin/pkg-config --variable=docdir Qt` Index: qt4.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4.sh 28 Feb 2007 17:28:01 -0000 1.1 +++ qt4.sh 19 Jul 2008 11:50:28 -0000 1.2 @@ -1,8 +1,9 @@ # Qt4 initialization script (sh) -if [ -z "$QMAKESPEC" ] ; then - QMAKESPEC=@@QMAKESPEC@@ - export QMAKESPEC +if [ -z "$QT4DIR" ] ; then + QT4DIR=`/usr/bin/pkg-config --variable=prefix Qt` + QT4DOCDIR=`/usr/bin/pkg-config --variable=docdir Qt` + export QT4DIR QT4DOCDIR fi Index: qt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- qt4.spec 18 Jun 2008 03:40:31 -0000 1.78 +++ qt4.spec 19 Jul 2008 11:50:28 -0000 1.79 @@ -7,14 +7,14 @@ %else Name: qt4 %endif -Version: 4.3.5 -Release: 2%{?dist} +Version: 4.4.0 +Release: 13%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL Group: System Environment/Libraries Url: http://www.trolltech.com/products/qt/ -Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz +Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{name}" != "qt4" @@ -29,28 +29,22 @@ %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc Source5: qconfig-multilib.h -# search for assistant-qt4 instead of (qt3's) assistant in $PATH -Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch # multilib hacks Patch2: qt-x11-opensource-src-4.2.2-multilib.patch -Patch5: qt-x11-opensource-src-4.3.4-as_IN-437440.patch -# look for OpenSSL using versioned sonames -Patch6: qt-x11-opensource-src-4.3.4-openssl.patch -# Fix sparc64 compile -Patch7: qt4-sparc64-qvector.patch +Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch # kill hardcoded font substitutions (#447298) Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch -# -Patch9: qt-x11-fix-combobox-window-type.patch +# under GNOME, default to QGtkStyle if available +# (otherwise fall back to QCleanlooksStyle) +Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch ## qt-copy patches -%define qt_copy 20080528 +%define qt_copy 20080711 Source1: qt-copy-patches-svn_checkout.sh -Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2 +%{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} %{?qt_copy:Provides: qt4-copy = %{qt_copy}} -Source10: qt4-wrapper.sh Source11: qt4.sh Source12: qt4.csh @@ -68,14 +62,20 @@ # set to -no-sql- to disable # set to -qt-sql- to enable *in* qt library %define mysql -plugin-sql-mysql -%define odbc -plugin-sql-odbc -%define psql -plugin-sql-psql -%define sqlite -plugin-sql-sqlite +%define odbc -plugin-sql-odbc +%define psql -plugin-sql-psql +%define sqlite -plugin-sql-sqlite +# FIXME: building -no-phonon currently busted, build fails -- Rex +#define phonon -phonon -gstreamer +%define webkit -webkit # undefine to disable these -%define nas -system-nas-sound +#define nas -system-nas-sound %if 0%{?fedora} > 4 || 0%{?rhel} > 4 -%define qdbus -qdbus +# link dbus +%define dbus -dbus-linked +# dlopen dbus +#define dbus -dbus BuildRequires: dbus-devel >= 0.62 %endif @@ -107,11 +107,11 @@ BuildRequires: libmng-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: libungif-devel BuildRequires: freetype-devel BuildRequires: zlib-devel BuildRequires: glib2-devel BuildRequires: openssl-devel +%{?phonon:BuildRequires: gstreamer-devel >= 0.10.12, gstreamer-plugins-base-devel} ## In theory, should be as simple as: #define x_deps libGL-devel libGLU-devel @@ -132,18 +132,18 @@ %if "%{?psql}" != "-no-sql-psql" BuildRequires: postgresql-devel +# added deps to workaround http://bugzilla.redhat.com/440673 +BuildRequires: krb5-devel libxslt-devel openssl-devel pam-devel readline-devel zlib-devel %endif %if "%{?odbc}" != "-no-sql-odbc" BuildRequires: unixODBC-devel %endif -%if "%{?sqlite:1}" != "-no-sql-sqlite" -%if 0%{?fedora} > 2 +%if "%{?sqlite}" != "-no-sql-sqlite" %define _system_sqlite -system-sqlite BuildRequires: sqlite-devel %endif -%endif Obsoletes: qt4-config < %{version}-%{release} Provides: qt4-config = %{version}-%{release} @@ -165,6 +165,15 @@ Requires: libpng-devel Requires: libjpeg-devel Requires: pkgconfig +%if 0%{?webkit:1} +Obsoletes: WebKit-qt-devel < 1.0.0-1 +Provides: WebKit-qt-devel = 1.0.0-1 +%endif +# we strip these from the .pc files to avoid the bogus deps +# -openssl-linked ? -- Rex +#Requires: openssl-devel +# -dbus-linked ? -- Rex +#Requires: dbus-devel Obsoletes: qt4-designer < %{version}-%{release} Provides: qt4-designer = %{version}-%{release} %if "%{name}" != "qt4" @@ -219,6 +228,16 @@ %description mysql %{summary}. +%package phonon-devel +Summary: Phonon development files for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +# FIXME +Conflicts: kdelibs4-devel < 4.1 + +%description phonon-devel +%{summary}. + %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries @@ -250,12 +269,15 @@ %package x11 Summary: Qt GUI-related libraries Group: System Environment/Libraries +%if 0%{?webkit:1} +Obsoletes: WebKit-qt < 1.0.0-1 +Provides: WebKit-qt = 1.0.0-1 +%endif Provides: qt4-assistant = %{version}-%{release} %if "%{name}" != "qt4" Provides: %{name}-assistant = %{version}-%{release} %endif Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: redhat-rpm-config rpm %if "%{name}" != "qt4" Obsoletes: qt4-x11 < %{version}-%{release} Provides: qt4-x11 = %{version}-%{release} @@ -267,31 +289,21 @@ %prep %if "%{?snap:1}" == "1" -%setup -q -n qt-x11%{?preview}-opensource-src-%{version}-%{snap} +%setup -q -n qt-x11-opensource-src-%{vesion}-%{snap} %else -%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta} %{?qt_copy:-a 2} +%setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2} %endif %if 0%{?qt_copy:1} -# dome don't apply atm, some/most of these are already included -- Rex -echo "0176" >> patches/DISABLED - test -x apply_patches && ./apply_patches %endif -%patch1 -p1 -b .assistant4 # don't use -b on mkspec files, else they get installed too. +# multilib hacks no longer required %patch2 -p1 %patch5 -p1 -b .bz#437440-as_IN-437440 -%patch6 -p1 -b .openssl -# SHLIB_VERSION_NUMBER is wrong on F8 and older -# 0.9.8b is the version in both F7 and F8 -%if 0%{?fedora} < 9 -sed -i -e 's/SHLIB_VERSION_NUMBER/"0.9.8b"/g' src/network/qsslsocket_openssl_symbols.cpp -%endif -%patch7 -p1 -b .sparc64 %patch8 -p1 -b .font-aliases -%patch9 -p0 -b .fix-combobox-window-type +%patch9 -p1 -b .qgtkstyle # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -352,11 +364,11 @@ -release \ -shared \ -cups \ - -no-exceptions \ -fontconfig \ -largefile \ -qt-gif \ -no-rpath \ + -reduce-relocations \ -no-separate-debug-info \ -sm \ -stl \ @@ -374,8 +386,12 @@ -xrender \ -xkb \ -glib \ - -openssl \ - %{?qdbus} %{!?qdbus:-no-qdbus} \ + -openssl-linked \ + -xmlpatterns \ + %{?phonon} %{!?phonon:-no-phonon } \ + %{?dbus} %{!?dbus:-no-dbus} \ + %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ + %{?webkit} %{!?webkit:-no-webkit } \ %{?nas} %{!?nas:-no-nas-sound} \ %{?mysql} \ %{?psql} \ @@ -400,8 +416,8 @@ # strip extraneous dirs/libraries -- Rex # safe ones glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0) -for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz \ - -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do +for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz -lssl -lcrypto -lsqlite3 \ + -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?pre}/lib -L/usr/X11R6/%{_lib} ; do sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||: sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl @@ -415,29 +431,30 @@ # nuke dandling reference(s) to %buildroot sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl +%if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc" # -doc make symbolic link to _qt4_docdir rm -rf %{buildroot}%{_qt4_prefix}/doc ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc - -## Make symlinks in %%_bindir -%if "%{_bindir}" != "%{_qt4_bindir}" - mkdir -p %{buildroot}%{_bindir} - pushd %{buildroot}%{_qt4_bindir} - for i in *; do - case "${i}" in - assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic) - LINK="${i}-qt4" - ln -s "${i}" "%{buildroot}%{_qt4_bindir}/${LINK}" - ;; - *) - LINK="${i}" - ;; - esac - install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK} - done - popd %endif +# let rpm handle binaries conflicts +mkdir %{buildroot}%{_bindir} +pushd %{buildroot}%{_qt4_bindir} +for i in * ; do + case "${i}" in + assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic) + mv $i ../../../bin/${i}-qt4 + ln -s ../../../bin/${i}-qt4 . + ln -s ../../../bin/${i}-qt4 $i + ;; + *) + mv $i ../../../bin/ + ln -s ../../../bin/$i . + ;; + esac +done +popd + # _debug lib symlinks (see bug #196513) pushd %{buildroot}%{_qt4_libdir} for lib in libQt*.so ; do @@ -468,9 +485,15 @@ %endif # qt4.(sh|csh), currently unused -#install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4-%{_arch}.sh -#install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4-%{_arch}.csh -#sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/qt4-%{_arch}.* +%if 0 +install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh +install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh +sed -i \ + -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \ + -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \ + %{buildroot}/etc/profile.d/qt4.* +%endif + %if "%{_qt4_libdir}" != "%{_libdir}" mkdir -p %{buildroot}/etc/ld.so.conf.d @@ -488,9 +511,6 @@ size=$(echo $(basename ${icon}) | cut -d- -f2) install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png done -# qtconfig icon (it's 50x50 actually, it's pretty generic as-is anyway, use qt4-logo instead -- Rex ) -#install -p -m644 -D tools/qtconfig/images/appicon.png \ -# %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig4.png # Qt.pc cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc< 4.3.5-2 -- fix-combobox-window-type patch (maniac103) +* Thu Jul 17 2008 Rex Dieter 4.4.0-13 +- (re)fix qconfig-multilib.h for sparc64 + +* Fri Jul 11 2008 Rex Dieter 4.4.0-12 +- qt-copy-patches-20080711 + +* Mon Jun 23 2008 Rex Dieter 4.4.0-11 +- fix dbus conditional (#452487) + +* Sat Jun 14 2008 Rex Dieter 4.4.0-10 +- strip -lsqlite3 from .pc files (#451490) + +* Sat Jun 14 2008 Kevin Kofler 4.4.0-9 +- restore -qt4 suffixes + +* Fri Jun 13 2008 Than Ngo 4.4.0-8 +- drop qt wrapper, make symlinks to /usr/bin -* Wed May 28 2008 Rex Dieter 4.3.5-1 -- qt-x11-opensource-src-4.3.5 -- qt-copy 20080528 patches +* Tue Jun 10 2008 Than Ngo 4.4.0-7 +- fix #450310, multilib issue -* Mon May 19 2008 Kevin Kofler 4.3.4-14 +* Fri Jun 06 2008 Rex Dieter 4.4.0-6 +- qt-copy-patches-20080606 +- drop BR: libungif-devel (not used) +- move libQtXmlPatters, -x11 -> main +- move qdbuscpp2xml, qdbusxml2cpp, xmlpatters, -x11 -> -devel + +* Tue May 27 2008 Kevin Kofler 4.4.0-5 +- under GNOME, default to QGtkStyle if available + +* Mon May 19 2008 Kevin Kofler 4.4.0-4 - don't hardcode incorrect font substitutions (#447298) -* Sun May 18 2008 Tom "spot" Callaway 4.3.4-13 -- fix sparc64 multilib header +* Fri May 16 2008 Rex Dieter 4.4.0-3 +- qt-copy-patches-20080516 + +* Tue May 13 2008 Kevin Kofler 4.4.0-2 +- revert _qt4_bindir change for now, needs more work (#446167) -* Sat May 17 2008 Tom "spot" Callaway 4.3.4-12 -- fix sparc64 compile, the 64bit sparc conditional in src/corelib/tools/qvector.h - applies to linux as well as solaris +* Tue May 06 2008 Rex Dieter 4.4.0-1 +- qt-4.4.0 -* Tue Apr 08 2008 Kevin Kofler 4.3.4-11 +* Tue Apr 29 2008 Rex Dieter 4.4.0-0.6.rc1 +- -webkit (include in -x11 subpkg), drop separate -webkit-devel +- omit qt4-wrapper.sh deps (since it's not used atm) +- qt-copy-patches-20080429 +- Obsoletes/Provides: WebKit-qt(-devel) <|= 1.0.0-1 (#442200) + +* Thu Apr 24 2008 Rex Dieter 4.4.0-0.5.rc1 +- strip -lssl -lcrypto from *.pc files too + +* Tue Apr 08 2008 Kevin Kofler 4.4.0-0.4.rc1 - updated patch for #437440 ([as-IN] Consonant combination issue) by Pravin Satpute +- port the patch to Qt 4.4 (the code moved to harfbuzz) and reenable it + +* Fri Apr 04 2008 Rex Dieter 4.4.0-0.3.rc1 +- qt-4.4.0-rc1 +- -xmlpatterns (and drop -no-exceptions) +- -reduce-relocations, -dbus-linked, -openssl-linked +- -no-nas +- -no-phonon (-no-gstreamer), -no-webkit (for now, at least until + conflicts with WebKit-qt and kdelibs4 are sorted out) +- %%_qt4_bindir -> %%_bindir, avoid qt4-wrapper hackage (#277581, #422291) +- qtconfig.desktop: NoDisplay=true (#244879) * Wed Apr 02 2008 Kevin Kofler 4.3.4-10 - look for OpenSSL using versioned sonames (#432271) Index: qtconfig.desktop =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qtconfig.desktop,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qtconfig.desktop 13 Sep 2007 17:29:57 -0000 1.5 +++ qtconfig.desktop 19 Jul 2008 11:50:28 -0000 1.6 @@ -7,3 +7,4 @@ Encoding=UTF-8 Type=Application Categories=Qt;Settings; +NoDisplay=true Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 4 Jun 2008 17:46:16 -0000 1.20 +++ sources 19 Jul 2008 11:50:28 -0000 1.21 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png -c12c234097d65943603a624ea989bca5 qt-copy-patches-20080528svn.tar.bz2 -4e6234235431e768e18777ff32990cc2 qt-x11-opensource-src-4.3.5.tar.gz +03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2 +7cf6bdbd220fb8915f8d875442e29961 qt-copy-patches-20080711svn.tar.bz2 --- qt-x11-opensource-src-4.3.0-qassistant-qt4.patch DELETED --- --- qt-x11-opensource-src-4.3.4-as_IN-437440.patch DELETED --- --- qt-x11-opensource-src-4.3.4-openssl.patch DELETED --- --- qt4-sparc64-qvector.patch DELETED --- --- qt4-wrapper.sh DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 11:52:58 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Sat, 19 Jul 2008 11:52:58 GMT Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.33, 1.34 sources, 1.33, 1.34 xorg-x11-drv-radeonhd-README.fedora, 1.31, 1.32 xorg-x11-drv-radeonhd-snapshot.sh, 1.11, 1.12 xorg-x11-drv-radeonhd.spec, 1.43, 1.44 Message-ID: <200807191152.m6JBqwYd005031@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4950 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec Log Message: * Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.5.20080719git - New snapshot (upstream commit 603a35a670c71d32c4f393e21ed09f87449ebbf6): - 603a35a6: Fix typo in list of supported chips - 3bc154bf: ID: Remove concept of chipset families. - 3ac5a2f5: ID: Update list of supported chipsets, bring in sync with chipsets listed. - edb72452: MC: Make sure MC engine is all idle before setting up the MC. - 4eebf4bc: Define SED var without requiring AC_PROG_SED - 2bc4450a: Use 'git foo' instead of 'git-foo' - 4134177e: Automatically update man page from rhd_id.c - b3717c77: I2C: Fix typo that caused one DDC line to not work properly. - bd14f735: Add proper MCIdle() bits for r6xx/r7xx - 72477c9e: manpage: Add description on the scaling option. - Fix removal of build dir in snapshot script Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 16 Jul 2008 14:41:43 -0000 1.33 +++ .cvsignore 19 Jul 2008 11:52:02 -0000 1.34 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 +xf86-video-radeonhd-1.2.1-20080719git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 16 Jul 2008 14:41:43 -0000 1.33 +++ sources 19 Jul 2008 11:52:02 -0000 1.34 @@ -1 +1 @@ -f2750801fc42e733517d1e703f1e8ae0 xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 +3b5a0419b34f30142127123bd795732e xf86-video-radeonhd-1.2.1-20080719git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- xorg-x11-drv-radeonhd-README.fedora 16 Jul 2008 14:41:43 -0000 1.31 +++ xorg-x11-drv-radeonhd-README.fedora 19 Jul 2008 11:52:02 -0000 1.32 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: 820187b208ab1ec94a015f07e48abbb381524c89 +Latest upstream commit: 603a35a670c71d32c4f393e21ed09f87449ebbf6 Contents Index: xorg-x11-drv-radeonhd-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-snapshot.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-drv-radeonhd-snapshot.sh 13 Jul 2008 17:00:49 -0000 1.11 +++ xorg-x11-drv-radeonhd-snapshot.sh 19 Jul 2008 11:52:02 -0000 1.12 @@ -101,6 +101,7 @@ [ -f "$specfile" ] rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9]$//')" + pre_update_dir=`pwd` cd "$(dirname "$0")/xf86-video-radeonhd.src" [ -d ".git" ] @@ -125,6 +126,7 @@ mv -f "${fullspecfile}.new" "${fullspecfile}" fi + cd "$pre_update_dir" } # End of update_changelog() function Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- xorg-x11-drv-radeonhd.spec 16 Jul 2008 14:41:43 -0000 1.43 +++ xorg-x11-drv-radeonhd.spec 19 Jul 2008 11:52:02 -0000 1.44 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20080716 -%define git_commit 820187b208ab1ec94a015f07e48abbb381524c89 +%define date 20080719 +%define git_commit 603a35a670c71d32c4f393e21ed09f87449ebbf6 %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.1 -Release: 3.4%{?alphatag}%{?dist} +Release: 3.5%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -160,6 +160,20 @@ %endif %changelog +* Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.5.20080719git +- New snapshot (upstream commit 603a35a670c71d32c4f393e21ed09f87449ebbf6): + - 603a35a6: Fix typo in list of supported chips + - 3bc154bf: ID: Remove concept of chipset families. + - 3ac5a2f5: ID: Update list of supported chipsets, bring in sync with chipsets listed. + - edb72452: MC: Make sure MC engine is all idle before setting up the MC. + - 4eebf4bc: Define SED var without requiring AC_PROG_SED + - 2bc4450a: Use 'git foo' instead of 'git-foo' + - 4134177e: Automatically update man page from rhd_id.c + - b3717c77: I2C: Fix typo that caused one DDC line to not work properly. + - bd14f735: Add proper MCIdle() bits for r6xx/r7xx + - 72477c9e: manpage: Add description on the scaling option. +- Fix removal of build dir in snapshot script + * Wed Jul 16 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080716git - New snapshot (upstream commit 820187b208ab1ec94a015f07e48abbb381524c89): - 820187b2: Fix hangs when setting up the MC From fedora-extras-commits at redhat.com Sat Jul 19 11:57:50 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 11:57:50 GMT Subject: rpms/rpl/F-9 rpl.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200807191157.m6JBvosj005238@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rpl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5202 Modified Files: rpl.spec sources Log Message: Update to upstream 1.5.5 Move to new upstream distribution site (Sourceforge) Index: rpl.spec =================================================================== RCS file: /cvs/extras/rpms/rpl/F-9/rpl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rpl.spec 19 Aug 2007 11:35:26 -0000 1.3 +++ rpl.spec 19 Jul 2008 11:56:49 -0000 1.4 @@ -1,12 +1,12 @@ Name: rpl -Version: 1.5.3 -Release: 4%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: Intelligent recursive search/replace utility Group: Applications/Text License: GPLv2+ -URL: http://packages.qa.debian.org/r/rpl.html -Source0: http://ftp.debian.org/debian/pool/main/r/rpl/rpl_%{version}.tar.gz +URL: http://rpl.sourceforge.net/ +Source0: http://downloads.sourceforge.net/rpl/rpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,10 @@ %changelog +* Sat Jul 19 2008 Tim Jackson 1.5.5-1 +- Update to version 1.5.5 +- Move to new upstream distribution location (Sourceforge) + * Sun Sep 10 2006 Tim Jackson 1.5.3-4 - Requires: python in place of env/python hack Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpl/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2006 11:01:56 -0000 1.2 +++ sources 19 Jul 2008 11:56:49 -0000 1.3 @@ -1 +1 @@ -7187b2c650e1522a82242c2c7f5e7123 rpl_1.5.3.tar.gz +0db1569ec6e5f4908bf8a25b183eb9a4 rpl-1.5.5.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 11:59:39 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 11:59:39 GMT Subject: rpms/rpl/F-8 rpl.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200807191159.m6JBxdrt005336@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rpl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5295 Modified Files: rpl.spec sources Log Message: Update to upstream 1.5.5 Move to new upstream distribution site (Sourceforge) Index: rpl.spec =================================================================== RCS file: /cvs/extras/rpms/rpl/F-8/rpl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rpl.spec 19 Aug 2007 11:35:26 -0000 1.3 +++ rpl.spec 19 Jul 2008 11:58:41 -0000 1.4 @@ -1,12 +1,12 @@ Name: rpl -Version: 1.5.3 -Release: 4%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: Intelligent recursive search/replace utility Group: Applications/Text License: GPLv2+ -URL: http://packages.qa.debian.org/r/rpl.html -Source0: http://ftp.debian.org/debian/pool/main/r/rpl/rpl_%{version}.tar.gz +URL: http://rpl.sourceforge.net/ +Source0: http://downloads.sourceforge.net/rpl/rpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,10 @@ %changelog +* Sat Jul 19 2008 Tim Jackson 1.5.5-1 +- Update to version 1.5.5 +- Move to new upstream distribution location (Sourceforge) + * Sun Sep 10 2006 Tim Jackson 1.5.3-4 - Requires: python in place of env/python hack Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpl/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2006 11:01:56 -0000 1.2 +++ sources 19 Jul 2008 11:58:41 -0000 1.3 @@ -1 +1 @@ -7187b2c650e1522a82242c2c7f5e7123 rpl_1.5.3.tar.gz +0db1569ec6e5f4908bf8a25b183eb9a4 rpl-1.5.5.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 12:01:21 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:01:21 GMT Subject: rpms/rapidsvn/devel rapidsvn.spec,1.15,1.16 Message-ID: <200807191201.m6JC1LbB011984@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5390 Modified Files: rapidsvn.spec Log Message: Fix Source URL Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- rapidsvn.spec 7 Jul 2008 12:32:13 -0000 1.15 +++ rapidsvn.spec 19 Jul 2008 12:00:20 -0000 1.16 @@ -6,7 +6,7 @@ Group: Development/Tools License: GPLv2+ URL: http://www.rapidsvn.org/ -Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz +Source0: http://rapidsvn.org/download/release/%{version}/rapidsvn-%{version}.tar.gz Patch0: rapidsvn-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Sat Jul 19 12:04:15 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 12:04:15 GMT Subject: rpms/joni/devel joni.spec,1.4,1.5 Message-ID: <200807191204.m6JC4FVn012113@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12056 Modified Files: joni.spec Log Message: Oops, don't aot-compile-rpm on noarch. Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- joni.spec 19 Jul 2008 11:01:55 -0000 1.4 +++ joni.spec 19 Jul 2008 12:03:23 -0000 1.5 @@ -50,7 +50,9 @@ # install unversioned jar as per Java Packaging Guidelines install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar +%if 0%{?fedora} <= 9 %{_bindir}/aot-compile-rpm +%endif %if 0%{?fedora} <= 9 From fedora-extras-commits at redhat.com Sat Jul 19 12:09:18 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:09:18 GMT Subject: rpms/rapidsvn/F-8 rapidsvn.spec,1.12,1.13 Message-ID: <200807191209.m6JC9IQi012310@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12281 Modified Files: rapidsvn.spec Log Message: Fix source URL Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/F-8/rapidsvn.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rapidsvn.spec 16 Mar 2008 11:31:19 -0000 1.12 +++ rapidsvn.spec 19 Jul 2008 12:08:15 -0000 1.13 @@ -6,7 +6,7 @@ Group: Development/Tools License: GPLv2+ URL: http://www.rapidsvn.org/ -Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz +Source0: http://rapidsvn.org/download/release/%{version}/rapidsvn-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Sat Jul 19 12:12:30 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:12:30 GMT Subject: rpms/rapidsvn/F-9 rapidsvn.spec,1.14,1.15 Message-ID: <200807191212.m6JCCUVL012433@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12326 Modified Files: rapidsvn.spec Log Message: Fix source URL Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/F-9/rapidsvn.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rapidsvn.spec 16 Mar 2008 11:21:43 -0000 1.14 +++ rapidsvn.spec 19 Jul 2008 12:11:31 -0000 1.15 @@ -6,7 +6,7 @@ Group: Development/Tools License: GPLv2+ URL: http://www.rapidsvn.org/ -Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz +Source0: http://rapidsvn.org/download/release/%{version}/rapidsvn-%{version}.tar.gz Patch0: rapidsvn-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Sat Jul 19 12:21:45 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:21:45 GMT Subject: rpms/altermime/devel .cvsignore, 1.3, 1.4 altermime.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807191221.m6JCLjTi012719@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/altermime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667 Modified Files: .cvsignore altermime.spec sources Log Message: Update to version 0.3.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/altermime/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Apr 2006 14:08:53 -0000 1.3 +++ .cvsignore 19 Jul 2008 12:20:27 -0000 1.4 @@ -1 +1 @@ -altermime-0.3.7.tar.gz +altermime-0.3.8.tar.gz Index: altermime.spec =================================================================== RCS file: /cvs/extras/rpms/altermime/devel/altermime.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- altermime.spec 20 Feb 2008 05:23:17 -0000 1.5 +++ altermime.spec 19 Jul 2008 12:20:27 -0000 1.6 @@ -1,6 +1,6 @@ Name: altermime -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: Alter MIME-encoded mailpacks Group: Applications/Internet @@ -46,6 +46,9 @@ %changelog +* Sat Jul 19 2008 Tim Jackson 0.3.8-1 +- Update to version 0.3.8 + * Wed Feb 20 2008 Fedora Release Engineering - 0.3.7-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/altermime/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Apr 2006 14:08:53 -0000 1.3 +++ sources 19 Jul 2008 12:20:27 -0000 1.4 @@ -1 +1 @@ -534a68f9fed6867511c50e1e7bdf7722 altermime-0.3.7.tar.gz +e9717152d05318731ffbf67e2087af3b altermime-0.3.8.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 12:23:25 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:23:25 GMT Subject: rpms/altermime/F-8 altermime.spec,1.4,1.5 Message-ID: <200807191223.m6JCNPoQ012838@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/altermime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12740 Modified Files: altermime.spec Log Message: Update to version 0.3.8 Index: altermime.spec =================================================================== RCS file: /cvs/extras/rpms/altermime/F-8/altermime.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- altermime.spec 9 Sep 2006 14:00:26 -0000 1.4 +++ altermime.spec 19 Jul 2008 12:22:25 -0000 1.5 @@ -1,6 +1,6 @@ Name: altermime -Version: 0.3.7 -Release: 2%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: Alter MIME-encoded mailpacks Group: Applications/Internet @@ -46,6 +46,9 @@ %changelog +* Sat Jul 19 2008 Tim Jackson 0.3.8-1 +- Update to version 0.3.8 + * Sat Sep 09 2006 Tim Jackson 0.3.7-2 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sat Jul 19 12:25:09 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:25:09 GMT Subject: rpms/altermime/F-9 altermime.spec,1.5,1.6 Message-ID: <200807191225.m6JCP9la012978@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/altermime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12846 Modified Files: altermime.spec Log Message: Update to version 0.3.8 Index: altermime.spec =================================================================== RCS file: /cvs/extras/rpms/altermime/F-9/altermime.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- altermime.spec 20 Feb 2008 05:23:17 -0000 1.5 +++ altermime.spec 19 Jul 2008 12:23:39 -0000 1.6 @@ -1,6 +1,6 @@ Name: altermime -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: Alter MIME-encoded mailpacks Group: Applications/Internet @@ -46,6 +46,9 @@ %changelog +* Sat Jul 19 2008 Tim Jackson 0.3.8-1 +- Update to version 0.3.8 + * Wed Feb 20 2008 Fedora Release Engineering - 0.3.7-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Jul 19 12:32:11 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Sat, 19 Jul 2008 12:32:11 GMT Subject: rpms/rpm/devel rpm-4.5.90-patchnum.patch, NONE, 1.1 rpm.spec, 1.287, 1.288 Message-ID: <200807191232.m6JCWBQa013308@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13237 Modified Files: rpm.spec Added Files: rpm-4.5.90-patchnum.patch Log Message: - fix regression in patch number handling (#455872) rpm-4.5.90-patchnum.patch: --- NEW FILE rpm-4.5.90-patchnum.patch --- commit 6df78d16a68ff508a965ba2166f3b376e850b138 Author: Panu Matilainen Date: Sat Jul 19 15:27:42 2008 +0300 Fix regression in %patch handling (rhbz#455872) - popt doesn't think of "008" as an integer, let popt think it's a string as we do our own conversion to number anyway diff --git a/build/parsePrep.c b/build/parsePrep.c index 4b0ccdf..fcc28c8 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -403,16 +403,16 @@ static int doSetupMacro(rpmSpec spec, const char *line) */ static rpmRC doPatchMacro(rpmSpec spec, const char *line) { - char *opt_b; + char *opt_b, *opt_P; char *buf = NULL; - int opt_P, opt_p, opt_R, opt_E, opt_F; + int opt_p, opt_R, opt_E, opt_F; int argc, c; const char **argv = NULL; ARGV_t patch, patchnums = NULL; rpmRC rc = RPMRC_FAIL; /* assume failure */ struct poptOption const patchOpts[] = { - { NULL, 'P', POPT_ARG_INT, &opt_P, 'P', NULL, NULL }, + { NULL, 'P', POPT_ARG_STRING, &opt_P, 'P', NULL, NULL }, { NULL, 'p', POPT_ARG_INT, &opt_p, 'p', NULL, NULL }, { NULL, 'R', POPT_ARG_NONE, &opt_R, 'R', NULL, NULL }, { NULL, 'E', POPT_ARG_NONE, &opt_E, 'E', NULL, NULL }, Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- rpm.spec 15 Jul 2008 17:18:17 -0000 1.287 +++ rpm.spec 19 Jul 2008 12:31:18 -0000 1.288 @@ -18,7 +18,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.8 +Release: 0.%{snapver}.9 Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -35,6 +35,7 @@ Patch200: rpm-4.5.90-digestlen.patch Patch201: rpm-4.5.90-mono-magic.patch Patch202: rpm-4.5.90-macroarg.patch +Patch203: rpm-4.5.90-patchnum.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -165,6 +166,7 @@ %patch200 -p1 -b .diglen %patch201 -p1 -b .mono-magic %patch202 -p1 -b .macroarg +%patch203 -p1 -b .patchnum %if %{with int_bdb} ln -s db-%{bdbver} db @@ -340,6 +342,10 @@ %doc doc/librpm/html/* %changelog +* Sat Jul 19 2008 Panu Matilainen +- 4.5.90-0.git8426.9 +- fix regression in patch number handling (#455872) + * Tue Jul 15 2008 Panu Matilainen - 4.5.90-0.git8426.8 - fix regression in macro argument handling (#455333) From fedora-extras-commits at redhat.com Sat Jul 19 12:37:47 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:37:47 GMT Subject: rpms/altermime/F-8 altermime.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200807191237.m6JCblJ8013661@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/altermime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13517 Modified Files: altermime.spec sources Log Message: Fix bad sources file Index: altermime.spec =================================================================== RCS file: /cvs/extras/rpms/altermime/F-8/altermime.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- altermime.spec 19 Jul 2008 12:22:25 -0000 1.5 +++ altermime.spec 19 Jul 2008 12:36:45 -0000 1.6 @@ -1,6 +1,6 @@ Name: altermime Version: 0.3.8 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Alter MIME-encoded mailpacks Group: Applications/Internet Index: sources =================================================================== RCS file: /cvs/extras/rpms/altermime/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Apr 2006 14:08:53 -0000 1.3 +++ sources 19 Jul 2008 12:36:45 -0000 1.4 @@ -1 +1 @@ -534a68f9fed6867511c50e1e7bdf7722 altermime-0.3.7.tar.gz +e9717152d05318731ffbf67e2087af3b altermime-0.3.8.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 12:38:28 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:38:28 GMT Subject: rpms/altermime/F-9 altermime.spec,1.6,1.7 sources,1.3,1.4 Message-ID: <200807191238.m6JCcSX3013715@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/altermime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13614 Modified Files: altermime.spec sources Log Message: Fix bad sources Index: altermime.spec =================================================================== RCS file: /cvs/extras/rpms/altermime/F-9/altermime.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- altermime.spec 19 Jul 2008 12:23:39 -0000 1.6 +++ altermime.spec 19 Jul 2008 12:37:37 -0000 1.7 @@ -1,6 +1,6 @@ Name: altermime Version: 0.3.8 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Alter MIME-encoded mailpacks Group: Applications/Internet @@ -46,7 +46,7 @@ %changelog -* Sat Jul 19 2008 Tim Jackson 0.3.8-1 +* Sat Jul 19 2008 Tim Jackson 0.3.8-1.fc9.1 - Update to version 0.3.8 * Wed Feb 20 2008 Fedora Release Engineering - 0.3.7-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/altermime/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Apr 2006 14:08:53 -0000 1.3 +++ sources 19 Jul 2008 12:37:37 -0000 1.4 @@ -1 +1 @@ -534a68f9fed6867511c50e1e7bdf7722 altermime-0.3.7.tar.gz +e9717152d05318731ffbf67e2087af3b altermime-0.3.8.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 12:39:13 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 19 Jul 2008 12:39:13 GMT Subject: rpms/altermime/F-8 altermime.spec,1.6,1.7 Message-ID: <200807191239.m6JCdDSg013798@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/altermime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13695 Modified Files: altermime.spec Log Message: Fix bad sources Index: altermime.spec =================================================================== RCS file: /cvs/extras/rpms/altermime/F-8/altermime.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- altermime.spec 19 Jul 2008 12:36:45 -0000 1.6 +++ altermime.spec 19 Jul 2008 12:38:11 -0000 1.7 @@ -46,7 +46,7 @@ %changelog -* Sat Jul 19 2008 Tim Jackson 0.3.8-1 +* Sat Jul 19 2008 Tim Jackson 0.3.8-1.fc8.1 - Update to version 0.3.8 * Sat Sep 09 2006 Tim Jackson 0.3.7-2 From fedora-extras-commits at redhat.com Sat Jul 19 12:40:23 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 12:40:23 GMT Subject: rpms/qt4/F-8 Makefile,1.2,1.3 Message-ID: <200807191240.m6JCeNvq013908@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13856/F-8 Modified Files: Makefile Log Message: Fix the makefile. Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 19 Jul 2008 11:50:28 -0000 1.2 +++ Makefile 19 Jul 2008 12:39:30 -0000 1.3 @@ -1,6 +1,6 @@ # Makefile for source rpm: qt # $Id$ -NAME := qt +NAME := qt4 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Sat Jul 19 12:41:31 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 12:41:31 GMT Subject: rpms/qt4/F-8 Makefile,1.3,1.4 Message-ID: <200807191241.m6JCfVLf014000@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13914/F-8 Modified Files: Makefile Log Message: Fix comment too. Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 19 Jul 2008 12:39:30 -0000 1.3 +++ Makefile 19 Jul 2008 12:40:39 -0000 1.4 @@ -1,4 +1,4 @@ -# Makefile for source rpm: qt +# Makefile for source rpm: qt4 # $Id$ NAME := qt4 SPECFILE = $(firstword $(wildcard *.spec)) From fedora-extras-commits at redhat.com Sat Jul 19 12:42:11 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Sat, 19 Jul 2008 12:42:11 GMT Subject: rpms/xorg-x11-drv-radeonhd/devel xorg-x11-drv-radeonhd.spec, 1.44, 1.45 Message-ID: <200807191242.m6JCgBE2014033@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13956 Modified Files: xorg-x11-drv-radeonhd.spec Log Message: * Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.6.20080719git - Compile DRI support. Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- xorg-x11-drv-radeonhd.spec 19 Jul 2008 11:52:02 -0000 1.44 +++ xorg-x11-drv-radeonhd.spec 19 Jul 2008 12:41:23 -0000 1.45 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.1 -Release: 3.5%{?alphatag}%{?dist} +Release: 3.6%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -94,6 +94,10 @@ Requires: xorg-x11-server-Xorg < 1.4.99.1 %endif +# DRI support +BuildRequires: libdrm-devel +BuildRequires: xorg-x11-proto-devel + %description X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets. %if %{snapshot} @@ -160,6 +164,9 @@ %endif %changelog +* Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.6.20080719git +- Compile DRI support. + * Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.5.20080719git - New snapshot (upstream commit 603a35a670c71d32c4f393e21ed09f87449ebbf6): - 603a35a6: Fix typo in list of supported chips From fedora-extras-commits at redhat.com Sat Jul 19 12:50:25 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 12:50:25 GMT Subject: rpms/jruby/devel .cvsignore, 1.2, 1.3 jruby-dont-include-dependencies-in-jar.patch, 1.1, 1.2 jruby.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200807191250.m6JCoPHH014284@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jruby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14247 Modified Files: .cvsignore jruby-dont-include-dependencies-in-jar.patch jruby.spec sources Log Message: * Sat Jul 19 2008 Conrad Meyer - 1.1.3-1 - Bump to 1.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jruby/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2008 02:38:18 -0000 1.2 +++ .cvsignore 19 Jul 2008 12:49:40 -0000 1.3 @@ -1 +1 @@ -jruby-src-1.1.1.tar.gz +jruby-src-1.1.3.tar.gz jruby-dont-include-dependencies-in-jar.patch: Index: jruby-dont-include-dependencies-in-jar.patch =================================================================== RCS file: /cvs/pkgs/rpms/jruby/devel/jruby-dont-include-dependencies-in-jar.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jruby-dont-include-dependencies-in-jar.patch 25 Apr 2008 02:38:18 -0000 1.1 +++ jruby-dont-include-dependencies-in-jar.patch 19 Jul 2008 12:49:40 -0000 1.2 @@ -1,43 +1,36 @@ ---- build.xml.orig 2008-04-22 17:22:58.000000000 -0700 -+++ build.xml 2008-04-22 17:27:32.000000000 -0700 -@@ -168,34 +168,18 @@ - - - +--- build.xml.orig 2008-07-19 02:20:15.000000000 -0700 ++++ build.xml 2008-07-19 02:20:29.000000000 -0700 +@@ -182,33 +182,19 @@ + + + + - -- - - -- -- -- ++ + + + - - - - - - -- +- - - - - - - -- -- -- -- + + + + - -+ -+ -+ -+ -+ -+ -+ -+ ++ Index: jruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/jruby/devel/jruby.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jruby.spec 22 May 2008 02:31:11 -0000 1.4 +++ jruby.spec 19 Jul 2008 12:49:40 -0000 1.5 @@ -1,12 +1,12 @@ Name: jruby -Version: 1.1.1 -Release: 7%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Pure Java implementation of the Ruby interpreter Group: Development/Languages License: (CPL or GPLv2+ or LGPLv2+) and ASL 1.1 and MIT and Ruby URL: http://jruby.codehaus.org/ -Source0: http://dist.codehaus.org/jruby/jruby-src-1.1.1.tar.gz +Source0: http://dist.codehaus.org/jruby/jruby-src-1.1.3.tar.gz # This patch is Fedora specific; we set up classpath using build-classpath. Patch1: jruby-fix-jruby-start-script.patch # Temporary until upstream realizes they don't support 1.4 and scraps @@ -15,8 +15,6 @@ # Disagreements with upstream. They want to bundle binary dependencies # into jruby's jar; we don't. Patch3: jruby-dont-include-dependencies-in-jar.patch -# Assuming we want to run the tests. -Patch5: jruby-add-classpath-for-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -29,10 +27,10 @@ BuildRequires: jna BuildRequires: jna-posix BuildRequires: joda-time -BuildRequires: joni +BuildRequires: joni >= 1.0.3 BuildRequires: jpackage-utils >= 1.5 BuildRequires: junit -BuildRequires: jvyamlb +BuildRequires: jvyamlb >= 0.2.2 BuildRequires: objectweb-asm Requires: bcel @@ -42,7 +40,7 @@ Requires: jline Requires: jna Requires: jna-posix -Requires: joni +Requires: joni >= 1.0.3 Requires: jpackage-utils >= 1.5 Requires: jvyamlb Requires: objectweb-asm @@ -73,9 +71,6 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 -%patch5 -p0 - -cp build.xml build.xml.orig # delete binary .jars. rm -f build_lib/*.jar @@ -143,10 +138,7 @@ %files %defattr(-,root,root,-) %doc COPYING COPYING.CPL COPYING.GPL COPYING.LGPL -%doc docs/BeanScriptingFramework docs/CodeConventions.txt -%doc docs/Glossary.txt docs/Javasupport-highlevel.txt -%doc docs/Javasupport-lowlevel.txt docs/Javasupport-overview.txt -%doc docs/README.test docs/release-checklist.txt +%doc docs/CodeConventions.txt docs/README.test %attr(0755,root,root) %{_bindir}/%{name} %attr(0755,root,root) %{_bindir}/jirb @@ -160,6 +152,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.1.3-1 +- Bump to 1.1.3. + * Wed May 21 2008 Conrad Meyer - 1.1.1-7 - Require joni and jline. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jruby/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2008 02:38:18 -0000 1.2 +++ sources 19 Jul 2008 12:49:40 -0000 1.3 @@ -1 +1 @@ -94ce5370ada712d2190666bacc6fae21 jruby-src-1.1.1.tar.gz +f8e094d740fa1b10f3d473a89100afa4 jruby-src-1.1.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 13:26:59 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 13:26:59 GMT Subject: rpms/qt/devel qt.spec,1.194,1.195 Message-ID: <200807191326.m6JDQx8Z022127@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22044 Modified Files: qt.spec Log Message: * Sat Jul 19 2008 Rex Dieter 4.4.0-14 - macros.qt4: fix %_qt4_datadir Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- qt.spec 17 Jul 2008 12:40:39 -0000 1.194 +++ qt.spec 19 Jul 2008 13:26:06 -0000 1.195 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 13%{?dist} +Release: 14%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -538,7 +538,7 @@ %%_qt4_version %{version} %%_qt4_prefix %%{_libdir}/qt4 %%_qt4_bindir %%{_qt4_prefix}/bin -%%_qt4_datadir %%{_datadir}/qt4 +%%_qt4_datadir %%{_qt4_prefix} %%_qt4_demosdir %%{_qt4_prefix}/demos %%_qt4_docdir %%{_docdir}/qt4 %%_qt4_examples %%{_qt4_prefix}/examples @@ -773,6 +773,9 @@ %changelog +* Sat Jul 19 2008 Rex Dieter 4.4.0-14 +- macros.qt4: fix %%_qt4_datadir + * Thu Jul 17 2008 Rex Dieter 4.4.0-13 - (re)fix qconfig-multilib.h for sparc64 From fedora-extras-commits at redhat.com Sat Jul 19 13:30:43 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 19 Jul 2008 13:30:43 GMT Subject: rpms/xdvik/F-9 xdvik-22.84.14-j1.40.patch.gz, NONE, 1.1 xdvik-22.84.14-pxdvi.patch, NONE, 1.1 sources, 1.6, 1.7 xdvik.spec, 1.17, 1.18 texlive-source-xdvi-numlock.patch, 1.1, NONE xdvik-22.84.13-bad_bar.patch, 1.1, NONE xdvik-22.84.13-keepflag-scrollfix.patch, 1.1, NONE xdvik-22.84.13-manpage.patch, 1.1, NONE xdvik-22.84.13-pxdvi-use-system-libs.patch, 1.1, NONE xdvik-22.84.13-pxdvi.patch, 1.1, NONE xdvik-22.84.13-tempfix.patch, 1.1, NONE xdvik-22.84.13-uint32_t-fix.patch, 1.2, NONE xdvik-22.84.13-use-system-libs.patch, 1.1, NONE xdvik-22.84.13-windowid.patch, 1.1, NONE xdvik-22.84.13-xdgopen.patch, 1.1, NONE Message-ID: <200807191330.m6JDUhHa022364@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/xdvik/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22305 Modified Files: sources xdvik.spec Added Files: xdvik-22.84.14-j1.40.patch.gz xdvik-22.84.14-pxdvi.patch Removed Files: texlive-source-xdvi-numlock.patch xdvik-22.84.13-bad_bar.patch xdvik-22.84.13-keepflag-scrollfix.patch xdvik-22.84.13-manpage.patch xdvik-22.84.13-pxdvi-use-system-libs.patch xdvik-22.84.13-pxdvi.patch xdvik-22.84.13-tempfix.patch xdvik-22.84.13-uint32_t-fix.patch xdvik-22.84.13-use-system-libs.patch xdvik-22.84.13-windowid.patch xdvik-22.84.13-xdgopen.patch Log Message: * Fri Jul 18 2008 Jonathan G. Underwood - 22.84.13-20 - Update to version 22.84.14 - Update Japanese patch to 22.84.14-j1.40 - Rework patch allowing both normal and Japanese versions to be built - Remove no longer needed patches that have been merged upstream: - Various spec file fixups --- NEW FILE xdvik-22.84.14-j1.40.patch.gz --- ? ??x4)??V????]?#?J.??????X$l????C?">??2??k??K??0l9?w'q??? ?????????g@??p?N???P?^???\???t[??m d?|z?w????G?R,B? V?,??I4M$I?9?????? ???=?^z?Qs??>P?? ?h?0?_?????p???n?]T7Upo???C??7??D0???MDz ?5?6pZ)??8X?K???O?`g&?E?6??????Q?sCr?,??~;|?????????G?3/?S ?4?*?.???W[??,? g?V?R|?u??/????& CM???????oRN?T?"Mi??g????'???9??tp?????L?????????~{??I??z"?O?u????3???? ?l?xJ????????s?X)??<'???;5??8???'?;??p?SV%V???5???o???x?z VOE?(I?$?????~1? ?i?8??Yc??8??}???d?E:x ? ??AU??%??x?H?0???s??????gU??B ??7?L?&??H??i -????????k???)??????ke????????jM&?bW??v7 ??c?^?7??U???]???D?V?#??[???? ?????3>{??N??`? eU9???? /X=???H?Y?xM??????*???H 2BfT?6??8+'s? S?U?o???%?d?#W*?}?P ???????????!V%%?+B? ?:?^???a{????????\ ?Ss?????]/??? ???*??|~oWP 1?0??D??j6/????E9?a?j{?? X:?* ?@?6P?Q)????. ?????e????A?C&`?}??{l?*?????9? ???????7YZQ3???Cb?? ?? ???7???2????|g??a?,???????????l'X??*??r~?D at Tj???}X????$ ??L?1,?^?=B8_???Q????HA?L?2?'?f???J!2???U????>?K?=??x?s?P}e4YN ?fgv?????"???m"?M? ??J????YD$ ??Z??T?#bv d7??h???gl??????x??T??oD???@???Q????M?p????h?u???N?s?6?+{??M??M??4????*q???IC r?leg???! ?????"{?6\? ~ ???:??v???????U???`]??q????" ?a?N??o? ???????? \?c??????npv?t??l?[E _q???w1?S????Al?f?w??g?'$ ??? ???J??? ?jB??cj?uw???R???????no?0???3??????|??}:????????O???O?yTi?'?Hi'???6?@V?????8+z?i;???@?R?????@& Y???tG?jj??+=??m??*????q?C???y??au??K??????wZ?;??z???????~J??PU??Q*;$jv/???=??????????u???????????o?Y? X??? ?M?r????V?W??"?N ?[?????dGB??$???????YqbU??q????b?u????} Z]Ee??????????????ig?6:???T;?#9z{??Z8??8?a?Nk???F?[,d????$@P???B.id??F?j???4? [,?L ?$??????V??h?'???&????^?????q kX ??z???"?@?Y??????^P35???????,???d???7^? ???i?d?????E????L ?y?u.???y??Dq??^ Q?? ?#?g???????0???q+?????zf???5??W???Mq??sxx???|???P?{?? ??+SN?*4 (I?+?$????tD"2??$???QhF??bv^??P=,??}P ??O?;?e4?s?P?p ??l"? ?B~oz?????????H??? s!?B??g?E???!?bzU`???? ?ro?0????d??????t8<????o?? ??1n&D?I??????`,?X.X??;??o ???R?y??l?Wah?????;????^-xjw?M?5k??+?\???< ??<?????B^?????????S?d?F??o???#?>??? G?????,?#}???????????j7'?P?O?AXS??c???&>R????d?????????O?Q{?P????aD+???ik????? ?l?4 IM ??$?K?9s\?F?? ?Y?C?? ???????{???i?B???i?2UXr????e?Nc?W?;??)tX]?%???$?????B?( Y?}??{?S????BE &{?{G?;??9?&m???Fz?> ??? 5???p??ZA????wxZ?NDb?Y.YQ3??!L?+bS?X?? X? ????????U*7???????3??,?j?????Z8?????ueq???w?` ?$?H?}??????_)????X???/L??2.w??>?????0?????F}]???y]z?q?????3?Cmo}?.?????????WToW?VW????zS?H???^???{u????A??????????OT-??u??????O?_z?^R??G?7?; ?b5?pe7T????;??_????S??\?]???Z????>XZ?_??h??????Z?V?\}R]????~Z(?X?a?f?)Ox5??s????9??)?zZ??x?]? u? ?????j??? ?n !0??.?Z]??x?????Z???????W???_?W?????k?8???_]B?GuS?Z?H??>???S??J?m??&T?dF6???????M`????+L?>?????O?~?{l?s'3?? ??[??n?|pbF ~????????Te????V?????`C???[Fg?xNU??%?R??Te?7??O?2Y?2?????????~? ??Ny-hAX?@Xa?_??^?A}(?U?~?y ??w7?[???a'????cu?????????????????o^??_????2?0?$K?????h?j????J?B??]y5??????WG?7????? ?????z???XQC???{????K,-A??m?vaHT??=????,?g???J???n???w???? L??P?? ???uo??.???=?V??a?1?X}?KY?s]@?P?????p???|???]?%?????????? ?????q?z??5y?.???pd= O??3?n??????P7??|??z??(j???????n??B]? sx?k??1?????8 ?_]??+?>#a??+???V??%a]P)v+[TG???oAkz?>??}????y?H???;???*??Xz?t?R? us????_??eE}??' ??????/??N?n~?m?@ ?W3????@?I?Z???>????r? ?F??????@? a?n {Da\?????`??#??Lz???H????? 3?`Y~??g?*??&??|?????V+6?T???O0???4???B??L???a&V????s?J????H??|?m??? ? ?b^?? ?????mR;?DKc?3???h????U?NJ????N?????)??nh ?=??R?G???.tw???E?A(??@@??????????bt?f?? ???pw?u/t?3??? ??D? ???4o?~?q?Y???t7 R?Y???|???? r????????z?? <??64?R?????=/+\?N?W?Z? eST??P?N4A?.?P8?3??Krk????9$?(?s?b????**??\J???? ??qR??qM??lx??p?????H????uJ??i??r?t3]<???v???x?n?7??a\O???wF?%?? ????WG??_QJ?Jz?/??Y?????I?m?Y???]J?[bX?|?E?????T?|?w6.??? c6?%???Q0> q??W4??%)d???Y?KR???????????:0<?K??>^?CKMgf???????3T??????w?t?)/?P???9????q`'?cE?:?????D!????M?2T;8l?4bS(?d?mLz  ?*L??j????x??????m?YS?{G?#_??^o ????K7M???V??U????H(?r?&?5~S??Q?!?F???M????X?? rr??&?{?/:Pr??t? ?e4??K???v0T?O? ?????? ??E?bI???"????]????Z????zz?Ntu???p?uJ?@?PgH?n3??ks??H????98?7t??l?l??T????`?G??|:???4C?P?N??r??b?=CC??F?q??p 8????Cz?)??????????w???q.????ncr?.=?YPw??K?xH3????F|2?nv2????CK??BiJ??L;?&??Ba2??d ?4?F8M???,'??d? ??? #T???(?f ?0M?'???5??a?l??????h%??z!'?39??.???X7????-/439??I?b????: A????? ??c,?F? TV??k??**?Z?-n?n????\??@????????b???? G%????v7???NDr??y?%?? _w?(*V?(??!?*"T?? l???)?P???p?N????????w??n V:wq?????H???x&??t?3 ?????32??U5 ??j?? v?????u?w?s???=f?????,Y?Eb??DF??,??/M%D? e?U??*n?B-?a|???e???????????? ?????????????)6???e|?!???p7Xi????p??????mw'?zsK??????2???e?e??i8?Y9mZ?H??5?4???s?[hP?Q6iO?? ??6???z?=??T??S????n?gL????F?QuQ?=G??????w??/?????}??E?Q?j??ToG1??o9?Rku6???~?w?????????P?????Q\??6????(? ?9M7??K|?T?5;?? ?4?a???e??? ??????~?y7f?-)????_?N?? \??8??1?B??p??!??g y??rJ?8^??H???C?_??????uO6Q??+a?l{???)y?e????.3 ??q#n?????=A}6 ???E???9??????,g-M????c??V? >?/?S? ??i? ?_f?T??*! ?G??'3??#?Pn?Ix??o???S?$! ? ??[$!?-?:?G?;:v`r?)?+sn?t?c?EE?,?? ??????/2??C>r???d??x??????s??(N]??#?????????Z ??????,?x??dz)?y???U#f)Bk???md?C???](*@vP??? B??w.T?E???b8M-a ?W?F??^?N[?8;???Z??g#??P?R?/???O?????????G???????$N|9?s)?:?Vb?,IYbW5o/_?>???K?4?6???'?b???wV??v??3?U| ??b?O?ta??%??????q4K????%??_????'?????N4?;???4!??????y8??*j?f??,???? ?s??oO{O?7.??t72?????q???\Bp vXb?? kft???z??i?`??>Y?????????&cU????g?E??????x??&???,? ?F?{???%?%q8???? FN?>????|?????.Gm?+??9?.??6???????f ?3/?+-?ZHcpEN?/?3??/u ?m??????R( ?B6?M?t?0|l??c???^?G_t>?4'?? ? K4?u?&????????$???W?s????m?p?????? e??E?l_?????p?? Q???"f???????A???v???????W?^???,?????!H?_?*!????J?? ?v?0???2Z???3??x????J???@"p??-i\???E ??}>??=E?/P??h?????? 3?????5?L?N??c??pA??~?A?3hD?db???2?????M?9?#J?9?*?.dY???4]0???y??t??????T??????d??P????????"E?????}?????\(N?j???n????s??4?8c?gO<3??~???j????\`??# ??;??J~?b>? /GQW?} U?*x;?!L9?n???)?J??? P?{ ??OWdZ?){Nyz???k????~??2?*????h|????kV?? V??c?Q/?]?]?9?R?Tc?"??o?? ?ZF+???m????!~H?|)?l%??J'??k$?N8?M1? |??O62?{?B?=?????"??J?z'I`??f|?h4?a???d.? ???t?????~?D???V?}%???f%????a???w??`????^r?w????K?M#/o??)?X????KeBvN\l???62?|??J??]7&?????g:Ao?U?N?v???N??:JC?? ??Z???v?? ??g`TS3-?7<`sbE?w ?A??H??r?=0??m? J???s'?`?*5??VO?r??`??4??? ??? ?I??bJ?B???D~y?D[?x?????DrsBCv???z?????eM#??0:J?????=/?????D?N?0_???p?0??ZM6=z?&?`;??V?w??B?y}VH??=CVz???ToF`?_??e??I?`6??@_u8uFld&e+?D?F~???m\=!;#O{O?????X_*??ub??W???ht"??]?y??t"?gr??+M?????'a}??]Q?t??IX???1???I dC?H?????x?e???U?[??G??0?????6???S?@??|Y#???????f? Y.?1???;?f????e???^?QR??g????E??j???n?S??B??=?s?3LV?}??(???e?????c?C??R?!;?Bz?:5\? 9??m?9q????1g?????????4?d?7?y??xh? &??,aY7??+dG{?9????aA6?????{??@?d|?*1???~U???U?si?;17??v????2???R??H{?pI42i?c?? ??8???k??)??h?B??????8;l4???w{?N?5x?????? ??*?=??g?X???A??.??9?Y?? ?hi??n?O?z}s?|rw?FU}??? &;@4?????O??G??????????????U?q??????????&W'V?*qzE'?j??sg??(??,???:?_U?]? ZYl???O?6?????E???X3g?k??u5?????l?+o???"U?N~C???"6?`P???^?F?Gw????_LmK?#?!X?j?A ;?=s??3 ?.?/XH?Dob%?,?b=??WP7???KM??I????N????:?akI???????????t??3?io?g2??:O?X? :_????-?.??,???+xsaJ???c??(???,?~???????u????*yD? ???f?e?(P???w;?u???????O?m?????!? ??????t??1pUZ?*?T??qS?d???????%?;???????H}????????Jv??qV??? ,?f?????R?B????w??M?X??b> XB???K^??W?8H???B%W*T??U?xCP ??z!W?P/????OS??z?????????????|??4T????B??zH???v?`K?7??-C?;?RS7?A?????`%??????/?? ?h??=?aY??j? ?+?M?[:????(?5U?Q?4?}0?~?E????c???~?D?=?E+???-bj?d[??V?F?g???@9?[M%*???~?1?v??????g??,?2J5??Z????v???'?eC[?~{ON}????\?Qs<?v????????G??9?????X }N?f??Y????a??xD<2IK?;w]tO???~.?"??@&????? ?= $?????F??????*:?????~J at jqi?F?????????)M?????GG?I???????D}Ze?{?C?,??w?./?????a?? 5z4r??W??+P????:{?@??-?0? t????]-:Ylk?XZ???W:{????e????P??jM_w?`t??8JwS?J??????-?t?{.?t??B??[Ls???g???S?D?dU????!*t??????Cy3??z/>??d??u????v'4?~?E??=???H???X????????X?? ????=?y*?Q???g6???L?^/++????????u?A?KQ_j?O 2????Td???M??M????|???c%?I?O??q^?J?SX'??:???6u ??2?Y???????E????2/???U?y??????E~-?5??@????e>??BV 2?? ??r?50/?c?3h?c2;?w???????-??1???O??;;?z??"????9?L??5BBz!X?/? ?h?????F??? dH1?n?.Y??i?W@?1???y?h0????W?-?\?n??? ??x!c?1 ??B???/??#?? ,??|??pE?h?$lH?????+??r?P??64]d?~?{??0/?Ja??+??h?Dz?l?? F?Zdg&?N1I??5??u?d?? 40?@? ;???n???y???Ol?? ?\?????n]~?Y?0????U????CIBM?A\W-1W a&!H?v??o????C???(???BT????hA??2P?B????,D2??5?C?i2???s[???PO!?E /?`????_???C??  ???6?^????bW6???Z?)`2e?j&+???(rAL????!???L-?r?RHk?%:$?????? Z?z+?g? CB??P_??6pZ[)?_[C?$k??..FQ?X%?w ??40?75@?? ????????rX????O????????????qk??x?y|z????H??Q?$"??G?)?\s???? ?v??$;??Z??Z??Q?y?????|EHK?b?oj?y???N??????iE????q?, ??d?!k?B?????$?,H ??????S?Y9J?fb?S)?g?h???A?3?s ?d??x?Y?3??  6?pM????v&??1C?????xhz8?$?L???8?????>???P?????t( Fmw??????,??+?r?Y???y;!l??????w?-@?%r F!?x??]?Z??Y@?f?v???d~?i?'?a?Fbr??Z$? ??'??d?E?#?????$??M??BO????2?<???.?_??b]^? ????T{?????W???? ??s?w???????{#???)??/n ??????)?hR8?S??T?4?8??#?J?%1?H"? ??'???F????%"X??A7.??!?Q?b??Wp?????????Bv??|?(G??'???{i??G!????i????g?Y??????????068?` 8???mHZ???5?Q5? ?4???`T $?xJ?]?n?+?9~???? j??UW?{?5}rpp?<.??%??LD?+??Jx???Q_??A???\H??4][a??-???o*di? k????C??\\L?)???n[?U-??DVT??J?[ M???)??????.??a*??A?)]?.m?S???T` d?? ?g??3? ?R????.hL????'?s,???3?!g?c?9????GC??E???Hr??-?????/]?(???c,S?9???????B 9y6?$?)?Ga????m??<}???gK?J??={??S?N ??l2?W??\????*2=?i?M????????l?Sv?$??$rC??0??Zw?B?1?x^???)uQ!?O?S????PF????O?2??L??3??5?l?N??PR???u?vZ??~S?+? ?xAww?????D???.?????W??`?r??e%q?????h/?q???????????????????S????(?h????;??m???S?i????????{?v?sL?????@:????? ????,?u????0?l?6?w?mu???????'?q`? ????C?x???Yq?/?_Y?,??D????????,^??? q?O?`Y? \X???????b???W????e%r???xu[ ?????E???&??????????4E?_v>7????c? ~??????J ?q??????$?N??I?&??:?vJ*????????HaNx????H1%:????,S?F?.?O????>??Z ????8x??-???0?????w?????)h???d?-T; (*^?C??V????nAd?Q??'Cz???&??|??1???n?7}}???+x???0????U?aE??P?#???pA0???'? ?J??A?q?A?Wp?z>???f; ?nT#????{?e?[#?~??? Wk?Aj???n]????~?0M?? ???"???_:?6???L:???*??qi& ?83?y? ??A8???`[???y??@Bz.?4 dX?(lM?=?)??$Jt??j<?8 ?Ug?*??^+?l`8????X?????????Az???+????vPM?+????kk??GY{ ???%@???l??C?`??bE?)???b???????,?S???kM???8m&????9r?>????o???X??`?_o????q??`7yqW?????_??%??dM?+uG?/A?????????Tv?Mh?o?o???w????B?JNW?U{MU??????[@??J.?????A???I???N?W?i?/???W?d???????6Q ??EX???????????]A???S??f.??`{'?h |m?? J???{?????^??q"?lZ??j??|???{?k??hp?7?/!???U?&????C2?8?%!]?*??????1????r6oe?I?k :?Y??u??W???oS&abd? ?1??t?f?I >?}_?Zm??[??j???6X????F3~?zk???y???????????Z?nk???????9]??0jNy?h?t???cR3??L?KA?Q????g/???t?????M????8)C?? ?\?.)p?Pd?jN?????M?9j???)????????? =????4????L?$?;????uV?;??1 ???*?"'??$?nm???M??9???6?&?R?}?4'????t???>r?9Uf????jm????V???n??~h ????I?h?Ql????#??O?s??I ????kF????TmB_{?m???|u??O?S?@Z??c??a?9?+F@Ig*?]???????c??????}?V??????????>??hc?S??31v[X?$??:3?;UI???E?q??E%??+??~&!?D????`'?4>?B:?%??XB`?????tLI?@9g??h?AExD?;]???:??mMv[2??mJy?X???~,??5??U$??>EW????gEO?[?\?R-?0?Y?8????*k???H??0?,?Q?  ?.?V?+G?2)y????q?~ ?b?/U;5?}fo?7??E;d?c??K???^r?s?%W??Z?O 6?=????T???l????e??f??)???????'?b+m??,??FX ??G ???r?5?G?wmlj7????6taX?V????T?|1?,G???y6\j.*'?{?/Z??]gJ?j??5??u?J???F?]?XZ25??)P??(?]? ?@1Re?=?Pk~cs?T??=v?????????2?TN.??6??Nk?K???????R?? ???`??.;NQ?"? ?p??a?c??TK???C?--??????i?G6?W??;??SHdD?c??????-???6???a????? *???A??Zhq?'d????)?Z?"?57/u'-?-?????.*q??B Tn?t&e8??Lg?R?O?? ??@?M????????e???-(Io?????uj??????4???t ?C?_?r???c??8Q9:??q?????6???qt????????5?: .?(?f7F-?i??^????Q?%??Q?F?~9 ?3?y?????q???G?pN??i? Z??}???kVu??????\5~?W/m?^>$???2???C?j?m???a(q????PB m?~???j?>vt[C??Y}???5???\_???;S?f??(???NTZ??J l?$?UqRZ??nU????lz?*???N?Wj?,?%k????????5]?o?1??Z??????k???r????2?C?ZG? ??" ??vo??o???S,???wI???G1_/?)???6??i? !???????M?n?)7?uk??t?]E??????LS?q?!?5?Ec?Z???4??&=2$V?o(_?Agtz??H?L?A??K ???d??GelS????*ge???SFn?r?x?S?$3?????|???8fN???D???8L?????A?3|G??E?w?UB??:#????X????2?????K????{??S\?J=??L!i??J???L?RH??db??X??\ko???1????????T(??m ??E?U0n?j ?t?k???z?q??;^w-???#@&???@?XA?T???????4ZbJ?????.I???2Jv??H??vk]??8 ?????n_?Bhs?!??T??C}?c????I????u????o#*U????? ???? ????@6?w?G+MgaESDY?????rk???????5W?8?F????H)??j?dk???8G??9qc????G?U?s?U??2?[?j?,]?? ?m?d?>?????????)? ?? ???&??$?kPt1????V?dF?%?????r6k??'???6^?$?j?^?)-{2?????????u!??????<+EG??S??I?????_O*,?Jc?u?4?V??*?????? H_i??n????W????}???a????????f_??3??Lo?$??????q???h;??'?z3??$?^????N??1?k??5?&?M ???Mf??N?V??n]?i?/??b?????$?u'?:?L?_f?A?U.?v{?x?H?7_*????% z?T0??Yq??????v?v?????j,N???nl?aHh at???x???????0??m=?;:?,5[?T???????Zcus.?<5?qPL???^??*Y?????h?mO????j?? p?? ????\?6?`?OO??|L??????r??O?7EQ?L??!?J?M?????ub'?1??fJ;?/F???D??Ix??8#*????8k]?e??]?Bm,??N?uT??te ????h,7???,?P2PI?m??l?????OtFG >?0e%?? j?????d???*l?g?vh?d?^????@?j ??.? ?????}{?*?n=?Fs?Z??q?\j?o?+????~:k? ??[??(W???N:?y?????3?X_?? 4?6?*??z?v???3?Mu?? ???C~ ?F:?i????d??????#9?l?'??NT??????? ???@??T?,?????'?o ??????Rz???~.?????xN???8P?[?J?I%?? g\pI??$?X|? ???gP??>\??&??????$"6??3wN?p'????0l?p?????'?*??1saL*?????@??H???(??gr????j?b7?41aG?7A?D??F?ET???uo?????+L&????1W???D?w???????J:_??bN&.??)????Bs?s?}*z?*???;???.0 ?B?DX?R?*?<I?w?? Q!i?+ ;BA???????Y??)_4V?F??H?sx" E????e8?\????^??????MGO?'??X???3??RH&??,?#H?+?qp?*???~??TC????I?? ?? ?(?Utr?il: E???`??8k???=sbQ?)}????X./?}??g?0?c??????*??3?7???u?vz???x??Mh????4???g? H??2$y@?7!??|?s?? H\@?W???$. qMH\@?bN\???9q1'.????x&$ ? ??????)`n ??????)?sS$E at R$E at R$E at R$E?" )?" )?" )?" )??? ?? ?? ?@??~? D?u??9)?" *"??" *?sR??1'E?IsR??1'E?I???HJ??J??J???9)E??!????,?}Gl??b?(????z }? ?B1 ]??" ?f0,?1??b#D:q?y???U?+?_6??W?*?????A??eT?p?d5iT??(??mq??&????G?L?/??4???!*??yQ%?/^^,?????????E,?????(l#???*?f?"?7{8??'?=^Q?^UN1M!vp5?????$???r"p?6?K?'b????M??? C)?{'r???/?? ??nL?&*%s??????4V??n-~$???N6?-f?^`'s??s$v^Q????X??9???^?|?/&??? ~ ??F*???? G=? ?????"?y?%???Vl?*V??#x??b/??W(?F,&s???QM????O? ??b??(/`??x?????H ??H?QB?????B???&???????c???y1\??? /?Y?|???$??a?b?8?????~?kU/??M??e???g????????C_?+?R \? .~O?:?I??3P?\?a ???>?{?9?b Z??"N?atGw/n:HB??? vR#/\??@~ ??qt?JA?t ??????q at A???:@g?????P? r??r?Oy?????=/?t^UA? J??h ??ePp??~!j?F?y?? 9,`?????5(??87l???e?h?]?#??? h{KhW!?????3d?)?V#)???vs? ?"? B?!C?A9H?E ?`2?? 'K]?!??,??!??aFyC0????X?g*??@?A?N??K?0?CB;U.?????!^?T?4:y? \X?Ox??riy9-????b?|H Y?P?|???\?<0????'? ?^6i?x%\!?ax???/a??/??c??e9?J???(s???0???^?t?&=lo?? h? ?@?i??????!?u??CP?C?????E???O???@?d h,?Xz?/C?_N ???#??r?????j?RE???I????8??#?\??x!bK?'?????0???!n?_B%?*B? ?KUC??? ? ?? ???B?&?2????N?}d5?2?s??q Z??e???a??T9Uid????k !??*????F??k?????P_?0,9pe??????? >?????v9??*??k"*?h%A????v >?%M?O? QQ#??0??2a??A ???K???V ??????`?!q.: U!???&?.?y?C,|?_B?? ??`vQ_?????Ab?X?#??~???0?E???????[?`?a?D;W?????`?X?qP??? ??9 "(f?jdsiv?: MCC?O?,jp#?f?&V???e?9?`????2??(?VX???tU???as ?|???n???yA?91??`???&?B?a?%Chy\'??l? 4????????d?? ???^???????" ?F?@?n? 86???(j?]??!?u?Ep?C??C????X?B"??i6? j?? ?q???&}?`b`:???\D:yhc?`?U? ?i??AA??E??7]%?U??$???N???4 ???A??? eA{a?b?z??h??? L??????? ?f ?j?r?s?Nk?h???.%??? ?N-?m?l??L?<,8K%??????????p?(?? OX`^Y3Y ?`?H}$???????wA?;?le??x?/?"?r8XDy?[K??0 ?C+???r nQ>6???u????#???k3 [??b???'dQ? $U-Vj. ?#??W???????8??e?g?*?c??T4kc?? ?sNJ??? H\x2?Z?1c?????B`D?3??3Ej??G0 ??U?? <FB:? ??0?g s?d?QNP?B??`i?9SiP???P?@??y ??!S(?~?? 7\0???dB^??C?Pt??? ?pf?M??|f\??i?@??!?Yxh?eMEQ??%4???64B??9S"ha??????x?_?9?A"?????????? ??,?? ?jZ]? XGEV+ ?,?????-A?P?$(,?a ??5???Z?L?(?A ~??6Z??h? ? ??(cY?? ???T???vA??o??o??X ??Z?Xp? ?8bZv?????m??4?~^_b?dp??a:????T%bc??K?r8+??????C,"Cl??Sp0?%(???5rB&?D?WM?J????q?J??A?:?%SD?H^:E1(?}? ? !? uL???C*8???? ??EH~???u????? A?J?K?Y??I???[???S??H z@??BvE??2?*d??*T`?)x$??p??bu???tDZ  ??Aa"?e??i?U???tC?ADV!z ?%?*Lj????G4mz]??*? B?t??4?R q?????A?C]???????i???!v 6??Y???M?![?:?0?)v ? l?????`? _'???????? *!????p ??,,*r?~((A?????*?AD)?*A@?3Dj?6p??? ????f?BN?g?0???!>?? Z?????L+???AT??l????!Gh[Y[??~??????E}??~;??T?_,?X??VV??hq?|?KD,?#?x 1r??Bh?4v;??8:???^Q[?CSUBT@?i???7??????'??l???g(O?T??????D??[??@A?u Y? jN?}?lH !???2"nF???M??!?F8?w ????{?w?c?????@a_???????/j?6?_-ME??X??? ?8 r???N5?^?Ch`?u?y?????NM?E????84?????? ?(????0r???&???av????[d????r?/Aa??+???????idN?0?@AFB????? ?^_???i9n? ???????9?\8KC??M?k?;r????#?kU{X?&D???-?`0????%D0z? ????M??8:$?\??9????xH???$@?|?.C??]h??EH???_?y ?I??_?????py? HO??????pz kF?R?~???` cC? ??+?z?aN??\.?L?"G???q "?(????N?JZ ???BMY#~X!3&?g?)P!MM\???K??J?s??rl?f?G0g ???????????FM??S??M????j?y???0L???6sx?????>!~j?LhU?k?n??5???i|M???o????;?k?FL?62?!_"?FeO??+W??? z?????l.?j???!? ??{H????r[?ZN???z???g?N?9?sq??z?:??p?\?^??k?k???= #????????W ??????a;{:^2???U???????QR????!n?vbO?\]??`??$?A8? ??? ????w@???p`1??:?C?%H=?7 ??ye4f??GD2?b??o???? ????F?o/ T%?F?>??|l???1?????ot, ?C?$??Y ???k?|?h?<??-??F??a#?!??????Fy>???e???'??I?????)?5?2sxy??????r?????@??^5???????? @fXH ?7?1A?R/0)?  3????e/??%tu ,??F;?{^7?FC??????`@?!???pE??!??i1 l??+?7q?K,? +?|???m V?"X?????9) EPREhw= ??K??????N ??'>pjQ?r*?a??jQ?nR (?????f:????7 )i0?WJ9m'`?t?%?*9?? Ru?=??????????L??g?)x?8 -??$-??u ._G?E'F???]8?G?pg#B?s ??s3??.?w???/m"4????^ R?k???.??/pV??"?~A???!?@????? ?o???y?x?X ????Cxz?L{B-?0V????L^;?qb@?? ?? ?C?`?IO4??e???A?@?E?"?K[???H???Qu ?x?z?;??b?\U????l????;???Ft?@? ??9?R?y??F@???d?X????????R?tpS?!??????:*?T??Vj???????BU????:?4 ????9m? ?H?2:?y5???kou??4??U??????????7s?5 ?uS???iAD???????T?S=`?!0?Q?? O?#*??}?5??????i?7?.? !)t>?A?v???_5??|=??:_BO?H$???z.?55??;_B at Px,!???j?G?]?W??????1? #?o? #Lx2o_?yf?3WGt??ru?J????????????>?0u1fp U?F???[2p???y????O?[???????\L??}???|Wgo^A?q?|?}d??=CBH???W?U}?P????{X5???????RC@x???CO? ????~?+???\????:V??j7]$E??=??" R????? ?Sn ??KB?V)pu?j??? ???`??????"????d>??%t?fc8?I???? :6??c ?%????????)?7??#?b?C0??S??w ? ?U???QYg?I???~?sH?:???j1??7???G2q"}j?M???s ?[ ???(???=?#?????>rb?{-??0???p???????{?{??????'?z"9(????c M?O\P??o@ ??$6??/????????2~C ?????;??3b??Q???U? ??R????T<3 ???N???$UDz???t(U??$???_F?"????Gt*?3????9B!_GL?????S?R???:?[8??U?bb?$?????"?N?.?S???p?+B?1B?qB? ?S%4M?C? ????+D|vz???????4???&?!r????'?}??(d???~????LY?????~"?7?6V)???P?P?2???Q?%7??a????w?@#?Ty?h?A??FL{?? ?^?ai?8???+#?9?Bd"?M?&$??:????n??B?? Y??4?? zB(T?)?;???XM?P?R%@???z"?qIgU$?J??????V????f?=??DO?????O!??Pe???tZH??????v TH ??a????D ???? =???pex?j?????W???.x? 5'??`??6?[ oC(JB?@Bd*???Jx?G?6PR???ruN??}`yh B?z?}?il:'4??#?*??w4 :)B???a??????Q ?????g???H?PI??0 at j? z???Q!?b5C\????B??n???y?)?8V54|e???????' uy??M?'?P?i?:???2?? ??laX@#H?t%4?1??J???&C??????????wC /???Q??X?? YB???!<B?? #?J???/B./8 ?P:?P?P9O4j??B?%?D????@?8???is??>D`a"???D????ad.5???^??c?? X??`0?HHJO??| P???a?#????"?PO???0??EU???,? lq??>?s ?~?L??Sa?B?"F}?=?p??p at M s?*z?7?LQ'????:??????J?l?u?OB??t?Gl:h,?R`0? a ?H?????,??Y??@?P ??B?OOd"5Yq?e????,D?O@??[?????DD"z??E??P???a?B@W???A?????? x ?????*??*.?jE??????????!??#X?G?(A?!?9?Gf#?{M?!Xg F#zB??2?N!??Q?#X?GP&D??D?"4??? ???ZH? =???%??>@??A?!\Q?????\!j.D??1?3?r??+b.????{)????!z~dZ?????3???Hg?!]?m???lC??????CO4??-t!~????mh{?G/?3?e?D???%@X???"??zw?p?D???SN?9?"SR?R!?M;?p"?;?????n?~ ???B?T??Gzu????d??S#9B? ???(B2z!?"????G?~?????G?Gya??????v Q?%/|t???Q^?#??7h>??=F?gb?dXy????T? ??r=??]?U?7((*H??y???@auA?!n;?6????O`?O?d.\ ???o? qu?Z?(? ?L? ?A?K?m?F?.~??DO*c? ???f???P?D???!?{? ?R_Re?? ?}???Fb?q?? =a???.B(?R?a????F???T"?\#Og????H????*??q?w3?????G$??D?????g(??t??h? z?|W?&??#?-}L?o?E?? t?c?}? ~??,?n;? ??QQ"?oG?=NO ???C\?"s?!-????? \??,?D#8C?????}???B?Y??9=?/???Q?Si???e9??3??yVt4?"2????0?????D?MA?A?I?]?????4w?? ?R_kG+'f????? ???????????FL??????v?????p/?=?g?j??w?1??????????g??j??z????????t????lJ=%?f?????s??5=?;???{??av5nU?????z?R???!?G?`??????g?~)?????x????$?GjV????????m??|??Y?? o???"?? V.?c?{<7???p?`+??pv? *? .?G???l???}??\m?4???V??N/k ??ik???~???]?N0??nT???h????????:? uy?5_[?L.??7??;?r???#????????}???Zm}??u?^+7*??!??W?{?X<{????????H_???????%?]????E?,w2o/?J???2 ?3p?@?Pa?????????????t??wV???z???????f????/?W?X??f?ml?n?`???A?g*????Iz??`????p)?VWGFA??*???]Y?1u"7?;s??Nw???????Pc??J?]????Z|Z??B}q??X#??Nc??h4?{?@?? ~5??\????,??Y???3???h ???'?3)L??0?@m??X??&?8,5?? [u??????\??@?,??o7???N?1?? M??wA][?????? ?1??KqK????m??8??????g?>??????57???o?"&Ao4 HS(Tl?????[&??8????24 F???? U???????~?j,1??1?|???Q?????1???????????S_),?l?3+??(?????P?e3?,3HT?????? O??Gcr?????m??U???tT?Nf%u?mU??Z]?k??q_?k?(?+>P???L?F?K?@V???????v??5?Q?V?X_?kt???D?'P?w=??e?tubv=?????y???PSM??[??w?l5Y-?? o??Bkm?hJi>??/?Zh?v?b?9I&0FL[? ??T?,?V??Z?0n???q???iC?,???j??s'????m?O??F?????E?8? *5???";???y????\^?+; ??fa??fA?? Txc????L?5???6-????2?"?]k?aZ????'\57s?)?(f??????e? ??4?s5?4????m???w???5e??? f??VGU????,?R???????8??A#??nc6tg?,K ??F????/?????Z?Du???s???5x?Z?4t+?????0d?7SK?P?q??y L? ?n2?h=a?????????V??M? ?s kb???,?YR=?|?l??????q????S???D?_ f??7 ??V??gn?R"??+e.???,?/?])??Hz??Z?f?Y^oq?????l???:]???M ?? ?6 $C6JSBtQ?m???w????"d?????@k????2?d?C?6??@??:c? ?[?3???l????ao????[??3??? (?3???X??W}?3!???hM??????-?0Q^TD?a??=3??:?^F?F9*?L(?x??w?R??,'&?????mY???P ????????.Q?K??B?1?K?36?Z??f?4w?.Y??2?6[C??Aj???\?;????E??VW???"??{t??Zn?i??z??C??/???????'L?X?d??.p?TI jK??:fYa?4v1k???A?? 3K???P????D&???????({??,S$????Ml?P? ???6??????HcV??`??????.`fWWM+ z??????}q?w{???????ke}???|?52>????D?52o\k ??/?????o? ?*?s?br?????%??????j'?j6Y??N???J???????Z??o??n???V????[n??????%??Q??? p?C?y?@???????3?Xe*??N????c??MIK?:??U???2#???l??{9?C???????V?v[}??j???rlt?f?m?5???M???:??J?M?:r j??C?f???{?2w???D??HAS{?????]?7????????3??)A{0X K??9Z???ju??>?H??s?n$5s?_???c? ++???{?`M?????? ?????\X7?q???~h??????Q?}?|^m?????m7??,??$?cS???<???j? _|?3????3n??Cl?9j???-;?[?|&ZgGF??B?m???5k?3??3k???1?^?B???5??v0i?????o?p????mL??d?[K?hl.*??]??M???????????u??y??h?PK???2?%??dj???cI%??K?Z??]p??m??$??*? ????5? \?``T)q&???V?2???G??UV?4? R34?Q????`?x??w?mc??M6?S[?7???g???qk?}?????R?? ??>Q[???|O?l?~3?????????v????]???,?>???4??4?????V?G???:??<}?ozz?U????? `???????$????????*??"u??7e\K]Moy?&?w????D???w??????Qi??????P???1.c??????]???f??u????1??t;??34????@?I????????g?x?????r:w[:l?TlP?Y!HO?r??:7??[?.!{S> ???t??6l?y???u?[ X???h???#l??v????Z?>G??B????????????)K?X??M!??D????_k.?q?J?]??0t?????,'???B????h???-=??7 ?????i????d??R?A?d?*S??3???r)???????e?J{K??n@??^y f ???n{?r??mj?:????? B3?"?N?|M????ZP?&?2u??k? ?#?{?Q????wY?????85(T?rcc?[?IZ?+?%C7??%"}0?DZN??\5?^K)O????t?????kS??l ?U?S?y??*J?M??L*EJf????????71????a??s]?3?VJJ`?i?F?j;??zm???Ge??I??K??1????z???W?O??W%?????B?g????[]s????????%???vx! ?3???5rGl?0w??? ???%???v????????m?u???????yt???m???.N??g?uO?-?0>????y?? vy???#%4??M???m??_?g????g??/??????7X?4????g??n??b?{?s3?w=tkL??-??C7?Bm?9?o?5[}1E?h????% ??*cA??T?6?q?|?\??>?????C?79Ta*F?3 ? ?n??v?7~??n??M\??? V?8?>Z?G-?{???Zc5??b??[??%Q????:3???!?Jm,?4?c?)??y??????)?vU?VT2wHV??Z?y??]??O=??omt??E?0??C??T????'&k8fL[?T?1??y"??w7? d?h?*e?B'^??T ??k?6Y?u?G??Il??T????YF?,??????qK??Cf?F9lp?Zs ?u?( ??i?????????>?????M???u???????}e?v?a*?[x?p?`?4k?j????????Z?.'??W6&6&k ???Zqofa??{4?g,5???x???r??=?A57Mz??Nq?????7?????]W?I? cG?????7?(???{_??w???0?H9??7r?? ,m??????.?*j???3?B6?U?I??E3???Dy???XF??[?h?K?Hb??Ve@??????X#???3=?r???8|T*m??Sk??f?6?@?-F?????L??h}q??v???WBe?????????nk??OowS??Tt?|",?N???9????V7??{?c?LF??????)U?Y????b`#??)???C.g'5-?N?bb?t3?jMy[p?????????{?5????? ???/`P]???H?wi?Y??????????[z?vsT????????^?????D?_Y??U??a?Z?7?S?j?????S?6S??z?s3{m?3??????!?$s???g?d?5???!?q??nj?u2????;=?7V|fGi9}q!Z??>??????????K??G?^r?.????? qd?C&??_XA?_[i,?e???,{QA???? ?OCr?Z??j?p?Ar??????G??Ng???OXjY?tKN??zVK]?%]Ba+???|VK?L' b???OXj?????-u????[??', ?TK^??'-=b???O?s?????m?v?X[b??V????D?fQ?"Yr>??^??vF?K????Z?.?\?%f??U??????U#?k??_??P????fWj*??|}?F???"J?m2;??o??|Ca??Z??o?Iidf??lmXg8????R???????t&kf?T??U~ ?s0???'?? K???Z?Txa?{???'L\?:v??{?L@?,|?^?N~??V??????s? K???XR?m?[]????9"$s????ed????,?'?$???????^XB&? ???2k??F??\O??i?efw? ??? ??t?j6???o??j?7???????l?6+?????*{?x???????J???+?? ?3???1??'?????????U??n???x>S#??????qu????2????v????t??Z?5??2????k ???,?????m????%e)_B?5???p???'][????e7V-?'????hH?????;a~][?Hb??4M?*8x?^??J ?wlR???U?????????bv?L?p????V?n?J?t???? ???@:!/???^f?]???'?u?U[?j???????m??+???9X94[8@?Z??u???u?X?v9#W??f}?S[[_????????3? 4?' ??????'e'P??F????:?? ???????Z??Z???' o6&wO???u:??wY??S??????????????g? g??K,(?6?.????:??O:= ?j9?tri?$vr???K5wJ ?A*|??!?????? F? H????c???#????(1?I?B??P6l?? v ???y3??e?????V????+??W?=V3??g?a???&>0YQ[?<9?_%?)? 1&????ctu?:???mr??Wk?o<wtv???b}o?????????yd???O????6??/???1?jN;?*\?'??qJ?(#L???4?Z}'?X??#@?\N_([??7q??F8?_??? ??9????????V>7?2DV????=N????????y1????`??Tl?*??F???F?aw?f????? A5????wao??G+???Jg??Rk.???'?{'W?x???f?z?&>?&????*l,???[9{O>??&???b??????[W???K?????b???????????{??_????x?W??????????_:??????????/}( ??V?!??}?W?61??7?ME? d1T>1S?90[9Z:X?z??????z???x?{?|?{?w??_???????8???/????_?.???7??]?=?{?w?w?????{?yk?,???$50/???X??z/???]?}????{??+???????}?w???????????K????91?????w>y?M??j>??v??s???????Wx?????~?=ZG?Y????9^N?k??? S3?????Z???u???????'???V ~^??_x?'??s??_????|?;V?J%[d??w???????1?????? ?p??q?e???4^??#Z?F??????? ?^??5????z????????a\v?'?~?????.?bd?t|???????c17??!??]??@?????? ???????3????__|??g???\??CCK????????Y~s??j??????????L.t&?+??????/{?~?a>g??s`????uZ?7?=F[]?Q???V?q:Pc?Cg??c???&?u??a4???{??????? ???N??xOT????x??+?{??c?????????.??Oo]g4??9B??/??v, ?? ?????J?+???{?\??{7?|???%[{???????u????S?ExY?f?LX#q5b?????????K?????*$KY?'yR??ix??????i??X????O??/?????????{[m???f??1`???cU[-??:???DS??}?P?{?????????????????q??O????????????|??????1??4T??????L??%J???qf?X6Y9w*G?bIDQ??4??Z? ?????jq??4?? ??r?L??gu??w???0????D5m?????????????;?V??? ?? ??g?YW???v?p9?~^ ??<??????0?v|}Q??642?|S?A???8???`^?o _2?(]?c?????\0? O&?qs?5?1rU?????f ?]??8Uo:w7K?M?F??????H?=?????????r???^??d?q?;????z????xHz`????\???0??{??>U???>??}???_y????????ev ?v????c?`o?<??? ????8?O?y??????????:"?zq?o????????2??n???]=?????z?W????????\x?_z?+?????|??X??Z}?x????.?9v?z?KM?? ??{H?q, -??.??_s??+MB??g/?????7\????V{?b????/' p??WZ?5??? ???H?.?K????_????!?????q??????]??????%???I??w???T?:???p?????J??????O?n??;?PT?~?a??&l?d???o????%? /??5???'!?O|?Q??Fw???lt?????BZ????* ?????OD?w+??u??????????j??#B ?}F J?H?????,?????zQ?0q0?YE?EO?????????????#c?s?ZxG-??]???/????o?l????}??????? w???G???~S(n?|/????U?z??/?'?q?L??t??????????F???94[>1c)???g~{?????r?E??0?*????zE1????w{=??N??r?zohEn?y[f????2???TY?F????v/?|???? ?+???u??u~/?T???? K v??m?Yz??????z??? "?l?????`??n??? ?kJ Q?c??w?>1q????l?Q???;???M???????>???p?he?/???h?)?"?????=*????/???\n????J??a????{?g?P*U??V??U?6?? ?.?????w??=??/????i??; ?????K?????g+???? u`f?]??G+U??`?6m?(?y?T?????????s?3? gv?p:U???6R6v??IU??\??T?Gv??JUh?\a5Uau? ?RNmQ????Pvx?+???!?5,0?J??'W?E???E?vt?k???)i%R????e?w???q|\d?M?????????r??k?????J??p?p??.L??8?????T9Ls??????)?;)?????L? E)tV*?C??r????.Sy??z??(Y?v??W?J}?!??0????*bm??)?}AO??R?`????5????|?(\?e9E????{O?}??w ?e????/??~???|?O????bqmdnnt-c?????dVjZ?K5??.'8???L????????0???\h.??^? ????Ta??w???????????h? ?y?????D???]{??/???????Z??R?&?E?v?????{???W~mn???q????5)???? ?|???????7i?}l??Pz *A??WLk+=j6N`???_1?????V?A\Q2?OT0"^5?s?????Y?Z?#?????t??%=??????+z? #???6?]3????z?????s????????????^W2(j???r?W?o???J? m?;?h???g?*?9iUi??uxK}???7z7^}?????G/>A?z?????'C?|?c???'"?e4?oB#z?Z???`????O?q?? ???/??z?F`9G???dk??d?I?h?*?Q?N???K???????Q?? ???????????fp??&&?j?M??????)?|???Y???3F=?G?=??7f???L??T2???e????_???z????D+???BP|/?G?) ?6K????????6?? ?????,4R?????^??g_[???-???%k??, ???;?|?w?????6??_)???i????V/??U?s????:T???e???z??????'T?vdXm?#?V*?Wj???{??zt?5 ???I???_?o?RfC?r?<.en?????3v????NEY???|?g?<;?~??aN*? ????? ))Z3?2???h????V? $???sy'????>???^???,?~????q????m???r????????????????_W??s?:?}??zS?? ????`??>X^~??7~?&?'??+??O?I~?? ??^?M?8?h??j??}nX?8 ~?^SR?D???-X?a?V[???6??+????p?d?Z???OZ???fg????????8??u?????X?[???????r???>g??\??C>? ?A????b??????z?N35?i/L8????????{/&k??????????K1??????0?(?????? ????????????? ??e?]?mt[?0?y????????????O??3??)q??^?????X??/????#???' ???w???K??N?|?????#t4?[~i1S[?D>?{a#k/?? ?91]A@???7b!?e?-??Wz?:?uZ???ds?Vl??`????? ???? ?q at FK?\??????o??2?Q?Go?:+?9c?Y0?H?h?D??v?e????? 1z??m?.LNN??tf*9v??Gny:m%r??GD ??/?y%5??\?3??? ???#t??T??4??g?_??7^???p=????|W$Q=v0?z^?I? ???????????0???{k??{?g???{?S\Hd ?c???O???w????????????????'b??O???M???bz?E?*??sW?_x??????????+J???Jds?/?*??S?>><"9????~??7z??O????u?3s???b9>5 U?{???_9????????4Z?a?7??3?;m???5v?]?Hq?????{x?}??Xr????????C??30??\g?kL? ?6w?Sj6r?-?1???w?S:|???s?iM?%??F??j?[b?,?y?>RTT??H\??f?t??c???????~X3?&J'???W??3B/?7?[?p?5?M???$?????/R|s? ;{????S???????????????jKF]?w5D?????VE????????v?p;{?jm?S?b?M+?? ?? f???????H????? ?[???J???7???[?p^J??)?d???C?~?B??z???_??W?B?}???????&??L3????S?y?q`Z?w?{?b???????R??p?pO??q?????2?)T???zk???7V?*"??!?Jl*???m?/+b??)??;?????????n6? ?p?y??+????7????o?F?p??1UA???????o??????m'?Y????/????j???y????????{??T???+?Pb??,??[ ??I????C?ptH???_??????u?i?O???a3???v?q?j????????/?u??V'????????=Z??o?????GX???9B ??????v?????E&?T@?0??????%?/???????C??}??KO???gq???S????PQI-?l??Q6?'?????? ???)KI3E?}D??L??R???F??S??k/????j ???$????7???e)j????"???????o??????]?5_??*?k?-?~#??5??????????????S????????zwaJ`?????Rcar?E??-;X4)?G??XR?'e5?=???o??2??u??|???????????{???*???????r u? ?W?aL???|????!c??o?'_??Z\m?&K{6?O???ZD>5???e????p???rj{??]????????cj?_S?m'Z??ta???????????J i?{?q}?/???ax???,?^?O???J;&}|?i?????3l??s?"n?xk?^V??O?:?????t)a??p(??liM?????L?%??H@???[?/)???_~???? ??I?p??o\??W~??I?u?!??s????]{??X???y??E??#???@?E[?????N ??W?y?g??O)[??)?W?9???u???`?:??p??c?*>Z??;??J???eb??{????B ????=??}w9Z??%??R??????F?@??V{????p5????????`??????q(?>0N?V?{??s?;mu?????F???g?_????g?x??F???X_?V???4?b????????N?B[??n[?Jc????,A+Fz?O????Z(z?"????o??)??U?k??x???q $W? ?????m"??U?!???_Fm????:??$.C???G?Q?\???s?)?;???_c??"?M??^?x??x9?8?k1:qFe.xG?????/5?*MY???RG?(??wgs??>?1??p?????]a?z?\2??U5?}??????????????/???F???c?????F?/???????tpa???1?B?@/??OY>\??u???vPO?u???;vE?R??????6?g E?lv&;????M???????W??~??????o??m?&z??n???????s??_r\????q?????g/????????+#H?t=Eg? ?<???????????????Yi?U ?1,@?\Z?e??1t?B?+o?? ?NLW???Go?{,^Ch??1???&[??????&?[\[n??F}#i???????Qe8?:?DpQ?tI?????q?(?_IT?k??w??+?????+#??1Uz??1b?&??7????????????hv??F??w??n;??? ??t??z?? ???z???f?">AD???QnD-??|g?????/$2w?H????cg?N?-? M??Chs???_e??h?%?1,?7t??f?0f?\??(fW?$????????h?m???????[???pUBD?l??7b?????6??NB??.G?:?R?p????m???3?M?&????W??????b@???:K?X?w? UB,Qk?????n?y59???? ?? Mf)O?K??}? ????j??HWQ???&??t?%(1???_??~??J??z?w?=?N??W??_??=???^?]????#?40?f???7d??????$???p?????3W??????j?u??\;S??Aw??????:?]??????? ??~fD&?.????,??!???"? ?y??????m{&??L??0??lM(?B??,-?N?o5?Y'??v???b????l4????E???7V??XS#?????????G.8????X#??S?&?j?q5?????C????s?2Q[\k0??"Y????????y?L??:Z{,o???X_{?,P*??? ??+&?7/???R??$?? ???????2~?N??Dn??HpABPN??M??????3????????A???q????^n?P#L?=????9??????*Q?L?I?!9????ou??????.X?????r??+*\??\???fJ?????????????????'?Vx?1-S??? j/???????D??Xo?e???e??-?? ~?{??/??K+)???????D?gE????@???H?8????{???N?O?*?+??c?"!?+? ??F!*a'???W?>3?8X?ql?q>CM?F?????f???75C????l[??????]{d???M.,5&??:????]Q???ofW??I@???-I@?6???C?B?2??sB???W????W?R;?8U?D?"?b????? ??O??i???T?n K??4!???~J???q?#}????)uW|,??_WN1?2????n??l?b?+??w?x?z{V?E?????3 >N??^??????P?r8'???p???F??G???xTL???????o???L??s????/>.T???}?_?y?w??W???~??o??W?^????U??>?e??:?-??/???6o?8s?v?????7&W???)????T??E\%?l?k?????2??w?T?????k?dk????p$?????????z?5??9_oS?v}r?v??Zs~a?Lc?S?L:?W??L?V??? .N?X?`?ou???:?=m?vc???P?????5r?U????O7???ks? =?????,?>?Q??Y% N?Q?????d???J??G[?V?9Va]?5?????UwM??????:???L*????>????>???b?E? ???@P?A??Y??????l????< ??U ????;?*N3?)?t?? ?GP??@)E?x?AmZO???)?>8?b1?xvx6?C?????????V? 8?@ ?? ??H-????1?y??CMW'?C???V????? ????B?|?$??d???"???h?`?V4????Zp?ym`i???qa???&? ?????b????????5?-???E_??????'~??h????????>(?b?=5? ??Th`J?2???w??o?e~??z??A??????? ?y?P]?Ox?)+e??u??r?m Y)??en???????(???<%l?^~ [V6???_6=??~???????,??N?7?v?????????? ^??|?Z??]%O?X,??H?Z?a ???d!???`? ??|3?`???%'?,?t??[???[??N1??X?t?? ??(?>U????l??bFEH?? ?????"c?= 9Ki?WV ?'????Z`v ]?p?u??@<????/+?.?????g???\?9????@?4e9?M?'???~??1?,??|??z??????????3????#~X??$????~ a?????U??1???kq???????????-kA&6???W?? ??"????????b??sH `??`?X?zR??^{??9?:ggZg????aj???T???yEq ???)JK?On6????I?? ??&x????&r?k???J?v?w??=????0?$?`+~ML?FUf?????e?>0>?q?:??????????3?u?V??| ?*???y ???]?n?tX/U|??7}|???W?K?????v?&e?i?.?LBEM?i??3?8l?????f{e???=?o?j8??|??????j??????l???N?N^???%y????x??4[?5?0I????+?P??ay#??_*??R?< 7??????K8Zy at V??TCO ???????1.?T???H8^???P?- ???e? ?{`aA?>?o)?^?)???Q?aZE???0?E?:q?1 ?L??H?0????\zd^,???yDMW??Ip?t,Dh??y!}e?g?89Z??GZ?It???" 6?r?q8???&$??Y+??? V???E?={?? ??:(???"??2s??????6?fr???Z?H????k??.)?1?b1?s??????%XL?b?;???9$?n !??z9??#,?-?UI+cVl????????????sr}%???gNX?E?R???Y??[.??-?(??Ge???z??G_??J??Oq8k?w=???????M???????,??J?gljt?1k?? -)XBrz?????pFa?puY?? ?d???2?4?m&??I?U?.s?????brDv>?\????z???Cac?H|c?N?"?W??80qv;??????|??(?#?'??R3I??%&?*LGN?d?mG?"? ?U??[C0m????(? ?L???~? ?{?????????? ??7:&J?#?c???uw????V????g#???.?B?I??|j?'?f??? ???? ^ ?K %?E ??D_??%????H4?????B??)a,q?????r???5U??&?{?a???g? "O???i?;???????6z9J?????%??)????7??v???/?R;?n?????m8?zc~?*??A?k????S+ ???f?4po?3?H??2o?=??L?Z?? iiJ ?#?=E??????@??@??Nc^??%???f?>?S??S$v?Dr?2???'?? 9h?f?OT?3cqf??3de??[???73??2G(??`?????????eX???????Iq?Y?G???I?D?1&R?(??H<)2d??v?,j?68b "?*+???????RH?I?????c??s? ??T??M????[?o'Z[??% ????s:?1O?F%]?` I9???7?@j"??e???K?)??6<????? ???E???a??D?O)? QNI?Qqt??g%?L????Ew x?t??t????)Xj???zG???? ?aT?3 ]00??q????STs8?l=? &{c???.0=?Z\Q?)?? e??X0?)tR?mn???????????}n???????????????S?b5?`???????*? V]?{]? ? ?mjJ????j7j0C???k%?b???????l? 88*??g?!???n?D?P???,Rg@? ??5s?j?U??p7??????f)6yW5Jd?Z)??@q?????/??_%?s(?F?????y?`?3?O??73wJ? $????????8?8?? 8????V????*N$q?S?)BP????8? \7n?d??)pH???Tk?J?.???R!?=?x????9????r????U???;??q??4???Rx?|??4?bm?Wt0?y{m?S?>??E??Q??p$L? 1c>J?A?I6? ??_??3?Br???hO2,????@?#?s??????q(?o??FF"????????,\??5?Vxc"?K?:x?QMuf?Eu?\???j[?.?/|?N?LP-?A???p6?????#??l?^q??????uH? ?|?L4E?j?dt?}???L?1???? ?9\??????q??:?*??????????u??I$`?0e]-?}??C?????HGJtB?1? ]@???????m? f?R?m?p,??W???1?A???EzN?T?Z?6????y??H,A?????h???8???X10???k?e%??~?2x??0?-.???W ?V-\?qK????$?~?c7[n????by??? Z??v??N????,!(1?+*?Z?6??8?o?+M?%?????????%??e??Z=???&?h?? ??k??6??H???38???9???|???.?/t7??\?KYxM??????C.?-????????q_R???%?;??ps??Q?ZG?I?7?0????A?Pp ?2??????y$?????S_$?%[??w??B50???;?UBd???????)?7??_FpE?Ja&??-????????g]|E?????n ??7????6??[{?@ss????[K?-#??TwG)1@??so????A?Sc?`+] ?B@???'?????f?1g?I??87????????????H?4??J?????B??????? 0S@ ?}??s???/????D]?l?L??WtBM??q?(?"??|#bx?[Y?6O(U???w?d?K?@???RE???+:T~rK????L??v??(rM?S?????K????B9?I%0?c?[D ?-?b??0???~???f??W?o??w;???b?<?y???(??????? \?P???%?]Sf?1%Jf??????`?u?m^??K????-d?Y58?????!w?????R"'1J/vRs??-???C?id??8? ????;?? -p??w????,?p*"7??????87DJ??!h??b?uVJQ??.82?l?D?kj 8??m?p????????Tb?5??5|??? ??`m???!??C?mk>?5g=??c????u??? md????d!??????????Ez:*9D?~?L??h+%?J;??R{q\ B?mQk??+??(???L?? ??M?;? }??4??1???|i????A?#hH????'f??fU]"f2?? ? oT?Ht???Q?+?B?$M??N$?O???R?c?v????n????#?7?<8?s??[??Bk??S??????????^???it&[??????9??3?0(A??U??C?X?>?~9>??]%~???)'?C?????G??? +q???????3m ??vJ??Wp?3?'] ???=?_: ?I????4m??tl????*n0????2????[??G?< ?+??Pv????J?J???????&w??????mC?E????????XgS4t??%?????e??qv???COm??????:????PC???{?p?????7??? ???:?D?n????t?^??u?;}.?xlY??H??#????4 O<C???73MZ??kP?$S_?$wg?A?q????B??^P??h??JuQ?:?h?"7?S??????4z?(?Sg??S?????? ???? `k??V?d?? ?(?LV??Y ??????$??#??dI?9? c????]eoM????#q???4 ???????????i????c??Q???E?E?X??e.??s?????/? ?o??#?h ??/L?gQl? ?=?$?r}???<?v???????G???G#'????~?90?8?WHM(9?2??TR??-???I,>u???f w??2???eZ??7|?0?^]K?? ?"???? R??d.>r.8)?y7???E2?'I0?Q?|7D??Eh ??0x??!???s??a{=_?????e???lR?l=@9C??J?;[?? N???s?.?9x?? ?P? ???sg??L]#-W?()??i[jr$N:?QP?6%]y?P???????/`??????$ya???e??`?i? ?????P?????B??C??v?????OP?ic5u??js1??Kmh'??c.?%Um??6?w?r?12??(??hs?e? ??%(\rD???????????o???z[?vO}????*??\??f????'??????%?????#??S??? )??`??? ?????^??=o??W?f?P???V?6Vm l??KsM w?d?a?s?????"?=??????/t???HA??Pn~?s????g??9brl?2?x???FI?????@?v68?@%??hK????????7]?????tw??ab??? ?????Qv??"?^G?c??mf??z?DpS?????f~b?56???wx??w?m~x3?xs>??;?????l??yV?l??a??3??N????????3?S*A;?`?||??F j?/??k?;?]#M??W???"x?LY????[|???x????????w?W "^??????.bR? Z???P ??????&??????'??O??????_??-'?5?e3S?????VT???l??{t?V(FV?_?r????x]?????Be8??2??\^? ?`??3????D^?????@w??Fa?,?k??!z? ?? ^??H`m??`?u ??A?~S\?x?XH7??O??"J???????`8?4"???`?)?????@M?t?? *?BW?? z9???8%????D$???????????j_?`U????|?g3??e?? ????N??fz?sq?? ?la,????l?5?H?9?`s!"J?]??????? #? \??f??Z?FO?(o??yi???????Lq?o? ?c^???? ~? ?? "?o???7+???u??R\?#?;??????T,???a?????????}H?\??????O????'??? B???_?89E?{??????? ????Tw?>z@????o?z|9+?'?v:c?C?????"P? h?(%e(??Q"$o?M?|?S~?%x?U?Qb,&ffs??6?????.????D(Y???T??z??4?7eR~LJz?Va??a?????(?]B???????y?B?" ??HRw \?g?S????WUp ?>0?;??=?????d???~??\????CT??9??rz???'}4?^???GG?????o???o?E??y;3???qh??E?B??????I??{r?????VS?????$??'?5 ?4R%???&'??????C2V d?r ?q0F?0BM?U? F??0V?`t0ZE[????????E/???~vq_ T?]?\???Y?????Q-??pu?E Y?? ??R?"?? X$??????E???c??????$!QYjQo?N?a??e???vvg???????r??&w???&/???]???????4?O"?T|?e? f?o??? '>?5?;???C!Zi_n???'Rv??;?,F!?+R????j@?H??rD0?.?K?+R?%B??%??*??V??s?cB?n?1????T????_????q? ???VI???_???~?w;?'?UT??}???~?z>??&bk?\ ???MA0???????A???H? ?)??VPIcF#???x????????e?`p#???????Z??.HJ?U?J?y5???? ?j??5?}S??????AF? ??)?_?x?G????Jw?Y???Q?????{??&?dkn??#??Gw?\???Zs?? ??UQ??B????????r#?7?0p?6(Nm???????A????+i??f??}????"??+??k7?V?I.???m????A????h#???s?o?????=?Q{Nx??}TN'l:Y???iU?t?? LW?twL?mC?K?BA?+H???C*P??k??????P?65??u???k?i?o7?./p?F??DOR(^???????N|????=)-h??l???z?+????g?q#?{????YN?>D$ ?sx?S?i?M?rmc/GtEm?}*??q?]?8??W+???D0?4~?????? /XT???????44????g???????r?Z+?u??+??9?;v-??8c?j?=?.?`RWHC????^*?Tc???????F??_ ??g????f??????o??}?`:??u'?)?????E? ?????5?6?w????E???!?(???????H??u????k?????????mN?N`??0I?g???Y??ik??]p?Br???wU?%?Ft? ??\??G? }??;???u^?? )??2=??o ??????e'#?j*??????:W?6??'LK??|?z??s??#U?F8??p??? &????H?X?s?]OA?????+??;?????m???L? ??<=??????e:?????`?????? ???7G???+7?,??????K/Ig]+Q?um??A?f<,?@*d0?$?C???D??~???/}?????%???????YQ?r ???*_?/?W??H?HA??X??I?-???&??W!\??? ???\LdE?O????}????tpQz$\?M????????????V.??`??? '?ZS??8o??t7)?&?N?????V?s???~>*j?_m?V??K? 1? )??h@:???M@???7L@???5&????\?%k?s???e???GL???X??$?t1f??rY}?????J?x??3????GC?????\???????_??2?2 G?M?V? *???h??W???@$ U8???O?????!?wD?M?i? ~???????h?? Q ??.#&?N??????????N3&????????Q???UV4'???C???2~1?X?}|}j?t????j?l-!K-?????[????pKi DK~??TLcr?~?5??#y??,??q?nW?????????)?????H?cjq??}^^%?N"??? ?-??vt|?F??????LeOK?y:????!v ????K'?&?F????V???????????K???r?o?????????8?%k at K???F???Z?'P?}??8??N?_SAdt? g?3o-???S??Rd,?+L?"?-?Av%???k????? ?x,? ???k?X!?.?????????Q??*&?:?n?G}#?c??? LgNr \?u_??~?^S8>?3]?g2???Pl??l!U?g?=wN~G?D??????A???z +?,q?X?X}CK}?A,??|/#???>???aS?<??? ???????4??S% 4?(???O%;??2kxp?6?,??D????? ?]C??????O?"?)??=?? ????xQ????? ?%px????(6(G?????O??P????&??4OV5?:????yS??P??????7?c?g?"?=m?? S??Bt]ZS???????L???K?s???p_?i? ??????s??}]?????k?j\cMt??vq??????/?R??JH? ???????? ?Y?~mQ Q?N?|???e??y?f6?/?8*??E??H^A? TU?jr????Xj???3?D??m?h ????9r???.9g-?????{?/ER,?aCdH????????=? C??C????4?3???,???_`4a??w???P??????x? ?P4???,??$TF??????vwt?o???Hq???B]?WU??????P???W?p????{2f?6?????(t?E?P??6?o??????~???/????UN?sp??&/??????U?u???????oG??7???????t2?;U|????/??"?K^?g??????o??U???B???-???????????;U 8???n? r??^? ??n?m%UDn???m??_?`?F?????9??V?(?W??M???,,?'?????|5??"???CU5????]?jj?*?Twn(?????????@8U??????RM4?5?@G???h6q?? ??|xW????????[????????I?^y]?GW?0???^????Tb_*?O)?5@?????????? zR??>???t?C?z D?W??{????????p??o?//?B?Jd:?;?l'?=]?8??U`???o?K?gmB8? ? ???? Q?5?????w?V?FV?}? 0O?\??b?S???????h?Z?{?????G?Q?]?r????? ??$?A???*????Wx *-T?i?9?W2x16??]0??v??????r???????????H?[????u6P?1YR?y?9?????EP}??q?.Q?d?e??? ??c??R ?C??kNFq|?????A n??}?c?:???gw?3??;?G?ow?????) ??zxO{G????jU+??[?^??????J?????.????(???[mpG??m??&$?/y?????[? ]?n;???o?"L?L????????????~( ????(?? %??#?l??-?G????'op???7?K ?4???cT?\??Z????%%c?d?|??_??????????8N??????x??? c????gw? ?y$?????D (bI??7???gvn?EYj?????+??Jc&?T>E ?T?S?sS'?M?????????p??J?,?N?~?? R?dg?>??^;{????u?q?{??e??????6~2O[/????&???*Uv????V????)??j?????SS??82ST#?AvO????oX/L8? ??:F??????????I??Q??????P?qSWz?X.?=??3???????9???W????????v????? s?GCs?H???=4lb$'??,6J[??32????Pe??zT???I8;?]=?3N?C??{g"y%G?:???`Ch}????????????NSoP?? ??fH?_????????c1p???? eP??7??!cj???7??)c*(? ?????-{?????5?????????U??;?wXS,??7????)?DXm???;US?d?^?5gV????#??i^??&???R#??B/''@?l????~A?p?K? >???M??>^??&?D????=U??f? ??L a????ac?????????BV?6?????w????2?I{?? *????9?IZ2?"??B=- >?Y?? ???FJI}????g??O?O? ??q[??H?ph?sC?+1?3??s?lfD?4?Ri????B?Yj??S????p?5;?Z ?C?@?-?G?Ar?? ?$i?????"??_Zg??.t ??d??Y?3?????r? qQ???M?u?m5)??A~?Y"?"??[??7Q?????/Q?R?C?.(:/??????w??u??]????dm??????`[???r??js?0?0`???????#????h?c??????psYQ????R?SYx?[!?_ cm4&?1Y79k??j?j??-.?6V???????r?j??F??????????y4|??p`?????m????????l??x??|+????|M?????U???_??S?L?T\+??5@[?)???;j??A??K?uQ???W???^m01????????T???d??????S??*?????:??B?}($???v%??|m?`c???8) Eb?Q???NH?s=?? ???xCK????/???:?Nt2o???W? ??+P4???NJ??????????H??-?aWw???-.Z?S??c???@ $?*????dM???o?? ?B?1???????^?{Mk?wp?????*x?8?<>?B???C*o0??17???i??(3?p?M??$??W???[?=?;T??????py?||??k????M?????1?L?a?"?P? ?K??W???)??? ,??<Z????j?d-Q?gpL+c??+????K??????????*?!7D?????F???b=]I??+?m,??|^Y??????,?ol?7???1\?B?t?? ?9???[??????' ?5?\G?#?& ??M'?.^?????????D?, 4F?A???S?Y????S??X?9a ?*}~xu?V?$\?????????Z2??/ ????  ???Es????X?00?????H??R??H????W^?&_????????,(\ ???(??1?Q?I???e;???6????|???? V?.'w?-??N?;?RY&*<7AM??F~J??S?D?%$?????????&?Xv`?????{?i??q?R?k??Z?N| S????\Y[=_:?d???,]?9?0?B??|?4'???N?????7???Ck??V?+?A__X]??{?????{O???&?g?a$?#??#???0?8'????r???eC;@ A???l?&?d?-????!?0VB?g?9??8?D0Yz???(?M2??P?Lfb*??? ??d ??U`??????1X??=?F2?(?p$4?XT ?g?$GV?;?j?HY??LX'G?'?>???????h??)?v? ???U62)??w?mhI?????M&U??7H3[??9?m?7?N|??{? ?0PbT?9{????!o=>?????.??*?E?S#??*!?????u??0???' ???N???c%?Kx}???$f"??????-J?J?KZ]MhZ??X?$???\{????????hCA?????Q|ew??oJ?????6??d3????.?M?????n?;??hnn?m???? ??|]7????p??"?Z?"R?',Z?Z1?+65?\6!'mZU?d???? ?????m??A???uP~?wp??tp?~?ioUu????W?c7??v??[]?????????7????w%?bb-Pm2???%C???z??< ???! ??:???:SY%?m????[?????@?B???A????\??\??_D1???#????????0n?z????+?a??pH?????%??0?^?6?bS? n?????@?Y?1x???}???(?[?M?? ?%mF{ ???P?@?a???;???k? R??pT?{?{?}?? {?;>,???n?u??F?T?]'????JD?D?)?z??} ?????R%?SM???P?/?hKt{!????4?EKj??k??0?hI$Vw?O??? {r??UM? ???K??,yL??ZM???????L??!???Vc?????????????{ ??tr????}?W????9j`??h? pVOo ????rS? ??8?? ?x????7?? ?x????7?? ?x????7?? ?x????7?? ?x????7xy????I?}?w??V^j??????y?@?? 7?? |k???(OGp!?6??????M??? T?I?{?0?????,?????+($)?U?? ????P???????04?"?2!:?|4?h?;?N~t B????1I{ n?+V??bF?? ?I y?h?'X'?????X??/iM? ?2?_???D?h?\??6;????.??z???[?~???+/?r?< g?? ??!?ju????)?;??< ?D?c??e2?q?A/??fC?$T?, )Jw??B?\Zf?]S7?i?0;|_v??.Z??[?H???7K:?B?QN? ?T4 ??.?bP?????U-!H3?iU1??w???o??%?#?r|??} ??r9B??ZDQ?j?@????p?i ???tm?3??>?]!l?Ge? ?"? ??????8?PP\???aD?A?[??????W9t???C?"??b?x??m{????4&??K?%???'?d?N?8HH?o^?Z?n&7????? d8????Z ???oB??J ?jV"??C?\?i??? [8 o}????j??=??@,O'G???????|1M?g??!? Y????vTl?4?? ??7E@?D??l nR??s????? 0???U?p??????f ???y??]j?a'AcGisK?):#?a?JV?????08R??(r]?&L?????a^f?@????? ??M??r3fp)?e? o?`?@M??????)#??[\????"9me&Y???]??c??q?o~?m??JW5???M??3?bf?"?s_%o?C?}&?\`????=?ke{?*:j??ydAE?a?????/??7?????Q???*(?V>4r?}o?%???????????ee?????~^4???????6C??i at vH? b ???????u????s ???,\?,i?^ ??t??E?7???????(?:7? #??,S???\?S/?vCEQ?? ???????Z??????!0?`C?z????c??????G ?l )??U?9?\ (e?L|?4???R1???QR?<:?????????v??~??D????DSXA?v???V???????s??y-~)??#8??xt?9??V???????3???&???q?s?|???? !Z?&??;?fh????s???<]`?[K??3BCo2????*?tu{w?R?gG?W?i$C)??$??6????`????GF?? ?v?*F@;??c38T???_"?? ???????>??????????'O?Z??a?X??c??????????????S?,?o ?? 5=?s??? =?Rf?c??Q-?$???????pGS??=?>?MQ7?6??????l !$N?m a??????H???i5.6??!F????z?[`m?|. &???????p?(?"?'?d{o?X???J?J?2>???v?v&?J|=*=?lbjb?????????????]4?v????M?@G;?????o>??7?k?+70T|D??h'QjC?C=?o?O~h?3}????????]_8q?or9R????? ?U???;?n??3??x???F?f??????'???bR???V?-?aZ?5??????yh"&X9??>r??$??S????@??w?????J &?B??lxQ9=?L?`a?5 q"??9????6!?????? ????-???&?. 4?=`V??@??????'?U????A?.?????H?&&?9GV?Sx$8W??????:????U?5 ???? '?qI!????"H??}oy?_%???5L??????:??MBU??4}cj"r;??~]B,X??@SG[g ??Y?`8y?? ?E? ????kO????????8?e??W??]???Oa%r.l^??o? 0 ?vt??????!z??? ?f ?G????^?0????ys+P?N?h?t?K?}IcK?={?E???nE 6.??)???\3 ?{??9??_z?8kj?N????????KC?vq?no?????????7*0?A??H?????0????????????? ?????????`]}m?>?u?C]???:?B?B??/.?4.Q+2?????J?s?O????I\|sO<6B{????n??6????E?nI@}?O??)J??X?-???cO?????????@sW?XX?J??"??m?? 9Xn??7??6Z?nm{???K=Y??#?????C5=???j????_??;X?rs?)?????C?v???]6_??????5??????u?4??Oq?|?F?????,??8????Q7???'??TC{??d3?H??? ?7ORcO?Oz=E??|1?<R$?E???M"g?\?)/?"??????nr?!Bd???L?>?????h??E??Y?????/??@??8??8?2?U&??-?H??o:=?7:y?o4?m$;y+?? YW"????v+??n?bhd??zi7??#a?$0??V?NC?s?x?F7?.?=?o???h?d?)???????????"?B|??r??-?T??g??JA?5?????b?4qH?y^wj??0Am?~?y???D????*?????h}d$??9?"*p H???+?????qkJ"??4???????] ?6M?(J???????Y46x???V??\? ?0??h??:?%????M?kr???;?!?HYh?95??j?h?6Ef?????\???:?p???N?W&B5?F?5-?????Z[;???"???)Vu?p??BP?h(?B?:??????u?"?????H?w?p?????f2N1"IPh\lG?f?-S? ???0<0D*Mt9????7eP??1YD??1??????2&;??`?l]??i?u?i? ?A?D????????^??? ;?_?Y?????1??????????j???n??????{P???( *w#??@?????N]?o?n??.?$?ot???+GS??E[???z ?> MZE?JV?????????????\?????N? u??C???+x?*?yAh4??1????????_?? ?H?@???? ?8zl ?[?@$gT?S:??!U*&I???Zz?!?????xF/;?T9U?5u~???(<!?????i?r?c???u??d?N????Z7??y._??4???J? ???c6a8????????b?uv????b(??]eW?\b?Nj??M2?`? ??P???????:?Ky?????3?|F?????????$??ra?<9???IK?+??+P`?Wa?P?????I? ???f??????r-???SW??3???p?? nn?71?0?J???'???4s?=?2??dD*?e????:??h? ?Ka?(???????s? ?85H???1.'h{?:?r???c????R?- ??????1:b????i?!?????2?? _Fk??o??4????G?^??Tw? yu&M??k?6T?`????/P?>1??????P?n??M? ?eBwA??6A?+??wx54?????& ?^%?:???kk 4?|q?`?D???U?5\8*<%?4??LVVxp?"??????(! }^t????CF????????@7]??o{J?b??'?? AE?0??T ?~?????A??i*?)?t?V?????,]?T?u???O???g?+5'??t???z7b?!???u?h??????{??@??t(?Uc?x?D?0??Ne? ???.rC???\]?^%??????u?E????L?R?%???W??! \?????:v?v?m-????x??pWS?3???*j?n? ?R??g//????Y?Pf`Bs? ?#/???R&@7jQ??}??+K?-?Q?|??q????e?) ?_???N%w?i????????h? l?M3?"?^?2$?^??Q\sw} ^o?9?p%?GH?????B T?????????? ????~?????????1?T?t%@? ???'H????g9? ?????VB?X????|!F2?2??-mT???? ??? T?rY ????e*??????????\?Cq?? ??????9???????f??E?1'?#"??X?????a????*?`bK",???:?Mf|?x??RX+</????[???3????~%H?4' and `-lX...' work. @@ -178,40 +181,40 @@ uninstall-exec: install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps + $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/pxdvi/pixmaps $(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext) rm -f $(man1dir)/o$(manpage).$(manext) ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext) - $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi - $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps + $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/pxdvi/XDvi + $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/pxdvi/pixmaps if \ - grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \ - || test ! -r $(texmf)/xdvi/xdvi.cfg; \ + grep 'original xdvi.cfg --' $(texmf)/pxdvi/xdvi.cfg >/dev/null 2>&1 \ + || test ! -r $(texmf)/pxdvi/xdvi.cfg; \ then \ - $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \ + $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/pxdvi/xdvi.cfg; \ else \ true; \ fi - $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/xdvi/ + $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/pxdvi/ if test ! -f $(PTEXMAP); then \ $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(PTEXMAP); \ fi uninstall-data: rm -f $(man1dir)/$(manpage).$(manext) \ - $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \ - $(texmf)/xdvi/XDvi + $(texmf)/pxdvi/pixmaps/toolbar.xpm $(texmf)/pxdvi/pixmaps/toolbar2.xpm \ + $(texmf)/pxdvi/XDvi if \ - head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \ - || test ! -r $(texmf)/xdvi/xdvi.cfg; \ + head -n 1 $(texmf)/pxdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \ + || test ! -r $(texmf)/pxdvi/xdvi.cfg; \ then \ - rm -f $(texmf)/xdvi/xdvi.cfg; \ + rm -f $(texmf)/pxdvi/xdvi.cfg; \ else \ true; \ fi - rmdir $(texmf)/xdvi/pixmaps + rmdir $(texmf)/pxdvi/pixmaps -distname = xdvik +distname = pxdvik program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \ MOTIF version_files = xdvi.c diff -up xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi xdvik-22.84.14/texk/pxdvik/texmf/XDvi --- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi 2008-07-17 00:22:02.000000000 +0100 +++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi 2008-07-17 00:22:02.000000000 +0100 @@ -137,7 +137,7 @@ Ctrl:set-shrink-factor(-)\n\ !!!------------------------------------------------------------------------------ !!! note: when i18n'ed, *font and *fontSet should have same size of font *international: true -*inputMethod: kinput2 +*inputMethod: SCIM *preeditType: OverTheSpot,OffTheSpot,Root !!! note: xdviSelFile can not be i18n'ed (bug?) xdviSelFile*international: false diff -up xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi xdvik-22.84.14/texk/pxdvik/xdvi-sh.in --- xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi 2007-10-18 17:28:55.000000000 +0100 +++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in 2008-07-17 00:22:02.000000000 +0100 @@ -35,7 +35,7 @@ case "$#:$1" in NAMEOPT="-name $BASE_NAME";; esac -xdviappfile=`kpsewhich -progname=xdvi --format='other text files' XDvi` +xdviappfile=`kpsewhich -progname=pxdvi --format='other text files' XDvi` if test -n "$xdviappfile"; then xdviappdir=`dirname "$xdviappfile"` xdviapppath="${xdviappdir}/%l_%t/%N:${xdviappdir}/%N" Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdvik/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 May 2008 15:52:05 -0000 1.6 +++ sources 19 Jul 2008 13:29:57 -0000 1.7 @@ -1,2 +1 @@ -4d3d92381be42d7163e0f815f9cfb346 xdvik-22.84.13.tar.gz -e67e814b92e7b07764efd4b9fde8e72c xdvik-22.84.13-j1.40.patch.gz +0e0c3d49b8c0cbc934894757780e098f xdvik-22.84.14.tar.gz Index: xdvik.spec =================================================================== RCS file: /cvs/extras/rpms/xdvik/F-9/xdvik.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xdvik.spec 11 May 2008 15:52:05 -0000 1.17 +++ xdvik.spec 19 Jul 2008 13:29:57 -0000 1.18 @@ -6,8 +6,8 @@ Summary: An X viewer for DVI files Name: xdvik -Version: 22.84.13 -Release: 20%{?dist} +Version: 22.84.14 +Release: 1%{?dist} Url: http://xdvi.sourceforge.net/ # encodings.c is GPLv2+ and LGPL and MIT # read-mapfile.c tfmload.c are from dvips @@ -44,71 +44,19 @@ # This patch not pushed upstream. Unclear if it's actually still needed. Patch1: texlive-2007-xprint.patch -# Fix for navigation with a spacebar does not keep position -# https://bugzilla.redhat.com/show_bug.cgi?id=417461 -# https://bugzilla.redhat.com/show_bug.cgi?id=168124 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875311&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch2: xdvik-22.84.13-keepflag-scrollfix.patch - -# Fix numlock key behaviour. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875321&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch3: texlive-source-xdvi-numlock.patch - -# Fix browser open command to use xdg-open -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875309&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch4: xdvik-22.84.13-xdgopen.patch - -# Fix security issues with temp file creation -# https://sourceforge.net/tracker/index.php?func=detail&aid=1953026&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch5: xdvik-22.84.13-tempfix.patch - -# Fix typos in man pages. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1833567&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch6: xdvik-22.84.13-manpage.patch - -# Fix for a double Ctrl-L segfault (BZ #429429) -# https://sourceforge.net/tracker/index.php?func=detail&aid=1953028&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch7: xdvik-22.84.13-bad_bar.patch - -# Fix bug with returning window ID. -# https://bugzilla.redhat.com/show_bug.cgi?id=442445 -# https://sourceforge.net/tracker/index.php?func=detail&aid=1953023&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch8: xdvik-22.84.13-windowid.patch - %if %{with japanese} # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/ -Patch1000: xdvik-22.84.13-j1.40.patch.gz +Patch1000: xdvik-22.84.14-j1.40.patch.gz # Patch to allow building of both xdvik and pxdvik. # Local to Fedora, not appropriate to push upstream. -Patch1001: xdvik-22.84.13-pxdvi.patch +Patch1001: xdvik-22.84.14-pxdvi.patch -# Patch to fix up some issues when using system installed libraries. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch1002: xdvik-22.84.13-pxdvi-use-system-libs.patch %endif -# These patches would conflict with Patch1000 and friends and so must be applied after the -# xdvik directory has been copied to pxdvik - -# Patch to fix up some issues when using system installed libraries. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580 -# Fixed in upstream CVS post 22.84.13 -Patch2000: xdvik-22.84.13-use-system-libs.patch - -# Fix conflicting definitions of unint32_t -# http://sourceforge.net/tracker/index.php?func=detail&aid=1875318&group_id=23164&atid=377580 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1819017&group_id=23164&atid=377583 -# Fixed in upstream CVS post 22.84.13 -Patch2001: xdvik-22.84.13-uint32_t-fix.patch +# These patches would conflict with Patch1000 and friends and so must be applied +# after the xdvik directory has been copied to pxdvik +# Currently no patches of this type %description Xdvik, the kpathsea version of xdvi, is a previewer for DVI files @@ -123,15 +71,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p0 -%patch4 -p1 -b .xdgopen -%patch5 -p1 -b .tempfix -%patch6 -p0 -%patch7 -p1 -%patch8 -p1 -b .windowid - # Allow Xaw3d enabled build of xdvi sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch] @@ -147,23 +86,12 @@ # Build both the normal and the Japanese xdvi at the same time %patch1001 -p1 -b .pxdvi -# Build pxdvik against system libs -%patch1002 -p1 -b .pxdvi-use-system-libs - # XXX Is this really necessary? mv texk/pxdvik/xdvi-ptex.sample texk/pxdvik/xdvi-ptex.sample.orig install -p -m 644 %{SOURCE100} texk/pxdvik/xdvi-ptex.sample %endif -# Build xdvik against system libs -%patch2000 -p1 -b .use-system-libs - -%if !%{with_japanese} -# Fix unin32_t problem for xdvik (Patch1000 also contains this hunk) -%patch2001 -p1 -%endif - # Re-run autoconf against patched Makefile.ins ( cd texk/xdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf ) %if %{with japanese} @@ -174,10 +102,11 @@ %build # Here we go to great pains to avoid the automatic dependency generation from pulling in the # bundled kpathsea stuff -%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d +%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d mv texk/kpathsea texk/kpathsea-keep +# Enable maintainer mode (see README_maintainer in tarball) cp -p texk/make/rdepend.mk texk/make/rdepend.mk.maint sed -i -e 's/@MAINT@//' texk/make/rdepend.mk @@ -194,7 +123,7 @@ mv texk/kpathsea-keep texk/kpathsea -%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d +%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d %if %{with japanese} # configure pxdvi with more options @@ -218,6 +147,8 @@ %if %{with japanese} install_dirs='INSTDIRS=texk/xdvik texk/pxdvik' +%else +install_dirs='INSTDIRS=texk/xdvik' %endif # make install DESTDIR=$RPM_BUILD_ROOT doesn't work here @@ -290,12 +221,10 @@ %doc README README.t1mapper README.t1fonts CHANGES %{_bindir}/oxdvi %{_bindir}/xdvi -%{_bindir}/xdvizilla %{_bindir}/xdvi-xaw3d %{_texmf_main}/xdvi/ %{_mandir}/man1/oxdvi.1* %{_mandir}/man1/xdvi.1* -%{_mandir}/man1/xdvizilla.1* %{_datadir}/pixmaps/xdvi48x48.png %{_datadir}/icons/hicolor/48x48/apps/xdvi.png %{_datadir}/applications/fedora-xdvi.desktop @@ -304,12 +233,18 @@ %doc pxdvik/ %{_bindir}/opxdvi %{_bindir}/pxdvi -%{_bindir}/pxdvizilla %{_bindir}/pxdvi-xaw3d %{_texmf_main}/pxdvi/ %endif %changelog +* Fri Jul 18 2008 Jonathan G. Underwood - 22.84.13-20 +- Update to version 22.84.14 +- Update Japanese patch to 22.84.14-j1.40 +- Rework patch allowing both normal and Japanese versions to be built +- Remove no longer needed patches that have been merged upstream: +- Various spec file fixups + * Sat May 10 2008 Jonathan G. Underwood - 22.84.13-20 - Update Japanese patch to xdvik-22.84.13-j1.40.patch.gz - Rework patch to allow simultaneous building of xdvik and pxdvik - now called --- texlive-source-xdvi-numlock.patch DELETED --- --- xdvik-22.84.13-bad_bar.patch DELETED --- --- xdvik-22.84.13-keepflag-scrollfix.patch DELETED --- --- xdvik-22.84.13-manpage.patch DELETED --- --- xdvik-22.84.13-pxdvi-use-system-libs.patch DELETED --- --- xdvik-22.84.13-pxdvi.patch DELETED --- --- xdvik-22.84.13-tempfix.patch DELETED --- --- xdvik-22.84.13-uint32_t-fix.patch DELETED --- --- xdvik-22.84.13-use-system-libs.patch DELETED --- --- xdvik-22.84.13-windowid.patch DELETED --- --- xdvik-22.84.13-xdgopen.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 13:31:02 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 13:31:02 GMT Subject: rpms/qt4/F-8 qt4.spec,1.79,1.80 Message-ID: <200807191331.m6JDV2rV022419@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22316/F-8 Modified Files: qt4.spec Log Message: Sync from qt/devel: * Sat Jul 19 2008 Rex Dieter 4.4.0-14 - macros.qt4: fix %_qt4_datadir Index: qt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- qt4.spec 19 Jul 2008 11:50:28 -0000 1.79 +++ qt4.spec 19 Jul 2008 13:30:03 -0000 1.80 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 13%{?dist} +Release: 14%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -538,7 +538,7 @@ %%_qt4_version %{version} %%_qt4_prefix %%{_libdir}/qt4 %%_qt4_bindir %%{_qt4_prefix}/bin -%%_qt4_datadir %%{_datadir}/qt4 +%%_qt4_datadir %%{_qt4_prefix} %%_qt4_demosdir %%{_qt4_prefix}/demos %%_qt4_docdir %%{_docdir}/qt4 %%_qt4_examples %%{_qt4_prefix}/examples @@ -773,6 +773,9 @@ %changelog +* Sat Jul 19 2008 Rex Dieter 4.4.0-14 +- macros.qt4: fix %%_qt4_datadir + * Thu Jul 17 2008 Rex Dieter 4.4.0-13 - (re)fix qconfig-multilib.h for sparc64 From fedora-extras-commits at redhat.com Sat Jul 19 13:37:40 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 13:37:40 GMT Subject: rpms/qt/devel qt.spec,1.195,1.196 Message-ID: <200807191337.m6JDbelH022669@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22600 Modified Files: qt.spec Log Message: fix %%qt4_translation dir Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- qt.spec 19 Jul 2008 13:26:06 -0000 1.195 +++ qt.spec 19 Jul 2008 13:36:53 -0000 1.196 @@ -547,7 +547,7 @@ %%_qt4_plugindir %%{_qt4_prefix}/plugins %%_qt4_qmake %%{_qt4_bindir}/qmake %%_qt4_sysconfdir %%{_sysconfdir} -%%_qt4_translationdir %%{_qt4_datadir}/translations +%%_qt4_translationdir %%{_datadir}/qt4/translations EOF # create/own %%_qt4_plugindir/styles From fedora-extras-commits at redhat.com Sat Jul 19 13:38:05 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 13:38:05 GMT Subject: rpms/qt/devel qt.spec,1.196,1.197 Message-ID: <200807191338.m6JDc5lr022677@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22643 Modified Files: qt.spec Log Message: * Sat Jul 19 2008 Rex Dieter 4.4.0-14 - macros.qt4: fix %_qt4_datadir, %_qt4_translationdir Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- qt.spec 19 Jul 2008 13:36:53 -0000 1.196 +++ qt.spec 19 Jul 2008 13:37:19 -0000 1.197 @@ -774,7 +774,7 @@ %changelog * Sat Jul 19 2008 Rex Dieter 4.4.0-14 -- macros.qt4: fix %%_qt4_datadir +- macros.qt4: fix %%_qt4_datadir, %%_qt4_translationdir * Thu Jul 17 2008 Rex Dieter 4.4.0-13 - (re)fix qconfig-multilib.h for sparc64 From fedora-extras-commits at redhat.com Sat Jul 19 13:41:00 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Sat, 19 Jul 2008 13:41:00 GMT Subject: rpms/kernel/devel kernel.spec,1.782,1.783 Message-ID: <200807191341.m6JDf0lU022878@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22839 Modified Files: kernel.spec Log Message: * Sat Jul 19 2008 Chuck Ebbert - Start building the kernel-doc package again. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.782 retrieving revision 1.783 diff -u -r1.782 -r1.783 --- kernel.spec 17 Jul 2008 19:54:34 -0000 1.782 +++ kernel.spec 19 Jul 2008 13:40:10 -0000 1.783 @@ -84,7 +84,7 @@ %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} # don't build the kernel-doc package -%define with_doc 0 +#% define with_doc 0 # Additional options for user-friendly one-off kernel building: # @@ -1780,6 +1780,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Sat Jul 19 2008 Chuck Ebbert +- Start building the kernel-doc package again. + * Thu Jul 17 2008 Dave Jones - 2.6.26-git6 From fedora-extras-commits at redhat.com Sat Jul 19 13:45:51 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 19 Jul 2008 13:45:51 GMT Subject: rpms/xdvik/devel xdvik-22.84.13-pxdvi.patch, 1.1, NONE xdvik-22.84.13-xdgopen.patch, 1.1, NONE Message-ID: <200807191345.m6JDjp6e023063@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/xdvik/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23040 Removed Files: xdvik-22.84.13-pxdvi.patch xdvik-22.84.13-xdgopen.patch Log Message: Remove some unused patches --- xdvik-22.84.13-pxdvi.patch DELETED --- --- xdvik-22.84.13-xdgopen.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 13:49:46 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 13:49:46 GMT Subject: rpms/qt4/F-8 qt4.spec,1.80,1.81 Message-ID: <200807191349.m6JDnkWD023210@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23136/F-8 Modified Files: qt4.spec Log Message: Sync again from qt/devel. Index: qt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- qt4.spec 19 Jul 2008 13:30:03 -0000 1.80 +++ qt4.spec 19 Jul 2008 13:48:48 -0000 1.81 @@ -547,7 +547,7 @@ %%_qt4_plugindir %%{_qt4_prefix}/plugins %%_qt4_qmake %%{_qt4_bindir}/qmake %%_qt4_sysconfdir %%{_sysconfdir} -%%_qt4_translationdir %%{_qt4_datadir}/translations +%%_qt4_translationdir %%{_datadir}/qt4/translations EOF # create/own %%_qt4_plugindir/styles @@ -774,7 +774,7 @@ %changelog * Sat Jul 19 2008 Rex Dieter 4.4.0-14 -- macros.qt4: fix %%_qt4_datadir +- macros.qt4: fix %%_qt4_datadir, %%_qt4_translationdir * Thu Jul 17 2008 Rex Dieter 4.4.0-13 - (re)fix qconfig-multilib.h for sparc64 From fedora-extras-commits at redhat.com Sat Jul 19 13:55:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 13:55:42 +0000 Subject: [pkgdb] xpad was added for cheekyboinc Message-ID: <200807191355.m6JDtgnC005415@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xpad with summary Sticky notepad for GTK+2 Kevin Fenzi (kevin) has approved Package xpad Kevin Fenzi (kevin) has added a Fedora devel branch for xpad with an owner of cheekyboinc Kevin Fenzi (kevin) has approved xpad in Fedora devel Kevin Fenzi (kevin) has approved Package xpad Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xpad (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xpad (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xpad (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on xpad (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on xpad (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on xpad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xpad From fedora-extras-commits at redhat.com Sat Jul 19 13:55:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 13:55:43 +0000 Subject: [pkgdb] xpad (Fedora, 9) updated by kevin Message-ID: <200807191355.m6JDthW7005435@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for xpad Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xpad (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xpad (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xpad (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on xpad (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xpad From fedora-extras-commits at redhat.com Sat Jul 19 13:55:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 13:55:43 +0000 Subject: [pkgdb] xpad (Fedora, 8) updated by kevin Message-ID: <200807191355.m6JDthWA005435@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xpad Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xpad (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xpad (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xpad (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on xpad (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xpad From fedora-extras-commits at redhat.com Sat Jul 19 13:55:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 13:55:43 +0000 Subject: [pkgdb] xpad (Fedora, devel) updated by kevin Message-ID: <200807191355.m6JDthWD005435@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xpad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xpad From fedora-extras-commits at redhat.com Sat Jul 19 13:56:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 13:56:05 GMT Subject: rpms/xpad - New directory Message-ID: <200807191356.m6JDu5DK023583@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xpad In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23553/rpms/xpad Log Message: Directory /cvs/extras/rpms/xpad added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 13:56:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 13:56:21 GMT Subject: rpms/xpad/devel - New directory Message-ID: <200807191356.m6JDuL2l023621@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xpad/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23553/rpms/xpad/devel Log Message: Directory /cvs/extras/rpms/xpad/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 13:56:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 13:56:35 GMT Subject: rpms/xpad Makefile,NONE,1.1 Message-ID: <200807191356.m6JDuZTH023648@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xpad In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23553/rpms/xpad Added Files: Makefile Log Message: Setup of module xpad --- NEW FILE Makefile --- # Top level Makefile for module xpad all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 19 13:56:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 13:56:48 GMT Subject: rpms/xpad/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807191356.m6JDumLp023667@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xpad/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23553/rpms/xpad/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xpad --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xpad # $Id: Makefile,v 1.1 2008/07/19 13:56:35 kevin Exp $ NAME := xpad SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 19 13:59:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 13:59:05 +0000 Subject: [pkgdb] stapitrace was added for dcnomura Message-ID: <200807191359.m6JDx5tY005756@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package stapitrace with summary user instruction tracing tool Kevin Fenzi (kevin) has approved Package stapitrace Kevin Fenzi (kevin) has added a Fedora devel branch for stapitrace with an owner of dcnomura Kevin Fenzi (kevin) has approved stapitrace in Fedora devel Kevin Fenzi (kevin) has approved Package stapitrace Kevin Fenzi (kevin) has set commit to Approved for cvsextras on stapitrace (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on stapitrace (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on stapitrace (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on stapitrace (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on stapitrace (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on stapitrace (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stapitrace From fedora-extras-commits at redhat.com Sat Jul 19 13:59:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 13:59:06 +0000 Subject: [pkgdb] stapitrace (Fedora, devel) updated by kevin Message-ID: <200807191359.m6JDx6PC005773@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on stapitrace (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stapitrace From fedora-extras-commits at redhat.com Sat Jul 19 13:59:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 13:59:28 GMT Subject: rpms/stapitrace - New directory Message-ID: <200807191359.m6JDxSwl023935@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/stapitrace In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23899/rpms/stapitrace Log Message: Directory /cvs/extras/rpms/stapitrace added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 13:59:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 13:59:41 GMT Subject: rpms/stapitrace/devel - New directory Message-ID: <200807191359.m6JDxfN3023967@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/stapitrace/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23899/rpms/stapitrace/devel Log Message: Directory /cvs/extras/rpms/stapitrace/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 13:59:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 13:59:53 GMT Subject: rpms/stapitrace Makefile,NONE,1.1 Message-ID: <200807191359.m6JDxrfi023994@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/stapitrace In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23899/rpms/stapitrace Added Files: Makefile Log Message: Setup of module stapitrace --- NEW FILE Makefile --- # Top level Makefile for module stapitrace all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 19 14:00:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:00:04 GMT Subject: rpms/stapitrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807191400.m6JE0467024027@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/stapitrace/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV23899/rpms/stapitrace/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module stapitrace --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: stapitrace # $Id: Makefile,v 1.1 2008/07/19 13:59:53 kevin Exp $ NAME := stapitrace SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 19 14:00:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 14:00:14 +0000 Subject: [pkgdb] gfs-nicefore-fonts was added for nim Message-ID: <200807191400.m6JE0EfB005926@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gfs-nicefore-fonts with summary GFS Nicefore majuscule Greek font Kevin Fenzi (kevin) has approved Package gfs-nicefore-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for gfs-nicefore-fonts with an owner of nim Kevin Fenzi (kevin) has approved gfs-nicefore-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package gfs-nicefore-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gfs-nicefore-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gfs-nicefore-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gfs-nicefore-fonts (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on gfs-nicefore-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on gfs-nicefore-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on gfs-nicefore-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-nicefore-fonts From fedora-extras-commits at redhat.com Sat Jul 19 14:00:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 14:00:16 +0000 Subject: [pkgdb] gfs-nicefore-fonts (Fedora, devel) updated by kevin Message-ID: <200807191400.m6JE0Gb1005946@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gfs-nicefore-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on gfs-nicefore-fonts (Fedora devel) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-nicefore-fonts From fedora-extras-commits at redhat.com Sat Jul 19 14:00:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:00:42 GMT Subject: rpms/gfs-nicefore-fonts - New directory Message-ID: <200807191400.m6JE0gqq024104@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-nicefore-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24065/rpms/gfs-nicefore-fonts Log Message: Directory /cvs/extras/rpms/gfs-nicefore-fonts added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 14:00:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:00:54 GMT Subject: rpms/gfs-nicefore-fonts/devel - New directory Message-ID: <200807191400.m6JE0sRM024121@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-nicefore-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24065/rpms/gfs-nicefore-fonts/devel Log Message: Directory /cvs/extras/rpms/gfs-nicefore-fonts/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 14:01:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:01:05 GMT Subject: rpms/gfs-nicefore-fonts Makefile,NONE,1.1 Message-ID: <200807191401.m6JE154u030705@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-nicefore-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24065/rpms/gfs-nicefore-fonts Added Files: Makefile Log Message: Setup of module gfs-nicefore-fonts --- NEW FILE Makefile --- # Top level Makefile for module gfs-nicefore-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 19 14:01:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 14:01:12 +0000 Subject: [pkgdb] gfs-jackson-fonts was added for nim Message-ID: <200807191401.m6JE0EfE005926@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gfs-jackson-fonts with summary GFS Jackson majuscule Greek font Kevin Fenzi (kevin) has approved Package gfs-jackson-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for gfs-jackson-fonts with an owner of nim Kevin Fenzi (kevin) has approved gfs-jackson-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package gfs-jackson-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gfs-jackson-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gfs-jackson-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gfs-jackson-fonts (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on gfs-jackson-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on gfs-jackson-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on gfs-jackson-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-jackson-fonts From fedora-extras-commits at redhat.com Sat Jul 19 14:01:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 14:01:14 +0000 Subject: [pkgdb] gfs-jackson-fonts (Fedora, devel) updated by kevin Message-ID: <200807191401.m6JE0Gb4005946@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gfs-jackson-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on gfs-jackson-fonts (Fedora devel) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gfs-jackson-fonts From fedora-extras-commits at redhat.com Sat Jul 19 14:01:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:01:18 GMT Subject: rpms/gfs-nicefore-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807191401.m6JE1Inv030722@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-nicefore-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU24065/rpms/gfs-nicefore-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gfs-nicefore-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gfs-nicefore-fonts # $Id: Makefile,v 1.1 2008/07/19 14:01:06 kevin Exp $ NAME := gfs-nicefore-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 19 14:01:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:01:47 GMT Subject: rpms/gfs-jackson-fonts - New directory Message-ID: <200807191401.m6JE1lOI030823@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-jackson-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz30744/rpms/gfs-jackson-fonts Log Message: Directory /cvs/extras/rpms/gfs-jackson-fonts added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 14:02:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:02:02 GMT Subject: rpms/gfs-jackson-fonts/devel - New directory Message-ID: <200807191402.m6JE226l030845@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-jackson-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz30744/rpms/gfs-jackson-fonts/devel Log Message: Directory /cvs/extras/rpms/gfs-jackson-fonts/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 14:02:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:02:19 GMT Subject: rpms/gfs-jackson-fonts Makefile,NONE,1.1 Message-ID: <200807191402.m6JE2JHS030895@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-jackson-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz30744/rpms/gfs-jackson-fonts Added Files: Makefile Log Message: Setup of module gfs-jackson-fonts --- NEW FILE Makefile --- # Top level Makefile for module gfs-jackson-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 19 14:02:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:02:35 GMT Subject: rpms/gfs-jackson-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807191402.m6JE2Zj4030922@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gfs-jackson-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz30744/rpms/gfs-jackson-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gfs-jackson-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gfs-jackson-fonts # $Id: Makefile,v 1.1 2008/07/19 14:02:19 kevin Exp $ NAME := gfs-jackson-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 19 14:02:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 14:02:56 +0000 Subject: [pkgdb] ecolier-court-fonts was added for nim Message-ID: <200807191402.m6JE2ujF006280@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ecolier-court-fonts with summary ?colier court fonts Kevin Fenzi (kevin) has approved Package ecolier-court-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for ecolier-court-fonts with an owner of nim Kevin Fenzi (kevin) has approved ecolier-court-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package ecolier-court-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ecolier-court-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ecolier-court-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ecolier-court-fonts (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on ecolier-court-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on ecolier-court-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on ecolier-court-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ecolier-court-fonts From fedora-extras-commits at redhat.com Sat Jul 19 14:02:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 19 Jul 2008 14:02:59 +0000 Subject: [pkgdb] ecolier-court-fonts (Fedora, devel) updated by kevin Message-ID: <200807191403.m6JE39Nw006302@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on ecolier-court-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on ecolier-court-fonts (Fedora devel) for fonts-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ecolier-court-fonts From fedora-extras-commits at redhat.com Sat Jul 19 14:03:22 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:03:22 GMT Subject: rpms/ecolier-court-fonts - New directory Message-ID: <200807191403.m6JE3MVo031003@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ecolier-court-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO30959/rpms/ecolier-court-fonts Log Message: Directory /cvs/extras/rpms/ecolier-court-fonts added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 14:03:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:03:37 GMT Subject: rpms/ecolier-court-fonts/devel - New directory Message-ID: <200807191403.m6JE3beM031026@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ecolier-court-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO30959/rpms/ecolier-court-fonts/devel Log Message: Directory /cvs/extras/rpms/ecolier-court-fonts/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 19 14:03:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:03:49 GMT Subject: rpms/ecolier-court-fonts Makefile,NONE,1.1 Message-ID: <200807191403.m6JE3n4K031051@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ecolier-court-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO30959/rpms/ecolier-court-fonts Added Files: Makefile Log Message: Setup of module ecolier-court-fonts --- NEW FILE Makefile --- # Top level Makefile for module ecolier-court-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 19 14:04:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 19 Jul 2008 14:04:00 GMT Subject: rpms/ecolier-court-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807191404.m6JE40l5031066@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ecolier-court-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO30959/rpms/ecolier-court-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ecolier-court-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ecolier-court-fonts # $Id: Makefile,v 1.1 2008/07/19 14:03:49 kevin Exp $ NAME := ecolier-court-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 19 14:06:59 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 14:06:59 GMT Subject: rpms/qt/devel qt.spec,1.197,1.198 Message-ID: <200807191406.m6JE6xBY031167@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31122 Modified Files: qt.spec Log Message: try to get new rpm to work Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- qt.spec 19 Jul 2008 13:37:19 -0000 1.197 +++ qt.spec 19 Jul 2008 14:06:10 -0000 1.198 @@ -69,8 +69,8 @@ #define phonon -phonon -gstreamer %define webkit -webkit -# undefine to disable these #define nas -system-nas-sound +%define nas -no-nas-sound %if 0%{?fedora} > 4 || 0%{?rhel} > 4 # link dbus %define dbus -dbus-linked @@ -122,7 +122,7 @@ %endif BuildRequires: %{x_deps} -%if "%{?nas}" == "-system-nas-sound" +%if "%{?nas}" != "-no-nas-sound" BuildRequires: nas-devel %endif @@ -392,7 +392,7 @@ %{?dbus} %{!?dbus:-no-dbus} \ %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ %{?webkit} %{!?webkit:-no-webkit } \ - %{?nas} %{!?nas:-no-nas-sound} \ + %{?nas} \ %{?mysql} \ %{?psql} \ %{?odbc} \ From fedora-extras-commits at redhat.com Sat Jul 19 14:10:20 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 19 Jul 2008 14:10:20 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1583,1.1584 Message-ID: <200807191410.m6JEAKoJ031331@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31275 Modified Files: openoffice.org.spec Log Message: some things can be moved out of core into the database module Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1583 retrieving revision 1.1584 diff -u -r1.1583 -r1.1584 --- openoffice.org.spec 17 Jul 2008 13:27:56 -0000 1.1583 +++ openoffice.org.spec 19 Jul 2008 14:09:32 -0000 1.1584 @@ -2075,7 +2075,6 @@ %{basisinstdir}/program/i18nsearch.uno.so %{basisinstdir}/program/kde-open-url %{basisinstdir}/program/legacy_binfilters.rdb -%{basisinstdir}/program/libabp%{SOPOST}.so %{basisinstdir}/program/libacc%{SOPOST}.so %{basisinstdir}/program/libadabas%{SOPOST}.so %{basisinstdir}/program/libavmedia*.so @@ -2106,10 +2105,8 @@ %{basisinstdir}/program/libdbase%{SOPOST}.so %{basisinstdir}/program/libdbaxml%{SOPOST}.so %{basisinstdir}/program/libdbmm%{SOPOST}.so -%{basisinstdir}/program/libdbp%{SOPOST}.so %{basisinstdir}/program/libdbpool2.so %{basisinstdir}/program/libdbtools%{SOPOST}.so -%{basisinstdir}/program/libdbu%{SOPOST}.so %{basisinstdir}/program/libdeploymentmisc%{SOPOST}.so %{basisinstdir}/program/libdict_ja.so %{basisinstdir}/program/libdict_zh.so @@ -2225,7 +2222,6 @@ %{basisinstdir}/program/productregistration.uno.so %dir %{basisinstdir}/program/resource %{basisinstdir}/program/resource/avmedia%{UPD}en-US.res -%{basisinstdir}/program/resource/abp%{UPD}en-US.res %{basisinstdir}/program/resource/acc%{UPD}en-US.res %{basisinstdir}/program/resource/basctl%{UPD}en-US.res %{basisinstdir}/program/resource/bf_frm%{UPD}en-US.res @@ -2238,9 +2234,7 @@ %{basisinstdir}/program/resource/cal%{UPD}en-US.res %{basisinstdir}/program/resource/chartcontroller%{UPD}en-US.res %{basisinstdir}/program/resource/dba%{UPD}en-US.res -%{basisinstdir}/program/resource/dbp%{UPD}en-US.res %{basisinstdir}/program/resource/dbmm%{UPD}en-US.res -%{basisinstdir}/program/resource/dbu%{UPD}en-US.res %{basisinstdir}/program/resource/dbw%{UPD}en-US.res %{basisinstdir}/program/resource/deployment%{UPD}en-US.res %{basisinstdir}/program/resource/deploymentgui%{UPD}en-US.res @@ -2266,7 +2260,6 @@ %{basisinstdir}/program/resource/san%{UPD}en-US.res %{basisinstdir}/program/resource/sb%{UPD}en-US.res %{basisinstdir}/program/resource/sd%{UPD}en-US.res -%{basisinstdir}/program/resource/sdbcl%{UPD}en-US.res %{basisinstdir}/program/resource/sfx%{UPD}en-US.res %{basisinstdir}/program/resource/spa%{UPD}en-US.res %{basisinstdir}/program/resource/sdbt%{UPD}en-US.res @@ -2778,13 +2771,20 @@ %files base-core %defattr(-,root,root,-) %{basisinstdir}/help/en/sdatabase.* +%{basisinstdir}/program/libabp%{SOPOST}.so %{basisinstdir}/program/libadabasui%{SOPOST}.so +%{basisinstdir}/program/libdbp%{SOPOST}.so +%{basisinstdir}/program/libdbu%{SOPOST}.so %{basisinstdir}/program/librpt*%{SOPOST}.so %dir %{basisinstdir}/program/resource +%{basisinstdir}/program/resource/abp%{UPD}en-US.res %{basisinstdir}/program/resource/adabasui%{UPD}en-US.res %{basisinstdir}/program/resource/cnr%{UPD}en-US.res +%{basisinstdir}/program/resource/dbp%{UPD}en-US.res +%{basisinstdir}/program/resource/dbu%{UPD}en-US.res %{basisinstdir}/program/resource/rpt%{UPD}en-US.res %{basisinstdir}/program/resource/rptui%{UPD}en-US.res +%{basisinstdir}/program/resource/sdbcl%{UPD}en-US.res %{basisinstdir}/program/resource/sdberr%{UPD}en-US.res %dir %{basisinstdir}/share/registry %dir %{basisinstdir}/share/registry/modules From fedora-extras-commits at redhat.com Sat Jul 19 14:14:48 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sat, 19 Jul 2008 14:14:48 GMT Subject: rpms/beagle/F-9 beagle.spec,1.137,1.138 Message-ID: <200807191414.m6JEEm1I031553@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31475 Modified Files: beagle.spec Log Message: fix bug 441375 Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- beagle.spec 21 May 2008 18:26:02 -0000 1.137 +++ beagle.spec 19 Jul 2008 14:13:56 -0000 1.138 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -67,10 +67,14 @@ BuildRequires: firefox-devel %endif -# firefox app if for beagle firefox extension +# firefox app id for beagle firefox extension %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\} +# thunderbird version and ext id for beagle extension +%define thunderbird_version 2.0.0.14 +%define tb_ext_id \{b656ef18-fd76-45e6-95cc-8043f26361e7\} + %description A general infrastructure for making your data easy to find. @@ -100,8 +104,7 @@ Summary: Beagle backend for Thunderbird Group: User Interface/Desktops Requires: beagle = %{version}-%{release} - -Requires: thunderbird +Requires: thunderbird = %{thunderbird_version} %description thunderbird Beagle backend for Thunderbird @@ -163,11 +166,15 @@ # don't autostart the search gui rm -f $RPM_BUILD_ROOT/etc/xdg/autostart/beagle-search-autostart.desktop -# TODO: Isn't there a better place to install this? +# firefox extension mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} unzip firefox-extension/beagle.xpi \ -d $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} +# thunderbird extension +mkdir -p $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} +unzip thunderbird-extension/beagle.xpi \ +-d $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -235,6 +242,8 @@ %{_bindir}/ %{_sbindir}/* %{_libdir}/beagle/ +%exclude %{_libdir}/beagle/Backends/Thunder* +%exclude %{_libdir}/beagle/Backends/Evolution* %{_datadir}/beagle %{_mandir}/*/* %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle @@ -248,6 +257,7 @@ %files thunderbird %defattr(-, root, root,-) %{_libdir}/beagle/Backends/ThunderbirdBackends.dll* +%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/ %files epiphany %defattr(-, root, root,-) @@ -276,6 +286,12 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Sat Jul 19 2008 Adel Gadllah - 0.3.7-5 +- RH #441375 +- Don't ship Thunderbird and Evolution backends in the main +- package +- Install thunderbird-extension correctly + * Wed May 21 2008 Adel Gadllah - 0.3.7-4 - Enable chm support RH #447746 From fedora-extras-commits at redhat.com Sat Jul 19 14:15:34 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sat, 19 Jul 2008 14:15:34 GMT Subject: rpms/beagle/devel beagle.spec,1.141,1.142 Message-ID: <200807191415.m6JEFYBS031628@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31552 Modified Files: beagle.spec Log Message: fix bug 441375 Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- beagle.spec 15 Jul 2008 12:23:23 -0000 1.141 +++ beagle.spec 19 Jul 2008 14:14:49 -0000 1.142 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -64,6 +64,10 @@ %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\} +# thunderbird version and ext id for beagle extension +%define thunderbird_version 2.0.0.14 +%define tb_ext_id \{b656ef18-fd76-45e6-95cc-8043f26361e7\} + %description A general infrastructure for making your data easy to find. @@ -153,11 +157,16 @@ # don't autostart the search gui rm -f $RPM_BUILD_ROOT/etc/xdg/autostart/beagle-search-autostart.desktop -# TODO: Isn't there a better place to install this? +# firefox extension mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} unzip firefox-extension/beagle.xpi \ -d $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} +# thunderbird extension +mkdir -p $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} +unzip thunderbird-extension/beagle.xpi \ +-d $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} + desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/beagle-search.desktop @@ -224,6 +233,8 @@ %{_bindir}/ %{_sbindir}/* %{_libdir}/beagle/ +%exclude %{_libdir}/beagle/Backends/Thunder* +%exclude %{_libdir}/beagle/Backends/Evolution* %{_datadir}/beagle %{_mandir}/*/* %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle @@ -237,6 +248,7 @@ %files thunderbird %defattr(-, root, root,-) %{_libdir}/beagle/Backends/ThunderbirdBackends.dll* +%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/ %files epiphany %defattr(-, root, root,-) @@ -265,6 +277,12 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Sat Jul 19 2008 Adel Gadllah - 0.3.8-2 +- RH #441375 +- Don't ship Thunderbird and Evolution backends in the main +- package +- Install thunderbird-extension correctly + * Tue Jul 15 2008 Adel Gadllah - 0.3.8-1 - Update to 0.3.8 - Drop unneeded patches From fedora-extras-commits at redhat.com Sat Jul 19 14:40:09 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 14:40:09 GMT Subject: rpms/qt4/F-8 qt4.spec,1.81,1.82 Message-ID: <200807191440.m6JEe9OX032407@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32361/F-8 Modified Files: qt4.spec Log Message: Sync again from qt/devel. Index: qt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- qt4.spec 19 Jul 2008 13:48:48 -0000 1.81 +++ qt4.spec 19 Jul 2008 14:39:05 -0000 1.82 @@ -69,8 +69,8 @@ #define phonon -phonon -gstreamer %define webkit -webkit -# undefine to disable these #define nas -system-nas-sound +%define nas -no-nas-sound %if 0%{?fedora} > 4 || 0%{?rhel} > 4 # link dbus %define dbus -dbus-linked @@ -122,7 +122,7 @@ %endif BuildRequires: %{x_deps} -%if "%{?nas}" == "-system-nas-sound" +%if "%{?nas}" != "-no-nas-sound" BuildRequires: nas-devel %endif @@ -392,7 +392,7 @@ %{?dbus} %{!?dbus:-no-dbus} \ %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ %{?webkit} %{!?webkit:-no-webkit } \ - %{?nas} %{!?nas:-no-nas-sound} \ + %{?nas} \ %{?mysql} \ %{?psql} \ %{?odbc} \ From fedora-extras-commits at redhat.com Sat Jul 19 14:41:02 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Sat, 19 Jul 2008 14:41:02 GMT Subject: rpms/gxine/devel gxine.spec,1.26,1.27 Message-ID: <200807191441.m6JEf2XK032462@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/gxine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32401 Modified Files: gxine.spec Log Message: Rebuild for new xulrunner. Index: gxine.spec =================================================================== RCS file: /cvs/extras/rpms/gxine/devel/gxine.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gxine.spec 15 Jun 2008 15:56:32 -0000 1.26 +++ gxine.spec 19 Jul 2008 14:40:10 -0000 1.27 @@ -1,23 +1,6 @@ -%if 0%{?fedora} > 8 - %define use_xulrunner_js 1 - %define gecko_dev_ver 1.9 - %define gecko_libs_ver %{gecko_dev_ver} -%else - %define use_xulrunner_js 0 - %if 0%{?rhel} == 5 - %define use_firefox_js 1 - %define gecko_dev_ver 1.8.0.12 - %define gecko_libs_ver %{gecko_dev_ver} - %else - %define use_firefox_js 0 - %endif -%endif - - - Name: gxine Version: 0.5.903 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK frontend for the xine multimedia library Group: Applications/Multimedia @@ -31,11 +14,7 @@ #Patch2: gxine-0.5.11-xine-version-check.patch Patch3: gxine-0.5.902-non-separate-toolbar.patch -%if 0%{?use_xulrunner_js}%{?use_firefox_js} -BuildRequires: gecko-devel = %{gecko_dev_ver} -%else -BuildRequires: js-devel -%endif +BuildRequires: gecko-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gtk2-devel @@ -46,19 +25,13 @@ # for hal support BuildRequires: hal-devel # for LIRC support (not available only for fedora) -%if 0%{?fedora} BuildRequires: lirc-devel -%endif # for XTest support BuildRequires: libXtst-devel # for mozplugin BuildRequires: libXaw-devel BuildRequires: nspr-devel -%if 0%{?use_xulrunner_js}%{?use_firefox_js} -Requires: gecko-libs = %{gecko_libs_ver} -%endif - %description gxine is a fully-featured free audio/video player for unix-like systems which uses libxine for audio/video decoding and playback. For more informations on @@ -69,15 +42,7 @@ Summary: Mozilla plugin for gxine Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%if 0%{?use_xulrunner_js} -Requires: xulrunner -%else -%if 0%{?use_firefox_js} -Requires: firefox -%else -Requires: %{_libdir}/mozilla/plugins -%endif -%endif +Requires: mozilla-filesystem %description mozplugin This plugin allows gxine to be embedded in a web browser. @@ -159,6 +124,11 @@ %{_libdir}/mozilla/plugins/gxineplugin.so %changelog +* Sat Jul 19 2008 Martin Sourada - 0.5.903-2 +- rebuild for new xulrunner +- drop dist checks to keep the spec cleaner +- drop versioned dependency on gecko-libs + * Sun Jun 15 2008 Martin Sourada - 0.5.903-1 - new upstream version From fedora-extras-commits at redhat.com Sat Jul 19 14:54:33 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 14:54:33 GMT Subject: rpms/qt/F-9 qt.spec,1.176,1.177 Message-ID: <200807191454.m6JEsX5A000621@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv557 Modified Files: qt.spec Log Message: * Sat Jul 19 2008 Rex Dieter 4.4.0-14 - macros.qt4: fix %_qt4_datadir, %_qt4_translationdir Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- qt.spec 18 Jul 2008 15:23:09 -0000 1.176 +++ qt.spec 19 Jul 2008 14:53:42 -0000 1.177 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 13%{?dist}.1 +Release: 14%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -69,8 +69,8 @@ #define phonon -phonon -gstreamer %define webkit -webkit -# undefine to disable these #define nas -system-nas-sound +%define nas -no-nas-sound %if 0%{?fedora} > 4 || 0%{?rhel} > 4 # link dbus %define dbus -dbus-linked @@ -122,7 +122,7 @@ %endif BuildRequires: %{x_deps} -%if "%{?nas}" == "-system-nas-sound" +%if "%{?nas}" != "-no-nas-sound" BuildRequires: nas-devel %endif @@ -392,7 +392,7 @@ %{?dbus} %{!?dbus:-no-dbus} \ %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ %{?webkit} %{!?webkit:-no-webkit } \ - %{?nas} %{!?nas:-no-nas-sound} \ + %{?nas} \ %{?mysql} \ %{?psql} \ %{?odbc} \ @@ -538,7 +538,7 @@ %%_qt4_version %{version} %%_qt4_prefix %%{_libdir}/qt4 %%_qt4_bindir %%{_qt4_prefix}/bin -%%_qt4_datadir %%{_datadir}/qt4 +%%_qt4_datadir %%{_qt4_prefix} %%_qt4_demosdir %%{_qt4_prefix}/demos %%_qt4_docdir %%{_docdir}/qt4 %%_qt4_examples %%{_qt4_prefix}/examples @@ -547,7 +547,7 @@ %%_qt4_plugindir %%{_qt4_prefix}/plugins %%_qt4_qmake %%{_qt4_bindir}/qmake %%_qt4_sysconfdir %%{_sysconfdir} -%%_qt4_translationdir %%{_qt4_datadir}/translations +%%_qt4_translationdir %%{_datadir}/qt4/translations EOF # create/own %%_qt4_plugindir/styles @@ -773,6 +773,9 @@ %changelog +* Sat Jul 19 2008 Rex Dieter 4.4.0-14 +- macros.qt4: fix %%_qt4_datadir, %%_qt4_translationdir + * Thu Jul 17 2008 Rex Dieter 4.4.0-13 - (re)fix qconfig-multilib.h for sparc64 From fedora-extras-commits at redhat.com Sat Jul 19 14:57:09 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 14:57:09 GMT Subject: rpms/kdepimlibs/F-9 .cvsignore, 1.18, 1.19 kdepimlibs.spec, 1.33, 1.34 sources, 1.17, 1.18 Message-ID: <200807191457.m6JEv9Tl000866@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv791 Modified Files: .cvsignore kdepimlibs.spec sources Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 1 Jun 2008 19:59:46 -0000 1.18 +++ .cvsignore 19 Jul 2008 14:56:16 -0000 1.19 @@ -1,2 +1 @@ -kdepimlibs-4.0.4.tar.bz2 -kdepimlibs-4.0.5.tar.bz2 +kdepimlibs-4.0.99.tar.bz2 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- kdepimlibs.spec 1 Jun 2008 19:59:46 -0000 1.33 +++ kdepimlibs.spec 19 Jul 2008 14:56:16 -0000 1.34 @@ -14,7 +14,7 @@ Name: kdepimlibs -Version: 4.0.5 +Version: 4.0.99 Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries @@ -27,6 +27,7 @@ Requires: kdelibs4 >= %{version} +BuildRequires: akonadi-devel BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cyrus-sasl-devel @@ -134,6 +135,7 @@ %if 0%{?rest} %files %defattr(-,root,root,-) +%{_kde4_datadir}/apps/akonadi-kde/ %{_kde4_appsdir}/kabc/ %{_kde4_appsdir}/libical/ %{_kde4_appsdir}/kconf_update/* @@ -161,11 +163,36 @@ %changelog -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Tue Jun 24 2008 Than Ngo 4.0.83-2 +- respun + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sat Jun 14 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Mon May 05 2008 Kevin Kofler - 4.0.72-2 +- add BR akonadi-devel +- update file list + +* Fri May 02 2008 Kevin Kofler - 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) * Thu Apr 03 2008 Kevin Kofler 4.0.3-3 - rebuild (again) for the fixed %%{_kde4_buildtype} Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 1 Jun 2008 19:59:46 -0000 1.17 +++ sources 19 Jul 2008 14:56:16 -0000 1.18 @@ -1 +1 @@ -30b43558e9f8eebb249696b0308ad341 kdepimlibs-4.0.5.tar.bz2 +5fb63a94b4b07e906cb3c19483b99fdd kdepimlibs-4.0.99.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 14:59:07 2008 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Sat, 19 Jul 2008 14:59:07 GMT Subject: rpms/mantis/F-9 .cvsignore, 1.9, 1.10 mantis.spec, 1.18, 1.19 sources, 1.14, 1.15 Message-ID: <200807191459.m6JEx7Gq001074@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/mantis/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv962 Modified Files: .cvsignore mantis.spec sources Log Message: * Sat Jul 19 2008 Gianluca Sforna - 1.1.2-1 - new upstream release - add patch for bugnotes notification Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mantis/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Jan 2008 22:52:18 -0000 1.9 +++ .cvsignore 19 Jul 2008 14:58:15 -0000 1.10 @@ -1 +1 @@ -mantis-1.1.1.tar.gz +mantis-1.1.2.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/F-9/mantis.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mantis.spec 20 Jan 2008 22:52:18 -0000 1.18 +++ mantis.spec 19 Jul 2008 14:58:15 -0000 1.19 @@ -5,7 +5,7 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet @@ -16,6 +16,8 @@ Patch1: mantis-1.1.0-noexamplecom.patch Patch2: mantis-1.0.0rc2-noadmin.patch +Patch3: mantis-1.1.2-bugnote.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php >= 4.3.0 @@ -58,6 +60,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp %{SOURCE1} ./doc/README.Fedora rm -rf packages @@ -142,6 +145,10 @@ %changelog +* Sat Jul 19 2008 Gianluca Sforna - 1.1.2-1 +- new upstream release +- add patch for bugnotes notification + * Sat Jan 19 2008 Gianluca Sforna - 1.1.1-1 - new upstream release - Add more info in README.Fedora about configuration, upgrades Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Jan 2008 22:52:18 -0000 1.14 +++ sources 19 Jul 2008 14:58:15 -0000 1.15 @@ -1 +1 @@ -7e646be79def5bb32b74b1a246caf766 mantis-1.1.1.tar.gz +4cf5a591fd6855b49d745285db5d91ff mantis-1.1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 15:40:16 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 19 Jul 2008 15:40:16 GMT Subject: rpms/xwnc/F-9 xwnc.spec,1.6,1.7 Message-ID: <200807191540.m6JFeGjh011029@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/xwnc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10930/F-9 Modified Files: xwnc.spec Log Message: try linking with -Wl,--export-dynamic Index: xwnc.spec =================================================================== RCS file: /cvs/extras/rpms/xwnc/F-9/xwnc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xwnc.spec 3 Jul 2008 17:56:04 -0000 1.6 +++ xwnc.spec 19 Jul 2008 15:39:28 -0000 1.7 @@ -1,7 +1,7 @@ Name: xwnc Summary: Mix of Xvnc and XDarwin with improved protocol Version: 0.3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: User Interface/X @@ -25,7 +25,7 @@ %build %configure --without-fvwm-ametista --disable-glx # does not build correctly with SMP flags -make +make LDFLAGS=-Wl,--export-dynamic %install @@ -44,6 +44,9 @@ %changelog +* Tue Jul 08 2008 Christopher Stone 0.3.3-6 +- Try linking with -Wl,--export-dynamic. + * Thu Jul 03 2008 Christopher Stone 0.3.3-5 - Rebuild for new Mesa From fedora-extras-commits at redhat.com Sat Jul 19 15:40:27 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 19 Jul 2008 15:40:27 GMT Subject: rpms/xwnc/F-8 xwnc.spec,1.5,1.6 Message-ID: <200807191540.m6JFeRuR011034@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/xwnc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10930/F-8 Modified Files: xwnc.spec Log Message: try linking with -Wl,--export-dynamic Index: xwnc.spec =================================================================== RCS file: /cvs/extras/rpms/xwnc/F-8/xwnc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xwnc.spec 3 Jul 2008 17:56:00 -0000 1.5 +++ xwnc.spec 19 Jul 2008 15:39:10 -0000 1.6 @@ -1,7 +1,7 @@ Name: xwnc Summary: Mix of Xvnc and XDarwin with improved protocol Version: 0.3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: User Interface/X @@ -25,7 +25,7 @@ %build %configure --without-fvwm-ametista --disable-glx # does not build correctly with SMP flags -make +make LDFLAGS=-Wl,--export-dynamic %install @@ -44,6 +44,9 @@ %changelog +* Tue Jul 08 2008 Christopher Stone 0.3.3-6 +- Try linking with -Wl,--export-dynamic. + * Thu Jul 03 2008 Christopher Stone 0.3.3-5 - Rebuild for new Mesa From fedora-extras-commits at redhat.com Sat Jul 19 15:40:35 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 19 Jul 2008 15:40:35 GMT Subject: rpms/xwnc/devel xwnc.spec,1.6,1.7 Message-ID: <200807191540.m6JFeZ45011039@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/xwnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10930/devel Modified Files: xwnc.spec Log Message: try linking with -Wl,--export-dynamic Index: xwnc.spec =================================================================== RCS file: /cvs/extras/rpms/xwnc/devel/xwnc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xwnc.spec 3 Jul 2008 17:56:22 -0000 1.6 +++ xwnc.spec 19 Jul 2008 15:39:46 -0000 1.7 @@ -1,7 +1,7 @@ Name: xwnc Summary: Mix of Xvnc and XDarwin with improved protocol Version: 0.3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: User Interface/X @@ -25,7 +25,7 @@ %build %configure --without-fvwm-ametista --disable-glx # does not build correctly with SMP flags -make +make LDFLAGS=-Wl,--export-dynamic %install @@ -44,6 +44,9 @@ %changelog +* Tue Jul 08 2008 Christopher Stone 0.3.3-6 +- Try linking with -Wl,--export-dynamic. + * Thu Jul 03 2008 Christopher Stone 0.3.3-5 - Rebuild for new Mesa From fedora-extras-commits at redhat.com Sat Jul 19 15:45:14 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 19 Jul 2008 15:45:14 GMT Subject: rpms/gfs-nicefore-fonts/devel gfs-nicefore-fonts-fontconfig.conf, NONE, 1.1 gfs-nicefore-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807191545.m6JFjEpX011274@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-nicefore-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11246/devel Modified Files: .cvsignore sources Added Files: gfs-nicefore-fonts-fontconfig.conf gfs-nicefore-fonts.spec import.log Log Message: Initial packaging --- NEW FILE gfs-nicefore-fonts-fontconfig.conf --- GFS Nicefore fantasy fantasy GFS Nicefore --- NEW FILE gfs-nicefore-fonts.spec --- %define fontname gfs-nicefore %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_NICEFORE Name: %{fontname}-fonts Version: 20080303 Release: 1%{?dist} Summary: GFS Nicefore majuscule Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description As it is known, the Greek alphabet was used in majuscule form for over a millennium before the minuscule letters gradually replaced it until they became the official script in the 9th century A.D. Thereafter, majuscule letters were confined to sparse use as initials or elaborate titles until the Italian Renaissance. The new art of Typography, as well as the need of the humanists to mimic the ancient Greco-Roman period brought back the extensive use of the majuscule letter-forms in both Latin and Greek typography. Greek books of the time were printed using the contemporary Byzantine hand with which they combined capital letters modelled on the Roman antiquity, i.e. with thick and thin strokes and serifs. At the same time the Byzantine majuscule tradition, principally used on theological editions, remainned alive until the early 19th century. GFS Nicefore is a typical Byzantine sample of the 5th-7th century period. It has been designed by George D. Matthiopoulos. %prep %setup -q -c -T unzip -j -L -q %{SOURCE0} chmod 0644 *.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.otf %changelog * Sun Jul 06 2008 Nicolas Mailhot - 20080303-1 ?? initial packaging --- NEW FILE import.log --- gfs-nicefore-fonts-20080303-1_fc10:HEAD:gfs-nicefore-fonts-20080303-1.fc10.src.rpm:1216482262 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gfs-nicefore-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2008 14:01:06 -0000 1.1 +++ .cvsignore 19 Jul 2008 15:44:33 -0000 1.2 @@ -0,0 +1 @@ +GFS_NICEFORE.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/gfs-nicefore-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2008 14:01:06 -0000 1.1 +++ sources 19 Jul 2008 15:44:33 -0000 1.2 @@ -0,0 +1 @@ +02fcaf05448bb0df6696567975014132 GFS_NICEFORE.zip From fedora-extras-commits at redhat.com Sat Jul 19 15:56:30 2008 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Sat, 19 Jul 2008 15:56:30 GMT Subject: rpms/mantis/F-9 mantis-1.1.2-bugnote.patch,NONE,1.1 Message-ID: <200807191556.m6JFuUiM011679@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/mantis/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11625 Added Files: mantis-1.1.2-bugnote.patch Log Message: Oops, forgot the actual patch file... mantis-1.1.2-bugnote.patch: --- NEW FILE mantis-1.1.2-bugnote.patch --- Index: mantis-1.1.2/core/bugnote_api.php =================================================================== --- mantis-1.1.2.orig/core/bugnote_api.php +++ mantis-1.1.2/core/bugnote_api.php @@ -99,7 +99,7 @@ # Add a bugnote to a bug # # return the ID of the new bugnote - function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null ) { + function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null, $p_send_email = true ) { $c_bug_id = db_prepare_int( $p_bug_id ); $c_bugnote_text = db_prepare_string( $p_bugnote_text ); $c_time_tracking = db_prepare_time( $p_time_tracking ); From fedora-extras-commits at redhat.com Sat Jul 19 15:58:29 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 15:58:29 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.99-plasma-tooltips.patch, NONE, 1.1 kdebase-workspace.spec, 1.107, 1.108 Message-ID: <200807191558.m6JFwTUi011885@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11789/devel Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.99-plasma-tooltips.patch Log Message: * Sat Jul 19 2008 Kevin Kofler 4.0.99-2 - backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) WARNING: Adds some new APIs from 4.2 (Plasma::popupPosition, Plasma::viewFor, Plasma::ToolTip*), use at your own risk, we have no control to guarantee that they will not change! kdebase-workspace-4.0.99-plasma-tooltips.patch: --- NEW FILE kdebase-workspace-4.0.99-plasma-tooltips.patch --- diff -Nur kdebase-workspace-4.0.99/libs/plasma/applet.cpp kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/applet.cpp --- kdebase-workspace-4.0.99/libs/plasma/applet.cpp 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/applet.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -76,6 +75,7 @@ #include "plasma/view.h" #include "plasma/widgets/label.h" #include "plasma/widgets/pushbutton.h" +#include "plasma/tooltipmanager.h" //#define DYNAMIC_SHADOWS namespace Plasma @@ -411,13 +411,16 @@ return 0; } + QGraphicsView *found = 0; foreach (QGraphicsView *view, scene()->views()) { if (view->sceneRect().intersects(sceneBoundingRect()) || view->sceneRect().contains(scenePos())) { - return view; + if (!found || view->isActiveWindow()) { + found = view; + } } } - return 0; + return found; } QRectF Applet::mapFromView(const QGraphicsView *view, const QRect &rect) const @@ -434,55 +437,7 @@ QPoint Applet::popupPosition(const QSize &s) const { - QGraphicsView *v = view(); - Q_ASSERT(v); - - QPoint pos = v->mapFromScene(scenePos()); - pos = v->mapToGlobal(pos); - //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; - Plasma::View *pv = dynamic_cast(v); - - Plasma::Location loc = Floating; - if (pv) { - loc = pv->containment()->location(); - } - - switch (loc) { - case BottomEdge: - pos = QPoint(pos.x(), pos.y() - s.height()); - break; - case TopEdge: - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - break; - case LeftEdge: - pos = QPoint(pos.x() + (int)size().width(), pos.y()); - break; - case RightEdge: - pos = QPoint(pos.x() - s.width(), pos.y()); - break; - default: - if (pos.y() - s.height() > 0) { - pos = QPoint(pos.x(), pos.y() - s.height()); - } else { - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - } - } - - //are we out of screen? - - QRect screenRect = QApplication::desktop()->screenGeometry(pv ? pv->containment()->screen() : -1); - //kDebug() << "==> rect for" << (pv ? pv->containment()->screen() : -1) << "is" << screenRect; - - if (pos.rx() + s.width() > screenRect.right()) { - pos.rx() -= ((pos.rx() + s.width()) - screenRect.right()); - } - - if (pos.ry() + s.height() > screenRect.bottom()) { - pos.ry() -= ((pos.ry() + s.height()) - screenRect.bottom()); - } - pos.rx() = qMax(0, pos.rx()); - - return pos; + return Plasma::popupPosition(this, s); } void Applet::updateConstraints(Plasma::Constraints constraints) diff -Nur kdebase-workspace-4.0.99/libs/plasma/CMakeLists.txt kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/CMakeLists.txt --- kdebase-workspace-4.0.99/libs/plasma/CMakeLists.txt 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/CMakeLists.txt 2008-07-19 17:33:19.000000000 +0200 @@ -58,6 +58,8 @@ svg.cpp theme.cpp toolbox.cpp + tooltipmanager.cpp + tooltip.cpp uiloader.cpp version.cpp view.cpp @@ -140,7 +142,9 @@ servicejob.h svg.h theme.h + tooltipmanager.h uiloader.h + tooltipmanager.h version.h view.h) @@ -225,6 +229,7 @@ includes/SignalPlotter includes/Svg includes/TextEdit +includes/ToolTipManager includes/Theme includes/UiLoader includes/View diff -Nur kdebase-workspace-4.0.99/libs/plasma/containment.cpp kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/containment.cpp --- kdebase-workspace-4.0.99/libs/plasma/containment.cpp 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/containment.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -1280,6 +1280,9 @@ // point anymore since we are in the qobject dtor. we don't actually // try and do anything with it, we just need the value of the pointer // so this unsafe looking code is actually just fine. + // + // NOTE: DO NOT USE THE applet VARIABLE FOR ANYTHING OTHER THAN COMPARING + // THE ADDRESS! ACTUALLY USING THE OBJECT WILL RESULT IN A CRASH!!! Applet* applet = static_cast(object); applets.removeAll(applet); if (focusedApplet == applet) { diff -Nur kdebase-workspace-4.0.99/libs/plasma/includes/ToolTipManager kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/includes/ToolTipManager --- kdebase-workspace-4.0.99/libs/plasma/includes/ToolTipManager 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/includes/ToolTipManager 2008-07-19 17:33:19.000000000 +0200 @@ -0,0 +1 @@ +#include "../../plasma/tooltipmanager.h" diff -Nur kdebase-workspace-4.0.99/libs/plasma/plasma.cpp kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/plasma.cpp --- kdebase-workspace-4.0.99/libs/plasma/plasma.cpp 2008-07-08 11:26:23.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/plasma.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -17,7 +17,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include + +#include +#include +#include + +#include +#include namespace Plasma { @@ -62,4 +69,78 @@ return Down; } +QPoint popupPosition(const QGraphicsItem * item, const QSize &s) +{ + QGraphicsView *v = viewFor(item); + + if (!v) { + return QPoint(0,0); + } + + QPoint pos = v->mapFromScene(item->scenePos()); + pos = v->mapToGlobal(pos); + //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; + Plasma::View *pv = dynamic_cast(v); + + Plasma::Location loc = Floating; + if (pv) { + loc = pv->containment()->location(); + } + + switch (loc) { + case BottomEdge: + pos = QPoint(pos.x(), pos.y() - s.height()); + break; + case TopEdge: + pos = QPoint(pos.x(), pos.y() + (int)item->boundingRect().size().height()); + break; + case LeftEdge: + pos = QPoint(pos.x() + (int)item->boundingRect().size().width(), pos.y()); + break; + case RightEdge: + pos = QPoint(pos.x() - s.width(), pos.y()); + break; + default: + if (pos.y() - s.height() > 0) { [...1822 lines suppressed...] m_icon->setDrawBackground(false); } } diff -Nur kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.cpp kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp --- kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -41,6 +41,7 @@ #include "plasma/theme.h" #include "plasma/paintutils.h" #include "plasma/panelsvg.h" +#include "plasma/tooltipmanager.h" #include "tasks.h" @@ -61,12 +62,18 @@ setAcceptsHoverEvents(true); setAcceptDrops(true); + Plasma::ToolTipManager::self()->registerWidget(this); + QFontMetrics fm(KGlobalSettings::taskbarFont()); QSize mSize = fm.size(0, "M"); setPreferredSize(QSize(mSize.width()*15 + m_applet->itemLeftMargin() + m_applet->itemRightMargin() + IconSize(KIconLoader::Panel), mSize.height()*3 + m_applet->itemTopMargin() + m_applet->itemBottomMargin())); } +WindowTaskItem::~WindowTaskItem() +{ +} + void WindowTaskItem::activate() { // the Task class has a method called activateRaiseOrIconify() which @@ -552,19 +559,18 @@ taskIcon.addPixmap(m_task->icon(KIconLoader::SizeMedium, KIconLoader::SizeMedium, false)); taskIcon.addPixmap(m_task->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false)); -#ifdef TOOLTIP_MANAGER if (m_showTooltip) { - Plasma::ToolTipData data; + Plasma::ToolTipManager::ToolTipContent data; data.mainText = m_task->visibleName(); data.subText = i18nc("Which virtual desktop a window is currently on", "On %1", KWindowSystem::desktopName(m_task->desktop())); - data.image = iconPixmap; + data.image = m_task->icon(KIconLoader::SizeSmall, KIconLoader::SizeSmall, false); data.windowToPreview = m_task->window(); - setToolTip(data); - } else { - Plasma::ToolTipData data; - setToolTip(data); // Clear + + Plasma::ToolTipManager::self()->setToolTipContent(this,data); + } + else { + Plasma::ToolTipManager::self()->unregisterWidget(this); } -#endif setIcon(taskIcon); setText(m_task->visibleName()); //redraw @@ -722,4 +728,5 @@ size, bounds.toRect()); } + #include "windowtaskitem.moc" diff -Nur kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.h kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h --- kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.h 2008-06-18 14:41:39.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h 2008-07-19 17:34:22.000000000 +0200 @@ -57,6 +57,9 @@ /** Constructs a new representation for a window task. */ WindowTaskItem(Tasks *parent, const bool showTooltip); + /**Destruct the representation of the window task */ + ~WindowTaskItem(); + /** Sets the starting task represented by this item. */ void setStartupTask(TaskManager::StartupPtr task); diff -Nur kdebase-workspace-4.0.99/plasma/applets/trash/trash.cpp kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.cpp --- kdebase-workspace-4.0.99/plasma/applets/trash/trash.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.cpp 2008-07-19 17:35:30.000000000 +0200 @@ -45,6 +45,7 @@ //Plasma #include #include +#include //Solid #include @@ -100,10 +101,6 @@ registerAsDragHandle(m_icon); - //setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Small))); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.mainText = i18n("Trash"); - connect(m_icon, SIGNAL(activated()), this, SLOT(slotOpen())); connect(&m_menu, SIGNAL(aboutToHide()), m_icon, SLOT(setUnpressed())); @@ -201,17 +198,20 @@ void Trash::setIcon() { + Plasma::ToolTipManager::ToolTipContent data; + data.mainText = i18n("Trash"); + if (m_count > 0) { m_icon->setIcon(KIcon("user-trash-full")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18np("One item", "%1 items", m_count); + + data.subText = i18np("One item", "%1 items", m_count); if (m_showText) { m_icon->setInfoText(i18np("One item", "%1 items", m_count)); } } else { m_icon->setIcon(KIcon("user-trash")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); + + data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); if (m_showText){ m_icon->setInfoText(i18nc("The trash is empty. This is not an action, but a state", "Empty")); } @@ -219,14 +219,13 @@ m_icon->update(); - //FIXME TOOLTIP MANAGER - /*m_data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); + data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); if (!m_showText) { - m_icon->setToolTip(m_data); + Plasma::ToolTipManager::self()->setToolTipContent(this, data); } else { - m_icon->setToolTip(Plasma::ToolTipData()); - }*/ + Plasma::ToolTipManager::self()->setToolTipContent(this, Plasma::ToolTipManager::ToolTipContent()); + } emptyTrash->setEnabled(m_count>0); } diff -Nur kdebase-workspace-4.0.99/plasma/applets/trash/trash.h kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.h --- kdebase-workspace-4.0.99/plasma/applets/trash/trash.h 2008-04-30 15:58:26.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.h 2008-07-19 17:35:30.000000000 +0200 @@ -75,8 +75,6 @@ QAction *emptyTrash; int m_count; bool m_showText; - //FIXME PORT TO TOOLTIP MANAGER - //Plasma::ToolTipData m_data; KFilePlacesModel *m_places; }; diff -Nur kdebase-workspace-4.0.99/plasma/design/tooltips kdebase-workspace-4.0.99-plasma-tooltips/plasma/design/tooltips --- kdebase-workspace-4.0.99/plasma/design/tooltips 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/design/tooltips 2008-07-19 17:34:22.000000000 +0200 @@ -0,0 +1,39 @@ +Tooltips +========== + +Overview +-------- +libplasma provides facilities to manage tooltips that display extended information in a visually pleasing and consistent manner for QGraphicsWidgets. These tooltip windows are themed using Plasma::Theme. + +Timeline +-------- +Introduced in: libplasma 2.1 (KDE 4.2.0) + +Component Type +-------------- +ToolTipManager is a QObject subclass in libplasma. +ToolTip is an internal QWidget subclass in libplasma. + +Registering Tooltips +-------------------- +ToolTipManger is quite simple to use: simply call setWidgetToolTipContent using the struct ToolTipContent. This causes the widget to be registered if it isn't already. Alternatively, for widgets that fill the data on demand, call registerWidget directly. + +Widgets are unregistered automatically upon destruction, but can also be manually unregsitered by calling ToolTipMnager::unregisterWidget. + +An event filter is registered on each registered widget and hover events that occur trigger calls to showToolTip and hideToolTip. The hover events are not, however, filtered out. + +Note: If another event filter is placed on registered widget that filters out these events, it may be necessary to manually call showToolTip and hideToolTip. + +ToolTip Updates +--------------- +Updating tooltip data is supported by means of invoking slots on the associated widget if they exist. In particular, just prior to being shown the toolTipAboutToShow method is invoked and when hiding the toolTipHidden method is invoked. + +ToolTip Visualization +--------------------- +The internal (non-exported) ToolTip class is used to actually display the tooltips. These are associated with widgets and created as necessary. + +ToolTip displays are only created when data is set, and are deleted if an empty ToolTipData struct is passed in. This keeps memory usage due to ToolTip objects down. + +Future Work +----------- +N/A Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- kdebase-workspace.spec 18 Jul 2008 15:16:58 -0000 1.107 +++ kdebase-workspace.spec 19 Jul 2008 15:57:44 -0000 1.108 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.99 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -26,6 +26,11 @@ Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch # upstream patches: +# backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) +# This is a cumulative patch from the following revision pairs: 833271:833299, +# 833385:833386, 833479:833545, 833580:833581, 833587:833620, 834651:834652 +# This is backwards BC wrt 4.1, but the API of the new classes is not finalized. +Patch100: kdebase-workspace-4.0.99-plasma-tooltips.patch # plasma-4.0-openSUSE patches: Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch @@ -139,6 +144,7 @@ %patch11 -p1 -b .plasma-default-wallpaper # upstream patches +%patch100 -p1 -b .plasma-tooltips # plasma-4.0-openSUSE patches: %patch204 -p1 -b .kickoff-suspend @@ -274,6 +280,12 @@ %changelog +* Sat Jul 19 2008 Kevin Kofler 4.0.99-2 +- backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) + WARNING: Adds some new APIs from 4.2 (Plasma::popupPosition, Plasma::viewFor, + Plasma::ToolTip*), use at your own risk, we have no control to + guarantee that they will not change! + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Sat Jul 19 16:02:10 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Sat, 19 Jul 2008 16:02:10 GMT Subject: rpms/cacti/EL-4 cacti.spec,1.16,1.17 Message-ID: <200807191602.m6JG2AJs018735@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/cacti/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18608/EL-4 Modified Files: cacti.spec Log Message: updated license and fixed changelog issue Index: cacti.spec =================================================================== RCS file: /cvs/pkgs/rpms/cacti/EL-4/cacti.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- cacti.spec 14 Feb 2008 14:42:47 -0000 1.16 +++ cacti.spec 19 Jul 2008 16:01:16 -0000 1.17 @@ -1,10 +1,11 @@ Name: cacti Version: 0.8.7b -Release: 1%{?dist} +Release: 3%{?dist} Summary: An rrd based graphing tool Group: Applications/System -License: GPL +# There's a lot of stuff in there. It's all compatible. +License: GPLv2+ and LGPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD) URL: http://www.cacti.net/ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz Source1: cacti-httpd.conf @@ -100,7 +101,13 @@ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog -* Thu Nov 14 2008 Mike McGrath - 0.8.7b-1 +* Fri Jul 18 2008 Tom "spot" Callaway - 0.8.7b-3 +- fix my own mistake in the license tag + +* Tue Jul 15 2008 Tom "spot" Callaway - 0.8.7b-2 +- fix license tag + +* Thu Feb 14 2008 Mike McGrath - 0.8.7b-1 - Upstream released new version * Fri Nov 23 2007 Mike McGrath - 0.8.7a-2 From fedora-extras-commits at redhat.com Sat Jul 19 16:02:35 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Sat, 19 Jul 2008 16:02:35 GMT Subject: rpms/cacti/EL-5 cacti.spec,1.16,1.17 Message-ID: <200807191602.m6JG2ZhS018777@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/cacti/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18608/EL-5 Modified Files: cacti.spec Log Message: updated license and fixed changelog issue Index: cacti.spec =================================================================== RCS file: /cvs/pkgs/rpms/cacti/EL-5/cacti.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- cacti.spec 14 Feb 2008 14:42:57 -0000 1.16 +++ cacti.spec 19 Jul 2008 16:01:40 -0000 1.17 @@ -1,10 +1,11 @@ Name: cacti Version: 0.8.7b -Release: 1%{?dist} +Release: 3%{?dist} Summary: An rrd based graphing tool Group: Applications/System -License: GPL +# There's a lot of stuff in there. It's all compatible. +License: GPLv2+ and LGPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD) URL: http://www.cacti.net/ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz Source1: cacti-httpd.conf @@ -100,7 +101,13 @@ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog -* Thu Nov 14 2008 Mike McGrath - 0.8.7b-1 +* Fri Jul 18 2008 Tom "spot" Callaway - 0.8.7b-3 +- fix my own mistake in the license tag + +* Tue Jul 15 2008 Tom "spot" Callaway - 0.8.7b-2 +- fix license tag + +* Thu Feb 14 2008 Mike McGrath - 0.8.7b-1 - Upstream released new version * Fri Nov 23 2007 Mike McGrath - 0.8.7a-2 From fedora-extras-commits at redhat.com Sat Jul 19 16:02:51 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 19 Jul 2008 16:02:51 GMT Subject: rpms/gfs-jackson-fonts/devel gfs-jackson-fonts-fontconfig.conf, NONE, 1.1 gfs-jackson-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807191602.m6JG2pKl018784@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-jackson-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18706/devel Modified Files: .cvsignore sources Added Files: gfs-jackson-fonts-fontconfig.conf gfs-jackson-fonts.spec import.log Log Message: Initial packaging --- NEW FILE gfs-jackson-fonts-fontconfig.conf --- GFS Jackson fantasy fantasy GFS Jackson --- NEW FILE gfs-jackson-fonts.spec --- %define fontname gfs-jackson %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_JACKSON Name: %{fontname}-fonts Version: 20080303 Release: 1%{?dist} Summary: GFS Jackson majuscule Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description As it is known, the Greek alphabet was used in majuscule form for over a millennium before the minuscule letters gradually replaced it until they became the official script in the 9th century A.D. Thereafter, majuscule letters were confined to sparse use as initials or elaborate titles until the Italian Renaissance. The new art of Typography, as well as the need of the humanists to mimic the ancient Greco-Roman period brought back the extensive use of the majuscule letter-forms in both Latin and Greek typography. Greek books of the time were printed using the contemporary Byzantine hand with which they combined capital letters modelled on the Roman antiquity, i.e. with thick and thin strokes and serifs. At the same time the Byzantine majuscule tradition, principally used on theological editions, remainned alive until the early 19th century. GFS Jackson is an edition of the font cut, in 1788, by Joseph Jackson on commission by the Cambridge University in preparation of the edition of the Beza codex containning the New Testament from the 5th-6th century. Theodore Beza was the erudite scholar from Geneva who had given the codex as a gift to the University in 1581. It has been designed by George D. Matthiopoulos. %prep %setup -q -c -T unzip -j -L -q %{SOURCE0} chmod 0644 *.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.otf %changelog * Sun Jul 06 2008 Nicolas Mailhot - 20080303-1 ?? initial packaging --- NEW FILE import.log --- gfs-jackson-fonts-20080303-1_fc10:HEAD:gfs-jackson-fonts-20080303-1.fc10.src.rpm:1216483310 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gfs-jackson-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2008 14:02:19 -0000 1.1 +++ .cvsignore 19 Jul 2008 16:02:05 -0000 1.2 @@ -0,0 +1 @@ +GFS_JACKSON.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/gfs-jackson-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2008 14:02:19 -0000 1.1 +++ sources 19 Jul 2008 16:02:05 -0000 1.2 @@ -0,0 +1 @@ +73d235051292e23bc807c71d8c951e6b GFS_JACKSON.zip From fedora-extras-commits at redhat.com Sat Jul 19 16:09:43 2008 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Sat, 19 Jul 2008 16:09:43 GMT Subject: rpms/mantis/F-8 mantis-1.1.2-bugnote.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 mantis.spec, 1.18, 1.19 sources, 1.14, 1.15 Message-ID: <200807191609.m6JG9hAu019424@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/mantis/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19351 Modified Files: .cvsignore mantis.spec sources Added Files: mantis-1.1.2-bugnote.patch Log Message: * Sat Jul 19 2008 Gianluca Sforna - 1.1.2-1 - new upstream release - add patch for bugnotes notification mantis-1.1.2-bugnote.patch: --- NEW FILE mantis-1.1.2-bugnote.patch --- Index: mantis-1.1.2/core/bugnote_api.php =================================================================== --- mantis-1.1.2.orig/core/bugnote_api.php +++ mantis-1.1.2/core/bugnote_api.php @@ -99,7 +99,7 @@ # Add a bugnote to a bug # # return the ID of the new bugnote - function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null ) { + function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null, $p_send_email = true ) { $c_bug_id = db_prepare_int( $p_bug_id ); $c_bugnote_text = db_prepare_string( $p_bugnote_text ); $c_time_tracking = db_prepare_time( $p_time_tracking ); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mantis/F-8/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 21 Jan 2008 08:05:27 -0000 1.9 +++ .cvsignore 19 Jul 2008 16:08:30 -0000 1.10 @@ -1 +1 @@ -mantis-1.1.1.tar.gz +mantis-1.1.2.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/F-8/mantis.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mantis.spec 21 Jan 2008 08:05:27 -0000 1.18 +++ mantis.spec 19 Jul 2008 16:08:30 -0000 1.19 @@ -5,7 +5,7 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet @@ -16,6 +16,8 @@ Patch1: mantis-1.1.0-noexamplecom.patch Patch2: mantis-1.0.0rc2-noadmin.patch +Patch3: mantis-1.1.2-bugnote.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php >= 4.3.0 @@ -58,6 +60,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp %{SOURCE1} ./doc/README.Fedora rm -rf packages @@ -142,6 +145,10 @@ %changelog +* Sat Jul 19 2008 Gianluca Sforna - 1.1.2-1 +- new upstream release +- add patch for bugnotes notification + * Sat Jan 19 2008 Gianluca Sforna - 1.1.1-1 - new upstream release - Add more info in README.Fedora about configuration, upgrades Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Jan 2008 08:05:27 -0000 1.14 +++ sources 19 Jul 2008 16:08:30 -0000 1.15 @@ -1 +1 @@ -7e646be79def5bb32b74b1a246caf766 mantis-1.1.1.tar.gz +4cf5a591fd6855b49d745285db5d91ff mantis-1.1.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 19 16:38:53 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 19 Jul 2008 16:38:53 GMT Subject: rpms/ecolier-court-fonts/devel README-Fedora.txt, NONE, 1.1 ecolier-court-fonts-fontconfig.conf, NONE, 1.1 ecolier-court-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 lisez_moi.txt, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807191638.m6JGcr6o020178@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/ecolier-court-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150/devel Modified Files: .cvsignore sources Added Files: README-Fedora.txt ecolier-court-fonts-fontconfig.conf ecolier-court-fonts.spec import.log lisez_moi.txt Log Message: Initial packaging ??? --- NEW FILE README-Fedora.txt --- [Unofficial English translation of lisez_moi.txt] WARNING The two fonts named: ??? Ecolier court ??? Ecolier lignes court are released under the OFL (Open Font Licence): http://scripts.sil.org/OFL An (unofficial) translation in French is available here: http://fontforge.sourceforge.net/OFL-Unofficial-fr.html Please read the conditions of use of the two fonts listed here. If you want to display my fonts on your site, please add it the OFL logo (with its link), the OFL translation and the lisez_moi.txt file. You can also (and this is often preferable), link to my site: http://perso.orange.fr/jm.douteau/ The author makes those fonts available to everyone free of charge and disclaims any responsibility for possible malfunctions. Those fonts were created by Jean-Marie Douteau. e-mail : douteau.ecolier at orange.fr --- NEW FILE ecolier-court-fonts-fontconfig.conf --- Ecolier_court cursive cursive Ecolier_court Ecolier_lignes_court fantasy fantasy Ecolier_lignes_court --- NEW FILE ecolier-court-fonts.spec --- %define fontname ecolier-court %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d Name: %{fontname}-fonts Version: 20070702 Release: 1%{?dist} Summary: ??colier court cursive fonts Group: User Interface/X License: OFL URL: http://perso.orange.fr/jm.douteau/page_ecolier.htm # The author links to third-party licence documents not included there Source0: http://perso.orange.fr/jm.douteau/polices/ecl_cour.ttf Source1: http://perso.orange.fr/jm.douteau/polices/ec_cour.ttf Source2: http://perso.orange.fr/jm.douteau/polices/lisez_moi.txt Source3: README-Fedora.txt Source4: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description ??colier are a set of Latin fonts created by Jean-Marie Douteau to mimic the traditional cursive writing French children are taught in school. He kindly released two of them under the OFL, which are redistributed in this package. %prep %setup -q -c -T iconv -f iso-8859-15 -t utf-8 %{SOURCE2} > lisez_moi.txt touch -r %{SOURCE2} lisez_moi.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done install -m 0644 -p %{SOURCE3} . %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p %{SOURCE0} %{SOURCE1} %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/61-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.ttf %changelog * Sat Jul 19 2008 - 20070702-1 ??? Stop waitting for upstream to answer distribution change requests ??? FESCO chickened out on UTF-8 names ??? FESCO decision unimplementable due to bug #455119 ??? Sync spec style with the way our font packaging guidelines have evolved ??? Package both fonts in a single package I'm going to consider they are two faces of the same font ??? Register in new fontconfig generic families ??? Add upstream readme translation as asked in review * Sun Nov 25 2007 Nicolas Mailhot ??? 1.00-0.4.20070628 ??? sync with packaging guidelines * Sat Sep 8 2007 Nicolas Mailhot ??? 1.00-0.2.20070628 ??? use more accurate naming ??? add an ASCII alias as suggested in review * Tue Aug 28 2007 Nicolas Mailhot ??? 1.00-0.1.20070628 ??? Initial packaging (based on DejaVu & Charis specs) --- NEW FILE import.log --- ecolier-court-fonts-20070702-1_fc10:HEAD:ecolier-court-fonts-20070702-1.fc10.src.rpm:1216485467 --- NEW FILE lisez_moi.txt --- AVERTISSEMENT Les 2 polices nomm?es?: Ecolier court Ecolier lignes court sont plac?es sous licence OFL (Open Font Licence): http://scripts.sil.org/OFL Une traduction (non-officielle) en langue fran?aise est disponible ici : http://fontforge.sourceforge.net/OFL-Unofficial-fr.html Merci de prendre connaissance des conditions d'utilisation des 2 polices cit?es ci-dessus. Si vous souhaitez afficher mes polices sur votre site, merci d'y joindre le logo de la licence OFL (avec son lien) ainsi que la traduction et le fichier lisez-moi.txt. Vous pouvez ?galement (et c'est souvent pr?f?rable), mettre un lien vers mon site : http://perso.orange.fr/jm.douteau/ L?auteur met gratuitement ces polices ? la disposition de chacun et d?cline toute responsabilit? concernant d??ventuels dysfonctionnements. Ces polices de caract?res ont ?t? cr??es par Jean-Marie Douteau e-mail?: douteau.ecolier at orange.fr Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2008 14:03:49 -0000 1.1 +++ .cvsignore 19 Jul 2008 16:38:06 -0000 1.2 @@ -0,0 +1,2 @@ +ec_cour.ttf +ecl_cour.ttf Index: sources =================================================================== RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2008 14:03:49 -0000 1.1 +++ sources 19 Jul 2008 16:38:06 -0000 1.2 @@ -0,0 +1,2 @@ +22138c551a0252edca92171e20c20a40 ec_cour.ttf +5a096077d2619ad399799f07fbaa1d78 ecl_cour.ttf From fedora-extras-commits at redhat.com Sat Jul 19 16:59:54 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 19 Jul 2008 16:59:54 GMT Subject: comps comps-f10.xml.in,1.55,1.56 Message-ID: <200807191659.m6JGxsMA021089@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21061 Modified Files: comps-f10.xml.in Log Message: add ??colier court Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- comps-f10.xml.in 18 Jul 2008 01:04:13 -0000 1.55 +++ comps-f10.xml.in 19 Jul 2008 16:59:24 -0000 1.56 @@ -1366,6 +1366,7 @@ cjkunifonts-ukai dejavu-lgc-fonts doulos-fonts + ecolier-court-fonts edrip-fonts fonts-truetype-apl freefont @@ -1448,6 +1449,7 @@ moodle-fr_ca openoffice.org-langpack-fr tesseract-langpack-fr + ecolier-court-fonts m17n-db-french From fedora-extras-commits at redhat.com Sat Jul 19 17:02:16 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 19 Jul 2008 17:02:16 GMT Subject: comps comps-f8.xml.in,1.259,1.260 Message-ID: <200807191702.m6JH2G4U027737@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27713 Modified Files: comps-f8.xml.in Log Message: sort Index: comps-f8.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f8.xml.in,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- comps-f8.xml.in 15 Jul 2008 10:05:21 -0000 1.259 +++ comps-f8.xml.in 19 Jul 2008 17:01:46 -0000 1.260 @@ -2613,16 +2613,16 @@ false km - khmeros-fonts-base koffice-langpack-km moodle-km - m17n-db-khmer + khmeros-fonts-base khmeros-fonts-battambang khmeros-fonts-bokor khmeros-fonts-handwritten khmeros-fonts-metalchrieng khmeros-fonts-muol khmeros-fonts-siemreap + m17n-db-khmer From fedora-extras-commits at redhat.com Sat Jul 19 17:03:14 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 19 Jul 2008 17:03:14 GMT Subject: comps comps-f9.xml.in,1.376,1.377 Message-ID: <200807191703.m6JH3Ei8027789@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27769 Modified Files: comps-f9.xml.in Log Message: sort Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- comps-f9.xml.in 15 Jul 2008 10:00:04 -0000 1.376 +++ comps-f9.xml.in 19 Jul 2008 17:02:44 -0000 1.377 @@ -2699,17 +2699,17 @@ false km - khmeros-fonts-base kde-l10n-Khmer koffice-langpack-km moodle-km - m17n-db-khmer + khmeros-fonts-base khmeros-fonts-battambang khmeros-fonts-bokor khmeros-fonts-handwritten khmeros-fonts-metalchrieng khmeros-fonts-muol khmeros-fonts-siemreap + m17n-db-khmer From fedora-extras-commits at redhat.com Sat Jul 19 17:37:23 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Sat, 19 Jul 2008 17:37:23 GMT Subject: rpms/xpad/devel import.log, NONE, 1.1 xpad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807191737.m6JHbNqk028821@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/xpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28785/devel Modified Files: .cvsignore sources Added Files: import.log xpad.spec Log Message: Initial commit --- NEW FILE import.log --- xpad-2_14-2_fc9:HEAD:xpad-2.14-2.fc9.src.rpm:1216488981 --- NEW FILE xpad.spec --- Name: xpad Version: 2.14 Release: 2%{?dist} Summary: Sticky notepad for GTK+2 Group: User Interface/Desktops License: GPLv2+ URL: http://xpad.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: hicolor-icon-theme BuildRequires: gtk2-devel libSM-devel gettext desktop-file-utils %description Xpad is a sticky note application written using GTK+ 2.0 that strives to be simple, fault-tolerant, and customizable. Xpad consists of independent pad windows; each is basically a text box in which notes can be written. Despite being called xpad, all that is needed to run or compile it is the GTK+ 2.0 libraries. %prep %setup -q %build %configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # desktop file stuff desktop-file-install --vendor="fedora" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README NEWS THANKS TODO %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog * Fri Jul 18 2008 Stefan Posdzich - 2.14-2 - description fixed - Add doc NEWS, THANKS and TODO - Add Requires: hicolor-icon-theme - Remove BuildRequires: libICE-devel * Fri Jul 11 2008 Stefan Posdzich - 2.14-1 - Initial SPEC file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xpad/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2008 13:56:35 -0000 1.1 +++ .cvsignore 19 Jul 2008 17:36:35 -0000 1.2 @@ -0,0 +1 @@ +xpad-2.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xpad/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2008 13:56:35 -0000 1.1 +++ sources 19 Jul 2008 17:36:35 -0000 1.2 @@ -0,0 +1 @@ +1e12e6aec8f03a656eb6427ba22c38d3 xpad-2.14.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 17:51:27 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 17:51:27 GMT Subject: rpms/qt/devel qt.spec,1.198,1.199 Message-ID: <200807191751.m6JHpRDi029750@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29623 Modified Files: qt.spec Log Message: fix spec syntax error (imo, workaround rpm regression) Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- qt.spec 19 Jul 2008 14:06:10 -0000 1.198 +++ qt.spec 19 Jul 2008 17:50:28 -0000 1.199 @@ -288,11 +288,7 @@ %prep -%if "%{?snap:1}" == "1" -%setup -q -n qt-x11-opensource-src-%{vesion}-%{snap} -%else %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2} -%endif %if 0%{?qt_copy:1} test -x apply_patches && ./apply_patches @@ -584,7 +580,6 @@ %files %defattr(-,root,root,-) %doc README* -%{!?snap:%doc OPENSOURCE-NOTICE.TXT} %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT %doc LICENSE.GPL3 %doc LICENSE.QPL From fedora-extras-commits at redhat.com Sat Jul 19 17:57:59 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Sat, 19 Jul 2008 17:57:59 GMT Subject: rpms/xpad/F-8 xpad.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807191757.m6JHvx8H030034@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/xpad/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29940 Modified Files: sources Added Files: xpad.spec Log Message: Initial commit --- NEW FILE xpad.spec --- Name: xpad Version: 2.14 Release: 2%{?dist} Summary: Sticky notepad for GTK+2 Group: User Interface/Desktops License: GPLv2+ URL: http://xpad.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: hicolor-icon-theme BuildRequires: gtk2-devel libSM-devel gettext desktop-file-utils %description Xpad is a sticky note application written using GTK+ 2.0 that strives to be simple, fault-tolerant, and customizable. Xpad consists of independent pad windows; each is basically a text box in which notes can be written. Despite being called xpad, all that is needed to run or compile it is the GTK+ 2.0 libraries. %prep %setup -q %build %configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # desktop file stuff desktop-file-install --vendor="fedora" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README NEWS THANKS TODO %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog * Fri Jul 18 2008 Stefan Posdzich - 2.14-2 - description fixed - Add doc NEWS, THANKS and TODO - Add Requires: hicolor-icon-theme - Remove BuildRequires: libICE-devel * Fri Jul 11 2008 Stefan Posdzich - 2.14-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xpad/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2008 13:56:35 -0000 1.1 +++ sources 19 Jul 2008 17:57:04 -0000 1.2 @@ -0,0 +1 @@ +1e12e6aec8f03a656eb6427ba22c38d3 xpad-2.14.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 18:02:50 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 18:02:50 GMT Subject: rpms/kdebase-runtime/F-9 kdebase-runtime-4.0.72-pulseaudio.patch, NONE, 1.1 kdebase-runtime-4.1.x-searchproviders-shortcuts.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdebase-runtime.spec, 1.46, 1.47 sources, 1.12, 1.13 kdebase-runtime-4.0.3-khelpcenter.patch, 1.1, NONE kdebase-runtime-4.0.3-pulseaudio.patch, 1.1, NONE kdebase-runtime-4.0.5-knotify-noaudio.patch, 1.1, NONE kdebase-runtime-4.0.x-searchproviders-shortcuts.patch, 1.1, NONE Message-ID: <200807191802.m6JI2oSB004374@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4326 Modified Files: .cvsignore kdebase-runtime.spec sources Added Files: kdebase-runtime-4.0.72-pulseaudio.patch kdebase-runtime-4.1.x-searchproviders-shortcuts.patch Removed Files: kdebase-runtime-4.0.3-khelpcenter.patch kdebase-runtime-4.0.3-pulseaudio.patch kdebase-runtime-4.0.5-knotify-noaudio.patch kdebase-runtime-4.0.x-searchproviders-shortcuts.patch Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 kdebase-runtime-4.0.72-pulseaudio.patch: --- NEW FILE kdebase-runtime-4.0.72-pulseaudio.patch --- diff -ur kdebase-runtime-4.0.72/phonon/xine/xineengine.cpp kdebase-runtime-4.0.72-pulseaudio/phonon/xine/xineengine.cpp --- kdebase-runtime-4.0.72/phonon/xine/xineengine.cpp 2008-04-23 17:51:26.000000000 +0200 +++ kdebase-runtime-4.0.72-pulseaudio/phonon/xine/xineengine.cpp 2008-05-06 17:28:52.000000000 +0200 @@ -371,9 +371,9 @@ "in KDE2 and KDE3. Its use is discouraged.

"), /*icon name */"audio-backend-arts", outputPlugins[i]); } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) { - addAudioOutput(nextIndex++, 10, i18n("PulseAudio"), + addAudioOutput(nextIndex++, 2000, i18n("PulseAudio"), xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]), - /*icon name */"audio-backend-pulseaudio", outputPlugins[i], true /*isAdvanced*/); + /*icon name */"audio-backend-pulseaudio", outputPlugins[i]); } else if (0 == strcmp(outputPlugins[i], "esd")) { addAudioOutput(nextIndex++, 8, i18n("Esound (ESD)"), xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]), kdebase-runtime-4.1.x-searchproviders-shortcuts.patch: --- NEW FILE kdebase-runtime-4.1.x-searchproviders-shortcuts.patch --- diff -up kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop.orig kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop --- kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop.orig 2008-06-05 13:19:46.000000000 +0200 +++ kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop 2008-06-05 13:21:39.000000000 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +Hidden=false +Type=Service +Name=Red Hat bug tracking system +ServiceTypes=SearchProvider +Keys=rhbug,bz +Query=http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=\\1 diff -up kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop.orig kdebase-runtime-4.0.5/kurifilter-plugins/ikws/searchproviders/fedora.desktop --- kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop.orig 2008-06-05 13:20:19.000000000 +0200 +++ kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop 2008-06-05 13:20:47.000000000 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +Hidden=false +Keys=fp,fedora +Name=fedoraproject +Query=http://fedoraproject.org/wiki/?action=fullsearch&context=180&value=\\{@}&titlesearch=Titles +ServiceTypes=SearchProvider +Type=Service Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 2 Jun 2008 11:50:32 -0000 1.12 +++ .cvsignore 19 Jul 2008 18:02:03 -0000 1.13 @@ -1,2 +1 @@ -kdebase-runtime-4.0.4.tar.bz2 -kdebase-runtime-4.0.5.tar.bz2 +kdebase-runtime-4.0.99.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- kdebase-runtime.spec 5 Jun 2008 12:08:37 -0000 1.46 +++ kdebase-runtime.spec 19 Jul 2008 18:02:03 -0000 1.47 @@ -8,22 +8,17 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.0.99 +Release: 1%{?dist} License: GPLv2 Group: User Interface/Desktops URL: http://www.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2 Source1: khelpcenter.desktop -Patch1: kdebase-runtime-4.0.3-pulseaudio.patch -Patch2: kdebase-runtime-4.0.3-khelpcenter.patch -Patch3: kdebase-runtime-4.0.x-searchproviders-shortcuts.patch - -# ustream patches -Patch100: kdebase-runtime-4.0.5-knotify-noaudio.patch +Patch0: kdebase-runtime-4.0.72-pulseaudio.patch +Patch1: kdebase-runtime-4.1.x-searchproviders-shortcuts.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch noarch %define icons 1 @@ -59,7 +54,7 @@ BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: qimageblitz-devel -BuildRequires: soprano-devel >= 1.97.1 +BuildRequires: soprano-devel >= 2.0.97 BuildRequires: strigi-devel >= 0.5.7 BuildRequires: xine-lib-devel # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support @@ -90,18 +85,23 @@ %description -n oxygen-icon-theme-scalable %{summary}. +%package -n phonon-backend-xine +Summary: Xine phonon backend +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} +# not sure exactly how best to version this one -- Rex +Provides: phonon-backend = 4.2 +# (temporary) upgrade path +Obsoletes: kdebase-runtime < 4.0.98-3 +%description -n phonon-backend-xine +%{summary}. + %prep %setup -q -n kdebase-runtime-%{version} -%if 0%{?fedora} > 7 -%patch1 -p1 -b .pulseaudio -%endif -%patch2 -p1 -b .khelpcenter -%patch3 -p1 -b .searchproviders-shortcuts - -# upstream patches -%patch100 -p1 -b .-knotify-noaudio.patch +%patch0 -p1 -b .pulseaudio +%patch1 -p1 -b .searchproviders-shortcuts %build @@ -124,7 +124,11 @@ %if 0%{?icons} make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen +%if ! 0%{?rest} +ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4 +%endif %else +rm -f %{buildroot}%{_kde4_iconsdir}/default.kde4 rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen %endif @@ -222,6 +226,15 @@ # so we can't use desktop-file-install for it. install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop %endif + +# FIXME: -devel type files, omit for now +rm -rf %{buildroot}%{_kde4_includedir}/phonon/ +rm -f %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so +# /usr/include/kde4/phonon/audiodevice.h +# /usr/include/kde4/phonon/audiodeviceenumerator.h +# /usr/include/kde4/phonon/kaudiodevicelist_export.h +# /usr/lib64/libkaudiodevicelist.so + %endif @@ -263,15 +276,19 @@ %defattr(-,root,root,-) %{_kde4_bindir}/* %{_kde4_appsdir}/* -%{_kde4_configdir}/khotnewstuff.knsrc +%{_kde4_configdir}/*.knsrc +%{_kde4_datadir}/autostart/nepomukserver.desktop %{_kde4_datadir}/config.kcfg/ %{_datadir}/dbus-1/interfaces/* %{_datadir}/dbus-1/services/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_datadir}/sounds/* +%{_kde4_libdir}/kconf_update_bin/* %{_kde4_libdir}/libkdeinit4_*.so +%{_kde4_libdir}/libkaudiodevicelist.so.* %{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/kde4/plugins/phonon_platform/ %{_kde4_libexecdir}/* %{_kde4_libdir}/kde4/plugins/styles/ %{_libdir}/strigi/* @@ -284,18 +301,32 @@ %{_kde4_datadir}/applications/kde4/Help.desktop %{_kde4_datadir}/applications/kde4/knetattach.desktop %{_kde4_configdir}/kshorturifilterrc -%{_kde4_datadir}/desktop-directories/kde-information.directory +%{_kde4_datadir}/desktop-directories/*.directory %{_kde4_datadir}/emoticons/kde4/ %{_kde4_datadir}/locale/en_US/entry.desktop %{_kde4_datadir}/locale/l10n/*.desktop %{_kde4_datadir}/locale/l10n/*/entry.desktop %{_datadir}/services/khelpcenter.desktop %endif + +%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so +%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop +%exclude %{_kde4_libdir}/kde4/phonon_xine.so +%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop + +%files -n phonon-backend-xine +%defattr(-,root,root,-) +%{_kde4_libdir}/kde4/kcm_phononxine.so +%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop +%{_kde4_libdir}/kde4/phonon_xine.so +%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop + %endif %if 0%{?icons} %files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list} %defattr(-,root,root,-) +%{_kde4_iconsdir}/default.kde4 %{_kde4_iconsdir}/oxygen/ %if 0%{?icons_svg} @@ -306,15 +337,46 @@ %changelog -* Thu Jun 05 2008 Than Ngo 4.0.5-2 -- add searchproviders-shortcuts for redhat bugzilla -- backport to make "No audio" option working again +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- respin + +* Mon Jul 14 2008 Rex Dieter 4.0.98-3 +- -phonon-backend-xine: new subpkg + +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sat Jun 14 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Thu Jun 05 2008 Than Ngo 4.0.80-2 +- add searchproviders-shortcuts for redhat bugzilla + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta 1 -* Mon Jun 02 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Tue May 06 2008 Kevin Kofler 4.0.72-2 +- BR new minimum version of soprano-devel -* Tue May 06 2008 Rex Dieter - 4.0.4-1 -- kde-4.0.4 +* Tue May 06 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) +- drop upstreamed deinterlace-crash patch +- drop khelpcenter patch (fixed upstream) +- update Phonon PulseAudio patch +- drop Fedora 7 support +- update file list * Mon Apr 28 2008 Rex Dieter 4.0.3-10.1 - omit conflicting icons (kde3_desktop=1 case) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 Jun 2008 11:50:32 -0000 1.12 +++ sources 19 Jul 2008 18:02:03 -0000 1.13 @@ -1 +1 @@ -6af10ce1df37ae231387581bd3941071 kdebase-runtime-4.0.5.tar.bz2 +265fa06347c83c8b9c6bc1d1259e83f2 kdebase-runtime-4.0.99.tar.bz2 --- kdebase-runtime-4.0.3-khelpcenter.patch DELETED --- --- kdebase-runtime-4.0.3-pulseaudio.patch DELETED --- --- kdebase-runtime-4.0.5-knotify-noaudio.patch DELETED --- --- kdebase-runtime-4.0.x-searchproviders-shortcuts.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 18:07:52 2008 From: fedora-extras-commits at redhat.com (Stefan Posdzich (cheekyboinc)) Date: Sat, 19 Jul 2008 18:07:52 GMT Subject: rpms/xpad/F-9 xpad.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807191807.m6JI7qvV004574@cvs-int.fedora.redhat.com> Author: cheekyboinc Update of /cvs/pkgs/rpms/xpad/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4522 Modified Files: sources Added Files: xpad.spec Log Message: Initial commit --- NEW FILE xpad.spec --- Name: xpad Version: 2.14 Release: 2%{?dist} Summary: Sticky notepad for GTK+2 Group: User Interface/Desktops License: GPLv2+ URL: http://xpad.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: hicolor-icon-theme BuildRequires: gtk2-devel libSM-devel gettext desktop-file-utils %description Xpad is a sticky note application written using GTK+ 2.0 that strives to be simple, fault-tolerant, and customizable. Xpad consists of independent pad windows; each is basically a text box in which notes can be written. Despite being called xpad, all that is needed to run or compile it is the GTK+ 2.0 libraries. %prep %setup -q %build %configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # desktop file stuff desktop-file-install --vendor="fedora" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README NEWS THANKS TODO %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* %changelog * Fri Jul 18 2008 Stefan Posdzich - 2.14-2 - description fixed - Add doc NEWS, THANKS and TODO - Add Requires: hicolor-icon-theme - Remove BuildRequires: libICE-devel * Fri Jul 11 2008 Stefan Posdzich - 2.14-1 - Initial SPEC file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xpad/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2008 13:56:35 -0000 1.1 +++ sources 19 Jul 2008 18:07:07 -0000 1.2 @@ -0,0 +1 @@ +1e12e6aec8f03a656eb6427ba22c38d3 xpad-2.14.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 18:15:57 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 18:15:57 GMT Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.0.72-ck-shutdown.patch, NONE, 1.1 kdebase-workspace-4.0.72-klipper-url.patch, NONE, 1.1 kdebase-workspace-4.0.72-plasma-konsole.patch, NONE, 1.1 kdebase-workspace-4.0.72-rootprivs.patch, NONE, 1.1 kdebase-workspace-4.0.72-show-systemsettings.patch, NONE, 1.1 kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch, NONE, 1.1 kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, NONE, 1.1 kdebase-workspace-4.0.98-consolekit-kdm.patch, NONE, 1.1 kdebase-workspace-4.0.98-kickoff-suspend.patch, NONE, 1.1 kdebase-workspace-4.0.99-plasma-tooltips.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 kdebase-workspace.spec, 1.91, 1.92 sources, 1.12, 1.13 kdebase-workspace-4.0.0-consolekit-kdm.patch, 1.1, NONE kdebase-workspace-4.0.2-onlyshowkde.patch, 1.1, NONE kdebase-workspace-4.0.2-plasma-konsole.patch, 1.1, NONE kdebase-workspace-4.0.3-ck-shutdown.patch, 1.1, NONE kdebase-workspace-4.0.3-kde#155362.patch, 1.1, NONE kdebase-workspace-4.0.3-kde#158301.patch, 1.2, NONE kdebase-workspace-4.0.3-menu-switch.patch, 1.2, NONE kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch, 1.1, NONE kdebase-workspace-4.0.3-plasma-default-wallpaper.patch, 1.2, NONE kdebase-workspace-4.0.3-rh#443610.patch, 1.2, NONE kdebase-workspace-4.0.3-rootprivs.patch, 1.1, NONE kdebase-workspace-4.0.4-klipper-url.patch, 1.1, NONE kdebase-workspace-4.0.5-kickoff-suspend.patch, 1.1, NONE kdebase-workspace-4.0.5-kwin-compositing.patch, 1.1, NONE kdebase-workspace-4.0.5-kwin-shortcuts.patch, 1.1, NONE kdebase-workspace-4.0.5-kwin-stacking.patch, 1.1, NONE kdebase-workspace-4.0.5-plasma-xinerama.patch, 1.1, NONE kdebase-workspace-4.0.5-screensaver-xautolock.patch, 1.1, NONE Message-ID: <200807191815.m6JIFveb004811@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4742 Modified Files: .cvsignore kdebase-workspace.spec sources Added Files: kdebase-workspace-4.0.72-ck-shutdown.patch kdebase-workspace-4.0.72-klipper-url.patch kdebase-workspace-4.0.72-plasma-konsole.patch kdebase-workspace-4.0.72-rootprivs.patch kdebase-workspace-4.0.72-show-systemsettings.patch kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch kdebase-workspace-4.0.85-plasma-default-wallpaper.patch kdebase-workspace-4.0.98-consolekit-kdm.patch kdebase-workspace-4.0.98-kickoff-suspend.patch kdebase-workspace-4.0.99-plasma-tooltips.patch Removed Files: kdebase-workspace-4.0.0-consolekit-kdm.patch kdebase-workspace-4.0.2-onlyshowkde.patch kdebase-workspace-4.0.2-plasma-konsole.patch kdebase-workspace-4.0.3-ck-shutdown.patch kdebase-workspace-4.0.3-kde#155362.patch kdebase-workspace-4.0.3-kde#158301.patch kdebase-workspace-4.0.3-menu-switch.patch kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch kdebase-workspace-4.0.3-plasma-default-wallpaper.patch kdebase-workspace-4.0.3-rh#443610.patch kdebase-workspace-4.0.3-rootprivs.patch kdebase-workspace-4.0.4-klipper-url.patch kdebase-workspace-4.0.5-kickoff-suspend.patch kdebase-workspace-4.0.5-kwin-compositing.patch kdebase-workspace-4.0.5-kwin-shortcuts.patch kdebase-workspace-4.0.5-kwin-stacking.patch kdebase-workspace-4.0.5-plasma-xinerama.patch kdebase-workspace-4.0.5-screensaver-xautolock.patch Log Message: sync w/devel (4.0.99) kdebase-workspace-4.0.72-ck-shutdown.patch: --- NEW FILE kdebase-workspace-4.0.72-ck-shutdown.patch --- diff -ur kdebase-workspace-4.0.72/libs/kworkspace/kdisplaymanager.cpp kdebase-workspace-4.0.72-ck-shutdown/libs/kworkspace/kdisplaymanager.cpp --- kdebase-workspace-4.0.72/libs/kworkspace/kdisplaymanager.cpp 2008-02-21 10:28:02.000000000 +0100 +++ kdebase-workspace-4.0.72-ck-shutdown/libs/kworkspace/kdisplaymanager.cpp 2008-05-07 00:56:17.000000000 +0200 @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -85,6 +86,7 @@ strcpy( sa.sun_path, "/tmp/.gdm_socket" ); if (::connect( d->fd, (struct sockaddr *)&sa, sizeof(sa) )) { ::close( d->fd ); + DMType = NoDM; d->fd = -1; break; } @@ -185,6 +187,21 @@ bool KDisplayManager::canShutdown() { + if (DMType == NoDM) { + // No DM or newest GDM running, we'll try shutting down through ConsoleKit. + // Unfortunately, ConsoleKit won't tell us if we're allowed to do that + // (it also depends on whether there are other users logged in on the + // system), so we can only check if it's running at all. + QDBusConnection systemBus = QDBusConnection::systemBus(); + if (!systemBus.isConnected()) + return false; + QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ), + QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ), + QLatin1String( "org.freedesktop.ConsoleKit.Manager" ), + systemBus ); + return consoleKit.isValid(); + } + if (DMType == OldKDM) return strstr( ctl, ",maysd" ) != 0; @@ -204,6 +221,21 @@ if (shutdownType == KWorkSpace::ShutdownTypeNone) return; + if (DMType == NoDM) { + // No DM or newest GDM running, try shutting down through ConsoleKit. + QDBusConnection systemBus = QDBusConnection::systemBus(); + if (!systemBus.isConnected()) + return; + QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ), + QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ), + QLatin1String( "org.freedesktop.ConsoleKit.Manager" ), + systemBus ); + if (consoleKit.isValid()) + consoleKit.call( QLatin1String( shutdownType == KWorkSpace::ShutdownTypeReboot ? + "Restart" : "Stop" ) ); + return; + } + bool cap_ask; if (DMType == NewKDM) { QByteArray re; kdebase-workspace-4.0.72-klipper-url.patch: --- NEW FILE kdebase-workspace-4.0.72-klipper-url.patch --- diff -up kdebase-workspace-4.0.72/klipper/klipperrc.desktop.orig kdebase-workspace-4.0.72/klipper/klipperrc.desktop --- kdebase-workspace-4.0.72/klipper/klipperrc.desktop.orig 2008-04-18 09:21:50.000000000 +0200 +++ kdebase-workspace-4.0.72/klipper/klipperrc.desktop 2008-05-21 15:58:58.000000000 +0200 @@ -279,7 +279,7 @@ Description[zh_TW]=?????? &Konqueror ??? Enabled=true [Action_1/Command_2] -Commandline=ps x |grep -q '[m]ozilla' && mozilla -remote openURL(%s, new-window) || mozilla %s +Commandline=ps x |grep -q '[m]ozilla' && mozilla -remote 'openURL(%s, new-window)' || mozilla %s Icon=mozilla Description=Open with &Mozilla Description[af]=Maak oop met Mozilla @@ -429,7 +429,7 @@ Description[zh_TW]=?????? &URL Enabled=true [Action_1/Command_4] -Commandline=ps x |grep -q '[f]irefox' && firefox -remote openURL(%s, new-window) || firefox %s +Commandline=ps x |grep -q '[f]irefox' && firefox -remote 'openURL(%s, new-window)' || firefox %s Icon=firefox Description=Open with &Firefox Description[af]=Maak oop met Firefox @@ -1533,7 +1533,7 @@ Description[zh_TW]=?????? &Konqueror ??? Enabled=true [Action_6/Command_2] -Commandline=mozilla -remote openURL(%s, new-window) +Commandline=mozilla -remote 'openURL(%s, new-window)' Description=Open with &Mozilla Description[af]=Maak oop met Mozilla Description[ar]=???????? ???????????? &???????????? kdebase-workspace-4.0.72-plasma-konsole.patch: --- NEW FILE kdebase-workspace-4.0.72-plasma-konsole.patch --- diff -ur kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.cpp kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.cpp --- kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.cpp 2008-04-30 15:58:29.000000000 +0200 +++ kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.cpp 2008-05-07 00:45:34.000000000 +0200 @@ -39,6 +39,7 @@ #include #include #include +#include #include "plasma/corona.h" #include "plasma/appletbrowser.h" @@ -62,6 +63,7 @@ m_lockDesktopAction(0), m_appletBrowserAction(0), m_addPanelAction(0), + m_runKonsoleAction(0), m_runCommandAction(0), m_lockScreenAction(0), m_logoutAction(0), @@ -341,6 +343,13 @@ } } +void DefaultDesktop::runKonsole() +{ + KProcess proc; + proc << KStandardDirs::locate("exe", "konsole"); + proc.execute(); +} + void DefaultDesktop::lockScreen() { if (!KAuthorized::authorizeKAction("lock_screen")) { @@ -368,6 +377,10 @@ connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel())); m_addPanelAction->setIcon(KIcon("list-add")); + m_runKonsoleAction = new QAction(i18n("Konsole"), this); + connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole())); + m_runKonsoleAction->setIcon(KIcon("terminal")); + m_runCommandAction = new QAction(i18n("Run Command..."), this); connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand())); m_runCommandAction->setIcon(KIcon("system-run")); @@ -398,6 +411,8 @@ QList actions; + actions.append(m_runKonsoleAction); + if (KAuthorized::authorizeKAction("run_command")) { actions.append(m_runCommandAction); } diff -ur kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.h kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.h --- kdebase-workspace-4.0.72/plasma/containments/desktop/desktop.h 2008-04-30 15:58:29.000000000 +0200 +++ kdebase-workspace-4.0.72-plasma-konsole/plasma/containments/desktop/desktop.h 2008-05-07 00:44:21.000000000 +0200 @@ -84,6 +84,7 @@ const QRect& contentsRect); protected Q_SLOTS: + void runKonsole(); void runCommand(); void configure(); void applyConfig(); @@ -106,6 +107,7 @@ QAction *m_lockDesktopAction; QAction *m_appletBrowserAction; QAction *m_addPanelAction; + QAction *m_runKonsoleAction; QAction *m_runCommandAction; QAction *m_setupDesktopAction; QAction *m_lockScreenAction; kdebase-workspace-4.0.72-rootprivs.patch: --- NEW FILE kdebase-workspace-4.0.72-rootprivs.patch --- diff -ur kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp --- kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp 2008-04-30 15:58:34.000000000 +0200 +++ kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp 2008-05-07 01:05:14.000000000 +0200 @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -297,9 +299,13 @@ return; MenuItem * mItem = selected.data( Qt::UserRole ).value(); + bool needsRootPrivs = false; if ( mItem ) { kDebug() << "Selected item: " << mItem->service->name(); kDebug() << "Comment: " << mItem->service->comment(); + + needsRootPrivs = mItem->service->property( "X-KDE-RootOnly", QVariant::Bool ).toBool(); + kDebug() << "Needs root privs:" << needsRootPrivs; } else { kDebug() << ":'( Got dud pointer from " << selected.data( Qt::DisplayRole ).toString(); Q_ASSERT(mItem); // Would core dump below. Do it now @@ -311,6 +317,35 @@ if ( groupWidget ) return; + if ( needsRootPrivs ) + { + QString kdesu = KStandardDirs::findExe( "kdesu" ); + //kDebug() << "kdesu path:" << kdesu; + + QString cmd = mItem->service->exec().trimmed(); + + /* Prepare the process to run the kcmshell */ + if ( cmd.left(5) == "kdesu" ) + { + cmd = cmd.remove(0,5).trimmed(); + + /* Remove all kdesu switches */ + while ( cmd.length() > 1 && cmd[ 0 ] == '-' ) + cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed(); + } + + if ( cmd.left(9) == "kcmshell4" ) + cmd = cmd.remove(0,9).trimmed(); + + QStringList args; + args << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() ); + + kDebug() << "Starting root module: " << args; + QProcess::execute( kdesu, args ); + + return; + } + groupWidget = moduleItemToWidgetDict[mItem->service]; if( !groupWidget ) { kdebase-workspace-4.0.72-show-systemsettings.patch: --- NEW FILE kdebase-workspace-4.0.72-show-systemsettings.patch --- diff -ur kdebase-workspace-4.0.72/systemsettings/systemsettings.desktop kdebase-workspace-4.0.72-show-systemsettings/systemsettings/systemsettings.desktop --- kdebase-workspace-4.0.72/systemsettings/systemsettings.desktop 2008-04-30 15:58:34.000000000 +0200 +++ kdebase-workspace-4.0.72-show-systemsettings/systemsettings/systemsettings.desktop 2008-05-07 00:50:55.000000000 +0200 @@ -114,4 +114,4 @@ X-DBUS-StartupType=Unique -Categories=Qt;KDE;System; -NoDisplay=true +Categories=Qt;KDE;Settings; +OnlyShowIn=KDE; kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch: --- NEW FILE kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch --- diff -up kdebase-workspace-4.0.80/ksysguard/gui/ksysguard.desktop.orig kdebase-workspace-4.0.80/ksysguard/gui/ksysguard.desktop --- kdebase-workspace-4.0.80/ksysguard/gui/ksysguard.desktop.orig 2008-06-04 10:34:11.000000000 +0200 +++ kdebase-workspace-4.0.80/ksysguard/gui/ksysguard.desktop 2008-06-04 10:35:58.000000000 +0200 @@ -64,3 +64,4 @@ Terminal=false X-KDE-StartupNotify=true X-DBUS-StartupType=Multi Categories=Qt;KDE;System; +OnlyShowIn=KDE; kdebase-workspace-4.0.85-plasma-default-wallpaper.patch: --- NEW FILE kdebase-workspace-4.0.85-plasma-default-wallpaper.patch --- diff -ur kdebase-workspace-4.0.85/libs/plasma/theme.cpp kdebase-workspace-4.0.85-plasma-default-wallpaper/libs/plasma/theme.cpp --- kdebase-workspace-4.0.85/libs/plasma/theme.cpp 2008-07-03 07:05:35.000000000 +0200 +++ kdebase-workspace-4.0.85-plasma-default-wallpaper/libs/plasma/theme.cpp 2008-07-09 23:16:58.000000000 +0200 @@ -94,6 +94,7 @@ KSharedConfigPtr colors; KConfigGroup cfg; QFont generalFont; + QString globalDefaultWallpaper; QString defaultWallpaperTheme; QString defaultWallpaperSuffix; int defaultWallpaperWidth; @@ -235,6 +236,10 @@ //kDebug() << "we're going for..." << colorsFile << "*******************"; // load the wallpaper settings, if any + KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc"); + KConfigGroup group = KConfigGroup(config, "Defaults"); + d->globalDefaultWallpaper = group.readEntry("wallpaper", (const char *) 0); + KConfig metadata(KStandardDirs::locate("data", "desktoptheme/" + theme + "/metadata.desktop")); KConfigGroup cg; if (metadata.hasGroup("Wallpaper")) { @@ -247,8 +252,8 @@ cg = d->config(); } - d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME); - d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); + d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", d->globalDefaultWallpaper.isEmpty() ? DEFAULT_WALLPAPER_THEME : (const char *) 0); + d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", d->globalDefaultWallpaper.isEmpty() ? DEFAULT_WALLPAPER_SUFFIX : (const char *) 0); d->defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); d->defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); @@ -300,7 +305,10 @@ QString fullPath; QString image = d->defaultWallpaperTheme; - image.append("/contents/images/%1x%2").append(d->defaultWallpaperSuffix); + if (image.isEmpty() && !d->globalDefaultWallpaper.isEmpty()) + image = d->globalDefaultWallpaper; + else + image.append("/contents/images/%1x%2").append(d->defaultWallpaperSuffix); QString defaultImage = image.arg(d->defaultWallpaperWidth).arg(d->defaultWallpaperHeight); if (size.isValid()) { kdebase-workspace-4.0.98-consolekit-kdm.patch: --- NEW FILE kdebase-workspace-4.0.98-consolekit-kdm.patch --- diff -Nur kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake --- kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake 2008-07-15 03:31:04.000000000 +0200 @@ -0,0 +1,58 @@ +# - Try to find the ConsoleKit connector library (libck-connector) +# Once done this will define +# +# CKCONNECTOR_FOUND - system has the CK Connector +# CKCONNECTOR_INCLUDE_DIR - the CK Connector include directory +# CKCONNECTOR_LIBRARIES - The libraries needed to use CK Connector + +# Copyright (c) 2008, Kevin Kofler, +# modeled after FindLibArt.cmake: +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + + # in cache already + SET(CKCONNECTOR_FOUND TRUE) + +else (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + + IF (NOT WIN32) + INCLUDE(UsePkgConfig) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + PKGCONFIG(ck-connector _ckConnectorIncDir _ckConnectorLinkDir _ckConnectorLinkFlags _ckConnectorCflags) + ENDIF (NOT WIN32) + + FIND_PATH(CKCONNECTOR_INCLUDE_DIR ck-connector.h + ${_ckConnectorIncDir}/ConsoleKit/ck-connector + ${_ckConnectorIncDir} + ) + + FIND_LIBRARY(CKCONNECTOR_LIBRARIES NAMES ck-connector + PATHS + ${_ckConnectorLinkDir} + ) + + + if (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + set(CKCONNECTOR_FOUND TRUE) + endif (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) + + + if (CKCONNECTOR_FOUND) + if (NOT CkConnector_FIND_QUIETLY) + message(STATUS "Found ck-connector: ${CKCONNECTOR_LIBRARIES}") + endif (NOT CkConnector_FIND_QUIETLY) + else (CKCONNECTOR_FOUND) + if (CkConnector_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find ck-connector") + endif (CkConnector_FIND_REQUIRED) + endif (CKCONNECTOR_FOUND) + + MARK_AS_ADVANCED(CKCONNECTOR_INCLUDE_DIR CKCONNECTOR_LIBRARIES) + +endif (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES) diff -Nur kdebase-workspace-4.0.98/cmake/modules/FindDBus.cmake kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindDBus.cmake --- kdebase-workspace-4.0.98/cmake/modules/FindDBus.cmake 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindDBus.cmake 2008-07-14 23:56:36.000000000 +0200 @@ -0,0 +1,39 @@ + +if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + # Already in cache, be silent + set(DBUS_FIND_QUIETLY TRUE) +endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + +set(DBUS_LIBRARY) +set(DBUS_INCLUDE_DIR) +set(DBUS_ARCH_INCLUDE_DIR) + +FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h + /usr/include + /usr/include/dbus-1.0 + /usr/local/include +) + +FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h + /usr/lib${LIB_SUFFIX}/include + /usr/lib${LIB_SUFFIX}/dbus-1.0/include + /usr/lib64/include + /usr/lib64/dbus-1.0/include + /usr/lib/include + /usr/lib/dbus-1.0/include +) + +FIND_LIBRARY(DBUS_LIBRARY NAMES dbus-1 dbus + PATHS + /usr/lib + /usr/local/lib +) + +if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + MESSAGE( STATUS "dbus found: includes in ${DBUS_INCLUDE_DIR}, library in ${DBUS_LIBRARY}") + set(DBUS_FOUND TRUE) +else(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + MESSAGE( STATUS "dbus not found") +endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR) + +MARK_AS_ADVANCED(DBUS_INCLUDE_DIR DBUS_LIBRARY DBUS_ARCH_INCLUDE_DIR) diff -Nur kdebase-workspace-4.0.98/kdm/backend/client.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/client.c --- kdebase-workspace-4.0.98/kdm/backend/client.c 2008-05-07 11:05:26.000000000 +0200 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/client.c 2008-07-14 23:48:35.000000000 +0200 @@ -1180,7 +1180,11 @@ */ int +#ifdef HAVE_CKCONNECTOR +startClient( volatile int *pid, const char *ck_session_cookie ) +#else startClient( volatile int *pid ) +#endif { const char *home, *sessargs, *desksess; char **env, *xma; @@ -1269,6 +1273,11 @@ if (krbtkfile[0] != '\0') env = setEnv( env, "KRBTKFILE", krbtkfile ); #endif +#ifdef HAVE_CKCONNECTOR + if (ck_session_cookie != NULL) { + env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie ); + } +#endif userEnviron = inheritEnv( env, envvars ); env = systemEnv( 0, curuser ); systemEnviron = setEnv( env, "HOME", p->pw_dir ); diff -Nur kdebase-workspace-4.0.98/kdm/backend/CMakeLists.txt kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/CMakeLists.txt --- kdebase-workspace-4.0.98/kdm/backend/CMakeLists.txt 2008-05-29 13:19:01.000000000 +0200 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/CMakeLists.txt 2008-07-15 00:32:29.000000000 +0200 @@ -60,6 +60,10 @@ ${SOCKET_LIBRARIES} ${RESOLV_LIBRARIES} ) +if (CKCONNECTOR_FOUND) + include_directories(${CKCONNECTOR_INCLUDE_DIR} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR}) + target_link_libraries( kdm ${CKCONNECTOR_LIBRARIES} ${DBUS_LIBRARY} ) +endif (CKCONNECTOR_FOUND) if(UTIL_LIBRARIES) target_link_libraries( kdm ${UTIL_LIBRARIES} ) endif(UTIL_LIBRARIES) diff -Nur kdebase-workspace-4.0.98/kdm/backend/dm.h kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/dm.h --- kdebase-workspace-4.0.98/kdm/backend/dm.h 2008-01-05 00:55:44.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/dm.h 2008-07-14 23:48:35.000000000 +0200 @@ -504,7 +504,11 @@ #define GCONV_BINARY 5 typedef char *(*GConvFunc)( int what, const char *prompt ); int verify( GConvFunc gconv, int rootok ); +#ifdef HAVE_CKCONNECTOR +int startClient( volatile int *pid, const char *ck_session_cookie ); +#else int startClient( volatile int *pid ); +#endif void clientExited( void ); void sessionExit( int status ) ATTR_NORETURN; int readDmrc( void ); diff -Nur kdebase-workspace-4.0.98/kdm/backend/session.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c --- kdebase-workspace-4.0.98/kdm/backend/session.c 2008-01-05 00:55:44.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-16 15:26:40.000000000 +0200 @@ -45,6 +45,14 @@ #include #include +#ifdef HAVE_CKCONNECTOR +#include +#include +/* for getpwnam */ +#include +#include +#endif + struct display *td; const char *td_setup = "auto"; @@ -553,6 +561,19 @@ volatile time_t tdiff = 0; sigset_t ss; +#ifdef HAVE_CKCONNECTOR + DBusError error; + CkConnector *connector; + char *ck_session_cookie; + struct passwd *pwent; + char devicebuf[20] = ""; + char *device = devicebuf; + dbus_bool_t is_local; +#ifdef XDMCP + char *remote_host_name = ""; +#endif +#endif + td = d; debug( "manageSession %s\n", d->name ); if ((ex = Setjmp( abortSession ))) { @@ -628,7 +649,57 @@ if (td_setup) setupDisplay( td_setup ); +#ifdef HAVE_CKCONNECTOR +#ifdef HAVE_VTS + if (d->serverVT > 0) { + /* FIXME: how does xorg construct this */ + sprintf(device, "/dev/tty%d", d->serverVT); + } +#endif + + pwent = getpwnam(curuser); + if (pwent == NULL) { + debug ("NULL user\n"); + ck_session_cookie = NULL; + } else { + connector = ck_connector_new (); + if (connector != NULL) { + is_local = ((d->displayType & d_location) == dLocal); +#ifdef XDMCP + if (!is_local && d->remoteHost) + remote_host_name = d->remoteHost; +#endif + + dbus_error_init (&error); + if ( !(ck_connector_open_session_with_parameters (connector, + &error, "unix-user", &(pwent->pw_uid), + "x11-display-device", &device, + "x11-display", &(d->name), + "is-local", &is_local, +#ifdef XDMCP + "remote-host-name", &remote_host_name, +#endif + NULL))) { + if (dbus_error_is_set (&error)) { + logError( "ConsoleKit open: %s\n", error.message); + dbus_error_free (&error); + } else { + logError("cannot open CK session: OOM, D-Bus system bus not available,\n" + "ConsoleKit not available or insufficient privileges.\n"); + } + ck_connector_unref (connector); + sessionExit( EX_NORMAL ); + } + } else { + debug ("OOM creating CkConnector\n"); + sessionExit( EX_NORMAL ); + } + ck_session_cookie = ck_connector_get_cookie (connector); + } + if (!startClient( &clientPid, ck_session_cookie )) { +#else if (!startClient( &clientPid )) { +#endif logError( "Client start failed\n" ); sessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */ } @@ -650,6 +721,23 @@ catchTerm( SIGTERM ); } } + +/* close consolekit session */ +#ifdef HAVE_CKCONNECTOR + if (ck_session_cookie != NULL) { + dbus_error_init (&error); + if (! ck_connector_close_session (connector, &error)) { + if (dbus_error_is_set (&error)) { + logError ("ConsoleKit close: %s\n", error.message); + dbus_error_free (&error); + } else { + logError ("Cannot close CK session: OOM, D-Bus system bus not available,\n" + "ConsoleKit not available or insufficient privileges.\n"); + } + } + ck_connector_unref (connector); + } +#endif /* * Sometimes the Xsession somehow manages to exit before * a server crash is noticed - so we sleep a bit and wait diff -Nur kdebase-workspace-4.0.98/kdm/backend/xdmcp.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/xdmcp.c --- kdebase-workspace-4.0.98/kdm/backend/xdmcp.c 2008-01-05 00:55:44.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/xdmcp.c 2008-07-14 23:48:35.000000000 +0200 @@ -1016,6 +1016,8 @@ d->clientAddr = clientAddress; d->clientPort = clientPort; d->connectionType = connectionType; + d->remoteHost = networkAddressToHostname (pdpy->connectionType, + &pdpy->connectionAddress); if (pdpy->fileAuthorization) { d->authorizations = (Xauth **)Malloc( sizeof(Xauth *) ); if (!d->authorizations) { diff -Nur kdebase-workspace-4.0.98/kdm/CMakeLists.txt kdebase-workspace-4.0.98-consolekit-kdm/kdm/CMakeLists.txt --- kdebase-workspace-4.0.98/kdm/CMakeLists.txt 2008-02-07 14:19:51.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/CMakeLists.txt 2008-07-15 00:28:16.000000000 +0200 @@ -4,6 +4,17 @@ install_pam_service(KDM) include(ConfigureChecks.cmake) + +macro_optional_find_package(CkConnector) +if(CKCONNECTOR_FOUND) + # when building with libck-connector, we also need the low-level D-Bus API + find_package(DBus REQUIRED) +endif(CKCONNECTOR_FOUND) + +macro_log_feature(CKCONNECTOR_FOUND "ck-connector" "The ConsoleKit connector library" "http://freedesktop.org/wiki/Software/ConsoleKit" FALSE "" "Provides ConsoleKit integration in KDM") + +macro_bool_to_01(CKCONNECTOR_FOUND HAVE_CKCONNECTOR) + configure_file(config-kdm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdm.h) install( FILES README DESTINATION ${DATA_INSTALL_DIR}/doc/kdm ) diff -Nur kdebase-workspace-4.0.98/kdm/config-kdm.h.cmake kdebase-workspace-4.0.98-consolekit-kdm/kdm/config-kdm.h.cmake --- kdebase-workspace-4.0.98/kdm/config-kdm.h.cmake 2008-01-05 00:55:45.000000000 +0100 +++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/config-kdm.h.cmake 2008-07-14 23:48:35.000000000 +0200 @@ -123,6 +123,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_TERMIOS_H 1 +/* Define to 1 if the ck-connector library is found */ +#cmakedefine HAVE_CKCONNECTOR 1 + /* $PATH defaults set by KDM */ #cmakedefine KDM_DEF_USER_PATH "${KDM_DEF_USER_PATH}" #cmakedefine KDM_DEF_SYSTEM_PATH "${KDM_DEF_SYSTEM_PATH}" kdebase-workspace-4.0.98-kickoff-suspend.patch: --- NEW FILE kdebase-workspace-4.0.98-kickoff-suspend.patch --- diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt --- kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/CMakeLists.txt 2008-06-01 13:53:49.000000000 +0200 @@ -55,13 +55,13 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) # Kickoff Plasma Applet set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp ) kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) -target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS}) +target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS}) install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) # Simple KMenu Plasma Applet set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp ) kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) -target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS}) +target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS}) install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.cpp 2008-06-01 13:53:49.000000000 +0200 @@ -29,6 +29,8 @@ #include #include #include +#include +#include // KDE Base #include @@ -83,6 +85,18 @@ bool LeaveItemHandler::openUrl(const QUr // decouple dbus call, otherwise we'll run into a dead-lock QTimer::singleShot(0, this, SLOT(logout())); return true; + } else if (m_logoutAction == "standby") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(standby())); + return true; + } else if (m_logoutAction == "suspendram") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(suspendRAM())); + return true; + } else if (m_logoutAction == "suspenddisk") { + // decouple dbus call, otherwise we'll run into a dead-lock + QTimer::singleShot(0, this, SLOT(suspendDisk())); + return true; } return false; @@ -128,3 +142,27 @@ void LeaveItemHandler::switchUser() krunner.switchUser(); } } + +void LeaveItemHandler::standby() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::Standby; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} + +void LeaveItemHandler::suspendRAM() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToRam; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} + +void LeaveItemHandler::suspendDisk() +{ + Solid::Control::PowerManager::SuspendMethod spdMethod = Solid::Control::PowerManager::ToDisk; + KJob *job = Solid::Control::PowerManager::suspend( spdMethod ); + if (job != 0) + job->start(); +} diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/itemhandlers.h 2008-06-01 13:53:49.000000000 +0200 @@ -42,6 +42,9 @@ private Q_SLOTS: void logout(); void lock(); void switchUser(); + void standby(); + void suspendRAM(); + void suspendDisk(); private: QString m_logoutAction; diff -up kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp.kickoff-suspend kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp --- kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp.kickoff-suspend 2008-03-27 21:34:51.000000000 +0100 +++ kdebase-workspace-4.0.5/plasma/applets/kickoff/core/leavemodel.cpp 2008-06-01 22:28:23.000000000 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include // Local #include "core/models.h" @@ -39,6 +40,7 @@ class LeaveModel::Private QStandardItem* LeaveModel::createStandardItem(const QString& url) { + KGlobal::locale()->insertCatalog("ksmserver"); //Q_ASSERT(KUrl(url).scheme() == "leave"); QStandardItem *item = new QStandardItem(); const QString basename = QFileInfo(url).baseName(); @@ -77,6 +79,21 @@ QStandardItem* LeaveModel::createStandar item->setIcon(KIcon("system-restart")); item->setData(i18n("Restart the computer"),Kickoff::SubTitleRole); } + else if (basename == "standby") { + item->setText(i18n("Standby")); + item->setIcon(KIcon("system-suspend")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } + else if (basename == "suspenddisk") { + item->setText(i18n("Suspend to Disk")); + item->setIcon(KIcon("system-suspend-hibernate")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } + else if (basename == "suspendram") { + item->setText(i18n("Suspend to RAM")); + item->setIcon(KIcon("system-suspend-hibernate")); + item->setData(i18n("Pause without logging out"),Kickoff::SubTitleRole); + } else { item->setText(basename); item->setData(url,Kickoff::SubTitleRole); @@ -122,6 +139,22 @@ LeaveModel::LeaveModel(QObject *parent) systemOptions->appendRow(hibernateOption); } + Solid::Control::PowerManager::SuspendMethods spdMethods = Solid::Control::PowerManager::supportedSuspendMethods(); + if( spdMethods & Solid::Control::PowerManager::Standby ) { + QStandardItem *standbyOption = createStandardItem("leave:/standby"); + systemOptions->appendRow(standbyOption); + } + + if( spdMethods & Solid::Control::PowerManager::ToRam ) { + QStandardItem *suspendramOption = createStandardItem("leave:/suspendram"); + systemOptions->appendRow(suspendramOption); + } + + if( spdMethods & Solid::Control::PowerManager::ToDisk ) { + QStandardItem *suspenddiskOption = createStandardItem("leave:/suspenddisk"); + systemOptions->appendRow(suspenddiskOption); + } + // Shutdown QStandardItem *shutDownOption = createStandardItem("leave:/shutdown"); systemOptions->appendRow(shutDownOption); kdebase-workspace-4.0.99-plasma-tooltips.patch: --- NEW FILE kdebase-workspace-4.0.99-plasma-tooltips.patch --- diff -Nur kdebase-workspace-4.0.99/libs/plasma/applet.cpp kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/applet.cpp --- kdebase-workspace-4.0.99/libs/plasma/applet.cpp 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/applet.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -76,6 +75,7 @@ #include "plasma/view.h" #include "plasma/widgets/label.h" #include "plasma/widgets/pushbutton.h" +#include "plasma/tooltipmanager.h" //#define DYNAMIC_SHADOWS namespace Plasma @@ -411,13 +411,16 @@ return 0; } + QGraphicsView *found = 0; foreach (QGraphicsView *view, scene()->views()) { if (view->sceneRect().intersects(sceneBoundingRect()) || view->sceneRect().contains(scenePos())) { - return view; + if (!found || view->isActiveWindow()) { + found = view; + } } } - return 0; + return found; } QRectF Applet::mapFromView(const QGraphicsView *view, const QRect &rect) const @@ -434,55 +437,7 @@ QPoint Applet::popupPosition(const QSize &s) const { - QGraphicsView *v = view(); - Q_ASSERT(v); - - QPoint pos = v->mapFromScene(scenePos()); - pos = v->mapToGlobal(pos); - //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; - Plasma::View *pv = dynamic_cast(v); - - Plasma::Location loc = Floating; - if (pv) { - loc = pv->containment()->location(); - } - - switch (loc) { - case BottomEdge: - pos = QPoint(pos.x(), pos.y() - s.height()); - break; - case TopEdge: - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - break; - case LeftEdge: - pos = QPoint(pos.x() + (int)size().width(), pos.y()); - break; - case RightEdge: - pos = QPoint(pos.x() - s.width(), pos.y()); - break; - default: - if (pos.y() - s.height() > 0) { - pos = QPoint(pos.x(), pos.y() - s.height()); - } else { - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - } - } - - //are we out of screen? - - QRect screenRect = QApplication::desktop()->screenGeometry(pv ? pv->containment()->screen() : -1); - //kDebug() << "==> rect for" << (pv ? pv->containment()->screen() : -1) << "is" << screenRect; - - if (pos.rx() + s.width() > screenRect.right()) { - pos.rx() -= ((pos.rx() + s.width()) - screenRect.right()); - } - - if (pos.ry() + s.height() > screenRect.bottom()) { - pos.ry() -= ((pos.ry() + s.height()) - screenRect.bottom()); - } - pos.rx() = qMax(0, pos.rx()); - - return pos; + return Plasma::popupPosition(this, s); } void Applet::updateConstraints(Plasma::Constraints constraints) diff -Nur kdebase-workspace-4.0.99/libs/plasma/CMakeLists.txt kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/CMakeLists.txt --- kdebase-workspace-4.0.99/libs/plasma/CMakeLists.txt 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/CMakeLists.txt 2008-07-19 17:33:19.000000000 +0200 @@ -58,6 +58,8 @@ svg.cpp theme.cpp toolbox.cpp + tooltipmanager.cpp + tooltip.cpp uiloader.cpp version.cpp view.cpp @@ -140,7 +142,9 @@ servicejob.h svg.h theme.h + tooltipmanager.h uiloader.h + tooltipmanager.h version.h view.h) @@ -225,6 +229,7 @@ includes/SignalPlotter includes/Svg includes/TextEdit +includes/ToolTipManager includes/Theme includes/UiLoader includes/View diff -Nur kdebase-workspace-4.0.99/libs/plasma/containment.cpp kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/containment.cpp --- kdebase-workspace-4.0.99/libs/plasma/containment.cpp 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/containment.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -1280,6 +1280,9 @@ // point anymore since we are in the qobject dtor. we don't actually // try and do anything with it, we just need the value of the pointer // so this unsafe looking code is actually just fine. + // + // NOTE: DO NOT USE THE applet VARIABLE FOR ANYTHING OTHER THAN COMPARING + // THE ADDRESS! ACTUALLY USING THE OBJECT WILL RESULT IN A CRASH!!! Applet* applet = static_cast(object); applets.removeAll(applet); if (focusedApplet == applet) { diff -Nur kdebase-workspace-4.0.99/libs/plasma/includes/ToolTipManager kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/includes/ToolTipManager --- kdebase-workspace-4.0.99/libs/plasma/includes/ToolTipManager 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/includes/ToolTipManager 2008-07-19 17:33:19.000000000 +0200 @@ -0,0 +1 @@ +#include "../../plasma/tooltipmanager.h" diff -Nur kdebase-workspace-4.0.99/libs/plasma/plasma.cpp kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/plasma.cpp --- kdebase-workspace-4.0.99/libs/plasma/plasma.cpp 2008-07-08 11:26:23.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/libs/plasma/plasma.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -17,7 +17,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include + +#include +#include +#include + +#include +#include namespace Plasma { @@ -62,4 +69,78 @@ return Down; } +QPoint popupPosition(const QGraphicsItem * item, const QSize &s) +{ + QGraphicsView *v = viewFor(item); + + if (!v) { + return QPoint(0,0); + } + + QPoint pos = v->mapFromScene(item->scenePos()); + pos = v->mapToGlobal(pos); + //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; + Plasma::View *pv = dynamic_cast(v); + + Plasma::Location loc = Floating; + if (pv) { + loc = pv->containment()->location(); + } + + switch (loc) { + case BottomEdge: + pos = QPoint(pos.x(), pos.y() - s.height()); + break; + case TopEdge: + pos = QPoint(pos.x(), pos.y() + (int)item->boundingRect().size().height()); + break; + case LeftEdge: + pos = QPoint(pos.x() + (int)item->boundingRect().size().width(), pos.y()); + break; + case RightEdge: + pos = QPoint(pos.x() - s.width(), pos.y()); + break; + default: + if (pos.y() - s.height() > 0) { [...1822 lines suppressed...] m_icon->setDrawBackground(false); } } diff -Nur kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.cpp kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp --- kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp 2008-07-19 17:34:22.000000000 +0200 @@ -41,6 +41,7 @@ #include "plasma/theme.h" #include "plasma/paintutils.h" #include "plasma/panelsvg.h" +#include "plasma/tooltipmanager.h" #include "tasks.h" @@ -61,12 +62,18 @@ setAcceptsHoverEvents(true); setAcceptDrops(true); + Plasma::ToolTipManager::self()->registerWidget(this); + QFontMetrics fm(KGlobalSettings::taskbarFont()); QSize mSize = fm.size(0, "M"); setPreferredSize(QSize(mSize.width()*15 + m_applet->itemLeftMargin() + m_applet->itemRightMargin() + IconSize(KIconLoader::Panel), mSize.height()*3 + m_applet->itemTopMargin() + m_applet->itemBottomMargin())); } +WindowTaskItem::~WindowTaskItem() +{ +} + void WindowTaskItem::activate() { // the Task class has a method called activateRaiseOrIconify() which @@ -552,19 +559,18 @@ taskIcon.addPixmap(m_task->icon(KIconLoader::SizeMedium, KIconLoader::SizeMedium, false)); taskIcon.addPixmap(m_task->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false)); -#ifdef TOOLTIP_MANAGER if (m_showTooltip) { - Plasma::ToolTipData data; + Plasma::ToolTipManager::ToolTipContent data; data.mainText = m_task->visibleName(); data.subText = i18nc("Which virtual desktop a window is currently on", "On %1", KWindowSystem::desktopName(m_task->desktop())); - data.image = iconPixmap; + data.image = m_task->icon(KIconLoader::SizeSmall, KIconLoader::SizeSmall, false); data.windowToPreview = m_task->window(); - setToolTip(data); - } else { - Plasma::ToolTipData data; - setToolTip(data); // Clear + + Plasma::ToolTipManager::self()->setToolTipContent(this,data); + } + else { + Plasma::ToolTipManager::self()->unregisterWidget(this); } -#endif setIcon(taskIcon); setText(m_task->visibleName()); //redraw @@ -722,4 +728,5 @@ size, bounds.toRect()); } + #include "windowtaskitem.moc" diff -Nur kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.h kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h --- kdebase-workspace-4.0.99/plasma/applets/tasks/windowtaskitem.h 2008-06-18 14:41:39.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h 2008-07-19 17:34:22.000000000 +0200 @@ -57,6 +57,9 @@ /** Constructs a new representation for a window task. */ WindowTaskItem(Tasks *parent, const bool showTooltip); + /**Destruct the representation of the window task */ + ~WindowTaskItem(); + /** Sets the starting task represented by this item. */ void setStartupTask(TaskManager::StartupPtr task); diff -Nur kdebase-workspace-4.0.99/plasma/applets/trash/trash.cpp kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.cpp --- kdebase-workspace-4.0.99/plasma/applets/trash/trash.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.cpp 2008-07-19 17:35:30.000000000 +0200 @@ -45,6 +45,7 @@ //Plasma #include #include +#include //Solid #include @@ -100,10 +101,6 @@ registerAsDragHandle(m_icon); - //setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Small))); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.mainText = i18n("Trash"); - connect(m_icon, SIGNAL(activated()), this, SLOT(slotOpen())); connect(&m_menu, SIGNAL(aboutToHide()), m_icon, SLOT(setUnpressed())); @@ -201,17 +198,20 @@ void Trash::setIcon() { + Plasma::ToolTipManager::ToolTipContent data; + data.mainText = i18n("Trash"); + if (m_count > 0) { m_icon->setIcon(KIcon("user-trash-full")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18np("One item", "%1 items", m_count); + + data.subText = i18np("One item", "%1 items", m_count); if (m_showText) { m_icon->setInfoText(i18np("One item", "%1 items", m_count)); } } else { m_icon->setIcon(KIcon("user-trash")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); + + data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); if (m_showText){ m_icon->setInfoText(i18nc("The trash is empty. This is not an action, but a state", "Empty")); } @@ -219,14 +219,13 @@ m_icon->update(); - //FIXME TOOLTIP MANAGER - /*m_data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); + data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); if (!m_showText) { - m_icon->setToolTip(m_data); + Plasma::ToolTipManager::self()->setToolTipContent(this, data); } else { - m_icon->setToolTip(Plasma::ToolTipData()); - }*/ + Plasma::ToolTipManager::self()->setToolTipContent(this, Plasma::ToolTipManager::ToolTipContent()); + } emptyTrash->setEnabled(m_count>0); } diff -Nur kdebase-workspace-4.0.99/plasma/applets/trash/trash.h kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.h --- kdebase-workspace-4.0.99/plasma/applets/trash/trash.h 2008-04-30 15:58:26.000000000 +0200 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/applets/trash/trash.h 2008-07-19 17:35:30.000000000 +0200 @@ -75,8 +75,6 @@ QAction *emptyTrash; int m_count; bool m_showText; - //FIXME PORT TO TOOLTIP MANAGER - //Plasma::ToolTipData m_data; KFilePlacesModel *m_places; }; diff -Nur kdebase-workspace-4.0.99/plasma/design/tooltips kdebase-workspace-4.0.99-plasma-tooltips/plasma/design/tooltips --- kdebase-workspace-4.0.99/plasma/design/tooltips 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.0.99-plasma-tooltips/plasma/design/tooltips 2008-07-19 17:34:22.000000000 +0200 @@ -0,0 +1,39 @@ +Tooltips +========== + +Overview +-------- +libplasma provides facilities to manage tooltips that display extended information in a visually pleasing and consistent manner for QGraphicsWidgets. These tooltip windows are themed using Plasma::Theme. + +Timeline +-------- +Introduced in: libplasma 2.1 (KDE 4.2.0) + +Component Type +-------------- +ToolTipManager is a QObject subclass in libplasma. +ToolTip is an internal QWidget subclass in libplasma. + +Registering Tooltips +-------------------- +ToolTipManger is quite simple to use: simply call setWidgetToolTipContent using the struct ToolTipContent. This causes the widget to be registered if it isn't already. Alternatively, for widgets that fill the data on demand, call registerWidget directly. + +Widgets are unregistered automatically upon destruction, but can also be manually unregsitered by calling ToolTipMnager::unregisterWidget. + +An event filter is registered on each registered widget and hover events that occur trigger calls to showToolTip and hideToolTip. The hover events are not, however, filtered out. + +Note: If another event filter is placed on registered widget that filters out these events, it may be necessary to manually call showToolTip and hideToolTip. + +ToolTip Updates +--------------- +Updating tooltip data is supported by means of invoking slots on the associated widget if they exist. In particular, just prior to being shown the toolTipAboutToShow method is invoked and when hiding the toolTipHidden method is invoked. + +ToolTip Visualization +--------------------- +The internal (non-exported) ToolTip class is used to actually display the tooltips. These are associated with widgets and created as necessary. + +ToolTip displays are only created when data is set, and are deleted if an empty ToolTipData struct is passed in. This keeps memory usage due to ToolTip objects down. + +Future Work +----------- +N/A Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 Jun 2008 19:18:06 -0000 1.10 +++ .cvsignore 19 Jul 2008 18:15:11 -0000 1.11 @@ -1,2 +1 @@ -kdebase-workspace-4.0.4.tar.bz2 -kdebase-workspace-4.0.5.tar.bz2 +kdebase-workspace-4.0.99.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- kdebase-workspace.spec 8 Jul 2008 22:12:16 -0000 1.91 +++ kdebase-workspace.spec 19 Jul 2008 18:15:11 -0000 1.92 @@ -1,74 +1,43 @@ - -# FIXME, currently incompat with nm >= 0.7 -%define _without_nm -DWITH_NetworkManager=off +%define _default_patch_fuzz 2 Summary: K Desktop Environment - Workspace Name: kdebase-workspace -Version: 4.0.5 +Version: 4.0.99 -Release: 4%{?dist} -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 +Release: 2%{?dist} +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops URL: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: kdebase-workspace-4.0.3-redhat-startkde.patch -Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch -Patch3: kdebase-workspace-4.0.2-plasma-konsole.patch -Patch4: kdebase-workspace-4.0.2-onlyshowkde.patch -Patch5: kdebase-workspace-4.0.3-ck-shutdown.patch +Patch2: kdebase-workspace-4.0.98-consolekit-kdm.patch +Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch +Patch4: kdebase-workspace-4.0.72-show-systemsettings.patch +Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch #??434824: KDE4 System Settings - No Method To Enter Administrative Mode -Patch6: kdebase-workspace-4.0.3-rootprivs.patch +Patch6: kdebase-workspace-4.0.72-rootprivs.patch Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch #??441062: packagekit tools do not show icons correctly on KDE Patch8: kdebase-workspace-4.0.3-krdb.patch -Patch10: kdebase-workspace-4.0.4-klipper-url.patch -#??kdebug:163146: Kwin on maximize doesn't respect the panel size with 2 monitors -Patch11: kdebase-workspace-4.0.5-plasma-xinerama.patch -# fix disappearing windows with KWin compositing on -Patch12: kdebase-workspace-4.0.5-kwin-compositing.patch -#??kdebug:161342 make per-window shortcut not crash and make it work -Patch13: kdebase-workspace-4.0.5-kwin-shortcuts.patch -# http://websvn.kde.org/?view=rev&revision=822345 -#??fix screensaver idle detection -Patch14: kdebase-workspace-4.0.5-screensaver-xautolock.patch -#??http://websvn.kde.org/?view=rev&revision=828061 -#??kdebug:161436 other desktops' windows not drawn with effects like desktop grid and present windows -Patch15: kdebase-workspace-4.0.5-kwin-stacking.patch +Patch10: kdebase-workspace-4.0.72-klipper-url.patch +# allows to define a default wallpaper via plasmarc:wallpaper +Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch # upstream patches: -# http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu) -# backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886 -# This has been merged into 4.0.3 in http://websvn.kde.org/?view=rev&revision=790059 -# and the config parts reverted in http://websvn.kde.org/?view=rev&revision=790454 -# due to new strings. This patch reverts rev 790454 and restores the full backport. -Patch100: kdebase-workspace-4.0.3-kde#155362.patch -# backport of http://websvn.kde.org/?view=rev&revision=780495 from 4.1 -# (fixed version of http://websvn.kde.org/?view=rev&revision=790063 -# which was reverted in http://websvn.kde.org/?view=rev&revision=790104) -Patch101: kdebase-workspace-4.0.3-menu-switch.patch +# backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) +# This is a cumulative patch from the following revision pairs: 833271:833299, +# 833385:833386, 833479:833545, 833580:833581, 833587:833620, 834651:834652 +# This is backwards BC wrt 4.1, but the API of the new classes is not finalized. +Patch100: kdebase-workspace-4.0.99-plasma-tooltips.patch # plasma-4.0-openSUSE patches: -# http://websvn.kde.org/?view=rev&revision=795438 -# allows to define a default wallpaper via plasmarc:wallpaper -Patch200: kdebase-workspace-4.0.3-plasma-default-wallpaper.patch -# http://websvn.kde.org/?view=rev&revision=791852 -# from Plasma review board: http://mattr.info/r/261/ -# allows moving plasmoids on panels (#439587, kde#158301) -Patch201: kdebase-workspace-4.0.3-kde#158301.patch -# http://websvn.kde.org/?view=rev&revision=794496 -# don't show "Zoom Out" toolbox action (not working in 4.0) -Patch202: kdebase-workspace-4.0.3-rh#443610.patch -# #444141: Initial wallpaper chooser has "EOS" preselected but wallpaper is "Fedora Waves" -#??http://websvn.kde.org/?view=rev&revision=801651 -Patch203: kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch -# suspend in kickoff -Patch204: kdebase-workspace-4.0.5-kickoff-suspend.patch +Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch +# FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151 -# upgrade path for former kde-redhat'ers -Obsoletes: kdebase-kdm < 6:%{version}-%{release} Provides: kdebase-kdm = 6:%{version}-%{release} +Provides: kdm = %{version}-%{release} # upgrade path: kdebase(3) -> kdebase-workspace Obsoletes: kdebase < 6:4 @@ -80,15 +49,16 @@ BuildRequires: bluez-libs-devel BuildRequires: cmake -BuildRequires: dbus-devel +BuildRequires: ConsoleKit-devel BuildRequires: glib2-devel BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: libcaptury-devel BuildRequires: libraw1394-devel BuildRequires: libxklavier-devel BuildRequires: libXres-devel BuildRequires: lm_sensors-devel -%{!?_without_nm:BuildRequires: NetworkManager-devel} +BuildRequires: NetworkManager-devel BuildRequires: pam-devel BuildRequires: qimageblitz-devel @@ -161,38 +131,30 @@ # RH/Fedora-specific startkde changes %patch1 -p1 -b .redhat-startkde -# ConsoleKit support for KDM (#228111, kde#147790) +# ConsoleKit support for KDM (#228111, #430388, kde#147790) %patch2 -p1 -b .consolekit %patch3 -p1 -b .plasma-konsole -%patch4 -p1 -b .onlyshowkde +%patch4 -p1 -b .show-systemsettings # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22) %patch5 -p1 -b .ck-shutdown -%patch6 -p0 -b .rootprivs +%patch6 -p1 -b .rootprivs %patch7 -p0 -b .timedate-kcm %patch8 -p0 -b .krdb %patch10 -p1 -b .klipper-url -%patch11 -p0 -b .plasma-xinerama -%patch12 -p0 -b .kwin-compositing -%patch13 -p0 -b .kwin-shortcuts -%patch14 -p0 -b .screensaver-xautolock -%patch15 -p0 -b .kwin-stacking +%patch11 -p1 -b .plasma-default-wallpaper # upstream patches -%patch101 -p1 -b .menu-switch -%patch100 -p0 -b .kde#155362 +%patch100 -p1 -b .plasma-tooltips # plasma-4.0-openSUSE patches: -%patch200 -p0 -b .plasma-default-wallpaper -%patch201 -p1 -b .kde#158301 -%patch202 -p1 -b .rh#443610 -%patch203 -p0 -b .plasma-default-wallpaper-config %patch204 -p1 -b .kickoff-suspend + %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} %{?_without_nm} \ +%{cmake_kde4} \ -DKDE4_KDM_PAM_SERVICE=kdm \ -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \ -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver .. @@ -274,15 +236,24 @@ %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_datadir}/wallpapers/* %{_kde4_datadir}/sounds/* -%{_kde4_datadir}/desktop-directories/* %{_kde4_datadir}/autostart/* %{_kde4_datadir}/applications/kde4/* %{_datadir}/dbus-1/interfaces/* %{_kde4_datadir}/config.kcfg/* %{_datadir}/xsessions/* %{_kde4_docdir}/HTML/en/* -%{_kde4_iconsdir}/oxygen/*/*/* %{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/oxygen/*/*/* +%{_kde4_iconsdir}/Oxygen_Black/ +%{_kde4_iconsdir}/Oxygen_Black_Big/ +%{_kde4_iconsdir}/Oxygen_Blue/ +%{_kde4_iconsdir}/Oxygen_Blue_Big/ +%{_kde4_iconsdir}/Oxygen_White/ +%{_kde4_iconsdir}/Oxygen_White_Big/ +%{_kde4_iconsdir}/Oxygen_Yellow/ +%{_kde4_iconsdir}/Oxygen_Yellow_Big/ +%{_kde4_iconsdir}/Oxygen_Zion/ +%{_kde4_iconsdir}/Oxygen_Zion_Big/ %{_kde4_libdir}/kde4/*.so %{_kde4_libexecdir}/* @@ -309,40 +280,97 @@ %changelog -* Wed Jul 9 2008 Luk???? Tinkl - 4.0.5-4 -- fix windows not being drawn on other desktops with effects like desktop - grid or present windows (kdebug:161436) - -* Fri Jun 20 2008 Luk???? Tinkl - 4.0.5-3 -- fix screensaver idle detection (#448183, kdebug:163006) - -* Mon Jun 16 2008 Luk???? Tinkl - 4.0.5-2 -- KWin on maximize doesn't respect the panel size with 2 monitors (kdebug#163146) -- fix disappearing windows with KWin compositing on -- make per-window shortcuts not crash kwin and make them work (kdebug:161342) - -* Sun Jun 01 2008 Than Ngo - 4.0.5-1 -- 4.0.5 - -* Sat May 24 2008 Than Ngo - 4.0.4-6 -- fix kdm session commands -- suspend in kickoff +* Sat Jul 19 2008 Kevin Kofler 4.0.99-2 +- backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) + WARNING: Adds some new APIs from 4.2 (Plasma::popupPosition, Plasma::viewFor, + Plasma::ToolTip*), use at your own risk, we have no control to + guarantee that they will not change! -* Wed May 21 2008 Than Ngo 4.0.4-5 -- fix #447030, hyperlinks do not open correctly in firefox +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Wed Jul 16 2008 Kevin Kofler 4.0.98-8 +- fix KDM ConsoleKit patch to use x11-display-device instead of display-device + +* Wed Jul 16 2008 Kevin Kofler 4.0.98-7 +- fix segfault in KDM ConsoleKit patch (#455562) + +* Tue Jul 15 2008 Kevin Kofler 4.0.98-6 +- move systemsettings back from System to Settings in the menu + +* Mon Jul 14 2008 Kevin Kofler 4.0.98-5 +- new consolekit-kdm patch using libck-connector, BR ConsoleKit-devel (#430388) + +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- install circles kdm theme + +* Sun Jul 13 2008 Kevin Kofler 4.0.98-3 +- sync kickoff-suspend patch from F9 (loads ksmserver translations) + +* Fri Jul 11 2008 Rex Dieter 4.0.98-2 +- respun tarball (with systray patch) -* Mon May 12 2008 Rex Dieter 4.0.4-4 -- kwin memleak (kde#161794) +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Wed Jul 09 2008 Kevin Kofler 4.0.85-3 +- rewrite and reapply plasma-default-wallpaper patch +- (no more separate plasma-default-wallpaper-config part) +- rediff kde#154119 patch one last time + +* Wed Jul 09 2008 Rex Dieter 4.0.85-2 +- systray icon patch (kde#164786) + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Fri Jun 27 2008 Kevin Kofler 4.0.83-2 +- port and apply kde#154119/kde#158301 patch for moving icons on panel (#439587) + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Tue Jun 17 2008 Rex Dieter 4.0.82-2 +- +Provides: kdm + +* Sat Jun 14 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Wed Jun 04 2008 Than Ngo 4.0.80-4 +- fix #449881, ksysguard OnlyShowIn=KDE + +* Tue Jun 03 2008 Kevin Kofler 4.0.80-3 +- enable NetworkManager support, now compatible with NM 0.7 + +* Thu May 29 2008 Rex Dieter 4.0.80-2 +- BR: libcaptury-devel + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Wed May 21 2008 Than Ngo 4.0.72-4 +- fix #447030, hyperlinks do not open correctly in firefox -* Thu May 08 2008 Rex Dieter 4.0.4-3 +* Thu May 08 2008 Rex Dieter 4.0.72-3 - ksysguardd subpkg (#426543) - %%config(noreplace) systemsettingsrc -* Thu May 08 2008 Rex Dieter 4.0.4-2 +* Thu May 08 2008 Rex Dieter 4.0.72-2 - gtkrc patch (rh#443309, kde#146779) -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Wed May 07 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 +- update file list (Lorenzo Villani) +- port plasma-konsole, ck-shutdown, rootprivs, plasma-default-wallpaper patches +- remove NoDisplay=true in systemsettings onlyshowkde patch (still add + OnlyShowIn=KDE), rename to show-systemsettings +- drop upstreamed suspend patch +- drop backported kde#155362 and menu-switch patches +- drop rh#443610 patch, "Zoom Out" should be working in 4.1 +- disable kde#158301 patch for now (fails to apply, looks hard to port) * Fri May 02 2008 Rex Dieter 4.0.3-20 - Requires: kdebase , so it doesn't go missing on upgrades from kde3 (#444928) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Jun 2008 19:18:06 -0000 1.12 +++ sources 19 Jul 2008 18:15:11 -0000 1.13 @@ -1 +1 @@ -02112644bd5c011b10c5ca70d03a18ae kdebase-workspace-4.0.5.tar.bz2 +eec3d9d9886a0436672007ab2568a20a kdebase-workspace-4.0.99.tar.bz2 --- kdebase-workspace-4.0.0-consolekit-kdm.patch DELETED --- --- kdebase-workspace-4.0.2-onlyshowkde.patch DELETED --- --- kdebase-workspace-4.0.2-plasma-konsole.patch DELETED --- --- kdebase-workspace-4.0.3-ck-shutdown.patch DELETED --- --- kdebase-workspace-4.0.3-kde#155362.patch DELETED --- --- kdebase-workspace-4.0.3-kde#158301.patch DELETED --- --- kdebase-workspace-4.0.3-menu-switch.patch DELETED --- --- kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch DELETED --- --- kdebase-workspace-4.0.3-plasma-default-wallpaper.patch DELETED --- --- kdebase-workspace-4.0.3-rh#443610.patch DELETED --- --- kdebase-workspace-4.0.3-rootprivs.patch DELETED --- --- kdebase-workspace-4.0.4-klipper-url.patch DELETED --- --- kdebase-workspace-4.0.5-kickoff-suspend.patch DELETED --- --- kdebase-workspace-4.0.5-kwin-compositing.patch DELETED --- --- kdebase-workspace-4.0.5-kwin-shortcuts.patch DELETED --- --- kdebase-workspace-4.0.5-kwin-stacking.patch DELETED --- --- kdebase-workspace-4.0.5-plasma-xinerama.patch DELETED --- --- kdebase-workspace-4.0.5-screensaver-xautolock.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 18:34:08 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 19 Jul 2008 18:34:08 GMT Subject: rpms/qt/devel qt.spec,1.199,1.200 Message-ID: <200807191834.m6JIY87X005463@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5432 Modified Files: qt.spec Log Message: * Sat Jul 19 2008 Rex Dieter 4.4.0-15 - fix/workaround spec syntax Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- qt.spec 19 Jul 2008 17:50:28 -0000 1.199 +++ qt.spec 19 Jul 2008 18:33:20 -0000 1.200 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 14%{?dist} +Release: 15%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -768,6 +768,9 @@ %changelog +* Sat Jul 19 2008 Rex Dieter 4.4.0-15 +- fix/workaround spec syntax + * Sat Jul 19 2008 Rex Dieter 4.4.0-14 - macros.qt4: fix %%_qt4_datadir, %%_qt4_translationdir From fedora-extras-commits at redhat.com Sat Jul 19 19:55:44 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Sat, 19 Jul 2008 19:55:44 GMT Subject: comps/po pt_BR.po,1.17,1.18 Message-ID: <200807191955.m6JJtiTr022978@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22952/po Modified Files: pt_BR.po Log Message: 2008-07-19 Igor Pires Soares (via igor at fedoraproject.org) * po/pt_BR.po: Updated Brazilian Portuguese translation View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.17 -r 1.18 pt_BR.po Index: pt_BR.po =================================================================== RCS file: /cvs/pkgs/comps/po/pt_BR.po,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pt_BR.po 17 Jul 2008 18:31:24 -0000 1.17 +++ pt_BR.po 19 Jul 2008 19:55:14 -0000 1.18 @@ -1,5 +1,6 @@ -# translation of comps.HEAD.po to Brazilian Portuguese -# Brazilian Portuguese localization of Red Hat Linux +# Brazilian Portuguese translation of comps. +# This file is distributed under the same license as the comps package. +# Copyright (C) 2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. # Originated from the Portuguese translation by # Pedro Morais # Jos?? Nuno Pires @@ -12,12 +13,13 @@ # Valnir Ferreira Jr. , 2006. # Diego B??rigo Zacar??o , 2008. # Igor Pires Soares , 2006,2007,2008. +# msgid "" msgstr "" -"Project-Id-Version: comps.HEAD\n" +"Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2008-04-21 11:33-0300\n" +"PO-Revision-Date: 2008-07-19 16:51-0300\n" "Last-Translator: Igor Pires Soares \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" @@ -26,190 +28,283 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" -"X-Generator: KBabel 1.11.4\n" -#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 +#: ../comps-f8.xml.in.h:1 +#: ../comps-f9.xml.in.h:1 #: ../comps-f10.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." -msgstr "" -"Um ambiente de trabalho leve que funciona bem em m??quinas de baixo custo." +msgstr "Um ambiente de trabalho leve que funciona bem em m??quinas de baixo custo." -#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 +#: ../comps-f8.xml.in.h:2 +#: ../comps-f9.xml.in.h:2 +#: ../comps-f10.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 +#: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Ferramentas Administrativas" -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +#: ../comps-f7.xml.in.h:3 +#: ../comps-f8.xml.in.h:3 +#: ../comps-f9.xml.in.h:3 #: ../comps-f10.xml.in.h:3 msgid "Afrikaans Support" msgstr "Suporte ?? Afrikaans" -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +#: ../comps-f7.xml.in.h:4 +#: ../comps-f8.xml.in.h:4 +#: ../comps-f9.xml.in.h:4 #: ../comps-f10.xml.in.h:4 msgid "Albanian Support" msgstr "Suporte ?? Alban??s" -#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:5 +#: ../comps-f8.xml.in.h:5 +#: ../comps-f9.xml.in.h:5 +#: ../comps-f10.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 +#: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Aplica????es" -#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +#: ../comps-f7.xml.in.h:6 +#: ../comps-f8.xml.in.h:6 +#: ../comps-f9.xml.in.h:6 #: ../comps-f10.xml.in.h:6 msgid "Applications to perform a variety of tasks" msgstr "Aplica????es para realizar uma variedade de tarefas" -#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 +#: ../comps-f8.xml.in.h:7 +#: ../comps-f9.xml.in.h:7 +#: ../comps-f10.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 +#: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Suporte ?? ??rabe" -#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 +#: ../comps-f8.xml.in.h:8 +#: ../comps-f9.xml.in.h:8 +#: ../comps-f10.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 +#: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "Suporte ?? Arm??nio" -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 +#: ../comps-f7.xml.in.h:9 +#: ../comps-f8.xml.in.h:9 +#: ../comps-f9.xml.in.h:9 #: ../comps-f10.xml.in.h:9 msgid "Assamese Support" msgstr "Suporte ?? Assam??s" -#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +#: ../comps-f7.xml.in.h:10 +#: ../comps-f8.xml.in.h:10 +#: ../comps-f9.xml.in.h:10 +#: ../comps-f10.xml.in.h:10 +#: ../comps-el4.xml.in.h:6 +#: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "Autoria e Publica????o" -#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 +#: ../comps-f7.xml.in.h:11 +#: ../comps-f8.xml.in.h:11 +#: ../comps-f9.xml.in.h:11 #: ../comps-f10.xml.in.h:11 msgid "Base" msgstr "Base" -#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 +#: ../comps-f7.xml.in.h:12 +#: ../comps-f8.xml.in.h:12 +#: ../comps-f9.xml.in.h:12 +#: ../comps-f10.xml.in.h:12 +#: ../comps-el4.xml.in.h:7 +#: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Sistema B??sico" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 +#: ../comps-f7.xml.in.h:13 +#: ../comps-f8.xml.in.h:13 +#: ../comps-f9.xml.in.h:13 #: ../comps-f10.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "Suporte b??sico ?? linguagem de programa????o Ruby." -#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 +#: ../comps-f7.xml.in.h:14 +#: ../comps-f8.xml.in.h:14 +#: ../comps-f9.xml.in.h:14 #: ../comps-f10.xml.in.h:14 msgid "Basque Support" msgstr "Suporte ?? Basco" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 +#: ../comps-f7.xml.in.h:15 +#: ../comps-f8.xml.in.h:15 +#: ../comps-f9.xml.in.h:15 #: ../comps-f10.xml.in.h:15 msgid "Belarusian Support" msgstr "Suporte ?? Bielo-russo" -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 +#: ../comps-f7.xml.in.h:16 +#: ../comps-f8.xml.in.h:16 +#: ../comps-f9.xml.in.h:16 #: ../comps-f10.xml.in.h:16 msgid "Bengali Support" msgstr "Suporte ?? Bengali" -#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 +#: ../comps-f7.xml.in.h:17 +#: ../comps-f8.xml.in.h:17 +#: ../comps-f9.xml.in.h:17 #: ../comps-f10.xml.in.h:17 msgid "Bhutanese Support" msgstr "Suporte ?? Butan??s" -#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 +#: ../comps-f7.xml.in.h:18 +#: ../comps-f8.xml.in.h:18 +#: ../comps-f9.xml.in.h:18 #: ../comps-f10.xml.in.h:18 [...1887 lines suppressed...] +msgstr "Haskell" #: ../comps-f10.xml.in.h:76 msgid "Input Methods" -msgstr "" +msgstr "M??todos de Entrada" #: ../comps-f10.xml.in.h:77 msgid "Input method packages for the input of international text." -msgstr "" +msgstr "Pacotes de m??todos de entrada para a inser????o de textos internacionais." #: ../comps-f10.xml.in.h:157 -#, fuzzy msgid "Tajik Support" -msgstr "Suporte ?? Tailand??s" +msgstr "Suporte ?? Tajik" -#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +#: ../comps-el4.xml.in.h:3 +#: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "Aplica????es para uma variedade de tarefas" -#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +#: ../comps-el4.xml.in.h:12 +#: ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" msgstr "Suporte ?? Rede Dialup" -#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de " -"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico." - -#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 -msgid "" -"KDE is a powerful, graphical user interface which includes a panel, desktop, " -"system icons, and a graphical file manager." -msgstr "" -"O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de " -"trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico." - -#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 -msgid "" -"Sometimes called text editors, these are programs that allow you to create " -"and edit files. These include Emacs and Vi." -msgstr "" -"Algumas vezes chamados de editores de texto, estes programas permitem criar " -"e editar arquivos. Isto inclui o Emacs e o Vi." +#: ../comps-el4.xml.in.h:22 +#: ../comps-el5.xml.in.h:23 +msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "O GNOME ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico." + +#: ../comps-el4.xml.in.h:35 +#: ../comps-el5.xml.in.h:35 +msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "O KDE ?? uma poderosa interface gr??fica que inclui um painel, uma ??rea de trabalho, ??cones de sistema e um gerenciador de arquivos gr??fico." + +#: ../comps-el4.xml.in.h:44 +#: ../comps-el5.xml.in.h:44 +msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." +msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos. Isto inclui o Emacs e o Vi." -#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +#: ../comps-el4.xml.in.h:50 +#: ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." msgstr "O editor de texto XEmacs." -#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 -msgid "" -"These tools allow you to create documentation in the DocBook format and " -"convert them to HTML, PDF, Postscript, and text." -msgstr "" -"Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-" -"la para HTML, PDF, PostScript e texto." +#: ../comps-el4.xml.in.h:54 +#: ../comps-el5.xml.in.h:52 +msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." +msgstr "Estas ferramentas permitem criar documenta????o no formato DocBook e convert??-la para HTML, PDF, PostScript e texto." -#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +#: ../comps-el4.xml.in.h:64 +#: ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" -msgstr "" -"Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos." +msgstr "Este grupo ?? uma cole????o de servidores de redes para prop??sitos espec??ficos." -#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Arabic environments." +#: ../comps-el4.xml.in.h:65 +#: ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes ??rabes." -#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 -msgid "" -"This group is a collection of tools and resources of Hebrew environments." -msgstr "" -"Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos." +#: ../comps-el4.xml.in.h:67 +#: ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes hebraicos." + +#: ../comps-el4.xml.in.h:68 +#: ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses." -#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools and resources of Japanese environments." -msgstr "" -"Este grupo ?? um cole????o de ferramentas e recursos de ambientes japoneses." - -#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +#: ../comps-el4.xml.in.h:77 +#: ../comps-el5.xml.in.h:77 msgid "XEmacs" msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -msgid "" -"This group is a collection of tools and resources of Czech environments." +msgid "This group is a collection of tools and resources of Czech environments." msgstr "Este grupo ?? um cole????o de ferramentas e recursos de ambientes checos." #~ msgid "British Support" #~ msgstr "Suporte ?? Bret??o" - #~ msgid "Cluster Storage" #~ msgstr "Armazenamento em Clusters" - #~ msgid "Clustering Support." #~ msgstr "Suporte a Clusters." - #~ msgid "Libraries for applications built on older releases." #~ msgstr "Bibliotecas para aplica????es compiladas em vers??es anteriores." - #~ msgid "Miscellaneous Included Packages" #~ msgstr "Pacotes Variados Inclu??dos" - #~ msgid "Packages which provide support for cluster storage." #~ msgstr "Pacotes que fornecem suporte para o armazenamento em clusters." - #~ msgid "Packages which provide support for single-node GFS." #~ msgstr "Pacotes que fornecem suporte para GFS de n?? ??nico." - #~ msgid "Single Node GFS Support" #~ msgstr "Suporte ao GFS de N?? ??nico" - #~ msgid "These packages provide compatibility support with previous releases." #~ msgstr "Estes pacotes fornecem compatibilidade com as vers??es anteriores." - #~ msgid "Java Runtime Environments and Development Kits" #~ msgstr "Ambientes de Tempo de Execu????o e Kits de Desenvolvimento Java" - #~ msgid "Misc" #~ msgstr "Variados" - #~ msgid "Misc packages" #~ msgstr "Pacotes variados" - #~ msgid "Multimedia" #~ msgstr "Multim??dia" - #~ msgid "Multimedia applications" #~ msgstr "Aplica????es multim??dia" - #~ msgid "" #~ "Packages which provide additional functionality for Red Hat Enterprise " #~ "Linux" #~ msgstr "" #~ "Pacotes que fornecem funcionalidades adicionais para o Red Hat Enterprise " #~ "Linux" - #~ msgid "Red Hat Enterprise Linux Supplementary" #~ msgstr "Suplementos do Red Hat Enterprise Linux" - #~ msgid "" #~ "Components used for high performance networking and clustering, such as " #~ "Infiniband and RDMA." #~ msgstr "" #~ "Componentes usados para redes e clusters de alta performance, como a " #~ "Infiniband e a RDMA." - #~ msgid "OpenFabrics Enterprise Distribution" #~ msgstr "Distribui????o do OpenFabrics Enterprise" - #~ msgid "Virtualization Support." #~ msgstr "Suporte ?? Virtualiza????o." + From fedora-extras-commits at redhat.com Sat Jul 19 20:14:44 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 20:14:44 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.108,1.109 Message-ID: <200807192014.m6JKEiNm029975@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29949/devel Modified Files: kdebase-workspace.spec Log Message: * Sat Jul 19 2008 Kevin Kofler 4.0.99-3 - BR soprano-devel (optional dependency of the Plasma Engine Explorer) Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- kdebase-workspace.spec 19 Jul 2008 15:57:44 -0000 1.108 +++ kdebase-workspace.spec 19 Jul 2008 20:14:00 -0000 1.109 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.99 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -61,6 +61,7 @@ BuildRequires: NetworkManager-devel BuildRequires: pam-devel BuildRequires: qimageblitz-devel +BuildRequires: soprano-devel Requires: %{name}-libs = %{version}-%{release} Requires: kde-settings-kdm @@ -280,6 +281,9 @@ %changelog +* Sat Jul 19 2008 Kevin Kofler 4.0.99-3 +- BR soprano-devel (optional dependency of the Plasma Engine Explorer) + * Sat Jul 19 2008 Kevin Kofler 4.0.99-2 - backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) WARNING: Adds some new APIs from 4.2 (Plasma::popupPosition, Plasma::viewFor, From fedora-extras-commits at redhat.com Sat Jul 19 20:34:34 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 19 Jul 2008 20:34:34 GMT Subject: rpms/kdebase-workspace/F-9 kdebase-workspace.spec,1.92,1.93 Message-ID: <200807192034.m6JKYYob030655@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30589/F-9 Modified Files: kdebase-workspace.spec Log Message: Sync from devel: * Sat Jul 19 2008 Kevin Kofler 4.0.99-3 - BR soprano-devel (optional dependency of the Plasma Engine Explorer) Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- kdebase-workspace.spec 19 Jul 2008 18:15:11 -0000 1.92 +++ kdebase-workspace.spec 19 Jul 2008 20:33:47 -0000 1.93 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.99 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -61,6 +61,7 @@ BuildRequires: NetworkManager-devel BuildRequires: pam-devel BuildRequires: qimageblitz-devel +BuildRequires: soprano-devel Requires: %{name}-libs = %{version}-%{release} Requires: kde-settings-kdm @@ -280,6 +281,9 @@ %changelog +* Sat Jul 19 2008 Kevin Kofler 4.0.99-3 +- BR soprano-devel (optional dependency of the Plasma Engine Explorer) + * Sat Jul 19 2008 Kevin Kofler 4.0.99-2 - backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) WARNING: Adds some new APIs from 4.2 (Plasma::popupPosition, Plasma::viewFor, From fedora-extras-commits at redhat.com Sat Jul 19 20:59:47 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 20:59:47 GMT Subject: rpms/nntpgrab/F-8 nntpgrab_apache.conf, NONE, 1.1 nntpgrab_php.ini, NONE, 1.1 .cvsignore, 1.1, 1.2 nntpgrab.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200807192059.m6JKxllI031905@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31780/F-8 Modified Files: .cvsignore nntpgrab.spec sources Added Files: nntpgrab_apache.conf nntpgrab_php.ini Log Message: Update to version 0.3.2 --- NEW FILE nntpgrab_apache.conf --- # NNTPGrab - Communicate with an NNTPGrab server using a webinterface # # Allows only localhost by default # # But allowing NNTPGrab to anyone other than localhost should be considered # dangerous unless properly secured by SSL Alias /nntpgrab /usr/share/nntpgrab/web order deny,allow deny from all allow from 127.0.0.1 --- NEW FILE nntpgrab_php.ini --- extension=php_nntpgrab.so Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jan 2008 18:10:41 -0000 1.1 +++ .cvsignore 19 Jul 2008 20:58:57 -0000 1.2 @@ -0,0 +1 @@ +nntpgrab-0.3.2.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nntpgrab.spec 29 Apr 2008 15:50:25 -0000 1.7 +++ nntpgrab.spec 19 Jul 2008 20:58:57 -0000 1.8 @@ -1,10 +1,12 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab -Version: 0.2.5 +Version: 0.3.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet -Source: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 +Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 +Source1: nntpgrab_php.ini +Source2: nntpgrab_apache.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -25,6 +27,9 @@ BuildRequires: libnotify-devel BuildRequires: sqlite-devel BuildRequires: openssl-devel +BuildRequires: php-devel +BuildRequires: dbus-devel +BuildRequires: intltool %description With this program it is possible to download files from the usenet @@ -75,6 +80,24 @@ %description devel Development files for NNTPGrab +%package server +Summary: NNTPGrab server +Group: %{group} +Requires: %{name}-core = %{version}-%{release} + +%description server +The NNTPGrab Server is required if you want to use the NNTPGrab webinterface +or control the program from a remote computer + +%package web +Summary: NNTPGrab web interface +Requires: nntpgrab-core = %{version}-%{release} +Group: %{group} +Requires: webserver +Requires: php >= 4.1.0 +%description web +Web interface to control NNTPGrab + %prep %setup -q @@ -84,7 +107,7 @@ %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} desktop-file-install --vendor fedora --delete-original \ --add-category Network \ @@ -92,27 +115,57 @@ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/nntpgrab.desktop +desktop-file-install --vendor fedora --delete-original \ + --add-category Network \ + --copy-generic-name-to-name \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/nntpgrab_networked.desktop + +desktop-file-install --vendor fedora --delete-original \ + --add-category Network \ + --copy-generic-name-to-name \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/nntpgrab_server.desktop + # Rename the plugins from name_of_plugin.so.0.0.0 to name_of_plugin.so -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so.0 -mv %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so - -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so.0 -mv %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so - -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.so -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.so.0 -mv %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.so +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0 +mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so + +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0 +mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so + +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0 +mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so # Libtool files are unnecessary rm %{buildroot}%{_libdir}/libnntpgrab.la -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.la -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.la -rm %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.la +rm %{buildroot}%{_libdir}/libnntpgrab_glue.la +rm %{buildroot}%{_libdir}/libnntpgrab_utils.la +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.la +rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.la + +# Install the webinterface to /usr/share/nntpgrab/web +mkdir -p %{buildroot}/%{_datadir}/%{name}/web +cp -ad client/web/* %{buildroot}/%{_datadir}/%{name}/web +rm -rf %{buildroot}/%{_datadir}/%{name}/web/module +rm -f %{buildroot}%{_datadir}/%{name}/web/Makefile* + +# Webinterface configuration +mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ +mkdir -p %{buildroot}/%{_sysconfdir}/php.d +mkdir -p %{buildroot}/%{_sysconfdir}/%{name} +install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/php.d/nntpgrab.ini +install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/nntpgrab.conf +install -m 644 client/web/config.ini %{buildroot}/%{_sysconfdir}/%{name}/config.ini +rm -f %{buildroot}/%{_datadir}/%{name}/web/config.ini +ln -s %{_sysconfdir}/%{name}/config.ini %{buildroot}/%{_datadir}/%{name}/web/config.ini -# The server part of NNTPGrab isn't operational yet -rm %{buildroot}%{_bindir}/nntpgrab_server +# The glade interface isn't used on GTK 2.12.0 and higher +rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.glade %find_lang NNTPGrab @@ -125,25 +178,49 @@ %files core %{_libdir}/libnntpgrab.so.0 %{_libdir}/libnntpgrab.so.0.0.0 +%{_libdir}/libnntpgrab_glue.so.0 +%{_libdir}/libnntpgrab_glue.so.0.0.0 +%{_libdir}/libnntpgrab_utils.so.0 +%{_libdir}/libnntpgrab_utils.so.0.0.0 +%{_datadir}/pixmaps/nntpgrab.png %doc COPYING ChangeLog %files plugins -%{_libdir}/libnntpgrab_plugin_nntp.so -%{_libdir}/libnntpgrab_plugin_decoder.so -%{_libdir}/libnntpgrab_plugin_schedular.so +%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so +%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so +%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so %files gui -f NNTPGrab.lang %{_datadir}/applications/fedora-nntpgrab.desktop +%{_datadir}/applications/fedora-nntpgrab_networked.desktop %{_bindir}/nntpgrab_gui +%{_bindir}/nntpgrab_gui_networked %{_datadir}/nntpgrab -%{_datadir}/pixmaps/nntpgrab.png +%{_datadir}/nntpgrab/nntpgrab_gui.ui %files devel %{_libdir}/libnntpgrab.so +%{_libdir}/libnntpgrab_glue.so +%{_libdir}/libnntpgrab_utils.so %{_includedir}/nntpgrab %{_libdir}/pkgconfig/nntpgrab.pc +%files server +%{_bindir}/nntpgrab_server +%{_bindir}/start_nntpgrab_server +%{_datadir}/applications/fedora-nntpgrab_server.desktop + +%files web +%{_libdir}/php/modules/php_nntpgrab.so +%config(noreplace) %{_sysconfdir}/httpd/conf.d/nntpgrab.conf +%config(noreplace) %{_sysconfdir}/php.d/nntpgrab.ini +%config(noreplace) %{_sysconfdir}/%{name} +%{_datadir}/nntpgrab/web + %changelog +* Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-1 +- Update to version 0.3.2 + * Tue Apr 29 2008 Erik van Pienbroek - 0.2.5-1 - Update to version 0.2.5 - Small packaging fix Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Apr 2008 15:50:25 -0000 1.6 +++ sources 19 Jul 2008 20:58:57 -0000 1.7 @@ -1 +1 @@ -87598c84b470d127ec45373b8b40a8b6 nntpgrab-0.2.5.tar.bz2 +ad5af50272852663ad992d7d4a663054 nntpgrab-0.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 21:00:03 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 21:00:03 GMT Subject: rpms/nntpgrab/F-9 .cvsignore, 1.8, 1.9 nntpgrab.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <200807192100.m6JL03Hg031967@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31780/F-9 Modified Files: .cvsignore nntpgrab.spec sources Log Message: Update to version 0.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Jun 2008 13:44:11 -0000 1.8 +++ .cvsignore 19 Jul 2008 20:59:17 -0000 1.9 @@ -1 +1 @@ -nntpgrab-0.3.1.tar.bz2 +nntpgrab-0.3.2.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nntpgrab.spec 11 Jun 2008 14:16:15 -0000 1.12 +++ nntpgrab.spec 19 Jul 2008 20:59:17 -0000 1.13 @@ -1,7 +1,7 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab -Version: 0.3.1 -Release: 2%{?dist} +Version: 0.3.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 @@ -121,6 +121,12 @@ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/nntpgrab_networked.desktop +desktop-file-install --vendor fedora --delete-original \ + --add-category Network \ + --copy-generic-name-to-name \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/nntpgrab_server.desktop + # Rename the plugins from name_of_plugin.so.0.0.0 to name_of_plugin.so rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0 @@ -176,6 +182,7 @@ %{_libdir}/libnntpgrab_glue.so.0.0.0 %{_libdir}/libnntpgrab_utils.so.0 %{_libdir}/libnntpgrab_utils.so.0.0.0 +%{_datadir}/pixmaps/nntpgrab.png %doc COPYING ChangeLog %files plugins @@ -190,7 +197,6 @@ %{_bindir}/nntpgrab_gui_networked %{_datadir}/nntpgrab %{_datadir}/nntpgrab/nntpgrab_gui.ui -%{_datadir}/pixmaps/nntpgrab.png %files devel %{_libdir}/libnntpgrab.so @@ -201,6 +207,8 @@ %files server %{_bindir}/nntpgrab_server +%{_bindir}/start_nntpgrab_server +%{_datadir}/applications/fedora-nntpgrab_server.desktop %files web %{_libdir}/php/modules/php_nntpgrab.so @@ -210,6 +218,9 @@ %{_datadir}/nntpgrab/web %changelog +* Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-1 +- Update to version 0.3.2 + * Wed Jun 11 2008 Erik van Pienbroek - 0.3.1-2 - Added BR: intltool Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Jun 2008 13:44:11 -0000 1.10 +++ sources 19 Jul 2008 20:59:17 -0000 1.11 @@ -1 +1 @@ -548b4304ec172be8d2c4ea16b4946ac0 nntpgrab-0.3.1.tar.bz2 +ad5af50272852663ad992d7d4a663054 nntpgrab-0.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 21:00:16 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 21:00:16 GMT Subject: rpms/nntpgrab/devel .cvsignore, 1.9, 1.10 nntpgrab.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200807192100.m6JL0GCO032023@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31780/devel Modified Files: .cvsignore nntpgrab.spec sources Log Message: Update to version 0.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 Jun 2008 13:44:30 -0000 1.9 +++ .cvsignore 19 Jul 2008 20:59:33 -0000 1.10 @@ -1 +1 @@ -nntpgrab-0.3.1.tar.bz2 +nntpgrab-0.3.2.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nntpgrab.spec 11 Jun 2008 14:16:28 -0000 1.11 +++ nntpgrab.spec 19 Jul 2008 20:59:33 -0000 1.12 @@ -1,7 +1,7 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab -Version: 0.3.1 -Release: 2%{?dist} +Version: 0.3.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 @@ -121,6 +121,12 @@ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/nntpgrab_networked.desktop +desktop-file-install --vendor fedora --delete-original \ + --add-category Network \ + --copy-generic-name-to-name \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/nntpgrab_server.desktop + # Rename the plugins from name_of_plugin.so.0.0.0 to name_of_plugin.so rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0 @@ -176,6 +182,7 @@ %{_libdir}/libnntpgrab_glue.so.0.0.0 %{_libdir}/libnntpgrab_utils.so.0 %{_libdir}/libnntpgrab_utils.so.0.0.0 +%{_datadir}/pixmaps/nntpgrab.png %doc COPYING ChangeLog %files plugins @@ -190,7 +197,6 @@ %{_bindir}/nntpgrab_gui_networked %{_datadir}/nntpgrab %{_datadir}/nntpgrab/nntpgrab_gui.ui -%{_datadir}/pixmaps/nntpgrab.png %files devel %{_libdir}/libnntpgrab.so @@ -201,6 +207,8 @@ %files server %{_bindir}/nntpgrab_server +%{_bindir}/start_nntpgrab_server +%{_datadir}/applications/fedora-nntpgrab_server.desktop %files web %{_libdir}/php/modules/php_nntpgrab.so @@ -210,6 +218,9 @@ %{_datadir}/nntpgrab/web %changelog +* Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-1 +- Update to version 0.3.2 + * Wed Jun 11 2008 Erik van Pienbroek - 0.3.1-2 - Added BR: intltool Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 11 Jun 2008 13:44:30 -0000 1.9 +++ sources 19 Jul 2008 20:59:33 -0000 1.10 @@ -1 +1 @@ -548b4304ec172be8d2c4ea16b4946ac0 nntpgrab-0.3.1.tar.bz2 +ad5af50272852663ad992d7d4a663054 nntpgrab-0.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 21:12:03 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sat, 19 Jul 2008 21:12:03 GMT Subject: rpms/joni/devel joni.spec,1.5,1.6 Message-ID: <200807192112.m6JLC3Fc007776@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7664 Modified Files: joni.spec Log Message: * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.3.svn7235 - Build AOT bits. Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- joni.spec 19 Jul 2008 12:03:23 -0000 1.5 +++ joni.spec 19 Jul 2008 21:11:17 -0000 1.6 @@ -1,6 +1,6 @@ Name: joni Version: 1.0.3 -Release: 0.2.svn7235%{?dist} +Release: 0.3.svn7235%{?dist} Summary: Java regular expression library Group: Development/Libraries License: MIT @@ -19,13 +19,13 @@ Requires: java >= 1.5 Requires: jpackage-utils -%if 0%{?fedora} > 9 -BuildArch: noarch -%else +#%if 0%{?fedora} > 9 +#BuildArch: noarch +#%else BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 -%endif +#%endif %description @@ -50,27 +50,27 @@ # install unversioned jar as per Java Packaging Guidelines install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar -%if 0%{?fedora} <= 9 +#%if 0%{?fedora} <= 9 %{_bindir}/aot-compile-rpm -%endif +#%endif -%if 0%{?fedora} <= 9 +#%if 0%{?fedora} <= 9 %post if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi -%endif +#%endif -%if 0%{?fedora} <= 9 +#%if 0%{?fedora} <= 9 %postun if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi -%endif +#%endif %clean @@ -82,12 +82,15 @@ %doc pom.xml %{_javadir}/%{name}.jar -%if 0%{?fedora} <= 9 +#%if 0%{?fedora} <= 9 %{_libdir}/gcj/%{name} -%endif +#%endif %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.3.svn7235 +- Build AOT bits. + * Sat Jul 19 2008 Conrad Meyer - 1.0.3-0.2.svn7235 - Bump revision because of stupid packager's mistake. From fedora-extras-commits at redhat.com Sat Jul 19 21:19:13 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Sat, 19 Jul 2008 21:19:13 GMT Subject: rpms/docbook-simple/F-9 docbook-simple.cat, 1.2, 1.3 docbook-simple.spec, 1.9, 1.10 docbook-simple.xml, 1.3, 1.4 Message-ID: <200807192119.m6JLJDnJ008592@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-simple/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8523 Modified Files: docbook-simple.cat docbook-simple.spec docbook-simple.xml Log Message: fix loop in post catalog registration(incomplete sed coverage) -#455680, fix broken catalogs for package updates, fix removal files during updates, change file locations to prevent their removal via old buggy broken postun Index: docbook-simple.cat =================================================================== RCS file: /cvs/extras/rpms/docbook-simple/F-9/docbook-simple.cat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- docbook-simple.cat 24 May 2007 12:07:27 -0000 1.2 +++ docbook-simple.cat 19 Jul 2008 21:18:29 -0000 1.3 @@ -1,11 +1,11 @@ -- BEGIN OASIS TR 9401:1997 catalog for docbook-simple V1.1 -- OVERRIDE YES -PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbook.dtd" -PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd" -PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbookref.dtd" -PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbook.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbookref.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd" +PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook.dtd" +PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.dtd" +PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref.dtd" +PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.1//EN" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd" "/usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd" -- END OASIS TR 9401:1997 catalog for docbook-simple V1.1 -- Index: docbook-simple.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-simple/F-9/docbook-simple.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- docbook-simple.spec 5 Nov 2007 17:12:50 -0000 1.9 +++ docbook-simple.spec 19 Jul 2008 21:18:29 -0000 1.10 @@ -1,6 +1,6 @@ Name: docbook-simple Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Text Summary: Simplified DocBook is a small subset of the DocBook XML DTD License: Freely redistributable without restriction @@ -41,19 +41,19 @@ ########## install versioned-numbered directory of dtd files ############ -DESTDIR=$RPM_BUILD_ROOT/usr/share/xml/docbook/simple +DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/simple-F9 mkdir -p $DESTDIR cp -a ../%{version} $DESTDIR ########## install package catalogs ################ -XML_CAT_DIR=$RPM_BUILD_ROOT/etc/xml +XML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/xml mkdir -p $XML_CAT_DIR -install -p -m 644 %{SOURCE2} $XML_CAT_DIR +install -p -m 644 %{SOURCE2} $XML_CAT_DIR/%{name}-F9.xml -SGML_CAT_DIR=$RPM_BUILD_ROOT/etc/sgml +SGML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/sgml mkdir -p $SGML_CAT_DIR -install -p -m 644 %{SOURCE3} $SGML_CAT_DIR +install -p -m 644 %{SOURCE3} $SGML_CAT_DIR/%{name}-F9.cat ####### FIXME: must copy README.redhat to source directory ######## ####### for %doc to find it, ${SOURCE1} doesn't work ######## @@ -65,12 +65,15 @@ rm -rf ../%{version} %files +##Files and dirs have -F9 suffix to prevent bug in postun of old packages. +##This change of suffix is temporary and there will be no file/dir suffix in F10 %defattr (-,root,root,-) %doc sdocbook.css %doc README.fedora -%{_datadir}/xml/docbook/simple/%{version} -%config(noreplace) %{_sysconfdir}/sgml/docbook-simple.cat -%config(noreplace) %{_sysconfdir}/xml/docbook-simple.xml +%dir %{_datadir}/xml/docbook/simple-F9/ +%{_datadir}/xml/docbook/simple-F9/%{version} +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-simple-F9.cat +%config(noreplace) %{_sysconfdir}/xml/docbook-simple-F9.xml %post @@ -80,7 +83,7 @@ ## Define handy variables ## ROOT_XML_CATALOG=%{_sysconfdir}/xml/catalog -PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-simple.xml +PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-simple-F9.xml #### Root XML Catalog Entries #### #### Delegate appropriate lookups to package catalog #### @@ -107,7 +110,7 @@ ################# SGML catalog registration ###################### ROOT_SGML_CATALOG=%{_sysconfdir}/sgml/catalog -PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-simple.cat +PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-simple-F9.cat #### Root SGML Catalog Entries #### #### "Delegate" appropriate lookups to package catalog #### @@ -122,11 +125,12 @@ # "/etc/sgml/docbook-simple.cat" install-catalog --add \ - $PKG_SGML_CATALOG \ - $ROOT_SGML_CATALOG 1>/dev/null + "$PKG_SGML_CATALOG" \ + "$ROOT_SGML_CATALOG" 1>/dev/null # Hack to workaround bug in install-catalog - sed -i 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log\"$/d' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log$/d' $PKG_SGML_CATALOG fi #################################################################### @@ -143,31 +147,26 @@ ## Jobs: remove package catalog entries from both root catalogs & ## remove package catalogs -##### SGML catalogs ##### - -## Remove package catalog entry from SGML root catalog -%{_bindir}/xmlcatalog --sgml --noout --del \ - %{_sysconfdir}/sgml/catalog \ - "%{_sysconfdir}/sgml/docbook-simple.cat" - -## Remove SGML package catalog -rm -f %{_sysconfdir}/sgml/docbook-simple.cat - - -##### XML catalogs ##### - -## Remove package catalog entry from XML root catalog -%{_bindir}/xmlcatalog --noout --del \ - "file://%{_sysconfdir}/xml/docbook-simple.xml" \ - %{_sysconfdir}/xml/catalog - -## Remove XML package catalog -rm -f %{_sysconfdir}/sgml/docbook-simple.xml - -## Remove dtd directory -rm -rf %{_datadir}/xml/docbook/simple +# remove catalog entries only on removal of package +if [ "$1" = 0 ]; then + %{_bindir}/xmlcatalog --sgml --noout --del \ + %{_sysconfdir}/sgml/catalog \ + "%{_sysconfdir}/sgml/docbook-simple-F9.cat" + + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_sysconfdir}/xml/docbook-simple-F9.xml" \ + %{_sysconfdir}/xml/catalog +fi %changelog +* Sat Jul 19 2008 Ondrej Vasik - 1.1-4 +- fix loop in post catalog registration(incomplete sed + coverage) #455680 +- fix broken catalogs for package updates +- fix removal of files during updates +- change file locations to prevent their removal via old + buggy broken postun + * Mon Nov 05 2007 Ondrej Vasik - 1.1-3 - merge review(#225701) - spec modified to follow guidelines Index: docbook-simple.xml =================================================================== RCS file: /cvs/extras/rpms/docbook-simple/F-9/docbook-simple.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook-simple.xml 24 May 2007 15:40:20 -0000 1.3 +++ docbook-simple.xml 19 Jul 2008 21:18:29 -0000 1.4 @@ -7,28 +7,28 @@ + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook.dtd"/> + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.dtd"/> + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref.dtd"/> + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd"/> + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook.dtd"/> + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbook-custom.dtd"/> + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref.dtd"/> + uri="file:///usr/share/xml/docbook/simple-F9/1.1/sdocbookref-custom.dtd"/> From fedora-extras-commits at redhat.com Sat Jul 19 21:19:58 2008 From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr)) Date: Sat, 19 Jul 2008 21:19:58 GMT Subject: rpms/foobillard/devel foobillard-3.0a-no-fonts.patch, NONE, 1.1 hobble-foobillard.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 foobillard.desktop, 1.1, 1.2 foobillard.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200807192119.m6JLJwLk008743@cvs-int.fedora.redhat.com> Author: mitr Update of /cvs/extras/rpms/foobillard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531 Modified Files: .cvsignore foobillard.desktop foobillard.spec sources Added Files: foobillard-3.0a-no-fonts.patch hobble-foobillard.sh Log Message: * Sat Jul 19 2008 Miloslav Trma?? - 3.0a-7 - Don't ship the non-free fonts - Update License: - Fix foobillard.desktop - Convert ChangeLog to UTF-8 - Don't ship empty NEWS foobillard-3.0a-no-fonts.patch: --- NEW FILE foobillard-3.0a-no-fonts.patch --- diff -urN foobillard/data/Makefile.in foobillard-3.0a/data/Makefile.in --- foobillard/data/Makefile.in 2004-04-24 03:30:26.000000000 +0200 +++ foobillard-3.0a/data/Makefile.in 2008-07-19 22:27:11.000000000 +0200 @@ -121,14 +121,12 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ pkgdata_DATA = blende.png \ - bluebold.ttf \ cue_shadow.png \ foobillard.gif \ foobillard.png \ full_symbol.png \ fullhalf_symbol.png \ half_symbol.png \ - iomanoid.ttf \ lightflare.png \ place_cue_ball.png \ queue.png \ @@ -142,7 +140,6 @@ table-frame.png \ tabletex_fB_128x128.png \ tabletex_fB_256x256.png \ - youregon.ttf \ ball_ball.raw \ posx.png \ posy.png \ diff -urN foobillard/src/options.h foobillard-3.0a/src/options.h --- foobillard/src/options.h 2003-11-27 04:32:54.000000000 +0100 +++ foobillard-3.0a/src/options.h 2008-07-19 22:20:14.000000000 +0200 @@ -96,13 +96,13 @@ //#define options_player_fontname "/usr/X11/lib/X11/fonts/win-ttf/tahomabd.ttf" #define options_shared_data_path "/usr/local/shared/foobillard" -#define options_player_fontname "iomanoid.ttf" -#define options_help_fontname "youregon.ttf" -#define options_menu_fontname "youregon.ttf" -#define options_winner_fontname "youregon.ttf" -#define options_ball_fontname "bluebold.ttf" -#define options_score_fontname "bluebold.ttf" -#define options_roster_fontname "bluebold.ttf" +#define options_player_fontname "/usr/share/fonts/dejavu/DejaVuSans.ttf" +#define options_help_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf" +#define options_menu_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf" +#define options_winner_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf" +#define options_ball_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf" +#define options_score_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf" +#define options_roster_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf" #define options_snd_volume 1.0 --- NEW FILE hobble-foobillard.sh --- #! /bin/sh set -e d=$(mktemp -d) o=$(pwd) cd "$d" tar xzf "$o"/foobillard-3*.tar.gz find \( -name '*.ttf' -o -name README.FONTS \) -print0 | xargs -0 rm tar cjf "$o/foobillard-hobbled.tar.bz2" * cd "$o" rm -rf "$d" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/foobillard/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 04:19:59 -0000 1.4 +++ .cvsignore 19 Jul 2008 21:19:02 -0000 1.5 @@ -1 +1 @@ -foobillard-3.0a.tar.gz +foobillard-3.0a-hobbled.tar.bz2 Index: foobillard.desktop =================================================================== RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- foobillard.desktop 8 Nov 2004 04:19:47 -0000 1.1 +++ foobillard.desktop 19 Jul 2008 21:19:02 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=FooBillard GenericName=Billard Comment=OpenGL billard game Exec=foobillard -Icon=foobillard.xpm +Icon=foobillard Terminal=false Type=Application -Categories=Application;Game;3DGame;X-Fedora; +Categories=Game;X-Fedora; Index: foobillard.spec =================================================================== RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- foobillard.spec 19 Feb 2008 13:51:01 -0000 1.12 +++ foobillard.spec 19 Jul 2008 21:19:02 -0000 1.13 @@ -1,15 +1,18 @@ Name: foobillard Version: 3.0a -Release: 6 +Release: 7 Summary: OpenGL billard game Group: Amusements/Games -License: GPL +License: GPLv2 URL: http://foobillard.sunsite.dk/ -Source0: http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz +# Based on http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz +Source0: foobillard-3.0a-hobbled.tar.bz2 Source1: foobillard.desktop +Source2: hobble-foobillard.sh Patch0: foobillard-3.0a-nonv.patch +Patch1: foobillard-3.0a-no-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: SDL-devel ImageMagick alsa-lib-devel BuildRequires: freetype-devel libpng-devel perl zlib-devel @@ -23,8 +26,11 @@ %prep %setup -q -n foobillard-3.0a %patch0 -p1 +%patch1 -p1 -b .no-fonts %build +iconv -f iso-8859-1 -t utf-8 < ChangeLog > _ +mv _ ChangeLog %configure --disable-nvidia CFLAGS="${RPM_OPT_FLAGS}" make %{?_smp_mflags} convert -resize 48 data/foobillard.png foobillard.png @@ -34,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT %makeinstall mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -install -pm 644 %{_sourcedir}/foobillard.desktop \ +install -pm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/applications/fedora-foobillard.desktop mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 install -pm 644 foobillard.6 $RPM_BUILD_ROOT%{_mandir}/man6 @@ -48,7 +54,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README TODO README.FONTS +%doc AUTHORS COPYING ChangeLog README TODO %doc foobillardrc.example %{_bindir}/foobillard %{_datadir}/applications/fedora-foobillard.desktop @@ -58,6 +64,13 @@ %changelog +* Sat Jul 19 2008 Miloslav Trma?? - 3.0a-7 +- Don't ship the non-free fonts +- Update License: +- Fix foobillard.desktop +- Convert ChangeLog to UTF-8 +- Don't ship empty NEWS + * Tue Feb 19 2008 Fedora Release Engineering - 3.0a-6 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/foobillard/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 04:19:59 -0000 1.4 +++ sources 19 Jul 2008 21:19:02 -0000 1.5 @@ -1 +1 @@ -c2d92edeaaf8bfb18aa26f1c79931b7d foobillard-3.0a.tar.gz +965d0dc0a4f864f2f25682bd9881e9b1 foobillard-3.0a-hobbled.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 22:06:45 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Sat, 19 Jul 2008 22:06:45 GMT Subject: rpms/docbook-slides/F-9 docbook-slides.cat, 1.2, 1.3 docbook-slides.spec, 1.9, 1.10 docbook-slides.xml, 1.2, 1.3 docbook-slides.patch, 1.1, NONE Message-ID: <200807192206.m6JM6ju2016769@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-slides/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16702 Modified Files: docbook-slides.cat docbook-slides.spec docbook-slides.xml Removed Files: docbook-slides.patch Log Message: fix loop in post catalog registration(incomplete sed coverage) - #455680, fix several issues in postun causing troubles for updates,change file locations to prevent their removal via old buggy broken postun Index: docbook-slides.cat =================================================================== RCS file: /cvs/extras/rpms/docbook-slides/F-9/docbook-slides.cat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- docbook-slides.cat 25 May 2007 07:58:35 -0000 1.2 +++ docbook-slides.cat 19 Jul 2008 22:06:00 -0000 1.3 @@ -1,14 +1,14 @@ -- BEGIN OASIS TR 9401:1997 catalog for docbook-slides V3.4.0 -- OVERRIDE YES -PUBLIC "-//Norman Walsh//DTD Slides XML V3.4.0//EN" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides.dtd" -PUBLIC "-//Norman Walsh//DTD Slides Custom XML V3.4.0//EN" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-custom.dtd" -PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.4.0//EN" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-full.dtd" +PUBLIC "-//Norman Walsh//DTD Slides XML V3.4.0//EN" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides.dtd" +PUBLIC "-//Norman Walsh//DTD Slides Custom XML V3.4.0//EN" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-custom.dtd" +PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.4.0//EN" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-full.dtd" -SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides.dtd" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides.dtd" -SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-custom.dtd" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-custom.dtd" -SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-full.dtd" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-full.dtd" +SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides.dtd" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides.dtd" +SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-custom.dtd" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-custom.dtd" +SYSTEM "http://docbook.sourceforge.net/release/slides/3.4.0/schema/dtd/slides-full.dtd" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-full.dtd" -SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides.dtd" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides.dtd" -SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-custom.dtd" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-custom.dtd" -SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-full.dtd" "/usr/share/xml/docbook/slides/3.4.0/schema/dtd/slides-full.dtd" +SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides.dtd" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides.dtd" +SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-custom.dtd" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-custom.dtd" +SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/dtd/slides-full.dtd" "/usr/share/xml/docbook/slides-F9/3.4.0/schema/dtd/slides-full.dtd" -- END OASIS TR 9401:1997 catalog for docbook-slides V3.4.0 -- Index: docbook-slides.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-slides/F-9/docbook-slides.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- docbook-slides.spec 14 Nov 2007 09:19:48 -0000 1.9 +++ docbook-slides.spec 19 Jul 2008 22:06:00 -0000 1.10 @@ -2,7 +2,7 @@ Summary: DocBook Slides document type and stylesheets Name: docbook-slides Version: 3.4.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Text URL: http://sourceforge.net/projects/docbook @@ -37,7 +37,7 @@ %install rm -rf $RPM_BUILD_ROOT -DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/slides/%{version} +DESTDIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook/slides-F9/%{version} mkdir -p $DESTDIR cp -a browser $DESTDIR cp -a graphics $DESTDIR @@ -50,11 +50,11 @@ XML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/xml mkdir -p $XML_CAT_DIR -install -p -m 644 %{SOURCE1} $XML_CAT_DIR +install -p -m 644 %{SOURCE1} $XML_CAT_DIR/%{name}-F9.xml SGML_CAT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/sgml mkdir -p $SGML_CAT_DIR -install -p -m 644 %{SOURCE2} $SGML_CAT_DIR +install -p -m 644 %{SOURCE2} $SGML_CAT_DIR/%{name}-F9.cat cp -p %{SOURCE3} ./README.fedora @@ -62,15 +62,18 @@ rm -rf $RPM_BUILD_ROOT %files +##Files and dirs have -F9 suffix to prevent bug in postun of old packages. +##This change of suffix is temporary and there will be no file/dir suffix in F10 %defattr (-,root,root, -) %doc doc %doc tests %doc README %doc NEWS %doc README.fedora -%{_datadir}/xml/docbook/slides/%{version} -%config(noreplace) %{_sysconfdir}/sgml/docbook-slides.cat -%config(noreplace) %{_sysconfdir}/xml/docbook-slides.xml +%dir %{_datadir}/xml/docbook/slides-F9/ +%{_datadir}/xml/docbook/slides-F9/%{version} +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook-slides-F9.cat +%config(noreplace) %{_sysconfdir}/xml/docbook-slides-F9.xml %post @@ -80,7 +83,7 @@ ## Define handy variables ## ROOT_XML_CATALOG=%{_sysconfdir}/xml/catalog -PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-slides.xml +PKG_XML_CATALOG=%{_sysconfdir}/xml/docbook-slides-F9.xml #LOCAL_XML_CATALOG=/usr/share/xml/docbook/slides/3.4.0/catalog.xml # @@ -105,7 +108,7 @@ ################# SGML catalog registration ###################### ROOT_SGML_CATALOG=%{_sysconfdir}/sgml/catalog -PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-slides.cat +PKG_SGML_CATALOG=%{_sysconfdir}/sgml/docbook-slides-F9.cat #### Root SGML Catalog Entries #### #### "Delegate" appropriate lookups to package catalog #### @@ -123,7 +126,8 @@ $ROOT_SGML_CATALOG 1>/dev/null # Hack to workaround bug in install-catalog - sed -i 's/^CATALOG.*log\"$//g' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log\"$/d' $PKG_SGML_CATALOG + sed -i '/^CATALOG.*log$/d' $PKG_SGML_CATALOG fi #################################################################### @@ -139,32 +143,26 @@ ## Jobs: remove package catalog entries from both root catalogs & ## remove package catalogs -##### SGML catalogs ##### - -## Remove package catalog entry from SGML root catalog -%{_bindir}/xmlcatalog --sgml --noout --del \ - %{_sysconfdir}/sgml/catalog \ - "%{_sysconfdir}/sgml/docbook-slides.cat" +# remove catalog entries only on removal of package +if [ "$1" = 0 ]; then + %{_bindir}/xmlcatalog --sgml --noout --del \ + %{_sysconfdir}/sgml/catalog \ + "%{_sysconfdir}/sgml/docbook-slides-F9.cat" -## Remove SGML package catalog -rm -f %{_sysconfdir}/sgml/docbook-slides.cat - - -##### XML catalogs ##### - -## Remove package catalog entry from XML root catalog -%{_bindir}/xmlcatalog --noout --del \ - "file://%{_sysconfdir}/xml/docbook-slides.xml" \ - %{_sysconfdir}/xml/catalog - -## Remove XML package catalog -rm -f %{_sysconfdir}/sgml/docbook-slides.xml - -## Remove dtd directory -rm -rf %{_datadir}/xml/docbook/slides - + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_sysconfdir}/xml/docbook-slides-F9.xml" \ + %{_sysconfdir}/xml/catalog +fi %changelog +* Fri Jul 18 2008 Ondrej Vasik - 3.4.0-4 +- fix loop in post catalog registration(incomplete sed + coverage) #455680 +- fix broken catalogs for package updates +- fix removal of files during updates +- change file locations to prevent their removal via old + buggy broken postun + * Tue Nov 06 2007 Ondrej Vasik - 3.4.0-3 - merge review(#225702) - spec file changed to follow guidelines Index: docbook-slides.xml =================================================================== RCS file: /cvs/extras/rpms/docbook-slides/F-9/docbook-slides.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- docbook-slides.xml 25 May 2007 07:58:35 -0000 1.2 +++ docbook-slides.xml 19 Jul 2008 22:06:00 -0000 1.3 @@ -7,18 +7,18 @@ + catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/> + catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/> + catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/> + catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/> + catalog="file:///usr/share/xml/docbook/slides-F9/3.4.0/catalog.xml"/> --- docbook-slides.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 22:10:31 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Sat, 19 Jul 2008 22:10:31 GMT Subject: rpms/kernel/F-9 linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch, NONE, 1.1 kernel.spec, 1.713, 1.714 Message-ID: <200807192210.m6JMAVDm016942@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16909 Modified Files: kernel.spec Added Files: linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch Log Message: * Fri Jul 19 2008 Chuck Ebbert 2.6.25.11-95 - Add sysrq-l to show backtraces on all CPUs. linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch: --- NEW FILE linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch --- From: Linux Kernel Mailing List To: git-commits-head at vger.kernel.org Subject: sysrq: add show-backtrace-on-all-cpus function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Git-Commit: 5045bcae0fb466a1dbb6af0036e56901fd7aafb7 X-Git-Parent: 6e574195b75543bc6a6240306313988b1952470c X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.3 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org Sender: git-commits-head-owner at vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git-commits-head at vger.kernel.org X-RedHat-Spam-Score: -3.865 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32 Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5045bcae0fb466a1dbb6af0036e56901fd7aafb7 Commit: 5045bcae0fb466a1dbb6af0036e56901fd7aafb7 Parent: 6e574195b75543bc6a6240306313988b1952470c Author: Rik van Riel AuthorDate: Tue Apr 29 00:59:21 2008 -0700 Committer: Linus Torvalds CommitDate: Tue Apr 29 08:06:03 2008 -0700 sysrq: add show-backtrace-on-all-cpus function SysRQ-P is not always useful on SMP systems, since it usually ends up showing the backtrace of a CPU that is doing just fine, instead of the backtrace of the CPU that is having problems. This patch adds SysRQ show-all-cpus(L), which shows the backtrace of every active CPU in the system. It skips idle CPUs because some SMP systems are just too large and we already know what the backtrace of the idle task looks like. [akpm at linux-foundation.org: coding-style fixes] Signed-off-by: Rik van Riel Randy Dunlap Cc: Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Documentation/sysrq.txt | 2 ++ drivers/char/sysrq.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index 10c8f69..5ce0952 100644 --- a/Documentation/sysrq.txt +++ b/Documentation/sysrq.txt @@ -85,6 +85,8 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 'k' - Secure Access Key (SAK) Kills all programs on the current virtual console. NOTE: See important comments below in SAK section. +'l' - Shows a stack backtrace for all active CPUs. + 'm' - Will dump current memory info to your console. 'n' - Used to make RT tasks nice-able diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 1ade193..9e9bad8 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -196,6 +196,48 @@ static struct sysrq_key_op sysrq_showlocks_op = { #define sysrq_showlocks_op (*(struct sysrq_key_op *)0) #endif +#ifdef CONFIG_SMP +static DEFINE_SPINLOCK(show_lock); + +static void showacpu(void *dummy) +{ + unsigned long flags; + + /* Idle CPUs have no interesting backtrace. */ + if (idle_cpu(smp_processor_id())) + return; + + spin_lock_irqsave(&show_lock, flags); + printk(KERN_INFO "CPU%d:\n", smp_processor_id()); + show_stack(NULL, NULL); + spin_unlock_irqrestore(&show_lock, flags); +} + +static void sysrq_showregs_othercpus(struct work_struct *dummy) +{ + smp_call_function(showacpu, NULL, 0, 0); +} + +static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus); + +static void sysrq_handle_showallcpus(int key, struct tty_struct *tty) +{ + struct pt_regs *regs = get_irq_regs(); + if (regs) { + printk(KERN_INFO "CPU%d:\n", smp_processor_id()); + show_regs(regs); + } + schedule_work(&sysrq_showallcpus); +} + +static struct sysrq_key_op sysrq_showallcpus_op = { + .handler = sysrq_handle_showallcpus, + .help_msg = "aLlcpus", + .action_msg = "Show backtrace of all active CPUs", + .enable_mask = SYSRQ_ENABLE_DUMP, +}; +#endif + static void sysrq_handle_showregs(int key, struct tty_struct *tty) { struct pt_regs *regs = get_irq_regs(); @@ -340,7 +382,11 @@ static struct sysrq_key_op *sysrq_key_table[36] = { &sysrq_kill_op, /* i */ NULL, /* j */ &sysrq_SAK_op, /* k */ +#ifdef CONFIG_SMP + &sysrq_showallcpus_op, /* l */ +#else NULL, /* l */ +#endif &sysrq_showmem_op, /* m */ &sysrq_unrt_op, /* n */ /* o: This will often be registered as 'Off' at init time */ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.713 retrieving revision 1.714 diff -u -r1.713 -r1.714 --- kernel.spec 17 Jul 2008 18:13:46 -0000 1.713 +++ kernel.spec 19 Jul 2008 22:09:35 -0000 1.714 @@ -629,6 +629,7 @@ Patch510: linux-2.6-silence-noise.patch Patch570: linux-2.6-selinux-mprotect-checks.patch Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch +Patch590: linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch Patch610: linux-2.6-defaults-fat-utf8.patch Patch611: linux-2.6-reiserfs-discard-prealloc.patch @@ -1199,6 +1200,9 @@ # Fix SELinux for sparc ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch +# add sysrq-l (show all cpus backtrace) +ApplyPatch linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch + # Changes to upstream defaults. # Use UTF-8 by default on VFAT. ApplyPatch linux-2.6-defaults-fat-utf8.patch @@ -1881,10 +1885,13 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog -* Thu Jul 17 2008 Dave Jones +* Fri Jul 19 2008 Chuck Ebbert 2.6.25.11-95 +- Add sysrq-l to show backtraces on all CPUs. + +* Thu Jul 17 2008 Dave Jones 2.6.25.11-94 - Fix SHIRQ debug trace in tulip driver. (#454575) -* Tue Jul 15 2008 John W. Linville +* Tue Jul 15 2008 John W. Linville 2.6.25.11-93 - Upstream wireless updates from 2008-07-14 (http://marc.info/?l=linux-wireless&m=121606436000705&w=2) From fedora-extras-commits at redhat.com Sat Jul 19 21:48:02 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Sat, 19 Jul 2008 21:48:02 GMT Subject: rpms/docbook-slides/devel docbook-slides.patch,1.1,NONE Message-ID: <200807192148.m6JLm2uu009592@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-slides/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9580 Removed Files: docbook-slides.patch Log Message: remove unused patch --- docbook-slides.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 19 22:31:58 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 22:31:58 GMT Subject: rpms/nntpgrab/F-9 sources,1.11,1.12 Message-ID: <200807192231.m6JMVw5Q017509@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17386/F-9 Modified Files: sources Log Message: Tarball for NNTPGrab 0.3.2 was updated by upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 19 Jul 2008 20:59:17 -0000 1.11 +++ sources 19 Jul 2008 22:31:10 -0000 1.12 @@ -1 +1 @@ -ad5af50272852663ad992d7d4a663054 nntpgrab-0.3.2.tar.bz2 +6d6a5b7868a470a8d1c5e1c288beee4f nntpgrab-0.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 22:32:10 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 22:32:10 GMT Subject: rpms/nntpgrab/F-8 sources,1.7,1.8 Message-ID: <200807192232.m6JMWA26017512@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17386/F-8 Modified Files: sources Log Message: Tarball for NNTPGrab 0.3.2 was updated by upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jul 2008 20:58:57 -0000 1.7 +++ sources 19 Jul 2008 22:30:54 -0000 1.8 @@ -1 +1 @@ -ad5af50272852663ad992d7d4a663054 nntpgrab-0.3.2.tar.bz2 +6d6a5b7868a470a8d1c5e1c288beee4f nntpgrab-0.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 22:32:17 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 22:32:17 GMT Subject: rpms/nntpgrab/devel sources,1.10,1.11 Message-ID: <200807192232.m6JMWHFp017522@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17386/devel Modified Files: sources Log Message: Tarball for NNTPGrab 0.3.2 was updated by upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Jul 2008 20:59:33 -0000 1.10 +++ sources 19 Jul 2008 22:31:28 -0000 1.11 @@ -1 +1 @@ -ad5af50272852663ad992d7d4a663054 nntpgrab-0.3.2.tar.bz2 +6d6a5b7868a470a8d1c5e1c288beee4f nntpgrab-0.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 19 22:38:02 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 22:38:02 GMT Subject: rpms/nntpgrab/F-8 nntpgrab.spec,1.8,1.9 Message-ID: <200807192238.m6JMc27p017863@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17776/F-8 Modified Files: nntpgrab.spec Log Message: Tarball for NNTPGrab 0.3.2 was updated by upstream Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nntpgrab.spec 19 Jul 2008 20:58:57 -0000 1.8 +++ nntpgrab.spec 19 Jul 2008 22:37:15 -0000 1.9 @@ -1,7 +1,7 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 @@ -218,6 +218,9 @@ %{_datadir}/nntpgrab/web %changelog +* Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-2 +- Tarball was respun by upstream + * Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-1 - Update to version 0.3.2 From fedora-extras-commits at redhat.com Sat Jul 19 22:38:15 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 22:38:15 GMT Subject: rpms/nntpgrab/F-9 nntpgrab.spec,1.13,1.14 Message-ID: <200807192238.m6JMcFVh017868@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17776/F-9 Modified Files: nntpgrab.spec Log Message: Tarball for NNTPGrab 0.3.2 was updated by upstream Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nntpgrab.spec 19 Jul 2008 20:59:17 -0000 1.13 +++ nntpgrab.spec 19 Jul 2008 22:37:32 -0000 1.14 @@ -1,7 +1,7 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 @@ -218,6 +218,9 @@ %{_datadir}/nntpgrab/web %changelog +* Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-2 +- Tarball was respun by upstream + * Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-1 - Update to version 0.3.2 From fedora-extras-commits at redhat.com Sat Jul 19 22:38:29 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 19 Jul 2008 22:38:29 GMT Subject: rpms/nntpgrab/devel nntpgrab.spec,1.12,1.13 Message-ID: <200807192238.m6JMcTrP017874@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17776/devel Modified Files: nntpgrab.spec Log Message: Tarball for NNTPGrab 0.3.2 was updated by upstream Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nntpgrab.spec 19 Jul 2008 20:59:33 -0000 1.12 +++ nntpgrab.spec 19 Jul 2008 22:37:46 -0000 1.13 @@ -1,7 +1,7 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 @@ -218,6 +218,9 @@ %{_datadir}/nntpgrab/web %changelog +* Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-2 +- Tarball was respun by upstream + * Sat Jul 19 2008 Erik van Pienbroek - 0.3.2-1 - Update to version 0.3.2 From fedora-extras-commits at redhat.com Sat Jul 19 22:42:47 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 19 Jul 2008 22:42:47 GMT Subject: rpms/clisp/devel clisp.spec,1.33,1.34 Message-ID: <200807192242.m6JMglaS018153@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18118 Modified Files: clisp.spec Log Message: new release 2.46 Index: clisp.spec =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/clisp.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- clisp.spec 4 Jul 2008 18:35:43 -0000 1.33 +++ clisp.spec 19 Jul 2008 22:41:56 -0000 1.34 @@ -72,7 +72,7 @@ %build %ifarch ppc ppc64 -%define opt_flags "$RPM_OPT_FLAGS -DNO_GENERATIONAL_GC" +%define opt_flags "$RPM_OPT_FLAGS -DNO_GENERATIONAL_GC -DNO_MULTIMAP_FILE -DNO_SINGLEMAP" ulimit -s unlimited %else %define opt_flags "$RPM_OPT_FLAGS" @@ -80,8 +80,8 @@ ./configure --prefix=%{_prefix} \ --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --docdir=%{_docdir}/clisp-%{version} \ + --mandir=%{_mandir} \ + --docdir=%{_docdir}/clisp-%{version} \ --fsstnd=redhat \ --with-module=bindings/glibc \ --with-module=clx/new-clx \ @@ -92,10 +92,15 @@ --with-module=rawsock \ --with-module=wildcard \ --with-module=zlib \ - --with-module=berkeley-db \ - --with-readline \ - --cbc \ - build CFLAGS=%opt_flags + --with-module=berkeley-db \ + --with-readline \ + build CFLAGS=%opt_flags + +%ifarch ppc ppc64 +ulimit -s unlimited +%endif +make -C build + %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Sat Jul 19 23:09:21 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 19 Jul 2008 23:09:21 GMT Subject: rpms/sooperlooper/devel sooperlooper.spec,1.1,1.2 Message-ID: <200807192309.m6JN9Ld1025427@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/sooperlooper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25402 Modified Files: sooperlooper.spec Log Message: * Sat Jul 19 2008 Michel Alexandre Salim - 1.6.2-2 - Rebuild against new rubberband (1.2) Index: sooperlooper.spec =================================================================== RCS file: /cvs/pkgs/rpms/sooperlooper/devel/sooperlooper.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sooperlooper.spec 15 Apr 2008 18:32:03 -0000 1.1 +++ sooperlooper.spec 19 Jul 2008 23:08:34 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Realtime software looping sampler Name: sooperlooper Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://essej.net/sooperlooper/ @@ -84,6 +84,9 @@ %changelog +* Sat Jul 19 2008 Michel Alexandre Salim - 1.6.2-2 +- Rebuild against new rubberband (1.2) + * Tue Apr 15 2008 Hans de Goede 1.6.2-1 - New upstream release 1.6.2 From fedora-extras-commits at redhat.com Sat Jul 19 23:11:36 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 19 Jul 2008 23:11:36 GMT Subject: rpms/clisp/devel clisp.spec,1.34,1.35 Message-ID: <200807192311.m6JNBa8b025532@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25500 Modified Files: clisp.spec Log Message: Index: clisp.spec =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/clisp.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- clisp.spec 19 Jul 2008 22:41:56 -0000 1.34 +++ clisp.spec 19 Jul 2008 23:10:45 -0000 1.35 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.46 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPLv2 @@ -29,7 +29,7 @@ BuildRequires: pcre-devel BuildRequires: postgresql-devel BuildRequires: zlib-devel -BuildRequires: db4-devel +#BuildRequires: db4-devel #BuildRequires: pari-devel ExcludeArch: ppc64 @@ -92,7 +92,6 @@ --with-module=rawsock \ --with-module=wildcard \ --with-module=zlib \ - --with-module=berkeley-db \ --with-readline \ build CFLAGS=%opt_flags From fedora-extras-commits at redhat.com Sat Jul 19 23:59:37 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 19 Jul 2008 23:59:37 GMT Subject: rpms/fedora-release-notes/F-9 fedora-release-notes.spec,1.30,1.31 Message-ID: <200807192359.m6JNxbL1028345@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/fedora-release-notes/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302 Modified Files: fedora-release-notes.spec Log Message: Bump release for new SRPM Index: fedora-release-notes.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-9/fedora-release-notes.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fedora-release-notes.spec 13 May 2008 12:50:53 -0000 1.30 +++ fedora-release-notes.spec 19 Jul 2008 23:58:54 -0000 1.31 @@ -1,5 +1,5 @@ Name: fedora-release-notes -Version: 9.0.1 +Version: 9.0.2 Release: 1 Summary: Release Notes for Fedora %{version} URL: http://fedoraproject.org/wiki/Docs/Beats @@ -120,6 +120,9 @@ %changelog +* Sat Jul 19 2008 Paul W. Frields - 9.0.2-1 +- Update with more bugfixes and translation updates + * Mon May 12 2008 Paul W. Frields - 9.0.1-1 - Update with various bugfixes and translation updates From fedora-extras-commits at redhat.com Sun Jul 20 00:07:01 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 20 Jul 2008 00:07:01 GMT Subject: rpms/fedora-release-notes/F-9 fedora-release-notes.spec,1.31,1.32 Message-ID: <200807200007.m6K071e2002736@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/fedora-release-notes/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2691 Modified Files: fedora-release-notes.spec Log Message: Also fix missing README problem. Index: fedora-release-notes.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-9/fedora-release-notes.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fedora-release-notes.spec 19 Jul 2008 23:58:54 -0000 1.31 +++ fedora-release-notes.spec 20 Jul 2008 00:06:18 -0000 1.32 @@ -65,6 +65,11 @@ find $D -type f | while read foo ; do ln -s ../../../$foo $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D} ; done done done +pushd README-%{version}/ +for F in README-*.txt; do + L=`echo ${F} | %{__sed} 's/README-\(.*\)\.txt/\1/'` + install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme/${L}/${F} +done pushd README-BURNING-ISOS-%{version}/ for F in README-BURNING-ISOS-*.txt; do L=`echo ${F} | %{__sed} 's/README-BURNING-ISOS-\(.*\)\.txt/\1/'` From fedora-extras-commits at redhat.com Sun Jul 20 00:27:14 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 20 Jul 2008 00:27:14 GMT Subject: rpms/Miro/devel Miro.spec,1.33,1.34 Message-ID: <200807200027.m6K0RE0x003331@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/Miro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3278 Modified Files: Miro.spec Log Message: - Rebuild for xulrunner-1.9.0.1 - Unfortunately we probably need to make this an exact match because Miro uses the unstable API, so a rebuild may need to be done on every package update to be sure that it will work with new xulrunner update Index: Miro.spec =================================================================== RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Miro.spec 19 Jun 2008 05:39:29 -0000 1.33 +++ Miro.spec 20 Jul 2008 00:26:30 -0000 1.34 @@ -1,11 +1,11 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define gecko_ver 1.9 +%define gecko_ver 1.9.0.1 Name: Miro Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -79,6 +79,12 @@ %changelog +* Sat July 19 2008 Alex Lancaster - 1.2.4-3 +- Rebuild for xulrunner-1.9.0.1 +- Unfortunately we probably need to make this an exact match because + Miro uses the unstable API, so a rebuild may need to be done on every + package update to be sure that it will work with new xulrunner updates + * Wed Jun 18 2008 Alex Lancaster - 1.2.4-2 - Rebuild for xulrunner-1.9 final. From fedora-extras-commits at redhat.com Sun Jul 20 00:28:45 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 20 Jul 2008 00:28:45 GMT Subject: rpms/fedora-release-notes/F-9 fedora-release-notes.spec,1.32,1.33 Message-ID: <200807200028.m6K0SjWg003391@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/fedora-release-notes/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3360 Modified Files: fedora-release-notes.spec Log Message: Fix description and changelog in spec file Index: fedora-release-notes.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-9/fedora-release-notes.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fedora-release-notes.spec 20 Jul 2008 00:06:18 -0000 1.32 +++ fedora-release-notes.spec 20 Jul 2008 00:27:59 -0000 1.33 @@ -23,7 +23,7 @@ Obsoletes: indexhtml < 9-3 %description -These are the official Release Notes for Fedora 8, +These are the official Release Notes for Fedora 9, written and edited by the Fedora community. For more information on the Release Notes process or how you can contribute, refer to the Release Notes HOWTO located at @@ -126,7 +126,8 @@ %changelog * Sat Jul 19 2008 Paul W. Frields - 9.0.2-1 -- Update with more bugfixes and translation updates +- Content and translation updates +- Fix description (#453255) * Mon May 12 2008 Paul W. Frields - 9.0.1-1 - Update with various bugfixes and translation updates From fedora-extras-commits at redhat.com Sun Jul 20 00:31:01 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 20 Jul 2008 00:31:01 GMT Subject: rpms/Miro/devel Miro.spec,1.34,1.35 Message-ID: <200807200031.m6K0V1Z0003480@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/Miro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3452 Modified Files: Miro.spec Log Message: Fix changelog date. Index: Miro.spec =================================================================== RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Miro.spec 20 Jul 2008 00:26:30 -0000 1.34 +++ Miro.spec 20 Jul 2008 00:30:17 -0000 1.35 @@ -79,7 +79,7 @@ %changelog -* Sat July 19 2008 Alex Lancaster - 1.2.4-3 +* Sat Jul 19 2008 Alex Lancaster - 1.2.4-3 - Rebuild for xulrunner-1.9.0.1 - Unfortunately we probably need to make this an exact match because Miro uses the unstable API, so a rebuild may need to be done on every From fedora-extras-commits at redhat.com Sun Jul 20 00:38:36 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 20 Jul 2008 00:38:36 GMT Subject: rpms/xfwm4/devel xfwm4.spec,1.24,1.25 Message-ID: <200807200038.m6K0cavC003736@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfwm4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3684 Modified Files: xfwm4.spec Log Message: * Sun Jul 20 2008 Christoph Wickert - 4.4.2-4 - Really switch to Nodoka theme Index: xfwm4.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfwm4/devel/xfwm4.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xfwm4.spec 29 Apr 2008 19:50:56 -0000 1.24 +++ xfwm4.spec 20 Jul 2008 00:37:49 -0000 1.25 @@ -1,11 +1,11 @@ Summary: Next generation window manager for Xfce Name: xfwm4 Version: 4.4.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfwm4-4.4.2.tar.bz2 -Patch: xfwm4-4.4.2-nodoka.patch +Patch0: xfwm4-4.4.2-nodoka.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +30,7 @@ %prep %setup -q +# use Nodoka Theme %patch0 -p1 -b .nodoka %build @@ -70,6 +71,9 @@ %{_datadir}/themes %changelog +* Sun Jul 20 2008 Christoph Wickert - 4.4.2-4 +- Really switch to Nodoka theme + * Wed Apr 23 2008 Christoph Wickert - 4.4.2-3 - Switch to Nodoka theme by default - disable-static instead of removing *.a files From fedora-extras-commits at redhat.com Sun Jul 20 00:58:46 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 20 Jul 2008 00:58:46 GMT Subject: rpms/fedora-release-notes/F-9 .cvsignore, 1.18, 1.19 sources, 1.27, 1.28 Message-ID: <200807200058.m6K0wkku004474@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/fedora-release-notes/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4434/F-9 Modified Files: .cvsignore sources Log Message: Import new fedora-release-notes-9.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 13 May 2008 12:50:53 -0000 1.18 +++ .cvsignore 20 Jul 2008 00:58:01 -0000 1.19 @@ -1,6 +1,6 @@ -README-9.0.1.tar.gz -README-BURNING-ISOS-9.0.1.tar.gz -about-fedora-9.0.1.tar.gz -fedora-release-notes-9.0.1.tar.gz -homepage-9.0.1.tar.gz -readme-live-image-9.0.1.tar.gz +README-9.0.2.tar.gz +README-BURNING-ISOS-9.0.2.tar.gz +about-fedora-9.0.2.tar.gz +fedora-release-notes-9.0.2.tar.gz +homepage-9.0.2.tar.gz +readme-live-image-9.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-9/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 13 May 2008 12:50:53 -0000 1.27 +++ sources 20 Jul 2008 00:58:01 -0000 1.28 @@ -1,6 +1,6 @@ -f76f57601f388d2f7fe4f2e40aa66d94 README-9.0.1.tar.gz -be912e5f6959a419633c1a44652a3dc0 README-BURNING-ISOS-9.0.1.tar.gz -ac8bb04a8d6360115ad3c2751d6d28eb about-fedora-9.0.1.tar.gz -95dbc9e01ff172b567de48b83af61163 fedora-release-notes-9.0.1.tar.gz -58becd0c9082380cff6227d66ff9ece8 homepage-9.0.1.tar.gz -ac7201e348620264354e5e30d0d350ca readme-live-image-9.0.1.tar.gz +ce20012eacc41af24664d271d9bbdd9d README-9.0.2.tar.gz +80465cc86aa48aaac58a6253a1414097 README-BURNING-ISOS-9.0.2.tar.gz +072a4b6811ae0a86d83f7d816e4c30fe about-fedora-9.0.2.tar.gz +fb2b9eb51f08fdf85fe5bd1d3d67a22d fedora-release-notes-9.0.2.tar.gz +ffe4fb3cd03153b7d4a193af55f90aa6 homepage-9.0.2.tar.gz +5c2ea2b881b6fa27bc20288cce070e30 readme-live-image-9.0.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 01:15:21 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 20 Jul 2008 01:15:21 GMT Subject: rpms/kde-i18n/devel kde-i18n.spec,1.88,1.89 Message-ID: <200807200115.m6K1FLvZ011953@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-i18n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11909/devel Modified Files: kde-i18n.spec Log Message: * Sun Jul 20 2008 Kevin Kofler 1:3.5.9-8 - also remove kpovmodeler translations on F9+ (#454458) Index: kde-i18n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-i18n/devel/kde-i18n.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- kde-i18n.spec 25 Jun 2008 16:25:31 -0000 1.88 +++ kde-i18n.spec 20 Jul 2008 01:14:33 -0000 1.89 @@ -6,7 +6,7 @@ Name: kde-i18n Epoch: 1 Version: 3.5.9 -Release: 7%{?dist} +Release: 8%{?dist} # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. License: GFDL @@ -1245,6 +1245,7 @@ rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/validatorsplugin.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/webarchiver.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksig.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpovmodeler.mo # remove docs which conflict with KDE 4 extragear rm -rf %{buildroot}%{_docdir}/HTML/*/kcoloredit @@ -1253,6 +1254,7 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/kmid rm -rf %{buildroot}%{_docdir}/HTML/*/konq-plugins rm -rf %{buildroot}%{_docdir}/HTML/*/ksig + rm -rf %{buildroot}%{_docdir}/HTML/*/kpovmodeler # remove obsolete KDE 3 application data translations rm -rf %{buildroot}%{_datadir}/apps @@ -1791,10 +1793,13 @@ %changelog -* Wed Jun 25 2008 Than Ngo 3.5.9-7 +* Sun Jul 20 2008 Kevin Kofler 1:3.5.9-8 +- also remove kpovmodeler translations on F9+ (#454458) + +* Wed Jun 25 2008 Than Ngo 1:3.5.9-7 - bump release because of Koji failure -* Mon Jun 23 2008 Than Ngo 3.5.9-6 +* Mon Jun 23 2008 Than Ngo 1:3.5.9-6 - on F9+, remove documentation which conflicts with kde-l10n rh#452391 * Fri Apr 18 2008 Kevin Kofler 1:3.5.9-5 From fedora-extras-commits at redhat.com Sun Jul 20 01:24:25 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 20 Jul 2008 01:24:25 GMT Subject: rpms/fedora-release-notes/F-9 fedora-release-notes.spec,1.33,1.34 Message-ID: <200807200124.m6K1OPHl012509@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/fedora-release-notes/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12481 Modified Files: fedora-release-notes.spec Log Message: Fix missing popd in spec file Index: fedora-release-notes.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-9/fedora-release-notes.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fedora-release-notes.spec 20 Jul 2008 00:27:59 -0000 1.33 +++ fedora-release-notes.spec 20 Jul 2008 01:23:39 -0000 1.34 @@ -70,6 +70,7 @@ L=`echo ${F} | %{__sed} 's/README-\(.*\)\.txt/\1/'` install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme/${L}/${F} done +popd pushd README-BURNING-ISOS-%{version}/ for F in README-BURNING-ISOS-*.txt; do L=`echo ${F} | %{__sed} 's/README-BURNING-ISOS-\(.*\)\.txt/\1/'` From fedora-extras-commits at redhat.com Sun Jul 20 01:39:09 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Sun, 20 Jul 2008 01:39:09 GMT Subject: rpms/gnofract4d/F-8 .cvsignore, 1.8, 1.9 gnofract4d.spec, 1.17, 1.18 sources, 1.8, 1.9 Message-ID: <200807200139.m6K1d9LK012819@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/gnofract4d/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12735/F-8 Modified Files: .cvsignore gnofract4d.spec sources Log Message: Update to 3.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 16 Feb 2008 18:04:01 -0000 1.8 +++ .cvsignore 20 Jul 2008 01:37:47 -0000 1.9 @@ -1 +1 @@ -gnofract4d-3.8.tar.gz +gnofract4d-3.9.tar.gz Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/F-8/gnofract4d.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnofract4d.spec 16 Feb 2008 18:04:01 -0000 1.17 +++ gnofract4d.spec 20 Jul 2008 01:37:47 -0000 1.18 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gnofract4d -Version: 3.8 +Version: 3.9 Release: 1%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics @@ -85,6 +85,9 @@ %{python_sitearch}/fractutils/ %changelog +* Sat Jul 19 2008 Stewart Adam - 3.9-1 +- Update to 3.9 + * Sat Feb 16 2008 Stewart Adam - 3.8-1 - Update to 3.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 16 Feb 2008 18:04:01 -0000 1.8 +++ sources 20 Jul 2008 01:37:47 -0000 1.9 @@ -1 +1 @@ -a274cc2223e3a3d09aebe7b100edb937 gnofract4d-3.8.tar.gz +16eefa12f488bb6d06e394cf93d7e784 gnofract4d-3.9.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 01:39:11 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Sun, 20 Jul 2008 01:39:11 GMT Subject: rpms/gnofract4d/F-9 .cvsignore, 1.8, 1.9 gnofract4d.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200807200139.m6K1dB7S012826@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/gnofract4d/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12735/F-9 Modified Files: .cvsignore gnofract4d.spec sources Log Message: Update to 3.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 16 Feb 2008 18:04:10 -0000 1.8 +++ .cvsignore 20 Jul 2008 01:38:09 -0000 1.9 @@ -1 +1 @@ -gnofract4d-3.8.tar.gz +gnofract4d-3.9.tar.gz Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/F-9/gnofract4d.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnofract4d.spec 16 Feb 2008 18:04:10 -0000 1.16 +++ gnofract4d.spec 20 Jul 2008 01:38:09 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gnofract4d -Version: 3.8 +Version: 3.9 Release: 1%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics @@ -86,6 +86,9 @@ %{python_sitearch}/fractutils/ %changelog +* Sat Jul 19 2008 Stewart Adam - 3.9-1 +- Update to 3.9 + * Sat Feb 16 2008 Stewart Adam - 3.8-1 - Update to 3.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 16 Feb 2008 18:04:10 -0000 1.8 +++ sources 20 Jul 2008 01:38:09 -0000 1.9 @@ -1 +1 @@ -a274cc2223e3a3d09aebe7b100edb937 gnofract4d-3.8.tar.gz +16eefa12f488bb6d06e394cf93d7e784 gnofract4d-3.9.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 01:39:34 2008 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Sun, 20 Jul 2008 01:39:34 GMT Subject: rpms/gnofract4d/devel .cvsignore, 1.8, 1.9 gnofract4d.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200807200139.m6K1dYmQ012844@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12735/devel Modified Files: .cvsignore gnofract4d.spec sources Log Message: Update to 3.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 16 Feb 2008 18:04:10 -0000 1.8 +++ .cvsignore 20 Jul 2008 01:38:41 -0000 1.9 @@ -1 +1 @@ -gnofract4d-3.8.tar.gz +gnofract4d-3.9.tar.gz Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnofract4d.spec 16 Feb 2008 18:04:10 -0000 1.16 +++ gnofract4d.spec 20 Jul 2008 01:38:41 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gnofract4d -Version: 3.8 +Version: 3.9 Release: 1%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics @@ -86,6 +86,9 @@ %{python_sitearch}/fractutils/ %changelog +* Sat Jul 19 2008 Stewart Adam - 3.9-1 +- Update to 3.9 + * Sat Feb 16 2008 Stewart Adam - 3.8-1 - Update to 3.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 16 Feb 2008 18:04:10 -0000 1.8 +++ sources 20 Jul 2008 01:38:41 -0000 1.9 @@ -1 +1 @@ -a274cc2223e3a3d09aebe7b100edb937 gnofract4d-3.8.tar.gz +16eefa12f488bb6d06e394cf93d7e784 gnofract4d-3.9.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 02:34:19 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sun, 20 Jul 2008 02:34:19 GMT Subject: rpms/joda-time/devel .cvsignore, 1.3, 1.4 joda-time.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807200234.m6K2YJMK020649@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joda-time/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618 Modified Files: .cvsignore joda-time.spec sources Log Message: Bump for tzdata2008d. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jun 2008 20:45:32 -0000 1.3 +++ .cvsignore 20 Jul 2008 02:33:34 -0000 1.4 @@ -1,3 +1,2 @@ joda-time-1.5.2-src.tar.gz -tzdata2008b.tar.gz -tzdata2008c.tar.gz +tzdata2008d.tar.gz Index: joda-time.spec =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/devel/joda-time.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- joda-time.spec 9 Jun 2008 20:45:32 -0000 1.2 +++ joda-time.spec 20 Jul 2008 02:33:34 -0000 1.3 @@ -1,9 +1,9 @@ -%define tzversion tzdata2008c +%define tzversion tzdata2008d Name: joda-time Version: 1.5.2 -Release: 6.%{tzversion}%{?dist} +Release: 7.%{tzversion}%{?dist} Summary: Java date and time API Group: Development/Libraries @@ -96,6 +96,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.5.2-7.tzdata2008d +- New version with new tzdata (2008d). + * Mon Jun 9 2008 Conrad Meyer - 1.5.2-6.tzdata2008c - New version with new tzdata (2008c). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jun 2008 20:45:32 -0000 1.3 +++ sources 20 Jul 2008 02:33:34 -0000 1.4 @@ -1,3 +1,2 @@ 56408d4f4328556d897f8dc06ae3bdcf joda-time-1.5.2-src.tar.gz -dbeb9a327bbff77ab4078488b8c5323a tzdata2008b.tar.gz -e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz +f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 02:41:23 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sun, 20 Jul 2008 02:41:23 GMT Subject: rpms/joda-time/F-8 .cvsignore, 1.3, 1.4 joda-time.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807200241.m6K2fNDd020901@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joda-time/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20854 Modified Files: .cvsignore joda-time.spec sources Log Message: Bump to tzdata2008d. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jun 2008 21:00:35 -0000 1.3 +++ .cvsignore 20 Jul 2008 02:40:37 -0000 1.4 @@ -1,3 +1,2 @@ joda-time-1.5.2-src.tar.gz -tzdata2008b.tar.gz -tzdata2008c.tar.gz +tzdata2008d.tar.gz Index: joda-time.spec =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/F-8/joda-time.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- joda-time.spec 9 Jun 2008 21:00:35 -0000 1.2 +++ joda-time.spec 20 Jul 2008 02:40:37 -0000 1.3 @@ -1,9 +1,9 @@ -%define tzversion tzdata2008c +%define tzversion tzdata2008d Name: joda-time Version: 1.5.2 -Release: 6.%{tzversion}%{?dist} +Release: 7.%{tzversion}%{?dist} Summary: Java date and time API Group: Development/Libraries @@ -96,6 +96,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.5.2-7.tzdata2008d +- New version with new tzdata (2008d). + * Mon Jun 9 2008 Conrad Meyer - 1.5.2-6.tzdata2008c - New version with new tzdata (2008c). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jun 2008 21:00:35 -0000 1.3 +++ sources 20 Jul 2008 02:40:37 -0000 1.4 @@ -1,3 +1,2 @@ 56408d4f4328556d897f8dc06ae3bdcf joda-time-1.5.2-src.tar.gz -dbeb9a327bbff77ab4078488b8c5323a tzdata2008b.tar.gz -e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz +f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 02:46:14 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Sun, 20 Jul 2008 02:46:14 GMT Subject: rpms/joda-time/F-9 .cvsignore, 1.3, 1.4 joda-time.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807200246.m6K2kEMW021100@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joda-time/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21069 Modified Files: .cvsignore joda-time.spec sources Log Message: Bump to tzdata2008d. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jun 2008 21:00:35 -0000 1.3 +++ .cvsignore 20 Jul 2008 02:45:30 -0000 1.4 @@ -1,3 +1,2 @@ joda-time-1.5.2-src.tar.gz -tzdata2008b.tar.gz -tzdata2008c.tar.gz +tzdata2008d.tar.gz Index: joda-time.spec =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/F-9/joda-time.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- joda-time.spec 9 Jun 2008 21:00:35 -0000 1.2 +++ joda-time.spec 20 Jul 2008 02:45:30 -0000 1.3 @@ -1,9 +1,9 @@ -%define tzversion tzdata2008c +%define tzversion tzdata2008d Name: joda-time Version: 1.5.2 -Release: 6.%{tzversion}%{?dist} +Release: 7.%{tzversion}%{?dist} Summary: Java date and time API Group: Development/Libraries @@ -96,6 +96,9 @@ %changelog +* Sat Jul 19 2008 Conrad Meyer - 1.5.2-7.tzdata2008d +- New version with new tzdata (2008d). + * Mon Jun 9 2008 Conrad Meyer - 1.5.2-6.tzdata2008c - New version with new tzdata (2008c). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/joda-time/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jun 2008 21:00:35 -0000 1.3 +++ sources 20 Jul 2008 02:45:30 -0000 1.4 @@ -1,3 +1,2 @@ 56408d4f4328556d897f8dc06ae3bdcf joda-time-1.5.2-src.tar.gz -dbeb9a327bbff77ab4078488b8c5323a tzdata2008b.tar.gz -e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz +f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 02:51:58 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 20 Jul 2008 02:51:58 GMT Subject: rpms/nemiver/devel nemiver-get_svn.sh, NONE, 1.1 .cvsignore, 1.7, 1.8 nemiver.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200807200251.m6K2pwYT021256@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/nemiver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21214 Modified Files: .cvsignore nemiver.spec sources Added Files: nemiver-get_svn.sh Log Message: Update to SVN 889; fix typo in %changelog. --- NEW FILE nemiver-get_svn.sh --- #!/bin/bash ## Author: Peter Gordon ## This script is placed into the public domain. ## What version and SVN revision is this based on or a snapshot of? NEMIVER_VERSION=0.5.5 NEMIVER_SVN_REVISION=889 ## Where should the built tarball go? NEMIVER_TARBALL_DEST=$HOME/rpmbuild/SOURCES svn export -r ${NEMIVER_SVN_REVISION} http://svn.gnome.org/svn/nemiver/trunk \ nemiver-${NEMIVER_VERSION} pushd nemiver-${NEMIVER_VERSION} ./autogen.sh popd tar cvf nemiver-${NEMIVER_VERSION}-svn${NEMIVER_SVN_REVISION}.tar.bz2 nemiver-${NEMIVER_VERSION} mv nemiver-${NEMIVER_VERSION}-svn${NEMIVER_SVN_REVISION}.tar.bz2 ${NEMIVER_TARBALL_DEST}/ rm -rf nemiver-${NEMIVER_VERSION} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Jun 2008 00:08:52 -0000 1.7 +++ .cvsignore 20 Jul 2008 02:51:09 -0000 1.8 @@ -1 +1 @@ -nemiver-0.5.4.tar.bz2 +nemiver-0.5.5-svn889.tar.bz2 Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nemiver.spec 28 Jun 2008 00:08:52 -0000 1.12 +++ nemiver.spec 20 Jul 2008 02:51:09 -0000 1.13 @@ -1,13 +1,20 @@ +%define svn_revision svn889 + Name: nemiver -Version: 0.5.4 -Release: 1%{?dist} +Version: 0.5.5 +Release: 0.1.%{?svn_revision}%{?dist} Summary: A C/C++ Debugger for GNOME - point, click, debug! Group: Development/Debuggers License: GPLv2+ URL: http://home.gna.org/nemiver/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2 +## We're building an SVN snapshot, so there is no canonical source URL. Please +## use the included get_svn.sh script (Source1) to reproduce the source +## tarball if needed. +#Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}-%{svn_revision}.tar.bz2 +Source1: %{name}-get_svn.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -152,6 +159,13 @@ %changelog +* Sat Jul 19 2008 Peter Gordon - 0.5.5-0.1.svn889 +- Update to new upstream snapshot (SVN 889): increased performance when + stepping in big applications like WebKit, ability to call arbitrary functions + in the inferior process being debugged and support for conditional + breakpoints, and loads of bug-fixes. Sweet! +- Fix typo in previous %%changelog entry. + * Fri Jun 27 2008 Peter Gordon - 0.5.4-1 - Update to new upstream release (0.5.4) - Rename -devel subpackage to -headers and adjust the %%description @@ -160,7 +174,7 @@ package due to its additional *-devel dependencies. Finally, upstream has said that nothing should really be using the libnemivercommon API yet anyway.) -- Drop the libnemiver global library patch (fixed upstream)L +- Drop the libnemiver global library patch (fixed upstream) - make-libnemivercommon-global-lib.patch * Mon May 26 2008 Peter Gordon - 0.5.3-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Jun 2008 00:08:52 -0000 1.7 +++ sources 20 Jul 2008 02:51:09 -0000 1.8 @@ -1 +1 @@ -5fa4df82e74810053c91fac121617190 nemiver-0.5.4.tar.bz2 +9546e21b05a0cabbbd54151e149f4524 nemiver-0.5.5-svn889.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 20 03:56:16 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sun, 20 Jul 2008 03:56:16 GMT Subject: rpms/glib2/F-9 .cvsignore, 1.88, 1.89 glib2.spec, 1.170, 1.171 sources, 1.90, 1.91 Message-ID: <200807200356.m6K3uGTO030132@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30103 Modified Files: .cvsignore glib2.spec sources Log Message: 2.16.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glib2/F-9/.cvsignore,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- .cvsignore 2 Jul 2008 02:45:48 -0000 1.88 +++ .cvsignore 20 Jul 2008 03:55:24 -0000 1.89 @@ -1 +1 @@ -glib-2.16.4.tar.bz2 +glib-2.16.5.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/F-9/glib2.spec,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- glib2.spec 2 Jul 2008 02:45:48 -0000 1.170 +++ glib2.spec 20 Jul 2008 03:55:24 -0000 1.171 @@ -2,7 +2,7 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.16.4 +Version: 2.16.5 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -128,6 +128,9 @@ %{_libdir}/lib*.a %changelog +* Sat Jul 19 2008 Matthias Clasen - 2.16.5-1 +- Update to 2.16.5 + * Tue Jul 1 2008 Matthias Clasen - 2.16.4-1 - Update to 2.16.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glib2/F-9/sources,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sources 2 Jul 2008 02:45:48 -0000 1.90 +++ sources 20 Jul 2008 03:55:24 -0000 1.91 @@ -1 +1 @@ -2ab79b3c93258827cc6ea8ee50128e49 glib-2.16.4.tar.bz2 +039f02d47d4071322a3f00abf031e5d9 glib-2.16.5.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 20 03:58:36 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 20 Jul 2008 03:58:36 GMT Subject: rpms/thunar-shares/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 thunar-shares.spec, 1.3, 1.4 Message-ID: <200807200358.m6K3walj030240@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/thunar-shares/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30196 Modified Files: .cvsignore sources thunar-shares.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Jul 2008 19:35:57 -0000 1.4 +++ .cvsignore 20 Jul 2008 03:57:52 -0000 1.5 @@ -1 +1 @@ -thunar-shares-0.13.tar.gz +thunar-shares-0.16.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Jul 2008 19:35:57 -0000 1.4 +++ sources 20 Jul 2008 03:57:52 -0000 1.5 @@ -1 +1 @@ -cce8095abedb3194b7481a8970371abd thunar-shares-0.13.tar.gz +2b47c30df2de21b94efa22310a3f2cd4 thunar-shares-0.16.tar.gz Index: thunar-shares.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/devel/thunar-shares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thunar-shares.spec 11 Jul 2008 19:35:57 -0000 1.3 +++ thunar-shares.spec 20 Jul 2008 03:57:52 -0000 1.4 @@ -1,7 +1,7 @@ %define thunarver 0.9.0 Name: thunar-shares -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Thunar file manager extension to share files using Samba @@ -13,7 +13,7 @@ BuildRequires: Thunar-devel >= %{thunarver}, libxfcegui4-devel >= 4.4.0 BuildRequires: libxml2-devel, gettext, perl(XML::Parser) -Requires: Thunar >= %{thunarver}, samba +Requires: Thunar >= %{thunarver}, samba >= 3.0.22 %description A Thunar file manager extension to share files using Samba. The backend is @@ -33,6 +33,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/thunarx-1/%{name}.la +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +54,7 @@ fi -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_libdir}/thunarx-1/%{name}.so @@ -60,6 +62,9 @@ %changelog +* Sun Jul 20 2008 Christoph Wickert - 0.16-1 +- Update to 0.16 + * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 From fedora-extras-commits at redhat.com Sun Jul 20 04:15:15 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 20 Jul 2008 04:15:15 GMT Subject: rpms/thunar-shares/F-8 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 thunar-shares.spec, 1.3, 1.4 Message-ID: <200807200415.m6K4FFGB005327@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/thunar-shares/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5271/F-8 Modified Files: .cvsignore sources thunar-shares.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Jul 2008 21:57:34 -0000 1.4 +++ .cvsignore 20 Jul 2008 04:14:31 -0000 1.5 @@ -1 +1 @@ -thunar-shares-0.13.tar.gz +thunar-shares-0.16.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Jul 2008 21:57:34 -0000 1.4 +++ sources 20 Jul 2008 04:14:31 -0000 1.5 @@ -1 +1 @@ -cce8095abedb3194b7481a8970371abd thunar-shares-0.13.tar.gz +2b47c30df2de21b94efa22310a3f2cd4 thunar-shares-0.16.tar.gz Index: thunar-shares.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-8/thunar-shares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thunar-shares.spec 11 Jul 2008 21:57:34 -0000 1.3 +++ thunar-shares.spec 20 Jul 2008 04:14:31 -0000 1.4 @@ -1,7 +1,7 @@ %define thunarver 0.9.0 Name: thunar-shares -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Thunar file manager extension to share files using Samba @@ -13,7 +13,7 @@ BuildRequires: Thunar-devel >= %{thunarver}, libxfcegui4-devel >= 4.4.0 BuildRequires: libxml2-devel, gettext, perl(XML::Parser) -Requires: Thunar >= %{thunarver}, samba +Requires: Thunar >= %{thunarver}, samba >= 3.0.22 %description A Thunar file manager extension to share files using Samba. The backend is @@ -33,6 +33,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/thunarx-1/%{name}.la +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +54,7 @@ fi -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_libdir}/thunarx-1/%{name}.so @@ -60,6 +62,9 @@ %changelog +* Sun Jul 20 2008 Christoph Wickert - 0.16-1 +- Update to 0.16 + * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 From fedora-extras-commits at redhat.com Sun Jul 20 04:15:30 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 20 Jul 2008 04:15:30 GMT Subject: rpms/thunar-shares/F-9 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 thunar-shares.spec, 1.3, 1.4 Message-ID: <200807200415.m6K4FUfO005332@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/thunar-shares/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5271/F-9 Modified Files: .cvsignore sources thunar-shares.spec Log Message: * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Jul 2008 21:57:52 -0000 1.4 +++ .cvsignore 20 Jul 2008 04:14:45 -0000 1.5 @@ -1 +1 @@ -thunar-shares-0.13.tar.gz +thunar-shares-0.16.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Jul 2008 21:57:52 -0000 1.4 +++ sources 20 Jul 2008 04:14:45 -0000 1.5 @@ -1 +1 @@ -cce8095abedb3194b7481a8970371abd thunar-shares-0.13.tar.gz +2b47c30df2de21b94efa22310a3f2cd4 thunar-shares-0.16.tar.gz Index: thunar-shares.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunar-shares/F-9/thunar-shares.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thunar-shares.spec 11 Jul 2008 21:57:52 -0000 1.3 +++ thunar-shares.spec 20 Jul 2008 04:14:45 -0000 1.4 @@ -1,7 +1,7 @@ %define thunarver 0.9.0 Name: thunar-shares -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Thunar file manager extension to share files using Samba @@ -13,7 +13,7 @@ BuildRequires: Thunar-devel >= %{thunarver}, libxfcegui4-devel >= 4.4.0 BuildRequires: libxml2-devel, gettext, perl(XML::Parser) -Requires: Thunar >= %{thunarver}, samba +Requires: Thunar >= %{thunarver}, samba >= 3.0.22 %description A Thunar file manager extension to share files using Samba. The backend is @@ -33,6 +33,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/thunarx-1/%{name}.la +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +54,7 @@ fi -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_libdir}/thunarx-1/%{name}.so @@ -60,6 +62,9 @@ %changelog +* Sun Jul 20 2008 Christoph Wickert - 0.16-1 +- Update to 0.16 + * Fri Jul 11 2008 Christoph Wickert - 0.13-1 - Update to 0.13 From fedora-extras-commits at redhat.com Sun Jul 20 05:20:19 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 20 Jul 2008 05:20:19 GMT Subject: rpms/python-fedora/devel .cvsignore, 1.17, 1.18 python-fedora.spec, 1.20, 1.21 sources, 1.18, 1.19 Message-ID: <200807200520.m6K5KJ2i011816@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11747 Modified Files: .cvsignore python-fedora.spec sources Log Message: 0.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 15 Jul 2008 04:36:28 -0000 1.17 +++ .cvsignore 20 Jul 2008 05:19:32 -0000 1.18 @@ -1 +1 @@ -python-fedora-0.3.1.tar.gz +python-fedora-0.3.2.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- python-fedora.spec 15 Jul 2008 04:39:21 -0000 1.20 +++ python-fedora.spec 20 Jul 2008 05:19:32 -0000 1.21 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -17,6 +17,7 @@ Requires: python-bugzilla Requires: python-feedparser Requires: python-sqlalchemy +Requires: koji Provides: python-fedora-infrastructure = %{version}-%{release} Obsoletes: python-fedora-infrastructure < %{version}-%{release} @@ -49,6 +50,10 @@ %{python_sitelib}/* %changelog +* Sun Jul 20 2008 Luke Macken - 0.3.2-1 +- Latest upstream release +- Add koji to the Requires + * Mon Jul 14 2008 Luke Macken - 0.3.1-1 - New upstream bugfix release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 15 Jul 2008 04:36:28 -0000 1.18 +++ sources 20 Jul 2008 05:19:32 -0000 1.19 @@ -1 +1 @@ -770f93074a7fcbdbc7871d0214e41bb9 python-fedora-0.3.1.tar.gz +620153d0c42d5a9030239c01e29ce1d8 python-fedora-0.3.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 05:30:22 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 20 Jul 2008 05:30:22 GMT Subject: rpms/python-fedora/F-8 python-fedora.spec,1.14,1.15 Message-ID: <200807200530.m6K5UMZE012354@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12301 Modified Files: python-fedora.spec Log Message: 0.3.2 Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/python-fedora.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-fedora.spec 15 Jul 2008 04:45:38 -0000 1.14 +++ python-fedora.spec 20 Jul 2008 05:29:28 -0000 1.15 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -17,6 +17,7 @@ Requires: python-bugzilla Requires: python-feedparser Requires: python-sqlalchemy +Requires: koji Provides: python-fedora-infrastructure = %{version}-%{release} Obsoletes: python-fedora-infrastructure < %{version}-%{release} @@ -49,6 +50,10 @@ %{python_sitelib}/* %changelog +* Sun Jul 20 2008 Luke Macken - 0.3.2-1 +- Latest upstream release +- Add koji to the Requires + * Mon Jul 14 2008 Luke Macken - 0.3.1-1 - New upstream bugfix release From fedora-extras-commits at redhat.com Sun Jul 20 05:30:49 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 20 Jul 2008 05:30:49 GMT Subject: rpms/python-fedora/F-8 .cvsignore,1.12,1.13 sources,1.14,1.15 Message-ID: <200807200530.m6K5Unpn012364@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329 Modified Files: .cvsignore sources Log Message: 0.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 20 May 2008 01:02:19 -0000 1.12 +++ .cvsignore 20 Jul 2008 05:30:01 -0000 1.13 @@ -1 +1 @@ -python-fedora-0.2.99.11.1.tar.gz +python-fedora-0.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Jul 2008 04:45:38 -0000 1.14 +++ sources 20 Jul 2008 05:30:01 -0000 1.15 @@ -1 +1 @@ -770f93074a7fcbdbc7871d0214e41bb9 python-fedora-0.3.1.tar.gz +620153d0c42d5a9030239c01e29ce1d8 python-fedora-0.3.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 05:35:03 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 20 Jul 2008 05:35:03 GMT Subject: rpms/python-fedora/F-9 .cvsignore, 1.14, 1.15 python-fedora.spec, 1.19, 1.20 sources, 1.16, 1.17 Message-ID: <200807200535.m6K5Z37h012520@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12496 Modified Files: .cvsignore python-fedora.spec sources Log Message: 0.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 20 May 2008 01:02:41 -0000 1.14 +++ .cvsignore 20 Jul 2008 05:34:08 -0000 1.15 @@ -1 +1 @@ -python-fedora-0.2.99.11.1.tar.gz +python-fedora-0.3.2.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- python-fedora.spec 15 Jul 2008 04:45:58 -0000 1.19 +++ python-fedora.spec 20 Jul 2008 05:34:08 -0000 1.20 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -17,6 +17,7 @@ Requires: python-bugzilla Requires: python-feedparser Requires: python-sqlalchemy +Requires: koji Provides: python-fedora-infrastructure = %{version}-%{release} Obsoletes: python-fedora-infrastructure < %{version}-%{release} @@ -49,6 +50,10 @@ %{python_sitelib}/* %changelog +* Sun Jul 20 2008 Luke Macken - 0.3.2-1 +- Latest upstream release +- Add koji to the Requires + * Mon Jul 14 2008 Luke Macken - 0.3.1-1 - New upstream bugfix release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 15 Jul 2008 04:45:58 -0000 1.16 +++ sources 20 Jul 2008 05:34:08 -0000 1.17 @@ -1 +1 @@ -770f93074a7fcbdbc7871d0214e41bb9 python-fedora-0.3.1.tar.gz +620153d0c42d5a9030239c01e29ce1d8 python-fedora-0.3.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 09:34:07 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Sun, 20 Jul 2008 09:34:07 GMT Subject: rpms/coq/devel coq.spec,1.1,1.2 import.log,1.1,1.2 Message-ID: <200807200934.m6K9Y7qX019922@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19776/devel Modified Files: coq.spec import.log Log Message: Fixing version numbers for F-8 < F-9 < F-10. (Next time will minor bump F-8 to <>.1 for less effort.) Index: coq.spec =================================================================== RCS file: /cvs/pkgs/rpms/coq/devel/coq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coq.spec 16 Jul 2008 18:49:27 -0000 1.1 +++ coq.spec 20 Jul 2008 09:33:24 -0000 1.2 @@ -18,13 +18,14 @@ # # It appears as though ALL of these are necessary to prevent unwanted # stripping + %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %define _enable_debug_package 0 %define debug_package %{nil} Name: coq Version: 8.1pl3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Coq proof management system Group: Applications/Engineering @@ -46,8 +47,15 @@ Patch2: makefile-strip.patch Patch3: check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, texlive-latex, texlive-texmf -# ExcludeArch: ppc64 +BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs + +%if 0%{?fedora} < 9 +BuildRequires: tetex, tetex-latex +# There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8 +ExcludeArch: ppc64 +%else +BuildRequires: texlive-latex, texlive-texmf +%endif %description Coq is a formal proof management system. It allows for the development @@ -284,5 +292,7 @@ %doc README.coq-emacs %changelog +* Thu Jul 17 2008 Alan Dunn 8.1pl3-2 +- Added check for Fedora distribution number to allow for Fedora 8 release. * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/coq/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Jul 2008 18:49:27 -0000 1.1 +++ import.log 20 Jul 2008 09:33:24 -0000 1.2 @@ -1 +1,2 @@ coq-8_1pl3-1_fc9:HEAD:coq-8.1pl3-1.fc9.src.rpm:1216233878 +coq-8_1pl3-2_fc10:HEAD:coq-8.1pl3-2.fc10.src.rpm:1216546261 From fedora-extras-commits at redhat.com Sun Jul 20 09:41:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 20 Jul 2008 09:41:40 GMT Subject: rpms/clisp/devel clisp.spec,1.35,1.36 Message-ID: <200807200941.m6K9feOK020287@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20222 Modified Files: clisp.spec Log Message: Index: clisp.spec =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/clisp.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- clisp.spec 19 Jul 2008 23:10:45 -0000 1.35 +++ clisp.spec 20 Jul 2008 09:40:51 -0000 1.36 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.46 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2 From fedora-extras-commits at redhat.com Sun Jul 20 09:51:09 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 20 Jul 2008 09:51:09 GMT Subject: rpms/xaos/devel config.sub,NONE,1.1 xaos.spec,1.7,1.8 Message-ID: <200807200951.m6K9p9rg020643@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/xaos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20615 Modified Files: xaos.spec Added Files: config.sub Log Message: --- NEW FILE config.sub --- #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA # 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. # Each package is responsible for reporting which valid configurations # it does not support. The user should be able to distinguish # a failure to support a valid configuration from a meaningless # configuration. # The goal of this file is to map all the various variations of a given # machine specification into a single specification in the form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM # or in some cases, the newer four-part form: # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS $0 [OPTION] ALIAS Canonicalize a configuration name. Operation modes: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit Report bugs and patches to ." version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." # Parse command line while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) echo "$timestamp" ; exit ;; --version | -v ) echo "$version" ; exit ;; --help | --h* | -h ) echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. break ;; -* ) echo "$me: invalid option $1$help" exit 1 ;; *local*) # First pass through any local machine types. echo $1 exit ;; * ) break ;; esac done case $# in 0) echo "$me: missing argument$help" >&2 exit 1;; 1) ;; *) echo "$me: too many arguments$help" >&2 exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] then os=`echo $1 | sed 's/.*-/-/'` else os=; fi ;; esac ### Let's recognize common machines as not being operating systems so ### that things like config.sub decstation-3100 work. We also ### recognize some manufacturers as not being operating systems, so we ### can provide default operating systems below. case $os in -sun*os*) # Prevent following clause from handling this invalid input. ;; -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 ;; -scout) ;; -wrs) os=-vxworks basic_machine=$1 ;; -chorusos*) os=-chorusos basic_machine=$1 ;; -chorusrdb) os=-chorusrdb basic_machine=$1 ;; -hiux*) os=-hiuxwe2 ;; -sco6) os=-sco5v6 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -lynx*) os=-lynxos ;; -ptx*) basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; -windowsnt*) os=`echo $os | sed -e 's/windowsnt/winnt/'` ;; -psos*) os=-psos ;; -mint | -mint[0-9]*) basic_machine=m68k-atari os=-mint ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ | mips64vr | mips64vrel \ | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | mt \ | msp430 \ | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; ms1) basic_machine=mt-unknown ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ | mips64vr-* | mips64vrel-* \ | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) basic_machine=i386-unknown os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; a29khif) basic_machine=a29k-amd os=-udi ;; abacus) basic_machine=abacus-unknown ;; adobe68k) basic_machine=m68010-adobe os=-scout ;; alliant | fx80) basic_machine=fx80-alliant ;; altos | altos3068) basic_machine=m68k-altos ;; am29k) basic_machine=a29k-none os=-bsd ;; amd64) basic_machine=x86_64-pc ;; amd64-*) basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl os=-sysv ;; amiga | amiga-*) basic_machine=m68k-unknown ;; amigaos | amigados) basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) basic_machine=m68k-unknown os=-sysv4 ;; apollo68) basic_machine=m68k-apollo os=-sysv ;; apollo68bsd) basic_machine=m68k-apollo os=-bsd ;; aux) basic_machine=m68k-apple os=-aux ;; balance) basic_machine=ns32k-sequent os=-dynix ;; blackfin) basic_machine=bfin-unknown os=-linux ;; blackfin-*) basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; c90) basic_machine=c90-cray os=-unicos ;; convex-c1) basic_machine=c1-convex os=-bsd ;; convex-c2) basic_machine=c2-convex os=-bsd ;; convex-c32) basic_machine=c32-convex os=-bsd ;; convex-c34) basic_machine=c34-convex os=-bsd ;; convex-c38) basic_machine=c38-convex os=-bsd ;; cray | j90) basic_machine=j90-cray os=-unicos ;; craynv) basic_machine=craynv-cray os=-unicosmp ;; cr16) basic_machine=cr16-unknown os=-elf ;; crds | unos) basic_machine=m68k-crds ;; crisv32 | crisv32-* | etraxfs*) basic_machine=crisv32-axis ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; crx) basic_machine=crx-unknown os=-elf ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; decsystem10* | dec10*) basic_machine=pdp10-dec os=-tops10 ;; decsystem20* | dec20*) basic_machine=pdp10-dec os=-tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola ;; delta88) basic_machine=m88k-motorola os=-sysv3 ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx ;; dpx2* | dpx2*-bull) basic_machine=m68k-bull os=-sysv3 ;; ebmon29k) basic_machine=a29k-amd os=-ebmon ;; elxsi) basic_machine=elxsi-elxsi os=-bsd ;; encore | umax | mmax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson os=-ose ;; fx2800) basic_machine=i860-alliant ;; genix) basic_machine=ns32k-ns ;; gmicro) basic_machine=tron-gmicro os=-sysv ;; go32) basic_machine=i386-pc os=-go32 ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; h8300hms) basic_machine=h8300-hitachi os=-hms ;; h8300xray) basic_machine=h8300-hitachi os=-xray ;; h8500hms) basic_machine=h8500-hitachi os=-hms ;; harris) basic_machine=m88k-harris os=-sysv3 ;; hp300-*) basic_machine=m68k-hp ;; hp300bsd) basic_machine=m68k-hp os=-bsd ;; hp300hpux) basic_machine=m68k-hp os=-hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) basic_machine=hppa1.0-hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) basic_machine=hppa1.1-hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp basic_machine=hppa1.1-hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp basic_machine=hppa1.1-hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; hppa-next) os=-nextstep3 ;; hppaosf) basic_machine=hppa1.1-hp os=-osf ;; hppro) basic_machine=hppa1.1-hp os=-proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; i386-vsta | vsta) basic_machine=i386-unknown os=-vsta ;; iris | iris4d) basic_machine=mips-sgi case $os in -irix*) ;; *) os=-irix4 ;; esac ;; isi68 | isi) basic_machine=m68k-isi os=-sysv ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; m88k-omron*) basic_machine=m88k-omron ;; magnum | m3230) basic_machine=mips-mips os=-sysv ;; merlin) basic_machine=ns32k-utek os=-sysv ;; mingw32) basic_machine=i386-pc os=-mingw32 ;; mingw32ce) basic_machine=arm-unknown os=-mingw32ce ;; miniframe) basic_machine=m68000-convergent ;; *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k os=-coff ;; morphos) basic_machine=powerpc-unknown os=-morphos ;; msdos) basic_machine=i386-pc os=-msdos ;; ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; mvs) basic_machine=i370-ibm os=-mvs ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; netbsd386) basic_machine=i386-unknown os=-netbsd ;; netwinder) basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos ;; news1000) basic_machine=m68030-sony os=-newsos ;; news-3600 | risc-news) basic_machine=mips-sony os=-newsos ;; necv70) basic_machine=v70-nec os=-sysv ;; next | m*-next ) basic_machine=m68k-next case $os in -nextstep* ) ;; -ns2*) os=-nextstep2 ;; *) os=-nextstep3 ;; esac ;; nh3000) basic_machine=m68k-harris os=-cxux ;; nh[45]000) basic_machine=m88k-harris os=-cxux ;; nindy960) basic_machine=i960-intel os=-nindy ;; mon960) basic_machine=i960-intel os=-mon960 ;; nonstopux) basic_machine=mips-compaq os=-nonstopux ;; np1) basic_machine=np1-gould ;; nsr-tandem) basic_machine=nsr-tandem ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) basic_machine=powerpc-ibm os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose ;; os68k) basic_machine=m68k-none os=-os68k ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; paragon) basic_machine=i860-intel os=-osf ;; parisc) basic_machine=hppa-unknown os=-linux ;; parisc-*) basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; pbd) basic_machine=sparc-tti ;; pbb) basic_machine=m68k-tti ;; pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pc98) basic_machine=i386-pc ;; pc98-*) basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; pentium4) basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentium4-*) basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm ;; pw32) basic_machine=i586-unknown os=-pw32 ;; rdos) basic_machine=i386-pc os=-rdos ;; rom68k) basic_machine=m68k-rom68k os=-coff ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; s390 | s390-*) basic_machine=s390-ibm ;; s390x | s390x-*) basic_machine=s390x-ibm ;; sa29200) basic_machine=a29k-amd os=-udi ;; sb1) basic_machine=mipsisa64sb1-unknown ;; sb1el) basic_machine=mipsisa64sb1el-unknown ;; sde) basic_machine=mipsisa32-sde os=-elf ;; sei) basic_machine=mips-sei os=-seiux ;; sequent) basic_machine=i386-sequent ;; sh) basic_machine=sh-hitachi os=-hms ;; sh5el) basic_machine=sh5le-unknown ;; sh64) basic_machine=sh64-unknown ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; sps7) basic_machine=m68k-bull os=-sysv2 ;; spur) basic_machine=spur-unknown ;; st2000) basic_machine=m68k-tandem ;; stratus) basic_machine=i860-stratus os=-sysv4 ;; sun2) basic_machine=m68000-sun ;; sun2os3) basic_machine=m68000-sun os=-sunos3 ;; sun2os4) basic_machine=m68000-sun os=-sunos4 ;; sun3os3) basic_machine=m68k-sun os=-sunos3 ;; sun3os4) basic_machine=m68k-sun os=-sunos4 ;; sun4os3) basic_machine=sparc-sun os=-sunos3 ;; sun4os4) basic_machine=sparc-sun os=-sunos4 ;; sun4sol2) basic_machine=sparc-sun os=-solaris2 ;; sun3 | sun3-*) basic_machine=m68k-sun ;; sun4) basic_machine=sparc-sun ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; sv1) basic_machine=sv1-cray os=-unicos ;; symmetry) basic_machine=i386-sequent os=-dynix ;; t3e) basic_machine=alphaev5-cray os=-unicos ;; t90) basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; tic55x | c55x*) basic_machine=tic55x-unknown os=-coff ;; tic6x | c6x*) basic_machine=tic6x-unknown os=-coff ;; tile*) basic_machine=tile-unknown os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; toad1) basic_machine=pdp10-xkl os=-tops20 ;; tower | tower-32) basic_machine=m68k-ncr ;; tpf) basic_machine=s390x-ibm os=-tpf ;; udi29k) basic_machine=a29k-amd os=-udi ;; ultra3) basic_machine=a29k-nyu os=-sym1 ;; v810 | necv810) basic_machine=v810-nec os=-none ;; vaxv) basic_machine=vax-dec os=-sysv ;; vms) basic_machine=vax-dec os=-vms ;; vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; vxworks960) basic_machine=i960-wrs os=-vxworks ;; vxworks68) basic_machine=m68k-wrs os=-vxworks ;; vxworks29k) basic_machine=a29k-wrs os=-vxworks ;; w65*) basic_machine=w65-wdc os=-none ;; w89k-*) basic_machine=hppa1.1-winbond os=-proelf ;; xbox) basic_machine=i686-pc os=-mingw32 ;; xps | xps100) basic_machine=xps100-honeywell ;; ymp) basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim ;; none) basic_machine=none-none os=-none ;; # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. w89k) basic_machine=hppa1.1-winbond ;; op50n) basic_machine=hppa1.1-oki ;; op60c) basic_machine=hppa1.1-oki ;; romp) basic_machine=romp-ibm ;; mmix) basic_machine=mmix-knuth ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; pdp10) # there are many clones, so DEC is not a safe bet basic_machine=pdp10-unknown ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) basic_machine=cydra-cydrome ;; orion) basic_machine=orion-highlevel ;; orion105) basic_machine=clipper-highlevel ;; mac | mpw | mac-mpw) basic_machine=m68k-apple ;; pmac | pmac-mpw) basic_machine=powerpc-apple ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` ;; *-commodore*) basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` ;; *) ;; esac # Decode manufacturer-specific aliases for certain operating systems. if [ x"$os" != x"" ] then case $os in # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -solaris) os=-solaris2 ;; -svr4*) os=-sysv4 ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # First accept the basic system types. # The portable systems comes first. # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) case $basic_machine in x86-* | i*86-*) ;; *) os=-nto$os ;; esac ;; -nto-qnx*) ;; -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) os=`echo $os | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition ;; -os400*) os=-os400 ;; -wince*) os=-wince ;; -osfrose*) os=-osfrose ;; -osf*) os=-osf ;; -utek*) os=-bsd ;; -dynix*) os=-bsd ;; -acis*) os=-aos ;; -atheos*) os=-atheos ;; -syllable*) os=-syllable ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; -nova*) os=-rtmk-nova ;; -ns2 ) os=-nextstep2 ;; -nsk*) os=-nsk ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; -sinix*) os=-sysv4 ;; -tpf*) os=-tpf ;; -triton*) os=-sysv3 ;; -oss*) os=-sysv3 ;; -svr4) os=-sysv4 ;; -svr3) os=-sysv3 ;; -sysvr4) os=-sysv4 ;; # This must come after -sysvr4. -sysv*) ;; -ose*) os=-ose ;; -es1800*) os=-ose ;; -xenix) os=-xenix ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; -aros*) os=-aros ;; -kaos*) os=-kaos ;; -zvmoe) os=-zvmoe ;; -none) ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 exit 1 ;; esac else # Here we handle the default operating systems that come with various machines. # The value should be what the vendor currently ships out the door with their # machine or put another way, the most popular os provided with the machine. # Note that if you're going to try to match "-MANUFACTURER" here (say, # "-sun"), then you have to tell the case statement up towards the top # that MANUFACTURER isn't an operating system. Otherwise, code above # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. case $basic_machine in score-*) os=-elf ;; spu-*) os=-elf ;; *-acorn) os=-riscix1.2 ;; arm*-rebel) os=-linux ;; arm*-semi) os=-aout ;; c4x-* | tic4x-*) os=-coff ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; pdp11-*) os=-none ;; *-dec | vax-*) os=-ultrix4.2 ;; m68*-apollo) os=-domain ;; i386-sun) os=-sunos4.0.2 ;; m68000-sun) os=-sunos3 # This also exists in the configure program, but was not the # default. # os=-sunos4 ;; m68*-cisco) os=-aout ;; mep-*) os=-elf ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; or32-*) os=-coff ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; sparc-* | *-sun) os=-sunos4.1.1 ;; *-be) os=-beos ;; *-haiku) os=-haiku ;; *-ibm) os=-aix ;; *-knuth) os=-mmixware ;; *-wec) os=-proelf ;; *-winbond) os=-proelf ;; *-oki) os=-proelf ;; *-hp) os=-hpux ;; *-hitachi) os=-hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) os=-sysv ;; *-cbm) os=-amigaos ;; *-dg) os=-dgux ;; *-dolphin) os=-sysv3 ;; m68k-ccur) os=-rtu ;; m88k-omron*) os=-luna ;; *-next ) os=-nextstep ;; *-sequent) os=-ptx ;; *-crds) os=-unos ;; *-ns) os=-genix ;; i370-*) os=-mvs ;; *-next) os=-nextstep3 ;; *-gould) os=-sysv ;; *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; *-sgi) os=-irix ;; *-siemens) os=-sysv4 ;; *-masscomp) os=-rtu ;; f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; *-rom68k) os=-coff ;; *-*bug) os=-coff ;; *-apple) os=-macos ;; *-atari*) os=-mint ;; *) os=-none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. vendor=unknown case $basic_machine in *-unknown) case $os in -riscix*) vendor=acorn ;; -sunos*) vendor=sun ;; -aix*) vendor=ibm ;; -beos*) vendor=be ;; -hpux*) vendor=hp ;; -mpeix*) vendor=hp ;; -hiux*) vendor=hitachi ;; -unos*) vendor=crds ;; -dgux*) vendor=dg ;; -luna*) vendor=omron ;; -genix*) vendor=ns ;; -mvs* | -opened*) vendor=ibm ;; -os400*) vendor=ibm ;; -ptx*) vendor=sequent ;; -tpf*) vendor=ibm ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) vendor=apple ;; -hms*) vendor=hitachi ;; -mpw* | -macos*) vendor=apple ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; -vos*) vendor=stratus ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: Index: xaos.spec =================================================================== RCS file: /cvs/pkgs/rpms/xaos/devel/xaos.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xaos.spec 22 Feb 2008 22:32:42 -0000 1.7 +++ xaos.spec 20 Jul 2008 09:50:22 -0000 1.8 @@ -1,6 +1,6 @@ Name: xaos Version: 3.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A fast, portable real-time interactive fractal zoomer Group: Applications/Multimedia @@ -8,6 +8,7 @@ URL: http://xaos.sourceforge.net Source0: http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz Source1: xaos.png +Source2: config.sub BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel BuildRequires: zlib-devel @@ -40,6 +41,7 @@ %prep %setup0 -q -n XaoS-%version +cp %{SOURCE2} . # disable stripping binaries when installing sed -i 's| -s | |' Makefile.in From fedora-extras-commits at redhat.com Sun Jul 20 10:12:17 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sun, 20 Jul 2008 10:12:17 GMT Subject: rpms/php/devel php.spec,1.158,1.159 Message-ID: <200807201012.m6KACHhs027846@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27813 Modified Files: php.spec Log Message: enable T1lib support in php-gd Index: php.spec =================================================================== RCS file: /cvs/extras/rpms/php/devel/php.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- php.spec 14 Jul 2008 13:43:49 -0000 1.158 +++ php.spec 20 Jul 2008 10:11:32 -0000 1.159 @@ -8,7 +8,7 @@ Summary: The PHP HTML-embedded scripting language Name: php Version: 5.2.6 -Release: 3 +Release: 4 License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -269,7 +269,7 @@ Summary: A module for PHP applications for using the gd graphics library Group: Development/Languages Requires: php-common = %{version}-%{release} -BuildRequires: gd-devel, freetype-devel +BuildRequires: gd-devel, freetype-devel, t1lib-devel %description gd The php-gd package contains a dynamic shared object that will add @@ -456,6 +456,7 @@ --with-freetype-dir=%{_prefix} \ --with-png-dir=%{_prefix} \ --enable-gd-native-ttf \ + --with-t1lib=%{_prefix} \ --without-gdbm \ --with-gettext \ --with-gmp \ @@ -725,6 +726,9 @@ %files pspell -f files.pspell %changelog +* Sun Jul 20 2008 Remi Collet 5.2.6-4 +- enable T1lib support in php-gd + * Mon Jul 14 2008 Joe Orton 5.2.6-3 - update to 5.2.6 - sync default php.ini with upstream From fedora-extras-commits at redhat.com Sun Jul 20 11:05:08 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Sun, 20 Jul 2008 11:05:08 GMT Subject: rpms/coq/F-9 coq.spec,1.1,1.2 import.log,1.1,1.2 Message-ID: <200807201105.m6KB5884003389@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3294/F-9 Modified Files: coq.spec import.log Log Message: Fixing version numbers for F-8 < F-9 < F-10. (Was actually for a change to F-8 version originally - next time will minor bump F-8 instead). Index: coq.spec =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/coq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coq.spec 16 Jul 2008 18:58:22 -0000 1.1 +++ coq.spec 20 Jul 2008 11:04:25 -0000 1.2 @@ -18,13 +18,14 @@ # # It appears as though ALL of these are necessary to prevent unwanted # stripping + %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %define _enable_debug_package 0 %define debug_package %{nil} Name: coq Version: 8.1pl3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Coq proof management system Group: Applications/Engineering @@ -46,8 +47,15 @@ Patch2: makefile-strip.patch Patch3: check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, texlive-latex, texlive-texmf -# ExcludeArch: ppc64 +BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs + +%if 0%{?fedora} < 9 +BuildRequires: tetex, tetex-latex +# There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8 +ExcludeArch: ppc64 +%else +BuildRequires: texlive-latex, texlive-texmf +%endif %description Coq is a formal proof management system. It allows for the development @@ -284,5 +292,7 @@ %doc README.coq-emacs %changelog +* Thu Jul 17 2008 Alan Dunn 8.1pl3-2 +- Added check for Fedora distribution number to allow for Fedora 8 release. * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Jul 2008 18:58:22 -0000 1.1 +++ import.log 20 Jul 2008 11:04:25 -0000 1.2 @@ -1 +1,2 @@ coq-8_1pl3-1_fc9:F-9:coq-8.1pl3-1.fc9.src.rpm:1216234547 +coq-8_1pl3-2_fc9:F-9:coq-8.1pl3-2.fc9.src.rpm:1216551707 From fedora-extras-commits at redhat.com Sun Jul 20 12:24:58 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:24:58 GMT Subject: rpms/tor/devel netfilter-ipv4.h, NONE, 1.1 tor-0.2.0.30-geoippath.patch, NONE, 1.1 update-geoip, NONE, 1.1 Message-ID: <200807201224.m6KCOwir013540@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13532 Added Files: netfilter-ipv4.h tor-0.2.0.30-geoippath.patch update-geoip Log Message: initial checkin --- NEW FILE netfilter-ipv4.h --- #include #include_next tor-0.2.0.30-geoippath.patch: --- NEW FILE tor-0.2.0.30-geoippath.patch --- diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c --- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200 +++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200 @@ -202,7 +202,7 @@ static config_var_t _option_vars[] = { V(GeoIPFile, STRING, ""), #else V(GeoIPFile, STRING, - SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), + "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), #endif V(Group, STRING, NULL), V(HardwareAccel, BOOL, "0"), --- NEW FILE update-geoip --- #! /bin/bash # Copyright (C) 2008 Enrico Scholz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 3 of the License. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see . ### NOTE: this program is part of the Fedora 'tor' package. Hence, file ### bugreports at http://bugzilla.redhat.com, but *NOT* at upstream tor ### webpage/maillists. URL=http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip : ${DESTDIR=/var/lib/tor-data} set -e d=$(mktemp -d -t tor-geoip.XXXXXX) trap "rm -rf $d" EXIT cd $d wget "$URL" unzip "$(basename "$URL")" date=$(stat -c '%Y' ip-to-country.csv) date=$(date +"%Y%m%dT%H%M%S" -d "1970-01-01 00:00:00 UTC $date seconds") fname=geoip-$date test ! -e "$DESTDIR/$fname" || exit 0 cut -d, -f1-3 < ip-to-country.csv | sed 's/"//g' > "$fname" rm -f "$DESTDIR/$fname" cp -p "$fname" "$DESTDIR/$fname" rm -f "$DESTDIR/geoip" ln -s "$fname" "$DESTDIR/geoip" From fedora-extras-commits at redhat.com Sun Jul 20 12:26:20 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:26:20 GMT Subject: rpms/tor/devel .cvsignore, 1.3, 1.4 lastver, 1.3, 1.4 sources, 1.12, 1.13 Message-ID: <200807201226.m6KCQKjQ013605@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13573 Modified Files: .cvsignore lastver sources Log Message: updated to 0.2.0.30 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Oct 2006 06:29:54 -0000 1.3 +++ .cvsignore 20 Jul 2008 12:25:33 -0000 1.4 @@ -1 +1,2 @@ -tor-*.tar.* +tor-0.2.0.30.tar.gz +tor-0.2.0.30.tar.gz.asc Index: lastver =================================================================== RCS file: /cvs/extras/rpms/tor/devel/lastver,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lastver 13 Feb 2008 11:18:23 -0000 1.3 +++ lastver 20 Jul 2008 12:25:33 -0000 1.4 @@ -1 +1 @@ -0.1.2.19 +0.2.0.30 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tor/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2008 11:18:23 -0000 1.12 +++ sources 20 Jul 2008 12:25:33 -0000 1.13 @@ -1,2 +1,2 @@ -4b3f9963b843010af5aa3bd6266d11e0 tor-0.1.2.19.tar.gz -fa3ba84f22fcffd19cc029f15d30e941 tor-0.1.2.19.tar.gz.asc +d37b582ee35b4f69564b0635a449b5f6 tor-0.2.0.30.tar.gz +6ae456c60864a1316600bf3ed504eaf7 tor-0.2.0.30.tar.gz.asc From fedora-extras-commits at redhat.com Sun Jul 20 12:27:18 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:27:18 GMT Subject: rpms/tor/devel tor-0.1.2.16-open.patch,1.1,NONE Message-ID: <200807201227.m6KCRIwX013730@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13687 Removed Files: tor-0.1.2.16-open.patch Log Message: obsoleted by 0.2.0.30 --- tor-0.1.2.16-open.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 12:29:12 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:29:12 GMT Subject: rpms/tor/devel tor.spec,1.21,1.22 Message-ID: <200807201229.m6KCTCtP014000@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13878 Modified Files: tor.spec Log Message: - updated to 0.2.0.30 - (re)enabled transparent proxy support by workarounding broken header - moved the 'geoip' database to /var/lib/tor-data where it can be updated periodically - built with -Wl,--as-needed Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- tor.spec 9 Jul 2008 21:05:20 -0000 1.21 +++ tor.spec 20 Jul 2008 12:28:26 -0000 1.22 @@ -10,8 +10,8 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: tor -Version: 0.1.2.19 -Release: %release_func 3 +Version: 0.2.0.30 +Release: %release_func 1 Group: System Environment/Daemons License: BSD Summary: Anonymizing overlay network for TCP (The onion router) @@ -27,8 +27,10 @@ Source0: http://tor.eff.org/dist/%name-%version.tar.gz Source1: http://tor.eff.org/dist/%name-%version.tar.gz.asc Source2: tor.logrotate +Source3: update-geoip +Source4: netfilter-ipv4.h Patch0: tor-0.1.1.26-setgroups.patch -Patch1: tor-0.1.2.16-open.patch +Patch1: tor-0.2.0.30-geoippath.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: libevent-devel openssl-devel transfig ghostscript @@ -91,7 +93,9 @@ %prep %setup -q %patch0 -p1 -b .setgroups -%patch1 -p1 -b .open +%patch1 -p1 -b .geoippath + +install -p -m0644 %SOURCE3 . sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in cat <>src/config/torrc.sample.in @@ -99,8 +103,13 @@ User %username EOF +mkdir -p linux +install -p -m0644 %SOURCE4 linux/netfilter_ipv4.h + %build +export ac_cv_header_linux_netfilter_ipv4_h=yes +export LDFLAGS='-Wl,--as-needed' %configure make %{?_smp_mflags} make -C doc/design-paper tor-design.pdf @@ -112,11 +121,13 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,} -mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name} +mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name,%_var/lib/tor-data} install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor +ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip + %pre core %__fe_groupadd %uid -r %username &>/dev/null || : @@ -164,6 +175,7 @@ %defattr(-,root,root,-) %doc AUTHORS LICENSE README ChangeLog %doc ReleaseNotes +%doc update-geoip %dir %_sysconfdir/tor %config(noreplace) %_sysconfdir/logrotate.d/tor %attr(0700,%username,%username) %dir %homedir @@ -171,6 +183,9 @@ %attr(0640,root,%username) %config(noreplace) %_sysconfdir/tor/torrc %_bindir/* %_mandir/man1/* +%_datadir/tor +%dir %_var/lib/tor-data +%config(noreplace) %_var/lib/tor-data/geoip %exclude %_bindir/torify %exclude %_mandir/man1/torify* @@ -184,6 +199,14 @@ %changelog +* Sun Jul 20 2008 Enrico Scholz - 0.2.0.30-1 +- updated to 0.2.0.30 +- (re)enabled transparent proxy support by workarounding broken + header +- moved the 'geoip' database to /var/lib/tor-data where it can be + updated periodically +- built with -Wl,--as-needed + * Thu Jul 10 2008 Nikolay Vladimirov - 0.1.2.19-3 - rebuild for new libevent From fedora-extras-commits at redhat.com Sun Jul 20 12:39:24 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Sun, 20 Jul 2008 12:39:24 GMT Subject: rpms/coq/F-8 coq.spec,1.2,1.3 import.log,1.2,1.3 Message-ID: <200807201239.m6KCdOqh014431@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14350/F-8 Modified Files: coq.spec import.log Log Message: What the previous spec file for F-8 should've been. Index: coq.spec =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/coq.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- coq.spec 17 Jul 2008 17:40:39 -0000 1.2 +++ coq.spec 20 Jul 2008 12:38:38 -0000 1.3 @@ -18,6 +18,7 @@ # # It appears as though ALL of these are necessary to prevent unwanted # stripping + %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %define _enable_debug_package 0 %define debug_package %{nil} @@ -47,12 +48,14 @@ Patch3: check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs -%if 0%{?fedora} <= 8 + +%if 0%{?fedora} < 9 BuildRequires: tetex, tetex-latex +# There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8 +ExcludeArch: ppc64 %else BuildRequires: texlive-latex, texlive-texmf %endif -# ExcludeArch: ppc64 %description Coq is a formal proof management system. It allows for the development Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 17 Jul 2008 17:40:39 -0000 1.2 +++ import.log 20 Jul 2008 12:38:38 -0000 1.3 @@ -1,2 +1,3 @@ coq-8_1pl3-1_fc9:F-8:coq-8.1pl3-1.fc9.src.rpm:1216235027 coq-8_1pl3-2_fc9:F-8:coq-8.1pl3-2.fc9.src.rpm:1216316352 +coq-8_1pl3-2_fc8:F-8:coq-8.1pl3-2.fc8.src.rpm:1216557367 From fedora-extras-commits at redhat.com Sun Jul 20 12:48:34 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:48:34 GMT Subject: rpms/tor/F-9 netfilter-ipv4.h, NONE, 1.1 tor-0.2.0.30-geoippath.patch, NONE, 1.1 update-geoip, NONE, 1.1 Message-ID: <200807201248.m6KCmYMM014810@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14784 Added Files: netfilter-ipv4.h tor-0.2.0.30-geoippath.patch update-geoip Log Message: initial checkin --- NEW FILE netfilter-ipv4.h --- #include #include_next tor-0.2.0.30-geoippath.patch: --- NEW FILE tor-0.2.0.30-geoippath.patch --- diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c --- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200 +++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200 @@ -202,7 +202,7 @@ static config_var_t _option_vars[] = { V(GeoIPFile, STRING, ""), #else V(GeoIPFile, STRING, - SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), + "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), #endif V(Group, STRING, NULL), V(HardwareAccel, BOOL, "0"), --- NEW FILE update-geoip --- #! /bin/bash # Copyright (C) 2008 Enrico Scholz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 3 of the License. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see . ### NOTE: this program is part of the Fedora 'tor' package. Hence, file ### bugreports at http://bugzilla.redhat.com, but *NOT* at upstream tor ### webpage/maillists. URL=http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip : ${DESTDIR=/var/lib/tor-data} set -e d=$(mktemp -d -t tor-geoip.XXXXXX) trap "rm -rf $d" EXIT cd $d wget "$URL" unzip "$(basename "$URL")" date=$(stat -c '%Y' ip-to-country.csv) date=$(date +"%Y%m%dT%H%M%S" -d "1970-01-01 00:00:00 UTC $date seconds") fname=geoip-$date test ! -e "$DESTDIR/$fname" || exit 0 cut -d, -f1-3 < ip-to-country.csv | sed 's/"//g' > "$fname" rm -f "$DESTDIR/$fname" cp -p "$fname" "$DESTDIR/$fname" rm -f "$DESTDIR/geoip" ln -s "$fname" "$DESTDIR/geoip" From fedora-extras-commits at redhat.com Sun Jul 20 12:49:40 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:49:40 GMT Subject: rpms/tor/F-9 .cvsignore,1.3,1.4 lastver,1.3,1.4 sources,1.12,1.13 Message-ID: <200807201249.m6KCnehH014941@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14864 Modified Files: .cvsignore lastver sources Log Message: updated to 0.2.0.30 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tor/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Oct 2006 06:29:54 -0000 1.3 +++ .cvsignore 20 Jul 2008 12:48:54 -0000 1.4 @@ -1 +1,2 @@ -tor-*.tar.* +tor-0.2.0.30.tar.gz +tor-0.2.0.30.tar.gz.asc Index: lastver =================================================================== RCS file: /cvs/extras/rpms/tor/F-9/lastver,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lastver 13 Feb 2008 11:18:23 -0000 1.3 +++ lastver 20 Jul 2008 12:48:54 -0000 1.4 @@ -1 +1 @@ -0.1.2.19 +0.2.0.30 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tor/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2008 11:18:23 -0000 1.12 +++ sources 20 Jul 2008 12:48:54 -0000 1.13 @@ -1,2 +1,2 @@ -4b3f9963b843010af5aa3bd6266d11e0 tor-0.1.2.19.tar.gz -fa3ba84f22fcffd19cc029f15d30e941 tor-0.1.2.19.tar.gz.asc +d37b582ee35b4f69564b0635a449b5f6 tor-0.2.0.30.tar.gz +6ae456c60864a1316600bf3ed504eaf7 tor-0.2.0.30.tar.gz.asc From fedora-extras-commits at redhat.com Sun Jul 20 12:50:24 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:50:24 GMT Subject: rpms/tor/F-9 tor-0.1.2.16-open.patch,1.1,NONE Message-ID: <200807201250.m6KCoOQH015037@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14991 Removed Files: tor-0.1.2.16-open.patch Log Message: obsoleted by 0.2.0.30 --- tor-0.1.2.16-open.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 12:50:44 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:50:44 GMT Subject: rpms/tor/F-8 netfilter-ipv4.h, NONE, 1.1 tor-0.2.0.30-geoippath.patch, NONE, 1.1 update-geoip, NONE, 1.1 Message-ID: <200807201250.m6KCoiAC015069@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15053 Added Files: netfilter-ipv4.h tor-0.2.0.30-geoippath.patch update-geoip Log Message: initial checkin --- NEW FILE netfilter-ipv4.h --- #include #include_next tor-0.2.0.30-geoippath.patch: --- NEW FILE tor-0.2.0.30-geoippath.patch --- diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c --- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200 +++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200 @@ -202,7 +202,7 @@ static config_var_t _option_vars[] = { V(GeoIPFile, STRING, ""), #else V(GeoIPFile, STRING, - SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), + "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), #endif V(Group, STRING, NULL), V(HardwareAccel, BOOL, "0"), --- NEW FILE update-geoip --- #! /bin/bash # Copyright (C) 2008 Enrico Scholz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 3 of the License. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see . ### NOTE: this program is part of the Fedora 'tor' package. Hence, file ### bugreports at http://bugzilla.redhat.com, but *NOT* at upstream tor ### webpage/maillists. URL=http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip : ${DESTDIR=/var/lib/tor-data} set -e d=$(mktemp -d -t tor-geoip.XXXXXX) trap "rm -rf $d" EXIT cd $d wget "$URL" unzip "$(basename "$URL")" date=$(stat -c '%Y' ip-to-country.csv) date=$(date +"%Y%m%dT%H%M%S" -d "1970-01-01 00:00:00 UTC $date seconds") fname=geoip-$date test ! -e "$DESTDIR/$fname" || exit 0 cut -d, -f1-3 < ip-to-country.csv | sed 's/"//g' > "$fname" rm -f "$DESTDIR/$fname" cp -p "$fname" "$DESTDIR/$fname" rm -f "$DESTDIR/geoip" ln -s "$fname" "$DESTDIR/geoip" From fedora-extras-commits at redhat.com Sun Jul 20 12:51:45 2008 From: fedora-extras-commits at redhat.com (Alan Dunn (amdunn)) Date: Sun, 20 Jul 2008 12:51:45 GMT Subject: rpms/coq/F-8 coq.spec,1.3,1.4 import.log,1.3,1.4 Message-ID: <200807201251.m6KCpjBq015154@cvs-int.fedora.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15051/F-8 Modified Files: coq.spec import.log Log Message: Changed tag to allow a proper commit. Index: coq.spec =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/coq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- coq.spec 20 Jul 2008 12:38:38 -0000 1.3 +++ coq.spec 20 Jul 2008 12:50:59 -0000 1.4 @@ -25,7 +25,7 @@ Name: coq Version: 8.1pl3 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Coq proof management system Group: Applications/Engineering @@ -292,6 +292,8 @@ %doc README.coq-emacs %changelog +* Sun Jul 20 2008 Alan Dunn 8.1pl3-2.1 +- Minor bump for Fedora 8 to bring it into line with the rest. * Thu Jul 17 2008 Alan Dunn 8.1pl3-2 - Added check for Fedora distribution number to allow for Fedora 8 release. * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-8/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 20 Jul 2008 12:38:38 -0000 1.3 +++ import.log 20 Jul 2008 12:50:59 -0000 1.4 @@ -1,3 +1,4 @@ coq-8_1pl3-1_fc9:F-8:coq-8.1pl3-1.fc9.src.rpm:1216235027 coq-8_1pl3-2_fc9:F-8:coq-8.1pl3-2.fc9.src.rpm:1216316352 coq-8_1pl3-2_fc8:F-8:coq-8.1pl3-2.fc8.src.rpm:1216557367 +coq-8_1pl3-2_fc8_1:F-8:coq-8.1pl3-2.fc8.1.src.rpm:1216558147 From fedora-extras-commits at redhat.com Sun Jul 20 12:52:16 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:52:16 GMT Subject: rpms/tor/F-8 .cvsignore,1.3,1.4 lastver,1.3,1.4 sources,1.12,1.13 Message-ID: <200807201252.m6KCqGLW015230@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15133 Modified Files: .cvsignore lastver sources Log Message: updated to 0.2.0.30 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tor/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Oct 2006 06:29:54 -0000 1.3 +++ .cvsignore 20 Jul 2008 12:51:15 -0000 1.4 @@ -1 +1,2 @@ -tor-*.tar.* +tor-0.2.0.30.tar.gz +tor-0.2.0.30.tar.gz.asc Index: lastver =================================================================== RCS file: /cvs/extras/rpms/tor/F-8/lastver,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lastver 13 Feb 2008 11:18:16 -0000 1.3 +++ lastver 20 Jul 2008 12:51:15 -0000 1.4 @@ -1 +1 @@ -0.1.2.19 +0.2.0.30 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tor/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2008 11:18:16 -0000 1.12 +++ sources 20 Jul 2008 12:51:15 -0000 1.13 @@ -1,2 +1,2 @@ -4b3f9963b843010af5aa3bd6266d11e0 tor-0.1.2.19.tar.gz -fa3ba84f22fcffd19cc029f15d30e941 tor-0.1.2.19.tar.gz.asc +d37b582ee35b4f69564b0635a449b5f6 tor-0.2.0.30.tar.gz +6ae456c60864a1316600bf3ed504eaf7 tor-0.2.0.30.tar.gz.asc From fedora-extras-commits at redhat.com Sun Jul 20 12:53:11 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:53:11 GMT Subject: rpms/tor/F-8 tor-0.1.2.16-open.patch,1.1,NONE Message-ID: <200807201253.m6KCrBSY015277@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15261 Removed Files: tor-0.1.2.16-open.patch Log Message: obsoleted by 0.2.0.30 --- tor-0.1.2.16-open.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 12:55:48 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:55:48 GMT Subject: rpms/tor/F-9 tor.spec,1.19,1.20 Message-ID: <200807201255.m6KCtmaQ015407@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15367 Modified Files: tor.spec Log Message: - updated to 0.2.0.30 - (re)enabled transparent proxy support by workarounding broken header - moved the 'geoip' database to /var/lib/tor-data where it can be updated periodically - built with -Wl,--as-needed Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/F-9/tor.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- tor.spec 13 Feb 2008 11:21:58 -0000 1.19 +++ tor.spec 20 Jul 2008 12:55:01 -0000 1.20 @@ -10,8 +10,8 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: tor -Version: 0.1.2.19 -Release: %release_func 1 +Version: 0.2.0.30 +Release: %release_func 1 Group: System Environment/Daemons License: BSD Summary: Anonymizing overlay network for TCP (The onion router) @@ -27,8 +27,10 @@ Source0: http://tor.eff.org/dist/%name-%version.tar.gz Source1: http://tor.eff.org/dist/%name-%version.tar.gz.asc Source2: tor.logrotate +Source3: update-geoip +Source4: netfilter-ipv4.h Patch0: tor-0.1.1.26-setgroups.patch -Patch1: tor-0.1.2.16-open.patch +Patch1: tor-0.2.0.30-geoippath.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: libevent-devel openssl-devel transfig ghostscript @@ -91,7 +93,9 @@ %prep %setup -q %patch0 -p1 -b .setgroups -%patch1 -p1 -b .open +%patch1 -p1 -b .geoippath + +install -p -m0644 %SOURCE3 . sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in cat <>src/config/torrc.sample.in @@ -99,8 +103,13 @@ User %username EOF +mkdir -p linux +install -p -m0644 %SOURCE4 linux/netfilter_ipv4.h + %build +export ac_cv_header_linux_netfilter_ipv4_h=yes +export LDFLAGS='-Wl,--as-needed' %configure make %{?_smp_mflags} make -C doc/design-paper tor-design.pdf @@ -112,11 +121,13 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,} -mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name} +mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name,%_var/lib/tor-data} install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor +ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip + %pre core %__fe_groupadd %uid -r %username &>/dev/null || : @@ -164,6 +175,7 @@ %defattr(-,root,root,-) %doc AUTHORS LICENSE README ChangeLog %doc ReleaseNotes +%doc update-geoip %dir %_sysconfdir/tor %config(noreplace) %_sysconfdir/logrotate.d/tor %attr(0700,%username,%username) %dir %homedir @@ -171,6 +183,9 @@ %attr(0640,root,%username) %config(noreplace) %_sysconfdir/tor/torrc %_bindir/* %_mandir/man1/* +%_datadir/tor +%dir %_var/lib/tor-data +%config(noreplace) %_var/lib/tor-data/geoip %exclude %_bindir/torify %exclude %_mandir/man1/torify* @@ -184,6 +199,14 @@ %changelog +* Sun Jul 20 2008 Enrico Scholz - 0.2.0.30-1 +- updated to 0.2.0.30 +- (re)enabled transparent proxy support by workarounding broken + header +- moved the 'geoip' database to /var/lib/tor-data where it can be + updated periodically +- built with -Wl,--as-needed + * Tue Feb 12 2008 Enrico Scholz - 0.1.2.19-1 - updated to 0.1.2.19 - use file based BR for latex From fedora-extras-commits at redhat.com Sun Jul 20 12:57:30 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 12:57:30 GMT Subject: rpms/tor/F-8 tor.spec,1.17,1.18 Message-ID: <200807201257.m6KCvUeG015522@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15465 Modified Files: tor.spec Log Message: - updated to 0.2.0.30 - (re)enabled transparent proxy support by workarounding broken header - moved the 'geoip' database to /var/lib/tor-data where it can be updated periodically - built with -Wl,--as-needed Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/F-8/tor.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tor.spec 21 Jun 2008 15:21:12 -0000 1.17 +++ tor.spec 20 Jul 2008 12:56:44 -0000 1.18 @@ -10,8 +10,8 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: tor -Version: 0.1.2.19 -Release: %release_func 2 +Version: 0.2.0.30 +Release: %release_func 1 Group: System Environment/Daemons License: BSD Summary: Anonymizing overlay network for TCP (The onion router) @@ -27,8 +27,10 @@ Source0: http://tor.eff.org/dist/%name-%version.tar.gz Source1: http://tor.eff.org/dist/%name-%version.tar.gz.asc Source2: tor.logrotate +Source3: update-geoip +Source4: netfilter-ipv4.h Patch0: tor-0.1.1.26-setgroups.patch -Patch1: tor-0.1.2.16-open.patch +Patch1: tor-0.2.0.30-geoippath.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: libevent-devel openssl-devel transfig ghostscript @@ -90,7 +92,9 @@ %prep %setup -q %patch0 -p1 -b .setgroups -%patch1 -p1 -b .open +%patch1 -p1 -b .geoippath + +install -p -m0644 %SOURCE3 . sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in cat <>src/config/torrc.sample.in @@ -98,8 +102,13 @@ User %username EOF +mkdir -p linux +install -p -m0644 %SOURCE4 linux/netfilter_ipv4.h + %build +export ac_cv_header_linux_netfilter_ipv4_h=yes +export LDFLAGS='-Wl,--as-needed' %configure make %{?_smp_mflags} make -C doc/design-paper tor-design.pdf @@ -111,11 +120,13 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,} -mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name} +mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name,%_var/lib/tor-data} install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor +ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip + %pre core %__fe_groupadd %uid -r %username &>/dev/null || : @@ -163,6 +174,7 @@ %defattr(-,root,root,-) %doc AUTHORS LICENSE README ChangeLog %doc ReleaseNotes +%doc update-geoip %dir %_sysconfdir/tor %config(noreplace) %_sysconfdir/logrotate.d/tor %attr(0700,%username,%username) %dir %homedir @@ -170,6 +182,9 @@ %attr(0640,root,%username) %config(noreplace) %_sysconfdir/tor/torrc %_bindir/* %_mandir/man1/* +%_datadir/tor +%dir %_var/lib/tor-data +%config(noreplace) %_var/lib/tor-data/geoip %exclude %_bindir/torify %exclude %_mandir/man1/torify* @@ -183,6 +198,14 @@ %changelog +* Sun Jul 20 2008 Enrico Scholz - 0.2.0.30-1 +- updated to 0.2.0.30 +- (re)enabled transparent proxy support by workarounding broken + header +- moved the 'geoip' database to /var/lib/tor-data where it can be + updated periodically +- built with -Wl,--as-needed + * Wed Feb 13 2008 Enrico Scholz - 0.1.2.19-2 - added 'missingok' to logrotate script (#429402) From fedora-extras-commits at redhat.com Sun Jul 20 13:01:42 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 13:01:42 GMT Subject: rpms/tor/devel tor-0.2.0.30-setgroups.patch, NONE, 1.1 tor.spec, 1.22, 1.23 tor-0.1.1.26-setgroups.patch, 1.1, NONE Message-ID: <200807201301.m6KD1giM022332@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15721 Modified Files: tor.spec Added Files: tor-0.2.0.30-setgroups.patch Removed Files: tor-0.1.1.26-setgroups.patch Log Message: rediffed patches tor-0.2.0.30-setgroups.patch: --- NEW FILE tor-0.2.0.30-setgroups.patch --- --- tor-0.2.0.30/src/common/compat.c.setgroups +++ tor-0.2.0.30/src/common/compat.c @@ -897,6 +897,11 @@ switch_id(const char *user, const char * return -1; } + if (getgroups(0,0)!=0 && setgroups(0,0)!=0) { + log_warn(LD_GENERAL,"Error setting groups: %s", strerror(errno)); + return -1; + } + if (setgid(gr->gr_gid) != 0) { log_warn(LD_GENERAL,"Error setting to configured GID: %s", strerror(errno)); Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- tor.spec 20 Jul 2008 12:28:26 -0000 1.22 +++ tor.spec 20 Jul 2008 13:00:56 -0000 1.23 @@ -29,7 +29,7 @@ Source2: tor.logrotate Source3: update-geoip Source4: netfilter-ipv4.h -Patch0: tor-0.1.1.26-setgroups.patch +Patch0: tor-0.2.0.30-setgroups.patch Patch1: tor-0.2.0.30-geoippath.patch BuildRoot: %_tmppath/%name-%version-%release-root @@ -200,7 +200,7 @@ %changelog * Sun Jul 20 2008 Enrico Scholz - 0.2.0.30-1 -- updated to 0.2.0.30 +- updated to 0.2.0.30; rediffed patches - (re)enabled transparent proxy support by workarounding broken header - moved the 'geoip' database to /var/lib/tor-data where it can be --- tor-0.1.1.26-setgroups.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 13:13:25 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:13:25 GMT Subject: rpms/xapian-core/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xapian-core.spec, 1.13, 1.14 Message-ID: <200807201313.m6KDDPNg022871@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22763 Modified Files: .cvsignore sources xapian-core.spec Log Message: version update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Mar 2008 12:20:14 -0000 1.6 +++ .cvsignore 20 Jul 2008 13:12:37 -0000 1.7 @@ -1 +1 @@ -xapian-core-1.0.6.tar.gz +xapian-core-1.0.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Mar 2008 12:20:14 -0000 1.6 +++ sources 20 Jul 2008 13:12:37 -0000 1.7 @@ -1 +1 @@ -a9cde41303f047523cec5c65cd91a0e6 xapian-core-1.0.6.tar.gz +b4acff50028120852d4a8d943065f6d2 xapian-core-1.0.7.tar.gz Index: xapian-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xapian-core.spec 30 Mar 2008 12:20:14 -0000 1.13 +++ xapian-core.spec 20 Jul 2008 13:12:37 -0000 1.14 @@ -1,6 +1,6 @@ Summary: The Xapian Probabilistic Information Retrieval Library Name: xapian-core -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} License: GPLv2+ Group: Applications/Databases @@ -120,6 +120,9 @@ %{_mandir}/man1/xapian-config.1* %changelog +* Sun Jul 20 2088 Adel Gadllah 1.0.7-1 +- Update to 1.0.7 + * Sun Mar 30 2008 Adel Gadllah 1.0.6-1 - Update to 1.0.6 From fedora-extras-commits at redhat.com Sun Jul 20 13:13:41 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:13:41 GMT Subject: rpms/xapian-bindings/devel xapian-bindings.spec,1.8,1.9 Message-ID: <200807201313.m6KDDfaj022906@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22785 Modified Files: xapian-bindings.spec Log Message: version update Index: xapian-bindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xapian-bindings.spec 30 Mar 2008 12:21:20 -0000 1.8 +++ xapian-bindings.spec 20 Jul 2008 13:12:47 -0000 1.9 @@ -2,7 +2,7 @@ Summary: Bindings for the Xapian Probabilistic Information Retrieval Library Name: xapian-bindings -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} License: GPLv2+ Group: Development/Libraries @@ -57,9 +57,10 @@ %{_libdir}/python%{python_ver}/site-packages/xapian.pyc %{_libdir}/python%{python_ver}/site-packages/xapian.pyo - - %changelog +* Sun Jul 20 2088 Adel Gadllah 1.0.7-1 +- Update to 1.0.7 + * Sun Mar 30 2008 Adel Gadllah 1.0.6-1 - Update to 1.0.6 From fedora-extras-commits at redhat.com Sun Jul 20 13:14:27 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 13:14:27 GMT Subject: rpms/tor/F-8 tor-0.2.0.30-setgroups.patch, NONE, 1.1 tor.spec, 1.18, 1.19 tor-0.1.1.26-setgroups.patch, 1.1, NONE Message-ID: <200807201314.m6KDERdo022954@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22901 Modified Files: tor.spec Added Files: tor-0.2.0.30-setgroups.patch Removed Files: tor-0.1.1.26-setgroups.patch Log Message: rediffed patches tor-0.2.0.30-setgroups.patch: --- NEW FILE tor-0.2.0.30-setgroups.patch --- --- tor-0.2.0.30/src/common/compat.c.setgroups +++ tor-0.2.0.30/src/common/compat.c @@ -897,6 +897,11 @@ switch_id(const char *user, const char * return -1; } + if (getgroups(0,0)!=0 && setgroups(0,0)!=0) { + log_warn(LD_GENERAL,"Error setting groups: %s", strerror(errno)); + return -1; + } + if (setgid(gr->gr_gid) != 0) { log_warn(LD_GENERAL,"Error setting to configured GID: %s", strerror(errno)); Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/F-8/tor.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- tor.spec 20 Jul 2008 12:56:44 -0000 1.18 +++ tor.spec 20 Jul 2008 13:13:34 -0000 1.19 @@ -29,7 +29,7 @@ Source2: tor.logrotate Source3: update-geoip Source4: netfilter-ipv4.h -Patch0: tor-0.1.1.26-setgroups.patch +Patch0: tor-0.2.0.30-setgroups.patch Patch1: tor-0.2.0.30-geoippath.patch BuildRoot: %_tmppath/%name-%version-%release-root @@ -199,7 +199,7 @@ %changelog * Sun Jul 20 2008 Enrico Scholz - 0.2.0.30-1 -- updated to 0.2.0.30 +- updated to 0.2.0.30; rediffed patches - (re)enabled transparent proxy support by workarounding broken header - moved the 'geoip' database to /var/lib/tor-data where it can be --- tor-0.1.1.26-setgroups.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 13:15:46 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:15:46 GMT Subject: rpms/xapian-core/devel xapian-core.spec,1.14,1.15 Message-ID: <200807201315.m6KDFkJr023053@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22972 Modified Files: xapian-core.spec Log Message: fix clog Index: xapian-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xapian-core.spec 20 Jul 2008 13:12:37 -0000 1.14 +++ xapian-core.spec 20 Jul 2008 13:14:56 -0000 1.15 @@ -120,7 +120,7 @@ %{_mandir}/man1/xapian-config.1* %changelog -* Sun Jul 20 2088 Adel Gadllah 1.0.7-1 +* Sun Jul 20 2008 Adel Gadllah 1.0.7-1 - Update to 1.0.7 * Sun Mar 30 2008 Adel Gadllah 1.0.6-1 From fedora-extras-commits at redhat.com Sun Jul 20 13:16:00 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:16:00 GMT Subject: rpms/xapian-bindings/devel xapian-bindings.spec,1.9,1.10 Message-ID: <200807201316.m6KDG023023077@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23003 Modified Files: xapian-bindings.spec Log Message: fix clog typo Index: xapian-bindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xapian-bindings.spec 20 Jul 2008 13:12:47 -0000 1.9 +++ xapian-bindings.spec 20 Jul 2008 13:15:13 -0000 1.10 @@ -58,7 +58,7 @@ %{_libdir}/python%{python_ver}/site-packages/xapian.pyo %changelog -* Sun Jul 20 2088 Adel Gadllah 1.0.7-1 +* Sun Jul 20 2008 Adel Gadllah 1.0.7-1 - Update to 1.0.7 * Sun Mar 30 2008 Adel Gadllah 1.0.6-1 From fedora-extras-commits at redhat.com Sun Jul 20 13:18:13 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:18:13 GMT Subject: rpms/xapian-bindings/devel .cvsignore,1.4,1.5 sources,1.5,1.6 Message-ID: <200807201318.m6KDIDqg023277@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23194 Modified Files: .cvsignore sources Log Message: update source Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Mar 2008 12:21:20 -0000 1.4 +++ .cvsignore 20 Jul 2008 13:17:27 -0000 1.5 @@ -1 +1 @@ -xapian-bindings-1.0.6.tar.gz +xapian-bindings-1.0.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Mar 2008 12:21:20 -0000 1.5 +++ sources 20 Jul 2008 13:17:27 -0000 1.6 @@ -1 +1 @@ -288a862643f88808dc828561949cc701 xapian-bindings-1.0.6.tar.gz +a80e51f4971d7505abcc0bdde912266b xapian-bindings-1.0.7.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 13:18:49 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:18:49 GMT Subject: rpms/pinot/devel .cvsignore, 1.10, 1.11 pinot.spec, 1.31, 1.32 sources, 1.10, 1.11 Message-ID: <200807201318.m6KDInUD023406@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23260 Modified Files: .cvsignore pinot.spec sources Log Message: update to 0.87 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 22 Jun 2008 16:12:28 -0000 1.10 +++ .cvsignore 20 Jul 2008 13:18:03 -0000 1.11 @@ -1 +1 @@ -pinot-0.86.tar.gz +pinot-0.87.tar.gz Index: pinot.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- pinot.spec 22 Jun 2008 16:12:28 -0000 1.31 +++ pinot.spec 20 Jul 2008 13:18:03 -0000 1.32 @@ -1,5 +1,5 @@ Name: pinot -Version: 0.86 +Version: 0.87 Release: 1%{?dist} Summary: Personal search and metasearch for the Desktop @@ -119,6 +119,9 @@ %changelog +* Sun Jul 20 2008 Adel Gadllah 0.87-1 +- Update to0.87 + * Sun Jun 22 2008 Adel Gadllah 0.86-1 - Update to 0.86 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 22 Jun 2008 16:12:28 -0000 1.10 +++ sources 20 Jul 2008 13:18:03 -0000 1.11 @@ -1 +1 @@ -d116f3b4623214098124ca83481c1332 pinot-0.86.tar.gz +f1081e9138a19dd38784581713f2546e pinot-0.87.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 13:19:15 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 20 Jul 2008 13:19:15 GMT Subject: rpms/tor/F-9 tor-0.2.0.30-setgroups.patch, NONE, 1.1 tor.spec, 1.20, 1.21 tor-0.1.1.26-setgroups.patch, 1.1, NONE Message-ID: <200807201319.m6KDJFPP023465@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23352 Modified Files: tor.spec Added Files: tor-0.2.0.30-setgroups.patch Removed Files: tor-0.1.1.26-setgroups.patch Log Message: rediffed patches tor-0.2.0.30-setgroups.patch: --- NEW FILE tor-0.2.0.30-setgroups.patch --- --- tor-0.2.0.30/src/common/compat.c.setgroups +++ tor-0.2.0.30/src/common/compat.c @@ -897,6 +897,11 @@ switch_id(const char *user, const char * return -1; } + if (getgroups(0,0)!=0 && setgroups(0,0)!=0) { + log_warn(LD_GENERAL,"Error setting groups: %s", strerror(errno)); + return -1; + } + if (setgid(gr->gr_gid) != 0) { log_warn(LD_GENERAL,"Error setting to configured GID: %s", strerror(errno)); Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/F-9/tor.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- tor.spec 20 Jul 2008 12:55:01 -0000 1.20 +++ tor.spec 20 Jul 2008 13:18:28 -0000 1.21 @@ -29,7 +29,7 @@ Source2: tor.logrotate Source3: update-geoip Source4: netfilter-ipv4.h -Patch0: tor-0.1.1.26-setgroups.patch +Patch0: tor-0.2.0.30-setgroups.patch Patch1: tor-0.2.0.30-geoippath.patch BuildRoot: %_tmppath/%name-%version-%release-root @@ -200,7 +200,7 @@ %changelog * Sun Jul 20 2008 Enrico Scholz - 0.2.0.30-1 -- updated to 0.2.0.30 +- updated to 0.2.0.30; rediffed patches - (re)enabled transparent proxy support by workarounding broken header - moved the 'geoip' database to /var/lib/tor-data where it can be --- tor-0.1.1.26-setgroups.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 13:42:03 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 20 Jul 2008 13:42:03 GMT Subject: rpms/pymsn/devel .cvsignore, 1.5, 1.6 pymsn.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200807201342.m6KDg31o025452@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/pymsn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25406 Modified Files: .cvsignore pymsn.spec sources Log Message: * Sun Jul 20 2008 Brian Pepple - 0.3.2-1 - Update to 0.3.2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pymsn/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Jan 2008 18:04:33 -0000 1.5 +++ .cvsignore 20 Jul 2008 13:41:17 -0000 1.6 @@ -1 +1 @@ -pymsn-0.3.1.tar.gz +pymsn-0.3.2.tar.gz Index: pymsn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pymsn/devel/pymsn.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pymsn.spec 16 Jan 2008 18:04:33 -0000 1.6 +++ pymsn.spec 20 Jul 2008 13:41:17 -0000 1.7 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pymsn -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: Python libraries for MSN Messenger network @@ -55,6 +55,9 @@ %changelog +* Sun Jul 20 2008 Brian Pepple - 0.3.2-1 +- Update to 0.3.2. + * Wed Jan 16 2008 Brian Pepple - 0.3.1-1 - Update to 0.3.1. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pymsn/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Jan 2008 18:04:33 -0000 1.5 +++ sources 20 Jul 2008 13:41:17 -0000 1.6 @@ -1 +1 @@ -e3444094f0a45488e4cb236b86d46cd7 pymsn-0.3.1.tar.gz +b136198d6a533c4c34ff6c64fccd1e73 pymsn-0.3.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 13:40:37 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 20 Jul 2008 13:40:37 GMT Subject: rpms/man-pages-uk/devel man-pages-uk.spec,1.6,1.7 Message-ID: <200807201340.m6KDebcw025364@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/man-pages-uk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25294 Modified Files: man-pages-uk.spec Log Message: Update URL tag Index: man-pages-uk.spec =================================================================== RCS file: /cvs/extras/rpms/man-pages-uk/devel/man-pages-uk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- man-pages-uk.spec 6 Mar 2008 09:40:35 -0000 1.6 +++ man-pages-uk.spec 20 Jul 2008 13:39:42 -0000 1.7 @@ -1,11 +1,11 @@ %define date 20071108 Name: man-pages-uk Version: 0.1 -Release: 0.7.%{date}%{?dist} +Release: 0.8.%{date}%{?dist} Summary: Ukrainian man pages from the Linux Documentation Project License: GFDL Group: Documentation -URL: http://docs.linux.org.ua/index.php/Man:Contents +URL: http://docs.linux.org.ua/index.php?title=Man:Contents Source0: http://downloads.sourceforge.net/wiki2man/man-pages-uk-utf8-%{date}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,6 +35,9 @@ %lang(uk) %{_mandir}/uk %changelog +* Sun Jul 20 2008 Andy Shevchenko 0.1-0.8.20071108 +- update URL tag + * Thu Mar 06 2008 Andy Shevchenko 0.1-0.7.20071108 - just fix Source0 URL From fedora-extras-commits at redhat.com Sun Jul 20 13:44:47 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 20 Jul 2008 13:44:47 GMT Subject: rpms/perl-Math-MatrixReal/devel .cvsignore, 1.2, 1.3 perl-Math-MatrixReal.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807201344.m6KDilBO025721@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-Math-MatrixReal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25605 Modified Files: .cvsignore perl-Math-MatrixReal.spec sources Log Message: * Sun Jul 20 2008 Patrice Dumas 2.05-1 - update to 2.05 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-MatrixReal/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Feb 2008 22:12:26 -0000 1.2 +++ .cvsignore 20 Jul 2008 13:44:00 -0000 1.3 @@ -1 +1 @@ -Math-MatrixReal-2.03.tar.gz +Math-MatrixReal-2.05.tar.gz Index: perl-Math-MatrixReal.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Math-MatrixReal/devel/perl-Math-MatrixReal.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Math-MatrixReal.spec 10 Mar 2008 17:41:48 -0000 1.2 +++ perl-Math-MatrixReal.spec 20 Jul 2008 13:44:00 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Math-MatrixReal -Version: 2.03 -Release: 2%{?dist} +Version: 2.05 +Release: 1%{?dist} Summary: Manipulate matrix of reals License: GPL+ or Artistic Group: Development/Libraries @@ -9,13 +9,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) perl(File::Spec) perl(Test::Simple) +BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -Implements the data type "matrix of reals", which can be used almost like -any other basic Perl type thanks to OPERATOR OVERLOADING, i.e., - $product = $matrix1 * $matrix2; -does what you would like it to do (a matrix multiplication). +Implements the data type "matrix of reals" (and consequently also +"vector of reals") which can be used almost like any other basic +Perl type thanks to OPERATOR OVERLOADING, i.e., + + $A = $matrix1 * $matrix2; + $B = $A ** 2; + $C = $A + 2*B; + $D = $C - $B/2; + $inverse = $C ** -1; + $inverse = 1/$C; + +does what you would like it to do. %prep %setup -q -n Math-MatrixReal-%{version} @@ -45,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun Jul 20 2008 Patrice Dumas 2.05-1 +- update to 2.05 + * Mon Mar 10 2008 Tom "spot" Callaway 2.03-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-MatrixReal/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Feb 2008 22:12:26 -0000 1.2 +++ sources 20 Jul 2008 13:44:00 -0000 1.3 @@ -1 +1 @@ -ddec2540dfe7a719225d2abd5be3ce52 Math-MatrixReal-2.03.tar.gz +67f23122424830b5eea044f987b892b9 Math-MatrixReal-2.05.tar.gz From fedora-extras-commits at redhat.com Sun Jul 20 13:47:54 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:47:54 GMT Subject: rpms/beagle/devel beagle.spec,1.142,1.143 Message-ID: <200807201347.m6KDlslG025856@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25827 Modified Files: beagle.spec Log Message: fix bug 441175 Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- beagle.spec 19 Jul 2008 14:14:49 -0000 1.142 +++ beagle.spec 20 Jul 2008 13:47:00 -0000 1.143 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -195,8 +195,13 @@ # Remove old username, we switched to an 8 char one for x in $(cut -d: -f1 /etc/passwd) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/userdel beagleindex; break; fi; done for x in $(cut -d: -f1 /etc/group) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/groupdel beagleindex; break; fi; done -/usr/sbin/groupadd -g %{beagle_user_uid} -r beaglidx 2> /dev/null || : -/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beaglidx beaglidx 2> /dev/null || : +#only create user if it doesn't exists +%{_bindir}/id -u beaglidx 1>/dev/null 2>&1 +if [ $? -eq 0 ]; then + %{_sbindir}/groupadd -g %{beagle_user_uid} -r beaglidx 2> /dev/null || : + %{_sbindir}/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beaglidx beaglidx 2> /dev/null || : +fi +exit 0 %preun if [ -f %{_libdir}/beagle/beagle-plugin-path ]; then @@ -277,6 +282,9 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Sun Jul 20 2008 Adel Gadllah - 0.3.8-3 +- Check if the user exists before creating RH #441175 + * Sat Jul 19 2008 Adel Gadllah - 0.3.8-2 - RH #441375 - Don't ship Thunderbird and Evolution backends in the main From fedora-extras-commits at redhat.com Sun Jul 20 13:52:13 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:52:13 GMT Subject: rpms/xapian-core/F-9 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xapian-core.spec, 1.13, 1.14 Message-ID: <200807201352.m6KDqD54026117@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-core/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26051 Modified Files: .cvsignore sources xapian-core.spec Log Message: update to 1.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Mar 2008 12:20:14 -0000 1.6 +++ .cvsignore 20 Jul 2008 13:51:27 -0000 1.7 @@ -1 +1 @@ -xapian-core-1.0.6.tar.gz +xapian-core-1.0.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Mar 2008 12:20:14 -0000 1.6 +++ sources 20 Jul 2008 13:51:27 -0000 1.7 @@ -1 +1 @@ -a9cde41303f047523cec5c65cd91a0e6 xapian-core-1.0.6.tar.gz +b4acff50028120852d4a8d943065f6d2 xapian-core-1.0.7.tar.gz Index: xapian-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/F-9/xapian-core.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xapian-core.spec 30 Mar 2008 12:20:14 -0000 1.13 +++ xapian-core.spec 20 Jul 2008 13:51:27 -0000 1.14 @@ -1,6 +1,6 @@ Summary: The Xapian Probabilistic Information Retrieval Library Name: xapian-core -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} License: GPLv2+ Group: Applications/Databases @@ -120,6 +120,9 @@ %{_mandir}/man1/xapian-config.1* %changelog +* Sun Jul 20 2008 Adel Gadllah 1.0.7-1 +- Update to 1.0.7 + * Sun Mar 30 2008 Adel Gadllah 1.0.6-1 - Update to 1.0.6 From fedora-extras-commits at redhat.com Sun Jul 20 13:53:45 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 20 Jul 2008 13:53:45 GMT Subject: rpms/xapian-core/F-8 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xapian-core.spec, 1.12, 1.13 Message-ID: <200807201353.m6KDrjOw026219@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-core/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26187 Modified Files: .cvsignore sources xapian-core.spec Log Message: update to 1.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Mar 2008 12:45:49 -0000 1.6 +++ .cvsignore 20 Jul 2008 13:52:56 -0000 1.7 @@ -1 +1 @@ -xapian-core-1.0.6.tar.gz +xapian-core-1.0.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Mar 2008 12:45:49 -0000 1.6 +++ sources 20 Jul 2008 13:52:56 -0000 1.7 @@ -1 +1 @@ -a9cde41303f047523cec5c65cd91a0e6 xapian-core-1.0.6.tar.gz +b4acff50028120852d4a8d943065f6d2 xapian-core-1.0.7.tar.gz Index: xapian-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/F-8/xapian-core.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xapian-core.spec 30 Mar 2008 12:45:49 -0000 1.12 +++ xapian-core.spec 20 Jul 2008 13:52:56 -0000 1.13 @@ -1,6 +1,6 @@ Summary: The Xapian Probabilistic Information Retrieval Library Name: xapian-core -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} License: GPLv2+ Group: Applications/Databases @@ -120,6 +120,9 @@ %{_mandir}/man1/xapian-config.1* %changelog +* Sun Jul 20 2008 Adel Gadllah 1.0.7-1 +- Update to 1.0.7 + * Sun Mar 30 2008 Adel Gadllah 1.0.6-1 - Update to 1.0.6 From fedora-extras-commits at redhat.com Sun Jul 20 14:01:54 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Sun, 20 Jul 2008 14:01:54 GMT Subject: rpms/perl-TAP-Harness/EL-5 perl-TAP-Harness.spec,1.1,1.2 Message-ID: <200807201401.m6KE1ser000709@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-TAP-Harness/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32692 Modified Files: perl-TAP-Harness.spec Log Message: * Sun Jul 20 2008 Lubomir Rintel (Good Data) 3.10-2 - Do not omit the manual Index: perl-TAP-Harness.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-TAP-Harness/EL-5/perl-TAP-Harness.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-TAP-Harness.spec 12 Jun 2008 17:17:57 -0000 1.1 +++ perl-TAP-Harness.spec 20 Jul 2008 14:01:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-TAP-Harness Version: 3.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Run Perl standard test scripts with statistics License: GPL+ or Artistic Group: Development/Libraries @@ -48,18 +48,19 @@ %{perl_vendorlib}/* %{_mandir}/man3/* # These do conflict with Test::Harness that is part of perl +%exclude %{perl_vendorlib}/Test %exclude %{_mandir}/man3/Test::Harness* -%exclude %{_mandir} %exclude %{_mandir}/man1/prove* %exclude %{_bindir} -%exclude %{_bindir}/prove -%exclude %{perl_vendorlib}/Test # App::Prove is kind of useless when we don't ship prove included # in this package %exclude %{perl_vendorlib}/App - +%exclude %{_mandir}/man3/App::Prove* %changelog +* Sun Jul 20 2008 Lubomir Rintel (Good Data) 3.10-2 +- Do not omit the manual + * Mon Jun 02 2008 Lubomir Rintel (Good Data) 3.10-1 - Specfile autogenerated by cpanspec 1.75. - Fix description From fedora-extras-commits at redhat.com Sun Jul 20 15:19:48 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 20 Jul 2008 15:19:48 GMT Subject: rpms/gossip/devel .cvsignore, 1.27, 1.28 gossip.spec, 1.55, 1.56 sources, 1.27, 1.28 Message-ID: <200807201519.m6KFJmRK009875@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9845 Modified Files: .cvsignore gossip.spec sources Log Message: * Sun Jul 20 2008 Brian Pepple - 0.30-1 - Update to 0.30. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gossip/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 8 May 2008 23:26:43 -0000 1.27 +++ .cvsignore 20 Jul 2008 15:18:56 -0000 1.28 @@ -1 +1 @@ -gossip-0.29.tar.bz2 +gossip-0.30.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/pkgs/rpms/gossip/devel/gossip.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- gossip.spec 15 May 2008 02:39:55 -0000 1.55 +++ gossip.spec 20 Jul 2008 15:18:56 -0000 1.56 @@ -1,6 +1,6 @@ Name: gossip -Version: 0.29 -Release: 2%{?dist} +Version: 0.30 +Release: 1%{?dist} Summary: GNOME Jabber Client Group: Applications/Communications @@ -122,6 +122,9 @@ %changelog +* Sun Jul 20 2008 Brian Pepple - 0.30-1 +- Update to 0.30. + * Wed May 14 2008 Brian Pepple - 0.29-2 - Rebuild for new e-d-s. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gossip/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 8 May 2008 23:26:43 -0000 1.27 +++ sources 20 Jul 2008 15:18:56 -0000 1.28 @@ -1 +1 @@ -03c0895cde92f9fdd8cc96abdea9ee68 gossip-0.29.tar.bz2 +d36603e333f77dba51a6750dec036f8b gossip-0.30.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 20 15:18:09 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 20 Jul 2008 15:18:09 GMT Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit-0.109.2-bz451531.patch, NONE, 1.1 jack-audio-connection-kit-README.Fedora, 1.1, 1.2 jack-audio-connection-kit.spec, 1.22, 1.23 Message-ID: <200807201518.m6KFI9v7009788@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9748 Modified Files: jack-audio-connection-kit-README.Fedora jack-audio-connection-kit.spec Added Files: jack-audio-connection-kit-0.109.2-bz451531.patch Log Message: Fix #455193, #451531 jack-audio-connection-kit-0.109.2-bz451531.patch: --- NEW FILE jack-audio-connection-kit-0.109.2-bz451531.patch --- --- config/cpu/powerpc/cycles.h.orig 2006-05-26 04:45:16.000000000 +0200 +++ config/cpu/powerpc/cycles.h 2008-03-08 18:15:19.000000000 +0100 @@ -36,16 +36,8 @@ { cycles_t ret = 0; - __asm__ __volatile__( - "98: mftb %0\n" - "99:\n" - ".section __ftr_fixup,\"a\"\n" - " .long %1\n" - " .long 0\n" - " .long 98b\n" - " .long 99b\n" - ".previous" - : "=r" (ret) : "i" (CPU_FTR_601)); + __asm__ __volatile__("mftbl %0" : "=r" (ret)); + return ret; } Index: jack-audio-connection-kit-README.Fedora =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit-README.Fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jack-audio-connection-kit-README.Fedora 26 May 2006 17:15:12 -0000 1.1 +++ jack-audio-connection-kit-README.Fedora 20 Jul 2008 15:17:12 -0000 1.2 @@ -1,4 +1,69 @@ -Running JACK server in realtime mode. + INTEGRATE JACK WITH PULSEAUDIO + +The original text is placed at: + http://www.harald-hoyer.de/linux/pulseaudio-and-jackd + +Switch to root account. + +Install the required packages: + yum install pulseaudio-module-jack alsa-plugins-jack jack-audio-connection-kit + +Add yourself to the pulse-rt and jackuser groups. + usermod -a -G pulse-rt,jackaudio "" + +Edit /etc/security/limits.conf: + + at jackuser - rtprio 20 + at jackuser - memlock 4194304 + at pulse-rt - rtprio 20 + at pulse-rt - nice -20 + +Switch to your normal user account. + +Create ~/bin subdirectory if absent: + mkdir -p ~/bin + +Create the pulseaudio start file ~/bin/jack.pa: + +#!/usr/bin/pulseaudio -nF + +load-module module-jack-sink +load-module module-jack-source + +load-module module-native-protocol-unix +load-module module-volume-restore +load-module module-default-device-restore +load-module module-rescue-streams +load-module module-suspend-on-idle +.ifexists module-gconf.so +.nofail +load-module module-gconf +.fail +.endif +.ifexists module-x11-publish.so +.nofail +load-module module-x11-publish +.fail +.endif + +Close all your sessions and relogin to get the new group permissions and +limits. + +Kill the current pulseaudio daemon: + killall pulseaudio + +Start the jack daemon (your parameters may be different): + jackd -R -P4 -dalsa -r44100 -p512 -n4 -D -Chw:0 -Phw:0 + +Start the pulseaudio daemon: + pulseaudio -nF ~/bin/jack.pa + +Now everything should work. + +Next chapter describes steps for older Fedora vesions. + + + RUNNING JACK SERVER IN REALTIME MODE The JACK server jackd has the capability to run in a real-time mode which greatly decreases the chance of audio glitches. The real-time mode Index: jack-audio-connection-kit.spec =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jack-audio-connection-kit.spec 14 Feb 2008 10:32:27 -0000 1.22 +++ jack-audio-connection-kit.spec 20 Jul 2008 15:17:12 -0000 1.23 @@ -1,11 +1,12 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.109.2 -Release: 1%{?dist}.1 +Release: 2%{?dist} License: GPLv2 and LGPLv2 Group: System Environment/Daemons Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz Source1: %{name}-README.Fedora +Patch0: jack-audio-connection-kit-0.109.2-bz451531.patch URL: http://www.jackaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -53,6 +54,9 @@ %prep %setup -q +%ifarch ppc64 +%patch0 -p0 -b .bz451531 +%endif %build # x86_64 issue reported by Rudolf Kastl (not checked, but not bad). @@ -144,6 +148,10 @@ %{_bindir}/jack_midisine %changelog +* Sun Jul 20 2008 Andy Shevchenko 0.109.2-2 +- apply patch to be work on ppc64 (#451531) +- update README.Fedora to describe integration jack with pulseaudio (#455193) + * Wed Feb 13 2008 Andy Shevchenko 0.109.2-1.1 - update to the last official release From fedora-extras-commits at redhat.com Sun Jul 20 15:35:16 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 20 Jul 2008 15:35:16 GMT Subject: rpms/jack-audio-connection-kit/F-9 jack-audio-connection-kit-0.109.2-bz451531.patch, NONE, 1.1 jack-audio-connection-kit-README.Fedora, 1.1, 1.2 jack-audio-connection-kit.spec, 1.22, 1.23 Message-ID: <200807201535.m6KFZGno010470@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10426 Modified Files: jack-audio-connection-kit-README.Fedora jack-audio-connection-kit.spec Added Files: jack-audio-connection-kit-0.109.2-bz451531.patch Log Message: Fix #455193, #451531 jack-audio-connection-kit-0.109.2-bz451531.patch: --- NEW FILE jack-audio-connection-kit-0.109.2-bz451531.patch --- --- config/cpu/powerpc/cycles.h.orig 2006-05-26 04:45:16.000000000 +0200 +++ config/cpu/powerpc/cycles.h 2008-03-08 18:15:19.000000000 +0100 @@ -36,16 +36,8 @@ { cycles_t ret = 0; - __asm__ __volatile__( - "98: mftb %0\n" - "99:\n" - ".section __ftr_fixup,\"a\"\n" - " .long %1\n" - " .long 0\n" - " .long 98b\n" - " .long 99b\n" - ".previous" - : "=r" (ret) : "i" (CPU_FTR_601)); + __asm__ __volatile__("mftbl %0" : "=r" (ret)); + return ret; } Index: jack-audio-connection-kit-README.Fedora =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-9/jack-audio-connection-kit-README.Fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jack-audio-connection-kit-README.Fedora 26 May 2006 17:15:12 -0000 1.1 +++ jack-audio-connection-kit-README.Fedora 20 Jul 2008 15:34:17 -0000 1.2 @@ -1,4 +1,69 @@ -Running JACK server in realtime mode. + INTEGRATE JACK WITH PULSEAUDIO + +The original text is placed at: + http://www.harald-hoyer.de/linux/pulseaudio-and-jackd + +Switch to root account. + +Install the required packages: + yum install pulseaudio-module-jack alsa-plugins-jack jack-audio-connection-kit + +Add yourself to the pulse-rt and jackuser groups. + usermod -a -G pulse-rt,jackaudio "" + +Edit /etc/security/limits.conf: + + at jackuser - rtprio 20 + at jackuser - memlock 4194304 + at pulse-rt - rtprio 20 + at pulse-rt - nice -20 + +Switch to your normal user account. + +Create ~/bin subdirectory if absent: + mkdir -p ~/bin + +Create the pulseaudio start file ~/bin/jack.pa: + +#!/usr/bin/pulseaudio -nF + +load-module module-jack-sink +load-module module-jack-source + +load-module module-native-protocol-unix +load-module module-volume-restore +load-module module-default-device-restore +load-module module-rescue-streams +load-module module-suspend-on-idle +.ifexists module-gconf.so +.nofail +load-module module-gconf +.fail +.endif +.ifexists module-x11-publish.so +.nofail +load-module module-x11-publish +.fail +.endif + +Close all your sessions and relogin to get the new group permissions and +limits. + +Kill the current pulseaudio daemon: + killall pulseaudio + +Start the jack daemon (your parameters may be different): + jackd -R -P4 -dalsa -r44100 -p512 -n4 -D -Chw:0 -Phw:0 + +Start the pulseaudio daemon: + pulseaudio -nF ~/bin/jack.pa + +Now everything should work. + +Next chapter describes steps for older Fedora vesions. + + + RUNNING JACK SERVER IN REALTIME MODE The JACK server jackd has the capability to run in a real-time mode which greatly decreases the chance of audio glitches. The real-time mode Index: jack-audio-connection-kit.spec =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-9/jack-audio-connection-kit.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jack-audio-connection-kit.spec 14 Feb 2008 10:32:27 -0000 1.22 +++ jack-audio-connection-kit.spec 20 Jul 2008 15:34:17 -0000 1.23 @@ -1,11 +1,12 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.109.2 -Release: 1%{?dist}.1 +Release: 2%{?dist} License: GPLv2 and LGPLv2 Group: System Environment/Daemons Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz Source1: %{name}-README.Fedora +Patch0: jack-audio-connection-kit-0.109.2-bz451531.patch URL: http://www.jackaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -53,6 +54,9 @@ %prep %setup -q +%ifarch ppc64 +%patch0 -p0 -b .bz451531 +%endif %build # x86_64 issue reported by Rudolf Kastl (not checked, but not bad). @@ -144,6 +148,10 @@ %{_bindir}/jack_midisine %changelog +* Sun Jul 20 2008 Andy Shevchenko 0.109.2-2 +- apply patch to be work on ppc64 (#451531) +- update README.Fedora to describe integration jack with pulseaudio (#455193) + * Wed Feb 13 2008 Andy Shevchenko 0.109.2-1.1 - update to the last official release From fedora-extras-commits at redhat.com Sun Jul 20 15:45:12 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 20 Jul 2008 15:45:12 GMT Subject: rpms/xemacs/devel xemacs.spec,1.42,1.43 Message-ID: <200807201545.m6KFjC01010856@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10806 Modified Files: xemacs.spec Log Message: * Sun Jul 20 2008 Ville Skytt?? - 21.5.28-9 - Rebuild. Index: xemacs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- xemacs.spec 6 Jul 2008 21:14:09 -0000 1.42 +++ xemacs.spec 20 Jul 2008 15:44:23 -0000 1.43 @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -545,6 +545,9 @@ %changelog +* Sun Jul 20 2008 Ville Skytt?? - 21.5.28-9 +- Rebuild. + * Sun Jul 6 2008 Ville Skytt?? - 21.5.28-8 - Apply upstream fix for detection of 3D Athena widget sets. From fedora-extras-commits at redhat.com Sun Jul 20 15:56:20 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 20 Jul 2008 15:56:20 GMT Subject: rpms/klamav/devel .cvsignore, 1.5, 1.6 klamav.spec, 1.22, 1.23 sources, 1.5, 1.6 klamav-0.41.1-gcc43.patch, 1.1, NONE klamav-0.42-clamav093.patch, 1.2, NONE Message-ID: <200807201556.m6KFuKoa011233@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/klamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11208 Modified Files: .cvsignore klamav.spec sources Removed Files: klamav-0.41.1-gcc43.patch klamav-0.42-clamav093.patch Log Message: Update to 0.44 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/klamav/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Feb 2008 16:43:27 -0000 1.5 +++ .cvsignore 20 Jul 2008 15:55:32 -0000 1.6 @@ -1 +1 @@ -klamav-0.42.tar.bz2 +klamav-0.44.tar.bz2 Index: klamav.spec =================================================================== RCS file: /cvs/extras/rpms/klamav/devel/klamav.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- klamav.spec 28 Mar 2008 05:51:10 -0000 1.22 +++ klamav.spec 20 Jul 2008 15:55:32 -0000 1.23 @@ -1,24 +1,22 @@ Summary: Clam Anti-Virus on the KDE Desktop Name: klamav -Version: 0.42 -Release: 3%{?dist} +Version: 0.44 +Release: 1%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 Patch0: klamav-suse-clamav-path.diff Patch1: klamav-0.41.1-pwd-echo.patch -Patch2: klamav-0.41.1-gcc43.patch -Patch3: klamav-0.42-clamav093.patch URL: http://klamav.sourceforge.net Group: Applications/System License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: clamav >= 0.90 -Requires: clamav-update >= 0.90 +Requires: clamav >= 0.93 +Requires: clamav-update >= 0.93 %if 0%{?fedora} >= 7 BuildRequires: kdelibs3-devel >= 3.5.2 %else BuildRequires: kdelibs-devel >= 3.5.2 %endif -BuildRequires: clamav-devel >= 0.90 +BuildRequires: clamav-devel >= 0.93 BuildRequires: curl-devel BuildRequires: gmp-devel BuildRequires: desktop-file-utils @@ -31,10 +29,6 @@ %setup -q %patch0 -p0 -b .suse-clamav-path %patch1 -p1 -b .pwd-echo -%patch2 -p1 -b .gcc43 -%if 0%{?fedora} >= 9 -%patch3 -p1 -b .clamav093 -%endif %build %configure --disable-rpath --without-included-sqlite @@ -89,6 +83,11 @@ %{_datadir}/icons/*/*x*/apps/klamav.png %changelog +* Sun Jul 20 2008 Andy Shevchenko 0.44-1 +- update to 0.44 +- bump clamav requirements to have their at least for 0.93 +- remove upstreamed patches + * Fri Mar 28 2008 Kevin Kofler 0.42-3 - patch for clamav 0.93 (#438627) Index: sources =================================================================== RCS file: /cvs/extras/rpms/klamav/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Feb 2008 16:43:27 -0000 1.5 +++ sources 20 Jul 2008 15:55:32 -0000 1.6 @@ -1 +1 @@ -8e5c4267d56039b105866bad3b44a331 klamav-0.42.tar.bz2 +0f5b89db6a8e5d4151a967e4983b4c10 klamav-0.44.tar.bz2 --- klamav-0.41.1-gcc43.patch DELETED --- --- klamav-0.42-clamav093.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 16:38:28 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 20 Jul 2008 16:38:28 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.99-kstandarddirs.patch, NONE, 1.1 kdelibs.spec, 1.349, 1.350 kdelibs-4.0.83-kstandarddirs.patch, 1.2, NONE Message-ID: <200807201638.m6KGcS3g019040@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19008/devel Modified Files: kdelibs.spec Added Files: kdelibs-4.0.99-kstandarddirs.patch Removed Files: kdelibs-4.0.83-kstandarddirs.patch Log Message: * Sun Jul 20 2008 Kevin Kofler 4.0.99-3 - fix kstandarddirs patch to always append the installed location last, even if it is already present earlier in the search path (#456004) kdelibs-4.0.99-kstandarddirs.patch: --- NEW FILE kdelibs-4.0.99-kstandarddirs.patch --- diff -ur kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp 2008-07-09 15:28:22.000000000 +0200 +++ kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-07-20 18:13:28.000000000 +0200 @@ -75,9 +75,12 @@ bool checkRestrictions : 1; QMap restrictions; QStringList xdgdata_prefixes; + QString localXdgdatahome; QStringList xdgconf_prefixes; + QString localXdgconfhome; QStringList prefixes; + QString localKdehome; // Directory dictionaries QMap absolutes; @@ -953,12 +956,65 @@ restrictionActive = true; d->dataRestrictionActive = false; // Reset } + const QStringList *prefixList = 0; + QString home; + if (strncmp(type, "xdgdata-", 8) == 0) + { + prefixList = &(d->xdgdata_prefixes); + home=d->localXdgdatahome; + } + else if (strncmp(type, "xdgconf-", 8) == 0) + { + prefixList = &(d->xdgconf_prefixes); + home=d->localXdgconfhome; + } + else + { + prefixList = &d->prefixes; + home=d->localKdehome; + } QStringList dirs; dirs = d->relatives.value(type); QString installdir = installPath( type ); QString installprefix = installPath("kdedir"); + if(!home.isNull()) + { + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( home + *it ); + testdir.setPath(path); + if (restrictionActive) + continue; + if (!candidates.contains(path)) + candidates.append(path); + } + + } + + // make sure we find the path where it's installed + // we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share + // except for config files, so profiles take precedence + // except for exe files too, so /usr/libexec/kde4 takes precedence over /usr/bin + if (strcmp("config", type) && strcmp("exe", type)) { + if (!installdir.isEmpty()) { + bool ok = true; + foreach (const QString &s, candidates) { + if (installdir.startsWith(s)) { + ok = false; + break; + } + } + if (ok) { + candidates.append(installdir); + } + } + } + if (!dirs.isEmpty()) { bool local = true; @@ -984,45 +1040,34 @@ } } - const QStringList *prefixList = 0; - if (strncmp(type, "xdgdata-", 8) == 0) - prefixList = &(d->xdgdata_prefixes); - else if (strncmp(type, "xdgconf-", 8) == 0) - prefixList = &(d->xdgconf_prefixes); - else - prefixList = &d->prefixes; for (QStringList::ConstIterator pit = prefixList->begin(); pit != prefixList->end(); ++pit) { - if((*pit)!=installprefix||installdir.isEmpty()) - { - for (QStringList::ConstIterator it = dirs.begin(); - it != dirs.end(); ++it) - { - if ( (*it).startsWith('%')) - continue; - QString path = realPath( *pit + *it ); - testdir.setPath(path); - if (local && restrictionActive) - continue; - if ((local || testdir.exists()) && !candidates.contains(path)) - candidates.append(path); - } - local = false; + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( *pit + *it ); + testdir.setPath(path); + if (local && restrictionActive) + continue; + if ((local || testdir.exists()) && !candidates.contains(path)) + candidates.append(path); } - else - { - // we have a custom install path, so use this instead of / - testdir.setPath(installdir); - if(testdir.exists() && ! candidates.contains(installdir)) - candidates.append(installdir); - } + // UGLY HACK - forward porting Chris Cheney's HACK - Rex Dieter + if ( local && (!strcmp("config", type))) + candidates.append("/etc/kde/"); + // + local = false; } } - // make sure we find the path where it's installed + // find the installed path for all resource types + // some code expects it to always come last, so we list it again even if + // we had it already at the beginning if (!installdir.isEmpty()) { bool ok = true; foreach (const QString &s, candidates) { @@ -1501,6 +1546,7 @@ { localKdeDir = KShell::tildeExpand(localKdeDir); addPrefix(localKdeDir); + d->localKdehome=localKdeDir; } #ifdef Q_WS_MACX @@ -1559,6 +1605,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgConfigPrefix(localXdgDir); + d->localXdgconfhome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) @@ -1607,6 +1654,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgDataPrefix(localXdgDir); + d->localXdgdatahome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- kdelibs.spec 19 Jul 2008 06:17:10 -0000 1.349 +++ kdelibs.spec 20 Jul 2008 16:37:44 -0000 1.350 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.99 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -74,8 +74,8 @@ Patch13: kdelibs-4.0.5-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec Patch14: kdelibs-4.0.85-libexecdir.patch -# forward port kstandarddirs hack to search /etc/kde -Patch18: kdelibs-4.0.83-kstandarddirs.patch +# kstandarddirs changes: search /etc/kde, change handling of install locations +Patch18: kdelibs-4.0.99-kstandarddirs.patch # revert a kinit patch which triggers an assertion failure in KComponentData # (and its followup) (#455130) Patch19: kdelibs-4.0.98-revert-kinit-regression.patch @@ -359,6 +359,10 @@ %changelog +* Sun Jul 20 2008 Kevin Kofler 4.0.99-3 +- fix kstandarddirs patch to always append the installed location last, even if + it is already present earlier in the search path (#456004) + * Sat Jul 19 2008 Rex Dieter 4.0.99-2 - use better fedora-buildtype patch from F-9 branch --- kdelibs-4.0.83-kstandarddirs.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 16:55:04 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Sun, 20 Jul 2008 16:55:04 GMT Subject: comps/po fr.po,1.12,1.13 Message-ID: <200807201655.m6KGt48i019623@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19600/po Modified Files: fr.po Log Message: 2008-07-20 Gauthier Ancelin (via gauthier at fedoraproject.org) * po/fr.po: Updated french translation. Index: fr.po =================================================================== RCS file: /cvs/pkgs/comps/po/fr.po,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fr.po 17 Jul 2008 18:31:24 -0000 1.12 +++ fr.po 20 Jul 2008 16:54:33 -0000 1.13 @@ -1,4 +1,4 @@ -# translation of comps (copie).HEAD.po to Fran??ais +# translation of comps.HEAD.po to french # translation of fr.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. @@ -7,14 +7,15 @@ # Thomas Canniot , 2006, 2007, 2008. # Damien Durand , 2006. # Decroux Fabien , 2006. +# Gauthier Ancelin , 2008. msgid "" msgstr "" -"Project-Id-Version: comps (copie).HEAD\n" +"Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2008-05-07 22:23+0100\n" -"Last-Translator: Thomas Canniot \n" -"Language-Team: Fran??ais \n" +"POT-Creation-Date: 2008-06-12 21:03+0000\n" +"PO-Revision-Date: 2008-07-02 22:15+0200\n" +"Last-Translator: Gauthier Ancelin \n" +"Language-Team: french \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -83,7 +84,7 @@ #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 #: ../comps-f10.xml.in.h:13 msgid "Basic support for the Ruby programming language." -msgstr "Support de base pour le langage de programmation Ruby" +msgstr "Prise en charge de base pour le langage de programmation Ruby" #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 #: ../comps-f10.xml.in.h:14 @@ -198,7 +199,7 @@ #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 #: ../comps-f10.xml.in.h:37 msgid "Dial-up Networking Support" -msgstr "Support d'acc??s distant au r??seau" +msgstr "Prise en charge de l'acc??s distant au r??seau" #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 #: ../comps-f10.xml.in.h:38 @@ -280,7 +281,7 @@ "From CD recording to playing audio CDs and multimedia files, this package " "group allows you to work with sound and video on the system." msgstr "" -"Ce groupe de paquetages vous permet de travailler sur votre syst??me avec du " +"Ce groupe de paquets vous permet de travailler sur votre syst??me avec du " "son et des images, de l'enregistrement de CD-ROM ?? la lecture de CD audio et " "de fichiers multim??dia." @@ -352,116 +353,114 @@ #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69 #: ../comps-f10.xml.in.h:69 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 msgid "Hardware Support" -msgstr "Support mat??riel" +msgstr "Prise en charge du mat??riel" #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70 -#: ../comps-f10.xml.in.h:71 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 +#: ../comps-f10.xml.in.h:70 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 msgid "Hebrew Support" msgstr "Prise en charge de l'h??breu" #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71 -#: ../comps-f10.xml.in.h:72 +#: ../comps-f10.xml.in.h:71 msgid "Hindi Support" msgstr "Prise en charge de l'hindi" #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72 -#: ../comps-f10.xml.in.h:73 +#: ../comps-f10.xml.in.h:72 msgid "Hungarian Support" msgstr "Prise en charge du hongrois" #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73 -#: ../comps-f10.xml.in.h:74 +#: ../comps-f10.xml.in.h:73 msgid "Icelandic Support" msgstr "Prise en charge de l'islandais" #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74 -#: ../comps-f10.xml.in.h:75 +#: ../comps-f10.xml.in.h:74 msgid "Indonesian Support" msgstr "Prise en charge de l'indon??sien" #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75 -#: ../comps-f10.xml.in.h:78 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 +#: ../comps-f10.xml.in.h:77 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 msgid "" "Install these packages in order to develop GTK+ and GNOME graphical " "applications." msgstr "" -"Installer ces paquetages pour d??velopper les applications graphiques GTK+ et " +"Installer ces paquets pour d??velopper les applications graphiques GTK+ et " "GNOME." #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76 -#: ../comps-f10.xml.in.h:79 +#: ../comps-f10.xml.in.h:78 msgid "" "Install these packages in order to develop GTK+ and XFCE graphical " "applications." msgstr "" -"Installer ces paquetages pour d??velopper les applications graphiques GTK+ et " +"Installer ces paquets pour d??velopper les applications graphiques GTK+ et " "XFCE." #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77 -#: ../comps-f10.xml.in.h:80 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 +#: ../comps-f10.xml.in.h:79 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." msgstr "" -"Installer ces paquetages pour d??velopper les applications graphiques QT et " +"Installer ces paquets pour d??velopper les applications graphiques QT et " "KDE." #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78 -#: ../comps-f10.xml.in.h:81 -msgid "" -"Install these tools to enable the system to print or act as a print server." +#: ../comps-f10.xml.in.h:80 +msgid "Install these tools to enable the system to print or act as a print server." msgstr "" "Installer ces outils pour habiliter le syst??me ?? imprimer ou agir comme un " "serveur d'impression." #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79 -#: ../comps-f10.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 -msgid "" -"Install this group of packages to use the base graphical (X) user interface." +#: ../comps-f10.xml.in.h:81 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 +msgid "Install this group of packages to use the base graphical (X) user interface." msgstr "" -"Installer ce groupe de paquetages pour utiliser l'interface utilisateur " +"Installer ce groupe de paquets pour utiliser l'interface utilisateur " "graphique de base (X)." #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81 -#: ../comps-f10.xml.in.h:84 +#: ../comps-f10.xml.in.h:83 msgid "Inuktitut Support" msgstr "Prise en charge de l'inuktitut " #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82 -#: ../comps-f10.xml.in.h:85 +#: ../comps-f10.xml.in.h:84 msgid "Irish Support" msgstr "Prise en charge de l'irlandais" #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83 -#: ../comps-f10.xml.in.h:86 +#: ../comps-f10.xml.in.h:85 msgid "Italian Support" msgstr "Prise en charge de l'italien" #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84 -#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 +#: ../comps-f10.xml.in.h:86 ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 msgid "Japanese Support" msgstr "Prise en charge du japonais" #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85 -#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:31 +#: ../comps-f10.xml.in.h:87 ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86 -#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:32 +#: ../comps-f10.xml.in.h:88 ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "D??veloppement Java" #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87 -#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 +#: ../comps-f10.xml.in.h:89 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" msgstr "Environnement de bureau KDE" #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88 -#: ../comps-f10.xml.in.h:91 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 +#: ../comps-f10.xml.in.h:90 ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 msgid "KDE Software Development" msgstr "D??veloppement de logiciel KDE" #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89 -#: ../comps-f10.xml.in.h:92 +#: ../comps-f10.xml.in.h:91 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -471,229 +470,226 @@ "graphique." #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90 -#: ../comps-f10.xml.in.h:93 +#: ../comps-f10.xml.in.h:92 msgid "Kannada Support" msgstr "Prise en charge du kannada" #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92 -#: ../comps-f10.xml.in.h:95 +#: ../comps-f10.xml.in.h:94 msgid "Khmer Support" msgstr "Prise en charge du khmer" #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93 -#: ../comps-f10.xml.in.h:96 +#: ../comps-f10.xml.in.h:95 msgid "Korean Support" msgstr "Prise en charge du cor??en" #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:94 -#: ../comps-f10.xml.in.h:97 +#: ../comps-f10.xml.in.h:96 msgid "Languages" msgstr "Langues" #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:95 -#: ../comps-f10.xml.in.h:98 +#: ../comps-f10.xml.in.h:97 msgid "Lao Support" msgstr "Prise en charge du lao" #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:96 -#: ../comps-f10.xml.in.h:99 +#: ../comps-f10.xml.in.h:98 msgid "Latvian Support" msgstr "Prise en charge du letton" #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:98 -#: ../comps-f10.xml.in.h:101 +#: ../comps-f10.xml.in.h:100 msgid "Legacy Network Server" msgstr "Serveur de r??seau h??rit??" #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:99 -#: ../comps-f10.xml.in.h:102 +#: ../comps-f10.xml.in.h:101 msgid "Legacy Software Development" msgstr "D??veloppement du logiciel h??rit??" #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:100 -#: ../comps-f10.xml.in.h:103 +#: ../comps-f10.xml.in.h:102 msgid "Legacy Software Support" -msgstr "Support du logiciel h??rit??" +msgstr "Prise en charge du logiciel h??rit??" #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:101 -#: ../comps-f10.xml.in.h:104 +#: ../comps-f10.xml.in.h:103 msgid "Lithuanian Support" msgstr "Prise en charge du lituanien" #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:104 -#: ../comps-f10.xml.in.h:107 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 +#: ../comps-f10.xml.in.h:106 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 msgid "Mail Server" msgstr "Serveur de messagerie" #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:105 -#: ../comps-f10.xml.in.h:108 +#: ../comps-f10.xml.in.h:107 msgid "Malay Support" msgstr "Prise en charge du malais" #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:106 -#: ../comps-f10.xml.in.h:109 +#: ../comps-f10.xml.in.h:108 msgid "Malayalam Support" msgstr "Prise en charge du malay??lam" #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:107 -#: ../comps-f10.xml.in.h:110 +#: ../comps-f10.xml.in.h:109 msgid "Maori Support" msgstr "Prise en charge du m??ori" #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:108 -#: ../comps-f10.xml.in.h:111 +#: ../comps-f10.xml.in.h:110 msgid "Marathi Support" msgstr "Prise en charge du marathi" #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:110 -#: ../comps-f10.xml.in.h:113 +#: ../comps-f10.xml.in.h:112 msgid "MySQL Database" msgstr "Base de donn??es MySQL" #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:112 -#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 +#: ../comps-f10.xml.in.h:114 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 msgid "Network Servers" msgstr "Serveurs de r??seau" #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:113 -#: ../comps-f10.xml.in.h:116 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 +#: ../comps-f10.xml.in.h:115 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 msgid "News Server" msgstr "Serveur de news" #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:115 -#: ../comps-f10.xml.in.h:118 +#: ../comps-f10.xml.in.h:117 msgid "Northern Sotho Support" msgstr "Prise en charge du sotho du Nord" #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:116 -#: ../comps-f10.xml.in.h:119 +#: ../comps-f10.xml.in.h:118 msgid "Norwegian Support" msgstr "Prise en charge du norv??gien" #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:117 -#: ../comps-f10.xml.in.h:120 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 +#: ../comps-f10.xml.in.h:119 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "Bureau/Productivit??" #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:119 -#: ../comps-f10.xml.in.h:122 +#: ../comps-f10.xml.in.h:121 msgid "Oriya Support" msgstr "Prise en charge de l'oriya" #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:120 -#: ../comps-f10.xml.in.h:123 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 +#: ../comps-f10.xml.in.h:122 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 msgid "" "Packages which provide functionality for developing and building " "applications." -msgstr "" -"Paquetages qui offrent des fonctions de d??veloppement et de cr??ation " -"d'applications." +msgstr "Paquets qui offrent des fonctions de d??veloppement et de cr??ation d'applications." #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:121 -#: ../comps-f10.xml.in.h:124 +#: ../comps-f10.xml.in.h:123 msgid "Persian Support" msgstr "Prise en charge du perse" #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:122 -#: ../comps-f10.xml.in.h:125 +#: ../comps-f10.xml.in.h:124 msgid "Polish Support" msgstr "Prise en charge du polonais" #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:123 -#: ../comps-f10.xml.in.h:126 +#: ../comps-f10.xml.in.h:125 msgid "Portuguese Support" msgstr "Prise en charge du portugais" #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:124 -#: ../comps-f10.xml.in.h:127 +#: ../comps-f10.xml.in.h:126 msgid "PostgreSQL Database" msgstr "Base de donn??es PostgreSQL" #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:125 -#: ../comps-f10.xml.in.h:128 +#: ../comps-f10.xml.in.h:127 msgid "Printing Support" msgstr "Prise en charge de l'impression" #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:126 -#: ../comps-f10.xml.in.h:129 +#: ../comps-f10.xml.in.h:128 msgid "Punjabi Support" msgstr "Prise en charge du panj??b??" #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:127 -#: ../comps-f10.xml.in.h:130 +#: ../comps-f10.xml.in.h:129 msgid "Romanian Support" msgstr "Prise en charge du roumain" #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:128 -#: ../comps-f10.xml.in.h:131 +#: ../comps-f10.xml.in.h:130 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:129 -#: ../comps-f10.xml.in.h:132 +#: ../comps-f10.xml.in.h:131 msgid "Russian Support" msgstr "Prise en charge du russe" -#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:132 -#: ../comps-f10.xml.in.h:135 +#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:130 +#: ../comps-f10.xml.in.h:132 msgid "Samoan Support" msgstr "Prise en charge du samoan" -#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:133 -#: ../comps-f10.xml.in.h:136 +#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:131 +#: ../comps-f10.xml.in.h:133 msgid "Serbian Support" msgstr "Prise en charge du serbe" -#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:134 -#: ../comps-f10.xml.in.h:137 +#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:132 +#: ../comps-f10.xml.in.h:134 msgid "Server Configuration Tools" msgstr "Outils de configuration de serveur" -#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:135 -#: ../comps-f10.xml.in.h:138 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 +#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:133 +#: ../comps-f10.xml.in.h:135 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 msgid "Servers" msgstr "Serveurs" -#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:136 -#: ../comps-f10.xml.in.h:139 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 -msgid "" -"Simple window managers that aren't part of a larger desktop environment." +#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:134 +#: ../comps-f10.xml.in.h:136 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 +msgid "Simple window managers that aren't part of a larger desktop environment." msgstr "" "Simples gestionnaires de fen??tres n'appartenant ?? aucun environnement de " "bureau." -#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:137 -#: ../comps-f10.xml.in.h:140 +#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:135 +#: ../comps-f10.xml.in.h:137 msgid "Sinhala Support" msgstr "Prise en charge du sinhala" -#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:138 -#: ../comps-f10.xml.in.h:141 +#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:136 +#: ../comps-f10.xml.in.h:138 msgid "Slovak Support" msgstr "Prise en charge du slovaque" -#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:139 -#: ../comps-f10.xml.in.h:142 +#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:137 +#: ../comps-f10.xml.in.h:139 msgid "Slovenian Support" msgstr "Prise en charge du slov??ne" -#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:140 -#: ../comps-f10.xml.in.h:143 +#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:138 +#: ../comps-f10.xml.in.h:140 msgid "Smallest possible installation" msgstr "Plus petite installation possible" -#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:141 -#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 +#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:139 +#: ../comps-f10.xml.in.h:141 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "Logiciels utilis??s pour serveurs de r??seau actifs" -#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:142 -#: ../comps-f10.xml.in.h:145 +#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:140 +#: ../comps-f10.xml.in.h:142 msgid "Somali Support" msgstr "Prise en charge du somalien" -#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:143 -#: ../comps-f10.xml.in.h:146 +#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:141 +#: ../comps-f10.xml.in.h:143 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -701,75 +697,75 @@ "Parfois appel??s ??diteurs de texte, ces programmes vous permettent de cr??er " "et d'??diter des fichiers texte. Ils comprennent Emacs et Vi." -#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:144 -#: ../comps-f10.xml.in.h:147 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 +#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:142 +#: ../comps-f10.xml.in.h:144 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 msgid "Sound and Video" msgstr "Son et vid??o" -#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:145 -#: ../comps-f10.xml.in.h:148 +#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:143 +#: ../comps-f10.xml.in.h:145 msgid "Southern Ndebele Support" msgstr "Prise en charge du nd??b??l?? du sud" -#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:146 -#: ../comps-f10.xml.in.h:149 +#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:144 +#: ../comps-f10.xml.in.h:146 msgid "Southern Sotho Support" msgstr "Prise en charge du sotho du Sud" -#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:147 -#: ../comps-f10.xml.in.h:150 +#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:145 +#: ../comps-f10.xml.in.h:147 msgid "Spanish Support" msgstr "Prise en charge de l'espagnol" -#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:148 -#: ../comps-f10.xml.in.h:151 ../comps-el4.xml.in.h:46 +#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:146 +#: ../comps-f10.xml.in.h:148 ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "" "Prise en charge du d??veloppement d'applications en langage de programmation " "Java" -#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:149 -#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:47 +#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:147 +#: ../comps-f10.xml.in.h:149 ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." -msgstr "Support pour le lancement d'applications ??crites en langage Java" +msgstr "Prise en charge de l'ex??cution d'applications ??crites en langage Java" -#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:150 -#: ../comps-f10.xml.in.h:153 +#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:148 +#: ../comps-f10.xml.in.h:150 msgid "Swati Support" msgstr "Prise en charge du swati" -#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:151 -#: ../comps-f10.xml.in.h:154 +#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:149 +#: ../comps-f10.xml.in.h:151 msgid "Swedish Support" msgstr "Prise en charge du su??dois" -#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:152 -#: ../comps-f10.xml.in.h:155 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 +#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:150 +#: ../comps-f10.xml.in.h:152 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 msgid "System Tools" msgstr "Outils syst??me" -#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:153 -#: ../comps-f10.xml.in.h:156 +#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:151 +#: ../comps-f10.xml.in.h:153 msgid "Tagalog Support" msgstr "Prise en charge du tagalog" -#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:154 -#: ../comps-f10.xml.in.h:158 +#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:152 +#: ../comps-f10.xml.in.h:154 msgid "Tamil Support" msgstr "Prise en charge du tamil" -#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:155 -#: ../comps-f10.xml.in.h:159 +#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:153 +#: ../comps-f10.xml.in.h:155 msgid "Telugu Support" msgstr "Prise en charge du t??lougou" -#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:156 -#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 +#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:154 +#: ../comps-f10.xml.in.h:156 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 msgid "Text-based Internet" msgstr "Internet bas?? sur du texte" -#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:157 -#: ../comps-f10.xml.in.h:161 +#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:155 +#: ../comps-f10.xml.in.h:157 msgid "Thai Support" msgstr "Prise en charge du tha??" @@ -777,84 +773,75 @@ msgid "The Eclipse Integrated Development Environment." msgstr "L'environnement de d??veloppement int??gr?? Eclipse." -#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:158 -#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 +#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:156 +#: ../comps-f10.xml.in.h:158 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "" "Les applications comprennent des suites bureautiques, des afficheurs PDF et " "bien plus encore." -#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:159 -#: ../comps-f10.xml.in.h:163 -msgid "" -"The packages in this group are core libraries needed to develop applications." -msgstr "" -"Les paquetages de ce groupe sont des biblioth??ques de m??moire n??cessaires au " -"d??veloppement d'applications." +#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:157 +#: ../comps-f10.xml.in.h:159 +msgid "The packages in this group are core libraries needed to develop applications." +msgstr "Les paquets de ce groupe sont des biblioth??ques centrales n??cessaires au d??veloppement d'applications." -#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:160 -#: ../comps-f10.xml.in.h:164 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 +#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:158 +#: ../comps-f10.xml.in.h:160 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." msgstr "" -"Ces paquetages vous permettent de configurer un serveur de messagerie IMAP " +"Ces paquets vous permettent de configurer un serveur de messagerie IMAP " "ou SMTP." -#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:161 -#: ../comps-f10.xml.in.h:165 -msgid "" -"These packages allow you to develop applications for the X Window System." +#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:159 +#: ../comps-f10.xml.in.h:161 +msgid "These packages allow you to develop applications for the X Window System." msgstr "" -"Ces paquetages vous permettent de d??velopper des applications pour le " +"Ces paquets vous permettent de d??velopper des applications pour le " "syst??me X Window." -#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:162 -#: ../comps-f10.xml.in.h:166 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 -msgid "" -"These packages are helpful when developing web applications or web pages." +#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:160 +#: ../comps-f10.xml.in.h:162 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 +msgid "These packages are helpful when developing web applications or web pages." msgstr "" -"Ces paquetages sont utiles pour d??velopper des applications web ou des pages " +"Ces paquets sont utiles pour d??velopper des applications web ou des pages " "web." -#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:163 -#: ../comps-f10.xml.in.h:167 -msgid "" -"These packages include network-based servers such as DHCP, Kerberos and NIS." +#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:161 +#: ../comps-f10.xml.in.h:163 +msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "" -"Ces paquetages comprennent des serveurs bas??s sur le r??seau comme DHCP, " +"Ces paquets comprennent des serveurs bas??s sur le r??seau comme DHCP, " "Kerberos et NIS." -#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:164 -#: ../comps-f10.xml.in.h:168 +#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:162 +#: ../comps-f10.xml.in.h:164 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." msgstr "" -"Ces paquetages comprennent des serveurs pour d'anciens protocoles r??seau " +"Ces paquets comprennent des serveurs pour d'anciens protocoles r??seau " "comme rsh et telnet." -#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:165 -#: ../comps-f10.xml.in.h:169 +#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:163 +#: ../comps-f10.xml.in.h:165 msgid "These packages provide a virtualization environment." -msgstr "Ces paquetages offrent un environnement de virtualisation." +msgstr "Ces paquets offrent un environnement de virtualisation." -#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:166 -#: ../comps-f10.xml.in.h:170 +#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:164 +#: ../comps-f10.xml.in.h:166 msgid "These packages provide compatibility with previous releases." -msgstr "" -"Ces paquetages offrent un support de compatibilit?? avec les versions " -"pr??c??dentes." +msgstr "Ces paquets offrent une prise en charge de la compatibilit?? avec les versions pr??c??dentes." -#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:167 -#: ../comps-f10.xml.in.h:171 +#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:165 +#: ../comps-f10.xml.in.h:167 +#, fuzzy msgid "" "These packages provide support for various locales including fonts and input " "methods." -msgstr "" -"Ces paquetages offrent le support pour la compatibilit?? pour diff??rentes " -"localisations comprenant des polices de caract??res et des m??thodes de saisie." +msgstr "Ces paquets fournissent la prise en charge de la compatibilit?? pour diff??rentes localisations y compris des polices de caract??res et des m??thodes de saisie." -#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:168 -#: ../comps-f10.xml.in.h:172 +#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:166 +#: ../comps-f10.xml.in.h:168 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -862,18 +849,18 @@ "Ces outils vous permettent de cr??er de la documentation au format DocBook et " "de la convertir en format HTML, PDF, Postscript et texte." -#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:169 -#: ../comps-f10.xml.in.h:173 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 +#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:167 +#: ../comps-f10.xml.in.h:169 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." msgstr "Ces outils vous permettent d'ex??cuter un serveur Web sur le syst??me." -#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:170 -#: ../comps-f10.xml.in.h:174 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 +#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:168 +#: ../comps-f10.xml.in.h:170 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." msgstr "Ces outils vous permettent d'ex??cuter un serveur FTP sur le syst??me. " -#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:171 -#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 +#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:169 +#: ../comps-f10.xml.in.h:171 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 msgid "" "These tools include core development tools such as automake, gcc, perl, " "python, and debuggers." @@ -881,54 +868,52 @@ "Ces outils comprennent des outils de d??veloppement m??moire comme automake, " "gcc, perl, python, ainsi que des d??bogueurs." -#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:172 -#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 +#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:170 +#: ../comps-f10.xml.in.h:172 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." msgstr "" "Ce groupe vous permet de configurer le syst??me comme un serveur de groupes " "de nouvelles." -#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:173 -#: ../comps-f10.xml.in.h:177 +#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:171 +#: ../comps-f10.xml.in.h:173 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" "Ce groupe contient tous les outils de configuration du serveur personnalis?? " "de Red Hat." -#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:174 -#: ../comps-f10.xml.in.h:178 +#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:172 +#: ../comps-f10.xml.in.h:174 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." -msgstr "" -"Ce groupe inclut un ensemble minimum de paquetages. Utile pour la cr??ation " -"de petits routeurs/bo??tes de pare-feu, par exemple." +msgstr "Ce groupe inclut un ensemble minimum de paquets. Utile pour cr??er une machine d??di??e au routage et/ou pare-feu, par exemple." -#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:175 -#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 +#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:173 +#: ../comps-f10.xml.in.h:175 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "" "Ce groupe comprend le courrier ??lectronique graphique, Web et les clients de " "conversation." -#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:176 -#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 +#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:174 +#: ../comps-f10.xml.in.h:176 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 msgid "" "This group includes packages for performing mathematical and scientific " "computations and plotting, as well as unit conversion." msgstr "" -"Ce groupe comprend les paquetages pour ex??cuter des calculs math??matiques et " +"Ce groupe comprend les paquets pour ex??cuter des calculs math??matiques et " "scientifiques, le tra??age et la conversion des unit??s." -#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:177 -#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 +#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:175 +#: ../comps-f10.xml.in.h:177 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." msgstr "" -"Ce groupe comprend des paquetages qui vous aident ?? manipuler et scanner des " +"Ce groupe comprend des paquets qui vous aident ?? manipuler et scanner des " "images." -#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:178 -#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 +#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:176 +#: ../comps-f10.xml.in.h:178 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 msgid "" "This group includes text-based email, Web, and chat clients. These " "applications do not require the X Window System." @@ -937,8 +922,8 @@ "clients de conversation. Ces applications ne n??cessitent pas le syst??me X " "Window." -#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:179 -#: ../comps-f10.xml.in.h:183 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 +#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:177 +#: ../comps-f10.xml.in.h:179 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 msgid "" "This group is a collection of graphical administration tools for the system, " "such as for managing user accounts and configuring system hardware." @@ -947,22 +932,20 @@ "syst??me, ainsi que pour la gestion des comptes utilisateurs et la " "configuration du mat??riel syst??me." -#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:180 -#: ../comps-f10.xml.in.h:184 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 -msgid "" -"This group is a collection of tools and resources of Armenian environments." +#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:178 +#: ../comps-f10.xml.in.h:180 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 +msgid "This group is a collection of tools and resources of Armenian environments." msgstr "" "Ce groupe comprend un ensemble d'outils et de ressources pour les " "environnements en arm??nien." -#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:181 -#: ../comps-f10.xml.in.h:185 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 -msgid "" -"This group is a collection of tools for various hardware specific utilities." +#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:179 +#: ../comps-f10.xml.in.h:181 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 +msgid "This group is a collection of tools for various hardware specific utilities." msgstr "Ce groupe comprend un ensemble d'outils pour du mat??riel sp??cifique." -#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:182 -#: ../comps-f10.xml.in.h:186 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 +#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:180 +#: ../comps-f10.xml.in.h:182 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 msgid "" "This group is a collection of various tools for the system, such as the " "client for connecting to SMB shares and tools to monitor network traffic." @@ -971,152 +954,149 @@ "client pour la connexion aux parts SMB et d'outils permettant de g??rer le " "trafic dans le r??seau." -#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:183 -#: ../comps-f10.xml.in.h:187 -msgid "" -"This package group allows you to run a DNS name server (BIND) on the system." +#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:181 +#: ../comps-f10.xml.in.h:183 +msgid "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" -"Ce groupe de paquetages vous permet d'ex??cuter un serveur de noms DNS (BIND) " +"Ce groupe de paquets vous permet d'ex??cuter un serveur de noms DNS (BIND) " "sur le syst??me." -#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:184 -#: ../comps-f10.xml.in.h:188 +#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:182 +#: ../comps-f10.xml.in.h:184 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." msgstr "" -"Ce groupe de paquetages vous permet de partager des fichiers entre les " +"Ce groupe de paquets vous permet de partager des fichiers entre les " "syst??mes Linux et Windows (tm)." -#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:185 -#: ../comps-f10.xml.in.h:189 +#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:183 +#: ../comps-f10.xml.in.h:185 msgid "This package group contains packages useful for use with MySQL." -msgstr "" -"Ce groupe contient des paquetages utiles lors de l'utilisation de MySQL." +msgstr "Ce groupe contient des paquets utiles lors de l'utilisation de MySQL." -#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:186 -#: ../comps-f10.xml.in.h:190 +#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:184 +#: ../comps-f10.xml.in.h:186 msgid "This package group includes packages useful for use with Postgresql." -msgstr "" -"Ce groupe comprend des paquetages utiles lors de l'utilisation de Postgresql." +msgstr "Ce groupe comprend des paquets utiles lors de l'utilisation de Postgresql." -#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:187 -#: ../comps-f10.xml.in.h:191 +#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:185 +#: ../comps-f10.xml.in.h:187 msgid "Tibetan Support" msgstr "Prise en charge du tib??tin" -#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:188 -#: ../comps-f10.xml.in.h:192 +#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:186 +#: ../comps-f10.xml.in.h:188 msgid "Tonga Support" msgstr "Prise en charge du tongien" -#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:189 -#: ../comps-f10.xml.in.h:193 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 +#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:187 +#: ../comps-f10.xml.in.h:189 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" msgstr "Outils et utilitaires n??cessaires ?? un empaqueteur Fedora" -#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:190 -#: ../comps-f10.xml.in.h:194 +#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:188 +#: ../comps-f10.xml.in.h:190 msgid "Tsonga Support" msgstr "Prise en charge du tsonga" -#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:191 -#: ../comps-f10.xml.in.h:195 +#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:189 +#: ../comps-f10.xml.in.h:191 msgid "Tswana Support" msgstr "Prise en charge du tswana" -#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:192 -#: ../comps-f10.xml.in.h:196 +#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:190 +#: ../comps-f10.xml.in.h:192 msgid "Turkish Support" msgstr "Prise en charge du turc" -#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:193 -#: ../comps-f10.xml.in.h:197 +#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:191 +#: ../comps-f10.xml.in.h:193 msgid "Ukrainian Support" msgstr "Prise en charge de l'ukrainien" -#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:194 -#: ../comps-f10.xml.in.h:198 +#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:192 +#: ../comps-f10.xml.in.h:194 msgid "Urdu Support" msgstr "Prise en charge de l'ourdou" -#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:195 -#: ../comps-f10.xml.in.h:199 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 +#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:193 +#: ../comps-f10.xml.in.h:195 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." msgstr "Divers composants du syst??me de base." -#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:196 -#: ../comps-f10.xml.in.h:200 ../comps-el5.xml.in.h:72 +#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:194 +#: ../comps-f10.xml.in.h:196 ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "Diff??rentes mani??res de vous relaxer et de passer le temps." -#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:197 -#: ../comps-f10.xml.in.h:201 +#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:195 +#: ../comps-f10.xml.in.h:197 msgid "Venda Support" msgstr "Prise en charge du venda" -#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:198 -#: ../comps-f10.xml.in.h:202 +#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:196 +#: ../comps-f10.xml.in.h:198 msgid "Vietnamese Support" msgstr "Prise en charge du vietnamien" -#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:199 -#: ../comps-f10.xml.in.h:203 +#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:197 +#: ../comps-f10.xml.in.h:199 msgid "Virtualization" msgstr "Virtualisation" -#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:201 -#: ../comps-f10.xml.in.h:205 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 +#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:199 +#: ../comps-f10.xml.in.h:201 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 msgid "Web Development" msgstr "D??veloppement web" -#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:202 -#: ../comps-f10.xml.in.h:206 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 +#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:200 +#: ../comps-f10.xml.in.h:202 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 msgid "Web Server" msgstr "Serveur Web" -#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:203 -#: ../comps-f10.xml.in.h:207 +#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:201 +#: ../comps-f10.xml.in.h:203 msgid "Welsh Support" msgstr "Prise en charge du gallois" -#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:204 -#: ../comps-f10.xml.in.h:208 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 +#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:202 +#: ../comps-f10.xml.in.h:204 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 msgid "Window Managers" msgstr "Gestionnaire de fen??tres" -#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:205 -#: ../comps-f10.xml.in.h:209 +#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:203 +#: ../comps-f10.xml.in.h:205 msgid "Windows File Server" msgstr "Serveur de fichiers Windows" -#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:206 -#: ../comps-f10.xml.in.h:210 +#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:204 +#: ../comps-f10.xml.in.h:206 msgid "X Software Development" msgstr "D??veloppement du logiciel X" -#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:207 -#: ../comps-f10.xml.in.h:211 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 +#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:205 +#: ../comps-f10.xml.in.h:207 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 msgid "X Window System" msgstr "Syst??me X Window" -#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:208 -#: ../comps-f10.xml.in.h:212 +#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:206 +#: ../comps-f10.xml.in.h:208 msgid "XFCE" msgstr "XFCE" -#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:209 -#: ../comps-f10.xml.in.h:213 +#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:207 +#: ../comps-f10.xml.in.h:209 msgid "XFCE Software Development" msgstr "D??veloppement du logiciel XFCE" -#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:210 -#: ../comps-f10.xml.in.h:214 +#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:208 +#: ../comps-f10.xml.in.h:210 msgid "Xhosa Support" msgstr "Prise en charge du xhosa" -#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:211 -#: ../comps-f10.xml.in.h:215 +#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:209 +#: ../comps-f10.xml.in.h:211 msgid "Zulu Support" msgstr "Prise en charge du zoulou" @@ -1134,78 +1114,59 @@ #: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54 msgid "Fonts packages for rendering text on the desktop." -msgstr "" -"Paquetages de polices de caract??res pour afficher du texte sur le bureau." +msgstr "Paquets de polices de caract??res pour afficher du texte sur le bureau." -#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83 +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:82 msgid "Integrated Development Environments based on Eclipse." msgstr "Les environnements de d??veloppement int??gr??s bas??s sur Eclipse." -#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:100 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:99 msgid "Legacy Fonts" msgstr "Anciennes polices de caract??res" -#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:105 +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:104 msgid "Low Saxon Support" msgstr "Prise en charge du bas-allemand" -#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:112 +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:111 msgid "Mongolian Support" msgstr "Prise en charge du mongol" -#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:114 +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:113 msgid "Nepali Support" msgstr "Prise en charge du n??palais" -#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:121 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:120 msgid "Older bitmap and vector fonts packages" -msgstr "Anciens paquetages de polices de caract??res et d'images bitmap" +msgstr "Anciens paquets de polices de caract??res vectorielles et matricielles" #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 msgid "Esperanto Support" msgstr "Prise en charge de l'esp??ranto" -#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:94 +#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:93 msgid "Kashubian Support" msgstr "Prise en charge du kachoube" -#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:106 +#: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:105 msgid "Macedonian Support" msgstr "Prise en charge du mac??donien" -#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:117 +#: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:116 msgid "Northern Sami Support" msgstr "Prise en charge du same du Nord" -#: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:133 -#, fuzzy -msgid "SUGAR Desktop Environment" -msgstr "Environnement de bureau" - -#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134 -msgid "SUGAR is the desktop environment developed for the OLPC XO." -msgstr "" - -#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204 +#: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:200 msgid "Walloon Support" msgstr "Prise en charge du wallon" -#: ../comps-f10.xml.in.h:70 -msgid "Haskell" -msgstr "" - -#: ../comps-f10.xml.in.h:76 +#: ../comps-f10.xml.in.h:75 msgid "Input Methods" -msgstr "" +msgstr "M??thodes de saisie" -#: ../comps-f10.xml.in.h:77 +#: ../comps-f10.xml.in.h:76 msgid "Input method packages for the input of international text." -msgstr "" - -#: ../comps-f10.xml.in.h:157 -#, fuzzy -msgid "Tajik Support" -msgstr "Prise en charge du tha??" +msgstr "Paquets de m??thodes de saisie de textes internationaux." #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" @@ -1213,7 +1174,7 @@ #: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" -msgstr "Support d'acc??s distant au r??seau" +msgstr "Prise en charge de l'acc??s distant au r??seau" #: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 msgid "" @@ -1260,22 +1221,19 @@ "sp??cifiques" #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Arabic environments." +msgid "This group is a collection of tools and resources of Arabic environments." msgstr "" "Ce groupe comprend un ensemble d'outils et de ressources pour les " "environnements en arabe." #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 -msgid "" -"This group is a collection of tools and resources of Hebrew environments." +msgid "This group is a collection of tools and resources of Hebrew environments." msgstr "" "Ce groupe comprend un ensemble d'outils et de ressources pour les " "environnements en h??bra??que." #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools and resources of Japanese environments." +msgid "This group is a collection of tools and resources of Japanese environments." msgstr "" "Ce groupe comprend un ensemble d'outils et de ressources pour les " "environnements en japonais." @@ -1285,8 +1243,8 @@ msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -msgid "" -"This group is a collection of tools and resources of Czech environments." +msgid "This group is a collection of tools and resources of Czech environments." msgstr "" "Ce groupe comprend un ensemble d'outils et de ressources pour les " "environnements en tch??que." + From fedora-extras-commits at redhat.com Sun Jul 20 17:17:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:17:25 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201717.m6KHHPjo007194@bastion.fedora.phx.redhat.com> Package moomps in Fedora devel was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:17:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:17:45 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201717.m6KHHPjq007194@bastion.fedora.phx.redhat.com> Package moomps in Fedora 7 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:17:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:17:39 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201717.m6KHHnFS007214@bastion.fedora.phx.redhat.com> Package moomps in Fedora 3 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:18:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:18:03 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201718.m6KHHPjs007194@bastion.fedora.phx.redhat.com> Package moomps in Fedora 4 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:18:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:18:07 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201718.m6KHI71K007275@bastion.fedora.phx.redhat.com> Package moomps in Fedora 5 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:18:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:18:15 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201718.m6KHHnFU007214@bastion.fedora.phx.redhat.com> Package moomps in Fedora 6 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:18:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:18:19 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201718.m6KHIJ7t007321@bastion.fedora.phx.redhat.com> Package moomps in Fedora 8 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:18:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:18:25 +0000 Subject: [pkgdb] moomps ownership updated Message-ID: <200807201718.m6KHI71M007275@bastion.fedora.phx.redhat.com> Package moomps in Fedora 9 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moomps From fedora-extras-commits at redhat.com Sun Jul 20 17:19:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:21 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJL1B007393@bastion.fedora.phx.redhat.com> Package moodss in Fedora devel is now owned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:26 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJQpe007410@bastion.fedora.phx.redhat.com> Package moodss in Fedora devel was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:17 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJRUh007392@bastion.fedora.phx.redhat.com> Package moodss in Fedora devel was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:33 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJRUj007392@bastion.fedora.phx.redhat.com> Package moodss in Fedora 7 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:36 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJL1D007393@bastion.fedora.phx.redhat.com> Package moodss in Fedora 1 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:44 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJRUl007392@bastion.fedora.phx.redhat.com> Package moodss in Fedora 2 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:48 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJmsm007507@bastion.fedora.phx.redhat.com> Package moodss in Fedora 3 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:53 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJRUn007392@bastion.fedora.phx.redhat.com> Package moodss in Fedora 4 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:19:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:19:57 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201719.m6KHJmso007507@bastion.fedora.phx.redhat.com> Package moodss in Fedora 5 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:20:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:20:00 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201720.m6KHJL1F007393@bastion.fedora.phx.redhat.com> Package moodss in Fedora 6 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:20:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:20:08 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201720.m6KHJL1H007393@bastion.fedora.phx.redhat.com> Package moodss in Red Hat Linux 9 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:20:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:20:11 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201720.m6KHJL1J007393@bastion.fedora.phx.redhat.com> Package moodss in Fedora 8 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:20:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 17:20:14 +0000 Subject: [pkgdb] moodss ownership updated Message-ID: <200807201720.m6KHJmsq007507@bastion.fedora.phx.redhat.com> Package moodss in Fedora 9 was orphaned by Jean-Luc Fontaine (jfontain) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/moodss From fedora-extras-commits at redhat.com Sun Jul 20 17:48:34 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 20 Jul 2008 17:48:34 GMT Subject: rpms/strigi/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 strigi.spec, 1.17, 1.18 strigi-compile-fix.patch, 1.1, NONE strigi-lucenetest_fix.patch, 1.1, NONE Message-ID: <200807201748.m6KHmYDm027807@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/strigi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27738/devel Modified Files: .cvsignore sources strigi.spec Removed Files: strigi-compile-fix.patch strigi-lucenetest_fix.patch Log Message: * Sun Jul 20 2008 Kevin Kofler - 0.5.11-1 - Update to 0.5.11 - Drop compile-fix and lucenetest_fix patches (fixed upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/strigi/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 May 2008 23:09:07 -0000 1.8 +++ .cvsignore 20 Jul 2008 17:47:43 -0000 1.9 @@ -1 +1 @@ -strigi-0.5.9.tar.bz2 +strigi-0.5.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/strigi/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 May 2008 23:09:07 -0000 1.8 +++ sources 20 Jul 2008 17:47:43 -0000 1.9 @@ -1 +1 @@ -cbc36a745a8ecb3c29c3072d262e559a strigi-0.5.9.tar.bz2 +f1fa3488a9c2fe1e8128f4d44088c4ad strigi-0.5.11.tar.bz2 Index: strigi.spec =================================================================== RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- strigi.spec 10 May 2008 14:02:00 -0000 1.17 +++ strigi.spec 20 Jul 2008 17:47:43 -0000 1.18 @@ -1,6 +1,6 @@ Name: strigi -Version: 0.5.9 -Release: 2%{?dist} +Version: 0.5.11 +Release: 1%{?dist} Summary: A desktop search program for KDE Group: Applications/Productivity License: LGPLv2+ @@ -9,8 +9,6 @@ Source1: strigiclient.desktop Source2: strigi-daemon.desktop Patch0: strigi-multilib-fix.patch -Patch1: strigi-compile-fix.patch -Patch2: strigi-lucenetest_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.4.5 @@ -52,8 +50,6 @@ %prep %setup -q %patch0 -p0 -b .multilibs -%patch1 -p0 -b .compile -%patch2 -p0 -b .test %build mkdir fedora @@ -119,6 +115,10 @@ %{_libdir}/strigi/ %changelog +* Sun Jul 20 2008 Kevin Kofler - 0.5.11-1 +- Update to 0.5.11 +- Drop compile-fix and lucenetest_fix patches (fixed upstream) + * Sat May 10 2008 Deji Akingunola - 0.5.9-2 - Disable 'make test' for now, seems the buildroot cannot find java --- strigi-compile-fix.patch DELETED --- --- strigi-lucenetest_fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 17:59:03 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 20 Jul 2008 17:59:03 GMT Subject: rpms/strigi/devel strigi.spec,1.18,1.19 Message-ID: <200807201759.m6KHx3ck028155@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/strigi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28094/devel Modified Files: strigi.spec Log Message: %define _default_patch_fuzz 2 Index: strigi.spec =================================================================== RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- strigi.spec 20 Jul 2008 17:47:43 -0000 1.18 +++ strigi.spec 20 Jul 2008 17:58:09 -0000 1.19 @@ -1,3 +1,5 @@ +%define _default_patch_fuzz 2 + Name: strigi Version: 0.5.11 Release: 1%{?dist} From fedora-extras-commits at redhat.com Sun Jul 20 18:05:47 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 20 Jul 2008 18:05:47 GMT Subject: rpms/subcommander/F-9 subcommander.spec,1.10,1.11 Message-ID: <200807201805.m6KI5l5W002541@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/subcommander/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483 Modified Files: subcommander.spec Log Message: Rebuild to solve broken deps Index: subcommander.spec =================================================================== RCS file: /cvs/extras/rpms/subcommander/F-9/subcommander.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- subcommander.spec 23 Apr 2008 15:31:52 -0000 1.10 +++ subcommander.spec 20 Jul 2008 18:04:59 -0000 1.11 @@ -1,6 +1,6 @@ Name: subcommander Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical UI for subversion Group: Development/Tools @@ -68,6 +68,9 @@ %doc README CHANGES COPYING %changelog +* Sun Jul 20 2008 Jochen Schmitt 1.2.3-2 +- Rebuild to solve broken deps. + * Sun Apr 20 2008 Jochen Schmitt 1.2.4-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 20 18:15:48 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 20 Jul 2008 18:15:48 GMT Subject: rpms/strigi/F-9 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 strigi.spec, 1.16, 1.17 strigi-compile-fix.patch, 1.1, NONE strigi-lucenetest_fix.patch, 1.1, NONE Message-ID: <200807201815.m6KIFm2d002975@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/strigi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2925/F-9 Modified Files: .cvsignore sources strigi.spec Removed Files: strigi-compile-fix.patch strigi-lucenetest_fix.patch Log Message: Sync from devel: * Sun Jul 20 2008 Kevin Kofler - 0.5.11-1 - Update to 0.5.11 - Drop compile-fix and lucenetest_fix patches (fixed upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/strigi/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 May 2008 23:11:53 -0000 1.8 +++ .cvsignore 20 Jul 2008 18:15:03 -0000 1.9 @@ -1 +1 @@ -strigi-0.5.9.tar.bz2 +strigi-0.5.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/strigi/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 May 2008 23:11:53 -0000 1.8 +++ sources 20 Jul 2008 18:15:03 -0000 1.9 @@ -1 +1 @@ -cbc36a745a8ecb3c29c3072d262e559a strigi-0.5.9.tar.bz2 +f1fa3488a9c2fe1e8128f4d44088c4ad strigi-0.5.11.tar.bz2 Index: strigi.spec =================================================================== RCS file: /cvs/pkgs/rpms/strigi/F-9/strigi.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- strigi.spec 10 May 2008 14:04:36 -0000 1.16 +++ strigi.spec 20 Jul 2008 18:15:03 -0000 1.17 @@ -1,6 +1,8 @@ +%define _default_patch_fuzz 2 + Name: strigi -Version: 0.5.9 -Release: 2%{?dist} +Version: 0.5.11 +Release: 1%{?dist} Summary: A desktop search program for KDE Group: Applications/Productivity License: LGPLv2+ @@ -9,8 +11,6 @@ Source1: strigiclient.desktop Source2: strigi-daemon.desktop Patch0: strigi-multilib-fix.patch -Patch1: strigi-compile-fix.patch -Patch2: strigi-lucenetest_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.4.5 @@ -52,8 +52,6 @@ %prep %setup -q %patch0 -p0 -b .multilibs -%patch1 -p0 -b .compile -%patch2 -p0 -b .test %build mkdir fedora @@ -119,6 +117,10 @@ %{_libdir}/strigi/ %changelog +* Sun Jul 20 2008 Kevin Kofler - 0.5.11-1 +- Update to 0.5.11 +- Drop compile-fix and lucenetest_fix patches (fixed upstream) + * Sat May 10 2008 Deji Akingunola - 0.5.9-2 - Disable 'make test' for now, seems the buildroot cannot find java --- strigi-compile-fix.patch DELETED --- --- strigi-lucenetest_fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 18:17:20 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 20 Jul 2008 18:17:20 GMT Subject: rpms/strigi/F-8 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 strigi.spec, 1.17, 1.18 strigi-compile-fix.patch, 1.1, NONE strigi-lucenetest_fix.patch, 1.1, NONE Message-ID: <200807201817.m6KIHKFp003071@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/strigi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3021/F-8 Modified Files: .cvsignore sources strigi.spec Removed Files: strigi-compile-fix.patch strigi-lucenetest_fix.patch Log Message: Sync from devel: * Sun Jul 20 2008 Kevin Kofler - 0.5.11-1 - Update to 0.5.11 - Drop compile-fix and lucenetest_fix patches (fixed upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/strigi/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 May 2008 23:18:18 -0000 1.8 +++ .cvsignore 20 Jul 2008 18:16:30 -0000 1.9 @@ -1 +1 @@ -strigi-0.5.9.tar.bz2 +strigi-0.5.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/strigi/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 May 2008 23:18:18 -0000 1.8 +++ sources 20 Jul 2008 18:16:30 -0000 1.9 @@ -1 +1 @@ -cbc36a745a8ecb3c29c3072d262e559a strigi-0.5.9.tar.bz2 +f1fa3488a9c2fe1e8128f4d44088c4ad strigi-0.5.11.tar.bz2 Index: strigi.spec =================================================================== RCS file: /cvs/pkgs/rpms/strigi/F-8/strigi.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- strigi.spec 10 May 2008 14:07:08 -0000 1.17 +++ strigi.spec 20 Jul 2008 18:16:31 -0000 1.18 @@ -1,6 +1,8 @@ +%define _default_patch_fuzz 2 + Name: strigi -Version: 0.5.9 -Release: 2%{?dist} +Version: 0.5.11 +Release: 1%{?dist} Summary: A desktop search program for KDE Group: Applications/Productivity License: LGPLv2+ @@ -9,8 +11,6 @@ Source1: strigiclient.desktop Source2: strigi-daemon.desktop Patch0: strigi-multilib-fix.patch -Patch1: strigi-compile-fix.patch -Patch2: strigi-lucenetest_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.4.5 @@ -52,8 +52,6 @@ %prep %setup -q %patch0 -p0 -b .multilibs -%patch1 -p0 -b .compile -%patch2 -p0 -b .test %build mkdir fedora @@ -119,15 +117,20 @@ %{_libdir}/strigi/ %changelog +* Sun Jul 20 2008 Kevin Kofler - 0.5.11-1 +- Update to 0.5.11 +- Drop compile-fix and lucenetest_fix patches (fixed upstream) + * Sat May 10 2008 Deji Akingunola - 0.5.9-2 - Disable 'make test' for now, seems the buildroot cannot find java -* Wed May 07 2008 Deji Akingunola - 0.5.9-1 +* Sat May 03 2008 Deji Akingunola - 0.5.9-1 - Update to 0.5.9 (bugfix release) * Thu Mar 06 2008 Deji Akingunola - 0.5.8-2 - Use upstream's default build options (disable inotify support, #436096) +* Thu Feb 21 2008 Kevin Kofler - 0.5.8-1 - Update to 0.5.8 - Fix LIB_DESTINATION (#433627) - Drop GCC 4.3 patch (fixed upstream) --- strigi-compile-fix.patch DELETED --- --- strigi-lucenetest_fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 20 18:38:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 20 Jul 2008 18:38:29 +0000 Subject: [pkgdb] eclipse-egit had acl change status Message-ID: <200807201838.m6KIcTfK009312@bastion.fedora.phx.redhat.com> Rob Myers (rmyers) has set the watchcommits acl on eclipse-egit (Fedora devel) to Approved for Niels de Vos (devos) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From fedora-extras-commits at redhat.com Sun Jul 20 18:50:39 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Sun, 20 Jul 2008 18:50:39 GMT Subject: rpms/eclipse/devel eclipse.spec,1.544,1.545 Message-ID: <200807201850.m6KIodpY004729@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4672 Modified Files: eclipse.spec Log Message: * Fri Jul 18 2008 Andrew Overholt 3.4.0-4 - Provision with java -cp instead of binary launcher Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.544 retrieving revision 1.545 diff -u -r1.544 -r1.545 --- eclipse.spec 18 Jul 2008 21:35:57 -0000 1.544 +++ eclipse.spec 20 Jul 2008 18:49:54 -0000 1.545 @@ -745,7 +745,9 @@ # Debugging? Add -debug and -consolelog # Provision with director -$installDir/eclipse \ +java \ +-cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ +org.eclipse.core.launcher.Main \ -application \ org.eclipse.equinox.p2.director.app.application \ -nosplash \ @@ -1349,7 +1351,8 @@ - Update patch for building native libraries - Re-add missing BR on tomcat5-jasper-eclipse - Add patch for 64-bit platforms to build SWT -- Don't try to resolve bundles.osgi.org during build +- Don't try to resolve http://bundles.osgi.org for javadocs +- Provision with java -cp instead of binary launcher * Thu Jul 17 2008 Andrew Overholt 3.4.0-3 - Generate metadata and provision each sub-package From fedora-extras-commits at redhat.com Mon Jul 21 22:35:21 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 21 Jul 2008 22:35:21 GMT Subject: rpms/glib2/devel statfs-check.patch, NONE, 1.1 glib2.spec, 1.175, 1.176 Message-ID: <200807212235.m6LMZLW8024404@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24333 Modified Files: glib2.spec Added Files: statfs-check.patch Log Message: fix a statfs configure check statfs-check.patch: --- NEW FILE statfs-check.patch --- diff -up glib-2.17.4/configure.in.statfs-check glib-2.17.4/configure.in --- glib-2.17.4/configure.in.statfs-check 2008-07-21 18:24:45.000000000 -0400 +++ glib-2.17.4/configure.in 2008-07-21 18:25:19.000000000 -0400 @@ -847,6 +847,7 @@ AC_CHECK_HEADERS([mntent.h sys/mnttab.h AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec]) AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include diff -up glib-2.17.4/configure.statfs-check glib-2.17.4/configure --- glib-2.17.4/configure.statfs-check 2008-07-21 18:25:36.000000000 -0400 +++ glib-2.17.4/configure 2008-07-21 18:25:47.000000000 -0400 @@ -33300,6 +33300,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include @@ -33349,6 +33350,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include @@ -33421,6 +33423,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include @@ -33470,6 +33473,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include @@ -33542,6 +33546,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include @@ -33591,6 +33596,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include @@ -33663,6 +33669,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include @@ -33712,6 +33719,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include +#include #include #ifdef HAVE_SYS_PARAM_H #include Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- glib2.spec 21 Jul 2008 18:17:47 -0000 1.175 +++ glib2.spec 21 Jul 2008 22:34:37 -0000 1.176 @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.17.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -25,6 +25,9 @@ # https://bugzilla.gnome.org/show_bug.cgi?id=529694 Patch3: gio-2.16-selinux-set-support.diff +# fixed in svn +Patch4: statfs-check.patch + %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure @@ -58,6 +61,7 @@ %setup -q -n glib-%{version} %patch2 -p1 -b .only-pass-uri-to-gio-apps %patch3 -p0 -b .selinux +%patch4 -p1 -b .statfs-check %build %configure --disable-gtk-doc --enable-static @@ -132,6 +136,9 @@ %{_libdir}/lib*.a %changelog +* Mon Jul 21 2008 Matthias Clasen - 2.17.4-2 +- Fix statfs configure check + * Mon Jul 21 2008 Matthias Clasen - 2.17.4-1 - Update to 2.17.4 From fedora-extras-commits at redhat.com Mon Jul 21 22:36:04 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 21 Jul 2008 22:36:04 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.61, 1.62 sources, 1.74, 1.75 system-config-services.spec, 1.73, 1.74 Message-ID: <200807212236.m6LMa4YN024440@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24397 Modified Files: .cvsignore sources system-config-services.spec Log Message: add dbus and PolicyKit integration Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 8 Apr 2008 14:05:15 -0000 1.61 +++ .cvsignore 21 Jul 2008 22:35:20 -0000 1.62 @@ -1 +1 @@ -system-config-services-0.99.15.tar.bz2 +system-config-services-0.99.16.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 8 Apr 2008 14:05:15 -0000 1.74 +++ sources 21 Jul 2008 22:35:20 -0000 1.75 @@ -1 +1 @@ -fc1546e9d6640a19cee9ea64c4ca6fce system-config-services-0.99.15.tar.bz2 +37ef9399496a83a801088a9e0c025a2a system-config-services-0.99.16.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- system-config-services.spec 8 Apr 2008 14:05:15 -0000 1.73 +++ system-config-services.spec 21 Jul 2008 22:35:20 -0000 1.74 @@ -1,4 +1,10 @@ -# -*- RPM-SPEC -*- +# workaround %%{with ...} peculiarities +%if %{undefined python_sitelib} +%expand %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") +%endif +%if %{undefined python_version} +%expand %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()") +%endif # Command line configurables @@ -16,7 +22,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.15 +Version: 0.99.16 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -26,6 +32,8 @@ Group: Applications/System BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python +BuildRequires: python-devel BuildRequires: intltool BuildRequires: sed BuildRequires: desktop-file-utils @@ -51,6 +59,9 @@ Requires: usermode >= 1.36 %endif Requires: usermode-gtk +Requires: dbus-python +Requires: python-slip-dbus >= 0.1.4 +Requires: python-slip-gtk Obsoletes: serviceconf <= 0.8.1 Obsoletes: redhat-config-services <= 0.8.5 @@ -100,13 +111,24 @@ %{_datadir}/applications/system-config-services.desktop %{_datadir}/icons/hicolor/48x48/apps/system-config-services.png %{_datadir}/system-config-services +%{python_sitelib}/scservices +%{python_sitelib}/scservices-%{version}-py%{python_version}.egg-info +%{python_sitelib}/scservices.dbus-%{version}-py%{python_version}.egg-info %config(noreplace) %{_sysconfdir}/pam.d/system-config-services %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-services %config(noreplace) %{_sysconfdir}/security/console.apps/serviceconf %config(noreplace) %{_sysconfdir}/pam.d/serviceconf + +%{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Config.Services.conf +%{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Services.service +%{_datadir}/PolicyKit/policy/org.fedoraproject.config.services.policy + %{_mandir}/*/system-config-services.8* %changelog +* Mon Jul 21 2008 Nils Philippsen - 0.99.16-1 +- add dbus and PolicyKit integration + * Fri Apr 04 2008 Nils Philippsen - 0.99.15-1 - pick up updated translations - remove unnecessary *.orig files From fedora-extras-commits at redhat.com Mon Jul 21 22:49:46 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Mon, 21 Jul 2008 22:49:46 GMT Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.169,1.170 Message-ID: <200807212249.m6LMnkWF025618@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25484 Modified Files: linux-2.6-compile-fixes.patch Log Message: fix build of mv643xx_eth linux-2.6-compile-fixes.patch: Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- linux-2.6-compile-fixes.patch 21 Jul 2008 22:14:46 -0000 1.169 +++ linux-2.6-compile-fixes.patch 21 Jul 2008 22:49:00 -0000 1.170 @@ -244,3 +244,19 @@ struct uart_icount *icount; unsigned long offset; +drivers/net/mv643xx_eth.c: In function 'mv643xx_eth_netpoll': +drivers/net/mv643xx_eth.c:2115: error: 'INT_CAUSE_EXT' undeclared (first use in this function) + +Signed-off-by: Dave Jones + +--- linux-2.6.26.noarch/drivers/net/mv643xx_eth.c~ 2008-07-21 18:47:33.000000000 -0400 ++++ linux-2.6.26.noarch/drivers/net/mv643xx_eth.c 2008-07-21 18:47:55.000000000 -0400 +@@ -2112,7 +2112,7 @@ static void mv643xx_eth_netpoll(struct n + + mv643xx_eth_irq(dev->irq, dev); + +- wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_CAUSE_EXT); ++ wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | (INT_CAUSE_EXT(mp->port_num))); + } + #endif + From fedora-extras-commits at redhat.com Mon Jul 21 22:52:15 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 21 Jul 2008 22:52:15 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.62, 1.63 sources, 1.75, 1.76 system-config-services.spec, 1.74, 1.75 Message-ID: <200807212252.m6LMqFsb026121@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25966 Modified Files: .cvsignore sources system-config-services.spec Log Message: remove pam/consolehelper cruft Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 21 Jul 2008 22:35:20 -0000 1.62 +++ .cvsignore 21 Jul 2008 22:51:30 -0000 1.63 @@ -1 +1 @@ -system-config-services-0.99.16.tar.bz2 +system-config-services-0.99.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sources 21 Jul 2008 22:35:20 -0000 1.75 +++ sources 21 Jul 2008 22:51:30 -0000 1.76 @@ -1 +1 @@ -37ef9399496a83a801088a9e0c025a2a system-config-services-0.99.16.tar.bz2 +150a2c566ab6f72b01741117a2d7da53 system-config-services-0.99.17.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- system-config-services.spec 21 Jul 2008 22:35:20 -0000 1.74 +++ system-config-services.spec 21 Jul 2008 22:51:30 -0000 1.75 @@ -22,7 +22,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.16 +Version: 0.99.17 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -114,10 +114,6 @@ %{python_sitelib}/scservices %{python_sitelib}/scservices-%{version}-py%{python_version}.egg-info %{python_sitelib}/scservices.dbus-%{version}-py%{python_version}.egg-info -%config(noreplace) %{_sysconfdir}/pam.d/system-config-services -%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-services -%config(noreplace) %{_sysconfdir}/security/console.apps/serviceconf -%config(noreplace) %{_sysconfdir}/pam.d/serviceconf %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Config.Services.conf %{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Services.service @@ -126,6 +122,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Tue Jul 22 2008 Nils Philippsen - 0.99.17-1 +- remove pam/consolehelper cruft + * Mon Jul 21 2008 Nils Philippsen - 0.99.16-1 - add dbus and PolicyKit integration From fedora-extras-commits at redhat.com Mon Jul 21 23:02:59 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 21 Jul 2008 23:02:59 GMT Subject: rpms/kdeutils/F-9 kdeutils-4.0.99-kjots-without-kdepim.patch, 1.1, 1.2 kdeutils.spec, 1.123, 1.124 Message-ID: <200807212302.m6LN2xa0000628@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv586/F-9 Modified Files: kdeutils-4.0.99-kjots-without-kdepim.patch kdeutils.spec Log Message: Use setup -q, fix patch. kdeutils-4.0.99-kjots-without-kdepim.patch: Index: kdeutils-4.0.99-kjots-without-kdepim.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils-4.0.99-kjots-without-kdepim.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdeutils-4.0.99-kjots-without-kdepim.patch 21 Jul 2008 22:22:58 -0000 1.1 +++ kdeutils-4.0.99-kjots-without-kdepim.patch 21 Jul 2008 23:02:11 -0000 1.2 @@ -11,13 +11,14 @@ macro_display_feature_log() diff -ur kjots-4.0.99/kjots/aboutdata.cpp kjots-4.0.99-kjots-without-kdepim/kjots/aboutdata.cpp --- kjots-4.0.99/kjots/aboutdata.cpp 2008-06-10 13:41:22.000000000 +0200 -+++ kjots-4.0.99-kjots-without-kdepim/kjots/aboutdata.cpp 2008-07-22 00:05:42.000000000 +0200 -@@ -24,7 +24,7 @@ ++++ kjots-4.0.99-kjots-without-kdepim/kjots/aboutdata.cpp 2008-07-22 01:01:28.000000000 +0200 +@@ -24,7 +24,8 @@ #include "aboutdata.h" #include -#include +#include ++#include AboutData::AboutData() : KAboutData( "kjots", 0, ki18n( "KJots" ), KDE_VERSION_STRING, Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- kdeutils.spec 21 Jul 2008 22:22:58 -0000 1.123 +++ kdeutils.spec 21 Jul 2008 23:02:11 -0000 1.124 @@ -97,7 +97,7 @@ %setup -q %if 0%{?include_kjots} # unpack kdepim -%setup -T -D -a 1 +%setup -q -T -D -a 1 # extract kjots mv -f kdepim-%{version}/kjots . # get rid of the rest of kdepim From fedora-extras-commits at redhat.com Tue Jul 22 17:35:16 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Tue, 22 Jul 2008 17:35:16 GMT Subject: rpms/ytalk/devel ytalk.spec,1.23,1.24 Message-ID: <200807221735.m6MHZG6h008523@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8455 Modified Files: ytalk.spec Log Message: test change Index: ytalk.spec =================================================================== RCS file: /cvs/pkgs/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ytalk.spec 22 Jul 2008 16:55:00 -0000 1.23 +++ ytalk.spec 22 Jul 2008 17:34:28 -0000 1.24 @@ -1,5 +1,6 @@ Summary: A chat program for multiple users Name: ytalk + Version: 3.3.0 Release: 12%{?dist} License: GPLv2+ From fedora-extras-commits at redhat.com Tue Jul 22 17:41:06 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Tue, 22 Jul 2008 17:41:06 GMT Subject: rpms/ytalk/devel ytalk.spec,1.24,1.25 Message-ID: <200807221741.m6MHf6rI009089@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9026 Modified Files: ytalk.spec Log Message: test commit Index: ytalk.spec =================================================================== RCS file: /cvs/pkgs/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ytalk.spec 22 Jul 2008 17:34:28 -0000 1.24 +++ ytalk.spec 22 Jul 2008 17:40:14 -0000 1.25 @@ -1,6 +1,5 @@ Summary: A chat program for multiple users Name: ytalk - Version: 3.3.0 Release: 12%{?dist} License: GPLv2+ From fedora-extras-commits at redhat.com Tue Jul 22 17:43:51 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Tue, 22 Jul 2008 17:43:51 GMT Subject: rpms/TeXmacs/F-8 TeXmacs.spec,1.56,1.57 Message-ID: <200807221743.m6MHhpSQ009347@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/TeXmacs/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9185/F-8 Modified Files: TeXmacs.spec Log Message: fix for Maxima 5.15 Index: TeXmacs.spec =================================================================== RCS file: /cvs/pkgs/rpms/TeXmacs/F-8/TeXmacs.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- TeXmacs.spec 20 Mar 2008 20:12:46 -0000 1.56 +++ TeXmacs.spec 22 Jul 2008 17:41:59 -0000 1.57 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -65,6 +65,7 @@ %patch5 -p1 %patch7 -p1 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in +sed -i "s|5\.14\.\*|5.15.*|" plugins/maxima/bin/tm_maxima %build @@ -169,6 +170,9 @@ %changelog +* Tue Jul 22 2008 Gerard Milmeister - 1.0.6.14-2 +- fix for Maxima 5.15 + * Thu Mar 20 2008 Gerard Milmeister - 1.0.6.14-1 - new release 1.0.6.14 From fedora-extras-commits at redhat.com Tue Jul 22 17:43:59 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Tue, 22 Jul 2008 17:43:59 GMT Subject: rpms/TeXmacs/F-9 TeXmacs.spec,1.58,1.59 Message-ID: <200807221743.m6MHhxHq009355@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/TeXmacs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9185/F-9 Modified Files: TeXmacs.spec Log Message: fix for Maxima 5.15 Index: TeXmacs.spec =================================================================== RCS file: /cvs/pkgs/rpms/TeXmacs/F-9/TeXmacs.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- TeXmacs.spec 20 Mar 2008 18:56:18 -0000 1.58 +++ TeXmacs.spec 22 Jul 2008 17:42:22 -0000 1.59 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -65,6 +65,7 @@ %patch5 -p1 %patch7 -p1 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in +sed -i "s|5\.14\.\*|5.15.*|" plugins/maxima/bin/tm_maxima %build @@ -169,6 +170,9 @@ %changelog +* Tue Jul 22 2008 Gerard Milmeister - 1.0.6.14-2 +- fix for Maxima 5.15 + * Thu Mar 20 2008 Gerard Milmeister - 1.0.6.14-1 - new release 1.0.6.14 From fedora-extras-commits at redhat.com Tue Jul 22 17:44:00 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Tue, 22 Jul 2008 17:44:00 GMT Subject: rpms/TeXmacs/devel TeXmacs.spec,1.58,1.59 Message-ID: <200807221744.m6MHi0ew009360@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9185/devel Modified Files: TeXmacs.spec Log Message: fix for Maxima 5.15 Index: TeXmacs.spec =================================================================== RCS file: /cvs/pkgs/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- TeXmacs.spec 20 Mar 2008 18:56:18 -0000 1.58 +++ TeXmacs.spec 22 Jul 2008 17:42:59 -0000 1.59 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -65,6 +65,7 @@ %patch5 -p1 %patch7 -p1 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in +sed -i "s|5\.14\.\*|5.15.*|" plugins/maxima/bin/tm_maxima %build @@ -169,6 +170,9 @@ %changelog +* Tue Jul 22 2008 Gerard Milmeister - 1.0.6.14-2 +- fix for Maxima 5.15 + * Thu Mar 20 2008 Gerard Milmeister - 1.0.6.14-1 - new release 1.0.6.14 From fedora-extras-commits at redhat.com Tue Jul 22 17:49:02 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 17:49:02 GMT Subject: rpms/mousetweaks/devel .cvsignore, 1.5, 1.6 mousetweaks.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200807221749.m6MHn2K0009885@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/mousetweaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9817 Modified Files: .cvsignore mousetweaks.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Jun 2008 17:01:41 -0000 1.5 +++ .cvsignore 22 Jul 2008 17:48:19 -0000 1.6 @@ -1 +1 @@ -mousetweaks-2.23.4.tar.bz2 +mousetweaks-2.23.5.tar.bz2 Index: mousetweaks.spec =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/devel/mousetweaks.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mousetweaks.spec 18 Jun 2008 17:01:41 -0000 1.6 +++ mousetweaks.spec 22 Jul 2008 17:48:19 -0000 1.7 @@ -1,5 +1,5 @@ Name: mousetweaks -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} Summary: Mouse accessibility support for the GNOME desktop Group: User Interface/Desktops @@ -14,6 +14,7 @@ BuildRequires: pkgconfig BuildRequires: GConf2-devel BuildRequires: gtk2-devel +BuildRequires: libXcursor-devel BuildRequires: libglade2-devel BuildRequires: gnome-panel-devel BuildRequires: at-spi-devel @@ -92,6 +93,9 @@ %doc %{_mandir}/man1/* %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Jun 2008 17:01:41 -0000 1.5 +++ sources 22 Jul 2008 17:48:19 -0000 1.6 @@ -1 +1 @@ -f516537dfe806a23ce363e774457c637 mousetweaks-2.23.4.tar.bz2 +482d6635fe10bb4cb414a46ff5882132 mousetweaks-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 17:55:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 22 Jul 2008 17:55:29 +0000 Subject: [pkgdb] bea-stax (Fedora EPEL, 5) updated by kevin Message-ID: <20080722175529.42A9F1AD0DF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for bea-stax Kevin Fenzi (kevin) has set commit to Approved for cvsextras on bea-stax (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on bea-stax (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on bea-stax (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on bea-stax (Fedora EPEL 5) for lkundrak Kevin Fenzi (kevin) approved watchcommits on bea-stax (Fedora EPEL 5) for lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bea-stax From fedora-extras-commits at redhat.com Tue Jul 22 17:55:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 22 Jul 2008 17:55:29 +0000 Subject: [pkgdb] bea-stax (Fedora EPEL, 4) updated by kevin Message-ID: <20080722175529.6288D1AD0DF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for bea-stax Kevin Fenzi (kevin) has set commit to Approved for cvsextras on bea-stax (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on bea-stax (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on bea-stax (Fedora EPEL 4) Kevin Fenzi (kevin) approved watchbugzilla on bea-stax (Fedora EPEL 4) for lkundrak Kevin Fenzi (kevin) approved watchcommits on bea-stax (Fedora EPEL 4) for lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bea-stax From fedora-extras-commits at redhat.com Tue Jul 22 17:59:19 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 17:59:19 GMT Subject: rpms/cheese/devel .cvsignore, 1.12, 1.13 cheese.spec, 1.25, 1.26 sources, 1.12, 1.13 Message-ID: <200807221759.m6MHxJ2o010922@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/cheese/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10804 Modified Files: .cvsignore cheese.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cheese/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 18 Jun 2008 17:31:48 -0000 1.12 +++ .cvsignore 22 Jul 2008 17:58:29 -0000 1.13 @@ -1 +1 @@ -cheese-2.23.4.tar.bz2 +cheese-2.23.5.tar.bz2 Index: cheese.spec =================================================================== RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- cheese.spec 18 Jun 2008 17:31:48 -0000 1.25 +++ cheese.spec 22 Jul 2008 17:58:30 -0000 1.26 @@ -1,5 +1,5 @@ Name: cheese -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} Summary: A webcam application for snapshots and movies @@ -13,7 +13,7 @@ BuildRequires: libglade2-devel >= 2.6.0 BuildRequires: dbus-devel BuildRequires: dbus-glib-devel -BuildRequires: gstreamer-devel >= 0.10.15 +BuildRequires: gstreamer-devel >= 0.10.16 BuildRequires: gstreamer-plugins-base-devel >= 0.10.12 BuildRequires: gnome-vfs2-devel BuildRequires: GConf2-devel @@ -110,6 +110,9 @@ %{_libexecdir}/cheese %changelog +* Tue Jul 22 2008 Matthias Clasen 2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen 2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cheese/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 18 Jun 2008 17:31:48 -0000 1.12 +++ sources 22 Jul 2008 17:58:30 -0000 1.13 @@ -1 +1 @@ -f6a0aae7d485fdc897caa51ee74f1978 cheese-2.23.4.tar.bz2 +5affd3a31930f1e491c7e1d6853a4f16 cheese-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 17:59:25 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 22 Jul 2008 17:59:25 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.109,1.110 Message-ID: <200807221759.m6MHxPu2010930@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10834 Modified Files: kdebase-workspace.spec Log Message: * Tue Jul 22 2008 Rex Dieter 4.0.99-4 - oxygen-cursor-themes, -wallpapers subpkgs Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- kdebase-workspace.spec 19 Jul 2008 20:14:00 -0000 1.109 +++ kdebase-workspace.spec 22 Jul 2008 17:58:42 -0000 1.110 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.99 -Release: 3%{?dist} +Release: 4%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -118,13 +118,26 @@ %description libs %{summary}. +%package wallpapers +Summary: KDE wallpapers +Group: User Interface/Desktops +Requires: kde-filesystem +%description wallpapers +%{summary}. + %package -n ksysguardd Summary: Performance monitor daemon Group: System Environment/Daemons -# FIXME -- Rex %description -n ksysguardd %{summary}. +%package -n oxygen-cursor-themes +Summary: Oxygen cursor themes +Group: User Interface/Desktops +%description -n oxygen-cursor-themes +%{summary}. + + %prep @@ -235,7 +248,6 @@ %{_kde4_configdir}/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* -%{_kde4_datadir}/wallpapers/* %{_kde4_datadir}/sounds/* %{_kde4_datadir}/autostart/* %{_kde4_datadir}/applications/kde4/* @@ -245,19 +257,8 @@ %{_kde4_docdir}/HTML/en/* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* -%{_kde4_iconsdir}/Oxygen_Black/ -%{_kde4_iconsdir}/Oxygen_Black_Big/ -%{_kde4_iconsdir}/Oxygen_Blue/ -%{_kde4_iconsdir}/Oxygen_Blue_Big/ -%{_kde4_iconsdir}/Oxygen_White/ -%{_kde4_iconsdir}/Oxygen_White_Big/ -%{_kde4_iconsdir}/Oxygen_Yellow/ -%{_kde4_iconsdir}/Oxygen_Yellow_Big/ -%{_kde4_iconsdir}/Oxygen_Zion/ -%{_kde4_iconsdir}/Oxygen_Zion_Big/ %{_kde4_libdir}/kde4/*.so %{_kde4_libexecdir}/* - %{_libdir}/strigi/ %{_kde4_libdir}/libkdeinit*.so %{_kde4_libdir}/kconf_update_bin/* @@ -274,13 +275,33 @@ %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so %exclude %{_kde4_libdir}/libkdeinit*.so +%files wallpapers +%defattr(-,root,root,-) +%{_kde4_datadir}/wallpapers/* + %files -n ksysguardd %defattr(-,root,root,-) %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc %{_kde4_bindir}/ksysguardd +%files -n oxygen-cursor-themes +%defattr(-,root,root,-) +%{_kde4_iconsdir}/Oxygen_Black/ +%{_kde4_iconsdir}/Oxygen_Black_Big/ +%{_kde4_iconsdir}/Oxygen_Blue/ +%{_kde4_iconsdir}/Oxygen_Blue_Big/ +%{_kde4_iconsdir}/Oxygen_White/ +%{_kde4_iconsdir}/Oxygen_White_Big/ +%{_kde4_iconsdir}/Oxygen_Yellow/ +%{_kde4_iconsdir}/Oxygen_Yellow_Big/ +%{_kde4_iconsdir}/Oxygen_Zion/ +%{_kde4_iconsdir}/Oxygen_Zion_Big/ + %changelog +* Tue Jul 22 2008 Rex Dieter 4.0.99-4 +- oxygen-cursor-themes, -wallpapers subpkgs + * Sat Jul 19 2008 Kevin Kofler 4.0.99-3 - BR soprano-devel (optional dependency of the Plasma Engine Explorer) From fedora-extras-commits at redhat.com Tue Jul 22 18:05:35 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 18:05:35 GMT Subject: rpms/gnome-games/devel .cvsignore, 1.81, 1.82 gnome-games.spec, 1.177, 1.178 sources, 1.86, 1.87 Message-ID: <200807221805.m6MI5Z4V018361@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18277 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- .cvsignore 18 Jun 2008 17:49:32 -0000 1.81 +++ .cvsignore 22 Jul 2008 18:04:43 -0000 1.82 @@ -1 +1 @@ -gnome-games-2.23.4.tar.bz2 +gnome-games-2.23.5.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- gnome-games.spec 18 Jun 2008 18:10:34 -0000 1.177 +++ gnome-games.spec 22 Jul 2008 18:04:43 -0000 1.178 @@ -43,7 +43,7 @@ Summary: GNOME games Name: gnome-games -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL+ @@ -335,6 +335,9 @@ %changelog +* Tue Jul 22 2008 Matthias Clasen - 1:2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen - 1:2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- sources 18 Jun 2008 17:49:32 -0000 1.86 +++ sources 22 Jul 2008 18:04:43 -0000 1.87 @@ -1 +1 @@ -de8e93a324c4f27215c9d250349c59a5 gnome-games-2.23.4.tar.bz2 +4ed0004cbe872801a3871e4d6591825d gnome-games-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 18:15:16 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 22 Jul 2008 18:15:16 GMT Subject: rpms/jd/F-9 .cvsignore, 1.269, 1.270 jd.spec, 1.306, 1.307 sources, 1.270, 1.271 Message-ID: <200807221815.m6MIFG5v019883@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19642/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 - 2.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- .cvsignore 21 Jul 2008 17:02:44 -0000 1.269 +++ .cvsignore 22 Jul 2008 18:14:24 -0000 1.270 @@ -1 +1 @@ -jd-2.0.0-svn2211_trunk.tgz +jd-2.0.0-080722.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- jd.spec 21 Jul 2008 17:02:44 -0000 1.306 +++ jd.spec 22 Jul 2008 18:14:24 -0000 1.307 @@ -10,16 +10,16 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2211_trunk -%define repoid 31996 +%define strtag 080722 +%define repoid 32215 # Define this if this is pre-version -%define pre_release 1 +%define pre_release 0 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 8 +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -134,8 +134,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 22 2008 Mamoru Tasaka -- rev 2211 +* Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 +- 2.0.0 * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- sources 21 Jul 2008 17:02:44 -0000 1.270 +++ sources 22 Jul 2008 18:14:24 -0000 1.271 @@ -1 +1 @@ -50865af951b5aa1f4af98c042218bcc0 jd-2.0.0-svn2211_trunk.tgz +869c361fed8356fc5cfa7d1262f3884d jd-2.0.0-080722.tgz From fedora-extras-commits at redhat.com Tue Jul 22 18:15:23 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 22 Jul 2008 18:15:23 GMT Subject: rpms/jd/F-8 .cvsignore, 1.262, 1.263 jd.spec, 1.295, 1.296 sources, 1.263, 1.264 Message-ID: <200807221815.m6MIFNGT019910@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19642/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 - 2.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- .cvsignore 21 Jul 2008 17:02:26 -0000 1.262 +++ .cvsignore 22 Jul 2008 18:14:05 -0000 1.263 @@ -1 +1 @@ -jd-2.0.0-svn2211_trunk.tgz +jd-2.0.0-080722.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- jd.spec 21 Jul 2008 17:02:26 -0000 1.295 +++ jd.spec 22 Jul 2008 18:14:05 -0000 1.296 @@ -10,16 +10,16 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2211_trunk -%define repoid 31996 +%define strtag 080722 +%define repoid 32215 # Define this if this is pre-version -%define pre_release 1 +%define pre_release 0 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 8 +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -134,8 +134,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 22 2008 Mamoru Tasaka -- rev 2211 +* Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 +- 2.0.0 * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- sources 21 Jul 2008 17:02:26 -0000 1.263 +++ sources 22 Jul 2008 18:14:05 -0000 1.264 @@ -1 +1 @@ -50865af951b5aa1f4af98c042218bcc0 jd-2.0.0-svn2211_trunk.tgz +869c361fed8356fc5cfa7d1262f3884d jd-2.0.0-080722.tgz From fedora-extras-commits at redhat.com Tue Jul 22 18:15:33 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 22 Jul 2008 18:15:33 GMT Subject: rpms/jd/devel .cvsignore, 1.269, 1.270 jd.spec, 1.312, 1.313 sources, 1.270, 1.271 Message-ID: <200807221815.m6MIFX6E019949@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19642/devel Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 - 2.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- .cvsignore 21 Jul 2008 17:03:01 -0000 1.269 +++ .cvsignore 22 Jul 2008 18:14:47 -0000 1.270 @@ -1 +1 @@ -jd-2.0.0-svn2211_trunk.tgz +jd-2.0.0-080722.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- jd.spec 21 Jul 2008 17:03:01 -0000 1.312 +++ jd.spec 22 Jul 2008 18:14:47 -0000 1.313 @@ -10,16 +10,16 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2211_trunk -%define repoid 31996 +%define strtag 080722 +%define repoid 32215 # Define this if this is pre-version -%define pre_release 1 +%define pre_release 0 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 8 +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -134,8 +134,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jul 22 2008 Mamoru Tasaka -- rev 2211 +* Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 +- 2.0.0 * Mon Jul 14 2008 Mamoru Tasaka - 2.0.0-0.8.rc080714 - 2.0.0 rc 080714 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- sources 21 Jul 2008 17:03:01 -0000 1.270 +++ sources 22 Jul 2008 18:14:47 -0000 1.271 @@ -1 +1 @@ -50865af951b5aa1f4af98c042218bcc0 jd-2.0.0-svn2211_trunk.tgz +869c361fed8356fc5cfa7d1262f3884d jd-2.0.0-080722.tgz From fedora-extras-commits at redhat.com Tue Jul 22 18:16:13 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 18:16:13 GMT Subject: rpms/bea-stax/EL-5 bea-stax.spec,1.3,1.4 Message-ID: <200807221816.m6MIGDRU020112@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/bea-stax/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19926 Modified Files: bea-stax.spec Log Message: * Tue Jul 22 2008 Lubomir Rintel - 0:1.2.0-0.4.rc1 - Require java 15 Index: bea-stax.spec =================================================================== RCS file: /cvs/pkgs/rpms/bea-stax/EL-5/bea-stax.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bea-stax.spec 9 Jul 2008 17:13:24 -0000 1.3 +++ bea-stax.spec 22 Jul 2008 18:15:28 -0000 1.4 @@ -42,7 +42,7 @@ Patch0: %{name}-ecj-bootclasspath.patch Name: bea-stax Version: 1.2.0 -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} Epoch: 0 License: ASL 2.0 Group: Development/Libraries/Java @@ -53,6 +53,8 @@ BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: ant BuildRequires: xerces-j2,xalan-j2 +BuildRequires: java-devel >= 1.5 +Requires: java Requires: jpackage-utils >= 0:1.6 Requires: %{name}-api = %{epoch}:%{version}-%{release} @@ -181,6 +183,9 @@ %doc %{_javadocdir}/* %changelog +* Tue Jul 22 2008 Lubomir Rintel - 0:1.2.0-0.4.rc1 +- Require java 15 + * Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2.0-0.3.rc1 - drop repotag - fix license From fedora-extras-commits at redhat.com Tue Jul 22 18:18:34 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 18:18:34 GMT Subject: rpms/jfreechart/devel import.log, NONE, 1.1 jfreechart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807221818.m6MIIYVE020647@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/jfreechart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20501/devel Modified Files: .cvsignore sources Added Files: import.log jfreechart.spec Log Message: Initial import --- NEW FILE import.log --- jfreechart-1_0_10-1_el5:HEAD:jfreechart-1.0.10-1.el5.src.rpm:1216750627 --- NEW FILE jfreechart.spec --- # TODO: junit QA tests # These do fail to link, disabling them #define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} %define with_gcj 0 Name: jfreechart Version: 1.0.10 Release: 1%{?dist} Summary: Java chart library Group: Development/Libraries License: LGPLv2+ URL: http://www.jfree.org/jfreechart/ Source0: http://download.sourceforge.net/sourceforge/jfreechart/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: servlet jcommon java jpackage-utils BuildRequires: %{requires} ant java-devel %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description JFreeChart is a free 100% Java chart library that makes it easy for developers to display professional quality charts in their applications. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q %build # Erase prebuilt files find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' \; # Build cd ant ant -Djcommon.jar=$(build-classpath jcommon) -Dservlet.jar=$(build-classpath servlet) compile javadoc %install rm -rf $RPM_BUILD_ROOT # Directory structure install -d $RPM_BUILD_ROOT%{_javadir} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} # JARs and JavaDoc install -m 644 jfreechart-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -rp javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name} # GCJ AOT bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %postun %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %doc ChangeLog licence-LGPL.txt NEWS README.txt %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) - 1.0.10-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jfreechart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:04:49 -0000 1.1 +++ .cvsignore 22 Jul 2008 18:17:47 -0000 1.2 @@ -0,0 +1 @@ +jfreechart-1.0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jfreechart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:04:49 -0000 1.1 +++ sources 22 Jul 2008 18:17:47 -0000 1.2 @@ -0,0 +1 @@ +5c903dbef8283961ee8b58355a4a9b18 jfreechart-1.0.10.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 18:20:20 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 18:20:20 GMT Subject: rpms/jfreechart/EL-5 import.log, NONE, 1.1 jfreechart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807221820.m6MIKKhL021081@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/jfreechart/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20922/EL-5 Modified Files: .cvsignore sources Added Files: import.log jfreechart.spec Log Message: Initial import --- NEW FILE import.log --- jfreechart-1_0_10-1_el5:EL-5:jfreechart-1.0.10-1.el5.src.rpm:1216750794 --- NEW FILE jfreechart.spec --- # TODO: junit QA tests # These do fail to link, disabling them #define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} %define with_gcj 0 Name: jfreechart Version: 1.0.10 Release: 1%{?dist} Summary: Java chart library Group: Development/Libraries License: LGPLv2+ URL: http://www.jfree.org/jfreechart/ Source0: http://download.sourceforge.net/sourceforge/jfreechart/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: servlet jcommon java jpackage-utils BuildRequires: %{requires} ant java-devel %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description JFreeChart is a free 100% Java chart library that makes it easy for developers to display professional quality charts in their applications. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q %build # Erase prebuilt files find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' \; # Build cd ant ant -Djcommon.jar=$(build-classpath jcommon) -Dservlet.jar=$(build-classpath servlet) compile javadoc %install rm -rf $RPM_BUILD_ROOT # Directory structure install -d $RPM_BUILD_ROOT%{_javadir} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} # JARs and JavaDoc install -m 644 jfreechart-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -rp javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name} # GCJ AOT bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %postun %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %doc ChangeLog licence-LGPL.txt NEWS README.txt %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) - 1.0.10-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jfreechart/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:04:49 -0000 1.1 +++ .cvsignore 22 Jul 2008 18:19:33 -0000 1.2 @@ -0,0 +1 @@ +jfreechart-1.0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jfreechart/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:04:49 -0000 1.1 +++ sources 22 Jul 2008 18:19:33 -0000 1.2 @@ -0,0 +1 @@ +5c903dbef8283961ee8b58355a4a9b18 jfreechart-1.0.10.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 18:21:38 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 18:21:38 GMT Subject: rpms/jfreechart/F-9 import.log, NONE, 1.1 jfreechart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807221821.m6MILcRR021329@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/jfreechart/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21216/F-9 Modified Files: .cvsignore sources Added Files: import.log jfreechart.spec Log Message: Initial import --- NEW FILE import.log --- jfreechart-1_0_10-1_el5:F-9:jfreechart-1.0.10-1.el5.src.rpm:1216750873 --- NEW FILE jfreechart.spec --- # TODO: junit QA tests # These do fail to link, disabling them #define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} %define with_gcj 0 Name: jfreechart Version: 1.0.10 Release: 1%{?dist} Summary: Java chart library Group: Development/Libraries License: LGPLv2+ URL: http://www.jfree.org/jfreechart/ Source0: http://download.sourceforge.net/sourceforge/jfreechart/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: servlet jcommon java jpackage-utils BuildRequires: %{requires} ant java-devel %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description JFreeChart is a free 100% Java chart library that makes it easy for developers to display professional quality charts in their applications. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q %build # Erase prebuilt files find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' \; # Build cd ant ant -Djcommon.jar=$(build-classpath jcommon) -Dservlet.jar=$(build-classpath servlet) compile javadoc %install rm -rf $RPM_BUILD_ROOT # Directory structure install -d $RPM_BUILD_ROOT%{_javadir} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} # JARs and JavaDoc install -m 644 jfreechart-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -rp javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name} # GCJ AOT bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %postun %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %doc ChangeLog licence-LGPL.txt NEWS README.txt %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) - 1.0.10-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jfreechart/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:04:49 -0000 1.1 +++ .cvsignore 22 Jul 2008 18:20:54 -0000 1.2 @@ -0,0 +1 @@ +jfreechart-1.0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jfreechart/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:04:49 -0000 1.1 +++ sources 22 Jul 2008 18:20:54 -0000 1.2 @@ -0,0 +1 @@ +5c903dbef8283961ee8b58355a4a9b18 jfreechart-1.0.10.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 18:22:11 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 18:22:11 GMT Subject: rpms/orca/devel .cvsignore, 1.34, 1.35 orca.spec, 1.55, 1.56 sources, 1.35, 1.36 Message-ID: <200807221822.m6MIMBGA021454@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/orca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21297 Modified Files: .cvsignore orca.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 18 Jun 2008 17:14:57 -0000 1.34 +++ .cvsignore 22 Jul 2008 18:21:24 -0000 1.35 @@ -1 +1 @@ -orca-2.23.4.tar.bz2 +orca-2.23.5.tar.bz2 Index: orca.spec =================================================================== RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- orca.spec 18 Jun 2008 17:14:57 -0000 1.55 +++ orca.spec 22 Jul 2008 18:21:24 -0000 1.56 @@ -17,7 +17,7 @@ %define control_center_version 2.16.0-5 Name: orca -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} Summary: Flexible, extensible, and powerful assistive technology @@ -104,6 +104,9 @@ %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/orca/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 18 Jun 2008 17:14:57 -0000 1.35 +++ sources 22 Jul 2008 18:21:24 -0000 1.36 @@ -1 +1 @@ -2c2f9a1ebf252d7c2688870c6e90d9fd orca-2.23.4.tar.bz2 +b5535b0511d1cacf60822efeb13cebeb orca-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 18:33:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 22 Jul 2008 18:33:15 +0000 Subject: [pkgdb] rhino ownership updated Message-ID: <20080722183315.D17081AD0DF@bastion.fedora.phx.redhat.com> Package rhino in Fedora EPEL 5 was orphaned by Matt Wringe (mwringe) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rhino From fedora-extras-commits at redhat.com Tue Jul 22 18:33:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 22 Jul 2008 18:33:16 +0000 Subject: [pkgdb] rhino ownership updated Message-ID: <20080722183316.836AF1AD0DF@bastion.fedora.phx.redhat.com> Package rhino in Fedora EPEL 4 was orphaned by Matt Wringe (mwringe) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rhino From fedora-extras-commits at redhat.com Tue Jul 22 18:36:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 22 Jul 2008 18:36:48 +0000 Subject: [pkgdb] rhino ownership updated Message-ID: <20080722183648.D01661AD0DD@bastion.fedora.phx.redhat.com> Package rhino in Fedora EPEL 5 is now owned by Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rhino From fedora-extras-commits at redhat.com Tue Jul 22 18:36:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 22 Jul 2008 18:36:49 +0000 Subject: [pkgdb] rhino ownership updated Message-ID: <20080722183649.616B91AD0E0@bastion.fedora.phx.redhat.com> Package rhino in Fedora EPEL 4 is now owned by Lubomir Rintel (lkundrak) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rhino From fedora-extras-commits at redhat.com Tue Jul 22 18:38:29 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 22 Jul 2008 18:38:29 GMT Subject: rpms/eclipse/devel eclipse.spec,1.558,1.559 Message-ID: <200807221838.m6MIcTwW023665@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23605 Modified Files: eclipse.spec Log Message: Exclude win32 files from non-upstream arch hack Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.558 retrieving revision 1.559 diff -u -r1.558 -r1.559 --- eclipse.spec 22 Jul 2008 17:28:14 -0000 1.558 +++ eclipse.spec 22 Jul 2008 18:37:45 -0000 1.559 @@ -419,7 +419,7 @@ # Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace # the ia64 strings with ppc64, etc. %ifarch ppc64 sparc sparcv9 sparc64 alpha - for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do + for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32 | grep -v win32); do tofile=$(echo $f | sed "s/ia64/%{_arch}/") mv $f $tofile # sed --in-place "s/ia64/%{_arch}/g" $tofile From fedora-extras-commits at redhat.com Tue Jul 22 18:40:47 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Tue, 22 Jul 2008 18:40:47 GMT Subject: rpms/PolicyKit-gnome/devel .cvsignore, 1.7, 1.8 PolicyKit-gnome.spec, 1.21, 1.22 sources, 1.7, 1.8 PolicyKit-gnome-0.8-fix-i18n.patch, 1.1, NONE Message-ID: <200807221840.m6MIelDM023973@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23884 Modified Files: .cvsignore PolicyKit-gnome.spec sources Removed Files: PolicyKit-gnome-0.8-fix-i18n.patch Log Message: * Tue Jul 22 2008 David Zeuthen - 0.9-1%{?dist} - Update to upstream release 0.9 - Drop patches that are upstream - Update license field Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Apr 2008 02:27:09 -0000 1.7 +++ .cvsignore 22 Jul 2008 18:40:00 -0000 1.8 @@ -4,3 +4,4 @@ PolicyKit-gnome-0.6.tar.bz2 PolicyKit-gnome-0.7.tar.bz2 PolicyKit-gnome-0.8.tar.bz2 +PolicyKit-gnome-0.9.tar.bz2 Index: PolicyKit-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- PolicyKit-gnome.spec 2 May 2008 03:56:09 -0000 1.21 +++ PolicyKit-gnome.spec 22 Jul 2008 18:40:00 -0000 1.22 @@ -9,9 +9,9 @@ Summary: PolicyKit integration for the GNOME desktop Name: PolicyKit-gnome -Version: 0.8 -Release: 5%{?dist} -License: GPLv2+ +Version: 0.9 +Release: 1%{?dist} +License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/PolicyKit-gnome.git;a=summary Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2 @@ -27,15 +27,17 @@ BuildRequires: intltool >= %{intltool_version} BuildRequires: gettext BuildRequires: desktop-file-utils +BuildRequires: GConf2-devel Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: gtk2 >= %{gtk2_version} Requires: gnome-vfs2 >= %{gnome_vfs2_version} Requires: PolicyKit >= %{polkit_version} Requires: libsexy >= %{libsexy_version} +Requires(post): GConf2 >= 2.14 +Requires(preun): GConf2 >= 2.14 -Patch0: PolicyKit-gnome-0.8-fix-i18n.patch -Patch1: PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch +Patch0: PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch %description PolicyKit-gnome provides a GNOME integration library and tools for @@ -78,8 +80,7 @@ %prep %setup -q -%patch0 -p1 -b .fix-i18n -%patch1 -p1 -b .no-spawning-under-gdm +%patch0 -p1 -b .no-spawning-under-gdm %build %configure @@ -103,6 +104,21 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/polkit-gnome.schemas > /dev/null || : + +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/polkit-gnome.schemas > /dev/null || : +fi + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/polkit-gnome.schemas > /dev/null || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -116,6 +132,7 @@ %{_bindir}/polkit-gnome-authorization %{_datadir}/applications/polkit-gnome-authorization.desktop +%{_sysconfdir}/gconf/schemas/polkit-gnome.schemas %files libs @@ -133,9 +150,14 @@ %files demo %defattr(-,root,root,-) %{_bindir}/polkit-gnome-example -%{_datadir}/PolicyKit/policy/polkit-gnome-example.policy +%{_datadir}/PolicyKit/policy/*.policy %changelog +* Tue Jul 22 2008 David Zeuthen - 0.9-1%{?dist} +- Update to upstream release 0.9 +- Drop patches that are upstream +- Update license field + * Thu May 1 2008 David Zeuthen - 0.8-5%{?dist} - Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Apr 2008 02:27:09 -0000 1.7 +++ sources 22 Jul 2008 18:40:00 -0000 1.8 @@ -1 +1 @@ -e8119034a8b63c80749177cebf035aac PolicyKit-gnome-0.8.tar.bz2 +68374b04289ce99d95a9df19d6217344 PolicyKit-gnome-0.9.tar.bz2 --- PolicyKit-gnome-0.8-fix-i18n.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 22 18:48:25 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 18:48:25 GMT Subject: rpms/file-roller/devel .cvsignore, 1.72, 1.73 file-roller.spec, 1.123, 1.124 sources, 1.72, 1.73 Message-ID: <200807221848.m6MImPQO024891@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24780 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.23.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- .cvsignore 18 Jun 2008 04:33:15 -0000 1.72 +++ .cvsignore 22 Jul 2008 18:47:36 -0000 1.73 @@ -1 +1 @@ -file-roller-2.23.3.tar.bz2 +file-roller-2.23.4.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- file-roller.spec 11 Jul 2008 14:46:28 -0000 1.123 +++ file-roller.spec 22 Jul 2008 18:47:36 -0000 1.124 @@ -10,8 +10,8 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller -Version: 2.23.3 -Release: 2%{?dist} +Version: 2.23.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ @@ -41,9 +41,6 @@ Requires: GConf2 -# http://bugzilla.gnome.org/show_bug.cgi?id=542541 -Patch0: broken-icon-lookup.patch - # The context menu API changed in 2.2.0: Conflicts: nautilus < 2.2.0 @@ -53,7 +50,6 @@ %prep %setup -q -%patch0 -p1 -b .broken-icon-lookup autoreconf @@ -132,6 +128,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.4-1 +- Update to 2.23.4 + * Fri Jul 11 2008 Matthias Clasen - 2.23.3-2 - Fix icon lookup Index: sources =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 18 Jun 2008 04:33:15 -0000 1.72 +++ sources 22 Jul 2008 18:47:36 -0000 1.73 @@ -1 +1 @@ -a08ca2543a90057eae92c6a2df237770 file-roller-2.23.3.tar.bz2 +e831361a6e7ebbbb4d0754ec2466aa7a file-roller-2.23.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 18:50:15 2008 From: fedora-extras-commits at redhat.com (Will Woods (wwoods)) Date: Tue, 22 Jul 2008 18:50:15 GMT Subject: comps comps.rng,1.3,1.4 Message-ID: <200807221850.m6MIoFgr025222@cvs-int.fedora.redhat.com> Author: wwoods Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25159 Modified Files: comps.rng Log Message: Fix up whiteout/blacklist schema - add forgotten elements, ignore ordering Index: comps.rng =================================================================== RCS file: /cvs/pkgs/comps/comps.rng,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- comps.rng 21 Jul 2008 18:49:49 -0000 1.3 +++ comps.rng 22 Jul 2008 18:49:45 -0000 1.4 @@ -22,8 +22,10 @@ - - + + + + @@ -180,24 +182,26 @@ 'hal.i386' causes anaconda to remove the (now-unneeded) hal.i386, which gives us the desired outcome. - - - - - - - + + + + - - Arch to blacklist this package from. If unspecified, it will be - blocked on all arches. - - - - - + + + + + Arch to blacklist this package from. If unspecified, it will be + blocked on all arches. + + + + + + + @@ -213,16 +217,18 @@ form 'package>requires', and the RPM macro '_dependency_whiteout' should be filled with a (newline-separated) list of these items. - - - - - - - - - - + + + + + + + + + + + + From fedora-extras-commits at redhat.com Tue Jul 22 18:59:42 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 18:59:42 GMT Subject: rpms/mousetweaks/devel mousetweaks.spec,1.7,1.8 Message-ID: <200807221859.m6MIxgKA026829@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/mousetweaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26582 Modified Files: mousetweaks.spec Log Message: brrr intltool Index: mousetweaks.spec =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/devel/mousetweaks.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mousetweaks.spec 22 Jul 2008 17:48:19 -0000 1.7 +++ mousetweaks.spec 22 Jul 2008 18:59:00 -0000 1.8 @@ -18,6 +18,7 @@ BuildRequires: libglade2-devel BuildRequires: gnome-panel-devel BuildRequires: at-spi-devel +BuildRequires: intltool Requires(pre): GConf2 Requires(post): GConf2 From fedora-extras-commits at redhat.com Tue Jul 22 19:07:21 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 19:07:21 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 bootstrap-java-1.6.0-openjdk.spec, 1.1.2.2, 1.1.2.3 Message-ID: <200807221907.m6MJ7LHw002288@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2173 Modified Files: Tag: java-1_6_0-openjdk-1_6_0_0-0_5_b06_el5_bootstrap bootstrap-java-1.6.0-openjdk.spec Log Message: supersede current ppc build with bootstrapped one Index: bootstrap-java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/Attic/bootstrap-java-1.6.0-openjdk.spec,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- bootstrap-java-1.6.0-openjdk.spec 14 Apr 2008 19:41:57 -0000 1.1.2.2 +++ bootstrap-java-1.6.0-openjdk.spec 22 Jul 2008 19:06:37 -0000 1.1.2.3 @@ -3,7 +3,7 @@ Name: bootstrap-%{boot_name} Version: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrap blob for %{boot_name} Group: Development/Libraries @@ -42,7 +42,8 @@ # Provides: AutoProv: 0 -%{expand:%(rpm -qp --provides %{packages} |sed 's/^/Provides: /')} +# Supersede the current version by 1 +%{expand:%(rpm -qp --provides %{packages} |sed 's/^/Provides: /' |sed 's/^\(.*\) = .*el5.*/\1 = 1:1.6.0.0-0.7.b08.el5.3/')} %description Binary packages encapsulated for bootstrapping %{boot_name} From fedora-extras-commits at redhat.com Tue Jul 22 19:07:27 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Tue, 22 Jul 2008 19:07:27 GMT Subject: rpms/hunspell/devel hunspell.spec, 1.45, 1.46 hunspell-1.2.2-xulrunner.pita.patch, 1.4, NONE Message-ID: <200807221907.m6MJ7R1i002303@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/hunspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2201 Modified Files: hunspell.spec Removed Files: hunspell-1.2.2-xulrunner.pita.patch Log Message: * Tue Jul 22 2008 Kristian H??gsberg - 1.2.4.2-2 - Drop ABI breaking hunspell-1.2.2-xulrunner.pita.patch and fix the hunspell include in xulrunner. Index: hunspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- hunspell.spec 19 Jun 2008 07:56:24 -0000 1.45 +++ hunspell.spec 22 Jul 2008 19:06:42 -0000 1.46 @@ -1,7 +1,7 @@ Name: hunspell Summary: Hunspell is a spell checker and morphological analyzer library Version: 1.2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://downloads.sourceforge.net/%{name}/hunspell-1.2.4-2.tar.gz Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell Group: System Environment/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ or GPLv2+ or MPLv1.1 BuildRequires: libtool, ncurses-devel -Patch0: hunspell-1.2.2-xulrunner.pita.patch %description Hunspell is a spell checker and morphological analyzer library and program @@ -27,7 +26,6 @@ %prep %setup -q -n hunspell-1.2.4 -%patch0 -p1 -b .pita.patch # Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell cat << \EOF > %{name}-req #!/bin/sh @@ -96,6 +94,10 @@ %{_mandir}/man3/hunspell.3.gz %changelog +* Tue Jul 22 2008 Kristian H??gsberg - 1.2.4.2-2 +- Drop ABI breaking hunspell-1.2.2-xulrunner.pita.patch and fix the + hunspell include in xulrunner. + * Fri Jun 18 2008 Caolan McNamara - 1.2.4.2-1 - latest version --- hunspell-1.2.2-xulrunner.pita.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 22 19:11:00 2008 From: fedora-extras-commits at redhat.com (Will Woods (wwoods)) Date: Tue, 22 Jul 2008 19:11:00 GMT Subject: comps comps.rng,1.4,1.5 Message-ID: <200807221911.m6MJB07i002900@cvs-int.fedora.redhat.com> Author: wwoods Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2818 Modified Files: comps.rng Log Message: fix documentation for whiteout Index: comps.rng =================================================================== RCS file: /cvs/pkgs/comps/comps.rng,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- comps.rng 22 Jul 2008 18:49:45 -0000 1.4 +++ comps.rng 22 Jul 2008 19:10:30 -0000 1.5 @@ -215,7 +215,7 @@ To feed this info to RPM, each item should be converted to a string of the form 'package>requires', and the RPM macro '_dependency_whiteout' should be - filled with a (newline-separated) list of these items. + filled with a (whitespace-separated) list of these items. From fedora-extras-commits at redhat.com Tue Jul 22 19:12:30 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 19:12:30 GMT Subject: rpms/evince/devel .cvsignore, 1.47, 1.48 evince.spec, 1.124, 1.125 sources, 1.46, 1.47 Message-ID: <200807221912.m6MJCUCl003117@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/evince/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3013 Modified Files: .cvsignore evince.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/evince/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 19 Jun 2008 00:45:47 -0000 1.47 +++ .cvsignore 22 Jul 2008 19:11:44 -0000 1.48 @@ -1 +1 @@ -evince-2.23.4.tar.bz2 +evince-2.23.5.tar.bz2 Index: evince.spec =================================================================== RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- evince.spec 17 Jul 2008 20:37:52 -0000 1.124 +++ evince.spec 22 Jul 2008 19:11:44 -0000 1.125 @@ -5,8 +5,8 @@ %define theme_version 2.17.1 Name: evince -Version: 2.23.4 -Release: 2%{?dist} +Version: 2.23.5 +Release: 1%{?dist} Summary: Document viewer License: GPLv2+ and GFDL @@ -229,6 +229,9 @@ %{_libdir}/evince/backends/djvudocument.evince-backend %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Thu Jul 17 2008 Tom "spot" Callaway - 2.23.4-2 - fix license tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/evince/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 19 Jun 2008 00:45:48 -0000 1.46 +++ sources 22 Jul 2008 19:11:44 -0000 1.47 @@ -1 +1 @@ -4e353edd6481f67ee534a40d4b7f3b8c evince-2.23.4.tar.bz2 +2ed17a49a130b08898faface61c054ec evince-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 19:13:21 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 22 Jul 2008 19:13:21 GMT Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.61, 1.62 Message-ID: <200807221913.m6MJDLLF003263@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3118 Modified Files: gstreamer-plugins-good.spec Log Message: * Tue Jul 22 2008 Jarod Wilson 0.10.8-9 - Bump and rebuild for libraw1394 v2.0.0 Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- gstreamer-plugins-good.spec 21 Jul 2008 14:58:30 -0000 1.61 +++ gstreamer-plugins-good.spec 22 Jul 2008 19:12:35 -0000 1.62 @@ -6,7 +6,7 @@ Name: %{gstreamer}-plugins-good Version: 0.10.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GStreamer plug-ins with good code and licensing Group: Applications/Multimedia @@ -246,6 +246,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || : %changelog +* Tue Jul 22 2008 Jarod Wilson 0.10.8-9 +- Bump and rebuild for libraw1394 v2.0.0 + * Mon Jul 21 2008 Adam Jackson 0.10.8-8 - gst-plugins-good-0.10.8-v4l2-progressive-fix.patch: Backport v4l2 interlace/progressive fixes. (#454534) From fedora-extras-commits at redhat.com Tue Jul 22 19:16:11 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 22 Jul 2008 19:16:11 GMT Subject: rpms/coriander/devel coriander.spec,1.2,1.3 Message-ID: <200807221916.m6MJGBmk003654@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/coriander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3544 Modified Files: coriander.spec Log Message: * Tue Jul 22 2008 Jarod Wilson 2.0.0-0.8.rc6 - Bump and rebuild for libraw1394 v2.0.0 Index: coriander.spec =================================================================== RCS file: /cvs/pkgs/rpms/coriander/devel/coriander.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- coriander.spec 9 Feb 2008 00:13:11 -0000 1.2 +++ coriander.spec 22 Jul 2008 19:15:25 -0000 1.3 @@ -7,7 +7,7 @@ Summary: Control a 1394 digital camera interactively Name: coriander Version: 2.0.0 -Release: 0.7.rc6%{?cvs_snapshot}%{?dist} +Release: 0.8.rc6%{?cvs_snapshot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://damien.douxchamps.net/ieee1394/coriander/ @@ -70,6 +70,9 @@ %{_datadir}/applications/*-coriander.desktop %changelog +* Tue Jul 22 2008 Jarod Wilson 2.0.0-0.8.rc6 +- Bump and rebuild for libraw1394 v2.0.0 + * Sat Feb 09 2008 Tim Niemueller - 2.0.0-0.7.rc6 - Rebuild with GCC 4.3 for rawhide (F9) From fedora-extras-commits at redhat.com Tue Jul 22 19:19:42 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 22 Jul 2008 19:19:42 GMT Subject: rpms/libfreebob/devel libfreebob.spec,1.10,1.11 Message-ID: <200807221919.m6MJJgaK004139@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/libfreebob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4033 Modified Files: libfreebob.spec Log Message: * Tue Jul 22 2008 Jarod Wilson 1.0.11-2 - Bump and rebuild for libraw1394 v2.0.0 Index: libfreebob.spec =================================================================== RCS file: /cvs/pkgs/rpms/libfreebob/devel/libfreebob.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libfreebob.spec 12 Apr 2008 13:28:21 -0000 1.10 +++ libfreebob.spec 22 Jul 2008 19:18:54 -0000 1.11 @@ -1,7 +1,7 @@ Summary: FreeBoB firewire audio driver library Name: libfreebob Version: 1.0.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries Source0: http://surfnet.dl.sourceforge.net/sourceforge/freebob/libfreebob-%{version}.tar.gz @@ -59,6 +59,9 @@ %{_includedir}/* %changelog +* Tue Jul 22 2008 Jarod Wilson 1.0.11-2 +- Bump and rebuild for libraw1394 v2.0.0 + * Sat Apr 12 2008 Anthony Green 1.0.11-1 - Upgrade to 1.0.11. From fedora-extras-commits at redhat.com Tue Jul 22 19:24:13 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 19:24:13 GMT Subject: rpms/gnome-themes/devel gnome-themes.spec,1.110,1.111 Message-ID: <200807221924.m6MJODMP004658@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4542 Modified Files: gnome-themes.spec Log Message: 2.23.5 Index: gnome-themes.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gnome-themes.spec 18 Jun 2008 17:10:23 -0000 1.110 +++ gnome-themes.spec 22 Jul 2008 19:23:16 -0000 1.111 @@ -1,6 +1,6 @@ Summary: Themes collection for GNOME Name: gnome-themes -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} URL: http://download.gnome.org/sources/gnome-themes/ Source: http://download.gnome.org/sources/gnome-themes/2.23/%{name}-%{version}.tar.bz2 @@ -94,6 +94,9 @@ %doc AUTHORS COPYING NEWS README %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 From fedora-extras-commits at redhat.com Tue Jul 22 19:24:46 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 22 Jul 2008 19:24:46 GMT Subject: rpms/libiec61883/devel libiec61883.spec,1.14,1.15 Message-ID: <200807221924.m6MJOkSY004715@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/libiec61883/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631 Modified Files: libiec61883.spec Log Message: * Tue Jul 22 2008 Jarod Wilson 1.1.0-5 - Bump and rebuild for libraw1394 v2.0.0 Index: libiec61883.spec =================================================================== RCS file: /cvs/pkgs/rpms/libiec61883/devel/libiec61883.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libiec61883.spec 14 Feb 2008 18:22:30 -0000 1.14 +++ libiec61883.spec 22 Jul 2008 19:24:01 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Streaming library for IEEE1394 Name: libiec61883 Version: 1.1.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://linux1394.org/dl/%{name}-%{version}.tar.gz @@ -81,6 +81,9 @@ %{_mandir}/man1/*.1* %changelog +* Tue Jul 22 2008 Jarod Wilson 1.1.0-5 +- Bump and rebuild for libraw1394 v2.0.0 + * Thu Feb 14 2008 Jarod Wilson - 1.1.0-4 - Bump and rebuild with gcc 4.3 From fedora-extras-commits at redhat.com Tue Jul 22 19:26:53 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 22 Jul 2008 19:26:53 GMT Subject: rpms/firecontrol/devel firecontrol.spec,1.1,1.2 Message-ID: <200807221926.m6MJQrRU005024@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/firecontrol/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4923 Modified Files: firecontrol.spec Log Message: * Tue Jul 22 2008 Jarod Wilson 0.2-3 - Bump and rebuild for libraw1394 v2.0.0 Index: firecontrol.spec =================================================================== RCS file: /cvs/pkgs/rpms/firecontrol/devel/firecontrol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- firecontrol.spec 4 Apr 2008 17:14:55 -0000 1.1 +++ firecontrol.spec 22 Jul 2008 19:26:06 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A console oriented tool for Linux to access a FireWire bus Name: firecontrol Version: 0.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://firecontrol.sourceforge.net/ @@ -38,6 +38,9 @@ %{_bindir}/firecontrol %changelog +* Tue Jul 22 2008 Jarod Wilson 0.2-3 +- Bump and rebuild for libraw1394 v2.0.0 + * Thu Apr 03 2008 Jarod Wilson - 0.2-2 - Fix license, is GPLv2+, not GPLv2-only, per commander.c From fedora-extras-commits at redhat.com Tue Jul 22 19:28:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 22 Jul 2008 19:28:31 GMT Subject: rpms/kdebase/devel kdebase.spec,1.336,1.337 Message-ID: <200807221928.m6MJSVG8005295@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5132 Modified Files: kdebase.spec Log Message: * Tue Jul 22 2008 Rex Dieter 4.0.99-2 respin (libraw1394) Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.336 retrieving revision 1.337 diff -u -r1.336 -r1.337 --- kdebase.spec 18 Jul 2008 15:15:34 -0000 1.336 +++ kdebase.spec 22 Jul 2008 19:27:42 -0000 1.337 @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.0.99 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -302,6 +302,9 @@ %changelog +* Tue Jul 22 2008 Rex Dieter 4.0.99-2 + respin (libraw1394) + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Tue Jul 22 19:28:46 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 19:28:46 GMT Subject: rpms/gnome-themes/devel .cvsignore,1.60,1.61 sources,1.65,1.66 Message-ID: <200807221928.m6MJSkee005359@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5203 Modified Files: .cvsignore sources Log Message: update source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-themes/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 18 Jun 2008 17:10:23 -0000 1.60 +++ .cvsignore 22 Jul 2008 19:28:00 -0000 1.61 @@ -1 +1 @@ -gnome-themes-2.23.4.tar.bz2 +gnome-themes-2.23.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-themes/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 18 Jun 2008 17:10:23 -0000 1.65 +++ sources 22 Jul 2008 19:28:00 -0000 1.66 @@ -1 +1 @@ -8b7020be347402c1d7181335aaac35f0 gnome-themes-2.23.4.tar.bz2 +2de097cdd85511611d7a9e0385b5eeae gnome-themes-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 19:29:07 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 22 Jul 2008 19:29:07 GMT Subject: rpms/libavc1394/devel libavc1394.spec,1.23,1.24 Message-ID: <200807221929.m6MJT7IV005385@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/libavc1394/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5246 Modified Files: libavc1394.spec Log Message: * Tue Jul 22 2008 Jarod Wilson 0.5.3-3 - Bump and rebuild for libraw1394 v2.0.0 Index: libavc1394.spec =================================================================== RCS file: /cvs/pkgs/rpms/libavc1394/devel/libavc1394.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libavc1394.spec 14 Feb 2008 16:17:04 -0000 1.23 +++ libavc1394.spec 22 Jul 2008 19:28:13 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Audio/Video Control library for IEEE-1394 devices Name: libavc1394 Version: 0.5.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries Source: http://dl.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz @@ -71,6 +71,9 @@ %changelog +* Tue Jul 22 2008 Jarod Wilson 0.5.3-3 +- Bump and rebuild for libraw1394 v2.0.0 + * Thu Feb 14 2008 Jarod Wilson - 0.5.3-2 - Bump and rebuild with gcc 4.3 From fedora-extras-commits at redhat.com Tue Jul 22 19:29:17 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 22 Jul 2008 19:29:17 GMT Subject: rpms/kdebase3/devel kdebase3.spec,1.63,1.64 Message-ID: <200807221929.m6MJTHKp005408@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5288 Modified Files: kdebase3.spec Log Message: * Tue Jul 22 2008 Rex Dieter - 3.5.9-16 - respin (libraw1394) Index: kdebase3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- kdebase3.spec 4 Jun 2008 22:09:25 -0000 1.63 +++ kdebase3.spec 22 Jul 2008 19:28:24 -0000 1.64 @@ -12,7 +12,7 @@ %define _with_samba --with-samba Version: 3.5.9 -Release: 15%{?dist} +Release: 16%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -863,6 +863,9 @@ %changelog +* Tue Jul 22 2008 Rex Dieter - 3.5.9-16 +- respin (libraw1394) + * Wed Jun 04 2008 Kevin Kofler - 3.5.9-15 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4) From fedora-extras-commits at redhat.com Tue Jul 22 19:34:10 2008 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 22 Jul 2008 19:34:10 GMT Subject: rpms/dnsmasq/F-8 .cvsignore, 1.13, 1.14 dnsmasq.spec, 1.23, 1.24 sources, 1.13, 1.14 Message-ID: <200807221934.m6MJYAxe005998@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/pkgs/rpms/dnsmasq/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5893 Modified Files: .cvsignore dnsmasq.spec sources Log Message: - Upstream release (bug/security fixes) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-8/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Sep 2007 15:15:26 -0000 1.13 +++ .cvsignore 22 Jul 2008 19:33:37 -0000 1.14 @@ -1 +1 @@ -dnsmasq-2.40.tar.gz +dnsmasq-2.45.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-8/dnsmasq.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- dnsmasq.spec 18 Sep 2007 15:36:39 -0000 1.23 +++ dnsmasq.spec 22 Jul 2008 19:33:37 -0000 1.24 @@ -10,7 +10,7 @@ %endif Name: dnsmasq -Version: 2.40 +Version: 2.45 Release: 1%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -103,6 +103,9 @@ %changelog +* Tue Jul 22 2008 Patrick "Jima" Laughton 2.45-1 +- Upstream release (bug/security fixes) + * Tue Sep 18 2007 Patrick "Jima" Laughton 2.40-1 - Finalized upstream release - Removing URLs from patch lines (CVS is the authoritative source) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Sep 2007 15:15:26 -0000 1.13 +++ sources 22 Jul 2008 19:33:37 -0000 1.14 @@ -1 +1 @@ -91b6063ae81146b9d70b4381b2f3e44f dnsmasq-2.40.tar.gz +b7956e15c9766e05b3eca3ce88fdb616 dnsmasq-2.45.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 19:35:07 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Tue, 22 Jul 2008 19:35:07 GMT Subject: rpms/DeviceKit/devel DeviceKit.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807221935.m6MJZ7rU006115@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014/devel Modified Files: .cvsignore sources Added Files: DeviceKit.spec import.log Log Message: initial commit --- NEW FILE DeviceKit.spec --- %define glib2_version 2.6.0 %define dbus_version 1.2 %define dbus_glib_version 0.76 %define gtk_doc_version 1.4 %define udev_version 124 Summary: Device Enumeration Framework Name: DeviceKit Version: 002 Release: 0.git20080720%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit.git;a=summary Source0: %{name}-%{version}.git20080720.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: gtk-doc >= %{gtk_doc_version} Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: glib2 >= %{glib2_version} Requires: udev >= %{udev_version} %description DeviceKit is a framework for enumerating devices. %package devel Summary: Headers and libraries for DeviceKit Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= %{glib2_version} Requires: pkgconfig # stupid guidelines require this for ownership of /usr/share/gtk-doc Requires: gtk-doc %description devel Headers and libraries for DeviceKit. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING HACKING doc/TODO %{_bindir}/* %{_libexecdir}/* %{_libdir}/lib*.so.* %{_mandir}/man1/* %{_mandir}/man7/* %{_mandir}/man8/* %{_sysconfdir}/dbus-1/system.d/* %{_sysconfdir}/udev/rules.d/* %{_datadir}/dbus-1/system-services/* %dir %{_localstatedir}/run/devkit %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* %{_datadir}/dbus-1/interfaces/* %dir %{_datadir}/gtk-doc/html/devkit %{_datadir}/gtk-doc/html/devkit/* %changelog * Sun Jul 20 2008 David Zeuthen - 002-0.git20080720%{?dist} - Initial packaging --- NEW FILE import.log --- DeviceKit-002-0_git20080720_fc10:HEAD:DeviceKit-002-0.git20080720.fc10.src.rpm:1216755223 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 15:59:38 -0000 1.1 +++ .cvsignore 22 Jul 2008 19:34:22 -0000 1.2 @@ -0,0 +1 @@ +DeviceKit-002.git20080720.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 15:59:38 -0000 1.1 +++ sources 22 Jul 2008 19:34:22 -0000 1.2 @@ -0,0 +1 @@ +c09e29df9882d731566a900346bbd7b5 DeviceKit-002.git20080720.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 19:37:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 22 Jul 2008 19:37:00 +0000 Subject: [pkgdb] pwlib had groupAcl changed Message-ID: <20080722193705.9359C1AD0DC@bastion.fedora.phx.redhat.com> Daniel Veillard (veillard) has set the commit acl on pwlib (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pwlib From fedora-extras-commits at redhat.com Tue Jul 22 19:38:13 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Tue, 22 Jul 2008 19:38:13 GMT Subject: rpms/DeviceKit-disks/devel DeviceKit-disks.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807221938.m6MJcDL0006578@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432/devel Modified Files: .cvsignore sources Added Files: DeviceKit-disks.spec import.log Log Message: initial commit --- NEW FILE DeviceKit-disks.spec --- %define glib2_version 2.6.0 %define dbus_version 1.2 %define dbus_glib_version 0.76 %define devicekit_version 002 %define polkit_version 0.8 %define parted_version 1.8.8 %define udev_version 124 %define mdadm_version 2.6.7 %define device_mapper_version 1.02 Summary: Disk Management Service Name: DeviceKit-disks Version: 002 Release: 0.git20080720%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary Source0: %{name}-%{version}.git20080720.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: PolicyKit-devel >= %{polkit_version} BuildRequires: parted-devel >= %{parted_version} BuildRequires: DeviceKit-devel >= %{devicekit_version} BuildRequires: sqlite-devel BuildRequires: device-mapper-devel >= %{device_mapper_version} BuildRequires: intltool Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: glib2 >= %{glib2_version} Requires: PolicyKit >= %{polkit_version} Requires: parted >= %{parted_version} Requires: DeviceKit >= %{devicekit_version} Requires: udev >= %{udev_version} Requires: mdadm >= %{mdadm_version} Requires: smartmontools Conflicts: kernel < 2.6.25 %description DeviceKit-disks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. %package devel Summary: D-Bus interface definitions for DeviceKit-disks Group: Development/Libraries Requires: %{name} = %{version}-%{release} # stupid guidelines require this for ownership of /usr/share/gtk-doc Requires: gtk-doc %description devel D-Bus interface definitions for DeviceKit-disks. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a # TODO: should be fixed upstream chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/devkit-disks-bash-completion.sh %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING HACKING doc/TODO %{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/profile.d/*.sh %{_sysconfdir}/udev/rules.d/*.rules /lib/udev/part_id /lib/udev/devkit-disks-dm-export /sbin/umount.devkit %{_bindir}/* %{_libexecdir}/* %{_mandir}/man1/* %{_mandir}/man7/* %{_mandir}/man8/* %{_datadir}/PolicyKit/policy/*.policy %{_datadir}/dbus-1/system-services/*.service %dir %{_localstatedir}/lib/DeviceKit-disks %files devel %defattr(-,root,root,-) %{_datadir}/dbus-1/interfaces/*.xml %dir %{_datadir}/gtk-doc/html/devkit-disks %{_datadir}/gtk-doc/html/devkit-disks/* %changelog * Fri Jul 20 2008 David Zeuthen - 002-0.git20080720%{?dist} - Initial packaging --- NEW FILE import.log --- DeviceKit-disks-002-0_git20080720_fc10:HEAD:DeviceKit-disks-002-0.git20080720.fc10.src.rpm:1216755419 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 15:55:57 -0000 1.1 +++ .cvsignore 22 Jul 2008 19:37:27 -0000 1.2 @@ -0,0 +1 @@ +DeviceKit-disks-002.git20080720.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 15:55:57 -0000 1.1 +++ sources 22 Jul 2008 19:37:27 -0000 1.2 @@ -0,0 +1 @@ +e5fc1c23c3cf7036ba8c92d19f4fdbca DeviceKit-disks-002.git20080720.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 19:39:22 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Tue, 22 Jul 2008 19:39:22 GMT Subject: rpms/gnome-disk-utility/devel gnome-disk-utility.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807221939.m6MJdMUt006773@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gnome-disk-utility/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6665/devel Modified Files: .cvsignore sources Added Files: gnome-disk-utility.spec import.log Log Message: initial commit --- NEW FILE gnome-disk-utility.spec --- %define dbus_version 1.2 %define dbus_glib_version 0.76 %define glib2_version 2.16 %define gtk2_version 2.12 %define gnome_doc_utils_version 0.3.2 %define polkit_version 0.8 %define polkit_gnome_version 0.8 %define gnome_keyring_version 2.22 %define devicekit_disks_version 002 Summary: GNOME Disk Utility Name: gnome-disk-utility Version: 0.1 Release: 0.git20080720%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/gnome-disk-utility.git;a=summary Source0: %{name}-%{version}.git20080720.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: dbus-glib >= %{dbus_glib_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: PolicyKit-devel >= %{polkit_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version} BuildRequires: DeviceKit-disks-devel >= %{devicekit_disks_version} BuildRequires: PolicyKit-gnome-devel >= %{polkit_gnome_version} BuildRequires: libsexy-devel BuildRequires: intltool Requires(post): scrollkeeper Requires(postun): scrollkeeper %description GNOME Disk Utility libraries and GTK+ based Palimpsest Disk Utility. %package libs Summary: Shared libraries for non-UI bits gnome-disk-utility Group: Development/Libraries Requires: DeviceKit-disks >= %{devicekit_disks_version} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description libs Shared libraries for non-UI bits of gnome-disk-utility. %package ui-libs Summary: Shared libraries for UI bits of gnome-disk-utility Group: Development/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description ui-libs Shared libraries for UI bits of gnome-disk-utility. %package devel Summary: Headers and libraries for non-UI bits of gnome-disk-utility Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: glib2-devel >= %{glib2_version} Requires: pkgconfig %description devel Headers and libraries for non-UI bits of gnome-disk-utility. %package ui-devel Summary: Headers and libraries for UI bits of gnome-disk-utility Group: Development/Libraries Requires: %{name}-ui-libs = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: gtk2-devel >= %{gtk2_version} Requires: pkgconfig %description ui-devel Headers and libraries for UI bits of gnome-disk-utility. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # TODO: upstream doesn't ship a HACKING file yet echo " " > HACKING desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/palimpsest.desktop rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a # TODO: no translations yet #%find_lang --with-gnome %{name} %clean rm -rf $RPM_BUILD_ROOT %post scrollkeeper-update update-desktop-database %{_datadir}/applications &> /dev/null %postun scrollkeeper-update update-desktop-database %{_datadir}/applications &> /dev/null %post libs touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi /sbin/ldconfig %postun libs touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi /sbin/ldconfig %post ui-libs -p /sbin/ldconfig %postun ui-libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/palimpsest %{_datadir}/applications/palimpsest.desktop %dir %{_datadir}/gnome/help/palimpsest %{_datadir}/gnome/help/palimpsest/* %dir %{_datadir}/omf/palimpsest %{_datadir}/omf/palimpsest/* # TODO: no translations yet #%files libs -f %{name}.lang %files libs %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING HACKING doc/TODO %{_libdir}/libgdu.so.* # Yes, it's a bit weird to include icons in the non-UI package but the # library returns references to these icons %{_datadir}/icons/hicolor/* %files ui-libs %defattr(-,root,root,-) %{_libdir}/libgdu-gtk.so.* %files devel %defattr(-,root,root,-) %{_libdir}/libgdu.so %{_libdir}/pkgconfig/gdu.pc %dir %{_includedir}/gnome-disk-utility %dir %{_includedir}/gnome-disk-utility/gdu %{_includedir}/gnome-disk-utility/gdu/* # TODO: upstream needs to split docs for libgdu and libgdu-gtk %dir %{_datadir}/gtk-doc/html/gnome-disk-utility %{_datadir}/gtk-doc/html/gnome-disk-utility/* %files ui-devel %defattr(-,root,root,-) %{_libdir}/libgdu-gtk.so %{_libdir}/pkgconfig/gdu-gtk.pc %dir %{_includedir}/gnome-disk-utility/gdu-gtk %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog * Fri Jul 20 2008 David Zeuthen - 0.1-0.git20080720%{?dist} - Initial Packaging --- NEW FILE import.log --- gnome-disk-utility-0_1-0_git20080720_fc10:HEAD:gnome-disk-utility-0.1-0.git20080720.fc10.src.rpm:1216755478 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 15:55:01 -0000 1.1 +++ .cvsignore 22 Jul 2008 19:38:35 -0000 1.2 @@ -0,0 +1 @@ +gnome-disk-utility-0.1.git20080720.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 15:55:01 -0000 1.1 +++ sources 22 Jul 2008 19:38:35 -0000 1.2 @@ -0,0 +1 @@ +c084cc2f0b3e97ff2f01a13d7c76651d gnome-disk-utility-0.1.git20080720.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 19:40:23 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 22 Jul 2008 19:40:23 GMT Subject: rpms/amarok/devel .cvsignore, 1.33, 1.34 amarok.spec, 1.113, 1.114 sources, 1.33, 1.34 amarok-1.4.7-xdg.patch, 1.1, NONE amarok-1.4.8-gcc43.patch, 1.6, NONE Message-ID: <200807221940.m6MJeNH0006939@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6825 Modified Files: .cvsignore amarok.spec sources Removed Files: amarok-1.4.7-xdg.patch amarok-1.4.8-gcc43.patch Log Message: * Tue Jul 22 2008 Rex Dieter - 1.86-1 - amarok-1.86 (amarok2 alpha 2) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 16 Apr 2008 13:13:44 -0000 1.33 +++ .cvsignore 22 Jul 2008 19:39:28 -0000 1.34 @@ -1 +1 @@ -amarok-1.4.9.1.tar.bz2 +amarok-1.86.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- amarok.spec 11 Jun 2008 16:18:58 -0000 1.113 +++ amarok.spec 22 Jul 2008 19:39:28 -0000 1.114 @@ -1,107 +1,47 @@ -# TODO: -# Rio Karma support : libkarma -%if 0%{?fedora} < 9 -# define to include konquisidebar support for kde3 desktop -%define konq 1 -%endif - -%if 0%{?fedora} > 6 -# suffix for kde3 -devel packages -%define kde3 3 -%endif - -%if 0%{?fedora} > 6 -# Helix engine on archs where it is available -%ifnarch ppc64 x86_64 s390 s390x ia64 sparcv9 sparc64 alpha -# consider omitting helix support, srsly, does *anyone* use it? -- Rex -%define _with_helix --with-helix=%{_libdir}/helix -%endif -%endif - -%if 0%{?fedora} -%define _with_ifp --with-ifp -%define _with_libgpod --with-libgpod -%define _with_libmtp --with-libmtp -%define _with_libnjb --with-libnjb -%define _with_libvisual --with-libvisual -%define _with_mp4v2 --with-mp4v2 -%endif - -Name: amarok -Summary: Media player -Version: 1.4.9.1 -Release: 4%{?dist} - -Group: Applications/Multimedia -License: GPLv2+ -Url: http://amarok.kde.org -Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Patch1: amarok-1.4.8-gcc43.patch -# Use xdg-open to start the selected browser -Patch2: amarok-1.4.7-xdg.patch - -BuildRequires: alsa-lib-devel -BuildRequires: desktop-file-utils -BuildRequires: esound-devel -BuildRequires: gettext -%{?_with_helix:BuildRequires: HelixPlayer} -BuildRequires: kdelibs%{?kde3}-devel -%if 0%{?konq} -BuildRequires: kdebase%{?kde3}-devel -%else -Obsoletes: %{name}-konqueror < %{version}-%{release} -%endif -BuildRequires: taglib-devel -%{?_with_ifp:BuildRequires: libifp-devel} -# Ipod -%{?_with_libgpod:BuildRequires: libgpod-devel} -%{?_with_mp4v2:BuildRequires: libmp4v2-devel} -# MTP players -%{?_with_libmtp:BuildRequires: libmtp-devel} -BuildRequires: libmusicbrainz-devel -# Creative Nomad Jukebox -%{?_with_libnjb:BuildRequires: libnjb-devel} -BuildRequires: libtool -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libtool-ltdl-devel -%endif -BuildRequires: libtunepimp-devel -BuildRequires: libusb-devel -%{?_with_libvisual:BuildRequires: libvisual-devel} -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: ruby-devel ruby -BuildRequires: SDL-devel -BuildRequires: taglib-devel -BuildRequires: xine-lib-devel -# not used anymore, in favor of libvisual ? -- Rex -#%{?fedora:BuildRequires: xmms-devel} +Name: amarok +Summary: Media player +Version: 1.86 +Release: 1%{?dist} + +Group: Applications/Multimedia +License: GPLv2+ +Url: http://amarok.kde.org/ +Source0: http://download.kde.org/unstable/amarok/1.86/src/amarok-1.86.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: alsa-lib-devel +BuildRequires: curl-devel +BuildRequires: desktop-file-utils +BuildRequires: esound-devel +BuildRequires: gettext +# FIXME: giflib-devel bogus dep, from where? +BuildRequires: giflib-devel +BuildRequires: kdelibs4-devel +BuildRequires: kdebase-workspace-devel +BuildRequires: kdemultimedia-devel +BuildRequires: libifp-devel +BuildRequires: libgpod-devel +BuildRequires: libmp4v2-devel +BuildRequires: libmtp-devel +BuildRequires: libmusicbrainz-devel +BuildRequires: libnjb-devel +BuildRequires: libtunepimp-devel +BuildRequires: libusb-devel +BuildRequires: libvisual-devel +BuildRequires: libxml2-devel +BuildRequires: loudmouth-devel +BuildRequires: mysql-devel +BuildRequires: soprano-devel +BuildRequires: taglib-devel -# For dir ownership and some default plugins (lyrics), -ruby subpkg? -- Rex -Requires: ruby - -# To open the selected browser, works with Patch2 -Requires: xdg-utils Requires(post): xdg-utils Requires(postun): xdg-utils Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 - Obsoletes: amarok-devel < %{version}-%{release} -%if 0%{?fedora} > 6 && 0%{?fedora} < 9 -# need to keep this around for previous releases, so not to break multilib compat. -Provides: amarok-devel = %{version}-%{release} -%endif - -# engines, etc... -# old, obsolete ones: arts, akode -Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 -# xine-lib -Provides: %{name}-engine-xine = %{version}-%{release} - +Obsoletes: amarok-konqueror < 1.5 +Obsoletes: amarok-visualisation < 1.5 %description Amarok is a multimedia player with: @@ -111,199 +51,77 @@ - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch -%if 0%{?_with_helix:1} -Amarok can use various engines to decode sound : helix and xine. -To use the helix engine, you need to install either HelixPlayer -or RealPlayer -%endif - -%package konqueror -Summary: Amarok konqueror (service menus, sidebar) support -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -%description konqueror -%{summary}. - -%if 0%{?_with_libvisual:1} -%package visualisation -Summary: Visualisation plugins for Amarok -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -# No plugins by default, we need libvisual-plugins -Requires: libvisual-plugins -%description visualisation -Amarok can use visualisation plugins from different origins. -Right now, only xmms is supported, which means that you can -use any of xmms' visualisation plugins with Amarok. -%endif - %prep %setup -q -%patch1 -p1 -b .gcc43 -%patch2 -p1 -b .xdg - %build -unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} .. +popd -%configure \ - --disable-debug --disable-warnings \ - --disable-rpath \ - --enable-mysql \ - --enable-postgresql \ - %{?_with_helix} %{!?_with_helix:--without-helix} \ - %{?_with_ifp} %{!?_with_ifp:--without-ifp} \ - %{?_with_libgpod} %{!?_with_libgpod:--without-libgpod} \ - %{?_with_libmtp} %{!?_with_libmtp:--without-libmtp} \ - %{?_with_libnjb} %{!?_with_libnjb:--without-libnjb} \ - %{?_with_libvisual} %{!?_with_libvisual:--without-libvisual} \ - %{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2} - -# --enable-final \ -# --with-nmm \ -# --with-mas - -# fails with smp flags -#make %{?_smp_mflags} -make +make %{?_smp_mflags} -C %{_target_platform} %install -rm -fr $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} -C %{_target_platform} # desktop files desktop-file-install --vendor "" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop + --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \ + --delete-original \ + %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop + +%find_lang amarok || touch amarok.lang # unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -%if ! 0%{?konq} -rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/*.desktop -%endif +rm -f %{buildroot}%{_kde4_libdir}/lib*.so -%find_lang %{name} -# HTML -for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - [ "$lang" == "en" ] && d=en/%{name} || d=$lang - echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang - fi -done +%clean +rm -rf %{buildroot} %post /sbin/ldconfig -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + %postun /sbin/ldconfig -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%clean -rm -fr $RPM_BUILD_ROOT - - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc COPYING AUTHORS ChangeLog README -%{_bindir}/amarok -%{_bindir}/amarokapp -%{_bindir}/amarokcollectionscanner -%{_bindir}/amarok_proxy.rb -%{_datadir}/apps/amarok/ -%{_datadir}/icons/hicolor/*/*/* -%{_datadir}/applications/kde/*.desktop -%{_datadir}/servicetypes/*.desktop -%{_datadir}/apps/profiles/amarok.profile.xml -%{_datadir}/config/amarokrc -%{_datadir}/config.kcfg/*.kcfg -%{_datadir}/services/amarokitpc.protocol -%{_datadir}/services/amaroklastfm.protocol -%{_datadir}/services/amarokpcast.protocol -# -libs ? -- Rex -%{_libdir}/libamarok.* -# -ruby ? -- Rex -%{_libdir}/ruby_lib/* -# DAAP -%{_bindir}/amarok_daapserver.rb -%{_libdir}/kde3/libamarok_daap-mediadevice.* -%{_datadir}/services/amarok_daap-mediadevice.desktop -# Mass-storage -%{_datadir}/services/amarok_massstorage-device.desktop -%{_libdir}/kde3/libamarok_massstorage-device.* -# NFS -%{_datadir}/services/amarok_nfs-device.desktop -%{_libdir}/kde3/libamarok_nfs-device.* -# SMB -%{_datadir}/services/amarok_smb-device.desktop -%{_libdir}/kde3/libamarok_smb-device.* -%if 0%{?_with_libgpod:1} -# IPod -%{_datadir}/services/amarok_ipod-mediadevice.desktop -%{_libdir}/kde3/libamarok_ipod-mediadevice.* -%endif -# VFAT -%{_datadir}/services/amarok_generic-mediadevice.desktop -%{_libdir}/kde3/libamarok_generic-mediadevice.* -%if 0%{?_with_ifp:1} -# iRiver -%{_datadir}/services/amarok_ifp-mediadevice.desktop -%{_libdir}/kde3/libamarok_ifp-mediadevice.* -%endif -%if 0%{?_with_libnjb:1} -# Creative Zen -%{_datadir}/services/amarok_njb-mediadevice.desktop -%{_libdir}/kde3/libamarok_njb-mediadevice.* -%endif -%if 0%{?_with_libmtp:1} -# MTP players -%{_datadir}/services/amarok_mtp-mediadevice.desktop -%{_libdir}/kde3/libamarok_mtp-mediadevice.* -%endif -# Rio Karma -#%{_datadir}/services/amarok_riokarma-mediadevice.desktop -#%{_libdir}/kde3/libamarok_riokarma-mediadevice.* -# Void engine (noop) -%{_datadir}/services/amarok_void-engine_plugin.desktop -%{_libdir}/kde3/libamarok_void-engine_plugin.* -# Xine engine -%{_datadir}/services/amarok_xine-engine.desktop -%{_libdir}/kde3/libamarok_xine-engine.* -## Gstreamer engine -#%{_datadir}/services/amarok_gst10engine_plugin.desktop -#%{_libdir}/kde3/libamarok_gst10engine_plugin.* -# Helix engine -%if 0%{?_with_helix:1} -%{_libdir}/kde3/libamarok_helixengine_plugin.* -%{_datadir}/services/amarok_helixengine_plugin.desktop -%endif - -%if 0%{?konq} -%files konqueror +%files -f amarok.lang %defattr(-,root,root,-) -%{_datadir}/apps/konqueror/servicemenus/*.desktop -%{_libdir}/kde3/konqsidebar_universalamarok.* -%{_datadir}/apps/konqsidebartng/*/amarok.desktop -%endif - -%if 0%{?_with_libvisual:1} -%files visualisation -%defattr(-,root,root,-) -%{_bindir}/amarok_libvisual -%endif +%doc AUTHORS COPYING ChangeLog README +%{_kde4_bindir}/* +%{_kde4_appsdir}/amarok/ +%{_kde4_appsdir}/desktoptheme/Amarok-Mockup/ +%{_kde4_appsdir}/desktoptheme/amarok-default.desktop +%{_kde4_appsdir}/desktoptheme/default/widgets/* +%{_kde4_configdir}/* +%{_kde4_datadir}/applications/kde4/*.desktop +%{_kde4_datadir}/config.kcfg/* +%{_kde4_datadir}/kde4/services/* +%{_kde4_datadir}/kde4/servicetypes/*.desktop +%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/lib*.so.* +%{_kde4_libdir}/strigi/* +%{_datadir}/dbus-1/interfaces/*.xml %changelog +* Tue Jul 22 2008 Rex Dieter - 1.86-1 +- amarok-1.86 (amarok2 alpha 2) + * Wed Jun 11 2008 Dennis Gilmore - 1.4.9.1-4 - we are building sparc32 as sparcv9 not sparc now fix ifnarch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 15 Apr 2008 19:16:13 -0000 1.33 +++ sources 22 Jul 2008 19:39:28 -0000 1.34 @@ -1 +1 @@ -aa588778379a391ad3f4b3fc770217e4 amarok-1.4.9.1.tar.bz2 +acf43672687a5f261ce36d668338a4c1 amarok-1.86.tar.bz2 --- amarok-1.4.7-xdg.patch DELETED --- --- amarok-1.4.8-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 22 19:41:55 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Tue, 22 Jul 2008 19:41:55 GMT Subject: rpms/unicap/devel unicap.spec,1.4,1.5 Message-ID: <200807221941.m6MJftDl007218@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7048 Modified Files: unicap.spec Log Message: Rebuild for libraw1394 2.0.0 Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/devel/unicap.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unicap.spec 19 May 2008 16:09:27 -0000 1.4 +++ unicap.spec 22 Jul 2008 19:40:50 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap Version: 0.2.23 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -65,6 +65,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Wed Jul 22 2008 Robert Scheck 0.2.23-2 +- Rebuild for libraw1394 2.0.0 + * Mon May 19 2008 Robert Scheck 0.2.23-1 - Upgrade to 0.2.23 - Corrected packaging of cpi/*.so files (thanks to Arne Caspari) From fedora-extras-commits at redhat.com Tue Jul 22 19:43:32 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Tue, 22 Jul 2008 19:43:32 GMT Subject: rpms/gfs-garaldus-fonts/devel gfs-garaldus-fonts-fontconfig.conf, NONE, 1.1 gfs-garaldus-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807221943.m6MJhWYc007484@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/gfs-garaldus-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7380/devel Modified Files: .cvsignore sources Added Files: gfs-garaldus-fonts-fontconfig.conf gfs-garaldus-fonts.spec import.log Log Message: Initial packaging ??? --- NEW FILE gfs-garaldus-fonts-fontconfig.conf --- GFS Garaldus fantasy fantasy GFS Garaldus --- NEW FILE gfs-garaldus-fonts.spec --- %define fontname gfs-garaldus %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename GFS_GARALDUS Name: %{fontname}-fonts Version: 20080707 Release: 1%{?dist} Summary: GFS Garaldus majuscule Greek font Group: User Interface/X License: OFL URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html Source0: http://www.greekfontsociety.gr/%{archivename}.zip Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch %description As it is known, the Greek alphabet was used in majuscule form for over a millennium before the minuscule letters gradually replaced it until they became the official script in the 9th century A.D. Thereafter, majuscule letters were confined to sparse use as initials or elaborate titles until the Italian Renaissance. The new art of Typography, as well as the need of the humanists to mimic the ancient Greco-Roman period brought back the extensive use of the majuscule letter-forms in both Latin and Greek typography. Greek books of the time were printed using the contemporary Byzantine hand with which they combined capital letters modelled on the Roman antiquity, i.e. with thick and thin strokes and serifs. At the same time the Byzantine majuscule tradition, principally used on theological editions, remainned alive until the early 19th century. It has been designed by George D. Matthiopoulos. %prep %setup -q -c -T unzip -j -L -q %{SOURCE0} chmod 0644 *.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build # Nothing there %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.otf %{buildroot}%{fontdir} install -m 0755 -d %{buildroot}%{fontconfdir} install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf %clean rm -fr %{buildroot} %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache %{fontdir} || : fi %files %defattr(0644,root,root,0755) %doc *.txt %config(noreplace) %{fontconfdir}/61-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.otf %changelog * Mon Jul 21 2008 Nicolas Mailhot - 20080707-1 ?? initial packaging --- NEW FILE import.log --- gfs-garaldus-fonts-20080707-1_fc10:HEAD:gfs-garaldus-fonts-20080707-1.fc10.src.rpm:1216755659 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gfs-garaldus-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 15:51:58 -0000 1.1 +++ .cvsignore 22 Jul 2008 19:42:51 -0000 1.2 @@ -0,0 +1 @@ +GFS_GARALDUS.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/gfs-garaldus-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 15:51:58 -0000 1.1 +++ sources 22 Jul 2008 19:42:51 -0000 1.2 @@ -0,0 +1 @@ +7638996769c9162f0d8b8885c18af68f GFS_GARALDUS.zip From fedora-extras-commits at redhat.com Tue Jul 22 19:46:23 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Tue, 22 Jul 2008 19:46:23 GMT Subject: comps comps-f10.xml.in,1.57,1.58 Message-ID: <200807221946.m6MJkNac007900@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816 Modified Files: comps-f10.xml.in Log Message: add gfs-garaldus-fonts Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- comps-f10.xml.in 21 Jul 2008 04:09:42 -0000 1.57 +++ comps-f10.xml.in 22 Jul 2008 19:45:53 -0000 1.58 @@ -1381,6 +1381,7 @@ gfs-didot-fonts gfs-eustace-fonts gfs-fleischman-fonts + gfs-garaldus-fonts gfs-gazis-fonts gfs-jackson-fonts gfs-neohellenic-fonts @@ -2151,6 +2152,7 @@ gfs-didot-fonts gfs-eustace-fonts gfs-fleischman-fonts + gfs-garaldus-fonts gfs-gazis-fonts gfs-jackson-fonts gfs-neohellenic-fonts From fedora-extras-commits at redhat.com Tue Jul 22 19:55:55 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 22 Jul 2008 19:55:55 GMT Subject: rpms/gnupg/devel gnupg.spec,1.76,1.77 Message-ID: <200807221955.m6MJtt3A008884@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/gnupg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8810 Modified Files: gnupg.spec Log Message: - describe license as actually GPLv3+ with exceptions rather than just GPLv3+ (Todd Zullinger, #447772) - drop unneeded patch to use gpgkeys_ldap for ldaps: URLs (#447772) From fedora-extras-commits at redhat.com Tue Jul 22 19:56:10 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 19:56:10 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 bootstrap-java-1.6.0-openjdk.spec, 1.1.2.3, 1.1.2.4 Message-ID: <200807221956.m6MJuAZb008920@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8799 Modified Files: Tag: java-1_6_0-openjdk-1_6_0_0-0_5_b06_el5_bootstrap bootstrap-java-1.6.0-openjdk.spec Log Message: supersede current ppc build with bootstrapped one Index: bootstrap-java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/Attic/bootstrap-java-1.6.0-openjdk.spec,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- bootstrap-java-1.6.0-openjdk.spec 22 Jul 2008 19:06:37 -0000 1.1.2.3 +++ bootstrap-java-1.6.0-openjdk.spec 22 Jul 2008 19:55:25 -0000 1.1.2.4 @@ -1,9 +1,10 @@ %define __spec_install_post %{nil} %define boot_name java-1.6.0-openjdk -Name: bootstrap-%{boot_name} -Version: 0 -Release: 2%{?dist} +Name: %{boot_name} +Epoch: 1 +Version: 1.6.0.0 +Release: 0.7.b08.el5.3 Summary: Bootstrap blob for %{boot_name} Group: Development/Libraries From fedora-extras-commits at redhat.com Tue Jul 22 19:56:46 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 22 Jul 2008 19:56:46 GMT Subject: rpms/gnupg/devel gnupg.spec,1.77,1.78 Message-ID: <200807221956.m6MJukuT008998@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/gnupg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8898 Modified Files: gnupg.spec Log Message: don't forget to increment the release number Index: gnupg.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnupg/devel/gnupg.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- gnupg.spec 22 Jul 2008 19:55:31 -0000 1.77 +++ gnupg.spec 22 Jul 2008 19:56:01 -0000 1.78 @@ -1,7 +1,7 @@ Summary: A GNU utility for secure communication and data storage Name: gnupg Version: 1.4.9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ with exceptions Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 19:59:44 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 22 Jul 2008 19:59:44 GMT Subject: rpms/amarok/devel amarok.spec,1.114,1.115 Message-ID: <200807221959.m6MJxig1009433@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9252 Modified Files: amarok.spec Log Message: BR +pcre-devel (another bogus dep) Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- amarok.spec 22 Jul 2008 19:39:28 -0000 1.114 +++ amarok.spec 22 Jul 2008 19:58:51 -0000 1.115 @@ -15,8 +15,8 @@ BuildRequires: desktop-file-utils BuildRequires: esound-devel BuildRequires: gettext -# FIXME: giflib-devel bogus dep, from where? -BuildRequires: giflib-devel +# FIXME: bogus deps, from where? +BuildRequires: giflib-devel pcre-devel BuildRequires: kdelibs4-devel BuildRequires: kdebase-workspace-devel BuildRequires: kdemultimedia-devel From fedora-extras-commits at redhat.com Tue Jul 22 20:00:26 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 20:00:26 GMT Subject: rpms/gnome-keyring/devel .cvsignore, 1.43, 1.44 gnome-keyring.spec, 1.86, 1.87 sources, 1.43, 1.44 Message-ID: <200807222000.m6MK0QZV009568@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-keyring/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9411 Modified Files: .cvsignore gnome-keyring.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 27 May 2008 09:18:03 -0000 1.43 +++ .cvsignore 22 Jul 2008 19:59:39 -0000 1.44 @@ -1 +1 @@ -gnome-keyring-2.22.2.tar.bz2 +gnome-keyring-2.23.5.tar.bz2 Index: gnome-keyring.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- gnome-keyring.spec 29 May 2008 21:36:29 -0000 1.86 +++ gnome-keyring.spec 22 Jul 2008 19:59:40 -0000 1.87 @@ -7,8 +7,8 @@ Summary: A framework for managing user passwords and other secrets Name: gnome-keyring -Version: 2.22.2 -Release: 2%{?dist} +Version: 2.23.5 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gnome-keyring/2.22/gnome-keyring-%{version}.tar.bz2 @@ -138,6 +138,9 @@ %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Thu May 29 2008 Colin Walters - 2.22.2-2 - Add patch to nuke allow-deny dialog, see linked upstream bug for discussion Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 27 May 2008 09:18:03 -0000 1.43 +++ sources 22 Jul 2008 19:59:40 -0000 1.44 @@ -1 +1 @@ -6957b89ad34c0e53135e66102e4db9f9 gnome-keyring-2.22.2.tar.bz2 +0f643130a83e443d22802c16b6fe3f69 gnome-keyring-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 20:01:26 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Tue, 22 Jul 2008 20:01:26 GMT Subject: rpms/kernel/F-8 linux-2.6-libata-acpi-fix-invalid-context-acpi.patch, NONE, 1.1 kernel.spec, 1.500, 1.501 Message-ID: <200807222001.m6MK1QgN016225@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9591 Modified Files: kernel.spec Added Files: linux-2.6-libata-acpi-fix-invalid-context-acpi.patch Log Message: * Tue Jul 22 2008 Kyle McMartin - libata-acpi: fix calling sleeping function in irq context (#451896, #454954) linux-2.6-libata-acpi-fix-invalid-context-acpi.patch: --- NEW FILE linux-2.6-libata-acpi-fix-invalid-context-acpi.patch --- 3c1e3896344063273715b332b1c0534deb9b286c Index: linux-2.6.25.noarch/drivers/ata/libata-acpi.c =================================================================== --- linux-2.6.25.noarch.orig/drivers/ata/libata-acpi.c +++ linux-2.6.25.noarch/drivers/ata/libata-acpi.c @@ -195,6 +195,10 @@ static void ata_acpi_handle_hotplug(stru /* This device does not support hotplug */ return; + if (event == ACPI_NOTIFY_BUS_CHECK || + event == ACPI_NOTIFY_DEVICE_CHECK) + status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); + spin_lock_irqsave(ap->lock, flags); switch (event) { @@ -202,7 +206,6 @@ static void ata_acpi_handle_hotplug(stru case ACPI_NOTIFY_DEVICE_CHECK: ata_ehi_push_desc(ehi, "ACPI event"); - status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); if (ACPI_FAILURE(status)) { ata_port_printk(ap, KERN_ERR, "acpi: failed to determine bay status (0x%x)\n", Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.500 retrieving revision 1.501 diff -u -r1.500 -r1.501 --- kernel.spec 21 Jul 2008 04:36:12 -0000 1.500 +++ kernel.spec 22 Jul 2008 20:00:38 -0000 1.501 @@ -650,6 +650,7 @@ Patch676: linux-2.6-libata-pata_atiixp-dont-disable.patch Patch677: linux-2.6-libata-retry-enabling-ahci.patch Patch678: linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch +Patch679: linux-2.6-libata-acpi-fix-invalid-context-acpi.patch Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch @@ -1182,6 +1183,8 @@ ApplyPatch linux-2.6-libata-retry-enabling-ahci.patch # fix ahci / ICH6 conflict ApplyPatch linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch +# fix invalid irq context in libata-acpi (#451896) +ApplyPatch linux-2.6-libata-acpi-fix-invalid-context-acpi.patch # wireless # @@ -1853,6 +1856,9 @@ %changelog +* Tue Jul 22 2008 Kyle McMartin +- libata-acpi: fix calling sleeping function in irq context (#451896, #454954) + * Sun Jul 20 2008 Chuck Ebbert 2.6.25.11-60 - x86: dump APIC/IOAPIC/PIC state at boot time From fedora-extras-commits at redhat.com Tue Jul 22 20:02:50 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Tue, 22 Jul 2008 20:02:50 GMT Subject: rpms/kernel/F-9 linux-2.6-libata-acpi-fix-invalid-context-acpi.patch, NONE, 1.1 kernel.spec, 1.717, 1.718 Message-ID: <200807222002.m6MK2oGB016451@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352 Modified Files: kernel.spec Added Files: linux-2.6-libata-acpi-fix-invalid-context-acpi.patch Log Message: * Tue Jul 22 2008 Kyle McMartin - libata-acpi: fix calling sleeping function in irq context (#451896, #454954) linux-2.6-libata-acpi-fix-invalid-context-acpi.patch: --- NEW FILE linux-2.6-libata-acpi-fix-invalid-context-acpi.patch --- 3c1e3896344063273715b332b1c0534deb9b286c Index: linux-2.6.25.noarch/drivers/ata/libata-acpi.c =================================================================== --- linux-2.6.25.noarch.orig/drivers/ata/libata-acpi.c +++ linux-2.6.25.noarch/drivers/ata/libata-acpi.c @@ -195,6 +195,10 @@ static void ata_acpi_handle_hotplug(stru /* This device does not support hotplug */ return; + if (event == ACPI_NOTIFY_BUS_CHECK || + event == ACPI_NOTIFY_DEVICE_CHECK) + status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); + spin_lock_irqsave(ap->lock, flags); switch (event) { @@ -202,7 +206,6 @@ static void ata_acpi_handle_hotplug(stru case ACPI_NOTIFY_DEVICE_CHECK: ata_ehi_push_desc(ehi, "ACPI event"); - status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); if (ACPI_FAILURE(status)) { ata_port_printk(ap, KERN_ERR, "acpi: failed to determine bay status (0x%x)\n", Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.717 retrieving revision 1.718 diff -u -r1.717 -r1.718 --- kernel.spec 21 Jul 2008 22:22:31 -0000 1.717 +++ kernel.spec 22 Jul 2008 20:02:02 -0000 1.718 @@ -643,6 +643,7 @@ Patch676: linux-2.6-libata-pata_atiixp-dont-disable.patch Patch677: linux-2.6-libata-retry-enabling-ahci.patch Patch678: linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch +Patch679: linux-2.6-libata-acpi-fix-invalid-context-acpi.patch Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch @@ -1234,6 +1235,8 @@ ApplyPatch linux-2.6-libata-retry-enabling-ahci.patch # fix ahci / ich6m conflict ApplyPatch linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch +# fix calling sleeping function in irq context (#451896, #454954) +ApplyPatch linux-2.6-libata-acpi-fix-invalid-context-acpi.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless.patch @@ -1893,6 +1896,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Tue Jul 22 2008 Kyle McMartin +- libata-acpi: fix calling sleeping function in irq context (#451896, #454954) + * Mon Jul 21 2008 Dave Jones - Change yenta to modular instead of built-in. (#456173) From fedora-extras-commits at redhat.com Tue Jul 22 20:04:11 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 22 Jul 2008 20:04:11 GMT Subject: rpms/sylpheed/devel sylpheed-2.5.0-svn2029.patch, NONE, 1.1 sylpheed.spec, 1.86, 1.87 sylpheed-2.4.8-enchant.patch, 1.2, NONE Message-ID: <200807222004.m6MK4BTw016611@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16518 Modified Files: sylpheed.spec Added Files: sylpheed-2.5.0-svn2029.patch Removed Files: sylpheed-2.4.8-enchant.patch Log Message: * Tue Jul 22 2008 Michael Schwendt - 2.5.0-2.2029svn - update to post-2.5.0 revision 2029 - upstream's IMAP LIST modifications move away from RFC 2683 (test this!) sylpheed-2.5.0-svn2029.patch: --- NEW FILE sylpheed-2.5.0-svn2029.patch --- Index: libsylph/procmime.c =================================================================== --- libsylph/procmime.c (revision 2012) +++ libsylph/procmime.c (working copy) @@ -782,9 +782,11 @@ } if (mimeinfo->mime_type == MIME_APPLICATION_OCTET_STREAM && - mimeinfo->name) { + (mimeinfo->filename || mimeinfo->name)) { const gchar *type; - type = procmime_get_mime_type(mimeinfo->name); + type = procmime_get_mime_type + (mimeinfo->filename ? mimeinfo->filename + : mimeinfo->name); if (type) mimeinfo->mime_type = procmime_scan_mime_type(type); } Index: libsylph/codeconv.c =================================================================== --- libsylph/codeconv.c (revision 2012) +++ libsylph/codeconv.c (working copy) @@ -154,6 +154,8 @@ state = JIS_UDC; \ } +static ConvADType conv_ad_type = C_AD_BY_LOCALE; + static gchar *conv_jistoeuc(const gchar *inbuf, gint *error); static gchar *conv_jistosjis(const gchar *inbuf, gint *error); static gchar *conv_euctojis(const gchar *inbuf, gint *error); @@ -1373,7 +1375,8 @@ /* auto detection mode */ if (!src_encoding && !dest_encoding) { - if (conv_is_ja_locale()) + if (conv_ad_type == C_AD_JAPANESE || + (conv_ad_type == C_AD_BY_LOCALE && conv_is_ja_locale())) return conv_anytodisp; else return conv_noconv; @@ -2087,6 +2090,16 @@ return is_ja_locale != 0; } +void conv_set_autodetect_type(ConvADType type) +{ + conv_ad_type = type; +} + +ConvADType conv_get_autodetect_type(void) +{ + return conv_ad_type; +} + gchar *conv_unmime_header(const gchar *str, const gchar *default_encoding) { gchar *buf; @@ -2105,7 +2118,8 @@ } } - if (conv_is_ja_locale()) + if (conv_ad_type == C_AD_JAPANESE || + (conv_ad_type == C_AD_BY_LOCALE && conv_is_ja_locale())) buf = conv_anytodisp(str, NULL); else buf = conv_localetodisp(str, NULL); Index: libsylph/codeconv.h =================================================================== --- libsylph/codeconv.h (revision 2012) +++ libsylph/codeconv.h (working copy) @@ -95,6 +95,13 @@ C_ISO_8859_16 } CharSet; +typedef enum +{ + C_AD_BY_LOCALE, + C_AD_NEVER, + C_AD_JAPANESE +} ConvADType; + typedef gchar *(*CodeConvFunc) (const gchar *inbuf, gint *error); struct _CodeConverter @@ -224,6 +231,9 @@ const gchar *conv_get_current_locale (void); gboolean conv_is_ja_locale (void); +void conv_set_autodetect_type (ConvADType type); +ConvADType conv_get_autodetect_type (void); + gchar *conv_unmime_header (const gchar *str, const gchar *default_encoding); void conv_encode_header (gchar *dest, Index: libsylph/imap.c =================================================================== --- libsylph/imap.c (revision 2012) +++ libsylph/imap.c (working copy) @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2007 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -183,6 +183,8 @@ static GSList *imap_parse_list (IMAPSession *session, const gchar *real_path, gchar *separator); +static GSList *imap_add_inter_folders (GSList *item_list, + const gchar *root_path); static GSList *imap_get_part_folder_list(GSList *item_list, FolderItem *item); @@ -1917,6 +1919,7 @@ imap_cmd_gen_send(session, "LIST \"\" \"%s\"", wildcard_path); item_list = imap_parse_list(session, real_path, NULL); + item_list = imap_add_inter_folders(item_list, item->path); g_free(real_path); g_free(wildcard_path); @@ -2013,6 +2016,82 @@ return item_list; } +static GSList *imap_add_inter_folders(GSList *item_list, const gchar *root_path) +{ + FolderItem *item; + GSList *cur; + GSList *add_list = NULL; + GHashTable *exist; + const gchar *p; + gint root_path_len = 0; + + if (root_path) + root_path_len = strlen(root_path); + + exist = g_hash_table_new(g_str_hash, g_str_equal); + + for (cur = item_list; cur != NULL; cur = cur->next) { + item = FOLDER_ITEM(cur->data); + + if (root_path_len > 0 && + strncmp(root_path, item->path, root_path_len) != 0) + continue; + p = item->path + root_path_len; + if (root_path_len > 0 && *p != '/') continue; + while (*p == '/') p++; + if (*p == '\0') continue; + g_hash_table_insert(exist, (gpointer)p, GINT_TO_POINTER(1)); + } + + for (cur = item_list; cur != NULL; cur = cur->next) { + const gchar *q, *r; + gchar *parent, *full_parent; + FolderItem *new_item; + + item = FOLDER_ITEM(cur->data); + + if (root_path_len > 0 && + strncmp(root_path, item->path, root_path_len) != 0) + continue; + p = item->path + root_path_len; + if (root_path_len > 0 && *p != '/') continue; + while (*p == '/') p++; + if (*p == '\0') continue; + + q = p; + while ((q = strchr(q, '/')) != NULL) { + parent = g_strndup(p, q - p); + if (!g_hash_table_lookup(exist, parent)) { + if (root_path_len > 0) + full_parent = g_strconcat + (root_path, "/", parent, NULL); + else + full_parent = g_strdup(parent); + new_item = folder_item_new(g_basename(parent), + full_parent); + new_item->no_select = TRUE; + add_list = g_slist_prepend(add_list, new_item); + r = new_item->path + root_path_len; + while (*r == '/') r++; + g_hash_table_insert(exist, (gpointer)r, + GINT_TO_POINTER(1)); + debug_print("intermediate folder '%s' added\n", + full_parent); + g_free(full_parent); + } + g_free(parent); + while (*q == '/') q++; + } + } + + g_hash_table_destroy(exist); + + add_list = g_slist_reverse(add_list); + item_list = g_slist_concat(item_list, add_list); + + return item_list; +} + static GSList *imap_get_part_folder_list(GSList *item_list, FolderItem *item) { FolderItem *cur_item; Index: src/compose.c =================================================================== --- src/compose.c (revision 2012) +++ src/compose.c (working copy) @@ -69,8 +69,12 @@ #if USE_GTKSPELL # include # include +#if USE_ENCHANT +# include +#else # include #endif +#endif #include #include @@ -5296,6 +5300,7 @@ compose->check_spell = prefs_common.check_spell; compose->spell_lang = g_strdup(prefs_common.spell_lang); compose->spell_menu = spell_menu; + compose->dict_list = NULL; #endif /* USE_GTKSPELL */ compose->focused_editable = NULL; @@ -5732,8 +5737,37 @@ } #if USE_GTKSPELL +#if USE_ENCHANT +static void ench_dict_desc_cb(const char *const lang_tag, + const char *const provider_name, + const char *const provider_desc, + const char *const provider_file, + void *user_data) +{ + GSList **dict_list = (GSList **)user_data; + *dict_list = g_slist_append(*dict_list, g_strdup((gchar*)lang_tag)); +} + static void compose_set_spell_lang_menu(Compose *compose) { + EnchantBroker *eb; + GSList *dict_list = NULL, *menu_list = NULL, *cur; + GtkWidget *menu; + gboolean lang_set = FALSE; + + eb = enchant_broker_init(); + enchant_broker_list_dicts(eb, ench_dict_desc_cb, &dict_list); + enchant_broker_free(eb); + + for (cur = dict_list; cur != NULL; cur = cur->next) { + if (compose->spell_lang != NULL && + g_ascii_strcasecmp(compose->spell_lang, + (gchar *)cur->data) == 0) + lang_set = TRUE; + } +#else /* !USE_ENCHANT */ +static void compose_set_spell_lang_menu(Compose *compose) +{ AspellConfig *config; AspellDictInfoList *dlist; AspellDictInfoEnumeration *dels; @@ -5748,13 +5782,16 @@ dels = aspell_dict_info_list_elements(dlist); while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) { - dict_list = g_slist_append(dict_list, (gchar *)entry->name); + dict_list = g_slist_append(dict_list, g_strdup(entry->name)); if (compose->spell_lang != NULL && g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0) lang_set = TRUE; } delete_aspell_dict_info_enumeration(dels); +#endif /* USE_ENCHANT */ + compose->dict_list = dict_list; + menu = gtk_menu_new(); for (cur = dict_list; cur != NULL; cur = cur->next) { @@ -5777,15 +5814,18 @@ g_object_set_data(G_OBJECT(item), "spell-lang", dict); gtk_widget_show(item); - if (!lang_set && g_ascii_strcasecmp("en", dict) == 0) + if (!lang_set && g_ascii_strcasecmp("en", dict) == 0) { + g_free(compose->spell_lang); + compose->spell_lang = g_strdup("en"); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), TRUE); + } } gtk_widget_show(menu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->spell_menu), menu); } -#endif +#endif /* USE_GTKSPELL */ static void compose_set_template_menu(Compose *compose) { @@ -5924,6 +5964,8 @@ address_completion_end(compose->window); #if USE_GTKSPELL + slist_free_strings(compose->dict_list); + g_slist_free(compose->dict_list); g_free(compose->spell_lang); #endif @@ -7505,7 +7547,8 @@ GtkSpell *speller; if (GTK_CHECK_MENU_ITEM(widget)->active) { - debug_print("Spell checking enabled\n"); + debug_print("Spell checking enabled: %s\n", + compose->spell_lang ? compose->spell_lang : "(none)"); speller = gtkspell_new_attach(GTK_TEXT_VIEW(compose->text), compose->spell_lang, NULL); compose->check_spell = TRUE; Index: src/compose.h =================================================================== --- src/compose.h (revision 2012) +++ src/compose.h (working copy) @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2007 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -133,9 +133,10 @@ GtkWidget *tmpl_menu; #if USE_GTKSPELL - GtkWidget *spell_menu; - gchar *spell_lang; - gboolean check_spell; + GtkWidget *spell_menu; + gchar *spell_lang; + gboolean check_spell; + GSList *dict_list; #endif ComposeMode mode; Index: src/main.c =================================================================== --- src/main.c (revision 2012) +++ src/main.c (working copy) @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2007 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -99,6 +99,10 @@ gchar *prog_version; +#ifdef G_OS_WIN32 +static gboolean init_console_done = FALSE; +#endif + static gint lock_socket = -1; static gint lock_socket_tag = 0; static GIOChannel *lock_ch = NULL; @@ -130,9 +134,7 @@ static void setup_rc_dir (void); static void check_gpg (void); static void set_log_handlers (gboolean enable); -#ifdef G_OS_WIN32 -static void process_win32_message (void); -#endif +static void register_system_events (void); static gchar *get_socket_name (void); static gint prohibit_duplicate_launch (void); @@ -298,10 +300,6 @@ set_log_handlers(TRUE); -#ifdef G_OS_WIN32 - process_win32_message(); -#endif - account_read_config_all(); account_set_menu(); main_window_reflect_prefs_all(); @@ -321,6 +319,8 @@ addressbook_read_file(); + register_system_events(); + inc_autocheck_timer_init(mainwin); remote_command_exec(); @@ -335,7 +335,6 @@ #ifdef G_OS_WIN32 gint fd; FILE *fp; - static gboolean init_console_done = FALSE; if (init_console_done) return; @@ -629,11 +628,6 @@ bind_textdomain_codeset(PACKAGE, CS_UTF_8); textdomain(PACKAGE); -#ifdef G_OS_UNIX - /* ignore SIGPIPE signal for preventing sudden death of program */ - signal(SIGPIPE, SIG_IGN); -#endif - #ifdef G_OS_WIN32 read_ini_file(); #endif @@ -967,6 +961,15 @@ } #ifdef G_OS_WIN32 +static BOOL WINAPI +ctrl_handler(DWORD dwctrltype) +{ + log_print("ctrl_handler: received %d\n", dwctrltype); + app_will_exit(TRUE); + + return TRUE; +} + static LRESULT CALLBACK wndproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { @@ -996,16 +999,26 @@ return DefWindowProc(hwnd, message, wparam, lparam); } -static void process_win32_message(void) +static void register_system_events(void) { WNDCLASS wclass; static HWND hwnd = NULL; + static BOOL ctrl_handler_set = FALSE; ATOM klass; HINSTANCE hmodule = GetModuleHandle(NULL); + if (init_console_done && !ctrl_handler_set) { + debug_print("register_system_events(): SetConsoleCtrlHandler\n"); + ctrl_handler_set = SetConsoleCtrlHandler(ctrl_handler, TRUE); + if (!ctrl_handler_set) + g_warning("SetConsoleCtrlHandler() failed\n"); + } + if (hwnd) return; + debug_print("register_system_events(): RegisterClass\n"); + memset(&wclass, 0, sizeof(WNDCLASS)); wclass.lpszClassName = "sylpheed-observer"; wclass.lpfnWndProc = wndproc; @@ -1020,6 +1033,44 @@ if (!hwnd) UnregisterClass(MAKEINTRESOURCE(klass), hmodule); } +#else /* G_OS_WIN32 */ +static void sig_handler(gint signum) +{ + debug_print("signal %d received\n", signum); + + switch (signum) { + case SIGHUP: + case SIGINT: + case SIGTERM: + case SIGQUIT: + app_will_exit(TRUE); + break; + default: + break; + } +} + +static void register_system_events(void) +{ + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = sig_handler; + sa.sa_flags = SA_RESTART; + + sigemptyset(&sa.sa_mask); + sigaddset(&sa.sa_mask, SIGHUP); + sigaddset(&sa.sa_mask, SIGINT); + sigaddset(&sa.sa_mask, SIGTERM); + sigaddset(&sa.sa_mask, SIGQUIT); + sigaddset(&sa.sa_mask, SIGPIPE); + + sigaction(SIGHUP, &sa, NULL); + sigaction(SIGINT, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); + sigaction(SIGQUIT, &sa, NULL); + sigaction(SIGPIPE, &sa, NULL); +} #endif static gchar *get_socket_name(void) Index: ChangeLog.ja =================================================================== --- ChangeLog.ja (revision 2012) +++ ChangeLog.ja (working copy) @@ -1,3 +1,57 @@ +2008-07-16 + + * src/compose.[ch]: Enchant ???????????????? + ?????????????????????????????????? 'en' ???????????????????????? + ?????? + +2008-07-10 + + * libsylph/imap.c: imap_add_inter_folders(): ?????????????????????? + +2008-07-09 + + * libsylph/imap.c: imap_get_folder_list(): ?????????????????????? + ??????????(IMAP ???????????????? 'LIST "" "*"' ?? \NoSelect ?? + ????????????????????????)?? + +2008-07-04 + + * src/main.c: win32: console ?????????????????????????????? + ???????????????????????????????? + +2008-07-04 + + * src/main.c: win32: console ctrl ?????????????????????????????? + ???????????????????????????????????? register_system_events() + ?????????????????? + +2008-06-27 + + * configure.in + src/compose.c: GtkSpell 2.0.13 (with Enchant) ?????? + (Michael Schwendt ???? thanks)?? + * Makefile.am: ?????? ACLOCAL_AMFLAGS ???????? + * config.guess + ltmain.sh + config.sub: ?????? + +2008-06-20 + + * src/main.c: Unix ?? SIGHUP/SIGINT/SIGTERM/SIGQUIT ?????????????? + ?????????????????????? Win32 ?????????? + +2008-06-19 + + * libsylph/codeconv.[ch]: + conv_set_autodetect_type() + conv_get_autodetect_type(): ?????????????????????????????????????? + ???????????????????? + +2008-06-18 + + * libsylph/procmime.c: procmime_scan_mime_header(): ?????????????? + ?????????????? MimeInfo::filename ?????????????????????? + 2008-06-17 * version 2.5.0 Index: ChangeLog =================================================================== --- ChangeLog (revision 2012) +++ ChangeLog (working copy) @@ -1,3 +1,55 @@ +2008-07-16 + + * src/compose.[ch]: fixed Enchant support. + Force 'en' dictionary if user-specified language doesn't match. + +2008-07-10 + + * libsylph/imap.c: imap_add_inter_folders(): more error checks. + +2008-07-09 + + * libsylph/imap.c: imap_get_folder_list(): add intermediate folders + because some IMAP servers don't return \NoSelect parent folders + at 'LIST "" "*"'. + +2008-07-04 + + * src/main.c: win32: handle window messages even if console is + initialized. + +2008-07-04 + + * src/main.c: win32: handle console ctrl events. + Call register_system_events() after all config files are read. + +2008-06-27 + + * configure.in + src/compose.c: supported GtkSpell 2.0.13 (with Enchant) + (thanks to Michael Schwendt). + * Makefile.am: removed unrequired ACLOCAL_AMFLAGS. + * config.guess + ltmain.sh + config.sub: updated. + +2008-06-20 + + * src/main.c: handle SIGHUP/SIGINT/SIGTERM/SIGQUIT signals on Unix, + and unified the function with Win32. + +2008-06-19 + + * libsylph/codeconv.[ch]: + conv_set_autodetect_type() + conv_get_autodetect_type(): added function to change the behavior + of character encoding auto-detection. + +2008-06-18 + + * libsylph/procmime.c: procmime_scan_mime_header(): also use + MimeInfo::filename to determine file type. + 2008-06-17 * version 2.5.0 Index: sylpheed.spec =================================================================== RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- sylpheed.spec 17 Jun 2008 11:00:25 -0000 1.86 +++ sylpheed.spec 22 Jul 2008 20:03:24 -0000 1.87 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.5.0 -Release: 1%{?dist} +Release: 2.2029svn%{?dist} License: GPLv2+ URL: http://sylpheed.sraoss.jp/ Group: Applications/Internet @@ -28,10 +28,8 @@ Patch2: sylpheed-2.5.0rc-desktop.patch Patch3: sylpheed-2.3.1-certsdir.patch Patch4: sylpheed-2.2.5-prefs_common.patch -%if 0%{?fedora} > 8 -Patch5: sylpheed-2.4.8-enchant.patch -%endif Patch6: sylpheed-2.5.0rc2-gtk-2.13.1.patch +Patch7: sylpheed-2.5.0-svn2029.patch # For xdg-open in patch1. Requires: xdg-utils @@ -52,15 +50,13 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n sylpheed-2.5.0 +%setup -q -n sylpheed-%{version} %patch1 -p1 -b .defs.h %patch2 -p1 -b .desktop %patch3 -p1 -b .certsdir %patch4 -p1 -b .prefs_common -%if 0%{?fedora} > 8 -%patch5 -p1 -b .enchant -%endif %patch6 -p1 -b .gtk-2.13.1 +%patch7 -p0 -b .svn2029 %build %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ @@ -69,6 +65,9 @@ %{?_with_oniguruma:--enable-oniguruma} \ %{?_with_jpilot:--enable-jpilot} echo "#define LDAP_DEPRECATED 1" >> config.h +%if 0%{?fedora} > 8 +echo "#define USE_ENCHANT 1" >> config.h +%endif make %{?_smp_mflags} %install @@ -104,6 +103,10 @@ %{_mandir}/man1/* %changelog +* Tue Jul 22 2008 Michael Schwendt - 2.5.0-2.2029svn +- update to post-2.5.0 revision 2029 +- upstream's IMAP LIST modifications move away from RFC 2683 (test this!) + * Tue Jun 17 2008 Michael Schwendt - 2.5.0-1 - update to 2.5.0 final (a few translation updates) --- sylpheed-2.4.8-enchant.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 22 20:09:16 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 22 Jul 2008 20:09:16 GMT Subject: rpms/sylpheed/F-9 sylpheed-2.5.0-svn2029.patch, NONE, 1.1 sylpheed-2.5.0rc2-gtk-2.13.1.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 sylpheed.spec, 1.75, 1.76 sylpheed-2.4.8-enchant.patch, 1.2, NONE Message-ID: <200807222009.m6MK9GoS017396@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/sylpheed/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17222 Modified Files: .cvsignore sources sylpheed.spec Added Files: sylpheed-2.5.0-svn2029.patch sylpheed-2.5.0rc2-gtk-2.13.1.patch Removed Files: sylpheed-2.4.8-enchant.patch Log Message: sync with rawhide sylpheed-2.5.0-svn2029.patch: --- NEW FILE sylpheed-2.5.0-svn2029.patch --- Index: libsylph/procmime.c =================================================================== --- libsylph/procmime.c (revision 2012) +++ libsylph/procmime.c (working copy) @@ -782,9 +782,11 @@ } if (mimeinfo->mime_type == MIME_APPLICATION_OCTET_STREAM && - mimeinfo->name) { + (mimeinfo->filename || mimeinfo->name)) { const gchar *type; - type = procmime_get_mime_type(mimeinfo->name); + type = procmime_get_mime_type + (mimeinfo->filename ? mimeinfo->filename + : mimeinfo->name); if (type) mimeinfo->mime_type = procmime_scan_mime_type(type); } Index: libsylph/codeconv.c =================================================================== --- libsylph/codeconv.c (revision 2012) +++ libsylph/codeconv.c (working copy) @@ -154,6 +154,8 @@ state = JIS_UDC; \ } +static ConvADType conv_ad_type = C_AD_BY_LOCALE; + static gchar *conv_jistoeuc(const gchar *inbuf, gint *error); static gchar *conv_jistosjis(const gchar *inbuf, gint *error); static gchar *conv_euctojis(const gchar *inbuf, gint *error); @@ -1373,7 +1375,8 @@ /* auto detection mode */ if (!src_encoding && !dest_encoding) { - if (conv_is_ja_locale()) + if (conv_ad_type == C_AD_JAPANESE || + (conv_ad_type == C_AD_BY_LOCALE && conv_is_ja_locale())) return conv_anytodisp; else return conv_noconv; @@ -2087,6 +2090,16 @@ return is_ja_locale != 0; } +void conv_set_autodetect_type(ConvADType type) +{ + conv_ad_type = type; +} + +ConvADType conv_get_autodetect_type(void) +{ + return conv_ad_type; +} + gchar *conv_unmime_header(const gchar *str, const gchar *default_encoding) { gchar *buf; @@ -2105,7 +2118,8 @@ } } - if (conv_is_ja_locale()) + if (conv_ad_type == C_AD_JAPANESE || + (conv_ad_type == C_AD_BY_LOCALE && conv_is_ja_locale())) buf = conv_anytodisp(str, NULL); else buf = conv_localetodisp(str, NULL); Index: libsylph/codeconv.h =================================================================== --- libsylph/codeconv.h (revision 2012) +++ libsylph/codeconv.h (working copy) @@ -95,6 +95,13 @@ C_ISO_8859_16 } CharSet; +typedef enum +{ + C_AD_BY_LOCALE, + C_AD_NEVER, + C_AD_JAPANESE +} ConvADType; + typedef gchar *(*CodeConvFunc) (const gchar *inbuf, gint *error); struct _CodeConverter @@ -224,6 +231,9 @@ const gchar *conv_get_current_locale (void); gboolean conv_is_ja_locale (void); +void conv_set_autodetect_type (ConvADType type); +ConvADType conv_get_autodetect_type (void); + gchar *conv_unmime_header (const gchar *str, const gchar *default_encoding); void conv_encode_header (gchar *dest, Index: libsylph/imap.c =================================================================== --- libsylph/imap.c (revision 2012) +++ libsylph/imap.c (working copy) @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2007 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -183,6 +183,8 @@ static GSList *imap_parse_list (IMAPSession *session, const gchar *real_path, gchar *separator); +static GSList *imap_add_inter_folders (GSList *item_list, + const gchar *root_path); static GSList *imap_get_part_folder_list(GSList *item_list, FolderItem *item); @@ -1917,6 +1919,7 @@ imap_cmd_gen_send(session, "LIST \"\" \"%s\"", wildcard_path); item_list = imap_parse_list(session, real_path, NULL); + item_list = imap_add_inter_folders(item_list, item->path); g_free(real_path); g_free(wildcard_path); @@ -2013,6 +2016,82 @@ return item_list; } +static GSList *imap_add_inter_folders(GSList *item_list, const gchar *root_path) +{ + FolderItem *item; + GSList *cur; + GSList *add_list = NULL; + GHashTable *exist; + const gchar *p; + gint root_path_len = 0; + + if (root_path) + root_path_len = strlen(root_path); + + exist = g_hash_table_new(g_str_hash, g_str_equal); + + for (cur = item_list; cur != NULL; cur = cur->next) { + item = FOLDER_ITEM(cur->data); + + if (root_path_len > 0 && + strncmp(root_path, item->path, root_path_len) != 0) + continue; + p = item->path + root_path_len; + if (root_path_len > 0 && *p != '/') continue; + while (*p == '/') p++; + if (*p == '\0') continue; + g_hash_table_insert(exist, (gpointer)p, GINT_TO_POINTER(1)); + } + + for (cur = item_list; cur != NULL; cur = cur->next) { + const gchar *q, *r; + gchar *parent, *full_parent; + FolderItem *new_item; + + item = FOLDER_ITEM(cur->data); + + if (root_path_len > 0 && + strncmp(root_path, item->path, root_path_len) != 0) + continue; + p = item->path + root_path_len; + if (root_path_len > 0 && *p != '/') continue; + while (*p == '/') p++; + if (*p == '\0') continue; + + q = p; + while ((q = strchr(q, '/')) != NULL) { + parent = g_strndup(p, q - p); + if (!g_hash_table_lookup(exist, parent)) { + if (root_path_len > 0) + full_parent = g_strconcat + (root_path, "/", parent, NULL); + else + full_parent = g_strdup(parent); + new_item = folder_item_new(g_basename(parent), + full_parent); + new_item->no_select = TRUE; + add_list = g_slist_prepend(add_list, new_item); + r = new_item->path + root_path_len; + while (*r == '/') r++; + g_hash_table_insert(exist, (gpointer)r, + GINT_TO_POINTER(1)); + debug_print("intermediate folder '%s' added\n", + full_parent); + g_free(full_parent); + } + g_free(parent); + while (*q == '/') q++; + } + } + + g_hash_table_destroy(exist); + + add_list = g_slist_reverse(add_list); + item_list = g_slist_concat(item_list, add_list); + + return item_list; +} + static GSList *imap_get_part_folder_list(GSList *item_list, FolderItem *item) { FolderItem *cur_item; Index: src/compose.c =================================================================== --- src/compose.c (revision 2012) +++ src/compose.c (working copy) @@ -69,8 +69,12 @@ #if USE_GTKSPELL # include # include +#if USE_ENCHANT +# include +#else # include #endif +#endif #include #include @@ -5296,6 +5300,7 @@ compose->check_spell = prefs_common.check_spell; compose->spell_lang = g_strdup(prefs_common.spell_lang); compose->spell_menu = spell_menu; + compose->dict_list = NULL; #endif /* USE_GTKSPELL */ compose->focused_editable = NULL; @@ -5732,8 +5737,37 @@ } #if USE_GTKSPELL +#if USE_ENCHANT +static void ench_dict_desc_cb(const char *const lang_tag, + const char *const provider_name, + const char *const provider_desc, + const char *const provider_file, + void *user_data) +{ + GSList **dict_list = (GSList **)user_data; + *dict_list = g_slist_append(*dict_list, g_strdup((gchar*)lang_tag)); +} + static void compose_set_spell_lang_menu(Compose *compose) { + EnchantBroker *eb; + GSList *dict_list = NULL, *menu_list = NULL, *cur; + GtkWidget *menu; + gboolean lang_set = FALSE; + + eb = enchant_broker_init(); + enchant_broker_list_dicts(eb, ench_dict_desc_cb, &dict_list); + enchant_broker_free(eb); + + for (cur = dict_list; cur != NULL; cur = cur->next) { + if (compose->spell_lang != NULL && + g_ascii_strcasecmp(compose->spell_lang, + (gchar *)cur->data) == 0) + lang_set = TRUE; + } +#else /* !USE_ENCHANT */ +static void compose_set_spell_lang_menu(Compose *compose) +{ AspellConfig *config; AspellDictInfoList *dlist; AspellDictInfoEnumeration *dels; @@ -5748,13 +5782,16 @@ dels = aspell_dict_info_list_elements(dlist); while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) { - dict_list = g_slist_append(dict_list, (gchar *)entry->name); + dict_list = g_slist_append(dict_list, g_strdup(entry->name)); if (compose->spell_lang != NULL && g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0) lang_set = TRUE; } delete_aspell_dict_info_enumeration(dels); +#endif /* USE_ENCHANT */ + compose->dict_list = dict_list; + menu = gtk_menu_new(); for (cur = dict_list; cur != NULL; cur = cur->next) { @@ -5777,15 +5814,18 @@ g_object_set_data(G_OBJECT(item), "spell-lang", dict); gtk_widget_show(item); - if (!lang_set && g_ascii_strcasecmp("en", dict) == 0) + if (!lang_set && g_ascii_strcasecmp("en", dict) == 0) { + g_free(compose->spell_lang); + compose->spell_lang = g_strdup("en"); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), TRUE); + } } gtk_widget_show(menu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->spell_menu), menu); } -#endif +#endif /* USE_GTKSPELL */ static void compose_set_template_menu(Compose *compose) { @@ -5924,6 +5964,8 @@ address_completion_end(compose->window); #if USE_GTKSPELL + slist_free_strings(compose->dict_list); + g_slist_free(compose->dict_list); g_free(compose->spell_lang); #endif @@ -7505,7 +7547,8 @@ GtkSpell *speller; if (GTK_CHECK_MENU_ITEM(widget)->active) { - debug_print("Spell checking enabled\n"); + debug_print("Spell checking enabled: %s\n", + compose->spell_lang ? compose->spell_lang : "(none)"); speller = gtkspell_new_attach(GTK_TEXT_VIEW(compose->text), compose->spell_lang, NULL); compose->check_spell = TRUE; Index: src/compose.h =================================================================== --- src/compose.h (revision 2012) +++ src/compose.h (working copy) @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2007 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -133,9 +133,10 @@ GtkWidget *tmpl_menu; #if USE_GTKSPELL - GtkWidget *spell_menu; - gchar *spell_lang; - gboolean check_spell; + GtkWidget *spell_menu; + gchar *spell_lang; + gboolean check_spell; + GSList *dict_list; #endif ComposeMode mode; Index: src/main.c =================================================================== --- src/main.c (revision 2012) +++ src/main.c (working copy) @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2007 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -99,6 +99,10 @@ gchar *prog_version; +#ifdef G_OS_WIN32 +static gboolean init_console_done = FALSE; +#endif + static gint lock_socket = -1; static gint lock_socket_tag = 0; static GIOChannel *lock_ch = NULL; @@ -130,9 +134,7 @@ static void setup_rc_dir (void); static void check_gpg (void); static void set_log_handlers (gboolean enable); -#ifdef G_OS_WIN32 -static void process_win32_message (void); -#endif +static void register_system_events (void); static gchar *get_socket_name (void); static gint prohibit_duplicate_launch (void); @@ -298,10 +300,6 @@ set_log_handlers(TRUE); -#ifdef G_OS_WIN32 - process_win32_message(); -#endif - account_read_config_all(); account_set_menu(); main_window_reflect_prefs_all(); @@ -321,6 +319,8 @@ addressbook_read_file(); + register_system_events(); + inc_autocheck_timer_init(mainwin); remote_command_exec(); @@ -335,7 +335,6 @@ #ifdef G_OS_WIN32 gint fd; FILE *fp; - static gboolean init_console_done = FALSE; if (init_console_done) return; @@ -629,11 +628,6 @@ bind_textdomain_codeset(PACKAGE, CS_UTF_8); textdomain(PACKAGE); -#ifdef G_OS_UNIX - /* ignore SIGPIPE signal for preventing sudden death of program */ - signal(SIGPIPE, SIG_IGN); -#endif - #ifdef G_OS_WIN32 read_ini_file(); #endif @@ -967,6 +961,15 @@ } #ifdef G_OS_WIN32 +static BOOL WINAPI +ctrl_handler(DWORD dwctrltype) +{ + log_print("ctrl_handler: received %d\n", dwctrltype); + app_will_exit(TRUE); + + return TRUE; +} + static LRESULT CALLBACK wndproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { @@ -996,16 +999,26 @@ return DefWindowProc(hwnd, message, wparam, lparam); } -static void process_win32_message(void) +static void register_system_events(void) { WNDCLASS wclass; static HWND hwnd = NULL; + static BOOL ctrl_handler_set = FALSE; ATOM klass; HINSTANCE hmodule = GetModuleHandle(NULL); + if (init_console_done && !ctrl_handler_set) { + debug_print("register_system_events(): SetConsoleCtrlHandler\n"); + ctrl_handler_set = SetConsoleCtrlHandler(ctrl_handler, TRUE); + if (!ctrl_handler_set) + g_warning("SetConsoleCtrlHandler() failed\n"); + } + if (hwnd) return; + debug_print("register_system_events(): RegisterClass\n"); + memset(&wclass, 0, sizeof(WNDCLASS)); wclass.lpszClassName = "sylpheed-observer"; wclass.lpfnWndProc = wndproc; @@ -1020,6 +1033,44 @@ if (!hwnd) UnregisterClass(MAKEINTRESOURCE(klass), hmodule); } +#else /* G_OS_WIN32 */ +static void sig_handler(gint signum) +{ + debug_print("signal %d received\n", signum); + + switch (signum) { + case SIGHUP: + case SIGINT: + case SIGTERM: + case SIGQUIT: + app_will_exit(TRUE); + break; + default: + break; + } +} + +static void register_system_events(void) +{ + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = sig_handler; + sa.sa_flags = SA_RESTART; + + sigemptyset(&sa.sa_mask); + sigaddset(&sa.sa_mask, SIGHUP); + sigaddset(&sa.sa_mask, SIGINT); + sigaddset(&sa.sa_mask, SIGTERM); + sigaddset(&sa.sa_mask, SIGQUIT); + sigaddset(&sa.sa_mask, SIGPIPE); + + sigaction(SIGHUP, &sa, NULL); + sigaction(SIGINT, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); + sigaction(SIGQUIT, &sa, NULL); + sigaction(SIGPIPE, &sa, NULL); +} #endif static gchar *get_socket_name(void) Index: ChangeLog.ja =================================================================== --- ChangeLog.ja (revision 2012) +++ ChangeLog.ja (working copy) @@ -1,3 +1,57 @@ +2008-07-16 + + * src/compose.[ch]: Enchant ???????????????? + ?????????????????????????????????? 'en' ???????????????????????? + ?????? + +2008-07-10 + + * libsylph/imap.c: imap_add_inter_folders(): ?????????????????????? + +2008-07-09 + + * libsylph/imap.c: imap_get_folder_list(): ?????????????????????? + ??????????(IMAP ???????????????? 'LIST "" "*"' ?? \NoSelect ?? + ????????????????????????)?? + +2008-07-04 + + * src/main.c: win32: console ?????????????????????????????? + ???????????????????????????????? + +2008-07-04 + + * src/main.c: win32: console ctrl ?????????????????????????????? + ???????????????????????????????????? register_system_events() + ?????????????????? + +2008-06-27 + + * configure.in + src/compose.c: GtkSpell 2.0.13 (with Enchant) ?????? + (Michael Schwendt ???? thanks)?? + * Makefile.am: ?????? ACLOCAL_AMFLAGS ???????? + * config.guess + ltmain.sh + config.sub: ?????? + +2008-06-20 + + * src/main.c: Unix ?? SIGHUP/SIGINT/SIGTERM/SIGQUIT ?????????????? + ?????????????????????? Win32 ?????????? + +2008-06-19 + + * libsylph/codeconv.[ch]: + conv_set_autodetect_type() + conv_get_autodetect_type(): ?????????????????????????????????????? + ???????????????????? + +2008-06-18 + + * libsylph/procmime.c: procmime_scan_mime_header(): ?????????????? + ?????????????? MimeInfo::filename ?????????????????????? + 2008-06-17 * version 2.5.0 Index: ChangeLog =================================================================== --- ChangeLog (revision 2012) +++ ChangeLog (working copy) @@ -1,3 +1,55 @@ +2008-07-16 + + * src/compose.[ch]: fixed Enchant support. + Force 'en' dictionary if user-specified language doesn't match. + +2008-07-10 + + * libsylph/imap.c: imap_add_inter_folders(): more error checks. + +2008-07-09 + + * libsylph/imap.c: imap_get_folder_list(): add intermediate folders + because some IMAP servers don't return \NoSelect parent folders + at 'LIST "" "*"'. + +2008-07-04 + + * src/main.c: win32: handle window messages even if console is + initialized. + +2008-07-04 + + * src/main.c: win32: handle console ctrl events. + Call register_system_events() after all config files are read. + +2008-06-27 + + * configure.in + src/compose.c: supported GtkSpell 2.0.13 (with Enchant) + (thanks to Michael Schwendt). + * Makefile.am: removed unrequired ACLOCAL_AMFLAGS. + * config.guess + ltmain.sh + config.sub: updated. + +2008-06-20 + + * src/main.c: handle SIGHUP/SIGINT/SIGTERM/SIGQUIT signals on Unix, + and unified the function with Win32. + +2008-06-19 + + * libsylph/codeconv.[ch]: + conv_set_autodetect_type() + conv_get_autodetect_type(): added function to change the behavior + of character encoding auto-detection. + +2008-06-18 + + * libsylph/procmime.c: procmime_scan_mime_header(): also use + MimeInfo::filename to determine file type. + 2008-06-17 * version 2.5.0 sylpheed-2.5.0rc2-gtk-2.13.1.patch: --- NEW FILE sylpheed-2.5.0rc2-gtk-2.13.1.patch --- diff -Nur sylpheed-2.5.0rc2-orig/src/addr_compl.c sylpheed-2.5.0rc2/src/addr_compl.c --- sylpheed-2.5.0rc2-orig/src/addr_compl.c 2008-03-13 08:15:07.000000000 +0100 +++ sylpheed-2.5.0rc2/src/addr_compl.c 2008-06-10 14:54:24.000000000 +0200 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff -Nur sylpheed-2.5.0rc2-orig/src/editgroup.c sylpheed-2.5.0rc2/src/editgroup.c --- sylpheed-2.5.0rc2-orig/src/editgroup.c 2007-03-28 03:30:15.000000000 +0200 +++ sylpheed-2.5.0rc2/src/editgroup.c 2008-06-10 14:57:20.000000000 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff -Nur sylpheed-2.5.0rc2-orig/src/prefs_display_items.c sylpheed-2.5.0rc2/src/prefs_display_items.c --- sylpheed-2.5.0rc2-orig/src/prefs_display_items.c 2007-09-20 04:17:58.000000000 +0200 +++ sylpheed-2.5.0rc2/src/prefs_display_items.c 2008-06-10 14:37:44.000000000 +0200 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff -Nur sylpheed-2.5.0rc2-orig/src/prefs_summary_column.c sylpheed-2.5.0rc2/src/prefs_summary_column.c --- sylpheed-2.5.0rc2-orig/src/prefs_summary_column.c 2007-09-12 08:56:55.000000000 +0200 +++ sylpheed-2.5.0rc2/src/prefs_summary_column.c 2008-06-10 14:36:12.000000000 +0200 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff -Nur sylpheed-2.5.0rc2-orig/src/select-keys.c sylpheed-2.5.0rc2/src/select-keys.c --- sylpheed-2.5.0rc2-orig/src/select-keys.c 2008-05-16 11:19:55.000000000 +0200 +++ sylpheed-2.5.0rc2/src/select-keys.c 2008-06-10 14:58:13.000000000 +0200 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sylpheed/F-9/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 8 Jun 2008 22:41:35 -0000 1.36 +++ .cvsignore 22 Jul 2008 20:08:22 -0000 1.37 @@ -1,2 +1,2 @@ -sylpheed-2.5.0rc2.tar.bz2.asc -sylpheed-2.5.0rc2.tar.bz2 +sylpheed-2.5.0.tar.bz2.asc +sylpheed-2.5.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sylpheed/F-9/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 8 Jun 2008 22:41:35 -0000 1.36 +++ sources 22 Jul 2008 20:08:22 -0000 1.37 @@ -1,2 +1,2 @@ -4c26d39e748d207515bb8cdf1a52ba40 sylpheed-2.5.0rc2.tar.bz2.asc -5554a2e421075b6d1396b66d8beb333c sylpheed-2.5.0rc2.tar.bz2 +5b453dede37deea13e16c1be707b5dfe sylpheed-2.5.0.tar.bz2.asc +a6fc9e9c2a33876fddb33f25f40b820f sylpheed-2.5.0.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/pkgs/rpms/sylpheed/F-9/sylpheed.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sylpheed.spec 8 Jun 2008 22:35:38 -0000 1.75 +++ sylpheed.spec 22 Jul 2008 20:08:22 -0000 1.76 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.5.0 -Release: 0.8.rc2%{?dist} +Release: 2.2029svn%{?dist} License: GPLv2+ URL: http://sylpheed.sraoss.jp/ Group: Applications/Internet @@ -21,17 +21,15 @@ %if 0%{?fedora} > 8 BuildRequires: enchant-devel %endif -Source0: http://sylpheed.sraoss.jp/sylpheed/v2.5beta/sylpheed-2.5.0rc2.tar.bz2 -#Source0: http://sylpheed.sraoss.jp/sylpheed/v2.4/%{name}-%{version}.tar.bz2 +Source0: http://sylpheed.sraoss.jp/sylpheed/v2.5/%{name}-%{version}.tar.bz2 Source1: sylpheed.1 Patch1: sylpheed-2.4.6-defs.h.patch Patch2: sylpheed-2.5.0rc-desktop.patch Patch3: sylpheed-2.3.1-certsdir.patch Patch4: sylpheed-2.2.5-prefs_common.patch -%if 0%{?fedora} > 8 -Patch5: sylpheed-2.4.8-enchant.patch -%endif +Patch6: sylpheed-2.5.0rc2-gtk-2.13.1.patch +Patch7: sylpheed-2.5.0-svn2029.patch # For xdg-open in patch1. Requires: xdg-utils @@ -52,14 +50,13 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n sylpheed-2.5.0rc2 +%setup -q -n sylpheed-%{version} %patch1 -p1 -b .defs.h %patch2 -p1 -b .desktop %patch3 -p1 -b .certsdir %patch4 -p1 -b .prefs_common -%if 0%{?fedora} > 8 -%patch5 -p1 -b .enchant -%endif +%patch6 -p1 -b .gtk-2.13.1 +%patch7 -p0 -b .svn2029 %build %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ @@ -68,6 +65,9 @@ %{?_with_oniguruma:--enable-oniguruma} \ %{?_with_jpilot:--enable-jpilot} echo "#define LDAP_DEPRECATED 1" >> config.h +%if 0%{?fedora} > 8 +echo "#define USE_ENCHANT 1" >> config.h +%endif make %{?_smp_mflags} %install @@ -103,6 +103,17 @@ %{_mandir}/man1/* %changelog +* Tue Jul 22 2008 Michael Schwendt - 2.5.0-2.2029svn +- update to post-2.5.0 revision 2029 +- upstream's IMAP LIST modifications move away from RFC 2683 (test this!) + +* Tue Jun 17 2008 Michael Schwendt - 2.5.0-1 +- update to 2.5.0 final (a few translation updates) + +* Tue Jun 10 2008 Michael Schwendt - 2.5.0-0.10.rc2 +- work around build problem with gtk2 >= 2.13.1 which drastically + changed the number of header-includes for the deprecated header files + * Sun Jun 8 2008 Michael Schwendt - 2.5.0-0.8.rc2 - avoid duplicate desktop menu entry - conditional BR oniguruma-devel and --enable-oniguruma --- sylpheed-2.4.8-enchant.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 22 20:10:23 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 22 Jul 2008 20:10:23 GMT Subject: rpms/hesiod/devel hesiod-3.1.0-env.patch, NONE, 1.1 hesiod-3.1.0-dnsparse.patch, 1.2, 1.3 hesiod.spec, 1.29, 1.30 hesiod-3.0.2-env.patch, 1.2, NONE Message-ID: <200807222010.m6MKANR7017705@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/hesiod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17484 Modified Files: hesiod-3.1.0-dnsparse.patch hesiod.spec Added Files: hesiod-3.1.0-env.patch Removed Files: hesiod-3.0.2-env.patch Log Message: rebuild hesiod-3.1.0-env.patch: --- NEW FILE hesiod-3.1.0-env.patch --- Ignore environment variables in setuid or setgid programs. The glibc-internal copy of the library already implements a similar check. --- hesiod-3.0.2/hesiod.c Wed Oct 3 14:53:37 2001 +++ hesiod-3.0.2/hesiod.c Wed Oct 3 14:55:02 2001 @@ -52,6 +52,7 @@ #include #include #include +#include #include #include "hesiod.h" @@ -79,13 +80,13 @@ if (ctx) { *context = ctx; - configname = getenv("HESIOD_CONFIG"); + configname = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HESIOD_CONFIG") : NULL; if (!configname) configname = SYSCONFDIR "/hesiod.conf"; if (read_config_file(ctx, configname) >= 0) { /* The default rhs can be overridden by an environment variable. */ - p = getenv("HES_DOMAIN"); + p = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HES_DOMAIN") : NULL; if (p) { if (ctx->rhs) hesiod-3.1.0-dnsparse.patch: Index: hesiod-3.1.0-dnsparse.patch =================================================================== RCS file: /cvs/pkgs/rpms/hesiod/devel/hesiod-3.1.0-dnsparse.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hesiod-3.1.0-dnsparse.patch 30 Mar 2006 22:15:59 -0000 1.2 +++ hesiod-3.1.0-dnsparse.patch 22 Jul 2008 20:09:39 -0000 1.3 @@ -2,17 +2,18 @@ --- hesiod-3.1.0/hesiod.c 2006-03-30 13:22:57.000000000 -0500 +++ hesiod-3.1.0/hesiod.c 2006-03-30 13:28:16.000000000 -0500 -@@ -327,7 +327,8 @@ +@@ -327,8 +327,9 @@ */ static char **get_txt_records(struct hesiod_p *ctx, const char *name) { - unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP]; +- int n; + unsigned char qbuf[PACKETSZ], *abuf; + char **tmp; -- int n; + int n, i, len; /* Make sure the resolver is initialized. */ + if ((_res.options & RES_INIT) == 0 && res_init() == -1) @@ -343,14 +344,36 @@ } Index: hesiod.spec =================================================================== RCS file: /cvs/pkgs/rpms/hesiod/devel/hesiod.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- hesiod.spec 12 Jun 2008 22:45:06 -0000 1.29 +++ hesiod.spec 22 Jul 2008 20:09:39 -0000 1.30 @@ -1,9 +1,9 @@ Name: hesiod Version: 3.1.0 -Release: 12 +Release: 13 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch0: hesiod-3.1.0-classes.patch -Patch1: hesiod-3.0.2-env.patch +Patch1: hesiod-3.1.0-env.patch Patch2: hesiod-3.1.0-str.patch Patch3: hesiod-3.1.0-dnsparse.patch Patch4: hesiod-3.1.0-libresolv.patch @@ -34,6 +34,9 @@ the header files and libraries required for building programs which use Hesiod. %changelog +* Tue Jul 22 2008 Nalin Dahyabhai - 3.1.0-13 +- rebuild + * Thu Jun 12 2008 Nalin Dahyabhai - 3.1.0-12 - call aclocal directly, because autoreconf didn't see the magic comment in the distributed version of aclocal.m4 which made it look like it was safe --- hesiod-3.0.2-env.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 22 20:12:23 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 22 Jul 2008 20:12:23 GMT Subject: rpms/pwlib/devel pwlib.spec,1.53,1.54 Message-ID: <200807222012.m6MKCNG9018008@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/pwlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17910 Modified Files: pwlib.spec Log Message: * Tue Jul 22 2008 Jarod Wilson 1.10.10-7 - Bump and rebuild for libraw1394 v2.0.0 Index: pwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/pwlib/devel/pwlib.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- pwlib.spec 27 Mar 2008 15:05:31 -0000 1.53 +++ pwlib.spec 22 Jul 2008 20:11:39 -0000 1.54 @@ -1,7 +1,7 @@ Summary: Portable Windows Library Name: pwlib Version: 1.10.10 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.openh323.org/ Source0: http://www.ekiga.org/pwlib-%{version}.tar.gz License: MPL @@ -98,6 +98,9 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Tue Jul 22 2008 Jarod Wilson 1.10.10-7 +- Bump and rebuild for libraw1394 v2.0.0 + * Thu Mar 27 2008 Daniel Veillard - 1.10.10-6 - apply rescale patch - Resolves: rhbz#438605 From fedora-extras-commits at redhat.com Tue Jul 22 20:19:45 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Tue, 22 Jul 2008 20:19:45 GMT Subject: rpms/gtk-nodoka-engine/devel .cvsignore, 1.10, 1.11 gtk-nodoka-engine.spec, 1.21, 1.22 sources, 1.11, 1.12 Message-ID: <200807222019.m6MKJjbp019080@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/gtk-nodoka-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18911 Modified Files: .cvsignore gtk-nodoka-engine.spec sources Log Message: New bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Apr 2008 22:22:27 -0000 1.10 +++ .cvsignore 22 Jul 2008 20:19:02 -0000 1.11 @@ -1 +1 @@ -gtk-nodoka-engine-0.7.0.tar.gz +gtk-nodoka-engine-0.7.1.tar.gz Index: gtk-nodoka-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gtk-nodoka-engine.spec 20 May 2008 14:23:18 -0000 1.21 +++ gtk-nodoka-engine.spec 22 Jul 2008 20:19:02 -0000 1.22 @@ -2,8 +2,8 @@ %define nogtk2 %(pkg-config gtk+-2.0 --modversion &> /dev/null; echo $?) Name: gtk-nodoka-engine -Version: 0.7.0 -Release: 2%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: The Nodoka GTK Theme Engine Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 22 2008 Martin Sourada - 0.7.1-1 +- New bugfix release + * Tue May 20 2008 Martin Sourada - 0.7.0-2 - Don't own %%{_datadir}/themes/Nodoka dir, instead require nodoka-filesystem Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 13 Apr 2008 22:22:27 -0000 1.11 +++ sources 22 Jul 2008 20:19:02 -0000 1.12 @@ -1 +1 @@ -7a1b55177cd5c925d9f16b9be14e7456 gtk-nodoka-engine-0.7.0.tar.gz +68d70f114b488bf594820004c37663ad gtk-nodoka-engine-0.7.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 20:26:48 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 22 Jul 2008 20:26:48 GMT Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.29,1.30 sources,1.16,1.17 Message-ID: <200807222026.m6MKQmhm020282@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/ConsoleKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20074 Modified Files: ConsoleKit.spec sources Log Message: - Update to snapshot Index: ConsoleKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ConsoleKit.spec 21 Jul 2008 18:34:29 -0000 1.29 +++ ConsoleKit.spec 22 Jul 2008 20:26:03 -0000 1.30 @@ -6,7 +6,7 @@ Summary: System daemon for tracking users, sessions and seats Name: ConsoleKit Version: 0.2.11 -Release: 0.2008.07.21.2%{?dist} +Release: 0.2008.07.22.1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/ConsoleKit @@ -154,6 +154,9 @@ %doc %{_datadir}/doc/%{name}-%{version}/spec/* %changelog +* Tue Jul 22 2008 Jon McCann - 0.2.11-0.2008.07.22.1 +- Update to snapshot + * Mon Jul 21 2008 Jon McCann - 0.2.11-0.2008.07.21.2 - Fix file list Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 21 Jul 2008 18:34:29 -0000 1.16 +++ sources 22 Jul 2008 20:26:03 -0000 1.17 @@ -1 +1 @@ -4212d9fa1db9e2767d357c5e2fd63d7d ConsoleKit-0.2.11.tar.bz2 +82f2ce289cfe6b78a7cabf2b583d52f8 ConsoleKit-0.2.11.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 20:30:07 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Tue, 22 Jul 2008 20:30:07 GMT Subject: rpms/gtk-nodoka-engine/F-9 .cvsignore, 1.10, 1.11 gtk-nodoka-engine.spec, 1.20, 1.21 sources, 1.11, 1.12 Message-ID: <200807222030.m6MKU7sW021074@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/gtk-nodoka-engine/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20810 Modified Files: .cvsignore gtk-nodoka-engine.spec sources Log Message: New bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Apr 2008 22:22:27 -0000 1.10 +++ .cvsignore 22 Jul 2008 20:29:22 -0000 1.11 @@ -1 +1 @@ -gtk-nodoka-engine-0.7.0.tar.gz +gtk-nodoka-engine-0.7.1.tar.gz Index: gtk-nodoka-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/F-9/gtk-nodoka-engine.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gtk-nodoka-engine.spec 13 Apr 2008 22:22:27 -0000 1.20 +++ gtk-nodoka-engine.spec 22 Jul 2008 20:29:22 -0000 1.21 @@ -2,7 +2,7 @@ %define nogtk2 %(pkg-config gtk+-2.0 --modversion &> /dev/null; echo $?) Name: gtk-nodoka-engine -Version: 0.7.0 +Version: 0.7.1 Release: 1%{?dist} Summary: The Nodoka GTK Theme Engine @@ -65,6 +65,9 @@ %changelog +* Tue Jul 22 2008 Martin Sourada - 0.7.1-1 +- New bugfix release + * Mon Apr 14 2008 Martin Sourada - 0.7.0-1 - Update to stable Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 13 Apr 2008 22:22:27 -0000 1.11 +++ sources 22 Jul 2008 20:29:22 -0000 1.12 @@ -1 +1 @@ -7a1b55177cd5c925d9f16b9be14e7456 gtk-nodoka-engine-0.7.0.tar.gz +68d70f114b488bf594820004c37663ad gtk-nodoka-engine-0.7.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 20:34:58 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 20:34:58 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 bootstrap-java-1.6.0-openjdk.spec, 1.1.2.4, 1.1.2.5 Message-ID: <200807222034.m6MKYwIP021894@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788 Modified Files: Tag: java-1_6_0-openjdk-1_6_0_0-0_5_b06_el5_bootstrap bootstrap-java-1.6.0-openjdk.spec Log Message: try to trick the yum depsolver Index: bootstrap-java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/Attic/bootstrap-java-1.6.0-openjdk.spec,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- bootstrap-java-1.6.0-openjdk.spec 22 Jul 2008 19:55:25 -0000 1.1.2.4 +++ bootstrap-java-1.6.0-openjdk.spec 22 Jul 2008 20:34:13 -0000 1.1.2.5 @@ -75,5 +75,11 @@ %files %{_datadir}/%{name} +%package devel +SUmmary: foo +Group: foo +%description devel +%files devel + %changelog From fedora-extras-commits at redhat.com Tue Jul 22 20:36:46 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 20:36:46 GMT Subject: rpms/perl-HTML-FormatText-WithLinks/EL-5 perl-HTML-FormatText-WithLinks.spec, 1.3, 1.4 Message-ID: <200807222036.m6MKakjS022194@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22039 Modified Files: perl-HTML-FormatText-WithLinks.spec Log Message: merge newer pkg from f8 Index: perl-HTML-FormatText-WithLinks.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/EL-5/perl-HTML-FormatText-WithLinks.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-HTML-FormatText-WithLinks.spec 17 Sep 2006 11:15:30 -0000 1.3 +++ perl-HTML-FormatText-WithLinks.spec 22 Jul 2008 20:35:58 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-HTML-FormatText-WithLinks -Version: 0.07 +Version: 0.09 Release: 1%{?dist} Summary: HTML to text conversion with links as footnotes @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::FormatText) perl(HTML::TreeBuilder) BuildRequires: perl(URI::WithBase) BuildRequires: perl(Test::MockObject) perl(Test::Pod::Coverage) @@ -37,7 +37,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -58,6 +57,9 @@ %changelog +* Wed Aug 8 2007 Patrice Dumas 0.09-1 +- update to 0.09 + * Sun Sep 17 2006 Patrice Dumas 0.07-1 - update to 0.07 From fedora-extras-commits at redhat.com Tue Jul 22 20:40:46 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 20:40:46 GMT Subject: rpms/perl-HTML-FormatText-WithLinks/EL-5 sources,1.3,1.4 Message-ID: <200807222040.m6MKek3p022697@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22602 Modified Files: sources Log Message: merge newer pkg from f8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Sep 2006 11:15:30 -0000 1.3 +++ sources 22 Jul 2008 20:39:57 -0000 1.4 @@ -1 +1 @@ -fda7805565f7c417fd185b78d7022179 HTML-FormatText-WithLinks-0.07.tar.gz +3d48f2bae0aa3068de6a31dea4043127 HTML-FormatText-WithLinks-0.09.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 20:59:16 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 22 Jul 2008 20:59:16 GMT Subject: rpms/kdebase3/devel kdebase3.spec,1.64,1.65 Message-ID: <200807222059.m6MKxGwi023888@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23833 Modified Files: kdebase3.spec Log Message: sync changes from F-9 branch Index: kdebase3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- kdebase3.spec 22 Jul 2008 19:28:24 -0000 1.64 +++ kdebase3.spec 22 Jul 2008 20:58:34 -0000 1.65 @@ -467,7 +467,6 @@ for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do echo "OnlyShowIn=KDE;" >> $f done - %endif # Own Mozilla plugin dir @@ -541,6 +540,14 @@ rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop +#??remove mediamanager stuff #447852 and kdebug:163717 +rm -f %{buildroot}%{_libdir}/kde3/kded_mediamanager.* +rm -f %{buildroot}%{_libdir}/kde3/kded_medianotifier.* +rm -f %{buildroot}%{_libdir}/kde3/kcm_media.* +rm -f %{buildroot}%{_datadir}/services/kded/mediamanager.desktop +rm -f %{buildroot}%{_datadir}/services/kded/medianotifier.desktop +rm -f %{buildroot}%{_datadir}/applications/kde/media.desktop + # remove conflicts with kdesdk rm -f %{buildroot}%{_datadir}/config/katerc @@ -863,8 +870,8 @@ %changelog -* Tue Jul 22 2008 Rex Dieter - 3.5.9-16 -- respin (libraw1394) +* Wed Jun 11 2008 Luk???? Tinkl - 3.5.9-16 +- remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717) * Wed Jun 04 2008 Kevin Kofler - 3.5.9-15 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4) From fedora-extras-commits at redhat.com Tue Jul 22 21:01:47 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 21:01:47 GMT Subject: rpms/soprano/devel .cvsignore, 1.10, 1.11 soprano.spec, 1.19, 1.20 sources, 1.10, 1.11 Message-ID: <200807222101.m6ML1l7C030730@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24097/devel Modified Files: .cvsignore soprano.spec sources Log Message: * Tue Jul 22 2008 Kevin Kofler 2.1-1 - update to 2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Jul 2008 07:58:40 -0000 1.10 +++ .cvsignore 22 Jul 2008 21:00:55 -0000 1.11 @@ -1 +1 @@ -soprano-2.0.99.tar.bz2 +soprano-2.1.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- soprano.spec 11 Jul 2008 07:30:18 -0000 1.19 +++ soprano.spec 22 Jul 2008 21:00:55 -0000 1.20 @@ -6,7 +6,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.99 +Version: 2.1 Release: 1%{?dist} Group: System Environment/Libraries @@ -107,6 +107,9 @@ %changelog +* Tue Jul 22 2008 Kevin Kofler 2.1-1 +- update to 2.1 + * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Jul 2008 07:58:40 -0000 1.10 +++ sources 22 Jul 2008 21:00:55 -0000 1.11 @@ -1 +1 @@ -adef1e8539bff9bd41a6b973dbd18ff4 soprano-2.0.99.tar.bz2 +c89c04931db14eb7f5801eb3d4e5c742 soprano-2.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 21:06:39 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 22 Jul 2008 21:06:39 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 bootstrap-java-1.6.0-openjdk.spec, 1.1.2.5, 1.1.2.6 Message-ID: <200807222106.m6ML6dno031158@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31096 Modified Files: Tag: java-1_6_0-openjdk-1_6_0_0-0_5_b06_el5_bootstrap bootstrap-java-1.6.0-openjdk.spec Log Message: finally trick the depsolver Index: bootstrap-java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/Attic/bootstrap-java-1.6.0-openjdk.spec,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- bootstrap-java-1.6.0-openjdk.spec 22 Jul 2008 20:34:13 -0000 1.1.2.5 +++ bootstrap-java-1.6.0-openjdk.spec 22 Jul 2008 21:05:49 -0000 1.1.2.6 @@ -39,7 +39,7 @@ # Requires: AutoReq: 0 -%{expand:%(rpm -qp --requires %{packages} |sed 's/^/Requires: /')} +%{expand:%(rpm -qp --requires %{packages} |sed 's/^/Requires: /' |sed 's/^\(.*\) = .*el5.*/\1 = 1:1.6.0.0-0.7.b08.el5.3/')} # Provides: AutoProv: 0 From fedora-extras-commits at redhat.com Tue Jul 22 21:08:09 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 21:08:09 GMT Subject: rpms/soprano/F-9 .cvsignore, 1.9, 1.10 soprano.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200807222108.m6ML89BI031297@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31210/F-9 Modified Files: .cvsignore soprano.spec sources Log Message: Sync from devel: * Tue Jul 22 2008 Kevin Kofler 2.1-1 - update to 2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 Jul 2008 03:32:34 -0000 1.9 +++ .cvsignore 22 Jul 2008 21:07:23 -0000 1.10 @@ -1 +1 @@ -soprano-2.0.99.tar.bz2 +soprano-2.1.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-9/soprano.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- soprano.spec 19 Jul 2008 03:32:34 -0000 1.17 +++ soprano.spec 22 Jul 2008 21:07:23 -0000 1.18 @@ -6,7 +6,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.99 +Version: 2.1 Release: 1%{?dist} Group: System Environment/Libraries @@ -107,6 +107,9 @@ %changelog +* Tue Jul 22 2008 Kevin Kofler 2.1-1 +- update to 2.1 + * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Jul 2008 03:32:34 -0000 1.9 +++ sources 22 Jul 2008 21:07:23 -0000 1.10 @@ -1 +1 @@ -adef1e8539bff9bd41a6b973dbd18ff4 soprano-2.0.99.tar.bz2 +c89c04931db14eb7f5801eb3d4e5c742 soprano-2.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 21:10:07 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 21:10:07 GMT Subject: rpms/soprano/F-8 .cvsignore, 1.8, 1.9 soprano.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200807222110.m6MLA7RW031540@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31446/F-8 Modified Files: .cvsignore soprano.spec sources Log Message: * Tue Jul 22 2008 Kevin Kofler 2.1-1 - update to 2.1 * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) * Thu May 1 2008 Kevin Kofler 2.0.98-1 - update to 2.0.98 (2.1 alpha 1) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 Mar 2008 23:50:00 -0000 1.8 +++ .cvsignore 22 Jul 2008 21:09:21 -0000 1.9 @@ -1 +1 @@ -soprano-2.0.3.tar.bz2 +soprano-2.1.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-8/soprano.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- soprano.spec 7 Mar 2008 23:50:00 -0000 1.12 +++ soprano.spec 22 Jul 2008 21:09:21 -0000 1.13 @@ -6,8 +6,8 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.3 -Release: 2%{?dist} +Version: 2.1 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -84,6 +84,7 @@ %doc AUTHORS COPYING* README TODO %{_bindir}/sopranocmd %{_bindir}/sopranod +%{_bindir}/onto2vocabularyclass %{_libdir}/lib*.so.* %{_libdir}/soprano/ %{_datadir}/soprano/ @@ -106,6 +107,15 @@ %changelog +* Tue Jul 22 2008 Kevin Kofler 2.1-1 +- update to 2.1 + +* Fri Jul 11 2008 Kevin Kofler 2.0.99-1 +- update to 2.0.99 (2.1 RC 1) + +* Thu May 1 2008 Kevin Kofler 2.0.98-1 +- update to 2.0.98 (2.1 alpha 1) + * Thu Mar 6 2008 Kevin Kofler 2.0.3-2 - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen and qt4-doc when building apidocs Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 Mar 2008 23:50:00 -0000 1.8 +++ sources 22 Jul 2008 21:09:21 -0000 1.9 @@ -1 +1 @@ -3f33799c6ebd03048621057d268fb62f soprano-2.0.3.tar.bz2 +c89c04931db14eb7f5801eb3d4e5c742 soprano-2.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 21:19:12 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 21:19:12 GMT Subject: rpms/soprano/F-9 soprano.spec,1.18,1.19 Message-ID: <200807222119.m6MLJC7h032376@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32294/F-9 Modified Files: soprano.spec Log Message: - BR graphviz for apidocs Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-9/soprano.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- soprano.spec 22 Jul 2008 21:07:23 -0000 1.18 +++ soprano.spec 22 Jul 2008 21:18:17 -0000 1.19 @@ -24,6 +24,7 @@ %if "%{?apidocs}" == "1" BuildRequires: doxygen +BuildRequires: graphviz BuildRequires: qt4-doc %endif @@ -109,6 +110,7 @@ %changelog * Tue Jul 22 2008 Kevin Kofler 2.1-1 - update to 2.1 +- BR graphviz for apidocs * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) From fedora-extras-commits at redhat.com Tue Jul 22 21:19:17 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 21:19:17 GMT Subject: rpms/soprano/F-8 soprano.spec,1.13,1.14 Message-ID: <200807222119.m6MLJHXv032396@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32294/F-8 Modified Files: soprano.spec Log Message: - BR graphviz for apidocs Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-8/soprano.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- soprano.spec 22 Jul 2008 21:09:21 -0000 1.13 +++ soprano.spec 22 Jul 2008 21:18:01 -0000 1.14 @@ -24,6 +24,7 @@ %if "%{?apidocs}" == "1" BuildRequires: doxygen +BuildRequires: graphviz BuildRequires: qt4-doc %endif @@ -109,6 +110,7 @@ %changelog * Tue Jul 22 2008 Kevin Kofler 2.1-1 - update to 2.1 +- BR graphviz for apidocs * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) From fedora-extras-commits at redhat.com Tue Jul 22 21:19:31 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 21:19:31 GMT Subject: rpms/soprano/devel soprano.spec,1.20,1.21 Message-ID: <200807222119.m6MLJVcf032417@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32294/devel Modified Files: soprano.spec Log Message: - BR graphviz for apidocs Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- soprano.spec 22 Jul 2008 21:00:55 -0000 1.20 +++ soprano.spec 22 Jul 2008 21:18:42 -0000 1.21 @@ -24,6 +24,7 @@ %if "%{?apidocs}" == "1" BuildRequires: doxygen +BuildRequires: graphviz BuildRequires: qt4-doc %endif @@ -109,6 +110,7 @@ %changelog * Tue Jul 22 2008 Kevin Kofler 2.1-1 - update to 2.1 +- BR graphviz for apidocs * Fri Jul 11 2008 Kevin Kofler 2.0.99-1 - update to 2.0.99 (2.1 RC 1) From fedora-extras-commits at redhat.com Tue Jul 22 21:32:16 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Tue, 22 Jul 2008 21:32:16 GMT Subject: rpms/upstart/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 upstart.spec, 1.20, 1.21 Message-ID: <200807222132.m6MLWGDb001221@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1138 Modified Files: .cvsignore sources upstart.spec Log Message: Upstream to 0.5.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Feb 2008 04:05:41 -0000 1.2 +++ .cvsignore 22 Jul 2008 21:31:33 -0000 1.3 @@ -1 +1 @@ -upstart-0.3.9.tar.bz2 +upstart-0.5.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Feb 2008 04:05:41 -0000 1.2 +++ sources 22 Jul 2008 21:31:33 -0000 1.3 @@ -1 +1 @@ -794208083d405ece123ad59a02f3e233 upstart-0.3.9.tar.bz2 +a1a362de2720926ad5ca215cb24f6203 upstart-0.5.0.tar.bz2 Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- upstart.spec 25 Apr 2008 21:22:26 -0000 1.20 +++ upstart.spec 22 Jul 2008 21:31:33 -0000 1.21 @@ -1,6 +1,6 @@ Name: upstart -Version: 0.3.9 -Release: 19%{?dist} +Version: 0.5.0 +Release: 0.0.7%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -8,16 +8,10 @@ URL: http://upstart.ubuntu.com Source0: http://upstart.ubuntu.com/download/0.3/upstart-%{version}.tar.bz2 Source1: events.5 -Patch0: upstart-gcc43.patch -Patch1: upstart-force-on-shutdown-reboot.patch -Patch2: upstart-tty-stack.patch -Patch3: upstart-rpm.patch -Patch4: upstart-fedora-buglist.patch -Patch5: upstart-telinit-u.patch -Patch6: upstart-initctl-man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 +Requires: dbus >= 1.2.1-4 BuildRequires: gettext %description @@ -27,13 +21,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -%patch3 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib} @@ -43,20 +30,11 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +mkdir -p %{buildroot}/%{_sysconfdir}/init/jobs.d/ + mkdir -p %{buildroot}/%{_mandir}/man5 install -m 644 %{SOURCE1} %{buildroot}/%{_mandir}/man5/events.5 -# libupstart and libnih aren't shipped -rm -f %{buildroot}/%{_lib}/libupstart.* -rm -f %{buildroot}/%{_lib}/libnih.* -rm -f %{buildroot}/%{_includedir}/libnih.h -rm -f %{buildroot}/%{_includedir}/libupstart.h -rm -rf %{buildroot}/%{_includedir}/nih -rm -rf %{buildroot}/%{_includedir}/upstart -rm -rf %{buildroot}/%{_datadir}/aclocal/compiler.m4 -rm -rf %{buildroot}/%{_datadir}/aclocal/linker.m4 -rm -rf %{buildroot}/%{_datadir}/aclocal/misc.m4 - %find_lang %{name} %clean @@ -70,12 +48,11 @@ %doc README %doc TODO %doc HACKING -%{_sysconfdir}/event.d/ -%config(noreplace) %{_sysconfdir}/event.d/logd +%{_sysconfdir}/init/ +%{_sysconfdir}/dbus-1/system.d/Upstart.conf /sbin/halt /sbin/init /sbin/initctl -/sbin/logd /sbin/poweroff /sbin/reboot /sbin/runlevel @@ -88,7 +65,6 @@ %{_mandir}/man8/halt.8.gz %{_mandir}/man8/init.8.gz %{_mandir}/man8/initctl.8.gz -%{_mandir}/man8/logd.8.gz %{_mandir}/man8/poweroff.8.gz %{_mandir}/man8/reboot.8.gz %{_mandir}/man8/runlevel.8.gz @@ -99,6 +75,28 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Tue Jul 22 2008 Casey Dahlin - 0.3.9-19 - with the merge of event-compat-sysv, move the sysvinit obsoletes/provides here From fedora-extras-commits at redhat.com Tue Jul 22 21:41:05 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Tue, 22 Jul 2008 21:41:05 GMT Subject: rpms/xine-plugin/devel xine-plugin.spec,1.8,1.9 Message-ID: <200807222141.m6MLf5vx001692@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/xine-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1573 Modified Files: xine-plugin.spec Log Message: Sync devel with F9 to fix EVR problem. Index: xine-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xine-plugin/devel/xine-plugin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xine-plugin.spec 1 Jun 2008 12:22:07 -0000 1.8 +++ xine-plugin.spec 22 Jul 2008 21:40:17 -0000 1.9 @@ -6,7 +6,7 @@ Name: xine-plugin Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Media plugin for mozilla compatible browsers using libxine backend Group: Applications/Multimedia @@ -69,6 +69,9 @@ %changelog +* Sun Jun 22 2008 Martin Stransky - 1.0.1-4 +- rebuild against new xulrunner + * Sun Jun 01 2008 Martin Sourada - 1.0.1-3 - require mozilla-filesystem instead of xulrunner on >= F9 From fedora-extras-commits at redhat.com Tue Jul 22 22:03:05 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 22:03:05 GMT Subject: rpms/gnome-keyring/devel gnome-keyring.spec, 1.87, 1.88 gnome-keyring-2.20-selinux-pam.patch, 1.2, NONE gnome-keyring-2.21.5-dont-ask-for-password.patch, 1.2, NONE gnome-keyring-2.21.5-race-condition.patch, 1.1, NONE gnome-keyring-no-human-security.patch, 1.1, NONE no-autounlock.patch, 1.1, NONE Message-ID: <200807222203.m6MM35Bw014444@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-keyring/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14322 Modified Files: gnome-keyring.spec Removed Files: gnome-keyring-2.20-selinux-pam.patch gnome-keyring-2.21.5-dont-ask-for-password.patch gnome-keyring-2.21.5-race-condition.patch gnome-keyring-no-human-security.patch no-autounlock.patch Log Message: drop patch Index: gnome-keyring.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- gnome-keyring.spec 22 Jul 2008 19:59:40 -0000 1.87 +++ gnome-keyring.spec 22 Jul 2008 22:02:07 -0000 1.88 @@ -12,8 +12,6 @@ License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gnome-keyring/2.22/gnome-keyring-%{version}.tar.bz2 -# http://bugzilla.gnome.org/show_bug.cgi?id=533493 -Patch0: gnome-keyring-no-human-security.patch URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_version} @@ -69,13 +67,12 @@ %prep %setup -q -n gnome-keyring-%{version} -%patch0 -p0 -b .no-human-security %build aclocal automake autoconf -%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security +%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts make %{?_smp_mflags} %install --- gnome-keyring-2.20-selinux-pam.patch DELETED --- --- gnome-keyring-2.21.5-dont-ask-for-password.patch DELETED --- --- gnome-keyring-2.21.5-race-condition.patch DELETED --- --- gnome-keyring-no-human-security.patch DELETED --- --- no-autounlock.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 22 22:11:09 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 22 Jul 2008 22:11:09 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1586,1.1587 Message-ID: <200807222211.m6MMB9YU015097@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15000 Modified Files: openoffice.org.spec Log Message: new files Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1586 retrieving revision 1.1587 diff -u -r1.1586 -r1.1587 --- openoffice.org.spec 22 Jul 2008 12:24:06 -0000 1.1586 +++ openoffice.org.spec 22 Jul 2008 22:10:18 -0000 1.1587 @@ -2140,6 +2140,7 @@ %{basisinstdir}/program/libitg%{SOPOST}.so %{basisinstdir}/program/libiti%{SOPOST}.so %{basisinstdir}/program/libofficebean.so +%{basisinstdir}/program/liboooimprovecore%{SOPOST}.so %{basisinstdir}/program/libfile%{SOPOST}.so %{basisinstdir}/program/libfilterconfig1.so %{basisinstdir}/program/libflat%{SOPOST}.so @@ -2273,6 +2274,7 @@ %{basisinstdir}/program/resource/tpl%{UPD}en-US.res %{basisinstdir}/program/resource/uui%{UPD}en-US.res %{basisinstdir}/program/resource/updchk%{UPD}en-US.res +%{basisinstdir}/program/resource/upd%{UPD}en-US.res %{basisinstdir}/program/resource/vcl%{UPD}en-US.res %{basisinstdir}/program/resource/wzi%{UPD}en-US.res %{basisinstdir}/program/resource/xmlsec%{UPD}en-US.res @@ -3053,6 +3055,7 @@ %{oooinstdir}/program/scalc %{oooinstdir}/program/scalc.bin %{_datadir}/applications/openoffice.org-*-calc.desktop +%{_datadir}/mimelnk/application/openoffice.org-ms-excel* %{_bindir}/oocalc %post calc @@ -3068,6 +3071,7 @@ %{brinstdir}/program/scalc %{brinstdir}/program/scalc.bin %{_datadir}/applications/broffice.org-calc.desktop +%{_datadir}/mimelnk/application/broffice.org-ms-excel* %post -n broffice.org-calc update-desktop-database -q %{_datadir}/applications @@ -3230,6 +3234,8 @@ %{oooinstdir}/program/swriter %{oooinstdir}/program/swriter.bin %{_datadir}/applications/openoffice.org-*-writer.desktop +%{_datadir}/mimelnk/application/openoffice.org-ms-word* +%{_datadir}/mimelnk/application/openoffice.org-openxmlformats-officedocument-wordprocessingml* %{_bindir}/oowriter %post writer @@ -3243,6 +3249,8 @@ %{brinstdir}/program/swriter %{brinstdir}/program/swriter.bin %{_datadir}/applications/broffice.org-writer.desktop +%{_datadir}/mimelnk/application/broffice.org-ms-word* +%{_datadir}/mimelnk/application/broffice.org-openxmlformats-officedocument-wordprocessingml* %post -n broffice.org-writer update-desktop-database -q %{_datadir}/applications @@ -3301,6 +3309,7 @@ %{oooinstdir}/program/simpress %{oooinstdir}/program/simpress.bin %{_datadir}/applications/openoffice.org-*-impress.desktop +%{_datadir}/mimelnk/application/openoffice.org-ms-powerpoint* %{_bindir}/ooimpress %post impress @@ -3316,6 +3325,7 @@ %{brinstdir}/program/simpress %{brinstdir}/program/simpress.bin %{_datadir}/applications/broffice.org-impress.desktop +%{_datadir}/mimelnk/application/broffice.org-ms-powerpoint* %post -n broffice.org-impress update-desktop-database -q %{_datadir}/applications From fedora-extras-commits at redhat.com Tue Jul 22 22:11:16 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Tue, 22 Jul 2008 22:11:16 GMT Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.5, 1.6 olpc-utils.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200807222211.m6MMBGmx015109@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15022 Modified Files: .cvsignore olpc-utils.spec sources Log Message: - cscott: dlo#7495: Trigger activity update on base OS upgrade. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jul 2008 21:58:51 -0000 1.5 +++ .cvsignore 22 Jul 2008 22:10:32 -0000 1.6 @@ -1 +1 @@ -olpc-utils-0.78.tar.bz2 +olpc-utils-0.79.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- olpc-utils.spec 8 Jul 2008 21:58:51 -0000 1.11 +++ olpc-utils.spec 22 Jul 2008 22:10:32 -0000 1.12 @@ -1,5 +1,5 @@ Name: olpc-utils -Version: 0.78 +Version: 0.79 Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary @@ -84,6 +84,9 @@ %changelog +* Tue Jul 22 2008 Michael Stone 0.79-1 +- cscott: dlo#7495: Trigger activity update on base OS upgrade. + * Tue Jul 08 2008 Michael Stone 0.78-1 - dsd: dlo#7211: Increase mouse sensitivity. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Jul 2008 21:58:51 -0000 1.6 +++ sources 22 Jul 2008 22:10:32 -0000 1.7 @@ -1 +1 @@ -08d9e4eedbf4525ba420d96ed06b1f90 olpc-utils-0.78.tar.bz2 +a16d38ac1c78d3f0dc113da21a5bff71 olpc-utils-0.79.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 22:48:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 22:48:44 GMT Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.10, 1.11 gnome-backgrounds-paths.patch, 1.1, 1.2 gnome-backgrounds.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200807222248.m6MMmi2K017921@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-backgrounds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17804 Modified Files: .cvsignore gnome-backgrounds-paths.patch gnome-backgrounds.spec sources Log Message: 2.23.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 10 Mar 2008 04:21:48 -0000 1.10 +++ .cvsignore 22 Jul 2008 22:47:55 -0000 1.11 @@ -1 +1 @@ -gnome-backgrounds-2.22.0.tar.bz2 +gnome-backgrounds-2.23.0.tar.bz2 gnome-backgrounds-paths.patch: Index: gnome-backgrounds-paths.patch =================================================================== RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds-paths.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-backgrounds-paths.patch 10 Mar 2008 04:31:41 -0000 1.1 +++ gnome-backgrounds-paths.patch 22 Jul 2008 22:47:55 -0000 1.2 @@ -1,58 +1,43 @@ -diff -up gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in.paths gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in ---- gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in.paths 2007-12-21 20:11:28.000000000 -0500 -+++ gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in 2008-03-10 00:27:27.000000000 -0400 -@@ -5,7 +5,7 @@ - - <_name>Boats Pattern -- @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg -+ @datadir@/backgrounds/tiles/pattern-boats.svg - wallpaper - vertical-gradient - #FCAF3E -@@ -15,7 +15,7 @@ - - <_name>Clouds Pattern -- @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg -+ @datadir@/backgrounds/tiles/pattern-clouds.svg - wallpaper - vertical-gradient - #729FCF -@@ -25,7 +25,7 @@ - - <_name>Stars Pattern -- @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg -+ @datadir@/backgrounds/tiles/pattern-stars.svg - wallpaper - vertical-gradient - #332133 -diff -up gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in.paths gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in ---- gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in.paths 2007-12-21 20:11:28.000000000 -0500 -+++ gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in 2008-03-10 00:27:27.000000000 -0400 -@@ -5,7 +5,7 @@ - - <_name>Ellipses (Translucent) -- @datadir@/pixmaps/backgrounds/gnome/translucent/ellipsis.svg -+ @datadir@/backgrounds/translucent/ellipsis.svg - stretched - solid - #BABDB6 -@@ -14,7 +14,7 @@ - - <_name>Tentacles (Translucent) -- @datadir@/pixmaps/backgrounds/gnome/translucent/tentacles.svg -+ @datadir@/backgrounds/translucent/tentacles.svg - stretched - solid - #366B04 -diff -up gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in ---- gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths 2007-12-21 20:12:53.000000000 -0500 -+++ gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in 2008-03-10 00:29:38.000000000 -0400 -@@ -5,21 +5,21 @@ +diff -up gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in.paths gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in +--- gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in.paths 2008-07-22 18:45:51.000000000 -0400 ++++ gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in 2008-07-22 18:46:25.000000000 -0400 +@@ -3,27 +3,27 @@ + + + <_name>Flow +- @datadir@/pixmaps/backgrounds/gnome/abstract/Flow.png ++ @datadir@/backgrounds/abstract/Flow.png + zoom + + + <_name>Gulp +- @datadir@/pixmaps/backgrounds/gnome/abstract/Gulp.png ++ @datadir@/backgrounds/abstract/Gulp.png + zoom + + + <_name>Silk +- @datadir@/pixmaps/backgrounds/gnome/abstract/Silk.png ++ @datadir@/backgrounds/abstract/Silk.png + zoom + + + <_name>Spring +- @datadir@/pixmaps/backgrounds/gnome/abstract/Spring.png ++ @datadir@/backgrounds/abstract/Spring.png + zoom + + + <_name>Waves +- @datadir@/pixmaps/backgrounds/gnome/abstract/Waves.png ++ @datadir@/backgrounds/abstract/Waves.png + zoom + + +diff -up gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in.paths gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in +--- gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in.paths 2008-07-22 11:46:06.000000000 -0400 ++++ gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in 2008-07-22 18:44:10.000000000 -0400 +@@ -5,64 +5,64 @@ <_name>Fresh Flower @@ -61,14 +46,6 @@ zoom - - <_name>Open Flower -- @datadir@/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg -+ @datadir@/backgrounds/nature/OpenFlower.jpg - zoom - - <_name>Green Meadow @@ -76,16 +53,64 @@ + @datadir@/backgrounds/nature/GreenMeadow.jpg zoom + + <_name>Aqua +- @datadir@/pixmaps/backgrounds/gnome/nature/Aqua.jpg ++ @datadir@/backgrounds/nature/Aqua.jpg + zoom + + + <_name>Dune +- @datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg ++ @datadir@/backgrounds/nature/Dune.jpg + zoom + + + <_name>Storm +- @datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg ++ @datadir@/backgrounds/nature/Dune.jpg + zoom + + + <_name>Two Wings +- @datadir@/pixmaps/backgrounds/gnome/nature/TwoWings.jpg ++ @datadir@/backgrounds/nature/TwoWings.jpg + zoom + + + <_name>Lady Bird +- @datadir@/pixmaps/backgrounds/gnome/nature/LadyBird.jpg ++ @datadir@/backgrounds/nature/LadyBird.jpg + zoom + + + <_name>Blinds +- @datadir@/pixmaps/backgrounds/gnome/nature/Blinds.jpg ++ @datadir@/backgrounds/nature/Blinds.jpg + zoom + + + <_name>Rain Drops +- @datadir@/pixmaps/backgrounds/gnome/nature/RainDrops.jpg ++ @datadir@/backgrounds/nature/RainDrops.jpg + zoom + + + <_name>Yellow Flower +- @datadir@/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg ++ @datadir@/backgrounds/nature/YellowFlower.jpg + zoom + + + <_name>Garden +- @datadir@/pixmaps/backgrounds/gnome/nature/Garden.jpg ++ @datadir@/backgrounds/nature/Garden.jpg + zoom + + + <_name>Wood +- @datadir@/pixmaps/backgrounds/gnome/nature/Wood.jpg ++ @datadir@/backgrounds/nature/Wood.jpg + zoom + -diff -up gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in.paths gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in ---- gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in.paths 2007-12-21 20:11:28.000000000 -0500 -+++ gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in 2008-03-10 00:27:27.000000000 -0400 -@@ -5,7 +5,7 @@ - - <_name>GNOME Curves -- @datadir@/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png -+ @datadir@/backgrounds/images/branded/GNOME-Curves.png - zoom - solid - #76848F Index: gnome-backgrounds.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnome-backgrounds.spec 10 Mar 2008 04:31:41 -0000 1.15 +++ gnome-backgrounds.spec 22 Jul 2008 22:47:55 -0000 1.16 @@ -1,11 +1,11 @@ Summary: Desktop backgrounds packaged with the GNOME desktop Name: gnome-backgrounds -Version: 2.22.0 +Version: 2.23.0 Release: 1%{?dist} License: GPLv2 Group: Applications/Multimedia URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-backgrounds/2.22/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-backgrounds/2.23/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext @@ -35,9 +35,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images -mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/branded $RPM_BUILD_ROOT%{_datadir}/backgrounds/images -mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/tiles $RPM_BUILD_ROOT%{_datadir}/backgrounds -mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/translucent $RPM_BUILD_ROOT%{_datadir}/backgrounds +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/abstract $RPM_BUILD_ROOT%{_datadir}/backgrounds mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/nature $RPM_BUILD_ROOT%{_datadir}/backgrounds %find_lang %{name} @@ -52,6 +50,9 @@ %{_datadir}/backgrounds/* %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.0-1 +- Update to 2.23.0 + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 10 Mar 2008 04:21:48 -0000 1.10 +++ sources 22 Jul 2008 22:47:55 -0000 1.11 @@ -1 +1 @@ -1997e020288ea6b91ed460c2c6bfc8d4 gnome-backgrounds-2.22.0.tar.bz2 +ab83065de900abe6f8388070892fa8d5 gnome-backgrounds-2.23.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 23:09:18 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 22 Jul 2008 23:09:18 GMT Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.30,1.31 sources,1.17,1.18 Message-ID: <200807222309.m6MN9Iil026354@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/ConsoleKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26231 Modified Files: ConsoleKit.spec sources Log Message: - Update to a new snapshot Index: ConsoleKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ConsoleKit.spec 22 Jul 2008 20:26:03 -0000 1.30 +++ ConsoleKit.spec 22 Jul 2008 23:08:27 -0000 1.31 @@ -6,7 +6,7 @@ Summary: System daemon for tracking users, sessions and seats Name: ConsoleKit Version: 0.2.11 -Release: 0.2008.07.22.1%{?dist} +Release: 0.2008.07.22.2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/ConsoleKit @@ -154,6 +154,9 @@ %doc %{_datadir}/doc/%{name}-%{version}/spec/* %changelog +* Tue Jul 22 2008 Jon McCann - 0.2.11-0.2008.07.22.2 +- Update to a new snapshot + * Tue Jul 22 2008 Jon McCann - 0.2.11-0.2008.07.22.1 - Update to snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 22 Jul 2008 20:26:03 -0000 1.17 +++ sources 22 Jul 2008 23:08:27 -0000 1.18 @@ -1 +1 @@ -82f2ce289cfe6b78a7cabf2b583d52f8 ConsoleKit-0.2.11.tar.bz2 +6514a70a8d6ca0dec10d8f683acad2ea ConsoleKit-0.2.11.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 22 23:10:58 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 22 Jul 2008 23:10:58 GMT Subject: rpms/PolicyKit/devel pk-ck-api-change.patch, NONE, 1.1 PolicyKit.spec, 1.20, 1.21 Message-ID: <200807222310.m6MNAwOX026619@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/PolicyKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26557 Modified Files: PolicyKit.spec Added Files: pk-ck-api-change.patch Log Message: - Fix for CK API change pk-ck-api-change.patch: --- NEW FILE pk-ck-api-change.patch --- diff --git a/src/polkit-dbus/polkit-dbus.c b/src/polkit-dbus/polkit-dbus.c index f7be03f..cad4a76 100644 --- a/src/polkit-dbus/polkit-dbus.c +++ b/src/polkit-dbus/polkit-dbus.c @@ -214,11 +214,17 @@ polkit_session_new_from_objpath (DBusConnection *con, const char *objpath, uid_t dbus_message_unref (reply); goto out; } + /* GetUnixUser API Changed in CK 0.3.0 */ if (!dbus_message_get_args (reply, NULL, - DBUS_TYPE_INT32, &uid, + DBUS_TYPE_UINT32, &uid, DBUS_TYPE_INVALID)) { - kit_warning ("Invalid GetUnixUser reply from CK"); - goto out; + /* try the older API */ + if (!dbus_message_get_args (reply, NULL, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INVALID)) { + kit_warning ("Invalid GetUnixUser reply from CK"); + goto out; + } } dbus_message_unref (message); dbus_message_unref (reply); @@ -1326,16 +1332,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) dbus_error_init (&error); seat_objpath = dbus_message_get_path (message); - if (!dbus_message_get_args (message, &error, - DBUS_TYPE_STRING, &session_objpath, + /* API fixed in CK 0.3 to match spec */ + if (!dbus_message_get_args (message, &error, + DBUS_TYPE_OBJECT_PATH, &session_objpath, DBUS_TYPE_INVALID)) { + if (!dbus_message_get_args (message, &error, + DBUS_TYPE_STRING, &session_objpath, + DBUS_TYPE_INVALID)) { - /* TODO: should be _pk_critical */ - kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " - "interface for object %s has the wrong signature! " - "Your system is misconfigured.", seat_objpath); + /* TODO: should be _pk_critical */ + kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " + "interface for object %s has the wrong signature! " + "Your system is misconfigured.", seat_objpath); - goto out; + goto out; + } } /* TODO: add to sessions - see polkit_tracker_is_authorization_relevant() */ @@ -1353,16 +1364,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) dbus_error_init (&error); seat_objpath = dbus_message_get_path (message); - if (!dbus_message_get_args (message, &error, - DBUS_TYPE_STRING, &session_objpath, + /* API fixed in CK 0.3 to match spec */ + if (!dbus_message_get_args (message, &error, + DBUS_TYPE_OBJECT_PATH, &session_objpath, DBUS_TYPE_INVALID)) { + if (!dbus_message_get_args (message, &error, + DBUS_TYPE_STRING, &session_objpath, + DBUS_TYPE_INVALID)) { - /* TODO: should be _pk_critical */ - kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " - "interface for object %s has the wrong signature! " - "Your system is misconfigured.", seat_objpath); + /* TODO: should be _pk_critical */ + kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " + "interface for object %s has the wrong signature! " + "Your system is misconfigured.", seat_objpath); - goto out; + goto out; + } } _remove_caller_by_session (pk_tracker, session_objpath); Index: PolicyKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PolicyKit/devel/PolicyKit.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- PolicyKit.spec 22 Jul 2008 18:22:59 -0000 1.20 +++ PolicyKit.spec 22 Jul 2008 23:10:14 -0000 1.21 @@ -14,11 +14,12 @@ Summary: Authorization Toolkit Name: PolicyKit Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz +Patch1: pk-ck-api-change.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): chkconfig Requires(preun): chkconfig @@ -73,6 +74,7 @@ %prep %setup -q +%patch1 -p1 -b .api-change %build %configure @@ -166,6 +168,9 @@ %{_datadir}/gtk-doc/html/polkit/* %changelog +* Tue Jul 22 2008 Jon McCann - 0.9-2%{?dist} +- Fix for CK API change + * Tue Jul 22 2008 David Zeuthen - 0.9-1%{?dist} - Upstream 0.9 release; fixes some file permissions From fedora-extras-commits at redhat.com Tue Jul 22 23:12:22 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 22 Jul 2008 23:12:22 GMT Subject: rpms/hal/devel hal-ck-api-change.patch, NONE, 1.1 hal.spec, 1.158, 1.159 Message-ID: <200807222312.m6MNCMvl026761@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/hal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26680/devel Modified Files: hal.spec Added Files: hal-ck-api-change.patch Log Message: - Fix for CK API changes hal-ck-api-change.patch: --- NEW FILE hal-ck-api-change.patch --- diff --git a/hald/ck-tracker.c b/hald/ck-tracker.c index 34aa640..7574e76 100644 --- a/hald/ck-tracker.c +++ b/hald/ck-tracker.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /*************************************************************************** * CVSID: $Id$ * @@ -255,11 +256,17 @@ ck_session_get_info (CKTracker *tracker, CKSession *session) dbus_message_unref (reply); goto error; } + /* GetUnixUser API Changed in CK 0.3.0 */ if (!dbus_message_get_args (reply, NULL, - DBUS_TYPE_INT32, &(session->user), + DBUS_TYPE_UINT32, &(session->user), DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid GetUnixUser reply from CK")); - goto error; + /* try the older API */ + if (!dbus_message_get_args (reply, NULL, + DBUS_TYPE_INT32, &(session->user), + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid GetUnixUser reply from CK")); + goto error; + } } dbus_message_unref (message); dbus_message_unref (reply); @@ -530,11 +537,16 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) seat_objpath = dbus_message_get_path (message); + /* API fixed in CK 0.3 to match spec */ if (!dbus_message_get_args (message, NULL, - DBUS_TYPE_STRING, &seat_objpath, + DBUS_TYPE_OBJECT_PATH, &seat_objpath, DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SeatAdded signal from CK")); - goto out; + if (!dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &seat_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SeatAdded signal from CK")); + goto out; + } } HAL_INFO (("Received SeatAdded '%s' from CK", seat_objpath)); @@ -557,11 +569,16 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) seat_objpath = dbus_message_get_path (message); + /* API fixed in CK 0.3 to match spec */ if (!dbus_message_get_args (message, NULL, - DBUS_TYPE_STRING, &seat_objpath, + DBUS_TYPE_OBJECT_PATH, &seat_objpath, DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SeatRemoved signal from CK")); - goto out; + if (!dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &seat_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SeatRemoved signal from CK")); + goto out; + } } HAL_INFO (("Received SeatRemoved '%s' from CK", seat_objpath)); @@ -587,11 +604,16 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) seat_objpath = dbus_message_get_path (message); + /* API fixed in CK 0.3 to match spec */ if (!dbus_message_get_args (message, NULL, - DBUS_TYPE_STRING, &session_objpath, + DBUS_TYPE_OBJECT_PATH, &session_objpath, DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SessionAdded signal from CK")); - goto out; + if (!dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &session_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SessionAdded signal from CK")); + goto out; + } } HAL_INFO (("Received SessionAdded '%s' from CK on seat '%s'", session_objpath, seat_objpath)); @@ -623,11 +645,16 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) seat_objpath = dbus_message_get_path (message); + /* API fixed in CK 0.3 to match spec */ if (!dbus_message_get_args (message, NULL, - DBUS_TYPE_STRING, &session_objpath, + DBUS_TYPE_OBJECT_PATH, &session_objpath, DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SessionRemoved signal from CK")); - goto out; + if (!dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &session_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SessionRemoved signal from CK")); + goto out; + } } HAL_INFO (("Received SessionRemoved '%s' from CK on seat '%s'", session_objpath, seat_objpath)); Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- hal.spec 12 Jun 2008 14:34:59 -0000 1.158 +++ hal.spec 22 Jul 2008 23:11:28 -0000 1.159 @@ -26,12 +26,13 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.11 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/Software/hal Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz Patch1: hal-0.5.10-set-property-direct.patch Patch2: hal-change-priority.patch Patch3: hal-cloexec.patch +Patch4: hal-ck-api-change.patch License: AFL or GPLv2 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,6 +129,7 @@ %patch1 -p1 -b .direct %patch2 -p1 -b .priority %patch3 -p1 -b .selinux-leak +%patch4 -p1 -b .api-change %build autoreconf @@ -272,6 +274,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Tue Jul 22 2008 Jon McCann - 0.5.11-3 +- Fix for CK API changes + * Thu Jun 12 2008 Richard Hughes - 0.5.11-2 - Fix unmounting of USB drives when using SELinux due to a leaking file descriptor (#447195) From fedora-extras-commits at redhat.com Tue Jul 22 23:16:17 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 23:16:17 GMT Subject: rpms/gnome-backgrounds/devel gnome-backgrounds.spec,1.16,1.17 Message-ID: <200807222316.m6MNGHHa027300@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-backgrounds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27190 Modified Files: gnome-backgrounds.spec Log Message: intltool hate... Index: gnome-backgrounds.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-backgrounds.spec 22 Jul 2008 22:47:55 -0000 1.16 +++ gnome-backgrounds.spec 22 Jul 2008 23:15:19 -0000 1.17 @@ -8,6 +8,7 @@ Source0: http://download.gnome.org/sources/gnome-backgrounds/2.23/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: intltool BuildRequires: gettext BuildRequires: perl(XML::Parser) From fedora-extras-commits at redhat.com Tue Jul 22 23:23:48 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 23:23:48 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.110,1.111 Message-ID: <200807222323.m6MNNmYd027788@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27748/devel Modified Files: kdebase-workspace.spec Log Message: * Wed Jul 23 2008 Kevin Kofler 4.0.99-5 - F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or Require kdebase, as kdebase now requires kdebase-workspace, obviating the upgrade path hack Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- kdebase-workspace.spec 22 Jul 2008 17:58:42 -0000 1.110 +++ kdebase-workspace.spec 22 Jul 2008 23:23:01 -0000 1.111 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.0.99 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -39,10 +39,12 @@ Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} +%if 0%{?fedora} == 9 # upgrade path: kdebase(3) -> kdebase-workspace Obsoletes: kdebase < 6:4 # so kdebase doesn't get lost on kde3->kde4 upgrade (#444928) Requires: kdebase4 +%endif # kdmtheme's functionality is now provided by kdebase-workspace itself Obsoletes: kdmtheme < 1.3 @@ -299,6 +301,11 @@ %changelog +* Wed Jul 23 2008 Kevin Kofler 4.0.99-5 +- F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or + Require kdebase, as kdebase now requires kdebase-workspace, obviating the + upgrade path hack + * Tue Jul 22 2008 Rex Dieter 4.0.99-4 - oxygen-cursor-themes, -wallpapers subpkgs From fedora-extras-commits at redhat.com Tue Jul 22 23:24:27 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 23:24:27 GMT Subject: rpms/vino/devel .cvsignore, 1.34, 1.35 sources, 1.34, 1.35 vino.spec, 1.69, 1.70 Message-ID: <200807222324.m6MNORY0027818@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/vino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27778 Modified Files: .cvsignore sources vino.spec Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vino/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 7 Apr 2008 14:10:09 -0000 1.34 +++ .cvsignore 22 Jul 2008 23:23:41 -0000 1.35 @@ -1 +1 @@ -vino-2.22.1.tar.bz2 +vino-2.23.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/vino/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 7 Apr 2008 14:10:09 -0000 1.34 +++ sources 22 Jul 2008 23:23:41 -0000 1.35 @@ -1 +1 @@ -01c5ffd0b252edb8921bfcca88438339 vino-2.22.1.tar.bz2 +0d8759df5e7c945fe032a63a8792b8da vino-2.23.5.tar.bz2 Index: vino.spec =================================================================== RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- vino.spec 7 Apr 2008 14:10:09 -0000 1.69 +++ vino.spec 22 Jul 2008 23:23:41 -0000 1.70 @@ -8,10 +8,10 @@ Summary: A remote desktop system for GNOME Name: vino -Version: 2.22.1 +Version: 2.23.5 Release: 1%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/vino/2.22/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/vino/2.23/%{name}-%{version}.tar.bz2 License: GPLv2+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +30,7 @@ BuildRequires: libXt-devel, libXtst-devel, libXdamage-devel, avahi-glib-devel BuildRequires: desktop-file-utils BuildRequires: perl(XML::Parser) +BuildRequires: intltool BuildRequires: gettext BuildRequires: dbus-glib-devel @@ -107,6 +108,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Mon Apr 7 2008 Matthias Clasen - 2.22.1-1 - Update to 2.22.1 From fedora-extras-commits at redhat.com Tue Jul 22 23:41:57 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 22 Jul 2008 23:41:57 GMT Subject: rpms/asterisk/F-8 .cvsignore, 1.16, 1.17 asterisk.spec, 1.20, 1.21 sources, 1.16, 1.17 Message-ID: <200807222341.m6MNfvHe029000@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28891 Modified Files: .cvsignore asterisk.spec sources Log Message: * Tue Jul 22 2008 Jeffrey C. Ollie - 1.4.21.2-1 - Update to 1.4.21.2 to fix CVE-2008-3263 / AST-2008-010 and CVE-2008-3264 / AST-2008-011 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 1 Jul 2008 13:23:50 -0000 1.16 +++ .cvsignore 22 Jul 2008 23:41:09 -0000 1.17 @@ -1 +1 @@ -asterisk-1.4.21.1-stripped.tar.gz +asterisk-1.4.21.2-stripped.tar.gz Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- asterisk.spec 1 Jul 2008 13:23:50 -0000 1.20 +++ asterisk.spec 22 Jul 2008 23:41:09 -0000 1.21 @@ -2,7 +2,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 1.4.21.1 +Version: 1.4.21.2 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -17,13 +17,13 @@ # MD5 Sums # ======== -# dfa1b73587aa74b36caaf4811cfe610e asterisk-1.4.21.1.tar.gz -# 51caedfdd9d92b9f2dc02c584ab7d7de asterisk-1.4.21.1-stripped.tar.gz +# 46881e1345eca21ea13a7d5b1036fa6e asterisk-1.4.21.2.tar.gz +# b5cf2c58c96659316d1edc5bd97ec443 asterisk-1.4.21.2-stripped.tar.gz # # SHA1 Sums # ========= -# dcd21c7b242487742a595a4d9d847c33ef2041d8 asterisk-1.4.21.1.tar.gz -# df4a8c6d7c75df01e4bb399bf4f5f6ba6466a522 asterisk-1.4.21.1-stripped.tar.gz +# 8c0dcf57f69ce27929f7836081316a2695eb76fa asterisk-1.4.21.2.tar.gz +# ca3421b51147bbad0e4bf696a2e15df0cd8a2ce2 asterisk-1.4.21.2-stripped.tar.gz Source0: asterisk-%{version}-stripped.tar.gz Source1: asterisk-logrotate @@ -901,6 +901,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Tue Jul 22 2008 Jeffrey C. Ollie - 1.4.21.2-1 +- Update to 1.4.21.2 to fix CVE-2008-3263 / AST-2008-010 and CVE-2008-3264 / AST-2008-011 + * Thu Jul 1 2008 Jeffrey C. Ollie - 1.4.21.1-1 - Update to 1.4.21.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 1 Jul 2008 13:23:50 -0000 1.16 +++ sources 22 Jul 2008 23:41:09 -0000 1.17 @@ -1 +1 @@ -51caedfdd9d92b9f2dc02c584ab7d7de asterisk-1.4.21.1-stripped.tar.gz +b5cf2c58c96659316d1edc5bd97ec443 asterisk-1.4.21.2-stripped.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 23:43:36 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 22 Jul 2008 23:43:36 GMT Subject: rpms/perl-DateTime-Format-DB2/devel import.log, NONE, 1.1 perl-DateTime-Format-DB2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807222343.m6MNha1V029249@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DB2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29140/devel Modified Files: .cvsignore sources Added Files: import.log perl-DateTime-Format-DB2.spec Log Message: initial import --- NEW FILE import.log --- perl-DateTime-Format-DB2-0_05-1_fc8:HEAD:perl-DateTime-Format-DB2-0.05-1.fc8.src.rpm:1216770151 --- NEW FILE perl-DateTime-Format-DB2.spec --- Name: perl-DateTime-Format-DB2 Version: 0.05 Release: 1%{?dist} Summary: Parse and format DB2 dates and times License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-DB2/ Source0: http://www.cpan.org/authors/id/J/JR/JROBINSON/DateTime-Format-DB2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(DateTime) BuildRequires: perl(DateTime::Format::Builder) BuildRequires: perl(ExtUtils::MakeMaker) # tests BuildRequires: perl(Test::More) # not picked up automatically Requires: perl(DateTime::Format::Builder) %description This module understands the formats used by DB2 for its DATE, TIME, and TIMESTAMP data types. It can be used to parse these formats in order to create DateTime objects, and it can take a DateTime object and produce a string representing it in the DB2 format. %prep %setup -q -n DateTime-Format-DB2-%{version} chmod -c -x t/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 16 2008 Chris Weyl 0.05-1 - Specfile autogenerated by cpanspec 1.74. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DB2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:01:04 -0000 1.1 +++ .cvsignore 22 Jul 2008 23:42:51 -0000 1.2 @@ -0,0 +1 @@ +DateTime-Format-DB2-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DB2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:01:04 -0000 1.1 +++ sources 22 Jul 2008 23:42:51 -0000 1.2 @@ -0,0 +1 @@ +a60a9535dcfab4458740c4805adcdd2b DateTime-Format-DB2-0.05.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 23:44:40 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 22 Jul 2008 23:44:40 GMT Subject: rpms/perl-DateTime-Format-DB2/devel perl-DateTime-Format-DB2.spec, 1.1, 1.2 Message-ID: <200807222344.m6MNieLr029418@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DB2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29324 Modified Files: perl-DateTime-Format-DB2.spec Log Message: release bump Index: perl-DateTime-Format-DB2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DB2/devel/perl-DateTime-Format-DB2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DateTime-Format-DB2.spec 22 Jul 2008 23:42:51 -0000 1.1 +++ perl-DateTime-Format-DB2.spec 22 Jul 2008 23:43:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-DateTime-Format-DB2 Version: 0.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parse and format DB2 dates and times License: GPL+ or Artistic Group: Development/Libraries @@ -57,5 +57,8 @@ %{_mandir}/man3/* %changelog +* Tue Jul 22 2008 Chris Weyl 0.05-2 +- bump + * Wed Jul 16 2008 Chris Weyl 0.05-1 - Specfile autogenerated by cpanspec 1.74. From fedora-extras-commits at redhat.com Tue Jul 22 23:45:35 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 22 Jul 2008 23:45:35 GMT Subject: rpms/perl-DateTime-Format-DB2/F-9 import.log, NONE, 1.1 perl-DateTime-Format-DB2.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807222345.m6MNjZ01029585@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DB2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29479 Modified Files: sources Added Files: import.log perl-DateTime-Format-DB2.spec Log Message: pseudo-branch of perl-DateTime-Format-DB2 to F-9 --- NEW FILE import.log --- perl-DateTime-Format-DB2-0_05-1_fc8:HEAD:perl-DateTime-Format-DB2-0.05-1.fc8.src.rpm:1216770151 --- NEW FILE perl-DateTime-Format-DB2.spec --- Name: perl-DateTime-Format-DB2 Version: 0.05 Release: 2%{?dist} Summary: Parse and format DB2 dates and times License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-DB2/ Source0: http://www.cpan.org/authors/id/J/JR/JROBINSON/DateTime-Format-DB2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(DateTime) BuildRequires: perl(DateTime::Format::Builder) BuildRequires: perl(ExtUtils::MakeMaker) # tests BuildRequires: perl(Test::More) # not picked up automatically Requires: perl(DateTime::Format::Builder) %description This module understands the formats used by DB2 for its DATE, TIME, and TIMESTAMP data types. It can be used to parse these formats in order to create DateTime objects, and it can take a DateTime object and produce a string representing it in the DB2 format. %prep %setup -q -n DateTime-Format-DB2-%{version} chmod -c -x t/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Jul 22 2008 Chris Weyl 0.05-2 - bump * Wed Jul 16 2008 Chris Weyl 0.05-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DB2/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:01:04 -0000 1.1 +++ sources 22 Jul 2008 23:44:49 -0000 1.2 @@ -0,0 +1 @@ +a60a9535dcfab4458740c4805adcdd2b DateTime-Format-DB2-0.05.tar.gz From fedora-extras-commits at redhat.com Tue Jul 22 23:46:34 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 22 Jul 2008 23:46:34 GMT Subject: rpms/orca/devel orca.spec,1.56,1.57 Message-ID: <200807222346.m6MNkYhn029714@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/orca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29583 Modified Files: orca.spec Log Message: fix BRs Index: orca.spec =================================================================== RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- orca.spec 22 Jul 2008 18:21:24 -0000 1.56 +++ orca.spec 22 Jul 2008 23:45:46 -0000 1.57 @@ -40,6 +40,7 @@ BuildRequires: perl(XML::Parser) BuildRequires: gettext BuildRequires: gnome-python2-bonobo +BuildRequires: gnome-python2-libwnck Obsoletes: gnopernicus Provides: gnopernicus From fedora-extras-commits at redhat.com Tue Jul 22 23:48:12 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 22 Jul 2008 23:48:12 GMT Subject: rpms/kdebase3/devel kdebase3.spec,1.65,1.66 Message-ID: <200807222348.m6MNmCB7029993@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29813/devel Modified Files: kdebase3.spec Log Message: %define _default_patch_fuzz 2, bump Release for libraw1394 rebuild. Index: kdebase3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- kdebase3.spec 22 Jul 2008 20:58:34 -0000 1.65 +++ kdebase3.spec 22 Jul 2008 23:47:23 -0000 1.66 @@ -1,3 +1,5 @@ +%define _default_patch_fuzz 2 + %define debug 0 %define final 1 %define redhatify 1 @@ -12,7 +14,7 @@ %define _with_samba --with-samba Version: 3.5.9 -Release: 16%{?dist} +Release: 17%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -870,6 +872,9 @@ %changelog +* Wed Jul 23 2008 Kevin Kofler - 3.5.9-17 +- rebuild for new libraw1394 + * Wed Jun 11 2008 Luk???? Tinkl - 3.5.9-16 - remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717) From fedora-extras-commits at redhat.com Wed Jul 23 00:06:34 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Wed, 23 Jul 2008 00:06:34 GMT Subject: rpms/pulseaudio/devel pa-ck-api-change.patch, NONE, 1.1 pulseaudio.spec, 1.47, 1.48 Message-ID: <200807230006.m6N06Y5i005814@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/pulseaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5724 Modified Files: pulseaudio.spec Added Files: pa-ck-api-change.patch Log Message: - Fix for CK API changes pa-ck-api-change.patch: --- NEW FILE pa-ck-api-change.patch --- diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c index 3adee99..3b7b57e 100644 --- a/src/modules/module-console-kit.c +++ b/src/modules/module-console-kit.c @@ -71,7 +71,7 @@ struct userdata { static void add_session(struct userdata *u, const char *id) { DBusError error; DBusMessage *m = NULL, *reply = NULL; - int32_t uid; + uid_t uid; struct session *session; char *t; @@ -92,10 +92,12 @@ static void add_session(struct userdata *u, const char *id) { goto fail; } - /* FIXME: Why is this in int32? and not an uint32? */ - if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID)) { - pa_log("Failed to parse GetUnixUser() result: %s: %s", error.name, error.message); - goto fail; + /* CK 0.3 this changed from int32 to uint32 */ + if (!dbus_message_get_args(reply, &error, DBUS_TYPE_UINT32, &uid, DBUS_TYPE_INVALID)) { + if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID)) { + pa_log("Failed to parse GetUnixUser() result: %s: %s", error.name, error.message); + goto fail; + } } /* We only care about our own sessions */ @@ -163,18 +165,24 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionAdded")) { - if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID) || dbus_error_is_set(&error)) { - pa_log_error("Failed to parse SessionAdded message: %s: %s", error.name, error.message); - goto finish; + /* CK API changed to match spec in 0.3 */ + if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { + if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) { + pa_log_error("Failed to parse SessionAdded message: %s: %s", error.name, error.message); + goto finish; + } } add_session(u, path); } else if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionRemoved")) { - if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID) || dbus_error_is_set(&error)) { - pa_log_error("Failed to parse SessionRemoved message: %s: %s", error.name, error.message); - goto finish; + /* CK API changed to match spec in 0.3 */ + if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { + if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) { + pa_log_error("Failed to parse SessionRemoved message: %s: %s", error.name, error.message); + goto finish; + } } remove_session(u, path); Index: pulseaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- pulseaudio.spec 26 Jun 2008 18:45:39 -0000 1.47 +++ pulseaudio.spec 23 Jul 2008 00:05:45 -0000 1.48 @@ -5,7 +5,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.11 -Release: 0.6.%{alphatag}%{?dist} +Release: 0.7.%{alphatag}%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.%{alphatag}.tar.gz @@ -34,6 +34,7 @@ #Patch8: pulseaudio-0.9.8-disable-realtime.patch #Patch9: pulseaudio-0.9.8-cputime-abort.patch #Patch10: wrong-assert.patch +Patch11: pa-ck-api-change.patch %description PulseAudio is a sound server for Linux and other Unix like operating @@ -179,6 +180,7 @@ #%patch8 -p1 -b .realtime #%patch9 -p1 -b .cputime-abort #%patch10 -p1 -b .wrong-assert +%patch11 -p1 -b .api-change %build %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -408,6 +410,9 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Tue Jul 22 2008 Jon McCann 0.9.11-0.7.git20080626 +- Fix for CK API changes + * Thu Jun 26 2008 Lennart Poettering 0.9.11-0.6.git20080626 - New GIT snapshot From fedora-extras-commits at redhat.com Wed Jul 23 00:08:21 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 23 Jul 2008 00:08:21 GMT Subject: rpms/perl-DateTime-Format-DB2/F-8 import.log, NONE, 1.1 perl-DateTime-Format-DB2.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807230008.m6N08L84006034@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DB2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5971 Modified Files: sources Added Files: import.log perl-DateTime-Format-DB2.spec Log Message: pseudo-branch of perl-DateTime-Format-DB2 to F-8 --- NEW FILE import.log --- perl-DateTime-Format-DB2-0_05-1_fc8:HEAD:perl-DateTime-Format-DB2-0.05-1.fc8.src.rpm:1216770151 --- NEW FILE perl-DateTime-Format-DB2.spec --- Name: perl-DateTime-Format-DB2 Version: 0.05 Release: 2%{?dist} Summary: Parse and format DB2 dates and times License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-DB2/ Source0: http://www.cpan.org/authors/id/J/JR/JROBINSON/DateTime-Format-DB2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(DateTime) BuildRequires: perl(DateTime::Format::Builder) BuildRequires: perl(ExtUtils::MakeMaker) # tests BuildRequires: perl(Test::More) # not picked up automatically Requires: perl(DateTime::Format::Builder) %description This module understands the formats used by DB2 for its DATE, TIME, and TIMESTAMP data types. It can be used to parse these formats in order to create DateTime objects, and it can take a DateTime object and produce a string representing it in the DB2 format. %prep %setup -q -n DateTime-Format-DB2-%{version} chmod -c -x t/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Jul 22 2008 Chris Weyl 0.05-2 - bump * Wed Jul 16 2008 Chris Weyl 0.05-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DB2/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:01:04 -0000 1.1 +++ sources 23 Jul 2008 00:07:36 -0000 1.2 @@ -0,0 +1 @@ +a60a9535dcfab4458740c4805adcdd2b DateTime-Format-DB2-0.05.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 00:23:34 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 00:23:34 GMT Subject: rpms/gnome-menus/devel .cvsignore, 1.43, 1.44 gnome-menus.spec, 1.83, 1.84 sources, 1.43, 1.44 Message-ID: <200807230023.m6N0NY8I007130@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-menus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7031 Modified Files: .cvsignore gnome-menus.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 18 Jun 2008 04:21:06 -0000 1.43 +++ .cvsignore 23 Jul 2008 00:22:49 -0000 1.44 @@ -1 +1 @@ -gnome-menus-2.23.4.tar.bz2 +gnome-menus-2.23.5.tar.bz2 Index: gnome-menus.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- gnome-menus.spec 18 Jun 2008 04:29:00 -0000 1.83 +++ gnome-menus.spec 23 Jul 2008 00:22:49 -0000 1.84 @@ -5,7 +5,7 @@ Summary: A menu system for the GNOME project Name: gnome-menus -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -99,6 +99,9 @@ %{_includedir}/gnome-menus %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 18 Jun 2008 04:21:06 -0000 1.43 +++ sources 23 Jul 2008 00:22:49 -0000 1.44 @@ -1 +1 @@ -0ecd7116fb90e1801eb2ac8402eb2d16 gnome-menus-2.23.4.tar.bz2 +c14456bab069cf3315cf652a2aeed078 gnome-menus-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 01:20:20 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 01:20:20 GMT Subject: rpms/gnome-desktop/devel .cvsignore, 1.66, 1.67 gnome-desktop.spec, 1.145, 1.146 sources, 1.66, 1.67 Message-ID: <200807230120.m6N1KKpr018791@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-desktop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18702 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- .cvsignore 18 Jun 2008 04:27:01 -0000 1.66 +++ .cvsignore 23 Jul 2008 01:19:35 -0000 1.67 @@ -1 +1 @@ -gnome-desktop-2.23.4.tar.bz2 +gnome-desktop-2.23.5.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- gnome-desktop.spec 18 Jun 2008 04:27:01 -0000 1.145 +++ gnome-desktop.spec 23 Jul 2008 01:19:35 -0000 1.146 @@ -11,7 +11,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2 @@ -20,7 +20,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: gnome-desktop-2.1.90-kdetheme.patch -Patch2: add-randr-12.patch Patch4: multires.patch Patch5: gnome-desktop-2.22.0-mistranslation.patch @@ -76,7 +75,6 @@ %setup -q %patch1 -p1 -b .kdetheme -%patch2 -p1 -b .add-randr-12 # %patch4 -p1 -b .multires %patch5 -p1 -b .mistranslation # %patch7 -p1 -b .refcount-slideshow @@ -126,6 +124,9 @@ %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sources 18 Jun 2008 04:27:01 -0000 1.66 +++ sources 23 Jul 2008 01:19:35 -0000 1.67 @@ -1 +1 @@ -f024f4e5adfa941c6f884dcbd0f4a7bd gnome-desktop-2.23.4.tar.bz2 +ad23a4a621e80dad71c412180d5d59f9 gnome-desktop-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 01:33:04 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 01:33:04 GMT Subject: rpms/libgweather/devel .cvsignore, 1.9, 1.10 libgweather.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <200807230133.m6N1X48W019912@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgweather/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19862 Modified Files: .cvsignore libgweather.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 18 Jun 2008 03:19:50 -0000 1.9 +++ .cvsignore 23 Jul 2008 01:32:20 -0000 1.10 @@ -1 +1 @@ -libgweather-2.23.4.tar.bz2 +libgweather-2.23.5.tar.bz2 Index: libgweather.spec =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libgweather.spec 18 Jun 2008 03:38:22 -0000 1.14 +++ libgweather.spec 23 Jul 2008 01:32:21 -0000 1.15 @@ -1,5 +1,5 @@ Name: libgweather -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?d4st} Summary: A library for weather information @@ -102,6 +102,9 @@ %changelog +* Tue Jul 22 2008 Matthias Clasen 2.23.5-1 +- Update to 2.23.5 + * Tue Jun 17 2008 Matthias Clasen 2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 18 Jun 2008 03:19:50 -0000 1.9 +++ sources 23 Jul 2008 01:32:21 -0000 1.10 @@ -1 +1 @@ -d776eeafe698f401199ac95f72e0f53f libgweather-2.23.4.tar.bz2 +b1ea3316ac9a2e33d45028b56740ada4 libgweather-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 01:42:52 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 01:42:52 GMT Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.146,1.147 Message-ID: <200807230142.m6N1gqB8020660@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-desktop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20532 Modified Files: gnome-desktop.spec Log Message: fix BRs Index: gnome-desktop.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- gnome-desktop.spec 23 Jul 2008 01:19:35 -0000 1.146 +++ gnome-desktop.spec 23 Jul 2008 01:42:07 -0000 1.147 @@ -30,6 +30,7 @@ Obsoletes: gnome-core gnome-core-devel Provides: gnome-core +BuildRequires: gnome-common BuildRequires: autoconf automake libtool BuildRequires: intltool, autoconf, automake BuildRequires: libxml2-devel >= %{libxml2_version} From fedora-extras-commits at redhat.com Wed Jul 23 01:48:54 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 01:48:54 GMT Subject: rpms/libgweather/devel libgweather.spec,1.15,1.16 Message-ID: <200807230148.m6N1mscb021016@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgweather/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20976 Modified Files: libgweather.spec Log Message: BR libsoup Index: libgweather.spec =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libgweather.spec 23 Jul 2008 01:32:21 -0000 1.15 +++ libgweather.spec 23 Jul 2008 01:48:10 -0000 1.16 @@ -12,7 +12,7 @@ BuildRequires: GConf2-devel >= 2.8.0 BuildRequires: gtk2-devel >= 2.11.0 -BuildRequires: gnome-vfs2-devel >= 2.15.4 +BuildRequires: libsoup-devel >= 2.4 BuildRequires: gettext BuildRequires: perl(XML::Parser) BuildRequires: intltool From fedora-extras-commits at redhat.com Wed Jul 23 01:52:21 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 23 Jul 2008 01:52:21 GMT Subject: rpms/lklug-fonts/devel lklug-fonts.spec,1.2,1.3 Message-ID: <200807230152.m6N1qLKn021405@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/lklug-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21209 Modified Files: lklug-fonts.spec Log Message: add comment about removing fonts-sinhala provides in f11 Index: lklug-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/lklug-fonts/devel/lklug-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lklug-fonts.spec 27 Jun 2008 09:17:16 -0000 1.2 +++ lklug-fonts.spec 23 Jul 2008 01:51:34 -0000 1.3 @@ -8,6 +8,7 @@ Source: lklug-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# provides can be dropped for F11 Provides: fonts-sinhala = 0.2.2-3 Obsoletes: fonts-sinhala <= 0.2.2-2 Group: User Interface/X From fedora-extras-commits at redhat.com Wed Jul 23 02:09:04 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 02:09:04 GMT Subject: rpms/bug-buddy/devel .cvsignore, 1.40, 1.41 bug-buddy.spec, 1.97, 1.98 sources, 1.40, 1.41 Message-ID: <200807230209.m6N294T3029027@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/bug-buddy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28966 Modified Files: .cvsignore bug-buddy.spec sources Log Message: 2.23.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 11 Mar 2008 03:25:43 -0000 1.40 +++ .cvsignore 23 Jul 2008 02:08:09 -0000 1.41 @@ -1 +1 @@ -bug-buddy-2.22.0.tar.bz2 +bug-buddy-2.23.5.1.tar.bz2 Index: bug-buddy.spec =================================================================== RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- bug-buddy.spec 4 Jun 2008 22:34:54 -0000 1.97 +++ bug-buddy.spec 23 Jul 2008 02:08:09 -0000 1.98 @@ -5,14 +5,14 @@ %define gconf_version 2.14 Name: bug-buddy -Version: 2.22.0 -Release: 4%{?dist} +Version: 2.23.5.1 +Release: 1%{?dist} Epoch: 1 Summary: A bug reporting utility for GNOME License: GPLv2 and BSD Group: Applications/System URL: http://www.gnome.org -Source: http://download.gnome.org/sources/bug-buddy/2.22/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/bug-buddy/2.23/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +42,7 @@ BuildRequires: elfutils-libelf-devel BuildRequires: autoconf, automake, libtool, intltool BuildRequires: gnome-common +BuildRequires: intltool Requires: gdb Requires(preun): GConf2 >= %{gconf_version} @@ -133,6 +134,9 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Tue Jul 22 2008 Matthias Clasen - 1:2.23.5.1-1 +- Update to 2.23.5.1 + * Wed Jun 4 2008 Matthias Clasen - 1:2.22.0-4 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 11 Mar 2008 03:25:43 -0000 1.40 +++ sources 23 Jul 2008 02:08:09 -0000 1.41 @@ -1 +1 @@ -092e1f91d0be4ca133cd0650622a6b06 bug-buddy-2.22.0.tar.bz2 +cbfa77850afb12bede5fdf79f2424d81 bug-buddy-2.23.5.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 02:16:09 2008 From: fedora-extras-commits at redhat.com (Peter Fernandes (hypersonic)) Date: Wed, 23 Jul 2008 02:16:09 GMT Subject: rpms/presto/F-9 import.log, NONE, 1.1 presto.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230216.m6N2G92Y029809@cvs-int.fedora.redhat.com> Author: hypersonic Update of /cvs/pkgs/rpms/presto/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29466/F-9 Modified Files: .cvsignore sources Added Files: import.log presto.spec Log Message: First commit for F9 branch --- NEW FILE import.log --- presto-0_1_3-4_fc9:F-9:presto-0.1.3-4.fc9.src.rpm:1216779164 --- NEW FILE presto.spec --- Name: presto Version: 0.1.3 Release: 4%{?dist} Summary: A tilemap engine using the Allegro game programming library Group: Development/Libraries License: GPLv3+ URL: http://www.hypersonicsoft.org/projects/showproject.php?id=29 Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel BuildRequires: qt4-devel BuildRequires: libpng-devel Requires: allegro %description Presto is a general-use tilemap engine coded in C that uses Allegro for graphics rendering, and therefore is intended for use in games using Allegro. It can handle rectangular tiles of any height and width (and different height from width), loading tilemaps from files, tile blending, and the capability to change most of these elements on the fly. %package devel Summary: Files needed to develop programs that use Presto Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: allegro-devel Requires: libpng-devel %description devel Development files used for creating applications using the Presto tilemap engine %prep %setup -q %build qmake-qt4 PREFIX="%{_prefix}" LIBFINALDIR="%{_libdir}" make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir %{buildroot} make install INSTALL_ROOT="%{buildroot}" %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_libdir}/libpresto.so.0 %{_libdir}/libpresto.so.0.1 %{_libdir}/libpresto.so.%{version} %doc %{_docdir}/presto-%{version}/README %doc %{_docdir}/presto-%{version}/COPYING %files devel %defattr(-,root,root,-) %{_libdir}/libpresto.so %{_includedir}/presto/presto.h %{_includedir}/presto/functions.h %{_includedir}/presto/loadpng.h %doc %{_docdir}/presto-%{version}/examples/build %doc %{_docdir}/presto-%{version}/examples/test.c %doc %{_docdir}/presto-%{version}/examples/test.map %doc %{_docdir}/presto-%{version}/examples/clouds.map %doc %{_docdir}/presto-%{version}/examples/images/ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog * Mon Jul 21 2008 Peter Fernandes 0.1.3-4 - Fixed clean section * Thu Jul 03 2008 Peter Fernandes 0.1.3-3 - Updated build and install sections * Sat Jun 21 2008 Peter Fernandes 0.1.3-2 - Added missing requires to -devel package * Sat Jun 21 2008 Peter Fernandes 0.1.3-1 - Fixed problem with example program * Sat Jun 21 2008 Peter Fernandes 0.1.2-2 - Fixed 64-bit lib directory. Now using qmake-qt4. * Sat Jun 21 2008 Peter Fernandes 0.1.2-1 - Fixed problems linking with loadpng * Fri Jun 20 2008 Peter Fernandes 0.1.1-6 - No longer linking with Allegro during the build due to its non-PIC code * Fri Jun 20 2008 Peter Fernandes 0.1.1-5 - Fixed RPM errors * Thu Jun 19 2008 Peter Fernandes 0.1.1-4 - Fixed RPM errors * Thu Jun 19 2008 Peter Fernandes 0.1.1-3 - Fixed RPM errors * Thu Jun 19 2008 Peter Fernandes 0.1.1-2 - Fixed RPM errors * Thu Jun 19 2008 Peter Fernandes 0.1.1-1 - Stable, tile transparency working. * Mon Jun 16 2008 Peter Fernandes 0.0.1-1 - Created Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/presto/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:03:29 -0000 1.1 +++ .cvsignore 23 Jul 2008 02:15:24 -0000 1.2 @@ -0,0 +1 @@ +presto-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/presto/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:03:29 -0000 1.1 +++ sources 23 Jul 2008 02:15:24 -0000 1.2 @@ -0,0 +1 @@ +1956d7fb3f053d82c4a8d3e83e903922 presto-0.1.3.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 02:26:02 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Wed, 23 Jul 2008 02:26:02 GMT Subject: rpms/ytalk/devel ytalk.spec,1.25,1.26 Message-ID: <200807230226.m6N2Q2JE030731@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618 Modified Files: ytalk.spec Log Message: test change Index: ytalk.spec =================================================================== RCS file: /cvs/pkgs/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ytalk.spec 22 Jul 2008 17:40:14 -0000 1.25 +++ ytalk.spec 23 Jul 2008 02:25:09 -0000 1.26 @@ -1,5 +1,6 @@ Summary: A chat program for multiple users Name: ytalk + Version: 3.3.0 Release: 12%{?dist} License: GPLv2+ From fedora-extras-commits at redhat.com Wed Jul 23 02:28:53 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 02:28:53 GMT Subject: rpms/seahorse/devel .cvsignore, 1.13, 1.14 seahorse.spec, 1.42, 1.43 sources, 1.15, 1.16 Message-ID: <200807230228.m6N2Srsi031055@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/seahorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30906 Modified Files: .cvsignore seahorse.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 7 Apr 2008 04:30:56 -0000 1.13 +++ .cvsignore 23 Jul 2008 02:27:53 -0000 1.14 @@ -1 +1 @@ -seahorse-2.22.1.tar.bz2 +seahorse-2.23.5.tar.bz2 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- seahorse.spec 7 Apr 2008 04:30:56 -0000 1.42 +++ seahorse.spec 23 Jul 2008 02:27:53 -0000 1.43 @@ -1,5 +1,5 @@ Name: seahorse -Version: 2.22.1 +Version: 2.23.5 Release: 1%{?dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops @@ -7,7 +7,7 @@ # libcryptui is LGPLv2+ License: GPLv2+ and LGPLv2+ URL: http://seahorse.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.22/%{name}-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.23/%{name}-%{version}.tar.bz2 Source1: seahorse-agent.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,8 +46,6 @@ %prep %setup -q -sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in -sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am %build %configure --disable-scrollkeeper @@ -168,6 +166,9 @@ %changelog +* Tue Jul 22 2008 Matthias Clasen 2.23.5-1 +- Update to 2.23.5 + * Mon Apr 7 2008 Matthias Clasen 2.22.1-1 - Update to 2.22.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 7 Apr 2008 04:30:56 -0000 1.15 +++ sources 23 Jul 2008 02:27:53 -0000 1.16 @@ -1 +1 @@ -e0e409ab825c954b5937b8b115dd5118 seahorse-2.22.1.tar.bz2 +0ca5eeb803a87a01030bcb01364abead seahorse-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 02:31:16 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 02:31:16 GMT Subject: rpms/bug-buddy/devel bug-buddy.spec,1.98,1.99 Message-ID: <200807230231.m6N2VGxU031235@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/bug-buddy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31146 Modified Files: bug-buddy.spec Log Message: time for libtool 2 to reach Fedora ? Index: bug-buddy.spec =================================================================== RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- bug-buddy.spec 23 Jul 2008 02:08:09 -0000 1.98 +++ bug-buddy.spec 23 Jul 2008 02:30:31 -0000 1.99 @@ -43,6 +43,7 @@ BuildRequires: autoconf, automake, libtool, intltool BuildRequires: gnome-common BuildRequires: intltool +BuildRequires: libtool Requires: gdb Requires(preun): GConf2 >= %{gconf_version} @@ -63,6 +64,7 @@ %setup -q autoreconf +libtoolize --force --copy %build %configure --disable-scrollkeeper From fedora-extras-commits at redhat.com Wed Jul 23 02:45:46 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 02:45:46 GMT Subject: rpms/gnome-panel/devel .cvsignore, 1.79, 1.80 gnome-panel-launch-with-gio.patch, 1.2, 1.3 gnome-panel.spec, 1.309, 1.310 preferred-apps.patch, 1.6, 1.7 sources, 1.82, 1.83 Message-ID: <200807230245.m6N2jkl9032128@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32083 Modified Files: .cvsignore gnome-panel-launch-with-gio.patch gnome-panel.spec preferred-apps.patch sources Log Message: fix patches Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- .cvsignore 18 Jun 2008 18:01:32 -0000 1.79 +++ .cvsignore 23 Jul 2008 02:44:59 -0000 1.80 @@ -1 +1 @@ -gnome-panel-2.23.4.tar.bz2 +gnome-panel-2.23.5.tar.bz2 gnome-panel-launch-with-gio.patch: Index: gnome-panel-launch-with-gio.patch =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel-launch-with-gio.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-panel-launch-with-gio.patch 19 Jul 2008 01:57:55 -0000 1.2 +++ gnome-panel-launch-with-gio.patch 23 Jul 2008 02:44:59 -0000 1.3 @@ -1,15 +1,15 @@ -diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio gnome-panel-2.23.4/gnome-panel/panel-menu-items.c ---- gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-18 21:45:57.000000000 -0400 -+++ gnome-panel-2.23.4/gnome-panel/panel-menu-items.c 2008-07-18 21:52:41.000000000 -0400 +diff -up gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio gnome-panel-2.23.5/gnome-panel/panel-menu-items.c +--- gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-22 22:37:50.000000000 -0400 ++++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c 2008-07-22 22:39:01.000000000 -0400 @@ -41,6 +41,7 @@ #include #include +#include + #include #include - -@@ -98,6 +99,51 @@ struct _PanelDesktopMenuItemPrivate { +@@ -99,6 +100,51 @@ struct _PanelDesktopMenuItemPrivate { guint append_lock_logout : 1; }; @@ -61,7 +61,7 @@ static void activate_uri_on_screen (const char *path, GdkScreen *screen) -@@ -124,12 +170,28 @@ activate_uri_on_screen (const char *path +@@ -125,12 +171,28 @@ activate_uri_on_screen (const char *path command = g_strdup_printf ("nautilus --no-desktop %s", url); gdk_spawn_command_line_on_screen (screen, command, &error); @@ -93,9 +93,9 @@ char *primary; escaped = g_markup_escape_text (url, -1); primary = g_strdup_printf (_("Could not open location '%s'"), -diff -up gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c ---- gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-06-17 06:02:08.000000000 -0400 -+++ gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c 2008-07-18 21:45:57.000000000 -0400 +diff -up gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c +--- gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-07-22 17:50:58.000000000 -0400 ++++ gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c 2008-07-22 22:37:50.000000000 -0400 @@ -102,6 +102,18 @@ password_dialog_button_clicked (GtkDialo anon = gnome_password_dialog_anon_selected (gpd); g_mount_operation_set_anonymous (op, anon); Index: gnome-panel.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- gnome-panel.spec 19 Jul 2008 01:57:55 -0000 1.309 +++ gnome-panel.spec 23 Jul 2008 02:44:59 -0000 1.310 @@ -22,8 +22,8 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.23.4 -Release: 5%{?dist} +Version: 2.23.5 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2 @@ -119,9 +119,6 @@ Patch35: clock-wakeups.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=542257 -Patch47: icon-names.patch - Conflicts: gnome-power-manager < 2.15.3 %description @@ -171,7 +168,6 @@ %patch33 -p1 -b .use-gio %patch34 -p1 -b .launch-with-gio %patch35 -p1 -b .clock-wakeups -%patch47 -p1 -b .icon-names . %{SOURCE6} @@ -358,6 +354,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Fri Jul 18 2008 Matthias Clasen - 2.23.4-5 - Fix one more icon preferred-apps.patch: Index: preferred-apps.patch =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/preferred-apps.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- preferred-apps.patch 19 Jul 2008 01:57:55 -0000 1.6 +++ preferred-apps.patch 23 Jul 2008 02:44:59 -0000 1.7 @@ -1,15 +1,15 @@ -diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.c ---- gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps 2008-07-18 21:44:07.000000000 -0400 -+++ gnome-panel-2.23.4/gnome-panel/launcher.c 2008-07-18 21:44:51.000000000 -0400 +diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.c +--- gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps 2008-07-22 22:20:48.000000000 -0400 ++++ gnome-panel-2.23.5/gnome-panel/launcher.c 2008-07-22 22:36:59.000000000 -0400 @@ -23,6 +23,7 @@ #include #include #include +#include + #include #include - -@@ -42,6 +43,7 @@ +@@ -43,6 +44,7 @@ #include "panel-compatibility.h" #include "panel-ditem-editor.h" #include "panel-icon-names.h" @@ -17,7 +17,7 @@ static GdkScreen * launcher_get_screen (Launcher *launcher) -@@ -1297,3 +1299,173 @@ panel_launcher_set_dnd_enabled (Launcher +@@ -1300,3 +1302,173 @@ panel_launcher_set_dnd_enabled (Launcher } else gtk_drag_source_unset (launcher->button); } @@ -191,9 +191,9 @@ + filename, g_free, NULL); + } +} -diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.h ---- gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps 2008-07-18 21:44:07.000000000 -0400 -+++ gnome-panel-2.23.4/gnome-panel/launcher.h 2008-07-18 21:44:07.000000000 -0400 +diff -up gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.h +--- gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps 2008-07-22 22:20:48.000000000 -0400 ++++ gnome-panel-2.23.5/gnome-panel/launcher.h 2008-07-22 22:20:49.000000000 -0400 @@ -14,6 +14,8 @@ #include "applet.h" #include "panel-widget.h" @@ -211,9 +211,9 @@ G_END_DECLS -diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps gnome-panel-2.23.4/gnome-panel/main.c ---- gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps 2008-06-17 06:02:08.000000000 -0400 -+++ gnome-panel-2.23.4/gnome-panel/main.c 2008-07-18 21:44:07.000000000 -0400 +diff -up gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps gnome-panel-2.23.5/gnome-panel/main.c +--- gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps 2008-07-22 17:50:58.000000000 -0400 ++++ gnome-panel-2.23.5/gnome-panel/main.c 2008-07-22 22:20:49.000000000 -0400 @@ -28,6 +28,7 @@ #include "panel-action-protocol.h" #include "panel-lockdown.h" @@ -230,9 +230,9 @@ panel_global_config_load (); panel_lockdown_init (); panel_profile_load (); -diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c ---- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps 2008-06-17 06:02:08.000000000 -0400 -+++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c 2008-07-18 21:44:07.000000000 -0400 +diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c +--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps 2008-07-22 17:50:58.000000000 -0400 ++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c 2008-07-22 22:20:49.000000000 -0400 @@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree return list; } @@ -242,9 +242,9 @@ get_all_applications (void) { GMenuTree *tree; -diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h ---- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps 2008-06-17 06:02:08.000000000 -0400 -+++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h 2008-07-18 21:44:07.000000000 -0400 +diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h +--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps 2008-07-22 17:50:58.000000000 -0400 ++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h 2008-07-22 22:20:49.000000000 -0400 @@ -32,6 +32,8 @@ G_BEGIN_DECLS void panel_run_dialog_present (GdkScreen *screen, guint32 activate_time); Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- sources 18 Jun 2008 18:01:32 -0000 1.82 +++ sources 23 Jul 2008 02:44:59 -0000 1.83 @@ -1 +1 @@ -5fe8148c05a8dab63a08b7db3c5d9ab6 gnome-panel-2.23.4.tar.bz2 +075172fb7a72e8a35df50e99a5a826af gnome-panel-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 03:01:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:01:17 +0000 Subject: [pkgdb] python-jinja2 was added for thm Message-ID: <20080723030117.9AF0C1AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-jinja2 with summary General purpose template engine Kevin Fenzi (kevin) has approved Package python-jinja2 Kevin Fenzi (kevin) has added a Fedora devel branch for python-jinja2 with an owner of thm Kevin Fenzi (kevin) has approved python-jinja2 in Fedora devel Kevin Fenzi (kevin) has approved Package python-jinja2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-jinja2 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-jinja2 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-jinja2 (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on python-jinja2 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on python-jinja2 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on python-jinja2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja2 From fedora-extras-commits at redhat.com Wed Jul 23 03:01:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:01:22 +0000 Subject: [pkgdb] python-jinja2 (Fedora, 8) updated by kevin Message-ID: <20080723030123.BF6241AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-jinja2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-jinja2 (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-jinja2 (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-jinja2 (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-jinja2 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja2 From fedora-extras-commits at redhat.com Wed Jul 23 03:01:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:01:22 +0000 Subject: [pkgdb] python-jinja2 (Fedora, devel) updated by kevin Message-ID: <20080723030123.11A161AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-jinja2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja2 From fedora-extras-commits at redhat.com Wed Jul 23 03:01:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:01:22 +0000 Subject: [pkgdb] python-jinja2 (Fedora, 9) updated by kevin Message-ID: <20080723030124.733EE1AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-jinja2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-jinja2 (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-jinja2 (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-jinja2 (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-jinja2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja2 From fedora-extras-commits at redhat.com Wed Jul 23 03:01:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:01:58 GMT Subject: rpms/python-jinja2 - New directory Message-ID: <200807230301.m6N31wFf008005@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxi7938/rpms/python-jinja2 Log Message: Directory /cvs/extras/rpms/python-jinja2 added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:02:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:02:12 GMT Subject: rpms/python-jinja2/devel - New directory Message-ID: <200807230302.m6N32C14008036@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxi7938/rpms/python-jinja2/devel Log Message: Directory /cvs/extras/rpms/python-jinja2/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:02:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:02:27 GMT Subject: rpms/python-jinja2 Makefile,NONE,1.1 Message-ID: <200807230302.m6N32RcU008062@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxi7938/rpms/python-jinja2 Added Files: Makefile Log Message: Setup of module python-jinja2 --- NEW FILE Makefile --- # Top level Makefile for module python-jinja2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 03:02:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:02:46 GMT Subject: rpms/python-jinja2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807230302.m6N32kNo008085@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxi7938/rpms/python-jinja2/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-jinja2 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-jinja2 # $Id: Makefile,v 1.1 2008/07/23 03:02:27 kevin Exp $ NAME := python-jinja2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 03:03:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:03:16 +0000 Subject: [pkgdb] plexus-graph was added for lkundrak Message-ID: <20080723030317.1736C1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package plexus-graph with summary Graph data structures manipulation library Kevin Fenzi (kevin) has approved Package plexus-graph Kevin Fenzi (kevin) has added a Fedora devel branch for plexus-graph with an owner of lkundrak Kevin Fenzi (kevin) has approved plexus-graph in Fedora devel Kevin Fenzi (kevin) has approved Package plexus-graph Kevin Fenzi (kevin) has set commit to Approved for cvsextras on plexus-graph (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on plexus-graph (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on plexus-graph (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on plexus-graph (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on plexus-graph (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on plexus-graph (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/plexus-graph From fedora-extras-commits at redhat.com Wed Jul 23 03:03:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:03:17 +0000 Subject: [pkgdb] plexus-graph (Fedora EPEL, 5) updated by kevin Message-ID: <20080723030317.B1C151AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for plexus-graph Kevin Fenzi (kevin) has set commit to Approved for cvsextras on plexus-graph (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on plexus-graph (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on plexus-graph (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on plexus-graph (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/plexus-graph From fedora-extras-commits at redhat.com Wed Jul 23 03:03:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:03:17 +0000 Subject: [pkgdb] plexus-graph (Fedora, 9) updated by kevin Message-ID: <20080723030317.D86CF1AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for plexus-graph Kevin Fenzi (kevin) has set commit to Approved for cvsextras on plexus-graph (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on plexus-graph (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on plexus-graph (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on plexus-graph (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/plexus-graph From fedora-extras-commits at redhat.com Wed Jul 23 03:03:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:03:17 +0000 Subject: [pkgdb] plexus-graph (Fedora, devel) updated by kevin Message-ID: <20080723030318.61F6D1AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on plexus-graph (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/plexus-graph From fedora-extras-commits at redhat.com Wed Jul 23 03:04:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:04:09 GMT Subject: rpms/plexus-graph - New directory Message-ID: <200807230304.m6N349Nn008279@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/plexus-graph In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSV8247/rpms/plexus-graph Log Message: Directory /cvs/extras/rpms/plexus-graph added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:04:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:04:26 GMT Subject: rpms/plexus-graph/devel - New directory Message-ID: <200807230304.m6N34QPK008293@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/plexus-graph/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSV8247/rpms/plexus-graph/devel Log Message: Directory /cvs/extras/rpms/plexus-graph/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:04:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:04:39 GMT Subject: rpms/plexus-graph Makefile,NONE,1.1 Message-ID: <200807230304.m6N34dGs008321@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/plexus-graph In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSV8247/rpms/plexus-graph Added Files: Makefile Log Message: Setup of module plexus-graph --- NEW FILE Makefile --- # Top level Makefile for module plexus-graph all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 03:04:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:04:53 GMT Subject: rpms/plexus-graph/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807230304.m6N34rfI008339@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/plexus-graph/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSV8247/rpms/plexus-graph/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module plexus-graph --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: plexus-graph # $Id: Makefile,v 1.1 2008/07/23 03:04:39 kevin Exp $ NAME := plexus-graph SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 03:05:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:05:20 +0000 Subject: [pkgdb] perl-Text-CSV-Separator was added for lkundrak Message-ID: <20080723030520.D25B41AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Text-CSV-Separator with summary Determine the field separator of a CSV file Kevin Fenzi (kevin) has approved Package perl-Text-CSV-Separator Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Text-CSV-Separator with an owner of lkundrak Kevin Fenzi (kevin) has approved perl-Text-CSV-Separator in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Text-CSV-Separator Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Text-CSV-Separator (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Text-CSV-Separator (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Text-CSV-Separator (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-Text-CSV-Separator (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-Text-CSV-Separator (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-Text-CSV-Separator (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV-Separator From fedora-extras-commits at redhat.com Wed Jul 23 03:05:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:05:22 +0000 Subject: [pkgdb] perl-Text-CSV-Separator (Fedora, 8) updated by kevin Message-ID: <20080723030522.42F0F1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Text-CSV-Separator Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Text-CSV-Separator (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Text-CSV-Separator (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Text-CSV-Separator (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Text-CSV-Separator (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV-Separator From fedora-extras-commits at redhat.com Wed Jul 23 03:05:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:05:22 +0000 Subject: [pkgdb] perl-Text-CSV-Separator (Fedora, devel) updated by kevin Message-ID: <20080723030522.E87CA1AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Text-CSV-Separator (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV-Separator From fedora-extras-commits at redhat.com Wed Jul 23 03:05:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:05:22 +0000 Subject: [pkgdb] perl-Text-CSV-Separator (Fedora EPEL, 5) updated by kevin Message-ID: <20080723030522.86F081AD0E6@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Text-CSV-Separator Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Text-CSV-Separator (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Text-CSV-Separator (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Text-CSV-Separator (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Text-CSV-Separator (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV-Separator From fedora-extras-commits at redhat.com Wed Jul 23 03:05:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:05:22 +0000 Subject: [pkgdb] perl-Text-CSV-Separator (Fedora, 9) updated by kevin Message-ID: <20080723030522.55A5A1AD0E2@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Text-CSV-Separator Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Text-CSV-Separator (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Text-CSV-Separator (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Text-CSV-Separator (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Text-CSV-Separator (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CSV-Separator From fedora-extras-commits at redhat.com Wed Jul 23 03:05:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:05:56 GMT Subject: rpms/perl-Text-CSV-Separator - New directory Message-ID: <200807230305.m6N35uPL008557@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Text-CSV-Separator In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbd8504/rpms/perl-Text-CSV-Separator Log Message: Directory /cvs/extras/rpms/perl-Text-CSV-Separator added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:06:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:06:15 GMT Subject: rpms/perl-Text-CSV-Separator/devel - New directory Message-ID: <200807230306.m6N36Ff8008606@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Text-CSV-Separator/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbd8504/rpms/perl-Text-CSV-Separator/devel Log Message: Directory /cvs/extras/rpms/perl-Text-CSV-Separator/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:06:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:06:34 GMT Subject: rpms/perl-Text-CSV-Separator Makefile,NONE,1.1 Message-ID: <200807230306.m6N36YJj008673@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Text-CSV-Separator In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbd8504/rpms/perl-Text-CSV-Separator Added Files: Makefile Log Message: Setup of module perl-Text-CSV-Separator --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-CSV-Separator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 03:06:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:06:49 GMT Subject: rpms/perl-Text-CSV-Separator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807230306.m6N36nLZ008715@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Text-CSV-Separator/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbd8504/rpms/perl-Text-CSV-Separator/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-CSV-Separator --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Text-CSV-Separator # $Id: Makefile,v 1.1 2008/07/23 03:06:35 kevin Exp $ NAME := perl-Text-CSV-Separator SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 03:08:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:08:40 +0000 Subject: [pkgdb] packagekit-qt was added for tuxbrewr Message-ID: <20080723030840.D6B861AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package packagekit-qt with summary Qt interface for PackageKit Kevin Fenzi (kevin) has approved Package packagekit-qt Kevin Fenzi (kevin) has added a Fedora devel branch for packagekit-qt with an owner of tuxbrewr Kevin Fenzi (kevin) has approved packagekit-qt in Fedora devel Kevin Fenzi (kevin) has approved Package packagekit-qt Kevin Fenzi (kevin) has set commit to Approved for cvsextras on packagekit-qt (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on packagekit-qt (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on packagekit-qt (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on packagekit-qt (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on packagekit-qt (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on packagekit-qt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Wed Jul 23 03:08:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:08:41 +0000 Subject: [pkgdb] packagekit-qt (Fedora, devel) updated by kevin Message-ID: <20080723030841.376131AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on packagekit-qt (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchcommits on packagekit-qt (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchbugzilla on packagekit-qt (Fedora devel) for kkofler Kevin Fenzi (kevin) approved watchcommits on packagekit-qt (Fedora devel) for kkofler Kevin Fenzi (kevin) Approved cvsextras for commit access on packagekit-qt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Wed Jul 23 03:08:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 03:08:41 +0000 Subject: [pkgdb] packagekit-qt (Fedora, 9) updated by kevin Message-ID: <20080723030841.BC2831AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for packagekit-qt Kevin Fenzi (kevin) has set commit to Approved for cvsextras on packagekit-qt (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on packagekit-qt (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on packagekit-qt (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on packagekit-qt (Fedora 9) for rdieter Kevin Fenzi (kevin) approved watchcommits on packagekit-qt (Fedora 9) for rdieter Kevin Fenzi (kevin) approved watchbugzilla on packagekit-qt (Fedora 9) for kkofler Kevin Fenzi (kevin) approved watchcommits on packagekit-qt (Fedora 9) for kkofler Kevin Fenzi (kevin) Approved cvsextras for commit access on packagekit-qt (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Wed Jul 23 03:09:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:09:11 GMT Subject: rpms/packagekit-qt - New directory Message-ID: <200807230309.m6N39BbW009071@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/packagekit-qt In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLb9034/rpms/packagekit-qt Log Message: Directory /cvs/extras/rpms/packagekit-qt added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:09:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:09:23 GMT Subject: rpms/packagekit-qt/devel - New directory Message-ID: <200807230309.m6N39Na2009098@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/packagekit-qt/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLb9034/rpms/packagekit-qt/devel Log Message: Directory /cvs/extras/rpms/packagekit-qt/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 03:09:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:09:35 GMT Subject: rpms/packagekit-qt Makefile,NONE,1.1 Message-ID: <200807230309.m6N39Zc8009125@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/packagekit-qt In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLb9034/rpms/packagekit-qt Added Files: Makefile Log Message: Setup of module packagekit-qt --- NEW FILE Makefile --- # Top level Makefile for module packagekit-qt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 03:09:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 03:09:51 GMT Subject: rpms/packagekit-qt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807230309.m6N39pOB009166@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/packagekit-qt/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLb9034/rpms/packagekit-qt/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module packagekit-qt --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: packagekit-qt # $Id: Makefile,v 1.1 2008/07/23 03:09:35 kevin Exp $ NAME := packagekit-qt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 03:13:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 03:13:48 GMT Subject: rpms/epiphany/devel .cvsignore, 1.70, 1.71 epiphany.spec, 1.193, 1.194 sources, 1.73, 1.74 Message-ID: <200807230313.m6N3DmQx009620@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/epiphany/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9491 Modified Files: .cvsignore epiphany.spec sources Log Message: 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- .cvsignore 7 Apr 2008 16:45:32 -0000 1.70 +++ .cvsignore 23 Jul 2008 03:13:03 -0000 1.71 @@ -1 +1 @@ -epiphany-2.22.1.1.tar.bz2 +epiphany-2.23.5.tar.bz2 Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- epiphany.spec 17 Jul 2008 20:09:24 -0000 1.193 +++ epiphany.spec 23 Jul 2008 03:13:03 -0000 1.194 @@ -7,12 +7,12 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 2.22.2 -Release: 2%{?dist} +Version: 2.23.5 +Release: 1%{?dist} License: GPLv2+ and GFDL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ -Source0: http://download.gnome.org/sources/epiphany/2.22/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/epiphany/2.23/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): scrollkeeper @@ -211,6 +211,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + * Thu Jul 17 2008 Tom "spot" Callaway 2.22.2-2 - fix license tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/epiphany/devel/sources,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- sources 10 Jun 2008 14:17:03 -0000 1.73 +++ sources 23 Jul 2008 03:13:03 -0000 1.74 @@ -1 +1 @@ -f90dc0a01dae58dfa393b17bce717d3c epiphany-2.22.2.tar.bz2 +47ca7802e0dccd1c6ec92bda673a093e epiphany-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 03:40:42 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Wed, 23 Jul 2008 03:40:42 GMT Subject: rpms/mash/devel .cvsignore, 1.30, 1.31 mash.spec, 1.29, 1.30 sources, 1.32, 1.33 Message-ID: <200807230340.m6N3egb5012590@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/mash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12452 Modified Files: .cvsignore mash.spec sources Log Message: update to 0.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 16 May 2008 18:51:38 -0000 1.30 +++ .cvsignore 23 Jul 2008 03:39:56 -0000 1.31 @@ -1 +1 @@ -mash-0.3.7.tar.gz +mash-0.4.0.tar.gz Index: mash.spec =================================================================== RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mash.spec 16 May 2008 18:51:38 -0000 1.29 +++ mash.spec 23 Jul 2008 03:39:56 -0000 1.30 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.3.7 +Version: 0.4.0 Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools @@ -30,7 +30,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_bindir}/mash.py $RPM_BUILD_ROOT/%{_bindir}/mash - +mkdir -p $RPM_BUILD_ROOT/var/cache/mash %clean rm -rf $RPM_BUILD_ROOT @@ -41,8 +41,13 @@ %{python_sitelib}/mash* %{_bindir}/* %{_datadir}/mash +/var/cache/mash %changelog +* Tue Jul 22 2008 Bill Nottingham 0.4.0-1 +- add simple timestamping for profiling usage +- add support for caching non-local koji repositories + * Fri May 16 2008 Bill Nottingham 0.3.7-1 - add F9 updates configuration Index: sources =================================================================== RCS file: /cvs/extras/rpms/mash/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 16 May 2008 18:51:38 -0000 1.32 +++ sources 23 Jul 2008 03:39:56 -0000 1.33 @@ -1 +1 @@ -48ed5db73ff39139bd686e3c09635272 mash-0.3.7.tar.gz +1460910cb3b41a8381647dae926b5dfa mash-0.4.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 03:50:24 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 23 Jul 2008 03:50:24 GMT Subject: rpms/seahorse/devel seahorse.spec,1.43,1.44 Message-ID: <200807230350.m6N3oO7L013861@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/seahorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13688 Modified Files: seahorse.spec Log Message: Fix spec Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- seahorse.spec 23 Jul 2008 02:27:53 -0000 1.43 +++ seahorse.spec 23 Jul 2008 03:49:32 -0000 1.44 @@ -12,14 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: gedit-devel BuildRequires: gettext BuildRequires: gpgme-devel >= 1.0 BuildRequires: gnupg BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel BuildRequires: scrollkeeper -BuildRequires: nautilus-devel BuildRequires: libsoup-devel BuildRequires: openldap-devel BuildRequires: gnome-panel-devel @@ -30,7 +28,6 @@ BuildRequires: gnome-keyring-devel BuildRequires: avahi-devel BuildRequires: avahi-glib-devel -BuildRequires: chrpath Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -63,7 +60,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -%find_lang seahorse +%find_lang seahorse --with-gnome # get rid of the cryptui-devel stuff until we figure out whast do with it later rm -rf ${RPM_BUILD_ROOT}/usr/include/libcryptui @@ -71,25 +68,6 @@ rm -rf ${RPM_BUILD_ROOT}/usr/lib64/pkgconfig/cryptui-0.0.pc rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcryptui.so -# Nuke rpath -for f in %{_bindir}/seahorse{,-preferences,-tool,-daemon,-agent} \ - %{_libdir}/seahorse/seahorse-{ssh-askpass,applet} \ - %{_libdir}/gedit-2/plugins/libseahorse-pgp.so; do - chrpath --delete $RPM_BUILD_ROOT${f} -done - -rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications -desktop-file-install --vendor fedora --delete-original \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop - -desktop-file-install --vendor fedora --delete-original \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop - desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category GNOME \ @@ -143,25 +121,13 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/*.desktop -%dir %{_datadir}/gnome/help/%{name} -%{_datadir}/gnome/help/%{name}/* -%{_datadir}/gnome/help/%{name}-applet/* -%{_datadir}/mime/packages/* %{_datadir}/icons/* -%dir %{_datadir}/omf/%{name} -%{_datadir}/omf/%{name}/* -%dir %{_datadir}/omf/%{name}-applet -%{_datadir}/omf/%{name}-applet/* %{_datadir}/pixmaps/* %{_mandir}/man1/*.gz %dir %{_libdir}/seahorse %{_libdir}/seahorse/* -%{_datadir}/gnome-2.0/ui/GNOME_SeahorseApplet.xml %{_libdir}/libcryptui* -%{_libdir}/gedit-2/plugins/* -%{_libdir}/nautilus/extensions-2.0/libnautilus-seahorse.so %config(noreplace) %{_sysconfdir}/gconf/schemas/* -%{_libdir}/bonobo/servers/GNOME_SeahorseApplet.server %{_datadir}/dbus-1/services/org.gnome.seahorse.service From fedora-extras-commits at redhat.com Wed Jul 23 04:08:18 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 23 Jul 2008 04:08:18 GMT Subject: rpms/gnome-commander/devel .cvsignore, 1.8, 1.9 gnome-commander.spec, 1.22, 1.23 sources, 1.8, 1.9 Message-ID: <200807230408.m6N48IfT022469@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22366 Modified Files: .cvsignore gnome-commander.spec sources Log Message: * Wed Jul 23 2008 Mamoru Tasaka - rev 1901 - Previous workaround removed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 13 Jul 2008 18:05:38 -0000 1.8 +++ .cvsignore 23 Jul 2008 04:07:31 -0000 1.9 @@ -1 +1 @@ -gnome-commander-1.2.7-svn1874_trunk.tar.bz2 +gnome-commander-1.2.7-svn1901_trunk.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnome-commander.spec 13 Jul 2008 18:05:38 -0000 1.22 +++ gnome-commander.spec 23 Jul 2008 04:07:31 -0000 1.23 @@ -11,7 +11,7 @@ %define use_autotool 0 %define if_pre 1 %define main_release 1 -%define extratag svn1874_trunk +%define extratag svn1901_trunk %if 0%{?if_pre} > 0 %define use_autotool 1 @@ -30,7 +30,7 @@ License: GPLv2+ URL: http://www.nongnu.org/gcmd/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2 -Patch0: gnome-commander-rev1874-hexmode-display.patch +#Patch0: gnome-commander-rev1874-hexmode-display.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -93,7 +93,7 @@ %prep %setup -q -n %{name}-%{version}%{?extratag:-%extratag} -%patch0 -p0 -b .hexdumpmode +#%%patch0 -p0 -b .hexdumpmode %if 0%{use_autotool} > 0 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh sh autogen.sh @@ -161,6 +161,10 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 23 2008 Mamoru Tasaka +- rev 1901 +- Previous workaround removed + * Mon Jul 14 2008 Mamoru Tasaka - rev 1874 - Workaround for Decimal offset mode in Hexdump display mode Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 13 Jul 2008 18:05:38 -0000 1.8 +++ sources 23 Jul 2008 04:07:31 -0000 1.9 @@ -1 +1 @@ -b8dfb30331a73ce16d0d92427aa05186 gnome-commander-1.2.7-svn1874_trunk.tar.bz2 +7b58a771b7a006a118d2fa5338eb42ad gnome-commander-1.2.7-svn1901_trunk.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 04:15:27 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:15:27 GMT Subject: rpms/dnssec-tools/devel .cvsignore, 1.6, 1.7 dnssec-tools.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200807230415.m6N4FR34023133@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23102 Modified Files: .cvsignore dnssec-tools.spec sources Log Message: update to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Jun 2008 23:40:10 -0000 1.6 +++ .cvsignore 23 Jul 2008 04:14:37 -0000 1.7 @@ -1,4 +1 @@ -dnssec-tools-1.3.tar.gz -dnssec-tools-1.3.1.tar.gz -dnssec-tools-1.3.2.tar.gz -dnssec-tools-1.4.tar.gz +dnssec-tools-1.4.1.tar.gz Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/devel/dnssec-tools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dnssec-tools.spec 18 Jun 2008 23:40:10 -0000 1.16 +++ dnssec-tools.spec 23 Jul 2008 04:14:37 -0000 1.17 @@ -1,6 +1,6 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools -Version: 1.4 +Version: 1.4.1 Release: 1%{?dist} License: BSD Group: System Environment/Base Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Jun 2008 23:40:10 -0000 1.7 +++ sources 23 Jul 2008 04:14:37 -0000 1.8 @@ -1,4 +1 @@ -955c76719de2a58a243aa19475d55378 dnssec-tools-1.3.tar.gz -3b5ff8d80199ed2fe4f9e1822fbf3f5d dnssec-tools-1.3.1.tar.gz -1c4e0f4599783eaba03a14bc2cdd43aa dnssec-tools-1.3.2.tar.gz -af9039bdfdd00ee7d4fa7127ee89e7a0 dnssec-tools-1.4.tar.gz +a47cf335e43139476695191fcb005aad dnssec-tools-1.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 04:19:19 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:19:19 GMT Subject: rpms/dnssec-tools/F-7 .cvsignore, 1.5, 1.6 dnssec-tools.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807230419.m6N4JJvb023506@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23417 Modified Files: .cvsignore dnssec-tools.spec sources Log Message: update to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-7/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Feb 2008 23:02:22 -0000 1.5 +++ .cvsignore 23 Jul 2008 04:18:34 -0000 1.6 @@ -1,3 +1 @@ -dnssec-tools-1.3.tar.gz -dnssec-tools-1.3.1.tar.gz -dnssec-tools-1.3.2.tar.gz +dnssec-tools-1.4.1.tar.gz Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-7/dnssec-tools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dnssec-tools.spec 15 Feb 2008 23:02:22 -0000 1.9 +++ dnssec-tools.spec 23 Jul 2008 04:18:34 -0000 1.10 @@ -1,8 +1,8 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools -Version: 1.3.2 +Version: 1.4.1 Release: 1%{?dist} -License: BSD-like +License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz @@ -13,8 +13,7 @@ # the tools do run time tests for their existence. But most of the tools # are much more useful with the modules in place, so we hand require them. Requires: perl(Net::DNS), perl(Net::DNS::SEC), dnssec-tools-perlmods, bind -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Getopt::GUI::Long) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: openssl-devel BuildRequires: perl(Test) perl(ExtUtils::MakeMaker) @@ -139,6 +138,9 @@ %{_datadir}/dnssec-tools/validator-testcases %{_bindir}/getaddr %{_bindir}/gethost +%{_bindir}/getname +%{_bindir}/getquery +%{_bindir}/getrrset %{_bindir}/trustman %{_bindir}/blinkenlights @@ -148,6 +150,7 @@ %{_bindir}/signset-editor %{_bindir}/rollrec-editor +%{_mandir}/man1/dnssec-tools.1.gz %{_mandir}/man1/dnspktflow.1.gz %{_mandir}/man1/donuts.1.gz %{_mandir}/man1/donutsd.1.gz @@ -162,6 +165,9 @@ %{_mandir}/man1/validate.1.gz %{_mandir}/man1/getaddr.1.gz %{_mandir}/man1/gethost.1.gz +%{_mandir}/man1/getname.1.gz +%{_mandir}/man1/getquery.1.gz +%{_mandir}/man1/getrrset.1.gz %{_mandir}/man1/zonesigner.1.gz %{_mandir}/man1/dtconfchk.1.gz @@ -230,9 +236,11 @@ %{_bindir}/libval-config* %{_mandir}/man3/libval.3.gz +%{_mandir}/man3/libval_shim.3.gz +%{_mandir}/man3/val_free_answer_chain.3.gz +%{_mandir}/man3/val_get_rrset.3.gz %{_mandir}/man3/val_getaddrinfo.3.gz %{_mandir}/man3/val_gethostbyname.3.gz -%{_mandir}/man3/val_query.3.gz %{_mandir}/man3/dnsval.conf.3.gz %{_mandir}/man3/dnsval_conf_get.3.gz %{_mandir}/man3/dnsval_conf_set.3.gz @@ -263,8 +271,17 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Tue May 27 2008 Wes Hardaker - 1.4.rc1-1 +- Update to upstream 1.4 + +* Thu Mar 06 2008 Tom "spot" Callaway - 1.3.2-2 +Rebuild for new perl + * Fri Feb 15 2008 Wes Hardaker - 1.3.2-1 -- Update to upstream 1.3.2 from a bad 1.3.1 release +- Jump to upstream to grab latest identical fixes + +* Fri Feb 15 2008 Wes Hardaker - 1.3.1-2 +- Fix top level makefile for bulid dirs * Fri Feb 15 2008 Wes Hardaker - 1.3.1-1 - Update to 1.3.1 to fix: @@ -273,13 +290,12 @@ - Small fixes with donuts - Small fixes with the ZoneFile::Fast parser -* Wed Jan 9 2008 Wes Hardaker - 1.3-7 -- require Getopt::GUI::Long now that it's in the repositories -- patch to fix donuts --help-* switches - -* Mon Jan 7 2008 Wes Hardaker - 1.3-6 +* Mon Jan 7 2008 Wes Hardaker - 1.3-7 - Fix donuts hard-coded rules path +* Fri Dec 07 2007 Release Engineering - 1.3-6 +- Rebuild for deps + * Tue Nov 27 2007 Wes Hardaker - 1.3-5 - Added a libval-config wrapper to get around a multi-arch issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-7/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Feb 2008 23:02:22 -0000 1.5 +++ sources 23 Jul 2008 04:18:34 -0000 1.6 @@ -1,3 +1 @@ -955c76719de2a58a243aa19475d55378 dnssec-tools-1.3.tar.gz -3b5ff8d80199ed2fe4f9e1822fbf3f5d dnssec-tools-1.3.1.tar.gz -1c4e0f4599783eaba03a14bc2cdd43aa dnssec-tools-1.3.2.tar.gz +a47cf335e43139476695191fcb005aad dnssec-tools-1.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 04:20:09 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:20:09 GMT Subject: rpms/dnssec-tools/F-8 .cvsignore, 1.6, 1.7 dnssec-tools.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200807230420.m6N4K9JV023595@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23517 Modified Files: .cvsignore dnssec-tools.spec sources Log Message: update to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Jun 2008 23:46:23 -0000 1.6 +++ .cvsignore 23 Jul 2008 04:19:22 -0000 1.7 @@ -1 +1 @@ -dnssec-tools-1.4.tar.gz +dnssec-tools-1.4.1.tar.gz Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-8/dnssec-tools.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dnssec-tools.spec 18 Jun 2008 23:46:23 -0000 1.13 +++ dnssec-tools.spec 23 Jul 2008 04:19:22 -0000 1.14 @@ -1,6 +1,6 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools -Version: 1.4 +Version: 1.4.1 Release: 1%{?dist} License: BSD Group: System Environment/Base Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Jun 2008 23:46:23 -0000 1.6 +++ sources 23 Jul 2008 04:19:22 -0000 1.7 @@ -1 +1 @@ -af9039bdfdd00ee7d4fa7127ee89e7a0 dnssec-tools-1.4.tar.gz +a47cf335e43139476695191fcb005aad dnssec-tools-1.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 04:21:02 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:21:02 GMT Subject: rpms/dnssec-tools/F-9 .cvsignore, 1.6, 1.7 dnssec-tools.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200807230421.m6N4L2Y3023706@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23603 Modified Files: .cvsignore dnssec-tools.spec sources Log Message: update to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Jun 2008 23:42:30 -0000 1.6 +++ .cvsignore 23 Jul 2008 04:20:11 -0000 1.7 @@ -1 +1 @@ -dnssec-tools-1.4.tar.gz +dnssec-tools-1.4.1.tar.gz Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-9/dnssec-tools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dnssec-tools.spec 18 Jun 2008 23:42:30 -0000 1.16 +++ dnssec-tools.spec 23 Jul 2008 04:20:11 -0000 1.17 @@ -1,6 +1,6 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools -Version: 1.4 +Version: 1.4.1 Release: 1%{?dist} License: BSD Group: System Environment/Base Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Jun 2008 23:42:30 -0000 1.7 +++ sources 23 Jul 2008 04:20:11 -0000 1.8 @@ -1 +1 @@ -af9039bdfdd00ee7d4fa7127ee89e7a0 dnssec-tools-1.4.tar.gz +a47cf335e43139476695191fcb005aad dnssec-tools-1.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 04:25:49 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:25:49 GMT Subject: rpms/dnssec-tools/F-7 dnssec-tools.spec,1.10,1.11 Message-ID: <200807230425.m6N4PnbQ024079@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24056 Modified Files: dnssec-tools.spec Log Message: added change log message Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-7/dnssec-tools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dnssec-tools.spec 23 Jul 2008 04:18:34 -0000 1.10 +++ dnssec-tools.spec 23 Jul 2008 04:25:02 -0000 1.11 @@ -1,7 +1,7 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ @@ -271,6 +271,15 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-2 +- Added missing log message for security release + +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-1 +- Update to upstream 1.4.1 which fixes the random port issue being + broadcast about every resolver known to man including this one; note + that DNSSEC itself will actually protect against the attack but + libval is vulnerable to non-DNSSEC-protected zones without this fix. + * Tue May 27 2008 Wes Hardaker - 1.4.rc1-1 - Update to upstream 1.4 From fedora-extras-commits at redhat.com Wed Jul 23 04:26:44 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:26:44 GMT Subject: rpms/dnssec-tools/F-8 dnssec-tools.spec,1.14,1.15 Message-ID: <200807230426.m6N4Qi4d024157@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24085 Modified Files: dnssec-tools.spec Log Message: added change log message Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-8/dnssec-tools.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dnssec-tools.spec 23 Jul 2008 04:19:22 -0000 1.14 +++ dnssec-tools.spec 23 Jul 2008 04:25:50 -0000 1.15 @@ -1,7 +1,7 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ @@ -271,6 +271,15 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-2 +- Added missing log message for security release + +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-1 +- Update to upstream 1.4.1 which fixes the random port issue being + broadcast about every resolver known to man including this one; note + that DNSSEC itself will actually protect against the attack but + libval is vulnerable to non-DNSSEC-protected zones without this fix. + * Tue May 27 2008 Wes Hardaker - 1.4.rc1-1 - Update to upstream 1.4 From fedora-extras-commits at redhat.com Wed Jul 23 04:27:31 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:27:31 GMT Subject: rpms/dnssec-tools/F-9 dnssec-tools.spec,1.17,1.18 Message-ID: <200807230427.m6N4RVAZ024234@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24163 Modified Files: dnssec-tools.spec Log Message: added change log message Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-9/dnssec-tools.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dnssec-tools.spec 23 Jul 2008 04:20:11 -0000 1.17 +++ dnssec-tools.spec 23 Jul 2008 04:26:46 -0000 1.18 @@ -1,7 +1,7 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ @@ -271,6 +271,15 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-2 +- Added missing log message for security release + +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-1 +- Update to upstream 1.4.1 which fixes the random port issue being + broadcast about every resolver known to man including this one; note + that DNSSEC itself will actually protect against the attack but + libval is vulnerable to non-DNSSEC-protected zones without this fix. + * Tue May 27 2008 Wes Hardaker - 1.4.rc1-1 - Update to upstream 1.4 From fedora-extras-commits at redhat.com Wed Jul 23 04:28:20 2008 From: fedora-extras-commits at redhat.com (Wes Hardaker (hardaker)) Date: Wed, 23 Jul 2008 04:28:20 GMT Subject: rpms/dnssec-tools/devel dnssec-tools.spec,1.17,1.18 Message-ID: <200807230428.m6N4SKvo024325@cvs-int.fedora.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24240 Modified Files: dnssec-tools.spec Log Message: added change log message Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/devel/dnssec-tools.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dnssec-tools.spec 23 Jul 2008 04:14:37 -0000 1.17 +++ dnssec-tools.spec 23 Jul 2008 04:27:33 -0000 1.18 @@ -1,7 +1,7 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ @@ -271,6 +271,15 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-2 +- Added missing log message for security release + +* Tue Jul 22 2008 Wes Hardaker - 1.4.1-1 +- Update to upstream 1.4.1 which fixes the random port issue being + broadcast about every resolver known to man including this one; note + that DNSSEC itself will actually protect against the attack but + libval is vulnerable to non-DNSSEC-protected zones without this fix. + * Tue May 27 2008 Wes Hardaker - 1.4.rc1-1 - Update to upstream 1.4 From fedora-extras-commits at redhat.com Wed Jul 23 05:00:21 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 23 Jul 2008 05:00:21 GMT Subject: rpms/xulrunner/devel xulrunner-mozconfig, 1.21, 1.22 xulrunner.spec, 1.130, 1.131 Message-ID: <200807230500.m6N50LHK026674@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26588 Modified Files: xulrunner-mozconfig xulrunner.spec Log Message: * Wed Jul 23 2008 Christopher Aillon 1.9.0.1-2 - Disable system hunspell for now as it's causing some crashes (447444) Index: xulrunner-mozconfig =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xulrunner-mozconfig 18 Jul 2008 17:23:55 -0000 1.21 +++ xulrunner-mozconfig 23 Jul 2008 04:59:37 -0000 1.22 @@ -9,7 +9,7 @@ ac_add_options --with-system-bz2 #ac_add_options --with-system-png ac_add_options --enable-system-lcms -ac_add_options --enable-system-hunspell +#ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --with-pthreads ac_add_options --disable-strip Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- xulrunner.spec 18 Jul 2008 22:25:35 -0000 1.130 +++ xulrunner.spec 23 Jul 2008 04:59:37 -0000 1.131 @@ -8,7 +8,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.0.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -380,6 +380,9 @@ #--------------------------------------------------------------------- %changelog +* Wed Jul 23 2008 Christopher Aillon 1.9.0.1-2 +- Disable system hunspell for now as it's causing some crashes (447444) + * Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 - Update to 1.9.0.1 From fedora-extras-commits at redhat.com Wed Jul 23 05:49:29 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 23 Jul 2008 05:49:29 GMT Subject: rpms/crossfire/devel crossfire.te,1.2,1.3 Message-ID: <200807230549.m6N5nTW7004441@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4370 Modified Files: crossfire.te Log Message: Fix sock_file perms Index: crossfire.te =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/crossfire.te,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- crossfire.te 18 Jul 2007 04:12:57 -0000 1.2 +++ crossfire.te 23 Jul 2008 05:48:39 -0000 1.3 @@ -55,14 +55,14 @@ # pid file allow crossfire_t crossfire_var_run_t:file manage_file_perms; -allow crossfire_t crossfire_var_run_t:sock_file manage_file_perms; +allow crossfire_t crossfire_var_run_t:sock_file manage_sock_file_perms; allow crossfire_t crossfire_var_run_t:dir rw_dir_perms; files_pid_filetrans(crossfire_t,crossfire_var_run_t, { file sock_file }) # log files allow crossfire_t crossfire_var_log_t:file create_file_perms; allow crossfire_t crossfire_var_log_t:file append; -allow crossfire_t crossfire_var_log_t:sock_file create_file_perms; +allow crossfire_t crossfire_var_log_t:sock_file create_sock_file_perms; allow crossfire_t crossfire_var_log_t:dir { rw_dir_perms setattr }; logging_log_filetrans(crossfire_t,crossfire_var_log_t,{ sock_file file dir }) From fedora-extras-commits at redhat.com Wed Jul 23 06:05:53 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Wed, 23 Jul 2008 06:05:53 GMT Subject: rpms/nginx/devel .cvsignore, 1.17, 1.18 nginx.spec, 1.24, 1.25 sources, 1.17, 1.18 nginx-auto-install.patch, 1.2, NONE nginx-auto-options.patch, 1.1, NONE Message-ID: <200807230605.m6N65rxH012223@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/nginx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12118 Modified Files: .cvsignore nginx.spec sources Removed Files: nginx-auto-install.patch nginx-auto-options.patch Log Message: update to 0.6.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 May 2008 04:06:38 -0000 1.17 +++ .cvsignore 23 Jul 2008 06:05:05 -0000 1.18 @@ -1 +1 @@ -nginx-0.6.31.tar.gz +nginx-0.6.32.tar.gz Index: nginx.spec =================================================================== RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- nginx.spec 27 May 2008 04:43:49 -0000 1.24 +++ nginx.spec 23 Jul 2008 06:05:05 -0000 1.25 @@ -8,8 +8,8 @@ %define nginx_webroot %{nginx_datadir}/html Name: nginx -Version: 0.6.31 -Release: 2%{?dist} +Version: 0.6.32 +Release: 1%{?dist} Summary: Robust, small and high performance http and reverse proxy server Group: System Environment/Daemons @@ -47,14 +47,9 @@ # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors. Patch0: nginx-auto-cc-gcc.patch -# nginx has its own configure/build scripts. These patches allow nginx -# to install into a buildroot. -Patch1: nginx-auto-options.patch -Patch2: nginx-auto-install.patch - # configuration patch to match all the Fedora paths for logs, pid files # etc. -Patch3: nginx-conf.patch +Patch1: nginx-conf.patch %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 @@ -68,8 +63,6 @@ %patch0 -p0 %patch1 -p0 -%patch2 -p0 -%patch3 -p0 %{__tar} zxvf %{SOURCE5} %build @@ -190,14 +183,18 @@ %changelog -* Mon May 26 2008 Jeremy Hinegardner - 0.6.31-2 +* Tue Jul 22 2008 Jeremy Hinegardner - 0.6.32-1 +- update to 0.6.32 +- nginx now supports DESTDIR so removed the patches that enabled it + +* Mon May 26 2008 Jeremy Hinegardner - 0.6.31-3 - init script fixes - resolve 'listen 80 default' [#447873] -* Mon May 12 2008 Jeremy Hinegardner - 0.6.31-1 +* Mon May 12 2008 Jeremy Hinegardner - 0.6.31-2 - update to 0.6.31 -* Sun May 11 2008 Jeremy Hinegardner - 0.6.30-1 +* Sun May 11 2008 Jeremy Hinegardner - 0.6.30-2 - upate to new upstream stable branch 0.6 - added 3rd party module nginx-upstream-fair - added default webpages Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 May 2008 04:06:38 -0000 1.17 +++ sources 23 Jul 2008 06:05:05 -0000 1.18 @@ -1 +1 @@ -824bcc25bbd5b636f182237b69227bd2 nginx-0.6.31.tar.gz +c09a2ace3c91f45dabbb608b11e48ed1 nginx-0.6.32.tar.gz --- nginx-auto-install.patch DELETED --- --- nginx-auto-options.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 06:19:39 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 23 Jul 2008 06:19:39 GMT Subject: rpms/perl-HTML-Parser/EL-4 dead.package,NONE,1.1 Message-ID: <200807230619.m6N6JdeT013203@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-HTML-Parser/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13185 Added Files: dead.package Log Message: The package is already in RHEL branches. --- NEW FILE dead.package --- The package is already in RHEL branches. From fedora-extras-commits at redhat.com Wed Jul 23 06:20:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 23 Jul 2008 06:20:18 GMT Subject: rpms/perl-HTML-Parser/EL-5 dead.package,NONE,1.1 Message-ID: <200807230620.m6N6KINw013277@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-HTML-Parser/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13235 Added Files: dead.package Log Message: The package is already in RHEL branches. --- NEW FILE dead.package --- The package is already in RHEL branches. From fedora-extras-commits at redhat.com Wed Jul 23 06:24:14 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 23 Jul 2008 06:24:14 GMT Subject: rpms/perl-XML-Grove/devel test.patch, NONE, 1.1 perl-XML-Grove.spec, 1.18, 1.19 Message-ID: <200807230624.m6N6OEOW013584@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-XML-Grove/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13504 Modified Files: perl-XML-Grove.spec Added Files: test.patch Log Message: * Tue Jul 22 2008 Marcela Maslanova - 0.46alpha-33 - use utf8 in test -> all are passing test.patch: --- NEW FILE test.patch --- diff -up XML-Grove-0.46alpha/t/grove.t.old XML-Grove-0.46alpha/t/grove.t --- XML-Grove-0.46alpha/t/grove.t.old 2008-07-22 14:47:27.000000000 +0200 +++ XML-Grove-0.46alpha/t/grove.t 2008-07-22 14:46:42.000000000 +0200 @@ -13,6 +13,7 @@ use XML::Parser::PerlSAX; use XML::Grove::Builder; use XML::Grove::AsString; use XML::Grove::AsCanonXML; +use utf8; $loaded = 1; print "ok 1\n"; Index: perl-XML-Grove.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Grove/devel/perl-XML-Grove.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-XML-Grove.spec 20 Jul 2008 22:22:32 -0000 1.18 +++ perl-XML-Grove.spec 23 Jul 2008 06:23:29 -0000 1.19 @@ -1,12 +1,13 @@ Name: perl-XML-Grove Version: 0.46alpha -Release: 32%{?dist} +Release: 33%{?dist} Summary: Simple access to infoset of parsed XML, HTML, or SGML instances Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/XML-Grove/ Source0: http://www.cpan.org/authors/id/K/KM/KMACLEOD/XML-Grove-%{version}.tar.bz2 +Patch1: test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,7 +24,7 @@ %prep %setup -q -n XML-Grove-%{version} - +%patch1 -p1 -b .test %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -54,6 +55,9 @@ %changelog +* Tue Jul 22 2008 Marcela Maslanova - 0.46alpha-33 +- use utf8 in test -> all are passing + * Sun Jul 20 2008 Tom "spot" Callaway - 0.46alpha-32 - fix license tag with upstream confirmation see: http://perl-xml.cvs.sourceforge.net/perl-xml/XML-Grove/COPYING?revision=1.2&view=markup From fedora-extras-commits at redhat.com Wed Jul 23 06:27:56 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:27:56 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk.spec,1.23,1.24 Message-ID: <200807230627.m6N6Ru0h013911@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13826 Modified Files: java-1.6.0-openjdk.spec Log Message: Specify vendor for javaws desktop entry Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- java-1.6.0-openjdk.spec 22 Jul 2008 12:20:58 -0000 1.23 +++ java-1.6.0-openjdk.spec 23 Jul 2008 06:27:12 -0000 1.24 @@ -108,7 +108,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.14.%{openjdkver}%{?dist} +Release: 0.14.%{openjdkver}%{?dist}.1 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -484,7 +484,7 @@ # Install javaws desktop file. install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps -desktop-file-install \ +desktop-file-install --vendor=fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop # Find JRE directories. @@ -864,6 +864,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.14.b11.1 +- Specify vendor for javaws desktop entry + * Tue Jul 22 2008 Lillian Angel - 1:1.6.0-0.14.b11 - Added rhino as a build requirement. From fedora-extras-commits at redhat.com Wed Jul 23 06:30:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:30:58 +0000 Subject: [pkgdb] xorg-x11-server: whot has requested watchcommits Message-ID: <20080723063058.6EF091AD0E1@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the watchcommits acl on xorg-x11-server (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Wed Jul 23 06:31:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:31:01 +0000 Subject: [pkgdb] xorg-x11-server: whot has requested commit Message-ID: <20080723063101.559611AD0E1@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the commit acl on xorg-x11-server (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Wed Jul 23 06:31:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:31:17 +0000 Subject: [pkgdb] xorg-x11-server: whot has requested commit Message-ID: <20080723063117.31EC71AD0E1@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the commit acl on xorg-x11-server (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Wed Jul 23 06:31:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:31:18 +0000 Subject: [pkgdb] xorg-x11-server: whot has requested watchcommits Message-ID: <20080723063119.7A4731AD0DD@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the watchcommits acl on xorg-x11-server (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Wed Jul 23 06:31:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:31:54 +0000 Subject: [pkgdb] synaptics: whot has requested watchcommits Message-ID: <20080723063154.60FF51AD0E0@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the watchcommits acl on synaptics (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/synaptics From fedora-extras-commits at redhat.com Wed Jul 23 06:31:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:31:55 +0000 Subject: [pkgdb] synaptics: whot has requested commit Message-ID: <20080723063155.387A41AD0E0@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the commit acl on synaptics (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/synaptics From fedora-extras-commits at redhat.com Wed Jul 23 06:32:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:32:05 +0000 Subject: [pkgdb] synaptics: whot has requested commit Message-ID: <20080723063205.C1D9C1AD0E0@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the commit acl on synaptics (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/synaptics From fedora-extras-commits at redhat.com Wed Jul 23 06:32:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 06:32:11 +0000 Subject: [pkgdb] synaptics: whot has requested watchcommits Message-ID: <20080723063211.5E7791AD0E0@bastion.fedora.phx.redhat.com> Peter Hutterer (whot) has requested the watchcommits acl on synaptics (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/synaptics From fedora-extras-commits at redhat.com Wed Jul 23 06:33:58 2008 From: fedora-extras-commits at redhat.com (Kushal Das (kushal)) Date: Wed, 23 Jul 2008 06:33:58 GMT Subject: rpms/pem/F-8 pem.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807230633.m6N6Xwnk014447@cvs-int.fedora.redhat.com> Author: kushal Update of /cvs/pkgs/rpms/pem/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14343 Modified Files: pem.spec sources Log Message: New release Index: pem.spec =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-8/pem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pem.spec 16 Jun 2008 18:36:36 -0000 1.1 +++ pem.spec 23 Jul 2008 06:33:09 -0000 1.2 @@ -1,6 +1,6 @@ Name: pem -Version: 0.7.1 -Release: 4%{?dist} +Version: 0.7.2 +Release: 3%{?dist} Summary: Personal Expenses Manager Group: Applications/Productivity @@ -32,7 +32,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT @@ -55,6 +55,15 @@ %changelog +* Mon Jul 21 2008 Kushal Das - 0.7.2-3 +- Bumping the release + +* Mon Jul 21 2008 Kushal Das - 0.7.2-2 +- Fixing Info dir problem + +* Wed Jul 2 2008 Kushal Das - 0.7.2-1 +- New release of pem + * Sun May 4 2008 Kushal Das - 0.7.1-4 - Fixed the description Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Jun 2008 18:33:46 -0000 1.2 +++ sources 23 Jul 2008 06:33:09 -0000 1.3 @@ -1 +1 @@ -5ea6f0167641c50ab6cb0482e8aeca96 pem-0.7.1.tar.gz +d575366fd6a2118262abd1e9b400b519 pem-0.7.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 06:40:53 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:40:53 GMT Subject: rpms/plexus-graph/devel plexus-graph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230640.m6N6errn015026@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/plexus-graph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14933 Modified Files: .cvsignore sources Added Files: plexus-graph.spec Log Message: Initial import --- NEW FILE plexus-graph.spec --- # TODO: junit QA tests %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: plexus-graph Version: 0.13.1 Release: 1%{?dist} Summary: Graph data structures manipulation library Group: Development/Libraries License: CPL URL: http://plexus.sourceforge.net/ Source0: http://download.sourceforge.net/plexus/plexus-src-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: log4j commons-collections java jpackage-utils BuildRequires: %{requires} ant java-devel %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description Plexus is a Java library with specifications and implementations for generic graph data structures. Like the Java Collections Framework, vertices and edges are containers for arbitrary user-defined objects. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q %build CLASSPATH=$(build-classpath commons-collections log4j) ant dist javadoc %install rm -rf $RPM_BUILD_ROOT # Directory structure install -d $RPM_BUILD_ROOT%{_javadir} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} # JARs and JavaDoc install -m 644 build/dist/plexus-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -rp doc/javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name} # GCJ AOT bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %postun %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %doc CHANGELOG LICENSE README %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) - 0.13.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:04:39 -0000 1.1 +++ .cvsignore 23 Jul 2008 06:40:03 -0000 1.2 @@ -0,0 +1 @@ +plexus-src-0.13.1.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:04:39 -0000 1.1 +++ sources 23 Jul 2008 06:40:03 -0000 1.2 @@ -0,0 +1 @@ +a2fc4002dcdb63cc66038bfe7f5753c6 plexus-src-0.13.1.tgz From fedora-extras-commits at redhat.com Wed Jul 23 06:41:16 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:41:16 GMT Subject: rpms/perl-Text-CSV-Separator/devel import.log, NONE, 1.1 perl-Text-CSV-Separator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230641.m6N6fGr3015054@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV-Separator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14972/devel Modified Files: .cvsignore sources Added Files: import.log perl-Text-CSV-Separator.spec Log Message: Initial import --- NEW FILE import.log --- perl-Text-CSV-Separator-0_19-1_el5:HEAD:perl-Text-CSV-Separator-0.19-1.el5.src.rpm:1216795198 --- NEW FILE perl-Text-CSV-Separator.spec --- Name: perl-Text-CSV-Separator Version: 0.19 Release: 1%{?dist} Summary: Determine the field separator of a CSV file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-CSV-Separator/ Source0: http://www.cpan.org/authors/id/E/EN/ENELL/Text-CSV-Separator-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a fast detection of the field separator character (also called field delimiter) of a CSV file, or more generally, of a character separated text file (also called delimited text file), and returns it ready to use in a CSV parser (e.g., Text::CSV_XS, Tie::CSV_File, or Text::CSV::Simple). %prep %setup -q -n Text-CSV-Separator-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 02 2008 Lubomir Rintel (Good Data) 0.19-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:06:35 -0000 1.1 +++ .cvsignore 23 Jul 2008 06:40:27 -0000 1.2 @@ -0,0 +1 @@ +Text-CSV-Separator-0.19.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:06:35 -0000 1.1 +++ sources 23 Jul 2008 06:40:27 -0000 1.2 @@ -0,0 +1 @@ +94b9f58042747b8b7cdfe52feffdd22b Text-CSV-Separator-0.19.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 06:44:11 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:44:11 GMT Subject: rpms/plexus-graph/F-9 import.log, NONE, 1.1 plexus-graph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230644.m6N6iBaS015324@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/plexus-graph/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15246/F-9 Modified Files: .cvsignore sources Added Files: import.log plexus-graph.spec Log Message: Initial import --- NEW FILE import.log --- plexus-graph-0_13_1-1_fc10:F-9:plexus-graph-0.13.1-1.fc10.src.rpm:1216795384 --- NEW FILE plexus-graph.spec --- # TODO: junit QA tests %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: plexus-graph Version: 0.13.1 Release: 1%{?dist} Summary: Graph data structures manipulation library Group: Development/Libraries License: CPL URL: http://plexus.sourceforge.net/ Source0: http://download.sourceforge.net/plexus/plexus-src-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: log4j commons-collections java jpackage-utils BuildRequires: %{requires} ant java-devel %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description Plexus is a Java library with specifications and implementations for generic graph data structures. Like the Java Collections Framework, vertices and edges are containers for arbitrary user-defined objects. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q %build CLASSPATH=$(build-classpath commons-collections log4j) ant dist javadoc %install rm -rf $RPM_BUILD_ROOT # Directory structure install -d $RPM_BUILD_ROOT%{_javadir} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} # JARs and JavaDoc install -m 644 build/dist/plexus-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -rp doc/javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name} # GCJ AOT bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %postun %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %doc CHANGELOG LICENSE README %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) - 0.13.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:04:39 -0000 1.1 +++ .cvsignore 23 Jul 2008 06:43:28 -0000 1.2 @@ -0,0 +1 @@ +plexus-src-0.13.1.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:04:39 -0000 1.1 +++ sources 23 Jul 2008 06:43:28 -0000 1.2 @@ -0,0 +1 @@ +a2fc4002dcdb63cc66038bfe7f5753c6 plexus-src-0.13.1.tgz From fedora-extras-commits at redhat.com Wed Jul 23 06:45:38 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:45:38 GMT Subject: rpms/perl-Text-CSV-Separator/F-9 import.log, NONE, 1.1 perl-Text-CSV-Separator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230645.m6N6jcca015492@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15415/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Text-CSV-Separator.spec Log Message: Initial import --- NEW FILE import.log --- perl-Text-CSV-Separator-0_19-1_el5:F-9:perl-Text-CSV-Separator-0.19-1.el5.src.rpm:1216795493 --- NEW FILE perl-Text-CSV-Separator.spec --- Name: perl-Text-CSV-Separator Version: 0.19 Release: 1%{?dist} Summary: Determine the field separator of a CSV file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-CSV-Separator/ Source0: http://www.cpan.org/authors/id/E/EN/ENELL/Text-CSV-Separator-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a fast detection of the field separator character (also called field delimiter) of a CSV file, or more generally, of a character separated text file (also called delimited text file), and returns it ready to use in a CSV parser (e.g., Text::CSV_XS, Tie::CSV_File, or Text::CSV::Simple). %prep %setup -q -n Text-CSV-Separator-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 02 2008 Lubomir Rintel (Good Data) 0.19-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:06:35 -0000 1.1 +++ .cvsignore 23 Jul 2008 06:44:53 -0000 1.2 @@ -0,0 +1 @@ +Text-CSV-Separator-0.19.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:06:35 -0000 1.1 +++ sources 23 Jul 2008 06:44:53 -0000 1.2 @@ -0,0 +1 @@ +94b9f58042747b8b7cdfe52feffdd22b Text-CSV-Separator-0.19.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 06:51:14 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:51:14 GMT Subject: rpms/perl-Text-CSV-Separator/F-8 import.log, NONE, 1.1 perl-Text-CSV-Separator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230651.m6N6pEmS016028@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15942/F-8 Modified Files: .cvsignore sources Added Files: import.log perl-Text-CSV-Separator.spec Log Message: Initial import --- NEW FILE import.log --- perl-Text-CSV-Separator-0_19-1_el5:F-8:perl-Text-CSV-Separator-0.19-1.el5.src.rpm:1216795772 --- NEW FILE perl-Text-CSV-Separator.spec --- Name: perl-Text-CSV-Separator Version: 0.19 Release: 1%{?dist} Summary: Determine the field separator of a CSV file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-CSV-Separator/ Source0: http://www.cpan.org/authors/id/E/EN/ENELL/Text-CSV-Separator-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a fast detection of the field separator character (also called field delimiter) of a CSV file, or more generally, of a character separated text file (also called delimited text file), and returns it ready to use in a CSV parser (e.g., Text::CSV_XS, Tie::CSV_File, or Text::CSV::Simple). %prep %setup -q -n Text-CSV-Separator-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 02 2008 Lubomir Rintel (Good Data) 0.19-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:06:35 -0000 1.1 +++ .cvsignore 23 Jul 2008 06:50:28 -0000 1.2 @@ -0,0 +1 @@ +Text-CSV-Separator-0.19.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:06:35 -0000 1.1 +++ sources 23 Jul 2008 06:50:28 -0000 1.2 @@ -0,0 +1 @@ +94b9f58042747b8b7cdfe52feffdd22b Text-CSV-Separator-0.19.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 06:51:23 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:51:23 GMT Subject: rpms/plexus-graph/EL-5 import.log, NONE, 1.1 plexus-graph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230651.m6N6pNe5016037@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/plexus-graph/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15960/EL-5 Modified Files: .cvsignore sources Added Files: import.log plexus-graph.spec Log Message: Initial import --- NEW FILE import.log --- plexus-graph-0_13_1-1_fc10:EL-5:plexus-graph-0.13.1-1.fc10.src.rpm:1216795713 --- NEW FILE plexus-graph.spec --- # TODO: junit QA tests %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: plexus-graph Version: 0.13.1 Release: 1%{?dist} Summary: Graph data structures manipulation library Group: Development/Libraries License: CPL URL: http://plexus.sourceforge.net/ Source0: http://download.sourceforge.net/plexus/plexus-src-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: log4j commons-collections java jpackage-utils BuildRequires: %{requires} ant java-devel %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description Plexus is a Java library with specifications and implementations for generic graph data structures. Like the Java Collections Framework, vertices and edges are containers for arbitrary user-defined objects. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q %build CLASSPATH=$(build-classpath commons-collections log4j) ant dist javadoc %install rm -rf $RPM_BUILD_ROOT # Directory structure install -d $RPM_BUILD_ROOT%{_javadir} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} # JARs and JavaDoc install -m 644 build/dist/plexus-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -rp doc/javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name} # GCJ AOT bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %post %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %postun %if %{with_gcj} [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %doc CHANGELOG LICENSE README %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) - 0.13.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:04:39 -0000 1.1 +++ .cvsignore 23 Jul 2008 06:50:34 -0000 1.2 @@ -0,0 +1 @@ +plexus-src-0.13.1.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:04:39 -0000 1.1 +++ sources 23 Jul 2008 06:50:34 -0000 1.2 @@ -0,0 +1 @@ +a2fc4002dcdb63cc66038bfe7f5753c6 plexus-src-0.13.1.tgz From fedora-extras-commits at redhat.com Wed Jul 23 06:55:00 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 06:55:00 GMT Subject: rpms/perl-Text-CSV-Separator/EL-5 import.log, NONE, 1.1 perl-Text-CSV-Separator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807230655.m6N6t0oY016412@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV-Separator/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16350/EL-5 Modified Files: .cvsignore sources Added Files: import.log perl-Text-CSV-Separator.spec Log Message: Initial import --- NEW FILE import.log --- perl-Text-CSV-Separator-0_19-1_el5:EL-5:perl-Text-CSV-Separator-0.19-1.el5.src.rpm:1216796015 --- NEW FILE perl-Text-CSV-Separator.spec --- Name: perl-Text-CSV-Separator Version: 0.19 Release: 1%{?dist} Summary: Determine the field separator of a CSV file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-CSV-Separator/ Source0: http://www.cpan.org/authors/id/E/EN/ENELL/Text-CSV-Separator-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a fast detection of the field separator character (also called field delimiter) of a CSV file, or more generally, of a character separated text file (also called delimited text file), and returns it ready to use in a CSV parser (e.g., Text::CSV_XS, Tie::CSV_File, or Text::CSV::Simple). %prep %setup -q -n Text-CSV-Separator-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 02 2008 Lubomir Rintel (Good Data) 0.19-1 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:06:35 -0000 1.1 +++ .cvsignore 23 Jul 2008 06:54:15 -0000 1.2 @@ -0,0 +1 @@ +Text-CSV-Separator-0.19.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:06:35 -0000 1.1 +++ sources 23 Jul 2008 06:54:15 -0000 1.2 @@ -0,0 +1 @@ +94b9f58042747b8b7cdfe52feffdd22b Text-CSV-Separator-0.19.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 06:57:55 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 23 Jul 2008 06:57:55 GMT Subject: rpms/perl-Config-Record/devel .cvsignore, 1.3, 1.4 perl-Config-Record.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200807230657.m6N6vtTG016757@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Config-Record/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16677 Modified Files: .cvsignore perl-Config-Record.spec sources Log Message: * Wed Jul 23 2008 Ralf Cors??pius - 1.1.2-1 - Upstream update. - Minor spec cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2006 01:12:37 -0000 1.3 +++ .cvsignore 23 Jul 2008 06:56:58 -0000 1.4 @@ -1 +1 @@ -Config-Record-1.1.1.tar.gz +Config-Record-1.1.2.tar.gz Index: perl-Config-Record.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/devel/perl-Config-Record.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Config-Record.spec 6 Mar 2008 18:25:19 -0000 1.10 +++ perl-Config-Record.spec 23 Jul 2008 06:56:58 -0000 1.11 @@ -1,12 +1,12 @@ Name: perl-Config-Record -Version: 1.1.1 -Release: 4%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Perl module for Configuration file access Group: Development/Libraries License: GPLv2+ URL: http://search.cpan.org/dist/Config-Record/ -Source: http://www.cpan.org/authors/id/D/DA/DANBERR/Config-Record-1.1.1.tar.gz +Source: http://www.cpan.org/authors/id/D/DA/DANBERR/Config-Record-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -14,8 +14,12 @@ BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%description +# for improved tests +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) + +%description Config::Record provides a module for loading configuration records. It supports scalar, array and hash parameters nested to an arbitrary depth. @@ -52,6 +56,10 @@ %{_mandir}/man3/*.3pm* %changelog +* Wed Jul 23 2008 Ralf Cors??pius - 1.1.2-1 +- Upstream update. +- Minor spec cleanup. + * Thu Mar 6 2008 Tom "spot" Callaway 1.1.1-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2006 01:12:37 -0000 1.3 +++ sources 23 Jul 2008 06:56:58 -0000 1.4 @@ -1 +1 @@ -d5170d92989313a8b5f0ceac3aa829ef Config-Record-1.1.1.tar.gz +3958d3b5221ddf65ba3143d28e0cd4e0 Config-Record-1.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 07:01:04 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 23 Jul 2008 07:01:04 GMT Subject: rpms/perl-Config-Record/F-9 .cvsignore, 1.3, 1.4 perl-Config-Record.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200807230701.m6N714kC021032@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Config-Record/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16997 Modified Files: .cvsignore perl-Config-Record.spec sources Log Message: * Wed Jul 23 2008 Ralf Cors??pius - 1.1.2-1 - Upstream update. - Minor spec cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2006 01:12:37 -0000 1.3 +++ .cvsignore 23 Jul 2008 07:00:11 -0000 1.4 @@ -1 +1 @@ -Config-Record-1.1.1.tar.gz +Config-Record-1.1.2.tar.gz Index: perl-Config-Record.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/F-9/perl-Config-Record.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Config-Record.spec 6 Mar 2008 18:25:19 -0000 1.10 +++ perl-Config-Record.spec 23 Jul 2008 07:00:11 -0000 1.11 @@ -1,12 +1,12 @@ Name: perl-Config-Record -Version: 1.1.1 -Release: 4%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Perl module for Configuration file access Group: Development/Libraries License: GPLv2+ URL: http://search.cpan.org/dist/Config-Record/ -Source: http://www.cpan.org/authors/id/D/DA/DANBERR/Config-Record-1.1.1.tar.gz +Source: http://www.cpan.org/authors/id/D/DA/DANBERR/Config-Record-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -14,8 +14,12 @@ BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%description +# for improved tests +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) + +%description Config::Record provides a module for loading configuration records. It supports scalar, array and hash parameters nested to an arbitrary depth. @@ -52,6 +56,10 @@ %{_mandir}/man3/*.3pm* %changelog +* Wed Jul 23 2008 Ralf Cors??pius - 1.1.2-1 +- Upstream update. +- Minor spec cleanup. + * Thu Mar 6 2008 Tom "spot" Callaway 1.1.1-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2006 01:12:37 -0000 1.3 +++ sources 23 Jul 2008 07:00:11 -0000 1.4 @@ -1 +1 @@ -d5170d92989313a8b5f0ceac3aa829ef Config-Record-1.1.1.tar.gz +3958d3b5221ddf65ba3143d28e0cd4e0 Config-Record-1.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 07:02:50 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 07:02:50 GMT Subject: rpms/plexus-graph/devel plexus-graph.spec,1.1,1.2 Message-ID: <200807230702.m6N72oBf023877@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/plexus-graph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803 Modified Files: plexus-graph.spec Log Message: fix setup Index: plexus-graph.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/devel/plexus-graph.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plexus-graph.spec 23 Jul 2008 06:40:03 -0000 1.1 +++ plexus-graph.spec 23 Jul 2008 07:02:06 -0000 1.2 @@ -41,7 +41,7 @@ %prep -%setup -q +%setup -q -n plexus-%{version} %build From fedora-extras-commits at redhat.com Wed Jul 23 07:03:31 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 23 Jul 2008 07:03:31 GMT Subject: rpms/perl-Config-Record/F-8 .cvsignore, 1.3, 1.4 perl-Config-Record.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200807230703.m6N73VEO024006@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Config-Record/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23857 Modified Files: .cvsignore perl-Config-Record.spec sources Log Message: * Wed Jul 23 2008 Ralf Cors??pius - 1.1.2-1 - Upstream update. - Minor spec cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2006 01:12:37 -0000 1.3 +++ .cvsignore 23 Jul 2008 07:02:40 -0000 1.4 @@ -1 +1 @@ -Config-Record-1.1.1.tar.gz +Config-Record-1.1.2.tar.gz Index: perl-Config-Record.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/F-8/perl-Config-Record.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Config-Record.spec 15 Oct 2007 20:18:09 -0000 1.9 +++ perl-Config-Record.spec 23 Jul 2008 07:02:40 -0000 1.10 @@ -1,12 +1,12 @@ Name: perl-Config-Record -Version: 1.1.1 -Release: 3%{?dist}.2 +Version: 1.1.2 +Release: 1%{?dist} Summary: Perl module for Configuration file access Group: Development/Libraries License: GPLv2+ URL: http://search.cpan.org/dist/Config-Record/ -Source: http://www.cpan.org/authors/id/D/DA/DANBERR/Config-Record-1.1.1.tar.gz +Source: http://www.cpan.org/authors/id/D/DA/DANBERR/Config-Record-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -14,8 +14,12 @@ BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%description +# for improved tests +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) + +%description Config::Record provides a module for loading configuration records. It supports scalar, array and hash parameters nested to an arbitrary depth. @@ -52,6 +56,13 @@ %{_mandir}/man3/*.3pm* %changelog +* Wed Jul 23 2008 Ralf Cors??pius - 1.1.2-1 +- Upstream update. +- Minor spec cleanup. + +* Thu Mar 6 2008 Tom "spot" Callaway 1.1.1-4 +- rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.1.1-3.2 - add BR: perl(Test::More) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2006 01:12:37 -0000 1.3 +++ sources 23 Jul 2008 07:02:40 -0000 1.4 @@ -1 +1 @@ -d5170d92989313a8b5f0ceac3aa829ef Config-Record-1.1.1.tar.gz +3958d3b5221ddf65ba3143d28e0cd4e0 Config-Record-1.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 07:04:43 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 07:04:43 GMT Subject: rpms/plexus-graph/EL-5 plexus-graph.spec,1.1,1.2 Message-ID: <200807230704.m6N74hJ7024124@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/plexus-graph/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24030 Modified Files: plexus-graph.spec Log Message: fix setup Index: plexus-graph.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/EL-5/plexus-graph.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plexus-graph.spec 23 Jul 2008 06:50:34 -0000 1.1 +++ plexus-graph.spec 23 Jul 2008 07:03:58 -0000 1.2 @@ -41,7 +41,7 @@ %prep -%setup -q +%setup -q -n plexus-%{version} %build From fedora-extras-commits at redhat.com Wed Jul 23 07:04:57 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 07:04:57 GMT Subject: rpms/plexus-graph/F-9 plexus-graph.spec,1.1,1.2 Message-ID: <200807230704.m6N74vEa024152@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/plexus-graph/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24041 Modified Files: plexus-graph.spec Log Message: fix setup Index: plexus-graph.spec =================================================================== RCS file: /cvs/pkgs/rpms/plexus-graph/F-9/plexus-graph.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plexus-graph.spec 23 Jul 2008 06:43:28 -0000 1.1 +++ plexus-graph.spec 23 Jul 2008 07:04:08 -0000 1.2 @@ -41,7 +41,7 @@ %prep -%setup -q +%setup -q -n plexus-%{version} %build From fedora-extras-commits at redhat.com Wed Jul 23 07:19:34 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 07:19:34 GMT Subject: rpms/perl-Text-CSV-Separator/devel perl-Text-CSV-Separator.spec, 1.1, 1.2 Message-ID: <200807230719.m6N7JYXX025354@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV-Separator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25262 Modified Files: perl-Text-CSV-Separator.spec Log Message: add missing BR Index: perl-Text-CSV-Separator.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/devel/perl-Text-CSV-Separator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-CSV-Separator.spec 23 Jul 2008 06:40:27 -0000 1.1 +++ perl-Text-CSV-Separator.spec 23 Jul 2008 07:18:49 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Text-CSV-Separator Version: 0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Determine the field separator of a CSV file License: GPL+ or Artistic Group: Development/Libraries @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -56,5 +57,8 @@ %changelog +* Wed Jul 23 2008 Lubomir Rintel (Good Data) 0.19-2 +- Add missing BR + * Wed Jul 02 2008 Lubomir Rintel (Good Data) 0.19-1 - Specfile autogenerated by cpanspec 1.75. From fedora-extras-commits at redhat.com Wed Jul 23 07:19:39 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 07:19:39 GMT Subject: rpms/perl-Text-CSV-Separator/F-8 perl-Text-CSV-Separator.spec, 1.1, 1.2 Message-ID: <200807230719.m6N7JdHU025365@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25277 Modified Files: perl-Text-CSV-Separator.spec Log Message: add missing BR Index: perl-Text-CSV-Separator.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/F-8/perl-Text-CSV-Separator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-CSV-Separator.spec 23 Jul 2008 06:50:28 -0000 1.1 +++ perl-Text-CSV-Separator.spec 23 Jul 2008 07:18:55 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Text-CSV-Separator Version: 0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Determine the field separator of a CSV file License: GPL+ or Artistic Group: Development/Libraries @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -56,5 +57,8 @@ %changelog +* Wed Jul 23 2008 Lubomir Rintel (Good Data) 0.19-2 +- Add missing BR + * Wed Jul 02 2008 Lubomir Rintel (Good Data) 0.19-1 - Specfile autogenerated by cpanspec 1.75. From fedora-extras-commits at redhat.com Wed Jul 23 07:41:08 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 23 Jul 2008 07:41:08 GMT Subject: rpms/libsigc++20/F-8 libsigc++.spec,1.13,1.14 Message-ID: <200807230741.m6N7f8Sd026326@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/libsigc++20/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26234 Modified Files: libsigc++.spec Log Message: typo fix Index: libsigc++.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsigc++20/F-8/libsigc++.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libsigc++.spec 14 Sep 2007 12:17:36 -0000 1.13 +++ libsigc++.spec 23 Jul 2008 07:40:10 -0000 1.14 @@ -3,7 +3,6 @@ Release: 1 Summary: Typesafe signal framework for C++ - Group: System Environment/Libraries License: LGPLv2+ URL: http://libsigc.sourceforge.net/ @@ -20,18 +19,20 @@ widget set, %name is now a separate library to provide for more general use. It is the most complete library of its kind with the ability to connect an abstract callback to a class method, function, or function object. It -contains adaptor classes for connection of dissimilar callbacks and has an +contains adapter classes for connection of dissimilar callbacks and has an ease of use unmatched by other C++ callback libraries. Package GTK-- (gtkmm), which is a C++ binding to the GTK+ library, starting with version 1.1.2, uses %name. + %package devel Summary: Development tools for the typesafe signal framework for C++ Group: Development/Libraries Requires: %name = %{version}-%{release} Requires: pkgconfig + %description devel The %name-devel package contains the static libraries and header files needed for development with %name. @@ -53,17 +54,15 @@ %{__mkdir} docs-to-include %{__mv} ${RPM_BUILD_ROOT}%{_docdir}/libsigc-2.0/* docs-to-include/ + %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig - +%postun -p /sbin/ldconfig %files @@ -71,6 +70,7 @@ %doc AUTHORS COPYING README NEWS ChangeLog TODO %{_libdir}/*.so.* + %files devel %defattr(-,root,root,-) %doc docs-to-include/* @@ -80,6 +80,7 @@ %{?_with_static: %{_libdir}/*.a} %{_libdir}/*.so + %changelog * Fri Sep 14 2007 Denis Leroy - 2.0.18-1 - Update to 2.0.18 From fedora-extras-commits at redhat.com Wed Jul 23 07:41:13 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 07:41:13 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk.spec,1.24,1.25 Message-ID: <200807230741.m6N7fDrR026333@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26266 Modified Files: java-1.6.0-openjdk.spec Log Message: do not change the desktop entry file name Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- java-1.6.0-openjdk.spec 23 Jul 2008 06:27:12 -0000 1.24 +++ java-1.6.0-openjdk.spec 23 Jul 2008 07:40:29 -0000 1.25 @@ -477,7 +477,7 @@ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png done for e in jconsole policytool ; do - desktop-file-install --vendor=fedora --mode=644 \ + desktop-file-install --vendor='' --mode=644 \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop done From fedora-extras-commits at redhat.com Wed Jul 23 07:50:18 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 23 Jul 2008 07:50:18 GMT Subject: rpms/glibmm24/F-9 .cvsignore, 1.28, 1.29 glibmm.spec, 1.39, 1.40 sources, 1.29, 1.30 Message-ID: <200807230750.m6N7oIcc026721@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glibmm24/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26660 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to upstream 2.16.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/F-9/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 4 Jun 2008 08:04:48 -0000 1.28 +++ .cvsignore 23 Jul 2008 07:49:27 -0000 1.29 @@ -1 +1 @@ -glibmm-2.16.2.tar.bz2 +glibmm-2.16.4.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/F-9/glibmm.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- glibmm.spec 4 Jun 2008 08:04:48 -0000 1.39 +++ glibmm.spec 23 Jul 2008 07:49:27 -0000 1.40 @@ -1,5 +1,5 @@ Name: glibmm24 -Version: 2.16.2 +Version: 2.16.4 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -83,6 +83,9 @@ %changelog +* Wed Jul 23 2008 Denis Leroy - 2.16.4-1 +- Update to upstream 2.16.4 + * Wed Jun 4 2008 Denis Leroy - 2.16.2-1 - Update to upstream 2.16.2, #449849 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/F-9/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 4 Jun 2008 08:04:48 -0000 1.29 +++ sources 23 Jul 2008 07:49:27 -0000 1.30 @@ -1 +1 @@ -408054366f0acc01014f4c4af2304da5 glibmm-2.16.2.tar.bz2 +fe2e91fa93759ffc812e80ca50ace233 glibmm-2.16.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 07:51:17 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 23 Jul 2008 07:51:17 GMT Subject: rpms/glibmm24/devel .cvsignore, 1.29, 1.30 glibmm.spec, 1.40, 1.41 sources, 1.30, 1.31 Message-ID: <200807230751.m6N7pHoV026810@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26761 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to upstream 2.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 4 Jul 2008 13:53:17 -0000 1.29 +++ .cvsignore 23 Jul 2008 07:50:25 -0000 1.30 @@ -1 +1 @@ -glibmm-2.17.0.tar.bz2 +glibmm-2.17.1.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- glibmm.spec 4 Jul 2008 13:53:17 -0000 1.40 +++ glibmm.spec 23 Jul 2008 07:50:25 -0000 1.41 @@ -1,5 +1,5 @@ Name: glibmm24 -Version: 2.17.0 +Version: 2.17.1 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -83,7 +83,10 @@ %changelog -* Thu Jul 3 2008 Denis Leroy - 2.17.0-1 +* Wed Jul 23 2008 Denis Leroy - 2.17.1-1 +- Update to upstream 2.17.1 + +* Thu Jul 3 2008 Denis Leroy - 2.17.0-1 - Update to unstable branch 2.17 * Sat May 17 2008 Denis Leroy - 2.16.2-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 4 Jul 2008 13:53:17 -0000 1.30 +++ sources 23 Jul 2008 07:50:25 -0000 1.31 @@ -1 +1 @@ -aad7cf751100f83c021eded677092ccd glibmm-2.17.0.tar.bz2 +37582537af902260c87c04798a36e5b0 glibmm-2.17.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 08:02:57 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 23 Jul 2008 08:02:57 GMT Subject: rpms/gtkmm24/devel .cvsignore, 1.25, 1.26 gtkmm.spec, 1.38, 1.39 sources, 1.27, 1.28 Message-ID: <200807230802.m6N82v22001381@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/gtkmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1320 Modified Files: .cvsignore gtkmm.spec sources Log Message: Update to upstream 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 4 Jul 2008 14:24:33 -0000 1.25 +++ .cvsignore 23 Jul 2008 08:01:53 -0000 1.26 @@ -1 +1 @@ -gtkmm-2.13.1.tar.bz2 +gtkmm-2.13.4.tar.bz2 Index: gtkmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gtkmm.spec 4 Jul 2008 14:24:33 -0000 1.38 +++ gtkmm.spec 23 Jul 2008 08:01:53 -0000 1.39 @@ -1,5 +1,5 @@ Name: gtkmm24 -Version: 2.13.1 +Version: 2.13.4 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -13,7 +13,7 @@ BuildRequires: glibmm24-devel >= 2.16.0 BuildRequires: atk-devel >= 1.9.0 BuildRequires: pango-devel >= 1.5.2 -BuildRequires: gtk2-devel >= 2.13.0 +BuildRequires: gtk2-devel >= 2.13.4 BuildRequires: cairomm-devel >= 1.2.2 @@ -109,6 +109,9 @@ %changelog +* Wed Jul 23 2008 Denis Leroy - 2.13.4-1 +- Update to upstream 2.13.4 + * Fri Jul 4 2008 Denis Leroy - 2.13.1-1 - Update to version 2.13.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 Jul 2008 14:24:33 -0000 1.27 +++ sources 23 Jul 2008 08:01:53 -0000 1.28 @@ -1 +1 @@ -1ce65accc81286bf4913defb60498fc9 gtkmm-2.13.1.tar.bz2 +bdd481cc0a3f7918e5db5bb72efc6b6f gtkmm-2.13.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 08:40:48 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Wed, 23 Jul 2008 08:40:48 GMT Subject: rpms/mailman/devel mailman-2.1.11-cron.patch, NONE, 1.1 mailman-2.1.11-fhsinit.patch, NONE, 1.1 mailman-2.1.11-lctype.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 mailman.spec, 1.70, 1.71 sources, 1.17, 1.18 mailman-2.1.10-LC_CTYPE.patch, 1.1, NONE mailman-2.1.10-cron.patch, 1.1, NONE mailman-2.1.9-init-retval.patch, 1.1, NONE Message-ID: <200807230840.m6N8emfM003169@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/mailman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3126 Modified Files: .cvsignore mailman.spec sources Added Files: mailman-2.1.11-cron.patch mailman-2.1.11-fhsinit.patch mailman-2.1.11-lctype.patch Removed Files: mailman-2.1.10-LC_CTYPE.patch mailman-2.1.10-cron.patch mailman-2.1.9-init-retval.patch Log Message: * Tue Jul 22 2008 Tomas Smetana - 3:2.1.11-1 - new upstream version - fix #246978 - FHS compliant initscript mailman-2.1.11-cron.patch: --- NEW FILE mailman-2.1.11-cron.patch --- diff -up mailman-2.1.11/misc/mailman.in.cron mailman-2.1.11/misc/mailman.in --- mailman-2.1.11/misc/mailman.in.cron 2008-07-22 08:55:18.000000000 +0200 +++ mailman-2.1.11/misc/mailman.in 2008-07-22 08:55:18.000000000 +0200 @@ -24,18 +24,48 @@ # On Debian, type "update-rc.d mailman defaults" # On RedHat, and derivatives, install with "chkconfig --add mailman" # -# chkconfig: 2345 98 12 +# chkconfig: - 98 12 # description: Mailman is the GNU Mailing List Manager, a program that \ # manages electronic mail discussion groups. For more \ # on GNU Mailman see http://www.list.org # processname: mailmanctl # config: @prefix@/Mailman/mm_cfg.py -# pidfile: @prefix@/data/master-qrunner.pid +# pidfile: @PID_DIR@/master-qrunner.pid PYTHON=@PYTHON@ MAILMANHOME=@prefix@ MAILMANCTL=$MAILMANHOME/bin/mailmanctl +# We used to install the mailman cron jobs when the mailman rpm was +# installed, irrespective of whether mailman was actually being +# run. Although the cron jobs didn't create any problems if someone +# wasn't running mailman some users complained about the cron log file +# filling up, resource usage, and power consumption since systems +# wouldn't really idle. It really only makes sense to run the mailman +# cron jobs if the mailman service is turned on and not just merely +# having the rpm installed. This init.d script is an obvious place to +# install or remove the cron jobs based on the service being enabled +# or not. + +SRC_CRON_SCRIPT=$MAILMANHOME/cron/crontab.in +DST_CRON_SCRIPT=/etc/cron.d/mailman + +function InstallCron() +{ + install -m644 -o root -g root $SRC_CRON_SCRIPT $DST_CRON_SCRIPT +} + +function RemoveCron() +{ +cat > $DST_CRON_SCRIPT <> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) @@ -80,7 +80,7 @@ def escape_line(line, lineno, quiet, out if output: sys.stdout.write('>' + line) if not quiet: - print >> sys.stderr, _('Unix-From line changed: %(lineno)d') + print >> sys.stderr, C_('Unix-From line changed: %(lineno)d') print >> sys.stderr, line[:-1] @@ -108,7 +108,7 @@ def main(): try: status = int(arg) except ValueError: - usage(1, _('Bad status number: %(arg)s')) + usage(1, C_('Bad status number: %(arg)s')) if args: usage(1) @@ -164,7 +164,7 @@ def main(): print >> sys.stderr statuscnt = 0 prevline = line - print >> sys.stderr, _('%(messages)d messages found') + print >> sys.stderr, C_('%(messages)d messages found') diff -up mailman-2.1.11/bin/arch.lctype mailman-2.1.11/bin/arch --- mailman-2.1.11/bin/arch.lctype 2008-06-30 18:29:46.000000000 +0200 +++ mailman-2.1.11/bin/arch 2008-07-22 09:01:21.000000000 +0200 @@ -70,7 +70,7 @@ from Mailman.Archiver.HyperArch import H from Mailman.LockFile import LockFile from Mailman import i18n -_ = i18n._ +C_ = i18n.C_ PROGRAM = sys.argv[0] i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) @@ -82,7 +82,7 @@ def usage(code, msg=''): fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) @@ -122,7 +122,7 @@ def main(): # grok arguments if len(args) < 1: - usage(1, _('listname is required')) + usage(1, C_('listname is required')) listname = args[0].lower().strip() if len(args) < 2: @@ -140,7 +140,7 @@ def main(): try: mlist = MailList(listname) except Errors.MMListError, e: - usage(2, _('No such list "%(listname)s"\n%(e)s')) + usage(2, C_('No such list "%(listname)s"\n%(e)s')) if mbox is None: mbox = mlist.ArchiveFileName() @@ -180,7 +180,7 @@ def main(): try: fp = open(mbox) except IOError, msg: - usage(3, _('Cannot open mbox file %(mbox)s: %(msg)s')) + usage(3, C_('Cannot open mbox file %(mbox)s: %(msg)s')) archiver = HyperArchive(mlist) archiver.VERBOSE = verbose diff -up mailman-2.1.11/bin/config_list.lctype mailman-2.1.11/bin/config_list --- mailman-2.1.11/bin/config_list.lctype 2008-06-30 18:29:46.000000000 +0200 +++ mailman-2.1.11/bin/config_list 2008-07-22 09:01:21.000000000 +0200 @@ -76,6 +76,7 @@ from Mailman import Errors from Mailman import i18n _ = i18n._ +C_ = i18n.C_ NL = '\n' nonasciipat = re.compile(r'[\x80-\xff]') @@ -87,7 +88,7 @@ def usage(code, msg=''): fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) @@ -106,7 +107,7 @@ def do_output(listname, outfile): try: mlist = MailList.MailList(listname, lock=0) except Errors.MMListError: - usage(1, _('No such list: %(listname)s')) + usage(1, C_('No such list: %(listname)s')) # Preamble for the config info. PEP263 charset and capture time. language = mlist.preferred_language charset = Utils.GetCharSet(language) @@ -114,7 +115,7 @@ def do_output(listname, outfile): if not charset: charset = 'us-ascii' when = time.ctime(time.time()) - print >> outfp, _('''\ + print >> outfp, C_('''\ # -*- python -*- # -*- coding: %(charset)s -*- ## "%(listname)s" mailing list configuration settings @@ -140,7 +141,7 @@ def do_list_categories(mlist, k, subcat, if info is None: return charset = Utils.GetCharSet(mlist.preferred_language) - print >> outfp, '##', k.capitalize(), _('options') + print >> outfp, '##', k.capitalize(), C_('options') print >> outfp, '#' # First, massage the descripton text, which could have obnoxious # leading whitespace on second and subsequent lines due to @@ -199,7 +200,7 @@ def do_list_categories(mlist, k, subcat, outfp.write('"""\n') elif vtype in (mm_cfg.Radio, mm_cfg.Toggle): print >> outfp, '#' - print >> outfp, '#', _('legal values are:') + print >> outfp, '#', C_('legal values are:') # TBD: This is disgusting, but it's special cased # everywhere else anyway... if varname == 'subscribe_policy' and \ @@ -253,7 +254,7 @@ def do_input(listname, infile, checkonly try: mlist = MailList.MailList(listname, lock=not checkonly) except Errors.MMListError, e: - usage(1, _('No such list "%(listname)s"\n%(e)s')) + usage(1, C_('No such list "%(listname)s"\n%(e)s')) savelist = 0 guibyprop = getPropertyMap(mlist) try: @@ -266,16 +267,16 @@ def do_input(listname, infile, checkonly if k in ('mlist', '__builtins__'): continue if not hasattr(mlist, k): - print >> sys.stderr, _('attribute "%(k)s" ignored') + print >> sys.stderr, C_('attribute "%(k)s" ignored') continue if verbose: - print >> sys.stderr, _('attribute "%(k)s" changed') + print >> sys.stderr, C_('attribute "%(k)s" changed') missing = [] gui, wtype = guibyprop.get(k, (missing, missing)) if gui is missing: # This isn't an official property of the list, but that's # okay, we'll just restore it the old fashioned way - print >> sys.stderr, _('Non-standard property restored: %(k)s') + print >> sys.stderr, C_('Non-standard property restored: %(k)s') setattr(mlist, k, v) else: # BAW: This uses non-public methods. This logic taken from @@ -283,9 +284,9 @@ def do_input(listname, infile, checkonly try: validval = gui._getValidValue(mlist, k, wtype, v) except ValueError: - print >> sys.stderr, _('Invalid value for property: %(k)s') + print >> sys.stderr, C_('Invalid value for property: %(k)s') except Errors.EmailAddressError: - print >> sys.stderr, _( + print >> sys.stderr, C_( 'Bad email address for option %(k)s: %(v)s') else: # BAW: Horrible hack, but then this is special cased @@ -342,13 +343,13 @@ def main(): # sanity check if infile is not None and outfile is not None: - usage(1, _('Only one of -i or -o is allowed')) + usage(1, C_('Only one of -i or -o is allowed')) [...2127 lines suppressed...] @@ -127,7 +127,7 @@ def dolist(mlist, options): digest = 0 else: if not options.quiet: - print _(' address not found:'), options.fromaddr + print C_(' address not found:'), options.fromaddr return # Check for banned to address. pattern = mlist.GetBannedPattern(options.toaddr) @@ -142,13 +142,13 @@ def dolist(mlist, options): mlist.changeMemberAddress(options.fromaddr, options.toaddr, not options.remove) if not options.quiet: - print _(' clone address added:'), options.toaddr + print C_(' clone address added:'), options.toaddr except Errors.MMAlreadyAMember: if not options.quiet: - print _(' clone address is already a member:'), options.toaddr + print C_(' clone address is already a member:'), options.toaddr if options.remove: - print _(' original address removed:'), options.fromaddr + print C_(' original address removed:'), options.fromaddr @@ -199,7 +199,7 @@ def main(): try: Utils.ValidateEmail(toaddr) except Errors.EmailAddressError: - usage(1, _('Not a valid email address: %(toaddr)s')) + usage(1, C_('Not a valid email address: %(toaddr)s')) lfromaddr = fromaddr.lower() options.toaddr = toaddr options.fromaddr = fromaddr @@ -212,7 +212,7 @@ def main(): try: mlist = MailList.MailList(listname) except Errors.MMListError, e: - print _('Error opening list "%(listname)s", skipping.\n%(e)s') + print C_('Error opening list "%(listname)s", skipping.\n%(e)s') continue try: dolist(mlist, options) diff -up mailman-2.1.11/Mailman/MTA/Postfix.py.lctype mailman-2.1.11/Mailman/MTA/Postfix.py --- mailman-2.1.11/Mailman/MTA/Postfix.py.lctype 2008-07-22 09:01:21.000000000 +0200 +++ mailman-2.1.11/Mailman/MTA/Postfix.py 2008-07-22 09:01:21.000000000 +0200 @@ -27,7 +27,7 @@ from stat import * from Mailman import mm_cfg from Mailman import Utils from Mailman import LockFile -from Mailman.i18n import _ +from Mailman.i18n import C_ from Mailman.MTA.Utils import makealiases from Mailman.Logging.Syslog import syslog @@ -303,7 +303,7 @@ def checkperms(state): targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP for file in ALIASFILE, VIRTFILE: if state.VERBOSE: - print _('checking permissions on %(file)s') + print C_('checking permissions on %(file)s') stat = None try: stat = os.stat(file) @@ -313,9 +313,9 @@ def checkperms(state): if stat and (stat[ST_MODE] & targetmode) <> targetmode: state.ERRORS += 1 octmode = oct(stat[ST_MODE]) - print _('%(file)s permissions must be 066x (got %(octmode)s)'), + print C_('%(file)s permissions must be 066x (got %(octmode)s)'), if state.FIX: - print _('(fixing)') + print C_('(fixing)') os.chmod(file, stat[ST_MODE] | targetmode) else: print @@ -331,7 +331,7 @@ def checkperms(state): raise continue if state.VERBOSE: - print _('checking ownership of %(dbfile)s') + print C_('checking ownership of %(dbfile)s') user = mm_cfg.MAILMAN_USER ownerok = stat[ST_UID] == pwd.getpwnam(user)[2] if not ownerok: @@ -339,10 +339,10 @@ def checkperms(state): owner = pwd.getpwuid(stat[ST_UID])[0] except KeyError: owner = 'uid %d' % stat[ST_UID] - print _('%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), + print C_('%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), state.ERRORS += 1 if state.FIX: - print _('(fixing)') + print C_('(fixing)') uid = pwd.getpwnam(user)[2] gid = grp.getgrnam(mm_cfg.MAILMAN_GROUP)[2] os.chown(dbfile, uid, gid) diff -up mailman-2.1.11/Mailman/MTA/Manual.py.lctype mailman-2.1.11/Mailman/MTA/Manual.py --- mailman-2.1.11/Mailman/MTA/Manual.py.lctype 2008-06-30 18:29:46.000000000 +0200 +++ mailman-2.1.11/Mailman/MTA/Manual.py 2008-07-22 09:01:21.000000000 +0200 @@ -25,7 +25,7 @@ from Mailman import mm_cfg from Mailman import Message from Mailman import Utils from Mailman.Queue.sbcache import get_switchboard -from Mailman.i18n import _ +from Mailman.i18n import _, C_ from Mailman.MTA.Utils import makealiases try: @@ -74,12 +74,12 @@ Here are the entries for the /etc/aliase outfp = sfp else: if not quiet: - print _("""\ + print C_("""\ To finish creating your mailing list, you must edit your /etc/aliases (or equivalent) file by adding the following lines, and possibly running the `newaliases' program: """) - print _("""\ + print C_("""\ ## %(listname)s mailing list""") outfp = sys.stdout # Common path @@ -120,7 +120,7 @@ Here are the entries in the /etc/aliases """) outfp = sfp else: - print _(""" + print C_(""" To finish removing your mailing list, you must edit your /etc/aliases (or equivalent) file by removing the following lines, and possibly running the `newaliases' program: diff -up mailman-2.1.11/Mailman/i18n.py.lctype mailman-2.1.11/Mailman/i18n.py --- mailman-2.1.11/Mailman/i18n.py.lctype 2008-06-30 18:29:46.000000000 +0200 +++ mailman-2.1.11/Mailman/i18n.py 2008-07-22 09:01:21.000000000 +0200 @@ -15,6 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +import locale import sys import time import gettext @@ -25,6 +26,15 @@ from Mailman.SafeDict import SafeDict _translation = None + +def _get_ctype_charset(): + old = locale.setlocale(locale.LC_CTYPE, '') + charset = locale.nl_langinfo(locale.CODESET) + locale.setlocale(locale.LC_CTYPE, old) + return charset + +_ctype_charset = _get_ctype_charset() + def set_language(language=None): @@ -54,7 +64,7 @@ if _translation is None: -def _(s): +def _(s, frame = 1): if s == '': return s assert s @@ -70,7 +80,7 @@ def _(s): # original string is 1) locals dictionary, 2) globals dictionary. # # First, get the frame of the caller - frame = sys._getframe(1) + frame = sys._getframe(frame) # A `safe' dictionary is used so we won't get an exception if there's a # missing key in the dictionary. dict = SafeDict(frame.f_globals.copy()) @@ -91,6 +101,19 @@ def _(s): +def tolocale(s): + global _ctype_charset + if isinstance(s, UnicodeType): + return s + source = _translation.charset () + if not source: + return s + return unicode(s, source, 'replace').encode(_ctype_charset, 'replace') + +def C_(s): + return tolocale(_(s, 2)) + + def ctime(date): # Don't make these module globals since we have to do runtime translation # of the strings anyway. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mailman/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 May 2008 08:32:25 -0000 1.17 +++ .cvsignore 23 Jul 2008 08:40:04 -0000 1.18 @@ -1 +1 @@ -mailman-2.1.10.tgz +mailman-2.1.11.tgz Index: mailman.spec =================================================================== RCS file: /cvs/pkgs/rpms/mailman/devel/mailman.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- mailman.spec 13 May 2008 08:32:26 -0000 1.70 +++ mailman.spec 23 Jul 2008 08:40:04 -0000 1.71 @@ -1,6 +1,6 @@ Summary: Mailing list manager with built in Web access Name: mailman -Version: 2.1.10 +Version: 2.1.11 Release: 1%{?dist} Epoch: 3 Group: Applications/Internet @@ -16,17 +16,17 @@ Patch1: mailman-2.1-multimail.patch Patch2: mailman-2.1-build.patch Patch3: mailman-2.1-mailmanctl-status.patch -Patch4: mailman-2.1.10-cron.patch +Patch4: mailman-2.1.11-cron.patch Patch5: mailman-2.1.10-FHS.patch Patch6: mailman-python-compile.patch Patch7: mailman-2.1.10-archive-reply.patch -Patch8: mailman-2.1.10-LC_CTYPE.patch +Patch8: mailman-2.1.11-lctype.patch Patch9: mailman-2.1.9-ctypo-new.patch -Patch10: mailman-2.1.9-init-retval.patch -Patch11: mailman-2.1.10-ctypefix.patch -Patch12: mailman-2.1.9-header-folding.patch -Patch13: mailman-2.1.9-selinux.patch -Patch14: mailman-2.1.9-unicode.patch +Patch10: mailman-2.1.10-ctypefix.patch +Patch11: mailman-2.1.9-header-folding.patch +Patch12: mailman-2.1.9-selinux.patch +Patch13: mailman-2.1.9-unicode.patch +Patch14: mailman-2.1.11-fhsinit.patch License: GPLv2+ URL: http://www.list.org/ @@ -102,11 +102,11 @@ %patch7 -p1 -b .archive-in-reply-to %patch8 -p1 -b .lctype %patch9 -p1 -b .ctypo -%patch10 -p1 -b .retval -%patch11 -p1 -b .ctypefix -%patch12 -p0 -b .header -%patch13 -p1 -b .selinux -%patch14 -p1 -b .unicode +%patch10 -p1 -b .ctypefix +%patch11 -p0 -b .header +%patch12 -p1 -b .selinux +%patch13 -p1 -b .unicode +%patch14 -p1 -b .fhsinit #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in cp %{SOURCE5} INSTALL.REDHAT.in @@ -352,6 +352,10 @@ %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in %changelog +* Tue Jul 22 2008 Tomas Smetana - 3:2.1.11-1 +- new upstream version +- fix #246978 - FHS compliant initscript + * Mon May 12 2008 Tomas Smetana - 3:2.1.10-1 - new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mailman/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 May 2008 08:32:26 -0000 1.17 +++ sources 23 Jul 2008 08:40:04 -0000 1.18 @@ -1 +1 @@ -79157d337a29f716a3a1ff8b70501f8d mailman-2.1.10.tgz +d9fd89f54c4743dbcb3b3eec8c6146d6 mailman-2.1.11.tgz --- mailman-2.1.10-LC_CTYPE.patch DELETED --- --- mailman-2.1.10-cron.patch DELETED --- --- mailman-2.1.9-init-retval.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 08:57:25 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 08:57:25 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk.spec,1.25,1.26 Message-ID: <200807230857.m6N8vP0T003928@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3879 Modified Files: java-1.6.0-openjdk.spec Log Message: eeek Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- java-1.6.0-openjdk.spec 23 Jul 2008 07:40:29 -0000 1.25 +++ java-1.6.0-openjdk.spec 23 Jul 2008 08:56:41 -0000 1.26 @@ -477,14 +477,14 @@ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png done for e in jconsole policytool ; do - desktop-file-install --vendor='' --mode=644 \ + desktop-file-install --vendor=fedora --mode=644 \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop done # Install javaws desktop file. install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps -desktop-file-install --vendor=fedora \ +desktop-file-install --vendor='' \ --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop # Find JRE directories. From fedora-extras-commits at redhat.com Wed Jul 23 09:10:38 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 09:10:38 GMT Subject: rpms/akonadi/devel .cvsignore, 1.4, 1.5 akonadi.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807230910.m6N9Ac2a011644@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/akonadi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550 Modified Files: .cvsignore akonadi.spec sources Log Message: 1.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/akonadi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jun 2008 14:13:00 -0000 1.4 +++ .cvsignore 23 Jul 2008 09:09:55 -0000 1.5 @@ -1 +1,2 @@ akonadi-0.82.0.tar.bz2 +akonadi-1.0.0.tar.bz2 Index: akonadi.spec =================================================================== RCS file: /cvs/extras/rpms/akonadi/devel/akonadi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- akonadi.spec 20 Jun 2008 14:13:00 -0000 1.7 +++ akonadi.spec 23 Jul 2008 09:09:55 -0000 1.8 @@ -1,16 +1,12 @@ -#define revision 812787 - Summary: PIM Storage Service Name: akonadi -Version: 0.82.0 +Version: 1.0.0 Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ -URL: http://pim.kde.org/akonadi/ -# checked out from svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/ -#Source0: akonadi-%{revision}.tar.bz2 -Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/akonadi-%{version}.tar.bz2 +URL: http://download.akonadi-project.org/ +Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -68,9 +64,7 @@ %{_bindir}/akonadictl %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.* -# own this completely for now, see #334681) %{_datadir}/dbus-1/interfaces/ -#%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_datadir}/mime/packages/akonadi-mime.xml @@ -81,6 +75,9 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 23 2008 Than Ngo - 1.0.0-1 +- 1.0.0 + * Wed Jun 18 2008 Rex Dieter 0.82.0-1 - akonadi-0.82.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/akonadi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Jun 2008 14:13:00 -0000 1.4 +++ sources 23 Jul 2008 09:09:55 -0000 1.5 @@ -1 +1 @@ -a6ab075c69a54abc024285a76673110b akonadi-0.82.0.tar.bz2 +90039928f818a55a7e2a1bf852a32f2d akonadi-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 09:13:53 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Wed, 23 Jul 2008 09:13:53 GMT Subject: rpms/chkrootkit/EL-4 chkrootkit.spec,1.11,1.12 Message-ID: <200807230913.m6N9DrJn011830@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/chkrootkit/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11769 Modified Files: chkrootkit.spec Log Message: * Wed Jul 23 2008 Manuel "lonely wolf" Wolfshant - 0.48-8 - fix license tag Index: chkrootkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/chkrootkit/EL-4/chkrootkit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- chkrootkit.spec 23 Apr 2008 12:54:41 -0000 1.11 +++ chkrootkit.spec 23 Jul 2008 09:12:39 -0000 1.12 @@ -1,9 +1,9 @@ Name: chkrootkit Version: 0.48 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tool to locally check for signs of a rootkit Group: Applications/System -License: BSD-like +License: BSD and GPLv2+ and Python URL: http://www.chkrootkit.org Source0: ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-%{version}.tar.gz Source1: chkrootkitX @@ -117,6 +117,9 @@ %changelog +* Wed Jul 23 2008 Manuel "lonely wolf" Wolfshant - 0.48-8 +- fix license tag + * Wed Apr 17 2008 Manuel "lonely wolf" Wolfshant - 0.48-7 - build for EPEL based on latest fedora-devel version; includes "Build with large file API (#441638)" From fedora-extras-commits at redhat.com Wed Jul 23 09:15:17 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Wed, 23 Jul 2008 09:15:17 GMT Subject: rpms/chkrootkit/EL-5 chkrootkit.spec,1.18,1.19 Message-ID: <200807230915.m6N9FHbJ011920@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/chkrootkit/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11857 Modified Files: chkrootkit.spec Log Message: * Wed Jul 23 2008 Manuel "lonely wolf" Wolfshant - 0.48-8 - fix license tag Index: chkrootkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/chkrootkit/EL-5/chkrootkit.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- chkrootkit.spec 16 Apr 2008 23:40:05 -0000 1.18 +++ chkrootkit.spec 23 Jul 2008 09:14:22 -0000 1.19 @@ -1,9 +1,9 @@ Name: chkrootkit Version: 0.48 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tool to locally check for signs of a rootkit Group: Applications/System -License: BSD-like +License: BSD and GPLv2+ and Python URL: http://www.chkrootkit.org Source0: ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-%{version}.tar.gz Source1: chkrootkitX @@ -117,6 +117,9 @@ %changelog +* Wed Jul 23 2008 Manuel "lonely wolf" Wolfshant - 0.48-8 +- fix license tag + * Wed Apr 17 2008 Manuel "lonely wolf" Wolfshant - 0.48-7 - build for EPEL based on latest fedora-devel version; includes "Build with large file API (#441638)" From fedora-extras-commits at redhat.com Wed Jul 23 09:18:12 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Wed, 23 Jul 2008 09:18:12 GMT Subject: rpms/gvfs/devel gvfs.spec,1.58,1.59 Message-ID: <200807230918.m6N9ICZE012099@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12026 Modified Files: gvfs.spec Log Message: Add missing files Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- gvfs.spec 22 Jul 2008 16:00:51 -0000 1.58 +++ gvfs.spec 23 Jul 2008 09:17:30 -0000 1.59 @@ -170,8 +170,11 @@ %{_datadir}/gvfs/mounts/network.mount %{_datadir}/gvfs/mounts/ftp.mount %{_datadir}/dbus-1/services/gvfs-daemon.service +%{_datadir}/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service +%{_datadir}/gvfs/remote-volume-monitors/hal.monitor %{_libdir}/libgvfscommon.so.* %{_libdir}/gio/modules/libgiohal-volume-monitor.so +%{_libdir}/gio/modules/libgioremote-volume-monitor.so %{_libdir}/gio/modules/libgvfsdbus.so %{_libdir}/gio/modules/libgiogconf.so %{_libexecdir}/gvfsd @@ -186,6 +189,7 @@ %{_libexecdir}/gvfsd-burn %{_libexecdir}/gvfsd-dnssd %{_libexecdir}/gvfsd-network +%{_libexecdir}/gvfs-hal-volume-monitor %{_bindir}/gvfs-cat %{_bindir}/gvfs-copy %{_bindir}/gvfs-info @@ -242,6 +246,9 @@ %defattr(-, root, root, -) %{_libexecdir}/gvfsd-gphoto2 %{_datadir}/gvfs/mounts/gphoto2.mount +%{_libexecdir}/gvfs-gphoto2-volume-monitor +%{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service +%{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor From fedora-extras-commits at redhat.com Wed Jul 23 09:21:21 2008 From: fedora-extras-commits at redhat.com (Morgan Collett (morgan)) Date: Wed, 23 Jul 2008 09:21:21 GMT Subject: rpms/sugar-presence-service/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-presence-service.spec, 1.6, 1.7 Message-ID: <200807230921.m6N9LL3r012419@cvs-int.fedora.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/sugar-presence-service/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12354 Modified Files: .cvsignore sources sugar-presence-service.spec Log Message: Update to 0.81.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jul 2008 11:37:21 -0000 1.5 +++ .cvsignore 23 Jul 2008 09:20:34 -0000 1.6 @@ -1 +1 @@ -sugar-presence-service-0.81.3.tar.bz2 +sugar-presence-service-0.81.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jul 2008 11:37:21 -0000 1.5 +++ sources 23 Jul 2008 09:20:34 -0000 1.6 @@ -1 +1 @@ -93bfa6c91d3a672d011b737f0e4ff384 sugar-presence-service-0.81.3.tar.bz2 +0d5034a473e298fca6ec8a4e2122f584 sugar-presence-service-0.81.4.tar.bz2 Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sugar-presence-service.spec 8 Jul 2008 11:58:44 -0000 1.6 +++ sugar-presence-service.spec 23 Jul 2008 09:20:34 -0000 1.7 @@ -1,18 +1,12 @@ -#%define alphatag 20080103git -#%define commitid 76984f3f28 - Name: sugar-presence-service -Version: 0.81.3 -Release: 2%{?dist} +Version: 0.81.4 +Release: 1%{?dist} Summary: The Sugar presence service Group: System Environment/Libraries License: GPLv2+ URL: http://dev.laptop.org/ -# git clone git://dev.laptop.org/projects/presence-service -# cd presence-service -# git-checkout %{alphatag} -Source0: sugar-presence-service-%{version}.tar.bz2 +Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,6 +42,9 @@ %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service %changelog +* Wed Jul 23 2008 Morgan Collett - 0.81.4-1 +- Update to 0.81.4 + * Tue Jul 8 2008 Morgan Collett - 0.81.3-2 - Depends on telepathy-salut and telepathy-gabble From fedora-extras-commits at redhat.com Wed Jul 23 09:22:42 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Wed, 23 Jul 2008 09:22:42 GMT Subject: rpms/sendmail/devel sendmail.spec,1.94,1.95 Message-ID: <200807230922.m6N9MgRn012569@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/sendmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12437 Modified Files: sendmail.spec Log Message: - added _default_patch_fuzz 2 to fix build problems for now Index: sendmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- sendmail.spec 22 Jul 2008 13:02:10 -0000 1.94 +++ sendmail.spec 23 Jul 2008 09:21:57 -0000 1.95 @@ -1,3 +1,5 @@ +%define _default_patch_fuzz 2 + # package options %define with_tls yes %define with_sasl1 no From fedora-extras-commits at redhat.com Wed Jul 23 09:32:22 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 23 Jul 2008 09:32:22 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.63, 1.64 sources, 1.76, 1.77 system-config-services.spec, 1.75, 1.76 Message-ID: <200807230932.m6N9WMJT013247@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13179 Modified Files: .cvsignore sources system-config-services.spec Log Message: require PolicyKit-gnome instead of usermode Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 21 Jul 2008 22:51:30 -0000 1.63 +++ .cvsignore 23 Jul 2008 09:31:38 -0000 1.64 @@ -1 +1 @@ -system-config-services-0.99.17.tar.bz2 +system-config-services-0.99.18.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- sources 21 Jul 2008 22:51:30 -0000 1.76 +++ sources 23 Jul 2008 09:31:38 -0000 1.77 @@ -1 +1 @@ -150a2c566ab6f72b01741117a2d7da53 system-config-services-0.99.17.tar.bz2 +e12c0b9c32087d84af95f327eb003c0d system-config-services-0.99.18.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- system-config-services.spec 21 Jul 2008 22:51:30 -0000 1.75 +++ system-config-services.spec 23 Jul 2008 09:31:38 -0000 1.76 @@ -14,15 +14,9 @@ %bcond_with rarian_compat %endif -%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6 -%bcond_without console_util -%else -%bcond_with console_util -%endif - Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.17 +Version: 0.99.18 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -53,15 +47,10 @@ Requires: pygtk2 Requires: pygtk2-libglade Requires: python >= 2.3.0 -%if %{with console_util} -Requires: usermode >= 1.94 -%else -Requires: usermode >= 1.36 -%endif -Requires: usermode-gtk Requires: dbus-python Requires: python-slip-dbus >= 0.1.4 Requires: python-slip-gtk +Requires: PolicyKit-gnome Obsoletes: serviceconf <= 0.8.1 Obsoletes: redhat-config-services <= 0.8.5 @@ -73,7 +62,7 @@ %setup -q %build -make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags} +make %{?_smp_mflags} %install rm -rf %{buildroot} @@ -122,6 +111,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Wed Jul 23 2008 Nils Philippsen - 0.99.18-1 +- require PolicyKit-gnome instead of usermode + * Tue Jul 22 2008 Nils Philippsen - 0.99.17-1 - remove pam/consolehelper cruft From fedora-extras-commits at redhat.com Wed Jul 23 09:34:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:34:38 +0000 Subject: [pkgdb] sugar-presence-service: gdesmott has requested commit Message-ID: <20080723093438.75A371AD0E0@bastion.fedora.phx.redhat.com> Guillaume Desmottes (gdesmott) has requested the commit acl on sugar-presence-service (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:34:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:34:40 +0000 Subject: [pkgdb] sugar-presence-service: gdesmott has requested watchcommits Message-ID: <20080723093441.4ED721AD0DC@bastion.fedora.phx.redhat.com> Guillaume Desmottes (gdesmott) has requested the watchcommits acl on sugar-presence-service (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:36:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:36:13 +0000 Subject: [pkgdb] sugar-presence-service: gdesmott has requested watchcommits Message-ID: <20080723093613.F241C1AD0DD@bastion.fedora.phx.redhat.com> Guillaume Desmottes (gdesmott) has requested the watchcommits acl on sugar-presence-service (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:36:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:36:15 +0000 Subject: [pkgdb] sugar-presence-service: gdesmott has requested commit Message-ID: <20080723093615.877A91AD0DD@bastion.fedora.phx.redhat.com> Guillaume Desmottes (gdesmott) has requested the commit acl on sugar-presence-service (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:36:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:36:54 +0000 Subject: [pkgdb] sugar-presence-service had acl change status Message-ID: <20080723093655.07A001AD0E0@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has set the watchcommits acl on sugar-presence-service (Fedora devel) to Approved for Guillaume Desmottes (gdesmott) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:36:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:36:57 +0000 Subject: [pkgdb] sugar-presence-service had acl change status Message-ID: <20080723093657.7038F1AD0E0@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has set the commit acl on sugar-presence-service (Fedora devel) to Approved for Guillaume Desmottes (gdesmott) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:37:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:37:04 +0000 Subject: [pkgdb] sugar-presence-service had acl change status Message-ID: <20080723093704.3854C1AD0DD@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has set the watchcommits acl on sugar-presence-service (Fedora OLPC 3) to Approved for Guillaume Desmottes (gdesmott) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:37:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:37:06 +0000 Subject: [pkgdb] sugar-presence-service had acl change status Message-ID: <20080723093706.7FC831AD0DD@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has set the commit acl on sugar-presence-service (Fedora OLPC 3) to Approved for Guillaume Desmottes (gdesmott) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:37:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 09:37:19 +0000 Subject: [pkgdb] sugar-presence-service had acl change status Message-ID: <20080723093720.1A95C1AD0DD@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has set the commit acl on sugar-presence-service (Fedora OLPC 3) to Obsolete for Guillaume Desmottes (gdesmott) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service From fedora-extras-commits at redhat.com Wed Jul 23 09:47:47 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Wed, 23 Jul 2008 09:47:47 GMT Subject: rpms/sugar/F-9 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 sugar.spec, 1.23, 1.24 Message-ID: <200807230947.m6N9llgm014127@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14068 Modified Files: .cvsignore sources sugar.spec Log Message: * Wed Jul 23 2008 Simon Schampijer - 0.81.7-1 - 7546 Activity launcher fails to show when launching from the journal - 5664 Copying formatted text out of Browse breaks Journal/clipboard interaction - 7385 Change the accelerator for switching between views in the home level - 7249 Device ordering in Frame is not fixed - 7510 Control Panel 'About Me' incorrectly keeps a name edit when you choose to Cancel out - 7071 Activities cannot be deleted via GUI - 4208 Battery indicator's icon fullness inconsistent with indicator %. - 7430 Favorites view is not preserved - 7434 Control panel UI for power management. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Jul 2008 20:32:57 -0000 1.14 +++ .cvsignore 23 Jul 2008 09:47:00 -0000 1.15 @@ -1 +1 @@ -sugar-0.81.6-git8137d5c37f.tar.bz2 +sugar-0.81.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 15 Jul 2008 20:32:57 -0000 1.15 +++ sources 23 Jul 2008 09:47:00 -0000 1.16 @@ -1 +1 @@ -c3d991b35538016161c09918aa23c5f2 sugar-0.81.6-git8137d5c37f.tar.bz2 +ef76f199764353cad3fc5f3937193b4b sugar-0.81.7.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/F-9/sugar.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sugar.spec 17 Jul 2008 07:04:28 -0000 1.23 +++ sugar.spec 23 Jul 2008 09:47:00 -0000 1.24 @@ -3,15 +3,15 @@ Summary: OLPC desktop environment Name: sugar -Version: 0.81.6 -#Release: 1%{?dist} -Release: 4.%{alphatag}%{?dist} +Version: 0.81.7 +Release: 1%{?dist} +#Release: 4.%{alphatag}%{?dist} URL: http://dev.laptop.org # git clone git://dev.laptop.org/sugar # cd sugar # git-checkout %{commitid} -Source0: %{name}-%{version}-git%{commitid}.tar.bz2 -#Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +#Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 License: GPL/LGPL Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -92,6 +92,17 @@ %{_bindir}/sugar-emulator %changelog +* Wed Jul 23 2008 Simon Schampijer - 0.81.7-1 +- 7546 Activity launcher fails to show when launching from the journal +- 5664 Copying formatted text out of Browse breaks Journal/clipboard interaction +- 7385 Change the accelerator for switching between views in the home level +- 7249 Device ordering in Frame is not fixed +- 7510 Control Panel 'About Me' incorrectly keeps a name edit when you choose to Cancel out +- 7071 Activities cannot be deleted via GUI +- 4208 Battery indicator's icon fullness inconsistent with indicator %. +- 7430 Favorites view is not preserved +- 7434 Control panel UI for power management. + * Thu Jul 17 2008 Simon Schampijer - 0.81.6-4.20080715git8137d5c37f - split the sugar-emulator in it's own package to get rid of the xephyr dependency From fedora-extras-commits at redhat.com Wed Jul 23 09:49:13 2008 From: fedora-extras-commits at redhat.com (Tomeu Vizoso (tomeu)) Date: Wed, 23 Jul 2008 09:49:13 GMT Subject: rpms/sugar-journal/F-9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-journal.spec, 1.5, 1.6 Message-ID: <200807230949.m6N9nDCM014253@cvs-int.fedora.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-journal/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14205 Modified Files: .cvsignore sources sugar-journal.spec Log Message: * Wed Jul 23 2008 Tomeu Vizoso - 95-1 - 7152 journal slowness: scrolling - 3958 Journal activity icon's pencil "fools" people into thinking it is a text editor - 6639 Journal can't resume activity bundles using another activity - 7441 no visual feedback on Erase - 7487 Do not decorate the object chooser - 7482 Object chooser has wrong icon for 'cancel' Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Jul 2008 19:08:07 -0000 1.5 +++ .cvsignore 23 Jul 2008 09:48:30 -0000 1.6 @@ -1 +1 @@ -sugar-journal-94-git814c37616b.tar.bz2 +journal-activity-95.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Jul 2008 19:08:07 -0000 1.5 +++ sources 23 Jul 2008 09:48:30 -0000 1.6 @@ -1 +1 @@ -70a98442ef3d7b0a2b7779095451cd3c sugar-journal-94-git814c37616b.tar.bz2 +a901f651d8741bea895415c0bafb16bd journal-activity-95.tar.bz2 Index: sugar-journal.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-journal/F-9/sugar-journal.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sugar-journal.spec 15 Jul 2008 19:08:07 -0000 1.5 +++ sugar-journal.spec 23 Jul 2008 09:48:30 -0000 1.6 @@ -1,18 +1,12 @@ -%define commitid 814c37616b -%define alphatag 200807015git%{commitid} - Name: sugar-journal -Version: 94 -Release: 2.%{alphatag}%{?dist} +Version: 95 +Release: 1%{?dist} Summary: Journal for Sugar Group: Sugar/Activities License: GPLv2+ URL: http://wiki.laptop.org/go/Journal -# git clone git://dev.laptop.org/journal-activity -# cd journal-activity -# git-checkout %{commitid} -Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +Source0: journal-activity-%{version}.tar.bz2 #Script to create the source tarball Source1: sugar-journal-checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -110,6 +104,14 @@ %lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/ %changelog +* Wed Jul 23 2008 Tomeu Vizoso - 95-1 +- 7152 journal slowness: scrolling +- 3958 Journal activity icon's pencil "fools" people into thinking it is a text editor +- 6639 Journal can't resume activity bundles using another activity +- 7441 no visual feedback on Erase +- 7487 Do not decorate the object chooser +- 7482 Object chooser has wrong icon for 'cancel' + * Tue Jul 15 2008 Tomeu Vizoso - 94-2.20080715git814c37616b - New git snapshot From fedora-extras-commits at redhat.com Wed Jul 23 09:50:10 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Wed, 23 Jul 2008 09:50:10 GMT Subject: rpms/gvfs/devel gvfs.spec,1.59,1.60 Message-ID: <200807230950.m6N9oAfD014359@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14250 Modified Files: gvfs.spec Log Message: Fix filelist again Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- gvfs.spec 23 Jul 2008 09:17:30 -0000 1.59 +++ gvfs.spec 23 Jul 2008 09:49:24 -0000 1.60 @@ -173,7 +173,7 @@ %{_datadir}/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service %{_datadir}/gvfs/remote-volume-monitors/hal.monitor %{_libdir}/libgvfscommon.so.* -%{_libdir}/gio/modules/libgiohal-volume-monitor.so +# %{_libdir}/gio/modules/libgiohal-volume-monitor.so %{_libdir}/gio/modules/libgioremote-volume-monitor.so %{_libdir}/gio/modules/libgvfsdbus.so %{_libdir}/gio/modules/libgiogconf.so From fedora-extras-commits at redhat.com Wed Jul 23 09:51:10 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 09:51:10 GMT Subject: rpms/akonadi/devel akonadi.spec,1.8,1.9 Message-ID: <200807230951.m6N9pAjp014481@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/akonadi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14384/devel Modified Files: akonadi.spec Log Message: Remove "mkdir $RPM_BUILD_ROOT", no longer works with the new RPM. Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- akonadi.spec 23 Jul 2008 09:09:55 -0000 1.8 +++ akonadi.spec 23 Jul 2008 09:50:27 -0000 1.9 @@ -41,7 +41,6 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean From fedora-extras-commits at redhat.com Wed Jul 23 09:52:12 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 09:52:12 GMT Subject: rpms/openoffice.org/devel openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch, NONE, 1.1 openoffice.org.spec, 1.1587, 1.1588 Message-ID: <200807230952.m6N9qC4q014572@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14504 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch Log Message: Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch: --- NEW FILE openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch --- Index: source/ui/framework/configuration/ConfigurationController.cxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx,v retrieving revision 1.2.182.1 diff -u -r1.2.182.1 ConfigurationController.cxx --- openoffice.org.orig/sd/source/ui/framework/configuration/ConfigurationController.cxx 18 Jan 2008 11:26:35 -0000 1.2.182.1 +++ openoffice.org/sd/source/ui/framework/configuration/ConfigurationController.cxx 23 Jul 2008 09:45:04 -0000 @@ -259,7 +259,9 @@ throw (RuntimeException) { ::osl::MutexGuard aGuard (maMutex); - ThrowIfDisposed(); + + if (rBHelper.bDisposed ) //i.e. allow unlocking if disposing, but not disposed + ThrowIfDisposed(); OSL_ASSERT(mnLockCount>0); --mnLockCount; Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1587 retrieving revision 1.1588 diff -u -r1.1587 -r1.1588 --- openoffice.org.spec 22 Jul 2008 22:10:18 -0000 1.1587 +++ openoffice.org.spec 23 Jul 2008 09:51:27 -0000 1.1588 @@ -1,6 +1,6 @@ %define oootag DEV300 %define ooomilestone 26 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -114,6 +114,7 @@ Patch42: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch Patch43: workspace.native172.patch Patch44: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch +Patch45: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1271,6 +1272,7 @@ %patch42 -p1 -b .ooo86142.serbiannumbering.patch %patch43 -p1 -b .workspace.native172.patch %patch44 -p1 -b .ooo91977.sd.holdreference.patch +%patch45 -p1 -b .ooo92026.sd.disposed_during_disposing.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -3570,6 +3572,9 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Wed Jul 23 2008 Caolan McNamara - 1:3.0.0-0.26-2 +- Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch + * Tue Jul 22 2008 Caolan McNamara - 1:3.0.0-0.26-1 - next version - drop integrated openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch From fedora-extras-commits at redhat.com Wed Jul 23 09:53:28 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 09:53:28 GMT Subject: rpms/kde-l10n/devel kde-l10n.spec,1.36,1.37 Message-ID: <200807230953.m6N9rSdS014779@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14656 Modified Files: kde-l10n.spec Log Message: fix rpm file list Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- kde-l10n.spec 22 Jul 2008 16:42:01 -0000 1.36 +++ kde-l10n.spec 23 Jul 2008 09:52:46 -0000 1.37 @@ -56,7 +56,6 @@ Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2 Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2 Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2 -# FIXME: recode-sr-latin: input is not valid in "ANSI_X3.4-1968" encoding Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2 Source1000: subdirs-kde-l10n @@ -1043,6 +1042,10 @@ %lang(nds) %{_kde4_appsdir}/klettres/nds %lang(nds) %{_kde4_appsdir}/khangman/nds.txt %lang(nds) %{_kde4_appsdir}/kvtml/nds +%lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds* +%lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml +%lang(nds) %{_kde4_appsdir}/kturtle/data/logokeywords.sr* +%lang(nds) %{_kde4_appsdir}/kturtle/examples/nds %files Latvian %defattr(-,root,root) @@ -1160,6 +1163,16 @@ %defattr(-,root,root) %lang(sr) %{_datadir}/locale/sr/* %lang(sr) %{_kde4_appsdir}/ktuberling/sounds/sr* +%lang(sr) %{_kde4_docdir}/HTML/sr +%lang(sr) %{_kde4_docdir}/HTML/sr at latin +%lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr/* +%lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr +%lang(sr) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sr* +%lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt +%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr/* +%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr +%lang(sr) %{_kde4_appsdir}/kvtml/sr* +%lang(sr) %{_datadir}/locale/sr at latin/* %files Swedish %defattr(-,root,root) From fedora-extras-commits at redhat.com Wed Jul 23 09:53:43 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 09:53:43 GMT Subject: rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch, NONE, 1.1 openoffice.org.spec, 1.1500, 1.1501 Message-ID: <200807230953.m6N9rhZM014794@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14681 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch Log Message: Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch: --- NEW FILE openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch --- Index: source/ui/framework/configuration/ConfigurationController.cxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx,v retrieving revision 1.2.182.1 diff -u -r1.2.182.1 ConfigurationController.cxx --- openoffice.org.orig/sd/source/ui/framework/configuration/ConfigurationController.cxx 18 Jan 2008 11:26:35 -0000 1.2.182.1 +++ openoffice.org/sd/source/ui/framework/configuration/ConfigurationController.cxx 23 Jul 2008 09:45:04 -0000 @@ -259,7 +259,9 @@ throw (RuntimeException) { ::osl::MutexGuard aGuard (maMutex); - ThrowIfDisposed(); + + if (rBHelper.bDisposed ) //i.e. allow unlocking if disposing, but not disposed + ThrowIfDisposed(); OSL_ASSERT(mnLockCount>0); --mnLockCount; Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v retrieving revision 1.1500 retrieving revision 1.1501 diff -u -r1.1500 -r1.1501 --- openoffice.org.spec 9 Jul 2008 12:37:10 -0000 1.1500 +++ openoffice.org.spec 23 Jul 2008 09:52:59 -0000 1.1501 @@ -165,6 +165,7 @@ Patch90: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch Patch91: workspace.locdat30.patch Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +Patch93: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch %define instdir %{_libdir}/openoffice.org @@ -820,6 +821,7 @@ Summary: Serbian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: hunspell-sr Obsoletes: openoffice.org2-langpack-sr_CS Obsoletes: openoffice.org-langpack-sr_CS @@ -1143,6 +1145,7 @@ %patch90 -p1 -b .ooo90697.sd.a11ycrash.patch %patch91 -p1 -b .workspace.locdat30.patch %patch92 -p1 -b .ooo86142.serbiannumbering.patch +%patch93 -p1 -b .ooo92026.sd.disposed_during_disposing.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2938,12 +2941,13 @@ %changelog -* Mon Jul 07 2008 Caolan McNamara - 1:2.4.1-17.5-UNRELEASED +* Wed Jul 23 2008 Caolan McNamara - 1:2.4.1-17.5-UNRELEASED - Resolves: rhbz#452376 backport workspace.locdat30.patch for Serbian - Resolves: rhbz#452376 update Serbian translations - Resolves: rhbz#452379 extend Serbian translations - Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch - Resolves: rhbz#452385 add postgress-jdbc to default classpath +- Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch * Fri Jun 13 2008 Caolan McNamara - 1:2.4.1-17.4 - Resolves: rhbz#451485 fix vertical glyphs From fedora-extras-commits at redhat.com Wed Jul 23 09:54:17 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Wed, 23 Jul 2008 09:54:17 GMT Subject: rpms/mailman/devel mailman.spec,1.71,1.72 Message-ID: <200807230954.m6N9sHVe014823@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/mailman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14782 Modified Files: mailman.spec Log Message: * Wed Jul 23 2008 Tomas Smetana - 3:2.1.11-2 - temporary fix for --fuzz=0 Index: mailman.spec =================================================================== RCS file: /cvs/pkgs/rpms/mailman/devel/mailman.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- mailman.spec 23 Jul 2008 08:40:04 -0000 1.71 +++ mailman.spec 23 Jul 2008 09:53:29 -0000 1.72 @@ -1,7 +1,7 @@ Summary: Mailing list manager with built in Web access Name: mailman Version: 2.1.11 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 3 Group: Applications/Internet #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz @@ -52,7 +52,6 @@ %define mmbuilddir %{_builddir}/%{name}-%{version} %define httpdconffile %{name}.conf - # Now, the user and group the CGIs will expect to be run under. This should # match the user and group the web server is configured to run as. The scripts # will error out if they are invoked by any other user. @@ -92,6 +91,9 @@ %{docdir}/INSTALL.REDHAT %prep +#FIXME -- This is a temporary solution +%define _default_patch_fuzz 2 + %setup -q %patch1 -p1 -b .multimail %patch2 -p1 -b .permissions @@ -352,6 +354,9 @@ %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in %changelog +* Wed Jul 23 2008 Tomas Smetana - 3:2.1.11-2 +- temporary fix for --fuzz=0 + * Tue Jul 22 2008 Tomas Smetana - 3:2.1.11-1 - new upstream version - fix #246978 - FHS compliant initscript From fedora-extras-commits at redhat.com Wed Jul 23 09:59:42 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Wed, 23 Jul 2008 09:59:42 GMT Subject: rpms/tilda/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tilda.spec, 1.3, 1.4 Message-ID: <200807230959.m6N9xglI015217@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/tilda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15168 Modified Files: .cvsignore sources tilda.spec Log Message: update release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tilda/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Apr 2008 14:01:57 -0000 1.3 +++ .cvsignore 23 Jul 2008 09:58:55 -0000 1.4 @@ -1 +1 @@ -tilda-0.9.5.tar.gz +tilda-0.9.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tilda/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2008 14:01:57 -0000 1.3 +++ sources 23 Jul 2008 09:58:55 -0000 1.4 @@ -1 +1 @@ -c497f82f180e128a1e6f301c6b2463d9 tilda-0.9.5.tar.gz +b44ebe04fdfd312e9ddc5e0ed77f4289 tilda-0.9.6.tar.gz Index: tilda.spec =================================================================== RCS file: /cvs/pkgs/rpms/tilda/devel/tilda.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tilda.spec 30 Apr 2008 14:01:57 -0000 1.3 +++ tilda.spec 23 Jul 2008 09:58:55 -0000 1.4 @@ -1,5 +1,5 @@ Name: tilda -Version: 0.9.5 +Version: 0.9.6 Release: 1%{?dist} Summary: A quake like terminal for GNOME @@ -52,14 +52,13 @@ # Move glade interface to correct dir mv $RPM_BUILD_ROOT%{_datadir}/%{name}.glade $RPM_BUILD_ROOT%{_datadir}/%{name} -# Disabled -#%find_lang %{name} +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang # -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO @@ -70,6 +69,9 @@ %{_datadir}/applications/%{name}.desktop %changelog +* Wed Jul 23 2008 Xavier Lamien - 0.9.6-1 +- Update release. + * Sun Mar 16 2008 Xavier Lamien - 0.9.5-1 - Updated Release. - Added New requires against new release. From fedora-extras-commits at redhat.com Wed Jul 23 10:01:23 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Wed, 23 Jul 2008 10:01:23 GMT Subject: rpms/culmus-fonts/devel culmus-fonts.spec,1.1,1.2 Message-ID: <200807231001.m6NA1NsM021885@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/culmus-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15256 Modified Files: culmus-fonts.spec Log Message: Obsoleted fonts-hebrew Index: culmus-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/culmus-fonts/devel/culmus-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- culmus-fonts.spec 16 Oct 2007 10:15:54 -0000 1.1 +++ culmus-fonts.spec 23 Jul 2008 10:00:32 -0000 1.2 @@ -3,12 +3,15 @@ Name: %{fontname}-fonts Version: 0.101 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Source: http://downloads.sourceforge.net/sourceforge/%{fontname}/%{fontname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Group: User Interface/X +#Provides can be dropped in F11. +Provides: fonts-hebrew = 0.101-2 +Obsoletes: fonts-hebrew <= 0.101-2 Summary: Fonts for Hebrew from Culmus project URL: http://culmus.sourceforge.net/ @@ -51,6 +54,9 @@ %{fontdir}/*.afm %changelog +* Wed Jul 23 2008 Rahul Bhalerao - 0.101-5.fc10 +- Obsoleted dead package fonts-hebrew + * Mon Oct 15 2007 Rahul Bhalerao - 0.101-4.fc8 - License change From fedora-extras-commits at redhat.com Wed Jul 23 10:15:35 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Wed, 23 Jul 2008 10:15:35 GMT Subject: rpms/kacst-fonts/devel kacst-fonts.spec,1.1,1.2 Message-ID: <200807231015.m6NAFZSm022607@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/kacst-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22510 Modified Files: kacst-fonts.spec Log Message: Obsoleted fonts-arabic Index: kacst-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/kacst-fonts/devel/kacst-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kacst-fonts.spec 16 Oct 2007 16:15:51 -0000 1.1 +++ kacst-fonts.spec 23 Jul 2008 10:14:53 -0000 1.2 @@ -3,13 +3,16 @@ Name: %{fontname}-fonts Version: 1.6.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source: http://downloads.sourceforge.net/sourceforge/arabeyes/%{fontname}_fonts_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: dos2unix Group: User Interface/X +#Provides can be dropped in F11 +Provides: fonts-arabic = 2.1-2 +Obsoletes: fonts-arabic <= 2.1-2 Summary: Fonts for arabic from arabeyes project URL: http://www.arabeyes.org/resources.php @@ -52,6 +55,9 @@ %{fontdir}/*.ttf %changelog +* Wed Jul 23 2008 Rahul Bhalerao - 1.6.2-3.fc10 +- Obsoleted dead package fonts-arabic + * Mon Oct 15 2007 Rahul Bhalerao - 1.6.2-2.fc8 - Used dos2unix From fedora-extras-commits at redhat.com Wed Jul 23 10:17:15 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Wed, 23 Jul 2008 10:17:15 GMT Subject: rpms/packagekit-qt/devel import.log, NONE, 1.1 packagekit-qt-fedora.patch, NONE, 1.1 packagekit-qt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231017.m6NAHFoV022737@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/packagekit-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22668/devel Modified Files: .cvsignore sources Added Files: import.log packagekit-qt-fedora.patch packagekit-qt.spec Log Message: Initial package build --- NEW FILE import.log --- packagekit-qt-0_1-4_fc9:HEAD:packagekit-qt-0.1-4.fc9.src.rpm:1216808222 packagekit-qt-fedora.patch: --- NEW FILE packagekit-qt-fedora.patch --- diff -crB KPackageKit/lib/CMakeLists.txt KPackageKit-fedora/lib/CMakeLists.txt *** KPackageKit/lib/CMakeLists.txt 2008-07-06 23:44:12.000000000 -0400 --- KPackageKit-fedora/lib/CMakeLists.txt 2008-07-18 15:55:33.000000000 -0400 *************** *** 53,58 **** --- 53,59 ---- target_link_libraries(packagekit-qt ${QT_QTCORE_LIBRARY} + ${QT_QTDBUS_LIBRARY} polkit-dbus ) Only in KPackageKit-fedora/lib: CMakeLists.txt~ --- NEW FILE packagekit-qt.spec --- #%define _default_patch_fuzz 2 %define betaversion b3 Name: packagekit-qt Version: 0.1 Release: 4%{?dist} Summary: Qt interface for PackageKit License: GPLv2+ Group: System Environment/Libraries Source0: http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}-%{betaversion}.tar.bz2 Patch0: packagekit-qt-fedora.patch URL: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: qt4-devel >= 4.4 BuildRequires: PolicyKit-devel %description Qt interface for PackageKit. %package devel Summary: Development files for packagekit-qt Group: Development/Libraries Requires: packagekit-qt-libs-%{version}-%{release} Requires: cmake %description devel Development files for packagekit-qt. %files devel %defattr(-, root, root,-) %{_libdir}/*.so %{_includedir}/packagekit-qt %{_datadir}/cmake/Modules/FindQPackageKit.cmake %{_libdir}/libpackagekit-qt.so.0* #------------------------------------------------------------------------------ %prep %setup -q -n KPackageKit/lib %patch0 -p2 -b .generic %build %{cmake} . make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=${RPM_BUILD_ROOT} %clean rm -rf $RPM_BUILD_ROOT %changelog * Tue Jul 22 2008 Steven M. Parrish 4 - Removed unneeded -libs package * Tue Jul 22 2008 Steven M. Parrish 3 - Updated spec to include missing requires * Wed Jul 16 2008 Steven M. Parrish 2 - Removed uneeded BR and made use of predefined macros * Wed Jul 16 2008 Steven M. Parrish 1 - Initial SPEC Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:09:35 -0000 1.1 +++ .cvsignore 23 Jul 2008 10:16:32 -0000 1.2 @@ -0,0 +1 @@ +84745-kpackagekit-0.1-b3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:09:35 -0000 1.1 +++ sources 23 Jul 2008 10:16:32 -0000 1.2 @@ -0,0 +1 @@ +5dd2cffe88091c495f93ffd256faa68e 84745-kpackagekit-0.1-b3.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 10:19:29 2008 From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera)) Date: Wed, 23 Jul 2008 10:19:29 GMT Subject: rpms/kacst-fonts/devel kacst-fonts.spec,1.2,1.3 Message-ID: <200807231019.m6NAJTOK022873@cvs-int.fedora.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/kacst-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22833 Modified Files: kacst-fonts.spec Log Message: Dropped one release to fix tagging Index: kacst-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/kacst-fonts/devel/kacst-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kacst-fonts.spec 23 Jul 2008 10:14:53 -0000 1.2 +++ kacst-fonts.spec 23 Jul 2008 10:18:46 -0000 1.3 @@ -3,7 +3,7 @@ Name: %{fontname}-fonts Version: 1.6.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Source: http://downloads.sourceforge.net/sourceforge/arabeyes/%{fontname}_fonts_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +55,9 @@ %{fontdir}/*.ttf %changelog +* Wed Jul 23 2008 Rahul Bhalerao - 1.6.2-4.fc10 +- Dropping previous release + * Wed Jul 23 2008 Rahul Bhalerao - 1.6.2-3.fc10 - Obsoleted dead package fonts-arabic From fedora-extras-commits at redhat.com Wed Jul 23 10:21:08 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 23 Jul 2008 10:21:08 GMT Subject: rpms/hwdata/devel .cvsignore, 1.97, 1.98 hwdata.spec, 1.105, 1.106 sources, 1.100, 1.101 Message-ID: <200807231021.m6NAL89Y023031@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/hwdata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22979 Modified Files: .cvsignore hwdata.spec sources Log Message: - update pci.ids, usb.ids, oui.txt - MonitorsDB: add some Samsung monitors (Ronald Warsow) - MonitorsDB: add Dell E1609W (Matt Domsch) - MonitorsDB: add 7 Dell monitors (Matt Domsch) - MonitorsDB: add a bunch of Hyundai and ImageQuest monitors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hwdata/devel/.cvsignore,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- .cvsignore 2 Jun 2008 12:32:36 -0000 1.97 +++ .cvsignore 23 Jul 2008 10:20:23 -0000 1.98 @@ -1 +1 @@ -hwdata-0.219.tar.bz2 +hwdata-0.220.tar.bz2 Index: hwdata.spec =================================================================== RCS file: /cvs/extras/rpms/hwdata/devel/hwdata.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- hwdata.spec 2 Jun 2008 12:32:36 -0000 1.105 +++ hwdata.spec 23 Jul 2008 10:20:23 -0000 1.106 @@ -1,6 +1,6 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.219 +Version: 0.220 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -36,6 +36,17 @@ %{_datadir}/%{name}/* %changelog +* Wed Jul 23 2008 Karsten Hopp 0.220-1 +- update pci.ids, usb.ids, oui.txt +- MonitorsDB: add some Samsung monitors (Ronald Warsow) +- MonitorsDB: add Dell E1609W (Matt Domsch) +- MonitorsDB: add 7 Dell monitors (Matt Domsch) +- MonitorsDB: add a bunch of Hyundai and ImageQuest monitors + +* Mon Jun 09 2008 Karsten Hopp 0.219-1 +- add BenQ FP2091 monitor (Peter Williams) +- add a bunch of Hyundai and ImageQuest monitors + * Mon Jun 02 2008 Karsten Hopp 0.219-1 - update pci.ids, usb.ids, oui.txt - blacklist snd-pcsp (#448425) Index: sources =================================================================== RCS file: /cvs/extras/rpms/hwdata/devel/sources,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- sources 2 Jun 2008 12:32:36 -0000 1.100 +++ sources 23 Jul 2008 10:20:23 -0000 1.101 @@ -1 +1 @@ -56e5b06f47a9ab804255daf1f7bfa097 hwdata-0.219.tar.bz2 +80b74064c7bae6a18013b5525c6ceae6 hwdata-0.220.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 10:28:10 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 23 Jul 2008 10:28:10 GMT Subject: rpms/nautilus-sendto/devel .cvsignore, 1.14, 1.15 nautilus-sendto.spec, 1.54, 1.55 sources, 1.14, 1.15 Message-ID: <200807231028.m6NASAV6023431@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23366 Modified Files: .cvsignore nautilus-sendto.spec sources Log Message: * Wed Jul 23 2008 - Bastien Nocera - 1.0.1 - Update to 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 12 Jun 2008 13:29:29 -0000 1.14 +++ .cvsignore 23 Jul 2008 10:27:21 -0000 1.15 @@ -1 +1 @@ -nautilus-sendto-1.0.0.tar.bz2 +nautilus-sendto-1.0.1.tar.bz2 Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- nautilus-sendto.spec 12 Jun 2008 13:29:29 -0000 1.54 +++ nautilus-sendto.spec 23 Jul 2008 10:27:21 -0000 1.55 @@ -1,5 +1,5 @@ Name: nautilus-sendto -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Nautilus context menu for sending files @@ -91,6 +91,9 @@ %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Wed Jul 23 2008 - Bastien Nocera - 1.0.1 +- Update to 1.0.1 + * Thu Jun 12 2008 - Bastien Nocera - 1.0.0 - Update to 1.0.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 12 Jun 2008 13:29:29 -0000 1.14 +++ sources 23 Jul 2008 10:27:21 -0000 1.15 @@ -1 +1 @@ -89261c1a4acf7d1077abdda8e1fdce4f nautilus-sendto-1.0.0.tar.bz2 +33f2a9b27a7641967f97493453ca60ac nautilus-sendto-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 10:30:01 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 23 Jul 2008 10:30:01 GMT Subject: rpms/nautilus-sendto/F-9 .cvsignore, 1.14, 1.15 nautilus-sendto.spec, 1.51, 1.52 sources, 1.14, 1.15 Message-ID: <200807231030.m6NAU1Ux023618@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23538 Modified Files: .cvsignore nautilus-sendto.spec sources Log Message: * Wed Jul 23 2008 - Bastien Nocera - 1.0.1-1 - Update to 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 12 Jun 2008 13:28:03 -0000 1.14 +++ .cvsignore 23 Jul 2008 10:29:11 -0000 1.15 @@ -1 +1 @@ -nautilus-sendto-1.0.0.tar.bz2 +nautilus-sendto-1.0.1.tar.bz2 Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-9/nautilus-sendto.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- nautilus-sendto.spec 12 Jun 2008 13:28:03 -0000 1.51 +++ nautilus-sendto.spec 23 Jul 2008 10:29:11 -0000 1.52 @@ -1,5 +1,5 @@ Name: nautilus-sendto -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Nautilus context menu for sending files @@ -91,6 +91,9 @@ %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Wed Jul 23 2008 - Bastien Nocera - 1.0.1-1 +- Update to 1.0.1 + * Thu Jun 12 2008 - Bastien Nocera - 1.0.0-1 - Update to 1.0.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 12 Jun 2008 13:28:03 -0000 1.14 +++ sources 23 Jul 2008 10:29:11 -0000 1.15 @@ -1 +1 @@ -89261c1a4acf7d1077abdda8e1fdce4f nautilus-sendto-1.0.0.tar.bz2 +33f2a9b27a7641967f97493453ca60ac nautilus-sendto-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 10:30:14 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 10:30:14 GMT Subject: rpms/akonadi/F-9 .cvsignore, 1.2, 1.3 akonadi.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807231030.m6NAUEbF023667@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/akonadi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23551/F-9 Modified Files: .cvsignore akonadi.spec sources Log Message: Sync from devel: * Wed Jul 23 2008 Than Ngo - 1.0.0-1 - 1.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jul 2008 20:00:44 -0000 1.2 +++ .cvsignore 23 Jul 2008 10:29:26 -0000 1.3 @@ -1 +1,2 @@ akonadi-0.82.0.tar.bz2 +akonadi-1.0.0.tar.bz2 Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/akonadi.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- akonadi.spec 18 Jul 2008 20:03:45 -0000 1.1 +++ akonadi.spec 23 Jul 2008 10:29:26 -0000 1.2 @@ -1,16 +1,12 @@ -#define revision 812787 - Summary: PIM Storage Service Name: akonadi -Version: 0.82.0 +Version: 1.0.0 Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ -URL: http://pim.kde.org/akonadi/ -# checked out from svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi/ -#Source0: akonadi-%{revision}.tar.bz2 -Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/akonadi-%{version}.tar.bz2 +URL: http://download.akonadi-project.org/ +Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -45,7 +41,6 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean @@ -68,9 +63,7 @@ %{_bindir}/akonadictl %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.* -# own this completely for now, see #334681) %{_datadir}/dbus-1/interfaces/ -#%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_datadir}/mime/packages/akonadi-mime.xml @@ -81,6 +74,9 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 23 2008 Than Ngo - 1.0.0-1 +- 1.0.0 + * Wed Jun 18 2008 Rex Dieter 0.82.0-1 - akonadi-0.82.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jul 2008 20:00:44 -0000 1.2 +++ sources 23 Jul 2008 10:29:26 -0000 1.3 @@ -1 +1 @@ -a6ab075c69a54abc024285a76673110b akonadi-0.82.0.tar.bz2 +90039928f818a55a7e2a1bf852a32f2d akonadi-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 10:31:23 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Wed, 23 Jul 2008 10:31:23 GMT Subject: rpms/iptables/F-9 iptables-1.4.1.1-cloexec.patch, NONE, 1.1 iptables-1.4.1.1-tos_value_mask.patch, NONE, 1.1 iptables.spec, 1.71, 1.72 iptables-1.4.1-cloexec.patch, 1.1, NONE Message-ID: <200807231031.m6NAVNCq023788@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673 Modified Files: iptables.spec Added Files: iptables-1.4.1.1-cloexec.patch iptables-1.4.1.1-tos_value_mask.patch Removed Files: iptables-1.4.1-cloexec.patch Log Message: - fixed TOS value mask problem (rhbz#456244) (upstream patch) - two more cloexec fixes iptables-1.4.1.1-cloexec.patch: --- NEW FILE iptables-1.4.1.1-cloexec.patch --- diff -up iptables-1.4.1.1/extensions/libipt_realm.c.cloexec iptables-1.4.1.1/extensions/libipt_realm.c --- iptables-1.4.1.1/extensions/libipt_realm.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/extensions/libipt_realm.c 2008-07-22 16:46:21.000000000 +0200 @@ -50,7 +50,7 @@ static void load_realms(void) int id; struct realmname *oldnm = NULL, *newnm = NULL; - fil = fopen(rfnm, "r"); + fil = fopen(rfnm, "re"); if (!fil) { rdberr = 1; return; @@ -256,7 +256,7 @@ static struct xtables_match realm_mt_reg .extra_opts = realm_opts, }; -void _init(void) +void __attribute((constructor)) nf_ext_init(void) { xtables_register_match(&realm_mt_reg); } diff -up iptables-1.4.1.1/ip6tables-restore.c.cloexec iptables-1.4.1.1/ip6tables-restore.c --- iptables-1.4.1.1/ip6tables-restore.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/ip6tables-restore.c 2008-07-22 16:46:21.000000000 +0200 @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s\n", argv[optind], strerror(errno)); diff -up iptables-1.4.1.1/ip6tables-save.c.cloexec iptables-1.4.1.1/ip6tables-save.c --- iptables-1.4.1.1/ip6tables-save.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/ip6tables-save.c 2008-07-22 16:46:21.000000000 +0200 @@ -40,7 +40,7 @@ static int for_each_table(int (*func)(co FILE *procfile = NULL; char tablename[IP6T_TABLE_MAXNAMELEN+1]; - procfile = fopen("/proc/net/ip6_tables_names", "r"); + procfile = fopen("/proc/net/ip6_tables_names", "re"); if (!procfile) exit_error(OTHER_PROBLEM, "Unable to open /proc/net/ip6_tables_names: %s\n", diff -up iptables-1.4.1.1/iptables-restore.c.cloexec iptables-1.4.1.1/iptables-restore.c --- iptables-1.4.1.1/iptables-restore.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/iptables-restore.c 2008-07-22 16:46:21.000000000 +0200 @@ -176,7 +176,7 @@ main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s\n", argv[optind], strerror(errno)); diff -up iptables-1.4.1.1/iptables-save.c.cloexec iptables-1.4.1.1/iptables-save.c --- iptables-1.4.1.1/iptables-save.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/iptables-save.c 2008-07-22 16:46:21.000000000 +0200 @@ -38,7 +38,7 @@ static int for_each_table(int (*func)(co FILE *procfile = NULL; char tablename[IPT_TABLE_MAXNAMELEN+1]; - procfile = fopen("/proc/net/ip_tables_names", "r"); + procfile = fopen("/proc/net/ip_tables_names", "re"); if (!procfile) exit_error(OTHER_PROBLEM, "Unable to open /proc/net/ip_tables_names: %s\n", diff -up iptables-1.4.1.1/iptables-xml.c.cloexec iptables-1.4.1.1/iptables-xml.c --- iptables-1.4.1.1/iptables-xml.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/iptables-xml.c 2008-07-22 16:46:21.000000000 +0200 @@ -664,7 +664,7 @@ main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s", argv[optind], strerror(errno)); diff -up iptables-1.4.1.1/xtables.c.cloexec iptables-1.4.1.1/xtables.c --- iptables-1.4.1.1/xtables.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/xtables.c 2008-07-22 16:47:23.000000000 +0200 @@ -85,6 +85,11 @@ static char *get_modprobe(void) procfile = open(PROC_SYS_MODPROBE, O_RDONLY); if (procfile < 0) return NULL; + if (fcntl(procfile, F_SETFD, FD_CLOEXEC) == -1) { + fprintf(stderr, "Could not set close on exec: %s\n", + strerror(errno)); + exit(1); + } ret = (char *) malloc(PROCFILE_BUFSIZ); if (ret) { @@ -498,6 +503,12 @@ static int compatible_revision(const cha exit(1); } + if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) { + fprintf(stderr, "Could not set close on exec: %s\n", + strerror(errno)); + exit(1); + } + load_xtables_ko(modprobe_program, 1); strcpy(rev.name, name); iptables-1.4.1.1-tos_value_mask.patch: --- NEW FILE iptables-1.4.1.1-tos_value_mask.patch --- diff -up iptables-1.4.1.1/extensions/tos_values.c.tos_value_mask iptables-1.4.1.1/extensions/tos_values.c --- iptables-1.4.1.1/extensions/tos_values.c.tos_value_mask 2008-07-22 16:48:36.000000000 +0200 +++ iptables-1.4.1.1/extensions/tos_values.c 2008-07-22 17:23:46.000000000 +0200 @@ -56,8 +56,9 @@ static bool tos_parse_symbolic(const cha { const unsigned int max = 255; const struct tos_symbol_info *symbol; + char *tmp; - if (strtonum(str, NULL, NULL, 0, max)) + if (strtonum(str, &tmp, NULL, 0, max)) return tos_parse_numeric(str, tvm, max); /* Do not consider ECN bits */ Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/F-9/iptables.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- iptables.spec 1 Jul 2008 09:59:04 -0000 1.71 +++ iptables.spec 23 Jul 2008 10:30:29 -0000 1.72 @@ -1,13 +1,14 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities Version: 1.4.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config Patch4: iptables-1.3.8-typo_latter.patch -Patch5: iptables-1.4.1-cloexec.patch +Patch5: iptables-1.4.1.1-cloexec.patch Patch8: iptables-1.4.1-nf_ext_init.patch +Patch9: iptables-1.4.1.1-tos_value_mask.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -55,6 +56,7 @@ %patch4 -p1 -b .typo_latter %patch5 -p1 -b .cloexec %patch8 -p1 -b .nf_ext_init +%patch9 -p1 -b .tos_value_mask # fix constructor names, see also nf_ext_init patch perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c @@ -131,6 +133,10 @@ %{_mandir}/man3/* %changelog +* Tue Jul 22 2008 Thomas Woerner 1.4.1.1-2 +- fixed TOS value mask problem (rhbz#456244) (upstream patch) +- two more cloexec fixes + * Tue Jul 1 2008 Thomas Woerner 1.4.1.1-1 - upstream bug fix release 1.4.1.1 - dropped extra patch for 1.4.1 - not needed anymore --- iptables-1.4.1-cloexec.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 10:31:59 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 23 Jul 2008 10:31:59 GMT Subject: rpms/nautilus-sendto/F-8 .cvsignore, 1.11, 1.12 nautilus-sendto.spec, 1.46, 1.47 sources, 1.11, 1.12 Message-ID: <200807231031.m6NAVxLs023862@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23706 Modified Files: .cvsignore nautilus-sendto.spec sources Log Message: * Wed Jul 23 2008 - Bastien Nocera 1.0.1-1 - Update to 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-8/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 12 Jun 2008 13:26:41 -0000 1.11 +++ .cvsignore 23 Jul 2008 10:30:51 -0000 1.12 @@ -1 +1 @@ -nautilus-sendto-1.0.0.tar.bz2 +nautilus-sendto-1.0.1.tar.bz2 Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-8/nautilus-sendto.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- nautilus-sendto.spec 12 Jun 2008 13:26:41 -0000 1.46 +++ nautilus-sendto.spec 23 Jul 2008 10:30:51 -0000 1.47 @@ -1,5 +1,5 @@ Name: nautilus-sendto -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Nautilus context menu for sending files @@ -90,6 +90,9 @@ %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Wed Jul 23 2008 - Bastien Nocera 1.0.1-1 +- Update to 1.0.1 + * Thu Jun 12 2008 - Bastien Nocera - 1.0.0-1 - Update to 1.0.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-8/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 12 Jun 2008 13:26:41 -0000 1.11 +++ sources 23 Jul 2008 10:30:51 -0000 1.12 @@ -1 +1 @@ -89261c1a4acf7d1077abdda8e1fdce4f nautilus-sendto-1.0.0.tar.bz2 +33f2a9b27a7641967f97493453ca60ac nautilus-sendto-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 10:40:47 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 23 Jul 2008 10:40:47 GMT Subject: rpms/vim/devel vim-7.1-lib64.patch, NONE, 1.1 vim.spec, 1.215, 1.216 vim-6.4-lib64.patch, 1.1, NONE Message-ID: <200807231040.m6NAelQb024324@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24272 Modified Files: vim.spec Added Files: vim-7.1-lib64.patch Removed Files: vim-6.4-lib64.patch Log Message: - new patch for fuzz=0 vim-7.1-lib64.patch: --- NEW FILE vim-7.1-lib64.patch --- diff -up vim71/src/auto/configure.lib64 vim71/src/auto/configure --- vim71/src/auto/configure.lib64 2008-07-23 12:36:17.000000000 +0200 +++ vim71/src/auto/configure 2008-07-23 12:37:04.000000000 +0200 @@ -4291,7 +4291,7 @@ else vi_cv_path_python_conf= for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do - for subdir in lib share; do + for subdir in lib64 lib share; do d="${path}/${subdir}/python${vi_cv_var_python_version}/config" if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python_conf="$d" diff -up vim71/src/configure.in.lib64 vim71/src/configure.in --- vim71/src/configure.in.lib64 2008-07-23 12:36:17.000000000 +0200 +++ vim71/src/configure.in 2008-07-23 12:36:17.000000000 +0200 @@ -634,7 +634,7 @@ if test "$enable_pythoninterp" = "yes"; [ vi_cv_path_python_conf= for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do - for subdir in lib share; do + for subdir in lib64 lib share; do d="${path}/${subdir}/python${vi_cv_var_python_version}/config" if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python_conf="$d" Index: vim.spec =================================================================== RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- vim.spec 18 Jul 2008 14:55:20 -0000 1.215 +++ vim.spec 23 Jul 2008 10:40:01 -0000 1.216 @@ -393,7 +393,7 @@ Patch3004: vim-7.0-rclocation.patch Patch3006: vim-6.4-checkhl.patch Patch3007: vim-7.0-fstabsyntax.patch -Patch3008: vim-6.4-lib64.patch +Patch3008: vim-7.1-lib64.patch Patch3009: vim-7.0-warning.patch Patch3010: vim-7.0-syncolor.patch Patch3011: vim-7.0-vimspelltypo.patch --- vim-6.4-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 10:41:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:41:36 +0000 Subject: [pkgdb] gdb: vda has requested watchbugzilla Message-ID: <20080723104136.E3E3F1AD0E0@bastion.fedora.phx.redhat.com> Denys Vlasenko (vda) has requested the watchbugzilla acl on gdb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:41:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:41:46 +0000 Subject: [pkgdb] gdb: vda has requested watchcommits Message-ID: <20080723104146.544CA1AD0E0@bastion.fedora.phx.redhat.com> Denys Vlasenko (vda) has requested the watchcommits acl on gdb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:41:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:41:54 +0000 Subject: [pkgdb] gdb: vda has requested watchcommits Message-ID: <20080723104154.52BF81AD0E0@bastion.fedora.phx.redhat.com> Denys Vlasenko (vda) has requested the watchcommits acl on gdb (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:41:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:41:55 +0000 Subject: [pkgdb] gdb: vda has requested watchbugzilla Message-ID: <20080723104155.96C1D1AD0E0@bastion.fedora.phx.redhat.com> Denys Vlasenko (vda) has requested the watchbugzilla acl on gdb (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:43:40 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Wed, 23 Jul 2008 10:43:40 GMT Subject: rpms/sugar-toolkit/F-9 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 sugar-toolkit.spec, 1.13, 1.14 Message-ID: <200807231043.m6NAhehB024488@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24446 Modified Files: .cvsignore sources sugar-toolkit.spec Log Message: * Wed Jul 23 2008 Simon Schampijer - 0.81.7-1 - 5136 Keep error alert hard to find - 6014 Shutdown should sync activities data - 7532 install + open content bundles with journal - 7523 library index regeneration fails due to no XDG_DATA_DIRS - 4208 Battery indicator's icon fullness inconsistent with indicator %. - 7444 cannot close a shared activity when the initiator has disconnected - 7430 Favorites view is not preserved - 7434 Control panel UI for power management. - 5079 Could simplify sharing code Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 Jul 2008 18:11:08 -0000 1.10 +++ .cvsignore 23 Jul 2008 10:42:54 -0000 1.11 @@ -1 +1 @@ -sugar-toolkit-0.81.6-gitd17347cc19.tar.bz2 +sugar-toolkit-0.81.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 15 Jul 2008 18:11:08 -0000 1.11 +++ sources 23 Jul 2008 10:42:54 -0000 1.12 @@ -1 +1 @@ -61fdb0e546b4798ba43d674188ab3e3a sugar-toolkit-0.81.6-gitd17347cc19.tar.bz2 +068d5114650bdd68fc3ac8c5f3e8d803 sugar-toolkit-0.81.7.tar.bz2 Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-9/sugar-toolkit.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sugar-toolkit.spec 15 Jul 2008 18:11:08 -0000 1.13 +++ sugar-toolkit.spec 23 Jul 2008 10:42:54 -0000 1.14 @@ -5,15 +5,15 @@ Summary: Sugar toolkit Name: sugar-toolkit -Version: 0.81.6 -#Release: 1%{?dist} -Release: 3.%{alphatag}%{?dist} +Version: 0.81.7 +Release: 1%{?dist} +#Release: 3.%{alphatag}%{?dist} URL: http://wiki.laptop.org/go/Sugar # git clone git://dev.laptop.org/sugar # cd sugar # git-checkout %{commitid} -Source0: %{name}-%{version}-git%{commitid}.tar.bz2 -#Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 +#Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 Source1: macros.sugar License: LGPLv2 Group: System Environment/Libraries @@ -65,6 +65,17 @@ %{_sysconfdir}/rpm/macros.sugar %changelog +* Wed Jul 23 2008 Simon Schampijer - 0.81.7-1 +- 5136 Keep error alert hard to find +- 6014 Shutdown should sync activities data +- 7532 install + open content bundles with journal +- 7523 library index regeneration fails due to no XDG_DATA_DIRS +- 4208 Battery indicator's icon fullness inconsistent with indicator %. +- 7444 cannot close a shared activity when the initiator has disconnected +- 7430 Favorites view is not preserved +- 7434 Control panel UI for power management. +- 5079 Could simplify sharing code + * Tue Jul 15 2008 Simon Schampijer - 0.81.6-3.20080715gitd17347cc19 - git snapshot - 7523 fix content bundle installation From fedora-extras-commits at redhat.com Wed Jul 23 10:48:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:48:29 +0000 Subject: [pkgdb] gdb had acl change status Message-ID: <20080723104829.BEA7B1AD0E0@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchbugzilla acl on gdb (Fedora devel) to Approved for Denys Vlasenko (vda) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:48:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:48:31 +0000 Subject: [pkgdb] gdb had acl change status Message-ID: <20080723104831.2F5BB1AD0E0@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchcommits acl on gdb (Fedora devel) to Approved for Denys Vlasenko (vda) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:48:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:48:36 +0000 Subject: [pkgdb] gdb had acl change status Message-ID: <20080723104837.0B8F91AD0E0@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchbugzilla acl on gdb (Fedora 9) to Approved for Denys Vlasenko (vda) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:48:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 10:48:38 +0000 Subject: [pkgdb] gdb had acl change status Message-ID: <20080723104839.C62851AD0DD@bastion.fedora.phx.redhat.com> Jan Kratochvil (jkratoch) has set the watchcommits acl on gdb (Fedora 9) to Approved for Denys Vlasenko (vda) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdb From fedora-extras-commits at redhat.com Wed Jul 23 10:52:07 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 23 Jul 2008 10:52:07 GMT Subject: rpms/shared-mime-info/devel .cvsignore, 1.18, 1.19 shared-mime-info.spec, 1.70, 1.71 sources, 1.18, 1.19 Message-ID: <200807231052.m6NAq7r0024927@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/shared-mime-info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24862 Modified Files: .cvsignore shared-mime-info.spec sources Log Message: * Wed Jul 23 2008 - Bastien Nocera - 0.51-1 - Update to 0.51 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 22 Jul 2008 14:58:28 -0000 1.18 +++ .cvsignore 23 Jul 2008 10:51:20 -0000 1.19 @@ -1 +1 @@ -shared-mime-info-0.50.tar.bz2 +shared-mime-info-0.51.tar.bz2 Index: shared-mime-info.spec =================================================================== RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- shared-mime-info.spec 22 Jul 2008 17:23:59 -0000 1.70 +++ shared-mime-info.spec 23 Jul 2008 10:51:20 -0000 1.71 @@ -1,6 +1,6 @@ Summary: Shared MIME information database Name: shared-mime-info -Version: 0.50 +Version: 0.51 Release: 1%{?dist} License: GPL+ Group: System Environment/Libraries @@ -63,6 +63,9 @@ %{_mandir}/man*/* %changelog +* Wed Jul 23 2008 - Bastien Nocera - 0.51-1 +- Update to 0.51 + * Tue Jul 22 2008 - Bastien Nocera - 0.50-1 - Update to 0.50 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 22 Jul 2008 14:58:28 -0000 1.18 +++ sources 23 Jul 2008 10:51:20 -0000 1.19 @@ -1 +1 @@ -e6adfaf1989140b3d3930c3842a01895 shared-mime-info-0.50.tar.bz2 +01d72161f7d88123fbccd378871f02f0 shared-mime-info-0.51.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 10:54:18 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 23 Jul 2008 10:54:18 GMT Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.55,1.56 Message-ID: <200807231054.m6NAsISG025036@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24999 Modified Files: nautilus-sendto.spec Log Message: Add intltool BR Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- nautilus-sendto.spec 23 Jul 2008 10:27:21 -0000 1.55 +++ nautilus-sendto.spec 23 Jul 2008 10:53:17 -0000 1.56 @@ -16,7 +16,7 @@ BuildRequires: nautilus-devel >= 2.5.4 BuildRequires: pidgin-devel >= 2.0.0 BuildRequires: gettext -BuildRequires: perl-XML-Parser +BuildRequires: perl-XML-Parser intltool BuildRequires: dbus-glib-devel >= 0.70 Requires(pre): GConf2 From fedora-extras-commits at redhat.com Wed Jul 23 11:03:32 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 23 Jul 2008 11:03:32 GMT Subject: rpms/slib/F-8 slib-3b1-guile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 slib.spec, 1.14, 1.15 sources, 1.4, 1.5 slib-3a4-guile.patch, 1.1, NONE Message-ID: <200807231103.m6NB3Wjh032025@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/slib/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31922 Modified Files: .cvsignore slib.spec sources Added Files: slib-3b1-guile.patch Removed Files: slib-3a4-guile.patch Log Message: - update to 3b1 - replace slib paths only in .init files slib-3b1-guile.patch: --- NEW FILE slib-3b1-guile.patch --- diff -up slib/guile.init.guile slib/guile.init --- slib/guile.init.guile 2007-12-24 05:33:08.000000000 +0100 +++ slib/guile.init 2008-02-14 15:17:54.000000000 +0100 @@ -53,7 +53,10 @@ (define implementation-vicinity (cond ((and (defined? 'getenv) (getenv "GUILE_IMPLEMENTATION_PATH")) => (lambda (path) (lambda () path))) - (else %site-dir))) + (else (let* ((path (or (%search-load-path "slib/qp.scm") + (error "Could not find slib/qp.scm in " %load-path))) + (vic (substring path 0 (- (string-length path) 11)))) + (lambda () vic))))) ;;; (library-vicinity) should be defined to be the pathname of the ;;; directory where files of Scheme library functions reside. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/slib/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Jan 2007 13:50:17 -0000 1.4 +++ .cvsignore 23 Jul 2008 11:02:43 -0000 1.5 @@ -1 +1 @@ -slib3a4.zip +slib-3b1.zip Index: slib.spec =================================================================== RCS file: /cvs/pkgs/rpms/slib/F-8/slib.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- slib.spec 22 Jun 2007 08:57:08 -0000 1.14 +++ slib.spec 23 Jul 2008 11:02:43 -0000 1.15 @@ -1,12 +1,12 @@ Summary: Platform independent library for scheme Name: slib -Version: 3a4 -Release: 2%{?dist} +Version: 3b1 +Release: 1%{?dist} License: SLIB Group: Development/Languages BuildArch: noarch -Source0: ftp://swissnet.ai.mit.edu/pub/scm/slib%{version}.zip -Patch1: slib-3a4-guile.patch +Source0: http://swiss.csail.mit.edu/ftpdir/scm/slib-%{version}.zip +Patch1: slib-3b1-guile.patch URL: http://swissnet.ai.mit.edu/~jaffer/SLIB.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -23,12 +23,7 @@ %prep %setup -q -n %{name} %patch1 -p1 -b .guile -for i in *; do - sed -e "s,/usr/local/lib,%{_datadir},g" \ - -e "s,/usr/lib,%{_datadir},g" \ - -e "s,/usr/local,/usr,g" < "${i}" > "${i}.tmp" - mv "${i}.tmp" "${i}" -done +sed -r -i "s,/usr/(local/)?lib/slib,%{_datadir}/slib,g" *.init %build @@ -60,6 +55,10 @@ %{_infodir}/slib.* %changelog +* Wed Jul 23 2008 Miroslav Lichvar 3b1-1 +- update to 3b1 +- replace slib paths only in .init files + * Fri Jun 22 2007 Miroslav Lichvar 3a4-2 - fix summary and buildroot (#226421) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slib/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Jan 2007 13:50:17 -0000 1.4 +++ sources 23 Jul 2008 11:02:43 -0000 1.5 @@ -1 +1 @@ -b0df4089264fd248c9c4f6d2e074b9f6 slib3a4.zip +9622df4aba2fde24eeb4456d97c5add1 slib-3b1.zip --- slib-3a4-guile.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 11:07:55 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 23 Jul 2008 11:07:55 GMT Subject: rpms/nautilus-sendto/F-9 nautilus-sendto.spec,1.52,1.53 Message-ID: <200807231107.m6NB7tp4032241@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32192 Modified Files: nautilus-sendto.spec Log Message: intltool BR Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-9/nautilus-sendto.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- nautilus-sendto.spec 23 Jul 2008 10:29:11 -0000 1.52 +++ nautilus-sendto.spec 23 Jul 2008 11:07:06 -0000 1.53 @@ -16,7 +16,7 @@ BuildRequires: nautilus-devel >= 2.5.4 BuildRequires: pidgin-devel >= 2.0.0 BuildRequires: gettext -BuildRequires: perl-XML-Parser +BuildRequires: perl-XML-Parser intltool BuildRequires: dbus-glib-devel >= 0.70 Requires(pre): GConf2 From fedora-extras-commits at redhat.com Wed Jul 23 11:12:06 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 23 Jul 2008 11:12:06 GMT Subject: rpms/nautilus-sendto/F-8 nautilus-sendto.spec,1.47,1.48 Message-ID: <200807231112.m6NBC6Lb032435@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32372 Modified Files: nautilus-sendto.spec Log Message: intltool BR Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-8/nautilus-sendto.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- nautilus-sendto.spec 23 Jul 2008 10:30:51 -0000 1.47 +++ nautilus-sendto.spec 23 Jul 2008 11:11:17 -0000 1.48 @@ -16,7 +16,7 @@ BuildRequires: nautilus-devel >= 2.5.4 BuildRequires: pidgin-devel >= 2.0.0 BuildRequires: gettext -BuildRequires: perl-XML-Parser +BuildRequires: perl-XML-Parser intltool BuildRequires: dbus-glib-devel >= 0.70 Requires(pre): GConf2 From fedora-extras-commits at redhat.com Wed Jul 23 11:13:33 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 23 Jul 2008 11:13:33 GMT Subject: rpms/guile/F-9 guile-1.8.5-conts.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 guile.spec, 1.58, 1.59 sources, 1.15, 1.16 Message-ID: <200807231113.m6NBDXqa032547@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/guile/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32483 Modified Files: .cvsignore guile.spec sources Added Files: guile-1.8.5-conts.patch Log Message: - update to 1.8.5 - fix continuations on ia64 guile-1.8.5-conts.patch: --- NEW FILE guile-1.8.5-conts.patch --- >From 78aa4a8850396801f2e5515565d051b45b4f15b5 Mon Sep 17 00:00:00 2001 From: Neil Jerram Date: Thu, 8 May 2008 00:29:53 +0100 Subject: [PATCH] Fix continuation problems on IA64. * Specific problems in IA64 make check ** test-unwind Representation of the relevant dynamic context: non-rewindable catch frame make cont. o----o-----a----------b-------------c \ \ call cont. o-----o-----------d A continuation is captured at (c), with a non-rewindable frame in the dynamic context at (b). If a rewind through that frame was attempted, Guile would throw to the catch at (a). Then the context unwinds back past (a), then winds forwards again, and the captured continuation is called at (d). We should end up at the catch at (a). On ia64, we get an "illegal instruction". The problem is that Guile does not restore the ia64 register backing store (RBS) stack (which is saved off when the continuation is captured) until all the unwinding and rewinding is done. Therefore, when the rewind code (scm_i_dowinds) hits the non-rewindable frame at (b), the RBS stack hasn't yet been restored. The throw finds the jmp_buf (for the catch at (a)) correctly from the dynamic context, and jumps back to (a), but the RBS stack is invalid, hence the illegal instruction. This could be fixed by restoring the RBS stack earlier, at the same point (copy_stack) where the normal stack is restored. But that causes a problem in the next test... ** continuations.test The dynamic context diagram for this case is similar: non-rewindable catch frame make cont. a----x-----o----------b-------------c \ \ call cont. o-------d The only significant difference is that the catch point (a) is upstream of where the dynamic context forks. This means that the RBS stack at (d) already contains the correct RBS contents for throwing back to (a), so it doesn't matter whether the RBS stack that was saved off with the continuation gets restored. This test passes with the Guile 1.8.4 code, but fails (with an "illegal instruction") when the code is changed to restore the RBS stack earlier as described above. The problem now is that the RBS stack is being restored _too_ early; specifically when there is still stuff to do that relies on the old RBS contents. When a continuation is called, the sequence of relevant events is: (1) Grow the (normal) stack until it is bigger than the (normal) stack saved off in the continuation. (scm_dynthrow, grow_stack) (2) scm_i_dowinds calls itself recursively, such that (2.1) for each rewind (from (x) to (c)) that will be needed, another frame is added to the stack (both normal and RBS), with local variables specifying the required rewind; the rewinds don't actually happen yet, they will happen when the stack unwinds again through these frames (2.2) required unwinds - back from where the continuation was called (d) to the fork point (x) - are done immediately. (3) The normal (i.e. non-RBS) stack that was stored in the continuation is restored (i.e. copied on top of the actual stack). Note that this doesn't overwrite the frames that were added in (2.1), because the growth in (1) ensures that the added frames are beyond the end of the restored stack. (4) ? Restore the RBS stack here too ? (5) Return (from copy_stack) through the (2.1) frames, which means that the rewinds now happen. (6) setcontext (or longjmp) to the context (c) where the continuation was captured. The trouble is that step (1) does not create space in the RBS stack in the same kind of way that it does for the normal stack. Therefore, if the saved (in the continuation) RBS stack is big enough, it can overwrite the RBS of the (2.1) frames that still need to complete. This causes an illegal instruction when we return through those frames and try to perform the rewinds. * Fix The key to the fix is that the saved RBS stack only needs to be restored at some point before the next setcontext call, and that doing it as close to the setcontext call as possible will avoid bad interactions with the pre-setcontext stack. Therefore we do the restoration at the last possible point, immediately before the next setcontext call. The situation is complicated by there being two ways that the next setcontext call can happen. - If the unwinding and rewinding is all successful, the next setcontext will be the one from step (6) above. This is the "normal" continuation invocation case. - If one of the rewinds throws an error, the next setcontext will come from the throw implementation code. (And the one in step (6) will never happen.) This is the rewind error case. In the rewind error case, the code calling setcontext knows nothing about the continuation. So to cover both cases, we: - copy (in step (4) above) the address and length of the continuation's saved RBS stack to the current thread state (SCM_I_CURRENT_THREAD) - modify all setcontext callers so that they check the current thread state for a saved RBS stack, and restore it if so before calling setcontext. * Notes ** I think rewinders cannot rely on using any stack data Unless it can be guaranteed that the data won't go into a register. I'm not 100% sure about this, but I think it follows from the fact that the RBS stack is not restored until after the rewinds have happened. Note that this isn't a regression caused by the current fix. In Guile 1.8.4, the RBS stack was restored _after_ the rewinds, and this is still the case now. ** Most setcontext calls for `throw' don't need to change the RBS stack In the absence of continuation invocation, the setcontext call in the throw implementation code always sets context to a place higher up the same stack (both normal and RBS), hence no stack restoration is needed. * Other changes ** Using setcontext for all non-local jumps (for __ia64__) Along the way, I read a claim somewhere that setcontext was more reliable than longjmp, in cases where the stack has been manipulated. I don't now have any reason to believe this, but it seems reasonable anyway to leave the __ia64__ code using getcontext/setcontext, instead of setjmp/longjmp. (I think the only possible argument against this would be performance - if getcontext was significantly slower than setjmp. It that proves to be the case, we should revisit this.) ** Capping RBS base for non-main threads Somewhere else along the way, I hit a problem in GC, involving the RBS stack of a non-main thread. The problem was, in SCM_MARK_BACKING_STORE, that scm_ia64_register_backing_store_base was returning a value that was massively greater than the value of scm_ia64_ar_bsp, leading to a seg fault. This is because the implementation of scm_ia64_register_backing_store_base is only valid for the main thread. I couldn't find a neat way of getting the true RBS base of a non-main thread, but one idea is simply to call scm_ia64_ar_bsp when guilifying a thread, and use the value returned as an upper bound for that thread's RBS base. (Note that the RBS stack grows upwards.) (Were it not for scm_init_guile, we could be much more definitive about this. We could take the value of scm_ia64_ar_bsp as a definitive base address for the part of the RBS stack that Guile cares about. We could also then discard scm_ia64_register_backing_store_base.) --- libguile/ChangeLog | 35 +++++++++++++++++++++++++++ libguile/__scm.h | 18 +++++++++++++- libguile/continuations.c | 58 +++++++++++++++++++++------------------------ libguile/continuations.h | 2 - libguile/threads.c | 20 ++++++++++++++- libguile/threads.h | 5 ++++ libguile/throw.c | 6 ++++ 7 files changed, 108 insertions(+), 36 deletions(-) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 6c25443..dec6dcd 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,38 @@ +2008-05-08 Neil Jerram + + * throw.c (scm_ithrow): For IA64 add a return statement, to + appease GCC. + + * threads.h (scm_i_thread): New IA64 fields: + register_backing_store_base and pending_rbs_continuation. + + * threads.c (guilify_self_1): For IA64: cap RBS base address at + the current value of scm_ia64_ar_bsp, and store the capped value + in thread state. + (SCM_MARK_BACKING_STORE): Use thread->register_backing_store_base + instead of scm_ia64_register_backing_store_base(). + (scm_threads_mark_stacks): Add "&" in "&t->regs", so that the code + works both for jmp_buf defined as an array, and jmp_buf defined as + a struct. + + * continuations.h (scm_t_contregs): Remove `fresh' and `ctx' + fields; these are now inside the IA64 definition of `jmp_buf'. + + * continuations.c (scm_make_continuation): Simplify, by moving + some of the IA64 code inside the definition of "setjmp", and by + some obvious commonizations. For IA64 register backing store + (RBS) stack base, use thread->register_backing_store_base instead + of scm_ia64_register_backing_store_base(). + (copy_stack): For IA64, store pointer to continuation being + invoked in thread state, so we can restore the continuation's RBS + stack just before the next setcontext call. + (copy_stack_and_call): Don't restore RBS stack explicitly here. + It will be restored, if appropriate, inside the longjmp call. + (scm_ia64_longjmp): New function. + + * __scm.h (setjmp, longjmp, jmp_buf): For IA64, implement using + getcontext and setcontext. + 2008-05-07 Ludovic Court??s * numbers.c (scm_from_complex_double): Mark as `SCM_UNUSED'. diff --git a/libguile/__scm.h b/libguile/__scm.h index 3d6d9a7..b198f9d 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -402,7 +402,23 @@ # define setjmp setjump # define longjmp longjump # else /* ndef _CRAY1 */ -# include +# if defined (__ia64__) +/* For IA64, emulate the setjmp API using getcontext. */ +# include +# include + typedef struct { + ucontext_t ctx; + int fresh; + } jmp_buf; +# define setjmp(JB) \ + ( (JB).fresh = 1, \ + getcontext (&((JB).ctx)), \ + ((JB).fresh ? ((JB).fresh = 0, 0) : 1) ) +# define longjmp(JB,VAL) scm_ia64_longjmp (&(JB), VAL) + void scm_ia64_longjmp (jmp_buf *, int); +# else /* ndef __ia64__ */ +# include +# endif /* ndef __ia64__ */ # endif /* ndef _CRAY1 */ #endif /* ndef vms */ diff --git a/libguile/continuations.c b/libguile/continuations.c index 39785a5..80a2790 100644 --- a/libguile/continuations.c +++ b/libguile/continuations.c @@ -124,47 +124,30 @@ scm_make_continuation (int *first) continuation->offset = continuation->stack - src; memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size); -#ifdef __ia64__ - continuation->fresh = 1; - getcontext (&continuation->ctx); - if (continuation->fresh) + *first = !setjmp (continuation->jmpbuf); + if (*first) { +#ifdef __ia64__ continuation->backing_store_size = - (char *) scm_ia64_ar_bsp(&continuation->ctx) + (char *) scm_ia64_ar_bsp(&continuation->jmpbuf.ctx) - - (char *) scm_ia64_register_backing_store_base (); + (char *) thread->register_backing_store_base; continuation->backing_store = NULL; continuation->backing_store = scm_gc_malloc (continuation->backing_store_size, "continuation backing store"); memcpy (continuation->backing_store, - (void *) scm_ia64_register_backing_store_base (), + (void *) thread->register_backing_store_base, continuation->backing_store_size); - *first = 1; - continuation->fresh = 0; +#endif /* __ia64__ */ return cont; } else { SCM ret = continuation->throw_value; - *first = 0; continuation->throw_value = SCM_BOOL_F; return ret; } -#else /* !__ia64__ */ - if (setjmp (continuation->jmpbuf)) - { - SCM ret = continuation->throw_value; - *first = 0; - continuation->throw_value = SCM_BOOL_F; - return ret; - } - else - { - *first = 1; - return cont; - } -#endif /* !__ia64__ */ } #undef FUNC_NAME @@ -218,6 +201,9 @@ copy_stack (void *data) copy_stack_data *d = (copy_stack_data *)data; memcpy (d->dst, d->continuation->stack, sizeof (SCM_STACKITEM) * d->continuation->num_stack_items); +#ifdef __ia64__ + SCM_I_CURRENT_THREAD->pending_rbs_continuation = d->continuation; +#endif } static void @@ -235,16 +221,26 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val, scm_i_set_last_debug_frame (continuation->dframe); continuation->throw_value = val; -#ifdef __ia64__ - memcpy (scm_ia64_register_backing_store_base (), - continuation->backing_store, - continuation->backing_store_size); - setcontext (&continuation->ctx); -#else longjmp (continuation->jmpbuf, 1); -#endif } +#ifdef __ia64__ +void +scm_ia64_longjmp (jmp_buf *JB, int VAL) +{ + scm_i_thread *t = SCM_I_CURRENT_THREAD; + + if (t->pending_rbs_continuation) + { + memcpy (t->register_backing_store_base, + t->pending_rbs_continuation->backing_store, + t->pending_rbs_continuation->backing_store_size); + t->pending_rbs_continuation = NULL; + } + setcontext (&JB->ctx); +} +#endif + /* Call grow_stack until the stack space is large enough, then, as the current * stack frame might get overwritten, let copy_stack_and_call perform the * actual copying and continuation calling. diff --git a/libguile/continuations.h b/libguile/continuations.h index 0274c1b..f6fb96a 100644 --- a/libguile/continuations.h +++ b/libguile/continuations.h @@ -46,8 +46,6 @@ typedef struct jmp_buf jmpbuf; SCM dynenv; #ifdef __ia64__ - ucontext_t ctx; - int fresh; void *backing_store; unsigned long backing_store_size; #endif /* __ia64__ */ diff --git a/libguile/threads.c b/libguile/threads.c index 858a1eb..609fc99 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -423,6 +423,22 @@ guilify_self_1 (SCM_STACKITEM *base) t->pending_asyncs = 1; t->last_debug_frame = NULL; t->base = base; +#ifdef __ia64__ + /* Calculate and store off the base of this thread's register + backing store (RBS). Unfortunately our implementation(s) of + scm_ia64_register_backing_store_base are only reliable for the + main thread. For other threads, therefore, find out the current + top of the RBS, and use that as a maximum. */ + t->register_backing_store_base = scm_ia64_register_backing_store_base (); + { + ucontext_t ctx; + void *bsp; + getcontext (&ctx); + bsp = scm_ia64_ar_bsp (&ctx); + if (t->register_backing_store_base > bsp) + t->register_backing_store_base = bsp; + } +#endif t->continuation_root = SCM_EOL; t->continuation_base = base; scm_i_pthread_cond_init (&t->sleep_cond, NULL); @@ -1350,7 +1366,7 @@ SCM_DEFINE (scm_broadcast_condition_variable, "broadcast-condition-variable", 1, scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \ ((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \ / sizeof (SCM_STACKITEM))); \ - bot = (SCM_STACKITEM *) scm_ia64_register_backing_store_base (); \ + bot = (SCM_STACKITEM *) SCM_I_CURRENT_THREAD->register_backing_store_base; \ top = (SCM_STACKITEM *) scm_ia64_ar_bsp (&ctx); \ scm_mark_locations (bot, top - bot); } while (0) #else @@ -1374,7 +1390,7 @@ scm_threads_mark_stacks (void) #else scm_mark_locations (t->top, t->base - t->top); #endif - scm_mark_locations ((SCM_STACKITEM *) t->regs, + scm_mark_locations ((SCM_STACKITEM *) &t->regs, ((size_t) sizeof(t->regs) / sizeof (SCM_STACKITEM))); } diff --git a/libguile/threads.h b/libguile/threads.h index 09939b0..d58a0fb 100644 --- a/libguile/threads.h +++ b/libguile/threads.h @@ -28,6 +28,7 @@ #include "libguile/root.h" #include "libguile/iselect.h" #include "libguile/dynwind.h" +#include "libguile/continuations.h" #if SCM_USE_PTHREAD_THREADS #include "libguile/pthread-threads.h" @@ -107,6 +108,10 @@ typedef struct scm_i_thread { SCM_STACKITEM *base; SCM_STACKITEM *top; jmp_buf regs; +#ifdef __ia64__ + void *register_backing_store_base; + scm_t_contregs *pending_rbs_continuation; +#endif } scm_i_thread; diff --git a/libguile/throw.c b/libguile/throw.c index 1c25463..119d0bd 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -824,6 +824,12 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED) /* Otherwise, it's some random piece of junk. */ else abort (); + +#ifdef __ia64__ + /* On IA64, we #define longjmp as setcontext, and GCC appears not to + know that that doesn't return. */ + return SCM_UNSPECIFIED; +#endif } -- 1.5.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/guile/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 21 Feb 2008 12:31:47 -0000 1.15 +++ .cvsignore 23 Jul 2008 11:12:49 -0000 1.16 @@ -1 +1 @@ -guile-1.8.4.tar.gz +guile-1.8.5.tar.gz Index: guile.spec =================================================================== RCS file: /cvs/pkgs/rpms/guile/F-9/guile.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- guile.spec 21 Feb 2008 12:31:47 -0000 1.58 +++ guile.spec 23 Jul 2008 11:12:49 -0000 1.59 @@ -1,12 +1,13 @@ Summary: A GNU implementation of Scheme for application extensibility Name: guile %define mver 1.8 -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz URL: http://www.gnu.org/software/guile/ Patch1: guile-1.8.4-multilib.patch Patch2: guile-1.8.4-testsuite.patch +Patch3: guile-1.8.5-conts.patch Patch4: guile-1.8.1-deplibs.patch License: GPLv2+ and LGPLv2+ Group: Development/Languages @@ -30,6 +31,7 @@ Summary: Libraries and header files for the GUILE extensibility library Group: Development/Libraries Requires: guile = %{epoch}:%{version} gmp-devel +Requires: pkgconfig %description devel The guile-devel package includes the libraries, header files, etc., @@ -44,6 +46,7 @@ %setup -q %patch1 -p1 -b .multilib %patch2 -p1 -b .testsuite +%patch3 -p1 -b .conts %patch4 -p1 -b .deplibs %build @@ -129,8 +132,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING* ChangeLog HACKING NEWS.bz2 README -%doc SNAPSHOTS ANON-CVS THANKS +%doc AUTHORS COPYING* ChangeLog HACKING NEWS.bz2 README THANKS %{_bindir}/guile %{_bindir}/guile-tools %{_libdir}/libguile*.so.* @@ -155,11 +157,16 @@ %{_bindir}/guile-snarf %{_datadir}/aclocal/* %{_libdir}/libguile.so +%{_libdir}/pkgconfig/*.pc %{_includedir}/guile %{_includedir}/libguile %{_includedir}/libguile.h %changelog +* Wed Jul 23 2008 Miroslav Lichvar - 5:1.8.5-1.fc9 +- update to 1.8.5 +- fix continuations on ia64 + * Thu Feb 21 2008 Miroslav Lichvar - 5:1.8.4-1 - update to 1.8.4 - add %%check Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/guile/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 21 Feb 2008 12:31:47 -0000 1.15 +++ sources 23 Jul 2008 11:12:49 -0000 1.16 @@ -1 +1 @@ -aacc6a384af88a85574717a9221f5c6e guile-1.8.4.tar.gz +a3f8216544509a74a4441f689a0410d2 guile-1.8.5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 11:19:01 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 23 Jul 2008 11:19:01 GMT Subject: rpms/guile/F-8 guile-1.8.5-conts.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 guile.spec, 1.55, 1.56 sources, 1.14, 1.15 Message-ID: <200807231119.m6NBJ1Dl000476@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/guile/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv385 Modified Files: .cvsignore guile.spec sources Added Files: guile-1.8.5-conts.patch Log Message: - update to 1.8.5 - fix continuations on ia64 guile-1.8.5-conts.patch: --- NEW FILE guile-1.8.5-conts.patch --- >From 78aa4a8850396801f2e5515565d051b45b4f15b5 Mon Sep 17 00:00:00 2001 From: Neil Jerram Date: Thu, 8 May 2008 00:29:53 +0100 Subject: [PATCH] Fix continuation problems on IA64. * Specific problems in IA64 make check ** test-unwind Representation of the relevant dynamic context: non-rewindable catch frame make cont. o----o-----a----------b-------------c \ \ call cont. o-----o-----------d A continuation is captured at (c), with a non-rewindable frame in the dynamic context at (b). If a rewind through that frame was attempted, Guile would throw to the catch at (a). Then the context unwinds back past (a), then winds forwards again, and the captured continuation is called at (d). We should end up at the catch at (a). On ia64, we get an "illegal instruction". The problem is that Guile does not restore the ia64 register backing store (RBS) stack (which is saved off when the continuation is captured) until all the unwinding and rewinding is done. Therefore, when the rewind code (scm_i_dowinds) hits the non-rewindable frame at (b), the RBS stack hasn't yet been restored. The throw finds the jmp_buf (for the catch at (a)) correctly from the dynamic context, and jumps back to (a), but the RBS stack is invalid, hence the illegal instruction. This could be fixed by restoring the RBS stack earlier, at the same point (copy_stack) where the normal stack is restored. But that causes a problem in the next test... ** continuations.test The dynamic context diagram for this case is similar: non-rewindable catch frame make cont. a----x-----o----------b-------------c \ \ call cont. o-------d The only significant difference is that the catch point (a) is upstream of where the dynamic context forks. This means that the RBS stack at (d) already contains the correct RBS contents for throwing back to (a), so it doesn't matter whether the RBS stack that was saved off with the continuation gets restored. This test passes with the Guile 1.8.4 code, but fails (with an "illegal instruction") when the code is changed to restore the RBS stack earlier as described above. The problem now is that the RBS stack is being restored _too_ early; specifically when there is still stuff to do that relies on the old RBS contents. When a continuation is called, the sequence of relevant events is: (1) Grow the (normal) stack until it is bigger than the (normal) stack saved off in the continuation. (scm_dynthrow, grow_stack) (2) scm_i_dowinds calls itself recursively, such that (2.1) for each rewind (from (x) to (c)) that will be needed, another frame is added to the stack (both normal and RBS), with local variables specifying the required rewind; the rewinds don't actually happen yet, they will happen when the stack unwinds again through these frames (2.2) required unwinds - back from where the continuation was called (d) to the fork point (x) - are done immediately. (3) The normal (i.e. non-RBS) stack that was stored in the continuation is restored (i.e. copied on top of the actual stack). Note that this doesn't overwrite the frames that were added in (2.1), because the growth in (1) ensures that the added frames are beyond the end of the restored stack. (4) ? Restore the RBS stack here too ? (5) Return (from copy_stack) through the (2.1) frames, which means that the rewinds now happen. (6) setcontext (or longjmp) to the context (c) where the continuation was captured. The trouble is that step (1) does not create space in the RBS stack in the same kind of way that it does for the normal stack. Therefore, if the saved (in the continuation) RBS stack is big enough, it can overwrite the RBS of the (2.1) frames that still need to complete. This causes an illegal instruction when we return through those frames and try to perform the rewinds. * Fix The key to the fix is that the saved RBS stack only needs to be restored at some point before the next setcontext call, and that doing it as close to the setcontext call as possible will avoid bad interactions with the pre-setcontext stack. Therefore we do the restoration at the last possible point, immediately before the next setcontext call. The situation is complicated by there being two ways that the next setcontext call can happen. - If the unwinding and rewinding is all successful, the next setcontext will be the one from step (6) above. This is the "normal" continuation invocation case. - If one of the rewinds throws an error, the next setcontext will come from the throw implementation code. (And the one in step (6) will never happen.) This is the rewind error case. In the rewind error case, the code calling setcontext knows nothing about the continuation. So to cover both cases, we: - copy (in step (4) above) the address and length of the continuation's saved RBS stack to the current thread state (SCM_I_CURRENT_THREAD) - modify all setcontext callers so that they check the current thread state for a saved RBS stack, and restore it if so before calling setcontext. * Notes ** I think rewinders cannot rely on using any stack data Unless it can be guaranteed that the data won't go into a register. I'm not 100% sure about this, but I think it follows from the fact that the RBS stack is not restored until after the rewinds have happened. Note that this isn't a regression caused by the current fix. In Guile 1.8.4, the RBS stack was restored _after_ the rewinds, and this is still the case now. ** Most setcontext calls for `throw' don't need to change the RBS stack In the absence of continuation invocation, the setcontext call in the throw implementation code always sets context to a place higher up the same stack (both normal and RBS), hence no stack restoration is needed. * Other changes ** Using setcontext for all non-local jumps (for __ia64__) Along the way, I read a claim somewhere that setcontext was more reliable than longjmp, in cases where the stack has been manipulated. I don't now have any reason to believe this, but it seems reasonable anyway to leave the __ia64__ code using getcontext/setcontext, instead of setjmp/longjmp. (I think the only possible argument against this would be performance - if getcontext was significantly slower than setjmp. It that proves to be the case, we should revisit this.) ** Capping RBS base for non-main threads Somewhere else along the way, I hit a problem in GC, involving the RBS stack of a non-main thread. The problem was, in SCM_MARK_BACKING_STORE, that scm_ia64_register_backing_store_base was returning a value that was massively greater than the value of scm_ia64_ar_bsp, leading to a seg fault. This is because the implementation of scm_ia64_register_backing_store_base is only valid for the main thread. I couldn't find a neat way of getting the true RBS base of a non-main thread, but one idea is simply to call scm_ia64_ar_bsp when guilifying a thread, and use the value returned as an upper bound for that thread's RBS base. (Note that the RBS stack grows upwards.) (Were it not for scm_init_guile, we could be much more definitive about this. We could take the value of scm_ia64_ar_bsp as a definitive base address for the part of the RBS stack that Guile cares about. We could also then discard scm_ia64_register_backing_store_base.) --- libguile/ChangeLog | 35 +++++++++++++++++++++++++++ libguile/__scm.h | 18 +++++++++++++- libguile/continuations.c | 58 +++++++++++++++++++++------------------------ libguile/continuations.h | 2 - libguile/threads.c | 20 ++++++++++++++- libguile/threads.h | 5 ++++ libguile/throw.c | 6 ++++ 7 files changed, 108 insertions(+), 36 deletions(-) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 6c25443..dec6dcd 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,38 @@ +2008-05-08 Neil Jerram + + * throw.c (scm_ithrow): For IA64 add a return statement, to + appease GCC. + + * threads.h (scm_i_thread): New IA64 fields: + register_backing_store_base and pending_rbs_continuation. + + * threads.c (guilify_self_1): For IA64: cap RBS base address at + the current value of scm_ia64_ar_bsp, and store the capped value + in thread state. + (SCM_MARK_BACKING_STORE): Use thread->register_backing_store_base + instead of scm_ia64_register_backing_store_base(). + (scm_threads_mark_stacks): Add "&" in "&t->regs", so that the code + works both for jmp_buf defined as an array, and jmp_buf defined as + a struct. + + * continuations.h (scm_t_contregs): Remove `fresh' and `ctx' + fields; these are now inside the IA64 definition of `jmp_buf'. + + * continuations.c (scm_make_continuation): Simplify, by moving + some of the IA64 code inside the definition of "setjmp", and by + some obvious commonizations. For IA64 register backing store + (RBS) stack base, use thread->register_backing_store_base instead + of scm_ia64_register_backing_store_base(). + (copy_stack): For IA64, store pointer to continuation being + invoked in thread state, so we can restore the continuation's RBS + stack just before the next setcontext call. + (copy_stack_and_call): Don't restore RBS stack explicitly here. + It will be restored, if appropriate, inside the longjmp call. + (scm_ia64_longjmp): New function. + + * __scm.h (setjmp, longjmp, jmp_buf): For IA64, implement using + getcontext and setcontext. + 2008-05-07 Ludovic Court??s * numbers.c (scm_from_complex_double): Mark as `SCM_UNUSED'. diff --git a/libguile/__scm.h b/libguile/__scm.h index 3d6d9a7..b198f9d 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -402,7 +402,23 @@ # define setjmp setjump # define longjmp longjump # else /* ndef _CRAY1 */ -# include +# if defined (__ia64__) +/* For IA64, emulate the setjmp API using getcontext. */ +# include +# include + typedef struct { + ucontext_t ctx; + int fresh; + } jmp_buf; +# define setjmp(JB) \ + ( (JB).fresh = 1, \ + getcontext (&((JB).ctx)), \ + ((JB).fresh ? ((JB).fresh = 0, 0) : 1) ) +# define longjmp(JB,VAL) scm_ia64_longjmp (&(JB), VAL) + void scm_ia64_longjmp (jmp_buf *, int); +# else /* ndef __ia64__ */ +# include +# endif /* ndef __ia64__ */ # endif /* ndef _CRAY1 */ #endif /* ndef vms */ diff --git a/libguile/continuations.c b/libguile/continuations.c index 39785a5..80a2790 100644 --- a/libguile/continuations.c +++ b/libguile/continuations.c @@ -124,47 +124,30 @@ scm_make_continuation (int *first) continuation->offset = continuation->stack - src; memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size); -#ifdef __ia64__ - continuation->fresh = 1; - getcontext (&continuation->ctx); - if (continuation->fresh) + *first = !setjmp (continuation->jmpbuf); + if (*first) { +#ifdef __ia64__ continuation->backing_store_size = - (char *) scm_ia64_ar_bsp(&continuation->ctx) + (char *) scm_ia64_ar_bsp(&continuation->jmpbuf.ctx) - - (char *) scm_ia64_register_backing_store_base (); + (char *) thread->register_backing_store_base; continuation->backing_store = NULL; continuation->backing_store = scm_gc_malloc (continuation->backing_store_size, "continuation backing store"); memcpy (continuation->backing_store, - (void *) scm_ia64_register_backing_store_base (), + (void *) thread->register_backing_store_base, continuation->backing_store_size); - *first = 1; - continuation->fresh = 0; +#endif /* __ia64__ */ return cont; } else { SCM ret = continuation->throw_value; - *first = 0; continuation->throw_value = SCM_BOOL_F; return ret; } -#else /* !__ia64__ */ - if (setjmp (continuation->jmpbuf)) - { - SCM ret = continuation->throw_value; - *first = 0; - continuation->throw_value = SCM_BOOL_F; - return ret; - } - else - { - *first = 1; - return cont; - } -#endif /* !__ia64__ */ } #undef FUNC_NAME @@ -218,6 +201,9 @@ copy_stack (void *data) copy_stack_data *d = (copy_stack_data *)data; memcpy (d->dst, d->continuation->stack, sizeof (SCM_STACKITEM) * d->continuation->num_stack_items); +#ifdef __ia64__ + SCM_I_CURRENT_THREAD->pending_rbs_continuation = d->continuation; +#endif } static void @@ -235,16 +221,26 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val, scm_i_set_last_debug_frame (continuation->dframe); continuation->throw_value = val; -#ifdef __ia64__ - memcpy (scm_ia64_register_backing_store_base (), - continuation->backing_store, - continuation->backing_store_size); - setcontext (&continuation->ctx); -#else longjmp (continuation->jmpbuf, 1); -#endif } +#ifdef __ia64__ +void +scm_ia64_longjmp (jmp_buf *JB, int VAL) +{ + scm_i_thread *t = SCM_I_CURRENT_THREAD; + + if (t->pending_rbs_continuation) + { + memcpy (t->register_backing_store_base, + t->pending_rbs_continuation->backing_store, + t->pending_rbs_continuation->backing_store_size); + t->pending_rbs_continuation = NULL; + } + setcontext (&JB->ctx); +} +#endif + /* Call grow_stack until the stack space is large enough, then, as the current * stack frame might get overwritten, let copy_stack_and_call perform the * actual copying and continuation calling. diff --git a/libguile/continuations.h b/libguile/continuations.h index 0274c1b..f6fb96a 100644 --- a/libguile/continuations.h +++ b/libguile/continuations.h @@ -46,8 +46,6 @@ typedef struct jmp_buf jmpbuf; SCM dynenv; #ifdef __ia64__ - ucontext_t ctx; - int fresh; void *backing_store; unsigned long backing_store_size; #endif /* __ia64__ */ diff --git a/libguile/threads.c b/libguile/threads.c index 858a1eb..609fc99 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -423,6 +423,22 @@ guilify_self_1 (SCM_STACKITEM *base) t->pending_asyncs = 1; t->last_debug_frame = NULL; t->base = base; +#ifdef __ia64__ + /* Calculate and store off the base of this thread's register + backing store (RBS). Unfortunately our implementation(s) of + scm_ia64_register_backing_store_base are only reliable for the + main thread. For other threads, therefore, find out the current + top of the RBS, and use that as a maximum. */ + t->register_backing_store_base = scm_ia64_register_backing_store_base (); + { + ucontext_t ctx; + void *bsp; + getcontext (&ctx); + bsp = scm_ia64_ar_bsp (&ctx); + if (t->register_backing_store_base > bsp) + t->register_backing_store_base = bsp; + } +#endif t->continuation_root = SCM_EOL; t->continuation_base = base; scm_i_pthread_cond_init (&t->sleep_cond, NULL); @@ -1350,7 +1366,7 @@ SCM_DEFINE (scm_broadcast_condition_variable, "broadcast-condition-variable", 1, scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \ ((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \ / sizeof (SCM_STACKITEM))); \ - bot = (SCM_STACKITEM *) scm_ia64_register_backing_store_base (); \ + bot = (SCM_STACKITEM *) SCM_I_CURRENT_THREAD->register_backing_store_base; \ top = (SCM_STACKITEM *) scm_ia64_ar_bsp (&ctx); \ scm_mark_locations (bot, top - bot); } while (0) #else @@ -1374,7 +1390,7 @@ scm_threads_mark_stacks (void) #else scm_mark_locations (t->top, t->base - t->top); #endif - scm_mark_locations ((SCM_STACKITEM *) t->regs, + scm_mark_locations ((SCM_STACKITEM *) &t->regs, ((size_t) sizeof(t->regs) / sizeof (SCM_STACKITEM))); } diff --git a/libguile/threads.h b/libguile/threads.h index 09939b0..d58a0fb 100644 --- a/libguile/threads.h +++ b/libguile/threads.h @@ -28,6 +28,7 @@ #include "libguile/root.h" #include "libguile/iselect.h" #include "libguile/dynwind.h" +#include "libguile/continuations.h" #if SCM_USE_PTHREAD_THREADS #include "libguile/pthread-threads.h" @@ -107,6 +108,10 @@ typedef struct scm_i_thread { SCM_STACKITEM *base; SCM_STACKITEM *top; jmp_buf regs; +#ifdef __ia64__ + void *register_backing_store_base; + scm_t_contregs *pending_rbs_continuation; +#endif } scm_i_thread; diff --git a/libguile/throw.c b/libguile/throw.c index 1c25463..119d0bd 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -824,6 +824,12 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED) /* Otherwise, it's some random piece of junk. */ else abort (); + +#ifdef __ia64__ + /* On IA64, we #define longjmp as setcontext, and GCC appears not to + know that that doesn't return. */ + return SCM_UNSPECIFIED; +#endif } -- 1.5.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/guile/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Apr 2008 16:32:15 -0000 1.14 +++ .cvsignore 23 Jul 2008 11:18:16 -0000 1.15 @@ -1 +1 @@ -guile-1.8.4.tar.gz +guile-1.8.5.tar.gz Index: guile.spec =================================================================== RCS file: /cvs/pkgs/rpms/guile/F-8/guile.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- guile.spec 15 Apr 2008 16:32:15 -0000 1.55 +++ guile.spec 23 Jul 2008 11:18:16 -0000 1.56 @@ -1,12 +1,13 @@ Summary: A GNU implementation of Scheme for application extensibility Name: guile %define mver 1.8 -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz URL: http://www.gnu.org/software/guile/ Patch1: guile-1.8.4-multilib.patch Patch2: guile-1.8.4-testsuite.patch +Patch3: guile-1.8.5-conts.patch Patch4: guile-1.8.1-deplibs.patch License: GPLv2+ and LGPLv2+ Group: Development/Languages @@ -30,6 +31,7 @@ Summary: Libraries and header files for the GUILE extensibility library Group: Development/Libraries Requires: guile = %{epoch}:%{version} gmp-devel +Requires: pkgconfig %description devel The guile-devel package includes the libraries, header files, etc., @@ -44,6 +46,7 @@ %setup -q %patch1 -p1 -b .multilib %patch2 -p1 -b .testsuite +%patch3 -p1 -b .conts %patch4 -p1 -b .deplibs %build @@ -129,8 +132,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING* ChangeLog HACKING NEWS.bz2 README -%doc SNAPSHOTS ANON-CVS THANKS +%doc AUTHORS COPYING* ChangeLog HACKING NEWS.bz2 README THANKS %{_bindir}/guile %{_bindir}/guile-tools %{_libdir}/libguile*.so.* @@ -155,11 +157,16 @@ %{_bindir}/guile-snarf %{_datadir}/aclocal/* %{_libdir}/libguile.so +%{_libdir}/pkgconfig/*.pc %{_includedir}/guile %{_includedir}/libguile %{_includedir}/libguile.h %changelog +* Wed Jul 23 2008 Miroslav Lichvar - 5:1.8.5-1.fc8 +- update to 1.8.5 +- fix continuations on ia64 + * Tue Apr 15 2008 Miroslav Lichvar - 5:1.8.4-1 - update to 1.8.4 - add %%check Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/guile/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Apr 2008 16:32:15 -0000 1.14 +++ sources 23 Jul 2008 11:18:16 -0000 1.15 @@ -1 +1 @@ -aacc6a384af88a85574717a9221f5c6e guile-1.8.4.tar.gz +a3f8216544509a74a4441f689a0410d2 guile-1.8.5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 11:33:45 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Wed, 23 Jul 2008 11:33:45 GMT Subject: rpms/iptables/F-8 iptables-1.4.1.1-cloexec.patch, NONE, 1.1 iptables-1.4.1.1-tos_value_mask.patch, NONE, 1.1 iptables.spec, 1.59, 1.60 iptables-1.4.1-cloexec.patch, 1.1, NONE Message-ID: <200807231133.m6NBXjcp001197@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1131 Modified Files: iptables.spec Added Files: iptables-1.4.1.1-cloexec.patch iptables-1.4.1.1-tos_value_mask.patch Removed Files: iptables-1.4.1-cloexec.patch Log Message: - fixed TOS value mask problem (rhbz#456244) (upstream patch) - two more cloexec fixes iptables-1.4.1.1-cloexec.patch: --- NEW FILE iptables-1.4.1.1-cloexec.patch --- diff -up iptables-1.4.1.1/extensions/libipt_realm.c.cloexec iptables-1.4.1.1/extensions/libipt_realm.c --- iptables-1.4.1.1/extensions/libipt_realm.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/extensions/libipt_realm.c 2008-07-22 16:46:21.000000000 +0200 @@ -50,7 +50,7 @@ static void load_realms(void) int id; struct realmname *oldnm = NULL, *newnm = NULL; - fil = fopen(rfnm, "r"); + fil = fopen(rfnm, "re"); if (!fil) { rdberr = 1; return; @@ -256,7 +256,7 @@ static struct xtables_match realm_mt_reg .extra_opts = realm_opts, }; -void _init(void) +void __attribute((constructor)) nf_ext_init(void) { xtables_register_match(&realm_mt_reg); } diff -up iptables-1.4.1.1/ip6tables-restore.c.cloexec iptables-1.4.1.1/ip6tables-restore.c --- iptables-1.4.1.1/ip6tables-restore.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/ip6tables-restore.c 2008-07-22 16:46:21.000000000 +0200 @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s\n", argv[optind], strerror(errno)); diff -up iptables-1.4.1.1/ip6tables-save.c.cloexec iptables-1.4.1.1/ip6tables-save.c --- iptables-1.4.1.1/ip6tables-save.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/ip6tables-save.c 2008-07-22 16:46:21.000000000 +0200 @@ -40,7 +40,7 @@ static int for_each_table(int (*func)(co FILE *procfile = NULL; char tablename[IP6T_TABLE_MAXNAMELEN+1]; - procfile = fopen("/proc/net/ip6_tables_names", "r"); + procfile = fopen("/proc/net/ip6_tables_names", "re"); if (!procfile) exit_error(OTHER_PROBLEM, "Unable to open /proc/net/ip6_tables_names: %s\n", diff -up iptables-1.4.1.1/iptables-restore.c.cloexec iptables-1.4.1.1/iptables-restore.c --- iptables-1.4.1.1/iptables-restore.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/iptables-restore.c 2008-07-22 16:46:21.000000000 +0200 @@ -176,7 +176,7 @@ main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s\n", argv[optind], strerror(errno)); diff -up iptables-1.4.1.1/iptables-save.c.cloexec iptables-1.4.1.1/iptables-save.c --- iptables-1.4.1.1/iptables-save.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/iptables-save.c 2008-07-22 16:46:21.000000000 +0200 @@ -38,7 +38,7 @@ static int for_each_table(int (*func)(co FILE *procfile = NULL; char tablename[IPT_TABLE_MAXNAMELEN+1]; - procfile = fopen("/proc/net/ip_tables_names", "r"); + procfile = fopen("/proc/net/ip_tables_names", "re"); if (!procfile) exit_error(OTHER_PROBLEM, "Unable to open /proc/net/ip_tables_names: %s\n", diff -up iptables-1.4.1.1/iptables-xml.c.cloexec iptables-1.4.1.1/iptables-xml.c --- iptables-1.4.1.1/iptables-xml.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/iptables-xml.c 2008-07-22 16:46:21.000000000 +0200 @@ -664,7 +664,7 @@ main(int argc, char *argv[]) } if (optind == argc - 1) { - in = fopen(argv[optind], "r"); + in = fopen(argv[optind], "re"); if (!in) { fprintf(stderr, "Can't open %s: %s", argv[optind], strerror(errno)); diff -up iptables-1.4.1.1/xtables.c.cloexec iptables-1.4.1.1/xtables.c --- iptables-1.4.1.1/xtables.c.cloexec 2008-06-16 15:12:40.000000000 +0200 +++ iptables-1.4.1.1/xtables.c 2008-07-22 16:47:23.000000000 +0200 @@ -85,6 +85,11 @@ static char *get_modprobe(void) procfile = open(PROC_SYS_MODPROBE, O_RDONLY); if (procfile < 0) return NULL; + if (fcntl(procfile, F_SETFD, FD_CLOEXEC) == -1) { + fprintf(stderr, "Could not set close on exec: %s\n", + strerror(errno)); + exit(1); + } ret = (char *) malloc(PROCFILE_BUFSIZ); if (ret) { @@ -498,6 +503,12 @@ static int compatible_revision(const cha exit(1); } + if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) { + fprintf(stderr, "Could not set close on exec: %s\n", + strerror(errno)); + exit(1); + } + load_xtables_ko(modprobe_program, 1); strcpy(rev.name, name); iptables-1.4.1.1-tos_value_mask.patch: --- NEW FILE iptables-1.4.1.1-tos_value_mask.patch --- diff -up iptables-1.4.1.1/extensions/tos_values.c.tos_value_mask iptables-1.4.1.1/extensions/tos_values.c --- iptables-1.4.1.1/extensions/tos_values.c.tos_value_mask 2008-07-22 16:48:36.000000000 +0200 +++ iptables-1.4.1.1/extensions/tos_values.c 2008-07-22 17:23:46.000000000 +0200 @@ -56,8 +56,9 @@ static bool tos_parse_symbolic(const cha { const unsigned int max = 255; const struct tos_symbol_info *symbol; + char *tmp; - if (strtonum(str, NULL, NULL, 0, max)) + if (strtonum(str, &tmp, NULL, 0, max)) return tos_parse_numeric(str, tvm, max); /* Do not consider ECN bits */ Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/F-8/iptables.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- iptables.spec 1 Jul 2008 14:38:47 -0000 1.59 +++ iptables.spec 23 Jul 2008 11:32:55 -0000 1.60 @@ -1,13 +1,14 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities Version: 1.4.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config Patch4: iptables-1.3.8-typo_latter.patch -Patch5: iptables-1.4.1-cloexec.patch +Patch5: iptables-1.4.1.1-cloexec.patch Patch8: iptables-1.4.1-nf_ext_init.patch +Patch9: iptables-1.4.1.1-tos_value_mask.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -55,6 +56,7 @@ %patch4 -p1 -b .typo_latter %patch5 -p1 -b .cloexec %patch8 -p1 -b .nf_ext_init +%patch9 -p1 -b .tos_value_mask # fix constructor names, see also nf_ext_init patch perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c @@ -131,6 +133,10 @@ %{_mandir}/man3/* %changelog +* Tue Jul 22 2008 Thomas Woerner 1.4.1.1-2 +- fixed TOS value mask problem (rhbz#456244) (upstream patch) +- two more cloexec fixes + * Tue Jul 1 2008 Thomas Woerner 1.4.1.1-1 - upstream bug fix release 1.4.1.1 - dropped extra patch for 1.4.1 - not needed anymore --- iptables-1.4.1-cloexec.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 11:48:32 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Wed, 23 Jul 2008 11:48:32 GMT Subject: rpms/speech-dispatcher/devel import.log, 1.5, 1.6 speech-dispatcher.spec, 1.5, 1.6 speechd.patch, 1.1, 1.2 Message-ID: <200807231148.m6NBmWGb002258@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993/devel Modified Files: import.log speech-dispatcher.spec speechd.patch Log Message: removed suid permission for speech-dispatcher binary. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 17 Jul 2008 10:58:19 -0000 1.5 +++ import.log 23 Jul 2008 11:47:37 -0000 1.6 @@ -3,3 +3,4 @@ speech-dispatcher-0_6_6-14_fc7:HEAD:speech-dispatcher-0.6.6-14.fc7.src.rpm:1216180922 speech-dispatcher-0_6_6-16_fc7:HEAD:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181531 speech-dispatcher-0_6_6-17_fc7:HEAD:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292151 +speech-dispatcher-0_6_6-18_fc7:HEAD:speech-dispatcher-0.6.6-18.fc7.src.rpm:1216813500 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speech-dispatcher.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- speech-dispatcher.spec 17 Jul 2008 10:58:19 -0000 1.5 +++ speech-dispatcher.spec 23 Jul 2008 11:47:37 -0000 1.6 @@ -12,7 +12,7 @@ Name: speech-dispatcher Version: 0.6.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -146,16 +146,11 @@ done #Install the init shell script -mkdir -p $RPM_BUILD_ROOT%{_initrddir} - -# We need to include the OLPC specific init script which starts the daemon -# and uses the configuration files in /home/olpc/.speech-settings - -%if 1%{?olpc} +%if 0%{?fedora} + mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ %endif - #Rename certain generically named binaries mv $RPM_BUILD_ROOT%{_bindir}/long_message $RPM_BUILD_ROOT%{_bindir}/spd_long_message mv $RPM_BUILD_ROOT%{_bindir}/run_test $RPM_BUILD_ROOT%{_bindir}/spd_run_test @@ -170,8 +165,6 @@ # olpc. %if 0%{?olpc} - #Setuid for speech-dispatcher binary - chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher #Move the speech-dispatcher configuration files to olpc writable location. mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd @@ -184,21 +177,21 @@ %post /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} /sbin/chkconfig --add speech-dispatcherd %endif %postun /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} if [ "$1" -ge "1" ] ; then /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : fi %endif %preun -%if 1%{?olpc} +%if 0%{?fedora} if [ $1 = 0 ] ; then /sbin/service speech-dispatcherd stop >/dev/null 2>&1 /sbin/chkconfig --del speech-dispatcherd @@ -211,13 +204,13 @@ %doc AUTHORS ChangeLog NEWS README TODO COPYING %if 0%{?olpc} -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf - -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/modules %else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf @@ -242,7 +235,7 @@ %dir %{_libdir}/speech-dispatcher -%if 1%{?olpc} +%if 0%{?fedora} %attr(0755,root,root)%{_initrddir}/speech-dispatcherd %endif @@ -285,6 +278,10 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-18 + +- removed suid permission for speech-dispatcher binary. + * Wed Jul 16 2008 Hemant Goyal 0.6.6-17 - changing permissions of speech-dispatcher to 6711 (setuid and setguid) speechd.patch: Index: speechd.patch =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speechd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- speechd.patch 24 Jun 2008 06:15:21 -0000 1.1 +++ speechd.patch 23 Jul 2008 11:47:37 -0000 1.2 @@ -1,6 +1,5 @@ -diff -uNr speech-dispatcher-0.6.6/config/speechd.conf.in speech-dispatcher-patched-0.6.6/config/speechd.conf.in --- speech-dispatcher-0.6.6/config/speechd.conf.in 2008-01-28 18:49:14.000000000 +0530 -+++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-06-17 20:24:54.000000000 +0530 ++++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-07-18 15:54:41.000000000 +0530 @@ -36,8 +36,8 @@ # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not # want to influence it. @@ -8,7 +7,7 @@ -LogDir "default" -#LogDir "/var/log/speech-dispatcher/" +#LogDir "default" -+LogDir "/var/log/" ++LogDir "/home/olpc/.speechd/" #LogDir "stdout" # CustomLogFile allows logging all messages of the given kind, From fedora-extras-commits at redhat.com Wed Jul 23 11:48:37 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Wed, 23 Jul 2008 11:48:37 GMT Subject: rpms/speech-dispatcher/OLPC-2 import.log, 1.5, 1.6 speech-dispatcher.spec, 1.5, 1.6 speechd.patch, 1.1, 1.2 Message-ID: <200807231148.m6NBmbFD002280@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1964/OLPC-2 Modified Files: import.log speech-dispatcher.spec speechd.patch Log Message: removed suid permission for speech-dispatcher binary. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 17 Jul 2008 11:10:07 -0000 1.5 +++ import.log 23 Jul 2008 11:47:44 -0000 1.6 @@ -3,3 +3,4 @@ speech-dispatcher-0_6_6-15_fc7:OLPC-2:speech-dispatcher-0.6.6-15.fc7.src.rpm:1216053499 speech-dispatcher-0_6_6-16_fc7:OLPC-2:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216182135 speech-dispatcher-0_6_6-17_fc7:OLPC-2:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292819 +speech-dispatcher-0_6_6-18_fc7:OLPC-2:speech-dispatcher-0.6.6-18.fc7.src.rpm:1216813520 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/speech-dispatcher.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- speech-dispatcher.spec 17 Jul 2008 11:10:07 -0000 1.5 +++ speech-dispatcher.spec 23 Jul 2008 11:47:44 -0000 1.6 @@ -12,7 +12,7 @@ Name: speech-dispatcher Version: 0.6.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -146,16 +146,11 @@ done #Install the init shell script -mkdir -p $RPM_BUILD_ROOT%{_initrddir} - -# We need to include the OLPC specific init script which starts the daemon -# and uses the configuration files in /home/olpc/.speech-settings - -%if 1%{?olpc} +%if 0%{?fedora} + mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ %endif - #Rename certain generically named binaries mv $RPM_BUILD_ROOT%{_bindir}/long_message $RPM_BUILD_ROOT%{_bindir}/spd_long_message mv $RPM_BUILD_ROOT%{_bindir}/run_test $RPM_BUILD_ROOT%{_bindir}/spd_run_test @@ -170,8 +165,6 @@ # olpc. %if 0%{?olpc} - #Setuid for speech-dispatcher binary - chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher #Move the speech-dispatcher configuration files to olpc writable location. mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd @@ -184,21 +177,21 @@ %post /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} /sbin/chkconfig --add speech-dispatcherd %endif %postun /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} if [ "$1" -ge "1" ] ; then /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : fi %endif %preun -%if 1%{?olpc} +%if 0%{?fedora} if [ $1 = 0 ] ; then /sbin/service speech-dispatcherd stop >/dev/null 2>&1 /sbin/chkconfig --del speech-dispatcherd @@ -211,13 +204,13 @@ %doc AUTHORS ChangeLog NEWS README TODO COPYING %if 0%{?olpc} -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf - -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/modules %else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf @@ -242,7 +235,7 @@ %dir %{_libdir}/speech-dispatcher -%if 1%{?olpc} +%if 0%{?fedora} %attr(0755,root,root)%{_initrddir}/speech-dispatcherd %endif @@ -285,6 +278,10 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-18 + +- removed suid permission for speech-dispatcher binary. + * Wed Jul 16 2008 Hemant Goyal 0.6.6-17 - changing permissions of speech-dispatcher to 6711 (setuid and setguid) speechd.patch: Index: speechd.patch =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-2/speechd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- speechd.patch 24 Jun 2008 06:19:14 -0000 1.1 +++ speechd.patch 23 Jul 2008 11:47:44 -0000 1.2 @@ -1,6 +1,5 @@ -diff -uNr speech-dispatcher-0.6.6/config/speechd.conf.in speech-dispatcher-patched-0.6.6/config/speechd.conf.in --- speech-dispatcher-0.6.6/config/speechd.conf.in 2008-01-28 18:49:14.000000000 +0530 -+++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-06-17 20:24:54.000000000 +0530 ++++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-07-18 15:54:41.000000000 +0530 @@ -36,8 +36,8 @@ # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not # want to influence it. @@ -8,7 +7,7 @@ -LogDir "default" -#LogDir "/var/log/speech-dispatcher/" +#LogDir "default" -+LogDir "/var/log/" ++LogDir "/home/olpc/.speechd/" #LogDir "stdout" # CustomLogFile allows logging all messages of the given kind, From fedora-extras-commits at redhat.com Wed Jul 23 11:48:39 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Wed, 23 Jul 2008 11:48:39 GMT Subject: rpms/speech-dispatcher/F-8 import.log, 1.4, 1.5 speech-dispatcher.spec, 1.3, 1.4 speechd.patch, 1.1, 1.2 Message-ID: <200807231148.m6NBmdcT002298@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1997/F-8 Modified Files: import.log speech-dispatcher.spec speechd.patch Log Message: removed suid permission for speech-dispatcher binary. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-8/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 17 Jul 2008 10:58:32 -0000 1.4 +++ import.log 23 Jul 2008 11:47:49 -0000 1.5 @@ -2,3 +2,4 @@ speech-dispatcher-0_6_6-13_fc7:F-8:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214550322 speech-dispatcher-0_6_6-16_fc7:F-8:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181955 speech-dispatcher-0_6_6-17_fc7:F-8:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292193 +speech-dispatcher-0_6_6-18_fc7:F-8:speech-dispatcher-0.6.6-18.fc7.src.rpm:1216813539 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-8/speech-dispatcher.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- speech-dispatcher.spec 17 Jul 2008 10:58:32 -0000 1.3 +++ speech-dispatcher.spec 23 Jul 2008 11:47:49 -0000 1.4 @@ -12,7 +12,7 @@ Name: speech-dispatcher Version: 0.6.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -146,16 +146,11 @@ done #Install the init shell script -mkdir -p $RPM_BUILD_ROOT%{_initrddir} - -# We need to include the OLPC specific init script which starts the daemon -# and uses the configuration files in /home/olpc/.speech-settings - -%if 1%{?olpc} +%if 0%{?fedora} + mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ %endif - #Rename certain generically named binaries mv $RPM_BUILD_ROOT%{_bindir}/long_message $RPM_BUILD_ROOT%{_bindir}/spd_long_message mv $RPM_BUILD_ROOT%{_bindir}/run_test $RPM_BUILD_ROOT%{_bindir}/spd_run_test @@ -170,8 +165,6 @@ # olpc. %if 0%{?olpc} - #Setuid for speech-dispatcher binary - chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher #Move the speech-dispatcher configuration files to olpc writable location. mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd @@ -184,21 +177,21 @@ %post /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} /sbin/chkconfig --add speech-dispatcherd %endif %postun /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} if [ "$1" -ge "1" ] ; then /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : fi %endif %preun -%if 1%{?olpc} +%if 0%{?fedora} if [ $1 = 0 ] ; then /sbin/service speech-dispatcherd stop >/dev/null 2>&1 /sbin/chkconfig --del speech-dispatcherd @@ -211,13 +204,13 @@ %doc AUTHORS ChangeLog NEWS README TODO COPYING %if 0%{?olpc} -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf - -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/modules %else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf @@ -242,7 +235,7 @@ %dir %{_libdir}/speech-dispatcher -%if 1%{?olpc} +%if 0%{?fedora} %attr(0755,root,root)%{_initrddir}/speech-dispatcherd %endif @@ -285,6 +278,10 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-18 + +- removed suid permission for speech-dispatcher binary. + * Wed Jul 16 2008 Hemant Goyal 0.6.6-17 - changing permissions of speech-dispatcher to 6711 (setuid and setguid) speechd.patch: Index: speechd.patch =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/F-8/speechd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- speechd.patch 24 Jun 2008 06:15:21 -0000 1.1 +++ speechd.patch 23 Jul 2008 11:47:49 -0000 1.2 @@ -1,6 +1,5 @@ -diff -uNr speech-dispatcher-0.6.6/config/speechd.conf.in speech-dispatcher-patched-0.6.6/config/speechd.conf.in --- speech-dispatcher-0.6.6/config/speechd.conf.in 2008-01-28 18:49:14.000000000 +0530 -+++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-06-17 20:24:54.000000000 +0530 ++++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-07-18 15:54:41.000000000 +0530 @@ -36,8 +36,8 @@ # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not # want to influence it. @@ -8,7 +7,7 @@ -LogDir "default" -#LogDir "/var/log/speech-dispatcher/" +#LogDir "default" -+LogDir "/var/log/" ++LogDir "/home/olpc/.speechd/" #LogDir "stdout" # CustomLogFile allows logging all messages of the given kind, From fedora-extras-commits at redhat.com Wed Jul 23 11:51:16 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Wed, 23 Jul 2008 11:51:16 GMT Subject: rpms/speech-dispatcher/OLPC-3 import.log, 1.4, 1.5 speech-dispatcher.spec, 1.3, 1.4 speechd.patch, 1.1, 1.2 Message-ID: <200807231151.m6NBpGp2002629@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2303/OLPC-3 Modified Files: import.log speech-dispatcher.spec speechd.patch Log Message: removed suid permission for speech-dispatcher binary. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-3/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 17 Jul 2008 11:10:14 -0000 1.4 +++ import.log 23 Jul 2008 11:50:26 -0000 1.5 @@ -2,3 +2,4 @@ speech-dispatcher-0_6_6-13_fc7:OLPC-3:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214549430 speech-dispatcher-0_6_6-16_fc7:OLPC-3:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216182617 speech-dispatcher-0_6_6-17_fc7:OLPC-3:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292819 +speech-dispatcher-0_6_6-18_fc7:OLPC-3:speech-dispatcher-0.6.6-18.fc7.src.rpm:1216813632 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-3/speech-dispatcher.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- speech-dispatcher.spec 17 Jul 2008 11:10:14 -0000 1.3 +++ speech-dispatcher.spec 23 Jul 2008 11:50:26 -0000 1.4 @@ -12,7 +12,7 @@ Name: speech-dispatcher Version: 0.6.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -146,16 +146,11 @@ done #Install the init shell script -mkdir -p $RPM_BUILD_ROOT%{_initrddir} - -# We need to include the OLPC specific init script which starts the daemon -# and uses the configuration files in /home/olpc/.speech-settings - -%if 1%{?olpc} +%if 0%{?fedora} + mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/ %endif - #Rename certain generically named binaries mv $RPM_BUILD_ROOT%{_bindir}/long_message $RPM_BUILD_ROOT%{_bindir}/spd_long_message mv $RPM_BUILD_ROOT%{_bindir}/run_test $RPM_BUILD_ROOT%{_bindir}/spd_run_test @@ -170,8 +165,6 @@ # olpc. %if 0%{?olpc} - #Setuid for speech-dispatcher binary - chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher #Move the speech-dispatcher configuration files to olpc writable location. mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd @@ -184,21 +177,21 @@ %post /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} /sbin/chkconfig --add speech-dispatcherd %endif %postun /sbin/ldconfig -%if 1%{?olpc} +%if 0%{?fedora} if [ "$1" -ge "1" ] ; then /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || : fi %endif %preun -%if 1%{?olpc} +%if 0%{?fedora} if [ $1 = 0 ] ; then /sbin/service speech-dispatcherd stop >/dev/null 2>&1 /sbin/chkconfig --del speech-dispatcherd @@ -211,13 +204,13 @@ %doc AUTHORS ChangeLog NEWS README TODO COPYING %if 0%{?olpc} -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/speechd.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/clients/*.conf -%config(noreplace) %attr(-,olpc,olpc) /home/olpc/.speechd/modules/*.conf - -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/ -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/clients -%dir %attr(-,olpc,olpc) /home/olpc/.speechd/modules +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/speechd.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/clients/*.conf +%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/modules/*.conf + +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/ +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/clients +%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/modules %else %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf @@ -242,7 +235,7 @@ %dir %{_libdir}/speech-dispatcher -%if 1%{?olpc} +%if 0%{?fedora} %attr(0755,root,root)%{_initrddir}/speech-dispatcherd %endif @@ -285,6 +278,10 @@ %changelog +* Wed Jul 16 2008 Hemant Goyal 0.6.6-18 + +- removed suid permission for speech-dispatcher binary. + * Wed Jul 16 2008 Hemant Goyal 0.6.6-17 - changing permissions of speech-dispatcher to 6711 (setuid and setguid) speechd.patch: Index: speechd.patch =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/OLPC-3/speechd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- speechd.patch 24 Jun 2008 06:15:21 -0000 1.1 +++ speechd.patch 23 Jul 2008 11:50:26 -0000 1.2 @@ -1,6 +1,5 @@ -diff -uNr speech-dispatcher-0.6.6/config/speechd.conf.in speech-dispatcher-patched-0.6.6/config/speechd.conf.in --- speech-dispatcher-0.6.6/config/speechd.conf.in 2008-01-28 18:49:14.000000000 +0530 -+++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-06-17 20:24:54.000000000 +0530 ++++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-07-18 15:54:41.000000000 +0530 @@ -36,8 +36,8 @@ # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not # want to influence it. @@ -8,7 +7,7 @@ -LogDir "default" -#LogDir "/var/log/speech-dispatcher/" +#LogDir "default" -+LogDir "/var/log/" ++LogDir "/home/olpc/.speechd/" #LogDir "stdout" # CustomLogFile allows logging all messages of the given kind, From fedora-extras-commits at redhat.com Wed Jul 23 11:52:16 2008 From: fedora-extras-commits at redhat.com (Balint Cristian (rezso)) Date: Wed, 23 Jul 2008 11:52:16 GMT Subject: rpms/mapserver/devel .cvsignore, 1.4, 1.5 import.log, 1.2, 1.3 mapserver.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200807231152.m6NBqGD9002876@cvs-int.fedora.redhat.com> Author: rezso Update of /cvs/pkgs/rpms/mapserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2621/devel Modified Files: .cvsignore import.log mapserver.spec sources Log Message: - new 5.2 series upstream ---------------------------------------------------------------------- Modified Files: devel/.cvsignore devel/import.log devel/mapserver.spec devel/sources ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jun 2008 17:20:20 -0000 1.4 +++ .cvsignore 23 Jul 2008 11:51:25 -0000 1.5 @@ -1 +1 @@ -mapserver-5.0.3.tar.gz +mapserver-5.2.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 5 Jul 2008 11:38:50 -0000 1.2 +++ import.log 23 Jul 2008 11:51:25 -0000 1.3 @@ -1,2 +1,3 @@ mapserver-5_0_3-1_fc9:HEAD:mapserver-5.0.3-1.fc9.src.rpm:1213290328 mapserver-5_0_3-3_fc9:HEAD:mapserver-5.0.3-3.fc9.src.rpm:1215257843 +mapserver-5_2_0-1_fc9:HEAD:mapserver-5.2.0-1.fc9.src.rpm:1216813802 Index: mapserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mapserver.spec 5 Jul 2008 11:38:50 -0000 1.12 +++ mapserver.spec 23 Jul 2008 11:51:25 -0000 1.13 @@ -1,6 +1,6 @@ Name: mapserver -Version: 5.0.3 -Release: 3%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: Environment for building spatially-enabled internet applications Group: Development/Tools License: BSD @@ -227,6 +227,9 @@ %{_javadir}/*.jar %changelog +* Wed Jul 23 2008 Balint Cristian 5.2.0-1 +- new 5.2 series upstream + * Thu Jul 05 2008 Balint Cristian 5.0.3-3 - address bz#453925 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mapserver/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jun 2008 17:20:20 -0000 1.5 +++ sources 23 Jul 2008 11:51:25 -0000 1.6 @@ -1 +1 @@ -953a131497132baef84ca33f8432d299 mapserver-5.0.3.tar.gz +6c0f210eb6510f0a43b6d5b09df8bb83 mapserver-5.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 11:52:43 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Wed, 23 Jul 2008 11:52:43 GMT Subject: rpms/tilda/F-9 sources,1.3,1.4 tilda.spec,1.4,1.5 Message-ID: <200807231152.m6NBqhMI002953@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/tilda/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2781 Modified Files: sources tilda.spec Log Message: update release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tilda/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2008 14:11:14 -0000 1.3 +++ sources 23 Jul 2008 11:51:51 -0000 1.4 @@ -1 +1 @@ -c497f82f180e128a1e6f301c6b2463d9 tilda-0.9.5.tar.gz +b44ebe04fdfd312e9ddc5e0ed77f4289 tilda-0.9.6.tar.gz Index: tilda.spec =================================================================== RCS file: /cvs/pkgs/rpms/tilda/F-9/tilda.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tilda.spec 30 Apr 2008 14:16:05 -0000 1.4 +++ tilda.spec 23 Jul 2008 11:51:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: tilda -Version: 0.9.5 -Release: 2%{?dist} +Version: 0.9.6 +Release: 1%{?dist} Summary: A quake like terminal for GNOME Group: Applications/System @@ -52,15 +52,13 @@ # Move glade interface to correct dir mv $RPM_BUILD_ROOT%{_datadir}/%{name}.glade $RPM_BUILD_ROOT%{_datadir}/%{name} -# Disabled -#%find_lang %{name} +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files -# -f %{name}.lang +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} @@ -70,6 +68,9 @@ %{_datadir}/applications/%{name}.desktop %changelog +* Wed Jul 23 2008 Xavier Lamien - 0.9.6-1 +- Update release. + * Wed Apr 30 2008 Xavier Lamien - 0.9.5-2 - Bump release. From fedora-extras-commits at redhat.com Wed Jul 23 12:19:53 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Wed, 23 Jul 2008 12:19:53 GMT Subject: comps comps-f10.xml.in,1.58,1.59 Message-ID: <200807231219.m6NCJrWp011604@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11516 Modified Files: comps-f10.xml.in Log Message: Add some gvfs backends which are now separate Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- comps-f10.xml.in 22 Jul 2008 19:45:53 -0000 1.58 +++ comps-f10.xml.in 23 Jul 2008 12:19:22 -0000 1.59 @@ -1817,6 +1817,10 @@ gtk2-engines gucharmap gvfs-fuse + gvfs-archive + gvfs-gphoto2 + gvfs-obexftp + gvfs-smb nautilus-cd-burner nautilus-sendto NetworkManager-gnome From fedora-extras-commits at redhat.com Wed Jul 23 12:26:49 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 12:26:49 GMT Subject: rpms/phonon/devel .cvsignore, 1.3, 1.4 phonon.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807231226.m6NCQn44012049@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11974 Modified Files: .cvsignore phonon.spec sources Log Message: * Wed Jul 23 2008 Rex Dieter 4.2.0-1 - phonon-4.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Jun 2008 18:12:48 -0000 1.3 +++ .cvsignore 23 Jul 2008 12:26:06 -0000 1.4 @@ -1 +1 @@ -phonon-4.1.83.tar.bz2 +phonon-4.2.0.tar.bz2 Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- phonon.spec 14 Jul 2008 16:33:22 -0000 1.5 +++ phonon.spec 23 Jul 2008 12:26:06 -0000 1.6 @@ -1,18 +1,13 @@ -#define svn 20080614svn820634 -%define beta 4.1.83 -%define beta_tag beta2 Summary: Multimedia framework api Name: phonon -Version: 4.2 -Release: 0.4.%{?beta_tag}%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ -# checked out from svn://anonsvn.kde.org/home/kde/branches/phonon/4.2 -#Source0: %{name}-%{version}-%{svn}.tar.bz2 -Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/phonon-%{beta}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automoc4 @@ -22,7 +17,7 @@ BuildRequires: gstreamer-plugins-base-devel BuildRequires: kde-filesystem BuildRequires: libxml2-devel -BuildRequires: qt4-devel +BuildRequires: qt4-devel >= 4.4.0 Requires: phonon-backend @@ -52,7 +47,7 @@ %prep -%setup -q -n phonon-%{beta} +%setup -q %build @@ -66,6 +61,7 @@ %install rm -rf %{buildroot} + make install DESTDIR=%{buildroot} -C %{_target_platform} @@ -103,6 +99,9 @@ %changelog +* Wed Jul 23 2008 Rex Dieter 4.2.0-1 +- phonon-4.2.0 + * Mon Jul 14 2008 Rex Dieter 4.2-0.4.beta2 - BR: automoc4 - -backend-gstreamer subpkg Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Jun 2008 18:12:48 -0000 1.3 +++ sources 23 Jul 2008 12:26:06 -0000 1.4 @@ -1 +1 @@ -7d0ae1321e7f013ce92b39548134b770 phonon-4.1.83.tar.bz2 +de80b0f055886a6946acc7886713e23e phonon-4.2.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 12:29:33 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 12:29:33 GMT Subject: rpms/kdebase/F-9 kdebase.spec,1.328,1.329 Message-ID: <200807231229.m6NCTX5n012251@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12211 Modified Files: kdebase.spec Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- kdebase.spec 2 Jul 2008 14:46:53 -0000 1.328 +++ kdebase.spec 23 Jul 2008 12:28:48 -0000 1.329 @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Core Files -Version: 4.0.5 -Release: 5%{?dist} +Version: 4.0.99 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -22,24 +22,13 @@ License: GPLv2 Group: User Interface/Desktops URL: http://www.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora specific nsplugins paths Patch1: kdebase-nsplugins-paths.patch ## upstream patches -# fix Konsole window size (backported from 4.1, #439638, kde#160422) -# http://websvn.kde.org/?view=rev&revision=793964 -# http://websvn.kde.org/?view=rev&revision=793970 -Patch100: kdebase-4.0.3-kde#160422.patch -# http://bugzilla.redhat.com/438786 (upstreamed -- Rex) -Patch102: kdebase-4.0.3-kwrite-dt_categories.patch -# backporte from 4.1 -Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch -Patch104: kdebase-4.0.5-konq-memleak.patch -#??Avoid lockup after a failed login on LDAP systems (kdebug:161377) -Patch105: kdebase-4.0.5-kdepasswd-ldap.patch BuildRequires: kde-filesystem >= 4 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } @@ -75,12 +64,16 @@ BuildRequires: hal-devel BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} +%if "%{name}" == "kdebase" +BuildRequires: kdebase-workspace-devel >= %{version} +%endif %ifnarch s390 s390x BuildRequires: libraw1394-devel BuildRequires: libusb-devel %endif BuildRequires: OpenEXR-devel BuildRequires: openssl-devel +BuildRequires: pciutils-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: qimageblitz-devel @@ -90,11 +83,12 @@ %else BuildRequires: samba %endif -BuildRequires: soprano-devel -BuildRequires: strigi-devel +BuildRequires: soprano-devel >= 2.0.97 +BuildRequires: strigi-devel >= 0.5.7 # needed? BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-proto-devel +BuildRequires: glib2-devel # Dolphin needs the ioslaves and icons from kdebase-runtime (#438632) Requires: kdebase-runtime oxygen-icon-theme @@ -130,22 +124,15 @@ %prep %setup -q -n kdebase-%{version} - %patch1 -p0 -b .nsplugins-paths -%patch100 -p0 -b .kde#160422 -%patch102 -p1 -b .kwrite-dt_categories -%patch103 -p1 -b .konqueror-updatehistoryentry -%patch104 -p1 -b .konq-memleak -%patch105 -p1 -b .kdepasswd-ldap %build - mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -315,31 +302,51 @@ %changelog -* Wed Jul 2 2008 Luk???? Tinkl - 4.0.5-5 -- Avoid lockup after a failed login on LDAP systems (kdebug:161377) +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Fri Jul 11 2008 Rex Dieter 4.0.98-2 +- BR: pciutils-devel -* Tue Jun 24 2008 Luk???? Tinkl - 4.0.5-4 +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Tue Jun 24 2008 Luk???? Tinkl - 4.0.83-2 - #426108: Add more directories to konqueror's default plugin search path list -* Thu Jun 05 2008 Than Ngo - 4.0.5-3 -- backport to fix memleak +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Mon Jun 16 2008 Than Ngo 4.0.82-2 +- BR kdebase-workspace-devel (F9+) + +* Sun Jun 15 2008 Rex Dieter 4.0.82-1 +- 4.0.82 -* Tue Jun 03 2008 Than Ngo - 4.0.5-2 +* Tue May 27 2008 Kevin Kofler 4.0.80-3 - respun tarball from upstream -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Tue May 27 2008 Than Ngo 4.0.80-2 +- rebuild to fix undefined symbol issue in dolphin -* Sat May 24 2008 Than Ngo 4.0.4-3 -- backport konqueror crash fix from trunk +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 -* Sun May 11 2008 Kevin Kofler 4.0.4-2 +* Sun May 11 2008 Kevin Kofler 4.0.72-2 - quote semicolon in fix for #442834 - only do the echo when konquerorsu.desktop is actually shipped (#445989) -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Tue May 06 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) +- drop backported kde#160422 and nspluginviewer patches +- add minimum versions to soprano-devel and strigi-devel BRs * Fri Apr 18 2008 Rex Dieter 4.0.3-9 - kwrite.desktop: Categories += Utility (#438786) From fedora-extras-commits at redhat.com Wed Jul 23 12:33:00 2008 From: fedora-extras-commits at redhat.com (Simo Sorce (simo)) Date: Wed, 23 Jul 2008 12:33:00 GMT Subject: rpms/ipa/F-9 0001-Fix-typo-in-inet-type.patch, NONE, 1.1 ipa.spec, 1.17, 1.18 Message-ID: <200807231233.m6NCX06s012558@cvs-int.fedora.redhat.com> Author: simo Update of /cvs/pkgs/rpms/ipa/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12485 Modified Files: ipa.spec Added Files: 0001-Fix-typo-in-inet-type.patch Log Message: * Wed Jul 23 2008 Simo Sorce - 1.1.0-6 - Fix build error 0001-Fix-typo-in-inet-type.patch: --- NEW FILE 0001-Fix-typo-in-inet-type.patch --- >From 77906dce20a8d37b10225c4dc8701b25f172f362 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 9 Jun 2008 17:55:32 -0400 Subject: [PATCH] Fix typo in inet type --- ipa-server/ipa-kpasswd/ipa_kpasswd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.c b/ipa-server/ipa-kpasswd/ipa_kpasswd.c index 677b61b..72d3c13 100644 --- a/ipa-server/ipa-kpasswd/ipa_kpasswd.c +++ b/ipa-server/ipa-kpasswd/ipa_kpasswd.c @@ -1296,7 +1296,7 @@ int main(int argc, char *argv[]) for (tifa = ifa; tifa; tifa = tifa->ifa_next) { - if (tifa->ifa_addr->sa_family != PF_INET && + if (tifa->ifa_addr->sa_family != AF_INET && tifa->ifa_addr->sa_family != AF_INET6) { /* not interesting for us */ continue; -- 1.5.5.1 Index: ipa.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipa/F-9/ipa.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ipa.spec 23 Jul 2008 11:55:27 -0000 1.17 +++ ipa.spec 23 Jul 2008 12:32:15 -0000 1.18 @@ -6,7 +6,7 @@ Name: ipa Version: 1.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -20,7 +20,8 @@ Patch3: freeipa-memberofindex.patch Patch4: freeipa-index.patch Patch5: 0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch -Patch6: 0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch +Patch6: 0001-Fix-typo-in-inet-type.patch +Patch7: 0001-In-openvz-we-found-out-some-interfaces-may-return-a.patch BuildRequires: fedora-ds-base-devel >= 1.1 BuildRequires: mozldap-devel @@ -190,7 +191,8 @@ %patch3 -p1 -b memberofindex %patch4 -p1 -b index %patch5 -p1 -b changepw -%patch6 -p1 -b kpasswd-segfault +%patch6 -p1 -b af-inet-fix +%patch7 -p1 -b kpasswd-segfault %build cd ipa-server; ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap=yes; cd .. @@ -439,6 +441,9 @@ %{_sbindir}/ipa-modradiusprofile %changelog +* Wed Jul 23 2008 Simo Sorce - 1.1.0-6 +- Fix build error + * Wed Jul 23 2008 Simo Sorce - 1.1.0-5 - Fix segfault in ipa-kpasswd in case getifaddrs returns a NULL interface From fedora-extras-commits at redhat.com Wed Jul 23 12:36:46 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 12:36:46 GMT Subject: rpms/automoc/devel automoc.spec,1.9,1.10 Message-ID: <200807231236.m6NCakvq012884@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/automoc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797 Modified Files: automoc.spec Log Message: fix %$files Index: automoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/automoc/devel/automoc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- automoc.spec 23 Jul 2008 12:15:46 -0000 1.9 +++ automoc.spec 23 Jul 2008 12:36:03 -0000 1.10 @@ -46,7 +46,7 @@ %files %defattr(-,root,root,-) %{_bindir}/automoc4 -%{_prefix}/lib/automoc4/ +%{_kde4_libdir}/automoc4/ %changelog From fedora-extras-commits at redhat.com Wed Jul 23 12:40:50 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 12:40:50 GMT Subject: rpms/kdeaccessibility/devel .cvsignore, 1.29, 1.30 kdeaccessibility.spec, 1.55, 1.56 sources, 1.30, 1.31 Message-ID: <200807231240.m6NCeoYk013238@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdeaccessibility/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13157 Modified Files: .cvsignore kdeaccessibility.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 19 Jul 2008 05:55:55 -0000 1.29 +++ .cvsignore 23 Jul 2008 12:40:05 -0000 1.30 @@ -1 +1,2 @@ kdeaccessibility-4.0.99.tar.bz2 +kdeaccessibility-4.1.0.tar.bz2 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- kdeaccessibility.spec 19 Jul 2008 05:55:55 -0000 1.55 +++ kdeaccessibility.spec 23 Jul 2008 12:40:05 -0000 1.56 @@ -1,8 +1,7 @@ - Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Group: User Interface/Desktops @@ -53,7 +52,6 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} @@ -97,6 +95,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeaccessibility/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 19 Jul 2008 05:55:55 -0000 1.30 +++ sources 23 Jul 2008 12:40:05 -0000 1.31 @@ -1 +1 @@ -f90361104b19893ffec42d53aee0fbe4 kdeaccessibility-4.0.99.tar.bz2 +7d53001b2db8d7d8bd82a63e8be882ae kdeaccessibility-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 12:44:07 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 12:44:07 GMT Subject: rpms/kdeadmin/devel .cvsignore, 1.50, 1.51 kdeadmin.spec, 1.102, 1.103 sources, 1.52, 1.53 Message-ID: <200807231244.m6NCi7LI013509@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13435 Modified Files: .cvsignore kdeadmin.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 19 Jul 2008 05:56:13 -0000 1.50 +++ .cvsignore 23 Jul 2008 12:43:23 -0000 1.51 @@ -1 +1,2 @@ kdeadmin-4.0.99.tar.bz2 +kdeadmin-4.1.0.tar.bz2 Index: kdeadmin.spec =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- kdeadmin.spec 19 Jul 2008 07:00:38 -0000 1.102 +++ kdeadmin.spec 23 Jul 2008 12:43:23 -0000 1.103 @@ -1,7 +1,6 @@ - Name: kdeadmin Epoch: 7 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: K Desktop Environment - Administrative tools @@ -120,6 +119,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 7:4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 19 Jul 2008 05:56:13 -0000 1.52 +++ sources 23 Jul 2008 12:43:23 -0000 1.53 @@ -1 +1 @@ -e2c14f1852eeb44d24db4ca2fed3651c kdeadmin-4.0.99.tar.bz2 +c814d39956c605a8cc60016a26a9401f kdeadmin-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 12:48:54 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 12:48:54 GMT Subject: rpms/automoc/F-8 .cvsignore, 1.2, 1.3 automoc.spec, 1.1, 1.2 sources, 1.2, 1.3 automoc-1.0-lib64.patch, 1.1, NONE Message-ID: <200807231248.m6NCmsYR013902@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/automoc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13848/F-8 Modified Files: .cvsignore automoc.spec sources Removed Files: automoc-1.0-lib64.patch Log Message: Sync from devel: * Wed Jul 23 2008 Rex Dieter 1.0-0.8.rc1 - automoc4-0.9.84 (1.0-rc1) * Mon Jun 30 2008 Rex Dieter 1.0-0.7.beta2 - automoc4-0.9.83 (1.0-beta2) - drop lib64 patch * Thu Jun 10 2008 Lorenzo Villani - 1.0-0.5.20080527svn811390 - Leave automoc4.files.in in _libdir - Same applies to Automoc4Config.cmake Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jun 2008 10:57:37 -0000 1.2 +++ .cvsignore 23 Jul 2008 12:48:09 -0000 1.3 @@ -1 +1 @@ -automoc-1.0.20080527svn811390.tar.gz +automoc4-0.9.84.tar.bz2 Index: automoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-8/automoc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- automoc.spec 1 Jun 2008 10:57:37 -0000 1.1 +++ automoc.spec 23 Jul 2008 12:48:09 -0000 1.2 @@ -1,16 +1,18 @@ -%define snaptag .20080527svn811390 +#define snaptag .20080527svn811390 +%define beta 0.9.84 +%define beta_tag rc1 Name: automoc Version: 1.0 -Release: 0.3%{?snaptag}%{?dist} +Release: 0.8.%{?beta_tag}%{?dist} Summary: KDE4 automoc Group: Development/Tools License: BSD URL: http://www.kde.org +Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.94/support/automoc4-%{beta}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://rpm.binaryhelix.net/SOURCES/%{name}-%{version}%{?snaptag}.tar.gz -Patch0: automoc-1.0-lib64.patch +Provides: automoc4 = %{beta} Requires: cmake BuildRequires: cmake qt4-devel kde-filesystem @@ -20,8 +22,7 @@ %prep -%setup -q -%patch0 -p1 -b .lib64 +%setup -q -n automoc4-%{beta} %build @@ -30,21 +31,12 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} +make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} -# Put things in proper places -# Put Automoc4Config.cmake in proper place -%{__mkdir} -p %{buildroot}%{_datadir}/cmake/Modules -%{__mv} %{buildroot}%{_libdir}/automoc4/Automoc4Config.cmake \ - %{buildroot}%{_datadir}/cmake/Modules/Automoc4Config.cmake -# Remove automoc4.files.in (and /usr/lib, since it's not needed) -%{__rm} -rf %{buildroot}%{_libdir} - - %clean @@ -53,13 +45,22 @@ %files %defattr(-,root,root,-) -%doc automoc4.files.in %{_bindir}/automoc4 -%{_datadir}/cmake/Modules/Automoc4Config.cmake - +%{_prefix}/lib/automoc4/ %changelog +* Wed Jul 23 2008 Rex Dieter 1.0-0.8.rc1 +- automoc4-0.9.84 (1.0-rc1) + +* Mon Jun 30 2008 Rex Dieter 1.0-0.7.beta2 +- automoc4-0.9.83 (1.0-beta2) +- drop lib64 patch + +* Thu Jun 10 2008 Lorenzo Villani - 1.0-0.5.20080527svn811390 +- Leave automoc4.files.in in _libdir +- Same applies to Automoc4Config.cmake + * Thu May 29 2008 Lorenzo Villani - 1.0-0.3.20080527svn811390 - Added 'cmake' to Requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jun 2008 10:57:37 -0000 1.2 +++ sources 23 Jul 2008 12:48:09 -0000 1.3 @@ -1 +1 @@ -577b4c8ac4e9ebce24d57af26b1cb337 automoc-1.0.20080527svn811390.tar.gz +6e1167594b8edd0fd2156aad75b4b2b0 automoc4-0.9.84.tar.bz2 --- automoc-1.0-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 13:00:12 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 13:00:12 GMT Subject: rpms/automoc/F-8 automoc.spec,1.2,1.3 Message-ID: <200807231300.m6ND0CuV014541@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/automoc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14483/F-8 Modified Files: automoc.spec Log Message: Sync again from devel (for file list fix). Index: automoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-8/automoc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- automoc.spec 23 Jul 2008 12:48:09 -0000 1.2 +++ automoc.spec 23 Jul 2008 12:59:28 -0000 1.3 @@ -46,7 +46,7 @@ %files %defattr(-,root,root,-) %{_bindir}/automoc4 -%{_prefix}/lib/automoc4/ +%{_kde4_libdir}/automoc4/ %changelog From fedora-extras-commits at redhat.com Wed Jul 23 13:12:04 2008 From: fedora-extras-commits at redhat.com (Hemant Goyal (hemantg)) Date: Wed, 23 Jul 2008 13:12:04 GMT Subject: rpms/speech-dispatcher/devel import.log, 1.6, 1.7 speech-dispatcher.spec, 1.6, 1.7 Message-ID: <200807231312.m6NDC43O021768@cvs-int.fedora.redhat.com> Author: hemantg Update of /cvs/pkgs/rpms/speech-dispatcher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13075/devel Modified Files: import.log speech-dispatcher.spec Log Message: Added BuildRequire : libraw for fedora-devel Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 23 Jul 2008 11:47:37 -0000 1.6 +++ import.log 23 Jul 2008 13:11:11 -0000 1.7 @@ -4,3 +4,4 @@ speech-dispatcher-0_6_6-16_fc7:HEAD:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181531 speech-dispatcher-0_6_6-17_fc7:HEAD:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292151 speech-dispatcher-0_6_6-18_fc7:HEAD:speech-dispatcher-0.6.6-18.fc7.src.rpm:1216813500 +speech-dispatcher-0_6_6-18_fc7:HEAD:speech-dispatcher-0.6.6-18.fc7.src.rpm:1216816673 Index: speech-dispatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speech-dispatcher.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- speech-dispatcher.spec 23 Jul 2008 11:47:37 -0000 1.6 +++ speech-dispatcher.spec 23 Jul 2008 13:11:11 -0000 1.7 @@ -48,6 +48,10 @@ Buildrequires: glib2-devel %endif +%if 0%{?fedora} >=10 +BuildRequires: libraw1394 +%endif + BuildRequires: alsa-lib-devel BuildRequires: dotconf-devel BuildRequires: texinfo From fedora-extras-commits at redhat.com Wed Jul 23 13:12:06 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 13:12:06 GMT Subject: rpms/kdeartwork/devel .cvsignore, 1.47, 1.48 kdeartwork.spec, 1.86, 1.87 sources, 1.49, 1.50 Message-ID: <200807231312.m6NDC6eJ021773@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdeartwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21691 Modified Files: .cvsignore kdeartwork.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 19 Jul 2008 05:56:42 -0000 1.47 +++ .cvsignore 23 Jul 2008 13:11:22 -0000 1.48 @@ -1 +1,2 @@ kdeartwork-4.0.99.tar.bz2 +kdeartwork-4.1.0.tar.bz2 Index: kdeartwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- kdeartwork.spec 19 Jul 2008 05:56:42 -0000 1.86 +++ kdeartwork.spec 23 Jul 2008 13:11:22 -0000 1.87 @@ -1,6 +1,5 @@ - Name: kdeartwork -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: Additional artwork (themes, sound themes, ...) for KDE @@ -197,6 +196,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeartwork/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 19 Jul 2008 05:56:42 -0000 1.49 +++ sources 23 Jul 2008 13:11:22 -0000 1.50 @@ -1 +1 @@ -4ce348b876ea6cd3e034056171995cf9 kdeartwork-4.0.99.tar.bz2 +3de07b7d7bc5219d135c68dce4266861 kdeartwork-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 13:14:13 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 13:14:13 GMT Subject: rpms/phonon/F-9 .cvsignore, 1.2, 1.3 phonon.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807231314.m6NDEDMe022153@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22001 Modified Files: .cvsignore phonon.spec sources Log Message: * Wed Jul 23 2008 Rex Dieter 4.2.0-1 - phonon-4.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jul 2008 20:15:35 -0000 1.2 +++ .cvsignore 23 Jul 2008 13:13:31 -0000 1.3 @@ -1 +1 @@ -phonon-4.1.83.tar.bz2 +phonon-4.2.0.tar.bz2 Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-9/phonon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- phonon.spec 18 Jul 2008 20:15:35 -0000 1.1 +++ phonon.spec 23 Jul 2008 13:13:31 -0000 1.2 @@ -1,18 +1,13 @@ -#define svn 20080614svn820634 -%define beta 4.1.83 -%define beta_tag beta2 Summary: Multimedia framework api Name: phonon -Version: 4.2 -Release: 0.4.%{?beta_tag}%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ -# checked out from svn://anonsvn.kde.org/home/kde/branches/phonon/4.2 -#Source0: %{name}-%{version}-%{svn}.tar.bz2 -Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/phonon-%{beta}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automoc4 @@ -22,7 +17,7 @@ BuildRequires: gstreamer-plugins-base-devel BuildRequires: kde-filesystem BuildRequires: libxml2-devel -BuildRequires: qt4-devel +BuildRequires: qt4-devel >= 4.4.0 Requires: phonon-backend @@ -52,7 +47,7 @@ %prep -%setup -q -n phonon-%{beta} +%setup -q %build @@ -66,6 +61,7 @@ %install rm -rf %{buildroot} + make install DESTDIR=%{buildroot} -C %{_target_platform} @@ -103,6 +99,9 @@ %changelog +* Wed Jul 23 2008 Rex Dieter 4.2.0-1 +- phonon-4.2.0 + * Mon Jul 14 2008 Rex Dieter 4.2-0.4.beta2 - BR: automoc4 - -backend-gstreamer subpkg Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jul 2008 20:15:35 -0000 1.2 +++ sources 23 Jul 2008 13:13:31 -0000 1.3 @@ -1 +1 @@ -7d0ae1321e7f013ce92b39548134b770 phonon-4.1.83.tar.bz2 +de80b0f055886a6946acc7886713e23e phonon-4.2.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 13:18:45 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 13:18:45 GMT Subject: rpms/kdebase/devel .cvsignore, 1.76, 1.77 kdebase.spec, 1.337, 1.338 sources, 1.99, 1.100 Message-ID: <200807231318.m6NDIjOJ022643@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22500 Modified Files: .cvsignore kdebase.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- .cvsignore 18 Jul 2008 15:15:08 -0000 1.76 +++ .cvsignore 23 Jul 2008 13:17:57 -0000 1.77 @@ -1 +1,2 @@ kdebase-4.0.99.tar.bz2 +kdebase-4.1.0.tar.bz2 Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.337 retrieving revision 1.338 diff -u -r1.337 -r1.338 --- kdebase.spec 22 Jul 2008 19:27:42 -0000 1.337 +++ kdebase.spec 23 Jul 2008 13:17:58 -0000 1.338 @@ -1,7 +1,6 @@ - Summary: K Desktop Environment 4 - Core Files -Version: 4.0.99 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -302,6 +301,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Tue Jul 22 2008 Rex Dieter 4.0.99-2 respin (libraw1394) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase/devel/sources,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- sources 18 Jul 2008 15:15:08 -0000 1.99 +++ sources 23 Jul 2008 13:17:58 -0000 1.100 @@ -1 +1 @@ -bc6959d918a06a7f0b0a091f5e632bf8 kdebase-4.0.99.tar.bz2 +6b58b056d27e3103f087f12abe899a49 kdebase-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 13:27:17 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 13:27:17 GMT Subject: rpms/kdebindings/F-9 .cvsignore, 1.40, 1.41 kdebindings.spec, 1.100, 1.101 sources, 1.45, 1.46 kdebindings-4.0.5-pykde4.patch, 1.1, NONE Message-ID: <200807231327.m6NDRHgZ023339@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288 Modified Files: .cvsignore kdebindings.spec sources Removed Files: kdebindings-4.0.5-pykde4.patch Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 1 Jun 2008 19:22:36 -0000 1.40 +++ .cvsignore 23 Jul 2008 13:26:28 -0000 1.41 @@ -1,2 +1 @@ -kdebindings-4.0.4.tar.bz2 -kdebindings-4.0.5.tar.bz2 +kdebindings-4.0.99.tar.bz2 Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- kdebindings.spec 4 Jun 2008 14:57:02 -0000 1.100 +++ kdebindings.spec 23 Jul 2008 13:26:28 -0000 1.101 @@ -1,3 +1,18 @@ +# FIXME/TODO: BRs for Java (krossjava), C# (qyoto, kimono) and PHP (php-qt) support? +# IMHO this one really needs to be split into subpackages, we don't want to pull +# in e.g. the whole Ruby, OpenJDK and Mono stacks for a PyKDE app! -- Kevin +# FIXME/TODO: Do we want to enable the optional Ruby bindings which are off by +# default? There are bindings for QScintilla, Plasma and Nepomuk/Soprano. -- Kevin + +# define to enable these optional bits +#define csharp 1 +%define ruby 1 +%define smoke 1 +#define php 1 + +%if 0%{?ruby}%{?smoke} +%define devel 1 +%endif %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} @@ -6,71 +21,87 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.0.99 +Release: 1%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops License: GPLv2 URL: http://developer.kde.org/language-bindings/ -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: kdebindings-4.0.5-pykde4.patch BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} +BuildRequires: kdegraphics4-devel >= %{version} +BuildRequires: soprano-devel >= 2.0.97 BuildRequires: cmake -# FIMXE:TODO: disabled for now -#BuildRequires: mono-core +%{?csharp:BuildRequires: mono-core} BuildRequires: python-devel -BuildRequires: ruby-devel -BuildRequires: ruby +%{?ruby:BuildRequires: ruby-devel ruby} BuildRequires: giflib-devel BuildRequires: pcre-devel # causes smokeqt to fail to build -#BuildRequires: qwt-devel +#{?smoke:BuildRequires: qwt-devel} BuildRequires: PyQt4-devel %if 0%{?fedora} > 8 BuildRequires: qscintilla-devel >= 2 %endif -Requires: PyQt4 -Provides: PyKDE4 = %{version}-%{release} - # FIXME/TODO: are there other explicit Requires? -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig Requires: kdelibs4 >= %{version} Requires: kdebase-workspace >= %{version} +%{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}} + %description KDE bindings to non-C++ languages +%package -n PyKDE4 +Group: Development/Languages +Summary: Python bindings for KDE4 +Requires: kdelibs4 >= %{version} +Requires: PyQt4 +%description -n PyKDE4 +Header files for developing applications using %{name}. + +%package -n PyKDE4-devel +Group: Development/Languages +Summary: Files needed to build other bindings based on KDE4 +Requires: PyQt4-devel +Requires: PyKDE4 = %{version}-%{release} +%description -n PyKDE4-devel +Files needed to build other bindings for C++ classes that inherit from any +of the KDE4 classes. + %package devel Group: Development/Libraries Summary: Header files for %{name} -Provides: PyKDE4-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: kdelibs4-devel kdebase-workspace-devel -Requires: PyQt4-devel %description devel Header files for developing applications using %{name}. %prep %setup -q -%patch0 -p1 -b .pykde4 -%build +%build mkdir -p %{_target_platform} pushd %{_target_platform} # FIXME/TODO: Get csharp to compile -%{cmake_kde4} -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} -DBUILD_csharp=OFF .. +%{cmake_kde4} \ + %{!?csharp:-DBUILD_csharp=OFF} \ + %{!?php:-DBUILD_php=OFF} \ + %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \ + %{!?smoke:-DBUILD_smoke=OFF} \ + .. popd -make %{?_smp_mflags} -C %{_target_platform} +# smp build not recommended (upstream) +make -C %{_target_platform} %install @@ -83,48 +114,121 @@ rm -rf %{buildroot} -%post -/sbin/ldconfig ||: +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig ||: +%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%{_kde4_bindir}/* +%if 0%{?smoke} %{_kde4_libdir}/lib*.so.* -%{_kde4_libdir}/kde4/*.so -%{ruby_sitelib}/KDE/ -%{ruby_sitelib}/Qt.rb -%{ruby_sitelib}/Qt/ -%{ruby_sitelib}/Qt3.rb -%{ruby_sitelib}/Qt4.rb +%endif +# unversioned library +%{_kde4_libdir}/kde4/krosspython.so +%if 0%{?ruby} +%{_kde4_bindir}/* +%{_kde4_libdir}/libqtruby4shared.so +%{_kde4_libdir}/kde4/krossruby.so +%{_kde4_libdir}/kde4/krubypluginfactory.so +%{ruby_sitelib}/* %{ruby_sitearch}/*.so +%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop +%{_kde4_appsdir}/dbpedia_references/ +%endif + +%files -n PyKDE4 +%defattr(-,root,root,-) +%doc COPYING %{python_sitearch}/PyKDE4/ %{_kde4_appsdir}/pykde4/ +%files -n PyKDE4-devel +%defattr(-,root,root,-) +%doc %{_kde4_docdir}/HTML/en/pykde4/ +%{_kde4_datadir}/sip/PyKDE4/ + +%if 0%{?devel} %files devel %defattr(-,root,root,-) -%doc %{_kde4_docdir}/HTML/PyKDE4/ +%if 0%{?smoke} %{_includedir}/smoke.h -%{_kde4_datadir}/sip/PyKDE4/ +%{_includedir}/smoke/ %{_kde4_libdir}/lib*.so +%endif +%if 0%{?ruby} +%{_includedir}/qtruby/ +%exclude %{_kde4_libdir}/libqtruby4shared.so +%endif +%endif %changelog -* Wed Jun 04 2008 Than Ngo 4.0.5-2 -- fix typedefs issue which breaks the build - -* Tue Jun 03 2008 Than Ngo - 4.0.5-2 -- respun tarball from upstream +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Mon Jul 14 2008 Rex Dieter 4.0.98-3 +- re-enable smoke (patched), ruby -* Tue May 06 2008 Rex Dieter - 4.0.4-1 -- kde-4.0.4 +* Mon Jul 14 2008 Rex Dieter 4.0.98-2 +- omit smoke, ruby bindings (build failures, sorting out upstream) +- -devel: -BR: PyQt4-devel + +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Sat Jun 28 2008 Kevin Kofler 4.0.84-2 +- fix Python bindings for Phonon and Soprano + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Sat Jun 21 2008 Kevin Kofler 4.0.83-4 +- fix PyKDE4-devel to require PyKDE4 rather than itself + +* Sat Jun 21 2008 Kevin Kofler 4.0.83-3 +- reenable Ruby again +- add missing Epoch for minimum kdegraphics-devel version requirement +- fix CMake target name conflict between Ruby and Python bindings +- fix file list for Ruby + +* Fri Jun 20 2008 Kevin Kofler 4.0.83-2 +- reenable smoke again (keep ruby off for now) +- drop explicit ENABLE_SMOKEKDEVPLATFORM=OFF (now off by default) +- add BR kdegraphics-devel for the Smoke Okular bindings +- fix file list + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Wed Jun 18 2008 Rex Dieter 4.0.82-3 +- revert, more borkage. + +* Tue Jun 17 2008 Kevin Kofler 4.0.82-2 +- reenable smoke and ruby, set ENABLE_SMOKEKDEVPLATFORM=OFF (no kdevplatform) + +* Sun Jun 15 2008 Rex Dieter 4.0.82-1 +- 4.0.82 +- omit ruby, smoke (busted) => no -devel subpkg (for now) +- PyKDE4(-devel) subpkgs + +* Tue May 27 2008 Kevin Kofler 4.0.80-2 +- disable php-qt for now +- apply PyKDE4 and smokekde build fixes from upstream +- update file lists (comment out smokeplasma, add new smoke/ruby files) +- fix incorrect libdir on lib64 platforms + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Wed May 07 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 +- add BR soprano-devel +- update file list to include plasma-ruby stuff * Thu Apr 03 2008 Kevin Kofler 4.0.3-3 - rebuild (again) for the fixed %%{_kde4_buildtype} Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 3 Jun 2008 08:02:30 -0000 1.45 +++ sources 23 Jul 2008 13:26:28 -0000 1.46 @@ -1 +1 @@ -21126044fbe6d9357ce3c8c07b659c3a kdebindings-4.0.5.tar.bz2 +5b9529a90445f075a201ec5754ebe3c9 kdebindings-4.0.99.tar.bz2 --- kdebindings-4.0.5-pykde4.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 13:31:45 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 23 Jul 2008 13:31:45 GMT Subject: rpms/ncurses/devel ncurses.spec,1.86,1.87 Message-ID: <200807231331.m6NDVjgC023598@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/ncurses/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23539 Modified Files: ncurses.spec Log Message: - rebuild with new gpm Index: ncurses.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- ncurses.spec 7 Jul 2008 10:33:00 -0000 1.86 +++ ncurses.spec 23 Jul 2008 13:30:59 -0000 1.87 @@ -1,7 +1,7 @@ Summary: Ncurses support utilities Name: ncurses Version: 5.6 -Release: 18.20080628%{?dist} +Release: 19.20080628%{?dist} License: MIT Group: System Environment/Base URL: http://invisible-island.net/ncurses/ncurses.html @@ -256,6 +256,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Jul 23 2008 Miroslav Lichvar 5.6-19.20080628 +- rebuild with new gpm + * Mon Jul 07 2008 Miroslav Lichvar 5.6-18.20080628 - update to patch 20080628 - move mlterm and screen.* entries to -base From fedora-extras-commits at redhat.com Wed Jul 23 13:32:19 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 13:32:19 GMT Subject: rpms/kdebase-runtime/devel .cvsignore, 1.18, 1.19 kdebase-runtime.spec, 1.58, 1.59 sources, 1.18, 1.19 Message-ID: <200807231332.m6NDWJ5Y023665@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23587 Modified Files: .cvsignore kdebase-runtime.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 18 Jul 2008 15:14:49 -0000 1.18 +++ .cvsignore 23 Jul 2008 13:31:34 -0000 1.19 @@ -1 +1,2 @@ kdebase-runtime-4.0.99.tar.bz2 +kdebase-runtime-4.1.0.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- kdebase-runtime.spec 18 Jul 2008 15:14:49 -0000 1.58 +++ kdebase-runtime.spec 23 Jul 2008 13:31:35 -0000 1.59 @@ -1,4 +1,3 @@ - %if 0%{?fedora} < 9 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here %define kde3_desktop 1 @@ -8,7 +7,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -337,6 +336,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 18 Jul 2008 15:14:49 -0000 1.18 +++ sources 23 Jul 2008 13:31:35 -0000 1.19 @@ -1 +1 @@ -265fa06347c83c8b9c6bc1d1259e83f2 kdebase-runtime-4.0.99.tar.bz2 +a19999207ad37131a2888b6e32160008 kdebase-runtime-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 13:38:21 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Wed, 23 Jul 2008 13:38:21 GMT Subject: rpms/rsyslog/devel .cvsignore, 1.26, 1.27 rsyslog.spec, 1.46, 1.47 sources, 1.28, 1.29 Message-ID: <200807231338.m6NDcLSl024107@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23998 Modified Files: .cvsignore rsyslog.spec sources Log Message: upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 11 Jul 2008 11:37:05 -0000 1.26 +++ .cvsignore 23 Jul 2008 13:37:36 -0000 1.27 @@ -1 +1 @@ -rsyslog-3.19.9.tar.gz +rsyslog-3.21.0.tar.gz Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- rsyslog.spec 14 Jul 2008 12:41:31 -0000 1.46 +++ rsyslog.spec 23 Jul 2008 13:37:36 -0000 1.47 @@ -2,8 +2,8 @@ Summary: Enhanced system logging and kernel message trapping daemons Name: rsyslog -Version: 3.19.9 -Release: 2%{?dist} +Version: 3.21.0 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -191,6 +191,9 @@ %{_libdir}/rsyslog/lmnsd_gtls.so %changelog +* Wed Jul 23 2008 Peter Vrabec 3.21.0-1 +- upgrade + * Mon Jul 14 2008 Peter Vrabec 3.19.9-2 - adjust default config file Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 11 Jul 2008 11:37:05 -0000 1.28 +++ sources 23 Jul 2008 13:37:36 -0000 1.29 @@ -1 +1 @@ -0c3c85ce0abba3caeab9bb1adc0d84fd rsyslog-3.19.9.tar.gz +6c960716daa05972f70a1b6b61261be7 rsyslog-3.21.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 13:38:41 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 23 Jul 2008 13:38:41 GMT Subject: rpms/cleanfeed/F-8 cleanfeed.spec,1.11,1.12 Message-ID: <200807231338.m6NDcfWq024135@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/cleanfeed/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24013 Modified Files: cleanfeed.spec Log Message: cleanfeed.conf shouldn't be replaced by update - added noreplace to %config Index: cleanfeed.spec =================================================================== RCS file: /cvs/extras/rpms/cleanfeed/F-8/cleanfeed.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cleanfeed.spec 12 Jul 2006 04:50:56 -0000 1.11 +++ cleanfeed.spec 23 Jul 2008 13:37:48 -0000 1.12 @@ -1,7 +1,7 @@ Summary: A spam filter for Usenet news servers. Name: cleanfeed Version: 0.95.7b -Release: 21.1.1 +Release: 21.1.2 License: distributable Group: System Environment/Daemons Source0: ftp://ftp.exit109.com/users/jeremy/cleanfeed-%{version}.tar.gz @@ -40,12 +40,15 @@ rm -rf $RPM_BUILD_ROOT %files -%attr(-,news,news) %config /etc/news/cleanfeed.conf +%attr(-,news,news) %config(noreplace) /etc/news/cleanfeed.conf %attr(-,root,root) %{_mandir}/man8/cleanfeed.8* %attr(755,news,news) %dir /usr/lib/news/bin/filter %attr(-,news,news) /usr/lib/news/bin/filter/filter_innd.pl %changelog +* Wed Jul 23 2008 Roman Rakus - 0.95.7b-21.1.2 +- cleanfeed.conf shouldn't be replaced by update + * Wed Jul 12 2006 Jesse Keating - 0.95.7b-21.1.1 - rebuild From fedora-extras-commits at redhat.com Wed Jul 23 13:46:27 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Wed, 23 Jul 2008 13:46:27 GMT Subject: rpms/busybox/devel busybox-1.10.1-static.patch, 1.1, 1.2 busybox.spec, 1.82, 1.83 Message-ID: <200807231346.m6NDkR3a024691@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/busybox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24577 Modified Files: busybox-1.10.1-static.patch busybox.spec Log Message: - add findfs to static version of busybox (kexec-tools need it #455998) busybox-1.10.1-static.patch: Index: busybox-1.10.1-static.patch =================================================================== RCS file: /cvs/pkgs/rpms/busybox/devel/busybox-1.10.1-static.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- busybox-1.10.1-static.patch 9 May 2008 09:27:17 -0000 1.1 +++ busybox-1.10.1-static.patch 23 Jul 2008 13:45:36 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up busybox-1.10.1/scripts/defconfig.pom busybox-1.10.1/scripts/defconfig ---- busybox-1.10.1/scripts/defconfig.pom 2008-05-09 10:48:54.000000000 +0200 -+++ busybox-1.10.1/scripts/defconfig 2008-05-09 10:54:30.000000000 +0200 +diff -up busybox-1.10.3/scripts/defconfig.static busybox-1.10.3/scripts/defconfig +--- busybox-1.10.3/scripts/defconfig.static 2008-04-19 05:50:27.000000000 +0200 ++++ busybox-1.10.3/scripts/defconfig 2008-07-23 15:26:28.000000000 +0200 @@ -38,7 +38,7 @@ CONFIG_FEATURE_HAVE_RPC=y # # Build Options @@ -28,3 +28,12 @@ CONFIG_FDFORMAT=y CONFIG_FDISK=y CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +@@ -460,7 +460,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y + # CONFIG_FEATURE_SUN_LABEL is not set + # CONFIG_FEATURE_OSF_LABEL is not set + CONFIG_FEATURE_FDISK_ADVANCED=y +-# CONFIG_FINDFS is not set ++CONFIG_FINDFS=y + CONFIG_FREERAMDISK=y + CONFIG_FSCK_MINIX=y + CONFIG_MKFS_MINIX=y Index: busybox.spec =================================================================== RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- busybox.spec 11 Jun 2008 07:09:18 -0000 1.82 +++ busybox.spec 23 Jul 2008 13:45:36 -0000 1.83 @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Shells @@ -112,6 +112,10 @@ /sbin/busybox.petitboot %changelog +* Wed Jul 23 2008 Ivana Varekova - 1:1.10.3-2 +- add findfs to static version of busybox + (kexec-tools need it #455998) + * Tue Jun 10 2008 Ivana Varekova - 1:1.10.3-1 - update to 1.10.3 From fedora-extras-commits at redhat.com Wed Jul 23 13:47:59 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 23 Jul 2008 13:47:59 GMT Subject: rpms/cleanfeed/F-9 cleanfeed.spec,1.11,1.12 Message-ID: <200807231347.m6NDlx6h024863@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/cleanfeed/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24792 Modified Files: cleanfeed.spec Log Message: Configure cleanfeed.conf as noreplace. Index: cleanfeed.spec =================================================================== RCS file: /cvs/extras/rpms/cleanfeed/F-9/cleanfeed.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cleanfeed.spec 12 Jul 2006 04:50:56 -0000 1.11 +++ cleanfeed.spec 23 Jul 2008 13:47:15 -0000 1.12 @@ -1,7 +1,7 @@ Summary: A spam filter for Usenet news servers. Name: cleanfeed Version: 0.95.7b -Release: 21.1.1 +Release: 22 License: distributable Group: System Environment/Daemons Source0: ftp://ftp.exit109.com/users/jeremy/cleanfeed-%{version}.tar.gz @@ -40,12 +40,15 @@ rm -rf $RPM_BUILD_ROOT %files -%attr(-,news,news) %config /etc/news/cleanfeed.conf +%attr(-,news,news) %config(noreplace) /etc/news/cleanfeed.conf %attr(-,root,root) %{_mandir}/man8/cleanfeed.8* %attr(755,news,news) %dir /usr/lib/news/bin/filter %attr(-,news,news) /usr/lib/news/bin/filter/filter_innd.pl %changelog +* Wed Jul 12 2008 Roman Rakus - 0.95.7b-22 +- Configure file cleanfeed.conf as noreplace + * Wed Jul 12 2006 Jesse Keating - 0.95.7b-21.1.1 - rebuild From fedora-extras-commits at redhat.com Wed Jul 23 13:50:52 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 23 Jul 2008 13:50:52 GMT Subject: rpms/cleanfeed/devel cleanfeed.spec,1.12,1.13 Message-ID: <200807231350.m6NDoqtx025089@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/cleanfeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25028 Modified Files: cleanfeed.spec Log Message: cleanfeed.conf shouldn't be replaced by update - added noreplace to %config Index: cleanfeed.spec =================================================================== RCS file: /cvs/extras/rpms/cleanfeed/devel/cleanfeed.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cleanfeed.spec 16 Jun 2008 08:32:12 -0000 1.12 +++ cleanfeed.spec 23 Jul 2008 13:50:08 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A spam filter for Usenet news servers. Name: cleanfeed Version: 0.95.7b -Release: 22%{?dist} +Release: 23%{?dist} License: distributable Group: System Environment/Daemons Source0: ftp://ftp.exit109.com/users/jeremy/cleanfeed-%{version}.tar.gz @@ -40,12 +40,15 @@ rm -rf $RPM_BUILD_ROOT %files -%attr(-,news,news) %config /etc/news/cleanfeed.conf +%attr(-,news,news) %config(noreplace) /etc/news/cleanfeed.conf %attr(-,root,root) %{_mandir}/man8/cleanfeed.8* %attr(755,news,news) %dir /usr/lib/news/bin/filter %attr(-,news,news) /usr/lib/news/bin/filter/filter_innd.pl %changelog +* Wed Jul 23 2008 Roman Rakus - 0.95.7b-23 +- Mark config file cleanfeed.conf as noreplace + * Mon Jun 16 2008 Roman Rakus - 0.95.7b-22 - Added dist to release tag From fedora-extras-commits at redhat.com Wed Jul 23 13:53:32 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 13:53:32 GMT Subject: rpms/kdebase-workspace/devel .cvsignore, 1.16, 1.17 kdebase-workspace.spec, 1.111, 1.112 sources, 1.19, 1.20 Message-ID: <200807231353.m6NDrWAF025389@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25279 Modified Files: .cvsignore kdebase-workspace.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 18 Jul 2008 15:16:58 -0000 1.16 +++ .cvsignore 23 Jul 2008 13:52:49 -0000 1.17 @@ -1 +1,2 @@ kdebase-workspace-4.0.99.tar.bz2 +kdebase-workspace-4.1.0.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- kdebase-workspace.spec 22 Jul 2008 23:23:01 -0000 1.111 +++ kdebase-workspace.spec 23 Jul 2008 13:52:49 -0000 1.112 @@ -2,9 +2,9 @@ Summary: K Desktop Environment - Workspace Name: kdebase-workspace -Version: 4.0.99 +Version: 4.1.0 -Release: 5%{?dist} +Release: 1%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -301,6 +301,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Wed Jul 23 2008 Kevin Kofler 4.0.99-5 - F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or Require kdebase, as kdebase now requires kdebase-workspace, obviating the Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 18 Jul 2008 15:16:58 -0000 1.19 +++ sources 23 Jul 2008 13:52:49 -0000 1.20 @@ -1 +1 @@ -eec3d9d9886a0436672007ab2568a20a kdebase-workspace-4.0.99.tar.bz2 +3b7db1a9860c68165f2cdc3d301974f6 kdebase-workspace-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 13:57:49 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 13:57:49 GMT Subject: rpms/kdebindings/devel .cvsignore, 1.46, 1.47 kdebindings.spec, 1.130, 1.131 sources, 1.50, 1.51 Message-ID: <200807231357.m6NDvnGn025733@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25658 Modified Files: .cvsignore kdebindings.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 19 Jul 2008 05:59:31 -0000 1.46 +++ .cvsignore 23 Jul 2008 13:57:04 -0000 1.47 @@ -1 +1,2 @@ kdebindings-4.0.99.tar.bz2 +kdebindings-4.1.0.tar.bz2 Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- kdebindings.spec 19 Jul 2008 05:59:31 -0000 1.130 +++ kdebindings.spec 23 Jul 2008 13:57:04 -0000 1.131 @@ -21,7 +21,7 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: KDE bindings to non-C++ languages @@ -165,6 +165,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 19 Jul 2008 05:59:31 -0000 1.50 +++ sources 23 Jul 2008 13:57:04 -0000 1.51 @@ -1 +1 @@ -5b9529a90445f075a201ec5754ebe3c9 kdebindings-4.0.99.tar.bz2 +0552896de98a70c94baf76be68a1bc5a kdebindings-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:06:05 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 23 Jul 2008 14:06:05 GMT Subject: rpms/authd/F-8 authd.spec,1.40,1.41 Message-ID: <200807231406.m6NE659G000561@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv478 Modified Files: authd.spec Log Message: corrections in specfile: URL, source, release tags. Configure ident.key as noreplace. Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/F-8/authd.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- authd.spec 19 Sep 2007 10:21:21 -0000 1.40 +++ authd.spec 23 Jul 2008 14:05:18 -0000 1.41 @@ -1,13 +1,14 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 10 +Release: 11%{?dist} License: GPLv2 Group: System Environment/Daemons +URL: https://fedorahosted.org/authd/ Obsoletes: pidentd Provides: pidentd = 3.2 Requires(post): openssl -Source0: %{name}-%{version}.tar.gz +Source0: http://svn.fedorahosted.org/svn/authd/%{name}-%{version}.tar.gz Patch0: authd-1.4.3-gcc4.patch Patch1: authd-1.4.3-disable.patch Patch2: authd-1.4.3-ipv6-mapping.patch @@ -63,13 +64,18 @@ %files -f authd.lang %defattr(640,root,root,-) -%verify(not md5 size mtime user group) %config %{_sysconfdir}/ident.key +%verify(not md5 size mtime user group) %config(noreplace) %{_sysconfdir}/ident.key %defattr(-,root,root,-) %doc COPYING README.html rfc1413.txt %config(noreplace) %{_sysconfdir}/xinetd.d/auth %{_sbindir}/in.authd %changelog +* Wed Jul 23 2008 Roman Rakus - 1.4.3-11 +- corrected config of file ident.key - now noreplace +- added URL tag +- corrected release and source tags + * Wed Sep 19 2007 Ondrej Dvoracek - 1.4.3-10 - corrected illegal identifier in longopt enumeration (#245436) - corrected summary and license From fedora-extras-commits at redhat.com Wed Jul 23 14:11:07 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 14:11:07 GMT Subject: rpms/kdegames/devel .cvsignore, 1.55, 1.56 kdegames.spec, 1.98, 1.99 sources, 1.58, 1.59 Message-ID: <200807231411.m6NEB7Bv001134@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdegames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1060 Modified Files: .cvsignore kdegames.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 19 Jul 2008 05:58:04 -0000 1.55 +++ .cvsignore 23 Jul 2008 14:10:19 -0000 1.56 @@ -1 +1,2 @@ kdegames-4.0.99.tar.bz2 +kdegames-4.1.0.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- kdegames.spec 19 Jul 2008 06:26:10 -0000 1.98 +++ kdegames.spec 23 Jul 2008 14:10:19 -0000 1.99 @@ -4,7 +4,7 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -187,6 +187,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegames/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 19 Jul 2008 05:58:04 -0000 1.58 +++ sources 23 Jul 2008 14:10:19 -0000 1.59 @@ -1 +1 @@ -9abe8d80e33947b5e949516f36e0bf4f kdegames-4.0.99.tar.bz2 +2c0a4c089bf31ff9bd3133c3f58c4dc7 kdegames-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:11:58 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 14:11:58 GMT Subject: rpms/kdeedu/devel .cvsignore, 1.50, 1.51 kdeedu.spec, 1.128, 1.129 sources, 1.54, 1.55 Message-ID: <200807231411.m6NEBwpT001268@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1140 Modified Files: .cvsignore kdeedu.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 19 Jul 2008 05:57:20 -0000 1.50 +++ .cvsignore 23 Jul 2008 14:11:14 -0000 1.51 @@ -1 +1,2 @@ kdeedu-4.0.99.tar.bz2 +kdeedu-4.1.0.tar.bz2 Index: kdeedu.spec =================================================================== RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- kdeedu.spec 19 Jul 2008 06:56:55 -0000 1.128 +++ kdeedu.spec 23 Jul 2008 14:11:14 -0000 1.129 @@ -13,7 +13,7 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -393,6 +393,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeedu/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 19 Jul 2008 05:57:20 -0000 1.54 +++ sources 23 Jul 2008 14:11:14 -0000 1.55 @@ -1 +1 @@ -9d4eceb28c16a547a7ab19c0b59c0177 kdeedu-4.0.99.tar.bz2 +0debdf843969152cb14b7186919b8c2b kdeedu-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:13:16 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 23 Jul 2008 14:13:16 GMT Subject: rpms/authd/F-9 authd.spec,1.50,1.51 Message-ID: <200807231413.m6NEDG77001442@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1361 Modified Files: authd.spec Log Message: Corrected configuration of ident.key to noreplace. Fixed some typos in specfile Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/F-9/authd.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- authd.spec 26 Mar 2008 09:26:55 -0000 1.50 +++ authd.spec 23 Jul 2008 14:12:31 -0000 1.51 @@ -1,7 +1,7 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://fedorahosted.org/authd/ @@ -15,6 +15,8 @@ Patch3: authd-1.4.3-locale.patch Patch4: authd-1.4.3-longopt-identifier.patch Patch5: authd-1.4.3-jiffies64.patch +Patch6: authd-1.4.3-valist.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: openssl-devel gettext Requires: xinetd @@ -31,8 +33,9 @@ %patch1 -p1 %patch2 -p1 -b .ipv6map %patch3 -p1 -b .locale -%patch4 -p1 -%patch5 -p1 +%patch4 -p1 -b .longopt-identifier +%patch5 -p1 -b .jiffies64 +%patch6 -p1 -b .valist sed -i -e "s|/etc|%{_sysconfdir}|" config.h %build @@ -66,29 +69,33 @@ %files -f authd.lang %defattr(640,root,root,-) -%verify(not md5 size mtime user group) %config %{_sysconfdir}/ident.key +%verify(not md5 size mtime user group) %config(noreplace) %{_sysconfdir}/ident.key %defattr(-,root,root,-) %doc COPYING README.html rfc1413.txt %config(noreplace) %{_sysconfdir}/xinetd.d/auth %{_sbindir}/in.authd %changelog -* Wed Mar 26 2008 Roman Rakus - 1.4.3-19 +* Wed Jul 23 2008 Roman Rakus - 1.4.3-19 - corrected jiffies64 patch -* Thu Mar 6 2008 Roman Rakus - 1.4.3-18 +* Thu Mar 6 2008 Roman Rakus - 1.4.3-18 - corrected Source0 - corrected link in URL - source added to svn on fedorahosted -* Wed Mar 5 2008 Roman Rakus - 1.4.3-16 +* Wed Mar 5 2008 Roman Rakus - 1.4.3-16 - fixed Source0 -* Wed Mar 5 2008 Roman Rakus - 1.4.3-15 +* Wed Mar 5 2008 Roman Rakus - 1.4.3-15 - added dist tag - added URL -* Tue Feb 26 2008 Roman Rakus - 1.4.3-14 +* Tue Feb 26 2008 Roman Rakus - 1.4.3-14 - fix 234262 bug * Wed Feb 13 2008 Jan Safranek - 1.4.3-13 From fedora-extras-commits at redhat.com Wed Jul 23 14:13:39 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 14:13:39 GMT Subject: rpms/qt/devel qt-copy-kde#162793.patch, NONE, 1.1 .cvsignore, 1.34, 1.35 qt.spec, 1.200, 1.201 sources, 1.35, 1.36 Message-ID: <200807231413.m6NEDd8f001478@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1402 Modified Files: .cvsignore qt.spec sources Added Files: qt-copy-kde#162793.patch Log Message: * Wed Jul 23 2008 Rex Dieter 4.4.0-16 - qt-copy-patches-20080723 (kde#162793) - omit deprecated phonon bits qt-copy-kde#162793.patch: --- NEW FILE qt-copy-kde#162793.patch --- --- trunk/qt-copy/src/gui/dialogs/qprintdialog_unix.cpp 2008/07/22 18:43:59 836671 +++ trunk/qt-copy/src/gui/dialogs/qprintdialog_unix.cpp 2008/07/22 18:46:17 836672 @@ -936,9 +936,12 @@ void QUnixPrintWidgetPrivate::setupPrinter() { - // printer or file name - if (widget.printers->currentIndex() >= widget.printers->count() - 2) { - if (widget.printers->currentIndex() == widget.printers->count() - 2) + const int printerCount = widget.printers->count(); + const int index = widget.printers->currentIndex(); + + if (filePrintersAdded && index > printerCount - 3) { // PDF or postscript + Q_ASSERT(index != printerCount - 3); // separator + if (index == printerCount - 2) printer->setOutputFormat(QPrinter::PdfFormat); else printer->setOutputFormat(QPrinter::PostScriptFormat); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 12 Jul 2008 01:31:46 -0000 1.34 +++ .cvsignore 23 Jul 2008 14:12:53 -0000 1.35 @@ -2,3 +2,4 @@ hi48-app-qt4-logo.png qt-x11-opensource-src-4.4.0.tar.bz2 qt-copy-patches-20080711svn.tar.bz2 +qt-copy-patches-20080723svn.tar.bz2 Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- qt.spec 19 Jul 2008 18:33:20 -0000 1.200 +++ qt.spec 23 Jul 2008 14:12:53 -0000 1.201 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 15%{?dist} +Release: 16%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -39,7 +39,7 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch ## qt-copy patches -%define qt_copy 20080711 +%define qt_copy 20080723 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -65,8 +65,6 @@ %define odbc -plugin-sql-odbc %define psql -plugin-sql-psql %define sqlite -plugin-sql-sqlite -# FIXME: building -no-phonon currently busted, build fails -- Rex -#define phonon -phonon -gstreamer %define webkit -webkit #define nas -system-nas-sound @@ -111,7 +109,6 @@ BuildRequires: zlib-devel BuildRequires: glib2-devel BuildRequires: openssl-devel -%{?phonon:BuildRequires: gstreamer-devel >= 0.10.12, gstreamer-plugins-base-devel} ## In theory, should be as simple as: #define x_deps libGL-devel libGLU-devel @@ -228,16 +225,6 @@ %description mysql %{summary}. -%package phonon-devel -Summary: Phonon development files for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -# FIXME -Conflicts: kdelibs4-devel < 4.1 - -%description phonon-devel -%{summary}. - %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries @@ -366,6 +353,7 @@ -no-rpath \ -reduce-relocations \ -no-separate-debug-info \ + -no-phonon -no-gstreamer \ -sm \ -stl \ -system-libmng \ @@ -384,9 +372,7 @@ -glib \ -openssl-linked \ -xmlpatterns \ - %{?phonon} %{!?phonon:-no-phonon } \ %{?dbus} %{!?dbus:-no-dbus} \ - %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ %{?webkit} %{!?webkit:-no-webkit } \ %{?nas} \ %{?mysql} \ @@ -635,7 +621,6 @@ %{_qt4_libdir}/libQtOpenGL.so.* %{_qt4_libdir}/libQtSvg.so.* %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*} -%{?phonon:%{_qt4_libdir}/libphonon.so.*} %{_qt4_plugindir}/* %exclude %{_qt4_plugindir}/designer %exclude %{_qt4_plugindir}/sqldrivers @@ -692,8 +677,6 @@ %dir %{_qt4_headerdir}/ %endif %{_qt4_headerdir}/* -%{?phonon:%exclude %{_qt4_headerdir}/phonon/} -%{?phonon:%exclude %{_qt4_headerdir}/Qt/phonon*} %{_qt4_datadir}/mkspecs/ %if "%{_qt4_datadir}" != "%{_qt4_prefix}" %{_qt4_prefix}/mkspecs/ @@ -704,7 +687,6 @@ %{_qt4_libdir}/libQt*.a %{_qt4_libdir}/libQt*.prl %{_libdir}/pkgconfig/*.pc -%{?phonon:%exclude %{_libdir}/pkgconfig/phonon.pc} # Qt designer %{_qt4_bindir}/designer* %{_qt4_plugindir}/designer/ @@ -732,16 +714,6 @@ %endif %{_datadir}/applications/*qtdemo*.desktop -%if 0%{?phonon:1} -%files phonon-devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/phonon.pc -%{_qt4_headerdir}/phonon/ -%{_qt4_headerdir}/Qt/phonon* -%{_qt4_libdir}/libphonon.so -%{_qt4_libdir}/libphonon.prl -%endif - %if "%{?odbc}" == "-plugin-sql-odbc" %files odbc %defattr(-,root,root,-) @@ -768,6 +740,10 @@ %changelog +* Wed Jul 23 2008 Rex Dieter 4.4.0-16 +- qt-copy-patches-20080723 (kde#162793) +- omit deprecated phonon bits + * Sat Jul 19 2008 Rex Dieter 4.4.0-15 - fix/workaround spec syntax Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 12 Jul 2008 01:31:46 -0000 1.35 +++ sources 23 Jul 2008 14:12:54 -0000 1.36 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png +bb7e7e6aa739c0c87e3cb3dbfe0fa814 qt-copy-patches-20080723svn.tar.bz2 03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2 -7cf6bdbd220fb8915f8d875442e29961 qt-copy-patches-20080711svn.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:14:59 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Wed, 23 Jul 2008 14:14:59 GMT Subject: rpms/rsyslog/F-9 rsyslog.conf, NONE, 1.1 rsyslog.init, NONE, 1.1 rsyslog.log, NONE, 1.1 rsyslog.sysconfig, NONE, 1.1 .cvsignore, 1.22, 1.23 rsyslog.spec, 1.39, 1.40 sources, 1.24, 1.25 Message-ID: <200807231414.m6NEExQ1001670@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1536 Modified Files: .cvsignore rsyslog.spec sources Added Files: rsyslog.conf rsyslog.init rsyslog.log rsyslog.sysconfig Log Message: upgrade --- NEW FILE rsyslog.conf --- #rsyslog v3 config file # if you experience problems, check # http://www.rsyslog.com/troubleshoot for assistance #### MODULES #### $ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command) $ModLoad imklog.so # provides kernel logging support (previously done by rklogd) #$ModLoad immark.so # provides --MARK-- message capability # Provides UDP syslog reception #$ModLoad imudp.so #$UDPServerRun 514 # Provides TCP syslog reception #$ModLoad imtcp.so #$InputTCPServerRun 514 #### GLOBAL DIRECTIVES #### # Use default timestamp format $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat # File syncing capability is disabled by default. This feature is usually not required, # not useful and an extreme performance hit #$ActionFileEnableSync on #### RULES #### # Log all kernel messages to the console. # Logging much else clutters up the screen. #kern.* /dev/console # Log anything (except mail) of level info or higher. # Don't log private authentication messages! *.info;mail.none;authpriv.none;cron.none /var/log/messages # The authpriv file has restricted access. authpriv.* /var/log/secure # Log all the mail messages in one place. mail.* -/var/log/maillog # Log cron stuff cron.* /var/log/cron # Everybody gets emergency messages *.emerg * # Save news errors of level crit and higher in a special file. uucp,news.crit /var/log/spooler # Save boot messages also to boot.log local7.* /var/log/boot.log # ### begin forwarding rule ### # The statement between the begin ... end define a SINGLE forwarding # rule. They belong together, do NOT split them. If you create multiple # forwarding rules, duplicate the whole block! # Remote Logging (we use TCP for reliable delivery) # # An on-disk queue is created for this action. If the remote host is # down, messages are spooled to disk and sent when it is up again. #$WorkDirectory /var/spppl/rsyslog # where to place spool files #$ActionQueueFileName fwdRule1 # unique name prefix for spool files #$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) #$ActionQueueSaveOnShutdown on # save messages to disk on shutdown #$ActionQueueType LinkedList # run asynchronously #$ActionResumeRetryCount -1 # infinite retries if host is down # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional #*.* @@remote-host:514 # ### end of the forwarding rule ### --- NEW FILE rsyslog.init --- #!/bin/bash # # rsyslog Starts rsyslogd/rklogd. # # # chkconfig: 2345 12 88 # description: Syslog is the facility by which many daemons use to log \ # messages to various system log files. It is a good idea to always \ # run rsyslog. ### BEGIN INIT INFO # Provides: $syslog # Required-Start: $local_fs # Required-Stop: $local_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Enhanced system logging and kernel message trapping daemons # Description: Rsyslog is an enhanced multi-threaded syslogd supporting, # among others, MySQL, syslog/tcp, RFC 3195, permitted # sender lists, filtering on any message part, and fine # grain output format control. ### END INIT INFO # Source function library. . /etc/init.d/functions RETVAL=0 start() { [ -x /sbin/rsyslogd ] || exit 5 # Source config if [ -f /etc/sysconfig/rsyslog ] ; then . /etc/sysconfig/rsyslog fi umask 077 echo -n $"Starting system logger: " daemon rsyslogd $SYSLOGD_OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog return $RETVAL } stop() { echo -n $"Shutting down system logger: " killproc rsyslogd RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rsyslog return $RETVAL } reload() { RETVAL=1 syslog=`cat /var/run/rsyslogd.pid 2>/dev/null` echo -n "Reloading system logger..." if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then kill -HUP "$syslog"; RETVAL=$? fi if [ $RETVAL -ne 0 ]; then failure else success fi echo return $RETVAL } rhstatus() { status rsyslogd } restart() { stop start } case "$1" in start) start ;; stop) stop ;; restart) restart ;; reload|force-reload) reload ;; status) rhstatus ;; condrestart) [ -f /var/lock/subsys/rsyslog ] && restart || : ;; *) echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart}" exit 2 esac exit $? --- NEW FILE rsyslog.log --- /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron { sharedscripts postrotate /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true endscript } --- NEW FILE rsyslog.sysconfig --- # Options to syslogd # syslogd options are deprecated in rsyslog v3 # if you want to use them, switch to compatibility mode 2 by "-c 2" SYSLOGD_OPTIONS="-c 3" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsyslog/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 13 Jun 2008 09:44:01 -0000 1.22 +++ .cvsignore 23 Jul 2008 14:14:15 -0000 1.23 @@ -1,5 +1 @@ -rsyslog-3.14.1.tar.gz -rsyslog.conf -rsyslog.init -rsyslog.sysconfig -rsyslog-3.16.1.tar.gz +rsyslog-3.18.1.tar.gz Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/F-9/rsyslog.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- rsyslog.spec 13 Jun 2008 09:47:52 -0000 1.39 +++ rsyslog.spec 23 Jul 2008 14:14:15 -0000 1.40 @@ -2,8 +2,8 @@ Summary: Enhanced system logging and kernel message trapping daemons Name: rsyslog -Version: 3.16.1 -Release: 2%{?dist} +Version: 3.18.1 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -11,6 +11,7 @@ Source1: rsyslog.init Source2: rsyslog.conf Source3: rsyslog.sysconfig +Source4: rsyslog.log Patch1: rsyslog-3.11.4-undef.patch Patch2: rsyslog-3.16.1-cfsline.patch Patch3: rsyslog-3.16.1-symLookup.patch @@ -80,9 +81,9 @@ %prep %setup -q -%patch1 -p1 -b .undef -%patch2 -p1 -b .cfsline -%patch3 -p1 -b .symlookup +#%patch1 -p1 -b .undef +#%patch2 -p1 -b .cfsline +#%patch3 -p1 -b .symlookup %build %configure --sbindir=%{sbindir} \ @@ -106,7 +107,7 @@ install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/rsyslog install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rsyslog -install -p -m 644 redhat/rsyslog.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog #get rid of *.la rm $RPM_BUILD_ROOT/%{_libdir}/rsyslog/*.la @@ -180,6 +181,9 @@ %{_libdir}/rsyslog/omrelp.so %changelog +* Wed Jul 23 2008 Peter Vrabec 3.18.1-1 +- upgrade + * Fri Jun 13 2008 Tomas Heinrich 3.16.1-2 - increase release number Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsyslog/F-9/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 13 Jun 2008 09:44:01 -0000 1.24 +++ sources 23 Jul 2008 14:14:15 -0000 1.25 @@ -1,5 +1 @@ -7e4a7b506e249d69c7d8c5ce7567ee8c rsyslog-3.14.1.tar.gz -e6fd8aa699a50ec9abffae50a423aca9 rsyslog.conf -04f3868aa518d33809f5943d7bc2fc0b rsyslog.sysconfig -26fb52edc816e59e29b1f3b4ac520d30 rsyslog.init -eb371da5e221182fa77c5d814212e460 rsyslog-3.16.1.tar.gz +105a989f89e87d3dd4923d2f4520750b rsyslog-3.18.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 14:18:35 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 14:18:35 GMT Subject: rpms/kdegraphics/devel .cvsignore, 1.48, 1.49 kdegraphics.spec, 1.157, 1.158 sources, 1.51, 1.52 Message-ID: <200807231418.m6NEIZ18002060@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdegraphics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1927 Modified Files: .cvsignore kdegraphics.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 19 Jul 2008 05:57:54 -0000 1.48 +++ .cvsignore 23 Jul 2008 14:17:42 -0000 1.49 @@ -1 +1,2 @@ kdegraphics-4.0.99.tar.bz2 +kdegraphics-4.1.0.tar.bz2 Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- kdegraphics.spec 21 Jul 2008 17:38:28 -0000 1.157 +++ kdegraphics.spec 23 Jul 2008 14:17:42 -0000 1.158 @@ -1,12 +1,11 @@ - %if 0%{?fedora} < 10 %define omit_kde3_conflicts 1 %endif Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.0.99 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Name: kdegraphics Obsoletes: kdegraphics4 < %{version}-%{release} @@ -46,7 +45,6 @@ %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } Requires: kdelibs4 >= %{version} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -# okular requires lpr.cups (provided by cups) Requires: cups Requires(post): xdg-utils Requires(postun): xdg-utils @@ -185,6 +183,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Mon Jul 21 2008 Rex Dieter 4.0.99-2 - omit conflicting lib{kexiv2,kdcraw,kipi}-devel bits in F-9 builds (#452392) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 19 Jul 2008 05:57:54 -0000 1.51 +++ sources 23 Jul 2008 14:17:42 -0000 1.52 @@ -1 +1 @@ -1462a278ed3178c5c941f2ad8d3f742b kdegraphics-4.0.99.tar.bz2 +ebaf7fc86d35587ce188e8e440bc8bcf kdegraphics-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:18:36 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 23 Jul 2008 14:18:36 GMT Subject: rpms/python-slip/devel .cvsignore, 1.4, 1.5 python-slip.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807231418.m6NEIaPK002065@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/python-slip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1935 Modified Files: .cvsignore python-slip.spec sources Log Message: version 0.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jul 2008 10:47:58 -0000 1.4 +++ .cvsignore 23 Jul 2008 14:17:49 -0000 1.5 @@ -1 +1 @@ -python-slip-0.1.5.tar.bz2 +python-slip-0.1.6.tar.bz2 Index: python-slip.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-slip.spec 22 Jul 2008 10:47:58 -0000 1.3 +++ python-slip.spec 23 Jul 2008 14:17:49 -0000 1.4 @@ -3,7 +3,7 @@ %{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")} Name: python-slip -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: Miscellaneous convenience, extension and workaround code for Python @@ -84,6 +84,11 @@ %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info %changelog +* Wed Jul 23 2008 Nils Philippsen - 0.1.6 +- move proxy.polkit_enable to polkit.enable_proxy +- rename polkit.NotAuthorized to NotAuthorizedException, polkit.auth_required + to require_auth + * Tue Jul 22 2008 Nils Philippsen - 0.1.5 - don't reset timeout on failed polkit authorizations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jul 2008 10:47:58 -0000 1.4 +++ sources 23 Jul 2008 14:17:49 -0000 1.5 @@ -1 +1 @@ -abc0462c5c24c2defcd059bdac4dfbc4 python-slip-0.1.5.tar.bz2 +b07267138e819d57e9fa48f08ce0c689 python-slip-0.1.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:22:01 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 23 Jul 2008 14:22:01 GMT Subject: rpms/authd/F-9 authd.spec,1.51,1.52 Message-ID: <200807231422.m6NEM17m002410@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2372 Modified Files: authd.spec Log Message: Some cleanup in specfile Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/F-9/authd.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- authd.spec 23 Jul 2008 14:12:31 -0000 1.51 +++ authd.spec 23 Jul 2008 14:21:16 -0000 1.52 @@ -15,7 +15,6 @@ Patch3: authd-1.4.3-locale.patch Patch4: authd-1.4.3-longopt-identifier.patch Patch5: authd-1.4.3-jiffies64.patch -Patch6: authd-1.4.3-valist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: openssl-devel gettext @@ -35,7 +34,6 @@ %patch3 -p1 -b .locale %patch4 -p1 -b .longopt-identifier %patch5 -p1 -b .jiffies64 -%patch6 -p1 -b .valist sed -i -e "s|/etc|%{_sysconfdir}|" config.h %build From fedora-extras-commits at redhat.com Wed Jul 23 14:26:15 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 14:26:15 GMT Subject: rpms/kdelibs/devel .cvsignore, 1.56, 1.57 kdelibs.spec, 1.350, 1.351 sources, 1.67, 1.68 Message-ID: <200807231426.m6NEQFsx002678@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2630 Modified Files: .cvsignore kdelibs.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- .cvsignore 18 Jul 2008 15:13:36 -0000 1.56 +++ .cvsignore 23 Jul 2008 14:25:23 -0000 1.57 @@ -1 +1,2 @@ kdelibs-4.0.99.tar.bz2 +kdelibs-4.1.0.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- kdelibs.spec 20 Jul 2008 16:37:44 -0000 1.350 +++ kdelibs.spec 23 Jul 2008 14:25:23 -0000 1.351 @@ -1,8 +1,8 @@ %define _default_patch_fuzz 2 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.99 -Release: 3%{?dist} +Version: 4.1.0 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -359,6 +359,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Sun Jul 20 2008 Kevin Kofler 4.0.99-3 - fix kstandarddirs patch to always append the installed location last, even if it is already present earlier in the search path (#456004) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- sources 18 Jul 2008 15:13:36 -0000 1.67 +++ sources 23 Jul 2008 14:25:23 -0000 1.68 @@ -1 +1 @@ -92e6d8d1bc0dccd8f5c204039c2aa00d kdelibs-4.0.99.tar.bz2 +86496aed25d4dce440418b3064a27913 kdelibs-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:30:07 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 23 Jul 2008 14:30:07 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.64, 1.65 sources, 1.77, 1.78 system-config-services.spec, 1.76, 1.77 Message-ID: <200807231430.m6NEU7qg002900@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2831 Modified Files: .cvsignore sources system-config-services.spec Log Message: version 0.99.19 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- .cvsignore 23 Jul 2008 09:31:38 -0000 1.64 +++ .cvsignore 23 Jul 2008 14:29:19 -0000 1.65 @@ -1 +1 @@ -system-config-services-0.99.18.tar.bz2 +system-config-services-0.99.19.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- sources 23 Jul 2008 09:31:38 -0000 1.77 +++ sources 23 Jul 2008 14:29:19 -0000 1.78 @@ -1 +1 @@ -e12c0b9c32087d84af95f327eb003c0d system-config-services-0.99.18.tar.bz2 +6b33385a20c75ee4e13861970898703f system-config-services-0.99.19.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- system-config-services.spec 23 Jul 2008 09:31:38 -0000 1.76 +++ system-config-services.spec 23 Jul 2008 14:29:19 -0000 1.77 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.18 +Version: 0.99.19 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -48,7 +48,7 @@ Requires: pygtk2-libglade Requires: python >= 2.3.0 Requires: dbus-python -Requires: python-slip-dbus >= 0.1.4 +Requires: python-slip-dbus >= 0.1.6 Requires: python-slip-gtk Requires: PolicyKit-gnome Obsoletes: serviceconf <= 0.8.1 @@ -111,6 +111,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Wed Jul 23 2008 Nils Philippsen - 0.99.19-1 +- use new slip.dbus API as of python-slip-0.1.6 + * Wed Jul 23 2008 Nils Philippsen - 0.99.18-1 - require PolicyKit-gnome instead of usermode From fedora-extras-commits at redhat.com Wed Jul 23 14:34:50 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 23 Jul 2008 14:34:50 GMT Subject: rpms/xen/devel xen-3.2.0-bzimage.patch, NONE, 1.1 xen-3.0.2-config-allow-unix-server.patch, 1.1, 1.2 xen-3.0.2-config-disable-reloc.patch, 1.1, 1.2 xen-3.2.0-block-rw-range-check.patch, 1.2, 1.3 xen-3.2.0-qemu-evtchn-fd.patch, 1.1, 1.2 xen-compile-fixes.patch, 1.9, 1.10 xen-config-dom0-minmem.patch, 1.1, 1.2 xen-dumpdir.patch, 1.2, 1.3 xen-hvm-kernel-boot-nonrelocatable.patch, 1.2, 1.3 xen-hvm-kernel-boot-relocatable.patch, 1.2, 1.3 xen-hvm-kernel-boot-xend.patch, 1.2, 1.3 xen-ia64-hypercall-args.patch, 1.1, 1.2 xen-net-disable-bridge-by-default.patch, 1.1, 1.2 xen-net-disable-iptables-on-bridge.patch, 1.1, 1.2 xen-pvfb-validate-fb.patch, 1.2, 1.3 xen-qemu-bootmenu.patch, 1.1, 1.2 xen-qemu-image-format.patch, 1.1, 1.2 xen-qemu-logfile.patch, 1.1, 1.2 xen-timer-mode.patch, 1.1, 1.2 xen-xenstore-cli.patch, 1.2, 1.3 xen.spec, 1.220, 1.221 Message-ID: <200807231434.m6NEYodZ003340@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/xen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184 Modified Files: xen-3.0.2-config-allow-unix-server.patch xen-3.0.2-config-disable-reloc.patch xen-3.2.0-block-rw-range-check.patch xen-3.2.0-qemu-evtchn-fd.patch xen-compile-fixes.patch xen-config-dom0-minmem.patch xen-dumpdir.patch xen-hvm-kernel-boot-nonrelocatable.patch xen-hvm-kernel-boot-relocatable.patch xen-hvm-kernel-boot-xend.patch xen-ia64-hypercall-args.patch xen-net-disable-bridge-by-default.patch xen-net-disable-iptables-on-bridge.patch xen-pvfb-validate-fb.patch xen-qemu-bootmenu.patch xen-qemu-image-format.patch xen-qemu-logfile.patch xen-timer-mode.patch xen-xenstore-cli.patch xen.spec Added Files: xen-3.2.0-bzimage.patch Log Message: * Wed Jul 23 2008 Mark McLoughlin - 3.2.0-17.fc10 - Enable xen-hypervisor build - Backport support for booting DomU from bzImage - Re-diff all patches for zero fuzz xen-3.2.0-bzimage.patch: --- NEW FILE xen-3.2.0-bzimage.patch --- x86: Support loading Linux bzImage v2.08 and up. The latest -mm kernel (2.6.25-rc3-mm1) contains v2.08 of the Linux bzImage format which embeds an ELF file in place of the raw payload allowing it to be extracted and used by the Xen domain builder. It is expected that this functionality will be put forward for 2.6.26. Signed-off-by : Ian Campbell Index: xen-3.2.0/tools/libxc/Makefile =================================================================== --- xen-3.2.0.orig/tools/libxc/Makefile 2008-01-16 18:34:59.000000000 +0000 +++ xen-3.2.0.orig/tools/libxc/Makefile 2008-01-16 18:34:59.000000000 +0000 @@ -47,10 +47,11 @@ $(LIBELF_SRCS) libelf-private.h: GUEST_SRCS-y += $(LIBELF_SRCS) # new domain builder -GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c -GUEST_SRCS-y += xc_dom_elfloader.c -GUEST_SRCS-y += xc_dom_binloader.c -GUEST_SRCS-y += xc_dom_compat_linux.c +GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c +GUEST_SRCS-y += xc_dom_elfloader.c +GUEST_SRCS-$(CONFIG_X86) += xc_dom_bzimageloader.c +GUEST_SRCS-y += xc_dom_binloader.c +GUEST_SRCS-y += xc_dom_compat_linux.c GUEST_SRCS-$(CONFIG_X86) += xc_dom_x86.c GUEST_SRCS-$(CONFIG_IA64) += xc_dom_ia64.c Index: xen-3.2.0/tools/libxc/xc_dom_elfloader.c =================================================================== --- xen-3.2.0.orig/tools/libxc/xc_dom_elfloader.c 2008-01-16 18:34:59.000000000 +0000 +++ xen-3.2.0.orig/tools/libxc/xc_dom_elfloader.c 2008-01-16 18:34:59.000000000 +0000 @@ -281,7 +281,7 @@ static int xc_dom_load_elf_kernel(struct /* ------------------------------------------------------------------------ */ -static struct xc_dom_loader elf_loader = { +struct xc_dom_loader elf_loader = { .name = "ELF-generic", .probe = xc_dom_probe_elf_kernel, .parser = xc_dom_parse_elf_kernel, Index: xen-3.2.0/tools/libxc/xc_dom_bzimageloader.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -0,0 +1,159 @@ +/* + * Xen domain builder -- bzImage bits + * + * Parse and load bzImage kernel images. + * + * This relies on version 2.08 of the boot protocol, which contains an + * ELF file embedded in the bzImage. The loader extracts this ELF + * image and passes it off to the standard ELF loader. + * + * This code is licenced under the GPL. + * written 2006 by Gerd Hoffmann . + * written 2007 by Jeremy Fitzhardinge + * written 2008 by Ian Campbell + * + */ +#include +#include +#include + +#include "xg_private.h" +#include "xc_dom.h" + +struct setup_header { + uint8_t _pad0[0x1f1]; /* skip uninteresting stuff */ + uint8_t setup_sects; + uint16_t root_flags; + uint32_t syssize; + uint16_t ram_size; + uint16_t vid_mode; + uint16_t root_dev; + uint16_t boot_flag; + uint16_t jump; + uint32_t header; +#define HDR_MAGIC "HdrS" +#define HDR_MAGIC_SZ 4 + uint16_t version; +#define VERSION(h,l) (((h)<<8) | (l)) + uint32_t realmode_swtch; + uint16_t start_sys; + uint16_t kernel_version; + uint8_t type_of_loader; + uint8_t loadflags; + uint16_t setup_move_size; + uint32_t code32_start; + uint32_t ramdisk_image; + uint32_t ramdisk_size; + uint32_t bootsect_kludge; + uint16_t heap_end_ptr; + uint16_t _pad1; + uint32_t cmd_line_ptr; + uint32_t initrd_addr_max; + uint32_t kernel_alignment; + uint8_t relocatable_kernel; + uint8_t _pad2[3]; + uint32_t cmdline_size; + uint32_t hardware_subarch; + uint64_t hardware_subarch_data; + uint32_t payload_offset; + uint32_t payload_length; +} __attribute__((packed)); + +extern struct xc_dom_loader elf_loader; + +static unsigned int payload_offset(struct setup_header *hdr) +{ + unsigned int off; + + off = (hdr->setup_sects + 1) * 512; + off += hdr->payload_offset; + return off; +} + +static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose) +{ + struct setup_header *hdr; + + if ( dom->kernel_blob == NULL ) + { + if ( verbose ) + xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n", + __FUNCTION__); + return -EINVAL; + } + if ( dom->kernel_size < sizeof(struct setup_header) ) + { + if ( verbose ) + xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n", + __FUNCTION__); + return -EINVAL; + } + + hdr = dom->kernel_blob; + + if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n", + __FUNCTION__); + return -EINVAL; + } + + if ( hdr->version < VERSION(2,8) ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n", + __FUNCTION__, hdr->version); + return -EINVAL; + } + + dom->kernel_blob = dom->kernel_blob + payload_offset(hdr); + dom->kernel_size = hdr->payload_length; + + if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\n", + __FUNCTION__); + return -EINVAL; + } + + return elf_loader.probe(dom); +} + +static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) +{ + return check_bzimage_kernel(dom, 0); +} + +static int xc_dom_parse_bzimage_kernel(struct xc_dom_image *dom) +{ + return elf_loader.parser(dom); +} + +static int xc_dom_load_bzimage_kernel(struct xc_dom_image *dom) +{ + return elf_loader.loader(dom); +} + +static struct xc_dom_loader bzimage_loader = { + .name = "Linux bzImage", + .probe = xc_dom_probe_bzimage_kernel, + .parser = xc_dom_parse_bzimage_kernel, + .loader = xc_dom_load_bzimage_kernel, +}; + +static void __init register_loader(void) +{ + xc_dom_register_loader(&bzimage_loader); +} + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ xen-3.0.2-config-allow-unix-server.patch: Index: xen-3.0.2-config-allow-unix-server.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.0.2-config-allow-unix-server.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-3.0.2-config-allow-unix-server.patch 11 Jul 2006 13:52:53 -0000 1.1 +++ xen-3.0.2-config-allow-unix-server.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -1,31 +1,20 @@ -*** xen-3.0.2/tools/examples/xend-config.sxp.orig 2006-06-07 12:53:18.000000000 +0200 ---- xen-3.0.2/tools/examples/xend-config.sxp 2006-07-11 15:43:47.000000000 +0200 -*************** -*** 15,27 **** - #(loglevel DEBUG) - - #(xend-http-server no) -! #(xend-unix-server no) - #(xend-tcp-xmlrpc-server no) - #(xend-unix-xmlrpc-server yes) - #(xend-relocation-server no) - (xend-relocation-server yes) - -! #(xend-unix-path /var/lib/xend/xend-socket) - - # Port xend should use for the HTTP interface, if xend-http-server is set. - #(xend-port 8000) ---- 15,27 ---- - #(loglevel DEBUG) - - #(xend-http-server no) -! (xend-unix-server yes) - #(xend-tcp-xmlrpc-server no) - #(xend-unix-xmlrpc-server yes) - #(xend-relocation-server no) - (xend-relocation-server yes) - -! (xend-unix-path /var/lib/xend/xend-socket) - - # Port xend should use for the HTTP interface, if xend-http-server is set. - #(xend-port 8000) +Index: xen-3.2.0/tools/examples/xend-config.sxp +=================================================================== +--- xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-07-23 15:14:29.000000000 +0100 ++++ xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-07-23 15:14:29.000000000 +0100 +@@ -56,13 +56,13 @@ + + + #(xend-http-server no) +-#(xend-unix-server no) ++(xend-unix-server yes) + #(xend-tcp-xmlrpc-server no) + #(xend-unix-xmlrpc-server yes) + #(xend-relocation-server no) + (xend-relocation-server yes) + +-#(xend-unix-path /var/lib/xend/xend-socket) ++(xend-unix-path /var/lib/xend/xend-socket) + + + # Address and port xend should use for the legacy TCP XMLRPC interface, xen-3.0.2-config-disable-reloc.patch: Index: xen-3.0.2-config-disable-reloc.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.0.2-config-disable-reloc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-3.0.2-config-disable-reloc.patch 17 Jul 2006 15:09:58 -0000 1.1 +++ xen-3.0.2-config-disable-reloc.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -1,21 +1,15 @@ -*** xen-3.0.2/tools/examples/xend-config.sxp.orig 2006-07-17 16:09:53.000000000 -0400 ---- xen-3.0.2/tools/examples/xend-config.sxp 2006-07-17 16:12:27.000000000 -0400 -*************** -*** 19,25 **** - #(xend-tcp-xmlrpc-server no) - #(xend-unix-xmlrpc-server yes) - #(xend-relocation-server no) -! (xend-relocation-server yes) - - (xend-unix-path /var/lib/xend/xend-socket) - ---- 19,27 ---- - #(xend-tcp-xmlrpc-server no) - #(xend-unix-xmlrpc-server yes) - #(xend-relocation-server no) -! # The relocation server should be kept desactivated unless using a trusted -! # network, the domain virtual memory will be exchanged in raw form without -! # encryption of the communication. See also xend-relocation-hosts-allow option - - (xend-unix-path /var/lib/xend/xend-socket) - +Index: xen-3.2.0/tools/examples/xend-config.sxp +=================================================================== +--- xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-07-23 15:14:29.000000000 +0100 ++++ xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-07-23 15:14:29.000000000 +0100 +@@ -60,7 +60,9 @@ + #(xend-tcp-xmlrpc-server no) + #(xend-unix-xmlrpc-server yes) + #(xend-relocation-server no) +-(xend-relocation-server yes) ++# The relocation server should be kept desactivated unless using a trusted ++# network, the domain virtual memory will be exchanged in raw form without ++# encryption of the communication. See also xend-relocation-hosts-allow option + + (xend-unix-path /var/lib/xend/xend-socket) + xen-3.2.0-block-rw-range-check.patch: Index: xen-3.2.0-block-rw-range-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.2.0-block-rw-range-check.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-3.2.0-block-rw-range-check.patch 28 Feb 2008 00:51:07 -0000 1.2 +++ xen-3.2.0-block-rw-range-check.patch 23 Jul 2008 14:34:05 -0000 1.3 @@ -1,6 +1,7 @@ -diff -rup xen-3.2.0.orig/tools/ioemu/block.c xen-3.2.0.new/tools/ioemu/block.c ---- xen-3.2.0.orig/tools/ioemu/block.c 2008-02-27 19:46:11.000000000 -0500 -+++ xen-3.2.0.new/tools/ioemu/block.c 2008-02-27 19:47:16.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/block.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/block.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/block.c 2008-01-16 18:34:59.000000000 +0000 @@ -120,6 +120,60 @@ void path_combine(char *dest, int dest_s } } @@ -154,9 +155,10 @@ if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) { memcpy(bs->boot_sector_data, buf, 512); } -diff -rup xen-3.2.0.orig/tools/ioemu/block_int.h xen-3.2.0.new/tools/ioemu/block_int.h ---- xen-3.2.0.orig/tools/ioemu/block_int.h 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0.new/tools/ioemu/block_int.h 2008-02-27 19:46:39.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/block_int.h +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/block_int.h 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/block_int.h 2008-01-16 18:34:59.000000000 +0000 @@ -87,6 +87,7 @@ struct BlockDriverState { int removable; /* if true, the media can be removed */ int locked; /* if true, the media cannot temporarily be ejected */ @@ -165,9 +167,10 @@ /* event callback when inserting/removing */ void (*change_cb)(void *opaque); void *change_opaque; -diff -rup xen-3.2.0.orig/tools/ioemu/block-qcow2.c xen-3.2.0.new/tools/ioemu/block-qcow2.c ---- xen-3.2.0.orig/tools/ioemu/block-qcow2.c 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0.new/tools/ioemu/block-qcow2.c 2008-02-27 19:46:39.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/block-qcow2.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/block-qcow2.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/block-qcow2.c 2008-01-16 18:34:59.000000000 +0000 @@ -191,7 +191,7 @@ static int qcow_open(BlockDriverState *b int len, i, shift, ret; QCowHeader header; @@ -177,9 +180,10 @@ if (ret < 0) return ret; if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) -diff -rup xen-3.2.0.orig/tools/ioemu/block-qcow.c xen-3.2.0.new/tools/ioemu/block-qcow.c ---- xen-3.2.0.orig/tools/ioemu/block-qcow.c 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0.new/tools/ioemu/block-qcow.c 2008-02-27 19:46:39.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/block-qcow.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/block-qcow.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/block-qcow.c 2008-01-16 18:34:59.000000000 +0000 @@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b int len, i, shift, ret; QCowHeader header; @@ -189,9 +193,10 @@ if (ret < 0) return ret; if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) -diff -rup xen-3.2.0.orig/tools/ioemu/block-vmdk.c xen-3.2.0.new/tools/ioemu/block-vmdk.c ---- xen-3.2.0.orig/tools/ioemu/block-vmdk.c 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0.new/tools/ioemu/block-vmdk.c 2008-02-27 19:46:39.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/block-vmdk.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/block-vmdk.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/block-vmdk.c 2008-01-16 18:34:59.000000000 +0000 @@ -352,7 +352,7 @@ static int vmdk_open(BlockDriverState *b uint32_t magic; int l1_size, i, ret; @@ -201,9 +206,10 @@ if (ret < 0) return ret; if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic)) -diff -rup xen-3.2.0.orig/tools/ioemu/vl.h xen-3.2.0.new/tools/ioemu/vl.h ---- xen-3.2.0.orig/tools/ioemu/vl.h 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0.new/tools/ioemu/vl.h 2008-02-27 19:46:39.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/vl.h +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/vl.h 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/vl.h 2008-01-16 18:34:59.000000000 +0000 @@ -611,6 +611,7 @@ typedef struct QEMUSnapshotInfo { use a disk image format on top of it (default for xen-3.2.0-qemu-evtchn-fd.patch: Index: xen-3.2.0-qemu-evtchn-fd.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.2.0-qemu-evtchn-fd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-3.2.0-qemu-evtchn-fd.patch 27 Feb 2008 20:33:17 -0000 1.1 +++ xen-3.2.0-qemu-evtchn-fd.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -3,9 +3,10 @@ date: Tue Feb 26 14:46:57 2008 +0000 summary: ioemu: Do not sue xce_handle directly as a file descriptor. -diff -r 76479f25cdac -r ca2cf5c1adcc tools/ioemu/hw/xen_console.c ---- a/tools/ioemu/hw/xen_console.c Tue Feb 26 14:46:07 2008 +0000 -+++ b/tools/ioemu/hw/xen_console.c Tue Feb 26 14:46:57 2008 +0000 +Index: xen-3.2.0/tools/ioemu/hw/xen_console.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/hw/xen_console.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/hw/xen_console.c 2008-01-16 18:34:59.000000000 +0000 @@ -381,7 +381,7 @@ static void xencons_startup(void *opaque qemu_set_fd_handler2(xs_fileno(dom->xsh), NULL, NULL, NULL, NULL); @@ -15,9 +16,10 @@ return; qemu_chr_add_handlers(dom->chr, xencons_can_receive, xencons_receive, -diff -r 76479f25cdac -r ca2cf5c1adcc tools/ioemu/hw/xenfb.c ---- a/tools/ioemu/hw/xenfb.c Tue Feb 26 14:46:07 2008 +0000 -+++ b/tools/ioemu/hw/xenfb.c Tue Feb 26 14:46:57 2008 +0000 +Index: xen-3.2.0/tools/ioemu/hw/xenfb.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/hw/xenfb.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/hw/xenfb.c 2008-01-16 18:34:59.000000000 +0000 @@ -1160,7 +1160,7 @@ static int xenfb_register_console(struct xenfb); dpy_resize(xenfb->ds, xenfb->width, xenfb->height); @@ -27,4 +29,3 @@ return -1; if (qemu_set_fd_handler2(xs_fileno(xenfb->xsh), NULL, xenfb_dispatch_store, NULL, xenfb) < 0) return -1; - xen-compile-fixes.patch: Index: xen-compile-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-compile-fixes.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xen-compile-fixes.patch 18 Jan 2007 17:22:03 -0000 1.9 +++ xen-compile-fixes.patch 23 Jul 2008 14:34:05 -0000 1.10 @@ -1,31 +1,34 @@ -diff -ruN xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile ---- xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile 2007-01-08 10:00:46.000000000 -0500 -+++ xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile 2007-01-18 11:26:37.000000000 -0500 -@@ -8,7 +8,7 @@ - INST_DIR = /usr/sbin +Index: xen-3.2.0/tools/blktap/drivers/Makefile +=================================================================== +--- xen-3.2.0.orig/tools/blktap/drivers/Makefile 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/blktap/drivers/Makefile 2008-01-16 18:34:59.000000000 +0000 +@@ -8,7 +8,7 @@ QCOW_UTIL = img2qcow qcow2raw qcow-cr + INST_DIR = /usr/sbin LIBAIO_DIR = ../../libaio/src -CFLAGS += -Werror +#CFLAGS += -Werror CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR) -diff -ruN xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile xen-3.0.4_1-src.new/tools/blktap/lib/Makefile ---- xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile 2007-01-08 10:00:47.000000000 -0500 -+++ xen-3.0.4_1-src.new/tools/blktap/lib/Makefile 2007-01-18 11:26:45.000000000 -0500 -@@ -14,7 +14,7 @@ + CFLAGS += $(INCLUDES) -I. -I../../xenstore +Index: xen-3.2.0/tools/blktap/lib/Makefile +=================================================================== +--- xen-3.2.0.orig/tools/blktap/lib/Makefile 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/blktap/lib/Makefile 2008-01-16 18:34:59.000000000 +0000 +@@ -14,7 +14,7 @@ LIBS := -lz SRCS := SRCS += xenbus.c blkif.c xs_api.c -CFLAGS += -Werror +#CFLAGS += -Werror CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing -fPIC + CFLAGS += -fPIC # get asprintf(): -diff -ruN xen-3.0.4_1-src.orig/tools/console/Makefile xen-3.0.4_1-src.new/tools/console/Makefile ---- xen-3.0.4_1-src.orig/tools/console/Makefile 2007-01-08 10:00:47.000000000 -0500 -+++ xen-3.0.4_1-src.new/tools/console/Makefile 2007-01-18 11:26:00.000000000 -0500 -@@ -5,7 +5,7 @@ +Index: xen-3.2.0/tools/console/Makefile +=================================================================== +--- xen-3.2.0.orig/tools/console/Makefile 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/console/Makefile 2008-01-16 18:34:59.000000000 +0000 +@@ -5,7 +5,7 @@ include $(XEN_ROOT)/tools/Rules.mk DAEMON_INSTALL_DIR = /usr/sbin CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin @@ -34,10 +37,11 @@ CFLAGS += -I $(XEN_LIBXC) CFLAGS += -I $(XEN_XENSTORE) -diff -ruN xen-3.0.4_1-src.orig/tools/xenstore/Makefile xen-3.0.4_1-src.new/tools/xenstore/Makefile ---- xen-3.0.4_1-src.orig/tools/xenstore/Makefile 2007-01-08 10:00:52.000000000 -0500 -+++ xen-3.0.4_1-src.new/tools/xenstore/Makefile 2007-01-18 11:25:48.000000000 -0500 -@@ -6,7 +6,7 @@ +Index: xen-3.2.0/tools/xenstore/Makefile +=================================================================== +--- xen-3.2.0.orig/tools/xenstore/Makefile 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/xenstore/Makefile 2008-01-16 18:34:59.000000000 +0000 +@@ -6,7 +6,7 @@ MAJOR = 3.0 MINOR = 0 PROFILE=#-pg xen-config-dom0-minmem.patch: Index: xen-config-dom0-minmem.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-config-dom0-minmem.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-config-dom0-minmem.patch 26 Apr 2006 03:37:05 -0000 1.1 +++ xen-config-dom0-minmem.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -1,6 +1,8 @@ ---- xen-3.0.0/tools/examples/xend-config.sxp.min 2005-12-06 15:05:29.000000000 +0100 -+++ xen-3.0.0/tools/examples/xend-config.sxp 2005-12-06 20:33:21.000000000 +0100 -@@ -105,7 +105,7 @@ +Index: xen-3.2.0/tools/examples/xend-config.sxp +=================================================================== +--- xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-07-23 15:14:26.000000000 +0100 ++++ xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-07-23 15:14:26.000000000 +0100 +@@ -181,7 +181,7 @@ # Dom0 will balloon out when needed to free memory for domU. # dom0-min-mem is the lowest memory level (in MB) dom0 will get down to. # If dom0-min-mem=0, dom0 will never balloon out. xen-dumpdir.patch: Index: xen-dumpdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-dumpdir.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-dumpdir.patch 1 May 2007 02:27:22 -0000 1.2 +++ xen-dumpdir.patch 23 Jul 2008 14:34:05 -0000 1.3 @@ -1,6 +1,7 @@ -diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README ---- xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README 2007-04-11 19:10:30.000000000 -0400 -+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README 2007-04-13 10:37:35.000000000 -0400 +Index: xen-3.2.0/tools/debugger/gdb/README +=================================================================== +--- xen-3.2.0.orig/tools/debugger/gdb/README 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/debugger/gdb/README 2008-01-16 18:34:59.000000000 +0000 @@ -33,6 +33,6 @@ To debug a crashed domU guest: 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before starting xend. @@ -9,9 +10,10 @@ + '/var/lib/xen/dump/..core'. 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. 4. Connect to the server as for a running guest. -diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile ---- xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile 2007-04-11 19:10:30.000000000 -0400 -+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile 2007-04-13 10:37:59.000000000 -0400 +Index: xen-3.2.0/tools/Makefile +=================================================================== +--- xen-3.2.0.orig/tools/Makefile 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/Makefile 2008-01-16 18:34:59.000000000 +0000 @@ -41,7 +41,7 @@ install: check $(MAKE) -C $$subdir $@; \ done @@ -19,12 +21,13 @@ - $(INSTALL_DIR) $(DESTDIR)/var/xen/dump + $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump $(INSTALL_DIR) $(DESTDIR)/var/log/xen + $(INSTALL_DIR) $(DESTDIR)/var/lib/xen - .PHONY: clean -diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py ---- xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py 2007-04-11 19:10:36.000000000 -0400 -+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py 2007-04-13 10:37:35.000000000 -0400 -@@ -1269,7 +1269,7 @@ class XendDomainInfo: +Index: xen-3.2.0/tools/python/xen/xend/XendDomainInfo.py +=================================================================== +--- xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py 2008-07-23 15:14:26.000000000 +0100 ++++ xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py 2008-07-23 15:14:26.000000000 +0100 +@@ -1455,7 +1455,7 @@ class XendDomainInfo: try: if not corefile: this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) xen-hvm-kernel-boot-nonrelocatable.patch: Index: xen-hvm-kernel-boot-nonrelocatable.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-hvm-kernel-boot-nonrelocatable.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-hvm-kernel-boot-nonrelocatable.patch 10 Jan 2008 21:37:26 -0000 1.2 +++ xen-hvm-kernel-boot-nonrelocatable.patch 23 Jul 2008 14:34:05 -0000 1.3 @@ -1,5 +1,7 @@ ---- xen-unstable-16606.orig/tools/ioemu/hw/pc.c 2007-12-18 14:15:17.000000000 -0500 -+++ xen-unstable-16606/tools/ioemu/hw/pc.c 2007-12-18 23:53:56.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/hw/pc.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/hw/pc.c 2008-07-23 15:14:25.000000000 +0100 ++++ xen-3.2.0.orig/tools/ioemu/hw/pc.c 2008-07-23 15:14:25.000000000 +0100 @@ -417,6 +417,90 @@ static void generate_bootsect(uint32_t g bdrv_set_boot_sector(bs_table[0], bootsect, sizeof(bootsect)); } xen-hvm-kernel-boot-relocatable.patch: Index: xen-hvm-kernel-boot-relocatable.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-hvm-kernel-boot-relocatable.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-hvm-kernel-boot-relocatable.patch 10 Jan 2008 21:37:26 -0000 1.2 +++ xen-hvm-kernel-boot-relocatable.patch 23 Jul 2008 14:34:05 -0000 1.3 @@ -1,6 +1,7 @@ -diff -rup xen-unstable-16606.orig/tools/ioemu/hw/pc.c xen-unstable-16606.new/tools/ioemu/hw/pc.c ---- xen-unstable-16606.orig/tools/ioemu/hw/pc.c 2007-12-17 17:52:29.000000000 -0500 -+++ xen-unstable-16606.new/tools/ioemu/hw/pc.c 2007-12-17 17:53:51.000000000 -0500 +Index: xen-3.2.0/tools/ioemu/hw/pc.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/hw/pc.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/hw/pc.c 2008-01-16 18:34:59.000000000 +0000 @@ -31,10 +31,8 @@ #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin" #define LINUX_BOOT_FILENAME "linux_boot.bin" xen-hvm-kernel-boot-xend.patch: Index: xen-hvm-kernel-boot-xend.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-hvm-kernel-boot-xend.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-hvm-kernel-boot-xend.patch 10 Jan 2008 21:37:26 -0000 1.2 +++ xen-hvm-kernel-boot-xend.patch 23 Jul 2008 14:34:05 -0000 1.3 @@ -1,6 +1,7 @@ -diff -rup xen-unstable-16606.orig/tools/python/xen/xend/image.py xen-unstable-16606.new/tools/python/xen/xend/image.py ---- xen-unstable-16606.orig/tools/python/xen/xend/image.py 2007-12-17 17:52:29.000000000 -0500 -+++ xen-unstable-16606.new/tools/python/xen/xend/image.py 2007-12-17 18:17:31.000000000 -0500 +Index: xen-3.2.0/tools/python/xen/xend/image.py +=================================================================== +--- xen-3.2.0.orig/tools/python/xen/xend/image.py 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/python/xen/xend/image.py 2008-01-16 18:34:59.000000000 +0000 @@ -127,7 +127,7 @@ class ImageHandler: """ # Set params and call buildDomain(). @@ -67,9 +68,10 @@ memsize = mem_mb, vcpus = self.vm.getVCpuCount(), acpi = self.acpi, -diff -rup xen-unstable-16606.orig/tools/python/xen/xend/XendConfig.py xen-unstable-16606.new/tools/python/xen/xend/XendConfig.py ---- xen-unstable-16606.orig/tools/python/xen/xend/XendConfig.py 2007-12-17 17:52:29.000000000 -0500 -+++ xen-unstable-16606.new/tools/python/xen/xend/XendConfig.py 2007-12-17 18:26:30.000000000 -0500 +Index: xen-3.2.0/tools/python/xen/xend/XendConfig.py +=================================================================== +--- xen-3.2.0.orig/tools/python/xen/xend/XendConfig.py 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/python/xen/xend/XendConfig.py 2008-01-16 18:34:59.000000000 +0000 @@ -124,7 +124,7 @@ XENAPI_CFG_TO_LEGACY_CFG = { LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG) @@ -97,9 +99,10 @@ # Compatibility hack, can go away soon. if 'soundhw' not in self['platform'] and \ self['platform'].get('enable_audio'): -diff -rup xen-unstable-16606.orig/tools/python/xen/xm/create.py xen-unstable-16606.new/tools/python/xen/xm/create.py ---- xen-unstable-16606.orig/tools/python/xen/xm/create.py 2007-12-17 17:52:29.000000000 -0500 -+++ xen-unstable-16606.new/tools/python/xen/xm/create.py 2007-12-17 18:28:06.000000000 -0500 +Index: xen-3.2.0/tools/python/xen/xm/create.py +=================================================================== +--- xen-3.2.0.orig/tools/python/xen/xm/create.py 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/python/xen/xm/create.py 2008-01-16 18:34:59.000000000 +0000 @@ -158,6 +158,10 @@ gopts.var('ramdisk', val='FILE', fn=set_value, default='', use="Path to ramdisk.") xen-ia64-hypercall-args.patch: Index: xen-ia64-hypercall-args.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-ia64-hypercall-args.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-ia64-hypercall-args.patch 9 Jul 2008 10:57:22 -0000 1.1 +++ xen-ia64-hypercall-args.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -11,10 +11,11 @@ Signed-off-by: Alex Williamson -diff -r 7d300a1ea762 -r 716a637722e4 tools/libxc/ia64/xc_ia64_stubs.c ---- a/tools/libxc/ia64/xc_ia64_stubs.c Mon Mar 10 11:52:25 2008 -0600 -+++ b/tools/libxc/ia64/xc_ia64_stubs.c Mon Mar 10 11:55:40 2008 -0600 -@@ -92,7 +92,6 @@ +Index: xen-3.2.0/tools/libxc/ia64/xc_ia64_stubs.c +=================================================================== +--- xen-3.2.0.orig/tools/libxc/ia64/xc_ia64_stubs.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/libxc/ia64/xc_ia64_stubs.c 2008-01-16 18:34:59.000000000 +0000 +@@ -92,7 +92,6 @@ xc_ia64_map_foreign_p2m(int xc_handle, u hypercall.arg[2] = dom; hypercall.arg[3] = (unsigned long)memmap_info; hypercall.arg[4] = flags; @@ -22,4 +23,3 @@ if (lock_pages(memmap_info, sizeof(*memmap_info) + memmap_info->efi_memmap_size) != 0) { - xen-net-disable-bridge-by-default.patch: Index: xen-net-disable-bridge-by-default.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-disable-bridge-by-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-net-disable-bridge-by-default.patch 18 Feb 2008 23:09:04 -0000 1.1 +++ xen-net-disable-bridge-by-default.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -1,10 +1,11 @@ Disable network-bridge script by default to avoid NetworkManager conflict -diff -up xen-3.2.0/tools/examples/xend-config.sxp.disable-bridge-by-default xen-3.2.0/tools/examples/xend-config.sxp ---- xen-3.2.0/tools/examples/xend-config.sxp.disable-bridge-by-default 2008-02-18 22:35:26.000000000 +0000 -+++ xen-3.2.0/tools/examples/xend-config.sxp 2008-02-18 22:53:37.000000000 +0000 -@@ -140,7 +140,15 @@ +Index: xen-3.2.0/tools/examples/xend-config.sxp +=================================================================== +--- xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/examples/xend-config.sxp 2008-01-16 18:34:59.000000000 +0000 +@@ -138,7 +138,15 @@ # two fake interfaces per guest domain. To do things like this, write # yourself a wrapper script, and call network-bridge from it, as appropriate. # @@ -21,7 +22,7 @@ # The script used to control virtual interfaces. This can be overridden on a # per-vif basis when creating a domain or a configuring a new vif. The -@@ -160,12 +168,14 @@ +@@ -158,12 +166,14 @@ ## Use the following if network traffic is routed, as an alternative to the # settings for bridged networking given above. xen-net-disable-iptables-on-bridge.patch: Index: xen-net-disable-iptables-on-bridge.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-disable-iptables-on-bridge.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-net-disable-iptables-on-bridge.patch 18 Feb 2008 23:09:04 -0000 1.1 +++ xen-net-disable-iptables-on-bridge.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -1,9 +1,10 @@ We don't want the system's iptables filter/FORWARD rules to apply to traffic on our bridge. -diff -up xen-3.2.0/tools/examples/xen-network-common.sh.disable-iptables-on-bridge xen-3.2.0/tools/examples/xen-network-common.sh ---- xen-3.2.0/tools/examples/xen-network-common.sh.disable-iptables-on-bridge 2008-01-16 18:34:59.000000000 +0000 -+++ xen-3.2.0/tools/examples/xen-network-common.sh 2008-02-18 22:54:18.000000000 +0000 +Index: xen-3.2.0/tools/examples/xen-network-common.sh +=================================================================== +--- xen-3.2.0.orig/tools/examples/xen-network-common.sh 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/examples/xen-network-common.sh 2008-01-16 18:34:59.000000000 +0000 @@ -109,6 +109,13 @@ create_bridge () { brctl addbr ${bridge} brctl stp ${bridge} off @@ -18,9 +19,10 @@ fi } -diff -up xen-3.2.0/tools/examples/vif-bridge.disable-iptables-on-bridge xen-3.2.0/tools/examples/vif-bridge ---- xen-3.2.0/tools/examples/vif-bridge.disable-iptables-on-bridge 2008-01-16 18:34:59.000000000 +0000 -+++ xen-3.2.0/tools/examples/vif-bridge 2008-02-18 22:54:18.000000000 +0000 +Index: xen-3.2.0/tools/examples/vif-bridge +=================================================================== +--- xen-3.2.0.orig/tools/examples/vif-bridge 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/examples/vif-bridge 2008-01-16 18:34:59.000000000 +0000 @@ -91,8 +91,6 @@ case "$command" in ;; esac xen-pvfb-validate-fb.patch: Index: xen-pvfb-validate-fb.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-validate-fb.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-pvfb-validate-fb.patch 13 Jun 2008 14:26:37 -0000 1.2 +++ xen-pvfb-validate-fb.patch 23 Jul 2008 14:34:05 -0000 1.3 @@ -6,9 +6,10 @@ # Parent 65eec0554f39049eab354abe1ee4c305f6d1e0aa ioemu: Fix PVFB backend to validate frontend's frame buffer description -diff -rup a/tools/ioemu/hw/xenfb.c b/tools/ioemu/hw/xenfb.c ---- a/tools/ioemu/hw/xenfb.c 2008-04-22 18:51:35.000000000 +0200 -+++ b/tools/ioemu/hw/xenfb.c 2008-04-22 18:52:07.000000000 +0200 +Index: xen-3.2.0/tools/ioemu/hw/xenfb.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/hw/xenfb.c 2008-07-23 15:14:27.000000000 +0100 ++++ xen-3.2.0.orig/tools/ioemu/hw/xenfb.c 2008-07-23 15:14:27.000000000 +0100 @@ -23,8 +23,6 @@ #define BTN_LEFT 0x110 /* from */ #endif @@ -75,7 +76,7 @@ static void xenfb_on_fb_event(struct xenfb *xenfb) { -@@ -506,7 +553,6 @@ static void xenfb_on_fb_event(struct xen +@@ -506,7 +554,6 @@ static void xenfb_on_fb_event(struct xen || h != event->update.height) { fprintf(stderr, "%s bogus update clipped\n", xenfb->fb.nodename); @@ -83,7 +84,7 @@ } xenfb_guest_copy(xenfb, x, y, w, h); break; -@@ -686,16 +732,15 @@ static int xenfb_read_frontend_fb_config +@@ -686,16 +733,15 @@ static int xenfb_read_frontend_fb_config xenfb->protocol[0] = '\0'; xenfb_xs_printf(xenfb->xsh, xenfb->fb.nodename, "request-update", "1"); xen-qemu-bootmenu.patch: Index: xen-qemu-bootmenu.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-bootmenu.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-qemu-bootmenu.patch 10 Oct 2007 23:49:14 -0000 1.1 +++ xen-qemu-bootmenu.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -1,7 +1,8 @@ -diff -rup xen-3.1.0-src.orig/tools/firmware/rombios/rombios.c xen-3.1.0-src.new/tools/firmware/rombios/rombios.c ---- xen-3.1.0-src.orig/tools/firmware/rombios/rombios.c 2007-05-18 10:45:21.000000000 -0400 -+++ xen-3.1.0-src.new/tools/firmware/rombios/rombios.c 2007-10-10 19:34:24.000000000 -0400 -@@ -2026,6 +2026,228 @@ print_cdromboot_failure( code ) +Index: xen-3.2.0/tools/firmware/rombios/rombios.c +=================================================================== +--- xen-3.2.0.orig/tools/firmware/rombios/rombios.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/firmware/rombios/rombios.c 2008-01-16 18:34:59.000000000 +0000 +@@ -2031,6 +2031,228 @@ print_cdromboot_failure( code ) return; } @@ -230,7 +231,7 @@ void nmi_handler_msg() { -@@ -9782,7 +10004,9 @@ post_default_ints: +@@ -9825,7 +10047,9 @@ post_default_ints: call _cdemu_init ;; #endif // BX_ELTORITO_BOOT xen-qemu-image-format.patch: Index: xen-qemu-image-format.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-image-format.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-qemu-image-format.patch 27 Jun 2008 15:17:57 -0000 1.1 +++ xen-qemu-image-format.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -46,9 +46,10 @@ changeset: 17282:0868396712b5 summary: ioemu: prefix phy devices with /dev/ -diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/block.c xen-3.2.0-new/tools/ioemu/block.c ---- xen-3.2.0/tools/ioemu/block.c 2008-06-26 13:36:21.000000000 -0400 -+++ xen-3.2.0-new/tools/ioemu/block.c 2008-06-26 14:49:21.000000000 -0400 +Index: xen-3.2.0/tools/ioemu/block.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/block.c 2008-07-23 15:14:27.000000000 +0100 ++++ xen-3.2.0.orig/tools/ioemu/block.c 2008-07-23 15:14:27.000000000 +0100 @@ -269,8 +269,28 @@ static int is_windows_drive(const char * } #endif @@ -125,9 +126,10 @@ goto fail; } -diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/hw/usb-msd.c xen-3.2.0-new/tools/ioemu/hw/usb-msd.c ---- xen-3.2.0/tools/ioemu/hw/usb-msd.c 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0-new/tools/ioemu/hw/usb-msd.c 2008-06-26 15:30:53.000000000 -0400 +Index: xen-3.2.0/tools/ioemu/hw/usb-msd.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/hw/usb-msd.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/hw/usb-msd.c 2008-01-16 18:34:59.000000000 +0000 @@ -510,7 +510,7 @@ static void usb_msd_handle_destroy(USBDe qemu_free(s); } @@ -146,9 +148,10 @@ goto fail; s->bs = bdrv; -diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/hw/usb.h xen-3.2.0-new/tools/ioemu/hw/usb.h ---- xen-3.2.0/tools/ioemu/hw/usb.h 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0-new/tools/ioemu/hw/usb.h 2008-06-26 14:42:45.000000000 -0400 +Index: xen-3.2.0/tools/ioemu/hw/usb.h +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/hw/usb.h 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/hw/usb.h 2008-01-16 18:34:59.000000000 +0000 @@ -217,7 +217,7 @@ USBDevice *usb_mouse_init(void); USBDevice *usb_tablet_init(void); @@ -158,9 +161,10 @@ /* usb.c */ void generic_usb_save(QEMUFile* f, void *opaque); -diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/monitor.c xen-3.2.0-new/tools/ioemu/monitor.c ---- xen-3.2.0/tools/ioemu/monitor.c 2008-06-26 13:36:21.000000000 -0400 -+++ xen-3.2.0-new/tools/ioemu/monitor.c 2008-06-26 14:41:11.000000000 -0400 +Index: xen-3.2.0/tools/ioemu/monitor.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/monitor.c 2008-07-23 15:14:27.000000000 +0100 ++++ xen-3.2.0.orig/tools/ioemu/monitor.c 2008-07-23 15:14:27.000000000 +0100 @@ -387,7 +387,7 @@ static void do_change_block(const char * } if (eject_device(bs, 0) < 0) @@ -170,9 +174,10 @@ if (bdrv_is_encrypted(bs)) { term_printf("%s is encrypted.\n", device); for(i = 0; i < 3; i++) { -diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/vl.c xen-3.2.0-new/tools/ioemu/vl.c ---- xen-3.2.0/tools/ioemu/vl.c 2008-06-26 13:36:21.000000000 -0400 -+++ xen-3.2.0-new/tools/ioemu/vl.c 2008-06-26 14:42:43.000000000 -0400 +Index: xen-3.2.0/tools/ioemu/vl.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/vl.c 2008-07-23 15:14:27.000000000 +0100 ++++ xen-3.2.0.orig/tools/ioemu/vl.c 2008-07-23 15:14:27.000000000 +0100 @@ -4211,7 +4211,9 @@ static int usb_device_add(const char *de } else if (!strcmp(devname, "tablet")) { dev = usb_tablet_init(); @@ -196,9 +201,10 @@ fprintf(stderr, "qemu: could not open floppy disk image '%s'\n", fd_filename[i]); exit(1); -diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/xenstore.c xen-3.2.0-new/tools/ioemu/xenstore.c ---- xen-3.2.0/tools/ioemu/xenstore.c 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0-new/tools/ioemu/xenstore.c 2008-06-26 15:35:48.000000000 -0400 +Index: xen-3.2.0/tools/ioemu/xenstore.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/xenstore.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/xenstore.c 2008-01-16 18:34:59.000000000 +0000 @@ -85,6 +85,7 @@ void xenstore_parse_domain_config(int do *dev = NULL, *params = NULL, *type = NULL, *drv = NULL; int i, is_scsi, is_hdN = 0; xen-qemu-logfile.patch: Index: xen-qemu-logfile.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-logfile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-qemu-logfile.patch 27 Feb 2008 20:33:17 -0000 1.1 +++ xen-qemu-logfile.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -1,6 +1,7 @@ -diff -r 2a8eaba24bf0 tools/ioemu/keymaps.c ---- a/tools/ioemu/keymaps.c Tue Feb 26 15:11:51 2008 +0000 -+++ b/tools/ioemu/keymaps.c Wed Feb 27 15:26:53 2008 -0500 +Index: xen-3.2.0/tools/ioemu/keymaps.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/keymaps.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/keymaps.c 2008-01-16 18:34:59.000000000 +0000 @@ -126,11 +126,11 @@ static kbd_layout_t *parse_keyboard_layo if (rest && strstr(rest, "numlock")) { add_to_key_range(&k->keypad_range, keycode); @@ -15,10 +16,11 @@ } /* if(keycode&0x80) -diff -r 2a8eaba24bf0 tools/ioemu/monitor.c ---- a/tools/ioemu/monitor.c Tue Feb 26 15:11:51 2008 +0000 -+++ b/tools/ioemu/monitor.c Wed Feb 27 15:26:53 2008 -0500 -@@ -2520,7 +2520,7 @@ static void monitor_handle_command1(void +Index: xen-3.2.0/tools/ioemu/monitor.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/monitor.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/monitor.c 2008-01-16 18:34:59.000000000 +0000 +@@ -2514,7 +2514,7 @@ static void monitor_handle_command1(void static void monitor_start_input(void) { @@ -27,10 +29,11 @@ } static void term_event(void *opaque, int event) -diff -r 2a8eaba24bf0 tools/ioemu/vl.c ---- a/tools/ioemu/vl.c Tue Feb 26 15:11:51 2008 +0000 -+++ b/tools/ioemu/vl.c Wed Feb 27 15:26:53 2008 -0500 -@@ -7611,9 +7611,7 @@ int main(int argc, char **argv) +Index: xen-3.2.0/tools/ioemu/vl.c +=================================================================== +--- xen-3.2.0.orig/tools/ioemu/vl.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/ioemu/vl.c 2008-01-16 18:34:59.000000000 +0000 +@@ -7538,9 +7538,7 @@ int main(int argc, char **argv) } } @@ -39,13 +42,14 @@ - cpu_set_log_filename(qemu_dm_logfilename); + cpu_set_log(0); - #ifndef NO_DAEMONIZE + #ifndef _WIN32 if (daemonize && !nographic && vnc_display == NULL && vncunused == 0) { -diff -r 2a8eaba24bf0 tools/python/xen/xend/image.py ---- a/tools/python/xen/xend/image.py Tue Feb 26 15:11:51 2008 +0000 -+++ b/tools/python/xen/xend/image.py Wed Feb 27 15:26:53 2008 -0500 -@@ -296,7 +296,34 @@ class ImageHandler: - { 'dom': self.vm.getDomid(), 'read': True, 'write': True }) +Index: xen-3.2.0/tools/python/xen/xend/image.py +=================================================================== +--- xen-3.2.0.orig/tools/python/xen/xend/image.py 2008-07-23 15:14:25.000000000 +0100 ++++ xen-3.2.0.orig/tools/python/xen/xend/image.py 2008-07-23 15:14:25.000000000 +0100 +@@ -286,7 +286,34 @@ class ImageHandler: + args = args + ([ "-vncviewer" ]) log.info("spawning device models: %s %s", self.device_model, args) # keep track of pid and spawned options to kill it later - self.pid = os.spawnve(os.P_NOWAIT, self.device_model, args, env) xen-timer-mode.patch: Index: xen-timer-mode.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-timer-mode.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-timer-mode.patch 3 Feb 2008 18:19:57 -0000 1.1 +++ xen-timer-mode.patch 23 Jul 2008 14:34:05 -0000 1.2 @@ -7,9 +7,10 @@ Signed-off-by: Keir Fraser -diff -r 1e6455d608bd -r 3f26758bcc02 tools/python/xen/xend/XendDomainInfo.py ---- a/tools/python/xen/xend/XendDomainInfo.py Fri Jan 18 16:20:47 2008 +0000 -+++ b/tools/python/xen/xend/XendDomainInfo.py Fri Jan 18 22:27:51 2008 +0000 +Index: xen-3.2.0/tools/python/xen/xend/XendDomainInfo.py +=================================================================== +--- xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py 2008-01-16 18:34:59.000000000 +0000 @@ -1650,9 +1650,10 @@ class XendDomainInfo: self._recreateDom() @@ -23,4 +24,3 @@ # Set maximum number of vcpus in domain xc.domain_max_vcpus(self.domid, int(self.info['VCPUs_max'])) - xen-xenstore-cli.patch: Index: xen-xenstore-cli.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-xenstore-cli.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-xenstore-cli.patch 6 Feb 2008 18:23:16 -0000 1.2 +++ xen-xenstore-cli.patch 23 Jul 2008 14:34:05 -0000 1.3 @@ -1,6 +1,7 @@ -diff -rup xen-3.2.0.orig/tools/xenstore/xenstore_client.c xen-3.2.0.new/tools/xenstore/xenstore_client.c ---- xen-3.2.0.orig/tools/xenstore/xenstore_client.c 2008-02-06 13:18:04.000000000 -0500 -+++ xen-3.2.0.new/tools/xenstore/xenstore_client.c 2008-02-06 13:17:43.000000000 -0500 +Index: xen-3.2.0/tools/xenstore/xenstore_client.c +=================================================================== +--- xen-3.2.0.orig/tools/xenstore/xenstore_client.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/xenstore/xenstore_client.c 2008-01-16 18:34:59.000000000 +0000 @@ -357,7 +357,9 @@ main(int argc, char **argv) xsh = socket ? xs_daemon_open() : xs_domain_open(); @@ -12,9 +13,10 @@ again: if (transaction) { -diff -rup xen-3.2.0.orig/tools/xenstore/xsls.c xen-3.2.0.new/tools/xenstore/xsls.c ---- xen-3.2.0.orig/tools/xenstore/xsls.c 2008-01-16 13:34:59.000000000 -0500 -+++ xen-3.2.0.new/tools/xenstore/xsls.c 2008-02-06 13:19:09.000000000 -0500 +Index: xen-3.2.0/tools/xenstore/xsls.c +=================================================================== +--- xen-3.2.0.orig/tools/xenstore/xsls.c 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0.orig/tools/xenstore/xsls.c 2008-01-16 18:34:59.000000000 +0000 @@ -163,7 +163,9 @@ int main(int argc, char *argv[]) xsh = socket ? xs_daemon_open() : xs_domain_open(); Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- xen.spec 9 Jul 2008 10:57:22 -0000 1.220 +++ xen.spec 23 Jul 2008 14:34:05 -0000 1.221 @@ -2,13 +2,12 @@ # Always set these 3 tags %define base_version 3.2.0 -%define base_release 16 +%define base_release 17 # Hypervisor ABI %define hv_abi 3.2 # Whether to build -hypervisor pacakges -# XXX keep this off until we finally kill off the kernel-xen PRM -%define hv_build 0 +%define hv_build 1 # For testing upstream dev trees run either # hg archive -t tgz ../xen-unstable-[changeset].tgz @@ -80,6 +79,8 @@ Patch37: xen-pvfb-validate-fb.patch Patch38: xen-qemu-image-format.patch +Patch40: xen-3.2.0-bzimage.patch + # Patches to modify the default config of xend Patch100: xen-config-dom0-minmem.patch Patch102: xen-3.0.2-config-allow-unix-server.patch @@ -185,6 +186,8 @@ %patch37 -p1 %patch38 -p1 +%patch40 -p1 + # config patches %patch100 -p1 %patch102 -p1 @@ -466,6 +469,11 @@ %{_libdir}/*.a %changelog +* Wed Jul 23 2008 Mark McLoughlin - 3.2.0-17.fc10 +- Enable xen-hypervisor build +- Backport support for booting DomU from bzImage +- Re-diff all patches for zero fuzz + * Wed Jul 9 2008 Daniel P. Berrange - 3.2.0-16.fc10 - Remove bogus ia64 hypercall arg (rhbz #433921) From fedora-extras-commits at redhat.com Wed Jul 23 14:35:23 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 14:35:23 GMT Subject: rpms/akonadi/F-8 akonadi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231435.m6NEZNRd003424@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/akonadi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3254/F-8 Modified Files: .cvsignore sources Added Files: akonadi.spec Log Message: Copy akonadi from devel. --- NEW FILE akonadi.spec --- Summary: PIM Storage Service Name: akonadi Version: 1.0.0 Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://download.akonadi-project.org/ Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: cmake BuildRequires: qt4-devel >= 4.4 BuildRequires: automoc BuildRequires: mysql-devel # for xsltproc BuildRequires: libxslt BuildRequires: shared-mime-info %description %{summary}. %package devel Summary: Developer files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: qt4-devel Requires: pkgconfig %description devel %{summary}. %prep %setup -q %build %cmake . -DCONFIG_INSTALL_DIR=%{_sysconfdir} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig update-mime-database %{_datadir}/mime &> /dev/null || : %postun /sbin/ldconfig update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) %doc AUTHORS lgpl-license %dir %{_sysconfdir}/akonadi/ %config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf %{_bindir}/akonadi_control %{_bindir}/akonadictl %{_bindir}/akonadiserver %{_libdir}/libakonadi*.so.* %{_datadir}/dbus-1/interfaces/ %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_datadir}/mime/packages/akonadi-mime.xml %files devel %defattr(-,root,root,-) %{_includedir}/akonadi/ %{_libdir}/pkgconfig/akonadi.pc %{_libdir}/libakonadi*.so %changelog * Wed Jul 23 2008 Than Ngo - 1.0.0-1 - 1.0.0 * Wed Jun 18 2008 Rex Dieter 0.82.0-1 - akonadi-0.82.0 * Tue Jun 3 2008 Kevin Kofler 0.81.0-0.2.20080526svn812787 - BR automoc, drop automoc hack * Mon May 26 2008 Kevin Kofler 0.81.0-0.1.20080526svn812787 - update to revision 812787 from KDE SVN (to match KDE 4.1 Beta 1) - restore builtin automoc4 for now - update file list, require pkgconfig in -devel (.pc file now included) * Mon May 5 2008 Kevin Kofler 0.80.0-2 - -devel: remove bogus Requires: pkgconfig * Sat May 3 2008 Kevin Kofler 0.80.0-1 - first Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 May 2008 15:50:12 -0000 1.1 +++ .cvsignore 23 Jul 2008 14:34:37 -0000 1.2 @@ -0,0 +1,2 @@ +akonadi-0.82.0.tar.bz2 +akonadi-1.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2008 15:50:12 -0000 1.1 +++ sources 23 Jul 2008 14:34:37 -0000 1.2 @@ -0,0 +1 @@ +90039928f818a55a7e2a1bf852a32f2d akonadi-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:39:16 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 14:39:16 GMT Subject: rpms/kde-l10n/devel .cvsignore, 1.10, 1.11 kde-l10n.spec, 1.37, 1.38 sources, 1.10, 1.11 subdirs-kde-l10n, 1.8, 1.9 Message-ID: <200807231439.m6NEdGbW003628@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3587 Modified Files: .cvsignore kde-l10n.spec sources subdirs-kde-l10n Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 22 Jul 2008 16:42:01 -0000 1.10 +++ .cvsignore 23 Jul 2008 14:38:33 -0000 1.11 @@ -314,3 +314,45 @@ kde-l10n-wa-4.0.98.tar.bz2 kde-l10n-zh_CN-4.0.98.tar.bz2 kde-l10n-zh_TW-4.0.98.tar.bz2 +kde-l10n-bg-4.1.0.tar.bz2 +kde-l10n-ca-4.1.0.tar.bz2 +kde-l10n-cs-4.1.0.tar.bz2 +kde-l10n-csb-4.1.0.tar.bz2 +kde-l10n-da-4.1.0.tar.bz2 +kde-l10n-de-4.1.0.tar.bz2 +kde-l10n-el-4.1.0.tar.bz2 +kde-l10n-en_GB-4.1.0.tar.bz2 +kde-l10n-eo-4.1.0.tar.bz2 +kde-l10n-es-4.1.0.tar.bz2 +kde-l10n-et-4.1.0.tar.bz2 +kde-l10n-fi-4.1.0.tar.bz2 +kde-l10n-fr-4.1.0.tar.bz2 +kde-l10n-ga-4.1.0.tar.bz2 +kde-l10n-gl-4.1.0.tar.bz2 +kde-l10n-hi-4.1.0.tar.bz2 +kde-l10n-hu-4.1.0.tar.bz2 +kde-l10n-it-4.1.0.tar.bz2 +kde-l10n-ja-4.1.0.tar.bz2 +kde-l10n-km-4.1.0.tar.bz2 +kde-l10n-ko-4.1.0.tar.bz2 +kde-l10n-mk-4.1.0.tar.bz2 +kde-l10n-lv-4.1.0.tar.bz2 +kde-l10n-nb-4.1.0.tar.bz2 +kde-l10n-nds-4.1.0.tar.bz2 +kde-l10n-nl-4.1.0.tar.bz2 +kde-l10n-nn-4.1.0.tar.bz2 +kde-l10n-pa-4.1.0.tar.bz2 +kde-l10n-pl-4.1.0.tar.bz2 +kde-l10n-pt-4.1.0.tar.bz2 +kde-l10n-pt_BR-4.1.0.tar.bz2 +kde-l10n-ru-4.1.0.tar.bz2 +kde-l10n-sl-4.1.0.tar.bz2 +kde-l10n-sr-4.1.0.tar.bz2 +kde-l10n-sv-4.1.0.tar.bz2 +kde-l10n-ta-4.1.0.tar.bz2 +kde-l10n-th-4.1.0.tar.bz2 +kde-l10n-tr-4.1.0.tar.bz2 +kde-l10n-uk-4.1.0.tar.bz2 +kde-l10n-wa-4.1.0.tar.bz2 +kde-l10n-zh_CN-4.1.0.tar.bz2 +kde-l10n-zh_TW-4.1.0.tar.bz2 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- kde-l10n.spec 23 Jul 2008 09:52:46 -0000 1.37 +++ kde-l10n.spec 23 Jul 2008 14:38:33 -0000 1.38 @@ -1,7 +1,7 @@ %define buildall 0 Name: kde-l10n -Version: 4.0.98 +Version: 4.1.0 Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -9,10 +9,10 @@ License: LGPLv2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2 -Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2 +#Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2 +#Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2 Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2 -Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2 +Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2 Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-csb-%{version}.tar.bz2 Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2 @@ -22,7 +22,7 @@ Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2 Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2 -Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2 +#Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2 Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2 Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2 Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2 @@ -37,7 +37,7 @@ Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2 Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2 Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2 -Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2 +#Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2 Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2 Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2 Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2 @@ -45,7 +45,7 @@ Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2 Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2 -Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2 +#Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2 #Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2 Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2 Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2 @@ -789,10 +789,12 @@ %lang(af) %{_datadir}/locale/af/* %endif +%if %{buildall} %files Arabic %defattr(-,root,root) %lang(ar) %{_datadir}/locale/ar/* %lang(ar) %{_datadir}/kde4/apps/klettres/ar +%endif %if %{buildall} %files Azerbaijani @@ -800,9 +802,11 @@ %lang(az) %{_datadir}/locale/az/* %endif +%if %{buildall} %files Belarusian %defattr(-,root,root) %lang(be) %{_datadir}/locale/be/* +%endif %files Bulgarian %defattr(-,root,root) @@ -906,9 +910,11 @@ %lang(et) %{_kde4_appsdir}/kvtml/et %lang(et) %{_kde4_docdir}/HTML/et +%if %{buildall} %files Basque %defattr(-,root,root) %lang(eu) %{_datadir}/locale/eu/* +%endif %if %{buildall} %files Farsi @@ -1067,9 +1073,11 @@ %lang(mt) %{_datadir}/locale/mt/* %endif +%if %{buildall} %files Nepali %defattr(-,root,root) %lang(ne) %{_datadir}/locale/ne/* +%endif %files Dutch %defattr(-,root,root) @@ -1079,9 +1087,11 @@ %lang(nl) %{_kde4_appsdir}/kvtml/nl %lang(nl) %{_kde4_docdir}/HTML/nl +%if %{buildall} %files NorthernSami %defattr(-,root,root) %lang(se) %{_datadir}/locale/se/* +%endif %files Norwegian %defattr(-,root,root) @@ -1166,11 +1176,16 @@ %lang(sr) %{_kde4_docdir}/HTML/sr %lang(sr) %{_kde4_docdir}/HTML/sr at latin %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr/* +%lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr at latin/* +%lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/* %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr +%lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin %lang(sr) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sr* %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt -%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr/* +%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr +%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr at latin %lang(sr) %{_kde4_appsdir}/kturtle/examples/sr +%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr at latin %lang(sr) %{_kde4_appsdir}/kvtml/sr* %lang(sr) %{_datadir}/locale/sr at latin/* @@ -1244,6 +1259,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Tue Jul 22 2008 Than Ngo 4.0.98-1 - 4.0.98 (4.1rc1) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 22 Jul 2008 16:42:01 -0000 1.10 +++ sources 23 Jul 2008 14:38:33 -0000 1.11 @@ -1,47 +1,42 @@ -9aeb88effbef1c877fced16f47e302a9 kde-l10n-ar-4.0.98.tar.bz2 -dd6215a97db03f5a5451aae144ae9dfa kde-l10n-be-4.0.98.tar.bz2 -5d4f63d4eb2460f44bb62daac478fc48 kde-l10n-bg-4.0.98.tar.bz2 -4dd7d0a26d95823872cac765484f94af kde-l10n-ca-4.0.98.tar.bz2 -f849da964d5ede6fa785ac41602a88c1 kde-l10n-cs-4.0.98.tar.bz2 -6e0254fdf2080c54b4f6e0c4e84e21f8 kde-l10n-csb-4.0.98.tar.bz2 -1bb45b55924f1f22c8104ef06b197114 kde-l10n-da-4.0.98.tar.bz2 -26a1f7418ef17358b7361245dac3f832 kde-l10n-de-4.0.98.tar.bz2 -817fb49ebf0ac4d098ec6980664c3d53 kde-l10n-el-4.0.98.tar.bz2 -54d9db81f2462bae67bfa6f921a170d8 kde-l10n-en_GB-4.0.98.tar.bz2 -14fb7be791993ff10c629765d83c6735 kde-l10n-eo-4.0.98.tar.bz2 -a6a0887cb7a05bb7c151160af40d7799 kde-l10n-es-4.0.98.tar.bz2 -5fec646981e2cf484acbfb829d099b44 kde-l10n-et-4.0.98.tar.bz2 -868d2c0b0be825518a898b347c9f5331 kde-l10n-eu-4.0.98.tar.bz2 -7591643b8471987798eb7ad28d8c50e2 kde-l10n-fi-4.0.98.tar.bz2 -cb3884c4374f5e3019cdd4874a25ad71 kde-l10n-fr-4.0.98.tar.bz2 -a476ccee8c8c9779bff3cda49672b88b kde-l10n-ga-4.0.98.tar.bz2 -40048f50bb540cf34dc0a771c5c350c3 kde-l10n-gl-4.0.98.tar.bz2 -5abf81bae058419d7b6a2cbb5f889e35 kde-l10n-hi-4.0.98.tar.bz2 -27eaaa5bc94301ec7e6207d8e97fe4b0 kde-l10n-hu-4.0.98.tar.bz2 -e011544a6ec8d319682077813226a3cd kde-l10n-it-4.0.98.tar.bz2 -69707943d055b21825eb7f6f52b88ef0 kde-l10n-ja-4.0.98.tar.bz2 -b91deec756318c41f23b435c6a2b2441 kde-l10n-km-4.0.98.tar.bz2 -a0db531b70bdd7f6edafa382382aa44d kde-l10n-ko-4.0.98.tar.bz2 -a3a5c8f566d7f150168b6775f39ad68b kde-l10n-mk-4.0.98.tar.bz2 -127c86202beb589227fc2fce5cf60172 kde-l10n-lv-4.0.98.tar.bz2 -7761851d40228ff99268694ace65b271 kde-l10n-nb-4.0.98.tar.bz2 -cd32d33399d6d98c567c32f1189d9f94 kde-l10n-nds-4.0.98.tar.bz2 -9dfac93e533765cd27215e54d955f191 kde-l10n-ne-4.0.98.tar.bz2 -09e120153bac95d838731fc21a94ff9b kde-l10n-nl-4.0.98.tar.bz2 -50333413d1108c369d321335451bf101 kde-l10n-nn-4.0.98.tar.bz2 -278b96a224222fed7d932c5883ef661b kde-l10n-pa-4.0.98.tar.bz2 -ac8f505cae675f8131af4fbae5638ce5 kde-l10n-pl-4.0.98.tar.bz2 -6da6d201f9ca428cd452fb34fa62541e kde-l10n-pt-4.0.98.tar.bz2 -98fbadc044cf4a954f6ed37dbf9ddfb9 kde-l10n-pt_BR-4.0.98.tar.bz2 -6ddf05b0ca4a5b46563e1630b3f86989 kde-l10n-ru-4.0.98.tar.bz2 -80c2a906466831fcc786fa5a47d39b7e kde-l10n-se-4.0.98.tar.bz2 -7883962a6a2f35c9187ebd711f97a1c7 kde-l10n-sl-4.0.98.tar.bz2 -8aef3da452b46b2674708a28e0e8e912 kde-l10n-sr-4.0.98.tar.bz2 -d8dcd9c66429aa528394295faa4b57d6 kde-l10n-sv-4.0.98.tar.bz2 -cb52bdd5dddfd3d114ca2b431e6d5529 kde-l10n-ta-4.0.98.tar.bz2 -c16f08068149829ae1672941d0225d25 kde-l10n-th-4.0.98.tar.bz2 -81d85933f3ad731032dfd5a4cb16425d kde-l10n-tr-4.0.98.tar.bz2 -1c62c1b4389da07c73e3df4ef38be8ba kde-l10n-uk-4.0.98.tar.bz2 -22a61616d8e11d54b135314dd4c0e600 kde-l10n-wa-4.0.98.tar.bz2 -25d5dd8c2363fbe52c66dac63fdea6b7 kde-l10n-zh_CN-4.0.98.tar.bz2 -f9227a0db298ed0988459b61c1215a98 kde-l10n-zh_TW-4.0.98.tar.bz2 +6ea143c07fec4c221163d518a6b4a6ba kde-l10n-bg-4.1.0.tar.bz2 +9d3b148e2519ecdd3413e75ced74d74d kde-l10n-ca-4.1.0.tar.bz2 +587b64f8faa341deacdcb001cb6c1d49 kde-l10n-cs-4.1.0.tar.bz2 +3f554dca9db73ae823de6a59e6c1fccb kde-l10n-csb-4.1.0.tar.bz2 +c0f1a76fa98261532b5b2ec7677b122c kde-l10n-da-4.1.0.tar.bz2 +4b4692687b61fe38b1936de557ad76fc kde-l10n-de-4.1.0.tar.bz2 +8a1cd5d567c3f73f3359aa33bf102eef kde-l10n-el-4.1.0.tar.bz2 +5c812fd8335c70aabcff3c92bd6fad2e kde-l10n-en_GB-4.1.0.tar.bz2 +b35462218b9cfe29bf106aba8e8a0a3c kde-l10n-eo-4.1.0.tar.bz2 +81e8d8a287c29b5ff099075d6e91f777 kde-l10n-es-4.1.0.tar.bz2 +2515a4e55e10a01c5edad030e1c4ee58 kde-l10n-et-4.1.0.tar.bz2 +a47ae43bbe50e733e8ad33d91a54e60d kde-l10n-fi-4.1.0.tar.bz2 +ba690a8e9409f5c934b7db78c4b26da8 kde-l10n-fr-4.1.0.tar.bz2 +d5cd12cd6d1cf9329b6029406b5c1e0f kde-l10n-ga-4.1.0.tar.bz2 +66718341e6fbec3144a8a6e6ff12eaf9 kde-l10n-gl-4.1.0.tar.bz2 +5759f8639cebab9e0eeb36092c4530cd kde-l10n-hi-4.1.0.tar.bz2 +c6cf7a32ef93f571a5929ad8567828c8 kde-l10n-hu-4.1.0.tar.bz2 +da1a689abd2cab8e16b63ebfbc1781a9 kde-l10n-it-4.1.0.tar.bz2 +21fdce21cbc277c99ab47548b1574277 kde-l10n-ja-4.1.0.tar.bz2 +5334d54a5eb05d2f9e036bcbe436c7f1 kde-l10n-km-4.1.0.tar.bz2 +8517edcee2bd74c2b6ae2817b6419ef9 kde-l10n-ko-4.1.0.tar.bz2 +c96fe5683d10216dab91044a6e8d067e kde-l10n-mk-4.1.0.tar.bz2 +eb9a66e0a50ce7ca2956fcde580a4861 kde-l10n-lv-4.1.0.tar.bz2 +5dabe6c3a7b7510d84ddc385e08da932 kde-l10n-nb-4.1.0.tar.bz2 +aac9294f3b1550ef2721e34c958f21f0 kde-l10n-nds-4.1.0.tar.bz2 +e0d37ba868babd2a139cbb288e9705ca kde-l10n-nl-4.1.0.tar.bz2 +b6ca1a9578358163c65ead322f172b6b kde-l10n-nn-4.1.0.tar.bz2 +b996ea1acc09bc3dc9432a96a948bb8e kde-l10n-pa-4.1.0.tar.bz2 +bdc1403f878cf95771ef1f55eaea5bf1 kde-l10n-pl-4.1.0.tar.bz2 +5af76c57b9aa57163192bc5ca6f51d56 kde-l10n-pt-4.1.0.tar.bz2 +de0643177deb5e71994d9a6f011e3a7c kde-l10n-pt_BR-4.1.0.tar.bz2 +4bf857f4f2fd8ca8fd647b02806216c8 kde-l10n-ru-4.1.0.tar.bz2 +1a326e1e690d91e1452cf9ff5367c1a2 kde-l10n-sl-4.1.0.tar.bz2 +05d7d2eb92edfceb0d0daa7967e531a8 kde-l10n-sr-4.1.0.tar.bz2 +e7af80be264b2345897587631024ee10 kde-l10n-sv-4.1.0.tar.bz2 +9958be9594b7a0e78a58628e9d549d0d kde-l10n-ta-4.1.0.tar.bz2 +d694f4c914c5694ea891d96ee2050c7c kde-l10n-th-4.1.0.tar.bz2 +7eb8f931768d071dee725226289a66df kde-l10n-tr-4.1.0.tar.bz2 +a5c44a250439d0653bacaffa89ecafbb kde-l10n-uk-4.1.0.tar.bz2 +a309ad111b09c205a94efa932f902e8b kde-l10n-wa-4.1.0.tar.bz2 +48aef075bef64f8d57ba124620a17eaa kde-l10n-zh_CN-4.1.0.tar.bz2 +7ef18fe5d0fee8252ff0f1186b2f8a4f kde-l10n-zh_TW-4.1.0.tar.bz2 Index: subdirs-kde-l10n =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- subdirs-kde-l10n 22 Jul 2008 16:42:01 -0000 1.8 +++ subdirs-kde-l10n 23 Jul 2008 14:38:33 -0000 1.9 @@ -1,5 +1,3 @@ -ar -be bg ca cs @@ -11,7 +9,6 @@ eo es et -eu fi fr ga @@ -26,7 +23,6 @@ lv nb nds -ne nl nn pa @@ -34,7 +30,6 @@ pt pt_BR ru -se sl sr sv From fedora-extras-commits at redhat.com Wed Jul 23 14:42:50 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 14:42:50 GMT Subject: rpms/kdemultimedia/devel .cvsignore, 1.52, 1.53 kdemultimedia.spec, 1.117, 1.118 sources, 1.54, 1.55 Message-ID: <200807231442.m6NEgoUV003854@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdemultimedia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3802 Modified Files: .cvsignore kdemultimedia.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 19 Jul 2008 05:58:49 -0000 1.52 +++ .cvsignore 23 Jul 2008 14:42:06 -0000 1.53 @@ -1 +1,2 @@ kdemultimedia-4.0.99.tar.bz2 +kdemultimedia-4.1.0.tar.bz2 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- kdemultimedia.spec 19 Jul 2008 05:58:49 -0000 1.117 +++ kdemultimedia.spec 23 Jul 2008 14:42:06 -0000 1.118 @@ -1,7 +1,6 @@ - Name: kdemultimedia Epoch: 6 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications @@ -38,8 +37,8 @@ Requires: kdelibs4 >= %{version} Requires: kdebase-workspace >= %{version} -Provides: dragonplayer = 2.0.2-0.1 -Obsoletes: dragonplayer < 2.0.2-0.1 +Provides: dragonplayer = 2.0.2-0.1 +Obsoletes: dragonplayer < 2.0.2-0.1 Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release} @@ -148,6 +147,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 19 Jul 2008 05:58:49 -0000 1.54 +++ sources 23 Jul 2008 14:42:06 -0000 1.55 @@ -1 +1 @@ -edf13e39c98b8c73a3fb71146741198e kdemultimedia-4.0.99.tar.bz2 +7965e42c3de193bde7f1e5437c9bedec kdemultimedia-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:48:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 23 Jul 2008 14:48:02 GMT Subject: rpms/openssh/devel openssh-5.1p1-cloexec.patch, NONE, 1.1 openssh-5.1p1-log-in-chroot.patch, NONE, 1.1 openssh-5.1p1-redhat.patch, NONE, 1.1 openssh-5.1p1-selinux.patch, NONE, 1.1 openssh-5.1p1-vendor.patch, NONE, 1.1 openssh.spec, 1.127, 1.128 openssh-4.5p1-controlcleanup.patch, 1.1, NONE openssh-4.7p1-cloexec.patch, 1.2, NONE openssh-4.7p1-log-in-chroot.patch, 1.1, NONE openssh-4.7p1-master-race.patch, 1.1, NONE openssh-4.7p1-redhat.patch, 1.2, NONE openssh-4.7p1-selinux.patch, 1.1, NONE openssh-4.7p1-vendor.patch, 1.1, NONE openssh-5.0p1-unbreakalive.patch, 1.1, NONE Message-ID: <200807231448.m6NEm2Qv004077@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/openssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4023 Modified Files: openssh.spec Added Files: openssh-5.1p1-cloexec.patch openssh-5.1p1-log-in-chroot.patch openssh-5.1p1-redhat.patch openssh-5.1p1-selinux.patch openssh-5.1p1-vendor.patch Removed Files: openssh-4.5p1-controlcleanup.patch openssh-4.7p1-cloexec.patch openssh-4.7p1-log-in-chroot.patch openssh-4.7p1-master-race.patch openssh-4.7p1-redhat.patch openssh-4.7p1-selinux.patch openssh-4.7p1-vendor.patch openssh-5.0p1-unbreakalive.patch Log Message: * Wed Jul 23 2008 Tomas Mraz - 5.1p1-1 - upgrade to new upstream release - fixed a problem with public key authentication and explicitely specified SELinux role openssh-5.1p1-cloexec.patch: --- NEW FILE openssh-5.1p1-cloexec.patch --- diff -up openssh-5.1p1/sshconnect2.c.cloexec openssh-5.1p1/sshconnect2.c --- openssh-5.1p1/sshconnect2.c.cloexec 2008-07-23 15:21:23.000000000 +0200 +++ openssh-5.1p1/sshconnect2.c 2008-07-23 15:23:19.000000000 +0200 @@ -38,6 +38,7 @@ #include #include #include +#include #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) #include #endif @@ -1267,6 +1268,7 @@ ssh_keysign(Key *key, u_char **sigp, u_i return -1; } if (pid == 0) { + fcntl(packet_get_connection_in(), F_SETFD, 0); /* keep the socket on exec */ permanently_drop_suid(getuid()); close(from[0]); if (dup2(from[1], STDOUT_FILENO) < 0) diff -up openssh-5.1p1/sshconnect.c.cloexec openssh-5.1p1/sshconnect.c --- openssh-5.1p1/sshconnect.c.cloexec 2008-07-02 14:34:30.000000000 +0200 +++ openssh-5.1p1/sshconnect.c 2008-07-23 15:21:23.000000000 +0200 @@ -38,6 +38,7 @@ #include #include #include +#include #include "xmalloc.h" #include "key.h" @@ -194,8 +195,11 @@ ssh_create_socket(int privileged, struct return sock; } sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if (sock < 0) + if (sock < 0) { error("socket: %.100s", strerror(errno)); + return -1; + } + fcntl(sock, F_SETFD, FD_CLOEXEC); /* Bind the socket to an alternative local IP address */ if (options.bind_address == NULL) openssh-5.1p1-log-in-chroot.patch: --- NEW FILE openssh-5.1p1-log-in-chroot.patch --- diff -up openssh-5.1p1/sshd.c.log-chroot openssh-5.1p1/sshd.c --- openssh-5.1p1/sshd.c.log-chroot 2008-07-23 15:18:52.000000000 +0200 +++ openssh-5.1p1/sshd.c 2008-07-23 15:18:52.000000000 +0200 @@ -591,6 +591,10 @@ privsep_preauth_child(void) /* Demote the private keys to public keys. */ demote_sensitive_data(); + /* Open the syslog permanently so the chrooted process still + can write to syslog. */ + open_log(); + /* Change our root directory */ if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, diff -up openssh-5.1p1/log.c.log-chroot openssh-5.1p1/log.c --- openssh-5.1p1/log.c.log-chroot 2008-06-10 15:01:51.000000000 +0200 +++ openssh-5.1p1/log.c 2008-07-23 15:18:52.000000000 +0200 @@ -56,6 +56,7 @@ static LogLevel log_level = SYSLOG_LEVEL static int log_on_stderr = 1; static int log_facility = LOG_AUTH; static char *argv0; +static int log_fd_keep; extern char *__progname; @@ -392,10 +393,21 @@ do_log(LogLevel level, const char *fmt, syslog_r(pri, &sdata, "%.500s", fmtbuf); closelog_r(&sdata); #else + if (!log_fd_keep) { openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); + } syslog(pri, "%.500s", fmtbuf); + if (!log_fd_keep) { closelog(); + } #endif } errno = saved_errno; } + +void +open_log(void) +{ + openlog(argv0 ? argv0 : __progname, LOG_PID|LOG_NDELAY, log_facility); + log_fd_keep = 1; +} diff -up openssh-5.1p1/log.h.log-chroot openssh-5.1p1/log.h --- openssh-5.1p1/log.h.log-chroot 2008-06-13 02:22:54.000000000 +0200 +++ openssh-5.1p1/log.h 2008-07-23 15:20:11.000000000 +0200 @@ -66,4 +66,6 @@ void debug3(const char *, ...) __att void do_log(LogLevel, const char *, va_list); void cleanup_exit(int) __attribute__((noreturn)); + +void open_log(void); #endif openssh-5.1p1-redhat.patch: --- NEW FILE openssh-5.1p1-redhat.patch --- diff -up openssh-5.1p1/sshd_config.redhat openssh-5.1p1/sshd_config --- openssh-5.1p1/sshd_config.redhat 2008-07-02 14:35:43.000000000 +0200 +++ openssh-5.1p1/sshd_config 2008-07-23 14:11:12.000000000 +0200 @@ -33,6 +33,7 @@ Protocol 2 # Logging # obsoletes QuietMode and FascistLogging #SyslogFacility AUTH +SyslogFacility AUTHPRIV #LogLevel INFO # Authentication: @@ -60,9 +61,11 @@ Protocol 2 # To disable tunneled clear text passwords, change to no here! #PasswordAuthentication yes #PermitEmptyPasswords no +PasswordAuthentication yes # Change to no to disable s/key passwords #ChallengeResponseAuthentication yes +ChallengeResponseAuthentication no # Kerberos options #KerberosAuthentication no @@ -72,7 +75,9 @@ Protocol 2 # GSSAPI options #GSSAPIAuthentication no +GSSAPIAuthentication yes #GSSAPICleanupCredentials yes +GSSAPICleanupCredentials yes # Set this to 'yes' to enable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will @@ -84,11 +89,18 @@ Protocol 2 # PAM authentication, then enable this but set PasswordAuthentication # and ChallengeResponseAuthentication to 'no'. #UsePAM no +UsePAM yes + +# Accept locale-related environment variables +AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES +AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT +AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE #AllowAgentForwarding yes #AllowTcpForwarding yes #GatewayPorts no #X11Forwarding no +X11Forwarding yes #X11DisplayOffset 10 #X11UseLocalhost yes #PrintMotd yes diff -up openssh-5.1p1/ssh_config.redhat openssh-5.1p1/ssh_config --- openssh-5.1p1/ssh_config.redhat 2007-06-11 06:04:42.000000000 +0200 +++ openssh-5.1p1/ssh_config 2008-07-23 14:07:29.000000000 +0200 @@ -43,3 +43,13 @@ # Tunnel no # TunnelDevice any:any # PermitLocalCommand no +Host * + GSSAPIAuthentication yes +# If this option is set to yes then remote X11 clients will have full access +# to the original X11 display. As virtually no X11 client supports the untrusted +# mode correctly we set this to yes. + ForwardX11Trusted yes +# Send locale-related environment variables + SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES + SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT + SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE diff -up openssh-5.1p1/sshd_config.0.redhat openssh-5.1p1/sshd_config.0 --- openssh-5.1p1/sshd_config.0.redhat 2008-07-21 10:30:51.000000000 +0200 +++ openssh-5.1p1/sshd_config.0 2008-07-23 14:07:29.000000000 +0200 @@ -490,9 +490,9 @@ DESCRIPTION SyslogFacility Gives the facility code that is used when logging messages from - sshd(8). The possible values are: DAEMON, USER, AUTH, LOCAL0, - LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The de- - fault is AUTH. + sshd(8). The possible values are: DAEMON, USER, AUTH, AUTHPRIV, + LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. + The default is AUTH. TCPKeepAlive Specifies whether the system should send TCP keepalive messages diff -up openssh-5.1p1/sshd_config.5.redhat openssh-5.1p1/sshd_config.5 --- openssh-5.1p1/sshd_config.5.redhat 2008-07-02 14:35:43.000000000 +0200 +++ openssh-5.1p1/sshd_config.5 2008-07-23 14:07:29.000000000 +0200 @@ -846,7 +846,7 @@ Note that this option applies to protoco .It Cm SyslogFacility Gives the facility code that is used when logging messages from .Xr sshd 8 . -The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2, +The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The default is AUTH. .It Cm TCPKeepAlive openssh-5.1p1-selinux.patch: --- NEW FILE openssh-5.1p1-selinux.patch --- diff -up openssh-5.1p1/configure.ac.selinux openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.selinux 2008-07-23 16:32:13.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 16:32:13.000000000 +0200 @@ -3309,6 +3309,7 @@ AC_ARG_WITH(selinux, AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], AC_MSG_ERROR(SELinux support requires libselinux library)) SSHDLIBS="$SSHDLIBS $LIBSELINUX" + LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) LIBS="$save_LIBS" fi ] diff -up openssh-5.1p1/auth1.c.selinux openssh-5.1p1/auth1.c --- openssh-5.1p1/auth1.c.selinux 2008-07-23 16:32:13.000000000 +0200 +++ openssh-5.1p1/auth1.c 2008-07-23 16:32:13.000000000 +0200 @@ -391,7 +391,7 @@ void do_authentication(Authctxt *authctxt) { u_int ulen; - char *user, *style = NULL; + char *user, *style = NULL, *role=NULL; /* Get the name of the user that we wish to log in as. */ packet_read_expect(SSH_CMSG_USER); @@ -400,11 +400,19 @@ do_authentication(Authctxt *authctxt) user = packet_get_string(&ulen); packet_check_eom(); + if ((role = strchr(user, '/')) != NULL) + *role++ = '\0'; + if ((style = strchr(user, ':')) != NULL) *style++ = '\0'; + else + if (role && (style = strchr(role, ':')) != NULL) + *style++ = '\0'; + authctxt->user = user; authctxt->style = style; + authctxt->role = role; /* Verify that the user is a valid user. */ if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) diff -up openssh-5.1p1/auth2-pubkey.c.selinux openssh-5.1p1/auth2-pubkey.c --- openssh-5.1p1/auth2-pubkey.c.selinux 2008-07-04 04:54:25.000000000 +0200 +++ openssh-5.1p1/auth2-pubkey.c 2008-07-23 16:32:13.000000000 +0200 @@ -117,7 +117,14 @@ userauth_pubkey(Authctxt *authctxt) } /* reconstruct packet */ buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(&b, authctxt->user); + if (authctxt->role) { + buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); + buffer_append(&b, authctxt->user, strlen(authctxt->user)); + buffer_put_char(&b, '/'); + buffer_append(&b, authctxt->role, strlen(authctxt->role)); + } else { + buffer_put_cstring(&b, authctxt->user); + } buffer_put_cstring(&b, datafellows & SSH_BUG_PKSERVICE ? "ssh-userauth" : diff -up openssh-5.1p1/monitor_wrap.h.selinux openssh-5.1p1/monitor_wrap.h --- openssh-5.1p1/monitor_wrap.h.selinux 2006-08-05 04:39:40.000000000 +0200 +++ openssh-5.1p1/monitor_wrap.h 2008-07-23 16:32:13.000000000 +0200 @@ -41,6 +41,7 @@ int mm_is_monitor(void); DH *mm_choose_dh(int, int, int); int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); void mm_inform_authserv(char *, char *); +void mm_inform_authrole(char *); struct passwd *mm_getpwnamallow(const char *); char *mm_auth2_read_banner(void); int mm_auth_password(struct Authctxt *, char *); diff -up openssh-5.1p1/monitor.h.selinux openssh-5.1p1/monitor.h --- openssh-5.1p1/monitor.h.selinux 2006-03-26 05:30:02.000000000 +0200 +++ openssh-5.1p1/monitor.h 2008-07-23 16:32:13.000000000 +0200 @@ -30,7 +30,7 @@ enum monitor_reqtype { MONITOR_REQ_MODULI, MONITOR_ANS_MODULI, - MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV, + MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE, MONITOR_REQ_SIGN, MONITOR_ANS_SIGN, MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM, MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER, diff -up openssh-5.1p1/auth2-hostbased.c.selinux openssh-5.1p1/auth2-hostbased.c --- openssh-5.1p1/auth2-hostbased.c.selinux 2008-07-17 10:57:19.000000000 +0200 +++ openssh-5.1p1/auth2-hostbased.c 2008-07-23 16:32:13.000000000 +0200 @@ -106,7 +106,14 @@ userauth_hostbased(Authctxt *authctxt) buffer_put_string(&b, session_id2, session_id2_len); /* reconstruct packet */ buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(&b, authctxt->user); + if (authctxt->role) { + buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); + buffer_append(&b, authctxt->user, strlen(authctxt->user)); + buffer_put_char(&b, '/'); + buffer_append(&b, authctxt->role, strlen(authctxt->role)); + } else { + buffer_put_cstring(&b, authctxt->user); + } buffer_put_cstring(&b, service); buffer_put_cstring(&b, "hostbased"); buffer_put_string(&b, pkalg, alen); diff -up openssh-5.1p1/monitor_wrap.c.selinux openssh-5.1p1/monitor_wrap.c --- openssh-5.1p1/monitor_wrap.c.selinux 2008-07-11 09:36:48.000000000 +0200 +++ openssh-5.1p1/monitor_wrap.c 2008-07-23 16:32:13.000000000 +0200 @@ -296,6 +296,23 @@ mm_inform_authserv(char *service, char * buffer_free(&m); } +/* Inform the privileged process about role */ + +void +mm_inform_authrole(char *role) +{ + Buffer m; + + debug3("%s entering", __func__); + + buffer_init(&m); + buffer_put_cstring(&m, role ? role : ""); + + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m); + + buffer_free(&m); +} + /* Do the password authentication */ int mm_auth_password(Authctxt *authctxt, char *password) diff -up openssh-5.1p1/openbsd-compat/port-linux.c.selinux openssh-5.1p1/openbsd-compat/port-linux.c --- openssh-5.1p1/openbsd-compat/port-linux.c.selinux 2008-03-26 21:27:21.000000000 +0100 +++ openssh-5.1p1/openbsd-compat/port-linux.c 2008-07-23 16:32:13.000000000 +0200 @@ -30,11 +30,16 @@ #ifdef WITH_SELINUX #include "log.h" #include "port-linux.h" +#include "key.h" +#include "hostfile.h" +#include "auth.h" #include #include #include +extern Authctxt *the_authctxt; + /* Wrapper around is_selinux_enabled() to log its return value once only */ int ssh_selinux_enabled(void) @@ -53,23 +58,36 @@ ssh_selinux_enabled(void) static security_context_t ssh_selinux_getctxbyname(char *pwname) { - security_context_t sc; - char *sename = NULL, *lvl = NULL; - int r; + security_context_t sc = NULL; + char *sename, *lvl; + char *role = NULL; + int r = 0; + if (the_authctxt) + role=the_authctxt->role; #ifdef HAVE_GETSEUSERBYNAME - if (getseuserbyname(pwname, &sename, &lvl) != 0) - return NULL; + if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { + sename = NULL; + lvl = NULL; + } #else sename = pwname; lvl = NULL; #endif + if (r == 0) { #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL - r = get_default_context_with_level(sename, lvl, NULL, &sc); + if (role != NULL && role[0]) + r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc); + else + r = get_default_context_with_level(sename, lvl, NULL, &sc); #else - r = get_default_context(sename, NULL, &sc); + if (role != NULL && role[0]) + r = get_default_context_with_role(sename, role, NULL, &sc); + else + r = get_default_context(sename, NULL, &sc); #endif + } if (r != 0) { switch (security_getenforce()) { diff -up openssh-5.1p1/auth.h.selinux openssh-5.1p1/auth.h --- openssh-5.1p1/auth.h.selinux 2008-07-02 14:37:30.000000000 +0200 +++ openssh-5.1p1/auth.h 2008-07-23 16:32:13.000000000 +0200 @@ -58,6 +58,7 @@ struct Authctxt { char *service; struct passwd *pw; /* set if 'valid' */ char *style; + char *role; void *kbdintctxt; #ifdef BSD_AUTH auth_session_t *as; diff -up openssh-5.1p1/auth2.c.selinux openssh-5.1p1/auth2.c --- openssh-5.1p1/auth2.c.selinux 2008-07-05 01:44:53.000000000 +0200 +++ openssh-5.1p1/auth2.c 2008-07-23 16:32:13.000000000 +0200 @@ -209,7 +209,7 @@ input_userauth_request(int type, u_int32 { Authctxt *authctxt = ctxt; Authmethod *m = NULL; - char *user, *service, *method, *style = NULL; + char *user, *service, *method, *style = NULL, *role = NULL; int authenticated = 0; if (authctxt == NULL) @@ -221,6 +221,9 @@ input_userauth_request(int type, u_int32 debug("userauth-request for user %s service %s method %s", user, service, method); debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); + if ((role = strchr(user, '/')) != NULL) + *role++ = 0; + if ((style = strchr(user, ':')) != NULL) *style++ = 0; @@ -246,8 +249,11 @@ input_userauth_request(int type, u_int32 use_privsep ? " [net]" : ""); authctxt->service = xstrdup(service); authctxt->style = style ? xstrdup(style) : NULL; - if (use_privsep) + authctxt->role = role ? xstrdup(role) : NULL; + if (use_privsep) { mm_inform_authserv(service, style); + mm_inform_authrole(role); + } userauth_banner(); } else if (strcmp(user, authctxt->user) != 0 || strcmp(service, authctxt->service) != 0) { diff -up openssh-5.1p1/monitor.c.selinux openssh-5.1p1/monitor.c --- openssh-5.1p1/monitor.c.selinux 2008-07-11 09:36:48.000000000 +0200 +++ openssh-5.1p1/monitor.c 2008-07-23 16:36:10.000000000 +0200 @@ -134,6 +134,7 @@ int mm_answer_sign(int, Buffer *); int mm_answer_pwnamallow(int, Buffer *); int mm_answer_auth2_read_banner(int, Buffer *); int mm_answer_authserv(int, Buffer *); +int mm_answer_authrole(int, Buffer *); int mm_answer_authpassword(int, Buffer *); int mm_answer_bsdauthquery(int, Buffer *); int mm_answer_bsdauthrespond(int, Buffer *); @@ -205,6 +206,7 @@ struct mon_table mon_dispatch_proto20[] {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, + {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole}, {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner}, {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, #ifdef USE_PAM @@ -658,6 +660,7 @@ mm_answer_pwnamallow(int sock, Buffer *m else { /* Allow service/style information on the auth context */ monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); + monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1); monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1); } @@ -703,6 +706,23 @@ mm_answer_authserv(int sock, Buffer *m) } int +mm_answer_authrole(int sock, Buffer *m) +{ + monitor_permit_authentications(1); + + authctxt->role = buffer_get_string(m, NULL); + debug3("%s: role=%s", + __func__, authctxt->role); + + if (strlen(authctxt->role) == 0) { + xfree(authctxt->role); + authctxt->role = NULL; + } + + return (0); +} + +int mm_answer_authpassword(int sock, Buffer *m) { static int call_count; @@ -1080,7 +1100,7 @@ static int monitor_valid_userblob(u_char *data, u_int datalen) { Buffer b; - char *p; + char *p, *r; u_int len; int fail = 0; @@ -1106,6 +1126,8 @@ monitor_valid_userblob(u_char *data, u_i if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); + if ((r = strchr(p, '/')) != NULL) + *r = '\0'; if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); @@ -1137,7 +1159,7 @@ monitor_valid_hostbasedblob(u_char *data char *chost) { Buffer b; - char *p; + char *p, *r; u_int len; int fail = 0; @@ -1154,6 +1176,8 @@ monitor_valid_hostbasedblob(u_char *data if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); + if ((r = strchr(p, '/')) != NULL) + *r = '\0'; if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); openssh-5.1p1-vendor.patch: --- NEW FILE openssh-5.1p1-vendor.patch --- diff -up openssh-5.1p1/configure.ac.vendor openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 14:13:22.000000000 +0200 @@ -3890,6 +3890,12 @@ AC_ARG_WITH(lastlog, fi ] ) +AC_ARG_ENABLE(vendor-patchlevel, + [ --enable-vendor-patchlevel=TAG specify a vendor patch level], + [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.]) + SSH_VENDOR_PATCHLEVEL="$enableval"], + [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.]) + SSH_VENDOR_PATCHLEVEL=none]) dnl lastlog, [uw]tmpx? detection dnl NOTE: set the paths in the platform section to avoid the @@ -4146,6 +4152,7 @@ echo " IP address in \$DISPLAY hac echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " BSD Auth support: $BSD_AUTH_MSG" echo " Random number source: $RAND_MSG" +echo " Vendor patch level: $SSH_VENDOR_PATCHLEVEL" if test ! -z "$USE_RAND_HELPER" ; then echo " ssh-rand-helper collects from: $RAND_HELPER_MSG" fi diff -up openssh-5.1p1/sshd_config.5.vendor openssh-5.1p1/sshd_config.5 --- openssh-5.1p1/sshd_config.5.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/sshd_config.5 2008-07-23 14:19:23.000000000 +0200 @@ -812,6 +812,14 @@ This option applies to protocol version .It Cm ServerKeyBits Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. +.It Cm ShowPatchLevel +Specifies whether +.Nm sshd +will display the patch level of the binary in the identification string. +The patch level is set at compile-time. +The default is +.Dq no . +This option applies to protocol version 1 only. .It Cm StrictModes Specifies whether .Xr sshd 8 diff -up openssh-5.1p1/servconf.h.vendor openssh-5.1p1/servconf.h --- openssh-5.1p1/servconf.h.vendor 2008-06-10 15:01:51.000000000 +0200 +++ openssh-5.1p1/servconf.h 2008-07-23 14:13:22.000000000 +0200 @@ -126,6 +126,7 @@ typedef struct { int max_authtries; int max_sessions; char *banner; /* SSH-2 banner message */ + int show_patchlevel; /* Show vendor patch level to clients */ int use_dns; int client_alive_interval; /* * poke the client this often to diff -up openssh-5.1p1/servconf.c.vendor openssh-5.1p1/servconf.c --- openssh-5.1p1/servconf.c.vendor 2008-07-04 05:51:12.000000000 +0200 +++ openssh-5.1p1/servconf.c 2008-07-23 14:32:27.000000000 +0200 @@ -117,6 +117,7 @@ initialize_server_options(ServerOptions options->max_authtries = -1; options->max_sessions = -1; options->banner = NULL; + options->show_patchlevel = -1; options->use_dns = -1; options->client_alive_interval = -1; options->client_alive_count_max = -1; @@ -259,6 +260,9 @@ fill_default_server_options(ServerOption if (options->permit_tun == -1) options->permit_tun = SSH_TUNMODE_NO; + if (options->show_patchlevel == -1) + options->show_patchlevel = 0; + /* Turn privilege separation on by default */ if (use_privsep == -1) use_privsep = 1; @@ -296,7 +300,7 @@ typedef enum { sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions, - sBanner, sUseDNS, sHostbasedAuthentication, + sBanner, sShowPatchLevel, sUseDNS, sHostbasedAuthentication, sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, @@ -401,6 +405,7 @@ static struct { { "maxauthtries", sMaxAuthTries, SSHCFG_ALL }, { "maxsessions", sMaxSessions, SSHCFG_ALL }, { "banner", sBanner, SSHCFG_ALL }, + { "showpatchlevel", sShowPatchLevel, SSHCFG_GLOBAL }, { "usedns", sUseDNS, SSHCFG_GLOBAL }, { "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL }, { "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL }, @@ -1020,6 +1025,10 @@ process_server_config_line(ServerOptions intptr = &use_privsep; goto parse_flag; + case sShowPatchLevel: + intptr = &options->show_patchlevel; + goto parse_flag; + case sAllowUsers: while ((arg = strdelim(&cp)) && *arg != '\0') { if (options->num_allow_users >= MAX_ALLOW_USERS) @@ -1584,6 +1593,7 @@ dump_config(ServerOptions *o) dump_cfg_fmtint(sUseLogin, o->use_login); dump_cfg_fmtint(sCompression, o->compression); dump_cfg_fmtint(sGatewayPorts, o->gateway_ports); + dump_cfg_fmtint(sShowPatchLevel, o->show_patchlevel); dump_cfg_fmtint(sUseDNS, o->use_dns); dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding); dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep); diff -up openssh-5.1p1/sshd_config.0.vendor openssh-5.1p1/sshd_config.0 --- openssh-5.1p1/sshd_config.0.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/sshd_config.0 2008-07-23 14:13:22.000000000 +0200 @@ -466,6 +466,11 @@ DESCRIPTION Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. + ShowPatchLevel + Specifies whether sshd will display the specific patch level of + the binary in the server identification string. The patch level + is set at compile-time. The default is M-bM-^@M-^\noM-bM-^@M-^]. + StrictModes Specifies whether sshd(8) should check file modes and ownership of the user's files and home directory before accepting login. diff -up openssh-5.1p1/sshd_config.vendor openssh-5.1p1/sshd_config --- openssh-5.1p1/sshd_config.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/sshd_config 2008-07-23 14:13:22.000000000 +0200 @@ -112,6 +112,7 @@ X11Forwarding yes #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 +#ShowPatchLevel no #UseDNS yes #PidFile /var/run/sshd.pid #MaxStartups 10 diff -up openssh-5.1p1/sshd.c.vendor openssh-5.1p1/sshd.c --- openssh-5.1p1/sshd.c.vendor 2008-07-11 09:36:49.000000000 +0200 +++ openssh-5.1p1/sshd.c 2008-07-23 14:35:43.000000000 +0200 @@ -416,7 +416,7 @@ sshd_exchange_identification(int sock_in minor = PROTOCOL_MINOR_1; } snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, - SSH_VERSION, newline); + (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_VERSION, newline); server_version_string = xstrdup(buf); /* Send our protocol version identification. */ @@ -1484,7 +1484,8 @@ main(int ac, char **av) exit(1); } - debug("sshd version %.100s", SSH_RELEASE); + debug("sshd version %.100s", + (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_RELEASE); /* Store privilege separation user for later use if required. */ if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- openssh.spec 21 May 2008 08:16:23 -0000 1.127 +++ openssh.spec 23 Jul 2008 14:47:19 -0000 1.128 @@ -62,8 +62,8 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 Name: openssh -Version: 5.0p1 -Release: 3%{?dist}%{?rescue_rel} +Version: 5.1p1 +Release: 1%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc @@ -74,17 +74,17 @@ Source1: openssh-nukeacss.sh Source2: sshd.pam Source3: sshd.init -Patch0: openssh-4.7p1-redhat.patch +Patch0: openssh-5.1p1-redhat.patch Patch2: openssh-3.8.1p1-skip-initial.patch Patch3: openssh-3.8.1p1-krb5-config.patch -Patch4: openssh-4.7p1-vendor.patch -Patch12: openssh-4.7p1-selinux.patch +Patch4: openssh-5.1p1-vendor.patch +Patch12: openssh-5.1p1-selinux.patch Patch13: openssh-4.7p1-mls.patch Patch16: openssh-4.7p1-audit.patch Patch17: openssh-4.3p2-cve-2007-3102.patch Patch22: openssh-3.9p1-askpass-keep-above.patch Patch24: openssh-4.3p1-fromto-remote.patch -Patch27: openssh-4.7p1-log-in-chroot.patch +Patch27: openssh-5.1p1-log-in-chroot.patch Patch30: openssh-4.0p1-exit-deadlock.patch Patch35: openssh-4.2p1-askpass-progress.patch Patch38: openssh-4.3p2-askpass-grab-info.patch @@ -93,11 +93,8 @@ Patch49: openssh-4.3p2-gssapi-canohost.patch Patch51: openssh-4.7p1-nss-keys.patch Patch54: openssh-4.7p1-gssapi-role.patch -Patch55: openssh-4.7p1-cloexec.patch -Patch58: openssh-4.5p1-controlcleanup.patch -Patch59: openssh-4.7p1-master-race.patch +Patch55: openssh-5.1p1-cloexec.patch Patch60: openssh-5.0p1-pam_selinux.patch -Patch61: openssh-5.0p1-unbreakalive.patch Patch62: openssh-3.9p1-scp-manpage.patch License: BSD @@ -229,10 +226,7 @@ %patch51 -p1 -b .nss-keys %patch54 -p0 -b .gssapi-role %patch55 -p1 -b .cloexec -%patch58 -p1 -b .controlcleanup -%patch59 -p1 -b .master-race %patch60 -p1 -b .pam_selinux -%patch61 -p0 -b .unbreakalive %patch62 -p0 -b .manpage autoreconf @@ -423,7 +417,7 @@ %files %defattr(-,root,root) -%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* RFC* TODO WARNING* +%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW PROTOCOL* README* TODO WARNING* %attr(0755,root,root) %dir %{_sysconfdir}/ssh %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli %if ! %{rescue} @@ -468,6 +462,7 @@ %attr(0755,root,root) %{_sbindir}/sshd %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server %attr(0644,root,root) %{_mandir}/man5/sshd_config.5* +%attr(0644,root,root) %{_mandir}/man5/moduli.5* %attr(0644,root,root) %{_mandir}/man8/sshd.8* %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config @@ -484,6 +479,11 @@ %endif %changelog +* Wed Jul 23 2008 Tomas Mraz - 5.1p1-1 +- upgrade to new upstream release +- fixed a problem with public key authentication and explicitely + specified SELinux role + * Wed May 21 2008 Tomas Mraz - 5.0p1-3 - pass the connection socket to ssh-keysign (#447680) --- openssh-4.5p1-controlcleanup.patch DELETED --- --- openssh-4.7p1-cloexec.patch DELETED --- --- openssh-4.7p1-log-in-chroot.patch DELETED --- --- openssh-4.7p1-master-race.patch DELETED --- --- openssh-4.7p1-redhat.patch DELETED --- --- openssh-4.7p1-selinux.patch DELETED --- --- openssh-4.7p1-vendor.patch DELETED --- --- openssh-5.0p1-unbreakalive.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 14:48:34 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Wed, 23 Jul 2008 14:48:34 GMT Subject: rpms/rsyslog/F-9 rsyslog.spec,1.40,1.41 Message-ID: <200807231448.m6NEmYNL004203@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4062 Modified Files: rsyslog.spec Log Message: clean spec Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/F-9/rsyslog.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- rsyslog.spec 23 Jul 2008 14:14:15 -0000 1.40 +++ rsyslog.spec 23 Jul 2008 14:47:46 -0000 1.41 @@ -12,9 +12,6 @@ Source2: rsyslog.conf Source3: rsyslog.sysconfig Source4: rsyslog.log -Patch1: rsyslog-3.11.4-undef.patch -Patch2: rsyslog-3.16.1-cfsline.patch -Patch3: rsyslog-3.16.1-symLookup.patch BuildRequires: zlib-devel BuildRequires: autoconf automake Requires: logrotate >= 3.5.2 @@ -81,9 +78,6 @@ %prep %setup -q -#%patch1 -p1 -b .undef -#%patch2 -p1 -b .cfsline -#%patch3 -p1 -b .symlookup %build %configure --sbindir=%{sbindir} \ From fedora-extras-commits at redhat.com Wed Jul 23 14:51:08 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 23 Jul 2008 14:51:08 GMT Subject: rpms/openssh/devel .cvsignore,1.21,1.22 sources,1.21,1.22 Message-ID: <200807231451.m6NEp8OT004447@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/openssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4385 Modified Files: .cvsignore sources Log Message: * Wed Jul 23 2008 Tomas Mraz - 5.1p1-1 - upgrade to new upstream release - fixed a problem with public key authentication and explicitely specified SELinux role Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 7 Apr 2008 20:14:31 -0000 1.21 +++ .cvsignore 23 Jul 2008 14:50:23 -0000 1.22 @@ -1 +1 @@ -openssh-5.0p1-noacss.tar.bz2 +openssh-5.1p1-noacss.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 7 Apr 2008 20:14:31 -0000 1.21 +++ sources 23 Jul 2008 14:50:23 -0000 1.22 @@ -1 +1 @@ -e39c15a5fb9036bd64256c78a6fbf394 openssh-5.0p1-noacss.tar.bz2 +5273579190b10f53baaf87f3c6eb0d73 openssh-5.1p1-noacss.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 14:58:22 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 14:58:22 GMT Subject: rpms/kdepim/devel .cvsignore, 1.50, 1.51 kdepim.spec, 1.180, 1.181 sources, 1.56, 1.57 Message-ID: <200807231458.m6NEwM5i005117@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5032 Modified Files: .cvsignore kdepim.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 18 Jul 2008 15:18:04 -0000 1.50 +++ .cvsignore 23 Jul 2008 14:57:35 -0000 1.51 @@ -1 +1,2 @@ kdepim-4.0.99.tar.bz2 +kdepim-4.1.0.tar.bz2 Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- kdepim.spec 18 Jul 2008 15:18:04 -0000 1.180 +++ kdepim.spec 23 Jul 2008 14:57:35 -0000 1.181 @@ -6,7 +6,7 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -176,6 +176,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 18 Jul 2008 15:18:04 -0000 1.56 +++ sources 23 Jul 2008 14:57:35 -0000 1.57 @@ -1 +1 @@ -19461421744e7d9117fa185d86b1b16f kdepim-4.0.99.tar.bz2 +6577e3ce8d6d078eddd59fe1529d1df6 kdepim-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 15:07:46 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 15:07:46 GMT Subject: rpms/kdepimlibs/devel .cvsignore, 1.24, 1.25 kdepimlibs.spec, 1.42, 1.43 sources, 1.24, 1.25 Message-ID: <200807231507.m6NF7kbd012288@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12250 Modified Files: .cvsignore kdepimlibs.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 18 Jul 2008 15:13:56 -0000 1.24 +++ .cvsignore 23 Jul 2008 15:07:01 -0000 1.25 @@ -1 +1,2 @@ kdepimlibs-4.0.99.tar.bz2 +kdepimlibs-4.1.0.tar.bz2 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- kdepimlibs.spec 18 Jul 2008 15:13:56 -0000 1.42 +++ kdepimlibs.spec 23 Jul 2008 15:07:01 -0000 1.43 @@ -1,4 +1,3 @@ - #ifarch noarch %if 0%{?fedora} > 8 # set this to 0 to disable -apidocs for a faster build @@ -14,7 +13,7 @@ Name: kdepimlibs -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries @@ -163,6 +162,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 18 Jul 2008 15:13:56 -0000 1.24 +++ sources 23 Jul 2008 15:07:01 -0000 1.25 @@ -1 +1 @@ -5fb63a94b4b07e906cb3c19483b99fdd kdepimlibs-4.0.99.tar.bz2 +b1eddf3b85a70a31f6a4385948b2a6cd kdepimlibs-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 15:17:08 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 15:17:08 GMT Subject: rpms/kdesdk/devel .cvsignore, 1.47, 1.48 kdesdk.spec, 1.110, 1.111 sources, 1.49, 1.50 Message-ID: <200807231517.m6NFH8pp012847@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdesdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12774 Modified Files: .cvsignore kdesdk.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 19 Jul 2008 06:01:08 -0000 1.47 +++ .cvsignore 23 Jul 2008 15:16:24 -0000 1.48 @@ -1 +1,2 @@ kdesdk-4.0.99.tar.bz2 +kdesdk-4.1.0.tar.bz2 Index: kdesdk.spec =================================================================== RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- kdesdk.spec 19 Jul 2008 06:31:28 -0000 1.110 +++ kdesdk.spec 23 Jul 2008 15:16:24 -0000 1.111 @@ -1,6 +1,5 @@ - Name: kdesdk -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) @@ -204,6 +203,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesdk/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 19 Jul 2008 06:01:08 -0000 1.49 +++ sources 23 Jul 2008 15:16:24 -0000 1.50 @@ -1 +1 @@ -b463aec4dbc6b2d73e200773aef81f2c kdesdk-4.0.99.tar.bz2 +eb4e7bc753c80f617c113f31ab501168 kdesdk-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 15:18:49 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 23 Jul 2008 15:18:49 GMT Subject: rpms/authd/devel authd.spec,1.51,1.52 Message-ID: <200807231518.m6NFInIm012915@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12865 Modified Files: authd.spec Log Message: Corrected config directive for ident.key to noreplace. Fixed some typos in specfile Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- authd.spec 29 Apr 2008 11:44:53 -0000 1.51 +++ authd.spec 23 Jul 2008 15:17:59 -0000 1.52 @@ -1,7 +1,7 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://fedorahosted.org/authd/ @@ -66,32 +66,36 @@ %files -f authd.lang %defattr(640,root,root,-) -%verify(not md5 size mtime user group) %config %{_sysconfdir}/ident.key +%verify(not md5 size mtime user group) %config(noreplace) %{_sysconfdir}/ident.key %defattr(-,root,root,-) %doc COPYING README.html rfc1413.txt %config(noreplace) %{_sysconfdir}/xinetd.d/auth %{_sbindir}/in.authd %changelog -* Tue Apr 29 2008 Roman Rakus - 1.4.3-20 +* Wed Jul 23 2008 Roman Rakus - 1.4.3-21 +- Corrected config directive for ident.key to noreplace +- Fixed some typos in specfile + +* Tue Apr 29 2008 Roman Rakus - 1.4.3-20 - another corrections of jiffies64 patch -* Wed Mar 26 2008 Roman Rakus - 1.4.3-19 +* Wed Mar 26 2008 Roman Rakus - 1.4.3-19 - corrected jiffies64 patch -* Thu Mar 6 2008 Roman Rakus - 1.4.3-18 +* Thu Mar 6 2008 Roman Rakus - 1.4.3-18 - corrected Source0 - corrected link in URL - source added to svn on fedorahosted -* Wed Mar 5 2008 Roman Rakus - 1.4.3-16 +* Wed Mar 5 2008 Roman Rakus - 1.4.3-16 - fixed Source0 -* Wed Mar 5 2008 Roman Rakus - 1.4.3-15 +* Wed Mar 5 2008 Roman Rakus - 1.4.3-15 - added dist tag - added URL -* Tue Feb 26 2008 Roman Rakus - 1.4.3-14 +* Tue Feb 26 2008 Roman Rakus - 1.4.3-14 - fix 234262 bug * Wed Feb 13 2008 Jan Safranek - 1.4.3-13 From fedora-extras-commits at redhat.com Wed Jul 23 15:32:34 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Wed, 23 Jul 2008 15:32:34 GMT Subject: comps comps-f10.xml.in,1.59,1.60 Message-ID: <200807231532.m6NFWYA1013389@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367 Modified Files: comps-f10.xml.in Log Message: make sure libcanberra-gtk2 gets installed by default so that we get new-style event sounds if they are enabled in GNOME Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- comps-f10.xml.in 23 Jul 2008 12:19:22 -0000 1.59 +++ comps-f10.xml.in 23 Jul 2008 15:32:04 -0000 1.60 @@ -1829,6 +1829,7 @@ pulseaudio-esound-compat pulseaudio-module-gconf pulseaudio-module-x11 + libcanberra-gtk2 tomboy vino xdg-user-dirs-gtk From fedora-extras-commits at redhat.com Wed Jul 23 15:41:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:41:07 +0000 Subject: [pkgdb] pyabiword was added for uwog Message-ID: <20080723154107.AFDAF1AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package pyabiword with summary Python bindings for libabiword Kevin Fenzi (kevin) has approved Package pyabiword Kevin Fenzi (kevin) has added a Fedora devel branch for pyabiword with an owner of uwog Kevin Fenzi (kevin) has approved pyabiword in Fedora devel Kevin Fenzi (kevin) has approved Package pyabiword Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyabiword (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyabiword (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyabiword (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on pyabiword (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on pyabiword (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on pyabiword (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyabiword From fedora-extras-commits at redhat.com Wed Jul 23 15:41:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:41:09 +0000 Subject: [pkgdb] pyabiword (Fedora, 9) updated by kevin Message-ID: <20080723154109.6530F1AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for pyabiword Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyabiword (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyabiword (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyabiword (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on pyabiword (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyabiword From fedora-extras-commits at redhat.com Wed Jul 23 15:41:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:41:09 +0000 Subject: [pkgdb] pyabiword (Fedora OLPC, 3) updated by kevin Message-ID: <20080723154109.A276B1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora OLPC 3 branch for pyabiword Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyabiword (Fedora OLPC 3) Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyabiword (Fedora OLPC 3) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyabiword (Fedora OLPC 3) Kevin Fenzi (kevin) Approved cvsextras for commit access on pyabiword (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyabiword From fedora-extras-commits at redhat.com Wed Jul 23 15:41:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:41:09 +0000 Subject: [pkgdb] pyabiword (Fedora, devel) updated by kevin Message-ID: <20080723154110.569861AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on pyabiword (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyabiword From fedora-extras-commits at redhat.com Wed Jul 23 15:41:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:41:31 GMT Subject: rpms/pyabiword - New directory Message-ID: <200807231541.m6NFfVWB013937@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyabiword In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA13891/rpms/pyabiword Log Message: Directory /cvs/extras/rpms/pyabiword added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:41:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:41:49 GMT Subject: rpms/pyabiword/devel - New directory Message-ID: <200807231541.m6NFfnf4013962@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyabiword/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA13891/rpms/pyabiword/devel Log Message: Directory /cvs/extras/rpms/pyabiword/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:42:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:42:03 GMT Subject: rpms/pyabiword Makefile,NONE,1.1 Message-ID: <200807231542.m6NFg3xG013992@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyabiword In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA13891/rpms/pyabiword Added Files: Makefile Log Message: Setup of module pyabiword --- NEW FILE Makefile --- # Top level Makefile for module pyabiword all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:42:17 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:42:17 GMT Subject: rpms/pyabiword/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231542.m6NFgHJN014007@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyabiword/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA13891/rpms/pyabiword/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pyabiword --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pyabiword # $Id: Makefile,v 1.1 2008/07/23 15:42:03 kevin Exp $ NAME := pyabiword SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 15:43:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:43:03 +0000 Subject: [pkgdb] perl-Apache2-SOAP was added for remi Message-ID: <20080723154303.678B81AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Apache2-SOAP with summary A replacement for Apache::SOAP designed to work with mod_perl 2 Kevin Fenzi (kevin) has approved Package perl-Apache2-SOAP Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Apache2-SOAP with an owner of remi Kevin Fenzi (kevin) has approved perl-Apache2-SOAP in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Apache2-SOAP Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Apache2-SOAP (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Apache2-SOAP (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Apache2-SOAP (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-Apache2-SOAP (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-Apache2-SOAP (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-Apache2-SOAP (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache2-SOAP From fedora-extras-commits at redhat.com Wed Jul 23 15:43:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:43:04 +0000 Subject: [pkgdb] perl-Apache2-SOAP (Fedora, 9) updated by kevin Message-ID: <20080723154304.EE19A1AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Apache2-SOAP Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Apache2-SOAP (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Apache2-SOAP (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Apache2-SOAP (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Apache2-SOAP (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache2-SOAP From fedora-extras-commits at redhat.com Wed Jul 23 15:43:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:43:04 +0000 Subject: [pkgdb] perl-Apache2-SOAP (Fedora, 8) updated by kevin Message-ID: <20080723154305.115A01AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Apache2-SOAP Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Apache2-SOAP (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Apache2-SOAP (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Apache2-SOAP (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Apache2-SOAP (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache2-SOAP From fedora-extras-commits at redhat.com Wed Jul 23 15:43:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:43:04 +0000 Subject: [pkgdb] perl-Apache2-SOAP (Fedora EPEL, 5) updated by kevin Message-ID: <20080723154305.6C6E41AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Apache2-SOAP Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Apache2-SOAP (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Apache2-SOAP (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Apache2-SOAP (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Apache2-SOAP (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache2-SOAP From fedora-extras-commits at redhat.com Wed Jul 23 15:43:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:43:04 +0000 Subject: [pkgdb] perl-Apache2-SOAP (Fedora, devel) updated by kevin Message-ID: <20080723154305.ABF371AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Apache2-SOAP (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache2-SOAP From fedora-extras-commits at redhat.com Wed Jul 23 15:43:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:43:40 GMT Subject: rpms/perl-Apache2-SOAP - New directory Message-ID: <200807231543.m6NFheRC014191@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Apache2-SOAP In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS14152/rpms/perl-Apache2-SOAP Log Message: Directory /cvs/extras/rpms/perl-Apache2-SOAP added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:43:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:43:56 GMT Subject: rpms/perl-Apache2-SOAP/devel - New directory Message-ID: <200807231543.m6NFhuRt014212@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Apache2-SOAP/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS14152/rpms/perl-Apache2-SOAP/devel Log Message: Directory /cvs/extras/rpms/perl-Apache2-SOAP/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:44:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:44:15 GMT Subject: rpms/perl-Apache2-SOAP Makefile,NONE,1.1 Message-ID: <200807231544.m6NFiFC5014246@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Apache2-SOAP In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS14152/rpms/perl-Apache2-SOAP Added Files: Makefile Log Message: Setup of module perl-Apache2-SOAP --- NEW FILE Makefile --- # Top level Makefile for module perl-Apache2-SOAP all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:44:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:44:20 +0000 Subject: [pkgdb] perl-Convert-BER was added for lkundrak Message-ID: <20080723154420.E11AA1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Convert-BER with summary ASN.1 Basic Encoding Rules Kevin Fenzi (kevin) has approved Package perl-Convert-BER Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Convert-BER with an owner of lkundrak Kevin Fenzi (kevin) has approved perl-Convert-BER in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Convert-BER Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Convert-BER (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Convert-BER (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Convert-BER (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-Convert-BER (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-Convert-BER (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-Convert-BER (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-BER From fedora-extras-commits at redhat.com Wed Jul 23 15:44:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:44:24 +0000 Subject: [pkgdb] perl-Convert-BER (Fedora, 9) updated by kevin Message-ID: <20080723154424.2F60C1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Convert-BER Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Convert-BER (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Convert-BER (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Convert-BER (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Convert-BER (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-BER From fedora-extras-commits at redhat.com Wed Jul 23 15:44:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:44:24 +0000 Subject: [pkgdb] perl-Convert-BER (Fedora, devel) updated by kevin Message-ID: <20080723154424.660801AD0E6@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Convert-BER (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-BER From fedora-extras-commits at redhat.com Wed Jul 23 15:44:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:44:24 +0000 Subject: [pkgdb] perl-Convert-BER (Fedora, 8) updated by kevin Message-ID: <20080723154424.48D511AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Convert-BER Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Convert-BER (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Convert-BER (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Convert-BER (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Convert-BER (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-BER From fedora-extras-commits at redhat.com Wed Jul 23 15:44:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:44:24 +0000 Subject: [pkgdb] perl-Convert-BER (Fedora EPEL, 5) updated by kevin Message-ID: <20080723154424.D660F1AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Convert-BER Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Convert-BER (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Convert-BER (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Convert-BER (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Convert-BER (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-BER From fedora-extras-commits at redhat.com Wed Jul 23 15:44:30 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:44:30 GMT Subject: rpms/perl-Apache2-SOAP/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231544.m6NFiUCG014269@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Apache2-SOAP/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS14152/rpms/perl-Apache2-SOAP/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Apache2-SOAP --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Apache2-SOAP # $Id: Makefile,v 1.1 2008/07/23 15:44:15 kevin Exp $ NAME := perl-Apache2-SOAP SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 15:45:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:45:05 GMT Subject: rpms/perl-Convert-BER - New directory Message-ID: <200807231545.m6NFj5bb014470@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Convert-BER In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14438/rpms/perl-Convert-BER Log Message: Directory /cvs/extras/rpms/perl-Convert-BER added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:45:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:45:20 GMT Subject: rpms/perl-Convert-BER/devel - New directory Message-ID: <200807231545.m6NFjK3l014484@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Convert-BER/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14438/rpms/perl-Convert-BER/devel Log Message: Directory /cvs/extras/rpms/perl-Convert-BER/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:45:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:45:35 GMT Subject: rpms/perl-Convert-BER Makefile,NONE,1.1 Message-ID: <200807231545.m6NFjZpF014512@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Convert-BER In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14438/rpms/perl-Convert-BER Added Files: Makefile Log Message: Setup of module perl-Convert-BER --- NEW FILE Makefile --- # Top level Makefile for module perl-Convert-BER all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:45:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:45:44 +0000 Subject: [pkgdb] blt (Fedora EPEL, 4) updated by kevin Message-ID: <20080723154544.A84301AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for blt Kevin Fenzi (kevin) has set commit to Approved for cvsextras on blt (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on blt (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on blt (Fedora EPEL 4) Kevin Fenzi (kevin) changed owner of blt in Fedora EPEL 4 to sergiopr Kevin Fenzi (kevin) approved watchbugzilla on blt (Fedora EPEL 4) for wart Kevin Fenzi (kevin) approved watchcommits on blt (Fedora EPEL 4) for wart To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/blt From fedora-extras-commits at redhat.com Wed Jul 23 15:45:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:45:44 +0000 Subject: [pkgdb] blt (Fedora EPEL, 5) updated by kevin Message-ID: <20080723154544.DE6031AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for blt Kevin Fenzi (kevin) has set commit to Approved for cvsextras on blt (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on blt (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on blt (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of blt in Fedora EPEL 5 to sergiopr Kevin Fenzi (kevin) approved watchbugzilla on blt (Fedora EPEL 5) for wart Kevin Fenzi (kevin) approved watchcommits on blt (Fedora EPEL 5) for wart To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/blt From fedora-extras-commits at redhat.com Wed Jul 23 15:45:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:45:57 GMT Subject: rpms/perl-Convert-BER/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231545.m6NFjv8f014539@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Convert-BER/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM14438/rpms/perl-Convert-BER/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Convert-BER --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Convert-BER # $Id: Makefile,v 1.1 2008/07/23 15:45:35 kevin Exp $ NAME := perl-Convert-BER SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 15:46:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:46:56 +0000 Subject: [pkgdb] tkcon (Fedora EPEL, 5) updated by kevin Message-ID: <20080723154656.5D0F11AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for tkcon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tkcon (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tkcon (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tkcon (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of tkcon in Fedora EPEL 5 to sergiopr Kevin Fenzi (kevin) approved watchbugzilla on tkcon (Fedora EPEL 5) for wart Kevin Fenzi (kevin) approved watchcommits on tkcon (Fedora EPEL 5) for wart To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tkcon From fedora-extras-commits at redhat.com Wed Jul 23 15:47:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:47:36 +0000 Subject: [pkgdb] tktable (Fedora EPEL, 5) updated by kevin Message-ID: <20080723154736.574BC1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for tktable Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tktable (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on tktable (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tktable (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of tktable in Fedora EPEL 5 to sergiopr Kevin Fenzi (kevin) approved watchbugzilla on tktable (Fedora EPEL 5) for wart Kevin Fenzi (kevin) approved watchcommits on tktable (Fedora EPEL 5) for wart To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tktable From fedora-extras-commits at redhat.com Wed Jul 23 15:47:50 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 15:47:50 GMT Subject: rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch, 1.2, 1.3 openoffice.org.spec, 1.1588, 1.1589 Message-ID: <200807231547.m6NFlovi014929@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14836 Modified Files: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch openoffice.org.spec Log Message: Resolves: rhbz#451708 ensure root certs are available for document signing openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch: Index: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch 20 Jun 2008 13:02:46 -0000 1.2 +++ openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch 23 Jul 2008 15:47:03 -0000 1.3 @@ -560,3 +560,31 @@ gid_File_Lib_Mysql_2, gid_File_Lib_Odbc_2, gid_File_Lib_Officebean, +Index: source/xmlsec/nss/seinitializer_nssimpl.cxx +=================================================================== +RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx,v +retrieving revision 1.21 +diff -u -r1.21 seinitializer_nssimpl.cxx +--- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 11 Apr 2008 00:38:31 -0000 1.21 ++++ openoffice.org/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 23 Jul 2008 15:36:20 -0000 +@@ -68,6 +68,7 @@ + #include "pk11func.h" + #ifdef SYSTEM_MOZILLA + #include "nssrenam.h" ++#include "secmod.h" + #endif + #include "cert.h" + #include "cryptohi.h" +@@ -104,6 +107,12 @@ + printf("%s",error); + return false ; + } ++ ++#if SYSTEM_MOZILLA ++ if (!SECMOD_HasRootCerts()) ++ SECMOD_AddNewModule("Root Certs", "libnssckbi.so", 0, 0); ++#endif ++ + initialized = 1 ; + } + Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1588 retrieving revision 1.1589 diff -u -r1.1588 -r1.1589 --- openoffice.org.spec 23 Jul 2008 09:51:27 -0000 1.1588 +++ openoffice.org.spec 23 Jul 2008 15:47:03 -0000 1.1589 @@ -3574,6 +3574,7 @@ %changelog * Wed Jul 23 2008 Caolan McNamara - 1:3.0.0-0.26-2 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch +- Resolves: rhbz#451708 ensure root certs are available for document signing * Tue Jul 22 2008 Caolan McNamara - 1:3.0.0-0.26-1 - next version From fedora-extras-commits at redhat.com Wed Jul 23 15:51:16 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 15:51:16 GMT Subject: rpms/kdetoys/devel .cvsignore, 1.24, 1.25 kdetoys.spec, 1.31, 1.32 sources, 1.22, 1.23 Message-ID: <200807231551.m6NFpGOe015148@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13846 Modified Files: .cvsignore kdetoys.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 19 Jul 2008 06:03:03 -0000 1.24 +++ .cvsignore 23 Jul 2008 15:50:25 -0000 1.25 @@ -1 +1,2 @@ kdetoys-4.0.99.tar.bz2 +kdetoys-4.1.0.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- kdetoys.spec 19 Jul 2008 06:03:03 -0000 1.31 +++ kdetoys.spec 23 Jul 2008 15:50:25 -0000 1.32 @@ -1,8 +1,7 @@ - Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -96,6 +95,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 Jul 2008 06:03:03 -0000 1.22 +++ sources 23 Jul 2008 15:50:25 -0000 1.23 @@ -1 +1 @@ -71de88592de156e861e0a68e628b9082 kdetoys-4.0.99.tar.bz2 +c8c9c2f66f65fc7acfa8060d08667406 kdetoys-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 15:51:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:51:40 +0000 Subject: [pkgdb] libspe2 was added for jroth Message-ID: <20080723155140.B93CD1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libspe2 with summary SPE Runtime Management Library Kevin Fenzi (kevin) has approved Package libspe2 Kevin Fenzi (kevin) has added a Fedora devel branch for libspe2 with an owner of jroth Kevin Fenzi (kevin) has approved libspe2 in Fedora devel Kevin Fenzi (kevin) has approved Package libspe2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libspe2 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libspe2 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libspe2 (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on libspe2 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on libspe2 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on libspe2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libspe2 From fedora-extras-commits at redhat.com Wed Jul 23 15:51:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:51:54 +0000 Subject: [pkgdb] libspe2 (Fedora, 9) updated by kevin Message-ID: <20080723155154.92CBB1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for libspe2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libspe2 (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libspe2 (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libspe2 (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on libspe2 (Fedora 9) for adrian Kevin Fenzi (kevin) approved watchcommits on libspe2 (Fedora 9) for adrian Kevin Fenzi (kevin) Approved cvsextras for commit access on libspe2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libspe2 From fedora-extras-commits at redhat.com Wed Jul 23 15:51:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:51:54 +0000 Subject: [pkgdb] libspe2 (Fedora, devel) updated by kevin Message-ID: <20080723155155.822B21AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on libspe2 (Fedora devel) for adrian Kevin Fenzi (kevin) approved watchcommits on libspe2 (Fedora devel) for adrian Kevin Fenzi (kevin) Approved cvsextras for commit access on libspe2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libspe2 From fedora-extras-commits at redhat.com Wed Jul 23 15:51:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:51:54 +0000 Subject: [pkgdb] libspe2 (Fedora EPEL, 5) updated by kevin Message-ID: <20080723155154.DAF921AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for libspe2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libspe2 (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libspe2 (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libspe2 (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on libspe2 (Fedora EPEL 5) for adrian Kevin Fenzi (kevin) approved watchcommits on libspe2 (Fedora EPEL 5) for adrian Kevin Fenzi (kevin) Approved cvsextras for commit access on libspe2 (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libspe2 From fedora-extras-commits at redhat.com Wed Jul 23 15:53:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:53:05 GMT Subject: rpms/libspe2 - New directory Message-ID: <200807231553.m6NFr5AO015313@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libspe2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15247/rpms/libspe2 Log Message: Directory /cvs/extras/rpms/libspe2 added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:53:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:53:14 +0000 Subject: [pkgdb] hunspell-sr was added for caolanm Message-ID: <20080723155315.6AE441AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package hunspell-sr with summary Serbian hunspell dictionaries Kevin Fenzi (kevin) has approved Package hunspell-sr Kevin Fenzi (kevin) has added a Fedora devel branch for hunspell-sr with an owner of caolanm Kevin Fenzi (kevin) has approved hunspell-sr in Fedora devel Kevin Fenzi (kevin) has approved Package hunspell-sr Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hunspell-sr (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on hunspell-sr (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hunspell-sr (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on hunspell-sr (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on hunspell-sr (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on hunspell-sr (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-sr From fedora-extras-commits at redhat.com Wed Jul 23 15:53:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:53:18 +0000 Subject: [pkgdb] hunspell-sr (Fedora, devel) updated by kevin Message-ID: <20080723155318.9E73C1AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on hunspell-sr (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-sr From fedora-extras-commits at redhat.com Wed Jul 23 15:53:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:53:18 GMT Subject: rpms/libspe2/devel - New directory Message-ID: <200807231553.m6NFrII2015339@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15247/rpms/libspe2/devel Log Message: Directory /cvs/extras/rpms/libspe2/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:53:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:53:18 +0000 Subject: [pkgdb] hunspell-sr (Fedora, 9) updated by kevin Message-ID: <20080723155319.5F3D91AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for hunspell-sr Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hunspell-sr (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on hunspell-sr (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hunspell-sr (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on hunspell-sr (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-sr From fedora-extras-commits at redhat.com Wed Jul 23 15:53:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 15:53:29 GMT Subject: rpms/perl-Razor-Agent/devel .cvsignore, 1.8, 1.9 perl-Razor-Agent.spec, 1.17, 1.18 sources, 1.8, 1.9 Message-ID: <200807231553.m6NFrTnX015377@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Razor-Agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15239 Modified Files: .cvsignore perl-Razor-Agent.spec sources Log Message: update to 2.85, fix licensing Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Aug 2007 16:15:12 -0000 1.8 +++ .cvsignore 23 Jul 2008 15:52:33 -0000 1.9 @@ -1 +1 @@ -razor-agents-2.84.tar.bz2 +razor-agents-2.85.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Razor-Agent.spec 7 Mar 2008 02:15:54 -0000 1.17 +++ perl-Razor-Agent.spec 23 Jul 2008 15:52:33 -0000 1.18 @@ -1,8 +1,8 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent -Version: 2.84 -Release: 4%{?dist} -License: Artistic +Version: 2.85 +Release: 1%{?dist} +License: Artistic 2.0 Group: Applications/Internet URL: http://razor.sourceforge.net/ Source: http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2 @@ -74,6 +74,9 @@ %{_mandir}/man*/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.85-1 +- update to 2.85, relicensed to Artistic 2.0 + * Thu Mar 06 2008 Tom "spot" Callaway - 2.84-4 Rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Aug 2007 16:15:12 -0000 1.8 +++ sources 23 Jul 2008 15:52:33 -0000 1.9 @@ -1 +1 @@ -8b9a11a6ce020383c32c45d1530d77c2 razor-agents-2.84.tar.bz2 +014d08db40187cb1316482191566b012 razor-agents-2.85.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 15:53:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:53:32 GMT Subject: rpms/libspe2 Makefile,NONE,1.1 Message-ID: <200807231553.m6NFrWVo015386@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libspe2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15247/rpms/libspe2 Added Files: Makefile Log Message: Setup of module libspe2 --- NEW FILE Makefile --- # Top level Makefile for module libspe2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:53:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:53:45 GMT Subject: rpms/libspe2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231553.m6NFrj1c015446@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15247/rpms/libspe2/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libspe2 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libspe2 # $Id: Makefile,v 1.1 2008/07/23 15:53:32 kevin Exp $ NAME := libspe2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 15:54:55 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 15:54:55 GMT Subject: rpms/kdeutils/devel .cvsignore, 1.50, 1.51 kdeutils.spec, 1.136, 1.137 sources, 1.53, 1.54 Message-ID: <200807231554.m6NFstjK015752@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdeutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15576 Modified Files: .cvsignore kdeutils.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 19 Jul 2008 06:03:18 -0000 1.50 +++ .cvsignore 23 Jul 2008 15:54:11 -0000 1.51 @@ -1 +1,2 @@ kdeutils-4.0.99.tar.bz2 +kdeutils-4.1.0.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- kdeutils.spec 21 Jul 2008 23:45:54 -0000 1.136 +++ kdeutils.spec 23 Jul 2008 15:54:11 -0000 1.137 @@ -9,8 +9,8 @@ Name: kdeutils Epoch: 6 -Version: 4.0.99 -Release: 1%{?dist}.1 +Version: 4.1.0 +Release: 1%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -208,6 +208,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Mon Jul 21 2008 Kevin Kofler 4.0.99-1.1 - reinclude kjots on F9 (moved to kdepim in 4.1, we don't ship kdepim 4 in F9) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeutils/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 19 Jul 2008 06:03:18 -0000 1.53 +++ sources 23 Jul 2008 15:54:11 -0000 1.54 @@ -1 +1 @@ -5114466bc392a2d4da9cdd9bcce5f4ea kdeutils-4.0.99.tar.bz2 +456d811618e5417e224476089df9a3b3 kdeutils-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 15:55:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:55:01 GMT Subject: rpms/hunspell-sr - New directory Message-ID: <200807231555.m6NFt1as015761@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/hunspell-sr In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15708/rpms/hunspell-sr Log Message: Directory /cvs/extras/rpms/hunspell-sr added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:55:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:55:14 GMT Subject: rpms/hunspell-sr/devel - New directory Message-ID: <200807231555.m6NFtEAq015809@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/hunspell-sr/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15708/rpms/hunspell-sr/devel Log Message: Directory /cvs/extras/rpms/hunspell-sr/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:55:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:55:28 GMT Subject: rpms/hunspell-sr Makefile,NONE,1.1 Message-ID: <200807231555.m6NFtSq7015841@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/hunspell-sr In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15708/rpms/hunspell-sr Added Files: Makefile Log Message: Setup of module hunspell-sr --- NEW FILE Makefile --- # Top level Makefile for module hunspell-sr all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:55:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:55:32 +0000 Subject: [pkgdb] fotowall was added for eponyme Message-ID: <20080723155532.2F33D1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package fotowall with summary Photo collection creativity tool Kevin Fenzi (kevin) has approved Package fotowall Kevin Fenzi (kevin) has added a Fedora devel branch for fotowall with an owner of eponyme Kevin Fenzi (kevin) has approved fotowall in Fedora devel Kevin Fenzi (kevin) has approved Package fotowall Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fotowall (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on fotowall (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fotowall (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on fotowall (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on fotowall (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on fotowall (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fotowall From fedora-extras-commits at redhat.com Wed Jul 23 15:55:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:55:36 +0000 Subject: [pkgdb] fotowall (Fedora, devel) updated by kevin Message-ID: <20080723155536.7AB641AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on fotowall (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fotowall From fedora-extras-commits at redhat.com Wed Jul 23 15:55:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:55:36 +0000 Subject: [pkgdb] fotowall (Fedora, 9) updated by kevin Message-ID: <20080723155536.AE4EA1AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for fotowall Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fotowall (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on fotowall (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fotowall (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on fotowall (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fotowall From fedora-extras-commits at redhat.com Wed Jul 23 15:55:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:55:44 GMT Subject: rpms/hunspell-sr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231555.m6NFti4L015856@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/hunspell-sr/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst15708/rpms/hunspell-sr/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-sr --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: hunspell-sr # $Id: Makefile,v 1.1 2008/07/23 15:55:28 kevin Exp $ NAME := hunspell-sr SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 15:56:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:56:08 GMT Subject: rpms/fotowall - New directory Message-ID: <200807231556.m6NFu8Ip015956@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotowall In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15925/rpms/fotowall Log Message: Directory /cvs/extras/rpms/fotowall added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:56:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:56:21 GMT Subject: rpms/fotowall/devel - New directory Message-ID: <200807231556.m6NFuLQj015977@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotowall/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15925/rpms/fotowall/devel Log Message: Directory /cvs/extras/rpms/fotowall/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:56:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:56:36 GMT Subject: rpms/fotowall Makefile,NONE,1.1 Message-ID: <200807231556.m6NFua2g016015@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotowall In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15925/rpms/fotowall Added Files: Makefile Log Message: Setup of module fotowall --- NEW FILE Makefile --- # Top level Makefile for module fotowall all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:56:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:56:49 GMT Subject: rpms/fotowall/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231556.m6NFunNG016038@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotowall/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15925/rpms/fotowall/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fotowall --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: fotowall # $Id: Makefile,v 1.1 2008/07/23 15:56:36 kevin Exp $ NAME := fotowall SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 15:57:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:57:21 +0000 Subject: [pkgdb] mon was added for lkundrak Message-ID: <20080723155721.45B3C1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package mon with summary General-purpose resource monitoring system Kevin Fenzi (kevin) has approved Package mon Kevin Fenzi (kevin) has added a Fedora devel branch for mon with an owner of lkundrak Kevin Fenzi (kevin) has approved mon in Fedora devel Kevin Fenzi (kevin) has approved Package mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mon (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mon (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mon (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on mon (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on mon (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on mon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mon From fedora-extras-commits at redhat.com Wed Jul 23 15:57:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:57:22 +0000 Subject: [pkgdb] mon (Fedora EPEL, 5) updated by kevin Message-ID: <20080723155722.7C8411AD0E6@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mon (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mon (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mon (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on mon (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mon From fedora-extras-commits at redhat.com Wed Jul 23 15:57:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:57:22 +0000 Subject: [pkgdb] mon (Fedora, 9) updated by kevin Message-ID: <20080723155722.4E3A11AD0E2@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mon (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mon (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mon (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on mon (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mon From fedora-extras-commits at redhat.com Wed Jul 23 15:57:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:57:22 +0000 Subject: [pkgdb] mon (Fedora, 8) updated by kevin Message-ID: <20080723155722.3A6131AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mon (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mon (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mon (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on mon (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mon From fedora-extras-commits at redhat.com Wed Jul 23 15:57:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:57:22 +0000 Subject: [pkgdb] mon (Fedora, devel) updated by kevin Message-ID: <20080723155722.DE64E1AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on mon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mon From fedora-extras-commits at redhat.com Wed Jul 23 15:57:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:57:56 GMT Subject: rpms/mon - New directory Message-ID: <200807231557.m6NFvuMQ016199@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mon In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16144/rpms/mon Log Message: Directory /cvs/extras/rpms/mon added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:58:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:58:15 GMT Subject: rpms/mon/devel - New directory Message-ID: <200807231558.m6NFwFx1016235@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mon/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16144/rpms/mon/devel Log Message: Directory /cvs/extras/rpms/mon/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:58:30 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:58:30 GMT Subject: rpms/mon Makefile,NONE,1.1 Message-ID: <200807231558.m6NFwUGh016287@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mon In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16144/rpms/mon Added Files: Makefile Log Message: Setup of module mon --- NEW FILE Makefile --- # Top level Makefile for module mon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:58:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:58:45 GMT Subject: rpms/mon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231558.m6NFwjaF016362@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mon/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16144/rpms/mon/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mon --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mon # $Id: Makefile,v 1.1 2008/07/23 15:58:31 kevin Exp $ NAME := mon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 15:58:53 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 15:58:53 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1589,1.1590 Message-ID: <200807231558.m6NFwrJb016521@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16220 Modified Files: openoffice.org.spec Log Message: hunspell-sr Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1589 retrieving revision 1.1590 diff -u -r1.1589 -r1.1590 --- openoffice.org.spec 23 Jul 2008 15:47:03 -0000 1.1589 +++ openoffice.org.spec 23 Jul 2008 15:58:08 -0000 1.1590 @@ -978,6 +978,7 @@ Summary: Serbian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: hunspell-sr Obsoletes: openoffice.org2-langpack-sr_CS Obsoletes: openoffice.org-langpack-sr_CS From fedora-extras-commits at redhat.com Wed Jul 23 15:59:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:59:08 +0000 Subject: [pkgdb] flute was added for caolanm Message-ID: <20080723155908.B1B3C1AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package flute with summary Java CSS parser Kevin Fenzi (kevin) has approved Package flute Kevin Fenzi (kevin) has added a Fedora devel branch for flute with an owner of caolanm Kevin Fenzi (kevin) has approved flute in Fedora devel Kevin Fenzi (kevin) has approved Package flute Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flute (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on flute (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flute (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on flute (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on flute (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on flute (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/flute From fedora-extras-commits at redhat.com Wed Jul 23 15:59:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:59:09 +0000 Subject: [pkgdb] flute (Fedora, devel) updated by kevin Message-ID: <20080723155909.80FB31AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on flute (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/flute From fedora-extras-commits at redhat.com Wed Jul 23 15:59:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:59:26 GMT Subject: rpms/flute - New directory Message-ID: <200807231559.m6NFxQEk016654@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/flute In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB16589/rpms/flute Log Message: Directory /cvs/extras/rpms/flute added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:59:30 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 15:59:30 GMT Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.3, 1.4 kdeplasma-addons.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807231559.m6NFxUVW016669@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdeplasma-addons/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356 Modified Files: .cvsignore kdeplasma-addons.spec sources Log Message: 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jul 2008 06:00:19 -0000 1.3 +++ .cvsignore 23 Jul 2008 15:58:45 -0000 1.4 @@ -1 +1,2 @@ kdeplasma-addons-4.0.99.tar.bz2 +kdeplasma-addons-4.1.0.tar.bz2 Index: kdeplasma-addons.spec =================================================================== RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdeplasma-addons.spec 19 Jul 2008 06:28:28 -0000 1.3 +++ kdeplasma-addons.spec 23 Jul 2008 15:58:45 -0000 1.4 @@ -1,6 +1,5 @@ - Name: kdeplasma-addons -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: Additional plasmoids for KDE @@ -93,6 +92,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jul 2008 06:00:19 -0000 1.3 +++ sources 23 Jul 2008 15:58:45 -0000 1.4 @@ -1 +1 @@ -a0ff769d85d748008201fd2dfb966bf7 kdeplasma-addons-4.0.99.tar.bz2 +c67db067de416209fd63ff0deea44510 kdeplasma-addons-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 15:59:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:59:39 GMT Subject: rpms/flute/devel - New directory Message-ID: <200807231559.m6NFxdBE016681@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/flute/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB16589/rpms/flute/devel Log Message: Directory /cvs/extras/rpms/flute/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 15:59:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 15:59:51 GMT Subject: rpms/flute Makefile,NONE,1.1 Message-ID: <200807231559.m6NFxpJT016762@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/flute In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB16589/rpms/flute Added Files: Makefile Log Message: Setup of module flute --- NEW FILE Makefile --- # Top level Makefile for module flute all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 15:59:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 15:59:53 +0000 Subject: [pkgdb] phonon (Fedora, 8) updated by kevin Message-ID: <20080723155953.21B841AD0E1@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for phonon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on phonon (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on phonon (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on phonon (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Wed Jul 23 16:00:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 16:00:04 GMT Subject: rpms/flute/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231600.m6NG04g3016807@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/flute/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB16589/rpms/flute/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module flute --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: flute # $Id: Makefile,v 1.1 2008/07/23 15:59:51 kevin Exp $ NAME := flute SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 16:01:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 16:01:11 +0000 Subject: [pkgdb] perl-DBIx-Class-Schema-Loader was added for cweyl Message-ID: <20080723160111.CBCA31AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-DBIx-Class-Schema-Loader with summary Dynamic definition of a DBIx::Class::Schema Kevin Fenzi (kevin) has approved Package perl-DBIx-Class-Schema-Loader Kevin Fenzi (kevin) has added a Fedora devel branch for perl-DBIx-Class-Schema-Loader with an owner of cweyl Kevin Fenzi (kevin) has approved perl-DBIx-Class-Schema-Loader in Fedora devel Kevin Fenzi (kevin) has approved Package perl-DBIx-Class-Schema-Loader Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-DBIx-Class-Schema-Loader (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-DBIx-Class-Schema-Loader (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-DBIx-Class-Schema-Loader (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader From fedora-extras-commits at redhat.com Wed Jul 23 16:01:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 16:01:14 +0000 Subject: [pkgdb] perl-DBIx-Class-Schema-Loader (Fedora, 8) updated by kevin Message-ID: <20080723160114.5035F1AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-DBIx-Class-Schema-Loader Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on perl-DBIx-Class-Schema-Loader (Fedora 8) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-DBIx-Class-Schema-Loader (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader From fedora-extras-commits at redhat.com Wed Jul 23 16:01:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 16:01:14 +0000 Subject: [pkgdb] perl-DBIx-Class-Schema-Loader (Fedora, 9) updated by kevin Message-ID: <20080723160115.0F4811AD0DC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-DBIx-Class-Schema-Loader Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DBIx-Class-Schema-Loader (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on perl-DBIx-Class-Schema-Loader (Fedora 9) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-DBIx-Class-Schema-Loader (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader From fedora-extras-commits at redhat.com Wed Jul 23 16:01:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 16:01:14 +0000 Subject: [pkgdb] perl-DBIx-Class-Schema-Loader (Fedora, devel) updated by kevin Message-ID: <20080723160114.833F81AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on perl-DBIx-Class-Schema-Loader (Fedora devel) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-DBIx-Class-Schema-Loader (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-Schema-Loader From fedora-extras-commits at redhat.com Wed Jul 23 16:01:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:01:25 GMT Subject: rpms/gnome-applet-vm/devel gnome-applet-vm.spec,1.18,1.19 Message-ID: <200807231601.m6NG1PTa023586@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16915 Modified Files: gnome-applet-vm.spec Log Message: fix license tag Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gnome-applet-vm.spec 3 Mar 2008 14:08:54 -0000 1.18 +++ gnome-applet-vm.spec 23 Jul 2008 16:00:37 -0000 1.19 @@ -1,8 +1,9 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +# No license attribution in code, only COPYING. +License: GPL+ Group: User Interface/Desktops %define upstreamname %{name}-%{version}-rc1 Source: http://people.redhat.com/kzak/gnome-applet-vm/v0.2/%{upstreamname}.tar.bz2 @@ -98,6 +99,9 @@ %config %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Wed Jul 23 2008 Tom "spot" Callaway 0.2.0-3 +- fix license tag + * Mon Mar 3 2008 Karel Zak 0.2.0-2 - update tarball (forgot -rc1 suffix) - fix URL and Source: From fedora-extras-commits at redhat.com Wed Jul 23 16:01:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 16:01:39 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader - New directory Message-ID: <200807231601.m6NG1dsp023689@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr23559/rpms/perl-DBIx-Class-Schema-Loader Log Message: Directory /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 16:01:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 16:01:58 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader/devel - New directory Message-ID: <200807231601.m6NG1wkO023722@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr23559/rpms/perl-DBIx-Class-Schema-Loader/devel Log Message: Directory /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 23 16:02:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 16:02:12 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader Makefile,NONE,1.1 Message-ID: <200807231602.m6NG2Cfv023768@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr23559/rpms/perl-DBIx-Class-Schema-Loader Added Files: Makefile Log Message: Setup of module perl-DBIx-Class-Schema-Loader --- NEW FILE Makefile --- # Top level Makefile for module perl-DBIx-Class-Schema-Loader all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 23 16:02:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 23 Jul 2008 16:02:27 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807231602.m6NG2R1N023796@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr23559/rpms/perl-DBIx-Class-Schema-Loader/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-DBIx-Class-Schema-Loader --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-DBIx-Class-Schema-Loader # $Id: Makefile,v 1.1 2008/07/23 16:02:12 kevin Exp $ NAME := perl-DBIx-Class-Schema-Loader SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 23 16:05:01 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Wed, 23 Jul 2008 16:05:01 GMT Subject: rpms/perl-Apache2-SOAP/devel perl-Apache2-SOAP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231605.m6NG5136024149@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Apache2-SOAP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24097 Modified Files: .cvsignore sources Added Files: perl-Apache2-SOAP.spec Log Message: new package --- NEW FILE perl-Apache2-SOAP.spec --- %define perlname Apache2-SOAP Name: perl-Apache2-SOAP Version: 0.73 Release: 1%{?dist} Summary: A replacement for Apache::SOAP designed to work with mod_perl 2 Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Apache2-SOAP/ Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKOBES/%{perlname}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::More) BuildRequires: perl(ExtUtils::MakeMaker) # perl(ModPerl::MM) is provided by mod_perl on EL5, by mod_perl-devel on Fedora #BuildRequires: perl(ModPerl::MM) # BR for test BuildRequires: httpd, mod_perl-devel, perl(SOAP::Lite), perl(LWP::UserAgent) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This Apache Perl module provides the ability to add support for SOAP (Simple Object Access Protocol) protocol with easy configuration (either in .conf or in .htaccess file). This functionality should give you lightweight option for hosting SOAP services and greatly simplify configuration aspects. This module inherites functionality from SOAP::Transport::HTTP2::Apache component of SOAP::Lite module. %prep %setup -q -n %{perlname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -print find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -print chmod -R u+rwX,go+rX,go-w %{buildroot}/* %clean rm -rf %{buildroot} %check APACHE_TEST_HTTPD=%{_sbindir}/httpd make test %files %defattr(-, root, root, -) %doc Changes README %{_mandir}/man3/Apache* %{perl_vendorlib}/Apache2 %{perl_vendorlib}/SOAP/Transport/HTTP2.pm %changelog * Tue Jul 22 2008 Remi Collet 0.73-1 - initial spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Apache2-SOAP/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:44:15 -0000 1.1 +++ .cvsignore 23 Jul 2008 16:04:13 -0000 1.2 @@ -0,0 +1 @@ +Apache2-SOAP-0.73.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Apache2-SOAP/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:44:15 -0000 1.1 +++ sources 23 Jul 2008 16:04:13 -0000 1.2 @@ -0,0 +1 @@ +e0c376abd24b9b494d0ee60b8eeecefb Apache2-SOAP-0.73.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 16:13:06 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Wed, 23 Jul 2008 16:13:06 GMT Subject: rpms/perl-Apache2-SOAP/EL-5 perl-Apache2-SOAP.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807231613.m6NGD6UI024614@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Apache2-SOAP/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24565 Modified Files: sources Added Files: perl-Apache2-SOAP.spec Log Message: new package --- NEW FILE perl-Apache2-SOAP.spec --- %define perlname Apache2-SOAP Name: perl-Apache2-SOAP Version: 0.73 Release: 1%{?dist} Summary: A replacement for Apache::SOAP designed to work with mod_perl 2 Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Apache2-SOAP/ Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKOBES/%{perlname}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::More) BuildRequires: perl(ExtUtils::MakeMaker) # perl(ModPerl::MM) is provided by mod_perl on EL5, by mod_perl-devel on Fedora #BuildRequires: perl(ModPerl::MM) # BR for test BuildRequires: httpd, mod_perl-devel, perl(SOAP::Lite), perl(LWP::UserAgent) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This Apache Perl module provides the ability to add support for SOAP (Simple Object Access Protocol) protocol with easy configuration (either in .conf or in .htaccess file). This functionality should give you lightweight option for hosting SOAP services and greatly simplify configuration aspects. This module inherites functionality from SOAP::Transport::HTTP2::Apache component of SOAP::Lite module. %prep %setup -q -n %{perlname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -print find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -print chmod -R u+rwX,go+rX,go-w %{buildroot}/* %clean rm -rf %{buildroot} %check APACHE_TEST_HTTPD=%{_sbindir}/httpd make test %files %defattr(-, root, root, -) %doc Changes README %{_mandir}/man3/Apache* %{perl_vendorlib}/Apache2 %{perl_vendorlib}/SOAP/Transport/HTTP2.pm %changelog * Tue Jul 22 2008 Remi Collet 0.73-1 - initial spec Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Apache2-SOAP/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:44:15 -0000 1.1 +++ sources 23 Jul 2008 16:12:21 -0000 1.2 @@ -0,0 +1 @@ +e0c376abd24b9b494d0ee60b8eeecefb Apache2-SOAP-0.73.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 16:14:50 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 16:14:50 GMT Subject: rpms/kdelibs/devel kdelibs-4.1.0-parallel_devel.patch, NONE, 1.1 kdelibs.spec, 1.351, 1.352 Message-ID: <200807231614.m6NGEoDJ024750@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24676 Modified Files: kdelibs.spec Added Files: kdelibs-4.1.0-parallel_devel.patch Log Message: kdelibs-4.1.0-parallel_devel.patch kdelibs-4.1.0-parallel_devel.patch: --- NEW FILE kdelibs-4.1.0-parallel_devel.patch --- diff -up kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-23 10:26:30.000000000 +0200 +++ kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake 2008-07-23 18:11:28.000000000 +0200 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: # -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable -# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable +# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable # # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: @@ -124,7 +124,7 @@ # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) -# Use this to add widget description files for the makekdewidgets code generator +# Use this to add widget description files for the makekdewidgets4 code generator # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) @@ -307,23 +307,23 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) # when building kdelibs, make the kcfg rules depend on the binaries... - set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) - set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) + set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) + set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) @@ -372,69 +372,69 @@ else (_kdeBootStrapping) include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) if (UNIX) - find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) - find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) - find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) if (UNIX) - find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) # Can't do that, it's not always compiled. @@ -453,14 +453,14 @@ else (_kdeBootStrapping) # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -708,7 +708,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY "${_CMAKE_INSTALL_DIR}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) -set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} +set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel" + ${CMAKE_SYSTEM_LIBRARY_PATH} "${KDE4_LIB_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) @@ -1108,9 +1109,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") else(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") + message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) diff -up kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh --- kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200 +++ kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh 2008-07-23 18:01:48.000000000 +0200 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # -kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" +kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" if test -z "$kcfg_compiler"; then - echo "kconfig_compiler not found!" + echo "kconfig_compiler4 not found!" exit 1; fi diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl --- kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200 +++ kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-23 18:01:48.000000000 +0200 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; -$cmd = "./kconfig_compiler $file $kcfgc"; +$cmd = "./kconfig_compiler4 $file $kcfgc"; #print "CMD $cmd\n"; if ( system( $cmd ) != 0 ) { - print STDERR "Unable to run kconfig_compiler\n"; + print STDERR "Unable to run kconfig_compiler4\n"; exit 1; } diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt --- kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:09:13.000000000 +0200 +++ kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -8,11 +8,11 @@ add_subdirectory( example ) set(kconfig_compiler_SRCS kconfig_compiler.cpp) -kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) +target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} ) ########### install files ############### diff -up kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt --- kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200 +++ kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) diff -up kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdewidgets/CMakeLists.txt --- kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 13:08:17.000000000 +0200 +++ kdelibs-4.1.0/kdewidgets/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -16,22 +16,22 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) -kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) +target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) -install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} ) ########### next target ############### # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) -get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT) +get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets - MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets) + MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4) set(kdewidgets_PART_SRCS classpreviews.cpp Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- kdelibs.spec 23 Jul 2008 14:25:23 -0000 1.351 +++ kdelibs.spec 23 Jul 2008 16:14:00 -0000 1.352 @@ -50,7 +50,7 @@ Source2: kde4.csh # make -devel packages parallel-installable -Patch0: kdelibs-4.0.98-parallel_devel.patch +Patch0: kdelibs-4.1.0-parallel_devel.patch # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Hunspell support for K3Spell From fedora-extras-commits at redhat.com Wed Jul 23 16:14:53 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Wed, 23 Jul 2008 16:14:53 GMT Subject: rpms/perl-Apache2-SOAP/F-9 perl-Apache2-SOAP.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807231614.m6NGErr4024766@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Apache2-SOAP/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24688 Modified Files: sources Added Files: perl-Apache2-SOAP.spec Log Message: new package --- NEW FILE perl-Apache2-SOAP.spec --- %define perlname Apache2-SOAP Name: perl-Apache2-SOAP Version: 0.73 Release: 1%{?dist} Summary: A replacement for Apache::SOAP designed to work with mod_perl 2 Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Apache2-SOAP/ Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKOBES/%{perlname}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::More) BuildRequires: perl(ExtUtils::MakeMaker) # perl(ModPerl::MM) is provided by mod_perl on EL5, by mod_perl-devel on Fedora #BuildRequires: perl(ModPerl::MM) # BR for test BuildRequires: httpd, mod_perl-devel, perl(SOAP::Lite), perl(LWP::UserAgent) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This Apache Perl module provides the ability to add support for SOAP (Simple Object Access Protocol) protocol with easy configuration (either in .conf or in .htaccess file). This functionality should give you lightweight option for hosting SOAP services and greatly simplify configuration aspects. This module inherites functionality from SOAP::Transport::HTTP2::Apache component of SOAP::Lite module. %prep %setup -q -n %{perlname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -print find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -print chmod -R u+rwX,go+rX,go-w %{buildroot}/* %clean rm -rf %{buildroot} %check APACHE_TEST_HTTPD=%{_sbindir}/httpd make test %files %defattr(-, root, root, -) %doc Changes README %{_mandir}/man3/Apache* %{perl_vendorlib}/Apache2 %{perl_vendorlib}/SOAP/Transport/HTTP2.pm %changelog * Tue Jul 22 2008 Remi Collet 0.73-1 - initial spec Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Apache2-SOAP/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:44:15 -0000 1.1 +++ sources 23 Jul 2008 16:14:09 -0000 1.2 @@ -0,0 +1 @@ +e0c376abd24b9b494d0ee60b8eeecefb Apache2-SOAP-0.73.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 16:20:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:20:10 GMT Subject: rpms/gnome-applets/devel gnome-applets.spec,1.288,1.289 Message-ID: <200807231620.m6NGKAB3025157@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-applets/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25093 Modified Files: gnome-applets.spec Log Message: fix license tag Index: gnome-applets.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.288 retrieving revision 1.289 diff -u -r1.288 -r1.289 --- gnome-applets.spec 19 Jun 2008 01:52:23 -0000 1.288 +++ gnome-applets.spec 23 Jul 2008 16:19:16 -0000 1.289 @@ -35,9 +35,9 @@ Summary: Small applications for the GNOME panel Name: gnome-applets Version: 2.23.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 -License: GPLv2+ and GFDL+ +License: GPLv2+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ Source: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2 @@ -319,6 +319,9 @@ %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 1:2.23.3-3 +- fix license tag + * Wed Jun 18 2008 Matthias Clasen - 1:2.23.3-1 - Update to 2.23.3 From fedora-extras-commits at redhat.com Wed Jul 23 16:24:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:24:48 GMT Subject: rpms/gnome-audio/devel gnome-audio.spec,1.18,1.19 Message-ID: <200807231624.m6NGOmEi025438@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-audio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25376 Modified Files: gnome-audio.spec Log Message: fix license tag Index: gnome-audio.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-audio/devel/gnome-audio.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gnome-audio.spec 6 May 2008 14:49:25 -0000 1.18 +++ gnome-audio.spec 23 Jul 2008 16:24:02 -0000 1.19 @@ -1,8 +1,8 @@ Summary: Sounds for GNOME events. Name: gnome-audio Version: 2.22.2 -Release: 1%{?dist} -License: LGPL +Release: 2%{?dist} +License: CC-BY and CC-BY-SA Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-audio/2.22/gnome-audio-%{version}.tar.bz2 BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +62,9 @@ %{_datadir}/sounds/card_shuffle.wav %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.22.2-2 +- fix license tag + * Tue May 06 2008 - Bastien Nocera - 2.22.2-1 - Update to 2.22.2 From fedora-extras-commits at redhat.com Wed Jul 23 16:25:46 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Wed, 23 Jul 2008 16:25:46 GMT Subject: rpms/perl-Apache2-SOAP/F-8 perl-Apache2-SOAP.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807231625.m6NGPkM5025554@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Apache2-SOAP/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503 Modified Files: sources Added Files: perl-Apache2-SOAP.spec Log Message: new package --- NEW FILE perl-Apache2-SOAP.spec --- %define perlname Apache2-SOAP Name: perl-Apache2-SOAP Version: 0.73 Release: 1%{?dist} Summary: A replacement for Apache::SOAP designed to work with mod_perl 2 Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Apache2-SOAP/ Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKOBES/%{perlname}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::More) BuildRequires: perl(ExtUtils::MakeMaker) # perl(ModPerl::MM) is provided by mod_perl on EL5, by mod_perl-devel on Fedora #BuildRequires: perl(ModPerl::MM) # BR for test BuildRequires: httpd, mod_perl-devel, perl(SOAP::Lite), perl(LWP::UserAgent) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This Apache Perl module provides the ability to add support for SOAP (Simple Object Access Protocol) protocol with easy configuration (either in .conf or in .htaccess file). This functionality should give you lightweight option for hosting SOAP services and greatly simplify configuration aspects. This module inherites functionality from SOAP::Transport::HTTP2::Apache component of SOAP::Lite module. %prep %setup -q -n %{perlname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -print find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -print chmod -R u+rwX,go+rX,go-w %{buildroot}/* %clean rm -rf %{buildroot} %check APACHE_TEST_HTTPD=%{_sbindir}/httpd make test %files %defattr(-, root, root, -) %doc Changes README %{_mandir}/man3/Apache* %{perl_vendorlib}/Apache2 %{perl_vendorlib}/SOAP/Transport/HTTP2.pm %changelog * Tue Jul 22 2008 Remi Collet 0.73-1 - initial spec Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Apache2-SOAP/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:44:15 -0000 1.1 +++ sources 23 Jul 2008 16:24:58 -0000 1.2 @@ -0,0 +1 @@ +e0c376abd24b9b494d0ee60b8eeecefb Apache2-SOAP-0.73.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 16:26:59 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 16:26:59 GMT Subject: rpms/qt/devel qt-copy-kde#162793.patch,1.1,NONE Message-ID: <200807231626.m6NGQx8T025715@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25698/devel Removed Files: qt-copy-kde#162793.patch Log Message: Remove unused patch. --- qt-copy-kde#162793.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 16:27:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:27:06 GMT Subject: rpms/gnome-compiz-manager/devel gnome-compiz-manager.spec,1.5,1.6 Message-ID: <200807231627.m6NGR6LS025727@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-compiz-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25633 Modified Files: gnome-compiz-manager.spec Log Message: fix license tag Index: gnome-compiz-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-compiz-manager/devel/gnome-compiz-manager.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-compiz-manager.spec 19 Feb 2008 07:15:43 -0000 1.5 +++ gnome-compiz-manager.spec 23 Jul 2008 16:26:17 -0000 1.6 @@ -1,10 +1,10 @@ Name: gnome-compiz-manager Version: 0.10.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compiz configuration utility Group: User Interface/Desktops -License: GPL +License: GPLv2+ URL: http://gandalfn.wordpress.com/gnome-compiz-manager/ Source0: http://download.gna.org/gcm/gnome-compiz-manager/gnome-compiz-manager-%{version}.tar.gz Source1: desktop.png @@ -128,6 +128,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 0.10.4-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.10.4-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 23 16:28:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:28:13 GMT Subject: rpms/gnome-games/devel gnome-games.spec,1.178,1.179 Message-ID: <200807231628.m6NGSD8h025847@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25780 Modified Files: gnome-games.spec Log Message: fix license tag Index: gnome-games.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- gnome-games.spec 22 Jul 2008 18:04:43 -0000 1.178 +++ gnome-games.spec 23 Jul 2008 16:27:20 -0000 1.179 @@ -44,9 +44,9 @@ Summary: GNOME games Name: gnome-games Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 -License: GPLv2+ and GFDL+ +License: GPLv2+ and GFDL Group: Amusements/Games Source: http://download.gnome.org/sources/gnome-games/2.23/gnome-games-%{version}.tar.bz2 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch @@ -335,6 +335,9 @@ %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 1:2.23.5-2 +- fix license tag + * Tue Jul 22 2008 Matthias Clasen - 1:2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Wed Jul 23 16:28:59 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 16:28:59 GMT Subject: rpms/qt4/F-8 .cvsignore, 1.25, 1.26 qt4.spec, 1.82, 1.83 sources, 1.21, 1.22 Message-ID: <200807231628.m6NGSxFa025982@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25823/F-8 Modified Files: .cvsignore qt4.spec sources Log Message: Sync from qt/devel: * Wed Jul 23 2008 Rex Dieter 4.4.0-16 - qt-copy-patches-20080723 (kde#162793) - omit deprecated phonon bits Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 19 Jul 2008 11:50:28 -0000 1.25 +++ .cvsignore 23 Jul 2008 16:27:52 -0000 1.26 @@ -1,4 +1,4 @@ hi128-app-qt4-logo.png hi48-app-qt4-logo.png qt-x11-opensource-src-4.4.0.tar.bz2 -qt-copy-patches-20080711svn.tar.bz2 +qt-copy-patches-20080723svn.tar.bz2 Index: qt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- qt4.spec 19 Jul 2008 14:39:05 -0000 1.82 +++ qt4.spec 23 Jul 2008 16:27:52 -0000 1.83 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 14%{?dist} +Release: 16%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -39,7 +39,7 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch ## qt-copy patches -%define qt_copy 20080711 +%define qt_copy 20080723 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -65,8 +65,6 @@ %define odbc -plugin-sql-odbc %define psql -plugin-sql-psql %define sqlite -plugin-sql-sqlite -# FIXME: building -no-phonon currently busted, build fails -- Rex -#define phonon -phonon -gstreamer %define webkit -webkit #define nas -system-nas-sound @@ -111,7 +109,6 @@ BuildRequires: zlib-devel BuildRequires: glib2-devel BuildRequires: openssl-devel -%{?phonon:BuildRequires: gstreamer-devel >= 0.10.12, gstreamer-plugins-base-devel} ## In theory, should be as simple as: #define x_deps libGL-devel libGLU-devel @@ -228,16 +225,6 @@ %description mysql %{summary}. -%package phonon-devel -Summary: Phonon development files for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -# FIXME -Conflicts: kdelibs4-devel < 4.1 - -%description phonon-devel -%{summary}. - %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries @@ -288,11 +275,7 @@ %prep -%if "%{?snap:1}" == "1" -%setup -q -n qt-x11-opensource-src-%{vesion}-%{snap} -%else %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2} -%endif %if 0%{?qt_copy:1} test -x apply_patches && ./apply_patches @@ -370,6 +353,7 @@ -no-rpath \ -reduce-relocations \ -no-separate-debug-info \ + -no-phonon -no-gstreamer \ -sm \ -stl \ -system-libmng \ @@ -388,9 +372,7 @@ -glib \ -openssl-linked \ -xmlpatterns \ - %{?phonon} %{!?phonon:-no-phonon } \ %{?dbus} %{!?dbus:-no-dbus} \ - %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ %{?webkit} %{!?webkit:-no-webkit } \ %{?nas} \ %{?mysql} \ @@ -584,7 +566,6 @@ %files %defattr(-,root,root,-) %doc README* -%{!?snap:%doc OPENSOURCE-NOTICE.TXT} %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT %doc LICENSE.GPL3 %doc LICENSE.QPL @@ -640,7 +621,6 @@ %{_qt4_libdir}/libQtOpenGL.so.* %{_qt4_libdir}/libQtSvg.so.* %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*} -%{?phonon:%{_qt4_libdir}/libphonon.so.*} %{_qt4_plugindir}/* %exclude %{_qt4_plugindir}/designer %exclude %{_qt4_plugindir}/sqldrivers @@ -697,8 +677,6 @@ %dir %{_qt4_headerdir}/ %endif %{_qt4_headerdir}/* -%{?phonon:%exclude %{_qt4_headerdir}/phonon/} -%{?phonon:%exclude %{_qt4_headerdir}/Qt/phonon*} %{_qt4_datadir}/mkspecs/ %if "%{_qt4_datadir}" != "%{_qt4_prefix}" %{_qt4_prefix}/mkspecs/ @@ -709,7 +687,6 @@ %{_qt4_libdir}/libQt*.a %{_qt4_libdir}/libQt*.prl %{_libdir}/pkgconfig/*.pc -%{?phonon:%exclude %{_libdir}/pkgconfig/phonon.pc} # Qt designer %{_qt4_bindir}/designer* %{_qt4_plugindir}/designer/ @@ -737,16 +714,6 @@ %endif %{_datadir}/applications/*qtdemo*.desktop -%if 0%{?phonon:1} -%files phonon-devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/phonon.pc -%{_qt4_headerdir}/phonon/ -%{_qt4_headerdir}/Qt/phonon* -%{_qt4_libdir}/libphonon.so -%{_qt4_libdir}/libphonon.prl -%endif - %if "%{?odbc}" == "-plugin-sql-odbc" %files odbc %defattr(-,root,root,-) @@ -773,6 +740,13 @@ %changelog +* Wed Jul 23 2008 Rex Dieter 4.4.0-16 +- qt-copy-patches-20080723 (kde#162793) +- omit deprecated phonon bits + +* Sat Jul 19 2008 Rex Dieter 4.4.0-15 +- fix/workaround spec syntax + * Sat Jul 19 2008 Rex Dieter 4.4.0-14 - macros.qt4: fix %%_qt4_datadir, %%_qt4_translationdir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt4/F-8/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 19 Jul 2008 11:50:28 -0000 1.21 +++ sources 23 Jul 2008 16:27:52 -0000 1.22 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png 03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2 -7cf6bdbd220fb8915f8d875442e29961 qt-copy-patches-20080711svn.tar.bz2 +bb7e7e6aa739c0c87e3cb3dbfe0fa814 qt-copy-patches-20080723svn.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 16:29:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:29:50 GMT Subject: rpms/gnome-launch-box/devel gnome-launch-box.spec,1.13,1.14 Message-ID: <200807231629.m6NGToMT026053@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-launch-box/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25975 Modified Files: gnome-launch-box.spec Log Message: fix license tag Index: gnome-launch-box.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-launch-box/devel/gnome-launch-box.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-launch-box.spec 5 Jun 2008 09:44:18 -0000 1.13 +++ gnome-launch-box.spec 23 Jul 2008 16:28:58 -0000 1.14 @@ -1,8 +1,8 @@ Summary: Funky application launcher Name: gnome-launch-box Version: 0.4 -Release: 10%{?dist} -License: GPL +Release: 11%{?dist} +License: GPLv2+ Group: Applications/Internet URL: http://developer.imendio.com/projects/gnome-launch-box Source0: http://ftp.imendio.com/pub/imendio/%{name}/src/%{name}-%{version}.tar.bz2 @@ -81,6 +81,9 @@ %{_datadir}/gnome-control-center/keybindings/90-gnome-launch-box.xml %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 0.4-11 +- fix license tag + * Thu Jun 05 2008 - Bastien Nocera - 0.4-10 - Rebuild From fedora-extras-commits at redhat.com Wed Jul 23 16:30:12 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 16:30:12 GMT Subject: rpms/qt/F-9 .cvsignore, 1.30, 1.31 qt.spec, 1.177, 1.178 sources, 1.31, 1.32 Message-ID: <200807231630.m6NGUC8l026127@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26012 Modified Files: .cvsignore qt.spec sources Log Message: * Wed Jul 23 2008 Rex Dieter 4.4.0-16 - qt-copy-patches-20080723 (kde#162793) - omit deprecated phonon bits Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 17 Jul 2008 12:35:07 -0000 1.30 +++ .cvsignore 23 Jul 2008 16:29:27 -0000 1.31 @@ -2,3 +2,4 @@ hi48-app-qt4-logo.png qt-x11-opensource-src-4.4.0.tar.bz2 qt-copy-patches-20080711svn.tar.bz2 +qt-copy-patches-20080723svn.tar.bz2 Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- qt.spec 19 Jul 2008 14:53:42 -0000 1.177 +++ qt.spec 23 Jul 2008 16:29:27 -0000 1.178 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.4.0 -Release: 14%{?dist} +Release: 16%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -39,7 +39,7 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch ## qt-copy patches -%define qt_copy 20080711 +%define qt_copy 20080723 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -65,8 +65,6 @@ %define odbc -plugin-sql-odbc %define psql -plugin-sql-psql %define sqlite -plugin-sql-sqlite -# FIXME: building -no-phonon currently busted, build fails -- Rex -#define phonon -phonon -gstreamer %define webkit -webkit #define nas -system-nas-sound @@ -111,7 +109,6 @@ BuildRequires: zlib-devel BuildRequires: glib2-devel BuildRequires: openssl-devel -%{?phonon:BuildRequires: gstreamer-devel >= 0.10.12, gstreamer-plugins-base-devel} ## In theory, should be as simple as: #define x_deps libGL-devel libGLU-devel @@ -228,16 +225,6 @@ %description mysql %{summary}. -%package phonon-devel -Summary: Phonon development files for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -# FIXME -Conflicts: kdelibs4-devel < 4.1 - -%description phonon-devel -%{summary}. - %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries @@ -288,11 +275,7 @@ %prep -%if "%{?snap:1}" == "1" -%setup -q -n qt-x11-opensource-src-%{vesion}-%{snap} -%else %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2} -%endif %if 0%{?qt_copy:1} test -x apply_patches && ./apply_patches @@ -370,6 +353,7 @@ -no-rpath \ -reduce-relocations \ -no-separate-debug-info \ + -no-phonon -no-gstreamer \ -sm \ -stl \ -system-libmng \ @@ -388,9 +372,7 @@ -glib \ -openssl-linked \ -xmlpatterns \ - %{?phonon} %{!?phonon:-no-phonon } \ %{?dbus} %{!?dbus:-no-dbus} \ - %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \ %{?webkit} %{!?webkit:-no-webkit } \ %{?nas} \ %{?mysql} \ @@ -584,7 +566,6 @@ %files %defattr(-,root,root,-) %doc README* -%{!?snap:%doc OPENSOURCE-NOTICE.TXT} %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT %doc LICENSE.GPL3 %doc LICENSE.QPL @@ -640,7 +621,6 @@ %{_qt4_libdir}/libQtOpenGL.so.* %{_qt4_libdir}/libQtSvg.so.* %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*} -%{?phonon:%{_qt4_libdir}/libphonon.so.*} %{_qt4_plugindir}/* %exclude %{_qt4_plugindir}/designer %exclude %{_qt4_plugindir}/sqldrivers @@ -697,8 +677,6 @@ %dir %{_qt4_headerdir}/ %endif %{_qt4_headerdir}/* -%{?phonon:%exclude %{_qt4_headerdir}/phonon/} -%{?phonon:%exclude %{_qt4_headerdir}/Qt/phonon*} %{_qt4_datadir}/mkspecs/ %if "%{_qt4_datadir}" != "%{_qt4_prefix}" %{_qt4_prefix}/mkspecs/ @@ -709,7 +687,6 @@ %{_qt4_libdir}/libQt*.a %{_qt4_libdir}/libQt*.prl %{_libdir}/pkgconfig/*.pc -%{?phonon:%exclude %{_libdir}/pkgconfig/phonon.pc} # Qt designer %{_qt4_bindir}/designer* %{_qt4_plugindir}/designer/ @@ -737,16 +714,6 @@ %endif %{_datadir}/applications/*qtdemo*.desktop -%if 0%{?phonon:1} -%files phonon-devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/phonon.pc -%{_qt4_headerdir}/phonon/ -%{_qt4_headerdir}/Qt/phonon* -%{_qt4_libdir}/libphonon.so -%{_qt4_libdir}/libphonon.prl -%endif - %if "%{?odbc}" == "-plugin-sql-odbc" %files odbc %defattr(-,root,root,-) @@ -773,6 +740,13 @@ %changelog +* Wed Jul 23 2008 Rex Dieter 4.4.0-16 +- qt-copy-patches-20080723 (kde#162793) +- omit deprecated phonon bits + +* Sat Jul 19 2008 Rex Dieter 4.4.0-15 +- fix/workaround spec syntax + * Sat Jul 19 2008 Rex Dieter 4.4.0-14 - macros.qt4: fix %%_qt4_datadir, %%_qt4_translationdir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 17 Jul 2008 12:35:07 -0000 1.31 +++ sources 23 Jul 2008 16:29:27 -0000 1.32 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png +bb7e7e6aa739c0c87e3cb3dbfe0fa814 qt-copy-patches-20080723svn.tar.bz2 03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2 -7cf6bdbd220fb8915f8d875442e29961 qt-copy-patches-20080711svn.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 16:30:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:30:37 GMT Subject: rpms/gnome-media/devel gnome-media.spec,1.132,1.133 Message-ID: <200807231630.m6NGUbPA026230@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26056 Modified Files: gnome-media.spec Log Message: fix license tag Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- gnome-media.spec 4 Jun 2008 00:54:18 -0000 1.132 +++ gnome-media.spec 23 Jul 2008 16:29:51 -0000 1.133 @@ -12,8 +12,8 @@ Summary: GNOME media programs Name: gnome-media Version: 2.23.3 -Release: 1%{?dist} -License: GPLv2+ and GFDL+ +Release: 2%{?dist} +License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.23/gnome-media-%{version}.tar.bz2 Patch0: gnome-media-2.13.5-hide-help-button.patch @@ -199,6 +199,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.23.3-2 +- fix license tag + * Tue Jun 3 2008 Matthias Clasen - 2.23.3-1 - Update to 2.23.3 From fedora-extras-commits at redhat.com Wed Jul 23 16:31:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 23 Jul 2008 16:31:03 GMT Subject: rpms/openssh/devel openssh-5.1p1-skip-initial.patch, NONE, 1.1 openssh.spec, 1.128, 1.129 openssh-3.8.1p1-skip-initial.patch, 1.1, NONE Message-ID: <200807231631.m6NGV34H026334@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/openssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26047 Modified Files: openssh.spec Added Files: openssh-5.1p1-skip-initial.patch Removed Files: openssh-3.8.1p1-skip-initial.patch Log Message: - rediff for zero fuzz tolerance openssh-5.1p1-skip-initial.patch: --- NEW FILE openssh-5.1p1-skip-initial.patch --- Skip the initial empty-password check if permit_empty_passwd is disabled. This doesn't change the timing profiles of the host because the additional condition check which can short-circuit the call to pam_authenticate() has no dependency on the identity of the user who is being authenticated. diff -up openssh-5.1p1/auth1.c.skip-initial openssh-5.1p1/auth1.c --- openssh-5.1p1/auth1.c.skip-initial 2008-07-09 12:54:05.000000000 +0200 +++ openssh-5.1p1/auth1.c 2008-07-23 18:26:01.000000000 +0200 @@ -244,7 +244,7 @@ do_authloop(Authctxt *authctxt) authctxt->valid ? "" : "invalid user ", authctxt->user); /* If the user has no password, accept authentication immediately. */ - if (options.password_authentication && + if (options.permit_empty_passwd && options.password_authentication && #ifdef KRB5 (!options.kerberos_authentication || options.kerberos_or_local_passwd) && #endif diff -up openssh-5.1p1/auth2-none.c.skip-initial openssh-5.1p1/auth2-none.c --- openssh-5.1p1/auth2-none.c.skip-initial 2008-07-02 14:56:09.000000000 +0200 +++ openssh-5.1p1/auth2-none.c 2008-07-23 18:26:01.000000000 +0200 @@ -65,7 +65,7 @@ userauth_none(Authctxt *authctxt) if (check_nt_auth(1, authctxt->pw) == 0) return (0); #endif - if (options.password_authentication) + if (options.permit_empty_passwd && options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); } Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- openssh.spec 23 Jul 2008 14:47:19 -0000 1.128 +++ openssh.spec 23 Jul 2008 16:30:14 -0000 1.129 @@ -75,13 +75,14 @@ Source2: sshd.pam Source3: sshd.init Patch0: openssh-5.1p1-redhat.patch -Patch2: openssh-3.8.1p1-skip-initial.patch +Patch2: openssh-5.1p1-skip-initial.patch Patch3: openssh-3.8.1p1-krb5-config.patch Patch4: openssh-5.1p1-vendor.patch Patch12: openssh-5.1p1-selinux.patch Patch13: openssh-4.7p1-mls.patch Patch16: openssh-4.7p1-audit.patch Patch17: openssh-4.3p2-cve-2007-3102.patch +Patch18: openssh-5.0p1-pam_selinux.patch Patch22: openssh-3.9p1-askpass-keep-above.patch Patch24: openssh-4.3p1-fromto-remote.patch Patch27: openssh-5.1p1-log-in-chroot.patch @@ -94,7 +95,6 @@ Patch51: openssh-4.7p1-nss-keys.patch Patch54: openssh-4.7p1-gssapi-role.patch Patch55: openssh-5.1p1-cloexec.patch -Patch60: openssh-5.0p1-pam_selinux.patch Patch62: openssh-3.9p1-scp-manpage.patch License: BSD @@ -199,7 +199,6 @@ an X11 passphrase dialog for OpenSSH. %prep - %setup -q %patch0 -p1 -b .redhat %patch2 -p1 -b .skip-initial @@ -212,6 +211,7 @@ %patch13 -p1 -b .mls %patch16 -p1 -b .audit %patch17 -p1 -b .inject-fix +%patch18 -p1 -b .pam_selinux %endif %patch22 -p1 -b .keep-above @@ -226,7 +226,6 @@ %patch51 -p1 -b .nss-keys %patch54 -p0 -b .gssapi-role %patch55 -p1 -b .cloexec -%patch60 -p1 -b .pam_selinux %patch62 -p0 -b .manpage autoreconf --- openssh-3.8.1p1-skip-initial.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 16:33:29 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Wed, 23 Jul 2008 16:33:29 GMT Subject: rpms/nagios/devel nagios.upgrade_to_v3.ReadMe, NONE, 1.1 nagios.upgrade_to_v3.sh, NONE, 1.1 nagios.spec, 1.56, 1.57 Message-ID: <200807231633.m6NGXTFE026586@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26475 Modified Files: nagios.spec Added Files: nagios.upgrade_to_v3.ReadMe nagios.upgrade_to_v3.sh Log Message: Added upgrade-scripts and german translations --- NEW FILE nagios.upgrade_to_v3.ReadMe --- Nagios v3 Upgrade Considerations ================================ This applies if you are upgrading from Nagios v2. The Nagios v2 nagios.cfg is will not pass a Nagios v3 syntax check without modification. The attribute "check_result_buffer_slots" from Nagios v2 is incompatible with Nagios v3 and will generate and error. In order to force a Nagios v2 nagios.cfg file to run with Nagios v3 simply commment out the "check_result_buffer_slots" line The included script upgrade_nagios.cfg_to_v3.sh will do this automatically for the file /etc/nagios/nagios.cfg (the standard location for the nagios.cfg file) This is a work-around and you should consider implementing the new nagios.cfg file, which includes several new options. as soon as possible so that you can take advantage of the new features. --- NEW FILE nagios.upgrade_to_v3.sh --- #!/bin/sh # this script checks the nagios.cfg file and comments out the following line which is incompatible with Nagios v3 # check_result_buffer_slots=4096 # this then allows your existing Nagios v2 nagios.cfg file to be operational with Nagios v3 # You will want to migrate to the Nagios v3 nagios.cfg file as soon as possible to take advantage of new features # this is the nagios.cfg file we will modify nagios_cfg=/etc/nagios/nagios.cfg tmp1=/tmp/nagioscfg.$$.tmp # search for and replace the check_result_buffer_slots attribute into a temporary file cat $nagios_cfg | sed --regexp-extended "s/^(\s*check_result_buffer_slots\s*=\s*)/# Line Commented out for Nagios v3 Compatibility\n#\1/g" > $tmp1 # check the diff diff_output=`diff -u $nagios_cfg $tmp1` diff_exit=$? # now decided whether or not to replace the file if [ "$diff_exit" = "0" ]; then echo "No changes were made to the Nagios Config file: $nagios_cfg" elif [ "$diff_exit" = "1" ]; then echo "The following changes were made to the Nagios Config file: $nagios_cfg" echo "$diff_output" # since changes were made, move the temp file into place cp $nagios_cfg $nagios_cfg.v2 mv $tmp1 $nagios_cfg else echo "ERROR: Unexpected exit code from diff. No changes made to file: $nagios_cfg" fi rm -f $tmp1 Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- nagios.spec 10 Jul 2008 17:31:52 -0000 1.56 +++ nagios.spec 23 Jul 2008 16:32:30 -0000 1.57 @@ -12,6 +12,8 @@ Source2: nagios.htaccess Source3: nagios.internet.cfg Source4: nagios.htpasswd +Source5: nagios.UpgradeToVersion3.ReadMe +Source6: nagios.UpgradeToVersion3.sh Patch0: nagios-initrd.patch #Patch1: nagios.cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,6 +29,9 @@ Requires(post): initscripts, chkconfig, shadow-utils Requires(postun): initscripts +Summary: Nagios monitors hosts and services and yells if somethings breaks +Summary(de): Nagios ??berwacht Dienste und Rechner und meldet Ihnen Ausf??lle + %description Nagios is a program that will monitor hosts and services on your network. It has the ability to send email or page alerts when a @@ -42,6 +47,18 @@ This package provides the core program, web interface, and documentation files for Nagios. Development files are built as a separate package. +%description -l (de) +Nagios ist ein Programm zum ??berwachen von Rechner und Diensten +in Ihrem Netzwerk. Wenn etwas ausf??llt, kann es Sie per eMail +oder Pager benachrichtigen. Nagios ist in C geschrieben und +sollte auf allen Unix-Varianten (inklusive Linux :-) laufen. Es +l??uft als D??mon und ??berwacht laufend alle konfigurierten +Dienste. + +Nagios ??berpr??ft die Rechner und Dienste nicht selber, sondern +braucht daf??r externe Programme. Viele dieser Programme finden +Sie im Paket nagios-plugins. + %package devel Group: Applications/System Summary: Provides include files that Nagios-related applications may compile against @@ -92,6 +109,8 @@ -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg +%{__cp} -f %{SOURCE5} UpgradeToVersion3.ReadMe +%{__cp} -f %{SOURCE6} UpgradeToVersion3.sh echo >> html/stylesheets/common.css %install @@ -156,7 +175,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/html %doc %{_datadir}/%{name}/html/docs -%doc Changelog INSTALLING LICENSE README UPGRADING +%doc Changelog INSTALLING LICENSE README UPGRADING UpgradeToVersion3.ReadMe UpgradeToVersion3.sh %{_datadir}/%{name}/html/[^d]* %{_sbindir}/* %{_bindir}/* @@ -183,6 +202,13 @@ %{_includedir}/%{name} %changelog +* Mon Jul 23 2008 Robert M. Albrecht 3.0.3-8 +- Matthew Jurgens provided a script and Readme for upgrading your config to Release 3 + +* Mon Jul 22 2008 Robert M. Albrecht 3.0.3-7 +- Added summary +- Added german translations + * Tue Jul 10 2008 Robert M. Albrecht 3.0.3-6 - disabled conf.d in nagios.conf for now From fedora-extras-commits at redhat.com Wed Jul 23 16:39:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:39:00 GMT Subject: rpms/gnome-mime-data/devel gnome-mime-data-2.2.0-openoffice.patch, 1.1, 1.2 gnome-mime-data-2.2.0-rpminstall.patch, 1.1, 1.2 gnome-mime-data.spec, 1.25, 1.26 Message-ID: <200807231639.m6NGd00e027025@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-mime-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26960 Modified Files: gnome-mime-data-2.2.0-openoffice.patch gnome-mime-data-2.2.0-rpminstall.patch gnome-mime-data.spec Log Message: fix license tag gnome-mime-data-2.2.0-openoffice.patch: Index: gnome-mime-data-2.2.0-openoffice.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-mime-data/devel/gnome-mime-data-2.2.0-openoffice.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-mime-data-2.2.0-openoffice.patch 9 Sep 2004 05:29:02 -0000 1.1 +++ gnome-mime-data-2.2.0-openoffice.patch 23 Jul 2008 16:38:16 -0000 1.2 @@ -1,6 +1,7 @@ ---- gnome-mime-data-2.2.0/gnome-vfs.keys.in.openoffice 2003-02-04 14:53:53.000000000 -0500 -+++ gnome-mime-data-2.2.0/gnome-vfs.keys.in 2003-02-04 14:54:46.000000000 -0500 -@@ -29,9 +29,9 @@ +diff -up gnome-mime-data-2.18.0/gnome-vfs.keys.in.openoffice gnome-mime-data-2.18.0/gnome-vfs.keys.in +--- gnome-mime-data-2.18.0/gnome-vfs.keys.in.openoffice 2007-04-03 13:24:30.000000000 -0400 ++++ gnome-mime-data-2.18.0/gnome-vfs.keys.in 2008-07-23 12:32:52.000000000 -0400 +@@ -27,9 +27,9 @@ application/mime-type-test application/msword _description=Microsoft Word document default_action_type=application @@ -13,9 +14,9 @@ _category=Documents/Word Processor use_category_default=yes -@@ -104,9 +104,9 @@ +@@ -111,9 +111,9 @@ application/qif application/rtf - _description=rich text document + _description=Rich text document default_action_type=application - short_list_application_ids_for_novice_user_level=abiword,openoffice,staroffice,applix - short_list_application_ids_for_intermediate_user_level=abiword,openoffice,staroffice,applix @@ -26,7 +27,7 @@ _category=Documents/Word Processor use_category_default=yes -@@ -124,9 +124,9 @@ +@@ -135,9 +135,9 @@ application/vnd.ms-excel _description=Microsoft Excel spreadsheet icon_filename=i-spreadsheet default_action_type=application gnome-mime-data-2.2.0-rpminstall.patch: Index: gnome-mime-data-2.2.0-rpminstall.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-mime-data/devel/gnome-mime-data-2.2.0-rpminstall.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-mime-data-2.2.0-rpminstall.patch 9 Sep 2004 05:29:02 -0000 1.1 +++ gnome-mime-data-2.2.0-rpminstall.patch 23 Jul 2008 16:38:16 -0000 1.2 @@ -13,4 +13,4 @@ + short_list_application_ids_for_advanced_user_level=redhat-install-packages application/x-shar - _description=shell archive + _description=Shell archive Index: gnome-mime-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnome-mime-data.spec 18 Apr 2007 11:12:50 -0000 1.25 +++ gnome-mime-data.spec 23 Jul 2008 16:38:16 -0000 1.26 @@ -1,10 +1,11 @@ Summary: MIME type data files for GNOME desktop Name: gnome-mime-data Version: 2.18.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 -License: GPL +# No license attribution, just COPYING. +License: GPL+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root BuildArch: noarch @@ -63,6 +64,10 @@ %{_datadir}/pkgconfig/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.18.0-3 +- fix license tag +- fix patches to apply with fuzz=0 + * Wed Apr 18 2007 - Bastien Nocera - 2.18.0-2 - Really make noarch From fedora-extras-commits at redhat.com Wed Jul 23 16:40:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:40:14 GMT Subject: rpms/gnome-panel/devel gnome-panel.spec,1.310,1.311 Message-ID: <200807231640.m6NGeEVH027129@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27079 Modified Files: gnome-panel.spec Log Message: fix license tag Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- gnome-panel.spec 23 Jul 2008 02:44:59 -0000 1.310 +++ gnome-panel.spec 23 Jul 2008 16:39:29 -0000 1.311 @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2 @@ -31,7 +31,7 @@ Source4: gnome-compiler-flags.m4 Source5: redhat-panel-backwards-compat-config.schemas Source6: add-translations.sh -License: GPLv2+ and LGPLv2+ and GFDL+ +License: GPLv2+ and LGPLv2+ and GFDL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -354,6 +354,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.23.5-2 +- fix license tag + * Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Wed Jul 23 16:42:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:42:51 GMT Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.66,1.67 Message-ID: <200807231642.m6NGgpoR027304@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-pilot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27270 Modified Files: gnome-pilot.spec Log Message: fix license tag Index: gnome-pilot.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/gnome-pilot.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- gnome-pilot.spec 27 Feb 2008 15:21:53 -0000 1.66 +++ gnome-pilot.spec 23 Jul 2008 16:42:06 -0000 1.67 @@ -4,8 +4,8 @@ Name: gnome-pilot Version: 2.0.16 -Release: 2%{?dist} -License: LGPL +Release: 3%{?dist} +License: LGPLv2+ and GPLv2+ Group: Applications/Communications Summary: GNOME pilot programs Source: %{name}-%{version}.tar.bz2 @@ -163,6 +163,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.0.16-3 +- fix license tag + * Wed Feb 27 2008 Matthew Barnes - 2.0.16-2.fc9 - Remove broken "PilotSync" menu item (RH bug #435118). From fedora-extras-commits at redhat.com Wed Jul 23 16:46:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:46:38 GMT Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits.spec, 1.30, 1.31 Message-ID: <200807231646.m6NGkcwm027560@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-pilot-conduits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27497 Modified Files: gnome-pilot-conduits.spec Log Message: fix license tag Index: gnome-pilot-conduits.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnome-pilot-conduits.spec 27 Feb 2008 02:45:14 -0000 1.30 +++ gnome-pilot-conduits.spec 23 Jul 2008 16:45:53 -0000 1.31 @@ -4,8 +4,8 @@ Name: gnome-pilot-conduits Version: 2.0.16 -Release: 1%{?dist} -License: LGPL +Release: 2%{?dist} +License: GPLv2+ and MPLv1.0 Group: Applications/Communications Summary: Additional conduits for gnome-pilot Source: %{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ %{_libdir}/gnome-pilot/conduits/*.so %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.0.16-2 +- fix license tag + * Tue Feb 26 2008 Matthew Barnes - 2.0.16-1.fc9 - Update to 2.0.16 From fedora-extras-commits at redhat.com Wed Jul 23 16:47:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:47:37 GMT Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.118, 1.119 Message-ID: <200807231647.m6NGlb7Z027684@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-power-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27577 Modified Files: gnome-power-manager.spec Log Message: fix license tag Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- gnome-power-manager.spec 1 Jul 2008 12:07:22 -0000 1.118 +++ gnome-power-manager.spec 23 Jul 2008 16:46:43 -0000 1.119 @@ -5,8 +5,8 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.23.3 -Release: 2%{?dist} -License: GPLv2+ and GFDL+ +Release: 3%{?dist} +License: GPLv2+ and GFDL Group: Applications/System Source: http://download.gnome.org/sources/gnome-power-manager/2.23/gnome-power-manager-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -127,6 +127,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.23.3-3 +- fix license tag + * Tue Jul 01 2008 Richard Hughes - 2.23.3-1 - Update to 2.23.3, which should fix backlight brightness. From fedora-extras-commits at redhat.com Wed Jul 23 16:51:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:51:32 GMT Subject: rpms/gnome-python2-extras/devel gnome-python-extras-2.10.0-gtkspell-static.patch, 1.3, 1.4 gnome-python2-extras.spec, 1.26, 1.27 Message-ID: <200807231651.m6NGpWIb027895@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-python2-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27860 Modified Files: gnome-python-extras-2.10.0-gtkspell-static.patch gnome-python2-extras.spec Log Message: fix license tag gnome-python-extras-2.10.0-gtkspell-static.patch: Index: gnome-python-extras-2.10.0-gtkspell-static.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python-extras-2.10.0-gtkspell-static.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-python-extras-2.10.0-gtkspell-static.patch 9 Aug 2005 22:31:43 -0000 1.3 +++ gnome-python-extras-2.10.0-gtkspell-static.patch 23 Jul 2008 16:50:46 -0000 1.4 @@ -1,11 +1,12 @@ ---- gnome-python-extras-2.10.0/gtkspell/gtkspellmodule.c.fix 2005-03-28 16:45:12.000000000 -0500 -+++ gnome-python-extras-2.10.0/gtkspell/gtkspellmodule.c 2005-03-28 16:46:33.000000000 -0500 -@@ -8,7 +8,7 @@ +diff -up gnome-python-extras-2.19.1/gtkspell/gtkspellmodule.c.gtkspell-static gnome-python-extras-2.19.1/gtkspell/gtkspellmodule.c +--- gnome-python-extras-2.19.1/gtkspell/gtkspellmodule.c.gtkspell-static 2007-06-05 10:52:29.000000000 -0400 ++++ gnome-python-extras-2.19.1/gtkspell/gtkspellmodule.c 2008-07-23 12:47:24.000000000 -0400 +@@ -8,7 +8,7 @@ typedef struct { GtkSpell *spell; } gtkspell_SpellObject; -extern PyTypeObject gtkspell_SpellType; +PyTypeObject gtkspell_SpellType; - static PyObject * - _wrap_gtkspell_new_attach (PyTypeObject *type, PyObject *args, PyObject *kwds) + static PyTypeObject *_PyGtkTextView_Type; + #define PyGtkTextView_Type (*_PyGtkTextView_Type) Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gnome-python2-extras.spec 7 Apr 2008 11:21:39 -0000 1.26 +++ gnome-python2-extras.spec 23 Jul 2008 16:50:46 -0000 1.27 @@ -21,8 +21,8 @@ Name: gnome-python2-extras Version: 2.19.1 -Release: 15%{?dist} -License: GPL/LGPL +Release: 16%{?dist} +License: GPLv2+ and LGPLv2+ Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. URL: http://www.pygtk.org/ @@ -199,6 +199,9 @@ %{_libdir}/pkgconfig/pygda-3.0.pc %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.19.1-16 +- fix license tag + * Mon Apr 07 2008 Matthew Barnes - 2.19.1-15.fc9 - Make gnome-python2-mozembed require gnome-python2-extras (RH bug #441228). From fedora-extras-commits at redhat.com Wed Jul 23 16:53:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:53:29 GMT Subject: rpms/gnome-specimen/devel gnome-specimen.spec,1.2,1.3 Message-ID: <200807231653.m6NGrTaI028028@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-specimen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27979 Modified Files: gnome-specimen.spec Log Message: fix license tag Index: gnome-specimen.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-specimen/devel/gnome-specimen.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-specimen.spec 18 Jul 2007 13:38:08 -0000 1.2 +++ gnome-specimen.spec 23 Jul 2008 16:52:41 -0000 1.3 @@ -2,11 +2,11 @@ Name: gnome-specimen Version: 0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple tool to view and compare fonts installed on your system Group: Applications/System -License: GPL +License: GPLv2+ URL: http://uwstopia.nl/geek/projects/gnome-specimen/ Source0: http://uwstopia.nl/geek/projects/gnome-specimen/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -86,6 +86,9 @@ %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 0.3-2 +- fix license tag + * Wed Jul 18 2007 Damien Durand - 0.3-1 - Update to 0.3 From fedora-extras-commits at redhat.com Wed Jul 23 16:55:30 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 23 Jul 2008 16:55:30 GMT Subject: rpms/pyabiword/devel pyabiword.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231655.m6NGtUUq028228@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28150 Modified Files: .cvsignore sources Added Files: pyabiword.spec Log Message: Initial spec file --- NEW FILE pyabiword.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define abiword_api_version 2.6 Summary: Python bindings for libabiword Name: pyabiword Version: 0.6.1 Release: 3%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz License: GPL+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libabiword-devel >= %{abiword_api_version} BuildRequires: pygtk2-devel BuildRequires: gtk2-devel BuildRequires: libglade2-devel BuildRequires: libgnomeprintui22-devel BuildRequires: goffice04-devel BuildRequires: enchant-devel BuildRequires: fribidi-devel BuildRequires: wv-devel %description This package installs Python bindings for libabiword %package devel Summary: Support files necessary to compile applications using pyabiword. Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Libraries, headers, and support files necessary to compile applications using pyabiword. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove execution bits from python examples find $RPM_BUILD_DIR/%{name}-%{version}/examples -name *.py -type f -print | xargs chmod -x # nuke .la files rm -f $RPM_BUILD_ROOT/%{python_sitearch}/abiword/*.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING $RPM_BUILD_DIR/%{name}-%{version}/examples %dir %{python_sitearch}/abiword %{python_sitearch}/abiword/*.py %{python_sitearch}/abiword/*.pyc %{python_sitearch}/abiword/*.pyo %{python_sitearch}/abiword/*.so %files devel %defattr(-,root,root,-) %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog * Tue Jul 22 2008 Marc Maurer - 0.6.1-3 - Include the BRs required to build in koji * Tue Jul 22 2008 Marc Maurer - 0.6.1-2 - Drop vendor tag - Include documentation - Include examples * Mon Jul 21 2008 Marc Maurer - 0.6.1-1 - Initial spec file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:42:03 -0000 1.1 +++ .cvsignore 23 Jul 2008 16:54:46 -0000 1.2 @@ -0,0 +1 @@ +pyabiword-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:42:03 -0000 1.1 +++ sources 23 Jul 2008 16:54:46 -0000 1.2 @@ -0,0 +1 @@ +d0cfa7533fc30db236993131a513ec0d pyabiword-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 16:55:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:55:59 GMT Subject: rpms/gnome-speech/devel gnome-speech.spec,1.50,1.51 Message-ID: <200807231655.m6NGtxqw028318@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-speech/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28198 Modified Files: gnome-speech.spec Log Message: fix license tag Index: gnome-speech.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-speech/devel/gnome-speech.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gnome-speech.spec 18 Jun 2008 17:24:24 -0000 1.50 +++ gnome-speech.spec 23 Jul 2008 16:55:13 -0000 1.51 @@ -3,8 +3,8 @@ Summary: GNOME Text to Speech Name: gnome-speech Version: 0.4.20 -Release: 1%{?dist} -License: LGPL +Release: 2%{?dist} +License: LGPLv2+ Group: Desktop/Accessibility URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/gnome-speech/0.4/gnome-speech-%{version}.tar.bz2 @@ -92,6 +92,9 @@ %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 0.4.20-2 +- fix license tag + * Wed Jun 18 2008 Matthias Clasen - 0.4.20-1 - Update to 0.4.20 From fedora-extras-commits at redhat.com Wed Jul 23 16:57:54 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 23 Jul 2008 16:57:54 GMT Subject: rpms/pyabiword/OLPC-3 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807231657.m6NGvsQX028516@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28436 Modified Files: .cvsignore sources Log Message: Initial spec Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/OLPC-3/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:42:03 -0000 1.1 +++ .cvsignore 23 Jul 2008 16:57:10 -0000 1.2 @@ -0,0 +1 @@ +pyabiword-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/OLPC-3/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:42:03 -0000 1.1 +++ sources 23 Jul 2008 16:57:10 -0000 1.2 @@ -0,0 +1 @@ +d0cfa7533fc30db236993131a513ec0d pyabiword-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 16:58:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:58:26 GMT Subject: rpms/gnome-themes/devel gnome-themes.spec,1.111,1.112 Message-ID: <200807231658.m6NGwQMj028593@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28471 Modified Files: gnome-themes.spec Log Message: fix license tag Index: gnome-themes.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- gnome-themes.spec 22 Jul 2008 19:23:16 -0000 1.111 +++ gnome-themes.spec 23 Jul 2008 16:57:40 -0000 1.112 @@ -1,10 +1,10 @@ Summary: Themes collection for GNOME Name: gnome-themes Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://download.gnome.org/sources/gnome-themes/ Source: http://download.gnome.org/sources/gnome-themes/2.23/%{name}-%{version}.tar.bz2 -License: LGPL+ +License: LGPLv2 and GPLv2 Group: User Interface/Desktops BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,6 +94,9 @@ %doc AUTHORS COPYING NEWS README %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.23.5-2 +- fix license tag + * Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Wed Jul 23 16:35:42 2008 From: fedora-extras-commits at redhat.com (Robert M. Albrecht (romal)) Date: Wed, 23 Jul 2008 16:35:42 GMT Subject: rpms/nagios/devel nagios.spec,1.57,1.58 Message-ID: <200807231635.m6NGZgtu026735@cvs-int.fedora.redhat.com> Author: romal Update of /cvs/pkgs/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26681 Modified Files: nagios.spec Log Message: fixed package-release in nagios.spec Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- nagios.spec 23 Jul 2008 16:32:30 -0000 1.57 +++ nagios.spec 23 Jul 2008 16:34:49 -0000 1.58 @@ -1,7 +1,7 @@ Name: nagios Version: 3.0.3 -Release: 6%{?dist} +Release: 8%{?dist} Summary: Host/service/network monitoring program Group: Applications/System From fedora-extras-commits at redhat.com Wed Jul 23 16:59:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 16:59:11 GMT Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.34,1.35 Message-ID: <200807231659.m6NGxBjb028676@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-user-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28592 Modified Files: gnome-user-docs.spec Log Message: fix license tag Index: gnome-user-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gnome-user-docs.spec 10 Mar 2008 21:37:45 -0000 1.34 +++ gnome-user-docs.spec 23 Jul 2008 16:58:26 -0000 1.35 @@ -1,8 +1,8 @@ Summary: GNOME User Documentation Name: gnome-user-docs Version: 2.22.0 -Release: 1%{?dist} -License: GFDL+ +Release: 2%{?dist} +License: GFDL Source: http://download.gnome.org/sources/gnome-user-docs/2.22/gnome-user-docs-%{version}.tar.bz2 Group: Documentation @@ -53,6 +53,9 @@ %dir %{_datadir}/omf/gnome-access-guide %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.22.0-2 +- fix license tag + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 From fedora-extras-commits at redhat.com Wed Jul 23 16:59:40 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 23 Jul 2008 16:59:40 GMT Subject: rpms/pyabiword/OLPC-3 pyabiword.spec,NONE,1.1 Message-ID: <200807231659.m6NGxeNE028737@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28728 Added Files: pyabiword.spec Log Message: Initial spec --- NEW FILE pyabiword.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define abiword_api_version 2.6 Summary: Python bindings for libabiword Name: pyabiword Version: 0.6.1 Release: 4%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz License: GPL+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libabiword-devel >= %{abiword_api_version} BuildRequires: pygtk2-devel BuildRequires: gtk2-devel BuildRequires: libglade2-devel BuildRequires: libgnomeprintui22-devel BuildRequires: goffice04-devel BuildRequires: enchant-devel BuildRequires: fribidi-devel BuildRequires: wv-devel %description This package installs Python bindings for libabiword %package devel Summary: Support files necessary to compile applications using pyabiword. Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Libraries, headers, and support files necessary to compile applications using pyabiword. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove execution bits from python examples find $RPM_BUILD_DIR/%{name}-%{version}/examples -name *.py -type f -print | xargs chmod -x # nuke .la files rm -f $RPM_BUILD_ROOT/%{python_sitearch}/abiword/*.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING $RPM_BUILD_DIR/%{name}-%{version}/examples %dir %{python_sitearch}/abiword %{python_sitearch}/abiword/*.py %{python_sitearch}/abiword/*.pyc %{python_sitearch}/abiword/*.pyo %{python_sitearch}/abiword/*.so %files devel %defattr(-,root,root,-) %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog * Wed Jul 23 2008 Marc Maurer - 0.6.1-4 - Rebuild * Tue Jul 22 2008 Marc Maurer - 0.6.1-3 - Include the BRs required to build in koji * Tue Jul 22 2008 Marc Maurer - 0.6.1-2 - Drop vendor tag - Include documentation - Include examples * Mon Jul 21 2008 Marc Maurer - 0.6.1-1 - Initial spec file From fedora-extras-commits at redhat.com Wed Jul 23 17:07:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 23 Jul 2008 17:07:21 GMT Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.178,1.179 Message-ID: <200807231707.m6NH7LGt003462@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-vfs2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390 Modified Files: gnome-vfs2.spec Log Message: fix license tag Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- gnome-vfs2.spec 5 May 2008 00:04:16 -0000 1.178 +++ gnome-vfs2.spec 23 Jul 2008 17:06:27 -0000 1.179 @@ -14,10 +14,10 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.22.0 -Release: 2%{?dist} -License: LGPLv2 and LGPL+ and GPL+ -# the daemon and the library are LGPLv2 -# the modules are LGPL+ and GPL+ +Release: 3%{?dist} +License: LGPLv2+ and GPLv2+ +# the daemon and the library are LGPLv2+ +# the modules are LGPLv2+ and GPLv2+ Group: System Environment/Libraries Source0: http://download.gnome.org/sources/gnome-vfs/2.22/gnome-vfs-%{version}.tar.bz2 URL: http://www.gnome.org/ @@ -62,7 +62,8 @@ # Default Patch104: gnome-vfs-2.8.2-browser_default.patch -Patch201: gnome-vfs-2.8.1-console-mount-opt.patch +# Applied upstream. +# Patch201: gnome-vfs-2.8.1-console-mount-opt.patch # RH bug #197868 Patch6: gnome-vfs-2.15.91-mailto-command.patch @@ -123,7 +124,7 @@ %patch101 -p1 -b .schema_about %patch104 -p1 -b .browser_default -%patch201 -p0 -b .console +# %patch201 -p0 -b .console %patch8 -p1 -b .no-dbus %patch9 -p1 -b .glob-leak @@ -235,6 +236,10 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.22.0-3 +- fix license tag +- don't apply Patch201, upstreamed + * Sun May 4 2008 Matthias Clasen - 2.22.0-2 - Fix source url From fedora-extras-commits at redhat.com Wed Jul 23 17:11:07 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 23 Jul 2008 17:11:07 GMT Subject: rpms/bash-completion/F-9 bash-completion.spec,1.27,1.28 Message-ID: <200807231711.m6NHB7SF003793@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/bash-completion/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3656/F-9 Modified Files: bash-completion.spec Log Message: * Wed Jul 23 2008 Ville Skytt?? - 20060301-12 - Fix plague-client completion install (#456355, Ricky Zhou). - Trigger-install support for sitecopy. Index: bash-completion.spec =================================================================== RCS file: /cvs/pkgs/rpms/bash-completion/F-9/bash-completion.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- bash-completion.spec 29 Apr 2008 17:12:40 -0000 1.27 +++ bash-completion.spec 23 Jul 2008 17:09:30 -0000 1.28 @@ -1,6 +1,6 @@ Name: bash-completion Version: 20060301 -Release: 11 +Release: 12 Summary: Programmable completion for Bash Group: System Environment/Shells @@ -36,8 +36,8 @@ %patch5 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f install -pm 644 %{SOURCE2} contrib/mock -install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage +install -pm 644 %{SOURCE4} contrib/plague-client %build @@ -67,7 +67,7 @@ %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || : # Not handled (yet?): -# bitkeeper, harbour, larch, lisp, p4, povray, sitecopy +# bitkeeper, harbour, larch, lisp, p4, povray %triggerin -- bittorrent %do_triggerin bittorrent @@ -159,6 +159,11 @@ %triggerun -- sbcl %do_triggerun sbcl +%triggerin -- sitecopy +%do_triggerin sitecopy +%triggerun -- sitecopy +%do_triggerun sitecopy + %triggerin -- snownews %do_triggerin snownews %triggerun -- snownews @@ -195,6 +200,10 @@ %changelog +* Wed Jul 23 2008 Ville Skytt?? - 20060301-12 +- Fix plague-client completion install (#456355, Ricky Zhou). +- Trigger-install support for sitecopy. + * Tue Apr 29 2008 Ville Skytt?? - 20060301-11 - Media player association improvements (#444467). From fedora-extras-commits at redhat.com Wed Jul 23 17:11:13 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 23 Jul 2008 17:11:13 GMT Subject: rpms/bash-completion/devel bash-completion.spec,1.27,1.28 Message-ID: <200807231711.m6NHBDvY003798@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3656/devel Modified Files: bash-completion.spec Log Message: * Wed Jul 23 2008 Ville Skytt?? - 20060301-12 - Fix plague-client completion install (#456355, Ricky Zhou). - Trigger-install support for sitecopy. Index: bash-completion.spec =================================================================== RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- bash-completion.spec 29 Apr 2008 17:12:49 -0000 1.27 +++ bash-completion.spec 23 Jul 2008 17:10:07 -0000 1.28 @@ -1,6 +1,6 @@ Name: bash-completion Version: 20060301 -Release: 11 +Release: 12 Summary: Programmable completion for Bash Group: System Environment/Shells @@ -36,8 +36,8 @@ %patch5 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f install -pm 644 %{SOURCE2} contrib/mock -install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage +install -pm 644 %{SOURCE4} contrib/plague-client %build @@ -67,7 +67,7 @@ %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || : # Not handled (yet?): -# bitkeeper, harbour, larch, lisp, p4, povray, sitecopy +# bitkeeper, harbour, larch, lisp, p4, povray %triggerin -- bittorrent %do_triggerin bittorrent @@ -159,6 +159,11 @@ %triggerun -- sbcl %do_triggerun sbcl +%triggerin -- sitecopy +%do_triggerin sitecopy +%triggerun -- sitecopy +%do_triggerun sitecopy + %triggerin -- snownews %do_triggerin snownews %triggerun -- snownews @@ -195,6 +200,10 @@ %changelog +* Wed Jul 23 2008 Ville Skytt?? - 20060301-12 +- Fix plague-client completion install (#456355, Ricky Zhou). +- Trigger-install support for sitecopy. + * Tue Apr 29 2008 Ville Skytt?? - 20060301-11 - Media player association improvements (#444467). From fedora-extras-commits at redhat.com Wed Jul 23 17:34:06 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 23 Jul 2008 17:34:06 GMT Subject: rpms/openssh/devel openssh-5.1p1-askpass-progress.patch, NONE, 1.1 openssh-5.1p1-gssapi-role.patch, NONE, 1.1 openssh-5.1p1-mls.patch, NONE, 1.1 openssh-5.1p1-nss-keys.patch, NONE, 1.1 openssh-5.1p1-scp-manpage.patch, NONE, 1.1 openssh.spec, 1.129, 1.130 openssh-3.9p1-scp-manpage.patch, 1.1, NONE openssh-4.2p1-askpass-progress.patch, 1.2, NONE openssh-4.7p1-gssapi-role.patch, 1.1, NONE openssh-4.7p1-mls.patch, 1.3, NONE openssh-4.7p1-nss-keys.patch, 1.2, NONE Message-ID: <200807231734.m6NHY63g004697@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/openssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4623 Modified Files: openssh.spec Added Files: openssh-5.1p1-askpass-progress.patch openssh-5.1p1-gssapi-role.patch openssh-5.1p1-mls.patch openssh-5.1p1-nss-keys.patch openssh-5.1p1-scp-manpage.patch Removed Files: openssh-3.9p1-scp-manpage.patch openssh-4.2p1-askpass-progress.patch openssh-4.7p1-gssapi-role.patch openssh-4.7p1-mls.patch openssh-4.7p1-nss-keys.patch Log Message: - rediff for no fuzz openssh-5.1p1-askpass-progress.patch: --- NEW FILE openssh-5.1p1-askpass-progress.patch --- diff -up openssh-5.1p1/contrib/gnome-ssh-askpass2.c.progress openssh-5.1p1/contrib/gnome-ssh-askpass2.c --- openssh-5.1p1/contrib/gnome-ssh-askpass2.c.progress 2008-07-23 19:05:26.000000000 +0200 +++ openssh-5.1p1/contrib/gnome-ssh-askpass2.c 2008-07-23 19:05:26.000000000 +0200 @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -83,13 +84,24 @@ ok_dialog(GtkWidget *entry, gpointer dia gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); } +static void +move_progress(GtkWidget *entry, gpointer progress) +{ + gdouble step; + g_return_if_fail(GTK_IS_PROGRESS_BAR(progress)); + + step = g_random_double_range(0.03, 0.1); + gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(progress), step); + gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress)); +} + static int passphrase_dialog(char *message) { const char *failed; char *passphrase, *local; int result, grab_tries, grab_server, grab_pointer; - GtkWidget *dialog, *entry; + GtkWidget *dialog, *entry, *progress, *hbox; GdkGrabStatus status; grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); @@ -102,13 +114,31 @@ passphrase_dialog(char *message) "%s", message); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, + FALSE, 0); + gtk_widget_show(hbox); + entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, FALSE, + gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, FALSE, 0); + gtk_entry_set_width_chars(GTK_ENTRY(entry), 2); gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); gtk_widget_grab_focus(entry); gtk_widget_show(entry); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, + FALSE, 8); + gtk_widget_show(hbox); + + progress = gtk_progress_bar_new(); + + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Passphrase length hidden intentionally"); + gtk_box_pack_start(GTK_BOX(hbox), progress, TRUE, + TRUE, 5); + gtk_widget_show(progress); + gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH"); gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); @@ -119,6 +149,8 @@ passphrase_dialog(char *message) gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(ok_dialog), dialog); + g_signal_connect(G_OBJECT(entry), "changed", + G_CALLBACK(move_progress), progress); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); openssh-5.1p1-gssapi-role.patch: --- NEW FILE openssh-5.1p1-gssapi-role.patch --- Written-by: Nalin Dahyabhai Reviewed-by: Tomas Mraz diff -up openssh-5.1p1/auth2-gss.c.gssapi-role openssh-5.1p1/auth2-gss.c --- openssh-5.1p1/auth2-gss.c.gssapi-role 2007-12-02 12:59:45.000000000 +0100 +++ openssh-5.1p1/auth2-gss.c 2008-07-23 19:18:15.000000000 +0200 @@ -258,6 +258,7 @@ input_gssapi_mic(int type, u_int32_t ple Authctxt *authctxt = ctxt; Gssctxt *gssctxt; int authenticated = 0; + char *micuser; Buffer b; gss_buffer_desc mic, gssbuf; u_int len; @@ -270,7 +271,11 @@ input_gssapi_mic(int type, u_int32_t ple mic.value = packet_get_string(&len); mic.length = len; - ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, + if (authctxt->role && (strlen(authctxt->role) > 0)) + xasprintf(&micuser, "%s/%s", authctxt->user, authctxt->role); + else + micuser = authctxt->user; + ssh_gssapi_buildmic(&b, micuser, authctxt->service, "gssapi-with-mic"); gssbuf.value = buffer_ptr(&b); @@ -282,6 +287,8 @@ input_gssapi_mic(int type, u_int32_t ple logit("GSSAPI MIC check failed"); buffer_free(&b); + if (micuser != authctxt->user) + xfree(micuser); xfree(mic.value); authctxt->postponed = 0; openssh-5.1p1-mls.patch: --- NEW FILE openssh-5.1p1-mls.patch --- diff -up openssh-5.1p1/misc.c.mls openssh-5.1p1/misc.c --- openssh-5.1p1/misc.c.mls 2008-06-13 06:48:59.000000000 +0200 +++ openssh-5.1p1/misc.c 2008-07-23 18:53:37.000000000 +0200 @@ -427,6 +427,7 @@ char * colon(char *cp) { int flag = 0; + int start = 1; if (*cp == ':') /* Leading colon is part of file name. */ return (0); @@ -440,8 +441,13 @@ colon(char *cp) return (cp+1); if (*cp == ':' && !flag) return (cp); - if (*cp == '/') - return (0); + if (start) { + /* Slash on beginning or after dots only denotes file name. */ + if (*cp == '/') + return (0); + if (*cp != '.') + start = 0; + } } return (0); } diff -up openssh-5.1p1/session.c.mls openssh-5.1p1/session.c --- openssh-5.1p1/session.c.mls 2008-06-16 15:29:18.000000000 +0200 +++ openssh-5.1p1/session.c 2008-07-23 18:53:37.000000000 +0200 @@ -1550,10 +1550,6 @@ do_setusercontext(struct passwd *pw) #endif if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); - -#ifdef WITH_SELINUX - ssh_selinux_setup_exec_context(pw->pw_name); -#endif } static void diff -up openssh-5.1p1/openbsd-compat/port-linux.c.mls openssh-5.1p1/openbsd-compat/port-linux.c --- openssh-5.1p1/openbsd-compat/port-linux.c.mls 2008-07-23 18:53:37.000000000 +0200 +++ openssh-5.1p1/openbsd-compat/port-linux.c 2008-07-23 18:53:37.000000000 +0200 @@ -33,12 +33,23 @@ #include "key.h" #include "hostfile.h" #include "auth.h" +#include "xmalloc.h" #include #include +#include #include +#include +#include + +#ifdef HAVE_LINUX_AUDIT +#include +#include +#endif extern Authctxt *the_authctxt; +extern int inetd_flag; +extern int rexeced_flag; /* Wrapper around is_selinux_enabled() to log its return value once only */ int @@ -54,17 +65,173 @@ ssh_selinux_enabled(void) return (enabled); } +/* Send audit message */ +static int +send_audit_message(int success, security_context_t default_context, + security_context_t selected_context) +{ + int rc=0; +#ifdef HAVE_LINUX_AUDIT + char *msg = NULL; + int audit_fd = audit_open(); + security_context_t default_raw=NULL; + security_context_t selected_raw=NULL; + rc = -1; + if (audit_fd < 0) { + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) + return 0; /* No audit support in kernel */ + error("Error connecting to audit system."); + return rc; + } + if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) { + error("Error translating default context."); + default_raw = NULL; + } + if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) { + error("Error translating selected context."); + selected_raw = NULL; + } + if (asprintf(&msg, "sshd: default-context=%s selected-context=%s", + default_raw ? default_raw : (default_context ? default_context: "?"), + selected_context ? selected_raw : (selected_context ? selected_context :"?")) < 0) { + error("Error allocating memory."); + goto out; + } + if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, + msg, NULL, NULL, NULL, success) <= 0) { + error("Error sending audit message."); + goto out; + } + rc = 0; + out: + free(msg); + freecon(default_raw); + freecon(selected_raw); + close(audit_fd); +#endif + return rc; +} + +static int +mls_range_allowed(security_context_t src, security_context_t dst) +{ + struct av_decision avd; + int retval; + unsigned int bit = CONTEXT__CONTAINS; + + debug("%s: src:%s dst:%s", __func__, src, dst); + retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd); + if (retval || ((bit & avd.allowed) != bit)) + return 0; + + return 1; +} + +static int +get_user_context(const char *sename, const char *role, const char *lvl, + security_context_t *sc) { +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + if (lvl == NULL || lvl[0] == '\0' || get_default_context_with_level(sename, lvl, NULL, sc) != 0) { + /* User may have requested a level completely outside of his + allowed range. We get a context just for auditing as the + range check below will certainly fail for default context. */ +#endif + if (get_default_context(sename, NULL, sc) != 0) { + *sc = NULL; + return -1; + } +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + } +#endif + if (role != NULL && role[0]) { + context_t con; + char *type=NULL; + if (get_default_type(role, &type) != 0) { + error("get_default_type: failed to get default type for '%s'", + role); + goto out; + } + con = context_new(*sc); + if (!con) { + goto out; + } + context_role_set(con, role); + context_type_set(con, type); + freecon(*sc); + *sc = strdup(context_str(con)); + context_free(con); + if (!*sc) + return -1; + } +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + if (lvl != NULL && lvl[0]) { + /* verify that the requested range is obtained */ + context_t con; + security_context_t obtained_raw; + security_context_t requested_raw; + con = context_new(*sc); + if (!con) { + goto out; + } + context_range_set(con, lvl); + if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) { + context_free(con); + goto out; + } + if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) { + freecon(obtained_raw); + context_free(con); + goto out; + } + + debug("get_user_context: obtained context '%s' requested context '%s'", + obtained_raw, requested_raw); + if (strcmp(obtained_raw, requested_raw)) { + /* set the context to the real requested one but fail */ + freecon(requested_raw); + freecon(obtained_raw); + freecon(*sc); + *sc = strdup(context_str(con)); + context_free(con); + return -1; + } + freecon(requested_raw); + freecon(obtained_raw); + context_free(con); + } +#endif + return 0; + out: + freecon(*sc); + *sc = NULL; + return -1; +} + /* Return the default security context for the given username */ -static security_context_t -ssh_selinux_getctxbyname(char *pwname) +static int +ssh_selinux_getctxbyname(char *pwname, + security_context_t *default_sc, security_context_t *user_sc) { - security_context_t sc = NULL; char *sename, *lvl; + const char *reqlvl = NULL; char *role = NULL; - int r = 0; + int r = -1; + context_t con = NULL; + + *default_sc = NULL; + *user_sc = NULL; + if (the_authctxt) { + if (the_authctxt->role != NULL) { + char *slash; + role = xstrdup(the_authctxt->role); + if ((slash = strchr(role, '/')) != NULL) { + *slash = '\0'; + reqlvl = slash + 1; + } + } + } - if (the_authctxt) - role=the_authctxt->role; #ifdef HAVE_GETSEUSERBYNAME if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { sename = NULL; @@ -72,38 +239,63 @@ ssh_selinux_getctxbyname(char *pwname) } #else sename = pwname; - lvl = NULL; + lvl = ""; #endif if (r == 0) { #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL - if (role != NULL && role[0]) - r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc); - else - r = get_default_context_with_level(sename, lvl, NULL, &sc); + r = get_default_context_with_level(sename, lvl, NULL, default_sc); #else - if (role != NULL && role[0]) - r = get_default_context_with_role(sename, role, NULL, &sc); - else - r = get_default_context(sename, NULL, &sc); + r = get_default_context(sename, NULL, default_sc); #endif } - if (r != 0) { - switch (security_getenforce()) { - case -1: - fatal("%s: ssh_selinux_getctxbyname: " - "security_getenforce() failed", __func__); - case 0: - error("%s: Failed to get default SELinux security " - "context for %s", __func__, pwname); - break; - default: - fatal("%s: Failed to get default SELinux security " - "context for %s (in enforcing mode)", - __func__, pwname); + if (r == 0) { + /* If launched from xinetd, we must use current level */ + if (inetd_flag && !rexeced_flag) { + security_context_t sshdsc=NULL; + + if (getcon_raw(&sshdsc) < 0) + fatal("failed to allocate security context"); + + if ((con=context_new(sshdsc)) == NULL) + fatal("failed to allocate selinux context"); + reqlvl = context_range_get(con); + freecon(sshdsc); + if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0) + /* we actually don't change level */ + reqlvl = ""; + + debug("%s: current connection level '%s'", __func__, reqlvl); + } + + if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) { + r = get_user_context(sename, role, reqlvl, user_sc); + + if (r == 0 && reqlvl != NULL && reqlvl[0]) { + security_context_t default_level_sc = *default_sc; + if (role != NULL && role[0]) { + if (get_user_context(sename, role, lvl, &default_level_sc) < 0) + default_level_sc = *default_sc; + } + /* verify that the requested range is contained in the user range */ + if (mls_range_allowed(default_level_sc, *user_sc)) { + logit("permit MLS level %s (user range %s)", reqlvl, lvl); + } else { + r = -1; + error("deny MLS level %s (user range %s)", reqlvl, lvl); + } + if (default_level_sc != *default_sc) + freecon(default_level_sc); + } + } else { + *user_sc = *default_sc; } } + if (r != 0) { + error("%s: Failed to get default SELinux security " + "context for %s", __func__, pwname); + } #ifdef HAVE_GETSEUSERBYNAME if (sename != NULL) @@ -111,14 +303,20 @@ ssh_selinux_getctxbyname(char *pwname) if (lvl != NULL) xfree(lvl); #endif + if (role != NULL) + xfree(role); + if (con) + context_free(con); - return (sc); + return (r); } /* Set the execution context to the default for the specified user */ void ssh_selinux_setup_exec_context(char *pwname) { + int r = 0; + security_context_t default_ctx = NULL; security_context_t user_ctx = NULL; if (!ssh_selinux_enabled()) @@ -126,22 +324,45 @@ ssh_selinux_setup_exec_context(char *pwn debug3("%s: setting execution context", __func__); - user_ctx = ssh_selinux_getctxbyname(pwname); - if (setexeccon(user_ctx) != 0) { + r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx); + if (r >= 0) { + r = setexeccon(user_ctx); + if (r < 0) { + error("%s: Failed to set SELinux execution context %s for %s", + __func__, user_ctx, pwname); + } +#ifdef HAVE_SETKEYCREATECON + else if (setkeycreatecon(user_ctx) < 0) { + error("%s: Failed to set SELinux keyring creation context %s for %s", + __func__, user_ctx, pwname); + } +#endif + } + if (user_ctx == NULL) { + user_ctx = default_ctx; + } + if (r < 0 || user_ctx != default_ctx) { + /* audit just the case when user changed a role or there was + a failure */ + send_audit_message(r >= 0, default_ctx, user_ctx); + } + if (r < 0) { switch (security_getenforce()) { case -1: fatal("%s: security_getenforce() failed", __func__); case 0: - error("%s: Failed to set SELinux execution " - "context for %s", __func__, pwname); + error("%s: SELinux failure. Continuing in permissive mode.", + __func__); break; default: - fatal("%s: Failed to set SELinux execution context " - "for %s (in enforcing mode)", __func__, pwname); + fatal("%s: SELinux failure. Aborting connection.", + __func__); } } - if (user_ctx != NULL) + if (user_ctx != NULL && user_ctx != default_ctx) freecon(user_ctx); + if (default_ctx != NULL) + freecon(default_ctx); debug3("%s: done", __func__); } @@ -159,7 +380,10 @@ ssh_selinux_setup_pty(char *pwname, cons debug3("%s: setting TTY context on %s", __func__, tty); - user_ctx = ssh_selinux_getctxbyname(pwname); + if (getexeccon(&user_ctx) < 0) { + error("%s: getexeccon: %s", __func__, strerror(errno)); + goto out; + } /* XXX: should these calls fatal() upon failure in enforcing mode? */ diff -up openssh-5.1p1/configure.ac.mls openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.mls 2008-07-23 18:53:37.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 18:53:37.000000000 +0200 @@ -3311,6 +3311,7 @@ AC_ARG_WITH(selinux, SSHDLIBS="$SSHDLIBS $LIBSELINUX" LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + AC_CHECK_FUNCS(setkeycreatecon) LIBS="$save_LIBS" fi ] ) diff -up openssh-5.1p1/sshd.c.mls openssh-5.1p1/sshd.c --- openssh-5.1p1/sshd.c.mls 2008-07-23 18:53:37.000000000 +0200 +++ openssh-5.1p1/sshd.c 2008-07-23 18:53:37.000000000 +0200 @@ -1896,6 +1896,9 @@ main(int ac, char **av) restore_uid(); } #endif +#ifdef WITH_SELINUX + ssh_selinux_setup_exec_context(authctxt->pw->pw_name); +#endif #ifdef USE_PAM if (options.use_pam) { do_pam_setcred(1); openssh-5.1p1-nss-keys.patch: --- NEW FILE openssh-5.1p1-nss-keys.patch --- diff -up openssh-5.1p1/key.c.nss-keys openssh-5.1p1/key.c --- openssh-5.1p1/key.c.nss-keys 2008-07-11 09:35:09.000000000 +0200 +++ openssh-5.1p1/key.c 2008-07-23 19:16:00.000000000 +0200 @@ -96,6 +96,54 @@ key_new(int type) return k; } +#ifdef HAVE_LIBNSS +Key * +key_new_nss(int type) +{ + Key *k = key_new(type); + + k->nss = xcalloc(1, sizeof(*k->nss)); + k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS; + + return k; +} + +Key * +key_new_nss_copy(int type, const Key *c) +{ + Key *k = key_new_nss(type); + + switch (k->type) { + case KEY_RSA: + if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) || + (BN_copy(k->rsa->e, c->rsa->e) == NULL)) + fatal("key_new_nss_copy: BN_copy failed"); + break; + case KEY_DSA: + if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) || + (BN_copy(k->dsa->q, c->dsa->q) == NULL) || + (BN_copy(k->dsa->g, c->dsa->g) == NULL) || + (BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL)) + fatal("key_new_nss_copy: BN_copy failed"); + break; + } + + k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk); + if (k->nss->privk == NULL) + fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed"); + + k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk); + if (k->nss->pubk == NULL) + fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed"); + + if (c->nss->privk->wincx) + k->nss->privk->wincx = xstrdup(c->nss->privk->wincx); + + return k; +} +#endif + + Key * key_new_private(int type) { @@ -151,6 +199,19 @@ key_free(Key *k) fatal("key_free: bad key type %d", k->type); break; } +#ifdef HAVE_LIBNSS + if (k->flags & KEY_FLAG_NSS) { + if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) { + memset(k->nss->privk->wincx, 0, + strlen(k->nss->privk->wincx)); + xfree(k->nss->privk->wincx); + k->nss->privk->wincx = NULL; + } + SECKEY_DestroyPrivateKey(k->nss->privk); + SECKEY_DestroyPublicKey(k->nss->pubk); + xfree(k->nss); + } +#endif xfree(k); } diff -up openssh-5.1p1/ssh-dss.c.nss-keys openssh-5.1p1/ssh-dss.c --- openssh-5.1p1/ssh-dss.c.nss-keys 2006-11-07 13:14:42.000000000 +0100 +++ openssh-5.1p1/ssh-dss.c 2008-07-23 19:16:00.000000000 +0200 @@ -39,6 +39,10 @@ #include "log.h" #include "key.h" +#ifdef HAVE_LIBNSS +#include +#endif + #define INTBLOB_LEN 20 #define SIGBLOB_LEN (2*INTBLOB_LEN) @@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si error("ssh_dss_sign: no DSA key"); return -1; } +#ifdef HAVE_LIBNSS + if (key->flags & KEY_FLAG_NSS) { + SECItem sigitem; + SECItem *rawsig; + + memset(&sigitem, 0, sizeof(sigitem)); + if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, + SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) { + error("ssh_dss_sign: sign failed"); + return -1; + } + + if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) { + error("ssh_dss_sign: der decode failed"); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + return -1; + } + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + if (rawsig->len != SIGBLOB_LEN) { + error("ssh_dss_sign: unsupported signature length %d", + rawsig->len); + SECITEM_ZfreeItem(rawsig, PR_TRUE); + return -1; + } + memcpy(sigblob, rawsig->data, SIGBLOB_LEN); + SECITEM_ZfreeItem(rawsig, PR_TRUE); + } else { +#endif EVP_DigestInit(&md, evp_md); EVP_DigestUpdate(&md, data, datalen); EVP_DigestFinal(&md, digest, &dlen); @@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen); BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen); DSA_SIG_free(sig); - +#ifdef HAVE_LIBNSS + } +#endif if (datafellows & SSH_BUG_SIGBLOB) { if (lenp != NULL) *lenp = SIGBLOB_LEN; diff -up openssh-5.1p1/ssh-agent.c.nss-keys openssh-5.1p1/ssh-agent.c --- openssh-5.1p1/ssh-agent.c.nss-keys 2008-07-04 15:10:49.000000000 +0200 +++ openssh-5.1p1/ssh-agent.c 2008-07-23 19:16:00.000000000 +0200 @@ -80,6 +80,10 @@ #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include "nsskeys.h" +#endif + #if defined(HAVE_SYS_PRCTL_H) #include /* For prctl() and PR_SET_DUMPABLE */ #endif @@ -714,6 +718,114 @@ send: } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS +static void +process_add_nss_key (SocketEntry *e) +{ + char *tokenname = NULL, *keyname = NULL, *password = NULL; + int i, version, success = 0, death = 0, confirm = 0; + Key **keys, *k; + Identity *id; + Idtab *tab; + + tokenname = buffer_get_string(&e->request, NULL); + keyname = buffer_get_string(&e->request, NULL); + password = buffer_get_string(&e->request, NULL); + + while (buffer_len(&e->request)) { + switch (buffer_get_char(&e->request)) { + case SSH_AGENT_CONSTRAIN_LIFETIME: + death = time(NULL) + buffer_get_int(&e->request); + break; + case SSH_AGENT_CONSTRAIN_CONFIRM: + confirm = 1; + break; + default: + break; + } + } + if (lifetime && !death) + death = time(NULL) + lifetime; + + keys = nss_get_keys(tokenname, keyname, password); + /* password is owned by keys[0] now */ + xfree(tokenname); + xfree(keyname); + + if (keys == NULL) { + memset(password, 0, strlen(password)); + xfree(password); + error("nss_get_keys failed"); + goto send; + } + for (i = 0; keys[i] != NULL; i++) { + k = keys[i]; + version = k->type == KEY_RSA1 ? 1 : 2; + tab = idtab_lookup(version); + if (lookup_identity(k, version) == NULL) { + id = xmalloc(sizeof(Identity)); + id->key = k; + id->comment = nss_get_key_label(k); + id->death = death; + id->confirm = confirm; + TAILQ_INSERT_TAIL(&tab->idlist, id, next); + tab->nentries++; + success = 1; + } else { + key_free(k); + } + keys[i] = NULL; + } + xfree(keys); +send: + buffer_put_int(&e->output, 1); + buffer_put_char(&e->output, + success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); +} + +static void +process_remove_nss_key(SocketEntry *e) +{ + char *tokenname = NULL, *keyname = NULL, *password = NULL; + int i, version, success = 0; + Key **keys, *k = NULL; + Identity *id; + Idtab *tab; + + tokenname = buffer_get_string(&e->request, NULL); + keyname = buffer_get_string(&e->request, NULL); + password = buffer_get_string(&e->request, NULL); + + keys = nss_get_keys(tokenname, keyname, password); + xfree(tokenname); + xfree(keyname); + xfree(password); + + if (keys == NULL || keys[0] == NULL) { + error("nss_get_keys failed"); + goto send; + } + for (i = 0; keys[i] != NULL; i++) { + k = keys[i]; + version = k->type == KEY_RSA1 ? 1 : 2; + if ((id = lookup_identity(k, version)) != NULL) { + tab = idtab_lookup(version); + TAILQ_REMOVE(&tab->idlist, id, next); + tab->nentries--; + free_identity(id); + success = 1; + } + key_free(k); + keys[i] = NULL; + } + xfree(keys); +send: + buffer_put_int(&e->output, 1); + buffer_put_char(&e->output, + success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); +} +#endif /* HAVE_LIBNSS */ + /* dispatch incoming messages */ static void @@ -806,6 +918,15 @@ process_message(SocketEntry *e) process_remove_smartcard_key(e); break; #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS + case SSH_AGENTC_ADD_NSS_KEY: + case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED: + process_add_nss_key(e); + break; + case SSH_AGENTC_REMOVE_NSS_KEY: + process_remove_nss_key(e); + break; +#endif /* SMARTCARD */ default: /* Unknown message. Respond with failure. */ error("Unknown message %d", type); diff -up openssh-5.1p1/authfd.h.nss-keys openssh-5.1p1/authfd.h --- openssh-5.1p1/authfd.h.nss-keys 2006-08-05 04:39:39.000000000 +0200 +++ openssh-5.1p1/authfd.h 2008-07-23 19:16:00.000000000 +0200 @@ -49,6 +49,12 @@ #define SSH2_AGENTC_ADD_ID_CONSTRAINED 25 #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26 +/* nss */ +#define SSH_AGENTC_ADD_NSS_KEY 30 +#define SSH_AGENTC_REMOVE_NSS_KEY 31 +#define SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED 32 + + #define SSH_AGENT_CONSTRAIN_LIFETIME 1 #define SSH_AGENT_CONSTRAIN_CONFIRM 2 @@ -83,6 +89,8 @@ int ssh_remove_all_identities(Authentic int ssh_lock_agent(AuthenticationConnection *, int, const char *); int ssh_update_card(AuthenticationConnection *, int, const char *, const char *, u_int, u_int); +int ssh_update_nss_key(AuthenticationConnection *, int, const char *, + const char *, const char *, u_int, u_int); int ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16], diff -up openssh-5.1p1/configure.ac.nss-keys openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.nss-keys 2008-07-23 19:16:00.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 19:16:00.000000000 +0200 @@ -3328,6 +3328,20 @@ AC_ARG_WITH(linux-audit, fi ] ) +# Check whether user wants NSS support +LIBNSS_MSG="no" +AC_ARG_WITH(nss, + [ --with-nss Enable NSS support], + [ if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.]) + LIBNSS_MSG="yes" + CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4" + AC_CHECK_HEADERS(pk11pub.h) + LIBS="$LIBS -lnss3" + fi + ]) +AC_SUBST(LIBNSS) + # Check whether user wants Kerberos 5 support KRB5_MSG="no" AC_ARG_WITH(kerberos5, @@ -4157,6 +4171,7 @@ echo " OSF SIA support echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" echo " Linux audit support: $LINUX_AUDIT_MSG" +echo " NSS support: $LIBNSS_MSG" echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" echo " TCP Wrappers support: $TCPW_MSG" diff -up /dev/null openssh-5.1p1/README.nss --- /dev/null 2008-07-15 11:15:04.125063641 +0200 +++ openssh-5.1p1/README.nss 2008-07-23 19:16:00.000000000 +0200 @@ -0,0 +1,36 @@ +How to use NSS tokens with OpenSSH? + +This version of OpenSSH contains experimental support for authentication using +keys stored in tokens stored in NSS database. This for example includes any +PKCS#11 tokens which are installed in your NSS database. + +As the code is experimental and preliminary only SSH protocol 2 is supported. +The NSS certificate and token databases are looked for in the ~/.ssh +directory or in a directory specified by environment variable NSS_DB_PATH. + +Common operations: + +(1) tell the ssh client to use the NSS keys: + + $ ssh -o 'UseNSS yes' otherhost + + if you want to use a specific token: + + $ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost + +(2) or tell the agent to use the NSS keys: + + $ ssh-add -n + + if you want to use a specific token: + + $ ssh-add -n -T 'My PKCS11 Token' + +(3) extract the public key from token so it can be added to the +server: + + $ ssh-keygen -n + + if you want to use a specific token and/or key: + + $ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID' diff -up openssh-5.1p1/authfd.c.nss-keys openssh-5.1p1/authfd.c --- openssh-5.1p1/authfd.c.nss-keys 2006-09-01 07:38:36.000000000 +0200 +++ openssh-5.1p1/authfd.c 2008-07-23 19:16:00.000000000 +0200 @@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection return decode_reply(type); } +int +ssh_update_nss_key(AuthenticationConnection *auth, int add, + const char *tokenname, const char *keyname, + const char *pass, u_int life, u_int confirm) +{ + Buffer msg; + int type, constrained = (life || confirm); + + if (add) { + type = constrained ? + SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED : + SSH_AGENTC_ADD_NSS_KEY; + } else + type = SSH_AGENTC_REMOVE_NSS_KEY; + + buffer_init(&msg); + buffer_put_char(&msg, type); + buffer_put_cstring(&msg, tokenname); + buffer_put_cstring(&msg, keyname); + buffer_put_cstring(&msg, pass); + + if (constrained) { + if (life != 0) { + buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); + buffer_put_int(&msg, life); + } + if (confirm != 0) + buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); + } + + if (ssh_request_reply(auth, &msg, &msg) == 0) { + buffer_free(&msg); + return 0; + } + type = buffer_get_char(&msg); + buffer_free(&msg); + return decode_reply(type); +} + /* * Removes all identities from the agent. This call is not meant to be used * by normal applications. diff -up openssh-5.1p1/readconf.h.nss-keys openssh-5.1p1/readconf.h --- openssh-5.1p1/readconf.h.nss-keys 2008-06-29 16:04:03.000000000 +0200 +++ openssh-5.1p1/readconf.h 2008-07-23 19:16:00.000000000 +0200 @@ -84,6 +84,8 @@ typedef struct { char *preferred_authentications; char *bind_address; /* local socket address for connection to sshd */ char *smartcard_device; /* Smartcard reader device */ + int use_nss; /* Use NSS library for keys */ + char *nss_token; /* Look for NSS keys on token */ int verify_host_key_dns; /* Verify host key using DNS */ int num_identity_files; /* Number of files for RSA/DSA identities. */ diff -up /dev/null openssh-5.1p1/nsskeys.c --- /dev/null 2008-07-15 11:15:04.125063641 +0200 +++ openssh-5.1p1/nsskeys.c 2008-07-23 19:16:00.000000000 +0200 @@ -0,0 +1,327 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2007 Red Hat, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" +#ifdef HAVE_LIBNSS + +#include + +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include "xmalloc.h" +#include "key.h" +#include "log.h" +#include "misc.h" +#include "nsskeys.h" +#include "pathnames.h" + +static char * +password_cb(PK11SlotInfo *slot, PRBool retry, void *arg) +{ + char *password = arg; + if (retry || password == NULL) + return NULL; + + return PL_strdup(password); +} + +int +nss_init(PK11PasswordFunc pwfn) +{ + char *dbpath; + char buf[MAXPATHLEN]; + + if (NSS_IsInitialized()) + return 0; + + if ((dbpath=getenv("NSS_DB_PATH")) == NULL) { + struct passwd *pw; + if ((pw = getpwuid(getuid())) == NULL || + pw->pw_dir == NULL) { + return -1; + } + snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, + _PATH_SSH_USER_DIR); + dbpath = buf; + } + + if (NSS_Init(dbpath) != SECSuccess) + return -1; + + if (pwfn == NULL) { + pwfn = password_cb; + } + + PK11_SetPasswordFunc(pwfn); + + return 0; +} + +static Key * +make_key_from_privkey(SECKEYPrivateKey *privk, char *password) +{ + Key *k; + switch (SECKEY_GetPrivateKeyType(privk)) { + case rsaKey: + k = key_new_nss(KEY_RSA); + break; + case dsaKey: + k = key_new_nss(KEY_DSA); + break; + default: + return NULL; + } + k->nss->pubk = SECKEY_ConvertToPublicKey(privk); + if (k->nss->pubk != NULL) { + k->nss->privk = SECKEY_CopyPrivateKey(privk); + } + if (k->nss->privk != NULL) { + if (password != NULL) { + k->nss->privk->wincx = xstrdup(password); + } + return k; + } + key_free(k); + return NULL; +} + +static Key ** +add_key_to_list(Key *k, Key **keys, size_t *i, size_t *allocated) +{ + if (*allocated < *i + 2) { + *allocated += 16; + keys = xrealloc(keys, *allocated, sizeof(k)); + } + keys[*i] = k; + (*i)++; + keys[*i] = NULL; + return keys; +} + +static int +nss_convert_pubkey(Key *k) +{ + u_char *n; + unsigned int len; + char *p; + + switch (k->type) { + case KEY_RSA: + n = k->nss->pubk->u.rsa.modulus.data; + len = k->nss->pubk->u.rsa.modulus.len; + + if (BN_bin2bn(n, len, k->rsa->n) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.rsa.publicExponent.data; + len = k->nss->pubk->u.rsa.publicExponent.len; + + if (BN_bin2bn(n, len, k->rsa->e) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + break; + case KEY_DSA: + n = k->nss->pubk->u.dsa.params.prime.data; + len = k->nss->pubk->u.dsa.params.prime.len; + + if (BN_bin2bn(n, len, k->dsa->p) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.params.subPrime.data; + len = k->nss->pubk->u.dsa.params.subPrime.len; + + if (BN_bin2bn(n, len, k->dsa->q) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.params.base.data; + len = k->nss->pubk->u.dsa.params.base.len; + + if (BN_bin2bn(n, len, k->dsa->g) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.publicValue.data; + len = k->nss->pubk->u.dsa.publicValue.len; + + if (BN_bin2bn(n, len, k->dsa->pub_key) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + break; + } + + p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX); + debug("fingerprint %u %s", key_size(k), p); + xfree(p); + + return 0; +} + +static Key ** +nss_find_privkeys(const char *tokenname, const char *keyname, + char *password) +{ + Key *k = NULL; + Key **keys = NULL; + PK11SlotList *slots; + PK11SlotListElement *sle; + size_t allocated = 0; + size_t i = 0; + + if ((slots=PK11_FindSlotsByNames(NULL, NULL, tokenname, PR_TRUE)) == NULL) { + if (tokenname == NULL) { + debug("No NSS token found"); + } else { + debug("NSS token not found: %s", tokenname); + } + return NULL; + } + + for (sle = slots->head; sle; sle = sle->next) { + SECKEYPrivateKeyList *list; + SECKEYPrivateKeyListNode *node; + char *tmppass = password; + + if (PK11_NeedLogin(sle->slot)) { + if (password == NULL) { + char *prompt; + if (asprintf(&prompt, "Enter passphrase for token %s: ", + PK11_GetTokenName(sle->slot)) < 0) + fatal("password_cb: asprintf failed"); + tmppass = read_passphrase(prompt, RP_ALLOW_STDIN); + } + PK11_Authenticate(sle->slot, PR_TRUE, tmppass); + } + + debug("Looking for: %s:%s", tokenname, keyname); + list = PK11_ListPrivKeysInSlot(sle->slot, (char *)keyname, + tmppass); + if (list == NULL && keyname != NULL) { + char *fooname; + /* NSS bug workaround */ + if (asprintf(&fooname, "%s~", keyname) < 0) { + error("nss_find_privkey: asprintf failed"); + PK11_FreeSlotList(slots); + return NULL; + } + list = PK11_ListPrivKeysInSlot(sle->slot, fooname, + tmppass); + free(fooname); + } + if (list == NULL && keyname != NULL) { + CERTCertificate *cert; + SECKEYPrivateKey *privk; + cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), + (char *)keyname); + if (cert == NULL) + goto cleanup; + privk = PK11_FindPrivateKeyFromCert(sle->slot, cert, tmppass); + CERT_DestroyCertificate(cert); + if (privk == NULL) + goto cleanup; + if ((k=make_key_from_privkey(privk, tmppass)) != NULL) { + nss_convert_pubkey(k); + keys = add_key_to_list(k, keys, &i, &allocated); + } + SECKEY_DestroyPrivateKey(privk); + } else { + if (list == NULL) + goto cleanup; + for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list); + node=PRIVKEY_LIST_NEXT(node)) + if ((k=make_key_from_privkey(node->key, tmppass)) != NULL) { + nss_convert_pubkey(k); + keys = add_key_to_list(k, keys, &i, &allocated); + } + SECKEY_DestroyPrivateKeyList(list); + } +cleanup: + if (password == NULL && tmppass != NULL) { + memset(tmppass, 0, strlen(tmppass)); + xfree(tmppass); + } + } + PK11_FreeSlotList(slots); + + return keys; +} + +Key ** +nss_get_keys(const char *tokenname, const char *keyname, + char *password) +{ + Key **keys; + + if (nss_init(NULL) == -1) { + error("Failed to initialize NSS library"); + return NULL; + } + + keys = nss_find_privkeys(tokenname, keyname, password); + if (keys == NULL && keyname != NULL) { + error("Cannot find key in nss, token removed"); + return NULL; + } +#if 0 + keys = xcalloc(3, sizeof(Key *)); + + if (k->type == KEY_RSA) { + n = key_new_nss_copy(KEY_RSA1, k); + + keys[0] = n; + keys[1] = k; + keys[2] = NULL; + } else { + keys[0] = k; + keys[1] = NULL; + } +#endif + return keys; +} + +char * +nss_get_key_label(Key *key) +{ + char *label, *nickname; + + nickname = PK11_GetPrivateKeyNickname(key->nss->privk); + label = xstrdup(nickname); + PORT_Free(nickname); + + return label; +} + +#endif /* HAVE_LIBNSS */ diff -up openssh-5.1p1/ssh.c.nss-keys openssh-5.1p1/ssh.c --- openssh-5.1p1/ssh.c.nss-keys 2008-07-04 04:53:50.000000000 +0200 +++ openssh-5.1p1/ssh.c 2008-07-23 19:16:00.000000000 +0200 @@ -104,6 +104,9 @@ #ifdef SMARTCARD #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include "nsskeys.h" +#endif extern char *__progname; @@ -1235,9 +1238,11 @@ load_public_identity_files(void) int i = 0; Key *public; struct passwd *pw; -#ifdef SMARTCARD +#if defined(SMARTCARD) || defined(HAVE_LIBNSS) Key **keys; +#endif +#ifdef SMARTCARD if (options.smartcard_device != NULL && options.num_identity_files < SSH_MAX_IDENTITY_FILES && (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) { @@ -1260,6 +1265,27 @@ load_public_identity_files(void) xfree(keys); } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS + if (options.use_nss && + options.num_identity_files < SSH_MAX_IDENTITY_FILES && + (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) { + int count; + for (count = 0; keys[count] != NULL; count++) { + memmove(&options.identity_files[1], &options.identity_files[0], + sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1)); + memmove(&options.identity_keys[1], &options.identity_keys[0], + sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1)); + options.num_identity_files++; + options.identity_keys[0] = keys[count]; + options.identity_files[0] = nss_get_key_label(keys[count]); + } + if (options.num_identity_files > SSH_MAX_IDENTITY_FILES) + options.num_identity_files = SSH_MAX_IDENTITY_FILES; + i += count; + xfree(keys); + } +#endif /* HAVE_LIBNSS */ + if ((pw = getpwuid(original_real_uid)) == NULL) fatal("load_public_identity_files: getpwuid failed"); pwname = xstrdup(pw->pw_name); diff -up /dev/null openssh-5.1p1/nsskeys.h --- /dev/null 2008-07-15 11:15:04.125063641 +0200 +++ openssh-5.1p1/nsskeys.h 2008-07-23 19:16:00.000000000 +0200 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2007 Red Hat, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef NSSKEYS_H +#define NSSKEYS_H +#ifdef HAVE_LIBNSS +#include +#include + +int nss_init(PK11PasswordFunc); +Key **nss_get_keys(const char *, const char *, char *); +char *nss_get_key_label(Key *); +/*void sc_close(void);*/ +/*int sc_put_key(Key *, const char *);*/ + +#endif +#endif diff -up openssh-5.1p1/Makefile.in.nss-keys openssh-5.1p1/Makefile.in --- openssh-5.1p1/Makefile.in.nss-keys 2008-07-08 16:21:12.000000000 +0200 +++ openssh-5.1p1/Makefile.in 2008-07-23 19:16:00.000000000 +0200 @@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ - entropy.o scard-opensc.o gss-genr.o umac.o + entropy.o scard-opensc.o gss-genr.o umac.o nsskeys.o SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ sshconnect.o sshconnect1.o sshconnect2.o mux.o diff -up openssh-5.1p1/key.h.nss-keys openssh-5.1p1/key.h --- openssh-5.1p1/key.h.nss-keys 2008-06-12 20:40:35.000000000 +0200 +++ openssh-5.1p1/key.h 2008-07-23 19:16:00.000000000 +0200 @@ -29,11 +29,17 @@ #include #include +#ifdef HAVE_LIBNSS +#include +#include +#endif + typedef struct Key Key; enum types { KEY_RSA1, KEY_RSA, KEY_DSA, + KEY_NSS, KEY_UNSPEC }; enum fp_type { @@ -48,16 +54,30 @@ enum fp_rep { /* key is stored in external hardware */ #define KEY_FLAG_EXT 0x0001 +#define KEY_FLAG_NSS 0x0002 + +#ifdef HAVE_LIBNSS +typedef struct NSSKey NSSKey; +struct NSSKey { + SECKEYPrivateKey *privk; + SECKEYPublicKey *pubk; +}; +#endif struct Key { int type; int flags; RSA *rsa; DSA *dsa; +#ifdef HAVE_LIBNSS + NSSKey *nss; +#endif }; Key *key_new(int); Key *key_new_private(int); +Key *key_new_nss(int); +Key *key_new_nss_copy(int, const Key *); void key_free(Key *); Key *key_demote(const Key *); int key_equal(const Key *, const Key *); diff -up openssh-5.1p1/ssh-add.c.nss-keys openssh-5.1p1/ssh-add.c --- openssh-5.1p1/ssh-add.c.nss-keys 2008-02-28 09:13:52.000000000 +0100 +++ openssh-5.1p1/ssh-add.c 2008-07-23 19:16:00.000000000 +0200 @@ -44,6 +44,14 @@ #include #include "openbsd-compat/openssl-compat.h" +#ifdef HAVE_LIBNSS +#include +#include +#include +#include +#include +#endif + #include #include #include @@ -57,6 +65,7 @@ #include "rsa.h" #include "log.h" #include "key.h" +#include "nsskeys.h" #include "buffer.h" #include "authfd.h" #include "authfile.h" @@ -307,6 +316,117 @@ do_file(AuthenticationConnection *ac, in return 0; } +#ifdef HAVE_LIBNSS +static char * +password_cb(PK11SlotInfo *slot, PRBool retry, void *arg) +{ + char **passcache = arg; + char *password, *p2 = NULL; + char *prompt; + + if (retry) + return NULL; + + if (asprintf(&prompt, "Enter passphrase for token %s: ", + PK11_GetTokenName(slot)) < 0) + fatal("password_cb: asprintf failed"); + + password = read_passphrase(prompt, RP_ALLOW_STDIN); + + if (password != NULL && (p2=PL_strdup(password)) == NULL) { + memset(password, 0, strlen(password)); + fatal("password_cb: PL_strdup failed"); + } + + if (passcache != NULL) { + if (*passcache != NULL) { + memset(*passcache, 0, strlen(*passcache)); + xfree(*passcache); + } + *passcache = password; + } else { + memset(password, 0, strlen(password)); + xfree(password); + } + + return p2; +} + +static int +add_slot_keys(AuthenticationConnection *ac, PK11SlotInfo *slot, int add) +{ + SECKEYPrivateKeyList *list; + SECKEYPrivateKeyListNode *node; + char *passcache = NULL; + char *tokenname; + + int count = 0; + + if (PK11_NeedLogin(slot)) + PK11_Authenticate(slot, PR_TRUE, &passcache); + + if ((list=PK11_ListPrivKeysInSlot(slot, NULL, NULL)) == NULL) { + return 0; + } + + tokenname = PK11_GetTokenName(slot); + + for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list); + node=PRIVKEY_LIST_NEXT(node)) { + char *keyname; + SECKEYPublicKey *pub; + + keyname = PK11_GetPrivateKeyNickname(node->key); + if (keyname == NULL || *keyname == '\0') { + /* no nickname to refer to */ + CERTCertificate *cert; + char *kn; + cert = PK11_GetCertFromPrivateKey(node->key); + if (cert == NULL) + continue; + kn = strchr(cert->nickname, ':'); + if (kn == NULL) + kn = cert->nickname; + else + kn++; + keyname = PORT_Strdup(kn); + CERT_DestroyCertificate(cert); + if (keyname == NULL) + continue; + } + pub = SECKEY_ConvertToPublicKey(node->key); + if (pub == NULL) { + fprintf(stderr, "No public key for: %s:%s\n", + tokenname, keyname); + continue; /* not possible to obtain public key */ + } + SECKEY_DestroyPublicKey(pub); + + if (ssh_update_nss_key(ac, add, tokenname, keyname, + passcache?passcache:"", lifetime, confirm)) { + fprintf(stderr, "Key %s: %s:%s\n", + add?"added":"removed", tokenname, keyname); + count++; + } else { + fprintf(stderr, "Could not %s key: %s:%s\n", + add?"add":"remove", tokenname, keyname); + } + + PORT_Free(keyname); + count++; + } + + if (passcache != NULL) { + memset(passcache, 0, strlen(passcache)); + xfree(passcache); + } + + SECKEY_DestroyPrivateKeyList(list); + + return count; +} +#endif + static void usage(void) { @@ -334,6 +454,10 @@ main(int argc, char **argv) AuthenticationConnection *ac = NULL; char *sc_reader_id = NULL; int i, ch, deleting = 0, ret = 0; +#ifdef HAVE_LIBNSS + char *token_id = NULL; + int use_nss = 0; +#endif /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); @@ -351,7 +475,7 @@ main(int argc, char **argv) "Could not open a connection to your authentication agent.\n"); exit(2); } - while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { + while ((ch = getopt(argc, argv, "lLcdDnxXe:s:t:T:")) != -1) { switch (ch) { case 'l': case 'L': @@ -373,6 +497,11 @@ main(int argc, char **argv) if (delete_all(ac) == -1) ret = 1; goto done; +#ifdef HAVE_LIBNSS + case 'n': + use_nss = 1; + break; +#endif case 's': sc_reader_id = optarg; break; @@ -387,6 +516,11 @@ main(int argc, char **argv) goto done; } break; +#ifdef HAVE_LIBNSS + case 'T': + token_id = optarg; + break; +#endif default: usage(); ret = 1; @@ -400,6 +534,40 @@ main(int argc, char **argv) ret = 1; goto done; } +#ifdef HAVE_LIBNSS + if (use_nss) { + PK11SlotList *slots; + PK11SlotListElement *sle; + int count = 0; + if (nss_init(password_cb) == -1) { + fprintf(stderr, "Failed to initialize NSS library\n"); + ret = 1; + goto done; + } + + if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE, + NULL)) == NULL) { + fprintf(stderr, "No tokens found\n"); + ret = 1; + goto nss_done; + } + + for (sle = slots->head; sle; sle = sle->next) { + int rv; + if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) { + ret = 1; + } + count += rv; + } + if (count == 0) { + ret = 1; + } +nss_done: + NSS_Shutdown(); + clear_pass(); + goto done; + } +#endif if (argc == 0) { char buf[MAXPATHLEN]; struct passwd *pw; diff -up openssh-5.1p1/ssh-rsa.c.nss-keys openssh-5.1p1/ssh-rsa.c --- openssh-5.1p1/ssh-rsa.c.nss-keys 2006-09-01 07:38:37.000000000 +0200 +++ openssh-5.1p1/ssh-rsa.c 2008-07-23 19:16:00.000000000 +0200 @@ -32,6 +32,10 @@ #include "compat.h" #include "ssh.h" +#ifdef HAVE_LIBNSS +#include +#endif + static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *); /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ @@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si error("ssh_rsa_sign: no RSA key"); return -1; } + + slen = RSA_size(key->rsa); + sig = xmalloc(slen); + +#ifdef HAVE_LIBNSS + if (key->flags & KEY_FLAG_NSS) { + SECItem sigitem; + SECOidTag alg; + + memset(&sigitem, 0, sizeof(sigitem)); + alg = (datafellows & SSH_BUG_RSASIGMD5) ? + SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION : + SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION; + + if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, + alg) != SECSuccess) { + error("ssh_rsa_sign: sign failed"); + return -1; + } + if (sigitem.len > slen) { + error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len); + xfree(sig); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + return -1; + } + if (sigitem.len < slen) { + memset(sig, 0, slen - sigitem.len); + } + memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + } else { +#endif nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); @@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si EVP_DigestUpdate(&md, data, datalen); EVP_DigestFinal(&md, digest, &dlen); - slen = RSA_size(key->rsa); - sig = xmalloc(slen); - ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa); memset(digest, 'd', sizeof(digest)); @@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si xfree(sig); return -1; } +#ifdef HAVE_LIBNSS + } +#endif /* encode signature */ buffer_init(&b); buffer_put_cstring(&b, "ssh-rsa"); diff -up openssh-5.1p1/ssh-keygen.c.nss-keys openssh-5.1p1/ssh-keygen.c --- openssh-5.1p1/ssh-keygen.c.nss-keys 2008-07-14 03:28:29.000000000 +0200 +++ openssh-5.1p1/ssh-keygen.c 2008-07-23 19:16:00.000000000 +0200 @@ -53,6 +53,11 @@ #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include +#include "nsskeys.h" +#endif + /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ #define DEFAULT_BITS 2048 #define DEFAULT_BITS_DSA 1024 @@ -501,6 +506,26 @@ do_download(struct passwd *pw, const cha } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS +static void +do_nss_download(struct passwd *pw, const char *tokenname, const char *keyname) +{ + Key **keys = NULL; + int i; + + keys = nss_get_keys(tokenname, keyname, NULL); + if (keys == NULL) + fatal("cannot find public key in NSS"); + for (i = 0; keys[i]; i++) { + key_write(keys[i], stdout); + key_free(keys[i]); + fprintf(stdout, "\n"); + } + xfree(keys); + exit(0); +} +#endif /* HAVE_LIBNSS */ + static void do_fingerprint(struct passwd *pw) { @@ -1083,7 +1108,8 @@ main(int argc, char **argv) Key *private, *public; struct passwd *pw; struct stat st; - int opt, type, fd, download = 0; + int opt, type, fd, download = 1; + int use_nss = 0; u_int32_t memory = 0, generator_wanted = 0, trials = 100; int do_gen_candidates = 0, do_screen_candidates = 0; BIGNUM *start = NULL; @@ -1116,7 +1142,7 @@ main(int argc, char **argv) } while ((opt = getopt(argc, argv, - "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { + "degiqpclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { switch (opt) { case 'b': bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr); @@ -1156,6 +1182,10 @@ main(int argc, char **argv) case 'g': print_generic = 1; break; + case 'n': + use_nss = 1; + download = 1; + break; case 'P': identity_passphrase = optarg; break; @@ -1187,10 +1217,10 @@ main(int argc, char **argv) case 't': key_type_name = optarg; break; - case 'D': - download = 1; - /*FALLTHROUGH*/ case 'U': + download = 0; + /*FALLTHROUGH*/ + case 'D': reader_id = optarg; break; case 'v': @@ -1299,6 +1329,17 @@ main(int argc, char **argv) exit(0); } } + + if (use_nss) { +#ifdef HAVE_LIBNSS + if (download) + do_nss_download(pw, reader_id, identity_file); + else + fatal("no support for NSS key upload."); +#else + fatal("no support for NSS keys."); +#endif + } if (reader_id != NULL) { #ifdef SMARTCARD if (download) diff -up openssh-5.1p1/readconf.c.nss-keys openssh-5.1p1/readconf.c --- openssh-5.1p1/readconf.c.nss-keys 2008-06-29 16:04:03.000000000 +0200 +++ openssh-5.1p1/readconf.c 2008-07-23 19:16:00.000000000 +0200 @@ -124,6 +124,7 @@ typedef enum { oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, + oUseNSS, oNSSToken, oClearAllForwardings, oNoHostAuthenticationForLocalhost, oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, oAddressFamily, oGssAuthentication, oGssDelegateCreds, @@ -210,6 +211,13 @@ static struct { #else { "smartcarddevice", oUnsupported }, #endif +#ifdef HAVE_LIBNSS + { "usenss", oUseNSS }, + { "nsstoken", oNSSToken }, +#else + { "usenss", oUnsupported }, + { "nsstoken", oNSSToken }, +#endif { "clearallforwardings", oClearAllForwardings }, { "enablesshkeysign", oEnableSSHKeysign }, { "verifyhostkeydns", oVerifyHostKeyDNS }, @@ -603,6 +611,14 @@ parse_string: charptr = &options->smartcard_device; goto parse_string; + case oUseNSS: + intptr = &options->use_nss; + goto parse_flag; + + case oNSSToken: + charptr = &options->nss_token; + goto parse_command; + case oProxyCommand: charptr = &options->proxy_command; parse_command: @@ -1055,6 +1071,8 @@ initialize_options(Options * options) options->preferred_authentications = NULL; options->bind_address = NULL; options->smartcard_device = NULL; + options->use_nss = -1; + options->nss_token = NULL; options->enable_ssh_keysign = - 1; options->no_host_authentication_for_localhost = - 1; options->identities_only = - 1; @@ -1184,6 +1202,8 @@ fill_default_options(Options * options) options->no_host_authentication_for_localhost = 0; if (options->identities_only == -1) options->identities_only = 0; + if (options->use_nss == -1) + options->use_nss = 0; if (options->enable_ssh_keysign == -1) options->enable_ssh_keysign = 0; if (options->rekey_limit == -1) openssh-5.1p1-scp-manpage.patch: --- NEW FILE openssh-5.1p1-scp-manpage.patch --- diff -up openssh-5.1p1/scp.1.manpage openssh-5.1p1/scp.1 --- openssh-5.1p1/scp.1.manpage 2008-07-12 09:12:49.000000000 +0200 +++ openssh-5.1p1/scp.1 2008-07-23 19:18:15.000000000 +0200 @@ -66,6 +66,14 @@ treating file names containing as host specifiers. Copies between two remote hosts are also permitted. .Pp +When copying a source file to a target file which already exists, +.Nm +will replace the contents of the target file (keeping the inode). +.Pp +If the target file does not yet exist, an empty file with the target +file name is created, then filled with the source file contents. +No attempt is made at "near-atomic" transfer using temporary files. +.Pp The options are as follows: .Bl -tag -width Ds .It Fl 1 Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- openssh.spec 23 Jul 2008 16:30:14 -0000 1.129 +++ openssh.spec 23 Jul 2008 17:33:16 -0000 1.130 @@ -79,7 +79,7 @@ Patch3: openssh-3.8.1p1-krb5-config.patch Patch4: openssh-5.1p1-vendor.patch Patch12: openssh-5.1p1-selinux.patch -Patch13: openssh-4.7p1-mls.patch +Patch13: openssh-5.1p1-mls.patch Patch16: openssh-4.7p1-audit.patch Patch17: openssh-4.3p2-cve-2007-3102.patch Patch18: openssh-5.0p1-pam_selinux.patch @@ -87,15 +87,15 @@ Patch24: openssh-4.3p1-fromto-remote.patch Patch27: openssh-5.1p1-log-in-chroot.patch Patch30: openssh-4.0p1-exit-deadlock.patch -Patch35: openssh-4.2p1-askpass-progress.patch +Patch35: openssh-5.1p1-askpass-progress.patch Patch38: openssh-4.3p2-askpass-grab-info.patch Patch39: openssh-4.3p2-no-v6only.patch Patch44: openssh-4.3p2-allow-ip-opts.patch Patch49: openssh-4.3p2-gssapi-canohost.patch -Patch51: openssh-4.7p1-nss-keys.patch -Patch54: openssh-4.7p1-gssapi-role.patch +Patch51: openssh-5.1p1-nss-keys.patch +Patch54: openssh-5.1p1-gssapi-role.patch Patch55: openssh-5.1p1-cloexec.patch -Patch62: openssh-3.9p1-scp-manpage.patch +Patch62: openssh-5.1p1-scp-manpage.patch License: BSD Group: Applications/Internet @@ -224,9 +224,9 @@ %patch44 -p1 -b .ip-opts %patch49 -p1 -b .canohost %patch51 -p1 -b .nss-keys -%patch54 -p0 -b .gssapi-role +%patch54 -p1 -b .gssapi-role %patch55 -p1 -b .cloexec -%patch62 -p0 -b .manpage +%patch62 -p1 -b .manpage autoreconf --- openssh-3.9p1-scp-manpage.patch DELETED --- --- openssh-4.2p1-askpass-progress.patch DELETED --- --- openssh-4.7p1-gssapi-role.patch DELETED --- --- openssh-4.7p1-mls.patch DELETED --- --- openssh-4.7p1-nss-keys.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 17:35:17 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Wed, 23 Jul 2008 17:35:17 GMT Subject: rpms/upstart/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 upstart.spec, 1.21, 1.22 Message-ID: <200807231735.m6NHZHmE004801@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4696 Modified Files: .cvsignore sources upstart.spec Log Message: Better revision naming for builds from source control Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Jul 2008 21:31:33 -0000 1.3 +++ .cvsignore 23 Jul 2008 17:34:30 -0000 1.4 @@ -1 +1 @@ -upstart-0.5.0.tar.bz2 +upstart-0.5.0-20080723bzr_dbus_userspace_1045.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Jul 2008 21:31:33 -0000 1.3 +++ sources 23 Jul 2008 17:34:30 -0000 1.4 @@ -1 +1 @@ -a1a362de2720926ad5ca215cb24f6203 upstart-0.5.0.tar.bz2 +7d3813c9632905d667750e78f51ca0dd upstart-0.5.0-20080723bzr_dbus_userspace_1045.tar.bz2 Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- upstart.spec 22 Jul 2008 21:31:33 -0000 1.21 +++ upstart.spec 23 Jul 2008 17:34:30 -0000 1.22 @@ -1,12 +1,20 @@ +%define build_str 20080723bzr_dbus_userspace_1045 +%if build_str +%define build_rel %{build_str}_ +%define build_pkg -%{build_str} +%else +%define build_rel %{nil} +%define build_pkg %{nil} +%endif + Name: upstart Version: 0.5.0 -Release: 0.0.7%{?dist} +Release: %{build_rel}1%{?dist} Summary: An event-driven init system - Group: System Environment/Base License: GPLv2+ URL: http://upstart.ubuntu.com -Source0: http://upstart.ubuntu.com/download/0.3/upstart-%{version}.tar.bz2 +Source0: http://upstart.ubuntu.com/download/0.3/upstart-%{version}%{build_pkg}.tar.bz2 Source1: events.5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 @@ -20,7 +28,7 @@ during shutdown and supervising them while the system is running. %prep -%setup -q +%setup -q -n upstart-%{version}%{build_pkg} %build %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib} @@ -75,6 +83,10 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Wed Jul 23 2008 Casey Dahlin Author: caolanm Update of /cvs/pkgs/rpms/hunspell-sr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4946/devel Modified Files: .cvsignore sources Added Files: hunspell-sr.spec import.log Log Message: --- NEW FILE hunspell-sr.spec --- Name: hunspell-sr Summary: Serbian hunspell dictionaries %define upstreamid 20080711 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://srpski.org/aspell/MySpell-sr_YU-and-sh_YU.tar.gz Group: Applications/Text URL: http://srpski.org/aspell/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ BuildArch: noarch Requires: hunspell %description Serbian hunspell dictionaries. %prep %setup -q -n myspell-sr %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p sr_YU.dic sr_YU.aff sh_YU.dic sh_YU.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ sr_YU_aliases="sr_ME sr_RS" for lang in $sr_YU_aliases; do ln -s sr_YU.aff $lang.aff ln -s sr_YU.dic $lang.dic done sh_YU_aliases="sh_ME sh_RS" for lang in $sh_YU_aliases; do ln -s sh_YU.aff $lang.aff ln -s sh_YU.dic $lang.dic done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_datadir}/myspell/* %changelog * Fri Jul 11 2008 Caolan McNamara - 0.20080711-1 - initial version --- NEW FILE import.log --- hunspell-sr-0_20080711-1_fc9:HEAD:hunspell-sr-0.20080711-1.fc9.src.rpm:1216834691 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sr/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:55:28 -0000 1.1 +++ .cvsignore 23 Jul 2008 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +MySpell-sr_YU-and-sh_YU.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sr/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:55:28 -0000 1.1 +++ sources 23 Jul 2008 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +11faca5e15bb64b60ffa1910f6ced975 MySpell-sr_YU-and-sh_YU.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 17:41:28 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 17:41:28 GMT Subject: rpms/hunspell-sr/F-9 hunspell-sr.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231741.m6NHfS2P005285@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-sr/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5223/F-9 Modified Files: .cvsignore sources Added Files: hunspell-sr.spec import.log Log Message: --- NEW FILE hunspell-sr.spec --- Name: hunspell-sr Summary: Serbian hunspell dictionaries %define upstreamid 20080711 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://srpski.org/aspell/MySpell-sr_YU-and-sh_YU.tar.gz Group: Applications/Text URL: http://srpski.org/aspell/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ BuildArch: noarch Requires: hunspell %description Serbian hunspell dictionaries. %prep %setup -q -n myspell-sr %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p sr_YU.dic sr_YU.aff sh_YU.dic sh_YU.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ sr_YU_aliases="sr_ME sr_RS" for lang in $sr_YU_aliases; do ln -s sr_YU.aff $lang.aff ln -s sr_YU.dic $lang.dic done sh_YU_aliases="sh_ME sh_RS" for lang in $sh_YU_aliases; do ln -s sh_YU.aff $lang.aff ln -s sh_YU.dic $lang.dic done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_datadir}/myspell/* %changelog * Fri Jul 11 2008 Caolan McNamara - 0.20080711-1 - initial version --- NEW FILE import.log --- hunspell-sr-0_20080711-1_fc9:F-9:hunspell-sr-0.20080711-1.fc9.src.rpm:1216834865 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sr/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:55:28 -0000 1.1 +++ .cvsignore 23 Jul 2008 17:40:40 -0000 1.2 @@ -0,0 +1 @@ +MySpell-sr_YU-and-sh_YU.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sr/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:55:28 -0000 1.1 +++ sources 23 Jul 2008 17:40:40 -0000 1.2 @@ -0,0 +1 @@ +11faca5e15bb64b60ffa1910f6ced975 MySpell-sr_YU-and-sh_YU.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 17:44:52 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Wed, 23 Jul 2008 17:44:52 GMT Subject: rpms/upstart/devel upstart.spec,1.22,1.23 Message-ID: <200807231744.m6NHiq22005499@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5436 Modified Files: upstart.spec Log Message: when using bzr tarballs, prefix release with 0. so a 'final' version overrides without epochs or other ugliness Index: upstart.spec =================================================================== RCS file: /cvs/extras/rpms/upstart/devel/upstart.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- upstart.spec 23 Jul 2008 17:34:30 -0000 1.22 +++ upstart.spec 23 Jul 2008 17:44:09 -0000 1.23 @@ -1,6 +1,6 @@ %define build_str 20080723bzr_dbus_userspace_1045 %if build_str -%define build_rel %{build_str}_ +%define build_rel 0.%{build_str}_ %define build_pkg -%{build_str} %else %define build_rel %{nil} From fedora-extras-commits at redhat.com Wed Jul 23 17:52:24 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 17:52:24 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.352,1.353 Message-ID: <200807231752.m6NHqOiG005836@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5796/devel Modified Files: kdelibs.spec Log Message: Attempt to work around circular dependency from phonon-devel pulling in phonon-backend-xine. Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.352 retrieving revision 1.353 diff -u -r1.352 -r1.353 --- kdelibs.spec 23 Jul 2008 16:14:00 -0000 1.352 +++ kdelibs.spec 23 Jul 2008 17:51:34 -0000 1.353 @@ -114,6 +114,8 @@ BuildRequires: OpenEXR-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +# work around circular dependency from phonon-devel pulling in phonon-backend-xine +BuildRequires: phonon-backend-gstreamer BuildRequires: phonon-devel BuildRequires: shared-mime-info BuildRequires: soprano-devel >= 2.0.97 From fedora-extras-commits at redhat.com Wed Jul 23 17:55:48 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 17:55:48 GMT Subject: rpms/flute/devel flute.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231755.m6NHtmcp006151@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/flute/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014/devel Modified Files: .cvsignore sources Added Files: flute.spec import.log Log Message: --- NEW FILE flute.spec --- # Use rpmbuild --without gcj to disable native bits %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: flute Version: 1.3 Release: 3jpp.1%{?dist} Summary: Java CSS parser using SAC License: W3C Group: System Environment/Libraries Source0: http://downloads.sourceforge.net/jfreereport/%{name}-1.3-jfree-20061107.tar.gz URL: http://www.w3.org/Style/CSS/SAC/ BuildRequires: ant, java-devel, jpackage-utils, sac BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: java, jpackage-utils sac %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description Java CSS parser using SAC. %package javadoc Group: Development/Documentation Summary: Javadoc for %{name} %description javadoc Javadoc for %{name}. %prep %setup -q -n flute-1.3-jfree-20061107 find . -name "*.jar" -exec rm -f {} \; build-jar-repository -s -p lib sac %build cd ant ant compile javadoc %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p flute-1.3-jfree-20061107.jar $RPM_BUILD_ROOT%{_javadir}/flute.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) %doc COPYRIGHT.html %{_javadir}/*.jar %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog * Wed May 07 2007 Caolan McNamara 1.3-3jpp.1 - initial import from jpackage * Mon Aug 23 2004 Ralph Apel 1.3-3jpp - update for JPackage 1.5 * Tue May 06 2003 David Walluck 1.3-2jpp - update for JPackage 1.5 * Thu Jul 11 2002 Ville Skytt?? 1.3-1jpp - Update to 1.3. - Use sed instead of bash 2 extension when symlinking jars during build. - Add Distribution tag, fix URL, tweak Summary and description. * Wed Feb 06 2002 Guillaume Rousse 1.2-1jpp - first jpp release --- NEW FILE import.log --- flute-1_3-3jpp_1_fc9:HEAD:flute-1.3-3jpp.1.fc9.src.rpm:1216835742 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flute/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:59:51 -0000 1.1 +++ .cvsignore 23 Jul 2008 17:55:07 -0000 1.2 @@ -0,0 +1 @@ +flute-1.3-jfree-20061107.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flute/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:59:51 -0000 1.1 +++ sources 23 Jul 2008 17:55:07 -0000 1.2 @@ -0,0 +1 @@ +aadb9c5131b308676765271848cf4bd2 flute-1.3-jfree-20061107.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 17:57:34 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 17:57:34 GMT Subject: rpms/kdesdk/F-9 kdesdk.spec,1.100,1.101 Message-ID: <200807231757.m6NHvYuM006343@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6289 Modified Files: kdesdk.spec Log Message: * Wed Jul 23 2008 Rex Dieter 4.0.99-2 - fix -utils dep issues Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- kdesdk.spec 23 Jun 2008 05:18:46 -0000 1.100 +++ kdesdk.spec 23 Jul 2008 17:56:49 -0000 1.101 @@ -1,27 +1,22 @@ Name: kdesdk -Version: 4.0.5 -Release: 3%{?dist} +Version: 4.0.99 +Release: 2%{?dist} Summary: The KDE Software Development Kit (SDK) Group: User Interface/Desktops # FIXME/TODO: Check license License: GPLv2 URL: http://www.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# http://bugzilla.redhat.com/433399, kate missing Category=Utility -Patch1: kdesdk-4.0.1-rh#433399.patch -# backport http://websvn.kde.org/?view=rev&revision=775583 from 4.1 -# (#452054 "Use of the Symbol Viewer plugin crashes kate", kde#156559) -Patch100: kdesdk-4.0.5-kde#156559.patch - BuildRequires: kde-filesystem >= 4 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} +BuildRequires: strigi-devel BuildRequires: cmake BuildRequires: flex BuildRequires: giflib-devel @@ -33,6 +28,7 @@ BuildRequires: libXtst-devel BuildRequires: libtool-ltdl-devel BuildRequires: subversion-devel +BuildRequires: boost-devel # for libiberty (used by kmtrace for cp_demangle) # IMPORTANT: check licensing from time to time, currently libiberty is still # GPLv2+/LGPLv2+ @@ -48,6 +44,10 @@ # not *strictly* required -- Rex Requires(hint): %{name}-utils = %{version}-%{release} +Provides: kaider = %{version}-%{release} +Obsoletes: kaider < %{version}-%{release} +# TODO: Shouldn't we Provides: lokalize too/instead? + %description A collection of applications and tools used by developers, including: * cervisia: a CVS frontend @@ -56,6 +56,7 @@ * kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind) * kompare: diff tool * kuiviewer: displays designer's UI files +* lokalize: computer-aided translation system focusing on productivity and performance * umbrello: UML modeller and UML diagram tool %package libs @@ -65,12 +66,12 @@ %{summary}. %package devel -Summary: Header files for %{name} +Summary: Developer files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: kdelibs4-devel kdepimlibs-devel %description devel -Header files for developing applications using %{name}. +Files for developing applications using %{name}. %package utils Summary: Text utilities from %{name} @@ -78,41 +79,39 @@ %description utils %{summary}, including: po2xml +split2po +swappo xml2pot %prep %setup -q -%patch1 -p1 -b .rh#433399 -%patch100 -p0 -b .kde#156559 %build - mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd - make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} -mkdir %{buildroot} + make install DESTDIR=%{buildroot} -C %{_target_platform} +# unpackaged files +rm -f %{buildroot}%{_kde4_libdir}/libantlr.so + # move devel symlinks mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel pushd %{buildroot}%{_kde4_libdir} for i in lib*.so do case "$i" in - # all these are not symlinks - libkdeinit4_*.so|libkomparedialogpages.so|libkomparediff2.so) - ;; - *) + libkateinterfaces.so) linktarget=`readlink "$i"` rm -f "$i" ln -sf "../../$linktarget" "kde4/devel/$i" @@ -128,10 +127,12 @@ %post %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : %postun %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : %post libs -p /sbin/ldconfig @@ -139,10 +140,12 @@ %files %defattr(-,root,root,-) -%doc COPYING COPYING.LIB COPYING-DOCS README +%doc COPYING COPYING.LIB COPYING.DOC README %{_kde4_bindir}/* -# moved to -utils +# -utils %exclude %{_kde4_bindir}/po2xml +%exclude %{_kde4_bindir}/split2po +%exclude %{_kde4_bindir}/swappo %exclude %{_kde4_bindir}/xml2pot %{_kde4_configdir}/* %{_kde4_appsdir}/cervisia/ @@ -154,10 +157,12 @@ %{_kde4_appsdir}/kbugbuster/ %{_kde4_appsdir}/kcachegrind/* %{_kde4_appsdir}/kconf_update/* +%{_kde4_appsdir}/kdevappwizard/ %{_kde4_appsdir}/kmtrace/ %{_kde4_appsdir}/kompare/ %{_kde4_appsdir}/kuiviewer/* %{_kde4_appsdir}/kuiviewerpart/* +%{_kde4_appsdir}/lokalize/ %{_kde4_appsdir}/umbrello/ %{_kde4_datadir}/applications/kde4/* %{_kde4_datadir}/config.kcfg/* @@ -172,45 +177,81 @@ %{_kde4_docdir}/HTML/en/kcachegrind/ %{_kde4_docdir}/HTML/en/kdesvn-build/ %{_kde4_docdir}/HTML/en/kompare/ +%{_kde4_docdir}/HTML/en/lokalize/ %{_kde4_docdir}/HTML/en/umbrello/ %{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/locolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* %{_mandir}/man1/* %{_kde4_libdir}/libkdeinit4*.so -%{_kde4_libdir}/strigi/* -%{_kde4_libdir}/kde4/* +%{_kde4_libdir}/libkomparedialogpages.so +%{_kde4_libdir}/libkomparediff2.so +%{_kde4_libdir}/strigi/*.so +%{_kde4_datadir}/strigi/fieldproperties/ +%{_kde4_libdir}/kde4/*.so +# -devel %exclude %{_kde4_libdir}/kde4/devel/ %files libs %defattr(-,root,root,-) %{_kde4_libdir}/lib*.so.* -%{_kde4_libdir}/libkomparedialogpages.so -%{_kde4_libdir}/libkomparediff2.so +# -utils +%exclude %{_kde4_libdir}/libantlr.so.* %files devel %defattr(-,root,root,-) %{_kde4_includedir}/* -%{_kde4_libdir}/kde4/devel/* +%{_kde4_libdir}/lib*.so +%exclude %{_kde4_libdir}/libkomparedialogpages.so +%exclude %{_kde4_libdir}/libkomparediff2.so +%{_kde4_libdir}/kde4/devel/lib*.so %files utils %defattr(-,root,root,-) %{_kde4_bindir}/po2xml +%{_kde4_bindir}/split2po +%{_kde4_bindir}/swappo %{_kde4_bindir}/xml2pot - +%{_kde4_libdir}/libantlr.so.* %changelog -* Mon Jun 23 2008 Kevin Kofler 4.0.5-3 -- backport fix for Kate symbol viewer crash from 4.1 (#452054, kde#156559) +* Wed Jul 23 2008 Rex Dieter 4.0.99-2 +- fix -utils dep issues + +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Sat Jun 21 2008 Kevin Kofler 4.0.83-2 +- drop upstreamed rh#433399 patch + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sun Jun 15 2008 Rex Dieter 4.0.82-1 +- 4.0.82 -* Sun Jun 01 2008 Than Ngo 4.0.5-2 -- 4.0.5 +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 -* Fri May 16 2008 Rex Dieter 4.0.4-2 +* Fri May 16 2008 Rex Dieter 4.0.72-2 - %%description: +kate -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Tue May 13 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 +- Obsoletes/Provides kaider (now part of kdesdk, renamed to lokalize) +- add lokalize to description and file list +- add BR strigi-devel for lokalize +- add BR boost-devel (now needed by Umbrello) * Fri Apr 18 2008 Rex Dieter 4.0.3-5 - Requires: kdesdk-utils From fedora-extras-commits at redhat.com Wed Jul 23 17:59:24 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 17:59:24 GMT Subject: rpms/flute/devel flute.spec,1.1,1.2 Message-ID: <200807231759.m6NHxO0e006522@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/flute/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6479 Modified Files: flute.spec Log Message: initial import from jpackage Index: flute.spec =================================================================== RCS file: /cvs/pkgs/rpms/flute/devel/flute.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- flute.spec 23 Jul 2008 17:55:07 -0000 1.1 +++ flute.spec 23 Jul 2008 17:58:43 -0000 1.2 @@ -3,7 +3,7 @@ Name: flute Version: 1.3 -Release: 3jpp.1%{?dist} +Release: 4%{?dist} Summary: Java CSS parser using SAC License: W3C Group: System Environment/Libraries @@ -21,7 +21,7 @@ %endif %description -Java CSS parser using SAC. +A Cascading Style Sheets parser using the Simple API for CSS, for Java. %package javadoc Group: Development/Documentation @@ -67,7 +67,7 @@ %{_javadocdir}/%{name} %changelog -* Wed May 07 2007 Caolan McNamara 1.3-3jpp.1 +* Wed May 07 2007 Caolan McNamara 1.3-4 - initial import from jpackage * Mon Aug 23 2004 Ralph Apel 1.3-3jpp From fedora-extras-commits at redhat.com Wed Jul 23 18:01:27 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 18:01:27 GMT Subject: rpms/kdesdk/devel kdesdk.spec,1.111,1.112 Message-ID: <200807231801.m6NI1RSu013311@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6645 Modified Files: kdesdk.spec Log Message: forward-port F-9 branch fix: fix -utils dep issues Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- kdesdk.spec 23 Jul 2008 15:16:24 -0000 1.111 +++ kdesdk.spec 23 Jul 2008 18:00:34 -0000 1.112 @@ -1,3 +1,4 @@ + Name: kdesdk Version: 4.1.0 Release: 1%{?dist} @@ -65,12 +66,12 @@ %{summary}. %package devel -Summary: Header files for %{name} +Summary: Developer files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: kdelibs4-devel kdepimlibs-devel %description devel -Header files for developing applications using %{name}. +Files for developing applications using %{name}. %package utils Summary: Text utilities from %{name} @@ -78,6 +79,8 @@ %description utils %{summary}, including: po2xml +split2po +swappo xml2pot @@ -99,16 +102,16 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} +# unpackaged files +rm -f %{buildroot}%{_kde4_libdir}/libantlr.so + # move devel symlinks mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel pushd %{buildroot}%{_kde4_libdir} for i in lib*.so do case "$i" in - # all these are not symlinks - libkdeinit4_*.so|libkomparedialogpages.so|libkomparediff2.so) - ;; - *) + libkateinterfaces.so) linktarget=`readlink "$i"` rm -f "$i" ln -sf "../../$linktarget" "kde4/devel/$i" @@ -139,8 +142,10 @@ %defattr(-,root,root,-) %doc COPYING COPYING.LIB COPYING.DOC README %{_kde4_bindir}/* -# moved to -utils +# -utils %exclude %{_kde4_bindir}/po2xml +%exclude %{_kde4_bindir}/split2po +%exclude %{_kde4_bindir}/swappo %exclude %{_kde4_bindir}/xml2pot %{_kde4_configdir}/* %{_kde4_appsdir}/cervisia/ @@ -179,33 +184,44 @@ %{_kde4_iconsdir}/oxygen/*/*/* %{_mandir}/man1/* %{_kde4_libdir}/libkdeinit4*.so -%{_kde4_libdir}/strigi/* -%{_kde4_datadir}/strigi/fieldproperties/strigi_translation.fieldproperties -%{_kde4_libdir}/kde4/* +%{_kde4_libdir}/libkomparedialogpages.so +%{_kde4_libdir}/libkomparediff2.so +%{_kde4_libdir}/strigi/*.so +%{_kde4_datadir}/strigi/fieldproperties/ +%{_kde4_libdir}/kde4/*.so +# -devel %exclude %{_kde4_libdir}/kde4/devel/ %files libs %defattr(-,root,root,-) %{_kde4_libdir}/lib*.so.* -%{_kde4_libdir}/libkomparedialogpages.so -%{_kde4_libdir}/libkomparediff2.so +# -utils +%exclude %{_kde4_libdir}/libantlr.so.* %files devel %defattr(-,root,root,-) %{_kde4_includedir}/* -%{_kde4_libdir}/kde4/devel/* +%{_kde4_libdir}/lib*.so +%exclude %{_kde4_libdir}/libkomparedialogpages.so +%exclude %{_kde4_libdir}/libkomparediff2.so +%{_kde4_libdir}/kde4/devel/lib*.so %files utils %defattr(-,root,root,-) %{_kde4_bindir}/po2xml +%{_kde4_bindir}/split2po +%{_kde4_bindir}/swappo %{_kde4_bindir}/xml2pot - +%{_kde4_libdir}/libantlr.so.* %changelog * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 +* Wed Jul 23 2008 Rex Dieter 4.0.99-2 +- fix -utils dep issues + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Wed Jul 23 18:34:57 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 23 Jul 2008 18:34:57 GMT Subject: rpms/openssh/F-9 openssh-5.1p1-askpass-progress.patch, NONE, 1.1 openssh-5.1p1-cloexec.patch, NONE, 1.1 openssh-5.1p1-gssapi-role.patch, NONE, 1.1 openssh-5.1p1-log-in-chroot.patch, NONE, 1.1 openssh-5.1p1-mls.patch, NONE, 1.1 openssh-5.1p1-nss-keys.patch, NONE, 1.1 openssh-5.1p1-redhat.patch, NONE, 1.1 openssh-5.1p1-scp-manpage.patch, NONE, 1.1 openssh-5.1p1-selinux.patch, NONE, 1.1 openssh-5.1p1-skip-initial.patch, NONE, 1.1 openssh-5.1p1-vendor.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 openssh.spec, 1.126, 1.127 sources, 1.21, 1.22 openssh-3.8.1p1-skip-initial.patch, 1.1, NONE openssh-3.9p1-scp-manpage.patch, 1.1, NONE openssh-4.2p1-askpass-progress.patch, 1.2, NONE openssh-4.5p1-controlcleanup.patch, 1.1, NONE openssh-4.7p1-cloexec.patch, 1.2, NONE openssh-4.7p1-gssapi-role.patch, 1.1, NONE openssh-4.7p1-log-in-chroot.patch, 1.1, NONE openssh-4.7p1-master-race.patch, 1.1, NONE openssh-4.7p1-mls.patch, 1.3, NONE openssh-4.7p1-nss-keys.patch, 1.2, NONE openssh-4.7p1-redhat.patch, 1.2, NONE openssh-4.7p1-selinux.patch, 1.1, NONE openssh-4.7p1-vendor.patch, 1.1, NONE openssh-5.0p1-unbreakalive.patch, 1.1, NONE Message-ID: <200807231834.m6NIYvBI014883@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/openssh/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14782 Modified Files: .cvsignore openssh.spec sources Added Files: openssh-5.1p1-askpass-progress.patch openssh-5.1p1-cloexec.patch openssh-5.1p1-gssapi-role.patch openssh-5.1p1-log-in-chroot.patch openssh-5.1p1-mls.patch openssh-5.1p1-nss-keys.patch openssh-5.1p1-redhat.patch openssh-5.1p1-scp-manpage.patch openssh-5.1p1-selinux.patch openssh-5.1p1-skip-initial.patch openssh-5.1p1-vendor.patch Removed Files: openssh-3.8.1p1-skip-initial.patch openssh-3.9p1-scp-manpage.patch openssh-4.2p1-askpass-progress.patch openssh-4.5p1-controlcleanup.patch openssh-4.7p1-cloexec.patch openssh-4.7p1-gssapi-role.patch openssh-4.7p1-log-in-chroot.patch openssh-4.7p1-master-race.patch openssh-4.7p1-mls.patch openssh-4.7p1-nss-keys.patch openssh-4.7p1-redhat.patch openssh-4.7p1-selinux.patch openssh-4.7p1-vendor.patch openssh-5.0p1-unbreakalive.patch Log Message: * Wed Jul 23 2008 Tomas Mraz - 5.1p1-1 - upgrade to new upstream release - fixed a problem with public key authentication and explicitely specified SELinux role openssh-5.1p1-askpass-progress.patch: --- NEW FILE openssh-5.1p1-askpass-progress.patch --- diff -up openssh-5.1p1/contrib/gnome-ssh-askpass2.c.progress openssh-5.1p1/contrib/gnome-ssh-askpass2.c --- openssh-5.1p1/contrib/gnome-ssh-askpass2.c.progress 2008-07-23 19:05:26.000000000 +0200 +++ openssh-5.1p1/contrib/gnome-ssh-askpass2.c 2008-07-23 19:05:26.000000000 +0200 @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -83,13 +84,24 @@ ok_dialog(GtkWidget *entry, gpointer dia gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); } +static void +move_progress(GtkWidget *entry, gpointer progress) +{ + gdouble step; + g_return_if_fail(GTK_IS_PROGRESS_BAR(progress)); + + step = g_random_double_range(0.03, 0.1); + gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(progress), step); + gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress)); +} + static int passphrase_dialog(char *message) { const char *failed; char *passphrase, *local; int result, grab_tries, grab_server, grab_pointer; - GtkWidget *dialog, *entry; + GtkWidget *dialog, *entry, *progress, *hbox; GdkGrabStatus status; grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); @@ -102,13 +114,31 @@ passphrase_dialog(char *message) "%s", message); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, + FALSE, 0); + gtk_widget_show(hbox); + entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, FALSE, + gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, FALSE, 0); + gtk_entry_set_width_chars(GTK_ENTRY(entry), 2); gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); gtk_widget_grab_focus(entry); gtk_widget_show(entry); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, + FALSE, 8); + gtk_widget_show(hbox); + + progress = gtk_progress_bar_new(); + + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Passphrase length hidden intentionally"); + gtk_box_pack_start(GTK_BOX(hbox), progress, TRUE, + TRUE, 5); + gtk_widget_show(progress); + gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH"); gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); @@ -119,6 +149,8 @@ passphrase_dialog(char *message) gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(ok_dialog), dialog); + g_signal_connect(G_OBJECT(entry), "changed", + G_CALLBACK(move_progress), progress); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); openssh-5.1p1-cloexec.patch: --- NEW FILE openssh-5.1p1-cloexec.patch --- diff -up openssh-5.1p1/sshconnect2.c.cloexec openssh-5.1p1/sshconnect2.c --- openssh-5.1p1/sshconnect2.c.cloexec 2008-07-23 15:21:23.000000000 +0200 +++ openssh-5.1p1/sshconnect2.c 2008-07-23 15:23:19.000000000 +0200 @@ -38,6 +38,7 @@ #include #include #include +#include #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) #include #endif @@ -1267,6 +1268,7 @@ ssh_keysign(Key *key, u_char **sigp, u_i return -1; } if (pid == 0) { + fcntl(packet_get_connection_in(), F_SETFD, 0); /* keep the socket on exec */ permanently_drop_suid(getuid()); close(from[0]); if (dup2(from[1], STDOUT_FILENO) < 0) diff -up openssh-5.1p1/sshconnect.c.cloexec openssh-5.1p1/sshconnect.c --- openssh-5.1p1/sshconnect.c.cloexec 2008-07-02 14:34:30.000000000 +0200 +++ openssh-5.1p1/sshconnect.c 2008-07-23 15:21:23.000000000 +0200 @@ -38,6 +38,7 @@ #include #include #include +#include #include "xmalloc.h" #include "key.h" @@ -194,8 +195,11 @@ ssh_create_socket(int privileged, struct return sock; } sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if (sock < 0) + if (sock < 0) { error("socket: %.100s", strerror(errno)); + return -1; + } + fcntl(sock, F_SETFD, FD_CLOEXEC); /* Bind the socket to an alternative local IP address */ if (options.bind_address == NULL) openssh-5.1p1-gssapi-role.patch: --- NEW FILE openssh-5.1p1-gssapi-role.patch --- Written-by: Nalin Dahyabhai Reviewed-by: Tomas Mraz diff -up openssh-5.1p1/auth2-gss.c.gssapi-role openssh-5.1p1/auth2-gss.c --- openssh-5.1p1/auth2-gss.c.gssapi-role 2007-12-02 12:59:45.000000000 +0100 +++ openssh-5.1p1/auth2-gss.c 2008-07-23 19:18:15.000000000 +0200 @@ -258,6 +258,7 @@ input_gssapi_mic(int type, u_int32_t ple Authctxt *authctxt = ctxt; Gssctxt *gssctxt; int authenticated = 0; + char *micuser; Buffer b; gss_buffer_desc mic, gssbuf; u_int len; @@ -270,7 +271,11 @@ input_gssapi_mic(int type, u_int32_t ple mic.value = packet_get_string(&len); mic.length = len; - ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, + if (authctxt->role && (strlen(authctxt->role) > 0)) + xasprintf(&micuser, "%s/%s", authctxt->user, authctxt->role); + else + micuser = authctxt->user; + ssh_gssapi_buildmic(&b, micuser, authctxt->service, "gssapi-with-mic"); gssbuf.value = buffer_ptr(&b); @@ -282,6 +287,8 @@ input_gssapi_mic(int type, u_int32_t ple logit("GSSAPI MIC check failed"); buffer_free(&b); + if (micuser != authctxt->user) + xfree(micuser); xfree(mic.value); authctxt->postponed = 0; openssh-5.1p1-log-in-chroot.patch: --- NEW FILE openssh-5.1p1-log-in-chroot.patch --- diff -up openssh-5.1p1/sshd.c.log-chroot openssh-5.1p1/sshd.c --- openssh-5.1p1/sshd.c.log-chroot 2008-07-23 15:18:52.000000000 +0200 +++ openssh-5.1p1/sshd.c 2008-07-23 15:18:52.000000000 +0200 @@ -591,6 +591,10 @@ privsep_preauth_child(void) /* Demote the private keys to public keys. */ demote_sensitive_data(); + /* Open the syslog permanently so the chrooted process still + can write to syslog. */ + open_log(); + /* Change our root directory */ if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, diff -up openssh-5.1p1/log.c.log-chroot openssh-5.1p1/log.c --- openssh-5.1p1/log.c.log-chroot 2008-06-10 15:01:51.000000000 +0200 +++ openssh-5.1p1/log.c 2008-07-23 15:18:52.000000000 +0200 @@ -56,6 +56,7 @@ static LogLevel log_level = SYSLOG_LEVEL static int log_on_stderr = 1; static int log_facility = LOG_AUTH; static char *argv0; +static int log_fd_keep; extern char *__progname; @@ -392,10 +393,21 @@ do_log(LogLevel level, const char *fmt, syslog_r(pri, &sdata, "%.500s", fmtbuf); closelog_r(&sdata); #else + if (!log_fd_keep) { openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); + } syslog(pri, "%.500s", fmtbuf); + if (!log_fd_keep) { closelog(); + } #endif } errno = saved_errno; } + +void +open_log(void) +{ + openlog(argv0 ? argv0 : __progname, LOG_PID|LOG_NDELAY, log_facility); + log_fd_keep = 1; +} diff -up openssh-5.1p1/log.h.log-chroot openssh-5.1p1/log.h --- openssh-5.1p1/log.h.log-chroot 2008-06-13 02:22:54.000000000 +0200 +++ openssh-5.1p1/log.h 2008-07-23 15:20:11.000000000 +0200 @@ -66,4 +66,6 @@ void debug3(const char *, ...) __att void do_log(LogLevel, const char *, va_list); void cleanup_exit(int) __attribute__((noreturn)); + +void open_log(void); #endif openssh-5.1p1-mls.patch: --- NEW FILE openssh-5.1p1-mls.patch --- diff -up openssh-5.1p1/misc.c.mls openssh-5.1p1/misc.c --- openssh-5.1p1/misc.c.mls 2008-06-13 06:48:59.000000000 +0200 +++ openssh-5.1p1/misc.c 2008-07-23 18:53:37.000000000 +0200 @@ -427,6 +427,7 @@ char * colon(char *cp) { int flag = 0; + int start = 1; if (*cp == ':') /* Leading colon is part of file name. */ return (0); @@ -440,8 +441,13 @@ colon(char *cp) return (cp+1); if (*cp == ':' && !flag) return (cp); - if (*cp == '/') - return (0); + if (start) { + /* Slash on beginning or after dots only denotes file name. */ + if (*cp == '/') + return (0); + if (*cp != '.') + start = 0; + } } return (0); } diff -up openssh-5.1p1/session.c.mls openssh-5.1p1/session.c --- openssh-5.1p1/session.c.mls 2008-06-16 15:29:18.000000000 +0200 +++ openssh-5.1p1/session.c 2008-07-23 18:53:37.000000000 +0200 @@ -1550,10 +1550,6 @@ do_setusercontext(struct passwd *pw) #endif if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); - -#ifdef WITH_SELINUX - ssh_selinux_setup_exec_context(pw->pw_name); -#endif } static void diff -up openssh-5.1p1/openbsd-compat/port-linux.c.mls openssh-5.1p1/openbsd-compat/port-linux.c --- openssh-5.1p1/openbsd-compat/port-linux.c.mls 2008-07-23 18:53:37.000000000 +0200 +++ openssh-5.1p1/openbsd-compat/port-linux.c 2008-07-23 18:53:37.000000000 +0200 @@ -33,12 +33,23 @@ #include "key.h" #include "hostfile.h" #include "auth.h" +#include "xmalloc.h" #include #include +#include #include +#include +#include + +#ifdef HAVE_LINUX_AUDIT +#include +#include +#endif extern Authctxt *the_authctxt; +extern int inetd_flag; +extern int rexeced_flag; /* Wrapper around is_selinux_enabled() to log its return value once only */ int @@ -54,17 +65,173 @@ ssh_selinux_enabled(void) return (enabled); } +/* Send audit message */ +static int +send_audit_message(int success, security_context_t default_context, + security_context_t selected_context) +{ + int rc=0; +#ifdef HAVE_LINUX_AUDIT + char *msg = NULL; + int audit_fd = audit_open(); + security_context_t default_raw=NULL; + security_context_t selected_raw=NULL; + rc = -1; + if (audit_fd < 0) { + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) + return 0; /* No audit support in kernel */ + error("Error connecting to audit system."); + return rc; + } + if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) { + error("Error translating default context."); + default_raw = NULL; + } + if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) { + error("Error translating selected context."); + selected_raw = NULL; + } + if (asprintf(&msg, "sshd: default-context=%s selected-context=%s", + default_raw ? default_raw : (default_context ? default_context: "?"), + selected_context ? selected_raw : (selected_context ? selected_context :"?")) < 0) { + error("Error allocating memory."); + goto out; + } + if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, + msg, NULL, NULL, NULL, success) <= 0) { + error("Error sending audit message."); + goto out; + } + rc = 0; + out: + free(msg); + freecon(default_raw); + freecon(selected_raw); + close(audit_fd); +#endif + return rc; +} + +static int +mls_range_allowed(security_context_t src, security_context_t dst) +{ + struct av_decision avd; + int retval; + unsigned int bit = CONTEXT__CONTAINS; + + debug("%s: src:%s dst:%s", __func__, src, dst); + retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd); + if (retval || ((bit & avd.allowed) != bit)) + return 0; + + return 1; +} + +static int +get_user_context(const char *sename, const char *role, const char *lvl, + security_context_t *sc) { +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + if (lvl == NULL || lvl[0] == '\0' || get_default_context_with_level(sename, lvl, NULL, sc) != 0) { + /* User may have requested a level completely outside of his + allowed range. We get a context just for auditing as the + range check below will certainly fail for default context. */ +#endif + if (get_default_context(sename, NULL, sc) != 0) { + *sc = NULL; + return -1; + } +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + } +#endif + if (role != NULL && role[0]) { + context_t con; + char *type=NULL; + if (get_default_type(role, &type) != 0) { + error("get_default_type: failed to get default type for '%s'", + role); + goto out; + } + con = context_new(*sc); + if (!con) { + goto out; + } + context_role_set(con, role); + context_type_set(con, type); + freecon(*sc); + *sc = strdup(context_str(con)); + context_free(con); + if (!*sc) + return -1; + } +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + if (lvl != NULL && lvl[0]) { + /* verify that the requested range is obtained */ + context_t con; + security_context_t obtained_raw; + security_context_t requested_raw; + con = context_new(*sc); + if (!con) { + goto out; + } + context_range_set(con, lvl); + if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) { + context_free(con); + goto out; + } + if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) { + freecon(obtained_raw); + context_free(con); + goto out; + } + + debug("get_user_context: obtained context '%s' requested context '%s'", + obtained_raw, requested_raw); + if (strcmp(obtained_raw, requested_raw)) { + /* set the context to the real requested one but fail */ + freecon(requested_raw); + freecon(obtained_raw); + freecon(*sc); + *sc = strdup(context_str(con)); + context_free(con); + return -1; + } + freecon(requested_raw); + freecon(obtained_raw); + context_free(con); + } +#endif + return 0; + out: + freecon(*sc); + *sc = NULL; + return -1; +} + /* Return the default security context for the given username */ -static security_context_t -ssh_selinux_getctxbyname(char *pwname) +static int +ssh_selinux_getctxbyname(char *pwname, + security_context_t *default_sc, security_context_t *user_sc) { - security_context_t sc = NULL; char *sename, *lvl; + const char *reqlvl = NULL; char *role = NULL; - int r = 0; + int r = -1; + context_t con = NULL; + + *default_sc = NULL; + *user_sc = NULL; + if (the_authctxt) { + if (the_authctxt->role != NULL) { + char *slash; + role = xstrdup(the_authctxt->role); + if ((slash = strchr(role, '/')) != NULL) { + *slash = '\0'; + reqlvl = slash + 1; + } + } + } - if (the_authctxt) - role=the_authctxt->role; #ifdef HAVE_GETSEUSERBYNAME if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { sename = NULL; @@ -72,38 +239,63 @@ ssh_selinux_getctxbyname(char *pwname) } #else sename = pwname; - lvl = NULL; + lvl = ""; #endif if (r == 0) { #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL - if (role != NULL && role[0]) - r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc); - else - r = get_default_context_with_level(sename, lvl, NULL, &sc); + r = get_default_context_with_level(sename, lvl, NULL, default_sc); #else - if (role != NULL && role[0]) - r = get_default_context_with_role(sename, role, NULL, &sc); - else - r = get_default_context(sename, NULL, &sc); + r = get_default_context(sename, NULL, default_sc); #endif } - if (r != 0) { - switch (security_getenforce()) { - case -1: - fatal("%s: ssh_selinux_getctxbyname: " - "security_getenforce() failed", __func__); - case 0: - error("%s: Failed to get default SELinux security " - "context for %s", __func__, pwname); - break; - default: - fatal("%s: Failed to get default SELinux security " - "context for %s (in enforcing mode)", - __func__, pwname); + if (r == 0) { + /* If launched from xinetd, we must use current level */ + if (inetd_flag && !rexeced_flag) { + security_context_t sshdsc=NULL; + + if (getcon_raw(&sshdsc) < 0) + fatal("failed to allocate security context"); + + if ((con=context_new(sshdsc)) == NULL) + fatal("failed to allocate selinux context"); + reqlvl = context_range_get(con); + freecon(sshdsc); + if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0) + /* we actually don't change level */ + reqlvl = ""; + + debug("%s: current connection level '%s'", __func__, reqlvl); + } + + if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) { + r = get_user_context(sename, role, reqlvl, user_sc); + + if (r == 0 && reqlvl != NULL && reqlvl[0]) { + security_context_t default_level_sc = *default_sc; + if (role != NULL && role[0]) { + if (get_user_context(sename, role, lvl, &default_level_sc) < 0) + default_level_sc = *default_sc; + } + /* verify that the requested range is contained in the user range */ + if (mls_range_allowed(default_level_sc, *user_sc)) { + logit("permit MLS level %s (user range %s)", reqlvl, lvl); + } else { + r = -1; + error("deny MLS level %s (user range %s)", reqlvl, lvl); + } + if (default_level_sc != *default_sc) + freecon(default_level_sc); + } + } else { + *user_sc = *default_sc; } } + if (r != 0) { + error("%s: Failed to get default SELinux security " + "context for %s", __func__, pwname); + } #ifdef HAVE_GETSEUSERBYNAME if (sename != NULL) @@ -111,14 +303,20 @@ ssh_selinux_getctxbyname(char *pwname) if (lvl != NULL) xfree(lvl); #endif + if (role != NULL) + xfree(role); + if (con) + context_free(con); - return (sc); + return (r); } /* Set the execution context to the default for the specified user */ void ssh_selinux_setup_exec_context(char *pwname) { + int r = 0; + security_context_t default_ctx = NULL; security_context_t user_ctx = NULL; if (!ssh_selinux_enabled()) @@ -126,22 +324,45 @@ ssh_selinux_setup_exec_context(char *pwn debug3("%s: setting execution context", __func__); - user_ctx = ssh_selinux_getctxbyname(pwname); - if (setexeccon(user_ctx) != 0) { + r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx); + if (r >= 0) { + r = setexeccon(user_ctx); + if (r < 0) { + error("%s: Failed to set SELinux execution context %s for %s", + __func__, user_ctx, pwname); + } +#ifdef HAVE_SETKEYCREATECON + else if (setkeycreatecon(user_ctx) < 0) { + error("%s: Failed to set SELinux keyring creation context %s for %s", + __func__, user_ctx, pwname); + } +#endif + } + if (user_ctx == NULL) { + user_ctx = default_ctx; + } + if (r < 0 || user_ctx != default_ctx) { + /* audit just the case when user changed a role or there was + a failure */ + send_audit_message(r >= 0, default_ctx, user_ctx); + } + if (r < 0) { switch (security_getenforce()) { case -1: fatal("%s: security_getenforce() failed", __func__); case 0: - error("%s: Failed to set SELinux execution " - "context for %s", __func__, pwname); + error("%s: SELinux failure. Continuing in permissive mode.", + __func__); break; default: - fatal("%s: Failed to set SELinux execution context " - "for %s (in enforcing mode)", __func__, pwname); + fatal("%s: SELinux failure. Aborting connection.", + __func__); } } - if (user_ctx != NULL) + if (user_ctx != NULL && user_ctx != default_ctx) freecon(user_ctx); + if (default_ctx != NULL) + freecon(default_ctx); debug3("%s: done", __func__); } @@ -159,7 +380,10 @@ ssh_selinux_setup_pty(char *pwname, cons debug3("%s: setting TTY context on %s", __func__, tty); - user_ctx = ssh_selinux_getctxbyname(pwname); + if (getexeccon(&user_ctx) < 0) { + error("%s: getexeccon: %s", __func__, strerror(errno)); + goto out; + } /* XXX: should these calls fatal() upon failure in enforcing mode? */ diff -up openssh-5.1p1/configure.ac.mls openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.mls 2008-07-23 18:53:37.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 18:53:37.000000000 +0200 @@ -3311,6 +3311,7 @@ AC_ARG_WITH(selinux, SSHDLIBS="$SSHDLIBS $LIBSELINUX" LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + AC_CHECK_FUNCS(setkeycreatecon) LIBS="$save_LIBS" fi ] ) diff -up openssh-5.1p1/sshd.c.mls openssh-5.1p1/sshd.c --- openssh-5.1p1/sshd.c.mls 2008-07-23 18:53:37.000000000 +0200 +++ openssh-5.1p1/sshd.c 2008-07-23 18:53:37.000000000 +0200 @@ -1896,6 +1896,9 @@ main(int ac, char **av) restore_uid(); } #endif +#ifdef WITH_SELINUX + ssh_selinux_setup_exec_context(authctxt->pw->pw_name); +#endif #ifdef USE_PAM if (options.use_pam) { do_pam_setcred(1); openssh-5.1p1-nss-keys.patch: --- NEW FILE openssh-5.1p1-nss-keys.patch --- diff -up openssh-5.1p1/key.c.nss-keys openssh-5.1p1/key.c --- openssh-5.1p1/key.c.nss-keys 2008-07-11 09:35:09.000000000 +0200 +++ openssh-5.1p1/key.c 2008-07-23 19:16:00.000000000 +0200 @@ -96,6 +96,54 @@ key_new(int type) return k; } +#ifdef HAVE_LIBNSS +Key * +key_new_nss(int type) +{ + Key *k = key_new(type); + + k->nss = xcalloc(1, sizeof(*k->nss)); + k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS; + + return k; +} + +Key * +key_new_nss_copy(int type, const Key *c) +{ + Key *k = key_new_nss(type); + + switch (k->type) { + case KEY_RSA: + if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) || + (BN_copy(k->rsa->e, c->rsa->e) == NULL)) + fatal("key_new_nss_copy: BN_copy failed"); + break; + case KEY_DSA: + if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) || + (BN_copy(k->dsa->q, c->dsa->q) == NULL) || + (BN_copy(k->dsa->g, c->dsa->g) == NULL) || + (BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL)) + fatal("key_new_nss_copy: BN_copy failed"); + break; + } + + k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk); + if (k->nss->privk == NULL) + fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed"); + + k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk); + if (k->nss->pubk == NULL) + fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed"); + + if (c->nss->privk->wincx) + k->nss->privk->wincx = xstrdup(c->nss->privk->wincx); + + return k; +} +#endif + + Key * key_new_private(int type) { @@ -151,6 +199,19 @@ key_free(Key *k) fatal("key_free: bad key type %d", k->type); break; } +#ifdef HAVE_LIBNSS + if (k->flags & KEY_FLAG_NSS) { + if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) { + memset(k->nss->privk->wincx, 0, + strlen(k->nss->privk->wincx)); + xfree(k->nss->privk->wincx); + k->nss->privk->wincx = NULL; + } + SECKEY_DestroyPrivateKey(k->nss->privk); + SECKEY_DestroyPublicKey(k->nss->pubk); + xfree(k->nss); + } +#endif xfree(k); } diff -up openssh-5.1p1/ssh-dss.c.nss-keys openssh-5.1p1/ssh-dss.c --- openssh-5.1p1/ssh-dss.c.nss-keys 2006-11-07 13:14:42.000000000 +0100 +++ openssh-5.1p1/ssh-dss.c 2008-07-23 19:16:00.000000000 +0200 @@ -39,6 +39,10 @@ #include "log.h" #include "key.h" +#ifdef HAVE_LIBNSS +#include +#endif + #define INTBLOB_LEN 20 #define SIGBLOB_LEN (2*INTBLOB_LEN) @@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si error("ssh_dss_sign: no DSA key"); return -1; } +#ifdef HAVE_LIBNSS + if (key->flags & KEY_FLAG_NSS) { + SECItem sigitem; + SECItem *rawsig; + + memset(&sigitem, 0, sizeof(sigitem)); + if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, + SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) { + error("ssh_dss_sign: sign failed"); + return -1; + } + + if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) { + error("ssh_dss_sign: der decode failed"); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + return -1; + } + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + if (rawsig->len != SIGBLOB_LEN) { + error("ssh_dss_sign: unsupported signature length %d", + rawsig->len); + SECITEM_ZfreeItem(rawsig, PR_TRUE); + return -1; + } + memcpy(sigblob, rawsig->data, SIGBLOB_LEN); + SECITEM_ZfreeItem(rawsig, PR_TRUE); + } else { +#endif EVP_DigestInit(&md, evp_md); EVP_DigestUpdate(&md, data, datalen); EVP_DigestFinal(&md, digest, &dlen); @@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen); BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen); DSA_SIG_free(sig); - +#ifdef HAVE_LIBNSS + } +#endif if (datafellows & SSH_BUG_SIGBLOB) { if (lenp != NULL) *lenp = SIGBLOB_LEN; diff -up openssh-5.1p1/ssh-agent.c.nss-keys openssh-5.1p1/ssh-agent.c --- openssh-5.1p1/ssh-agent.c.nss-keys 2008-07-04 15:10:49.000000000 +0200 +++ openssh-5.1p1/ssh-agent.c 2008-07-23 19:16:00.000000000 +0200 @@ -80,6 +80,10 @@ #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include "nsskeys.h" +#endif + #if defined(HAVE_SYS_PRCTL_H) #include /* For prctl() and PR_SET_DUMPABLE */ #endif @@ -714,6 +718,114 @@ send: } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS +static void +process_add_nss_key (SocketEntry *e) +{ + char *tokenname = NULL, *keyname = NULL, *password = NULL; + int i, version, success = 0, death = 0, confirm = 0; + Key **keys, *k; + Identity *id; + Idtab *tab; + + tokenname = buffer_get_string(&e->request, NULL); + keyname = buffer_get_string(&e->request, NULL); + password = buffer_get_string(&e->request, NULL); + + while (buffer_len(&e->request)) { + switch (buffer_get_char(&e->request)) { + case SSH_AGENT_CONSTRAIN_LIFETIME: + death = time(NULL) + buffer_get_int(&e->request); + break; + case SSH_AGENT_CONSTRAIN_CONFIRM: + confirm = 1; + break; + default: + break; + } + } + if (lifetime && !death) + death = time(NULL) + lifetime; + + keys = nss_get_keys(tokenname, keyname, password); + /* password is owned by keys[0] now */ + xfree(tokenname); + xfree(keyname); + + if (keys == NULL) { + memset(password, 0, strlen(password)); + xfree(password); + error("nss_get_keys failed"); + goto send; + } + for (i = 0; keys[i] != NULL; i++) { + k = keys[i]; + version = k->type == KEY_RSA1 ? 1 : 2; + tab = idtab_lookup(version); + if (lookup_identity(k, version) == NULL) { + id = xmalloc(sizeof(Identity)); + id->key = k; + id->comment = nss_get_key_label(k); + id->death = death; + id->confirm = confirm; + TAILQ_INSERT_TAIL(&tab->idlist, id, next); + tab->nentries++; + success = 1; + } else { + key_free(k); + } + keys[i] = NULL; + } + xfree(keys); +send: + buffer_put_int(&e->output, 1); + buffer_put_char(&e->output, + success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); +} + +static void +process_remove_nss_key(SocketEntry *e) +{ + char *tokenname = NULL, *keyname = NULL, *password = NULL; + int i, version, success = 0; + Key **keys, *k = NULL; + Identity *id; + Idtab *tab; + + tokenname = buffer_get_string(&e->request, NULL); + keyname = buffer_get_string(&e->request, NULL); + password = buffer_get_string(&e->request, NULL); + + keys = nss_get_keys(tokenname, keyname, password); + xfree(tokenname); + xfree(keyname); + xfree(password); + + if (keys == NULL || keys[0] == NULL) { + error("nss_get_keys failed"); + goto send; + } + for (i = 0; keys[i] != NULL; i++) { + k = keys[i]; + version = k->type == KEY_RSA1 ? 1 : 2; + if ((id = lookup_identity(k, version)) != NULL) { + tab = idtab_lookup(version); + TAILQ_REMOVE(&tab->idlist, id, next); + tab->nentries--; + free_identity(id); + success = 1; + } + key_free(k); + keys[i] = NULL; + } + xfree(keys); +send: + buffer_put_int(&e->output, 1); + buffer_put_char(&e->output, + success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); +} +#endif /* HAVE_LIBNSS */ + /* dispatch incoming messages */ static void @@ -806,6 +918,15 @@ process_message(SocketEntry *e) process_remove_smartcard_key(e); break; #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS + case SSH_AGENTC_ADD_NSS_KEY: + case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED: + process_add_nss_key(e); + break; + case SSH_AGENTC_REMOVE_NSS_KEY: + process_remove_nss_key(e); + break; +#endif /* SMARTCARD */ default: /* Unknown message. Respond with failure. */ error("Unknown message %d", type); diff -up openssh-5.1p1/authfd.h.nss-keys openssh-5.1p1/authfd.h --- openssh-5.1p1/authfd.h.nss-keys 2006-08-05 04:39:39.000000000 +0200 +++ openssh-5.1p1/authfd.h 2008-07-23 19:16:00.000000000 +0200 @@ -49,6 +49,12 @@ #define SSH2_AGENTC_ADD_ID_CONSTRAINED 25 #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26 +/* nss */ +#define SSH_AGENTC_ADD_NSS_KEY 30 +#define SSH_AGENTC_REMOVE_NSS_KEY 31 +#define SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED 32 + + #define SSH_AGENT_CONSTRAIN_LIFETIME 1 #define SSH_AGENT_CONSTRAIN_CONFIRM 2 @@ -83,6 +89,8 @@ int ssh_remove_all_identities(Authentic int ssh_lock_agent(AuthenticationConnection *, int, const char *); int ssh_update_card(AuthenticationConnection *, int, const char *, const char *, u_int, u_int); +int ssh_update_nss_key(AuthenticationConnection *, int, const char *, + const char *, const char *, u_int, u_int); int ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16], diff -up openssh-5.1p1/configure.ac.nss-keys openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.nss-keys 2008-07-23 19:16:00.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 19:16:00.000000000 +0200 @@ -3328,6 +3328,20 @@ AC_ARG_WITH(linux-audit, fi ] ) +# Check whether user wants NSS support +LIBNSS_MSG="no" +AC_ARG_WITH(nss, + [ --with-nss Enable NSS support], + [ if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.]) + LIBNSS_MSG="yes" + CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4" + AC_CHECK_HEADERS(pk11pub.h) + LIBS="$LIBS -lnss3" + fi + ]) +AC_SUBST(LIBNSS) + # Check whether user wants Kerberos 5 support KRB5_MSG="no" AC_ARG_WITH(kerberos5, @@ -4157,6 +4171,7 @@ echo " OSF SIA support echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" echo " Linux audit support: $LINUX_AUDIT_MSG" +echo " NSS support: $LIBNSS_MSG" echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" echo " TCP Wrappers support: $TCPW_MSG" diff -up /dev/null openssh-5.1p1/README.nss --- /dev/null 2008-07-15 11:15:04.125063641 +0200 +++ openssh-5.1p1/README.nss 2008-07-23 19:16:00.000000000 +0200 @@ -0,0 +1,36 @@ +How to use NSS tokens with OpenSSH? + +This version of OpenSSH contains experimental support for authentication using +keys stored in tokens stored in NSS database. This for example includes any +PKCS#11 tokens which are installed in your NSS database. + +As the code is experimental and preliminary only SSH protocol 2 is supported. +The NSS certificate and token databases are looked for in the ~/.ssh +directory or in a directory specified by environment variable NSS_DB_PATH. + +Common operations: + +(1) tell the ssh client to use the NSS keys: + + $ ssh -o 'UseNSS yes' otherhost + + if you want to use a specific token: + + $ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost + +(2) or tell the agent to use the NSS keys: + + $ ssh-add -n + + if you want to use a specific token: + + $ ssh-add -n -T 'My PKCS11 Token' + +(3) extract the public key from token so it can be added to the +server: + + $ ssh-keygen -n + + if you want to use a specific token and/or key: + + $ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID' diff -up openssh-5.1p1/authfd.c.nss-keys openssh-5.1p1/authfd.c --- openssh-5.1p1/authfd.c.nss-keys 2006-09-01 07:38:36.000000000 +0200 +++ openssh-5.1p1/authfd.c 2008-07-23 19:16:00.000000000 +0200 @@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection return decode_reply(type); } +int +ssh_update_nss_key(AuthenticationConnection *auth, int add, + const char *tokenname, const char *keyname, + const char *pass, u_int life, u_int confirm) +{ + Buffer msg; + int type, constrained = (life || confirm); + + if (add) { + type = constrained ? + SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED : + SSH_AGENTC_ADD_NSS_KEY; + } else + type = SSH_AGENTC_REMOVE_NSS_KEY; + + buffer_init(&msg); + buffer_put_char(&msg, type); + buffer_put_cstring(&msg, tokenname); + buffer_put_cstring(&msg, keyname); + buffer_put_cstring(&msg, pass); + + if (constrained) { + if (life != 0) { + buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); + buffer_put_int(&msg, life); + } + if (confirm != 0) + buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); + } + + if (ssh_request_reply(auth, &msg, &msg) == 0) { + buffer_free(&msg); + return 0; + } + type = buffer_get_char(&msg); + buffer_free(&msg); + return decode_reply(type); +} + /* * Removes all identities from the agent. This call is not meant to be used * by normal applications. diff -up openssh-5.1p1/readconf.h.nss-keys openssh-5.1p1/readconf.h --- openssh-5.1p1/readconf.h.nss-keys 2008-06-29 16:04:03.000000000 +0200 +++ openssh-5.1p1/readconf.h 2008-07-23 19:16:00.000000000 +0200 @@ -84,6 +84,8 @@ typedef struct { char *preferred_authentications; char *bind_address; /* local socket address for connection to sshd */ char *smartcard_device; /* Smartcard reader device */ + int use_nss; /* Use NSS library for keys */ + char *nss_token; /* Look for NSS keys on token */ int verify_host_key_dns; /* Verify host key using DNS */ int num_identity_files; /* Number of files for RSA/DSA identities. */ diff -up /dev/null openssh-5.1p1/nsskeys.c --- /dev/null 2008-07-15 11:15:04.125063641 +0200 +++ openssh-5.1p1/nsskeys.c 2008-07-23 19:16:00.000000000 +0200 @@ -0,0 +1,327 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2007 Red Hat, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" +#ifdef HAVE_LIBNSS + +#include + +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include "xmalloc.h" +#include "key.h" +#include "log.h" +#include "misc.h" +#include "nsskeys.h" +#include "pathnames.h" + +static char * +password_cb(PK11SlotInfo *slot, PRBool retry, void *arg) +{ + char *password = arg; + if (retry || password == NULL) + return NULL; + + return PL_strdup(password); +} + +int +nss_init(PK11PasswordFunc pwfn) +{ + char *dbpath; + char buf[MAXPATHLEN]; + + if (NSS_IsInitialized()) + return 0; + + if ((dbpath=getenv("NSS_DB_PATH")) == NULL) { + struct passwd *pw; + if ((pw = getpwuid(getuid())) == NULL || + pw->pw_dir == NULL) { + return -1; + } + snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, + _PATH_SSH_USER_DIR); + dbpath = buf; + } + + if (NSS_Init(dbpath) != SECSuccess) + return -1; + + if (pwfn == NULL) { + pwfn = password_cb; + } + + PK11_SetPasswordFunc(pwfn); + + return 0; +} + +static Key * +make_key_from_privkey(SECKEYPrivateKey *privk, char *password) +{ + Key *k; + switch (SECKEY_GetPrivateKeyType(privk)) { + case rsaKey: + k = key_new_nss(KEY_RSA); + break; + case dsaKey: + k = key_new_nss(KEY_DSA); + break; + default: + return NULL; + } + k->nss->pubk = SECKEY_ConvertToPublicKey(privk); + if (k->nss->pubk != NULL) { + k->nss->privk = SECKEY_CopyPrivateKey(privk); + } + if (k->nss->privk != NULL) { + if (password != NULL) { + k->nss->privk->wincx = xstrdup(password); + } + return k; + } + key_free(k); + return NULL; +} + +static Key ** +add_key_to_list(Key *k, Key **keys, size_t *i, size_t *allocated) +{ + if (*allocated < *i + 2) { + *allocated += 16; + keys = xrealloc(keys, *allocated, sizeof(k)); + } + keys[*i] = k; + (*i)++; + keys[*i] = NULL; + return keys; +} + +static int +nss_convert_pubkey(Key *k) +{ + u_char *n; + unsigned int len; + char *p; + + switch (k->type) { + case KEY_RSA: + n = k->nss->pubk->u.rsa.modulus.data; + len = k->nss->pubk->u.rsa.modulus.len; + + if (BN_bin2bn(n, len, k->rsa->n) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.rsa.publicExponent.data; + len = k->nss->pubk->u.rsa.publicExponent.len; + + if (BN_bin2bn(n, len, k->rsa->e) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + break; + case KEY_DSA: + n = k->nss->pubk->u.dsa.params.prime.data; + len = k->nss->pubk->u.dsa.params.prime.len; + + if (BN_bin2bn(n, len, k->dsa->p) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.params.subPrime.data; + len = k->nss->pubk->u.dsa.params.subPrime.len; + + if (BN_bin2bn(n, len, k->dsa->q) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.params.base.data; + len = k->nss->pubk->u.dsa.params.base.len; + + if (BN_bin2bn(n, len, k->dsa->g) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.publicValue.data; + len = k->nss->pubk->u.dsa.publicValue.len; + + if (BN_bin2bn(n, len, k->dsa->pub_key) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + break; + } + + p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX); + debug("fingerprint %u %s", key_size(k), p); + xfree(p); + + return 0; +} + +static Key ** +nss_find_privkeys(const char *tokenname, const char *keyname, + char *password) +{ + Key *k = NULL; + Key **keys = NULL; + PK11SlotList *slots; + PK11SlotListElement *sle; + size_t allocated = 0; + size_t i = 0; + + if ((slots=PK11_FindSlotsByNames(NULL, NULL, tokenname, PR_TRUE)) == NULL) { + if (tokenname == NULL) { + debug("No NSS token found"); + } else { + debug("NSS token not found: %s", tokenname); + } + return NULL; + } + + for (sle = slots->head; sle; sle = sle->next) { + SECKEYPrivateKeyList *list; + SECKEYPrivateKeyListNode *node; + char *tmppass = password; + + if (PK11_NeedLogin(sle->slot)) { + if (password == NULL) { + char *prompt; + if (asprintf(&prompt, "Enter passphrase for token %s: ", + PK11_GetTokenName(sle->slot)) < 0) + fatal("password_cb: asprintf failed"); + tmppass = read_passphrase(prompt, RP_ALLOW_STDIN); + } + PK11_Authenticate(sle->slot, PR_TRUE, tmppass); + } + + debug("Looking for: %s:%s", tokenname, keyname); + list = PK11_ListPrivKeysInSlot(sle->slot, (char *)keyname, + tmppass); + if (list == NULL && keyname != NULL) { + char *fooname; + /* NSS bug workaround */ + if (asprintf(&fooname, "%s~", keyname) < 0) { + error("nss_find_privkey: asprintf failed"); + PK11_FreeSlotList(slots); + return NULL; + } + list = PK11_ListPrivKeysInSlot(sle->slot, fooname, + tmppass); + free(fooname); + } + if (list == NULL && keyname != NULL) { + CERTCertificate *cert; + SECKEYPrivateKey *privk; + cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), + (char *)keyname); + if (cert == NULL) + goto cleanup; + privk = PK11_FindPrivateKeyFromCert(sle->slot, cert, tmppass); + CERT_DestroyCertificate(cert); + if (privk == NULL) + goto cleanup; + if ((k=make_key_from_privkey(privk, tmppass)) != NULL) { + nss_convert_pubkey(k); + keys = add_key_to_list(k, keys, &i, &allocated); + } + SECKEY_DestroyPrivateKey(privk); + } else { + if (list == NULL) + goto cleanup; + for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list); + node=PRIVKEY_LIST_NEXT(node)) + if ((k=make_key_from_privkey(node->key, tmppass)) != NULL) { + nss_convert_pubkey(k); + keys = add_key_to_list(k, keys, &i, &allocated); + } + SECKEY_DestroyPrivateKeyList(list); + } +cleanup: + if (password == NULL && tmppass != NULL) { + memset(tmppass, 0, strlen(tmppass)); + xfree(tmppass); + } + } + PK11_FreeSlotList(slots); + + return keys; +} + +Key ** +nss_get_keys(const char *tokenname, const char *keyname, + char *password) +{ + Key **keys; + + if (nss_init(NULL) == -1) { + error("Failed to initialize NSS library"); + return NULL; + } + + keys = nss_find_privkeys(tokenname, keyname, password); + if (keys == NULL && keyname != NULL) { + error("Cannot find key in nss, token removed"); + return NULL; + } +#if 0 + keys = xcalloc(3, sizeof(Key *)); + + if (k->type == KEY_RSA) { + n = key_new_nss_copy(KEY_RSA1, k); + + keys[0] = n; + keys[1] = k; + keys[2] = NULL; + } else { + keys[0] = k; + keys[1] = NULL; + } +#endif + return keys; +} + +char * +nss_get_key_label(Key *key) +{ + char *label, *nickname; + + nickname = PK11_GetPrivateKeyNickname(key->nss->privk); + label = xstrdup(nickname); + PORT_Free(nickname); + + return label; +} + +#endif /* HAVE_LIBNSS */ diff -up openssh-5.1p1/ssh.c.nss-keys openssh-5.1p1/ssh.c --- openssh-5.1p1/ssh.c.nss-keys 2008-07-04 04:53:50.000000000 +0200 +++ openssh-5.1p1/ssh.c 2008-07-23 19:16:00.000000000 +0200 @@ -104,6 +104,9 @@ #ifdef SMARTCARD #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include "nsskeys.h" +#endif extern char *__progname; @@ -1235,9 +1238,11 @@ load_public_identity_files(void) int i = 0; Key *public; struct passwd *pw; -#ifdef SMARTCARD +#if defined(SMARTCARD) || defined(HAVE_LIBNSS) Key **keys; +#endif +#ifdef SMARTCARD if (options.smartcard_device != NULL && options.num_identity_files < SSH_MAX_IDENTITY_FILES && (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) { @@ -1260,6 +1265,27 @@ load_public_identity_files(void) xfree(keys); } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS + if (options.use_nss && + options.num_identity_files < SSH_MAX_IDENTITY_FILES && + (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) { + int count; + for (count = 0; keys[count] != NULL; count++) { + memmove(&options.identity_files[1], &options.identity_files[0], + sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1)); + memmove(&options.identity_keys[1], &options.identity_keys[0], + sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1)); + options.num_identity_files++; + options.identity_keys[0] = keys[count]; + options.identity_files[0] = nss_get_key_label(keys[count]); + } + if (options.num_identity_files > SSH_MAX_IDENTITY_FILES) + options.num_identity_files = SSH_MAX_IDENTITY_FILES; + i += count; + xfree(keys); + } +#endif /* HAVE_LIBNSS */ + if ((pw = getpwuid(original_real_uid)) == NULL) fatal("load_public_identity_files: getpwuid failed"); pwname = xstrdup(pw->pw_name); diff -up /dev/null openssh-5.1p1/nsskeys.h --- /dev/null 2008-07-15 11:15:04.125063641 +0200 +++ openssh-5.1p1/nsskeys.h 2008-07-23 19:16:00.000000000 +0200 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2007 Red Hat, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef NSSKEYS_H +#define NSSKEYS_H +#ifdef HAVE_LIBNSS +#include +#include + +int nss_init(PK11PasswordFunc); +Key **nss_get_keys(const char *, const char *, char *); +char *nss_get_key_label(Key *); +/*void sc_close(void);*/ +/*int sc_put_key(Key *, const char *);*/ + +#endif +#endif diff -up openssh-5.1p1/Makefile.in.nss-keys openssh-5.1p1/Makefile.in --- openssh-5.1p1/Makefile.in.nss-keys 2008-07-08 16:21:12.000000000 +0200 +++ openssh-5.1p1/Makefile.in 2008-07-23 19:16:00.000000000 +0200 @@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ - entropy.o scard-opensc.o gss-genr.o umac.o + entropy.o scard-opensc.o gss-genr.o umac.o nsskeys.o SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ sshconnect.o sshconnect1.o sshconnect2.o mux.o diff -up openssh-5.1p1/key.h.nss-keys openssh-5.1p1/key.h --- openssh-5.1p1/key.h.nss-keys 2008-06-12 20:40:35.000000000 +0200 +++ openssh-5.1p1/key.h 2008-07-23 19:16:00.000000000 +0200 @@ -29,11 +29,17 @@ #include #include +#ifdef HAVE_LIBNSS +#include +#include +#endif + typedef struct Key Key; enum types { KEY_RSA1, KEY_RSA, KEY_DSA, + KEY_NSS, KEY_UNSPEC }; enum fp_type { @@ -48,16 +54,30 @@ enum fp_rep { /* key is stored in external hardware */ #define KEY_FLAG_EXT 0x0001 +#define KEY_FLAG_NSS 0x0002 + +#ifdef HAVE_LIBNSS +typedef struct NSSKey NSSKey; +struct NSSKey { + SECKEYPrivateKey *privk; + SECKEYPublicKey *pubk; +}; +#endif struct Key { int type; int flags; RSA *rsa; DSA *dsa; +#ifdef HAVE_LIBNSS + NSSKey *nss; +#endif }; Key *key_new(int); Key *key_new_private(int); +Key *key_new_nss(int); +Key *key_new_nss_copy(int, const Key *); void key_free(Key *); Key *key_demote(const Key *); int key_equal(const Key *, const Key *); diff -up openssh-5.1p1/ssh-add.c.nss-keys openssh-5.1p1/ssh-add.c --- openssh-5.1p1/ssh-add.c.nss-keys 2008-02-28 09:13:52.000000000 +0100 +++ openssh-5.1p1/ssh-add.c 2008-07-23 19:16:00.000000000 +0200 @@ -44,6 +44,14 @@ #include #include "openbsd-compat/openssl-compat.h" +#ifdef HAVE_LIBNSS +#include +#include +#include +#include +#include +#endif + #include #include #include @@ -57,6 +65,7 @@ #include "rsa.h" #include "log.h" #include "key.h" +#include "nsskeys.h" #include "buffer.h" #include "authfd.h" #include "authfile.h" @@ -307,6 +316,117 @@ do_file(AuthenticationConnection *ac, in return 0; } +#ifdef HAVE_LIBNSS +static char * +password_cb(PK11SlotInfo *slot, PRBool retry, void *arg) +{ + char **passcache = arg; + char *password, *p2 = NULL; + char *prompt; + + if (retry) + return NULL; + + if (asprintf(&prompt, "Enter passphrase for token %s: ", + PK11_GetTokenName(slot)) < 0) + fatal("password_cb: asprintf failed"); + + password = read_passphrase(prompt, RP_ALLOW_STDIN); + + if (password != NULL && (p2=PL_strdup(password)) == NULL) { + memset(password, 0, strlen(password)); + fatal("password_cb: PL_strdup failed"); + } + + if (passcache != NULL) { + if (*passcache != NULL) { + memset(*passcache, 0, strlen(*passcache)); + xfree(*passcache); + } + *passcache = password; + } else { + memset(password, 0, strlen(password)); + xfree(password); + } + + return p2; +} + +static int +add_slot_keys(AuthenticationConnection *ac, PK11SlotInfo *slot, int add) +{ + SECKEYPrivateKeyList *list; + SECKEYPrivateKeyListNode *node; + char *passcache = NULL; + char *tokenname; + + int count = 0; + + if (PK11_NeedLogin(slot)) + PK11_Authenticate(slot, PR_TRUE, &passcache); + + if ((list=PK11_ListPrivKeysInSlot(slot, NULL, NULL)) == NULL) { + return 0; + } + + tokenname = PK11_GetTokenName(slot); + + for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list); + node=PRIVKEY_LIST_NEXT(node)) { + char *keyname; + SECKEYPublicKey *pub; + + keyname = PK11_GetPrivateKeyNickname(node->key); + if (keyname == NULL || *keyname == '\0') { + /* no nickname to refer to */ + CERTCertificate *cert; + char *kn; + cert = PK11_GetCertFromPrivateKey(node->key); + if (cert == NULL) + continue; + kn = strchr(cert->nickname, ':'); + if (kn == NULL) + kn = cert->nickname; + else + kn++; + keyname = PORT_Strdup(kn); + CERT_DestroyCertificate(cert); + if (keyname == NULL) + continue; + } + pub = SECKEY_ConvertToPublicKey(node->key); + if (pub == NULL) { + fprintf(stderr, "No public key for: %s:%s\n", + tokenname, keyname); + continue; /* not possible to obtain public key */ + } + SECKEY_DestroyPublicKey(pub); + + if (ssh_update_nss_key(ac, add, tokenname, keyname, + passcache?passcache:"", lifetime, confirm)) { + fprintf(stderr, "Key %s: %s:%s\n", + add?"added":"removed", tokenname, keyname); + count++; + } else { + fprintf(stderr, "Could not %s key: %s:%s\n", + add?"add":"remove", tokenname, keyname); + } + + PORT_Free(keyname); + count++; + } + + if (passcache != NULL) { + memset(passcache, 0, strlen(passcache)); + xfree(passcache); + } + + SECKEY_DestroyPrivateKeyList(list); + + return count; +} +#endif + static void usage(void) { @@ -334,6 +454,10 @@ main(int argc, char **argv) AuthenticationConnection *ac = NULL; char *sc_reader_id = NULL; int i, ch, deleting = 0, ret = 0; +#ifdef HAVE_LIBNSS + char *token_id = NULL; + int use_nss = 0; +#endif /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); @@ -351,7 +475,7 @@ main(int argc, char **argv) "Could not open a connection to your authentication agent.\n"); exit(2); } - while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { + while ((ch = getopt(argc, argv, "lLcdDnxXe:s:t:T:")) != -1) { switch (ch) { case 'l': case 'L': @@ -373,6 +497,11 @@ main(int argc, char **argv) if (delete_all(ac) == -1) ret = 1; goto done; +#ifdef HAVE_LIBNSS + case 'n': + use_nss = 1; + break; +#endif case 's': sc_reader_id = optarg; break; @@ -387,6 +516,11 @@ main(int argc, char **argv) goto done; } break; +#ifdef HAVE_LIBNSS + case 'T': + token_id = optarg; + break; +#endif default: usage(); ret = 1; @@ -400,6 +534,40 @@ main(int argc, char **argv) ret = 1; goto done; } +#ifdef HAVE_LIBNSS + if (use_nss) { + PK11SlotList *slots; + PK11SlotListElement *sle; + int count = 0; + if (nss_init(password_cb) == -1) { + fprintf(stderr, "Failed to initialize NSS library\n"); + ret = 1; + goto done; + } + + if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE, + NULL)) == NULL) { + fprintf(stderr, "No tokens found\n"); + ret = 1; + goto nss_done; + } + + for (sle = slots->head; sle; sle = sle->next) { + int rv; + if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) { + ret = 1; + } + count += rv; + } + if (count == 0) { + ret = 1; + } +nss_done: + NSS_Shutdown(); + clear_pass(); + goto done; + } +#endif if (argc == 0) { char buf[MAXPATHLEN]; struct passwd *pw; diff -up openssh-5.1p1/ssh-rsa.c.nss-keys openssh-5.1p1/ssh-rsa.c --- openssh-5.1p1/ssh-rsa.c.nss-keys 2006-09-01 07:38:37.000000000 +0200 +++ openssh-5.1p1/ssh-rsa.c 2008-07-23 19:16:00.000000000 +0200 @@ -32,6 +32,10 @@ #include "compat.h" #include "ssh.h" +#ifdef HAVE_LIBNSS +#include +#endif + static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *); /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ @@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si error("ssh_rsa_sign: no RSA key"); return -1; } + + slen = RSA_size(key->rsa); + sig = xmalloc(slen); + +#ifdef HAVE_LIBNSS + if (key->flags & KEY_FLAG_NSS) { + SECItem sigitem; + SECOidTag alg; + + memset(&sigitem, 0, sizeof(sigitem)); + alg = (datafellows & SSH_BUG_RSASIGMD5) ? + SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION : + SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION; + + if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, + alg) != SECSuccess) { + error("ssh_rsa_sign: sign failed"); + return -1; + } + if (sigitem.len > slen) { + error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len); + xfree(sig); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + return -1; + } + if (sigitem.len < slen) { + memset(sig, 0, slen - sigitem.len); + } + memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + } else { +#endif nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); @@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si EVP_DigestUpdate(&md, data, datalen); EVP_DigestFinal(&md, digest, &dlen); - slen = RSA_size(key->rsa); - sig = xmalloc(slen); - ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa); memset(digest, 'd', sizeof(digest)); @@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si xfree(sig); return -1; } +#ifdef HAVE_LIBNSS + } +#endif /* encode signature */ buffer_init(&b); buffer_put_cstring(&b, "ssh-rsa"); diff -up openssh-5.1p1/ssh-keygen.c.nss-keys openssh-5.1p1/ssh-keygen.c --- openssh-5.1p1/ssh-keygen.c.nss-keys 2008-07-14 03:28:29.000000000 +0200 +++ openssh-5.1p1/ssh-keygen.c 2008-07-23 19:16:00.000000000 +0200 @@ -53,6 +53,11 @@ #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include +#include "nsskeys.h" +#endif + /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ #define DEFAULT_BITS 2048 #define DEFAULT_BITS_DSA 1024 @@ -501,6 +506,26 @@ do_download(struct passwd *pw, const cha } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS +static void +do_nss_download(struct passwd *pw, const char *tokenname, const char *keyname) +{ + Key **keys = NULL; + int i; + + keys = nss_get_keys(tokenname, keyname, NULL); + if (keys == NULL) + fatal("cannot find public key in NSS"); + for (i = 0; keys[i]; i++) { + key_write(keys[i], stdout); + key_free(keys[i]); + fprintf(stdout, "\n"); + } + xfree(keys); + exit(0); +} +#endif /* HAVE_LIBNSS */ + static void do_fingerprint(struct passwd *pw) { @@ -1083,7 +1108,8 @@ main(int argc, char **argv) Key *private, *public; struct passwd *pw; struct stat st; - int opt, type, fd, download = 0; + int opt, type, fd, download = 1; + int use_nss = 0; u_int32_t memory = 0, generator_wanted = 0, trials = 100; int do_gen_candidates = 0, do_screen_candidates = 0; BIGNUM *start = NULL; @@ -1116,7 +1142,7 @@ main(int argc, char **argv) } while ((opt = getopt(argc, argv, - "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { + "degiqpclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { switch (opt) { case 'b': bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr); @@ -1156,6 +1182,10 @@ main(int argc, char **argv) case 'g': print_generic = 1; break; + case 'n': + use_nss = 1; + download = 1; + break; case 'P': identity_passphrase = optarg; break; @@ -1187,10 +1217,10 @@ main(int argc, char **argv) case 't': key_type_name = optarg; break; - case 'D': - download = 1; - /*FALLTHROUGH*/ case 'U': + download = 0; + /*FALLTHROUGH*/ + case 'D': reader_id = optarg; break; case 'v': @@ -1299,6 +1329,17 @@ main(int argc, char **argv) exit(0); } } + + if (use_nss) { +#ifdef HAVE_LIBNSS + if (download) + do_nss_download(pw, reader_id, identity_file); + else + fatal("no support for NSS key upload."); +#else + fatal("no support for NSS keys."); +#endif + } if (reader_id != NULL) { #ifdef SMARTCARD if (download) diff -up openssh-5.1p1/readconf.c.nss-keys openssh-5.1p1/readconf.c --- openssh-5.1p1/readconf.c.nss-keys 2008-06-29 16:04:03.000000000 +0200 +++ openssh-5.1p1/readconf.c 2008-07-23 19:16:00.000000000 +0200 @@ -124,6 +124,7 @@ typedef enum { oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, + oUseNSS, oNSSToken, oClearAllForwardings, oNoHostAuthenticationForLocalhost, oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, oAddressFamily, oGssAuthentication, oGssDelegateCreds, @@ -210,6 +211,13 @@ static struct { #else { "smartcarddevice", oUnsupported }, #endif +#ifdef HAVE_LIBNSS + { "usenss", oUseNSS }, + { "nsstoken", oNSSToken }, +#else + { "usenss", oUnsupported }, + { "nsstoken", oNSSToken }, +#endif { "clearallforwardings", oClearAllForwardings }, { "enablesshkeysign", oEnableSSHKeysign }, { "verifyhostkeydns", oVerifyHostKeyDNS }, @@ -603,6 +611,14 @@ parse_string: charptr = &options->smartcard_device; goto parse_string; + case oUseNSS: + intptr = &options->use_nss; + goto parse_flag; + + case oNSSToken: + charptr = &options->nss_token; + goto parse_command; + case oProxyCommand: charptr = &options->proxy_command; parse_command: @@ -1055,6 +1071,8 @@ initialize_options(Options * options) options->preferred_authentications = NULL; options->bind_address = NULL; options->smartcard_device = NULL; + options->use_nss = -1; + options->nss_token = NULL; options->enable_ssh_keysign = - 1; options->no_host_authentication_for_localhost = - 1; options->identities_only = - 1; @@ -1184,6 +1202,8 @@ fill_default_options(Options * options) options->no_host_authentication_for_localhost = 0; if (options->identities_only == -1) options->identities_only = 0; + if (options->use_nss == -1) + options->use_nss = 0; if (options->enable_ssh_keysign == -1) options->enable_ssh_keysign = 0; if (options->rekey_limit == -1) openssh-5.1p1-redhat.patch: --- NEW FILE openssh-5.1p1-redhat.patch --- diff -up openssh-5.1p1/sshd_config.redhat openssh-5.1p1/sshd_config --- openssh-5.1p1/sshd_config.redhat 2008-07-02 14:35:43.000000000 +0200 +++ openssh-5.1p1/sshd_config 2008-07-23 14:11:12.000000000 +0200 @@ -33,6 +33,7 @@ Protocol 2 # Logging # obsoletes QuietMode and FascistLogging #SyslogFacility AUTH +SyslogFacility AUTHPRIV #LogLevel INFO # Authentication: @@ -60,9 +61,11 @@ Protocol 2 # To disable tunneled clear text passwords, change to no here! #PasswordAuthentication yes #PermitEmptyPasswords no +PasswordAuthentication yes # Change to no to disable s/key passwords #ChallengeResponseAuthentication yes +ChallengeResponseAuthentication no # Kerberos options #KerberosAuthentication no @@ -72,7 +75,9 @@ Protocol 2 # GSSAPI options #GSSAPIAuthentication no +GSSAPIAuthentication yes #GSSAPICleanupCredentials yes +GSSAPICleanupCredentials yes # Set this to 'yes' to enable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will @@ -84,11 +89,18 @@ Protocol 2 # PAM authentication, then enable this but set PasswordAuthentication # and ChallengeResponseAuthentication to 'no'. #UsePAM no +UsePAM yes + +# Accept locale-related environment variables +AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES +AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT +AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE #AllowAgentForwarding yes #AllowTcpForwarding yes #GatewayPorts no #X11Forwarding no +X11Forwarding yes #X11DisplayOffset 10 #X11UseLocalhost yes #PrintMotd yes diff -up openssh-5.1p1/ssh_config.redhat openssh-5.1p1/ssh_config --- openssh-5.1p1/ssh_config.redhat 2007-06-11 06:04:42.000000000 +0200 +++ openssh-5.1p1/ssh_config 2008-07-23 14:07:29.000000000 +0200 @@ -43,3 +43,13 @@ # Tunnel no # TunnelDevice any:any # PermitLocalCommand no +Host * + GSSAPIAuthentication yes +# If this option is set to yes then remote X11 clients will have full access +# to the original X11 display. As virtually no X11 client supports the untrusted +# mode correctly we set this to yes. + ForwardX11Trusted yes +# Send locale-related environment variables + SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES + SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT + SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE diff -up openssh-5.1p1/sshd_config.0.redhat openssh-5.1p1/sshd_config.0 --- openssh-5.1p1/sshd_config.0.redhat 2008-07-21 10:30:51.000000000 +0200 +++ openssh-5.1p1/sshd_config.0 2008-07-23 14:07:29.000000000 +0200 @@ -490,9 +490,9 @@ DESCRIPTION SyslogFacility Gives the facility code that is used when logging messages from - sshd(8). The possible values are: DAEMON, USER, AUTH, LOCAL0, - LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The de- - fault is AUTH. + sshd(8). The possible values are: DAEMON, USER, AUTH, AUTHPRIV, + LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. + The default is AUTH. TCPKeepAlive Specifies whether the system should send TCP keepalive messages diff -up openssh-5.1p1/sshd_config.5.redhat openssh-5.1p1/sshd_config.5 --- openssh-5.1p1/sshd_config.5.redhat 2008-07-02 14:35:43.000000000 +0200 +++ openssh-5.1p1/sshd_config.5 2008-07-23 14:07:29.000000000 +0200 @@ -846,7 +846,7 @@ Note that this option applies to protoco .It Cm SyslogFacility Gives the facility code that is used when logging messages from .Xr sshd 8 . -The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2, +The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The default is AUTH. .It Cm TCPKeepAlive openssh-5.1p1-scp-manpage.patch: --- NEW FILE openssh-5.1p1-scp-manpage.patch --- diff -up openssh-5.1p1/scp.1.manpage openssh-5.1p1/scp.1 --- openssh-5.1p1/scp.1.manpage 2008-07-12 09:12:49.000000000 +0200 +++ openssh-5.1p1/scp.1 2008-07-23 19:18:15.000000000 +0200 @@ -66,6 +66,14 @@ treating file names containing as host specifiers. Copies between two remote hosts are also permitted. .Pp +When copying a source file to a target file which already exists, +.Nm +will replace the contents of the target file (keeping the inode). +.Pp +If the target file does not yet exist, an empty file with the target +file name is created, then filled with the source file contents. +No attempt is made at "near-atomic" transfer using temporary files. +.Pp The options are as follows: .Bl -tag -width Ds .It Fl 1 openssh-5.1p1-selinux.patch: --- NEW FILE openssh-5.1p1-selinux.patch --- diff -up openssh-5.1p1/configure.ac.selinux openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.selinux 2008-07-23 16:32:13.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 16:32:13.000000000 +0200 @@ -3309,6 +3309,7 @@ AC_ARG_WITH(selinux, AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], AC_MSG_ERROR(SELinux support requires libselinux library)) SSHDLIBS="$SSHDLIBS $LIBSELINUX" + LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) LIBS="$save_LIBS" fi ] diff -up openssh-5.1p1/auth1.c.selinux openssh-5.1p1/auth1.c --- openssh-5.1p1/auth1.c.selinux 2008-07-23 16:32:13.000000000 +0200 +++ openssh-5.1p1/auth1.c 2008-07-23 16:32:13.000000000 +0200 @@ -391,7 +391,7 @@ void do_authentication(Authctxt *authctxt) { u_int ulen; - char *user, *style = NULL; + char *user, *style = NULL, *role=NULL; /* Get the name of the user that we wish to log in as. */ packet_read_expect(SSH_CMSG_USER); @@ -400,11 +400,19 @@ do_authentication(Authctxt *authctxt) user = packet_get_string(&ulen); packet_check_eom(); + if ((role = strchr(user, '/')) != NULL) + *role++ = '\0'; + if ((style = strchr(user, ':')) != NULL) *style++ = '\0'; + else + if (role && (style = strchr(role, ':')) != NULL) + *style++ = '\0'; + authctxt->user = user; authctxt->style = style; + authctxt->role = role; /* Verify that the user is a valid user. */ if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) diff -up openssh-5.1p1/auth2-pubkey.c.selinux openssh-5.1p1/auth2-pubkey.c --- openssh-5.1p1/auth2-pubkey.c.selinux 2008-07-04 04:54:25.000000000 +0200 +++ openssh-5.1p1/auth2-pubkey.c 2008-07-23 16:32:13.000000000 +0200 @@ -117,7 +117,14 @@ userauth_pubkey(Authctxt *authctxt) } /* reconstruct packet */ buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(&b, authctxt->user); + if (authctxt->role) { + buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); + buffer_append(&b, authctxt->user, strlen(authctxt->user)); + buffer_put_char(&b, '/'); + buffer_append(&b, authctxt->role, strlen(authctxt->role)); + } else { + buffer_put_cstring(&b, authctxt->user); + } buffer_put_cstring(&b, datafellows & SSH_BUG_PKSERVICE ? "ssh-userauth" : diff -up openssh-5.1p1/monitor_wrap.h.selinux openssh-5.1p1/monitor_wrap.h --- openssh-5.1p1/monitor_wrap.h.selinux 2006-08-05 04:39:40.000000000 +0200 +++ openssh-5.1p1/monitor_wrap.h 2008-07-23 16:32:13.000000000 +0200 @@ -41,6 +41,7 @@ int mm_is_monitor(void); DH *mm_choose_dh(int, int, int); int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); void mm_inform_authserv(char *, char *); +void mm_inform_authrole(char *); struct passwd *mm_getpwnamallow(const char *); char *mm_auth2_read_banner(void); int mm_auth_password(struct Authctxt *, char *); diff -up openssh-5.1p1/monitor.h.selinux openssh-5.1p1/monitor.h --- openssh-5.1p1/monitor.h.selinux 2006-03-26 05:30:02.000000000 +0200 +++ openssh-5.1p1/monitor.h 2008-07-23 16:32:13.000000000 +0200 @@ -30,7 +30,7 @@ enum monitor_reqtype { MONITOR_REQ_MODULI, MONITOR_ANS_MODULI, - MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV, + MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE, MONITOR_REQ_SIGN, MONITOR_ANS_SIGN, MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM, MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER, diff -up openssh-5.1p1/auth2-hostbased.c.selinux openssh-5.1p1/auth2-hostbased.c --- openssh-5.1p1/auth2-hostbased.c.selinux 2008-07-17 10:57:19.000000000 +0200 +++ openssh-5.1p1/auth2-hostbased.c 2008-07-23 16:32:13.000000000 +0200 @@ -106,7 +106,14 @@ userauth_hostbased(Authctxt *authctxt) buffer_put_string(&b, session_id2, session_id2_len); /* reconstruct packet */ buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(&b, authctxt->user); + if (authctxt->role) { + buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); + buffer_append(&b, authctxt->user, strlen(authctxt->user)); + buffer_put_char(&b, '/'); + buffer_append(&b, authctxt->role, strlen(authctxt->role)); + } else { + buffer_put_cstring(&b, authctxt->user); + } buffer_put_cstring(&b, service); buffer_put_cstring(&b, "hostbased"); buffer_put_string(&b, pkalg, alen); diff -up openssh-5.1p1/monitor_wrap.c.selinux openssh-5.1p1/monitor_wrap.c --- openssh-5.1p1/monitor_wrap.c.selinux 2008-07-11 09:36:48.000000000 +0200 +++ openssh-5.1p1/monitor_wrap.c 2008-07-23 16:32:13.000000000 +0200 @@ -296,6 +296,23 @@ mm_inform_authserv(char *service, char * buffer_free(&m); } +/* Inform the privileged process about role */ + +void +mm_inform_authrole(char *role) +{ + Buffer m; + + debug3("%s entering", __func__); + + buffer_init(&m); + buffer_put_cstring(&m, role ? role : ""); + + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m); + + buffer_free(&m); +} + /* Do the password authentication */ int mm_auth_password(Authctxt *authctxt, char *password) diff -up openssh-5.1p1/openbsd-compat/port-linux.c.selinux openssh-5.1p1/openbsd-compat/port-linux.c --- openssh-5.1p1/openbsd-compat/port-linux.c.selinux 2008-03-26 21:27:21.000000000 +0100 +++ openssh-5.1p1/openbsd-compat/port-linux.c 2008-07-23 16:32:13.000000000 +0200 @@ -30,11 +30,16 @@ #ifdef WITH_SELINUX #include "log.h" #include "port-linux.h" +#include "key.h" +#include "hostfile.h" +#include "auth.h" #include #include #include +extern Authctxt *the_authctxt; + /* Wrapper around is_selinux_enabled() to log its return value once only */ int ssh_selinux_enabled(void) @@ -53,23 +58,36 @@ ssh_selinux_enabled(void) static security_context_t ssh_selinux_getctxbyname(char *pwname) { - security_context_t sc; - char *sename = NULL, *lvl = NULL; - int r; + security_context_t sc = NULL; + char *sename, *lvl; + char *role = NULL; + int r = 0; + if (the_authctxt) + role=the_authctxt->role; #ifdef HAVE_GETSEUSERBYNAME - if (getseuserbyname(pwname, &sename, &lvl) != 0) - return NULL; + if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { + sename = NULL; + lvl = NULL; + } #else sename = pwname; lvl = NULL; #endif + if (r == 0) { #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL - r = get_default_context_with_level(sename, lvl, NULL, &sc); + if (role != NULL && role[0]) + r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc); + else + r = get_default_context_with_level(sename, lvl, NULL, &sc); #else - r = get_default_context(sename, NULL, &sc); + if (role != NULL && role[0]) + r = get_default_context_with_role(sename, role, NULL, &sc); + else + r = get_default_context(sename, NULL, &sc); #endif + } if (r != 0) { switch (security_getenforce()) { diff -up openssh-5.1p1/auth.h.selinux openssh-5.1p1/auth.h --- openssh-5.1p1/auth.h.selinux 2008-07-02 14:37:30.000000000 +0200 +++ openssh-5.1p1/auth.h 2008-07-23 16:32:13.000000000 +0200 @@ -58,6 +58,7 @@ struct Authctxt { char *service; struct passwd *pw; /* set if 'valid' */ char *style; + char *role; void *kbdintctxt; #ifdef BSD_AUTH auth_session_t *as; diff -up openssh-5.1p1/auth2.c.selinux openssh-5.1p1/auth2.c --- openssh-5.1p1/auth2.c.selinux 2008-07-05 01:44:53.000000000 +0200 +++ openssh-5.1p1/auth2.c 2008-07-23 16:32:13.000000000 +0200 @@ -209,7 +209,7 @@ input_userauth_request(int type, u_int32 { Authctxt *authctxt = ctxt; Authmethod *m = NULL; - char *user, *service, *method, *style = NULL; + char *user, *service, *method, *style = NULL, *role = NULL; int authenticated = 0; if (authctxt == NULL) @@ -221,6 +221,9 @@ input_userauth_request(int type, u_int32 debug("userauth-request for user %s service %s method %s", user, service, method); debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); + if ((role = strchr(user, '/')) != NULL) + *role++ = 0; + if ((style = strchr(user, ':')) != NULL) *style++ = 0; @@ -246,8 +249,11 @@ input_userauth_request(int type, u_int32 use_privsep ? " [net]" : ""); authctxt->service = xstrdup(service); authctxt->style = style ? xstrdup(style) : NULL; - if (use_privsep) + authctxt->role = role ? xstrdup(role) : NULL; + if (use_privsep) { mm_inform_authserv(service, style); + mm_inform_authrole(role); + } userauth_banner(); } else if (strcmp(user, authctxt->user) != 0 || strcmp(service, authctxt->service) != 0) { diff -up openssh-5.1p1/monitor.c.selinux openssh-5.1p1/monitor.c --- openssh-5.1p1/monitor.c.selinux 2008-07-11 09:36:48.000000000 +0200 +++ openssh-5.1p1/monitor.c 2008-07-23 16:36:10.000000000 +0200 @@ -134,6 +134,7 @@ int mm_answer_sign(int, Buffer *); int mm_answer_pwnamallow(int, Buffer *); int mm_answer_auth2_read_banner(int, Buffer *); int mm_answer_authserv(int, Buffer *); +int mm_answer_authrole(int, Buffer *); int mm_answer_authpassword(int, Buffer *); int mm_answer_bsdauthquery(int, Buffer *); int mm_answer_bsdauthrespond(int, Buffer *); @@ -205,6 +206,7 @@ struct mon_table mon_dispatch_proto20[] {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, + {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole}, {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner}, {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, #ifdef USE_PAM @@ -658,6 +660,7 @@ mm_answer_pwnamallow(int sock, Buffer *m else { /* Allow service/style information on the auth context */ monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); + monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1); monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1); } @@ -703,6 +706,23 @@ mm_answer_authserv(int sock, Buffer *m) } int +mm_answer_authrole(int sock, Buffer *m) +{ + monitor_permit_authentications(1); + + authctxt->role = buffer_get_string(m, NULL); + debug3("%s: role=%s", + __func__, authctxt->role); + + if (strlen(authctxt->role) == 0) { + xfree(authctxt->role); + authctxt->role = NULL; + } + + return (0); +} + +int mm_answer_authpassword(int sock, Buffer *m) { static int call_count; @@ -1080,7 +1100,7 @@ static int monitor_valid_userblob(u_char *data, u_int datalen) { Buffer b; - char *p; + char *p, *r; u_int len; int fail = 0; @@ -1106,6 +1126,8 @@ monitor_valid_userblob(u_char *data, u_i if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); + if ((r = strchr(p, '/')) != NULL) + *r = '\0'; if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); @@ -1137,7 +1159,7 @@ monitor_valid_hostbasedblob(u_char *data char *chost) { Buffer b; - char *p; + char *p, *r; u_int len; int fail = 0; @@ -1154,6 +1176,8 @@ monitor_valid_hostbasedblob(u_char *data if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); + if ((r = strchr(p, '/')) != NULL) + *r = '\0'; if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); openssh-5.1p1-skip-initial.patch: --- NEW FILE openssh-5.1p1-skip-initial.patch --- Skip the initial empty-password check if permit_empty_passwd is disabled. This doesn't change the timing profiles of the host because the additional condition check which can short-circuit the call to pam_authenticate() has no dependency on the identity of the user who is being authenticated. diff -up openssh-5.1p1/auth1.c.skip-initial openssh-5.1p1/auth1.c --- openssh-5.1p1/auth1.c.skip-initial 2008-07-09 12:54:05.000000000 +0200 +++ openssh-5.1p1/auth1.c 2008-07-23 18:26:01.000000000 +0200 @@ -244,7 +244,7 @@ do_authloop(Authctxt *authctxt) authctxt->valid ? "" : "invalid user ", authctxt->user); /* If the user has no password, accept authentication immediately. */ - if (options.password_authentication && + if (options.permit_empty_passwd && options.password_authentication && #ifdef KRB5 (!options.kerberos_authentication || options.kerberos_or_local_passwd) && #endif diff -up openssh-5.1p1/auth2-none.c.skip-initial openssh-5.1p1/auth2-none.c --- openssh-5.1p1/auth2-none.c.skip-initial 2008-07-02 14:56:09.000000000 +0200 +++ openssh-5.1p1/auth2-none.c 2008-07-23 18:26:01.000000000 +0200 @@ -65,7 +65,7 @@ userauth_none(Authctxt *authctxt) if (check_nt_auth(1, authctxt->pw) == 0) return (0); #endif - if (options.password_authentication) + if (options.permit_empty_passwd && options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); } openssh-5.1p1-vendor.patch: --- NEW FILE openssh-5.1p1-vendor.patch --- diff -up openssh-5.1p1/configure.ac.vendor openssh-5.1p1/configure.ac --- openssh-5.1p1/configure.ac.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/configure.ac 2008-07-23 14:13:22.000000000 +0200 @@ -3890,6 +3890,12 @@ AC_ARG_WITH(lastlog, fi ] ) +AC_ARG_ENABLE(vendor-patchlevel, + [ --enable-vendor-patchlevel=TAG specify a vendor patch level], + [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.]) + SSH_VENDOR_PATCHLEVEL="$enableval"], + [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.]) + SSH_VENDOR_PATCHLEVEL=none]) dnl lastlog, [uw]tmpx? detection dnl NOTE: set the paths in the platform section to avoid the @@ -4146,6 +4152,7 @@ echo " IP address in \$DISPLAY hac echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " BSD Auth support: $BSD_AUTH_MSG" echo " Random number source: $RAND_MSG" +echo " Vendor patch level: $SSH_VENDOR_PATCHLEVEL" if test ! -z "$USE_RAND_HELPER" ; then echo " ssh-rand-helper collects from: $RAND_HELPER_MSG" fi diff -up openssh-5.1p1/sshd_config.5.vendor openssh-5.1p1/sshd_config.5 --- openssh-5.1p1/sshd_config.5.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/sshd_config.5 2008-07-23 14:19:23.000000000 +0200 @@ -812,6 +812,14 @@ This option applies to protocol version .It Cm ServerKeyBits Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. +.It Cm ShowPatchLevel +Specifies whether +.Nm sshd +will display the patch level of the binary in the identification string. +The patch level is set at compile-time. +The default is +.Dq no . +This option applies to protocol version 1 only. .It Cm StrictModes Specifies whether .Xr sshd 8 diff -up openssh-5.1p1/servconf.h.vendor openssh-5.1p1/servconf.h --- openssh-5.1p1/servconf.h.vendor 2008-06-10 15:01:51.000000000 +0200 +++ openssh-5.1p1/servconf.h 2008-07-23 14:13:22.000000000 +0200 @@ -126,6 +126,7 @@ typedef struct { int max_authtries; int max_sessions; char *banner; /* SSH-2 banner message */ + int show_patchlevel; /* Show vendor patch level to clients */ int use_dns; int client_alive_interval; /* * poke the client this often to diff -up openssh-5.1p1/servconf.c.vendor openssh-5.1p1/servconf.c --- openssh-5.1p1/servconf.c.vendor 2008-07-04 05:51:12.000000000 +0200 +++ openssh-5.1p1/servconf.c 2008-07-23 14:32:27.000000000 +0200 @@ -117,6 +117,7 @@ initialize_server_options(ServerOptions options->max_authtries = -1; options->max_sessions = -1; options->banner = NULL; + options->show_patchlevel = -1; options->use_dns = -1; options->client_alive_interval = -1; options->client_alive_count_max = -1; @@ -259,6 +260,9 @@ fill_default_server_options(ServerOption if (options->permit_tun == -1) options->permit_tun = SSH_TUNMODE_NO; + if (options->show_patchlevel == -1) + options->show_patchlevel = 0; + /* Turn privilege separation on by default */ if (use_privsep == -1) use_privsep = 1; @@ -296,7 +300,7 @@ typedef enum { sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions, - sBanner, sUseDNS, sHostbasedAuthentication, + sBanner, sShowPatchLevel, sUseDNS, sHostbasedAuthentication, sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, @@ -401,6 +405,7 @@ static struct { { "maxauthtries", sMaxAuthTries, SSHCFG_ALL }, { "maxsessions", sMaxSessions, SSHCFG_ALL }, { "banner", sBanner, SSHCFG_ALL }, + { "showpatchlevel", sShowPatchLevel, SSHCFG_GLOBAL }, { "usedns", sUseDNS, SSHCFG_GLOBAL }, { "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL }, { "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL }, @@ -1020,6 +1025,10 @@ process_server_config_line(ServerOptions intptr = &use_privsep; goto parse_flag; + case sShowPatchLevel: + intptr = &options->show_patchlevel; + goto parse_flag; + case sAllowUsers: while ((arg = strdelim(&cp)) && *arg != '\0') { if (options->num_allow_users >= MAX_ALLOW_USERS) @@ -1584,6 +1593,7 @@ dump_config(ServerOptions *o) dump_cfg_fmtint(sUseLogin, o->use_login); dump_cfg_fmtint(sCompression, o->compression); dump_cfg_fmtint(sGatewayPorts, o->gateway_ports); + dump_cfg_fmtint(sShowPatchLevel, o->show_patchlevel); dump_cfg_fmtint(sUseDNS, o->use_dns); dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding); dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep); diff -up openssh-5.1p1/sshd_config.0.vendor openssh-5.1p1/sshd_config.0 --- openssh-5.1p1/sshd_config.0.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/sshd_config.0 2008-07-23 14:13:22.000000000 +0200 @@ -466,6 +466,11 @@ DESCRIPTION Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. + ShowPatchLevel + Specifies whether sshd will display the specific patch level of + the binary in the server identification string. The patch level + is set at compile-time. The default is M-bM-^@M-^\noM-bM-^@M-^]. + StrictModes Specifies whether sshd(8) should check file modes and ownership of the user's files and home directory before accepting login. diff -up openssh-5.1p1/sshd_config.vendor openssh-5.1p1/sshd_config --- openssh-5.1p1/sshd_config.vendor 2008-07-23 14:13:22.000000000 +0200 +++ openssh-5.1p1/sshd_config 2008-07-23 14:13:22.000000000 +0200 @@ -112,6 +112,7 @@ X11Forwarding yes #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 +#ShowPatchLevel no #UseDNS yes #PidFile /var/run/sshd.pid #MaxStartups 10 diff -up openssh-5.1p1/sshd.c.vendor openssh-5.1p1/sshd.c --- openssh-5.1p1/sshd.c.vendor 2008-07-11 09:36:49.000000000 +0200 +++ openssh-5.1p1/sshd.c 2008-07-23 14:35:43.000000000 +0200 @@ -416,7 +416,7 @@ sshd_exchange_identification(int sock_in minor = PROTOCOL_MINOR_1; } snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, - SSH_VERSION, newline); + (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_VERSION, newline); server_version_string = xstrdup(buf); /* Send our protocol version identification. */ @@ -1484,7 +1484,8 @@ main(int ac, char **av) exit(1); } - debug("sshd version %.100s", SSH_RELEASE); + debug("sshd version %.100s", + (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_RELEASE); /* Store privilege separation user for later use if required. */ if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openssh/F-9/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 7 Apr 2008 20:14:31 -0000 1.21 +++ .cvsignore 23 Jul 2008 18:34:08 -0000 1.22 @@ -1 +1 @@ -openssh-5.0p1-noacss.tar.bz2 +openssh-5.1p1-noacss.tar.bz2 Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/F-9/openssh.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- openssh.spec 21 May 2008 08:34:21 -0000 1.126 +++ openssh.spec 23 Jul 2008 18:34:08 -0000 1.127 @@ -62,8 +62,8 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 Name: openssh -Version: 5.0p1 -Release: 3%{?dist}%{?rescue_rel} +Version: 5.1p1 +Release: 1%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc @@ -74,31 +74,28 @@ Source1: openssh-nukeacss.sh Source2: sshd.pam Source3: sshd.init -Patch0: openssh-4.7p1-redhat.patch -Patch2: openssh-3.8.1p1-skip-initial.patch +Patch0: openssh-5.1p1-redhat.patch +Patch2: openssh-5.1p1-skip-initial.patch Patch3: openssh-3.8.1p1-krb5-config.patch -Patch4: openssh-4.7p1-vendor.patch -Patch12: openssh-4.7p1-selinux.patch -Patch13: openssh-4.7p1-mls.patch +Patch4: openssh-5.1p1-vendor.patch +Patch12: openssh-5.1p1-selinux.patch +Patch13: openssh-5.1p1-mls.patch Patch16: openssh-4.7p1-audit.patch Patch17: openssh-4.3p2-cve-2007-3102.patch +Patch18: openssh-5.0p1-pam_selinux.patch Patch22: openssh-3.9p1-askpass-keep-above.patch Patch24: openssh-4.3p1-fromto-remote.patch -Patch27: openssh-4.7p1-log-in-chroot.patch +Patch27: openssh-5.1p1-log-in-chroot.patch Patch30: openssh-4.0p1-exit-deadlock.patch -Patch35: openssh-4.2p1-askpass-progress.patch +Patch35: openssh-5.1p1-askpass-progress.patch Patch38: openssh-4.3p2-askpass-grab-info.patch Patch39: openssh-4.3p2-no-v6only.patch Patch44: openssh-4.3p2-allow-ip-opts.patch Patch49: openssh-4.3p2-gssapi-canohost.patch -Patch51: openssh-4.7p1-nss-keys.patch -Patch54: openssh-4.7p1-gssapi-role.patch -Patch55: openssh-4.7p1-cloexec.patch -Patch58: openssh-4.5p1-controlcleanup.patch -Patch59: openssh-4.7p1-master-race.patch -Patch60: openssh-5.0p1-pam_selinux.patch -Patch61: openssh-5.0p1-unbreakalive.patch -Patch62: openssh-3.9p1-scp-manpage.patch +Patch51: openssh-5.1p1-nss-keys.patch +Patch54: openssh-5.1p1-gssapi-role.patch +Patch55: openssh-5.1p1-cloexec.patch +Patch62: openssh-5.1p1-scp-manpage.patch License: BSD Group: Applications/Internet @@ -202,7 +199,6 @@ an X11 passphrase dialog for OpenSSH. %prep - %setup -q %patch0 -p1 -b .redhat %patch2 -p1 -b .skip-initial @@ -215,6 +211,7 @@ %patch13 -p1 -b .mls %patch16 -p1 -b .audit %patch17 -p1 -b .inject-fix +%patch18 -p1 -b .pam_selinux %endif %patch22 -p1 -b .keep-above @@ -227,13 +224,9 @@ %patch44 -p1 -b .ip-opts %patch49 -p1 -b .canohost %patch51 -p1 -b .nss-keys -%patch54 -p0 -b .gssapi-role +%patch54 -p1 -b .gssapi-role %patch55 -p1 -b .cloexec -%patch58 -p1 -b .controlcleanup -%patch59 -p1 -b .master-race -%patch60 -p1 -b .pam_selinux -%patch61 -p0 -b .unbreakalive -%patch62 -p0 -b .manpage +%patch62 -p1 -b .manpage autoreconf @@ -423,7 +416,7 @@ %files %defattr(-,root,root) -%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* RFC* TODO WARNING* +%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW PROTOCOL* README* TODO WARNING* %attr(0755,root,root) %dir %{_sysconfdir}/ssh %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli %if ! %{rescue} @@ -468,6 +461,7 @@ %attr(0755,root,root) %{_sbindir}/sshd %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server %attr(0644,root,root) %{_mandir}/man5/sshd_config.5* +%attr(0644,root,root) %{_mandir}/man5/moduli.5* %attr(0644,root,root) %{_mandir}/man8/sshd.8* %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config @@ -484,6 +478,11 @@ %endif %changelog +* Wed Jul 23 2008 Tomas Mraz - 5.1p1-1 +- upgrade to new upstream release +- fixed a problem with public key authentication and explicitely + specified SELinux role + * Wed May 21 2008 Tomas Mraz - 5.0p1-3 - pass the connection socket to ssh-keysign (#447680) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openssh/F-9/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 7 Apr 2008 20:14:31 -0000 1.21 +++ sources 23 Jul 2008 18:34:08 -0000 1.22 @@ -1 +1 @@ -e39c15a5fb9036bd64256c78a6fbf394 openssh-5.0p1-noacss.tar.bz2 +5273579190b10f53baaf87f3c6eb0d73 openssh-5.1p1-noacss.tar.bz2 --- openssh-3.8.1p1-skip-initial.patch DELETED --- --- openssh-3.9p1-scp-manpage.patch DELETED --- --- openssh-4.2p1-askpass-progress.patch DELETED --- --- openssh-4.5p1-controlcleanup.patch DELETED --- --- openssh-4.7p1-cloexec.patch DELETED --- --- openssh-4.7p1-gssapi-role.patch DELETED --- --- openssh-4.7p1-log-in-chroot.patch DELETED --- --- openssh-4.7p1-master-race.patch DELETED --- --- openssh-4.7p1-mls.patch DELETED --- --- openssh-4.7p1-nss-keys.patch DELETED --- --- openssh-4.7p1-redhat.patch DELETED --- --- openssh-4.7p1-selinux.patch DELETED --- --- openssh-4.7p1-vendor.patch DELETED --- --- openssh-5.0p1-unbreakalive.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 18:39:28 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 23 Jul 2008 18:39:28 GMT Subject: rpms/clive/devel .cvsignore, 1.4, 1.5 clive.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807231839.m6NIdSJ2015155@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15044 Modified Files: .cvsignore clive.spec sources Log Message: Update for new version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jul 2008 20:41:22 -0000 1.4 +++ .cvsignore 23 Jul 2008 18:38:41 -0000 1.5 @@ -1 +1 @@ -clive-0.4.18.tar.bz2 +clive-0.4.19.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clive.spec 16 Jul 2008 20:41:22 -0000 1.3 +++ clive.spec 23 Jul 2008 18:38:41 -0000 1.4 @@ -1,6 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 18 +%define minor_version 19 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} @@ -58,6 +58,8 @@ %changelog +* Wed Jul 23 2008 Nicoleau Fabien 0.4.19-1 +- rebuild for 0.4.19 * Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 - rebuild for 0.4.18 * Sun Jun 29 2008 Nicoleau Fabien 0.4.17-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jul 2008 20:41:22 -0000 1.4 +++ sources 23 Jul 2008 18:38:41 -0000 1.5 @@ -1 +1 @@ -bf5630fcea81d0b8c593fd79eb3ebd83 clive-0.4.18.tar.bz2 +b7cce85b06179a4d92e2aa90af46468a clive-0.4.19.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 18:40:28 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 23 Jul 2008 18:40:28 GMT Subject: rpms/perl-Razor-Agent/EL-4 .cvsignore, 1.7, 1.8 perl-Razor-Agent.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200807231840.m6NIeSYY015232@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/perl-Razor-Agent/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14956/EL-4 Modified Files: .cvsignore perl-Razor-Agent.spec sources Log Message: Reflected to other branches: update to 2.85, relicensed to Artistic 2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/EL-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Aug 2007 16:21:32 -0000 1.7 +++ .cvsignore 23 Jul 2008 18:37:34 -0000 1.8 @@ -1 +1 @@ -razor-agents-2.84.tar.bz2 +razor-agents-2.85.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/EL-4/perl-Razor-Agent.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Razor-Agent.spec 11 Aug 2007 16:21:32 -0000 1.10 +++ perl-Razor-Agent.spec 23 Jul 2008 18:37:34 -0000 1.11 @@ -1,8 +1,8 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent -Version: 2.84 +Version: 2.85 Release: 1%{?dist} -License: Artistic +License: Artistic 2.0 Group: Applications/Internet URL: http://razor.sourceforge.net/ Source: http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2 @@ -74,6 +74,18 @@ %{_mandir}/man*/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.85-1 +- update to 2.85, relicensed to Artistic 2.0 + +* Thu Mar 06 2008 Tom "spot" Callaway - 2.84-4 +- Rebuild for new perl + +* Sun Feb 10 2008 Robert Scheck 2.84-3 +- Rebuilt against gcc 4.3 + +* Wed Aug 29 2007 Robert Scheck 2.84-2 +- Rebuilt (missing BuildID) + * Sat Aug 11 2007 Robert Scheck 2.84-1 - Upgrade to 2.84 (#250869) - Added build requirement to perl(ExtUtils::MakeMaker) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/EL-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Aug 2007 16:21:32 -0000 1.7 +++ sources 23 Jul 2008 18:37:34 -0000 1.8 @@ -1 +1 @@ -8b9a11a6ce020383c32c45d1530d77c2 razor-agents-2.84.tar.bz2 +014d08db40187cb1316482191566b012 razor-agents-2.85.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 18:40:30 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 23 Jul 2008 18:40:30 GMT Subject: rpms/perl-Razor-Agent/F-9 .cvsignore, 1.8, 1.9 perl-Razor-Agent.spec, 1.17, 1.18 sources, 1.8, 1.9 Message-ID: <200807231840.m6NIeU8n015241@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/perl-Razor-Agent/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14956/F-9 Modified Files: .cvsignore perl-Razor-Agent.spec sources Log Message: Reflected to other branches: update to 2.85, relicensed to Artistic 2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Aug 2007 16:15:12 -0000 1.8 +++ .cvsignore 23 Jul 2008 18:39:01 -0000 1.9 @@ -1 +1 @@ -razor-agents-2.84.tar.bz2 +razor-agents-2.85.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/F-9/perl-Razor-Agent.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Razor-Agent.spec 7 Mar 2008 02:15:54 -0000 1.17 +++ perl-Razor-Agent.spec 23 Jul 2008 18:39:01 -0000 1.18 @@ -1,8 +1,8 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent -Version: 2.84 -Release: 4%{?dist} -License: Artistic +Version: 2.85 +Release: 1%{?dist} +License: Artistic 2.0 Group: Applications/Internet URL: http://razor.sourceforge.net/ Source: http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2 @@ -74,8 +74,11 @@ %{_mandir}/man*/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.85-1 +- update to 2.85, relicensed to Artistic 2.0 + * Thu Mar 06 2008 Tom "spot" Callaway - 2.84-4 -Rebuild for new perl +- Rebuild for new perl * Sun Feb 10 2008 Robert Scheck 2.84-3 - Rebuilt against gcc 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Aug 2007 16:15:12 -0000 1.8 +++ sources 23 Jul 2008 18:39:01 -0000 1.9 @@ -1 +1 @@ -8b9a11a6ce020383c32c45d1530d77c2 razor-agents-2.84.tar.bz2 +014d08db40187cb1316482191566b012 razor-agents-2.85.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 18:40:31 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 23 Jul 2008 18:40:31 GMT Subject: rpms/perl-Razor-Agent/F-8 .cvsignore, 1.8, 1.9 perl-Razor-Agent.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200807231840.m6NIeVkr015252@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/perl-Razor-Agent/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14956/F-8 Modified Files: .cvsignore perl-Razor-Agent.spec sources Log Message: Reflected to other branches: update to 2.85, relicensed to Artistic 2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Aug 2007 16:15:12 -0000 1.8 +++ .cvsignore 23 Jul 2008 18:38:34 -0000 1.9 @@ -1 +1 @@ -razor-agents-2.84.tar.bz2 +razor-agents-2.85.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/F-8/perl-Razor-Agent.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Razor-Agent.spec 28 Aug 2007 22:48:58 -0000 1.15 +++ perl-Razor-Agent.spec 23 Jul 2008 18:38:34 -0000 1.16 @@ -1,8 +1,8 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent -Version: 2.84 -Release: 2%{?dist} -License: Artistic +Version: 2.85 +Release: 1%{?dist} +License: Artistic 2.0 Group: Applications/Internet URL: http://razor.sourceforge.net/ Source: http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2 @@ -74,6 +74,15 @@ %{_mandir}/man*/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.85-1 +- update to 2.85, relicensed to Artistic 2.0 + +* Thu Mar 06 2008 Tom "spot" Callaway - 2.84-4 +- Rebuild for new perl + +* Sun Feb 10 2008 Robert Scheck 2.84-3 +- Rebuilt against gcc 4.3 + * Wed Aug 29 2007 Robert Scheck 2.84-2 - Rebuilt (missing BuildID) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Aug 2007 16:15:12 -0000 1.8 +++ sources 23 Jul 2008 18:38:34 -0000 1.9 @@ -1 +1 @@ -8b9a11a6ce020383c32c45d1530d77c2 razor-agents-2.84.tar.bz2 +014d08db40187cb1316482191566b012 razor-agents-2.85.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 18:40:34 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 23 Jul 2008 18:40:34 GMT Subject: rpms/perl-Razor-Agent/devel perl-Razor-Agent.spec,1.18,1.19 Message-ID: <200807231840.m6NIeYMu015263@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/perl-Razor-Agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14956/devel Modified Files: perl-Razor-Agent.spec Log Message: Reflected to other branches: update to 2.85, relicensed to Artistic 2.0 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Razor-Agent.spec 23 Jul 2008 15:52:33 -0000 1.18 +++ perl-Razor-Agent.spec 23 Jul 2008 18:39:30 -0000 1.19 @@ -78,7 +78,7 @@ - update to 2.85, relicensed to Artistic 2.0 * Thu Mar 06 2008 Tom "spot" Callaway - 2.84-4 -Rebuild for new perl +- Rebuild for new perl * Sun Feb 10 2008 Robert Scheck 2.84-3 - Rebuilt against gcc 4.3 From fedora-extras-commits at redhat.com Wed Jul 23 18:40:33 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 23 Jul 2008 18:40:33 GMT Subject: rpms/perl-Razor-Agent/EL-5 .cvsignore, 1.8, 1.9 perl-Razor-Agent.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200807231840.m6NIeXqj015257@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/perl-Razor-Agent/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14956/EL-5 Modified Files: .cvsignore perl-Razor-Agent.spec sources Log Message: Reflected to other branches: update to 2.85, relicensed to Artistic 2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/EL-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Aug 2007 16:19:39 -0000 1.8 +++ .cvsignore 23 Jul 2008 18:37:58 -0000 1.9 @@ -1 +1 @@ -razor-agents-2.84.tar.bz2 +razor-agents-2.85.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/EL-5/perl-Razor-Agent.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Razor-Agent.spec 11 Aug 2007 16:19:39 -0000 1.14 +++ perl-Razor-Agent.spec 23 Jul 2008 18:37:58 -0000 1.15 @@ -1,8 +1,8 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent -Version: 2.84 +Version: 2.85 Release: 1%{?dist} -License: Artistic +License: Artistic 2.0 Group: Applications/Internet URL: http://razor.sourceforge.net/ Source: http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2 @@ -74,6 +74,18 @@ %{_mandir}/man*/* %changelog +* Wed Jul 23 2008 Tom "spot" Callaway - 2.85-1 +- update to 2.85, relicensed to Artistic 2.0 + +* Thu Mar 06 2008 Tom "spot" Callaway - 2.84-4 +- Rebuild for new perl + +* Sun Feb 10 2008 Robert Scheck 2.84-3 +- Rebuilt against gcc 4.3 + +* Wed Aug 29 2007 Robert Scheck 2.84-2 +- Rebuilt (missing BuildID) + * Sat Aug 11 2007 Robert Scheck 2.84-1 - Upgrade to 2.84 (#250869) - Added build requirement to perl(ExtUtils::MakeMaker) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Aug 2007 16:19:39 -0000 1.8 +++ sources 23 Jul 2008 18:37:58 -0000 1.9 @@ -1 +1 @@ -8b9a11a6ce020383c32c45d1530d77c2 razor-agents-2.84.tar.bz2 +014d08db40187cb1316482191566b012 razor-agents-2.85.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 18:48:51 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 23 Jul 2008 18:48:51 GMT Subject: rpms/clive/F-8 .cvsignore, 1.4, 1.5 clive.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807231848.m6NImpab016007@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15907 Modified Files: .cvsignore clive.spec sources Log Message: Update for 0.4.19 version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jul 2008 20:50:34 -0000 1.4 +++ .cvsignore 23 Jul 2008 18:48:08 -0000 1.5 @@ -1 +1 @@ -clive-0.4.18.tar.bz2 +clive-0.4.19.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/clive.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clive.spec 16 Jul 2008 20:50:34 -0000 1.3 +++ clive.spec 23 Jul 2008 18:48:08 -0000 1.4 @@ -1,6 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 18 +%define minor_version 19 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} @@ -58,6 +58,8 @@ %changelog +* Wed Jul 23 2008 Nicoleau Fabien 0.4.19-1 +- rebuild for 0.4.19 * Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 - rebuild for 0.4.18 * Sun Jun 29 2008 Nicoleau Fabien 0.4.17-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jul 2008 20:50:34 -0000 1.4 +++ sources 23 Jul 2008 18:48:08 -0000 1.5 @@ -1 +1 @@ -bf5630fcea81d0b8c593fd79eb3ebd83 clive-0.4.18.tar.bz2 +b7cce85b06179a4d92e2aa90af46468a clive-0.4.19.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 18:52:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 18:52:28 GMT Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.59,1.60 Message-ID: <200807231852.m6NIqSYX016264@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16207 Modified Files: kdebase-runtime.spec Log Message: drop Obsoletes/Requires upgrade-path hackery Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- kdebase-runtime.spec 23 Jul 2008 13:31:35 -0000 1.59 +++ kdebase-runtime.spec 23 Jul 2008 18:51:38 -0000 1.60 @@ -87,11 +87,8 @@ %package -n phonon-backend-xine Summary: Xine phonon backend Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} # not sure exactly how best to version this one -- Rex Provides: phonon-backend = 4.2 -# (temporary) upgrade path -Obsoletes: kdebase-runtime < 4.0.98-3 %description -n phonon-backend-xine %{summary}. From fedora-extras-commits at redhat.com Wed Jul 23 18:52:45 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 23 Jul 2008 18:52:45 GMT Subject: rpms/clive/F-9 .cvsignore, 1.4, 1.5 clive.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807231852.m6NIqjtx016286@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16221 Modified Files: .cvsignore clive.spec sources Log Message: Update for 0.4.19 version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jul 2008 20:53:04 -0000 1.4 +++ .cvsignore 23 Jul 2008 18:51:58 -0000 1.5 @@ -1 +1 @@ -clive-0.4.18.tar.bz2 +clive-0.4.19.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/clive.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clive.spec 16 Jul 2008 20:53:04 -0000 1.3 +++ clive.spec 23 Jul 2008 18:51:58 -0000 1.4 @@ -1,6 +1,6 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 18 +%define minor_version 19 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} @@ -58,6 +58,8 @@ %changelog +* Wed Jul 23 2008 Nicoleau Fabien 0.4.19-1 +- rebuild for 0.4.19 * Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 - rebuild for 0.4.18 * Sun Jun 29 2008 Nicoleau Fabien 0.4.17-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jul 2008 20:53:04 -0000 1.4 +++ sources 23 Jul 2008 18:51:58 -0000 1.5 @@ -1 +1 @@ -bf5630fcea81d0b8c593fd79eb3ebd83 clive-0.4.18.tar.bz2 +b7cce85b06179a4d92e2aa90af46468a clive-0.4.19.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 18:53:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 18:53:23 +0000 Subject: [pkgdb] eclipse-pydev ownership updated Message-ID: <20080723185324.452FF1AD0E3@bastion.fedora.phx.redhat.com> Package eclipse-pydev in Fedora 7 was orphaned by Jeff Johnston (jjohnstn) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From fedora-extras-commits at redhat.com Wed Jul 23 18:53:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 18:53:32 +0000 Subject: [pkgdb] eclipse-pydev ownership updated Message-ID: <20080723185332.E0CC71AD0E7@bastion.fedora.phx.redhat.com> Package eclipse-pydev in Fedora 8 was orphaned by Jeff Johnston (jjohnstn) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From fedora-extras-commits at redhat.com Wed Jul 23 18:53:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 23 Jul 2008 18:53:40 +0000 Subject: [pkgdb] eclipse-pydev ownership updated Message-ID: <20080723185340.91A3A1AD0E5@bastion.fedora.phx.redhat.com> Package eclipse-pydev in Fedora 9 was orphaned by Jeff Johnston (jjohnstn) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From fedora-extras-commits at redhat.com Wed Jul 23 18:59:07 2008 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 23 Jul 2008 18:59:07 GMT Subject: rpms/abiword/OLPC-3 abiword.spec,1.68,1.69 Message-ID: <200807231859.m6NIx7Dk016552@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16518 Modified Files: abiword.spec Log Message: Remove unmaintained scripts that cause a perl dependency Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/OLPC-3/abiword.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- abiword.spec 21 Jul 2008 21:37:59 -0000 1.68 +++ abiword.spec 23 Jul 2008 18:58:17 -0000 1.69 @@ -7,7 +7,7 @@ Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -187,6 +187,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la # nuke custom dictionary files rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml +# nuke whacky scripts +rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/scripts %clean rm -rf $RPM_BUILD_ROOT @@ -216,6 +218,9 @@ %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Wed Jul 23 2008 Marc Maurer - 1:2.6.4-6 +- Remove unmaintained scripts that cause a perl dependency + * Mon Jul 21 2008 Marc Maurer - 1:2.6.4-5 - Fix libabiword-devel requires From fedora-extras-commits at redhat.com Wed Jul 23 19:02:40 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 23 Jul 2008 19:02:40 GMT Subject: rpms/fotowall/devel fotowall.desktop, NONE, 1.1 fotowall.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231902.m6NJ2eUi023424@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/fotowall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23353/devel Modified Files: .cvsignore sources Added Files: fotowall.desktop fotowall.spec import.log Log Message: New package --- NEW FILE fotowall.desktop --- [Desktop Entry] Encoding=UTF-8 Name=FotoWall GenericName=FotoWall Comment=Photo collection creativity tool Exec=fotowall Icon=fotowall Terminal=false Type=Application Categories=Graphics; --- NEW FILE fotowall.spec --- Name: fotowall Version: 0.21 Release: 1%{?dist} Summary: Photo collection creativity tool Group: Applications/Multimedia License: GPLv2 URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 4.3 BuildRequires: desktop-file-utils %description FotoWall is a creative tool that allows you to layout your photos or pictures in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.. %prep %setup -q -n %{name} # for hidden-file-or-dir warning sed -i -e "s/.bin/bin/" %{name}.pro %build qmake-qt4 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/ install -m 755 -p %{name} $RPM_BUILD_ROOT%{_bindir} install -Dm 755 -p data/icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="" \ --mode 644 \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc example-layouts GPL_V2 README %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sun Jul 20 2008 Nicoleau Fabien - 0.21-1 - Initial build --- NEW FILE import.log --- fotowall-0_21-1_fc9:HEAD:fotowall-0.21-1.fc9.src.rpm:1216839666 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fotowall/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:56:36 -0000 1.1 +++ .cvsignore 23 Jul 2008 19:01:54 -0000 1.2 @@ -0,0 +1 @@ +fotowall-0.21.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fotowall/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:56:36 -0000 1.1 +++ sources 23 Jul 2008 19:01:54 -0000 1.2 @@ -0,0 +1 @@ +c19dcc486bcbf778282b2ce17348ce12 fotowall-0.21.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 19:05:22 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 23 Jul 2008 19:05:22 GMT Subject: rpms/fotowall/F-9 fotowall.desktop, NONE, 1.1 fotowall.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807231905.m6NJ5M8m023596@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/fotowall/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23561/F-9 Modified Files: .cvsignore sources Added Files: fotowall.desktop fotowall.spec import.log Log Message: New package --- NEW FILE fotowall.desktop --- [Desktop Entry] Encoding=UTF-8 Name=FotoWall GenericName=FotoWall Comment=Photo collection creativity tool Exec=fotowall Icon=fotowall Terminal=false Type=Application Categories=Graphics; --- NEW FILE fotowall.spec --- Name: fotowall Version: 0.21 Release: 1%{?dist} Summary: Photo collection creativity tool Group: Applications/Multimedia License: GPLv2 URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 4.3 BuildRequires: desktop-file-utils %description FotoWall is a creative tool that allows you to layout your photos or pictures in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.. %prep %setup -q -n %{name} # for hidden-file-or-dir warning sed -i -e "s/.bin/bin/" %{name}.pro %build qmake-qt4 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/ install -m 755 -p %{name} $RPM_BUILD_ROOT%{_bindir} install -Dm 755 -p data/icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="" \ --mode 644 \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc example-layouts GPL_V2 README %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sun Jul 20 2008 Nicoleau Fabien - 0.21-1 - Initial build --- NEW FILE import.log --- fotowall-0_21-1_fc9:F-9:fotowall-0.21-1.fc9.src.rpm:1216839853 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fotowall/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:56:36 -0000 1.1 +++ .cvsignore 23 Jul 2008 19:04:39 -0000 1.2 @@ -0,0 +1 @@ +fotowall-0.21.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fotowall/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:56:36 -0000 1.1 +++ sources 23 Jul 2008 19:04:39 -0000 1.2 @@ -0,0 +1 @@ +c19dcc486bcbf778282b2ce17348ce12 fotowall-0.21.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 19:13:39 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 23 Jul 2008 19:13:39 GMT Subject: rpms/dvgrab/devel dvgrab.spec,1.25,1.26 Message-ID: <200807231913.m6NJDdAm024031@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/dvgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23977 Modified Files: dvgrab.spec Log Message: * Wed Jul 23 2008 Jarod Wilson - 3.1-5 - Bump and rebuild for libraw1394 v2.0.0 Index: dvgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/dvgrab/devel/dvgrab.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- dvgrab.spec 16 Jul 2008 22:05:08 -0000 1.25 +++ dvgrab.spec 23 Jul 2008 19:12:53 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Utility to capture video from a DV camera Name: dvgrab Version: 3.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.kinodv.org/ @@ -40,6 +40,9 @@ %{_mandir}/man1/dvgrab.1* %changelog +* Wed Jul 23 2008 Jarod Wilson - 3.1-5 +- Bump and rebuild for libraw1394 v2.0.0 + * Wed Jul 16 2008 Tom "spot" Callaway - 3.1-4 - fix license tag From fedora-extras-commits at redhat.com Wed Jul 23 19:18:30 2008 From: fedora-extras-commits at redhat.com (John Matthews (jmatthews)) Date: Wed, 23 Jul 2008 19:18:30 GMT Subject: rpms/jython/F-8 jython.spec,1.5,1.6 Message-ID: <200807231918.m6NJIUjM024348@cvs-int.fedora.redhat.com> Author: jmatthews Update of /cvs/pkgs/rpms/jython/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24287 Modified Files: jython.spec Log Message: bugzilla: 426373 many missing modules Backporting fix to f8 Index: jython.spec =================================================================== RCS file: /cvs/pkgs/rpms/jython/F-8/jython.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jython.spec 27 Mar 2007 15:06:00 -0000 1.5 +++ jython.spec 23 Jul 2008 19:17:40 -0000 1.6 @@ -5,7 +5,7 @@ %define cpython_version %{pyver} %define pyxml_version 0.8.3 %define svn_tag Release_2_2beta1 -%define release 0.3.%{svn_tag}.1jpp.3%{?dist} +%define release 0.3.%{svn_tag}.1jpp.4%{?dist} %define gcj_support 1 @@ -109,7 +109,7 @@ ant \ -Dpython.home=%{_bindir} \ -Dht2html.dir=%{_datadir}/ht2html \ - -Dpython.lib=./Lib \ + -Dpython.lib=./CPythonLib \ -Dpython.exe=%{_bindir}/python \ -DPyXmlHome=%{_libdir}/python%pyver \ -Dtargetver=1.3 \ @@ -206,8 +206,6 @@ %{_bindir}/%{name} %{_datadir}/%{name}/Tools/%{name}c/%{name}c.py "\$@" EOF -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/Lib/UserDict.py - # Natively compile %if %{gcj_support} # Exclude examples from native compilation @@ -279,6 +277,9 @@ %doc %{_datadir}/%{name}/Demo %changelog +* Wed Jul 23 2008 John Matthews - 2.2-0.3.Release_2_2beta1.1jpp.4 +- Backporting fix for rhbz#426373 + * Mon Mar 26 2007 Thomas Fitzsimmons - 2.2-0.3.Release_2_2beta1.1jpp.3 - Rename doc subpackage "manual". - Require libreadline-java. From fedora-extras-commits at redhat.com Wed Jul 23 19:24:35 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 23 Jul 2008 19:24:35 GMT Subject: rpms/kdepimlibs/F-9 kdepimlibs.spec,1.34,1.35 Message-ID: <200807231924.m6NJOZc7024643@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24602 Modified Files: kdepimlibs.spec Log Message: * Wed Jul 23 2008 Rex Dieter 4.0.99-2 - respin against akonadi-1.0 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- kdepimlibs.spec 19 Jul 2008 14:56:16 -0000 1.34 +++ kdepimlibs.spec 23 Jul 2008 19:23:45 -0000 1.35 @@ -15,7 +15,7 @@ Name: kdepimlibs Version: 4.0.99 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -27,7 +27,7 @@ Requires: kdelibs4 >= %{version} -BuildRequires: akonadi-devel +BuildRequires: akonadi-devel >= 1.0 BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cyrus-sasl-devel @@ -163,6 +163,9 @@ %changelog +* Wed Jul 23 2008 Rex Dieter 4.0.99-2 +- respin against akonadi-1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Wed Jul 23 19:41:43 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 23 Jul 2008 19:41:43 GMT Subject: rpms/anaconda/devel .cvsignore, 1.549, 1.550 anaconda.spec, 1.691, 1.692 sources, 1.682, 1.683 Message-ID: <200807231941.m6NJfhDD025569@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.549 retrieving revision 1.550 diff -u -r1.549 -r1.550 --- .cvsignore 18 Jul 2008 00:40:44 -0000 1.549 +++ .cvsignore 23 Jul 2008 19:40:53 -0000 1.550 @@ -1,3 +1,4 @@ clog anaconda-11.4.1.15.tar.bz2 anaconda-11.4.1.16.tar.bz2 +anaconda-11.4.1.17.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.691 retrieving revision 1.692 diff -u -r1.691 -r1.692 --- anaconda.spec 18 Jul 2008 00:40:44 -0000 1.691 +++ anaconda.spec 23 Jul 2008 19:40:53 -0000 1.692 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.16 +Version: 11.4.1.17 Release: 1 License: GPLv2+ Group: Applications/System @@ -107,6 +107,7 @@ %endif Requires: hal, dbus-python Requires: cracklib-python +Requires: python-bugzilla %ifarch %livearches Requires: usermode Requires: zenity @@ -194,6 +195,22 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jul 23 2008 Chris Lumens - 11.4.1.17-1 +- Add support for filing bugs straight into bugzilla. (clumens) +- Running git-tag -f from a makefile rule is a bad idea (katzj) +- A text message in rescue.py is not gettext-ized (atodorov) +- Code cleanup - handling of --serial (atodorov) +- Offer physical NIC identification in stage 1 (#261101) (dcantrell) +- Specify a default cio_ignore parameter for s390x (#253075) (dcantrell) +- Fix getting the stage2 image when doing kickstart installs. (clumens) +- Convert package names to unicode before displaying the error message + (#446826). (clumens) +- When there is text mode specified in the kickstart file, disable the vnc + question (#455612) (msivak) +- We no longer add the fstype to the hd: method in loader. (clumens) +- Check DHCP by default on the text network configurator screen. (clumens) +- Support booting from FCP-attached CD/DVD drive on s390 (#184648) (dcantrell) + * Thu Jul 17 2008 Chris Lumens - 11.4.1.16-1 - Support xdriver= again (katzj) - Fix loadkeys on serial console (niels.devos) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.682 retrieving revision 1.683 diff -u -r1.682 -r1.683 --- sources 18 Jul 2008 00:40:44 -0000 1.682 +++ sources 23 Jul 2008 19:40:53 -0000 1.683 @@ -1 +1 @@ -2ccbed54a4241deeb631373db89a4c96 anaconda-11.4.1.16.tar.bz2 +22d8bd2e1874186f15ed61fe90312889 anaconda-11.4.1.17.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 19:50:33 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 23 Jul 2008 19:50:33 GMT Subject: rpms/anaconda/devel sources,1.683,1.684 Message-ID: <200807231950.m6NJoX1g026023@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25979 Modified Files: sources Log Message: New version that should actually build. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.683 retrieving revision 1.684 diff -u -r1.683 -r1.684 --- sources 23 Jul 2008 19:40:53 -0000 1.683 +++ sources 23 Jul 2008 19:49:49 -0000 1.684 @@ -1 +1 @@ -22d8bd2e1874186f15ed61fe90312889 anaconda-11.4.1.17.tar.bz2 +0432b5e38fe861ba524311630dc4136a anaconda-11.4.1.17.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 19:51:55 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 23 Jul 2008 19:51:55 GMT Subject: rpms/kernel/devel patch-2.6.26-git10.bz2.sign, NONE, 1.1 .cvsignore, 1.874, 1.875 config-generic, 1.137, 1.138 config-ia64-generic, 1.13, 1.14 config-powerpc64, 1.17, 1.18 config-x86-generic, 1.41, 1.42 kernel.spec, 1.790, 1.791 linux-2.6-compile-fixes.patch, 1.170, 1.171 sources, 1.835, 1.836 upstream, 1.752, 1.753 linux-2.6-net-8139-pio-mmio-fallback.patch, 1.2, NONE linux-2.6-net-8139-pio-modparam.patch, 1.4, NONE linux-2.6-net-8139-pio-oqo2.patch, 1.4, NONE linux-2.6-netdev-atl1e.patch, 1.1, NONE patch-2.6.26-git9.bz2.sign, 1.1, NONE Message-ID: <200807231951.m6NJptaF026152@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26095 Modified Files: .cvsignore config-generic config-ia64-generic config-powerpc64 config-x86-generic kernel.spec linux-2.6-compile-fixes.patch sources upstream Added Files: patch-2.6.26-git10.bz2.sign Removed Files: linux-2.6-net-8139-pio-mmio-fallback.patch linux-2.6-net-8139-pio-modparam.patch linux-2.6-net-8139-pio-oqo2.patch linux-2.6-netdev-atl1e.patch patch-2.6.26-git9.bz2.sign Log Message: 2.6.26-git10 --- NEW FILE patch-2.6.26-git10.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIhteHyGugalF9Dw4RAjtJAKCOCRtrAd+yLs5sY4zdohfygmsZiwCeOkjS cm3XjYpPmVHtW1cesDE9Nwc= =JV7O -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.874 retrieving revision 1.875 diff -u -r1.874 -r1.875 --- .cvsignore 22 Jul 2008 13:06:24 -0000 1.874 +++ .cvsignore 23 Jul 2008 19:51:09 -0000 1.875 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git9.bz2 +patch-2.6.26-git10.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- config-generic 21 Jul 2008 22:22:11 -0000 1.137 +++ config-generic 23 Jul 2008 19:51:09 -0000 1.138 @@ -3536,6 +3536,7 @@ CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_SMX=m +CONFIG_UIO_PDRV=m CONFIG_INSTRUMENTATION=y CONFIG_MARKERS=y @@ -3618,3 +3619,5 @@ CONFIG_OPTIMIZE_INLINING=y +# FIXME: This should be x86/ia64 only +# CONFIG_HP_ILO is not set Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- config-ia64-generic 14 Jul 2008 19:38:29 -0000 1.13 +++ config-ia64-generic 23 Jul 2008 19:51:09 -0000 1.14 @@ -204,3 +204,5 @@ CONFIG_UTRACE=n CONFIG_UTRACE_PTRACE=n + +CONFIG_HP_ILO=m Index: config-powerpc64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- config-powerpc64 21 Jul 2008 19:45:13 -0000 1.17 +++ config-powerpc64 23 Jul 2008 19:51:09 -0000 1.18 @@ -171,3 +171,6 @@ CONFIG_SERIO_XILINX_XPS_PS2=m +CONFIG_PPC_IBM_CELL_RESETBUTTON=y +CONFIG_PPC_IBM_CELL_POWERBUTTON=m +CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- config-x86-generic 21 Jul 2008 19:45:13 -0000 1.41 +++ config-x86-generic 23 Jul 2008 19:51:09 -0000 1.42 @@ -394,3 +394,6 @@ # CONFIG_MMIOTRACE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set + +CONFIG_HP_ILO=m + Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.790 retrieving revision 1.791 diff -u -r1.790 -r1.791 --- kernel.spec 22 Jul 2008 13:06:24 -0000 1.790 +++ kernel.spec 23 Jul 2008 19:51:09 -0000 1.791 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 9 +%define gitrev 10 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -606,9 +606,6 @@ Patch402: linux-2.6-scsi-mpt-vmware-fix.patch Patch420: linux-2.6-squashfs.patch Patch430: linux-2.6-net-silence-noisy-printks.patch -Patch440: linux-2.6-net-8139-pio-modparam.patch -Patch441: linux-2.6-net-8139-pio-oqo2.patch -Patch442: linux-2.6-net-8139-pio-mmio-fallback.patch Patch450: linux-2.6-input-kill-stupid-messages.patch Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch @@ -648,8 +645,6 @@ # atl2 network driver Patch2020: linux-2.6-netdev-atl2.patch -# atl1e network driver -Patch2021: linux-2.6-netdev-atl1e.patch # make USB EHCI driver respect "nousb" parameter Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch @@ -1092,12 +1087,6 @@ # Networking # Disable easy to trigger printk's. ApplyPatch linux-2.6-net-silence-noisy-printks.patch -# Make 8139too PIO/MMIO a module parameter -ApplyPatch linux-2.6-net-8139-pio-modparam.patch -# OQO2 needs PIO -ApplyPatch linux-2.6-net-8139-pio-oqo2.patch -# PIO fallback -ApplyPatch linux-2.6-net-8139-pio-mmio-fallback.patch # Misc fixes # The input layer spews crap no-one cares about. @@ -1150,7 +1139,6 @@ ApplyPatch linux-2.6-sata-eeepc-faster.patch # atl1e & atl2 network drivers -ApplyPatch linux-2.6-netdev-atl1e.patch ApplyPatch linux-2.6-netdev-atl2.patch # Nouveau DRM + drm fixes @@ -1780,6 +1768,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 23 2008 Dave Jones +- 2.6.26-git10 + * Tue Jul 22 2008 Dave Jones - 2.6.26-git9 linux-2.6-compile-fixes.patch: Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- linux-2.6-compile-fixes.patch 21 Jul 2008 22:49:00 -0000 1.170 +++ linux-2.6-compile-fixes.patch 23 Jul 2008 19:51:09 -0000 1.171 @@ -5,258 +5,3 @@ # to do a compile to figure out what your diff is fixing. Thanks. # -Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1006): No description found for parameter 'dev_queue' -Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1033): No description found for parameter 'dev_queue' -Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1067): No description found for parameter 'dev_queue' -Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1093): No description found for parameter 'dev_queue' -Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1474): No description found for parameter 'txq' - ---- linux-2.6.26.noarch/include/linux/netdevice.h~ 2008-07-21 16:46:36.000000000 -0400 -+++ linux-2.6.26.noarch/include/linux/netdevice.h 2008-07-21 16:48:53.000000000 -0400 -@@ -996,17 +996,17 @@ static inline void netif_tx_schedule_all - netif_schedule_queue(netdev_get_tx_queue(dev, i)); - } - -+static inline void netif_tx_start_queue(struct netdev_queue *dev_queue) -+{ -+ clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state); -+} -+ - /** - * netif_start_queue - allow transmit - * @dev: network device - * - * Allow upper layers to call the device hard_start_xmit routine. - */ --static inline void netif_tx_start_queue(struct netdev_queue *dev_queue) --{ -- clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state); --} -- - static inline void netif_start_queue(struct net_device *dev) - { - netif_tx_start_queue(netdev_get_tx_queue(dev, 0)); -@@ -1022,13 +1022,6 @@ static inline void netif_tx_start_all_qu - } - } - --/** -- * netif_wake_queue - restart transmit -- * @dev: network device -- * -- * Allow upper layers to call the device hard_start_xmit routine. -- * Used for flow control when transmit resources are available. -- */ - static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue) - { - #ifdef CONFIG_NETPOLL_TRAP -@@ -1041,6 +1034,13 @@ static inline void netif_tx_wake_queue(s - __netif_schedule(dev_queue->qdisc); - } - -+/** -+ * netif_wake_queue - restart transmit -+ * @dev: network device -+ * -+ * Allow upper layers to call the device hard_start_xmit routine. -+ * Used for flow control when transmit resources are available. -+ */ - static inline void netif_wake_queue(struct net_device *dev) - { - netif_tx_wake_queue(netdev_get_tx_queue(dev, 0)); -@@ -1056,6 +1056,11 @@ static inline void netif_tx_wake_all_que - } - } - -+static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue) -+{ -+ set_bit(__QUEUE_STATE_XOFF, &dev_queue->state); -+} -+ - /** - * netif_stop_queue - stop transmitted packets - * @dev: network device -@@ -1063,11 +1068,6 @@ static inline void netif_tx_wake_all_que - * Stop upper layers calling the device hard_start_xmit routine. - * Used for flow control when transmit resources are unavailable. - */ --static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue) --{ -- set_bit(__QUEUE_STATE_XOFF, &dev_queue->state); --} -- - static inline void netif_stop_queue(struct net_device *dev) - { - netif_tx_stop_queue(netdev_get_tx_queue(dev, 0)); -@@ -1083,17 +1083,17 @@ static inline void netif_tx_stop_all_que - } - } - -+static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue) -+{ -+ return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state); -+} -+ - /** - * netif_queue_stopped - test if transmit queue is flowblocked - * @dev: network device - * - * Test if transmit queue on device is currently unable to send. - */ --static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue) --{ -- return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state); --} -- - static inline int netif_queue_stopped(const struct net_device *dev) - { - return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0)); -@@ -1463,13 +1463,6 @@ static inline void netif_rx_complete(str - local_irq_restore(flags); - } - --/** -- * netif_tx_lock - grab network device transmit lock -- * @dev: network device -- * @cpu: cpu number of lock owner -- * -- * Get network device transmit lock -- */ - static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu) - { - spin_lock(&txq->_xmit_lock); -@@ -1482,6 +1475,13 @@ static inline void __netif_tx_lock_bh(st - txq->xmit_lock_owner = smp_processor_id(); - } - -+/** -+ * netif_tx_lock - grab network device transmit lock -+ * @dev: network device -+ * @cpu: cpu number of lock owner -+ * -+ * Get network device transmit lock -+ */ - static inline void netif_tx_lock(struct net_device *dev) - { - int cpu = smp_processor_id(); - - -Error(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//net/core/dev.c:1674): cannot understand prototype: 'u32 simple_tx_hashrnd; ' - ---- linux-2.6.26.noarch/net/core/dev.c~ 2008-07-21 16:49:10.000000000 -0400 -+++ linux-2.6.26.noarch/net/core/dev.c 2008-07-21 16:49:47.000000000 -0400 -@@ -1645,32 +1645,6 @@ out_kfree_skb: - return 0; - } - --/** -- * dev_queue_xmit - transmit a buffer -- * @skb: buffer to transmit -- * -- * Queue a buffer for transmission to a network device. The caller must -- * have set the device and priority and built the buffer before calling -- * this function. The function can be called from an interrupt. -- * -- * A negative errno code is returned on a failure. A success does not -- * guarantee the frame will be transmitted as it may be dropped due -- * to congestion or traffic shaping. -- * -- * ----------------------------------------------------------------------------------- -- * I notice this method can also return errors from the queue disciplines, -- * including NET_XMIT_DROP, which is a positive value. So, errors can also -- * be positive. -- * -- * Regardless of the return value, the skb is consumed, so it is currently -- * difficult to retry a send to this method. (You can bump the ref count -- * before sending to hold a reference for retry if you are careful.) -- * -- * When calling this method, interrupts MUST be enabled. This is because -- * the BH enable code must have IRQs enabled so that it will not deadlock. -- * --BLG -- */ -- - static u32 simple_tx_hashrnd; - static int simple_tx_hashrnd_initialized = 0; - -@@ -1738,6 +1712,31 @@ static struct netdev_queue *dev_pick_tx( - return netdev_get_tx_queue(dev, queue_index); - } - -+/** -+ * dev_queue_xmit - transmit a buffer -+ * @skb: buffer to transmit -+ * -+ * Queue a buffer for transmission to a network device. The caller must -+ * have set the device and priority and built the buffer before calling -+ * this function. The function can be called from an interrupt. -+ * -+ * A negative errno code is returned on a failure. A success does not -+ * guarantee the frame will be transmitted as it may be dropped due -+ * to congestion or traffic shaping. -+ * -+ * ----------------------------------------------------------------------------------- -+ * I notice this method can also return errors from the queue disciplines, -+ * including NET_XMIT_DROP, which is a positive value. So, errors can also -+ * be positive. -+ * -+ * Regardless of the return value, the skb is consumed, so it is currently -+ * difficult to retry a send to this method. (You can bump the ref count -+ * before sending to hold a reference for retry if you are careful.) -+ * -+ * When calling this method, interrupts MUST be enabled. This is because -+ * the BH enable code must have IRQs enabled so that it will not deadlock. -+ * --BLG -+ */ - int dev_queue_xmit(struct sk_buff *skb) - { - struct net_device *dev = skb->dev; -drivers/serial/serial_txx9.c: In function 'receive_chars': -drivers/serial/serial_txx9.c:275: error: 'struct uart_info' has no member named 'tty' - -Signed-off-by: Dave Jones - ---- linux-2.6.26.noarch/drivers/serial/serial_txx9.c~ 2008-07-21 17:13:21.000000000 -0400 -+++ linux-2.6.26.noarch/drivers/serial/serial_txx9.c 2008-07-21 17:13:37.000000000 -0400 -@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struc - static inline void - receive_chars(struct uart_txx9_port *up, unsigned int *status) - { -- struct tty_struct *tty = up->port.info->tty; -+ struct tty_struct *tty = up->port.info->port.tty; - unsigned char ch; - unsigned int disr = *status; - int max_count = 256; - -drivers/serial/icom.c: In function 'recv_interrupt': -drivers/serial/icom.c:733: error: 'struct uart_info' has no member named 'tty' - -Signed-off-by: Dave Jones - ---- linux-2.6.26.noarch/drivers/serial/icom.c~ 2008-07-21 18:08:30.000000000 -0400 -+++ linux-2.6.26.noarch/drivers/serial/icom.c 2008-07-21 18:13:00.000000000 -0400 -@@ -730,7 +730,7 @@ static void xmit_interrupt(u16 port_int_ - static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port) - { - short int count, rcv_buff; -- struct tty_struct *tty = icom_port->uart_port.info->tty; -+ struct tty_struct *tty = icom_port->uart_port.info->port.tty; - unsigned short int status; - struct uart_icount *icount; - unsigned long offset; - -drivers/net/mv643xx_eth.c: In function 'mv643xx_eth_netpoll': -drivers/net/mv643xx_eth.c:2115: error: 'INT_CAUSE_EXT' undeclared (first use in this function) - -Signed-off-by: Dave Jones - ---- linux-2.6.26.noarch/drivers/net/mv643xx_eth.c~ 2008-07-21 18:47:33.000000000 -0400 -+++ linux-2.6.26.noarch/drivers/net/mv643xx_eth.c 2008-07-21 18:47:55.000000000 -0400 -@@ -2112,7 +2112,7 @@ static void mv643xx_eth_netpoll(struct n - - mv643xx_eth_irq(dev->irq, dev); - -- wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_CAUSE_EXT); -+ wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | (INT_CAUSE_EXT(mp->port_num))); - } - #endif - Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.835 retrieving revision 1.836 diff -u -r1.835 -r1.836 --- sources 22 Jul 2008 13:06:24 -0000 1.835 +++ sources 23 Jul 2008 19:51:09 -0000 1.836 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -b0ac744ce758d4803eea09c74e581201 patch-2.6.26-git9.bz2 +5de8b6532393677ffa0ceb647213370d patch-2.6.26-git10.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.752 retrieving revision 1.753 diff -u -r1.752 -r1.753 --- upstream 22 Jul 2008 13:06:24 -0000 1.752 +++ upstream 23 Jul 2008 19:51:09 -0000 1.753 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git9.bz2 +patch-2.6.26-git10.bz2 --- linux-2.6-net-8139-pio-mmio-fallback.patch DELETED --- --- linux-2.6-net-8139-pio-modparam.patch DELETED --- --- linux-2.6-net-8139-pio-oqo2.patch DELETED --- --- linux-2.6-netdev-atl1e.patch DELETED --- --- patch-2.6.26-git9.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 20:01:19 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 23 Jul 2008 20:01:19 GMT Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.43,1.44 Message-ID: <200807232001.m6NK1JsQ000791@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26621 Modified Files: kdepimlibs.spec Log Message: fix rpm file list Index: kdepimlibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- kdepimlibs.spec 23 Jul 2008 15:07:01 -0000 1.43 +++ kdepimlibs.spec 23 Jul 2008 20:00:30 -0000 1.44 @@ -134,7 +134,7 @@ %if 0%{?rest} %files %defattr(-,root,root,-) -%{_kde4_datadir}/apps/akonadi-kde/ +%{_kde4_appsdir}/akonadi-kde/ %{_kde4_appsdir}/kabc/ %{_kde4_appsdir}/libical/ %{_kde4_appsdir}/kconf_update/* From fedora-extras-commits at redhat.com Wed Jul 23 20:19:40 2008 From: fedora-extras-commits at redhat.com (Shawn Starr (spstarr)) Date: Wed, 23 Jul 2008 20:19:40 GMT Subject: rpms/qgtkstyle/devel import.log, NONE, 1.1 .cvsignore, 1.5, 1.6 qgtkstyle.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807232019.m6NKJejn001429@cvs-int.fedora.redhat.com> Author: spstarr Update of /cvs/pkgs/rpms/qgtkstyle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1378/devel Modified Files: .cvsignore qgtkstyle.spec sources Added Files: import.log Log Message: New upstream version, fixes several bugs and display issues with widgets --- NEW FILE import.log --- qgtkstyle-0_0-0_1_20080719svn693_fc10:HEAD:qgtkstyle-0.0-0.1.20080719svn693.fc10.src.rpm:1216844301 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Jun 2008 04:50:16 -0000 1.5 +++ .cvsignore 23 Jul 2008 20:18:56 -0000 1.6 @@ -1 +1 @@ -qgtkstyle-0.0-20080609svn648.tar.bz2 +qgtkstyle-0.0-20080719svn693.tar.bz2 Index: qgtkstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/qgtkstyle.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qgtkstyle.spec 11 Jun 2008 04:50:16 -0000 1.4 +++ qgtkstyle.spec 23 Jul 2008 20:18:56 -0000 1.5 @@ -1,6 +1,6 @@ %define qgtkstyle_version 0.0 -%define svn_date 20080609 -%define svn_revision 648 +%define svn_date 20080719 +%define svn_revision 693 %define snapshot %{svn_date}svn%{svn_revision} # Tarfile created from svn snapshot @@ -52,6 +52,12 @@ %{_qt4_plugindir}/styles/libgtkstyle.so %changelog +* Wed Jul 23 2008 Shawn Starr 0.0-0.1.20080719svn693 +- New upstream snapshot, fix display widget issues +- Mimic GTK+ behavour better for some widgets +- Fix support for KDE colour pallette +- Fixes support for big-endian systems + * Tue Jun 09 2008 Shawn Starr 0.0-0.1.20080609svn647 - New upstream snapshot, refactoring of gtkstyle - Fix editable combobox, fix menu, dialog checkbox size and shapes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Jun 2008 04:50:16 -0000 1.5 +++ sources 23 Jul 2008 20:18:56 -0000 1.6 @@ -1 +1 @@ -d447dd64401e54dbad7402d1ee6db2eb qgtkstyle-0.0-20080609svn648.tar.bz2 +95c736455b641c2eb6f2130911b599f2 qgtkstyle-0.0-20080719svn693.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 20:29:35 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 23 Jul 2008 20:29:35 GMT Subject: rpms/pwlib/devel pwlib.spec,1.54,1.55 Message-ID: <200807232029.m6NKTZCm001929@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/pwlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1830 Modified Files: pwlib.spec Log Message: * Wed Jul 23 2008 Jarod Wilson 1.10.10-8 - Disable avc support, since pwlib uses a long-since deprecated and now removed libraw1394 interface for it... Index: pwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/pwlib/devel/pwlib.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- pwlib.spec 22 Jul 2008 20:11:39 -0000 1.54 +++ pwlib.spec 23 Jul 2008 20:28:45 -0000 1.55 @@ -1,7 +1,7 @@ Summary: Portable Windows Library Name: pwlib Version: 1.10.10 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.openh323.org/ Source0: http://www.ekiga.org/pwlib-%{version}.tar.gz License: MPL @@ -44,7 +44,7 @@ %build export CFLAGS="$CFLAGS -DLDAP_DEPRECATED" -%configure --prefix=/usr --enable-opal --enable-plugins --disable-oss --enable-v4l2 +%configure --prefix=/usr --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc make %install @@ -87,7 +87,7 @@ %{_libdir}/pwlib/devices/videoinput/v4l_pwplugin.so %{_libdir}/pwlib/devices/videoinput/v4l2_pwplugin.so %ifnarch s390 s390x -%{_libdir}/pwlib/devices/videoinput/avc_pwplugin.so +#{_libdir}/pwlib/devices/videoinput/avc_pwplugin.so %endif %files devel @@ -98,6 +98,10 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Wed Jul 23 2008 Jarod Wilson 1.10.10-8 +- Disable avc support, since pwlib uses a long-since deprecated + and now removed libraw1394 interface for it... + * Tue Jul 22 2008 Jarod Wilson 1.10.10-7 - Bump and rebuild for libraw1394 v2.0.0 From fedora-extras-commits at redhat.com Wed Jul 23 20:31:29 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 23 Jul 2008 20:31:29 GMT Subject: rpms/epiphany/devel epiphany.spec,1.194,1.195 Message-ID: <200807232031.m6NKVT6C002109@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2040 Modified Files: epiphany.spec Log Message: * Wed Jul 23 2008 Christopher Aillon - 2.23.5-2 - Rebuild against newer gecko Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- epiphany.spec 23 Jul 2008 03:13:03 -0000 1.194 +++ epiphany.spec 23 Jul 2008 20:30:35 -0000 1.195 @@ -1,4 +1,4 @@ -%define gecko_ver 1.9 +%define gecko_ver 1.9.0.1 %define desktop_file_utils_version 0.9 %define glib2_devel_ver 2.15.2 %define gtk2_devel_ver 2.12.0 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and GFDL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -211,6 +211,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed Jul 23 2008 Christopher Aillon - 2.23.5-2 +- Rebuild against newer gecko + * Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Wed Jul 23 20:49:24 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Wed, 23 Jul 2008 20:49:24 GMT Subject: rpms/yum/F-9 yum.conf.fedora,1.18,1.19 Message-ID: <200807232049.m6NKnO0C003028@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/yum/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2977 Modified Files: yum.conf.fedora Log Message: Fix installonly_limit, ready for 3.2.18 (no build just for this) Index: yum.conf.fedora =================================================================== RCS file: /cvs/pkgs/rpms/yum/F-9/yum.conf.fedora,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- yum.conf.fedora 2 Jul 2008 17:10:58 -0000 1.18 +++ yum.conf.fedora 23 Jul 2008 20:48:25 -0000 1.19 @@ -7,7 +7,7 @@ obsoletes=1 gpgcheck=1 plugins=1 -installonly_limit=2 +installonly_limit=3 # This is the default, if you make this bigger yum won't see if the metadata # is newer on the remote and so you'll "gain" the bandwidth of not having to From fedora-extras-commits at redhat.com Wed Jul 23 20:58:17 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 23 Jul 2008 20:58:17 GMT Subject: rpms/epiphany/devel epiphany.spec,1.195,1.196 Message-ID: <200807232058.m6NKwHsT003373@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3325 Modified Files: epiphany.spec Log Message: BR: intltool Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- epiphany.spec 23 Jul 2008 20:30:35 -0000 1.195 +++ epiphany.spec 23 Jul 2008 20:57:24 -0000 1.196 @@ -39,6 +39,7 @@ BuildRequires: gettext-devel BuildRequires: perl(XML::Parser) BuildRequires: avahi-gobject-devel +BuildRequires: intltool %ifnarch s390 s390x BuildRequires: NetworkManager-devel %endif From fedora-extras-commits at redhat.com Wed Jul 23 20:58:56 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 23 Jul 2008 20:58:56 GMT Subject: rpms/devhelp/devel devhelp.spec,1.90,1.91 Message-ID: <200807232058.m6NKwunb003451@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/devhelp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3368 Modified Files: devhelp.spec Log Message: * Wed Jul 23 2008 Christopher Aillon - 0.19.1-3 - Rebuild against newer gecko Index: devhelp.spec =================================================================== RCS file: /cvs/extras/rpms/devhelp/devel/devhelp.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- devhelp.spec 7 Jul 2008 20:58:39 -0000 1.90 +++ devhelp.spec 23 Jul 2008 20:58:10 -0000 1.91 @@ -1,5 +1,5 @@ # Last updated for 0.17 -%define gecko_version 1.9 +%define gecko_version 1.9.0.1 %define gtk2_version 2.8.0 %define libwnck_version 2.10.0 @@ -7,7 +7,7 @@ Name: devhelp Version: 0.19.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools Summary: API document browser @@ -135,6 +135,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jul 23 2008 Christopher Aillon - 0.19.1-3 +- Rebuild against newer gecko + * Mon Jul 07 2008 Matthew Barnes - 0.19.1-2 - Rebuild, just to keep up with F9 package. From fedora-extras-commits at redhat.com Wed Jul 23 21:05:19 2008 From: fedora-extras-commits at redhat.com (Mads Villadsen (maxx)) Date: Wed, 23 Jul 2008 21:05:19 GMT Subject: rpms/hamster-applet/F-9 .cvsignore, 1.6, 1.7 hamster-applet.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200807232105.m6NL5Jca010311@cvs-int.fedora.redhat.com> Author: maxx Update of /cvs/pkgs/rpms/hamster-applet/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10283 Modified Files: .cvsignore hamster-applet.spec sources Log Message: * Wed Jul 23 2008 Mads Villadsen - 0.6.1-1 - Update to new upstream release - Simple reporting via Overview dialog - Not stealing middle-click to move applet - Correct label orientation on vertical panels - Fixed fact pushing on overlap Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hamster-applet/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 May 2008 20:07:01 -0000 1.6 +++ .cvsignore 23 Jul 2008 21:04:34 -0000 1.7 @@ -1 +1 @@ -hamster-applet-0.5.tar.gz +hamster-applet-0.6.1.tar.gz Index: hamster-applet.spec =================================================================== RCS file: /cvs/pkgs/rpms/hamster-applet/F-9/hamster-applet.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hamster-applet.spec 25 May 2008 20:07:01 -0000 1.6 +++ hamster-applet.spec 23 Jul 2008 21:04:34 -0000 1.7 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: hamster-applet -Version: 0.5 +Version: 0.6.1 Release: 1%{?dist} Summary: Time tracking applet @@ -91,6 +91,13 @@ %changelog +* Wed Jul 23 2008 Mads Villadsen - 0.6.1-1 +- Update to new upstream release +- Simple reporting via Overview dialog +- Not stealing middle-click to move applet +- Correct label orientation on vertical panels +- Fixed fact pushing on overlap + * Sun May 25 2008 Mads Villadsen - 0.5-1 - Update to latest upstream release - Preferences are now editable via user interface Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hamster-applet/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 May 2008 20:07:01 -0000 1.6 +++ sources 23 Jul 2008 21:04:34 -0000 1.7 @@ -1 +1 @@ -13c5c77081304e849306a4782dae8c89 hamster-applet-0.5.tar.gz +c9aa0690c9dc8fda4a47cb8bb9434b3a hamster-applet-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 21:14:01 2008 From: fedora-extras-commits at redhat.com (Shawn Starr (spstarr)) Date: Wed, 23 Jul 2008 21:14:01 GMT Subject: rpms/qgtkstyle/F-9 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 qgtkstyle.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807232114.m6NLE1M8010687@cvs-int.fedora.redhat.com> Author: spstarr Update of /cvs/pkgs/rpms/qgtkstyle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10617/F-9 Modified Files: .cvsignore qgtkstyle.spec sources Added Files: import.log Log Message: New upstream version, fixes widget display issues and some behavours --- NEW FILE import.log --- qgtkstyle-0_0-0_1_20080719svn693_fc9:F-9:qgtkstyle-0.0-0.1.20080719svn693.fc9.src.rpm:1216847567 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jul 2008 03:44:27 -0000 1.2 +++ .cvsignore 23 Jul 2008 21:13:18 -0000 1.3 @@ -1 +1 @@ -qgtkstyle-0.0-20080609svn648.tar.bz2 +qgtkstyle-0.0-20080719svn693.tar.bz2 Index: qgtkstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/qgtkstyle.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qgtkstyle.spec 19 Jul 2008 03:44:27 -0000 1.1 +++ qgtkstyle.spec 23 Jul 2008 21:13:18 -0000 1.2 @@ -1,6 +1,6 @@ %define qgtkstyle_version 0.0 -%define svn_date 20080609 -%define svn_revision 648 +%define svn_date 20080719 +%define svn_revision 693 %define snapshot %{svn_date}svn%{svn_revision} # Tarfile created from svn snapshot @@ -17,9 +17,9 @@ Group: User Interface/Desktops URL: http://labs.trolltech.com/page/Projects/Styles/GtkStyle BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel >= 4.4.0 +BuildRequires: qt-devel >= 4.4.0 BuildRequires: gtk2-devel -Requires: qt4-x11 >= 4.4.0 +Requires: qt-x11 >= 4.4.0 # Fedora specific snapshot no upstream release (yet) Source0: %{tarfile} @@ -52,6 +52,12 @@ %{_qt4_plugindir}/styles/libgtkstyle.so %changelog +* Wed Jul 23 2008 Shawn Starr 0.0-0.1.20080719svn693 +- New upstream snapshot, fix display widget issues +- Mimic GTK+ behavour better for some widgets +- Fix support for KDE colour palette +- Fixes support for big-endian systems + * Tue Jun 09 2008 Shawn Starr 0.0-0.1.20080609svn647 - New upstream snapshot, refactoring of gtkstyle - Fix editable combobox, fix menu, dialog checkbox size and shapes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jul 2008 03:44:27 -0000 1.2 +++ sources 23 Jul 2008 21:13:18 -0000 1.3 @@ -1 +1 @@ -d447dd64401e54dbad7402d1ee6db2eb qgtkstyle-0.0-20080609svn648.tar.bz2 +95c736455b641c2eb6f2130911b599f2 qgtkstyle-0.0-20080719svn693.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 21:24:15 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 23 Jul 2008 21:24:15 GMT Subject: rpms/anaconda/devel .cvsignore, 1.550, 1.551 anaconda.spec, 1.692, 1.693 sources, 1.684, 1.685 Message-ID: <200807232124.m6NLOF0p011454@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.550 retrieving revision 1.551 diff -u -r1.550 -r1.551 --- .cvsignore 23 Jul 2008 19:40:53 -0000 1.550 +++ .cvsignore 23 Jul 2008 21:23:30 -0000 1.551 @@ -2,3 +2,4 @@ anaconda-11.4.1.15.tar.bz2 anaconda-11.4.1.16.tar.bz2 anaconda-11.4.1.17.tar.bz2 +anaconda-11.4.1.18.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.692 retrieving revision 1.693 diff -u -r1.692 -r1.693 --- anaconda.spec 23 Jul 2008 19:40:53 -0000 1.692 +++ anaconda.spec 23 Jul 2008 21:23:30 -0000 1.693 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.17 +Version: 11.4.1.18 Release: 1 License: GPLv2+ Group: Applications/System @@ -195,6 +195,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jul 23 2008 Chris Lumens - 11.4.1.18-1 +- MD_NEW_SIZE_BLOCKS no longer exists in newer kernel headers. (clumens) + * Wed Jul 23 2008 Chris Lumens - 11.4.1.17-1 - Add support for filing bugs straight into bugzilla. (clumens) - Running git-tag -f from a makefile rule is a bad idea (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.684 retrieving revision 1.685 diff -u -r1.684 -r1.685 --- sources 23 Jul 2008 19:49:49 -0000 1.684 +++ sources 23 Jul 2008 21:23:30 -0000 1.685 @@ -1 +1 @@ -0432b5e38fe861ba524311630dc4136a anaconda-11.4.1.17.tar.bz2 +37374255822ce6c239a519b2f1dbc4f7 anaconda-11.4.1.18.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 21:25:11 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 21:25:11 GMT Subject: rpms/qgtkstyle/F-9 qgtkstyle.spec,1.2,1.3 Message-ID: <200807232125.m6NLPBk5011612@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qgtkstyle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11500/F-9 Modified Files: qgtkstyle.spec Log Message: Fix specfile. Index: qgtkstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/qgtkstyle.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qgtkstyle.spec 23 Jul 2008 21:13:18 -0000 1.2 +++ qgtkstyle.spec 23 Jul 2008 21:24:27 -0000 1.3 @@ -17,9 +17,9 @@ Group: User Interface/Desktops URL: http://labs.trolltech.com/page/Projects/Styles/GtkStyle BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel >= 4.4.0 +BuildRequires: qt4-devel >= 4.4.0 BuildRequires: gtk2-devel -Requires: qt-x11 >= 4.4.0 +Requires: qt4-x11 >= 4.4.0 # Fedora specific snapshot no upstream release (yet) Source0: %{tarfile} From fedora-extras-commits at redhat.com Wed Jul 23 21:31:22 2008 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Wed, 23 Jul 2008 21:31:22 GMT Subject: rpms/gcstar/devel .cvsignore, 1.9, 1.10 gcstar.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200807232131.m6NLVMla012061@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/pkgs/rpms/gcstar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11971 Modified Files: .cvsignore gcstar.spec sources Log Message: New upstream version 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 3 Jun 2008 18:36:16 -0000 1.9 +++ .cvsignore 23 Jul 2008 21:30:36 -0000 1.10 @@ -1 +1 @@ -gcstar-1.4.0.tar.gz +gcstar-1.4.1.tar.gz Index: gcstar.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/devel/gcstar.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gcstar.spec 3 Jun 2008 18:36:16 -0000 1.13 +++ gcstar.spec 23 Jul 2008 21:30:36 -0000 1.14 @@ -1,5 +1,5 @@ Name: gcstar -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Personal collections manager @@ -101,6 +101,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Wed Jul 23 2008 Tian - 1.4.1-1 + - New upstream version http://svn.gna.org/viewcvs/*checkout*/gcstar/tags/GCstar_1_4_1/CHANGELOG * Tue Jun 3 2008 Tian - 1.4.0-1 - New upstream version * Fri Jan 25 2008 Tian - 1.3.2-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 3 Jun 2008 18:36:16 -0000 1.8 +++ sources 23 Jul 2008 21:30:36 -0000 1.9 @@ -1 +1 @@ -70bebd9e52e2f9d1532e91080604b26f gcstar-1.4.0.tar.gz +67dccb804edce20ab124aefb10c3f61e gcstar-1.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 21:32:09 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 21:32:09 GMT Subject: rpms/qgtkstyle/F-9 qgtkstyle.spec,1.3,1.4 Message-ID: <200807232132.m6NLW9Uw012179@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qgtkstyle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12065/F-9 Modified Files: qgtkstyle.spec Log Message: Bump Release because the build was canceled too late. :-( Index: qgtkstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/qgtkstyle.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qgtkstyle.spec 23 Jul 2008 21:24:27 -0000 1.3 +++ qgtkstyle.spec 23 Jul 2008 21:31:24 -0000 1.4 @@ -12,7 +12,7 @@ Summary: Qt style rendering using GTK+ themes Name: qgtkstyle Version: %{qgtkstyle_version} -Release: 0.1.%{snapshot}%{?dist} +Release: 0.1.%{snapshot}%{?dist}.1 License: GPLv2 Group: User Interface/Desktops URL: http://labs.trolltech.com/page/Projects/Styles/GtkStyle From fedora-extras-commits at redhat.com Wed Jul 23 21:34:30 2008 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Wed, 23 Jul 2008 21:34:30 GMT Subject: rpms/gcstar/F-9 .cvsignore, 1.9, 1.10 gcstar.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200807232134.m6NLYUwn012356@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/pkgs/rpms/gcstar/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12281 Modified Files: .cvsignore gcstar.spec sources Log Message: New upstream version 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 5 Jul 2008 22:07:36 -0000 1.9 +++ .cvsignore 23 Jul 2008 21:33:41 -0000 1.10 @@ -1 +1 @@ -gcstar-1.4.0.tar.gz +gcstar-1.4.1.tar.gz Index: gcstar.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/F-9/gcstar.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gcstar.spec 5 Jul 2008 22:07:36 -0000 1.13 +++ gcstar.spec 23 Jul 2008 21:33:41 -0000 1.14 @@ -1,5 +1,5 @@ Name: gcstar -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Personal collections manager @@ -101,6 +101,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Wed Jul 23 2008 Tian - 1.4.1-1 + - New upstream version http://svn.gna.org/viewcvs/*checkout*/gcstar/tags/GCstar_1_4_1/CHANGELOG * Tue Jun 3 2008 Tian - 1.4.0-1 - New upstream version * Fri Jan 25 2008 Tian - 1.3.2-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcstar/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Jul 2008 22:07:36 -0000 1.8 +++ sources 23 Jul 2008 21:33:41 -0000 1.9 @@ -1 +1 @@ -70bebd9e52e2f9d1532e91080604b26f gcstar-1.4.0.tar.gz +67dccb804edce20ab124aefb10c3f61e gcstar-1.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 21:34:37 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 21:34:37 GMT Subject: rpms/qgtkstyle/devel qgtkstyle.spec,1.5,1.6 Message-ID: <200807232134.m6NLYbkX012366@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qgtkstyle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12297/devel Modified Files: qgtkstyle.spec Log Message: Fix changelog typos and non-US English. Index: qgtkstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/qgtkstyle.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qgtkstyle.spec 23 Jul 2008 20:18:56 -0000 1.5 +++ qgtkstyle.spec 23 Jul 2008 21:33:52 -0000 1.6 @@ -12,7 +12,7 @@ Summary: Qt style rendering using GTK+ themes Name: qgtkstyle Version: %{qgtkstyle_version} -Release: 0.1.%{snapshot}%{?dist} +Release: 0.2.%{snapshot}%{?dist} License: GPLv2 Group: User Interface/Desktops URL: http://labs.trolltech.com/page/Projects/Styles/GtkStyle @@ -52,10 +52,10 @@ %{_qt4_plugindir}/styles/libgtkstyle.so %changelog -* Wed Jul 23 2008 Shawn Starr 0.0-0.1.20080719svn693 +* Wed Jul 23 2008 Shawn Starr 0.0-0.2.20080719svn693 - New upstream snapshot, fix display widget issues -- Mimic GTK+ behavour better for some widgets -- Fix support for KDE colour pallette +- Mimic GTK+ behavior better for some widgets +- Fix support for KDE color palette - Fixes support for big-endian systems * Tue Jun 09 2008 Shawn Starr 0.0-0.1.20080609svn647 From fedora-extras-commits at redhat.com Wed Jul 23 21:36:13 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 21:36:13 GMT Subject: rpms/qgtkstyle/F-9 qgtkstyle.spec,1.4,1.5 Message-ID: <200807232136.m6NLaDVO012497@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qgtkstyle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443/F-9 Modified Files: qgtkstyle.spec Log Message: Fix changelog typos and non-US English. Index: qgtkstyle.spec =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/qgtkstyle.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qgtkstyle.spec 23 Jul 2008 21:31:24 -0000 1.4 +++ qgtkstyle.spec 23 Jul 2008 21:35:30 -0000 1.5 @@ -12,7 +12,7 @@ Summary: Qt style rendering using GTK+ themes Name: qgtkstyle Version: %{qgtkstyle_version} -Release: 0.1.%{snapshot}%{?dist}.1 +Release: 0.2.%{snapshot}%{?dist} License: GPLv2 Group: User Interface/Desktops URL: http://labs.trolltech.com/page/Projects/Styles/GtkStyle @@ -52,10 +52,10 @@ %{_qt4_plugindir}/styles/libgtkstyle.so %changelog -* Wed Jul 23 2008 Shawn Starr 0.0-0.1.20080719svn693 +* Wed Jul 23 2008 Shawn Starr 0.0-0.2.20080719svn693 - New upstream snapshot, fix display widget issues -- Mimic GTK+ behavour better for some widgets -- Fix support for KDE colour palette +- Mimic GTK+ behavior better for some widgets +- Fix support for KDE color palette - Fixes support for big-endian systems * Tue Jun 09 2008 Shawn Starr 0.0-0.1.20080609svn647 From fedora-extras-commits at redhat.com Wed Jul 23 21:40:05 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 21:40:05 GMT Subject: rpms/qgtkstyle/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807232140.m6NLe56o012779@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qgtkstyle/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12722/F-8 Modified Files: .cvsignore sources Log Message: Copy devel to F-8. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2008 20:20:19 -0000 1.1 +++ .cvsignore 23 Jul 2008 21:39:18 -0000 1.2 @@ -0,0 +1 @@ +qgtkstyle-0.0-20080719svn693.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qgtkstyle/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2008 20:20:19 -0000 1.1 +++ sources 23 Jul 2008 21:39:18 -0000 1.2 @@ -0,0 +1 @@ +95c736455b641c2eb6f2130911b599f2 qgtkstyle-0.0-20080719svn693.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 21:41:06 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 21:41:06 GMT Subject: rpms/qgtkstyle/F-8 qgtkstyle.spec,NONE,1.1 Message-ID: <200807232141.m6NLf6BU012850@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qgtkstyle/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12818/F-8 Added Files: qgtkstyle.spec Log Message: Copy devel to F-8. --- NEW FILE qgtkstyle.spec --- %define qgtkstyle_version 0.0 %define svn_date 20080719 %define svn_revision 693 %define snapshot %{svn_date}svn%{svn_revision} # Tarfile created from svn snapshot # svn co svn://labs.trolltech.com/svn/styles/gtkstyle qgtkstyle-%{qgtkstyle_version} # tar cjf qgtkstyle-%{qgtkstyle_version}-%{snapshot}.tar.bz2 qgtkstyle-%{qgtkstyle_version}/ %define tarfile %{name}-%{qgtkstyle_version}-%{snapshot}.tar.bz2 Summary: Qt style rendering using GTK+ themes Name: qgtkstyle Version: %{qgtkstyle_version} Release: 0.2.%{snapshot}%{?dist} License: GPLv2 Group: User Interface/Desktops URL: http://labs.trolltech.com/page/Projects/Styles/GtkStyle BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel >= 4.4.0 BuildRequires: gtk2-devel Requires: qt4-x11 >= 4.4.0 # Fedora specific snapshot no upstream release (yet) Source0: %{tarfile} %description This is a Qt style rendered using GTK to give a native appearence for Qt applications running on the GNOME desktop. %prep %setup -q -n %{name}-%{version} %build CXXFLAGS="%{optflags}" qmake-qt4 make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}/%{_qt4_plugindir}/styles make install INSTALL_ROOT=%{buildroot} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_qt4_plugindir}/styles/libgtkstyle.so %changelog * Wed Jul 23 2008 Shawn Starr 0.0-0.2.20080719svn693 - New upstream snapshot, fix display widget issues - Mimic GTK+ behavior better for some widgets - Fix support for KDE color palette - Fixes support for big-endian systems * Tue Jun 09 2008 Shawn Starr 0.0-0.1.20080609svn647 - New upstream snapshot, refactoring of gtkstyle - Fix editable combobox, fix menu, dialog checkbox size and shapes - Improved sliders - Fix pixmap cache regressions * Mon Jun 02 2008 Shawn Starr 0.0-0.1.20080601svn636 - New upstream snapshot, Fix endian issues - Check boxes and menu optimizations, fix tabbing issues - Improved tab bar - Fix toolbars and frames with flat-style - Improved toolbar handles * Thu May 29 2008 Shawn Starr 0.0-0.1.20080529svn626 - New upstream snapshot, Improved menu separators - Fix menu separator height, fix paint glitches with comboboxes. * Tue May 27 2008 Shawn Starr 0.0-0.1.20080526svn617 - Initial Fedora package. From fedora-extras-commits at redhat.com Wed Jul 23 21:44:24 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 23 Jul 2008 21:44:24 GMT Subject: rpms/thunderbird/F-9 .cvsignore, 1.19, 1.20 sources, 1.26, 1.27 thunderbird.spec, 1.119, 1.120 Message-ID: <200807232144.m6NLiOio013188@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/thunderbird/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986/F-9 Modified Files: .cvsignore sources thunderbird.spec Log Message: * Wed Jul 23 2008 Christopher Aillon 2.0.0.16-1 - Update to 2.0.0.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/thunderbird/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 1 May 2008 21:38:46 -0000 1.19 +++ .cvsignore 23 Jul 2008 21:43:22 -0000 1.20 @@ -1,2 +1,2 @@ -thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 -thunderbird-2.0.0.14-source.tar.bz2 +thunderbird-2.0.0.16-source.tar.bz2 +thunderbird-langpacks-2.0.0.16-20080723.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/thunderbird/F-9/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 1 May 2008 21:38:46 -0000 1.26 +++ sources 23 Jul 2008 21:43:22 -0000 1.27 @@ -1,2 +1,2 @@ -d8cf331743cc00eef920c8d65d7cde09 thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 -e304510d08f7e226bbfff8e7e549232f thunderbird-2.0.0.14-source.tar.bz2 +591c9f80a2f6772c5acf8fb6128f40bd thunderbird-2.0.0.16-source.tar.bz2 +688e25ab483139f14f98987878046ec0 thunderbird-langpacks-2.0.0.16-20080723.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/extras/rpms/thunderbird/F-9/thunderbird.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- thunderbird.spec 1 May 2008 21:38:46 -0000 1.119 +++ thunderbird.spec 23 Jul 2008 21:43:22 -0000 1.120 @@ -7,7 +7,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 2.0.0.14 +Version: 2.0.0.16 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -18,7 +18,7 @@ %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20080501.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20080723.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -329,14 +329,17 @@ #=============================================================================== %changelog -* Thu May 1 2008 Christopher Aillon - 2.0.0.14-1 +* Wed Jul 23 2008 Christopher Aillon 2.0.0.16-1 +- Update to 2.0.0.16 + +* Thu May 1 2008 Christopher Aillon 2.0.0.14-1 - Update to 2.0.0.14 - Use the system dictionaries -* Fri Apr 18 2008 Christopher Aillon - 2.0.0.12-6 +* Fri Apr 18 2008 Christopher Aillon 2.0.0.12-6 - Icon belongs in _datadir/pixmaps -* Fri Apr 18 2008 Christopher Aillon - 2.0.0.12-5 +* Fri Apr 18 2008 Christopher Aillon 2.0.0.12-5 - rebuilt * Mon Apr 7 2008 Christopher Aillon 2.0.0.12-4 From fedora-extras-commits at redhat.com Wed Jul 23 21:44:52 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 23 Jul 2008 21:44:52 GMT Subject: rpms/thunderbird/F-8 .cvsignore, 1.19, 1.20 sources, 1.26, 1.27 thunderbird.spec, 1.114, 1.115 Message-ID: <200807232144.m6NLiqoC013270@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/thunderbird/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986/F-8 Modified Files: .cvsignore sources thunderbird.spec Log Message: * Wed Jul 23 2008 Christopher Aillon 2.0.0.16-1 - Update to 2.0.0.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/thunderbird/F-8/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 1 May 2008 21:41:37 -0000 1.19 +++ .cvsignore 23 Jul 2008 21:43:04 -0000 1.20 @@ -1,2 +1,2 @@ -thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 -thunderbird-2.0.0.14-source.tar.bz2 +thunderbird-2.0.0.16-source.tar.bz2 +thunderbird-langpacks-2.0.0.16-20080723.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/thunderbird/F-8/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 1 May 2008 21:41:37 -0000 1.26 +++ sources 23 Jul 2008 21:43:04 -0000 1.27 @@ -1,2 +1,2 @@ -d8cf331743cc00eef920c8d65d7cde09 thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 -e304510d08f7e226bbfff8e7e549232f thunderbird-2.0.0.14-source.tar.bz2 +591c9f80a2f6772c5acf8fb6128f40bd thunderbird-2.0.0.16-source.tar.bz2 +688e25ab483139f14f98987878046ec0 thunderbird-langpacks-2.0.0.16-20080723.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/extras/rpms/thunderbird/F-8/thunderbird.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- thunderbird.spec 1 May 2008 21:43:29 -0000 1.114 +++ thunderbird.spec 23 Jul 2008 21:43:04 -0000 1.115 @@ -7,7 +7,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 2.0.0.14 +Version: 2.0.0.16 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -18,7 +18,7 @@ %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20080501.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20080723.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -309,6 +309,9 @@ #=============================================================================== %changelog +* Wed Jul 23 2008 Christopher Aillon 2.0.0.16-1 +- Update to 2.0.0.16 + * Thu May 1 2008 Christopher Aillon 2.0.0.14-1 - Update to 2.0.0.14 From fedora-extras-commits at redhat.com Wed Jul 23 21:44:53 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 23 Jul 2008 21:44:53 GMT Subject: rpms/thunderbird/devel .cvsignore, 1.19, 1.20 sources, 1.26, 1.27 thunderbird.spec, 1.117, 1.118 Message-ID: <200807232144.m6NLiroN013275@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/thunderbird/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986/devel Modified Files: .cvsignore sources thunderbird.spec Log Message: * Wed Jul 23 2008 Christopher Aillon 2.0.0.16-1 - Update to 2.0.0.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/thunderbird/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 1 May 2008 22:09:48 -0000 1.19 +++ .cvsignore 23 Jul 2008 21:43:54 -0000 1.20 @@ -1,2 +1,2 @@ -thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 -thunderbird-2.0.0.14-source.tar.bz2 +thunderbird-2.0.0.16-source.tar.bz2 +thunderbird-langpacks-2.0.0.16-20080723.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/thunderbird/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 1 May 2008 22:09:48 -0000 1.26 +++ sources 23 Jul 2008 21:43:54 -0000 1.27 @@ -1,2 +1,2 @@ -d8cf331743cc00eef920c8d65d7cde09 thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 -e304510d08f7e226bbfff8e7e549232f thunderbird-2.0.0.14-source.tar.bz2 +591c9f80a2f6772c5acf8fb6128f40bd thunderbird-2.0.0.16-source.tar.bz2 +688e25ab483139f14f98987878046ec0 thunderbird-langpacks-2.0.0.16-20080723.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- thunderbird.spec 1 May 2008 22:09:48 -0000 1.117 +++ thunderbird.spec 23 Jul 2008 21:43:54 -0000 1.118 @@ -7,7 +7,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 2.0.0.14 +Version: 2.0.0.16 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -18,7 +18,7 @@ %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20080501.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20080723.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -329,14 +329,17 @@ #=============================================================================== %changelog -* Thu May 1 2008 Christopher Aillon - 2.0.0.14-1 +* Wed Jul 23 2008 Christopher Aillon 2.0.0.16-1 +- Update to 2.0.0.16 + +* Thu May 1 2008 Christopher Aillon 2.0.0.14-1 - Update to 2.0.0.14 - Use the system dictionaries -* Fri Apr 18 2008 Christopher Aillon - 2.0.0.12-6 +* Fri Apr 18 2008 Christopher Aillon 2.0.0.12-6 - Icon belongs in _datadir/pixmaps -* Fri Apr 18 2008 Christopher Aillon - 2.0.0.12-5 +* Fri Apr 18 2008 Christopher Aillon 2.0.0.12-5 - rebuilt * Mon Apr 7 2008 Christopher Aillon 2.0.0.12-4 From fedora-extras-commits at redhat.com Wed Jul 23 21:56:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 23 Jul 2008 21:56:55 GMT Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.44,1.45 Message-ID: <200807232156.m6NLutXX013910@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13852/devel Modified Files: kdepimlibs.spec Log Message: Work around circular dependency from kdelibs4-devel pulling in phonon-backend-xine. Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- kdepimlibs.spec 23 Jul 2008 20:00:30 -0000 1.44 +++ kdepimlibs.spec 23 Jul 2008 21:56:04 -0000 1.45 @@ -31,6 +31,8 @@ BuildRequires: cmake BuildRequires: cyrus-sasl-devel BuildRequires: gpgme-devel +# work around circular dependency from kdelibs4-devel pulling in phonon-backend-xine +BuildRequires: phonon-backend-gstreamer BuildRequires: kdelibs4-devel >= %{version} BuildRequires: libXpm-devel libXtst-devel BuildRequires: openldap-devel From fedora-extras-commits at redhat.com Wed Jul 23 22:48:43 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 23 Jul 2008 22:48:43 GMT Subject: extras-repoclosure PackageOwners.py,1.18,1.19 Message-ID: <200807232248.m6NMmh6Z022595@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22577 Modified Files: PackageOwners.py Log Message: FAS group dump contains a "disabled" user that has "disabled" in the email addr field - skip such entries Index: PackageOwners.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/PackageOwners.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- PackageOwners.py 16 Jun 2008 04:10:00 -0000 1.18 +++ PackageOwners.py 23 Jul 2008 22:48:42 -0000 1.19 @@ -251,6 +251,8 @@ raise if (addr.find('@') < 0): # unexpected, no addr print 'No email in:', line + if addr == 'disabled': + continue # no email for this user! raise Exception self.usermap[user] = addr self._parse(self._getlinesfromurl(self.url)) From fedora-extras-commits at redhat.com Wed Jul 23 22:56:38 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 23 Jul 2008 22:56:38 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1590,1.1591 Message-ID: <200807232256.m6NMucbI022902@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22849 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#456459 3-layer OOo hits the sdk/odk Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1590 retrieving revision 1.1591 diff -u -r1.1590 -r1.1591 --- openoffice.org.spec 23 Jul 2008 15:58:08 -0000 1.1590 +++ openoffice.org.spec 23 Jul 2008 22:55:52 -0000 1.1591 @@ -1514,7 +1514,8 @@ for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do sed -e "s, at OO_SDK_NAME@,sdk," \ -e "s, at OO_SDK_HOME@,%{sdkinstdir}," \ - -e "s, at OFFICE_HOME@,%{basisinstdir}," \ + -e "s, at OFFICE_HOME@,%{baseinstdir}," \ + -e "s, at OFFICE_BASE_HOME@,%{basisinstdir}," \ -e "s, at OO_SDK_URE_HOME@,%{ureinstdir}," \ -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \ -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \ @@ -3576,6 +3577,7 @@ * Wed Jul 23 2008 Caolan McNamara - 1:3.0.0-0.26-2 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch - Resolves: rhbz#451708 ensure root certs are available for document signing +- Resolves: rhbz#456459 3-layer OOo hits the sdk/odk * Tue Jul 22 2008 Caolan McNamara - 1:3.0.0-0.26-1 - next version From fedora-extras-commits at redhat.com Wed Jul 23 22:56:39 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Wed, 23 Jul 2008 22:56:39 GMT Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.6, 1.7 olpc-utils.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200807232256.m6NMud8q022909@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22761 Modified Files: .cvsignore olpc-utils.spec sources Log Message: - sayamindu: dlo#7474: Choose the XIM method by default. - pgf: dlo#7537: Be more precise when assigning permissions to /home/olpc. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Jul 2008 22:10:32 -0000 1.6 +++ .cvsignore 23 Jul 2008 22:55:53 -0000 1.7 @@ -1 +1 @@ -olpc-utils-0.79.tar.bz2 +olpc-utils-0.80.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- olpc-utils.spec 22 Jul 2008 22:10:32 -0000 1.12 +++ olpc-utils.spec 23 Jul 2008 22:55:53 -0000 1.13 @@ -1,5 +1,5 @@ Name: olpc-utils -Version: 0.79 +Version: 0.80 Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary @@ -84,6 +84,10 @@ %changelog +* Wed Jul 23 2008 Michael Stone 0.80-1 +- sayamindu: dlo#7474: Choose the XIM method by default. +- pgf: dlo#7537: Be more precise when assigning permissions to /home/olpc. + * Tue Jul 22 2008 Michael Stone 0.79-1 - cscott: dlo#7495: Trigger activity update on base OS upgrade. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Jul 2008 22:10:32 -0000 1.7 +++ sources 23 Jul 2008 22:55:53 -0000 1.8 @@ -1 +1 @@ -a16d38ac1c78d3f0dc113da21a5bff71 olpc-utils-0.79.tar.bz2 +5306d8b00f4fd28e86e82c5106b48459 olpc-utils-0.80.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 23 23:03:27 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 23:03:27 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk.spec, 1.26, 1.27 sources, 1.14, 1.15 java-1.6.0-openjdk-jconsole.desktop, 1.1, NONE java-1.6.0-openjdk-jhat.patch, 1.1, NONE java-1.6.0-openjdk-policytool.desktop, 1.1, NONE Message-ID: <200807232303.m6NN3RK9029821@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29758 Modified Files: java-1.6.0-openjdk.spec sources Removed Files: java-1.6.0-openjdk-jconsole.desktop java-1.6.0-openjdk-jhat.patch java-1.6.0-openjdk-policytool.desktop Log Message: Attempt to bring devel and EL-5 in sync Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- java-1.6.0-openjdk.spec 23 Jul 2008 08:56:41 -0000 1.26 +++ java-1.6.0-openjdk.spec 23 Jul 2008 23:02:42 -0000 1.27 @@ -3,6 +3,9 @@ # java-1.6.0-openjdk-devel. %define gcjbootstrap 0 +# If runtests is 0 test suites will not be run. +%define runtests 1 + %define icedteaver 1.3 %define icedteasnapshot -30aed052fabd0303b4001763652b94c054fa59e7 %define openjdkver b11 @@ -21,29 +24,27 @@ %define mauvedate 2008-03-11 +%define multilib_arches ppc64 sparc64 x86_64 + %define jit_arches %{ix86} x86_64 -%ifarch x86_64 -%define archbuild amd64 -%define archinstall amd64 -%else -%ifarch ppc -%define archbuild ppc -%define archinstall ppc -%else -%ifarch ppc64 -%define archbuild ppc64 -%define archinstall ppc64 -%else %ifarch %{ix86} %define archbuild i586 %define archinstall i386 -%else -%define archbuild zero -%define archinstall zero %endif +%ifarch x86_64 +%define archbuild amd64 +%define archinstall amd64 %endif +%ifnarch %{jit_arches} +%define archbuild %{_arch} +%define archinstall %{_arch} %endif + +# Reduce build time from 27 hours to 12 hours by only running test +# suites on JIT architectures. +%ifnarch %{jit_arches} +%define runtests 0 %endif %define buildoutputdir openjdk/control/build/linux-%{archbuild} @@ -62,7 +63,7 @@ # Hard-code libdir on 64-bit architectures to make the 64-bit JDK # simply be another alternative. -%ifarch x86_64 ppc64 sparc64 +%ifarch %{multilib_arches} %define syslibdir %{_prefix}/lib64 %define _libdir %{_prefix}/lib %define archname %{name}.%{_arch} @@ -85,7 +86,7 @@ # Standard JPackage directories and symbolic links. # Make 64-bit JDKs just another alternative on 64-bit architectures. -%ifarch x86_64 ppc64 sparc64 +%ifarch %{multilib_arches} %define sdklnk java-%{javaver}-%{origin}.%{_arch} %define jrelnk jre-%{javaver}-%{origin}.%{_arch} %define sdkdir %{name}-%{version}.%{_arch} @@ -97,7 +98,7 @@ %define jredir %{sdkdir}/jre %define sdkbindir %{_jvmdir}/%{sdklnk}/bin %define jrebindir %{_jvmdir}/%{jrelnk}/bin -%ifarch x86_64 ppc64 sparc64 +%ifarch %{multilib_arches} %define jvmjardir %{_jvmjardir}/%{name}-%{version}.%{_arch} %else %define jvmjardir %{_jvmjardir}/%{name}-%{version} @@ -108,7 +109,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.14.%{openjdkver}%{?dist}.1 +Release: 0.19.%{openjdkver}%{?dist}.1 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -126,23 +127,18 @@ URL: http://icedtea.classpath.org/ Source0: %{url}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz Source1: %{fedorazip} -# Save icedtea.classpath.org space and bandwidth. -# NoSource: 1 Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz Source3: %{genurl}generate-fedora-zip.sh Source4: README.src Source5: README.plugin Source6: mauve-%{mauvedate}.tar.gz Source7: mauve_tests -Source8: %{name}-jconsole.desktop -Source9: %{name}-policytool.desktop -# FIXME: This patch needs to be fixed. optflags argument -mtune=generic is being ignored -# because it breaks several graphical applications. +# FIXME: This patch needs to be fixed. optflags argument +# -mtune=generic is being ignored because it breaks several graphical +# applications. Patch0: java-1.6.0-openjdk-optflags.patch -Patch1: java-1.6.0-openjdk-makefile.patch -# FIXME: The licenses in the jhat sources need to be fixed with proper -# GPL Licenses. -Patch2: java-1.6.0-openjdk-jhat.patch +Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch +Patch2: java-1.6.0-openjdk-makefile.patch Patch3: java-1.6.0-openjdk-freetype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -151,7 +147,7 @@ BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel -%if %{?fedora}0 +%if 0%{?fedora} BuildRequires: lesstif-devel %else BuildRequires: openmotif-devel @@ -170,6 +166,7 @@ BuildRequires: mercurial BuildRequires: ant BuildRequires: libXinerama-devel +BuildRequires: rhino %if %{gcjbootstrap} BuildRequires: java-1.5.0-gcj-devel %else @@ -181,6 +178,7 @@ BuildRequires: xorg-x11-fonts-misc BuildRequires: freetype-devel >= 2.2.0 BuildRequires: fontconfig +BuildRequires: eclipse-ecj # Java Access Bridge for GNOME build requirements. BuildRequires: at-spi-devel BuildRequires: gawk @@ -191,18 +189,22 @@ BuildRequires: gecko-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel -# Zero-assembler build requirement -%ifnarch x86_64 %{ix86} +# Zero-assembler build requirement. +%ifnarch %{jit_arches} BuildRequires: libffi-devel %endif -BuildRequires: rhino Requires: libjpeg = 6b +%if 0%{?fedora} > 9 +# Require /etc/pki/java/cacerts. +Requires: ca-certificates +%else # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating # cacerts. Requires: openssl -# Require jpackage-utils for ant -Requires: jpackage-utils >= 1.7.3-1jpp.3 +%endif +# Require jpackage-utils for ant. +Requires: jpackage-utils >= 1.7.3-1jpp.2 # Require zoneinfo data provided by tzdata-java subpackage. Requires: tzdata-java # Post requires alternatives to install tool alternatives. @@ -216,7 +218,7 @@ # for jnlp files. Requires(postun): %{_bindir}/update-desktop-database -# java-1.6.0-openjdk replaces java-1.7.0-icedtea +# java-1.6.0-openjdk replaces java-1.7.0-icedtea. Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999 Obsoletes: java-1.7.0-icedtea < 0:1.7.0.0-0.999 @@ -254,7 +256,7 @@ # Postun requires alternatives to uninstall tool alternatives. Requires(postun): %{_sbindir}/alternatives -# java-1.6.0-openjdk-devel replaces java-1.7.0-icedtea-devel +# java-1.6.0-openjdk-devel replaces java-1.7.0-icedtea-devel. Provides: java-1.7.0-icedtea-devel = 0:1.7.0.0-0.999 Obsoletes: java-1.7.0-icedtea-devel < 0:1.7.0.0-0.999 @@ -276,7 +278,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} -# java-1.6.0-openjdk-demo replaces java-1.7.0-icedtea-demo +# java-1.6.0-openjdk-demo replaces java-1.7.0-icedtea-demo. Provides: java-1.7.0-icedtea-demo = 0:1.7.0.0-0.999 Obsoletes: java-1.7.0-icedtea-demo < 0:1.7.0.0-0.999 @@ -289,7 +291,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} -# java-1.6.0-openjdk-src replaces java-1.7.0-icedtea-src +# java-1.6.0-openjdk-src replaces java-1.7.0-icedtea-src. Provides: java-1.7.0-icedtea-src = 0:1.7.0.0-0.999 Obsoletes: java-1.7.0-icedtea-src < 0:1.7.0.0-0.999 @@ -305,7 +307,7 @@ # Postun requires alternatives to uninstall javadoc alternative. Requires(postun): %{_sbindir}/alternatives -# java-1.6.0-openjdk-javadoc replaces java-1.7.0-icedtea-javadoc +# java-1.6.0-openjdk-javadoc replaces java-1.7.0-icedtea-javadoc. Provides: java-1.7.0-icedtea-javadoc = 0:1.7.0.0-0.999 Obsoletes: java-1.7.0-icedtea-javadoc < 0:1.7.0.0-0.999 @@ -327,7 +329,7 @@ # Postun requires alternatives to uninstall plugin alternative. Requires(postun): %{_sbindir}/alternatives -# java-1.6.0-openjdk-plugin replaces java-1.7.0-icedtea-plugin +# java-1.6.0-openjdk-plugin replaces java-1.7.0-icedtea-plugin. Provides: java-1.7.0-icedtea-plugin = 0:1.7.0.0-0.999 Obsoletes: java-1.7.0-icedtea-plugin < 0:1.7.0.0-0.999 @@ -343,50 +345,74 @@ %setup -q -n icedtea6-%{icedteaver} -T -D -a 6 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2 %patch0 -%patch1 +%patch2 cp %{SOURCE4} . cp %{SOURCE5} . cp %{SOURCE7} . -cp %{SOURCE8} jconsole.desktop -cp %{SOURCE9} policytool.desktop %build +# Build IcedTea and OpenJDK. +%ifarch sparc64 +export ARCH_DATA_MODEL=64 +%endif ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} %if %{gcjbootstrap} make stamps/patch-ecj.stamp pushd openjdk-ecj - patch -l -p1 < %{PATCH2} patch -l -p2 < %{PATCH3} popd %endif make stamps/patch.stamp -patch -l -p0 < %{PATCH2} patch -l -p1 < %{PATCH3} + make + +export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image + +# Build Java Access Bridge for GNOME. pushd java-access-bridge-%{accessver} - export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image - export PATH=$JAVA_HOME/bin:$PATH + patch -l -p1 < %{PATCH1} + OLD_PATH=$PATH + export PATH=$JAVA_HOME/bin:$OLD_PATH ./configure make + export PATH=$OLD_PATH cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext popd -# Running Mauve to check for regressions -pushd mauve-%{mauvedate} - ./configure - make - echo ====================MAUVE TESTING======================== + +%if %{runtests} +# Run jtreg test suite. +{ + echo ====================JTREG TESTING======================== export DISPLAY=:20 - Xvfb :20 -screen 0 1x1x24 -ac& + Xvfb :20 -screen 0 1x1x24 -ac& echo $! > Xvfb.pid - ( $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \ - -file %{SOURCE7} \ - -timeout 30000 2>&1 | tee mauve_output ) || : + make jtregcheck -k | tee jtreg_output kill -9 `cat Xvfb.pid` unset DISPLAY rm -f Xvfb.pid - echo ====================MAUVE TESTING END==================== -popd + echo ====================JTREG TESTING END==================== +} || : + +# Run Mauve test suite. +{ + pushd mauve-%{mauvedate} + ./configure + make + echo ====================MAUVE TESTING======================== + export DISPLAY=:20 + Xvfb :20 -screen 0 1x1x24 -ac& + echo $! > Xvfb.pid + $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \ + -file %{SOURCE7} -timeout 30000 2>&1 | tee mauve_output + kill -9 `cat Xvfb.pid` + unset DISPLAY + rm -f Xvfb.pid + echo ====================MAUVE TESTING END==================== + popd +} || : +%endif %install rm -rf $RPM_BUILD_ROOT @@ -399,6 +425,16 @@ install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} +%if 0%{?fedora} > 9 + # Install cacerts symlink. + rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts + pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security + RELATIVE=$(%{abs2rel} %{_sysconfdir}/pki/java \ + %{_jvmdir}/%{jredir}/lib/security) + ln -sf $RELATIVE/cacerts . + popd +%endif + # Install extension symlinks. install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir} pushd $RPM_BUILD_ROOT%{jvmjardir} @@ -470,22 +506,22 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} -# Install icons and menu entries +# Install icons and menu entries. for s in 16 24 32 48 ; do install -D -p -m 644 \ openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png done -for e in jconsole policytool ; do - desktop-file-install --vendor=fedora --mode=644 \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop -done -# Install javaws desktop file. +# Install desktop files. install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps -desktop-file-install --vendor='' \ +desktop-file-install --vendor ''\ --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop +for e in jconsole policytool ; do + desktop-file-install --vendor=fedora --mode=644 \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop +done # Find JRE directories. find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \ @@ -526,7 +562,7 @@ %clean rm -rf $RPM_BUILD_ROOT -# FIXME: identical binaries are copied, not linked. This needs to be +# FIXME: identical binaries are copied, not linked. This needs to be # fixed upstream. %post ext=.gz @@ -635,6 +671,7 @@ --slave %{_bindir}/javap javap %{sdkbindir}/javap \ --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \ --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \ + --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \ --slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \ --slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \ --slave %{_bindir}/jps jps %{sdkbindir}/jps \ @@ -672,6 +709,8 @@ %{_mandir}/man1/jconsole-%{name}.1$ext \ --slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \ %{_mandir}/man1/jdb-%{name}.1$ext \ + --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \ + %{_mandir}/man1/jhat-%{name}.1$ext \ --slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \ %{_mandir}/man1/jinfo-%{name}.1$ext \ --slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \ @@ -777,8 +816,7 @@ %{_jvmprivdir}/* %{jvmjardir} %dir %{_jvmdir}/%{jredir}/lib/security -#FIXME: These should be replaced by symlinks into /etc. -%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts +%{_jvmdir}/%{jredir}/lib/security/cacerts %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar @@ -851,8 +889,12 @@ %defattr(-,root,root,-) %doc README.src %{_jvmdir}/%{sdkdir}/src.zip +%if %{runtests} +# FIXME: put these in a separate testresults subpackage. %doc mauve_tests %doc mauve-%{mauvedate}/mauve_output +%doc jtreg_output +%endif %files javadoc %defattr(-,root,root,-) @@ -865,32 +907,123 @@ %changelog * Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.14.b11.1 -- Specify vendor for javaws desktop entry +- Specify vendor for javaws desktop entry. +- Merge EPEL-5 and Fedora devel packages. -* Tue Jul 22 2008 Lillian Angel - 1:1.6.0-0.14.b11 -- Added rhino as a build requirement. +* Mon Jul 21 2008 Lillian Angel - 1:1.6.0.0-0.19.b11 +- Updated icedteasnapshot. -* Mon Jul 21 2008 Lillian Angel - 1:1.6.0-0.14.b11 -- Updated accessmajorver. +* Wed Jul 16 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Updated icedteasnapshot. +- Updated openjdkver. +- Updated openjdkdate. +- Updated generate-fedora-zip.sh + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Updated accessver to 1.23. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Added rhino as a BuildRequirement. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Removed all unneeded patches. Security patches are included in the +new icedtea source. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 +- Fixed fedorazip. + +* Tue Jul 15 2008 Lillian Angel - 1:1.6.0.0-0.18.b10 - Updated icedteaver. +- Updated icedteasnapshot. - Updated openjdkdate. -- Removed security patches. Now apart of new sources. +- Updated openjdkver. - Updated release. +- Resolves: rhbz#452525 +- Resolves: rhbz#369861 + +* Thu Jul 9 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 +- Added sparc/64 patches. -* Wed Jul 8 2008 Lillian Angel - 1:1.6.0-0.13.b08 -- Only apply hotspot security patch on jit_arches. +* Wed Jul 8 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 +- Only apply hotspot security patch of jitarches. -* Wed Jul 2 2008 Lillian Angel - 1:1.6.0-0.13.b08 +* Wed Jul 2 2008 Lillian Angel - 1:1.6.0.0-0.17.b09 - Added OpenJDK security patches. -* Mon Apr 28 2008 Lubomir Kundrak - 1:1.6.0.0-0.12.b08 +* Tue Jun 3 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.16.b09 +- Add runtests define. +- Provide Xvfb instance to jtreg. +- Run test suites on JIT architectures only. +- Clean up arch handling. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Remove jhat patch. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Remove makefile patch. +- Update generate-fedora-zip.sh. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Formatting cleanups. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Group all Mauve commands. + +* Fri May 30 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Formatting cleanups. +- Add jtreg_output to src subpackage. + +* Wed May 28 2008 Lillian Angel - 1:1.6.0.0-0.15.b09 +- Updated icedteasnapshot for new release. + +* Tue May 27 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.15.b09 +- Require ca-certificates. +- Symlink to ca-certificates cacerts. +- Remove cacerts from files list. +- Resolves: rhbz#444260 + +* Mon May 26 2008 Lillian Angel - 1:1.6.0.0-0.14.b09 +- Added eclipse-ecj build requirement for mauve. +- Updated icedteasnapshot. + +* Fri May 23 2008 Lillian Angel - 1:1.6.0.0-0.14.b09 +- Fixed jtreg testing. + +* Fri May 23 2008 Lillian Angel - 1:1.6.0.0-0.14.b09 +- Updated icedteasnapshot. +- Updated release. +- Added jtreg testing. + +* Thu May 22 2008 Lillian Angel - 1:1.6.0.0-0.13.b09 +- Added new patch java-1.6.0-openjdk-java-access-bridge-tck.patch. +- Updated release. + +* Mon May 05 2008 Lillian Angel - 1:1.6.0.0-0.12.b09 +- Updated release. +- Updated icedteasnapshot. +- Resolves: rhbz#445182 +- Resolves: rhbz#445183 + +* Tue Apr 29 2008 Lillian Angel - 1:1.6.0.0-0.11.b09 +- Fixed javaws.desktop installation. + +* Tue Apr 29 2008 Lillian Angel - 1:1.6.0.0-0.11.b09 +- Updated icedteasnapshot. +- Removed java-1.6.0-openjdk-jconsole.desktop and + java-1.6.0-openjdk-policytool.desktop files. + +* Tue Apr 29 2008 Lillian Angel - 1:1.6.0.0-0.11.b09 +- Updated release. +- Added archbuild and archinstall definitions for ia64. +- Resolves: rhbz#433843 + +* Mon Apr 28 2008 Lubomir Rintel - 1:1.6.0.0-0.12.b08 - Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL: -- Require Freetype 2.2.0 instead of 2.3.0 -- Build against openmotif instead of lesstif when not on Fedora +- Require Freetype 2.2.0 instead of 2.3.0. +- Build against openmotif instead of lesstif when not on Fedora. -* Mon Apr 28 2008 Lillian Angel - 1:1.6.0.0-0.11.b09 -- Fixed javaws.desktop and javaws.png installation. +* Mon Apr 28 2008 Lillian Angel - 1:1.6.0.0-0.10.b09 +- Fixed installation of javaws.desktop and javaws.png. * Mon Apr 28 2008 Joshua Sumali - 1:1.6.0.0-0.10.b09 - Added javaws menu entry. @@ -909,7 +1042,7 @@ * Thu Apr 18 2008 Lillian Angel - 1:1.6.0.0-0.9.b09 - Updated icedteaver. -- Updated icedteasnapshot. +- Updated icedteasnapshot. - Updated openjdkver. - Updated openjdkdate. - Updated release. @@ -927,7 +1060,7 @@ - Updated icedteaver. * Mon Apr 07 2008 Dennis Gilmore - 1:1.6.0.0-0.8.b08 -- enable building for all arches using zero where there is not a native port +- Enable building for all arches using zero where there is not a native port. * Mon Mar 31 2008 Lillian Angel - 1:1.6.0.0-0.7.b08 - Updated icedteasnapshot. Includes sources needed to build xmlgraphics-commons. @@ -954,7 +1087,7 @@ * Mon Mar 17 2008 Lillian Angel - 1:1.6.0.0-0.5.b06 - Updated icedteasnapshot. - Updated Release. -- Added new patch: java-1.6.0-openjdk-optflags.patch +- Added new patch: java-1.6.0-openjdk-optflags.patch. - Resolves: rhbz#437331 * Mon Mar 17 2008 Lillian Angel - 1:1.6.0.0-0.5.b06 @@ -963,7 +1096,7 @@ * Fri Mar 14 2008 Lillian Angel - 1:1.6.0.0-0.4.b06 - Fixed Provides and Obsoletes for all sub-packages. Should have specified -java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999. + java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999. - Resolves: rhbz#437492 * Wed Mar 12 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.4.b06 @@ -980,8 +1113,8 @@ - Changed icedteaopt to use --with-openjdk instead of --with-icedtea. * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 -- Added Provides and Obsoletes for all subpackages. All sub-packages -replaces java-1.7.0-icedtea. +- Added Provides and Obsoletes for all subpackages. All sub-packages + replaces java-1.7.0-icedtea. - Updated Release. - Changed BuildRequires from java-1.7.0-icedtea to java-1.6.0-openjdk. - Added TRADEMARK file to docs. @@ -1027,8 +1160,8 @@ - Fixed archbuild/archinstall if-block. * Thu Jan 03 2008 Lillian Angel - 1.7.0.0-0.23.b24.snapshot -- Removed BuildRequirement firefox-devel -- Added BuildRequirement gecko-devel +- Removed BuildRequirement firefox-devel. +- Added BuildRequirement gecko-devel. - Resolves rhbz#427350 * Fri Dec 28 2007 Lillian Angel - 1.7.0.0-0.23.b24.snapshot @@ -1094,9 +1227,9 @@ - Removed gcjbootstrap. - Removed icedteaopt. - Removed all gcj related checks. -- Resolves: rhbz#317041 -- Resolves: rhbz#314211 -- Resolves: rhbz#314141 +- Resolves: rhbz#317041 +- Resolves: rhbz#314211 +- Resolves: rhbz#314141 - Resolves: rhbz#301691 * Mon Oct 1 2007 Lillian Angel - 1.7.0.0-0.16.b19.snapshot @@ -1124,7 +1257,7 @@ is thrown * Mon Sep 24 2007 Lillian Angel - 1.7.0.0-0.15.b19.snapshot -- Added JTreg zip as source +- Added JTreg zip as source. - Run JTreg tests after build for smoke testing. - Added Xvfb as build requirement. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Jul 2008 21:06:56 -0000 1.14 +++ sources 23 Jul 2008 23:02:42 -0000 1.15 @@ -1,5 +1,5 @@ 079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests -0997dea46b42ed9bbebff8cbe5f70aa0 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz 1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz +0997dea46b42ed9bbebff8cbe5f70aa0 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz adb53a87bc9546c1093b73c9a5035de5 icedtea6-1.3-30aed052fabd0303b4001763652b94c054fa59e7.tar.gz --- java-1.6.0-openjdk-jconsole.desktop DELETED --- --- java-1.6.0-openjdk-jhat.patch DELETED --- --- java-1.6.0-openjdk-policytool.desktop DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 23:14:44 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 23:14:44 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-java-access-bridge-tck.patch, NONE, 1.1 Message-ID: <200807232314.m6NNEisO030370@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30355 Added Files: java-1.6.0-openjdk-java-access-bridge-tck.patch Log Message: forgotten file java-1.6.0-openjdk-java-access-bridge-tck.patch: --- NEW FILE java-1.6.0-openjdk-java-access-bridge-tck.patch --- --- java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-05-22 11:27:00.000000000 -0400 +++ java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2008-05-22 11:28:02.000000000 -0400 @@ -34,6 +34,9 @@ import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleText; import javax.accessibility.AccessibleEditableText; +import java.security.PrivilegedAction; +import java.security.AccessController; + public class JavaBridge { @@ -332,7 +335,11 @@ System.err.println ("Java Accessibility Bridge for GNOME loaded.\n"); // Not sure what kind of arguments should be sent to ORB - String vm_rev = System.getProperty("java.version"); + String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() { + public java.lang.Object run() { + return System.getProperty("java.version"); + } + }); if (vm_rev.compareTo("1.4.0") < 0) { System.err.println("WARNING: Java Accessibility Bridge " + From fedora-extras-commits at redhat.com Wed Jul 23 23:28:18 2008 From: fedora-extras-commits at redhat.com (Dave Nomura (dcnomura)) Date: Wed, 23 Jul 2008 23:28:18 GMT Subject: rpms/stapitrace/devel stapitrace.spec,1.2,1.3 Message-ID: <200807232328.m6NNSIxQ030901@cvs-int.fedora.redhat.com> Author: dcnomura Update of /cvs/pkgs/rpms/stapitrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30804 Modified Files: stapitrace.spec Log Message: add build dependence on glibc-headers Index: stapitrace.spec =================================================================== RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stapitrace.spec 22 Jul 2008 16:10:05 -0000 1.2 +++ stapitrace.spec 23 Jul 2008 23:27:36 -0000 1.3 @@ -6,7 +6,7 @@ Name: stapitrace Summary: Instruction Tracing Tool Version: 1.0.0 -Release: 0.%{alphatag}%{?dist}.1 +Release: 1.%{alphatag}%{?dist} License: GPLv2+ Group: Development/Tools URL: http://sourceforge.net/projects/perfinsp @@ -14,7 +14,7 @@ Patch0: itrace_fix1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: systemtap systemtap-runtime -BuildRequires: binutils binutils-devel autoconf automake +BuildRequires: binutils binutils-devel autoconf automake glibc-headers ExclusiveArch: ppc ppc64 %description From fedora-extras-commits at redhat.com Wed Jul 23 23:34:25 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 23 Jul 2008 23:34:25 GMT Subject: rpms/beagle/F-9 beagle-thunderbird-update.sh, NONE, 1.1 beagle.spec, 1.139, 1.140 Message-ID: <200807232334.m6NNYPgM031442@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31331 Modified Files: beagle.spec Added Files: beagle-thunderbird-update.sh Log Message: remove hardcoded thunderbird dep --- NEW FILE beagle-thunderbird-update.sh --- #!/bin/sh # # This script is used to add and remove our extension from the thunderbird # directory, and is run from 'triggers' when thunderbird is installed or # upgraded, as well as when our package is installed. It is needed because # thunderbird is installed into versioned directories in /usr/lib[64]/thunderbird # Based on firefox-update.sh from mugshot if [ "$1" = "install" ] ; then for libdir in /usr/lib /usr/lib64 ; do # Add symlinks to any thunderbird directory that looks like it is part of a # currently installed package for d in $libdir/thunderbird*; do if [ "$d" = "$libdir/thunderbird*" ] ; then continue fi link=$d/extensions/\{b656ef18-fd76-45e6-95cc-8043f26361e7\} target=$libdir/beagle/thunderbird if [ -e $target -a -e $d/thunderbird-bin -a -d $d/extensions -a ! -L $link ] ; then ln -s $target $link fi done done elif [ "$1" = "remove" ] ; then for libdir in /usr/lib /usr/lib64 ; do # Remove any symlinks we've created into any thunderbird directory for d in $libdir/thunderbird*; do if [ "$d" = "$libdir/thunderbird*" ] ; then continue fi link=$d/extensions/\{b656ef18-fd76-45e6-95cc-8043f26361e7\} if [ -L $link ] ; then rm $link fi done done else echo "Usage thunderbird-update.sh [install/remove]" fi Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- beagle.spec 22 Jul 2008 16:42:23 -0000 1.139 +++ beagle.spec 23 Jul 2008 23:33:39 -0000 1.140 @@ -1,13 +1,13 @@ Name: beagle Version: 0.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details License: ASL 2.0 and MIT and BSD and CC-BY and LGPLv2+ and (AFL or LGPLv2+) URL: http://beagle-project.org/ Source0: http://download.gnome.org/sources/beagle/0.3/%{name}-%{version}.tar.bz2 - +Source1: beagle-thunderbird-update.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel @@ -101,7 +101,7 @@ Summary: Beagle backend for Thunderbird Group: User Interface/Desktops Requires: beagle = %{version}-%{release} -Requires: thunderbird = %{thunderbird_version} +Requires: thunderbird %description thunderbird Beagle backend for Thunderbird @@ -169,9 +169,9 @@ -d $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} # thunderbird extension -mkdir -p $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} -unzip thunderbird-extension/beagle.xpi \ --d $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/beagle/thunderbird +unzip thunderbird-extension/beagle.xpi -d $RPM_BUILD_ROOT%{_libdir}/beagle/thunderbird +install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/beagle/beagle-thunderbird-update.sh desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -233,6 +233,35 @@ %{_bindir}/monodoc --make-index > /dev/null fi +############################# +# thunderbird extension hacks +# copied from mugshot to deal with versioned +# thunderbird dirs +%post thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh install + +%preun thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh remove + +%postun thunderbird +if [ "$1" != 0 ] ; then + test -x %{_datadir}/beagle/beagle-thunderbird-update.sh && %{_datadir}/beagle/beagle-thunderbird-update.sh install +fi + +%triggerin thunderbird -- thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh install + +%triggerun thunderbird -- thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh remove + +%triggerpostun thunderbird -- thunderbird +if [ "$1" != 0 ] ; then + test -x %{_datadir}/beagle/beagle-thunderbird-update.sh && %{_datadir}/beagle/beagle-thunderbird-update.sh install +fi + +# thunderbird extension hacks +################################# + %clean rm -rf $RPM_BUILD_ROOT @@ -246,7 +275,8 @@ %{_libdir}/beagle/ %exclude %{_libdir}/beagle/Backends/Thunder* %exclude %{_libdir}/beagle/Backends/Evolution* -%{_datadir}/beagle +%exclude %{_datadir}/beagle/beagle-thunderbird-update.sh +%exclude %{_datadir}/beagle %{_mandir}/*/* %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes @@ -258,6 +288,7 @@ %files thunderbird %defattr(-, root, root,-) +%{_datadir}/beagle/beagle-thunderbird-update.sh %{_libdir}/beagle/Backends/ThunderbirdBackends.dll* %{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/ @@ -288,6 +319,10 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Thu Jul 24 2008 Adel Gadllah - 0.3.8-2 +- Remove versioned thubderbird deps by using the same hack as + mugshot + * Tue Jul 22 2008 Adel Gadllah - 0.3.8-1 - Update to 0.3.8 - Check if the user exists before creating RH #441175 From fedora-extras-commits at redhat.com Wed Jul 23 23:38:34 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 23:38:34 GMT Subject: rpms/tzdata-java/EL-5 dead.package,NONE,1.1 Message-ID: <200807232338.m6NNcYOd031732@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/tzdata-java/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31707/EL-5 Added Files: dead.package Log Message: bury this, it is useless now --- NEW FILE dead.package --- tzdata since RHEL 5.2 has a subpackage that provides this From fedora-extras-commits at redhat.com Wed Jul 23 23:38:51 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 23:38:51 GMT Subject: rpms/tzdata-java/F-9 dead.package, NONE, 1.1 Makefile, 1.1, NONE sources, 1.1, NONE Message-ID: <200807232338.m6NNcp0h031780@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/tzdata-java/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31707/F-9 Added Files: dead.package Removed Files: Makefile sources Log Message: bury this, it is useless now --- NEW FILE dead.package --- tzdata has a subpackage that provides this --- Makefile DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 23:38:53 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 23 Jul 2008 23:38:53 GMT Subject: rpms/beagle/F-9 beagle.spec,1.140,1.141 Message-ID: <200807232338.m6NNcrUX031795@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31690 Modified Files: beagle.spec Log Message: fix clog typo Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- beagle.spec 23 Jul 2008 23:33:39 -0000 1.140 +++ beagle.spec 23 Jul 2008 23:38:08 -0000 1.141 @@ -320,7 +320,7 @@ %changelog * Thu Jul 24 2008 Adel Gadllah - 0.3.8-2 -- Remove versioned thubderbird deps by using the same hack as +- Remove versioned thunderbird deps by using the same hack as mugshot * Tue Jul 22 2008 Adel Gadllah - 0.3.8-1 From fedora-extras-commits at redhat.com Wed Jul 23 23:39:05 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Wed, 23 Jul 2008 23:39:05 GMT Subject: rpms/tzdata-java/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE sources, 1.1, NONE Message-ID: <200807232339.m6NNd5BC031803@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/tzdata-java/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31707/devel Added Files: dead.package Removed Files: Makefile sources Log Message: bury this, it is useless now --- NEW FILE dead.package --- tzdata has a subpackage that provides this --- Makefile DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Jul 23 23:43:32 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Wed, 23 Jul 2008 23:43:32 GMT Subject: rpms/beagle/F-9 beagle.spec,1.141,1.142 Message-ID: <200807232343.m6NNhWH7032036@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32002 Modified Files: beagle.spec Log Message: fix file lists Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- beagle.spec 23 Jul 2008 23:38:08 -0000 1.141 +++ beagle.spec 23 Jul 2008 23:42:39 -0000 1.142 @@ -277,6 +277,7 @@ %exclude %{_libdir}/beagle/Backends/Evolution* %exclude %{_datadir}/beagle/beagle-thunderbird-update.sh %exclude %{_datadir}/beagle +%exclude %{_libdir}/beagle/thunderbird/ %{_mandir}/*/* %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes @@ -290,7 +291,7 @@ %defattr(-, root, root,-) %{_datadir}/beagle/beagle-thunderbird-update.sh %{_libdir}/beagle/Backends/ThunderbirdBackends.dll* -%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/ +%{_libdir}/beagle/thunderbird/ %files epiphany %defattr(-, root, root,-) From fedora-extras-commits at redhat.com Wed Jul 23 23:45:13 2008 From: fedora-extras-commits at redhat.com (Karel Zak (kzak)) Date: Wed, 23 Jul 2008 23:45:13 GMT Subject: rpms/util-linux-ng/devel util-linux-ng-2.14-mount-file_t.patch, 1.1, 1.2 util-linux-ng.spec, 1.27, 1.28 Message-ID: <200807232345.m6NNjDsP032128@cvs-int.fedora.redhat.com> Author: kzak Update of /cvs/pkgs/rpms/util-linux-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32095 Modified Files: util-linux-ng-2.14-mount-file_t.patch util-linux-ng.spec Log Message: * Thu Jul 24 2008 Karel Zak 2.14-3 - update util-linux-ng-2.14-mount-file_t.patch to make the SELinux warning optional (verbose mode is required) util-linux-ng-2.14-mount-file_t.patch: Index: util-linux-ng-2.14-mount-file_t.patch =================================================================== RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.14-mount-file_t.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- util-linux-ng-2.14-mount-file_t.patch 1 Jul 2008 12:53:26 -0000 1.1 +++ util-linux-ng-2.14-mount-file_t.patch 23 Jul 2008 23:44:27 -0000 1.2 @@ -1,24 +1,7 @@ -From 4edebc1486133231e38b3881325c374eda567f74 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 23 Jun 2008 13:00:00 +0200 -Subject: [PATCH] mount: warn on "file_t" selinux context - -Currently if I mount a file system without labels, it works fine, but -later or SELinux will start printing denials and stopping certain -applications from working. It would be nice if the mount command -checked it in selinux mode. - -Addresses-Red-Hat-Bugzilla: #390691 -Signed-off-by: Karel Zak ---- - mount/mount.c | 29 ++++++++++++++++++++++++++--- - 1 files changed, 26 insertions(+), 3 deletions(-) - -diff --git a/mount/mount.c b/mount/mount.c -index bed792d..30688ac 100644 ---- a/mount/mount.c -+++ b/mount/mount.c -@@ -327,7 +327,7 @@ append_context(const char *optname, char *optdata, char **extra_opts) +diff -up util-linux-ng-2.14/mount/mount.c.kzak util-linux-ng-2.14/mount/mount.c +--- util-linux-ng-2.14/mount/mount.c.kzak 2008-07-24 01:26:39.000000000 +0200 ++++ util-linux-ng-2.14/mount/mount.c 2008-07-24 01:27:56.000000000 +0200 +@@ -332,7 +332,7 @@ append_context(const char *optname, char security_context_t raw = NULL; char *data = NULL; @@ -27,7 +10,7 @@ /* ignore the option if we running without selinux */ return 0; -@@ -338,8 +338,8 @@ append_context(const char *optname, char *optdata, char **extra_opts) +@@ -343,8 +343,8 @@ append_context(const char *optname, char data = *optdata =='"' ? strip_quotes(optdata) : optdata; if (selinux_trans_to_raw_context( @@ -38,13 +21,13 @@ return -1; if (verbose) -@@ -1370,6 +1370,29 @@ try_mount_one (const char *spec0, const char *node0, const char *types0, +@@ -1397,6 +1397,27 @@ try_mount_one (const char *spec0, const res = EX_FAIL; out: + +#ifdef HAVE_LIBSELINUX -+ if (res != EX_FAIL && is_selinux_enabled() > 0) { ++ if (res != EX_FAIL && verbose && is_selinux_enabled() > 0) { + security_context_t raw = NULL, def = NULL; + + if (getfilecon(node, &raw) > 0 && @@ -55,10 +38,8 @@ + " You just mounted an file system that supports labels which does not\n" + " contain labels, onto an SELinux box. It is likely that confined\n" + " applications will generate AVC messages and not be allowed access to\n" -+ " this file system. You can add labels to this file system by executing\n" -+ " restorecon(8). If you do not want to add labels to this file system,\n" -+ " you should mount the file system using one of the \"context\" mount\n" -+ " option."), node); ++ " this file system. For more details see restorecon(8) and mount(8).\n"), ++ node); + } + freecon(raw); + freecon(def); @@ -68,6 +49,3 @@ my_free(extra_opts1); my_free(spec1); my_free(node1); --- -1.5.4.1 - Index: util-linux-ng.spec =================================================================== RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- util-linux-ng.spec 1 Jul 2008 12:53:26 -0000 1.27 +++ util-linux-ng.spec 23 Jul 2008 23:44:27 -0000 1.28 @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux-ng Version: 2.14 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng @@ -122,7 +122,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 +%patch11 -p1 -b .kzak %build unset LINGUAS || : @@ -515,6 +515,10 @@ /sbin/losetup %changelog +* Thu Jul 24 2008 Karel Zak 2.14-3 +- update util-linux-ng-2.14-mount-file_t.patch to make + the SELinux warning optional (verbose mode is required) + * Tue Jul 1 2008 Karel Zak 2.14-2 - fix #390691 - mount should check selinux context on mount, and warn on file_t From fedora-extras-commits at redhat.com Wed Jul 23 23:48:03 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 23 Jul 2008 23:48:03 GMT Subject: rpms/eclipse/devel eclipse.spec,1.559,1.560 Message-ID: <200807232348.m6NNm3ix032236@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32203 Modified Files: eclipse.spec Log Message: * Wed Jul 23 2008 Andrew Overholt 3.4.0-7 - More work on non-upstream arches Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.559 retrieving revision 1.560 diff -u -r1.559 -r1.560 --- eclipse.spec 22 Jul 2008 18:37:45 -0000 1.559 +++ eclipse.spec 23 Jul 2008 23:47:14 -0000 1.560 @@ -24,7 +24,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 6%{?dist} +Release: 7%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -391,20 +391,20 @@ find -name \*.so | xargs rm find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm -# FIXME +# FIXME: do this as part of Linux distros project # -# the swt version is set to HEAD on ia64 but shouldn't be +# the swt version is set to HEAD on s390x but shouldn't be # get swt version SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") -swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") -sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \ - plugins/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF \ - plugins/org.eclipse.swt.gtk.linux.ia64.source/META-INF/MANIFEST.MF \ - plugins/org.eclipse.swt.gtk.linux.ia64.source/build.xml \ - assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ +swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") +sed --in-place "s/$swt_frag_ver_s390x/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \ + plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF \ + plugins/org.eclipse.swt.gtk.linux.s390x.source/META-INF/MANIFEST.MF \ + plugins/org.eclipse.swt.gtk.linux.s390x.source/build.xml \ + assemble.org.eclipse.sdk.linux.gtk.s390x.xml \ features/org.eclipse.rcp/build.xml # Nasty hack to get suppport for ppc64, sparc{,64} and alpha @@ -416,21 +416,24 @@ # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \ features/org.eclipse.equinox.executable/target.build.xml -# Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace -# the ia64 strings with ppc64, etc. + +# Move all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace +# the s390x strings with ppc64, etc. %ifarch ppc64 sparc sparcv9 sparc64 alpha - for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32 | grep -v win32); do - tofile=$(echo $f | sed "s/ia64/%{_arch}/") + for f in $(find -name \*s390x\*); do + tofile=$(echo $f | sed "s/s390x/%{_arch}/") + for g in $(find $f); do + sed -in "s/s390x/%{_arch}/g" $g + done mv $f $tofile -# sed --in-place "s/ia64/%{_arch}/g" $tofile done OLDIFS=$IFS IFS=' ' for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \ -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \ - \*.exe -a ! -name \*.pm -a ! -name \*.jpg); do - sed -i -e "s/ia64_32/@eye-eh-64_32@/g" -e "s/ia64/%{_arch}/g" -e "s/@eye-eh-64_32@/ia64_32/g" $f + \*.exe -a ! -name \*.pm -a ! -name \*.jpg -a ! -name \*win32\* | grep -v win32); do + sed -i -e "s/s390x/%{_arch}/g" $f done IFS=$OLDIFS %endif @@ -454,6 +457,36 @@ IFS=$OLDIFS %endif +# FIXME: this isn't quite finished yet +## libsconfig on the platform on which we're building +#sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml +# +## Don't build for non-linux,gtk,%%{_arch} targets +#pushd features +#for f in */build.xml; do +# for platform in win32 macosx hpux solaris aix qnx motif; do +# sed -i "// d" $f +# sed -i "s/org.eclipse.*.$platform:.*,org/,org/g" $f +# done +#done +#popd +# +#arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \ +# features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \ +# '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ") +# +#arches=$(echo $arches | sed s/%{_arch}//) +# +## Don't build for arches other than the one on which we're building +#pushd features +#for f in */build.xml; do +# for arch in $arches; do +# sed -i "// d" $f +# sed -i "s/org.eclipse.*.linux.$arch:.*,org/,org/g" $f +# done +#done +#popd + # Symlinks rm plugins/org.sat4j* ln -s %{_javadir}/org.sat4j.core_* plugins/ @@ -1348,6 +1381,9 @@ %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* %changelog +* Wed Jul 23 2008 Andrew Overholt 3.4.0-7 +- More work on non-upstream arches + * Mon Jul 21 2008 Andrew Overholt 3.4.0-6 - Update description to be a bit more current - Attempt ppc64, etc. builds From fedora-extras-commits at redhat.com Wed Jul 23 23:55:11 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 23 Jul 2008 23:55:11 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader/devel import.log, NONE, 1.1 perl-DBIx-Class-Schema-Loader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807232355.m6NNtBBY032573@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32542/devel Modified Files: .cvsignore sources Added Files: import.log perl-DBIx-Class-Schema-Loader.spec Log Message: initial commit --- NEW FILE import.log --- perl-DBIx-Class-Schema-Loader-0_04005-1_fc9:HEAD:perl-DBIx-Class-Schema-Loader-0.04005-1.fc9.src.rpm:1216857250 --- NEW FILE perl-DBIx-Class-Schema-Loader.spec --- Name: perl-DBIx-Class-Schema-Loader Version: 0.04005 Release: 1%{?dist} Summary: Dynamic definition of a DBIx::Class::Schema License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DBIx-Class-Schema-Loader/ Source0: http://www.cpan.org/modules/by-module/DBIx/DBIx-Class-Schema-Loader-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # core BuildRequires: perl(Digest::MD5) >= 2.36 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Path) BuildRequires: perl(File::Spec) BuildRequires: perl(Scalar::Util) BuildRequires: perl(Test::More) BuildRequires: perl(Text::Balanced) # cpan BuildRequires: perl(Carp::Clan) BuildRequires: perl(Class::Accessor::Fast) >= 0.30 BuildRequires: perl(Class::C3) >= 0.18 BuildRequires: perl(Class::Data::Accessor) >= 0.03 BuildRequires: perl(Class::Inspector) BuildRequires: perl(Data::Dump) >= 1.06 BuildRequires: perl(DBD::SQLite) >= 1.12 BuildRequires: perl(DBI) >= 1.56 BuildRequires: perl(DBIx::Class) >= 0.07006 BuildRequires: perl(Lingua::EN::Inflect::Number) >= 1.1 BuildRequires: perl(UNIVERSAL::require) >= 0.11 # optional tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # not automatically picked up Requires: perl(Class::Accessor::Fast) >= 0.30 Requires: perl(Class::Data::Accessor) >= 0.03 %description DBIx::Class::Schema::Loader automates the definition of a DBIx::Class::Schema by scanning database table definitions and setting up the columns, primary keys, and relationships. %prep %setup -q -n DBIx-Class-Schema-Loader-%{version} # make sure doc/tests don't generate provides # note we first filter out the bits in _docdir... cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` EOF %define __perl_provides %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-prov chmod +x %{__perl_provides} cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` EOF %define __perl_requires %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-req chmod +x %{__perl_requires} %build echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Jun 02 2008 Chris Weyl 0.04005-1 - update to 0.4005 - filter _docdir requires/provides * Mon Mar 17 2008 Chris Weyl 0.04004-1 - brush-up for review submission * Wed Oct 17 2007 Chris Weyl 0.04003-1 - Specfile autogenerated by cpanspec 1.71. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 16:02:12 -0000 1.1 +++ .cvsignore 23 Jul 2008 23:54:28 -0000 1.2 @@ -0,0 +1 @@ +DBIx-Class-Schema-Loader-0.04005.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 16:02:12 -0000 1.1 +++ sources 23 Jul 2008 23:54:28 -0000 1.2 @@ -0,0 +1 @@ +d9e112493df06800862b93bf46760c4f DBIx-Class-Schema-Loader-0.04005.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 23:56:24 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 23 Jul 2008 23:56:24 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader/devel perl-DBIx-Class-Schema-Loader.spec, 1.1, 1.2 Message-ID: <200807232356.m6NNuOZV032683@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32640 Modified Files: perl-DBIx-Class-Schema-Loader.spec Log Message: release bump Index: perl-DBIx-Class-Schema-Loader.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/devel/perl-DBIx-Class-Schema-Loader.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DBIx-Class-Schema-Loader.spec 23 Jul 2008 23:54:28 -0000 1.1 +++ perl-DBIx-Class-Schema-Loader.spec 23 Jul 2008 23:55:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-DBIx-Class-Schema-Loader Version: 0.04005 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dynamic definition of a DBIx::Class::Schema License: GPL+ or Artistic Group: Development/Libraries @@ -92,6 +92,9 @@ %{_mandir}/man3/* %changelog +* Wed Jul 23 2008 Chris Weyl 0.04005-2 +- bump + * Mon Jun 02 2008 Chris Weyl 0.04005-1 - update to 0.4005 - filter _docdir requires/provides From fedora-extras-commits at redhat.com Wed Jul 23 23:57:17 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 23 Jul 2008 23:57:17 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader/F-9 import.log, NONE, 1.1 perl-DBIx-Class-Schema-Loader.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807232357.m6NNvHZR000316@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32725 Modified Files: sources Added Files: import.log perl-DBIx-Class-Schema-Loader.spec Log Message: pseudo-branch of perl-DBIx-Class-Schema-Loader to F-9 --- NEW FILE import.log --- perl-DBIx-Class-Schema-Loader-0_04005-1_fc9:HEAD:perl-DBIx-Class-Schema-Loader-0.04005-1.fc9.src.rpm:1216857250 --- NEW FILE perl-DBIx-Class-Schema-Loader.spec --- Name: perl-DBIx-Class-Schema-Loader Version: 0.04005 Release: 2%{?dist} Summary: Dynamic definition of a DBIx::Class::Schema License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DBIx-Class-Schema-Loader/ Source0: http://www.cpan.org/modules/by-module/DBIx/DBIx-Class-Schema-Loader-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # core BuildRequires: perl(Digest::MD5) >= 2.36 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Path) BuildRequires: perl(File::Spec) BuildRequires: perl(Scalar::Util) BuildRequires: perl(Test::More) BuildRequires: perl(Text::Balanced) # cpan BuildRequires: perl(Carp::Clan) BuildRequires: perl(Class::Accessor::Fast) >= 0.30 BuildRequires: perl(Class::C3) >= 0.18 BuildRequires: perl(Class::Data::Accessor) >= 0.03 BuildRequires: perl(Class::Inspector) BuildRequires: perl(Data::Dump) >= 1.06 BuildRequires: perl(DBD::SQLite) >= 1.12 BuildRequires: perl(DBI) >= 1.56 BuildRequires: perl(DBIx::Class) >= 0.07006 BuildRequires: perl(Lingua::EN::Inflect::Number) >= 1.1 BuildRequires: perl(UNIVERSAL::require) >= 0.11 # optional tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # not automatically picked up Requires: perl(Class::Accessor::Fast) >= 0.30 Requires: perl(Class::Data::Accessor) >= 0.03 %description DBIx::Class::Schema::Loader automates the definition of a DBIx::Class::Schema by scanning database table definitions and setting up the columns, primary keys, and relationships. %prep %setup -q -n DBIx-Class-Schema-Loader-%{version} # make sure doc/tests don't generate provides # note we first filter out the bits in _docdir... cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` EOF %define __perl_provides %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-prov chmod +x %{__perl_provides} cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` EOF %define __perl_requires %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-req chmod +x %{__perl_requires} %build echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 23 2008 Chris Weyl 0.04005-2 - bump * Mon Jun 02 2008 Chris Weyl 0.04005-1 - update to 0.4005 - filter _docdir requires/provides * Mon Mar 17 2008 Chris Weyl 0.04004-1 - brush-up for review submission * Wed Oct 17 2007 Chris Weyl 0.04003-1 - Specfile autogenerated by cpanspec 1.71. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 16:02:12 -0000 1.1 +++ sources 23 Jul 2008 23:56:33 -0000 1.2 @@ -0,0 +1 @@ +d9e112493df06800862b93bf46760c4f DBIx-Class-Schema-Loader-0.04005.tar.gz From fedora-extras-commits at redhat.com Wed Jul 23 23:58:39 2008 From: fedora-extras-commits at redhat.com (Dave Nomura (dcnomura)) Date: Wed, 23 Jul 2008 23:58:39 GMT Subject: rpms/stapitrace/devel stapitrace.spec,1.3,1.4 Message-ID: <200807232358.m6NNwdXT000451@cvs-int.fedora.redhat.com> Author: dcnomura Update of /cvs/pkgs/rpms/stapitrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv398 Modified Files: stapitrace.spec Log Message: add dependency on glibc-devel Index: stapitrace.spec =================================================================== RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stapitrace.spec 23 Jul 2008 23:27:36 -0000 1.3 +++ stapitrace.spec 23 Jul 2008 23:57:58 -0000 1.4 @@ -6,7 +6,7 @@ Name: stapitrace Summary: Instruction Tracing Tool Version: 1.0.0 -Release: 1.%{alphatag}%{?dist} +Release: 2.%{alphatag}%{?dist} License: GPLv2+ Group: Development/Tools URL: http://sourceforge.net/projects/perfinsp @@ -14,7 +14,7 @@ Patch0: itrace_fix1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: systemtap systemtap-runtime -BuildRequires: binutils binutils-devel autoconf automake glibc-headers +BuildRequires: binutils binutils-devel autoconf automake glibc-headers glibc-devel ExclusiveArch: ppc ppc64 %description From fedora-extras-commits at redhat.com Thu Jul 24 00:05:49 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Thu, 24 Jul 2008 00:05:49 GMT Subject: rpms/perl-DBIx-Class-Schema-Loader/F-8 import.log, NONE, 1.1 perl-DBIx-Class-Schema-Loader.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807240005.m6O05nm5007417@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7398 Modified Files: sources Added Files: import.log perl-DBIx-Class-Schema-Loader.spec Log Message: pseudo-branch of perl-DBIx-Class-Schema-Loader to F-8 --- NEW FILE import.log --- perl-DBIx-Class-Schema-Loader-0_04005-1_fc9:HEAD:perl-DBIx-Class-Schema-Loader-0.04005-1.fc9.src.rpm:1216857250 --- NEW FILE perl-DBIx-Class-Schema-Loader.spec --- Name: perl-DBIx-Class-Schema-Loader Version: 0.04005 Release: 2%{?dist} Summary: Dynamic definition of a DBIx::Class::Schema License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DBIx-Class-Schema-Loader/ Source0: http://www.cpan.org/modules/by-module/DBIx/DBIx-Class-Schema-Loader-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # core BuildRequires: perl(Digest::MD5) >= 2.36 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Path) BuildRequires: perl(File::Spec) BuildRequires: perl(Scalar::Util) BuildRequires: perl(Test::More) BuildRequires: perl(Text::Balanced) # cpan BuildRequires: perl(Carp::Clan) BuildRequires: perl(Class::Accessor::Fast) >= 0.30 BuildRequires: perl(Class::C3) >= 0.18 BuildRequires: perl(Class::Data::Accessor) >= 0.03 BuildRequires: perl(Class::Inspector) BuildRequires: perl(Data::Dump) >= 1.06 BuildRequires: perl(DBD::SQLite) >= 1.12 BuildRequires: perl(DBI) >= 1.56 BuildRequires: perl(DBIx::Class) >= 0.07006 BuildRequires: perl(Lingua::EN::Inflect::Number) >= 1.1 BuildRequires: perl(UNIVERSAL::require) >= 0.11 # optional tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # not automatically picked up Requires: perl(Class::Accessor::Fast) >= 0.30 Requires: perl(Class::Data::Accessor) >= 0.03 %description DBIx::Class::Schema::Loader automates the definition of a DBIx::Class::Schema by scanning database table definitions and setting up the columns, primary keys, and relationships. %prep %setup -q -n DBIx-Class-Schema-Loader-%{version} # make sure doc/tests don't generate provides # note we first filter out the bits in _docdir... cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` EOF %define __perl_provides %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-prov chmod +x %{__perl_provides} cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` EOF %define __perl_requires %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-req chmod +x %{__perl_requires} %build echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Jul 23 2008 Chris Weyl 0.04005-2 - bump * Mon Jun 02 2008 Chris Weyl 0.04005-1 - update to 0.4005 - filter _docdir requires/provides * Mon Mar 17 2008 Chris Weyl 0.04004-1 - brush-up for review submission * Wed Oct 17 2007 Chris Weyl 0.04003-1 - Specfile autogenerated by cpanspec 1.71. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-Class-Schema-Loader/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 16:02:12 -0000 1.1 +++ sources 24 Jul 2008 00:05:06 -0000 1.2 @@ -0,0 +1 @@ +d9e112493df06800862b93bf46760c4f DBIx-Class-Schema-Loader-0.04005.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 00:11:36 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Thu, 24 Jul 2008 00:11:36 GMT Subject: rpms/perl-Convert-BER/EL-5 import.log, NONE, 1.1 perl-Convert-BER.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240011.m6O0BaJS007837@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Convert-BER/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7805/EL-5 Modified Files: .cvsignore sources Added Files: import.log perl-Convert-BER.spec Log Message: Initial import --- NEW FILE import.log --- perl-Convert-BER-1_3101-2_el5:EL-5:perl-Convert-BER-1.3101-2.el5.src.rpm:1216858224 --- NEW FILE perl-Convert-BER.spec --- Name: perl-Convert-BER Version: 1.3101 Release: 2%{?dist} Summary: ASN.1 Basic Encoding Rules License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-BER/ Source0: http://archive.cpan.cz//authors/id/G/GB/GBARR/Convert-BER-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Convert::BER provides an OO interface to encoding and decoding data using the ASN.1 Basic Encoding Rules (BER), a platform independent way of encoding structured binary data together with the structure. %prep %setup -q -n Convert-BER-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun Jul 13 2008 Lubomir Rintel (Good Data) 1.3101-2 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:45:35 -0000 1.1 +++ .cvsignore 24 Jul 2008 00:10:48 -0000 1.2 @@ -0,0 +1 @@ +Convert-BER-1.3101.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:45:35 -0000 1.1 +++ sources 24 Jul 2008 00:10:48 -0000 1.2 @@ -0,0 +1 @@ +00fd5e5a98d4194da0e980186cba6292 Convert-BER-1.3101.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 00:12:48 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Thu, 24 Jul 2008 00:12:48 GMT Subject: rpms/perl-Convert-BER/F-8 import.log, NONE, 1.1 perl-Convert-BER.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240012.m6O0CmQw007979@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Convert-BER/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7890/F-8 Modified Files: .cvsignore sources Added Files: import.log perl-Convert-BER.spec Log Message: Initial import --- NEW FILE import.log --- perl-Convert-BER-1_3101-2_el5:F-8:perl-Convert-BER-1.3101-2.el5.src.rpm:1216858220 --- NEW FILE perl-Convert-BER.spec --- Name: perl-Convert-BER Version: 1.3101 Release: 2%{?dist} Summary: ASN.1 Basic Encoding Rules License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-BER/ Source0: http://archive.cpan.cz//authors/id/G/GB/GBARR/Convert-BER-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Convert::BER provides an OO interface to encoding and decoding data using the ASN.1 Basic Encoding Rules (BER), a platform independent way of encoding structured binary data together with the structure. %prep %setup -q -n Convert-BER-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun Jul 13 2008 Lubomir Rintel (Good Data) 1.3101-2 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:45:35 -0000 1.1 +++ .cvsignore 24 Jul 2008 00:12:02 -0000 1.2 @@ -0,0 +1 @@ +Convert-BER-1.3101.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:45:35 -0000 1.1 +++ sources 24 Jul 2008 00:12:02 -0000 1.2 @@ -0,0 +1 @@ +00fd5e5a98d4194da0e980186cba6292 Convert-BER-1.3101.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 00:13:26 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Thu, 24 Jul 2008 00:13:26 GMT Subject: rpms/perl-Convert-BER/F-9 import.log, NONE, 1.1 perl-Convert-BER.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240013.m6O0DQth008051@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Convert-BER/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7958/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Convert-BER.spec Log Message: Initial import --- NEW FILE import.log --- perl-Convert-BER-1_3101-2_el5:F-9:perl-Convert-BER-1.3101-2.el5.src.rpm:1216858220 --- NEW FILE perl-Convert-BER.spec --- Name: perl-Convert-BER Version: 1.3101 Release: 2%{?dist} Summary: ASN.1 Basic Encoding Rules License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-BER/ Source0: http://archive.cpan.cz//authors/id/G/GB/GBARR/Convert-BER-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Convert::BER provides an OO interface to encoding and decoding data using the ASN.1 Basic Encoding Rules (BER), a platform independent way of encoding structured binary data together with the structure. %prep %setup -q -n Convert-BER-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun Jul 13 2008 Lubomir Rintel (Good Data) 1.3101-2 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:45:35 -0000 1.1 +++ .cvsignore 24 Jul 2008 00:12:41 -0000 1.2 @@ -0,0 +1 @@ +Convert-BER-1.3101.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:45:35 -0000 1.1 +++ sources 24 Jul 2008 00:12:41 -0000 1.2 @@ -0,0 +1 @@ +00fd5e5a98d4194da0e980186cba6292 Convert-BER-1.3101.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 00:14:10 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Thu, 24 Jul 2008 00:14:10 GMT Subject: rpms/perl-Convert-BER/devel import.log, NONE, 1.1 perl-Convert-BER.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240014.m6O0EA0s008135@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Convert-BER/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8046/devel Modified Files: .cvsignore sources Added Files: import.log perl-Convert-BER.spec Log Message: Initial import --- NEW FILE import.log --- perl-Convert-BER-1_3101-2_el5:HEAD:perl-Convert-BER-1.3101-2.el5.src.rpm:1216858217 --- NEW FILE perl-Convert-BER.spec --- Name: perl-Convert-BER Version: 1.3101 Release: 2%{?dist} Summary: ASN.1 Basic Encoding Rules License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-BER/ Source0: http://archive.cpan.cz//authors/id/G/GB/GBARR/Convert-BER-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Convert::BER provides an OO interface to encoding and decoding data using the ASN.1 Basic Encoding Rules (BER), a platform independent way of encoding structured binary data together with the structure. %prep %setup -q -n Convert-BER-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun Jul 13 2008 Lubomir Rintel (Good Data) 1.3101-2 - Specfile autogenerated by cpanspec 1.75. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:45:35 -0000 1.1 +++ .cvsignore 24 Jul 2008 00:13:26 -0000 1.2 @@ -0,0 +1 @@ +Convert-BER-1.3101.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-BER/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:45:35 -0000 1.1 +++ sources 24 Jul 2008 00:13:26 -0000 1.2 @@ -0,0 +1 @@ +00fd5e5a98d4194da0e980186cba6292 Convert-BER-1.3101.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 00:40:13 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 24 Jul 2008 00:40:13 GMT Subject: rpms/crossfire/devel crossfire.spec,1.9,1.10 Message-ID: <200807240040.m6O0eDT6009256@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9213 Modified Files: crossfire.spec Log Message: Fix selinux policy with regard to sock_file Index: crossfire.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/crossfire.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- crossfire.spec 18 Jun 2008 11:04:02 -0000 1.9 +++ crossfire.spec 24 Jul 2008 00:39:19 -0000 1.10 @@ -1,5 +1,6 @@ %define selinux_variants mls strict targeted -%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) +%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) + %define logwatch_root %{_datadir}/logwatch %define logwatch_conf %{logwatch_root}/dist.conf @@ -7,7 +8,7 @@ Name: crossfire Version: 1.10.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -332,6 +333,9 @@ %changelog +* Tue Jul 22 2008 Wart 1.10.0-6 +- Fix selinux policy with regard to sock_file + * Wed Jun 18 2008 Wart 1.10.0-5 - Fix creation of the crossfire user (BZ #442384) From fedora-extras-commits at redhat.com Thu Jul 24 00:55:41 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 24 Jul 2008 00:55:41 GMT Subject: rpms/eclipse/devel eclipse.spec,1.560,1.561 Message-ID: <200807240055.m6O0tfbX009866@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9817 Modified Files: eclipse.spec Log Message: find -> find -type Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.560 retrieving revision 1.561 diff -u -r1.560 -r1.561 --- eclipse.spec 23 Jul 2008 23:47:14 -0000 1.560 +++ eclipse.spec 24 Jul 2008 00:54:57 -0000 1.561 @@ -24,7 +24,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 7%{?dist} +Release: 8%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -422,7 +422,7 @@ %ifarch ppc64 sparc sparcv9 sparc64 alpha for f in $(find -name \*s390x\*); do tofile=$(echo $f | sed "s/s390x/%{_arch}/") - for g in $(find $f); do + for g in $(find -type f $f); do sed -in "s/s390x/%{_arch}/g" $g done mv $f $tofile @@ -457,35 +457,34 @@ IFS=$OLDIFS %endif -# FIXME: this isn't quite finished yet -## libsconfig on the platform on which we're building -#sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml -# -## Don't build for non-linux,gtk,%%{_arch} targets -#pushd features -#for f in */build.xml; do -# for platform in win32 macosx hpux solaris aix qnx motif; do -# sed -i "// d" $f -# sed -i "s/org.eclipse.*.$platform:.*,org/,org/g" $f -# done -#done -#popd -# -#arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \ -# features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \ -# '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ") -# -#arches=$(echo $arches | sed s/%{_arch}//) -# -## Don't build for arches other than the one on which we're building -#pushd features -#for f in */build.xml; do -# for arch in $arches; do -# sed -i "// d" $f -# sed -i "s/org.eclipse.*.linux.$arch:.*,org/,org/g" $f -# done -#done -#popd +# libsconfig on the platform on which we're building +sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml + +# Don't build for non-linux,gtk,%%{_arch} targets +pushd features +for f in */build.xml; do + for platform in win32 macosx hpux solaris aix qnx motif; do + sed -i "// d" $f + sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Iv\-]\+,//g" $f + done +done +popd + +arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \ + features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \ + '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ") + +arches=$(echo $arches | sed s/%{_arch}//) + +# Don't build for arches other than the one on which we're building +pushd features +for f in */build.xml; do + for arch in $arches; do + sed -i "// d" $f + sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9I\.v\-]\+,//g" $f + done +done +popd # Symlinks rm plugins/org.sat4j* @@ -1381,6 +1380,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* %changelog +* Wed Jul 23 2008 Andrew Overholt 3.4.0-8 +- Don't build for arch/ws/os combos other than the one on which we're + building + * Wed Jul 23 2008 Andrew Overholt 3.4.0-7 - More work on non-upstream arches From fedora-extras-commits at redhat.com Thu Jul 24 01:41:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 24 Jul 2008 01:41:22 GMT Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.90,1.91 Message-ID: <200807240141.m6O1fMX7017823@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-icon-theme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17660 Modified Files: gnome-icon-theme.spec Log Message: fix gtk stock icons, again Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- gnome-icon-theme.spec 22 Jul 2008 04:50:49 -0000 1.90 +++ gnome-icon-theme.spec 24 Jul 2008 01:40:37 -0000 1.91 @@ -1,9 +1,10 @@ Summary: Base gnome icons Name: gnome-icon-theme Version: 2.23.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://download.gnome.org/sources/gnome-icon-theme/2.23/%{name}-%{version}.tar.bz2 Source1: gnome-icon-theme-extra-device-icons-4.tar.bz2 +Source2: legacy-icon-mapping.xml License: GPL+ BuildArch: noarch Group: User Interface/Desktops @@ -99,6 +100,9 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog +* Wed Jul 23 2008 Matthias Clasen - 2.23.3-2 +- Re-add the symlinks for gtk stock icons again + * Tue Jul 22 2008 Matthias Clasen - 2.23.3-1 - Update to 2.23.3 From fedora-extras-commits at redhat.com Thu Jul 24 02:09:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 24 Jul 2008 02:09:44 GMT Subject: rpms/gvfs/devel .cvsignore, 1.19, 1.20 gvfs.spec, 1.60, 1.61 sources, 1.19, 1.20 Message-ID: <200807240209.m6O29igr025499@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25474 Modified Files: .cvsignore gvfs.spec sources Log Message: 0.99.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 22 Jul 2008 16:00:51 -0000 1.19 +++ .cvsignore 24 Jul 2008 02:09:02 -0000 1.20 @@ -1 +1 @@ -gvfs-0.99.2.tar.bz2 +gvfs-0.99.3.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- gvfs.spec 23 Jul 2008 09:49:24 -0000 1.60 +++ gvfs.spec 24 Jul 2008 02:09:02 -0000 1.61 @@ -1,6 +1,6 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 0.99.2 +Version: 0.99.3 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -253,6 +253,9 @@ %changelog +* Wed Jul 23 2008 Matthias Clasen - 0.99.3-1 +- Update to 0.99.3 + * Tue Jul 22 2008 Tomas Bzatek - 0.99.2-1 - Update to 0.99.2 - Split out backends to separate packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 22 Jul 2008 16:00:51 -0000 1.19 +++ sources 24 Jul 2008 02:09:02 -0000 1.20 @@ -1 +1 @@ -be34d612c4d993e90022af1751c280c5 gvfs-0.99.2.tar.bz2 +3e1aa44247e634b11a5181d3281be802 gvfs-0.99.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 02:18:21 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 24 Jul 2008 02:18:21 GMT Subject: rpms/xscreensaver/F-8 xscreensaver.spec,1.64,1.65 Message-ID: <200807240218.m6O2ILtu025797@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25768 Modified Files: xscreensaver.spec Log Message: * Thu Jul 24 2008 Mamoru Tasaka - Build some test binaries for debugging Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- xscreensaver.spec 17 Jul 2008 01:59:19 -0000 1.64 +++ xscreensaver.spec 24 Jul 2008 02:17:35 -0000 1.65 @@ -14,14 +14,15 @@ %define pam_ver 0.80-7 %define autoconf_ver 2.53 -%define update_po 1 +%define update_po 0 +%define build_tests 1 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: X screen saver and locker Name: %{name} Version: %{mainversion} -Release: %{fedora_rel}%{?dist}%{?extrarel} +Release: %{fedora_rel}%{?dist}%{?extrarel}.1 Epoch: 1 License: BSD Group: Amusements/Graphics @@ -104,6 +105,11 @@ Requires: %{name}-gl-extras = %{epoch}:%{version}-%{release} Requires: gnome-screensaver +%package tests +Summary: Test programs related to XScreenSaver +Group: Development/Debuggers +Requires: %{name}-base = %{epoch}:%{version}-%{release} + %description A modular screen saver and locker for the X Window System. @@ -166,6 +172,8 @@ This package contains desktop files of gl-extras screensavers for gnome-screensaver compatibility. +%description tests +This package contains some test programs to debug XScreenSaver. %prep @@ -279,6 +287,22 @@ driver/screensaver-properties.desktop.in %endif +# Disable (don't build) some tests +# apm: doesn't compile +# passwd: causes segv +# mlstring: causes OOM +sed -i.test \ + -e 's|test-apm[ \t][ \t]*t|t|' \ + -e 's|test-passwd[ \t][ \t]*t|t|' \ + -e 's|test-mlstring[ \t][ \t]*t|t|' \ + driver/Makefile.in +sed -i.dir -e '/TEST_FADE_OBJS =/s|UTILS_SRC|UTILS_BIN|' driver/Makefile.in + +# test-fade: give more time between fading +sed -i.delay -e 's| delay = 1| delay = 3|' driver/test-fade.c +# test-grab: testing time too long, setting time 15 min -> 20 sec +sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c + %build autoconf @@ -331,6 +355,11 @@ %endif +# test +%if %{build_tests} +make tests -C driver +%endif + %install archdir=`./config.guess` cd $archdir @@ -464,6 +493,17 @@ fi done +# tests +%if %{build_tests} +echo "%%defattr(-,root,root,-)" > $dd/tests.files +cd driver +for tests in `find . -name test-\* -perm -0700` ; do + install -cpm 0755 $tests ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver + echo "%{_libexecdir}/xscreensaver/$tests" >> $dd/tests.files +done +cd .. +%endif + # create desktop entry for gnome-screensaver create_desktop(){ COMMAND=`cat $1 | sed -n -e 's|^ +- Build some test binaries for debugging + * Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 - Update to 5.06 From fedora-extras-commits at redhat.com Thu Jul 24 03:00:48 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 24 Jul 2008 03:00:48 GMT Subject: rpms/evolution-data-server/devel evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch, NONE, 1.1 .cvsignore, 1.88, 1.89 evolution-data-server.spec, 1.221, 1.222 sources, 1.88, 1.89 evolution-data-server-2.23.4-fix-attachment-saving.patch, 1.1, NONE Message-ID: <200807240300.m6O30muE027443@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27336 Modified Files: .cvsignore evolution-data-server.spec sources Added Files: evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch Removed Files: evolution-data-server-2.23.4-fix-attachment-saving.patch Log Message: * Mon Jul 21 2008 Matthew Barnes - 2.23.5-1.fc10 - Update to 2.23.5 - Remove patch for RH bug #534080 (fixed upstream). evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch: --- NEW FILE evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch --- diff -up evolution-data-server-2.23.5/gtk-doc.make.fix-gtkdoc-mkhtml evolution-data-server-2.23.5/gtk-doc.make --- evolution-data-server-2.23.5/gtk-doc.make.fix-gtkdoc-mkhtml 2008-07-23 22:32:21.000000000 -0400 +++ evolution-data-server-2.23.5/gtk-doc.make 2008-07-23 22:32:31.000000000 -0400 @@ -107,7 +107,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_ @-chmod -R u+w $(srcdir) rm -rf $(srcdir)/html mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- .cvsignore 16 Jun 2008 17:41:48 -0000 1.88 +++ .cvsignore 24 Jul 2008 03:00:01 -0000 1.89 @@ -1 +1 @@ -evolution-data-server-2.23.4.tar.bz2 +evolution-data-server-2.23.5.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- evolution-data-server.spec 18 Jul 2008 13:23:46 -0000 1.221 +++ evolution-data-server.spec 24 Jul 2008 03:00:01 -0000 1.222 @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution-data-server -Version: 2.23.4 -Release: 3%{?dist} +Version: 2.23.5 +Release: 1%{?dist} License: LGPLv2 Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -50,8 +50,8 @@ # RH bug #243296 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch -# RH bug #534080 -Patch14: evolution-data-server-2.23.4-fix-attachment-saving.patch +# Fix broken gtk-doc.make +Patch14: evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch ### Build Dependencies ### @@ -129,7 +129,7 @@ %patch11 -p1 -b .fix-ldap-query %patch12 -p1 -b .camel-folder-summary-crash %patch13 -p1 -b .fix-64bit-acinclude -%patch14 -p1 -b .fix-attachment-saving +%patch14 -p1 -b .fix-gtkdoc-mkhtml mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -322,6 +322,7 @@ # e-d-s extensions: %{eds_extensions_dir}/libebookbackendfile.so +%{eds_extensions_dir}/libebookbackendgoogle.so %{eds_extensions_dir}/libebookbackendgroupwise.so %{eds_extensions_dir}/libebookbackendldap.so %{eds_extensions_dir}/libebookbackendvcf.so @@ -376,11 +377,15 @@ %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Mon Jul 21 2008 Matthew Barnes - 2.23.5-1.fc10 +- Update to 2.23.5 +- Remove patch for RH bug #534080 (fixed upstream). + * Fri Jul 18 2008 Tom "spot" Callaway 2.23.4-3 - fix license tag * Thu Jul 03 2008 Matthew Barnes - 3.23.4-2.fc10 -- Add patch for GNOME bug #534080 (fix attachment saving). +- Add patch for RH bug #534080 (fix attachment saving). * Mon Jun 16 2008 Matthew Barnes - 3.23.4-1.fc10 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- sources 16 Jun 2008 17:41:49 -0000 1.88 +++ sources 24 Jul 2008 03:00:01 -0000 1.89 @@ -1 +1 @@ -2b86e018c8483e5cc2077303ca8e57a7 evolution-data-server-2.23.4.tar.bz2 +73847cb2caac32e45499bbe3b88353c2 evolution-data-server-2.23.5.tar.bz2 --- evolution-data-server-2.23.4-fix-attachment-saving.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 03:28:59 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 24 Jul 2008 03:28:59 GMT Subject: rpms/deluge/devel deluge.spec,1.59,1.60 Message-ID: <200807240328.m6O3SxmJ002592@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/deluge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2546 Modified Files: deluge.spec Log Message: Add setuptools runtime dep, for pkg_resources module. Index: deluge.spec =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- deluge.spec 22 Jul 2008 03:37:41 -0000 1.59 +++ deluge.spec 24 Jul 2008 03:28:13 -0000 1.60 @@ -3,7 +3,7 @@ Name: deluge Version: 0.9.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPLv2+ @@ -35,6 +35,7 @@ Requires: hicolor-icon-theme Requires: pygtk2-libglade Requires: pyOpenSSL +Requires: python-setuptools Requires: pyxdg ## Deluge is now using its own internal copy of rb_libtorrent, which they have ## heavily modified. Patches were sent to the upstream rb_libtorrent devs, @@ -122,6 +123,10 @@ %changelog +* Wed Jul 23 2008 Peter Gordon - 0.9.03-2 +- Add setuptools runtime dependency, to fix "No module named pkg_resources" + error messages. + * Mon Jul 21 2008 Peter Gordon - 0.9.03-1 - Update to new upstream release candidate (1.0.0 RC3) - Re-add the blocklist plugin, at upstream's suggestion. (The rewrite is From fedora-extras-commits at redhat.com Thu Jul 24 03:44:10 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 24 Jul 2008 03:44:10 GMT Subject: rpms/dbus/devel dbus.spec,1.148,1.149 Message-ID: <200807240344.m6O3iAbS003307@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/dbus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3231 Modified Files: dbus.spec Log Message: fix a directory ownership issue Index: dbus.spec =================================================================== RCS file: /cvs/extras/rpms/dbus/devel/dbus.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- dbus.spec 19 Jul 2008 00:05:15 -0000 1.148 +++ dbus.spec 24 Jul 2008 03:43:24 -0000 1.149 @@ -8,7 +8,7 @@ Summary: D-BUS message bus Name: dbus Version: 1.2.1 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz Source1: doxygen_to_devhelp.xsl @@ -153,6 +153,8 @@ install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh +mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces + ## %find_lang %{gettext_package} %clean @@ -203,6 +205,7 @@ %dir %{_datadir}/dbus-1 %{_datadir}/dbus-1/services %{_datadir}/dbus-1/system-services +%{_datadir}/dbus-1/interfaces %dir /%{_lib}/dbus-1 # See doc/system-activation.txt in source tarball for the rationale # behind these permissions @@ -235,6 +238,9 @@ %{_includedir}/* %changelog +* Wed Jul 23 2008 Matthias Clasen - 1.2.1-7 +- Own /usr/share/dbus-1/interfaces + * Fri Jul 18 2008 Matthias Clasen - 1.2.1-6 - Add a patch from upstream git that adds a method for changing the activation environment on the session bus From fedora-extras-commits at redhat.com Thu Jul 24 04:03:01 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 24 Jul 2008 04:03:01 GMT Subject: rpms/evolution/devel .cvsignore, 1.93, 1.94 evolution-2.23.4-experimental-plugins.patch, 1.1, 1.2 evolution.spec, 1.346, 1.347 sources, 1.93, 1.94 Message-ID: <200807240403.m6O431UG010717@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10623 Modified Files: .cvsignore evolution-2.23.4-experimental-plugins.patch evolution.spec sources Log Message: * Tue Jul 22 2008 Matthew Barnes - 2.23.5-1.fc10 - Update to 2.23.5 - Bump eds_version to 2.23.5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- .cvsignore 16 Jun 2008 17:41:50 -0000 1.93 +++ .cvsignore 24 Jul 2008 04:02:14 -0000 1.94 @@ -1 +1 @@ -evolution-2.23.4.tar.bz2 +evolution-2.23.5.tar.bz2 evolution-2.23.4-experimental-plugins.patch: Index: evolution-2.23.4-experimental-plugins.patch =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.23.4-experimental-plugins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.23.4-experimental-plugins.patch 19 Jun 2008 13:00:31 -0000 1.1 +++ evolution-2.23.4-experimental-plugins.patch 24 Jul 2008 04:02:14 -0000 1.2 @@ -5,8 +5,8 @@ plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" --plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header" -+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore" +-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" ++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" @@ -24,8 +24,8 @@ plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" --plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header" -+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore" +-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" ++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.346 retrieving revision 1.347 diff -u -r1.346 -r1.347 --- evolution.spec 18 Jul 2008 13:16:37 -0000 1.346 +++ evolution.spec 24 Jul 2008 04:02:14 -0000 1.347 @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.23.3 +%define eds_version 2.23.5 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.23.4 -Release: 3%{?dist} +Version: 2.23.5 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -366,6 +366,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null %post bogofilter @@ -392,6 +393,7 @@ %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas +%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas %{_sysconfdir}/gconf/schemas/evolution-mail.schemas # The main executable @@ -574,6 +576,10 @@ %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so +%{evo_plugin_dir}/templates.glade +%{evo_plugin_dir}/org-gnome-templates.eplug +%{evo_plugin_dir}/liborg-gnome-templates.so + %{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug %{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so @@ -646,6 +652,10 @@ %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Jul 22 2008 Matthew Barnes - 2.23.5-1.fc10 +- Update to 2.23.5 +- Bump eds_version to 2.23.5. + * Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-3.fc10 - fix license tag - fix patches to apply with fuzz=0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- sources 16 Jun 2008 17:41:50 -0000 1.93 +++ sources 24 Jul 2008 04:02:15 -0000 1.94 @@ -1 +1 @@ -5a6ceba4a7cdb33fb02fe32e1c58cb40 evolution-2.23.4.tar.bz2 +ea19190dec55a30b106ebb9da5de8b70 evolution-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 04:11:21 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 24 Jul 2008 04:11:21 GMT Subject: rpms/evolution-exchange/devel .cvsignore, 1.24, 1.25 evolution-exchange.spec, 1.34, 1.35 sources, 1.24, 1.25 Message-ID: <200807240411.m6O4BLiE012373@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-exchange/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12341 Modified Files: .cvsignore evolution-exchange.spec sources Log Message: * Mon Jul 21 2008 Matthew Barnes - 2.23.5-1.fc10 - Update to 2.23.5 - Bump eds_version to 2.23.5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 16 Jun 2008 17:41:52 -0000 1.24 +++ .cvsignore 24 Jul 2008 04:10:30 -0000 1.25 @@ -1 +1 @@ -evolution-exchange-2.23.4.tar.bz2 +evolution-exchange-2.23.5.tar.bz2 Index: evolution-exchange.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- evolution-exchange.spec 18 Jul 2008 13:30:14 -0000 1.34 +++ evolution-exchange.spec 24 Jul 2008 04:10:30 -0000 1.35 @@ -1,5 +1,5 @@ %define evo_version 2.23.1 -%define eds_version 2.23.1 +%define eds_version 2.23.5 %define intltool_version 0.35.5 %define libsoup_version 2.3.0 @@ -22,8 +22,8 @@ ### Abstract ### Name: evolution-exchange -Version: 2.23.4 -Release: 2%{?dist} +Version: 2.23.5 +Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity Summary: Evolution plugin to interact with MS Exchange Server @@ -148,6 +148,10 @@ %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas %changelog +* Mon Jul 21 2008 Matthew Barnes - 2.23.5-1.fc10 +- Update to 2.23.5 +- Bump eds_version to 2.23.5. + * Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-2 - fix license tag - fix source url Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 16 Jun 2008 17:41:52 -0000 1.24 +++ sources 24 Jul 2008 04:10:30 -0000 1.25 @@ -1 +1 @@ -6224497dbdb3c94f94a47b1cb140f4b6 evolution-exchange-2.23.4.tar.bz2 +701df76ba2e44e6c4238ac3b22423cfc evolution-exchange-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 04:19:48 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Thu, 24 Jul 2008 04:19:48 GMT Subject: rpms/decibel-audio-player/F-8 decibel-audio-player.spec,1.1,1.2 Message-ID: <200807240419.m6O4Jm8p012594@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/decibel-audio-player/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12562 Modified Files: decibel-audio-player.spec Log Message: * Thu Jul 24 2008 Debarshi Ray - 0.10-2 - Added 'Requires: gnome-python2-gnomekeyring'. Closes Red Hat Bugzilla bug #455780. Index: decibel-audio-player.spec =================================================================== RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-8/decibel-audio-player.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- decibel-audio-player.spec 22 May 2008 18:39:42 -0000 1.1 +++ decibel-audio-player.spec 24 Jul 2008 04:19:03 -0000 1.2 @@ -6,7 +6,7 @@ Summary: Music player for GNOME Name: decibel-audio-player Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://decibel.silent-blade.org/ @@ -18,6 +18,7 @@ Requires: dbus-python Requires: gnome-python2 +Requires: gnome-python2-gnomekeyring Requires: gstreamer-python Requires: hicolor-icon-theme Requires: pygtk2-libglade @@ -121,6 +122,10 @@ %{_datadir}/%{name}/src %changelog +* Thu Jul 24 2008 Debarshi Ray - 0.10-2 +- Added 'Requires: gnome-python2-gnomekeyring'. Closes Red Hat Bugzilla bug + #455780. + * Thu May 22 2008 Debarshi Ray - 0.10-1 - Version bump to 0.10. From fedora-extras-commits at redhat.com Thu Jul 24 04:21:16 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Thu, 24 Jul 2008 04:21:16 GMT Subject: rpms/decibel-audio-player/F-9 decibel-audio-player.spec,1.1,1.2 Message-ID: <200807240421.m6O4LGj3012708@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/decibel-audio-player/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12668 Modified Files: decibel-audio-player.spec Log Message: * Thu Jul 24 2008 Debarshi Ray - 0.10-2 - Added 'Requires: gnome-python2-gnomekeyring'. Closes Red Hat Bugzilla bug #455780. Index: decibel-audio-player.spec =================================================================== RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-9/decibel-audio-player.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- decibel-audio-player.spec 22 May 2008 18:35:27 -0000 1.1 +++ decibel-audio-player.spec 24 Jul 2008 04:20:27 -0000 1.2 @@ -6,7 +6,7 @@ Summary: Music player for GNOME Name: decibel-audio-player Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://decibel.silent-blade.org/ @@ -18,6 +18,7 @@ Requires: dbus-python Requires: gnome-python2 +Requires: gnome-python2-gnomekeyring Requires: gstreamer-python Requires: hicolor-icon-theme Requires: pygtk2-libglade @@ -121,6 +122,10 @@ %{_datadir}/%{name}/src %changelog +* Thu Jul 24 2008 Debarshi Ray - 0.10-2 +- Added 'Requires: gnome-python2-gnomekeyring'. Closes Red Hat Bugzilla bug + #455780. + * Thu May 22 2008 Debarshi Ray - 0.10-1 - Version bump to 0.10. From fedora-extras-commits at redhat.com Thu Jul 24 04:22:55 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Thu, 24 Jul 2008 04:22:55 GMT Subject: rpms/decibel-audio-player/devel decibel-audio-player.spec,1.1,1.2 Message-ID: <200807240422.m6O4Mtgc012842@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/decibel-audio-player/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12798 Modified Files: decibel-audio-player.spec Log Message: * Thu Jul 24 2008 Debarshi Ray - 0.10-2 - Added 'Requires: gnome-python2-gnomekeyring'. Closes Red Hat Bugzilla bug #455780. Index: decibel-audio-player.spec =================================================================== RCS file: /cvs/pkgs/rpms/decibel-audio-player/devel/decibel-audio-player.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- decibel-audio-player.spec 22 May 2008 18:30:35 -0000 1.1 +++ decibel-audio-player.spec 24 Jul 2008 04:22:10 -0000 1.2 @@ -6,7 +6,7 @@ Summary: Music player for GNOME Name: decibel-audio-player Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://decibel.silent-blade.org/ @@ -18,6 +18,7 @@ Requires: dbus-python Requires: gnome-python2 +Requires: gnome-python2-gnomekeyring Requires: gstreamer-python Requires: hicolor-icon-theme Requires: pygtk2-libglade @@ -121,6 +122,10 @@ %{_datadir}/%{name}/src %changelog +* Thu Jul 24 2008 Debarshi Ray - 0.10-2 +- Added 'Requires: gnome-python2-gnomekeyring'. Closes Red Hat Bugzilla bug + #455780. + * Thu May 22 2008 Debarshi Ray - 0.10-1 - Version bump to 0.10. From fedora-extras-commits at redhat.com Thu Jul 24 04:23:37 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 24 Jul 2008 04:23:37 GMT Subject: rpms/cyphesis/devel cyphesis.spec,1.21,1.22 Message-ID: <200807240423.m6O4NbFe012912@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/cyphesis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12835 Modified Files: cyphesis.spec Log Message: Update to 0.5.16 Index: cyphesis.spec =================================================================== RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cyphesis.spec 6 Jun 2008 02:42:43 -0000 1.21 +++ cyphesis.spec 24 Jul 2008 04:22:51 -0000 1.22 @@ -3,12 +3,11 @@ %define logwatch_scripts %{logwatch_root}/scripts Name: cyphesis -Version: 0.5.15 -Release: 7%{?dist} +Version: 0.5.16 +Release: 1%{?dist} Summary: WorldForge game server Group: System Environment/Libraries -# Would be GPLv2+, except server/protocol_instructions.h is GPLv2 only. -License: GPLv2 +License: GPLv2+ URL: http://www.worldforge.org Source0: http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.gz Source4: logwatch.logconf.cyphesis @@ -17,7 +16,7 @@ Source7: logwatch.shared.applycyphesisdate Patch0: cyphesis-0.5.15-init.patch Patch1: cyphesis-0.5.11-logdir.patch -Patch2: cyphesis-0.5.15-gcc43.patch +Patch2: cyphesis-0.5.16-destdir.patch Patch3: cyphesis-0.5.15-sockpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel libgcrypt-devel pkgconfig atlascpp-devel @@ -56,10 +55,6 @@ %patch2 -p1 %patch3 -p1 -# Fix a bug where DESTDIR is added twice to some files during the -# install step. Upstream has been notified. -sed -i -e 's#moduledir = $(DESTDIR)#moduledir = #' rulesets/Makefile.in - chmod a-x rulesets/basic/mind/dictlist.py chmod a-x rulesets/mason/world/objects/buildings/House.py chmod a-x rulesets/mason/world/objects/elements/Fire.py @@ -167,6 +162,9 @@ %changelog +* Wed Jul 23 2008 Wart 0.5.16-1 +- Update to 0.5.16 + * Wed Apr 10 2008 Wart 0.5.15-7 - Remove selinux subpackage; it's been merged into the main selinux-policy package. From fedora-extras-commits at redhat.com Thu Jul 24 04:27:52 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 24 Jul 2008 04:27:52 GMT Subject: rpms/cyphesis/devel cyphesis-0.5.16-destdir.patch,NONE,1.1 Message-ID: <200807240427.m6O4Rqsa013118@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/cyphesis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13090 Added Files: cyphesis-0.5.16-destdir.patch Log Message: Replace sed command in spec file with a real patch for upstream cyphesis-0.5.16-destdir.patch: --- NEW FILE cyphesis-0.5.16-destdir.patch --- --- cyphesis-0.5.16/rulesets/Makefile.in.orig 2008-07-23 19:56:34.000000000 -0700 +++ cyphesis-0.5.16/rulesets/Makefile.in 2008-07-23 19:56:56.000000000 -0700 @@ -466,12 +466,12 @@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` install-dist_moduleDATA: $(dist_module_DATA) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(moduledir)" @list='$(dist_module_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dist_moduleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(dist_moduleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(dist_moduleDATA_INSTALL) '$$d$$p' '$(moduledir)/$$f'"; \ + $(dist_moduleDATA_INSTALL) "$$d$$p" "$(moduledir)/$$f"; \ done uninstall-dist_moduleDATA: From fedora-extras-commits at redhat.com Thu Jul 24 04:36:59 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 24 Jul 2008 04:36:59 GMT Subject: rpms/cyphesis/devel .cvsignore,1.8,1.9 sources,1.8,1.9 Message-ID: <200807240436.m6O4ax2d013551@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/cyphesis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13493 Modified Files: .cvsignore sources Log Message: Update to 0.5.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cyphesis/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 16 Dec 2007 19:27:34 -0000 1.8 +++ .cvsignore 24 Jul 2008 04:36:10 -0000 1.9 @@ -1 +1 @@ -cyphesis-0.5.15.tar.gz +cyphesis-0.5.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cyphesis/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 16 Dec 2007 19:27:34 -0000 1.8 +++ sources 24 Jul 2008 04:36:10 -0000 1.9 @@ -1 +1 @@ -4f6fa69ebe0d4b7d89d5c60a2a1dafae cyphesis-0.5.15.tar.gz +18b0527fb74f9c2bfb8b3610bca8b13a cyphesis-0.5.16.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 04:45:35 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 24 Jul 2008 04:45:35 GMT Subject: rpms/gnome-vfs2/devel xdgmime.patch, NONE, 1.1 gnome-vfs2.spec, 1.179, 1.180 Message-ID: <200807240445.m6O4jZ2Z013868@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-vfs2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13821 Modified Files: gnome-vfs2.spec Added Files: xdgmime.patch Log Message: use newer xdgmime xdgmime.patch: --- NEW FILE xdgmime.patch --- Index: libgnomevfs/xdgmimecache.c =================================================================== --- libgnomevfs/xdgmimecache.c (revision 5479) +++ libgnomevfs/xdgmimecache.c (working copy) @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include @@ -41,6 +41,8 @@ #ifdef HAVE_MMAP #include +#else +#warning Building xdgmime without MMAP support. Binary "mime.info" cache files will not be used. #endif #include @@ -70,7 +72,7 @@ #endif #define MAJOR_VERSION 1 -#define MINOR_VERSION 0 +#define MINOR_VERSION 1 struct _XdgMimeCache { @@ -344,6 +346,11 @@ return NULL; } +typedef struct { + const char *mime; + int weight; +} MimeWeight; + static int cache_glob_lookup_literal (const char *file_name, const char *mime_types[], @@ -365,7 +372,7 @@ { mid = (min + max) / 2; - offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid); + offset = GET_UINT32 (cache->buffer, list_offset + 4 + 12 * mid); ptr = cache->buffer + offset; cmp = strcmp (ptr, file_name); @@ -375,7 +382,7 @@ max = mid - 1; else { - offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid + 4); + offset = GET_UINT32 (cache->buffer, list_offset + 4 + 12 * mid + 4); mime_types[0] = (const char *)(cache->buffer + offset); return 1; @@ -388,7 +395,7 @@ static int cache_glob_lookup_fnmatch (const char *file_name, - const char *mime_types[], + MimeWeight mime_types[], int n_mime_types) { const char *mime_type; @@ -406,14 +413,19 @@ for (j = 0; j < n_entries && n < n_mime_types; j++) { - xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j); - xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j + 4); + xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4 + 12 * j); + xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 12 * j + 4); + int weight = GET_UINT32 (cache->buffer, list_offset + 4 + 12 * j + 8); ptr = cache->buffer + offset; mime_type = cache->buffer + mimetype_offset; /* FIXME: Not UTF-8 safe */ if (fnmatch (ptr, file_name, 0) == 0) - mime_types[n++] = mime_type; + { + mime_types[n].mime = mime_type; + mime_types[n].weight = weight; + n++; + } } if (n > 0) @@ -424,85 +436,86 @@ } static int -cache_glob_node_lookup_suffix (XdgMimeCache *cache, - xdg_uint32_t n_entries, - xdg_uint32_t offset, - const char *suffix, - int ignore_case, - const char *mime_types[], - int n_mime_types) +cache_glob_node_lookup_suffix (XdgMimeCache *cache, + xdg_uint32_t n_entries, + xdg_uint32_t offset, + xdg_unichar_t *file_name, + int len, + int ignore_case, + MimeWeight mime_types[], + int n_mime_types) { xdg_unichar_t character; xdg_unichar_t match_char; xdg_uint32_t mimetype_offset; xdg_uint32_t n_children; xdg_uint32_t child_offset; + int weight; int min, max, mid, n, i; - character = _xdg_utf8_to_ucs4 (suffix); + character = file_name[len - 1]; if (ignore_case) character = _xdg_ucs4_to_lower (character); + assert (character != 0); + min = 0; max = n_entries - 1; while (max >= min) { mid = (min + max) / 2; - - match_char = GET_UINT32 (cache->buffer, offset + 16 * mid); - + match_char = GET_UINT32 (cache->buffer, offset + 12 * mid); if (match_char < character) min = mid + 1; else if (match_char > character) max = mid - 1; else { - suffix = _xdg_utf8_next_char (suffix); - if (*suffix == '\0') - { - mimetype_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 4); - n = 0; - mime_types[n++] = cache->buffer + mimetype_offset; - - n_children = GET_UINT32 (cache->buffer, offset + 16 * mid + 8); - child_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 12); + len--; + n = 0; + n_children = GET_UINT32 (cache->buffer, offset + 12 * mid + 4); + child_offset = GET_UINT32 (cache->buffer, offset + 12 * mid + 8); + + if (len > 0) + { + n = cache_glob_node_lookup_suffix (cache, + n_children, child_offset, + file_name, len, + ignore_case, + mime_types, + n_mime_types); + } + if (n == 0) + { i = 0; while (n < n_mime_types && i < n_children) { - match_char = GET_UINT32 (cache->buffer, child_offset + 16 * i); - mimetype_offset = GET_UINT32 (cache->buffer, offset + 16 * i + 4); + match_char = GET_UINT32 (cache->buffer, child_offset + 12 * i); if (match_char != 0) break; - mime_types[n++] = cache->buffer + mimetype_offset; + mimetype_offset = GET_UINT32 (cache->buffer, child_offset + 12 * i + 4); + weight = GET_UINT32 (cache->buffer, child_offset + 12 * i + 8); + + mime_types[n].mime = cache->buffer + mimetype_offset; + mime_types[n].weight = weight; + n++; i++; } - - return n; } - else - { - n_children = GET_UINT32 (cache->buffer, offset + 16 * mid + 8); - child_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 12); - - return cache_glob_node_lookup_suffix (cache, - n_children, child_offset, - suffix, ignore_case, - mime_types, - n_mime_types); - } + return n; } } - return 0; } static int -cache_glob_lookup_suffix (const char *suffix, - int ignore_case, - const char *mime_types[], - int n_mime_types) +cache_glob_lookup_suffix (xdg_unichar_t *file_name, + int len, + int ignore_case, + MimeWeight mime_types[], + int n_mime_types) { int i, n; @@ -516,7 +529,8 @@ n = cache_glob_node_lookup_suffix (cache, n_entries, offset, - suffix, ignore_case, + file_name, len, + ignore_case, mime_types, n_mime_types); if (n > 0) @@ -526,41 +540,12 @@ return 0; } -static void -find_stopchars (char *stopchars) +static int compare_mime_weight (const void *a, const void *b) { - int i, j, k, l; - - k = 0; - for (i = 0; _caches[i]; i++) - { - XdgMimeCache *cache = _caches[i]; + const MimeWeight *aa = (const MimeWeight *)a; + const MimeWeight *bb = (const MimeWeight *)b; - xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 16); - xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset); - xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4); - - for (j = 0; j < n_entries; j++) - { - xdg_uint32_t match_char = GET_UINT32 (cache->buffer, offset); - - if (match_char < 128) - { - for (l = 0; l < k; l++) - if (stopchars[l] == match_char) - break; - if (l == k) - { - stopchars[k] = (char) match_char; - k++; - } - } - - offset += 16; - } - } - - stopchars[k] = '\0'; + return aa->weight - bb->weight; } static int @@ -568,36 +553,40 @@ const char *mime_types[], int n_mime_types) { - const char *ptr; - char stopchars[128]; int n; + MimeWeight mimes[10]; + int n_mimes = 10; + int i; + xdg_unichar_t *ucs4; + int len; - assert (file_name != NULL); + assert (file_name != NULL && n_mime_types > 0); /* First, check the literals */ n = cache_glob_lookup_literal (file_name, mime_types, n_mime_types); if (n > 0) return n; - find_stopchars (stopchars); + ucs4 = _xdg_convert_to_ucs4 (file_name, &len); + n = cache_glob_lookup_suffix (ucs4, len, FALSE, mimes, n_mimes); - /* Next, check suffixes */ - ptr = strpbrk (file_name, stopchars); - while (ptr) - { - n = cache_glob_lookup_suffix (ptr, FALSE, mime_types, n_mime_types); - if (n > 0) - return n; - - n = cache_glob_lookup_suffix (ptr, TRUE, mime_types, n_mime_types); - if (n > 0) - return n; - - ptr = strpbrk (ptr + 1, stopchars); - } + if (n == 0) + n = cache_glob_lookup_suffix (ucs4, len, TRUE, mimes, n_mimes); + free(ucs4); /* Last, try fnmatch */ - return cache_glob_lookup_fnmatch (file_name, mime_types, n_mime_types); + if (n == 0) + n = cache_glob_lookup_fnmatch (file_name, mimes, n_mimes); + + qsort (mimes, n, sizeof (MimeWeight), compare_mime_weight); + + if (n_mime_types < n) + n = n_mime_types; + + for (i = 0; i < n; i++) + mime_types[i] = mimes[i].mime; + + return n; } int @@ -622,6 +611,7 @@ static const char * cache_get_mime_type_for_data (const void *data, size_t len, + int *result_prio, const char *mime_types[], int n_mime_types) { @@ -646,11 +636,15 @@ } } + if (result_prio) + *result_prio = priority; + if (priority > 0) return mime_type; for (n = 0; n < n_mime_types; n++) { + if (mime_types[n]) return mime_types[n]; } @@ -660,9 +654,10 @@ const char * _xdg_mime_cache_get_mime_type_for_data (const void *data, - size_t len) + size_t len, + int *result_prio) { - return cache_get_mime_type_for_data (data, len, NULL, 0); + return cache_get_mime_type_for_data (data, len, result_prio, NULL, 0); } const char * @@ -670,7 +665,7 @@ struct stat *statbuf) { const char *mime_type; - const char *mime_types[2]; + const char *mime_types[10]; FILE *file; unsigned char *data; int max_extent; @@ -686,7 +681,7 @@ return NULL; base_name = _xdg_get_base_name (file_name); - n = cache_glob_lookup_file_name (base_name, mime_types, 2); + n = cache_glob_lookup_file_name (base_name, mime_types, 10); if (n == 1) return mime_types[0]; @@ -725,7 +720,7 @@ return XDG_MIME_TYPE_UNKNOWN; } - mime_type = cache_get_mime_type_for_data (data, bytes_read, + mime_type = cache_get_mime_type_for_data (data, bytes_read, NULL, mime_types, n); free (data); @@ -745,6 +740,14 @@ return XDG_MIME_TYPE_UNKNOWN; } +int +_xdg_mime_cache_get_mime_types_from_file_name (const char *file_name, + const char *mime_types[], + int n_mime_types) +{ + return cache_glob_lookup_file_name (file_name, mime_types, n_mime_types); +} + #if 1 static int is_super_type (const char *mime) @@ -850,10 +853,12 @@ char ** _xdg_mime_cache_list_mime_parents (const char *mime) { - int i, j, p; + int i, j, k, l, p; char *all_parents[128]; /* we'll stop at 128 */ char **result; + mime = xdg_mime_unalias_mime_type (mime); + p = 0; for (i = 0; _caches[i]; i++) { @@ -864,21 +869,36 @@ for (j = 0; j < n_entries; j++) { - xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * i); - xdg_uint32_t parents_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * i + 4); - + xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j); + xdg_uint32_t parents_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j + 4); + if (strcmp (cache->buffer + mimetype_offset, mime) == 0) { + xdg_uint32_t parent_mime_offset; xdg_uint32_t n_parents = GET_UINT32 (cache->buffer, parents_offset); - - for (j = 0; j < n_parents; j++) - all_parents[p++] = cache->buffer + parents_offset + 4 + 4 * j; + for (k = 0; k < n_parents && p < 127; k++) + { + parent_mime_offset = GET_UINT32 (cache->buffer, parents_offset + 4 + 4 * k); + + /* Don't add same parent multiple times. + * This can happen for instance if the same type is listed in multiple directories + */ + for (l = 0; l < p; l++) + { + if (strcmp (all_parents[l], cache->buffer + parent_mime_offset) == 0) + break; + } + + if (l == p) + all_parents[p++] = cache->buffer + parent_mime_offset; + } + break; } } } - all_parents[p++] = 0; + all_parents[p++] = NULL; result = (char **) malloc (p * sizeof (char *)); memcpy (result, all_parents, p * sizeof (char *)); @@ -886,3 +906,107 @@ return result; } +static const char * +cache_lookup_icon (const char *mime, int header) +{ + const char *ptr; + int i, min, max, mid, cmp; + + for (i = 0; _caches[i]; i++) + { + XdgMimeCache *cache = _caches[i]; + xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, header); + xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset); + xdg_uint32_t offset; + + min = 0; + max = n_entries - 1; + while (max >= min) + { + mid = (min + max) / 2; + + offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid); + ptr = cache->buffer + offset; + cmp = strcmp (ptr, mime); + + if (cmp < 0) + min = mid + 1; + else if (cmp > 0) + max = mid - 1; + else + { + offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * mid + 4); + return cache->buffer + offset; + } + } + } + + return NULL; +} + +const char * +_xdg_mime_cache_get_generic_icon (const char *mime) +{ + return cache_lookup_icon (mime, 36); +} + +const char * +_xdg_mime_cache_get_icon (const char *mime) +{ + const char *icon; + + icon = cache_lookup_icon (mime, 32); + + if (icon == NULL) + icon = _xdg_mime_cache_get_generic_icon (mime); + + return icon; +} + +static void +dump_glob_node (XdgMimeCache *cache, + xdg_uint32_t offset, + int depth) +{ + xdg_unichar_t character; + xdg_uint32_t mime_offset; + xdg_uint32_t n_children; + xdg_uint32_t child_offset; + int i; + + character = GET_UINT32 (cache->buffer, offset); + mime_offset = GET_UINT32 (cache->buffer, offset + 4); + n_children = GET_UINT32 (cache->buffer, offset + 8); + child_offset = GET_UINT32 (cache->buffer, offset + 12); + for (i = 0; i < depth; i++) + printf (" "); + printf ("%c", character); + if (mime_offset) + printf (" - %s", cache->buffer + mime_offset); + printf ("\n"); + if (child_offset) + { + for (i = 0; i < n_children; i++) + dump_glob_node (cache, child_offset + 20 * i, depth + 1); + } +} + +void +_xdg_mime_cache_glob_dump (void) +{ + int i, j; + for (i = 0; _caches[i]; i++) + { + XdgMimeCache *cache = _caches[i]; + xdg_uint32_t list_offset; + xdg_uint32_t n_entries; + xdg_uint32_t offset; + list_offset = GET_UINT32 (cache->buffer, 16); + n_entries = GET_UINT32 (cache->buffer, list_offset); + offset = GET_UINT32 (cache->buffer, list_offset + 4); + for (j = 0; j < n_entries; j++) + dump_glob_node (cache, offset + 20 * j, 0); + } +} + + Index: libgnomevfs/xdgmimecache.h =================================================================== --- libgnomevfs/xdgmimecache.h (revision 5479) +++ libgnomevfs/xdgmimecache.h (working copy) @@ -32,9 +32,20 @@ typedef struct _XdgMimeCache XdgMimeCache; #ifdef XDG_PREFIX -#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) -#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) -#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) +#define _xdg_mime_cache_new_from_file XDG_RESERVED_ENTRY(cache_new_from_file) +#define _xdg_mime_cache_ref XDG_RESERVED_ENTRY(cache_ref) +#define _xdg_mime_cache_unref XDG_RESERVED_ENTRY(cache_unref) +#define _xdg_mime_cache_get_max_buffer_extents XDG_RESERVED_ENTRY(cache_get_max_buffer_extents) +#define _xdg_mime_cache_get_mime_type_for_data XDG_RESERVED_ENTRY(cache_get_mime_type_for_data) +#define _xdg_mime_cache_get_mime_type_for_file XDG_RESERVED_ENTRY(cache_get_mime_type_for_file) +#define _xdg_mime_cache_get_mime_type_from_file_name XDG_RESERVED_ENTRY(cache_get_mime_type_from_file_name) +#define _xdg_mime_cache_get_mime_types_from_file_name XDG_RESERVED_ENTRY(cache_get_mime_types_from_file_name) +#define _xdg_mime_cache_list_mime_parents XDG_RESERVED_ENTRY(cache_list_mime_parents) +#define _xdg_mime_cache_mime_type_subclass XDG_RESERVED_ENTRY(cache_mime_type_subclass) +#define _xdg_mime_cache_unalias_mime_type XDG_RESERVED_ENTRY(cache_unalias_mime_type) +#define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) +#define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) +#define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) #endif extern XdgMimeCache **_caches; @@ -45,9 +56,13 @@ const char *_xdg_mime_cache_get_mime_type_for_data (const void *data, - size_t len); + size_t len, + int *result_prio); const char *_xdg_mime_cache_get_mime_type_for_file (const char *file_name, struct stat *statbuf); +int _xdg_mime_cache_get_mime_types_from_file_name (const char *file_name, + const char *mime_types[], + int n_mime_types); const char *_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name); int _xdg_mime_cache_is_valid_mime_type (const char *mime_type); int _xdg_mime_cache_mime_type_equal (const char *mime_a, @@ -59,5 +74,8 @@ char **_xdg_mime_cache_list_mime_parents (const char *mime); const char *_xdg_mime_cache_unalias_mime_type (const char *mime); int _xdg_mime_cache_get_max_buffer_extents (void); +const char *_xdg_mime_cache_get_icon (const char *mime); +const char *_xdg_mime_cache_get_generic_icon (const char *mime); +void _xdg_mime_cache_glob_dump (void); #endif /* __XDG_MIME_CACHE_H__ */ Index: libgnomevfs/gnome-vfs-mime.c =================================================================== --- libgnomevfs/gnome-vfs-mime.c (revision 5479) +++ libgnomevfs/gnome-vfs-mime.c (working copy) @@ -236,6 +236,7 @@ int max_extents; GnomeVFSResult result = GNOME_VFS_OK; const char *mime_type; + int prio; G_LOCK (gnome_vfs_mime_mutex); max_extents = xdg_mime_get_max_buffer_extents (); @@ -250,7 +251,7 @@ } G_LOCK (gnome_vfs_mime_mutex); - mime_type = xdg_mime_get_mime_type_for_data (buffer->buffer, buffer->buffer_length); + mime_type = xdg_mime_get_mime_type_for_data (buffer->buffer, buffer->buffer_length, &prio); G_UNLOCK (gnome_vfs_mime_mutex); Index: libgnomevfs/xdgmimeparent.c =================================================================== --- libgnomevfs/xdgmimeparent.c (revision 5479) +++ libgnomevfs/xdgmimeparent.c (working copy) @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "xdgmimeparent.h" Index: libgnomevfs/xdgmimeparent.h =================================================================== --- libgnomevfs/xdgmimeparent.h (revision 5479) +++ libgnomevfs/xdgmimeparent.h (working copy) @@ -33,10 +33,11 @@ typedef struct XdgParentList XdgParentList; #ifdef XDG_PREFIX -#define _xdg_mime_parent_read_from_file XDG_ENTRY(parent_read_from_file) -#define _xdg_mime_parent_list_new XDG_ENTRY(parent_list_new) -#define _xdg_mime_parent_list_free XDG_ENTRY(parent_list_free) -#define _xdg_mime_parent_list_lookup XDG_ENTRY(parent_list_lookup) +#define _xdg_mime_parent_read_from_file XDG_RESERVED_ENTRY(parent_read_from_file) +#define _xdg_mime_parent_list_new XDG_RESERVED_ENTRY(parent_list_new) +#define _xdg_mime_parent_list_free XDG_RESERVED_ENTRY(parent_list_free) +#define _xdg_mime_parent_list_lookup XDG_RESERVED_ENTRY(parent_list_lookup) +#define _xdg_mime_parent_list_dump XDG_RESERVED_ENTRY(parent_list_dump) #endif void _xdg_mime_parent_read_from_file (XdgParentList *list, Index: libgnomevfs/xdgmimeglob.c =================================================================== --- libgnomevfs/xdgmimeglob.c (revision 5479) +++ libgnomevfs/xdgmimeglob.c (working copy) @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "xdgmimeglob.h" @@ -52,6 +52,7 @@ { xdg_unichar_t character; const char *mime_type; + int weight; XdgGlobHashNode *next; XdgGlobHashNode *child; }; @@ -59,6 +60,7 @@ { const char *data; const char *mime_type; + int weight; XdgGlobList *next; }; @@ -107,7 +109,8 @@ static XdgGlobList * _xdg_glob_list_append (XdgGlobList *glob_list, void *data, - const char *mime_type) + const char *mime_type, + int weight) { XdgGlobList *new_element; XdgGlobList *tmp_element; @@ -115,6 +118,7 @@ new_element = _xdg_glob_list_new (); new_element->data = data; new_element->mime_type = mime_type; + new_element->weight = weight; if (glob_list == NULL) return new_element; @@ -127,23 +131,6 @@ return glob_list; } -#if 0 -static XdgGlobList * -_xdg_glob_list_prepend (XdgGlobList *glob_list, - void *data, - const char *mime_type) -{ - XdgGlobList *new_element; - - new_element = _xdg_glob_list_new (); - new_element->data = data; - new_element->next = glob_list; - new_element->mime_type = mime_type; - - return new_element; -} -#endif - /* XdgGlobHashNode */ @@ -167,7 +154,7 @@ printf ("%c", (char)glob_hash_node->character); if (glob_hash_node->mime_type) - printf (" - %s\n", glob_hash_node->mime_type); + printf (" - %s %d\n", glob_hash_node->mime_type, glob_hash_node->weight); else printf ("\n"); if (glob_hash_node->child) @@ -177,14 +164,15 @@ } static XdgGlobHashNode * -_xdg_glob_hash_insert_text (XdgGlobHashNode *glob_hash_node, - const char *text, - const char *mime_type) +_xdg_glob_hash_insert_ucs4 (XdgGlobHashNode *glob_hash_node, + xdg_unichar_t *text, + const char *mime_type, + int weight) { XdgGlobHashNode *node; xdg_unichar_t character; - character = _xdg_utf8_to_ucs4 (text); + character = text[0]; if ((glob_hash_node == NULL) || (character < glob_hash_node->character)) @@ -238,8 +226,8 @@ } } - text = _xdg_utf8_next_char (text); - if (*text == '\000') + text++; + if (*text == 0) { if (node->mime_type) { @@ -249,7 +237,7 @@ int found_node = FALSE; child = node->child; - while (child && child->character == '\0') + while (child && child->character == 0) { if (strcmp (child->mime_type, mime_type) == 0) { @@ -262,8 +250,9 @@ if (!found_node) { child = _xdg_glob_hash_node_new (); - child->character = '\000'; - child->mime_type = mime_type; + child->character = 0; + child->mime_type = strdup (mime_type); + child->weight = weight; child->child = NULL; child->next = node->child; node->child = child; @@ -272,21 +261,46 @@ } else { - node->mime_type = mime_type; + node->mime_type = strdup (mime_type); + node->weight = weight; } } else { - node->child = _xdg_glob_hash_insert_text (node->child, text, mime_type); + node->child = _xdg_glob_hash_insert_ucs4 (node->child, text, mime_type, weight); } return glob_hash_node; } +/* glob must be valid UTF-8 */ +static XdgGlobHashNode * +_xdg_glob_hash_insert_text (XdgGlobHashNode *glob_hash_node, + const char *text, + const char *mime_type, + int weight) +{ + XdgGlobHashNode *node; + xdg_unichar_t *unitext; + int len; + + unitext = _xdg_convert_to_ucs4 (text, &len); + _xdg_reverse_ucs4 (unitext, len); + node = _xdg_glob_hash_insert_ucs4 (glob_hash_node, unitext, mime_type, weight); + free (unitext); + return node; +} + +typedef struct { + const char *mime; + int weight; +} MimeWeight; + static int _xdg_glob_hash_node_lookup_file_name (XdgGlobHashNode *glob_hash_node, - const char *file_name, + xdg_unichar_t *file_name, + int len, int ignore_case, - const char *mime_types[], + MimeWeight mime_types[], int n_mime_types) { int n; @@ -296,36 +310,45 @@ if (glob_hash_node == NULL) return 0; - character = _xdg_utf8_to_ucs4 (file_name); + character = file_name[len - 1]; if (ignore_case) character = _xdg_ucs4_to_lower(character); for (node = glob_hash_node; node && character >= node->character; node = node->next) { if (character == node->character) - { - file_name = _xdg_utf8_next_char (file_name); - if (*file_name == '\000') + { + len--; + n = 0; + if (len > 0) { - n = 0; + n = _xdg_glob_hash_node_lookup_file_name (node->child, + file_name, + len, + ignore_case, + mime_types, + n_mime_types); + } + if (n == 0) + { if (node->mime_type) - mime_types[n++] = node->mime_type; + { + mime_types[n].mime = node->mime_type; + mime_types[n].weight = node->weight; + n++; + } node = node->child; while (n < n_mime_types && node && node->character == 0) { if (node->mime_type) - mime_types[n++] = node->mime_type; + { + mime_types[n].mime = node->mime_type; + mime_types[n].weight = node->weight; + n++; + } node = node->next; } } - else - { - n = _xdg_glob_hash_node_lookup_file_name (node->child, - file_name, - ignore_case, - mime_types, - n_mime_types); - } return n; } } @@ -333,6 +356,14 @@ return 0; } +static int compare_mime_weight (const void *a, const void *b) +{ + const MimeWeight *aa = (const MimeWeight *)a; + const MimeWeight *bb = (const MimeWeight *)b; + + return aa->weight - bb->weight; +} + int _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash, const char *file_name, @@ -340,15 +371,18 @@ int n_mime_types) { XdgGlobList *list; - const char *ptr; - char stopchars[128]; int i, n; - XdgGlobHashNode *node; + MimeWeight mimes[10]; + int n_mimes = 10; + xdg_unichar_t *ucs4; + int len; /* First, check the literals */ assert (file_name != NULL && n_mime_types > 0); + n = 0; + for (list = glob_hash->literal_list; list; list = list->next) { if (strcmp ((const char *)list->data, file_name) == 0) @@ -358,38 +392,36 @@ } } - i = 0; - for (node = glob_hash->simple_node; node; node = node->next) - { - if (node->character < 128) - stopchars[i++] = (char)node->character; - } - stopchars[i] = '\0'; - - ptr = strpbrk (file_name, stopchars); - while (ptr) - { - n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ptr, FALSE, - mime_types, n_mime_types); - if (n > 0) - return n; - - n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ptr, TRUE, - mime_types, n_mime_types); - if (n > 0) - return n; - - ptr = strpbrk (ptr + 1, stopchars); - } + ucs4 = _xdg_convert_to_ucs4 (file_name, &len); + n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ucs4, len, FALSE, + mimes, n_mimes); + if (n == 0) + n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ucs4, len, TRUE, + mimes, n_mimes); + free(ucs4); /* FIXME: Not UTF-8 safe */ - n = 0; - for (list = glob_hash->full_list; list && n < n_mime_types; list = list->next) + if (n == 0) { - if (fnmatch ((const char *)list->data, file_name, 0) == 0) - mime_types[n++] = list->mime_type; + for (list = glob_hash->full_list; list && n < n_mime_types; list = list->next) + { + if (fnmatch ((const char *)list->data, file_name, 0) == 0) + { + mimes[n].mime = list->mime_type; + mimes[n].weight = list->weight; + n++; + } + } } + qsort (mimes, n, sizeof (MimeWeight), compare_mime_weight); + + if (n_mime_types < n) + n = n_mime_types; + + for (i = 0; i < n; i++) + mime_types[i] = mimes[i].mime; + return n; } @@ -442,7 +474,7 @@ ptr = glob; - while (*ptr != '\000') + while (*ptr != '\0') { if (*ptr == '*' && first_char) maybe_in_simple_glob = TRUE; @@ -462,7 +494,8 @@ void _xdg_glob_hash_append_glob (XdgGlobHash *glob_hash, const char *glob, - const char *mime_type) + const char *mime_type, + int weight) { XdgGlobType type; @@ -474,13 +507,13 @@ switch (type) { case XDG_GLOB_LITERAL: - glob_hash->literal_list = _xdg_glob_list_append (glob_hash->literal_list, strdup (glob), strdup (mime_type)); + glob_hash->literal_list = _xdg_glob_list_append (glob_hash->literal_list, strdup (glob), strdup (mime_type), weight); break; case XDG_GLOB_SIMPLE: - glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, strdup (mime_type)); + glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, mime_type, weight); break; case XDG_GLOB_FULL: - glob_hash->full_list = _xdg_glob_list_append (glob_hash->full_list, strdup (glob), strdup (mime_type)); + glob_hash->full_list = _xdg_glob_list_append (glob_hash->full_list, strdup (glob), strdup (mime_type), weight); break; } } @@ -490,27 +523,34 @@ { XdgGlobList *list; printf ("LITERAL STRINGS\n"); - if (glob_hash->literal_list == NULL) + if (!glob_hash || glob_hash->literal_list == NULL) { printf (" None\n"); } else { for (list = glob_hash->literal_list; list; list = list->next) - printf (" %s - %s\n", (char *)list->data, list->mime_type); + printf (" %s - %s %d\n", (char *)list->data, list->mime_type, list->weight); } printf ("\nSIMPLE GLOBS\n"); - _xdg_glob_hash_node_dump (glob_hash->simple_node, 4); + if (!glob_hash || glob_hash->simple_node == NULL) + { + printf (" None\n"); + } + else + { + _xdg_glob_hash_node_dump (glob_hash->simple_node, 4); + } printf ("\nFULL GLOBS\n"); - if (glob_hash->full_list == NULL) + if (!glob_hash || glob_hash->full_list == NULL) { printf (" None\n"); } else { for (list = glob_hash->full_list; list; list = list->next) - printf (" %s - %s\n", (char *)list->data, list->mime_type); + printf (" %s - %s %d\n", (char *)list->data, list->mime_type, list->weight); } } @@ -531,16 +571,33 @@ * Blah */ while (fgets (line, 255, glob_file) != NULL) { - char *colon; + char *colon, *colon2; + char *mimetype, *glob; + int weight; + if (line[0] == '#') continue; colon = strchr (line, ':'); if (colon == NULL) continue; - *(colon++) = '\000'; - colon[strlen (colon) -1] = '\000'; - _xdg_glob_hash_append_glob (glob_hash, colon, line); + *(colon++) = '\0'; + colon[strlen (colon) -1] = '\0'; + colon2 = strchr (colon, ':'); + if (colon2) + { + *(colon2++) = '\000'; + weight = atoi (line); + mimetype = colon; + glob = colon2; + } + else + { + weight = 50; + mimetype = line; + glob = colon; + } + _xdg_glob_hash_append_glob (glob_hash, glob, mimetype, weight); } fclose (glob_file); Index: libgnomevfs/xdgmimeglob.h =================================================================== --- libgnomevfs/xdgmimeglob.h (revision 5479) +++ libgnomevfs/xdgmimeglob.h (working copy) @@ -41,13 +41,13 @@ #ifdef XDG_PREFIX -#define _xdg_mime_glob_read_from_file XDG_ENTRY(glob_read_from_file) -#define _xdg_glob_hash_new XDG_ENTRY(hash_new) -#define _xdg_glob_hash_free XDG_ENTRY(hash_free) -#define _xdg_glob_hash_lookup_file_name XDG_ENTRY(hash_lookup_file_name) -#define _xdg_glob_hash_append_glob XDG_ENTRY(hash_append_glob) -#define _xdg_glob_determine_type XDG_ENTRY(determine_type) -#define _xdg_glob_hash_dump XDG_ENTRY(hash_dump) +#define _xdg_mime_glob_read_from_file XDG_RESERVED_ENTRY(glob_read_from_file) +#define _xdg_glob_hash_new XDG_RESERVED_ENTRY(hash_new) +#define _xdg_glob_hash_free XDG_RESERVED_ENTRY(hash_free) +#define _xdg_glob_hash_lookup_file_name XDG_RESERVED_ENTRY(hash_lookup_file_name) +#define _xdg_glob_hash_append_glob XDG_RESERVED_ENTRY(hash_append_glob) +#define _xdg_glob_determine_type XDG_RESERVED_ENTRY(determine_type) +#define _xdg_glob_hash_dump XDG_RESERVED_ENTRY(hash_dump) #endif void _xdg_mime_glob_read_from_file (XdgGlobHash *glob_hash, @@ -60,7 +60,8 @@ int n_mime_types); void _xdg_glob_hash_append_glob (XdgGlobHash *glob_hash, const char *glob, - const char *mime_type); + const char *mime_type, + int weight); XdgGlobType _xdg_glob_determine_type (const char *glob); void _xdg_glob_hash_dump (XdgGlobHash *glob_hash); Index: libgnomevfs/xdgmimealias.c =================================================================== --- libgnomevfs/xdgmimealias.c (revision 5479) +++ libgnomevfs/xdgmimealias.c (working copy) @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "xdgmimealias.h" @@ -105,7 +105,7 @@ if (list->n_aliases > 0) { key.alias = (char *)alias; - key.mime_type = 0; + key.mime_type = NULL; entry = bsearch (&key, list->aliases, list->n_aliases, sizeof (XdgAlias), alias_entry_cmp); Index: libgnomevfs/xdgmimealias.h =================================================================== --- libgnomevfs/xdgmimealias.h (revision 5479) +++ libgnomevfs/xdgmimealias.h (working copy) @@ -33,10 +33,11 @@ typedef struct XdgAliasList XdgAliasList; #ifdef XDG_PREFIX -#define _xdg_mime_alias_read_from_file XDG_ENTRY(alias_read_from_file) -#define _xdg_mime_alias_list_new XDG_ENTRY(alias_list_new) -#define _xdg_mime_alias_list_free XDG_ENTRY(alias_list_free) -#define _xdg_mime_alias_list_lookup XDG_ENTRY(alias_list_lookup) +#define _xdg_mime_alias_read_from_file XDG_RESERVED_ENTRY(alias_read_from_file) +#define _xdg_mime_alias_list_new XDG_RESERVED_ENTRY(alias_list_new) +#define _xdg_mime_alias_list_free XDG_RESERVED_ENTRY(alias_list_free) +#define _xdg_mime_alias_list_lookup XDG_RESERVED_ENTRY(alias_list_lookup) +#define _xdg_mime_alias_list_dump XDG_RESERVED_ENTRY(alias_list_dump) #endif void _xdg_mime_alias_read_from_file (XdgAliasList *list, Index: libgnomevfs/xdgmimemagic.c =================================================================== --- libgnomevfs/xdgmimemagic.c (revision 5479) +++ libgnomevfs/xdgmimemagic.c (working copy) @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include @@ -47,6 +47,10 @@ #define TRUE (!FALSE) #endif +#if !defined getc_unlocked && !defined HAVE_GETC_UNLOCKED +# define getc_unlocked(fp) getc (fp) +#endif + typedef struct XdgMimeMagicMatch XdgMimeMagicMatch; typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet; @@ -472,9 +476,7 @@ /* We clean up the matchlet, byte swapping if needed */ if (matchlet->word_size > 1) { -#if LITTLE_ENDIAN int i; -#endif if (matchlet->value_length % matchlet->word_size != 0) { _xdg_mime_magic_matchlet_free (matchlet); @@ -654,34 +656,24 @@ _xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic, const void *data, size_t len, + int *result_prio, const char *mime_types[], int n_mime_types) { XdgMimeMagicMatch *match; const char *mime_type; int n; - int priority; - int had_match; + int prio; + prio = 0; mime_type = NULL; - priority = 0; - had_match = 0; for (match = mime_magic->match_list; match; match = match->next) { if (_xdg_mime_magic_match_compare_to_data (match, data, len)) { - if (!had_match || match->priority > priority || - (mime_type != NULL && _xdg_mime_mime_type_subclass (match->mime_type, mime_type))) - { - mime_type = match->mime_type; - priority = match->priority; - } - else if (had_match && match->priority == priority) - /* multiple unrelated patterns with the same priority matched, - * so we can't tell what type this is. */ - mime_type = NULL; - - had_match = 1; + prio = match->priority; + mime_type = match->mime_type; + break; } else { @@ -702,6 +694,9 @@ mime_type = mime_types[n]; } } + + if (result_prio) + *result_prio = prio; return mime_type; } Index: libgnomevfs/xdgmimemagic.h =================================================================== --- libgnomevfs/xdgmimemagic.h (revision 5479) +++ libgnomevfs/xdgmimemagic.h (working copy) @@ -33,12 +33,12 @@ typedef struct XdgMimeMagic XdgMimeMagic; #ifdef XDG_PREFIX -#define _xdg_mime_glob_read_from_file XDG_ENTRY(glob_read_from_file) -#define _xdg_mime_magic_new XDG_ENTRY(magic_new) -#define _xdg_mime_magic_read_from_file XDG_ENTRY(magic_read_from_file) -#define _xdg_mime_magic_free XDG_ENTRY(magic_free) -#define _xdg_mime_magic_get_buffer_extents XDG_ENTRY(magic_get_buffer_extents) -#define _xdg_mime_magic_lookup_data XDG_ENTRY(magic_lookup_data) +#define _xdg_mime_glob_read_from_file XDG_RESERVED_ENTRY(glob_read_from_file) +#define _xdg_mime_magic_new XDG_RESERVED_ENTRY(magic_new) +#define _xdg_mime_magic_read_from_file XDG_RESERVED_ENTRY(magic_read_from_file) +#define _xdg_mime_magic_free XDG_RESERVED_ENTRY(magic_free) +#define _xdg_mime_magic_get_buffer_extents XDG_RESERVED_ENTRY(magic_get_buffer_extents) +#define _xdg_mime_magic_lookup_data XDG_RESERVED_ENTRY(magic_lookup_data) #endif @@ -50,6 +50,7 @@ const char *_xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic, const void *data, size_t len, + int *result_prio, const char *mime_types[], int n_mime_types); Index: libgnomevfs/xdgmime.c =================================================================== --- libgnomevfs/xdgmime.c (revision 5479) +++ libgnomevfs/xdgmime.c (working copy) @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "xdgmime.h" @@ -34,6 +34,7 @@ #include "xdgmimeglob.h" #include "xdgmimemagic.h" #include "xdgmimealias.h" +#include "xdgmimeicon.h" #include "xdgmimeparent.h" #include "xdgmimecache.h" #include @@ -56,6 +57,8 @@ static XdgParentList *parent_list = NULL; static XdgDirTimeList *dir_time_list = NULL; static XdgCallbackList *callback_list = NULL; +static XdgIconList *icon_list = NULL; +static XdgIconList *generic_icon_list = NULL; XdgMimeCache **_caches = NULL; static int n_caches = 0; @@ -155,8 +158,8 @@ } free (file_name); - file_name = malloc (strlen (directory) + strlen ("/mime/globs") + 1); - strcpy (file_name, directory); strcat (file_name, "/mime/globs"); + file_name = malloc (strlen (directory) + strlen ("/mime/globs2") + 1); + strcpy (file_name, directory); strcat (file_name, "/mime/globs2"); if (stat (file_name, &st) == 0) { _xdg_mime_glob_read_from_file (global_hash, file_name); @@ -165,6 +168,17 @@ else { free (file_name); + file_name = malloc (strlen (directory) + strlen ("/mime/globs") + 1); + strcpy (file_name, directory); strcat (file_name, "/mime/globs"); + if (stat (file_name, &st) == 0) + { + _xdg_mime_glob_read_from_file (global_hash, file_name); + xdg_dir_time_list_add (file_name, st.st_mtime); + } + else + { + free (file_name); + } } file_name = malloc (strlen (directory) + strlen ("/mime/magic") + 1); @@ -189,6 +203,16 @@ _xdg_mime_parent_read_from_file (parent_list, file_name); free (file_name); + file_name = malloc (strlen (directory) + strlen ("/mime/icons") + 1); + strcpy (file_name, directory); strcat (file_name, "/mime/icons"); + _xdg_mime_icon_read_from_file (icon_list, file_name); + free (file_name); + + file_name = malloc (strlen (directory) + strlen ("/mime/generic-icons") + 1); + strcpy (file_name, directory); strcat (file_name, "/mime/generic-icons"); + _xdg_mime_icon_read_from_file (generic_icon_list, file_name); + free (file_name); + return FALSE; /* Keep processing */ } @@ -423,6 +447,8 @@ global_magic = _xdg_mime_magic_new (); alias_list = _xdg_mime_alias_list_new (); parent_list = _xdg_mime_parent_list_new (); + icon_list = _xdg_mime_icon_list_new (); + generic_icon_list = _xdg_mime_icon_list_new (); xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_mime_init_from_directory, NULL); @@ -433,16 +459,17 @@ const char * xdg_mime_get_mime_type_for_data (const void *data, - size_t len) + size_t len, + int *result_prio) { const char *mime_type; xdg_mime_init (); if (_caches) - return _xdg_mime_cache_get_mime_type_for_data (data, len); + return _xdg_mime_cache_get_mime_type_for_data (data, len, result_prio); - mime_type = _xdg_mime_magic_lookup_data (global_magic, data, len, NULL, 0); + mime_type = _xdg_mime_magic_lookup_data (global_magic, data, len, result_prio, NULL, 0); if (mime_type) return mime_type; @@ -517,7 +544,7 @@ return XDG_MIME_TYPE_UNKNOWN; } - mime_type = _xdg_mime_magic_lookup_data (global_magic, data, bytes_read, + mime_type = _xdg_mime_magic_lookup_data (global_magic, data, bytes_read, NULL, mime_types, n); free (data); @@ -546,6 +573,19 @@ } int +xdg_mime_get_mime_types_from_file_name (const char *file_name, + const char *mime_types[], + int n_mime_types) +{ + xdg_mime_init (); + + if (_caches) + return _xdg_mime_cache_get_mime_types_from_file_name (file_name, mime_types, n_mime_types); + + return _xdg_glob_hash_lookup_file_name (global_hash, file_name, mime_types, n_mime_types); +} + +int xdg_mime_is_valid_mime_type (const char *mime_type) { /* FIXME: We should make this a better test @@ -782,10 +822,18 @@ void xdg_mime_dump (void) { + xdg_mime_init(); + printf ("*** ALIASES ***\n\n"); _xdg_mime_alias_list_dump (alias_list); printf ("\n*** PARENTS ***\n\n"); _xdg_mime_parent_list_dump (parent_list); + printf ("\n*** CACHE ***\n\n"); + _xdg_glob_hash_dump (global_hash); + printf ("\n*** GLOBS ***\n\n"); + _xdg_glob_hash_dump (global_hash); + printf ("\n*** GLOBS REVERSE TREE ***\n\n"); + _xdg_mime_cache_glob_dump (); } @@ -839,3 +887,32 @@ } } } + +const char * +xdg_mime_get_icon (const char *mime) +{ + const char *icon; + + xdg_mime_init (); + + if (_caches) + return _xdg_mime_cache_get_icon (mime); + + icon = _xdg_mime_icon_list_lookup (icon_list, mime); + + if (!icon) + icon = xdg_mime_get_generic_icon (mime); + + return icon; +} + +const char * +xdg_mime_get_generic_icon (const char *mime) +{ + xdg_mime_init (); + + if (_caches) + return _xdg_mime_cache_get_generic_icon (mime); + + return _xdg_mime_icon_list_lookup (generic_icon_list, mime); +} Index: libgnomevfs/xdgmime.h =================================================================== --- libgnomevfs/xdgmime.h (revision 5479) +++ libgnomevfs/xdgmime.h (working copy) @@ -40,6 +40,10 @@ #define XDG_ENTRY(func) _XDG_ENTRY2(XDG_PREFIX,func) #define _XDG_ENTRY2(prefix,func) _XDG_ENTRY3(prefix,func) #define _XDG_ENTRY3(prefix,func) prefix##_##func + +#define XDG_RESERVED_ENTRY(func) _XDG_RESERVED_ENTRY2(XDG_PREFIX,func) +#define _XDG_RESERVED_ENTRY2(prefix,func) _XDG_RESERVED_ENTRY3(prefix,func) +#define _XDG_RESERVED_ENTRY3(prefix,func) _##prefix##_##func #endif typedef void (*XdgMimeCallback) (void *user_data); @@ -50,32 +54,40 @@ #define xdg_mime_get_mime_type_for_data XDG_ENTRY(get_mime_type_for_data) #define xdg_mime_get_mime_type_for_file XDG_ENTRY(get_mime_type_for_file) #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name) +#define xdg_mime_get_mime_types_from_file_name XDG_ENTRY(get_mime_types_from_file_name) #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type) #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal) -#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p) #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal) #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass) -#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p) #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents) #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents) #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type) -#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p) #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents) #define xdg_mime_shutdown XDG_ENTRY(shutdown) #define xdg_mime_dump XDG_ENTRY(dump) #define xdg_mime_register_reload_callback XDG_ENTRY(register_reload_callback) #define xdg_mime_remove_callback XDG_ENTRY(remove_callback) #define xdg_mime_type_unknown XDG_ENTRY(type_unknown) +#define xdg_mime_get_icon XDG_ENTRY(get_icon) +#define xdg_mime_get_generic_icon XDG_ENTRY(get_generic_icon) + +#define _xdg_mime_mime_type_equal XDG_RESERVED_ENTRY(mime_type_equal) +#define _xdg_mime_mime_type_subclass XDG_RESERVED_ENTRY(mime_type_subclass) +#define _xdg_mime_unalias_mime_type XDG_RESERVED_ENTRY(unalias_mime_type) #endif extern const char xdg_mime_type_unknown[]; #define XDG_MIME_TYPE_UNKNOWN xdg_mime_type_unknown const char *xdg_mime_get_mime_type_for_data (const void *data, - size_t len); + size_t len, + int *result_prio); const char *xdg_mime_get_mime_type_for_file (const char *file_name, struct stat *statbuf); const char *xdg_mime_get_mime_type_from_file_name (const char *file_name); +int xdg_mime_get_mime_types_from_file_name(const char *file_name, + const char *mime_types[], + int n_mime_types); int xdg_mime_is_valid_mime_type (const char *mime_type); int xdg_mime_mime_type_equal (const char *mime_a, const char *mime_b); @@ -91,6 +103,8 @@ const char **xdg_mime_get_mime_parents (const char *mime); char ** xdg_mime_list_mime_parents (const char *mime); const char *xdg_mime_unalias_mime_type (const char *mime); +const char *xdg_mime_get_icon (const char *mime); +const char *xdg_mime_get_generic_icon (const char *mime); int xdg_mime_get_max_buffer_extents (void); void xdg_mime_shutdown (void); void xdg_mime_dump (void); @@ -104,7 +118,7 @@ const char *mime_b); int _xdg_mime_mime_type_subclass (const char *mime, const char *base); -const char *_xdg_mime_unalias_mime_type (const char *mime); +const char *_xdg_mime_unalias_mime_type (const char *mime); #ifdef __cplusplus Index: libgnomevfs/xdgmimeint.c =================================================================== --- libgnomevfs/xdgmimeint.c (revision 5479) +++ libgnomevfs/xdgmimeint.c (working copy) @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "xdgmimeint.h" @@ -152,3 +152,40 @@ else return base_name + 1; } + +xdg_unichar_t * +_xdg_convert_to_ucs4 (const char *source, int *len) +{ + xdg_unichar_t *out; + int i; + const char *p; + + out = malloc (sizeof (xdg_unichar_t) * (strlen (source) + 1)); + + p = source; + i = 0; + while (*p) + { + out[i++] = _xdg_utf8_to_ucs4 (p); + p = _xdg_utf8_next_char (p); + } + out[i] = 0; + *len = i; + + return out; +} + +void +_xdg_reverse_ucs4 (xdg_unichar_t *source, int len) +{ + xdg_unichar_t c; + int i; + + for (i = 0; i < len - i - 1; i++) + { + c = source[i]; + source[i] = source[len - i - 1]; + source[len - i - 1] = c; + } +} + Index: libgnomevfs/xdgmimeint.h =================================================================== --- libgnomevfs/xdgmimeint.h (revision 5479) +++ libgnomevfs/xdgmimeint.h (working copy) @@ -46,11 +46,13 @@ typedef unsigned int xdg_uint32_t; #ifdef XDG_PREFIX -#define _xdg_utf8_skip XDG_ENTRY(utf8_skip) -#define _xdg_utf8_to_ucs4 XDG_ENTRY(utf8_to_ucs4) -#define _xdg_ucs4_to_lower XDG_ENTRY(ucs4_to_lower) -#define _xdg_utf8_validate XDG_ENTRY(utf8_validate) -#define _xdg_get_base_name XDG_ENTRY(get_ase_name) +#define _xdg_utf8_skip XDG_RESERVED_ENTRY(utf8_skip) +#define _xdg_utf8_to_ucs4 XDG_RESERVED_ENTRY(utf8_to_ucs4) +#define _xdg_ucs4_to_lower XDG_RESERVED_ENTRY(ucs4_to_lower) +#define _xdg_utf8_validate XDG_RESERVED_ENTRY(utf8_validate) +#define _xdg_get_base_name XDG_RESERVED_ENTRY(get_base_name) +#define _xdg_convert_to_ucs4 XDG_RESERVED_ENTRY(convert_to_ucs4) +#define _xdg_reverse_ucs4 XDG_RESERVED_ENTRY(reverse_ucs4) #endif #define SWAP_BE16_TO_LE16(val) (xdg_uint16_t)(((xdg_uint16_t)(val) << 8)|((xdg_uint16_t)(val) >> 8)) @@ -68,6 +70,8 @@ xdg_unichar_t _xdg_utf8_to_ucs4 (const char *source); xdg_unichar_t _xdg_ucs4_to_lower (xdg_unichar_t source); int _xdg_utf8_validate (const char *source); +xdg_unichar_t *_xdg_convert_to_ucs4 (const char *source, int *len); +void _xdg_reverse_ucs4 (xdg_unichar_t *source, int len); const char *_xdg_get_base_name (const char *file_name); #endif /* __XDG_MIME_INT_H__ */ Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- gnome-vfs2.spec 23 Jul 2008 17:06:27 -0000 1.179 +++ gnome-vfs2.spec 24 Jul 2008 04:44:49 -0000 1.180 @@ -14,7 +14,7 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.22.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ # the daemon and the library are LGPLv2+ # the modules are LGPLv2+ and GPLv2+ @@ -78,6 +78,9 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=335241 Patch300: gnome-vfs-2.20.0-ignore-certain-mountpoints.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=544485 +Patch402: xdgmime.patch + %description GNOME VFS is the GNOME virtual file system. It is the foundation of the Nautilus file manager. It provides a modular architecture and @@ -131,6 +134,8 @@ %patch300 -p1 -b .ignore-certain-mount-points +%patch402 -p0 -b .xdgmime + # for patch 10 autoheader autoconf @@ -236,6 +241,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Thu Jul 24 2008 Matthias Clasen - 2.22.0-4 +- Use newer xdgmime + * Wed Jul 23 2008 Tom "spot" Callaway - 2.22.0-3 - fix license tag - don't apply Patch201, upstreamed From fedora-extras-commits at redhat.com Thu Jul 24 05:13:32 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 24 Jul 2008 05:13:32 GMT Subject: comps/po it.po,1.16,1.17 Message-ID: <200807240513.m6O5DWFL021483@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21451/po Modified Files: it.po Log Message: 2008-07-24 Francesco Tombolini (via tombo at fedoraproject.org) * po/it.po: Small update to italian translation Index: it.po =================================================================== RCS file: /cvs/pkgs/comps/po/it.po,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- it.po 17 Jul 2008 18:31:24 -0000 1.16 +++ it.po 24 Jul 2008 05:13:02 -0000 1.17 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2008-06-24 06:22+0200\n" +"POT-Creation-Date: 2008-07-24 02:42+0000\n" +"PO-Revision-Date: 2008-07-24 07:11+0200\n" "Last-Translator: Francesco Tombolini \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -1179,7 +1179,7 @@ #: ../comps-f10.xml.in.h:70 msgid "Haskell" -msgstr "" +msgstr "Haskell" #: ../comps-f10.xml.in.h:76 msgid "Input Methods" @@ -1190,9 +1190,8 @@ msgstr "Pacchetti dei metodi di input per l'input di testo internazionale." #: ../comps-f10.xml.in.h:157 -#, fuzzy msgid "Tajik Support" -msgstr "Supporto per il thai" +msgstr "Supporto per il Tajik" #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" @@ -1338,3 +1337,4 @@ #~ msgid "Virtualization Support." #~ msgstr "Supporto per la virtualizzazione." + From fedora-extras-commits at redhat.com Thu Jul 24 06:35:11 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Thu, 24 Jul 2008 06:35:11 GMT Subject: rpms/gdb/F-9 gdb.spec,1.287,1.288 Message-ID: <200807240635.m6O6ZBNp031121@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31061 Modified Files: gdb.spec Log Message: * Thu Jul 24 2008 Jan Kratochvil - 6.8-12 - Temporarily disable attaching to a stopped process (BZ 453688) - To be reintroduced after a fix of the kernel BZ 454404. Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/F-9/gdb.spec,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- gdb.spec 7 Jul 2008 22:49:31 -0000 1.287 +++ gdb.spec 24 Jul 2008 06:34:23 -0000 1.288 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 11%{?_with_upstream:.upstream}%{?dist} +Release: 12%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -504,7 +504,7 @@ %patch247 -p1 %patch249 -p1 %patch254 -p1 -%patch256 -p1 +###%patch256 -p1 %patch258 -p1 %patch260 -p1 %patch261 -p1 @@ -785,6 +785,10 @@ %endif %changelog +* Thu Jul 24 2008 Jan Kratochvil - 6.8-12 +- Temporarily disable attaching to a stopped process (BZ 453688) + - To be reintroduced after a fix of the kernel BZ 454404. + * Tue Jul 8 2008 Jan Kratochvil - 6.8-11 - Fix crash due to calling an inferior function right after a watchpoint stop. From fedora-extras-commits at redhat.com Thu Jul 24 07:17:26 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Thu, 24 Jul 2008 07:17:26 GMT Subject: rpms/libspe2/devel import.log, NONE, 1.1 libspe2-2.2.80-doxygen.patch, NONE, 1.1 libspe2.spec, NONE, 1.1 png-mtime.py, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240717.m6O7HQXF007871@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7781/devel Modified Files: .cvsignore sources Added Files: import.log libspe2-2.2.80-doxygen.patch libspe2.spec png-mtime.py Log Message: Initial checkin of libspe2 --- NEW FILE import.log --- libspe2-2_2_80_95-4:HEAD:libspe2-2.2.80.95-4.src.rpm:1216883734 libspe2-2.2.80-doxygen.patch: --- NEW FILE libspe2-2.2.80-doxygen.patch --- Patch by Robert Scheck for libspe2 >= 2.2.80.95, which solves the multilib/multiarch problem by removing the timestamp within the footer from the doxygen generated files. It also removes the LATEX_HEADER definition in order to get doxygen successfully run. --- libspe2-2.2.80/doc/Doxyfile 2008-05-31 15:22:22.000000000 +0200 +++ libspe2-2.2.80/doc/Doxyfile.doxygen 2008-05-31 16:17:00.000000000 +0200 @@ -603,7 +603,7 @@ # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = footer_no_timestamp.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to --- libspe2-2.2.80/doc/Doxyfile 2007-03-21 15:49:59.000000000 +0100 +++ libspe2-2.2.80/doc/Doxyfile.doxygen 2008-05-31 15:22:22.000000000 +0200 @@ -732,7 +732,7 @@ # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = doc/LatexHeader +LATEX_HEADER = # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will --- libspe2-2.2.80/doc/footer_no_timestamp.html 1970-01-01 01:00:00.000000000 +0100 +++ libspe2-2.2.80/doc/footer_no_timestamp.html.multilib 2008-05-31 16:17:00.000000000 +0200 @@ -0,0 +1,5 @@ +
Generated for $projectname by  + +doxygen $doxygenversion
+ + --- NEW FILE libspe2.spec --- %define up_version 2.2.80 %define up_release 95 %define spuinclude %{_includedir}/spu Name: libspe2 Version: %{up_version}.%{up_release} Release: 4 Summary: SPE Runtime Management Library Group: System Environment/Libraries License: LGPLv2+ URL: http://sourceforge.net/projects/libspe/ Source0: http://downloads.sourceforge.net/sourceforge/libspe/%{name}-%{up_version}-%{up_release}.tar.gz Source1: png-mtime.py Patch: libspe2-2.2.80-doxygen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, graphviz, python Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service ExclusiveArch: ppc ppc64 %description SPE Runtime Management Library for the Cell Broadband Engine Architecture. %package devel Summary: SPE Runtime Management Library Group: Development/Libraries Requires: %{name} = %{version}-%{release}, pkgconfig %description devel Header and object files for SPE Runtime Management Library. %ifarch ppc %package -n elfspe2 Summary: Helper for standalong SPE applications Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description -n elfspe2 This tool acts as a standalone loader for spe binaries. %endif %ifarch ppc64 %package adabinding-devel Summary: Ada package files porting libspe headers Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description adabinding-devel Ada package files porting libspe headers Management Library. %endif %prep %setup -q -n %{name}-%{up_version} %patch -p1 -b .doxygen %build # It doesn't understand handling of %{?_smp_mflags} make OPTFLAGS="%{optflags}" SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} %ifarch ppc # It doesn't understand handling of %{?_smp_mflags} make elfspe2-all OPTFLAGS="%{optflags}" SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} %endif # Generate documentation via doxygen including the images pushd doc doxygen # Solve multilib problems by changing the internal PNG timestamp to a reference timestamp; # see http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks for further information. python %{SOURCE1} html/graph_legend.png ARCHITECTURE popd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} speinclude=%{spuinclude} mv -f $RPM_BUILD_ROOT%{_prefix}/adainclude/* $RPM_BUILD_ROOT%{_includedir} %ifarch ppc make elfspe2-install DESTDIR=$RPM_BUILD_ROOT SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} speinclude=%{spuinclude} install -D -m 755 elfspe2.init $RPM_BUILD_ROOT%{_initrddir}/elfspe2 # Ada makes only sense on ppc64 arch rm -f $RPM_BUILD_ROOT%{_includedir}/*.ads %endif # Remove unwanted files, static files and files for %doc rm -f $RPM_BUILD_ROOT%{_includedir}/README-libspe2 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}/libspe.* %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %ifarch ppc %post -n elfspe2 /sbin/chkconfig --add elfspe2 %{_bindir}/elfspe2-register %preun -n elfspe2 if [ $1 -eq 0 ]; then /sbin/service elfspe2 stop > /dev/null 2>&1 || : /sbin/chkconfig --del elfspe2 fi %postun -n elfspe2 if [ $1 -ne 0 ]; then /sbin/service elfspe2 condrestart > /dev/null 2>&1 || : fi %endif %files %defattr(-,root,root) %doc COPYING %{_libdir}/%{name}.so.* %files devel %defattr(-,root,root) %doc PATCH-SUBMITTING-RULES doc/ARCHITECTURE %doc doc/html %{_libdir}/%{name}.so %{_includedir}/*2*.h %{_includedir}/cbea_map.h %{spuinclude} %{_libdir}/pkgconfig/libspe2.pc %ifarch ppc %files -n elfspe2 %defattr(-,root,root) %doc PATCH-SUBMITTING-RULES %{_initrddir}/elfspe2 %{_bindir}/elfspe2-register %{_bindir}/elfspe2-unregister %{_bindir}/elfspe2 %endif %ifarch ppc64 %files adabinding-devel %defattr(-,root,root) %doc ada/README %{_includedir}/libspe2.ads %{_includedir}/libspe2_types.ads %{_includedir}/cbea_map.ads %endif %changelog * Tue Jul 22 2008 Jochen Roth 2.2.80.95-4 - Changed elfspe startup script to be enabled per default * Wed Jul 16 2008 Jochen Roth 2.2.80.95-3 - Changes according to package review comments. * Mon Jun 02 2008 Jochen Roth 2.2.80.95-2 - Repaired rpm build errors * Sat May 31 2008 Robert Scheck 2.2.80.95-1 - Changes to (hopefully) match with Fedora Packaging Guidelines * Fri Apr 11 2008 Jochen Roth 2.2.80-95 - adopted to suit Fedora's packaging guidelines * Mon Aug 13 2007 Gerhard Stenzel 2.2.0-85 - fixes for rpmlint complaints * Thu Nov 24 2005 Arnd Bergmann 1.0.1-3 - initial spec file for fc5 --- NEW FILE png-mtime.py --- #! /usr/bin/python -tt # This script takes a PNG file, and parses the GMT timestamp information from # it. You can then print and/or alter the timestamp, and finally save the new # timestamp information back to the PNG file. # See the __main__ section for API usage. # # CMD line usage: # png-mtime.py [reference-file] # # If the reference file isn't there, it just prints the old timestamp. # # Author: James Antill # Copyright: 2008 # License: MIT, LGPL, new style BSD ... take your pick import os import sys import binascii import struct import time import calendar _PNG_HEADER = "\x89PNG\r\n\x1A\n" class PNG_time: """ For reading, displaying and setting a PNG's modification time. """ _time_chunk = None year = None month = None day = None hour = None minute = None second = None def _read_header(self, fo): """ read header, and make sure this is a png """ header = fo.read(8) if header != _PNG_HEADER: print >>sys.stderr, " Bad HEADER:", header sys.exit(1) self.chunks = 0 self.off = 0 def _read_chunk(self, fo): """ read a chunk, and check the CRC. Then return tuple. """ length = struct.unpack(">I", fo.read(4))[0] rawtype = fo.read(4) chunktype = struct.unpack(">4s", rawtype)[0] rawdata = fo.read(length) data = struct.unpack(">%ss" % length, rawdata)[0] CRC = struct.unpack(">i", fo.read(4))[0] # Check the CRC chk_CRC = binascii.crc32(rawtype + rawdata) if CRC != chk_CRC: print >>sys.stderr, " Bad CRC: %d %d" % (CRC, chk_CRC) sys.exit(1) # print "JDBG: Chunk[%s] = %d %d" % (chunktype, length, CRC) self.chunks += 1 self.off += (4 * 3) + length return (chunktype, length, data, CRC) def _get_time(self, chunktype, length, data): """ Convert a tIME chunk into a time dict. """ if chunktype != "tIME" or length != 7: return False if self._time_chunk is not None: print >>sys.stderr, " Mulitple tIME Chunks %d %d" % (self._time_chunk, self.chunks) sys.exit(1) self._time_chunk = self.chunks self._time_off = self.off - length vals = struct.unpack(">Hbbbbb", data) self.year = vals[0] self.month = vals[1] self.day = vals[2] self.hour = vals[3] self.minute = vals[4] self.second = vals[5] return True def __init__(self, fname): self.fname = fname fo = open(fname) self._read_header(fo) T = "blah" while T != "IEND": (T,l,d,c) = self._read_chunk(fo) self._get_time(T, l, d) if self._time_chunk is None: print >>sys.stderr, " No tIME Chunks" sys.exit(1) def ymdhms(self): """ Returns a tuple of: year, month, day, hour, minute, second. Note that this is all that's stored in the file, and so should be in UTC time. """ return (self.year, self.month, self.day, self.hour, self.minute, self.second) def tm(self): """ Returns a tm tuple for the PNG timestamp data. Note that this is in UTC, as though it's from time.gmtime(). """ return (self.year, self.month, self.day, self.hour, self.minute, self.second, 0, 0, 0) def time(self): """ Returns an Epoch time for the PNG timestamp data. """ return calendar.timegm(self.tm()) def save(self): """ Save the new timestamp information over the old in the PNG file. """ fo = open(self.fname, "r+") fo.seek(self._time_off) ymdhms = self.ymdhms() rawdata = struct.pack(">4sHbbbbb", "tIME", *ymdhms) CRC = binascii.crc32(rawdata) rawCRC = struct.pack(">i", CRC) fo.write(rawdata) fo.write(rawCRC) fo.close() def utime(self): """ Set the st_mtime of the file to the timestamp in the PNG file. """ os.utime(self.fname, (time.time(), self.time())) def set_time_from_file(self, fname): """ Set the PNG timestamp data based on a reference file. """ tm = time.gmtime(os.stat(fname).st_mtime) self.year = tm.tm_year self.month = tm.tm_mon self.day = tm.tm_mday self.hour = tm.tm_hour self.minute = tm.tm_min self.second = tm.tm_sec if __name__ == '__main__': png = PNG_time(sys.argv[1]) # print "JDBG: chunks=%d" % png.chunks print "orig time =", time.ctime(png.time()) if len(sys.argv) > 2: png.set_time_from_file(sys.argv[2]) print "new time =", time.ctime(png.time()) png.save() # Reset the mtime of the file to the modified time of the PNG file. # People might consider it evil to always utime here, but hey! png.utime() Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:53:32 -0000 1.1 +++ .cvsignore 24 Jul 2008 07:16:26 -0000 1.2 @@ -0,0 +1 @@ +libspe2-2.2.80-95.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:53:32 -0000 1.1 +++ sources 24 Jul 2008 07:16:26 -0000 1.2 @@ -0,0 +1 @@ +e534fd24e9c0225519d9dcc11f1ecba2 libspe2-2.2.80-95.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 07:18:40 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 07:18:40 GMT Subject: rpms/afflib/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 afflib.spec, 1.11, 1.12 Message-ID: <200807240718.m6O7IehT007971@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/afflib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7931 Modified Files: .cvsignore sources afflib.spec Log Message: - Update to 3.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Jul 2008 23:00:13 -0000 1.6 +++ .cvsignore 24 Jul 2008 07:17:55 -0000 1.7 @@ -1 +1 @@ -afflib-3.2.3.tar.gz +afflib-3.2.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Jul 2008 23:00:13 -0000 1.6 +++ sources 24 Jul 2008 07:17:55 -0000 1.7 @@ -1 +1 @@ -cb3b5a181adeee5047ded626e5903859 afflib-3.2.3.tar.gz +e6012eb6d276ce3ba59e40e7216d6939 afflib-3.2.5.tar.gz Index: afflib.spec =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- afflib.spec 4 Jul 2008 23:00:13 -0000 1.11 +++ afflib.spec 24 Jul 2008 07:17:55 -0000 1.12 @@ -1,5 +1,5 @@ Name: afflib -Version: 3.2.3 +Version: 3.2.5 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -125,6 +125,9 @@ %changelog +* Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-1 +- Update to 3.2.5 + * Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 3.2.3-1 - Update to 3.2.3 From fedora-extras-commits at redhat.com Thu Jul 24 07:37:02 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 07:37:02 GMT Subject: rpms/afflib/devel afflib.spec, 1.12, 1.13 afflib-3.2.3-nos3.patch, 1.1, NONE Message-ID: <200807240737.m6O7b2VG008543@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/afflib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8506 Modified Files: afflib.spec Removed Files: afflib-3.2.3-nos3.patch Log Message: - Remove nos3 patch Index: afflib.spec =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- afflib.spec 24 Jul 2008 07:17:55 -0000 1.12 +++ afflib.spec 24 Jul 2008 07:36:14 -0000 1.13 @@ -1,6 +1,6 @@ Name: afflib Version: 3.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -9,7 +9,6 @@ Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch -Patch2: afflib-3.2.3-nos3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -61,7 +60,6 @@ %setup -q %patch0 -p1 -b .WCtype %patch1 -p1 -b .gcc43 -%patch2 -p1 -b .nos3 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -125,6 +123,9 @@ %changelog +* Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-2 +- Remove nos3 patch + * Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-1 - Update to 3.2.5 --- afflib-3.2.3-nos3.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 07:56:53 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Thu, 24 Jul 2008 07:56:53 GMT Subject: rpms/python-jinja2/devel import.log, NONE, 1.1 python-jinja2-docs.patch, NONE, 1.1 python-jinja2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240756.m6O7urqB009622@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/python-jinja2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9579/devel Modified Files: .cvsignore sources Added Files: import.log python-jinja2-docs.patch python-jinja2.spec Log Message: New package. --- NEW FILE import.log --- python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150 python-jinja2-docs.patch: --- NEW FILE python-jinja2-docs.patch --- diff -up Jinja2-2.0rc1/setup.py.orig Jinja2-2.0rc1/setup.py --- Jinja2-2.0rc1/setup.py.orig 2008-06-29 01:44:48.000000000 +0200 +++ Jinja2-2.0rc1/setup.py 2008-06-29 01:48:00.000000000 +0200 @@ -51,7 +51,7 @@ from distutils.errors import CCompilerEr data_files = [] documentation_path = 'docs/_build/html' -if os.path.exists(documentation_path): +if os.path.exists(documentation_path) and False: documentation_files = [] for fn in os.listdir(documentation_path): if not fn.startswith('.'): --- NEW FILE python-jinja2.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja2 Version: 2.0 Release: 2%{?dist} Summary: General purpose template engine Group: Development/Languages License: BSD URL: http://jinja.pocoo.org/ Source0: http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz Patch0: %{name}-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif Requires: python-babel >= 0.8 %description Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. If you have any exposure to other text-based template languages, such as Smarty or Django, you should feel right at home with Jinja2. It's both designer and developer friendly by sticking to Python's principles and adding functionality useful for templating environments. %prep %setup -q -n Jinja2-%{version} %patch0 -p1 -b .docs %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} # fix EOL sed -i 's|\r$||g' LICENSE # fix wrong permission %{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE TODO %doc docs/_build/html ext %{python_sitearch}/* %changelog * Tue Jul 22 2008 Thomas Moschny - 2.0-2 - Use rpm buildroot macro instead of RPM_BUILD_ROOT. * Sun Jul 20 2008 Thomas Moschny - 2.0-1 - Upstream released 2.0. * Sun Jun 29 2008 Thomas Moschny - 2.0-0.1.rc1 - Modified specfile from the existing python-jinja package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:02:27 -0000 1.1 +++ .cvsignore 24 Jul 2008 07:56:09 -0000 1.2 @@ -0,0 +1 @@ +Jinja2-2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:02:27 -0000 1.1 +++ sources 24 Jul 2008 07:56:09 -0000 1.2 @@ -0,0 +1 @@ +19fe3ee10ee94a6003c53374112f2403 Jinja2-2.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 08:07:32 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Thu, 24 Jul 2008 08:07:32 GMT Subject: rpms/python-jinja2/F-9 import.log, NONE, 1.1 python-jinja2-docs.patch, NONE, 1.1 python-jinja2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240807.m6O87Wfa017100@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/python-jinja2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16997/F-9 Modified Files: .cvsignore sources Added Files: import.log python-jinja2-docs.patch python-jinja2.spec Log Message: New package. --- NEW FILE import.log --- python-jinja2-2_0-2_fc10:F-9:python-jinja2-2.0-2.fc10.src.rpm:1216886790 python-jinja2-docs.patch: --- NEW FILE python-jinja2-docs.patch --- diff -up Jinja2-2.0rc1/setup.py.orig Jinja2-2.0rc1/setup.py --- Jinja2-2.0rc1/setup.py.orig 2008-06-29 01:44:48.000000000 +0200 +++ Jinja2-2.0rc1/setup.py 2008-06-29 01:48:00.000000000 +0200 @@ -51,7 +51,7 @@ from distutils.errors import CCompilerEr data_files = [] documentation_path = 'docs/_build/html' -if os.path.exists(documentation_path): +if os.path.exists(documentation_path) and False: documentation_files = [] for fn in os.listdir(documentation_path): if not fn.startswith('.'): --- NEW FILE python-jinja2.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja2 Version: 2.0 Release: 2%{?dist} Summary: General purpose template engine Group: Development/Languages License: BSD URL: http://jinja.pocoo.org/ Source0: http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz Patch0: %{name}-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif Requires: python-babel >= 0.8 %description Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. If you have any exposure to other text-based template languages, such as Smarty or Django, you should feel right at home with Jinja2. It's both designer and developer friendly by sticking to Python's principles and adding functionality useful for templating environments. %prep %setup -q -n Jinja2-%{version} %patch0 -p1 -b .docs %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} # fix EOL sed -i 's|\r$||g' LICENSE # fix wrong permission %{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE TODO %doc docs/_build/html ext %{python_sitearch}/* %changelog * Tue Jul 22 2008 Thomas Moschny - 2.0-2 - Use rpm buildroot macro instead of RPM_BUILD_ROOT. * Sun Jul 20 2008 Thomas Moschny - 2.0-1 - Upstream released 2.0. * Sun Jun 29 2008 Thomas Moschny - 2.0-0.1.rc1 - Modified specfile from the existing python-jinja package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja2/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:02:27 -0000 1.1 +++ .cvsignore 24 Jul 2008 08:06:46 -0000 1.2 @@ -0,0 +1 @@ +Jinja2-2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja2/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:02:27 -0000 1.1 +++ sources 24 Jul 2008 08:06:46 -0000 1.2 @@ -0,0 +1 @@ +19fe3ee10ee94a6003c53374112f2403 Jinja2-2.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 08:11:16 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Thu, 24 Jul 2008 08:11:16 GMT Subject: rpms/libspe2/devel libspe2.spec,1.1,1.2 Message-ID: <200807240811.m6O8BGNR017531@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17362 Modified Files: libspe2.spec Log Message: changed package name to contain the branch name. Index: libspe2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/libspe2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libspe2.spec 24 Jul 2008 07:16:26 -0000 1.1 +++ libspe2.spec 24 Jul 2008 08:10:31 -0000 1.2 @@ -4,7 +4,7 @@ Name: libspe2 Version: %{up_version}.%{up_release} -Release: 4 +Release: 5%{?dist} Summary: SPE Runtime Management Library Group: System Environment/Libraries @@ -154,6 +154,9 @@ %endif %changelog +* Thu Jul 24 2008 Jochen Roth 2.2.80.95-5 +- changed release name to include branch name + * Tue Jul 22 2008 Jochen Roth 2.2.80.95-4 - Changed elfspe startup script to be enabled per default From fedora-extras-commits at redhat.com Thu Jul 24 08:15:00 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Thu, 24 Jul 2008 08:15:00 GMT Subject: rpms/python-jinja2/F-8 import.log, NONE, 1.1 python-jinja2-docs.patch, NONE, 1.1 python-jinja2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240815.m6O8F0dS017920@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/python-jinja2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17866/F-8 Modified Files: .cvsignore sources Added Files: import.log python-jinja2-docs.patch python-jinja2.spec Log Message: New package. --- NEW FILE import.log --- python-jinja2-2_0-2_fc10:F-8:python-jinja2-2.0-2.fc10.src.rpm:1216887238 python-jinja2-docs.patch: --- NEW FILE python-jinja2-docs.patch --- diff -up Jinja2-2.0rc1/setup.py.orig Jinja2-2.0rc1/setup.py --- Jinja2-2.0rc1/setup.py.orig 2008-06-29 01:44:48.000000000 +0200 +++ Jinja2-2.0rc1/setup.py 2008-06-29 01:48:00.000000000 +0200 @@ -51,7 +51,7 @@ from distutils.errors import CCompilerEr data_files = [] documentation_path = 'docs/_build/html' -if os.path.exists(documentation_path): +if os.path.exists(documentation_path) and False: documentation_files = [] for fn in os.listdir(documentation_path): if not fn.startswith('.'): --- NEW FILE python-jinja2.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja2 Version: 2.0 Release: 2%{?dist} Summary: General purpose template engine Group: Development/Languages License: BSD URL: http://jinja.pocoo.org/ Source0: http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz Patch0: %{name}-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif Requires: python-babel >= 0.8 %description Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. If you have any exposure to other text-based template languages, such as Smarty or Django, you should feel right at home with Jinja2. It's both designer and developer friendly by sticking to Python's principles and adding functionality useful for templating environments. %prep %setup -q -n Jinja2-%{version} %patch0 -p1 -b .docs %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} # fix EOL sed -i 's|\r$||g' LICENSE # fix wrong permission %{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE TODO %doc docs/_build/html ext %{python_sitearch}/* %changelog * Tue Jul 22 2008 Thomas Moschny - 2.0-2 - Use rpm buildroot macro instead of RPM_BUILD_ROOT. * Sun Jul 20 2008 Thomas Moschny - 2.0-1 - Upstream released 2.0. * Sun Jun 29 2008 Thomas Moschny - 2.0-0.1.rc1 - Modified specfile from the existing python-jinja package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja2/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 03:02:27 -0000 1.1 +++ .cvsignore 24 Jul 2008 08:14:17 -0000 1.2 @@ -0,0 +1 @@ +Jinja2-2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja2/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 03:02:27 -0000 1.1 +++ sources 24 Jul 2008 08:14:17 -0000 1.2 @@ -0,0 +1 @@ +19fe3ee10ee94a6003c53374112f2403 Jinja2-2.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 08:03:08 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Thu, 24 Jul 2008 08:03:08 GMT Subject: rpms/kernel/devel kernel.spec,1.791,1.792 Message-ID: <200807240803.m6O838u0016755@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16686 Modified Files: kernel.spec Log Message: Cache vanilla between untar and upstream patch. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.791 retrieving revision 1.792 diff -u -r1.791 -r1.792 --- kernel.spec 23 Jul 2008 19:51:09 -0000 1.791 +++ kernel.spec 24 Jul 2008 08:02:22 -0000 1.792 @@ -904,10 +904,19 @@ %endif if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then - # Ok, first time we do a make prep. - rm -f pax_global_header + + if [ -d kernel-%{kversion}/vanilla-%{kversion} ]; then + cd kernel-%{kversion} + else + # Ok, first time we do a make prep. + rm -f pax_global_header %setup -q -n kernel-%{kversion} -c - mv linux-%{kversion} vanilla-%{vanillaversion} + mv linux-%{kversion} vanilla-%{kversion} + fi + +%if "%{kversion}" != "%{vanillaversion}" + cp -rl vanilla-%{kversion} vanilla-%{vanillaversion} +%endif cd vanilla-%{vanillaversion} # Update vanilla to the latest upstream. From fedora-extras-commits at redhat.com Thu Jul 24 08:19:00 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Thu, 24 Jul 2008 08:19:00 GMT Subject: rpms/busybox/devel busybox-1.2.2-iptunnel.patch, 1.1, 1.2 busybox-1.2.2-ls.patch, 1.1, 1.2 Message-ID: <200807240819.m6O8J0Io018210@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/busybox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18150 Modified Files: busybox-1.2.2-iptunnel.patch busybox-1.2.2-ls.patch Log Message: update the patch format busybox-1.2.2-iptunnel.patch: Index: busybox-1.2.2-iptunnel.patch =================================================================== RCS file: /cvs/pkgs/rpms/busybox/devel/busybox-1.2.2-iptunnel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- busybox-1.2.2-iptunnel.patch 22 Jan 2007 12:49:39 -0000 1.1 +++ busybox-1.2.2-iptunnel.patch 24 Jul 2008 08:18:14 -0000 1.2 @@ -1,10 +1,11 @@ ---- busybox-1.2.2/networking/libiproute/iptunnel.c.pom 2006-07-01 00:42:02.000000000 +0200 -+++ busybox-1.2.2/networking/libiproute/iptunnel.c 2007-01-22 13:42:10.000000000 +0100 -@@ -29,6 +29,7 @@ +diff -up busybox-1.10.3/networking/libiproute/iptunnel.c.iptunnel busybox-1.10.3/networking/libiproute/iptunnel.c +--- busybox-1.10.3/networking/libiproute/iptunnel.c.iptunnel 2008-04-19 05:50:26.000000000 +0200 ++++ busybox-1.10.3/networking/libiproute/iptunnel.c 2008-07-24 09:34:44.000000000 +0200 +@@ -21,6 +21,7 @@ #ifndef __constant_htons #define __constant_htons htons #endif +#include #include - #include "rt_names.h" + #include "ip_common.h" /* #include "libbb.h" is inside */ busybox-1.2.2-ls.patch: Index: busybox-1.2.2-ls.patch =================================================================== RCS file: /cvs/pkgs/rpms/busybox/devel/busybox-1.2.2-ls.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- busybox-1.2.2-ls.patch 2 Apr 2007 10:39:08 -0000 1.1 +++ busybox-1.2.2-ls.patch 24 Jul 2008 08:18:14 -0000 1.2 @@ -1,18 +1,19 @@ ---- busybox-1.2.2/coreutils/ls.c.pom 2006-07-01 00:42:07.000000000 +0200 -+++ busybox-1.2.2/coreutils/ls.c 2007-04-02 12:25:55.000000000 +0200 -@@ -477,6 +477,7 @@ +diff -up busybox-1.10.3/coreutils/ls.c.ls busybox-1.10.3/coreutils/ls.c +--- busybox-1.10.3/coreutils/ls.c.ls 2008-04-19 05:50:32.000000000 +0200 ++++ busybox-1.10.3/coreutils/ls.c 2008-07-24 10:14:25.000000000 +0200 +@@ -435,6 +435,7 @@ static void showfiles(struct dnode **dn, putchar('\n'); column = 0; } + fflush(stdout); } - /*----------------------------------------------------------------------*/ -@@ -520,6 +521,7 @@ + +@@ -478,6 +479,7 @@ static void showdirs(struct dnode **dn, } } } + fflush(stdout); } - /*----------------------------------------------------------------------*/ + From fedora-extras-commits at redhat.com Thu Jul 24 08:22:50 2008 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Thu, 24 Jul 2008 08:22:50 GMT Subject: rpms/pdns-recursor/devel .cvsignore, 1.6, 1.7 pdns-recursor.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200807240822.m6O8MoSS018395@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/pdns-recursor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18342 Modified Files: .cvsignore pdns-recursor.spec sources Log Message: * Thu Jul 24 2008 Ruben Kerkhof - 3.1.7 - Upstream released new version, now with Lua support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 11 May 2008 13:31:33 -0000 1.6 +++ .cvsignore 24 Jul 2008 08:21:58 -0000 1.7 @@ -1 +1 @@ -pdns-recursor-3.1.6.tar.bz2 +pdns-recursor-3.1.7.tar.bz2 Index: pdns-recursor.spec =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/pdns-recursor.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pdns-recursor.spec 11 May 2008 13:31:33 -0000 1.6 +++ pdns-recursor.spec 24 Jul 2008 08:21:58 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Modern, advanced and high performance recursing/non authoritative nameserver Name: pdns-recursor -Version: 3.1.6 +Version: 3.1.7 Release: 1%{?dist} Group: System Environment/Daemons License: GPLv2 @@ -11,11 +11,11 @@ Patch0: pdns-recursor-fixsysconfdir.patch Patch1: pdns-recursor-fixmakefile.patch -Patch2: pdns-recursor-addheader.patch -Patch3: pdns-recursor-mremap.patch +#Patch2: pdns-recursor-addheader.patch +#Patch3: pdns-recursor-mremap.patch Provides: powerdns-recursor = %{version}-%{release} -BuildRequires: boost-devel +BuildRequires: boost-devel, lua-devel Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service @@ -27,11 +27,11 @@ %setup -q %patch0 -p1 -b .fixsysconfdir %patch1 -p1 -b .fixmakefile -%patch2 -p1 -b .addheader -%patch3 -p1 -b .mremap +#%patch2 -p1 -b .addheader +#%patch3 -p1 -b .mremap %build -make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" +LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %install %{__rm} -rf %{buildroot} @@ -79,6 +79,9 @@ %changelog +* Thu Jul 24 2008 Ruben Kerkhof - 3.1.7 +- Upstream released new version, now with Lua support + * Sun May 11 2008 Ruben Kerkhof - 3.1.6 - Upstream released new version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 May 2008 13:31:33 -0000 1.6 +++ sources 24 Jul 2008 08:21:58 -0000 1.7 @@ -1 +1 @@ -6153e89070b9535778dca6b548081f02 pdns-recursor-3.1.6.tar.bz2 +e7521055f949ba8e9e77fe27411be2ed pdns-recursor-3.1.7.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 08:29:12 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Thu, 24 Jul 2008 08:29:12 GMT Subject: rpms/kernel/devel linux-2.6-powerpc-tracehook.patch, NONE, 1.1 linux-2.6-sparc64-tracehook.patch, NONE, 1.1 linux-2.6-x86-tracehook.patch, NONE, 1.1 patch-2.6.26-git11.bz2.sign, NONE, 1.1 .cvsignore, 1.875, 1.876 config-ia64-generic, 1.14, 1.15 kernel.spec, 1.792, 1.793 linux-2.6-tracehook.patch, 1.4, 1.5 linux-2.6-utrace.patch, 1.82, 1.83 sources, 1.836, 1.837 upstream, 1.753, 1.754 linux-2.6-ptrace-cleanup.patch, 1.3, NONE patch-2.6.26-git10.bz2.sign, 1.1, NONE Message-ID: <200807240829.m6O8TC0j018962@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18822 Modified Files: .cvsignore config-ia64-generic kernel.spec linux-2.6-tracehook.patch linux-2.6-utrace.patch sources upstream Added Files: linux-2.6-powerpc-tracehook.patch linux-2.6-sparc64-tracehook.patch linux-2.6-x86-tracehook.patch patch-2.6.26-git11.bz2.sign Removed Files: linux-2.6-ptrace-cleanup.patch patch-2.6.26-git10.bz2.sign Log Message: * Thu Jul 24 2008 Roland McGrath - 2.6.26-git11 - utrace update linux-2.6-powerpc-tracehook.patch: --- NEW FILE linux-2.6-powerpc-tracehook.patch --- arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/entry_32.S | 11 ++++- arch/powerpc/kernel/entry_64.S | 10 +++- arch/powerpc/kernel/ptrace.c | 66 +++++++++++++++++----------- arch/powerpc/kernel/signal.c | 21 ++++++++- include/asm-powerpc/ptrace.h | 5 ++ include/asm-powerpc/signal.h | 3 +- include/asm-powerpc/syscall.h | 84 +++++++++++++++++++++++++++++++++++++ include/asm-powerpc/thread_info.h | 5 ++- 9 files changed, 169 insertions(+), 37 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 737ebf9..8f2c5c7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -114,6 +114,7 @@ config PPC select HAVE_KPROBES select HAVE_ARCH_KGDB select HAVE_KRETPROBES + select HAVE_ARCH_TRACEHOOK select HAVE_LMB select HAVE_DMA_ATTRS if PPC64 select USE_GENERIC_SMP_HELPERS if SMP diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index da52269..1cbbf70 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -343,7 +343,12 @@ syscall_dotrace: stw r0,_TRAP(r1) addi r3,r1,STACK_FRAME_OVERHEAD bl do_syscall_trace_enter - lwz r0,GPR0(r1) /* Restore original registers */ + /* + * Restore argument registers possibly just changed. + * We use the return value of do_syscall_trace_enter + * for call number to look up in the table (r0). + */ + mr r0,r3 lwz r3,GPR3(r1) lwz r4,GPR4(r1) lwz r5,GPR5(r1) @@ -1055,8 +1060,8 @@ do_user_signal: /* r10 contains MSR_KE SAVE_NVGPRS(r1) rlwinm r3,r3,0,0,30 stw r3,_TRAP(r1) -2: li r3,0 - addi r4,r1,STACK_FRAME_OVERHEAD +2: addi r3,r1,STACK_FRAME_OVERHEAD + mr r4,r9 bl do_signal REST_NVGPRS(r1) b recheck diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index d736924..2d802e9 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -214,7 +214,12 @@ syscall_dotrace: bl .save_nvgprs addi r3,r1,STACK_FRAME_OVERHEAD bl .do_syscall_trace_enter - ld r0,GPR0(r1) /* Restore original registers */ + /* + * Restore argument registers possibly just changed. + * We use the return value of do_syscall_trace_enter + * for the call number to look up in the table (r0). + */ + mr r0,r3 ld r3,GPR3(r1) ld r4,GPR4(r1) ld r5,GPR5(r1) @@ -638,8 +643,7 @@ user_work: b .ret_from_except_lite 1: bl .save_nvgprs - li r3,0 - addi r4,r1,STACK_FRAME_OVERHEAD + addi r3,r1,STACK_FRAME_OVERHEAD bl .do_signal b .ret_from_except diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 8feb93e..a704603 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -706,12 +707,29 @@ void user_enable_single_step(struct task task->thread.dbcr0 = DBCR0_IDM | DBCR0_IC; regs->msr |= MSR_DE; #else + regs->msr &= ~MSR_BE; regs->msr |= MSR_SE; #endif } set_tsk_thread_flag(task, TIF_SINGLESTEP); } +void user_enable_block_step(struct task_struct *task) +{ + struct pt_regs *regs = task->thread.regs; + + if (regs != NULL) { +#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) + task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT; + regs->msr |= MSR_DE; +#else + regs->msr &= ~MSR_SE; + regs->msr |= MSR_BE; +#endif + } + set_tsk_thread_flag(task, TIF_SINGLESTEP); +} + void user_disable_single_step(struct task_struct *task) { struct pt_regs *regs = task->thread.regs; @@ -721,7 +739,7 @@ void user_disable_single_step(struct tas task->thread.dbcr0 = 0; regs->msr &= ~MSR_DE; #else - regs->msr &= ~MSR_SE; + regs->msr &= ~(MSR_SE | MSR_BE); #endif } clear_tsk_thread_flag(task, TIF_SINGLESTEP); @@ -953,31 +971,24 @@ long arch_ptrace(struct task_struct *chi return ret; } -static void do_syscall_trace(void) +/* + * We must return the syscall number to actually look up in the table. + * This can be -1L to skip running any syscall at all. + */ +long do_syscall_trace_enter(struct pt_regs *regs) { - /* the 0x80 provides a way for the tracing parent to distinguish - between a syscall stop and SIGTRAP delivery */ - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) - ? 0x80 : 0)); - - /* - * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; - } -} + long ret = 0; -void do_syscall_trace_enter(struct pt_regs *regs) -{ secure_computing(regs->gpr[0]); - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) - do_syscall_trace(); + if (test_thread_flag(TIF_SYSCALL_TRACE) && + tracehook_report_syscall_entry(regs)) + /* + * Tracing decided this syscall should not happen. + * We'll return a bogus call number to get an ENOSYS + * error, but leave the original number in regs->gpr[0]. + */ + ret = -1L; if (unlikely(current->audit_context)) { #ifdef CONFIG_PPC64 @@ -995,16 +1006,19 @@ void do_syscall_trace_enter(struct pt_re regs->gpr[5] & 0xffffffff, regs->gpr[6] & 0xffffffff); } + + return ret ?: regs->gpr[0]; } void do_syscall_trace_leave(struct pt_regs *regs) { + int step; + if (unlikely(current->audit_context)) audit_syscall_exit((regs->ccr&0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, regs->result); - if ((test_thread_flag(TIF_SYSCALL_TRACE) - || test_thread_flag(TIF_SINGLESTEP)) - && (current->ptrace & PT_PTRACED)) - do_syscall_trace(); + step = test_thread_flag(TIF_SINGLESTEP); + if (step || test_thread_flag(TIF_SYSCALL_TRACE)) + tracehook_report_syscall_exit(regs, step); } diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index ad55488..e032336 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -9,7 +9,7 @@ * this archive for more details. */ -#include +#include #include #include #include @@ -112,7 +112,7 @@ static void check_syscall_restart(struct } } -int do_signal(sigset_t *oldset, struct pt_regs *regs) +static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs) { siginfo_t info; int signr; @@ -173,11 +173,28 @@ int do_signal(sigset_t *oldset, struct p * its frame, and we can clear the TLF_RESTORE_SIGMASK flag. */ current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK; + + /* + * Let tracing know that we've done the handler setup. + */ + tracehook_signal_handler(signr, &info, &ka, regs, + test_thread_flag(TIF_SINGLESTEP)); } return ret; } +void do_signal(struct pt_regs *regs, unsigned long thread_info_flags) +{ + if (thread_info_flags & _TIF_SIGPENDING) + do_signal_pending(NULL, regs); + + if (thread_info_flags & _TIF_NOTIFY_RESUME) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + } +} + long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, unsigned long r5, unsigned long r6, unsigned long r7, unsigned long r8, struct pt_regs *regs) diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h index 3d6e310..42301cf 100644 --- a/include/asm-powerpc/ptrace.h +++ b/include/asm-powerpc/ptrace.h @@ -84,6 +84,7 @@ struct pt_regs { #ifndef __ASSEMBLY__ #define instruction_pointer(regs) ((regs)->nip) +#define user_stack_pointer(regs) ((regs)->gpr[1]) #define regs_return_value(regs) ((regs)->gpr[3]) #ifdef CONFIG_SMP @@ -136,7 +137,9 @@ do { \ * These are defined as per linux/ptrace.h, which see. */ #define arch_has_single_step() (1) +#define arch_has_block_step() (1) extern void user_enable_single_step(struct task_struct *); +extern void user_enable_block_step(struct task_struct *); extern void user_disable_single_step(struct task_struct *); #endif /* __ASSEMBLY__ */ @@ -289,4 +292,6 @@ extern void user_disable_single_step(str #define PPC_PTRACE_PEEKUSR_3264 0x91 #define PPC_PTRACE_POKEUSR_3264 0x90 +#define PTRACE_SINGLEBLOCK 0x100 /* resume execution until next branch */ + #endif /* _ASM_POWERPC_PTRACE_H */ diff --git a/include/asm-powerpc/signal.h b/include/asm-powerpc/signal.h index a8c7bab..a7360cd 100644 --- a/include/asm-powerpc/signal.h +++ b/include/asm-powerpc/signal.h @@ -122,8 +122,7 @@ typedef struct sigaltstack { #ifdef __KERNEL__ struct pt_regs; -extern int do_signal(sigset_t *oldset, struct pt_regs *regs); -extern int do_signal32(sigset_t *oldset, struct pt_regs *regs); +extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags); #define ptrace_signal_deliver(regs, cookie) do { } while (0) #endif /* __KERNEL__ */ diff --git a/include/asm-powerpc/syscall.h b/include/asm-powerpc/syscall.h new file mode 100644 index ...3ced23a 100644 --- /dev/null +++ b/include/asm-powerpc/syscall.h @@ -0,0 +1,84 @@ +/* + * Access to user system call parameters and results + * + * Copyright (C) 2008 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + * + * See asm-generic/syscall.h for descriptions of what we must do here. + */ + +#ifndef _ASM_SYSCALL_H +#define _ASM_SYSCALL_H 1 + +#include + +static inline long syscall_get_nr(struct task_struct *task, + struct pt_regs *regs) +{ + return regs->trap == 0xc01 ? regs->gpr[0] : -1L; +} + +static inline void syscall_rollback(struct task_struct *task, + struct pt_regs *regs) +{ + regs->gpr[3] = regs->orig_gpr3; +} + +static inline long syscall_get_error(struct task_struct *task, + struct pt_regs *regs) +{ + return (regs->ccr & 0x1000) ? -regs->gpr[3] : 0; +} + +static inline long syscall_get_return_value(struct task_struct *task, + struct pt_regs *regs) +{ + return regs->gpr[3]; +} + +static inline void syscall_set_return_value(struct task_struct *task, + struct pt_regs *regs, + int error, long val) +{ + if (error) { + regs->ccr |= 0x1000L; + regs->gpr[3] = -error; + } else { + regs->ccr &= ~0x1000L; + regs->gpr[3] = val; + } +} + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + unsigned long *args) +{ + BUG_ON(i + n > 6); +#ifdef CONFIG_PPC64 + if (test_tsk_thread_flag(task, TIF_32BIT)) { + /* + * Zero-extend 32-bit argument values. The high bits are + * garbage ignored by the actual syscall dispatch. + */ + while (n-- > 0) + args[n] = (u32) regs->gpr[3 + i + n]; + return; + } +#endif + memcpy(args, ®s->gpr[3 + i], n * sizeof(args[0])); +} + +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + const unsigned long *args) +{ + BUG_ON(i + n > 6); + memcpy(®s->gpr[3 + i], args, n * sizeof(args[0])); +} + +#endif /* _ASM_SYSCALL_H */ diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h index b705c2a..a52d62e 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h @@ -116,6 +116,7 @@ static inline struct thread_info *curren #define TIF_SECCOMP 10 /* secure computing */ #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */ #define TIF_NOERROR 12 /* Force successful syscall return */ +#define TIF_NOTIFY_RESUME 13 /* callback before returning to user */ #define TIF_FREEZE 14 /* Freezing for suspend */ #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ #define TIF_ABI_PENDING 16 /* 32/64 bit switch needed */ @@ -133,12 +134,14 @@ static inline struct thread_info *curren #define _TIF_SECCOMP (1< #include #include +#include #include #include @@ -1064,26 +1065,13 @@ asmlinkage void syscall_trace(struct pt_ audit_syscall_exit(result, regs->u_regs[UREG_I0]); } - if (!(current->ptrace & PT_PTRACED)) - goto out; - - if (!test_thread_flag(TIF_SYSCALL_TRACE)) - goto out; - - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) - ? 0x80 : 0)); - - /* - * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; + if (test_thread_flag(TIF_SYSCALL_TRACE)) { + if (syscall_exit_p) + tracehook_report_syscall_exit(regs, 0); + else + tracehook_report_syscall_entry(regs); } -out: if (unlikely(current->audit_context) && !syscall_exit_p) audit_syscall_entry((test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC : diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index c6fc695..97a993c 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S @@ -46,7 +46,7 @@ __handle_user_windows: wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate ldx [%g6 + TI_FLAGS], %l0 -1: andcc %l0, _TIF_SIGPENDING, %g0 +1: andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 be,pt %xcc, __handle_user_windows_continue nop mov %l5, %o1 @@ -86,7 +86,7 @@ __handle_perfctrs: wrpr %g0, RTRAP_PSTATE, %pstate wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate ldx [%g6 + TI_FLAGS], %l0 -1: andcc %l0, _TIF_SIGPENDING, %g0 +1: andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 be,pt %xcc, __handle_perfctrs_continue sethi %hi(TSTATE_PEF), %o0 @@ -195,7 +195,7 @@ __handle_preemption_continue: andcc %l1, %o0, %g0 andcc %l0, _TIF_NEED_RESCHED, %g0 bne,pn %xcc, __handle_preemption - andcc %l0, _TIF_SIGPENDING, %g0 + andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 bne,pn %xcc, __handle_signal __handle_signal_continue: ldub [%g6 + TI_WSAVED], %o2 diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 9667e96..e12bece 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -574,6 +575,8 @@ static void do_signal(struct pt_regs *re * clear the TS_RESTORE_SIGMASK flag. */ current_thread_info()->status &= ~TS_RESTORE_SIGMASK; + + tracehook_signal_handler(signr, &info, &ka, regs, 0); return; } if (restart_syscall && @@ -605,4 +608,8 @@ void do_notify_resume(struct pt_regs *re { if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs, orig_i0); + if (thread_info_flags & _TIF_NOTIFY_RESUME) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + } } diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index 97cdd1b..fb201b2 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c @@ -794,6 +794,8 @@ void do_signal32(sigset_t *oldset, struc * clear the TS_RESTORE_SIGMASK flag. */ current_thread_info()->status &= ~TS_RESTORE_SIGMASK; + + tracehook_signal_handler(signr, &info, &ka, regs, 0); return; } if (restart_syscall && diff --git a/include/asm-sparc/ptrace_32.h b/include/asm-sparc/ptrace_32.h index 0401cc7..d43c88b 100644 --- a/include/asm-sparc/ptrace_32.h +++ b/include/asm-sparc/ptrace_32.h @@ -74,6 +74,7 @@ struct sparc_stackf { #define user_mode(regs) (!((regs)->psr & PSR_PS)) #define instruction_pointer(regs) ((regs)->pc) +#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) unsigned long profile_pc(struct pt_regs *); extern void show_regs(struct pt_regs *); #endif diff --git a/include/asm-sparc/ptrace_64.h b/include/asm-sparc/ptrace_64.h index a682e66..ec6d45c 100644 --- a/include/asm-sparc/ptrace_64.h +++ b/include/asm-sparc/ptrace_64.h @@ -146,6 +146,7 @@ do { current_thread_info()->syscall_noer } while (0) #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV)) #define instruction_pointer(regs) ((regs)->tpc) +#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) #define regs_return_value(regs) ((regs)->u_regs[UREG_I0]) #ifdef CONFIG_SMP extern unsigned long profile_pc(struct pt_regs *); diff --git a/include/asm-sparc/syscall.h b/include/asm-sparc/syscall.h new file mode 100644 index ...53bf5b3 100644 --- /dev/null +++ b/include/asm-sparc/syscall.h @@ -0,0 +1,79 @@ +/* + * Access to user system call parameters and results + * + * Copyright (C) 2008 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + * + * See asm-generic/syscall.h for descriptions of what we must do here. + */ + +#ifndef _ASM_SYSCALL_H +#define _ASM_SYSCALL_H 1 + +#include +#include +struct task_struct; + +static inline long syscall_get_nr(struct task_struct *task, + struct pt_regs *regs) +{ + return pt_regs_is_syscall(regs) ? regs->u_regs[UREG_G1] : -1L; +} + +static inline long syscall_get_error(struct task_struct *task, + struct pt_regs *regs) +{ + if (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY)) + return -regs->u_regs[UREG_I0]; + return 0; +} + +static inline long syscall_get_return_value(struct task_struct *task, + struct pt_regs *regs) +{ + return regs->u_regs[UREG_I0]; +} + +static inline void syscall_set_return_value(struct task_struct *task, + struct pt_regs *regs, + int error, long val) +{ + if (error) { + regs->tstate |= (TSTATE_XCARRY | TSTATE_ICARRY); + regs->u_regs[UREG_I0] = -error; + } else { + regs->tstate &= ~(TSTATE_XCARRY | TSTATE_ICARRY); + regs->u_regs[UREG_I0] = val; + } +} + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + unsigned long *args) +{ + BUG_ON(i + n > 6); +#ifdef TIF_32BIT + if (test_tsk_thread_flag(task, TIF_32BIT)) { + while (n-- > 0) + args[n] = (u32) regs->u_regs[UREG_I0 + i + n]; + return; + } + +#endif + memcpy(args, ®s->u_regs[UREG_I0 + i], n * sizeof(args[0])); +} + +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + const unsigned long *args) +{ + BUG_ON(i + n > 6); + memcpy(®s->u_regs[UREG_I0 + i], args, n * sizeof(args[0])); +} + +#endif /* _ASM_SYSCALL_H */ diff --git a/include/asm-sparc/thread_info_64.h b/include/asm-sparc/thread_info_64.h index c6d2e6c..0ddf16b 100644 --- a/include/asm-sparc/thread_info_64.h +++ b/include/asm-sparc/thread_info_64.h @@ -217,7 +217,7 @@ register struct thread_info *current_thr * nop */ #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ -/* flags bit 1 is available */ +#define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_PERFCTR 4 /* performance counters active */ @@ -237,6 +237,7 @@ register struct thread_info *current_thr #define TIF_POLLING_NRFLAG 14 #define _TIF_SYSCALL_TRACE (1< linux-2.6-x86-tracehook.patch: --- NEW FILE linux-2.6-x86-tracehook.patch --- arch/x86/Kconfig | 1 + arch/x86/kernel/ptrace.c | 34 +------ arch/x86/kernel/signal_32.c | 11 ++- arch/x86/kernel/signal_64.c | 49 +++------- include/asm-x86/ptrace.h | 5 + include/asm-x86/syscall.h | 210 +++++++++++++++++++++++++++++++++++++++++ include/asm-x86/thread_info.h | 4 +- 7 files changed, 248 insertions(+), 66 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 03980cb..b009ddf 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -27,6 +27,7 @@ config X86 select HAVE_FTRACE select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER + select HAVE_ARCH_TRACEHOOK config ARCH_DEFCONFIG string diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index e37dccc..19a7d2c 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -1375,30 +1376,6 @@ void send_sigtrap(struct task_struct *ts force_sig_info(SIGTRAP, &info, tsk); } -static void syscall_trace(struct pt_regs *regs) -{ - if (!(current->ptrace & PT_PTRACED)) - return; - -#if 0 - printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n", - current->comm, - regs->ip, regs->sp, regs->ax, regs->orig_ax, __builtin_return_address(0), - current_thread_info()->flags, current->ptrace); -#endif - - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) - ? 0x80 : 0)); - /* - * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; - } -} #ifdef CONFIG_X86_32 # define IS_IA32 1 @@ -1432,8 +1409,9 @@ asmregparm long syscall_trace_enter(stru if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) ret = -1L; - if (ret || test_thread_flag(TIF_SYSCALL_TRACE)) - syscall_trace(regs); + if ((ret || test_thread_flag(TIF_SYSCALL_TRACE)) && + tracehook_report_syscall_entry(regs)) + ret = -1L; if (unlikely(current->audit_context)) { if (IS_IA32) @@ -1459,7 +1437,7 @@ asmregparm void syscall_trace_leave(stru audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); if (test_thread_flag(TIF_SYSCALL_TRACE)) - syscall_trace(regs); + tracehook_report_syscall_exit(regs, 0); /* * If TIF_SYSCALL_EMU is set, we only get here because of @@ -1475,6 +1453,6 @@ asmregparm void syscall_trace_leave(stru * system call instruction. */ if (test_thread_flag(TIF_SINGLESTEP) && - (current->ptrace & PT_PTRACED)) + tracehook_consider_fatal_signal(current, SIGTRAP, SIG_DFL)) send_sigtrap(current, regs, 0); } diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index 6fb5bcd..4445d26 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -558,8 +559,6 @@ handle_signal(unsigned long sig, siginfo * handler too. */ regs->flags &= ~X86_EFLAGS_TF; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); @@ -568,6 +567,9 @@ handle_signal(unsigned long sig, siginfo recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); + tracehook_signal_handler(sig, info, ka, regs, + test_thread_flag(TIF_SINGLESTEP)); + return 0; } @@ -661,5 +663,10 @@ do_notify_resume(struct pt_regs *regs, v if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); + if (thread_info_flags & _TIF_NOTIFY_RESUME) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + } + clear_thread_flag(TIF_IRET); } diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index 47c3d24..282abdc 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +#include #include "sigframe.h" #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) @@ -293,35 +295,6 @@ give_sigsegv: } /* - * Return -1L or the syscall number that @regs is executing. - */ -static long current_syscall(struct pt_regs *regs) -{ - /* - * We always sign-extend a -1 value being set here, - * so this is always either -1L or a syscall number. - */ - return regs->orig_ax; -} - -/* - * Return a value that is -EFOO if the system call in @regs->orig_ax - * returned an error. This only works for @regs from @current. - */ -static long current_syscall_ret(struct pt_regs *regs) -{ -#ifdef CONFIG_IA32_EMULATION - if (test_thread_flag(TIF_IA32)) - /* - * Sign-extend the value so (int)-EFOO becomes (long)-EFOO - * and will match correctly in comparisons. - */ - return (int) regs->ax; -#endif - return regs->ax; -} - -/* * OK, we're invoking a handler */ @@ -332,9 +305,9 @@ handle_signal(unsigned long sig, siginfo int ret; /* Are we from a system call? */ - if (current_syscall(regs) >= 0) { + if (syscall_get_nr(current, regs) >= 0) { /* If so, check system call restarting.. */ - switch (current_syscall_ret(regs)) { + switch (syscall_get_error(current, regs)) { case -ERESTART_RESTARTBLOCK: case -ERESTARTNOHAND: regs->ax = -EINTR; @@ -391,8 +364,6 @@ handle_signal(unsigned long sig, siginfo * handler too. */ regs->flags &= ~X86_EFLAGS_TF; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); @@ -400,6 +371,9 @@ handle_signal(unsigned long sig, siginfo sigaddset(¤t->blocked,sig); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); + + tracehook_signal_handler(sig, info, ka, regs, + test_thread_flag(TIF_SINGLESTEP)); } return ret; @@ -456,9 +430,9 @@ static void do_signal(struct pt_regs *re } /* Did we come from a system call? */ - if (current_syscall(regs) >= 0) { + if (syscall_get_nr(current, regs) >= 0) { /* Restart the system call - no handlers present */ - switch (current_syscall_ret(regs)) { + switch (syscall_get_error(current, regs)) { case -ERESTARTNOHAND: case -ERESTARTSYS: case -ERESTARTNOINTR: @@ -496,6 +470,11 @@ void do_notify_resume(struct pt_regs *re /* deal with pending signal delivery */ if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); + + if (thread_info_flags & _TIF_NOTIFY_RESUME) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + } } void signal_fault(struct pt_regs *regs, void __user *frame, char *where) diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 8a71db8..91a77f5 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h @@ -213,6 +213,11 @@ static inline unsigned long frame_pointe return regs->bp; } +static inline unsigned long user_stack_pointer(struct pt_regs *regs) +{ + return regs->sp; +} + /* * These are defined as per linux/ptrace.h, which see. */ diff --git a/include/asm-x86/syscall.h b/include/asm-x86/syscall.h new file mode 100644 index ...6f29389 100644 --- /dev/null +++ b/include/asm-x86/syscall.h @@ -0,0 +1,210 @@ +/* + * Access to user system call parameters and results + * + * Copyright (C) 2008 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + * + * See asm-generic/syscall.h for descriptions of what we must do here. + */ + +#ifndef _ASM_SYSCALL_H +#define _ASM_SYSCALL_H 1 + +#include + +static inline long syscall_get_nr(struct task_struct *task, + struct pt_regs *regs) +{ + /* + * We always sign-extend a -1 value being set here, + * so this is always either -1L or a syscall number. + */ + return regs->orig_ax; +} + +static inline void syscall_rollback(struct task_struct *task, + struct pt_regs *regs) +{ + regs->ax = regs->orig_ax; +} + +static inline long syscall_get_error(struct task_struct *task, + struct pt_regs *regs) +{ + unsigned long error = regs->ax; +#ifdef CONFIG_IA32_EMULATION + /* + * TS_COMPAT is set for 32-bit syscall entries and then + * remains set until we return to user mode. + */ + if (task_thread_info(task)->status & TS_COMPAT) + /* + * Sign-extend the value so (int)-EFOO becomes (long)-EFOO + * and will match correctly in comparisons. + */ + error = (long) (int) error; +#endif + return error >= -4095L ? error : 0; +} + +static inline long syscall_get_return_value(struct task_struct *task, + struct pt_regs *regs) +{ + return regs->ax; +} + +static inline void syscall_set_return_value(struct task_struct *task, + struct pt_regs *regs, + int error, long val) +{ + regs->ax = (long) error ?: val; +} + +#ifdef CONFIG_X86_32 + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + unsigned long *args) +{ + BUG_ON(i + n > 6); + memcpy(args, ®s->bx + i, n * sizeof(args[0])); +} + +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + const unsigned long *args) +{ + BUG_ON(i + n > 6); + memcpy(®s->bx + i, args, n * sizeof(args[0])); +} + +#else /* CONFIG_X86_64 */ + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + unsigned long *args) +{ +# ifdef CONFIG_IA32_EMULATION + if (task_thread_info(task)->status & TS_COMPAT) + switch (i + n) { + case 6: + if (!n--) break; + *args++ = regs->bp; + case 5: + if (!n--) break; + *args++ = regs->di; + case 4: + if (!n--) break; + *args++ = regs->si; + case 3: + if (!n--) break; + *args++ = regs->dx; + case 2: + if (!n--) break; + *args++ = regs->cx; + case 1: + if (!n--) break; + *args++ = regs->bx; + case 0: + if (!n--) break; + default: + BUG(); + break; + } + else +# endif + switch (i + n) { + case 6: + if (!n--) break; + *args++ = regs->r9; + case 5: + if (!n--) break; + *args++ = regs->r8; + case 4: + if (!n--) break; + *args++ = regs->r10; + case 3: + if (!n--) break; + *args++ = regs->dx; + case 2: + if (!n--) break; + *args++ = regs->si; + case 1: + if (!n--) break; + *args++ = regs->di; + case 0: + if (!n--) break; + default: + BUG(); + break; + } +} + +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + const unsigned long *args) +{ +# ifdef CONFIG_IA32_EMULATION + if (task_thread_info(task)->status & TS_COMPAT) + switch (i + n) { + case 6: + if (!n--) break; + regs->bp = *args++; + case 5: + if (!n--) break; + regs->di = *args++; + case 4: + if (!n--) break; + regs->si = *args++; + case 3: + if (!n--) break; + regs->dx = *args++; + case 2: + if (!n--) break; + regs->cx = *args++; + case 1: + if (!n--) break; + regs->bx = *args++; + case 0: + if (!n--) break; + default: + BUG(); + } + else +# endif + switch (i + n) { + case 6: + if (!n--) break; + regs->r9 = *args++; + case 5: + if (!n--) break; + regs->r8 = *args++; + case 4: + if (!n--) break; + regs->r10 = *args++; + case 3: + if (!n--) break; + regs->dx = *args++; + case 2: + if (!n--) break; + regs->si = *args++; + case 1: + if (!n--) break; + regs->di = *args++; + case 0: + if (!n--) break; + default: + BUG(); + } +} + +#endif /* CONFIG_X86_32 */ + +#endif /* _ASM_SYSCALL_H */ diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h index 3f2de10..29533e3 100644 --- a/include/asm-x86/thread_info.h +++ b/include/asm-x86/thread_info.h @@ -71,6 +71,7 @@ struct thread_info { * Warning: layout of LSW is hardcoded in entry.S */ #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ +#define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ @@ -93,6 +94,7 @@ struct thread_info { #define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) +#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) @@ -133,7 +135,7 @@ struct thread_info { /* Only used for 64 bit */ #define _TIF_DO_NOTIFY_MASK \ - (_TIF_SIGPENDING|_TIF_MCE_NOTIFY) + (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_NOTIFY_RESUME) /* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \ --- NEW FILE patch-2.6.26-git11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIiCl/yGugalF9Dw4RAi/sAKCNbjGv7xjYKaCJG1WxvPzIco3X3QCfZ4gt WnPP0RjfSYOvXCoEKWwgT5Y= =2Hyn -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.875 retrieving revision 1.876 diff -u -r1.875 -r1.876 --- .cvsignore 23 Jul 2008 19:51:09 -0000 1.875 +++ .cvsignore 24 Jul 2008 08:28:26 -0000 1.876 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git10.bz2 +patch-2.6.26-git11.bz2 Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- config-ia64-generic 23 Jul 2008 19:51:09 -0000 1.14 +++ config-ia64-generic 24 Jul 2008 08:28:26 -0000 1.15 @@ -202,7 +202,4 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m -CONFIG_UTRACE=n -CONFIG_UTRACE_PTRACE=n - CONFIG_HP_ILO=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.792 retrieving revision 1.793 diff -u -r1.792 -r1.793 --- kernel.spec 24 Jul 2008 08:02:22 -0000 1.792 +++ kernel.spec 24 Jul 2008 08:28:26 -0000 1.793 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 10 +%define gitrev 11 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -576,9 +576,11 @@ Patch10: linux-2.6-hotfixes.patch -Patch21: linux-2.6-ptrace-cleanup.patch -Patch22: linux-2.6-tracehook.patch -Patch23: linux-2.6-utrace.patch +Patch20: linux-2.6-tracehook.patch +Patch21: linux-2.6-utrace.patch +Patch22: linux-2.6-x86-tracehook.patch +Patch23: linux-2.6-powerpc-tracehook.patch +Patch24: linux-2.6-sparc64-tracehook.patch Patch41: linux-2.6-sysrq-c.patch Patch42: linux-2.6-x86-tune-generic.patch @@ -943,13 +945,14 @@ else # We already have a vanilla dir. cd kernel-%{kversion} - if [ -d linux-%{kversion}.%{_target_cpu} ]; then - # Just in case we ctrl-c'd a prep already - rm -rf deleteme.%{_target_cpu} - # Move away the stale away, and delete in background. - mv linux-%{kversion}.%{_target_cpu} deleteme.%{_target_cpu} - rm -rf deleteme.%{_target_cpu} & - fi +fi + +if [ -d linux-%{kversion}.%{_target_cpu} ]; then + # Just in case we ctrl-c'd a prep already + rm -rf deleteme.%{_target_cpu} + # Move away the stale away, and delete in background. + mv linux-%{kversion}.%{_target_cpu} deleteme.%{_target_cpu} + rm -rf deleteme.%{_target_cpu} & fi cp -rl vanilla-%{vanillaversion} linux-%{kversion}.%{_target_cpu} @@ -1007,9 +1010,11 @@ ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. -#ApplyPatch linux-2.6-ptrace-cleanup.patch -#ApplyPatch linux-2.6-tracehook.patch -#ApplyPatch linux-2.6-utrace.patch +ApplyPatch linux-2.6-tracehook.patch +ApplyPatch linux-2.6-utrace.patch +ApplyPatch linux-2.6-x86-tracehook.patch +ApplyPatch linux-2.6-powerpc-tracehook.patch +ApplyPatch linux-2.6-sparc64-tracehook.patch # enable sysrq-c on all kernels, not only kexec ApplyPatch linux-2.6-sysrq-c.patch @@ -1777,6 +1782,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 24 2008 Roland McGrath +- 2.6.26-git11 +- utrace update + * Wed Jul 23 2008 Dave Jones - 2.6.26-git10 linux-2.6-tracehook.patch: Index: linux-2.6-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-tracehook.patch 14 Jul 2008 19:38:29 -0000 1.4 +++ linux-2.6-tracehook.patch 24 Jul 2008 08:28:26 -0000 1.5 @@ -1,69 +1,38 @@ - arch/Kconfig | 18 ++ - arch/ia64/Kconfig | 1 + - arch/ia64/kernel/perfmon.c | 11 +- - arch/ia64/kernel/process.c | 22 +- - arch/ia64/kernel/ptrace.c | 43 +-- - arch/ia64/kernel/signal.c | 8 + - arch/mips/kernel/irixelf.c | 2 - - arch/powerpc/Kconfig | 1 + - arch/powerpc/kernel/entry_32.S | 11 +- - arch/powerpc/kernel/entry_64.S | 10 +- - arch/powerpc/kernel/ptrace.c | 47 ++-- - arch/powerpc/kernel/signal.c | 21 ++- - arch/sparc64/Kconfig | 1 + - arch/sparc64/kernel/ptrace.c | 24 +-- - arch/sparc64/kernel/rtrap.S | 6 +- - arch/sparc64/kernel/signal.c | 5 + - arch/x86/Kconfig | 1 + - arch/x86/ia32/ia32_aout.c | 6 - - arch/x86/kernel/ptrace.c | 34 +-- - arch/x86/kernel/signal_32.c | 11 +- - arch/x86/kernel/signal_64.c | 49 +--- - fs/binfmt_aout.c | 6 - - fs/binfmt_elf.c | 6 - - fs/binfmt_elf_fdpic.c | 7 - - fs/binfmt_flat.c | 3 - - fs/binfmt_som.c | 2 - - fs/exec.c | 12 +- - fs/proc/array.c | 9 +- - fs/proc/base.c | 39 +++- - include/asm-generic/syscall.h | 141 +++++++++ - include/asm-ia64/thread_info.h | 3 - - include/asm-powerpc/ptrace.h | 1 + - include/asm-powerpc/signal.h | 3 +- - include/asm-powerpc/syscall.h | 73 +++++ - include/asm-powerpc/thread_info.h | 5 +- - include/asm-sparc64/ptrace.h | 1 + - include/asm-sparc64/syscall.h | 70 +++++ - include/asm-sparc64/thread_info.h | 8 +- - include/asm-x86/ptrace.h | 5 + - include/asm-x86/syscall.h | 210 ++++++++++++++ - include/asm-x86/thread_info_32.h | 2 + - include/asm-x86/thread_info_64.h | 4 +- - include/linux/ptrace.h | 72 +++++ - include/linux/sched.h | 10 +- - include/linux/tracehook.h | 575 +++++++++++++++++++++++++++++++++++++ - kernel/exit.c | 53 ++--- - kernel/fork.c | 74 ++--- - kernel/kthread.c | 2 +- - kernel/ptrace.c | 2 +- - kernel/sched.c | 29 ++- - kernel/signal.c | 99 ++++--- - lib/Makefile | 2 + - lib/syscall.c | 75 +++++ - mm/nommu.c | 4 +- - security/selinux/hooks.c | 22 +-- - 55 files changed, 1590 insertions(+), 371 deletions(-) + arch/Kconfig | 18 ++ + arch/ia64/kernel/perfmon.c | 4 +- + arch/x86/ia32/ia32_aout.c | 6 - + fs/binfmt_aout.c | 6 - + fs/binfmt_elf.c | 6 - + fs/binfmt_elf_fdpic.c | 7 - + fs/binfmt_flat.c | 3 - + fs/binfmt_som.c | 2 - + fs/exec.c | 12 +- + fs/proc/array.c | 9 +- + fs/proc/base.c | 39 +++- + include/asm-generic/syscall.h | 141 ++++++++++ + include/linux/ptrace.h | 72 +++++ + include/linux/sched.h | 10 +- + include/linux/tracehook.h | 575 +++++++++++++++++++++++++++++++++++++++++ + kernel/exit.c | 53 ++--- + kernel/fork.c | 74 ++---- + kernel/kthread.c | 2 +- + kernel/ptrace.c | 2 +- + kernel/sched.c | 29 ++- + kernel/signal.c | 99 +++++--- + lib/Makefile | 2 + + lib/syscall.c | 75 ++++++ + mm/nommu.c | 4 +- + security/selinux/hooks.c | 22 +-- + 25 files changed, 1084 insertions(+), 188 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig -index 3ea332b..1955fbd 100644 +index ad89a33..4641edf 100644 --- a/arch/Kconfig +++ b/arch/Kconfig -@@ -39,3 +39,21 @@ config HAVE_KRETPROBES - - config HAVE_DMA_ATTRS +@@ -37,6 +37,24 @@ config HAVE_KPROBES + config HAVE_KRETPROBES def_bool n -+ + +# +# An arch should select this if it provides all these things: +# @@ -81,31 +50,15 @@ +# +config HAVE_ARCH_TRACEHOOK + def_bool n -diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig -index 16be414..f23a54a 100644 ---- a/arch/ia64/Kconfig -+++ b/arch/ia64/Kconfig -@@ -19,6 +19,7 @@ config IA64 - select HAVE_OPROFILE - select HAVE_KPROBES - select HAVE_KRETPROBES -+ select HAVE_ARCH_TRACEHOOK - select HAVE_DMA_ATTRS - select HAVE_KVM - default y ++ + config HAVE_DMA_ATTRS + def_bool n + diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c -index 7714a97..189d525 100644 +index 19d4493..fc8f350 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -2626,7 +2627,7 @@ pfm_task_incompatible(pfm_context_t *ctx +@@ -2626,7 +2626,7 @@ pfm_task_incompatible(pfm_context_t *ctx /* * make sure the task is off any CPU */ @@ -114,16 +67,7 @@ /* more to come... */ -@@ -3684,7 +3685,7 @@ pfm_restart(pfm_context_t *ctx, void *ar - - PFM_SET_WORK_PENDING(task, 1); - -- tsk_set_notify_resume(task); -+ set_notify_resume(task); - - /* - * XXX: send reschedule if task runs on another CPU -@@ -4774,7 +4775,7 @@ recheck: +@@ -4774,7 +4774,7 @@ recheck: UNPROTECT_CTX(ctx, flags); @@ -132,541 +76,6 @@ PROTECT_CTX(ctx, flags); -@@ -5044,8 +5045,6 @@ pfm_handle_work(void) - - PFM_SET_WORK_PENDING(current, 0); - -- tsk_clear_notify_resume(current); -- - regs = task_pt_regs(current); - - /* -@@ -5414,7 +5413,7 @@ pfm_overflow_handler(struct task_struct - * when coming from ctxsw, current still points to the - * previous task, therefore we must work with task and not current. - */ -- tsk_set_notify_resume(task); -+ set_notify_resume(task); - } - /* - * defer until state is changed (shorten spin window). the context is locked -diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c -index a3a34b4..5164aab 100644 ---- a/arch/ia64/kernel/process.c -+++ b/arch/ia64/kernel/process.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -156,21 +157,6 @@ show_regs (struct pt_regs *regs) - show_stack(NULL, NULL); - } - --void tsk_clear_notify_resume(struct task_struct *tsk) --{ --#ifdef CONFIG_PERFMON -- if (tsk->thread.pfm_needs_checking) -- return; --#endif -- if (test_ti_thread_flag(task_thread_info(tsk), TIF_RESTORE_RSE)) -- return; -- clear_ti_thread_flag(task_thread_info(tsk), TIF_NOTIFY_RESUME); --} -- --/* -- * do_notify_resume_user(): -- * Called from notify_resume_user at entry.S, with interrupts disabled. -- */ - void - do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall) - { -@@ -199,6 +185,11 @@ do_notify_resume_user(sigset_t *unused, - ia64_do_signal(scr, in_syscall); - } - -+ if (test_thread_flag(TIF_NOTIFY_RESUME)) { -+ clear_thread_flag(TIF_NOTIFY_RESUME); -+ tracehook_notify_resume(&scr->pt); -+ } -+ - /* copy user rbs to kernel rbs */ - if (unlikely(test_thread_flag(TIF_RESTORE_RSE))) { - local_irq_enable(); /* force interrupt enable */ -diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c -index 2a9943b..3ba40a1 100644 ---- a/arch/ia64/kernel/ptrace.c -+++ b/arch/ia64/kernel/ptrace.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -603,7 +604,7 @@ void ia64_ptrace_stop(void) - { - if (test_and_set_tsk_thread_flag(current, TIF_RESTORE_RSE)) - return; -- tsk_set_notify_resume(current); -+ set_notify_resume(current); - unw_init_running(do_sync_rbs, ia64_sync_user_rbs); - } - -@@ -613,7 +614,6 @@ void ia64_ptrace_stop(void) - void ia64_sync_krbs(void) - { - clear_tsk_thread_flag(current, TIF_RESTORE_RSE); -- tsk_clear_notify_resume(current); - - unw_init_running(do_sync_rbs, ia64_sync_kernel_rbs); - } -@@ -644,7 +644,7 @@ ptrace_attach_sync_user_rbs (struct task - spin_lock_irq(&child->sighand->siglock); - if (child->state == TASK_STOPPED && - !test_and_set_tsk_thread_flag(child, TIF_RESTORE_RSE)) { -- tsk_set_notify_resume(child); -+ set_notify_resume(child); - - child->state = TASK_TRACED; - stopped = 1; -@@ -1232,27 +1232,6 @@ arch_ptrace (struct task_struct *child, - } - - --static void --syscall_trace (void) --{ -- /* -- * The 0x80 provides a way for the tracing parent to -- * distinguish between a syscall stop and SIGTRAP delivery. -- */ -- ptrace_notify(SIGTRAP -- | ((current->ptrace & PT_TRACESYSGOOD) ? 0x80 : 0)); -- -- /* -- * This isn't the same as continuing with a signal, but it -- * will do for normal use. strace only continues with a -- * signal if the stopping signal is not SIGTRAP. -brl -- */ -- if (current->exit_code) { -- send_sig(current->exit_code, current, 1); -- current->exit_code = 0; -- } --} -- - /* "asmlinkage" so the input arguments are preserved... */ - - asmlinkage void -@@ -1260,9 +1239,8 @@ syscall_trace_enter (long arg0, long arg - long arg4, long arg5, long arg6, long arg7, - struct pt_regs regs) - { -- if (test_thread_flag(TIF_SYSCALL_TRACE) -- && (current->ptrace & PT_PTRACED)) -- syscall_trace(); -+ if (test_thread_flag(TIF_SYSCALL_TRACE)) -+ tracehook_report_syscall_entry(®s); - - /* copy user rbs to kernel rbs */ - if (test_thread_flag(TIF_RESTORE_RSE)) -@@ -1292,6 +1270,8 @@ syscall_trace_leave (long arg0, long arg - long arg4, long arg5, long arg6, long arg7, - struct pt_regs regs) - { -+ int step; -+ - if (unlikely(current->audit_context)) { - int success = AUDITSC_RESULT(regs.r10); - long result = regs.r8; -@@ -1301,10 +1281,9 @@ syscall_trace_leave (long arg0, long arg - audit_syscall_exit(success, result); - } - -- if ((test_thread_flag(TIF_SYSCALL_TRACE) -- || test_thread_flag(TIF_SINGLESTEP)) -- && (current->ptrace & PT_PTRACED)) -- syscall_trace(); -+ step = test_thread_flag(TIF_SINGLESTEP); -+ if (step || test_thread_flag(TIF_SYSCALL_TRACE)) -+ tracehook_report_syscall_exit(®s, step); - - /* copy user rbs to kernel rbs */ - if (test_thread_flag(TIF_RESTORE_RSE)) -@@ -1940,7 +1919,7 @@ gpregs_writeback(struct task_struct *tar - { - if (test_and_set_tsk_thread_flag(target, TIF_RESTORE_RSE)) - return 0; -- tsk_set_notify_resume(target); -+ set_notify_resume(target); - return do_regset_call(do_gpregs_writeback, target, regset, 0, 0, - NULL, NULL); - } -diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c -index 19c5a78..e12500a 100644 ---- a/arch/ia64/kernel/signal.c -+++ b/arch/ia64/kernel/signal.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -439,6 +440,13 @@ handle_signal (unsigned long sig, struct - sigaddset(¤t->blocked, sig); - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); -+ -+ /* -+ * Let tracing know that we've done the handler setup. -+ */ -+ tracehook_signal_handler(sig, info, ka, &scr->pt, -+ test_thread_flag(TIF_SINGLESTEP)); -+ - return 1; - } - -diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c -index 469c723..a48edbe 100644 ---- a/arch/mips/kernel/irixelf.c -+++ b/arch/mips/kernel/irixelf.c -@@ -808,8 +808,6 @@ static int load_irix_binary(struct linux - #endif - - start_thread(regs, elf_entry, bprm->p); -- if (current->ptrace & PT_PTRACED) -- send_sig(SIGTRAP, current, 0); - return 0; - out: - return retval; -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 3934e26..52486c7 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -109,6 +109,7 @@ config PPC - select HAVE_OPROFILE - select HAVE_KPROBES - select HAVE_KRETPROBES -+ select HAVE_ARCH_TRACEHOOK - select HAVE_LMB - - config EARLY_PRINTK -diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S -index 3a05e9f..eb40c67 100644 ---- a/arch/powerpc/kernel/entry_32.S -+++ b/arch/powerpc/kernel/entry_32.S -@@ -299,7 +299,12 @@ syscall_dotrace: - stw r0,_TRAP(r1) - addi r3,r1,STACK_FRAME_OVERHEAD - bl do_syscall_trace_enter -- lwz r0,GPR0(r1) /* Restore original registers */ -+ /* -+ * Restore argument registers possibly just changed. -+ * We use the return value of do_syscall_trace_enter -+ * for call number to look up in the table (r0). -+ */ -+ mr r0,r3 - lwz r3,GPR3(r1) - lwz r4,GPR4(r1) - lwz r5,GPR5(r1) -@@ -938,8 +943,8 @@ do_user_signal: /* r10 contains MSR_KE - SAVE_NVGPRS(r1) - rlwinm r3,r3,0,0,30 - stw r3,_TRAP(r1) --2: li r3,0 -- addi r4,r1,STACK_FRAME_OVERHEAD -+2: addi r3,r1,STACK_FRAME_OVERHEAD -+ mr r4,r9 - bl do_signal - REST_NVGPRS(r1) - b recheck -diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S -index c0db5b7..2a13029 100644 ---- a/arch/powerpc/kernel/entry_64.S -+++ b/arch/powerpc/kernel/entry_64.S -@@ -213,7 +213,12 @@ syscall_dotrace: - bl .save_nvgprs - addi r3,r1,STACK_FRAME_OVERHEAD - bl .do_syscall_trace_enter -- ld r0,GPR0(r1) /* Restore original registers */ -+ /* -+ * Restore argument registers possibly just changed. -+ * We use the return value of do_syscall_trace_enter -+ * for the call number to look up in the table (r0). -+ */ -+ mr r0,r3 - ld r3,GPR3(r1) - ld r4,GPR4(r1) - ld r5,GPR5(r1) -@@ -632,8 +637,7 @@ user_work: - b .ret_from_except_lite - - 1: bl .save_nvgprs -- li r3,0 -- addi r4,r1,STACK_FRAME_OVERHEAD -+ addi r3,r1,STACK_FRAME_OVERHEAD - bl .do_signal - b .ret_from_except - -diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c -index 91ee077..b9bf411 100644 ---- a/arch/powerpc/kernel/ptrace.c -+++ b/arch/powerpc/kernel/ptrace.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -866,31 +867,24 @@ long arch_ptrace(struct task_struct *chi - return ret; - } - --static void do_syscall_trace(void) -+/* -+ * We must return the syscall number to actually look up in the table. -+ * This can be -1L to skip running any syscall at all. -+ */ -+long do_syscall_trace_enter(struct pt_regs *regs) - { -- /* the 0x80 provides a way for the tracing parent to distinguish -- between a syscall stop and SIGTRAP delivery */ -- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) -- ? 0x80 : 0)); -- -- /* -- * this isn't the same as continuing with a signal, but it will do -- * for normal use. strace only continues with a signal if the -- * stopping signal is not SIGTRAP. -brl -- */ -- if (current->exit_code) { -- send_sig(current->exit_code, current, 1); -- current->exit_code = 0; -- } --} -+ long ret = 0; - --void do_syscall_trace_enter(struct pt_regs *regs) --{ - secure_computing(regs->gpr[0]); - -- if (test_thread_flag(TIF_SYSCALL_TRACE) -- && (current->ptrace & PT_PTRACED)) -- do_syscall_trace(); -+ if (test_thread_flag(TIF_SYSCALL_TRACE) && -+ tracehook_report_syscall_entry(regs)) -+ /* -+ * Tracing decided this syscall should not happen. -+ * We'll return a bogus call number to get an ENOSYS -+ * error, but leave the original number in regs->gpr[0]. -+ */ -+ ret = -1L; - - if (unlikely(current->audit_context)) { - #ifdef CONFIG_PPC64 -@@ -908,16 +902,19 @@ void do_syscall_trace_enter(struct pt_re - regs->gpr[5] & 0xffffffff, - regs->gpr[6] & 0xffffffff); - } -+ -+ return ret ?: regs->gpr[0]; - } - - void do_syscall_trace_leave(struct pt_regs *regs) - { -+ int step; -+ - if (unlikely(current->audit_context)) - audit_syscall_exit((regs->ccr&0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, - regs->result); - -- if ((test_thread_flag(TIF_SYSCALL_TRACE) -- || test_thread_flag(TIF_SINGLESTEP)) -- && (current->ptrace & PT_PTRACED)) -- do_syscall_trace(); -+ step = test_thread_flag(TIF_SINGLESTEP); -+ if (step || test_thread_flag(TIF_SYSCALL_TRACE)) -+ tracehook_report_syscall_exit(regs, step); - } -diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c -index ad55488..e032336 100644 ---- a/arch/powerpc/kernel/signal.c -+++ b/arch/powerpc/kernel/signal.c -@@ -9,7 +9,7 @@ - * this archive for more details. - */ - --#include -+#include - #include - #include - #include -@@ -112,7 +112,7 @@ static void check_syscall_restart(struct - } - } - --int do_signal(sigset_t *oldset, struct pt_regs *regs) -+static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs) - { - siginfo_t info; - int signr; -@@ -173,11 +173,28 @@ int do_signal(sigset_t *oldset, struct p - * its frame, and we can clear the TLF_RESTORE_SIGMASK flag. - */ - current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK; -+ -+ /* -+ * Let tracing know that we've done the handler setup. -+ */ -+ tracehook_signal_handler(signr, &info, &ka, regs, -+ test_thread_flag(TIF_SINGLESTEP)); - } - - return ret; - } - -+void do_signal(struct pt_regs *regs, unsigned long thread_info_flags) -+{ -+ if (thread_info_flags & _TIF_SIGPENDING) -+ do_signal_pending(NULL, regs); -+ -+ if (thread_info_flags & _TIF_NOTIFY_RESUME) { -+ clear_thread_flag(TIF_NOTIFY_RESUME); -+ tracehook_notify_resume(regs); -+ } -+} -+ - long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, - unsigned long r5, unsigned long r6, unsigned long r7, - unsigned long r8, struct pt_regs *regs) -diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig -index eb36f3b..94504d4 100644 ---- a/arch/sparc64/Kconfig -+++ b/arch/sparc64/Kconfig -@@ -11,6 +11,7 @@ config SPARC - config SPARC64 - bool - default y -+ select HAVE_ARCH_TRACEHOOK - select HAVE_IDE - select HAVE_LMB - select HAVE_ARCH_KGDB -diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c -index f6c9fc9..2e3f998 100644 ---- a/arch/sparc64/kernel/ptrace.c -+++ b/arch/sparc64/kernel/ptrace.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -1064,26 +1065,13 @@ asmlinkage void syscall_trace(struct pt_ - audit_syscall_exit(result, regs->u_regs[UREG_I0]); - } - -- if (!(current->ptrace & PT_PTRACED)) -- goto out; -- -- if (!test_thread_flag(TIF_SYSCALL_TRACE)) -- goto out; -- -- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) -- ? 0x80 : 0)); -- -- /* -- * this isn't the same as continuing with a signal, but it will do -- * for normal use. strace only continues with a signal if the -- * stopping signal is not SIGTRAP. -brl -- */ -- if (current->exit_code) { -- send_sig(current->exit_code, current, 1); -- current->exit_code = 0; -+ if (test_thread_flag(TIF_SYSCALL_TRACE)) { -+ if (syscall_exit_p) -+ tracehook_report_syscall_exit(regs, 0); -+ else -+ tracehook_report_syscall_entry(regs); - } - --out: - if (unlikely(current->audit_context) && !syscall_exit_p) - audit_syscall_entry((test_thread_flag(TIF_32BIT) ? - AUDIT_ARCH_SPARC : -diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S -index c6fc695..97a993c 100644 ---- a/arch/sparc64/kernel/rtrap.S -+++ b/arch/sparc64/kernel/rtrap.S -@@ -46,7 +46,7 @@ __handle_user_windows: - wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate - ldx [%g6 + TI_FLAGS], %l0 - --1: andcc %l0, _TIF_SIGPENDING, %g0 -+1: andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 - be,pt %xcc, __handle_user_windows_continue - nop - mov %l5, %o1 -@@ -86,7 +86,7 @@ __handle_perfctrs: - wrpr %g0, RTRAP_PSTATE, %pstate - wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate - ldx [%g6 + TI_FLAGS], %l0 --1: andcc %l0, _TIF_SIGPENDING, %g0 -+1: andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 - - be,pt %xcc, __handle_perfctrs_continue - sethi %hi(TSTATE_PEF), %o0 -@@ -195,7 +195,7 @@ __handle_preemption_continue: - andcc %l1, %o0, %g0 - andcc %l0, _TIF_NEED_RESCHED, %g0 - bne,pn %xcc, __handle_preemption -- andcc %l0, _TIF_SIGPENDING, %g0 -+ andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 - bne,pn %xcc, __handle_signal - __handle_signal_continue: - ldub [%g6 + TI_WSAVED], %o2 -diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c -index 9667e96..9424fda 100644 ---- a/arch/sparc64/kernel/signal.c -+++ b/arch/sparc64/kernel/signal.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -605,4 +606,8 @@ void do_notify_resume(struct pt_regs *re - { - if (thread_info_flags & _TIF_SIGPENDING) - do_signal(regs, orig_i0); -+ if (thread_info_flags & _TIF_NOTIFY_RESUME) { -+ clear_thread_flag(TIF_NOTIFY_RESUME); -+ tracehook_notify_resume(regs); -+ } - } -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index bf07b6f..1c42efb 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -25,6 +25,7 @@ config X86 - select HAVE_KRETPROBES - select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) - select HAVE_ARCH_KGDB if !X86_VOYAGER -+ select HAVE_ARCH_TRACEHOOK - - config ARCH_DEFCONFIG - string diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index 58cccb6..a0e1dbe 100644 --- a/arch/x86/ia32/ia32_aout.c @@ -684,232 +93,6 @@ return 0; } -diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c -index 652f550..d537484 100644 ---- a/arch/x86/kernel/ptrace.c -+++ b/arch/x86/kernel/ptrace.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1375,30 +1376,6 @@ void send_sigtrap(struct task_struct *ts - force_sig_info(SIGTRAP, &info, tsk); - } - --static void syscall_trace(struct pt_regs *regs) --{ -- if (!(current->ptrace & PT_PTRACED)) -- return; -- --#if 0 -- printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n", -- current->comm, -- regs->ip, regs->sp, regs->ax, regs->orig_ax, __builtin_return_address(0), -- current_thread_info()->flags, current->ptrace); --#endif -- -- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) -- ? 0x80 : 0)); -- /* -- * this isn't the same as continuing with a signal, but it will do -- * for normal use. strace only continues with a signal if the -- * stopping signal is not SIGTRAP. -brl -- */ -- if (current->exit_code) { -- send_sig(current->exit_code, current, 1); -- current->exit_code = 0; -- } --} - - #ifdef CONFIG_X86_32 - # define IS_IA32 1 -@@ -1432,8 +1409,9 @@ asmregparm long syscall_trace_enter(stru - if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) - ret = -1L; - -- if (ret || test_thread_flag(TIF_SYSCALL_TRACE)) -- syscall_trace(regs); -+ if ((ret || test_thread_flag(TIF_SYSCALL_TRACE)) && -+ tracehook_report_syscall_entry(regs)) -+ ret = -1L; - - if (unlikely(current->audit_context)) { - if (IS_IA32) -@@ -1459,7 +1437,7 @@ asmregparm void syscall_trace_leave(stru - audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); - - if (test_thread_flag(TIF_SYSCALL_TRACE)) -- syscall_trace(regs); -+ tracehook_report_syscall_exit(regs, 0); - - /* - * If TIF_SYSCALL_EMU is set, we only get here because of -@@ -1475,6 +1453,6 @@ asmregparm void syscall_trace_leave(stru - * system call instruction. - */ - if (test_thread_flag(TIF_SINGLESTEP) && -- (current->ptrace & PT_PTRACED)) -+ tracehook_consider_fatal_signal(current, SIGTRAP, SIG_DFL)) - send_sigtrap(current, regs, 0); - } -diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c -index 295b5f5..c17c0cb 100644 ---- a/arch/x86/kernel/signal_32.c -+++ b/arch/x86/kernel/signal_32.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -558,8 +559,6 @@ handle_signal(unsigned long sig, siginfo - * handler too. - */ - regs->flags &= ~X86_EFLAGS_TF; -- if (test_thread_flag(TIF_SINGLESTEP)) -- ptrace_notify(SIGTRAP); - - spin_lock_irq(¤t->sighand->siglock); - sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); -@@ -568,6 +567,9 @@ handle_signal(unsigned long sig, siginfo - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - -+ tracehook_signal_handler(sig, info, ka, regs, -+ test_thread_flag(TIF_SINGLESTEP)); -+ - return 0; - } - -@@ -661,6 +663,11 @@ do_notify_resume(struct pt_regs *regs, v - if (thread_info_flags & _TIF_SIGPENDING) - do_signal(regs); - -+ if (thread_info_flags & _TIF_NOTIFY_RESUME) { -+ clear_thread_flag(TIF_NOTIFY_RESUME); -+ tracehook_notify_resume(regs); -+ } -+ - if (thread_info_flags & _TIF_HRTICK_RESCHED) - hrtick_resched(); - -diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c -index bf87684..f65ece6 100644 ---- a/arch/x86/kernel/signal_64.c -+++ b/arch/x86/kernel/signal_64.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -26,6 +27,7 @@ - #include - #include - #include -+#include - #include "sigframe.h" - - #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) -@@ -293,35 +295,6 @@ give_sigsegv: - } - - /* -- * Return -1L or the syscall number that @regs is executing. -- */ --static long current_syscall(struct pt_regs *regs) --{ -- /* -- * We always sign-extend a -1 value being set here, -- * so this is always either -1L or a syscall number. -- */ -- return regs->orig_ax; --} -- --/* -- * Return a value that is -EFOO if the system call in @regs->orig_ax -- * returned an error. This only works for @regs from @current. -- */ --static long current_syscall_ret(struct pt_regs *regs) --{ --#ifdef CONFIG_IA32_EMULATION -- if (test_thread_flag(TIF_IA32)) -- /* -- * Sign-extend the value so (int)-EFOO becomes (long)-EFOO -- * and will match correctly in comparisons. -- */ -- return (int) regs->ax; --#endif -- return regs->ax; --} -- --/* - * OK, we're invoking a handler - */ - -@@ -332,9 +305,9 @@ handle_signal(unsigned long sig, siginfo - int ret; - - /* Are we from a system call? */ -- if (current_syscall(regs) >= 0) { -+ if (syscall_get_nr(current, regs) >= 0) { - /* If so, check system call restarting.. */ -- switch (current_syscall_ret(regs)) { -+ switch (syscall_get_error(current, regs)) { - case -ERESTART_RESTARTBLOCK: - case -ERESTARTNOHAND: - regs->ax = -EINTR; -@@ -391,8 +364,6 @@ handle_signal(unsigned long sig, siginfo - * handler too. - */ - regs->flags &= ~X86_EFLAGS_TF; -- if (test_thread_flag(TIF_SINGLESTEP)) -- ptrace_notify(SIGTRAP); - - spin_lock_irq(¤t->sighand->siglock); - sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); -@@ -400,6 +371,9 @@ handle_signal(unsigned long sig, siginfo - sigaddset(¤t->blocked,sig); - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); -+ -+ tracehook_signal_handler(sig, info, ka, regs, -+ test_thread_flag(TIF_SINGLESTEP)); - } - - return ret; -@@ -456,9 +430,9 @@ static void do_signal(struct pt_regs *re - } - - /* Did we come from a system call? */ -- if (current_syscall(regs) >= 0) { -+ if (syscall_get_nr(current, regs) >= 0) { - /* Restart the system call - no handlers present */ -- switch (current_syscall_ret(regs)) { -+ switch (syscall_get_error(current, regs)) { - case -ERESTARTNOHAND: - case -ERESTARTSYS: - case -ERESTARTNOINTR: -@@ -497,6 +471,11 @@ void do_notify_resume(struct pt_regs *re - if (thread_info_flags & _TIF_SIGPENDING) - do_signal(regs); - -+ if (thread_info_flags & _TIF_NOTIFY_RESUME) { -+ clear_thread_flag(TIF_NOTIFY_RESUME); -+ tracehook_notify_resume(regs); -+ } -+ - if (thread_info_flags & _TIF_HRTICK_RESCHED) - hrtick_resched(); - } diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index ba4cddb..204cfd1 100644 --- a/fs/binfmt_aout.c @@ -928,10 +111,10 @@ } diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index d48ff5f..66a2bdc 100644 +index 639d2d8..fcfe706 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c -@@ -974,12 +974,6 @@ static int load_elf_binary(struct linux_ +@@ -975,12 +975,6 @@ static int load_elf_binary(struct linux_ #endif start_thread(regs, elf_entry, bprm->p); @@ -1061,7 +244,7 @@ "State:\t%s\n" "Tgid:\t%d\n" diff --git a/fs/proc/base.c b/fs/proc/base.c -index 3b45537..eb59321 100644 +index 58c3e6a..6c950c7 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -69,6 +69,7 @@ @@ -1078,20 +261,20 @@ */ - if (task->parent == current && (task->ptrace & PT_PTRACED) && - task_is_stopped_or_traced(task) && -- ptrace_may_attach(task)) +- ptrace_may_access(task, PTRACE_MODE_ATTACH)) - return 0; + if (task_is_stopped_or_traced(task)) { + int match; + rcu_read_lock(); + match = (tracehook_tracer_task(task) == current); + rcu_read_unlock(); -+ if (match && ptrace_may_attach(task)) ++ if (match && ptrace_may_access(task, PTRACE_MODE_ATTACH)) + return 0; + } /* * Noone else is allowed. -@@ -503,6 +508,26 @@ static int proc_pid_limits(struct task_s +@@ -504,6 +509,26 @@ static int proc_pid_limits(struct task_s return count; } @@ -1118,7 +301,7 @@ /************************************************************************/ /* Here the fs part begins */ /************************************************************************/ -@@ -2419,6 +2444,9 @@ static const struct pid_entry tgid_base_ +@@ -2420,6 +2445,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, pid_sched), #endif @@ -1128,7 +311,7 @@ INF("cmdline", S_IRUGO, pid_cmdline), ONE("stat", S_IRUGO, tgid_stat), ONE("statm", S_IRUGO, pid_statm), -@@ -2751,6 +2779,9 @@ static const struct pid_entry tid_base_s +@@ -2752,6 +2780,9 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, pid_sched), #endif @@ -1140,7 +323,7 @@ ONE("statm", S_IRUGO, pid_statm), diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h new file mode 100644 -index ...fd57a55 100644 +index ...abcf34c 100644 --- /dev/null +++ b/include/asm-generic/syscall.h @@ -0,0 +1,141 @@ @@ -1264,7 +447,7 @@ + unsigned int i, unsigned int n, unsigned long *args); + +/** -+ * syscall_set_argument - change system call parameter value ++ * syscall_set_arguments - change system call parameter value + * @task: task of interest, must be in system call entry tracing + * @regs: task_pt_regs() of @task + * @i: argument index [0,5] @@ -1285,560 +468,11 @@ + const unsigned long *args); + +#endif /* _ASM_SYSCALL_H */ -diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h -index 2422ac6..05158b8 100644 ---- a/include/asm-ia64/thread_info.h -+++ b/include/asm-ia64/thread_info.h -@@ -85,9 +85,6 @@ struct thread_info { - #define alloc_task_struct() ((struct task_struct *)__get_free_pages(GFP_KERNEL | __GFP_COMP, KERNEL_STACK_SIZE_ORDER)) - #define free_task_struct(tsk) free_pages((unsigned long) (tsk), KERNEL_STACK_SIZE_ORDER) - --#define tsk_set_notify_resume(tsk) \ -- set_ti_thread_flag(task_thread_info(tsk), TIF_NOTIFY_RESUME) --extern void tsk_clear_notify_resume(struct task_struct *tsk); - #endif /* !__ASSEMBLY */ - - /* -diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h -index 6a3892d..33ec703 100644 ---- a/include/asm-powerpc/ptrace.h -+++ b/include/asm-powerpc/ptrace.h -@@ -84,6 +84,7 @@ struct pt_regs { - #ifndef __ASSEMBLY__ - - #define instruction_pointer(regs) ((regs)->nip) -+#define user_stack_pointer(regs) ((regs)->gpr[1]) - #define regs_return_value(regs) ((regs)->gpr[3]) - - #ifdef CONFIG_SMP -diff --git a/include/asm-powerpc/signal.h b/include/asm-powerpc/signal.h -index a8c7bab..a7360cd 100644 ---- a/include/asm-powerpc/signal.h -+++ b/include/asm-powerpc/signal.h -@@ -122,8 +122,7 @@ typedef struct sigaltstack { - - #ifdef __KERNEL__ - struct pt_regs; --extern int do_signal(sigset_t *oldset, struct pt_regs *regs); --extern int do_signal32(sigset_t *oldset, struct pt_regs *regs); -+extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags); - #define ptrace_signal_deliver(regs, cookie) do { } while (0) - #endif /* __KERNEL__ */ - -diff --git a/include/asm-powerpc/syscall.h b/include/asm-powerpc/syscall.h -new file mode 100644 -index ...174e1ad 100644 ---- /dev/null -+++ b/include/asm-powerpc/syscall.h -@@ -0,0 +1,73 @@ -+/* -+ * Access to user system call parameters and results -+ * -+ * Copyright (C) 2008 Red Hat, Inc. All rights reserved. -+ * -+ * This copyrighted material is made available to anyone wishing to use, -+ * modify, copy, or redistribute it subject to the terms and conditions -+ * of the GNU General Public License v.2. -+ * -+ * See asm-generic/syscall.h for descriptions of what we must do here. -+ */ -+ -+#ifndef _ASM_SYSCALL_H -+#define _ASM_SYSCALL_H 1 -+ -+#include -+ -+static inline long syscall_get_nr(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ return regs->trap == 0xc01 ? regs->gpr[0] : -1L; -+} -+ -+static inline void syscall_rollback(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ regs->gpr[3] = regs->orig_gpr3; -+} -+ -+static inline long syscall_get_error(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ return (regs->ccr & 0x1000) ? -regs->gpr[3] : 0; -+} -+ -+static inline long syscall_get_return_value(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ return regs->gpr[3]; -+} -+ -+static inline void syscall_set_return_value(struct task_struct *task, -+ struct pt_regs *regs, -+ int error, long val) -+{ -+ if (error) { -+ regs->ccr |= 0x1000L; -+ regs->gpr[3] = -error; -+ } else { -+ regs->ccr &= ~0x1000L; -+ regs->gpr[3] = val; -+ } -+} -+ -+static inline void syscall_get_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ unsigned long args[n]) -+{ -+ BUG_ON(i + n > 6); -+ memcpy(args, ®s->gpr[3 + i], n * sizeof(args[0])); -+} -+ -+static inline void syscall_set_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ const unsigned long args[n]) -+{ -+ BUG_ON(i + n > 6); -+ memcpy(®s->gpr[3 + i], args, n * sizeof(args[0])); -+} -+ -+#endif /* _ASM_SYSCALL_H */ -diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h -index e079e81..d0005e8 100644 ---- a/include/asm-powerpc/thread_info.h -+++ b/include/asm-powerpc/thread_info.h -@@ -116,6 +116,7 @@ static inline struct thread_info *curren - #define TIF_SECCOMP 10 /* secure computing */ - #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */ - #define TIF_NOERROR 12 /* Force successful syscall return */ -+#define TIF_NOTIFY_RESUME 13 /* callback before returning to user */ - #define TIF_FREEZE 14 /* Freezing for suspend */ - #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ - #define TIF_ABI_PENDING 16 /* 32/64 bit switch needed */ -@@ -133,12 +134,14 @@ static inline struct thread_info *curren - #define _TIF_SECCOMP (1<syscall_noer - } while (0) - #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV)) - #define instruction_pointer(regs) ((regs)->tpc) -+#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) - #define regs_return_value(regs) ((regs)->u_regs[UREG_I0]) - #ifdef CONFIG_SMP - extern unsigned long profile_pc(struct pt_regs *); -diff --git a/include/asm-sparc64/syscall.h b/include/asm-sparc64/syscall.h -new file mode 100644 -index ...c00fb1a 100644 ---- /dev/null -+++ b/include/asm-sparc64/syscall.h -@@ -0,0 +1,70 @@ -+/* -+ * Access to user system call parameters and results -+ * -+ * Copyright (C) 2008 Red Hat, Inc. All rights reserved. -+ * -+ * This copyrighted material is made available to anyone wishing to use, -+ * modify, copy, or redistribute it subject to the terms and conditions -+ * of the GNU General Public License v.2. -+ * -+ * See asm-generic/syscall.h for descriptions of what we must do here. -+ */ -+ -+#ifndef _ASM_SYSCALL_H -+#define _ASM_SYSCALL_H 1 -+ -+#include -+struct task_struct; -+ -+static inline long syscall_get_nr(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ return pt_regs_is_syscall(regs) ? regs->u_regs[UREG_G1] : -1L; -+} -+ -+static inline long syscall_get_error(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ if (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY)) -+ return -regs->u_regs[UREG_I0]; -+ return 0; -+} -+ -+static inline long syscall_get_return_value(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ return regs->u_regs[UREG_I0]; -+} -+ -+static inline void syscall_set_return_value(struct task_struct *task, -+ struct pt_regs *regs, -+ int error, long val) -+{ -+ if (error) { -+ regs->tstate |= (TSTATE_XCARRY | TSTATE_ICARRY); -+ regs->u_regs[UREG_I0] = -error; -+ } else { -+ regs->tstate &= ~(TSTATE_XCARRY | TSTATE_ICARRY); -+ regs->u_regs[UREG_I0] = val; -+ } -+} -+ -+static inline void syscall_get_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ unsigned long args[n]) -+{ -+ BUG_ON(i + n > 6); -+ memcpy(args, ®s->u_regs[UREG_I0 + i], n * sizeof(args[0])); -+} -+ -+static inline void syscall_set_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ const unsigned long args[n]) -+{ -+ BUG_ON(i + n > 6); -+ memcpy(®s->u_regs[UREG_I0 + i], args, n * sizeof(args[0])); -+} -+ -+#endif /* _ASM_SYSCALL_H */ -diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h -index e5873e3..a4d0147 100644 ---- a/include/asm-sparc64/thread_info.h -+++ b/include/asm-sparc64/thread_info.h -@@ -217,7 +217,7 @@ register struct thread_info *current_thr - * nop - */ - #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ --/* flags bit 1 is available */ -+#define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ - #define TIF_SIGPENDING 2 /* signal pending */ - #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ - #define TIF_PERFCTR 4 /* performance counters active */ -@@ -237,6 +237,7 @@ register struct thread_info *current_thr - #define TIF_POLLING_NRFLAG 14 - - #define _TIF_SYSCALL_TRACE (1<bp; - } - -+static inline unsigned long user_stack_pointer(struct pt_regs *regs) -+{ -+ return regs->sp; -+} -+ - /* - * These are defined as per linux/ptrace.h, which see. - */ -diff --git a/include/asm-x86/syscall.h b/include/asm-x86/syscall.h -new file mode 100644 -index ...7de35f0 100644 ---- /dev/null -+++ b/include/asm-x86/syscall.h -@@ -0,0 +1,210 @@ -+/* -+ * Access to user system call parameters and results -+ * -+ * Copyright (C) 2008 Red Hat, Inc. All rights reserved. -+ * -+ * This copyrighted material is made available to anyone wishing to use, -+ * modify, copy, or redistribute it subject to the terms and conditions -+ * of the GNU General Public License v.2. -+ * -+ * See asm-generic/syscall.h for descriptions of what we must do here. -+ */ -+ -+#ifndef _ASM_SYSCALL_H -+#define _ASM_SYSCALL_H 1 -+ -+#include -+ -+static inline long syscall_get_nr(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ /* -+ * We always sign-extend a -1 value being set here, -+ * so this is always either -1L or a syscall number. -+ */ -+ return regs->orig_ax; -+} -+ -+static inline void syscall_rollback(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ regs->ax = regs->orig_ax; -+} -+ -+static inline long syscall_get_error(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ unsigned long error = regs->ax; -+#ifdef CONFIG_IA32_EMULATION -+ /* -+ * TS_COMPAT is set for 32-bit syscall entries and then -+ * remains set until we return to user mode. -+ */ -+ if (task_thread_info(task)->status & TS_COMPAT) -+ /* -+ * Sign-extend the value so (int)-EFOO becomes (long)-EFOO -+ * and will match correctly in comparisons. -+ */ -+ error = (long) (int) error; -+#endif -+ return error >= -4095L ? error : 0; -+} -+ -+static inline long syscall_get_return_value(struct task_struct *task, -+ struct pt_regs *regs) -+{ -+ return regs->ax; -+} -+ -+static inline void syscall_set_return_value(struct task_struct *task, -+ struct pt_regs *regs, -+ int error, long val) -+{ -+ regs->ax = (long) error ?: val; -+} -+ -+#ifdef CONFIG_X86_32 -+ -+static inline void syscall_get_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ unsigned long args[n]) -+{ -+ BUG_ON(i + n > 6); -+ memcpy(args, ®s->bx + i, n * sizeof(args[0])); -+} -+ -+static inline void syscall_set_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ const unsigned long args[n]) -+{ -+ BUG_ON(i + n > 6); -+ memcpy(®s->bx + i, args, n * sizeof(args[0])); -+} -+ -+#else /* CONFIG_X86_64 */ -+ -+static inline void syscall_get_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ unsigned long *args) -+{ -+# ifdef CONFIG_IA32_EMULATION -+ if (task_thread_info(task)->status & TS_COMPAT) -+ switch (i + n) { -+ case 6: -+ if (!n--) break; -+ *args++ = regs->bp; -+ case 5: -+ if (!n--) break; -+ *args++ = regs->di; -+ case 4: -+ if (!n--) break; -+ *args++ = regs->si; -+ case 3: -+ if (!n--) break; -+ *args++ = regs->dx; -+ case 2: -+ if (!n--) break; -+ *args++ = regs->cx; -+ case 1: -+ if (!n--) break; -+ *args++ = regs->bx; -+ case 0: -+ if (!n--) break; -+ default: -+ BUG(); -+ break; -+ } -+ else -+# endif -+ switch (i + n) { -+ case 6: -+ if (!n--) break; -+ *args++ = regs->r9; -+ case 5: -+ if (!n--) break; -+ *args++ = regs->r8; -+ case 4: -+ if (!n--) break; -+ *args++ = regs->r10; -+ case 3: -+ if (!n--) break; -+ *args++ = regs->dx; -+ case 2: -+ if (!n--) break; -+ *args++ = regs->si; -+ case 1: -+ if (!n--) break; -+ *args++ = regs->di; -+ case 0: -+ if (!n--) break; -+ default: -+ BUG(); -+ break; -+ } -+} -+ -+static inline void syscall_set_arguments(struct task_struct *task, -+ struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ const unsigned long *args) -+{ -+# ifdef CONFIG_IA32_EMULATION -+ if (task_thread_info(task)->status & TS_COMPAT) -+ switch (i + n) { -+ case 6: -+ if (!n--) break; -+ regs->bp = *args++; -+ case 5: -+ if (!n--) break; -+ regs->di = *args++; -+ case 4: -+ if (!n--) break; -+ regs->si = *args++; -+ case 3: -+ if (!n--) break; -+ regs->dx = *args++; -+ case 2: -+ if (!n--) break; -+ regs->cx = *args++; -+ case 1: -+ if (!n--) break; -+ regs->bx = *args++; -+ case 0: -+ if (!n--) break; -+ default: -+ BUG(); -+ } -+ else -+# endif -+ switch (i + n) { -+ case 6: -+ if (!n--) break; -+ regs->r9 = *args++; -+ case 5: -+ if (!n--) break; -+ regs->r8 = *args++; -+ case 4: -+ if (!n--) break; -+ regs->r10 = *args++; -+ case 3: -+ if (!n--) break; -+ regs->dx = *args++; -+ case 2: -+ if (!n--) break; -+ regs->si = *args++; -+ case 1: -+ if (!n--) break; -+ regs->di = *args++; -+ case 0: -+ if (!n--) break; -+ default: -+ BUG(); -+ } -+} -+ -+#endif /* CONFIG_X86_32 */ -+ -+#endif /* _ASM_SYSCALL_H */ -diff --git a/include/asm-x86/thread_info_32.h b/include/asm-x86/thread_info_32.h -index 3267d9c..975e2b1 100644 ---- a/include/asm-x86/thread_info_32.h -+++ b/include/asm-x86/thread_info_32.h -@@ -131,6 +131,7 @@ static inline struct thread_info *curren - #define TIF_SYSCALL_EMU 5 /* syscall emulation active */ - #define TIF_SYSCALL_AUDIT 6 /* syscall auditing active */ - #define TIF_SECCOMP 7 /* secure computing */ -+#define TIF_NOTIFY_RESUME 8 /* callback before returning to user */ - #define TIF_HRTICK_RESCHED 9 /* reprogram hrtick timer */ - #define TIF_MEMDIE 16 - #define TIF_DEBUG 17 /* uses debug registers */ -@@ -150,6 +151,7 @@ static inline struct thread_info *curren - #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) - #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) - #define _TIF_SECCOMP (1 << TIF_SECCOMP) -+#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) - #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) - #define _TIF_DEBUG (1 << TIF_DEBUG) - #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) -diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h -index a531e79..f1281a7 100644 ---- a/include/asm-x86/thread_info_64.h -+++ b/include/asm-x86/thread_info_64.h -@@ -103,6 +103,7 @@ static inline struct thread_info *stack_ - * Warning: layout of LSW is hardcoded in entry.S - */ - #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ -+#define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ - #define TIF_SIGPENDING 2 /* signal pending */ - #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ - #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ -@@ -127,6 +128,7 @@ static inline struct thread_info *stack_ - #define TIF_NOTSC 28 /* TSC is not accessible in userland */ - - #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) -+#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) - #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) - #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) - #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) -@@ -165,7 +167,7 @@ static inline struct thread_info *stack_ - #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) - - #define _TIF_DO_NOTIFY_MASK \ -- (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) -+ (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED|_TIF_NOTIFY_RESUME) - - /* flags to check in __switch_to() */ - #define _TIF_WORK_CTXSW \ diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h -index f98501b..c6d85c5 100644 +index c6f5f9d..fd31756 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h -@@ -117,6 +117,74 @@ static inline void ptrace_unlink(struct +@@ -121,6 +121,74 @@ static inline void ptrace_unlink(struct int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data); int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data); @@ -1913,7 +547,7 @@ #ifndef force_successful_syscall_return /* * System call handlers that, upon successful completion, need to return a -@@ -242,6 +310,10 @@ static inline void user_enable_block_ste +@@ -246,6 +314,10 @@ static inline void user_enable_block_ste #define arch_ptrace_stop(code, info) do { } while (0) #endif @@ -1925,10 +559,10 @@ #endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index 75145b7..c77eeb8 100644 +index dc7e592..fdcd427 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1779,7 +1779,7 @@ extern int kill_pid_info_as_uid(int, str +@@ -1795,7 +1795,7 @@ extern int kill_pid_info_as_uid(int, str extern int kill_pgrp(struct pid *pid, int sig, int priv); extern int kill_pid(struct pid *pid, int sig, int priv); extern int kill_proc_info(int, struct siginfo *, pid_t); @@ -1937,7 +571,7 @@ extern void force_sig(int, struct task_struct *); extern void force_sig_specific(int, struct task_struct *); extern int send_sig(int, struct task_struct *, int); -@@ -1866,9 +1866,13 @@ extern void set_task_comm(struct task_st +@@ -1882,9 +1882,13 @@ extern void set_task_comm(struct task_st extern char *get_task_comm(char *to, struct task_struct *tsk); #ifdef CONFIG_SMP @@ -1955,7 +589,7 @@ #define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks) diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h new file mode 100644 -index ...61d4ca4 100644 +index ...589f429 100644 --- /dev/null +++ b/include/linux/tracehook.h @@ -0,0 +1,575 @@ @@ -2024,7 +658,7 @@ + */ +static inline int tracehook_expect_breakpoints(struct task_struct *task) +{ -+ return (task_ptrace(task) & PT_PTRACED); ++ return (task_ptrace(task) & PT_PTRACED) != 0; +} + +/* @@ -2172,7 +806,7 @@ + */ +static inline void tracehook_report_exit(long *exit_code) +{ -+ ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXIT, *exit_code); ++ ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code); +} + +/** @@ -2360,7 +994,7 @@ + int sig, + void __user *handler) +{ -+ return (task_ptrace(task) & PT_PTRACED); ++ return (task_ptrace(task) & PT_PTRACED) != 0; +} + +/** @@ -2381,7 +1015,7 @@ + int sig, + void __user *handler) +{ -+ return (task_ptrace(task) & PT_PTRACED); ++ return (task_ptrace(task) & PT_PTRACED) != 0; +} + +/** @@ -2535,10 +1169,10 @@ + +#endif /* */ diff --git a/kernel/exit.c b/kernel/exit.c -index fa7b700..a0225e2 100644 +index 93d2711..78c6307 100644 --- a/kernel/exit.c +++ b/kernel/exit.c -@@ -45,6 +45,7 @@ +@@ -46,6 +46,7 @@ #include #include #include @@ -2546,7 +1180,7 @@ #include #include -@@ -151,27 +152,17 @@ static void delayed_put_task_struct(stru +@@ -152,27 +153,17 @@ static void delayed_put_task_struct(stru put_task_struct(container_of(rhp, struct task_struct, rcu)); } @@ -2576,7 +1210,7 @@ __exit_signal(p); /* -@@ -193,6 +184,13 @@ repeat: +@@ -194,6 +185,13 @@ repeat: * that case. */ zap_leader = task_detached(leader); @@ -2590,7 +1224,7 @@ } write_unlock_irq(&tasklist_lock); -@@ -862,7 +860,8 @@ static void forget_original_parent(struc +@@ -863,7 +861,8 @@ static void forget_original_parent(struc */ static void exit_notify(struct task_struct *tsk, int group_dead) { @@ -2600,7 +1234,7 @@ /* * This does two things: -@@ -899,22 +898,11 @@ static void exit_notify(struct task_stru +@@ -900,22 +899,11 @@ static void exit_notify(struct task_stru !capable(CAP_KILL)) tsk->exit_signal = SIGCHLD; @@ -2628,7 +1262,7 @@ /* mt-exec, de_thread() is waiting for us */ if (thread_group_leader(tsk) && -@@ -924,8 +912,10 @@ static void exit_notify(struct task_stru +@@ -925,8 +913,10 @@ static void exit_notify(struct task_stru write_unlock_irq(&tasklist_lock); @@ -2640,7 +1274,7 @@ release_task(tsk); } -@@ -1004,10 +994,7 @@ NORET_TYPE void do_exit(long code) +@@ -1005,10 +995,7 @@ NORET_TYPE void do_exit(long code) if (unlikely(!tsk->pid)) panic("Attempted to kill the idle task!"); @@ -2653,10 +1287,10 @@ /* * We're taking recursive faults here in do_exit. Safest is to just diff --git a/kernel/fork.c b/kernel/fork.c -index df8fe06..37b5be0 100644 +index adefc11..5345b7d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -54,6 +54,7 @@ +@@ -55,6 +55,7 @@ #include #include #include @@ -2664,7 +1298,7 @@ #include #include -@@ -832,8 +833,7 @@ static void copy_flags(unsigned long clo +@@ -833,8 +834,7 @@ static void copy_flags(unsigned long clo new_flags &= ~PF_SUPERPRIV; new_flags |= PF_FORKNOEXEC; @@ -2674,7 +1308,7 @@ p->flags = new_flags; clear_freeze_flag(p); } -@@ -874,7 +874,8 @@ static struct task_struct *copy_process( +@@ -875,7 +875,8 @@ static struct task_struct *copy_process( struct pt_regs *regs, unsigned long stack_size, int __user *child_tidptr, @@ -2684,7 +1318,7 @@ { int retval; struct task_struct *p; -@@ -1124,8 +1125,6 @@ static struct task_struct *copy_process( +@@ -1125,8 +1126,6 @@ static struct task_struct *copy_process( */ p->group_leader = p; INIT_LIST_HEAD(&p->thread_group); @@ -2693,7 +1327,7 @@ /* Now that the task is set up, run cgroup callbacks if * necessary. We need to run them before the task is visible -@@ -1156,7 +1155,6 @@ static struct task_struct *copy_process( +@@ -1157,7 +1156,6 @@ static struct task_struct *copy_process( p->real_parent = current->real_parent; else p->real_parent = current; @@ -2701,7 +1335,7 @@ spin_lock(¤t->sighand->siglock); -@@ -1198,8 +1196,7 @@ static struct task_struct *copy_process( +@@ -1199,8 +1197,7 @@ static struct task_struct *copy_process( if (likely(p->pid)) { list_add_tail(&p->sibling, &p->real_parent->children); @@ -2711,7 +1345,7 @@ if (thread_group_leader(p)) { if (clone_flags & CLONE_NEWPID) -@@ -1284,29 +1281,13 @@ struct task_struct * __cpuinit fork_idle +@@ -1285,29 +1282,13 @@ struct task_struct * __cpuinit fork_idle struct pt_regs regs; task = copy_process(CLONE_VM, 0, idle_regs(®s), 0, NULL, @@ -2742,7 +1376,7 @@ /* * Ok, this is the main fork-routine. * -@@ -1341,14 +1322,14 @@ long do_fork(unsigned long clone_flags, +@@ -1342,14 +1323,14 @@ long do_fork(unsigned long clone_flags, } } @@ -2763,7 +1397,7 @@ /* * Do this prior waking up the new thread - the thread pointer * might get invalid after that point, if the thread exits quickly. -@@ -1366,32 +1347,35 @@ long do_fork(unsigned long clone_flags, +@@ -1367,32 +1348,35 @@ long do_fork(unsigned long clone_flags, init_completion(&vfork); } @@ -2814,7 +1448,7 @@ } else { nr = PTR_ERR(p); diff --git a/kernel/kthread.c b/kernel/kthread.c -index bd1b9ea..1869162 100644 +index ac3fb73..88538db 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -176,7 +176,7 @@ void kthread_bind(struct task_struct *k, @@ -2827,7 +1461,7 @@ k->cpus_allowed = cpumask_of_cpu(cpu); k->rt.nr_cpus_allowed = 1; diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index acf80a4..ef66127 100644 +index 8392a9d..082b3fc 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -107,7 +107,7 @@ int ptrace_check_attach(struct task_stru @@ -2840,10 +1474,10 @@ /* All systems go.. */ return ret; diff --git a/kernel/sched.c b/kernel/sched.c -index 4e2f603..102d634 100644 +index 6acf749..dfb65bd 100644 --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -1765,16 +1765,24 @@ migrate_task(struct task_struct *p, int +@@ -1867,16 +1867,24 @@ migrate_task(struct task_struct *p, int /* * wait_task_inactive - wait for a thread to unschedule. * @@ -2869,7 +1503,7 @@ struct rq *rq; for (;;) { -@@ -1797,8 +1805,11 @@ void wait_task_inactive(struct task_stru +@@ -1899,8 +1907,11 @@ void wait_task_inactive(struct task_stru * return false if the runqueue has changed and p * is actually now running somewhere else! */ @@ -2882,7 +1516,7 @@ /* * Ok, time to look more closely! We need the rq -@@ -1808,9 +1819,21 @@ void wait_task_inactive(struct task_stru +@@ -1910,9 +1921,21 @@ void wait_task_inactive(struct task_stru rq = task_rq_lock(p, &flags); running = task_running(rq, p); on_rq = p->se.on_rq; @@ -2904,7 +1538,7 @@ * Was it really running after all now that we * checked with the proper locks actually held? * -@@ -1842,6 +1865,8 @@ void wait_task_inactive(struct task_stru +@@ -1944,6 +1967,8 @@ void wait_task_inactive(struct task_stru */ break; } @@ -3170,10 +1804,10 @@ sigaddset(&mask, sig); rm_from_queue_full(&mask, &t->signal->shared_pending); diff --git a/lib/Makefile b/lib/Makefile -index 74b0cfb..62dfd16 100644 +index 818c4d4..c0bad7f 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -72,6 +72,8 @@ lib-$(CONFIG_GENERIC_BUG) += bug.o +@@ -78,6 +78,8 @@ lib-$(CONFIG_GENERIC_BUG) += bug.o obj-$(CONFIG_HAVE_LMB) += lmb.o @@ -3286,10 +1920,10 @@ return vm_flags; diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index 1c864c0..f92c6af 100644 +index 63f131f..3481cde 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #include #include @@ -3298,7 +1932,7 @@ #include #include #include -@@ -1910,22 +1910,6 @@ static int selinux_vm_enough_memory(stru +@@ -1971,22 +1971,6 @@ static int selinux_vm_enough_memory(stru return __vm_enough_memory(mm, pages, cap_sys_admin); } @@ -3321,7 +1955,7 @@ /* binprm security operations */ static int selinux_bprm_alloc_security(struct linux_binprm *bprm) -@@ -2177,7 +2161,7 @@ static void selinux_bprm_apply_creds(str +@@ -2238,7 +2222,7 @@ static void selinux_bprm_apply_creds(str u32 ptsid = 0; rcu_read_lock(); @@ -3330,7 +1964,7 @@ if (likely(tracer != NULL)) { sec = tracer->security; ptsid = sec->sid; -@@ -5205,7 +5189,7 @@ static int selinux_setprocattr(struct ta +@@ -5247,7 +5231,7 @@ static int selinux_setprocattr(struct ta Otherwise, leave SID unchanged and fail. */ task_lock(p); rcu_read_lock(); linux-2.6-utrace.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.82 -r 1.83 linux-2.6-utrace.patch Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- linux-2.6-utrace.patch 14 Jul 2008 19:38:29 -0000 1.82 +++ linux-2.6-utrace.patch 24 Jul 2008 08:28:26 -0000 1.83 @@ -1,17 +1,16 @@ Documentation/DocBook/Makefile | 2 +- - Documentation/DocBook/utrace.tmpl | 21 + - Documentation/utrace.txt | 579 ++++++++++ + Documentation/DocBook/utrace.tmpl | 475 ++++++++ fs/proc/array.c | 3 + - include/linux/ptrace.h | 15 + + include/linux/ptrace.h | 21 + include/linux/sched.h | 6 + - include/linux/tracehook.h | 60 + - include/linux/utrace.h | 534 +++++++++ - init/Kconfig | 28 + + include/linux/tracehook.h | 62 + + include/linux/utrace.h | 610 ++++++++++ + init/Kconfig | 27 + kernel/Makefile | 1 + - kernel/ptrace.c | 542 +++++++++- + kernel/ptrace.c | 578 ++++++++++- kernel/signal.c | 14 +- - kernel/utrace.c | 2211 +++++++++++++++++++++++++++++++++++++ - 13 files changed, 4012 insertions(+), 4 deletions(-) + kernel/utrace.c | 2278 +++++++++++++++++++++++++++++++++++++ + 12 files changed, 4070 insertions(+), 7 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 0eb0d02..49a78b7 100644 @@ -28,616 +27,485 @@ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl new file mode 100644 -index ...8dfaa91 100644 +index ...3e47524 100644 --- /dev/null +++ b/Documentation/DocBook/utrace.tmpl -@@ -0,0 +1,21 @@ +@@ -0,0 +1,475 @@ + + ++"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []> + + -+ -+ The utrace User Debugging Infrastructure -+ ++ ++ The utrace User Debugging Infrastructure ++ ++ ++ ++ ++ utrace concepts ++ ++ Introduction ++ ++ ++ utrace is infrastructure code for tracing ++ and controlling user threads. This is the foundation for writing ++ tracing engines, which can be loadable kernel modules. ++ ++ ++ ++ The basic actors in utrace are the thread ++ and the tracing engine. A tracing engine is some body of code that ++ calls into the <linux/utrace.h> ++ interfaces, represented by a struct ++ utrace_engine_ops. (Usually it's a kernel module, ++ though the legacy ptrace support is a tracing ++ engine that is not in a kernel module.) The interface operates on ++ individual threads (struct task_struct). ++ If an engine wants to treat several threads as a group, that is up ++ to its higher-level code. ++ ++ ++ ++ Tracing begins by attaching an engine to a thread, using ++ utrace_attach. If successful, it returns a ++ pointer that is the handle used in all other calls. ++ ++ ++ ++ ++ Events and Callbacks ++ ++ ++ An attached engine does nothing by default. An engine makes something ++ happen by requesting callbacks via utrace_set_events ++ and poking the thread with utrace_control. ++ The synchronization issues related to these two calls ++ are discussed further below in . ++ ++ ++ ++ Events are specified using the macro ++ UTRACE_EVENT(type). ++ Each event type is associated with a callback in struct ++ utrace_engine_ops. A tracing engine can leave unused ++ callbacks NULL. The only callbacks required ++ are those used by the event flags it sets. ++ ++ ++ ++ Many engines can be attached to each thread. When a thread has an ++ event, each engine gets a callback if it has set the event flag for ++ that event type. Engines are called in the order they attached. ++ ++ ++ ++ Event reporting callbacks have details particular to the event type, ++ but are all called in similar environments and have the same ++ constraints. Callbacks are made from safe points, where no locks ++ are held, no special resources are pinned (usually), and the ++ user-mode state of the thread is accessible. So, callback code has ++ a pretty free hand. But to be a good citizen, callback code should ++ never block for long periods. It is fine to block in ++ kmalloc and the like, but never wait for i/o or ++ for user mode to do something. If you need the thread to wait, use ++ UTRACE_STOP and return from the callback ++ quickly. When your i/o finishes or whatever, you can use ++ utrace_control to resume the thread. ++ ++ ++ ++ ++ Stopping Safely ++ ++ ++ Well-behaved callbacks are important to maintain two essential ++ properties of the interface. The first of these is that unrelated ++ tracing engines not interfere with each other. If your engine's ++ event callback does not return quickly, then another engine won't ++ get the event notification in a timely manner. The second important ++ property is that tracing be as noninvasive as possible to the normal ++ operation of the system overall and of the traced thread in ++ particular. That is, attached tracing engines should not perturb a ++ thread's behavior, except to the extent that changing its ++ user-visible state is explicitly what you want to do. (Obviously ++ some perturbation is unavoidable, primarily timing changes, ranging ++ from small delays due to the overhead of tracing, to arbitrary ++ pauses in user code execution when a user stops a thread with a ++ debugger for examination.) Even when you explicitly want the ++ pertrubation of making the traced thread block, just blocking ++ directly in your callback has more unwanted effects. For example, ++ the CLONE event callbacks are called when the ++ new child thread has been created but not yet started running; the ++ child can never be scheduled until the CLONE ++ tracing callbacks return. (This allows engines tracing the parent ++ to attach to the child.) If a CLONE event ++ callback blocks the parent thread, it also prevents the child thread ++ from running (even to process a SIGKILL). If ++ what you want is to make both the parent and child block, then use ++ utrace_attach on the child and then use ++ UTRACE_STOP on both threads. A more crucial ++ problem with blocking in callbacks is that it can prevent ++ SIGKILL from working. A thread that is ++ blocking due to UTRACE_STOP will still wake up ++ and die immediately when sent a SIGKILL, as all ++ threads should. Relying on the utrace ++ infrastructure rather than on private synchronization calls in event ++ callbacks is an important way to help keep tracing robustly ++ noninvasive. ++ ++ ++ ++ To control another thread and access its state, it must be stopped ++ with UTRACE_STOP. This means that it is ++ stopped and won't start running again while we access it. When a ++ thread is not already stopped, utrace_control ++ returns -EINPROGRESS and an engine must wait ++ for an event callback when the thread is ready to stop. The thread ++ may be running on another CPU or may be blocked. When it is ready ++ to be examined, it will make callbacks to engines that set the ++ UTRACE_EVENT(QUIESCE) event bit. To wake up an ++ interruptible wait, use UTRACE_INTERRUPT. ++ ++ ++ ++ As long as some engine has used UTRACE_STOP and ++ not called utrace_control to resume the thread, ++ then the thread will remain stopped. SIGKILL ++ will wake it up, but it will not run user code. When the stop is ++ cleared with utrace_control or a callback ++ return value, the thread starts running again. ++ (See also .) ++ ++ ++ ++ ++ Teardown Races ++ ++ ++ Ordinarily synchronization issues for tracing engines are kept fairly [...2251 lines suppressed...] ++ (utrace->reap && ((old_flags & ~events) & UTRACE_EVENT(REAP))))) { + spin_unlock(&utrace->lock); + return -EALREADY; + } @@ -2896,7 +2951,7 @@ + * and really is quiescent now in its existing job control stop. + */ + if (!utrace->stopped && -+ ((set_utrace_flags &~ old_utrace_flags) & UTRACE_EVENT(JCTL))) { ++ ((set_utrace_flags & ~old_utrace_flags) & UTRACE_EVENT(JCTL))) { + sighand = lock_task_sighand(target, &flags); + if (likely(sighand)) { + if (task_is_stopped(target)) @@ -2915,7 +2970,7 @@ + * knows positively that utrace_report_death() will be called or + * that it won't. + */ -+ if ((set_utrace_flags &~ old_utrace_flags) & DEATH_EVENTS) { ++ if ((set_utrace_flags & ~old_utrace_flags) & DEATH_EVENTS) { + read_lock(&tasklist_lock); + if (unlikely(target->exit_state)) { + read_unlock(&tasklist_lock); @@ -3048,14 +3103,16 @@ + struct utrace_attached_engine *engine, *next; + unsigned long flags = 0; + ++ splice_attaching(utrace); ++ + /* + * Update the set of events of interest from the union + * of the interests of the remaining tracing engines. + * For any engine marked detached, remove it from the list. + */ -+ list_for_each_entry_safe(engine, next, &utrace->engines, entry) { ++ list_for_each_entry_safe(engine, next, &utrace->attached, entry) { + if (engine->ops == &utrace_detached_ops) { -+ list_del_rcu(&engine->entry); ++ list_del(&engine->entry); + continue; + } + @@ -3129,8 +3186,8 @@ + * again if it was stopped and no longer has any attached engines + * that want it stopped. + * -+ * If the report_reap() callback may already have begun, this fails -+ * with -%ESRCH. If the report_deeath() callback may already have ++ * If the @report_reap callback may already have begun, this fails ++ * with -%ESRCH. If the @report_deeath callback may already have + * begun, this fails with -%EALREADY. + * + * If @target is not already stopped, then a callback to this engine @@ -3141,8 +3198,8 @@ + * to the @engine->ops vector will be made. + * + * The only exception is %SIGKILL (and exec or group-exit by another -+ * thread in the group), which can cause asynchronous report_death() -+ * and/or report_reap() callbacks even when %UTRACE_STOP was used. ++ * thread in the group), which can cause asynchronous @report_death ++ * and/or @report_reap callbacks even when %UTRACE_STOP was used. + * (In that event, this fails with -%ESRCH or -%EALREADY, see above.) + * + * UTRACE_STOP: @@ -3154,14 +3211,14 @@ + * another thread in the same thread group). + * + * This returns -%EINPROGRESS if @target is not already stopped. -+ * Then the effect is like %UTRACE_REPORT. A report_quiesce() or -+ * report_signal() callback will be made soon. Your callback can ++ * Then the effect is like %UTRACE_REPORT. A @report_quiesce or ++ * @report_signal callback will be made soon. Your callback can + * then return %UTRACE_STOP to keep @target stopped. + * + * This does not interrupt system calls in progress, including ones + * that sleep for a long time. For that, use %UTRACE_INTERRUPT. + * To interrupt system calls and then keep @target stopped, your -+ * report_signal() callback can return %UTRACE_STOP. ++ * @report_signal callback can return %UTRACE_STOP. + * + * UTRACE_RESUME: + * @@ -3173,7 +3230,7 @@ + * UTRACE_REPORT: + * + * This is like %UTRACE_RESUME, but also ensures that there will be -+ * a report_quiesce() or report_signal() callback made soon. If ++ * a @report_quiesce or @report_signal callback made soon. If + * @target had been stopped, then there will be a callback before it + * resumes running normally. If another engine is keeping @target + * stopped, then there might be no callbacks until all engines let @@ -3182,14 +3239,14 @@ + * UTRACE_INTERRUPT: + * + * This is like %UTRACE_REPORT, but ensures that @target will make a -+ * report_signal() callback before it resumes or delivers signals. ++ * @report_signal callback before it resumes or delivers signals. + * If @target was in a system call or about to enter one, work in + * progress will be interrupted as if by %SIGSTOP. If another + * engine is keeping @target stopped, then there might be no + * callbacks until all engines let it resume. + * + * This gives @engine an opportunity to introduce a forced signal -+ * disposition via its report_signal() callback. ++ * disposition via its @report_signal callback. + * + * UTRACE_SINGLESTEP: + * @@ -3204,8 +3261,8 @@ + * more callbacks made to any engine before returning to user mode, + * then the resume action is chosen only by the last set of callbacks. + * To be sure, enable %UTRACE_EVENT(%QUIESCE) and look for the -+ * report_quiesce() callback with a zero event mask, or the -+ * report_signal() callback with %UTRACE_SIGNAL_REPORT. ++ * @report_quiesce callback with a zero event mask, or the ++ * @report_signal callback with %UTRACE_SIGNAL_REPORT. + * + * UTRACE_BLOCKSTEP: + * @@ -3375,7 +3432,8 @@ + return ret; +} +EXPORT_SYMBOL_GPL(utrace_control); -+ ++ ++ +/* + * This is local state used for reporting loops, perhaps optimized away. + */ @@ -3399,6 +3457,7 @@ + if (utrace->report) { + spin_lock(&utrace->lock); + utrace->report = 0; ++ splice_attaching(utrace); + spin_unlock(&utrace->lock); + } +} @@ -3543,7 +3602,7 @@ + struct utrace_attached_engine *engine, *next; \ + const struct utrace_engine_ops *ops; \ + list_for_each_entry_safe(engine, next, \ -+ &utrace->engines, entry) { \ ++ &utrace->attached, entry) { \ + ops = start_callback(utrace, report, engine, task, \ + event); \ + if (!ops) \ @@ -3865,7 +3924,7 @@ + */ + start_report(utrace); + -+ list_for_each_entry_safe(engine, next, &utrace->engines, entry) ++ list_for_each_entry_safe(engine, next, &utrace->attached, entry) + start_callback(utrace, &report, engine, task, 0); + + /* @@ -3950,6 +4009,8 @@ + return -1; + } + ++ splice_attaching(utrace); ++ + if (unlikely(!utrace->interrupt) && unlikely(!utrace->report)) + action = UTRACE_SIGNAL_IGN; + else if (utrace->signal_handler) @@ -4079,7 +4140,7 @@ + /* + * This reporting pass chooses what signal disposition we'll act on. + */ -+ list_for_each_entry_safe(engine, next, &utrace->engines, entry) { ++ list_for_each_entry_safe(engine, next, &utrace->attached, entry) { + /* + * This pairs with the barrier in mark_engine_detached(), + * see start_callback() comments. @@ -4262,7 +4323,8 @@ + + spin_unlock(&utrace->lock); +} -+ ++ ++ +/** + * utrace_prepare_examine - prepare to examine thread state + * @target: thread of interest, a &struct task_struct pointer @@ -4382,7 +4444,7 @@ + struct list_head *pos, *next; + struct utrace_attached_engine *engine; + const struct utrace_engine_ops *ops; -+ list_for_each_safe(pos, next, &utrace->engines) { ++ list_for_each_safe(pos, next, &utrace->attached) { + engine = list_entry(pos, struct utrace_attached_engine, + entry); + ops = rcu_dereference(engine->ops); @@ -4408,7 +4470,7 @@ + const struct utrace_engine_ops *ops; + int unsafe = 0; + -+ list_for_each_entry_safe(engine, next, &utrace->engines, entry) { ++ list_for_each_entry_safe(engine, next, &utrace->attached, entry) { + ops = rcu_dereference(engine->ops); + if (ops->unsafe_exec) + unsafe |= (*ops->unsafe_exec)(engine, task); Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.836 retrieving revision 1.837 diff -u -r1.836 -r1.837 --- sources 23 Jul 2008 19:51:09 -0000 1.836 +++ sources 24 Jul 2008 08:28:26 -0000 1.837 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -5de8b6532393677ffa0ceb647213370d patch-2.6.26-git10.bz2 +31df4b444a2404677d0003611190f417 patch-2.6.26-git11.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.753 retrieving revision 1.754 diff -u -r1.753 -r1.754 --- upstream 23 Jul 2008 19:51:09 -0000 1.753 +++ upstream 24 Jul 2008 08:28:26 -0000 1.754 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git10.bz2 +patch-2.6.26-git11.bz2 --- linux-2.6-ptrace-cleanup.patch DELETED --- --- patch-2.6.26-git10.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 08:30:58 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Thu, 24 Jul 2008 08:30:58 GMT Subject: rpms/shadow-utils/devel shadow-4.1.2-selinux.patch, NONE, 1.1 shadow-utils.spec, 1.117, 1.118 shadow-4.1.1-selinux.patch, 1.1, NONE Message-ID: <200807240830.m6O8UwgO019029@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/shadow-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18990 Modified Files: shadow-utils.spec Added Files: shadow-4.1.2-selinux.patch Removed Files: shadow-4.1.1-selinux.patch Log Message: recreate selinux patch shadow-4.1.2-selinux.patch: --- NEW FILE shadow-4.1.2-selinux.patch --- diff -up /dev/null shadow-4.1.2/libmisc/system.c --- /dev/null 2008-07-15 12:00:55.602698860 +0200 +++ shadow-4.1.2/libmisc/system.c 2008-07-24 10:14:24.000000000 +0200 @@ -0,0 +1,37 @@ +#include + +#ident "$Id: shell.c,v 1.13 2006/01/18 19:38:27 kloczek Exp $" + +#include +#include +#include +#include "prototypes.h" +#include "defines.h" + +int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr) +{ + int status = -1; + int fd; + pid_t pid; + + pid = fork(); + if (pid < 0) + return -1; + + if (pid) { /* Parent */ + waitpid(pid, &status, 0); + return status; + } + + fd = open("/dev/null", O_RDWR); + /* Child */ + dup2(fd,0); // Close Stdin + if (ignore_stderr) + dup2(fd,2); // Close Stderr + + execve(command, (char *const *) argv, (char *const *) env); + fprintf (stderr, + _("Failed to exec '%s'\n"), argv[0]); + exit (-1); +} + diff -up shadow-4.1.2/libmisc/copydir.c.selinux shadow-4.1.2/libmisc/copydir.c --- shadow-4.1.2/libmisc/copydir.c.selinux 2008-05-24 17:35:17.000000000 +0200 +++ shadow-4.1.2/libmisc/copydir.c 2008-07-24 10:14:24.000000000 +0200 @@ -85,7 +85,7 @@ static int copy_file (const char *src, c * symlink, directory, ... * */ -static int selinux_file_context (const char *dst_name) +int selinux_file_context (const char *dst_name) { security_context_t scontext = NULL; @@ -256,6 +256,12 @@ int copy_tree (const char *src_root, con src_orig = 0; dst_orig = 0; } + +#ifdef WITH_SELINUX + /* Reset SELinux to create files with default contexts */ + setfscreatecon (NULL); +#endif + return err; } diff -up shadow-4.1.2/libmisc/Makefile.am.selinux shadow-4.1.2/libmisc/Makefile.am --- shadow-4.1.2/libmisc/Makefile.am.selinux 2008-01-27 15:21:48.000000000 +0100 +++ shadow-4.1.2/libmisc/Makefile.am 2008-07-24 10:14:24.000000000 +0200 @@ -43,6 +43,7 @@ libmisc_a_SOURCES = \ setugid.c \ setupenv.c \ shell.c \ + system.c \ strtoday.c \ sub.c \ sulog.c \ diff -up shadow-4.1.2/src/useradd.c.selinux shadow-4.1.2/src/useradd.c --- shadow-4.1.2/src/useradd.c.selinux 2008-07-24 10:13:23.000000000 +0200 +++ shadow-4.1.2/src/useradd.c 2008-07-24 10:14:24.000000000 +0200 @@ -104,6 +104,7 @@ static const char *user_comment = ""; static const char *user_home = ""; static const char *user_shell = ""; static const char *create_mail_spool = ""; +static const char *user_selinux = ""; static long user_expire = -1; static int is_shadow_pwd; @@ -176,6 +177,7 @@ static int set_defaults (void); static int get_groups (char *); static void usage (void); static void new_pwent (struct passwd *); +static void selinux_update_mapping (void); static long scale_age (long); static void new_spent (struct spwd *); @@ -376,6 +378,7 @@ static void get_defaults (void) def_create_mail_spool = xstrdup (cp); } } + fclose(fp); } /* @@ -668,6 +671,9 @@ static void usage (void) " -s, --shell SHELL the login shell for the new user account\n" " -u, --uid UID force use the UID for the new user account\n" " -U, --user-group create a group with the same name as the user\n" +#ifdef WITH_SELINUX + " -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user mapping\n" +#endif "\n"), stderr); exit (E_USAGE); } @@ -883,12 +889,19 @@ static void process_flags (int argc, cha {"password", required_argument, NULL, 'p'}, {"system", no_argument, NULL, 'r'}, {"shell", required_argument, NULL, 's'}, +#ifdef WITH_SELINUX + {"selinux-user", required_argument, NULL, 'Z'}, +#endif {"uid", required_argument, NULL, 'u'}, {"user-group", no_argument, NULL, 'U'}, {NULL, 0, NULL, '\0'} }; while ((c = +#ifdef WITH_SELINUX + getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:UZ:", +#else getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:U", +#endif long_options, NULL)) != -1) { switch (c) { case 'b': @@ -1073,6 +1086,17 @@ static void process_flags (int argc, cha case 'U': Uflg++; break; +#ifdef WITH_SELINUX + case 'Z': + if (is_selinux_enabled() > 0) + user_selinux = optarg; + else { + fprintf (stderr,_("%s: -Z requires SELinux enabled kernel\n"), Prog); + + exit (E_BAD_ARG); + } + break; +#endif default: usage (); } @@ -1479,6 +1503,33 @@ static void usr_update (void) grp_update (); } +static void selinux_update_mapping () { + +#ifdef WITH_SELINUX + if (is_selinux_enabled() <= 0) return; + + if (*user_selinux) { /* must be done after passwd write() */ + const char *argv[7]; + argv[0] = "/usr/sbin/semanage"; + argv[1] = "login"; + argv[2] = "-a"; + argv[3] = "-s"; + argv[4] = user_selinux; + argv[5] = user_name; + argv[6] = NULL; + if (safe_system(argv[0], argv, NULL, 0)) { + fprintf (stderr, + _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"), + Prog, user_name, user_selinux); +#ifdef WITH_AUDIT + audit_logger (AUDIT_USER_CHAUTHTOK, Prog, + "adding SELinux user mapping", user_name, user_id, 0); +#endif + } + } +#endif + +} /* * create_home - create the user's home directory * @@ -1488,7 +1539,11 @@ static void usr_update (void) */ static void create_home (void) { + if (access (user_home, F_OK)) { +#ifdef WITH_SELINUX + selinux_file_context (user_home); +#endif /* XXX - create missing parent directories. --marekm */ if (mkdir (user_home, 0)) { fprintf (stderr, @@ -1510,6 +1565,10 @@ static void create_home (void) audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding home directory", user_name, user_id, 1); #endif +#ifdef WITH_SELINUX + /* Reset SELinux to create files with default contexts */ + setfscreatecon (NULL); +#endif } } @@ -1763,6 +1822,8 @@ int main (int argc, char **argv) close_files (); + selinux_update_mapping(); + nscd_flush_cache ("passwd"); nscd_flush_cache ("group"); diff -up shadow-4.1.2/src/usermod.c.selinux shadow-4.1.2/src/usermod.c --- shadow-4.1.2/src/usermod.c.selinux 2008-05-24 17:35:17.000000000 +0200 +++ shadow-4.1.2/src/usermod.c 2008-07-24 10:14:24.000000000 +0200 @@ -94,6 +94,7 @@ static char *user_newcomment; static char *user_home; static char *user_newhome; static char *user_shell; +static const char *user_selinux = ""; static char *user_newshell; static long user_expire; static long user_newexpire; @@ -141,6 +142,7 @@ static void date_to_str (char *buf, size static int get_groups (char *); static void usage (void); static void new_pwent (struct passwd *); +static void selinux_update_mapping (void); static void new_spent (struct spwd *); static void fail_exit (int); @@ -323,6 +325,9 @@ static void usage (void) " -s, --shell SHELL new login shell for the user account\n" " -u, --uid UID new UID for the user account\n" " -U, --unlock unlock the user account\n" +#ifdef WITH_SELINUX + " -Z, --selinux-user new selinux user mapping for the user account\n" +#endif "\n"), stderr); exit (E_USAGE); } @@ -849,13 +854,20 @@ static void process_flags (int argc, cha {"move-home", no_argument, NULL, 'm'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'}, +#ifdef WITH_SELINUX + {"selinux-user", required_argument, NULL, 'Z'}, +#endif {"shell", required_argument, NULL, 's'}, {"uid", required_argument, NULL, 'u'}, {"unlock", no_argument, NULL, 'U'}, {NULL, 0, NULL, '\0'} }; while ((c = - getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:U", +#ifdef WITH_SELINUX + getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:UZ:", +#else + getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:U", +#endif long_options, NULL)) != -1) { switch (c) { case 'a': @@ -956,6 +968,16 @@ static void process_flags (int argc, cha case 'U': Uflg++; break; +#ifdef WITH_SELINUX + case 'Z': + if (is_selinux_enabled() > 0) + user_selinux = optarg; + else { + fprintf (stderr, _("%s: -Z requires SELinux enabled kernel\n"), Prog); + exit (E_BAD_ARG); + } + break; +#endif default: usage (); } @@ -1534,6 +1556,8 @@ int main (int argc, char **argv) nscd_flush_cache ("passwd"); nscd_flush_cache ("group"); + selinux_update_mapping(); + if (mflg) move_home (); @@ -1562,3 +1586,62 @@ int main (int argc, char **argv) exit (E_SUCCESS); /* NOT REACHED */ } + +static void selinux_update_mapping () { +#ifdef WITH_SELINUX + const char *argv[7]; + + if (is_selinux_enabled() <= 0) return; + + if (*user_selinux) { + argv[0] = "/usr/sbin/semanage"; + argv[1] = "login"; + argv[2] = "-m"; + argv[3] = "-s"; + argv[4] = user_selinux; + argv[5] = user_name; + argv[6] = NULL; + if (safe_system(argv[0], argv, NULL, 1)) { + argv[2] = "-a"; + if (safe_system(argv[0], argv, NULL, 0)) { + fprintf (stderr, + _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"), + Prog, user_name, user_selinux); +#ifdef WITH_AUDIT + audit_logger (AUDIT_USER_CHAUTHTOK, Prog, + "modifying User mapping ", user_name, user_id, 0); +#endif + } + } + } + + if (dflg || *user_selinux) { + argv[0] = "/usr/sbin/genhomedircon"; + argv[1] = NULL; + if(safe_system(argv[0], argv, NULL,0)) { + fprintf (stderr, + _("%s: warning: unable to relabel the homedir %s for %s.\n"), + Prog, user_home, user_name); +#ifdef WITH_AUDIT + audit_logger (AUDIT_USER_CHAUTHTOK, Prog, + "relabeling home directory", user_name, user_id, 0); +#endif + } + + argv[0] = "/sbin/restorecon"; + argv[1] = "-F"; + argv[2] = "-R"; + argv[3] = user_home; + argv[4] = NULL; + if (safe_system(argv[0], argv, NULL, 0)) { + fprintf (stderr, + _("%s: warning: unable to relabel the homedir %s for %s.\n"), + Prog, user_home, user_name); +#ifdef WITH_AUDIT + audit_logger (AUDIT_USER_CHAUTHTOK, Prog, + "relabeling home directory", user_name, user_id, 0); +#endif + } + } +#endif +} diff -up shadow-4.1.2/src/userdel.c.selinux shadow-4.1.2/src/userdel.c --- shadow-4.1.2/src/userdel.c.selinux 2008-05-24 17:35:17.000000000 +0200 +++ shadow-4.1.2/src/userdel.c 2008-07-24 10:14:24.000000000 +0200 @@ -811,6 +811,17 @@ int main (int argc, char **argv) #endif } +#ifdef WITH_SELINUX + if (is_selinux_enabled() > 0) { + const char *argv[5]; + argv[0] = "/usr/sbin/semanage"; + argv[1] = "login"; + argv[2] = "-d"; + argv[3] = user_name; + argv[4] = NULL; + safe_system(argv[0], argv, NULL, 1); + } +#endif /* * Cancel any crontabs or at jobs. Have to do this before we remove * the entry from /etc/passwd. diff -up shadow-4.1.2/man/useradd.8.selinux shadow-4.1.2/man/useradd.8 --- shadow-4.1.2/man/useradd.8.selinux 2008-07-24 10:13:23.000000000 +0200 +++ shadow-4.1.2/man/useradd.8 2008-07-24 10:20:27.000000000 +0200 @@ -239,6 +239,11 @@ options are not specified) is defined by variable in \fIlogin\&.defs\fR\&. .RE +.PP +\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR +.RS 4 +The SELinux user for the user\'s login\. The default is to leave this field blank, which causes the system to select the default SELinux user\. +.RE .SS "Changing the default values" .PP When invoked with only the diff -up shadow-4.1.2/man/usermod.8.xml.selinux shadow-4.1.2/man/usermod.8.xml --- shadow-4.1.2/man/usermod.8.xml.selinux 2007-12-31 17:48:34.000000000 +0100 +++ shadow-4.1.2/man/usermod.8.xml 2008-07-24 10:14:24.000000000 +0200 @@ -245,6 +245,19 @@ + + + , + SEUSER + + + + The SELinux user for the user's login. The default is to leave this + field the blank, which causes the system to select the default + SELinux user. + + + diff -up shadow-4.1.2/man/usermod.8.selinux shadow-4.1.2/man/usermod.8 --- shadow-4.1.2/man/usermod.8.selinux 2008-05-25 01:20:28.000000000 +0200 +++ shadow-4.1.2/man/usermod.8 2008-07-24 10:21:39.000000000 +0200 @@ -133,6 +133,11 @@ Note: if you wish to unlock the account value from \fI/etc/default/useradd\fR)\&. .RE +.PP +\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR +.RS 4 +The SELinux user for the user\'s login\. The default is to leave this field blank, which causes the system to select the default SELinux user. +.RE .SH "CAVEATS" .PP diff -up shadow-4.1.2/man/useradd.8.xml.selinux shadow-4.1.2/man/useradd.8.xml --- shadow-4.1.2/man/useradd.8.xml.selinux 2008-05-20 00:18:17.000000000 +0200 +++ shadow-4.1.2/man/useradd.8.xml 2008-07-24 10:14:24.000000000 +0200 @@ -363,6 +363,19 @@ + + + , + SEUSER + + + + The SELinux user for the user's login. The default is to leave this + field blank, which causes the system to select the default SELinux + user. + + + diff -up shadow-4.1.2/lib/defines.h.selinux shadow-4.1.2/lib/defines.h --- shadow-4.1.2/lib/defines.h.selinux 2008-05-24 19:35:54.000000000 +0200 +++ shadow-4.1.2/lib/defines.h 2008-07-24 10:14:24.000000000 +0200 @@ -321,4 +321,7 @@ extern char *strerror (); # define unused #endif +#ifdef WITH_SELINUX +#include +#endif #endif /* _DEFINES_H_ */ diff -up shadow-4.1.2/lib/prototypes.h.selinux shadow-4.1.2/lib/prototypes.h --- shadow-4.1.2/lib/prototypes.h.selinux 2008-04-27 02:40:13.000000000 +0200 +++ shadow-4.1.2/lib/prototypes.h 2008-07-24 10:14:24.000000000 +0200 @@ -83,6 +83,10 @@ extern int copy_tree (const char *src_ro long int uid, long int gid); extern int remove_tree (const char *root); +#ifdef WITH_SELINUX +extern int selinux_file_context (const char *dst_name); +#endif + /* encrypt.c */ extern char *pw_encrypt (const char *, const char *); @@ -226,6 +230,9 @@ extern struct spwd *__spw_dup (const str /* shell.c */ extern int shell (const char *, const char *, char *const *); +/* system.c */ +extern int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr); + /* strtoday.c */ extern long strtoday (const char *); Index: shadow-utils.spec =================================================================== RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- shadow-utils.spec 23 Jul 2008 14:53:58 -0000 1.117 +++ shadow-utils.spec 24 Jul 2008 08:30:14 -0000 1.118 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -14,7 +14,7 @@ Patch0: shadow-4.1.2-redhat.patch Patch1: shadow-4.1.2-goodname.patch -Patch2: shadow-4.1.1-selinux.patch +Patch2: shadow-4.1.2-selinux.patch Patch3: shadow-4.1.2-sysAccountDownhill.patch License: BSD @@ -185,6 +185,9 @@ %{_mandir}/man8/vigr.8* %changelog +* Thu Jul 24 2008 Peter Vrabec 2:4.1.2-3 +- recreate selinux patch + * Tue Jul 22 2008 Peter Vrabec 2:4.1.2-2 - provide getspnam by man-pages --- shadow-4.1.1-selinux.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 08:31:36 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Thu, 24 Jul 2008 08:31:36 GMT Subject: rpms/libspe2/F-9 import.log, NONE, 1.1 libspe2-2.2.80-doxygen.patch, NONE, 1.1 libspe2.spec, NONE, 1.1 png-mtime.py, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807240831.m6O8VaYW019078@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18775/F-9 Modified Files: .cvsignore sources Added Files: import.log libspe2-2.2.80-doxygen.patch libspe2.spec png-mtime.py Log Message: Initial check in for F-9 --- NEW FILE import.log --- libspe2-2_2_80_95-5_fc9:F-9:libspe2-2.2.80.95-5.fc9.src.rpm:1216888065 libspe2-2.2.80-doxygen.patch: --- NEW FILE libspe2-2.2.80-doxygen.patch --- Patch by Robert Scheck for libspe2 >= 2.2.80.95, which solves the multilib/multiarch problem by removing the timestamp within the footer from the doxygen generated files. It also removes the LATEX_HEADER definition in order to get doxygen successfully run. --- libspe2-2.2.80/doc/Doxyfile 2008-05-31 15:22:22.000000000 +0200 +++ libspe2-2.2.80/doc/Doxyfile.doxygen 2008-05-31 16:17:00.000000000 +0200 @@ -603,7 +603,7 @@ # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = footer_no_timestamp.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to --- libspe2-2.2.80/doc/Doxyfile 2007-03-21 15:49:59.000000000 +0100 +++ libspe2-2.2.80/doc/Doxyfile.doxygen 2008-05-31 15:22:22.000000000 +0200 @@ -732,7 +732,7 @@ # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = doc/LatexHeader +LATEX_HEADER = # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will --- libspe2-2.2.80/doc/footer_no_timestamp.html 1970-01-01 01:00:00.000000000 +0100 +++ libspe2-2.2.80/doc/footer_no_timestamp.html.multilib 2008-05-31 16:17:00.000000000 +0200 @@ -0,0 +1,5 @@ +
Generated for $projectname by  + +doxygen $doxygenversion
+ + --- NEW FILE libspe2.spec --- %define up_version 2.2.80 %define up_release 95 %define spuinclude %{_includedir}/spu Name: libspe2 Version: %{up_version}.%{up_release} Release: 5%{?dist} Summary: SPE Runtime Management Library Group: System Environment/Libraries License: LGPLv2+ URL: http://sourceforge.net/projects/libspe/ Source0: http://downloads.sourceforge.net/sourceforge/libspe/%{name}-%{up_version}-%{up_release}.tar.gz Source1: png-mtime.py Patch: libspe2-2.2.80-doxygen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, graphviz, python Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service ExclusiveArch: ppc ppc64 %description SPE Runtime Management Library for the Cell Broadband Engine Architecture. %package devel Summary: SPE Runtime Management Library Group: Development/Libraries Requires: %{name} = %{version}-%{release}, pkgconfig %description devel Header and object files for SPE Runtime Management Library. %ifarch ppc %package -n elfspe2 Summary: Helper for standalong SPE applications Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description -n elfspe2 This tool acts as a standalone loader for spe binaries. %endif %ifarch ppc64 %package adabinding-devel Summary: Ada package files porting libspe headers Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description adabinding-devel Ada package files porting libspe headers Management Library. %endif %prep %setup -q -n %{name}-%{up_version} %patch -p1 -b .doxygen %build # It doesn't understand handling of %{?_smp_mflags} make OPTFLAGS="%{optflags}" SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} %ifarch ppc # It doesn't understand handling of %{?_smp_mflags} make elfspe2-all OPTFLAGS="%{optflags}" SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} %endif # Generate documentation via doxygen including the images pushd doc doxygen # Solve multilib problems by changing the internal PNG timestamp to a reference timestamp; # see http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks for further information. python %{SOURCE1} html/graph_legend.png ARCHITECTURE popd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} speinclude=%{spuinclude} mv -f $RPM_BUILD_ROOT%{_prefix}/adainclude/* $RPM_BUILD_ROOT%{_includedir} %ifarch ppc make elfspe2-install DESTDIR=$RPM_BUILD_ROOT SYSROOT="" prefix=%{_prefix} libdir=%{_libdir} speinclude=%{spuinclude} install -D -m 755 elfspe2.init $RPM_BUILD_ROOT%{_initrddir}/elfspe2 # Ada makes only sense on ppc64 arch rm -f $RPM_BUILD_ROOT%{_includedir}/*.ads %endif # Remove unwanted files, static files and files for %doc rm -f $RPM_BUILD_ROOT%{_includedir}/README-libspe2 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}/libspe.* %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %ifarch ppc %post -n elfspe2 /sbin/chkconfig --add elfspe2 %{_bindir}/elfspe2-register %preun -n elfspe2 if [ $1 -eq 0 ]; then /sbin/service elfspe2 stop > /dev/null 2>&1 || : /sbin/chkconfig --del elfspe2 fi %postun -n elfspe2 if [ $1 -ne 0 ]; then /sbin/service elfspe2 condrestart > /dev/null 2>&1 || : fi %endif %files %defattr(-,root,root) %doc COPYING %{_libdir}/%{name}.so.* %files devel %defattr(-,root,root) %doc PATCH-SUBMITTING-RULES doc/ARCHITECTURE %doc doc/html %{_libdir}/%{name}.so %{_includedir}/*2*.h %{_includedir}/cbea_map.h %{spuinclude} %{_libdir}/pkgconfig/libspe2.pc %ifarch ppc %files -n elfspe2 %defattr(-,root,root) %doc PATCH-SUBMITTING-RULES %{_initrddir}/elfspe2 %{_bindir}/elfspe2-register %{_bindir}/elfspe2-unregister %{_bindir}/elfspe2 %endif %ifarch ppc64 %files adabinding-devel %defattr(-,root,root) %doc ada/README %{_includedir}/libspe2.ads %{_includedir}/libspe2_types.ads %{_includedir}/cbea_map.ads %endif %changelog * Thu Jul 24 2008 Jochen Roth 2.2.80.95-5 - changed release name to include branch name * Tue Jul 22 2008 Jochen Roth 2.2.80.95-4 - Changed elfspe startup script to be enabled per default * Wed Jul 16 2008 Jochen Roth 2.2.80.95-3 - Changes according to package review comments. * Mon Jun 02 2008 Jochen Roth 2.2.80.95-2 - Repaired rpm build errors * Sat May 31 2008 Robert Scheck 2.2.80.95-1 - Changes to (hopefully) match with Fedora Packaging Guidelines * Fri Apr 11 2008 Jochen Roth 2.2.80-95 - adopted to suit Fedora's packaging guidelines * Mon Aug 13 2007 Gerhard Stenzel 2.2.0-85 - fixes for rpmlint complaints * Thu Nov 24 2005 Arnd Bergmann 1.0.1-3 - initial spec file for fc5 --- NEW FILE png-mtime.py --- #! /usr/bin/python -tt # This script takes a PNG file, and parses the GMT timestamp information from # it. You can then print and/or alter the timestamp, and finally save the new # timestamp information back to the PNG file. # See the __main__ section for API usage. # # CMD line usage: # png-mtime.py [reference-file] # # If the reference file isn't there, it just prints the old timestamp. # # Author: James Antill # Copyright: 2008 # License: MIT, LGPL, new style BSD ... take your pick import os import sys import binascii import struct import time import calendar _PNG_HEADER = "\x89PNG\r\n\x1A\n" class PNG_time: """ For reading, displaying and setting a PNG's modification time. """ _time_chunk = None year = None month = None day = None hour = None minute = None second = None def _read_header(self, fo): """ read header, and make sure this is a png """ header = fo.read(8) if header != _PNG_HEADER: print >>sys.stderr, " Bad HEADER:", header sys.exit(1) self.chunks = 0 self.off = 0 def _read_chunk(self, fo): """ read a chunk, and check the CRC. Then return tuple. """ length = struct.unpack(">I", fo.read(4))[0] rawtype = fo.read(4) chunktype = struct.unpack(">4s", rawtype)[0] rawdata = fo.read(length) data = struct.unpack(">%ss" % length, rawdata)[0] CRC = struct.unpack(">i", fo.read(4))[0] # Check the CRC chk_CRC = binascii.crc32(rawtype + rawdata) if CRC != chk_CRC: print >>sys.stderr, " Bad CRC: %d %d" % (CRC, chk_CRC) sys.exit(1) # print "JDBG: Chunk[%s] = %d %d" % (chunktype, length, CRC) self.chunks += 1 self.off += (4 * 3) + length return (chunktype, length, data, CRC) def _get_time(self, chunktype, length, data): """ Convert a tIME chunk into a time dict. """ if chunktype != "tIME" or length != 7: return False if self._time_chunk is not None: print >>sys.stderr, " Mulitple tIME Chunks %d %d" % (self._time_chunk, self.chunks) sys.exit(1) self._time_chunk = self.chunks self._time_off = self.off - length vals = struct.unpack(">Hbbbbb", data) self.year = vals[0] self.month = vals[1] self.day = vals[2] self.hour = vals[3] self.minute = vals[4] self.second = vals[5] return True def __init__(self, fname): self.fname = fname fo = open(fname) self._read_header(fo) T = "blah" while T != "IEND": (T,l,d,c) = self._read_chunk(fo) self._get_time(T, l, d) if self._time_chunk is None: print >>sys.stderr, " No tIME Chunks" sys.exit(1) def ymdhms(self): """ Returns a tuple of: year, month, day, hour, minute, second. Note that this is all that's stored in the file, and so should be in UTC time. """ return (self.year, self.month, self.day, self.hour, self.minute, self.second) def tm(self): """ Returns a tm tuple for the PNG timestamp data. Note that this is in UTC, as though it's from time.gmtime(). """ return (self.year, self.month, self.day, self.hour, self.minute, self.second, 0, 0, 0) def time(self): """ Returns an Epoch time for the PNG timestamp data. """ return calendar.timegm(self.tm()) def save(self): """ Save the new timestamp information over the old in the PNG file. """ fo = open(self.fname, "r+") fo.seek(self._time_off) ymdhms = self.ymdhms() rawdata = struct.pack(">4sHbbbbb", "tIME", *ymdhms) CRC = binascii.crc32(rawdata) rawCRC = struct.pack(">i", CRC) fo.write(rawdata) fo.write(rawCRC) fo.close() def utime(self): """ Set the st_mtime of the file to the timestamp in the PNG file. """ os.utime(self.fname, (time.time(), self.time())) def set_time_from_file(self, fname): """ Set the PNG timestamp data based on a reference file. """ tm = time.gmtime(os.stat(fname).st_mtime) self.year = tm.tm_year self.month = tm.tm_mon self.day = tm.tm_mday self.hour = tm.tm_hour self.minute = tm.tm_min self.second = tm.tm_sec if __name__ == '__main__': png = PNG_time(sys.argv[1]) # print "JDBG: chunks=%d" % png.chunks print "orig time =", time.ctime(png.time()) if len(sys.argv) > 2: png.set_time_from_file(sys.argv[2]) print "new time =", time.ctime(png.time()) png.save() # Reset the mtime of the file to the modified time of the PNG file. # People might consider it evil to always utime here, but hey! png.utime() Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Jul 2008 15:53:32 -0000 1.1 +++ .cvsignore 24 Jul 2008 08:30:51 -0000 1.2 @@ -0,0 +1 @@ +libspe2-2.2.80-95.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Jul 2008 15:53:32 -0000 1.1 +++ sources 24 Jul 2008 08:30:51 -0000 1.2 @@ -0,0 +1 @@ +e534fd24e9c0225519d9dcc11f1ecba2 libspe2-2.2.80-95.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 08:33:23 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Thu, 24 Jul 2008 08:33:23 GMT Subject: rpms/busybox/devel busybox.spec,1.83,1.84 Message-ID: <200807240833.m6O8XNSv019184@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/busybox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142 Modified Files: busybox.spec Log Message: minor spec file change Index: busybox.spec =================================================================== RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- busybox.spec 23 Jul 2008 13:45:36 -0000 1.83 +++ busybox.spec 24 Jul 2008 08:32:38 -0000 1.84 @@ -70,7 +70,7 @@ # create busybox optimized for anaconda make clean # revert the static patches -patch -R -p1 <%{PATCH0} +patch -R -p1 <%{PATCH} # applied anaconda patch patch -b --suffix .anaconda -p1 < %{PATCH1} make defconfig From fedora-extras-commits at redhat.com Thu Jul 24 08:39:31 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 24 Jul 2008 08:39:31 GMT Subject: rpms/nmap/devel nmap-4.68-nostrip.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 nmap.spec, 1.44, 1.45 sources, 1.21, 1.22 nmap-4.60-nostrip.patch, 1.1, NONE Message-ID: <200807240839.m6O8dVul019460@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/nmap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19421 Modified Files: .cvsignore nmap.spec sources Added Files: nmap-4.68-nostrip.patch Removed Files: nmap-4.60-nostrip.patch Log Message: * Thu Jul 24 2008 Tomas Smetana - 2:4.68-1 - new upstream version nmap-4.68-nostrip.patch: --- NEW FILE nmap-4.68-nostrip.patch --- diff -up nmap-4.68/Makefile.in.nostrip nmap-4.68/Makefile.in --- nmap-4.68/Makefile.in.nostrip 2008-07-24 10:17:22.000000000 +0200 +++ nmap-4.68/Makefile.in 2008-07-24 10:17:41.000000000 +0200 @@ -176,9 +176,6 @@ my_distclean: install-nmap: $(TARGET) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap -# Use strip -x to avoid stripping dynamically loaded NSE functions. See -# http://seclists.org/nmap-dev/2007/q4/0272.html. - $(STRIP) -x $(DESTDIR)$(bindir)/nmap $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/ $(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/ $(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nmap/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 12 May 2008 10:39:01 -0000 1.21 +++ .cvsignore 24 Jul 2008 08:38:43 -0000 1.22 @@ -1 +1 @@ -nmap-4.62.tar.bz2 +nmap-4.68.tar.bz2 Index: nmap.spec =================================================================== RCS file: /cvs/pkgs/rpms/nmap/devel/nmap.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- nmap.spec 12 May 2008 10:44:03 -0000 1.44 +++ nmap.spec 24 Jul 2008 08:38:43 -0000 1.45 @@ -1,6 +1,6 @@ Summary: Network exploration tool and security scanner Name: nmap -Version: 4.62 +Version: 4.68 Release: 1%{?dist} License: BSD with advertising, BSD, GPLv2 Group: Applications/System @@ -10,8 +10,7 @@ Source3: nmapfe-48.png Patch1: nmap-4.03-mktemp.patch Patch2: nmap-4.52-noms.patch -Patch3: nmap-4.60-nostrip.patch -Patch4: nmap-4.52-pixmaps.patch +Patch3: nmap-4.68-nostrip.patch URL: http://www.insecure.org/nmap/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Epoch: 2 @@ -43,12 +42,11 @@ %patch1 -p1 -b .mktemp %patch2 -p1 -b .noms %patch3 -p1 -b .nostrip -%patch4 -p1 -b .pixmaps # we want pixmaps in /usr/share/pixmaps/zenmap/ -mkdir %{pixmap_srcdir}/zenmap -mv %{pixmap_srcdir}/*.svg %{pixmap_srcdir}/zenmap -mv %{pixmap_srcdir}/*.png %{pixmap_srcdir}/zenmap +#mkdir %{pixmap_srcdir}/zenmap +#mv %{pixmap_srcdir}/*.svg %{pixmap_srcdir}/zenmap +#mv %{pixmap_srcdir}/*.png %{pixmap_srcdir}/zenmap %build export CFLAGS="$RPM_OPT_FLAGS" @@ -104,13 +102,15 @@ %{python_sitelib}/* %{_datadir}/applications/nmap-zenmap.desktop %{_datadir}/icons/* -%{_datadir}/pixmaps/zenmap %{_datadir}/zenmap %{_mandir}/man1/zenmap.1.gz %{_mandir}/man1/nmapfe.1.gz %{_mandir}/man1/xnmap.1.gz %changelog +* Thu Jul 24 2008 Tomas Smetana - 2:4.68-1 +- new upstream version + * Mon May 12 2008 Tomas Smetana - 2:4.62-1 - new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nmap/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 12 May 2008 10:39:01 -0000 1.21 +++ sources 24 Jul 2008 08:38:43 -0000 1.22 @@ -1 +1 @@ -4fdaa418f4008509d4c91ec087131d4e nmap-4.62.tar.bz2 +c363d32a00c697d15996fced22072b6c nmap-4.68.tar.bz2 --- nmap-4.60-nostrip.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 08:44:50 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Thu, 24 Jul 2008 08:44:50 GMT Subject: rpms/busybox/devel busybox.spec,1.84,1.85 Message-ID: <200807240844.m6O8ioNE019819@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/busybox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19675 Modified Files: busybox.spec Log Message: add the patch number Index: busybox.spec =================================================================== RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- busybox.spec 24 Jul 2008 08:32:38 -0000 1.84 +++ busybox.spec 24 Jul 2008 08:44:03 -0000 1.85 @@ -7,7 +7,7 @@ Group: System Environment/Shells Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2 Source1: busybox-petitboot.config -Patch: busybox-1.10.1-static.patch +Patch0: busybox-1.10.1-static.patch Patch1: busybox-1.10.1-anaconda.patch Patch4: busybox-1.2.0-ppc64.patch Patch11: busybox-1.2.2-iptunnel.patch @@ -54,7 +54,7 @@ %prep %setup -q %patch13 -b .clean -p1 -%patch -b .static -p1 +%patch0 -b .static -p1 %patch11 -b .iptunnel -p1 %patch12 -b .ls -p1 %patch14 -b .msh -p1 @@ -70,7 +70,7 @@ # create busybox optimized for anaconda make clean # revert the static patches -patch -R -p1 <%{PATCH} +patch -R -p1 <%{PATCH0} # applied anaconda patch patch -b --suffix .anaconda -p1 < %{PATCH1} make defconfig From fedora-extras-commits at redhat.com Thu Jul 24 08:45:04 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 24 Jul 2008 08:45:04 GMT Subject: rpms/nmap/devel nmap.spec,1.45,1.46 Message-ID: <200807240845.m6O8j4hq019838@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/nmap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19748 Modified Files: nmap.spec Log Message: removed trailing whitespaces... and couldn't make tag Index: nmap.spec =================================================================== RCS file: /cvs/pkgs/rpms/nmap/devel/nmap.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- nmap.spec 24 Jul 2008 08:38:43 -0000 1.45 +++ nmap.spec 24 Jul 2008 08:44:17 -0000 1.46 @@ -32,7 +32,7 @@ Summary: the GTK+ frontend for nmap Group: Applications/System Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2 -BuildRequires: python >= 2.5 pygtk2-devel libpng-devel +BuildRequires: python >= 2.5 pygtk2-devel libpng-devel %description frontend This package includes zenmap, a GTK+ frontend for nmap. The nmap package must be installed before installing nmap-frontend. @@ -82,13 +82,13 @@ %clean rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) %doc COPYING* -%doc docs/README +%doc docs/README #%doc docs/nmap-fingerprinting-article.txt -#%doc docs/nmap.deprecated.txt -%doc docs/nmap.usage.txt +#%doc docs/nmap.deprecated.txt +%doc docs/nmap.usage.txt %{_bindir}/nmap %{_datadir}/nmap %{_libexecdir}/nmap From fedora-extras-commits at redhat.com Thu Jul 24 09:00:50 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Thu, 24 Jul 2008 09:00:50 GMT Subject: rpms/kernel/devel config-generic,1.138,1.139 Message-ID: <200807240900.m6O90oiM020990@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20873 Modified Files: config-generic Log Message: New items for 2.6.26-git11 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- config-generic 23 Jul 2008 19:51:09 -0000 1.138 +++ config-generic 24 Jul 2008 08:59:56 -0000 1.139 @@ -2861,6 +2861,7 @@ # Multifunction USB devices CONFIG_MFD_SM501=m +# CONFIG_MFD_TC6393XB is not set # # File systems @@ -3296,6 +3297,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_KEXEC=y @@ -3491,8 +3493,11 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_DMADEVICES=y +CONFIG_INTEL_IOATDMA=m CONFIG_DMA_ENGINE=y CONFIG_NET_DMA=y +# CONFIG_DMATEST is not set CONFIG_UNUSED_SYMBOLS=y From fedora-extras-commits at redhat.com Thu Jul 24 09:03:24 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Thu, 24 Jul 2008 09:03:24 GMT Subject: rpms/kernel/devel kernel.spec,1.793,1.794 Message-ID: <200807240903.m6O93On3027922@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27734 Modified Files: kernel.spec Log Message: New items for 2.6.26-git11 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.793 retrieving revision 1.794 diff -u -r1.793 -r1.794 --- kernel.spec 24 Jul 2008 08:28:26 -0000 1.793 +++ kernel.spec 24 Jul 2008 09:02:32 -0000 1.794 @@ -1784,6 +1784,7 @@ %changelog * Thu Jul 24 2008 Roland McGrath - 2.6.26-git11 +- kconfig updates for 2.6.26-git11 - utrace update * Wed Jul 23 2008 Dave Jones From fedora-extras-commits at redhat.com Thu Jul 24 09:03:51 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 09:03:51 GMT Subject: rpms/python-fedora/devel .cvsignore, 1.18, 1.19 python-fedora.spec, 1.21, 1.22 sources, 1.19, 1.20 Message-ID: <200807240903.m6O93pQ7027953@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Jul 2008 05:19:32 -0000 1.18 +++ .cvsignore 24 Jul 2008 09:03:02 -0000 1.19 @@ -1 +1 @@ -python-fedora-0.3.2.tar.gz +python-fedora-0.3.3.tar.gz \ No newline at end of file Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- python-fedora.spec 20 Jul 2008 05:19:32 -0000 1.21 +++ python-fedora.spec 24 Jul 2008 09:03:02 -0000 1.22 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.2 +Version: 0.3.3 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 +- A few fixes for the new fas release. + * Sun Jul 20 2008 Luke Macken - 0.3.2-1 - Latest upstream release - Add koji to the Requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 20 Jul 2008 05:19:32 -0000 1.19 +++ sources 24 Jul 2008 09:03:02 -0000 1.20 @@ -1 +1 @@ -620153d0c42d5a9030239c01e29ce1d8 python-fedora-0.3.2.tar.gz +5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz \ No newline at end of file From fedora-extras-commits at redhat.com Thu Jul 24 09:06:42 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Thu, 24 Jul 2008 09:06:42 GMT Subject: rpms/ikiwiki/devel .cvsignore, 1.4, 1.5 ikiwiki.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200807240906.m6O96gHG028213@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28128/devel Modified Files: .cvsignore ikiwiki.spec import.log sources Log Message: Update to 2.54. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jul 2008 11:35:14 -0000 1.4 +++ .cvsignore 24 Jul 2008 09:05:56 -0000 1.5 @@ -1 +1 @@ -ikiwiki_2.53.tar.gz +ikiwiki_2.54.tar.gz Index: ikiwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ikiwiki.spec 12 Jul 2008 11:35:14 -0000 1.3 +++ ikiwiki.spec 24 Jul 2008 09:05:56 -0000 1.4 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 2.53 +Version: 2.54 Release: 1%{?dist} Summary: A wiki compiler @@ -117,10 +117,13 @@ # contains a packlist only %exclude %{perl_vendorarch} %{perl_vendorlib}/IkiWiki* +%exclude %{perl_vendorlib}/IkiWiki*/Plugin/skeleton.pm.example # directory for external (non-perl) plugins, needs RPC::XML %exclude %{_prefix}/lib/ikiwiki/plugins/* %doc README debian/changelog debian/NEWS %doc html +%doc IkiWiki/Plugin/skeleton.pm.example + %package w3m Summary: Ikiwiki w3m cgi meta-wrapper @@ -142,6 +145,10 @@ %changelog +* Thu Jul 24 2008 Thomas Moschny - 2.54-1 +- Update to 2.54. +- Move example plugin file to doc. + * Sat Jul 12 2008 Thomas Moschny - 2.53-1 - Update to 2.53. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 12 Jul 2008 11:35:14 -0000 1.3 +++ import.log 24 Jul 2008 09:05:56 -0000 1.4 @@ -1,3 +1,4 @@ ikiwiki-2_51-1_fc9:HEAD:ikiwiki-2.51-1.fc9.src.rpm:1215354319 ikiwiki-2_52-1_fc9:HEAD:ikiwiki-2.52-1.fc9.src.rpm:1215849595 ikiwiki-2_53-1_fc9:HEAD:ikiwiki-2.53-1.fc9.src.rpm:1215862494 +ikiwiki-2_54-1_fc9:HEAD:ikiwiki-2.54-1.fc9.src.rpm:1216890323 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jul 2008 11:35:14 -0000 1.4 +++ sources 24 Jul 2008 09:05:56 -0000 1.5 @@ -1 +1 @@ -757a65d66e574f288eb9a11f37a6d389 ikiwiki_2.53.tar.gz +fc48464008cc84eb15481da4870ce3cf ikiwiki_2.54.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 09:10:11 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 09:10:11 GMT Subject: rpms/python-fedora/devel .cvsignore,1.19,1.20 sources,1.20,1.21 Message-ID: <200807240910.m6O9AB4v028535@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28354 Modified Files: .cvsignore sources Log Message: bad merge left us with the files that aren't parsed by the system right. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 24 Jul 2008 09:03:02 -0000 1.19 +++ .cvsignore 24 Jul 2008 09:09:20 -0000 1.20 @@ -1 +1 @@ -python-fedora-0.3.3.tar.gz \ No newline at end of file +python-fedora-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 24 Jul 2008 09:03:02 -0000 1.20 +++ sources 24 Jul 2008 09:09:20 -0000 1.21 @@ -1 +1 @@ -5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz \ No newline at end of file +5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 09:12:48 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 24 Jul 2008 09:12:48 GMT Subject: rpms/kdepim/devel kdepim-4.1.0-akonadi.patch, NONE, 1.1 kdepim.spec, 1.181, 1.182 Message-ID: <200807240912.m6O9Cmw3028859@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28755 Modified Files: kdepim.spec Added Files: kdepim-4.1.0-akonadi.patch Log Message: fix compile problem for akonadi kdepim-4.1.0-akonadi.patch: --- NEW FILE kdepim-4.1.0-akonadi.patch --- diff -up kdepim-4.1.0/akonadi/CMakeLists.txt.orig kdepim-4.1.0/akonadi/CMakeLists.txt --- kdepim-4.1.0/akonadi/CMakeLists.txt.orig 2008-07-24 11:07:36.000000000 +0200 +++ kdepim-4.1.0/akonadi/CMakeLists.txt 2008-07-24 11:08:18.000000000 +0200 @@ -14,10 +14,10 @@ if (XSLTPROC_EXECUTABLE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name} - ${CMAKE_INSTALL_PREFIX}/share/apps/akonadi-kde/kcfg2dbus.xsl + ${DATA_INSTALL_DIR}/akonadi-kde/kcfg2dbus.xsl ${_kcfg} > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml - DEPENDS ${CMAKE_INSTALL_PREFIX}/share/apps/akonadi-kde/kcfg2dbus.xsl + DEPENDS ${DATA_INSTALL_DIR}/akonadi-kde/kcfg2dbus.xsl ${_kcfg} ) endmacro( kcfg_generate_dbus_interface ) Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- kdepim.spec 23 Jul 2008 14:57:35 -0000 1.181 +++ kdepim.spec 24 Jul 2008 09:12:01 -0000 1.182 @@ -14,6 +14,7 @@ URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: kdepim-4.1.0-akonadi.patch Provides: kdepim4 = %{version}-%{release} @@ -88,6 +89,7 @@ %prep %setup -q +%patch -p1 -b .akonadi %build From fedora-extras-commits at redhat.com Thu Jul 24 09:16:31 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 09:16:31 GMT Subject: rpms/python-fedora/F-8 .cvsignore, 1.13, 1.14 python-fedora.spec, 1.15, 1.16 sources, 1.15, 1.16 Message-ID: <200807240916.m6O9GVBM029119@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/F-8 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 20 Jul 2008 05:30:01 -0000 1.13 +++ .cvsignore 24 Jul 2008 09:15:43 -0000 1.14 @@ -1 +1 @@ -python-fedora-0.3.2.tar.gz +python-fedora-0.3.3.tar.gz \ No newline at end of file Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/python-fedora.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-fedora.spec 20 Jul 2008 05:29:28 -0000 1.15 +++ python-fedora.spec 24 Jul 2008 09:15:43 -0000 1.16 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.2 +Version: 0.3.3 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 +- A few fixes for the new fas release. + * Sun Jul 20 2008 Luke Macken - 0.3.2-1 - Latest upstream release - Add koji to the Requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 20 Jul 2008 05:30:01 -0000 1.15 +++ sources 24 Jul 2008 09:15:43 -0000 1.16 @@ -1 +1 @@ -620153d0c42d5a9030239c01e29ce1d8 python-fedora-0.3.2.tar.gz +5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz \ No newline at end of file From fedora-extras-commits at redhat.com Thu Jul 24 09:16:43 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 09:16:43 GMT Subject: rpms/python-fedora/EL-5 .cvsignore, 1.10, 1.11 python-fedora.spec, 1.9, 1.10 sources, 1.10, 1.11 Message-ID: <200807240916.m6O9GhhP029130@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/EL-5 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 May 2008 01:01:41 -0000 1.10 +++ .cvsignore 24 Jul 2008 09:15:22 -0000 1.11 @@ -1 +1 @@ -python-fedora-0.2.99.11.1.tar.gz +python-fedora-0.3.3.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-fedora.spec 20 May 2008 01:01:41 -0000 1.9 +++ python-fedora.spec 24 Jul 2008 09:15:22 -0000 1.10 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.2.99.11.1 +Version: 0.3.3 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -17,6 +17,7 @@ Requires: python-bugzilla Requires: python-feedparser Requires: python-sqlalchemy +Requires: koji Provides: python-fedora-infrastructure = %{version}-%{release} Obsoletes: python-fedora-infrastructure < %{version}-%{release} @@ -49,6 +50,19 @@ %{python_sitelib}/* %changelog +* Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 +- A few fixes for the new fas release. + +* Sun Jul 20 2008 Luke Macken - 0.3.2-1 +- Latest upstream release +- Add koji to the Requires + +* Mon Jul 14 2008 Luke Macken - 0.3.1-1 +- New upstream bugfix release + +* Wed Jul 02 2008 Luke Macken - 0.3-1 +- New upstream release. + * Wed Apr 23 2008 Toshio Kuratomi - 0.2.99.11.1-1 - Fix a crasher bug. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 May 2008 01:01:41 -0000 1.10 +++ sources 24 Jul 2008 09:15:22 -0000 1.11 @@ -1 +1 @@ -ba500610a05a4a450e3c5db4f8074848 python-fedora-0.2.99.11.1.tar.gz +5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 09:17:00 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 09:17:00 GMT Subject: rpms/python-fedora/F-9 .cvsignore, 1.15, 1.16 python-fedora.spec, 1.20, 1.21 sources, 1.17, 1.18 Message-ID: <200807240917.m6O9H0S7029156@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/F-9 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 20 Jul 2008 05:34:08 -0000 1.15 +++ .cvsignore 24 Jul 2008 09:16:02 -0000 1.16 @@ -1 +1 @@ -python-fedora-0.3.2.tar.gz +python-fedora-0.3.3.tar.gz \ No newline at end of file Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- python-fedora.spec 20 Jul 2008 05:34:08 -0000 1.20 +++ python-fedora.spec 24 Jul 2008 09:16:02 -0000 1.21 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.2 +Version: 0.3.3 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 +- A few fixes for the new fas release. + * Sun Jul 20 2008 Luke Macken - 0.3.2-1 - Latest upstream release - Add koji to the Requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 20 Jul 2008 05:34:08 -0000 1.17 +++ sources 24 Jul 2008 09:16:02 -0000 1.18 @@ -1 +1 @@ -620153d0c42d5a9030239c01e29ce1d8 python-fedora-0.3.2.tar.gz +5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz \ No newline at end of file From fedora-extras-commits at redhat.com Thu Jul 24 09:33:12 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Thu, 24 Jul 2008 09:33:12 GMT Subject: rpms/transmission/F-8 transmission-1.05-gnusource.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 transmission.spec, 1.18, 1.19 transmission-1.11-socket.patch, 1.1, NONE Message-ID: <200807240933.m6O9XCpM030205@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/transmission/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30144 Modified Files: .cvsignore sources transmission.spec Added Files: transmission-1.05-gnusource.patch Removed Files: transmission-1.11-socket.patch Log Message: Update to upstream 1.22 transmission-1.05-gnusource.patch: --- NEW FILE transmission-1.05-gnusource.patch --- --- transmission-1.05/third-party/libevent/http.c.orig 2008-02-10 12:56:09.000000000 +0100 +++ transmission-1.05/third-party/libevent/http.c 2008-02-10 12:56:26.000000000 +0100 @@ -25,6 +25,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define _GNU_SOURCE + #ifdef HAVE_CONFIG_H #include "config.h" #endif Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/transmission/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 6 May 2008 07:11:19 -0000 1.15 +++ .cvsignore 24 Jul 2008 09:32:25 -0000 1.16 @@ -1 +1 @@ -transmission-1.11.tar.bz2 +transmission-1.22.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/transmission/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 6 May 2008 07:11:19 -0000 1.15 +++ sources 24 Jul 2008 09:32:25 -0000 1.16 @@ -1 +1 @@ -4582d7aff489a9425b147634653df1d1 transmission-1.11.tar.bz2 +aa0a2db19b0f3dbfd75a0fb354d6c47d transmission-1.22.tar.bz2 Index: transmission.spec =================================================================== RCS file: /cvs/pkgs/rpms/transmission/F-8/transmission.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- transmission.spec 6 May 2008 07:11:19 -0000 1.18 +++ transmission.spec 24 Jul 2008 09:32:25 -0000 1.19 @@ -1,6 +1,6 @@ Name: transmission -Version: 1.11 +Version: 1.22 Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client @@ -9,13 +9,16 @@ URL: http://www.transmissionbt.com/ Source0: http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2 Patch0: transmission-0.81-downloaddir.patch -Patch1: transmission-1.11-copt.patch -Patch2: transmission-1.11-socket.patch +Patch1: transmission-1.05-gnusource.patch +Patch2: transmission-1.11-copt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel >= 0.9.4 +BuildRequires: glib2-devel >= 2.15.5 BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: libnotify-devel >= 0.4.4 +BuildRequires: curl-devel >= 7.15.0 +BuildRequires: dbus-glib-devel >= 0.70 BuildRequires: desktop-file-utils BuildRequires: gettext intltool @@ -29,8 +32,8 @@ %prep %setup -q %patch0 -p1 -b .dwnldir -%patch1 -p1 -b .copt -%patch2 -p1 -b .socket +%patch1 -p1 -b .gnusrc +%patch2 -p1 -b .copt %build @@ -73,6 +76,9 @@ %changelog +* Thu Jul 24 2008 Denis Leroy - 1.22-1 +- Update to upstream 1.22 + * Fri May 2 2008 Denis Leroy - 1.11-1 - Update to upstream 1.11, many bug fixes - Patch to fix opening issue from browser (#431769) --- transmission-1.11-socket.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 09:38:03 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Thu, 24 Jul 2008 09:38:03 GMT Subject: rpms/kernel/devel config-generic, 1.139, 1.140 kernel.spec, 1.794, 1.795 Message-ID: <200807240938.m6O9c3jl030506@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413 Modified Files: config-generic kernel.spec Log Message: Disable sfc module, not compiling. Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- config-generic 24 Jul 2008 08:59:56 -0000 1.139 +++ config-generic 24 Jul 2008 09:37:15 -0000 1.140 @@ -1224,7 +1224,7 @@ CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y -CONFIG_SFC=m +CONFIG_SFC=n # CONFIG_SK98LIN is not set CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.794 retrieving revision 1.795 diff -u -r1.794 -r1.795 --- kernel.spec 24 Jul 2008 09:02:32 -0000 1.794 +++ kernel.spec 24 Jul 2008 09:37:15 -0000 1.795 @@ -1783,6 +1783,9 @@ %changelog * Thu Jul 24 2008 Roland McGrath +- Disable sfc module, not compiling. + +* Thu Jul 24 2008 Roland McGrath - 2.6.26-git11 - kconfig updates for 2.6.26-git11 - utrace update From fedora-extras-commits at redhat.com Thu Jul 24 09:51:46 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 24 Jul 2008 09:51:46 GMT Subject: rpms/tktable/EL-5 tktable.spec,1.17,1.18 Message-ID: <200807240951.m6O9pkxp031224@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/tktable/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31186 Modified Files: tktable.spec Log Message: * Thu Jul 24 2008 Sergio Pascual 2.9-10 - Rebuilt for EL-5 - Clarify license tag Index: tktable.spec =================================================================== RCS file: /cvs/pkgs/rpms/tktable/EL-5/tktable.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tktable.spec 1 Mar 2006 17:23:33 -0000 1.17 +++ tktable.spec 24 Jul 2008 09:50:48 -0000 1.18 @@ -1,8 +1,8 @@ Summary: Table/matrix widget extension to Tcl/Tk Name: tktable Version: 2.9 -Release: 9%{?dist} -License: BSD-like +Release: 10%{?dist} +License: TCL Group: Development/Libraries Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz URL: http://tktable.sourceforge.net/ @@ -49,6 +49,10 @@ %changelog +* Thu Jul 24 2008 Sergio Pascual 2.9-10 +- Rebuilt for EL-5 +- Clarify license tag + * Tue Mar 1 2006 Jean-Luc Fontaine 2.9-9 - fixed problem in configuration stage From fedora-extras-commits at redhat.com Thu Jul 24 09:57:05 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 09:57:05 GMT Subject: rpms/kdepim/devel kdepim.spec,1.182,1.183 Message-ID: <200807240957.m6O9v5ms031402@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31347/devel Modified Files: kdepim.spec Log Message: Can't mix Patch0: and unnumbered %patch with the new RPM. Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- kdepim.spec 24 Jul 2008 09:12:01 -0000 1.182 +++ kdepim.spec 24 Jul 2008 09:56:20 -0000 1.183 @@ -89,7 +89,7 @@ %prep %setup -q -%patch -p1 -b .akonadi +%patch0 -p1 -b .akonadi %build From fedora-extras-commits at redhat.com Thu Jul 24 10:05:38 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 24 Jul 2008 10:05:38 GMT Subject: rpms/blt/EL-5 blt.spec,1.11,1.12 Message-ID: <200807241005.m6OA5cMd005923@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/blt/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5845 Modified Files: blt.spec Log Message: * Thu Jul 24 2008 Sergio Pascual 2.4-20.z - Rebuilt for EL-5 Index: blt.spec =================================================================== RCS file: /cvs/pkgs/rpms/blt/EL-5/blt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blt.spec 28 Aug 2006 09:52:50 -0000 1.11 +++ blt.spec 24 Jul 2008 10:04:44 -0000 1.12 @@ -1,7 +1,7 @@ Summary: BLT widget extension to Tcl/Tk scripting language development Name: blt Version: 2.4 -Release: 14.z%{?dist} +Release: 20.z%{?dist} License: MIT Group: Development/Libraries @@ -22,8 +22,23 @@ Note: this version is stubs enabled and therefore should be compatible with Tcl/Tk versions after and including 8.3.1. + +%package devel +Summary: Development package for BLT +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +BLT is an extension to the Tk toolkiy. BLT's most useful feature is the +provision of more widgets for Tk, but it also provides more geometry managers +and miscellaneous other commands. Note that you won't need to any patching +of the Tcl or Tk source file to use BLT, but you will need to have Tcl/Tk +installed in order to use BLT. + +This package provides headers needed to build packages based on BLT. + %prep -%setup -q -n %{name}%{version}z +%setup -q -n %{name}%{version} %patch0 -p1 %patch1 -p1 @@ -38,19 +53,47 @@ install -d $DIRECTORY install -m 755 -p src/shared/libBLT24.so src/shared/libBLTlite24.so $DIRECTORY install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $DIRECTORY +install -d $RPM_BUILD_ROOT%{_includedir}/%{name} +install -m 644 -p src/*.h $RPM_BUILD_ROOT%{_includedir}/%{name} echo 'package ifneeded BLT 2.4 "if {[llength [info commands tk]] > 0} {load [file join $dir libBLT24.so]} else {load [file join $dir libBLTlite24.so] BLT}"' > $DIRECTORY/pkgIndex.tcl cp -p -r library/dd_protocols $DIRECTORY rm -f html/Makefile.vc +# File in /etc/ld.so.conf.d +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/%{name}%{version}" >> $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root,0755) %doc README INSTALL PROBLEMS html/ +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* %{_libdir}/%{name}%{version}/ +%files devel +%defattr(-,root,root,-) +%{_includedir}/blt/* + %changelog +* Thu Jul 24 2008 Sergio Pascual 2.4-20.z +- Rebuilt for EL-5 + +* Thu Nov 15 2007 Sergio Pascual 2.4-19 +- Renaming the file in /etc/ld.so.conf.d to %%name + +* Mon Nov 05 2007 Sergio Pascual 2.4-18 +- Providing file in /etc/ld.so.conf.d (bug #333081) + +* Mon Oct 22 2007 Marek Mahut 2.4-17 +- Providing devel package as per request in BZ#249812 + +* Thu Feb 8 2007 Jean-Luc Fontaine 2.4-15.z +- require tk < 8.5 * Mon Aug 28 2006 Jean-Luc Fontaine 2.4-14.z - added dist tag From fedora-extras-commits at redhat.com Thu Jul 24 10:14:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:14:03 +0000 Subject: [pkgdb] coreutils: kdudka has requested watchbugzilla Message-ID: <20080724101403.DA2371AD0E0@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on coreutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:14:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:14:18 +0000 Subject: [pkgdb] coreutils: kdudka has requested commit Message-ID: <20080724101419.1B1461AD0E5@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on coreutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:14:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:14:23 +0000 Subject: [pkgdb] coreutils: kdudka has requested watchcommits Message-ID: <20080724101423.933481AD0E9@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on coreutils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:14:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:14:45 +0000 Subject: [pkgdb] coreutils: kdudka has requested watchbugzilla Message-ID: <20080724101446.1FDC11AD0F7@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on coreutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:14:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:14:49 +0000 Subject: [pkgdb] coreutils: kdudka has requested commit Message-ID: <20080724101451.315381AD0E5@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on coreutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:14:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:14:47 +0000 Subject: [pkgdb] coreutils: kdudka has requested watchcommits Message-ID: <20080724101449.A5D6C1AD0FF@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on coreutils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:15:58 +0000 Subject: [pkgdb] elinks: kdudka has requested watchbugzilla Message-ID: <20080724101559.3E0621AD0E3@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on elinks (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Thu Jul 24 10:16:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:16:02 +0000 Subject: [pkgdb] elinks: kdudka has requested watchcommits Message-ID: <20080724101602.E7F621AD0EC@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on elinks (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Thu Jul 24 10:16:00 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 24 Jul 2008 10:16:00 GMT Subject: rpms/blt/EL-5 blt.spec,1.12,1.13 Message-ID: <200807241016.m6OAG0SU006411@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/blt/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6318 Modified Files: blt.spec Log Message: * Thu Jul 24 2008 Sergio Pascual 2.4-21.z - Rebuilt for EL-5 - Minor typo fixed Index: blt.spec =================================================================== RCS file: /cvs/pkgs/rpms/blt/EL-5/blt.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blt.spec 24 Jul 2008 10:04:44 -0000 1.12 +++ blt.spec 24 Jul 2008 10:15:03 -0000 1.13 @@ -1,7 +1,7 @@ Summary: BLT widget extension to Tcl/Tk scripting language development Name: blt Version: 2.4 -Release: 20.z%{?dist} +Release: 21.z%{?dist} License: MIT Group: Development/Libraries @@ -38,7 +38,7 @@ This package provides headers needed to build packages based on BLT. %prep -%setup -q -n %{name}%{version} +%setup -q -n %{name}%{version}z %patch0 -p1 %patch1 -p1 @@ -80,8 +80,9 @@ %{_includedir}/blt/* %changelog -* Thu Jul 24 2008 Sergio Pascual 2.4-20.z +* Thu Jul 24 2008 Sergio Pascual 2.4-21.z - Rebuilt for EL-5 +- Minor typo fixed * Thu Nov 15 2007 Sergio Pascual 2.4-19 - Renaming the file in /etc/ld.so.conf.d to %%name From fedora-extras-commits at redhat.com Thu Jul 24 10:16:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:16:03 +0000 Subject: [pkgdb] elinks: kdudka has requested commit Message-ID: <20080724101603.A9C521AD0F7@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on elinks (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Thu Jul 24 10:18:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:18:35 +0000 Subject: [pkgdb] quota: kdudka has requested watchcommits Message-ID: <20080724101835.53BB51AD0E7@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on quota (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:18:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:18:33 +0000 Subject: [pkgdb] quota: kdudka has requested watchbugzilla Message-ID: <20080724101833.5FF791AD0E0@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on quota (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:18:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:18:37 +0000 Subject: [pkgdb] quota: kdudka has requested commit Message-ID: <20080724101838.B277B1AD0EC@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on quota (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:18:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:18:45 +0000 Subject: [pkgdb] quota: kdudka has requested watchbugzilla Message-ID: <20080724101845.6B6811AD0DD@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on quota (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:18:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:18:48 +0000 Subject: [pkgdb] quota: kdudka has requested watchcommits Message-ID: <20080724101848.27F631AD0F8@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on quota (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:18:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:18:48 +0000 Subject: [pkgdb] quota: kdudka has requested commit Message-ID: <20080724101848.7A16E1AD0FB@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on quota (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:19:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:19:44 +0000 Subject: [pkgdb] docbook-style-xsl: kdudka has requested watchcommits Message-ID: <20080724101945.EB2411AD0E7@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on docbook-style-xsl (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:19:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:19:45 +0000 Subject: [pkgdb] docbook-style-xsl: kdudka has requested commit Message-ID: <20080724101947.506E51AD0E5@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on docbook-style-xsl (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:19:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:19:50 +0000 Subject: [pkgdb] docbook-style-xsl: kdudka has requested watchbugzilla Message-ID: <20080724101950.7AB2B1AD0F8@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchbugzilla acl on docbook-style-xsl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:19:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:19:52 +0000 Subject: [pkgdb] docbook-style-xsl: kdudka has requested watchcommits Message-ID: <20080724101952.176301AD0FB@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the watchcommits acl on docbook-style-xsl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:19:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:19:54 +0000 Subject: [pkgdb] docbook-style-xsl: kdudka has requested commit Message-ID: <20080724101954.2C7D81AD101@bastion.fedora.phx.redhat.com> Kamil Dudka (kdudka) has requested the commit acl on docbook-style-xsl (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:20:58 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 24 Jul 2008 10:20:58 GMT Subject: rpms/kdepim/devel kdepim.spec, 1.183, 1.184 sources, 1.57, 1.58 kdepim-4.1.0-akonadi.patch, 1.1, NONE Message-ID: <200807241020.m6OAKwLe006747@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6705 Modified Files: kdepim.spec sources Removed Files: kdepim-4.1.0-akonadi.patch Log Message: respun kdepim-4.1.0 Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- kdepim.spec 24 Jul 2008 09:56:20 -0000 1.183 +++ kdepim.spec 24 Jul 2008 10:20:09 -0000 1.184 @@ -14,7 +14,6 @@ URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: kdepim-4.1.0-akonadi.patch Provides: kdepim4 = %{version}-%{release} @@ -89,8 +88,6 @@ %prep %setup -q -%patch0 -p1 -b .akonadi - %build mkdir -p %{_target_platform} Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 23 Jul 2008 14:57:35 -0000 1.57 +++ sources 24 Jul 2008 10:20:09 -0000 1.58 @@ -1 +1 @@ -6577e3ce8d6d078eddd59fe1529d1df6 kdepim-4.1.0.tar.bz2 +af600e2c096e932b3b87cc2a8270fcf0 kdepim-4.1.0.tar.bz2 --- kdepim-4.1.0-akonadi.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 10:27:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:27:06 +0000 Subject: [pkgdb] coreutils had acl change status Message-ID: <20080724102706.A52981AD0E7@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on coreutils (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:27:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:27:04 +0000 Subject: [pkgdb] coreutils had acl change status Message-ID: <20080724102704.742131AD0E0@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on coreutils (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:27:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:27:08 +0000 Subject: [pkgdb] coreutils had acl change status Message-ID: <20080724102708.E73F51AD0EC@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on coreutils (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:27:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:27:20 +0000 Subject: [pkgdb] coreutils had acl change status Message-ID: <20080724102721.6557E1AD0ED@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on coreutils (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:27:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:27:24 +0000 Subject: [pkgdb] coreutils had acl change status Message-ID: <20080724102724.EC9611AD0E0@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on coreutils (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:27:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:27:21 +0000 Subject: [pkgdb] coreutils had acl change status Message-ID: <20080724102722.A61B81AD0E3@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on coreutils (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/coreutils From fedora-extras-commits at redhat.com Thu Jul 24 10:28:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:05 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <20080724102806.329A91AD0DD@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on elinks (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Thu Jul 24 10:28:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:10 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <20080724102811.1D6921AD0EC@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on elinks (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Thu Jul 24 10:28:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:07 +0000 Subject: [pkgdb] elinks had acl change status Message-ID: <20080724102807.8C2231AD0E7@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on elinks (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elinks From fedora-extras-commits at redhat.com Thu Jul 24 10:28:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:33 +0000 Subject: [pkgdb] quota had acl change status Message-ID: <20080724102834.6C36A1AD0F8@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on quota (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:28:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:34 +0000 Subject: [pkgdb] quota had acl change status Message-ID: <20080724102835.425341AD0E7@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on quota (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:28:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:36 +0000 Subject: [pkgdb] quota had acl change status Message-ID: <20080724102836.C8CB51AD102@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on quota (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:28:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:41 +0000 Subject: [pkgdb] quota had acl change status Message-ID: <20080724102842.47D171AD0E0@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on quota (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:28:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:44 +0000 Subject: [pkgdb] quota had acl change status Message-ID: <20080724102844.C70291AD0E9@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on quota (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:28:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:49 +0000 Subject: [pkgdb] quota had acl change status Message-ID: <20080724102849.CB0161AD0F8@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on quota (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/quota From fedora-extras-commits at redhat.com Thu Jul 24 10:28:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:52 +0000 Subject: [pkgdb] docbook-style-xsl had acl change status Message-ID: <20080724102852.1E87B1AD104@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on docbook-style-xsl (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:28:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:52 +0000 Subject: [pkgdb] docbook-style-xsl had acl change status Message-ID: <20080724102852.65CCC1AD107@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on docbook-style-xsl (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:28:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:59 +0000 Subject: [pkgdb] docbook-style-xsl had acl change status Message-ID: <20080724102859.5B2EE1AD10D@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchcommits acl on docbook-style-xsl (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:28:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:56 +0000 Subject: [pkgdb] docbook-style-xsl had acl change status Message-ID: <20080724102856.DA1001AD10B@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the watchbugzilla acl on docbook-style-xsl (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:29:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:29:01 +0000 Subject: [pkgdb] docbook-style-xsl had acl change status Message-ID: <20080724102901.B488E1AD113@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on docbook-style-xsl (Fedora 9) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:28:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 10:28:55 +0000 Subject: [pkgdb] docbook-style-xsl had acl change status Message-ID: <20080724102855.EC53B1AD101@bastion.fedora.phx.redhat.com> Ondrej Vasik (ovasik) has set the commit acl on docbook-style-xsl (Fedora devel) to Approved for Kamil Dudka (kdudka) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/docbook-style-xsl From fedora-extras-commits at redhat.com Thu Jul 24 10:47:53 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 24 Jul 2008 10:47:53 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch,1.216,1.217 Message-ID: <200807241047.m6OAlrA3008008@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7951 Modified Files: policy-20070703.patch Log Message: * Wed Jul 2 2008 Dan Walsh 3.0.8-111 - Handle updated NetworkManager policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- policy-20070703.patch 2 Jul 2008 20:53:30 -0000 1.216 +++ policy-20070703.patch 24 Jul 2008 10:47:06 -0000 1.217 @@ -1812,7 +1812,7 @@ files_search_var(mrtg_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.0.8/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2008-06-12 23:37:55.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/admin/netutils.te 2008-06-12 23:37:59.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/admin/netutils.te 2008-07-02 17:05:40.000000000 -0400 @@ -40,7 +40,7 @@ allow netutils_t self:capability { net_admin net_raw setuid setgid }; dontaudit netutils_t self:capability sys_tty_config; @@ -1871,18 +1871,7 @@ nis_use_ypbind(ping_t) ') -@@ -151,6 +170,10 @@ - ') - - optional_policy(` -+ munin_append_logs(ping_t) -+') -+ -+optional_policy(` - pcmcia_use_cardmgr_fds(ping_t) - ') - -@@ -166,7 +189,7 @@ +@@ -166,7 +185,7 @@ allow traceroute_t self:capability { net_admin net_raw setuid setgid }; allow traceroute_t self:rawip_socket create_socket_perms; allow traceroute_t self:packet_socket create_socket_perms; @@ -9656,7 +9645,7 @@ ifdef(`distro_redhat',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/dbus.if 2008-06-12 23:37:58.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/services/dbus.if 2008-07-02 17:15:03.000000000 -0400 @@ -50,6 +50,12 @@ ## # @@ -9754,7 +9743,7 @@ # For connecting to the bus allow $3 $1_dbusd_t:unix_stream_socket connectto; -+ userdom_dontaudit_write_user_home_content_files($1_dbusd_t) ++ userdom_dontaudit_write_user_home_content_files($1, $1_dbusd_t) ') ######################################## @@ -22847,7 +22836,7 @@ +/usr/sbin/sysreport -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/unconfined.if 2008-06-12 23:37:59.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/unconfined.if 2008-07-02 17:10:48.000000000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -23444,7 +23433,7 @@ /tmp/gconfd-USER -d gen_context(system_u:object_r:ROLE_tmp_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if 2008-06-27 07:07:05.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if 2008-07-02 17:13:24.000000000 -0400 @@ -29,8 +29,9 @@ ') @@ -24450,9 +24439,14 @@ read_files_pattern($2,{ $1_home_dir_t $1_home_t },$1_home_t) ') -@@ -2034,6 +2161,10 @@ - ') - +@@ -2029,11 +2156,11 @@ + ## + # + template(`userdom_dontaudit_write_user_home_content_files',` +- gen_require(` +- type $1_home_t; +- ') +- dontaudit $2 $1_home_t:file write; + fs_dontaudit_list_nfs($2) + fs_dontaudit_rw_nfs_files($2) @@ -24461,7 +24455,7 @@ ') ######################################## -@@ -2066,7 +2197,7 @@ +@@ -2066,7 +2193,7 @@ type $1_home_dir_t, $1_home_t; ') @@ -24470,7 +24464,7 @@ read_lnk_files_pattern($2,{ $1_home_dir_t $1_home_t },$1_home_t) ') -@@ -2100,7 +2231,7 @@ +@@ -2100,7 +2227,7 @@ type $1_home_dir_t, $1_home_t; ') @@ -24479,7 +24473,7 @@ exec_files_pattern($2,{ $1_home_dir_t $1_home_t },$1_home_t) ') -@@ -2169,7 +2300,7 @@ +@@ -2169,7 +2296,7 @@ type $1_home_dir_t, $1_home_t; ') @@ -24488,7 +24482,7 @@ allow $2 $1_home_dir_t:dir search_dir_perms; manage_files_pattern($2,$1_home_t,$1_home_t) ') -@@ -2241,7 +2372,7 @@ +@@ -2241,7 +2368,7 @@ type $1_home_dir_t, $1_home_t; ') @@ -24497,7 +24491,7 @@ allow $2 $1_home_dir_t:dir search_dir_perms; manage_lnk_files_pattern($2,$1_home_t,$1_home_t) ') -@@ -2278,7 +2409,7 @@ +@@ -2278,7 +2405,7 @@ type $1_home_dir_t, $1_home_t; ') @@ -24506,7 +24500,7 @@ allow $2 $1_home_dir_t:dir search_dir_perms; manage_fifo_files_pattern($2,$1_home_t,$1_home_t) ') -@@ -2315,7 +2446,7 @@ +@@ -2315,7 +2442,7 @@ type $1_home_dir_t, $1_home_t; ') @@ -24515,7 +24509,7 @@ allow $2 $1_home_dir_t:dir search_dir_perms; manage_sock_files_pattern($2,$1_home_t,$1_home_t) ') -@@ -2365,7 +2496,7 @@ +@@ -2365,7 +2492,7 @@ type $1_home_dir_t; ') @@ -24524,7 +24518,7 @@ filetrans_pattern($2,$1_home_dir_t,$3,$4) ') -@@ -2414,7 +2545,7 @@ +@@ -2414,7 +2541,7 @@ type $1_home_t; ') @@ -24533,7 +24527,7 @@ filetrans_pattern($2,$1_home_t,$3,$4) ') -@@ -2458,7 +2589,7 @@ +@@ -2458,7 +2585,7 @@ type $1_home_dir_t, $1_home_t; ') @@ -24542,7 +24536,7 @@ filetrans_pattern($2,$1_home_dir_t,$1_home_t,$3) ') -@@ -2994,6 +3125,25 @@ +@@ -2994,6 +3121,25 @@ ######################################## ## @@ -24568,7 +24562,7 @@ ## Create objects in a user temporary directory ## with an automatic type transition to ## a specified private type. -@@ -3078,7 +3228,7 @@ +@@ -3078,7 +3224,7 @@ # template(`userdom_tmp_filetrans_user_tmp',` gen_require(` @@ -24577,7 +24571,7 @@ ') files_tmp_filetrans($2,$1_tmp_t,$3) -@@ -3086,11 +3236,11 @@ +@@ -3086,11 +3232,11 @@ ######################################## ## @@ -24591,7 +24585,7 @@ ##

##

## This is a templated interface, and should only -@@ -3122,6 +3272,42 @@ +@@ -3122,6 +3268,42 @@ ######################################## ##

@@ -24634,7 +24628,7 @@ ## List users untrusted directories. ## ## -@@ -4089,7 +4275,7 @@ +@@ -4089,7 +4271,7 @@ type staff_home_dir_t; ') @@ -24643,7 +24637,7 @@ allow $1 staff_home_dir_t:dir search_dir_perms; ') -@@ -4128,7 +4314,7 @@ +@@ -4128,7 +4310,7 @@ type staff_home_dir_t; ') @@ -24652,7 +24646,7 @@ allow $1 staff_home_dir_t:dir manage_dir_perms; ') -@@ -4147,7 +4333,7 @@ +@@ -4147,7 +4329,7 @@ type staff_home_dir_t; ') @@ -24661,7 +24655,7 @@ allow $1 staff_home_dir_t:dir relabelto; ') -@@ -4185,7 +4371,7 @@ +@@ -4185,7 +4367,7 @@ type staff_home_dir_t, staff_home_t; ') @@ -24670,7 +24664,7 @@ allow $1 { staff_home_dir_t staff_home_t }:dir list_dir_perms; read_files_pattern($1,{ staff_home_dir_t staff_home_t },staff_home_t) read_lnk_files_pattern($1,{ staff_home_dir_t staff_home_t },staff_home_t) -@@ -4410,6 +4596,7 @@ +@@ -4410,6 +4592,7 @@ ') dontaudit $1 sysadm_home_dir_t:dir getattr; @@ -24678,7 +24672,7 @@ ') ######################################## -@@ -4444,9 +4631,11 @@ +@@ -4444,9 +4627,11 @@ interface(`userdom_dontaudit_search_sysadm_home_dirs',` gen_require(` type sysadm_home_dir_t; @@ -24690,7 +24684,7 @@ ') ######################################## -@@ -4570,10 +4759,11 @@ +@@ -4570,10 +4755,11 @@ type sysadm_home_dir_t, sysadm_home_t; ') @@ -24703,7 +24697,7 @@ ') ######################################## -@@ -4609,11 +4799,29 @@ +@@ -4609,11 +4795,29 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -24734,7 +24728,7 @@ ') ######################################## -@@ -4633,6 +4841,14 @@ +@@ -4633,6 +4837,14 @@ files_list_home($1) allow $1 home_dir_type:dir list_dir_perms; @@ -24749,7 +24743,7 @@ ') ######################################## -@@ -4670,6 +4886,8 @@ +@@ -4670,6 +4882,8 @@ ') dontaudit $1 { home_dir_type home_type }:dir search_dir_perms; @@ -24758,7 +24752,7 @@ ') ######################################## -@@ -4895,7 +5113,7 @@ +@@ -4895,7 +5109,7 @@ type user_home_dir_t, user_home_t; ') @@ -24767,7 +24761,7 @@ filetrans_pattern($1,user_home_dir_t,user_home_t,$2) ') -@@ -4933,7 +5151,7 @@ +@@ -4933,7 +5147,7 @@ type user_home_dir_t; ') @@ -24776,7 +24770,7 @@ allow $1 user_home_dir_t:dir manage_dir_perms; ') -@@ -4954,7 +5172,7 @@ +@@ -4954,7 +5168,7 @@ type user_home_t; ') @@ -24785,7 +24779,7 @@ manage_dirs_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -4973,7 +5191,7 @@ +@@ -4973,7 +5187,7 @@ type staff_home_dir_t; ') @@ -24794,7 +24788,7 @@ allow $1 user_home_dir_t:dir relabelto; ') -@@ -4992,7 +5210,7 @@ +@@ -4992,7 +5206,7 @@ type user_home_t, user_home_dir_t; ') @@ -24803,7 +24797,7 @@ allow $1 user_home_t:dir list_dir_perms; read_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5013,7 +5231,7 @@ +@@ -5013,7 +5227,7 @@ type user_home_t; ') @@ -24812,7 +24806,7 @@ allow $1 user_home_t:file execute; ') -@@ -5033,7 +5251,7 @@ +@@ -5033,7 +5247,7 @@ type user_home_dir_t, user_home_t; ') @@ -24821,7 +24815,7 @@ manage_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5072,7 +5290,7 @@ +@@ -5072,7 +5286,7 @@ type user_home_t; ') @@ -24830,7 +24824,7 @@ manage_lnk_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5092,7 +5310,7 @@ +@@ -5092,7 +5306,7 @@ type user_home_t; ') @@ -24839,7 +24833,7 @@ manage_fifo_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5112,7 +5330,7 @@ +@@ -5112,7 +5326,7 @@ type user_home_t; ') @@ -24848,7 +24842,7 @@ manage_sock_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') -@@ -5131,7 +5349,7 @@ +@@ -5131,7 +5345,7 @@ attribute user_home_dir_type; ') @@ -24857,7 +24851,7 @@ allow $1 user_home_dir_type:dir search_dir_perms; ') -@@ -5151,7 +5369,7 @@ +@@ -5151,7 +5365,7 @@ attribute user_home_dir_type, user_home_type; ') @@ -24866,7 +24860,7 @@ allow $1 user_home_type:dir list_dir_perms; read_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) read_lnk_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) -@@ -5173,7 +5391,7 @@ +@@ -5173,7 +5387,7 @@ attribute user_home_dir_type, user_home_type; ') @@ -24875,7 +24869,7 @@ manage_dirs_pattern($1,{ user_home_dir_type user_home_type },user_home_type) ') -@@ -5193,7 +5411,7 @@ +@@ -5193,7 +5407,7 @@ attribute user_home_dir_type, user_home_type; ') @@ -24884,7 +24878,7 @@ manage_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) ') -@@ -5323,7 +5541,7 @@ +@@ -5323,7 +5537,7 @@ attribute user_tmpfile; ') @@ -24893,7 +24887,7 @@ ') ######################################## -@@ -5346,6 +5564,25 @@ +@@ -5346,6 +5560,25 @@ ######################################## ## @@ -24919,7 +24913,7 @@ ## Write all unprivileged users files in /tmp ## ## -@@ -5529,6 +5766,24 @@ +@@ -5529,6 +5762,24 @@ ######################################## ## @@ -24944,7 +24938,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5559,3 +5814,420 @@ +@@ -5559,3 +5810,420 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') From fedora-extras-commits at redhat.com Thu Jul 24 10:51:54 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Thu, 24 Jul 2008 10:51:54 GMT Subject: rpms/kernel/devel kernel.spec,1.795,1.796 Message-ID: <200807241051.m6OApsdL008469@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8340 Modified Files: kernel.spec Log Message: Disable kernel-doc package. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.795 retrieving revision 1.796 diff -u -r1.795 -r1.796 --- kernel.spec 24 Jul 2008 09:37:15 -0000 1.795 +++ kernel.spec 24 Jul 2008 10:51:05 -0000 1.796 @@ -84,7 +84,7 @@ %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} # don't build the kernel-doc package -#% define with_doc 0 +%define with_doc 0 # Additional options for user-friendly one-off kernel building: # @@ -1784,6 +1784,7 @@ %changelog * Thu Jul 24 2008 Roland McGrath - Disable sfc module, not compiling. +- Disable kernel-doc package. * Thu Jul 24 2008 Roland McGrath - 2.6.26-git11 From fedora-extras-commits at redhat.com Thu Jul 24 10:57:29 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Thu, 24 Jul 2008 10:57:29 GMT Subject: rpms/mpfr/F-9 .cvsignore, 1.3, 1.4 mpfr.spec, 1.8, 1.9 sources, 1.3, 1.4 mpfr-2.3.0-upstream.patch, 1.1, NONE Message-ID: <200807241057.m6OAvTv1008947@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/mpfr/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8882 Modified Files: .cvsignore mpfr.spec sources Removed Files: mpfr-2.3.0-upstream.patch Log Message: - update to 2.3.1 (#455167) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mpfr/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Sep 2007 09:15:48 -0000 1.3 +++ .cvsignore 24 Jul 2008 10:56:46 -0000 1.4 @@ -1 +1 @@ -mpfr-2.3.0.tar.bz2 +mpfr-2.3.1.tar.bz2 Index: mpfr.spec =================================================================== RCS file: /cvs/pkgs/rpms/mpfr/F-9/mpfr.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mpfr.spec 20 Feb 2008 06:39:14 -0000 1.8 +++ mpfr.spec 24 Jul 2008 10:56:46 -0000 1.9 @@ -1,10 +1,9 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr -Version: 2.3.0 -Release: 3%{?dist} +Version: 2.3.1 +Release: 1%{?dist} URL: http://www.mpfr.org/ Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.bz2 -Patch0: mpfr-2.3.0-upstream.patch License: LGPLv2+ and GPLv2+ and GFDL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,7 +36,6 @@ %prep %setup -q -%patch0 -p1 -b .up %build @@ -85,6 +83,9 @@ %{_infodir}/mpfr.info* %changelog +* Mon Jul 24 2008 Ivana Varekova - 2.3.1-1 +- update to 2.3.1 (#455167) + * Wed Feb 20 2008 Fedora Release Engineering - 2.3.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mpfr/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Sep 2007 09:15:48 -0000 1.3 +++ sources 24 Jul 2008 10:56:46 -0000 1.4 @@ -1 +1 @@ -cf7c743e4be122e63eb6f372fc58b657 mpfr-2.3.0.tar.bz2 +8352b619e04dcc73411a38b39dd855f6 mpfr-2.3.1.tar.bz2 --- mpfr-2.3.0-upstream.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 11:00:16 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 24 Jul 2008 11:00:16 GMT Subject: rpms/openoffice.org/devel workspace.cmcfixes46.patch, NONE, 1.1 .cvsignore, 1.178, 1.179 openoffice.org.spec, 1.1591, 1.1592 sources, 1.305, 1.306 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch, 1.2, NONE openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch, 1.1, NONE openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch, 1.2, NONE openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch, 1.1, NONE openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch, 1.2, NONE workspace.native172.patch, 1.1, NONE Message-ID: <200807241100.m6OB0Gi8009160@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9096 Modified Files: .cvsignore openoffice.org.spec sources Added Files: workspace.cmcfixes46.patch Removed Files: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch workspace.native172.patch Log Message: next version workspace.cmcfixes46.patch: --- NEW FILE workspace.cmcfixes46.patch --- Index: unx/source/gdi/salgdi3.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v retrieving revision 1.154 diff -u -r1.154 salgdi3.cxx --- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx 11 Apr 2008 09:55:12 -0000 1.154 +++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx 3 Jun 2008 15:52:06 -0000 @@ -944,7 +950,7 @@ Display* pDisplay = GetXDisplay(); cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay, - hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, 1, 1); + hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16); /* * It might be ideal to cache surface and cairo context between calls and Index: inc/tools/resmgr.hxx =================================================================== RCS file: /cvs/util/tools/inc/tools/resmgr.hxx,v retrieving revision 1.5 diff -u -r1.5 resmgr.hxx --- openoffice.org.orig/tools/inc/tools/resmgr.hxx 11 Apr 2008 13:28:38 -0000 1.5 +++ openoffice.org/tools/inc/tools/resmgr.hxx 3 Jun 2008 15:26:03 -0000 @@ -38,7 +38,7 @@ #include #define CREATEVERSIONRESMGR_NAME( Name ) #Name -#define CREATEVERSIONRESMGR( Name ) ResMgr::CreateResMgr( #Name ) +#define CREATEVERSIONRESMGR( Name ) ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( Name ) ) #define LOCALE_MAX_FALLBACK 6 Index: source/gdi/outdev3.cxx =================================================================== RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v retrieving revision 1.240 diff -u -r1.240 outdev3.cxx --- openoffice.org.orig/vcl/source/gdi/outdev3.cxx 11 Apr 2008 08:49:58 -0000 1.240 +++ openoffice.org/vcl/source/gdi/outdev3.cxx 4 May 2008 16:43:14 -0000 @@ -2786,6 +2786,17 @@ if( rA.maStyleName != rB.maStyleName) return false; + // Symbol fonts may recode from one type to another So they are only + // safely equivalent for equal targets + if ( + (rA.mpFontData && rA.mpFontData->IsSymbolFont()) || + (rB.mpFontData && rB.mpFontData->IsSymbolFont()) + ) + { + if (rA.maTargetName != rB.maTargetName) + return false; + } + return true; } Index: source/glyphs/gcach_ftyp.cxx =================================================================== RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v retrieving revision 1.149 diff -u -r1.149 gcach_ftyp.cxx --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx 11 Apr 2008 08:57:28 -0000 1.149 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx 4 May 2008 16:43:33 -0000 @@ -911,11 +914,21 @@ void FreetypeServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const { static_cast(rTo) = mpFontInfo->GetFontAttributes(); + rTo.mbScalableFont = true; rTo.mbDevice = true; rTo.mbKernableFont = (FT_HAS_KERNING( maFaceFT ) != 0) || mpFontInfo->HasExtraKerning(); rTo.mnOrientation = GetFontSelData().mnOrientation; + //Always consider [star]symbol as symbol fonts + if ( + (rTo.GetFamilyName().EqualsAscii("OpenSymbol")) || + (rTo.GetFamilyName().EqualsAscii("StarSymbol")) + ) + { + rTo.mbSymbolFlag = true; + } + if( maSizeFT ) pFTActivateSize( maSizeFT ); diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx 2008-05-26 15:17:03.000000000 +0100 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx 2008-06-03 13:01:17.000000000 +0100 @@ -2172,7 +2242,7 @@ int nGlyphFlags; SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags ); - FT_Int nLoadFlags = FT_LOAD_DEFAULT; + FT_Int nLoadFlags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_TRANSFORM; #ifdef FT_LOAD_TARGET_LIGHT // enable "light hinting" if available Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- .cvsignore 21 Jul 2008 13:10:14 -0000 1.178 +++ .cvsignore 24 Jul 2008 10:59:31 -0000 1.179 @@ -6,4 +6,3 @@ redhat-langpacks.tar.gz evolocal.odb bengali.sdf -DEV300_m26.tar.bz2 Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1591 retrieving revision 1.1592 diff -u -r1.1591 -r1.1592 --- openoffice.org.spec 23 Jul 2008 22:55:52 -0000 1.1591 +++ openoffice.org.spec 24 Jul 2008 10:59:31 -0000 1.1592 @@ -1,6 +1,6 @@ %define oootag DEV300 -%define ooomilestone 26 -%define rh_rpm_release 2 +%define ooomilestone 27 +%define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -101,20 +101,15 @@ Patch29: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch Patch30: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch Patch31: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch -Patch32: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch -Patch33: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch34: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch -Patch35: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch -Patch36: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch -Patch37: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch -Patch38: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch -Patch39: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch -Patch40: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch -Patch41: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch -Patch42: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch -Patch43: workspace.native172.patch -Patch44: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch -Patch45: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch +Patch32: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch +Patch33: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch +Patch34: workspace.cmcfixes46.patch +Patch35: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch +Patch36: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch +Patch37: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch +Patch38: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +Patch39: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch +Patch40: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1260,20 +1255,15 @@ %patch29 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch %patch30 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch %patch31 -p1 -b .ooo88341.sc.verticalboxes.patch -%patch32 -p1 -b .ooo89002.vcl.symbolfonts.patch -%patch33 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch34 -p1 -b .ooo87970.vcl.samenamesubs.patch -%patch35 -p1 -b .ooo90037.vcl.cairotransforms.patch -%patch36 -p1 -b .ooo90178.tools.fixmacro.patch -%patch37 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch -%patch38 -p1 -b .ooo82545.np_sdk.x86_64.patch -%patch39 -p1 -b .ooo48400.svx.fixspelling.patch -%patch40 -p1 -b .ooo90876.connectivity.evoab2.patch -%patch41 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch -%patch42 -p1 -b .ooo86142.serbiannumbering.patch -%patch43 -p1 -b .workspace.native172.patch -%patch44 -p1 -b .ooo91977.sd.holdreference.patch -%patch45 -p1 -b .ooo92026.sd.disposed_during_disposing.patch +%patch32 -p1 -b .gccXXXXX.solenv.javaregistration.patch +%patch33 -p1 -b .ooo87970.vcl.samenamesubs.patch +%patch34 -p1 -b .workspace.cmcfixes46.patch +%patch35 -p1 -b .ooo48400.svx.fixspelling.patch +%patch36 -p1 -b .ooo90876.connectivity.evoab2.patch +%patch37 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch +%patch38 -p1 -b .ooo86142.serbiannumbering.patch +%patch39 -p1 -b .ooo91977.sd.holdreference.patch +%patch40 -p1 -b .ooo92026.sd.disposed_during_disposing.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2820,7 +2810,6 @@ %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs -%{_datadir}/mimelnk/application/*database* %files base %defattr(-,root,root,-) @@ -2828,6 +2817,7 @@ %dir %{oooinstdir}/program %{oooinstdir}/program/sbase %{_datadir}/applications/openoffice.org-*-base.desktop +%{_datadir}/mimelnk/application/openoffice.org-*database* %{_bindir}/oobase %post base @@ -2842,6 +2832,7 @@ %dir %{brinstdir}/program %{brinstdir}/program/sbase %{_datadir}/applications/broffice.org-base.desktop +%{_datadir}/mimelnk/application/broffice.org-*database* %post -n broffice.org-base update-desktop-database -q %{_datadir}/applications @@ -3048,7 +3039,6 @@ %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs -%{_datadir}/mimelnk/application/*spreadsheet* #vba %{basisinstdir}/program/libvbaobj%{SOPOST}.uno.so @@ -3060,6 +3050,7 @@ %{oooinstdir}/program/scalc.bin %{_datadir}/applications/openoffice.org-*-calc.desktop %{_datadir}/mimelnk/application/openoffice.org-ms-excel* +%{_datadir}/mimelnk/application/openoffice.org-*spreadsheet* %{_bindir}/oocalc %post calc @@ -3076,6 +3067,7 @@ %{brinstdir}/program/scalc.bin %{_datadir}/applications/broffice.org-calc.desktop %{_datadir}/mimelnk/application/broffice.org-ms-excel* +%{_datadir}/mimelnk/application/broffice.org-*spreadsheet* %post -n broffice.org-calc update-desktop-database -q %{_datadir}/applications @@ -3118,7 +3110,6 @@ %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs -%{_datadir}/mimelnk/application/*drawing* %files draw %defattr(-,root,root,-) @@ -3127,6 +3118,7 @@ %{oooinstdir}/program/sdraw %{oooinstdir}/program/sdraw.bin %{_datadir}/applications/openoffice.org-*-draw.desktop +%{_datadir}/mimelnk/application/openoffice.org-*drawing* %{_bindir}/oodraw %post draw @@ -3142,6 +3134,7 @@ %{brinstdir}/program/sdraw %{brinstdir}/program/sdraw.bin %{_datadir}/applications/broffice.org-draw.desktop +%{_datadir}/mimelnk/application/broffice.org-*drawing* %post -n broffice.org-draw update-desktop-database -q %{_datadir}/applications @@ -3227,9 +3220,6 @@ %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs -%{_datadir}/mimelnk/application/*master* -%{_datadir}/mimelnk/application/*text* -%{_datadir}/mimelnk/application/*web* %files writer %defattr(-,root,root,-) @@ -3240,6 +3230,9 @@ %{_datadir}/applications/openoffice.org-*-writer.desktop %{_datadir}/mimelnk/application/openoffice.org-ms-word* %{_datadir}/mimelnk/application/openoffice.org-openxmlformats-officedocument-wordprocessingml* +%{_datadir}/mimelnk/application/openoffice.org-*master* +%{_datadir}/mimelnk/application/openoffice.org-*text* +%{_datadir}/mimelnk/application/openoffice.org-*web* %{_bindir}/oowriter %post writer @@ -3255,6 +3248,9 @@ %{_datadir}/applications/broffice.org-writer.desktop %{_datadir}/mimelnk/application/broffice.org-ms-word* %{_datadir}/mimelnk/application/broffice.org-openxmlformats-officedocument-wordprocessingml* +%{_datadir}/mimelnk/application/broffice.org-*master* +%{_datadir}/mimelnk/application/broffice.org-*text* +%{_datadir}/mimelnk/application/broffice.org-*web* %post -n broffice.org-writer update-desktop-database -q %{_datadir}/applications @@ -3304,7 +3300,6 @@ %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs -%{_datadir}/mimelnk/application/*presentation* %files impress %defattr(-,root,root,-) @@ -3314,6 +3309,7 @@ %{oooinstdir}/program/simpress.bin %{_datadir}/applications/openoffice.org-*-impress.desktop %{_datadir}/mimelnk/application/openoffice.org-ms-powerpoint* +%{_datadir}/mimelnk/application/openoffice.org-*presentation* %{_bindir}/ooimpress %post impress @@ -3330,6 +3326,7 @@ %{brinstdir}/program/simpress.bin %{_datadir}/applications/broffice.org-impress.desktop %{_datadir}/mimelnk/application/broffice.org-ms-powerpoint* +%{_datadir}/mimelnk/application/broffice.org-*presentation* %post -n broffice.org-impress update-desktop-database -q %{_datadir}/applications @@ -3381,7 +3378,6 @@ %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs -%{_datadir}/mimelnk/application/*formula* %files math %defattr(-,root,root,-) @@ -3389,6 +3385,7 @@ %dir %{oooinstdir}/program %{oooinstdir}/program/smath %{_datadir}/applications/openoffice.org-*-math.desktop +%{_datadir}/mimelnk/application/openoffice.org-*formula* %{_bindir}/oomath %post math @@ -3403,6 +3400,7 @@ %dir %{brinstdir}/program %{brinstdir}/program/smath %{_datadir}/applications/broffice.org-math.desktop +%{_datadir}/mimelnk/application/broffice.org-*formula* %post -n broffice.org-math update-desktop-database -q %{_datadir}/applications @@ -3574,10 +3572,15 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Thu Jul 24 2008 Caolan McNamara - 1:3.0.0-0.27-1 +- next version +- drop integrated workspace.native172.patch +- drop integrated openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch + * Wed Jul 23 2008 Caolan McNamara - 1:3.0.0-0.26-2 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch - Resolves: rhbz#451708 ensure root certs are available for document signing -- Resolves: rhbz#456459 3-layer OOo hits the sdk/odk +- Resolves: rhbz#456459 3-layer OOo hits the sdk/odk again * Tue Jul 22 2008 Caolan McNamara - 1:3.0.0-0.26-1 - next version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- sources 21 Jul 2008 15:34:03 -0000 1.305 +++ sources 24 Jul 2008 10:59:31 -0000 1.306 @@ -6,4 +6,3 @@ 261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -7b1df547e4cf6876ef3d867ee445ac80 DEV300_m26.tar.bz2 --- openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch DELETED --- --- openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch DELETED --- --- openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch DELETED --- --- openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch DELETED --- --- openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch DELETED --- --- workspace.native172.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 11:09:33 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 24 Jul 2008 11:09:33 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch,1.217,1.218 Message-ID: <200807241109.m6OB9X8P016399@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16351 Modified Files: policy-20070703.patch Log Message: * Wed Jul 2 2008 Dan Walsh 3.0.8-111 - Handle updated NetworkManager policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- policy-20070703.patch 24 Jul 2008 10:47:06 -0000 1.217 +++ policy-20070703.patch 24 Jul 2008 11:08:40 -0000 1.218 @@ -10118,7 +10118,7 @@ /var/run/dnsmasq\.pid -- gen_context(system_u:object_r:dnsmasq_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.0.8/policy/modules/services/dnsmasq.te --- nsaserefpolicy/policy/modules/services/dnsmasq.te 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/dnsmasq.te 2008-06-12 23:37:58.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/services/dnsmasq.te 2008-07-24 06:52:17.000000000 -0400 @@ -16,6 +16,9 @@ type dnsmasq_var_run_t; files_pid_file(dnsmasq_var_run_t) @@ -10138,6 +10138,15 @@ files_var_lib_filetrans(dnsmasq_t,dnsmasq_lease_t,file) manage_files_pattern(dnsmasq_t,dnsmasq_var_run_t,dnsmasq_var_run_t) +@@ -55,7 +58,7 @@ + corenet_tcp_bind_all_nodes(dnsmasq_t) + corenet_udp_bind_all_nodes(dnsmasq_t) + corenet_tcp_bind_dns_port(dnsmasq_t) +-corenet_udp_bind_dns_port(dnsmasq_t) ++corenet_udp_bind_all_ports(dnsmasq_t) + corenet_udp_bind_dhcpd_port(dnsmasq_t) + corenet_sendrecv_dns_server_packets(dnsmasq_t) + corenet_sendrecv_dhcpd_server_packets(dnsmasq_t) @@ -94,3 +97,7 @@ optional_policy(` udev_read_db(dnsmasq_t) @@ -18766,7 +18775,7 @@ +/var/cache/coolkey(/.*)? gen_context(system_u:object_r:auth_cache_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if 2008-06-22 06:46:13.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if 2008-07-24 06:57:00.000000000 -0400 @@ -26,7 +26,8 @@ type $1_chkpwd_t, can_read_shadow_passwords; application_domain($1_chkpwd_t,chkpwd_exec_t) @@ -19225,7 +19234,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2008-06-12 23:37:57.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te 2008-06-22 06:47:13.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te 2008-07-24 06:57:59.000000000 -0400 @@ -1,4 +1,4 @@ - + @@ -19267,7 +19276,7 @@ ######################################## # # PAM local policy -@@ -94,36 +108,39 @@ +@@ -94,36 +108,38 @@ allow pam_t pam_tmp_t:file manage_file_perms; files_tmp_filetrans(pam_t, pam_tmp_t, { file dir }) @@ -19300,7 +19309,6 @@ +userdom_dontaudit_write_user_home_content_files(user, pam_t) +userdom_append_unpriv_users_home_content_files(pam_t) +userdom_dontaudit_read_user_tmp_files(user, pam_t) -+userdom_dontaudit_write_user_home_content_files(unconfined, pam_t) optional_policy(` locallogin_use_fds(pam_t) @@ -19317,7 +19325,7 @@ ######################################## # # PAM console local policy -@@ -149,6 +166,8 @@ +@@ -149,6 +165,8 @@ dev_setattr_apm_bios_dev(pam_console_t) dev_getattr_dri_dev(pam_console_t) dev_setattr_dri_dev(pam_console_t) @@ -19326,7 +19334,7 @@ dev_getattr_framebuffer_dev(pam_console_t) dev_setattr_framebuffer_dev(pam_console_t) dev_getattr_generic_usb_dev(pam_console_t) -@@ -159,6 +178,8 @@ +@@ -159,6 +177,8 @@ dev_setattr_mouse_dev(pam_console_t) dev_getattr_power_mgmt_dev(pam_console_t) dev_setattr_power_mgmt_dev(pam_console_t) @@ -19335,7 +19343,7 @@ dev_getattr_scanner_dev(pam_console_t) dev_setattr_scanner_dev(pam_console_t) dev_getattr_sound_dev(pam_console_t) -@@ -168,6 +189,8 @@ +@@ -168,6 +188,8 @@ dev_getattr_xserver_misc_dev(pam_console_t) dev_setattr_xserver_misc_dev(pam_console_t) dev_read_urand(pam_console_t) @@ -19344,7 +19352,7 @@ mls_file_read_all_levels(pam_console_t) mls_file_write_all_levels(pam_console_t) -@@ -200,6 +223,7 @@ +@@ -200,6 +222,7 @@ fs_list_auto_mountpoints(pam_console_t) fs_list_noxattr_fs(pam_console_t) @@ -19352,7 +19360,7 @@ init_use_fds(pam_console_t) init_use_script_ptys(pam_console_t) -@@ -236,7 +260,7 @@ +@@ -236,7 +259,7 @@ optional_policy(` xserver_read_xdm_pid(pam_console_t) @@ -19361,7 +19369,7 @@ ') ######################################## -@@ -256,6 +280,7 @@ +@@ -256,6 +279,7 @@ userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t) userdom_dontaudit_use_unpriv_users_ptys(system_chkpwd_t) userdom_dontaudit_use_sysadm_terms(system_chkpwd_t) @@ -19369,7 +19377,7 @@ ######################################## # -@@ -302,3 +327,31 @@ +@@ -302,3 +326,31 @@ xserver_use_xdm_fds(utempter_t) xserver_rw_xdm_pipes(utempter_t) ') From fedora-extras-commits at redhat.com Thu Jul 24 11:23:46 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Thu, 24 Jul 2008 11:23:46 GMT Subject: rpms/packagekit-qt/devel packagekit-qt.spec,1.1,1.2 Message-ID: <200807241123.m6OBNk0Q017165@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/packagekit-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17131 Modified Files: packagekit-qt.spec Log Message: Fixed broken dependency Index: packagekit-qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/packagekit-qt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- packagekit-qt.spec 23 Jul 2008 10:16:32 -0000 1.1 +++ packagekit-qt.spec 24 Jul 2008 11:23:02 -0000 1.2 @@ -3,7 +3,7 @@ Name: packagekit-qt Version: 0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt interface for PackageKit License: GPLv2+ @@ -24,7 +24,6 @@ %package devel Summary: Development files for packagekit-qt Group: Development/Libraries -Requires: packagekit-qt-libs-%{version}-%{release} Requires: cmake %description devel Development files for packagekit-qt. @@ -54,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 24 2008 Steven M. Parrish 5 +- Fixed broken dependecy + * Tue Jul 22 2008 Steven M. Parrish 4 - Removed unneeded -libs package From fedora-extras-commits at redhat.com Thu Jul 24 11:40:34 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 24 Jul 2008 11:40:34 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.179, 1.180 sources, 1.306, 1.307 Message-ID: <200807241140.m6OBeY2m017928@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17898 Modified Files: .cvsignore sources Log Message: sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- .cvsignore 24 Jul 2008 10:59:31 -0000 1.179 +++ .cvsignore 24 Jul 2008 11:39:49 -0000 1.180 @@ -6,3 +6,4 @@ redhat-langpacks.tar.gz evolocal.odb bengali.sdf +DEV300_m27.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- sources 24 Jul 2008 10:59:31 -0000 1.306 +++ sources 24 Jul 2008 11:39:49 -0000 1.307 @@ -6,3 +6,4 @@ 261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb 0c0e868b34329d90a7c9a92f1704775c bengali.sdf +5962ea25065092dbbb13a56e887b3b09 DEV300_m27.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 11:58:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 11:58:02 GMT Subject: rpms/python-fedora/F-8 .cvsignore,1.14,1.15 sources,1.16,1.17 Message-ID: <200807241158.m6OBw20h019322@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19192/F-8 Modified Files: .cvsignore sources Log Message: Bah, copied the bad version to the other branches. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 24 Jul 2008 09:15:43 -0000 1.14 +++ .cvsignore 24 Jul 2008 11:57:14 -0000 1.15 @@ -1 +1 @@ -python-fedora-0.3.3.tar.gz \ No newline at end of file +python-fedora-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 24 Jul 2008 09:15:43 -0000 1.16 +++ sources 24 Jul 2008 11:57:14 -0000 1.17 @@ -1 +1 @@ -5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz \ No newline at end of file +5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 11:58:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 11:58:19 GMT Subject: rpms/python-fedora/F-9 .cvsignore,1.16,1.17 sources,1.18,1.19 Message-ID: <200807241158.m6OBwJiI019344@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19192/F-9 Modified Files: .cvsignore sources Log Message: Bah, copied the bad version to the other branches. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 24 Jul 2008 09:16:02 -0000 1.16 +++ .cvsignore 24 Jul 2008 11:57:32 -0000 1.17 @@ -1 +1 @@ -python-fedora-0.3.3.tar.gz \ No newline at end of file +python-fedora-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 24 Jul 2008 09:16:02 -0000 1.18 +++ sources 24 Jul 2008 11:57:32 -0000 1.19 @@ -1 +1 @@ -5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz \ No newline at end of file +5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 12:10:42 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 12:10:42 GMT Subject: rpms/phonon/devel phonon.spec,1.6,1.7 Message-ID: <200807241210.m6OCAgQF027343@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27259 Modified Files: phonon.spec Log Message: * Thu Jul 24 2008 Rex Dieter 4.2.0-2 - rename -backend-gstreamer -> backend-gst Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- phonon.spec 23 Jul 2008 12:26:06 -0000 1.6 +++ phonon.spec 24 Jul 2008 12:09:54 -0000 1.7 @@ -2,7 +2,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -24,15 +24,14 @@ %description %{summary}. -%package backend-gstreamer +%package backend-gst Summary: Gstreamer phonon backend Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -# not sure exactly how best to version this one -- Rex Provides: phonon-backend = %{version}-%{release} -# (temporary) upgrade path -Obsoletes: phonon < 4.2-0.4 -%description backend-gstreamer +Obsoletes: %{name}-backend-gstreamer < 4.2-2 +Provides: %{name}-backend-gstreamer = %{version}-%{release} +%description backend-gst %{summary}. %package devel @@ -45,7 +44,6 @@ %{summary}. - %prep %setup -q @@ -84,7 +82,7 @@ %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/ %dir %{_kde4_datadir}/kde4/services/phononbackends/ -%files backend-gstreamer +%files backend-gst %defattr(-,root,root,-) %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop @@ -99,6 +97,9 @@ %changelog +* Thu Jul 24 2008 Rex Dieter 4.2.0-2 +- rename -backend-gstreamer -> backend-gst + * Wed Jul 23 2008 Rex Dieter 4.2.0-1 - phonon-4.2.0 From fedora-extras-commits at redhat.com Thu Jul 24 12:21:06 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 12:21:06 GMT Subject: rpms/phonon/F-9 phonon.spec,1.2,1.3 Message-ID: <200807241221.m6OCL6at027837@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/phonon/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27804 Modified Files: phonon.spec Log Message: * Thu Jul 24 2008 Rex Dieter 4.2.0-2 - rename -backend-gstreamer -> backend-gst Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-9/phonon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- phonon.spec 23 Jul 2008 13:13:31 -0000 1.2 +++ phonon.spec 24 Jul 2008 12:20:23 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -24,15 +24,14 @@ %description %{summary}. -%package backend-gstreamer +%package backend-gst Summary: Gstreamer phonon backend Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -# not sure exactly how best to version this one -- Rex Provides: phonon-backend = %{version}-%{release} -# (temporary) upgrade path -Obsoletes: phonon < 4.2-0.4 -%description backend-gstreamer +Obsoletes: %{name}-backend-gstreamer < 4.2-2 +Provides: %{name}-backend-gstreamer = %{version}-%{release} +%description backend-gst %{summary}. %package devel @@ -45,7 +44,6 @@ %{summary}. - %prep %setup -q @@ -84,7 +82,7 @@ %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/ %dir %{_kde4_datadir}/kde4/services/phononbackends/ -%files backend-gstreamer +%files backend-gst %defattr(-,root,root,-) %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop @@ -99,6 +97,9 @@ %changelog +* Thu Jul 24 2008 Rex Dieter 4.2.0-2 +- rename -backend-gstreamer -> backend-gst + * Wed Jul 23 2008 Rex Dieter 4.2.0-1 - phonon-4.2.0 From fedora-extras-commits at redhat.com Thu Jul 24 12:27:48 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Thu, 24 Jul 2008 12:27:48 GMT Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.34, 1.35 sources, 1.34, 1.35 xorg-x11-drv-radeonhd-README.fedora, 1.32, 1.33 xorg-x11-drv-radeonhd.spec, 1.45, 1.46 Message-ID: <200807241227.m6OCRmin028114@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28070 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd.spec Log Message: * Thu Jul 24 2008 Hans Ulrich Niedermann - 1.2.1-3.7.20080724git - New snapshot (upstream commit 31e46386293fd0c54c99328eee3cfe7b49584f9d): - 31e46386: Connectors: Increase the number of available connectors to 6. - 8b1d3323: I2C: Fix I2C slave address probing for RV620 and later. - d65b67b0: HPD: Add support for HPD_3 found on RV620 and later hardware. - a900052b: DIG: Extend heuristic to check if golden values are available for requested coherent/incoherent mode. - d3e6c7f7: RandR: Log when a 'scaled to' mode doesn't vaildate. - 68592e30: MC/RS600: Fix MC indirect access functions. - fdf5014c: CRTC/Scaler: Log more information about the scaler. - 94d759b9: DDIA: Disable Sync DC Balancer on DDIA block of RS690. - 202f2332: I2C: Check for more error conditions in I2CStatus on RS690. - ec2fbeee: Fix typo in list of supported chips (again) - 435320de: Crtc/Scaler: Disallow interlaced for all modes involving scaler. - c0e0dc7d: ID: Adding M82 chipset name and some more verbose logging info. - 8133d1a4: MC: Enable MC control for RS600, fixed segfault. - f362e5ab: R5xx DRI: increase CP timeout. - 1761d6c5: R5xx Accel: split r5xx2DInfo into XAA and EXA specific structs. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 19 Jul 2008 11:52:02 -0000 1.34 +++ .cvsignore 24 Jul 2008 12:27:03 -0000 1.35 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.1-20080719git.tar.bz2 +xf86-video-radeonhd-1.2.1-20080724git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 19 Jul 2008 11:52:02 -0000 1.34 +++ sources 24 Jul 2008 12:27:03 -0000 1.35 @@ -1 +1 @@ -3b5a0419b34f30142127123bd795732e xf86-video-radeonhd-1.2.1-20080719git.tar.bz2 +47660263832de3cb0e8227b8ff36be69 xf86-video-radeonhd-1.2.1-20080724git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- xorg-x11-drv-radeonhd-README.fedora 19 Jul 2008 11:52:02 -0000 1.32 +++ xorg-x11-drv-radeonhd-README.fedora 24 Jul 2008 12:27:03 -0000 1.33 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: 603a35a670c71d32c4f393e21ed09f87449ebbf6 +Latest upstream commit: 31e46386293fd0c54c99328eee3cfe7b49584f9d Contents Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xorg-x11-drv-radeonhd.spec 19 Jul 2008 12:41:23 -0000 1.45 +++ xorg-x11-drv-radeonhd.spec 24 Jul 2008 12:27:03 -0000 1.46 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20080719 -%define git_commit 603a35a670c71d32c4f393e21ed09f87449ebbf6 +%define date 20080724 +%define git_commit 31e46386293fd0c54c99328eee3cfe7b49584f9d %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.1 -Release: 3.6%{?alphatag}%{?dist} +Release: 3.7%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -164,6 +164,24 @@ %endif %changelog +* Thu Jul 24 2008 Hans Ulrich Niedermann - 1.2.1-3.7.20080724git +- New snapshot (upstream commit 31e46386293fd0c54c99328eee3cfe7b49584f9d): + - 31e46386: Connectors: Increase the number of available connectors to 6. + - 8b1d3323: I2C: Fix I2C slave address probing for RV620 and later. + - d65b67b0: HPD: Add support for HPD_3 found on RV620 and later hardware. + - a900052b: DIG: Extend heuristic to check if golden values are available for requested coherent/incoherent mode. + - d3e6c7f7: RandR: Log when a 'scaled to' mode doesn't vaildate. + - 68592e30: MC/RS600: Fix MC indirect access functions. + - fdf5014c: CRTC/Scaler: Log more information about the scaler. + - 94d759b9: DDIA: Disable Sync DC Balancer on DDIA block of RS690. + - 202f2332: I2C: Check for more error conditions in I2CStatus on RS690. + - ec2fbeee: Fix typo in list of supported chips (again) + - 435320de: Crtc/Scaler: Disallow interlaced for all modes involving scaler. + - c0e0dc7d: ID: Adding M82 chipset name and some more verbose logging info. + - 8133d1a4: MC: Enable MC control for RS600, fixed segfault. + - f362e5ab: R5xx DRI: increase CP timeout. + - 1761d6c5: R5xx Accel: split r5xx2DInfo into XAA and EXA specific structs. + * Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.6.20080719git - Compile DRI support. From fedora-extras-commits at redhat.com Thu Jul 24 12:32:00 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 24 Jul 2008 12:32:00 GMT Subject: rpms/python-slip/devel .cvsignore, 1.5, 1.6 python-slip.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807241232.m6OCW0eu028364@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/python-slip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28313 Modified Files: .cvsignore python-slip.spec sources Log Message: version 0.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jul 2008 14:17:49 -0000 1.5 +++ .cvsignore 24 Jul 2008 12:31:16 -0000 1.6 @@ -1 +1 @@ -python-slip-0.1.6.tar.bz2 +python-slip-0.1.7.tar.bz2 Index: python-slip.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-slip.spec 23 Jul 2008 14:17:49 -0000 1.4 +++ python-slip.spec 24 Jul 2008 12:31:16 -0000 1.5 @@ -3,7 +3,7 @@ %{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")} Name: python-slip -Version: 0.1.6 +Version: 0.1.7 Release: 1%{?dist} Summary: Miscellaneous convenience, extension and workaround code for Python @@ -84,6 +84,9 @@ %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info %changelog +* Thu Jul 24 2008 Nils Philippsen - 0.1.7 +- fix import error (#456511) + * Wed Jul 23 2008 Nils Philippsen - 0.1.6 - move proxy.polkit_enable to polkit.enable_proxy - rename polkit.NotAuthorized to NotAuthorizedException, polkit.auth_required Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jul 2008 14:17:49 -0000 1.5 +++ sources 24 Jul 2008 12:31:16 -0000 1.6 @@ -1 +1 @@ -b07267138e819d57e9fa48f08ce0c689 python-slip-0.1.6.tar.bz2 +7359c730e1a13fe3853462e1ad275dea python-slip-0.1.7.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 12:35:15 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Thu, 24 Jul 2008 12:35:15 GMT Subject: rpms/beagle/devel beagle-0.3.8-epiphany.patch, NONE, 1.1 beagle-thunderbird-update.sh, NONE, 1.1 beagle.spec, 1.143, 1.144 Message-ID: <200807241235.m6OCZFNE028537@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28479 Modified Files: beagle.spec Added Files: beagle-0.3.8-epiphany.patch beagle-thunderbird-update.sh Log Message: fix epiphany and thunderbird extension beagle-0.3.8-epiphany.patch: --- NEW FILE beagle-0.3.8-epiphany.patch --- diff -upNr beagle-0.3.8.orign/configure.in beagle-0.3.8/configure.in --- beagle-0.3.8.orign/configure.in 2008-06-12 18:06:25.000000000 +0200 +++ beagle-0.3.8/configure.in 2008-07-24 14:17:24.000000000 +0200 @@ -402,7 +402,7 @@ if test "x$enable_epiphany_extension" != dnl If you want to add anything but a . version here, you dnl need to see the handling of the epiphany_version variable in the dnl epiphany extension code - VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" + VALID_EPIPHANY_VERSIONS="2.23 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6" for v in $VALID_EPIPHANY_VERSIONS; do AC_MSG_CHECKING([for Epiphany $v]) --- NEW FILE beagle-thunderbird-update.sh --- #!/bin/sh # # This script is used to add and remove our extension from the thunderbird # directory, and is run from 'triggers' when thunderbird is installed or # upgraded, as well as when our package is installed. It is needed because # thunderbird is installed into versioned directories in /usr/lib[64]/thunderbird # Based on firefox-update.sh from mugshot if [ "$1" = "install" ] ; then for libdir in /usr/lib /usr/lib64 ; do # Add symlinks to any thunderbird directory that looks like it is part of a # currently installed package for d in $libdir/thunderbird*; do if [ "$d" = "$libdir/thunderbird*" ] ; then continue fi link=$d/extensions/\{b656ef18-fd76-45e6-95cc-8043f26361e7\} target=$libdir/beagle/thunderbird if [ -e $target -a -e $d/thunderbird-bin -a -d $d/extensions -a ! -L $link ] ; then ln -s $target $link fi done done elif [ "$1" = "remove" ] ; then for libdir in /usr/lib /usr/lib64 ; do # Remove any symlinks we've created into any thunderbird directory for d in $libdir/thunderbird*; do if [ "$d" = "$libdir/thunderbird*" ] ; then continue fi link=$d/extensions/\{b656ef18-fd76-45e6-95cc-8043f26361e7\} if [ -L $link ] ; then rm $link fi done done else echo "Usage thunderbird-update.sh [install/remove]" fi Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- beagle.spec 20 Jul 2008 13:47:00 -0000 1.143 +++ beagle.spec 24 Jul 2008 12:34:29 -0000 1.144 @@ -1,13 +1,13 @@ Name: beagle Version: 0.3.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details License: ASL 2.0 and MIT and BSD and CC-BY and LGPLv2+ and (AFL or LGPLv2+) URL: http://beagle-project.org/ Source0: http://download.gnome.org/sources/beagle/0.3/%{name}-%{version}.tar.bz2 - +Source1: beagle-thunderbird-update.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel @@ -49,6 +49,7 @@ Patch5: beagle-0.2.15.1-libdir.patch Patch6: beagle-monodoc.patch Patch7: beagle-0.3.8-typo-fix.patch +Patch8: beagle-0.3.8-epiphany.patch # Mono is not available on these arches ExcludeArch: s390 s390x sparc64 ppc64 @@ -65,7 +66,6 @@ %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\} # thunderbird version and ext id for beagle extension -%define thunderbird_version 2.0.0.14 %define tb_ext_id \{b656ef18-fd76-45e6-95cc-8043f26361e7\} %description @@ -93,7 +93,6 @@ Summary: Beagle backend for Thunderbird Group: User Interface/Desktops Requires: beagle = %{version}-%{release} - Requires: thunderbird %description thunderbird @@ -139,6 +138,7 @@ %patch5 -p1 -b .libdir %patch6 -p1 -b .monodoc %patch7 -p1 -b .typo +%patch8 -p1 -b .epiphany %build autoconf @@ -163,9 +163,9 @@ -d $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} # thunderbird extension -mkdir -p $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} -unzip thunderbird-extension/beagle.xpi \ --d $RPM_BUILD_ROOT%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/beagle/thunderbird +unzip thunderbird-extension/beagle.xpi -d $RPM_BUILD_ROOT%{_libdir}/beagle/thunderbird +install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/beagle/beagle-thunderbird-update.sh desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -227,6 +227,34 @@ %{_bindir}/monodoc --make-index > /dev/null fi +############################# +# thunderbird extension hacks +# copied from mugshot to deal with versioned +# thunderbird dirs +%post thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh install + +%preun thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh remove + +%postun thunderbird +if [ "$1" != 0 ] ; then + test -x %{_datadir}/beagle/beagle-thunderbird-update.sh && %{_datadir}/beagle/beagle-thunderbird-update.sh install +fi + +%triggerin thunderbird -- thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh install + +%triggerun thunderbird -- thunderbird +%{_datadir}/beagle/beagle-thunderbird-update.sh remove + +%triggerpostun thunderbird -- thunderbird +if [ "$1" != 0 ] ; then + test -x %{_datadir}/beagle/beagle-thunderbird-update.sh && %{_datadir}/beagle/beagle-thunderbird-update.sh install +fi + +# thunderbird extension hacks + %clean rm -rf $RPM_BUILD_ROOT @@ -240,6 +268,8 @@ %{_libdir}/beagle/ %exclude %{_libdir}/beagle/Backends/Thunder* %exclude %{_libdir}/beagle/Backends/Evolution* +%exclude %{_datadir}/beagle/beagle-thunderbird-update.sh +%exclude %{_libdir}/beagle/thunderbird/ %{_datadir}/beagle %{_mandir}/*/* %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle @@ -252,8 +282,9 @@ %files thunderbird %defattr(-, root, root,-) +%{_datadir}/beagle/beagle-thunderbird-update.sh %{_libdir}/beagle/Backends/ThunderbirdBackends.dll* -%{_libdir}/thunderbird-%{thunderbird_version}/extensions/%{tb_ext_id}/ +%{_libdir}/beagle/thunderbird/ %files epiphany %defattr(-, root, root,-) @@ -282,6 +313,10 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Thu Jul 24 2008 Adel Gadllah - 0.3.8-4 +- Fix build against new epiphany +- Remove versioned thunderbird requires + * Sun Jul 20 2008 Adel Gadllah - 0.3.8-3 - Check if the user exists before creating RH #441175 From fedora-extras-commits at redhat.com Thu Jul 24 12:37:01 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Thu, 24 Jul 2008 12:37:01 GMT Subject: rpms/beagle/F-9 beagle.spec,1.142,1.143 Message-ID: <200807241237.m6OCb17p028684@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28622 Modified Files: beagle.spec Log Message: fix dir ownership Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- beagle.spec 23 Jul 2008 23:42:39 -0000 1.142 +++ beagle.spec 24 Jul 2008 12:36:16 -0000 1.143 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -276,8 +276,8 @@ %exclude %{_libdir}/beagle/Backends/Thunder* %exclude %{_libdir}/beagle/Backends/Evolution* %exclude %{_datadir}/beagle/beagle-thunderbird-update.sh -%exclude %{_datadir}/beagle %exclude %{_libdir}/beagle/thunderbird/ +%{_datadir}/beagle %{_mandir}/*/* %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes @@ -320,6 +320,9 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Thu Jul 24 2008 Adel Gadllah - 0.3.8-3 +- Fix dir ownership + * Thu Jul 24 2008 Adel Gadllah - 0.3.8-2 - Remove versioned thunderbird deps by using the same hack as mugshot From fedora-extras-commits at redhat.com Thu Jul 24 12:41:59 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 24 Jul 2008 12:41:59 GMT Subject: rpms/dayplanner/F-9 dayplanner.spec,1.2,1.3 Message-ID: <200807241241.m6OCfxpX028971@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/dayplanner/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28915/F-9 Modified Files: dayplanner.spec Log Message: * Sat Jul 19 2008 Christoph Wickert - 0.9.1-2 - Filter out unwanted Requires on perl(DP::CoreModules) Index: dayplanner.spec =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/F-9/dayplanner.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dayplanner.spec 19 Jul 2008 01:26:53 -0000 1.2 +++ dayplanner.spec 24 Jul 2008 12:41:10 -0000 1.3 @@ -43,6 +43,17 @@ %prep %setup -q +# filter out unwanted requires for perl(DP::CoreModules) +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ +sed -e '/perl(DP::CoreModules)/d' +EOF + +%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +chmod +x %{__perl_requires} + + # Desktop file cat > %{name}.desktop << EOF [Desktop Entry] @@ -122,6 +133,9 @@ %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Sat Jul 19 2008 Christoph Wickert - 0.9.1-2 +- Filter out unwanted Requires on perl(DP::CoreModules) + * Sat Jul 19 2008 Christoph Wickert - 0.9.1-1 - Update to 0.9.1 to fix #446883 - Require perl(Locale::gettext) From fedora-extras-commits at redhat.com Thu Jul 24 12:42:16 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 24 Jul 2008 12:42:16 GMT Subject: rpms/dayplanner/devel dayplanner.spec,1.3,1.4 Message-ID: <200807241242.m6OCgGVr029010@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/dayplanner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28915/devel Modified Files: dayplanner.spec Log Message: * Sat Jul 19 2008 Christoph Wickert - 0.9.1-2 - Filter out unwanted Requires on perl(DP::CoreModules) Index: dayplanner.spec =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/devel/dayplanner.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dayplanner.spec 19 Jul 2008 01:07:19 -0000 1.3 +++ dayplanner.spec 24 Jul 2008 12:41:30 -0000 1.4 @@ -43,6 +43,17 @@ %prep %setup -q +# filter out unwanted requires for perl(DP::CoreModules) +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ +sed -e '/perl(DP::CoreModules)/d' +EOF + +%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +chmod +x %{__perl_requires} + + # Desktop file cat > %{name}.desktop << EOF [Desktop Entry] @@ -122,6 +133,9 @@ %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Sat Jul 19 2008 Christoph Wickert - 0.9.1-2 +- Filter out unwanted Requires on perl(DP::CoreModules) + * Sat Jul 19 2008 Christoph Wickert - 0.9.1-1 - Update to 0.9.1 to fix #446883 - Require perl(Locale::gettext) From fedora-extras-commits at redhat.com Thu Jul 24 12:44:17 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Thu, 24 Jul 2008 12:44:17 GMT Subject: rpms/hulahop/OLPC-3 .cvsignore, 1.2, 1.3 hulahop.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807241244.m6OCiHeX029174@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/hulahop/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29103 Modified Files: .cvsignore hulahop.spec sources Log Message: * Thu Jul 24 2008 Marco Pesenti Gritti - 0.4.2-1 - Update to 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jun 2008 21:38:25 -0000 1.2 +++ .cvsignore 24 Jul 2008 12:43:26 -0000 1.3 @@ -1 +1,2 @@ hulahop-0.4.1.tar.bz2 +hulahop-0.4.2.tar.bz2 Index: hulahop.spec =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hulahop.spec 23 Jun 2008 20:20:18 -0000 1.5 +++ hulahop.spec 24 Jul 2008 12:43:26 -0000 1.6 @@ -1,8 +1,8 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: hulahop -Version: 0.4.1 -Release: 3%{?dist} +Version: 0.4.2 +Release: 1%{?dist} Summary: A pygtk widget for embedding mozilla Group: System Environment/Libraries @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 24 2008 Marco Pesenti Gritti - 0.4.2-1 +- Update to 0.4.2 + * Mon Jun 23 2008 Dennis Gilmore - 0.4.1-3 - change Requires from python-xulrunner to xulrunner-pyxpcom Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Jun 2008 21:38:25 -0000 1.3 +++ sources 24 Jul 2008 12:43:26 -0000 1.4 @@ -1 +1,2 @@ 92d441c645dde20c98635dff496b8b29 hulahop-0.4.1.tar.bz2 +eb0579cd66f556a75a63374b2e54d673 hulahop-0.4.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 12:46:52 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 24 Jul 2008 12:46:52 GMT Subject: rpms/dayplanner/F-9 dayplanner.spec,1.3,1.4 Message-ID: <200807241246.m6OCkq89029399@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/dayplanner/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29302/F-9 Modified Files: dayplanner.spec Log Message: fix release Index: dayplanner.spec =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/F-9/dayplanner.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dayplanner.spec 24 Jul 2008 12:41:10 -0000 1.3 +++ dayplanner.spec 24 Jul 2008 12:46:05 -0000 1.4 @@ -3,7 +3,7 @@ Name: dayplanner Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An easy and clean Day Planner Summary(pl): Prosty i elegancki organizer Summary(de): Ein einfacher und klarer Tagesplaner From fedora-extras-commits at redhat.com Thu Jul 24 12:47:06 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 24 Jul 2008 12:47:06 GMT Subject: rpms/dayplanner/devel dayplanner.spec,1.4,1.5 Message-ID: <200807241247.m6OCl6ZX029413@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/dayplanner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29302/devel Modified Files: dayplanner.spec Log Message: fix release Index: dayplanner.spec =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/devel/dayplanner.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dayplanner.spec 24 Jul 2008 12:41:30 -0000 1.4 +++ dayplanner.spec 24 Jul 2008 12:46:22 -0000 1.5 @@ -3,7 +3,7 @@ Name: dayplanner Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An easy and clean Day Planner Summary(pl): Prosty i elegancki organizer Summary(de): Ein einfacher und klarer Tagesplaner From fedora-extras-commits at redhat.com Thu Jul 24 12:50:11 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Thu, 24 Jul 2008 12:50:11 GMT Subject: rpms/hulahop/OLPC-3 hulahop.spec,1.6,1.7 Message-ID: <200807241250.m6OCoBJ6029703@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/hulahop/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29580 Modified Files: hulahop.spec Log Message: * Thu Jul 24 2008 Marco Pesenti Gritti - 0.4.2-1 - Update to 0.4.2 - Change back to python-xulrunner Index: hulahop.spec =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hulahop.spec 24 Jul 2008 12:43:26 -0000 1.6 +++ hulahop.spec 24 Jul 2008 12:49:20 -0000 1.7 @@ -20,7 +20,7 @@ Requires: pygobject2 Requires: pygtk2 -Requires: xulrunner-pyxpcom +Requires: python-xulrunner %description The hulalop library contains a widget for embedding mozilla. @@ -52,6 +52,7 @@ %changelog * Thu Jul 24 2008 Marco Pesenti Gritti - 0.4.2-1 - Update to 0.4.2 +- Change back to python-xulrunner * Mon Jun 23 2008 Dennis Gilmore - 0.4.1-3 - change Requires from python-xulrunner to xulrunner-pyxpcom From fedora-extras-commits at redhat.com Thu Jul 24 12:50:47 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 24 Jul 2008 12:50:47 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.65, 1.66 sources, 1.78, 1.79 system-config-services.spec, 1.77, 1.78 Message-ID: <200807241250.m6OColv6029803@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29681 Modified Files: .cvsignore sources system-config-services.spec Log Message: version 0.99.20 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- .cvsignore 23 Jul 2008 14:29:19 -0000 1.65 +++ .cvsignore 24 Jul 2008 12:49:58 -0000 1.66 @@ -1 +1 @@ -system-config-services-0.99.19.tar.bz2 +system-config-services-0.99.20.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sources 23 Jul 2008 14:29:19 -0000 1.78 +++ sources 24 Jul 2008 12:49:58 -0000 1.79 @@ -1 +1 @@ -6b33385a20c75ee4e13861970898703f system-config-services-0.99.19.tar.bz2 +790551fa610e431bf0182665a52b775f system-config-services-0.99.20.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- system-config-services.spec 23 Jul 2008 14:29:19 -0000 1.77 +++ system-config-services.spec 24 Jul 2008 12:49:58 -0000 1.78 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.19 +Version: 0.99.20 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -48,7 +48,7 @@ Requires: pygtk2-libglade Requires: python >= 2.3.0 Requires: dbus-python -Requires: python-slip-dbus >= 0.1.6 +Requires: python-slip-dbus >= 0.1.7 Requires: python-slip-gtk Requires: PolicyKit-gnome Obsoletes: serviceconf <= 0.8.1 @@ -111,6 +111,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Thu Jul 24 2008 Nils Philippsen - 0.99.20-1 +- use new slip.dbus API as of python-slip-0.1.7 + * Wed Jul 23 2008 Nils Philippsen - 0.99.19-1 - use new slip.dbus API as of python-slip-0.1.6 From fedora-extras-commits at redhat.com Thu Jul 24 12:54:11 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Thu, 24 Jul 2008 12:54:11 GMT Subject: rpms/speex/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 speex.spec, 1.27, 1.28 speex-1.0.4-pkgconfig.patch, 1.1, NONE speex-1.2-CVE-2008-1686.diff, 1.1, NONE speex-1.2beta1-test-progs.patch, 1.1, NONE speex-underquoted.patch, 1.1, NONE Message-ID: <200807241254.m6OCsBBl030087@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/speex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29924 Modified Files: .cvsignore sources speex.spec Removed Files: speex-1.0.4-pkgconfig.patch speex-1.2-CVE-2008-1686.diff speex-1.2beta1-test-progs.patch speex-underquoted.patch Log Message: - update to 1.2rc1 - move manual.pdf to -devel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/speex/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Dec 2007 14:52:23 -0000 1.7 +++ .cvsignore 24 Jul 2008 12:53:14 -0000 1.8 @@ -1 +1 @@ -speex-1.2beta3.tar.gz +speex-1.2rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/speex/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Dec 2007 14:52:23 -0000 1.7 +++ sources 24 Jul 2008 12:53:14 -0000 1.8 @@ -1 +1 @@ -bcada04dc663a725ee7fcfa6301520a3 speex-1.2beta3.tar.gz +c4438b22c08e5811ff10e2b06ee9b9ae speex-1.2rc1.tar.gz Index: speex.spec =================================================================== RCS file: /cvs/pkgs/rpms/speex/devel/speex.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- speex.spec 13 May 2008 13:58:57 -0000 1.27 +++ speex.spec 24 Jul 2008 12:53:14 -0000 1.28 @@ -1,19 +1,15 @@ Summary: A voice compression format (codec) Name: speex Version: 1.2 -Release: 0.9.beta3 +%define rc_ver rc1 +Release: 0.10.%{rc_ver}%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.speex.org/ -Source0: http://downloads.us.xiph.org/releases/speex/%{name}-1.2beta3.tar.gz +Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libogg-devel -# don't build unneded test programs, since they seem to cause -# build failures -Patch0: speex-1.2beta1-test-progs.patch -Patch1: speex-1.2-CVE-2008-1686.diff - %description Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in @@ -41,10 +37,7 @@ speech. This package contains tools files and user's manual for %{name}. %prep -%setup -q -n speex-1.2beta3 -%patch0 -p1 -b .test-progs -%patch1 -p1 -b .CVE-2008-1686 -chmod a-x README +%setup -q -n %{name}-%{version}%{rc_ver} %build %configure --disable-static @@ -71,6 +64,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/manual.pdf %{_includedir}/speex %{_datadir}/aclocal/speex.m4 %{_libdir}/pkgconfig/speex*.pc @@ -79,13 +73,16 @@ %files tools %defattr(-,root,root,-) -%doc doc/manual.pdf %{_bindir}/speexenc %{_bindir}/speexdec %{_mandir}/man1/speexenc.1* %{_mandir}/man1/speexdec.1* %changelog +* Thu Jul 24 2008 Miroslav Lichvar - 1.2-0.10.rc1 +- update to 1.2rc1 +- move manual.pdf to -devel + * Tue May 13 2008 Marcela Maslanova - 1.2-0.9.beta3 - polishing review (many thanks to Matthias Saou) --- speex-1.0.4-pkgconfig.patch DELETED --- --- speex-1.2-CVE-2008-1686.diff DELETED --- --- speex-1.2beta1-test-progs.patch DELETED --- --- speex-underquoted.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 12:57:37 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Thu, 24 Jul 2008 12:57:37 GMT Subject: rpms/hulahop/OLPC-3 hulahop.spec,1.7,1.8 Message-ID: <200807241257.m6OCvbQF030318@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/hulahop/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30279 Modified Files: hulahop.spec Log Message: Revert requires change Index: hulahop.spec =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hulahop.spec 24 Jul 2008 12:49:20 -0000 1.7 +++ hulahop.spec 24 Jul 2008 12:56:50 -0000 1.8 @@ -20,7 +20,7 @@ Requires: pygobject2 Requires: pygtk2 -Requires: python-xulrunner +Requires: xulrunner-pyxpcom-devel %description The hulalop library contains a widget for embedding mozilla. @@ -52,7 +52,6 @@ %changelog * Thu Jul 24 2008 Marco Pesenti Gritti - 0.4.2-1 - Update to 0.4.2 -- Change back to python-xulrunner * Mon Jun 23 2008 Dennis Gilmore - 0.4.1-3 - change Requires from python-xulrunner to xulrunner-pyxpcom From fedora-extras-commits at redhat.com Thu Jul 24 13:01:29 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Thu, 24 Jul 2008 13:01:29 GMT Subject: rpms/hulahop/OLPC-3 hulahop.spec,1.8,1.9 Message-ID: <200807241301.m6OD1TQJ004688@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/hulahop/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30477 Modified Files: hulahop.spec Log Message: Really fix requires Index: hulahop.spec =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hulahop.spec 24 Jul 2008 12:56:50 -0000 1.8 +++ hulahop.spec 24 Jul 2008 13:00:42 -0000 1.9 @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xulrunner-devel-unstable -BuildRequires: python-xulrunner-devel +BuildRequires: xulrunner-pyxpcom-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: pygobject2-devel @@ -20,7 +20,7 @@ Requires: pygobject2 Requires: pygtk2 -Requires: xulrunner-pyxpcom-devel +Requires: xulrunner-pyxpcom %description The hulalop library contains a widget for embedding mozilla. @@ -52,6 +52,7 @@ %changelog * Thu Jul 24 2008 Marco Pesenti Gritti - 0.4.2-1 - Update to 0.4.2 +- Fix requires * Mon Jun 23 2008 Dennis Gilmore - 0.4.1-3 - change Requires from python-xulrunner to xulrunner-pyxpcom From fedora-extras-commits at redhat.com Thu Jul 24 13:16:20 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 24 Jul 2008 13:16:20 GMT Subject: rpms/kdepim/devel sources,1.58,1.59 Message-ID: <200807241316.m6ODGKve005621@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5580 Modified Files: sources Log Message: respun Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 24 Jul 2008 10:20:09 -0000 1.58 +++ sources 24 Jul 2008 13:15:35 -0000 1.59 @@ -1 +1 @@ -af600e2c096e932b3b87cc2a8270fcf0 kdepim-4.1.0.tar.bz2 +5ccd9ca2bf92c0f94ac3b0bf5a5a1344 kdepim-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 13:18:27 2008 From: fedora-extras-commits at redhat.com (Kamil Dudka (kdudka)) Date: Thu, 24 Jul 2008 13:18:27 GMT Subject: rpms/coreutils/devel coreutils-6.12-dd-fullblock.patch, NONE, 1.1 coreutils-6.12-ls-libcap.patch, NONE, 1.1 coreutils-DIR_COLORS, 1.4, 1.5 coreutils-DIR_COLORS.256color, 1.3, 1.4 coreutils-DIR_COLORS.xterm, 1.4, 1.5 coreutils.spec, 1.221, 1.222 Message-ID: <200807241318.m6ODIRZ6005680@cvs-int.fedora.redhat.com> Author: kdudka Update of /cvs/extras/rpms/coreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5641 Modified Files: coreutils-DIR_COLORS coreutils-DIR_COLORS.256color coreutils-DIR_COLORS.xterm coreutils.spec Added Files: coreutils-6.12-dd-fullblock.patch coreutils-6.12-ls-libcap.patch Log Message: dd: iflag=fullblock now read full blocks if possible (#431997, #449263) ls: --color now highlights files with capabilities (#449985) coreutils-6.12-dd-fullblock.patch: --- NEW FILE coreutils-6.12-dd-fullblock.patch --- >From 9f8be4b0b83d1e0cbf1326f8cb7e077d026d9b0b Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 23 Jul 2008 11:29:21 +0200 Subject: [PATCH] dd: iflag=fullblock now read full blocks if possible * src/dd.c (iread_fullblock): New function for reading full blocks. (scanargs): Check for new parameter iflag=fullblock. (skip): Use iread_fnc pointer instead of iread function. (dd_copy): Use iread_fnc pointer instead of iread function. * tests/dd/misc: Add test for dd - read full blocks. * doc/coretuils.texi: Mention new parameter iflag=fullblock. * NEWS: Mentioned the change. --- NEWS | 4 ++++ doc/coreutils.texi | 6 ++++++ src/dd.c | 39 +++++++++++++++++++++++++++++++++++++-- tests/dd/misc | 9 +++++++++ 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 81e3b91..b95f8dc 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -7719,6 +7719,12 @@ platforms that distinguish binary from text I/O. Use text I/O. Like @samp{binary}, this option has no effect on standard platforms. + at item fullblock + at opindex fullblock +Read full blocks from input if possible. read() may return early +if a full block is not available, so retry until data is available +or end of file is reached. This flag can be used only for the iflag option. + @end table These flags are not supported on all systems, and @samp{dd} rejects diff --git a/src/dd.c b/src/dd.c index ead9574..1b620df 100644 --- a/src/dd.c +++ b/src/dd.c @@ -225,6 +225,9 @@ static sig_atomic_t volatile interrupt_signal; /* A count of the number of pending info signals that have been received. */ static sig_atomic_t volatile info_signal_count; +/* Function used for read (to handle iflag=fullblock parameter) */ +static ssize_t (*iread_fnc) (int fd, char *buf, size_t size); + /* A longest symbol in the struct symbol_values tables below. */ #define LONGEST_SYMBOL "fdatasync" @@ -257,6 +260,7 @@ static struct symbol_value const conversions[] = }; /* Flags, for iflag="..." and oflag="...". */ +#define O_FULLBLOCK 010000000 /* Read only full blocks from input */ static struct symbol_value const flags[] = { {"append", O_APPEND}, @@ -271,6 +275,7 @@ static struct symbol_value const flags[] = {"nonblock", O_NONBLOCK}, {"sync", O_SYNC}, {"text", O_TEXT}, + {"fullblock", O_FULLBLOCK}, /* Read only full blocks from input */ {"", 0} }; @@ -762,6 +767,27 @@ iread (int fd, char *buf, size_t size) } } +/* Wrapper around iread function which reads full blocks if possible */ +static ssize_t +iread_fullblock (int fd, char *buf, size_t size) +{ + ssize_t nread = 0; + + while (0 < size) + { + ssize_t ncurr = iread(fd, buf, size); + if (ncurr < 0) + return ncurr; + if (ncurr == 0) + break; + nread += ncurr; + buf += ncurr; + size -= ncurr; + } + + return nread; +} + /* Write to FD the buffer BUF of size SIZE, processing any signals that arrive. Return the number of bytes written, setting errno if this is less than SIZE. Keep trying if there are partial @@ -1000,6 +1026,15 @@ scanargs (int argc, char *const *argv) if (input_flags & (O_DSYNC | O_SYNC)) input_flags |= O_RSYNC; + if (output_flags & O_FULLBLOCK) + { + error (0, 0, "%s: %s", _("invalid output flag"), "'fullblock'"); + usage (EXIT_FAILURE); + } + iread_fnc = (input_flags & O_FULLBLOCK)? + iread_fullblock: + iread; + if (multiple_bits_set (conversions_mask & (C_ASCII | C_EBCDIC | C_IBM))) error (EXIT_FAILURE, 0, _("cannot combine any two of {ascii,ebcdic,ibm}")); if (multiple_bits_set (conversions_mask & (C_BLOCK | C_UNBLOCK))) @@ -1197,7 +1232,7 @@ skip (int fdesc, char const *file, uintmax_t records, size_t blocksize, do { - ssize_t nread = iread (fdesc, buf, blocksize); + ssize_t nread = iread_fnc (fdesc, buf, blocksize); if (nread < 0) { if (fdesc == STDIN_FILENO) @@ -1508,7 +1543,7 @@ dd_copy (void) (conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0', input_blocksize); - nread = iread (STDIN_FILENO, ibuf, input_blocksize); + nread = iread_fnc (STDIN_FILENO, ibuf, input_blocksize); if (nread == 0) break; /* EOF. */ diff --git a/tests/dd/misc b/tests/dd/misc index d54fbfa..24e5eba 100755 --- a/tests/dd/misc +++ b/tests/dd/misc @@ -88,6 +88,15 @@ fi outbytes=`echo x | dd bs=3 ibs=10 obs=10 conv=sync 2>/dev/null | wc -c` test "$outbytes" -eq 3 || fail=1 +(echo a; sleep .1; echo b) \ + | LC_ALL=C dd bs=4 status=noxfer iflag=fullblock >out 2>err || fail=1 +echo "a +b" > out_ok +echo "1+0 records in +1+0 records out" > err_ok +compare out out_ok || fail=1 +compare err err_ok || fail=1 + test $fail -eq 0 && fail=$warn (exit $fail); exit $fail diff -ruN coreutils-6.12.old/doc/coreutils.info coreutils-6.12/doc/coreutils.info --- coreutils-6.12.old/doc/coreutils.info 2008-07-24 12:49:57.000000000 +0200 +++ coreutils-6.12/doc/coreutils.info 2008-07-24 12:52:17.000000000 +0200 @@ -6112,6 +6112,12 @@ Use text I/O. Like `binary', this option has no effect on standard platforms. + 'fullblock' + Read full blocks from input if possible. read() may return + early if a full block is not available, so retry until data + is available or end of file is reached. This flag can be used + only for the iflag option. + These flags are not supported on all systems, and `dd' rejects attempts to use them when they are not supported. When reading diff -ruN coreutils-6.12.old/man/dd.1 coreutils-6.12/man/dd.1 --- coreutils-6.12.old/man/dd.1 2008-07-24 12:51:06.000000000 +0200 +++ coreutils-6.12/man/dd.1 2008-07-24 12:59:06.000000000 +0200 @@ -111,6 +111,13 @@ .TP direct use direct I/O for data +.PP +FLAG symbols only for iflag option: +.TP +fullblock +Read full blocks from input if possible. read() may return early +if a full block is not available, so retry until data is available +or end of file is reached. .IP directory fail unless a directory dsync use synchronized I/O for data coreutils-6.12-ls-libcap.patch: --- NEW FILE coreutils-6.12-ls-libcap.patch --- >From 7634188624dc7f48c047b29fab3715dc7a468059 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 23 Jul 2008 09:52:05 +0200 Subject: [PATCH] ls: --color now highlights files with capabilities, too * configure.ac: New option: --disable-libcap. Check for libcap usability. * src/Makefile.am (dir_LDADD, ls_LDADD, ...): Append $(LIB_CAP). * src/ls.c: [HAVE_CAP] Include . (has_capability): New function for capability detection. (print_color_indicator): Colorize file with capability. * src/dircolors.c: Update color lists. * src/dircolors.hin: Mention new CAPABILITY color attribute. * tests/ls/capability: Test for ls - colorize file with capability. * tests/Makefile.am (TESTS): Add ls/capability. * NEWS: Mention the change. --- NEWS | 2 ++ configure.ac | 13 +++++++++++++ src/Makefile.am | 6 +++--- src/dircolors.c | 4 ++-- src/dircolors.hin | 1 + src/ls.c | 43 +++++++++++++++++++++++++++++++++++++++++-- tests/Makefile.am | 1 + tests/ls/capability | 43 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 106 insertions(+), 7 deletions(-) create mode 100755 tests/ls/capability diff -ruN coreutils-6.12.old/configure.ac coreutils-6.12/configure.ac --- coreutils-6.12.old/configure.ac 2008-07-24 14:16:32.000000000 +0200 +++ coreutils-6.12/configure.ac 2008-07-24 14:18:51.000000000 +0200 @@ -58,6 +58,19 @@ LIB_SELINUX="-lselinux" AC_SUBST(LIB_SELINUX)]) +dnl Check whether libcap is usable +AC_ARG_ENABLE([libcap], + AC_HELP_STRING([--disable-libcap], [disable libcap support]), + AC_MSG_WARN([libcap support disabled by user]), + [AC_CHECK_LIB([cap], [cap_get_file], + [AC_CHECK_HEADER([sys/capability.h], + [LIB_CAP="-lcap" AC_DEFINE(HAVE_CAP, 1, [libcap usability])], + [AC_MSG_WARN([header sys/capability.h was not found, support for libcap will not be built])] + )], + [AC_MSG_WARN([libcap library was not found or not usable, support for libcap will not be built])]) + ]) +AC_SUBST([LIB_CAP]) + AC_FUNC_FORK optional_bin_progs= diff -ruN coreutils-6.12.orig/src/Makefile.am coreutils-6.12/src/Makefile.am --- coreutils-6.12.orig/src/Makefile.am 2008-07-10 12:30:03.000000000 +0200 +++ coreutils-6.12/src/Makefile.am 2008-07-24 13:18:43.000000000 +0200 @@ -98,15 +98,15 @@ # for clock_gettime and fdatasync dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC) -dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) +dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP) id_LDADD = $(LDADD) $(LIB_SELINUX) -ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) +ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP) mktemp_LDADD = $(LDADD) $(LIB_GETHRXTIME) pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) shred_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC) shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME) tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) -vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) +vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP) tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) ## If necessary, add -lm to resolve use of pow in lib/strtod.c. diff --git a/src/dircolors.c b/src/dircolors.c index 56194f7..79109b9 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -63,14 +63,14 @@ static const char *const slack_codes[] = "SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK", "CHR", "CHAR", "DOOR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END", "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "STICKY", - "OTHER_WRITABLE", "OWR", "STICKY_OTHER_WRITABLE", "OWT", NULL + "OTHER_WRITABLE", "OWR", "STICKY_OTHER_WRITABLE", "OWT", "CAPABILITY", NULL }; static const char *const ls_codes[] = { "no", "no", "fi", "rs", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi", "so", "bd", "bd", "cd", "cd", "do", "ex", "lc", "lc", "rc", "rc", "ec", "ec", - "su", "su", "sg", "sg", "st", "ow", "ow", "tw", "tw", NULL + "su", "su", "sg", "sg", "st", "ow", "ow", "tw", "tw", "ca", NULL }; #define array_len(Array) (sizeof (Array) / sizeof *(Array)) verify (array_len (slack_codes) == array_len (ls_codes)); diff --git a/src/dircolors.hin b/src/dircolors.hin index 38914c8..5137cc6 100644 --- a/src/dircolors.hin +++ b/src/dircolors.hin @@ -77,6 +77,7 @@ CHR 40;33;01 # character device driver ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable diff --git a/src/ls.c b/src/ls.c index 4b69f7d..9bc66a1 100644 --- a/src/ls.c +++ b/src/ls.c @@ -38,6 +38,10 @@ #include #include +#ifdef HAVE_CAP +# include +#endif + #if HAVE_TERMIOS_H # include #endif @@ -513,14 +517,14 @@ enum indicator_no C_LEFT, C_RIGHT, C_END, C_RESET, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK, C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR, C_SETUID, C_SETGID, - C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE + C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE, C_CAP }; static const char *const indicator_name[]= { "lc", "rc", "ec", "rs", "no", "fi", "di", "ln", "pi", "so", "bd", "cd", "mi", "or", "ex", "do", "su", "sg", "st", - "ow", "tw", NULL + "ow", "tw", "ca", NULL }; struct color_ext_type @@ -553,6 +557,7 @@ static struct bin_str color_indicator[] = { LEN_STR_PAIR ("37;44") }, /* st: sticky: black on blue */ { LEN_STR_PAIR ("34;42") }, /* ow: other-writable: blue on green */ { LEN_STR_PAIR ("30;42") }, /* tw: ow w/ sticky: black on green */ + { LEN_STR_PAIR ("30;41") }, /* capability: black on red */ }; /* FIXME: comment */ @@ -3896,6 +3901,38 @@ print_type_indicator (bool stat_ok, mode_t mode, enum filetype type) DIRED_PUTCHAR (c); } +#ifdef HAVE_CAP +static bool +/* Return true if NAME has a capability (see linux/capability.h) */ +has_capability (const char *name) +{ + cap_t cap_d; + char *result; + bool has_cap; + + cap_d = cap_get_file (name); + if (cap_d == NULL) + return false; + + result = cap_to_text (cap_d, NULL); + cap_free (cap_d); + if (!result) + return false; + + /* check if human-readable capability string is empty */ + has_cap = !!*result; + + cap_free (result); + return has_cap; +} +#else +static bool +has_capability (const char *name) +{ + return false; +} +#endif + /* Returns whether any color sequence was printed. */ static bool print_color_indicator (const char *name, mode_t mode, int linkok, @@ -3923,6 +3960,8 @@ print_color_indicator (const char *name, mode_t mode, int linkok, type = C_SETUID; else if ((mode & S_ISGID) != 0) type = C_SETGID; + else if (has_capability (name)) + type = C_CAP; else if ((mode & S_IXUGO) != 0) type = C_EXEC; } diff --git a/tests/Makefile.am b/tests/Makefile.am index c2da630..309d174 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -313,6 +313,7 @@ TESTS = \ ln/misc \ ln/sf-1 \ ln/target-1 \ + ls/capability \ ls/color-dtype-dir \ ls/dangle \ ls/dired \ diff --git a/tests/ls/capability b/tests/ls/capability new file mode 100755 index 0000000..549e06b --- /dev/null +++ b/tests/ls/capability @@ -0,0 +1,43 @@ +#!/bin/sh +# Ensure "ls --color" properly colorizes file with capability. + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if test "$VERBOSE" = yes; then + set -x + ls --version +fi + +. $srcdir/test-lib.sh +require_root_ + +(setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \ + || skip_test_ "setcap utility not found" +fail=0 + +# Don't let a different umask perturb the results. +umask 22 + +touch test +setcap cap_net_bind_service=ep test \ + || framework_failure +code='30;41' +LS_COLORS="ca=$code" \ + ls --color=always test > out || fail=1 +printf "\033[0m\033[${code}mtest\033[0m\n\033[m" > out_ok || fail=1 +compare out out_ok || fail=1 + +(exit $fail); exit $fail -- 1.5.4.1 Index: coreutils-DIR_COLORS =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- coreutils-DIR_COLORS 19 May 2008 11:31:08 -0000 1.4 +++ coreutils-DIR_COLORS 24 Jul 2008 13:17:42 -0000 1.5 @@ -83,6 +83,7 @@ MISSING 01;05;37;41 # ... and the files they point to SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable Index: coreutils-DIR_COLORS.256color =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- coreutils-DIR_COLORS.256color 19 May 2008 11:31:08 -0000 1.3 +++ coreutils-DIR_COLORS.256color 24 Jul 2008 13:17:42 -0000 1.4 @@ -62,6 +62,7 @@ MISSING 01;05;48;5;232;38;5;15 # ... and the files they point to SETUID 48;5;196;38;5;15 # file that is setuid (u+s) SETGID 48;5;11;38;5;16 # file that is setgid (g+s) +CAPABILITY 48;5;196;38;5;226 # file with capability STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable Index: coreutils-DIR_COLORS.xterm =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.xterm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- coreutils-DIR_COLORS.xterm 19 May 2008 11:31:08 -0000 1.4 +++ coreutils-DIR_COLORS.xterm 24 Jul 2008 13:17:42 -0000 1.5 @@ -65,6 +65,7 @@ MISSING 01;05;37;41 # ... and the files they point to SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- coreutils.spec 16 Jul 2008 14:22:18 -0000 1.221 +++ coreutils.spec 24 Jul 2008 13:17:42 -0000 1.222 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.12 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -54,6 +54,8 @@ Patch950: coreutils-selinux.patch Patch951: coreutils-selinuxmanpages.patch Patch952: coreutils-6.11-matchpathconinstall.patch +Patch953: coreutils-6.12-dd-fullblock.patch +Patch954: coreutils-6.12-ls-libcap.patch BuildRequires: libselinux-devel >= 1.25.6-1 BuildRequires: libacl-devel @@ -64,6 +66,7 @@ #dist-lzma required BuildRequires: automake >= 1.10.1 %{?!nopam:BuildRequires: pam-devel} +BuildRequires: libcap-devel >= 2.0.6 Requires(post): libselinux >= 1.25.6-1 Requires(pre): /sbin/install-info @@ -71,6 +74,7 @@ Requires(post): /sbin/install-info Requires(post): grep %{?!nopam:Requires: pam >= 0.66-12} +Requires(post): libcap >= 2.0.6 # Require a C library that doesn't put LC_TIME files in our way. Conflicts: glibc < 2.2 @@ -133,11 +137,14 @@ #SELinux %patch950 -p1 -b .selinux %patch951 -p1 -b .selinuxman +%patch953 -p1 -b .dd-fullblock +%patch954 -p1 -b .ls-libcap chmod a+x tests/misc/sort-mb-tests chmod a+x tests/misc/id-context chmod a+x tests/misc/utimensat-touchcp +chmod a+x tests/ls/capability #fix typos/mistakes in localized documentation(#439410, #440056) for pofile in $(find ./po/*.p*) @@ -316,6 +323,11 @@ /sbin/runuser %changelog +* Wed Jul 24 2008 Kamil Dudka - 6.12-7 +- dd: iflag=fullblock now read full blocks if possible + (#431997, #449263) +- ls: --color now highlights files with capabilities (#449985) + * Wed Jul 16 2008 Ondrej Vasik - 6.12-6 - Get rid off fuzz in patches From fedora-extras-commits at redhat.com Thu Jul 24 13:19:03 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 24 Jul 2008 13:19:03 GMT Subject: rpms/kdepim/devel kdepim.spec,1.184,1.185 Message-ID: <200807241319.m6ODJ3tN005705@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5672 Modified Files: kdepim.spec Log Message: bump release Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- kdepim.spec 24 Jul 2008 10:20:09 -0000 1.184 +++ kdepim.spec 24 Jul 2008 13:18:19 -0000 1.185 @@ -7,7 +7,7 @@ Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Productivity @@ -175,6 +175,9 @@ %changelog +* Thu Jul 24 2008 Than Ngo 4.1.0-2 +- respun + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Thu Jul 24 13:26:54 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Thu, 24 Jul 2008 13:26:54 GMT Subject: rpms/speex/F-9 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 speex.spec, 1.24, 1.25 speex-1.0.4-pkgconfig.patch, 1.1, NONE speex-1.2-CVE-2008-1686.diff, 1.1, NONE speex-1.2beta1-test-progs.patch, 1.1, NONE speex-underquoted.patch, 1.1, NONE Message-ID: <200807241326.m6ODQsic005996@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/speex/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5955 Modified Files: .cvsignore sources speex.spec Removed Files: speex-1.0.4-pkgconfig.patch speex-1.2-CVE-2008-1686.diff speex-1.2beta1-test-progs.patch speex-underquoted.patch Log Message: - update to 1.2rc1 - move manual.pdf to -devel - spec cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/speex/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Dec 2007 14:52:23 -0000 1.7 +++ .cvsignore 24 Jul 2008 13:25:53 -0000 1.8 @@ -1 +1 @@ -speex-1.2beta3.tar.gz +speex-1.2rc1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/speex/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Dec 2007 14:52:23 -0000 1.7 +++ sources 24 Jul 2008 13:25:53 -0000 1.8 @@ -1 +1 @@ -bcada04dc663a725ee7fcfa6301520a3 speex-1.2beta3.tar.gz +c4438b22c08e5811ff10e2b06ee9b9ae speex-1.2rc1.tar.gz Index: speex.spec =================================================================== RCS file: /cvs/pkgs/rpms/speex/F-9/speex.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- speex.spec 15 Apr 2008 15:43:22 -0000 1.24 +++ speex.spec 24 Jul 2008 13:25:53 -0000 1.25 @@ -1,19 +1,15 @@ Summary: A voice compression format (codec) Name: speex Version: 1.2 -Release: 0.7.beta3 +%define rc_ver rc1 +Release: 0.10.%{rc_ver}%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.speex.org/ -Source0: http://downloads.us.xiph.org/releases/speex/%{name}-1.2beta3.tar.gz +Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libogg-devel -# don't build unneded test programs, since they seem to cause -# build failures -Patch0: speex-1.2beta1-test-progs.patch -Patch1: speex-1.2-CVE-2008-1686.diff - %description Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in @@ -41,10 +37,7 @@ speech. This package contains tools files and user's manual for %{name}. %prep -%setup -q -n speex-1.2beta3 -%patch0 -p1 -b .test-progs -%patch1 -p1 -b .CVE-2008-1686 -chmod a-x README +%setup -q -n %{name}-%{version}%{rc_ver} %build %configure --disable-static @@ -55,7 +48,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_docdir}/speex/manual.pdf %clean @@ -67,38 +60,42 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING TODO ChangeLog README NEWS -%{_libdir}/libspeex.so.* %{_libdir}/libspeex*.so.* -%exclude %{_libdir}/libspeexdsp.la %files devel %defattr(-,root,root,-) +%doc doc/manual.pdf %{_includedir}/speex %{_datadir}/aclocal/speex.m4 -%{_libdir}/pkgconfig/speexdsp.pc -%{_libdir}/pkgconfig/speex.pc -%{_libdir}/libspeex.so -#%{_libdir}/libspeexdsp.so* +%{_libdir}/pkgconfig/speex*.pc %{_libdir}/libspeex*.so -%exclude %{_libdir}/libspeex.la +%exclude %{_libdir}/libspeex*.la %files tools %defattr(-,root,root,-) -%{_defaultdocdir}/speex -%doc doc/manual.pdf %{_bindir}/speexenc %{_bindir}/speexdec %{_mandir}/man1/speexenc.1* %{_mandir}/man1/speexdec.1* %changelog +* Thu Jul 24 2008 Miroslav Lichvar - 1.2-0.10.rc1 +- update to 1.2rc1 +- move manual.pdf to -devel + +* Tue May 13 2008 Marcela Maslanova - 1.2-0.9.beta3 +- polishing review (many thanks to Matthias Saou) + +* Fri Apr 25 2008 Marcela Maslanova - 1.2-0.8.beta3 +- 226428 review + * Tue Apr 15 2008 Tomas Hoger - 1.2-0.7.beta3 - Security update: Add mode checks to speex_packet_to_header() to protect applications using speex library and not having proper checks (CVE-2008-1686, #441239, https://trac.xiph.org/changeset/14701) * Mon Mar 31 2008 Marcela Maslanova - 1.2-0.6.beta3 -- 439284 add owner to %{_defaultdocdir}/speex +- 439284 add owner to %%{_defaultdocdir}/speex * Tue Feb 19 2008 Fedora Release Engineering - 1.2-0.5.beta3 - Autorebuild for GCC 4.3 --- speex-1.0.4-pkgconfig.patch DELETED --- --- speex-1.2-CVE-2008-1686.diff DELETED --- --- speex-1.2beta1-test-progs.patch DELETED --- --- speex-underquoted.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 13:27:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 13:27:01 +0000 Subject: [pkgdb] synaptics had acl change status Message-ID: <20080724132701.56FB41AD0E3@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the watchcommits acl on synaptics (Fedora devel) to Approved for Peter Hutterer (whot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/synaptics From fedora-extras-commits at redhat.com Thu Jul 24 13:27:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 13:27:05 +0000 Subject: [pkgdb] synaptics had acl change status Message-ID: <20080724132706.1ACB01AD0E9@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the commit acl on synaptics (Fedora devel) to Approved for Peter Hutterer (whot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/synaptics From fedora-extras-commits at redhat.com Thu Jul 24 13:27:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 13:27:16 +0000 Subject: [pkgdb] synaptics had acl change status Message-ID: <20080724132716.A1D7F1AD0E5@bastion.fedora.phx.redhat.com> Kristian H?gsberg (krh) has set the approveacls acl on synaptics (Fedora devel) to Approved for Peter Hutterer (whot) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/synaptics From fedora-extras-commits at redhat.com Thu Jul 24 13:47:14 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Thu, 24 Jul 2008 13:47:14 GMT Subject: rpms/pulseaudio/devel .cvsignore, 1.21, 1.22 pulseaudio.spec, 1.48, 1.49 sources, 1.23, 1.24 Message-ID: <200807241347.m6ODlEcd006981@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/pulseaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6903 Modified Files: .cvsignore pulseaudio.spec sources Log Message: Final release 0.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 26 Jun 2008 18:45:39 -0000 1.21 +++ .cvsignore 24 Jul 2008 13:46:25 -0000 1.22 @@ -1 +1 @@ -pulseaudio-0.9.11.git20080626.tar.gz +pulseaudio-0.9.11.tar.gz Index: pulseaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- pulseaudio.spec 23 Jul 2008 00:05:45 -0000 1.48 +++ pulseaudio.spec 24 Jul 2008 13:46:25 -0000 1.49 @@ -1,14 +1,12 @@ %define drvver 0.9 -%define alphatag git20080626 - Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.11 -Release: 0.7.%{alphatag}%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.%{alphatag}.tar.gz +Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz URL: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel @@ -22,7 +20,7 @@ BuildRequires: libtool BuildRequires: libXt-devel, xorg-x11-proto-devel BuildRequires: openssl-devel -BuildRequires: gdbm-devel +BuildRequires: gdbm-devel speex-devel Requires: %{name}-core-libs = %{version}-%{release} Obsoletes: pulseaudio-devel #Patch2: pulseaudio-0.9.8-fix-sample-upload.patch @@ -34,7 +32,7 @@ #Patch8: pulseaudio-0.9.8-disable-realtime.patch #Patch9: pulseaudio-0.9.8-cputime-abort.patch #Patch10: wrong-assert.patch -Patch11: pa-ck-api-change.patch +#Patch11: pa-ck-api-change.patch %description PulseAudio is a sound server for Linux and other Unix like operating @@ -180,7 +178,7 @@ #%patch8 -p1 -b .realtime #%patch9 -p1 -b .cputime-abort #%patch10 -p1 -b .wrong-assert -%patch11 -p1 -b .api-change +#%patch11 -p1 -b .api-change %build %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -194,7 +192,6 @@ # configure --disable-static had no effect; delete manually. rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio -ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd rm $RPM_BUILD_ROOT/%{_libdir}/libpulsecore.so # preserve time stamps, for multilib's sake touch -r src/daemon/daemon.conf.in $RPM_BUILD_ROOT%{_sysconfdir}/pulse/daemon.conf @@ -241,7 +238,9 @@ %dir %{_sysconfdir}/pulse/ %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa +%config %{_sysconfdir}/xdg/autostart/pulseaudio.desktop %attr(4755,root,root) %{_bindir}/pulseaudio +%attr(4755,root,root) %{_bindir}/start-pulseaudio-x11 %dir %{_libdir}/pulse-%{drvver}/ %dir %{_libdir}/pulse-%{drvver}/modules/ %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so @@ -320,7 +319,6 @@ %files esound-compat %defattr(-,root,root) %{_bindir}/esdcompat -%{_bindir}/esd %{_mandir}/man1/esdcompat.1.gz %files module-lirc @@ -334,7 +332,6 @@ %{_libdir}/pulse-%{drvver}/modules/module-x11-bell.so %{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so %{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so -%config %{_sysconfdir}/xdg/autostart/pulseaudio-module-xsmp.desktop %files module-zeroconf %defattr(-,root,root) @@ -410,6 +407,9 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Thu Jul 24 2008 Lennart Poettering 0.9.11-1 +- Final release 0.9.11 + * Tue Jul 22 2008 Jon McCann 0.9.11-0.7.git20080626 - Fix for CK API changes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 26 Jun 2008 18:45:39 -0000 1.23 +++ sources 24 Jul 2008 13:46:25 -0000 1.24 @@ -1 +1 @@ -a57872ddc91db15512946a02099d544a pulseaudio-0.9.11.git20080626.tar.gz +fa121f8e5dd4b98d65096de1b6c84021 pulseaudio-0.9.11.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 13:52:51 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 13:52:51 GMT Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.60,1.61 Message-ID: <200807241352.m6ODqpOw007458@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318 Modified Files: kdebase-runtime.spec Log Message: forward-port changelog update Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- kdebase-runtime.spec 23 Jul 2008 18:51:38 -0000 1.60 +++ kdebase-runtime.spec 24 Jul 2008 13:52:06 -0000 1.61 @@ -336,6 +336,9 @@ * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 +* Wed Jul 23 2008 Rex Dieter 4.0.99-2 +- phonon-backend-xine: drop Obsoletes/Requires upgrade hack + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Thu Jul 24 13:53:43 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 13:53:43 GMT Subject: rpms/kdebase-runtime/F-9 kdebase-runtime.spec,1.47,1.48 Message-ID: <200807241353.m6ODrhVG007524@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-runtime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7473 Modified Files: kdebase-runtime.spec Log Message: * Wed Jul 23 2008 Rex Dieter 4.0.99-2 - phonon-backend-xine: drop Obsoletes/Requires upgrade hack Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- kdebase-runtime.spec 19 Jul 2008 18:02:03 -0000 1.47 +++ kdebase-runtime.spec 24 Jul 2008 13:52:58 -0000 1.48 @@ -9,7 +9,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.0.99 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -88,11 +88,8 @@ %package -n phonon-backend-xine Summary: Xine phonon backend Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} # not sure exactly how best to version this one -- Rex Provides: phonon-backend = 4.2 -# (temporary) upgrade path -Obsoletes: kdebase-runtime < 4.0.98-3 %description -n phonon-backend-xine %{summary}. @@ -337,6 +334,9 @@ %changelog +* Wed Jul 23 2008 Rex Dieter 4.0.99-2 +- phonon-backend-xine: drop Obsoletes/Requires upgrade hack + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Thu Jul 24 13:59:54 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Thu, 24 Jul 2008 13:59:54 GMT Subject: rpms/xorg-x11-drv-radeonhd/F-9 .cvsignore, 1.34, 1.35 sources, 1.34, 1.35 xorg-x11-drv-radeonhd-README.fedora, 1.32, 1.33 xorg-x11-drv-radeonhd-snapshot.sh, 1.11, 1.12 xorg-x11-drv-radeonhd.spec, 1.42, 1.43 Message-ID: <200807241359.m6ODxs58007962@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7898 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec Log Message: * Thu Jul 24 2008 Hans Ulrich Niedermann - 1.2.1-3.7.20080724git - New snapshot (upstream commit 31e46386293fd0c54c99328eee3cfe7b49584f9d): - 31e46386: Connectors: Increase the number of available connectors to 6. - 8b1d3323: I2C: Fix I2C slave address probing for RV620 and later. - d65b67b0: HPD: Add support for HPD_3 found on RV620 and later hardware. - a900052b: DIG: Extend heuristic to check if golden values are available for requested coherent/incoherent mode. - d3e6c7f7: RandR: Log when a 'scaled to' mode doesn't vaildate. - 68592e30: MC/RS600: Fix MC indirect access functions. - fdf5014c: CRTC/Scaler: Log more information about the scaler. - 94d759b9: DDIA: Disable Sync DC Balancer on DDIA block of RS690. - 202f2332: I2C: Check for more error conditions in I2CStatus on RS690. - ec2fbeee: Fix typo in list of supported chips (again) - 435320de: Crtc/Scaler: Disallow interlaced for all modes involving scaler. - c0e0dc7d: ID: Adding M82 chipset name and some more verbose logging info. - 8133d1a4: MC: Enable MC control for RS600, fixed segfault. - f362e5ab: R5xx DRI: increase CP timeout. - 1761d6c5: R5xx Accel: split r5xx2DInfo into XAA and EXA specific structs. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 16 Jul 2008 14:43:55 -0000 1.34 +++ .cvsignore 24 Jul 2008 13:59:08 -0000 1.35 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 +xf86-video-radeonhd-1.2.1-20080724git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 16 Jul 2008 14:43:55 -0000 1.34 +++ sources 24 Jul 2008 13:59:08 -0000 1.35 @@ -1 +1 @@ -f2750801fc42e733517d1e703f1e8ae0 xf86-video-radeonhd-1.2.1-20080716git.tar.bz2 +47660263832de3cb0e8227b8ff36be69 xf86-video-radeonhd-1.2.1-20080724git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- xorg-x11-drv-radeonhd-README.fedora 16 Jul 2008 14:43:55 -0000 1.32 +++ xorg-x11-drv-radeonhd-README.fedora 24 Jul 2008 13:59:08 -0000 1.33 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: 820187b208ab1ec94a015f07e48abbb381524c89 +Latest upstream commit: 31e46386293fd0c54c99328eee3cfe7b49584f9d Contents Index: xorg-x11-drv-radeonhd-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-snapshot.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-drv-radeonhd-snapshot.sh 13 Jul 2008 17:06:54 -0000 1.11 +++ xorg-x11-drv-radeonhd-snapshot.sh 24 Jul 2008 13:59:08 -0000 1.12 @@ -101,6 +101,7 @@ [ -f "$specfile" ] rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9]$//')" + pre_update_dir=`pwd` cd "$(dirname "$0")/xf86-video-radeonhd.src" [ -d ".git" ] @@ -125,6 +126,7 @@ mv -f "${fullspecfile}.new" "${fullspecfile}" fi + cd "$pre_update_dir" } # End of update_changelog() function Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- xorg-x11-drv-radeonhd.spec 16 Jul 2008 14:43:55 -0000 1.42 +++ xorg-x11-drv-radeonhd.spec 24 Jul 2008 13:59:08 -0000 1.43 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20080716 -%define git_commit 820187b208ab1ec94a015f07e48abbb381524c89 +%define date 20080724 +%define git_commit 31e46386293fd0c54c99328eee3cfe7b49584f9d %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.1 -Release: 3.4%{?alphatag}%{?dist} +Release: 3.7%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -94,6 +94,10 @@ Requires: xorg-x11-server-Xorg < 1.4.99.1 %endif +# DRI support +BuildRequires: libdrm-devel +BuildRequires: xorg-x11-proto-devel + %description X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets. %if %{snapshot} @@ -160,6 +164,41 @@ %endif %changelog +* Thu Jul 24 2008 Hans Ulrich Niedermann - 1.2.1-3.7.20080724git +- New snapshot (upstream commit 31e46386293fd0c54c99328eee3cfe7b49584f9d): + - 31e46386: Connectors: Increase the number of available connectors to 6. + - 8b1d3323: I2C: Fix I2C slave address probing for RV620 and later. + - d65b67b0: HPD: Add support for HPD_3 found on RV620 and later hardware. + - a900052b: DIG: Extend heuristic to check if golden values are available for requested coherent/incoherent mode. + - d3e6c7f7: RandR: Log when a 'scaled to' mode doesn't vaildate. + - 68592e30: MC/RS600: Fix MC indirect access functions. + - fdf5014c: CRTC/Scaler: Log more information about the scaler. + - 94d759b9: DDIA: Disable Sync DC Balancer on DDIA block of RS690. + - 202f2332: I2C: Check for more error conditions in I2CStatus on RS690. + - ec2fbeee: Fix typo in list of supported chips (again) + - 435320de: Crtc/Scaler: Disallow interlaced for all modes involving scaler. + - c0e0dc7d: ID: Adding M82 chipset name and some more verbose logging info. + - 8133d1a4: MC: Enable MC control for RS600, fixed segfault. + - f362e5ab: R5xx DRI: increase CP timeout. + - 1761d6c5: R5xx Accel: split r5xx2DInfo into XAA and EXA specific structs. + +* Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.6.20080719git +- Compile DRI support. + +* Sat Jul 19 2008 Hans Ulrich Niedermann - 1.2.1-3.5.20080719git +- New snapshot (upstream commit 603a35a670c71d32c4f393e21ed09f87449ebbf6): + - 603a35a6: Fix typo in list of supported chips + - 3bc154bf: ID: Remove concept of chipset families. + - 3ac5a2f5: ID: Update list of supported chipsets, bring in sync with chipsets listed. + - edb72452: MC: Make sure MC engine is all idle before setting up the MC. + - 4eebf4bc: Define SED var without requiring AC_PROG_SED + - 2bc4450a: Use 'git foo' instead of 'git-foo' + - 4134177e: Automatically update man page from rhd_id.c + - b3717c77: I2C: Fix typo that caused one DDC line to not work properly. + - bd14f735: Add proper MCIdle() bits for r6xx/r7xx + - 72477c9e: manpage: Add description on the scaling option. +- Fix removal of build dir in snapshot script + * Wed Jul 16 2008 Hans Ulrich Niedermann - 1.2.1-3.4.20080716git - New snapshot (upstream commit 820187b208ab1ec94a015f07e48abbb381524c89): - 820187b2: Fix hangs when setting up the MC From fedora-extras-commits at redhat.com Thu Jul 24 14:01:00 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 24 Jul 2008 14:01:00 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1592, 1.1593 openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch, 1.2, NONE openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch, 1.3, NONE Message-ID: <200807241401.m6OE10ZL008102@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8019 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch Log Message: block together upstream-accepted patches by workspace Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1592 retrieving revision 1.1593 diff -u -r1.1592 -r1.1593 --- openoffice.org.spec 24 Jul 2008 10:59:31 -0000 1.1592 +++ openoffice.org.spec 24 Jul 2008 14:00:12 -0000 1.1593 @@ -94,7 +94,7 @@ Patch22: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz Patch23: openoffice.org-2.3.0.ooo76649.httpencoding.patch Patch24: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch -Patch25: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch +Patch25: workspace.cmcfixes48.patch Patch26: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch Patch27: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch Patch28: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch @@ -106,10 +106,9 @@ Patch34: workspace.cmcfixes46.patch Patch35: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch Patch36: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch -Patch37: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch -Patch38: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch -Patch39: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch -Patch40: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch +Patch37: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +Patch38: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch +Patch39: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1260,10 +1259,9 @@ %patch34 -p1 -b .workspace.cmcfixes46.patch %patch35 -p1 -b .ooo48400.svx.fixspelling.patch %patch36 -p1 -b .ooo90876.connectivity.evoab2.patch -%patch37 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch -%patch38 -p1 -b .ooo86142.serbiannumbering.patch -%patch39 -p1 -b .ooo91977.sd.holdreference.patch -%patch40 -p1 -b .ooo92026.sd.disposed_during_disposing.patch +%patch37 -p1 -b .ooo86142.serbiannumbering.patch +%patch38 -p1 -b .ooo91977.sd.holdreference.patch +%patch39 -p1 -b .ooo92026.sd.disposed_during_disposing.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -3900,7 +3898,7 @@ - fix broken requires * Fri Jan 11 2008 Caolan McNamara - 1:2.4.0-1.2 -- add openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch to fix up -devel Requires +- add openoffice.org-2.4.0.ooo92086.solenv.paths.patch to fix up -devel Requires - add openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch - Resolves: rhbz#425701/ooo#83410 try and fix serbian translations --- openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch DELETED --- --- openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 14:04:36 2008 From: fedora-extras-commits at redhat.com (James Bowes (jbowes)) Date: Thu, 24 Jul 2008 14:04:36 GMT Subject: rpms/git/devel .cvsignore, 1.62, 1.63 git.spec, 1.69, 1.70 sources, 1.62, 1.63 Message-ID: <200807241404.m6OE4a0B015079@cvs-int.fedora.redhat.com> Author: jbowes Update of /cvs/extras/rpms/git/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14970 Modified Files: .cvsignore git.spec sources Log Message: git-1.5.6.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 19 Jun 2008 12:38:47 -0000 1.62 +++ .cvsignore 24 Jul 2008 14:03:40 -0000 1.63 @@ -1 +1 @@ -git-1.5.6.tar.bz2 +git-1.5.6.4.tar.bz2 Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/devel/git.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- git.spec 19 Jun 2008 12:38:47 -0000 1.69 +++ git.spec 24 Jul 2008 14:03:40 -0000 1.70 @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.6 +Version: 1.5.6.4 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ # No files for you! %changelog +* Thu Jul 24 2008 James Bowes 1.5.6-4 +- git-1.5.6.4 + * Thu Jun 19 2008 James Bowes 1.5.6-1 - git-1.5.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 19 Jun 2008 12:38:47 -0000 1.62 +++ sources 24 Jul 2008 14:03:40 -0000 1.63 @@ -1 +1 @@ -76c4efaaa5470a5385e22d99349a97b3 git-1.5.6.tar.bz2 +b5f248c71d32921ff0ff7e35f7770003 git-1.5.6.4.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 14:05:23 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Thu, 24 Jul 2008 14:05:23 GMT Subject: rpms/packagekit-qt/devel packagekit-qt.spec,1.2,1.3 Message-ID: <200807241405.m6OE5NDs015148@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/packagekit-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15083 Modified Files: packagekit-qt.spec Log Message: Fixed changelog to include version & release Index: packagekit-qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/packagekit-qt.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- packagekit-qt.spec 24 Jul 2008 11:23:02 -0000 1.2 +++ packagekit-qt.spec 24 Jul 2008 14:04:40 -0000 1.3 @@ -3,7 +3,7 @@ Name: packagekit-qt Version: 0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Qt interface for PackageKit License: GPLv2+ @@ -53,17 +53,20 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Jul 24 2008 Steven M. Parrish 5 -- Fixed broken dependecy +* Thu Jul 24 2008 Steven M. Parrish 0.1-6 +- Fixed changelog to include version & release -* Tue Jul 22 2008 Steven M. Parrish 4 +* Thu Jul 24 2008 Steven M. Parrish 0.1-5 +- Fixed broken dependency + +* Tue Jul 22 2008 Steven M. Parrish 0.1-4 - Removed unneeded -libs package -* Tue Jul 22 2008 Steven M. Parrish 3 +* Tue Jul 22 2008 Steven M. Parrish 0.1-3 - Updated spec to include missing requires -* Wed Jul 16 2008 Steven M. Parrish 2 +* Wed Jul 16 2008 Steven M. Parrish 0.1-2 - Removed uneeded BR and made use of predefined macros -* Wed Jul 16 2008 Steven M. Parrish 1 +* Wed Jul 16 2008 Steven M. Parrish 0.1-1 - Initial SPEC From fedora-extras-commits at redhat.com Thu Jul 24 14:09:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:09:44 +0000 Subject: [pkgdb] packagekit-qt had acl change status Message-ID: <20080724140944.B427A1AD0E7@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on packagekit-qt (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:09:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:09:42 +0000 Subject: [pkgdb] packagekit-qt had acl change status Message-ID: <20080724140943.56E471AD0E0@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on packagekit-qt (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:10:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:10:02 +0000 Subject: [pkgdb] packagekit-qt had acl change status Message-ID: <20080724141003.195DC1AD0EC@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on packagekit-qt (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:10:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:10:08 +0000 Subject: [pkgdb] packagekit-qt had acl change status Message-ID: <20080724141009.B23421AD0ED@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on packagekit-qt (Fedora 9) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:11:09 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 14:11:09 GMT Subject: rpms/phonon/F-8 phonon.spec,1.6,1.7 Message-ID: <200807241411.m6OEB92n015674@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/phonon/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15589/F-8 Modified Files: phonon.spec Log Message: Sync from devel: * Thu Jul 24 2008 Rex Dieter 4.2.0-2 - rename -backend-gstreamer -> backend-gst Index: phonon.spec =================================================================== RCS file: /cvs/pkgs/rpms/phonon/F-8/phonon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- phonon.spec 23 Jul 2008 12:26:06 -0000 1.6 +++ phonon.spec 24 Jul 2008 14:10:26 -0000 1.7 @@ -2,7 +2,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -24,15 +24,14 @@ %description %{summary}. -%package backend-gstreamer +%package backend-gst Summary: Gstreamer phonon backend Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -# not sure exactly how best to version this one -- Rex Provides: phonon-backend = %{version}-%{release} -# (temporary) upgrade path -Obsoletes: phonon < 4.2-0.4 -%description backend-gstreamer +Obsoletes: %{name}-backend-gstreamer < 4.2-2 +Provides: %{name}-backend-gstreamer = %{version}-%{release} +%description backend-gst %{summary}. %package devel @@ -45,7 +44,6 @@ %{summary}. - %prep %setup -q @@ -84,7 +82,7 @@ %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/ %dir %{_kde4_datadir}/kde4/services/phononbackends/ -%files backend-gstreamer +%files backend-gst %defattr(-,root,root,-) %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop @@ -99,6 +97,9 @@ %changelog +* Thu Jul 24 2008 Rex Dieter 4.2.0-2 +- rename -backend-gstreamer -> backend-gst + * Wed Jul 23 2008 Rex Dieter 4.2.0-1 - phonon-4.2.0 From fedora-extras-commits at redhat.com Thu Jul 24 14:11:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:11:55 +0000 Subject: [pkgdb] phonon: kkofler has requested watchbugzilla Message-ID: <20080724141155.58FC81AD0E3@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on phonon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:11:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:11:59 +0000 Subject: [pkgdb] phonon: kkofler has requested watchcommits Message-ID: <20080724141159.805731AD0EB@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on phonon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:02 +0000 Subject: [pkgdb] phonon: kkofler has requested approveacls Message-ID: <20080724141202.E75A61AD0FC@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the approveacls acl on phonon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:01 +0000 Subject: [pkgdb] phonon: kkofler has requested commit Message-ID: <20080724141201.424DF1AD0F7@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on phonon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:04 +0000 Subject: [pkgdb] phonon: kkofler has requested watchbugzilla Message-ID: <20080724141205.66A881AD105@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on phonon (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:09 +0000 Subject: [pkgdb] phonon: kkofler has requested commit Message-ID: <20080724141209.E52D71AD10E@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on phonon (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:08 +0000 Subject: [pkgdb] phonon: kkofler has requested watchcommits Message-ID: <20080724141209.CCC751AD109@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on phonon (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:14 +0000 Subject: [pkgdb] phonon: kkofler has requested watchbugzilla Message-ID: <20080724141215.D3E081AD11A@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on phonon (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:16 +0000 Subject: [pkgdb] phonon: kkofler has requested watchcommits Message-ID: <20080724141216.DC1CF1AD111@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on phonon (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:18 +0000 Subject: [pkgdb] phonon: kkofler has requested commit Message-ID: <20080724141218.295C01AD118@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on phonon (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:12 +0000 Subject: [pkgdb] phonon: kkofler has requested approveacls Message-ID: <20080724141214.CD7E11AD113@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the approveacls acl on phonon (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:12:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:12:19 +0000 Subject: [pkgdb] phonon: kkofler has requested approveacls Message-ID: <20080724141219.8F8BB1AD11E@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the approveacls acl on phonon (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:17:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:17:58 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141758.9BBC51AD0DD@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchcommits acl on phonon (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:17:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:17:59 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141759.796D01AD0E7@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the commit acl on phonon (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:00 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141800.8C6271AD0ED@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchbugzilla acl on phonon (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:02 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141802.578401AD0FB@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the approveacls acl on phonon (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:05 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141805.7C9071AD102@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchbugzilla acl on phonon (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:06 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141806.8C2C61AD107@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchcommits acl on phonon (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:12 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141812.3AA041AD113@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchbugzilla acl on phonon (Fedora 8) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:09 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141809.EE6C11AD109@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the commit acl on phonon (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:10 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141811.2C9B51AD10E@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the approveacls acl on phonon (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:18 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141818.79C171AD0E7@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the commit acl on phonon (Fedora 8) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:16 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141816.C7E691AD0E0@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the watchcommits acl on phonon (Fedora 8) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:20 +0000 Subject: [pkgdb] phonon had acl change status Message-ID: <20080724141820.45F951AD11A@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has set the approveacls acl on phonon (Fedora 8) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/phonon From fedora-extras-commits at redhat.com Thu Jul 24 14:18:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:56 +0000 Subject: [pkgdb] packagekit-qt: rdieter has requested approveacls Message-ID: <20080724141856.755221AD0DD@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the approveacls acl on packagekit-qt (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:18:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:18:53 +0000 Subject: [pkgdb] packagekit-qt: rdieter has requested approveacls Message-ID: <20080724141853.ECDCF1AD0FB@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the approveacls acl on packagekit-qt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:27:14 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 24 Jul 2008 14:27:14 GMT Subject: rpms/xorg-x11-server/F-8 xserver-1.3.0-render-traps-crash.patch, NONE, 1.1 xorg-x11-server.spec, 1.276, 1.277 xserver-1.3.0-randr-updates.patch, 1.2, 1.3 xserver-1.3.0-xrandr-timestamp-buglet.patch, 1.1, 1.2 Message-ID: <200807241427.m6OEREMf016560@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16479 Modified Files: xorg-x11-server.spec xserver-1.3.0-randr-updates.patch xserver-1.3.0-xrandr-timestamp-buglet.patch Added Files: xserver-1.3.0-render-traps-crash.patch Log Message: * Thu Jul 24 2008 Adam Jackson 1.3.0.0-47 - xserver-1.3.0-render-traps-crash.patch: Fix a crash in Render trapezoid rasterisation. (#455209) xserver-1.3.0-render-traps-crash.patch: --- NEW FILE xserver-1.3.0-render-traps-crash.patch --- diff -up xorg-server-1.3.0.0/fb/fbtrap.c.jx xorg-server-1.3.0.0/fb/fbtrap.c --- xorg-server-1.3.0.0/fb/fbtrap.c.jx 2006-11-16 13:01:23.000000000 -0500 +++ xorg-server-1.3.0.0/fb/fbtrap.c 2008-07-24 10:14:16.000000000 -0400 @@ -115,6 +115,9 @@ fbRasterizeTrapezoid (PicturePtr pPic RenderEdge l, r; xFixed t, b; + if (!xTrapezoidValid (trap)) + return; + fbGetDrawable (pPicture->pDrawable, buf, stride, bpp, pxoff, pyoff); width = pPicture->pDrawable->width; diff -up xorg-server-1.3.0.0/render/renderedge.c.jx xorg-server-1.3.0.0/render/renderedge.c --- xorg-server-1.3.0.0/render/renderedge.c.jx 2006-06-06 13:13:55.000000000 -0400 +++ xorg-server-1.3.0.0/render/renderedge.c 2008-07-24 10:13:48.000000000 -0400 @@ -143,6 +143,7 @@ RenderEdgeInit (RenderEdge *e, dx = x_bot - x_top; dy = y_bot - y_top; e->dy = dy; + e->dx = 0 if (dy) { if (dx >= 0) Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xorg-x11-server.spec,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- xorg-x11-server.spec 11 Jun 2008 23:37:18 -0000 1.276 +++ xorg-x11-server.spec 24 Jul 2008 14:26:24 -0000 1.277 @@ -9,7 +9,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.3.0.0 -Release: 46%{?dist} +Release: 47%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -110,6 +110,8 @@ Patch3009: cve-2008-2360.patch Patch3010: cve-2008-2361.patch Patch3011: cve-2008-2362.patch +# technically CVE-2007-2437, but it's DoS only so don't glorify it. +Patch3012: xserver-1.3.0-render-traps-crash.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -399,6 +401,7 @@ %patch3009 -p1 -b .cve-2008-2360 %patch3010 -p1 -b .cve-2008-2361 %patch3011 -p1 -b .cve-2008-2362 +%patch3012 -p1 -b .render-traps-crash %build @@ -667,6 +670,10 @@ %changelog +* Thu Jul 24 2008 Adam Jackson 1.3.0.0-47 +- xserver-1.3.0-render-traps-crash.patch: Fix a crash in Render trapezoid + rasterisation. (#455209) + * Thu Jun 12 2008 Dave Airlie 1.3.0.0-46 - cve-2008-1377.patch: Record and Security Extension Input validation - cve-2008-1379.patch: MIT-SHM extension Input Validation flaw xserver-1.3.0-randr-updates.patch: xserver-1.3.0-xrandr-timestamp-buglet.patch: From fedora-extras-commits at redhat.com Thu Jul 24 14:28:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:28:49 +0000 Subject: [pkgdb] packagekit-qt had acl change status Message-ID: <20080724142849.6B9931AD0E3@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the approveacls acl on packagekit-qt (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:28:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:28:56 +0000 Subject: [pkgdb] packagekit-qt had acl change status Message-ID: <20080724142856.EFB801AD0E9@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the approveacls acl on packagekit-qt (Fedora 9) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt From fedora-extras-commits at redhat.com Thu Jul 24 14:33:38 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 24 Jul 2008 14:33:38 GMT Subject: rpms/xorg-x11-server/F-8 xserver-1.3.0-render-traps-crash.patch, 1.1, 1.2 Message-ID: <200807241433.m6OEXchX016780@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16725 Modified Files: xserver-1.3.0-render-traps-crash.patch Log Message: * Thu Jul 24 2008 Adam Jackson 1.3.0.0-47 - xserver-1.3.0-render-traps-crash.patch: Fix a crash in Render trapezoid rasterisation. (#455209) xserver-1.3.0-render-traps-crash.patch: Index: xserver-1.3.0-render-traps-crash.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xserver-1.3.0-render-traps-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xserver-1.3.0-render-traps-crash.patch 24 Jul 2008 14:26:25 -0000 1.1 +++ xserver-1.3.0-render-traps-crash.patch 24 Jul 2008 14:32:47 -0000 1.2 @@ -18,7 +18,7 @@ dx = x_bot - x_top; dy = y_bot - y_top; e->dy = dy; -+ e->dx = 0 ++ e->dx = 0; if (dy) { if (dx >= 0) From fedora-extras-commits at redhat.com Thu Jul 24 14:42:01 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 24 Jul 2008 14:42:01 GMT Subject: rpms/xorg-x11-server/F-9 .cvsignore, 1.49, 1.50 import.log, 1.3, 1.4 sources, 1.43, 1.44 xorg-x11-server.spec, 1.339, 1.340 commitid, 1.21, NONE make-git-snapshot.sh, 1.2, NONE Message-ID: <200807241442.m6OEg1xj017237@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17149/F-9 Modified Files: .cvsignore import.log sources xorg-x11-server.spec Removed Files: commitid make-git-snapshot.sh Log Message: 1.5RC6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 2 Jul 2008 17:20:09 -0000 1.49 +++ .cvsignore 24 Jul 2008 14:41:11 -0000 1.50 @@ -1 +1 @@ -xorg-server-20080702.tar.bz2 +xorg-server-1.4.99.906.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 2 Jul 2008 17:20:09 -0000 1.3 +++ import.log 24 Jul 2008 14:41:11 -0000 1.4 @@ -1 +1,2 @@ xorg-x11-server-1_4_99_905-2_20080702_fc9:F-9:xorg-x11-server-1.4.99.905-2.20080702.fc9.src.rpm:1215018868 +xorg-x11-server-1_4_99_906-1_fc9:F-9:xorg-x11-server-1.4.99.906-1.fc9.src.rpm:1216909882 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 2 Jul 2008 17:20:09 -0000 1.43 +++ sources 24 Jul 2008 14:41:11 -0000 1.44 @@ -1 +1 @@ -b19b858731fefbfd88be47d4dcb65a02 xorg-server-20080702.tar.bz2 +d225476fea6721d9f64c3268e47d6c51 xorg-server-1.4.99.906.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v retrieving revision 1.339 retrieving revision 1.340 diff -u -r1.339 -r1.340 --- xorg-x11-server.spec 2 Jul 2008 17:20:09 -0000 1.339 +++ xorg-x11-server.spec 24 Jul 2008 14:41:11 -0000 1.340 @@ -14,25 +14,25 @@ # Fix rhpxl to no longer need vesamodes/extramodes %define pkgname xorg-server -%define gitdate 20080702 +#define gitdate 20080723 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.905 -Release: 2.%{gitdate}%{?dist} +Version: 1.4.99.906 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{gitdate} +%if 0%{?gitdate} # git snapshot. to recreate, run: # ./make-git-snapshot.sh `cat commitid` -Source0: xorg-server-%{gitdate}.tar.bz2 +Source0: xorg-server-%{?gitdate}.tar.bz2 Source1: make-git-snapshot.sh Source2: commitid %else -Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 +Source0: http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 %endif # OpenGL compositing manager feature/optimization patches. @@ -91,8 +91,6 @@ BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel BuildRequires: libX11-devel libXext-devel -# XXX Really? Why would we need this, Xfont should hide it. -BuildRequires: freetype-devel >= 2.1.9-1 # DMX config utils buildreqs. BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel @@ -240,21 +238,20 @@ %prep %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%if 0%{gitdate} +%if 0%{?gitdate} # XXX hack git checkout -b fedora # make it something you can push to. sed -i 's/git/&+ssh/' .git/config %else git-init-db -echo "This is incomplete. FIXME." -exit 1 -%endif - if [ -z "$GIT_COMMITTER_NAME" ]; then - export GIT_COMMITTER_NAME="Fedora X Ninjas" + git-config user.email "x at fedoraproject.org" + git-config user.name "Fedora X Ninjas" fi - +git-add . +git-commit -a -q -m "%{version} baseline." +%endif # Apply all the patches. Hold your nose... git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) @@ -278,7 +275,7 @@ --with-xkb-output=%{_localstatedir}/lib/xkb \ --with-rgb-path=%{_datadir}/X11/rgb \ --disable-xorgcfg \ - --disable-record \ + --disable-record --disable-xtrap \ --enable-install-libxf86config \ --enable-xselinux \ --with-dri-driver-path=%{drimoduledir} \ @@ -376,7 +373,6 @@ %{_libdir}/xorg/modules/extensions/libdri2.so %{_libdir}/xorg/modules/extensions/libdbe.so %{_libdir}/xorg/modules/extensions/libextmod.so -%{_libdir}/xorg/modules/extensions/libxtrap.so %dir %{_libdir}/xorg/modules/input %dir %{_libdir}/xorg/modules/fonts %{_libdir}/xorg/modules/fonts/libfreetype.so @@ -463,6 +459,9 @@ %changelog +* Wed Jul 23 2008 Adam Jackson 1.4.99.906-1 +- 1.5RC6. + * Wed Jul 02 2008 Adam Jackson 1.4.99.905-2.20080702 - Today's snapshot. --- commitid DELETED --- --- make-git-snapshot.sh DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 14:42:27 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Thu, 24 Jul 2008 14:42:27 GMT Subject: rpms/firefox/F-9 firefox.spec,1.302,1.303 Message-ID: <200807241442.m6OEgRih017380@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/firefox/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175 Modified Files: firefox.spec Log Message: Export correct locale in firefox-l10n.js Index: firefox.spec =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-9/firefox.spec,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- firefox.spec 16 Jul 2008 22:03:25 -0000 1.302 +++ firefox.spec 24 Jul 2008 14:41:32 -0000 1.303 @@ -180,6 +180,12 @@ pref("startup.homepage_welcome_url", "%{firstrun}"); EOF +# Export correct locale +%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js << EOF +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +EOF +%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js + # place the preferences %{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/all-redhat.js %{__rm} rh-default-prefs From fedora-extras-commits at redhat.com Thu Jul 24 14:43:52 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Thu, 24 Jul 2008 14:43:52 GMT Subject: rpms/firefox/devel firefox.spec,1.311,1.312 Message-ID: <200807241443.m6OEhqkk017487@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17452 Modified Files: firefox.spec Log Message: Export correct locale in firefox-l10n.js Index: firefox.spec =================================================================== RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- firefox.spec 19 Jul 2008 00:50:41 -0000 1.311 +++ firefox.spec 24 Jul 2008 14:42:59 -0000 1.312 @@ -181,6 +181,12 @@ pref("startup.homepage_welcome_url", "%{firstrun}"); EOF +# Export correct locale +%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js << EOF +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +EOF +%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js + # place the preferences %{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/all-redhat.js %{__rm} rh-default-prefs From fedora-extras-commits at redhat.com Thu Jul 24 14:45:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 24 Jul 2008 14:45:22 GMT Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec, 1.180, 1.181 xdgmime.patch, 1.1, 1.2 Message-ID: <200807241445.m6OEjMje017561@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-vfs2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17516 Modified Files: gnome-vfs2.spec xdgmime.patch Log Message: fix up patch Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- gnome-vfs2.spec 24 Jul 2008 04:44:49 -0000 1.180 +++ gnome-vfs2.spec 24 Jul 2008 14:44:36 -0000 1.181 @@ -134,7 +134,7 @@ %patch300 -p1 -b .ignore-certain-mount-points -%patch402 -p0 -b .xdgmime +%patch402 -p1 -b .xdgmime # for patch 10 autoheader xdgmime.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 xdgmime.patch Index: xdgmime.patch =================================================================== RCS file: /cvs/extras/rpms/gnome-vfs2/devel/xdgmime.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xdgmime.patch 24 Jul 2008 04:44:49 -0000 1.1 +++ xdgmime.patch 24 Jul 2008 14:44:36 -0000 1.2 @@ -1,7 +1,66 @@ -Index: libgnomevfs/xdgmimecache.c -=================================================================== ---- libgnomevfs/xdgmimecache.c (revision 5479) -+++ libgnomevfs/xdgmimecache.c (working copy) +diff -up gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime.c.xdgmime gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime.c +--- gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime.c.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime.c 2008-07-24 10:35:59.000000000 -0400 +@@ -236,6 +236,7 @@ _gnome_vfs_read_mime_from_buffer (GnomeV + int max_extents; + GnomeVFSResult result = GNOME_VFS_OK; + const char *mime_type; ++ int prio; + + G_LOCK (gnome_vfs_mime_mutex); + max_extents = xdg_mime_get_max_buffer_extents (); +@@ -250,7 +251,7 @@ _gnome_vfs_read_mime_from_buffer (GnomeV + } + G_LOCK (gnome_vfs_mime_mutex); + +- mime_type = xdg_mime_get_mime_type_for_data (buffer->buffer, buffer->buffer_length); ++ mime_type = xdg_mime_get_mime_type_for_data (buffer->buffer, buffer->buffer_length, &prio); + + G_UNLOCK (gnome_vfs_mime_mutex); + +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.c.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.c +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.c.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.c 2008-07-24 10:42:39.000000000 -0400 +@@ -26,7 +26,7 @@ + */ + + #ifdef HAVE_CONFIG_H +-#include ++#include "config.h" + #endif + + #include "xdgmimealias.h" +@@ -105,7 +105,7 @@ _xdg_mime_alias_list_lookup (XdgAliasLis + if (list->n_aliases > 0) + { + key.alias = (char *)alias; +- key.mime_type = 0; ++ key.mime_type = NULL; + + entry = bsearch (&key, list->aliases, list->n_aliases, + sizeof (XdgAlias), alias_entry_cmp); +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.h.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.h +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.h.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimealias.h 2008-07-24 10:42:39.000000000 -0400 +@@ -33,10 +33,11 @@ + typedef struct XdgAliasList XdgAliasList; + + #ifdef XDG_PREFIX +-#define _xdg_mime_alias_read_from_file XDG_ENTRY(alias_read_from_file) +-#define _xdg_mime_alias_list_new XDG_ENTRY(alias_list_new) +-#define _xdg_mime_alias_list_free XDG_ENTRY(alias_list_free) +-#define _xdg_mime_alias_list_lookup XDG_ENTRY(alias_list_lookup) ++#define _xdg_mime_alias_read_from_file XDG_RESERVED_ENTRY(alias_read_from_file) ++#define _xdg_mime_alias_list_new XDG_RESERVED_ENTRY(alias_list_new) ++#define _xdg_mime_alias_list_free XDG_RESERVED_ENTRY(alias_list_free) ++#define _xdg_mime_alias_list_lookup XDG_RESERVED_ENTRY(alias_list_lookup) ++#define _xdg_mime_alias_list_dump XDG_RESERVED_ENTRY(alias_list_dump) + #endif + + void _xdg_mime_alias_read_from_file (XdgAliasList *list, +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimecache.c.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimecache.c +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimecache.c.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimecache.c 2008-07-24 10:42:40.000000000 -0400 @@ -25,7 +25,7 @@ */ @@ -29,7 +88,16 @@ struct _XdgMimeCache { -@@ -344,6 +346,11 @@ +@@ -297,7 +299,7 @@ cache_magic_lookup_data (XdgMimeCache *c + for (n = 0; n < n_mime_types; n++) + { + if (mime_types[n] && +- xdg_mime_mime_type_equal (mime_types[n], non_match)) ++ _xdg_mime_mime_type_equal (mime_types[n], non_match)) + mime_types[n] = NULL; + } + } +@@ -344,6 +346,11 @@ cache_alias_lookup (const char *alias) return NULL; } @@ -41,7 +109,7 @@ static int cache_glob_lookup_literal (const char *file_name, const char *mime_types[], -@@ -365,7 +372,7 @@ +@@ -365,7 +372,7 @@ cache_glob_lookup_literal (const char *f { mid = (min + max) / 2; @@ -50,7 +118,7 @@ ptr = cache->buffer + offset; cmp = strcmp (ptr, file_name); -@@ -375,7 +382,7 @@ +@@ -375,7 +382,7 @@ cache_glob_lookup_literal (const char *f max = mid - 1; else { @@ -59,7 +127,7 @@ mime_types[0] = (const char *)(cache->buffer + offset); return 1; -@@ -388,7 +395,7 @@ +@@ -388,7 +395,7 @@ cache_glob_lookup_literal (const char *f static int cache_glob_lookup_fnmatch (const char *file_name, @@ -68,7 +136,7 @@ int n_mime_types) { const char *mime_type; -@@ -406,14 +413,19 @@ +@@ -406,14 +413,19 @@ cache_glob_lookup_fnmatch (const char *f for (j = 0; j < n_entries && n < n_mime_types; j++) { @@ -91,7 +159,7 @@ } if (n > 0) -@@ -424,85 +436,86 @@ +@@ -424,85 +436,86 @@ cache_glob_lookup_fnmatch (const char *f } static int @@ -187,7 +255,7 @@ } - - return n; - } +- } - else - { - n_children = GET_UINT32 (cache->buffer, offset + 16 * mid + 8); @@ -198,7 +266,7 @@ - suffix, ignore_case, - mime_types, - n_mime_types); -- } + } + return n; } } @@ -219,7 +287,7 @@ { int i, n; -@@ -516,7 +529,8 @@ +@@ -516,7 +529,8 @@ cache_glob_lookup_suffix (const char *su n = cache_glob_node_lookup_suffix (cache, n_entries, offset, @@ -229,7 +297,7 @@ mime_types, n_mime_types); if (n > 0) -@@ -526,41 +540,12 @@ +@@ -526,41 +540,12 @@ cache_glob_lookup_suffix (const char *su return 0; } @@ -243,9 +311,7 @@ - for (i = 0; _caches[i]; i++) - { - XdgMimeCache *cache = _caches[i]; -+ const MimeWeight *aa = (const MimeWeight *)a; -+ const MimeWeight *bb = (const MimeWeight *)b; - +- - xdg_uint32_t list_offset = GET_UINT32 (cache->buffer, 16); - xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset); - xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4); @@ -265,7 +331,9 @@ - k++; - } - } -- ++ const MimeWeight *aa = (const MimeWeight *)a; ++ const MimeWeight *bb = (const MimeWeight *)b; + - offset += 16; - } - } [...1764 lines suppressed...] int _xdg_mime_mime_type_subclass (const char *mime, const char *base); -const char *_xdg_mime_unalias_mime_type (const char *mime); @@ -1603,10 +1557,9 @@ #ifdef __cplusplus -Index: libgnomevfs/xdgmimeint.c -=================================================================== ---- libgnomevfs/xdgmimeint.c (revision 5479) -+++ libgnomevfs/xdgmimeint.c (working copy) +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.c.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.c +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.c.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.c 2008-07-24 10:42:40.000000000 -0400 @@ -26,7 +26,7 @@ */ @@ -1616,7 +1569,7 @@ #endif #include "xdgmimeint.h" -@@ -152,3 +152,40 @@ +@@ -152,3 +152,40 @@ _xdg_get_base_name (const char *file_nam else return base_name + 1; } @@ -1657,11 +1610,10 @@ + } +} + -Index: libgnomevfs/xdgmimeint.h -=================================================================== ---- libgnomevfs/xdgmimeint.h (revision 5479) -+++ libgnomevfs/xdgmimeint.h (working copy) -@@ -46,11 +46,13 @@ +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.h.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.h +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.h.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimeint.h 2008-07-24 10:42:40.000000000 -0400 +@@ -46,11 +46,13 @@ typedef unsigned short xdg_uint16_t; typedef unsigned int xdg_uint32_t; #ifdef XDG_PREFIX @@ -1680,7 +1632,7 @@ #endif #define SWAP_BE16_TO_LE16(val) (xdg_uint16_t)(((xdg_uint16_t)(val) << 8)|((xdg_uint16_t)(val) >> 8)) -@@ -68,6 +70,8 @@ +@@ -68,6 +70,8 @@ extern const char *const _xdg_utf8_skip; xdg_unichar_t _xdg_utf8_to_ucs4 (const char *source); xdg_unichar_t _xdg_ucs4_to_lower (xdg_unichar_t source); int _xdg_utf8_validate (const char *source); @@ -1689,3 +1641,148 @@ const char *_xdg_get_base_name (const char *file_name); #endif /* __XDG_MIME_INT_H__ */ +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.c.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.c +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.c.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.c 2008-07-24 10:42:40.000000000 -0400 +@@ -26,7 +26,7 @@ + */ + + #ifdef HAVE_CONFIG_H +-#include ++#include "config.h" + #endif + + #include +@@ -47,6 +47,10 @@ + #define TRUE (!FALSE) + #endif + ++#if !defined getc_unlocked && !defined HAVE_GETC_UNLOCKED ++# define getc_unlocked(fp) getc (fp) ++#endif ++ + typedef struct XdgMimeMagicMatch XdgMimeMagicMatch; + typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet; + +@@ -472,9 +476,7 @@ _xdg_mime_magic_parse_magic_line (FILE + /* We clean up the matchlet, byte swapping if needed */ + if (matchlet->word_size > 1) + { +-#if LITTLE_ENDIAN + int i; +-#endif + if (matchlet->value_length % matchlet->word_size != 0) + { + _xdg_mime_magic_matchlet_free (matchlet); +@@ -654,34 +656,24 @@ const char * + _xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic, + const void *data, + size_t len, ++ int *result_prio, + const char *mime_types[], + int n_mime_types) + { + XdgMimeMagicMatch *match; + const char *mime_type; + int n; +- int priority; +- int had_match; ++ int prio; + ++ prio = 0; + mime_type = NULL; +- priority = 0; +- had_match = 0; + for (match = mime_magic->match_list; match; match = match->next) + { + if (_xdg_mime_magic_match_compare_to_data (match, data, len)) + { +- if (!had_match || match->priority > priority || +- (mime_type != NULL && _xdg_mime_mime_type_subclass (match->mime_type, mime_type))) +- { +- mime_type = match->mime_type; +- priority = match->priority; +- } +- else if (had_match && match->priority == priority) +- /* multiple unrelated patterns with the same priority matched, +- * so we can't tell what type this is. */ +- mime_type = NULL; +- +- had_match = 1; ++ prio = match->priority; ++ mime_type = match->mime_type; ++ break; + } + else + { +@@ -702,6 +694,9 @@ _xdg_mime_magic_lookup_data (XdgMimeMagi + mime_type = mime_types[n]; + } + } ++ ++ if (result_prio) ++ *result_prio = prio; + + return mime_type; + } +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.h.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.h +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.h.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimemagic.h 2008-07-24 10:42:40.000000000 -0400 +@@ -33,12 +33,12 @@ + typedef struct XdgMimeMagic XdgMimeMagic; + + #ifdef XDG_PREFIX +-#define _xdg_mime_glob_read_from_file XDG_ENTRY(glob_read_from_file) +-#define _xdg_mime_magic_new XDG_ENTRY(magic_new) +-#define _xdg_mime_magic_read_from_file XDG_ENTRY(magic_read_from_file) +-#define _xdg_mime_magic_free XDG_ENTRY(magic_free) +-#define _xdg_mime_magic_get_buffer_extents XDG_ENTRY(magic_get_buffer_extents) +-#define _xdg_mime_magic_lookup_data XDG_ENTRY(magic_lookup_data) ++#define _xdg_mime_glob_read_from_file XDG_RESERVED_ENTRY(glob_read_from_file) ++#define _xdg_mime_magic_new XDG_RESERVED_ENTRY(magic_new) ++#define _xdg_mime_magic_read_from_file XDG_RESERVED_ENTRY(magic_read_from_file) ++#define _xdg_mime_magic_free XDG_RESERVED_ENTRY(magic_free) ++#define _xdg_mime_magic_get_buffer_extents XDG_RESERVED_ENTRY(magic_get_buffer_extents) ++#define _xdg_mime_magic_lookup_data XDG_RESERVED_ENTRY(magic_lookup_data) + #endif + + +@@ -50,6 +50,7 @@ int _xdg_mime_magic_get_buffer + const char *_xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic, + const void *data, + size_t len, ++ int *result_prio, + const char *mime_types[], + int n_mime_types); + +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.c.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.c +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.c.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.c 2008-07-24 10:42:40.000000000 -0400 +@@ -26,7 +26,7 @@ + */ + + #ifdef HAVE_CONFIG_H +-#include ++#include "config.h" + #endif + + #include "xdgmimeparent.h" +diff -up gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.h.xdgmime gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.h +--- gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.h.xdgmime 2008-03-10 15:12:45.000000000 -0400 ++++ gnome-vfs-2.22.0/libgnomevfs/xdgmimeparent.h 2008-07-24 10:42:40.000000000 -0400 +@@ -33,10 +33,11 @@ + typedef struct XdgParentList XdgParentList; + + #ifdef XDG_PREFIX +-#define _xdg_mime_parent_read_from_file XDG_ENTRY(parent_read_from_file) +-#define _xdg_mime_parent_list_new XDG_ENTRY(parent_list_new) +-#define _xdg_mime_parent_list_free XDG_ENTRY(parent_list_free) +-#define _xdg_mime_parent_list_lookup XDG_ENTRY(parent_list_lookup) ++#define _xdg_mime_parent_read_from_file XDG_RESERVED_ENTRY(parent_read_from_file) ++#define _xdg_mime_parent_list_new XDG_RESERVED_ENTRY(parent_list_new) ++#define _xdg_mime_parent_list_free XDG_RESERVED_ENTRY(parent_list_free) ++#define _xdg_mime_parent_list_lookup XDG_RESERVED_ENTRY(parent_list_lookup) ++#define _xdg_mime_parent_list_dump XDG_RESERVED_ENTRY(parent_list_dump) + #endif + + void _xdg_mime_parent_read_from_file (XdgParentList *list, From fedora-extras-commits at redhat.com Thu Jul 24 15:02:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 24 Jul 2008 15:02:10 GMT Subject: rpms/gnome-yum/devel gnome-yum.spec,1.8,1.9 Message-ID: <200807241502.m6OF2Aqg024901@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-yum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24763 Modified Files: gnome-yum.spec Log Message: fix license tag Index: gnome-yum.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-yum/devel/gnome-yum.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnome-yum.spec 11 Dec 2006 16:36:36 -0000 1.8 +++ gnome-yum.spec 24 Jul 2008 15:01:13 -0000 1.9 @@ -1,9 +1,9 @@ Summary: GNOME interface for YUM Name: gnome-yum Version: 0.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System -License: GPL +License: GPLv2+ Source0: http://prdownloads.sourceforge.net/g/gn/gnome-yum/%{name}-%{version}.tar.gz Url: http://gnome-yum.sourceforge.net Requires: usermode @@ -68,6 +68,9 @@ %attr(0755,root,root) %{_datadir}/gnome-yum/gyum-query.sh %changelog +* Thu Jul 24 2008 Tom "spot" Callaway - 0.1.4-2 +- fix license tag + * Sun Sep 24 2006 Andr??s T??th - 0.1.4-1 - Added User Manual (thanks for Sam S. Ganzha) - Added Czech translation (thanks for Lukas Novotny) From fedora-extras-commits at redhat.com Thu Jul 24 15:03:06 2008 From: fedora-extras-commits at redhat.com (James Bowes (jbowes)) Date: Thu, 24 Jul 2008 15:03:06 GMT Subject: rpms/python-vobject/devel .cvsignore, 1.11, 1.12 python-vobject.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <200807241503.m6OF36tQ024955@cvs-int.fedora.redhat.com> Author: jbowes Update of /cvs/extras/rpms/python-vobject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24894 Modified Files: .cvsignore python-vobject.spec sources Log Message: 0.7.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-vobject/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 11 Jun 2008 12:12:01 -0000 1.11 +++ .cvsignore 24 Jul 2008 15:02:09 -0000 1.12 @@ -1 +1 @@ -vobject-0.6.6.tar.gz +vobject-0.7.0.tar.gz Index: python-vobject.spec =================================================================== RCS file: /cvs/extras/rpms/python-vobject/devel/python-vobject.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-vobject.spec 11 Jun 2008 12:12:01 -0000 1.14 +++ python-vobject.spec 24 Jul 2008 15:02:09 -0000 1.15 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-vobject -Version: 0.6.6 +Version: 0.7.0 Release: 1%{?dist} Summary: A python library for manipulating vCard and vCalendar files @@ -51,6 +51,9 @@ %changelog +* Thu Jul 24 2008 James Bowes - 0.7.0-1 +- Update to 0.7.0 + * Wed Jun 11 2008 James Bowes - 0.6.6-1 - Update to 0.6.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-vobject/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 11 Jun 2008 12:12:01 -0000 1.11 +++ sources 24 Jul 2008 15:02:09 -0000 1.12 @@ -1 +1 @@ -4a57e8a819ca5477db3598e6ed12ef6f vobject-0.6.6.tar.gz +2678ed290cdcc72606062005ee25d950 vobject-0.7.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 15:04:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 24 Jul 2008 15:04:41 GMT Subject: rpms/gnome-vfs2-obexftp/devel gnome-vfs2-obexftp.spec,1.9,1.10 Message-ID: <200807241504.m6OF4f9N025148@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnome-vfs2-obexftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25068 Modified Files: gnome-vfs2-obexftp.spec Log Message: fix license tag Index: gnome-vfs2-obexftp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-vfs2-obexftp/devel/gnome-vfs2-obexftp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnome-vfs2-obexftp.spec 19 Feb 2008 04:26:32 -0000 1.9 +++ gnome-vfs2-obexftp.spec 24 Jul 2008 15:03:51 -0000 1.10 @@ -1,8 +1,8 @@ Summary: ObexFTP over Bluetooth support for GNOME Name: gnome-vfs2-obexftp Version: 0.4 -Release: 6%{?dist} -License: GPL +Release: 7%{?dist} +License: LGPLv2+ Group: Applications/Communications URL: http://www.gnome.org/ Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-obexftp/%{version}/gnome-vfs-obexftp-%{version}.tar.bz2 @@ -48,6 +48,9 @@ %{_libdir}/gnome-vfs-2.0/modules/*.so %changelog +* Thu Jul 24 2008 Tom "spot" Callaway - 0.4-7 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.4-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 24 15:12:09 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 15:12:09 GMT Subject: rpms/compiz/F-9 compiz.spec,1.122,1.123 Message-ID: <200807241512.m6OFC93K025658@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/compiz/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25634 Modified Files: compiz.spec Log Message: * Thu Jul 24 2008 Rex Dieter - 0.7.6-3.1 - (re)build for kde-4.1 Index: compiz.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz/F-9/compiz.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- compiz.spec 23 Jun 2008 15:55:11 -0000 1.122 +++ compiz.spec 24 Jul 2008 15:11:23 -0000 1.123 @@ -14,7 +14,7 @@ License: X11/MIT/GPL Group: User Interface/Desktops Version: 0.7.6 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +39,7 @@ BuildRequires: librsvg2-devel BuildRequires: metacity-devel >= 2.18 BuildRequires: mesa-libGLU-devel -BuildRequires: kdebase-workspace-devel +BuildRequires: kdebase-workspace-devel >= 4.0.80 BuildRequires: dbus-qt-devel BuildRequires: fuse-devel @@ -136,7 +136,7 @@ %endif #%patch110 -p1 -b .scale-key %patch111 -p1 -b .decoration-size -%patch112 -p1 -b .plasma +#patch112 -p1 -b .plasma %build rm -rf $RPM_BUILD_ROOT @@ -338,6 +338,9 @@ %changelog +* Thu Jul 24 2008 Rex Dieter - 0.7.6-3.1 +- (re)build for kde-4.1 + * Mon Jun 23 2008 Adel Gadllah - 0.7.6-3 - Speed up gconf schema installation From fedora-extras-commits at redhat.com Thu Jul 24 14:40:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:40:01 +0000 Subject: [pkgdb] gstreamer-plugins-base (Fedora OLPC, 3) updated by ausil Message-ID: <20080724144002.19FFE1AD0E9@bastion.fedora.phx.redhat.com> Dennis Gilmore (ausil) added a Fedora OLPC 3 branch for gstreamer-plugins-base Dennis Gilmore (ausil) has set commit to Approved for cvsextras on gstreamer-plugins-base (Fedora OLPC 3) Dennis Gilmore (ausil) has set build to Approved for cvsextras on gstreamer-plugins-base (Fedora OLPC 3) Dennis Gilmore (ausil) has set checkout to Approved for cvsextras on gstreamer-plugins-base (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-base From fedora-extras-commits at redhat.com Thu Jul 24 14:40:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:40:28 +0000 Subject: [pkgdb] ntp (Fedora OLPC, 3) updated by ausil Message-ID: <20080724144028.EE7BE1AD0F7@bastion.fedora.phx.redhat.com> Dennis Gilmore (ausil) added a Fedora OLPC 3 branch for ntp Dennis Gilmore (ausil) has set commit to Approved for cvsextras on ntp (Fedora OLPC 3) Dennis Gilmore (ausil) has set build to Approved for cvsextras on ntp (Fedora OLPC 3) Dennis Gilmore (ausil) has set checkout to Approved for cvsextras on ntp (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntp From fedora-extras-commits at redhat.com Thu Jul 24 14:40:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 14:40:43 +0000 Subject: [pkgdb] xorg-x11-utils (Fedora OLPC, 3) updated by ausil Message-ID: <20080724144043.A41B21AD0ED@bastion.fedora.phx.redhat.com> Dennis Gilmore (ausil) added a Fedora OLPC 3 branch for xorg-x11-utils Dennis Gilmore (ausil) has set commit to Approved for cvsextras on xorg-x11-utils (Fedora OLPC 3) Dennis Gilmore (ausil) has set build to Approved for cvsextras on xorg-x11-utils (Fedora OLPC 3) Dennis Gilmore (ausil) has set checkout to Approved for cvsextras on xorg-x11-utils (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-utils From fedora-extras-commits at redhat.com Thu Jul 24 15:18:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 24 Jul 2008 15:18:38 GMT Subject: rpms/gnubiff/devel gnubiff.spec,1.15,1.16 Message-ID: <200807241518.m6OFIc4R025949@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25900 Modified Files: gnubiff.spec Log Message: fix license tag Index: gnubiff.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnubiff/devel/gnubiff.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnubiff.spec 20 Feb 2008 00:52:43 -0000 1.15 +++ gnubiff.spec 24 Jul 2008 15:17:50 -0000 1.16 @@ -1,10 +1,10 @@ Name: gnubiff Version: 2.2.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A mail notification program Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://gnubiff.sourceforge.net/ Source0: http://belnet.dl.sourceforge.net/sourceforge/gnubiff/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -63,6 +63,9 @@ %{_mandir}/man1/* %changelog +* Thu Jul 24 2008 Tom "spot" Callaway - 2.2.7-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 2.2.7-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 24 15:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 24 Jul 2008 15:23:18 GMT Subject: rpms/gnugo/devel gnugo.spec,1.13,1.14 Message-ID: <200807241523.m6OFNImF026467@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnugo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26347 Modified Files: gnugo.spec Log Message: fix license tag Index: gnugo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/devel/gnugo.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnugo.spec 19 Feb 2008 23:15:11 -0000 1.13 +++ gnugo.spec 24 Jul 2008 15:22:22 -0000 1.14 @@ -1,11 +1,11 @@ Name: gnugo Version: 3.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Text based go program Group: Amusements/Games -License: GPL +License: GPLv2 URL: http://www.gnu.org/software/gnugo/gnugo.html Source0: http://ftp.gnu.org/gnu/gnugo/gnugo-3.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,6 +60,9 @@ %changelog +* Thu Jul 24 2008 Tom "spot" Callaway - 3.6-7 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 3.6-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 24 15:27:15 2008 From: fedora-extras-commits at redhat.com (James Bowes (jbowes)) Date: Thu, 24 Jul 2008 15:27:15 GMT Subject: rpms/python-elixir/devel .cvsignore, 1.6, 1.7 python-elixir.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200807241527.m6OFRFm0026845@cvs-int.fedora.redhat.com> Author: jbowes Update of /cvs/extras/rpms/python-elixir/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26745 Modified Files: .cvsignore python-elixir.spec sources Log Message: 0.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-elixir/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 Apr 2008 13:29:54 -0000 1.6 +++ .cvsignore 24 Jul 2008 15:26:29 -0000 1.7 @@ -1 +1 @@ -Elixir-0.5.2.tar.gz +Elixir-0.6.0.tar.gz Index: python-elixir.spec =================================================================== RCS file: /cvs/extras/rpms/python-elixir/devel/python-elixir.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-elixir.spec 5 Apr 2008 13:29:54 -0000 1.5 +++ python-elixir.spec 24 Jul 2008 15:26:29 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-elixir -Version: 0.5.2 +Version: 0.6.0 Release: 1%{?dist} Summary: A declarative mapper for SQLAlchemy @@ -54,6 +54,9 @@ %changelog +* Thu Jul 24 2008 James Bowes 0.6.0-1 +- Update to 0.6.0 + * Sat Apr 05 2008 James Bowes 0.5.2-1 - Update to 0.5.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-elixir/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Apr 2008 13:29:54 -0000 1.6 +++ sources 24 Jul 2008 15:26:29 -0000 1.7 @@ -1 +1 @@ -ea37e917896dce419f777d17afc43fce Elixir-0.5.2.tar.gz +b5f5cf5b8c0b98e45e903f9910b3d49e Elixir-0.6.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 15:29:19 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 24 Jul 2008 15:29:19 GMT Subject: rpms/control-center/devel control-center.spec, 1.377, 1.378 background-location.patch, 1.1, NONE gnome-control-center-2.19.90-no-warnings.patch, 1.1, NONE Message-ID: <200807241529.m6OFTJa0027098@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27000 Modified Files: control-center.spec Removed Files: background-location.patch gnome-control-center-2.19.90-no-warnings.patch Log Message: * Thu Jul 24 2008 - Bastien Nocera - 2.23.4-5 - Remove some obsolete patches Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- control-center.spec 14 Jul 2008 21:20:48 -0000 1.377 +++ control-center.spec 24 Jul 2008 15:28:33 -0000 1.378 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.4 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -355,6 +355,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Thu Jul 24 2008 - Bastien Nocera - 2.23.4-5 +- Remove some obsolete patches + * Mon Jul 14 2008 Matthias Clasen - 2.23.4-4 - Drop some obsolete patches - Fix an issue with the notification-theme support (#455329) --- background-location.patch DELETED --- --- gnome-control-center-2.19.90-no-warnings.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 15:29:44 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Thu, 24 Jul 2008 15:29:44 GMT Subject: rpms/sectool/devel .cvsignore, 1.11, 1.12 sectool.spec, 1.13, 1.14 sources, 1.11, 1.12 Message-ID: <200807241529.m6OFTixT027123@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sectool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27034 Modified Files: .cvsignore sectool.spec sources Log Message: fix conflict Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Jul 2008 10:25:08 -0000 1.11 +++ .cvsignore 24 Jul 2008 15:28:53 -0000 1.12 @@ -1 +1 @@ -sectool-0.8.0.tar.bz2 +sectool-0.8.5.tar.bz2 Index: sectool.spec =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sectool.spec 18 Jul 2008 13:11:26 -0000 1.13 +++ sectool.spec 24 Jul 2008 15:28:53 -0000 1.14 @@ -1,13 +1,13 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.8.0 -Release: 2%{?dist} +Version: 0.8.5 +Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 License: GPLv2+ Group: Applications/System Requires: python2 gettext coreutils rpm-python -BuildRequires: desktop-file-utils gettext intltool rpm-devel +BuildRequires: desktop-file-utils gettext intltool rpm-devel asciidoc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package gui @@ -42,8 +42,9 @@ --vendor=fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/sectool.desktop #adjust paths in sectool.conf -sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf -sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf +sed -i 's,DSC_DIR=\(.*\),DSC_DIR=%{_sysconfdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf +sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf +sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf #adjust icons path in guiOutput.py sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py @@ -59,8 +60,8 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc COPYING AUTHORS README -%config %{_sysconfdir}/sectool.conf +%doc COPYING AUTHORS README doc/tests_documentation.html +%config %{_sysconfdir}/sectool/ %dir %{_localstatedir}/lib/sectool %dir %{_datadir}/sectool %{_sbindir}/sectool @@ -91,6 +92,9 @@ %changelog +* Thu Jul 24 2008 Peter Vrabec - 0.8.5-1 +- upgrade + * Fri Jul 18 2008 Caol??n McNamara - 0.8.0-2 - rebuild for new rpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Jul 2008 10:25:08 -0000 1.11 +++ sources 24 Jul 2008 15:28:53 -0000 1.12 @@ -1 +1 @@ -f6d96b2fff95ca973914f9a911848e19 sectool-0.8.0.tar.bz2 +3e155945378b8c44ea0bff85fb66f38b sectool-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 15:34:57 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Thu, 24 Jul 2008 15:34:57 GMT Subject: rpms/sectool/F-9 .cvsignore, 1.11, 1.12 sectool.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <200807241534.m6OFYvZ7027687@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sectool/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27593 Modified Files: .cvsignore sectool.spec sources Log Message: upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sectool/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Jul 2008 10:09:46 -0000 1.11 +++ .cvsignore 24 Jul 2008 15:34:15 -0000 1.12 @@ -1 +1 @@ -sectool-0.8.0.tar.bz2 +sectool-0.8.5.tar.bz2 Index: sectool.spec =================================================================== RCS file: /cvs/extras/rpms/sectool/F-9/sectool.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sectool.spec 3 Jul 2008 10:09:46 -0000 1.12 +++ sectool.spec 24 Jul 2008 15:34:15 -0000 1.13 @@ -1,13 +1,13 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.8.0 +Version: 0.8.5 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 License: GPLv2+ Group: Applications/System Requires: python2 gettext coreutils rpm-python -BuildRequires: desktop-file-utils gettext intltool rpm-devel +BuildRequires: desktop-file-utils gettext intltool rpm-devel asciidoc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package gui @@ -42,8 +42,9 @@ --vendor=fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/sectool.desktop #adjust paths in sectool.conf -sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf -sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf +sed -i 's,DSC_DIR=\(.*\),DSC_DIR=%{_sysconfdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf +sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf +sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf #adjust icons path in guiOutput.py sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py @@ -59,8 +60,8 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc COPYING AUTHORS README -%config %{_sysconfdir}/sectool.conf +%doc COPYING AUTHORS README doc/tests_documentation.html +%config %{_sysconfdir}/sectool/ %dir %{_localstatedir}/lib/sectool %dir %{_datadir}/sectool %{_sbindir}/sectool @@ -91,6 +92,9 @@ %changelog +* Thu Jul 24 2008 Peter Vrabec - 0.8.5-1 +- upgrade + * Thu Jul 03 2008 Peter Vrabec - 0.8.0-1 - upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/sectool/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Jul 2008 10:09:46 -0000 1.11 +++ sources 24 Jul 2008 15:34:15 -0000 1.12 @@ -1 +1 @@ -f6d96b2fff95ca973914f9a911848e19 sectool-0.8.0.tar.bz2 +3e155945378b8c44ea0bff85fb66f38b sectool-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 15:42:30 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 15:42:30 GMT Subject: rpms/kdeedu/F-9 kdeedu.spec,1.104,1.105 Message-ID: <200807241542.m6OFgUjj028442@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28345 Modified Files: kdeedu.spec Log Message: * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- kdeedu.spec 7 Jul 2008 13:10:10 -0000 1.104 +++ kdeedu.spec 24 Jul 2008 15:41:44 -0000 1.105 @@ -13,8 +13,8 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.0.99 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Games @@ -22,7 +22,8 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: kdeedu-4.0.4-cfitsio.patch +# fix cfitsio detection by using pkgconfig +Patch0: kdeedu-4.0.4-cfitsio.patch # http://bugzilla.redhat.com/371121 Obsoletes: kalgebra < 1:0.7-7 @@ -43,17 +44,24 @@ BuildRequires: desktop-file-utils BuildRequires: eigen-devel BuildRequires: giflib-devel +BuildRequires: gmm-devel BuildRequires: gpsd-devel +BuildRequires: gsl-devel +# for libplasma +BuildRequires: kdebase-workspace-devel >= %{version} BuildRequires: kdelibs4-devel >= %{version} # for macros.kde4 BuildRequires: kde-filesystem BuildRequires: libnova-devel +BuildRequires: libqalculate-devel BuildRequires: libusb-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel %if 0%{?with_facile} BuildRequires: ocaml(compiler) BuildRequires: ocaml-facile-devel %endif -BuildRequires: openbabel-devel +BuildRequires: openbabel-devel >= 2.2.0-0.4.b5 BuildRequires: pcre-devel BuildRequires: python-devel python BuildRequires: readline-devel @@ -61,28 +69,28 @@ #+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +# split pkgs, (temporary?) upgrade path -- Rex +Requires: %{name}-kstars = %{version}-%{release} +Requires: %{name}-math = %{version}-%{release} Requires(post): xdg-utils Requires(postun): xdg-utils %description Educational/Edutainment applications: * blinken: Simon Says Game -* kalgebra: MathML-based graph calculator -* kbruch: Exercise Fractions -* kgeography: Geography Trainer +* kalzium: A periodic table of the elements +* kanagram: Anagram game +* kgeography: Learn geography * khangman: Hangman Game -* kig: Interactive Geometry * kiten: Japanese Reference/Study Tool * klettres: French alphabet tutor -* kmplot: Mathematical Function Plotter -* kpercentage: Excersie Percentages -* kstars: Desktop Planetarium -* ktouch: Touch Typing Tutor +* ktouch: Learn and practice touch typing * kturtle: Logo Programming Environment -* kvoctrain: Vocabulary Trainer -* kwordquiz: Vocabulary Trainer -* marble: Virtual Globe +* kwordquiz: Flashcard and vocabulary learning +* marble: A World Atlas +* parley: Vocabulary Trainer +* step: Interactive physical simulator %package libs Summary: Runtime libraries for %{name} @@ -93,7 +101,7 @@ %package devel Group: Development/Libraries Summary: Developer files for %{name} -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Obsoletes: kdeedu4-devel < %{version}-%{release} Provides: kdeedu4-devel = %{version}-%{release} # http://bugzilla.redhat.com/394011 @@ -105,11 +113,34 @@ %description devel %{summary}. +%package kstars +Group: Amusements/Games +Summary: Desktop Planetarium +Requires: %{name}-libs = %{version}-%{release} +Requires(post): xdg-utils +Requires(postun): xdg-utils +%description kstars +%{summary}. + +%package math +Group: Amusements/Games +Summary: Math applications +Requires: %{name}-libs = %{version}-%{release} +Requires(post): xdg-utils +Requires(postun): xdg-utils +Provides: kdeedu4-math = %{version}-%{release} +%description math +Educational/Edutainment Math applications: +* kalgebra: MathML-based graph calculator +* kbruch: Exercise Fractions +* kig: Interactive Geometry +* kmplot: Mathematical Function Plotter +* kpercentage: Excersize Percentages + %prep %setup -q -n kdeedu-%{version} - -%patch1 -p1 -b .cfitsio +%patch0 -p1 -b .cfitsio %build @@ -119,9 +150,7 @@ %{cmake_kde4} .. popd -# smp build busted? -make -k %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 || \ - make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -129,6 +158,10 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} +# #unpackaged files +# omit stuff for which there isn't a clear public API +rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,compoundviewer,htmesh,sbigudrv}.{a,so} + %post xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : @@ -144,6 +177,18 @@ %postun libs -p /sbin/ldconfig +%post kstars +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%postun kstars +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%post math +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%postun math +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + %clean rm -rf %{buildroot} @@ -151,44 +196,260 @@ %files %defattr(-,root,root,-) -%doc COPYING README -%{_kde4_bindir}/* -%{_kde4_appsdir}/* -%{_kde4_configdir}/* -%{_kde4_datadir}/applications/kde4/* -%{_kde4_datadir}/config.kcfg/* -%{_kde4_datadir}/kde4/services/*.desktop -%{_kde4_docdir}/HTML/en/* -%{_kde4_iconsdir}/hicolor/*/*/* +# FIXME/TODO : sort file list into per-app sections. ? -- Rex +%{_kde4_bindir}/blinken +%{_kde4_bindir}/geodatatest +%{_kde4_bindir}/indi* +%{_kde4_bindir}/kalzium +%{_kde4_bindir}/kanagram +%{_kde4_bindir}/kgeography +%{_kde4_bindir}/khangman +%{_kde4_bindir}/kiten +%{_kde4_bindir}/kitengen +%{_kde4_bindir}/kitenradselect +%{_kde4_bindir}/klettres +%{_kde4_bindir}/ktouch +%{_kde4_bindir}/kturtle +%{_kde4_bindir}/kwordquiz +%{_kde4_bindir}/marble +%{_kde4_bindir}/parley +%{_kde4_bindir}/step +%{_kde4_bindir}/tilecreator + +# FIXME? +%{_kde4_appsdir}/desktoptheme/ +%{_kde4_appsdir}/blinken/ +%{_kde4_appsdir}/kalzium/ +%{_kde4_appsdir}/kanagram/ +%{_kde4_appsdir}/kgeography/ +%{_kde4_appsdir}/khangman/ +%{_kde4_appsdir}/kiten/ +%{_kde4_appsdir}/kitenradselect/ +%{_kde4_appsdir}/klettres/ +%{_kde4_appsdir}/ktouch/ +%{_kde4_appsdir}/kturtle/ +%{_kde4_appsdir}/kvtml/ +%{_kde4_appsdir}/kwordquiz/ +%{_kde4_appsdir}/marble/ +%{_kde4_appsdir}/marble_part/ +%{_kde4_appsdir}/parley/ +%{_kde4_appsdir}/step/ + +%{_kde4_datadir}/kde4/services/marble_part.desktop +%{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop +%{_kde4_datadir}/kde4/services/plasma_parley.desktop + +%{_kde4_libdir}/kde4/libmarble_part.so +%{_kde4_libdir}/kde4/plasma_applet_kalgebra.so +%{_kde4_libdir}/kde4/plasma_applet_parley.so +%{_kde4_libdir}/kde4/plasma_engine_parley.so +%{_kde4_datadir}/applications/kde4/blinken.desktop +%{_kde4_datadir}/applications/kde4/kalzium.desktop +%{_kde4_datadir}/applications/kde4/kanagram.desktop +%{_kde4_datadir}/applications/kde4/kgeography.desktop +%{_kde4_datadir}/applications/kde4/khangman.desktop +%{_kde4_datadir}/applications/kde4/kiten.desktop +%{_kde4_datadir}/applications/kde4/klettres.desktop +%{_kde4_datadir}/applications/kde4/ktouch.desktop +%{_kde4_datadir}/applications/kde4/kturtle.desktop +%{_kde4_datadir}/applications/kde4/kwordquiz.desktop +%{_kde4_datadir}/applications/kde4/marble.desktop +%{_kde4_datadir}/applications/kde4/parley.desktop +%{_kde4_datadir}/applications/kde4/step.desktop + +%{_kde4_datadir}/config.kcfg/blinken.kcfg +%{_kde4_datadir}/config.kcfg/documentsettings.kcfg +%{_kde4_datadir}/config.kcfg/kalzium.kcfg +%{_kde4_datadir}/config.kcfg/kanagram.kcfg +%{_kde4_datadir}/config.kcfg/kgeography.kcfg +%{_kde4_datadir}/config.kcfg/khangman.kcfg +%{_kde4_datadir}/config.kcfg/kiten.kcfg +%{_kde4_datadir}/config.kcfg/klettres.kcfg +%{_kde4_datadir}/config.kcfg/ktouch.kcfg +%{_kde4_datadir}/config.kcfg/kwordquiz.kcfg +%{_kde4_datadir}/config.kcfg/languagesettings.kcfg +%{_kde4_datadir}/config.kcfg/marble.kcfg +%{_kde4_datadir}/config.kcfg/parley.kcfg +%{_kde4_datadir}/config.kcfg/step.kcfg +%{_kde4_datadir}/config/kalzium.knsrc +%{_kde4_datadir}/config/kanagram.knsrc +%{_kde4_datadir}/config/khangman.knsrc +%{_kde4_datadir}/config/klettres.knsrc +%{_kde4_datadir}/config/kwordquiz.knsrc +%{_kde4_datadir}/config/parley.knsrc +%{_kde4_datadir}/config/step.knsrc + +%{_kde4_docdir}/HTML/en/blinken/ +%{_kde4_docdir}/HTML/en/kalzium/ +%{_kde4_docdir}/HTML/en/kanagram/ +%{_kde4_docdir}/HTML/en/kgeography/ +%{_kde4_docdir}/HTML/en/khangman/ +%{_kde4_docdir}/HTML/en/kiten/ +%{_kde4_docdir}/HTML/en/klettres/ +%{_kde4_docdir}/HTML/en/ktouch/ +%{_kde4_docdir}/HTML/en/kturtle +%{_kde4_docdir}/HTML/en/kwordquiz/ +%{_kde4_docdir}/HTML/en/marble/ +%{_kde4_docdir}/HTML/en/parley/ +%{_kde4_docdir}/HTML/en/step/ + +%{_kde4_iconsdir}/hicolor/*/*/blinken.* +%{_kde4_iconsdir}/hicolor/*/*/kalzium.* +%{_kde4_iconsdir}/hicolor/*/*/kanagram.* +%{_kde4_iconsdir}/hicolor/*/*/kgeography.* +%{_kde4_iconsdir}/hicolor/*/*/khangman.* +%{_kde4_iconsdir}/hicolor/*/*/kiten.* +%{_kde4_iconsdir}/hicolor/*/*/klettres.* +%{_kde4_iconsdir}/hicolor/*/*/ktouch.* +%{_kde4_iconsdir}/hicolor/*/*/kturtle.* +%{_kde4_iconsdir}/hicolor/*/*/kwordquiz.* +%{_kde4_iconsdir}/hicolor/*/*/marble.* +%{_kde4_iconsdir}/hicolor/*/*/parley*.* +%{_kde4_iconsdir}/hicolor/*/*/step.* %{_kde4_iconsdir}/oxygen/*/*/* -%{_kde4_libdir}/kde4/* + %{_kde4_libdir}/avogadro-kalzium/ -%{_datadir}/dbus-1/interfaces/* +# marble +%{_kde4_libdir}/libcompoundviewer.so.* %files libs %defattr(-,root,root,-) -%{_kde4_libdir}/lib*.so.* +%doc COPYING README +%{_kde4_libdir}/libanalitza.so.* +%{_kde4_libdir}/libavogadro-kalzium.so.* +%{_kde4_libdir}/libkdeedu*.so.* +%{_kde4_libdir}/libkeduvocdocument.so.* +%{_kde4_libdir}/libkiten.so.* +%{_kde4_libdir}/libmarble*.so.* +%{_kde4_libdir}/libsbigudrv.so.* +%{_kde4_libdir}/libscience.so.* +%{_kde4_appsdir}/libkdeedu/ +%{_kde4_libdir}/kde4/plugins/marble/ %files devel %defattr(-,root,root,-) -%{_kde4_includedir}/* +%{_kde4_appsdir}/cmake/modules +%{_kde4_includedir}/libkdeedu/ +%{_kde4_includedir}/libkiten/ %{_includedir}/marble/ -%{_kde4_libdir}/lib*.so -%{_kde4_libdir}/libhtmesh.a +%{_kde4_libdir}/libavogadro-kalzium.so +%{_kde4_libdir}/libkdeedu*.so +%{_kde4_libdir}/libkeduvocdocument.so +%{_kde4_libdir}/libkiten.so +%{_kde4_libdir}/libmarble*.so +%{_kde4_libdir}/libscience.so +%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so + +%files kstars +%defattr(-,root,root,-) +%{_kde4_bindir}/kstars +%{_kde4_datadir}/applications/kde4/kstars.desktop +%{_kde4_datadir}/config.kcfg/kstars.kcfg +%{_kde4_configdir}/kstars.knsrc +%{_kde4_docdir}/HTML/en/kstars/ +%{_kde4_appsdir}/kstars/ +%{_kde4_iconsdir}/hicolor/*/*/kstars.* +%{_kde4_libdir}/libSatLib.so.* + +%files math +%defattr(-,root,root,-) +%doc COPYING README +%{_kde4_bindir}/calgebra +%{_kde4_bindir}/kalgebra +%{_kde4_bindir}/kbruch +%{_kde4_bindir}/kig +%{_kde4_bindir}/kmplot +%{_kde4_bindir}/kpercentage +%{_kde4_bindir}/pykig.* +%{_kde4_libdir}/kde4/kigpart.* +%{_kde4_libdir}/kde4/libkmplotpart.* +%{_kde4_datadir}/applications/kde4/kalgebra.desktop +%{_kde4_datadir}/applications/kde4/kbruch.desktop +%{_kde4_datadir}/applications/kde4/kig.desktop +%{_kde4_datadir}/applications/kde4/kmplot.desktop +%{_kde4_datadir}/applications/kde4/kpercentage.desktop +%{_kde4_datadir}/config.kcfg/kbruch.kcfg +%{_kde4_datadir}/config.kcfg/kmplot.kcfg +%{_datadir}/dbus-1/interfaces/org.kde.kmplot.* +%{_kde4_docdir}/HTML/en/kpercentage/ +%{_kde4_docdir}/HTML/en/kalgebra/ +%{_kde4_docdir}/HTML/en/kbruch/ +%{_kde4_docdir}/HTML/en/kig/ +%{_kde4_docdir}/HTML/en/kmplot/ +%{_kde4_iconsdir}/hicolor/*/*/kalgebra.* +%{_kde4_iconsdir}/hicolor/*/*/kbruch.* +%{_kde4_iconsdir}/hicolor/*/*/kig.* +%{_kde4_iconsdir}/hicolor/*/*/kmplot.* +%{_kde4_iconsdir}/hicolor/*/*/kpercentage.* +%{_kde4_iconsdir}/hicolor/*/*/application-x-kig.* +%{_kde4_appsdir}/katepart/syntax/python-kig.xml +%{_kde4_appsdir}/kbruch/ +%{_kde4_appsdir}/kig/ +%{_kde4_appsdir}/kmplot/ +%{_kde4_appsdir}/kpercentage/ +%{_kde4_datadir}/kde4/services/kalgebraplasmoid.desktop +%{_kde4_datadir}/kde4/services/kig_part.desktop +%{_kde4_datadir}/kde4/services/kmplot_part.desktop %changelog -* Mon Jul 07 2008 Kevin Kofler 4.0.5-2 +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Mon Jul 07 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Mon Jul 07 2008 Kevin Kofler 4.0.84-2 - rebuild for new OpenBabel -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Thu Jun 26 2008 Rex Dieter 4.0.83-2 +- %%description: update for new apps +- -math subpkg (#446093) +- -devel: omit a few lib*.so symlinks for those with non-public apis +- -devel: move designer plugins here + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sun Jun 15 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Fri Jun 06 2008 Kevin Kofler 4.0.80-5 +- BR OpenBabel 2.2.0 beta5, drop build fix hack for beta 4 + +* Thu Jun 05 2008 Kevin Kofler 4.0.80-4 +- backport upstream fix for Step build + +* Tue Jun 03 2008 Kevin Kofler 4.0.80-3 +- add BR gmm-devel, libqalculate-devel and gsl-devel for Step + +* Tue May 27 2008 Kevin Kofler 4.0.80-2 +- patch to build against OpenBabel 2.2.0 beta4 + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Fri May 23 2008 Kevin Kofler 4.0.72-3 +- put unversioned libanalitza.so in -libs instead of -devel (#448035) + +* Thu May 08 2008 Rex Dieter 4.0.72-2 +- -kstars subpkg (#432317) -* Wed May 07 2008 Rex Dieter 4.0.4-2 -- still need cfitsio patch +* Thu May 08 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 +- use pkgconfig for cfitsio patch now that cfitsio.pc has been fixed +- add BR kdebase-workspace-devel for plasmoids +- add BR libxml2-devel, libxslt-devel for Parley HTML export +- BR new minimum version of openbabel-devel -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Wed Apr 23 2008 Kevin Kofler 4.0.3-4 +- rebuild for new ocaml (3.10.2) * Thu Apr 03 2008 Kevin Kofler 4.0.3-3 - rebuild (again) for the fixed %%{_kde4_buildtype} From fedora-extras-commits at redhat.com Thu Jul 24 15:53:56 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 24 Jul 2008 15:53:56 GMT Subject: rpms/control-center/devel gcc-libcanberra-support-5.patch, NONE, 1.1 control-center.spec, 1.378, 1.379 control-center-2.20.0-enable-sound-by-default.patch, 1.2, NONE Message-ID: <200807241553.m6OFruT3029068@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29017 Modified Files: control-center.spec Added Files: gcc-libcanberra-support-5.patch Removed Files: control-center-2.20.0-enable-sound-by-default.patch Log Message: * Thu Jul 24 2008 - Bastien Nocera - 2.23.4-6 - Add patch to support the Free Desktop sound theme spec - Remove gnome-vfs-methods as per upstream gcc-libcanberra-support-5.patch: --- NEW FILE gcc-libcanberra-support-5.patch --- Index: configure.in =================================================================== --- configure.in (revision 8792) +++ configure.in (working copy) @@ -242,30 +242,6 @@ AM_GCONF_SOURCE_2 dnl ============================================== -dnl Esd section -dnl ============================================== -have_esd=no -AC_ARG_ENABLE(esd, - AC_HELP_STRING([--disable-esd], - [turn off ESD audio support]), - [case "${enableval}" in - yes) WANT_ESD=yes ;; - no) WANT_ESD=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-esd) ;; - esac], - [WANT_ESD=yes]) dnl Default value - -if test x$WANT_ESD = xyes ; then - PKG_CHECK_MODULES(ESD, esound >= 0.2.28, - have_esd=yes - AC_DEFINE(HAVE_ESD, 1, [Define if ESD sound server should be used]), - AC_MSG_RESULT([disabled])) -fi - -AC_SUBST(ESD_CFLAGS) -AC_SUBST(ESD_LIBS) - -dnl ============================================== dnl GStreamer section dnl ============================================== GST_MAJORMINOR=auto @@ -300,15 +276,22 @@ AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) -if test "x$have_gstreamer" = "xyes"; then - SOUND_CAPPLET_LIBS="$ESD_LIBS $GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10" - SOUND_CAPPLET_CFLAGS="$ESD_CFLAGS $GST_CFLAGS" +dnl ============================================== +dnl sound capplet section +dnl ============================================== + +PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk gio-2.0, have_canberra=yes, AC_MSG_RESULT([no])) + +if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then + SOUND_CAPPLET_LIBS="$GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10" + SOUND_CAPPLET_CFLAGS="$GST_CFLAGS" AC_SUBST(SOUND_CAPPLET_LIBS) AC_SUBST(SOUND_CAPPLET_CFLAGS) else AC_MSG_NOTICE([*** Sound capplet will not be built]); fi + dnl ============================================== dnl Define the main variables dnl ============================================== @@ -377,7 +360,6 @@ help/Makefile libslab/Makefile libslab/libslab.pc -libsounds/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in Index: Makefile.am =================================================================== --- Makefile.am (revision 8792) +++ Makefile.am (working copy) @@ -1,4 +1,4 @@ -SUBDIRS = po libsounds libwindow-settings libslab capplets shell help vfs-methods $(TYPING_BREAK) +SUBDIRS = po libwindow-settings libslab capplets shell help $(TYPING_BREAK) ACLOCAL_AMFLAGS = -I m4 Index: capplets/sound/sound-theme-file-utils.c =================================================================== --- capplets/sound/sound-theme-file-utils.c (revision 0) +++ capplets/sound/sound-theme-file-utils.c (revision 0) @@ -0,0 +1,154 @@ +/* -*- mode: c; style: linux -*- */ +/* -*- c-basic-offset: 2 -*- */ + +/* sound-theme-file-utils.c + * Copyright (C) 2008 Bastien Nocera + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include +#include + +#define CUSTOM_THEME_NAME "__custom" + +GFile * +custom_theme_dir_path (void) +{ + const char *data_dir; + GFile *file; + char *dir; + + data_dir = g_get_user_data_dir (); + dir = g_build_filename (data_dir, "sounds", CUSTOM_THEME_NAME, NULL); + file = g_file_new_for_path (dir); + g_free (dir); + + return file; +} + +void +delete_custom_theme_dir (void) +{ + GFile *file; + + file = custom_theme_dir_path (); + /* FIXME we shouldn't be using the trash here, but it's faster/easier */ + g_file_trash (file, NULL, NULL); + g_object_unref (file); + + g_message ("deleted the custom theme dir"); +} + +static void +delete_one_file (GFile *parent, const char *sound_name, const char *pattern) +{ + GFile *file; + char *name; + + name = g_strdup_printf (pattern, sound_name); + file = g_file_get_child (parent, name); + g_free (name); + /* FIXME we shouldn't be using the trash here, but it's faster/easier */ + g_file_trash (file, NULL, NULL); + g_object_unref (file); +} + +void +delete_old_files (char **sounds) +{ + static const char *patterns[] = { "%s.ogg", "%s.wav", NULL }; + GFile *dir; + guint i, j; + + dir = custom_theme_dir_path (); + for (i = 0; sounds[i] != NULL; i++) { + for (j = 0; patterns[j] != NULL; j++) { + delete_one_file (dir, sounds[i], patterns[j]); + } + } + g_object_unref (dir); +} + +void +delete_disabled_files (char **sounds) +{ + GFile *dir; + guint i; + + dir = custom_theme_dir_path (); + for (i = 0; sounds[i] != NULL; i++) + delete_one_file (dir, sounds[i], "%s.disabled"); + g_object_unref (dir); +} + +static void +create_one_file (GFile *file) +{ + GFileOutputStream* stream; + + stream = g_file_create (file, G_FILE_CREATE_NONE, NULL, NULL); + if (stream != NULL) { + g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, NULL); + g_object_unref (stream); + } +} + +void +add_disabled_file (char **sounds) +{ + GFile *dir; + guint i; + [...1745 lines suppressed...] + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + char **sound_names; + + gtk_tree_model_get (model, iter, SOUND_NAMES_COL, &sound_names, -1); + if (sound_names != NULL) { + char *filename; + int type; + + type = get_file_type (sound_names[0], &filename); + + gtk_tree_store_set (GTK_TREE_STORE (model), iter, + SETTING_COL, type, + FILENAME_COL, filename, + -1); + g_strfreev (sound_names); + } + return FALSE; +} + +void +setup_sound_theme_custom (GladeXML *dialog, gboolean have_xkb) +{ + GtkTreeStore *store; + GtkTreeModel *custom_model; + GtkTreeViewColumn *column; + GtkCellRenderer *renderer; + GtkTreeIter iter, parent; + GConfClient *client; + CategoryType type; + gboolean input_feedback_enabled, audible_bell_enabled; + int visual_bell_setting; + char *theme_name; + guint i; + + client = gconf_client_get_default (); + visual_bell_setting = visual_bell_gconf_to_setting (client); + + /* Set up the model for the custom view */ + store = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRV); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Display", renderer, "text", DISPLAY_COL, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("sounds_treeview")), column); + + renderer = gtk_cell_renderer_combo_new(); + g_signal_connect (renderer, "edited", G_CALLBACK (setting_column_edited), dialog); + g_signal_connect (renderer, "editing-started", G_CALLBACK (combobox_editing_started), dialog); + custom_model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT)); + fill_custom_model (GTK_LIST_STORE (custom_model)); + g_object_set (renderer, "model", custom_model, "has-entry", FALSE, "editable", TRUE, "text-column", 0, NULL); + column = gtk_tree_view_column_new_with_attributes ("Setting", renderer, "editable", EDITABLE_COL, "visible", TRUE, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("sounds_treeview")), column); + gtk_tree_view_column_set_cell_data_func (column, renderer, setting_set_func, NULL, NULL); + + gtk_tree_view_set_model (GTK_TREE_VIEW (WID ("sounds_treeview")), GTK_TREE_MODEL (store)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (WID ("sounds_treeview")), FALSE); + + /* Fill in the model */ + type = CATEGORY_INVALID; + + for (i = 0; ; i++) { + GtkTreeIter *_parent; + + if (sounds[i].category == -1) + break; + + if (sounds[i].type == SOUND_TYPE_VISUAL_BELL && have_xkb == FALSE) + continue; + + /* Is it a new type of sound? */ + if (sounds[i].category == type && type != CATEGORY_INVALID && type != CATEGORY_BELL) + _parent = &parent; + else + _parent = NULL; + + if (sounds[i].type == SOUND_TYPE_VISUAL_BELL) + gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT, + DISPLAY_COL, _(sounds[i].display_name), + SETTING_COL, visual_bell_setting, + TYPE_COL, sounds[i].type, + EDITABLE_COL, TRUE, + -1); + else if (sounds[i].type != -1) + gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT, + DISPLAY_COL, _(sounds[i].display_name), + SETTING_COL, SOUND_BUILTIN, + TYPE_COL, sounds[i].type, + SOUND_NAMES_COL, sounds[i].names, + EDITABLE_COL, TRUE, + -1); + else + /* Category */ + gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT, + DISPLAY_COL, _(sounds[i].display_name), + SETTING_COL, SOUND_UNSET, + TYPE_COL, sounds[i].type, + EDITABLE_COL, FALSE, + -1); + + /* If we didn't set a parent already, set one in case we need it later */ + if (_parent == NULL) + parent = iter; + type = sounds[i].category; + } + + gtk_tree_view_expand_all (GTK_TREE_VIEW (WID ("sounds_treeview"))); + + /* Listen to GConf for a bunch of keys */ + input_feedback_enabled = gconf_client_get_bool (client, INPUT_SOUNDS_KEY, NULL); + if (input_feedback_enabled == FALSE) + set_input_feedback_enabled (dialog, FALSE); + gconf_client_notify_add (client, INPUT_SOUNDS_KEY, + (GConfClientNotifyFunc) input_feedback_changed_cb, dialog, NULL, NULL); + + audible_bell_enabled = gconf_client_get_bool (client, AUDIO_BELL_KEY, NULL); + if (audible_bell_enabled == FALSE) + set_audible_bell_enabled (dialog, FALSE); + gconf_client_notify_add (client, AUDIO_BELL_KEY, + (GConfClientNotifyFunc) audible_bell_changed_cb, dialog, NULL, NULL); + + /* Setup the default values if we're using the custom theme */ + theme_name = gconf_client_get_string (client, SOUND_THEME_KEY, NULL); + if (theme_name != NULL && strcmp (theme_name, CUSTOM_THEME_NAME) == 0) + gtk_tree_model_foreach (GTK_TREE_MODEL (store), theme_changed_custom_init, NULL); + g_free (theme_name); + + g_object_unref (G_OBJECT (client)); +} + Index: capplets/sound/Makefile.am =================================================================== --- capplets/sound/Makefile.am (revision 8792) +++ capplets/sound/Makefile.am (working copy) @@ -4,15 +4,23 @@ bin_PROGRAMS = gnome-sound-properties gnome_sound_properties_LDADD = \ - $(top_builddir)/libsounds/libsounds.la \ $(GNOMECC_CAPPLETS_LIBS) \ - $(SOUND_CAPPLET_LIBS) \ + $(CANBERRA_LIBS) $(SOUND_CAPPLET_LIBS) \ $(HAL_LIBS) -gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pipeline-tests.c mixer-support.h mixer-support.c +gnome_sound_properties_SOURCES = \ + sound-properties-capplet.c \ + pipeline-tests.h \ + pipeline-tests.c \ + mixer-support.h \ + mixer-support.c \ + sound-theme.c \ + sound-theme.h \ + sound-theme-file-utils.c \ + sound-theme-file-utils.h INCLUDES = \ $(GNOMECC_CAPPLETS_CFLAGS) \ - $(SOUND_CAPPLET_CFLAGS) \ + $(CANBERRA_CFLAGS) $(SOUND_CAPPLET_CFLAGS) \ $(HAL_CFLAGS) \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ Index: capplets/sound/sound-theme.h =================================================================== --- capplets/sound/sound-theme.h (revision 0) +++ capplets/sound/sound-theme.h (revision 0) @@ -0,0 +1,31 @@ +/* -*- mode: c; style: linux -*- */ +/* -*- c-basic-offset: 2 -*- */ + +/* sound-theme.h + * Copyright (C) 2008 Bastien Nocera + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ +#ifndef __SOUND_THEME_HH__ +#define __SOUND_THEME_HH__ + +#include +#include + +void setup_sound_theme (GladeXML *dialog); +void setup_sound_theme_custom (GladeXML *dialog, gboolean have_xkb); + +#endif /* __SOUND_THEME_HH__ */ Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- control-center.spec 24 Jul 2008 15:28:33 -0000 1.378 +++ control-center.spec 24 Jul 2008 15:53:03 -0000 1.379 @@ -22,14 +22,13 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.4 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops Source: http://download.gnome.org/sources/gnome-control-center/2.23/gnome-control-center-%{version}.tar.bz2 Source1: org.gnome.control-center.defaultbackground.policy -Patch2: control-center-2.20.0-enable-sound-by-default.patch Patch3: control-center-2.19.3-no-gnome-common.patch Patch7: make-default.patch # minor build breakage in gtk, will be fixed in the next gtk release @@ -42,6 +41,9 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=539343 Patch9: standard-icon.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=542979 +Patch10: gcc-libcanberra-support-5.patch + # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.23.2-passwd.patch Patch96: control-center-2.23.2-gecos.patch @@ -76,7 +78,6 @@ Requires: pkgconfig BuildRequires: autoconf automake libtool -BuildRequires: esound-devel BuildRequires: pango-devel BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -117,6 +118,7 @@ BuildRequires: dbus-glib-devel >= 0.70 BuildRequires: scrollkeeper BuildRequires: PolicyKit-gnome-devel +BuildRequires: libcanberra-devel Requires(preun): GConf2 Requires(pre): GConf2 @@ -167,10 +169,10 @@ %prep %setup -q -n gnome-control-center-%{version} -%patch2 -p0 -b .enable-sound %patch3 -p1 -b .no-gnome-common %patch8 -p1 -b .gtkmarshal %patch9 -p1 -b .standard-icon +%patch10 -p0 -b .libcanberra # vendor configuration patches %patch95 -p1 -b .passwd @@ -335,10 +337,8 @@ %{_libdir}/*.so.* %{_sysconfdir}/gconf/schemas/fontilus.schemas %{_sysconfdir}/gconf/schemas/control-center.schemas -%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf %{_sysconfdir}/xdg/menus/gnomecc.menu %{_sysconfdir}/xdg/autostart/gnome-at-session.desktop -%{_libdir}/gnome-vfs-2.0/modules/*.so %{_libdir}/window-manager-settings/*.so %files devel @@ -355,6 +355,10 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Thu Jul 24 2008 - Bastien Nocera - 2.23.4-6 +- Add patch to support the Free Desktop sound theme spec +- Remove gnome-vfs-methods as per upstream + * Thu Jul 24 2008 - Bastien Nocera - 2.23.4-5 - Remove some obsolete patches --- control-center-2.20.0-enable-sound-by-default.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 15:54:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 15:54:32 +0000 Subject: [pkgdb] gdhcpd had groupAcl changed Message-ID: <20080724155432.7B7521AD0E3@bastion.fedora.phx.redhat.com> Adel Gadllah (drago01) has set the commit acl on gdhcpd (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdhcpd From fedora-extras-commits at redhat.com Thu Jul 24 15:54:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 15:54:34 +0000 Subject: [pkgdb] gdhcpd had groupAcl changed Message-ID: <20080724155435.291011AD0EF@bastion.fedora.phx.redhat.com> Adel Gadllah (drago01) has set the commit acl on gdhcpd (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdhcpd From fedora-extras-commits at redhat.com Thu Jul 24 15:54:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 15:54:33 +0000 Subject: [pkgdb] xorg-x11-server: dsd has requested commit Message-ID: <20080724155434.3F5061AD0EB@bastion.fedora.phx.redhat.com> Daniel Drake (dsd) has requested the commit acl on xorg-x11-server (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Thu Jul 24 15:54:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 15:54:36 +0000 Subject: [pkgdb] gdhcpd had groupAcl changed Message-ID: <20080724155436.7C7F41AD0FB@bastion.fedora.phx.redhat.com> Adel Gadllah (drago01) has set the commit acl on gdhcpd (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdhcpd From fedora-extras-commits at redhat.com Thu Jul 24 15:54:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 15:54:42 +0000 Subject: [pkgdb] gdhcpd had groupAcl changed Message-ID: <20080724155442.5A8E61AD106@bastion.fedora.phx.redhat.com> Adel Gadllah (drago01) has set the commit acl on gdhcpd (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdhcpd From fedora-extras-commits at redhat.com Thu Jul 24 15:54:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 15:54:42 +0000 Subject: [pkgdb] gdhcpd had groupAcl changed Message-ID: <20080724155444.B9D671AD0DD@bastion.fedora.phx.redhat.com> Adel Gadllah (drago01) has set the commit acl on gdhcpd (Fedora 9) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdhcpd From fedora-extras-commits at redhat.com Thu Jul 24 15:57:52 2008 From: fedora-extras-commits at redhat.com (Behdad Esfahbod (behdad)) Date: Thu, 24 Jul 2008 15:57:52 GMT Subject: rpms/preload/devel preload-0.6-start-late.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 preload.spec, 1.2, 1.3 sources, 1.2, 1.3 preload.cmdline.c.patch, 1.1, NONE preload.conf.in.patch, 1.1, NONE preload.init.in.patch, 1.1, NONE preload.logrotate.in.patch, 1.1, NONE preload.proc.c.patch, 1.1, NONE preload.prophet.c.patch, 1.1, NONE preload.readahead.c.patch, 1.1, NONE preload.readahead.h.patch, 1.1, NONE preload.state.c.patch, 1.1, NONE Message-ID: <200807241557.m6OFvq60029282@cvs-int.fedora.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/preload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29221 Modified Files: .cvsignore preload.spec sources Added Files: preload-0.6-start-late.patch Removed Files: preload.cmdline.c.patch preload.conf.in.patch preload.init.in.patch preload.logrotate.in.patch preload.proc.c.patch preload.prophet.c.patch preload.readahead.c.patch preload.readahead.h.patch preload.state.c.patch Log Message: * Thu Jul 24 2008 Behdad Esfahbod - 0.6-1 - Update to 0.6 - Remove all patches. They are all obsolete by upstream now. - Add preload-0.6-start-late.patch to start preload as last service. We use readahead for boot speedup, and want preload just for login/desktop speedup. So, start it last. preload-0.6-start-late.patch: --- NEW FILE preload-0.6-start-late.patch --- diff -up preload-0.6/preload.init.in.start-late preload-0.6/preload.init.in --- preload-0.6/preload.init.in.start-late 2008-07-24 11:54:21.000000000 -0400 +++ preload-0.6/preload.init.in 2008-07-24 11:54:34.000000000 -0400 @@ -4,7 +4,7 @@ # # Starts the @PACKAGE@ daemon # -# chkconfig: - 05 95 +# chkconfig: - 099 1 # description: @PACKAGE_SUMMARY@ # processname: @PACKAGE@ # Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jan 2008 21:22:39 -0000 1.2 +++ .cvsignore 24 Jul 2008 15:57:00 -0000 1.3 @@ -1 +1 @@ -preload-0.4.tar.gz +preload-0.6.tar.gz Index: preload.spec =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/preload.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- preload.spec 13 Feb 2008 11:31:35 -0000 1.2 +++ preload.spec 24 Jul 2008 15:57:00 -0000 1.3 @@ -1,6 +1,6 @@ Name: preload -Version: 0.4 -Release: 6%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Preload is an adaptive readahead daemon Group: Applications/System @@ -8,15 +8,8 @@ URL: http://preload.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: preload.init.in.patch -Patch1: preload.logrotate.in.patch -Patch2: preload.cmdline.c.patch -Patch3: preload.conf.in.patch -Patch4: preload.proc.c.patch -Patch5: preload.prophet.c.patch -Patch6: preload.readahead.c.patch -Patch7: preload.readahead.h.patch -Patch8: preload.state.c.patch + +Patch0: preload-0.6-start-late.patch BuildRequires: basesystem, glib2-devel, help2man Requires: basesystem, logrotate @@ -33,15 +26,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch0 -p1 -b .start-late %build %configure @@ -87,6 +72,13 @@ %changelog +* Thu Jul 24 2008 Behdad Esfahbod - 0.6-1 +- Update to 0.6 +- Remove all patches. They are all obsolete by upstream now. +- Add preload-0.6-start-late.patch to start preload as last service. + We use readahead for boot speedup, and want preload just for login/desktop + speedup. So, start it last. + * Wed Feb 13 2008 Marc Wiriadisastra - 0.4-6 - Rebuild for gcc4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jan 2008 21:22:39 -0000 1.2 +++ sources 24 Jul 2008 15:57:00 -0000 1.3 @@ -1 +1 @@ -9c98bc97ec261925c9a40e5084c9c149 preload-0.4.tar.gz +2aac518aceea4dbd33d74f52b1a98fca preload-0.6.tar.gz --- preload.cmdline.c.patch DELETED --- --- preload.conf.in.patch DELETED --- --- preload.init.in.patch DELETED --- --- preload.logrotate.in.patch DELETED --- --- preload.proc.c.patch DELETED --- --- preload.prophet.c.patch DELETED --- --- preload.readahead.c.patch DELETED --- --- preload.readahead.h.patch DELETED --- --- preload.state.c.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 16:01:30 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 16:01:30 GMT Subject: rpms/kde-i18n/F-9 kde-i18n.spec,1.84,1.85 Message-ID: <200807241601.m6OG1UZ5003610@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-i18n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29440 Modified Files: kde-i18n.spec Log Message: sync w/devel branch Index: kde-i18n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-i18n/F-9/kde-i18n.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- kde-i18n.spec 18 Apr 2008 03:01:18 -0000 1.84 +++ kde-i18n.spec 24 Jul 2008 16:00:42 -0000 1.85 @@ -6,7 +6,7 @@ Name: kde-i18n Epoch: 1 Version: 3.5.9 -Release: 5%{?dist} +Release: 8%{?dist} # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. License: GFDL @@ -802,7 +802,6 @@ rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwinrules.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwm.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlaunch.mo - rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlilo.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlirc.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlocale.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmnic.mo @@ -968,6 +967,7 @@ rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_locationsrunner.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_searchrunner.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_webshortcutsrunner.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolourpaint.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksame.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksayit.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscanplugin.mo @@ -1130,6 +1130,7 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/kcron rm -rf %{buildroot}%{_docdir}/HTML/*/kdat rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu + rm -rf %{buildroot}%{_docdir}/HTML/*/kdebugdialog rm -rf %{buildroot}%{_docdir}/HTML/*/kdf rm -rf %{buildroot}%{_docdir}/HTML/*/kdm rm -rf %{buildroot}%{_docdir}/HTML/*/kfind @@ -1145,6 +1146,7 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/kig rm -rf %{buildroot}%{_docdir}/HTML/*/kinfocenter rm -rf %{buildroot}%{_docdir}/HTML/*/kiriki + rm -rf %{buildroot}%{_docdir}/HTML/*/kioslave rm -rf %{buildroot}%{_docdir}/HTML/*/kiten rm -rf %{buildroot}%{_docdir}/HTML/*/kjots rm -rf %{buildroot}%{_docdir}/HTML/*/kjumpingcube @@ -1160,6 +1162,7 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/kmousetool rm -rf %{buildroot}%{_docdir}/HTML/*/kmouth rm -rf %{buildroot}%{_docdir}/HTML/*/kmplot + rm -rf %{buildroot}%{_docdir}/HTML/*/knetattach rm -rf %{buildroot}%{_docdir}/HTML/*/knetwalk rm -rf %{buildroot}%{_docdir}/HTML/*/knetworkconf rm -rf %{buildroot}%{_docdir}/HTML/*/knewsticker @@ -1202,7 +1205,6 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/kworldclock rm -rf %{buildroot}%{_docdir}/HTML/*/kwrite rm -rf %{buildroot}%{_docdir}/HTML/*/kxkb - rm -rf %{buildroot}%{_docdir}/HTML/*/lilo-config rm -rf %{buildroot}%{_docdir}/HTML/*/lskat rm -rf %{buildroot}%{_docdir}/HTML/*/marble rm -rf %{buildroot}%{_docdir}/HTML/*/okular @@ -1243,6 +1245,7 @@ rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/validatorsplugin.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/webarchiver.mo rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksig.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpovmodeler.mo # remove docs which conflict with KDE 4 extragear rm -rf %{buildroot}%{_docdir}/HTML/*/kcoloredit @@ -1251,6 +1254,7 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/kmid rm -rf %{buildroot}%{_docdir}/HTML/*/konq-plugins rm -rf %{buildroot}%{_docdir}/HTML/*/ksig + rm -rf %{buildroot}%{_docdir}/HTML/*/kpovmodeler # remove obsolete KDE 3 application data translations rm -rf %{buildroot}%{_datadir}/apps @@ -1789,6 +1793,15 @@ %changelog +* Sun Jul 20 2008 Kevin Kofler 1:3.5.9-8 +- also remove kpovmodeler translations on F9+ (#454458) + +* Wed Jun 25 2008 Than Ngo 1:3.5.9-7 +- bump release because of Koji failure + +* Mon Jun 23 2008 Than Ngo 1:3.5.9-6 +- on F9+, remove documentation which conflicts with kde-l10n rh#452391 + * Fri Apr 18 2008 Kevin Kofler 1:3.5.9-5 - on F9+, remove documentation which conflicts with kde-l10n (#441537) - mark Norvegian Bokmal translations with %%lang(nb) rather than %%lang(no) From fedora-extras-commits at redhat.com Thu Jul 24 16:05:46 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 24 Jul 2008 16:05:46 GMT Subject: rpms/mod_fcgid/devel mod_fcgid.spec,1.11,1.12 Message-ID: <200807241605.m6OG5kXj003973@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/mod_fcgid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3895 Modified Files: mod_fcgid.spec Log Message: * Thu Jul 24 2008 Paul Howarth 2.2-5 - Tweak selinux-policy version detection macro to work with current Rawhide Index: mod_fcgid.spec =================================================================== RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_fcgid.spec 14 Feb 2008 14:45:39 -0000 1.11 +++ mod_fcgid.spec 24 Jul 2008 16:04:55 -0000 1.12 @@ -11,7 +11,7 @@ Name: mod_fcgid Version: 2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons License: GPL+ @@ -37,7 +37,7 @@ as possible. %if %{selinux_module} -%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) +%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) %define selinux_policynum %(echo %{selinux_policyver} | %{__awk} -F. '{ printf "%d%02d%02d", $1, $2, $3 }') %package selinux Summary: SELinux policy module supporting FastCGI applications with mod_fcgid @@ -49,9 +49,7 @@ # http://www.redhat.com/archives/fedora-selinux-list/2006-May/msg00102.html # Hence the versioned dependency. The versioning will hopefully be replaced by # an ABI version requirement or something similar in the future -%if "%{selinux_policyver}" != "" Requires: selinux-policy >= %{selinux_policyver} -%endif Requires: %{name} = %{version}-%{release} Requires(post): /usr/sbin/semodule, /sbin/restorecon Requires(postun): /usr/sbin/semodule, /sbin/restorecon @@ -157,6 +155,9 @@ %endif %changelog +* Thu Jul 24 2008 Paul Howarth 2.2-5 +- Tweak selinux-policy version detection macro to work with current Rawhide + * Thu Feb 14 2008 Paul Howarth 2.2-4 - Rebuild with gcc 4.3.0 for Fedora 9 From fedora-extras-commits at redhat.com Thu Jul 24 16:07:38 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 16:07:38 GMT Subject: rpms/kde-l10n/F-9 .cvsignore, 1.8, 1.9 kde-l10n.spec, 1.26, 1.27 sources, 1.8, 1.9 subdirs-kde-l10n, 1.4, 1.5 Message-ID: <200807241607.m6OG7cIX004201@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4083 Modified Files: .cvsignore kde-l10n.spec sources subdirs-kde-l10n Log Message: * Tue Jul 22 2008 Than Ngo 4.0.98-1 - 4.0.98 (4.1rc1) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Jun 2008 11:15:31 -0000 1.8 +++ .cvsignore 24 Jul 2008 16:06:55 -0000 1.9 @@ -1,98 +1,316 @@ -kde-l10n-ar-4.0.4.tar.bz2 -kde-l10n-be-4.0.4.tar.bz2 -kde-l10n-bg-4.0.4.tar.bz2 -kde-l10n-ca-4.0.4.tar.bz2 -kde-l10n-cs-4.0.4.tar.bz2 -kde-l10n-csb-4.0.4.tar.bz2 -kde-l10n-da-4.0.4.tar.bz2 -kde-l10n-de-4.0.4.tar.bz2 -kde-l10n-el-4.0.4.tar.bz2 -kde-l10n-en_GB-4.0.4.tar.bz2 -kde-l10n-eo-4.0.4.tar.bz2 -kde-l10n-es-4.0.4.tar.bz2 -kde-l10n-et-4.0.4.tar.bz2 -kde-l10n-eu-4.0.4.tar.bz2 -kde-l10n-fa-4.0.4.tar.bz2 -kde-l10n-fi-4.0.4.tar.bz2 -kde-l10n-fr-4.0.4.tar.bz2 -kde-l10n-fy-4.0.4.tar.bz2 -kde-l10n-ga-4.0.4.tar.bz2 -kde-l10n-gl-4.0.4.tar.bz2 -kde-l10n-hi-4.0.4.tar.bz2 -kde-l10n-hu-4.0.4.tar.bz2 -kde-l10n-is-4.0.4.tar.bz2 -kde-l10n-it-4.0.4.tar.bz2 -kde-l10n-ja-4.0.4.tar.bz2 -kde-l10n-kk-4.0.4.tar.bz2 -kde-l10n-km-4.0.4.tar.bz2 -kde-l10n-ko-4.0.4.tar.bz2 -kde-l10n-lv-4.0.4.tar.bz2 -kde-l10n-mk-4.0.4.tar.bz2 -kde-l10n-nb-4.0.4.tar.bz2 -kde-l10n-nds-4.0.4.tar.bz2 -kde-l10n-ne-4.0.4.tar.bz2 -kde-l10n-nl-4.0.4.tar.bz2 -kde-l10n-nn-4.0.4.tar.bz2 -kde-l10n-pa-4.0.4.tar.bz2 -kde-l10n-pl-4.0.4.tar.bz2 -kde-l10n-pt-4.0.4.tar.bz2 -kde-l10n-pt_BR-4.0.4.tar.bz2 -kde-l10n-ru-4.0.4.tar.bz2 -kde-l10n-se-4.0.4.tar.bz2 -kde-l10n-sl-4.0.4.tar.bz2 -kde-l10n-sv-4.0.4.tar.bz2 -kde-l10n-th-4.0.4.tar.bz2 -kde-l10n-tr-4.0.4.tar.bz2 -kde-l10n-uk-4.0.4.tar.bz2 -kde-l10n-wa-4.0.4.tar.bz2 -kde-l10n-zh_CN-4.0.4.tar.bz2 -kde-l10n-zh_TW-4.0.4.tar.bz2 -kde-l10n-ar-4.0.5.tar.bz2 -kde-l10n-be-4.0.5.tar.bz2 -kde-l10n-bg-4.0.5.tar.bz2 -kde-l10n-ca-4.0.5.tar.bz2 -kde-l10n-cs-4.0.5.tar.bz2 -kde-l10n-csb-4.0.5.tar.bz2 -kde-l10n-da-4.0.5.tar.bz2 -kde-l10n-de-4.0.5.tar.bz2 -kde-l10n-el-4.0.5.tar.bz2 -kde-l10n-en_GB-4.0.5.tar.bz2 -kde-l10n-eo-4.0.5.tar.bz2 -kde-l10n-es-4.0.5.tar.bz2 -kde-l10n-et-4.0.5.tar.bz2 -kde-l10n-eu-4.0.5.tar.bz2 -kde-l10n-fa-4.0.5.tar.bz2 -kde-l10n-fi-4.0.5.tar.bz2 -kde-l10n-fr-4.0.5.tar.bz2 -kde-l10n-fy-4.0.5.tar.bz2 -kde-l10n-ga-4.0.5.tar.bz2 -kde-l10n-gl-4.0.5.tar.bz2 -kde-l10n-hi-4.0.5.tar.bz2 -kde-l10n-hu-4.0.5.tar.bz2 -kde-l10n-is-4.0.5.tar.bz2 -kde-l10n-it-4.0.5.tar.bz2 -kde-l10n-ja-4.0.5.tar.bz2 -kde-l10n-kk-4.0.5.tar.bz2 -kde-l10n-km-4.0.5.tar.bz2 -kde-l10n-ko-4.0.5.tar.bz2 -kde-l10n-mk-4.0.5.tar.bz2 -kde-l10n-lv-4.0.5.tar.bz2 -kde-l10n-nb-4.0.5.tar.bz2 -kde-l10n-nds-4.0.5.tar.bz2 -kde-l10n-ne-4.0.5.tar.bz2 -kde-l10n-nl-4.0.5.tar.bz2 -kde-l10n-nn-4.0.5.tar.bz2 -kde-l10n-pa-4.0.5.tar.bz2 -kde-l10n-pl-4.0.5.tar.bz2 -kde-l10n-pt-4.0.5.tar.bz2 -kde-l10n-pt_BR-4.0.5.tar.bz2 -kde-l10n-ru-4.0.5.tar.bz2 -kde-l10n-se-4.0.5.tar.bz2 -kde-l10n-sl-4.0.5.tar.bz2 -kde-l10n-sv-4.0.5.tar.bz2 -kde-l10n-th-4.0.5.tar.bz2 -kde-l10n-tr-4.0.5.tar.bz2 -kde-l10n-uk-4.0.5.tar.bz2 -kde-l10n-wa-4.0.5.tar.bz2 -kde-l10n-zh_CN-4.0.5.tar.bz2 -kde-l10n-zh_TW-4.0.5.tar.bz2 +kde-l10n-ar-4.0.0.tar.bz2 +kde-l10n-bg-4.0.0.tar.bz2 +kde-l10n-ca-4.0.0.tar.bz2 +kde-l10n-de-4.0.0.tar.bz2 +kde-l10n-el-4.0.0.tar.bz2 +kde-l10n-en_GB-4.0.0.tar.bz2 +kde-l10n-es-4.0.0.tar.bz2 +kde-l10n-et-4.0.0.tar.bz2 +kde-l10n-fi-4.0.0.tar.bz2 +kde-l10n-fr-4.0.0.tar.bz2 +kde-l10n-hu-4.0.0.tar.bz2 +kde-l10n-it-4.0.0.tar.bz2 +kde-l10n-ja-4.0.0.tar.bz2 +kde-l10n-ko-4.0.0.tar.bz2 +kde-l10n-nb-4.0.0.tar.bz2 +kde-l10n-nl-4.0.0.tar.bz2 +kde-l10n-nn-4.0.0.tar.bz2 +kde-l10n-pa-4.0.0.tar.bz2 +kde-l10n-pl-4.0.0.tar.bz2 +kde-l10n-pt-4.0.0.tar.bz2 +kde-l10n-pt_BR-4.0.0.tar.bz2 +kde-l10n-ru-4.0.0.tar.bz2 +kde-l10n-sl-4.0.0.tar.bz2 +kde-l10n-sv-4.0.0.tar.bz2 +kde-l10n-th-4.0.0.tar.bz2 +kde-l10n-tr-4.0.0.tar.bz2 +kde-l10n-uk-4.0.0.tar.bz2 +kde-l10n-zh_CN-4.0.0.tar.bz2 +kde-l10n-zh_TW-4.0.0.tar.bz2 +kde-l10n-be-4.0.0.tar.bz2 +kde-l10n-csb-4.0.0.tar.bz2 +kde-l10n-eo-4.0.0.tar.bz2 +kde-l10n-eu-4.0.0.tar.bz2 +kde-l10n-ga-4.0.0.tar.bz2 +kde-l10n-gl-4.0.0.tar.bz2 +kde-l10n-hi-4.0.0.tar.bz2 +kde-l10n-km-4.0.0.tar.bz2 +kde-l10n-lv-4.0.0.tar.bz2 +kde-l10n-mk-4.0.0.tar.bz2 +kde-l10n-nds-4.0.0.tar.bz2 +kde-l10n-ne-4.0.0.tar.bz2 +kde-l10n-se-4.0.0.tar.bz2 +kde-l10n-wa-4.0.0.tar.bz2 +kde-l10n-ar-4.0.1.tar.bz2 +kde-l10n-be-4.0.1.tar.bz2 +kde-l10n-bg-4.0.1.tar.bz2 +kde-l10n-ca-4.0.1.tar.bz2 +kde-l10n-cs-4.0.1.tar.bz2 +kde-l10n-csb-4.0.1.tar.bz2 +kde-l10n-da-4.0.1.tar.bz2 +kde-l10n-de-4.0.1.tar.bz2 +kde-l10n-el-4.0.1.tar.bz2 +kde-l10n-en_GB-4.0.1.tar.bz2 +kde-l10n-eo-4.0.1.tar.bz2 +kde-l10n-es-4.0.1.tar.bz2 +kde-l10n-et-4.0.1.tar.bz2 +kde-l10n-eu-4.0.1.tar.bz2 +kde-l10n-fi-4.0.1.tar.bz2 +kde-l10n-fr-4.0.1.tar.bz2 +kde-l10n-ga-4.0.1.tar.bz2 +kde-l10n-gl-4.0.1.tar.bz2 +kde-l10n-hi-4.0.1.tar.bz2 +kde-l10n-hu-4.0.1.tar.bz2 +kde-l10n-it-4.0.1.tar.bz2 +kde-l10n-ja-4.0.1.tar.bz2 +kde-l10n-km-4.0.1.tar.bz2 +kde-l10n-ko-4.0.1.tar.bz2 +kde-l10n-mk-4.0.1.tar.bz2 +kde-l10n-lv-4.0.1.tar.bz2 +kde-l10n-nb-4.0.1.tar.bz2 +kde-l10n-nds-4.0.1.tar.bz2 +kde-l10n-ne-4.0.1.tar.bz2 +kde-l10n-nl-4.0.1.tar.bz2 +kde-l10n-nn-4.0.1.tar.bz2 +kde-l10n-pa-4.0.1.tar.bz2 +kde-l10n-pl-4.0.1.tar.bz2 +kde-l10n-pt-4.0.1.tar.bz2 +kde-l10n-pt_BR-4.0.1.tar.bz2 +kde-l10n-ru-4.0.1.tar.bz2 +kde-l10n-se-4.0.1.tar.bz2 +kde-l10n-sl-4.0.1.tar.bz2 +kde-l10n-sv-4.0.1.tar.bz2 +kde-l10n-th-4.0.1.tar.bz2 +kde-l10n-tr-4.0.1.tar.bz2 +kde-l10n-uk-4.0.1.tar.bz2 +kde-l10n-wa-4.0.1.tar.bz2 +kde-l10n-zh_CN-4.0.1.tar.bz2 +kde-l10n-zh_TW-4.0.1.tar.bz2 +kde-l10n-ar-4.0.2.tar.bz2 +kde-l10n-be-4.0.2.tar.bz2 +kde-l10n-bg-4.0.2.tar.bz2 +kde-l10n-ca-4.0.2.tar.bz2 +kde-l10n-cs-4.0.2.tar.bz2 +kde-l10n-csb-4.0.2.tar.bz2 +kde-l10n-da-4.0.2.tar.bz2 +kde-l10n-de-4.0.2.tar.bz2 +kde-l10n-el-4.0.2.tar.bz2 +kde-l10n-en_GB-4.0.2.tar.bz2 +kde-l10n-eo-4.0.2.tar.bz2 +kde-l10n-es-4.0.2.tar.bz2 +kde-l10n-et-4.0.2.tar.bz2 +kde-l10n-eu-4.0.2.tar.bz2 +kde-l10n-fi-4.0.2.tar.bz2 +kde-l10n-fr-4.0.2.tar.bz2 +kde-l10n-ga-4.0.2.tar.bz2 +kde-l10n-gl-4.0.2.tar.bz2 +kde-l10n-hi-4.0.2.tar.bz2 +kde-l10n-hu-4.0.2.tar.bz2 +kde-l10n-it-4.0.2.tar.bz2 +kde-l10n-ja-4.0.2.tar.bz2 +kde-l10n-km-4.0.2.tar.bz2 +kde-l10n-ko-4.0.2.tar.bz2 +kde-l10n-mk-4.0.2.tar.bz2 +kde-l10n-lv-4.0.2.tar.bz2 +kde-l10n-nb-4.0.2.tar.bz2 +kde-l10n-nds-4.0.2.tar.bz2 +kde-l10n-ne-4.0.2.tar.bz2 +kde-l10n-nl-4.0.2.tar.bz2 +kde-l10n-nn-4.0.2.tar.bz2 +kde-l10n-pa-4.0.2.tar.bz2 +kde-l10n-pl-4.0.2.tar.bz2 +kde-l10n-pt-4.0.2.tar.bz2 +kde-l10n-pt_BR-4.0.2.tar.bz2 +kde-l10n-ru-4.0.2.tar.bz2 +kde-l10n-se-4.0.2.tar.bz2 +kde-l10n-sl-4.0.2.tar.bz2 +kde-l10n-sv-4.0.2.tar.bz2 +kde-l10n-th-4.0.2.tar.bz2 +kde-l10n-tr-4.0.2.tar.bz2 +kde-l10n-uk-4.0.2.tar.bz2 +kde-l10n-wa-4.0.2.tar.bz2 +kde-l10n-zh_CN-4.0.2.tar.bz2 +kde-l10n-zh_TW-4.0.2.tar.bz2 +kde-l10n-ar-4.0.3.tar.bz2 +kde-l10n-be-4.0.3.tar.bz2 +kde-l10n-bg-4.0.3.tar.bz2 +kde-l10n-ca-4.0.3.tar.bz2 +kde-l10n-cs-4.0.3.tar.bz2 +kde-l10n-csb-4.0.3.tar.bz2 +kde-l10n-da-4.0.3.tar.bz2 +kde-l10n-de-4.0.3.tar.bz2 +kde-l10n-el-4.0.3.tar.bz2 +kde-l10n-en_GB-4.0.3.tar.bz2 +kde-l10n-eo-4.0.3.tar.bz2 +kde-l10n-es-4.0.3.tar.bz2 +kde-l10n-et-4.0.3.tar.bz2 +kde-l10n-eu-4.0.3.tar.bz2 +kde-l10n-fi-4.0.3.tar.bz2 +kde-l10n-fr-4.0.3.tar.bz2 +kde-l10n-ga-4.0.3.tar.bz2 +kde-l10n-gl-4.0.3.tar.bz2 +kde-l10n-hi-4.0.3.tar.bz2 +kde-l10n-hu-4.0.3.tar.bz2 +kde-l10n-it-4.0.3.tar.bz2 +kde-l10n-ja-4.0.3.tar.bz2 +kde-l10n-km-4.0.3.tar.bz2 +kde-l10n-ko-4.0.3.tar.bz2 +kde-l10n-mk-4.0.3.tar.bz2 +kde-l10n-lv-4.0.3.tar.bz2 +kde-l10n-nb-4.0.3.tar.bz2 +kde-l10n-nds-4.0.3.tar.bz2 +kde-l10n-ne-4.0.3.tar.bz2 +kde-l10n-nl-4.0.3.tar.bz2 +kde-l10n-nn-4.0.3.tar.bz2 +kde-l10n-pa-4.0.3.tar.bz2 +kde-l10n-pl-4.0.3.tar.bz2 +kde-l10n-pt-4.0.3.tar.bz2 +kde-l10n-pt_BR-4.0.3.tar.bz2 +kde-l10n-ru-4.0.3.tar.bz2 +kde-l10n-se-4.0.3.tar.bz2 +kde-l10n-sl-4.0.3.tar.bz2 +kde-l10n-sv-4.0.3.tar.bz2 +kde-l10n-th-4.0.3.tar.bz2 +kde-l10n-tr-4.0.3.tar.bz2 +kde-l10n-uk-4.0.3.tar.bz2 +kde-l10n-wa-4.0.3.tar.bz2 +kde-l10n-zh_CN-4.0.3.tar.bz2 +kde-l10n-zh_TW-4.0.3.tar.bz2 +kde-l10n-ar-4.0.80.tar.bz2 +kde-l10n-be-4.0.80.tar.bz2 +kde-l10n-bg-4.0.80.tar.bz2 +kde-l10n-ca-4.0.80.tar.bz2 +kde-l10n-cs-4.0.80.tar.bz2 +kde-l10n-csb-4.0.80.tar.bz2 +kde-l10n-de-4.0.80.tar.bz2 +kde-l10n-el-4.0.80.tar.bz2 +kde-l10n-en_GB-4.0.80.tar.bz2 +kde-l10n-eo-4.0.80.tar.bz2 +kde-l10n-es-4.0.80.tar.bz2 +kde-l10n-et-4.0.80.tar.bz2 +kde-l10n-eu-4.0.80.tar.bz2 +kde-l10n-fi-4.0.80.tar.bz2 +kde-l10n-fr-4.0.80.tar.bz2 +kde-l10n-ga-4.0.80.tar.bz2 +kde-l10n-gl-4.0.80.tar.bz2 +kde-l10n-hi-4.0.80.tar.bz2 +kde-l10n-hu-4.0.80.tar.bz2 +kde-l10n-it-4.0.80.tar.bz2 +kde-l10n-ja-4.0.80.tar.bz2 +kde-l10n-km-4.0.80.tar.bz2 +kde-l10n-ko-4.0.80.tar.bz2 +kde-l10n-mk-4.0.80.tar.bz2 +kde-l10n-lv-4.0.80.tar.bz2 +kde-l10n-nb-4.0.80.tar.bz2 +kde-l10n-nds-4.0.80.tar.bz2 +kde-l10n-ne-4.0.80.tar.bz2 +kde-l10n-nl-4.0.80.tar.bz2 +kde-l10n-nn-4.0.80.tar.bz2 +kde-l10n-pa-4.0.80.tar.bz2 +kde-l10n-pl-4.0.80.tar.bz2 +kde-l10n-pt-4.0.80.tar.bz2 +kde-l10n-pt_BR-4.0.80.tar.bz2 +kde-l10n-ru-4.0.80.tar.bz2 +kde-l10n-se-4.0.80.tar.bz2 +kde-l10n-sl-4.0.80.tar.bz2 +kde-l10n-sv-4.0.80.tar.bz2 +kde-l10n-th-4.0.80.tar.bz2 +kde-l10n-tr-4.0.80.tar.bz2 +kde-l10n-uk-4.0.80.tar.bz2 +kde-l10n-wa-4.0.80.tar.bz2 +kde-l10n-zh_CN-4.0.80.tar.bz2 +kde-l10n-zh_TW-4.0.80.tar.bz2 +kde-l10n-ar-4.0.83.tar.bz2 +kde-l10n-be-4.0.83.tar.bz2 +kde-l10n-bg-4.0.83.tar.bz2 +kde-l10n-ca-4.0.83.tar.bz2 +kde-l10n-cs-4.0.83.tar.bz2 +kde-l10n-csb-4.0.83.tar.bz2 +kde-l10n-da-4.0.83.tar.bz2 +kde-l10n-de-4.0.83.tar.bz2 +kde-l10n-el-4.0.83.tar.bz2 +kde-l10n-en_GB-4.0.83.tar.bz2 +kde-l10n-eo-4.0.83.tar.bz2 +kde-l10n-es-4.0.83.tar.bz2 +kde-l10n-et-4.0.83.tar.bz2 +kde-l10n-eu-4.0.83.tar.bz2 +kde-l10n-fi-4.0.83.tar.bz2 +kde-l10n-fr-4.0.83.tar.bz2 +kde-l10n-ga-4.0.83.tar.bz2 +kde-l10n-gl-4.0.83.tar.bz2 +kde-l10n-hi-4.0.83.tar.bz2 +kde-l10n-hu-4.0.83.tar.bz2 +kde-l10n-it-4.0.83.tar.bz2 +kde-l10n-ja-4.0.83.tar.bz2 +kde-l10n-km-4.0.83.tar.bz2 +kde-l10n-ko-4.0.83.tar.bz2 +kde-l10n-mk-4.0.83.tar.bz2 +kde-l10n-lv-4.0.83.tar.bz2 +kde-l10n-nb-4.0.83.tar.bz2 +kde-l10n-nds-4.0.83.tar.bz2 +kde-l10n-ne-4.0.83.tar.bz2 +kde-l10n-nl-4.0.83.tar.bz2 +kde-l10n-nn-4.0.83.tar.bz2 +kde-l10n-pa-4.0.83.tar.bz2 +kde-l10n-pl-4.0.83.tar.bz2 +kde-l10n-pt-4.0.83.tar.bz2 +kde-l10n-pt_BR-4.0.83.tar.bz2 +kde-l10n-ru-4.0.83.tar.bz2 +kde-l10n-se-4.0.83.tar.bz2 +kde-l10n-sl-4.0.83.tar.bz2 +kde-l10n-sv-4.0.83.tar.bz2 +kde-l10n-ta-4.0.83.tar.bz2 +kde-l10n-th-4.0.83.tar.bz2 +kde-l10n-tr-4.0.83.tar.bz2 +kde-l10n-uk-4.0.83.tar.bz2 +kde-l10n-wa-4.0.83.tar.bz2 +kde-l10n-zh_CN-4.0.83.tar.bz2 +kde-l10n-zh_TW-4.0.83.tar.bz2 +kde-l10n-sr-4.0.83.tar.bz2 +kde-l10n-ar-4.0.98.tar.bz2 +kde-l10n-be-4.0.98.tar.bz2 +kde-l10n-bg-4.0.98.tar.bz2 +kde-l10n-ca-4.0.98.tar.bz2 +kde-l10n-cs-4.0.98.tar.bz2 +kde-l10n-csb-4.0.98.tar.bz2 +kde-l10n-da-4.0.98.tar.bz2 +kde-l10n-de-4.0.98.tar.bz2 +kde-l10n-el-4.0.98.tar.bz2 +kde-l10n-en_GB-4.0.98.tar.bz2 +kde-l10n-eo-4.0.98.tar.bz2 +kde-l10n-es-4.0.98.tar.bz2 +kde-l10n-et-4.0.98.tar.bz2 +kde-l10n-eu-4.0.98.tar.bz2 +kde-l10n-fi-4.0.98.tar.bz2 +kde-l10n-fr-4.0.98.tar.bz2 +kde-l10n-ga-4.0.98.tar.bz2 +kde-l10n-gl-4.0.98.tar.bz2 +kde-l10n-hi-4.0.98.tar.bz2 +kde-l10n-hu-4.0.98.tar.bz2 +kde-l10n-it-4.0.98.tar.bz2 +kde-l10n-ja-4.0.98.tar.bz2 +kde-l10n-km-4.0.98.tar.bz2 +kde-l10n-ko-4.0.98.tar.bz2 +kde-l10n-mk-4.0.98.tar.bz2 +kde-l10n-lv-4.0.98.tar.bz2 +kde-l10n-nb-4.0.98.tar.bz2 +kde-l10n-nds-4.0.98.tar.bz2 +kde-l10n-ne-4.0.98.tar.bz2 +kde-l10n-nl-4.0.98.tar.bz2 +kde-l10n-nn-4.0.98.tar.bz2 +kde-l10n-pa-4.0.98.tar.bz2 +kde-l10n-pl-4.0.98.tar.bz2 +kde-l10n-pt-4.0.98.tar.bz2 +kde-l10n-pt_BR-4.0.98.tar.bz2 +kde-l10n-ru-4.0.98.tar.bz2 +kde-l10n-se-4.0.98.tar.bz2 +kde-l10n-sl-4.0.98.tar.bz2 +kde-l10n-sr-4.0.98.tar.bz2 +kde-l10n-sv-4.0.98.tar.bz2 +kde-l10n-ta-4.0.98.tar.bz2 +kde-l10n-th-4.0.98.tar.bz2 +kde-l10n-tr-4.0.98.tar.bz2 +kde-l10n-uk-4.0.98.tar.bz2 +kde-l10n-wa-4.0.98.tar.bz2 +kde-l10n-zh_CN-4.0.98.tar.bz2 +kde-l10n-zh_TW-4.0.98.tar.bz2 Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- kde-l10n.spec 3 Jun 2008 11:15:31 -0000 1.26 +++ kde-l10n.spec 24 Jul 2008 16:06:55 -0000 1.27 @@ -1,7 +1,7 @@ %define buildall 0 Name: kde-l10n -Version: 4.0.5 +Version: 4.0.98 Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -23,43 +23,40 @@ Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2 Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2 -Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fa-%{version}.tar.bz2 -Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2 -Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2 -Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2 -Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2 -Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gl-%{version}.tar.bz2 -Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hi-%{version}.tar.bz2 -Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hu-%{version}.tar.bz2 -Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-is-%{version}.tar.bz2 -Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-it-%{version}.tar.bz2 -Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2 -Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2 -Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-km-%{version}.tar.bz2 -Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2 -Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2 -Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2 -Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2 -Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2 -Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2 -Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2 -Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2 -Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2 -Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2 -Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2 -Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2 -Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2 -Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2 -#Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2 -Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2 -Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2 -#Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2 -Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2 -Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2 -Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2 -Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2 -Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2 -Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2 +Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2 +Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2 +Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2 +Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gl-%{version}.tar.bz2 +Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hi-%{version}.tar.bz2 +Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hu-%{version}.tar.bz2 +Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-it-%{version}.tar.bz2 +Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2 +Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-km-%{version}.tar.bz2 +Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2 +Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2 +Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2 +Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2 +Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2 +Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2 +Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2 +Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2 +Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2 +Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2 +Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2 +Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2 +Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2 +Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2 +#Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2 +Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2 +Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2 +Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2 +Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2 +Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2 +Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2 +Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2 +Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2 +Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2 +Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2 Source1000: subdirs-kde-l10n @@ -401,15 +398,6 @@ %description Kashubian Kashubian language support for KDE -%package Kazakh -Summary: Kazakh language support for KDE -Group: User Interface/Desktops -Requires: kde-filesystem -Provides: %{name}-kk = %{version}-%{release} - -%description Kazakh -Kazakh language support for KDE - %package Khmer Summary: Khmer language support for KDE Group: User Interface/Desktops @@ -758,6 +746,11 @@ if [ -e docs/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' docs/CMakeLists.txt fi + # remove lilo-config, conflicts with 3.5.9 + rm -f messages/kdeadmin/kcmlilo.po + if [ -e docs/kdeadmin/CMakeLists.txt ] ; then + sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt + fi mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. @@ -787,11 +780,6 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/*/ksmiletris rm -rf %{buildroot}%{_kde4_docdir}/HTML/*/ksplashml -# get rid of some kdepim documentation which found its way into kde-l10n 4.0 -rm -rf %{buildroot}%{_kde4_docdir}/HTML/*/kmail -rm -rf %{buildroot}%{_kde4_docdir}/HTML/*/knode -rm -rf %{buildroot}%{_kde4_docdir}/HTML/*/korn - %clean rm -rf %{buildroot} @@ -922,9 +910,11 @@ %defattr(-,root,root) %lang(eu) %{_datadir}/locale/eu/* +%if %{buildall} %files Farsi %defattr(-,root,root) %lang(fa) %{_datadir}/locale/fa/* +%endif %files Finnish %defattr(-,root,root) @@ -947,9 +937,11 @@ %lang(fr) %{_kde4_appsdir}/kvtml/fr %lang(fr) %{_kde4_docdir}/HTML/fr +%if %{buildall} %files Frisian %defattr(-,root,root) %lang(fy) %{_datadir}/locale/fy/* +%endif %files Irish %defattr(-,root,root) @@ -961,6 +953,7 @@ %defattr(-,root,root) %lang(gl) %{_datadir}/locale/gl/* %lang(gl) %{_kde4_appsdir}/kvtml/gl +%lang(gl) %{_kde4_docdir}/HTML/gl %if %{buildall} %files Hebrew @@ -984,6 +977,7 @@ %lang(hu) %{_datadir}/locale/hu/* %lang(hu) %{_kde4_appsdir}/khangman/hu.txt %lang(hu) %{_kde4_appsdir}/kvtml/hu +%lang(hu) %{_kde4_appsdir}/klettres/hu %lang(hu) %{_kde4_docdir}/HTML/hu %if %{buildall} @@ -992,9 +986,11 @@ %lang(id) %{_datadir}/locale/id/* %endif +%if %{buildall} %files Icelandic %defattr(-,root,root) %lang(is) %{_datadir}/locale/is/* +%endif %files Italian %defattr(-,root,root) @@ -1013,10 +1009,6 @@ %defattr(-,root,root) %lang(csb) %{_datadir}/locale/csb/* -%files Kazakh -%defattr(-,root,root) -%lang(kk) %{_datadir}/locale/kk/* - %files Khmer %defattr(-,root,root) %lang(km) %{_datadir}/locale/km/* @@ -1024,6 +1016,7 @@ %files Korean %defattr(-,root,root) %lang(ko) %{_datadir}/locale/ko/* +%lang(ko) %{_kde4_docdir}/HTML/ko %if %{buildall} %files Kurdish @@ -1047,12 +1040,12 @@ %defattr(-,root,root) %lang(nds) %{_datadir}/locale/nds/* %lang(nds) %{_kde4_appsdir}/klettres/nds -%lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml %lang(nds) %{_kde4_appsdir}/khangman/nds.txt -%lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds.soundtheme -%lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds -%lang(nds) %{_kde4_appsdir}/kturtle/examples/nds %lang(nds) %{_kde4_appsdir}/kvtml/nds +%lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds* +%lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml +%lang(nds) %{_kde4_appsdir}/kturtle/data/logokeywords.sr* +%lang(nds) %{_kde4_appsdir}/kturtle/examples/nds %files Latvian %defattr(-,root,root) @@ -1166,12 +1159,20 @@ %lang(sl) %{_kde4_appsdir}/kvtml/sl %lang(sl) %{_kde4_docdir}/HTML/sl -%if %{buildall} %files Serbian %defattr(-,root,root) %lang(sr) %{_datadir}/locale/sr/* %lang(sr) %{_kde4_appsdir}/ktuberling/sounds/sr* -%endif +%lang(sr) %{_kde4_docdir}/HTML/sr +%lang(sr) %{_kde4_docdir}/HTML/sr at latin +%lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr/* +%lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr +%lang(sr) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sr* +%lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt +%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr/* +%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr +%lang(sr) %{_kde4_appsdir}/kvtml/sr* +%lang(sr) %{_datadir}/locale/sr at latin/* %files Swedish %defattr(-,root,root) @@ -1181,11 +1182,9 @@ %lang(sv) %{_kde4_appsdir}/kvtml/sv %lang(sv) %{_kde4_docdir}/HTML/sv -%if %{buildall} %files Tamil %defattr(-,root,root) %lang(ta) %{_datadir}/locale/ta/* -%endif %if %{buildall} %files Tajik @@ -1196,7 +1195,6 @@ %files Thai %defattr(-,root,root) %lang(th) %{_datadir}/locale/th/* -%lang(th) %{_kde4_docdir}/HTML/th %files Turkish %defattr(-,root,root) @@ -1208,7 +1206,9 @@ %files Ukrainian %defattr(-,root,root) %lang(uk) %{_datadir}/locale/uk/* +%lang(uk) %{_kde4_appsdir}/ktuberling/sounds/uk* %lang(uk) %{_kde4_appsdir}/kvtml/uk +%lang(uk) %{_kde4_docdir}/HTML/uk %if %{buildall} %files Venda @@ -1244,11 +1244,18 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog -* Tue Jun 03 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Tue Jul 22 2008 Than Ngo 4.0.98-1 +- 4.0.98 (4.1rc1) + +* Sat Jun 28 2008 Kevin Kofler 4.0.83-2 +- disable Serbian for now, it's broken +- fix file list for Ukranian + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) -* Wed May 07 2008 Rex Dieter 4.0.4-1 -- kde-l10n-4.0.4 +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta 1 * Fri Apr 18 2008 Kevin Kofler 4.0.3-4 - remove documentation for apps which are not part of KDE 4.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 3 Jun 2008 11:15:31 -0000 1.8 +++ sources 24 Jul 2008 16:06:55 -0000 1.9 @@ -1,49 +1,47 @@ -c47814e472bec6d43cd197b60cef3c20 kde-l10n-ar-4.0.5.tar.bz2 -9d5b2f23eefff09f548ae6379ce9e041 kde-l10n-be-4.0.5.tar.bz2 -3aebff0afc2974bce6c0d5b8b3b7c028 kde-l10n-bg-4.0.5.tar.bz2 -b3449515f26cdc12b0ec7e831a43b1d8 kde-l10n-ca-4.0.5.tar.bz2 -3e0e4e001d928e134048f7ea05b54eb2 kde-l10n-cs-4.0.5.tar.bz2 -380c4eec63d4f84f173cea79b49344cf kde-l10n-csb-4.0.5.tar.bz2 -1e0d5e8a459b6f6b58faaade8b786d52 kde-l10n-da-4.0.5.tar.bz2 -ca9e3d24bd1797be10bb8dc0cf7a2322 kde-l10n-de-4.0.5.tar.bz2 -5b7783b1c90630a9c6cd9e0eac530c10 kde-l10n-el-4.0.5.tar.bz2 -79a76d01502494e1a0828d10f33d89a2 kde-l10n-en_GB-4.0.5.tar.bz2 -458c3fa8fc70e9d8285c6ca25b364bd7 kde-l10n-eo-4.0.5.tar.bz2 -f3c91e8577aa5a3bfdd68853afb532aa kde-l10n-es-4.0.5.tar.bz2 -6ae3c39a592661ddb0e0d6a643db3aca kde-l10n-et-4.0.5.tar.bz2 -1f0582a2265d5b70f77af4309a29577c kde-l10n-eu-4.0.5.tar.bz2 -e56c062e02b1f3500c0f637ea12202e8 kde-l10n-fa-4.0.5.tar.bz2 -88e2853cd095742552c7c6817a8d7a52 kde-l10n-fi-4.0.5.tar.bz2 -b09f6d66ab479dd88ee881a17223b32e kde-l10n-fr-4.0.5.tar.bz2 -e34abd3525ffba14827c1d84cad88172 kde-l10n-fy-4.0.5.tar.bz2 -626c1deed2518efce47c1437a61d4f5c kde-l10n-ga-4.0.5.tar.bz2 -1d062610d562ad806b1e2b9c9c186474 kde-l10n-gl-4.0.5.tar.bz2 -5f207c306808e7992bf957f6b2f19162 kde-l10n-hi-4.0.5.tar.bz2 -6e07254428866b960bfb7ca1a97ddc72 kde-l10n-hu-4.0.5.tar.bz2 -9d903f63d4823ce6227d0c537d7de3e1 kde-l10n-is-4.0.5.tar.bz2 -1c1049dc703abfe130449a130f853887 kde-l10n-it-4.0.5.tar.bz2 -f2c97c8ba74d1365e829e63033f51a63 kde-l10n-ja-4.0.5.tar.bz2 -ef254ce2882e2fc7219b8d9cf78179b0 kde-l10n-kk-4.0.5.tar.bz2 -ee4344f9ccd75efd28004213e4b87d25 kde-l10n-km-4.0.5.tar.bz2 -b0884055e694e37cd16db9ca6e48448c kde-l10n-ko-4.0.5.tar.bz2 -a8b07790f6b90a6676b31a911d6eb555 kde-l10n-mk-4.0.5.tar.bz2 -6b3ccccd0506c6bb6886ac06e6a9f170 kde-l10n-lv-4.0.5.tar.bz2 -55a5c41d0008fdc142b849e59f889143 kde-l10n-nb-4.0.5.tar.bz2 -2fb4d9b546da9d45f9a0e8716dd5c8b0 kde-l10n-nds-4.0.5.tar.bz2 -34c0319f29c59a95ee3b1b0711a997c1 kde-l10n-ne-4.0.5.tar.bz2 -3a23c6f02459721b571373ec91d8b614 kde-l10n-nl-4.0.5.tar.bz2 -b9d45492a303d2c8979160ee885bc88a kde-l10n-nn-4.0.5.tar.bz2 -92785c17fe3cc4e218995a147eef720a kde-l10n-pa-4.0.5.tar.bz2 -0c1ccd6580b2bf3010be9f094cb422ee kde-l10n-pl-4.0.5.tar.bz2 -bb42cbdf5e9b171e4af9bf09aa665781 kde-l10n-pt-4.0.5.tar.bz2 -7442860f1da9e6e7e96882bb3c7419a3 kde-l10n-pt_BR-4.0.5.tar.bz2 -ddf758554284b53301f66867b27c0552 kde-l10n-ru-4.0.5.tar.bz2 -efc9a0035d643d932699750d4a32f55c kde-l10n-se-4.0.5.tar.bz2 -92579e8d88ce10173a374225a660ab12 kde-l10n-sl-4.0.5.tar.bz2 -22a0d7c193a6245e59dfc5ed33081dfe kde-l10n-sv-4.0.5.tar.bz2 -8decf58e4430967a2ec89caf521bc95c kde-l10n-th-4.0.5.tar.bz2 -99d2cf0fe42b1542b5aaad222fb2c732 kde-l10n-tr-4.0.5.tar.bz2 -ae59b23e13ca18bc4880dd5a35c9b42c kde-l10n-uk-4.0.5.tar.bz2 -38860acc4905c81e9df45e698983c43d kde-l10n-wa-4.0.5.tar.bz2 -3acb99ea347f9fb4265a6fd6fa42eacc kde-l10n-zh_CN-4.0.5.tar.bz2 -bc8348158c0301097569da25364a1f58 kde-l10n-zh_TW-4.0.5.tar.bz2 +9aeb88effbef1c877fced16f47e302a9 kde-l10n-ar-4.0.98.tar.bz2 +dd6215a97db03f5a5451aae144ae9dfa kde-l10n-be-4.0.98.tar.bz2 +5d4f63d4eb2460f44bb62daac478fc48 kde-l10n-bg-4.0.98.tar.bz2 +4dd7d0a26d95823872cac765484f94af kde-l10n-ca-4.0.98.tar.bz2 +f849da964d5ede6fa785ac41602a88c1 kde-l10n-cs-4.0.98.tar.bz2 +6e0254fdf2080c54b4f6e0c4e84e21f8 kde-l10n-csb-4.0.98.tar.bz2 +1bb45b55924f1f22c8104ef06b197114 kde-l10n-da-4.0.98.tar.bz2 +26a1f7418ef17358b7361245dac3f832 kde-l10n-de-4.0.98.tar.bz2 +817fb49ebf0ac4d098ec6980664c3d53 kde-l10n-el-4.0.98.tar.bz2 +54d9db81f2462bae67bfa6f921a170d8 kde-l10n-en_GB-4.0.98.tar.bz2 +14fb7be791993ff10c629765d83c6735 kde-l10n-eo-4.0.98.tar.bz2 +a6a0887cb7a05bb7c151160af40d7799 kde-l10n-es-4.0.98.tar.bz2 +5fec646981e2cf484acbfb829d099b44 kde-l10n-et-4.0.98.tar.bz2 +868d2c0b0be825518a898b347c9f5331 kde-l10n-eu-4.0.98.tar.bz2 +7591643b8471987798eb7ad28d8c50e2 kde-l10n-fi-4.0.98.tar.bz2 +cb3884c4374f5e3019cdd4874a25ad71 kde-l10n-fr-4.0.98.tar.bz2 +a476ccee8c8c9779bff3cda49672b88b kde-l10n-ga-4.0.98.tar.bz2 +40048f50bb540cf34dc0a771c5c350c3 kde-l10n-gl-4.0.98.tar.bz2 +5abf81bae058419d7b6a2cbb5f889e35 kde-l10n-hi-4.0.98.tar.bz2 +27eaaa5bc94301ec7e6207d8e97fe4b0 kde-l10n-hu-4.0.98.tar.bz2 +e011544a6ec8d319682077813226a3cd kde-l10n-it-4.0.98.tar.bz2 +69707943d055b21825eb7f6f52b88ef0 kde-l10n-ja-4.0.98.tar.bz2 +b91deec756318c41f23b435c6a2b2441 kde-l10n-km-4.0.98.tar.bz2 +a0db531b70bdd7f6edafa382382aa44d kde-l10n-ko-4.0.98.tar.bz2 +a3a5c8f566d7f150168b6775f39ad68b kde-l10n-mk-4.0.98.tar.bz2 +127c86202beb589227fc2fce5cf60172 kde-l10n-lv-4.0.98.tar.bz2 +7761851d40228ff99268694ace65b271 kde-l10n-nb-4.0.98.tar.bz2 +cd32d33399d6d98c567c32f1189d9f94 kde-l10n-nds-4.0.98.tar.bz2 +9dfac93e533765cd27215e54d955f191 kde-l10n-ne-4.0.98.tar.bz2 +09e120153bac95d838731fc21a94ff9b kde-l10n-nl-4.0.98.tar.bz2 +50333413d1108c369d321335451bf101 kde-l10n-nn-4.0.98.tar.bz2 +278b96a224222fed7d932c5883ef661b kde-l10n-pa-4.0.98.tar.bz2 +ac8f505cae675f8131af4fbae5638ce5 kde-l10n-pl-4.0.98.tar.bz2 +6da6d201f9ca428cd452fb34fa62541e kde-l10n-pt-4.0.98.tar.bz2 +98fbadc044cf4a954f6ed37dbf9ddfb9 kde-l10n-pt_BR-4.0.98.tar.bz2 +6ddf05b0ca4a5b46563e1630b3f86989 kde-l10n-ru-4.0.98.tar.bz2 +80c2a906466831fcc786fa5a47d39b7e kde-l10n-se-4.0.98.tar.bz2 +7883962a6a2f35c9187ebd711f97a1c7 kde-l10n-sl-4.0.98.tar.bz2 +8aef3da452b46b2674708a28e0e8e912 kde-l10n-sr-4.0.98.tar.bz2 +d8dcd9c66429aa528394295faa4b57d6 kde-l10n-sv-4.0.98.tar.bz2 +cb52bdd5dddfd3d114ca2b431e6d5529 kde-l10n-ta-4.0.98.tar.bz2 +c16f08068149829ae1672941d0225d25 kde-l10n-th-4.0.98.tar.bz2 +81d85933f3ad731032dfd5a4cb16425d kde-l10n-tr-4.0.98.tar.bz2 +1c62c1b4389da07c73e3df4ef38be8ba kde-l10n-uk-4.0.98.tar.bz2 +22a61616d8e11d54b135314dd4c0e600 kde-l10n-wa-4.0.98.tar.bz2 +25d5dd8c2363fbe52c66dac63fdea6b7 kde-l10n-zh_CN-4.0.98.tar.bz2 +f9227a0db298ed0988459b61c1215a98 kde-l10n-zh_TW-4.0.98.tar.bz2 Index: subdirs-kde-l10n =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/subdirs-kde-l10n,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- subdirs-kde-l10n 7 May 2008 20:10:06 -0000 1.4 +++ subdirs-kde-l10n 24 Jul 2008 16:06:55 -0000 1.5 @@ -12,18 +12,14 @@ es et eu -fa fi fr -fy ga gl hi hu -is it ja -kk km ko mk @@ -40,7 +36,9 @@ ru se sl +sr sv +ta th tr uk From fedora-extras-commits at redhat.com Thu Jul 24 16:07:52 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 24 Jul 2008 16:07:52 GMT Subject: rpms/kdebindings/devel kdebindings-4.1.0-kate.patch, NONE, 1.1 kdebindings.spec, 1.131, 1.132 Message-ID: <200807241607.m6OG7qO8004256@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4048 Modified Files: kdebindings.spec Added Files: kdebindings-4.1.0-kate.patch Log Message: katepart lib is not needed kdebindings-4.1.0-kate.patch: --- NEW FILE kdebindings-4.1.0-kate.patch --- diff -up kdebindings-4.1.0/ruby/ktexteditor/CMakeLists.txt.orig kdebindings-4.1.0/ruby/ktexteditor/CMakeLists.txt --- kdebindings-4.1.0/ruby/ktexteditor/CMakeLists.txt.orig 2008-07-24 17:21:57.000000000 +0200 +++ kdebindings-4.1.0/ruby/ktexteditor/CMakeLists.txt 2008-07-24 17:22:10.000000000 +0200 @@ -10,16 +10,7 @@ target_link_libraries(rubyktexteditor smokeqt smokekde smokektexteditor - katepart qtruby4shared) set_target_properties(rubyktexteditor PROPERTIES PREFIX "" OUTPUT_NAME ktexteditor) install(TARGETS rubyktexteditor DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR}) install(FILES ktexteditor.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/ktexteditor) - -if(FALSE) -set(rubyloadktexteditor_LIBRARY_SRC loadktexteditor.cpp) -add_library(rubyloadktexteditor MODULE ${rubyloadktexteditor_LIBRARY_SRC}) -target_link_libraries(rubyloadktexteditor ${RUBY_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS}) -set_target_properties(rubyloadktexteditor PROPERTIES PREFIX "" OUTPUT_NAME loadktexteditor) -install(TARGETS rubyloadktexteditor DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR}) -endif(FALSE) Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- kdebindings.spec 23 Jul 2008 13:57:04 -0000 1.131 +++ kdebindings.spec 24 Jul 2008 16:07:04 -0000 1.132 @@ -30,6 +30,7 @@ URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: kdebindings-4.1.0-kate.patch BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} @@ -44,7 +45,7 @@ BuildRequires: pcre-devel # causes smokeqt to fail to build #{?smoke:BuildRequires: qwt-devel} -BuildRequires: PyQt4-devel +BuildRequires: PyQt4-devel >= 4.4.2 %if 0%{?fedora} > 8 BuildRequires: qscintilla-devel >= 2 %endif @@ -87,6 +88,7 @@ %prep %setup -q +%patch0 -p1 -b .kate %build mkdir -p %{_target_platform} From fedora-extras-commits at redhat.com Thu Jul 24 16:16:03 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 24 Jul 2008 16:16:03 GMT Subject: rpms/kernel/devel config-generic,1.140,1.141 Message-ID: <200807241616.m6OGG3jL004810@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4695 Modified Files: config-generic Log Message: remove dupe Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- config-generic 24 Jul 2008 09:37:15 -0000 1.140 +++ config-generic 24 Jul 2008 16:15:13 -0000 1.141 @@ -3494,7 +3494,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_DMADEVICES=y -CONFIG_INTEL_IOATDMA=m CONFIG_DMA_ENGINE=y CONFIG_NET_DMA=y # CONFIG_DMATEST is not set From fedora-extras-commits at redhat.com Thu Jul 24 16:16:38 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Thu, 24 Jul 2008 16:16:38 GMT Subject: rpms/subversion/F-9 subversion.spec,1.111,1.112 Message-ID: <200807241616.m6OGGcHq004874@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4790 Modified Files: subversion.spec Log Message: * Thu Jul 24 2008 Joe Orton 1.5.0-10.fc9 - rebuild to add ra_dav library thunk Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/subversion.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- subversion.spec 7 Jul 2008 18:59:06 -0000 1.111 +++ subversion.spec 24 Jul 2008 16:15:52 -0000 1.112 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.5.0 -Release: 8%{?dist} +Release: 10%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -190,6 +190,15 @@ s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g; }" $RPM_BUILD_ROOT%{_libdir}/*.la +# Create thunk ra_dav library for broken apps which linked against it. +> ra_dav-thunk.c +make ra_dav-thunk.lo +./libtool --mode=link %{__cc} $RPM_OPT_FLAGS \ + -shared -rpath %{_libdir} -o libsvn_ra_dav-1.la \ + ./subversion/libsvn_ra_neon/libsvn_ra_neon-1.la +./libtool --mode=install %{__install} -c libsvn_ra_dav-1.la \ + $RPM_BUILD_ROOT%{_libdir}/libsvn_ra_dav-1.la + %find_lang %{name} %if %{make_check} @@ -275,6 +284,9 @@ %endif %changelog +* Thu Jul 24 2008 Joe Orton 1.5.0-10.fc9 +- rebuild to add ra_dav library thunk + * Mon Jul 7 2008 Joe Orton 1.5.0-9.fc9 - rebuild for F9 From fedora-extras-commits at redhat.com Thu Jul 24 16:16:59 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 16:16:59 GMT Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec,1.2,1.3 Message-ID: <200807241616.m6OGGxrq004933@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4811 Modified Files: perl-AnyEvent.spec Log Message: - Update to 4.22 (rpm version : 4.220 ) Index: perl-AnyEvent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-AnyEvent.spec 18 Jul 2008 11:28:37 -0000 1.2 +++ perl-AnyEvent.spec 24 Jul 2008 16:16:13 -0000 1.3 @@ -1,12 +1,13 @@ +%define version_anyevent 4.22 Name: perl-AnyEvent -Version: 4.21 +Version: 4.220 Release: 1%{?dist} Summary: Framework for multiple event loops Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/AnyEvent/ -Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version_anyevent}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,7 +22,7 @@ %prep -%setup -q -n AnyEvent-%{version} +%setup -q -n AnyEvent-%{version_anyevent} # Filter unwanted Requires: cat << \EOF > %{name}-req @@ -33,7 +34,7 @@ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF -%define __perl_requires %{_builddir}/AnyEvent-%{version}/%{name}-req +%define __perl_requires %{_builddir}/AnyEvent-%{version_anyevent}/%{name}-req chmod +x %{name}-req # Filter unwanted Provides: @@ -43,7 +44,7 @@ sed -e '/^perl(AnyEvent::Impl::Qt/d' EOF -%define __perl_provides %{_builddir}/AnyEvent-%{version}/%{name}-prov +%define __perl_provides %{_builddir}/AnyEvent-%{version_anyevent}/%{name}-prov chmod +x %{name}-prov %build @@ -75,6 +76,9 @@ %changelog +* Fri Jul 18 2008 kwizart < kwizart at gmail.com > - 4.22-1 +- Update to 4.22 (rpm version : 4.220 ) + * Fri Jul 18 2008 kwizart < kwizart at gmail.com > - 4.21-1 - Update to 4.21 From fedora-extras-commits at redhat.com Thu Jul 24 16:19:00 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 16:19:00 GMT Subject: rpms/perl-AnyEvent/devel sources,1.3,1.4 Message-ID: <200807241619.m6OGJ0Rq005049@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4992 Modified Files: sources Log Message: Update source Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jul 2008 11:28:37 -0000 1.3 +++ sources 24 Jul 2008 16:18:13 -0000 1.4 @@ -1 +1 @@ -6fe3464f513dd8e45b1d64049d84bfdf AnyEvent-4.21.tar.gz +dc2795211724a5568422ee4847ee12e0 AnyEvent-4.22.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 16:21:05 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 24 Jul 2008 16:21:05 GMT Subject: rpms/kde-l10n/devel kde-l10n.spec,1.38,1.39 Message-ID: <200807241621.m6OGL5ZQ005133@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5072 Modified Files: kde-l10n.spec Log Message: fixed error: No source number 0 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- kde-l10n.spec 23 Jul 2008 14:38:33 -0000 1.38 +++ kde-l10n.spec 24 Jul 2008 16:20:19 -0000 1.39 @@ -11,7 +11,7 @@ BuildArch: noarch #Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2 #Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2 -Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2 Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2 Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-csb-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 16:24:04 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 16:24:04 GMT Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec, 1.3, 1.4 .cvsignore, 1.3, 1.4 Message-ID: <200807241624.m6OGO4EF005521@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5363 Modified Files: perl-AnyEvent.spec .cvsignore Log Message: More fixes Index: perl-AnyEvent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-AnyEvent.spec 24 Jul 2008 16:16:13 -0000 1.3 +++ perl-AnyEvent.spec 24 Jul 2008 16:23:19 -0000 1.4 @@ -1,4 +1,5 @@ %define version_anyevent 4.22 + Name: perl-AnyEvent Version: 4.220 Release: 1%{?dist} @@ -76,7 +77,7 @@ %changelog -* Fri Jul 18 2008 kwizart < kwizart at gmail.com > - 4.22-1 +* Fri Jul 18 2008 kwizart < kwizart at gmail.com > - 4.220-1 - Update to 4.22 (rpm version : 4.220 ) * Fri Jul 18 2008 kwizart < kwizart at gmail.com > - 4.21-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jul 2008 11:28:37 -0000 1.3 +++ .cvsignore 24 Jul 2008 16:23:19 -0000 1.4 @@ -1 +1 @@ -AnyEvent-4.21.tar.gz +AnyEvent-4.22.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 16:24:46 2008 From: fedora-extras-commits at redhat.com (Will Woods (wwoods)) Date: Thu, 24 Jul 2008 16:24:46 GMT Subject: rpms/pybluez/F-9 pybluez.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200807241624.m6OGOkeW005581@cvs-int.fedora.redhat.com> Author: wwoods Update of /cvs/extras/rpms/pybluez/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5470 Modified Files: pybluez.spec sources Log Message: Update to PyBluez-0.15 (bugfixes, License change, URL change) Index: pybluez.spec =================================================================== RCS file: /cvs/extras/rpms/pybluez/F-9/pybluez.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pybluez.spec 20 Feb 2008 06:59:31 -0000 1.2 +++ pybluez.spec 24 Jul 2008 16:23:58 -0000 1.3 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pybluez -Version: 0.9.1 -Release: 4%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: Python API for the BlueZ bluetooth stack Group: Development/Languages -License: GPL -URL: http://org.csail.mit.edu/pybluez -Source0: http://org.csail.mit.edu/pybluez/release/pybluez-src-0.9.1.tar.gz +License: GPLv2 +URL: http://code.google.com/p/pybluez/ +Source0: http://pybluez.googlecode.com/files/PyBluez-0.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel bluez-libs-devel @@ -19,12 +19,11 @@ applications. %prep -%setup -q +%setup -q -n PyBluez-%{version} %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build -doc/gendoc %install @@ -40,10 +39,13 @@ %files %defattr(-,root,root,-) -%doc doc/*.html README CHANGELOG COPYING examples +%doc README CHANGELOG COPYING examples %{python_sitearch}/* %changelog +* Wed Jun 4 2008 Will Woods - 0.15-1 +- New upstream version + * Wed Feb 20 2008 Fedora Release Engineering - 0.9.1-4 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pybluez/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jan 2007 21:08:58 -0000 1.2 +++ sources 24 Jul 2008 16:23:58 -0000 1.3 @@ -1 +1 @@ -3e7e951ea4e8433f3b80ef8c14d99c28 pybluez-src-0.9.1.tar.gz +104ad743d4bc999796ceff4f39d1003a PyBluez-0.15.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 16:28:46 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:28:46 GMT Subject: rpms/kernel/devel kernel.spec,1.796,1.797 Message-ID: <200807241628.m6OGSk7F005835@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5774 Modified Files: kernel.spec Log Message: Fix kernel_{conflicts,obsoletes,provides} Makes e.g. kernel_obsoletes actually work Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.796 retrieving revision 1.797 diff -u -r1.796 -r1.797 --- kernel.spec 24 Jul 2008 10:51:05 -0000 1.796 +++ kernel.spec 24 Jul 2008 16:27:51 -0000 1.797 @@ -440,9 +440,9 @@ Requires(pre): %{kernel_prereq}\ Conflicts: %{kernel_dot_org_conflicts}\ Conflicts: %{package_conflicts}\ -%{?1:%{expand:%%{?kernel_%{1}_conflicts:Conflicts: %%{kernel_%{1}_conflicts}}}}\ -%{?1:%{expand:%%{?kernel_%{1}_obsoletes:Obsoletes: %%{kernel_%{1}_obsoletes}}}}\ -%{?1:%{expand:%%{?kernel_%{1}_provides:Provides: %%{kernel_%{1}_provides}}}}\ +%{expand:%%{?kernel%{?1:_%{1}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\ +%{expand:%%{?kernel%{?1:_%{1}}_obsoletes:Obsoletes: %%{kernel%{?1:_%{1}}_obsoletes}}}\ +%{expand:%%{?kernel%{?1:_%{1}}_provides:Provides: %%{kernel%{?1:_%{1}}_provides}}}\ # We can't let RPM do the dependencies automatic because it'll then pick up\ # a correct but undesirable perl dependency from the module headers which\ # isn't required for the kernel proper to function\ From fedora-extras-commits at redhat.com Thu Jul 24 16:31:50 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:31:50 GMT Subject: rpms/kernel/devel kernel.spec,1.797,1.798 Message-ID: <200807241631.m6OGVo73005987@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887 Modified Files: kernel.spec Log Message: Change the way we our ld.so.conf file so that we can add nosegneg stuff for kernels with xen enabled Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.797 retrieving revision 1.798 diff -u -r1.797 -r1.798 --- kernel.spec 24 Jul 2008 16:27:51 -0000 1.797 +++ kernel.spec 24 Jul 2008 16:30:51 -0000 1.798 @@ -1326,6 +1326,12 @@ make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= %ifarch %{vdso_arches} make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer + if [ ! -s ldconfig-kernel.conf ]; then + echo > ldconfig-kernel.conf "\ +# Placeholder file, no vDSO hwcap entries used in this kernel." + fi + %{__install} -D -m 444 ldconfig-kernel.conf \ + $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernel-$KernelVer.conf %endif # And save the headers/makefiles etc for building modules against @@ -1523,22 +1529,6 @@ cd linux-%{kversion}.%{_target_cpu} -%if %{includexen} -%if %{with_xen} -mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d -rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf -cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf <<\EOF -# This directive teaches ldconfig to search in nosegneg subdirectories -# and cache the DSOs there with extra bit 0 set in their hwcap match -# fields. In Xen guest kernels, the vDSO tells the dynamic linker to -# search in nosegneg subdirectories and to match this extra hwcap bit -# in the ld.so.cache file. -hwcap 0 nosegneg -EOF -chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf -%endif -%endif - %if %{with_doc} mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}/Documentation @@ -1742,6 +1732,7 @@ /lib/modules/%{KVERREL}%{?2:.%{2}}/weak-updates\ %ifarch %{vdso_arches}\ /lib/modules/%{KVERREL}%{?2:.%{2}}/vdso\ +/etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\ %endif\ /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.block\ /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.networking\ @@ -1779,7 +1770,7 @@ %kernel_variant_files %{with_pae} PAE %kernel_variant_files %{with_pae_debug} PAEdebug %kernel_variant_files -k vmlinux %{with_kdump} kdump -%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen +%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen %{with_xen} xen %changelog * Thu Jul 24 2008 Roland McGrath From fedora-extras-commits at redhat.com Thu Jul 24 16:32:40 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 24 Jul 2008 16:32:40 GMT Subject: rpms/crossfire/devel crossfire.spec,1.10,1.11 Message-ID: <200807241632.m6OGWePa006029@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5960 Modified Files: crossfire.spec Log Message: Fix dependency on selinux policy version Index: crossfire.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/crossfire.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- crossfire.spec 24 Jul 2008 00:39:19 -0000 1.10 +++ crossfire.spec 24 Jul 2008 16:31:52 -0000 1.11 @@ -1,5 +1,5 @@ %define selinux_variants mls strict targeted -%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) +%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) %define logwatch_root %{_datadir}/logwatch @@ -87,9 +87,7 @@ Summary: SELinux policy files for crossfire Group: Amusements/Games Requires: %{name} = %{version}-%{release} -%if "%{selinux_policyver}" != "" Requires: selinux-policy >= %{selinux_policyver} -%endif Requires(post): /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles Requires(preun): /sbin/service /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles Requires(postun): /usr/sbin/semodule From fedora-extras-commits at redhat.com Thu Jul 24 16:34:38 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:34:38 GMT Subject: rpms/kernel/devel/scripts rebase-xen-hv.sh, 1.1, NONE rebase-xen-kernel.sh, 1.5, NONE Message-ID: <200807241634.m6OGYcdJ006125@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6082/scripts Removed Files: rebase-xen-hv.sh rebase-xen-kernel.sh Log Message: Kill off most of the remnants of the separate xen package Gone is the kernel-xen variant and xen.gz --- rebase-xen-hv.sh DELETED --- --- rebase-xen-kernel.sh DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 16:34:42 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:34:42 GMT Subject: rpms/kernel/devel Makefile.config, 1.65, 1.66 kernel.spec, 1.798, 1.799 config-xen-generic, 1.5, NONE config-xen-ia64, 1.1, NONE config-xen-x86, 1.1, NONE config-xen-x86_64, 1.2, NONE Message-ID: <200807241634.m6OGYgvO006140@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6082 Modified Files: Makefile.config kernel.spec Removed Files: config-xen-generic config-xen-ia64 config-xen-x86 config-xen-x86_64 Log Message: Kill off most of the remnants of the separate xen package Gone is the kernel-xen variant and xen.gz Index: Makefile.config =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- Makefile.config 16 Jul 2008 21:29:33 -0000 1.65 +++ Makefile.config 24 Jul 2008 16:33:56 -0000 1.66 @@ -12,9 +12,7 @@ $(CFG)-s390x.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-sparc64.config $(CFG)-sparc64-smp.config \ - $(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \ - $(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \ - $(CFG)-ia64-xen.config + $(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) @@ -61,21 +59,6 @@ temp-ia64-generic: config-ia64-generic temp-generic perl merge.pl $^ > $@ -temp-x86-xen-generic-tmp: config-xen-generic temp-x86-generic - perl merge.pl $^ > $@ - -temp-x86-xen-generic: config-xen-x86 temp-x86-xen-generic-tmp - perl merge.pl $^ > $@ - -temp-x86_64-xen-generic-tmp: config-xen-generic temp-x86_64-generic - perl merge.pl $^ > $@ - -temp-x86_64-xen-generic: config-xen-x86_64 temp-x86_64-xen-generic-tmp - perl merge.pl $^ > $@ - -temp-ia64-xen-generic: config-xen-generic temp-ia64-generic - perl merge.pl $^ > $@ - kernel-$(VERSION)-i686.config: config-i686 temp-x86-generic perl merge.pl $^ i386 > $@ @@ -120,12 +103,3 @@ kernel-$(VERSION)-ia64.config: config-ia64 temp-ia64-generic perl merge.pl $^ ia64 > $@ - -kernel-$(VERSION)-i686-xen.config: config-i686-PAE temp-x86-xen-generic - perl merge.pl $^ i386 > $@ - -kernel-$(VERSION)-x86_64-xen.config: /dev/null temp-x86_64-xen-generic - perl merge.pl $^ x86_64 > $@ - -kernel-$(VERSION)-ia64-xen.config: config-xen-ia64 temp-ia64-xen-generic - perl merge.pl $^ ia64 > $@ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.798 retrieving revision 1.799 diff -u -r1.798 -r1.799 --- kernel.spec 24 Jul 2008 16:30:51 -0000 1.798 +++ kernel.spec 24 Jul 2008 16:33:56 -0000 1.799 @@ -66,8 +66,6 @@ %define with_smp %{?_without_smp: 0} %{?!_without_smp: 1} # kernel-PAE (only valid for i686) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} -# kernel-xen -%define with_xen %{?_without_xen: 0} %{?!_without_xen: 1} # kernel-kdump %define with_kdump %{?_without_kdump: 0} %{?!_without_kdump: 1} # kernel-debug @@ -94,17 +92,10 @@ %define with_smponly %{?_with_smponly: 1} %{?!_with_smponly: 0} # Only build the pae kernel (--with paeonly): %define with_paeonly %{?_with_paeonly: 1} %{?!_with_paeonly: 0} -# Only build the xen kernel (--with xenonly): -%define with_xenonly %{?_with_xenonly: 1} %{?!_with_xenonly: 0} # should we do C=1 builds with sparse %define with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0} -# Whether or not to apply the Xen patches -- leave this enabled -%define includexen 0 -# Xen doesn't work with current upstream kernel, shut it off -%define with_xen 0 - # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. @@ -135,11 +126,6 @@ %define make_target bzImage -%define xen_hv_cset 11633 -%define xen_flags verbose=y crash_debug=y -%define xen_target vmlinuz -%define xen_image vmlinuz - %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}.%{_target_cpu} %define hdrarch %_target_cpu @@ -152,8 +138,6 @@ %endif %if %{nopatches} -%define includexen 0 -%define with_xen 0 %define with_bootwrapper 0 %define variant -vanilla %else @@ -181,7 +165,6 @@ %if %{with_baseonly} %define with_smp 0 %define with_pae 0 -%define with_xen 0 %define with_kdump 0 %define with_debug 0 %endif @@ -190,7 +173,6 @@ %if %{with_smponly} %define with_up 0 %define with_pae 0 -%define with_xen 0 %define with_kdump 0 %define with_debug 0 %endif @@ -199,16 +181,6 @@ %if %{with_paeonly} %define with_up 0 %define with_smp 0 -%define with_xen 0 -%define with_kdump 0 -%define with_debug 0 -%endif - -# if requested, only build xen kernel -%if %{with_xenonly} -%define with_up 0 -%define with_smp 0 -%define with_pae 0 %define with_kdump 0 %define with_debug 0 %endif @@ -230,11 +202,6 @@ %define with_pae 0 %endif -# xen only builds on i686, x86_64 and ia64 -%ifnarch i686 x86_64 ia64 -%define with_xen 0 -%endif - # only build kernel-kdump on ppc64 # (no relocatable kernel support upstream yet) %ifnarch ppc64 @@ -281,8 +248,6 @@ %define all_arch_configs kernel-%{version}-i?86*.config %define image_install_path boot %define hdrarch i386 -# we build always xen i686 HV with pae -%define xen_flags verbose=y crash_debug=y pae=y %define kernel_image arch/x86/boot/bzImage %endif @@ -334,10 +299,6 @@ %define image_install_path boot/efi/EFI/redhat %define make_target compressed %define kernel_image vmlinux.gz -# ia64 xen HV doesn't building with debug=y at the moment -%define xen_flags verbose=y crash_debug=y -%define xen_target compressed -%define xen_image vmlinux.gz %endif %ifarch alpha alphaev56 @@ -374,7 +335,6 @@ %define with_up 0 %define with_smp 0 %define with_pae 0 -%define with_xen 0 %define with_kdump 0 %define with_debuginfo 0 %define _enable_debug_packages 0 @@ -496,8 +456,6 @@ %endif Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -#Source1: xen-%{xen_hv_cset}.tar.bz2 -Source2: Config.mk Source10: COPYING.modules Source11: genkey @@ -508,18 +466,15 @@ Source21: config-debug Source22: config-nodebug Source23: config-generic -Source24: config-xen-generic -Source25: config-rhel-generic -Source26: config-rhel-x86-generic +Source24: config-rhel-generic +Source25: config-rhel-x86-generic Source30: config-x86-generic Source31: config-i586 Source32: config-i686 Source33: config-i686-PAE -Source34: config-xen-x86 Source40: config-x86_64-generic -Source41: config-xen-x86_64 Source50: config-powerpc-generic Source51: config-powerpc32-generic @@ -529,7 +484,6 @@ Source60: config-ia64-generic Source61: config-ia64 -Source62: config-xen-ia64 Source70: config-s390x @@ -819,13 +773,6 @@ on kernel bugs, as some of these options impact performance noticably. -%define variant_summary The Linux kernel compiled for Xen VM operations -%kernel_variant_package -n Xen xen -%description xen -This package includes a version of the Linux kernel which -runs in a Xen VM. It works for both privileged and unprivileged guests. - - %define variant_summary A minimal Linux kernel compiled for crash dumps %kernel_variant_package kdump %description kdump @@ -857,13 +804,6 @@ %endif %endif -%if %{with_xenonly} -%if !%{with_xen} -echo "Cannot build --with xenonly, xen build is disabled" -exit 1 -%endif -%endif - patch_command='patch -p1 -F1 -s' ApplyPatch() { @@ -1221,19 +1161,6 @@ cd .. -# Unpack the Xen tarball. -%if %{includexen} -cp %{SOURCE2} . -if [ -d xen ]; then - rm -rf xen -fi -%setup -D -T -q -n kernel-%{kversion} -a1 -cd xen -# Any necessary hypervisor patches go here - -%endif - - ### ### build ### @@ -1383,9 +1310,6 @@ ln -sf ../../../include/asm-ppc* asm popd fi -%if %{includexen} - cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include -%endif # Make sure the Makefile and version.h have a matching timestamp so that # external modules can be built @@ -1458,17 +1382,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/boot -%if %{includexen} -%if %{with_xen} - cd xen - mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot - make %{?_smp_mflags} %{xen_flags} - install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}.xen - install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}.xen - cd .. -%endif -%endif - cd linux-%{kversion}.%{_target_cpu} %if %{with_debug} @@ -1490,12 +1403,6 @@ BuildKernel %make_target %kernel_image smp %endif -%if %{includexen} -%if %{with_xen} -BuildKernel %xen_target %xen_image xen -%endif -%endif - %if %{with_kdump} BuildKernel vmlinux vmlinux kdump vmlinux %endif @@ -1664,8 +1571,6 @@ %kernel_variant_post -v PAEdebug -s kernel-smp -r kernel-PAEdebug %kernel_variant_preun PAEdebug -%kernel_variant_preun xen -%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}.xen` if [ -x /sbin/ldconfig ] then /sbin/ldconfig -X || exit $? @@ -1770,7 +1675,6 @@ %kernel_variant_files %{with_pae} PAE %kernel_variant_files %{with_pae_debug} PAEdebug %kernel_variant_files -k vmlinux %{with_kdump} kdump -%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen %{with_xen} xen %changelog * Thu Jul 24 2008 Roland McGrath --- config-xen-generic DELETED --- --- config-xen-ia64 DELETED --- --- config-xen-x86 DELETED --- --- config-xen-x86_64 DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 16:36:19 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:36:19 GMT Subject: rpms/kernel/devel kernel.spec,1.799,1.800 Message-ID: <200807241636.m6OGaJ18006292@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6196 Modified Files: kernel.spec Log Message: Remove unneeded %kernel_variant_post args We no longer need the ability to pass arbitrary mkinitrd args to %kernel_variant_post Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.799 retrieving revision 1.800 diff -u -r1.799 -r1.800 --- kernel.spec 24 Jul 2008 16:33:56 -0000 1.799 +++ kernel.spec 24 Jul 2008 16:35:23 -0000 1.800 @@ -1514,7 +1514,7 @@ %{nil} # This macro defines a %%posttrans script for a kernel package. -# %%kernel_variant_posttrans [-v ] [-s -r ] +# %%kernel_variant_posttrans [-v ] [-s -r ] # More text can follow to go at the end of this variant's %%post. # %define kernel_variant_posttrans(s:r:v:) \ @@ -1524,7 +1524,7 @@ # # This macro defines a %%post script for a kernel package and its devel package. -# %%kernel_variant_post [-v ] [-s -r ] +# %%kernel_variant_post [-v ] [-s -r ] # More text can follow to go at the end of this variant's %%post. # %define kernel_variant_post(s:r:v:) \ @@ -1536,7 +1536,7 @@ [ -f /etc/sysconfig/kernel ]; then\ /bin/sed -i -e 's/^DEFAULTKERNEL=%{-s*}$/DEFAULTKERNEL=%{-r*}/' /etc/sysconfig/kernel || exit $?\ fi}\ -/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{*} %{KVERREL}%{?-v:.%{-v*}} || exit $?\ +/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\ #if [ -x /sbin/weak-modules ]\ #then\ # /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\ From fedora-extras-commits at redhat.com Thu Jul 24 16:37:53 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:37:53 GMT Subject: rpms/kernel/devel kernel.spec,1.800,1.801 Message-ID: <200807241637.m6OGbrxs006372@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6322 Modified Files: kernel.spec Log Message: Kill -a and -e args to %kernel_variant_files We don't need them anymore Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.800 retrieving revision 1.801 diff -u -r1.800 -r1.801 --- kernel.spec 24 Jul 2008 16:35:23 -0000 1.800 +++ kernel.spec 24 Jul 2008 16:37:07 -0000 1.801 @@ -1617,9 +1617,9 @@ # # This macro defines the %%files sections for a kernel package # and its devel and debuginfo packages. -# %%kernel_variant_files [-k vmlinux] [-a ] [-e ] +# %%kernel_variant_files [-k vmlinux] # -%define kernel_variant_files(a:e:k:) \ +%define kernel_variant_files(k:) \ %if %{1}\ %{expand:%%files %{?2}}\ %defattr(-,root,root)\ @@ -1627,7 +1627,6 @@ /boot/System.map-%{KVERREL}%{?2:.%{2}}\ #/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\ /boot/config-%{KVERREL}%{?2:.%{2}}\ -%{?-a:%{-a*}}\ %dir /lib/modules/%{KVERREL}%{?2:.%{2}}\ /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel\ /lib/modules/%{KVERREL}%{?2:.%{2}}/build\ @@ -1643,7 +1642,6 @@ /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.networking\ /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.order\ %ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\ -%{?-e:%{-e*}}\ %{expand:%%files %{?2:%{2}-}devel}\ %defattr(-,root,root)\ %verify(not mtime) /usr/src/kernels/%{KVERREL}%{?2:.%{2}}\ From fedora-extras-commits at redhat.com Thu Jul 24 16:39:32 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:39:32 GMT Subject: rpms/kernel/devel config-x86-generic, 1.42, 1.43 config-x86_64-generic, 1.41, 1.42 Message-ID: <200807241639.m6OGdWgu006504@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6415 Modified Files: config-x86-generic config-x86_64-generic Log Message: Slightly re-org virt related configs Get all OCD on virt related configs - bring them together, separate the host stuff from the guest stuff and make the x86_64 config look much more like the x86 config. Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- config-x86-generic 23 Jul 2008 19:51:09 -0000 1.42 +++ config-x86-generic 24 Jul 2008 16:38:41 -0000 1.43 @@ -318,9 +318,6 @@ # CONFIG_SMSC37B787_WDT is not set CONFIG_W83697HF_WDT=m -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set - CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x400000 CONFIG_PHYSICAL_START=0x400000 @@ -331,12 +328,21 @@ CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m +CONFIG_KVM_TRACE=y +CONFIG_LGUEST=m + +CONFIG_PARAVIRT_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y -CONFIG_KVM_TRACE=y +# CONFIG_XEN is not set +CONFIG_LGUEST_GUEST=y +CONFIG_VMI=y CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m @@ -360,14 +366,6 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m -CONFIG_VIRTUALIZATION=y -CONFIG_PARAVIRT_GUEST=y -CONFIG_VMI=y -CONFIG_LGUEST=m -CONFIG_LGUEST_GUEST=y -# CONFIG_XEN is not set -# CONFIG_HVC_XEN is not set - CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- config-x86_64-generic 21 Jul 2008 19:45:13 -0000 1.41 +++ config-x86_64-generic 24 Jul 2008 16:38:41 -0000 1.42 @@ -1,6 +1,5 @@ CONFIG_64BIT=y CONFIG_UID16=y -# CONFIG_XEN is not set # CONFIG_MK8 is not set # CONFIG_MPSC is not set CONFIG_GENERIC_CPU=y @@ -227,11 +226,6 @@ # CONFIG_VIDEO_CAFE_CCIC is not set -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_KVM_TRACE=y - CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m @@ -254,18 +248,23 @@ CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_TRACE=y + +CONFIG_PARAVIRT_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +# CONFIG_XEN is not set CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m CONFIG_SENSORS_I5K_AMB=m -CONFIG_PARAVIRT_GUEST=y -CONFIG_KVM_CLOCK=y -CONFIG_KVM_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set - # CONFIG_COMPAT_VDSO is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set From fedora-extras-commits at redhat.com Thu Jul 24 16:41:10 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:41:10 GMT Subject: rpms/kernel/devel linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch, NONE, 1.1 linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch, NONE, 1.1 linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch, NONE, 1.1 config-x86-generic, 1.43, 1.44 config-x86_64-generic, 1.42, 1.43 kernel.spec, 1.801, 1.802 Message-ID: <200807241641.m6OGfAkN006590@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6528 Modified Files: config-x86-generic config-x86_64-generic kernel.spec Added Files: linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch Log Message: Enable Xen support again Now that i686 PAE and x86_64 Xen DomU support is fully upstream, re-enable it in the stock kernel. The only not-upstream patches we require are to support execshield Also note the Obsoletes/Provides to make upgrades go smoothely. linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch: --- NEW FILE linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch --- >From cdff48f3077459f1dfaf243db8e402c8202a2693 Mon Sep 17 00:00:00 2001 From: Stephen Tweedie Date: Tue, 11 Mar 2008 18:05:30 +0000 Subject: [PATCH] xen execshield: Add xen-specific load_user_cs_desc() x86 32-bit execshield uses load_user_cs_desc() to setup the user CS descriptor, but the Xen version needs to do this via a hypercall. Add this via a new pv_cpu_ops->load_user_cs_desc pv_ops indirection so that it can be selected appropriately at run-time. Signed-off-by: Stephen Tweedie --- arch/x86/kernel/paravirt.c | 1 + arch/x86/xen/enlighten.c | 17 +++++++++++++++++ include/asm-x86/desc.h | 8 ++++++-- include/asm-x86/paravirt.h | 6 ++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 94da4d5..f2a678c 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -336,6 +336,7 @@ struct pv_cpu_ops pv_cpu_ops = { .read_tscp = native_read_tscp, .load_tr_desc = native_load_tr_desc, .set_ldt = native_set_ldt, + .load_user_cs_desc = native_load_user_cs_desc, .load_gdt = native_load_gdt, .load_idt = native_load_idt, .store_gdt = native_store_gdt, diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 9ff6e3c..9b95277 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -340,6 +340,22 @@ static void xen_set_ldt(const void *addr, unsigned entries) xen_mc_issue(PARAVIRT_LAZY_CPU); } +static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm) +{ + void *gdt; + xmaddr_t mgdt; + u64 descriptor; + struct desc_struct user_cs; + + gdt = &get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]; + mgdt = virt_to_machine(gdt); + + user_cs = mm->context.user_cs; + descriptor = (u64) user_cs.a | ((u64) user_cs.b) << 32; + + HYPERVISOR_update_descriptor(mgdt.maddr, descriptor); +} + static void xen_load_gdt(const struct desc_ptr *dtr) { unsigned long *frames; @@ -1213,6 +1229,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .load_tr_desc = paravirt_nop, .set_ldt = xen_set_ldt, + .load_user_cs_desc = xen_load_user_cs_desc, .load_gdt = xen_load_gdt, .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 3a545b1..713634f 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -6,6 +6,7 @@ #include #include #include +#include static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *info) @@ -90,6 +91,7 @@ static inline int desc_empty(const void *ptr) #define load_TLS(t, cpu) native_load_tls(t, cpu) #define set_ldt native_set_ldt +#define load_user_cs_desc native_load_user_cs_desc #define write_ldt_entry(dt, entry, desc) \ native_write_ldt_entry(dt, entry, desc) @@ -380,8 +382,10 @@ static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) desc->b = (limit & 0xf0000) | 0x00c0fb00; } -#define load_user_cs_desc(cpu, mm) \ - get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs +static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm) +{ + get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = mm->context.user_cs; +} extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index fbbde93..151ac7a 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h @@ -113,6 +113,7 @@ struct pv_cpu_ops { void (*store_gdt)(struct desc_ptr *); void (*store_idt)(struct desc_ptr *); void (*set_ldt)(const void *desc, unsigned entries); + void (*load_user_cs_desc)(int cpu, struct mm_struct *mm); unsigned long (*store_tr)(void); void (*load_tls)(struct thread_struct *t, unsigned int cpu); #ifdef CONFIG_X86_64 @@ -840,6 +841,11 @@ static inline void set_ldt(const void *addr, unsigned entries) { PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries); } +static inline void load_user_cs_desc(unsigned int cpu, + struct mm_struct *mm) +{ + PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm); +} static inline void store_gdt(struct desc_ptr *dtr) { PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); -- 1.5.4.1 linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch: --- NEW FILE linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch --- >From ad6f7a1789fdb94b16952f50ed65964dc206d7be Mon Sep 17 00:00:00 2001 From: Stephen Tweedie Date: Tue, 11 Mar 2008 18:07:31 +0000 Subject: [PATCH] xen execshield: fix endless GPF fault loop Under Xen, loading the user_cs descriptor does not necessarily load the descriptor with the exact same values the kernel requested: some of the control bits in the descriptor may be modified by the hypervisor. With execshield, the check_lazy_exec_limit() function is needed to test whether a fault has been caused by the existing user_cs descriptor being too constrained: if so, it performs a lazy expansion of the legal cs segment bounds. But it does so via an exact match on the descriptor values against their current expected values, so if Xen modifies any control bits in the descriptor, it looks as if the user_cs is out-of-sync; so check_lazy_exec_limit() resets the descriptor and retakes the fault unnecessarily. This means that a GPF fault can be retried indefinitely, with the kernel always seeing the wrong values in user_cs and continually trying to correct them and retake the fault. Fix it by masking off the xen-sensitive control bits when checking that the segment descriptor is up-to-date, and comparing only the bits which affect the segment base and limit. Affects 32-bit only; execshield on 64-bit uses NX for this functionality. Signed-off-by: Stephen Tweedie --- arch/x86/kernel/traps_32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index d001d55..c932b3e 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c @@ -621,7 +621,8 @@ check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code) desc1 = ¤t->mm->context.user_cs; desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; - if (desc1->a != desc2->a || desc1->b != desc2->b) { + if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) || + desc1->b != desc2->b) { /* * The CS was not in sync - reload it and retry the * instruction. If the instruction still faults then -- 1.5.4.1 linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch: --- NEW FILE linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch --- >From 226bc4b8f13ece618de046f6f8da88eeb4b8f8da Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 25 Mar 2008 11:56:43 +0000 Subject: [PATCH] xen execshield: Only define load_user_cs_desc() on 32 bit load_user_cs_desc() is only used on 32 bit, so only define it in that case. Fixes compile failure in native_load_user_cs_desc() since mm_context_t->user_cs is only available on 32 bit. Signed-off-by: Mark McLoughlin --- arch/x86/kernel/paravirt.c | 2 ++ arch/x86/xen/enlighten.c | 4 ++++ include/asm-x86/desc.h | 4 ++++ include/asm-x86/paravirt.h | 4 ++++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index f2a678c..4277d1a 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -336,7 +336,9 @@ struct pv_cpu_ops pv_cpu_ops = { .read_tscp = native_read_tscp, .load_tr_desc = native_load_tr_desc, .set_ldt = native_set_ldt, +#ifdef CONFIG_X86_32 .load_user_cs_desc = native_load_user_cs_desc, +#endif .load_gdt = native_load_gdt, .load_idt = native_load_idt, .store_gdt = native_store_gdt, diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 9b95277..c54060c 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -340,6 +340,7 @@ static void xen_set_ldt(const void *addr, unsigned entries) xen_mc_issue(PARAVIRT_LAZY_CPU); } +#ifdef CONFIG_X86_32 static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm) { void *gdt; @@ -355,6 +356,7 @@ static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm) HYPERVISOR_update_descriptor(mgdt.maddr, descriptor); } +#endif static void xen_load_gdt(const struct desc_ptr *dtr) { @@ -1229,7 +1231,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .load_tr_desc = paravirt_nop, .set_ldt = xen_set_ldt, +#ifdef CONFIG_X86_32 .load_user_cs_desc = xen_load_user_cs_desc, +#endif .load_gdt = xen_load_gdt, .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 713634f..54234ac 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -91,7 +91,9 @@ static inline int desc_empty(const void *ptr) #define load_TLS(t, cpu) native_load_tls(t, cpu) #define set_ldt native_set_ldt +#ifdef CONFIG_X86_32 #define load_user_cs_desc native_load_user_cs_desc +#endif #define write_ldt_entry(dt, entry, desc) \ native_write_ldt_entry(dt, entry, desc) @@ -382,10 +384,12 @@ static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) desc->b = (limit & 0xf0000) | 0x00c0fb00; } +#ifdef CONFIG_X86_32 static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm) { get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = mm->context.user_cs; } +#endif extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index 151ac7a..f354748 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h @@ -113,7 +113,9 @@ struct pv_cpu_ops { void (*store_gdt)(struct desc_ptr *); void (*store_idt)(struct desc_ptr *); void (*set_ldt)(const void *desc, unsigned entries); +#ifdef CONFIG_X86_32 void (*load_user_cs_desc)(int cpu, struct mm_struct *mm); +#endif unsigned long (*store_tr)(void); void (*load_tls)(struct thread_struct *t, unsigned int cpu); #ifdef CONFIG_X86_64 @@ -841,11 +843,13 @@ static inline void set_ldt(const void *addr, unsigned entries) { PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries); } +#ifdef CONFIG_X86_32 static inline void load_user_cs_desc(unsigned int cpu, struct mm_struct *mm) { PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm); } +#endif static inline void store_gdt(struct desc_ptr *dtr) { PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); -- 1.5.4.1 Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- config-x86-generic 24 Jul 2008 16:38:41 -0000 1.43 +++ config-x86-generic 24 Jul 2008 16:40:21 -0000 1.44 @@ -340,10 +340,20 @@ # CONFIG_PARAVIRT_DEBUG is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y -# CONFIG_XEN is not set CONFIG_LGUEST_GUEST=y CONFIG_VMI=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_SAVE_RESTORE=y +CONFIG_HVC_XEN=y +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_KBDDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m + CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m CONFIG_MTD_NAND_CAFE=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- config-x86_64-generic 24 Jul 2008 16:38:41 -0000 1.42 +++ config-x86_64-generic 24 Jul 2008 16:40:21 -0000 1.43 @@ -258,7 +258,17 @@ # CONFIG_PARAVIRT_DEBUG is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y -# CONFIG_XEN is not set + +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=32 +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_SAVE_RESTORE=y +CONFIG_HVC_XEN=y +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_KBDDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.801 retrieving revision 1.802 diff -u -r1.801 -r1.802 --- kernel.spec 24 Jul 2008 16:37:07 -0000 1.801 +++ kernel.spec 24 Jul 2008 16:40:21 -0000 1.802 @@ -372,7 +372,13 @@ # upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise # now that the smp kernel offers this capability, obsolete the old kernel %define kernel_smp_obsoletes kernel-enterprise < 2.4.10 -%define kernel_PAE_obsoletes kernel-smp < 2.6.17 +%define kernel_PAE_obsoletes kernel-smp < 2.6.17, kernel-xen <= 2.6.27-0.2.rc0.git6.fc10 +%define kernel_PAE_provides kernel-xen = %{rpmversion}-%{pkg_release} + +%ifarch x86_64 +%define kernel_obsoletes kernel-xen <= 2.6.27-0.2.rc0.git6.fc10 +%define kernel_provides kernel-xen = %{rpmversion}-%{pkg_release} +%endif # We moved the drm include files into kernel-headers, make sure there's # a recent enough libdrm-devel on the system that doesn't have those. @@ -549,6 +555,9 @@ Patch149: linux-2.6-efika-not-chrp.patch Patch160: linux-2.6-execshield.patch +Patch161: linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch +Patch162: linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch +Patch163: linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch Patch250: linux-2.6-debug-sizeof-structs.patch Patch260: linux-2.6-debug-nmi-timeout.patch Patch270: linux-2.6-debug-taint-vm.patch @@ -995,6 +1004,9 @@ # Exec shield # ApplyPatch linux-2.6-execshield.patch +ApplyPatch linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch +ApplyPatch linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch +ApplyPatch linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch # # bugfixes to drivers and filesystems @@ -1253,6 +1265,15 @@ make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= %ifarch %{vdso_arches} make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer + if grep '^CONFIG_XEN=y$' .config >/dev/null; then + echo > ldconfig-kernel.conf "\ +# This directive teaches ldconfig to search in nosegneg subdirectories +# and cache the DSOs there with extra bit 0 set in their hwcap match +# fields. In Xen guest kernels, the vDSO tells the dynamic linker to +# search in nosegneg subdirectories and to match this extra hwcap bit +# in the ld.so.cache file. +hwcap 0 nosegneg" + fi if [ ! -s ldconfig-kernel.conf ]; then echo > ldconfig-kernel.conf "\ # Placeholder file, no vDSO hwcap entries used in this kernel." From fedora-extras-commits at redhat.com Thu Jul 24 16:44:47 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 16:44:47 GMT Subject: rpms/kernel/devel kernel.spec,1.802,1.803 Message-ID: <200807241644.m6OGilQm006833@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6797 Modified Files: kernel.spec Log Message: * Thu Jul 24 2008 Mark McLoughlin - Enable Xen guest support in kernel-PAE.i686 and kernel.x86_64 - Obsolete kernel-xen - Remove the hypervisor (xen.gz) - moved to xen-hypervisor package Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.802 retrieving revision 1.803 diff -u -r1.802 -r1.803 --- kernel.spec 24 Jul 2008 16:40:21 -0000 1.802 +++ kernel.spec 24 Jul 2008 16:44:01 -0000 1.803 @@ -1696,6 +1696,11 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Thu Jul 24 2008 Mark McLoughlin +- Enable Xen guest support in kernel-PAE.i686 and kernel.x86_64 +- Obsolete kernel-xen +- Remove the hypervisor (xen.gz) - moved to xen-hypervisor package + * Thu Jul 24 2008 Roland McGrath - Disable sfc module, not compiling. - Disable kernel-doc package. From fedora-extras-commits at redhat.com Thu Jul 24 16:59:57 2008 From: fedora-extras-commits at redhat.com (C. Scott Ananian (cscott)) Date: Thu, 24 Jul 2008 16:59:57 GMT Subject: rpms/initscripts/OLPC-3 olpc-runlevel.patch, NONE, 1.1 olpc-setolpckeys.patch, NONE, 1.1 olpc-xstartup.patch, NONE, 1.1 initscripts-8.76.2-prettyboot.patch, 1.2, 1.3 initscripts.spec, 1.180, 1.181 Message-ID: <200807241659.m6OGxv3t007966@cvs-int.fedora.redhat.com> Author: cscott Update of /cvs/pkgs/rpms/initscripts/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7826 Modified Files: initscripts-8.76.2-prettyboot.patch initscripts.spec Added Files: olpc-runlevel.patch olpc-setolpckeys.patch olpc-xstartup.patch Log Message: * Unfreeze DCON after failed X start, and fail more quickly when there are problems. * Change default runlevel to 5 (replacing an uglier patch to do this in our image creation tool). * Remove a redundant udev console initialization which causes the screen to flash during prettyboot (dlo trac #3569). This replaces an uglier patch to do this in our image creation tool. * Set up keymap when hal sees an OLPC keyboard. This replaces an uglier patch in our image creation tool. olpc-runlevel.patch: --- NEW FILE olpc-runlevel.patch --- --- initscripts-8.76.2/inittab.upstart.orig 2008-07-23 13:47:33.000000000 -0400 +++ initscripts-8.76.2/inittab.upstart 2008-07-23 13:47:51.000000000 -0400 @@ -23,4 +23,4 @@ # 5 - X11 # 6 - reboot (Do NOT set initdefault to this) # -id:3:initdefault: +id:5:initdefault: olpc-setolpckeys.patch: --- NEW FILE olpc-setolpckeys.patch --- diff -ruHpN initscripts-8.76.2.orig/udev/rules.d/96-olpc-keyboard.rules initscripts-8.76.2/udev/rules.d/96-olpc-keyboard.rules --- initscripts-8.76.2.orig/udev/rules.d/96-olpc-keyboard.rules 1969-12-31 19:00:00.000000000 -0500 +++ initscripts-8.76.2/udev/rules.d/96-olpc-keyboard.rules 2008-07-24 12:44:36.000000000 -0400 @@ -0,0 +1 @@ +ACTION=="add", SYSFS{name}=="AT Translated Set 2 keyboard", KERNEL=="event*", RUN+="/usr/sbin/setolpckeys /dev/input/%k" olpc-xstartup.patch: --- NEW FILE olpc-xstartup.patch --- --- initscripts-8.76.2/event.d/prefdm.orig 2008-07-23 19:34:18.000000000 -0400 +++ initscripts-8.76.2/event.d/prefdm 2008-07-23 19:35:13.000000000 -0400 @@ -8,5 +8,10 @@ console output respawn -respawn limit 10 120 +respawn limit 3 120 exec /usr/sbin/olpc-dm + +# make sure dcon is unfrozen if something goes wrong. +post-stop script + echo 0 > /sys/devices/platform/dcon/freeze +end script initscripts-8.76.2-prettyboot.patch: Index: initscripts-8.76.2-prettyboot.patch =================================================================== RCS file: /cvs/pkgs/rpms/initscripts/OLPC-3/initscripts-8.76.2-prettyboot.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- initscripts-8.76.2-prettyboot.patch 27 Jun 2008 21:29:32 -0000 1.2 +++ initscripts-8.76.2-prettyboot.patch 24 Jul 2008 16:59:03 -0000 1.3 @@ -50,3 +50,19 @@ # Load other user-defined modules for file in /etc/sysconfig/modules/*.modules ; do +diff -ruHp initscripts-8.76.2.orig/udev/rules.d/10-console.rules initscripts-8.76.2/udev/rules.d/10-console.rules +--- initscripts-8.76.2.orig/udev/rules.d/10-console.rules 2008-07-24 12:26:56.000000000 -0400 ++++ initscripts-8.76.2/udev/rules.d/10-console.rules 2008-07-24 12:29:15.000000000 -0400 +@@ -1,5 +1,11 @@ + # Console initialization - keyboard, font, etc. +-KERNEL=="tty0", RUN+="/lib/udev/console_init %k" ++# OLPC: commented out to remove tty0 udev initialization, which takes ++# place during pretty boot and makes the screen flash (dlo trac #3569). ++# We set up the console ourselves, both in ++# 96-olpc-keyboard.rules as well as in olpc-configure, and we ++# set the appropriate font in /etc/init.d/z-boot-anim-stop -- so ++# this is completely unnecessary. ++#KERNEL=="tty0", RUN+="/lib/udev/console_init %k" + + # Check and set up serial and serial-like consoles if necessary + KERNEL=="console", RUN+="/lib/udev/console_check %k" Index: initscripts.spec =================================================================== RCS file: /cvs/pkgs/rpms/initscripts/OLPC-3/initscripts.spec,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- initscripts.spec 29 Jun 2008 16:05:13 -0000 1.180 +++ initscripts.spec 24 Jul 2008 16:59:03 -0000 1.181 @@ -6,12 +6,15 @@ # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.6 +Release: 1%{?dist}.7 Source: initscripts-%{version}.tar.bz2 Patch0: olpc-initscripts.patch Patch1: olpc-autologin.patch Patch2: initscripts-8.76.2-readonly.patch Patch3: initscripts-8.76.2-prettyboot.patch +Patch4: olpc-xstartup.patch +Patch5: olpc-runlevel.patch +Patch6: olpc-setolpckeys.patch BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -57,6 +60,13 @@ %patch1 -p1 %patch2 -p1 -b .readonly %patch3 -p1 -b .prettyboot +%patch4 -p1 -b .xstartup +%patch5 -p1 -b .runlevel +%patch6 -p1 -b .setolpckeys +# clean up patch backup files which would otherwise get copied into the +# RPM. +rm -f udev/rules.d/*.prettyboot udev/rules.d/*.setolpckeys +rm -f event.d/*.xstartup %build make @@ -246,6 +256,17 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Jul 23 2008 C. Scott Ananian - 8.76.2-1.7 +- Unfreeze DCON after failed X start, and fail more quickly when there + are problems. +- Change default runlevel to 5 (replacing an uglier patch to do this + in our image creation tool). +- Remove a redundant udev console initialization which causes the + screen to flash during prettyboot (dlo trac #3569). This replaces + an uglier patch to do this in our image creation tool. +- Set up keymap when hal sees an OLPC keyboard. This replaces an + uglier patch in our image creation tool. + * Sat Jun 28 2008 C. Scott Ananian - 8.76.2-1.6 - Turn on graphical boot by default to generate proper rhgb messages for pretty boot. From fedora-extras-commits at redhat.com Thu Jul 24 17:00:40 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 24 Jul 2008 17:00:40 GMT Subject: comps comps-f10.xml.in,1.60,1.61 Message-ID: <200807241700.m6OH0eu8008013@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7951 Modified Files: comps-f10.xml.in Log Message: Drop kernel-xen because it's been folded back into kernel-PAE.i686 and kernel.x86_64 Drop xen because we don't have Dom0 support at the moment Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- comps-f10.xml.in 23 Jul 2008 15:32:04 -0000 1.60 +++ comps-f10.xml.in 24 Jul 2008 17:00:10 -0000 1.61 @@ -4358,9 +4358,7 @@ virt-manager virt-viewer gnome-applet-vm - kernel-xen virt-top - xen From fedora-extras-commits at redhat.com Thu Jul 24 17:04:35 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 17:04:35 GMT Subject: rpms/kdeadmin/devel kdeadmin.spec,1.103,1.104 Message-ID: <200807241704.m6OH4ZYe014862@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14811/devel Modified Files: kdeadmin.spec Log Message: * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - remove broken .pc file, drop Requires: pkgconfig Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- kdeadmin.spec 23 Jul 2008 12:43:23 -0000 1.103 +++ kdeadmin.spec 24 Jul 2008 17:03:49 -0000 1.104 @@ -1,7 +1,7 @@ Name: kdeadmin Epoch: 7 Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment - Administrative tools Group: User Interface/Desktops @@ -24,7 +24,6 @@ Requires(postun): /sbin/ldconfig xdg-utils Requires: kdelibs4 >= %{version} Requires: kdepimlibs >= %{version} -Requires: pkgconfig %description @@ -66,6 +65,9 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} +# remove broken .pc file which has no business to be in a non-devel pkg anyway +rm -rf %{buildroot}%{_libdir}/pkgconfig + %clean rm -rf %{buildroot} @@ -119,6 +121,9 @@ %changelog +* Thu Jul 24 2008 Kevin Kofler 4.1.0-2 +- remove broken .pc file, drop Requires: pkgconfig + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Thu Jul 24 17:06:57 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 17:06:57 GMT Subject: rpms/kdeadmin/devel kdeadmin.spec,1.104,1.105 Message-ID: <200807241706.m6OH6v2s014998@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14921/devel Modified Files: kdeadmin.spec Log Message: Mention bug ID. Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- kdeadmin.spec 24 Jul 2008 17:03:49 -0000 1.104 +++ kdeadmin.spec 24 Jul 2008 17:05:59 -0000 1.105 @@ -122,7 +122,7 @@ %changelog * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 -- remove broken .pc file, drop Requires: pkgconfig +- remove broken .pc file (segfaults RPM, #456100), drop Requires: pkgconfig * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Thu Jul 24 17:23:46 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 17:23:46 GMT Subject: rpms/kdeadmin/devel kdeadmin.spec,1.105,1.106 Message-ID: <200807241723.m6OHNkcJ015907@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15868/devel Modified Files: kdeadmin.spec Log Message: Fix the file list. Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- kdeadmin.spec 24 Jul 2008 17:05:59 -0000 1.105 +++ kdeadmin.spec 24 Jul 2008 17:22:53 -0000 1.106 @@ -108,7 +108,6 @@ %exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage* %{_kde4_libdir}/kde4/kcm_cron.so %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so -%{_libdir}/pkgconfig/*.pc %files kpackage %defattr(-,root,root,-) From fedora-extras-commits at redhat.com Thu Jul 24 17:51:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 17:51:43 +0000 Subject: [pkgdb] mozvoikko (Fedora, 9) updated by kevin Message-ID: <20080724175143.97CF11AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for mozvoikko Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mozvoikko (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mozvoikko (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mozvoikko (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on mozvoikko (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mozvoikko From fedora-extras-commits at redhat.com Thu Jul 24 17:51:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 17:51:39 +0000 Subject: [pkgdb] mozvoikko was added for vpv Message-ID: <20080724175139.9D1291AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package mozvoikko with summary Finnish Voikko spell-checker extension for Mozilla programs Kevin Fenzi (kevin) has approved Package mozvoikko Kevin Fenzi (kevin) has added a Fedora devel branch for mozvoikko with an owner of vpv Kevin Fenzi (kevin) has approved mozvoikko in Fedora devel Kevin Fenzi (kevin) has approved Package mozvoikko Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mozvoikko (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mozvoikko (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mozvoikko (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on mozvoikko (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on mozvoikko (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on mozvoikko (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mozvoikko From fedora-extras-commits at redhat.com Thu Jul 24 17:51:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 17:51:43 +0000 Subject: [pkgdb] mozvoikko (Fedora, devel) updated by kevin Message-ID: <20080724175143.C5DE91AD0EB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on mozvoikko (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mozvoikko From fedora-extras-commits at redhat.com Thu Jul 24 17:52:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 17:52:19 GMT Subject: rpms/mozvoikko - New directory Message-ID: <200807241752.m6OHqJnx016963@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mozvoikko In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16926/rpms/mozvoikko Log Message: Directory /cvs/extras/rpms/mozvoikko added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 17:52:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 17:52:34 GMT Subject: rpms/mozvoikko/devel - New directory Message-ID: <200807241752.m6OHqY6P016990@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mozvoikko/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16926/rpms/mozvoikko/devel Log Message: Directory /cvs/extras/rpms/mozvoikko/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 17:52:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 17:52:46 GMT Subject: rpms/mozvoikko Makefile,NONE,1.1 Message-ID: <200807241752.m6OHqkKv017020@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mozvoikko In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16926/rpms/mozvoikko Added Files: Makefile Log Message: Setup of module mozvoikko --- NEW FILE Makefile --- # Top level Makefile for module mozvoikko all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 17:52:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 17:52:59 GMT Subject: rpms/mozvoikko/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241752.m6OHqx9c017045@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mozvoikko/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16926/rpms/mozvoikko/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mozvoikko --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mozvoikko # $Id: Makefile,v 1.1 2008/07/24 17:52:47 kevin Exp $ NAME := mozvoikko SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:05:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:05:42 +0000 Subject: [pkgdb] perl-Mon (Fedora, 8) updated by kevin Message-ID: <20080724180542.48F971AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Mon (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Mon (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Mon (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Mon (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mon From fedora-extras-commits at redhat.com Thu Jul 24 18:05:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:05:42 +0000 Subject: [pkgdb] perl-Mon (Fedora EPEL, 5) updated by kevin Message-ID: <20080724180542.8CE431AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Mon (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Mon (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Mon (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Mon (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mon From fedora-extras-commits at redhat.com Thu Jul 24 18:05:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:05:42 +0000 Subject: [pkgdb] perl-Mon (Fedora, 9) updated by kevin Message-ID: <20080724180543.20B0A1AD0EB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Mon (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Mon (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Mon (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Mon (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mon From fedora-extras-commits at redhat.com Thu Jul 24 18:05:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:05:41 +0000 Subject: [pkgdb] perl-Mon was added for lkundrak Message-ID: <20080724180546.B3BC91AD0F9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Mon with summary Mon Perl module Kevin Fenzi (kevin) has approved Package perl-Mon Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Mon with an owner of lkundrak Kevin Fenzi (kevin) has approved perl-Mon in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Mon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Mon (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Mon (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Mon (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-Mon (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-Mon (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-Mon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mon From fedora-extras-commits at redhat.com Thu Jul 24 18:06:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:06:18 GMT Subject: rpms/perl-Mon - New directory Message-ID: <200807241806.m6OI6Imn024342@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Mon In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl24314/rpms/perl-Mon Log Message: Directory /cvs/extras/rpms/perl-Mon added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:05:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:05:42 +0000 Subject: [pkgdb] perl-Mon (Fedora, devel) updated by kevin Message-ID: <20080724180543.A6A451AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Mon (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mon From fedora-extras-commits at redhat.com Thu Jul 24 18:06:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:06:33 GMT Subject: rpms/perl-Mon/devel - New directory Message-ID: <200807241806.m6OI6Xb9024360@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Mon/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl24314/rpms/perl-Mon/devel Log Message: Directory /cvs/extras/rpms/perl-Mon/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:06:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:06:49 GMT Subject: rpms/perl-Mon Makefile,NONE,1.1 Message-ID: <200807241806.m6OI6nr4024396@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Mon In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl24314/rpms/perl-Mon Added Files: Makefile Log Message: Setup of module perl-Mon --- NEW FILE Makefile --- # Top level Makefile for module perl-Mon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:07:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:07:04 GMT Subject: rpms/perl-Mon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241807.m6OI74Yj024411@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Mon/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl24314/rpms/perl-Mon/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Mon --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Mon # $Id: Makefile,v 1.1 2008/07/24 18:06:49 kevin Exp $ NAME := perl-Mon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:09:53 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Thu, 24 Jul 2008 18:09:53 GMT Subject: rpms/gbrainy/F-8 gbrainy.spec,1.4,1.5 Message-ID: <200807241809.m6OI9roM024682@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/gbrainy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24594 Modified Files: gbrainy.spec Log Message: Rebuild for dependencies Index: gbrainy.spec =================================================================== RCS file: /cvs/pkgs/rpms/gbrainy/F-8/gbrainy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gbrainy.spec 3 Jun 2008 22:52:07 -0000 1.4 +++ gbrainy.spec 24 Jul 2008 18:08:53 -0000 1.5 @@ -4,7 +4,7 @@ Name: gbrainy Version: 0.70 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Gbrainy is a brain teaser game and trainer to keep your brain trained Group: Amusements/Games @@ -77,10 +77,15 @@ %{_datadir}/pixmaps/%{name}* %changelog +* Tue Jul 24 2008 Beno??t Marcelin 0.70-4 +- Rebuild for dependencies + * Tue Jun 03 2008 Beno??t Marcelin 0.70-3 - Don't generate empty debuginfo in Fedora <= 8 + * Tue Jun 03 2008 Beno??t Marcelin 0.70-2 - Fix BuildRequires for Fedora <= 8 + * Tue Jun 03 2008 Beno??t Marcelin 0.70-1 - Update to 0.70 - 8 new puzzles From fedora-extras-commits at redhat.com Thu Jul 24 18:11:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:11:01 +0000 Subject: [pkgdb] python-dotconf was added for hemantg Message-ID: <20080724181101.AE5501AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-dotconf with summary python parser for dot.conf file Kevin Fenzi (kevin) has approved Package python-dotconf Kevin Fenzi (kevin) has added a Fedora devel branch for python-dotconf with an owner of hemantg Kevin Fenzi (kevin) has approved python-dotconf in Fedora devel Kevin Fenzi (kevin) has approved Package python-dotconf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dotconf (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dotconf (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dotconf (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on python-dotconf (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on python-dotconf (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on python-dotconf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dotconf From fedora-extras-commits at redhat.com Thu Jul 24 18:11:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:11:26 GMT Subject: rpms/python-dotconf - New directory Message-ID: <200807241811.m6OIBQR1024843@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dotconf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24808/rpms/python-dotconf Log Message: Directory /cvs/extras/rpms/python-dotconf added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:11:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:11:20 +0000 Subject: [pkgdb] python-dotconf (Fedora, devel) updated by kevin Message-ID: <20080724181128.2E4B71AD0FF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dotconf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dotconf From fedora-extras-commits at redhat.com Thu Jul 24 18:11:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:11:20 +0000 Subject: [pkgdb] python-dotconf (Fedora, 8) updated by kevin Message-ID: <20080724181126.839271AD104@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-dotconf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dotconf (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dotconf (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dotconf (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dotconf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dotconf From fedora-extras-commits at redhat.com Thu Jul 24 18:11:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:11:47 GMT Subject: rpms/python-dotconf/devel - New directory Message-ID: <200807241811.m6OIBlMO024871@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dotconf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24808/rpms/python-dotconf/devel Log Message: Directory /cvs/extras/rpms/python-dotconf/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:11:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:11:20 +0000 Subject: [pkgdb] python-dotconf (Fedora OLPC, 2) updated by kevin Message-ID: <20080724181128.D21631AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora OLPC 2 branch for python-dotconf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dotconf (Fedora OLPC 2) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dotconf (Fedora OLPC 2) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dotconf (Fedora OLPC 2) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dotconf (Fedora OLPC 2) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dotconf From fedora-extras-commits at redhat.com Thu Jul 24 18:11:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:11:20 +0000 Subject: [pkgdb] python-dotconf (Fedora OLPC, 3) updated by kevin Message-ID: <20080724181127.214211AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora OLPC 3 branch for python-dotconf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dotconf (Fedora OLPC 3) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dotconf (Fedora OLPC 3) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dotconf (Fedora OLPC 3) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dotconf (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dotconf From fedora-extras-commits at redhat.com Thu Jul 24 18:12:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:12:09 GMT Subject: rpms/python-dotconf Makefile,NONE,1.1 Message-ID: <200807241812.m6OIC9CI024903@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dotconf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24808/rpms/python-dotconf Added Files: Makefile Log Message: Setup of module python-dotconf --- NEW FILE Makefile --- # Top level Makefile for module python-dotconf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:11:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:11:20 +0000 Subject: [pkgdb] python-dotconf (Fedora, 9) updated by kevin Message-ID: <20080724181129.A5ECE1AD118@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-dotconf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-dotconf (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-dotconf (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-dotconf (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-dotconf (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-dotconf From fedora-extras-commits at redhat.com Thu Jul 24 18:12:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:12:31 GMT Subject: rpms/python-dotconf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241812.m6OICVuG024950@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-dotconf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu24808/rpms/python-dotconf/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-dotconf --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-dotconf # $Id: Makefile,v 1.1 2008/07/24 18:12:09 kevin Exp $ NAME := python-dotconf SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:12:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 18:12:55 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.353,1.354 Message-ID: <200807241812.m6OICtsi024992@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24917/devel Modified Files: kdelibs.spec Log Message: * Thu Jul 24 2008 Kevin Kofler 4.1.0-1.1 - fix file list for build as kdelibs4 (no -common split) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.353 retrieving revision 1.354 diff -u -r1.353 -r1.354 --- kdelibs.spec 23 Jul 2008 17:51:34 -0000 1.353 +++ kdelibs.spec 24 Jul 2008 18:12:10 -0000 1.354 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 %if 0%{?fedora} > 8 Name: kdelibs @@ -334,11 +334,11 @@ %{_kde4_configdir}/kdebugrc %dir %{_kde4_configdir}/ui %{_kde4_configdir}/ui/ui_standards.rc +%{_kde4_appsdir}/kdeui +%endif %{_kde4_docdir}/HTML/en/common/ %{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_datadir}/locale/all_languages/ -%{_kde4_appsdir}/kdeui -%endif %files devel %defattr(-,root,root,-) @@ -361,6 +361,9 @@ %changelog +* Thu Jul 24 2008 Kevin Kofler 4.1.0-1.1 +- fix file list for build as kdelibs4 (no -common split) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Thu Jul 24 18:14:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:14:04 +0000 Subject: [pkgdb] perl-Event-ExecFlow was added for kwizart Message-ID: <20080724181404.AEDA31AD0E0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Event-ExecFlow with summary High level API for event-based execution flow control Kevin Fenzi (kevin) has approved Package perl-Event-ExecFlow Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Event-ExecFlow with an owner of kwizart Kevin Fenzi (kevin) has approved perl-Event-ExecFlow in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Event-ExecFlow Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Event-ExecFlow (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Event-ExecFlow (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Event-ExecFlow (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-Event-ExecFlow (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-Event-ExecFlow (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-Event-ExecFlow (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Event-ExecFlow From fedora-extras-commits at redhat.com Thu Jul 24 18:14:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:14:05 +0000 Subject: [pkgdb] perl-Event-ExecFlow (Fedora, 9) updated by kevin Message-ID: <20080724181405.BDE161AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Event-ExecFlow Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Event-ExecFlow (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Event-ExecFlow (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Event-ExecFlow (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Event-ExecFlow (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Event-ExecFlow From fedora-extras-commits at redhat.com Thu Jul 24 18:14:20 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 18:14:20 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.354,1.355 Message-ID: <200807241814.m6OIEKQZ025271@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25188/devel Modified Files: kdelibs.spec Log Message: Fix again. Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- kdelibs.spec 24 Jul 2008 18:12:10 -0000 1.354 +++ kdelibs.spec 24 Jul 2008 18:13:35 -0000 1.355 @@ -335,10 +335,10 @@ %dir %{_kde4_configdir}/ui %{_kde4_configdir}/ui/ui_standards.rc %{_kde4_appsdir}/kdeui -%endif %{_kde4_docdir}/HTML/en/common/ -%{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_datadir}/locale/all_languages/ +%endif +%{_kde4_docdir}/HTML/en/sonnet/ %files devel %defattr(-,root,root,-) From fedora-extras-commits at redhat.com Thu Jul 24 18:14:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:14:05 +0000 Subject: [pkgdb] perl-Event-ExecFlow (Fedora, 8) updated by kevin Message-ID: <20080724181405.CE4381AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Event-ExecFlow Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Event-ExecFlow (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Event-ExecFlow (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Event-ExecFlow (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Event-ExecFlow (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Event-ExecFlow From fedora-extras-commits at redhat.com Thu Jul 24 18:14:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:14:05 +0000 Subject: [pkgdb] perl-Event-ExecFlow (Fedora, devel) updated by kevin Message-ID: <20080724181406.865FE1AD101@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Event-ExecFlow (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Event-ExecFlow From fedora-extras-commits at redhat.com Thu Jul 24 18:14:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:14:05 +0000 Subject: [pkgdb] perl-Event-ExecFlow (Fedora EPEL, 5) updated by kevin Message-ID: <20080724181406.0DA081AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Event-ExecFlow Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Event-ExecFlow (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Event-ExecFlow (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Event-ExecFlow (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Event-ExecFlow (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Event-ExecFlow From fedora-extras-commits at redhat.com Thu Jul 24 18:14:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:14:49 GMT Subject: rpms/perl-Event-ExecFlow/devel - New directory Message-ID: <200807241814.m6OIEn1H025329@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Event-ExecFlow/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25244/rpms/perl-Event-ExecFlow/devel Log Message: Directory /cvs/extras/rpms/perl-Event-ExecFlow/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:14:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:14:34 GMT Subject: rpms/perl-Event-ExecFlow - New directory Message-ID: <200807241814.m6OIEYoD025299@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Event-ExecFlow In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25244/rpms/perl-Event-ExecFlow Log Message: Directory /cvs/extras/rpms/perl-Event-ExecFlow added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:14:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:14:05 +0000 Subject: [pkgdb] perl-Event-ExecFlow (Fedora EPEL, 4) updated by kevin Message-ID: <20080724181406.478D01AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Event-ExecFlow Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Event-ExecFlow (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Event-ExecFlow (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Event-ExecFlow (Fedora EPEL 4) Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Event-ExecFlow (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Event-ExecFlow From fedora-extras-commits at redhat.com Thu Jul 24 18:15:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:15:05 GMT Subject: rpms/perl-Event-ExecFlow Makefile,NONE,1.1 Message-ID: <200807241815.m6OIF5NY025366@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Event-ExecFlow In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25244/rpms/perl-Event-ExecFlow Added Files: Makefile Log Message: Setup of module perl-Event-ExecFlow --- NEW FILE Makefile --- # Top level Makefile for module perl-Event-ExecFlow all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:15:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:15:23 GMT Subject: rpms/perl-Event-ExecFlow/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241815.m6OIFNEd025408@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Event-ExecFlow/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA25244/rpms/perl-Event-ExecFlow/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Event-ExecFlow --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Event-ExecFlow # $Id: Makefile,v 1.1 2008/07/24 18:15:05 kevin Exp $ NAME := perl-Event-ExecFlow SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:16:08 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 24 Jul 2008 18:16:08 GMT Subject: rpms/xscreensaver/F-8 xscreensaver-5.06-bz456399-jwz.patch, NONE, 1.1 xscreensaver.spec, 1.65, 1.66 Message-ID: <200807241816.m6OIG8BS025683@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25319/F-8 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.06-bz456399-jwz.patch Log Message: * Fri Jul 25 2008 Mamoru Tasaka - 1:5.06-2 - Patch from jwz to fix bug 456399 xscreensaver-5.06-bz456399-jwz.patch: --- NEW FILE xscreensaver-5.06-bz456399-jwz.patch --- Index: driver/screens.c =================================================================== RCS file: /cvsroot/xscreensaver/driver/screens.c,v retrieving revision 1.7 diff -u -r1.7 screens.c --- driver/screens.c 8 Jul 2008 05:22:46 -0000 1.7 +++ driver/screens.c 24 Jul 2008 15:52:14 -0000 @@ -342,7 +342,7 @@ for (i = 0, j = 0; i < ScreenCount (dpy); i++) { - Screen *screen = ScreenOfDisplay (dpy, j); + Screen *screen = ScreenOfDisplay (dpy, i); if (! new_randr_p) /* RANDR 1.0 */ { @@ -624,6 +624,7 @@ if (i != j && monitors[i]->sanity == S_SANE && monitors[j]->sanity == S_SANE && + monitors[i]->screen == monitors[j]->screen && X2 >= X1 && Y2 >= Y1 && (X2+W2) <= (X1+W1) && @@ -648,6 +649,7 @@ { if (monitors[i]->sanity != S_SANE) continue; /* already marked */ if (monitors[j]->sanity != S_SANE) continue; + if (monitors[i]->screen != monitors[j]->screen) continue; if (monitors_overlap_p (monitors[i], monitors[j])) { @@ -656,17 +658,15 @@ } } - /* Finally, make sure all monitors are enclosed by their X screen. + /* Finally, make sure all monitors have sane positions and sizes. Xinerama sometimes reports 1024x768 VPs at -1936862040, -1953705044. */ for (i = 0; i < count; i++) { - int sw = WidthOfScreen (monitors[i]->screen) * 2; - int sh = HeightOfScreen (monitors[i]->screen) * 2; if (monitors[i]->sanity != S_SANE) continue; /* already marked */ - if (X1 < 0 || Y1 < 0 || - W1 <= 0 || H1 <= 0 || - X1+W1 > sw || Y1+H1 > sh) + if (X1 < 0 || Y1 < 0 || + W1 <= 0 || H1 <= 0 || + X1+W1 >= 0x7FFF || Y1+H1 >= 0x7FFF) { monitors[i]->sanity = S_OFFSCREEN; monitors[i]->enemy = 0; Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- xscreensaver.spec 24 Jul 2008 02:17:35 -0000 1.65 +++ xscreensaver.spec 24 Jul 2008 18:14:46 -0000 1.66 @@ -5,7 +5,7 @@ %define modular_conf 1 -%define fedora_rel 1 +%define fedora_rel 2 %define extrarel %{nil} @@ -15,14 +15,14 @@ %define autoconf_ver 2.53 %define update_po 0 -%define build_tests 1 +%define build_tests 0 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: X screen saver and locker Name: %{name} Version: %{mainversion} -Release: %{fedora_rel}%{?dist}%{?extrarel}.1 +Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: BSD Group: Amusements/Graphics @@ -33,6 +33,7 @@ %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch +Patch40: xscreensaver-5.06-bz456399-jwz.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -68,6 +69,10 @@ Requires: xdg-utils Requires: xorg-x11-resutils Requires: xorg-x11-fonts-ISO8859-1-100dpi +%if 0%{?build_tests} < 1 +# Obsoletes but not Provides +Obsoletes: xscreeensaver-tests < %{epoch}:%{version}-%{release} +%endif %package extras Summary: An enhanced set of screensavers @@ -181,6 +186,7 @@ %patch1 -p1 -b .sanitize-hacks %patch21 -p1 -b .nonet +%patch40 -p0 -b .jwz40 change_option(){ set +x @@ -603,6 +609,9 @@ %defattr(-,root,root,-) %changelog +* Fri Jul 25 2008 Mamoru Tasaka - 1:5.06-2 +- Patch from jwz to fix bug 456399 + * Thu Jul 24 2008 Mamoru Tasaka - Build some test binaries for debugging From fedora-extras-commits at redhat.com Thu Jul 24 18:16:02 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 24 Jul 2008 18:16:02 GMT Subject: rpms/xscreensaver/F-9 xscreensaver-5.06-bz456399-jwz.patch, NONE, 1.1 xscreensaver.spec, 1.70, 1.71 Message-ID: <200807241816.m6OIG2s2025677@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25319/F-9 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.06-bz456399-jwz.patch Log Message: * Fri Jul 25 2008 Mamoru Tasaka - 1:5.06-2 - Patch from jwz to fix bug 456399 xscreensaver-5.06-bz456399-jwz.patch: --- NEW FILE xscreensaver-5.06-bz456399-jwz.patch --- Index: driver/screens.c =================================================================== RCS file: /cvsroot/xscreensaver/driver/screens.c,v retrieving revision 1.7 diff -u -r1.7 screens.c --- driver/screens.c 8 Jul 2008 05:22:46 -0000 1.7 +++ driver/screens.c 24 Jul 2008 15:52:14 -0000 @@ -342,7 +342,7 @@ for (i = 0, j = 0; i < ScreenCount (dpy); i++) { - Screen *screen = ScreenOfDisplay (dpy, j); + Screen *screen = ScreenOfDisplay (dpy, i); if (! new_randr_p) /* RANDR 1.0 */ { @@ -624,6 +624,7 @@ if (i != j && monitors[i]->sanity == S_SANE && monitors[j]->sanity == S_SANE && + monitors[i]->screen == monitors[j]->screen && X2 >= X1 && Y2 >= Y1 && (X2+W2) <= (X1+W1) && @@ -648,6 +649,7 @@ { if (monitors[i]->sanity != S_SANE) continue; /* already marked */ if (monitors[j]->sanity != S_SANE) continue; + if (monitors[i]->screen != monitors[j]->screen) continue; if (monitors_overlap_p (monitors[i], monitors[j])) { @@ -656,17 +658,15 @@ } } - /* Finally, make sure all monitors are enclosed by their X screen. + /* Finally, make sure all monitors have sane positions and sizes. Xinerama sometimes reports 1024x768 VPs at -1936862040, -1953705044. */ for (i = 0; i < count; i++) { - int sw = WidthOfScreen (monitors[i]->screen) * 2; - int sh = HeightOfScreen (monitors[i]->screen) * 2; if (monitors[i]->sanity != S_SANE) continue; /* already marked */ - if (X1 < 0 || Y1 < 0 || - W1 <= 0 || H1 <= 0 || - X1+W1 > sw || Y1+H1 > sh) + if (X1 < 0 || Y1 < 0 || + W1 <= 0 || H1 <= 0 || + X1+W1 >= 0x7FFF || Y1+H1 >= 0x7FFF) { monitors[i]->sanity = S_OFFSCREEN; monitors[i]->enemy = 0; Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- xscreensaver.spec 17 Jul 2008 01:59:34 -0000 1.70 +++ xscreensaver.spec 24 Jul 2008 18:15:08 -0000 1.71 @@ -5,7 +5,7 @@ %define modular_conf 1 -%define fedora_rel 1 +%define fedora_rel 2 %define extrarel %{nil} @@ -14,7 +14,8 @@ %define pam_ver 0.80-7 %define autoconf_ver 2.53 -%define update_po 1 +%define update_po 0 +%define build_tests 0 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,6 +33,7 @@ %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch +Patch40: xscreensaver-5.06-bz456399-jwz.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -67,6 +69,10 @@ Requires: xdg-utils Requires: xorg-x11-resutils Requires: xorg-x11-fonts-ISO8859-1-100dpi +%if 0%{?build_tests} < 1 +# Obsoletes but not Provides +Obsoletes: xscreeensaver-tests < %{epoch}:%{version}-%{release} +%endif %package extras Summary: An enhanced set of screensavers @@ -104,6 +110,11 @@ Requires: %{name}-gl-extras = %{epoch}:%{version}-%{release} Requires: gnome-screensaver +%package tests +Summary: Test programs related to XScreenSaver +Group: Development/Debuggers +Requires: %{name}-base = %{epoch}:%{version}-%{release} + %description A modular screen saver and locker for the X Window System. @@ -166,6 +177,8 @@ This package contains desktop files of gl-extras screensavers for gnome-screensaver compatibility. +%description tests +This package contains some test programs to debug XScreenSaver. %prep @@ -173,6 +186,7 @@ %patch1 -p1 -b .sanitize-hacks %patch21 -p1 -b .nonet +%patch40 -p0 -b .jwz40 change_option(){ set +x @@ -279,6 +293,22 @@ driver/screensaver-properties.desktop.in %endif +# Disable (don't build) some tests +# apm: doesn't compile +# passwd: causes segv +# mlstring: causes OOM +sed -i.test \ + -e 's|test-apm[ \t][ \t]*t|t|' \ + -e 's|test-passwd[ \t][ \t]*t|t|' \ + -e 's|test-mlstring[ \t][ \t]*t|t|' \ + driver/Makefile.in +sed -i.dir -e '/TEST_FADE_OBJS =/s|UTILS_SRC|UTILS_BIN|' driver/Makefile.in + +# test-fade: give more time between fading +sed -i.delay -e 's| delay = 1| delay = 3|' driver/test-fade.c +# test-grab: testing time too long, setting time 15 min -> 20 sec +sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c + %build autoconf @@ -331,6 +361,11 @@ %endif +# test +%if %{build_tests} +make tests -C driver +%endif + %install archdir=`./config.guess` cd $archdir @@ -464,6 +499,17 @@ fi done +# tests +%if %{build_tests} +echo "%%defattr(-,root,root,-)" > $dd/tests.files +cd driver +for tests in `find . -name test-\* -perm -0700` ; do + install -cpm 0755 $tests ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver + echo "%{_libexecdir}/xscreensaver/$tests" >> $dd/tests.files +done +cd .. +%endif + # create desktop entry for gnome-screensaver create_desktop(){ COMMAND=`cat $1 | sed -n -e 's|^ - 1:5.06-2 +- Patch from jwz to fix bug 456399 + +* Thu Jul 24 2008 Mamoru Tasaka +- Build some test binaries for debugging + * Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 - Update to 5.06 From fedora-extras-commits at redhat.com Thu Jul 24 18:16:19 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 24 Jul 2008 18:16:19 GMT Subject: rpms/xscreensaver/devel xscreensaver-5.06-bz456399-jwz.patch, NONE, 1.1 xscreensaver.spec, 1.71, 1.72 Message-ID: <200807241816.m6OIGJHm025694@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25319/devel Modified Files: xscreensaver.spec Added Files: xscreensaver-5.06-bz456399-jwz.patch Log Message: * Fri Jul 25 2008 Mamoru Tasaka - 1:5.06-2 - Patch from jwz to fix bug 456399 xscreensaver-5.06-bz456399-jwz.patch: --- NEW FILE xscreensaver-5.06-bz456399-jwz.patch --- Index: driver/screens.c =================================================================== RCS file: /cvsroot/xscreensaver/driver/screens.c,v retrieving revision 1.7 diff -u -r1.7 screens.c --- driver/screens.c 8 Jul 2008 05:22:46 -0000 1.7 +++ driver/screens.c 24 Jul 2008 15:52:14 -0000 @@ -342,7 +342,7 @@ for (i = 0, j = 0; i < ScreenCount (dpy); i++) { - Screen *screen = ScreenOfDisplay (dpy, j); + Screen *screen = ScreenOfDisplay (dpy, i); if (! new_randr_p) /* RANDR 1.0 */ { @@ -624,6 +624,7 @@ if (i != j && monitors[i]->sanity == S_SANE && monitors[j]->sanity == S_SANE && + monitors[i]->screen == monitors[j]->screen && X2 >= X1 && Y2 >= Y1 && (X2+W2) <= (X1+W1) && @@ -648,6 +649,7 @@ { if (monitors[i]->sanity != S_SANE) continue; /* already marked */ if (monitors[j]->sanity != S_SANE) continue; + if (monitors[i]->screen != monitors[j]->screen) continue; if (monitors_overlap_p (monitors[i], monitors[j])) { @@ -656,17 +658,15 @@ } } - /* Finally, make sure all monitors are enclosed by their X screen. + /* Finally, make sure all monitors have sane positions and sizes. Xinerama sometimes reports 1024x768 VPs at -1936862040, -1953705044. */ for (i = 0; i < count; i++) { - int sw = WidthOfScreen (monitors[i]->screen) * 2; - int sh = HeightOfScreen (monitors[i]->screen) * 2; if (monitors[i]->sanity != S_SANE) continue; /* already marked */ - if (X1 < 0 || Y1 < 0 || - W1 <= 0 || H1 <= 0 || - X1+W1 > sw || Y1+H1 > sh) + if (X1 < 0 || Y1 < 0 || + W1 <= 0 || H1 <= 0 || + X1+W1 >= 0x7FFF || Y1+H1 >= 0x7FFF) { monitors[i]->sanity = S_OFFSCREEN; monitors[i]->enemy = 0; Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- xscreensaver.spec 17 Jul 2008 01:59:57 -0000 1.71 +++ xscreensaver.spec 24 Jul 2008 18:15:32 -0000 1.72 @@ -5,7 +5,7 @@ %define modular_conf 1 -%define fedora_rel 1 +%define fedora_rel 2 %define extrarel %{nil} @@ -14,7 +14,8 @@ %define pam_ver 0.80-7 %define autoconf_ver 2.53 -%define update_po 1 +%define update_po 0 +%define build_tests 0 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,6 +33,7 @@ %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch +Patch40: xscreensaver-5.06-bz456399-jwz.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -67,6 +69,10 @@ Requires: xdg-utils Requires: xorg-x11-resutils Requires: xorg-x11-fonts-ISO8859-1-100dpi +%if 0%{?build_tests} < 1 +# Obsoletes but not Provides +Obsoletes: xscreeensaver-tests < %{epoch}:%{version}-%{release} +%endif %package extras Summary: An enhanced set of screensavers @@ -104,6 +110,11 @@ Requires: %{name}-gl-extras = %{epoch}:%{version}-%{release} Requires: gnome-screensaver +%package tests +Summary: Test programs related to XScreenSaver +Group: Development/Debuggers +Requires: %{name}-base = %{epoch}:%{version}-%{release} + %description A modular screen saver and locker for the X Window System. @@ -166,6 +177,8 @@ This package contains desktop files of gl-extras screensavers for gnome-screensaver compatibility. +%description tests +This package contains some test programs to debug XScreenSaver. %prep @@ -173,6 +186,7 @@ %patch1 -p1 -b .sanitize-hacks %patch21 -p1 -b .nonet +%patch40 -p0 -b .jwz40 change_option(){ set +x @@ -279,6 +293,22 @@ driver/screensaver-properties.desktop.in %endif +# Disable (don't build) some tests +# apm: doesn't compile +# passwd: causes segv +# mlstring: causes OOM +sed -i.test \ + -e 's|test-apm[ \t][ \t]*t|t|' \ + -e 's|test-passwd[ \t][ \t]*t|t|' \ + -e 's|test-mlstring[ \t][ \t]*t|t|' \ + driver/Makefile.in +sed -i.dir -e '/TEST_FADE_OBJS =/s|UTILS_SRC|UTILS_BIN|' driver/Makefile.in + +# test-fade: give more time between fading +sed -i.delay -e 's| delay = 1| delay = 3|' driver/test-fade.c +# test-grab: testing time too long, setting time 15 min -> 20 sec +sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c + %build autoconf @@ -331,6 +361,11 @@ %endif +# test +%if %{build_tests} +make tests -C driver +%endif + %install archdir=`./config.guess` cd $archdir @@ -464,6 +499,17 @@ fi done +# tests +%if %{build_tests} +echo "%%defattr(-,root,root,-)" > $dd/tests.files +cd driver +for tests in `find . -name test-\* -perm -0700` ; do + install -cpm 0755 $tests ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver + echo "%{_libexecdir}/xscreensaver/$tests" >> $dd/tests.files +done +cd .. +%endif + # create desktop entry for gnome-screensaver create_desktop(){ COMMAND=`cat $1 | sed -n -e 's|^ - 1:5.06-2 +- Patch from jwz to fix bug 456399 + +* Thu Jul 24 2008 Mamoru Tasaka +- Build some test binaries for debugging + * Thu Jul 17 2008 Mamoru Tasaka - 1:5.06-1 - Update to 5.06 From fedora-extras-commits at redhat.com Thu Jul 24 18:17:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:17:06 +0000 Subject: [pkgdb] immix was added for eponyme Message-ID: <20080724181706.A71FF1AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package immix with summary An image mixer Kevin Fenzi (kevin) has approved Package immix Kevin Fenzi (kevin) has added a Fedora devel branch for immix with an owner of eponyme Kevin Fenzi (kevin) has approved immix in Fedora devel Kevin Fenzi (kevin) has approved Package immix Kevin Fenzi (kevin) has set commit to Approved for cvsextras on immix (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on immix (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on immix (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on immix (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on immix (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on immix (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/immix From fedora-extras-commits at redhat.com Thu Jul 24 18:17:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:17:09 +0000 Subject: [pkgdb] immix (Fedora, devel) updated by kevin Message-ID: <20080724181710.0E3CB1AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on immix (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/immix From fedora-extras-commits at redhat.com Thu Jul 24 18:17:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:17:09 +0000 Subject: [pkgdb] immix (Fedora, 8) updated by kevin Message-ID: <20080724181709.4223C1AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for immix Kevin Fenzi (kevin) has set commit to Approved for cvsextras on immix (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on immix (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on immix (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on immix (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/immix From fedora-extras-commits at redhat.com Thu Jul 24 18:17:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:17:09 +0000 Subject: [pkgdb] immix (Fedora, 9) updated by kevin Message-ID: <20080724181709.C33851AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for immix Kevin Fenzi (kevin) has set commit to Approved for cvsextras on immix (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on immix (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on immix (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on immix (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/immix From fedora-extras-commits at redhat.com Thu Jul 24 18:17:36 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 18:17:36 GMT Subject: rpms/kdelibs4/F-8 kdelibs-4.0.72-xdg-menu.patch, NONE, 1.1 kdelibs-4.0.85-libexecdir.patch, NONE, 1.1 kdelibs-4.0.98-parallel_devel.patch, NONE, 1.1 kdelibs-4.0.98-revert-kinit-regression.patch, NONE, 1.1 kdelibs-4.0.99-kstandarddirs.patch, NONE, 1.1 kdelibs-4.1.0-parallel_devel.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 kdelibs4.spec, 1.21, 1.22 sources, 1.11, 1.12 kdelibs-4.0.3-libexecdir.patch, 1.1, NONE kdelibs-4.0.4-khtml-stylesheet.patch, 1.1, NONE kdelibs-4.0.4-kstandarddirs.patch, 1.2, NONE kdelibs-4.0.4-parallel_devel.patch, 1.2, NONE kdelibs-4.0.4-proxy.patch, 1.1, NONE kdelibs-4.0.5-iconload.patch, 1.1, NONE kdelibs-4.0.5-kio-ftp-overwrite.patch, 1.1, NONE kdelibs-4.0.5-kio-subjob.patch, 1.1, NONE kdelibs-4.0.5-kprotocolcombo.patch, 1.1, NONE kdelibs-4.0.5-strigi-metainfo.patch, 1.1, NONE kdelibs-4.x-xdg-menu.patch, 1.1, NONE Message-ID: <200807241817.m6OIHaU6025909@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25748/F-8 Modified Files: .cvsignore kdelibs4.spec sources Added Files: kdelibs-4.0.72-xdg-menu.patch kdelibs-4.0.85-libexecdir.patch kdelibs-4.0.98-parallel_devel.patch kdelibs-4.0.98-revert-kinit-regression.patch kdelibs-4.0.99-kstandarddirs.patch kdelibs-4.1.0-parallel_devel.patch Removed Files: kdelibs-4.0.3-libexecdir.patch kdelibs-4.0.4-khtml-stylesheet.patch kdelibs-4.0.4-kstandarddirs.patch kdelibs-4.0.4-parallel_devel.patch kdelibs-4.0.4-proxy.patch kdelibs-4.0.5-iconload.patch kdelibs-4.0.5-kio-ftp-overwrite.patch kdelibs-4.0.5-kio-subjob.patch kdelibs-4.0.5-kprotocolcombo.patch kdelibs-4.0.5-strigi-metainfo.patch kdelibs-4.x-xdg-menu.patch Log Message: Sync kdelibs-4.1.0-1.fc*.1 from kdelibs/devel. kdelibs-4.0.72-xdg-menu.patch: --- NEW FILE kdelibs-4.0.72-xdg-menu.patch --- diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/applications.menu --- kdelibs-4.0.72/kded/applications.menu 2008-03-26 22:10:55.000000000 +0100 +++ kdelibs-4.0.72-xdg-menu/kded/applications.menu 2008-05-02 02:49:25.000000000 +0200 @@ -31,6 +31,7 @@ Core KDE + X-Red-Hat-Base X-SuSE-YaST X-KDE-settings-hardware @@ -54,6 +55,24 @@ + System Settings + SystemConfig.directory + + + System + Settings + X-Red-Hat-ServerConfig + + + + Server + ServerConfig.directory + + X-Red-Hat-ServerConfig + + + + Development kde-development.directory @@ -358,7 +377,11 @@ Settingsmenu kde-settingsmenu.directory - Settings + + Settings + System + X-Red-Hat-ServerConfig + @@ -367,7 +390,9 @@ System + Settings X-KDE-More + X-Red-Hat-ServerConfig kdelibs-4.0.85-libexecdir.patch: --- NEW FILE kdelibs-4.0.85-libexecdir.patch --- diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2008-07-03 00:06:28.000000000 -0500 +++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults() addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); index+=2; } - addResourceType("exe", "lib", "kde4/libexec", true ); + addResourceType("exe", 0, "libexec/kde4", true ); addResourceDir("home", QDir::homePath(), false); } diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp --- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500 +++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const if (strcmp("lib", type) == 0) return QString::fromLatin1(LIB_INSTALL_DIR "/"); if (strcmp("libexec", type) == 0) - return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/"); + return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/"); if (strcmp("locale", type) == 0) return QString::fromLatin1(LOCALE_INSTALL_DIR "/"); break; diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp --- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2008-07-03 00:06:29.000000000 -0500 +++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp 2008-07-06 14:41:31.000000000 -0500 @@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource #define KIOSLAVE "bin/kioslave.exe" #else #define EXT "" -#define KIOSLAVE "kde4/libexec/kioslave" +#define KIOSLAVE "libexec/kde4/kioslave" #endif + const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); QVERIFY( !bin.isEmpty() ); QVERIFY( bin.endsWith( KIOSLAVE ) ); @@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe() // findExe with a result in libexec const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); QVERIFY( !lnusertemp.isEmpty() ); - QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) ); + QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) ); #endif // Check the "exe" resource too diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp --- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500 +++ kdelibs-4.0.85/kio/tests/krununittest.cpp 2008-07-06 14:38:18.000000000 -0500 @@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe if (kmailservice.isEmpty()) kmailservice = "kmailservice"; if (!kdeinit.isEmpty()) { QVERIFY(!kmailservice.isEmpty()); - QVERIFY(kmailservice.contains("kde4/libexec")); + QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4")); } QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit; kdelibs-4.0.98-parallel_devel.patch: --- NEW FILE kdelibs-4.0.98-parallel_devel.patch --- diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-08 04:54:11.000000000 -0500 +++ kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake 2008-07-10 20:54:43.000000000 -0500 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: # -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable -# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable +# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable # # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: @@ -124,7 +124,7 @@ # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) -# Use this to add widget description files for the makekdewidgets code generator +# Use this to add widget description files for the makekdewidgets4 code generator # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) @@ -286,23 +286,23 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) # when building kdelibs, make the kcfg rules depend on the binaries... - set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) - set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) + set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) + set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) @@ -351,69 +351,69 @@ else (_kdeBootStrapping) include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) if (UNIX) - find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) - find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) - find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) if (UNIX) - find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) # Can't do that, it's not always compiled. @@ -432,14 +432,14 @@ else (_kdeBootStrapping) # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -668,7 +668,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY "${_CMAKE_INSTALL_DIR}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) -set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} +set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel" + ${CMAKE_SYSTEM_LIBRARY_PATH} "${KDE4_LIB_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) @@ -1059,9 +1060,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") else(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") + message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) diff -up kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh --- kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 06:07:26.000000000 -0500 +++ kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh 2008-07-10 20:53:39.000000000 -0500 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # -kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" +kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" if test -z "$kcfg_compiler"; then - echo "kconfig_compiler not found!" + echo "kconfig_compiler4 not found!" exit 1; fi diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl --- kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500 +++ kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-10 20:53:39.000000000 -0500 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; -$cmd = "./kconfig_compiler $file $kcfgc"; +$cmd = "./kconfig_compiler4 $file $kcfgc"; #print "CMD $cmd\n"; if ( system( $cmd ) != 0 ) { - print STDERR "Unable to run kconfig_compiler\n"; + print STDERR "Unable to run kconfig_compiler4\n"; exit 1; } diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt --- kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:09:13.000000000 -0500 +++ kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -8,11 +8,11 @@ add_subdirectory( example ) set(kconfig_compiler_SRCS kconfig_compiler.cpp) -kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) +target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} ) ########### install files ############### diff -up kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt --- kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:08:30.000000000 -0500 +++ kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) diff -up kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdewidgets/CMakeLists.txt --- kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 06:08:17.000000000 -0500 +++ kdelibs-4.0.98/kdewidgets/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 @@ -16,22 +16,22 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) -kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) +target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) -install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} ) ########### next target ############### # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) -get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT) +get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets - MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets) + MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4) set(kdewidgets_PART_SRCS classpreviews.cpp kdelibs-4.0.98-revert-kinit-regression.patch: --- NEW FILE kdelibs-4.0.98-revert-kinit-regression.patch --- Index: kinit.cpp =================================================================== --- kinit/kinit.cpp (revision 829264) +++ kinit/kinit.cpp (revision 828077) @@ -49,10 +49,9 @@ #include #include #include -#include #include #include -#include +#include #include #include #include @@ -530,17 +529,8 @@ if (cwd && *cwd) chdir(cwd); else { - // Can't use KGlobalSettings::documentPath() here, we don't have a main component set, - // and we don't want to set one; e.g. kioslaves will do that. - // So we have to duplicate this stuff from KGlobalSettings. - KConfigGroup g(s_instance->config(), "Paths"); - const QString documentPath = g.readPathEntry("Documents", -#ifdef Q_WS_WIN - getWin32ShellFoldersPath("Personal") -#else - QDir::homePath()); -#endif - const QByteArray docPath = QFile::encodeName(documentPath); + KComponentData componentData("klauncher"); // needed for KConfig usage + const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath()); chdir(docPath.constData()); } kdelibs-4.0.99-kstandarddirs.patch: --- NEW FILE kdelibs-4.0.99-kstandarddirs.patch --- diff -ur kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp 2008-07-09 15:28:22.000000000 +0200 +++ kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-07-20 18:13:28.000000000 +0200 @@ -75,9 +75,12 @@ bool checkRestrictions : 1; QMap restrictions; QStringList xdgdata_prefixes; + QString localXdgdatahome; QStringList xdgconf_prefixes; + QString localXdgconfhome; QStringList prefixes; + QString localKdehome; // Directory dictionaries QMap absolutes; @@ -953,12 +956,65 @@ restrictionActive = true; d->dataRestrictionActive = false; // Reset } + const QStringList *prefixList = 0; + QString home; + if (strncmp(type, "xdgdata-", 8) == 0) + { + prefixList = &(d->xdgdata_prefixes); + home=d->localXdgdatahome; + } + else if (strncmp(type, "xdgconf-", 8) == 0) + { + prefixList = &(d->xdgconf_prefixes); + home=d->localXdgconfhome; + } + else + { + prefixList = &d->prefixes; + home=d->localKdehome; + } QStringList dirs; dirs = d->relatives.value(type); QString installdir = installPath( type ); QString installprefix = installPath("kdedir"); + if(!home.isNull()) + { + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( home + *it ); + testdir.setPath(path); + if (restrictionActive) + continue; + if (!candidates.contains(path)) + candidates.append(path); + } + + } + + // make sure we find the path where it's installed + // we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share + // except for config files, so profiles take precedence + // except for exe files too, so /usr/libexec/kde4 takes precedence over /usr/bin + if (strcmp("config", type) && strcmp("exe", type)) { + if (!installdir.isEmpty()) { + bool ok = true; + foreach (const QString &s, candidates) { + if (installdir.startsWith(s)) { + ok = false; + break; + } + } + if (ok) { + candidates.append(installdir); + } + } + } + if (!dirs.isEmpty()) { bool local = true; @@ -984,45 +1040,34 @@ } } - const QStringList *prefixList = 0; - if (strncmp(type, "xdgdata-", 8) == 0) - prefixList = &(d->xdgdata_prefixes); - else if (strncmp(type, "xdgconf-", 8) == 0) - prefixList = &(d->xdgconf_prefixes); - else - prefixList = &d->prefixes; for (QStringList::ConstIterator pit = prefixList->begin(); pit != prefixList->end(); ++pit) { - if((*pit)!=installprefix||installdir.isEmpty()) - { - for (QStringList::ConstIterator it = dirs.begin(); - it != dirs.end(); ++it) - { - if ( (*it).startsWith('%')) - continue; - QString path = realPath( *pit + *it ); - testdir.setPath(path); - if (local && restrictionActive) - continue; - if ((local || testdir.exists()) && !candidates.contains(path)) - candidates.append(path); - } - local = false; + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( *pit + *it ); + testdir.setPath(path); + if (local && restrictionActive) + continue; + if ((local || testdir.exists()) && !candidates.contains(path)) + candidates.append(path); } - else - { - // we have a custom install path, so use this instead of / - testdir.setPath(installdir); - if(testdir.exists() && ! candidates.contains(installdir)) - candidates.append(installdir); - } + // UGLY HACK - forward porting Chris Cheney's HACK - Rex Dieter + if ( local && (!strcmp("config", type))) + candidates.append("/etc/kde/"); + // + local = false; } } - // make sure we find the path where it's installed + // find the installed path for all resource types + // some code expects it to always come last, so we list it again even if + // we had it already at the beginning if (!installdir.isEmpty()) { bool ok = true; foreach (const QString &s, candidates) { @@ -1501,6 +1546,7 @@ { localKdeDir = KShell::tildeExpand(localKdeDir); addPrefix(localKdeDir); + d->localKdehome=localKdeDir; } #ifdef Q_WS_MACX @@ -1559,6 +1605,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgConfigPrefix(localXdgDir); + d->localXdgconfhome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) @@ -1607,6 +1654,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgDataPrefix(localXdgDir); + d->localXdgdatahome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) kdelibs-4.1.0-parallel_devel.patch: --- NEW FILE kdelibs-4.1.0-parallel_devel.patch --- diff -up kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-23 10:26:30.000000000 +0200 +++ kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake 2008-07-23 18:11:28.000000000 +0200 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: # -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable -# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable +# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable # # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: @@ -124,7 +124,7 @@ # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) -# Use this to add widget description files for the makekdewidgets code generator +# Use this to add widget description files for the makekdewidgets4 code generator # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) @@ -307,23 +307,23 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) # when building kdelibs, make the kcfg rules depend on the binaries... - set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) - set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) + set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) + set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) @@ -372,69 +372,69 @@ else (_kdeBootStrapping) include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) if (UNIX) - find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) - find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) - find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) if (UNIX) - find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) # Can't do that, it's not always compiled. @@ -453,14 +453,14 @@ else (_kdeBootStrapping) # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -708,7 +708,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY "${_CMAKE_INSTALL_DIR}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) -set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} +set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel" + ${CMAKE_SYSTEM_LIBRARY_PATH} "${KDE4_LIB_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) @@ -1108,9 +1109,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") else(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") + message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) diff -up kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh --- kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200 +++ kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh 2008-07-23 18:01:48.000000000 +0200 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # -kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" +kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" if test -z "$kcfg_compiler"; then - echo "kconfig_compiler not found!" + echo "kconfig_compiler4 not found!" exit 1; fi diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl --- kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200 +++ kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-23 18:01:48.000000000 +0200 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; -$cmd = "./kconfig_compiler $file $kcfgc"; +$cmd = "./kconfig_compiler4 $file $kcfgc"; #print "CMD $cmd\n"; if ( system( $cmd ) != 0 ) { - print STDERR "Unable to run kconfig_compiler\n"; + print STDERR "Unable to run kconfig_compiler4\n"; exit 1; } diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt --- kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:09:13.000000000 +0200 +++ kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -8,11 +8,11 @@ add_subdirectory( example ) set(kconfig_compiler_SRCS kconfig_compiler.cpp) -kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) +target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} ) ########### install files ############### diff -up kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt --- kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200 +++ kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) diff -up kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdewidgets/CMakeLists.txt --- kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 13:08:17.000000000 +0200 +++ kdelibs-4.1.0/kdewidgets/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -16,22 +16,22 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) -kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) +target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) -install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} ) ########### next target ############### # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) -get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT) +get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets - MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets) + MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4) set(kdewidgets_PART_SRCS classpreviews.cpp Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 Jun 2008 15:39:10 -0000 1.11 +++ .cvsignore 24 Jul 2008 18:16:49 -0000 1.12 @@ -1 +1 @@ -kdelibs-4.0.5.tar.bz2 +kdelibs-4.1.0.tar.bz2 Index: kdelibs4.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- kdelibs4.spec 27 Jun 2008 02:29:13 -0000 1.21 +++ kdelibs4.spec 24 Jul 2008 18:16:50 -0000 1.22 @@ -1,7 +1,8 @@ +%define _default_patch_fuzz 2 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.5 -Release: 4%{?dist} +Version: 4.1.0 +Release: 1%{?dist}.1 %if 0%{?fedora} > 8 Name: kdelibs @@ -27,6 +28,7 @@ %define rest 1 %endif +BuildRequires: kde4-macros(api) >= 2 BuildRequires: kde-filesystem >= 4 Requires: dbus-x11 Requires: hicolor-icon-theme @@ -48,7 +50,7 @@ Source2: kde4.csh # make -devel packages parallel-installable -Patch0: kdelibs-4.0.4-parallel_devel.patch +Patch0: kdelibs-4.1.0-parallel_devel.patch # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Hunspell support for K3Spell @@ -67,30 +69,20 @@ Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch # workaround for policykit Patch11: kdelibs-4.0.2-policykit-workaround.patch -Patch12: kdelibs-4.x-xdg-menu.patch -# Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) +Patch12: kdelibs-4.0.72-xdg-menu.patch +# Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) Patch13: kdelibs-4.0.5-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec -Patch14: kdelibs-4.0.3-libexecdir.patch -# fix proxy support (#443931, kde#155707) -# patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46 -Patch15: kdelibs-4.0.4-proxy.patch -# forward port kstandarddirs hack to search /etc/kde -Patch18: kdelibs-4.0.4-kstandarddirs.patch -#??kdebug:162956: Kopete Press File Transfer crash -Patch19: kdelibs-4.0.5-kprotocolcombo.patch -#??kdebug:162285: click on add network folder crashes dolphin -Patch20: kdelibs-4.0.5-kio-subjob.patch -# kdebug:163050: Strigi indexing of large/unbounded files causes KFileMetaInfo to freeze -Patch21: kdelibs-4.0.5-strigi-metainfo.patch -#??kdebug:127793: Renaming in FTP overwrites existing files without confirmation -Patch22: kdelibs-4.0.5-kio-ftp-overwrite.patch - -## upstream patches -Patch100: kdelibs-4.0.4-khtml-stylesheet.patch -Patch101: kdelibs-4.0.5-iconload.patch +Patch14: kdelibs-4.0.85-libexecdir.patch +# kstandarddirs changes: search /etc/kde, change handling of install locations +Patch18: kdelibs-4.0.99-kstandarddirs.patch +# revert a kinit patch which triggers an assertion failure in KComponentData +# (and its followup) (#455130) +Patch19: kdelibs-4.0.98-revert-kinit-regression.patch -BuildRequires: qt4-devel >= 4.3.0 +# upstream patches + +BuildRequires: qt4-devel >= 4.4.0 Requires: qt4 >= %{_qt4_version} Requires: xdg-utils Requires(post): /sbin/ldconfig xdg-utils @@ -101,6 +93,7 @@ # we don't want a hard dependency on aspell on F9+, use enchant only BuildRequires: aspell-devel %endif +BuildRequires: automoc BuildRequires: avahi-devel BuildRequires: bzip2-devel BuildRequires: cmake @@ -121,8 +114,11 @@ BuildRequires: OpenEXR-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +# work around circular dependency from phonon-devel pulling in phonon-backend-xine +BuildRequires: phonon-backend-gstreamer +BuildRequires: phonon-devel BuildRequires: shared-mime-info -BuildRequires: soprano-devel >= 1.99 +BuildRequires: soprano-devel >= 2.0.97 BuildRequires: strigi-devel >= 0.5.7 BuildRequires: zlib-devel # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) @@ -131,7 +127,7 @@ BuildRequires: openssh-clients BuildRequires: subversion -%if "%{?apidocs}" == "1" +%if 0%{?apidocs} BuildRequires: doxygen BuildRequires: graphviz BuildRequires: qt4-doc @@ -156,11 +152,12 @@ Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} %endif -Provides: phonon-devel = 4.0 +Requires: automoc Requires: qt4-devel Requires: openssl-devel +Requires: phonon-devel +Requires: strigi-devel Requires: bzip2-devel gamin-devel libacl-devel zlib-devel -Requires: strigi-devel >= 0.5.7 %{?x_deps:Requires: %{x_deps}} %description devel This package includes the header files you will need to compile @@ -205,25 +202,20 @@ %patch12 -p1 -b .Administration-menu %patch13 -p1 -b .fedora-buildtype %patch14 -p1 -b .libexecdir -%patch15 -p0 -b .proxy %patch18 -p1 -b .kstandarddirs -%patch19 -p1 -b .kprotocolcombo -%patch20 -p1 -b .kio-subjob -%patch21 -p1 -b .strigi-metainfo -%patch22 -p1 -b .kio-ftp-overwrite +%patch19 -p0 -b .kinit-regression # upstream patches -%patch100 -p1 -b .khtml-stylesheet -%patch101 -p1 -b .iconload %build + mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" .. popd %if 0%{?rest} -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %endif # build apidocs @@ -239,7 +231,7 @@ %if 0%{?rest} make install DESTDIR=%{buildroot} -C %{_target_platform} -# see also use-of/patching of XDG_MENU_PREFIX in kdebase +# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu @@ -261,9 +253,7 @@ case "$i" in libkdeinit4_*.so) ;; - # don't move Phonon, non-KDE apps want to use it - libphonon.so) - ;; + ## FIXME/TODO: imo, should leave everything except for known-conflicts -- Rex *) linktarget=`readlink "$i"` rm -f "$i" @@ -317,11 +307,11 @@ %exclude %{_kde4_appsdir}/cmake/ %{_kde4_configdir}/* %{_datadir}/dbus-1/interfaces/* +%{_libdir}/kde4/plugins/script/* %{_kde4_datadir}/mime/packages/* %{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/servicetypes/* %{_kde4_sharedir}/icons/hicolor/*/actions/presence_* -%{_kde4_docdir}/HTML/en/* %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit4_*.so %dir %{_kde4_libdir}/kde4/ @@ -329,18 +319,14 @@ %{_kde4_libexecdir}/* %dir %{_kde4_libdir}/kde4/plugins/ %{_kde4_libdir}/kde4/plugins/imageformats/ -%{_kde4_libdir}/kde4/plugins/phonon_platform/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* -%if 0%{?apidocs} -%exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ -%endif # kdelibs-common comes from here for fedora >= 9 %if "%{name}" == "kdelibs" %exclude %{_kde4_configdir}/kdebug.areas %exclude %{_kde4_configdir}/kdebugrc %exclude %{_kde4_configdir}/ui/ui_standards.rc -%exclude %{_kde4_docdir}/HTML/en/common +%exclude %{_kde4_appsdir}/kdeui %files common %defattr(-,root,root,-) @@ -348,9 +334,11 @@ %{_kde4_configdir}/kdebugrc %dir %{_kde4_configdir}/ui %{_kde4_configdir}/ui/ui_standards.rc -%{_kde4_docdir}/HTML/en/common +%{_kde4_appsdir}/kdeui +%{_kde4_docdir}/HTML/en/common/ %{_kde4_datadir}/locale/all_languages/ %endif +%{_kde4_docdir}/HTML/en/sonnet/ %files devel %defattr(-,root,root,-) @@ -361,7 +349,6 @@ %{_kde4_appsdir}/cmake/ %{_kde4_appsdir}/kdewidgets/ %{_kde4_includedir}/* -%{_kde4_libdir}/libphonon.so %{_kde4_libdir}/kde4/devel/ %{_kde4_libdir}/kde4/plugins/designer/ %endif @@ -374,62 +361,88 @@ %changelog -* Fri Jun 27 2008 Kevin Kofler - 4.0.5-4 -- fix kstandarddirs patch so /usr/libexec/kde4 is found before /usr/bin (see - also #453063, ensures the KDE 4 versions of kdesu, lnusertemp etc. are used) - -* Sat Jun 14 2008 Rex Dieter - 4.0.5-3 -- -devel: Provides: phonon-devel = 4.0 - -* Tue Jun 10 2008 Luk???? Tinkl - 4.0.5-2 -- kopete crashes with sending files over AIM/ICQ (kdebug:162956) -- fix crashes when adding a new network folder (kdebug:162285) -- KFileMetaInfo freezes when Strigi indexes non-sequential files (kdebug:163050) -- renaming in FTP overwrites existing files without confirmation (kdebug:127793) - -* Sat May 31 2008 Than Ngo - 4.0.5-1 -- 4.0.5 -- backport patch from 4.1 branch to fix inherit issue in iconload, #448536 +* Thu Jul 24 2008 Kevin Kofler 4.1.0-1.1 +- fix file list for build as kdelibs4 (no -common split) -* Fri May 30 2008 Than Ngo - 4.0.4-11 -- fix #447965, order issue in kde path, thanks to Kevin -- backport patch from 4.1 branch to check html style version +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 -* Tue May 27 2008 Luk???? Tinkl - 4.0.4-10 -- Fixes a crash when you are using two different protocols and move through the tree +* Sun Jul 20 2008 Kevin Kofler 4.0.99-3 +- fix kstandarddirs patch to always append the installed location last, even if + it is already present earlier in the search path (#456004) -* Tue May 27 2008 Luk???? Tinkl - 4.0.4-9 -- fix kdebug:161196: Drop-down list options display blank when a comment is added between option tags -- fix kdebug:156419: konqueror crash on http://pidgin.im/ -- fix kdebug:48704 document.styleSheets.length does not return the correct number under all circumstances +* Sat Jul 19 2008 Rex Dieter 4.0.99-2 +- use better fedora-buildtype patch from F-9 branch -* Fri May 23 2008 Kevin Kofler - 4.0.4-8 -- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831) +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 -* Fri May 23 2008 Luk???? Tinkl - 4.0.4-7 -- fix #447840: Konquerorsu crash in KDE 4 +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- respun tarball -* Thu May 22 2008 Rex Dieter - 4.0.4-6 -- kstandarddirs hack to search /etc/kde +* Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 +- revert a kinit patch causing an assertion failure in KComponentData (#455130) + +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 +- omit proxy patch (fixed upstream) + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 -* Wed May 21 2008 Luk???? Tinkl - 4.0.4-5 -- fix problems with deleting dirs on FTP server (kdebug:162189) +* Fri Jun 27 2008 Kevin Kofler - 4.0.83-3 +- fix kstandarddirs patch so /usr/libexec/kde4 is found (#453063) -* Thu May 15 2008 Luk???? Tinkl - 4.0.4-4 -- fix compatibility with newer HALs to find the actual HW info +* Wed Jun 25 2008 Rex Dieter 4.0.83-2 +- -common: move %{_kde4_docdir}/HTML/en/sonnet/ here (#341751) -* Thu May 15 2008 Kevin Kofler - 4.0.4-3 +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Fri Jun 13 2008 Than Ngo 4.0.82-1 +- 4.0.82 + +* Fri May 30 2008 Than Ngo 4.0.80-2 +- fix #447965, order issue in kde path, thanks to Kevin +- backport patch to check html style version + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Sat May 24 2008 Rex Dieter - 4.0.72-8 +- revert previous, don't include kde3-compat symlink (here, anyway) + +* Fri May 23 2008 Rex Dieter - 4.0.72-7 +- -common: provide %%_datadir/apps/kdeui for kde3 apps (#447965) + +* Thu May 22 2008 Rex Dieter - 4.0.72-6 +- kstandarddirs hack to search /etc/kde + +* Thu May 22 2008 Kevin Kofler - 4.0.72-5 +- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831) + +* Thu May 15 2008 Kevin Kofler - 4.0.72-4 - fix proxy support (#443931, kde#155707) - move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435) -* Tue May 13 2008 Kevin Kofler - 4.0.4-2 +* Tue May 13 2008 Kevin Kofler - 4.0.72-3 - drop no longer needed ALSA default device Phonon hack -* Tue May 06 2008 Rex Dieter - 4.0.4-1 -- kde-4.0.4 +* Sun May 4 2008 Kevin Kofler - 4.0.72-2 +- BR new minimum versions of qt4-devel and soprano-devel + +* Fri May 2 2008 Kevin Kofler - 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) +- parallel_devel patch ported by Lorenzo Villani +- update file list (Lorenzo Villani) +- drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches +- update xdg-menu (Administration menu) patch * Tue Apr 22 2008 Luk???? Tinkl - 4.0.3-7 -- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1, +- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1, #443766: CVE-2008-1670) * Fri Apr 04 2008 Than Ngo - 4.0.3-6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Jun 2008 15:39:10 -0000 1.11 +++ sources 24 Jul 2008 18:16:50 -0000 1.12 @@ -1 +1 @@ -4922865df8df46bef0472528e88564a5 kdelibs-4.0.5.tar.bz2 +86496aed25d4dce440418b3064a27913 kdelibs-4.1.0.tar.bz2 --- kdelibs-4.0.3-libexecdir.patch DELETED --- --- kdelibs-4.0.4-khtml-stylesheet.patch DELETED --- --- kdelibs-4.0.4-kstandarddirs.patch DELETED --- --- kdelibs-4.0.4-parallel_devel.patch DELETED --- --- kdelibs-4.0.4-proxy.patch DELETED --- --- kdelibs-4.0.5-iconload.patch DELETED --- --- kdelibs-4.0.5-kio-ftp-overwrite.patch DELETED --- --- kdelibs-4.0.5-kio-subjob.patch DELETED --- --- kdelibs-4.0.5-kprotocolcombo.patch DELETED --- --- kdelibs-4.0.5-strigi-metainfo.patch DELETED --- --- kdelibs-4.x-xdg-menu.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 18:19:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Thu, 24 Jul 2008 18:19:02 GMT Subject: rpms/gbrainy/F-9 gbrainy.spec,1.2,1.3 Message-ID: <200807241819.m6OIJ2Yg026012@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/gbrainy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25962 Modified Files: gbrainy.spec Log Message: Rebuild for dependencies Index: gbrainy.spec =================================================================== RCS file: /cvs/pkgs/rpms/gbrainy/F-9/gbrainy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gbrainy.spec 3 Jun 2008 20:11:00 -0000 1.2 +++ gbrainy.spec 24 Jul 2008 18:18:13 -0000 1.3 @@ -1,6 +1,6 @@ Name: gbrainy Version: 0.70 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gbrainy is a brain teaser game and trainer to keep your brain trained Group: Amusements/Games @@ -73,6 +73,9 @@ %{_datadir}/pixmaps/%{name}* %changelog +* Tue Jul 24 2008 Beno??t Marcelin 0.70-2 +- Rebuild for dependencies + * Tue Jun 03 2008 Beno??t Marcelin 0.70-1 - Update to 0.70 - 8 new puzzles From fedora-extras-commits at redhat.com Thu Jul 24 18:19:50 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 24 Jul 2008 18:19:50 GMT Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.3, 1.4 selinux-policy.spec, 1.687, 1.688 Message-ID: <200807241819.m6OIJoFI026132@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25985 Modified Files: policy-20080710.patch selinux-policy.spec Log Message: * Wed Jul 16 2008 Dan Walsh 3.5.1-1 - Fix xguest -> xguest_mozilla_t -> xguest_openiffice_t - Change dhclient to be able to red networkmanager_var_run policy-20080710.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 policy-20080710.patch Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- policy-20080710.patch 17 Jul 2008 19:53:32 -0000 1.3 +++ policy-20080710.patch 24 Jul 2008 18:19:05 -0000 1.4 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.1/Makefile --- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.1/Makefile 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/Makefile 2008-07-24 06:54:04.000000000 -0400 @@ -311,20 +311,22 @@ # parse-rolemap modulename,outputfile @@ -47,7 +47,7 @@ $(verbose) $(INSTALL) -m 644 $< $@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.1/Rules.modular --- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.1/Rules.modular 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/Rules.modular 2008-07-24 06:54:04.000000000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -79,7 +79,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.1/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/default_contexts 2008-07-17 11:49:28.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -2,7 +2,7 @@ system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0 @@ -91,13 +91,13 @@ staff_r:staff_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context 2008-07-24 06:54:04.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -105,7 +105,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -121,7 +121,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 @@ -134,13 +134,13 @@ +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context 2008-07-24 06:54:04.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -149,7 +149,7 @@ +system_r:xdm_t xguest_r:xguest_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -157,7 +157,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t @@ -165,7 +165,7 @@ +system_r:crond_t guest_r:guest_crond_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -181,7 +181,7 @@ +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t @@ -190,21 +190,115 @@ +system_r:xdm_t xguest_r:xguest_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.5.1/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/man/man8/ftpd_selinux.8 2008-07-16 10:33:11.000000000 -0400 -@@ -35,10 +35,6 @@ - directorories, you need to set the ftp_home_dir boolean. ++++ serefpolicy-3.5.1/man/man8/ftpd_selinux.8 2008-07-24 06:54:04.000000000 -0400 +@@ -1,52 +1,65 @@ +-.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation" ++.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ftpd SELinux policy documentation" + .SH "NAME" +-ftpd_selinux \- Security Enhanced Linux Policy for the ftp daemon ++.PP ++ftpd_selinux \- Security-Enhanced Linux policy for ftp daemons. + .SH "DESCRIPTION" +- +-Security-Enhanced Linux secures the ftpd server via flexible mandatory access +-control. ++.PP ++Security-Enhanced Linux provides security for ftp daemons via flexible mandatory access control. + .SH FILE_CONTEXTS +-SELinux requires files to have an extended attribute to define the file type. +-Policy governs the access daemons have to these files. +-If you want to share files anonymously, you must label the files and directories public_content_t. So if you created a special directory /var/ftp, you would need to label the directory with the chcon tool. +-.TP +-chcon -R -t public_content_t /var/ftp +-.TP +-If you want to setup a directory where you can upload files to you must label the files and directories public_content_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. +-.TP +-chcon -t public_content_rw_t /var/ftp/incoming ++.PP ++SELinux requires files to have a file type. File types may be specified with semanage and are restored with restorecon. Policy governs the access that daemons have to files. + .TP +-You must also turn on the boolean allow_ftpd_anon_write. ++Allow ftp servers to read the /var/ftp directory by adding the public_content_t file type to the directory and by restoring the file type. ++.PP ++.B ++semanage fcontext -a -t public_content_t "/var/ftp(/.*)?" ++.TP ++.B ++restorecon -R -v /var/ftp ++.TP ++Allow ftp servers to read and write /var/tmp/incoming by adding the public_content_rw_t type to the directory and by restoring the file type. This also requires the allow_ftpd_anon_write boolean to be set. ++.PP ++.B ++semanage fcontext -a -t public_content_rw_t "/var/ftp/incoming(/.*)?" .TP - setsebool -P ftp_home_dir 1 +-setsebool -P allow_ftpd_anon_write=1 +-.TP +-If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. +-.TP +-/etc/selinux/POLICYTYPE/contexts/files/file_contexts.local +-.br +-/var/ftp(/.*)? system_u:object_r:public_content_t +-/var/ftp/incoming(/.*)? system_u:object_r:public_content_rw_t ++.B ++restorecon -R -v /var/ftp/incoming + + .SH BOOLEANS +-SELinux ftp daemon policy is customizable based on least access required. So by +-default SElinux does not allow users to login and read their home directories. +-.br +-If you are setting up this machine as a ftpd server and wish to allow users to access their home +-directorories, you need to set the ftp_home_dir boolean. +-.TP +-setsebool -P ftp_home_dir 1 -.TP -ftpd can run either as a standalone daemon or as part of the xinetd domain. If you want to run ftpd as a daemon you must set the ftpd_is_daemon boolean. -.TP -setsebool -P ftpd_is_daemon 1 - .br - service vsftpd restart +-.br +-service vsftpd restart ++.PP ++SELinux policy is based on least privilege required and may also be customizable by setting a boolean with setsebool. ++.TP ++Allow ftp servers to read and write files with the public_content_rw_t file type. [...4620 lines suppressed...] optional_policy(` -@@ -226,6 +235,10 @@ +@@ -226,6 +229,10 @@ ') optional_policy(` @@ -32631,7 +32661,7 @@ kernel_read_xen_state(dhcpc_t) kernel_write_xen_state(dhcpc_t) xen_append_log(dhcpc_t) -@@ -239,7 +252,6 @@ +@@ -239,7 +246,6 @@ allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack }; allow ifconfig_t self:capability { net_raw net_admin sys_tty_config }; @@ -32639,7 +32669,7 @@ allow ifconfig_t self:fd use; allow ifconfig_t self:fifo_file rw_fifo_file_perms; -@@ -253,6 +265,7 @@ +@@ -253,6 +259,7 @@ allow ifconfig_t self:sem create_sem_perms; allow ifconfig_t self:msgq create_msgq_perms; allow ifconfig_t self:msg { send receive }; @@ -32647,7 +32677,7 @@ # Create UDP sockets, necessary when called from dhcpc allow ifconfig_t self:udp_socket create_socket_perms; -@@ -268,7 +281,10 @@ +@@ -268,7 +275,10 @@ kernel_read_system_state(ifconfig_t) kernel_read_network_state(ifconfig_t) kernel_search_network_sysctl(ifconfig_t) @@ -32658,7 +32688,7 @@ corenet_rw_tun_tap_dev(ifconfig_t) -@@ -279,8 +295,11 @@ +@@ -279,8 +289,11 @@ fs_getattr_xattr_fs(ifconfig_t) fs_search_auto_mountpoints(ifconfig_t) @@ -32670,7 +32700,7 @@ domain_use_interactive_fds(ifconfig_t) -@@ -308,7 +327,7 @@ +@@ -308,7 +321,7 @@ unconfined_domain(ifconfig_t) ') ') @@ -32679,7 +32709,7 @@ ifdef(`hide_broken_symptoms',` optional_policy(` dev_dontaudit_rw_cardmgr(ifconfig_t) -@@ -324,6 +343,10 @@ +@@ -324,6 +337,10 @@ ') optional_policy(` @@ -32690,7 +32720,7 @@ nis_use_ypbind(ifconfig_t) ') -@@ -332,6 +355,14 @@ +@@ -332,6 +349,14 @@ ') optional_policy(` @@ -32707,7 +32737,7 @@ xen_append_log(ifconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.1/policy/modules/system/udev.if --- nsaserefpolicy/policy/modules/system/udev.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/udev.if 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/udev.if 2008-07-24 06:54:05.000000000 -0400 @@ -96,6 +96,24 @@ ######################################## @@ -32763,7 +32793,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.1/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/udev.te 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/udev.te 2008-07-24 06:54:05.000000000 -0400 @@ -83,6 +83,7 @@ kernel_rw_unix_dgram_sockets(udev_t) kernel_dgram_send(udev_t) @@ -32821,8 +32851,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.1/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-07-16 10:26:23.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/unconfined.fc 2008-07-16 10:33:11.000000000 -0400 -@@ -2,15 +2,28 @@ ++++ serefpolicy-3.5.1/policy/modules/system/unconfined.fc 2008-07-24 06:54:05.000000000 -0400 +@@ -2,15 +2,29 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t @@ -32856,9 +32886,10 @@ +/usr/libexec/ghc-[^/]+/ghc-.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) + +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) ++/usr/sbin/vbetool -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.1/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-07-16 10:26:23.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/unconfined.if 2008-07-16 14:12:57.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/unconfined.if 2008-07-24 06:54:05.000000000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -33228,7 +33259,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.1/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-07-16 10:26:23.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/unconfined.te 2008-07-16 14:13:22.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/unconfined.te 2008-07-24 06:54:05.000000000 -0400 @@ -6,35 +6,74 @@ # Declarations # @@ -33564,7 +33595,7 @@ +domain_ptrace_all_domains(unconfined_notrans_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.1/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/userdomain.fc 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/userdomain.fc 2008-07-24 06:54:05.000000000 -0400 @@ -1,4 +1,5 @@ -HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) -HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) @@ -33577,7 +33608,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/userdomain.if 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/userdomain.if 2008-07-24 06:54:05.000000000 -0400 @@ -28,10 +28,14 @@ class context contains; ') @@ -36333,7 +36364,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/userdomain.te 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/userdomain.te 2008-07-24 06:54:05.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -36450,7 +36481,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.1/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/xen.fc 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.fc 2008-07-24 06:54:05.000000000 -0400 @@ -20,6 +20,7 @@ /var/run/xenconsoled\.pid -- gen_context(system_u:object_r:xenconsoled_var_run_t,s0) /var/run/xend(/.*)? gen_context(system_u:object_r:xend_var_run_t,s0) @@ -36461,7 +36492,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.1/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/xen.if 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.if 2008-07-24 06:54:05.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -36505,7 +36536,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.1/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/xen.te 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.te 2008-07-24 06:54:05.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -36744,7 +36775,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.1/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.1/policy/support/file_patterns.spt 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/support/file_patterns.spt 2008-07-24 06:54:05.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -36771,7 +36802,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.1/policy/support/obj_perm_sets.spt 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/support/obj_perm_sets.spt 2008-07-24 06:54:05.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -36788,7 +36819,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.1/policy/users --- nsaserefpolicy/policy/users 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/users 2008-07-16 10:33:11.000000000 -0400 ++++ serefpolicy-3.5.1/policy/users 2008-07-24 06:54:05.000000000 -0400 @@ -1,3 +1,9 @@ +role auditadm_r; +role secadm_r; Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.687 retrieving revision 1.688 diff -u -r1.687 -r1.688 --- selinux-policy.spec 17 Jul 2008 19:53:32 -0000 1.687 +++ selinux-policy.spec 24 Jul 2008 18:19:05 -0000 1.688 @@ -377,6 +377,7 @@ %changelog * Wed Jul 16 2008 Dan Walsh 3.5.1-1 - Fix xguest -> xguest_mozilla_t -> xguest_openiffice_t +- Change dhclient to be able to red networkmanager_var_run * Tue Jul 15 2008 Dan Walsh 3.5.0-1 - Update to latest refpolicy From fedora-extras-commits at redhat.com Thu Jul 24 18:21:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:21:28 GMT Subject: rpms/immix - New directory Message-ID: <200807241821.m6OILSp4026246@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/immix In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26206/rpms/immix Log Message: Directory /cvs/extras/rpms/immix added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:21:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:21:42 GMT Subject: rpms/immix/devel - New directory Message-ID: <200807241821.m6OILgO7026262@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/immix/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26206/rpms/immix/devel Log Message: Directory /cvs/extras/rpms/immix/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:22:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:22:00 GMT Subject: rpms/immix Makefile,NONE,1.1 Message-ID: <200807241822.m6OIM0bL026287@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/immix In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26206/rpms/immix Added Files: Makefile Log Message: Setup of module immix --- NEW FILE Makefile --- # Top level Makefile for module immix all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:22:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:22:16 GMT Subject: rpms/immix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241822.m6OIMGHU026309@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/immix/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26206/rpms/immix/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module immix --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: immix # $Id: Makefile,v 1.1 2008/07/24 18:22:00 kevin Exp $ NAME := immix SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:24:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:24:06 +0000 Subject: [pkgdb] gtest was added for rishi Message-ID: <20080724182406.3C2F21AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gtest with summary Google C++ testing framework Kevin Fenzi (kevin) has approved Package gtest Kevin Fenzi (kevin) has added a Fedora devel branch for gtest with an owner of rishi Kevin Fenzi (kevin) has approved gtest in Fedora devel Kevin Fenzi (kevin) has approved Package gtest Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gtest (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gtest (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gtest (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on gtest (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on gtest (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on gtest (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtest From fedora-extras-commits at redhat.com Thu Jul 24 18:24:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:24:11 +0000 Subject: [pkgdb] gtest (Fedora, 9) updated by kevin Message-ID: <20080724182418.3311F1AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for gtest Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gtest (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gtest (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gtest (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on gtest (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtest From fedora-extras-commits at redhat.com Thu Jul 24 18:24:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:24:11 +0000 Subject: [pkgdb] gtest (Fedora, 8) updated by kevin Message-ID: <20080724182417.29F571AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for gtest Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gtest (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gtest (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gtest (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on gtest (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtest From fedora-extras-commits at redhat.com Thu Jul 24 18:24:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:24:11 +0000 Subject: [pkgdb] gtest (Fedora, devel) updated by kevin Message-ID: <20080724182418.E03541AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on gtest (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtest From fedora-extras-commits at redhat.com Thu Jul 24 18:25:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:25:40 GMT Subject: rpms/gtest - New directory Message-ID: <200807241825.m6OIPeiG026572@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gtest In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26521/rpms/gtest Log Message: Directory /cvs/extras/rpms/gtest added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:25:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:25:54 GMT Subject: rpms/gtest/devel - New directory Message-ID: <200807241825.m6OIPsep026590@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gtest/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26521/rpms/gtest/devel Log Message: Directory /cvs/extras/rpms/gtest/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:26:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:26:11 GMT Subject: rpms/gtest Makefile,NONE,1.1 Message-ID: <200807241826.m6OIQBFl026615@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gtest In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26521/rpms/gtest Added Files: Makefile Log Message: Setup of module gtest --- NEW FILE Makefile --- # Top level Makefile for module gtest all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:26:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:26:24 GMT Subject: rpms/gtest/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241826.m6OIQOWV026632@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gtest/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso26521/rpms/gtest/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtest --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gtest # $Id: Makefile,v 1.1 2008/07/24 18:26:11 kevin Exp $ NAME := gtest SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:26:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:26:19 +0000 Subject: [pkgdb] kpackagekit was added for tuxbrewr Message-ID: <20080724182619.516E71AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package kpackagekit with summary KDE packagekit interface Kevin Fenzi (kevin) has approved Package kpackagekit Kevin Fenzi (kevin) has added a Fedora devel branch for kpackagekit with an owner of tuxbrewr Kevin Fenzi (kevin) has approved kpackagekit in Fedora devel Kevin Fenzi (kevin) has approved Package kpackagekit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kpackagekit (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on kpackagekit (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kpackagekit (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on kpackagekit (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on kpackagekit (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on kpackagekit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:26:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:26:25 +0000 Subject: [pkgdb] kpackagekit (Fedora, devel) updated by kevin Message-ID: <20080724182631.BC6181AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on kpackagekit (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchcommits on kpackagekit (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchbugzilla on kpackagekit (Fedora devel) for kkofler Kevin Fenzi (kevin) approved watchcommits on kpackagekit (Fedora devel) for kkofler Kevin Fenzi (kevin) Approved cvsextras for commit access on kpackagekit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:26:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:26:25 +0000 Subject: [pkgdb] kpackagekit (Fedora, 9) updated by kevin Message-ID: <20080724182633.24E9A1AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for kpackagekit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kpackagekit (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on kpackagekit (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kpackagekit (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on kpackagekit (Fedora 9) for rdieter Kevin Fenzi (kevin) approved watchcommits on kpackagekit (Fedora 9) for rdieter Kevin Fenzi (kevin) approved watchbugzilla on kpackagekit (Fedora 9) for kkofler Kevin Fenzi (kevin) approved watchcommits on kpackagekit (Fedora 9) for kkofler Kevin Fenzi (kevin) Approved cvsextras for commit access on kpackagekit (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:27:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:27:09 GMT Subject: rpms/kpackagekit - New directory Message-ID: <200807241827.m6OIR9QF026805@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kpackagekit In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi26765/rpms/kpackagekit Log Message: Directory /cvs/extras/rpms/kpackagekit added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:27:22 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:27:22 GMT Subject: rpms/kpackagekit/devel - New directory Message-ID: <200807241827.m6OIRMxA026854@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kpackagekit/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi26765/rpms/kpackagekit/devel Log Message: Directory /cvs/extras/rpms/kpackagekit/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:27:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:27:27 +0000 Subject: [pkgdb] fotoxx was added for eponyme Message-ID: <20080724182727.2ADA61AD0DD@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package fotoxx with summary Photo editor Kevin Fenzi (kevin) has approved Package fotoxx Kevin Fenzi (kevin) has added a Fedora devel branch for fotoxx with an owner of eponyme Kevin Fenzi (kevin) has approved fotoxx in Fedora devel Kevin Fenzi (kevin) has approved Package fotoxx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fotoxx (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on fotoxx (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fotoxx (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on fotoxx (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on fotoxx (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on fotoxx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fotoxx From fedora-extras-commits at redhat.com Thu Jul 24 18:27:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:27:38 GMT Subject: rpms/kpackagekit Makefile,NONE,1.1 Message-ID: <200807241827.m6OIRc61026896@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kpackagekit In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi26765/rpms/kpackagekit Added Files: Makefile Log Message: Setup of module kpackagekit --- NEW FILE Makefile --- # Top level Makefile for module kpackagekit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:27:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:27:28 +0000 Subject: [pkgdb] fotoxx (Fedora, 8) updated by kevin Message-ID: <20080724182728.347EF1AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for fotoxx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fotoxx (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on fotoxx (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fotoxx (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on fotoxx (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fotoxx From fedora-extras-commits at redhat.com Thu Jul 24 18:27:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:27:28 +0000 Subject: [pkgdb] fotoxx (Fedora, devel) updated by kevin Message-ID: <20080724182728.91DE31AD0EB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on fotoxx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fotoxx From fedora-extras-commits at redhat.com Thu Jul 24 18:27:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 18:27:41 GMT Subject: rpms/bzr-gtk/devel bzr-gtk-ghost-keyerror.patch, 1.2, 1.3 bzr-gtk.spec, 1.34, 1.35 Message-ID: <200807241827.m6OIRfgA026913@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26464 Modified Files: bzr-gtk-ghost-keyerror.patch bzr-gtk.spec Log Message: * Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 - Upstream has a new patch for bz#455284. bzr-gtk-ghost-keyerror.patch: Index: bzr-gtk-ghost-keyerror.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk-ghost-keyerror.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bzr-gtk-ghost-keyerror.patch 15 Jul 2008 09:09:06 -0000 1.2 +++ bzr-gtk-ghost-keyerror.patch 24 Jul 2008 18:26:52 -0000 1.3 @@ -1,13 +1,13 @@ -Index: bzr-gtk-0.94.0/branchview/treeview.py +Index: bzr-gtk-0.94.0/olive/__init__.py =================================================================== ---- bzr-gtk-0.94.0.orig/branchview/treeview.py -+++ bzr-gtk-0.94.0/branchview/treeview.py -@@ -285,7 +285,7 @@ class TreeView(gtk.VBox): +--- bzr-gtk-0.94.0.orig/olive/__init__.py ++++ bzr-gtk-0.94.0/olive/__init__.py +@@ -773,7 +773,7 @@ class OliveGtk: + else: + branch = self.remote_branch - self.branch.lock_read() - (linegraphdata, index, columns_len) = linegraph(self.branch.repository, -- self.start, -+ (self.start,), - self.maxnum, - broken_line_length, - show_graph, +- window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window) ++ window = branchwin.BranchWindow(branch, [branch.last_revision()], None, parent=self.window) + window.show() + + def on_menuitem_view_refresh_activate(self, widget): Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- bzr-gtk.spec 15 Jul 2008 09:09:06 -0000 1.34 +++ bzr-gtk.spec 24 Jul 2008 18:26:52 -0000 1.35 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 4%{?dist}.1 +Release: 5%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,6 +127,9 @@ %endif %changelog +* Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 +- Upstream has a new patch for bz#455284. + * Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4.1 - Add upstream patch to fix a traceback when using log in olive. - Refresh patches so we don't have fuzz. From fedora-extras-commits at redhat.com Thu Jul 24 18:27:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:27:55 GMT Subject: rpms/kpackagekit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241827.m6OIRt8j026920@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kpackagekit/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi26765/rpms/kpackagekit/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kpackagekit --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: kpackagekit # $Id: Makefile,v 1.1 2008/07/24 18:27:38 kevin Exp $ NAME := kpackagekit SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:27:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:27:28 +0000 Subject: [pkgdb] fotoxx (Fedora, 9) updated by kevin Message-ID: <20080724182728.CE5FA1AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for fotoxx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fotoxx (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on fotoxx (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fotoxx (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on fotoxx (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fotoxx From fedora-extras-commits at redhat.com Thu Jul 24 18:29:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:29:16 GMT Subject: rpms/fotoxx - New directory Message-ID: <200807241829.m6OITGRr027111@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotoxx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx27026/rpms/fotoxx Log Message: Directory /cvs/extras/rpms/fotoxx added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:29:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:29:33 GMT Subject: rpms/fotoxx/devel - New directory Message-ID: <200807241829.m6OITX8l027148@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotoxx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx27026/rpms/fotoxx/devel Log Message: Directory /cvs/extras/rpms/fotoxx/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:29:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:29:48 GMT Subject: rpms/fotoxx Makefile,NONE,1.1 Message-ID: <200807241829.m6OITmnb027185@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotoxx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx27026/rpms/fotoxx Added Files: Makefile Log Message: Setup of module fotoxx --- NEW FILE Makefile --- # Top level Makefile for module fotoxx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:29:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:29:50 +0000 Subject: [pkgdb] perl-DateTime-Format-DBI was added for cweyl Message-ID: <20080724182951.0C3021AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-DateTime-Format-DBI with summary Find a parser class for a database connection Kevin Fenzi (kevin) has approved Package perl-DateTime-Format-DBI Kevin Fenzi (kevin) has added a Fedora devel branch for perl-DateTime-Format-DBI with an owner of cweyl Kevin Fenzi (kevin) has approved perl-DateTime-Format-DBI in Fedora devel Kevin Fenzi (kevin) has approved Package perl-DateTime-Format-DBI Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-DateTime-Format-DBI (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-DateTime-Format-DBI (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-DateTime-Format-DBI (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DBI From fedora-extras-commits at redhat.com Thu Jul 24 18:30:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:30:05 GMT Subject: rpms/fotoxx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241830.m6OIU5wZ027228@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fotoxx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx27026/rpms/fotoxx/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fotoxx --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: fotoxx # $Id: Makefile,v 1.1 2008/07/24 18:29:48 kevin Exp $ NAME := fotoxx SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:29:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:29:57 +0000 Subject: [pkgdb] perl-DateTime-Format-DBI (Fedora, 8) updated by kevin Message-ID: <20080724183004.C2FD11AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-DateTime-Format-DBI Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on perl-DateTime-Format-DBI (Fedora 8) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-DateTime-Format-DBI (Fedora 8) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-DateTime-Format-DBI (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DBI From fedora-extras-commits at redhat.com Thu Jul 24 18:29:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:29:57 +0000 Subject: [pkgdb] perl-DateTime-Format-DBI (Fedora, devel) updated by kevin Message-ID: <20080724183008.5D0041AD10F@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on perl-DateTime-Format-DBI (Fedora devel) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-DateTime-Format-DBI (Fedora devel) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-DateTime-Format-DBI (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DBI From fedora-extras-commits at redhat.com Thu Jul 24 18:30:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:30:39 GMT Subject: rpms/perl-DateTime-Format-DBI - New directory Message-ID: <200807241830.m6OIUdmx027417@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DateTime-Format-DBI In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm27366/rpms/perl-DateTime-Format-DBI Log Message: Directory /cvs/extras/rpms/perl-DateTime-Format-DBI added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:30:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:30:53 GMT Subject: rpms/perl-DateTime-Format-DBI/devel - New directory Message-ID: <200807241830.m6OIUrKC027441@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DateTime-Format-DBI/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm27366/rpms/perl-DateTime-Format-DBI/devel Log Message: Directory /cvs/extras/rpms/perl-DateTime-Format-DBI/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 24 18:29:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:29:57 +0000 Subject: [pkgdb] perl-DateTime-Format-DBI (Fedora, 9) updated by kevin Message-ID: <20080724183012.48B0B1AD11A@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-DateTime-Format-DBI Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-DateTime-Format-DBI (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on perl-DateTime-Format-DBI (Fedora 9) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-DateTime-Format-DBI (Fedora 9) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-DateTime-Format-DBI (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DBI From fedora-extras-commits at redhat.com Thu Jul 24 18:31:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:31:12 GMT Subject: rpms/perl-DateTime-Format-DBI Makefile,NONE,1.1 Message-ID: <200807241831.m6OIVCYh027500@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DateTime-Format-DBI In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm27366/rpms/perl-DateTime-Format-DBI Added Files: Makefile Log Message: Setup of module perl-DateTime-Format-DBI --- NEW FILE Makefile --- # Top level Makefile for module perl-DateTime-Format-DBI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 24 18:30:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:30:54 +0000 Subject: [pkgdb] ipython (Fedora EPEL, 5) updated by kevin Message-ID: <20080724183055.595011AD109@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for ipython Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ipython (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ipython (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ipython (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipython From fedora-extras-commits at redhat.com Thu Jul 24 18:31:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 24 Jul 2008 18:31:26 GMT Subject: rpms/perl-DateTime-Format-DBI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807241831.m6OIVQg8027538@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-DateTime-Format-DBI/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm27366/rpms/perl-DateTime-Format-DBI/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-DateTime-Format-DBI --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-DateTime-Format-DBI # $Id: Makefile,v 1.1 2008/07/24 18:31:12 kevin Exp $ NAME := perl-DateTime-Format-DBI SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 24 18:32:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 18:32:03 GMT Subject: rpms/bzr-gtk/F-8 bzr-gtk-disable-nautilus-pull.patch, 1.1, 1.2 bzr-gtk-disable-notifier.patch, 1.1, 1.2 bzr-gtk-ghost-keyerror.patch, 1.1, 1.2 bzr-gtk.spec, 1.19, 1.20 Message-ID: <200807241832.m6OIW36n027794@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27415/F-8 Modified Files: bzr-gtk-disable-nautilus-pull.patch bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch bzr-gtk.spec Log Message: * Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 - Upstream has a new patch for bz#455284. bzr-gtk-disable-nautilus-pull.patch: Index: bzr-gtk-disable-nautilus-pull.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk-disable-nautilus-pull.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-nautilus-pull.patch 10 Jun 2007 21:21:19 -0000 1.1 +++ bzr-gtk-disable-nautilus-pull.patch 24 Jul 2008 18:31:15 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/nautilus-bzr.py +Index: bzr-gtk-0.94.0/nautilus-bzr.py =================================================================== ---- bzr-gtk-0.15.2.orig/nautilus-bzr.py -+++ bzr-gtk-0.15.2/nautilus-bzr.py -@@ -165,24 +165,6 @@ class BzrExtension(nautilus.MenuProvider +--- bzr-gtk-0.94.0.orig/nautilus-bzr.py ++++ bzr-gtk-0.94.0/nautilus-bzr.py +@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider return @@ -27,7 +27,7 @@ def merge_cb(self, menu, vfs_file): # We can only cope with local files if vfs_file.get_uri_scheme() != 'file': -@@ -227,12 +209,6 @@ class BzrExtension(nautilus.MenuProvider +@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider item.connect('activate', self.log_cb, vfs_file) items.append(item) bzr-gtk-disable-notifier.patch: Index: bzr-gtk-disable-notifier.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk-disable-notifier.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-notifier.patch 3 Apr 2007 20:44:47 -0000 1.1 +++ bzr-gtk-disable-notifier.patch 24 Jul 2008 18:31:15 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/__init__.py +Index: bzr-gtk-0.94.0/__init__.py =================================================================== ---- bzr-gtk-0.15.2.orig/__init__.py -+++ bzr-gtk-0.15.2/__init__.py -@@ -491,7 +491,9 @@ class cmd_commit_notify(GTKCommand): +--- bzr-gtk-0.94.0.orig/__init__.py ++++ bzr-gtk-0.94.0/__init__.py +@@ -594,7 +594,9 @@ class cmd_commit_notify(GTKCommand): pynotify.init("bzr commit-notify") gtk.main() @@ -12,4 +12,4 @@ +#register_command(cmd_commit_notify) - import gettext + class cmd_gselftest(GTKCommand): bzr-gtk-ghost-keyerror.patch: Index: bzr-gtk-ghost-keyerror.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk-ghost-keyerror.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-ghost-keyerror.patch 15 Jul 2008 02:56:31 -0000 1.1 +++ bzr-gtk-ghost-keyerror.patch 24 Jul 2008 18:31:15 -0000 1.2 @@ -1,12 +1,13 @@ -diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py ---- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 -+++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 -@@ -285,7 +285,7 @@ class TreeView(gtk.VBox): +Index: bzr-gtk-0.94.0/olive/__init__.py +=================================================================== +--- bzr-gtk-0.94.0.orig/olive/__init__.py ++++ bzr-gtk-0.94.0/olive/__init__.py +@@ -773,7 +773,7 @@ class OliveGtk: + else: + branch = self.remote_branch - self.branch.lock_read() - (linegraphdata, index, columns_len) = linegraph(self.branch.repository, -- self.start, -+ (self.start,), - self.maxnum, - broken_line_length, - show_graph, +- window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window) ++ window = branchwin.BranchWindow(branch, [branch.last_revision()], None, parent=self.window) + window.show() + + def on_menuitem_view_refresh_activate(self, widget): Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bzr-gtk.spec 15 Jul 2008 02:59:25 -0000 1.19 +++ bzr-gtk.spec 24 Jul 2008 18:31:15 -0000 1.20 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,8 +127,12 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 +* Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 +- Upstream has a new patch for bz#455284. + +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4.1 - Add upstream patch to fix a traceback when using log in olive. +- Refresh patches so we don't have fuzz. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse From fedora-extras-commits at redhat.com Thu Jul 24 18:32:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 18:32:15 GMT Subject: rpms/bzr-gtk/EL-5 bzr-gtk-disable-nautilus-pull.patch, 1.1, 1.2 bzr-gtk-disable-notifier.patch, 1.1, 1.2 bzr-gtk-ghost-keyerror.patch, 1.1, 1.2 bzr-gtk.spec, 1.19, 1.20 Message-ID: <200807241832.m6OIWFAZ027812@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27415/EL-5 Modified Files: bzr-gtk-disable-nautilus-pull.patch bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch bzr-gtk.spec Log Message: * Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 - Upstream has a new patch for bz#455284. bzr-gtk-disable-nautilus-pull.patch: Index: bzr-gtk-disable-nautilus-pull.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk-disable-nautilus-pull.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-nautilus-pull.patch 25 Jul 2007 23:01:06 -0000 1.1 +++ bzr-gtk-disable-nautilus-pull.patch 24 Jul 2008 18:30:55 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/nautilus-bzr.py +Index: bzr-gtk-0.94.0/nautilus-bzr.py =================================================================== ---- bzr-gtk-0.15.2.orig/nautilus-bzr.py -+++ bzr-gtk-0.15.2/nautilus-bzr.py -@@ -165,24 +165,6 @@ class BzrExtension(nautilus.MenuProvider +--- bzr-gtk-0.94.0.orig/nautilus-bzr.py ++++ bzr-gtk-0.94.0/nautilus-bzr.py +@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider return @@ -27,7 +27,7 @@ def merge_cb(self, menu, vfs_file): # We can only cope with local files if vfs_file.get_uri_scheme() != 'file': -@@ -227,12 +209,6 @@ class BzrExtension(nautilus.MenuProvider +@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider item.connect('activate', self.log_cb, vfs_file) items.append(item) bzr-gtk-disable-notifier.patch: Index: bzr-gtk-disable-notifier.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk-disable-notifier.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-notifier.patch 3 Apr 2007 20:44:58 -0000 1.1 +++ bzr-gtk-disable-notifier.patch 24 Jul 2008 18:30:55 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/__init__.py +Index: bzr-gtk-0.94.0/__init__.py =================================================================== ---- bzr-gtk-0.15.2.orig/__init__.py -+++ bzr-gtk-0.15.2/__init__.py -@@ -491,7 +491,9 @@ class cmd_commit_notify(GTKCommand): +--- bzr-gtk-0.94.0.orig/__init__.py ++++ bzr-gtk-0.94.0/__init__.py +@@ -594,7 +594,9 @@ class cmd_commit_notify(GTKCommand): pynotify.init("bzr commit-notify") gtk.main() @@ -12,4 +12,4 @@ +#register_command(cmd_commit_notify) - import gettext + class cmd_gselftest(GTKCommand): bzr-gtk-ghost-keyerror.patch: Index: bzr-gtk-ghost-keyerror.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk-ghost-keyerror.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-ghost-keyerror.patch 15 Jul 2008 02:56:10 -0000 1.1 +++ bzr-gtk-ghost-keyerror.patch 24 Jul 2008 18:30:55 -0000 1.2 @@ -1,12 +1,13 @@ -diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py ---- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 -+++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 -@@ -285,7 +285,7 @@ class TreeView(gtk.VBox): +Index: bzr-gtk-0.94.0/olive/__init__.py +=================================================================== +--- bzr-gtk-0.94.0.orig/olive/__init__.py ++++ bzr-gtk-0.94.0/olive/__init__.py +@@ -773,7 +773,7 @@ class OliveGtk: + else: + branch = self.remote_branch - self.branch.lock_read() - (linegraphdata, index, columns_len) = linegraph(self.branch.repository, -- self.start, -+ (self.start,), - self.maxnum, - broken_line_length, - show_graph, +- window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window) ++ window = branchwin.BranchWindow(branch, [branch.last_revision()], None, parent=self.window) + window.show() + + def on_menuitem_view_refresh_activate(self, widget): Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bzr-gtk.spec 15 Jul 2008 02:59:03 -0000 1.19 +++ bzr-gtk.spec 24 Jul 2008 18:30:55 -0000 1.20 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,8 +127,12 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 +* Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 +- Upstream has a new patch for bz#455284. + +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4.1 - Add upstream patch to fix a traceback when using log in olive. +- Refresh patches so we don't have fuzz. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse From fedora-extras-commits at redhat.com Thu Jul 24 18:32:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Thu, 24 Jul 2008 18:32:24 GMT Subject: rpms/bzr-gtk/F-9 bzr-gtk-disable-nautilus-pull.patch, 1.1, 1.2 bzr-gtk-disable-notifier.patch, 1.1, 1.2 bzr-gtk-ghost-keyerror.patch, 1.1, 1.2 bzr-gtk.spec, 1.20, 1.21 Message-ID: <200807241832.m6OIWOVC027847@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/bzr-gtk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27415/F-9 Modified Files: bzr-gtk-disable-nautilus-pull.patch bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch bzr-gtk.spec Log Message: * Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 - Upstream has a new patch for bz#455284. bzr-gtk-disable-nautilus-pull.patch: Index: bzr-gtk-disable-nautilus-pull.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk-disable-nautilus-pull.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-nautilus-pull.patch 10 Jun 2007 21:21:19 -0000 1.1 +++ bzr-gtk-disable-nautilus-pull.patch 24 Jul 2008 18:31:34 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/nautilus-bzr.py +Index: bzr-gtk-0.94.0/nautilus-bzr.py =================================================================== ---- bzr-gtk-0.15.2.orig/nautilus-bzr.py -+++ bzr-gtk-0.15.2/nautilus-bzr.py -@@ -165,24 +165,6 @@ class BzrExtension(nautilus.MenuProvider +--- bzr-gtk-0.94.0.orig/nautilus-bzr.py ++++ bzr-gtk-0.94.0/nautilus-bzr.py +@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider return @@ -27,7 +27,7 @@ def merge_cb(self, menu, vfs_file): # We can only cope with local files if vfs_file.get_uri_scheme() != 'file': -@@ -227,12 +209,6 @@ class BzrExtension(nautilus.MenuProvider +@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider item.connect('activate', self.log_cb, vfs_file) items.append(item) bzr-gtk-disable-notifier.patch: Index: bzr-gtk-disable-notifier.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk-disable-notifier.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-disable-notifier.patch 3 Apr 2007 20:44:47 -0000 1.1 +++ bzr-gtk-disable-notifier.patch 24 Jul 2008 18:31:34 -0000 1.2 @@ -1,8 +1,8 @@ -Index: bzr-gtk-0.15.2/__init__.py +Index: bzr-gtk-0.94.0/__init__.py =================================================================== ---- bzr-gtk-0.15.2.orig/__init__.py -+++ bzr-gtk-0.15.2/__init__.py -@@ -491,7 +491,9 @@ class cmd_commit_notify(GTKCommand): +--- bzr-gtk-0.94.0.orig/__init__.py ++++ bzr-gtk-0.94.0/__init__.py +@@ -594,7 +594,9 @@ class cmd_commit_notify(GTKCommand): pynotify.init("bzr commit-notify") gtk.main() @@ -12,4 +12,4 @@ +#register_command(cmd_commit_notify) - import gettext + class cmd_gselftest(GTKCommand): bzr-gtk-ghost-keyerror.patch: Index: bzr-gtk-ghost-keyerror.patch =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk-ghost-keyerror.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-gtk-ghost-keyerror.patch 15 Jul 2008 02:56:49 -0000 1.1 +++ bzr-gtk-ghost-keyerror.patch 24 Jul 2008 18:31:34 -0000 1.2 @@ -1,12 +1,13 @@ -diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py ---- bzr-gtk-0.94.0/branchview/treeview.py.ghost 2008-07-14 19:24:23.000000000 -0700 -+++ bzr-gtk-0.94.0/branchview/treeview.py 2008-07-14 19:24:48.000000000 -0700 -@@ -285,7 +285,7 @@ class TreeView(gtk.VBox): +Index: bzr-gtk-0.94.0/olive/__init__.py +=================================================================== +--- bzr-gtk-0.94.0.orig/olive/__init__.py ++++ bzr-gtk-0.94.0/olive/__init__.py +@@ -773,7 +773,7 @@ class OliveGtk: + else: + branch = self.remote_branch - self.branch.lock_read() - (linegraphdata, index, columns_len) = linegraph(self.branch.repository, -- self.start, -+ (self.start,), - self.maxnum, - broken_line_length, - show_graph, +- window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window) ++ window = branchwin.BranchWindow(branch, [branch.last_revision()], None, parent=self.window) + window.show() + + def on_menuitem_view_refresh_activate(self, widget): Index: bzr-gtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr-gtk/F-9/bzr-gtk.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bzr-gtk.spec 15 Jul 2008 02:59:57 -0000 1.20 +++ bzr-gtk.spec 24 Jul 2008 18:31:34 -0000 1.21 @@ -8,7 +8,7 @@ Name: bzr-gtk Version: 0.94.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations Group: Development/Tools @@ -127,8 +127,12 @@ %endif %changelog -* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4 +* Thu Jul 24 2008 Toshio Kuratomi 0.94.0-5 +- Upstream has a new patch for bz#455284. + +* Mon Jul 14 2008 Toshio Kuratomi 0.94.0-4.1 - Add upstream patch to fix a traceback when using log in olive. +- Refresh patches so we don't have fuzz. * Wed May 21 2008 Toshio Kuratomi 0.94.0-2 - Add patch from upstream to fix all bzr-gtk commands when seahorse From fedora-extras-commits at redhat.com Thu Jul 24 18:34:18 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Thu, 24 Jul 2008 18:34:18 GMT Subject: rpms/immix/devel immix.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807241834.m6OIYIHR027939@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/immix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27904/devel Modified Files: .cvsignore sources Added Files: immix.spec import.log Log Message: New package --- NEW FILE immix.spec --- %define maj_version 1.3 %define min_version 2 Name: immix Version: %{maj_version}.%{min_version} Release: 3%{?dist} Summary: Immix, an image mixer Group: Applications/Multimedia License: GPLv3+ URL: http://immix.sourceforge.net/ Source0: http://downloads.sourceforge.net/immix/immix-%{maj_version}-%{min_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel BuildRequires: exiv2-devel BuildRequires: fftw-devel BuildRequires: desktop-file-utils %description Immix alignes and averages a set of similar images, thereby decreasing the numerical noise. It is especially useful with digital cameras images shot in a low light environment: multiple noisy, high-ISO setting images can be combined to get a single less noisy, low-ISO-like image, without the blur typically associated with low-ISO (motion during exposure) or noise reduction algorithms. %prep %setup -q -n %{name}-%{maj_version} chmod 0644 *.{cpp,h} # it seems that "lrelease" does'nt work on rawhide sed -i -e s/lrelease/lrelease-qt4/ immix.pro sed -i -e 's at Icon=/usr/share/pixmaps/%{name}.svg at Icon=%{name}@' packaging/%{name}.desktop %build qmake-qt4 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ --mode 644 \ $RPM_BUILD_ROOT%{_datadir}/applications/immix.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/immix %{_datadir}/applications/*immix.desktop %{_datadir}/pixmaps/immix.svg %changelog * Thu Jul 3 2008 Nicoleau Fabien - 1.3.2-3 - lrelease-qt4 usage - .desktop file changes * Wed May 14 2008 Nicoleau Fabien - 1.3.2-2 - Rebuild for F-9 * Wed Feb 13 2008 kwizart < kwizart at gmail.com > - 0.8-3 - Initial spec file (based on the upstream project). --- NEW FILE import.log --- immix-1_3_2-3_fc9:HEAD:immix-1.3.2-3.fc9.src.rpm:1216924356 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/immix/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:22:00 -0000 1.1 +++ .cvsignore 24 Jul 2008 18:33:34 -0000 1.2 @@ -0,0 +1 @@ +immix-1.3-2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/immix/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:22:00 -0000 1.1 +++ sources 24 Jul 2008 18:33:34 -0000 1.2 @@ -0,0 +1 @@ +05fd352475a0ba6e663ac50e365336c6 immix-1.3-2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 18:34:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:54 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183454.A599D1AD0E0@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:34:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:59 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183459.894F81AD0E7@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:35:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:35:00 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183500.E0E791AD0EC@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora 9) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:34:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:54 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183454.A599D1AD0E0@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:34:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:55 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183501.906081AD0F8@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:34:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:59 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183459.894F81AD0E7@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora 9) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:34:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:55 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183501.906081AD0F8@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:35:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:35:00 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183500.E0E791AD0EC@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the commit acl on kpackagekit (Fedora 9) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:34:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:55 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183502.457A21AD0FC@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the approveacls acl on kpackagekit (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:35:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:35:03 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183504.84CED1AD101@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the approveacls acl on kpackagekit (Fedora 9) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:35:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:35:03 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183504.84CED1AD101@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the approveacls acl on kpackagekit (Fedora 9) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 18:34:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 18:34:55 +0000 Subject: [pkgdb] kpackagekit had acl change status Message-ID: <20080724183502.457A21AD0FC@bastion.fedora.phx.redhat.com> Steven M. Parrish (tuxbrewr) has set the approveacls acl on kpackagekit (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit From fedora-extras-commits at redhat.com Thu Jul 24 19:01:30 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Thu, 24 Jul 2008 19:01:30 GMT Subject: rpms/fotoxx/devel fotoxx.desktop, NONE, 1.1 fotoxx.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807241901.m6OJ1U44004727@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/fotoxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30498/devel Modified Files: .cvsignore sources Added Files: fotoxx.desktop fotoxx.spec import.log Log Message: New package --- NEW FILE fotoxx.desktop --- [Desktop Entry] Encoding=UTF-8 Name=fotoxx GenericName=fotoxx Comment=Program for editing image files from a digital camera Exec=fotoxx Icon=fotoxx Terminal=false Type=Application Categories=Application;Graphics; --- NEW FILE fotoxx.spec --- Name: fotoxx Version: 4.9 Release: 1%{?dist} Summary: Photo editor Group: Applications/Multimedia License: GPLv2 URL: http://kornelix.squarespace.com/%{name} Source0: http://kornelix.squarespace.com/storage/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel #BuildRequires: pkgconfig BuildRequires: desktop-file-utils Requires: exiv2 %description Fotoxx is a free open source Linux program for editing image files from a digital camera. The goal of fotoxx is to meet most image editing needs while remaining easy to use. %prep %setup -q -n %{name} # To use "fedora" CFLAGS (exported) sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile # I prefer %%{doc} usage than this line sed -i -e "/cp -R doc\/\* $(DESTDIR)$(DOCDIR)/d" Makefile %build CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; make %{?_smp_mflags} PREFIX=%{_prefix} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install -Dm 644 -p data/icons/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="" \ --mode 644 \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/* %dir %{_datadir}/%{name} %{_bindir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Tue Jul 22 2008 Nicoleau Fabien - 4.9-1 - Initial build --- NEW FILE import.log --- fotoxx-4_9-1_fc9:HEAD:fotoxx-4.9-1.fc9.src.rpm:1216926018 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fotoxx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:29:48 -0000 1.1 +++ .cvsignore 24 Jul 2008 19:00:47 -0000 1.2 @@ -0,0 +1 @@ +fotoxx-4.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fotoxx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:29:48 -0000 1.1 +++ sources 24 Jul 2008 19:00:47 -0000 1.2 @@ -0,0 +1 @@ +bbc9b2522331960f1bf5cab9b7b09ca0 fotoxx-4.9.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 19:03:10 2008 From: fedora-extras-commits at redhat.com (Chris Ball (cjb)) Date: Thu, 24 Jul 2008 19:03:10 GMT Subject: rpms/ohm/OLPC-3 ohm.spec,1.4,1.5 Message-ID: <200807241903.m6OJ3AgX004997@cvs-int.fedora.redhat.com> Author: cjb Update of /cvs/pkgs/rpms/ohm/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4824 Modified Files: ohm.spec Log Message: Modify spec file, xauthority moved from /home/olpc to /var/tmp/olpc-auth Index: ohm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ohm/OLPC-3/ohm.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ohm.spec 7 Jul 2008 05:42:24 -0000 1.4 +++ ohm.spec 24 Jul 2008 19:02:19 -0000 1.5 @@ -7,7 +7,7 @@ Summary: Open Hardware Manager Name: ohm Version: 0.1.1 -Release: 6.14.%{alphatag}%{?dist} +Release: 6.15.%{alphatag}%{?dist} URL: http://www.freedesktop.org/Software/ohm Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz @@ -70,7 +70,7 @@ #%patch0 -p1 %build -%configure --disable-docbook-docs --with-xauth-dir=/home/olpc --with-os-type=redhat --docdir=%{_datadir}/doc/%{name}-%{version} +%configure --disable-docbook-docs --with-xauth-dir=/var/tmp/olpc-auth --with-os-type=redhat --docdir=%{_datadir}/doc/%{name}-%{version} %install rm -rf %{buildroot} @@ -137,6 +137,9 @@ %{_includedir}/* %changelog +* Thu Jul 24 2008 Chris Ball - 0.1.1-6.15.20080707git.olpc +- Move xauthority from /home/olpc to /var/tmp/olpc-auth. + * Mon Jul 07 2008 Chris Ball - 0.1.1-6.14.20080707git.olpc - Implement the OHM side of the sugar control panel power section. From fedora-extras-commits at redhat.com Thu Jul 24 19:03:51 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Thu, 24 Jul 2008 19:03:51 GMT Subject: rpms/evolution-rss/devel evolution-rss.spec,1.13,1.14 Message-ID: <200807241903.m6OJ3pHp005087@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987 Modified Files: evolution-rss.spec Log Message: Fix firefox import RH bug #452322 Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- evolution-rss.spec 2 Jul 2008 18:25:54 -0000 1.13 +++ evolution-rss.spec 24 Jul 2008 19:03:04 -0000 1.14 @@ -1,10 +1,11 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz +Patch0: evolution-rss-0.1.0-firefox-import.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Requires: evolution @@ -27,6 +28,7 @@ %prep %setup -q -n evolution-rss-%{version} +%path0 -p1 -b .firefox %build %configure @@ -86,6 +88,9 @@ %doc TODO %changelog +* Thu Jul 24 2008 Lucian Langa - 0.1.0-2 +- Fix firefox import RH bug #452322 + * Wed Jul 2 2008 Lucian Langa - 0.1.0-1 - New upstream From fedora-extras-commits at redhat.com Thu Jul 24 19:04:18 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Thu, 24 Jul 2008 19:04:18 GMT Subject: rpms/fotoxx/F-8 fotoxx.desktop, NONE, 1.1 fotoxx.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807241904.m6OJ4ImA005195@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/fotoxx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5046/F-8 Modified Files: .cvsignore sources Added Files: fotoxx.desktop fotoxx.spec import.log Log Message: New package --- NEW FILE fotoxx.desktop --- [Desktop Entry] Encoding=UTF-8 Name=fotoxx GenericName=fotoxx Comment=Program for editing image files from a digital camera Exec=fotoxx Icon=fotoxx Terminal=false Type=Application Categories=Application;Graphics; --- NEW FILE fotoxx.spec --- Name: fotoxx Version: 4.9 Release: 1%{?dist} Summary: Photo editor Group: Applications/Multimedia License: GPLv2 URL: http://kornelix.squarespace.com/%{name} Source0: http://kornelix.squarespace.com/storage/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel #BuildRequires: pkgconfig BuildRequires: desktop-file-utils Requires: exiv2 %description Fotoxx is a free open source Linux program for editing image files from a digital camera. The goal of fotoxx is to meet most image editing needs while remaining easy to use. %prep %setup -q -n %{name} # To use "fedora" CFLAGS (exported) sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile # I prefer %%{doc} usage than this line sed -i -e "/cp -R doc\/\* $(DESTDIR)$(DOCDIR)/d" Makefile %build CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; make %{?_smp_mflags} PREFIX=%{_prefix} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install -Dm 644 -p data/icons/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="" \ --mode 644 \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/* %dir %{_datadir}/%{name} %{_bindir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Tue Jul 22 2008 Nicoleau Fabien - 4.9-1 - Initial build --- NEW FILE import.log --- fotoxx-4_9-1_fc9:F-8:fotoxx-4.9-1.fc9.src.rpm:1216926149 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fotoxx/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:29:48 -0000 1.1 +++ .cvsignore 24 Jul 2008 19:03:30 -0000 1.2 @@ -0,0 +1 @@ +fotoxx-4.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fotoxx/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:29:48 -0000 1.1 +++ sources 24 Jul 2008 19:03:30 -0000 1.2 @@ -0,0 +1 @@ +bbc9b2522331960f1bf5cab9b7b09ca0 fotoxx-4.9.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 19:06:27 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Thu, 24 Jul 2008 19:06:27 GMT Subject: rpms/fotoxx/F-9 fotoxx.desktop, NONE, 1.1 fotoxx.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807241906.m6OJ6RS5005566@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/fotoxx/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5463/F-9 Modified Files: .cvsignore sources Added Files: fotoxx.desktop fotoxx.spec import.log Log Message: New package --- NEW FILE fotoxx.desktop --- [Desktop Entry] Encoding=UTF-8 Name=fotoxx GenericName=fotoxx Comment=Program for editing image files from a digital camera Exec=fotoxx Icon=fotoxx Terminal=false Type=Application Categories=Application;Graphics; --- NEW FILE fotoxx.spec --- Name: fotoxx Version: 4.9 Release: 1%{?dist} Summary: Photo editor Group: Applications/Multimedia License: GPLv2 URL: http://kornelix.squarespace.com/%{name} Source0: http://kornelix.squarespace.com/storage/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel #BuildRequires: pkgconfig BuildRequires: desktop-file-utils Requires: exiv2 %description Fotoxx is a free open source Linux program for editing image files from a digital camera. The goal of fotoxx is to meet most image editing needs while remaining easy to use. %prep %setup -q -n %{name} # To use "fedora" CFLAGS (exported) sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile # I prefer %%{doc} usage than this line sed -i -e "/cp -R doc\/\* $(DESTDIR)$(DOCDIR)/d" Makefile %build CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; make %{?_smp_mflags} PREFIX=%{_prefix} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install -Dm 644 -p data/icons/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="" \ --mode 644 \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/* %dir %{_datadir}/%{name} %{_bindir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Tue Jul 22 2008 Nicoleau Fabien - 4.9-1 - Initial build --- NEW FILE import.log --- fotoxx-4_9-1_fc9:F-9:fotoxx-4.9-1.fc9.src.rpm:1216926310 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fotoxx/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:29:48 -0000 1.1 +++ .cvsignore 24 Jul 2008 19:05:41 -0000 1.2 @@ -0,0 +1 @@ +fotoxx-4.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fotoxx/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:29:48 -0000 1.1 +++ sources 24 Jul 2008 19:05:41 -0000 1.2 @@ -0,0 +1 @@ +bbc9b2522331960f1bf5cab9b7b09ca0 fotoxx-4.9.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 19:06:50 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Thu, 24 Jul 2008 19:06:50 GMT Subject: rpms/evolution-rss/devel evolution-rss.spec,1.14,1.15 Message-ID: <200807241906.m6OJ6o1v005650@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5523 Modified Files: evolution-rss.spec Log Message: Fix firefox import RH bug #452322 Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- evolution-rss.spec 24 Jul 2008 19:03:04 -0000 1.14 +++ evolution-rss.spec 24 Jul 2008 19:06:00 -0000 1.15 @@ -28,7 +28,7 @@ %prep %setup -q -n evolution-rss-%{version} -%path0 -p1 -b .firefox +%patch0 -p1 -b .firefox %build %configure From fedora-extras-commits at redhat.com Thu Jul 24 19:07:04 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Thu, 24 Jul 2008 19:07:04 GMT Subject: rpms/xorg-x11-server/OLPC-3 swrast-dont-abort.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 sources, 1.41, 1.42 xorg-x11-server.spec, 1.338, 1.339 xserver-1.4.99-selinux-awareness.patch, 1.3, NONE xserver-1.4.99-xaa-evict-pixmaps.patch, 1.2, NONE xserver-1.5.0-xaa-sucks.patch, 1.2, NONE Message-ID: <200807241907.m6OJ74rK005695@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5531 Modified Files: .cvsignore sources xorg-x11-server.spec Added Files: swrast-dont-abort.patch Removed Files: xserver-1.4.99-selinux-awareness.patch xserver-1.4.99-xaa-evict-pixmaps.patch xserver-1.5.0-xaa-sucks.patch Log Message: resync with F-9, dont crash if swrast not present swrast-dont-abort.patch: --- NEW FILE swrast-dont-abort.patch --- >From 6bf46df463d19456761ae670f60e0b153e285bd9 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 24 Jul 2008 14:42:22 -0400 Subject: [PATCH] Don't abort if swrast library is not present --- glx/glxdriswrast.c | 6 ++++++ glx/glxext.c | 37 ++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index cf4827e..20c39ab 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -468,6 +468,12 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { + if (errno == ENOENT) { + xfree(screen); + LogMessage(X_INFO, "AIGLX: swrast library %s not found\n", + filename); + return NULL; + } LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", filename, dlerror()); goto handle_error; diff --git a/glx/glxext.c b/glx/glxext.c index 13c65da..6ba404f 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -279,6 +279,7 @@ void GlxExtensionInit(void) ScreenPtr pScreen; int i; __GLXprovider *p; + Bool glx_provided = False; __glXContextRes = CreateNewResourceType((DeleteType)ContextGone); __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone); @@ -289,6 +290,29 @@ void GlxExtensionInit(void) if (!AddCallback (&ClientStateCallback, glxClientCallback, 0)) return; + for (i = 0; i < screenInfo.numScreens; i++) { + pScreen = screenInfo.screens[i]; + + for (p = __glXProviderStack; p != NULL; p = p->next) { + if (p->screenProbe(pScreen) != NULL) { + LogMessage(X_INFO, + "GLX: Initialized %s GL provider for screen %d\n", + p->name, i); + break; + } + } + + if (!p) + LogMessage(X_INFO, + "GLX: no usable GL providers found for screen %d\n", i); + else + glx_provided = True; + } + + /* don't register extension if GL is not provided on any screen */ + if (!glx_provided) + return; + /* ** Add extension to server extensions. */ @@ -306,19 +330,6 @@ void GlxExtensionInit(void) } __glXErrorBase = extEntry->errorBase; - - for (i = 0; i < screenInfo.numScreens; i++) { - pScreen = screenInfo.screens[i]; - - for (p = __glXProviderStack; p != NULL; p = p->next) { - if (p->screenProbe(pScreen) != NULL) { - LogMessage(X_INFO, - "GLX: Initialized %s GL provider for screen %d\n", - p->name, i); - break; - } - } - } } /************************************************************************/ -- 1.5.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 12 Jun 2008 02:07:31 -0000 1.47 +++ .cvsignore 24 Jul 2008 19:06:12 -0000 1.48 @@ -1 +1 @@ -xorg-server-20080612.tar.bz2 +xorg-server-1.4.99.906.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 12 Jun 2008 02:07:31 -0000 1.41 +++ sources 24 Jul 2008 19:06:12 -0000 1.42 @@ -1 +1 @@ -067f2f0fdbcac0f8a7cd4f4ee046a2c8 xorg-server-20080612.tar.bz2 +d225476fea6721d9f64c3268e47d6c51 xorg-server-1.4.99.906.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v retrieving revision 1.338 retrieving revision 1.339 diff -u -r1.338 -r1.339 --- xorg-x11-server.spec 17 Jun 2008 22:51:39 -0000 1.338 +++ xorg-x11-server.spec 24 Jul 2008 19:06:12 -0000 1.339 @@ -12,55 +12,50 @@ # F9 TODO list: # # Fix rhpxl to no longer need vesamodes/extramodes -# RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080612 +#define gitdate 20080723 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.902 -Release: 3.%{gitdate}%{?dist}.1 +Version: 1.4.99.906 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{gitdate} +%if 0%{?gitdate} # git snapshot. to recreate, run: # ./make-git-snapshot.sh `cat commitid` -Source0: xorg-server-%{gitdate}.tar.bz2 +Source0: xorg-server-%{?gitdate}.tar.bz2 Source1: make-git-snapshot.sh Source2: commitid %else -Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 +Source0: http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 %endif +# Add by OLPC: don't abort if mesa swrast library is not found +Patch1: swrast-dont-abort.patch + # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch Patch101: xserver-1.4.99-dont-backfill-bg-none.patch # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list -Patch1001: xorg-x11-server-Red-Hat-extramodes.patch Patch1003: xserver-1.4.99-pic-libxf86config.patch -Patch1004: xserver-1.4.99-selinux-awareness.patch Patch1005: xserver-1.4.99-builtin-fonts.patch Patch1010: xserver-1.3.0-no-prerelease-warning.patch -Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch # Trivial things to never merge upstream ever -# Don't merge this without protecting the gccisms. -Patch5001: xserver-1.4.99-alloca-poison.patch # This really could be done prettier. Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch -Patch5008: xserver-1.5.0-xaa-sucks.patch #Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch -Patch5010: xserver-1.5.0-fix-single-aspect.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -99,8 +94,6 @@ BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel BuildRequires: libX11-devel libXext-devel -# XXX Really? Why would we need this, Xfont should hide it. -BuildRequires: freetype-devel >= 2.1.9-1 # DMX config utils buildreqs. BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel @@ -111,8 +104,7 @@ # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex -BuildRequires: mesa-libGL-devel >= 7.1-0.21 -BuildRequires: mesa-source >= 7.1-0.21 +BuildRequires: mesa-libGL-devel >= 7.1-0.36 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -122,17 +114,6 @@ BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1 BuildRequires: hal-devel dbus-devel -# Make sure libXfont has the catalogue FPE -Conflicts: libXfont < 1.2.9 - -# Make sure we pull ABI compatible drivers. -Conflicts: xorg-x11-drv-ati < 6.6.1 -Conflicts: xorg-x11-drv-i810 < 1.6.0 -# Match up work-arounds between compiz and the xserver -Conflicts: compiz < 0.0.13-0.20.20060817git.fc6 -# Match up GLX_EXT_texture_from_pixmap opcodes -Conflicts: mesa-libGL < 6.5.1-2.fc6 - # All server subpackages have a virtual provide for the name of the server # they deliver. The Xorg one is versioned, the others are intentionally # unversioned. @@ -185,10 +166,7 @@ %description Xnest Xnest is an X server, which has been implemented as an ordinary X application. It runs in a window just like other X applications, -but it is an X server itself in which you can run other software. It -is a very useful tool for developers who wish to test their -applications without running them on their real X server. - +but it is an X server itself in which you can run other software. %package Xdmx Summary: Distributed Multihead X Server and utilities @@ -201,12 +179,7 @@ Xdmx is proxy X server that provides multi-head support for multiple displays attached to different machines (each of which is running a typical X server). When Xinerama is used with Xdmx, the multiple displays on multiple machines -are presented to the user as a single unified screen. A simple application -for Xdmx would be to provide multi-head support using two desktop machines, -each of which has a single display device attached to it. A complex -application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays -(each attached to one of 16 computers) into a unified 5120x4096 display. - +are presented to the user as a single unified screen. %package Xvfb Summary: A X Windows System virtual framebuffer X server. @@ -232,10 +205,8 @@ %description Xephyr Xephyr is an X server, which has been implemented as an ordinary X application. It runs in a window just like other X applications, -but it is an X server itself in which you can run other software. It -is a very useful tool for developers who wish to test their -applications without running them on their real X server. Unlike -Xnest, Xephyr renders to an X image rather than relaying the +but it is an X server itself in which you can run other software. +Unlike Xnest, Xephyr renders to an X image rather than relaying the X protocol, and therefore supports the newer X extensions like Render and Composite. @@ -270,21 +241,20 @@ %prep %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%if 0%{gitdate} +%if 0%{?gitdate} # XXX hack git checkout -b fedora # make it something you can push to. sed -i 's/git/&+ssh/' .git/config %else git-init-db -echo "This is incomplete. FIXME." -exit 1 -%endif - if [ -z "$GIT_COMMITTER_NAME" ]; then - export GIT_COMMITTER_NAME="Fedora X Ninjas" + git-config user.email "x at fedoraproject.org" + git-config user.name "Fedora X Ninjas" fi - +git-add . +git-commit -a -q -m "%{version} baseline." +%endif # Apply all the patches. Hold your nose... git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) @@ -308,9 +278,8 @@ --with-xkb-output=%{_localstatedir}/lib/xkb \ --with-rgb-path=%{_datadir}/X11/rgb \ --disable-xorgcfg \ - --disable-record \ + --disable-record --disable-xtrap \ --enable-install-libxf86config \ - --with-mesa-source=%{_datadir}/mesa/source \ --enable-xselinux \ --with-dri-driver-path=%{drimoduledir} \ ${CONFIGURE} @@ -336,7 +305,6 @@ mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}} cp cpprules.in %{inst_srcdir} cp xkb/README.compiled %{inst_srcdir}/xkb -cp GL/symlink-mesa.sh %{inst_srcdir}/GL cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/ @@ -356,21 +324,6 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1* find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : - -%if !%{with_hw_servers} - # These get installed regardless of whether you're building Xorg. - # XXX Re-check this list. - # error: Installed (but unpackaged) file(s) found: - # /randrstr.h - # /usr/lib/pkgconfig/xorg-server.pc - # /usr/share/aclocal/xorg-server.m4 - # /var/lib/xkb/README.compiled - - rm -f $RPM_BUILD_ROOT/randrstr.h - rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig - rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal - rm -rf $RPM_BUILD_ROOT/var/lib/xkb -%endif } %clean @@ -418,13 +371,11 @@ %dir %{_libdir}/xorg/modules %dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/extensions -%{_libdir}/xorg/modules/extensions/libGLcore.so %{_libdir}/xorg/modules/extensions/libglx.so %{_libdir}/xorg/modules/extensions/libdri.so %{_libdir}/xorg/modules/extensions/libdri2.so %{_libdir}/xorg/modules/extensions/libdbe.so %{_libdir}/xorg/modules/extensions/libextmod.so -%{_libdir}/xorg/modules/extensions/libxtrap.so %dir %{_libdir}/xorg/modules/input %dir %{_libdir}/xorg/modules/fonts %{_libdir}/xorg/modules/fonts/libfreetype.so @@ -511,6 +462,10 @@ %changelog +* Thu Jul 24 2008 Daniel Drake 1.4.99.906-1 +- resync with F-9 for new xinput ABI +- add patch to allow X server to run when mesa's swrast is not present + * Tue Jun 17 2008 Dennis Gilmore 1.4.99.902-3.20080612.1 - disable the noevdev patch for OLPC --- xserver-1.4.99-selinux-awareness.patch DELETED --- --- xserver-1.4.99-xaa-evict-pixmaps.patch DELETED --- --- xserver-1.5.0-xaa-sucks.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 19:09:07 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 19:09:07 GMT Subject: rpms/kpackagekit/devel kpackagekit.spec,1.1,1.2 Message-ID: <200807241909.m6OJ97Ze005893@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kpackagekit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5761 Modified Files: kpackagekit.spec Log Message: cosmetics Index: kpackagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kpackagekit.spec 24 Jul 2008 18:40:27 -0000 1.1 +++ kpackagekit.spec 24 Jul 2008 19:08:19 -0000 1.2 @@ -2,7 +2,7 @@ Name: kpackagekit Version: 0.1 -Release: 0.3%{?betaversion} +Release: 0.3.%{?betaversion} Summary: KDE interface for PackageKit License: GPLv2+ @@ -40,17 +40,17 @@ %files %defattr(-,root,root,-) -%{_libdir}/kde4/*.so -%{_datadir}/kde4/services/*.desktop -%{_datadir}/kde4/services/kded/*.desktop +%{_kde4_libdir}/kde4/*.so +%{_kde4_datadir}/kde4/services/*.desktop +%{_kde4_datadir}/kde4/services/kded/*.desktop %changelog -* Thu Jul 24 2008 Steven M. Parrish 0.1-0.3b3 +* Thu Jul 24 2008 Steven M. Parrish 0.1-0.3.b3 - Removed additional uneeded BRs -* Tue Jul 22 2008 Steven M. Parrish 0.1-0.2b3 +* Tue Jul 22 2008 Steven M. Parrish 0.1-0.2.b3 - Removed uneeded BRs - Made use of predefined macros -* Wed Jul 16 2008 Steven M. Parrish 0.1-0.1b3 +* Wed Jul 16 2008 Steven M. Parrish 0.1-0.1.b3 - Initial SPEC file From fedora-extras-commits at redhat.com Thu Jul 24 19:11:15 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 19:11:15 GMT Subject: rpms/packagekit-qt/devel packagekit-qt.spec,1.3,1.4 Message-ID: <200807241911.m6OJBFf4006048@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/packagekit-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5983 Modified Files: packagekit-qt.spec Log Message: cosmetics (fix Release tag) Index: packagekit-qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/packagekit-qt/devel/packagekit-qt.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- packagekit-qt.spec 24 Jul 2008 14:04:40 -0000 1.3 +++ packagekit-qt.spec 24 Jul 2008 19:10:28 -0000 1.4 @@ -3,7 +3,7 @@ Name: packagekit-qt Version: 0.1 -Release: 6%{?dist} +Release: 0.6.%{betaversion}%{?dist} Summary: Qt interface for PackageKit License: GPLv2+ @@ -53,20 +53,20 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Jul 24 2008 Steven M. Parrish 0.1-6 +* Thu Jul 24 2008 Steven M. Parrish 0.1-0.6.b3 - Fixed changelog to include version & release -* Thu Jul 24 2008 Steven M. Parrish 0.1-5 +* Thu Jul 24 2008 Steven M. Parrish 0.1-0.5.b3 - Fixed broken dependency -* Tue Jul 22 2008 Steven M. Parrish 0.1-4 +* Tue Jul 22 2008 Steven M. Parrish 0.1-0.4.b3 - Removed unneeded -libs package -* Tue Jul 22 2008 Steven M. Parrish 0.1-3 +* Tue Jul 22 2008 Steven M. Parrish 0.1-0.3.b3 - Updated spec to include missing requires -* Wed Jul 16 2008 Steven M. Parrish 0.1-2 +* Wed Jul 16 2008 Steven M. Parrish 0.1-0.2.be - Removed uneeded BR and made use of predefined macros -* Wed Jul 16 2008 Steven M. Parrish 0.1-1 +* Wed Jul 16 2008 Steven M. Parrish 0.1-0.1.b3 - Initial SPEC From fedora-extras-commits at redhat.com Thu Jul 24 19:45:03 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 24 Jul 2008 19:45:03 GMT Subject: rpms/libffi/F-9 libffi.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200807241945.m6OJj3lH007854@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/libffi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7811 Modified Files: libffi.spec sources Log Message: Upgrade to 3.0.5 Index: libffi.spec =================================================================== RCS file: /cvs/pkgs/rpms/libffi/F-9/libffi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libffi.spec 16 Feb 2008 01:07:40 -0000 1.2 +++ libffi.spec 24 Jul 2008 19:44:15 -0000 1.3 @@ -1,5 +1,5 @@ Name: libffi -Version: 3.0.1 +Version: 3.0.5 Release: 1%{?dist} Summary: A portable foreign function interface library @@ -97,6 +97,9 @@ %{_infodir}/libffi.info.gz %changelog +* Tue Jul 08 2008 Anthony Green 3.0.5-1 +- Upgrade to 3.0.5 + * Fri Feb 15 2008 Anthony Green 3.0.1-1 - Upgrade to 3.0.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libffi/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Feb 2008 01:07:40 -0000 1.3 +++ sources 24 Jul 2008 19:44:15 -0000 1.4 @@ -1 +1 @@ -6f6cea82a8dfe6126d207fd6113ad632 libffi-3.0.1.tar.gz +29544f542140da929221805e332407b9 libffi-3.0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 19:48:30 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Thu, 24 Jul 2008 19:48:30 GMT Subject: rpms/mozvoikko/devel import.log, NONE, 1.1 mozvoikko-no-unstable.patch, NONE, 1.1 mozvoikko.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807241948.m6OJmUmw008086@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/mozvoikko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8015/devel Modified Files: .cvsignore sources Added Files: import.log mozvoikko-no-unstable.patch mozvoikko.spec Log Message: Initial import to Rawhide --- NEW FILE import.log --- mozvoikko-0_9_5-1_fc9:HEAD:mozvoikko-0.9.5-1.fc9.src.rpm:1216928784 mozvoikko-no-unstable.patch: --- NEW FILE mozvoikko-no-unstable.patch --- diff -Naur mozvoikko-0.9.5.orig/src/Makefile.xulrunner mozvoikko-0.9.5/src/Makefile.xulrunner --- mozvoikko-0.9.5.orig/src/Makefile.xulrunner 2008-06-16 19:43:41.000000000 +0300 +++ mozvoikko-0.9.5/src/Makefile.xulrunner 2008-07-17 23:19:26.000000000 +0300 @@ -28,7 +28,7 @@ -I$(XULRUNNER_INCDIR)/uconv \ -I$(XULRUNNER_INCDIR)/unicharutil \ -I$(XULRUNNER_INCDIR)/xulapp \ --I$(XULRUNNER_INCDIR)/unstable +-I$(XULRUNNER_INCDIR) XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \ -Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4 --- NEW FILE mozvoikko.spec --- # These come from install.rdf %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\} # These requires are hardcoded in the sources %define libvoikko libvoikko.so.1 %define libmalaga libmalaga.so.7 %ifarch x86_64 ppc64 ia64 sparc64 s390x %define mark64 ()(64bit) %endif Name: mozvoikko Version: 0.9.5 Release: 1%{?dist} Summary: Finnish Voikko spell-checker extension for Mozilla programs Group: Applications/Internet License: GPLv2+ URL: http://voikko.sourceforge.net Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz # This package will build without this patch if BR xulrunner-devel-unstable is # added, but with this patch xulrunner-devel-unstable is not needed in Fedora. # Upstream knows about the patch, but it's somewhat Fedora specific. Patch0: mozvoikko-no-unstable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xulrunner-devel libvoikko-devel BuildRequires: pkgconfig # As long as Firefox is the only program which can use the extension, # we may as well require it, since this package is quite useless without it. Requires: firefox Requires: %{libvoikko}%{?mark64} Requires: %{libmalaga}%{?mark64} %description This is mozvoikko, an extension for Mozilla programs for using the Finnish spell-checker Voikko. %prep %setup -q %patch0 -p1 %build make -f Makefile.xulrunner extension-files CFLAGS="$RPM_OPT_FLAGS" \ CC_LINK="g++ -shared -Wl,--no-undefined $RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make -f Makefile.xulrunner install-unpacked \ DESTDIR=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id} # Make the .so executable, so debuginfo can be stripped chmod +x \ $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id}/components/*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README %{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} %changelog * Thu Jul 24 2008 Ville-Pekka Vainio - 0.9.5-1 - Bump Release for initial Fedora build * Fri Jul 18 2008 Ville-Pekka Vainio - 0.9.5-0.2 - Add patch to remove xulrunner unstable include from Makefile.xulrunner and only BuildRequire xulrunner-devel, not xulrunner-devel-unstable - Change Group to Applications/Internet - Add dependency to the sonames libvoikko.so.1 and libmalaga.so.7 * Mon Jun 24 2008 Ville-Pekka Vainio - 0.9.5-0.1 - New upstream release * Mon May 31 2008 Ville-Pekka Vainio - 0.9.4.1.3-0.1 - New upstream release, the Makefile.xulrunner path patch is no longer needed * Mon May 26 2008 Ville-Pekka Vainio - 0.9.4.1.2-0.1 - New upstream release, Makefile.xulrunner paths are no longer hardcoded, VOIKKO_INCLUDES is dropped completely - Path patch updated, most notably include directories, even though the build worked even before for some reason * Mon May 26 2008 Ville-Pekka Vainio - 0.9.4.1.1-0.3 - Change name to mozvoikko to reflect the possibility of this package later supporting Thunderbird and Seamonkey as well - Change summary and description accordingly - Add firefox to Requires, because currently it's the only program which can use mozvoikko - Drop BR xulrunner-devel, the -unstable package is enough to require for now * Sat May 24 2008 Ville-Pekka Vainio - 0.9.4.1.1-0.1 - New upstream release - Use the new extension-files and install-unpacked make targets - Path patch edited accordingly * Fri May 23 2008 Ville-Pekka Vainio - 0.9.4.1-0.1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 17:52:47 -0000 1.1 +++ .cvsignore 24 Jul 2008 19:47:47 -0000 1.2 @@ -0,0 +1 @@ +mozvoikko-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 17:52:47 -0000 1.1 +++ sources 24 Jul 2008 19:47:47 -0000 1.2 @@ -0,0 +1 @@ +3469e95199aab774f74d13a41cb26d16 mozvoikko-0.9.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 19:53:50 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 24 Jul 2008 19:53:50 GMT Subject: rpms/libffi/F-8 libffi.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807241953.m6OJroWN008464@cvs-int.fedora.redhat.com> Author: green Update of /cvs/pkgs/rpms/libffi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8425 Modified Files: libffi.spec sources Log Message: Upgrade to 3.0.5 Index: libffi.spec =================================================================== RCS file: /cvs/pkgs/rpms/libffi/F-8/libffi.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libffi.spec 16 Feb 2008 01:11:13 -0000 1.1 +++ libffi.spec 24 Jul 2008 19:53:06 -0000 1.2 @@ -1,5 +1,5 @@ Name: libffi -Version: 3.0.1 +Version: 3.0.5 Release: 1%{?dist} Summary: A portable foreign function interface library @@ -97,6 +97,9 @@ %{_infodir}/libffi.info.gz %changelog +* Tue Jul 08 2008 Anthony Green 3.0.5-1 +- Upgrade to 3.0.5 + * Fri Feb 15 2008 Anthony Green 3.0.1-1 - Upgrade to 3.0.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libffi/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Feb 2008 01:11:13 -0000 1.2 +++ sources 24 Jul 2008 19:53:06 -0000 1.3 @@ -1 +1 @@ -6f6cea82a8dfe6126d207fd6113ad632 libffi-3.0.1.tar.gz +29544f542140da929221805e332407b9 libffi-3.0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 20:04:23 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Thu, 24 Jul 2008 20:04:23 GMT Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.13, 1.14 gnome-settings-daemon.spec, 1.34, 1.35 sources, 1.13, 1.14 Message-ID: <200807242004.m6OK4N53015712@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15672 Modified Files: .cvsignore gnome-settings-daemon.spec sources Log Message: Update to 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Jun 2008 17:39:41 -0000 1.13 +++ .cvsignore 24 Jul 2008 20:03:39 -0000 1.14 @@ -1 +1,2 @@ gnome-settings-daemon-2.23.4.tar.bz2 +gnome-settings-daemon-2.23.5.tar.bz2 Index: gnome-settings-daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gnome-settings-daemon.spec 18 Jun 2008 17:39:41 -0000 1.34 +++ gnome-settings-daemon.spec 24 Jul 2008 20:03:39 -0000 1.35 @@ -1,5 +1,5 @@ Name: gnome-settings-daemon -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications @@ -17,7 +17,7 @@ BuildRequires: GConf2-devel BuildRequires: gtk2-devel BuildRequires: gnome-vfs2-devel -BuildRequires: gnome-desktop-devel >= 2.23.2 +BuildRequires: gnome-desktop-devel >= 2.23.5 BuildRequires: libglade2-devel BuildRequires: libgnomeui-devel BuildRequires: libgnome-devel @@ -30,7 +30,6 @@ BuildRequires: perl(XML::Parser) BuildRequires: intltool -Patch1: add-randr-12.patch Patch2: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch # survive xrandr being absent (such as on Xnest in sabayon) Patch5: xrandr-missingok.patch @@ -54,7 +53,6 @@ %prep %setup -q -%patch1 -p1 -b .add-randr-12 %patch2 -p1 -b .ignore-layout-if-using-evdev %patch5 -p1 -b .xrandr-missingok %patch6 -p0 -b .legacy-sound @@ -140,6 +138,9 @@ %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Thu Jul 24 2008 Soren Sandmann - 2.23.5-1 +- Update to 2.23.5 + * Wed Jun 18 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Jun 2008 17:39:41 -0000 1.13 +++ sources 24 Jul 2008 20:03:39 -0000 1.14 @@ -1 +1 @@ -ea26c660a580e9d976111e078ca233ef gnome-settings-daemon-2.23.4.tar.bz2 +1dfdc22020b53b89e5cee243daaf5049 gnome-settings-daemon-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 20:08:02 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 24 Jul 2008 20:08:02 GMT Subject: rpms/eclipse/devel eclipse.spec,1.561,1.562 Message-ID: <200807242008.m6OK82J0016010@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15968 Modified Files: eclipse.spec Log Message: More non-upstream arch fixes. Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.561 retrieving revision 1.562 diff -u -r1.561 -r1.562 --- eclipse.spec 24 Jul 2008 00:54:57 -0000 1.561 +++ eclipse.spec 24 Jul 2008 20:07:17 -0000 1.562 @@ -339,19 +339,20 @@ zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library popd -# use our system-installed javadocs -sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ +# Use our system-installed javadocs, reference only what we built, and +# don't like to osgi.org docs (FIXME: maybe we should package them?) +sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ + -e "/osgi\.org/d" \ plugins/org.eclipse.platform.doc.isv/platformOptions.txt -sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \ - plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt \ +sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \ + -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \ + plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt \ plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt -sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \ - plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ +sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \ + -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \ + plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ plugins/org.eclipse.pde.doc.user/pdeOptions -# FIXME: package these? -grep -rl bundles.osgi.org * | xargs sed -i "/bundles.osgi.org/d" - #%patch14 -p0 pushd plugins/org.eclipse.pde.build @@ -420,6 +421,7 @@ # Move all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace # the s390x strings with ppc64, etc. %ifarch ppc64 sparc sparcv9 sparc64 alpha + cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}} for f in $(find -name \*s390x\*); do tofile=$(echo $f | sed "s/s390x/%{_arch}/") for g in $(find -type f $f); do @@ -455,17 +457,15 @@ done popd IFS=$OLDIFS -%endif -# libsconfig on the platform on which we're building -sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml +%endif # Don't build for non-linux,gtk,%%{_arch} targets pushd features for f in */build.xml; do - for platform in win32 macosx hpux solaris aix qnx motif; do + for platform in win32 macosx carbon hpux solaris aix qnx motif; do sed -i "// d" $f - sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Iv\-]\+,//g" $f + sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Ivf\-]\+,//g" $f done done popd @@ -474,14 +474,14 @@ features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \ '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ") -arches=$(echo $arches | sed s/%{_arch}//) +arches=$(echo $arches | sed s/%{eclipse_arch}//) # Don't build for arches other than the one on which we're building pushd features for f in */build.xml; do for arch in $arches; do - sed -i "// d" $f - sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9I\.v\-]\+,//g" $f + sed -i "// d" $f + sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch:0.0.0,[0-9I\.vf\-]\+,//g" $f done done popd From fedora-extras-commits at redhat.com Thu Jul 24 20:09:38 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 20:09:38 GMT Subject: rpms/NetworkManager/devel .cvsignore, 1.80, 1.81 NetworkManager.spec, 1.231, 1.232 sources, 1.114, 1.115 Message-ID: <200807242009.m6OK9c6o016181@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16089 Modified Files: .cvsignore NetworkManager.spec sources Log Message: * Thu Jul 24 2008 Dan Williams - 1:0.7.0-0.11.svn3846 - Convert stored IPv4 static IP addresses to new prefix-based scheme automatically - Fix pppd connections to some 3G providers (rh #455348) - Make PPPoE "Show Password" option work - Hide IPv4 config options that don't make sense in certain configurations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- .cvsignore 18 Jul 2008 16:08:25 -0000 1.80 +++ .cvsignore 24 Jul 2008 20:08:48 -0000 1.81 @@ -108,3 +108,5 @@ nm-applet-0.7.0.svn774.tar.gz NetworkManager-0.7.0.svn3830.tar.gz nm-applet-0.7.0.svn792.tar.gz +NetworkManager-0.7.0.svn3846.tar.gz +nm-applet-0.7.0.svn798.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- NetworkManager.spec 18 Jul 2008 16:58:03 -0000 1.231 +++ NetworkManager.spec 24 Jul 2008 20:08:48 -0000 1.232 @@ -6,11 +6,11 @@ %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 -%define libnl_version 1.0-0.15.pre8.git20071218 +%define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot svn3830 -%define applet_snapshot svn792 +%define snapshot svn3846 +%define applet_snapshot svn798 Name: NetworkManager Summary: Network connection manager and user applications @@ -294,6 +294,12 @@ %{_libdir}/libnm-util.so %changelog +* Thu Jul 24 2008 Dan Williams - 1:0.7.0-0.11.svn3846 +- Convert stored IPv4 static IP addresses to new prefix-based scheme automatically +- Fix pppd connections to some 3G providers (rh #455348) +- Make PPPoE "Show Password" option work +- Hide IPv4 config options that don't make sense in certain configurations + * Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.11.svn3830 - Expose server-returned DHCP options via D-Bus - Use avahi-autoipd rather than old built-in IPv4LL implementation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- sources 18 Jul 2008 16:08:25 -0000 1.114 +++ sources 24 Jul 2008 20:08:48 -0000 1.115 @@ -1,2 +1,2 @@ -a65687a0a4003fd7bd8159c00594c484 NetworkManager-0.7.0.svn3830.tar.gz -31a19503390cd5bce9ff16aace4e6dd4 nm-applet-0.7.0.svn792.tar.gz +2ead19fc2a5c47c0573ada0d9d1fdb6f NetworkManager-0.7.0.svn3846.tar.gz +93704b83076413e4ded64c958d474bca nm-applet-0.7.0.svn798.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 20:13:16 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 24 Jul 2008 20:13:16 GMT Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.332,1.333 Message-ID: <200807242013.m6OKDGdQ016345@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289 Modified Files: xorg-x11-server.spec Log Message: * Thu Jul 24 2008 Adam Jackson 1.4.99.906-1 - 1.5RC6. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- xorg-x11-server.spec 24 Jul 2008 18:49:14 -0000 1.332 +++ xorg-x11-server.spec 24 Jul 2008 20:12:27 -0000 1.333 @@ -110,7 +110,7 @@ # should be useless now... # BuildRequires: mesa-source >= 7.1-0.36 # XXX silly... -BuildRequires: libdrm-devel >= 2.4.0 +BuildRequires: libdrm-devel >= 2.4.0 kernel-devel %if %{with_hw_servers} Requires: libdrm >= 2.4.0 %endif From fedora-extras-commits at redhat.com Thu Jul 24 19:52:38 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 19:52:38 GMT Subject: rpms/kde-filesystem/F-9 kde-filesystem.spec,1.28,1.29 Message-ID: <200807241952.m6OJqcjl008372@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-filesystem/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8240 Modified Files: kde-filesystem.spec Log Message: sync w/devel branch Index: kde-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-filesystem/F-9/kde-filesystem.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- kde-filesystem.spec 16 May 2008 18:22:54 -0000 1.28 +++ kde-filesystem.spec 24 Jul 2008 19:51:53 -0000 1.29 @@ -17,7 +17,7 @@ Summary: KDE filesystem layout Name: kde-filesystem Version: 4 -Release: 15%{?dist} +Release: 17%{?dist} Group: System Environment/Base License: Public Domain @@ -58,6 +58,7 @@ ## KDE3 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm} mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus # not sure who best should own locolor, so we'll included it here, for now. -- Rex mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/{16x16,22x22,32x32,48x48}/{actions,apps,mimetypes} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/{.hidden,Applications,Edutainment,Graphics,Internet,Settings,System,Toys,Utilities} @@ -86,8 +87,8 @@ -p $RPM_BUILD_ROOT%{_kde4_configdir} \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \ - -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \ - -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \ + -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/services \ + -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/servicetypes \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \ @@ -169,8 +170,7 @@ %{_kde4_sharedir}/emoticons/ %{_kde4_datadir}/autostart/ %{_kde4_datadir}/icons/locolor -%{_kde4_sharedir}/services/ -%{_kde4_sharedir}/servicetypes/ +%{_kde4_sharedir}/kde4/ %{_kde4_sharedir}/templates/ %{_kde4_datadir}/wallpapers/ %{_kde4_datadir}/sounds/ @@ -179,6 +179,12 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4-17 +- + %%_kde4_sharedir/kde4 + +* Sun Jun 29 2008 Rex Dieter 4-16 +- + %%_datadir/apps/konqueror(/servicemenus) + * Fri May 16 2008 Rex Dieter 4-15 - omit %%_sysconfdir/kde/xdg (see also #249109) From fedora-extras-commits at redhat.com Thu Jul 24 20:00:07 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Thu, 24 Jul 2008 20:00:07 GMT Subject: rpms/mozvoikko/F-9 import.log, NONE, 1.1 mozvoikko-no-unstable.patch, NONE, 1.1 mozvoikko.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807242000.m6OK07oE008879@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/mozvoikko/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8750/F-9 Modified Files: .cvsignore sources Added Files: import.log mozvoikko-no-unstable.patch mozvoikko.spec Log Message: Initial import to F-9 --- NEW FILE import.log --- mozvoikko-0_9_5-1_fc9:F-9:mozvoikko-0.9.5-1.fc9.src.rpm:1216929503 mozvoikko-no-unstable.patch: --- NEW FILE mozvoikko-no-unstable.patch --- diff -Naur mozvoikko-0.9.5.orig/src/Makefile.xulrunner mozvoikko-0.9.5/src/Makefile.xulrunner --- mozvoikko-0.9.5.orig/src/Makefile.xulrunner 2008-06-16 19:43:41.000000000 +0300 +++ mozvoikko-0.9.5/src/Makefile.xulrunner 2008-07-17 23:19:26.000000000 +0300 @@ -28,7 +28,7 @@ -I$(XULRUNNER_INCDIR)/uconv \ -I$(XULRUNNER_INCDIR)/unicharutil \ -I$(XULRUNNER_INCDIR)/xulapp \ --I$(XULRUNNER_INCDIR)/unstable +-I$(XULRUNNER_INCDIR) XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \ -Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4 --- NEW FILE mozvoikko.spec --- # These come from install.rdf %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\} # These requires are hardcoded in the sources %define libvoikko libvoikko.so.1 %define libmalaga libmalaga.so.7 %ifarch x86_64 ppc64 ia64 sparc64 s390x %define mark64 ()(64bit) %endif Name: mozvoikko Version: 0.9.5 Release: 1%{?dist} Summary: Finnish Voikko spell-checker extension for Mozilla programs Group: Applications/Internet License: GPLv2+ URL: http://voikko.sourceforge.net Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz # This package will build without this patch if BR xulrunner-devel-unstable is # added, but with this patch xulrunner-devel-unstable is not needed in Fedora. # Upstream knows about the patch, but it's somewhat Fedora specific. Patch0: mozvoikko-no-unstable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xulrunner-devel libvoikko-devel BuildRequires: pkgconfig # As long as Firefox is the only program which can use the extension, # we may as well require it, since this package is quite useless without it. Requires: firefox Requires: %{libvoikko}%{?mark64} Requires: %{libmalaga}%{?mark64} %description This is mozvoikko, an extension for Mozilla programs for using the Finnish spell-checker Voikko. %prep %setup -q %patch0 -p1 %build make -f Makefile.xulrunner extension-files CFLAGS="$RPM_OPT_FLAGS" \ CC_LINK="g++ -shared -Wl,--no-undefined $RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make -f Makefile.xulrunner install-unpacked \ DESTDIR=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id} # Make the .so executable, so debuginfo can be stripped chmod +x \ $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id}/components/*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README %{_libdir}/mozilla/extensions/%{firefox_app_id}/%{firefox_ext_id} %changelog * Thu Jul 24 2008 Ville-Pekka Vainio - 0.9.5-1 - Bump Release for initial Fedora build * Fri Jul 18 2008 Ville-Pekka Vainio - 0.9.5-0.2 - Add patch to remove xulrunner unstable include from Makefile.xulrunner and only BuildRequire xulrunner-devel, not xulrunner-devel-unstable - Change Group to Applications/Internet - Add dependency to the sonames libvoikko.so.1 and libmalaga.so.7 * Mon Jun 24 2008 Ville-Pekka Vainio - 0.9.5-0.1 - New upstream release * Mon May 31 2008 Ville-Pekka Vainio - 0.9.4.1.3-0.1 - New upstream release, the Makefile.xulrunner path patch is no longer needed * Mon May 26 2008 Ville-Pekka Vainio - 0.9.4.1.2-0.1 - New upstream release, Makefile.xulrunner paths are no longer hardcoded, VOIKKO_INCLUDES is dropped completely - Path patch updated, most notably include directories, even though the build worked even before for some reason * Mon May 26 2008 Ville-Pekka Vainio - 0.9.4.1.1-0.3 - Change name to mozvoikko to reflect the possibility of this package later supporting Thunderbird and Seamonkey as well - Change summary and description accordingly - Add firefox to Requires, because currently it's the only program which can use mozvoikko - Drop BR xulrunner-devel, the -unstable package is enough to require for now * Sat May 24 2008 Ville-Pekka Vainio - 0.9.4.1.1-0.1 - New upstream release - Use the new extension-files and install-unpacked make targets - Path patch edited accordingly * Fri May 23 2008 Ville-Pekka Vainio - 0.9.4.1-0.1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 17:52:47 -0000 1.1 +++ .cvsignore 24 Jul 2008 19:59:21 -0000 1.2 @@ -0,0 +1 @@ +mozvoikko-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 17:52:47 -0000 1.1 +++ sources 24 Jul 2008 19:59:21 -0000 1.2 @@ -0,0 +1 @@ +3469e95199aab774f74d13a41cb26d16 mozvoikko-0.9.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 20:19:25 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Thu, 24 Jul 2008 20:19:25 GMT Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.35, 1.36 Message-ID: <200807242019.m6OKJPxr016685@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16628 Modified Files: gnome-settings-daemon.spec Log Message: Drop legacy sound patch Index: gnome-settings-daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- gnome-settings-daemon.spec 24 Jul 2008 20:03:39 -0000 1.35 +++ gnome-settings-daemon.spec 24 Jul 2008 20:18:43 -0000 1.36 @@ -33,7 +33,6 @@ Patch2: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch # survive xrandr being absent (such as on Xnest in sabayon) Patch5: xrandr-missingok.patch -Patch6: gnome-settings-daemon-legacy-sound.patch %description A daemon to share settings from GNOME to other applications. It also @@ -55,7 +54,6 @@ %patch2 -p1 -b .ignore-layout-if-using-evdev %patch5 -p1 -b .xrandr-missingok -%patch6 -p0 -b .legacy-sound %build %configure --enable-static=no --enable-profiling From fedora-extras-commits at redhat.com Thu Jul 24 20:28:33 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 20:28:33 GMT Subject: rpms/NetworkManager/F-9 NetworkManager.spec, 1.233, 1.234 sources, 1.116, 1.117 Message-ID: <200807242028.m6OKSXqF017098@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17050 Modified Files: NetworkManager.spec sources Log Message: * Thu Jul 24 2008 Dan Williams - 1:0.7.0-0.11.svn3846 - Convert stored IPv4 static IP addresses to new prefix-based scheme automatically - Fix pppd connections to some 3G providers (rh #455348) - Make PPPoE "Show Password" option work - Hide IPv4 config options that don't make sense in certain configurations Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- NetworkManager.spec 18 Jul 2008 18:21:23 -0000 1.233 +++ NetworkManager.spec 24 Jul 2008 20:27:41 -0000 1.234 @@ -6,11 +6,11 @@ %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 -%define libnl_version 1.0-0.15.pre8.git20071218 +%define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot svn3830 -%define applet_snapshot svn792 +%define snapshot svn3846 +%define applet_snapshot svn798 Name: NetworkManager Summary: Network connection manager and user applications @@ -301,6 +301,12 @@ %{_libdir}/libnm-util.so %changelog +* Thu Jul 24 2008 Dan Williams - 1:0.7.0-0.11.svn3846 +- Convert stored IPv4 static IP addresses to new prefix-based scheme automatically +- Fix pppd connections to some 3G providers (rh #455348) +- Make PPPoE "Show Password" option work +- Hide IPv4 config options that don't make sense in certain configurations + * Fri Jul 18 2008 Dan Williams - 1:0.7.0-0.11.svn3830 - Expose server-returned DHCP options via D-Bus - Use avahi-autoipd rather than old built-in IPv4LL implementation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- sources 18 Jul 2008 16:17:02 -0000 1.116 +++ sources 24 Jul 2008 20:27:41 -0000 1.117 @@ -1,2 +1,2 @@ -a65687a0a4003fd7bd8159c00594c484 NetworkManager-0.7.0.svn3830.tar.gz -31a19503390cd5bce9ff16aace4e6dd4 nm-applet-0.7.0.svn792.tar.gz +2ead19fc2a5c47c0573ada0d9d1fdb6f NetworkManager-0.7.0.svn3846.tar.gz +93704b83076413e4ded64c958d474bca nm-applet-0.7.0.svn798.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 20:35:53 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 24 Jul 2008 20:35:53 GMT Subject: rpms/eclipse/devel eclipse.spec,1.562,1.563 Message-ID: <200807242035.m6OKZrSe017452@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17406 Modified Files: eclipse.spec Log Message: More non-upstream arch fixes. Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.562 retrieving revision 1.563 diff -u -r1.562 -r1.563 --- eclipse.spec 24 Jul 2008 20:07:17 -0000 1.562 +++ eclipse.spec 24 Jul 2008 20:35:04 -0000 1.563 @@ -418,16 +418,16 @@ sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \ features/org.eclipse.equinox.executable/target.build.xml -# Move all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace +# Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace # the s390x strings with ppc64, etc. %ifarch ppc64 sparc sparcv9 sparc64 alpha cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}} for f in $(find -name \*s390x\*); do tofile=$(echo $f | sed "s/s390x/%{_arch}/") - for g in $(find -type f $f); do - sed -in "s/s390x/%{_arch}/g" $g + cp -rp $f $tofile + for g in $(find $tofile -type f); do + sed -i "s/s390x/%{_arch}/g" $g done - mv $f $tofile done OLDIFS=$IFS IFS=' From fedora-extras-commits at redhat.com Thu Jul 24 20:46:19 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 24 Jul 2008 20:46:19 GMT Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.333,1.334 Message-ID: <200807242046.m6OKkJ6B018365@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206 Modified Files: xorg-x11-server.spec Log Message: * Thu Jul 24 2008 Adam Jackson 1.4.99.906-1 - 1.5RC6. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- xorg-x11-server.spec 24 Jul 2008 20:12:27 -0000 1.333 +++ xorg-x11-server.spec 24 Jul 2008 20:45:20 -0000 1.334 @@ -294,6 +294,7 @@ --enable-install-libxf86config \ --enable-xselinux \ --with-dri-driver-path=%{drimoduledir} \ + --disable-dri2 \ ${CONFIGURE} make %{?_smp_mflags} @@ -385,7 +386,7 @@ %dir %{_libdir}/xorg/modules/extensions %{_libdir}/xorg/modules/extensions/libglx.so %{_libdir}/xorg/modules/extensions/libdri.so -%{_libdir}/xorg/modules/extensions/libdri2.so +#{_libdir}/xorg/modules/extensions/libdri2.so %{_libdir}/xorg/modules/extensions/libdbe.so %{_libdir}/xorg/modules/extensions/libextmod.so %dir %{_libdir}/xorg/modules/input From fedora-extras-commits at redhat.com Thu Jul 24 20:48:26 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 20:48:26 GMT Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.18, 1.19 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.4, 1.5 NetworkManager-vpnc.spec, 1.38, 1.39 sources, 1.21, 1.22 Message-ID: <200807242048.m6OKmQtp018736@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18547 Modified Files: .cvsignore NetworkManager-vpnc-0.7.0-gppasswd.patch NetworkManager-vpnc.spec sources Log Message: * Thu Jul 24 2008 Dan Williams 1:0.7.0-10.svn3846 - Rebuild for updated NetworkManager Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 19 Jul 2008 01:13:09 -0000 1.18 +++ .cvsignore 24 Jul 2008 20:47:24 -0000 1.19 @@ -14,3 +14,4 @@ NetworkManager-vpnc-0.7.0.svn3549.tar.gz NetworkManager-vpnc-0.7.0.svn3801.tar.gz NetworkManager-vpnc-0.7.0.svn3832.tar.gz +NetworkManager-vpnc-0.7.0.svn3846.tar.gz NetworkManager-vpnc-0.7.0-gppasswd.patch: Index: NetworkManager-vpnc-0.7.0-gppasswd.patch =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc-0.7.0-gppasswd.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NetworkManager-vpnc-0.7.0-gppasswd.patch 19 Jul 2008 01:13:09 -0000 1.4 +++ NetworkManager-vpnc-0.7.0-gppasswd.patch 24 Jul 2008 20:47:24 -0000 1.5 @@ -305,10 +305,9 @@ static gboolean retry = FALSE; static gchar *vpn_name = NULL; static gchar *vpn_id = NULL; -@@ -261,13 +264,13 @@ main (int argc, char *argv[]) +@@ -261,12 +264,12 @@ main (int argc, char *argv[]) { NULL } }; - char buf[1]; + KeyringData keyring_data; + gboolean success = FALSE; Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- NetworkManager-vpnc.spec 19 Jul 2008 01:13:09 -0000 1.38 +++ NetworkManager-vpnc.spec 24 Jul 2008 20:47:24 -0000 1.39 @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.10.svn3830 +%define nm_version 1:0.7.0-0.11.svn3830 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn3832 +%define svn_snapshot svn3846 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc @@ -100,6 +100,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-10.svn3846 +- Rebuild for updated NetworkManager + * Fri Jul 18 2008 Dan Williams 1:0.7.0-10.svn3832 - Update for NM netmask -> prefix changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 19 Jul 2008 01:13:09 -0000 1.21 +++ sources 24 Jul 2008 20:47:24 -0000 1.22 @@ -1 +1 @@ -c9d8fdf801536c57a3fe206086f3f519 NetworkManager-vpnc-0.7.0.svn3832.tar.gz +a46bf418e5922dbfe81407adc854e7a9 NetworkManager-vpnc-0.7.0.svn3846.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 20:48:48 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Thu, 24 Jul 2008 20:48:48 GMT Subject: rpms/control-center/devel .cvsignore, 1.77, 1.78 control-center-2.23.2-gecos.patch, 1.1, 1.2 control-center.spec, 1.379, 1.380 sources, 1.80, 1.81 Message-ID: <200807242048.m6OKmm6N018820@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18659 Modified Files: .cvsignore control-center-2.23.2-gecos.patch control-center.spec sources Log Message: Update to 2.23.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- .cvsignore 18 Jun 2008 17:45:20 -0000 1.77 +++ .cvsignore 24 Jul 2008 20:48:03 -0000 1.78 @@ -1 +1,2 @@ gnome-control-center-2.23.4.tar.bz2 +gnome-control-center-2.23.5.tar.bz2 control-center-2.23.2-gecos.patch: Index: control-center-2.23.2-gecos.patch =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center-2.23.2-gecos.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- control-center-2.23.2-gecos.patch 28 May 2008 03:27:28 -0000 1.1 +++ control-center-2.23.2-gecos.patch 24 Jul 2008 20:48:03 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c ---- gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c.gecos 2008-05-27 23:22:26.000000000 -0400 -+++ gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.c 2008-05-27 23:23:17.000000000 -0400 +diff -up gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c +--- gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c.gecos 2008-07-24 16:40:29.000000000 -0400 ++++ gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.c 2008-07-24 16:40:29.000000000 -0400 @@ -35,6 +35,7 @@ #include @@ -289,9 +289,9 @@ widget = WID ("login"); gtk_label_set_text (GTK_LABEL (widget), me->login); -diff -up gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade ---- gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade.gecos 2008-05-17 12:47:00.000000000 -0400 -+++ gnome-control-center-2.23.2/capplets/about-me/gnome-about-me.glade 2008-05-27 23:22:26.000000000 -0400 +diff -up gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade +--- gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade.gecos 2008-07-08 14:21:03.000000000 -0400 ++++ gnome-control-center-2.23.5/capplets/about-me/gnome-about-me.glade 2008-07-24 16:40:29.000000000 -0400 @@ -101,23 +101,30 @@ @@ -340,9 +340,9 @@ 0 False -diff -up gnome-control-center-2.23.2/capplets/about-me/Makefile.am.gecos gnome-control-center-2.23.2/capplets/about-me/Makefile.am ---- gnome-control-center-2.23.2/capplets/about-me/Makefile.am.gecos 2008-05-17 12:47:00.000000000 -0400 -+++ gnome-control-center-2.23.2/capplets/about-me/Makefile.am 2008-05-27 23:22:26.000000000 -0400 +diff -up gnome-control-center-2.23.5/capplets/about-me/Makefile.am.gecos gnome-control-center-2.23.5/capplets/about-me/Makefile.am +--- gnome-control-center-2.23.5/capplets/about-me/Makefile.am.gecos 2008-07-08 14:21:03.000000000 -0400 ++++ gnome-control-center-2.23.5/capplets/about-me/Makefile.am 2008-07-24 16:40:29.000000000 -0400 @@ -9,9 +9,6 @@ pixmap_files = \ gnome-about-me-lock-open.png @@ -370,14 +370,15 @@ -DDATADIR="\"$(datadir)\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \ -diff -up gnome-control-center-2.23.2/configure.in.gecos gnome-control-center-2.23.2/configure.in ---- gnome-control-center-2.23.2/configure.in.gecos 2008-05-27 23:22:26.000000000 -0400 -+++ gnome-control-center-2.23.2/configure.in 2008-05-27 23:22:26.000000000 -0400 -@@ -255,6 +255,7 @@ if test x$enable_vfs_methods = xyes; the - FONT_THUMBNAILER_LIBS=`echo $FONT_THUMBNAILER_LIBS | sed -e "s/$export_dynamic//"` - FONT_METHOD_LIBS=`echo $FONT_METHOD_LIBS | sed -e "s/$export_dynamic//"` - fi -+ PKG_CHECK_MODULES(EEL, eel-2.0) - fi - +diff -up gnome-control-center-2.23.5/configure.in.gecos gnome-control-center-2.23.5/configure.in +--- gnome-control-center-2.23.5/configure.in.gecos 2008-07-24 16:40:29.000000000 -0400 ++++ gnome-control-center-2.23.5/configure.in 2008-07-24 16:43:50.000000000 -0400 +@@ -188,6 +188,8 @@ dnl ==================================== + dnl About-me dnl ============================================== + ++PKG_CHECK_MODULES(EEL, eel-2.0) ++ + AC_MSG_CHECKING([whether to enable About Me]) + AC_ARG_ENABLE([aboutme], + AC_HELP_STRING([--enable-aboutme], Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- control-center.spec 24 Jul 2008 15:53:03 -0000 1.379 +++ control-center.spec 24 Jul 2008 20:48:03 -0000 1.380 @@ -3,7 +3,7 @@ %define glib2_version 2.13.0 %define gtk2_version 2.11.6 %define gconf2_version 1.2.0 -%define gnome_desktop_version 2.22.0-6 +%define gnome_desktop_version 2.23.5-1 %define libgnome_version 2.3.0 %define libbonobo_version 2.3.0 %define libgnomeui_version 2.3.0 @@ -21,8 +21,8 @@ Summary: GNOME Control Center Name: control-center -Version: 2.23.4 -Release: 6%{?dist} +Version: 2.23.5 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -39,10 +39,9 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=539339 # http://bugzilla.gnome.org/show_bug.cgi?id=539340 # http://bugzilla.gnome.org/show_bug.cgi?id=539343 -Patch9: standard-icon.patch # http://bugzilla.gnome.org/show_bug.cgi?id=542979 -Patch10: gcc-libcanberra-support-5.patch +#Patch10: gcc-libcanberra-support-5.patch # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.23.2-passwd.patch @@ -50,11 +49,6 @@ # change default preferred apps to programs we ship Patch99: default-applications.patch -Patch100: add-randr12-capplet.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=533611 -Patch101: notification-theme.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org @@ -171,19 +165,15 @@ %patch3 -p1 -b .no-gnome-common %patch8 -p1 -b .gtkmarshal -%patch9 -p1 -b .standard-icon -%patch10 -p0 -b .libcanberra +#%patch10 -p0 -b .libcanberra # vendor configuration patches %patch95 -p1 -b .passwd %patch96 -p1 -b .gecos %patch99 -p1 -b .default-apps -%patch100 -p1 -b .add-randr12-capplet %patch7 -p1 -b .make-default -%patch101 -p1 -b .notification-theme - %build autoreconf @@ -355,6 +345,11 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Thu Jul 24 2008 Soren Sandmann - 2.23.5-1 +- Update to 2.23.5. Drop randr, standard icon and + notification theme patches. +- Comment out libcanberra patch for now since it doesn't apply + * Thu Jul 24 2008 - Bastien Nocera - 2.23.4-6 - Add patch to support the Free Desktop sound theme spec - Remove gnome-vfs-methods as per upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 18 Jun 2008 17:45:20 -0000 1.80 +++ sources 24 Jul 2008 20:48:03 -0000 1.81 @@ -1 +1 @@ -100b1137a8da7c0bd9d165d97b2fe67f gnome-control-center-2.23.4.tar.bz2 +8d4c9488bc0727b092f9ac96bafce6c6 gnome-control-center-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 20:56:10 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 24 Jul 2008 20:56:10 GMT Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec-addosgimanifest.patch, 1.1, 1.2 jakarta-commons-codec.spec, 1.20, 1.21 Message-ID: <200807242056.m6OKuAr7019891@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jakarta-commons-codec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19752 Modified Files: jakarta-commons-codec-addosgimanifest.patch jakarta-commons-codec.spec Log Message: * Thu Jul 24 2008 Andrew Overholt 1.3-9.4 - Update OSGi manifest. jakarta-commons-codec-addosgimanifest.patch: Index: jakarta-commons-codec-addosgimanifest.patch =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/jakarta-commons-codec-addosgimanifest.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jakarta-commons-codec-addosgimanifest.patch 7 Sep 2007 17:34:34 -0000 1.1 +++ jakarta-commons-codec-addosgimanifest.patch 24 Jul 2008 20:55:25 -0000 1.2 @@ -10,7 +10,7 @@ +Bundle-ManifestVersion: 2 +Bundle-Name: %bundleName +Bundle-SymbolicName: org.apache.commons.codec -+Bundle-Version: 1.3.0.qualifier ++Bundle-Version: 1.3.0.v20080530-1600 +Bundle-Localization: plugin +Export-Package: org.apache.commons.codec;version="1.3.0", + org.apache.commons.codec.binary;version="1.3.0", Index: jakarta-commons-codec.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jakarta-commons-codec.spec 9 Jul 2008 19:22:18 -0000 1.20 +++ jakarta-commons-codec.spec 24 Jul 2008 20:55:25 -0000 1.21 @@ -38,7 +38,7 @@ Name: jakarta-commons-codec Version: 1.3 -Release: 9.3%{?dist} +Release: 9.4%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 Group: Development/Libraries/Java @@ -178,6 +178,9 @@ # ----------------------------------------------------------------------------- %changelog +* Thu Jul 24 2008 Andrew Overholt 1.3-9.4 +- Update OSGi manifest. + * Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3-9.3 - drop repotag - fix license tag From fedora-extras-commits at redhat.com Thu Jul 24 20:56:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 20:56:27 +0000 Subject: [pkgdb] jakarta-commons-lang: overholt has requested commit Message-ID: <20080724205628.5A4D91AD0E7@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on jakarta-commons-lang (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang From fedora-extras-commits at redhat.com Thu Jul 24 20:56:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 20:56:35 +0000 Subject: [pkgdb] jakarta-commons-httpclient: overholt has requested commit Message-ID: <20080724205635.8C70E1AD0EC@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on jakarta-commons-httpclient (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-httpclient From fedora-extras-commits at redhat.com Thu Jul 24 20:56:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 20:56:39 +0000 Subject: [pkgdb] jakarta-commons-codec: overholt has requested commit Message-ID: <20080724205644.EFAD11AD0ED@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on jakarta-commons-codec (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-codec From fedora-extras-commits at redhat.com Thu Jul 24 20:58:27 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 20:58:27 GMT Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.7, 1.8 NetworkManager-openvpn.spec, 1.18, 1.19 sources, 1.10, 1.11 Message-ID: <200807242058.m6OKwRU6020282@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20128 Modified Files: .cvsignore NetworkManager-openvpn.spec sources Log Message: * Thu Jul 24 2008 Dan Williams 1:0.7.0-11.svn3846 - Fix TLS Authentication direction combo - Only update settings if the advanced dialog's OK button is pressed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Jul 2008 01:56:36 -0000 1.7 +++ .cvsignore 24 Jul 2008 20:57:39 -0000 1.8 @@ -2,3 +2,4 @@ NetworkManager-openvpn-0.7.0.svn3549.tar.gz NetworkManager-openvpn-0.7.0.svn3801.tar.gz NetworkManager-openvpn-0.7.0.svn3832.tar.gz +NetworkManager-openvpn-0.7.0.svn3846.tar.gz Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- NetworkManager-openvpn.spec 19 Jul 2008 01:56:36 -0000 1.18 +++ NetworkManager-openvpn.spec 24 Jul 2008 20:57:39 -0000 1.19 @@ -4,7 +4,7 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3832 +%define svn_snapshot .svn3846 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -103,6 +103,10 @@ %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-11.svn3846 +- Fix TLS Authentication direction combo +- Only update settings if the advanced dialog's OK button is pressed + * Fri Jul 18 2008 Dan Williams 1:0.7.0-11.svn3832 - Update for NM netmask -> prefix changes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Jul 2008 01:56:36 -0000 1.10 +++ sources 24 Jul 2008 20:57:39 -0000 1.11 @@ -1 +1 @@ -13c2a24d2ae0f4d2ea0d4374d725c397 NetworkManager-openvpn-0.7.0.svn3832.tar.gz +eb01cff3d1bb688f9e5bead7ef6b2c76 NetworkManager-openvpn-0.7.0.svn3846.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 20:58:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 20:58:43 +0000 Subject: [pkgdb] jakarta-commons-codec had acl change status Message-ID: <20080724205844.2DE571AD0EB@bastion.fedora.phx.redhat.com> Matt Wringe (mwringe) has set the commit acl on jakarta-commons-codec (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-codec From fedora-extras-commits at redhat.com Thu Jul 24 21:02:07 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 21:02:07 GMT Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.5, 1.6 Message-ID: <200807242102.m6OL27tI027411@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27277 Modified Files: NetworkManager-vpnc-0.7.0-gppasswd.patch Log Message: Remove fuzz NetworkManager-vpnc-0.7.0-gppasswd.patch: Index: NetworkManager-vpnc-0.7.0-gppasswd.patch =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc-0.7.0-gppasswd.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NetworkManager-vpnc-0.7.0-gppasswd.patch 24 Jul 2008 20:47:24 -0000 1.5 +++ NetworkManager-vpnc-0.7.0-gppasswd.patch 24 Jul 2008 21:01:12 -0000 1.6 @@ -1,6 +1,6 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c --- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd 2008-06-26 12:54:04.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-07-18 21:04:37.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-07-24 16:42:56.000000000 -0400 @@ -69,6 +69,7 @@ struct GnomeTwoPasswordDialogDetails GtkWidget *remember_session_button; @@ -95,7 +95,7 @@ } diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h --- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd 2008-06-26 12:54:04.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-07-18 21:04:37.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-07-24 16:42:56.000000000 -0400 @@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass typedef enum { GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, @@ -105,8 +105,8 @@ } GnomeTwoPasswordDialogRemember; diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/main.c ---- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd 2008-06-26 14:30:14.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-07-18 21:04:37.000000000 -0400 +--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd 2008-07-18 21:05:54.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-07-24 16:42:56.000000000 -0400 @@ -39,6 +39,32 @@ #define KEYRING_SN_TAG "setting-name" #define KEYRING_SK_TAG "setting-key" @@ -305,7 +305,8 @@ static gboolean retry = FALSE; static gchar *vpn_name = NULL; static gchar *vpn_id = NULL; -@@ -261,12 +264,12 @@ main (int argc, char *argv[]) +@@ -262,13 +265,13 @@ main (int argc, char *argv[]) + { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, { NULL } }; + KeyringData keyring_data; @@ -320,7 +321,7 @@ context = g_option_context_new ("- vpnc auth dialog"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -@@ -277,7 +280,6 @@ main (int argc, char *argv[]) +@@ -278,7 +281,6 @@ main (int argc, char *argv[]) GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_NONE); @@ -328,7 +329,7 @@ if (vpn_id == NULL || vpn_name == NULL || vpn_service == NULL) { fprintf (stderr, "Have to supply ID, name, and service\n"); goto out; -@@ -288,21 +290,22 @@ main (int argc, char *argv[]) +@@ -289,21 +291,22 @@ main (int argc, char *argv[]) goto out; } @@ -356,8 +357,8 @@ + keyring_data_free(&keyring_data); /* wait for data on stdin */ - fread (buf, sizeof (char), sizeof (buf), stdin); -@@ -310,5 +313,5 @@ main (int argc, char *argv[]) + ret = fread (buf, sizeof (char), sizeof (buf), stdin); +@@ -311,5 +314,5 @@ main (int argc, char *argv[]) out: g_object_unref (program); From fedora-extras-commits at redhat.com Thu Jul 24 21:03:54 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Thu, 24 Jul 2008 21:03:54 GMT Subject: rpms/control-center/devel control-center.spec,1.380,1.381 Message-ID: <200807242103.m6OL3sef027715@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27594 Modified Files: control-center.spec Log Message: Buildrequire intltool 0.;37.1 Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.380 retrieving revision 1.381 diff -u -r1.380 -r1.381 --- control-center.spec 24 Jul 2008 20:48:03 -0000 1.380 +++ control-center.spec 24 Jul 2008 21:03:01 -0000 1.381 @@ -97,6 +97,7 @@ BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version} BuildRequires: gnome-settings-daemon-devel # For intltool: +BuildRequires: intltool >= 0.37.1 BuildRequires: perl(XML::Parser) BuildRequires: evolution-data-server-devel >= 1.9.1 BuildRequires: libXxf86misc-devel From fedora-extras-commits at redhat.com Thu Jul 24 21:04:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 21:04:41 +0000 Subject: [pkgdb] jakarta-commons-httpclient had acl change status Message-ID: <20080724210441.CBB611AD0E7@bastion.fedora.phx.redhat.com> Permaine Cheung (pcheung) has set the commit acl on jakarta-commons-httpclient (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-httpclient From fedora-extras-commits at redhat.com Thu Jul 24 21:04:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 21:04:52 +0000 Subject: [pkgdb] jakarta-commons-lang had acl change status Message-ID: <20080724210452.68E581AD0E9@bastion.fedora.phx.redhat.com> Permaine Cheung (pcheung) has set the commit acl on jakarta-commons-lang (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-lang From fedora-extras-commits at redhat.com Thu Jul 24 21:05:03 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 21:05:03 GMT Subject: rpms/kdelibs/F-9 kdelibs-4.0.99-kstandarddirs.patch, NONE, 1.1 kdelibs-4.1.0-parallel_devel.patch, NONE, 1.1 .cvsignore, 1.51, 1.52 kdelibs.spec, 1.331, 1.332 sources, 1.61, 1.62 kdelibs-4.0.83-kstandarddirs.patch, 1.1, NONE kdelibs-4.0.98-parallel_devel.patch, 1.1, NONE Message-ID: <200807242105.m6OL531A027957@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27813 Modified Files: .cvsignore kdelibs.spec sources Added Files: kdelibs-4.0.99-kstandarddirs.patch kdelibs-4.1.0-parallel_devel.patch Removed Files: kdelibs-4.0.83-kstandarddirs.patch kdelibs-4.0.98-parallel_devel.patch Log Message: * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package - fix #453063 (Sonnet documentation multilib conflict) properly kdelibs-4.0.99-kstandarddirs.patch: --- NEW FILE kdelibs-4.0.99-kstandarddirs.patch --- diff -ur kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp 2008-07-09 15:28:22.000000000 +0200 +++ kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-07-20 18:13:28.000000000 +0200 @@ -75,9 +75,12 @@ bool checkRestrictions : 1; QMap restrictions; QStringList xdgdata_prefixes; + QString localXdgdatahome; QStringList xdgconf_prefixes; + QString localXdgconfhome; QStringList prefixes; + QString localKdehome; // Directory dictionaries QMap absolutes; @@ -953,12 +956,65 @@ restrictionActive = true; d->dataRestrictionActive = false; // Reset } + const QStringList *prefixList = 0; + QString home; + if (strncmp(type, "xdgdata-", 8) == 0) + { + prefixList = &(d->xdgdata_prefixes); + home=d->localXdgdatahome; + } + else if (strncmp(type, "xdgconf-", 8) == 0) + { + prefixList = &(d->xdgconf_prefixes); + home=d->localXdgconfhome; + } + else + { + prefixList = &d->prefixes; + home=d->localKdehome; + } QStringList dirs; dirs = d->relatives.value(type); QString installdir = installPath( type ); QString installprefix = installPath("kdedir"); + if(!home.isNull()) + { + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( home + *it ); + testdir.setPath(path); + if (restrictionActive) + continue; + if (!candidates.contains(path)) + candidates.append(path); + } + + } + + // make sure we find the path where it's installed + // we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share + // except for config files, so profiles take precedence + // except for exe files too, so /usr/libexec/kde4 takes precedence over /usr/bin + if (strcmp("config", type) && strcmp("exe", type)) { + if (!installdir.isEmpty()) { + bool ok = true; + foreach (const QString &s, candidates) { + if (installdir.startsWith(s)) { + ok = false; + break; + } + } + if (ok) { + candidates.append(installdir); + } + } + } + if (!dirs.isEmpty()) { bool local = true; @@ -984,45 +1040,34 @@ } } - const QStringList *prefixList = 0; - if (strncmp(type, "xdgdata-", 8) == 0) - prefixList = &(d->xdgdata_prefixes); - else if (strncmp(type, "xdgconf-", 8) == 0) - prefixList = &(d->xdgconf_prefixes); - else - prefixList = &d->prefixes; for (QStringList::ConstIterator pit = prefixList->begin(); pit != prefixList->end(); ++pit) { - if((*pit)!=installprefix||installdir.isEmpty()) - { - for (QStringList::ConstIterator it = dirs.begin(); - it != dirs.end(); ++it) - { - if ( (*it).startsWith('%')) - continue; - QString path = realPath( *pit + *it ); - testdir.setPath(path); - if (local && restrictionActive) - continue; - if ((local || testdir.exists()) && !candidates.contains(path)) - candidates.append(path); - } - local = false; + for (QStringList::ConstIterator it = dirs.begin(); + it != dirs.end(); ++it) + { + if ( (*it).startsWith('%')) + continue; + QString path = realPath( *pit + *it ); + testdir.setPath(path); + if (local && restrictionActive) + continue; + if ((local || testdir.exists()) && !candidates.contains(path)) + candidates.append(path); } - else - { - // we have a custom install path, so use this instead of / - testdir.setPath(installdir); - if(testdir.exists() && ! candidates.contains(installdir)) - candidates.append(installdir); - } + // UGLY HACK - forward porting Chris Cheney's HACK - Rex Dieter + if ( local && (!strcmp("config", type))) + candidates.append("/etc/kde/"); + // + local = false; } } - // make sure we find the path where it's installed + // find the installed path for all resource types + // some code expects it to always come last, so we list it again even if + // we had it already at the beginning if (!installdir.isEmpty()) { bool ok = true; foreach (const QString &s, candidates) { @@ -1501,6 +1546,7 @@ { localKdeDir = KShell::tildeExpand(localKdeDir); addPrefix(localKdeDir); + d->localKdehome=localKdeDir; } #ifdef Q_WS_MACX @@ -1559,6 +1605,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgConfigPrefix(localXdgDir); + d->localXdgconfhome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) @@ -1607,6 +1654,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgDataPrefix(localXdgDir); + d->localXdgdatahome=localXdgDir; for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) kdelibs-4.1.0-parallel_devel.patch: --- NEW FILE kdelibs-4.1.0-parallel_devel.patch --- diff -up kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-23 10:26:30.000000000 +0200 +++ kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake 2008-07-23 18:11:28.000000000 +0200 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: # -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable -# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable +# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable # # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: @@ -124,7 +124,7 @@ # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) -# Use this to add widget description files for the makekdewidgets code generator +# Use this to add widget description files for the makekdewidgets4 code generator # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) @@ -307,23 +307,23 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) # when building kdelibs, make the kcfg rules depend on the binaries... - set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) - set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) + set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) + set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) @@ -372,69 +372,69 @@ else (_kdeBootStrapping) include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) if (UNIX) - find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) - find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) - find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) if (UNIX) - find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) # Can't do that, it's not always compiled. @@ -453,14 +453,14 @@ else (_kdeBootStrapping) # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -708,7 +708,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY "${_CMAKE_INSTALL_DIR}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) -set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} +set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel" + ${CMAKE_SYSTEM_LIBRARY_PATH} "${KDE4_LIB_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) @@ -1108,9 +1109,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") else(KDE4_KCFGC_EXECUTABLE) - message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") + message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) diff -up kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh --- kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200 +++ kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh 2008-07-23 18:01:48.000000000 +0200 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # -kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" +kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" if test -z "$kcfg_compiler"; then - echo "kconfig_compiler not found!" + echo "kconfig_compiler4 not found!" exit 1; fi diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl --- kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200 +++ kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-23 18:01:48.000000000 +0200 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; -$cmd = "./kconfig_compiler $file $kcfgc"; +$cmd = "./kconfig_compiler4 $file $kcfgc"; #print "CMD $cmd\n"; if ( system( $cmd ) != 0 ) { - print STDERR "Unable to run kconfig_compiler\n"; + print STDERR "Unable to run kconfig_compiler4\n"; exit 1; } diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt --- kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:09:13.000000000 +0200 +++ kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -8,11 +8,11 @@ add_subdirectory( example ) set(kconfig_compiler_SRCS kconfig_compiler.cpp) -kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) +target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} ) ########### install files ############### diff -up kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt --- kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200 +++ kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) diff -up kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdewidgets/CMakeLists.txt --- kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 13:08:17.000000000 +0200 +++ kdelibs-4.1.0/kdewidgets/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -16,22 +16,22 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) -kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) +target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) -install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} ) +install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} ) ########### next target ############### # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) -get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT) +get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets - MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets) + MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4) set(kdewidgets_PART_SRCS classpreviews.cpp Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 19 Jul 2008 03:13:11 -0000 1.51 +++ .cvsignore 24 Jul 2008 21:04:15 -0000 1.52 @@ -1 +1,2 @@ kdelibs-4.0.99.tar.bz2 +kdelibs-4.1.0.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- kdelibs.spec 19 Jul 2008 06:18:35 -0000 1.331 +++ kdelibs.spec 24 Jul 2008 21:04:15 -0000 1.332 @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.99 +Version: 4.1.0 Release: 2%{?dist} %if 0%{?fedora} > 8 @@ -50,7 +50,7 @@ Source2: kde4.csh # make -devel packages parallel-installable -Patch0: kdelibs-4.0.98-parallel_devel.patch +Patch0: kdelibs-4.1.0-parallel_devel.patch # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Hunspell support for K3Spell @@ -74,8 +74,8 @@ Patch13: kdelibs-4.0.5-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec Patch14: kdelibs-4.0.85-libexecdir.patch -# forward port kstandarddirs hack to search /etc/kde -Patch18: kdelibs-4.0.83-kstandarddirs.patch +# kstandarddirs changes: search /etc/kde, change handling of install locations +Patch18: kdelibs-4.0.99-kstandarddirs.patch # revert a kinit patch which triggers an assertion failure in KComponentData # (and its followup) (#455130) Patch19: kdelibs-4.0.98-revert-kinit-regression.patch @@ -114,6 +114,8 @@ BuildRequires: OpenEXR-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +# work around circular dependency from phonon-devel pulling in phonon-backend-xine +BuildRequires: phonon-backend-gstreamer BuildRequires: phonon-devel BuildRequires: shared-mime-info BuildRequires: soprano-devel >= 2.0.97 @@ -264,6 +266,11 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh +# fix Sonnet documentation multilib conflict +bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2 +sed -i -e 's!!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache +bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache + # install apidocs and generator script install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh %endif @@ -310,6 +317,7 @@ %{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/servicetypes/* %{_kde4_sharedir}/icons/hicolor/*/actions/presence_* +%{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit4_*.so %dir %{_kde4_libdir}/kde4/ @@ -332,10 +340,9 @@ %{_kde4_configdir}/kdebugrc %dir %{_kde4_configdir}/ui %{_kde4_configdir}/ui/ui_standards.rc +%{_kde4_appsdir}/kdeui %{_kde4_docdir}/HTML/en/common/ -%{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_datadir}/locale/all_languages/ -%{_kde4_appsdir}/kdeui %endif %files devel @@ -359,6 +366,17 @@ %changelog +* Thu Jul 24 2008 Kevin Kofler 4.1.0-2 +- move Sonnet documentation back to the main package +- fix #453063 (Sonnet documentation multilib conflict) properly + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Sun Jul 20 2008 Kevin Kofler 4.0.99-3 +- fix kstandarddirs patch to always append the installed location last, even if + it is already present earlier in the search path (#456004) + * Sat Jul 19 2008 Rex Dieter 4.0.99-2 - use better fedora-buildtype patch from F-9 branch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 19 Jul 2008 03:13:11 -0000 1.61 +++ sources 24 Jul 2008 21:04:15 -0000 1.62 @@ -1 +1 @@ -92e6d8d1bc0dccd8f5c204039c2aa00d kdelibs-4.0.99.tar.bz2 +86496aed25d4dce440418b3064a27913 kdelibs-4.1.0.tar.bz2 --- kdelibs-4.0.83-kstandarddirs.patch DELETED --- --- kdelibs-4.0.98-parallel_devel.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 21:07:21 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Thu, 24 Jul 2008 21:07:21 GMT Subject: rpms/kernel/F-9 patch-2.6.25.12.bz2.sign, NONE, 1.1 .cvsignore, 1.819, 1.820 kernel.spec, 1.718, 1.719 linux-2.6-upstream-reverts.patch, 1.6, 1.7 sources, 1.780, 1.781 upstream, 1.699, 1.700 linux-2.6-hwmon-hdaps-add-new-models.patch, 1.1, NONE linux-2.6-reiserfs-discard-prealloc.patch, 1.1, NONE linux-2.6-usb-ehci-fix-timer-regression.patch, 1.1, NONE linux-2.6-usb-fix-interrupt-disabling.patch, 1.1, NONE patch-2.6.25.11.bz2.sign, 1.1, NONE Message-ID: <200807242107.m6OL7LSd028364@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28225 Modified Files: .cvsignore kernel.spec linux-2.6-upstream-reverts.patch sources upstream Added Files: patch-2.6.25.12.bz2.sign Removed Files: linux-2.6-hwmon-hdaps-add-new-models.patch linux-2.6-reiserfs-discard-prealloc.patch linux-2.6-usb-ehci-fix-timer-regression.patch linux-2.6-usb-fix-interrupt-disabling.patch patch-2.6.25.11.bz2.sign Log Message: * Thu Jul 24 2008 Kyle McMartin - Linux 2.6.25.12 --- NEW FILE patch-2.6.25.12.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIiK/ryGugalF9Dw4RAoj9AKCEe7e0V+1fPeM2qo/a7yfrFMjHzgCffs1D gSkALHWYpBZZAEKJL45Q9bE= =/WEy -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v retrieving revision 1.819 retrieving revision 1.820 diff -u -r1.819 -r1.820 --- .cvsignore 13 Jul 2008 22:13:04 -0000 1.819 +++ .cvsignore 24 Jul 2008 21:06:33 -0000 1.820 @@ -4,4 +4,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.11.bz2 +patch-2.6.25.12.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.718 retrieving revision 1.719 diff -u -r1.718 -r1.719 --- kernel.spec 22 Jul 2008 20:02:02 -0000 1.718 +++ kernel.spec 24 Jul 2008 21:06:33 -0000 1.719 @@ -31,7 +31,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 11 +%define stable_update 12 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -625,14 +625,12 @@ Patch450: linux-2.6-input-kill-stupid-messages.patch Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch Patch452: linux-2.6-hwmon-applesmc-remove-debugging-messages.patch -Patch453: linux-2.6-hwmon-hdaps-add-new-models.patch Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch Patch570: linux-2.6-selinux-mprotect-checks.patch Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch Patch590: linux-2.6-sysrq-add-show-backtrace-on-all-cpus-function.patch Patch610: linux-2.6-defaults-fat-utf8.patch -Patch611: linux-2.6-reiserfs-discard-prealloc.patch # libata Patch670: linux-2.6-ata-quirk.patch @@ -697,10 +695,6 @@ Patch2301: linux-2.6-ms-wireless-receiver.patch # https://bugzilla.redhat.com/show_bug.cgi?id=454028 Patch2302: linux-2.6-usb-storage-nikond80-quirk.patch -# fix interrupt handling -Patch2303: linux-2.6-usb-fix-interrupt-disabling.patch -# fix timer regression (queued for 2.6.25.12) -Patch2304: linux-2.6-usb-ehci-fix-timer-regression.patch # usb video Patch2400: linux-2.6-uvcvideo.patch @@ -1117,8 +1111,6 @@ # USB ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch ApplyPatch linux-2.6-usb-storage-nikond80-quirk.patch -ApplyPatch linux-2.6-usb-fix-interrupt-disabling.patch -ApplyPatch linux-2.6-usb-ehci-fix-timer-regression.patch # ACPI # acpi has a bug in the sizeof function causing thermal panics (from 2.6.26) @@ -1195,8 +1187,6 @@ ApplyPatch linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch # kill annoying applesmc debug messages ApplyPatch linux-2.6-hwmon-applesmc-remove-debugging-messages.patch -# add new models to hdaps -ApplyPatch linux-2.6-hwmon-hdaps-add-new-models.patch # Allow to use 480600 baud on 16C950 UARTs ApplyPatch linux-2.6-serial-460800.patch @@ -1215,9 +1205,6 @@ # Use UTF-8 by default on VFAT. ApplyPatch linux-2.6-defaults-fat-utf8.patch -# Fix reiserfs list corruption -ApplyPatch linux-2.6-reiserfs-discard-prealloc.patch - # libata # ia64 ata quirk ApplyPatch linux-2.6-ata-quirk.patch @@ -1896,6 +1883,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Jul 24 2008 Kyle McMartin +- Linux 2.6.25.12 + * Tue Jul 22 2008 Kyle McMartin - libata-acpi: fix calling sleeping function in irq context (#451896, #454954) linux-2.6-upstream-reverts.patch: Index: linux-2.6-upstream-reverts.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-upstream-reverts.patch 3 Jul 2008 21:17:32 -0000 1.6 +++ linux-2.6-upstream-reverts.patch 24 Jul 2008 21:06:33 -0000 1.7 @@ -587,3 +587,120 @@ } /* +diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c +index 0aac1ff..23d4c09 100644 +--- a/drivers/net/wireless/b43/leds.c ++++ b/drivers/net/wireless/b43/leds.c +@@ -72,6 +72,9 @@ static void b43_led_brightness_set(struct led_classdev *led_dev, + struct b43_wldev *dev = led->dev; + bool radio_enabled; + ++ if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) ++ return; ++ + /* Checking the radio-enabled status here is slightly racy, + * but we want to avoid the locking overhead and we don't care + * whether the LED has the wrong state for a second. */ +diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c +index b4a2042..b2cc246 100644 +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -2607,7 +2607,7 @@ static int b43_op_tx(struct ieee80211_hw *hw, + int err; + + if (unlikely(!dev)) +- return NETDEV_TX_BUSY; ++ goto drop_packet; + + /* Transmissions on seperate queues can run concurrently. */ + read_lock_irqsave(&wl->tx_lock, flags); +@@ -2619,7 +2619,12 @@ static int b43_op_tx(struct ieee80211_hw *hw, + read_unlock_irqrestore(&wl->tx_lock, flags); + + if (unlikely(err)) +- return NETDEV_TX_BUSY; ++ goto drop_packet; ++ return NETDEV_TX_OK; ++ ++drop_packet: ++ /* We can not transmit this packet. Drop it. */ ++ dev_kfree_skb_any(skb); + return NETDEV_TX_OK; + } + +diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c +index c990f87..93ddc1c 100644 +--- a/drivers/net/wireless/b43legacy/dma.c ++++ b/drivers/net/wireless/b43legacy/dma.c +@@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, + if (!ring) + goto out; + ring->type = type; ++ ring->dev = dev; + + nr_slots = B43legacy_RXRING_SLOTS; + if (for_tx) +@@ -922,7 +923,6 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, + DMA_TO_DEVICE); + } + +- ring->dev = dev; + ring->nr_slots = nr_slots; + ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index); + ring->index = controller_index; +diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c +index 0f7a6e7..531aeb2 100644 +--- a/drivers/net/wireless/b43legacy/main.c ++++ b/drivers/net/wireless/b43legacy/main.c +@@ -2350,8 +2350,10 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw, + } else + err = b43legacy_dma_tx(dev, skb, ctl); + out: +- if (unlikely(err)) +- return NETDEV_TX_BUSY; ++ if (unlikely(err)) { ++ /* Drop the packet. */ ++ dev_kfree_skb_any(skb); ++ } + return NETDEV_TX_OK; + } + +diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c +index 7942b15..17efe4f 100644 +--- a/drivers/net/wireless/zd1211rw/zd_usb.c ++++ b/drivers/net/wireless/zd1211rw/zd_usb.c +@@ -64,6 +64,7 @@ static struct usb_device_id usb_ids[] = { + { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B }, ++ { USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B }, +diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c +index 67b509e..9bdaed8 100644 +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -1090,7 +1090,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, + ieee80211_tx_handler *handler; + struct ieee80211_txrx_data tx; + ieee80211_txrx_result res = TXRX_DROP, res_prepare; +- int ret, i; ++ int ret, i, retries = 0; + + WARN_ON(__ieee80211_queue_pending(local, control->queue)); + +@@ -1181,6 +1181,13 @@ retry: + if (!__ieee80211_queue_stopped(local, control->queue)) { + clear_bit(IEEE80211_LINK_STATE_PENDING, + &local->state[control->queue]); ++ retries++; ++ /* ++ * Driver bug, it's rejecting packets but ++ * not stopping queues. ++ */ ++ if (WARN_ON_ONCE(retries > 5)) ++ goto drop; + goto retry; + } + memcpy(&store->control, control, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v retrieving revision 1.780 retrieving revision 1.781 diff -u -r1.780 -r1.781 --- sources 13 Jul 2008 22:13:04 -0000 1.780 +++ sources 24 Jul 2008 21:06:33 -0000 1.781 @@ -1,2 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -86abbd32d5cfd382782ffc7a924e7574 patch-2.6.25.11.bz2 +584efcae6ee19b118e3b013e939df04f patch-2.6.25.12.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v retrieving revision 1.699 retrieving revision 1.700 diff -u -r1.699 -r1.700 --- upstream 13 Jul 2008 22:13:04 -0000 1.699 +++ upstream 24 Jul 2008 21:06:33 -0000 1.700 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.11.bz2 +patch-2.6.25.12.bz2 --- linux-2.6-hwmon-hdaps-add-new-models.patch DELETED --- --- linux-2.6-reiserfs-discard-prealloc.patch DELETED --- --- linux-2.6-usb-ehci-fix-timer-regression.patch DELETED --- --- linux-2.6-usb-fix-interrupt-disabling.patch DELETED --- --- patch-2.6.25.11.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 21:07:36 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 24 Jul 2008 21:07:36 GMT Subject: rpms/dayplanner/devel dayplanner.spec,1.5,1.6 Message-ID: <200807242107.m6OL7ax6028418@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/dayplanner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28275/devel Modified Files: dayplanner.spec Log Message: * Sat Jul 19 2008 Christoph Wickert - 0.9.1-3 - Filter out all dayplanner related Requires and Provides Index: dayplanner.spec =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/devel/dayplanner.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dayplanner.spec 24 Jul 2008 12:46:22 -0000 1.5 +++ dayplanner.spec 24 Jul 2008 21:06:51 -0000 1.6 @@ -3,7 +3,7 @@ Name: dayplanner Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An easy and clean Day Planner Summary(pl): Prosty i elegancki organizer Summary(de): Ein einfacher und klarer Tagesplaner @@ -43,11 +43,22 @@ %prep %setup -q -# filter out unwanted requires for perl(DP::CoreModules) +# filter out all unwanted perl related Requires and Provides +cat << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ +sed -e '/perl(DP::.*)/d' |\ +sed -e '/perl(Date::HolidayParser)/d' +EOF + +%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov +chmod +x %{__perl_provides} + cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ -sed -e '/perl(DP::CoreModules)/d' +sed -e '/perl(DP::.*)/d' |\ +sed -e '/perl(Date::HolidayParser)/d' EOF %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req @@ -133,6 +144,9 @@ %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Sat Jul 19 2008 Christoph Wickert - 0.9.1-3 +- Filter out all dayplanner related Requires and Provides + * Sat Jul 19 2008 Christoph Wickert - 0.9.1-2 - Filter out unwanted Requires on perl(DP::CoreModules) From fedora-extras-commits at redhat.com Thu Jul 24 21:07:54 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Thu, 24 Jul 2008 21:07:54 GMT Subject: rpms/dayplanner/F-9 dayplanner.spec,1.4,1.5 Message-ID: <200807242107.m6OL7s1v028520@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/dayplanner/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28275/F-9 Modified Files: dayplanner.spec Log Message: * Sat Jul 19 2008 Christoph Wickert - 0.9.1-3 - Filter out all dayplanner related Requires and Provides Index: dayplanner.spec =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/F-9/dayplanner.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dayplanner.spec 24 Jul 2008 12:46:05 -0000 1.4 +++ dayplanner.spec 24 Jul 2008 21:07:07 -0000 1.5 @@ -3,7 +3,7 @@ Name: dayplanner Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An easy and clean Day Planner Summary(pl): Prosty i elegancki organizer Summary(de): Ein einfacher und klarer Tagesplaner @@ -43,11 +43,22 @@ %prep %setup -q -# filter out unwanted requires for perl(DP::CoreModules) +# filter out all unwanted perl related Requires and Provides +cat << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ +sed -e '/perl(DP::.*)/d' |\ +sed -e '/perl(Date::HolidayParser)/d' +EOF + +%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov +chmod +x %{__perl_provides} + cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ -sed -e '/perl(DP::CoreModules)/d' +sed -e '/perl(DP::.*)/d' |\ +sed -e '/perl(Date::HolidayParser)/d' EOF %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req @@ -133,6 +144,9 @@ %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Sat Jul 19 2008 Christoph Wickert - 0.9.1-3 +- Filter out all dayplanner related Requires and Provides + * Sat Jul 19 2008 Christoph Wickert - 0.9.1-2 - Filter out unwanted Requires on perl(DP::CoreModules) From fedora-extras-commits at redhat.com Thu Jul 24 21:08:21 2008 From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn)) Date: Thu, 24 Jul 2008 21:08:21 GMT Subject: rpms/eclipse-changelog/devel .cvsignore, 1.17, 1.18 eclipse-changelog.spec, 1.66, 1.67 sources, 1.26, 1.27 Message-ID: <200807242108.m6OL8LY8028625@cvs-int.fedora.redhat.com> Author: jjohnstn Update of /cvs/pkgs/rpms/eclipse-changelog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28391 Modified Files: .cvsignore eclipse-changelog.spec sources Log Message: * Thu Jun 26 2008 Jeff Johnston 1:2.6.2-1 - Rebase to 2.6.2 - Resolves Bugzilla #452574 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 3 Apr 2008 17:15:00 -0000 1.17 +++ .cvsignore 24 Jul 2008 21:07:31 -0000 1.18 @@ -1,3 +1,4 @@ eclipse-changelog-src-2.5.1.zip eclipse-changelog-src-2.6.0.zip eclipse-changelog-src-2.6.1.zip +eclipse-changelog-src-2.6.2.zip Index: eclipse-changelog.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- eclipse-changelog.spec 3 Apr 2008 17:15:00 -0000 1.66 +++ eclipse-changelog.spec 24 Jul 2008 21:07:31 -0000 1.67 @@ -4,8 +4,8 @@ %define eclipse_base %{_datadir}/eclipse Name: eclipse-changelog -Version: 2.6.1 -Release: 3%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: Eclipse ChangeLog plug-in Group: Development/Tools @@ -20,8 +20,8 @@ # This tarball was generated like so: # -# mkdir eclipse-changelog-src-2.6.1 -# cd eclipse-changelog-src-2.6.1 +# mkdir eclipse-changelog-src-2.6.2 +# cd eclipse-changelog-src-2.6.2 # for f in \ # org.eclipse.linuxtools.changelog.core \ # org.eclipse.linuxtools.changelog.doc \ @@ -30,15 +30,12 @@ # org.eclipse.linuxtools.changelog-feature \ # do \ # svn export \ -# svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_1/$f; +# svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_2/$f; # done -# zip -r eclipse-changelog-src-2.6.1.zip * +# zip -r eclipse-changelog-src-2.6.2.zip * Source0: http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip -# Patch required to 2.6.1 sources to fix a number of problems -Patch1: %{name}-2.6.1.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: eclipse-pde >= 1:3.3.0 @@ -70,7 +67,6 @@ %prep %setup -q -c -n eclipse-changelog-%{version} -%patch1 -p0 %build # See comments in the script to understand this. @@ -129,6 +125,10 @@ %endif %changelog +* Thu Jun 26 2008 Jeff Johnston 1:2.6.2-1 +- Rebase to 2.6.2 +- Resolves Bugzilla #452574 + * Mon Jan 21 2008 Jeff Johnston 1:2.6.1-3 - fix regressions to GNU formatter, ChangeLog editor - fix Prepare ChangeLog project menu activation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 Apr 2008 17:15:00 -0000 1.26 +++ sources 24 Jul 2008 21:07:31 -0000 1.27 @@ -1 +1 @@ -471c92160b5cca3e4e4251e57e27e6c5 eclipse-changelog-src-2.6.1.zip +01cacfc71db1cd0af8d2c77b0b49b7b4 eclipse-changelog-src-2.6.2.zip From fedora-extras-commits at redhat.com Thu Jul 24 21:10:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Thu, 24 Jul 2008 21:10:44 GMT Subject: rpms/vpnc/devel vpnc-0.5.1-domain.patch, NONE, 1.1 vpnc-cleanup, NONE, 1.1 vpnc.spec, 1.29, 1.30 Message-ID: <200807242110.m6OLAipB029003@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28899 Modified Files: vpnc.spec Added Files: vpnc-0.5.1-domain.patch vpnc-cleanup Log Message: * Thu Jul 24 2008 Tomas Mraz - 0.5.1-6 - do not modify domain in resolv.conf (#446404) - clean up modified resolv.conf on startup (#455899) vpnc-0.5.1-domain.patch: --- NEW FILE vpnc-0.5.1-domain.patch --- diff -up vpnc-0.5.1/vpnc-script.domain vpnc-0.5.1/vpnc-script --- vpnc-0.5.1/vpnc-script.domain 2008-07-24 22:06:21.000000000 +0200 +++ vpnc-0.5.1/vpnc-script 2008-07-24 22:07:08.000000000 +0200 @@ -238,7 +238,7 @@ EOF LINE="" fi ;; - domain*|search*) + search*) if [ -n "$CISCO_DEF_DOMAIN" ]; then LINE="$LINE $CISCO_DEF_DOMAIN" CISCO_DEF_DOMAIN="" --- NEW FILE vpnc-cleanup --- # vpnc-cleanup - clean up vpnc modified resolv.conf # start on stopped rcS stop on runlevel script rm -f /var/run/vpnc/pid RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup if [ -e "$RESOLV_CONF_BACKUP" ]; then grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 && cat "$RESOLV_CONF_BACKUP" > /etc/resolv.conf rm -f -- "$RESOLV_CONF_BACKUP" fi end script Index: vpnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vpnc.spec 5 Apr 2008 19:16:05 -0000 1.29 +++ vpnc.spec 24 Jul 2008 21:09:49 -0000 1.30 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: IPSec VPN client compatible with Cisco equipment @@ -13,14 +13,16 @@ Source3: vpnc-disconnect.consolehelper Source4: vpnc.pam Source5: vpnc-helper +Source6: vpnc-cleanup Patch2: vpnc-0.4.0-cloexec.patch Patch3: vpnc-0.5.1-dpd.patch Patch4: vpnc-0.5.1-mtu.patch +Patch5: vpnc-0.5.1-domain.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel > 1.1.90 -Requires: kernel >= 2.4 +Requires: upstart iproute %description A VPN client compatible with Cisco's EasyVPN equipment. @@ -43,6 +45,7 @@ %patch2 -p1 -b .cloexec %patch3 -p1 -b .dpd %patch4 -p1 -b .mtu +%patch5 -p1 -b .domain %build CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr @@ -72,6 +75,8 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect +install -Dp -m 0644 %{SOURCE6} \ + $RPM_BUILD_ROOT%{_sysconfdir}/event.d/vpnc-cleanup %clean rm -rf $RPM_BUILD_ROOT @@ -83,6 +88,7 @@ %dir %{_sysconfdir}/vpnc %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script %config(noreplace) %{_sysconfdir}/vpnc/default.conf +%config(noreplace) %{_sysconfdir}/event.d/vpnc-cleanup %{_sbindir}/vpnc %{_bindir}/cisco-decrypt %{_sbindir}/vpnc-disconnect @@ -101,6 +107,10 @@ %{_sbindir}/vpnc-helper %changelog +* Thu Jul 24 2008 Tomas Mraz - 0.5.1-6 +- do not modify domain in resolv.conf (#446404) +- clean up modified resolv.conf on startup (#455899) + * Sat Apr 5 2008 Michal Schmidt - 0.5.1-5 - vpnc-script: fix 'ip link ...' syntax. From fedora-extras-commits at redhat.com Thu Jul 24 21:19:43 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Thu, 24 Jul 2008 21:19:43 GMT Subject: rpms/kernel/F-8 patch-2.6.25.12.bz2.sign, NONE, 1.1 .cvsignore, 1.729, 1.730 kernel.spec, 1.501, 1.502 linux-2.6-upstream-reverts.patch, 1.11, 1.12 sources, 1.690, 1.691 linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch, 1.1, NONE linux-2.6-hwmon-hdaps-add-new-models.patch, 1.1, NONE linux-2.6-usb-ehci-fix-timer-regression.patch, 1.1, NONE linux-2.6-usb-fix-interrupt-disabling.patch, 1.1, NONE patch-2.6.25.11.bz2.sign, 1.1, NONE Message-ID: <200807242119.m6OLJh9x029843@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29782 Modified Files: .cvsignore kernel.spec linux-2.6-upstream-reverts.patch sources Added Files: patch-2.6.25.12.bz2.sign Removed Files: linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch linux-2.6-hwmon-hdaps-add-new-models.patch linux-2.6-usb-ehci-fix-timer-regression.patch linux-2.6-usb-fix-interrupt-disabling.patch patch-2.6.25.11.bz2.sign Log Message: * Thu Jul 24 2008 Kyle McMartin - Linux 2.6.25.12 --- NEW FILE patch-2.6.25.12.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIiK/ryGugalF9Dw4RAoj9AKCEe7e0V+1fPeM2qo/a7yfrFMjHzgCffs1D gSkALHWYpBZZAEKJL45Q9bE= =/WEy -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v retrieving revision 1.729 retrieving revision 1.730 diff -u -r1.729 -r1.730 --- .cvsignore 13 Jul 2008 22:13:58 -0000 1.729 +++ .cvsignore 24 Jul 2008 21:18:53 -0000 1.730 @@ -4,3 +4,4 @@ kernel-2.6.25 linux-2.6.25.tar.bz2 patch-2.6.25.11.bz2 +patch-2.6.25.12.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.501 retrieving revision 1.502 diff -u -r1.501 -r1.502 --- kernel.spec 22 Jul 2008 20:00:38 -0000 1.501 +++ kernel.spec 24 Jul 2008 21:18:53 -0000 1.502 @@ -33,7 +33,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 11 +%define stable_update 12 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -626,7 +626,6 @@ Patch426: linux-2.6-fs-fat-cleanup-code.patch Patch427: linux-2.6-fs-fat-fix-setattr.patch Patch428: linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch -Patch429: linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch Patch430: linux-2.6-net-silence-noisy-printks.patch Patch431: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch @@ -673,11 +672,6 @@ Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch Patch1308: linux-2.6-usb-ehci-hcd-respect-nousb.patch -Patch1310: linux-2.6-usb-fix-interrupt-disabling.patch -# fix timer regression (queued for 2.6.25.12) -Patch1314: linux-2.6-usb-ehci-fix-timer-regression.patch - -Patch1350: linux-2.6-hwmon-hdaps-add-new-models.patch Patch1400: linux-2.6-smarter-relatime.patch @@ -1126,8 +1120,6 @@ ApplyPatch linux-2.6-fs-fat-cleanup-code.patch ApplyPatch linux-2.6-fs-fat-fix-setattr.patch ApplyPatch linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch -# fix reiserfs hang (from F9) -ApplyPatch linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch # Networking # Disable easy to trigger printk's. @@ -1231,16 +1223,9 @@ # USB # respect the 'nousb' boot option ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch -# make USB work with shared interrupts -ApplyPatch linux-2.6-usb-fix-interrupt-disabling.patch - -ApplyPatch linux-2.6-usb-ehci-fix-timer-regression.patch # ISDN -# hwmon -ApplyPatch linux-2.6-hwmon-hdaps-add-new-models.patch - # implement smarter atime updates support. ApplyPatch linux-2.6-smarter-relatime.patch @@ -1856,6 +1841,9 @@ %changelog +* Thu Jul 24 2008 Kyle McMartin +- Linux 2.6.25.12 + * Tue Jul 22 2008 Kyle McMartin - libata-acpi: fix calling sleeping function in irq context (#451896, #454954) linux-2.6-upstream-reverts.patch: Index: linux-2.6-upstream-reverts.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-upstream-reverts.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-upstream-reverts.patch 3 Jul 2008 21:27:53 -0000 1.11 +++ linux-2.6-upstream-reverts.patch 24 Jul 2008 21:18:53 -0000 1.12 @@ -587,3 +587,120 @@ } /* +diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c +index 0aac1ff..23d4c09 100644 +--- a/drivers/net/wireless/b43/leds.c ++++ b/drivers/net/wireless/b43/leds.c +@@ -72,6 +72,9 @@ static void b43_led_brightness_set(struct led_classdev *led_dev, + struct b43_wldev *dev = led->dev; + bool radio_enabled; + ++ if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) ++ return; ++ + /* Checking the radio-enabled status here is slightly racy, + * but we want to avoid the locking overhead and we don't care + * whether the LED has the wrong state for a second. */ +diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c +index b4a2042..b2cc246 100644 +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -2607,7 +2607,7 @@ static int b43_op_tx(struct ieee80211_hw *hw, + int err; + + if (unlikely(!dev)) +- return NETDEV_TX_BUSY; ++ goto drop_packet; + + /* Transmissions on seperate queues can run concurrently. */ + read_lock_irqsave(&wl->tx_lock, flags); +@@ -2619,7 +2619,12 @@ static int b43_op_tx(struct ieee80211_hw *hw, + read_unlock_irqrestore(&wl->tx_lock, flags); + + if (unlikely(err)) +- return NETDEV_TX_BUSY; ++ goto drop_packet; ++ return NETDEV_TX_OK; ++ ++drop_packet: ++ /* We can not transmit this packet. Drop it. */ ++ dev_kfree_skb_any(skb); + return NETDEV_TX_OK; + } + +diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c +index c990f87..93ddc1c 100644 +--- a/drivers/net/wireless/b43legacy/dma.c ++++ b/drivers/net/wireless/b43legacy/dma.c +@@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, + if (!ring) + goto out; + ring->type = type; ++ ring->dev = dev; + + nr_slots = B43legacy_RXRING_SLOTS; + if (for_tx) +@@ -922,7 +923,6 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, + DMA_TO_DEVICE); + } + +- ring->dev = dev; + ring->nr_slots = nr_slots; + ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index); + ring->index = controller_index; +diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c +index 0f7a6e7..531aeb2 100644 +--- a/drivers/net/wireless/b43legacy/main.c ++++ b/drivers/net/wireless/b43legacy/main.c +@@ -2350,8 +2350,10 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw, + } else + err = b43legacy_dma_tx(dev, skb, ctl); + out: +- if (unlikely(err)) +- return NETDEV_TX_BUSY; ++ if (unlikely(err)) { ++ /* Drop the packet. */ ++ dev_kfree_skb_any(skb); ++ } + return NETDEV_TX_OK; + } + +diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c +index 7942b15..17efe4f 100644 +--- a/drivers/net/wireless/zd1211rw/zd_usb.c ++++ b/drivers/net/wireless/zd1211rw/zd_usb.c +@@ -64,6 +64,7 @@ static struct usb_device_id usb_ids[] = { + { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B }, ++ { USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B }, + { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B }, +diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c +index 67b509e..9bdaed8 100644 +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -1090,7 +1090,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, + ieee80211_tx_handler *handler; + struct ieee80211_txrx_data tx; + ieee80211_txrx_result res = TXRX_DROP, res_prepare; +- int ret, i; ++ int ret, i, retries = 0; + + WARN_ON(__ieee80211_queue_pending(local, control->queue)); + +@@ -1181,6 +1181,13 @@ retry: + if (!__ieee80211_queue_stopped(local, control->queue)) { + clear_bit(IEEE80211_LINK_STATE_PENDING, + &local->state[control->queue]); ++ retries++; ++ /* ++ * Driver bug, it's rejecting packets but ++ * not stopping queues. ++ */ ++ if (WARN_ON_ONCE(retries > 5)) ++ goto drop; + goto retry; + } + memcpy(&store->control, control, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v retrieving revision 1.690 retrieving revision 1.691 diff -u -r1.690 -r1.691 --- sources 13 Jul 2008 22:13:58 -0000 1.690 +++ sources 24 Jul 2008 21:18:53 -0000 1.691 @@ -1,2 +1,3 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 86abbd32d5cfd382782ffc7a924e7574 patch-2.6.25.11.bz2 +584efcae6ee19b118e3b013e939df04f patch-2.6.25.12.bz2 --- linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch DELETED --- --- linux-2.6-hwmon-hdaps-add-new-models.patch DELETED --- --- linux-2.6-usb-ehci-fix-timer-regression.patch DELETED --- --- linux-2.6-usb-fix-interrupt-disabling.patch DELETED --- --- patch-2.6.25.11.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 21:24:22 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Thu, 24 Jul 2008 21:24:22 GMT Subject: rpms/kernel/F-8 .cvsignore, 1.730, 1.731 sources, 1.691, 1.692 upstream, 1.611, 1.612 Message-ID: <200807242124.m6OLOMNd030086@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30040 Modified Files: .cvsignore sources upstream Log Message: fix thinko Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v retrieving revision 1.730 retrieving revision 1.731 diff -u -r1.730 -r1.731 --- .cvsignore 24 Jul 2008 21:18:53 -0000 1.730 +++ .cvsignore 24 Jul 2008 21:23:35 -0000 1.731 @@ -3,5 +3,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.11.bz2 patch-2.6.25.12.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v retrieving revision 1.691 retrieving revision 1.692 diff -u -r1.691 -r1.692 --- sources 24 Jul 2008 21:18:53 -0000 1.691 +++ sources 24 Jul 2008 21:23:35 -0000 1.692 @@ -1,3 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -86abbd32d5cfd382782ffc7a924e7574 patch-2.6.25.11.bz2 584efcae6ee19b118e3b013e939df04f patch-2.6.25.12.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v retrieving revision 1.611 retrieving revision 1.612 diff -u -r1.611 -r1.612 --- upstream 13 Jul 2008 22:13:58 -0000 1.611 +++ upstream 24 Jul 2008 21:23:35 -0000 1.612 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.11.bz2 +patch-2.6.25.12.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 21:28:36 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 21:28:36 GMT Subject: rpms/kde-filesystem/F-8 kde-filesystem.spec,1.14,1.15 Message-ID: <200807242128.m6OLSavF030276@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-filesystem/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30257/F-8 Modified Files: kde-filesystem.spec Log Message: Sync from devel: * Mon Jul 14 2008 Rex Dieter 4-17 - + %%_kde4_sharedir/kde4 * Sun Jun 29 2008 Rex Dieter 4-16 - + %%_datadir/apps/konqueror(/servicemenus) * Fri May 16 2008 Rex Dieter 4-15 - omit %%_sysconfdir/kde/xdg (see also #249109) Index: kde-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-filesystem/F-8/kde-filesystem.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kde-filesystem.spec 16 Apr 2008 13:23:52 -0000 1.14 +++ kde-filesystem.spec 24 Jul 2008 21:27:51 -0000 1.15 @@ -17,7 +17,7 @@ Summary: KDE filesystem layout Name: kde-filesystem Version: 4 -Release: 14%{?dist} +Release: 17%{?dist} Group: System Environment/Base License: Public Domain @@ -56,8 +56,9 @@ rm -rf $RPM_BUILD_ROOT ## KDE3 -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm} mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus # not sure who best should own locolor, so we'll included it here, for now. -- Rex mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/{16x16,22x22,32x32,48x48}/{actions,apps,mimetypes} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/{.hidden,Applications,Edutainment,Graphics,Internet,Settings,System,Toys,Utilities} @@ -77,7 +78,6 @@ -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \ -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \ -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \ - -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \ -p $RPM_BUILD_ROOT%{_kde4_includedir} \ -p $RPM_BUILD_ROOT%{_kde4_libexecdir} \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \ @@ -87,8 +87,8 @@ -p $RPM_BUILD_ROOT%{_kde4_configdir} \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \ - -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \ - -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \ + -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/services \ + -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/servicetypes \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \ -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \ @@ -170,8 +170,7 @@ %{_kde4_sharedir}/emoticons/ %{_kde4_datadir}/autostart/ %{_kde4_datadir}/icons/locolor -%{_kde4_sharedir}/services/ -%{_kde4_sharedir}/servicetypes/ +%{_kde4_sharedir}/kde4/ %{_kde4_sharedir}/templates/ %{_kde4_datadir}/wallpapers/ %{_kde4_datadir}/sounds/ @@ -180,6 +179,15 @@ %changelog +* Mon Jul 14 2008 Rex Dieter 4-17 +- + %%_kde4_sharedir/kde4 + +* Sun Jun 29 2008 Rex Dieter 4-16 +- + %%_datadir/apps/konqueror(/servicemenus) + +* Fri May 16 2008 Rex Dieter 4-15 +- omit %%_sysconfdir/kde/xdg (see also #249109) + * Thu Apr 03 2008 Kevin Kofler 4-14 - don't define %%{_kde4_debug} in macros.kde4 anymore From fedora-extras-commits at redhat.com Thu Jul 24 21:31:26 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Thu, 24 Jul 2008 21:31:26 GMT Subject: rpms/anaconda/devel .cvsignore, 1.551, 1.552 anaconda.spec, 1.693, 1.694 sources, 1.685, 1.686 Message-ID: <200807242131.m6OLVQQS030405@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30359 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.551 retrieving revision 1.552 diff -u -r1.551 -r1.552 --- .cvsignore 23 Jul 2008 21:23:30 -0000 1.551 +++ .cvsignore 24 Jul 2008 21:30:40 -0000 1.552 @@ -3,3 +3,4 @@ anaconda-11.4.1.16.tar.bz2 anaconda-11.4.1.17.tar.bz2 anaconda-11.4.1.18.tar.bz2 +anaconda-11.4.1.19.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.693 retrieving revision 1.694 diff -u -r1.693 -r1.694 --- anaconda.spec 23 Jul 2008 21:23:30 -0000 1.693 +++ anaconda.spec 24 Jul 2008 21:30:40 -0000 1.694 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.18 +Version: 11.4.1.19 Release: 1 License: GPLv2+ Group: Applications/System @@ -195,6 +195,16 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Jul 24 2008 Chris Lumens - 11.4.1.19-1 +- Fix another NFS kickstart segfault (#456461). (clumens) +- Remove support for generating a minstg2.img image. (dcantrell) +- If the xconfig command is given, do something with it (#455938). (clumens) +- METHOD_CDROM is now supported on s390 (jgranado). (clumens) +- Fix test for if we could access stage2.img on the CD (wwoods). +- Look for updates.img and product.img on the boot.iso. (clumens) +- Suspend the curses interface before calling scripts and resume afterwards + (#435314) (msivak) + * Wed Jul 23 2008 Chris Lumens - 11.4.1.18-1 - MD_NEW_SIZE_BLOCKS no longer exists in newer kernel headers. (clumens) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.685 retrieving revision 1.686 diff -u -r1.685 -r1.686 --- sources 23 Jul 2008 21:23:30 -0000 1.685 +++ sources 24 Jul 2008 21:30:40 -0000 1.686 @@ -1 +1 @@ -37374255822ce6c239a519b2f1dbc4f7 anaconda-11.4.1.18.tar.bz2 +5886e78bdc34812cb4078b5793de9a49 anaconda-11.4.1.19.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 21:32:52 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Thu, 24 Jul 2008 21:32:52 GMT Subject: rpms/vpnc/devel vpnc-0.5.1-cloexec.patch, NONE, 1.1 vpnc.spec, 1.30, 1.31 vpnc-0.4.0-cloexec.patch, 1.2, NONE Message-ID: <200807242132.m6OLWq2D030526@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30465 Modified Files: vpnc.spec Added Files: vpnc-0.5.1-cloexec.patch Removed Files: vpnc-0.4.0-cloexec.patch Log Message: - rediff for no fuzz vpnc-0.5.1-cloexec.patch: --- NEW FILE vpnc-0.5.1-cloexec.patch --- diff -up vpnc-0.5.1/vpnc.c.cloexec vpnc-0.5.1/vpnc.c --- vpnc-0.5.1/vpnc.c.cloexec 2007-09-10 22:39:48.000000000 +0200 +++ vpnc-0.5.1/vpnc.c 2008-07-24 23:29:49.000000000 +0200 @@ -2693,6 +2693,8 @@ static void setup_link(struct sa_block * close_tunnel(); error(1, errno, "socket(PF_INET, SOCK_RAW, IPPROTO_ESP)"); } + fcntl(s->esp_fd, F_SETFD, FD_CLOEXEC); + #ifdef IP_HDRINCL if (setsockopt(s->esp_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1) { close_tunnel(); Index: vpnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- vpnc.spec 24 Jul 2008 21:09:49 -0000 1.30 +++ vpnc.spec 24 Jul 2008 21:31:57 -0000 1.31 @@ -14,7 +14,7 @@ Source4: vpnc.pam Source5: vpnc-helper Source6: vpnc-cleanup -Patch2: vpnc-0.4.0-cloexec.patch +Patch2: vpnc-0.5.1-cloexec.patch Patch3: vpnc-0.5.1-dpd.patch Patch4: vpnc-0.5.1-mtu.patch Patch5: vpnc-0.5.1-domain.patch --- vpnc-0.4.0-cloexec.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 21:44:46 2008 From: fedora-extras-commits at redhat.com (Mikhail Fedotov (anyremote)) Date: Thu, 24 Jul 2008 21:44:46 GMT Subject: rpms/ganyremote/F-9 .cvsignore, 1.3, 1.4 ganyremote.spec, 1.2, 1.3 sources, 1.4, 1.5 Message-ID: <200807242144.m6OLikGj031128@cvs-int.fedora.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/ganyremote/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31083/F-9 Modified Files: .cvsignore ganyremote.spec sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 May 2008 20:35:16 -0000 1.3 +++ .cvsignore 24 Jul 2008 21:44:00 -0000 1.4 @@ -1 +1 @@ -ganyremote-3.0.tar.gz +ganyremote-5.0.tar.gz Index: ganyremote.spec =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/F-9/ganyremote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ganyremote.spec 29 May 2008 20:35:16 -0000 1.2 +++ ganyremote.spec 24 Jul 2008 21:44:00 -0000 1.3 @@ -1,13 +1,13 @@ Summary: GTK frontend for anyRemote Name: ganyremote -Version: 3.0 +Version: 5.0 Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz URL: http://anyremote.sourceforge.net/ Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.4 -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, gettext-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -38,6 +38,14 @@ %changelog +* Mon Jul 21 2008 Mikhail Fedotov - 5.0-1 +Fixed to work properly under RHEL4. Internationalization support. +Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, +Polish and Russian translation. + +* Sun Jun 29 2008 Mikhail Fedotov - 4.0-1 +Small enhancements + * Sun May 25 2008 Mikhail Fedotov - 3.0-1 Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and anyremote2html v0.5. @@ -69,4 +77,11 @@ %{_datadir}/pixmaps/%{name}_light.png %{_datadir}/pixmaps/%{name}.png %{_defaultdocdir}/%{name} - +%{_datadir}/locale/de_AT/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/de_DE/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/es_ES/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/it_IT/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/hu_HU/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/pl_PL/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/pt_BR/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/ru_RU/LC_MESSAGES/ganyremote.mo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 May 2008 20:35:16 -0000 1.4 +++ sources 24 Jul 2008 21:44:00 -0000 1.5 @@ -1 +1 @@ -a1f2157ddf5691fe25e9beeb64bdc789 ganyremote-3.0.tar.gz +9b0273e65724bd9369df9c2fe541bf37 ganyremote-5.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:46:35 2008 From: fedora-extras-commits at redhat.com (Mikhail Fedotov (anyremote)) Date: Thu, 24 Jul 2008 21:46:35 GMT Subject: rpms/ganyremote/devel .cvsignore, 1.3, 1.4 ganyremote.spec, 1.2, 1.3 sources, 1.4, 1.5 Message-ID: <200807242146.m6OLkZFp031376@cvs-int.fedora.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/ganyremote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31262/devel Modified Files: .cvsignore ganyremote.spec sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 May 2008 20:29:13 -0000 1.3 +++ .cvsignore 24 Jul 2008 21:45:51 -0000 1.4 @@ -1 +1 @@ -ganyremote-3.0.tar.gz +ganyremote-5.0.tar.gz Index: ganyremote.spec =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/devel/ganyremote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ganyremote.spec 29 May 2008 20:29:13 -0000 1.2 +++ ganyremote.spec 24 Jul 2008 21:45:51 -0000 1.3 @@ -1,13 +1,13 @@ Summary: GTK frontend for anyRemote Name: ganyremote -Version: 3.0 +Version: 5.0 Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz URL: http://anyremote.sourceforge.net/ Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.4 -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, gettext-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -38,6 +38,14 @@ %changelog +* Mon Jul 21 2008 Mikhail Fedotov - 5.0-1 +Fixed to work properly under RHEL4. Internationalization support. +Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, +Polish and Russian translation. + +* Sun Jun 29 2008 Mikhail Fedotov - 4.0-1 +Small enhancements + * Sun May 25 2008 Mikhail Fedotov - 3.0-1 Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and anyremote2html v0.5. @@ -69,4 +77,11 @@ %{_datadir}/pixmaps/%{name}_light.png %{_datadir}/pixmaps/%{name}.png %{_defaultdocdir}/%{name} - +%{_datadir}/locale/de_AT/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/de_DE/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/es_ES/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/it_IT/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/hu_HU/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/pl_PL/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/pt_BR/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/ru_RU/LC_MESSAGES/ganyremote.mo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 May 2008 20:29:13 -0000 1.4 +++ sources 24 Jul 2008 21:45:51 -0000 1.5 @@ -1 +1 @@ -a1f2157ddf5691fe25e9beeb64bdc789 ganyremote-3.0.tar.gz +9b0273e65724bd9369df9c2fe541bf37 ganyremote-5.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:47:29 2008 From: fedora-extras-commits at redhat.com (Mikhail Fedotov (anyremote)) Date: Thu, 24 Jul 2008 21:47:29 GMT Subject: rpms/ganyremote/F-8 .cvsignore, 1.3, 1.4 ganyremote.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807242147.m6OLlTr0031511@cvs-int.fedora.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/ganyremote/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31398/F-8 Modified Files: .cvsignore ganyremote.spec sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 May 2008 20:36:39 -0000 1.3 +++ .cvsignore 24 Jul 2008 21:46:44 -0000 1.4 @@ -1 +1 @@ -ganyremote-3.0.tar.gz +ganyremote-5.0.tar.gz Index: ganyremote.spec =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/F-8/ganyremote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ganyremote.spec 29 May 2008 20:36:39 -0000 1.2 +++ ganyremote.spec 24 Jul 2008 21:46:44 -0000 1.3 @@ -1,13 +1,13 @@ Summary: GTK frontend for anyRemote Name: ganyremote -Version: 3.0 +Version: 5.0 Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz URL: http://anyremote.sourceforge.net/ Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.20, anyremote >= 4.4 -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, gettext-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -38,6 +38,14 @@ %changelog +* Mon Jul 21 2008 Mikhail Fedotov - 5.0-1 +Fixed to work properly under RHEL4. Internationalization support. +Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, +Polish and Russian translation. + +* Sun Jun 29 2008 Mikhail Fedotov - 4.0-1 +Small enhancements + * Sun May 25 2008 Mikhail Fedotov - 3.0-1 Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and anyremote2html v0.5. @@ -69,4 +77,11 @@ %{_datadir}/pixmaps/%{name}_light.png %{_datadir}/pixmaps/%{name}.png %{_defaultdocdir}/%{name} - +%{_datadir}/locale/de_AT/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/de_DE/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/es_ES/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/it_IT/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/hu_HU/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/pl_PL/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/pt_BR/LC_MESSAGES/ganyremote.mo +%{_datadir}/locale/ru_RU/LC_MESSAGES/ganyremote.mo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ganyremote/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 May 2008 20:36:39 -0000 1.3 +++ sources 24 Jul 2008 21:46:44 -0000 1.4 @@ -1 +1 @@ -a1f2157ddf5691fe25e9beeb64bdc789 ganyremote-3.0.tar.gz +9b0273e65724bd9369df9c2fe541bf37 ganyremote-5.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:47:30 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 21:47:30 GMT Subject: rpms/NetworkManager-vpnc/F-9 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.3, 1.4 NetworkManager-vpnc.spec, 1.36, 1.37 sources, 1.19, 1.20 Message-ID: <200807242147.m6OLlUUQ031516@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31368 Modified Files: NetworkManager-vpnc-0.7.0-gppasswd.patch NetworkManager-vpnc.spec sources Log Message: * Thu Jul 24 2008 Dan Williams 1:0.7.0-10.svn3846 - Rebuild for updated NetworkManager * Fri Jul 18 2008 Dan Williams 1:0.7.0-10.svn3832 - Update for NM netmask -> prefix changes * Wed Jul 02 2008 Dan Williams 1:0.7.0-10.svn3801 - Update for moving VPN editing into connection manager - Add option to disable Dead Peer Detection - Add option to select NAT Traversal mode NetworkManager-vpnc-0.7.0-gppasswd.patch: Index: NetworkManager-vpnc-0.7.0-gppasswd.patch =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/NetworkManager-vpnc-0.7.0-gppasswd.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NetworkManager-vpnc-0.7.0-gppasswd.patch 10 Apr 2008 03:54:43 -0000 1.3 +++ NetworkManager-vpnc-0.7.0-gppasswd.patch 24 Jul 2008 21:46:37 -0000 1.4 @@ -1,8 +1,115 @@ ---- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig 2007-11-07 19:05:57.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2007-11-27 09:24:17.000000000 +0100 -@@ -35,6 +35,32 @@ - #include "../src/nm-vpnc-service.h" - #include "gnome-two-password-dialog.h" +diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c +--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd 2008-06-26 12:54:04.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-07-24 16:42:56.000000000 -0400 +@@ -69,6 +69,7 @@ struct GnomeTwoPasswordDialogDetails + + GtkWidget *remember_session_button; + GtkWidget *remember_forever_button; ++ GtkWidget *remember_group_button; + + GtkWidget *radio_vbox; + GtkWidget *connect_with_no_userpass_button; +@@ -462,14 +463,18 @@ gnome_two_password_dialog_new (const cha + gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); + + password_dialog->details->remember_session_button = +- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); ++ gtk_radio_button_new_with_mnemonic (NULL, _("_Remember passwords for this session")); + password_dialog->details->remember_forever_button = +- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); ++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("_Save passwords in keyring")); ++ password_dialog->details->remember_group_button = ++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("S_ave group password in keyring")); + + gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, + FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, + FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_button, ++ FALSE, FALSE, 0); + + gnome_two_password_dialog_set_username (password_dialog, username); + gnome_two_password_dialog_set_password (password_dialog, password); +@@ -688,9 +693,11 @@ gnome_two_password_dialog_set_show_remem + if (show_remember) { + gtk_widget_show (password_dialog->details->remember_session_button); + gtk_widget_show (password_dialog->details->remember_forever_button); ++ gtk_widget_show (password_dialog->details->remember_group_button); + } else { + gtk_widget_hide (password_dialog->details->remember_session_button); + gtk_widget_hide (password_dialog->details->remember_forever_button); ++ gtk_widget_hide (password_dialog->details->remember_group_button); + } + } + +@@ -698,32 +705,46 @@ void + gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, + GnomeTwoPasswordDialogRemember remember) + { +- gboolean session, forever; ++ gboolean session, forever, group; + + session = FALSE; + forever = FALSE; +- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { ++ group = FALSE; ++ ++ switch (remember) { ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: + session = TRUE; +- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ ++ break; ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: + forever = TRUE; ++ break; ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP: ++ group = TRUE; ++ break; + } ++ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), + session); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), + forever); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button), ++ group); + } + + GnomeTwoPasswordDialogRemember + gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) + { +- gboolean session, forever; ++ gboolean session, forever, group; + + session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); + forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); ++ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button)); + if (forever) { + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; + } else if (session) { + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; ++ } else if (group) { ++ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP; + } + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; + } +diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h +--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd 2008-06-26 12:54:04.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-07-24 16:42:56.000000000 -0400 +@@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass + typedef enum { + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, ++ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP, + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER + } GnomeTwoPasswordDialogRemember; + +diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/main.c +--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd 2008-07-18 21:05:54.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-07-24 16:42:56.000000000 -0400 +@@ -39,6 +39,32 @@ + #define KEYRING_SN_TAG "setting-name" + #define KEYRING_SK_TAG "setting-key" +typedef struct { + const char *password; @@ -31,9 +138,9 @@ +} + static char * - find_one_password (const char *vpn_name, - const char *vpn_service, -@@ -74,27 +100,14 @@ + find_one_password (const char *vpn_id, + const char *vpn_name, +@@ -79,27 +105,14 @@ find_one_password (const char *vpn_id, return secret; } @@ -67,19 +174,16 @@ } static void -@@ -136,42 +149,29 @@ +@@ -142,42 +155,29 @@ save_vpn_password (const char *vpn_id, g_free (display_name); } -static GSList * --get_passwords (const char *vpn_id, -- const char *vpn_name, -- const char *vpn_service, -- gboolean retry) +gboolean -+get_passwords (const char *vpn_id, -+ const char *vpn_name, -+ const char *vpn_service, + get_passwords (const char *vpn_id, + const char *vpn_name, + const char *vpn_service, +- gboolean retry) + gboolean retry, + KeyringData *kdata) { @@ -126,7 +230,7 @@ prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE); -@@ -180,21 +179,23 @@ +@@ -190,21 +190,23 @@ get_passwords (const char *vpn_id, gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:")); /* use the same keyring storage options as from the items we put in the entry boxes */ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; @@ -162,7 +266,7 @@ gtk_widget_show (dialog); -@@ -205,11 +206,16 @@ +@@ -215,11 +217,16 @@ get_passwords (const char *vpn_id, password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog)); group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog)); @@ -181,7 +285,7 @@ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: save_vpn_password (vpn_id, vpn_name, vpn_service, "session", "password", password); save_vpn_password (vpn_id, vpn_name, vpn_service, "session", "group-password", group_password); -@@ -224,18 +230,14 @@ +@@ -234,18 +241,14 @@ get_passwords (const char *vpn_id, } @@ -201,10 +305,10 @@ static gboolean retry = FALSE; static gchar *vpn_name = NULL; static gchar *vpn_id = NULL; -@@ -249,13 +251,13 @@ +@@ -262,13 +265,13 @@ main (int argc, char *argv[]) + { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, { NULL } }; - char buf[1]; + KeyringData keyring_data; + gboolean success = FALSE; @@ -217,7 +321,7 @@ context = g_option_context_new ("- vpnc auth dialog"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -@@ -265,7 +267,6 @@ +@@ -278,7 +281,6 @@ main (int argc, char *argv[]) GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_NONE); @@ -225,7 +329,7 @@ if (vpn_id == NULL || vpn_name == NULL || vpn_service == NULL) { fprintf (stderr, "Have to supply ID, name, and service\n"); goto out; -@@ -276,21 +277,22 @@ +@@ -289,21 +291,22 @@ main (int argc, char *argv[]) goto out; } @@ -253,115 +357,11 @@ + keyring_data_free(&keyring_data); /* wait for data on stdin */ - fread (buf, sizeof (char), sizeof (buf), stdin); -@@ -298,5 +300,5 @@ + ret = fread (buf, sizeof (char), sizeof (buf), stdin); +@@ -311,5 +314,5 @@ main (int argc, char *argv[]) out: g_object_unref (program); - return passwords != NULL ? 0 : 1; + return (success ? 0 : 1); } ---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig 2007-11-27 09:23:30.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2007-11-27 09:24:17.000000000 +0100 -@@ -69,6 +69,7 @@ - - GtkWidget *remember_session_button; - GtkWidget *remember_forever_button; -+ GtkWidget *remember_group_button; - - GtkWidget *radio_vbox; - GtkWidget *connect_with_no_userpass_button; -@@ -462,14 +463,18 @@ - gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); - - password_dialog->details->remember_session_button = -- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); -+ gtk_radio_button_new_with_mnemonic (NULL, _("_Remember passwords for this session")); - password_dialog->details->remember_forever_button = -- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); -+ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("_Save passwords in keyring")); -+ password_dialog->details->remember_group_button = -+ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("S_ave group password in keyring")); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, - FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_button, -+ FALSE, FALSE, 0); - - gnome_two_password_dialog_set_username (password_dialog, username); - gnome_two_password_dialog_set_password (password_dialog, password); -@@ -688,9 +693,11 @@ - if (show_remember) { - gtk_widget_show (password_dialog->details->remember_session_button); - gtk_widget_show (password_dialog->details->remember_forever_button); -+ gtk_widget_show (password_dialog->details->remember_group_button); - } else { - gtk_widget_hide (password_dialog->details->remember_session_button); - gtk_widget_hide (password_dialog->details->remember_forever_button); -+ gtk_widget_hide (password_dialog->details->remember_group_button); - } - } - -@@ -698,32 +705,46 @@ - gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember) - { -- gboolean session, forever; -+ gboolean session, forever, group; - - session = FALSE; - forever = FALSE; -- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { -+ group = FALSE; -+ -+ switch (remember) { -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: - session = TRUE; -- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ -+ break; -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: - forever = TRUE; -+ break; -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP: -+ group = TRUE; -+ break; - } -+ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), - session); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), - forever); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button), -+ group); - } - - GnomeTwoPasswordDialogRemember - gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) - { -- gboolean session, forever; -+ gboolean session, forever, group; - - session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); - forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); -+ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button)); - if (forever) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; - } else if (session) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; -+ } else if (group) { -+ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP; - } - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; - } ---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig 2007-11-27 09:23:26.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2007-11-27 09:24:17.000000000 +0100 -@@ -57,6 +57,7 @@ - typedef enum { - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, -+ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER - } GnomeTwoPasswordDialogRemember; - Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/NetworkManager-vpnc.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- NetworkManager-vpnc.spec 2 May 2008 03:15:11 -0000 1.36 +++ NetworkManager-vpnc.spec 24 Jul 2008 21:46:37 -0000 1.37 @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.9.3.svn3623 +%define nm_version 1:0.7.0-0.11.svn3830 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn3627 +%define svn_snapshot svn3846 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc Epoch: 1 Version: 0.7.0 -Release: 0.7.7.%{svn_snapshot}%{?dist} +Release: 0.10.%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -100,6 +100,17 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-10.svn3846 +- Rebuild for updated NetworkManager + +* Fri Jul 18 2008 Dan Williams 1:0.7.0-10.svn3832 +- Update for NM netmask -> prefix changes + +* Wed Jul 02 2008 Dan Williams 1:0.7.0-10.svn3801 +- Update for moving VPN editing into connection manager +- Add option to disable Dead Peer Detection +- Add option to select NAT Traversal mode + * Thu May 01 2008 Dan Williams 1:0.7.0-7.7.svn3627 - Update for compat with new NM bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 2 May 2008 03:15:11 -0000 1.19 +++ sources 24 Jul 2008 21:46:37 -0000 1.20 @@ -1 +1 @@ -6401add359698efdc15a65ee85a4cd4e NetworkManager-vpnc-0.7.0.svn3627.tar.gz +a46bf418e5922dbfe81407adc854e7a9 NetworkManager-vpnc-0.7.0.svn3846.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:50:00 2008 From: fedora-extras-commits at redhat.com (Mikhail Fedotov (anyremote)) Date: Thu, 24 Jul 2008 21:50:00 GMT Subject: rpms/kanyremote/F-9 .cvsignore, 1.3, 1.4 kanyremote.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807242150.m6OLo0fC031738@cvs-int.fedora.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/kanyremote/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31662/F-9 Modified Files: .cvsignore kanyremote.spec sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2008 22:52:36 -0000 1.3 +++ .cvsignore 24 Jul 2008 21:49:16 -0000 1.4 @@ -1 +1 @@ -kanyremote-4.9.tar.gz +kanyremote-5.0.tar.gz Index: kanyremote.spec =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kanyremote.spec 31 May 2008 22:52:36 -0000 1.2 +++ kanyremote.spec 24 Jul 2008 21:49:16 -0000 1.3 @@ -1,6 +1,6 @@ Summary: KDE frontend for anyRemote Name: kanyremote -Version: 4.9 +Version: 5.0 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -36,6 +36,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 21 2008 Mikhail Fedotov - 5.0-1 +Internationalization support. +Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, +Polish and Russian translation. + * Sun May 25 2008 Mikhail Fedotov - 4.9-1 - Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and anyremote2html v0.5. @@ -67,4 +72,12 @@ %{_datadir}/pixmaps/%{name}_light.png %{_datadir}/pixmaps/%{name}.png %{_defaultdocdir}/%{name} +%{_datadir}/locale/de_AT/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/de_DE/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/es_ES/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/it_IT/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/hu_HU/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/pl_PL/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/pt_BR/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/ru_RU/LC_MESSAGES/kanyremote.mo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2008 22:52:36 -0000 1.3 +++ sources 24 Jul 2008 21:49:16 -0000 1.4 @@ -1 +1 @@ -31ecadd620bb1f5063abd026f749fbed kanyremote-4.9.tar.gz +be26667d5e7442c5b74ebf8ceaa5a9ec kanyremote-5.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:51:07 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 24 Jul 2008 21:51:07 GMT Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.26, 1.27 Message-ID: <200807242151.m6OLp7Yv031927@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jakarta-commons-lang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31810 Modified Files: jakarta-commons-lang.spec Log Message: * Thu Jul 24 2008 Andrew Overholt 0:2.3-2.3 - Add OSGi MANIFEST.MF Index: jakarta-commons-lang.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- jakarta-commons-lang.spec 9 Jul 2008 19:32:31 -0000 1.26 +++ jakarta-commons-lang.spec 24 Jul 2008 21:50:21 -0000 1.27 @@ -40,7 +40,7 @@ Name: jakarta-%{short_name} Version: 2.3 -Release: 2.2%{?dist} +Release: 2.3%{?dist} Epoch: 0 Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 @@ -53,6 +53,7 @@ Source4: %{short_name}-%{version}-jpp-depmap.xml Source5: %{short_name}-%{version}.pom Patch0: %{name}-notarget.patch +Patch1: %{name}-addosgimanifest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -127,6 +128,7 @@ /usr/bin/saxon $DEPCAT %{SOURCE2} > %{short_name}-%{version}-depmap.new.xml fi %patch0 +%patch1 %build %if %{with_maven} @@ -251,6 +253,9 @@ %endif %changelog +* Thu Jul 24 2008 Andrew Overholt 0:2.3-2.3 +- Add OSGi MANIFEST.MF + * Wed Jul 9 2008 Tom "spot" Callaway - 0:2.3-2.2 - drop repotag - fix license tag From fedora-extras-commits at redhat.com Thu Jul 24 21:51:16 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 24 Jul 2008 21:51:16 GMT Subject: rpms/jakarta-commons-httpclient/devel jakarta-commons-httpclient-addosgimanifest.patch, 1.2, 1.3 jakarta-commons-httpclient.spec, 1.22, 1.23 Message-ID: <200807242151.m6OLpG9L031981@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jakarta-commons-httpclient/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31822 Modified Files: jakarta-commons-httpclient-addosgimanifest.patch jakarta-commons-httpclient.spec Log Message: * Thu Jul 24 2008 Andrew Overholt 1:3.1-0.3 - Update OSGi MANIFEST.MF jakarta-commons-httpclient-addosgimanifest.patch: Index: jakarta-commons-httpclient-addosgimanifest.patch =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient-addosgimanifest.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jakarta-commons-httpclient-addosgimanifest.patch 4 Apr 2008 18:41:56 -0000 1.2 +++ jakarta-commons-httpclient-addosgimanifest.patch 24 Jul 2008 21:50:24 -0000 1.3 @@ -8,7 +8,7 @@ +Bundle-ManifestVersion: 2 +Bundle-Name: %bundleName +Bundle-SymbolicName: org.apache.commons.httpclient -+Bundle-Version: 3.1.qualifier ++Bundle-Version: 3.1.0.v20080605-1935 +Import-Package: javax.crypto;resolution:=optional, + javax.crypto.spec;resolution:=optional, + javax.net;resolution:=optional, @@ -17,14 +17,14 @@ + org.apache.commons.codec.binary;version="[1.2.0,2.0.0)", + org.apache.commons.codec.net;version="[1.2.0,2.0.0)", + org.apache.commons.logging;version="[1.0.4,2.0.0)" -+Export-Package: org.apache.commons.httpclient;version="3.1", -+ org.apache.commons.httpclient.auth;version="3.1", -+ org.apache.commons.httpclient.cookie;version="3.1", -+ org.apache.commons.httpclient.methods;version="3.1", -+ org.apache.commons.httpclient.methods.multipart;version="3.1", -+ org.apache.commons.httpclient.params;version="3.1", -+ org.apache.commons.httpclient.protocol;version="3.1", -+ org.apache.commons.httpclient.util;version="3.1" ++Export-Package: org.apache.commons.httpclient;version="3.1.0", ++ org.apache.commons.httpclient.auth;version="3.1.0", ++ org.apache.commons.httpclient.cookie;version="3.1.0", ++ org.apache.commons.httpclient.methods;version="3.1.0", ++ org.apache.commons.httpclient.methods.multipart;version="3.1.0", ++ org.apache.commons.httpclient.params;version="3.1.0", ++ org.apache.commons.httpclient.protocol;version="3.1.0", ++ org.apache.commons.httpclient.util;version="3.1.0" +Bundle-Vendor: %bundleProvider +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, Index: jakarta-commons-httpclient.spec =================================================================== RCS file: /cvs/pkgs/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jakarta-commons-httpclient.spec 9 Jul 2008 19:30:17 -0000 1.22 +++ jakarta-commons-httpclient.spec 24 Jul 2008 21:50:24 -0000 1.23 @@ -36,7 +36,7 @@ Name: jakarta-commons-httpclient Version: 3.1 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Epoch: 1 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards License: ASL 2.0 @@ -233,6 +233,9 @@ %changelog +* Thu Jul 24 2008 Andrew Overholt 1:3.1-0.3 +- Update OSGi MANIFEST.MF + * Wed Jul 9 2008 Tom "spot" Callaway - 1:3.1-0.2 - drop repotag - fix license tag From fedora-extras-commits at redhat.com Thu Jul 24 21:51:22 2008 From: fedora-extras-commits at redhat.com (Mikhail Fedotov (anyremote)) Date: Thu, 24 Jul 2008 21:51:22 GMT Subject: rpms/kanyremote/F-8 .cvsignore, 1.3, 1.4 kanyremote.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807242151.m6OLpMeS032032@cvs-int.fedora.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/kanyremote/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31850/F-8 Modified Files: .cvsignore kanyremote.spec sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2008 22:55:35 -0000 1.3 +++ .cvsignore 24 Jul 2008 21:50:34 -0000 1.4 @@ -1 +1 @@ -kanyremote-4.9.tar.gz +kanyremote-5.0.tar.gz Index: kanyremote.spec =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/F-8/kanyremote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kanyremote.spec 31 May 2008 22:55:35 -0000 1.2 +++ kanyremote.spec 24 Jul 2008 21:50:34 -0000 1.3 @@ -1,6 +1,6 @@ Summary: KDE frontend for anyRemote Name: kanyremote -Version: 4.9 +Version: 5.0 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -36,6 +36,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 21 2008 Mikhail Fedotov - 5.0-1 +Internationalization support. +Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, +Polish and Russian translation. + * Sun May 25 2008 Mikhail Fedotov - 4.9-1 - Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and anyremote2html v0.5. @@ -67,4 +72,12 @@ %{_datadir}/pixmaps/%{name}_light.png %{_datadir}/pixmaps/%{name}.png %{_defaultdocdir}/%{name} +%{_datadir}/locale/de_AT/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/de_DE/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/es_ES/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/it_IT/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/hu_HU/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/pl_PL/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/pt_BR/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/ru_RU/LC_MESSAGES/kanyremote.mo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2008 22:55:35 -0000 1.3 +++ sources 24 Jul 2008 21:50:34 -0000 1.4 @@ -1 +1 @@ -31ecadd620bb1f5063abd026f749fbed kanyremote-4.9.tar.gz +be26667d5e7442c5b74ebf8ceaa5a9ec kanyremote-5.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:51:12 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 21:51:12 GMT Subject: rpms/perl-Event-ExecFlow/devel Event-ExecFlow-0.63-rm_anyevent_prov.patch, NONE, 1.1 import.log, NONE, 1.1 perl-Event-ExecFlow.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807242151.m6OLpCG9031939@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Event-ExecFlow/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31806/devel Modified Files: .cvsignore sources Added Files: Event-ExecFlow-0.63-rm_anyevent_prov.patch import.log perl-Event-ExecFlow.spec Log Message: Initial import for devel Event-ExecFlow-0.63-rm_anyevent_prov.patch: --- NEW FILE Event-ExecFlow-0.63-rm_anyevent_prov.patch --- diff -up Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm.rm_anyeventprov Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm --- Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm.rm_anyeventprov 2008-07-16 00:21:53.000000000 +0200 +++ Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm 2008-07-16 00:22:22.000000000 +0200 @@ -9,7 +9,7 @@ use AnyEvent; # prevent warnings from AnyEvent { package AnyEvent::Impl::Event::CondVar; - package AnyEvent::Impl::Event::Glib; } +} sub get_type { "command" } sub get_exec_type { "async" } --- NEW FILE import.log --- perl-Event-ExecFlow-0_63-3_fc8_kwizart:HEAD:perl-Event-ExecFlow-0.63-3.fc8.kwizart.src.rpm:1216936202 --- NEW FILE perl-Event-ExecFlow.spec --- Name: perl-Event-ExecFlow Version: 0.63 Release: 3%{?dist} Summary: High level API for event-based execution flow control Group: Development/Libraries License: (GPL+ or Artistic) and LGPLv2+ URL: http://search.cpan.org/dist/Event-ExecFlow/ Source0: http://search.cpan.org/CPAN/authors/id/J/JR/JRED/Event-ExecFlow-%{version}.tar.gz Patch0: Event-ExecFlow-0.63-rm_anyevent_prov.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(AnyEvent) BuildRequires: perl(Test::More) BuildRequires: perl(Locale::TextDomain) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Event::ExecFlow offers a high level API to declare jobs, which mainly execute external commands, parse their output to get progress or other status information, triggers actions when the command has been finished etc. Such jobs can be chained together in a recursive fashion to fulfill rather complex tasks which consist of many jobs. %prep %setup -q -n Event-ExecFlow-%{version} # Convert encoding for f in $(find lib/ -name *.pm) README ; do cp -p ${f} ${f}.noutf8 iconv -f ISO-8859-1 -t UTF-8 ${f}.noutf8 > ${f} touch -r ${f}.noutf8 ${f} rm ${f}.noutf8 done %patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' # Fix perm chmod 0755 $RPM_BUILD_ROOT%{_bindir}/execflow %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README # This file is GPL+ or Artistic %{_bindir}/execflow # Theses files are LGPLv2+ %{perl_vendorlib}/Event/ %{_mandir}/man3/*.3* %changelog * Sun Jul 20 2008 kwizart < kwizart at gmail.com > - 0.63-4 - Update license to (GPL+ or Artistic) and LGPLv2+ * Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 0.63-3 - Fix directory ownership - Fix execflow perm - Fix perl Encoding - Fix License to LGPLv2+ * Thu Jul 10 2008 kwizart < kwizart at gmail.com > - 0.63-2 - Add BR Test::More and Locale::TextDomain * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 0.63-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-ExecFlow/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:15:05 -0000 1.1 +++ .cvsignore 24 Jul 2008 21:50:23 -0000 1.2 @@ -0,0 +1 @@ +Event-ExecFlow-0.63.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-ExecFlow/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:15:05 -0000 1.1 +++ sources 24 Jul 2008 21:50:23 -0000 1.2 @@ -0,0 +1 @@ +79116732b550701a3436a448581e01da Event-ExecFlow-0.63.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:52:23 2008 From: fedora-extras-commits at redhat.com (Mikhail Fedotov (anyremote)) Date: Thu, 24 Jul 2008 21:52:23 GMT Subject: rpms/kanyremote/devel .cvsignore, 1.3, 1.4 kanyremote.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807242152.m6OLqNx8032190@cvs-int.fedora.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/kanyremote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32113/devel Modified Files: .cvsignore kanyremote.spec sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2008 22:37:59 -0000 1.3 +++ .cvsignore 24 Jul 2008 21:51:38 -0000 1.4 @@ -1 +1 @@ -kanyremote-4.9.tar.gz +kanyremote-5.0.tar.gz Index: kanyremote.spec =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kanyremote.spec 31 May 2008 22:37:59 -0000 1.2 +++ kanyremote.spec 24 Jul 2008 21:51:38 -0000 1.3 @@ -1,6 +1,6 @@ Summary: KDE frontend for anyRemote Name: kanyremote -Version: 4.9 +Version: 5.0 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -36,6 +36,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 21 2008 Mikhail Fedotov - 5.0-1 +Internationalization support. +Added Austrian, Brazilian Portuguese, German, Hungarian, Spanish, Italian, +Polish and Russian translation. + * Sun May 25 2008 Mikhail Fedotov - 4.9-1 - Bugfixes and enhancements to better support anyremote-J2ME client v4.6 and anyremote2html v0.5. @@ -67,4 +72,12 @@ %{_datadir}/pixmaps/%{name}_light.png %{_datadir}/pixmaps/%{name}.png %{_defaultdocdir}/%{name} +%{_datadir}/locale/de_AT/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/de_DE/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/es_ES/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/it_IT/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/hu_HU/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/pl_PL/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/pt_BR/LC_MESSAGES/kanyremote.mo +%{_datadir}/locale/ru_RU/LC_MESSAGES/kanyremote.mo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2008 22:37:59 -0000 1.3 +++ sources 24 Jul 2008 21:51:38 -0000 1.4 @@ -1 +1 @@ -31ecadd620bb1f5063abd026f749fbed kanyremote-4.9.tar.gz +be26667d5e7442c5b74ebf8ceaa5a9ec kanyremote-5.0.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:56:22 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Thu, 24 Jul 2008 21:56:22 GMT Subject: rpms/ntp/OLPC-3 ntp.spec,1.80,1.81 Message-ID: <200807242156.m6OLuMCd032424@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/ntp/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32369 Modified Files: ntp.spec Log Message: split ntpdate into its own package Index: ntp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ntp/OLPC-3/ntp.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- ntp.spec 7 Apr 2008 17:18:26 -0000 1.80 +++ ntp.spec 24 Jul 2008 21:55:36 -0000 1.81 @@ -1,7 +1,7 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP) Name: ntp Version: 4.2.4p4 -Release: 6%{?dist} +Release: 7%{?dist} # primary license (COPYRIGHT) : MIT # ElectricFence/ (not used) : GPLv2 # kernel/sys/ppsclock.h (not used) : BSD with advertising @@ -84,6 +84,13 @@ Install the ntp package if you need tools for keeping your system's time synchronized via the NTP protocol. +%package ntpdate +Summary: Utility to set the date and time via NTP +Group: Applications/System + +%description ntpdate +This standalone utility allows you set the date and time via NTP + %prep %setup -q -a 5 @@ -220,15 +227,12 @@ %{_sbindir}/ntptrace %{_sbindir}/ntp-keygen %{_sbindir}/ntpd -%{_sbindir}/ntpdate %{_sbindir}/ntpdc %{_sbindir}/ntpq %{_sbindir}/ntptime %{_sbindir}/tickadj %{_initrddir}/ntpd -%{_initrddir}/ntpdate %config(noreplace) %{_sysconfdir}/sysconfig/ntpd -%config(noreplace) %{_sysconfdir}/sysconfig/ntpdate %dir %{_sysconfdir}/ntp %config(noreplace) %{_sysconfdir}/ntp.conf %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers @@ -238,11 +242,27 @@ %dir %attr(-,ntp,ntp) %{_localstatedir}/lib/ntp %ghost %attr(644,ntp,ntp) %{_localstatedir}/lib/ntp/drift %dir %attr(-,ntp,ntp) %{_localstatedir}/log/ntpstats -%{_mandir}/man[58]/*.[58]* +%{_mandir}/man5/*.5* +%{_mandir}/man8/ntp-keygen.8.gz +%{_mandir}/man8/ntpd.8.gz +%{_mandir}/man8/ntpdc.8.gz +%{_mandir}/man8/ntpq.8.gz +%{_mandir}/man8/ntpstat.8.gz +%{_mandir}/man8/ntptime.8.gz +%{_mandir}/man8/ntptrace.8.gz %{_bindir}/ntpstat +%files ntpdate +%defattr(-,root,root,-) +%{_sbindir}/ntpdate +%{_initrddir}/ntpdate +%config(noreplace) %{_sysconfdir}/sysconfig/ntpdate +%{_mandir}/man8/ntpdate.8.gz %changelog +* Thu Jul 24 2008 Daniel Drake 4.2.4p4-7 +- split ntpdate into its own package + * Mon Apr 07 2008 Miroslav Lichvar 4.2.4p4-6 - don't use /etc/sysconfig/clock in ntpdate init script From fedora-extras-commits at redhat.com Thu Jul 24 21:56:42 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 21:56:42 GMT Subject: rpms/NetworkManager-openvpn/F-9 NetworkManager-openvpn.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <200807242156.m6OLugbQ032482@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32379 Modified Files: NetworkManager-openvpn.spec sources Log Message: * Thu Jul 24 2008 Dan Williams 1:0.7.0-15.svn3846 - Fix TLS Authentication direction combo - Only update settings if the advanced dialog's OK button is pressed - Update for NM netmask -> prefix changes - Update for moving VPN editing into connection manager - Import OpenVPN configuration files rather than old custom format Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- NetworkManager-openvpn.spec 24 Jun 2008 10:06:23 -0000 1.20 +++ NetworkManager-openvpn.spec 24 Jul 2008 21:55:53 -0000 1.21 @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.9.3.svn3623 +%define nm_version 1:0.7.0-0.11.svn3830 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3632 +%define svn_snapshot .svn3846 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 14%{svn_snapshot}%{?dist} +Release: 15%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -18,12 +18,9 @@ # - Check out NetworkManager from Gnome SVN, currently trunk is used # - cd NetworkManager/vpn-daemons/openvpn # - ./autogen.sh --prefix=/usr --sysconfdir=/etc -# - make distclean -# - cd .. -# - mv openvpn NetworkManager-openvpn-%{version} -# - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version} +# - make distcheck +# - use generated NetworkManager-openvpn-0.7.0.tar.gz Source: %{name}-%{version}%{svn_snapshot}.tar.gz -Patch: NetworkManager-openvpn-0.7.0-remote-ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -57,7 +54,6 @@ %prep %setup -q -n %{name}-%{version} -%patch -p0 -b .buildroot %build if [ ! -f configure ]; then @@ -107,6 +103,13 @@ %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-15.svn3846 +- Fix TLS Authentication direction combo +- Only update settings if the advanced dialog's OK button is pressed +- Update for NM netmask -> prefix changes +- Update for moving VPN editing into connection manager +- Import OpenVPN configuration files rather than old custom format + * Tue Jun 24 2008 Christoph H??ger 1:0.7.0-14.svn3632 - revoke last change - openvpn seems to be buggy itself Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 May 2008 21:06:25 -0000 1.8 +++ sources 24 Jul 2008 21:55:53 -0000 1.9 @@ -1 +1 @@ -f4266d18d5949091ec85a8214244b787 NetworkManager-openvpn-0.7.0.svn3632.tar.gz +eb01cff3d1bb688f9e5bead7ef6b2c76 NetworkManager-openvpn-0.7.0.svn3846.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 21:58:32 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 21:58:32 GMT Subject: rpms/perl-Event-ExecFlow/F-9 Event-ExecFlow-0.63-rm_anyevent_prov.patch, NONE, 1.1 perl-Event-ExecFlow.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807242158.m6OLwWXl032623@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Event-ExecFlow/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32567 Modified Files: sources Added Files: Event-ExecFlow-0.63-rm_anyevent_prov.patch perl-Event-ExecFlow.spec Log Message: Initial import for F-9 Event-ExecFlow-0.63-rm_anyevent_prov.patch: --- NEW FILE Event-ExecFlow-0.63-rm_anyevent_prov.patch --- diff -up Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm.rm_anyeventprov Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm --- Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm.rm_anyeventprov 2008-07-16 00:21:53.000000000 +0200 +++ Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm 2008-07-16 00:22:22.000000000 +0200 @@ -9,7 +9,7 @@ use AnyEvent; # prevent warnings from AnyEvent { package AnyEvent::Impl::Event::CondVar; - package AnyEvent::Impl::Event::Glib; } +} sub get_type { "command" } sub get_exec_type { "async" } --- NEW FILE perl-Event-ExecFlow.spec --- Name: perl-Event-ExecFlow Version: 0.63 Release: 3%{?dist} Summary: High level API for event-based execution flow control Group: Development/Libraries License: (GPL+ or Artistic) and LGPLv2+ URL: http://search.cpan.org/dist/Event-ExecFlow/ Source0: http://search.cpan.org/CPAN/authors/id/J/JR/JRED/Event-ExecFlow-%{version}.tar.gz Patch0: Event-ExecFlow-0.63-rm_anyevent_prov.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(AnyEvent) BuildRequires: perl(Test::More) BuildRequires: perl(Locale::TextDomain) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Event::ExecFlow offers a high level API to declare jobs, which mainly execute external commands, parse their output to get progress or other status information, triggers actions when the command has been finished etc. Such jobs can be chained together in a recursive fashion to fulfill rather complex tasks which consist of many jobs. %prep %setup -q -n Event-ExecFlow-%{version} # Convert encoding for f in $(find lib/ -name *.pm) README ; do cp -p ${f} ${f}.noutf8 iconv -f ISO-8859-1 -t UTF-8 ${f}.noutf8 > ${f} touch -r ${f}.noutf8 ${f} rm ${f}.noutf8 done %patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' # Fix perm chmod 0755 $RPM_BUILD_ROOT%{_bindir}/execflow %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README # This file is GPL+ or Artistic %{_bindir}/execflow # Theses files are LGPLv2+ %{perl_vendorlib}/Event/ %{_mandir}/man3/*.3* %changelog * Sun Jul 20 2008 kwizart < kwizart at gmail.com > - 0.63-4 - Update license to (GPL+ or Artistic) and LGPLv2+ * Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 0.63-3 - Fix directory ownership - Fix execflow perm - Fix perl Encoding - Fix License to LGPLv2+ * Thu Jul 10 2008 kwizart < kwizart at gmail.com > - 0.63-2 - Add BR Test::More and Locale::TextDomain * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 0.63-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-ExecFlow/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:15:05 -0000 1.1 +++ sources 24 Jul 2008 21:57:42 -0000 1.2 @@ -0,0 +1 @@ +79116732b550701a3436a448581e01da Event-ExecFlow-0.63.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 22:01:30 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 24 Jul 2008 22:01:30 GMT Subject: rpms/NetworkManager-openvpn/devel NetworkManager-openvpn.spec, 1.19, 1.20 Message-ID: <200807242201.m6OM1UQm006955@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32735 Modified Files: NetworkManager-openvpn.spec Log Message: * Thu Jul 24 2008 Dan Williams 1:0.7.0-15.svn3846 - Rebuild to sync with F9 release number Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- NetworkManager-openvpn.spec 24 Jul 2008 20:57:39 -0000 1.19 +++ NetworkManager-openvpn.spec 24 Jul 2008 22:00:44 -0000 1.20 @@ -10,7 +10,7 @@ Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 11%{svn_snapshot}%{?dist} +Release: 15%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-15.svn3846 +- Rebuild to sync with F9 release number + * Thu Jul 24 2008 Dan Williams 1:0.7.0-11.svn3846 - Fix TLS Authentication direction combo - Only update settings if the advanced dialog's OK button is pressed From fedora-extras-commits at redhat.com Thu Jul 24 22:02:48 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Thu, 24 Jul 2008 22:02:48 GMT Subject: rpms/control-center/devel control-center.spec,1.381,1.382 Message-ID: <200807242202.m6OM2mp4007131@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7035 Modified Files: control-center.spec Log Message: Update packaged files Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- control-center.spec 24 Jul 2008 21:03:01 -0000 1.381 +++ control-center.spec 24 Jul 2008 22:01:59 -0000 1.382 @@ -297,15 +297,16 @@ %defattr(-, root, root) %doc AUTHORS COPYING NEWS README %{_datadir}/gnome-control-center/keybindings/*.xml +%{_datadir}/gnome-control-center/default-apps/*.xml %{_datadir}/gnome-control-center/glade %{_datadir}/gnome-control-center/pixmaps -%{_datadir}/gnome-control-center/*.xml %{_datadir}/applications/*.desktop %{_datadir}/desktop-directories/* %{_datadir}/mime/packages/gnome-theme-package.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/PolicyKit/policy/* %{_datadir}/pkgconfig/gnome-keybindings.pc +%{_datadir}/pkgconfig/gnome-default-applications.pc # list all binaries explicitly, so we notice if one goes missing %{_bindir}/gnome-about-me %{_bindir}/gnome-appearance-properties @@ -315,18 +316,14 @@ %{_bindir}/gnome-control-center %{_bindir}/gnome-default-applications-properties %{_bindir}/gnome-display-properties -%{_bindir}/gnome-font-viewer %{_bindir}/gnome-keybinding-properties %{_bindir}/gnome-keyboard-properties %{_bindir}/gnome-mouse-properties %{_bindir}/gnome-network-preferences %{_bindir}/gnome-sound-properties -%{_bindir}/gnome-thumbnail-font %{_bindir}/gnome-typing-monitor %{_bindir}/gnome-window-properties -%{_libdir}/nautilus/extensions-2.0/*.so %{_libdir}/*.so.* -%{_sysconfdir}/gconf/schemas/fontilus.schemas %{_sysconfdir}/gconf/schemas/control-center.schemas %{_sysconfdir}/xdg/menus/gnomecc.menu %{_sysconfdir}/xdg/autostart/gnome-at-session.desktop @@ -347,6 +344,9 @@ %changelog * Thu Jul 24 2008 Soren Sandmann - 2.23.5-1 +- Update the packaged files to match reality. + +* Thu Jul 24 2008 Soren Sandmann - 2.23.5-1 - Update to 2.23.5. Drop randr, standard icon and notification theme patches. - Comment out libcanberra patch for now since it doesn't apply From fedora-extras-commits at redhat.com Thu Jul 24 22:02:43 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Thu, 24 Jul 2008 22:02:43 GMT Subject: rpms/olpc-utils/OLPC-3 .cvsignore, 1.7, 1.8 olpc-utils.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200807242202.m6OM2h0A007096@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7027 Modified Files: .cvsignore olpc-utils.spec sources Log Message: - cscott: dlo#317: Set appropriate ICEAUTHORITY, XAUTHORITY, and XSERVERAUTH variables to move these to a tmpfs. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Jul 2008 22:55:53 -0000 1.7 +++ .cvsignore 24 Jul 2008 22:01:58 -0000 1.8 @@ -1 +1 @@ -olpc-utils-0.80.tar.bz2 +olpc-utils-0.81.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- olpc-utils.spec 23 Jul 2008 22:55:53 -0000 1.13 +++ olpc-utils.spec 24 Jul 2008 22:01:58 -0000 1.14 @@ -1,5 +1,5 @@ Name: olpc-utils -Version: 0.80 +Version: 0.81 Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary @@ -84,6 +84,10 @@ %changelog +* Thu Jul 24 2008 Michael Stone 0.81-1 +- cscott: dlo#317: Set appropriate ICEAUTHORITY, XAUTHORITY, and XSERVERAUTH + variables to move these to a tmpfs. + * Wed Jul 23 2008 Michael Stone 0.80-1 - sayamindu: dlo#7474: Choose the XIM method by default. - pgf: dlo#7537: Be more precise when assigning permissions to /home/olpc. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Jul 2008 22:55:53 -0000 1.8 +++ sources 24 Jul 2008 22:01:58 -0000 1.9 @@ -1 +1 @@ -5306d8b00f4fd28e86e82c5106b48459 olpc-utils-0.80.tar.bz2 +51a28f7f368d5059ed71e611d5a121b7 olpc-utils-0.81.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 22:04:26 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Thu, 24 Jul 2008 22:04:26 GMT Subject: rpms/totem-pl-parser/OLPC-3 bye-bye-camel.patch, NONE, 1.1 totem-pl-parser.spec, 1.14, 1.15 Message-ID: <200807242204.m6OM4QVQ007315@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/totem-pl-parser/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7217 Modified Files: totem-pl-parser.spec Added Files: bye-bye-camel.patch Log Message: remove dependency on libcamel bye-bye-camel.patch: --- NEW FILE bye-bye-camel.patch --- Index: totem-pl-parser-2.23.2/plparse/totem-pl-parser.c =================================================================== --- totem-pl-parser-2.23.2.orig/plparse/totem-pl-parser.c +++ totem-pl-parser-2.23.2/plparse/totem-pl-parser.c @@ -103,7 +103,9 @@ #ifndef TOTEM_PL_PARSER_MINI #include #include +#ifdef USE_SLEDGEHAMMER_TO_CRACK_NUT #include +#endif #include "totem-pl-parser.h" #include "totemplparser-marshal.h" @@ -1733,7 +1735,11 @@ totem_pl_parser_parse_date (const char * D(g_message ("Failed to parse duration '%s' using the ISO8601 parser", date_str)); /* Fall back to RFC 2822 date parsing */ +#ifdef USE_SLEDGEHAMMER_TO_CRACK_NUT return camel_header_decode_date (date_str, NULL); +#else + return 0; +#endif } #endif /* !TOTEM_PL_PARSER_MINI */ Index: totem-pl-parser-2.23.2/configure =================================================================== --- totem-pl-parser-2.23.2.orig/configure +++ totem-pl-parser-2.23.2/configure @@ -22062,12 +22062,12 @@ if test -n "$TOTEM_PLPARSER_CFLAGS"; the pkg_cv_TOTEM_PLPARSER_CFLAGS="$TOTEM_PLPARSER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_TOTEM_PLPARSER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>/dev/null` + pkg_cv_TOTEM_PLPARSER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -22078,12 +22078,12 @@ if test -n "$TOTEM_PLPARSER_LIBS"; then pkg_cv_TOTEM_PLPARSER_LIBS="$TOTEM_PLPARSER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_TOTEM_PLPARSER_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>/dev/null` + pkg_cv_TOTEM_PLPARSER_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -22101,14 +22101,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>&1` + TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>&1` else - TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>&1` + TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TOTEM_PLPARSER_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0) were not met: $TOTEM_PLPARSER_PKG_ERRORS @@ -22119,7 +22119,7 @@ Alternatively, you may set the environme and TOTEM_PLPARSER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0) were not met: +echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0) were not met: $TOTEM_PLPARSER_PKG_ERRORS Index: totem-pl-parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/OLPC-3/totem-pl-parser.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- totem-pl-parser.spec 2 Jul 2008 20:16:56 -0000 1.14 +++ totem-pl-parser.spec 24 Jul 2008 22:03:42 -0000 1.15 @@ -1,17 +1,18 @@ Name: totem-pl-parser Version: 2.23.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Totem Playlist Parser library Group: System Environment/Libraries License: LGPLv2+ Url: http://www.gnome.org/projects/totem/ Source0: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 +Patch0: bye-bye-camel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: totem-plparser BuildRequires: gtk2-devel -BuildRequires: evolution-data-server-devel +BuildRequires: libxml2-devel BuildRequires: gettext BuildRequires: perl(XML::Parser) @@ -33,6 +34,7 @@ %prep %setup -q +%patch0 -p1 %build @@ -66,6 +68,9 @@ %{_datadir}/gtk-doc/html/totem-pl-parser %changelog +* Thu Jul 24 2008 - Daniel Drake - 2.23.2-2 +- Add patch to remove dependency on libcamel + * Wed Jun 11 2008 - Bastien Nocera - 2.23.2-1 - Update to 2.23.2 From fedora-extras-commits at redhat.com Thu Jul 24 22:05:08 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Thu, 24 Jul 2008 22:05:08 GMT Subject: rpms/rainbow/F-9 .cvsignore, 1.4, 1.5 rainbow.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807242205.m6OM58o5007408@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/rainbow/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7291 Modified Files: .cvsignore rainbow.spec sources Log Message: - C. Scott Ananian (2): Update Makefile.fedora to be kinder to cross-building from debian systems. dlo#317: Adjust location of XAUTHORITY and ICEAUTHORITY files. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rainbow/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Jul 2008 18:08:27 -0000 1.4 +++ .cvsignore 24 Jul 2008 22:04:22 -0000 1.5 @@ -1 +1 @@ -rainbow-0.7.15.tar.bz2 +rainbow-0.7.16.tar.bz2 Index: rainbow.spec =================================================================== RCS file: /cvs/pkgs/rpms/rainbow/F-9/rainbow.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rainbow.spec 21 Jul 2008 18:08:27 -0000 1.4 +++ rainbow.spec 24 Jul 2008 22:04:22 -0000 1.5 @@ -3,7 +3,7 @@ %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")} Name: rainbow -Version: 0.7.15 +Version: 0.7.16 Release: 1%{?dist} Summary: The OLPC security service @@ -98,6 +98,10 @@ %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info/* %changelog +* Mon Jul 24 2008 Michael Stone - 0.7.16-1.olpc3 +- C. Scott Ananian (2): + Update Makefile.fedora to be kinder to cross-building from debian systems. + dlo#317: Adjust location of XAUTHORITY and ICEAUTHORITY files. * Mon Jul 21 2008 Michael Stone - 0.7.15-1.olpc3 - Martin Dengler (1): Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rainbow/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2008 18:08:27 -0000 1.4 +++ sources 24 Jul 2008 22:04:22 -0000 1.5 @@ -1 +1 @@ -3f58babcaa46adc4f387b5ad71db0c29 rainbow-0.7.15.tar.bz2 +7771536f368be1b55274dba56436084e rainbow-0.7.16.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 24 22:09:26 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Thu, 24 Jul 2008 22:09:26 GMT Subject: rpms/xorg-x11-utils/OLPC-3 xorg-x11-utils.spec,1.23,1.24 Message-ID: <200807242209.m6OM9QWm007713@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/xorg-x11-utils/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7647 Modified Files: xorg-x11-utils.spec Log Message: remove xdriinfo to kill off mesa dependencies Index: xorg-x11-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/OLPC-3/xorg-x11-utils.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xorg-x11-utils.spec 2 Jul 2008 18:50:06 -0000 1.23 +++ xorg-x11-utils.spec 24 Jul 2008 22:08:36 -0000 1.24 @@ -1,16 +1,17 @@ +%define minimal_build 1 %define pkgname utils Summary: X.Org X11 X client utilities Name: xorg-x11-%{pkgname} Version: 7.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2 -Source1: ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2 +Source1: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2 Source4: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2 @@ -19,11 +20,13 @@ Source7: ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2 Source8: ftp://ftp.x.org/pub/individual/app/xprop-1.0.4.tar.bz2 Source9: ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2 -Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2 + +%if %{minimal_build} == 0 +Source10: ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2 +%endif BuildRequires: pkgconfig BuildRequires: libdmx-devel -BuildRequires: libGL-devel BuildRequires: libXaw-devel BuildRequires: libXext-devel BuildRequires: libXft-devel @@ -37,14 +40,25 @@ BuildRequires: libXxf86misc-devel BuildRequires: libXxf86vm-devel -Provides: xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo +%if %{minimal_build} == 0 +BuildRequires: libGL-devel +%endif + +Provides: xdpyinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo +%if %{minimal_build} == 0 +Provides: xdriinfo +%endif %description A collection of client utilities which can be used to query the X server for various information, view and select fonts, etc. %prep +%if %{minimal_build} == 0 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 +%else +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 +%endif %build # Build all apps @@ -75,7 +89,6 @@ %defattr(-,root,root,-) %doc %{_bindir}/xdpyinfo -%{_bindir}/xdriinfo %{_bindir}/xev %{_bindir}/xfd %{_bindir}/xfontsel @@ -89,7 +102,6 @@ %{_datadir}/X11/app-defaults/XFontSel %{_datadir}/X11/app-defaults/Xfd %{_mandir}/man1/xdpyinfo.1* -%{_mandir}/man1/xdriinfo.1* %{_mandir}/man1/xev.1* %{_mandir}/man1/xfd.1* %{_mandir}/man1/xfontsel.1* @@ -100,7 +112,15 @@ %{_mandir}/man1/xvinfo.1* %{_mandir}/man1/xwininfo.1* +%if %{minimal_build} == 0 +%{_bindir}/xdriinfo +%{_mandir}/man1/xdriinfo.1* +%endif + %changelog +* Thu Jul 24 2008 Daniel Drake 7.4-2 +- Add OLPC-3 branch with fewer dependencies + * Wed Jul 02 2008 Adam Jackson 7.4-1 - xdpyinfo 1.0.3 - xprop 1.0.4 From fedora-extras-commits at redhat.com Thu Jul 24 22:09:36 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 22:09:36 GMT Subject: rpms/perl-Event-ExecFlow/F-8 Event-ExecFlow-0.63-rm_anyevent_prov.patch, NONE, 1.1 perl-Event-ExecFlow.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807242209.m6OM9akW007718@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Event-ExecFlow/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7641 Modified Files: sources Added Files: Event-ExecFlow-0.63-rm_anyevent_prov.patch perl-Event-ExecFlow.spec Log Message: Initial import for F-8 Event-ExecFlow-0.63-rm_anyevent_prov.patch: --- NEW FILE Event-ExecFlow-0.63-rm_anyevent_prov.patch --- diff -up Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm.rm_anyeventprov Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm --- Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm.rm_anyeventprov 2008-07-16 00:21:53.000000000 +0200 +++ Event-ExecFlow-0.63/lib/Event/ExecFlow/Job/Command.pm 2008-07-16 00:22:22.000000000 +0200 @@ -9,7 +9,7 @@ use AnyEvent; # prevent warnings from AnyEvent { package AnyEvent::Impl::Event::CondVar; - package AnyEvent::Impl::Event::Glib; } +} sub get_type { "command" } sub get_exec_type { "async" } --- NEW FILE perl-Event-ExecFlow.spec --- Name: perl-Event-ExecFlow Version: 0.63 Release: 4%{?dist}.1 Summary: High level API for event-based execution flow control Group: Development/Libraries License: (GPL+ or Artistic) and LGPLv2+ URL: http://search.cpan.org/dist/Event-ExecFlow/ Source0: http://search.cpan.org/CPAN/authors/id/J/JR/JRED/Event-ExecFlow-%{version}.tar.gz Patch0: Event-ExecFlow-0.63-rm_anyevent_prov.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(AnyEvent) BuildRequires: perl(Test::More) BuildRequires: perl(Locale::TextDomain) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Event::ExecFlow offers a high level API to declare jobs, which mainly execute external commands, parse their output to get progress or other status information, triggers actions when the command has been finished etc. Such jobs can be chained together in a recursive fashion to fulfill rather complex tasks which consist of many jobs. %prep %setup -q -n Event-ExecFlow-%{version} # Convert encoding for f in $(find lib/ -name *.pm) README ; do cp -p ${f} ${f}.noutf8 iconv -f ISO-8859-1 -t UTF-8 ${f}.noutf8 > ${f} touch -r ${f}.noutf8 ${f} rm ${f}.noutf8 done %patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' # Fix perm chmod 0755 $RPM_BUILD_ROOT%{_bindir}/execflow %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README # This file is GPL+ or Artistic %{_bindir}/execflow # Theses files are LGPLv2+ %{perl_vendorlib}/Event/ %{_mandir}/man3/*.3* %changelog * Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 0.63-4.1 - Exlude ppc64 on F-8 - Update license to (GPL+ or Artistic) and LGPLv2+ * Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 0.63-3 - Fix directory ownership - Fix execflow perm - Fix perl Encoding - Fix License to LGPLv2+ * Thu Jul 10 2008 kwizart < kwizart at gmail.com > - 0.63-2 - Add BR Test::More and Locale::TextDomain * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 0.63-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-ExecFlow/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:15:05 -0000 1.1 +++ sources 24 Jul 2008 22:08:37 -0000 1.2 @@ -0,0 +1 @@ +79116732b550701a3436a448581e01da Event-ExecFlow-0.63.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 22:12:00 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 24 Jul 2008 22:12:00 GMT Subject: rpms/kdelibs4/F-8 kdelibs4.spec,1.22,1.23 Message-ID: <200807242212.m6OMC01b007947@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7851/F-8 Modified Files: kdelibs4.spec Log Message: Sync from kdelibs/devel: * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package - fix #453063 (Sonnet documentation multilib conflict) properly Index: kdelibs4.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- kdelibs4.spec 24 Jul 2008 18:16:50 -0000 1.22 +++ kdelibs4.spec 24 Jul 2008 22:11:10 -0000 1.23 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.0 -Release: 1%{?dist}.1 +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -266,6 +266,11 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh +# fix Sonnet documentation multilib conflict +bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2 +sed -i -e 's!!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache +bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache + # install apidocs and generator script install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh %endif @@ -312,6 +317,7 @@ %{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/servicetypes/* %{_kde4_sharedir}/icons/hicolor/*/actions/presence_* +%{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit4_*.so %dir %{_kde4_libdir}/kde4/ @@ -338,7 +344,6 @@ %{_kde4_docdir}/HTML/en/common/ %{_kde4_datadir}/locale/all_languages/ %endif -%{_kde4_docdir}/HTML/en/sonnet/ %files devel %defattr(-,root,root,-) @@ -361,8 +366,9 @@ %changelog -* Thu Jul 24 2008 Kevin Kofler 4.1.0-1.1 -- fix file list for build as kdelibs4 (no -common split) +* Thu Jul 24 2008 Kevin Kofler 4.1.0-2 +- move Sonnet documentation back to the main package +- fix #453063 (Sonnet documentation multilib conflict) properly * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Thu Jul 24 22:14:38 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 22:14:38 GMT Subject: rpms/perl-Event-ExecFlow/F-9 perl-Event-ExecFlow.spec,1.1,1.2 Message-ID: <200807242214.m6OMEc08008067@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Event-ExecFlow/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8027 Modified Files: perl-Event-ExecFlow.spec Log Message: Bump Index: perl-Event-ExecFlow.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-ExecFlow/F-9/perl-Event-ExecFlow.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Event-ExecFlow.spec 24 Jul 2008 21:57:42 -0000 1.1 +++ perl-Event-ExecFlow.spec 24 Jul 2008 22:13:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Event-ExecFlow Version: 0.63 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High level API for event-based execution flow control Group: Development/Libraries From fedora-extras-commits at redhat.com Thu Jul 24 22:16:36 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Thu, 24 Jul 2008 22:16:36 GMT Subject: rpms/perl-Event-ExecFlow/devel perl-Event-ExecFlow.spec,1.1,1.2 Message-ID: <200807242216.m6OMGaKM008159@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Event-ExecFlow/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8140 Modified Files: perl-Event-ExecFlow.spec Log Message: Bump Index: perl-Event-ExecFlow.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event-ExecFlow/devel/perl-Event-ExecFlow.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Event-ExecFlow.spec 24 Jul 2008 21:50:23 -0000 1.1 +++ perl-Event-ExecFlow.spec 24 Jul 2008 22:15:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Event-ExecFlow Version: 0.63 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High level API for event-based execution flow control Group: Development/Libraries From fedora-extras-commits at redhat.com Thu Jul 24 22:23:11 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Thu, 24 Jul 2008 22:23:11 GMT Subject: rpms/gstreamer-plugins-base/OLPC-3 gstreamer-plugins-base.spec, 1.52, 1.53 Message-ID: <200807242223.m6OMNBoa008378@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/gstreamer-plugins-base/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8316 Modified Files: gstreamer-plugins-base.spec Log Message: remove cdparanoia and perl dependencies Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/OLPC-3/gstreamer-plugins-base.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gstreamer-plugins-base.spec 18 Apr 2008 13:14:31 -0000 1.52 +++ gstreamer-plugins-base.spec 24 Jul 2008 22:22:21 -0000 1.53 @@ -1,3 +1,5 @@ +%define minimal_build 1 + %define gstreamer gstreamer %define majorminor 0.10 @@ -5,7 +7,7 @@ Name: %{gstreamer}-plugins-base Version: 0.10.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -60,6 +62,9 @@ %configure \ --with-package-name='Fedora gstreamer-plugins-base package' \ --with-package-origin='http://download.fedora.redhat.com/fedora' \ +%if %{minimal_build} == 1 + --disable-cdparanoia \ +%endif --disable-gtk-doc \ --enable-experimental \ --disable-static @@ -77,6 +82,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%if %{minimal_build} == 1 +# Remove gst-visualise because it requires perl +rm -f $RPM_BUILD_ROOT%{_bindir}/gst-visualise-%{majorminor} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gst-visualise-%{majorminor}* +%endif + # Install the docs by hand, see http://bugzilla.gnome.org/show_bug.cgi?id=349099 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/gst-plugins-base-libs-0.10/ cp -ar docs/libs/html/ $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/gst-plugins-base-libs-0.10/ @@ -92,9 +103,11 @@ %defattr(-, root, root) %doc AUTHORS COPYING README REQUIREMENTS +%if %{minimal_build} == 0 # helper programs %{_bindir}/gst-visualise-%{majorminor} %{_mandir}/man1/gst-visualise-%{majorminor}* +%endif # libraries %{_libdir}/libgstinterfaces-%{majorminor}.so.* @@ -134,7 +147,9 @@ # base plugins with dependencies %{_libdir}/gstreamer-%{majorminor}/libgstalsa.so +%if %{minimal_build} == 0 %{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so +%endif %{_libdir}/gstreamer-%{majorminor}/libgstgnomevfs.so %{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so %{_libdir}/gstreamer-%{majorminor}/libgstogg.so @@ -249,6 +264,10 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Thu Jul 24 2008 - Daniel Drake - 0.10.19-3 +- Disable cdparanoia +- Manully remove a perl script to not bring in dependencies + * Fri Apr 18 2008 - Bastien Nocera - 0.10.19-2 - Add patch to avoid sync problems in the ALSA sink when a specific track has both playback and record flags From fedora-extras-commits at redhat.com Thu Jul 24 22:36:56 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Thu, 24 Jul 2008 22:36:56 GMT Subject: rpms/libdvdnav/devel libdvdnav.spec,1.10,1.11 Message-ID: <200807242236.m6OMauri008983@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libdvdnav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935 Modified Files: libdvdnav.spec Log Message: * Fri Jul 25 2008 Dominik Mierzejewski 4.1.3-0.3 - add missing file to -devel Index: libdvdnav.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/devel/libdvdnav.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libdvdnav.spec 17 Jul 2008 18:59:38 -0000 1.10 +++ libdvdnav.spec 24 Jul 2008 22:36:02 -0000 1.11 @@ -1,6 +1,6 @@ Name: libdvdnav Version: 4.1.3 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: A library for reading DVD video discs based on Ogle code Group: System Environment/Libraries @@ -75,8 +75,12 @@ %{_includedir}/dvdnav %{_datadir}/aclocal/dvdnav.m4 %{_libdir}/pkgconfig/dvdnav.pc +%{_libdir}/pkgconfig/dvdnavmini.pc %changelog +* Fri Jul 25 2008 Dominik Mierzejewski 4.1.3-0.3 +- add missing file to -devel + * Thu Jul 17 2008 Dominik Mierzejewski 4.1.3-0.2 - update to current SVN - use new external libdvdread From fedora-extras-commits at redhat.com Thu Jul 24 22:54:43 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 24 Jul 2008 22:54:43 GMT Subject: rpms/gnomesword/devel gnomesword.spec,1.47,1.48 Message-ID: <200807242254.m6OMshdl009453@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9418 Modified Files: gnomesword.spec Log Message: * Thu Jul 24 2008 Deji Akingunola - 2.3.5-2 - Bump EVR Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gnomesword.spec 3 Jul 2008 05:06:49 -0000 1.47 +++ gnomesword.spec 24 Jul 2008 22:53:47 -0000 1.48 @@ -1,6 +1,6 @@ Name: gnomesword Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text @@ -75,6 +75,9 @@ %_datadir/gnome/help/gnomesword/ %changelog +* Thu Jul 24 2008 Deji Akingunola - 2.3.5-2 +- Bump EVR + * Thu Jul 03 2008 Deji Akingunola - 2.3.5-1 - Update to 2.3.5 From fedora-extras-commits at redhat.com Thu Jul 24 23:03:01 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Thu, 24 Jul 2008 23:03:01 GMT Subject: rpms/perl-DateTime-Format-DBI/devel perl-DateTime-Format-DBI.spec, 1.1, 1.2 Message-ID: <200807242303.m6ON3194016396@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352 Modified Files: perl-DateTime-Format-DBI.spec Log Message: release bump Index: perl-DateTime-Format-DBI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DBI/devel/perl-DateTime-Format-DBI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DateTime-Format-DBI.spec 24 Jul 2008 23:01:45 -0000 1.1 +++ perl-DateTime-Format-DBI.spec 24 Jul 2008 23:02:15 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-DateTime-Format-DBI Version: 0.031 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find a parser class for a database connection License: GPL+ or Artistic Group: Development/Libraries @@ -65,6 +65,9 @@ %{_mandir}/man3/* %changelog +* Thu Jul 24 2008 Chris Weyl 0.031-3 +- bump + * Tue Jul 22 2008 Chris Weyl 0.031-2 - override perl's auto-prov. see RH BZ#456357 From fedora-extras-commits at redhat.com Thu Jul 24 23:03:01 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Thu, 24 Jul 2008 23:03:01 GMT Subject: rpms/perl-DateTime-Format-DBI/devel import.log, NONE, 1.1 perl-DateTime-Format-DBI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807242303.m6ON31Ec016399@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16310/devel Modified Files: .cvsignore sources Added Files: import.log perl-DateTime-Format-DBI.spec Log Message: initial commit --- NEW FILE import.log --- perl-DateTime-Format-DBI-0_031-2_fc9:HEAD:perl-DateTime-Format-DBI-0.031-2.fc9.src.rpm:1216940486 --- NEW FILE perl-DateTime-Format-DBI.spec --- Name: perl-DateTime-Format-DBI Version: 0.031 Release: 2%{?dist} Summary: Find a parser class for a database connection License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-DBI/ Source0: http://www.cpan.org/authors/id/C/CF/CFAERBER/DateTime-Format-DBI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(DateTime) >= 0.1 BuildRequires: perl(DBI) >= 1.21 BuildRequires: perl(ExtUtils::MakeMaker) # test BuildRequires: perl(Test::More) # see BZ#456357; until then... AutoProv: no Provides: perl(DateTime::Format::DBI) = %{version} %description This module finds a DateTime::Format::* class that is suitable for the use with a given DBI connection (and DBD::* driver). Note that this is most useful if you actually have the DateTime::Format::* class for your particular database(s) installed! See, e.g., perl-DateTime-MySQL, perl-DateTime-Oracle, perl-DateTime-DB2, etc. %prep %setup -q -n DateTime-Format-DBI-%{version} for i in README lib/DateTime/Format/DBI.pm ; do # correct UTF-8 wonkiness cat $i | iconv -f ISO-8859-1 -t UTF-8 > foo mv foo $i done %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes LICENSE README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Jul 22 2008 Chris Weyl 0.031-2 - override perl's auto-prov. see RH BZ#456357 * Wed Jul 16 2008 Chris Weyl 0.031-1 - Specfile autogenerated by cpanspec 1.74. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DBI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:31:12 -0000 1.1 +++ .cvsignore 24 Jul 2008 23:01:45 -0000 1.2 @@ -0,0 +1 @@ +DateTime-Format-DBI-0.031.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DBI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:31:12 -0000 1.1 +++ sources 24 Jul 2008 23:01:45 -0000 1.2 @@ -0,0 +1 @@ +97efe8dfe3a6e68cfb9489c451cd16dd DateTime-Format-DBI-0.031.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 23:03:55 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Thu, 24 Jul 2008 23:03:55 GMT Subject: rpms/perl-DateTime-Format-DBI/F-9 import.log, NONE, 1.1 perl-DateTime-Format-DBI.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807242303.m6ON3til016522@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DBI/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16480 Modified Files: sources Added Files: import.log perl-DateTime-Format-DBI.spec Log Message: pseudo-branch of perl-DateTime-Format-DBI to F-9 --- NEW FILE import.log --- perl-DateTime-Format-DBI-0_031-2_fc9:HEAD:perl-DateTime-Format-DBI-0.031-2.fc9.src.rpm:1216940486 --- NEW FILE perl-DateTime-Format-DBI.spec --- Name: perl-DateTime-Format-DBI Version: 0.031 Release: 3%{?dist} Summary: Find a parser class for a database connection License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-DBI/ Source0: http://www.cpan.org/authors/id/C/CF/CFAERBER/DateTime-Format-DBI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(DateTime) >= 0.1 BuildRequires: perl(DBI) >= 1.21 BuildRequires: perl(ExtUtils::MakeMaker) # test BuildRequires: perl(Test::More) # see BZ#456357; until then... AutoProv: no Provides: perl(DateTime::Format::DBI) = %{version} %description This module finds a DateTime::Format::* class that is suitable for the use with a given DBI connection (and DBD::* driver). Note that this is most useful if you actually have the DateTime::Format::* class for your particular database(s) installed! See, e.g., perl-DateTime-MySQL, perl-DateTime-Oracle, perl-DateTime-DB2, etc. %prep %setup -q -n DateTime-Format-DBI-%{version} for i in README lib/DateTime/Format/DBI.pm ; do # correct UTF-8 wonkiness cat $i | iconv -f ISO-8859-1 -t UTF-8 > foo mv foo $i done %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes LICENSE README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Jul 24 2008 Chris Weyl 0.031-3 - bump * Tue Jul 22 2008 Chris Weyl 0.031-2 - override perl's auto-prov. see RH BZ#456357 * Wed Jul 16 2008 Chris Weyl 0.031-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DBI/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:31:12 -0000 1.1 +++ sources 24 Jul 2008 23:03:10 -0000 1.2 @@ -0,0 +1 @@ +97efe8dfe3a6e68cfb9489c451cd16dd DateTime-Format-DBI-0.031.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 23:11:11 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 24 Jul 2008 23:11:11 GMT Subject: rpms/control-center/devel gcc-libcanberra-support-8.patch, NONE, 1.1 control-center.spec, 1.382, 1.383 gcc-libcanberra-support-5.patch, 1.1, NONE Message-ID: <200807242311.m6ONBBHZ016772@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16709 Modified Files: control-center.spec Added Files: gcc-libcanberra-support-8.patch Removed Files: gcc-libcanberra-support-5.patch Log Message: * Thu Jul 24 2008 - Bastien Nocera - 2.23.5-2 - Update the libcanberra patch gcc-libcanberra-support-8.patch: --- NEW FILE gcc-libcanberra-support-8.patch --- Index: configure.in =================================================================== --- configure.in (revision 8795) +++ configure.in (working copy) @@ -244,30 +244,6 @@ AM_GCONF_SOURCE_2 dnl ============================================== -dnl Esd section -dnl ============================================== -have_esd=no -AC_ARG_ENABLE(esd, - AC_HELP_STRING([--disable-esd], - [turn off ESD audio support]), - [case "${enableval}" in - yes) WANT_ESD=yes ;; - no) WANT_ESD=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-esd) ;; - esac], - [WANT_ESD=yes]) dnl Default value - -if test x$WANT_ESD = xyes ; then - PKG_CHECK_MODULES(ESD, esound >= 0.2.28, - have_esd=yes - AC_DEFINE(HAVE_ESD, 1, [Define if ESD sound server should be used]), - AC_MSG_RESULT([disabled])) -fi - -AC_SUBST(ESD_CFLAGS) -AC_SUBST(ESD_LIBS) - -dnl ============================================== dnl GStreamer section dnl ============================================== GST_MAJORMINOR=auto @@ -302,15 +278,22 @@ AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) -if test "x$have_gstreamer" = "xyes"; then - SOUND_CAPPLET_LIBS="$ESD_LIBS $GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10" - SOUND_CAPPLET_CFLAGS="$ESD_CFLAGS $GST_CFLAGS" +dnl ============================================== +dnl sound capplet section +dnl ============================================== + +PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk gio-2.0, have_canberra=yes, AC_MSG_RESULT([no])) + +if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then + SOUND_CAPPLET_LIBS="$GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10" + SOUND_CAPPLET_CFLAGS="$GST_CFLAGS" AC_SUBST(SOUND_CAPPLET_LIBS) AC_SUBST(SOUND_CAPPLET_CFLAGS) else AC_MSG_NOTICE([*** Sound capplet will not be built]); fi + dnl ============================================== dnl Define the main variables dnl ============================================== @@ -379,7 +362,6 @@ help/Makefile libslab/Makefile libslab/libslab.pc -libsounds/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc po/Makefile.in Index: Makefile.am =================================================================== --- Makefile.am (revision 8795) +++ Makefile.am (working copy) @@ -1,4 +1,4 @@ -SUBDIRS = po libsounds libwindow-settings libslab capplets shell help +SUBDIRS = po libwindow-settings libslab capplets shell help if HAVE_TYPING_BREAK SUBDIRS += typing-break Index: capplets/sound/sound-theme-file-utils.c =================================================================== --- capplets/sound/sound-theme-file-utils.c (revision 0) +++ capplets/sound/sound-theme-file-utils.c (revision 0) @@ -0,0 +1,152 @@ +/* -*- mode: c; style: linux -*- */ +/* -*- c-basic-offset: 2 -*- */ + +/* sound-theme-file-utils.c + * Copyright (C) 2008 Bastien Nocera + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#include +#include +#include + +#define CUSTOM_THEME_NAME "__custom" + +char * +custom_theme_dir_path (const char *child) +{ + static char *dir = NULL; + const char *data_dir; + + if (dir == NULL) { + data_dir = g_get_user_data_dir (); + dir = g_build_filename (data_dir, "sounds", CUSTOM_THEME_NAME, NULL); + } + if (child == NULL) + return g_strdup (dir); + + return g_build_filename (dir, child, NULL); +} + +void +delete_custom_theme_dir (void) +{ + char *dir; + GFile *file; + + dir = custom_theme_dir_path (NULL); + file = g_file_new_for_path (dir); + g_free (dir); + /* FIXME we shouldn't be using the trash here, but it's faster/easier */ + g_file_trash (file, NULL, NULL); + g_object_unref (file); + + g_message ("deleted the custom theme dir"); +} + +static void +delete_one_file (const char *sound_name, const char *pattern) +{ + GFile *file; + char *name, *filename; + + name = g_strdup_printf (pattern, sound_name); + filename = custom_theme_dir_path (name); + g_free (name); + file = g_file_new_for_path (filename); + g_free (filename); + /* FIXME we shouldn't be using the trash here, but it's faster/easier */ + g_file_trash (file, NULL, NULL); + g_object_unref (file); +} + +void +delete_old_files (char **sounds) +{ + guint i; + + for (i = 0; sounds[i] != NULL; i++) { + delete_one_file (sounds[i], "%s.ogg"); + } +} + +void +delete_disabled_files (char **sounds) +{ + guint i; + + for (i = 0; sounds[i] != NULL; i++) + delete_one_file (sounds[i], "%s.disabled"); +} + +static void +create_one_file (GFile *file) +{ + GFileOutputStream* stream; + + stream = g_file_create (file, G_FILE_CREATE_NONE, NULL, NULL); + if (stream != NULL) { + g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, NULL); + g_object_unref (stream); + } +} + +void +add_disabled_file (char **sounds) +{ + guint i; + + for (i = 0; sounds[i] != NULL; i++) { + GFile *file; + char *name, *filename; [...1754 lines suppressed...] + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + char **sound_names; + + gtk_tree_model_get (model, iter, SOUND_NAMES_COL, &sound_names, -1); + if (sound_names != NULL) { + char *filename; + int type; + + type = get_file_type (sound_names[0], &filename); + + gtk_tree_store_set (GTK_TREE_STORE (model), iter, + SETTING_COL, type, + FILENAME_COL, filename, + -1); + g_strfreev (sound_names); + g_free (filename); + } + return FALSE; +} + +static void +treeview_row_activated (GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, + GladeXML *dialog) +{ + GtkTreeModel *model; + GtkTreeIter iter; + char **sound_names; + ca_context *ctx; + + model = gtk_tree_view_get_model (tree_view); + if (gtk_tree_model_get_iter (model, &iter, path) == FALSE) + return; + + gtk_tree_model_get (model, &iter, SOUND_NAMES_COL, &sound_names, -1); + if (sound_names == NULL) + return; + + ctx = ca_gtk_context_get (); + ca_gtk_play_for_widget (GTK_WIDGET (tree_view), 0, + CA_PROP_APPLICATION_NAME, _("Sound Preferences"), + CA_PROP_EVENT_ID, sound_names[0], + CA_PROP_EVENT_DESCRIPTION, _("Testing event sound"), + NULL); + g_strfreev (sound_names); +} + +void +setup_sound_theme_custom (GladeXML *dialog, gboolean have_xkb) +{ + GtkTreeStore *store; + GtkTreeModel *custom_model; + GtkTreeViewColumn *column; + GtkCellRenderer *renderer; + GtkTreeIter iter, parent; + GConfClient *client; + CategoryType type; + gboolean input_feedback_enabled, audible_bell_enabled; + int visual_bell_setting; + char *theme_name; + guint i; + + client = gconf_client_get_default (); + visual_bell_setting = visual_bell_gconf_to_setting (client); + + /* Set up the model for the custom view */ + store = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRV); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Display", renderer, "text", DISPLAY_COL, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("sounds_treeview")), column); + + renderer = gtk_cell_renderer_combo_new(); + g_signal_connect (renderer, "edited", G_CALLBACK (setting_column_edited), dialog); + g_signal_connect (renderer, "editing-started", G_CALLBACK (combobox_editing_started), dialog); + custom_model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT)); + fill_custom_model (GTK_LIST_STORE (custom_model)); + g_object_set (renderer, "model", custom_model, "has-entry", FALSE, "editable", TRUE, "text-column", 0, NULL); + column = gtk_tree_view_column_new_with_attributes ("Setting", renderer, "editable", EDITABLE_COL, "visible", TRUE, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("sounds_treeview")), column); + gtk_tree_view_column_set_cell_data_func (column, renderer, setting_set_func, NULL, NULL); + + gtk_tree_view_set_model (GTK_TREE_VIEW (WID ("sounds_treeview")), GTK_TREE_MODEL (store)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (WID ("sounds_treeview")), FALSE); + + g_signal_connect (G_OBJECT (WID ("sounds_treeview")), "row-activated", + G_CALLBACK (treeview_row_activated), dialog); + + /* Fill in the model */ + type = CATEGORY_INVALID; + + for (i = 0; ; i++) { + GtkTreeIter *_parent; + + if (sounds[i].category == -1) + break; + + if (sounds[i].type == SOUND_TYPE_VISUAL_BELL && have_xkb == FALSE) + continue; + + /* Is it a new type of sound? */ + if (sounds[i].category == type && type != CATEGORY_INVALID && type != CATEGORY_BELL) + _parent = &parent; + else + _parent = NULL; + + if (sounds[i].type == SOUND_TYPE_VISUAL_BELL) + gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT, + DISPLAY_COL, _(sounds[i].display_name), + SETTING_COL, visual_bell_setting, + TYPE_COL, sounds[i].type, + EDITABLE_COL, TRUE, + -1); + else if (sounds[i].type != -1) + gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT, + DISPLAY_COL, _(sounds[i].display_name), + SETTING_COL, SOUND_BUILTIN, + TYPE_COL, sounds[i].type, + SOUND_NAMES_COL, sounds[i].names, + EDITABLE_COL, TRUE, + -1); + else + /* Category */ + gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT, + DISPLAY_COL, _(sounds[i].display_name), + SETTING_COL, SOUND_UNSET, + TYPE_COL, sounds[i].type, + EDITABLE_COL, FALSE, + -1); + + /* If we didn't set a parent already, set one in case we need it later */ + if (_parent == NULL) + parent = iter; + type = sounds[i].category; + } + + gtk_tree_view_expand_all (GTK_TREE_VIEW (WID ("sounds_treeview"))); + + /* Listen to GConf for a bunch of keys */ + input_feedback_enabled = gconf_client_get_bool (client, INPUT_SOUNDS_KEY, NULL); + if (input_feedback_enabled == FALSE) + set_input_feedback_enabled (dialog, FALSE); + gconf_client_notify_add (client, INPUT_SOUNDS_KEY, + (GConfClientNotifyFunc) input_feedback_changed_cb, dialog, NULL, NULL); + + audible_bell_enabled = gconf_client_get_bool (client, AUDIO_BELL_KEY, NULL); + if (audible_bell_enabled == FALSE) + set_audible_bell_enabled (dialog, FALSE); + gconf_client_notify_add (client, AUDIO_BELL_KEY, + (GConfClientNotifyFunc) audible_bell_changed_cb, dialog, NULL, NULL); + + /* Setup the default values if we're using the custom theme */ + theme_name = gconf_client_get_string (client, SOUND_THEME_KEY, NULL); + if (theme_name != NULL && strcmp (theme_name, CUSTOM_THEME_NAME) == 0) + gtk_tree_model_foreach (GTK_TREE_MODEL (store), theme_changed_custom_init, NULL); + g_free (theme_name); + + g_object_unref (G_OBJECT (client)); +} + Index: capplets/sound/sound-theme.h =================================================================== --- capplets/sound/sound-theme.h (revision 0) +++ capplets/sound/sound-theme.h (revision 0) @@ -0,0 +1,31 @@ +/* -*- mode: c; style: linux -*- */ +/* -*- c-basic-offset: 2 -*- */ + +/* sound-theme.h + * Copyright (C) 2008 Bastien Nocera + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ +#ifndef __SOUND_THEME_HH__ +#define __SOUND_THEME_HH__ + +#include +#include + +void setup_sound_theme (GladeXML *dialog); +void setup_sound_theme_custom (GladeXML *dialog, gboolean have_xkb); + +#endif /* __SOUND_THEME_HH__ */ Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- control-center.spec 24 Jul 2008 22:01:59 -0000 1.382 +++ control-center.spec 24 Jul 2008 23:10:26 -0000 1.383 @@ -34,14 +34,8 @@ # minor build breakage in gtk, will be fixed in the next gtk release Patch8: gtkmarshal.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=539336 -# http://bugzilla.gnome.org/show_bug.cgi?id=539338 -# http://bugzilla.gnome.org/show_bug.cgi?id=539339 -# http://bugzilla.gnome.org/show_bug.cgi?id=539340 -# http://bugzilla.gnome.org/show_bug.cgi?id=539343 - # http://bugzilla.gnome.org/show_bug.cgi?id=542979 -#Patch10: gcc-libcanberra-support-5.patch +Patch10: gcc-libcanberra-support-8.patch # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.23.2-passwd.patch @@ -166,7 +160,7 @@ %patch3 -p1 -b .no-gnome-common %patch8 -p1 -b .gtkmarshal -#%patch10 -p0 -b .libcanberra +%patch10 -p0 -b .libcanberra # vendor configuration patches %patch95 -p1 -b .passwd @@ -343,6 +337,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Thu Jul 24 2008 - Bastien Nocera - 2.23.5-2 +- Update the libcanberra patch + * Thu Jul 24 2008 Soren Sandmann - 2.23.5-1 - Update the packaged files to match reality. --- gcc-libcanberra-support-5.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 23:11:44 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 24 Jul 2008 23:11:44 GMT Subject: rpms/gparted/devel .cvsignore, 1.15, 1.16 gparted.spec, 1.40, 1.41 sources, 1.15, 1.16 gparted-refresh_crash-fix.patch, 1.3, NONE run-gparted, 1.3, NONE Message-ID: <200807242311.m6ONBiR0016834@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16765 Modified Files: .cvsignore gparted.spec sources Removed Files: gparted-refresh_crash-fix.patch run-gparted Log Message: * Sun Jul 13 2008 Deji Akingunola - 0.3.8-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 30 Apr 2008 18:44:11 -0000 1.15 +++ .cvsignore 24 Jul 2008 23:10:52 -0000 1.16 @@ -1 +1 @@ -gparted-0.3.7.tar.bz2 +gparted-0.3.8.tar.bz2 Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gparted.spec 30 Apr 2008 18:44:11 -0000 1.40 +++ gparted.spec 24 Jul 2008 23:10:52 -0000 1.41 @@ -1,6 +1,6 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.3.7 +Version: 0.3.8 Release: 1%{?dist} Group: Applications/System License: GPLv2+ @@ -8,7 +8,6 @@ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Source1: gparted-console.apps Source2: gparted-pam.d -Patch0: gparted-refresh_crash-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel parted-devel BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) @@ -24,7 +23,6 @@ %prep %setup -q -%patch0 -p0 -b .refresh %build %configure @@ -40,7 +38,7 @@ --mode 0644 \ --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/%{name}.desktop -sed -i 's#sbin#bin#' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop + %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop #### consolehelper stuff mkdir -p %{buildroot}%{_bindir} @@ -77,6 +75,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Sun Jul 13 2008 Deji Akingunola - 0.3.8-1 +- New upstream version + * Wed Apr 30 2008 Deji Akingunola - 0.3.7-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 30 Apr 2008 18:44:11 -0000 1.15 +++ sources 24 Jul 2008 23:10:52 -0000 1.16 @@ -1 +1 @@ -6a96ab9b8871a58b6ca74941c30ab812 gparted-0.3.7.tar.bz2 +7c890472168b0b5e5f353b445758ab3f gparted-0.3.8.tar.bz2 --- gparted-refresh_crash-fix.patch DELETED --- --- run-gparted DELETED --- From fedora-extras-commits at redhat.com Thu Jul 24 23:13:30 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 24 Jul 2008 23:13:30 GMT Subject: rpms/control-center/devel control-center.spec,1.383,1.384 Message-ID: <200807242313.m6ONDUFc017015@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16902 Modified Files: control-center.spec Log Message: And up the release Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- control-center.spec 24 Jul 2008 23:10:26 -0000 1.383 +++ control-center.spec 24 Jul 2008 23:12:44 -0000 1.384 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops From fedora-extras-commits at redhat.com Thu Jul 24 23:19:44 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Thu, 24 Jul 2008 23:19:44 GMT Subject: rpms/perl-DateTime-Format-DBI/F-8 import.log, NONE, 1.1 perl-DateTime-Format-DBI.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807242319.m6ONJiRb017423@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-DBI/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17329 Modified Files: sources Added Files: import.log perl-DateTime-Format-DBI.spec Log Message: pseudo-branch of perl-DateTime-Format-DBI to F-8 --- NEW FILE import.log --- perl-DateTime-Format-DBI-0_031-2_fc9:HEAD:perl-DateTime-Format-DBI-0.031-2.fc9.src.rpm:1216940486 --- NEW FILE perl-DateTime-Format-DBI.spec --- Name: perl-DateTime-Format-DBI Version: 0.031 Release: 3%{?dist} Summary: Find a parser class for a database connection License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-DBI/ Source0: http://www.cpan.org/authors/id/C/CF/CFAERBER/DateTime-Format-DBI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(DateTime) >= 0.1 BuildRequires: perl(DBI) >= 1.21 BuildRequires: perl(ExtUtils::MakeMaker) # test BuildRequires: perl(Test::More) # see BZ#456357; until then... AutoProv: no Provides: perl(DateTime::Format::DBI) = %{version} %description This module finds a DateTime::Format::* class that is suitable for the use with a given DBI connection (and DBD::* driver). Note that this is most useful if you actually have the DateTime::Format::* class for your particular database(s) installed! See, e.g., perl-DateTime-MySQL, perl-DateTime-Oracle, perl-DateTime-DB2, etc. %prep %setup -q -n DateTime-Format-DBI-%{version} for i in README lib/DateTime/Format/DBI.pm ; do # correct UTF-8 wonkiness cat $i | iconv -f ISO-8859-1 -t UTF-8 > foo mv foo $i done %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes LICENSE README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Jul 24 2008 Chris Weyl 0.031-3 - bump * Tue Jul 22 2008 Chris Weyl 0.031-2 - override perl's auto-prov. see RH BZ#456357 * Wed Jul 16 2008 Chris Weyl 0.031-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-DBI/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:31:12 -0000 1.1 +++ sources 24 Jul 2008 23:18:53 -0000 1.2 @@ -0,0 +1 @@ +97efe8dfe3a6e68cfb9489c451cd16dd DateTime-Format-DBI-0.031.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 23:29:44 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 24 Jul 2008 23:29:44 GMT Subject: rpms/gparted/devel gparted.spec,1.41,1.42 Message-ID: <200807242329.m6ONTicL017895@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829 Modified Files: gparted.spec Log Message: Fix the desktop file Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gparted.spec 24 Jul 2008 23:10:52 -0000 1.41 +++ gparted.spec 24 Jul 2008 23:28:50 -0000 1.42 @@ -38,7 +38,7 @@ --mode 0644 \ --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/%{name}.desktop - %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop +sed -i 's#sbin#bin#' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop #### consolehelper stuff mkdir -p %{buildroot}%{_bindir} From fedora-extras-commits at redhat.com Thu Jul 24 23:30:23 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 24 Jul 2008 23:30:23 GMT Subject: rpms/control-center/devel control-center.spec,1.384,1.385 Message-ID: <200807242330.m6ONUN4A017996@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17876 Modified Files: control-center.spec Log Message: Don't remove the mime cache by hand, instead, don't generate it in the first place Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.384 retrieving revision 1.385 diff -u -r1.384 -r1.385 --- control-center.spec 24 Jul 2008 23:12:44 -0000 1.384 +++ control-center.spec 24 Jul 2008 23:29:38 -0000 1.385 @@ -182,6 +182,7 @@ --enable-gstreamer \ --enable-alsa \ --enable-aboutme \ + --disable-update-mimedb \ CFLAGS="$RPM_OPT_FLAGS -Wno-error" make %{?_smp_mflags} @@ -228,19 +229,6 @@ # remove useless libtool archive files find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \; -# don't package mime caches -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/XMLnamespaces -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/aliases -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/application/x-gnome-theme-package.xml -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/globs -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/globs2 -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/magic -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/subclasses -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/mime.cache -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/generic-icons -rm -f $RPM_BUILD_ROOT%{_datadir}/mime/icons -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache - %find_lang %{gettext_package} --all-name --with-gnome %clean From fedora-extras-commits at redhat.com Thu Jul 24 23:36:34 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 23:36:34 GMT Subject: rpms/libmusicbrainz3/devel import.log, NONE, 1.1 libmusicbrainz-3.0.1-gcc43.patch, NONE, 1.1 libmusicbrainz3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807242336.m6ONaYeN018479@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libmusicbrainz3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18432/devel Modified Files: .cvsignore sources Added Files: import.log libmusicbrainz-3.0.1-gcc43.patch libmusicbrainz3.spec Log Message: import --- NEW FILE import.log --- libmusicbrainz3-3_0_1-1:HEAD:libmusicbrainz3-3.0.1-1.src.rpm:1216942626 libmusicbrainz-3.0.1-gcc43.patch: --- NEW FILE libmusicbrainz-3.0.1-gcc43.patch --- diff -up libmusicbrainz-3.0.1/src/utils_private.cpp.gcc43 libmusicbrainz-3.0.1/src/utils_private.cpp --- libmusicbrainz-3.0.1/src/utils_private.cpp.gcc43 2006-09-05 03:59:44.000000000 -0500 +++ libmusicbrainz-3.0.1/src/utils_private.cpp 2008-06-15 19:33:15.000000000 -0500 @@ -22,6 +22,7 @@ #include #include +#include #include #include #include --- NEW FILE libmusicbrainz3.spec --- # Fedora package review: http://bugzilla.redhat.com/451643 Summary: Library for accessing MusicBrainz servers Name: libmusicbrainz3 Version: 3.0.1 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.musicbrainz.org/ Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: libmusicbrainz-3.0.1-gcc43.patch BuildRequires: cmake BuildRequires: neon-devel %description The MusicBrainz client library allows applications to make metadata lookup to a MusicBrainz server, generate signatures from WAV data and create CD Index Disk ids from audio CD roms. %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the headers that programmers will need to develop applications which will use %{name}. %prep %setup -q -n libmusicbrainz-%{version} %patch1 -p1 -b .gcc43 %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} .. popd make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS.txt COPYING.txt NEWS.txt README.txt %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/musicbrainz3/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %changelog * Mon Jun 16 2008 Rex Dieter 3.0.1-1 - libmusicbrainz3-3.0.1 * Sun Jun 15 2008 Rex Dieter 2.1.5-7 - Provides: libmusicbrainz2(-devel), prepare for libmusicbrainz3 * Fri Feb 22 2008 Rex Dieter 2.1.5-6 - gcc43 patch (#434127) * Mon Feb 18 2008 Fedora Release Engineering - 2.1.5-5 - Autorebuild for GCC 4.3 * Mon Feb 18 2008 Rex Dieter - 2.1.5-4 - specfile cosmetics * Thu Nov 15 2007 Rex Dieter - 2.1.5-3 - use versioned Obsoletes - drop (Build)Requires: libstdc++-devel - License: LGPLv2+ * Fri Aug 24 2007 Adam Jackson - 2.1.5-2 - Rebuild for PPC toolchain bug * Thu Jun 21 2007 - Bastien Nocera - 2.1.5-1 - Update to 2.1.5 * Mon Oct 23 2006 Matthias Clasen - 2.1.4-1 - Update to 2.1.4 * Wed Jul 12 2006 Jesse Keating - 2.1.1-4.1 - rebuild * Wed Jun 7 2006 Jeremy Katz - 2.1.1-4 - rebuild for -devel deps * Tue Apr 18 2006 Matthias Clasen - 2.1.1-3 - apply .spec file cleanups from Matthias Saou (#172926) * Fri Feb 10 2006 Jesse Keating - 2.1.1-2.1 - bump again for double-long bug on ppc(64) * Tue Feb 7 2006 Christopher Aillon - 2.1.1-2 - Stop shipping the .a file in the main package * Tue Feb 07 2006 Jesse Keating - 2.1.1-1.2 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Dec 09 2005 Jesse Keating - rebuilt * Wed Mar 23 2005 John (J5) Palmieri 2.1.1-1 - Update to upstream version 2.1.1 - Removed libmusicbrainz-2.0.2-missing-return.patch - Removed libmusicbrainz-2.0.2-conf.patch * Wed Mar 03 2005 John (J5) Palmieri 2.0.2-14 - Add patch to fix percision cast error to compile correctly on s390x * Wed Mar 03 2005 John (J5) Palmieri 2.0.2-13 - rebuild with gcc 4.0 * Mon Nov 08 2004 Colin Walters 2.0.2-12 - Add libmusicbrainz-2.0.2-missing-return.patch (bug #137289) * Thu Oct 07 2004 Colin Walters 2.0.2-11 - BuildRequire expat-devel * Tue Sep 28 2004 Colin Walters 2.0.2-10 - Move .so symlink to -devel package * Tue Aug 31 2004 Colin Walters 2.0.2-9 - Add ldconfig calls (bz #131281) * Tue Jun 15 2004 Elliot Lee - rebuilt * Tue Mar 02 2004 Elliot Lee - rebuilt * Fri Feb 13 2004 Elliot Lee - rebuilt * Thu Dec 18 2003 Brent Fox 2.0.2-6 - add a BuildPreReq for libstdc++-devel and gcc-c++ (bug #106556) - add a Requires for libstdc++-devel for libmusicbrainz-devel * Mon Sep 1 2003 Bill Nottingham - Obsoletes musicbrainz-devel too * Mon Sep 1 2003 Jonathan Blandford - Obsoletes musicbrainz * Fri Aug 22 2003 Bill Nottingham 2.0.2-5 - fix autoconf/libtool weirdness, remove exclusivearch * Fri Aug 22 2003 Brent Fox 2.0.2-4 - add ExcludeArch for s390x (something is really broken) * Fri Aug 22 2003 Brent Fox 2.0.2-3 - add ExcludeArch for ppc64 * Fri Aug 22 2003 Brent Fox 2.0.2-2 - add ExcludeArch for x86_64 for now * Thu Aug 21 2003 Brent Fox - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jun 2008 17:17:30 -0000 1.1 +++ .cvsignore 24 Jul 2008 23:35:51 -0000 1.2 @@ -0,0 +1 @@ +libmusicbrainz-3.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jun 2008 17:17:30 -0000 1.1 +++ sources 24 Jul 2008 23:35:51 -0000 1.2 @@ -0,0 +1 @@ +d42110ae548dae1eea73e83b03a1a936 libmusicbrainz-3.0.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 24 23:38:04 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 24 Jul 2008 23:38:04 GMT Subject: rpms/gnome-session/devel gerror-crash.patch, NONE, 1.1 gnome-session.spec, 1.175, 1.176 Message-ID: <200807242338.m6ONc4rh018586@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18464 Modified Files: gnome-session.spec Added Files: gerror-crash.patch Log Message: fix a crash gerror-crash.patch: --- NEW FILE gerror-crash.patch --- diff -up gnome-session-2.23.5/gnome-session/gsm-autostart-app.c.gerror-crash gnome-session-2.23.5/gnome-session/gsm-autostart-app.c --- gnome-session-2.23.5/gnome-session/gsm-autostart-app.c.gerror-crash 2008-07-24 19:31:29.000000000 -0400 +++ gnome-session-2.23.5/gnome-session/gsm-autostart-app.c 2008-07-24 19:33:00.000000000 -0400 @@ -156,6 +156,8 @@ gsm_autostart_app_set_desktop_filename ( g_debug ("GsmAutostartApp: setting desktop filename to %s", desktop_filename); + error = NULL; + if (app->priv->desktop_file != NULL) { egg_desktop_file_free (app->priv->desktop_file); app->priv->desktop_file = NULL; Index: gnome-session.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- gnome-session.spec 22 Jul 2008 04:21:07 -0000 1.175 +++ gnome-session.spec 24 Jul 2008 23:37:18 -0000 1.176 @@ -12,7 +12,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.23.5 -Release: 0.2008.07.21.3%{?dist} +Release: 0.2008.07.21.4%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -44,6 +44,8 @@ # Work around the assumption that the nautilus desktop file is nautilus.desktop Patch34: gnome-session-nautilus.patch +Patch57: gerror-crash.patch + BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -84,6 +86,7 @@ %patch13 -p1 -b .window-manager #%patch20 -p1 -b .timeout %patch34 -p1 -b .nautilus +%patch57 -p1 -b .gerror-crash %build @@ -170,6 +173,9 @@ %changelog +* Thu Jul 24 2008 Matthias Clasen - 2.23.5.0.2008.07.21.4 +- Fix a crash + * Mon Jul 22 2008 Jon McCann - 2.23.5.0.2008.07.21.3 - Add BuildRequires PolicyKit-gnome-devel From fedora-extras-commits at redhat.com Thu Jul 24 23:43:37 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 24 Jul 2008 23:43:37 GMT Subject: rpms/libmusicbrainz3/devel libmusicbrainz3.spec,1.1,1.2 Message-ID: <200807242343.m6ONhb2l018981@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libmusicbrainz3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18925 Modified Files: libmusicbrainz3.spec Log Message: * Thu Jul 24 2008 Rex Dieter 3.0.1-2 - BR: libdiscid-devel - -devel: Requires: libdiscid-devel neon-devel Index: libmusicbrainz3.spec =================================================================== RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/libmusicbrainz3.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmusicbrainz3.spec 24 Jul 2008 23:35:51 -0000 1.1 +++ libmusicbrainz3.spec 24 Jul 2008 23:42:50 -0000 1.2 @@ -4,7 +4,7 @@ Summary: Library for accessing MusicBrainz servers Name: libmusicbrainz3 Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.musicbrainz.org/ @@ -14,6 +14,7 @@ Patch1: libmusicbrainz-3.0.1-gcc43.patch BuildRequires: cmake +BuildRequires: libdiscid-devel BuildRequires: neon-devel %description @@ -26,6 +27,8 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig +# FIXME +Requires: libdiscid-devel neon-devel %description devel This package contains the headers that programmers will need to develop applications which will use %{name}. @@ -74,6 +77,10 @@ %changelog +* Thu Jul 24 2008 Rex Dieter 3.0.1-2 +- BR: libdiscid-devel +- -devel: Requires: libdiscid-devel neon-devel + * Mon Jun 16 2008 Rex Dieter 3.0.1-1 - libmusicbrainz3-3.0.1 From fedora-extras-commits at redhat.com Thu Jul 24 23:49:17 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Thu, 24 Jul 2008 23:49:17 GMT Subject: rpms/glib2/devel glib-2.17.4-gio-guess-content-sync.patch, NONE, 1.1 glib2.spec, 1.176, 1.177 Message-ID: <200807242349.m6ONnHEG019320@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19266 Modified Files: glib2.spec Added Files: glib-2.17.4-gio-guess-content-sync.patch Log Message: * Thu Jul 24 2008 David Zeuthen - 2.17.4-3 - Backport patch for g_mount_guess_content_type_sync glib-2.17.4-gio-guess-content-sync.patch: --- NEW FILE glib-2.17.4-gio-guess-content-sync.patch --- --- trunk/docs/reference/gio/gio-sections.txt 2008/07/24 01:13:33 7251 +++ trunk/docs/reference/gio/gio-sections.txt 2008/07/24 21:21:22 7252 @@ -816,6 +816,7 @@ g_mount_eject_finish g_mount_guess_content_type g_mount_guess_content_type_finish +g_mount_guess_content_type_sync G_IS_MOUNT G_MOUNT --- trunk/gio/gio.symbols 2008/07/24 01:13:33 7251 +++ trunk/gio/gio.symbols 2008/07/24 21:21:22 7252 @@ -718,6 +718,7 @@ g_mount_remount_finish g_mount_guess_content_type g_mount_guess_content_type_finish +g_mount_guess_content_type_sync #endif #endif --- trunk/gio/gmount.c 2008/07/24 01:13:33 7251 +++ trunk/gio/gmount.c 2008/07/24 21:21:22 7252 @@ -570,9 +570,10 @@ * memory cards. See the shared-mime-info * specification for more on x-content types. * - * This is an asynchronous operation, and is finished by calling - * g_mount_guess_content_type_finish() with the @mount and #GAsyncResult - * data returned in the @callback. + * This is an asynchronous operation (see + * g_mount_guess_content_type_sync() for the synchronous version), and + * is finished by calling g_mount_guess_content_type_finish() with the + * @mount and #GAsyncResult data returned in the @callback. * * Since: 2.18 */ @@ -644,6 +645,55 @@ return (* iface->guess_content_type_finish) (mount, result, error); } +/** + * g_mount_guess_content_type_sync: + * @mount: a #GMount + * @force_rescan: Whether to force a rescan of the content. + * Otherwise a cached result will be used if available + * @cancellable: optional #GCancellable object, %NULL to ignore + * @error: a #GError location to store the error occuring, or %NULL to + * ignore + * + * Tries to guess the type of content stored on @mount. Returns one or + * more textual identifiers of well-known content types (typically + * prefixed with "x-content/"), e.g. x-content/image-dcf for camera + * memory cards. See the shared-mime-info + * specification for more on x-content types. + * + * This is an synchronous operation and as such may block doing IO; + * see g_mount_guess_content_type() for the asynchronous version. + * + * Returns: a %NULL-terminated array of content types or %NULL on error. + * Caller should free this array with g_strfreev() when done with it. + * + * Since: 2.18 + */ +char ** +g_mount_guess_content_type_sync (GMount *mount, + gboolean force_rescan, + GCancellable *cancellable, + GError **error) +{ + GMountIface *iface; + + g_return_val_if_fail (G_IS_MOUNT (mount), NULL); + + iface = G_MOUNT_GET_IFACE (mount); + + if (iface->guess_content_type_sync == NULL) + { + g_set_error_literal (error, + G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + /* Translators: This is an error + * message for mount objects that + * don't implement content type guessing. */ + _("mount doesn't implement synchronous content type guessing")); + + return NULL; + } + + return (* iface->guess_content_type_sync) (mount, force_rescan, cancellable, error); +} #define __G_MOUNT_C__ #include "gioaliasdef.c" --- trunk/gio/gmount.h 2008/07/24 01:13:33 7251 +++ trunk/gio/gmount.h 2008/07/24 21:21:22 7252 @@ -119,6 +119,11 @@ gchar ** (*guess_content_type_finish) (GMount *mount, GAsyncResult *result, GError **error); + + gchar ** (*guess_content_type_sync) (GMount *mount, + gboolean force_rescan, + GCancellable *cancellable, + GError **error); }; GType g_mount_get_type (void) G_GNUC_CONST; @@ -166,6 +171,11 @@ GAsyncResult *result, GError **error); +gchar ** g_mount_guess_content_type_sync (GMount *mount, + gboolean force_rescan, + GCancellable *cancellable, + GError **error); + G_END_DECLS #endif /* __G_MOUNT_H__ */ --- trunk/configure.in 2008/07/21 17:56:17 7234 +++ trunk/configure.in 2008/07/21 18:07:55 7236 @@ -23,7 +23,7 @@ # m4_define([glib_major_version], [2]) m4_define([glib_minor_version], [17]) -m4_define([glib_micro_version], [4]) +m4_define([glib_micro_version], [5]) m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) Index: glib2.spec =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- glib2.spec 21 Jul 2008 22:34:37 -0000 1.176 +++ glib2.spec 24 Jul 2008 23:48:32 -0000 1.177 @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.17.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -28,6 +28,10 @@ # fixed in svn Patch4: statfs-check.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=544599 (upstream) + +# bump version to 2.17.5 since gvfs will require this version +Patch5: glib-2.17.4-gio-guess-content-sync.patch + %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure @@ -62,6 +66,7 @@ %patch2 -p1 -b .only-pass-uri-to-gio-apps %patch3 -p0 -b .selinux %patch4 -p1 -b .statfs-check +%patch5 -p1 -b .guess-content-type-sync %build %configure --disable-gtk-doc --enable-static @@ -136,6 +141,9 @@ %{_libdir}/lib*.a %changelog +* Thu Jul 24 2008 David Zeuthen - 2.17.4-3 +- Backport patch for g_mount_guess_content_type_sync + * Mon Jul 21 2008 Matthias Clasen - 2.17.4-2 - Fix statfs configure check From fedora-extras-commits at redhat.com Thu Jul 24 23:53:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:34 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235335.2FCF51AD0E5@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchbugzilla acl on bacula (Fedora 9) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:35 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235335.B72401AD0EC@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchcommits acl on bacula (Fedora 9) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:42 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235342.D3B0A1AD0E0@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchcommits acl on bacula (Fedora 8) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:38 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235339.C0B4C1AD0F3@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the commit acl on bacula (Fedora 9) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:42 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235343.C1A711AD0E3@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the commit acl on bacula (Fedora 8) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:46 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235346.DEB2A1AD104@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchbugzilla acl on bacula (Fedora 8) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:54 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235354.90E2E1AD0EB@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchbugzilla acl on bacula (Fedora devel) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:55 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235355.7889C1AD109@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the watchcommits acl on bacula (Fedora devel) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:53:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 24 Jul 2008 23:53:55 +0000 Subject: [pkgdb] bacula had acl change status Message-ID: <20080724235355.D3C951AD10E@bastion.fedora.phx.redhat.com> Mike McGrath (mmcgrath) has set the commit acl on bacula (Fedora devel) to Approved for Jon Ciesla (limb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Thu Jul 24 23:59:02 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 24 Jul 2008 23:59:02 GMT Subject: rpms/libgnome/devel libgnome-2.23.4-sound-theme-xsettings.patch, NONE, 1.1 libgnome.spec, 1.120, 1.121 libgnome-2.19.1-default-esd.patch, 1.1, NONE Message-ID: <200807242359.m6ONx2at019706@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/libgnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590 Modified Files: libgnome.spec Added Files: libgnome-2.23.4-sound-theme-xsettings.patch Removed Files: libgnome-2.19.1-default-esd.patch Log Message: * Fri Jul 25 2008 - Bastien Nocera - 2.23.4-2 - Remove the "esound by default" patch, it's obsoleted by changes in gnome-settings-daemon - Add patch to support the new sound theme XSettings libgnome-2.23.4-sound-theme-xsettings.patch: --- NEW FILE libgnome-2.23.4-sound-theme-xsettings.patch --- --- trunk/schemas/desktop_gnome_sound.schemas.in 2007/01/10 14:13:28 3330 +++ trunk/schemas/desktop_gnome_sound.schemas.in 2008/07/22 11:01:48 3756 @@ -46,5 +46,27 @@ Whether to play sounds on user events. + + /schemas/desktop/gnome/sound/theme_name + /desktop/gnome/sound/theme_name + gnome + string + freedesktop + + Sound theme name + The XDG sound theme to use for event sounds. + + + + /schemas/desktop/gnome/sound/input_feedback_sounds + /desktop/gnome/sound/input_feedback_sounds + gnome + bool + false + + Input feedback sounds + Whether to play sounds on input events. + + Index: libgnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- libgnome.spec 18 Jun 2008 02:41:14 -0000 1.120 +++ libgnome.spec 24 Jul 2008 23:58:07 -0000 1.121 @@ -13,7 +13,7 @@ Summary: GNOME base library Name: libgnome Version: 2.23.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/libgnome/2.23/%{name}-%{version}.tar.bz2 Source1: desktop_gnome_peripherals_monitor.schemas @@ -59,12 +59,13 @@ Patch3: libgnome-2.7.2-default-cursor.patch Patch4: libgnome-2.8.0-default-browser.patch Patch6: libgnome-2.19.1-default-settings.patch -Patch7: libgnome-2.19.1-default-esd.patch -Patch8: libgnome-2.22.0-default-sound-effects.patch +Patch7: libgnome-2.22.0-default-sound-effects.patch # backport from upstream svn -Patch9: im-setting.patch +Patch8: im-setting.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=541420 +Patch9: libgnome-2.23.4-sound-theme-xsettings.patch %description @@ -115,9 +116,9 @@ %patch3 -p1 -b .default-cursor %patch4 -p1 -b .default-browser %patch6 -p1 -b .default-settings -%patch7 -p1 -b .default-esd -%patch8 -p1 -b .default-sound-effects -%patch9 -p1 -b .im-setting +%patch7 -p1 -b .default-sound-effects +%patch8 -p1 -b .im-setting +%patch9 -p1 -b .sound-theme %build aclocal @@ -198,6 +199,11 @@ %{_datadir}/gtk-doc/html/* %changelog +* Fri Jul 25 2008 - Bastien Nocera - 2.23.4-2 +- Remove the "esound by default" patch, it's obsoleted by + changes in gnome-settings-daemon +- Add patch to support the new sound theme XSettings + * Tue Jun 17 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 --- libgnome-2.19.1-default-esd.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 00:05:54 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Fri, 25 Jul 2008 00:05:54 GMT Subject: rpms/glib2/devel glib2.spec,1.177,1.178 Message-ID: <200807250005.m6P05sjV026631@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26603 Modified Files: glib2.spec Log Message: * Thu Jul 24 2008 David Zeuthen - 2.17.4-4 - autoreconf Index: glib2.spec =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- glib2.spec 24 Jul 2008 23:48:32 -0000 1.177 +++ glib2.spec 25 Jul 2008 00:05:08 -0000 1.178 @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.17.4 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -30,7 +30,10 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=544599 (upstream) + # bump version to 2.17.5 since gvfs will require this version +# Patch5: glib-2.17.4-gio-guess-content-sync.patch +# this patch requires autoreconf +BuildRequires: autoconf automake libtool gettext-devel %description GLib is the low-level core library that forms the basis @@ -69,6 +72,7 @@ %patch5 -p1 -b .guess-content-type-sync %build +autoreconf %configure --disable-gtk-doc --enable-static make %{?_smp_mflags} @@ -141,6 +145,9 @@ %{_libdir}/lib*.a %changelog +* Thu Jul 24 2008 David Zeuthen - 2.17.4-4 +- autoreconf + * Thu Jul 24 2008 David Zeuthen - 2.17.4-3 - Backport patch for g_mount_guess_content_type_sync From fedora-extras-commits at redhat.com Fri Jul 25 00:12:37 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 25 Jul 2008 00:12:37 GMT Subject: rpms/control-center/devel control-center.spec, 1.385, 1.386 gcc-libcanberra-support-8.patch, 1.1, 1.2 Message-ID: <200807250012.m6P0CbsP026790@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26754 Modified Files: control-center.spec gcc-libcanberra-support-8.patch Log Message: * Fri Jul 25 2008 - Bastien Nocera - 2.23.5-3 - Remove testing hack Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- control-center.spec 24 Jul 2008 23:29:38 -0000 1.385 +++ control-center.spec 25 Jul 2008 00:11:51 -0000 1.386 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -325,6 +325,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Fri Jul 25 2008 - Bastien Nocera - 2.23.5-3 +- Remove testing hack + * Thu Jul 24 2008 - Bastien Nocera - 2.23.5-2 - Update the libcanberra patch gcc-libcanberra-support-8.patch: Index: gcc-libcanberra-support-8.patch =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/gcc-libcanberra-support-8.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-libcanberra-support-8.patch 24 Jul 2008 23:10:26 -0000 1.1 +++ gcc-libcanberra-support-8.patch 25 Jul 2008 00:11:51 -0000 1.2 @@ -422,16 +422,6 @@ COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/event_sounds", "/sound/system/settings/event_sounds=false"); g_object_unref (G_OBJECT (client)); } -@@ -1203,6 +1121,9 @@ - capplet_set_icon (dialog_win, "gnome-sound-properties"); - gtk_widget_show (dialog_win); - -+ //FIXME to remove -+ gtk_notebook_set_current_page (GTK_NOTEBOOK(WID("prefs_widget")), 1); -+ - gtk_main (); - gconf_change_set_unref (changeset); - g_object_unref (dialog); Index: capplets/sound/sound-theme-file-utils.h =================================================================== --- capplets/sound/sound-theme-file-utils.h (revision 0) From fedora-extras-commits at redhat.com Fri Jul 25 00:17:21 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Fri, 25 Jul 2008 00:17:21 GMT Subject: rpms/glib2/devel glib-2.17.4-gio-guess-content-sync.patch, 1.1, 1.2 glib2.spec, 1.178, 1.179 Message-ID: <200807250017.m6P0HLDn026997@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26956 Modified Files: glib-2.17.4-gio-guess-content-sync.patch glib2.spec Log Message: * Thu Jul 24 2008 David Zeuthen - 2.17.4-5 - rebuild glib-2.17.4-gio-guess-content-sync.patch: Index: glib-2.17.4-gio-guess-content-sync.patch =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/glib-2.17.4-gio-guess-content-sync.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glib-2.17.4-gio-guess-content-sync.patch 24 Jul 2008 23:48:32 -0000 1.1 +++ glib-2.17.4-gio-guess-content-sync.patch 25 Jul 2008 00:16:36 -0000 1.2 @@ -127,3 +127,13 @@ m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) +--- trunk/tests/Makefile.am 2008/07/20 02:09:05 7209 ++++ trunk/tests/Makefile.am 2008/07/23 16:22:32 7243 +@@ -186,7 +186,6 @@ + module_test_LDFLAGS = $(G_MODULE_LDFLAGS) + node_test_LDADD = $(progs_ldadd) + onceinit_LDADD = $(thread_ldadd) +-option_test_LDADD = $(progs_ldadd) + printf_test_LDADD = $(progs_ldadd) + queue_test_LDADD = $(progs_ldadd) + asyncqueue_test_LDADD = $(thread_ldadd) Index: glib2.spec =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- glib2.spec 25 Jul 2008 00:05:08 -0000 1.178 +++ glib2.spec 25 Jul 2008 00:16:36 -0000 1.179 @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.17.4 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -33,7 +33,7 @@ # Patch5: glib-2.17.4-gio-guess-content-sync.patch # this patch requires autoreconf -BuildRequires: autoconf automake libtool gettext-devel +BuildRequires: autoconf automake libtool gettext-devel gtk-doc %description GLib is the low-level core library that forms the basis @@ -145,6 +145,9 @@ %{_libdir}/lib*.a %changelog +* Thu Jul 24 2008 David Zeuthen - 2.17.4-5 +- rebuild + * Thu Jul 24 2008 David Zeuthen - 2.17.4-4 - autoreconf From fedora-extras-commits at redhat.com Fri Jul 25 01:22:04 2008 From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel)) Date: Fri, 25 Jul 2008 01:22:04 GMT Subject: rpms/dhcp/devel dhcp-4.0.0-O_CLOEXEC.patch, NONE, 1.1 dhcp.spec, 1.210, 1.211 linux, 1.13, 1.14 Message-ID: <200807250122.m6P1M46Z002956@cvs-int.fedora.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2904 Modified Files: dhcp.spec linux Added Files: dhcp-4.0.0-O_CLOEXEC.patch Log Message: * Thu Jul 24 2008 David Cantrell - 12:4.0.0-17 - Carry over RES_OPTIONS from ifcfg-ethX files to /etc/resolv.conf (#202923) - Clean up Requires tags for devel packages dhcp-4.0.0-O_CLOEXEC.patch: --- NEW FILE dhcp-4.0.0-O_CLOEXEC.patch --- diff -up dhcp-4.0.0//client/clparse.c.cloexec dhcp-4.0.0//client/clparse.c --- dhcp-4.0.0//client/clparse.c.cloexec 2008-07-01 15:36:54.000000000 -1000 +++ dhcp-4.0.0//client/clparse.c 2008-07-01 17:02:38.000000000 -1000 @@ -221,7 +221,7 @@ int read_client_conf_file (const char *n int token; isc_result_t status; - if ((file = open (name, O_RDONLY)) < 0) + if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0) return uerr2isc (errno); cfile = (struct parse *)0; @@ -258,7 +258,7 @@ void read_client_leases () /* Open the lease file. If we can't open it, just return - we can safely trust the server to remember our state. */ - if ((file = open (path_dhclient_db, O_RDONLY)) < 0) + if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0) return; cfile = (struct parse *)0; /* new_parse() may fail if the file is of zero length. */ diff -up dhcp-4.0.0//client/dhclient.c.cloexec dhcp-4.0.0//client/dhclient.c --- dhcp-4.0.0//client/dhclient.c.cloexec 2008-07-01 15:36:54.000000000 -1000 +++ dhcp-4.0.0//client/dhclient.c 2008-07-01 17:22:06.000000000 -1000 @@ -162,11 +162,11 @@ int main(int argc, char **argv, char **e /* Make sure that file descriptors 0 (stdin), 1, (stdout), and 2 (stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ - fd = open("/dev/null", O_RDWR); + fd = open("/dev/null", O_RDWR | O_CLOEXEC); if (fd == 0) - fd = open("/dev/null", O_RDWR); + fd = open("/dev/null", O_RDWR | O_CLOEXEC); if (fd == 1) - fd = open("/dev/null", O_RDWR); + fd = open("/dev/null", O_RDWR | O_CLOEXEC); if (fd == 2) log_perror = 0; /* No sense logging to /dev/null. */ else if (fd != -1) @@ -442,6 +442,19 @@ int main(int argc, char **argv, char **e oldpid = 0; if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) { + int fn = fileno(pidfd); + int flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } + } + e = fscanf(pidfd, "%ld\n", &temp); oldpid = (pid_t)temp; @@ -484,6 +497,19 @@ int main(int argc, char **argv, char **e sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name); if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) { + int fn = fileno(pidfd); + int flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } + } + e = fscanf(pidfd, "%ld\n", &temp); oldpid = (pid_t)temp; @@ -509,6 +535,19 @@ int main(int argc, char **argv, char **e char procfn[256] = ""; if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) { + int fn = fileno(pidfd); + int flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } + } + if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) { snprintf(procfn,256,"/proc/%u",dhcpid); dhc_running = (access(procfn, F_OK) == 0); @@ -2896,6 +2935,7 @@ int leases_written = 0; void rewrite_client_leases () { + int fn, flags; struct interface_info *ip; struct client_state *client; struct client_lease *lp; @@ -2908,9 +2948,17 @@ void rewrite_client_leases () return; } - if (fcntl(leaseFile, F_SETFD, FD_CLOEXEC) == -1) { - log_error ("failed to set close-on-exec for %s", path_dhclient_db); - return; + fn = fileno(leaseFile); + flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } } /* If there is a default duid, write it out. */ @@ -3005,20 +3053,30 @@ static isc_result_t write_duid(struct data_string *duid) { char *str; - int stat; + int stat, fn, flags; if ((duid == NULL) || (duid->len <= 2)) return ISC_R_INVALIDARG; if (leaseFile == NULL) { /* XXX? */ leaseFile = fopen(path_dhclient_db, "w"); + if (leaseFile == NULL) { log_error("can't create %s: %m", path_dhclient_db); return ISC_R_IOERROR; } - if (fcntl(leaseFile, F_SETFD, FD_CLOEXEC) == -1) { - log_error ("failed to set close-on-exec for %s", path_dhclient_db); - return ISC_R_IOERROR; + + fn = fileno(leaseFile); + flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } } } @@ -3049,7 +3107,7 @@ write_client6_lease(struct client_state { struct dhc6_ia *ia; struct dhc6_addr *addr; - int stat; + int stat, fn, flags; /* This should include the current lease. */ if (!rewrite && (leases_written++ > 20)) { @@ -3063,13 +3121,23 @@ write_client6_lease(struct client_state if (leaseFile == NULL) { /* XXX? */ leaseFile = fopen(path_dhclient_db, "w"); + if (leaseFile == NULL) { log_error("can't create %s: %m", path_dhclient_db); return ISC_R_IOERROR; } - if (fcntl(leaseFile, F_SETFD, FD_CLOEXEC) == -1) { - log_error ("failed to set close-on-exec for %s", path_dhclient_db); - return ISC_R_IOERROR; + + fn = fileno(leaseFile); + flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } } } @@ -3152,7 +3220,7 @@ int write_client_lease (client, lease, r int makesure; { struct data_string ds; - int errors = 0; + int errors = 0, fn, flags; char *s; const char *tval; @@ -3170,13 +3238,23 @@ int write_client_lease (client, lease, r if (leaseFile == NULL) { /* XXX */ leaseFile = fopen (path_dhclient_db, "w"); + if (leaseFile == NULL) { log_error ("can't create %s: %m", path_dhclient_db); return 0; } - if (fcntl(leaseFile, F_SETFD, FD_CLOEXEC) == -1) { - log_error ("failed to set close-on-exec for %s", path_dhclient_db); - return ISC_R_IOERROR; + + fn = fileno(leaseFile); + flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } } } @@ -3675,9 +3753,9 @@ void go_daemon () close(2); /* Reopen them on /dev/null. */ - open("/dev/null", O_RDWR); - open("/dev/null", O_RDWR); - open("/dev/null", O_RDWR); + open("/dev/null", O_RDWR | O_CLOEXEC); + open("/dev/null", O_RDWR | O_CLOEXEC); + open("/dev/null", O_RDWR | O_CLOEXEC); write_client_pid_file (); @@ -3689,7 +3767,7 @@ void write_client_pid_file () FILE *pf; int pfdesc; - pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644); + pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644); if (pfdesc < 0) { log_error ("Can't create %s: %m", path_dhclient_pid); diff -up dhcp-4.0.0//common/bpf.c.cloexec dhcp-4.0.0//common/bpf.c --- dhcp-4.0.0//common/bpf.c.cloexec 2008-07-01 15:36:54.000000000 -1000 +++ dhcp-4.0.0//common/bpf.c 2008-07-01 17:23:40.000000000 -1000 @@ -94,7 +94,7 @@ int if_register_bpf (info) for (b = 0; 1; b++) { /* %Audit% 31 bytes max. %2004.06.17,Safe% */ sprintf(filename, BPF_FORMAT, b); - sock = open (filename, O_RDWR, 0); + sock = open (filename, O_RDWR | O_CLOEXEC, 0); if (sock < 0) { if (errno == EBUSY) { continue; diff -up dhcp-4.0.0//common/discover.c.cloexec dhcp-4.0.0//common/discover.c --- dhcp-4.0.0//common/discover.c.cloexec 2008-07-01 15:36:54.000000000 -1000 +++ dhcp-4.0.0//common/discover.c 2008-07-01 17:26:03.000000000 -1000 @@ -387,6 +387,8 @@ begin_iface_scan(struct iface_conf_list char buf[256]; int len; int i; + int fn; + int flags; ifaces->fp = fopen("/proc/net/dev", "r"); if (ifaces->fp == NULL) { @@ -394,6 +396,19 @@ begin_iface_scan(struct iface_conf_list return 0; } + fn = fileno(ifaces->fp); + flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } + } + /* * The first 2 lines are header information, so read and ignore them. */ @@ -432,6 +447,19 @@ begin_iface_scan(struct iface_conf_list ifaces->fp = NULL; return 0; } + + int fn = fileno(ifaces->fp6); + int flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } + } #endif return 1; diff -up dhcp-4.0.0//common/dlpi.c.cloexec dhcp-4.0.0//common/dlpi.c --- dhcp-4.0.0//common/dlpi.c.cloexec 2008-07-01 15:36:54.000000000 -1000 +++ dhcp-4.0.0//common/dlpi.c 2008-07-01 17:26:31.000000000 -1000 @@ -795,7 +795,7 @@ dlpiopen(const char *ifname) { } *dp = '\0'; - return open (devname, O_RDWR, 0); + return open (devname, O_RDWR | O_CLOEXEC, 0); } /* diff -up dhcp-4.0.0//common/nit.c.cloexec dhcp-4.0.0//common/nit.c --- dhcp-4.0.0//common/nit.c.cloexec 2008-07-01 15:36:54.000000000 -1000 +++ dhcp-4.0.0//common/nit.c 2008-07-01 17:26:41.000000000 -1000 @@ -81,7 +81,7 @@ int if_register_nit (info) struct strioctl sio; /* Open a NIT device */ - sock = open ("/dev/nit", O_RDWR); + sock = open ("/dev/nit", O_RDWR | O_CLOEXEC); if (sock < 0) log_fatal ("Can't open NIT device for %s: %m", info -> name); diff -up dhcp-4.0.0//common/resolv.c.cloexec dhcp-4.0.0//common/resolv.c --- dhcp-4.0.0//common/resolv.c.cloexec 2007-11-30 11:51:43.000000000 -1000 +++ dhcp-4.0.0//common/resolv.c 2008-07-01 17:26:54.000000000 -1000 @@ -48,7 +48,7 @@ void read_resolv_conf (parse_time) struct name_server *sp, *sl, *ns; struct domain_search_list *dp, *dl, *nd; - if ((file = open (path_resolv_conf, O_RDONLY)) < 0) { + if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) { log_error ("Can't open %s: %m", path_resolv_conf); return; } diff -up dhcp-4.0.0//common/upf.c.cloexec dhcp-4.0.0//common/upf.c --- dhcp-4.0.0//common/upf.c.cloexec 2008-07-01 15:36:54.000000000 -1000 +++ dhcp-4.0.0//common/upf.c 2008-07-01 17:27:04.000000000 -1000 @@ -77,7 +77,7 @@ int if_register_upf (info) /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */ sprintf(filename, "/dev/pf/pfilt%d", b); - sock = open (filename, O_RDWR, 0); + sock = open (filename, O_RDWR | O_CLOEXEC, 0); if (sock < 0) { if (errno == EBUSY) { continue; diff -up dhcp-4.0.0//dst/dst_support.c.cloexec dhcp-4.0.0//dst/dst_support.c --- dhcp-4.0.0//dst/dst_support.c.cloexec 2007-12-05 14:50:22.000000000 -1000 +++ dhcp-4.0.0//dst/dst_support.c 2008-07-01 17:31:47.000000000 -1000 @@ -426,6 +426,8 @@ dst_s_fopen(const char *filename, const FILE *fp; char pathname[PATH_MAX]; unsigned plen = sizeof(pathname); + int fn; + int flags; if (*dst_path != '\0') { strcpy(pathname, dst_path); @@ -442,6 +444,15 @@ dst_s_fopen(const char *filename, const fp = fopen(pathname, mode); if (perm) chmod(pathname, perm); + + fn = fileno(fp); + flags = fcntl(fn, F_GETFD); + + if (flags != -1) { + flags |= FD_CLOEXEC; + flags = fcntl(fn, F_SETFD, flags); + } + return (fp); } diff -up dhcp-4.0.0//dst/prandom.c.cloexec dhcp-4.0.0//dst/prandom.c --- dhcp-4.0.0//dst/prandom.c.cloexec 2007-11-30 11:51:43.000000000 -1000 +++ dhcp-4.0.0//dst/prandom.c 2008-07-01 17:35:55.000000000 -1000 @@ -267,7 +267,7 @@ get_dev_random(u_char *output, unsigned s = stat("/dev/random", &st); if (s == 0 && S_ISCHR(st.st_mode)) { - if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK)) != -1) { + if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC)) != -1) { if ((n = read(fd, output, size)) < 0) n = 0; close(fd); @@ -480,6 +480,12 @@ digest_file(dst_work *work) } if ((fp = fopen(name, "r")) == NULL) return (0); + int fn = fileno(fp); + int flags = fcntl(fn, F_GETFD); + if (flags != -1) { + flags |= FD_CLOEXEC; + flags = fcntl(fn, F_SETFD, flags); + } for (no = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), fp)) > 0; no += i) dst_sign_data(SIG_MODE_UPDATE, work->file_digest, &ctx, diff -up dhcp-4.0.0//minires/res_init.c.cloexec dhcp-4.0.0//minires/res_init.c --- dhcp-4.0.0//minires/res_init.c.cloexec 2007-10-01 04:47:35.000000000 -1000 +++ dhcp-4.0.0//minires/res_init.c 2008-07-01 17:44:26.000000000 -1000 @@ -235,6 +235,14 @@ minires_vinit(res_state statp, int prein line[sizeof(name) - 1] == '\t')) if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) { + int fn = fileno(fp); + int flags = fcntl(fn, F_GETFD); + + if (flags != -1) { + flags |= FD_CLOEXEC; + flags = fcntl(fn, F_SETFD, flags); + } + /* read the config file */ while (fgets(buf, sizeof(buf), fp) != NULL) { /* skip comments */ diff -up dhcp-4.0.0//minires/res_query.c.cloexec dhcp-4.0.0//minires/res_query.c --- dhcp-4.0.0//minires/res_query.c.cloexec 2007-09-05 07:32:10.000000000 -1000 +++ dhcp-4.0.0//minires/res_query.c 2008-07-01 17:46:04.000000000 -1000 @@ -387,12 +387,19 @@ res_hostalias(const res_state statp, con unsigned char *cp1, *cp2; char buf[BUFSIZ]; FILE *fp; + int fn, flags; if (statp->options & RES_NOALIASES) return (NULL); file = getenv("HOSTALIASES"); if (file == NULL || (fp = fopen(file, "r")) == NULL) return (NULL); + fn = fileno(fp); + flags = fcntl(fn, F_GETFD); + if (flags != -1) { + flags |= FD_CLOEXEC; + flags = fcntl(fn, F_SETFD, flags); + } setbuf(fp, NULL); buf[sizeof(buf) - 1] = '\0'; while (fgets(buf, sizeof(buf), fp)) { diff -up dhcp-4.0.0//omapip/trace.c.cloexec dhcp-4.0.0//omapip/trace.c --- dhcp-4.0.0//omapip/trace.c.cloexec 2007-07-12 20:43:42.000000000 -1000 +++ dhcp-4.0.0//omapip/trace.c 2008-07-01 17:29:46.000000000 -1000 @@ -140,10 +140,10 @@ isc_result_t trace_begin (const char *fi return ISC_R_INVALIDARG; } - traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600); + traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600); if (traceoutfile < 0 && errno == EEXIST) { log_error ("WARNING: Overwriting trace file \"%s\"", filename); - traceoutfile = open (filename, O_WRONLY | O_EXCL, 0600); + traceoutfile = open (filename, O_WRONLY | O_EXCL | O_CLOEXEC, 0600); } if (traceoutfile < 0) { @@ -428,12 +428,28 @@ void trace_file_replay (const char *file trace_type_t *ttype = (trace_type_t *)0; isc_result_t result; int len; + int fn; + int flags; traceinfile = fopen (filename, "r"); if (!traceinfile) { log_error ("Can't open tracefile %s: %m", filename); return; } + + fn = fileno(traceinfile); + flags = fcntl(fn, F_GETFD); + + if (flags == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } else { + flags |= FD_CLOEXEC; + + if (fcntl(fn, F_SETFD, flags) == -1) { + log_error("%s (%d): %s\n", __func__, __LINE__, strerror(errno)); + } + } + #if defined (HAVE_SETFD) if (fcntl (fileno (traceinfile), F_SETFD, 1) < 0) log_error ("Can't set close-on-exec on %s: %m", filename); Index: dhcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- dhcp.spec 21 Jun 2008 20:14:17 -0000 1.210 +++ dhcp.spec 25 Jul 2008 01:21:14 -0000 1.211 @@ -4,7 +4,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 4.0.0 -Release: 16%{?dist} +Release: 17%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -45,6 +45,7 @@ Patch16: %{name}-4.0.0-NetworkManager-crash.patch Patch17: %{name}-4.0.0-selinux.patch Patch18: %{name}-4.0.0-libdhcp4client.patch +Patch19: %{name}-4.0.0-O_CLOEXEC.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -91,6 +92,7 @@ %package devel Summary: Development headers and libraries for interfacing to the DHCP server Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} %description devel Header files and API documentation for using the ISC DHCP libraries. The @@ -194,6 +196,9 @@ # Add the libdhcp4client target (library version of dhclient) %patch18 -p1 +# Make sure all open file descriptors are closed-on-exec for SELinux +%patch19 -p1 + # Copy in documentation and example scripts for LDAP patch to dhcpd %{__install} -p -m 0644 %{SOURCE5} . %{__install} -p -m 0644 %{SOURCE6} doc/ @@ -422,6 +427,10 @@ %{_libdir}/libdhcp4client.so %changelog +* Thu Jul 24 2008 David Cantrell - 12:4.0.0-17 +- Carry over RES_OPTIONS from ifcfg-ethX files to /etc/resolv.conf (#202923) +- Clean up Requires tags for devel packages + * Sat Jun 21 2008 David Cantrell - 12:4.0.0-16 - Remove instaces of \032 in domain search option (#450042) - Make 'service dhcpd configtest' display text indicating the status Index: linux =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/linux,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux 21 Jun 2008 20:14:17 -0000 1.13 +++ linux 25 Jul 2008 01:21:14 -0000 1.14 @@ -55,6 +55,10 @@ fi fi + if [ -n "$RES_OPTIONS" ]; then + echo options $RES_OPTIONS >> $rscf + fi + for nameserver in $new_domain_name_servers; do echo nameserver $nameserver >> $rscf done From fedora-extras-commits at redhat.com Fri Jul 25 01:21:55 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 25 Jul 2008 01:21:55 GMT Subject: rpms/crossfire-client/devel .cvsignore, 1.4, 1.5 crossfire-client.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807250121.m6P1Lt32002945@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2891 Modified Files: .cvsignore crossfire-client.spec sources Log Message: Update to 1.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 May 2007 00:02:42 -0000 1.4 +++ .cvsignore 25 Jul 2008 01:21:06 -0000 1.5 @@ -1 +1 @@ -crossfire-client-1.10.0.tar.gz +crossfire-client-1.11.0.tar.gz Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/crossfire-client.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- crossfire-client.spec 9 Feb 2008 20:38:54 -0000 1.9 +++ crossfire-client.spec 25 Jul 2008 01:21:06 -0000 1.10 @@ -1,13 +1,13 @@ Name: crossfire-client -Version: 1.10.0 -Release: 4%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPLv2+ URL: http://crossfire.real-time.com Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz BuildRequires: SDL-devel SDL_image-devel -BuildRequires: gtk+-devel gtk2-devel libpng-devel +BuildRequires: gtk+-devel gtk2-devel libpng-devel curl-devel BuildRequires: desktop-file-utils ImageMagick # Disabled sound for Fedora until it's working again #BuildRequires: alsa-lib-devel @@ -108,6 +108,9 @@ %changelog +* Thu Jul 24 2008 Wart 1.11.0-1 +- Update to 1.11.0 + * Sat Feb 9 2008 Wart 1.10.0-4 - Rebuild for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 May 2007 00:02:42 -0000 1.4 +++ sources 25 Jul 2008 01:21:06 -0000 1.5 @@ -1 +1 @@ -883296ef199cbf47334d52d8b5d61886 crossfire-client-1.10.0.tar.gz +7c47046067bb0bada9951e61d0d2980b crossfire-client-1.11.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 01:23:55 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 25 Jul 2008 01:23:55 GMT Subject: rpms/crossfire-client/devel crossfire-1.9.1-menusegfault.patch, 1.1, NONE Message-ID: <200807250123.m6P1Ntjx003157@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3143 Removed Files: crossfire-1.9.1-menusegfault.patch Log Message: Remove unused patch --- crossfire-1.9.1-menusegfault.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 01:36:32 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 25 Jul 2008 01:36:32 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.194, 1.195 selinux-policy.spec, 1.697, 1.698 Message-ID: <200807250136.m6P1aW9B003460@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3428 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Thu Jul 24 2008 Dan Walsh 3.3.1-80 - Allow system_crond_t to restart init scripts - Allow dnsmasq to bind to any udp port - Change dhclient to be able to red networkmanager_var_run policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- policy-20071130.patch 21 Jul 2008 00:50:59 -0000 1.194 +++ policy-20071130.patch 25 Jul 2008 01:35:46 -0000 1.195 @@ -2006,7 +2006,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.3.1/policy/modules/admin/kismet.te --- nsaserefpolicy/policy/modules/admin/kismet.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/admin/kismet.te 2008-07-15 14:02:51.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/admin/kismet.te 2008-07-24 13:59:46.000000000 -0400 @@ -0,0 +1,56 @@ + +policy_module(kismet,1.0.0) @@ -2035,7 +2035,7 @@ +# kismet local policy +# + -+allow kismet_t self:capability { net_admin setuid setgid }; ++allow kismet_t self:capability { net_admin net_raw setuid setgid }; + +corecmd_exec_bin(kismet_t) + @@ -2142,8 +2142,14 @@ init_domtrans_script(logrotate_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.3.1/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/logwatch.te 2008-07-15 14:02:51.000000000 -0400 -@@ -59,10 +59,9 @@ ++++ serefpolicy-3.3.1/policy/modules/admin/logwatch.te 2008-07-24 07:12:06.000000000 -0400 +@@ -54,15 +54,15 @@ + domain_read_all_domains_state(logwatch_t) + + files_list_var(logwatch_t) ++files_read_var_symlinks(logwatch_t) + files_read_etc_files(logwatch_t) + files_read_etc_runtime_files(logwatch_t) files_read_usr_files(logwatch_t) files_search_spool(logwatch_t) files_search_mnt(logwatch_t) @@ -2156,7 +2162,7 @@ fs_getattr_all_fs(logwatch_t) fs_dontaudit_list_auto_mountpoints(logwatch_t) -@@ -88,9 +87,6 @@ +@@ -88,9 +88,6 @@ sysnet_dns_name_resolve(logwatch_t) @@ -2166,7 +2172,7 @@ mta_send_mail(logwatch_t) optional_policy(` -@@ -132,4 +128,5 @@ +@@ -132,4 +129,5 @@ optional_policy(` samba_read_log(logwatch_t) @@ -9175,7 +9181,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-3.3.1/policy/modules/kernel/selinux.te --- nsaserefpolicy/policy/modules/kernel/selinux.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/kernel/selinux.te 2008-07-15 14:02:51.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/kernel/selinux.te 2008-07-24 13:57:00.000000000 -0400 @@ -10,6 +10,7 @@ attribute can_setenforce; attribute can_setsecparam; @@ -9184,18 +9190,19 @@ # # security_t is the target type when checking -@@ -22,6 +23,11 @@ +@@ -21,6 +22,12 @@ + mls_trusted_object(security_t) sid security gen_context(system_u:object_r:security_t,mls_systemhigh) genfscon selinuxfs / gen_context(system_u:object_r:security_t,s0) - ++genfscon securityfs / gen_context(system_u:object_r:security_t,s0) ++ +type boolean_t, booleans_type; +fs_type(boolean_t) +mls_trusted_object(boolean_t) +#genfscon selinuxfs /booleans gen_context(system_u:object_r:boolean_t,s0) -+ + neverallow ~{ selinux_unconfined_type can_load_policy } security_t:security load_policy; neverallow ~{ selinux_unconfined_type can_setenforce } security_t:security setenforce; - neverallow ~{ selinux_unconfined_type can_setsecparam } security_t:security setsecparam; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.3.1/policy/modules/kernel/storage.fc --- nsaserefpolicy/policy/modules/kernel/storage.fc 2008-06-12 23:38:02.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/kernel/storage.fc 2008-07-15 14:02:51.000000000 -0400 @@ -12812,7 +12819,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.3.1/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/cron.te 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/cron.te 2008-07-24 07:27:14.000000000 -0400 @@ -12,14 +12,6 @@ ## @@ -12996,16 +13003,17 @@ kernel_read_kernel_sysctls(system_crond_t) kernel_read_system_state(system_crond_t) -@@ -323,7 +358,7 @@ +@@ -323,7 +358,8 @@ init_read_utmp(system_crond_t) init_dontaudit_rw_utmp(system_crond_t) # prelink tells init to restart it self, we either need to allow or dontaudit -init_write_initctl(system_crond_t) +init_telinit(system_crond_t) ++init_spec_domtrans_script(system_crond_t) auth_use_nsswitch(system_crond_t) -@@ -333,6 +368,7 @@ +@@ -333,6 +369,7 @@ libs_exec_ld_so(system_crond_t) logging_read_generic_logs(system_crond_t) @@ -13013,7 +13021,7 @@ logging_send_syslog_msg(system_crond_t) miscfiles_read_localization(system_crond_t) -@@ -348,18 +384,6 @@ +@@ -348,18 +385,6 @@ ') ') @@ -13032,7 +13040,7 @@ optional_policy(` # Needed for certwatch apache_exec_modules(system_crond_t) -@@ -383,6 +407,14 @@ +@@ -383,6 +408,14 @@ ') optional_policy(` @@ -13047,7 +13055,7 @@ mrtg_append_create_logs(system_crond_t) ') -@@ -415,8 +447,7 @@ +@@ -415,8 +448,7 @@ ') optional_policy(` @@ -13057,7 +13065,7 @@ ') optional_policy(` -@@ -424,15 +455,12 @@ +@@ -424,15 +456,12 @@ ') optional_policy(` @@ -15132,7 +15140,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.3.1/policy/modules/services/dnsmasq.te --- nsaserefpolicy/policy/modules/services/dnsmasq.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.te 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.te 2008-07-24 06:51:59.000000000 -0400 @@ -16,6 +16,9 @@ type dnsmasq_var_run_t; files_pid_file(dnsmasq_var_run_t) @@ -15161,6 +15169,15 @@ files_var_lib_filetrans(dnsmasq_t,dnsmasq_lease_t,file) manage_files_pattern(dnsmasq_t,dnsmasq_var_run_t,dnsmasq_var_run_t) +@@ -55,7 +58,7 @@ + corenet_tcp_bind_all_nodes(dnsmasq_t) + corenet_udp_bind_all_nodes(dnsmasq_t) + corenet_tcp_bind_dns_port(dnsmasq_t) +-corenet_udp_bind_dns_port(dnsmasq_t) ++corenet_udp_bind_all_ports(dnsmasq_t) + corenet_udp_bind_dhcpd_port(dnsmasq_t) + corenet_sendrecv_dns_server_packets(dnsmasq_t) + corenet_sendrecv_dhcpd_server_packets(dnsmasq_t) @@ -94,3 +97,7 @@ optional_policy(` udev_read_db(dnsmasq_t) @@ -17909,15 +17926,19 @@ +files_type(mailscanner_spool_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.3.1/policy/modules/services/mta.fc --- nsaserefpolicy/policy/modules/services/mta.fc 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/mta.fc 2008-07-15 14:02:52.000000000 -0400 -@@ -11,6 +11,7 @@ ++++ serefpolicy-3.3.1/policy/modules/services/mta.fc 2008-07-22 06:33:02.000000000 -0400 +@@ -11,9 +11,10 @@ /usr/lib(64)?/sendmail -- gen_context(system_u:object_r:sendmail_exec_t,s0) /usr/sbin/rmail -- gen_context(system_u:object_r:sendmail_exec_t,s0) +/bin/mail -- gen_context(system_u:object_r:sendmail_exec_t,s0) /usr/sbin/sendmail\.postfix -- gen_context(system_u:object_r:sendmail_exec_t,s0) /usr/sbin/sendmail(\.sendmail)? -- gen_context(system_u:object_r:sendmail_exec_t,s0) +- ++/usr/sbin/ssmtp -- gen_context(system_u:object_r:sendmail_exec_t,s0) + /var/mail(/.*)? gen_context(system_u:object_r:mail_spool_t,s0) + /var/qmail/bin/sendmail -- gen_context(system_u:object_r:sendmail_exec_t,s0) @@ -22,6 +23,4 @@ /var/spool/(client)?mqueue(/.*)? gen_context(system_u:object_r:mqueue_spool_t,s0) /var/spool/mail(/.*)? gen_context(system_u:object_r:mail_spool_t,s0) @@ -18876,8 +18897,8 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.3.1/policy/modules/services/networkmanager.fc --- nsaserefpolicy/policy/modules/services/networkmanager.fc 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.fc 2008-07-15 14:02:52.000000000 -0400 -@@ -1,7 +1,11 @@ ++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.fc 2008-07-24 08:18:27.000000000 -0400 +@@ -1,7 +1,13 @@ /usr/s?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) /usr/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) +/usr/sbin/NetworkManagerDispatcher -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) @@ -18887,12 +18908,14 @@ /var/run/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) /var/run/wpa_supplicant(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) /var/run/wpa_supplicant-global -s gen_context(system_u:object_r:NetworkManager_var_run_t,s0) ++/var/run/nm-dhclient.* gen_context(system_u:object_r:NetworkManager_var_run_t,s0) ++ +/var/log/wpa_supplicant\.log.* -- gen_context(system_u:object_r:NetworkManager_log_t,s0) +/etc/NetworkManager/dispatcher.d(/.*) gen_context(system_u:object_r:NetworkManager_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.3.1/policy/modules/services/networkmanager.if --- nsaserefpolicy/policy/modules/services/networkmanager.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if 2008-07-15 14:02:52.000000000 -0400 -@@ -97,3 +97,40 @@ ++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if 2008-07-24 08:11:29.000000000 -0400 +@@ -97,3 +97,58 @@ allow $1 NetworkManager_t:dbus send_msg; allow NetworkManager_t $1:dbus send_msg; ') @@ -18933,6 +18956,24 @@ + init_script_domtrans_spec($1, NetworkManager_script_exec_t) +') + ++######################################## ++## ++## Read NetworkManager PID files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`networkmanager_read_pid_files',` ++ gen_require(` ++ type NetworkManager_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 NetworkManager_var_run_t:file read_file_perms; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.3.1/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2008-06-12 23:38:02.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te 2008-07-15 14:02:52.000000000 -0400 @@ -19088,7 +19129,7 @@ +/etc/rc.d/init.d/ypxfrd -- gen_context(system_u:object_r:nis_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.3.1/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/nis.if 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/nis.if 2008-07-24 08:13:28.000000000 -0400 @@ -28,7 +28,7 @@ type var_yp_t; ') @@ -30057,7 +30098,7 @@ - diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.3.1/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/init.if 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/init.if 2008-07-24 07:26:35.000000000 -0400 @@ -211,6 +211,16 @@ kernel_dontaudit_use_fds($1) ') @@ -33614,7 +33655,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.3.1/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.te 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.te 2008-07-24 08:14:38.000000000 -0400 @@ -20,6 +20,10 @@ init_daemon_domain(dhcpc_t,dhcpc_exec_t) role system_r types dhcpc_t; @@ -33684,18 +33725,20 @@ optional_policy(` networkmanager_dbus_chat(dhcpc_t) ') -@@ -186,6 +199,10 @@ +@@ -186,6 +199,12 @@ ') optional_policy(` + networkmanager_domtrans(dhcpc_t) ++ networkmanager_read_pid_files(dhcpc_t) +') + +optional_policy(` ++ nis_script_domtrans(dhcpc_t) nis_use_ypbind(dhcpc_t) nis_signal_ypbind(dhcpc_t) nis_read_ypbind_pid(dhcpc_t) -@@ -202,9 +219,7 @@ +@@ -202,9 +221,7 @@ ') optional_policy(` @@ -33706,7 +33749,7 @@ ') optional_policy(` -@@ -215,6 +230,7 @@ +@@ -215,6 +232,7 @@ optional_policy(` seutil_sigchld_newrole(dhcpc_t) seutil_dontaudit_search_config(dhcpc_t) @@ -33714,7 +33757,7 @@ ') optional_policy(` -@@ -226,6 +242,10 @@ +@@ -226,6 +244,10 @@ ') optional_policy(` @@ -33725,7 +33768,7 @@ kernel_read_xen_state(dhcpc_t) kernel_write_xen_state(dhcpc_t) xen_append_log(dhcpc_t) -@@ -239,7 +259,6 @@ +@@ -239,7 +261,6 @@ allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack }; allow ifconfig_t self:capability { net_raw net_admin sys_tty_config }; @@ -33733,7 +33776,7 @@ allow ifconfig_t self:fd use; allow ifconfig_t self:fifo_file rw_fifo_file_perms; -@@ -253,6 +272,7 @@ +@@ -253,6 +274,7 @@ allow ifconfig_t self:sem create_sem_perms; allow ifconfig_t self:msgq create_msgq_perms; allow ifconfig_t self:msg { send receive }; @@ -33741,7 +33784,7 @@ # Create UDP sockets, necessary when called from dhcpc allow ifconfig_t self:udp_socket create_socket_perms; -@@ -268,7 +288,10 @@ +@@ -268,7 +290,10 @@ kernel_read_system_state(ifconfig_t) kernel_read_network_state(ifconfig_t) kernel_search_network_sysctl(ifconfig_t) @@ -33752,7 +33795,7 @@ corenet_rw_tun_tap_dev(ifconfig_t) -@@ -279,8 +302,11 @@ +@@ -279,8 +304,11 @@ fs_getattr_xattr_fs(ifconfig_t) fs_search_auto_mountpoints(ifconfig_t) @@ -33764,7 +33807,7 @@ domain_use_interactive_fds(ifconfig_t) -@@ -303,12 +329,16 @@ +@@ -303,12 +331,16 @@ userdom_use_all_users_fds(ifconfig_t) @@ -33782,7 +33825,7 @@ ifdef(`hide_broken_symptoms',` optional_policy(` dev_dontaudit_rw_cardmgr(ifconfig_t) -@@ -332,6 +362,14 @@ +@@ -332,6 +364,14 @@ ') optional_policy(` @@ -38395,7 +38438,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.3.1/policy/modules/system/virt.te --- nsaserefpolicy/policy/modules/system/virt.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-07-24 07:40:40.000000000 -0400 @@ -0,0 +1,204 @@ + +policy_module(virt,1.0.0) @@ -38451,7 +38494,7 @@ +# +# virtd local policy +# -+allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace }; ++allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace sys_resource }; +allow virtd_t self:process { getsched sigkill signal execmem }; +allow virtd_t self:fifo_file rw_file_perms; +allow virtd_t self:unix_stream_socket create_stream_socket_perms; @@ -38906,8 +38949,8 @@ +## Policy for guest user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.3.1/policy/modules/users/guest.te --- nsaserefpolicy/policy/modules/users/guest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-07-15 14:02:52.000000000 -0400 -@@ -0,0 +1,21 @@ ++++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-07-24 14:15:43.000000000 -0400 +@@ -0,0 +1,31 @@ +policy_module(guest,1.0.1) +userdom_restricted_user_template(guest) + @@ -38929,6 +38972,16 @@ + dbus_chat_user_bus(xguest,xguest_mozilla_t) + dbus_connectto_user_bus(xguest,xguest_mozilla_t) +') ++ ++optional_policy(` ++ gen_require(` ++ type openoffice_exec_t; ++ type xguest_mozilla_t; ++ type xguest_openoffice_t; ++ ') ++ ++ domtrans_pattern(xguest_mozilla_t, openoffice_exec_t, xguest_openoffice_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.3.1/policy/modules/users/logadm.fc --- nsaserefpolicy/policy/modules/users/logadm.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/users/logadm.fc 2008-07-15 14:02:52.000000000 -0400 Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- selinux-policy.spec 18 Jul 2008 19:21:11 -0000 1.697 +++ selinux-policy.spec 25 Jul 2008 01:35:47 -0000 1.698 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 79%{?dist} +Release: 80%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -386,6 +386,11 @@ %endif %changelog +* Thu Jul 24 2008 Dan Walsh 3.3.1-80 +- Allow system_crond_t to restart init scripts +- Allow dnsmasq to bind to any udp port +- Change dhclient to be able to red networkmanager_var_run + * Thu Jul 17 2008 Dan Walsh 3.3.1-79 - Allow xguest to communicate with hal - allow mozilla to communicate with networkmanager From fedora-extras-commits at redhat.com Fri Jul 25 01:46:52 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 25 Jul 2008 01:46:52 GMT Subject: rpms/crossfire-maps/devel .cvsignore, 1.4, 1.5 crossfire-maps.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807250146.m6P1kqME003803@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3778 Modified Files: .cvsignore crossfire-maps.spec sources Log Message: Update to 1.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 May 2007 18:54:23 -0000 1.4 +++ .cvsignore 25 Jul 2008 01:46:01 -0000 1.5 @@ -1 +1 @@ -crossfire-1.10.0.maps.tar.gz +crossfire-1.11.0.maps.tar.gz Index: crossfire-maps.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/devel/crossfire-maps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- crossfire-maps.spec 19 Aug 2007 16:38:35 -0000 1.7 +++ crossfire-maps.spec 25 Jul 2008 01:46:01 -0000 1.8 @@ -1,6 +1,6 @@ Name: crossfire-maps -Version: 1.10.0 -Release: 3%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Map files for the crossfire server Group: Amusements/Games @@ -31,6 +31,14 @@ chmod -x maps/pup_land/lone_town/cave/* chmod -x maps/templates/keep/*.tpl chmod -x maps/templates/guild/bigchest +chmod -x maps/navar_city/troll_canyon/* +chmod -x maps/brest/sow/sow.1 +chmod -x maps/lake_country/elven_moon/* +chmod -x maps/unlinked/casino/casino_infernal +chmod -x maps/santo_dominion/shaft/* +chmod -x maps/santo_dominion/temple_naive/* +chmod -x maps/darcap/temple_justice/* +chmod -x maps/brest/sow/sow %{__sed} -i 's/\r//' maps/templates/keep/keep1.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep2.tpl @@ -59,6 +67,9 @@ %{_datadir}/crossfire/maps %changelog +* Thu Jul 24 2008 Wart 1.11.0-1 +- Update to 1.11.0 + * Sat Aug 18 2007 Wart 1.10.0-3 - License tag clarification Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 May 2007 18:54:23 -0000 1.4 +++ sources 25 Jul 2008 01:46:01 -0000 1.5 @@ -1 +1 @@ -0c410171602268b0499f3b62091fafa4 crossfire-1.10.0.maps.tar.gz +f0c3f1459e42163a500ce9be3cad39d2 crossfire-1.11.0.maps.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 02:10:46 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 25 Jul 2008 02:10:46 GMT Subject: rpms/crossfire/devel .cvsignore, 1.4, 1.5 crossfire.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <200807250210.m6P2Ake3011164@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11122 Modified Files: .cvsignore crossfire.spec sources Log Message: Update to 1.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 May 2007 18:39:12 -0000 1.4 +++ .cvsignore 25 Jul 2008 02:09:49 -0000 1.5 @@ -1,2 +1,2 @@ -crossfire-1.10.0.tar.gz -crossfire-1.10.0.arch.tar.gz +crossfire-1.11.0.tar.gz +crossfire-1.11.0.arch.tar.gz Index: crossfire.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/crossfire.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- crossfire.spec 24 Jul 2008 16:31:52 -0000 1.11 +++ crossfire.spec 25 Jul 2008 02:09:49 -0000 1.12 @@ -7,8 +7,8 @@ %define logwatch_scripts %{logwatch_root}/scripts Name: crossfire -Version: 1.10.0 -Release: 6%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -25,8 +25,7 @@ Source8: logwatch.logconf.crossfire Source9: logwatch.script.crossfire Source10: logwatch.serviceconf.crossfire -Patch0: crossfire-1.9.1-logtimestamp.patch -Patch1: crossfire-1.10.0-log-login.patch +Patch0: crossfire-1.10.0-log-login.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: crossfire-maps BuildRequires: checkpolicy selinux-policy-devel hardlink @@ -105,7 +104,6 @@ %setup -q %setup -q -a 1 %patch0 -p0 -%patch1 -p0 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux @@ -292,6 +290,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/news %config(noreplace) %{_sysconfdir}/%{name}/rules %config(noreplace) %{_sysconfdir}/%{name}/settings +%config(noreplace) %{_sysconfdir}/%{name}/metaserver2 %attr(-,crossfire,root) %{_var}/games/%{name} %attr(-,crossfire,root) %{_var}/log/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -331,6 +330,9 @@ %changelog +* Thu Jul 24 2008 Wart 1.11.0-1 +- Update to 1.11.0 + * Tue Jul 22 2008 Wart 1.10.0-6 - Fix selinux policy with regard to sock_file Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 May 2007 18:39:12 -0000 1.4 +++ sources 25 Jul 2008 02:09:49 -0000 1.5 @@ -1,2 +1,2 @@ -d56ad6cac04ea49f8b6b326b441553a3 crossfire-1.10.0.tar.gz -26a6d6c2ffb82fd408bf75b25ed339d1 crossfire-1.10.0.arch.tar.gz +4c2e8f60ca57fb140808d07e62b072a9 crossfire-1.11.0.tar.gz +cba07d6d4ec61e1b08d2bf1c88e8821c crossfire-1.11.0.arch.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 03:17:57 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 03:17:57 GMT Subject: rpms/gnome-utils/devel icon-names.patch, NONE, 1.1 gnome-utils.spec, 1.163, 1.164 Message-ID: <200807250317.m6P3Hvo7020756@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20636 Modified Files: gnome-utils.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gnome-utils-2.20.0.1/baobab/src/gedit-spinner.c.icon-names gnome-utils-2.20.0.1/baobab/src/gedit-spinner.c --- gnome-utils-2.20.0.1/baobab/src/gedit-spinner.c.icon-names 2008-07-24 23:08:37.000000000 -0400 +++ gnome-utils-2.20.0.1/baobab/src/gedit-spinner.c 2008-07-24 23:09:03.000000000 -0400 @@ -92,8 +92,8 @@ typedef struct } GeditSpinnerImages; #define LAST_ICON_SIZE GTK_ICON_SIZE_DIALOG + 1 -#define SPINNER_ICON_NAME "gnome-spinner" -#define SPINNER_REST_ICON_NAME "gnome-spinner-rest" +#define SPINNER_ICON_NAME "process-working" +#define SPINNER_REST_ICON_NAME "process-idle" #define GEDIT_SPINNER_IMAGES_INVALID ((GeditSpinnerImages *) 0x1) typedef struct Index: gnome-utils.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- gnome-utils.spec 4 Jun 2008 17:34:09 -0000 1.163 +++ gnome-utils.spec 25 Jul 2008 03:17:12 -0000 1.164 @@ -10,7 +10,7 @@ Name: gnome-utils Version: 2.20.0.1 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: GNOME utility programs @@ -28,6 +28,8 @@ Patch3: logview-versions-format.patch # http://bugzilla.gnome.org/show_bug.cgi?id=529560 Patch4: gnome-screenshot-hideous-uri.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=544637 +Patch5: icon-names.patch BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -86,6 +88,7 @@ %patch2 -p1 -b .versions-crash %patch3 -p1 -b .versions-format %patch4 -p1 -b .hideous-uri +%patch5 -p1 -b .icon-names # Hide from menus pushd gsearchtool @@ -245,6 +248,9 @@ %changelog +* Thu Jul 24 2008 Matthias Clasen - 1:2.20.0.0.1-8 +- Use standard icon names + * Wed Jun 4 2008 Matthias Clasen - 1:2.20.0.0.1-7 - Rebuild From fedora-extras-commits at redhat.com Fri Jul 25 04:05:19 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 04:05:19 GMT Subject: rpms/vino/devel icon-names.patch,NONE,1.1 vino.spec,1.70,1.71 Message-ID: <200807250405.m6P45J4w030060@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/vino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30003 Modified Files: vino.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up vino-2.23.5/capplet/vino-preferences.glade.icon-names vino-2.23.5/capplet/vino-preferences.glade --- vino-2.23.5/capplet/vino-preferences.glade.icon-names 2008-07-25 00:00:24.000000000 -0400 +++ vino-2.23.5/capplet/vino-preferences.glade 2008-07-25 00:00:37.000000000 -0400 @@ -394,7 +394,7 @@ 0 gtk-missing-image 6 - gnome-fs-network + network-workgroup False Index: vino.spec =================================================================== RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- vino.spec 22 Jul 2008 23:23:41 -0000 1.70 +++ vino.spec 25 Jul 2008 04:04:31 -0000 1.71 @@ -9,7 +9,7 @@ Summary: A remote desktop system for GNOME Name: vino Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/vino/2.23/%{name}-%{version}.tar.bz2 License: GPLv2+ @@ -34,6 +34,8 @@ BuildRequires: gettext BuildRequires: dbus-glib-devel +# http://bugzilla.gnome.org/show_bug.cgi?id=544639 +Patch0: icon-names.patch %description Vino is a VNC server for GNOME. It allows remote users to @@ -41,6 +43,7 @@ %prep %setup -q +%patch0 -p1 -b .icon-names %build %configure \ @@ -108,6 +111,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Fri Jul 25 2008 Matthias Clasen - 2.23.5-2 +- Use standard icon names + * Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Fri Jul 25 04:18:25 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 25 Jul 2008 04:18:25 GMT Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.4, 1.5 selinux-policy.spec, 1.688, 1.689 Message-ID: <200807250418.m6P4IPEm030879@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30753 Modified Files: policy-20080710.patch selinux-policy.spec Log Message: * Thu Jul 25 2008 Dan Walsh 3.5.1-2 - Eliminate vbetool duplicate entry policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- policy-20080710.patch 24 Jul 2008 18:19:05 -0000 1.4 +++ policy-20080710.patch 25 Jul 2008 04:17:41 -0000 1.5 @@ -1,82 +1,3 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.1/Makefile ---- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.1/Makefile 2008-07-24 06:54:04.000000000 -0400 -@@ -311,20 +311,22 @@ - - # parse-rolemap modulename,outputfile - define parse-rolemap -- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ -- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 -+ echo "" >> $2 -+# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ -+# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 - endef - - # perrole-expansion modulename,outputfile - define perrole-expansion -- $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 -- $(call parse-rolemap,$1,$2) -- $(verbose) echo "')" >> $2 -- -- $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 -- $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 -- $(call parse-rolemap-compat,$1,$2) -- $(verbose) echo "')" >> $2 -+ echo "No longer doing perrole-expansion" -+# $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 -+# $(call parse-rolemap,$1,$2) -+# $(verbose) echo "')" >> $2 -+ -+# $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 -+# $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 -+# $(call parse-rolemap-compat,$1,$2) -+# $(verbose) echo "')" >> $2 - endef - - # create-base-per-role-tmpl modulenames,outputfile -@@ -523,6 +525,10 @@ - @mkdir -p $(appdir)/users - $(verbose) $(INSTALL) -m 644 $^ $@ - -+$(appdir)/initrc_context: $(tmpdir)/initrc_context -+ @mkdir -p $(appdir) -+ $(verbose) $(INSTALL) -m 644 $< $@ -+ - $(appdir)/%: $(appconf)/% - @mkdir -p $(appdir) - $(verbose) $(INSTALL) -m 644 $< $@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.1/Rules.modular ---- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.1/Rules.modular 2008-07-24 06:54:04.000000000 -0400 -@@ -73,8 +73,8 @@ - $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te - @echo "Compliling $(NAME) $(@F) module" - @test -d $(tmpdir) || mkdir -p $(tmpdir) -- $(call perrole-expansion,$(basename $(@F)),$@.role) -- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) -+# $(call perrole-expansion,$(basename $(@F)),$@.role) -+ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) - $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ - - $(tmpdir)/%.mod.fc: $(m4support) %.fc -@@ -129,7 +129,7 @@ - @test -d $(tmpdir) || mkdir -p $(tmpdir) - # define all available object classes - $(verbose) $(genperm) $(avs) $(secclass) > $@ -- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) -+# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) - $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true - - $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy -@@ -146,7 +146,7 @@ - $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/rolemap.conf: $(rolemap) - $(verbose) echo "" > $@ -- $(call parse-rolemap,base,$@) -+# $(call parse-rolemap,base,$@) - - $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.1/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.1/config/appconfig-mcs/default_contexts 2008-07-24 06:54:04.000000000 -0400 @@ -188,6 +109,53 @@ +system_r:sshd_t xguest_r:xguest_t +system_r:crond_t xguest_r:xguest_crond_t +system_r:xdm_t xguest_r:xguest_t +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.1/Makefile +--- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 ++++ serefpolicy-3.5.1/Makefile 2008-07-24 06:54:04.000000000 -0400 +@@ -311,20 +311,22 @@ + + # parse-rolemap modulename,outputfile + define parse-rolemap +- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ +- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 ++ echo "" >> $2 ++# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ ++# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 + endef + + # perrole-expansion modulename,outputfile + define perrole-expansion +- $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 +- $(call parse-rolemap,$1,$2) +- $(verbose) echo "')" >> $2 +- +- $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 +- $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 +- $(call parse-rolemap-compat,$1,$2) +- $(verbose) echo "')" >> $2 ++ echo "No longer doing perrole-expansion" ++# $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 ++# $(call parse-rolemap,$1,$2) ++# $(verbose) echo "')" >> $2 ++ ++# $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 ++# $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 ++# $(call parse-rolemap-compat,$1,$2) ++# $(verbose) echo "')" >> $2 + endef + + # create-base-per-role-tmpl modulenames,outputfile +@@ -523,6 +525,10 @@ + @mkdir -p $(appdir)/users + $(verbose) $(INSTALL) -m 644 $^ $@ + ++$(appdir)/initrc_context: $(tmpdir)/initrc_context ++ @mkdir -p $(appdir) ++ $(verbose) $(INSTALL) -m 644 $< $@ ++ + $(appdir)/%: $(appconf)/% + @mkdir -p $(appdir) + $(verbose) $(INSTALL) -m 644 $< $@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.5.1/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-06-12 23:25:09.000000000 -0400 +++ serefpolicy-3.5.1/man/man8/ftpd_selinux.8 2008-07-24 06:54:04.000000000 -0400 @@ -1413,6 +1381,121 @@ optional_policy(` usermanage_domtrans_groupadd(rpm_script_t) usermanage_domtrans_useradd(rpm_script_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.5.1/policy/modules/admin/sudo.if +--- nsaserefpolicy/policy/modules/admin/sudo.if 2008-06-12 23:25:08.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/admin/sudo.if 2008-07-24 06:54:04.000000000 -0400 +@@ -55,7 +55,7 @@ + # + + # Use capabilities. +- allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_resource }; ++ allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_nice sys_resource }; + allow $1_sudo_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; + allow $1_sudo_t self:process { setexec setrlimit }; + allow $1_sudo_t self:fd use; +@@ -68,33 +68,35 @@ + allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms; + allow $1_sudo_t self:unix_dgram_socket sendto; + allow $1_sudo_t self:unix_stream_socket connectto; +- allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read }; ++ allow $1_sudo_t self:key manage_key_perms; ++ allow $1_sudo_t $1_t:key search; + + # Enter this derived domain from the user domain + domtrans_pattern($2, sudo_exec_t, $1_sudo_t) + + # By default, revert to the calling domain when a shell is executed. + corecmd_shell_domtrans($1_sudo_t,$2) ++ corecmd_bin_domtrans($1_sudo_t,$2) + allow $2 $1_sudo_t:fd use; + allow $2 $1_sudo_t:fifo_file rw_file_perms; + allow $2 $1_sudo_t:process sigchld; + + kernel_read_kernel_sysctls($1_sudo_t) + kernel_read_system_state($1_sudo_t) +- kernel_search_key($1_sudo_t) ++ kernel_link_key($1_sudo_t) + + dev_read_urand($1_sudo_t) + + fs_search_auto_mountpoints($1_sudo_t) + fs_getattr_xattr_fs($1_sudo_t) + +- auth_domtrans_chk_passwd($1_sudo_t) ++ auth_run_chk_passwd($1_sudo_t, $3, { $1_tty_device_t $1_devpts_t }) + # sudo stores a token in the pam_pid directory + auth_manage_pam_pid($1_sudo_t) + auth_use_nsswitch($1_sudo_t) + + corecmd_read_bin_symlinks($1_sudo_t) +- corecmd_getattr_all_executables($1_sudo_t) ++ corecmd_exec_all_executables($1_sudo_t) + + domain_use_interactive_fds($1_sudo_t) + domain_sigchld_interactive_fds($1_sudo_t) +@@ -106,32 +108,50 @@ + files_getattr_usr_files($1_sudo_t) + # for some PAM modules and for cwd + files_dontaudit_search_home($1_sudo_t) ++ files_list_tmp($1_sudo_t) + + init_rw_utmp($1_sudo_t) + + libs_use_ld_so($1_sudo_t) + libs_use_shared_libs($1_sudo_t) + ++ logging_send_audit_msgs($1_sudo_t) + logging_send_syslog_msg($1_sudo_t) + + miscfiles_read_localization($1_sudo_t) + +- userdom_manage_user_home_content_files($1,$1_sudo_t) +- userdom_manage_user_home_content_symlinks($1,$1_sudo_t) +- userdom_manage_user_tmp_files($1,$1_sudo_t) +- userdom_manage_user_tmp_symlinks($1,$1_sudo_t) ++ mta_per_role_template($1, $1_sudo_t, $3) ++ ++ unprivuser_manage_home_content_files($1_sudo_t) ++ unprivuser_manage_home_content_symlinks($1_sudo_t) ++ tunable_policy(`use_nfs_home_dirs',` ++ fs_manage_nfs_files($1_sudo_t) ++ ') ++ ++ tunable_policy(`use_samba_home_dirs',` ++ fs_manage_cifs_files($1_sudo_t) ++ ') ++ unprivuser_manage_tmp_files($1_sudo_t) ++ unprivuser_manage_tmp_symlinks($1_sudo_t) ++ userdom_exec_user_home_content_files($1,$1_sudo_t) + userdom_use_user_terminals($1,$1_sudo_t) + userdom_use_unpriv_users_fds($1_sudo_t) + # for some PAM modules and for cwd ++ sysadm_search_home_content_dirs($1_sudo_t) + userdom_dontaudit_search_all_users_home_content($1_sudo_t) ++ userdom_manage_all_users_keys($1_sudo_t) + +- ifdef(`TODO',` +- # for when the network connection is killed +- dontaudit unpriv_userdomain $1_sudo_t:process signal; +- +- ifdef(`mta.te', ` +- domain_auto_trans($1_sudo_t, sendmail_exec_t, $1_mail_t) +- ') ++ domain_role_change_exemption($1_sudo_t) ++ userdom_spec_domtrans_all_users($1_sudo_t) + +- ') dnl end TODO ++ selinux_validate_context($1_sudo_t) ++ selinux_compute_relabel_context($1_sudo_t) ++ selinux_getattr_fs($1_sudo_t) ++ seutil_read_config($1_sudo_t) ++ seutil_search_default_contexts($1_sudo_t) ++ ++ term_use_all_user_ttys($1_sudo_t) ++ term_use_all_user_ptys($1_sudo_t) ++ term_relabel_all_user_ttys($1_sudo_t) ++ term_relabel_all_user_ptys($1_sudo_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.5.1/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2008-06-12 23:25:08.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/admin/su.if 2008-07-24 06:54:04.000000000 -0400 @@ -1543,121 +1626,6 @@ ') ####################################### -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.5.1/policy/modules/admin/sudo.if ---- nsaserefpolicy/policy/modules/admin/sudo.if 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/admin/sudo.if 2008-07-24 06:54:04.000000000 -0400 -@@ -55,7 +55,7 @@ - # - - # Use capabilities. -- allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_resource }; -+ allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_nice sys_resource }; - allow $1_sudo_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; - allow $1_sudo_t self:process { setexec setrlimit }; - allow $1_sudo_t self:fd use; -@@ -68,33 +68,35 @@ - allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms; - allow $1_sudo_t self:unix_dgram_socket sendto; - allow $1_sudo_t self:unix_stream_socket connectto; -- allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read }; -+ allow $1_sudo_t self:key manage_key_perms; -+ allow $1_sudo_t $1_t:key search; - - # Enter this derived domain from the user domain - domtrans_pattern($2, sudo_exec_t, $1_sudo_t) - - # By default, revert to the calling domain when a shell is executed. - corecmd_shell_domtrans($1_sudo_t,$2) -+ corecmd_bin_domtrans($1_sudo_t,$2) - allow $2 $1_sudo_t:fd use; - allow $2 $1_sudo_t:fifo_file rw_file_perms; - allow $2 $1_sudo_t:process sigchld; - - kernel_read_kernel_sysctls($1_sudo_t) - kernel_read_system_state($1_sudo_t) -- kernel_search_key($1_sudo_t) -+ kernel_link_key($1_sudo_t) - - dev_read_urand($1_sudo_t) - - fs_search_auto_mountpoints($1_sudo_t) - fs_getattr_xattr_fs($1_sudo_t) - -- auth_domtrans_chk_passwd($1_sudo_t) -+ auth_run_chk_passwd($1_sudo_t, $3, { $1_tty_device_t $1_devpts_t }) - # sudo stores a token in the pam_pid directory - auth_manage_pam_pid($1_sudo_t) - auth_use_nsswitch($1_sudo_t) - - corecmd_read_bin_symlinks($1_sudo_t) -- corecmd_getattr_all_executables($1_sudo_t) -+ corecmd_exec_all_executables($1_sudo_t) - - domain_use_interactive_fds($1_sudo_t) - domain_sigchld_interactive_fds($1_sudo_t) -@@ -106,32 +108,50 @@ - files_getattr_usr_files($1_sudo_t) - # for some PAM modules and for cwd - files_dontaudit_search_home($1_sudo_t) -+ files_list_tmp($1_sudo_t) - - init_rw_utmp($1_sudo_t) - - libs_use_ld_so($1_sudo_t) - libs_use_shared_libs($1_sudo_t) - -+ logging_send_audit_msgs($1_sudo_t) - logging_send_syslog_msg($1_sudo_t) - - miscfiles_read_localization($1_sudo_t) - -- userdom_manage_user_home_content_files($1,$1_sudo_t) -- userdom_manage_user_home_content_symlinks($1,$1_sudo_t) -- userdom_manage_user_tmp_files($1,$1_sudo_t) -- userdom_manage_user_tmp_symlinks($1,$1_sudo_t) -+ mta_per_role_template($1, $1_sudo_t, $3) -+ -+ unprivuser_manage_home_content_files($1_sudo_t) -+ unprivuser_manage_home_content_symlinks($1_sudo_t) -+ tunable_policy(`use_nfs_home_dirs',` -+ fs_manage_nfs_files($1_sudo_t) -+ ') -+ -+ tunable_policy(`use_samba_home_dirs',` -+ fs_manage_cifs_files($1_sudo_t) -+ ') -+ unprivuser_manage_tmp_files($1_sudo_t) -+ unprivuser_manage_tmp_symlinks($1_sudo_t) -+ userdom_exec_user_home_content_files($1,$1_sudo_t) - userdom_use_user_terminals($1,$1_sudo_t) - userdom_use_unpriv_users_fds($1_sudo_t) - # for some PAM modules and for cwd -+ sysadm_search_home_content_dirs($1_sudo_t) - userdom_dontaudit_search_all_users_home_content($1_sudo_t) -+ userdom_manage_all_users_keys($1_sudo_t) - -- ifdef(`TODO',` -- # for when the network connection is killed -- dontaudit unpriv_userdomain $1_sudo_t:process signal; -- -- ifdef(`mta.te', ` -- domain_auto_trans($1_sudo_t, sendmail_exec_t, $1_mail_t) -- ') -+ domain_role_change_exemption($1_sudo_t) -+ userdom_spec_domtrans_all_users($1_sudo_t) - -- ') dnl end TODO -+ selinux_validate_context($1_sudo_t) -+ selinux_compute_relabel_context($1_sudo_t) -+ selinux_getattr_fs($1_sudo_t) -+ seutil_read_config($1_sudo_t) -+ seutil_search_default_contexts($1_sudo_t) -+ -+ term_use_all_user_ttys($1_sudo_t) -+ term_use_all_user_ptys($1_sudo_t) -+ term_relabel_all_user_ttys($1_sudo_t) -+ term_relabel_all_user_ptys($1_sudo_t) - ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.5.1/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2008-06-12 23:25:08.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/admin/tmpreaper.te 2008-07-24 06:54:04.000000000 -0400 @@ -20555,7 +20523,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.5.1/policy/modules/services/polkit.te --- nsaserefpolicy/policy/modules/services/polkit.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/policy/modules/services/polkit.te 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/polkit.te 2008-07-24 22:56:25.000000000 -0400 @@ -0,0 +1,221 @@ +policy_module(polkit_auth,1.0.0) + @@ -20894,6 +20862,100 @@ ## Execute postfix user mail programs ## in their respective domains. ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.fc serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.fc +--- nsaserefpolicy/policy/modules/services/postfixpolicyd.fc 2008-06-12 23:25:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.fc 2008-07-24 06:54:04.000000000 -0400 +@@ -3,3 +3,5 @@ + /usr/sbin/policyd -- gen_context(system_u:object_r:postfix_policyd_exec_t, s0) + + /var/run/policyd\.pid -- gen_context(system_u:object_r:postfix_policyd_var_run_t, s0) ++ ++/etc/rc.d/init.d/postfixpolicyd -- gen_context(system_u:object_r:postfixpolicyd_script_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.if serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.if +--- nsaserefpolicy/policy/modules/services/postfixpolicyd.if 2008-06-12 23:25:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.if 2008-07-24 06:54:04.000000000 -0400 +@@ -1 +1,68 @@ + ## Postfix policy server ++ ++######################################## ++## ++## Execute postfixpolicyd server in the postfixpolicyd domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++# ++interface(`postfixpolicyd_script_domtrans',` ++ gen_require(` ++ type postfix_policyd_script_exec_t; ++ ') ++ ++ init_script_domtrans_spec($1,postfix_policyd_script_exec_t) ++') ++ ++######################################## ++## ++## All of the rules required to administrate ++## an postfixpolicyd environment ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to be allowed to manage the postfixpolicyd domain. ++## ++## ++## ++## ++## The type of the user terminal. ++## ++## ++## ++# ++interface(`postfixpolicyd_admin',` ++ gen_require(` ++ type postfix_policyd_t; ++ type postfix_policyd_script_exec_t; ++ type postfix_policyd_conf_t; ++ type postfix_policyd_var_run_t; ++ ') ++ ++ allow $1 postfix_policyd_t:process { ptrace signal_perms getattr }; ++ read_files_pattern($1, postfix_policyd_t, postfix_policyd_t) ++ ++ # Allow postfix_policyd_t to restart the apache service ++ postfixpolicyd_script_domtrans($1) ++ domain_system_change_exemption($1) ++ role_transition $2 postfix_policyd_script_exec_t system_r; ++ allow $2 system_r; ++ ++ files_list_etc($1) ++ manage_all_pattern($1,postfix_policyd_conf_t) ++ ++ files_list_pids($1) ++ manage_all_pattern($1,postfix_policyd_var_run_t) ++') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.te serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.te +--- nsaserefpolicy/policy/modules/services/postfixpolicyd.te 2008-06-12 23:25:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.te 2008-07-24 06:54:04.000000000 -0400 +@@ -16,6 +16,9 @@ + type postfix_policyd_var_run_t; + files_pid_file(postfix_policyd_var_run_t) + ++type postfix_policyd_script_exec_t; ++init_script_type(postfix_policyd_script_exec_t) ++ + ######################################## + # + # Local Policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.1/policy/modules/services/postfix.te --- nsaserefpolicy/policy/modules/services/postfix.te 2008-07-10 11:38:46.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/services/postfix.te 2008-07-24 06:54:04.000000000 -0400 @@ -21158,100 +21220,6 @@ corecmd_exec_shell(postfix_virtual_t) corecmd_exec_bin(postfix_virtual_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.fc serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.fc ---- nsaserefpolicy/policy/modules/services/postfixpolicyd.fc 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.fc 2008-07-24 06:54:04.000000000 -0400 -@@ -3,3 +3,5 @@ - /usr/sbin/policyd -- gen_context(system_u:object_r:postfix_policyd_exec_t, s0) - - /var/run/policyd\.pid -- gen_context(system_u:object_r:postfix_policyd_var_run_t, s0) -+ -+/etc/rc.d/init.d/postfixpolicyd -- gen_context(system_u:object_r:postfixpolicyd_script_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.if serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.if ---- nsaserefpolicy/policy/modules/services/postfixpolicyd.if 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.if 2008-07-24 06:54:04.000000000 -0400 -@@ -1 +1,68 @@ - ## Postfix policy server -+ -+######################################## -+## -+## Execute postfixpolicyd server in the postfixpolicyd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`postfixpolicyd_script_domtrans',` -+ gen_require(` -+ type postfix_policyd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1,postfix_policyd_script_exec_t) -+') -+ -+######################################## -+## -+## All of the rules required to administrate -+## an postfixpolicyd environment -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to be allowed to manage the postfixpolicyd domain. -+## -+## -+## -+## -+## The type of the user terminal. -+## -+## -+## -+# -+interface(`postfixpolicyd_admin',` -+ gen_require(` -+ type postfix_policyd_t; -+ type postfix_policyd_script_exec_t; -+ type postfix_policyd_conf_t; -+ type postfix_policyd_var_run_t; -+ ') -+ -+ allow $1 postfix_policyd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, postfix_policyd_t, postfix_policyd_t) -+ -+ # Allow postfix_policyd_t to restart the apache service -+ postfixpolicyd_script_domtrans($1) -+ domain_system_change_exemption($1) -+ role_transition $2 postfix_policyd_script_exec_t system_r; -+ allow $2 system_r; -+ -+ files_list_etc($1) -+ manage_all_pattern($1,postfix_policyd_conf_t) -+ -+ files_list_pids($1) -+ manage_all_pattern($1,postfix_policyd_var_run_t) -+') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.te serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.te ---- nsaserefpolicy/policy/modules/services/postfixpolicyd.te 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/postfixpolicyd.te 2008-07-24 06:54:04.000000000 -0400 -@@ -16,6 +16,9 @@ - type postfix_policyd_var_run_t; - files_pid_file(postfix_policyd_var_run_t) - -+type postfix_policyd_script_exec_t; -+init_script_type(postfix_policyd_script_exec_t) -+ - ######################################## - # - # Local Policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.5.1/policy/modules/services/postgresql.fc --- nsaserefpolicy/policy/modules/services/postgresql.fc 2008-06-12 23:25:06.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/services/postgresql.fc 2008-07-24 06:54:04.000000000 -0400 @@ -22969,6 +22937,121 @@ ######################################## # # Local policy +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.1/policy/modules/services/rpcbind.fc +--- nsaserefpolicy/policy/modules/services/rpcbind.fc 2008-06-12 23:25:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/rpcbind.fc 2008-07-24 06:54:04.000000000 -0400 +@@ -5,3 +5,5 @@ + /var/run/rpc.statd\.pid -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) + /var/run/rpcbind\.lock -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) + /var/run/rpcbind\.sock -s gen_context(system_u:object_r:rpcbind_var_run_t,s0) ++ ++/etc/rc.d/init.d/rpcbind -- gen_context(system_u:object_r:rpcbind_script_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.5.1/policy/modules/services/rpcbind.if +--- nsaserefpolicy/policy/modules/services/rpcbind.if 2008-06-12 23:25:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/rpcbind.if 2008-07-24 06:54:04.000000000 -0400 +@@ -95,3 +95,68 @@ + manage_files_pattern($1,rpcbind_var_lib_t,rpcbind_var_lib_t) + files_search_var_lib($1) + ') ++ ++######################################## ++## ++## Execute rpcbind server in the rpcbind domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++# ++interface(`rpcbind_script_domtrans',` ++ gen_require(` ++ type rpcbind_script_exec_t; ++ ') ++ ++ init_script_domtrans_spec($1,rpcbind_script_exec_t) ++') ++ ++######################################## ++## ++## All of the rules required to administrate ++## an rpcbind environment ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to be allowed to manage the rpcbind domain. ++## ++## ++## ++## ++## The type of the user terminal. ++## ++## ++## ++# ++interface(`rpcbind_admin',` ++ gen_require(` ++ type rpcbind_t; ++ type rpcbind_script_exec_t; ++ type rpcbind_var_lib_t; ++ type rpcbind_var_run_t; ++ ') ++ ++ allow $1 rpcbind_t:process { ptrace signal_perms getattr }; ++ read_files_pattern($1, rpcbind_t, rpcbind_t) ++ ++ # Allow rpcbind_t to restart the apache service ++ rpcbind_script_domtrans($1) ++ domain_system_change_exemption($1) ++ role_transition $2 rpcbind_script_exec_t system_r; ++ allow $2 system_r; ++ ++ files_list_var_lib($1) ++ manage_all_pattern($1,rpcbind_var_lib_t) ++ ++ files_list_pids($1) ++ manage_all_pattern($1,rpcbind_var_run_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.1/policy/modules/services/rpcbind.te +--- nsaserefpolicy/policy/modules/services/rpcbind.te 2008-06-12 23:25:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/rpcbind.te 2008-07-24 06:54:04.000000000 -0400 +@@ -16,16 +16,21 @@ + type rpcbind_var_lib_t; + files_type(rpcbind_var_lib_t) + ++type rpcbind_script_exec_t; ++init_script_type(rpcbind_script_exec_t) ++ + ######################################## + # + # rpcbind local policy + # + +-allow rpcbind_t self:capability setuid; ++allow rpcbind_t self:capability { dac_override setgid setuid sys_tty_config }; + allow rpcbind_t self:fifo_file rw_file_perms; + allow rpcbind_t self:unix_stream_socket create_stream_socket_perms; + allow rpcbind_t self:netlink_route_socket r_netlink_socket_perms; + allow rpcbind_t self:udp_socket create_socket_perms; ++# BROKEN ... ++dontaudit rpcbind_t self:udp_socket listen; + allow rpcbind_t self:tcp_socket create_stream_socket_perms; + + manage_files_pattern(rpcbind_t,rpcbind_var_run_t,rpcbind_var_run_t) +@@ -37,6 +42,7 @@ + manage_sock_files_pattern(rpcbind_t,rpcbind_var_lib_t,rpcbind_var_lib_t) + files_var_lib_filetrans(rpcbind_t,rpcbind_var_lib_t, { file dir sock_file }) + ++kernel_read_system_state(rpcbind_t) + kernel_read_network_state(rpcbind_t) + + corenet_all_recvfrom_unlabeled(rpcbind_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.5.1/policy/modules/services/rpc.if --- nsaserefpolicy/policy/modules/services/rpc.if 2008-07-10 11:38:46.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/services/rpc.if 2008-07-24 06:54:04.000000000 -0400 @@ -23124,121 +23207,6 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.1/policy/modules/services/rpcbind.fc ---- nsaserefpolicy/policy/modules/services/rpcbind.fc 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/rpcbind.fc 2008-07-24 06:54:04.000000000 -0400 -@@ -5,3 +5,5 @@ - /var/run/rpc.statd\.pid -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) - /var/run/rpcbind\.lock -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) - /var/run/rpcbind\.sock -s gen_context(system_u:object_r:rpcbind_var_run_t,s0) -+ -+/etc/rc.d/init.d/rpcbind -- gen_context(system_u:object_r:rpcbind_script_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.5.1/policy/modules/services/rpcbind.if ---- nsaserefpolicy/policy/modules/services/rpcbind.if 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/rpcbind.if 2008-07-24 06:54:04.000000000 -0400 -@@ -95,3 +95,68 @@ - manage_files_pattern($1,rpcbind_var_lib_t,rpcbind_var_lib_t) - files_search_var_lib($1) - ') -+ -+######################################## -+## -+## Execute rpcbind server in the rpcbind domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`rpcbind_script_domtrans',` -+ gen_require(` -+ type rpcbind_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1,rpcbind_script_exec_t) -+') -+ -+######################################## -+## -+## All of the rules required to administrate -+## an rpcbind environment -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to be allowed to manage the rpcbind domain. -+## -+## -+## -+## -+## The type of the user terminal. -+## -+## -+## -+# -+interface(`rpcbind_admin',` -+ gen_require(` -+ type rpcbind_t; -+ type rpcbind_script_exec_t; -+ type rpcbind_var_lib_t; -+ type rpcbind_var_run_t; -+ ') -+ -+ allow $1 rpcbind_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, rpcbind_t, rpcbind_t) -+ -+ # Allow rpcbind_t to restart the apache service -+ rpcbind_script_domtrans($1) -+ domain_system_change_exemption($1) -+ role_transition $2 rpcbind_script_exec_t system_r; -+ allow $2 system_r; -+ -+ files_list_var_lib($1) -+ manage_all_pattern($1,rpcbind_var_lib_t) -+ -+ files_list_pids($1) -+ manage_all_pattern($1,rpcbind_var_run_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.1/policy/modules/services/rpcbind.te ---- nsaserefpolicy/policy/modules/services/rpcbind.te 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/rpcbind.te 2008-07-24 06:54:04.000000000 -0400 -@@ -16,16 +16,21 @@ - type rpcbind_var_lib_t; - files_type(rpcbind_var_lib_t) - -+type rpcbind_script_exec_t; -+init_script_type(rpcbind_script_exec_t) -+ - ######################################## - # - # rpcbind local policy - # - --allow rpcbind_t self:capability setuid; -+allow rpcbind_t self:capability { dac_override setgid setuid sys_tty_config }; - allow rpcbind_t self:fifo_file rw_file_perms; - allow rpcbind_t self:unix_stream_socket create_stream_socket_perms; - allow rpcbind_t self:netlink_route_socket r_netlink_socket_perms; - allow rpcbind_t self:udp_socket create_socket_perms; -+# BROKEN ... -+dontaudit rpcbind_t self:udp_socket listen; - allow rpcbind_t self:tcp_socket create_stream_socket_perms; - - manage_files_pattern(rpcbind_t,rpcbind_var_run_t,rpcbind_var_run_t) -@@ -37,6 +42,7 @@ - manage_sock_files_pattern(rpcbind_t,rpcbind_var_lib_t,rpcbind_var_lib_t) - files_var_lib_filetrans(rpcbind_t,rpcbind_var_lib_t, { file dir sock_file }) - -+kernel_read_system_state(rpcbind_t) - kernel_read_network_state(rpcbind_t) - - corenet_all_recvfrom_unlabeled(rpcbind_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.5.1/policy/modules/services/rshd.te --- nsaserefpolicy/policy/modules/services/rshd.te 2008-06-12 23:25:06.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/services/rshd.te 2008-07-24 06:54:04.000000000 -0400 @@ -32851,8 +32819,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.1/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-07-16 10:26:23.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/unconfined.fc 2008-07-24 06:54:05.000000000 -0400 -@@ -2,15 +2,29 @@ ++++ serefpolicy-3.5.1/policy/modules/system/unconfined.fc 2008-07-24 22:55:17.000000000 -0400 +@@ -2,15 +2,28 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t @@ -32886,7 +32854,6 @@ +/usr/libexec/ghc-[^/]+/ghc-.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) + +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -+/usr/sbin/vbetool -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.1/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-07-16 10:26:23.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/system/unconfined.if 2008-07-24 06:54:05.000000000 -0400 @@ -36854,3 +36821,35 @@ - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -') +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.1/Rules.modular +--- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 ++++ serefpolicy-3.5.1/Rules.modular 2008-07-24 06:54:04.000000000 -0400 +@@ -73,8 +73,8 @@ + $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te + @echo "Compliling $(NAME) $(@F) module" + @test -d $(tmpdir) || mkdir -p $(tmpdir) +- $(call perrole-expansion,$(basename $(@F)),$@.role) +- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) ++# $(call perrole-expansion,$(basename $(@F)),$@.role) ++ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) + $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ + + $(tmpdir)/%.mod.fc: $(m4support) %.fc +@@ -129,7 +129,7 @@ + @test -d $(tmpdir) || mkdir -p $(tmpdir) + # define all available object classes + $(verbose) $(genperm) $(avs) $(secclass) > $@ +- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) ++# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) + $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true + + $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy +@@ -146,7 +146,7 @@ + $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/rolemap.conf: $(rolemap) + $(verbose) echo "" > $@ +- $(call parse-rolemap,base,$@) ++# $(call parse-rolemap,base,$@) + + $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.688 retrieving revision 1.689 diff -u -r1.688 -r1.689 --- selinux-policy.spec 24 Jul 2008 18:19:05 -0000 1.688 +++ selinux-policy.spec 25 Jul 2008 04:17:41 -0000 1.689 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.5.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -375,6 +375,9 @@ %endif %changelog +* Thu Jul 25 2008 Dan Walsh 3.5.1-2 +- Eliminate vbetool duplicate entry + * Wed Jul 16 2008 Dan Walsh 3.5.1-1 - Fix xguest -> xguest_mozilla_t -> xguest_openiffice_t - Change dhclient to be able to red networkmanager_var_run From fedora-extras-commits at redhat.com Fri Jul 25 04:24:47 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 25 Jul 2008 04:24:47 GMT Subject: rpms/selinux-policy/devel policy-20080710.patch,1.5,1.6 Message-ID: <200807250424.m6P4Olem031970@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31790 Modified Files: policy-20080710.patch Log Message: * Thu Jul 25 2008 Dan Walsh 3.5.1-2 - Eliminate vbetool duplicate entry policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- policy-20080710.patch 25 Jul 2008 04:17:41 -0000 1.5 +++ policy-20080710.patch 25 Jul 2008 04:24:01 -0000 1.6 @@ -7904,7 +7904,7 @@ ## SELinux protections for filesystem objects, and diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.5.1/policy/modules/kernel/terminal.if --- nsaserefpolicy/policy/modules/kernel/terminal.if 2008-06-12 23:25:03.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/kernel/terminal.if 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/kernel/terminal.if 2008-07-25 00:21:45.000000000 -0400 @@ -525,11 +525,13 @@ interface(`term_use_generic_ptys',` gen_require(` @@ -32052,7 +32052,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.1/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/selinuxutil.te 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/selinuxutil.te 2008-07-25 00:23:26.000000000 -0400 @@ -23,6 +23,9 @@ type selinux_config_t; files_type(selinux_config_t) @@ -32256,7 +32256,7 @@ # cjp: need a more general way to handle this: ifdef(`enable_mls',` # read secadm tmp files -@@ -514,121 +486,40 @@ +@@ -514,121 +486,42 @@ # Handle pp files created in homedir and /tmp sysadm_read_home_content_files(semanage_t) sysadm_read_tmp_files(semanage_t) @@ -32383,6 +32383,8 @@ - udev_dontaudit_rw_dgram_sockets(setfiles_t) - ') +seutil_setfiles(setfiles_t) ++# During boot in Rawhide ++term_use_generic_ptys(setfiles_t) - # cjp: cover up stray file descriptors. - optional_policy(` From fedora-extras-commits at redhat.com Fri Jul 25 05:18:11 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Fri, 25 Jul 2008 05:18:11 GMT Subject: rpms/publican-fedora/devel .cvsignore, 1.5, 1.6 publican-fedora.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807250518.m6P5IBIu015340@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15150 Modified Files: .cvsignore publican-fedora.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Apr 2008 07:34:39 -0000 1.5 +++ .cvsignore 25 Jul 2008 05:17:24 -0000 1.6 @@ -1,3 +1,4 @@ publican-fedora-0.10.tgz publican-fedora-0.11.tgz publican-fedora-0.12.tgz +publican-fedora-0.13.tgz Index: publican-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/devel/publican-fedora.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- publican-fedora.spec 7 Apr 2008 07:34:39 -0000 1.4 +++ publican-fedora.spec 25 Jul 2008 05:17:24 -0000 1.5 @@ -2,13 +2,13 @@ Name: publican-%{brand} Summary: Publican documentation template files for %{brand} -Version: 0.12 +Version: 0.13 Release: 0%{?dist} License: Open Publication Group: Development/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildarch: noarch -Source: http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz +Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz Requires: publican BuildRequires: publican URL: https://fedorahosted.org/publican @@ -28,9 +28,13 @@ rm -rf $RPM_BUILD_ROOT mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Templates mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/make +mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand} cp -rf Common_Content $RPM_BUILD_ROOT%{_datadir}/publican/ cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Book_Template +cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Set_Template +cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Article_Template install -m 755 make/Makefile.%{brand} $RPM_BUILD_ROOT%{_datadir}/publican/make/. +install -m 755 xsl/*.xsl $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}/. %clean rm -rf $RPM_BUILD_ROOT @@ -40,10 +44,18 @@ %doc README %doc COPYING %{_datadir}/publican/Common_Content/%{brand} -%{_datadir}/publican/Templates/%{brand}-Book_Template +%{_datadir}/publican/Templates/%{brand}-*_Template %{_datadir}/publican/make/Makefile.%{brand} +%{_datadir}/publican/xsl/%{brand} %changelog +* Mon Apr 14 2008 Jeff Fearn 0.13-0 +- Fix missing list image in html-single articles +- QANDA set css fix BZ #442674 +- Override PDF Theme +- Added package tag BZ #444908 +- Added Article and Set Templates + * Mon Apr 7 2008 Jeff Fearn 0.12-0 - Add Desktop css customisations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Apr 2008 07:34:39 -0000 1.5 +++ sources 25 Jul 2008 05:17:24 -0000 1.6 @@ -1,3 +1 @@ -081a65ffa8680f3acb3d1a17b5de9c28 publican-fedora-0.10.tgz -68f6e964703c70258e9fb3b328ba869a publican-fedora-0.11.tgz -3258bb5285dcaa11d359dc91de81ae07 publican-fedora-0.12.tgz +61914fa32218fdbb8a2110e1e8b9bbc8 publican-fedora-0.13.tgz From fedora-extras-commits at redhat.com Fri Jul 25 05:23:13 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 25 Jul 2008 05:23:13 GMT Subject: rpms/python-migrate/devel .cvsignore, 1.2, 1.3 python-migrate.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807250523.m6P5NDHi016309@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16168 Modified Files: .cvsignore python-migrate.spec sources Log Message: Commit a new upstream version and test the new cvs notifylist. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jul 2008 16:38:51 -0000 1.2 +++ .cvsignore 25 Jul 2008 05:22:43 -0000 1.3 @@ -1 +1 @@ -sqlalchemy-migrate-0.4.4.tar.gz +sqlalchemy-migrate-0.4.5.tar.gz Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-migrate.spec 17 Jul 2008 19:58:16 -0000 1.2 +++ python-migrate.spec 25 Jul 2008 05:22:43 -0000 1.3 @@ -3,8 +3,8 @@ %define srcname sqlalchemy-migrate Name: python-migrate -Version: 0.4.4 -Release: 4%{?dist} +Version: 0.4.5 +Release: 1%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages @@ -59,6 +59,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.5-1 +- New upstream + * Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 - Disable py.test so we don't try to download it during build. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jul 2008 16:38:51 -0000 1.2 +++ sources 25 Jul 2008 05:22:43 -0000 1.3 @@ -1 +1 @@ -ea2da4aaeb82b538ec23148b35ead72c sqlalchemy-migrate-0.4.4.tar.gz +d4f17e2c7fcfbb7bd0df628d974c8e3e sqlalchemy-migrate-0.4.5.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 05:50:15 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Fri, 25 Jul 2008 05:50:15 GMT Subject: rpms/evolution-rss/devel evolution-rss-0.1.0-firefox-import.patch, NONE, 1.1 Message-ID: <200807250550.m6P5oFPP025125@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25106 Added Files: evolution-rss-0.1.0-firefox-import.patch Log Message: Fix firefox import RH bug #452322 evolution-rss-0.1.0-firefox-import.patch: --- NEW FILE evolution-rss-0.1.0-firefox-import.patch --- Index: src/misc.c =================================================================== --- src/misc.c (.../svn+ssh://lucilanga at svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/misc.c) (revision 333) +++ src/misc.c (.../src/misc.c) (working copy) @@ -65,6 +65,8 @@ { if (strstr(text, "feed//")) text = strextr(text, "feed//"); + if (strstr(text, "feed:")) + text = strextr(text, "feed:"); if (strstr(text, "feed://")) text = strextr(text, "feed://"); if (!strstr (text, "http://") Index: src/network-soup.c =================================================================== --- src/network-soup.c (.../svn+ssh://lucilanga at svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/network-soup.c) (revision 333) +++ src/network-soup.c (.../src/network-soup.c) (working copy) @@ -488,7 +488,7 @@ if (!rf->b_session) rf->b_session = soup_sess = - soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL); + soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL); else soup_sess = rf->b_session; @@ -499,14 +499,14 @@ G_CALLBACK (reauthenticate), soup_sess); #endif - suri = soup_uri_new(url); - if (!suri) + req = soup_message_new(SOUP_METHOD_GET, url); + if (!req) { g_set_error(err, NET_ERROR, NET_ERROR_GENERIC, soup_status_get_phrase(2)); //invalid url goto out; } - req = soup_message_new_from_uri(SOUP_METHOD_GET, suri); + d(g_print("request ok :%d\n", req->status_code)); g_signal_connect(G_OBJECT(req), "got-chunk", G_CALLBACK(got_chunk_blocking_cb), &info); for (; headers; headers = headers->next) { From fedora-extras-commits at redhat.com Fri Jul 25 05:57:08 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Fri, 25 Jul 2008 05:57:08 GMT Subject: rpms/publican/devel .cvsignore, 1.5, 1.6 publican.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200807250557.m6P5v8n9027562@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27399 Modified Files: .cvsignore publican.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Apr 2008 07:32:01 -0000 1.5 +++ .cvsignore 25 Jul 2008 05:56:37 -0000 1.6 @@ -1,3 +1,4 @@ publican-0.30.tgz publican-0.32.tgz publican-0.33.tgz +publican-0.34.tgz Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- publican.spec 15 Jul 2008 03:05:23 -0000 1.10 +++ publican.spec 25 Jul 2008 05:56:37 -0000 1.11 @@ -1,9 +1,12 @@ %define my_vendor fedora +%define EMBED_DOCKBOOK45 0 +%define HTMLVIEW 0 +%define PREMOLESTATION 0 Name: publican Summary: Common files and scripts for publishing Documentation -Version: 0.33 -Release: 2%{?dist} +Version: 0.34 +Release: 0%{?dist} License: GPLv2+ and GFDL # The following directories are licensed under the GFDL: # content @@ -11,15 +14,46 @@ Group: Applications/Text Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildarch: noarch -Source: http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz +Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz # need kdesdk for po2xml & xml2pot -Requires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks +Requires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl elinks aspell Requires: %{_bindir}/xml2pot %{_bindir}/po2xml -BuildRequires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl -BuildRequires: desktop-file-utils +Requires: perl-ParseLex perl-HTML-Template make +Requires: fop batik saxon ImageMagick +#Requires: xslthl + +BuildRequires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl aspell BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml +BuildRequires: desktop-file-utils +# FOP is required to build the mont metrics. +BuildRequires: fop saxon +#BuildRequires: xslthl +# *&%^*&^ decided to rename font packages and change font paths. +# No actual real changes. +%if %{PREMOLESTATION} +Requires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +Requires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +Requires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +Requires: fonts-tamil fonts-telugu liberation-fonts + +BuildRequires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +BuildRequires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +BuildRequires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +BuildRequires: fonts-tamil fonts-telugu liberation-fonts +%else +Requires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +Requires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts fonts-korean + +BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts fonts-korean +%endif + URL: https://fedorahosted.org/publican -Obsoletes: documentation-devel < 0.26-3 +Obsoletes: documentation-devel < 0.26-3 Obsoletes: perl-SGML-Translate <= 0.37-3 %description @@ -28,7 +62,11 @@ %package doc Group: Documentation Summary: Documentation for the Publican package +%if %{HTMLVIEW} +Requires: htmlview +%else Requires: xdg-utils +%endif %description doc Documentation for the Publican publishing tool chain. @@ -38,6 +76,7 @@ %build %{__make} docs +./fop-fonts --dist=%{?dist} %install rm -rf $RPM_BUILD_ROOT @@ -45,13 +84,31 @@ mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p -m755 $RPM_BUILD_ROOT%{_bindir} install -m 755 bin/* $RPM_BUILD_ROOT%{_bindir} + +%if %{EMBED_DOCKBOOK45} +%{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates +%endif + for i in fop make xsl Common_Content templates; do cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i done cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template +cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Set_Template +cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Article_Template + +%if %{EMBED_DOCKBOOK45} +cp -rf xsl_extras/docbook $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. +%endif + +cp xsl_extras/docbook/1.72.0/extensions/saxon65.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop + +%if %{HTMLVIEW} +sed -i -e 's|xdg-open|htmlview|' %{name}.desktop +%endif + desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop %clean @@ -84,11 +141,51 @@ %doc fdl.txt %changelog -* Tue Jul 15 2008 Jeff Fearn 0.33-2 -- Rebuild +* Fri Apr 11 2008 Jeff Fearn 0.34-0 +- Fix PO file name missing from translation status report +- Modify xmlClean to output dummy content for empty files (beta) +- Default SHOW_UNKNOWN tags off +- Make unset entity warnings more obvious +- Make docs use DESKTOP styles +- Fix missing list image in html-single articles +- Commented out debug output in chunking xsl +- QANDA set html and css fix BZ #442674 +- Fix kde requires. BZ #443024 +- Add default FOP xconf file. +- Added help_internals target. +- Added check for banned tags. +- Added --lang to create_book BZ #444851 +- Added package tag BZ #444908 +- Added ability to ship $lang/files directories with html/xml payloads BZ #444935 +- Hardcoded PDF footnote colour to black BZ #446011 +- Set segmentedlist.as.table to 1. BZ #445628 +- Force monospace on command +- Switched to FOP 0.95Beta +- Fixed crash bug on files names with parentheses BZ #447659 +- Fix loose directory name matching when exluding directiories. +- Added GENERATE_SECTION_TOC_LEVEL to allow section level TOC control. BZ #449720 +- Banned inlinegraphic. BZ #448331 +- Added Article and Set Templates +- Banned xreflabel and endterm. BZ #452051 +- Generate FOP config file and font-metricfiles as build. BZ #451913 +- Changed HTML and PDF common brand to more pleasing colors. BZ #442675 +- Fixed incorrect PDF colours on Fedora and Common brands. BZ #442988 +- Fixed PDF TOC missing Chapter numbers on Sections. BZ #452802 +- Fixed spaces being removed between inline tags. BZ #453067 +- Changed TOC layout (bold chapters + spacing). BZ #453885 +- Changed title spacing, unbolded figure/table titles. +- Fix over size images breaking PDF and HTML layouts +- Add missing make Requires. BZ #454376 +- Added call to aspell to spell check. +- Fixed incorrect other credit title in PDF. BZ #454394 +- Turned on Hyphenation to split verbatim lines. +- Added code highlighting to CSS and PDF +- Remove trailing '.' from formal para title. BZ #455826 +- Restructure CSS for easier maintenance of brands +- Add documentation on publican design philosophy. BZ #456170 +- Italicised package tag. BZ #442668 +- Updated documentation descriptions of Book_Info.xml tags. BZ #456489 BZ #456488 -* Tue Jul 15 2008 Jeff Fearn 0.33-1 -- Change kde reqs to a more portable format * Mon Apr 7 2008 Jeff Fearn 0.33-0 - Remove release from package name in html desktop spec file @@ -364,6 +461,8 @@ - Added Legal_Notice to common - Moved balance of non-translatable entities out of Translatable-entities.ent, updated po files - Added missing Req perl-SGML-Translate, used for translation reports +- Updated documentation descriptions of Book_Info.xml tags. BZ #456489 BZ #456488 + * Tue May 01 2007 Jeff Fearn 0.10 - fix image dimensions on content/common/en-US/images/redhat-logo.svg Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 May 2008 05:28:50 -0000 1.6 +++ sources 25 Jul 2008 05:56:37 -0000 1.7 @@ -1 +1 @@ -8a8450730a6aa3fa6fa362d95465e46e publican-0.33.tgz +6a2f366acfaa8af0119f8c5fde2d9f05 publican-0.34.tgz From fedora-extras-commits at redhat.com Fri Jul 25 06:06:21 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 25 Jul 2008 06:06:21 GMT Subject: rpms/crossfire-maps/F-9 .cvsignore, 1.4, 1.5 crossfire-maps.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200807250606.m6P66LF4004842@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4623 Modified Files: .cvsignore crossfire-maps.spec sources Log Message: Update to 1.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 May 2007 18:54:23 -0000 1.4 +++ .cvsignore 25 Jul 2008 06:05:51 -0000 1.5 @@ -1 +1 @@ -crossfire-1.10.0.maps.tar.gz +crossfire-1.11.0.maps.tar.gz Index: crossfire-maps.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/F-9/crossfire-maps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- crossfire-maps.spec 19 Aug 2007 16:38:35 -0000 1.7 +++ crossfire-maps.spec 25 Jul 2008 06:05:51 -0000 1.8 @@ -1,6 +1,6 @@ Name: crossfire-maps -Version: 1.10.0 -Release: 3%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Map files for the crossfire server Group: Amusements/Games @@ -31,6 +31,14 @@ chmod -x maps/pup_land/lone_town/cave/* chmod -x maps/templates/keep/*.tpl chmod -x maps/templates/guild/bigchest +chmod -x maps/navar_city/troll_canyon/* +chmod -x maps/brest/sow/sow.1 +chmod -x maps/lake_country/elven_moon/* +chmod -x maps/unlinked/casino/casino_infernal +chmod -x maps/santo_dominion/shaft/* +chmod -x maps/santo_dominion/temple_naive/* +chmod -x maps/darcap/temple_justice/* +chmod -x maps/brest/sow/sow %{__sed} -i 's/\r//' maps/templates/keep/keep1.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep2.tpl @@ -59,6 +67,9 @@ %{_datadir}/crossfire/maps %changelog +* Thu Jul 24 2008 Wart 1.11.0-1 +- Update to 1.11.0 + * Sat Aug 18 2007 Wart 1.10.0-3 - License tag clarification Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 May 2007 18:54:23 -0000 1.4 +++ sources 25 Jul 2008 06:05:51 -0000 1.5 @@ -1 +1 @@ -0c410171602268b0499f3b62091fafa4 crossfire-1.10.0.maps.tar.gz +f0c3f1459e42163a500ce9be3cad39d2 crossfire-1.11.0.maps.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 06:06:58 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Fri, 25 Jul 2008 06:06:58 GMT Subject: rpms/publican/devel publican.spec,1.11,1.12 Message-ID: <200807250606.m6P66wp4005041@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4874 Modified Files: publican.spec Log Message: grrr Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- publican.spec 25 Jul 2008 05:56:37 -0000 1.11 +++ publican.spec 25 Jul 2008 06:06:27 -0000 1.12 @@ -44,7 +44,8 @@ Requires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati Requires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts fonts-korean +Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts +# fonts-korean BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada @@ -141,6 +142,9 @@ %doc fdl.txt %changelog +* Fri Apr 11 2008 Jeff Fearn 0.34-1 +- No Korean support + * Fri Apr 11 2008 Jeff Fearn 0.34-0 - Fix PO file name missing from translation status report - Modify xmlClean to output dummy content for empty files (beta) From fedora-extras-commits at redhat.com Fri Jul 25 06:08:53 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 25 Jul 2008 06:08:53 GMT Subject: rpms/crossfire/F-9 .cvsignore, 1.4, 1.5 crossfire.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807250608.m6P68rFO005749@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556 Modified Files: .cvsignore crossfire.spec sources Log Message: Update to 1.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 May 2007 18:39:12 -0000 1.4 +++ .cvsignore 25 Jul 2008 06:08:23 -0000 1.5 @@ -1,2 +1,2 @@ -crossfire-1.10.0.tar.gz -crossfire-1.10.0.arch.tar.gz +crossfire-1.11.0.tar.gz +crossfire-1.11.0.arch.tar.gz Index: crossfire.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire/F-9/crossfire.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- crossfire.spec 18 Jun 2008 11:07:13 -0000 1.9 +++ crossfire.spec 25 Jul 2008 06:08:23 -0000 1.10 @@ -6,8 +6,8 @@ %define logwatch_scripts %{logwatch_root}/scripts Name: crossfire -Version: 1.10.0 -Release: 5%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -24,8 +24,7 @@ Source8: logwatch.logconf.crossfire Source9: logwatch.script.crossfire Source10: logwatch.serviceconf.crossfire -Patch0: crossfire-1.9.1-logtimestamp.patch -Patch1: crossfire-1.10.0-log-login.patch +Patch0: crossfire-1.10.0-log-login.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: crossfire-maps BuildRequires: checkpolicy selinux-policy-devel hardlink @@ -106,7 +105,6 @@ %setup -q %setup -q -a 1 %patch0 -p0 -%patch1 -p0 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux @@ -293,6 +291,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/news %config(noreplace) %{_sysconfdir}/%{name}/rules %config(noreplace) %{_sysconfdir}/%{name}/settings +%config(noreplace) %{_sysconfdir}/%{name}/metaserver2 %attr(-,crossfire,root) %{_var}/games/%{name} %attr(-,crossfire,root) %{_var}/log/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -332,6 +331,9 @@ %changelog +* Thu Jul 24 2008 Wart 1.11.0-1 +- Update to 1.11.0 + * Wed Jun 18 2008 Wart 1.10.0-5 - Fix creation of the crossfire user (BZ #442384) Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 May 2007 18:39:12 -0000 1.4 +++ sources 25 Jul 2008 06:08:23 -0000 1.5 @@ -1,2 +1,2 @@ -d56ad6cac04ea49f8b6b326b441553a3 crossfire-1.10.0.tar.gz -26a6d6c2ffb82fd408bf75b25ed339d1 crossfire-1.10.0.arch.tar.gz +4c2e8f60ca57fb140808d07e62b072a9 crossfire-1.11.0.tar.gz +cba07d6d4ec61e1b08d2bf1c88e8821c crossfire-1.11.0.arch.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 06:12:30 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Fri, 25 Jul 2008 06:12:30 GMT Subject: rpms/publican/devel publican.spec,1.12,1.13 Message-ID: <200807250612.m6P6CUwR007060@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6855 Modified Files: publican.spec Log Message: grrr Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- publican.spec 25 Jul 2008 06:06:27 -0000 1.12 +++ publican.spec 25 Jul 2008 06:12:00 -0000 1.13 @@ -50,7 +50,8 @@ BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts fonts-korean +BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts +# fonts-korean %endif URL: https://fedorahosted.org/publican From fedora-extras-commits at redhat.com Fri Jul 25 06:19:01 2008 From: fedora-extras-commits at redhat.com (Jeff Fearn (jfearn)) Date: Fri, 25 Jul 2008 06:19:01 GMT Subject: rpms/publican/devel publican.spec,1.13,1.14 Message-ID: <200807250619.m6P6J13Z008971@cvs-int.fedora.redhat.com> Author: jfearn Update of /cvs/pkgs/rpms/publican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8857 Modified Files: publican.spec Log Message: stupid me Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- publican.spec 25 Jul 2008 06:12:00 -0000 1.13 +++ publican.spec 25 Jul 2008 06:18:31 -0000 1.14 @@ -143,9 +143,6 @@ %doc fdl.txt %changelog -* Fri Apr 11 2008 Jeff Fearn 0.34-1 -- No Korean support - * Fri Apr 11 2008 Jeff Fearn 0.34-0 - Fix PO file name missing from translation status report - Modify xmlClean to output dummy content for empty files (beta) From fedora-extras-commits at redhat.com Fri Jul 25 07:19:58 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 25 Jul 2008 07:19:58 GMT Subject: rpms/tcl/devel .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 tcl.spec, 1.78, 1.79 Message-ID: <200807250719.m6P7Jw38026264@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26161 Modified Files: .cvsignore sources tcl.spec Log Message: * Fri Jul 25 2008 Marcela Maslanova - 1:8.5.3-1 - update to 8.5.3 - create vers macro for provides, obsoletes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tcl/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 19 May 2008 12:41:11 -0000 1.24 +++ .cvsignore 25 Jul 2008 07:19:28 -0000 1.25 @@ -1 +1 @@ -tcl8.5.2-src.tar.gz +tcl8.5.3-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tcl/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 19 May 2008 12:41:11 -0000 1.25 +++ sources 25 Jul 2008 07:19:28 -0000 1.26 @@ -1 +1 @@ -2eeff7a61844b3e6de5202da1275cff1 tcl8.5.2-src.tar.gz +651b2dc097a0291e31d44c72dcb5135e tcl8.5.3-src.tar.gz Index: tcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- tcl.spec 2 Jul 2008 08:06:34 -0000 1.78 +++ tcl.spec 25 Jul 2008 07:19:28 -0000 1.79 @@ -1,9 +1,10 @@ %define majorver 8.5 +%define vers %{majorver}.3 Summary: Tcl scripting language development environment Name: tcl -Version: %{majorver}.2 -Release: 3%{?dist} +Version: %{vers} +Release: 1%{?dist} Epoch: 1 License: TCL Group: Development/Languages @@ -12,8 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf Provides: tcl(abi) = %{majorver} -Obsoletes: tcl-tcldict <= 8.5.2 -Provides: tcl-tcldict = 8.5.2 +Obsoletes: tcl-tcldict <= %{vers} +Provides: tcl-tcldict = %{vers} Patch0: tcl-8.5.1-autopath.patch Patch1: tcl-8.5.0-conf.patch Patch2: tcl-8.5.0-hidden.patch @@ -123,6 +124,10 @@ %{_libdir}/%{name}8.5/%{name}Config.sh %changelog +* Fri Jul 25 2008 Marcela Maslanova - 1:8.5.3-1 +- update to 8.5.3 +- create vers macro for provides, obsoletes + * Mon Jul 2 2008 Marcela Maslanova - 1:8.5.2-3 - tclConfig.sh was fixed again with symlink into libdir/tcl8.5. Many packages are looking in /usr/lib, because tcl dir is versioned. From fedora-extras-commits at redhat.com Fri Jul 25 07:31:28 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 25 Jul 2008 07:31:28 GMT Subject: rpms/libgnome/devel libgnome.spec,1.121,1.122 Message-ID: <200807250731.m6P7VSJq028472@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/libgnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28336 Modified Files: libgnome.spec Log Message: Damn no fuzzing Index: libgnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- libgnome.spec 24 Jul 2008 23:58:07 -0000 1.121 +++ libgnome.spec 25 Jul 2008 07:30:58 -0000 1.122 @@ -1,3 +1,5 @@ +%define _default_patch_fuzz 2 + %define glib2_version 2.6.0 %define libbonobo_version 2.13.0 %define libxml2_version 2.5 From fedora-extras-commits at redhat.com Fri Jul 25 07:35:39 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Fri, 25 Jul 2008 07:35:39 GMT Subject: rpms/vpnc/F-9 vpnc-0.5.1-cloexec.patch, NONE, 1.1 vpnc-0.5.1-domain.patch, NONE, 1.1 vpnc-cleanup, NONE, 1.1 vpnc.spec, 1.29, 1.30 vpnc-0.4.0-cloexec.patch, 1.2, NONE Message-ID: <200807250735.m6P7ZdqM029465@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/vpnc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29334 Modified Files: vpnc.spec Added Files: vpnc-0.5.1-cloexec.patch vpnc-0.5.1-domain.patch vpnc-cleanup Removed Files: vpnc-0.4.0-cloexec.patch Log Message: * Thu Jul 24 2008 Tomas Mraz - 0.5.1-6 - do not modify domain in resolv.conf (#446404) - clean up modified resolv.conf on startup (#455899) vpnc-0.5.1-cloexec.patch: --- NEW FILE vpnc-0.5.1-cloexec.patch --- diff -up vpnc-0.5.1/vpnc.c.cloexec vpnc-0.5.1/vpnc.c --- vpnc-0.5.1/vpnc.c.cloexec 2007-09-10 22:39:48.000000000 +0200 +++ vpnc-0.5.1/vpnc.c 2008-07-24 23:29:49.000000000 +0200 @@ -2693,6 +2693,8 @@ static void setup_link(struct sa_block * close_tunnel(); error(1, errno, "socket(PF_INET, SOCK_RAW, IPPROTO_ESP)"); } + fcntl(s->esp_fd, F_SETFD, FD_CLOEXEC); + #ifdef IP_HDRINCL if (setsockopt(s->esp_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1) { close_tunnel(); vpnc-0.5.1-domain.patch: --- NEW FILE vpnc-0.5.1-domain.patch --- diff -up vpnc-0.5.1/vpnc-script.domain vpnc-0.5.1/vpnc-script --- vpnc-0.5.1/vpnc-script.domain 2008-07-24 22:06:21.000000000 +0200 +++ vpnc-0.5.1/vpnc-script 2008-07-24 22:07:08.000000000 +0200 @@ -238,7 +238,7 @@ EOF LINE="" fi ;; - domain*|search*) + search*) if [ -n "$CISCO_DEF_DOMAIN" ]; then LINE="$LINE $CISCO_DEF_DOMAIN" CISCO_DEF_DOMAIN="" --- NEW FILE vpnc-cleanup --- # vpnc-cleanup - clean up vpnc modified resolv.conf # start on stopped rcS stop on runlevel script rm -f /var/run/vpnc/pid RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup if [ -e "$RESOLV_CONF_BACKUP" ]; then grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 && cat "$RESOLV_CONF_BACKUP" > /etc/resolv.conf rm -f -- "$RESOLV_CONF_BACKUP" fi end script Index: vpnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vpnc/F-9/vpnc.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vpnc.spec 5 Apr 2008 19:16:05 -0000 1.29 +++ vpnc.spec 25 Jul 2008 07:35:09 -0000 1.30 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: IPSec VPN client compatible with Cisco equipment @@ -13,14 +13,16 @@ Source3: vpnc-disconnect.consolehelper Source4: vpnc.pam Source5: vpnc-helper -Patch2: vpnc-0.4.0-cloexec.patch +Source6: vpnc-cleanup +Patch2: vpnc-0.5.1-cloexec.patch Patch3: vpnc-0.5.1-dpd.patch Patch4: vpnc-0.5.1-mtu.patch +Patch5: vpnc-0.5.1-domain.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel > 1.1.90 -Requires: kernel >= 2.4 +Requires: upstart iproute %description A VPN client compatible with Cisco's EasyVPN equipment. @@ -43,6 +45,7 @@ %patch2 -p1 -b .cloexec %patch3 -p1 -b .dpd %patch4 -p1 -b .mtu +%patch5 -p1 -b .domain %build CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr @@ -72,6 +75,8 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect +install -Dp -m 0644 %{SOURCE6} \ + $RPM_BUILD_ROOT%{_sysconfdir}/event.d/vpnc-cleanup %clean rm -rf $RPM_BUILD_ROOT @@ -83,6 +88,7 @@ %dir %{_sysconfdir}/vpnc %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script %config(noreplace) %{_sysconfdir}/vpnc/default.conf +%config(noreplace) %{_sysconfdir}/event.d/vpnc-cleanup %{_sbindir}/vpnc %{_bindir}/cisco-decrypt %{_sbindir}/vpnc-disconnect @@ -101,6 +107,10 @@ %{_sbindir}/vpnc-helper %changelog +* Thu Jul 24 2008 Tomas Mraz - 0.5.1-6 +- do not modify domain in resolv.conf (#446404) +- clean up modified resolv.conf on startup (#455899) + * Sat Apr 5 2008 Michal Schmidt - 0.5.1-5 - vpnc-script: fix 'ip link ...' syntax. --- vpnc-0.4.0-cloexec.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 07:41:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 25 Jul 2008 07:41:25 GMT Subject: rpms/tcl-html/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tcl-html.spec, 1.3, 1.4 Message-ID: <200807250741.m6P7fPrt030479@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tcl-html/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30361 Modified Files: .cvsignore sources tcl-html.spec Log Message: * Mon May 19 2008 Marcela Maslanova - 8.5.3-1 - update to 8.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tcl-html/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2008 13:15:15 -0000 1.4 +++ .cvsignore 25 Jul 2008 07:40:55 -0000 1.5 @@ -1 +1 @@ -tcl8.5.2-html.tar.gz +tcl8.5.3-html.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tcl-html/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2008 13:15:15 -0000 1.4 +++ sources 25 Jul 2008 07:40:55 -0000 1.5 @@ -1 +1 @@ -b64b16a0d98be52651ea9094a4a21d00 tcl8.5.2-html.tar.gz +8df900e3311240ae16f92441e6d16f5a tcl8.5.3-html.tar.gz Index: tcl-html.spec =================================================================== RCS file: /cvs/pkgs/rpms/tcl-html/devel/tcl-html.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tcl-html.spec 19 May 2008 13:15:15 -0000 1.3 +++ tcl-html.spec 25 Jul 2008 07:40:55 -0000 1.4 @@ -1,8 +1,8 @@ %define majorver 8.5 - +%define vers %{majorver}.3 Summary: Tcl/Tk manual in html format Name: tcl-html -Version: %{majorver}.2 +Version: %{vers} Release: 1%{?dist} License: TCL Group: Documentation @@ -35,6 +35,9 @@ %doc html/* %changelog +* Mon May 19 2008 Marcela Maslanova - 8.5.3-1 +- update to 8.5.3 + * Mon May 19 2008 Marcela Maslanova - 8.5.2-1 - new version tcl8.5.2 From fedora-extras-commits at redhat.com Fri Jul 25 07:45:36 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 25 Jul 2008 07:45:36 GMT Subject: rpms/tk/devel .cvsignore, 1.15, 1.16 sources, 1.17, 1.18 tk.spec, 1.53, 1.54 Message-ID: <200807250745.m6P7jaae031310@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31219 Modified Files: .cvsignore sources tk.spec Log Message: * Fri Jul 25 2008 Marcela Maslanova - 1:8.5.3-1 - update to 8.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tk/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 19 May 2008 12:56:46 -0000 1.15 +++ .cvsignore 25 Jul 2008 07:45:06 -0000 1.16 @@ -1 +1,2 @@ tk8.5.2-src.tar.gz +tk8.5.3-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tk/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 19 May 2008 12:56:46 -0000 1.17 +++ sources 25 Jul 2008 07:45:06 -0000 1.18 @@ -1 +1,2 @@ bd014bd3e1a818e06ad375b95241452d tk8.5.2-src.tar.gz +c7d2ef187d0f313850689cda20148ec3 tk8.5.3-src.tar.gz Index: tk.spec =================================================================== RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- tk.spec 19 May 2008 12:56:46 -0000 1.53 +++ tk.spec 25 Jul 2008 07:45:06 -0000 1.54 @@ -1,8 +1,9 @@ %define majorver 8.5 +%define vers %{majorver}.3 Summary: The graphical toolkit for the Tcl scripting language Name: tk -Version: %{majorver}.2 +Version: %{vers} Release: 1%{?dist} Epoch: 1 License: TCL @@ -112,6 +113,9 @@ %{_mandir}/man3/* %changelog +* Fri Jul 25 2008 Marcela Maslanova - 1:8.5.3-1 +- update to 8.5.3 + * Mon May 19 2008 Marcela Maslanova - 1:8.5.2-1 - new version tk8.5.2 From fedora-extras-commits at redhat.com Fri Jul 25 07:49:46 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:49:46 GMT Subject: rpms/phpMyAdmin/EL-4 .cvsignore, 1.17, 1.18 phpMyAdmin.spec, 1.24, 1.25 sources, 1.21, 1.22 Message-ID: <200807250749.m6P7nkHU032303@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32035/EL-4 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8-rc1 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 15 Jul 2008 20:48:47 -0000 1.17 +++ .cvsignore 25 Jul 2008 07:49:15 -0000 1.18 @@ -1 +1 @@ -phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- phpMyAdmin.spec 15 Jul 2008 20:48:47 -0000 1.24 +++ phpMyAdmin.spec 25 Jul 2008 07:49:15 -0000 1.25 @@ -1,12 +1,12 @@ Name: phpMyAdmin -Version: 2.11.7.1 -Release: 1%{?dist} +Version: 2.11.8 +Release: 0.1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 +- Upstream released 2.11.8-rc1 (#456637) + * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 15 Jul 2008 20:48:47 -0000 1.21 +++ sources 25 Jul 2008 07:49:15 -0000 1.22 @@ -1 +1 @@ -68f3933a0f1a01fe2d131bff597af1a3 phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 07:49:46 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:49:46 GMT Subject: rpms/phpMyAdmin/EL-5 .cvsignore, 1.17, 1.18 phpMyAdmin.spec, 1.24, 1.25 sources, 1.21, 1.22 Message-ID: <200807250749.m6P7nkIA032313@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32035/EL-5 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8-rc1 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 15 Jul 2008 20:49:15 -0000 1.17 +++ .cvsignore 25 Jul 2008 07:49:16 -0000 1.18 @@ -1 +1 @@ -phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- phpMyAdmin.spec 15 Jul 2008 20:49:15 -0000 1.24 +++ phpMyAdmin.spec 25 Jul 2008 07:49:16 -0000 1.25 @@ -1,12 +1,12 @@ Name: phpMyAdmin -Version: 2.11.7.1 -Release: 1%{?dist} +Version: 2.11.8 +Release: 0.1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 +- Upstream released 2.11.8-rc1 (#456637) + * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 15 Jul 2008 20:49:15 -0000 1.21 +++ sources 25 Jul 2008 07:49:16 -0000 1.22 @@ -1 +1 @@ -68f3933a0f1a01fe2d131bff597af1a3 phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 07:49:47 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:49:47 GMT Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.21, 1.22 phpMyAdmin.spec, 1.24, 1.25 sources, 1.21, 1.22 Message-ID: <200807250749.m6P7nlWD032327@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32035/F-9 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8-rc1 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 15 Jul 2008 20:50:05 -0000 1.21 +++ .cvsignore 25 Jul 2008 07:49:17 -0000 1.22 @@ -1 +1 @@ -phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- phpMyAdmin.spec 15 Jul 2008 20:50:05 -0000 1.24 +++ phpMyAdmin.spec 25 Jul 2008 07:49:17 -0000 1.25 @@ -1,12 +1,12 @@ Name: phpMyAdmin -Version: 2.11.7.1 -Release: 1%{?dist} +Version: 2.11.8 +Release: 0.1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 +- Upstream released 2.11.8-rc1 (#456637) + * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 15 Jul 2008 20:50:05 -0000 1.21 +++ sources 25 Jul 2008 07:49:17 -0000 1.22 @@ -1 +1 @@ -68f3933a0f1a01fe2d131bff597af1a3 phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 07:49:47 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:49:47 GMT Subject: rpms/phpMyAdmin/devel .cvsignore, 1.21, 1.22 phpMyAdmin.spec, 1.24, 1.25 sources, 1.21, 1.22 Message-ID: <200807250749.m6P7nlvu032335@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32035/devel Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8-rc1 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 15 Jul 2008 20:50:23 -0000 1.21 +++ .cvsignore 25 Jul 2008 07:49:17 -0000 1.22 @@ -1 +1 @@ -phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- phpMyAdmin.spec 15 Jul 2008 20:50:23 -0000 1.24 +++ phpMyAdmin.spec 25 Jul 2008 07:49:17 -0000 1.25 @@ -1,12 +1,12 @@ Name: phpMyAdmin -Version: 2.11.7.1 -Release: 1%{?dist} +Version: 2.11.8 +Release: 0.1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 +- Upstream released 2.11.8-rc1 (#456637) + * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 15 Jul 2008 20:50:23 -0000 1.21 +++ sources 25 Jul 2008 07:49:17 -0000 1.22 @@ -1 +1 @@ -68f3933a0f1a01fe2d131bff597af1a3 phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 07:49:47 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:49:47 GMT Subject: rpms/phpMyAdmin/F-8 .cvsignore, 1.18, 1.19 phpMyAdmin.spec, 1.24, 1.25 sources, 1.21, 1.22 Message-ID: <200807250749.m6P7nlRK032320@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32035/F-8 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8-rc1 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 15 Jul 2008 20:49:38 -0000 1.18 +++ .cvsignore 25 Jul 2008 07:49:16 -0000 1.19 @@ -1 +1 @@ -phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/phpMyAdmin.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- phpMyAdmin.spec 15 Jul 2008 20:49:38 -0000 1.24 +++ phpMyAdmin.spec 25 Jul 2008 07:49:16 -0000 1.25 @@ -1,12 +1,12 @@ Name: phpMyAdmin -Version: 2.11.7.1 -Release: 1%{?dist} +Version: 2.11.8 +Release: 0.1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 +- Upstream released 2.11.8-rc1 (#456637) + * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 15 Jul 2008 20:49:38 -0000 1.21 +++ sources 25 Jul 2008 07:49:16 -0000 1.22 @@ -1 +1 @@ -68f3933a0f1a01fe2d131bff597af1a3 phpMyAdmin-2.11.7.1-all-languages.tar.bz2 +8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 07:52:09 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:52:09 GMT Subject: rpms/phpMyAdmin/EL-4 phpMyAdmin.spec,1.25,1.26 Message-ID: <200807250752.m6P7q9IM000543@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv319/EL-4 Modified Files: phpMyAdmin.spec Log Message: Corrected a typo for 2.11.8-rc1 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- phpMyAdmin.spec 25 Jul 2008 07:49:15 -0000 1.25 +++ phpMyAdmin.spec 25 Jul 2008 07:51:39 -0000 1.26 @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-all-languages +%setup -qn phpMyAdmin-%{version}-rc1-all-languages %install rm -rf %{buildroot} From fedora-extras-commits at redhat.com Fri Jul 25 07:52:09 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:52:09 GMT Subject: rpms/phpMyAdmin/EL-5 phpMyAdmin.spec,1.25,1.26 Message-ID: <200807250752.m6P7q9O1000548@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv319/EL-5 Modified Files: phpMyAdmin.spec Log Message: Corrected a typo for 2.11.8-rc1 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- phpMyAdmin.spec 25 Jul 2008 07:49:16 -0000 1.25 +++ phpMyAdmin.spec 25 Jul 2008 07:51:39 -0000 1.26 @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-all-languages +%setup -qn phpMyAdmin-%{version}-rc1-all-languages %install rm -rf %{buildroot} From fedora-extras-commits at redhat.com Fri Jul 25 07:52:10 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:52:10 GMT Subject: rpms/phpMyAdmin/F-8 phpMyAdmin.spec,1.25,1.26 Message-ID: <200807250752.m6P7qAvo000551@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv319/F-8 Modified Files: phpMyAdmin.spec Log Message: Corrected a typo for 2.11.8-rc1 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/phpMyAdmin.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- phpMyAdmin.spec 25 Jul 2008 07:49:16 -0000 1.25 +++ phpMyAdmin.spec 25 Jul 2008 07:51:40 -0000 1.26 @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-all-languages +%setup -qn phpMyAdmin-%{version}-rc1-all-languages %install rm -rf %{buildroot} From fedora-extras-commits at redhat.com Fri Jul 25 07:52:10 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:52:10 GMT Subject: rpms/phpMyAdmin/F-9 phpMyAdmin.spec,1.25,1.26 Message-ID: <200807250752.m6P7qAIv000555@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv319/F-9 Modified Files: phpMyAdmin.spec Log Message: Corrected a typo for 2.11.8-rc1 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- phpMyAdmin.spec 25 Jul 2008 07:49:17 -0000 1.25 +++ phpMyAdmin.spec 25 Jul 2008 07:51:40 -0000 1.26 @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-all-languages +%setup -qn phpMyAdmin-%{version}-rc1-all-languages %install rm -rf %{buildroot} From fedora-extras-commits at redhat.com Fri Jul 25 07:52:11 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 07:52:11 GMT Subject: rpms/phpMyAdmin/devel phpMyAdmin.spec,1.25,1.26 Message-ID: <200807250752.m6P7qB5n000561@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv319/devel Modified Files: phpMyAdmin.spec Log Message: Corrected a typo for 2.11.8-rc1 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- phpMyAdmin.spec 25 Jul 2008 07:49:17 -0000 1.25 +++ phpMyAdmin.spec 25 Jul 2008 07:51:41 -0000 1.26 @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-all-languages +%setup -qn phpMyAdmin-%{version}-rc1-all-languages %install rm -rf %{buildroot} From fedora-extras-commits at redhat.com Fri Jul 25 08:25:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 25 Jul 2008 08:25:40 GMT Subject: rpms/perl-XML-Twig/devel perl-XML-Twig.spec,1.22,1.23 Message-ID: <200807250825.m6P8PejN013189@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-XML-Twig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13061 Modified Files: perl-XML-Twig.spec Log Message: Fix last rpmlint message. Index: perl-XML-Twig.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- perl-XML-Twig.spec 3 Mar 2008 02:35:47 -0000 1.22 +++ perl-XML-Twig.spec 25 Jul 2008 08:25:10 -0000 1.23 @@ -65,6 +65,8 @@ %{__perl} Makefile.PL -y INSTALLDIRS=vendor make %{?_smp_mflags} +cp Changes Changes.orig +iconv -f iso88591 -t utf8 < Changes.orig > Changes %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Fri Jul 25 08:50:09 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 25 Jul 2008 08:50:09 GMT Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.36, 1.37 Message-ID: <200807250850.m6P8o9JT016918@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16768 Modified Files: gnome-settings-daemon.spec Log Message: * Fri Jul 25 2008 - Bastien Nocera - 2.23.5-2 - Fix build, call gtk-update-icon-cache as required Index: gnome-settings-daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gnome-settings-daemon.spec 24 Jul 2008 20:18:43 -0000 1.36 +++ gnome-settings-daemon.spec 25 Jul 2008 08:49:39 -0000 1.37 @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -87,6 +87,10 @@ %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \ %{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \ >& /dev/null || : +touch %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi %pre if [ "$1" -gt 1 ]; then @@ -120,6 +124,12 @@ >& /dev/null || : fi +%postun +touch %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS @@ -129,6 +139,7 @@ %{_datadir}/gnome-settings-daemon/ %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service %{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop +%{_datadir}/icons/hicolor/*/apps/gsd-xrandr.* %files devel %defattr(-,root,root,-) @@ -136,6 +147,9 @@ %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Fri Jul 25 2008 - Bastien Nocera - 2.23.5-2 +- Fix build, call gtk-update-icon-cache as required + * Thu Jul 24 2008 Soren Sandmann - 2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Fri Jul 25 08:57:06 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 25 Jul 2008 08:57:06 GMT Subject: rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk.spec,1.27,1.28 Message-ID: <200807250857.m6P8v6DV018198@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18038/EL-5 Modified Files: java-1.6.0-openjdk.spec Log Message: Synchronize fedora and EPEL packages Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- java-1.6.0-openjdk.spec 23 Jul 2008 23:02:42 -0000 1.27 +++ java-1.6.0-openjdk.spec 25 Jul 2008 08:56:36 -0000 1.28 @@ -109,7 +109,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.19.%{openjdkver}%{?dist}.1 +Release: 0.20.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -906,7 +906,7 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog -* Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.14.b11.1 +* Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.20.b11 - Specify vendor for javaws desktop entry. - Merge EPEL-5 and Fedora devel packages. From fedora-extras-commits at redhat.com Fri Jul 25 08:57:06 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 25 Jul 2008 08:57:06 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.64,1.65 Message-ID: <200807250857.m6P8v6iQ018203@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18038/devel Modified Files: java-1.6.0-openjdk.spec Log Message: Synchronize fedora and EPEL packages Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- java-1.6.0-openjdk.spec 21 Jul 2008 20:52:40 -0000 1.64 +++ java-1.6.0-openjdk.spec 25 Jul 2008 08:56:36 -0000 1.65 @@ -109,7 +109,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.19.%{openjdkver}%{?dist} +Release: 0.20.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -139,6 +139,7 @@ Patch0: java-1.6.0-openjdk-optflags.patch Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch Patch2: java-1.6.0-openjdk-makefile.patch +Patch3: java-1.6.0-openjdk-freetype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -146,7 +147,11 @@ BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel +%if 0%{?fedora} BuildRequires: lesstif-devel +%else +BuildRequires: openmotif-devel +%endif BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXp-devel @@ -171,7 +176,7 @@ BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-fonts-Type1 BuildRequires: xorg-x11-fonts-misc -BuildRequires: freetype-devel >= 2.3.0 +BuildRequires: freetype-devel >= 2.2.0 BuildRequires: fontconfig BuildRequires: eclipse-ecj # Java Access Bridge for GNOME build requirements. @@ -190,10 +195,16 @@ %endif Requires: libjpeg = 6b +%if 0%{?fedora} > 9 # Require /etc/pki/java/cacerts. Requires: ca-certificates +%else +# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating +# cacerts. +Requires: openssl +%endif # Require jpackage-utils for ant. -Requires: jpackage-utils >= 1.7.3-1jpp.3 +Requires: jpackage-utils >= 1.7.3-1jpp.2 # Require zoneinfo data provided by tzdata-java subpackage. Requires: tzdata-java # Post requires alternatives to install tool alternatives. @@ -347,7 +358,13 @@ ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} %if %{gcjbootstrap} make stamps/patch-ecj.stamp +pushd openjdk-ecj + patch -l -p2 < %{PATCH3} +popd %endif +make stamps/patch.stamp +patch -l -p1 < %{PATCH3} + make export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -408,6 +425,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} +%if 0%{?fedora} > 9 # Install cacerts symlink. rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security @@ -415,6 +433,7 @@ %{_jvmdir}/%{jredir}/lib/security) ln -sf $RELATIVE/cacerts . popd +%endif # Install extension symlinks. install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir} @@ -497,7 +516,7 @@ # Install desktop files. install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps -desktop-file-install \ +desktop-file-install --vendor ''\ --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop for e in jconsole policytool ; do desktop-file-install --vendor=fedora --mode=644 \ @@ -798,7 +817,6 @@ %{jvmjardir} %dir %{_jvmdir}/%{jredir}/lib/security %{_jvmdir}/%{jredir}/lib/security/cacerts -# FIXME: These should be replaced by symlinks into /etc. %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar @@ -888,6 +906,10 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.20.b11 +- Specify vendor for javaws desktop entry. +- Merge EPEL-5 and Fedora devel packages. + * Mon Jul 21 2008 Lillian Angel - 1:1.6.0.0-0.19.b11 - Updated icedteasnapshot. @@ -995,6 +1017,11 @@ - Added archbuild and archinstall definitions for ia64. - Resolves: rhbz#433843 +* Mon Apr 28 2008 Lubomir Rintel - 1:1.6.0.0-0.12.b08 +- Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL: +- Require Freetype 2.2.0 instead of 2.3.0. +- Build against openmotif instead of lesstif when not on Fedora. + * Mon Apr 28 2008 Lillian Angel - 1:1.6.0.0-0.10.b09 - Fixed installation of javaws.desktop and javaws.png. From fedora-extras-commits at redhat.com Fri Jul 25 09:18:30 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 25 Jul 2008 09:18:30 GMT Subject: rpms/s3cmd/EL-5 s3cmd.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807250918.m6P9IUGe028810@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28712 Modified Files: s3cmd.spec sources Log Message: merge from devel Index: s3cmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/s3cmd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- s3cmd.spec 4 Jul 2008 21:11:21 -0000 1.1 +++ s3cmd.spec 25 Jul 2008 09:18:00 -0000 1.2 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: s3cmd -Version: 0.9.8.1 -Release: 3%{?dist} +Version: 0.9.8.2 +Release: 1%{?dist} Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet @@ -56,6 +56,9 @@ %changelog +* Tue Jul 15 2008 Lubomir Rintel (Good Data) - 0.9.8.2-1 +- New upstream + * Fri Jul 04 2008 Lubomir Rintel (Good Data) - 0.9.8.1-3 - Be satisfied with ET provided by 2.5 python Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Jul 2008 21:11:21 -0000 1.2 +++ sources 25 Jul 2008 09:18:00 -0000 1.3 @@ -1 +1 @@ -6814b86a2640f96fc52d704ec876ec81 s3cmd-0.9.8.1.tar.gz +34662f429cdb0929245430c1d7ff68af s3cmd-0.9.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 10:12:23 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 25 Jul 2008 10:12:23 GMT Subject: rpms/totem/F-9 totem-2.23.2-flv-thumbnail.patch, NONE, 1.1 totem.spec, 1.189, 1.190 Message-ID: <200807251012.m6PACN4c011648@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11510 Modified Files: totem.spec Added Files: totem-2.23.2-flv-thumbnail.patch Log Message: * Fri Jul 25 2008 - Bastien Nocera - 2.23.2-6 - Add patch to make FLV videos thumbnail (#449279) totem-2.23.2-flv-thumbnail.patch: --- NEW FILE totem-2.23.2-flv-thumbnail.patch --- --- trunk/data/mime-type-list.txt 2008/03/14 00:50:55 5298 +++ trunk/data/mime-type-list.txt 2008/05/26 13:11:33 5433 @@ -79,6 +79,7 @@ video/x-flc video/x-fli video/x-flic +video/x-flv video/x-m4v video/x-matroska video/x-mpeg Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/F-9/totem.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- totem.spec 18 Jul 2008 09:30:39 -0000 1.189 +++ totem.spec 25 Jul 2008 10:11:52 -0000 1.190 @@ -11,7 +11,7 @@ Summary: Movie player for GNOME Name: totem Version: 2.23.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -64,6 +64,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=458324 Patch0: totem-xul-4.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=449279 +Patch1: totem-2.23.2-flv-thumbnail.patch %description Totem is simple movie player for the Gnome desktop. It features a @@ -191,6 +193,7 @@ pushd totem-%{version} %patch0 -p0 -b .xulrunner +%patch1 -p1 # regen automake @@ -433,6 +436,9 @@ %endif %changelog +* Fri Jul 25 2008 - Bastien Nocera - 2.23.2-6 +- Add patch to make FLV videos thumbnail (#449279) + * Fri Jul 18 2008 Martin Stransky - 2.23.2-5 - Rebuild against xulrunner 1.9.0.1 and fixed gecko dependency From fedora-extras-commits at redhat.com Fri Jul 25 10:13:43 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 25 Jul 2008 10:13:43 GMT Subject: rpms/s3cmd/devel s3cmd.spec,1.2,1.3 Message-ID: <200807251013.m6PADhJG011856@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11784 Modified Files: s3cmd.spec Log Message: fix a typo Index: s3cmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/devel/s3cmd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- s3cmd.spec 15 Jul 2008 20:38:27 -0000 1.2 +++ s3cmd.spec 25 Jul 2008 10:13:13 -0000 1.3 @@ -2,7 +2,7 @@ Name: s3cmd Version: 0.9.8.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet @@ -49,13 +49,16 @@ %{_bindir}/s3cmd %{_mandir}/man1/s3cmd.1* %{python_sitelib}/S3 -%if 0%{?fedora} >= 9 || 0%{?rhel >= 6} +%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 %{python_sitelib}/s3cmd*.egg-info %endif %doc NEWS README %changelog +* Fri Jul 25 2008 Lubomir Rintel (Good Data) - 0.9.8.2-1.1 +- Fix a typo + * Tue Jul 15 2008 Lubomir Rintel (Good Data) - 0.9.8.2-1 - New upstream From fedora-extras-commits at redhat.com Fri Jul 25 10:15:16 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Fri, 25 Jul 2008 10:15:16 GMT Subject: rpms/s3cmd/EL-5 s3cmd.spec,1.2,1.3 Message-ID: <200807251015.m6PAFGno012090@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12015 Modified Files: s3cmd.spec Log Message: fix a typo Index: s3cmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/s3cmd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- s3cmd.spec 25 Jul 2008 09:18:00 -0000 1.2 +++ s3cmd.spec 25 Jul 2008 10:14:45 -0000 1.3 @@ -2,7 +2,7 @@ Name: s3cmd Version: 0.9.8.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet @@ -49,13 +49,16 @@ %{_bindir}/s3cmd %{_mandir}/man1/s3cmd.1* %{python_sitelib}/S3 -%if 0%{?fedora} >= 9 || 0%{?rhel >= 6} +%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 %{python_sitelib}/s3cmd*.egg-info %endif %doc NEWS README %changelog +* Fri Jul 25 2008 Lubomir Rintel (Good Data) - 0.9.8.2-1.1 +- Fix a typo + * Tue Jul 15 2008 Lubomir Rintel (Good Data) - 0.9.8.2-1 - New upstream From fedora-extras-commits at redhat.com Fri Jul 25 10:43:46 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Fri, 25 Jul 2008 10:43:46 GMT Subject: rpms/gbrainy/F-9 gbrainy.spec,1.3,1.4 Message-ID: <200807251043.m6PAhk8C015600@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/gbrainy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15496 Modified Files: gbrainy.spec Log Message: Increase release to fix a bug Index: gbrainy.spec =================================================================== RCS file: /cvs/pkgs/rpms/gbrainy/F-9/gbrainy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gbrainy.spec 24 Jul 2008 18:18:13 -0000 1.3 +++ gbrainy.spec 25 Jul 2008 10:43:16 -0000 1.4 @@ -1,6 +1,6 @@ Name: gbrainy Version: 0.70 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Gbrainy is a brain teaser game and trainer to keep your brain trained Group: Amusements/Games @@ -73,7 +73,10 @@ %{_datadir}/pixmaps/%{name}* %changelog -* Tue Jul 24 2008 Beno??t Marcelin 0.70-2 +* Fri Jul 25 2008 Beno??t Marcelin 0.70-4 +- Increase release to fix a bug + +* Thu Jul 24 2008 Beno??t Marcelin 0.70-2 - Rebuild for dependencies * Tue Jun 03 2008 Beno??t Marcelin 0.70-1 From fedora-extras-commits at redhat.com Fri Jul 25 11:04:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Fri, 25 Jul 2008 11:04:03 GMT Subject: rpms/net-snmp/devel net-snmp-5.0.8-ipv6-sock-close.patch, 1.1, 1.2 net-snmp-5.0.8-readonly.patch, 1.1, 1.2 net-snmp-5.1.2-dir-fix.patch, 1.1, 1.2 net-snmp-5.2.1-file_offset.patch, 1.1, 1.2 net-snmp-5.3.1-multilib.patch, 1.1, 1.2 net-snmp-5.4-64bit.patch, 1.2, 1.3 net-snmp-5.4-exec-crash.patch, 1.1, 1.2 net-snmp-5.4.1-config_libdir.patch, 1.1, 1.2 net-snmp-5.4.1-hmac-check.patch, 1.1, 1.2 net-snmp-5.4.1-hostname.patch, 1.1, 1.2 net-snmp-5.4.1-perl-set.patch, 1.1, 1.2 net-snmp-5.4.1-perl-snprintf.patch, 1.1, 1.2 net-snmp-5.4.1-pie.patch, 1.1, 1.2 net-snmp-5.4.1-sensors3.patch, 1.1, 1.2 net-snmp-5.4.1-shared-ip.patch, 1.1, 1.2 net-snmp-5.4.1-strange_libpath.patch, 1.1, 1.2 net-snmp-5.4.1-xen-crash.patch, 1.1, 1.2 net-snmp.spec, 1.154, 1.155 ucd-snmp-4.2.4.pre3-mnttab.patch, 1.1, 1.2 Message-ID: <200807251104.m6PB43D2023258@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/net-snmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23136 Modified Files: net-snmp-5.0.8-ipv6-sock-close.patch net-snmp-5.0.8-readonly.patch net-snmp-5.1.2-dir-fix.patch net-snmp-5.2.1-file_offset.patch net-snmp-5.3.1-multilib.patch net-snmp-5.4-64bit.patch net-snmp-5.4-exec-crash.patch net-snmp-5.4.1-config_libdir.patch net-snmp-5.4.1-hmac-check.patch net-snmp-5.4.1-hostname.patch net-snmp-5.4.1-perl-set.patch net-snmp-5.4.1-perl-snprintf.patch net-snmp-5.4.1-pie.patch net-snmp-5.4.1-sensors3.patch net-snmp-5.4.1-shared-ip.patch net-snmp-5.4.1-strange_libpath.patch net-snmp-5.4.1-xen-crash.patch net-snmp.spec ucd-snmp-4.2.4.pre3-mnttab.patch Log Message: rediff all patches to get rid of fuzz=2 net-snmp-5.0.8-ipv6-sock-close.patch: Index: net-snmp-5.0.8-ipv6-sock-close.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.0.8-ipv6-sock-close.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.0.8-ipv6-sock-close.patch 9 Sep 2004 09:09:42 -0000 1.1 +++ net-snmp-5.0.8-ipv6-sock-close.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,6 +1,7 @@ ---- net-snmp-5.0.8/agent/mibgroup/mibII/ipv6.c.orig 2003-02-25 16:35:58.000000000 +0200 -+++ net-snmp-5.0.8/agent/mibgroup/mibII/ipv6.c 2003-02-25 16:36:30.000000000 +0200 -@@ -1961,6 +1961,7 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c.backup_patch_2 net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c +--- net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c.backup_patch_2 2007-05-25 00:01:04.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c 2008-07-25 12:52:36.000000000 +0200 +@@ -2017,6 +2017,7 @@ var_ifv6Entry(register struct variable * break; } long_return = (ifr.ifr_flags & flag) ? 1 : 2; net-snmp-5.0.8-readonly.patch: Index: net-snmp-5.0.8-readonly.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.0.8-readonly.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.0.8-readonly.patch 9 Sep 2004 09:09:42 -0000 1.1 +++ net-snmp-5.0.8-readonly.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,7 +1,8 @@ ---- net-snmp-5.0.8/agent/snmp_agent.c.readonly 2003-08-05 14:55:44.000000000 +0200 -+++ net-snmp-5.0.8/agent/snmp_agent.c 2003-08-06 16:05:56.000000000 +0200 -@@ -1133,6 +1133,12 @@ - int i, n = 0, r = 0; +diff -up net-snmp-5.4.1/agent/snmp_agent.c.backup_patch_3 net-snmp-5.4.1/agent/snmp_agent.c +--- net-snmp-5.4.1/agent/snmp_agent.c.backup_patch_3 2007-05-14 16:50:38.000000000 +0200 ++++ net-snmp-5.4.1/agent/snmp_agent.c 2008-07-25 12:52:40.000000000 +0200 +@@ -1504,6 +1504,12 @@ netsnmp_wrap_up_request(netsnmp_agent_se + int i; /* + * Update asp->status if necessary. Fixes ro/rw problem. net-snmp-5.1.2-dir-fix.patch: Index: net-snmp-5.1.2-dir-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.1.2-dir-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.1.2-dir-fix.patch 16 Nov 2004 08:54:28 -0000 1.1 +++ net-snmp-5.1.2-dir-fix.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,7 +1,8 @@ ---- net-snmp-5.1.2/net-snmp-config.in.dir-fix 2004-06-17 15:39:28.000000000 +0200 -+++ net-snmp-5.1.2/net-snmp-config.in 2004-11-16 10:26:28.928414992 +0100 -@@ -249,7 +249,7 @@ - echo " " $line +diff -up net-snmp-5.4.1/net-snmp-config.in.backup_patch_6 net-snmp-5.4.1/net-snmp-config.in +--- net-snmp-5.4.1/net-snmp-config.in.backup_patch_6 2007-06-30 00:18:27.000000000 +0200 ++++ net-snmp-5.4.1/net-snmp-config.in 2008-07-25 12:53:19.000000000 +0200 +@@ -302,7 +302,7 @@ else + fi echo $line >> $outfile - outfile="@datadir@/snmp/snmpd.conf" net-snmp-5.2.1-file_offset.patch: Index: net-snmp-5.2.1-file_offset.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.2.1-file_offset.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.2.1-file_offset.patch 4 Apr 2005 08:11:17 -0000 1.1 +++ net-snmp-5.2.1-file_offset.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,17 +1,7 @@ ---- net-snmp-5.2.1/include/net-snmp/agent/snmp_vars.h.long 2004-04-15 14:47:10.000000000 +0200 -+++ net-snmp-5.2.1/include/net-snmp/agent/snmp_vars.h 2005-03-21 17:03:29.909271960 +0100 -@@ -73,7 +73,7 @@ - - struct nlist; - -- extern long long_return; -+ extern fsblkcnt_t long_return; - extern u_char return_buf[]; - - extern oid nullOid[]; ---- net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.c.long 2004-06-19 15:34:11.000000000 +0200 -+++ net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.c 2005-03-21 17:03:29.910271808 +0100 -@@ -773,7 +773,7 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c.backup_patch_7 net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c +--- net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c.backup_patch_7 2007-05-18 20:08:01.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c 2008-07-25 12:53:28.000000000 +0200 +@@ -911,7 +911,7 @@ Get_FSIndex(char *dev) return 0; } @@ -20,9 +10,10 @@ Get_FSSize(char *dev) { struct HRFS_statfs statfs_buf; ---- net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.h.long 2002-07-04 14:56:35.000000000 +0200 -+++ net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.h 2005-03-21 17:03:29.910271808 +0100 -@@ -12,7 +12,7 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h.backup_patch_7 net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h +--- net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h.backup_patch_7 2002-07-04 14:58:04.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h 2008-07-25 12:53:28.000000000 +0200 +@@ -12,7 +12,7 @@ extern int Get_Next_HR_FileSys(void extern int Check_HR_FileSys_NFS(void); extern int Get_FSIndex(char *); @@ -31,9 +22,10 @@ #endif /* _MIBGROUP_HRFSYS_H */ ---- net-snmp-5.2.1/agent/snmp_vars.c.long 2005-03-21 17:08:37.790466904 +0100 -+++ net-snmp-5.2.1/agent/snmp_vars.c 2005-03-21 17:08:37.790466904 +0100 -@@ -223,7 +223,7 @@ +diff -up net-snmp-5.4.1/agent/snmp_vars.c.backup_patch_7 net-snmp-5.4.1/agent/snmp_vars.c +--- net-snmp-5.4.1/agent/snmp_vars.c.backup_patch_7 2006-09-15 02:48:50.000000000 +0200 ++++ net-snmp-5.4.1/agent/snmp_vars.c 2008-07-25 12:53:28.000000000 +0200 +@@ -224,7 +224,7 @@ extern netsnmp_subtree *subtrees; * int name_len IN - number of sub-ids in the name */ @@ -42,3 +34,15 @@ #ifndef ibm032 u_char return_buf[258]; #else +diff -up net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h.backup_patch_7 net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h +--- net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h.backup_patch_7 2005-06-21 23:33:55.000000000 +0200 ++++ net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h 2008-07-25 12:53:28.000000000 +0200 +@@ -73,7 +73,7 @@ PERFORMANCE OF THIS SOFTWARE. + + struct nlist; + +- extern long long_return; ++ extern fsblkcnt_t long_return; + extern u_char return_buf[]; + + extern oid nullOid[]; net-snmp-5.3.1-multilib.patch: Index: net-snmp-5.3.1-multilib.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.3.1-multilib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.3.1-multilib.patch 23 May 2006 09:04:55 -0000 1.1 +++ net-snmp-5.3.1-multilib.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,6 +1,7 @@ ---- net-snmp-5.3.1.pre2/man/read_config.3.def.old 2003-04-25 16:02:55.000000000 +0200 -+++ net-snmp-5.3.1.pre2/man/read_config.3.def 2006-05-23 09:41:35.000000000 +0200 -@@ -257,7 +257,7 @@ +diff -up net-snmp-5.4.1/man/read_config.3.def.backup_patch_8 net-snmp-5.4.1/man/read_config.3.def +--- net-snmp-5.4.1/man/read_config.3.def.backup_patch_8 2003-04-25 16:02:55.000000000 +0200 ++++ net-snmp-5.4.1/man/read_config.3.def 2008-07-25 12:53:34.000000000 +0200 +@@ -257,7 +257,7 @@ The configuration files read are found b .I SNMPCONFPATH environment variable (or its default value, which will be SYSCONFDIR/snmp, followed by @@ -9,7 +10,7 @@ reading in the files found that match both the prefix registered and the two suffixes .I .conf -@@ -285,7 +285,7 @@ +@@ -285,7 +285,7 @@ function that it should abort the operat SNMPCONFPATH A colon separated list of directories to search for configuration files in. net-snmp-5.4-64bit.patch: Index: net-snmp-5.4-64bit.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4-64bit.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- net-snmp-5.4-64bit.patch 14 Feb 2008 11:56:20 -0000 1.2 +++ net-snmp-5.4-64bit.patch 25 Jul 2008 11:03:32 -0000 1.3 @@ -1,62 +1,7 @@ ---- net-snmp-5.4/agent/mibgroup/ucd-snmp/pass_persist.c.64bit 2006-10-18 04:59:10.000000000 +0200 -+++ net-snmp-5.4/agent/mibgroup/ucd-snmp/pass_persist.c 2006-11-27 13:56:30.000000000 +0100 -@@ -218,6 +218,7 @@ - oid newname[MAX_OID_LEN]; - int i, rtest, newlen; - static long long_ret; -+ static in_addr_t addr_ret; - char buf[SNMP_MAXBUF]; - static char buf2[SNMP_MAXBUF]; - static oid objid[MAX_OID_LEN]; -@@ -366,13 +367,13 @@ - *var_len = 0; - return (NULL); - } -- long_ret = -+ addr_ret = - (objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) + - (objid[2] << 8) + objid[3]; -- long_ret = htonl(long_ret); -- *var_len = sizeof(long_ret); -+ addr_ret = htonl(addr_ret); -+ *var_len = sizeof(addr_ret); - vp->type = ASN_IPADDRESS; -- return ((unsigned char *) &long_ret); -+ return ((unsigned char *) &addr_ret); - } - } - *var_len = 0; ---- net-snmp-5.4/agent/mibgroup/ucd-snmp/pass.c.64bit 2005-08-18 02:44:02.000000000 +0200 -+++ net-snmp-5.4/agent/mibgroup/ucd-snmp/pass.c 2006-11-27 13:56:30.000000000 +0100 -@@ -287,6 +287,7 @@ - oid newname[MAX_OID_LEN]; - int i, rtest, fd, newlen; - static long long_ret; -+ static in_addr_t addr_ret; - char buf[SNMP_MAXBUF]; - static char buf2[SNMP_MAXBUF]; - static oid objid[MAX_OID_LEN]; -@@ -412,13 +413,13 @@ - *var_len = 0; - return (NULL); - } -- long_ret = -+ addr_ret = - (objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) + - (objid[2] << 8) + objid[3]; -- long_ret = htonl(long_ret); -- *var_len = sizeof(long_ret); -+ addr_ret = htonl(addr_ret); -+ *var_len = sizeof(addr_ret); - vp->type = ASN_IPADDRESS; -- return ((unsigned char *) &long_ret); -+ return ((unsigned char *) &addr_ret); - } - } - *var_len = 0; ---- net-snmp-5.4/agent/mibgroup/mibII/at.c.64bit 2006-11-07 00:43:27.000000000 +0100 -+++ net-snmp-5.4/agent/mibgroup/mibII/at.c 2006-11-27 13:59:46.000000000 +0100 -@@ -126,9 +126,9 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/mibII/at.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/mibII/at.c +--- net-snmp-5.4.1/agent/mibgroup/mibII/at.c.backup_patch_5 2006-12-27 20:17:49.000000000 +0100 ++++ net-snmp-5.4.1/agent/mibgroup/mibII/at.c 2008-07-25 12:53:03.000000000 +0200 +@@ -128,9 +128,9 @@ #ifndef solaris2 static void ARP_Scan_Init(void); #ifdef ARP_SCAN_FOUR_ARGUMENTS @@ -68,7 +13,7 @@ #endif #endif #endif -@@ -204,7 +204,8 @@ +@@ -206,7 +206,8 @@ var_atEntry(struct variable *vp, oid lowest[16]; oid current[16]; static char PhysAddr[6], LowPhysAddr[6]; @@ -78,7 +23,7 @@ #ifdef ARP_SCAN_FOUR_ARGUMENTS u_short ifIndex, lowIfIndex = 0; #endif /* ARP_SCAN_FOUR_ARGUMENTS */ -@@ -314,9 +315,9 @@ +@@ -316,9 +317,9 @@ var_atEntry(struct variable *vp, *var_len = sizeof(LowPhysAddr); return (u_char *) LowPhysAddr; case IPMEDIANETADDRESS: /* also ATNETADDRESS */ @@ -91,7 +36,7 @@ case IPMEDIATYPE: *var_len = sizeof long_return; long_return = lowIfType; -@@ -707,11 +708,11 @@ +@@ -709,11 +710,11 @@ ARP_Scan_Init(void) #ifdef ARP_SCAN_FOUR_ARGUMENTS static int @@ -105,9 +50,59 @@ #endif { #ifndef NETSNMP_CAN_USE_SYSCTL ---- net-snmp-5.4/agent/mibgroup/mibII/var_route.c.64bit 2006-11-07 00:43:27.000000000 +0100 -+++ net-snmp-5.4/agent/mibgroup/mibII/var_route.c 2006-11-27 14:13:13.000000000 +0100 -@@ -434,6 +434,7 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c +--- net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c.backup_patch_5 2003-02-22 05:19:51.000000000 +0100 ++++ net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c 2008-07-25 12:53:03.000000000 +0200 +@@ -22,6 +22,7 @@ + /** a global static we'll make use of a lot to map to the right + datatype to return (which for SNMP integer's is always a long). */ + static u_long long_ret; ++static in_addr_t addr_ret; + + + /* +@@ -32,18 +33,18 @@ u_long * + get_ipCidrRouteDest(void *data_context, size_t * ret_len) + { + RTENTRY *ourroute = (RTENTRY *) data_context; +- long_ret = ((struct sockaddr_in *) (&ourroute->rt_dst))->sin_addr.s_addr; +- *ret_len = sizeof(long_ret); +- return &long_ret; ++ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_dst))->sin_addr.s_addr; ++ *ret_len = sizeof(addr_ret); ++ return &addr_ret; + } + + u_long * + get_ipCidrRouteMask(void *data_context, size_t * ret_len) + { + RTENTRY *ourroute = (RTENTRY *) data_context; +- long_ret = ((struct sockaddr_in *) (&ourroute->rt_genmask))->sin_addr.s_addr; +- *ret_len = sizeof(long_ret); +- return &long_ret; ++ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_genmask))->sin_addr.s_addr; ++ *ret_len = sizeof(addr_ret); ++ return &addr_ret; + } + + long * +@@ -59,9 +60,9 @@ u_long * + get_ipCidrRouteNextHop(void *data_context, size_t * ret_len) + { + RTENTRY *ourroute = (RTENTRY *) data_context; +- long_ret = ((struct sockaddr_in *) (&ourroute->rt_gateway))->sin_addr.s_addr; +- *ret_len = sizeof(long_ret); +- return &long_ret; ++ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_gateway))->sin_addr.s_addr; ++ *ret_len = sizeof(addr_ret); ++ return &addr_ret; + } + + long * +diff -up net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c +--- net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c.backup_patch_5 2006-11-07 00:43:27.000000000 +0100 ++++ net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c 2008-07-25 12:53:03.000000000 +0200 +@@ -434,6 +434,7 @@ var_ipRouteEntry(struct variable * vp, static oid saveName[MAX_OID_LEN], Current[MAX_OID_LEN]; u_char *cp; oid *op; @@ -115,7 +110,7 @@ #if NEED_KLGETSA struct sockaddr_in *sa; #endif -@@ -538,13 +539,13 @@ +@@ -538,13 +539,13 @@ var_ipRouteEntry(struct variable * vp, switch (vp->magic) { case IPROUTEDEST: @@ -132,7 +127,7 @@ #else return (u_char *) & ((struct sockaddr_in *) &rthead[RtIndex]-> rt_dst)->sin_addr.s_addr; -@@ -597,13 +598,13 @@ +@@ -597,13 +598,13 @@ var_ipRouteEntry(struct variable * vp, long_return = -1; return (u_char *) & long_return; case IPROUTENEXTHOP: @@ -149,7 +144,7 @@ #else return (u_char *) & ((struct sockaddr_in *) &rthead[RtIndex]-> rt_gateway)->sin_addr.s_addr; -@@ -649,14 +650,14 @@ +@@ -649,14 +650,14 @@ var_ipRouteEntry(struct variable * vp, #if NETSNMP_NO_DUMMY_VALUES return NULL; #endif @@ -168,7 +163,7 @@ else { #ifndef linux if (!NETSNMP_KLOOKUP(rthead[RtIndex]->rt_ifp, -@@ -681,7 +682,7 @@ +@@ -681,7 +682,7 @@ var_ipRouteEntry(struct variable * vp, #endif /* linux */ } #endif /* NEED_KLGETSA */ @@ -177,51 +172,61 @@ case IPROUTEINFO: *var_len = nullOidLen; return (u_char *) nullOid; ---- net-snmp-5.4/agent/mibgroup/mibII/ipCidrRouteTable_access.c.64bit 2003-02-22 05:19:51.000000000 +0100 -+++ net-snmp-5.4/agent/mibgroup/mibII/ipCidrRouteTable_access.c 2006-11-27 13:56:30.000000000 +0100 -@@ -22,6 +22,7 @@ - /** a global static we'll make use of a lot to map to the right - datatype to return (which for SNMP integer's is always a long). */ - static u_long long_ret; -+static in_addr_t addr_ret; - - - /* -@@ -32,18 +33,18 @@ - get_ipCidrRouteDest(void *data_context, size_t * ret_len) - { - RTENTRY *ourroute = (RTENTRY *) data_context; -- long_ret = ((struct sockaddr_in *) (&ourroute->rt_dst))->sin_addr.s_addr; -- *ret_len = sizeof(long_ret); -- return &long_ret; -+ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_dst))->sin_addr.s_addr; -+ *ret_len = sizeof(addr_ret); -+ return &addr_ret; - } - - u_long * - get_ipCidrRouteMask(void *data_context, size_t * ret_len) - { - RTENTRY *ourroute = (RTENTRY *) data_context; -- long_ret = ((struct sockaddr_in *) (&ourroute->rt_genmask))->sin_addr.s_addr; -- *ret_len = sizeof(long_ret); -- return &long_ret; -+ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_genmask))->sin_addr.s_addr; -+ *ret_len = sizeof(addr_ret); -+ return &addr_ret; - } - - long * -@@ -59,9 +60,9 @@ - get_ipCidrRouteNextHop(void *data_context, size_t * ret_len) - { - RTENTRY *ourroute = (RTENTRY *) data_context; -- long_ret = ((struct sockaddr_in *) (&ourroute->rt_gateway))->sin_addr.s_addr; -- *ret_len = sizeof(long_ret); -- return &long_ret; -+ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_gateway))->sin_addr.s_addr; -+ *ret_len = sizeof(addr_ret); -+ return &addr_ret; - } - - long * +diff -up net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c +--- net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c.backup_patch_5 2005-08-18 02:44:02.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c 2008-07-25 12:53:03.000000000 +0200 +@@ -287,6 +287,7 @@ var_extensible_pass(struct variable *vp, + oid newname[MAX_OID_LEN]; + int i, rtest, fd, newlen; + static long long_ret; ++ static in_addr_t addr_ret; + char buf[SNMP_MAXBUF]; + static char buf2[SNMP_MAXBUF]; + static oid objid[MAX_OID_LEN]; +@@ -412,13 +413,13 @@ var_extensible_pass(struct variable *vp, + *var_len = 0; + return (NULL); + } +- long_ret = ++ addr_ret = + (objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) + + (objid[2] << 8) + objid[3]; +- long_ret = htonl(long_ret); +- *var_len = sizeof(long_ret); ++ addr_ret = htonl(addr_ret); ++ *var_len = sizeof(addr_ret); + vp->type = ASN_IPADDRESS; +- return ((unsigned char *) &long_ret); ++ return ((unsigned char *) &addr_ret); + } + } + *var_len = 0; +diff -up net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c +--- net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c.backup_patch_5 2006-10-18 04:59:10.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c 2008-07-25 12:53:03.000000000 +0200 +@@ -218,6 +218,7 @@ var_extensible_pass_persist(struct varia + oid newname[MAX_OID_LEN]; + int i, rtest, newlen; + static long long_ret; ++ static in_addr_t addr_ret; + char buf[SNMP_MAXBUF]; + static char buf2[SNMP_MAXBUF]; + static oid objid[MAX_OID_LEN]; +@@ -366,13 +367,13 @@ var_extensible_pass_persist(struct varia + *var_len = 0; + return (NULL); + } +- long_ret = ++ addr_ret = + (objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) + + (objid[2] << 8) + objid[3]; +- long_ret = htonl(long_ret); +- *var_len = sizeof(long_ret); ++ addr_ret = htonl(addr_ret); ++ *var_len = sizeof(addr_ret); + vp->type = ASN_IPADDRESS; +- return ((unsigned char *) &long_ret); ++ return ((unsigned char *) &addr_ret); + } + } + *var_len = 0; net-snmp-5.4-exec-crash.patch: Index: net-snmp-5.4-exec-crash.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4-exec-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4-exec-crash.patch 28 Jun 2007 08:56:14 -0000 1.1 +++ net-snmp-5.4-exec-crash.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,6 +1,7 @@ ---- net-snmp-5.4/agent/mibgroup/agent/extend.c.orig 2006-10-18 21:07:35.000000000 +0200 -+++ net-snmp-5.4/agent/mibgroup/agent/extend.c 2007-06-27 14:30:08.000000000 +0200 -@@ -448,6 +448,9 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/agent/extend.c.backup_patch_14 net-snmp-5.4.1/agent/mibgroup/agent/extend.c +--- net-snmp-5.4.1/agent/mibgroup/agent/extend.c.backup_patch_14 2007-07-06 17:32:59.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/agent/extend.c 2008-07-25 12:53:44.000000000 +0200 +@@ -450,6 +450,9 @@ extend_parse_config(const char *token, c extension->command = strdup( exec_command ); if (cptr) extension->args = strdup( cptr ); net-snmp-5.4.1-config_libdir.patch: Index: net-snmp-5.4.1-config_libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-config_libdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-config_libdir.patch 7 Aug 2007 12:33:35 -0000 1.1 +++ net-snmp-5.4.1-config_libdir.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,6 +1,7 @@ ---- net-snmp-5.4/configure.libdir 2006-11-27 14:27:52.000000000 +0100 -+++ net-snmp-5.4/configure 2006-11-27 14:31:34.000000000 +0100 -@@ -5161,7 +5161,7 @@ +diff -up net-snmp-5.4.1/configure.backup_patch_9 net-snmp-5.4.1/configure +--- net-snmp-5.4.1/configure.backup_patch_9 2008-07-25 12:52:01.000000000 +0200 ++++ net-snmp-5.4.1/configure 2008-07-25 12:53:35.000000000 +0200 +@@ -5252,7 +5252,7 @@ freebsd* | dragonfly*) # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file @@ -9,7 +10,7 @@ ;; esac else -@@ -5178,15 +5178,15 @@ +@@ -5269,15 +5269,15 @@ hpux10.20* | hpux11*) case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -28,7 +29,7 @@ ;; esac ;; -@@ -5222,7 +5222,7 @@ +@@ -5313,7 +5313,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file @@ -37,7 +38,7 @@ ;; nto-qnx*) -@@ -5249,7 +5249,7 @@ +@@ -5344,7 +5344,7 @@ sysv4 | sysv4.3*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' @@ -46,7 +47,7 @@ ;; ncr) lt_cv_deplibs_check_method=pass_all -@@ -8761,13 +8761,13 @@ +@@ -8905,13 +8905,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -62,7 +63,7 @@ allow_undefined_flag="-z nodefs" archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else -@@ -8822,7 +8822,7 @@ +@@ -8973,7 +8973,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -71,7 +72,7 @@ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8936,7 +8936,7 @@ +@@ -9087,7 +9087,7 @@ if test -z "$aix_libpath"; then aix_libp # does not break anything, and helps significantly (at the cost of a little # extra space). freebsd2.2*) @@ -80,18 +81,18 @@ hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9504,7 +9504,7 @@ +@@ -9504,7 +9504,7 @@ shlibpath_var= shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" +sys_lib_dlsearch_path_spec="/lib $LIBDIR" - + if test "$GCC" = yes; then case $host_os in -@@ -9363,7 +9363,7 @@ - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi +@@ -9555,7 +9555,7 @@ BEGIN {RS=" "; FS="/|\n";} { + }'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/lib $LIBDIR /usr/local/lib" net-snmp-5.4.1-hmac-check.patch: Index: net-snmp-5.4.1-hmac-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-hmac-check.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-hmac-check.patch 10 Jun 2008 06:02:57 -0000 1.1 +++ net-snmp-5.4.1-hmac-check.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -4,9 +4,10 @@ Reviewed-by: Jan Safranek diff -up net-snmp-5.0.9/snmplib/scapi.c.orig net-snmp-5.0.9/snmplib/scapi.c ---- net-snmp-5.0.9/snmplib/scapi.c.orig 2008-06-04 10:19:26.000000000 +0200 -+++ net-snmp-5.0.9/snmplib/scapi.c 2008-06-04 10:20:45.000000000 +0200 -@@ -460,6 +460,9 @@ sc_check_keyed_hash(const oid * authtype +diff -up net-snmp-5.4.1/snmplib/scapi.c.backup_patch_17 net-snmp-5.4.1/snmplib/scapi.c +--- net-snmp-5.4.1/snmplib/scapi.c.backup_patch_17 2006-09-15 14:47:01.000000000 +0200 ++++ net-snmp-5.4.1/snmplib/scapi.c 2008-07-25 12:54:00.000000000 +0200 +@@ -562,6 +562,9 @@ sc_check_keyed_hash(const oid * authtype QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); } net-snmp-5.4.1-hostname.patch: Index: net-snmp-5.4.1-hostname.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-hostname.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-hostname.patch 7 Aug 2007 12:33:35 -0000 1.1 +++ net-snmp-5.4.1-hostname.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,36 +1,6 @@ ---- net-snmp-5.4/snmplib/snmpUDPDomain.c.orig 2006-09-20 01:42:17.000000000 +0200 -+++ net-snmp-5.4/snmplib/snmpUDPDomain.c 2007-05-03 12:17:30.000000000 +0200 -@@ -87,6 +87,7 @@ - netsnmp_udp_fmtaddr(netsnmp_transport *t, void *data, int len) - { - netsnmp_udp_addr_pair *addr_pair = NULL; -+ struct hostent *host; - - if (data != NULL && len == sizeof(netsnmp_udp_addr_pair)) { - addr_pair = (netsnmp_udp_addr_pair *) data; -@@ -104,6 +105,10 @@ - return strdup("UDP: unknown"); - } - -+ if ( t && t->flags & NETSNMP_TRANSPORT_FLAG_HOSTNAME ) { -+ host = gethostbyaddr((char *)&to->sin_addr, 4, AF_INET); -+ return (host ? strdup(host->h_name) : NULL); -+ } - sprintf(tmp, "UDP: [%s]:%hu", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); - return strdup(tmp); ---- net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h.orig 2005-09-15 15:46:58.000000000 +0200 -+++ net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h 2007-05-02 17:21:30.000000000 +0200 -@@ -19,6 +19,7 @@ - #define NETSNMP_TRANSPORT_FLAG_STREAM 0x01 - #define NETSNMP_TRANSPORT_FLAG_LISTEN 0x02 - #define NETSNMP_TRANSPORT_FLAG_TUNNELED 0x04 -+#define NETSNMP_TRANSPORT_FLAG_HOSTNAME 0x80 /* for fmtaddr hook */ - - /* The standard SNMP domains. */ - ---- net-snmp-5.4.1/apps/snmptrapd_log.c.orig 2007-05-31 16:39:14.000000000 +0200 -+++ net-snmp-5.4.1/apps/snmptrapd_log.c 2007-08-07 13:46:40.000000000 +0200 +diff -up net-snmp-5.4.1/apps/snmptrapd_log.c.backup_patch_12 net-snmp-5.4.1/apps/snmptrapd_log.c +--- net-snmp-5.4.1/apps/snmptrapd_log.c.backup_patch_12 2007-05-31 16:39:14.000000000 +0200 ++++ net-snmp-5.4.1/apps/snmptrapd_log.c 2008-07-25 12:53:41.000000000 +0200 @@ -626,6 +626,8 @@ realloc_handle_ip_fmt(u_char ** buf, siz char fmt_cmd = options->cmd; /* what we're formatting */ u_char *temp_buf = NULL; @@ -210,3 +180,36 @@ return 0; } } +diff -up net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h.backup_patch_12 net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h +--- net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h.backup_patch_12 2006-10-27 22:19:44.000000000 +0200 ++++ net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h 2008-07-25 12:53:41.000000000 +0200 +@@ -19,6 +19,7 @@ extern "C" { + #define NETSNMP_TRANSPORT_FLAG_STREAM 0x01 + #define NETSNMP_TRANSPORT_FLAG_LISTEN 0x02 + #define NETSNMP_TRANSPORT_FLAG_TUNNELED 0x04 ++#define NETSNMP_TRANSPORT_FLAG_HOSTNAME 0x80 /* for fmtaddr hook */ + + /* The standard SNMP domains. */ + +diff -up net-snmp-5.4.1/snmplib/snmpUDPDomain.c.backup_patch_12 net-snmp-5.4.1/snmplib/snmpUDPDomain.c +--- net-snmp-5.4.1/snmplib/snmpUDPDomain.c.backup_patch_12 2007-06-11 00:15:24.000000000 +0200 ++++ net-snmp-5.4.1/snmplib/snmpUDPDomain.c 2008-07-25 12:53:41.000000000 +0200 +@@ -90,6 +90,7 @@ static char * + netsnmp_udp_fmtaddr(netsnmp_transport *t, void *data, int len) + { + netsnmp_udp_addr_pair *addr_pair = NULL; ++ struct hostent *host; + + if (data != NULL && len == sizeof(netsnmp_udp_addr_pair)) { + addr_pair = (netsnmp_udp_addr_pair *) data; +@@ -107,6 +108,10 @@ netsnmp_udp_fmtaddr(netsnmp_transport *t + return strdup("UDP: unknown"); + } + ++ if ( t && t->flags & NETSNMP_TRANSPORT_FLAG_HOSTNAME ) { ++ host = gethostbyaddr((char *)&to->sin_addr, 4, AF_INET); ++ return (host ? strdup(host->h_name) : NULL); ++ } + sprintf(tmp, "UDP: [%s]:%hu", + inet_ntoa(to->sin_addr), ntohs(to->sin_port)); + return strdup(tmp); net-snmp-5.4.1-perl-set.patch: Index: net-snmp-5.4.1-perl-set.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-perl-set.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-perl-set.patch 22 Jul 2008 07:46:49 -0000 1.1 +++ net-snmp-5.4.1-perl-set.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -3,9 +3,10 @@ Source: jbjohnso at us.ibm.com, accepted upstream, SVN rev. 17097 diff -urN net-snmp-5.4.1/perl/SNMP/SNMP.xs net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.xs ---- net-snmp-5.4.1/perl/SNMP/SNMP.xs 2008-06-13 15:48:46.000000000 -0500 -+++ net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.xs 2008-06-13 15:48:05.000000000 -0500 -@@ -3072,7 +3072,7 @@ +diff -up net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_19 net-snmp-5.4.1/perl/SNMP/SNMP.xs +--- net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_19 2008-07-25 12:54:02.000000000 +0200 ++++ net-snmp-5.4.1/perl/SNMP/SNMP.xs 2008-07-25 12:54:05.000000000 +0200 +@@ -3072,7 +3072,7 @@ snmp_set(sess_ref, varlist_ref, perl_cal res = __add_var_val_str(pdu, oid_arr, oid_arr_len, (varbind_val_f && SvOK(*varbind_val_f) ? SvPV(*varbind_val_f,na):NULL), @@ -14,7 +15,7 @@ SvCUR(*varbind_val_f):0), type); if (verbose && res == FAILURE) -@@ -4266,7 +4266,7 @@ +@@ -4266,7 +4266,7 @@ snmp_trapV1(sess_ref,enterprise,agent,ge res = __add_var_val_str(pdu, oid_arr, oid_arr_len, (varbind_val_f && SvOK(*varbind_val_f) ? SvPV(*varbind_val_f,na):NULL), @@ -23,7 +24,7 @@ SvCUR(*varbind_val_f):0), type); -@@ -4424,7 +4424,7 @@ +@@ -4424,7 +4424,7 @@ snmp_trapV2(sess_ref,uptime,trap_oid,var res = __add_var_val_str(pdu, oid_arr, oid_arr_len, (varbind_val_f && SvOK(*varbind_val_f) ? SvPV(*varbind_val_f,na):NULL), @@ -32,7 +33,7 @@ SvCUR(*varbind_val_f):0), type); -@@ -4563,7 +4563,7 @@ +@@ -4563,7 +4563,7 @@ snmp_inform(sess_ref,uptime,trap_oid,var res = __add_var_val_str(pdu, oid_arr, oid_arr_len, (varbind_val_f && SvOK(*varbind_val_f) ? SvPV(*varbind_val_f,na):NULL), net-snmp-5.4.1-perl-snprintf.patch: Index: net-snmp-5.4.1-perl-snprintf.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-perl-snprintf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-perl-snprintf.patch 10 Jun 2008 06:02:57 -0000 1.1 +++ net-snmp-5.4.1-perl-snprintf.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -3,9 +3,10 @@ Source: upstream, http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?view=rev&sortby=date&revision=16770 Reviewed-By: Jan Safranek ---- branches/V5-4-patches/net-snmp/perl/SNMP/SNMP.xs 2007/12/21 23:19:29 16769 -+++ branches/V5-4-patches/net-snmp/perl/SNMP/SNMP.xs 2007/12/22 19:22:44 16770 -@@ -470,14 +470,16 @@ +diff -up net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_18 net-snmp-5.4.1/perl/SNMP/SNMP.xs +--- net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_18 2007-06-19 00:28:09.000000000 +0200 ++++ net-snmp-5.4.1/perl/SNMP/SNMP.xs 2008-07-25 12:54:02.000000000 +0200 +@@ -470,14 +470,16 @@ int flag; if (flag == USE_ENUMS) { for(ep = tp->enums; ep; ep = ep->next) { if (ep->value == *var->val.integer) { @@ -24,7 +25,7 @@ len = strlen(buf); } break; -@@ -486,21 +488,25 @@ +@@ -486,21 +488,25 @@ int flag; case ASN_COUNTER: case ASN_TIMETICKS: case ASN_UINTEGER: @@ -56,7 +57,7 @@ case ASN_NULL: break; -@@ -512,14 +518,14 @@ +@@ -512,14 +518,14 @@ int flag; break; case SNMP_ENDOFMIBVIEW: @@ -77,7 +78,7 @@ case ASN_COUNTER64: #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES -@@ -538,19 +544,19 @@ +@@ -538,19 +544,19 @@ int flag; #endif case ASN_BIT_STR: net-snmp-5.4.1-pie.patch: Index: net-snmp-5.4.1-pie.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-pie.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-pie.patch 7 Aug 2007 12:33:35 -0000 1.1 +++ net-snmp-5.4.1-pie.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,16 +1,6 @@ ---- net-snmp-5.4.1/apps/Makefile.in.orig 2007-07-05 01:26:56.000000000 +0200 -+++ net-snmp-5.4.1/apps/Makefile.in 2007-08-07 11:05:41.000000000 +0200 -@@ -115,7 +115,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX - $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} - - snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) -- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} -+ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} - - snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) - $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} ---- net-snmp-5.4.1/agent/Makefile.in.orig 2007-07-05 01:26:56.000000000 +0200 -+++ net-snmp-5.4.1/agent/Makefile.in 2007-08-07 11:05:19.000000000 +0200 +diff -up net-snmp-5.4.1/agent/Makefile.in.backup_patch_4 net-snmp-5.4.1/agent/Makefile.in +--- net-snmp-5.4.1/agent/Makefile.in.backup_patch_4 2007-07-05 01:26:56.000000000 +0200 ++++ net-snmp-5.4.1/agent/Makefile.in 2008-07-25 12:52:44.000000000 +0200 @@ -139,7 +139,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? @@ -20,3 +10,15 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) +diff -up net-snmp-5.4.1/apps/Makefile.in.backup_patch_4 net-snmp-5.4.1/apps/Makefile.in +--- net-snmp-5.4.1/apps/Makefile.in.backup_patch_4 2007-07-05 01:26:56.000000000 +0200 ++++ net-snmp-5.4.1/apps/Makefile.in 2008-07-25 12:52:44.000000000 +0200 +@@ -115,7 +115,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX + $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + + snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) +- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} ++ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} + + snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) + $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} net-snmp-5.4.1-sensors3.patch: Index: net-snmp-5.4.1-sensors3.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-sensors3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-sensors3.patch 14 Nov 2007 14:30:41 -0000 1.1 +++ net-snmp-5.4.1-sensors3.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -4,355 +4,287 @@ Index: configure =================================================================== ---- configure (revision 16736) -+++ configure (revision 16739) -@@ -32628,7 +32628,7 @@ - fi - - # LM-SENSORS-MIB support --echo " $module_list " | grep " ucd-snmp/lmSensors " > /dev/null -+echo " $module_list " | $GREP -i "ucd-snmp/lmsensor" > /dev/null - if test $? -eq 0 ; then - { echo "$as_me:$LINENO: checking for sensors support" >&5 - echo $ECHO_N "checking for sensors support... $ECHO_C" >&6; } -Index: include/net-snmp/agent/hardware/sensors.h -=================================================================== ---- include/net-snmp/agent/hardware/sensors.h (revision 0) -+++ include/net-snmp/agent/hardware/sensors.h (revision 16739) -@@ -0,0 +1,48 @@ -+/* -+ * Hardware Abstraction Layer - Sensors module -+ * -+ * Public interface -+ */ +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/dummy_sensors.c +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/dummy_sensors.c 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,60 @@ ++#include ++#include ++#include ++#include + -+#define NETSNMP_SENSOR_TYPE_OTHER 1 -+#define NETSNMP_SENSOR_TYPE_VOLTAGE_AC 3 -+#define NETSNMP_SENSOR_TYPE_VOLTAGE_DC 4 -+#define NETSNMP_SENSOR_TYPE_CURRENT 5 -+#define NETSNMP_SENSOR_TYPE_POWER 6 -+#define NETSNMP_SENSOR_TYPE_FREQUENCY 7 -+#define NETSNMP_SENSOR_TYPE_TEMPERATURE 8 -+#define NETSNMP_SENSOR_TYPE_HUMIDITY 9 -+#define NETSNMP_SENSOR_TYPE_RPM 10 -+#define NETSNMP_SENSOR_TYPE_VOLUME 11 -+#define NETSNMP_SENSOR_TYPE_BOOLEAN 12 + ++void netsnmp_sensor_arch_init( void ) { ++ /* Nothing to do */ ++ DEBUGMSGTL(("sensors:arch", "Initialise Dummy Sensors module\n")); ++} + -+#define NETSNMP_SENSOR_FLAG_ACTIVE 0x01 -+#define NETSNMP_SENSOR_FLAG_NAVAIL 0x02 -+#define NETSNMP_SENSOR_FLAG_BROKEN 0x04 -+#define NETSNMP_SENSOR_FLAG_DISABLE 0x08 ++int ++netsnmp_sensor_arch_load(netsnmp_cache *cache, void *vp) { ++ time_t now; ++ struct tm *tm; ++ netsnmp_sensor_info *sp; + -+#define NETSNMP_SENSOR_MASK_STATUS 0x06 /* NAVAIL|BROKEN */ ++ time(&now); ++ tm = localtime(&now); + ++ DEBUGMSGTL(("sensors:arch", "Reload Dummy Sensors module\n")); + -+#define NETSNMP_SENSOR_FIND_CREATE 1 /* or use one of the sensor type values */ -+#define NETSNMP_SENSOR_FIND_EXIST 0 ++ /* First pseudo-sensor - slowly-rising temperature */ ++ sp = sensor_by_name( "minute", NETSNMP_SENSOR_TYPE_TEMPERATURE ); ++ sp->value = tm->tm_min; ++ snprintf( sp->descr, 256, "Minute-based pseudo-sensor - slowly-rising temperature" ); ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; + -+typedef struct netsnmp_sensor_info_s netsnmp_sensor_info; -+struct netsnmp_sensor_info_s { ++ /* Second pseudo-sensor - quickly-rising temperature */ ++ sp = sensor_by_name( "second", NETSNMP_SENSOR_TYPE_TEMPERATURE ); ++ sp->value = tm->tm_sec; ++ snprintf( sp->descr, 256, "Second-based pseudo-sensor - quickly-rising temperature" ); ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; + -+ netsnmp_index idx; -+ /* int idx; */ -+ char name[256]; -+ -+ int type; -+ float value; -+ char descr[256]; -+ long flags; -+}; ++ /* Third pseudo-sensor - annual fan speed */ ++ sp = sensor_by_name( "year", NETSNMP_SENSOR_TYPE_RPM ); ++ sp->value = tm->tm_year + 1900; ++ snprintf( sp->descr, 256, "RPM pseudo-sensor - annual fan speed" ); ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; + -+netsnmp_container *get_sensor_container( void ); -+netsnmp_cache *get_sensor_cache( void ); -+netsnmp_sensor_info *sensor_by_name( char *, int ); -+NetsnmpCacheLoad netsnmp_sensor_load; -+NetsnmpCacheFree netsnmp_sensor_free; -Index: configure.in -=================================================================== ---- configure.in (revision 16736) -+++ configure.in (revision 16739) -@@ -2885,7 +2885,7 @@ - fi - - # LM-SENSORS-MIB support --echo " $module_list " | grep " ucd-snmp/lmSensors " > /dev/null -+echo " $module_list " | $GREP -i "ucd-snmp/lmsensor" > /dev/null - if test $? -eq 0 ; then - AC_MSG_CHECKING([for sensors support]) - case $target_os in -Index: agent/mibgroup/ucd-snmp/lmsensorsMib.c -=================================================================== ---- agent/mibgroup/ucd-snmp/lmsensorsMib.c (revision 0) -+++ agent/mibgroup/ucd-snmp/lmsensorsMib.c (revision 16739) -@@ -0,0 +1,205 @@ ++ /* Fourth pseudo-sensor - daily voltage */ ++ sp = sensor_by_name( "day", NETSNMP_SENSOR_TYPE_VOLTAGE_DC ); ++ sp->value = tm->tm_mday-20; ++ snprintf( sp->descr, 256, "Day-based pseudo-sensor - positive or negative voltage" ); ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ ++ /* Fifth pseudo-sensor - monthly voltage */ ++ sp = sensor_by_name( "month", NETSNMP_SENSOR_TYPE_VOLTAGE_DC ); ++ sp->value = tm->tm_mon; ++ snprintf( sp->descr, 256, "Month-based pseudo-sensor - positive voltage" ); ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ ++ /* Sixth pseudo-sensor - annual daily something */ ++ sp = sensor_by_name( "yday", NETSNMP_SENSOR_TYPE_OTHER ); ++ sp->value = tm->tm_yday; ++ snprintf( sp->descr, 256, "Day-based pseudo-sensor - annual something" ); ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ ++ return 0; ++} +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/dummy_sensors.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/dummy_sensors.h 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1 @@ ++config_require(hardware/sensors/hw_sensors) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors.h 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,13 @@ ++config_require(hardware/sensors/hw_sensors) ++ ++#if defined(solaris) ++# if defined(HAVE_PICL_H) ++config_require(hardware/sensors/picld_sensors) ++# else ++config_require(hardware/sensors/kstat_sensors) ++# endif ++#else ++config_require(hardware/sensors/lmsensors_v3) ++#endif ++ ++//config_require(hardware/sensors/dummy_sensors) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/hw_sensors.c +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/hw_sensors.c 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,183 @@ +#include +#include +#include +#include -+#include "ucd-snmp/lmsensorsMib.h" -+ -+netsnmp_container *sensorContainer = NULL; + -+void initialize_lmSensorsTable(const char *tableName, oid *tableOID, -+ netsnmp_container_op *filter, int mult ); + -+int _sensor_filter_temp( netsnmp_container *c, const void *v ); -+int _sensor_filter_fan( netsnmp_container *c, const void *v ); -+int _sensor_filter_volt( netsnmp_container *c, const void *v ); -+int _sensor_filter_misc( netsnmp_container *c, const void *v ); ++extern NetsnmpCacheLoad netsnmp_sensor_arch_load; ++extern void netsnmp_sensor_arch_init( void ); ++static int _sensor_load( void ); ++static void _sensor_free( void ); + -+static oid lmTempSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,2}; -+static oid lmFanSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,3}; -+static oid lmVoltSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,4}; -+static oid lmMiscSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,5}; -+ /* All the tables have the same length root OID */ -+size_t lmSensorsTables_oid_len = OID_LENGTH(lmMiscSensorsTable_oid); ++static int _sensorAutoUpdate = 0; /* 0 means on-demand caching */ ++static void _sensor_update_stats( unsigned int, void* ); + ++netsnmp_cache *_sensor_cache = NULL; ++netsnmp_container *_sensor_container = NULL; ++static int _sensor_idx = 0; + -+/* Initialise the LM Sensors MIB module */ -+void -+init_lmsensorsMib(void) -+{ -+ DEBUGMSGTL(("ucd-snmp/lmsensorsMib","Initializing LM-SENSORS-MIB tables\n")); ++void init_hw_sensors( void ) { + -+ /* -+ * Initialise the four LM-SENSORS-MIB tables -+ * -+ * They are almost identical, so we can use the same registration code. -+ */ -+ initialize_lmSensorsTable( "lmTempSensorsTable", lmTempSensorsTable_oid, -+ _sensor_filter_temp, 1000 ); /* MIB asks for mC */ -+ initialize_lmSensorsTable( "lmFanSensorsTable", lmFanSensorsTable_oid, -+ _sensor_filter_fan, 1); -+ initialize_lmSensorsTable( "lmVoltSensorsTable", lmVoltSensorsTable_oid, -+ _sensor_filter_volt, 1000 ); /* MIB asks for mV */ -+ initialize_lmSensorsTable( "lmMiscSensorsTable", lmMiscSensorsTable_oid, -+ _sensor_filter_misc, 1 ); -+} ++ if ( _sensor_container ) ++ return; /* Already initialised */ + -+/* -+ * Common initialisation code, used for setting up all four tables -+ */ -+void -+initialize_lmSensorsTable(const char *tableName, oid *tableOID, -+ netsnmp_container_op *filter, int mult ) -+{ -+ netsnmp_handler_registration *reg; -+ netsnmp_table_registration_info *table_info; -+ netsnmp_cache *cache; -+ netsnmp_container *container; ++ DEBUGMSGTL(("sensors", "Initialise Hardware Sensors module\n")); + + /* -+ * Ensure the HAL sensors module has been initialised, -+ * and retrieve the main sensors container. -+ * This table will then be registered using a filter on this container. ++ * Define a container to hold the basic list of sensors ++ * The four LM-SENSOR-MIB containers will be created in ++ * the relevant initialisation routine(s) + */ -+ sensorContainer = get_sensor_container(); -+ if ( !sensorContainer ) { -+ init_hw_sensors( ); -+ sensorContainer = get_sensor_container(); ++ _sensor_container = netsnmp_container_find("sensorTable:table_container"); ++ if ( NULL == _sensor_container ) { ++ snmp_log( LOG_ERR, "failed to create container for sensorTable"); ++ return; + } -+ container = netsnmp_container_find("sensorTable:table_container"); -+ container->insert_filter = filter; -+ netsnmp_container_add_index( sensorContainer, container ); -+ -+ -+ /* -+ * Create a basic registration structure for the table -+ */ -+ reg = netsnmp_create_handler_registration( -+ tableName, lmSensorsTables_handler, -+ tableOID, lmSensorsTables_oid_len, HANDLER_CAN_RONLY -+ ); -+ -+ /* -+ * Register the table using the filtered container -+ * Include an indicator of any scaling to be applied to the sensor value -+ */ -+ reg->my_reg_void = (void *)mult; -+ table_info = SNMP_MALLOC_TYPEDEF( netsnmp_table_registration_info ); -+ netsnmp_table_helper_add_indexes(table_info, ASN_INTEGER, 0); -+ table_info->min_column = COLUMN_LMSENSORS_INDEX; -+ table_info->max_column = COLUMN_LMSENSORS_VALUE; -+ netsnmp_container_table_register( reg, table_info, container, 0 ); ++ netsnmp_sensor_arch_init( ); + + /* -+ * If the HAL sensors module was configured as an on-demand caching -+ * module (rather than being automatically loaded regularly), -+ * then ensure this table makes use of that cache. ++ * If we're sampling the sensor information automatically, ++ * then arrange for this to be triggered regularly. ++ * ++ * If we're not sampling these values regularly, ++ * create a suitable cache handler instead. + */ -+ cache = get_sensor_cache(); -+ if ( cache ) { -+ netsnmp_inject_handler_before( reg, netsnmp_cache_handler_get( cache ), -+ "table_container"); ++ if ( _sensorAutoUpdate ) { ++ DEBUGMSGTL(("sensors", "Reloading Hardware Sensors automatically (%d)\n", ++ _sensorAutoUpdate)); ++ snmp_alarm_register( _sensorAutoUpdate, SA_REPEAT, ++ _sensor_update_stats, NULL ); ++ } ++ else { ++ _sensor_cache = netsnmp_cache_create( 5, netsnmp_sensor_load, ++ netsnmp_sensor_free, NULL, 0 ); ++ DEBUGMSGTL(("sensors", "Reloading Hardware Sensors on-demand (%p)\n", ++ _sensor_cache)); + } ++} + ++void shutdown_hw_sensors( void ) { ++ _sensor_free(); +} + ++/* ++ * Return the main sensor container ++ */ ++netsnmp_container *get_sensor_container( void ) { return _sensor_container; } + +/* -+ * Container filters for the four tables -+ * -+ * Used to ensure that sensor entries appear in the appropriate table. ++ * Return the main sensor cache control structure (if defined) + */ -+int _sensor_filter_temp( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Only matches temperature sensors */ -+ return (( sp->type == NETSNMP_SENSOR_TYPE_TEMPERATURE ) ? 0 : 1 ); -+} ++netsnmp_cache *get_sensor_cache( void ) { return _sensor_cache; } + -+int _sensor_filter_fan( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Only matches fan sensors */ -+ return (( sp->type == NETSNMP_SENSOR_TYPE_RPM ) ? 0 : 1 ); ++ ++/* ++ * Wrapper routine for automatically updating sensor statistics ++ */ ++void ++_sensor_update_stats( unsigned int clientreg, void *data ) ++{ ++ _sensor_free(); ++ _sensor_load(); +} + -+int _sensor_filter_volt( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Only matches voltage sensors (AC or DC) */ -+ return ((( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_DC ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_AC )) ? 0 : 1 ); ++/* ++ * Wrapper routine for re-loading sensor statistics on demand ++ */ ++int ++netsnmp_sensor_load( netsnmp_cache *cache, void *data ) ++{ ++ return _sensor_load(); +} + -+int _sensor_filter_misc( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Matches everything except temperature, fan or voltage sensors */ -+ return ((( sp->type == NETSNMP_SENSOR_TYPE_TEMPERATURE ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_RPM ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_DC ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_AC )) ? 1 : 0 ); ++/* ++ * Wrapper routine for releasing expired sensor statistics ++ */ ++void ++netsnmp_sensor_free( netsnmp_cache *cache, void *data ) ++{ ++ _sensor_free(); +} + + +/* -+ * Handle requests for any of the four lmXxxxSensorsTables -+ * -+ * This is possible because all the table share the -+ * same structure and behaviour. ++ * Architecture-independent processing of loading sensor statistics + */ -+int -+lmSensorsTables_handler( -+ netsnmp_mib_handler *handler, -+ netsnmp_handler_registration *reginfo, -+ netsnmp_agent_request_info *reqinfo, -+ netsnmp_request_info *requests) { ++static int ++_sensor_load( void ) ++{ ++ netsnmp_sensor_arch_load( NULL, NULL ); ++} + -+ netsnmp_request_info *request; -+ netsnmp_table_request_info *table_info; -+ netsnmp_sensor_info *sensor_info; -+ int mult = (int)reginfo->my_reg_void; ++/* ++ * Architecture-independent release of sensor statistics ++ */ ++static void ++_sensor_free( void ) ++{ ++ netsnmp_sensor_info *sp; + -+ DEBUGMSGTL(( "ucd-snmp/lmsensorsMib","lmSensorsTables_handler - root: ")); -+ DEBUGMSGOID(("ucd-snmp/lmsensorsMib", reginfo->rootoid, reginfo->rootoid_len)); -+ DEBUGMSG(( "ucd-snmp/lmsensorsMib",", mode %d\n", reqinfo->mode )); -+ /* -+ * This is a read-only table, so we only need to handle GET requests. -+ * (The container helper converts GETNEXT->GET requests automatically). -+ */ -+ switch (reqinfo->mode) { -+ case MODE_GET: -+ for (request=requests; request; request=request->next) { -+ sensor_info = (netsnmp_sensor_info *) -+ netsnmp_container_table_extract_context(request); -+ if ( !sensor_info ) { -+ netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE); -+ continue; -+ } -+ -+ table_info = netsnmp_extract_table_info(request); -+ switch (table_info->colnum) { -+ case COLUMN_LMSENSORS_INDEX: -+ snmp_set_var_typed_integer( request->requestvb, ASN_INTEGER, -+ sensor_info->idx.oids[0]); -+ break; -+ case COLUMN_LMSENSORS_DEVICE: -+ if ( sensor_info->descr[0] != '\0' ) { -+ snmp_set_var_typed_value( request->requestvb, ASN_OCTET_STR, -+ sensor_info->descr, strlen(sensor_info->descr)); -+ } else { -+ snmp_set_var_typed_value( request->requestvb, ASN_OCTET_STR, -+ sensor_info->name, strlen(sensor_info->name)); -+ } -+ break; -+ case COLUMN_LMSENSORS_VALUE: -+ /* Multiply the value by the appropriate scaling factor for this table */ -+ snmp_set_var_typed_integer( request->requestvb, ASN_GAUGE, -+ (int)(mult*sensor_info->value)); -+ break; -+ default: -+ netsnmp_set_request_error(reqinfo, request, -+ SNMP_NOSUCHOBJECT); -+ break; -+ } -+ } -+ break; ++ for (sp = CONTAINER_FIRST( _sensor_container ); ++ sp; ++ sp = CONTAINER_NEXT( _sensor_container, sp )) { + ++ sp->flags &= ~ NETSNMP_SENSOR_FLAG_ACTIVE; + } -+ return SNMP_ERR_NOERROR; +} -Index: agent/mibgroup/ucd-snmp/lmsensorsMib.h -=================================================================== ---- agent/mibgroup/ucd-snmp/lmsensorsMib.h (revision 0) -+++ agent/mibgroup/ucd-snmp/lmsensorsMib.h (revision 16739) -@@ -0,0 +1,23 @@ -+#ifndef LM_SENSORS_MIB_H -+#define LM_SENSORS_MIB_H -+ -+config_require(hardware/sensors) -+config_add_mib(LM-SENSORS-MIB) + -+/* function declarations */ -+void init_lmsensorsMib(void); + +/* -+ * Handler and Column definitions for lmXxxxSensorsTable -+ * -+ * Note that the same handler (and hence the same -+ * column identifiers) are used for all four tables. -+ * This is possible because all the table share the -+ * same structure and behaviour. ++ * Retrieve a sensor entry by name, ++ * or (optionally) insert a new one into the container + */ -+Netsnmp_Node_Handler lmSensorsTables_handler; -+#define COLUMN_LMSENSORS_INDEX 1 -+#define COLUMN_LMSENSORS_DEVICE 2 -+#define COLUMN_LMSENSORS_VALUE 3 ++netsnmp_sensor_info * ++sensor_by_name( char *name, int create_type ) ++{ ++ netsnmp_sensor_info *sp; + -+#endif /* LM_SENSORS_MIB_H */ -Index: agent/mibgroup/hardware/sensors.h -=================================================================== ---- agent/mibgroup/hardware/sensors.h (revision 0) -+++ agent/mibgroup/hardware/sensors.h (revision 16739) -@@ -0,0 +1,13 @@ -+config_require(hardware/sensors/hw_sensors) ++ DEBUGMSGTL(("sensors:name", "Get sensor entry (%s)\n", name)); + -+#if defined(solaris) -+# if defined(HAVE_PICL_H) -+config_require(hardware/sensors/picld_sensors) -+# else -+config_require(hardware/sensors/kstat_sensors) -+# endif -+#else -+config_require(hardware/sensors/lmsensors_v3) -+#endif ++ /* ++ * Look through the list for a matching entry ++ */ ++ /* .. or use a secondary index container ?? */ ++ for (sp = CONTAINER_FIRST( _sensor_container ); ++ sp; ++ sp = CONTAINER_NEXT( _sensor_container, sp )) { + -+//config_require(hardware/sensors/dummy_sensors) -Index: agent/mibgroup/hardware/sensors/hw_sensors.h -=================================================================== ---- agent/mibgroup/hardware/sensors/hw_sensors.h (revision 0) -+++ agent/mibgroup/hardware/sensors/hw_sensors.h (revision 16739) ++ if ( !strcmp( name, sp->name )) ++ return sp; ++ } ++ ++ /* ++ * Not found... ++ */ ++ if ( create_type == NETSNMP_SENSOR_FIND_EXIST ) { ++ DEBUGMSGTL(("sensors:name", "No such sensor entry\n")); ++ return NULL; ++ } ++ ++ /* ++ * ... so let's create a new one, using the type supplied ++ */ ++ sp = SNMP_MALLOC_TYPEDEF( netsnmp_sensor_info ); ++ if ( sp ) { ++ strcpy( sp->name, name ); ++ sp->type = create_type; ++ /* ++ * Set up the index value. ++ * ++ * All this trouble, just for a simple integer. ++ * Surely there must be a better way? ++ */ ++ sp->idx.len = 1; ++ sp->idx.oids = SNMP_MALLOC_TYPEDEF( oid ); ++ sp->idx.oids[0] = ++_sensor_idx; ++ } ++ ++ DEBUGMSGTL(("sensors:name", "Create sensor entry (type = %d, index = %d\n", ++ create_type, _sensor_idx)); ++ CONTAINER_INSERT( _sensor_container, sp ); ++ return sp; ++} ++ +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/hw_sensors.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/hw_sensors.h 2008-07-25 12:53:46.000000000 +0200 @@ -0,0 +1 @@ +void init_hw_sensors( void ); -Index: agent/mibgroup/hardware/sensors/lmsensors_v2.h -=================================================================== ---- agent/mibgroup/hardware/sensors/lmsensors_v2.h (revision 0) -+++ agent/mibgroup/hardware/sensors/lmsensors_v2.h (revision 16739) -@@ -0,0 +1 @@ -+config_require(hardware/sensors/hw_sensors) -Index: agent/mibgroup/hardware/sensors/kstat_sensors.c -=================================================================== ---- agent/mibgroup/hardware/sensors/kstat_sensors.c (revision 0) -+++ agent/mibgroup/hardware/sensors/kstat_sensors.c (revision 16739) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/kstat_sensors.c +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/kstat_sensors.c 2008-07-25 12:53:46.000000000 +0200 @@ -0,0 +1,161 @@ +#include +#include @@ -515,87 +447,208 @@ + + return 0; +} -Index: agent/mibgroup/hardware/sensors/lmsensors_v3.h -=================================================================== ---- agent/mibgroup/hardware/sensors/lmsensors_v3.h (revision 0) -+++ agent/mibgroup/hardware/sensors/lmsensors_v3.h (revision 16739) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/kstat_sensors.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/kstat_sensors.h 2008-07-25 12:53:46.000000000 +0200 @@ -0,0 +1 @@ +config_require(hardware/sensors/hw_sensors) -Index: agent/mibgroup/hardware/sensors/dummy_sensors.c -=================================================================== ---- agent/mibgroup/hardware/sensors/dummy_sensors.c (revision 0) -+++ agent/mibgroup/hardware/sensors/dummy_sensors.c (revision 16739) -@@ -0,0 +1,60 @@ +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v2.c +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v2.c 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,75 @@ +#include +#include +#include +#include + ++#include "util_funcs.h" ++#include ++#include + +void netsnmp_sensor_arch_init( void ) { -+ /* Nothing to do */ -+ DEBUGMSGTL(("sensors:arch", "Initialise Dummy Sensors module\n")); ++ FILE *fp = fopen("/etc/sensors.conf", "r"); ++ DEBUGMSGTL(("sensors:arch", "Initialise LM Sensors module\n")); ++ sensors_init( fp ); +} + +int +netsnmp_sensor_arch_load(netsnmp_cache *cache, void *vp) { -+ time_t now; -+ struct tm *tm; + netsnmp_sensor_info *sp; ++ const sensors_chip_name *chip; ++ const sensors_feature_data *data; ++ int chip_nr = 0; + -+ time(&now); -+ tm = localtime(&now); -+ -+ DEBUGMSGTL(("sensors:arch", "Reload Dummy Sensors module\n")); -+ -+ /* First pseudo-sensor - slowly-rising temperature */ -+ sp = sensor_by_name( "minute", NETSNMP_SENSOR_TYPE_TEMPERATURE ); -+ sp->value = tm->tm_min; -+ snprintf( sp->descr, 256, "Minute-based pseudo-sensor - slowly-rising temperature" ); -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; -+ -+ /* Second pseudo-sensor - quickly-rising temperature */ -+ sp = sensor_by_name( "second", NETSNMP_SENSOR_TYPE_TEMPERATURE ); -+ sp->value = tm->tm_sec; -+ snprintf( sp->descr, 256, "Second-based pseudo-sensor - quickly-rising temperature" ); -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ DEBUGMSGTL(("sensors:arch", "Reload LM Sensors module\n")); ++ while ((chip = sensors_get_detected_chips(&chip_nr))) { ++ int a = 0; ++ int b = 0; + -+ /* Third pseudo-sensor - annual fan speed */ -+ sp = sensor_by_name( "year", NETSNMP_SENSOR_TYPE_RPM ); -+ sp->value = tm->tm_year + 1900; -+ snprintf( sp->descr, 256, "RPM pseudo-sensor - annual fan speed" ); -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ while ((data = sensors_get_all_features(*chip, &a, &b))) { ++ DEBUGMSGTL(("sensors:arch:detail", "get_all_features (%d, %d)\n", a, b)); ++ char *label = NULL; ++ double val; ++ int type = NETSNMP_SENSOR_TYPE_OTHER; + -+ /* Fourth pseudo-sensor - daily voltage */ -+ sp = sensor_by_name( "day", NETSNMP_SENSOR_TYPE_VOLTAGE_DC ); -+ sp->value = tm->tm_mday-20; -+ snprintf( sp->descr, 256, "Day-based pseudo-sensor - positive or negative voltage" ); -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ if ((data->mode & SENSORS_MODE_R) && ++ (data->mapping == SENSORS_NO_MAPPING) && ++ !sensors_get_label(*chip, data->number, &label) && ++ !sensors_get_feature(*chip, data->number, &val)) { + -+ /* Fifth pseudo-sensor - monthly voltage */ -+ sp = sensor_by_name( "month", NETSNMP_SENSOR_TYPE_VOLTAGE_DC ); -+ sp->value = tm->tm_mon; -+ snprintf( sp->descr, 256, "Month-based pseudo-sensor - positive voltage" ); -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ DEBUGMSGTL(("sensors:arch:detail", "%s = %f\n", label, val)); ++ /* ++ * Determine the type of sensor from the description. ++ * ++ * If the text being looked for below is not in the label of a ++ * given sensor (e.g., the temp1 sensor has been labeled 'CPU' ++ * rather than 'CPU temp') it will be categorised as OTHER. ++ */ ++ if (strstr(label, "V")) { ++ type = NETSNMP_SENSOR_TYPE_VOLTAGE_DC; ++ } ++ if (strstr(label, "fan") || strstr(label, "Fan")) { ++ type = NETSNMP_SENSOR_TYPE_RPM; ++ } ++ if (strstr(label, "temp") || strstr(label, "Temp")) { ++ type = NETSNMP_SENSOR_TYPE_TEMPERATURE; ++ } + -+ /* Sixth pseudo-sensor - annual daily something */ -+ sp = sensor_by_name( "yday", NETSNMP_SENSOR_TYPE_OTHER ); -+ sp->value = tm->tm_yday; -+ snprintf( sp->descr, 256, "Day-based pseudo-sensor - annual something" ); -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ /* ++ * Use this type to create a new sensor entry ++ * (inserting it in the appropriate sub-containers) ++ */ ++ sp = sensor_by_name( label, type ); ++ if ( sp ) { ++ sp->value = val; ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ } ++ } ++ if (label) { ++ free(label); ++ label = NULL; ++ } ++ } /* end while data */ ++ } /* end while chip */ ++ ++ return 0; ++} +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v2.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v2.h 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1 @@ ++config_require(hardware/sensors/hw_sensors) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v3.c +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v3.c 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,101 @@ ++#include ++#include ++#include ++#include ++ ++#include "util_funcs.h" ++#include ++#include ++ ++ ++void netsnmp_sensor_arch_init( void ) { ++ FILE *fp = fopen("/etc/sensors.conf", "r"); ++ DEBUGMSGTL(("sensors:arch", "Initialise v3 LM Sensors module\n")); ++ sensors_init( fp ); ++} ++ ++int ++netsnmp_sensor_arch_load(netsnmp_cache *cache, void *vp) { ++ netsnmp_sensor_info *sp; ++ const sensors_chip_name *chip; ++ const sensors_feature *data; ++ const sensors_subfeature *data2; ++ int chip_nr = 0; ++ ++ DEBUGMSGTL(("sensors:arch", "Reload v3 LM Sensors module\n")); ++ while ((chip = sensors_get_detected_chips( NULL, &chip_nr))) { ++ int a = 0; ++ ++ while ((data = sensors_get_features( chip, &a))) { ++ DEBUGMSGTL(("sensors:arch:detail", "get_features (%s, %d)\n", data->name, data->number)); ++ int b = 0; ++ ++ ++ while ((data2 = sensors_get_all_subfeatures( chip, data, &b))) { ++ char *label = NULL; ++ double val; ++ int type = NETSNMP_SENSOR_TYPE_OTHER; ++ ++ DEBUGMSGTL(("sensors:arch:detail", " get_subfeatures (%s, %d)\n", data2->name, data2->number)); ++ /* ++ * Check the type of this subfeature, ++ * concentrating on the main "input" measurements. ++ */ ++ switch ( data2->type ) { ++ case SENSORS_SUBFEATURE_IN_INPUT: ++ type = NETSNMP_SENSOR_TYPE_VOLTAGE_DC; ++ break; ++ case SENSORS_SUBFEATURE_FAN_INPUT: ++ type = NETSNMP_SENSOR_TYPE_RPM; ++ break; ++ case SENSORS_SUBFEATURE_TEMP_INPUT: ++ type = NETSNMP_SENSOR_TYPE_TEMPERATURE; ++ break; ++ case SENSORS_SUBFEATURE_VID: ++ type = NETSNMP_SENSOR_TYPE_VOLTAGE_DC; ++ break; ++ default: ++ /* Skip everything other than these basic sensor features - ??? */ ++ DEBUGMSGTL(("sensors:arch:detail", " Skip type %x\n", data2->type)); ++ continue; ++ } ++ ++ /* ++ * Get the name and value of this subfeature ++ */ ++/* ++ if (!(label = sensors_get_label(chip, data))) { ++ DEBUGMSGTL(("sensors:arch:detail", " Can't get name (%s)\n", label)); ++ continue; ++ } ++ if (sensors_get_value(chip, data2->number, &val) < 0) { ++ DEBUGMSGTL(("sensors:arch:detail", " Can't get value (%f)\n", val)); ++ continue; ++ } ++*/ ++ if (!(label = sensors_get_label(chip, data)) || ++ (sensors_get_value(chip, data2->number, &val) < 0)) { ++ DEBUGMSGTL(("sensors:arch:detail", " Can't get name/value (%s, %f)\n", label, val)); ++ continue; ++ } ++ DEBUGMSGTL(("sensors:arch:detail", "%s = %f\n", label, val)); ++ ++ /* ++ * Use this type to create a new sensor entry ++ * (inserting it in the appropriate sub-containers) ++ */ ++ sp = sensor_by_name( label, type ); ++ if ( sp ) { ++ sp->value = val; ++ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ } ++ if (label) { ++ free(label); ++ label = NULL; ++ } ++ } /* end while data2 */ ++ } /* end while data */ ++ } /* end while chip */ + + return 0; +} -Index: agent/mibgroup/hardware/sensors/kstat_sensors.h -=================================================================== ---- agent/mibgroup/hardware/sensors/kstat_sensors.h (revision 0) -+++ agent/mibgroup/hardware/sensors/kstat_sensors.h (revision 16739) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v3.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/lmsensors_v3.h 2008-07-25 12:53:46.000000000 +0200 @@ -0,0 +1 @@ +config_require(hardware/sensors/hw_sensors) -Index: agent/mibgroup/hardware/sensors/picld_sensors.c -=================================================================== ---- agent/mibgroup/hardware/sensors/picld_sensors.c (revision 0) -+++ agent/mibgroup/hardware/sensors/picld_sensors.c (revision 16739) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/picld_sensors.c +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/picld_sensors.c 2008-07-25 12:53:46.000000000 +0200 @@ -0,0 +1,341 @@ +#include +#include @@ -938,389 +991,320 @@ + picl_shutdown(); +} + -Index: agent/mibgroup/hardware/sensors/hw_sensors.c -=================================================================== ---- agent/mibgroup/hardware/sensors/hw_sensors.c (revision 0) -+++ agent/mibgroup/hardware/sensors/hw_sensors.c (revision 16739) -@@ -0,0 +1,183 @@ +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/hardware/sensors/picld_sensors.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/hardware/sensors/picld_sensors.h 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1 @@ ++config_require(hardware/sensors/hw_sensors) +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/ucd-snmp/lmsensorsMib.c +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/lmsensorsMib.c 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,205 @@ +#include +#include +#include +#include ++#include "ucd-snmp/lmsensorsMib.h" + ++netsnmp_container *sensorContainer = NULL; + -+extern NetsnmpCacheLoad netsnmp_sensor_arch_load; -+extern void netsnmp_sensor_arch_init( void ); -+static int _sensor_load( void ); -+static void _sensor_free( void ); -+ -+static int _sensorAutoUpdate = 0; /* 0 means on-demand caching */ -+static void _sensor_update_stats( unsigned int, void* ); -+ -+netsnmp_cache *_sensor_cache = NULL; -+netsnmp_container *_sensor_container = NULL; -+static int _sensor_idx = 0; ++void initialize_lmSensorsTable(const char *tableName, oid *tableOID, ++ netsnmp_container_op *filter, int mult ); + -+void init_hw_sensors( void ) { ++int _sensor_filter_temp( netsnmp_container *c, const void *v ); ++int _sensor_filter_fan( netsnmp_container *c, const void *v ); ++int _sensor_filter_volt( netsnmp_container *c, const void *v ); ++int _sensor_filter_misc( netsnmp_container *c, const void *v ); + -+ if ( _sensor_container ) -+ return; /* Already initialised */ ++static oid lmTempSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,2}; ++static oid lmFanSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,3}; ++static oid lmVoltSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,4}; ++static oid lmMiscSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,5}; ++ /* All the tables have the same length root OID */ ++size_t lmSensorsTables_oid_len = OID_LENGTH(lmMiscSensorsTable_oid); + -+ DEBUGMSGTL(("sensors", "Initialise Hardware Sensors module\n")); + -+ /* -+ * Define a container to hold the basic list of sensors -+ * The four LM-SENSOR-MIB containers will be created in -+ * the relevant initialisation routine(s) -+ */ -+ _sensor_container = netsnmp_container_find("sensorTable:table_container"); -+ if ( NULL == _sensor_container ) { -+ snmp_log( LOG_ERR, "failed to create container for sensorTable"); -+ return; -+ } -+ netsnmp_sensor_arch_init( ); ++/* Initialise the LM Sensors MIB module */ ++void ++init_lmsensorsMib(void) ++{ ++ DEBUGMSGTL(("ucd-snmp/lmsensorsMib","Initializing LM-SENSORS-MIB tables\n")); + -+ /* -+ * If we're sampling the sensor information automatically, -+ * then arrange for this to be triggered regularly. ++ /* ++ * Initialise the four LM-SENSORS-MIB tables + * -+ * If we're not sampling these values regularly, -+ * create a suitable cache handler instead. ++ * They are almost identical, so we can use the same registration code. + */ -+ if ( _sensorAutoUpdate ) { -+ DEBUGMSGTL(("sensors", "Reloading Hardware Sensors automatically (%d)\n", -+ _sensorAutoUpdate)); -+ snmp_alarm_register( _sensorAutoUpdate, SA_REPEAT, -+ _sensor_update_stats, NULL ); -+ } -+ else { -+ _sensor_cache = netsnmp_cache_create( 5, netsnmp_sensor_load, -+ netsnmp_sensor_free, NULL, 0 ); -+ DEBUGMSGTL(("sensors", "Reloading Hardware Sensors on-demand (%p)\n", -+ _sensor_cache)); -+ } -+} -+ -+void shutdown_hw_sensors( void ) { -+ _sensor_free(); ++ initialize_lmSensorsTable( "lmTempSensorsTable", lmTempSensorsTable_oid, ++ _sensor_filter_temp, 1000 ); /* MIB asks for mC */ ++ initialize_lmSensorsTable( "lmFanSensorsTable", lmFanSensorsTable_oid, ++ _sensor_filter_fan, 1); ++ initialize_lmSensorsTable( "lmVoltSensorsTable", lmVoltSensorsTable_oid, ++ _sensor_filter_volt, 1000 ); /* MIB asks for mV */ ++ initialize_lmSensorsTable( "lmMiscSensorsTable", lmMiscSensorsTable_oid, ++ _sensor_filter_misc, 1 ); +} + +/* -+ * Return the main sensor container -+ */ -+netsnmp_container *get_sensor_container( void ) { return _sensor_container; } -+ -+/* -+ * Return the main sensor cache control structure (if defined) -+ */ -+netsnmp_cache *get_sensor_cache( void ) { return _sensor_cache; } -+ -+ -+/* -+ * Wrapper routine for automatically updating sensor statistics ++ * Common initialisation code, used for setting up all four tables + */ +void -+_sensor_update_stats( unsigned int clientreg, void *data ) ++initialize_lmSensorsTable(const char *tableName, oid *tableOID, ++ netsnmp_container_op *filter, int mult ) +{ -+ _sensor_free(); -+ _sensor_load(); -+} ++ netsnmp_handler_registration *reg; ++ netsnmp_table_registration_info *table_info; ++ netsnmp_cache *cache; ++ netsnmp_container *container; + -+/* -+ * Wrapper routine for re-loading sensor statistics on demand -+ */ -+int -+netsnmp_sensor_load( netsnmp_cache *cache, void *data ) -+{ -+ return _sensor_load(); -+} -+ -+/* -+ * Wrapper routine for releasing expired sensor statistics -+ */ -+void -+netsnmp_sensor_free( netsnmp_cache *cache, void *data ) -+{ -+ _sensor_free(); -+} -+ -+ -+/* -+ * Architecture-independent processing of loading sensor statistics -+ */ -+static int -+_sensor_load( void ) -+{ -+ netsnmp_sensor_arch_load( NULL, NULL ); -+} -+ -+/* -+ * Architecture-independent release of sensor statistics -+ */ -+static void -+_sensor_free( void ) -+{ -+ netsnmp_sensor_info *sp; -+ -+ for (sp = CONTAINER_FIRST( _sensor_container ); -+ sp; -+ sp = CONTAINER_NEXT( _sensor_container, sp )) { -+ -+ sp->flags &= ~ NETSNMP_SENSOR_FLAG_ACTIVE; ++ /* ++ * Ensure the HAL sensors module has been initialised, ++ * and retrieve the main sensors container. ++ * This table will then be registered using a filter on this container. ++ */ ++ sensorContainer = get_sensor_container(); ++ if ( !sensorContainer ) { ++ init_hw_sensors( ); ++ sensorContainer = get_sensor_container(); + } -+} -+ -+ -+/* -+ * Retrieve a sensor entry by name, -+ * or (optionally) insert a new one into the container -+ */ -+netsnmp_sensor_info * -+sensor_by_name( char *name, int create_type ) -+{ -+ netsnmp_sensor_info *sp; ++ container = netsnmp_container_find("sensorTable:table_container"); ++ container->insert_filter = filter; ++ netsnmp_container_add_index( sensorContainer, container ); + -+ DEBUGMSGTL(("sensors:name", "Get sensor entry (%s)\n", name)); + + /* -+ * Look through the list for a matching entry ++ * Create a basic registration structure for the table + */ -+ /* .. or use a secondary index container ?? */ -+ for (sp = CONTAINER_FIRST( _sensor_container ); -+ sp; -+ sp = CONTAINER_NEXT( _sensor_container, sp )) { -+ -+ if ( !strcmp( name, sp->name )) -+ return sp; -+ } ++ reg = netsnmp_create_handler_registration( ++ tableName, lmSensorsTables_handler, ++ tableOID, lmSensorsTables_oid_len, HANDLER_CAN_RONLY ++ ); + + /* -+ * Not found... ++ * Register the table using the filtered container ++ * Include an indicator of any scaling to be applied to the sensor value + */ -+ if ( create_type == NETSNMP_SENSOR_FIND_EXIST ) { -+ DEBUGMSGTL(("sensors:name", "No such sensor entry\n")); -+ return NULL; -+ } ++ reg->my_reg_void = (void *)mult; ++ table_info = SNMP_MALLOC_TYPEDEF( netsnmp_table_registration_info ); ++ netsnmp_table_helper_add_indexes(table_info, ASN_INTEGER, 0); ++ table_info->min_column = COLUMN_LMSENSORS_INDEX; ++ table_info->max_column = COLUMN_LMSENSORS_VALUE; ++ netsnmp_container_table_register( reg, table_info, container, 0 ); + + /* -+ * ... so let's create a new one, using the type supplied ++ * If the HAL sensors module was configured as an on-demand caching ++ * module (rather than being automatically loaded regularly), ++ * then ensure this table makes use of that cache. + */ -+ sp = SNMP_MALLOC_TYPEDEF( netsnmp_sensor_info ); -+ if ( sp ) { -+ strcpy( sp->name, name ); -+ sp->type = create_type; -+ /* -+ * Set up the index value. -+ * -+ * All this trouble, just for a simple integer. -+ * Surely there must be a better way? -+ */ -+ sp->idx.len = 1; -+ sp->idx.oids = SNMP_MALLOC_TYPEDEF( oid ); -+ sp->idx.oids[0] = ++_sensor_idx; ++ cache = get_sensor_cache(); ++ if ( cache ) { ++ netsnmp_inject_handler_before( reg, netsnmp_cache_handler_get( cache ), ++ "table_container"); + } + -+ DEBUGMSGTL(("sensors:name", "Create sensor entry (type = %d, index = %d\n", -+ create_type, _sensor_idx)); -+ CONTAINER_INSERT( _sensor_container, sp ); -+ return sp; +} + -Index: agent/mibgroup/hardware/sensors/dummy_sensors.h -=================================================================== ---- agent/mibgroup/hardware/sensors/dummy_sensors.h (revision 0) -+++ agent/mibgroup/hardware/sensors/dummy_sensors.h (revision 16739) -@@ -0,0 +1 @@ -+config_require(hardware/sensors/hw_sensors) -Index: agent/mibgroup/hardware/sensors/lmsensors_v2.c -=================================================================== ---- agent/mibgroup/hardware/sensors/lmsensors_v2.c (revision 0) -+++ agent/mibgroup/hardware/sensors/lmsensors_v2.c (revision 16739) -@@ -0,0 +1,75 @@ -+#include -+#include -+#include -+#include + -+#include "util_funcs.h" -+#include -+#include ++/* ++ * Container filters for the four tables ++ * ++ * Used to ensure that sensor entries appear in the appropriate table. ++ */ ++int _sensor_filter_temp( netsnmp_container *c, const void *v ) { ++ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; ++ /* Only matches temperature sensors */ ++ return (( sp->type == NETSNMP_SENSOR_TYPE_TEMPERATURE ) ? 0 : 1 ); ++} + -+void netsnmp_sensor_arch_init( void ) { -+ FILE *fp = fopen("/etc/sensors.conf", "r"); -+ DEBUGMSGTL(("sensors:arch", "Initialise LM Sensors module\n")); -+ sensors_init( fp ); ++int _sensor_filter_fan( netsnmp_container *c, const void *v ) { ++ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; ++ /* Only matches fan sensors */ ++ return (( sp->type == NETSNMP_SENSOR_TYPE_RPM ) ? 0 : 1 ); +} + -+int -+netsnmp_sensor_arch_load(netsnmp_cache *cache, void *vp) { -+ netsnmp_sensor_info *sp; -+ const sensors_chip_name *chip; -+ const sensors_feature_data *data; -+ int chip_nr = 0; ++int _sensor_filter_volt( netsnmp_container *c, const void *v ) { ++ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; ++ /* Only matches voltage sensors (AC or DC) */ ++ return ((( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_DC ) || ++ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_AC )) ? 0 : 1 ); ++} + -+ DEBUGMSGTL(("sensors:arch", "Reload LM Sensors module\n")); -+ while ((chip = sensors_get_detected_chips(&chip_nr))) { -+ int a = 0; -+ int b = 0; ++int _sensor_filter_misc( netsnmp_container *c, const void *v ) { ++ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; ++ /* Matches everything except temperature, fan or voltage sensors */ ++ return ((( sp->type == NETSNMP_SENSOR_TYPE_TEMPERATURE ) || ++ ( sp->type == NETSNMP_SENSOR_TYPE_RPM ) || ++ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_DC ) || ++ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_AC )) ? 1 : 0 ); ++} + -+ while ((data = sensors_get_all_features(*chip, &a, &b))) { -+ DEBUGMSGTL(("sensors:arch:detail", "get_all_features (%d, %d)\n", a, b)); -+ char *label = NULL; -+ double val; -+ int type = NETSNMP_SENSOR_TYPE_OTHER; + -+ if ((data->mode & SENSORS_MODE_R) && -+ (data->mapping == SENSORS_NO_MAPPING) && -+ !sensors_get_label(*chip, data->number, &label) && -+ !sensors_get_feature(*chip, data->number, &val)) { ++/* ++ * Handle requests for any of the four lmXxxxSensorsTables ++ * ++ * This is possible because all the table share the ++ * same structure and behaviour. ++ */ ++int ++lmSensorsTables_handler( ++ netsnmp_mib_handler *handler, ++ netsnmp_handler_registration *reginfo, ++ netsnmp_agent_request_info *reqinfo, ++ netsnmp_request_info *requests) { + -+ DEBUGMSGTL(("sensors:arch:detail", "%s = %f\n", label, val)); -+ /* -+ * Determine the type of sensor from the description. -+ * -+ * If the text being looked for below is not in the label of a -+ * given sensor (e.g., the temp1 sensor has been labeled 'CPU' -+ * rather than 'CPU temp') it will be categorised as OTHER. -+ */ -+ if (strstr(label, "V")) { -+ type = NETSNMP_SENSOR_TYPE_VOLTAGE_DC; -+ } -+ if (strstr(label, "fan") || strstr(label, "Fan")) { -+ type = NETSNMP_SENSOR_TYPE_RPM; -+ } -+ if (strstr(label, "temp") || strstr(label, "Temp")) { -+ type = NETSNMP_SENSOR_TYPE_TEMPERATURE; -+ } ++ netsnmp_request_info *request; ++ netsnmp_table_request_info *table_info; ++ netsnmp_sensor_info *sensor_info; ++ int mult = (int)reginfo->my_reg_void; + -+ /* -+ * Use this type to create a new sensor entry -+ * (inserting it in the appropriate sub-containers) -+ */ -+ sp = sensor_by_name( label, type ); -+ if ( sp ) { -+ sp->value = val; -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; ++ DEBUGMSGTL(( "ucd-snmp/lmsensorsMib","lmSensorsTables_handler - root: ")); ++ DEBUGMSGOID(("ucd-snmp/lmsensorsMib", reginfo->rootoid, reginfo->rootoid_len)); ++ DEBUGMSG(( "ucd-snmp/lmsensorsMib",", mode %d\n", reqinfo->mode )); ++ /* ++ * This is a read-only table, so we only need to handle GET requests. ++ * (The container helper converts GETNEXT->GET requests automatically). ++ */ ++ switch (reqinfo->mode) { ++ case MODE_GET: ++ for (request=requests; request; request=request->next) { ++ sensor_info = (netsnmp_sensor_info *) ++ netsnmp_container_table_extract_context(request); ++ if ( !sensor_info ) { ++ netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE); ++ continue; ++ } ++ ++ table_info = netsnmp_extract_table_info(request); ++ switch (table_info->colnum) { ++ case COLUMN_LMSENSORS_INDEX: ++ snmp_set_var_typed_integer( request->requestvb, ASN_INTEGER, ++ sensor_info->idx.oids[0]); ++ break; ++ case COLUMN_LMSENSORS_DEVICE: ++ if ( sensor_info->descr[0] != '\0' ) { ++ snmp_set_var_typed_value( request->requestvb, ASN_OCTET_STR, ++ sensor_info->descr, strlen(sensor_info->descr)); ++ } else { ++ snmp_set_var_typed_value( request->requestvb, ASN_OCTET_STR, ++ sensor_info->name, strlen(sensor_info->name)); + } ++ break; ++ case COLUMN_LMSENSORS_VALUE: ++ /* Multiply the value by the appropriate scaling factor for this table */ ++ snmp_set_var_typed_integer( request->requestvb, ASN_GAUGE, ++ (int)(mult*sensor_info->value)); ++ break; ++ default: ++ netsnmp_set_request_error(reqinfo, request, ++ SNMP_NOSUCHOBJECT); ++ break; + } -+ if (label) { -+ free(label); -+ label = NULL; -+ } -+ } /* end while data */ -+ } /* end while chip */ ++ } ++ break; + -+ return 0; ++ } ++ return SNMP_ERR_NOERROR; +} -Index: agent/mibgroup/hardware/sensors/picld_sensors.h -=================================================================== ---- agent/mibgroup/hardware/sensors/picld_sensors.h (revision 0) -+++ agent/mibgroup/hardware/sensors/picld_sensors.h (revision 16739) -@@ -0,0 +1 @@ -+config_require(hardware/sensors/hw_sensors) -Index: agent/mibgroup/hardware/sensors/lmsensors_v3.c -=================================================================== ---- agent/mibgroup/hardware/sensors/lmsensors_v3.c (revision 0) -+++ agent/mibgroup/hardware/sensors/lmsensors_v3.c (revision 16739) -@@ -0,0 +1,101 @@ -+#include -+#include -+#include -+#include +diff -up /dev/null net-snmp-5.4.1/agent/mibgroup/ucd-snmp/lmsensorsMib.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/lmsensorsMib.h 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,23 @@ ++#ifndef LM_SENSORS_MIB_H ++#define LM_SENSORS_MIB_H + -+#include "util_funcs.h" -+#include -+#include ++config_require(hardware/sensors) ++config_add_mib(LM-SENSORS-MIB) + ++/* function declarations */ ++void init_lmsensorsMib(void); + -+void netsnmp_sensor_arch_init( void ) { -+ FILE *fp = fopen("/etc/sensors.conf", "r"); -+ DEBUGMSGTL(("sensors:arch", "Initialise v3 LM Sensors module\n")); -+ sensors_init( fp ); -+} ++/* ++ * Handler and Column definitions for lmXxxxSensorsTable ++ * ++ * Note that the same handler (and hence the same ++ * column identifiers) are used for all four tables. ++ * This is possible because all the table share the ++ * same structure and behaviour. ++ */ ++Netsnmp_Node_Handler lmSensorsTables_handler; ++#define COLUMN_LMSENSORS_INDEX 1 ++#define COLUMN_LMSENSORS_DEVICE 2 ++#define COLUMN_LMSENSORS_VALUE 3 + -+int -+netsnmp_sensor_arch_load(netsnmp_cache *cache, void *vp) { -+ netsnmp_sensor_info *sp; -+ const sensors_chip_name *chip; -+ const sensors_feature *data; -+ const sensors_subfeature *data2; -+ int chip_nr = 0; ++#endif /* LM_SENSORS_MIB_H */ +diff -up net-snmp-5.4.1/configure.backup_patch_15 net-snmp-5.4.1/configure +--- net-snmp-5.4.1/configure.backup_patch_15 2008-07-25 12:53:39.000000000 +0200 ++++ net-snmp-5.4.1/configure 2008-07-25 12:53:46.000000000 +0200 +@@ -31030,7 +31030,7 @@ fi + fi + + # LM-SENSORS-MIB support +-echo " $module_list " | grep " ucd-snmp/lmSensors " > /dev/null ++echo " $module_list " | $GREP -i "ucd-snmp/lmsensor" > /dev/null + if test $? -eq 0 ; then + echo "$as_me:$LINENO: checking for sensors support" >&5 + echo $ECHO_N "checking for sensors support... $ECHO_C" >&6 +diff -up net-snmp-5.4.1/configure.in.backup_patch_15 net-snmp-5.4.1/configure.in +--- net-snmp-5.4.1/configure.in.backup_patch_15 2008-07-25 12:53:39.000000000 +0200 ++++ net-snmp-5.4.1/configure.in 2008-07-25 12:53:46.000000000 +0200 +@@ -2880,7 +2880,7 @@ if test $? -eq 0 ; then + fi + + # LM-SENSORS-MIB support +-echo " $module_list " | grep " ucd-snmp/lmSensors " > /dev/null ++echo " $module_list " | $GREP -i "ucd-snmp/lmsensor" > /dev/null + if test $? -eq 0 ; then + AC_MSG_CHECKING([for sensors support]) + case $target_os in +diff -up /dev/null net-snmp-5.4.1/include/net-snmp/agent/hardware/sensors.h +--- /dev/null 2008-07-23 14:59:56.660004489 +0200 ++++ net-snmp-5.4.1/include/net-snmp/agent/hardware/sensors.h 2008-07-25 12:53:46.000000000 +0200 +@@ -0,0 +1,48 @@ ++/* ++ * Hardware Abstraction Layer - Sensors module ++ * ++ * Public interface ++ */ + -+ DEBUGMSGTL(("sensors:arch", "Reload v3 LM Sensors module\n")); -+ while ((chip = sensors_get_detected_chips( NULL, &chip_nr))) { -+ int a = 0; ++#define NETSNMP_SENSOR_TYPE_OTHER 1 ++#define NETSNMP_SENSOR_TYPE_VOLTAGE_AC 3 ++#define NETSNMP_SENSOR_TYPE_VOLTAGE_DC 4 ++#define NETSNMP_SENSOR_TYPE_CURRENT 5 ++#define NETSNMP_SENSOR_TYPE_POWER 6 ++#define NETSNMP_SENSOR_TYPE_FREQUENCY 7 ++#define NETSNMP_SENSOR_TYPE_TEMPERATURE 8 ++#define NETSNMP_SENSOR_TYPE_HUMIDITY 9 ++#define NETSNMP_SENSOR_TYPE_RPM 10 ++#define NETSNMP_SENSOR_TYPE_VOLUME 11 ++#define NETSNMP_SENSOR_TYPE_BOOLEAN 12 + -+ while ((data = sensors_get_features( chip, &a))) { -+ DEBUGMSGTL(("sensors:arch:detail", "get_features (%s, %d)\n", data->name, data->number)); -+ int b = 0; -+ + -+ while ((data2 = sensors_get_all_subfeatures( chip, data, &b))) { -+ char *label = NULL; -+ double val; -+ int type = NETSNMP_SENSOR_TYPE_OTHER; ++#define NETSNMP_SENSOR_FLAG_ACTIVE 0x01 ++#define NETSNMP_SENSOR_FLAG_NAVAIL 0x02 ++#define NETSNMP_SENSOR_FLAG_BROKEN 0x04 ++#define NETSNMP_SENSOR_FLAG_DISABLE 0x08 + -+ DEBUGMSGTL(("sensors:arch:detail", " get_subfeatures (%s, %d)\n", data2->name, data2->number)); -+ /* -+ * Check the type of this subfeature, -+ * concentrating on the main "input" measurements. -+ */ -+ switch ( data2->type ) { -+ case SENSORS_SUBFEATURE_IN_INPUT: -+ type = NETSNMP_SENSOR_TYPE_VOLTAGE_DC; -+ break; -+ case SENSORS_SUBFEATURE_FAN_INPUT: -+ type = NETSNMP_SENSOR_TYPE_RPM; -+ break; -+ case SENSORS_SUBFEATURE_TEMP_INPUT: -+ type = NETSNMP_SENSOR_TYPE_TEMPERATURE; -+ break; -+ case SENSORS_SUBFEATURE_VID: -+ type = NETSNMP_SENSOR_TYPE_VOLTAGE_DC; -+ break; -+ default: -+ /* Skip everything other than these basic sensor features - ??? */ -+ DEBUGMSGTL(("sensors:arch:detail", " Skip type %x\n", data2->type)); -+ continue; -+ } -+ -+ /* -+ * Get the name and value of this subfeature -+ */ -+/* -+ if (!(label = sensors_get_label(chip, data))) { -+ DEBUGMSGTL(("sensors:arch:detail", " Can't get name (%s)\n", label)); -+ continue; -+ } -+ if (sensors_get_value(chip, data2->number, &val) < 0) { -+ DEBUGMSGTL(("sensors:arch:detail", " Can't get value (%f)\n", val)); -+ continue; -+ } -+*/ -+ if (!(label = sensors_get_label(chip, data)) || -+ (sensors_get_value(chip, data2->number, &val) < 0)) { -+ DEBUGMSGTL(("sensors:arch:detail", " Can't get name/value (%s, %f)\n", label, val)); -+ continue; -+ } -+ DEBUGMSGTL(("sensors:arch:detail", "%s = %f\n", label, val)); ++#define NETSNMP_SENSOR_MASK_STATUS 0x06 /* NAVAIL|BROKEN */ + -+ /* -+ * Use this type to create a new sensor entry -+ * (inserting it in the appropriate sub-containers) -+ */ -+ sp = sensor_by_name( label, type ); -+ if ( sp ) { -+ sp->value = val; -+ sp->flags|= NETSNMP_SENSOR_FLAG_ACTIVE; -+ } -+ if (label) { -+ free(label); -+ label = NULL; -+ } -+ } /* end while data2 */ -+ } /* end while data */ -+ } /* end while chip */ + -+ return 0; -+} ++#define NETSNMP_SENSOR_FIND_CREATE 1 /* or use one of the sensor type values */ ++#define NETSNMP_SENSOR_FIND_EXIST 0 ++ ++typedef struct netsnmp_sensor_info_s netsnmp_sensor_info; ++struct netsnmp_sensor_info_s { ++ ++ netsnmp_index idx; ++ /* int idx; */ ++ char name[256]; ++ ++ int type; ++ float value; ++ char descr[256]; ++ long flags; ++}; ++ ++netsnmp_container *get_sensor_container( void ); ++netsnmp_cache *get_sensor_cache( void ); ++netsnmp_sensor_info *sensor_by_name( char *, int ); ++NetsnmpCacheLoad netsnmp_sensor_load; ++NetsnmpCacheFree netsnmp_sensor_free; net-snmp-5.4.1-shared-ip.patch: Index: net-snmp-5.4.1-shared-ip.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-shared-ip.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-shared-ip.patch 7 Aug 2007 12:33:35 -0000 1.1 +++ net-snmp-5.4.1-shared-ip.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,13 +1,56 @@ ---- net-snmp-5.3.1/include/net-snmp/library/container.h.orig 2005-12-04 19:43:04.000000000 +0100 -+++ net-snmp-5.3.1/include/net-snmp/library/container.h 2007-05-04 10:01:38.000000000 +0200 -@@ -370,8 +370,32 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c +--- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13 2007-05-17 23:53:28.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c 2008-07-25 12:53:42.000000000 +0200 +@@ -272,11 +272,15 @@ _netsnmp_ioctl_ipaddress_container_load_ + /* + * add entry to container + */ +- if (CONTAINER_INSERT(container, entry) < 0) +- { +- DEBUGMSGTL(("access:ipaddress:container","error with ipaddress_entry: insert into container failed.\n")); ++ rc = CONTAINER_TRY_INSERT(container, entry); ++ if (rc < 0) { ++ static int logged = 0; ++ if (!logged) { ++ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n"); ++ logged = 1; ++ } ++ rc = 0; + netsnmp_access_ipaddress_entry_free(entry); +- continue; + } + } + +diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +--- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13 2006-09-15 02:48:50.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c 2008-07-25 12:53:42.000000000 +0200 +@@ -324,7 +324,16 @@ _load_v6(netsnmp_container *container, i + /* + * add entry to container + */ +- CONTAINER_INSERT(container, entry); ++ rc = CONTAINER_TRY_INSERT(container, entry); ++ if (rc < 0) { ++ static int logged = 0; ++ if (!logged) { ++ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n"); ++ logged = 1; ++ } ++ netsnmp_access_ipaddress_entry_free(entry); ++ } ++ + } + + fclose(in); +diff -up net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13 net-snmp-5.4.1/include/net-snmp/library/container.h +--- net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13 2005-12-04 19:43:04.000000000 +0100 ++++ net-snmp-5.4.1/include/net-snmp/library/container.h 2008-07-25 12:53:42.000000000 +0200 +@@ -370,8 +370,32 @@ extern "C" { } } return rc; -- } + } + -- + NETSNMP_STATIC_INLINE + int CONTAINER_TRY_INSERT(netsnmp_container *x, const void *k) + { @@ -30,14 +73,16 @@ + } + } + return CONTAINER_INSERT(start, k); -+ } + } +- + /*------------------------------------------------------------------ * These functions should EXACTLY match the function version in * container.c. If you change one, change them both. ---- net-snmp-5.3.1/snmplib/container.c.orig 2006-04-21 02:24:47.000000000 +0200 -+++ net-snmp-5.3.1/snmplib/container.c 2007-05-04 10:34:23.000000000 +0200 -@@ -286,6 +286,29 @@ +diff -up net-snmp-5.4.1/snmplib/container.c.backup_patch_13 net-snmp-5.4.1/snmplib/container.c +--- net-snmp-5.4.1/snmplib/container.c.backup_patch_13 2006-08-25 11:41:06.000000000 +0200 ++++ net-snmp-5.4.1/snmplib/container.c 2008-07-25 12:53:42.000000000 +0200 +@@ -286,6 +286,29 @@ int CONTAINER_INSERT(netsnmp_container * return rc; } @@ -67,45 +112,3 @@ /*------------------------------------------------------------------ * These functions should EXACTLY match the inline version in * container.h. If you change one, change them both. ---- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.orig 2007-05-17 23:53:28.000000000 +0200 -+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c 2007-08-07 13:49:49.000000000 +0200 -@@ -272,11 +272,15 @@ _netsnmp_ioctl_ipaddress_container_load_ - /* - * add entry to container - */ -- if (CONTAINER_INSERT(container, entry) < 0) -- { -- DEBUGMSGTL(("access:ipaddress:container","error with ipaddress_entry: insert into container failed.\n")); -+ rc = CONTAINER_TRY_INSERT(container, entry); -+ if (rc < 0) { -+ static int logged = 0; -+ if (!logged) { -+ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n"); -+ logged = 1; -+ } -+ rc = 0; - netsnmp_access_ipaddress_entry_free(entry); -- continue; - } - } - ---- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.orig 2006-09-15 02:48:50.000000000 +0200 -+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c 2007-08-07 13:47:55.000000000 +0200 -@@ -324,7 +324,16 @@ _load_v6(netsnmp_container *container, i - /* - * add entry to container - */ -- CONTAINER_INSERT(container, entry); -+ rc = CONTAINER_TRY_INSERT(container, entry); -+ if (rc < 0) { -+ static int logged = 0; -+ if (!logged) { -+ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n"); -+ logged = 1; -+ } -+ netsnmp_access_ipaddress_entry_free(entry); -+ } -+ - } - - fclose(in); net-snmp-5.4.1-strange_libpath.patch: Index: net-snmp-5.4.1-strange_libpath.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-strange_libpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-strange_libpath.patch 7 Aug 2007 12:33:35 -0000 1.1 +++ net-snmp-5.4.1-strange_libpath.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,63 +1,6 @@ ---- net-snmp-5.4.1/configure.mnttab.orig 2007-07-27 19:04:19.000000000 +0200 -+++ net-snmp-5.4.1/configure.mnttab 2007-08-07 13:32:45.000000000 +0200 -@@ -27930,7 +27930,7 @@ if test "${with_libwrap+set}" = set; the - if test "$with_libwrap" != "no"; then - if test "$with_libwrap" != "yes"; then - CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include" -- LDFLAGS="${LDFLAGS} -L$with_libwrap/lib" -+ LDFLAGS="${LDFLAGS} -L$with_libwrap" - fi - - _libs=${LIBS} -@@ -28134,7 +28134,7 @@ echo "${ECHO_T}yes" >&6 - #define NETSNMP_USE_LIBWRAP 1 - _ACEOF - -- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib" -+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap" - _wraplibs="$_wraplibs -lwrap" - else - echo "$as_me: failed program was:" >&5 -@@ -28362,7 +28362,7 @@ echo "${ECHO_T}yes" >&6 - #define NETSNMP_USE_LIBWRAP 1 - _ACEOF - -- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib" -+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap" - _wraplibs="$_wraplibs -lwrap -lnsl" - else - echo "$as_me: failed program was:" >&5 ---- net-snmp-5.4.1/configure.libdir.orig 2007-08-07 13:31:31.000000000 +0200 -+++ net-snmp-5.4.1/configure.libdir 2007-08-07 13:32:05.000000000 +0200 -@@ -27922,7 +27922,7 @@ if test "${with_libwrap+set}" = set; the - if test "$with_libwrap" != "no"; then - if test "$with_libwrap" != "yes"; then - CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include" -- LDFLAGS="${LDFLAGS} -L$with_libwrap/lib" -+ LDFLAGS="${LDFLAGS} -L$with_libwrap" - fi - - _libs=${LIBS} -@@ -28126,7 +28126,7 @@ echo "${ECHO_T}yes" >&6 - #define NETSNMP_USE_LIBWRAP 1 - _ACEOF - -- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib" -+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap" - _wraplibs="$_wraplibs -lwrap" - else - echo "$as_me: failed program was:" >&5 -@@ -28354,7 +28354,7 @@ echo "${ECHO_T}yes" >&6 - #define NETSNMP_USE_LIBWRAP 1 - _ACEOF - -- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib" -+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap" - _wraplibs="$_wraplibs -lwrap -lnsl" - else - echo "$as_me: failed program was:" >&5 ---- net-snmp-5.4.1/configure.orig 2007-08-07 13:31:31.000000000 +0200 -+++ net-snmp-5.4.1/configure 2007-08-07 13:33:29.000000000 +0200 +diff -up net-snmp-5.4.1/configure.backup_patch_11 net-snmp-5.4.1/configure +--- net-snmp-5.4.1/configure.backup_patch_11 2008-07-25 12:53:35.000000000 +0200 ++++ net-snmp-5.4.1/configure 2008-07-25 12:53:39.000000000 +0200 @@ -27922,7 +27922,7 @@ if test "${with_libwrap+set}" = set; the if test "$with_libwrap" != "no"; then if test "$with_libwrap" != "yes"; then @@ -85,8 +28,9 @@ _wraplibs="$_wraplibs -lwrap -lnsl" else echo "$as_me: failed program was:" >&5 ---- net-snmp-5.4.1/configure.in.orig 2007-07-27 19:02:00.000000000 +0200 -+++ net-snmp-5.4.1/configure.in 2007-08-07 13:33:55.000000000 +0200 +diff -up net-snmp-5.4.1/configure.in.backup_patch_11 net-snmp-5.4.1/configure.in +--- net-snmp-5.4.1/configure.in.backup_patch_11 2007-07-27 19:02:00.000000000 +0200 ++++ net-snmp-5.4.1/configure.in 2008-07-25 12:53:39.000000000 +0200 @@ -2714,7 +2714,7 @@ AC_ARG_WITH(libwrap, if test "$with_libwrap" != "no"; then if test "$with_libwrap" != "yes"; then @@ -114,32 +58,3 @@ _wraplibs="$_wraplibs -lwrap -lnsl", AC_MSG_RESULT(no) ---- net-snmp-5.4.1/configure.libpath.orig 2007-08-07 13:31:31.000000000 +0200 -+++ net-snmp-5.4.1/configure.libpath 2007-08-07 13:34:52.000000000 +0200 -@@ -27922,7 +27922,7 @@ if test "${with_libwrap+set}" = set; the - if test "$with_libwrap" != "no"; then - if test "$with_libwrap" != "yes"; then - CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include" -- LDFLAGS="${LDFLAGS} -L$with_libwrap/lib" -+ LDFLAGS="${LDFLAGS} -L$with_libwrap" - fi - - _libs=${LIBS} -@@ -28126,7 +28126,7 @@ echo "${ECHO_T}yes" >&6 - #define NETSNMP_USE_LIBWRAP 1 - _ACEOF - -- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib" -+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap" - _wraplibs="$_wraplibs -lwrap" - else - echo "$as_me: failed program was:" >&5 -@@ -28354,7 +28354,7 @@ echo "${ECHO_T}yes" >&6 - #define NETSNMP_USE_LIBWRAP 1 - _ACEOF - -- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib" -+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap" - _wraplibs="$_wraplibs -lwrap -lnsl" - else - echo "$as_me: failed program was:" >&5 net-snmp-5.4.1-xen-crash.patch: Index: net-snmp-5.4.1-xen-crash.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp-5.4.1-xen-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-snmp-5.4.1-xen-crash.patch 19 Nov 2007 07:50:57 -0000 1.1 +++ net-snmp-5.4.1-xen-crash.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -4,26 +4,40 @@ Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c =================================================================== ---- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c (revision 16711) -+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c (working copy) -@@ -258,9 +258,10 @@ - if ((NULL != rowreq_ctx) && - (MFD_SUCCESS == - ipAddressTable_indexes_set(rowreq_ctx, -+ ipaddress_entry->ia_address_len + 1, -+ ipaddress_entry->ia_address, - ipaddress_entry->ia_address_len, -- ipaddress_entry->ia_address, -- ipaddress_entry->ia_address_len))) { -+ ipaddress_entry->if_index))) { - if (CONTAINER_INSERT(container, rowreq_ctx) < 0) { - DEBUGMSGTL (("ipAddressTable:access","container insert failed for new entry\n")); - ipAddressTable_release_rowreq_ctx(rowreq_ctx); -Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c -=================================================================== ---- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c (revision 16711) -+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c (working copy) -@@ -348,10 +348,18 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c +--- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c.backup_patch_16 2007-07-17 01:59:44.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c 2008-07-25 12:53:57.000000000 +0200 +@@ -411,6 +411,7 @@ static int _access_ipaddress_entry_compa + { + const netsnmp_ipaddress_entry *lh = (const netsnmp_ipaddress_entry *)lhs; + const netsnmp_ipaddress_entry *rh = (const netsnmp_ipaddress_entry *)rhs; ++ int rc; + + netsnmp_assert(NULL != lhs); + netsnmp_assert(NULL != rhs); +@@ -426,5 +427,17 @@ static int _access_ipaddress_entry_compa + /* + * length equal, compare address + */ +- return memcmp(lh->ia_address, rh->ia_address, lh->ia_address_len); ++ rc = memcmp(lh->ia_address, rh->ia_address, lh->ia_address_len); ++ if (rc) ++ return rc; ++ ++ /* ++ * address same, compare ifIndex ++ */ ++ if (lh->if_index < rh->if_index) ++ return -1; ++ else if (lh->if_index > rh->if_index) ++ return 1; ++ ++ return 0; + } +diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c +--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c.backup_patch_16 2006-12-06 16:10:40.000000000 +0100 ++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c 2008-07-25 12:53:57.000000000 +0200 +@@ -348,10 +348,18 @@ ipAddressAddrType_map(u_long * mib_ipAdd *mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV4; break; @@ -42,7 +56,7 @@ default: snmp_log(LOG_ERR, "couldn't map value %ld for ipAddressAddrType\n", raw_ipAddressAddrType_val); -@@ -382,8 +390,11 @@ +@@ -382,8 +390,11 @@ int ipAddressTable_indexes_set_tbl_idx(ipAddressTable_mib_index * tbl_idx, u_long ipAddressAddrType_val, char *ipAddressAddr_val_ptr, @@ -55,7 +69,7 @@ DEBUGMSGTL(("verbose:ipAddressTable:ipAddressTable_indexes_set_tbl_idx", "called\n")); /* -@@ -409,6 +420,11 @@ +@@ -409,6 +420,11 @@ ipAddressTable_indexes_set_tbl_idx(ipAdd memcpy(tbl_idx->ipAddressAddr, ipAddressAddr_val_ptr, ipAddressAddr_val_ptr_len * sizeof(ipAddressAddr_val_ptr[0])); @@ -67,7 +81,7 @@ return MFD_SUCCESS; } /* ipAddressTable_indexes_set_tbl_idx */ -@@ -430,7 +446,8 @@ +@@ -430,7 +446,8 @@ int ipAddressTable_indexes_set(ipAddressTable_rowreq_ctx * rowreq_ctx, u_long ipAddressAddrType_val, char *ipAddressAddr_val_ptr, @@ -77,7 +91,7 @@ { DEBUGMSGTL(("verbose:ipAddressTable:ipAddressTable_indexes_set", "called\n")); -@@ -439,7 +456,8 @@ +@@ -439,7 +456,8 @@ ipAddressTable_indexes_set(ipAddressTabl ipAddressTable_indexes_set_tbl_idx(&rowreq_ctx->tbl_idx, ipAddressAddrType_val, ipAddressAddr_val_ptr, @@ -87,11 +101,10 @@ return MFD_ERROR; /* -Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h -=================================================================== ---- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h (revision 16711) -+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h (working copy) -@@ -106,7 +106,9 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h +--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h.backup_patch_16 2005-12-01 18:00:57.000000000 +0100 ++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h 2008-07-25 12:53:57.000000000 +0200 +@@ -106,7 +106,9 @@ extern "C" { * simplistic map of address length to type */ #define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV4 4 @@ -101,11 +114,26 @@ /************************************************************* -Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h -=================================================================== ---- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h (revision 16711) -+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h (working copy) -@@ -273,14 +273,16 @@ +diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c +--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c.backup_patch_16 2007-05-17 23:53:28.000000000 +0200 ++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c 2008-07-25 12:53:57.000000000 +0200 +@@ -258,9 +258,10 @@ _add_new_entry(netsnmp_ipaddress_entry * + if ((NULL != rowreq_ctx) && + (MFD_SUCCESS == + ipAddressTable_indexes_set(rowreq_ctx, +- ipaddress_entry->ia_address_len, ++ ipaddress_entry->ia_address_len + 1, + ipaddress_entry->ia_address, +- ipaddress_entry->ia_address_len))) { ++ ipaddress_entry->ia_address_len, ++ ipaddress_entry->if_index))) { + if (CONTAINER_INSERT(container, rowreq_ctx) < 0) { + DEBUGMSGTL (("ipAddressTable:access","container insert failed for new entry\n")); + ipAddressTable_release_rowreq_ctx(rowreq_ctx); +diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h +--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h.backup_patch_16 2006-01-25 17:28:12.000000000 +0100 ++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h 2008-07-25 12:53:57.000000000 +0200 +@@ -273,14 +273,16 @@ config_require(ip-mib/ipAddressTable/ipA u_long ipAddressAddrType_val, char *ipAddressAddr_val_ptr, size_t @@ -124,34 +152,3 @@ -Index: agent/mibgroup/ip-mib/data_access/ipaddress_common.c -=================================================================== ---- agent/mibgroup/ip-mib/data_access/ipaddress_common.c (revision 16711) -+++ agent/mibgroup/ip-mib/data_access/ipaddress_common.c (working copy) -@@ -411,6 +415,7 @@ - { - const netsnmp_ipaddress_entry *lh = (const netsnmp_ipaddress_entry *)lhs; - const netsnmp_ipaddress_entry *rh = (const netsnmp_ipaddress_entry *)rhs; -+ int rc; - - netsnmp_assert(NULL != lhs); - netsnmp_assert(NULL != rhs); -@@ -426,5 +431,17 @@ - /* - * length equal, compare address - */ -- return memcmp(lh->ia_address, rh->ia_address, lh->ia_address_len); -+ rc = memcmp(lh->ia_address, rh->ia_address, lh->ia_address_len); -+ if (rc) -+ return rc; -+ -+ /* -+ * address same, compare ifIndex -+ */ -+ if (lh->if_index < rh->if_index) -+ return -1; -+ else if (lh->if_index > rh->if_index) -+ return 1; -+ -+ return 0; - } Index: net-snmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- net-snmp.spec 22 Jul 2008 07:46:49 -0000 1.154 +++ net-snmp.spec 25 Jul 2008 11:03:32 -0000 1.155 @@ -1,8 +1,5 @@ %{!?tcp_wrappers:%define tcp_wrappers 1} -# TODO: rediff all patches and remove following line: -%define _default_patch_fuzz 2 - # Arches on which we need to prevent arch conflicts on net-snmp-config.h %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64 %define major_ver 5.4.1 @@ -35,16 +32,15 @@ Patch7: net-snmp-5.2.1-file_offset.patch Patch8: net-snmp-5.3.1-multilib.patch Patch9: net-snmp-5.4.1-config_libdir.patch -#Patch10: net-snmp-5.4.1-ethtool-config.patch -Patch11: net-snmp-5.4.1-strange_libpath.patch -Patch12: net-snmp-5.4.1-hostname.patch -Patch13: net-snmp-5.4.1-shared-ip.patch -Patch14: net-snmp-5.4-exec-crash.patch -Patch15: net-snmp-5.4.1-sensors3.patch -Patch16: net-snmp-5.4.1-xen-crash.patch -Patch17: net-snmp-5.4.1-hmac-check.patch -Patch18: net-snmp-5.4.1-perl-snprintf.patch -Patch19: net-snmp-5.4.1-perl-set.patch +Patch10: net-snmp-5.4.1-strange_libpath.patch +Patch11: net-snmp-5.4.1-hostname.patch +Patch12: net-snmp-5.4.1-shared-ip.patch +Patch13: net-snmp-5.4-exec-crash.patch +Patch14: net-snmp-5.4.1-sensors3.patch +Patch15: net-snmp-5.4.1-xen-crash.patch +Patch16: net-snmp-5.4.1-hmac-check.patch +Patch17: net-snmp-5.4.1-perl-snprintf.patch +Patch18: net-snmp-5.4.1-perl-set.patch Requires(pre): chkconfig Requires(post): chkconfig @@ -168,16 +164,15 @@ %patch7 -p1 -b .file_offset %patch8 -p1 -b .multilib %patch9 -p1 -b .libdir -#%patch10 -p1 -b .ethtool -%patch11 -p1 -b .libpath -%patch12 -p1 -b .hostname -%patch13 -p1 -b .shared-ip -%patch14 -p1 -b .exec -%patch15 -p0 -b .sensors -%patch16 -p0 -b .xen-crash -%patch17 -p1 -b .hmac-check -%patch18 -p3 -b .perl-snprintf -%patch19 -p1 -b .perl-set +%patch10 -p1 -b .libpath +%patch11 -p1 -b .hostname +%patch12 -p1 -b .shared-ip +%patch13 -p1 -b .exec +%patch14 -p1 -b .sensors +%patch15 -p1 -b .xen-crash +%patch16 -p1 -b .hmac-check +%patch17 -p1 -b .perl-snprintf +%patch18 -p1 -b .perl-set # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh ucd-snmp-4.2.4.pre3-mnttab.patch: Index: ucd-snmp-4.2.4.pre3-mnttab.patch =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/ucd-snmp-4.2.4.pre3-mnttab.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ucd-snmp-4.2.4.pre3-mnttab.patch 9 Sep 2004 09:07:53 -0000 1.1 +++ ucd-snmp-4.2.4.pre3-mnttab.patch 25 Jul 2008 11:03:32 -0000 1.2 @@ -1,8 +1,9 @@ ---- ucd-snmp-4.2.4.pre3/configure.mnttab Tue Apr 9 13:56:13 2002 -+++ ucd-snmp-4.2.4.pre3/configure Tue Apr 9 13:58:14 2002 -@@ -7148,15 +7148,7 @@ - if eval "test \"`echo '$''{'ac_cv_ETC_MNTTAB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +diff -up net-snmp-5.4.1/configure.backup_patch_1 net-snmp-5.4.1/configure +--- net-snmp-5.4.1/configure.backup_patch_1 2007-07-27 19:04:19.000000000 +0200 ++++ net-snmp-5.4.1/configure 2008-07-25 12:52:01.000000000 +0200 +@@ -26579,15 +26579,7 @@ echo $ECHO_N "checking for mount table l + if test "${ac_cv_ETC_MNTTAB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_ETC_MNTTAB="unknown" -for i in /etc/mnttab /etc/mtab /etc/filesystems @@ -15,5 +16,5 @@ - + ac_cv_ETC_MNTTAB="/etc/mtab" fi - - echo "$ac_t""$ac_cv_ETC_MNTTAB" 1>&6 + echo "$as_me:$LINENO: result: $ac_cv_ETC_MNTTAB" >&5 + echo "${ECHO_T}$ac_cv_ETC_MNTTAB" >&6 From fedora-extras-commits at redhat.com Fri Jul 25 11:05:46 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 25 Jul 2008 11:05:46 GMT Subject: rpms/kdebindings/devel kdebindings.spec, 1.132, 1.133 sources, 1.51, 1.52 Message-ID: <200807251105.m6PB5krS023308@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23275 Modified Files: kdebindings.spec sources Log Message: respun Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- kdebindings.spec 24 Jul 2008 16:07:04 -0000 1.132 +++ kdebindings.spec 25 Jul 2008 11:05:15 -0000 1.133 @@ -22,7 +22,7 @@ Name: kdebindings Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -30,7 +30,6 @@ URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: kdebindings-4.1.0-kate.patch BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} @@ -88,8 +87,6 @@ %prep %setup -q -%patch0 -p1 -b .kate - %build mkdir -p %{_target_platform} pushd %{_target_platform} @@ -167,6 +164,9 @@ %changelog +* Fri Jul 25 2008 Than Ngo 4.1.0-2 +- respun + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 23 Jul 2008 13:57:04 -0000 1.51 +++ sources 25 Jul 2008 11:05:15 -0000 1.52 @@ -1 +1 @@ -0552896de98a70c94baf76be68a1bc5a kdebindings-4.1.0.tar.bz2 +d03166d9fc3e46df1c9a99fcedd8bfd1 kdebindings-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 11:06:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Fri, 25 Jul 2008 11:06:30 GMT Subject: rpms/net-snmp/devel net-snmp-5.4-ethtool-config.patch,1.1,NONE Message-ID: <200807251106.m6PB6UgM023377@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/net-snmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23371 Removed Files: net-snmp-5.4-ethtool-config.patch Log Message: remove unused patches --- net-snmp-5.4-ethtool-config.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 11:08:53 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 25 Jul 2008 11:08:53 GMT Subject: rpms/kdegraphics/devel kdegraphics.spec, 1.158, 1.159 sources, 1.52, 1.53 Message-ID: <200807251108.m6PB8rt6023491@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdegraphics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23441 Modified Files: kdegraphics.spec sources Log Message: respun Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- kdegraphics.spec 23 Jul 2008 14:17:42 -0000 1.158 +++ kdegraphics.spec 25 Jul 2008 11:08:23 -0000 1.159 @@ -5,7 +5,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdegraphics Obsoletes: kdegraphics4 < %{version}-%{release} @@ -183,6 +183,9 @@ %changelog +* Fri Jul 25 2008 Than Ngo 4.1.0-2 +- respun + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 23 Jul 2008 14:17:42 -0000 1.52 +++ sources 25 Jul 2008 11:08:23 -0000 1.53 @@ -1 +1 @@ -ebaf7fc86d35587ce188e8e440bc8bcf kdegraphics-4.1.0.tar.bz2 +d45c25889331497776d5aa3093951821 kdegraphics-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 11:12:59 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 25 Jul 2008 11:12:59 GMT Subject: rpms/kdenetwork/devel kdenetwork.spec, 1.152, 1.153 sources, 1.62, 1.63 Message-ID: <200807251112.m6PBCxsT023716@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdenetwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23676 Modified Files: kdenetwork.spec sources Log Message: respun Index: kdenetwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- kdenetwork.spec 23 Jul 2008 14:52:09 -0000 1.152 +++ kdenetwork.spec 25 Jul 2008 11:12:28 -0000 1.153 @@ -1,4 +1,3 @@ - # FIXME/TODO: needed BuildRequires # Decibel @@ -6,7 +5,7 @@ Name: kdenetwork Epoch: 7 Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet @@ -165,6 +164,9 @@ %changelog +* Fri Jul 25 2008 Than Ngo 4.1.0-2 +- respun + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 23 Jul 2008 14:52:09 -0000 1.62 +++ sources 25 Jul 2008 11:12:28 -0000 1.63 @@ -1 +1 @@ -a28c85e1c51ed293e72813b80bb21a3c kdenetwork-4.1.0.tar.bz2 +bd0193f2ea4f2d055c7bae0233d5e10e kdenetwork-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 11:15:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Fri, 25 Jul 2008 11:15:50 GMT Subject: rpms/openldap/devel openldap-2.4.6-pie.patch, 1.1, 1.2 openldap.spec, 1.129, 1.130 Message-ID: <200807251115.m6PBFoZK023890@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/openldap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23852 Modified Files: openldap-2.4.6-pie.patch openldap.spec Log Message: rediff all patches to get rid of fuzz=2 openldap-2.4.6-pie.patch: Index: openldap-2.4.6-pie.patch =================================================================== RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-pie.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openldap-2.4.6-pie.patch 21 Nov 2007 12:12:15 -0000 1.1 +++ openldap-2.4.6-pie.patch 25 Jul 2008 11:15:20 -0000 1.2 @@ -2,14 +2,15 @@ should be threaded into the various autotools, but I guess this is what we have until that happens, if it happens. ---- openldap-2.2.13/servers/slapd/Makefile.in 2004-04-12 14:07:40.000000000 -0400 -+++ openldap-2.2.13/servers/slapd/Makefile.in 2004-06-15 13:45:45.000000000 -0400 -@@ -255,7 +255,7 @@ +diff -up openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3 openldap-2.4.11/servers/slapd/Makefile.in +--- openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3 2008-02-12 00:26:43.000000000 +0100 ++++ openldap-2.4.11/servers/slapd/Makefile.in 2008-07-25 13:13:37.000000000 +0200 +@@ -266,7 +266,7 @@ libslapi.a: slapi/.libs/libslapi.a cp slapi/.libs/libslapi.a . slapd: $(SLAPD_DEPENDS) @LIBSLAPI@ - $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \ + $(LTLINK) -pie -Wl,-z,defs -o $@ $(SLAPD_OBJECTS) $(LIBS) \ $(WRAP_LIBS) - rm -f $(SLAPTOOLS) + $(RM) $(SLAPTOOLS) for i in $(SLAPTOOLS); do \ Index: openldap.spec =================================================================== RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- openldap.spec 21 Jul 2008 08:17:30 -0000 1.129 +++ openldap.spec 25 Jul 2008 11:15:20 -0000 1.130 @@ -8,9 +8,6 @@ %define evolution_connector_includedir %{evolution_connector_prefix}/include %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib} -#TODO: rediff the patches which need fuzz -%define _default_patch_fuzz 2 - Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version} From fedora-extras-commits at redhat.com Fri Jul 25 11:36:43 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 11:36:43 GMT Subject: rpms/kdepimlibs/F-9 kdepimlibs.spec,1.35,1.36 Message-ID: <200807251136.m6PBahX0024577@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24539/F-9 Modified Files: kdepimlibs.spec Log Message: Sync from devel: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- kdepimlibs.spec 23 Jul 2008 19:23:45 -0000 1.35 +++ kdepimlibs.spec 25 Jul 2008 11:36:12 -0000 1.36 @@ -1,4 +1,3 @@ - #ifarch noarch %if 0%{?fedora} > 8 # set this to 0 to disable -apidocs for a faster build @@ -14,8 +13,8 @@ Name: kdepimlibs -Version: 4.0.99 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -27,11 +26,13 @@ Requires: kdelibs4 >= %{version} -BuildRequires: akonadi-devel >= 1.0 +BuildRequires: akonadi-devel BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cyrus-sasl-devel BuildRequires: gpgme-devel +# work around circular dependency from kdelibs4-devel pulling in phonon-backend-xine +BuildRequires: phonon-backend-gstreamer BuildRequires: kdelibs4-devel >= %{version} BuildRequires: libXpm-devel libXtst-devel BuildRequires: openldap-devel @@ -135,7 +136,7 @@ %if 0%{?rest} %files %defattr(-,root,root,-) -%{_kde4_datadir}/apps/akonadi-kde/ +%{_kde4_appsdir}/akonadi-kde/ %{_kde4_appsdir}/kabc/ %{_kde4_appsdir}/libical/ %{_kde4_appsdir}/kconf_update/* @@ -163,8 +164,8 @@ %changelog -* Wed Jul 23 2008 Rex Dieter 4.0.99-2 -- respin against akonadi-1.0 +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Fri Jul 25 11:37:49 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 11:37:49 GMT Subject: rpms/kdepimlibs/F-8 .cvsignore, 1.13, 1.14 kdepimlibs.spec, 1.20, 1.21 sources, 1.13, 1.14 Message-ID: <200807251137.m6PBbnaS024719@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24647/F-8 Modified Files: .cvsignore kdepimlibs.spec sources Log Message: Sync kdepimlibs 4.1.0 from devel. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 4 Jun 2008 17:34:56 -0000 1.13 +++ .cvsignore 25 Jul 2008 11:37:19 -0000 1.14 @@ -1,2 +1,2 @@ -kdepimlibs-4.0.4.tar.bz2 -kdepimlibs-4.0.5.tar.bz2 +kdepimlibs-4.0.99.tar.bz2 +kdepimlibs-4.1.0.tar.bz2 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/kdepimlibs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- kdepimlibs.spec 4 Jun 2008 17:34:56 -0000 1.20 +++ kdepimlibs.spec 25 Jul 2008 11:37:19 -0000 1.21 @@ -1,4 +1,3 @@ - #ifarch noarch %if 0%{?fedora} > 8 # set this to 0 to disable -apidocs for a faster build @@ -14,7 +13,7 @@ Name: kdepimlibs -Version: 4.0.5 +Version: 4.1.0 Release: 1%{?dist} Summary: K Desktop Environment 4 - PIM Libraries @@ -27,10 +26,13 @@ Requires: kdelibs4 >= %{version} +BuildRequires: akonadi-devel BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cyrus-sasl-devel BuildRequires: gpgme-devel +# work around circular dependency from kdelibs4-devel pulling in phonon-backend-xine +BuildRequires: phonon-backend-gstreamer BuildRequires: kdelibs4-devel >= %{version} BuildRequires: libXpm-devel libXtst-devel BuildRequires: openldap-devel @@ -134,6 +136,7 @@ %if 0%{?rest} %files %defattr(-,root,root,-) +%{_kde4_appsdir}/akonadi-kde/ %{_kde4_appsdir}/kabc/ %{_kde4_appsdir}/libical/ %{_kde4_appsdir}/kconf_update/* @@ -161,11 +164,39 @@ %changelog -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Tue Jun 24 2008 Than Ngo 4.0.83-2 +- respun + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sat Jun 14 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Mon May 05 2008 Kevin Kofler - 4.0.72-2 +- add BR akonadi-devel +- update file list -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Fri May 02 2008 Kevin Kofler - 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) * Thu Apr 03 2008 Kevin Kofler 4.0.3-3 - rebuild (again) for the fixed %%{_kde4_buildtype} Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 4 Jun 2008 17:34:56 -0000 1.13 +++ sources 25 Jul 2008 11:37:19 -0000 1.14 @@ -1 +1 @@ -30b43558e9f8eebb249696b0308ad341 kdepimlibs-4.0.5.tar.bz2 +b1eddf3b85a70a31f6a4385948b2a6cd kdepimlibs-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 11:40:23 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 11:40:23 GMT Subject: rpms/kdepimlibs/F-9 .cvsignore,1.19,1.20 sources,1.18,1.19 Message-ID: <200807251140.m6PBeNJi024873@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24814/F-9 Modified Files: .cvsignore sources Log Message: Sync from devel: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 19 Jul 2008 14:56:16 -0000 1.19 +++ .cvsignore 25 Jul 2008 11:39:53 -0000 1.20 @@ -1 +1,2 @@ kdepimlibs-4.0.99.tar.bz2 +kdepimlibs-4.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Jul 2008 14:56:16 -0000 1.18 +++ sources 25 Jul 2008 11:39:53 -0000 1.19 @@ -1 +1 @@ -5fb63a94b4b07e906cb3c19483b99fdd kdepimlibs-4.0.99.tar.bz2 +b1eddf3b85a70a31f6a4385948b2a6cd kdepimlibs-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 11:42:45 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 25 Jul 2008 11:42:45 GMT Subject: rpms/selinux-policy/devel policy-20080710.patch, 1.6, 1.7 selinux-policy.spec, 1.689, 1.690 Message-ID: <200807251142.m6PBgj6u025123@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25072 Modified Files: policy-20080710.patch selinux-policy.spec Log Message: * Fri Jul 25 2008 Dan Walsh 3.5.1-3 - Fixes for logrotate, alsa policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- policy-20080710.patch 25 Jul 2008 04:24:01 -0000 1.6 +++ policy-20080710.patch 25 Jul 2008 11:42:14 -0000 1.7 @@ -337,6 +337,18 @@ +gen_tunable(allow_console_login,false) + + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.1/policy/modules/admin/alsa.te +--- nsaserefpolicy/policy/modules/admin/alsa.te 2008-07-10 11:38:46.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/admin/alsa.te 2008-07-25 06:59:42.000000000 -0400 +@@ -51,6 +51,8 @@ + + auth_use_nsswitch(alsa_t) + ++init_use_fds(alsa_t) ++ + libs_use_ld_so(alsa_t) + libs_use_shared_libs(alsa_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-3.5.1/policy/modules/admin/amanda.fc --- nsaserefpolicy/policy/modules/admin/amanda.fc 2008-06-12 23:25:08.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/admin/amanda.fc 2008-07-24 06:54:04.000000000 -0400 @@ -650,7 +662,7 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.5.1/policy/modules/admin/logrotate.te --- nsaserefpolicy/policy/modules/admin/logrotate.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/admin/logrotate.te 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/admin/logrotate.te 2008-07-25 06:42:53.000000000 -0400 @@ -71,6 +71,7 @@ fs_search_auto_mountpoints(logrotate_t) @@ -671,6 +683,25 @@ # cjp: why is this needed? init_domtrans_script(logrotate_t) +@@ -140,9 +143,8 @@ + ') + + optional_policy(` +- apache_read_config(logrotate_t) +- apache_domtrans(logrotate_t) + apache_signull(logrotate_t) ++ apache_manage_all_content(logrotate_t) + ') + + optional_policy(` +@@ -184,6 +186,5 @@ + ') + + optional_policy(` +- # cjp: why? +- squid_domtrans(logrotate_t) ++ squid_signal(logrotate_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.5.1/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2008-07-10 11:38:46.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/admin/logwatch.te 2008-07-24 08:00:57.000000000 -0400 @@ -9734,7 +9765,7 @@ +/etc/rc\.d/init\.d/httpd -- gen_context(system_u:object_r:httpd_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.5.1/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2008-06-12 23:25:06.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/apache.if 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/apache.if 2008-07-25 06:30:35.000000000 -0400 @@ -13,21 +13,16 @@ # template(`apache_content_template',` @@ -10358,7 +10389,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.1/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/apache.te 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/apache.te 2008-07-25 07:41:00.000000000 -0400 @@ -20,6 +20,8 @@ # Declarations # @@ -10579,14 +10610,14 @@ + filetrans_pattern(httpd_sys_script_t,httpd_sys_content_t,httpd_sys_content_rw_t, { file dir lnk_file }) + can_exec(httpd_sys_script_t, httpd_sys_content_t) +') ++ ++tunable_policy(`allow_httpd_sys_script_anon_write',` ++ miscfiles_manage_public_files(httpd_sys_script_t) ++') - manage_dirs_pattern(httpd_t,httpdcontent,httpdcontent) - manage_files_pattern(httpd_t,httpdcontent,httpdcontent) - manage_lnk_files_pattern(httpd_t,httpdcontent,httpdcontent) -+tunable_policy(`allow_httpd_sys_script_anon_write',` -+ miscfiles_manage_public_files(httpd_sys_script_t) -+') -+ +tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',` + domtrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_script_t) + filetrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_rw_t, { file dir lnk_file }) @@ -10660,27 +10691,28 @@ ') optional_policy(` -@@ -476,14 +559,15 @@ +@@ -476,6 +559,12 @@ openca_kill(httpd_t) ') -+tunable_policy(`httpd_can_network_connect_db',` -+ postgresql_tcp_connect(httpd_t) -+ postgresql_tcp_connect(httpd_sys_script_t) -+') ++tunable_policy(`httpd_execmem',` ++ allow httpd_t self:process { execmem execstack }; ++ allow httpd_sys_script_t self:process { execmem execstack }; ++ allow httpd_suexec_t self:process { execmem execstack }; ++') + optional_policy(` # Allow httpd to work with postgresql postgresql_stream_connect(httpd_t) - postgresql_unpriv_client(httpd_t) -- -- tunable_policy(`httpd_can_network_connect_db',` -- postgresql_tcp_connect(httpd_t) -- ') +@@ -483,6 +572,7 @@ + + tunable_policy(`httpd_can_network_connect_db',` + postgresql_tcp_connect(httpd_t) ++ postgresql_tcp_connect(httpd_sys_script_t) + ') ') - optional_policy(` -@@ -491,6 +575,7 @@ +@@ -491,6 +581,7 @@ ') optional_policy(` @@ -10688,7 +10720,7 @@ snmp_dontaudit_read_snmp_var_lib_files(httpd_t) snmp_dontaudit_write_snmp_var_lib_files(httpd_t) ') -@@ -520,9 +605,28 @@ +@@ -520,9 +611,28 @@ logging_send_syslog_msg(httpd_helper_t) tunable_policy(`httpd_tty_comm',` @@ -10717,7 +10749,7 @@ ######################################## # # Apache PHP script local policy -@@ -552,22 +656,27 @@ +@@ -552,22 +662,27 @@ fs_search_auto_mountpoints(httpd_php_t) @@ -10751,7 +10783,7 @@ ') ######################################## -@@ -591,6 +700,8 @@ +@@ -591,6 +706,8 @@ manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t) files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir }) @@ -10760,7 +10792,7 @@ kernel_read_kernel_sysctls(httpd_suexec_t) kernel_list_proc(httpd_suexec_t) kernel_read_proc_symlinks(httpd_suexec_t) -@@ -599,9 +710,7 @@ +@@ -599,9 +716,7 @@ fs_search_auto_mountpoints(httpd_suexec_t) @@ -10771,7 +10803,7 @@ files_read_etc_files(httpd_suexec_t) files_read_usr_files(httpd_suexec_t) -@@ -634,12 +743,21 @@ +@@ -634,12 +749,21 @@ corenet_sendrecv_all_client_packets(httpd_suexec_t) ') @@ -10796,7 +10828,7 @@ ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -648,6 +766,12 @@ +@@ -648,6 +772,12 @@ fs_exec_nfs_files(httpd_suexec_t) ') @@ -10809,7 +10841,7 @@ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_suexec_t) fs_read_cifs_symlinks(httpd_suexec_t) -@@ -665,10 +789,6 @@ +@@ -665,10 +795,6 @@ dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write }; ') @@ -10820,7 +10852,7 @@ ######################################## # # Apache system script local policy -@@ -678,7 +798,8 @@ +@@ -678,7 +804,8 @@ dontaudit httpd_sys_script_t httpd_config_t:dir search; @@ -10830,7 +10862,7 @@ allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms; read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t) -@@ -692,19 +813,44 @@ +@@ -692,19 +819,44 @@ # Should we add a boolean? apache_domtrans_rotatelogs(httpd_sys_script_t) @@ -10878,7 +10910,7 @@ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_sys_script_t) fs_read_cifs_symlinks(httpd_sys_script_t) -@@ -717,10 +863,10 @@ +@@ -717,10 +869,10 @@ optional_policy(` mysql_stream_connect(httpd_sys_script_t) mysql_rw_db_sockets(httpd_sys_script_t) @@ -10893,7 +10925,7 @@ ') ######################################## -@@ -728,6 +874,8 @@ +@@ -728,6 +880,8 @@ # httpd_rotatelogs local policy # @@ -10902,7 +10934,7 @@ manage_files_pattern(httpd_rotatelogs_t,httpd_log_t,httpd_log_t) kernel_read_kernel_sysctls(httpd_rotatelogs_t) -@@ -742,3 +890,48 @@ +@@ -742,3 +896,48 @@ logging_search_logs(httpd_rotatelogs_t) miscfiles_read_localization(httpd_rotatelogs_t) @@ -17982,7 +18014,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.5.1/policy/modules/services/mailman.te --- nsaserefpolicy/policy/modules/services/mailman.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/mailman.te 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/mailman.te 2008-07-25 07:31:24.000000000 -0400 @@ -53,10 +53,9 @@ apache_use_fds(mailman_cgi_t) apache_dontaudit_append_log(mailman_cgi_t) @@ -24354,7 +24386,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.1/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/sendmail.te 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/sendmail.te 2008-07-25 07:31:50.000000000 -0400 @@ -20,13 +20,17 @@ mta_mailserver_delivery(sendmail_t) mta_mailserver_sender(sendmail_t) @@ -24383,7 +24415,13 @@ corenet_all_recvfrom_unlabeled(sendmail_t) corenet_all_recvfrom_netlabel(sendmail_t) -@@ -69,19 +74,23 @@ +@@ -64,24 +69,29 @@ + + fs_getattr_all_fs(sendmail_t) + fs_search_auto_mountpoints(sendmail_t) ++fs_rw_anon_inodefs_files(sendmail_t) + + term_dontaudit_use_console(sendmail_t) # for piping mail to a command corecmd_exec_shell(sendmail_t) @@ -24407,7 +24445,7 @@ auth_use_nsswitch(sendmail_t) -@@ -91,27 +100,46 @@ +@@ -91,27 +101,46 @@ libs_read_lib_files(sendmail_t) logging_send_syslog_msg(sendmail_t) @@ -24456,7 +24494,7 @@ postfix_exec_master(sendmail_t) postfix_read_config(sendmail_t) postfix_search_spool(sendmail_t) -@@ -119,6 +147,7 @@ +@@ -119,6 +148,7 @@ optional_policy(` procmail_domtrans(sendmail_t) @@ -24464,7 +24502,7 @@ ') optional_policy(` -@@ -126,24 +155,25 @@ +@@ -126,24 +156,25 @@ ') optional_policy(` @@ -26243,8 +26281,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-3.5.1/policy/modules/services/squid.if --- nsaserefpolicy/policy/modules/services/squid.if 2008-06-12 23:25:05.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/squid.if 2008-07-24 06:54:04.000000000 -0400 -@@ -131,3 +131,95 @@ ++++ serefpolicy-3.5.1/policy/modules/services/squid.if 2008-07-25 06:35:25.000000000 -0400 +@@ -131,3 +131,114 @@ interface(`squid_use',` refpolicywarn(`$0($*) has been deprecated.') ') @@ -26340,6 +26378,25 @@ + files_list_pids($1) + manage_all_pattern($1,squid_var_run_t) +') ++ ++######################################## ++## ++## Send a signal to squid. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`squid_signal',` ++ gen_require(` ++ type squid_t; ++ ') ++ ++ allow $1 squid_t:process signal; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.1/policy/modules/services/squid.te --- nsaserefpolicy/policy/modules/services/squid.te 2008-07-10 11:38:46.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/services/squid.te 2008-07-24 06:54:04.000000000 -0400 @@ -31127,7 +31184,7 @@ # /opt diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-3.5.1/policy/modules/system/modutils.if --- nsaserefpolicy/policy/modules/system/modutils.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/modutils.if 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/modutils.if 2008-07-25 07:26:20.000000000 -0400 @@ -66,6 +66,25 @@ ######################################## @@ -31154,6 +31211,14 @@ ## Unconditionally execute insmod in the insmod domain. ## ## +@@ -275,6 +294,7 @@ + modutils_domtrans_update_mods($1) + role $2 types update_modules_t; + allow update_modules_t $3:chr_file rw_term_perms; ++ modutils_run_insmod(update_modules_t, $2, $3) + ') + + ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.5.1/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2008-07-10 11:38:46.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/system/modutils.te 2008-07-24 06:54:04.000000000 -0400 Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.689 retrieving revision 1.690 diff -u -r1.689 -r1.690 --- selinux-policy.spec 25 Jul 2008 04:17:41 -0000 1.689 +++ selinux-policy.spec 25 Jul 2008 11:42:14 -0000 1.690 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.5.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -375,6 +375,9 @@ %endif %changelog +* Fri Jul 25 2008 Dan Walsh 3.5.1-3 +- Fixes for logrotate, alsa + * Thu Jul 25 2008 Dan Walsh 3.5.1-2 - Eliminate vbetool duplicate entry From fedora-extras-commits at redhat.com Fri Jul 25 11:46:05 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 11:46:05 GMT Subject: rpms/kde-l10n/F-9 .cvsignore, 1.9, 1.10 kde-l10n.spec, 1.27, 1.28 sources, 1.9, 1.10 subdirs-kde-l10n, 1.5, 1.6 Message-ID: <200807251146.m6PBk5bn025385@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25291/F-9 Modified Files: .cvsignore kde-l10n.spec sources subdirs-kde-l10n Log Message: Sync from devel: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 Jul 2008 16:06:55 -0000 1.9 +++ .cvsignore 25 Jul 2008 11:45:35 -0000 1.10 @@ -314,3 +314,45 @@ kde-l10n-wa-4.0.98.tar.bz2 kde-l10n-zh_CN-4.0.98.tar.bz2 kde-l10n-zh_TW-4.0.98.tar.bz2 +kde-l10n-bg-4.1.0.tar.bz2 +kde-l10n-ca-4.1.0.tar.bz2 +kde-l10n-cs-4.1.0.tar.bz2 +kde-l10n-csb-4.1.0.tar.bz2 +kde-l10n-da-4.1.0.tar.bz2 +kde-l10n-de-4.1.0.tar.bz2 +kde-l10n-el-4.1.0.tar.bz2 +kde-l10n-en_GB-4.1.0.tar.bz2 +kde-l10n-eo-4.1.0.tar.bz2 +kde-l10n-es-4.1.0.tar.bz2 +kde-l10n-et-4.1.0.tar.bz2 +kde-l10n-fi-4.1.0.tar.bz2 +kde-l10n-fr-4.1.0.tar.bz2 +kde-l10n-ga-4.1.0.tar.bz2 +kde-l10n-gl-4.1.0.tar.bz2 +kde-l10n-hi-4.1.0.tar.bz2 +kde-l10n-hu-4.1.0.tar.bz2 +kde-l10n-it-4.1.0.tar.bz2 +kde-l10n-ja-4.1.0.tar.bz2 +kde-l10n-km-4.1.0.tar.bz2 +kde-l10n-ko-4.1.0.tar.bz2 +kde-l10n-mk-4.1.0.tar.bz2 +kde-l10n-lv-4.1.0.tar.bz2 +kde-l10n-nb-4.1.0.tar.bz2 +kde-l10n-nds-4.1.0.tar.bz2 +kde-l10n-nl-4.1.0.tar.bz2 +kde-l10n-nn-4.1.0.tar.bz2 +kde-l10n-pa-4.1.0.tar.bz2 +kde-l10n-pl-4.1.0.tar.bz2 +kde-l10n-pt-4.1.0.tar.bz2 +kde-l10n-pt_BR-4.1.0.tar.bz2 +kde-l10n-ru-4.1.0.tar.bz2 +kde-l10n-sl-4.1.0.tar.bz2 +kde-l10n-sr-4.1.0.tar.bz2 +kde-l10n-sv-4.1.0.tar.bz2 +kde-l10n-ta-4.1.0.tar.bz2 +kde-l10n-th-4.1.0.tar.bz2 +kde-l10n-tr-4.1.0.tar.bz2 +kde-l10n-uk-4.1.0.tar.bz2 +kde-l10n-wa-4.1.0.tar.bz2 +kde-l10n-zh_CN-4.1.0.tar.bz2 +kde-l10n-zh_TW-4.1.0.tar.bz2 Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- kde-l10n.spec 24 Jul 2008 16:06:55 -0000 1.27 +++ kde-l10n.spec 25 Jul 2008 11:45:35 -0000 1.28 @@ -1,7 +1,7 @@ %define buildall 0 Name: kde-l10n -Version: 4.0.98 +Version: 4.1.0 Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -9,10 +9,10 @@ License: LGPLv2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2 -Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2 -Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2 -Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2 +#Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2 +#Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2 +Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2 Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-csb-%{version}.tar.bz2 Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2 @@ -22,7 +22,7 @@ Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2 Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2 -Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2 +#Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2 Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2 Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2 Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2 @@ -37,7 +37,7 @@ Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2 Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2 Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2 -Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2 +#Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2 Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2 Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2 Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2 @@ -45,7 +45,7 @@ Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2 Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2 -Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2 +#Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2 #Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2 Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2 Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2 @@ -789,10 +789,12 @@ %lang(af) %{_datadir}/locale/af/* %endif +%if %{buildall} %files Arabic %defattr(-,root,root) %lang(ar) %{_datadir}/locale/ar/* %lang(ar) %{_datadir}/kde4/apps/klettres/ar +%endif %if %{buildall} %files Azerbaijani @@ -800,9 +802,11 @@ %lang(az) %{_datadir}/locale/az/* %endif +%if %{buildall} %files Belarusian %defattr(-,root,root) %lang(be) %{_datadir}/locale/be/* +%endif %files Bulgarian %defattr(-,root,root) @@ -906,9 +910,11 @@ %lang(et) %{_kde4_appsdir}/kvtml/et %lang(et) %{_kde4_docdir}/HTML/et +%if %{buildall} %files Basque %defattr(-,root,root) %lang(eu) %{_datadir}/locale/eu/* +%endif %if %{buildall} %files Farsi @@ -1067,9 +1073,11 @@ %lang(mt) %{_datadir}/locale/mt/* %endif +%if %{buildall} %files Nepali %defattr(-,root,root) %lang(ne) %{_datadir}/locale/ne/* +%endif %files Dutch %defattr(-,root,root) @@ -1079,9 +1087,11 @@ %lang(nl) %{_kde4_appsdir}/kvtml/nl %lang(nl) %{_kde4_docdir}/HTML/nl +%if %{buildall} %files NorthernSami %defattr(-,root,root) %lang(se) %{_datadir}/locale/se/* +%endif %files Norwegian %defattr(-,root,root) @@ -1166,11 +1176,16 @@ %lang(sr) %{_kde4_docdir}/HTML/sr %lang(sr) %{_kde4_docdir}/HTML/sr at latin %lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr/* +%lang(sr) %{_kde4_iconsdir}/*/*/*/*/sr at latin/* +%lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/* %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr +%lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin %lang(sr) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sr* %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt -%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr/* +%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr +%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr at latin %lang(sr) %{_kde4_appsdir}/kturtle/examples/sr +%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr at latin %lang(sr) %{_kde4_appsdir}/kvtml/sr* %lang(sr) %{_datadir}/locale/sr at latin/* @@ -1244,6 +1259,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Tue Jul 22 2008 Than Ngo 4.0.98-1 - 4.0.98 (4.1rc1) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 24 Jul 2008 16:06:55 -0000 1.9 +++ sources 25 Jul 2008 11:45:35 -0000 1.10 @@ -1,47 +1,42 @@ -9aeb88effbef1c877fced16f47e302a9 kde-l10n-ar-4.0.98.tar.bz2 -dd6215a97db03f5a5451aae144ae9dfa kde-l10n-be-4.0.98.tar.bz2 -5d4f63d4eb2460f44bb62daac478fc48 kde-l10n-bg-4.0.98.tar.bz2 -4dd7d0a26d95823872cac765484f94af kde-l10n-ca-4.0.98.tar.bz2 -f849da964d5ede6fa785ac41602a88c1 kde-l10n-cs-4.0.98.tar.bz2 -6e0254fdf2080c54b4f6e0c4e84e21f8 kde-l10n-csb-4.0.98.tar.bz2 -1bb45b55924f1f22c8104ef06b197114 kde-l10n-da-4.0.98.tar.bz2 -26a1f7418ef17358b7361245dac3f832 kde-l10n-de-4.0.98.tar.bz2 -817fb49ebf0ac4d098ec6980664c3d53 kde-l10n-el-4.0.98.tar.bz2 -54d9db81f2462bae67bfa6f921a170d8 kde-l10n-en_GB-4.0.98.tar.bz2 -14fb7be791993ff10c629765d83c6735 kde-l10n-eo-4.0.98.tar.bz2 -a6a0887cb7a05bb7c151160af40d7799 kde-l10n-es-4.0.98.tar.bz2 -5fec646981e2cf484acbfb829d099b44 kde-l10n-et-4.0.98.tar.bz2 -868d2c0b0be825518a898b347c9f5331 kde-l10n-eu-4.0.98.tar.bz2 -7591643b8471987798eb7ad28d8c50e2 kde-l10n-fi-4.0.98.tar.bz2 -cb3884c4374f5e3019cdd4874a25ad71 kde-l10n-fr-4.0.98.tar.bz2 -a476ccee8c8c9779bff3cda49672b88b kde-l10n-ga-4.0.98.tar.bz2 -40048f50bb540cf34dc0a771c5c350c3 kde-l10n-gl-4.0.98.tar.bz2 -5abf81bae058419d7b6a2cbb5f889e35 kde-l10n-hi-4.0.98.tar.bz2 -27eaaa5bc94301ec7e6207d8e97fe4b0 kde-l10n-hu-4.0.98.tar.bz2 -e011544a6ec8d319682077813226a3cd kde-l10n-it-4.0.98.tar.bz2 -69707943d055b21825eb7f6f52b88ef0 kde-l10n-ja-4.0.98.tar.bz2 -b91deec756318c41f23b435c6a2b2441 kde-l10n-km-4.0.98.tar.bz2 -a0db531b70bdd7f6edafa382382aa44d kde-l10n-ko-4.0.98.tar.bz2 -a3a5c8f566d7f150168b6775f39ad68b kde-l10n-mk-4.0.98.tar.bz2 -127c86202beb589227fc2fce5cf60172 kde-l10n-lv-4.0.98.tar.bz2 -7761851d40228ff99268694ace65b271 kde-l10n-nb-4.0.98.tar.bz2 -cd32d33399d6d98c567c32f1189d9f94 kde-l10n-nds-4.0.98.tar.bz2 -9dfac93e533765cd27215e54d955f191 kde-l10n-ne-4.0.98.tar.bz2 -09e120153bac95d838731fc21a94ff9b kde-l10n-nl-4.0.98.tar.bz2 -50333413d1108c369d321335451bf101 kde-l10n-nn-4.0.98.tar.bz2 -278b96a224222fed7d932c5883ef661b kde-l10n-pa-4.0.98.tar.bz2 -ac8f505cae675f8131af4fbae5638ce5 kde-l10n-pl-4.0.98.tar.bz2 -6da6d201f9ca428cd452fb34fa62541e kde-l10n-pt-4.0.98.tar.bz2 -98fbadc044cf4a954f6ed37dbf9ddfb9 kde-l10n-pt_BR-4.0.98.tar.bz2 -6ddf05b0ca4a5b46563e1630b3f86989 kde-l10n-ru-4.0.98.tar.bz2 -80c2a906466831fcc786fa5a47d39b7e kde-l10n-se-4.0.98.tar.bz2 -7883962a6a2f35c9187ebd711f97a1c7 kde-l10n-sl-4.0.98.tar.bz2 -8aef3da452b46b2674708a28e0e8e912 kde-l10n-sr-4.0.98.tar.bz2 -d8dcd9c66429aa528394295faa4b57d6 kde-l10n-sv-4.0.98.tar.bz2 -cb52bdd5dddfd3d114ca2b431e6d5529 kde-l10n-ta-4.0.98.tar.bz2 -c16f08068149829ae1672941d0225d25 kde-l10n-th-4.0.98.tar.bz2 -81d85933f3ad731032dfd5a4cb16425d kde-l10n-tr-4.0.98.tar.bz2 -1c62c1b4389da07c73e3df4ef38be8ba kde-l10n-uk-4.0.98.tar.bz2 -22a61616d8e11d54b135314dd4c0e600 kde-l10n-wa-4.0.98.tar.bz2 -25d5dd8c2363fbe52c66dac63fdea6b7 kde-l10n-zh_CN-4.0.98.tar.bz2 -f9227a0db298ed0988459b61c1215a98 kde-l10n-zh_TW-4.0.98.tar.bz2 +6ea143c07fec4c221163d518a6b4a6ba kde-l10n-bg-4.1.0.tar.bz2 +9d3b148e2519ecdd3413e75ced74d74d kde-l10n-ca-4.1.0.tar.bz2 +587b64f8faa341deacdcb001cb6c1d49 kde-l10n-cs-4.1.0.tar.bz2 +3f554dca9db73ae823de6a59e6c1fccb kde-l10n-csb-4.1.0.tar.bz2 +c0f1a76fa98261532b5b2ec7677b122c kde-l10n-da-4.1.0.tar.bz2 +4b4692687b61fe38b1936de557ad76fc kde-l10n-de-4.1.0.tar.bz2 +8a1cd5d567c3f73f3359aa33bf102eef kde-l10n-el-4.1.0.tar.bz2 +5c812fd8335c70aabcff3c92bd6fad2e kde-l10n-en_GB-4.1.0.tar.bz2 +b35462218b9cfe29bf106aba8e8a0a3c kde-l10n-eo-4.1.0.tar.bz2 +81e8d8a287c29b5ff099075d6e91f777 kde-l10n-es-4.1.0.tar.bz2 +2515a4e55e10a01c5edad030e1c4ee58 kde-l10n-et-4.1.0.tar.bz2 +a47ae43bbe50e733e8ad33d91a54e60d kde-l10n-fi-4.1.0.tar.bz2 +ba690a8e9409f5c934b7db78c4b26da8 kde-l10n-fr-4.1.0.tar.bz2 +d5cd12cd6d1cf9329b6029406b5c1e0f kde-l10n-ga-4.1.0.tar.bz2 +66718341e6fbec3144a8a6e6ff12eaf9 kde-l10n-gl-4.1.0.tar.bz2 +5759f8639cebab9e0eeb36092c4530cd kde-l10n-hi-4.1.0.tar.bz2 +c6cf7a32ef93f571a5929ad8567828c8 kde-l10n-hu-4.1.0.tar.bz2 +da1a689abd2cab8e16b63ebfbc1781a9 kde-l10n-it-4.1.0.tar.bz2 +21fdce21cbc277c99ab47548b1574277 kde-l10n-ja-4.1.0.tar.bz2 +5334d54a5eb05d2f9e036bcbe436c7f1 kde-l10n-km-4.1.0.tar.bz2 +8517edcee2bd74c2b6ae2817b6419ef9 kde-l10n-ko-4.1.0.tar.bz2 +c96fe5683d10216dab91044a6e8d067e kde-l10n-mk-4.1.0.tar.bz2 +eb9a66e0a50ce7ca2956fcde580a4861 kde-l10n-lv-4.1.0.tar.bz2 +5dabe6c3a7b7510d84ddc385e08da932 kde-l10n-nb-4.1.0.tar.bz2 +aac9294f3b1550ef2721e34c958f21f0 kde-l10n-nds-4.1.0.tar.bz2 +e0d37ba868babd2a139cbb288e9705ca kde-l10n-nl-4.1.0.tar.bz2 +b6ca1a9578358163c65ead322f172b6b kde-l10n-nn-4.1.0.tar.bz2 +b996ea1acc09bc3dc9432a96a948bb8e kde-l10n-pa-4.1.0.tar.bz2 +bdc1403f878cf95771ef1f55eaea5bf1 kde-l10n-pl-4.1.0.tar.bz2 +5af76c57b9aa57163192bc5ca6f51d56 kde-l10n-pt-4.1.0.tar.bz2 +de0643177deb5e71994d9a6f011e3a7c kde-l10n-pt_BR-4.1.0.tar.bz2 +4bf857f4f2fd8ca8fd647b02806216c8 kde-l10n-ru-4.1.0.tar.bz2 +1a326e1e690d91e1452cf9ff5367c1a2 kde-l10n-sl-4.1.0.tar.bz2 +05d7d2eb92edfceb0d0daa7967e531a8 kde-l10n-sr-4.1.0.tar.bz2 +e7af80be264b2345897587631024ee10 kde-l10n-sv-4.1.0.tar.bz2 +9958be9594b7a0e78a58628e9d549d0d kde-l10n-ta-4.1.0.tar.bz2 +d694f4c914c5694ea891d96ee2050c7c kde-l10n-th-4.1.0.tar.bz2 +7eb8f931768d071dee725226289a66df kde-l10n-tr-4.1.0.tar.bz2 +a5c44a250439d0653bacaffa89ecafbb kde-l10n-uk-4.1.0.tar.bz2 +a309ad111b09c205a94efa932f902e8b kde-l10n-wa-4.1.0.tar.bz2 +48aef075bef64f8d57ba124620a17eaa kde-l10n-zh_CN-4.1.0.tar.bz2 +7ef18fe5d0fee8252ff0f1186b2f8a4f kde-l10n-zh_TW-4.1.0.tar.bz2 Index: subdirs-kde-l10n =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/subdirs-kde-l10n,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- subdirs-kde-l10n 24 Jul 2008 16:06:55 -0000 1.5 +++ subdirs-kde-l10n 25 Jul 2008 11:45:35 -0000 1.6 @@ -1,5 +1,3 @@ -ar -be bg ca cs @@ -11,7 +9,6 @@ eo es et -eu fi fr ga @@ -26,7 +23,6 @@ lv nb nds -ne nl nn pa @@ -34,7 +30,6 @@ pt pt_BR ru -se sl sr sv From fedora-extras-commits at redhat.com Fri Jul 25 11:49:36 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Fri, 25 Jul 2008 11:49:36 GMT Subject: rpms/filezilla/devel sources, 1.15, 1.16 .cvsignore, 1.12, 1.13 filezilla.spec, 1.16, 1.17 FileZilla_3.1.0-socket.patch, 1.1, NONE FileZilla_3.0.11-rc1-system.patch, 1.1, NONE Message-ID: <200807251149.m6PBnaT5025613@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25566 Modified Files: sources .cvsignore filezilla.spec Removed Files: FileZilla_3.1.0-socket.patch FileZilla_3.0.11-rc1-system.patch Log Message: -Update to 3.1.0.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 14 Jul 2008 16:10:41 -0000 1.15 +++ sources 25 Jul 2008 11:49:06 -0000 1.16 @@ -1 +1 @@ -0be04004b138a80f7a4d94bfd82cb69d FileZilla_3.1.0-beta2_src.tar.bz2 +45a28bac466bd8f2eb1a97dfeb3ea8b3 FileZilla_3.1.0.1_src.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Jul 2008 16:10:41 -0000 1.12 +++ .cvsignore 25 Jul 2008 11:49:06 -0000 1.13 @@ -1 +1 @@ -FileZilla_3.1.0-beta2_src.tar.bz2 +FileZilla_3.1.0.1_src.tar.bz2 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- filezilla.spec 14 Jul 2008 16:10:41 -0000 1.16 +++ filezilla.spec 25 Jul 2008 11:49:06 -0000 1.17 @@ -1,18 +1,16 @@ Name: filezilla -Version: 3.1.0 -Release: 0.1.beta2%{?dist} +Version: 3.1.0.1 +Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet License: GPLv2+ URL: http://filezilla-project.org/ -Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}-beta2_src.tar.bz2 -Patch0: FileZilla_3.0.11-rc1-system.patch -Patch1: FileZilla_3.1.0-socket.patch +Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked -BuildRequires: automake, autoconf, libtool +#BuildRequires: automake, autoconf, libtool ## ## Needed if test program is build BuildRequires: cppunit-devel >= 1.10.2 @@ -40,14 +38,12 @@ %prep -%setup -q -n %{name}-%{version}-beta2 -%patch0 -p1 -b .system -%patch1 -p1 -b .socket +%setup -q -n %{name}-%{version} #sed -i -e 's/2.0.4/1.6.3/' configure.in # Run autotools if needed -sh autogen.sh +# sh autogen.sh %build @@ -55,6 +51,7 @@ --disable-static \ --enable-locales \ --disable-manualupdatecheck \ + --with-tinyxml=system \ --disable-autoupdatecheck ## Do not use --enable-buildtype=official @@ -68,13 +65,9 @@ %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" -mkdir -p __doc -install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc -rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs - for i in 16x16 32x32 48x48 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps ln -sf ../../../../%{name}/resources/${i}/%{name}.png \ @@ -114,7 +107,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS -%doc __doc/* +%doc %{_datadir}/%{name}/docs/* %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop @@ -124,15 +117,15 @@ %changelog +* Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 3.1.0.1-1 +- Update to 3.1.0.1 + * Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 3.1.0-0.1.beta2 - Update to 3.1.0-beta2 * Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 - Update to 3.0.11.1 -* Wed Jun 25 2008 Tomas Mraz - 3.0.11-2 -- rebuild with new gnutls - * Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1 - Update to 3.0.11 - Create patch for a shared tinyxml. --- FileZilla_3.1.0-socket.patch DELETED --- --- FileZilla_3.0.11-rc1-system.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 11:54:04 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Fri, 25 Jul 2008 11:54:04 GMT Subject: rpms/selinux-policy/devel policy-20080710.patch,1.7,1.8 Message-ID: <200807251154.m6PBs4uw025882@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25841 Modified Files: policy-20080710.patch Log Message: * Fri Jul 25 2008 Dan Walsh 3.5.1-3 - Fixes for logrotate, alsa policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- policy-20080710.patch 25 Jul 2008 11:42:14 -0000 1.7 +++ policy-20080710.patch 25 Jul 2008 11:53:34 -0000 1.8 @@ -10389,7 +10389,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.1/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/services/apache.te 2008-07-25 07:41:00.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/services/apache.te 2008-07-25 07:51:49.000000000 -0400 @@ -20,6 +20,8 @@ # Declarations # @@ -10399,20 +10399,27 @@ ## ##

## Allow Apache to modify public files -@@ -31,10 +33,10 @@ +@@ -31,10 +33,17 @@ ## ##

-## Allow Apache to use mod_auth_pam -+## Allow Apache to communicate with avahi service via dbus ++## Allow httpd scripts and modules execmem/execstack ##

## -gen_tunable(allow_httpd_mod_auth_pam,false) ++gen_tunable(httpd_execmem,false) ++ ++## ++##

++## Allow Apache to communicate with avahi service via dbus ++##

++## +gen_tunable(allow_httpd_dbus_avahi,false) ## ##

-@@ -45,7 +47,14 @@ +@@ -45,7 +54,14 @@ ## ##

@@ -10428,7 +10435,7 @@ ##

## gen_tunable(httpd_can_network_connect,false) -@@ -109,14 +118,33 @@ +@@ -109,14 +125,33 @@ ## gen_tunable(httpd_unified,false) @@ -10464,7 +10471,7 @@ # user script domains attribute httpd_script_domains; -@@ -147,6 +175,9 @@ +@@ -147,6 +182,9 @@ type httpd_log_t; logging_log_file(httpd_log_t) @@ -10474,7 +10481,7 @@ # httpd_modules_t is the type given to module files (libraries) # that come with Apache /etc/httpd/modules and /usr/lib/apache type httpd_modules_t; -@@ -180,6 +211,9 @@ +@@ -180,6 +218,9 @@ # setup the system domain for system CGI scripts apache_content_template(sys) @@ -10484,7 +10491,7 @@ type httpd_tmp_t; files_tmp_file(httpd_tmp_t) -@@ -202,12 +236,16 @@ +@@ -202,12 +243,16 @@ prelink_object_file(httpd_modules_t) ') @@ -10502,7 +10509,7 @@ dontaudit httpd_t self:capability { net_admin sys_tty_config }; allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow httpd_t self:fd use; -@@ -249,6 +287,7 @@ +@@ -249,6 +294,7 @@ allow httpd_t httpd_modules_t:dir list_dir_perms; mmap_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) read_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) @@ -10510,7 +10517,7 @@ apache_domtrans_rotatelogs(httpd_t) # Apache-httpd needs to be able to send signals to the log rotate procs. -@@ -289,6 +328,7 @@ +@@ -289,6 +335,7 @@ kernel_read_kernel_sysctls(httpd_t) # for modules that want to access /proc/meminfo kernel_read_system_state(httpd_t) @@ -10518,7 +10525,7 @@ corenet_all_recvfrom_unlabeled(httpd_t) corenet_all_recvfrom_netlabel(httpd_t) -@@ -312,12 +352,11 @@ +@@ -312,12 +359,11 @@ fs_getattr_all_fs(httpd_t) fs_search_auto_mountpoints(httpd_t) @@ -10533,7 +10540,7 @@ domain_use_interactive_fds(httpd_t) -@@ -335,6 +374,10 @@ +@@ -335,6 +381,10 @@ files_read_var_lib_symlinks(httpd_t) fs_search_auto_mountpoints(httpd_sys_script_t) @@ -10544,7 +10551,7 @@ libs_use_ld_so(httpd_t) libs_use_shared_libs(httpd_t) -@@ -351,25 +394,50 @@ +@@ -351,25 +401,50 @@ userdom_use_unpriv_users_fds(httpd_t) @@ -10599,7 +10606,7 @@ tunable_policy(`httpd_can_network_relay',` # allow httpd to work as a relay corenet_tcp_connect_gopher_port(httpd_t) -@@ -382,23 +450,34 @@ +@@ -382,23 +457,34 @@ corenet_sendrecv_http_cache_client_packets(httpd_t) ') @@ -10642,7 +10649,7 @@ fs_read_nfs_files(httpd_t) fs_read_nfs_symlinks(httpd_t) ') -@@ -408,6 +487,11 @@ +@@ -408,6 +494,11 @@ fs_read_cifs_symlinks(httpd_t) ') @@ -10654,7 +10661,7 @@ tunable_policy(`httpd_ssi_exec',` corecmd_shell_domtrans(httpd_t,httpd_sys_script_t) allow httpd_sys_script_t httpd_t:fd use; -@@ -441,8 +525,13 @@ +@@ -441,8 +532,13 @@ ') optional_policy(` @@ -10670,7 +10677,7 @@ ') optional_policy(` -@@ -454,19 +543,13 @@ +@@ -454,19 +550,13 @@ ') optional_policy(` @@ -10691,7 +10698,7 @@ ') optional_policy(` -@@ -476,6 +559,12 @@ +@@ -476,6 +566,12 @@ openca_kill(httpd_t) ') @@ -10704,7 +10711,7 @@ optional_policy(` # Allow httpd to work with postgresql postgresql_stream_connect(httpd_t) -@@ -483,6 +572,7 @@ +@@ -483,6 +579,7 @@ tunable_policy(`httpd_can_network_connect_db',` postgresql_tcp_connect(httpd_t) @@ -10712,7 +10719,7 @@ ') ') -@@ -491,6 +581,7 @@ +@@ -491,6 +588,7 @@ ') optional_policy(` @@ -10720,7 +10727,7 @@ snmp_dontaudit_read_snmp_var_lib_files(httpd_t) snmp_dontaudit_write_snmp_var_lib_files(httpd_t) ') -@@ -520,9 +611,28 @@ +@@ -520,9 +618,28 @@ logging_send_syslog_msg(httpd_helper_t) tunable_policy(`httpd_tty_comm',` @@ -10749,7 +10756,7 @@ ######################################## # # Apache PHP script local policy -@@ -552,22 +662,27 @@ +@@ -552,22 +669,27 @@ fs_search_auto_mountpoints(httpd_php_t) @@ -10783,7 +10790,7 @@ ') ######################################## -@@ -591,6 +706,8 @@ +@@ -591,6 +713,8 @@ manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t) files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir }) @@ -10792,7 +10799,7 @@ kernel_read_kernel_sysctls(httpd_suexec_t) kernel_list_proc(httpd_suexec_t) kernel_read_proc_symlinks(httpd_suexec_t) -@@ -599,9 +716,7 @@ +@@ -599,9 +723,7 @@ fs_search_auto_mountpoints(httpd_suexec_t) @@ -10803,7 +10810,7 @@ files_read_etc_files(httpd_suexec_t) files_read_usr_files(httpd_suexec_t) -@@ -634,12 +749,21 @@ +@@ -634,12 +756,21 @@ corenet_sendrecv_all_client_packets(httpd_suexec_t) ') @@ -10828,7 +10835,7 @@ ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -648,6 +772,12 @@ +@@ -648,6 +779,12 @@ fs_exec_nfs_files(httpd_suexec_t) ') @@ -10841,7 +10848,7 @@ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_suexec_t) fs_read_cifs_symlinks(httpd_suexec_t) -@@ -665,10 +795,6 @@ +@@ -665,10 +802,6 @@ dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write }; ') @@ -10852,7 +10859,7 @@ ######################################## # # Apache system script local policy -@@ -678,7 +804,8 @@ +@@ -678,7 +811,8 @@ dontaudit httpd_sys_script_t httpd_config_t:dir search; @@ -10862,7 +10869,7 @@ allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms; read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t) -@@ -692,19 +819,44 @@ +@@ -692,19 +826,44 @@ # Should we add a boolean? apache_domtrans_rotatelogs(httpd_sys_script_t) @@ -10910,7 +10917,7 @@ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_sys_script_t) fs_read_cifs_symlinks(httpd_sys_script_t) -@@ -717,10 +869,10 @@ +@@ -717,10 +876,10 @@ optional_policy(` mysql_stream_connect(httpd_sys_script_t) mysql_rw_db_sockets(httpd_sys_script_t) @@ -10925,7 +10932,7 @@ ') ######################################## -@@ -728,6 +880,8 @@ +@@ -728,6 +887,8 @@ # httpd_rotatelogs local policy # @@ -10934,7 +10941,7 @@ manage_files_pattern(httpd_rotatelogs_t,httpd_log_t,httpd_log_t) kernel_read_kernel_sysctls(httpd_rotatelogs_t) -@@ -742,3 +896,48 @@ +@@ -742,3 +903,48 @@ logging_search_logs(httpd_rotatelogs_t) miscfiles_read_localization(httpd_rotatelogs_t) From fedora-extras-commits at redhat.com Fri Jul 25 11:54:53 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Fri, 25 Jul 2008 11:54:53 GMT Subject: rpms/gdb/F-9 gdb-6.8-upstream.patch,1.4,1.5 gdb.spec,1.288,1.289 Message-ID: <200807251154.m6PBsrsO026016@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25938 Modified Files: gdb-6.8-upstream.patch gdb.spec Log Message: * Fri Jul 25 2008 Jan Kratochvil - 6.8-13 - Fix powerpc recent secure PLTs handling (shared library calls) (BZ 452960). - Fix the testsuite .spec runner to run biarch also on ppc. - Reenable testcases threadcrash.exp, chng-syms.exp, checkpoint.exp (BZ 207002). gdb-6.8-upstream.patch: Index: gdb-6.8-upstream.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/F-9/gdb-6.8-upstream.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdb-6.8-upstream.patch 7 Jul 2008 22:49:31 -0000 1.4 +++ gdb-6.8-upstream.patch 25 Jul 2008 11:54:22 -0000 1.5 @@ -931,3 +931,710 @@ +gdb_test "print empty()" " = void" +# We did segfault here. +gdb_test "help help" + + + +https://bugzilla.redhat.com/show_bug.cgi?id=452960 + +bfd/ +2008-05-14 Ulrich Weigand + + * elf32-ppc.c (ppc_elf_get_synthetic_symtab): Fix memset calls. + * elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Likewise. + +bfd/ +2008-05-14 Ulrich Weigand + Alan Modra + + * elf32-ppc.c (section_covers_vma): New function. + (ppc_elf_get_synthetic_symtab): New function. + (bfd_elf32_get_synthetic_symtab): Define. + * elf64-ppc.c (section_covers_vma): New function. + (ppc64_elf_get_synthetic_symtab): Generate sym at plt on glink branch + table entries, and __glink_PLTresolve on resolver stub. + (ppc64_elf_build_stubs): Rename __glink sym to __glink_PLTresolve. + +gdb/ +2008-05-14 Ulrich Weigand + + * ppc-linux-tdep.c (ppc_linux_convert_from_func_ptr_addr): Rename ... + (ppc64_linux_convert_from_func_ptr_addr): ... to this. No longer try + to handle ppc32 PLT entries. + (ppc_linux_init_abi): Install ppc64_linux_convert_from_func_ptr_addr + only on ppc64. + +gdb/ +2008-05-14 Daniel Jacobowitz + + * elfread.c (elf_symtab_read): Create trampolines for @plt symbols. + * minsyms.c (lookup_minimal_symbol_by_pc_section_1): Renamed from + lookup_minimal_symbol_by_pc_section. Prefer trampolines if requested. + (lookup_minimal_symbol_by_pc_section): Use + lookup_minimal_symbol_by_pc_section_1. + (lookup_solib_trampoline_symbol_by_pc): Likewise. + +[ Backported for GDB-6.8f. ] + +--- ./bfd/elf32-ppc.c 2008-02-26 09:36:03.000000000 +0100 ++++ ./bfd/elf32-ppc.c 2008-07-24 15:42:47.000000000 +0200 +@@ -2291,6 +2291,208 @@ ppc_elf_final_write_processing (bfd *abf + apuinfo_list_finish (); + } + ++static bfd_boolean ++section_covers_vma (bfd *abfd ATTRIBUTE_UNUSED, asection *section, void *ptr) ++{ ++ bfd_vma vma = *(bfd_vma *) ptr; ++ return ((section->flags & SEC_ALLOC) != 0 ++ && section->vma <= vma ++ && vma < section->vma + section->size); ++} ++ ++static long ++ppc_elf_get_synthetic_symtab (bfd *abfd, long symcount, asymbol **syms, ++ long dynsymcount, asymbol **dynsyms, ++ asymbol **ret) ++{ ++ bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean); ++ asection *plt, *relplt, *dynamic, *glink; ++ bfd_vma glink_vma = 0; ++ bfd_vma resolv_vma = 0; ++ bfd_vma stub_vma; ++ asymbol *s; ++ arelent *p; ++ long count, i; ++ size_t size; ++ char *names; ++ bfd_byte buf[4]; ++ ++ *ret = NULL; ++ ++ if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0) ++ return 0; ++ ++ if (dynsymcount <= 0) ++ return 0; ++ ++ relplt = bfd_get_section_by_name (abfd, ".rela.plt"); ++ if (relplt == NULL) ++ return 0; ++ ++ plt = bfd_get_section_by_name (abfd, ".plt"); ++ if (plt == NULL) ++ return 0; ++ ++ /* Call common code to handle old-style executable PLTs. */ ++ if (elf_section_flags (plt) & SHF_EXECINSTR) ++ return _bfd_elf_get_synthetic_symtab (abfd, symcount, syms, ++ dynsymcount, dynsyms, ret); ++ ++ /* If this object was prelinked, the prelinker stored the address ++ of .glink at got[1]. If it wasn't prelinked, got[1] will be zero. */ ++ dynamic = bfd_get_section_by_name (abfd, ".dynamic"); ++ if (dynamic != NULL) ++ { ++ bfd_byte *dynbuf, *extdyn, *extdynend; ++ size_t extdynsize; ++ void (*swap_dyn_in) (bfd *, const void *, Elf_Internal_Dyn *); ++ ++ if (!bfd_malloc_and_get_section (abfd, dynamic, &dynbuf)) ++ return -1; ++ ++ extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn; ++ swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in; ++ ++ extdyn = dynbuf; ++ extdynend = extdyn + dynamic->size; ++ for (; extdyn < extdynend; extdyn += extdynsize) ++ { ++ Elf_Internal_Dyn dyn; ++ (*swap_dyn_in) (abfd, extdyn, &dyn); ++ ++ if (dyn.d_tag == DT_NULL) ++ break; ++ ++ if (dyn.d_tag == DT_PPC_GOT) ++ { ++ unsigned int g_o_t = dyn.d_un.d_val; ++ asection *got = bfd_get_section_by_name (abfd, ".got"); ++ if (got != NULL ++ && bfd_get_section_contents (abfd, got, buf, ++ g_o_t - got->vma + 4, 4)) ++ glink_vma = bfd_get_32 (abfd, buf); ++ break; ++ } ++ } ++ free (dynbuf); ++ } ++ ++ /* Otherwise we read the first plt entry. */ ++ if (glink_vma == 0) ++ { ++ if (bfd_get_section_contents (abfd, plt, buf, 0, 4)) ++ glink_vma = bfd_get_32 (abfd, buf); ++ } ++ ++ if (glink_vma == 0) ++ return 0; ++ ++ /* The .glink section usually does not survive the final ++ link; search for the section (usually .text) where the ++ glink stubs now reside. */ ++ glink = bfd_sections_find_if (abfd, section_covers_vma, &glink_vma); ++ if (glink == NULL) ++ return 0; ++ ++ /* Determine glink PLT resolver by reading the relative branch ++ from the first glink stub. */ ++ if (bfd_get_section_contents (abfd, glink, buf, ++ glink_vma - glink->vma, 4)) ++ { ++ unsigned int insn = bfd_get_32 (abfd, buf); ++ ++ /* The first glink stub may either branch to the resolver ... */ ++ insn ^= B; ++ if ((insn & ~0x3fffffc) == 0) ++ resolv_vma = glink_vma + (insn ^ 0x2000000) - 0x2000000; ++ ++ /* ... or fall through a bunch of NOPs. */ ++ else if ((insn ^ B ^ NOP) == 0) ++ for (i = 4; ++ bfd_get_section_contents (abfd, glink, buf, ++ glink_vma - glink->vma + i, 4); ++ i += 4) ++ if (bfd_get_32 (abfd, buf) != NOP) ++ { ++ resolv_vma = glink_vma + i; ++ break; ++ } ++ } ++ ++ slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table; ++ if (! (*slurp_relocs) (abfd, relplt, dynsyms, TRUE)) ++ return -1; ++ ++ count = relplt->size / sizeof (Elf32_External_Rela); ++ stub_vma = glink_vma - (bfd_vma) count * 16; ++ size = count * sizeof (asymbol); ++ p = relplt->relocation; ++ for (i = 0; i < count; i++, p++) ++ size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt"); ++ ++ size += sizeof (asymbol) + sizeof ("__glink"); ++ ++ if (resolv_vma) ++ size += sizeof (asymbol) + sizeof ("__glink_PLTresolve"); ++ ++ s = *ret = bfd_malloc (size); ++ if (s == NULL) ++ return -1; ++ ++ names = (char *) (s + count + 1 + (resolv_vma != 0)); ++ p = relplt->relocation; ++ for (i = 0; i < count; i++, p++) ++ { ++ size_t len; ++ ++ *s = **p->sym_ptr_ptr; ++ /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set. Since ++ we are defining a symbol, ensure one of them is set. */ ++ if ((s->flags & BSF_LOCAL) == 0) ++ s->flags |= BSF_GLOBAL; ++ s->section = glink; ++ s->value = stub_vma - glink->vma; ++ s->name = names; ++ s->udata.p = NULL; ++ len = strlen ((*p->sym_ptr_ptr)->name); ++ memcpy (names, (*p->sym_ptr_ptr)->name, len); ++ names += len; ++ memcpy (names, "@plt", sizeof ("@plt")); ++ names += sizeof ("@plt"); ++ ++s; ++ stub_vma += 16; ++ } ++ ++ /* Add a symbol at the start of the glink branch table. */ ++ memset (s, 0, sizeof *s); ++ s->the_bfd = abfd; ++ s->flags = BSF_GLOBAL; ++ s->section = glink; ++ s->value = glink_vma - glink->vma; ++ s->name = names; ++ memcpy (names, "__glink", sizeof ("__glink")); ++ names += sizeof ("__glink"); ++ s++; ++ count++; ++ ++ if (resolv_vma) ++ { ++ /* Add a symbol for the glink PLT resolver. */ ++ memset (s, 0, sizeof *s); ++ s->the_bfd = abfd; ++ s->flags = BSF_GLOBAL; ++ s->section = glink; ++ s->value = resolv_vma - glink->vma; ++ s->name = names; ++ memcpy (names, "__glink_PLTresolve", sizeof ("__glink_PLTresolve")); ++ names += sizeof ("__glink_PLTresolve"); ++ s++; ++ count++; ++ } ++ ++ return count; ++} ++ + /* The following functions are specific to the ELF linker, while + functions above are used generally. They appear in this file more + or less in the order in which they are called. eg. +@@ -7733,6 +7935,7 @@ ppc_elf_finish_dynamic_sections (bfd *ou + #define bfd_elf32_bfd_reloc_name_lookup ppc_elf_reloc_name_lookup + #define bfd_elf32_bfd_set_private_flags ppc_elf_set_private_flags + #define bfd_elf32_bfd_link_hash_table_create ppc_elf_link_hash_table_create ++#define bfd_elf32_get_synthetic_symtab ppc_elf_get_synthetic_symtab + + #define elf_backend_object_p ppc_elf_object_p + #define elf_backend_gc_mark_hook ppc_elf_gc_mark_hook +@@ -7847,6 +8050,8 @@ ppc_elf_vxworks_final_write_processing ( + #undef elf_backend_got_header_size + #define elf_backend_got_header_size 12 + ++#undef bfd_elf32_get_synthetic_symtab ++ + #undef bfd_elf32_bfd_link_hash_table_create + #define bfd_elf32_bfd_link_hash_table_create \ + ppc_elf_vxworks_link_hash_table_create +--- ./bfd/elf64-ppc.c 2008-02-15 09:27:19.000000000 +0100 ++++ ./bfd/elf64-ppc.c 2008-07-24 15:42:47.000000000 +0200 +@@ -2771,8 +2771,17 @@ sym_exists_at (asymbol **syms, long lo, + return NULL; + } + ++static bfd_boolean ++section_covers_vma (bfd *abfd ATTRIBUTE_UNUSED, asection *section, void *ptr) ++{ ++ bfd_vma vma = *(bfd_vma *) ptr; ++ return ((section->flags & SEC_ALLOC) != 0 ++ && section->vma <= vma ++ && vma < section->vma + section->size); ++} ++ + /* Create synthetic symbols, effectively restoring "dot-symbol" function +- entry syms. */ ++ entry syms. Also generate @plt symbols for the glink branch table. */ + + static long + ppc64_elf_get_synthetic_symtab (bfd *abfd, +@@ -2862,8 +2871,6 @@ ppc64_elf_get_synthetic_symtab (bfd *abf + symcount = i; + + count = 0; +- if (opdsymend == secsymend) +- goto done; + + if (relocatable) + { +@@ -2872,6 +2879,9 @@ ppc64_elf_get_synthetic_symtab (bfd *abf + size_t size; + long relcount; + ++ if (opdsymend == secsymend) ++ goto done; ++ + slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table; + relcount = (opd->flags & SEC_RELOC) ? opd->reloc_count : 0; + if (relcount == 0) +@@ -2960,8 +2970,13 @@ ppc64_elf_get_synthetic_symtab (bfd *abf + } + else + { ++ bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean); + bfd_byte *contents; + size_t size; ++ long plt_count = 0; ++ bfd_vma glink_vma = 0, resolv_vma = 0; ++ asection *dynamic, *glink = NULL, *relplt = NULL; ++ arelent *p; + + if (!bfd_malloc_and_get_section (abfd, opd, &contents)) + { +@@ -2988,11 +3003,85 @@ ppc64_elf_get_synthetic_symtab (bfd *abf + } + } + ++ /* Get start of .glink stubs from DT_PPC64_GLINK. */ ++ dynamic = bfd_get_section_by_name (abfd, ".dynamic"); ++ if (dynamic != NULL) ++ { ++ bfd_byte *dynbuf, *extdyn, *extdynend; ++ size_t extdynsize; ++ void (*swap_dyn_in) (bfd *, const void *, Elf_Internal_Dyn *); ++ ++ if (!bfd_malloc_and_get_section (abfd, dynamic, &dynbuf)) ++ goto free_contents_and_exit; ++ ++ extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn; ++ swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in; ++ ++ extdyn = dynbuf; ++ extdynend = extdyn + dynamic->size; ++ for (; extdyn < extdynend; extdyn += extdynsize) ++ { ++ Elf_Internal_Dyn dyn; ++ (*swap_dyn_in) (abfd, extdyn, &dyn); ++ ++ if (dyn.d_tag == DT_NULL) ++ break; ++ ++ if (dyn.d_tag == DT_PPC64_GLINK) ++ { ++ /* The first glink stub starts at offset 32; see comment in ++ ppc64_elf_finish_dynamic_sections. */ ++ glink_vma = dyn.d_un.d_val + 32; ++ /* The .glink section usually does not survive the final ++ link; search for the section (usually .text) where the ++ glink stubs now reside. */ ++ glink = bfd_sections_find_if (abfd, section_covers_vma, ++ &glink_vma); ++ break; ++ } ++ } ++ ++ free (dynbuf); ++ } ++ ++ if (glink != NULL) ++ { ++ /* Determine __glink trampoline by reading the relative branch ++ from the first glink stub. */ ++ bfd_byte buf[4]; ++ if (bfd_get_section_contents (abfd, glink, buf, ++ glink_vma + 4 - glink->vma, 4)) ++ { ++ unsigned int insn = bfd_get_32 (abfd, buf); ++ insn ^= B_DOT; ++ if ((insn & ~0x3fffffc) == 0) ++ resolv_vma = glink_vma + 4 + (insn ^ 0x2000000) - 0x2000000; ++ } ++ ++ if (resolv_vma) ++ size += sizeof (asymbol) + sizeof ("__glink_PLTresolve"); ++ } ++ ++ relplt = bfd_get_section_by_name (abfd, ".rela.plt"); ++ if (glink != NULL && relplt != NULL) ++ { ++ slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table; ++ if (! (*slurp_relocs) (abfd, relplt, dyn_syms, TRUE)) ++ goto free_contents_and_exit; ++ ++ plt_count = relplt->size / sizeof (Elf64_External_Rela); ++ size += plt_count * sizeof (asymbol); ++ ++ p = relplt->relocation; ++ for (i = 0; i < plt_count; i++, p++) ++ size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt"); ++ } ++ + s = *ret = bfd_malloc (size); + if (s == NULL) + goto free_contents_and_exit; + +- names = (char *) (s + count); ++ names = (char *) (s + count + plt_count + (resolv_vma != 0)); + + for (i = secsymend; i < opdsymend; ++i) + { +@@ -3048,6 +3137,66 @@ ppc64_elf_get_synthetic_symtab (bfd *abf + } + } + free (contents); ++ ++ if (glink != NULL && relplt != NULL) ++ { ++ if (resolv_vma) ++ { ++ /* Add a symbol for the main glink trampoline. */ ++ memset (s, 0, sizeof *s); ++ s->the_bfd = abfd; ++ s->flags = BSF_GLOBAL; ++ s->section = glink; ++ s->value = resolv_vma - glink->vma; ++ s->name = names; ++ memcpy (names, "__glink_PLTresolve", sizeof ("__glink_PLTresolve")); ++ names += sizeof ("__glink_PLTresolve"); ++ s++; ++ count++; ++ } ++ ++ /* FIXME: It would be very much nicer to put sym at plt on the ++ stub rather than on the glink branch table entry. The ++ objdump disassembler would then use a sensible symbol ++ name on plt calls. The difficulty in doing so is ++ a) finding the stubs, and, ++ b) matching stubs against plt entries, and, ++ c) there can be multiple stubs for a given plt entry. ++ ++ Solving (a) could be done by code scanning, but older ++ ppc64 binaries used different stubs to current code. ++ (b) is the tricky one since you need to known the toc ++ pointer for at least one function that uses a pic stub to ++ be able to calculate the plt address referenced. ++ (c) means gdb would need to set multiple breakpoints (or ++ find the glink branch itself) when setting breakpoints ++ for pending shared library loads. */ ++ p = relplt->relocation; ++ for (i = 0; i < plt_count; i++, p++) ++ { ++ size_t len; ++ ++ *s = **p->sym_ptr_ptr; ++ /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set. Since ++ we are defining a symbol, ensure one of them is set. */ ++ if ((s->flags & BSF_LOCAL) == 0) ++ s->flags |= BSF_GLOBAL; ++ s->section = glink; ++ s->value = glink_vma - glink->vma; ++ s->name = names; ++ s->udata.p = NULL; ++ len = strlen ((*p->sym_ptr_ptr)->name); ++ memcpy (names, (*p->sym_ptr_ptr)->name, len); ++ names += len; ++ memcpy (names, "@plt", sizeof ("@plt")); ++ names += sizeof ("@plt"); ++ s++; ++ glink_vma += 8; ++ if (i >= 0x8000) ++ glink_vma += 4; ++ } ++ count += plt_count; ++ } + } + + done: +@@ -9705,7 +9854,8 @@ ppc64_elf_build_stubs (bfd_boolean emit_ + if (htab->emit_stub_syms) + { + struct elf_link_hash_entry *h; +- h = elf_link_hash_lookup (&htab->elf, "__glink", TRUE, FALSE, FALSE); ++ h = elf_link_hash_lookup (&htab->elf, "__glink_PLTresolve", ++ TRUE, FALSE, FALSE); + if (h == NULL) + return FALSE; + if (h->root.type == bfd_link_hash_new) +--- ./gdb/elfread.c 2008-07-24 15:41:07.000000000 +0200 ++++ ./gdb/elfread.c 2008-07-24 15:42:48.000000000 +0200 +@@ -514,6 +514,34 @@ elf_symtab_read (struct objfile *objfile + if (msym != NULL) + msym->filename = filesymname; + gdbarch_elf_make_msymbol_special (current_gdbarch, sym, msym); ++ ++ /* For @plt symbols, also record a trampoline to the ++ destination symbol. The @plt symbol will be used in ++ disassembly, and the trampoline will be used when we are ++ trying to find the target. */ ++ if (msym && ms_type == mst_text && type == ST_SYNTHETIC) ++ { ++ int len = strlen (sym->name); ++ ++ if (len > 4 && strcmp (sym->name + len - 4, "@plt") == 0) ++ { ++ char *base_name = alloca (len - 4 + 1); ++ struct minimal_symbol *mtramp; ++ ++ memcpy (base_name, sym->name, len - 4); ++ base_name[len - 4] = '\0'; ++ mtramp = record_minimal_symbol (base_name, symaddr, ++ mst_solib_trampoline, ++ sym->section, objfile); ++ if (mtramp) ++ { ++ MSYMBOL_SIZE (mtramp) = MSYMBOL_SIZE (msym); ++ mtramp->filename = filesymname; ++ gdbarch_elf_make_msymbol_special (current_gdbarch, sym, ++ mtramp); ++ } ++ } ++ } + } + } + } +--- ./gdb/minsyms.c 2008-07-24 15:41:07.000000000 +0200 ++++ ./gdb/minsyms.c 2008-07-24 15:42:48.000000000 +0200 +@@ -357,10 +357,15 @@ lookup_minimal_symbol_solib_trampoline ( + ALL the minimal symbol tables before deciding on the symbol that + comes closest to the specified PC. This is because objfiles can + overlap, for example objfile A has .text at 0x100 and .data at +- 0x40000 and objfile B has .text at 0x234 and .data at 0x40048. */ ++ 0x40000 and objfile B has .text at 0x234 and .data at 0x40048. + +-struct minimal_symbol * +-lookup_minimal_symbol_by_pc_section (CORE_ADDR pc, asection *section) ++ If WANT_TRAMPOLINE is set, prefer mst_solib_trampoline symbols when ++ there are text and trampoline symbols at the same address. ++ Otherwise prefer mst_text symbols. */ ++ ++static struct minimal_symbol * ++lookup_minimal_symbol_by_pc_section_1 (CORE_ADDR pc, asection *section, ++ int want_trampoline) + { + int lo; + int hi; +@@ -369,7 +374,11 @@ lookup_minimal_symbol_by_pc_section (COR + struct minimal_symbol *msymbol; + struct minimal_symbol *best_symbol = NULL; + struct obj_section *pc_section; ++ enum minimal_symbol_type want_type, other_type; + ++ want_type = want_trampoline ? mst_solib_trampoline : mst_text; ++ other_type = want_trampoline ? mst_text : mst_solib_trampoline; ++ + /* PC has to be in a known section. This ensures that anything + beyond the end of the last segment doesn't appear to be part of + the last function in the last segment. */ +@@ -491,6 +500,24 @@ lookup_minimal_symbol_by_pc_section (COR + continue; + } + ++ /* If we are looking for a trampoline and this is a ++ text symbol, or the other way around, check the ++ preceeding symbol too. If they are otherwise ++ identical prefer that one. */ ++ if (hi > 0 ++ && MSYMBOL_TYPE (&msymbol[hi]) == other_type ++ && MSYMBOL_TYPE (&msymbol[hi - 1]) == want_type ++ && (MSYMBOL_SIZE (&msymbol[hi]) ++ == MSYMBOL_SIZE (&msymbol[hi - 1])) ++ && (SYMBOL_VALUE_ADDRESS (&msymbol[hi]) ++ == SYMBOL_VALUE_ADDRESS (&msymbol[hi - 1])) ++ && (SYMBOL_BFD_SECTION (&msymbol[hi]) ++ == SYMBOL_BFD_SECTION (&msymbol[hi - 1]))) ++ { ++ hi--; ++ continue; ++ } ++ + /* If the minimal symbol has a zero size, save it + but keep scanning backwards looking for one with + a non-zero size. A zero size may mean that the +@@ -571,6 +598,12 @@ lookup_minimal_symbol_by_pc_section (COR + return (best_symbol); + } + ++struct minimal_symbol * ++lookup_minimal_symbol_by_pc_section (CORE_ADDR pc, asection *section) ++{ ++ return lookup_minimal_symbol_by_pc_section_1 (pc, section, 0); ++} ++ + /* Backward compatibility: search through the minimal symbol table + for a matching PC (no section given) */ + +@@ -1024,7 +1057,13 @@ msymbols_sort (struct objfile *objfile) + struct minimal_symbol * + lookup_solib_trampoline_symbol_by_pc (CORE_ADDR pc) + { +- struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (pc); ++ struct obj_section *section = find_pc_section (pc); ++ struct minimal_symbol *msymbol; ++ ++ if (section == NULL) ++ return NULL; ++ msymbol = lookup_minimal_symbol_by_pc_section_1 (pc, section->the_bfd_section, ++ 1); + + if (msymbol != NULL && MSYMBOL_TYPE (msymbol) == mst_solib_trampoline) + return msymbol; +--- ./gdb/ppc-linux-tdep.c 2008-02-20 15:31:40.000000000 +0100 ++++ ./gdb/ppc-linux-tdep.c 2008-07-24 15:43:24.000000000 +0200 +@@ -545,7 +545,7 @@ ppc64_skip_trampoline_code (struct frame + } + + +-/* Support for convert_from_func_ptr_addr (ARCH, ADDR, TARG) on PPC ++/* Support for convert_from_func_ptr_addr (ARCH, ADDR, TARG) on PPC64 + GNU/Linux. + + Usually a function pointer's representation is simply the address +@@ -557,12 +557,6 @@ ppc64_skip_trampoline_code (struct frame + function, the second word is the TOC pointer (r2), and the third word + is the static chain value. + +- For PPC32, there are two kinds of function pointers: non-secure and +- secure. Non-secure function pointers point directly to the +- function in a code section and thus need no translation. Secure +- ones (from GCC's -msecure-plt option) are in a data section and +- contain one word: the address of the function. +- + Throughout GDB it is currently assumed that a function pointer contains + the address of the function, which is not easy to fix. In addition, the + conversion of a function address to a function pointer would +@@ -578,40 +572,15 @@ ppc64_skip_trampoline_code (struct frame + random addresses such as occur when there is no symbol table. */ + + static CORE_ADDR +-ppc_linux_convert_from_func_ptr_addr (struct gdbarch *gdbarch, +- CORE_ADDR addr, +- struct target_ops *targ) ++ppc64_linux_convert_from_func_ptr_addr (struct gdbarch *gdbarch, ++ CORE_ADDR addr, ++ struct target_ops *targ) + { +- struct gdbarch_tdep *tdep; + struct section_table *s = target_section_by_addr (targ, addr); +- char *sect_name = NULL; +- +- if (!s) +- return addr; +- +- tdep = gdbarch_tdep (gdbarch); +- +- switch (tdep->wordsize) +- { +- case 4: +- sect_name = ".plt"; +- break; +- case 8: +- sect_name = ".opd"; +- break; +- default: +- internal_error (__FILE__, __LINE__, +- _("failed internal consistency check")); +- } + + /* Check if ADDR points to a function descriptor. */ +- +- /* NOTE: this depends on the coincidence that the address of a functions +- entry point is contained in the first word of its function descriptor +- for both PPC-64 and for PPC-32 with secure PLTs. */ +- if ((strcmp (s->the_bfd_section->name, sect_name) == 0) +- && s->the_bfd_section->flags & SEC_DATA) +- return get_target_memory_unsigned (targ, addr, tdep->wordsize); ++ if (s && strcmp (s->the_bfd_section->name, ".opd") == 0) ++ return get_target_memory_unsigned (targ, addr, 8); + + return addr; + } +@@ -905,11 +874,6 @@ ppc_linux_init_abi (struct gdbarch_info + set_gdbarch_long_double_bit (gdbarch, 16 * TARGET_CHAR_BIT); + set_gdbarch_long_double_format (gdbarch, floatformats_ibm_long_double); + +- /* Handle PPC GNU/Linux 64-bit function pointers (which are really +- function descriptors) and 32-bit secure PLT entries. */ +- set_gdbarch_convert_from_func_ptr_addr +- (gdbarch, ppc_linux_convert_from_func_ptr_addr); +- + if (tdep->wordsize == 4) + { + /* Until November 2001, gcc did not comply with the 32 bit SysV +@@ -937,6 +901,11 @@ ppc_linux_init_abi (struct gdbarch_info + + if (tdep->wordsize == 8) + { ++ /* Handle PPC GNU/Linux 64-bit function pointers (which are really ++ function descriptors). */ ++ set_gdbarch_convert_from_func_ptr_addr ++ (gdbarch, ppc64_linux_convert_from_func_ptr_addr); ++ + /* Shared library handling. */ + set_gdbarch_skip_trampoline_code (gdbarch, ppc64_skip_trampoline_code); + set_solib_svr4_fetch_link_map_offsets Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/F-9/gdb.spec,v retrieving revision 1.288 retrieving revision 1.289 diff -u -r1.288 -r1.289 --- gdb.spec 24 Jul 2008 06:34:23 -0000 1.288 +++ gdb.spec 25 Jul 2008 11:54:22 -0000 1.289 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 12%{?_with_upstream:.upstream}%{?dist} +Release: 13%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -631,8 +631,6 @@ cd gdb gcc -o ./orphanripper %{SOURCE2} -Wall -lutil # Need to use a single --ignore option, second use overrides first. -# "chng-syms.exp" for possibly avoiding Linux kernel crash - Bug 207002. -# "threadcrash.exp" is incompatible on ia64 with old kernels. # No `%{?_smp_mflags}' here as it may race. # WARNING: can't generate a core file - core tests suppressed - check ulimit # "readline-overflow.exp" - Testcase is broken, functionality is OK. @@ -642,23 +640,31 @@ ulimit -c unlimited || : # Setup $CHECK as `check//unix/' or `check//unix/-m64' for explicit bitsize. - # Simple `check' is not used for $CHECK as different escaping rules apply - # for the --ignore list delimiting spaces. + # Never use two different bitsizes as it fails on ppc64. echo 'int main (void) { return 0; }' >biarch.c - gcc $RPM_OPT_FLAGS -o biarch biarch.c - mv -f biarch biarch-native - # Do not try -m64 for biarch as GDB cannot handle inferior larger than itself. - for BI in -m32 -m31 "" + CHECK="" + for BI in -m64 -m32 -m31 "" do - if gcc 2>/dev/null $RPM_OPT_FLAGS $BI -o biarch biarch.c + # Do not use size-less options if any of the sizes works. + if [ -z "$BI" -a -n "$CHECK" ];then + continue + fi + # Do not use $RPM_OPT_FLAGS as the other non-size options will not be used + # in the real run of the testsuite. + if ! gcc $BI -o biarch biarch.c then - break + continue fi + CHECK="$CHECK check//unix/$BI" done - CHECK="check`echo " $RPM_OPT_FLAGS "|sed -n 's#^.* \(-m[36][241]\) .*$#//unix/\1#p'`" - if ! cmp -s biarch-native biarch + # Do not try -m64 inferiors for -m32 GDB as it cannot handle inferiors larger + # than itself. + # s390 -m31 still uses the standard ELF32 binary format. + gcc $RPM_OPT_FLAGS -o biarch biarch.c + RPM_SIZE="$(file ./biarch|sed -n 's/^.*: ELF \(32\|64\)-bit .*$/\1/p')" + if [ "$RPM_SIZE" != "64" ] then - CHECK="$CHECK check//unix/$BI" + CHECK="$(echo " $CHECK "|sed 's# check//unix/-m64 # #')" fi # Disable some problematic testcases. @@ -666,10 +672,7 @@ # `check//...' target spawn and too much escaping there would be dense. for test in \ gdb.base/readline-overflow.exp \ - gdb.base/chng-syms.exp \ - gdb.base/checkpoint.exp \ gdb.base/bigcore.exp \ - gdb.threads/threadcrash.exp \ ; do mv -f ../../gdb/testsuite/$test ../gdb/testsuite/$test-DISABLED || : done @@ -785,6 +788,11 @@ %endif %changelog +* Fri Jul 25 2008 Jan Kratochvil - 6.8-13 +- Fix powerpc recent secure PLTs handling (shared library calls) (BZ 452960). +- Fix the testsuite .spec runner to run biarch also on ppc. +- Reenable testcases threadcrash.exp, chng-syms.exp, checkpoint.exp (BZ 207002). + * Thu Jul 24 2008 Jan Kratochvil - 6.8-12 - Temporarily disable attaching to a stopped process (BZ 453688) - To be reintroduced after a fix of the kernel BZ 454404. From fedora-extras-commits at redhat.com Fri Jul 25 12:18:04 2008 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 25 Jul 2008 12:18:04 GMT Subject: rpms/mod_auth_ntlm_winbind/F-8 mod_auth_ntlm_winbind.spec,1.4,1.5 Message-ID: <200807251218.m6PCI4kJ001362@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/mod_auth_ntlm_winbind/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1299 Modified Files: mod_auth_ntlm_winbind.spec Log Message: Index: mod_auth_ntlm_winbind.spec =================================================================== RCS file: /cvs/extras/rpms/mod_auth_ntlm_winbind/F-8/mod_auth_ntlm_winbind.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_auth_ntlm_winbind.spec 29 Aug 2007 18:36:33 -0000 1.4 +++ mod_auth_ntlm_winbind.spec 25 Jul 2008 12:17:34 -0000 1.5 @@ -4,7 +4,7 @@ Summary: NTLM authentication for the Apache web server using winbind daemon Name: mod_auth_ntlm_winbind Version: 0.0.0 -Release: 0.6.%{svn}%{?dist} +Release: 0.7.%{svn}%{?dist} Group: System Environment/Daemons License: ASL 2.0 URL: http://viewcvs.samba.org/cgi-bin/viewcvs.cgi/trunk/mod_auth_ntlm_winbind/?root=lorikeet @@ -83,6 +83,9 @@ %changelog +* Fri Jul 25 2008 Dmitry Butskoy 0.0.0-0.7.20070129svn713 +- rebuild to avoid segfaults + * Wed Aug 29 2007 Fedora Release Engineering - 0.0.0-0.6.20070129svn713 - Rebuild for selinux ppc32 issue. From fedora-extras-commits at redhat.com Fri Jul 25 12:18:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:18:37 +0000 Subject: [pkgdb] wireshark: steved has requested approveacls Message-ID: <20080725121837.494F21AD0E9@bastion.fedora.phx.redhat.com> Steve Dickson (steved) has requested the approveacls acl on wireshark (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 12:18:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:18:32 +0000 Subject: [pkgdb] wireshark: steved has requested commit Message-ID: <20080725121832.5FE101AD0E5@bastion.fedora.phx.redhat.com> Steve Dickson (steved) has requested the commit acl on wireshark (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 12:18:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:18:56 +0000 Subject: [pkgdb] wireshark: steved has requested commit Message-ID: <20080725121902.74E031AD0E7@bastion.fedora.phx.redhat.com> Steve Dickson (steved) has requested the commit acl on wireshark (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 12:18:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:18:59 +0000 Subject: [pkgdb] wireshark: steved has requested approveacls Message-ID: <20080725121903.2AC0A1AD0EC@bastion.fedora.phx.redhat.com> Steve Dickson (steved) has requested the approveacls acl on wireshark (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 12:22:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:22:15 +0000 Subject: [pkgdb] wireshark had acl change status Message-ID: <20080725122215.59C411AD0E0@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on wireshark (Fedora devel) to Approved for Steve Dickson (steved) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 12:22:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:22:23 +0000 Subject: [pkgdb] wireshark had acl change status Message-ID: <20080725122224.1EEEF1AD0EC@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the commit acl on wireshark (Fedora 9) to Approved for Steve Dickson (steved) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 12:22:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:22:44 +0000 Subject: [pkgdb] wireshark had acl change status Message-ID: <20080725122244.6951C1AD0E5@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the approveacls acl on wireshark (Fedora devel) to Obsolete for Steve Dickson (steved) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 12:22:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 12:22:48 +0000 Subject: [pkgdb] wireshark had acl change status Message-ID: <20080725122254.0ED791AD0E9@bastion.fedora.phx.redhat.com> Radek Vok?l (rvokal) has set the approveacls acl on wireshark (Fedora devel) to Approved for Steve Dickson (steved) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From fedora-extras-commits at redhat.com Fri Jul 25 13:21:36 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Fri, 25 Jul 2008 13:21:36 GMT Subject: rpms/wireshark/devel wireshark-nfsv4-opts.patch, 1.1, 1.2 wireshark.spec, 1.39, 1.40 Message-ID: <200807251321.m6PDLaWX011085@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/wireshark/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10995 Modified Files: wireshark-nfsv4-opts.patch wireshark.spec Log Message: Removed the fuzzines from wireshark-nfsv4-opts.patch wireshark-nfsv4-opts.patch: Index: wireshark-nfsv4-opts.patch =================================================================== RCS file: /cvs/pkgs/rpms/wireshark/devel/wireshark-nfsv4-opts.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wireshark-nfsv4-opts.patch 15 Jun 2006 13:27:16 -0000 1.1 +++ wireshark-nfsv4-opts.patch 25 Jul 2008 13:21:06 -0000 1.2 @@ -1,17 +1,18 @@ ---- ethereal-0.10.14/epan/dissectors/packet-nfs.c.orig 2005-12-26 21:21:11.000000000 -0500 -+++ ethereal-0.10.14/epan/dissectors/packet-nfs.c 2006-01-02 13:57:05.000000000 -0500 -@@ -7040,6 +7040,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of - - if (ftree == NULL) return offset; +diff -up wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig wireshark-1.0.2/epan/dissectors/packet-nfs.c +--- wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig 2008-07-10 13:39:23.000000000 -0400 ++++ wireshark-1.0.2/epan/dissectors/packet-nfs.c 2008-07-25 07:59:45.000000000 -0400 +@@ -7962,6 +7962,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of + ftree = proto_item_add_subtree(fitem, ett_nfs_argop4); + } + proto_item_append_text(tree, ", Ops(%d):", ops); + for (ops_counter=0; ops_countercinfo, COL_INFO)) { @@ -25,16 +26,16 @@ switch(opcode) { case NFS4_OP_ACCESS: -@@ -7391,6 +7402,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of - - if (ftree == NULL) return offset; /* error adding new subtree */ +@@ -8420,6 +8431,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of + ftree = proto_item_add_subtree(fitem, ett_nfs_resop4); + } + proto_item_append_text(tree, ", Ops(%d):", ops); + for (ops_counter = 0; ops_counter < ops; ops_counter++) { opcode = tvb_get_ntohl(tvb, offset); -@@ -7418,6 +7431,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of +@@ -8451,6 +8464,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status); @@ -52,7 +53,7 @@ /* * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and * NFS4_OP_SETATTR, all other ops do *not* return data with the -@@ -7662,7 +7686,7 @@ static const value_string nfsv3_proc_val +@@ -8770,7 +8794,7 @@ static const value_string nfsv3_proc_val static const vsff nfs4_proc[] = { { 0, "NULL", dissect_nfs3_null_call, dissect_nfs3_null_reply }, Index: wireshark.spec =================================================================== RCS file: /cvs/pkgs/rpms/wireshark/devel/wireshark.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- wireshark.spec 18 Jul 2008 12:42:56 -0000 1.39 +++ wireshark.spec 25 Jul 2008 13:21:06 -0000 1.40 @@ -18,12 +18,12 @@ Source2: wireshark.console Source3: wireshark.desktop Patch1: wireshark-1.0.2-pie.patch -Patch3: wireshark-nfsv4-opts.patch -Patch4: wireshark-0.99.7-path.patch -Patch5: wireshark-nfsv41.patch -Patch6: wireshark-nfsv41-layout-types.patch -Patch7: wireshark-nfsv41-layout-updates.patch -Patch8: wireshark-rpc-pdu-size.patch +Patch2: wireshark-nfsv4-opts.patch +Patch3: wireshark-0.99.7-path.patch +Patch4: wireshark-nfsv41.patch +Patch5: wireshark-nfsv41-layout-types.patch +Patch6: wireshark-nfsv41-layout-updates.patch +Patch7: wireshark-rpc-pdu-size.patch Url: http://www.wireshark.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,12 +79,12 @@ %setup -q -n %{name}-%{version} %endif %patch1 -p1 -b .pie -%patch3 -p1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %build %ifarch s390 s390x sparcv9 sparc64 @@ -210,7 +210,7 @@ %changelog -* Thu Jul 17 2008 Steve Dickson +* Thu Jul 17 2008 Steve Dickson 1.0.2-2 - Added patches to support NFSv4.1 * Fri Jul 11 2008 Radek Vok??l 1.0.2-1 From fedora-extras-commits at redhat.com Fri Jul 25 13:21:55 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 25 Jul 2008 13:21:55 GMT Subject: rpms/eclipse/devel eclipse-buildswtnatives.patch, NONE, 1.1 eclipse.spec, 1.563, 1.564 eclipse-compilelibs-64bit.patch, 1.1, NONE eclipse-compilelibs.patch, 1.2, NONE Message-ID: <200807251321.m6PDLt4O011098@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11053 Modified Files: eclipse.spec Added Files: eclipse-buildswtnatives.patch Removed Files: eclipse-compilelibs-64bit.patch eclipse-compilelibs.patch Log Message: * Fri Jul 25 2008 Andrew Overholt 3.4.0-9 - Collapse patches to build SWT native bits into two - Copy about* from x86 to all non-x86{_64} platforms eclipse-buildswtnatives.patch: --- NEW FILE eclipse-buildswtnatives.patch --- diff -up ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml --- ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400 +++ ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml 2008-07-25 09:08:15.000000000 -0400 @@ -272,6 +272,11 @@ + + + + + @@ -293,6 +298,7 @@ + diff -up ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml --- ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400 +++ ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml 2008-07-25 09:07:58.000000000 -0400 @@ -141,6 +141,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -346,4 +368,4 @@ - \ No newline at end of file + diff -up ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml --- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400 +++ ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml 2008-07-25 09:07:58.000000000 -0400 @@ -272,6 +272,11 @@ + + + + + @@ -294,6 +299,7 @@ + diff -up ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml --- ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400 +++ ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2008-07-25 09:07:58.000000000 -0400 @@ -271,6 +271,11 @@ + + + + + diff -up ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml --- ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.buildswt 2008-07-25 09:07:55.000000000 -0400 +++ ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml 2008-07-25 09:07:58.000000000 -0400 @@ -149,13 +149,14 @@ + - + Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.563 retrieving revision 1.564 diff -u -r1.563 -r1.564 --- eclipse.spec 24 Jul 2008 20:35:04 -0000 1.563 +++ eclipse.spec 25 Jul 2008 13:21:25 -0000 1.564 @@ -24,7 +24,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 8%{?dist} +Release: 9%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -75,9 +75,14 @@ # tar cjf eclipse-ecj-gcj.tar.bz2 eclipse-gcj Source29: %{name}-ecj-gcj.tar.bz2 -# Build swttools.jar +# Build swttools.jar before generation on 64-bit platforms. +# Build SWT native libraries # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 -Patch4: %{name}-swttools.patch +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908 +# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593 +Patch4: %{name}-buildswtnatives.patch +Patch32: %{name}-compilelibs.patch + # This does two things: # 1. allows the launcher to be in /usr/bin and # 2. ensures that the OSGi configuration directory @@ -107,12 +112,6 @@ Patch31: %{name}-ia64-packaging.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908 -# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593 -Patch32: %{name}-compilelibs.patch -# 64-bit systems need to generate the 64-bit JNI code first -Patch38: %{name}-compilelibs-64bit.patch - # FIXME: file these upstream # Upstream builds with a 1.4 (or lower) class library Patch33: %{name}-pdeapicasting.patch @@ -303,16 +302,10 @@ %prep %setup -q -c -%patch32 -p4 -%ifarch x86_64 ppc64 sparc64 ia64 s390x -%patch38 -%endif - sed --in-place "s/java5.home/java.home/" build.xml -# Build swttools.jar -pushd plugins/org.eclipse.swt.gtk.linux.x86_64 +# Build swttools.jar and native libraries %patch4 -p0 -popd +%patch32 -p0 # Use ECJ for GCJ's bytecode compiler tar jxf %{SOURCE29} @@ -420,8 +413,10 @@ # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace # the s390x strings with ppc64, etc. -%ifarch ppc64 sparc sparcv9 sparc64 alpha +%ifnarch %{ix86} x86_64 cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}} +%endif +%ifarch ppc64 sparc sparcv9 sparc64 alpha for f in $(find -name \*s390x\*); do tofile=$(echo $f | sed "s/s390x/%{_arch}/") cp -rp $f $tofile @@ -1137,9 +1132,7 @@ #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html -%ifarch %{ix86} x86_64 %{_libdir}/%{name}/about.html -%endif %ifarch x86_64 %{_libdir}/%{name}/about_files %endif @@ -1380,6 +1373,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* %changelog +* Fri Jul 25 2008 Andrew Overholt 3.4.0-9 +- Collapse patches to build SWT native bits into two +- Copy about* from x86 to all non-x86{_64} platforms + * Wed Jul 23 2008 Andrew Overholt 3.4.0-8 - Don't build for arch/ws/os combos other than the one on which we're building --- eclipse-compilelibs-64bit.patch DELETED --- --- eclipse-compilelibs.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 13:22:31 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 25 Jul 2008 13:22:31 GMT Subject: rpms/eclipse/devel eclipse-compilelibs.patch,1.3,1.4 Message-ID: <200807251322.m6PDMVFj011208@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117 Added Files: eclipse-compilelibs.patch Log Message: Re-add mistakenly-removed eclipse-compilelibs.patch eclipse-compilelibs.patch: Index: eclipse-compilelibs.patch =================================================================== RCS file: eclipse-compilelibs.patch diff -N eclipse-compilelibs.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse-compilelibs.patch 25 Jul 2008 13:22:00 -0000 1.4 @@ -0,0 +1,45 @@ +--- build.xml.compilelibs 2008-07-25 09:15:34.000000000 -0400 ++++ build.xml 2008-07-25 09:15:40.000000000 -0400 +@@ -1,7 +1,7 @@ + + + +- ++ + + + +@@ -71,6 +71,33 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + From fedora-extras-commits at redhat.com Fri Jul 25 13:46:50 2008 From: fedora-extras-commits at redhat.com (James Bowes (jbowes)) Date: Fri, 25 Jul 2008 13:46:50 GMT Subject: rpms/ipython/EL-5 ipython.spec,1.13,1.14 sources,1.9,1.10 Message-ID: <200807251346.m6PDkoMV012621@cvs-int.fedora.redhat.com> Author: jbowes Update of /cvs/extras/rpms/ipython/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12562 Modified Files: ipython.spec sources Log Message: 0.8.4 for el 5 Index: ipython.spec =================================================================== RCS file: /cvs/extras/rpms/ipython/EL-5/ipython.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ipython.spec 16 Sep 2006 18:32:11 -0000 1.13 +++ ipython.spec 25 Jul 2008 13:46:20 -0000 1.14 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: ipython -Version: 0.7.2 -Release: 3%{?dist} +Version: 0.8.4 +Release: 1%{?dist} Summary: An enhanced interactive Python shell Group: Development/Libraries @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: python-devel -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + %description @@ -48,7 +48,6 @@ rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT @@ -56,23 +55,33 @@ %files %defattr(-,root,root,-) # ipython installs its own documentation, but we need to own the directory -%{_datadir}/doc/%{name}-%{version}/ +%{_datadir}/doc/%{name} %{_mandir}/man*/* %{_bindir}/ipython %{_bindir}/irunner %{_bindir}/pycolor -%dir %{python_sitelib}/IPython -%{python_sitelib}/IPython/*.py -%dir %{python_sitelib}/IPython/Extensions/ -%{python_sitelib}/IPython/Extensions/*.py -%{python_sitelib}/IPython/*.pyc -%{python_sitelib}/IPython/Extensions/*.pyc -%dir %{python_sitelib}/IPython/UserConfig/ -%{python_sitelib}/IPython/UserConfig/* -%{python_sitelib}/IPython/*.pyo -%{python_sitelib}/IPython/Extensions/*.pyo +%{python_sitelib}/* + %changelog +* Wed Jun 11 2008 James Bowes 0.8.4-1 +- Update to 0.8.4 + +* Fri May 30 2008 James Bowes 0.8.3-1 +- Update to 0.8.3 + +* Wed Dec 12 2007 James Bowes - 0.8.2-1 +- Update to 0.8.2 + +* Sun Aug 05 2007 James Bowes - 0.8.1-2 +- Remove explicit requires on python-abi. + +* Sun Aug 05 2007 James Bowes - 0.8.1-1 +- Update to 0.8.1 + +* Thu Dec 14 2006 Jason L Tibbitts III - 0.7.2-4 +- Rebuild for new Python + * Sat Sep 16 2006 Shahms E. King 0.7.2-3 - Rebuild for FC6 @@ -112,7 +121,7 @@ - Removed unused python_sitearch define * Tue Mar 01 2005 Shahms E. King 0.6.11-2 -- Fix up %doc file specifications +- Fix up %%doc file specifications - Use offical .tar.gz, not upstream .src.rpm .tar.gz * Tue Mar 01 2005 Shahms E. King 0.6.11-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ipython/EL-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Jun 2006 17:53:10 -0000 1.9 +++ sources 25 Jul 2008 13:46:20 -0000 1.10 @@ -1 +1 @@ -3565efcf87c7318c1a3930e278ac9fa5 ipython-0.7.2.tar.gz +9b8b439d295defa694b9fbf799203680 ipython-0.8.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 13:56:24 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 13:56:24 GMT Subject: rpms/kdebase-runtime/F-9 .cvsignore, 1.13, 1.14 kdebase-runtime.spec, 1.48, 1.49 sources, 1.13, 1.14 Message-ID: <200807251356.m6PDuOYa013462@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13376/F-9 Modified Files: .cvsignore kdebase-runtime.spec sources Log Message: Sync from devel: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 19 Jul 2008 18:02:03 -0000 1.13 +++ .cvsignore 25 Jul 2008 13:55:54 -0000 1.14 @@ -1 +1,2 @@ kdebase-runtime-4.0.99.tar.bz2 +kdebase-runtime-4.1.0.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- kdebase-runtime.spec 24 Jul 2008 13:52:58 -0000 1.48 +++ kdebase-runtime.spec 25 Jul 2008 13:55:54 -0000 1.49 @@ -1,4 +1,3 @@ - %if 0%{?fedora} < 9 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here %define kde3_desktop 1 @@ -8,8 +7,8 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.0.99 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -334,6 +333,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Wed Jul 23 2008 Rex Dieter 4.0.99-2 - phonon-backend-xine: drop Obsoletes/Requires upgrade hack Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 19 Jul 2008 18:02:03 -0000 1.13 +++ sources 25 Jul 2008 13:55:54 -0000 1.14 @@ -1 +1 @@ -265fa06347c83c8b9c6bc1d1259e83f2 kdebase-runtime-4.0.99.tar.bz2 +a19999207ad37131a2888b6e32160008 kdebase-runtime-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 13:58:17 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 13:58:17 GMT Subject: rpms/kdebase-runtime/F-8 kdebase-runtime-4.0.72-pulseaudio.patch, NONE, 1.1 kdebase-runtime-4.1.x-searchproviders-shortcuts.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kdebase-runtime.spec, 1.12, 1.13 sources, 1.9, 1.10 kdebase-runtime-4.0.3-deinterlace-crash.patch, 1.1, NONE kdebase-runtime-4.0.3-khelpcenter.patch, 1.1, NONE kdebase-runtime-4.0.3-pulseaudio.patch, 1.1, NONE Message-ID: <200807251358.m6PDwHhe013685@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13607/F-8 Modified Files: .cvsignore kdebase-runtime.spec sources Added Files: kdebase-runtime-4.0.72-pulseaudio.patch kdebase-runtime-4.1.x-searchproviders-shortcuts.patch Removed Files: kdebase-runtime-4.0.3-deinterlace-crash.patch kdebase-runtime-4.0.3-khelpcenter.patch kdebase-runtime-4.0.3-pulseaudio.patch Log Message: Sync kdebase-runtime 4.1.0 from devel. kdebase-runtime-4.0.72-pulseaudio.patch: --- NEW FILE kdebase-runtime-4.0.72-pulseaudio.patch --- diff -ur kdebase-runtime-4.0.72/phonon/xine/xineengine.cpp kdebase-runtime-4.0.72-pulseaudio/phonon/xine/xineengine.cpp --- kdebase-runtime-4.0.72/phonon/xine/xineengine.cpp 2008-04-23 17:51:26.000000000 +0200 +++ kdebase-runtime-4.0.72-pulseaudio/phonon/xine/xineengine.cpp 2008-05-06 17:28:52.000000000 +0200 @@ -371,9 +371,9 @@ "in KDE2 and KDE3. Its use is discouraged.

"), /*icon name */"audio-backend-arts", outputPlugins[i]); } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) { - addAudioOutput(nextIndex++, 10, i18n("PulseAudio"), + addAudioOutput(nextIndex++, 2000, i18n("PulseAudio"), xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]), - /*icon name */"audio-backend-pulseaudio", outputPlugins[i], true /*isAdvanced*/); + /*icon name */"audio-backend-pulseaudio", outputPlugins[i]); } else if (0 == strcmp(outputPlugins[i], "esd")) { addAudioOutput(nextIndex++, 8, i18n("Esound (ESD)"), xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]), kdebase-runtime-4.1.x-searchproviders-shortcuts.patch: --- NEW FILE kdebase-runtime-4.1.x-searchproviders-shortcuts.patch --- diff -up kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop.orig kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop --- kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop.orig 2008-06-05 13:19:46.000000000 +0200 +++ kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop 2008-06-05 13:21:39.000000000 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +Hidden=false +Type=Service +Name=Red Hat bug tracking system +ServiceTypes=SearchProvider +Keys=rhbug,bz +Query=http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=\\1 diff -up kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop.orig kdebase-runtime-4.0.5/kurifilter-plugins/ikws/searchproviders/fedora.desktop --- kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop.orig 2008-06-05 13:20:19.000000000 +0200 +++ kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop 2008-06-05 13:20:47.000000000 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +Hidden=false +Keys=fp,fedora +Name=fedoraproject +Query=http://fedoraproject.org/wiki/?action=fullsearch&context=180&value=\\{@}&titlesearch=Titles +ServiceTypes=SearchProvider +Type=Service Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 4 Jun 2008 19:18:58 -0000 1.9 +++ .cvsignore 25 Jul 2008 13:57:47 -0000 1.10 @@ -1,2 +1,2 @@ -kdebase-runtime-4.0.4.tar.bz2 -kdebase-runtime-4.0.5.tar.bz2 +kdebase-runtime-4.0.99.tar.bz2 +kdebase-runtime-4.1.0.tar.bz2 Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/kdebase-runtime.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kdebase-runtime.spec 4 Jun 2008 19:18:58 -0000 1.12 +++ kdebase-runtime.spec 25 Jul 2008 13:57:47 -0000 1.13 @@ -1,4 +1,3 @@ - %if 0%{?fedora} < 9 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here %define kde3_desktop 1 @@ -8,18 +7,17 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime -Version: 4.0.5 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 Group: User Interface/Desktops URL: http://www.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2 Source1: khelpcenter.desktop -Patch1: kdebase-runtime-4.0.3-pulseaudio.patch -Patch2: kdebase-runtime-4.0.3-khelpcenter.patch +Patch0: kdebase-runtime-4.0.72-pulseaudio.patch +Patch1: kdebase-runtime-4.1.x-searchproviders-shortcuts.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch noarch %define icons 1 @@ -55,7 +53,7 @@ BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: qimageblitz-devel -BuildRequires: soprano-devel >= 1.97.1 +BuildRequires: soprano-devel >= 2.0.97 BuildRequires: strigi-devel >= 0.5.7 BuildRequires: xine-lib-devel # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support @@ -86,15 +84,20 @@ %description -n oxygen-icon-theme-scalable %{summary}. +%package -n phonon-backend-xine +Summary: Xine phonon backend +Group: Applications/Multimedia +# not sure exactly how best to version this one -- Rex +Provides: phonon-backend = 4.2 +%description -n phonon-backend-xine +%{summary}. + %prep %setup -q -n kdebase-runtime-%{version} -%if 0%{?fedora} > 7 -%patch1 -p1 -b .pulseaudio -%endif -%patch2 -p1 -b .khelpcenter - +%patch0 -p1 -b .pulseaudio +%patch1 -p1 -b .searchproviders-shortcuts %build @@ -117,7 +120,11 @@ %if 0%{?icons} make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen +%if ! 0%{?rest} +ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4 +%endif %else +rm -f %{buildroot}%{_kde4_iconsdir}/default.kde4 rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen %endif @@ -215,6 +222,15 @@ # so we can't use desktop-file-install for it. install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop %endif + +# FIXME: -devel type files, omit for now +rm -rf %{buildroot}%{_kde4_includedir}/phonon/ +rm -f %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so +# /usr/include/kde4/phonon/audiodevice.h +# /usr/include/kde4/phonon/audiodeviceenumerator.h +# /usr/include/kde4/phonon/kaudiodevicelist_export.h +# /usr/lib64/libkaudiodevicelist.so + %endif @@ -256,15 +272,19 @@ %defattr(-,root,root,-) %{_kde4_bindir}/* %{_kde4_appsdir}/* -%{_kde4_configdir}/khotnewstuff.knsrc +%{_kde4_configdir}/*.knsrc +%{_kde4_datadir}/autostart/nepomukserver.desktop %{_kde4_datadir}/config.kcfg/ %{_datadir}/dbus-1/interfaces/* %{_datadir}/dbus-1/services/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_datadir}/sounds/* +%{_kde4_libdir}/kconf_update_bin/* %{_kde4_libdir}/libkdeinit4_*.so +%{_kde4_libdir}/libkaudiodevicelist.so.* %{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/kde4/plugins/phonon_platform/ %{_kde4_libexecdir}/* %{_kde4_libdir}/kde4/plugins/styles/ %{_libdir}/strigi/* @@ -277,18 +297,32 @@ %{_kde4_datadir}/applications/kde4/Help.desktop %{_kde4_datadir}/applications/kde4/knetattach.desktop %{_kde4_configdir}/kshorturifilterrc -%{_kde4_datadir}/desktop-directories/kde-information.directory +%{_kde4_datadir}/desktop-directories/*.directory %{_kde4_datadir}/emoticons/kde4/ %{_kde4_datadir}/locale/en_US/entry.desktop %{_kde4_datadir}/locale/l10n/*.desktop %{_kde4_datadir}/locale/l10n/*/entry.desktop %{_datadir}/services/khelpcenter.desktop %endif + +%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so +%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop +%exclude %{_kde4_libdir}/kde4/phonon_xine.so +%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop + +%files -n phonon-backend-xine +%defattr(-,root,root,-) +%{_kde4_libdir}/kde4/kcm_phononxine.so +%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop +%{_kde4_libdir}/kde4/phonon_xine.so +%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop + %endif %if 0%{?icons} %files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list} %defattr(-,root,root,-) +%{_kde4_iconsdir}/default.kde4 %{_kde4_iconsdir}/oxygen/ %if 0%{?icons_svg} @@ -299,11 +333,52 @@ %changelog -* Mon Jun 02 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Wed Jul 23 2008 Rex Dieter 4.0.99-2 +- phonon-backend-xine: drop Obsoletes/Requires upgrade hack + +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- respin + +* Mon Jul 14 2008 Rex Dieter 4.0.98-3 +- -phonon-backend-xine: new subpkg + +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sat Jun 14 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Thu Jun 05 2008 Than Ngo 4.0.80-2 +- add searchproviders-shortcuts for redhat bugzilla + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta 1 + +* Tue May 06 2008 Kevin Kofler 4.0.72-2 +- BR new minimum version of soprano-devel -* Tue May 06 2008 Rex Dieter - 4.0.4-1 -- kde-4.0.4 +* Tue May 06 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) +- drop upstreamed deinterlace-crash patch +- drop khelpcenter patch (fixed upstream) +- update Phonon PulseAudio patch +- drop Fedora 7 support +- update file list * Mon Apr 28 2008 Rex Dieter 4.0.3-10.1 - omit conflicting icons (kde3_desktop=1 case) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Jun 2008 19:18:58 -0000 1.9 +++ sources 25 Jul 2008 13:57:47 -0000 1.10 @@ -1 +1 @@ -6af10ce1df37ae231387581bd3941071 kdebase-runtime-4.0.5.tar.bz2 +a19999207ad37131a2888b6e32160008 kdebase-runtime-4.1.0.tar.bz2 --- kdebase-runtime-4.0.3-deinterlace-crash.patch DELETED --- --- kdebase-runtime-4.0.3-khelpcenter.patch DELETED --- --- kdebase-runtime-4.0.3-pulseaudio.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 14:02:41 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 14:02:41 GMT Subject: rpms/kdebase-workspace/F-9 .cvsignore, 1.11, 1.12 kdebase-workspace.spec, 1.93, 1.94 sources, 1.13, 1.14 Message-ID: <200807251402.m6PE2fZ6020716@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20624/F-9 Modified Files: .cvsignore kdebase-workspace.spec sources Log Message: Sync from devel: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 * Wed Jul 23 2008 Kevin Kofler 4.0.99-5 - F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or Require kdebase, as kdebase now requires kdebase-workspace, obviating the upgrade path hack * Tue Jul 22 2008 Rex Dieter 4.0.99-4 - oxygen-cursor-themes, -wallpapers subpkgs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 19 Jul 2008 18:15:11 -0000 1.11 +++ .cvsignore 25 Jul 2008 14:02:10 -0000 1.12 @@ -1 +1,2 @@ kdebase-workspace-4.0.99.tar.bz2 +kdebase-workspace-4.1.0.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- kdebase-workspace.spec 19 Jul 2008 20:33:47 -0000 1.93 +++ kdebase-workspace.spec 25 Jul 2008 14:02:10 -0000 1.94 @@ -2,9 +2,9 @@ Summary: K Desktop Environment - Workspace Name: kdebase-workspace -Version: 4.0.99 +Version: 4.1.0 -Release: 3%{?dist} +Release: 1%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -39,10 +39,12 @@ Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} +%if 0%{?fedora} == 9 # upgrade path: kdebase(3) -> kdebase-workspace Obsoletes: kdebase < 6:4 # so kdebase doesn't get lost on kde3->kde4 upgrade (#444928) Requires: kdebase4 +%endif # kdmtheme's functionality is now provided by kdebase-workspace itself Obsoletes: kdmtheme < 1.3 @@ -118,13 +120,26 @@ %description libs %{summary}. +%package wallpapers +Summary: KDE wallpapers +Group: User Interface/Desktops +Requires: kde-filesystem +%description wallpapers +%{summary}. + %package -n ksysguardd Summary: Performance monitor daemon Group: System Environment/Daemons -# FIXME -- Rex %description -n ksysguardd %{summary}. +%package -n oxygen-cursor-themes +Summary: Oxygen cursor themes +Group: User Interface/Desktops +%description -n oxygen-cursor-themes +%{summary}. + + %prep @@ -235,7 +250,6 @@ %{_kde4_configdir}/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* -%{_kde4_datadir}/wallpapers/* %{_kde4_datadir}/sounds/* %{_kde4_datadir}/autostart/* %{_kde4_datadir}/applications/kde4/* @@ -245,19 +259,8 @@ %{_kde4_docdir}/HTML/en/* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* -%{_kde4_iconsdir}/Oxygen_Black/ -%{_kde4_iconsdir}/Oxygen_Black_Big/ -%{_kde4_iconsdir}/Oxygen_Blue/ -%{_kde4_iconsdir}/Oxygen_Blue_Big/ -%{_kde4_iconsdir}/Oxygen_White/ -%{_kde4_iconsdir}/Oxygen_White_Big/ -%{_kde4_iconsdir}/Oxygen_Yellow/ -%{_kde4_iconsdir}/Oxygen_Yellow_Big/ -%{_kde4_iconsdir}/Oxygen_Zion/ -%{_kde4_iconsdir}/Oxygen_Zion_Big/ %{_kde4_libdir}/kde4/*.so %{_kde4_libexecdir}/* - %{_libdir}/strigi/ %{_kde4_libdir}/libkdeinit*.so %{_kde4_libdir}/kconf_update_bin/* @@ -274,13 +277,41 @@ %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so %exclude %{_kde4_libdir}/libkdeinit*.so +%files wallpapers +%defattr(-,root,root,-) +%{_kde4_datadir}/wallpapers/* + %files -n ksysguardd %defattr(-,root,root,-) %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc %{_kde4_bindir}/ksysguardd +%files -n oxygen-cursor-themes +%defattr(-,root,root,-) +%{_kde4_iconsdir}/Oxygen_Black/ +%{_kde4_iconsdir}/Oxygen_Black_Big/ +%{_kde4_iconsdir}/Oxygen_Blue/ +%{_kde4_iconsdir}/Oxygen_Blue_Big/ +%{_kde4_iconsdir}/Oxygen_White/ +%{_kde4_iconsdir}/Oxygen_White_Big/ +%{_kde4_iconsdir}/Oxygen_Yellow/ +%{_kde4_iconsdir}/Oxygen_Yellow_Big/ +%{_kde4_iconsdir}/Oxygen_Zion/ +%{_kde4_iconsdir}/Oxygen_Zion_Big/ + %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Wed Jul 23 2008 Kevin Kofler 4.0.99-5 +- F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or + Require kdebase, as kdebase now requires kdebase-workspace, obviating the + upgrade path hack + +* Tue Jul 22 2008 Rex Dieter 4.0.99-4 +- oxygen-cursor-themes, -wallpapers subpkgs + * Sat Jul 19 2008 Kevin Kofler 4.0.99-3 - BR soprano-devel (optional dependency of the Plasma Engine Explorer) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 19 Jul 2008 18:15:11 -0000 1.13 +++ sources 25 Jul 2008 14:02:10 -0000 1.14 @@ -1 +1 @@ -eec3d9d9886a0436672007ab2568a20a kdebase-workspace-4.0.99.tar.bz2 +3b7db1a9860c68165f2cdc3d301974f6 kdebase-workspace-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 14:07:51 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:07:51 GMT Subject: rpms/firmware-tools/EL-4 firmware-tools.spec,1.2,1.3 Message-ID: <200807251407.m6PE7pxq021290@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177/EL-4 Modified Files: firmware-tools.spec Log Message: update license tags. Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/EL-4/firmware-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- firmware-tools.spec 23 Aug 2007 03:50:17 -0000 1.2 +++ firmware-tools.spec 25 Jul 2008 14:07:21 -0000 1.3 @@ -43,8 +43,7 @@ Summary: Scripts and tools to manage firmware and BIOS updates Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:07:52 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:07:52 GMT Subject: rpms/firmware-tools/EL-5 firmware-tools.spec,1.4,1.5 Message-ID: <200807251407.m6PE7q6D021293@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177/EL-5 Modified Files: firmware-tools.spec Log Message: update license tags. Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/EL-5/firmware-tools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- firmware-tools.spec 23 Aug 2007 03:48:48 -0000 1.4 +++ firmware-tools.spec 25 Jul 2008 14:07:22 -0000 1.5 @@ -43,8 +43,7 @@ Summary: Scripts and tools to manage firmware and BIOS updates Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:07:52 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:07:52 GMT Subject: rpms/firmware-tools/F-7 firmware-tools.spec,1.6,1.7 Message-ID: <200807251407.m6PE7qkE021296@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177/F-7 Modified Files: firmware-tools.spec Log Message: update license tags. Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/F-7/firmware-tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- firmware-tools.spec 27 Aug 2007 17:55:45 -0000 1.6 +++ firmware-tools.spec 25 Jul 2008 14:07:22 -0000 1.7 @@ -43,8 +43,7 @@ Summary: Scripts and tools to manage firmware and BIOS updates Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:07:53 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:07:53 GMT Subject: rpms/firmware-tools/F-8 firmware-tools.spec,1.7,1.8 Message-ID: <200807251407.m6PE7rFY021299@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177/F-8 Modified Files: firmware-tools.spec Log Message: update license tags. Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/F-8/firmware-tools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- firmware-tools.spec 27 Aug 2007 17:24:47 -0000 1.7 +++ firmware-tools.spec 25 Jul 2008 14:07:23 -0000 1.8 @@ -43,8 +43,7 @@ Summary: Scripts and tools to manage firmware and BIOS updates Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:07:53 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:07:53 GMT Subject: rpms/firmware-tools/F-9 firmware-tools.spec,1.7,1.8 Message-ID: <200807251407.m6PE7r7p021302@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177/F-9 Modified Files: firmware-tools.spec Log Message: update license tags. Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/F-9/firmware-tools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- firmware-tools.spec 27 Aug 2007 17:24:47 -0000 1.7 +++ firmware-tools.spec 25 Jul 2008 14:07:23 -0000 1.8 @@ -43,8 +43,7 @@ Summary: Scripts and tools to manage firmware and BIOS updates Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:07:54 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:07:54 GMT Subject: rpms/firmware-tools/FC-6 firmware-tools.spec,1.3,1.4 Message-ID: <200807251407.m6PE7sg1021305@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177/FC-6 Modified Files: firmware-tools.spec Log Message: update license tags. Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/FC-6/firmware-tools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firmware-tools.spec 27 Aug 2007 18:17:47 -0000 1.3 +++ firmware-tools.spec 25 Jul 2008 14:07:23 -0000 1.4 @@ -43,8 +43,7 @@ Summary: Scripts and tools to manage firmware and BIOS updates Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:07:54 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:07:54 GMT Subject: rpms/firmware-tools/devel firmware-tools.spec,1.7,1.8 Message-ID: <200807251407.m6PE7skd021308@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177/devel Modified Files: firmware-tools.spec Log Message: update license tags. Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/devel/firmware-tools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- firmware-tools.spec 27 Aug 2007 17:24:47 -0000 1.7 +++ firmware-tools.spec 25 Jul 2008 14:07:24 -0000 1.8 @@ -43,8 +43,7 @@ Summary: Scripts and tools to manage firmware and BIOS updates Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:09:23 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:09:23 GMT Subject: rpms/firmware-addon-dell/F-7 firmware-addon-dell.spec,1.12,1.13 Message-ID: <200807251409.m6PE9Ntb021510@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-addon-dell/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21372/F-7 Modified Files: firmware-addon-dell.spec Log Message: fixup license tags. Index: firmware-addon-dell.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-addon-dell/F-7/firmware-addon-dell.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- firmware-addon-dell.spec 27 Aug 2007 17:55:45 -0000 1.12 +++ firmware-addon-dell.spec 25 Jul 2008 14:08:53 -0000 1.13 @@ -44,8 +44,7 @@ Summary: A firmware-tools plugin to handle BIOS/Firmware for Dell systems Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:09:23 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:09:23 GMT Subject: rpms/firmware-addon-dell/EL-5 firmware-addon-dell.spec,1.10,1.11 Message-ID: <200807251409.m6PE9NYO021507@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-addon-dell/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21372/EL-5 Modified Files: firmware-addon-dell.spec Log Message: fixup license tags. Index: firmware-addon-dell.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-addon-dell/EL-5/firmware-addon-dell.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- firmware-addon-dell.spec 23 Aug 2007 03:48:56 -0000 1.10 +++ firmware-addon-dell.spec 25 Jul 2008 14:08:53 -0000 1.11 @@ -44,8 +44,7 @@ Summary: A firmware-tools plugin to handle BIOS/Firmware for Dell systems Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:09:22 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:09:22 GMT Subject: rpms/firmware-addon-dell/EL-4 firmware-addon-dell.spec,1.9,1.10 Message-ID: <200807251409.m6PE9MDB021504@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-addon-dell/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21372/EL-4 Modified Files: firmware-addon-dell.spec Log Message: fixup license tags. Index: firmware-addon-dell.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-addon-dell/EL-4/firmware-addon-dell.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- firmware-addon-dell.spec 23 Aug 2007 03:50:12 -0000 1.9 +++ firmware-addon-dell.spec 25 Jul 2008 14:08:52 -0000 1.10 @@ -44,8 +44,7 @@ Summary: A firmware-tools plugin to handle BIOS/Firmware for Dell systems Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:09:24 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:09:24 GMT Subject: rpms/firmware-addon-dell/FC-6 firmware-addon-dell.spec,1.11,1.12 Message-ID: <200807251409.m6PE9Ojs021513@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-addon-dell/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21372/FC-6 Modified Files: firmware-addon-dell.spec Log Message: fixup license tags. Index: firmware-addon-dell.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-addon-dell/FC-6/firmware-addon-dell.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- firmware-addon-dell.spec 27 Aug 2007 18:18:08 -0000 1.11 +++ firmware-addon-dell.spec 25 Jul 2008 14:08:54 -0000 1.12 @@ -44,8 +44,7 @@ Summary: A firmware-tools plugin to handle BIOS/Firmware for Dell systems Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:09:24 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:09:24 GMT Subject: rpms/firmware-addon-dell/devel firmware-addon-dell.spec,1.15,1.16 Message-ID: <200807251409.m6PE9OK3021516@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-addon-dell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21372/devel Modified Files: firmware-addon-dell.spec Log Message: fixup license tags. Index: firmware-addon-dell.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/firmware-addon-dell.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- firmware-addon-dell.spec 19 Feb 2008 13:21:26 -0000 1.15 +++ firmware-addon-dell.spec 25 Jul 2008 14:08:54 -0000 1.16 @@ -44,8 +44,7 @@ Summary: A firmware-tools plugin to handle BIOS/Firmware for Dell systems Group: Applications/System -# License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 URL: http://linux.dell.com/libsmbios/download/ Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 14:10:00 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:10:00 GMT Subject: rpms/firmware-tools/devel firmware-tools.spec,1.8,1.9 Message-ID: <200807251410.m6PEA0PC021562@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21523 Modified Files: firmware-tools.spec Log Message: bump rpm release for rebuild Index: firmware-tools.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-tools/devel/firmware-tools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- firmware-tools.spec 25 Jul 2008 14:07:24 -0000 1.8 +++ firmware-tools.spec 25 Jul 2008 14:09:30 -0000 1.9 @@ -8,7 +8,7 @@ %define minor 5 %define sub 6 %define extralevel %{nil} -%define rpm_release 1 +%define rpm_release 2 %define release_name firmware-tools %define release_version %{major}.%{minor}.%{sub}%{extralevel} # From fedora-extras-commits at redhat.com Fri Jul 25 14:10:57 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Fri, 25 Jul 2008 14:10:57 GMT Subject: rpms/firmware-addon-dell/devel firmware-addon-dell.spec,1.16,1.17 Message-ID: <200807251410.m6PEAvdI021664@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/firmware-addon-dell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634 Modified Files: firmware-addon-dell.spec Log Message: bump rpm release for rebuild Index: firmware-addon-dell.spec =================================================================== RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/firmware-addon-dell.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- firmware-addon-dell.spec 25 Jul 2008 14:08:54 -0000 1.16 +++ firmware-addon-dell.spec 25 Jul 2008 14:10:26 -0000 1.17 @@ -10,7 +10,7 @@ %define minor 4 %define sub 8 %define extralevel %{nil} -%define rpm_release 1 +%define rpm_release 2 %define release_name firmware-addon-dell %define release_version %{major}.%{minor}.%{sub}%{extralevel} # From fedora-extras-commits at redhat.com Fri Jul 25 14:21:47 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 25 Jul 2008 14:21:47 GMT Subject: rpms/NetworkManager/F-8 old-dbus-glib.patch, NONE, 1.1 old-glib.patch, NONE, 1.1 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.16, 1.17 NetworkManager.spec, 1.213, 1.214 sources, 1.105, 1.106 Message-ID: <200807251421.m6PELlLF022641@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22581 Modified Files: NetworkManager-0.6.5-fixup-internal-applet-build.patch NetworkManager.spec sources Added Files: old-dbus-glib.patch old-glib.patch Log Message: * Thu Jul 24 2008 Dan Williams - 1:0.7.0-0.11.svn3846 - Convert stored IPv4 static IP addresses to new prefix-based scheme automatically - Fix pppd connections to some 3G providers (rh #455348) - Make PPPoE "Show Password" option work - Hide IPv4 config options that don't make sense in certain configurations - Expose server-returned DHCP options via D-Bus - Use avahi-autoipd rather than old built-in IPv4LL implementation - Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) - Support sending DHCP Client Identifier to DHCP server - Allow forcing 802.1x PEAP Label to '0' - Make connection sharing more robust - Show status for shared and Ad-Hoc connections if no other connection is active - Revert fix for (rh #351101) since it breaks multi-lib (rh #451519) - Drop explicit hal dep in -gnome - Move VPN configuration into connection editor - Fix mobile broadband username/password issues - Fix issues with broken rfkill setups (rh #448889) - Honor APN setting for GSM mobile broadband configurations - Fix adding CDMA connections in the connection editor old-dbus-glib.patch: --- NEW FILE old-dbus-glib.patch --- diff -up NetworkManager-0.7.0/configure.in.dbusglib NetworkManager-0.7.0/configure.in --- NetworkManager-0.7.0/configure.in.dbusglib 2008-07-18 14:17:51.000000000 -0400 +++ NetworkManager-0.7.0/configure.in 2008-07-18 14:18:14.000000000 -0400 @@ -170,7 +170,7 @@ if test "$ac_have_iwevgenie" = no; then AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional) fi -PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.75) +PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.73) ##### Find out the version of DBUS we're using dbus_version=`pkg-config --modversion dbus-1` old-glib.patch: --- NEW FILE old-glib.patch --- diff -up NetworkManager-0.7.0/src/nm-device-wifi.c.no-warn-if-fail NetworkManager-0.7.0/src/nm-device-wifi.c --- NetworkManager-0.7.0/src/nm-device-wifi.c.no-warn-if-fail 2008-07-25 09:53:53.000000000 -0400 +++ NetworkManager-0.7.0/src/nm-device-wifi.c 2008-07-25 09:54:33.000000000 -0400 @@ -3417,7 +3417,8 @@ nm_device_wifi_set_enabled (NMDeviceWifi return; if (enabled) { - g_warn_if_fail (state == NM_DEVICE_STATE_UNAVAILABLE); + if (state == NM_DEVICE_STATE_UNAVAILABLE) + g_warning ("%s: state was already unavailable!", __func__); if (!nm_device_hw_bring_up (NM_DEVICE (self), TRUE)) { /* The device sucks, or HAL was lying to us about the killswitch state */ NetworkManager-0.6.5-fixup-internal-applet-build.patch: Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- NetworkManager-0.6.5-fixup-internal-applet-build.patch 5 Jun 2008 15:54:37 -0000 1.16 +++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 25 Jul 2008 14:21:16 -0000 1.17 @@ -1,44 +1,46 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac ---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -60,9 +60,6 @@ AC_C_BIGENDIAN +--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-06-17 13:51:13.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-07-18 11:52:29.000000000 -0400 +@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 glib-2.0 >= 2.10 - NetworkManager >= 0.7.0 -- libnm_glib -- libnm-util +- libnm_glib >= 0.7.0 +- libnm-util >= 0.7.0 +- libnm_glib_vpn >= 0.7.0 gtk+-2.0 >= 2.10 libglade-2.0 - gconf-2.0 -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-22 22:54:27.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -1,6 +1,10 @@ + gmodule-export-2.0 +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-07-03 07:08:55.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -2,6 +2,10 @@ NULL= - bin_PROGRAMS = nm-vpn-properties + bin_PROGRAMS = nm-connection-editor +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-glib + - nm_vpn_propertiesdir=$(includedir)/NetworkManager - - nm_vpn_properties_HEADERS = \ -@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \ - - nm_vpn_properties_LDADD = \ + nm_connection_editor_CPPFLAGS = \ + $(NMA_CFLAGS) \ + -DICONDIR=\""$(datadir)/icons"\" \ +@@ -60,7 +64,10 @@ nm_connection_editor_LDADD = \ + ${top_builddir}/src/wireless-security/libwireless-security.la \ + ${top_builddir}/src/utils/libutils.la \ $(NMA_LIBS) \ -- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la -+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +- $(POLKIT_LIBS) ++ $(POLKIT_LIBS) \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - CLEANFILES = $(server_DATA) *.bak *.gladep *~ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la + gladedir = $(datadir)/nm-applet + glade_DATA = \ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -47,8 +49,7 @@ noinst_LTLIBRARIES = libgconf-helpers.la libgconf_helpers_la_SOURCES = \ -@@ -13,6 +17,8 @@ libgconf_helpers_la_CPPFLAGS = \ - +@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \ libgconf_helpers_la_LIBADD = \ $(NMA_LIBS) \ ${top_builddir}/src/marshallers/libmarshallers.la \ @@ -57,9 +58,34 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-07-03 08:48:24.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -4,6 +4,10 @@ NULL= + + bin_PROGRAMS = nm-applet + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_applet_CPPFLAGS = \ + $(NMA_CFLAGS) \ + $(NOTIFY_CFLAGS) \ +@@ -57,7 +61,9 @@ nm_applet_LDADD = \ + ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/utils/libutils.la \ + ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +- ${top_builddir}/src/wireless-security/libwireless-security.la ++ ${top_builddir}/src/wireless-security/libwireless-security.la \ ++ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + + gladedir = $(datadir)/nm-applet + glade_DATA = applet.glade keyring.png diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2007-11-13 15:41:01.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2007-11-13 15:42:30.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -78,8 +104,8 @@ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2007-11-07 12:12:16.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -99,54 +125,3 @@ + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -2,6 +2,10 @@ NULL= - - bin_PROGRAMS = nm-connection-editor - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_connection_editor_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -29,8 +33,10 @@ nm_connection_editor_LDADD = \ - $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \ - ${top_builddir}/src/wireless-security/libwireless-security.la \ - ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ -- $(POLKIT_LIBS) -+ $(POLKIT_LIBS) \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - gladedir = $(datadir)/nm-applet - glade_DATA = nm-connection-editor.gladediff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -4,6 +4,10 @@ NULL= - - bin_PROGRAMS = nm-applet - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_applet_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -58,7 +62,9 @@ nm_applet_LDADD = \ - $(NMA_LIBS) \ - ${top_builddir}/src/utils/libutils.la \ - ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -- ${top_builddir}/src/wireless-security/libwireless-security.la -+ ${top_builddir}/src/wireless-security/libwireless-security.la \ -+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - if WITH_NOTIFY - nm_applet_LDADD += $(NOTIFY_LIBS) - Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- NetworkManager.spec 11 Jun 2008 16:11:15 -0000 1.213 +++ NetworkManager.spec 25 Jul 2008 14:21:16 -0000 1.214 @@ -6,17 +6,17 @@ %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 -%define libnl_version 1.0-0.15.pre8.git20071218 +%define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot svn3747 -%define applet_snapshot svn755 +%define snapshot svn3846 +%define applet_snapshot svn798 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0 -Release: 0.7.%{snapshot}%{?dist} +Release: 0.11.%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -25,10 +25,12 @@ Source2: nm-system-settings.conf Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch2: disable-editing-system-connections-for-now.patch +Patch3: old-dbus-glib.patch Patch4: serial-debug.patch Patch5: explain-dns1-dns2.patch Patch6: pk-06-fixes.patch Patch7: preserve-f8-priorities.patch +Patch20: old-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -41,11 +43,14 @@ Requires: libnl >= %{libnl_version} Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: ppp >= %{ppp_version} +Requires: avahi-autoipd +Requires: dnsmasq Obsoletes: dhcdbd # Due to VPN auth-dialog changes in applet r662 -Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549 -Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549 +# Due to using prefixes instead of netmasks in NM > r3812 +Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn3830 +Conflicts: NetworkManager-openvpn < 1:0.7.0-11.svn3830 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -92,6 +97,7 @@ from applications. + %package gnome Summary: GNOME applications for use with NetworkManager Group: Applications/Internet @@ -100,7 +106,6 @@ Requires: gnome-panel Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} -Requires: hal >= %{hal_version} Requires: libnotify >= 0.4.3 PreReq: gtk2 >= %{gtk2_version} Requires: gnome-keyring @@ -117,6 +122,9 @@ Group: Development/Libraries Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} +# Evil hack for multi-lib due to move of libnm-util from core package to -glib +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: %{name} < %{epoch}:%{version}-0.9.4.svn3675 %description glib This package contains the libraries that make it easier to use some NetworkManager @@ -144,31 +152,28 @@ tar -xzf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .disable-system +%patch3 -p1 -b .old-dbus-glib %patch4 -p1 -b .serial-debug %patch5 -p1 -b .explain-dns1-dns2 %patch6 -p1 -b .pk-06-fixes %patch7 -p1 -b .f8-priorities +%patch20 -p1 -b .old-glib %build -# Even though we don't require named, we still build with it -# so that if the user installs it, NM will use it automatically autoreconf -i %configure \ --disable-static \ - --with-named=/usr/sbin/named \ - --with-named-dir=/var/named/data \ - --with-named-user=named + --with-distro=redhat \ + --with-dhcp-client=dhclient \ + --with-crypto=nss \ + --enable-more-warnings=yes make # build the applet pushd nm-applet-0.7.0 autoreconf -i intltoolize --force - %configure \ - --disable-static \ - --with-notify \ - --with-nss=yes \ - --with-gnutls=no + %configure --disable-static make popd @@ -178,7 +183,7 @@ # install NM make install DESTDIR=$RPM_BUILD_ROOT -%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ +%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install the applet pushd nm-applet-0.7.0 @@ -210,10 +215,12 @@ %preun if [ $1 -eq 0 ]; then /sbin/service NetworkManager stop >/dev/null 2>&1 + killall -TERM nm-system-settings >/dev/null 2>&1 /sbin/chkconfig --del NetworkManager fi %triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614 +/sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1 /sbin/chkconfig --del NetworkManagerDispatcher exit 0 @@ -237,18 +244,20 @@ %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf +%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} %{_sbindir}/nm-system-settings -%{_sysconfdir}/nm-system-settings.conf -%dir %{_sysconfdir}/NetworkManager/ -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%dir %{_sysconfdir}/NetworkManager/VPN +%dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name}/dispatcher.d +%dir %{_sysconfdir}/%{name}/VPN +%{_sysconfdir}/%{name}/nm-system-settings.conf %{_bindir}/nm-tool %{_bindir}/nm-online %{_libexecdir}/nm-dhcp-client.action +%{_libexecdir}/nm-avahi-autoipd.action %{_libexecdir}/nm-dispatcher.action %dir %{_libdir}/NetworkManager %{_libdir}/NetworkManager/*.so* @@ -274,9 +283,7 @@ %defattr(-,root,root,0755) %{_sysconfdir}/dbus-1/system.d/nm-applet.conf %{_bindir}/nm-applet -%{_bindir}/nm-vpn-properties %{_bindir}/nm-connection-editor -%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png @@ -293,13 +300,33 @@ %{_includedir}/libnm-glib/*.h %{_includedir}/NetworkManager/nm-*.h %{_libdir}/pkgconfig/libnm_glib.pc +%{_libdir}/pkgconfig/libnm_glib_vpn.pc %{_libdir}/pkgconfig/libnm-util.pc %{_libdir}/libnm_glib.so %{_libdir}/libnm_glib_vpn.so %{_libdir}/libnm-util.so - %changelog +* Thu Jul 24 2008 Dan Williams - 1:0.7.0-0.11.svn3846 +- Convert stored IPv4 static IP addresses to new prefix-based scheme automatically +- Fix pppd connections to some 3G providers (rh #455348) +- Make PPPoE "Show Password" option work +- Hide IPv4 config options that don't make sense in certain configurations +- Expose server-returned DHCP options via D-Bus +- Use avahi-autoipd rather than old built-in IPv4LL implementation +- Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) +- Support sending DHCP Client Identifier to DHCP server +- Allow forcing 802.1x PEAP Label to '0' +- Make connection sharing more robust +- Show status for shared and Ad-Hoc connections if no other connection is active +- Revert fix for (rh #351101) since it breaks multi-lib (rh #451519) +- Drop explicit hal dep in -gnome +- Move VPN configuration into connection editor +- Fix mobile broadband username/password issues +- Fix issues with broken rfkill setups (rh #448889) +- Honor APN setting for GSM mobile broadband configurations +- Fix adding CDMA connections in the connection editor + * Wed Jun 11 2008 Dan Williams - 1:0.7.0-0.7.svn3747 - Update to latest SVN - Enable connection sharing Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/sources,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- sources 11 Jun 2008 16:11:15 -0000 1.105 +++ sources 25 Jul 2008 14:21:16 -0000 1.106 @@ -1,2 +1,2 @@ -25a1612c01ec19ba2864ad97ac98c759 NetworkManager-0.7.0.svn3747.tar.gz -4ae0a5d13783f4de4e4e6f7fb949aaed nm-applet-0.7.0.svn755.tar.gz +2ead19fc2a5c47c0573ada0d9d1fdb6f NetworkManager-0.7.0.svn3846.tar.gz +93704b83076413e4ded64c958d474bca nm-applet-0.7.0.svn798.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 14:27:51 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Fri, 25 Jul 2008 14:27:51 GMT Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang-addosgimanifest.patch, NONE, 1.1 Message-ID: <200807251427.m6PERpZO023229@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jakarta-commons-lang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214 Added Files: jakarta-commons-lang-addosgimanifest.patch Log Message: Add OSGi manifest patch jakarta-commons-lang-addosgimanifest.patch: --- NEW FILE jakarta-commons-lang-addosgimanifest.patch --- diff -up ./src/conf/MANIFEST.MF.osgi ./src/conf/MANIFEST.MF --- ./src/conf/MANIFEST.MF.osgi 2008-07-24 16:38:38.000000000 -0400 +++ ./src/conf/MANIFEST.MF 2008-07-24 16:39:13.000000000 -0400 @@ -10,3 +10,17 @@ Implementation-Title: Commons Lang Implementation-Vendor-Id: org.apache X-Compile-Source-JDK: @compile.source@ X-Compile-Target-JDK: @compile.target@ +Bundle-RequiredExecutionEnvironment: JRE-1.1 +Bundle-SymbolicName: org.apache.commons.lang +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Version: 2.3.0.v200803061910 +Bundle-Vendor: %providerName +Export-Package: org.apache.commons.lang;version="2.3.0",org.apache.com + mons.lang.builder;version="2.3.0",org.apache.commons.lang.enum;versio + n="2.3.0",org.apache.commons.lang.enums;version="2.3.0",org.apache.co + mmons.lang.exception;version="2.3.0",org.apache.commons.lang.math;ver + sion="2.3.0",org.apache.commons.lang.mutable;version="2.3.0",org.apac + he.commons.lang.text;version="2.3.0",org.apache.commons.lang.time;ver + sion="2.3.0" From fedora-extras-commits at redhat.com Fri Jul 25 14:38:36 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 14:38:36 GMT Subject: rpms/kdebase-runtime/F-8 kdebase-runtime.spec,1.13,1.14 Message-ID: <200807251438.m6PEcaZM023633@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23582/F-8 Modified Files: kdebase-runtime.spec Log Message: * Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 - don't remove autostart directory on F8- (does not conflict, fixes build failure due to nepomukserver.desktop listed in filelist but not found) Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/kdebase-runtime.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kdebase-runtime.spec 25 Jul 2008 13:57:47 -0000 1.13 +++ kdebase-runtime.spec 25 Jul 2008 14:38:06 -0000 1.14 @@ -8,7 +8,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 Group: User Interface/Desktops @@ -148,7 +148,6 @@ rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/knetattach.* rm -rf %{buildroot}%{_datadir}/emoticons rm -rf %{buildroot}%{_kde4_datadir}/locale -rm -rf %{buildroot}%{_kde4_datadir}/autostart rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k* @@ -333,6 +332,10 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 +- don't remove autostart directory on F8- (does not conflict, fixes build + failure due to nepomukserver.desktop listed in filelist but not found) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Fri Jul 25 14:39:45 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Fri, 25 Jul 2008 14:39:45 GMT Subject: rpms/qemu/devel qemu.spec,1.42,1.43 Message-ID: <200807251439.m6PEdjK6023713@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23677 Modified Files: qemu.spec Log Message: fix summary (#456344) Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- qemu.spec 7 Jul 2008 09:32:29 -0000 1.42 +++ qemu.spec 25 Jul 2008 14:39:15 -0000 1.43 @@ -42,14 +42,14 @@ As QEMU requires no host kernel patches to run, it is safe and easy to use. %package img -Summary: QEMU is a FAST! processor emulator +Summary: QEMU command line tool for disk image manipulation Group: Development/Tools %description img QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. -This package provides the command line tool for manipulating disk images +This package provides the command line tool for manipulating disk images. %prep %setup -q @@ -145,6 +145,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Fri Jul 25 2008 Bill Nottingham +- Fix qemu-img summary (#456344) + * Wed Jun 25 2008 Daniel P. Berrange - 0.9.1-10.fc10 - Rebuild for GNU TLS ABI change From fedora-extras-commits at redhat.com Fri Jul 25 14:42:19 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 25 Jul 2008 14:42:19 GMT Subject: rpms/NetworkManager/F-8 NetworkManager.spec,1.214,1.215 Message-ID: <200807251442.m6PEgJjL023847@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23808 Modified Files: NetworkManager.spec Log Message: Need dhclient at build time Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- NetworkManager.spec 25 Jul 2008 14:21:16 -0000 1.214 +++ NetworkManager.spec 25 Jul 2008 14:41:49 -0000 1.215 @@ -74,6 +74,7 @@ BuildRequires: ppp >= %{ppp_version} BuildRequires: nss-devel >= 3.11.7 BuildRequires: PolicyKit-devel +BuildRequires: dhclient %description NetworkManager attempts to keep an active network connection available at all From fedora-extras-commits at redhat.com Fri Jul 25 14:52:49 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 14:52:49 GMT Subject: rpms/python-lxml/devel .cvsignore, 1.16, 1.17 python-lxml.spec, 1.22, 1.23 sources, 1.16, 1.17 Message-ID: <200807251452.m6PEqnpw024256@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24209 Modified Files: .cvsignore python-lxml.spec sources Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 2.1.1-1 - Update to 2.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 20 Jun 2008 13:22:04 -0000 1.16 +++ .cvsignore 25 Jul 2008 14:52:19 -0000 1.17 @@ -1 +1 @@ -lxml-2.0.7.tar.gz +lxml-2.1.1.tar.gz Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/devel/python-lxml.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- python-lxml.spec 20 Jun 2008 13:22:04 -0000 1.22 +++ python-lxml.spec 25 Jul 2008 14:52:19 -0000 1.23 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.7 +Version: 2.1.1 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -49,6 +49,9 @@ %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 2.1.1-1 +- Update to 2.1.1 + * Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 - Update to 2.0.7 - Update download URL Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 20 Jun 2008 13:22:04 -0000 1.16 +++ sources 25 Jul 2008 14:52:19 -0000 1.17 @@ -1 +1 @@ -f72a3ce319b286926ac08ae66d30cd31 lxml-2.0.7.tar.gz +f6fd6f45e3034de29ec1411549bc529d lxml-2.1.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 14:53:30 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 14:53:30 GMT Subject: rpms/python-lxml/F-9 .cvsignore, 1.16, 1.17 python-lxml.spec, 1.22, 1.23 sources, 1.16, 1.17 Message-ID: <200807251453.m6PErU59024370@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24318 Modified Files: .cvsignore python-lxml.spec sources Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 - Update to 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 23 Jun 2008 02:58:32 -0000 1.16 +++ .cvsignore 25 Jul 2008 14:52:59 -0000 1.17 @@ -1 +1 @@ -lxml-2.0.7.tar.gz +lxml-2.0.8.tar.gz Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-9/python-lxml.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- python-lxml.spec 23 Jun 2008 02:58:32 -0000 1.22 +++ python-lxml.spec 25 Jul 2008 14:52:59 -0000 1.23 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.7 +Version: 2.0.8 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -49,6 +49,9 @@ %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 +- Update to 2.0.8 + * Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 - Update to 2.0.7 - Update download URL Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 23 Jun 2008 02:58:32 -0000 1.16 +++ sources 25 Jul 2008 14:52:59 -0000 1.17 @@ -1 +1 @@ -f72a3ce319b286926ac08ae66d30cd31 lxml-2.0.7.tar.gz +f3e7ad6e0e4b66d596e8f301c6943b43 lxml-2.0.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:07:57 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 25 Jul 2008 15:07:57 GMT Subject: rpms/NetworkManager-vpnc/F-8 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.5, 1.6 NetworkManager-vpnc.spec, 1.39, 1.40 sources, 1.19, 1.20 Message-ID: <200807251507.m6PF7vau031447@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-vpnc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31391 Modified Files: NetworkManager-vpnc-0.7.0-gppasswd.patch NetworkManager-vpnc.spec sources Log Message: * Thu Jul 24 2008 Dan Williams 1:0.7.0-10.svn3846 - Rebuild for updated NetworkManager * Fri Jul 18 2008 Dan Williams 1:0.7.0-10.svn3832 - Update for NM netmask -> prefix changes * Wed Jul 02 2008 Dan Williams 1:0.7.0-10.svn3801 - Update for moving VPN editing into connection manager - Add option to disable Dead Peer Detection - Add option to select NAT Traversal mode NetworkManager-vpnc-0.7.0-gppasswd.patch: Index: NetworkManager-vpnc-0.7.0-gppasswd.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/F-8/NetworkManager-vpnc-0.7.0-gppasswd.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NetworkManager-vpnc-0.7.0-gppasswd.patch 19 May 2008 17:09:05 -0000 1.5 +++ NetworkManager-vpnc-0.7.0-gppasswd.patch 25 Jul 2008 15:07:27 -0000 1.6 @@ -1,8 +1,115 @@ ---- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig 2007-11-07 19:05:57.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2007-11-27 09:24:17.000000000 +0100 -@@ -35,6 +35,32 @@ - #include "../src/nm-vpnc-service.h" - #include "gnome-two-password-dialog.h" +diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c +--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd 2008-06-26 12:54:04.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-07-24 16:42:56.000000000 -0400 +@@ -69,6 +69,7 @@ struct GnomeTwoPasswordDialogDetails + + GtkWidget *remember_session_button; + GtkWidget *remember_forever_button; ++ GtkWidget *remember_group_button; + + GtkWidget *radio_vbox; + GtkWidget *connect_with_no_userpass_button; +@@ -462,14 +463,18 @@ gnome_two_password_dialog_new (const cha + gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); + + password_dialog->details->remember_session_button = +- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); ++ gtk_radio_button_new_with_mnemonic (NULL, _("_Remember passwords for this session")); + password_dialog->details->remember_forever_button = +- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); ++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("_Save passwords in keyring")); ++ password_dialog->details->remember_group_button = ++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("S_ave group password in keyring")); + + gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, + FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, + FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_button, ++ FALSE, FALSE, 0); + + gnome_two_password_dialog_set_username (password_dialog, username); + gnome_two_password_dialog_set_password (password_dialog, password); +@@ -688,9 +693,11 @@ gnome_two_password_dialog_set_show_remem + if (show_remember) { + gtk_widget_show (password_dialog->details->remember_session_button); + gtk_widget_show (password_dialog->details->remember_forever_button); ++ gtk_widget_show (password_dialog->details->remember_group_button); + } else { + gtk_widget_hide (password_dialog->details->remember_session_button); + gtk_widget_hide (password_dialog->details->remember_forever_button); ++ gtk_widget_hide (password_dialog->details->remember_group_button); + } + } + +@@ -698,32 +705,46 @@ void + gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, + GnomeTwoPasswordDialogRemember remember) + { +- gboolean session, forever; ++ gboolean session, forever, group; + + session = FALSE; + forever = FALSE; +- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { ++ group = FALSE; ++ ++ switch (remember) { ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: + session = TRUE; +- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ ++ break; ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: + forever = TRUE; ++ break; ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP: ++ group = TRUE; ++ break; + } ++ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), + session); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), + forever); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button), ++ group); + } + + GnomeTwoPasswordDialogRemember + gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) + { +- gboolean session, forever; ++ gboolean session, forever, group; + + session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); + forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); ++ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button)); + if (forever) { + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; + } else if (session) { + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; ++ } else if (group) { ++ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP; + } + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; + } +diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h +--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd 2008-06-26 12:54:04.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-07-24 16:42:56.000000000 -0400 +@@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass + typedef enum { + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, ++ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP, + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER + } GnomeTwoPasswordDialogRemember; + +diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/main.c +--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd 2008-07-18 21:05:54.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-07-24 16:42:56.000000000 -0400 +@@ -39,6 +39,32 @@ + #define KEYRING_SN_TAG "setting-name" + #define KEYRING_SK_TAG "setting-key" +typedef struct { + const char *password; @@ -31,9 +138,9 @@ +} + static char * - find_one_password (const char *vpn_name, - const char *vpn_service, -@@ -74,27 +100,14 @@ + find_one_password (const char *vpn_id, + const char *vpn_name, +@@ -79,27 +105,14 @@ find_one_password (const char *vpn_id, return secret; } @@ -67,19 +174,16 @@ } static void -@@ -136,42 +149,29 @@ +@@ -142,42 +155,29 @@ save_vpn_password (const char *vpn_id, g_free (display_name); } -static GSList * --get_passwords (const char *vpn_id, -- const char *vpn_name, -- const char *vpn_service, -- gboolean retry) +gboolean -+get_passwords (const char *vpn_id, -+ const char *vpn_name, -+ const char *vpn_service, + get_passwords (const char *vpn_id, + const char *vpn_name, + const char *vpn_service, +- gboolean retry) + gboolean retry, + KeyringData *kdata) { @@ -126,7 +230,7 @@ prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE); -@@ -180,21 +179,23 @@ +@@ -190,21 +190,23 @@ get_passwords (const char *vpn_id, gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:")); /* use the same keyring storage options as from the items we put in the entry boxes */ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; @@ -162,7 +266,7 @@ gtk_widget_show (dialog); -@@ -205,11 +206,16 @@ +@@ -215,11 +217,16 @@ get_passwords (const char *vpn_id, password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog)); group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog)); @@ -181,7 +285,7 @@ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: save_vpn_password (vpn_id, vpn_name, vpn_service, "session", "password", password); save_vpn_password (vpn_id, vpn_name, vpn_service, "session", "group-password", group_password); -@@ -224,18 +230,14 @@ +@@ -234,18 +241,14 @@ get_passwords (const char *vpn_id, } @@ -201,10 +305,10 @@ static gboolean retry = FALSE; static gchar *vpn_name = NULL; static gchar *vpn_id = NULL; -@@ -249,13 +251,13 @@ +@@ -262,13 +265,13 @@ main (int argc, char *argv[]) + { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, { NULL } }; - char buf[1]; + KeyringData keyring_data; + gboolean success = FALSE; @@ -217,7 +321,7 @@ context = g_option_context_new ("- vpnc auth dialog"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -@@ -265,7 +267,6 @@ +@@ -278,7 +281,6 @@ main (int argc, char *argv[]) GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_NONE); @@ -225,7 +329,7 @@ if (vpn_id == NULL || vpn_name == NULL || vpn_service == NULL) { fprintf (stderr, "Have to supply ID, name, and service\n"); goto out; -@@ -276,21 +277,22 @@ +@@ -289,21 +291,22 @@ main (int argc, char *argv[]) goto out; } @@ -253,115 +357,11 @@ + keyring_data_free(&keyring_data); /* wait for data on stdin */ - fread (buf, sizeof (char), sizeof (buf), stdin); -@@ -298,5 +300,5 @@ + ret = fread (buf, sizeof (char), sizeof (buf), stdin); +@@ -311,5 +314,5 @@ main (int argc, char *argv[]) out: g_object_unref (program); - return passwords != NULL ? 0 : 1; + return (success ? 0 : 1); } ---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig 2007-11-27 09:23:30.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2007-11-27 09:24:17.000000000 +0100 -@@ -69,6 +69,7 @@ - - GtkWidget *remember_session_button; - GtkWidget *remember_forever_button; -+ GtkWidget *remember_group_button; - - GtkWidget *radio_vbox; - GtkWidget *connect_with_no_userpass_button; -@@ -462,14 +463,18 @@ - gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); - - password_dialog->details->remember_session_button = -- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); -+ gtk_radio_button_new_with_mnemonic (NULL, _("_Remember passwords for this session")); - password_dialog->details->remember_forever_button = -- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); -+ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("_Save passwords in keyring")); -+ password_dialog->details->remember_group_button = -+ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("S_ave group password in keyring")); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, - FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_button, -+ FALSE, FALSE, 0); - - gnome_two_password_dialog_set_username (password_dialog, username); - gnome_two_password_dialog_set_password (password_dialog, password); -@@ -688,9 +693,11 @@ - if (show_remember) { - gtk_widget_show (password_dialog->details->remember_session_button); - gtk_widget_show (password_dialog->details->remember_forever_button); -+ gtk_widget_show (password_dialog->details->remember_group_button); - } else { - gtk_widget_hide (password_dialog->details->remember_session_button); - gtk_widget_hide (password_dialog->details->remember_forever_button); -+ gtk_widget_hide (password_dialog->details->remember_group_button); - } - } - -@@ -698,32 +705,46 @@ - gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember) - { -- gboolean session, forever; -+ gboolean session, forever, group; - - session = FALSE; - forever = FALSE; -- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { -+ group = FALSE; -+ -+ switch (remember) { -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: - session = TRUE; -- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ -+ break; -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: - forever = TRUE; -+ break; -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP: -+ group = TRUE; -+ break; - } -+ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), - session); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), - forever); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button), -+ group); - } - - GnomeTwoPasswordDialogRemember - gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) - { -- gboolean session, forever; -+ gboolean session, forever, group; - - session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); - forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); -+ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button)); - if (forever) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; - } else if (session) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; -+ } else if (group) { -+ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP; - } - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; - } ---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig 2007-11-27 09:23:26.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2007-11-27 09:24:17.000000000 +0100 -@@ -57,6 +57,7 @@ - typedef enum { - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, -+ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER - } GnomeTwoPasswordDialogRemember; - Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/F-8/NetworkManager-vpnc.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- NetworkManager-vpnc.spec 19 May 2008 17:09:05 -0000 1.39 +++ NetworkManager-vpnc.spec 25 Jul 2008 15:07:27 -0000 1.40 @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.6.8.svn3623 +%define nm_version 1:0.7.0-0.11.svn3830 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn3627 +%define svn_snapshot svn3846 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc Epoch: 1 Version: 0.7.0 -Release: 0.7.7.%{svn_snapshot}%{?dist} +Release: 0.10.%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -100,6 +100,17 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-10.svn3846 +- Rebuild for updated NetworkManager + +* Fri Jul 18 2008 Dan Williams 1:0.7.0-10.svn3832 +- Update for NM netmask -> prefix changes + +* Wed Jul 02 2008 Dan Williams 1:0.7.0-10.svn3801 +- Update for moving VPN editing into connection manager +- Add option to disable Dead Peer Detection +- Add option to select NAT Traversal mode + * Thu May 01 2008 Dan Williams 1:0.7.0-7.7.svn3627 - Update for compat with new NM bits Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/F-8/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 19 May 2008 17:09:05 -0000 1.19 +++ sources 25 Jul 2008 15:07:27 -0000 1.20 @@ -1 +1 @@ -6401add359698efdc15a65ee85a4cd4e NetworkManager-vpnc-0.7.0.svn3627.tar.gz +a46bf418e5922dbfe81407adc854e7a9 NetworkManager-vpnc-0.7.0.svn3846.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:10:26 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 15:10:26 GMT Subject: rpms/python-lxml/F-8 .cvsignore, 1.14, 1.15 branch, 1.1, 1.2 python-lxml.spec, 1.19, 1.20 sources, 1.14, 1.15 Message-ID: <200807251510.m6PFAQDa031578@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31543 Modified Files: .cvsignore branch python-lxml.spec sources Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 - Update to 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Jun 2008 03:13:08 -0000 1.14 +++ .cvsignore 25 Jul 2008 15:09:56 -0000 1.15 @@ -1 +1 @@ -lxml-2.0.7.tar.gz +lxml-2.0.8.tar.gz Index: branch =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 20 Oct 2007 10:19:43 -0000 1.1 +++ branch 25 Jul 2008 15:09:56 -0000 1.2 @@ -1 +1 @@ -F-8 +F-9 Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/python-lxml.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- python-lxml.spec 23 Jun 2008 03:13:08 -0000 1.19 +++ python-lxml.spec 25 Jul 2008 15:09:56 -0000 1.20 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.7 +Version: 2.0.8 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -49,6 +49,9 @@ %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 +- Update to 2.0.8 + * Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 - Update to 2.0.7 - Update download URL Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 23 Jun 2008 03:13:08 -0000 1.14 +++ sources 25 Jul 2008 15:09:56 -0000 1.15 @@ -1 +1 @@ -f72a3ce319b286926ac08ae66d30cd31 lxml-2.0.7.tar.gz +f3e7ad6e0e4b66d596e8f301c6943b43 lxml-2.0.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:11:16 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 15:11:16 GMT Subject: rpms/python-lxml/EL-5 .cvsignore, 1.14, 1.15 branch, 1.1, 1.2 python-lxml.spec, 1.16, 1.17 sources, 1.14, 1.15 Message-ID: <200807251511.m6PFBG0C031673@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31637 Modified Files: .cvsignore branch python-lxml.spec sources Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 - Update to 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Jun 2008 02:54:48 -0000 1.14 +++ .cvsignore 25 Jul 2008 15:10:45 -0000 1.15 @@ -1 +1 @@ -lxml-2.0.7.tar.gz +lxml-2.0.8.tar.gz Index: branch =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 1 Aug 2007 19:07:06 -0000 1.1 +++ branch 25 Jul 2008 15:10:45 -0000 1.2 @@ -1 +1 @@ -EL-5 +F-9 Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/python-lxml.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-lxml.spec 23 Jun 2008 02:54:48 -0000 1.16 +++ python-lxml.spec 25 Jul 2008 15:10:45 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.7 +Version: 2.0.8 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -49,6 +49,9 @@ %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 +- Update to 2.0.8 + * Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 - Update to 2.0.7 - Update download URL Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 23 Jun 2008 02:54:48 -0000 1.14 +++ sources 25 Jul 2008 15:10:45 -0000 1.15 @@ -1 +1 @@ -f72a3ce319b286926ac08ae66d30cd31 lxml-2.0.7.tar.gz +f3e7ad6e0e4b66d596e8f301c6943b43 lxml-2.0.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:14:06 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 15:14:06 GMT Subject: rpms/python-lxml/EL-4 .cvsignore, 1.14, 1.15 branch, 1.1, 1.2 python-lxml.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200807251514.m6PFE6KK031844@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804 Modified Files: .cvsignore branch python-lxml.spec sources Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 - Update to 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Jun 2008 02:56:19 -0000 1.14 +++ .cvsignore 25 Jul 2008 15:13:36 -0000 1.15 @@ -1 +1 @@ -lxml-2.0.7.tar.gz +lxml-2.0.8.tar.gz Index: branch =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 1 Aug 2007 19:07:01 -0000 1.1 +++ branch 25 Jul 2008 15:13:36 -0000 1.2 @@ -1 +1 @@ -EL-4 +F-9 Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/python-lxml.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- python-lxml.spec 23 Jun 2008 02:56:19 -0000 1.17 +++ python-lxml.spec 25 Jul 2008 15:13:36 -0000 1.18 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.7 +Version: 2.0.8 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -49,6 +49,9 @@ %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 +- Update to 2.0.8 + * Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 - Update to 2.0.7 - Update download URL Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 23 Jun 2008 02:56:19 -0000 1.14 +++ sources 25 Jul 2008 15:13:36 -0000 1.15 @@ -1 +1 @@ -f72a3ce319b286926ac08ae66d30cd31 lxml-2.0.7.tar.gz +f3e7ad6e0e4b66d596e8f301c6943b43 lxml-2.0.8.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:32:13 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 15:32:13 GMT Subject: rpms/kdebase-runtime/F-9 kdebase-runtime.spec,1.49,1.50 Message-ID: <200807251532.m6PFWDG1032720@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32617/F-9 Modified Files: kdebase-runtime.spec Log Message: Sync from F-8: * Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 - don't remove autostart directory on F8- (does not conflict, fixes build failure due to nepomukserver.desktop listed in filelist but not found) (No new F-9 or devel builds needed.) Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- kdebase-runtime.spec 25 Jul 2008 13:55:54 -0000 1.49 +++ kdebase-runtime.spec 25 Jul 2008 15:31:43 -0000 1.50 @@ -8,7 +8,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 Group: User Interface/Desktops @@ -148,7 +148,6 @@ rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/knetattach.* rm -rf %{buildroot}%{_datadir}/emoticons rm -rf %{buildroot}%{_kde4_datadir}/locale -rm -rf %{buildroot}%{_kde4_datadir}/autostart rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k* @@ -333,6 +332,10 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 +- don't remove autostart directory on F8- (does not conflict, fixes build + failure due to nepomukserver.desktop listed in filelist but not found) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Fri Jul 25 15:32:14 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 15:32:14 GMT Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.61,1.62 Message-ID: <200807251532.m6PFWEPV032728@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32617/devel Modified Files: kdebase-runtime.spec Log Message: Sync from F-8: * Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 - don't remove autostart directory on F8- (does not conflict, fixes build failure due to nepomukserver.desktop listed in filelist but not found) (No new F-9 or devel builds needed.) Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- kdebase-runtime.spec 24 Jul 2008 13:52:06 -0000 1.61 +++ kdebase-runtime.spec 25 Jul 2008 15:31:44 -0000 1.62 @@ -8,7 +8,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 Group: User Interface/Desktops @@ -148,7 +148,6 @@ rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/knetattach.* rm -rf %{buildroot}%{_datadir}/emoticons rm -rf %{buildroot}%{_kde4_datadir}/locale -rm -rf %{buildroot}%{_kde4_datadir}/autostart rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k* @@ -333,6 +332,10 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 +- don't remove autostart directory on F8- (does not conflict, fixes build + failure due to nepomukserver.desktop listed in filelist but not found) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Fri Jul 25 15:38:48 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 15:38:48 GMT Subject: rpms/kdebase4/F-8 kdebase-nsplugins-paths.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 kdebase4.spec, 1.16, 1.17 sources, 1.10, 1.11 kdebase-4.0.3-kde#160422.patch, 1.1, NONE kdebase-4.0.3-kwrite-dt_categories.patch, 1.1, NONE kdebase-4.0.4-konqueror-updatehistoryentry.patch, 1.1, NONE Message-ID: <200807251538.m6PFcm6n000709@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv666/F-8 Modified Files: .cvsignore kdebase4.spec sources Added Files: kdebase-nsplugins-paths.patch Removed Files: kdebase-4.0.3-kde#160422.patch kdebase-4.0.3-kwrite-dt_categories.patch kdebase-4.0.4-konqueror-updatehistoryentry.patch Log Message: Sync 4.1.0 from kdebase/devel. kdebase-nsplugins-paths.patch: --- NEW FILE kdebase-nsplugins-paths.patch --- Index: apps/konqueror/settings/konqhtml/pluginopts.cpp =================================================================== --- apps/konqueror/settings/konqhtml/pluginopts.cpp (revision 823888) +++ apps/konqueror/settings/konqhtml/pluginopts.cpp (working copy) @@ -432,6 +432,8 @@ paths.append("/usr/lib/mozilla/plugins"); paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); + paths.append("/usr/lib64/mozilla/plugins-wrapped"); + paths.append("/usr/lib/mozilla/plugins-wrapped"); paths.append("$MOZILLA_HOME/plugins"); } Index: apps/nsplugins/plugin_paths.cpp =================================================================== --- apps/nsplugins/plugin_paths.cpp (revision 823888) +++ apps/nsplugins/plugin_paths.cpp (working copy) @@ -54,6 +54,8 @@ paths.append("/usr/lib/mozilla/plugins"); paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); + paths.append("/usr/lib64/mozilla/plugins-wrapped"); + paths.append("/usr/lib/mozilla/plugins-wrapped"); paths.append("$MOZILLA_HOME/plugins"); config.writeEntry( "scanPaths", paths ); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 5 Jun 2008 01:42:41 -0000 1.10 +++ .cvsignore 25 Jul 2008 15:38:18 -0000 1.11 @@ -1 +1,2 @@ -kdebase-4.0.5.tar.bz2 +kdebase-4.0.99.tar.bz2 +kdebase-4.1.0.tar.bz2 Index: kdebase4.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kdebase4.spec 5 Jun 2008 01:42:41 -0000 1.16 +++ kdebase4.spec 25 Jul 2008 15:38:18 -0000 1.17 @@ -1,7 +1,6 @@ - Summary: K Desktop Environment 4 - Core Files -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -22,18 +21,13 @@ License: GPLv2 Group: User Interface/Desktops URL: http://www.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# fedora specific nsplugins paths +Patch1: kdebase-nsplugins-paths.patch + ## upstream patches -# fix Konsole window size (backported from 4.1, #439638, kde#160422) -# http://websvn.kde.org/?view=rev&revision=793964 -# http://websvn.kde.org/?view=rev&revision=793970 -Patch100: kdebase-4.0.3-kde#160422.patch -# http://bugzilla.redhat.com/438786 (will upstream -- Rex) -Patch102: kdebase-4.0.3-kwrite-dt_categories.patch -# backporte from 4.1 -Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch BuildRequires: kde-filesystem >= 4 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } @@ -69,12 +63,16 @@ BuildRequires: hal-devel BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} +%if "%{name}" == "kdebase" +BuildRequires: kdebase-workspace-devel >= %{version} +%endif %ifnarch s390 s390x BuildRequires: libraw1394-devel BuildRequires: libusb-devel %endif BuildRequires: OpenEXR-devel BuildRequires: openssl-devel +BuildRequires: pciutils-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: qimageblitz-devel @@ -84,11 +82,12 @@ %else BuildRequires: samba %endif -BuildRequires: soprano-devel -BuildRequires: strigi-devel +BuildRequires: soprano-devel >= 2.0.97 +BuildRequires: strigi-devel >= 0.5.7 # needed? BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-proto-devel +BuildRequires: glib2-devel # Dolphin needs the ioslaves and icons from kdebase-runtime (#438632) Requires: kdebase-runtime oxygen-icon-theme @@ -124,19 +123,15 @@ %prep %setup -q -n kdebase-%{version} - -%patch100 -p0 -b .kde#160422 -%patch102 -p1 -b .kwrite-dt_categories -%patch103 -p1 -b .konqueror-updatehistoryentry +%patch1 -p0 -b .nsplugins-paths %build - mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -306,21 +301,57 @@ %changelog -* Tue Jun 03 2008 Than Ngo - 4.0.5-2 +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Tue Jul 22 2008 Rex Dieter 4.0.99-2 + respin (libraw1394) + +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Fri Jul 11 2008 Rex Dieter 4.0.98-2 +- BR: pciutils-devel + +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Tue Jun 24 2008 Luk???? Tinkl - 4.0.83-2 +- #426108: Add more directories to konqueror's default + plugin search path list + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Mon Jun 16 2008 Than Ngo 4.0.82-2 +- BR kdebase-workspace-devel (F9+) + +* Sun Jun 15 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Tue May 27 2008 Kevin Kofler 4.0.80-3 - respun tarball from upstream -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Tue May 27 2008 Than Ngo 4.0.80-2 +- rebuild to fix undefined symbol issue in dolphin -* Sat May 24 2008 Than Ngo 4.0.4-3 -- backport konqueror crash fix from trunk +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 -* Sun May 11 2008 Kevin Kofler 4.0.4-2 +* Sun May 11 2008 Kevin Kofler 4.0.72-2 - quote semicolon in fix for #442834 - only do the echo when konquerorsu.desktop is actually shipped (#445989) -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Tue May 06 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) +- drop backported kde#160422 and nspluginviewer patches +- add minimum versions to soprano-devel and strigi-devel BRs * Fri Apr 18 2008 Rex Dieter 4.0.3-9 - kwrite.desktop: Categories += Utility (#438786) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 5 Jun 2008 01:42:41 -0000 1.10 +++ sources 25 Jul 2008 15:38:18 -0000 1.11 @@ -1 +1 @@ -b3ba290cb675fbc4522704a39a503fe5 kdebase-4.0.5.tar.bz2 +6b58b056d27e3103f087f12abe899a49 kdebase-4.1.0.tar.bz2 --- kdebase-4.0.3-kde#160422.patch DELETED --- --- kdebase-4.0.3-kwrite-dt_categories.patch DELETED --- --- kdebase-4.0.4-konqueror-updatehistoryentry.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 15:41:11 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 25 Jul 2008 15:41:11 GMT Subject: rpms/perl-Catalyst-Manual/devel perl-Catalyst-Manual.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807251541.m6PFfB8T000867@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Manual/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv822 Modified Files: perl-Catalyst-Manual.spec sources Log Message: * Fri Jul 25 2008 Chris Weyl - update to 5.7013 - don't just exclude Catalyst::Manual's man page, but the .pm as well. (RH BZ#455151) * Wed Jun 25 2008 Chris Weyl 5.7012-2 - re-exclude Catalyst::Manual.3pm Index: perl-Catalyst-Manual.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Catalyst-Manual.spec 25 Jun 2008 21:54:46 -0000 1.5 +++ perl-Catalyst-Manual.spec 25 Jul 2008 15:40:40 -0000 1.6 @@ -1,7 +1,7 @@ Name: perl-Catalyst-Manual Epoch: 1 -Version: 5.7012 -Release: 2%{?dist} +Version: 5.7013 +Release: 1%{?dist} Summary: Catalyst web framework manual License: GPL+ or Artistic Group: Development/Libraries @@ -49,9 +49,15 @@ %{perl_vendorlib}/* %{_mandir}/man3/* # this is actually better done in perl-Catalyst-Runtime +%exclude %{perl_vendorlib}/Catalyst/Manual.pm %exclude %{_mandir}/man3/Catalyst::Manual.3* %changelog +* Fri Jul 25 2008 Chris Weyl +- update to 5.7013 +- don't just exclude Catalyst::Manual's man page, but the .pm as well. + (RH BZ#455151) + * Wed Jun 25 2008 Chris Weyl 5.7012-2 - re-exclude Catalyst::Manual.3pm Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Jun 2008 03:34:14 -0000 1.3 +++ sources 25 Jul 2008 15:40:40 -0000 1.4 @@ -1 +1 @@ -ae393f5f193d77a24f0aba62f979353f Catalyst-Manual-5.7012.tar.gz +928dd128c12a670b8a6c9ae8d66e1f40 Catalyst-Manual-5.7013.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:49:22 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Fri, 25 Jul 2008 15:49:22 GMT Subject: rpms/setup/F-9 .cvsignore, 1.50, 1.51 setup.spec, 1.55, 1.56 sources, 1.51, 1.52 Message-ID: <200807251549.m6PFnM5d001468@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/setup/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424 Modified Files: .cvsignore setup.spec sources Log Message: - Temporarily added rquotad to /etc/services - Dropped user news from default /etc/passwd (#437462) - Added prelude-manager and snortd to uidgid list Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/setup/F-9/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 7 Apr 2008 21:43:02 -0000 1.50 +++ .cvsignore 25 Jul 2008 15:48:51 -0000 1.51 @@ -1 +1 @@ -setup-2.6.14.tar.bz2 +setup-2.6.17.tar.bz2 Index: setup.spec =================================================================== RCS file: /cvs/pkgs/rpms/setup/F-9/setup.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- setup.spec 7 Apr 2008 21:43:02 -0000 1.55 +++ setup.spec 25 Jul 2008 15:48:51 -0000 1.56 @@ -1,6 +1,6 @@ Summary: A set of system configuration and setup files. Name: setup -Version: 2.6.14 +Version: 2.6.17 Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -76,6 +76,15 @@ %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %changelog +* Fri Jul 25 2008 Phil Knirsch 2.6.17-1 +- Temporarily added rquotad to /etc/services + +* Tue Jun 17 2008 Phil Knirsch 2.6.16-1 +- Dropped user news from default /etc/passwd (#437462) + +* Thu Jun 05 2008 Phil Knirsch 2.6.15-1 +- Added prelude-manager and snortd to uidgid list + * Mon Apr 07 2008 Phil Knirsch 2.6.14-1 - Updated /etc/services to latest IANA version (#315571) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/setup/F-9/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 7 Apr 2008 21:43:02 -0000 1.51 +++ sources 25 Jul 2008 15:48:51 -0000 1.52 @@ -1 +1 @@ -5ed27c5abbc82e4db0d2980043258f1f setup-2.6.14.tar.bz2 +1be48ea3c1332ad884d4bb0b22180e04 setup-2.6.17.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 15:50:13 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 25 Jul 2008 15:50:13 GMT Subject: rpms/perl-Catalyst-Manual/devel perl-Catalyst-Manual.spec,1.6,1.7 Message-ID: <200807251550.m6PFoDUA001582@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Manual/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1523 Modified Files: perl-Catalyst-Manual.spec Log Message: * Fri Jul 25 2008 Chris Weyl 5.7013-1 - update to 5.7013 - don't just exclude Catalyst::Manual's man page, but the .pm as well. (RH BZ#455151) * Wed Jun 25 2008 Chris Weyl 5.7012-2 - re-exclude Catalyst::Manual.3pm Index: perl-Catalyst-Manual.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Catalyst-Manual.spec 25 Jul 2008 15:40:40 -0000 1.6 +++ perl-Catalyst-Manual.spec 25 Jul 2008 15:49:43 -0000 1.7 @@ -53,7 +53,7 @@ %exclude %{_mandir}/man3/Catalyst::Manual.3* %changelog -* Fri Jul 25 2008 Chris Weyl +* Fri Jul 25 2008 Chris Weyl 5.7013-1 - update to 5.7013 - don't just exclude Catalyst::Manual's man page, but the .pm as well. (RH BZ#455151) From fedora-extras-commits at redhat.com Fri Jul 25 15:50:51 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 25 Jul 2008 15:50:51 GMT Subject: rpms/perl-Catalyst-Manual/F-9 .cvsignore, 1.2, 1.3 perl-Catalyst-Manual.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200807251550.m6PFopiG001639@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Manual/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1587 Modified Files: .cvsignore perl-Catalyst-Manual.spec sources Log Message: * Fri Jul 25 2008 Chris Weyl 5.7013-1 - update to 5.7013 - don't just exclude Catalyst::Manual's man page, but the .pm as well. (RH BZ#455151) * Wed Jun 25 2008 Chris Weyl 5.7012-2 - re-exclude Catalyst::Manual.3pm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jun 2007 15:46:14 -0000 1.2 +++ .cvsignore 25 Jul 2008 15:50:20 -0000 1.3 @@ -1 +1 @@ -Catalyst-Manual-5.700701.tar.gz +Catalyst-Manual-5.7013.tar.gz Index: perl-Catalyst-Manual.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-9/perl-Catalyst-Manual.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Catalyst-Manual.spec 25 Jun 2008 22:08:12 -0000 1.5 +++ perl-Catalyst-Manual.spec 25 Jul 2008 15:50:20 -0000 1.6 @@ -1,7 +1,7 @@ Name: perl-Catalyst-Manual Epoch: 1 -Version: 5.7012 -Release: 2%{?dist} +Version: 5.7013 +Release: 1%{?dist} Summary: Catalyst web framework manual License: GPL+ or Artistic Group: Development/Libraries @@ -49,9 +49,15 @@ %{perl_vendorlib}/* %{_mandir}/man3/* # this is actually better done in perl-Catalyst-Runtime +%exclude %{perl_vendorlib}/Catalyst/Manual.pm %exclude %{_mandir}/man3/Catalyst::Manual.3* %changelog +* Fri Jul 25 2008 Chris Weyl 5.7013-1 +- update to 5.7013 +- don't just exclude Catalyst::Manual's man page, but the .pm as well. + (RH BZ#455151) + * Wed Jun 25 2008 Chris Weyl 5.7012-2 - re-exclude Catalyst::Manual.3pm Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Jun 2008 16:13:48 -0000 1.3 +++ sources 25 Jul 2008 15:50:20 -0000 1.4 @@ -1 +1 @@ -ae393f5f193d77a24f0aba62f979353f Catalyst-Manual-5.7012.tar.gz +928dd128c12a670b8a6c9ae8d66e1f40 Catalyst-Manual-5.7013.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:55:03 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 15:55:03 GMT Subject: rpms/python-lxml/EL-4 .cvsignore, 1.15, 1.16 branch, 1.2, 1.3 python-lxml.spec, 1.18, 1.19 sources, 1.15, 1.16 Message-ID: <200807251555.m6PFt3Yq001941@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1898 Modified Files: .cvsignore branch python-lxml.spec sources Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.3.6-2 - Revert CVS back to a version of lxml that actually builds on EL-4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 25 Jul 2008 15:13:36 -0000 1.15 +++ .cvsignore 25 Jul 2008 15:54:33 -0000 1.16 @@ -1 +1 @@ -lxml-2.0.8.tar.gz +lxml-1.3.6.tar.gz Index: branch =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/branch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- branch 25 Jul 2008 15:13:36 -0000 1.2 +++ branch 25 Jul 2008 15:54:33 -0000 1.3 @@ -1 +1 @@ -F-9 +EL-4 Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/python-lxml.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- python-lxml.spec 25 Jul 2008 15:13:36 -0000 1.18 +++ python-lxml.spec 25 Jul 2008 15:54:33 -0000 1.19 @@ -1,24 +1,19 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.8 -Release: 1%{?dist} +Version: 1.3.6 +Release: 2%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt Group: Development/Libraries License: BSD URL: http://codespeak.net/lxml/ Source0: http://cheeseshop.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz -#Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python-devel BuildRequires: libxslt-devel - -%if 0%{?fedora} >= 8 -BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif +BuildRequires: python-setuptools %description lxml provides a Python binding to the libxslt and libxml2 libraries. @@ -49,30 +44,8 @@ %{python_sitearch}/* %changelog -* Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 -- Update to 2.0.8 - -* Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 -- Update to 2.0.7 -- Update download URL - -* Sat May 31 2008 Jeffrey C. Ollie - 2.0.6-1 -- Update to 2.0.6 - -* Thu May 8 2008 Jeffrey C. Ollie - 2.0.5-1 -- Update to 2.0.5 - -* Wed Mar 26 2008 Jeffrey C. Ollie - 2.0.3-1 -- Update to 2.0.3 - -* Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 -- Update to 2.0.2 - -* Tue Feb 19 2008 Jeffrey C. Ollie - 2.0.1-1 -- Update to 2.0.1 - -* Tue Feb 19 2008 Fedora Release Engineering - 1.3.6-2 -- Autorebuild for GCC 4.3 +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.3.6-2 +- Revert CVS back to a version of lxml that actually builds on EL-4. * Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 - Update to 1.3.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 25 Jul 2008 15:13:36 -0000 1.15 +++ sources 25 Jul 2008 15:54:33 -0000 1.16 @@ -1 +1 @@ -f3e7ad6e0e4b66d596e8f301c6943b43 lxml-2.0.8.tar.gz +a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 15:56:23 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 15:56:23 GMT Subject: rpms/kdebase4/F-8 kdebase4.spec,1.17,1.18 Message-ID: <200807251556.m6PFuN0x002054@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2024/F-8 Modified Files: kdebase4.spec Log Message: * Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 - always check for Plasma actually being present (fixes F8 kdebase4 build) Index: kdebase4.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- kdebase4.spec 25 Jul 2008 15:38:18 -0000 1.17 +++ kdebase4.spec 25 Jul 2008 15:55:52 -0000 1.18 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 %if 0%{?fedora} > 8 Name: kdebase @@ -124,6 +124,8 @@ %prep %setup -q -n kdebase-%{version} %patch1 -p0 -b .nsplugins-paths +# fix incorrect assumption that we're building in a combined kdebase tree +sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt %build mkdir -p %{_target_platform} @@ -301,6 +303,9 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 +- always check for Plasma actually being present (fixes F8 kdebase4 build) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Fri Jul 25 15:57:31 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Fri, 25 Jul 2008 15:57:31 GMT Subject: rpms/xorg-x11-server/OLPC-3 swrast-dont-abort.patch, 1.1, 1.2 xorg-x11-server.spec, 1.339, 1.340 Message-ID: <200807251557.m6PFvVmN002182@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2076 Modified Files: swrast-dont-abort.patch xorg-x11-server.spec Log Message: update swrast patch to upstream version, fixes errno bug swrast-dont-abort.patch: Index: swrast-dont-abort.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/swrast-dont-abort.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swrast-dont-abort.patch 24 Jul 2008 19:06:12 -0000 1.1 +++ swrast-dont-abort.patch 25 Jul 2008 15:57:01 -0000 1.2 @@ -1,30 +1,32 @@ -From 6bf46df463d19456761ae670f60e0b153e285bd9 Mon Sep 17 00:00:00 2001 +From eff25430b4a391409e39337962ff7697165d23c7 Mon Sep 17 00:00:00 2001 From: Daniel Drake -Date: Thu, 24 Jul 2008 14:42:22 -0400 +Date: Thu, 24 Jul 2008 21:06:34 -0500 Subject: [PATCH] Don't abort if swrast library is not present +GLX is enabled by default, but the current swrast behaviour causes X +to abort with fatal error if the swrast dri library dlopen fails. + +Handle the case where the swrast library is not present, and do not +register the GLX extension unless at least one screen has a usable +GL provider. --- - glx/glxdriswrast.c | 6 ++++++ + glx/glxdriswrast.c | 2 +- glx/glxext.c | 37 ++++++++++++++++++++++++------------- - 2 files changed, 30 insertions(+), 13 deletions(-) + 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c -index cf4827e..20c39ab 100644 +index 199f5f8..2859704 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c -@@ -468,6 +468,12 @@ __glXDRIscreenProbe(ScreenPtr pScreen) +@@ -515,7 +515,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { -+ if (errno == ENOENT) { -+ xfree(screen); -+ LogMessage(X_INFO, "AIGLX: swrast library %s not found\n", -+ filename); -+ return NULL; -+ } - LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", - filename, dlerror()); - goto handle_error; + xfree(screen); + +- FatalError("GLX: could not load software renderer\n"); ++ LogMessage(X_ERROR, "GLX: could not load software renderer\n"); + + return NULL; + } diff --git a/glx/glxext.c b/glx/glxext.c index 13c65da..6ba404f 100644 --- a/glx/glxext.c Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v retrieving revision 1.339 retrieving revision 1.340 diff -u -r1.339 -r1.340 --- xorg-x11-server.spec 24 Jul 2008 19:06:12 -0000 1.339 +++ xorg-x11-server.spec 25 Jul 2008 15:57:01 -0000 1.340 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.906 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -462,6 +462,10 @@ %changelog +* Fri Jul 25 2008 Daniel Drake 1.4.99.906-2 +- update no-swrast patch to the one that went upstream, this one had a bug + (dlopen isn't documented to populate errno) + * Thu Jul 24 2008 Daniel Drake 1.4.99.906-1 - resync with F-9 for new xinput ABI - add patch to allow X server to run when mesa's swrast is not present From fedora-extras-commits at redhat.com Fri Jul 25 15:58:07 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Fri, 25 Jul 2008 15:58:07 GMT Subject: rpms/setup/devel .cvsignore, 1.52, 1.53 setup.spec, 1.57, 1.58 sources, 1.53, 1.54 Message-ID: <200807251558.m6PFw7es002271@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/setup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2186 Modified Files: .cvsignore setup.spec sources Log Message: - Bump to 2.7.1 to avoid version problems with F-9 - Removed group news as well (#437462) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/setup/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 23 Jun 2008 12:14:32 -0000 1.52 +++ .cvsignore 25 Jul 2008 15:57:36 -0000 1.53 @@ -1 +1 @@ -setup-2.6.16.tar.bz2 +setup-2.7.1.tar.bz2 Index: setup.spec =================================================================== RCS file: /cvs/pkgs/rpms/setup/devel/setup.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- setup.spec 23 Jun 2008 12:14:32 -0000 1.57 +++ setup.spec 25 Jul 2008 15:57:36 -0000 1.58 @@ -1,6 +1,6 @@ Summary: A set of system configuration and setup files. Name: setup -Version: 2.6.16 +Version: 2.7.1 Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -76,6 +76,10 @@ %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %changelog +* Fri Jul 25 2008 Phil Knirsch 2.7.1-1 +- Bump to 2.7.1 to avoid version problems with F-9 +- Removed group news as well (#437462) + * Tue Jun 17 2008 Phil Knirsch 2.6.16-1 - Dropped user news from default /etc/passwd (#437462) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/setup/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 23 Jun 2008 12:14:32 -0000 1.53 +++ sources 25 Jul 2008 15:57:36 -0000 1.54 @@ -1 +1 @@ -fb8a1a0e9e6bd4894f55f937bcfabcad setup-2.6.16.tar.bz2 +411120aebc89a60abd84ad60b9546f07 setup-2.7.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 15:58:52 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 15:58:52 GMT Subject: rpms/asterisk/devel 0011-Merged-revisions-123952-via-svnmerge-from.patch, NONE, 1.1 asterisk.spec, 1.28, 1.29 Message-ID: <200807251558.m6PFwqgm002399@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2326 Modified Files: asterisk.spec Added Files: 0011-Merged-revisions-123952-via-svnmerge-from.patch Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.18.beta9 - Add patch for LDAP extracted from upstream SVN (#442011) 0011-Merged-revisions-123952-via-svnmerge-from.patch: --- NEW FILE 0011-Merged-revisions-123952-via-svnmerge-from.patch --- >From 5931413c9269ef3fca3444a2c10865860f907758 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 19 Jun 2008 17:23:22 +0000 Subject: [PATCH] Merged revisions 123952 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r123952 | tilghman | 2008-06-19 12:22:27 -0500 (Thu, 19 Jun 2008) | 6 lines Don't change pointers that need to be later passed back for deallocation. (closes issue #12572) Reported by: flyn Patches: 20080613__bug12572.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 123958 614ede4d-c843-0410-af14-a771ab80d22e --- res/res_config_ldap.c | 85 +++++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 41 deletions(-) diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 7ce37c6..01050ca 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -282,33 +282,36 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); /* these are freed at the end */ if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; - ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, value->bv_val); + valptr = value->bv_val; + ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, valptr); if (is_realmed_password_attribute) { - if (!strncasecmp(value->bv_val, "{md5}", 5)) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (!strncasecmp(valptr, "{md5}", 5)) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { /* ok, so looping through all delimited values except the last one (not, last character is not delimited...) */ if (is_delimited) { i = 0; pos = 0; - while (!ast_strlen_zero(value->bv_val + i)) { - if (value->bv_val[i] == ';'){ - value->bv_val[i] = '\0'; + while (!ast_strlen_zero(valptr + i)) { + if (valptr[i] == ';'){ + valptr[i] = '\0'; if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } pos = i + 1; } @@ -317,15 +320,14 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config } /* for the last delimited value or if the value is not delimited: */ if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } } - v++; } ldap_value_free_len(values); } @@ -400,23 +402,26 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; + valptr = value->bv_val; if (is_realmed_password_attribute) { - if (strncasecmp(value->bv_val, "{md5}", 5) == 0) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (strncasecmp(valptr, "{md5}", 5) == 0) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { if (delim_value == NULL && !is_realmed_password_attribute && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0)) { - delim_value = ast_strdup(value->bv_val); + delim_value = ast_strdup(valptr); if ((delim_tot_count = semicolon_count_str(delim_value)) > 0) { ast_debug(4, "LINE(%d) is delimited %d times: %s\n", __LINE__, delim_tot_count, delim_value); @@ -426,11 +431,10 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf if (is_delimited != 0 && !is_realmed_password_attribute - && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ){ + && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ) { /* for non-Static RealTime, first */ - i = pos; - while (!ast_strlen_zero(value->bv_val + i)) { + for (i = pos; !ast_strlen_zero(valptr + i); i++) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); if (delim_value[i] == ';') { delim_value[i] = '\0'; @@ -451,9 +455,8 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf break; } } - i++; } - if (ast_strlen_zero(value->bv_val + i)) { + if (ast_strlen_zero(valptr + i)) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d delim_count: %d\n", __LINE__, pos, i, delim_count); /* Last delimited value */ ast_debug(4, "LINE(%d) DELIM - attribute_name: %s value: %s pos: %d\n", __LINE__, attribute_name, &delim_value[pos], pos); @@ -468,9 +471,9 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf /* Remembering to free memory */ is_delimited = 0; pos = 0; - free(delim_value); - delim_value = NULL; } + free(delim_value); + delim_value = NULL; ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); } else { @@ -479,20 +482,19 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf free(delim_value); delim_value = NULL; } - ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, value->bv_val); + ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, valptr); if (prev) { - prev->next = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev->next = ast_variable_new(attribute_name, valptr, table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev = var = ast_variable_new(attribute_name, valptr, table_config->table_name); } } } - v++; - } /*!< while(*v) */ + } /*!< for (v = values; *v; v++) */ ldap_value_free_len(values); }/*!< if (values) */ ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber); @@ -1459,10 +1461,11 @@ int parse_config(void) static_table_config = table_config; } for (; var; var = var->next) { - if (!strcasecmp(var->name, "additionalFilter")) - table_config->additional_filter = strdup(var->value); - else + if (!strcasecmp(var->name, "additionalFilter")) { + table_config->additional_filter = ast_strdup(var->value); + } else { ldap_table_config_add_attribute(table_config, var->name, var->value); + } } } } -- 1.5.5.2 Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- asterisk.spec 2 Jul 2008 16:12:30 -0000 1.28 +++ asterisk.spec 25 Jul 2008 15:58:22 -0000 1.29 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.17.beta%{beta}%{?dist} +Release: 0.18.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -44,6 +44,7 @@ Patch8: 0008-Build-using-external-libedit.patch Patch9: 0009-Update-cdr_tds-to-latest.patch Patch10: 0010-Update-autoconf.patch +Patch11: 0011-Merged-revisions-123952-via-svnmerge-from.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -413,6 +414,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 cp %{SOURCE2} menuselect.makedeps cp %{SOURCE3} menuselect.makeopts @@ -1023,6 +1025,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.18.beta9 +- Add patch for LDAP extracted from upstream SVN (#442011) + * Thu Jul 2 2008 Jeffrey C. Ollie - 1.6.0-0.17.beta9 - Add patch that unbreaks cdr_tds with FreeTDS 0.82. - Properly obsolete conference subpackage. From fedora-extras-commits at redhat.com Fri Jul 25 16:01:53 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 16:01:53 GMT Subject: rpms/libmusicbrainz3/devel libmusicbrainz-3.0.1-private.patch, NONE, 1.1 libmusicbrainz3.spec, 1.2, 1.3 Message-ID: <200807251601.m6PG1rr0009260@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libmusicbrainz3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204 Modified Files: libmusicbrainz3.spec Added Files: libmusicbrainz-3.0.1-private.patch Log Message: * Fri Jul 25 2008 Rex Dieter 3.0.1-3 - fix recursive linking against libdiscid neon libmusicbrainz-3.0.1-private.patch: --- NEW FILE libmusicbrainz-3.0.1-private.patch --- diff -up libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake --- libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private 2007-05-11 17:55:10.000000000 -0500 +++ libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake 2008-07-25 10:56:33.000000000 -0500 @@ -7,7 +7,7 @@ Name: ${PROJECT_NAME} Description: The Musicbrainz Client Library. URL: http://musicbrainz.org/doc/libmusicbrainz Version: ${PROJECT_VERSION} -Requires: neon >= 0.25, libdiscid +Requires.private: neon >= 0.25, libdiscid Libs: -L${LIB_INSTALL_DIR} -lmusicbrainz3 Cflags: -I${INCLUDE_INSTALL_DIR} Index: libmusicbrainz3.spec =================================================================== RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/libmusicbrainz3.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libmusicbrainz3.spec 24 Jul 2008 23:42:50 -0000 1.2 +++ libmusicbrainz3.spec 25 Jul 2008 16:01:23 -0000 1.3 @@ -4,14 +4,16 @@ Summary: Library for accessing MusicBrainz servers Name: libmusicbrainz3 Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.musicbrainz.org/ Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# upstream these -- Rex Patch1: libmusicbrainz-3.0.1-gcc43.patch +Patch2: libmusicbrainz-3.0.1-private.patch BuildRequires: cmake BuildRequires: libdiscid-devel @@ -27,7 +29,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig -# FIXME +# patch2 likely fixes this , confirm w/upstream -- Rex Requires: libdiscid-devel neon-devel %description devel This package contains the headers that programmers will need to develop @@ -38,6 +40,7 @@ %setup -q -n libmusicbrainz-%{version} %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .private %build @@ -67,16 +70,19 @@ %files %defattr(-,root,root,-) %doc AUTHORS.txt COPYING.txt NEWS.txt README.txt -%{_libdir}/lib*.so.* +%{_libdir}/libmusicbrainz3.so.6* %files devel %defattr(-,root,root,-) %{_includedir}/musicbrainz3/ -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libmusicbrainz3.so +%{_libdir}/pkgconfig/libmusicbrainz3.pc %changelog +* Fri Jul 25 2008 Rex Dieter 3.0.1-3 +- fix recursive linking against libdiscid neon + * Thu Jul 24 2008 Rex Dieter 3.0.1-2 - BR: libdiscid-devel - -devel: Requires: libdiscid-devel neon-devel From fedora-extras-commits at redhat.com Fri Jul 25 16:02:23 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Fri, 25 Jul 2008 16:02:23 GMT Subject: rpms/gnome-python2/OLPC-3 no-bonobo-activation.patch, NONE, 1.1 gnome-python2.spec, 1.20, 1.21 Message-ID: <200807251602.m6PG2NV4009358@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/gnome-python2/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9255 Modified Files: gnome-python2.spec Added Files: no-bonobo-activation.patch Log Message: remove dependency on bonobo, modularize libgnome bindings no-bonobo-activation.patch: --- NEW FILE no-bonobo-activation.patch --- Index: gnome-python-2.22.1/configure.ac =================================================================== --- gnome-python-2.22.1.orig/configure.ac +++ gnome-python-2.22.1/configure.ac @@ -243,8 +243,7 @@ fi dnl should we build the gnomevfs python module bridge? AC_ARG_BINDING([pyvfsmodule], [ON], [bridge]) if $build_pyvfsmodule; then - PKG_CHECK_MODULES(GNOME_VFS_MODULE, [gnome-vfs-module-2.0 >= libgnomevfs_required_version dnl - bonobo-activation-2.0 >= bonobo_activation_required_version], + PKG_CHECK_MODULES(GNOME_VFS_MODULE, [gnome-vfs-module-2.0 >= libgnomevfs_required_version], build_pyvfsmodule=true, build_pyvfsmodule=false) fi Index: gnome-python2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2/OLPC-3/gnome-python2.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnome-python2.spec 17 Jun 2008 04:50:27 -0000 1.20 +++ gnome-python2.spec 25 Jul 2008 16:01:53 -0000 1.21 @@ -1,4 +1,5 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define minimal_build 1 # Last updated for 2.22.0 # The order here corresponds to that in configure.ac, @@ -21,17 +22,17 @@ Name: gnome-python2 Version: 2.22.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Languages Summary: The sources for the PyGNOME Python extension module URL: http://download.gnome.org/sources/gnome-python/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Source: http://download.gnome.org/sources/gnome-python/2.22/gnome-python-%{version}.tar.bz2 +Patch0: no-bonobo-activation.patch ### Dependencies ### -Requires: gnome-python2-bonobo Requires: gnome-python2-gnomevfs Requires: pygtk2 >= %{pygtk_version} @@ -44,6 +45,7 @@ BuildRequires: pygtk2-devel >= %{pygtk_version} BuildRequires: pyorbit-devel >= %{pyorbit_version} BuildRequires: python2-devel >= %{python_version} +BuildRequires: libtool Obsoletes: gnome-python2-nautilus @@ -55,6 +57,15 @@ base GNOME libraries, so you have access to more widgets, a simple configuration interface, and metadata support. +%package gnome +Summary: Python bindings for libgnome +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description gnome +This module contains a wrapper that makes libgnome functionality available +from Python. + %package capplet Summary: Python bindings for GNOME Panel applets. Group: Development/Languages @@ -103,7 +114,10 @@ Group: Development/Languages Requires: %{name} = %{version}-%{release} Requires: gnome-vfs2 >= %{libgnomevfs_version} + +%if %{minimal_build} == 0 Requires: libbonobo >= %{libbonobo_version} +%endif %description gnomevfs This module contains a wrapper that allows the use of gnome-vfs via python. @@ -122,9 +136,15 @@ %prep %setup -q -n gnome-python-%{version} +%patch0 -p1 +autoreconf -f -i %build +%if %{minimal_build} == 0 %configure +%else +%configure --disable-gnomevfsbonobo +%endif make %install @@ -139,17 +159,23 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS %dir %{python_sitearch}/gtk-2.0/gnome/ +%dir %{_datadir}/pygtk/2.0/defs +%dir %{_datadir}/pygtk/2.0/argtypes + +%files gnome %{python_sitearch}/gtk-2.0/gnome/__init__.* %{python_sitearch}/gtk-2.0/gnome/_gnome.so %{python_sitearch}/gtk-2.0/gnome/ui.so -%{_datadir}/pygtk/ +%{_datadir}/pygtk/2.0/defs/ui.defs +%{_datadir}/pygtk/2.0/defs/gnome.defs +%{_datadir}/pygtk/2.0/defs/gnome-types.defs %files canvas %defattr(-,root,root,-) %dir %{python_sitearch}/gtk-2.0/gnome/ -%{python_sitearch}/gtk-2.0/gnome/__init__.* %{python_sitearch}/gtk-2.0/gnome/canvas.* %{python_sitearch}/gtk-2.0/gnomecanvas.so +%{_datadir}/pygtk/2.0/defs/canvas.defs %defattr(644,root,root,755) %doc examples/canvas/* @@ -158,12 +184,16 @@ %dir %{python_sitearch}/gtk-2.0/bonobo/ %{python_sitearch}/gtk-2.0/bonobo/__init__.* %{python_sitearch}/gtk-2.0/bonobo/*.so +%{_datadir}/pygtk/2.0/defs/bonobo*.defs +%{_datadir}/pygtk/2.0/argtypes/bonobo* %defattr(644,root,root,755) %doc examples/bonobo/* %files gconf %defattr(-,root,root,-) %{python_sitearch}/gtk-2.0/gconf.so +%{_datadir}/pygtk/2.0/defs/gconf.defs +%{_datadir}/pygtk/2.0/argtypes/gconf* %defattr(644,root,root,755) %doc examples/gconf/* @@ -175,6 +205,7 @@ %dir %{_datadir}/gtk-doc/ %dir %{_datadir}/gtk-doc/html/ %doc %{_datadir}/gtk-doc/html/pygnomevfs + %defattr(644,root,root,755) %doc examples/vfs/* @@ -191,6 +222,10 @@ rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo} %changelog +* Fri Jul 25 2008 Daniel Drake - 2.22.1-3.olpc3 +- Remove gnomevfs dependency on libbonobo +- Modularize libgnome bindings + * Tue Jun 17 2008 Matthew Barnes - 2.22.1-2.fc9 - Fix directory ownership (RH bug #451754). From fedora-extras-commits at redhat.com Fri Jul 25 16:03:16 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 16:03:16 GMT Subject: rpms/python-lxml/EL-4 python-lxml.spec,1.19,1.20 Message-ID: <200807251603.m6PG3Gol009456@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9392 Modified Files: python-lxml.spec Log Message: Use setup.py directly. Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/python-lxml.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- python-lxml.spec 25 Jul 2008 15:54:33 -0000 1.19 +++ python-lxml.spec 25 Jul 2008 16:02:46 -0000 1.20 @@ -29,11 +29,11 @@ chmod a-x doc/rest2html.py %build -CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build +CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} -%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} +%{__python} setup.py install --skip-build --root %{buildroot} %clean rm -rf %{buildroot} From fedora-extras-commits at redhat.com Fri Jul 25 16:16:44 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 16:16:44 GMT Subject: rpms/kdebase/F-9 kdebase.spec,1.329,1.330 Message-ID: <200807251616.m6PGGiCs010409@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10320/F-9 Modified Files: kdebase.spec Log Message: Sync from kdebase4/F-8: * Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 - always check for Plasma actually being present (fixes F8 kdebase4 build) (No new devel build needed.) Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- kdebase.spec 23 Jul 2008 12:28:48 -0000 1.329 +++ kdebase.spec 25 Jul 2008 16:16:14 -0000 1.330 @@ -1,7 +1,6 @@ - Summary: K Desktop Environment 4 - Core Files -Version: 4.0.99 -Release: 1%{?dist} +Version: 4.1.0 +Release: 1%{?dist}.1 %if 0%{?fedora} > 8 Name: kdebase @@ -125,6 +124,8 @@ %prep %setup -q -n kdebase-%{version} %patch1 -p0 -b .nsplugins-paths +# fix incorrect assumption that we're building in a combined kdebase tree +sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt %build mkdir -p %{_target_platform} @@ -302,6 +303,15 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 +- always check for Plasma actually being present (fixes F8 kdebase4 build) + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Tue Jul 22 2008 Rex Dieter 4.0.99-2 + respin (libraw1394) + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 From fedora-extras-commits at redhat.com Fri Jul 25 16:16:45 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 16:16:45 GMT Subject: rpms/kdebase/devel kdebase.spec,1.338,1.339 Message-ID: <200807251616.m6PGGjRk010415@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10320/devel Modified Files: kdebase.spec Log Message: Sync from kdebase4/F-8: * Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 - always check for Plasma actually being present (fixes F8 kdebase4 build) (No new devel build needed.) Index: kdebase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.338 retrieving revision 1.339 diff -u -r1.338 -r1.339 --- kdebase.spec 23 Jul 2008 13:17:58 -0000 1.338 +++ kdebase.spec 25 Jul 2008 16:16:15 -0000 1.339 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 %if 0%{?fedora} > 8 Name: kdebase @@ -124,6 +124,8 @@ %prep %setup -q -n kdebase-%{version} %patch1 -p0 -b .nsplugins-paths +# fix incorrect assumption that we're building in a combined kdebase tree +sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt %build mkdir -p %{_target_platform} @@ -301,6 +303,9 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-1.1 +- always check for Plasma actually being present (fixes F8 kdebase4 build) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Fri Jul 25 16:19:47 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 16:19:47 GMT Subject: rpms/python-lxml/F-8 branch,1.2,1.3 Message-ID: <200807251619.m6PGJlUH010686@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10633 Modified Files: branch Log Message: Fix branch. Index: branch =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/branch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- branch 25 Jul 2008 15:09:56 -0000 1.2 +++ branch 25 Jul 2008 16:19:17 -0000 1.3 @@ -1 +1 @@ -F-9 +F-8 From fedora-extras-commits at redhat.com Fri Jul 25 16:20:42 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 16:20:42 GMT Subject: rpms/python-lxml/EL-5 branch,1.2,1.3 Message-ID: <200807251620.m6PGKgpD010783@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10723 Modified Files: branch Log Message: Fix branch. Index: branch =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/branch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- branch 25 Jul 2008 15:10:45 -0000 1.2 +++ branch 25 Jul 2008 16:20:12 -0000 1.3 @@ -1 +1 @@ -F-9 +EL-5 From fedora-extras-commits at redhat.com Fri Jul 25 16:20:41 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 16:20:41 GMT Subject: rpms/kdebase/F-9 .cvsignore,1.70,1.71 sources,1.94,1.95 Message-ID: <200807251620.m6PGKf5b010777@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10704/F-9 Modified Files: .cvsignore sources Log Message: Completely sync 4.1.0-1.1 to F-9. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/F-9/.cvsignore,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- .cvsignore 21 Jul 2008 18:11:06 -0000 1.70 +++ .cvsignore 25 Jul 2008 16:20:11 -0000 1.71 @@ -1 +1,2 @@ kdebase-4.0.99.tar.bz2 +kdebase-4.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase/F-9/sources,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- sources 21 Jul 2008 18:11:06 -0000 1.94 +++ sources 25 Jul 2008 16:20:11 -0000 1.95 @@ -1 +1 @@ -bc6959d918a06a7f0b0a091f5e632bf8 kdebase-4.0.99.tar.bz2 +6b58b056d27e3103f087f12abe899a49 kdebase-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:21:40 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 25 Jul 2008 16:21:40 GMT Subject: rpms/kernel/devel patch-2.6.26-git12.bz2.sign, NONE, 1.1 .cvsignore, 1.876, 1.877 config-generic, 1.141, 1.142 config-x86-generic, 1.44, 1.45 config-x86_64-generic, 1.43, 1.44 kernel.spec, 1.803, 1.804 linux-2.6-execshield.patch, 1.93, 1.94 sources, 1.837, 1.838 upstream, 1.754, 1.755 patch-2.6.26-git11.bz2.sign, 1.1, NONE Message-ID: <200807251621.m6PGLeA6010890@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10831 Modified Files: .cvsignore config-generic config-x86-generic config-x86_64-generic kernel.spec linux-2.6-execshield.patch sources upstream Added Files: patch-2.6.26-git12.bz2.sign Removed Files: patch-2.6.26-git11.bz2.sign Log Message: 2.6.26-git12 --- NEW FILE patch-2.6.26-git12.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIiXqNyGugalF9Dw4RAs7CAJ4knjgnFYdKhSVJMUqZAe9qPUVBUgCaAula uJtXeAM3LJeB+SrJcqHd4pI= =+FyK -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.876 retrieving revision 1.877 diff -u -r1.876 -r1.877 --- .cvsignore 24 Jul 2008 08:28:26 -0000 1.876 +++ .cvsignore 25 Jul 2008 16:21:10 -0000 1.877 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git11.bz2 +patch-2.6.26-git12.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- config-generic 24 Jul 2008 16:15:13 -0000 1.141 +++ config-generic 25 Jul 2008 16:21:10 -0000 1.142 @@ -2353,6 +2353,7 @@ CONFIG_FB_ATY_GX=y CONFIG_FB_ATY_GENERIC_LCD=y # CONFIG_FB_ASILIANT is not set +# CONFIG_FB_CARMINE is not set CONFIG_FB_CIRRUS=m # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_CYBLA is not set @@ -3270,6 +3271,7 @@ CONFIG_FB_ATY_BACKLIGHT=y CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m CONFIG_SCHEDSTATS=y CONFIG_SCHED_DEBUG=y @@ -3315,6 +3317,7 @@ CONFIG_PM_DEBUG=y CONFIG_PM_TRACE=y # CONFIG_PM_VERBOSE is not set +CONFIG_PM_TEST_SUSPEND=y CONFIG_CRASH=m @@ -3479,14 +3482,16 @@ CONFIG_RESOURCES_64BIT=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y +# CONFIG_LEDS_AMS_DELTA is not set # CONFIG_LEDS_CORGI is not set +# CONFIG_LEDS_IXP4XX is not set # CONFIG_LEDS_LOCOMO is not set +# CONFIG_LEDS_NET48XX is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_S3C24XX is not set # CONFIG_LEDS_SPITZ is not set -# CONFIG_LEDS_IXP4XX is not set # CONFIG_LEDS_TOSA is not set -# CONFIG_LEDS_S3C24XX is not set -# CONFIG_LEDS_AMS_DELTA is not set -# CONFIG_LEDS_NET48XX is not set CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y @@ -3625,3 +3630,4 @@ # FIXME: This should be x86/ia64 only # CONFIG_HP_ILO is not set + Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- config-x86-generic 24 Jul 2008 16:40:21 -0000 1.44 +++ config-x86-generic 25 Jul 2008 16:21:10 -0000 1.45 @@ -405,3 +405,4 @@ CONFIG_HP_ILO=m +CONFIG_BACKLIGHT_MBP_NVIDIA=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- config-x86_64-generic 24 Jul 2008 16:40:21 -0000 1.43 +++ config-x86_64-generic 25 Jul 2008 16:21:10 -0000 1.44 @@ -305,3 +305,5 @@ # CONFIG_MMIOTRACE is not set CONFIG_X86_MPPARSE=y + +CONFIG_BACKLIGHT_MBP_NVIDIA=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.803 retrieving revision 1.804 diff -u -r1.803 -r1.804 --- kernel.spec 24 Jul 2008 16:44:01 -0000 1.803 +++ kernel.spec 25 Jul 2008 16:21:10 -0000 1.804 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 11 +%define gitrev 12 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1696,6 +1696,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Fri Jul 25 2008 Dave Jones +- 2.6.26-git12 + * Thu Jul 24 2008 Mark McLoughlin - Enable Xen guest support in kernel-PAE.i686 and kernel.x86_64 - Obsolete kernel-xen linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- linux-2.6-execshield.patch 21 Jul 2008 20:11:41 -0000 1.93 +++ linux-2.6-execshield.patch 25 Jul 2008 16:21:10 -0000 1.94 @@ -798,9 +798,9 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -2048,6 +2139,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -2173,6 +2173,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); - free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); + free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); + arch_flush_exec_range(mm); Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.837 retrieving revision 1.838 diff -u -r1.837 -r1.838 --- sources 24 Jul 2008 08:28:26 -0000 1.837 +++ sources 25 Jul 2008 16:21:10 -0000 1.838 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -31df4b444a2404677d0003611190f417 patch-2.6.26-git11.bz2 +81488c85358bd593d7bb2e952b7c48fb patch-2.6.26-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.754 retrieving revision 1.755 diff -u -r1.754 -r1.755 --- upstream 24 Jul 2008 08:28:26 -0000 1.754 +++ upstream 25 Jul 2008 16:21:10 -0000 1.755 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git11.bz2 +patch-2.6.26-git12.bz2 --- patch-2.6.26-git11.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 16:23:20 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 25 Jul 2008 16:23:20 GMT Subject: rpms/mysqltuner/devel mysqltuner.spec,1.3,1.4 Message-ID: <200807251623.m6PGNK34011103@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/mysqltuner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11031 Modified Files: mysqltuner.spec Log Message: bump Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/devel/mysqltuner.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mysqltuner.spec 21 Jul 2008 21:06:07 -0000 1.3 +++ mysqltuner.spec 25 Jul 2008 16:22:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: mysqltuner Version: 0.9.8 -Release: 1 +Release: 2 Summary: MySQL high performance tuning script Group: Applications/Databases @@ -45,7 +45,7 @@ %changelog -* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-1 +* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-2 - 0.9.8, --checkversion patch applied upstream. * Sat Jun 21 2008 Ville Skytt?? - 0.9.1-4 From fedora-extras-commits at redhat.com Fri Jul 25 16:24:42 2008 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Fri, 25 Jul 2008 16:24:42 GMT Subject: rpms/pdns-recursor/F-9 pdns-recursor.spec,1.5,1.6 Message-ID: <200807251624.m6PGOgLt011173@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/pdns-recursor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11132 Modified Files: pdns-recursor.spec Log Message: * Fri Jul 25 2008 Ruben Kerkhof - 3.1.7-1 - Upstream released new version, now with Lua support Index: pdns-recursor.spec =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/F-9/pdns-recursor.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pdns-recursor.spec 2 Apr 2008 21:45:46 -0000 1.5 +++ pdns-recursor.spec 25 Jul 2008 16:24:12 -0000 1.6 @@ -1,19 +1,19 @@ Summary: Modern, advanced and high performance recursing/non authoritative nameserver Name: pdns-recursor -Version: 3.1.5 +Version: 3.1.7 Release: 1%{?dist} Group: System Environment/Daemons License: GPLv2 URL: http://powerdns.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://downloads.powerdns.com/releases/pdns-recursor-3.1.5.tar.bz2 +Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2 Source1: pdns-recursor.init Patch0: pdns-recursor-fixsysconfdir.patch Patch1: pdns-recursor-fixmakefile.patch Provides: powerdns-recursor = %{version}-%{release} -BuildRequires: boost-devel +BuildRequires: boost-devel, lua-devel, lua Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service @@ -27,7 +27,8 @@ %patch1 -p1 -b .fixmakefile %build -make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" +LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} @@ -75,6 +76,9 @@ %changelog +* Fri Jul 25 2008 Ruben Kerkhof - 3.1.7-1 +- Upstream released new version, now with Lua support + * Wed Apr 02 2008 Ruben Kerkhof - 3.1.5 - Upstream released new version From fedora-extras-commits at redhat.com Fri Jul 25 16:31:46 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 16:31:46 GMT Subject: rpms/vino/devel vino.desktop,NONE,1.1 vino.spec,1.71,1.72 Message-ID: <200807251631.m6PGVk6A011496@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/vino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11452 Modified Files: vino.spec Added Files: vino.desktop Log Message: add autostart for the server --- NEW FILE vino.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Remote Desktop Server Comment=Allow remote access to your desktop Icon=preferences-desktop-remote-desktop Exec=/usr/libexec/vino-server Terminal=false Type=Application Categories= OnlyShowIn=GNOME; AutostartCondition=GNOME /desktop/gnome/remote_access/enabled Index: vino.spec =================================================================== RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- vino.spec 25 Jul 2008 04:04:31 -0000 1.71 +++ vino.spec 25 Jul 2008 16:31:16 -0000 1.72 @@ -9,9 +9,11 @@ Summary: A remote desktop system for GNOME Name: vino Version: 2.23.5 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/vino/2.23/%{name}-%{version}.tar.bz2 +# http://bugzilla.gnome.org/show_bug.cgi?id=544719 +Source1: vino.desktop License: GPLv2+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +71,8 @@ # stuff we don't want rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache +cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart + %find_lang %{name} %clean @@ -109,8 +113,12 @@ %{_bindir}/* %{_libexecdir}/* %{_sysconfdir}/gconf/schemas/*.schemas +%{_sysconfdir}/xdg/autostart/vino.desktop %changelog +* Fri Jul 25 2008 Matthias Clasen - 2.23.5-3 +- Use autostart to have gnome-session start the server + * Fri Jul 25 2008 Matthias Clasen - 2.23.5-2 - Use standard icon names From fedora-extras-commits at redhat.com Fri Jul 25 16:33:02 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Fri, 25 Jul 2008 16:33:02 GMT Subject: rpms/evolution-rss/devel evolution-rss.spec,1.15,1.16 Message-ID: <200807251633.m6PGX2rd011701@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626 Modified Files: evolution-rss.spec Log Message: Fix firefox import RH bug #452322 Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- evolution-rss.spec 24 Jul 2008 19:06:00 -0000 1.15 +++ evolution-rss.spec 25 Jul 2008 16:32:32 -0000 1.16 @@ -28,7 +28,7 @@ %prep %setup -q -n evolution-rss-%{version} -%patch0 -p1 -b .firefox +%patch0 -p0 -b .firefox %build %configure From fedora-extras-commits at redhat.com Fri Jul 25 16:35:58 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 25 Jul 2008 16:35:58 GMT Subject: rpms/mysqltuner/devel mysqltuner.spec,1.4,1.5 Message-ID: <200807251635.m6PGZwLE011894@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/mysqltuner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11812 Modified Files: mysqltuner.spec Log Message: unbump Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/devel/mysqltuner.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mysqltuner.spec 25 Jul 2008 16:22:50 -0000 1.4 +++ mysqltuner.spec 25 Jul 2008 16:35:28 -0000 1.5 @@ -1,6 +1,6 @@ Name: mysqltuner Version: 0.9.8 -Release: 2 +Release: 1 Summary: MySQL high performance tuning script Group: Applications/Databases @@ -45,7 +45,7 @@ %changelog -* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-2 +* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-1 - 0.9.8, --checkversion patch applied upstream. * Sat Jun 21 2008 Ville Skytt?? - 0.9.1-4 From fedora-extras-commits at redhat.com Fri Jul 25 16:40:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:40:28 +0000 Subject: [pkgdb] jcommon (Fedora EPEL, 5) updated by kevin Message-ID: <20080725164033.C03B51AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for jcommon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jcommon (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on jcommon (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jcommon (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of jcommon in Fedora EPEL 5 to lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jcommon From fedora-extras-commits at redhat.com Fri Jul 25 16:40:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:40:28 +0000 Subject: [pkgdb] jcommon (Fedora, 9) updated by kevin Message-ID: <20080725164034.84BFE1AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for jcommon Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jcommon (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on jcommon (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jcommon (Fedora 9) Kevin Fenzi (kevin) changed owner of jcommon in Fedora 9 to lkundrak To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jcommon From fedora-extras-commits at redhat.com Fri Jul 25 16:41:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:41:34 +0000 Subject: [pkgdb] poppler (Fedora OLPC, 3) updated by kevin Message-ID: <20080725164134.CD6371AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora OLPC 3 branch for poppler Kevin Fenzi (kevin) has set commit to Approved for cvsextras on poppler (Fedora OLPC 3) Kevin Fenzi (kevin) has set build to Approved for cvsextras on poppler (Fedora OLPC 3) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on poppler (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/poppler From fedora-extras-commits at redhat.com Fri Jul 25 16:42:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:42:49 +0000 Subject: [pkgdb] gnome-vfs2 (Fedora OLPC, 3) updated by kevin Message-ID: <20080725164249.EDD201AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora OLPC 3 branch for gnome-vfs2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-vfs2 (Fedora OLPC 3) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-vfs2 (Fedora OLPC 3) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-vfs2 (Fedora OLPC 3) Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-vfs2 (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-vfs2 From fedora-extras-commits at redhat.com Fri Jul 25 16:43:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:43:52 +0000 Subject: [pkgdb] python-webob was added for ricky Message-ID: <20080725164352.5FE391AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-webob with summary WSGI request and response object Kevin Fenzi (kevin) has approved Package python-webob Kevin Fenzi (kevin) has added a Fedora devel branch for python-webob with an owner of ricky Kevin Fenzi (kevin) has approved python-webob in Fedora devel Kevin Fenzi (kevin) has approved Package python-webob Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-webob (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-webob (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-webob (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on python-webob (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on python-webob (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on python-webob (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-webob From fedora-extras-commits at redhat.com Fri Jul 25 16:44:07 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 16:44:07 GMT Subject: rpms/vino/devel vino.spec,1.72,1.73 Message-ID: <200807251644.m6PGi7Aq012429@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/vino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12359 Modified Files: vino.spec Log Message: fix spec Index: vino.spec =================================================================== RCS file: /cvs/extras/rpms/vino/devel/vino.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- vino.spec 25 Jul 2008 16:31:16 -0000 1.72 +++ vino.spec 25 Jul 2008 16:43:37 -0000 1.73 @@ -71,6 +71,7 @@ # stuff we don't want rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart %find_lang %{name} From fedora-extras-commits at redhat.com Fri Jul 25 16:43:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:43:53 +0000 Subject: [pkgdb] python-webob (Fedora, 8) updated by kevin Message-ID: <20080725164353.6D7D21AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-webob Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-webob (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-webob (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-webob (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-webob (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-webob From fedora-extras-commits at redhat.com Fri Jul 25 16:43:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:43:53 +0000 Subject: [pkgdb] python-webob (Fedora, devel) updated by kevin Message-ID: <20080725164353.4CC151AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-webob (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-webob From fedora-extras-commits at redhat.com Fri Jul 25 16:44:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:44:08 GMT Subject: rpms/python-webob - New directory Message-ID: <200807251644.m6PGi8Hh012437@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-webob In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12406/rpms/python-webob Log Message: Directory /cvs/extras/rpms/python-webob added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:43:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:43:53 +0000 Subject: [pkgdb] python-webob (Fedora, 9) updated by kevin Message-ID: <20080725164353.986B51AD0F3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-webob Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-webob (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-webob (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-webob (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-webob (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-webob From fedora-extras-commits at redhat.com Fri Jul 25 16:44:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:44:08 GMT Subject: rpms/python-webob/devel - New directory Message-ID: <200807251644.m6PGi835012451@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-webob/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12406/rpms/python-webob/devel Log Message: Directory /cvs/extras/rpms/python-webob/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:44:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:44:08 GMT Subject: rpms/python-webob Makefile,NONE,1.1 Message-ID: <200807251644.m6PGi8aq012477@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-webob In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12406/rpms/python-webob Added Files: Makefile Log Message: Setup of module python-webob --- NEW FILE Makefile --- # Top level Makefile for module python-webob all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 25 16:44:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:44:09 GMT Subject: rpms/python-webob/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807251644.m6PGi9bk012492@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-webob/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12406/rpms/python-webob/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-webob --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-webob # $Id: Makefile,v 1.1 2008/07/25 16:44:09 kevin Exp $ NAME := python-webob SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 25 16:47:00 2008 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Fri, 25 Jul 2008 16:47:00 GMT Subject: rpms/pdns-recursor/F-9 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200807251647.m6PGl0cB012710@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/pdns-recursor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680 Modified Files: .cvsignore sources Log Message: Don't forget to add the sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Apr 2008 21:45:46 -0000 1.5 +++ .cvsignore 25 Jul 2008 16:46:30 -0000 1.6 @@ -1 +1 @@ -pdns-recursor-3.1.5.tar.bz2 +pdns-recursor-3.1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Apr 2008 21:45:46 -0000 1.5 +++ sources 25 Jul 2008 16:46:30 -0000 1.6 @@ -1 +1 @@ -682529d59c80076f986003ed5f47e26f pdns-recursor-3.1.5.tar.bz2 +e7521055f949ba8e9e77fe27411be2ed pdns-recursor-3.1.7.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:48:45 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Fri, 25 Jul 2008 16:48:45 GMT Subject: rpms/libcanberra/devel .cvsignore, 1.2, 1.3 libcanberra.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807251648.m6PGmjR7012812@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libcanberra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12779 Modified Files: .cvsignore libcanberra.spec sources Log Message: new version 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Jun 2008 17:30:16 -0000 1.2 +++ .cvsignore 25 Jul 2008 16:48:15 -0000 1.3 @@ -1 +1,2 @@ -libcanberra-0.3.tar.gz +libcanberra-0.4.tar.gz +libcanberra-gtk-module.sh Index: libcanberra.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcanberra.spec 16 Jun 2008 18:13:52 -0000 1.2 +++ libcanberra.spec 25 Jul 2008 16:48:15 -0000 1.3 @@ -1,9 +1,10 @@ Name: libcanberra -Version: 0.3 -Release: 2%{?dist} +Version: 0.4 +Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz +Source1: libcanberra-gtk-module.sh License: LGPLv2 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +56,8 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; +install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh +rm $RPM_BUILD_ROOT%{_libdir}/libcanberra/libcanberra-multi.so %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +75,8 @@ %defattr(-,root,root) %{_libdir}/libcanberra-gtk.so.* %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so +%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh +%{_bindir}/canberra-gtk-play %files devel %defattr(-,root,root) @@ -84,6 +89,10 @@ %{_libdir}/pkgconfig/libcanberra.pc %changelog +* Fri Jul 25 2008 Lennart Poettering 0.4-1 +- New version +- Install libcanberra-gtk-module.sh + * Mon Jun 16 2008 Lennart Poettering 0.3-2 - Add dependency on sound-theme-freedesktop Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Jun 2008 17:30:16 -0000 1.2 +++ sources 25 Jul 2008 16:48:15 -0000 1.3 @@ -1 +1,2 @@ -53740431b5a6abc3c4bed3fdf22ccc82 libcanberra-0.3.tar.gz +29b45a649cc6e84698eeabb7488b8b10 libcanberra-0.4.tar.gz +bf7f13181bf21d1a02195c00faf7effd libcanberra-gtk-module.sh From fedora-extras-commits at redhat.com Fri Jul 25 16:49:43 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 25 Jul 2008 16:49:43 GMT Subject: rpms/python-alsa/devel .cvsignore, 1.4, 1.5 python-alsa.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200807251649.m6PGnhn3012943@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/python-alsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12879 Modified Files: .cvsignore python-alsa.spec sources Log Message: update to release 1.0.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-alsa/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 May 2008 11:11:16 -0000 1.4 +++ .cvsignore 25 Jul 2008 16:49:13 -0000 1.5 @@ -1 +1 @@ -pyalsa-1.0.16.tar.bz2 +pyalsa-1.0.17.tar.bz2 Index: python-alsa.spec =================================================================== RCS file: /cvs/extras/rpms/python-alsa/devel/python-alsa.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-alsa.spec 4 May 2008 11:11:16 -0000 1.6 +++ python-alsa.spec 25 Jul 2008 16:49:13 -0000 1.7 @@ -5,7 +5,7 @@ Summary: Python binding for the ALSA library Name: python-alsa -Version: 1.0.16 +Version: 1.0.17 Release: 1%{?rcver_dot}%{?dist} License: LGPLv2+ Group: Development/Languages @@ -41,6 +41,9 @@ %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Andy Shevchenko - 1.0.17-1 +- update to release 1.0.17 + * Sun May 04 2008 Andy Shevchenko - 1.0.16-1 - update to release 1.0.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-alsa/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 May 2008 11:11:16 -0000 1.4 +++ sources 25 Jul 2008 16:49:13 -0000 1.5 @@ -1 +1 @@ -a1f4d561fa5c41a570480f3f328559a2 pyalsa-1.0.16.tar.bz2 +cb38d76edaf47b85baf7eec2b60da5fa pyalsa-1.0.17.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:50:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:50:19 +0000 Subject: [pkgdb] calamaris was added for robert Message-ID: <20080725165019.9F37B1AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package calamaris with summary Squid native log format (NLF) analyzer and report generator Kevin Fenzi (kevin) has approved Package calamaris Kevin Fenzi (kevin) has added a Fedora devel branch for calamaris with an owner of robert Kevin Fenzi (kevin) has approved calamaris in Fedora devel Kevin Fenzi (kevin) has approved Package calamaris Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calamaris (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on calamaris (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calamaris (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on calamaris (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on calamaris (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on calamaris (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 16:50:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:50:23 +0000 Subject: [pkgdb] calamaris (Fedora, 9) updated by kevin Message-ID: <20080725165023.E0F8B1AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for calamaris Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calamaris (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on calamaris (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calamaris (Fedora 9) Kevin Fenzi (kevin) Denied cvsextras for commit access on calamaris (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 16:50:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:50:44 GMT Subject: rpms/calamaris - New directory Message-ID: <200807251650.m6PGoif5013066@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/calamaris In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13033/rpms/calamaris Log Message: Directory /cvs/extras/rpms/calamaris added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:50:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:50:44 GMT Subject: rpms/calamaris/devel - New directory Message-ID: <200807251650.m6PGoiQq013081@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/calamaris/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13033/rpms/calamaris/devel Log Message: Directory /cvs/extras/rpms/calamaris/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:50:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:50:45 GMT Subject: rpms/calamaris/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807251650.m6PGojfp013119@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/calamaris/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13033/rpms/calamaris/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module calamaris --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: calamaris # $Id: Makefile,v 1.1 2008/07/25 16:50:45 kevin Exp $ NAME := calamaris SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 25 16:50:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:50:23 +0000 Subject: [pkgdb] calamaris (Fedora EPEL, 5) updated by kevin Message-ID: <20080725165024.38F9E1AD0F8@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for calamaris Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calamaris (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on calamaris (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calamaris (Fedora EPEL 5) Kevin Fenzi (kevin) Denied cvsextras for commit access on calamaris (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 16:50:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:50:44 GMT Subject: rpms/calamaris Makefile,NONE,1.1 Message-ID: <200807251650.m6PGoiul013104@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/calamaris In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13033/rpms/calamaris Added Files: Makefile Log Message: Setup of module calamaris --- NEW FILE Makefile --- # Top level Makefile for module calamaris all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 25 16:50:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:50:23 +0000 Subject: [pkgdb] calamaris (Fedora, 8) updated by kevin Message-ID: <20080725165024.12F841AD0F0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for calamaris Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calamaris (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on calamaris (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calamaris (Fedora 8) Kevin Fenzi (kevin) Denied cvsextras for commit access on calamaris (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 16:50:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:50:23 +0000 Subject: [pkgdb] calamaris (Fedora, devel) updated by kevin Message-ID: <20080725165024.7DF391AD0FC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Denied cvsextras for commit access on calamaris (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 16:50:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:50:23 +0000 Subject: [pkgdb] calamaris (Fedora EPEL, 4) updated by kevin Message-ID: <20080725165024.AC7521AD102@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for calamaris Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calamaris (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on calamaris (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calamaris (Fedora EPEL 4) Kevin Fenzi (kevin) Denied cvsextras for commit access on calamaris (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 16:51:29 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 16:51:29 GMT Subject: rpms/kdeaccessibility/F-9 .cvsignore, 1.24, 1.25 kdeaccessibility.spec, 1.50, 1.51 sources, 1.25, 1.26 Message-ID: <200807251651.m6PGpTsH013408@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeaccessibility/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13366 Modified Files: .cvsignore kdeaccessibility.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 21 Jul 2008 16:49:36 -0000 1.24 +++ .cvsignore 25 Jul 2008 16:50:59 -0000 1.25 @@ -1 +1,2 @@ kdeaccessibility-4.0.99.tar.bz2 +kdeaccessibility-4.1.0.tar.bz2 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/kdeaccessibility.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- kdeaccessibility.spec 21 Jul 2008 16:49:36 -0000 1.50 +++ kdeaccessibility.spec 25 Jul 2008 16:50:59 -0000 1.51 @@ -1,8 +1,7 @@ - Summary: K Desktop Environment - Accessibility Name: kdeaccessibility Epoch: 1 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Group: User Interface/Desktops @@ -53,7 +52,6 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} @@ -97,6 +95,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 21 Jul 2008 16:49:36 -0000 1.25 +++ sources 25 Jul 2008 16:50:59 -0000 1.26 @@ -1 +1 @@ -f90361104b19893ffec42d53aee0fbe4 kdeaccessibility-4.0.99.tar.bz2 +7d53001b2db8d7d8bd82a63e8be882ae kdeaccessibility-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:51:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:51:56 +0000 Subject: [pkgdb] python-mwlib was added for ianweller Message-ID: <20080725165156.5611A1AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-mwlib with summary MediaWiki conversion library for Python Kevin Fenzi (kevin) has approved Package python-mwlib Kevin Fenzi (kevin) has added a Fedora devel branch for python-mwlib with an owner of ianweller Kevin Fenzi (kevin) has approved python-mwlib in Fedora devel Kevin Fenzi (kevin) has approved Package python-mwlib Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-mwlib (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-mwlib (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-mwlib (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on python-mwlib (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on python-mwlib (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on python-mwlib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-mwlib From fedora-extras-commits at redhat.com Fri Jul 25 16:52:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:52:16 GMT Subject: rpms/python-mwlib - New directory Message-ID: <200807251652.m6PGqGQJ013567@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-mwlib In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13539/rpms/python-mwlib Log Message: Directory /cvs/extras/rpms/python-mwlib added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:52:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:52:16 GMT Subject: rpms/python-mwlib Makefile,NONE,1.1 Message-ID: <200807251652.m6PGqGMV013604@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-mwlib In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13539/rpms/python-mwlib Added Files: Makefile Log Message: Setup of module python-mwlib --- NEW FILE Makefile --- # Top level Makefile for module python-mwlib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 25 16:52:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:52:07 +0000 Subject: [pkgdb] python-mwlib (Fedora, 8) updated by kevin Message-ID: <20080725165212.CD1641AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-mwlib Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-mwlib (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-mwlib (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-mwlib (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on python-mwlib (Fedora 8) for pfrields Kevin Fenzi (kevin) approved watchcommits on python-mwlib (Fedora 8) for pfrields Kevin Fenzi (kevin) approved commit on python-mwlib (Fedora 8) for pfrields Kevin Fenzi (kevin) approved build on python-mwlib (Fedora 8) for pfrields Kevin Fenzi (kevin) approved approveacls on python-mwlib (Fedora 8) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on python-mwlib (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-mwlib From fedora-extras-commits at redhat.com Fri Jul 25 16:52:20 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 16:52:20 GMT Subject: rpms/kdegraphics/F-9 .cvsignore, 1.43, 1.44 kdegraphics.spec, 1.147, 1.148 sources, 1.46, 1.47 Message-ID: <200807251652.m6PGqKg8013736@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13452 Modified Files: .cvsignore kdegraphics.spec sources Log Message: devel/ sync Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 21 Jul 2008 16:51:54 -0000 1.43 +++ .cvsignore 25 Jul 2008 16:51:50 -0000 1.44 @@ -1 +1,2 @@ kdegraphics-4.0.99.tar.bz2 +kdegraphics-4.1.0.tar.bz2 Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- kdegraphics.spec 21 Jul 2008 17:39:18 -0000 1.147 +++ kdegraphics.spec 25 Jul 2008 16:51:50 -0000 1.148 @@ -1,11 +1,10 @@ - %if 0%{?fedora} < 10 %define omit_kde3_conflicts 1 %endif Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.0.99 +Version: 4.1.0 Release: 2%{?dist} Name: kdegraphics @@ -46,7 +45,6 @@ %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } Requires: kdelibs4 >= %{version} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -# okular requires lpr.cups (provided by cups) Requires: cups Requires(post): xdg-utils Requires(postun): xdg-utils @@ -185,6 +183,12 @@ %changelog +* Fri Jul 25 2008 Than Ngo 4.1.0-2 +- respun + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Mon Jul 21 2008 Rex Dieter 4.0.99-2 - omit conflicting lib{kexiv2,kdcraw,kipi}-devel bits in F-9 builds (#452392) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 21 Jul 2008 16:51:54 -0000 1.46 +++ sources 25 Jul 2008 16:51:50 -0000 1.47 @@ -1 +1 @@ -1462a278ed3178c5c941f2ad8d3f742b kdegraphics-4.0.99.tar.bz2 +d45c25889331497776d5aa3093951821 kdegraphics-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:52:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:52:16 GMT Subject: rpms/python-mwlib/devel - New directory Message-ID: <200807251652.m6PGqGov013581@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-mwlib/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13539/rpms/python-mwlib/devel Log Message: Directory /cvs/extras/rpms/python-mwlib/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:52:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:52:07 +0000 Subject: [pkgdb] python-mwlib (Fedora, devel) updated by kevin Message-ID: <20080725165214.4E1761AD102@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on python-mwlib (Fedora devel) for pfrields Kevin Fenzi (kevin) approved watchcommits on python-mwlib (Fedora devel) for pfrields Kevin Fenzi (kevin) approved commit on python-mwlib (Fedora devel) for pfrields Kevin Fenzi (kevin) approved build on python-mwlib (Fedora devel) for pfrields Kevin Fenzi (kevin) approved approveacls on python-mwlib (Fedora devel) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on python-mwlib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-mwlib From fedora-extras-commits at redhat.com Fri Jul 25 16:52:17 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:52:17 GMT Subject: rpms/python-mwlib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807251652.m6PGqHhH013619@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-mwlib/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13539/rpms/python-mwlib/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-mwlib --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-mwlib # $Id: Makefile,v 1.1 2008/07/25 16:52:17 kevin Exp $ NAME := python-mwlib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 25 16:52:30 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 25 Jul 2008 16:52:30 GMT Subject: rpms/klamav/F-9 klamav.spec,1.22,1.23 sources,1.5,1.6 Message-ID: <200807251652.m6PGqUH3013817@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/klamav/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13482 Modified Files: klamav.spec sources Log Message: update to 0.44 Index: klamav.spec =================================================================== RCS file: /cvs/extras/rpms/klamav/F-9/klamav.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- klamav.spec 28 Mar 2008 05:51:10 -0000 1.22 +++ klamav.spec 25 Jul 2008 16:52:00 -0000 1.23 @@ -1,24 +1,22 @@ Summary: Clam Anti-Virus on the KDE Desktop Name: klamav -Version: 0.42 -Release: 3%{?dist} +Version: 0.44 +Release: 1%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 Patch0: klamav-suse-clamav-path.diff Patch1: klamav-0.41.1-pwd-echo.patch -Patch2: klamav-0.41.1-gcc43.patch -Patch3: klamav-0.42-clamav093.patch URL: http://klamav.sourceforge.net Group: Applications/System License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: clamav >= 0.90 -Requires: clamav-update >= 0.90 +Requires: clamav >= 0.93 +Requires: clamav-update >= 0.93 %if 0%{?fedora} >= 7 BuildRequires: kdelibs3-devel >= 3.5.2 %else BuildRequires: kdelibs-devel >= 3.5.2 %endif -BuildRequires: clamav-devel >= 0.90 +BuildRequires: clamav-devel >= 0.93 BuildRequires: curl-devel BuildRequires: gmp-devel BuildRequires: desktop-file-utils @@ -31,10 +29,6 @@ %setup -q %patch0 -p0 -b .suse-clamav-path %patch1 -p1 -b .pwd-echo -%patch2 -p1 -b .gcc43 -%if 0%{?fedora} >= 9 -%patch3 -p1 -b .clamav093 -%endif %build %configure --disable-rpath --without-included-sqlite @@ -89,6 +83,11 @@ %{_datadir}/icons/*/*x*/apps/klamav.png %changelog +* Sun Jul 20 2008 Andy Shevchenko 0.44-1 +- update to 0.44 +- bump clamav requirements to have their at least for 0.93 +- remove upstreamed patches + * Fri Mar 28 2008 Kevin Kofler 0.42-3 - patch for clamav 0.93 (#438627) Index: sources =================================================================== RCS file: /cvs/extras/rpms/klamav/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Feb 2008 16:43:27 -0000 1.5 +++ sources 25 Jul 2008 16:52:00 -0000 1.6 @@ -1 +1 @@ -8e5c4267d56039b105866bad3b44a331 klamav-0.42.tar.bz2 +0f5b89db6a8e5d4151a967e4983b4c10 klamav-0.44.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:52:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:52:07 +0000 Subject: [pkgdb] python-mwlib (Fedora, 9) updated by kevin Message-ID: <20080725165216.1639F1AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for python-mwlib Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-mwlib (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-mwlib (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-mwlib (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on python-mwlib (Fedora 9) for pfrields Kevin Fenzi (kevin) approved watchcommits on python-mwlib (Fedora 9) for pfrields Kevin Fenzi (kevin) approved commit on python-mwlib (Fedora 9) for pfrields Kevin Fenzi (kevin) approved build on python-mwlib (Fedora 9) for pfrields Kevin Fenzi (kevin) approved approveacls on python-mwlib (Fedora 9) for pfrields Kevin Fenzi (kevin) Approved cvsextras for commit access on python-mwlib (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-mwlib From fedora-extras-commits at redhat.com Fri Jul 25 16:53:00 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 16:53:00 GMT Subject: rpms/kdeadmin/F-9 .cvsignore, 1.45, 1.46 kdeadmin.spec, 1.93, 1.94 sources, 1.47, 1.48 Message-ID: <200807251653.m6PGr0Rw013844@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeadmin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13794 Modified Files: .cvsignore kdeadmin.spec sources Log Message: devel/ sync Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 21 Jul 2008 18:05:39 -0000 1.45 +++ .cvsignore 25 Jul 2008 16:52:30 -0000 1.46 @@ -1 +1,2 @@ kdeadmin-4.0.99.tar.bz2 +kdeadmin-4.1.0.tar.bz2 Index: kdeadmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/kdeadmin.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- kdeadmin.spec 21 Jul 2008 18:05:39 -0000 1.93 +++ kdeadmin.spec 25 Jul 2008 16:52:30 -0000 1.94 @@ -1,8 +1,7 @@ - Name: kdeadmin Epoch: 7 -Version: 4.0.99 -Release: 1%{?dist} +Version: 4.1.0 +Release: 2%{?dist} Summary: K Desktop Environment - Administrative tools Group: User Interface/Desktops @@ -25,7 +24,6 @@ Requires(postun): /sbin/ldconfig xdg-utils Requires: kdelibs4 >= %{version} Requires: kdepimlibs >= %{version} -Requires: pkgconfig %description @@ -67,6 +65,9 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} +# remove broken .pc file which has no business to be in a non-devel pkg anyway +rm -rf %{buildroot}%{_libdir}/pkgconfig + %clean rm -rf %{buildroot} @@ -107,7 +108,6 @@ %exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage* %{_kde4_libdir}/kde4/kcm_cron.so %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so -%{_libdir}/pkgconfig/*.pc %files kpackage %defattr(-,root,root,-) @@ -120,6 +120,12 @@ %changelog +* Thu Jul 24 2008 Kevin Kofler 4.1.0-2 +- remove broken .pc file (segfaults RPM, #456100), drop Requires: pkgconfig + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 7:4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeadmin/F-9/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 21 Jul 2008 18:05:39 -0000 1.47 +++ sources 25 Jul 2008 16:52:30 -0000 1.48 @@ -1 +1 @@ -e2c14f1852eeb44d24db4ca2fed3651c kdeadmin-4.0.99.tar.bz2 +c814d39956c605a8cc60016a26a9401f kdeadmin-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:53:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:53:16 +0000 Subject: [pkgdb] xkeyboard-config (Fedora OLPC, 3) updated by kevin Message-ID: <20080725165316.EA0D11AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora OLPC 3 branch for xkeyboard-config Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xkeyboard-config (Fedora OLPC 3) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xkeyboard-config (Fedora OLPC 3) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xkeyboard-config (Fedora OLPC 3) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config From fedora-extras-commits at redhat.com Fri Jul 25 16:53:37 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Fri, 25 Jul 2008 16:53:37 GMT Subject: rpms/ocsinventory/devel ocsinventory-reports.conf, 1.1, 1.2 ocsinventory.spec, 1.1, 1.2 Message-ID: <200807251653.m6PGrb16013966@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/ocsinventory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13889 Modified Files: ocsinventory-reports.conf ocsinventory.spec Log Message: minor spec/config fixes Index: ocsinventory-reports.conf =================================================================== RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory-reports.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocsinventory-reports.conf 24 Jun 2008 05:07:04 -0000 1.1 +++ ocsinventory-reports.conf 25 Jul 2008 16:53:07 -0000 1.2 @@ -23,7 +23,6 @@ # ServerName ocsinventory-ng # ServerAlias ocsinventory-ng.yourdomain.tld # DocumentRoot PATH_TO_OCSREPORTS_DIR -# AddDefaultCharset ISO-8859-1 Alias OCSREPORTS_ALIAS PATH_TO_OCSREPORTS_DIR @@ -31,6 +30,8 @@ # By default, users can use console from everywhere Order deny,allow Allow from all + + AddDefaultCharset ISO-8859-1 Options Indexes FollowSymLinks DirectoryIndex index.php Index: ocsinventory.spec =================================================================== RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocsinventory.spec 24 Jun 2008 05:07:04 -0000 1.1 +++ ocsinventory.spec 25 Jul 2008 16:53:07 -0000 1.2 @@ -10,7 +10,7 @@ Summary: Open Computer and Software Inventory Next Generation Version: 1.02 -Release: 0.5.rc2%{?dist} +Release: 0.6.rc2%{?dist} Group: Applications/Internet License: GPLv2 @@ -71,6 +71,10 @@ Group: Applications/Internet Summary: OCS Inventory NG - Communication server Requires: mod_perl +%if 0%{?rhel} != 4 +# when use with mod_perl2 +Requires: perl(SOAP::Transport::HTTP2) +%endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # Required by the original setup script, but not detected automatically : # Apache::DBI drags in DBI @@ -221,10 +225,10 @@ ( # New File context semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" -semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-server(/.*)?" +semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" # files created by app restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports -restorecon -R %{_localstatedir}/lib/ocsinventory-server +restorecon -R %{_localstatedir}/lib/ocsinventory-reports ) ||: %endif @@ -275,6 +279,11 @@ %changelog +* Tue Jul 22 2008 Remi Collet 1.02-0.6.rc2 +- add missing requires perl(SOAP::Transport::HTTP2) (with mod_perl2) +- AddDefaultCharset ISO-8859-1 in httpd config +- fix SElinux path + * Sat Jun 14 2008 Remi Collet 1.02-0.5.rc2 - change dir from /var/lib/ocsinventory-server to /var/lib/ocsinventory-reports - add Requires nmap and samba-client (nmblookup) From fedora-extras-commits at redhat.com Fri Jul 25 16:54:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:54:25 +0000 Subject: [pkgdb] merkaartor was added for slankes Message-ID: <20080725165425.B740E1AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package merkaartor with summary QT-Based OpenStreetMap editor Kevin Fenzi (kevin) has approved Package merkaartor Kevin Fenzi (kevin) has added a Fedora devel branch for merkaartor with an owner of slankes Kevin Fenzi (kevin) has approved merkaartor in Fedora devel Kevin Fenzi (kevin) has approved Package merkaartor Kevin Fenzi (kevin) has set commit to Approved for cvsextras on merkaartor (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on merkaartor (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on merkaartor (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on merkaartor (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on merkaartor (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on merkaartor (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Fri Jul 25 16:54:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:54:35 GMT Subject: rpms/merkaartor - New directory Message-ID: <200807251654.m6PGsZhj014106@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/merkaartor In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14067/rpms/merkaartor Log Message: Directory /cvs/extras/rpms/merkaartor added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:54:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:54:35 GMT Subject: rpms/merkaartor/devel - New directory Message-ID: <200807251654.m6PGsZkS014121@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/merkaartor/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14067/rpms/merkaartor/devel Log Message: Directory /cvs/extras/rpms/merkaartor/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 25 16:54:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:54:37 GMT Subject: rpms/merkaartor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807251654.m6PGsbrl014180@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/merkaartor/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14067/rpms/merkaartor/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module merkaartor --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: merkaartor # $Id: Makefile,v 1.1 2008/07/25 16:54:37 kevin Exp $ NAME := merkaartor SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 25 16:54:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:54:26 +0000 Subject: [pkgdb] merkaartor (Fedora, devel) updated by kevin Message-ID: <20080725165426.887871AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on merkaartor (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Fri Jul 25 16:54:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 25 Jul 2008 16:54:35 GMT Subject: rpms/merkaartor Makefile,NONE,1.1 Message-ID: <200807251654.m6PGsZG9014158@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/merkaartor In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO14067/rpms/merkaartor Added Files: Makefile Log Message: Setup of module merkaartor --- NEW FILE Makefile --- # Top level Makefile for module merkaartor all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Jul 25 16:54:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 16:54:26 +0000 Subject: [pkgdb] merkaartor (Fedora, 9) updated by kevin Message-ID: <20080725165426.AC5DB1AD0F0@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for merkaartor Kevin Fenzi (kevin) has set commit to Approved for cvsextras on merkaartor (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on merkaartor (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on merkaartor (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on merkaartor (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Fri Jul 25 16:55:05 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 16:55:05 GMT Subject: rpms/kdeartwork/F-9 .cvsignore, 1.42, 1.43 kdeartwork.spec, 1.80, 1.81 sources, 1.44, 1.45 Message-ID: <200807251655.m6PGt5Nk014261@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeartwork/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14114 Modified Files: .cvsignore kdeartwork.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 21 Jul 2008 18:06:15 -0000 1.42 +++ .cvsignore 25 Jul 2008 16:54:35 -0000 1.43 @@ -1 +1,2 @@ kdeartwork-4.0.99.tar.bz2 +kdeartwork-4.1.0.tar.bz2 Index: kdeartwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/kdeartwork.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- kdeartwork.spec 21 Jul 2008 18:06:15 -0000 1.80 +++ kdeartwork.spec 25 Jul 2008 16:54:35 -0000 1.81 @@ -1,6 +1,5 @@ - Name: kdeartwork -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: Additional artwork (themes, sound themes, ...) for KDE @@ -197,6 +196,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeartwork/F-9/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 21 Jul 2008 18:06:15 -0000 1.44 +++ sources 25 Jul 2008 16:54:35 -0000 1.45 @@ -1 +1 @@ -4ce348b876ea6cd3e034056171995cf9 kdeartwork-4.0.99.tar.bz2 +3de07b7d7bc5219d135c68dce4266861 kdeartwork-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 16:55:38 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 25 Jul 2008 16:55:38 GMT Subject: rpms/python-alsa/F-9 python-alsa.spec,1.6,1.7 sources,1.4,1.5 Message-ID: <200807251655.m6PGtcZv014338@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/python-alsa/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14269 Modified Files: python-alsa.spec sources Log Message: update to 1.0.17 Index: python-alsa.spec =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-9/python-alsa.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-alsa.spec 4 May 2008 11:17:19 -0000 1.6 +++ python-alsa.spec 25 Jul 2008 16:55:08 -0000 1.7 @@ -5,7 +5,7 @@ Summary: Python binding for the ALSA library Name: python-alsa -Version: 1.0.16 +Version: 1.0.17 Release: 1%{?rcver_dot}%{?dist} License: LGPLv2+ Group: Development/Languages @@ -41,6 +41,9 @@ %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Andy Shevchenko - 1.0.17-1 +- update to release 1.0.17 + * Sun May 04 2008 Andy Shevchenko - 1.0.16-1 - update to release 1.0.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 May 2008 11:17:19 -0000 1.4 +++ sources 25 Jul 2008 16:55:08 -0000 1.5 @@ -1 +1 @@ -a1f4d561fa5c41a570480f3f328559a2 pyalsa-1.0.16.tar.bz2 +cb38d76edaf47b85baf7eec2b60da5fa pyalsa-1.0.17.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:04:46 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:04:46 GMT Subject: rpms/kdeedu/F-9 .cvsignore, 1.45, 1.46 kdeedu.spec, 1.105, 1.106 sources, 1.49, 1.50 Message-ID: <200807251704.m6PH4kBJ021691@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeedu/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21582 Modified Files: .cvsignore kdeedu.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/F-9/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 21 Jul 2008 20:18:18 -0000 1.45 +++ .cvsignore 25 Jul 2008 17:04:16 -0000 1.46 @@ -1 +1,2 @@ kdeedu-4.0.99.tar.bz2 +kdeedu-4.1.0.tar.bz2 Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- kdeedu.spec 24 Jul 2008 15:41:44 -0000 1.105 +++ kdeedu.spec 25 Jul 2008 17:04:16 -0000 1.106 @@ -13,7 +13,7 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -393,6 +393,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/F-9/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 21 Jul 2008 20:18:18 -0000 1.49 +++ sources 25 Jul 2008 17:04:16 -0000 1.50 @@ -1 +1 @@ -9d4eceb28c16a547a7ab19c0b59c0177 kdeedu-4.0.99.tar.bz2 +0debdf843969152cb14b7186919b8c2b kdeedu-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:05:12 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:05:12 GMT Subject: rpms/kdegames/F-9 .cvsignore, 1.50, 1.51 kdegames.spec, 1.89, 1.90 sources, 1.53, 1.54 Message-ID: <200807251705.m6PH5CeS021760@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegames/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21668 Modified Files: .cvsignore kdegames.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/F-9/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 21 Jul 2008 20:22:20 -0000 1.50 +++ .cvsignore 25 Jul 2008 17:04:41 -0000 1.51 @@ -1 +1,2 @@ kdegames-4.0.99.tar.bz2 +kdegames-4.1.0.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/F-9/kdegames.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- kdegames.spec 21 Jul 2008 20:22:20 -0000 1.89 +++ kdegames.spec 25 Jul 2008 17:04:41 -0000 1.90 @@ -4,7 +4,7 @@ Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -187,6 +187,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdegames/F-9/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 21 Jul 2008 20:22:20 -0000 1.53 +++ sources 25 Jul 2008 17:04:41 -0000 1.54 @@ -1 +1 @@ -9abe8d80e33947b5e949516f36e0bf4f kdegames-4.0.99.tar.bz2 +2c0a4c089bf31ff9bd3133c3f58c4dc7 kdegames-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:05:50 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:05:50 GMT Subject: rpms/kdemultimedia/F-9 .cvsignore, 1.47, 1.48 kdemultimedia.spec, 1.111, 1.112 sources, 1.49, 1.50 Message-ID: <200807251705.m6PH5owE021919@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdemultimedia/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21806 Modified Files: .cvsignore kdemultimedia.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 21 Jul 2008 20:23:43 -0000 1.47 +++ .cvsignore 25 Jul 2008 17:05:20 -0000 1.48 @@ -1 +1,2 @@ kdemultimedia-4.0.99.tar.bz2 +kdemultimedia-4.1.0.tar.bz2 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/kdemultimedia.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- kdemultimedia.spec 21 Jul 2008 20:23:43 -0000 1.111 +++ kdemultimedia.spec 25 Jul 2008 17:05:20 -0000 1.112 @@ -1,7 +1,6 @@ - Name: kdemultimedia Epoch: 6 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications @@ -38,8 +37,8 @@ Requires: kdelibs4 >= %{version} Requires: kdebase-workspace >= %{version} -Provides: dragonplayer = 2.0.2-0.1 -Obsoletes: dragonplayer < 2.0.2-0.1 +Provides: dragonplayer = 2.0.2-0.1 +Obsoletes: dragonplayer < 2.0.2-0.1 Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release} @@ -148,6 +147,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 21 Jul 2008 20:23:43 -0000 1.49 +++ sources 25 Jul 2008 17:05:20 -0000 1.50 @@ -1 +1 @@ -edf13e39c98b8c73a3fb71146741198e kdemultimedia-4.0.99.tar.bz2 +7965e42c3de193bde7f1e5437c9bedec kdemultimedia-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:06:06 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:06:06 GMT Subject: rpms/kdenetwork/F-9 .cvsignore, 1.50, 1.51 kdenetwork.spec, 1.150, 1.151 sources, 1.56, 1.57 Message-ID: <200807251706.m6PH66tO021981@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdenetwork/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21862 Modified Files: .cvsignore kdenetwork.spec sources Log Message: * Fri Jul 25 2008 Than Ngo 4.1.0-2 - respun Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 21 Jul 2008 20:24:11 -0000 1.50 +++ .cvsignore 25 Jul 2008 17:05:36 -0000 1.51 @@ -1 +1,2 @@ kdenetwork-4.0.99.tar.bz2 +kdenetwork-4.1.0.tar.bz2 Index: kdenetwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/kdenetwork.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- kdenetwork.spec 21 Jul 2008 20:26:00 -0000 1.150 +++ kdenetwork.spec 25 Jul 2008 17:05:36 -0000 1.151 @@ -1,12 +1,11 @@ - # FIXME/TODO: needed BuildRequires # Decibel Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 -Version: 4.0.99 -Release: 1%{?dist}.1 +Version: 4.1.0 +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet @@ -165,6 +164,12 @@ %changelog +* Fri Jul 25 2008 Than Ngo 4.1.0-2 +- respun + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 21 Jul 2008 20:24:11 -0000 1.56 +++ sources 25 Jul 2008 17:05:36 -0000 1.57 @@ -1 +1 @@ -ae53d3ce521a50cbebf85a88911c24ee kdenetwork-4.0.99.tar.bz2 +bd0193f2ea4f2d055c7bae0233d5e10e kdenetwork-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:06:56 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:06:56 GMT Subject: rpms/kdeplasma-addons/F-9 .cvsignore, 1.2, 1.3 kdeplasma-addons.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807251706.m6PH6uZB022146@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasma-addons/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22044 Modified Files: .cvsignore kdeplasma-addons.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jul 2008 20:25:15 -0000 1.2 +++ .cvsignore 25 Jul 2008 17:06:26 -0000 1.3 @@ -1 +1,2 @@ kdeplasma-addons-4.0.99.tar.bz2 +kdeplasma-addons-4.1.0.tar.bz2 Index: kdeplasma-addons.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/kdeplasma-addons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdeplasma-addons.spec 21 Jul 2008 20:25:15 -0000 1.1 +++ kdeplasma-addons.spec 25 Jul 2008 17:06:26 -0000 1.2 @@ -1,6 +1,5 @@ - Name: kdeplasma-addons -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} Summary: Additional plasmoids for KDE @@ -82,7 +81,6 @@ %defattr(-,root,root,-) %doc COPYING COPYING.LIB %{_kde4_appsdir}/desktoptheme/* -%{_kde4_appsdir}/plasma-bluemarble/ %{_kde4_appsdir}/plasma-comic/ %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/* @@ -93,6 +91,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jul 2008 20:25:15 -0000 1.2 +++ sources 25 Jul 2008 17:06:26 -0000 1.3 @@ -1 +1 @@ -a0ff769d85d748008201fd2dfb966bf7 kdeplasma-addons-4.0.99.tar.bz2 +c67db067de416209fd63ff0deea44510 kdeplasma-addons-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:07:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:07:58 GMT Subject: rpms/kdetoys/F-9 .cvsignore, 1.19, 1.20 kdetoys.spec, 1.23, 1.24 sources, 1.17, 1.18 Message-ID: <200807251707.m6PH7wRi022298@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdetoys/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22257 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 21 Jul 2008 20:27:14 -0000 1.19 +++ .cvsignore 25 Jul 2008 17:07:28 -0000 1.20 @@ -1 +1,2 @@ kdetoys-4.0.99.tar.bz2 +kdetoys-4.1.0.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/F-9/kdetoys.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kdetoys.spec 21 Jul 2008 20:27:14 -0000 1.23 +++ kdetoys.spec 25 Jul 2008 17:07:28 -0000 1.24 @@ -1,8 +1,7 @@ - Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.0.99 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2 @@ -96,6 +95,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 21 Jul 2008 20:27:14 -0000 1.17 +++ sources 25 Jul 2008 17:07:28 -0000 1.18 @@ -1 +1 @@ -71de88592de156e861e0a68e628b9082 kdetoys-4.0.99.tar.bz2 +c8c9c2f66f65fc7acfa8060d08667406 kdetoys-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:09:05 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:09:05 GMT Subject: rpms/kdeutils/F-9 .cvsignore, 1.46, 1.47 kdeutils.spec, 1.125, 1.126 sources, 1.49, 1.50 Message-ID: <200807251709.m6PH95JZ022499@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22423 Modified Files: .cvsignore kdeutils.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 21 Jul 2008 22:22:58 -0000 1.46 +++ .cvsignore 25 Jul 2008 17:08:35 -0000 1.47 @@ -1,2 +1,2 @@ kdeutils-4.0.99.tar.bz2 -kdepim-4.0.99.tar.bz2 +kdeutils-4.1.0.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- kdeutils.spec 21 Jul 2008 23:19:33 -0000 1.125 +++ kdeutils.spec 25 Jul 2008 17:08:35 -0000 1.126 @@ -9,8 +9,8 @@ Name: kdeutils Epoch: 6 -Version: 4.0.99 -Release: 1%{?dist}.1 +Version: 4.1.0 +Release: 1%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -208,6 +208,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Mon Jul 21 2008 Kevin Kofler 4.0.99-1.1 - reinclude kjots on F9 (moved to kdepim in 4.1, we don't ship kdepim 4 in F9) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 21 Jul 2008 22:22:58 -0000 1.49 +++ sources 25 Jul 2008 17:08:35 -0000 1.50 @@ -1,2 +1 @@ -5114466bc392a2d4da9cdd9bcce5f4ea kdeutils-4.0.99.tar.bz2 -19461421744e7d9117fa185d86b1b16f kdepim-4.0.99.tar.bz2 +456d811618e5417e224476089df9a3b3 kdeutils-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:09:00 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 25 Jul 2008 17:09:00 GMT Subject: rpms/python-alsa/F-9 .cvsignore, 1.3, 1.4 python-alsa.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200807251709.m6PH90KP022469@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/python-alsa/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22391 Modified Files: .cvsignore python-alsa.spec sources Log Message: Necessary to downgrade version, although .rc1 and release are the same. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Oct 2007 13:56:22 -0000 1.3 +++ .cvsignore 25 Jul 2008 17:08:30 -0000 1.4 @@ -1 +1 @@ -pyalsa-1.0.15.tar.bz2 +pyalsa-1.0.17rc1.tar.bz2 Index: python-alsa.spec =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-9/python-alsa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-alsa.spec 25 Jul 2008 16:55:08 -0000 1.7 +++ python-alsa.spec 25 Jul 2008 17:08:30 -0000 1.8 @@ -1,12 +1,12 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define rcver %{nil} -%define rcver_dot %{nil} +%define rcver rc1 +%define rcver_dot .rc1 Summary: Python binding for the ALSA library Name: python-alsa Version: 1.0.17 -Release: 1%{?rcver_dot}%{?dist} +Release: 0.1%{?rcver_dot}%{?dist} License: LGPLv2+ Group: Development/Languages Source0: ftp://ftp.alsa-project.org/pub/pyalsa/pyalsa-%{version}%{?rcver}.tar.bz2 @@ -41,8 +41,8 @@ %{python_sitearch}/* %changelog -* Fri Jul 25 2008 Andy Shevchenko - 1.0.17-1 -- update to release 1.0.17 +* Fri Jul 25 2008 Andy Shevchenko - 1.0.17-0.1.rc1 +- update to release 1.0.17rc1 * Sun May 04 2008 Andy Shevchenko - 1.0.16-1 - update to release 1.0.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Jul 2008 16:55:08 -0000 1.5 +++ sources 25 Jul 2008 17:08:30 -0000 1.6 @@ -1 +1 @@ -cb38d76edaf47b85baf7eec2b60da5fa pyalsa-1.0.17.tar.bz2 +efc84449c792477607abe71637f38eca pyalsa-1.0.17rc1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:15:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 17:15:13 +0000 Subject: [pkgdb] calamaris: wolfy has requested watchbugzilla Message-ID: <20080725171520.C683F1AD0F0@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchbugzilla acl on calamaris (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 17:15:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 17:15:19 +0000 Subject: [pkgdb] calamaris: wolfy has requested watchcommits Message-ID: <20080725171520.072261AD0EC@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchcommits acl on calamaris (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 17:15:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 17:15:26 +0000 Subject: [pkgdb] calamaris: wolfy has requested watchcommits Message-ID: <20080725171526.8B3741AD0FC@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchcommits acl on calamaris (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 17:15:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 17:15:24 +0000 Subject: [pkgdb] calamaris: wolfy has requested watchbugzilla Message-ID: <20080725171524.F10CD1AD0F8@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchbugzilla acl on calamaris (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 17:15:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 17:15:43 +0000 Subject: [pkgdb] calamaris: wolfy has requested watchbugzilla Message-ID: <20080725171543.CEA791AD0EF@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchbugzilla acl on calamaris (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 17:15:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 17:15:45 +0000 Subject: [pkgdb] calamaris: wolfy has requested watchcommits Message-ID: <20080725171545.7A4A11AD0FF@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchcommits acl on calamaris (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 17:17:22 2008 From: fedora-extras-commits at redhat.com (Sven Lankes (slankes)) Date: Fri, 25 Jul 2008 17:17:22 GMT Subject: rpms/merkaartor/devel import.log, NONE, 1.1 merkaartor.desktop, NONE, 1.1 merkaartor.spec, NONE, 1.1 merkaartor.xpm, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251717.m6PHHMlr023209@cvs-int.fedora.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/merkaartor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880/devel Modified Files: .cvsignore sources Added Files: import.log merkaartor.desktop merkaartor.spec merkaartor.xpm Log Message: * Thu Jul 24 2008 slankes - 0.0.10-7 - fix executable source-files * Wed Jun 25 2008 slankes - 0.0.10-6 - remove superfluous make install from specfile - tune requires/buildrequires * Sat Jun 14 2008 slankes - 0.0.10-5 - Remove unneeded buildrequires - SPEC-Cleanup * Sun May 18 2008 slankes - 0.0.10-4 - Build in release mode instead of debug. This (among other things) makes merkaartor honour the rpm optflags) * Thu May 8 2008 slankes - 0.0.10-3 - Preserve timestamps * Sun May 4 2008 slankes - 0.0.10-2 - First package version --- NEW FILE import.log --- merkaartor-0_0_10-7_fc10:HEAD:merkaartor-0.0.10-7.fc10.src.rpm:1217005941 --- NEW FILE merkaartor.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Merkaartor GenericName=OpenStreetMap Editor Comment=Open .gpx files Exec=merkaartor Icon=merkaartor Terminal=false Type=Application Categories=Graphics; --- NEW FILE merkaartor.spec --- Name: merkaartor Version: 0.0.10 Release: 7%{?dist} Summary: QT-Based OpenStreetMap editor Group: Applications/Productivity License: GPLv2 URL: http://www.irule.be/bvh/c++/merkaartor/ Source0: http://www.irule.be/bvh/c++/merkaartor/versions/Merkaartor-%{version}.tgz Source1: %{name}.desktop Source2: %{name}.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel >= 4.3 BuildRequires: desktop-file-utils %description Merkaartor is a small editor for OpenStreetMap available under the GNU General Public License and developed using the Qt toolkit. It has some unique features like anti-aliased displaying, transparent display of map features like roads and curved roads. %prep %setup -q -n %{name} sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro chmod 644 LICENSE find -name "*.[ch]" -exec %{__chmod} -x '{}' \; find -name "*.cpp" -exec %{__chmod} -x '{}' \; %build qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -p -D release/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name} install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.xpm %doc AUTHORS CHANGELOG HACKING LICENSE %changelog * Thu Jul 24 2008 slankes - 0.0.10-7 - fix executable source-files * Wed Jun 25 2008 slankes - 0.0.10-6 - remove superfluous make install from specfile - tune requires/buildrequires * Sat Jun 14 2008 slankes - 0.0.10-5 - Remove unneeded buildrequires - SPEC-Cleanup * Sun May 18 2008 slankes - 0.0.10-4 - Build in release mode instead of debug. This (among other things) makes merkaartor honour the rpm optflags) * Thu May 8 2008 slankes - 0.0.10-3 - Preserve timestamps * Sun May 4 2008 slankes - 0.0.10-2 - First package version --- NEW FILE merkaartor.xpm --- /* XPM */ static char * Merkaartor_xpm[] = { "24 24 482 2", " c #AC9744", ". c #877119", "+ c #756110", "@ c #735F11", "# c #64530F", "$ c #8B751F", "% c #5F4F0E", "& c #332A09", "* c #141002", "= c #151100", "- c #342A02", "; c #70622A", "> c #74662F", ", c #574C20", "' c #524513", ") c #524616", "! c #54491E", "~ c #685A1F", "{ c #7E6A1E", "] c #695918", "^ c #756420", "/ c #796515", "( c #7B6616", "_ c #A59556", ": c #7E6E2F", "< c #705C0B", "[ c #7C660D", "} c #665309", "| c #594703", "1 c #241D00", "2 c #171200", "3 c #181300", "4 c #2F2707", "5 c #4B3E0C", "6 c #92813D", "7 c #C3B26B", "8 c #A89856", "9 c #968649", "0 c #7F7037", "a c #382D00", "b c #120F00", "c c #0D0A00", "d c #261E00", "e c #3D3100", "f c #473902", "g c #7D670D", "h c #715C06", "i c #776C3F", "j c #7C6D30", "k c #705D10", "l c #6C590F", "m c #453701", "n c #0E0B00", "o c #251E01", "p c #705F1F", "q c #C1AE67", "r c #BBA85B", "s c #AC9641", "t c #BEAB61", "u c #C6B571", "v c #483B08", "w c #BBA85D", "x c #7F6F32", "y c #433600", "z c #2D2400", "A c #0F0C00", "B c #1D1800", "C c #493C08", "D c #423501", "E c #6B5603", "F c #8C7B36", "G c #7E6D2A", "H c #4D3E02", "I c #473903", "J c #231C00", "K c #110D00", "L c #4D3F05", "M c #9A8531", "N c #C1AF66", "O c #BDAB61", "P c #A69240", "Q c #9C8B49", "R c #A39354", "S c #897B42", "T c #94833E", "U c #93823D", "V c #8B7D45", "W c #514412", "X c #786725", "Y c #5B4D16", "Z c #100C00", "` c #110E00", " . c #4E3F05", ".. c #5B4902", "+. c #7F6F2E", "@. c #847332", "#. c #3A2F01", "$. c #221B00", "%. c #120E00", "&. c #1C1600", "*. c #2F2600", "=. c #2E2500", "-. c #2E2501", ";. c #2C2300", ">. c #352B00", ",. c #1F1800", "'. c #211A00", "). c #292100", "!. c #1E1800", "~. c #211B04", "{. c #181301", "]. c #1E1803", "^. c #141000", "/. c #322A0A", "(. c #604F09", "_. c #927E30", ":. c #978335", "<. c #554504", "[. c #0C0900", "}. c #171300", "|. c #392E02", "1. c #312701", "2. c #1A1501", "3. c #61531B", "4. c #AD9A51", "5. c #AF9A49", "6. c #816B13", "7. c #5B4900", "8. c #413400", "9. c #282000", "0. c #735F0E", "a. c #3D3105", "b. c #2A2100", "c. c #978330", "d. c #9B8634", "e. c #2F2601", "f. c #0A0800", "g. c #191400", "h. c #161200", "i. c #4F4108", "j. c #9F8933", "k. c #BFAD63", "l. c #BBA960", "m. c #AB9748", "n. c #5E4E0B", "o. c #1D1700", "p. c #100D00", "q. c #56460A", "r. c #7C660C", "s. c #504104", "t. c #110D01", "u. c #98853C", "v. c #201900", "w. c #312802", "x. c #403407", "y. c #B4A04F", "z. c #C3B169", "A. c #C5B46E", "B. c #C9B977", "C. c #7D6918", "D. c #292000", "E. c #493C09", "F. c #312700", "G. c #130F00", "H. c #54460C", "I. c #765F08", "J. c #6B5602", "K. c #140F00", "L. c #5C522A", "M. c #91803C", "N. c #302602", "O. c #887113", "P. c #403509", "Q. c #3D3102", "R. c #807238", "S. c #B2A260", "T. c #908042", "U. c #594E27", "V. c #604F08", "W. c #473900", "X. c #1A1400", "Y. c #423503", "Z. c #735E09", "`. c #745F08", " + c #4E3E01", ".+ c #1A1500", "++ c #49411F", "@+ c #86783F", "#+ c #2E2400", "$+ c #635109", "%+ c #8C761C", "&+ c #937D27", "*+ c #5F4F10", "=+ c #302703", "-+ c #857844", ";+ c #52471A", ">+ c #2C2509", ",+ c #3C3000", "'+ c #382C00", ")+ c #2A2101", "!+ c #241C00", "~+ c #211A01", "{+ c #4B3C01", "]+ c #7E670B", "^+ c #745E06", "/+ c #584702", "(+ c #514823", "_+ c #7A6B32", ":+ c #322800", "<+ c #6A5608", "[+ c #988125", "}+ c #947C1C", "|+ c #A18A2F", "1+ c #AD994B", "2+ c #B19F59", "3+ c #7E6A1B", "4+ c #B9A657", "5+ c #AB9950", "6+ c #7C6A23", "7+ c #4B3C00", "8+ c #796823", "9+ c #403404", "0+ c #887424", "a+ c #8B730F", "b+ c #886F0F", "c+ c #7A6308", "d+ c #735D05", "e+ c #423500", "f+ c #463C12", "g+ c #917E32", "h+ c #483A01", "i+ c #877012", "j+ c #8B7419", "k+ c #9E862A", "l+ c #A48D32", "m+ c #BEAC61", "n+ c #AF9B4E", "o+ c #C7B673", "p+ c #BBAA65", "q+ c #6C5A13", "r+ c #614E02", "s+ c #7B6C30", "t+ c #8F7A23", "u+ c #927917", "v+ c #876E0B", "w+ c #856D10", "x+ c #745E05", "y+ c #3F350C", "z+ c #887735", "A+ c #251E00", "B+ c #594805", "C+ c #8F7717", "D+ c #9E8629", "E+ c #A18A2E", "F+ c #9C852C", "G+ c #8D7B34", "H+ c #504416", "I+ c #766628", "J+ c #AC9A51", "K+ c #5A4A0A", "L+ c #624F04", "M+ c #584703", "N+ c #5D4C08", "O+ c #957E22", "P+ c #8D7411", "Q+ c #846B0A", "R+ c #7D6609", "S+ c #574603", "T+ c #4F4316", "U+ c #766831", "V+ c #584805", "W+ c #897113", "X+ c #927A1B", "Y+ c #977F1F", "Z+ c #675613", "`+ c #4A3C05", " @ c #4F4210", ".@ c #534719", "+@ c #544407", "@@ c #5C4A04", "#@ c #483A00", "$@ c #40350B", "%@ c #968026", "&@ c #887010", "*@ c #9A8223", "=@ c #947C1A", "-@ c #886F0C", ";@ c #856D0C", ">@ c #5D4B03", ",@ c #594C1C", "'@ c #8C7E46", ")@ c #1B1600", "!@ c #5C4B0A", "~@ c #967E1E", "{@ c #322907", "]@ c #665924", "^@ c #695B22", "/@ c #372E0B", "(@ c #403300", "_@ c #231D04", ":@ c #AB9952", "<@ c #9B852D", "[@ c #866E12", "}@ c #998020", "|@ c #8C7411", "1@ c #8C7310", "2@ c #80690D", "3@ c #41360C", "4@ c #80733E", "5@ c #342A00", "6@ c #7F6912", "7@ c #9B8326", "8@ c #998124", "9@ c #8F7718", "0@ c #5D4B05", "a@ c #A6944C", "b@ c #6E6026", "c@ c #302600", "d@ c #5C5021", "e@ c #9D893B", "f@ c #6D590D", "g@ c #282104", "h@ c #796410", "i@ c #937A1A", "j@ c #7D6504", "k@ c #5A4903", "l@ c #53481A", "m@ c #867942", "n@ c #2D2608", "o@ c #816C16", "p@ c #9E8628", "q@ c #91791A", "r@ c #A18B36", "s@ c #776006", "t@ c #90791E", "u@ c #443702", "v@ c #7E6B20", "w@ c #A29150", "x@ c #BAA75B", "y@ c #A48F3D", "z@ c #362B00", "A@ c #0C0A00", "B@ c #483A02", "C@ c #927A1A", "D@ c #564503", "E@ c #524615", "F@ c #887D50", "G@ c #473E1A", "H@ c #B19E55", "I@ c #B7A354", "J@ c #806F28", "K@ c #382E03", "L@ c #7F6E2E", "M@ c #836C0F", "N@ c #806A10", "O@ c #75600D", "P@ c #937D26", "Q@ c #6D5807", "R@ c #1C1703", "S@ c #C3B26C", "T@ c #B8A558", "U@ c #A38D37", "V@ c #2C2403", "W@ c #4C3E02", "X@ c #66571B", "Y@ c #A9995A", "Z@ c #BBA85E", "`@ c #BAA658", " # c #BEAB60", ".# c #635315", "+# c #695818", "@# c #715D0F", "## c #8A7212", "$# c #715D0C", "%# c #6B580D", "&# c #7C660E", "*# c #41391A", "=# c #C3B16B", "-# c #856F19", ";# c #0B0900", "># c #0F0B00", ",# c #453B15", "'# c #BFAD65", ")# c #BBA85A", "!# c #BDAA5D", "~# c #B5A153", "{# c #5F5117", "]# c #B9A556", "^# c #806C1B", "/# c #8B782D", "(# c #87721E", "_# c #4D3E05", ":# c #221D0B", "<# c #6C5F29", "[# c #B9A75E", "}# c #604F0D", "|# c #433707", "1# c #272002", "2# c #292102", "3# c #54491D", "4# c #261F06", "5# c #3D3411", "6# c #BFAC64", "7# c #B9A555", "8# c #BDAA5E", "9# c #917F35", "0# c #76682C", "a# c #BFAC61", "b# c #857226", "c# c #846D15", "d# c #433705", "e# c #705B06", "f# c #4D4213", "g# c #7F7034", "h# c #685818", "i# c #A59141", "j# c #B8A559", "k# c #635418", "l# c #94864C", "m# c #C6B570", "n# c #AA9645", "o# c #453B16", "p# c #B0A061", "q# c #B6A250", "r# c #766729", "s# c #1D1703", "t# c #BFAD64", "u# c #BFAD62", "v# c #C0AD63", "w# c #7E6B1D", "x# c #7B650E", "y# c #6D5F28", "z# c #8C7B39", "A# c #C1B06C", "B# c #C8B774", "C# c #CABA79", "D# c #AF9B4D", "E# c #C0AE68", "F# c #CAB978", "G# c #C0AE67", "H# c #5B4C0F", "I# c #4B4220", "J# c #A19257", "K# c #AB9641", "L# c #38300D", "M# c #221C04", "N# c #BFAD66", "O# c #C2AF66", "P# c #C3B168", "Q# c #A7954E", "R# c #908040", "S# c #C7B571", "T# c #CEBE80", "U# c #CDBD7F", "V# c #CEBF82", "W# c #CBBC7C", "X# c #C7B672", "Y# c #C9B877", "Z# c #B19D4D", "`# c #6D5A0D", " $ c #403819", ".$ c #9E8E50", "+$ c #8E7A2E", "@$ c #AD9844", "#$ c #302702", "$$ c #3A310D", "%$ c #C3B16A", "&$ c #C4B26B", "*$ c #C5B36D", "=$ c #BBA75B", "-$ c #3A2F02", ";$ c #6F612A", ">$ c #CEBF81", ",$ c #CDBD7E", "'$ c #C9B978", ")$ c #695C2B", "!$ c #816F29", "~$ c #CAB977", "{$ c #C6B572", "]$ c #937F2F", "^$ c #5C4B06", "/$ c #6F6230", " . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ ", ": < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i ", "j k l m 3 n o p q r s t u v w x y z A B C D E F ", "G H I J K L M N O P Q R S T U V W X Y Z ` ...+.", "@.#.$.%.2 &.*.=.-.=.;.z >.,.'.).!.~.{.].^./.(._.", ":.<.[.}.,.|.1.2.3.4.5.6.7.8.9.3 ` c #.0.a.A b.c.", "d.e.f.c 3 g.h.i.j.k.l.m.n.).o.2 p.%.q.r.s.'.t.+.", "u.v.n A w.x.K - y.z.A.B.C.=.D.E.F.G.H.I.J.=.K.L.", "M.1 ^.=.N.O.P.Q.R.S.T.U.V.W.x.b.X.n Y.Z.`. +.+++", "@+1 K #+$+%+&+*+=+-+;+>+,+'+)+!+~+K {+]+^+/+J (+", "_+:+&.*.<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+", "g+y o.h+i+j+k+l+m+n+k.o+p+q+r+s+W.t+u+v+w+x+7+y+", "z+A+2 B+C+D+E+F+G+H+I+J+K+L+M+&.N+O+u+P+Q+R+S+T+", "U+2 '.V+W+X+Y+Z+`+ @. at +@@@#@;.$@%@&@*@=@-@;@>@,@", "'@A+)@!@~@k+Y+w.{@]@^@/@b.(@_@:@<@[@}@|@1 at 2@S+3@", "4 at 1 5 at 6@7 at 8@9 at r+0@a at b@c at 5@g.d at w e at f@g at h@i at j@k at l@", "m at g.n@o at p@q at r@s at t@{+u at v@3 K w at x@y at z@A at p.B@C at D@E@", "F at G@H at I@J at K@L at M@N at O@P at Q@!.R at S@T at U@^.c [.A at V@W at X@", "Y at Z@`@ #.#[ +#@###$#%#&#).*#=#p+-#%.%.K ;#>#g.,#", "'#)#!#~#{#]#^#B@/#(#_#B@!.:#<#[#}#|#1#2#3#4#d 5#", "6#7#8#9#0#N a#b#c#0+d#e#9.f#g#h#i#j#k#l#m#n#1.o#", "p#q#8#r#s#t#u#v#w#x#9.e.y#z#A#B#C#D#E#F#G#=#H#I#", "J#K#N L#M#N#O#P#Q#e.2#R#S#T#U#V#W#U+X#C#Y#Z#`# $", ".$+$@$#$$$%$&$*$=$-$;$u X#>$,$'$)$!$~$U#{$]$^$/$"}; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:54:37 -0000 1.1 +++ .cvsignore 25 Jul 2008 17:16:52 -0000 1.2 @@ -0,0 +1 @@ +Merkaartor-0.0.10.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:54:37 -0000 1.1 +++ sources 25 Jul 2008 17:16:52 -0000 1.2 @@ -0,0 +1 @@ +af231c7a6834ffa72ddb9983b344821f Merkaartor-0.0.10.tgz From fedora-extras-commits at redhat.com Fri Jul 25 17:23:00 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 25 Jul 2008 17:23:00 GMT Subject: rpms/klamav/devel klamav-suse-clamav-path.diff, 1.1, 1.2 klamav.spec, 1.23, 1.24 Message-ID: <200807251723.m6PHN0H4023720@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/klamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23662 Modified Files: klamav-suse-clamav-path.diff klamav.spec Log Message: Fix unapplied patch klamav-suse-clamav-path.diff: Index: klamav-suse-clamav-path.diff =================================================================== RCS file: /cvs/extras/rpms/klamav/devel/klamav-suse-clamav-path.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- klamav-suse-clamav-path.diff 28 Sep 2006 15:56:10 -0000 1.1 +++ klamav-suse-clamav-path.diff 25 Jul 2008 17:22:30 -0000 1.2 @@ -1,11 +1,11 @@ --- src/klammail/clamdmail.c.orig 2005-01-16 23:43:02.113205840 +0100 +++ src/klammail/clamdmail.c 2005-01-16 23:43:13.392491128 +0100 -@@ -563,7 +563,7 @@ +@@ -541,7 +541,7 @@ break; } }else{ - fprintf(tmp,"DatabaseDirectory /usr/local/share/clamav\n"); + fprintf(tmp,"DatabaseDirectory /var/lib/clamav\n"); } - fprintf(tmp,"ScanMail\n"); - fprintf(tmp,"FixStaleSocket\n"); + //fprintf(tmp,"ScanMail\n"); + if ((strstr(cl_retver(), "0.8")) || (strstr(cl_retver(), "0.7"))) Index: klamav.spec =================================================================== RCS file: /cvs/extras/rpms/klamav/devel/klamav.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- klamav.spec 20 Jul 2008 15:55:32 -0000 1.23 +++ klamav.spec 25 Jul 2008 17:22:30 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Clam Anti-Virus on the KDE Desktop Name: klamav Version: 0.44 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 Patch0: klamav-suse-clamav-path.diff Patch1: klamav-0.41.1-pwd-echo.patch @@ -83,7 +83,7 @@ %{_datadir}/icons/*/*x*/apps/klamav.png %changelog -* Sun Jul 20 2008 Andy Shevchenko 0.44-1 +* Sun Jul 20 2008 Andy Shevchenko 0.44-2 - update to 0.44 - bump clamav requirements to have their at least for 0.93 - remove upstreamed patches From fedora-extras-commits at redhat.com Fri Jul 25 17:23:42 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 25 Jul 2008 17:23:42 GMT Subject: rpms/python-alsa/F-9 python-alsa.spec,1.8,1.9 sources,1.6,1.7 Message-ID: <200807251723.m6PHNgSN023839@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/python-alsa/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23735 Modified Files: python-alsa.spec sources Log Message: update to 1.0.17 (revert back last unneeded change) Index: python-alsa.spec =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-9/python-alsa.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-alsa.spec 25 Jul 2008 17:08:30 -0000 1.8 +++ python-alsa.spec 25 Jul 2008 17:23:12 -0000 1.9 @@ -1,12 +1,12 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define rcver rc1 -%define rcver_dot .rc1 +%define rcver %{nil} +%define rcver_dot %{nil} Summary: Python binding for the ALSA library Name: python-alsa Version: 1.0.17 -Release: 0.1%{?rcver_dot}%{?dist} +Release: 1%{?rcver_dot}%{?dist} License: LGPLv2+ Group: Development/Languages Source0: ftp://ftp.alsa-project.org/pub/pyalsa/pyalsa-%{version}%{?rcver}.tar.bz2 @@ -41,8 +41,8 @@ %{python_sitearch}/* %changelog -* Fri Jul 25 2008 Andy Shevchenko - 1.0.17-0.1.rc1 -- update to release 1.0.17rc1 +* Fri Jul 25 2008 Andy Shevchenko - 1.0.17-1 +- update to release 1.0.17 * Sun May 04 2008 Andy Shevchenko - 1.0.16-1 - update to release 1.0.16 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jul 2008 17:08:30 -0000 1.6 +++ sources 25 Jul 2008 17:23:12 -0000 1.7 @@ -1 +1 @@ -efc84449c792477607abe71637f38eca pyalsa-1.0.17rc1.tar.bz2 +cb38d76edaf47b85baf7eec2b60da5fa pyalsa-1.0.17.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:24:38 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Fri, 25 Jul 2008 17:24:38 GMT Subject: rpms/pytrainer/devel pytrainer.spec,1.4,1.5 Message-ID: <200807251724.m6PHOcgb023971@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/pytrainer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23877 Modified Files: pytrainer.spec Log Message: * Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-6 - bumping xulrunner dep to 1.9.0.1 Index: pytrainer.spec =================================================================== RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pytrainer.spec 21 Jul 2008 18:42:42 -0000 1.4 +++ pytrainer.spec 25 Jul 2008 17:24:07 -0000 1.5 @@ -6,7 +6,7 @@ Name: pytrainer Version: 1.5.0.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool to log all your sport excursions Group: Development/Languages @@ -90,6 +90,9 @@ %changelog +* Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-6 +- bumping xulrunner dep to 1.9.0.1 + * Mon Jul 07 2008 Douglas E. Warner 1.5.0.0.1-5 - bumping xulrunner dep to 1.9.0.1 From fedora-extras-commits at redhat.com Fri Jul 25 17:26:49 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Fri, 25 Jul 2008 17:26:49 GMT Subject: rpms/python-mwlib/devel import.log, NONE, 1.1 mwlib-0.8.0.patch, NONE, 1.1 python-mwlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251726.m6PHQneq024179@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/python-mwlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24137/devel Modified Files: .cvsignore sources Added Files: import.log mwlib-0.8.0.patch python-mwlib.spec Log Message: import python-mwlib 0.8.0-2 in devel --- NEW FILE import.log --- python-mwlib-0_8_0-2_fc9:HEAD:python-mwlib-0.8.0-2.fc9.src.rpm:1217006722 mwlib-0.8.0.patch: --- NEW FILE mwlib-0.8.0.patch --- diff -up mwlib-0.8.0/mwlib/snippets.txt.orig mwlib-0.8.0/mwlib/snippets.txt --- mwlib-0.8.0/mwlib/snippets.txt.orig 2008-07-21 03:00:04.000000000 -0500 +++ mwlib-0.8.0/mwlib/snippets.txt 2008-07-21 03:00:17.000000000 -0500 @@ -1,13 +1,13 @@ -#! -*- mode: wikipedia -*- - +# -*- mode: wikipedia -*- + funky Umlauts and symbols: ?????? ?????? some symbols: @ ??? ~ # ^ ?? ' - + Intra wiki link: [[Articlename]] with different link text: [[Other Article|Some funky text]] - + External link to [http://example.com] with optional link text [http://example.com bla blub] - + some url: http://example.com. now a url with umlauts: http://das??rtliche.de and now a italic url ''http://example.com/??path'' - + * item 1 ??#???? * item 2 @??? * item3 @@ -15,7 +15,7 @@ some url: http://example.com. now a url # numbered item 1 # numbered item 2 # numbered item3 - + {| class="prettytable" |- | row 1, col 1 || row 1, col 2 || row 1, col 3 @@ -24,13 +24,13 @@ some url: http://example.com. now a url |- | row 3, col 1 || row 3, col 2 || row 3, col 3 |} - + normal paragraph : some indented text back to normal - + [[w:en:Help:Piped link|en:Help:Piped link]] [[wikipedia:]] @@ -52,4 +52,4 @@ back to normal [[Category:SomeCategory]] [[:Category:SomeCategoryWhichIsDisplayed]] - + diff -up mwlib-0.8.0/mwlib/tagext.py.orig mwlib-0.8.0/mwlib/tagext.py --- mwlib-0.8.0/mwlib/tagext.py.orig 2008-07-21 03:11:22.000000000 -0500 +++ mwlib-0.8.0/mwlib/tagext.py 2008-07-21 03:11:28.000000000 -0500 @@ -1,4 +1,3 @@ -#! /usr/bin/env py.test # -*- coding: utf-8 -*- # Copyright (c) 2007-2008 PediaPress GmbH diff -up mwlib-0.8.0/mwlib/xmltreecleaner.py.orig mwlib-0.8.0/mwlib/xmltreecleaner.py --- mwlib-0.8.0/mwlib/xmltreecleaner.py.orig 2008-07-21 03:00:26.000000000 -0500 +++ mwlib-0.8.0/mwlib/xmltreecleaner.py 2008-07-21 03:00:36.000000000 -0500 @@ -1,5 +1,5 @@ #! /usr/bin/env python -#! -*- coding:utf-8 -*- +# -*- coding:utf-8 -*- # Copyright (c) 2007, PediaPress GmbH # See README.txt for additional licensing information. --- NEW FILE python-mwlib.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-mwlib Version: 0.8.0 Release: 2%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages # mwlib/cdb.py under Python license, everything else under BSD License: BSD and Python URL: http://code.pediapress.com/ Source0: http://pypi.python.org/packages/source/m/mwlib/mwlib-%{version}.tar.gz Patch0: mwlib-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools Requires: perl python-imaging tex(latex) python-flup pyparsing odfpy python-simplejson %description mwlib is a Python library for parsing MediaWiki articles. It is currently aimed at developers, who have a need to somehow handle MediaWiki articles. %prep %setup -q -n mwlib-%{version} %patch0 -p1 %build CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} sed -i '/#! \/usr\/bin\/env python/d' %{buildroot}%{python_sitearch}/mwlib/*.py chmod a-x %{buildroot}%{python_sitearch}/mwlib/snippets.txt chmod 755 %{buildroot}%{python_sitearch}/mwlib/_mwscan.so %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc example_conf.txt README.txt docs/*.html %{python_sitearch}/mwlib* %{_bindir}/* %changelog * Fri Jul 25 2008 Ian Weller 0.8.0-2 - Fix source URL (again) - Remove make commands because setup.py build does that now - Kill off the check section - Fix license * Mon Jul 21 2008 Ian Weller 0.8.0-1 - Bump to 0.8.0 * Sun Jul 13 2008 Ian Weller 0.7.1-1 - Fix source URL, license, other things * Sun Jul 13 2008 Paul W. Frields - 0.7.1-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:52:17 -0000 1.1 +++ .cvsignore 25 Jul 2008 17:26:19 -0000 1.2 @@ -0,0 +1 @@ +mwlib-0.8.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:52:17 -0000 1.1 +++ sources 25 Jul 2008 17:26:19 -0000 1.2 @@ -0,0 +1 @@ +5286ff35bbbda3a0b84182e743ee9d92 mwlib-0.8.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 17:07:21 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:07:21 GMT Subject: rpms/kdesdk/F-9 .cvsignore, 1.42, 1.43 kdesdk.spec, 1.101, 1.102 sources, 1.44, 1.45 Message-ID: <200807251707.m6PH7LxE022210@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22123 Modified Files: .cvsignore kdesdk.spec sources Log Message: * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/F-9/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 21 Jul 2008 20:26:55 -0000 1.42 +++ .cvsignore 25 Jul 2008 17:06:51 -0000 1.43 @@ -1 +1,2 @@ kdesdk-4.0.99.tar.bz2 +kdesdk-4.1.0.tar.bz2 Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- kdesdk.spec 23 Jul 2008 17:56:49 -0000 1.101 +++ kdesdk.spec 25 Jul 2008 17:06:51 -0000 1.102 @@ -1,7 +1,7 @@ Name: kdesdk -Version: 4.0.99 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) Group: User Interface/Desktops @@ -216,6 +216,9 @@ %changelog +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Wed Jul 23 2008 Rex Dieter 4.0.99-2 - fix -utils dep issues Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/F-9/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 21 Jul 2008 20:26:56 -0000 1.44 +++ sources 25 Jul 2008 17:06:51 -0000 1.45 @@ -1 +1 @@ -b463aec4dbc6b2d73e200773aef81f2c kdesdk-4.0.99.tar.bz2 +eb4e7bc753c80f617c113f31ab501168 kdesdk-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:28:32 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Fri, 25 Jul 2008 17:28:32 GMT Subject: rpms/python-mwlib/F-9 import.log, NONE, 1.1 mwlib-0.8.0.patch, NONE, 1.1 python-mwlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251728.m6PHSWhh024322@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/python-mwlib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24275/F-9 Modified Files: .cvsignore sources Added Files: import.log mwlib-0.8.0.patch python-mwlib.spec Log Message: import python-mwlib 0.8.0-2 in F-9 --- NEW FILE import.log --- python-mwlib-0_8_0-2_fc9:F-9:python-mwlib-0.8.0-2.fc9.src.rpm:1217006866 mwlib-0.8.0.patch: --- NEW FILE mwlib-0.8.0.patch --- diff -up mwlib-0.8.0/mwlib/snippets.txt.orig mwlib-0.8.0/mwlib/snippets.txt --- mwlib-0.8.0/mwlib/snippets.txt.orig 2008-07-21 03:00:04.000000000 -0500 +++ mwlib-0.8.0/mwlib/snippets.txt 2008-07-21 03:00:17.000000000 -0500 @@ -1,13 +1,13 @@ -#! -*- mode: wikipedia -*- - +# -*- mode: wikipedia -*- + funky Umlauts and symbols: ?????? ?????? some symbols: @ ??? ~ # ^ ?? ' - + Intra wiki link: [[Articlename]] with different link text: [[Other Article|Some funky text]] - + External link to [http://example.com] with optional link text [http://example.com bla blub] - + some url: http://example.com. now a url with umlauts: http://das??rtliche.de and now a italic url ''http://example.com/??path'' - + * item 1 ??#???? * item 2 @??? * item3 @@ -15,7 +15,7 @@ some url: http://example.com. now a url # numbered item 1 # numbered item 2 # numbered item3 - + {| class="prettytable" |- | row 1, col 1 || row 1, col 2 || row 1, col 3 @@ -24,13 +24,13 @@ some url: http://example.com. now a url |- | row 3, col 1 || row 3, col 2 || row 3, col 3 |} - + normal paragraph : some indented text back to normal - + [[w:en:Help:Piped link|en:Help:Piped link]] [[wikipedia:]] @@ -52,4 +52,4 @@ back to normal [[Category:SomeCategory]] [[:Category:SomeCategoryWhichIsDisplayed]] - + diff -up mwlib-0.8.0/mwlib/tagext.py.orig mwlib-0.8.0/mwlib/tagext.py --- mwlib-0.8.0/mwlib/tagext.py.orig 2008-07-21 03:11:22.000000000 -0500 +++ mwlib-0.8.0/mwlib/tagext.py 2008-07-21 03:11:28.000000000 -0500 @@ -1,4 +1,3 @@ -#! /usr/bin/env py.test # -*- coding: utf-8 -*- # Copyright (c) 2007-2008 PediaPress GmbH diff -up mwlib-0.8.0/mwlib/xmltreecleaner.py.orig mwlib-0.8.0/mwlib/xmltreecleaner.py --- mwlib-0.8.0/mwlib/xmltreecleaner.py.orig 2008-07-21 03:00:26.000000000 -0500 +++ mwlib-0.8.0/mwlib/xmltreecleaner.py 2008-07-21 03:00:36.000000000 -0500 @@ -1,5 +1,5 @@ #! /usr/bin/env python -#! -*- coding:utf-8 -*- +# -*- coding:utf-8 -*- # Copyright (c) 2007, PediaPress GmbH # See README.txt for additional licensing information. --- NEW FILE python-mwlib.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-mwlib Version: 0.8.0 Release: 2%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages # mwlib/cdb.py under Python license, everything else under BSD License: BSD and Python URL: http://code.pediapress.com/ Source0: http://pypi.python.org/packages/source/m/mwlib/mwlib-%{version}.tar.gz Patch0: mwlib-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools Requires: perl python-imaging tex(latex) python-flup pyparsing odfpy python-simplejson %description mwlib is a Python library for parsing MediaWiki articles. It is currently aimed at developers, who have a need to somehow handle MediaWiki articles. %prep %setup -q -n mwlib-%{version} %patch0 -p1 %build CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} sed -i '/#! \/usr\/bin\/env python/d' %{buildroot}%{python_sitearch}/mwlib/*.py chmod a-x %{buildroot}%{python_sitearch}/mwlib/snippets.txt chmod 755 %{buildroot}%{python_sitearch}/mwlib/_mwscan.so %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc example_conf.txt README.txt docs/*.html %{python_sitearch}/mwlib* %{_bindir}/* %changelog * Fri Jul 25 2008 Ian Weller 0.8.0-2 - Fix source URL (again) - Remove make commands because setup.py build does that now - Kill off the check section - Fix license * Mon Jul 21 2008 Ian Weller 0.8.0-1 - Bump to 0.8.0 * Sun Jul 13 2008 Ian Weller 0.7.1-1 - Fix source URL, license, other things * Sun Jul 13 2008 Paul W. Frields - 0.7.1-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:52:17 -0000 1.1 +++ .cvsignore 25 Jul 2008 17:28:01 -0000 1.2 @@ -0,0 +1 @@ +mwlib-0.8.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:52:17 -0000 1.1 +++ sources 25 Jul 2008 17:28:01 -0000 1.2 @@ -0,0 +1 @@ +5286ff35bbbda3a0b84182e743ee9d92 mwlib-0.8.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 17:31:02 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Fri, 25 Jul 2008 17:31:02 GMT Subject: rpms/python-mwlib/F-8 import.log, NONE, 1.1 mwlib-0.8.0.patch, NONE, 1.1 python-mwlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251731.m6PHV24l024476@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/python-mwlib/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24441/F-8 Modified Files: .cvsignore sources Added Files: import.log mwlib-0.8.0.patch python-mwlib.spec Log Message: import python-mwlib 0.8.0-2 in F-8 --- NEW FILE import.log --- python-mwlib-0_8_0-2_fc9:F-8:python-mwlib-0.8.0-2.fc9.src.rpm:1217007019 mwlib-0.8.0.patch: --- NEW FILE mwlib-0.8.0.patch --- diff -up mwlib-0.8.0/mwlib/snippets.txt.orig mwlib-0.8.0/mwlib/snippets.txt --- mwlib-0.8.0/mwlib/snippets.txt.orig 2008-07-21 03:00:04.000000000 -0500 +++ mwlib-0.8.0/mwlib/snippets.txt 2008-07-21 03:00:17.000000000 -0500 @@ -1,13 +1,13 @@ -#! -*- mode: wikipedia -*- - +# -*- mode: wikipedia -*- + funky Umlauts and symbols: ?????? ?????? some symbols: @ ??? ~ # ^ ?? ' - + Intra wiki link: [[Articlename]] with different link text: [[Other Article|Some funky text]] - + External link to [http://example.com] with optional link text [http://example.com bla blub] - + some url: http://example.com. now a url with umlauts: http://das??rtliche.de and now a italic url ''http://example.com/??path'' - + * item 1 ??#???? * item 2 @??? * item3 @@ -15,7 +15,7 @@ some url: http://example.com. now a url # numbered item 1 # numbered item 2 # numbered item3 - + {| class="prettytable" |- | row 1, col 1 || row 1, col 2 || row 1, col 3 @@ -24,13 +24,13 @@ some url: http://example.com. now a url |- | row 3, col 1 || row 3, col 2 || row 3, col 3 |} - + normal paragraph : some indented text back to normal - + [[w:en:Help:Piped link|en:Help:Piped link]] [[wikipedia:]] @@ -52,4 +52,4 @@ back to normal [[Category:SomeCategory]] [[:Category:SomeCategoryWhichIsDisplayed]] - + diff -up mwlib-0.8.0/mwlib/tagext.py.orig mwlib-0.8.0/mwlib/tagext.py --- mwlib-0.8.0/mwlib/tagext.py.orig 2008-07-21 03:11:22.000000000 -0500 +++ mwlib-0.8.0/mwlib/tagext.py 2008-07-21 03:11:28.000000000 -0500 @@ -1,4 +1,3 @@ -#! /usr/bin/env py.test # -*- coding: utf-8 -*- # Copyright (c) 2007-2008 PediaPress GmbH diff -up mwlib-0.8.0/mwlib/xmltreecleaner.py.orig mwlib-0.8.0/mwlib/xmltreecleaner.py --- mwlib-0.8.0/mwlib/xmltreecleaner.py.orig 2008-07-21 03:00:26.000000000 -0500 +++ mwlib-0.8.0/mwlib/xmltreecleaner.py 2008-07-21 03:00:36.000000000 -0500 @@ -1,5 +1,5 @@ #! /usr/bin/env python -#! -*- coding:utf-8 -*- +# -*- coding:utf-8 -*- # Copyright (c) 2007, PediaPress GmbH # See README.txt for additional licensing information. --- NEW FILE python-mwlib.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-mwlib Version: 0.8.0 Release: 2%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages # mwlib/cdb.py under Python license, everything else under BSD License: BSD and Python URL: http://code.pediapress.com/ Source0: http://pypi.python.org/packages/source/m/mwlib/mwlib-%{version}.tar.gz Patch0: mwlib-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools Requires: perl python-imaging tex(latex) python-flup pyparsing odfpy python-simplejson %description mwlib is a Python library for parsing MediaWiki articles. It is currently aimed at developers, who have a need to somehow handle MediaWiki articles. %prep %setup -q -n mwlib-%{version} %patch0 -p1 %build CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} sed -i '/#! \/usr\/bin\/env python/d' %{buildroot}%{python_sitearch}/mwlib/*.py chmod a-x %{buildroot}%{python_sitearch}/mwlib/snippets.txt chmod 755 %{buildroot}%{python_sitearch}/mwlib/_mwscan.so %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc example_conf.txt README.txt docs/*.html %{python_sitearch}/mwlib* %{_bindir}/* %changelog * Fri Jul 25 2008 Ian Weller 0.8.0-2 - Fix source URL (again) - Remove make commands because setup.py build does that now - Kill off the check section - Fix license * Mon Jul 21 2008 Ian Weller 0.8.0-1 - Bump to 0.8.0 * Sun Jul 13 2008 Ian Weller 0.7.1-1 - Fix source URL, license, other things * Sun Jul 13 2008 Paul W. Frields - 0.7.1-0.1 - Initial RPM package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:52:17 -0000 1.1 +++ .cvsignore 25 Jul 2008 17:30:32 -0000 1.2 @@ -0,0 +1 @@ +mwlib-0.8.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:52:17 -0000 1.1 +++ sources 25 Jul 2008 17:30:32 -0000 1.2 @@ -0,0 +1 @@ +5286ff35bbbda3a0b84182e743ee9d92 mwlib-0.8.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 17:33:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 25 Jul 2008 17:33:31 GMT Subject: rpms/kdeutils/F-9 .cvsignore,1.47,1.48 sources,1.50,1.51 Message-ID: <200807251733.m6PHXVEA024646@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24604 Modified Files: .cvsignore sources Log Message: +kdepim (kjots) sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 25 Jul 2008 17:08:35 -0000 1.47 +++ .cvsignore 25 Jul 2008 17:33:01 -0000 1.48 @@ -1,2 +1,2 @@ -kdeutils-4.0.99.tar.bz2 kdeutils-4.1.0.tar.bz2 +kdepim-4.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 25 Jul 2008 17:08:35 -0000 1.50 +++ sources 25 Jul 2008 17:33:01 -0000 1.51 @@ -1 +1,2 @@ 456d811618e5417e224476089df9a3b3 kdeutils-4.1.0.tar.bz2 +5ccd9ca2bf92c0f94ac3b0bf5a5a1344 kdepim-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 17:47:41 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 17:47:41 GMT Subject: rpms/gnome-settings-daemon/devel icon-names.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.37, 1.38 Message-ID: <200807251747.m6PHlf3D025212@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-settings-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25188 Modified Files: gnome-settings-daemon.spec Added Files: icon-names.patch Log Message: more icon name fixes icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gnome-settings-daemon-2.23.5/plugins/media-keys/actions/acme.glade.icon-names gnome-settings-daemon-2.23.5/plugins/media-keys/actions/acme.glade --- gnome-settings-daemon-2.23.5/plugins/media-keys/actions/acme.glade.icon-names 2008-07-25 13:41:10.000000000 -0400 +++ gnome-settings-daemon-2.23.5/plugins/media-keys/actions/acme.glade 2008-07-25 13:41:35.000000000 -0400 @@ -20,7 +20,7 @@ True 6 - stock_volume-max + audio-volume-high 0.5 0.5 0 Index: gnome-settings-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-settings-daemon.spec 25 Jul 2008 08:49:39 -0000 1.37 +++ gnome-settings-daemon.spec 25 Jul 2008 17:47:11 -0000 1.38 @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 2.23.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -34,6 +34,9 @@ # survive xrandr being absent (such as on Xnest in sabayon) Patch5: xrandr-missingok.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=544733 +Patch7: icon-names.patch + %description A daemon to share settings from GNOME to other applications. It also handles global keybindings, as well as a number of desktop-wide settings. @@ -54,6 +57,7 @@ %patch2 -p1 -b .ignore-layout-if-using-evdev %patch5 -p1 -b .xrandr-missingok +%patch7 -p1 -b .icon-names %build %configure --enable-static=no --enable-profiling @@ -147,6 +151,9 @@ %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Fri Jul 25 2008 Matthias Clasen - 2.23.5-3 +- Use standard icon names in the volume OSD + * Fri Jul 25 2008 - Bastien Nocera - 2.23.5-2 - Fix build, call gtk-update-icon-cache as required From fedora-extras-commits at redhat.com Fri Jul 25 17:50:11 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 17:50:11 GMT Subject: rpms/asterisk/devel 0012-Merged-revisions-132778-via-svnmerge-from.patch, NONE, 1.1 asterisk.spec, 1.29, 1.30 Message-ID: <200807251750.m6PHoBNc025416@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25383 Modified Files: asterisk.spec Added Files: 0012-Merged-revisions-132778-via-svnmerge-from.patch Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.19.beta9 - Add patch pulled from upstream SVN that fixes AST-2008-010 and AST-2008-011. 0012-Merged-revisions-132778-via-svnmerge-from.patch: --- NEW FILE 0012-Merged-revisions-132778-via-svnmerge-from.patch --- >From 6c1b2ef859c2ad25a42b62d731d398c77fc3bb71 Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 22 Jul 2008 21:55:06 +0000 Subject: [PATCH] Merged revisions 132778 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r132778 | tilghman | 2008-07-22 16:53:40 -0500 (Tue, 22 Jul 2008) | 18 lines Merged revisions 132713 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r132713 | tilghman | 2008-07-22 16:19:39 -0500 (Tue, 22 Jul 2008) | 10 lines Merged revisions 132711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r132711 | tilghman | 2008-07-22 16:14:10 -0500 (Tue, 22 Jul 2008) | 2 lines Fixes for AST-2008-010 and AST-2008-011 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 132780 614ede4d-c843-0410-af14-a771ab80d22e --- channels/chan_iax2.c | 31 +++++++++++++++++++++++++++++-- configs/iax.conf.sample | 10 ++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index de1b450..055aa17 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -278,6 +278,7 @@ enum iax2_flags { IAX_DELAYPBXSTART = (1 << 25), /*!< Don't start a PBX on the channel until the peer sends us a response, so that we've achieved a three-way handshake with them before sending voice or anything else*/ + IAX_ALLOWFWDOWNLOAD = (1 << 26), /*!< Allow the FWDOWNL command? */ }; static int global_rtautoclear = 120; @@ -1701,10 +1702,10 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s snprintf(host, sizeof(host), "%s:%d", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); now = ast_tvnow(); - start = 1 + (ast_random() % (TRUNK_CALL_START - 1)); + start = 2 + (ast_random() % (TRUNK_CALL_START - 1)); for (x = start; 1; x++) { if (x == TRUNK_CALL_START) { - x = 0; + x = 1; continue; } @@ -3447,6 +3448,15 @@ struct parsed_dial_string { char *options; }; +static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno) +{ + struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno), + .ts = htonl(ts), .iseqno = seqno, .oseqno = seqno, .type = AST_FRAME_IAX, + .csub = compress_subclass(command) }; + + return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin)); +} + /*! * \brief Parses an IAX dial string into its component parts. * \param data the string to be parsed @@ -7990,6 +8000,17 @@ static int socket_process(struct iax2_thread *thread) } else { f.subclass = uncompress_subclass(fh->csub); } + + /* Deal with POKE/PONG without allocating a callno */ + if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) { + /* Reply back with a PONG, but don't care about the result. */ + send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->oseqno); + return 1; + } else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) { + /* Ignore */ + return 1; + } + if ((f.frametype == AST_FRAME_IAX) && ((f.subclass == IAX_COMMAND_NEW) || (f.subclass == IAX_COMMAND_REGREQ) || (f.subclass == IAX_COMMAND_POKE) || (f.subclass == IAX_COMMAND_FWDOWNL) || (f.subclass == IAX_COMMAND_REGREL))) @@ -9305,6 +9326,10 @@ retryowner2: break; case IAX_COMMAND_FWDOWNL: /* Firmware download */ + if (!ast_test_flag(&globalflags, IAX_ALLOWFWDOWNLOAD)) { + send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_UNSUPPORT, 0, NULL, 0, -1); + break; + } memset(&ied0, 0, sizeof(ied0)); res = iax_firmware_append(&ied0, (unsigned char *)ies.devicetype, ies.fwdesc); if (res < 0) @@ -10964,6 +10989,8 @@ static int set_config(char *config_file, int reload) ast_set2_flag((&globalflags), ast_true(v->value), IAX_FORCEJITTERBUF); else if (!strcasecmp(v->name, "delayreject")) delayreject = ast_true(v->value); + else if (!strcasecmp(v->name, "allowfwdownload")) + ast_set2_flag((&globalflags), ast_true(v->value), IAX_ALLOWFWDOWNLOAD); else if (!strcasecmp(v->name, "rtcachefriends")) ast_set2_flag((&globalflags), ast_true(v->value), IAX_RTCACHEFRIENDS); else if (!strcasecmp(v->name, "rtignoreregexpire")) diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index 2441f2c..854a243 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -264,6 +264,16 @@ autokill=yes ; The default value is 'host' ; ;codecpriority=host +; +; allowfwdownload controls whether this host will serve out firmware to +; IAX clients which request it. This has only been used for the IAXy, +; and it has been recently proven that this firmware distribution method +; can be used as a source of traffic amplification attacks. Also, the +; IAXy firmware has not been updated for at least 18 months, so unless +; you are provisioning IAXys in a secure network, we recommend that you +; leave this option to the default, off. +; +;allowfwdownload=yes ;rtcachefriends=yes ; Cache realtime friends by adding them to the internal list ; just like friends added from the config file only on a -- 1.5.5.2 Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- asterisk.spec 25 Jul 2008 15:58:22 -0000 1.29 +++ asterisk.spec 25 Jul 2008 17:49:41 -0000 1.30 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.18.beta%{beta}%{?dist} +Release: 0.19.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -45,6 +45,7 @@ Patch9: 0009-Update-cdr_tds-to-latest.patch Patch10: 0010-Update-autoconf.patch Patch11: 0011-Merged-revisions-123952-via-svnmerge-from.patch +Patch12: 0012-Merged-revisions-132778-via-svnmerge-from.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -415,6 +416,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 cp %{SOURCE2} menuselect.makedeps cp %{SOURCE3} menuselect.makeopts @@ -1025,6 +1027,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.19.beta9 +- Add patch pulled from upstream SVN that fixes AST-2008-010 and AST-2008-011. + * Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.18.beta9 - Add patch for LDAP extracted from upstream SVN (#442011) From fedora-extras-commits at redhat.com Fri Jul 25 17:53:24 2008 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Fri, 25 Jul 2008 17:53:24 GMT Subject: rpms/pdns-recursor/F-9 pdns-recursor.spec,1.6,1.7 Message-ID: <200807251753.m6PHrOGd025656@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/pdns-recursor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25606 Modified Files: pdns-recursor.spec Log Message: * Fri Jul 25 2008 Ruben Kerkhof - 3.1.7-2 - Exclude ppc and ppc64 for now, the build fails randomly Index: pdns-recursor.spec =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/F-9/pdns-recursor.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pdns-recursor.spec 25 Jul 2008 16:24:12 -0000 1.6 +++ pdns-recursor.spec 25 Jul 2008 17:52:54 -0000 1.7 @@ -1,13 +1,14 @@ Summary: Modern, advanced and high performance recursing/non authoritative nameserver Name: pdns-recursor Version: 3.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Daemons License: GPLv2 URL: http://powerdns.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2 Source1: pdns-recursor.init +ExcludeArch: ppc ppc64 Patch0: pdns-recursor-fixsysconfdir.patch Patch1: pdns-recursor-fixmakefile.patch @@ -76,6 +77,9 @@ %changelog +* Fri Jul 25 2008 Ruben Kerkhof - 3.1.7-2 +- Exclude ppc and ppc64 for now, the build fails randomly + * Fri Jul 25 2008 Ruben Kerkhof - 3.1.7-1 - Upstream released new version, now with Lua support From fedora-extras-commits at redhat.com Fri Jul 25 17:57:23 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Fri, 25 Jul 2008 17:57:23 GMT Subject: rpms/gnome-vfs2/OLPC-3 gnome-vfs2.spec,1.177,1.178 Message-ID: <200807251757.m6PHvN4l025910@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/gnome-vfs2/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25858 Modified Files: gnome-vfs2.spec Log Message: remove dependency on gnome-mount Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-vfs2/OLPC-3/gnome-vfs2.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- gnome-vfs2.spec 10 Mar 2008 23:15:33 -0000 1.177 +++ gnome-vfs2.spec 25 Jul 2008 17:56:53 -0000 1.178 @@ -1,3 +1,5 @@ +%define minimal_build 1 + %define samba_version 3.0.8-0.pre1.3 %define gconf2_version 2.14 %define gtkdoc_version 0.9 @@ -14,7 +16,7 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 and LGPL+ and GPL+ # the daemon and the library are LGPLv2 # the modules are LGPL+ and GPL+ @@ -24,11 +26,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gnome-mime-data >= %{gnome_mime_data_version} Requires: shared-mime-info -Requires: gnome-mount >= %{gnome_mount_version} Requires: GConf2 >= %{gconf2_version} Requires(post): GConf2 >= %{gconf2_version} Requires(pre): GConf2 >= %{gconf2_version} Requires(preun): GConf2 >= %{gconf2_version} + +%if %{minimal_build} == 0 +Requires: gnome-mount >= %{gnome_mount_version} +%endif + BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: gnome-mime-data >= %{gnome_mime_data_version} BuildRequires: libxml2-devel, zlib-devel @@ -235,6 +241,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Jul 21 2008 Daniel Drake - 2.22.0-2 +- Remove dependency on gnome-mount + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 From fedora-extras-commits at redhat.com Fri Jul 25 18:07:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 18:07:09 +0000 Subject: [pkgdb] calamaris had acl change status Message-ID: <20080725180710.151421AD0E9@bastion.fedora.phx.redhat.com> Robert Scheck (robert) has set the watchbugzilla acl on calamaris (Fedora devel) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 18:07:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 18:07:11 +0000 Subject: [pkgdb] calamaris had acl change status Message-ID: <20080725180712.94C9A1AD0F7@bastion.fedora.phx.redhat.com> Robert Scheck (robert) has set the watchcommits acl on calamaris (Fedora devel) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 18:07:12 2008 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Fri, 25 Jul 2008 18:07:12 GMT Subject: rpms/pdns-recursor/F-8 .cvsignore, 1.2, 1.3 pdns-recursor.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807251807.m6PI7Cjx000634@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/pdns-recursor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv604 Modified Files: .cvsignore pdns-recursor.spec sources Log Message: * Fri Jul 26 2008 Ruben Kerkhof 3.1.7-1 - Upstream released new version, now with Lua support - Disable ppc and ppc64 for now, the build keeps breaking randomly Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jan 2007 22:13:15 -0000 1.2 +++ .cvsignore 25 Jul 2008 18:06:42 -0000 1.3 @@ -1 +1 @@ -pdns-recursor-3.1.4.tar.bz2 +pdns-recursor-3.1.7.tar.bz2 Index: pdns-recursor.spec =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/F-8/pdns-recursor.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdns-recursor.spec 2 Apr 2008 22:21:36 -0000 1.3 +++ pdns-recursor.spec 25 Jul 2008 18:06:42 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Modern, advanced and high performance recursing/non authoritative nameserver Name: pdns-recursor -Version: 3.1.5 +Version: 3.1.7 Release: 1%{?dist} Group: System Environment/Daemons @@ -9,12 +9,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2 Source1: pdns-recursor.init +ExcludeArch: ppc ppc64 Patch0: pdns-recursor-fixsysconfdir.patch Patch1: pdns-recursor-fixmakefile.patch Provides: powerdns-recursor = %{version}-%{release} -BuildRequires: boost-devel +BuildRequires: boost-devel, lua-devel, lua Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service @@ -27,12 +28,9 @@ %patch0 -p1 -b .fixsysconfdir %patch1 -p1 -b .fixmakefile -# this file gets added to debuginfo rpm but has wrong permission -# already fixed upstream in trunk -chmod 0644 sstuff.hh - %build -make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" +LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} @@ -80,6 +78,10 @@ %changelog +* Fri Jul 26 2008 Ruben Kerkhof 3.1.7-1 +- Upstream released new version, now with Lua support +- Disable ppc and ppc64 for now, the build keeps breaking randomly + * Wed Apr 02 2008 Ruben Kerkhof 3.1.5-1 - Upstream released new version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pdns-recursor/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2008 22:21:36 -0000 1.3 +++ sources 25 Jul 2008 18:06:42 -0000 1.4 @@ -1 +1 @@ -682529d59c80076f986003ed5f47e26f pdns-recursor-3.1.5.tar.bz2 +e7521055f949ba8e9e77fe27411be2ed pdns-recursor-3.1.7.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 18:07:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 18:07:30 +0000 Subject: [pkgdb] calamaris had acl change status Message-ID: <20080725180730.CD1531AD0E5@bastion.fedora.phx.redhat.com> Robert Scheck (robert) has set the watchbugzilla acl on calamaris (Fedora EPEL 5) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 18:07:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 18:07:36 +0000 Subject: [pkgdb] calamaris had acl change status Message-ID: <20080725180737.392DC1AD0E7@bastion.fedora.phx.redhat.com> Robert Scheck (robert) has set the watchbugzilla acl on calamaris (Fedora EPEL 4) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 18:07:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 18:07:41 +0000 Subject: [pkgdb] calamaris had acl change status Message-ID: <20080725180742.5D8C81AD0EC@bastion.fedora.phx.redhat.com> Robert Scheck (robert) has set the watchcommits acl on calamaris (Fedora EPEL 4) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 18:07:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 18:07:34 +0000 Subject: [pkgdb] calamaris had acl change status Message-ID: <20080725180739.E8D941AD0EF@bastion.fedora.phx.redhat.com> Robert Scheck (robert) has set the watchcommits acl on calamaris (Fedora EPEL 5) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/calamaris From fedora-extras-commits at redhat.com Fri Jul 25 18:09:32 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 25 Jul 2008 18:09:32 GMT Subject: rpms/crossfire-client/F-9 .cvsignore, 1.4, 1.5 crossfire-client.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807251809.m6PI9WEO000737@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv698 Modified Files: .cvsignore crossfire-client.spec sources Log Message: Update to 1.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 May 2007 00:02:42 -0000 1.4 +++ .cvsignore 25 Jul 2008 18:09:02 -0000 1.5 @@ -1 +1 @@ -crossfire-client-1.10.0.tar.gz +crossfire-client-1.11.0.tar.gz Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/F-9/crossfire-client.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- crossfire-client.spec 9 Feb 2008 20:38:54 -0000 1.9 +++ crossfire-client.spec 25 Jul 2008 18:09:02 -0000 1.10 @@ -1,13 +1,13 @@ Name: crossfire-client -Version: 1.10.0 -Release: 4%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPLv2+ URL: http://crossfire.real-time.com Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz BuildRequires: SDL-devel SDL_image-devel -BuildRequires: gtk+-devel gtk2-devel libpng-devel +BuildRequires: gtk+-devel gtk2-devel libpng-devel curl-devel BuildRequires: desktop-file-utils ImageMagick # Disabled sound for Fedora until it's working again #BuildRequires: alsa-lib-devel @@ -108,6 +108,9 @@ %changelog +* Thu Jul 24 2008 Wart 1.11.0-1 +- Update to 1.11.0 + * Sat Feb 9 2008 Wart 1.10.0-4 - Rebuild for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 May 2007 00:02:42 -0000 1.4 +++ sources 25 Jul 2008 18:09:02 -0000 1.5 @@ -1 +1 @@ -883296ef199cbf47334d52d8b5d61886 crossfire-client-1.10.0.tar.gz +7c47046067bb0bada9951e61d0d2980b crossfire-client-1.11.0.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 18:14:22 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 25 Jul 2008 18:14:22 GMT Subject: rpms/klamav/F-9 klamav-suse-clamav-path.diff, 1.1, 1.2 klamav.spec, 1.23, 1.24 klamav-0.41.1-gcc43.patch, 1.1, NONE klamav-0.42-clamav093.patch, 1.2, NONE Message-ID: <200807251814.m6PIEMJP000971@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/klamav/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv941 Modified Files: klamav-suse-clamav-path.diff klamav.spec Removed Files: klamav-0.41.1-gcc43.patch klamav-0.42-clamav093.patch Log Message: Fix unapplied patch klamav-suse-clamav-path.diff: Index: klamav-suse-clamav-path.diff =================================================================== RCS file: /cvs/extras/rpms/klamav/F-9/klamav-suse-clamav-path.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- klamav-suse-clamav-path.diff 28 Sep 2006 15:56:10 -0000 1.1 +++ klamav-suse-clamav-path.diff 25 Jul 2008 18:13:52 -0000 1.2 @@ -1,11 +1,11 @@ --- src/klammail/clamdmail.c.orig 2005-01-16 23:43:02.113205840 +0100 +++ src/klammail/clamdmail.c 2005-01-16 23:43:13.392491128 +0100 -@@ -563,7 +563,7 @@ +@@ -541,7 +541,7 @@ break; } }else{ - fprintf(tmp,"DatabaseDirectory /usr/local/share/clamav\n"); + fprintf(tmp,"DatabaseDirectory /var/lib/clamav\n"); } - fprintf(tmp,"ScanMail\n"); - fprintf(tmp,"FixStaleSocket\n"); + //fprintf(tmp,"ScanMail\n"); + if ((strstr(cl_retver(), "0.8")) || (strstr(cl_retver(), "0.7"))) Index: klamav.spec =================================================================== RCS file: /cvs/extras/rpms/klamav/F-9/klamav.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- klamav.spec 25 Jul 2008 16:52:00 -0000 1.23 +++ klamav.spec 25 Jul 2008 18:13:52 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Clam Anti-Virus on the KDE Desktop Name: klamav Version: 0.44 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 Patch0: klamav-suse-clamav-path.diff Patch1: klamav-0.41.1-pwd-echo.patch @@ -83,7 +83,7 @@ %{_datadir}/icons/*/*x*/apps/klamav.png %changelog -* Sun Jul 20 2008 Andy Shevchenko 0.44-1 +* Sun Jul 20 2008 Andy Shevchenko 0.44-2 - update to 0.44 - bump clamav requirements to have their at least for 0.93 - remove upstreamed patches --- klamav-0.41.1-gcc43.patch DELETED --- --- klamav-0.42-clamav093.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 18:35:52 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 18:35:52 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.133,1.134 Message-ID: <200807251835.m6PIZq7r002868@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2695/devel Modified Files: kdebindings.spec Log Message: * Fri Jul 25 2008 Kevin Kofler 4.1.0-3 - drop unneeded BR kdegraphics4-devel (Ruby Okular bindings disabled by default) - add BR kdepimlibs-devel for Python Akonadi bindings Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- kdebindings.spec 25 Jul 2008 11:05:15 -0000 1.133 +++ kdebindings.spec 25 Jul 2008 18:35:22 -0000 1.134 @@ -22,7 +22,7 @@ Name: kdebindings Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -34,7 +34,7 @@ BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} -BuildRequires: kdegraphics4-devel >= %{version} +BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: soprano-devel >= 2.0.97 BuildRequires: cmake %{?csharp:BuildRequires: mono-core} @@ -164,6 +164,10 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-3 +- drop unneeded BR kdegraphics4-devel (Ruby Okular bindings disabled by default) +- add BR kdepimlibs-devel for Python Akonadi bindings + * Fri Jul 25 2008 Than Ngo 4.1.0-2 - respun From fedora-extras-commits at redhat.com Fri Jul 25 18:35:59 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 18:35:59 GMT Subject: rpms/calamaris/EL-4 calamaris-filter-requires.sh, NONE, 1.1 calamaris.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251835.m6PIZxr2002889@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/calamaris/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2687/EL-4 Modified Files: .cvsignore sources Added Files: calamaris-filter-requires.sh calamaris.spec Log Message: - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux --- NEW FILE calamaris-filter-requires.sh --- #!/bin/sh # The original script name has been passed as the first argument: "$@" | awk '$0 != "perl(-F)" && $0 != "perl(-f)"' --- NEW FILE calamaris.spec --- %{expand:%%define prev__perl_requires %{__perl_requires}} %define __perl_requires perl %{SOURCE1} %{prev__perl_requires} Summary: Squid native log format (NLF) analyzer and report generator Name: calamaris Version: 2.59 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://calamaris.cord.de/ Source0: http://calamaris.cord.de/%{name}-%{version}.tar.gz Source1: calamaris-filter-requires.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Calamaris parses the Squid Native Log and generates reports about Peak-usage, Request-Methods, Status-reports of incoming and outgoing requests, second and Top-level destinations, content-types and performance. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 # Convert everything to UTF-8 iconv -f iso-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES touch -r CHANGES CHANGES.utf8; mv -f CHANGES.utf8 CHANGES iconv -f iso-8859-1 -t utf-8 -o EXAMPLES.utf8 EXAMPLES touch -r EXAMPLES EXAMPLES.utf8; mv -f EXAMPLES.utf8 EXAMPLES %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES COPYRIGHT EXAMPLES README %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Thu Jul 24 2008 Robert Scheck 2.59-1 - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:50:45 -0000 1.1 +++ .cvsignore 25 Jul 2008 18:35:29 -0000 1.2 @@ -0,0 +1 @@ +calamaris-2.59.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:50:45 -0000 1.1 +++ sources 25 Jul 2008 18:35:29 -0000 1.2 @@ -0,0 +1 @@ +63c233b3407f9aec34b03647ed7fc852 calamaris-2.59.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 18:36:00 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 18:36:00 GMT Subject: rpms/calamaris/F-8 calamaris-filter-requires.sh, NONE, 1.1 calamaris.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251836.m6PIa0HN002897@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/calamaris/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2687/F-8 Modified Files: .cvsignore sources Added Files: calamaris-filter-requires.sh calamaris.spec Log Message: - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux --- NEW FILE calamaris-filter-requires.sh --- #!/bin/sh # The original script name has been passed as the first argument: "$@" | awk '$0 != "perl(-F)" && $0 != "perl(-f)"' --- NEW FILE calamaris.spec --- %{expand:%%define prev__perl_requires %{__perl_requires}} %define __perl_requires perl %{SOURCE1} %{prev__perl_requires} Summary: Squid native log format (NLF) analyzer and report generator Name: calamaris Version: 2.59 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://calamaris.cord.de/ Source0: http://calamaris.cord.de/%{name}-%{version}.tar.gz Source1: calamaris-filter-requires.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Calamaris parses the Squid Native Log and generates reports about Peak-usage, Request-Methods, Status-reports of incoming and outgoing requests, second and Top-level destinations, content-types and performance. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 # Convert everything to UTF-8 iconv -f iso-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES touch -r CHANGES CHANGES.utf8; mv -f CHANGES.utf8 CHANGES iconv -f iso-8859-1 -t utf-8 -o EXAMPLES.utf8 EXAMPLES touch -r EXAMPLES EXAMPLES.utf8; mv -f EXAMPLES.utf8 EXAMPLES %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES COPYRIGHT EXAMPLES README %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Thu Jul 24 2008 Robert Scheck 2.59-1 - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:50:45 -0000 1.1 +++ .cvsignore 25 Jul 2008 18:35:30 -0000 1.2 @@ -0,0 +1 @@ +calamaris-2.59.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:50:45 -0000 1.1 +++ sources 25 Jul 2008 18:35:30 -0000 1.2 @@ -0,0 +1 @@ +63c233b3407f9aec34b03647ed7fc852 calamaris-2.59.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 18:36:01 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 18:36:01 GMT Subject: rpms/calamaris/devel calamaris-filter-requires.sh, NONE, 1.1 calamaris.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251836.m6PIa14p002907@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/calamaris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2687/devel Modified Files: .cvsignore sources Added Files: calamaris-filter-requires.sh calamaris.spec Log Message: - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux --- NEW FILE calamaris-filter-requires.sh --- #!/bin/sh # The original script name has been passed as the first argument: "$@" | awk '$0 != "perl(-F)" && $0 != "perl(-f)"' --- NEW FILE calamaris.spec --- %{expand:%%define prev__perl_requires %{__perl_requires}} %define __perl_requires perl %{SOURCE1} %{prev__perl_requires} Summary: Squid native log format (NLF) analyzer and report generator Name: calamaris Version: 2.59 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://calamaris.cord.de/ Source0: http://calamaris.cord.de/%{name}-%{version}.tar.gz Source1: calamaris-filter-requires.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Calamaris parses the Squid Native Log and generates reports about Peak-usage, Request-Methods, Status-reports of incoming and outgoing requests, second and Top-level destinations, content-types and performance. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 # Convert everything to UTF-8 iconv -f iso-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES touch -r CHANGES CHANGES.utf8; mv -f CHANGES.utf8 CHANGES iconv -f iso-8859-1 -t utf-8 -o EXAMPLES.utf8 EXAMPLES touch -r EXAMPLES EXAMPLES.utf8; mv -f EXAMPLES.utf8 EXAMPLES %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES COPYRIGHT EXAMPLES README %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Thu Jul 24 2008 Robert Scheck 2.59-1 - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:50:45 -0000 1.1 +++ .cvsignore 25 Jul 2008 18:35:31 -0000 1.2 @@ -0,0 +1 @@ +calamaris-2.59.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:50:45 -0000 1.1 +++ sources 25 Jul 2008 18:35:31 -0000 1.2 @@ -0,0 +1 @@ +63c233b3407f9aec34b03647ed7fc852 calamaris-2.59.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 18:36:00 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 18:36:00 GMT Subject: rpms/calamaris/EL-5 calamaris-filter-requires.sh, NONE, 1.1 calamaris.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251836.m6PIa04o002893@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/calamaris/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2687/EL-5 Modified Files: .cvsignore sources Added Files: calamaris-filter-requires.sh calamaris.spec Log Message: - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux --- NEW FILE calamaris-filter-requires.sh --- #!/bin/sh # The original script name has been passed as the first argument: "$@" | awk '$0 != "perl(-F)" && $0 != "perl(-f)"' --- NEW FILE calamaris.spec --- %{expand:%%define prev__perl_requires %{__perl_requires}} %define __perl_requires perl %{SOURCE1} %{prev__perl_requires} Summary: Squid native log format (NLF) analyzer and report generator Name: calamaris Version: 2.59 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://calamaris.cord.de/ Source0: http://calamaris.cord.de/%{name}-%{version}.tar.gz Source1: calamaris-filter-requires.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Calamaris parses the Squid Native Log and generates reports about Peak-usage, Request-Methods, Status-reports of incoming and outgoing requests, second and Top-level destinations, content-types and performance. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 # Convert everything to UTF-8 iconv -f iso-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES touch -r CHANGES CHANGES.utf8; mv -f CHANGES.utf8 CHANGES iconv -f iso-8859-1 -t utf-8 -o EXAMPLES.utf8 EXAMPLES touch -r EXAMPLES EXAMPLES.utf8; mv -f EXAMPLES.utf8 EXAMPLES %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES COPYRIGHT EXAMPLES README %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Thu Jul 24 2008 Robert Scheck 2.59-1 - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:50:45 -0000 1.1 +++ .cvsignore 25 Jul 2008 18:35:30 -0000 1.2 @@ -0,0 +1 @@ +calamaris-2.59.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:50:45 -0000 1.1 +++ sources 25 Jul 2008 18:35:30 -0000 1.2 @@ -0,0 +1 @@ +63c233b3407f9aec34b03647ed7fc852 calamaris-2.59.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 18:36:01 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Fri, 25 Jul 2008 18:36:01 GMT Subject: rpms/calamaris/F-9 calamaris-filter-requires.sh, NONE, 1.1 calamaris.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807251836.m6PIa1sg002903@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/calamaris/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2687/F-9 Modified Files: .cvsignore sources Added Files: calamaris-filter-requires.sh calamaris.spec Log Message: - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux --- NEW FILE calamaris-filter-requires.sh --- #!/bin/sh # The original script name has been passed as the first argument: "$@" | awk '$0 != "perl(-F)" && $0 != "perl(-f)"' --- NEW FILE calamaris.spec --- %{expand:%%define prev__perl_requires %{__perl_requires}} %define __perl_requires perl %{SOURCE1} %{prev__perl_requires} Summary: Squid native log format (NLF) analyzer and report generator Name: calamaris Version: 2.59 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://calamaris.cord.de/ Source0: http://calamaris.cord.de/%{name}-%{version}.tar.gz Source1: calamaris-filter-requires.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Calamaris parses the Squid Native Log and generates reports about Peak-usage, Request-Methods, Status-reports of incoming and outgoing requests, second and Top-level destinations, content-types and performance. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 # Convert everything to UTF-8 iconv -f iso-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES touch -r CHANGES CHANGES.utf8; mv -f CHANGES.utf8 CHANGES iconv -f iso-8859-1 -t utf-8 -o EXAMPLES.utf8 EXAMPLES touch -r EXAMPLES EXAMPLES.utf8; mv -f EXAMPLES.utf8 EXAMPLES %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES COPYRIGHT EXAMPLES README %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Thu Jul 24 2008 Robert Scheck 2.59-1 - Upgrade to 2.59 - Initial spec file for Fedora and Red Hat Enterprise Linux Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:50:45 -0000 1.1 +++ .cvsignore 25 Jul 2008 18:35:31 -0000 1.2 @@ -0,0 +1 @@ +calamaris-2.59.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/calamaris/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:50:45 -0000 1.1 +++ sources 25 Jul 2008 18:35:31 -0000 1.2 @@ -0,0 +1 @@ +63c233b3407f9aec34b03647ed7fc852 calamaris-2.59.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 18:38:50 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 18:38:50 GMT Subject: rpms/kdebindings/devel kdebindings-4.0.85-smoke-buildfix.patch, 1.1, NONE kdebindings-4.0.98-phonon_include_dir.patch, 1.1, NONE kdebindings-4.1.0-kate.patch, 1.1, NONE Message-ID: <200807251838.m6PIcoJs003420@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3412/devel Removed Files: kdebindings-4.0.85-smoke-buildfix.patch kdebindings-4.0.98-phonon_include_dir.patch kdebindings-4.1.0-kate.patch Log Message: Remove obsolete patches. --- kdebindings-4.0.85-smoke-buildfix.patch DELETED --- --- kdebindings-4.0.98-phonon_include_dir.patch DELETED --- --- kdebindings-4.1.0-kate.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 18:40:17 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 18:40:17 GMT Subject: rpms/kdebindings/F-9 .cvsignore, 1.41, 1.42 kdebindings.spec, 1.101, 1.102 sources, 1.46, 1.47 Message-ID: <200807251840.m6PIeHrf003564@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3513/F-9 Modified Files: .cvsignore kdebindings.spec sources Log Message: Sync from devel: * Fri Jul 25 2008 Kevin Kofler 4.1.0-3 - drop unneeded BR kdegraphics4-devel (Ruby Okular bindings disabled by default) - add BR kdepimlibs-devel for Python Akonadi bindings * Fri Jul 25 2008 Than Ngo 4.1.0-2 - respun * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 23 Jul 2008 13:26:28 -0000 1.41 +++ .cvsignore 25 Jul 2008 18:39:47 -0000 1.42 @@ -1 +1,2 @@ kdebindings-4.0.99.tar.bz2 +kdebindings-4.1.0.tar.bz2 Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- kdebindings.spec 23 Jul 2008 13:26:28 -0000 1.101 +++ kdebindings.spec 25 Jul 2008 18:39:47 -0000 1.102 @@ -21,8 +21,8 @@ %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") Name: kdebindings -Version: 4.0.99 -Release: 1%{?dist} +Version: 4.1.0 +Release: 3%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -34,7 +34,7 @@ BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} -BuildRequires: kdegraphics4-devel >= %{version} +BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: soprano-devel >= 2.0.97 BuildRequires: cmake %{?csharp:BuildRequires: mono-core} @@ -44,7 +44,7 @@ BuildRequires: pcre-devel # causes smokeqt to fail to build #{?smoke:BuildRequires: qwt-devel} -BuildRequires: PyQt4-devel +BuildRequires: PyQt4-devel >= 4.4.2 %if 0%{?fedora} > 8 BuildRequires: qscintilla-devel >= 2 %endif @@ -87,7 +87,6 @@ %prep %setup -q - %build mkdir -p %{_target_platform} pushd %{_target_platform} @@ -165,6 +164,16 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-3 +- drop unneeded BR kdegraphics4-devel (Ruby Okular bindings disabled by default) +- add BR kdepimlibs-devel for Python Akonadi bindings + +* Fri Jul 25 2008 Than Ngo 4.1.0-2 +- respun + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 23 Jul 2008 13:26:28 -0000 1.46 +++ sources 25 Jul 2008 18:39:47 -0000 1.47 @@ -1 +1 @@ -5b9529a90445f075a201ec5754ebe3c9 kdebindings-4.0.99.tar.bz2 +d03166d9fc3e46df1c9a99fcedd8bfd1 kdebindings-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 18:50:05 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Fri, 25 Jul 2008 18:50:05 GMT Subject: rpms/poppler/OLPC-3 poppler.spec,1.42,1.43 Message-ID: <200807251850.m6PIo5nq004596@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/poppler/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4550 Modified Files: poppler.spec Log Message: need qt3-devel Index: poppler.spec =================================================================== RCS file: /cvs/pkgs/rpms/poppler/OLPC-3/poppler.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- poppler.spec 12 Dec 2007 22:11:40 -0000 1.42 +++ poppler.spec 25 Jul 2008 18:49:35 -0000 1.43 @@ -3,7 +3,7 @@ Summary: PDF rendering library Name: poppler Version: 0.6.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 and Redistributable, no modification permitted # the code is GPLv2 # the charmap data in /usr/share/poppler is redistributable @@ -18,7 +18,7 @@ BuildRequires: gtk2-devel BuildRequires: cairo-devel -BuildRequires: qt-devel +BuildRequires: qt3-devel BuildRequires: qt4-devel %description @@ -174,6 +174,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 25 2008 Daniel Drake - 0.6.2-5 +- need qt3-devel + * Tue Dec 4 2007 Reinier Heeres - 0.6.2-4OLPC-2 - configure parameters adjusted for OLPC-2 From fedora-extras-commits at redhat.com Fri Jul 25 18:55:01 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 18:55:01 GMT Subject: rpms/WebKit/F-8 WebKit.spec, 1.5, 1.6 WebKit-TCSpinLock-use-pthread-stubs.patch, 1.1, NONE Message-ID: <200807251855.m6PIt1t2005069@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/WebKit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4965/F-8 Modified Files: WebKit.spec Removed Files: WebKit-TCSpinLock-use-pthread-stubs.patch Log Message: Sync F-9 changes to drop QtWebKit stuff: * Fri Jul 18 2008 Peter Gordon 1.0.0-0.11.svn34655 - Remove Qt subpackage stuff, in preparation for Qt 4.4 bump; thanks to Rex Dieter/Ngo Than and crew. - Reference: bug 442200 (RFE: WebKit Migration) Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-8/WebKit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- WebKit.spec 6 Jul 2008 13:14:15 -0000 1.5 +++ WebKit.spec 25 Jul 2008 18:54:31 -0000 1.6 @@ -24,7 +24,7 @@ Name: WebKit Version: 1.0.0 -Release: 0.10.svn%{svn_revision}%{?dist} +Release: 0.11.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -41,13 +41,12 @@ BuildRequires: gperf BuildRequires: gtk2-devel BuildRequires: libicu-devel +BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: libxslt-devel BuildRequires: libXt-devel BuildRequires: pcre-devel BuildRequires: sqlite-devel -## Necessary for qmake and friends. -BuildRequires: qt4-devel ## Conditional dependencies... %if %{with html5video} @@ -91,29 +90,6 @@ only be used as a "preview" rather than a stable platform library. -%package qt -Summary: Qt port of WebKit -Group: Development/Libraries - -%description qt -%{name} is an open-source Web content engine library. This package contains -the shared libraries for the WebKit Qt port as well as the sample QtLauncher -tool. - - -%package qt-devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-qt = %{version}-%{release} -Requires: pkgconfig -Requires: qt4-devel - -%description qt-devel -The %{name}-qt-devel package contains libraries, build data, and header files -for developing applications that use %{name}-qt, as well as the DumpRenderTree -tool. - - %package doc Summary: Documentation for %{name} Group: Documentation @@ -135,60 +111,24 @@ ## Fix permissions for the debuginfo generation. chmod a-x WebCore/dom/Clipboard.cpp -## Build the GTK+ port... ## Don't call configure automatically sed -i.conf -e '$d' autogen.sh ./autogen.sh -install -d build-gtk -pushd build-gtk - ln -sf ../configure - %configure \ - %{?with_debug: --enable-debug } \ - %{?with_html5video: --enable-video } \ - %{?with_pango: --with-font-backend=pango } \ - %{?with_svg: --enable-svg-filters } - make %{?_smp_mflags} -popd - - -## ...and the Qt port. -install -d build-qt -pushd build-qt - %{_qt4_qmake} -r \ - OUTPUT_DIR="$PWD" \ - QMAKE_STRIP=/bin/true \ - QMAKE_RPATH= \ - QMAKE_CFLAGS="%{optflags}" \ - QMAKE_CXXFLAGS="%{optflags}" \ - VERSION=%{version} \ - CONFIG-=gtk \ - CONFIG+=qt-port \ - WEBKIT_LIB_DIR=%{_libdir} \ - ../WebKit.pro - make %{?_smp_mflags} -popd +%configure \ +%{?with_debug: --enable-debug } \ +%{?with_html5video: --enable-video } \ +%{?with_pango: --with-font-backend=pango } \ +%{?with_svg: --enable-svg-filters } + +make %{?_smp_mflags} %install rm -rf %{buildroot} -make -C build-gtk install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} install -d -m 755 %{buildroot}%{_libexecdir}/%{name} -install -m 755 build-gtk/Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} - -make -C build-qt install INSTALL_ROOT=%{buildroot} -install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name} -install -m 755 build-qt/bin/DumpRenderTree %{buildroot}%{_libexecdir}/%{name} - - -## Cleanup the pkgconfig files a bit... -pushd %{buildroot}%{_libdir}/pkgconfig/ - for WEBKIT_LIB in QtWebKit; do - sed -i -e 's!prefix=.*!prefix=%{_prefix}!' ${WEBKIT_LIB}.pc - ## We don't need linkage that the WebKit DSOs already ensure. - sed -i -e "s/^Libs:.*$/Libs: -L\${libdir} -l${WEBKIT_LIB}/" ${WEBKIT_LIB}.pc - done -popd +install -m 755 Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} ## Finally, copy over and rename the various files for %%doc inclusion. rm -f docfiles.list @@ -218,17 +158,12 @@ %postun gtk -p /sbin/ldconfig -%post qt -p /sbin/ldconfig - -%postun qt -p /sbin/ldconfig - - %files gtk %defattr(-,root,root,-) +%doc %{_bindir}/jsc %{_libdir}/libwebkit-1.0.so.* -%dir %{_libexecdir}/WebKit/ -%{_libexecdir}/WebKit/GtkLauncher +%{_libexecdir}/WebKit/ %files gtk-devel %defattr(-,root,root,-) @@ -237,26 +172,16 @@ %{_libdir}/libwebkit-1.0.so %{_libdir}/pkgconfig/webkit-1.0.pc -%files qt -%defattr(-,root,root,-) -%{_libdir}/libQtWebKit.so.* -%dir %{_libexecdir}/WebKit/ -%{_libexecdir}/WebKit/QtLauncher - -%files qt-devel -%defattr(-,root,root,-) -%{_includedir}/QtWebKit/ -%{_libdir}/libQtWebKit.prl -%{_libdir}/libQtWebKit.so -%{_libdir}/pkgconfig/QtWebKit.pc -%{_libexecdir}/WebKit/DumpRenderTree -%{_qt4_prefix}/mkspecs/features/qtwebkit.prf - %files doc -f docfiles.list %defattr(-,root,root,-) %changelog +* Fri Jul 18 2008 Peter Gordon 1.0.0-0.11.svn34655 +- Remove Qt subpackage stuff, in preparation for Qt 4.4 bump; thanks to Rex + Dieter/Ngo Than and crew. +- Reference: bug 442200 (RFE: WebKit Migration) + * Sun Jul 06 2008 Peter Gordon 1.0.0-0.10.svn34655 - Update to new upstream snapshot (SVN 34655) - Resolves: CVE-2008-2307 (bug #454092: memory corruption in handling of --- WebKit-TCSpinLock-use-pthread-stubs.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 19:23:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:23:04 GMT Subject: rpms/gperiodic/devel gperiodic.spec,1.10,1.11 Message-ID: <200807251923.m6PJN4aJ013137@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gperiodic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13115 Modified Files: gperiodic.spec Log Message: fix license tag Index: gperiodic.spec =================================================================== RCS file: /cvs/pkgs/rpms/gperiodic/devel/gperiodic.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gperiodic.spec 20 Feb 2008 03:42:45 -0000 1.10 +++ gperiodic.spec 25 Jul 2008 19:22:33 -0000 1.11 @@ -1,8 +1,8 @@ Summary: Program for browsing the periodic table Name: gperiodic Version: 2.0.10 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2+ Group: Applications/Engineering URL: http://www.frantz.fi/software/gperiodic.php Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz @@ -56,6 +56,9 @@ %doc README AUTHORS ChangeLog gpl.txt %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 2.0.10-4 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 2.0.10-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:25:00 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Fri, 25 Jul 2008 19:25:00 GMT Subject: rpms/liferea/devel liferea-1.4.17-configure.patch, NONE, 1.1 .cvsignore, 1.73, 1.74 liferea.spec, 1.117, 1.118 sources, 1.74, 1.75 Message-ID: <200807251925.m6PJP0Ij013318@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-1.4.17-configure.patch Log Message: New upstream release liferea-1.4.17-configure.patch: --- NEW FILE liferea-1.4.17-configure.patch --- diff -crB liferea-1.4.17/configure liferea-1.4.17-fedora/configure *** liferea-1.4.17/configure 2008-07-22 12:42:06.000000000 -0400 --- liferea-1.4.17-fedora/configure 2008-07-24 19:51:54.000000000 -0400 *************** *** 1619,1625 **** --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support --- 1619,1625 ---- --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox", "xulrunner-1.9" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support *************** *** 25327,25485 **** gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried fi ! if test -n "$PKG_CONFIG"; then ! if test -n "$MOZILLA_LIBS"; then ! pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" ! else ! if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` ! else ! pkg_failed=yes fi - fi - else - pkg_failed=untried - fi - - - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - enable_mozilla=no - elif test $pkg_failed = untried; then - enable_mozilla=no - else - MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS - MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - enable_mozilla=yes - fi - fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_LIBS"; then - pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - - - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - enable_mozilla=no - elif test $pkg_failed = untried; then - enable_mozilla=no - else - MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS - MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - enable_mozilla=yes - fi fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } --- 25327,25357 ---- gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi ! if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then ! gecko_provider=xulrunner-1.9 ! gecko_provider_gtkmozembed=libxul-embedding fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } + fi + + if test "x$gecko_provider" != "x"; then + if test "$gecko_provider_gtkmozembed" = "x"; then + gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed + fi + + pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } *************** *** 25489,25500 **** pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25361,25372 ---- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider_gtkmozembed" 2>/dev/null` else pkg_failed=yes fi *************** *** 25507,25518 **** pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25379,25390 ---- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider_gtkmozembed" 2>/dev/null` else pkg_failed=yes fi *************** *** 25531,25539 **** _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 --- 25403,25411 ---- _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 *************** *** 26034,26042 **** ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ --- 25906,25914 ---- ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ diff -crB liferea-1.4.17/configure.ac liferea-1.4.17-fedora/configure.ac *** liferea-1.4.17/configure.ac 2008-07-22 12:41:09.000000000 -0400 --- liferea-1.4.17-fedora/configure.ac 2008-07-24 20:00:40.000000000 -0400 *************** *** 36,42 **** AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) --- 36,42 ---- AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox", "xulrunner-1.9" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) *************** *** 44,51 **** AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=no ! AC_MSG_RESULT([yes -> disabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) --- 44,51 ---- AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=yes ! AC_MSG_RESULT([yes -> enabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) *************** *** 232,249 **** if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") --- 232,249 ---- if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla fi + + if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then + gecko_provider=xulrunner-1.9 + gecko_provider_gtkmozembed=libxul-embedding + fi + if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") *************** *** 263,271 **** dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ --- 263,271 ---- dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liferea/devel/.cvsignore,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- .cvsignore 27 Jun 2008 19:30:54 -0000 1.73 +++ .cvsignore 25 Jul 2008 19:24:30 -0000 1.74 @@ -1 +1 @@ -liferea-1.4.16b.tar.gz +liferea-1.4.17.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- liferea.spec 20 Jul 2008 19:05:04 -0000 1.117 +++ liferea.spec 25 Jul 2008 19:24:30 -0000 1.118 @@ -1,8 +1,8 @@ %define gecko_ver 1.8.1.14 Name: liferea -Version: 1.4.16b -Release: 6%{?dist} +Version: 1.4.17 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -28,7 +28,9 @@ BuildRequires: gettext BuildRequires: perl-XML-Parser BuildRequires: xulrunner-devel -Requires: sqlite +BuildRequires: intltool >= 0.35.0 +Requires: sqlite + Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 @@ -115,6 +117,9 @@ %changelog +* Thu Jul 24 2008 Steven M. Parrish - 1.4.17-1 +- New upstream release + * Sun Jul 20 2008 Steven M. Parrish 1.4.16b-6 - fix missing dependencies Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liferea/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 27 Jun 2008 19:30:54 -0000 1.74 +++ sources 25 Jul 2008 19:24:30 -0000 1.75 @@ -1 +1 @@ -b7d8ef4b5d054a7c57e53789d7259edb liferea-1.4.16b.tar.gz +5600626c3626a3da65423cd7caddaa55 liferea-1.4.17.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 19:26:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:26:13 GMT Subject: rpms/granule/devel granule.spec,1.9,1.10 Message-ID: <200807251926.m6PJQD1Z013410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/granule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13380 Modified Files: granule.spec Log Message: fix license tag Index: granule.spec =================================================================== RCS file: /cvs/pkgs/rpms/granule/devel/granule.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- granule.spec 9 Mar 2008 03:42:08 -0000 1.9 +++ granule.spec 25 Jul 2008 19:25:42 -0000 1.10 @@ -4,8 +4,8 @@ Summary: Flashcards program based on Leitner methodology Name: granule Version: 1.3.0 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ Group: Applications/Multimedia URL: http://granule.sourceforge.net/ Source: http://dl.sf.net/sourceforge/granule/granule-%{version}.tar.gz @@ -68,6 +68,9 @@ %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 1.3.0-2 +- fix license tag + * Wed Oct 18 2006 Michael Schwendt - 1.2.3-2 - Fix missing BR and remaining spec issues. From fedora-extras-commits at redhat.com Fri Jul 25 19:28:40 2008 From: fedora-extras-commits at redhat.com (Steven M. Parrish (tuxbrewr)) Date: Fri, 25 Jul 2008 19:28:40 GMT Subject: rpms/liferea/F-9 liferea-1.4.17-configure.patch, NONE, 1.1 .cvsignore, 1.73, 1.74 liferea.spec, 1.118, 1.119 sources, 1.74, 1.75 Message-ID: <200807251928.m6PJSebk013586@cvs-int.fedora.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13513 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-1.4.17-configure.patch Log Message: New upstream release liferea-1.4.17-configure.patch: --- NEW FILE liferea-1.4.17-configure.patch --- diff -crB liferea-1.4.17/configure liferea-1.4.17-fedora/configure *** liferea-1.4.17/configure 2008-07-22 12:42:06.000000000 -0400 --- liferea-1.4.17-fedora/configure 2008-07-24 19:51:54.000000000 -0400 *************** *** 1619,1625 **** --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support --- 1619,1625 ---- --disable-xulrunner don't compile the xulrunner backend --disable-gecko don't compile the Gecko backend --enable-gecko=ARG specify which Gecko provider to use ("mozilla", ! "firefox", "xulrunner-1.9" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support *************** *** 25327,25485 **** gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried fi ! if test -n "$PKG_CONFIG"; then ! if test -n "$MOZILLA_LIBS"; then ! pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" ! else ! if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` ! else ! pkg_failed=yes fi - fi - else - pkg_failed=untried - fi - - - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - enable_mozilla=no - elif test $pkg_failed = untried; then - enable_mozilla=no - else - MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS - MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - enable_mozilla=yes - fi - fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 - echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_CFLAGS"; then - pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then - if test -n "$MOZILLA_LIBS"; then - pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` - else - pkg_failed=yes - fi - fi - else - pkg_failed=untried - fi - - - - if test $pkg_failed = yes; then - - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - else - MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` - fi - # Put the nasty error message in config.log where it belongs - echo "$MOZILLA_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - enable_mozilla=no - elif test $pkg_failed = untried; then - enable_mozilla=no - else - MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS - MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - enable_mozilla=yes - fi fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } --- 25327,25357 ---- gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi ! if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then ! gecko_provider=xulrunner-1.9 ! gecko_provider_gtkmozembed=libxul-embedding fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } + fi + + if test "x$gecko_provider" != "x"; then + if test "$gecko_provider_gtkmozembed" = "x"; then + gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed + fi + + pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } *************** *** 25489,25500 **** pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25361,25372 ---- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider_gtkmozembed" 2>/dev/null` else pkg_failed=yes fi *************** *** 25507,25518 **** pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` else pkg_failed=yes fi --- 25379,25390 ---- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ ! { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 ! ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider_gtkmozembed" 2>/dev/null` else pkg_failed=yes fi *************** *** 25531,25539 **** _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 --- 25403,25411 ---- _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` else ! MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_PKG_ERRORS" >&5 *************** *** 26034,26042 **** ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ --- 25906,25914 ---- ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ -I$MOZILLA_INCLUDE_ROOT \ diff -crB liferea-1.4.17/configure.ac liferea-1.4.17-fedora/configure.ac *** liferea-1.4.17/configure.ac 2008-07-22 12:41:09.000000000 -0400 --- liferea-1.4.17-fedora/configure.ac 2008-07-24 20:00:40.000000000 -0400 *************** *** 36,42 **** AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) --- 36,42 ---- AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) ! AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox", "xulrunner-1.9" or "seamonkey")]),,enable_gecko=yes) AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) *************** *** 44,51 **** AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=no ! AC_MSG_RESULT([yes -> disabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) --- 44,51 ---- AC_MSG_CHECKING([for 64bit platform]) case "$target" in x86_64-*-*) ! enable_gtkhtml2=yes ! AC_MSG_RESULT([yes -> enabling GtkHTML2]) ;; *) AC_MSG_RESULT([no]) *************** *** 232,249 **** if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey - AC_MSG_CHECKING([for Gecko provider $gecko_provider]) - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") --- 232,249 ---- if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla fi + + if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then + gecko_provider=xulrunner-1.9 + gecko_provider_gtkmozembed=libxul-embedding + fi + if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then gecko_provider=firefox fi if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then gecko_provider=seamonkey fi AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") *************** *** 263,271 **** dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ --- 263,271 ---- dnl of macros to come around this. Which I would like to dnl avoid. So this might be not very portable... ! MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` ! MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` dnl Maybe we don't need all of this... MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liferea/F-9/.cvsignore,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- .cvsignore 27 Jun 2008 20:29:11 -0000 1.73 +++ .cvsignore 25 Jul 2008 19:28:10 -0000 1.74 @@ -1 +1 @@ -liferea-1.4.16b.tar.gz +liferea-1.4.17.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/pkgs/rpms/liferea/F-9/liferea.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- liferea.spec 2 Jul 2008 16:33:08 -0000 1.118 +++ liferea.spec 25 Jul 2008 19:28:10 -0000 1.119 @@ -1,8 +1,8 @@ %define gecko_ver 1.8.1.14 Name: liferea -Version: 1.4.16b -Release: 5%{?dist} +Version: 1.4.17 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -28,6 +28,8 @@ BuildRequires: gettext BuildRequires: perl-XML-Parser BuildRequires: xulrunner-devel +BuildRequires: intltool >= 0.35.0 +Requires: sqlite Requires(pre): GConf2 Requires(post): GConf2 @@ -115,6 +117,12 @@ %changelog +* Thu Jul 24 2008 Steven M. Parrish - 1.4.17-1 +- New upstream release + +* Sun Jul 20 2008 Steven M. Parrish 1.4.16b-6 +- fix missing dependencies + * Wed Jul 02 2008 Steven Parrish - 1.4.16b-5 - corrected multiple segfaults. Fixes Bug #453233 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liferea/F-9/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 27 Jun 2008 20:29:11 -0000 1.74 +++ sources 25 Jul 2008 19:28:10 -0000 1.75 @@ -1 +1 @@ -b7d8ef4b5d054a7c57e53789d7259edb liferea-1.4.16b.tar.gz +5600626c3626a3da65423cd7caddaa55 liferea-1.4.17.tar.gz From fedora-extras-commits at redhat.com Fri Jul 25 19:28:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:28:41 GMT Subject: rpms/grep/devel grep.spec,1.68,1.69 Message-ID: <200807251928.m6PJSfpQ013589@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/grep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13523 Modified Files: grep.spec Log Message: fix license tag Index: grep.spec =================================================================== RCS file: /cvs/pkgs/rpms/grep/devel/grep.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- grep.spec 19 Feb 2008 10:07:39 -0000 1.68 +++ grep.spec 25 Jul 2008 19:28:11 -0000 1.69 @@ -1,8 +1,8 @@ Summary: The GNU versions of grep pattern matching utilities Name: grep Version: 2.5.1 -Release: 59%{?dist} -License: GPL +Release: 60%{?dist} +License: GPLv2+ Group: Applications/Text Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2 Patch0: grep-2.5.1-fgrep.patch @@ -103,6 +103,9 @@ %{_mandir}/*/* %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 2.5.1-60 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 2.5.1-59 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:31:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:31:38 GMT Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.25,1.26 Message-ID: <200807251931.m6PJVck8013752@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gsf-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13726 Modified Files: gsf-sharp.spec Log Message: fix license tag Index: gsf-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsf-sharp/devel/gsf-sharp.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gsf-sharp.spec 19 Feb 2008 10:47:47 -0000 1.25 +++ gsf-sharp.spec 25 Jul 2008 19:31:08 -0000 1.26 @@ -1,10 +1,10 @@ Name: gsf-sharp Version: 0.8.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Mono bindings for libgsf Group: System Environment/Libraries -License: GPL +License: LGPLv2+ URL: http://go-mono.com Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,6 +60,9 @@ %{_libdir}/pkgconfig/gsf-sharp.pc %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 0.8.1-8 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.1-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:33:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:33:02 GMT Subject: rpms/gshutdown/devel gshutdown.spec,1.4,1.5 Message-ID: <200807251933.m6PJX227013861@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gshutdown/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13833 Modified Files: gshutdown.spec Log Message: fix license tag Index: gshutdown.spec =================================================================== RCS file: /cvs/pkgs/rpms/gshutdown/devel/gshutdown.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gshutdown.spec 19 Feb 2008 10:48:59 -0000 1.4 +++ gshutdown.spec 25 Jul 2008 19:32:32 -0000 1.5 @@ -1,10 +1,10 @@ Name: gshutdown Version: 0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GShutDown is an advanced shut down utility for GNOME Group: Applications/System -License: GPL +License: GPLv2+ URL: http://gshutdown.tuxfamily.org/ Source0: http://gshutdown.tuxfamily.org/release/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +64,9 @@ %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 0.2-4 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.2-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:35:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:35:30 GMT Subject: rpms/gstm/devel gstm.spec,1.3,1.4 Message-ID: <200807251935.m6PJZUAb013962@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gstm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13940 Modified Files: gstm.spec Log Message: fix license tag Index: gstm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstm/devel/gstm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gstm.spec 20 Feb 2008 00:53:32 -0000 1.3 +++ gstm.spec 25 Jul 2008 19:35:00 -0000 1.4 @@ -1,10 +1,10 @@ Name: gstm Version: 1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A front-end to ssh tunneling Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://gstm.sourceforge.net Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,6 +58,9 @@ %{_bindir}/gaskpass %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 1.2-8 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.2-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:38:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:38:03 GMT Subject: rpms/gstreamer08/devel gstreamer08.spec,1.5,1.6 Message-ID: <200807251938.m6PJc3e0014122@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14070 Modified Files: gstreamer08.spec Log Message: fix license tag Index: gstreamer08.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer08/devel/gstreamer08.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gstreamer08.spec 5 Sep 2006 18:05:20 -0000 1.5 +++ gstreamer08.spec 25 Jul 2008 19:37:33 -0000 1.6 @@ -10,11 +10,11 @@ Name: %{gstreamer} Version: 0.8.12 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia -License: LGPL +License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2 Patch0: gstreamer-0.8.11-lib64.patch @@ -154,6 +154,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 0.8.12-9 +- fix license tag + * Tue Sep 5 2006 Brian Pepple - 0.8.12-8 - fix the dtd reference so it will build. From fedora-extras-commits at redhat.com Fri Jul 25 19:40:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:40:42 GMT Subject: rpms/gstreamer08-plugins/devel gstreamer08-plugins.spec,1.5,1.6 Message-ID: <200807251940.m6PJegic014197@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gstreamer08-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14175 Modified Files: gstreamer08-plugins.spec Log Message: fix license tag Index: gstreamer08-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer08-plugins/devel/gstreamer08-plugins.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gstreamer08-plugins.spec 5 Sep 2006 18:11:33 -0000 1.5 +++ gstreamer08-plugins.spec 25 Jul 2008 19:40:12 -0000 1.6 @@ -7,11 +7,11 @@ Name: %{gstreamer}-plugins Version: 0.8.12 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GStreamer Streaming media framework plug-ins Group: Applications/Multimedia -License: LGPL +License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-%{version}.tar.bz2 Source2: patch-tarball.sh @@ -310,6 +310,9 @@ %{_libdir}/*so %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 0.8.12-8 +- fix license tag + * Tue Sep 5 2006 Brian Pepple - 0.8.12-7 - Rebuild for FC6. - Simplify summary & description for devel package. From fedora-extras-commits at redhat.com Fri Jul 25 19:41:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:41:56 GMT Subject: rpms/gstreamer08-python/devel gstreamer08-python.spec,1.4,1.5 Message-ID: <200807251941.m6PJfuJV014262@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gstreamer08-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14224 Modified Files: gstreamer08-python.spec Log Message: fix license tag Index: gstreamer08-python.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer08-python/devel/gstreamer08-python.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gstreamer08-python.spec 11 Dec 2006 16:36:37 -0000 1.4 +++ gstreamer08-python.spec 25 Jul 2008 19:41:26 -0000 1.5 @@ -6,11 +6,11 @@ Name: %{gstreamer}-python Version: 0.8.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python bindings for GStreamer Group: Development/Languages -License: LGPL +License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,9 @@ %{_libdir}/pkgconfig/gst-python-0.8.pc %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 0.8.4-3 +- fix license tag + * Wed Sep 20 2006 Thomas Vander Stichele - 0.8.4-2 - rebuilt From fedora-extras-commits at redhat.com Fri Jul 25 19:43:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:43:17 GMT Subject: rpms/gtk-doc/devel gtk-doc.spec,1.50,1.51 Message-ID: <200807251943.m6PJhHsE014320@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtk-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14298 Modified Files: gtk-doc.spec Log Message: fix license tag Index: gtk-doc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-doc/devel/gtk-doc.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gtk-doc.spec 25 Apr 2008 03:41:53 -0000 1.50 +++ gtk-doc.spec 25 Jul 2008 19:42:47 -0000 1.51 @@ -1,8 +1,8 @@ Summary: API documentation generation tool for GTK+ and GNOME Name: gtk-doc Version: 1.10 -Release: 1%{?dist} -License: GPLv2+ and GFDL+ +Release: 2%{?dist} +License: GPLv2+ and GFDL Group: Development/Tools Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.10/gtk-doc-%{version}.tar.bz2 Patch0: docdir.patch @@ -85,6 +85,9 @@ %{_datadir}/omf/gtk-doc/ %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 1.10-2 +- fix license tag + * Thu Apr 24 2008 Matthias Clasen - 1.10-1 - Update to 1.10 From fedora-extras-commits at redhat.com Fri Jul 25 19:45:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:45:21 GMT Subject: rpms/gtk-murrine-engine/devel gtk-murrine-engine.spec,1.7,1.8 Message-ID: <200807251945.m6PJjLFQ014479@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtk-murrine-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14434 Modified Files: gtk-murrine-engine.spec Log Message: fix license tag Index: gtk-murrine-engine.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-murrine-engine/devel/gtk-murrine-engine.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtk-murrine-engine.spec 19 Feb 2008 11:07:13 -0000 1.7 +++ gtk-murrine-engine.spec 25 Jul 2008 19:44:51 -0000 1.8 @@ -1,8 +1,9 @@ Summary: Murrine GTK2 engine Name: gtk-murrine-engine Version: 0.53.1 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +# No version specified. +License: GPL+ Group: System Environment/Libraries URL: http://cimi.netsons.org/pages/murrine.php Source0: http://cimi.netsons.org/media/download_gallery/murrine/murrine-%{version}.tar.bz2 @@ -53,6 +54,9 @@ %{_datadir}/* %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 0.53.1-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.53.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:45:42 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Fri, 25 Jul 2008 19:45:42 GMT Subject: rpms/zenon/devel zenon-format.5, NONE, 1.1 zenon.1, NONE, 1.1 import.log, 1.1, 1.2 zenon.spec, 1.1, 1.2 Message-ID: <200807251945.m6PJjgnK014532@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/zenon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14430/devel Modified Files: import.log zenon.spec Added Files: zenon-format.5 zenon.1 Log Message: * Fri Jun 27 2008 David A. Wheeler - 0.5.0-3 - Add documentation for Zenon and its built-in format as man pages (man pages used so Debian, etc., will use them too) - Fix release number so it increases everywhere --- NEW FILE zenon-format.5 --- .TH ZENON-FORMAT "5" "2008-07" "David A. Wheeler" "User Commands" .SH NAME zenon-format \- Automated theorem prover for first-order classical logic format .SH DESCRIPTION .\" Add any additional description here .PP Zenon can use several input formats, including its own "Zenon" format. This document describes this "Zenon" format. .PP In the Zenon format, "#" and ";" introduce comments that continue to the end of the line. Identifiers begin with A-Z, a-z, or underscore; they may continue with 0 or more of the characters A-Z, a-z, 0-9, underscore, and apostrophe. Strings are enclosed inside double-quote characters; they may not contain the double-quote character, control characters, or characters beyond 126. Whitespace is a token separator, but is otherwise ignored. Its syntax is as follows: .RS file: | EOF | phrase file phrase: | DEF "(" IDENT ident_list ")" expr | HYP int_opt hyp_name expr | GOAL expr | SIG IDENT "(" string_list ")" STRING | INDSET IDENT "(" ident_list ")" expr: | IDENT | "(" IDENT expr_list ")" | "(" NOT expr ")" | "(" AND expr expr_list ")" | "(" OR expr expr_list ")" | "(" IMPLY expr expr_list ")" | "(" RIMPLY expr expr_list ")" | "(" EQUIV expr expr_list ")" | "(" TRUE ")" | TRUE | "(" FALSE ")" | FALSE | "(" ALL mlambda ")" | "(" EX mlambda ")" | mlambda | "(" TAU lambda ")" | "(" "=" expr expr ")" | "(" MATCH expr case_list ")" | "(" LET id_expr_list_expr ")" expr_list: | expr expr_list | /* empty */ lambda: | "(" "(" IDENT STRING ")" expr ")" | "(" "(" IDENT ")" expr ")" mlambda: | "(" "(" ident_list STRING ")" expr ")" | "(" "(" ident_list ")" expr ")" ident_list: | /* empty */ | IDENT ident_list int_opt: | /* empty */ | INT hyp_name: | /* empty */ | STRING string_list: | /* empty */ | STRING string_list case_list: | /* empty */ | "(" IDENT ident_list ")" expr case_list id_expr_list_expr: | expr | IDENT expr id_expr_list_expr .RE .PP With the following token definitions: .RS DEF "$def" GOAL "$goal" HYP "$hyp" INDSET "$indset" INDPROP "$indprop" LET "$let" MATCH "$match" SIG "$sig" NOT "-." AND "/\\" OR "\\/" IMPLY "=>" RIMPLY "<=" EQUIV "<=>" TRUE "T." FALSE "F." ALL "A." EX "E." TAU "t." .RE .SH "SEE ALSO" .PP zenon(1) .SH AUTHOR .PP This man page was written by David A. Wheeler. .SH COPYRIGHT Zenon is released under the revised BSD license. This man page is released under both the revised BSD and MIT licenses (your choice). --- NEW FILE zenon.1 --- .TH ZENON "1" "2008-07" "David A. Wheeler" "User Commands" .SH NAME zenon \- Automated theorem prover for first-order classical logic .SH SYNOPSIS .B zenon [\fIOPTIONS\fR] \fIFILE\fR .SH DESCRIPTION .\" Add any additional description here .PP Zenon is an automated theorem prover for first order classical logic with equality, based on the tableau method. Zenon can read input files in TPTP, Coq, Focal, and its own Zenon format. Zenon can directly generate Coq proofs (proof scripts or proof terms), which can be reinserted into Coq specifications. Zenon can also be extended. .SH OPTIONS .PP .\" Mandatory arguments to long options are mandatory for short options too. If file is "-", it will read input from stdin. .TP 10 \fB\-context\fR provide context for checking the proof independently .TP 10 \fB\-d\fR debug mode .TP 10 \fB\-errmsg\fR \fI\fR prefix warnings and errors with \fI\fR .TP 10 \fB\-help\fR, \fB\--help\fR print this option list and exit .TP 10 \fB\-I\fR \fI\fR add \fI\fR to the include path (for TPTP input format) .TP 10 \fB\-icoq\fR read input file in Coq format .TP 10 \fB\-ifocal\fR read input file in Focal format .TP 10 \fB\-itptp\fR read input file in TPTP format .TP 10 \fB\-iz\fR read input file in Zenon format (default) .TP 10 \fB\-loadpath\fR path to Zenon's coq libraries (default /usr/share/zenon) .TP 10 \fB\-max\fR \fI[kMGT]/[kMGT]/[smhd]\fR set size, step, and time limits .TP 10 \fB\-max-size\fR \fI[kMGT]\fR limit heap size to kilo/mega/giga/tera word (default 100M) .TP 10 \fB\-max-step\fR \fI[kMGT]\fR limit number of steps to kilo/mega/giga/tera (default 10k) .TP 10 \fB\-max-time\fR \fI[smhd]\fR limit CPU time to second/minute/hour/day (default 5m) .TP 10 \fB\-ocoq\fR print the proof in Coq script format .TP 10 \fB\-ocoqterm\fR print the proof in Coq term format .TP 10 \fB\-oh\fR print the proof in high-level format up to depth .TP 10 \fB\-ol\fR print the proof in low-level format .TP 10 \fB\-olx\fR print the proof in raw low-level format .TP 10 \fB\-om\fR print the proof in middle-level format .TP 10 \fB\-onone\fR do not print the proof (default) .TP 10 \fB\-opt0\fR do not optimise the proof .TP 10 \fB\-opt1\fR do peephole optimisation of the proof (default) .TP 10 \fB\-p0\fR turn off progress bar and progress messages .TP 10 \fB\-p1\fR display progress bar (default) .TP 10 \fB\-p2\fR display progress messages .TP 10 \fB\-q\fR (quiet) suppress proof-found/no-proof/begin-proof/end-proof .TP 10 \fB\-rename\fR prefix all input symbols to avoid clashes .TP 10 \fB\-rnd\fR \fI\fR randomize proof search .TP 10 \fB\-stats\fR print statistics .TP 10 \fB\-short\fR output a less detailed proof .TP 10 \fB\-v\fR print version string and exit .TP 10 \fB\-versions\fR print CVS version strings and exit .TP 10 \fB\-w\fR suppress warnings .TP 10 \fB\-where\fR print the location of the zenon library and exit .TP 10 \fB\-wout\fR \fI\fR output errors and warnings to \fI\fR instead of stderr .TP 10 \fB\-x\fR \fI\fR activate extension \fI\fR .SH EXAMPLE .PP The command: .RS \fCzenon -itptp -ocoq /usr/share/zenon*/examples/tptp-COM003+2.p\fP .RE will take the input file "tptp-COM003+2.p" in TPTP format (-itptp), search for a proof, and produce any proof output in Coq format (-ocoq). tptp-COM003+2.p is a TPTP representation of the halting problem. Zenon can prove this, and will print out: .RS \fC(* PROOF-FOUND *)\fP .br \fC(* BEGIN-PROOF *)\fP .br ... details of proof in Coq format .br \fC(* END-PROOF *)\fP .RE .\" TO DO: .SH EXIT STATUS .SH "SEE ALSO" .PP zenon-format(5) .SH AUTHOR .PP This man page was written by David A. Wheeler. .SH COPYRIGHT Zenon is released under the revised BSD license. This man page is released under both the revised BSD and MIT licenses (your choice). Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/zenon/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Jul 2008 16:40:45 -0000 1.1 +++ import.log 25 Jul 2008 19:45:12 -0000 1.2 @@ -1 +1,2 @@ zenon-0_5_0-2_fc9:HEAD:zenon-0.5.0-2.fc9.src.rpm:1216658352 +zenon-0_5_0-3_fc9:HEAD:zenon-0.5.0-3.fc9.src.rpm:1217015067 Index: zenon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zenon/devel/zenon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zenon.spec 21 Jul 2008 16:40:45 -0000 1.1 +++ zenon.spec 25 Jul 2008 19:45:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: zenon Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Automated theorem prover for first-order classical logic Group: Applications/Engineering License: BSD @@ -8,12 +8,17 @@ Source0: http://focal.inria.fr/zenon/zenon-0.5.0.tar.gz Source1: zenon-tptp-COM003+2.p Source2: zenon-tptp-ReadMe +# Basic documentation (man pages). Submitted upstream 2008-07-25: +Source3: zenon.1 +Source4: zenon-format.5 Patch0 : zenon.bytecode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08 # prelink required to run execstack: BuildRequires: prelink -%{?fc8:ExcludeArch: ppc64} +%if 0%fedora == 8 +ExcludeArch: ppc64 +%endif %description Zenon is an automated theorem prover for first order classical logic @@ -40,6 +45,10 @@ cp -p %{SOURCE2} tptp-ReadMe chmod g-w tptp* +cp -p %{SOURCE3} %{SOURCE4} . +gzip zenon.1 +gzip zenon-format.5 + # Work around Makefile errors (fails if no ocamlopt, uses _bytecode_ otherwise) %if %opt make %{?_smp_mflags} zenon.opt @@ -56,41 +65,24 @@ %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %endif -# Create stub documentation; upstream has NOTHING. -cat > zenon-doc.txt <> zenon-doc.txt 2>&1 %install rm -rf %{buildroot} install -d %{buildroot}/%{_bindir}/ install -d %{buildroot}/%{_libdir}/ -install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ make install DESTDIR=%{buildroot} + +install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ +cp -p LICENSE %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/ cp -p tptp-COM003+2.p tptp-ReadMe \ %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ -cp -p LICENSE zenon-doc.txt %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/ +install -d %{buildroot}%{_mandir}/man1/ +install -d %{buildroot}%{_mandir}/man5/ +cp -p zenon.1.gz %{buildroot}%{_mandir}/man1/ +cp -p zenon-format.5.gz %{buildroot}%{_mandir}/man5/ + %check @@ -117,9 +109,19 @@ %{_defaultdocdir}/%{name}-%{version}/ %{_bindir}/* %{_datadir}/%{name}/ +%{_mandir}/man1/* +%{_mandir}/man5/* %changelog +* Fri Jun 27 2008 David A. Wheeler - 0.5.0-3 +- Add documentation for Zenon and its built-in format as man pages + (man pages used so Debian, etc., will use them too) +- Fix release number so it increases everywhere + +* Fri Jun 27 2008 David A. Wheeler - 0.5.0-2.1 +- macro fc8 failed, minor rebuild for Fedora 8 + * Fri Jun 27 2008 David A. Wheeler - 0.5.0-2 - Moved examples to an "examples" subdirectory in /usr/share/doc/NAME-VERSION - Moved "check" to be after "install" in spec file (that's when it's executed) From fedora-extras-commits at redhat.com Fri Jul 25 19:47:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:47:38 GMT Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.8,1.9 Message-ID: <200807251947.m6PJlcCw014651@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtk-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14617 Modified Files: gtk-sharp.spec Log Message: fix license tag Index: gtk-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp/devel/gtk-sharp.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtk-sharp.spec 3 Jun 2008 11:22:22 -0000 1.8 +++ gtk-sharp.spec 25 Jul 2008 19:47:07 -0000 1.9 @@ -3,10 +3,10 @@ Name: gtk-sharp Version: 1.0.10 -Release: 16%{?dist} +Release: 17%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries -License: LGPL +License: LGPLv2 URL: http://go-mono.com/sources-latest Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -104,6 +104,9 @@ %{monodir}/pkgconfig/gapi.pc %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 1.0.10-17 +- fix license tag + * Wed May 07 2008 Paul F. Johnson 1.0.10-16 - Removed ppc build for now From fedora-extras-commits at redhat.com Fri Jul 25 19:48:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:48:57 GMT Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.16,1.17 Message-ID: <200807251948.m6PJmvrx014765@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtkglarea2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14736 Modified Files: gtkglarea2.spec Log Message: fix license tag Index: gtkglarea2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkglarea2/devel/gtkglarea2.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gtkglarea2.spec 19 Feb 2008 03:36:40 -0000 1.16 +++ gtkglarea2.spec 25 Jul 2008 19:48:26 -0000 1.17 @@ -1,9 +1,9 @@ Summary: OpenGL GTK widget Name: gtkglarea2 Version: 1.99.0 -Release: 8%{?dist} +Release: 9%{?dist} -License: LGPL +License: LGPLv2+ Group: System Environment/Libraries URL: ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/ @@ -63,6 +63,9 @@ %{_libdir}/pkgconfig/gtkgl-2.0.pc %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 1.99.0-9 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1.99.0-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:50:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 25 Jul 2008 19:50:27 GMT Subject: rpms/gtkglextmm/devel gtkglextmm.spec,1.6,1.7 Message-ID: <200807251950.m6PJoRek014909@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14867 Modified Files: gtkglextmm.spec Log Message: fix license tag Index: gtkglextmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkglextmm/devel/gtkglextmm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtkglextmm.spec 19 Feb 2008 05:33:33 -0000 1.6 +++ gtkglextmm.spec 25 Jul 2008 19:49:56 -0000 1.7 @@ -5,8 +5,8 @@ Summary: C++ wrapper for GtkGlExt Name: gtkglextmm Version: 1.2.0 -Release: 6%{?dist} -License: LGPL +Release: 7%{?dist} +License: LGPLv2+ Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net Source0: http://dl.sourceforge.net/sourceforge/gtkglext/%{name}-%{version}.tar.bz2 @@ -72,6 +72,9 @@ %doc %{_datadir}/doc/%{name}-%{gtkglextmm_major}/html/* %changelog +* Fri Jul 25 2008 Tom "spot" Callaway - 1.2.0-7 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.0-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Jul 25 19:55:36 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Fri, 25 Jul 2008 19:55:36 GMT Subject: rpms/zenon/F-9 zenon-format.5, NONE, 1.1 zenon.1, NONE, 1.1 import.log, 1.1, 1.2 zenon.spec, 1.1, 1.2 Message-ID: <200807251955.m6PJtac7015257@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/zenon/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15197/F-9 Modified Files: import.log zenon.spec Added Files: zenon-format.5 zenon.1 Log Message: * Fri Jun 27 2008 David A. Wheeler - 0.5.0-3 - Add documentation for Zenon and its built-in format as man pages (man pages used so Debian, etc., will use them too) - Fix release number so it increases everywhere --- NEW FILE zenon-format.5 --- .TH ZENON-FORMAT "5" "2008-07" "David A. Wheeler" "User Commands" .SH NAME zenon-format \- Automated theorem prover for first-order classical logic format .SH DESCRIPTION .\" Add any additional description here .PP Zenon can use several input formats, including its own "Zenon" format. This document describes this "Zenon" format. .PP In the Zenon format, "#" and ";" introduce comments that continue to the end of the line. Identifiers begin with A-Z, a-z, or underscore; they may continue with 0 or more of the characters A-Z, a-z, 0-9, underscore, and apostrophe. Strings are enclosed inside double-quote characters; they may not contain the double-quote character, control characters, or characters beyond 126. Whitespace is a token separator, but is otherwise ignored. Its syntax is as follows: .RS file: | EOF | phrase file phrase: | DEF "(" IDENT ident_list ")" expr | HYP int_opt hyp_name expr | GOAL expr | SIG IDENT "(" string_list ")" STRING | INDSET IDENT "(" ident_list ")" expr: | IDENT | "(" IDENT expr_list ")" | "(" NOT expr ")" | "(" AND expr expr_list ")" | "(" OR expr expr_list ")" | "(" IMPLY expr expr_list ")" | "(" RIMPLY expr expr_list ")" | "(" EQUIV expr expr_list ")" | "(" TRUE ")" | TRUE | "(" FALSE ")" | FALSE | "(" ALL mlambda ")" | "(" EX mlambda ")" | mlambda | "(" TAU lambda ")" | "(" "=" expr expr ")" | "(" MATCH expr case_list ")" | "(" LET id_expr_list_expr ")" expr_list: | expr expr_list | /* empty */ lambda: | "(" "(" IDENT STRING ")" expr ")" | "(" "(" IDENT ")" expr ")" mlambda: | "(" "(" ident_list STRING ")" expr ")" | "(" "(" ident_list ")" expr ")" ident_list: | /* empty */ | IDENT ident_list int_opt: | /* empty */ | INT hyp_name: | /* empty */ | STRING string_list: | /* empty */ | STRING string_list case_list: | /* empty */ | "(" IDENT ident_list ")" expr case_list id_expr_list_expr: | expr | IDENT expr id_expr_list_expr .RE .PP With the following token definitions: .RS DEF "$def" GOAL "$goal" HYP "$hyp" INDSET "$indset" INDPROP "$indprop" LET "$let" MATCH "$match" SIG "$sig" NOT "-." AND "/\\" OR "\\/" IMPLY "=>" RIMPLY "<=" EQUIV "<=>" TRUE "T." FALSE "F." ALL "A." EX "E." TAU "t." .RE .SH "SEE ALSO" .PP zenon(1) .SH AUTHOR .PP This man page was written by David A. Wheeler. .SH COPYRIGHT Zenon is released under the revised BSD license. This man page is released under both the revised BSD and MIT licenses (your choice). --- NEW FILE zenon.1 --- .TH ZENON "1" "2008-07" "David A. Wheeler" "User Commands" .SH NAME zenon \- Automated theorem prover for first-order classical logic .SH SYNOPSIS .B zenon [\fIOPTIONS\fR] \fIFILE\fR .SH DESCRIPTION .\" Add any additional description here .PP Zenon is an automated theorem prover for first order classical logic with equality, based on the tableau method. Zenon can read input files in TPTP, Coq, Focal, and its own Zenon format. Zenon can directly generate Coq proofs (proof scripts or proof terms), which can be reinserted into Coq specifications. Zenon can also be extended. .SH OPTIONS .PP .\" Mandatory arguments to long options are mandatory for short options too. If file is "-", it will read input from stdin. .TP 10 \fB\-context\fR provide context for checking the proof independently .TP 10 \fB\-d\fR debug mode .TP 10 \fB\-errmsg\fR \fI\fR prefix warnings and errors with \fI\fR .TP 10 \fB\-help\fR, \fB\--help\fR print this option list and exit .TP 10 \fB\-I\fR \fI\fR add \fI\fR to the include path (for TPTP input format) .TP 10 \fB\-icoq\fR read input file in Coq format .TP 10 \fB\-ifocal\fR read input file in Focal format .TP 10 \fB\-itptp\fR read input file in TPTP format .TP 10 \fB\-iz\fR read input file in Zenon format (default) .TP 10 \fB\-loadpath\fR path to Zenon's coq libraries (default /usr/share/zenon) .TP 10 \fB\-max\fR \fI[kMGT]/[kMGT]/[smhd]\fR set size, step, and time limits .TP 10 \fB\-max-size\fR \fI[kMGT]\fR limit heap size to kilo/mega/giga/tera word (default 100M) .TP 10 \fB\-max-step\fR \fI[kMGT]\fR limit number of steps to kilo/mega/giga/tera (default 10k) .TP 10 \fB\-max-time\fR \fI[smhd]\fR limit CPU time to second/minute/hour/day (default 5m) .TP 10 \fB\-ocoq\fR print the proof in Coq script format .TP 10 \fB\-ocoqterm\fR print the proof in Coq term format .TP 10 \fB\-oh\fR print the proof in high-level format up to depth .TP 10 \fB\-ol\fR print the proof in low-level format .TP 10 \fB\-olx\fR print the proof in raw low-level format .TP 10 \fB\-om\fR print the proof in middle-level format .TP 10 \fB\-onone\fR do not print the proof (default) .TP 10 \fB\-opt0\fR do not optimise the proof .TP 10 \fB\-opt1\fR do peephole optimisation of the proof (default) .TP 10 \fB\-p0\fR turn off progress bar and progress messages .TP 10 \fB\-p1\fR display progress bar (default) .TP 10 \fB\-p2\fR display progress messages .TP 10 \fB\-q\fR (quiet) suppress proof-found/no-proof/begin-proof/end-proof .TP 10 \fB\-rename\fR prefix all input symbols to avoid clashes .TP 10 \fB\-rnd\fR \fI\fR randomize proof search .TP 10 \fB\-stats\fR print statistics .TP 10 \fB\-short\fR output a less detailed proof .TP 10 \fB\-v\fR print version string and exit .TP 10 \fB\-versions\fR print CVS version strings and exit .TP 10 \fB\-w\fR suppress warnings .TP 10 \fB\-where\fR print the location of the zenon library and exit .TP 10 \fB\-wout\fR \fI\fR output errors and warnings to \fI\fR instead of stderr .TP 10 \fB\-x\fR \fI\fR activate extension \fI\fR .SH EXAMPLE .PP The command: .RS \fCzenon -itptp -ocoq /usr/share/zenon*/examples/tptp-COM003+2.p\fP .RE will take the input file "tptp-COM003+2.p" in TPTP format (-itptp), search for a proof, and produce any proof output in Coq format (-ocoq). tptp-COM003+2.p is a TPTP representation of the halting problem. Zenon can prove this, and will print out: .RS \fC(* PROOF-FOUND *)\fP .br \fC(* BEGIN-PROOF *)\fP .br ... details of proof in Coq format .br \fC(* END-PROOF *)\fP .RE .\" TO DO: .SH EXIT STATUS .SH "SEE ALSO" .PP zenon-format(5) .SH AUTHOR .PP This man page was written by David A. Wheeler. .SH COPYRIGHT Zenon is released under the revised BSD license. This man page is released under both the revised BSD and MIT licenses (your choice). Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/zenon/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Jul 2008 16:42:29 -0000 1.1 +++ import.log 25 Jul 2008 19:55:06 -0000 1.2 @@ -1 +1,2 @@ zenon-0_5_0-2_fc9:F-9:zenon-0.5.0-2.fc9.src.rpm:1216658527 +zenon-0_5_0-3_fc9:F-9:zenon-0.5.0-3.fc9.src.rpm:1217015663 Index: zenon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zenon/F-9/zenon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zenon.spec 21 Jul 2008 16:42:29 -0000 1.1 +++ zenon.spec 25 Jul 2008 19:55:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: zenon Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Automated theorem prover for first-order classical logic Group: Applications/Engineering License: BSD @@ -8,12 +8,17 @@ Source0: http://focal.inria.fr/zenon/zenon-0.5.0.tar.gz Source1: zenon-tptp-COM003+2.p Source2: zenon-tptp-ReadMe +# Basic documentation (man pages). Submitted upstream 2008-07-25: +Source3: zenon.1 +Source4: zenon-format.5 Patch0 : zenon.bytecode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08 # prelink required to run execstack: BuildRequires: prelink -%{?fc8:ExcludeArch: ppc64} +%if 0%fedora == 8 +ExcludeArch: ppc64 +%endif %description Zenon is an automated theorem prover for first order classical logic @@ -40,6 +45,10 @@ cp -p %{SOURCE2} tptp-ReadMe chmod g-w tptp* +cp -p %{SOURCE3} %{SOURCE4} . +gzip zenon.1 +gzip zenon-format.5 + # Work around Makefile errors (fails if no ocamlopt, uses _bytecode_ otherwise) %if %opt make %{?_smp_mflags} zenon.opt @@ -56,41 +65,24 @@ %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %endif -# Create stub documentation; upstream has NOTHING. -cat > zenon-doc.txt <> zenon-doc.txt 2>&1 %install rm -rf %{buildroot} install -d %{buildroot}/%{_bindir}/ install -d %{buildroot}/%{_libdir}/ -install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ make install DESTDIR=%{buildroot} + +install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ +cp -p LICENSE %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/ cp -p tptp-COM003+2.p tptp-ReadMe \ %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ -cp -p LICENSE zenon-doc.txt %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/ +install -d %{buildroot}%{_mandir}/man1/ +install -d %{buildroot}%{_mandir}/man5/ +cp -p zenon.1.gz %{buildroot}%{_mandir}/man1/ +cp -p zenon-format.5.gz %{buildroot}%{_mandir}/man5/ + %check @@ -117,9 +109,19 @@ %{_defaultdocdir}/%{name}-%{version}/ %{_bindir}/* %{_datadir}/%{name}/ +%{_mandir}/man1/* +%{_mandir}/man5/* %changelog +* Fri Jun 27 2008 David A. Wheeler - 0.5.0-3 +- Add documentation for Zenon and its built-in format as man pages + (man pages used so Debian, etc., will use them too) +- Fix release number so it increases everywhere + +* Fri Jun 27 2008 David A. Wheeler - 0.5.0-2.1 +- macro fc8 failed, minor rebuild for Fedora 8 + * Fri Jun 27 2008 David A. Wheeler - 0.5.0-2 - Moved examples to an "examples" subdirectory in /usr/share/doc/NAME-VERSION - Moved "check" to be after "install" in spec file (that's when it's executed) From fedora-extras-commits at redhat.com Fri Jul 25 19:56:39 2008 From: fedora-extras-commits at redhat.com (David A. Wheeler (dwheeler)) Date: Fri, 25 Jul 2008 19:56:39 GMT Subject: rpms/zenon/F-8 zenon-format.5, NONE, 1.1 zenon.1, NONE, 1.1 import.log, 1.1, 1.2 zenon.spec, 1.2, 1.3 Message-ID: <200807251956.m6PJudHq015393@cvs-int.fedora.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/zenon/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357/F-8 Modified Files: import.log zenon.spec Added Files: zenon-format.5 zenon.1 Log Message: * Fri Jun 27 2008 David A. Wheeler - 0.5.0-3 - Add documentation for Zenon and its built-in format as man pages (man pages used so Debian, etc., will use them too) - Fix release number so it increases everywhere --- NEW FILE zenon-format.5 --- .TH ZENON-FORMAT "5" "2008-07" "David A. Wheeler" "User Commands" .SH NAME zenon-format \- Automated theorem prover for first-order classical logic format .SH DESCRIPTION .\" Add any additional description here .PP Zenon can use several input formats, including its own "Zenon" format. This document describes this "Zenon" format. .PP In the Zenon format, "#" and ";" introduce comments that continue to the end of the line. Identifiers begin with A-Z, a-z, or underscore; they may continue with 0 or more of the characters A-Z, a-z, 0-9, underscore, and apostrophe. Strings are enclosed inside double-quote characters; they may not contain the double-quote character, control characters, or characters beyond 126. Whitespace is a token separator, but is otherwise ignored. Its syntax is as follows: .RS file: | EOF | phrase file phrase: | DEF "(" IDENT ident_list ")" expr | HYP int_opt hyp_name expr | GOAL expr | SIG IDENT "(" string_list ")" STRING | INDSET IDENT "(" ident_list ")" expr: | IDENT | "(" IDENT expr_list ")" | "(" NOT expr ")" | "(" AND expr expr_list ")" | "(" OR expr expr_list ")" | "(" IMPLY expr expr_list ")" | "(" RIMPLY expr expr_list ")" | "(" EQUIV expr expr_list ")" | "(" TRUE ")" | TRUE | "(" FALSE ")" | FALSE | "(" ALL mlambda ")" | "(" EX mlambda ")" | mlambda | "(" TAU lambda ")" | "(" "=" expr expr ")" | "(" MATCH expr case_list ")" | "(" LET id_expr_list_expr ")" expr_list: | expr expr_list | /* empty */ lambda: | "(" "(" IDENT STRING ")" expr ")" | "(" "(" IDENT ")" expr ")" mlambda: | "(" "(" ident_list STRING ")" expr ")" | "(" "(" ident_list ")" expr ")" ident_list: | /* empty */ | IDENT ident_list int_opt: | /* empty */ | INT hyp_name: | /* empty */ | STRING string_list: | /* empty */ | STRING string_list case_list: | /* empty */ | "(" IDENT ident_list ")" expr case_list id_expr_list_expr: | expr | IDENT expr id_expr_list_expr .RE .PP With the following token definitions: .RS DEF "$def" GOAL "$goal" HYP "$hyp" INDSET "$indset" INDPROP "$indprop" LET "$let" MATCH "$match" SIG "$sig" NOT "-." AND "/\\" OR "\\/" IMPLY "=>" RIMPLY "<=" EQUIV "<=>" TRUE "T." FALSE "F." ALL "A." EX "E." TAU "t." .RE .SH "SEE ALSO" .PP zenon(1) .SH AUTHOR .PP This man page was written by David A. Wheeler. .SH COPYRIGHT Zenon is released under the revised BSD license. This man page is released under both the revised BSD and MIT licenses (your choice). --- NEW FILE zenon.1 --- .TH ZENON "1" "2008-07" "David A. Wheeler" "User Commands" .SH NAME zenon \- Automated theorem prover for first-order classical logic .SH SYNOPSIS .B zenon [\fIOPTIONS\fR] \fIFILE\fR .SH DESCRIPTION .\" Add any additional description here .PP Zenon is an automated theorem prover for first order classical logic with equality, based on the tableau method. Zenon can read input files in TPTP, Coq, Focal, and its own Zenon format. Zenon can directly generate Coq proofs (proof scripts or proof terms), which can be reinserted into Coq specifications. Zenon can also be extended. .SH OPTIONS .PP .\" Mandatory arguments to long options are mandatory for short options too. If file is "-", it will read input from stdin. .TP 10 \fB\-context\fR provide context for checking the proof independently .TP 10 \fB\-d\fR debug mode .TP 10 \fB\-errmsg\fR \fI\fR prefix warnings and errors with \fI\fR .TP 10 \fB\-help\fR, \fB\--help\fR print this option list and exit .TP 10 \fB\-I\fR \fI\fR add \fI\fR to the include path (for TPTP input format) .TP 10 \fB\-icoq\fR read input file in Coq format .TP 10 \fB\-ifocal\fR read input file in Focal format .TP 10 \fB\-itptp\fR read input file in TPTP format .TP 10 \fB\-iz\fR read input file in Zenon format (default) .TP 10 \fB\-loadpath\fR path to Zenon's coq libraries (default /usr/share/zenon) .TP 10 \fB\-max\fR \fI[kMGT]/[kMGT]/[smhd]\fR set size, step, and time limits .TP 10 \fB\-max-size\fR \fI[kMGT]\fR limit heap size to kilo/mega/giga/tera word (default 100M) .TP 10 \fB\-max-step\fR \fI[kMGT]\fR limit number of steps to kilo/mega/giga/tera (default 10k) .TP 10 \fB\-max-time\fR \fI[smhd]\fR limit CPU time to second/minute/hour/day (default 5m) .TP 10 \fB\-ocoq\fR print the proof in Coq script format .TP 10 \fB\-ocoqterm\fR print the proof in Coq term format .TP 10 \fB\-oh\fR print the proof in high-level format up to depth .TP 10 \fB\-ol\fR print the proof in low-level format .TP 10 \fB\-olx\fR print the proof in raw low-level format .TP 10 \fB\-om\fR print the proof in middle-level format .TP 10 \fB\-onone\fR do not print the proof (default) .TP 10 \fB\-opt0\fR do not optimise the proof .TP 10 \fB\-opt1\fR do peephole optimisation of the proof (default) .TP 10 \fB\-p0\fR turn off progress bar and progress messages .TP 10 \fB\-p1\fR display progress bar (default) .TP 10 \fB\-p2\fR display progress messages .TP 10 \fB\-q\fR (quiet) suppress proof-found/no-proof/begin-proof/end-proof .TP 10 \fB\-rename\fR prefix all input symbols to avoid clashes .TP 10 \fB\-rnd\fR \fI\fR randomize proof search .TP 10 \fB\-stats\fR print statistics .TP 10 \fB\-short\fR output a less detailed proof .TP 10 \fB\-v\fR print version string and exit .TP 10 \fB\-versions\fR print CVS version strings and exit .TP 10 \fB\-w\fR suppress warnings .TP 10 \fB\-where\fR print the location of the zenon library and exit .TP 10 \fB\-wout\fR \fI\fR output errors and warnings to \fI\fR instead of stderr .TP 10 \fB\-x\fR \fI\fR activate extension \fI\fR .SH EXAMPLE .PP The command: .RS \fCzenon -itptp -ocoq /usr/share/zenon*/examples/tptp-COM003+2.p\fP .RE will take the input file "tptp-COM003+2.p" in TPTP format (-itptp), search for a proof, and produce any proof output in Coq format (-ocoq). tptp-COM003+2.p is a TPTP representation of the halting problem. Zenon can prove this, and will print out: .RS \fC(* PROOF-FOUND *)\fP .br \fC(* BEGIN-PROOF *)\fP .br ... details of proof in Coq format .br \fC(* END-PROOF *)\fP .RE .\" TO DO: .SH EXIT STATUS .SH "SEE ALSO" .PP zenon-format(5) .SH AUTHOR .PP This man page was written by David A. Wheeler. .SH COPYRIGHT Zenon is released under the revised BSD license. This man page is released under both the revised BSD and MIT licenses (your choice). Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/zenon/F-8/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Jul 2008 16:44:04 -0000 1.1 +++ import.log 25 Jul 2008 19:56:09 -0000 1.2 @@ -1 +1,2 @@ zenon-0_5_0-2_fc9:F-8:zenon-0.5.0-2.fc9.src.rpm:1216658626 +zenon-0_5_0-3_fc9:F-8:zenon-0.5.0-3.fc9.src.rpm:1217015751 Index: zenon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zenon/F-8/zenon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zenon.spec 21 Jul 2008 17:38:33 -0000 1.2 +++ zenon.spec 25 Jul 2008 19:56:09 -0000 1.3 @@ -1,6 +1,6 @@ Name: zenon Version: 0.5.0 -Release: 2.1%{?dist} +Release: 3%{?dist} Summary: Automated theorem prover for first-order classical logic Group: Applications/Engineering License: BSD @@ -8,6 +8,9 @@ Source0: http://focal.inria.fr/zenon/zenon-0.5.0.tar.gz Source1: zenon-tptp-COM003+2.p Source2: zenon-tptp-ReadMe +# Basic documentation (man pages). Submitted upstream 2008-07-25: +Source3: zenon.1 +Source4: zenon-format.5 Patch0 : zenon.bytecode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08 @@ -42,6 +45,10 @@ cp -p %{SOURCE2} tptp-ReadMe chmod g-w tptp* +cp -p %{SOURCE3} %{SOURCE4} . +gzip zenon.1 +gzip zenon-format.5 + # Work around Makefile errors (fails if no ocamlopt, uses _bytecode_ otherwise) %if %opt make %{?_smp_mflags} zenon.opt @@ -58,41 +65,24 @@ %define __os_install_post /usr/lib/rpm/brp-compress %{nil} %endif -# Create stub documentation; upstream has NOTHING. -cat > zenon-doc.txt <> zenon-doc.txt 2>&1 %install rm -rf %{buildroot} install -d %{buildroot}/%{_bindir}/ install -d %{buildroot}/%{_libdir}/ -install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ make install DESTDIR=%{buildroot} + +install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ +cp -p LICENSE %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/ cp -p tptp-COM003+2.p tptp-ReadMe \ %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/ -cp -p LICENSE zenon-doc.txt %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/ +install -d %{buildroot}%{_mandir}/man1/ +install -d %{buildroot}%{_mandir}/man5/ +cp -p zenon.1.gz %{buildroot}%{_mandir}/man1/ +cp -p zenon-format.5.gz %{buildroot}%{_mandir}/man5/ + %check @@ -119,11 +109,18 @@ %{_defaultdocdir}/%{name}-%{version}/ %{_bindir}/* %{_datadir}/%{name}/ +%{_mandir}/man1/* +%{_mandir}/man5/* %changelog +* Fri Jun 27 2008 David A. Wheeler - 0.5.0-3 +- Add documentation for Zenon and its built-in format as man pages + (man pages used so Debian, etc., will use them too) +- Fix release number so it increases everywhere + * Fri Jun 27 2008 David A. Wheeler - 0.5.0-2.1 -- macro fc8 failed. +- macro fc8 failed, minor rebuild for Fedora 8 * Fri Jun 27 2008 David A. Wheeler - 0.5.0-2 - Moved examples to an "examples" subdirectory in /usr/share/doc/NAME-VERSION From fedora-extras-commits at redhat.com Fri Jul 25 19:59:35 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Fri, 25 Jul 2008 19:59:35 GMT Subject: rpms/openoffice.org-voikko/devel import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 openoffice.org-voikko.spec, 1.8, 1.9 sources, 1.4, 1.5 openoffice.org-voikko-2.2-3layer.patch, 1.1, NONE Message-ID: <200807251959.m6PJxZsP015624@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15559/devel Modified Files: .cvsignore openoffice.org-voikko.spec sources Added Files: import.log Removed Files: openoffice.org-voikko-2.2-3layer.patch Log Message: New pre-release --- NEW FILE import.log --- openoffice_org-voikko-3_0-0_1_pre4_fc10:HEAD:openoffice.org-voikko-3.0-0.1.pre4.fc10.src.rpm:1217015746 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2008 13:26:47 -0000 1.4 +++ .cvsignore 25 Jul 2008 19:59:04 -0000 1.5 @@ -1 +1 @@ -openoffice.org-voikko-2.2.tar.gz +openoffice.org-voikko-3.0pre4.tar.gz Index: openoffice.org-voikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openoffice.org-voikko.spec 3 Jun 2008 09:13:24 -0000 1.8 +++ openoffice.org-voikko.spec 25 Jul 2008 19:59:04 -0000 1.9 @@ -1,29 +1,29 @@ Name: openoffice.org-voikko -Version: 2.2 -Release: 5%{?dist} +Version: 3.0 +Release: 0.1.pre4%{?dist} Summary: Finnish spellchecker and hyphenator extension for OpenOffice.org Group: Applications/Productivity -License: GPLv2+ +License: GPLv3+ URL: http://voikko.sourceforge.net/ -Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz +# The usual format of stable release tarball URLs +#Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz +Source0: http://www.puimula.org/htp/testing/%{name}-%{version}pre4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openoffice.org-sdk >= 2.3.0-6.12 libvoikko-devel >= 1.5 -Requires(pre): openoffice.org-core >= 2.3.0-6.12 -Requires(post): openoffice.org-core >= 2.3.0-6.12 -Requires(preun): openoffice.org-core >= 2.3.0-6.12 -Requires(postun): openoffice.org-core >= 2.3.0-6.12 -Requires: openoffice.org-core >= 2.3.0-6.12 libvoikko >= 1.5 - -Patch0: openoffice.org-voikko-2.2-3layer.patch - -%define oo2_sdk %{_libdir}/openoffice.org/sdk -%define oo2 %{_libdir}/openoffice.org -%define unopkg %{oo2}/program/unopkg +BuildRequires: openoffice.org-sdk >= 3.0.0 libvoikko-devel >= 1.5 +Requires(pre): openoffice.org-core >= 3.0.0 +Requires(post): openoffice.org-core >= 3.0.0 +Requires(preun): openoffice.org-core >= 3.0.0 +Requires(postun): openoffice.org-core >= 3.0.0 +Requires: openoffice.org-core >= 3.0.0 libvoikko >= 1.5 + +%define ooo_sdk %{_libdir}/openoffice.org/basis3.0/sdk +%define ooo %{_libdir}/openoffice.org +%define unopkg %{_libdir}/openoffice.org3/program/unopkg # The location of the installed extension. Apparently the directory name must # end with .uno.pkg or unopkg will fail. -%define voikkoext %{_libdir}/openoffice.org/extensions/voikko.uno.pkg +%define voikkoext %{ooo}/extensions/voikko.uno.pkg %description This package contains a Finnish spell-checking and hyphenation component for @@ -33,7 +33,6 @@ %prep %setup -q -%patch0 -p1 -b .3layer.patch # Make install-unpacked also builds before installing, leave the build section @@ -43,9 +42,10 @@ %install rm -rf $RPM_BUILD_ROOT -. %{oo2_sdk}/setsdkenv_unix.sh +. %{ooo_sdk}/setsdkenv_unix.sh +# Use SHOW_UGLY_WARNINGS only for pre-release builds make install-unpacked DESTDIR=$RPM_BUILD_ROOT%{voikkoext} \ - "OPT_FLAGS=$RPM_OPT_FLAGS" %{?_smp_mflags} + SHOW_UGLY_WARNINGS=1 "OPT_FLAGS=$RPM_OPT_FLAGS" %{?_smp_mflags} # Set the library executable so debuginfo can be extracted. chmod +x $RPM_BUILD_ROOT%{voikkoext}/voikko.so @@ -82,6 +82,13 @@ %changelog +* Fri Jul 25 2008 Ville-Pekka Vainio - 3.0-0.1.pre4 +- New pre-release +- License changed to GPLv3+ +- Require openoffice.org >= 3.0.0 +- Drop unneeded 3 layer patch +- Build with new SHOW_UGLY_WARNINGS=1 option as this is a test release + * Tue Jun 03 2008 Caol??n McNamara - 2.2-5 - add openoffice.org-voikko-2.2-3layer.patch to build against 3 layer OOo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2008 13:26:47 -0000 1.4 +++ sources 25 Jul 2008 19:59:04 -0000 1.5 @@ -1 +1 @@ -830e6ed421f6d5eef19f3c4978b04da7 openoffice.org-voikko-2.2.tar.gz +88ffb4d2daad6c26610717cf29e337c4 openoffice.org-voikko-3.0pre4.tar.gz --- openoffice.org-voikko-2.2-3layer.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 20:20:20 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Fri, 25 Jul 2008 20:20:20 GMT Subject: rpms/anaconda/devel .cvsignore, 1.552, 1.553 anaconda.spec, 1.694, 1.695 sources, 1.686, 1.687 Message-ID: <200807252020.m6PKKKIu023602@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23557 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.552 retrieving revision 1.553 diff -u -r1.552 -r1.553 --- .cvsignore 24 Jul 2008 21:30:40 -0000 1.552 +++ .cvsignore 25 Jul 2008 20:19:50 -0000 1.553 @@ -4,3 +4,4 @@ anaconda-11.4.1.17.tar.bz2 anaconda-11.4.1.18.tar.bz2 anaconda-11.4.1.19.tar.bz2 +anaconda-11.4.1.20.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.694 retrieving revision 1.695 diff -u -r1.694 -r1.695 --- anaconda.spec 24 Jul 2008 21:30:40 -0000 1.694 +++ anaconda.spec 25 Jul 2008 20:19:50 -0000 1.695 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.19 +Version: 11.4.1.20 Release: 1 License: GPLv2+ Group: Applications/System @@ -195,6 +195,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jul 25 2008 Chris Lumens - 11.4.1.20-1 +- Clean up some mistakes in the minstg2 removal. (dcantrell) +- Fix passing the language to anaconda (katzj) + * Thu Jul 24 2008 Chris Lumens - 11.4.1.19-1 - Fix another NFS kickstart segfault (#456461). (clumens) - Remove support for generating a minstg2.img image. (dcantrell) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.686 retrieving revision 1.687 diff -u -r1.686 -r1.687 --- sources 24 Jul 2008 21:30:40 -0000 1.686 +++ sources 25 Jul 2008 20:19:50 -0000 1.687 @@ -1 +1 @@ -5886e78bdc34812cb4078b5793de9a49 anaconda-11.4.1.19.tar.bz2 +262e66ff7df1c1ff3e9cff1a60399201 anaconda-11.4.1.20.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 20:30:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 20:30:37 +0000 Subject: [pkgdb] emerald-themes ownership updated Message-ID: <20080725203037.B7A5E1AD0E3@bastion.fedora.phx.redhat.com> Package emerald-themes in Fedora 8 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes From fedora-extras-commits at redhat.com Fri Jul 25 20:31:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 25 Jul 2008 20:31:42 +0000 Subject: [pkgdb] emerald ownership updated Message-ID: <20080725203148.58EDF1AD0E3@bastion.fedora.phx.redhat.com> Package emerald in Fedora 8 is now owned by Nikolay Vladimirov (turki) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/emerald From fedora-extras-commits at redhat.com Fri Jul 25 21:00:38 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 25 Jul 2008 21:00:38 GMT Subject: rpms/asterisk/F-9 0011-Merged-revisions-123952-via-svnmerge-from.patch, NONE, 1.1 0012-Merged-revisions-132778-via-svnmerge-from.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 asterisk.spec, 1.26, 1.27 Message-ID: <200807252100.m6PL0cV6025124@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25077 Modified Files: .cvsignore asterisk.spec Added Files: 0011-Merged-revisions-123952-via-svnmerge-from.patch 0012-Merged-revisions-132778-via-svnmerge-from.patch Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.19.beta9 - Add patch pulled from upstream SVN that fixes AST-2008-010 and AST-2008-011. 0011-Merged-revisions-123952-via-svnmerge-from.patch: --- NEW FILE 0011-Merged-revisions-123952-via-svnmerge-from.patch --- >From 5931413c9269ef3fca3444a2c10865860f907758 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 19 Jun 2008 17:23:22 +0000 Subject: [PATCH] Merged revisions 123952 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r123952 | tilghman | 2008-06-19 12:22:27 -0500 (Thu, 19 Jun 2008) | 6 lines Don't change pointers that need to be later passed back for deallocation. (closes issue #12572) Reported by: flyn Patches: 20080613__bug12572.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 123958 614ede4d-c843-0410-af14-a771ab80d22e --- res/res_config_ldap.c | 85 +++++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 41 deletions(-) diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 7ce37c6..01050ca 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -282,33 +282,36 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); /* these are freed at the end */ if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; - ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, value->bv_val); + valptr = value->bv_val; + ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, valptr); if (is_realmed_password_attribute) { - if (!strncasecmp(value->bv_val, "{md5}", 5)) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (!strncasecmp(valptr, "{md5}", 5)) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { /* ok, so looping through all delimited values except the last one (not, last character is not delimited...) */ if (is_delimited) { i = 0; pos = 0; - while (!ast_strlen_zero(value->bv_val + i)) { - if (value->bv_val[i] == ';'){ - value->bv_val[i] = '\0'; + while (!ast_strlen_zero(valptr + i)) { + if (valptr[i] == ';'){ + valptr[i] = '\0'; if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } pos = i + 1; } @@ -317,15 +320,14 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config } /* for the last delimited value or if the value is not delimited: */ if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } } - v++; } ldap_value_free_len(values); } @@ -400,23 +402,26 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; + valptr = value->bv_val; if (is_realmed_password_attribute) { - if (strncasecmp(value->bv_val, "{md5}", 5) == 0) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (strncasecmp(valptr, "{md5}", 5) == 0) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { if (delim_value == NULL && !is_realmed_password_attribute && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0)) { - delim_value = ast_strdup(value->bv_val); + delim_value = ast_strdup(valptr); if ((delim_tot_count = semicolon_count_str(delim_value)) > 0) { ast_debug(4, "LINE(%d) is delimited %d times: %s\n", __LINE__, delim_tot_count, delim_value); @@ -426,11 +431,10 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf if (is_delimited != 0 && !is_realmed_password_attribute - && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ){ + && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ) { /* for non-Static RealTime, first */ - i = pos; - while (!ast_strlen_zero(value->bv_val + i)) { + for (i = pos; !ast_strlen_zero(valptr + i); i++) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); if (delim_value[i] == ';') { delim_value[i] = '\0'; @@ -451,9 +455,8 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf break; } } - i++; } - if (ast_strlen_zero(value->bv_val + i)) { + if (ast_strlen_zero(valptr + i)) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d delim_count: %d\n", __LINE__, pos, i, delim_count); /* Last delimited value */ ast_debug(4, "LINE(%d) DELIM - attribute_name: %s value: %s pos: %d\n", __LINE__, attribute_name, &delim_value[pos], pos); @@ -468,9 +471,9 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf /* Remembering to free memory */ is_delimited = 0; pos = 0; - free(delim_value); - delim_value = NULL; } + free(delim_value); + delim_value = NULL; ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); } else { @@ -479,20 +482,19 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf free(delim_value); delim_value = NULL; } - ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, value->bv_val); + ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, valptr); if (prev) { - prev->next = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev->next = ast_variable_new(attribute_name, valptr, table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev = var = ast_variable_new(attribute_name, valptr, table_config->table_name); } } } - v++; - } /*!< while(*v) */ + } /*!< for (v = values; *v; v++) */ ldap_value_free_len(values); }/*!< if (values) */ ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber); @@ -1459,10 +1461,11 @@ int parse_config(void) static_table_config = table_config; } for (; var; var = var->next) { - if (!strcasecmp(var->name, "additionalFilter")) - table_config->additional_filter = strdup(var->value); - else + if (!strcasecmp(var->name, "additionalFilter")) { + table_config->additional_filter = ast_strdup(var->value); + } else { ldap_table_config_add_attribute(table_config, var->name, var->value); + } } } } -- 1.5.5.2 0012-Merged-revisions-132778-via-svnmerge-from.patch: --- NEW FILE 0012-Merged-revisions-132778-via-svnmerge-from.patch --- >From 6c1b2ef859c2ad25a42b62d731d398c77fc3bb71 Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 22 Jul 2008 21:55:06 +0000 Subject: [PATCH] Merged revisions 132778 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r132778 | tilghman | 2008-07-22 16:53:40 -0500 (Tue, 22 Jul 2008) | 18 lines Merged revisions 132713 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r132713 | tilghman | 2008-07-22 16:19:39 -0500 (Tue, 22 Jul 2008) | 10 lines Merged revisions 132711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r132711 | tilghman | 2008-07-22 16:14:10 -0500 (Tue, 22 Jul 2008) | 2 lines Fixes for AST-2008-010 and AST-2008-011 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 132780 614ede4d-c843-0410-af14-a771ab80d22e --- channels/chan_iax2.c | 31 +++++++++++++++++++++++++++++-- configs/iax.conf.sample | 10 ++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index de1b450..055aa17 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -278,6 +278,7 @@ enum iax2_flags { IAX_DELAYPBXSTART = (1 << 25), /*!< Don't start a PBX on the channel until the peer sends us a response, so that we've achieved a three-way handshake with them before sending voice or anything else*/ + IAX_ALLOWFWDOWNLOAD = (1 << 26), /*!< Allow the FWDOWNL command? */ }; static int global_rtautoclear = 120; @@ -1701,10 +1702,10 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s snprintf(host, sizeof(host), "%s:%d", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); now = ast_tvnow(); - start = 1 + (ast_random() % (TRUNK_CALL_START - 1)); + start = 2 + (ast_random() % (TRUNK_CALL_START - 1)); for (x = start; 1; x++) { if (x == TRUNK_CALL_START) { - x = 0; + x = 1; continue; } @@ -3447,6 +3448,15 @@ struct parsed_dial_string { char *options; }; +static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno) +{ + struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno), + .ts = htonl(ts), .iseqno = seqno, .oseqno = seqno, .type = AST_FRAME_IAX, + .csub = compress_subclass(command) }; + + return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin)); +} + /*! * \brief Parses an IAX dial string into its component parts. * \param data the string to be parsed @@ -7990,6 +8000,17 @@ static int socket_process(struct iax2_thread *thread) } else { f.subclass = uncompress_subclass(fh->csub); } + + /* Deal with POKE/PONG without allocating a callno */ + if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) { + /* Reply back with a PONG, but don't care about the result. */ + send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->oseqno); + return 1; + } else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) { + /* Ignore */ + return 1; + } + if ((f.frametype == AST_FRAME_IAX) && ((f.subclass == IAX_COMMAND_NEW) || (f.subclass == IAX_COMMAND_REGREQ) || (f.subclass == IAX_COMMAND_POKE) || (f.subclass == IAX_COMMAND_FWDOWNL) || (f.subclass == IAX_COMMAND_REGREL))) @@ -9305,6 +9326,10 @@ retryowner2: break; case IAX_COMMAND_FWDOWNL: /* Firmware download */ + if (!ast_test_flag(&globalflags, IAX_ALLOWFWDOWNLOAD)) { + send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_UNSUPPORT, 0, NULL, 0, -1); + break; + } memset(&ied0, 0, sizeof(ied0)); res = iax_firmware_append(&ied0, (unsigned char *)ies.devicetype, ies.fwdesc); if (res < 0) @@ -10964,6 +10989,8 @@ static int set_config(char *config_file, int reload) ast_set2_flag((&globalflags), ast_true(v->value), IAX_FORCEJITTERBUF); else if (!strcasecmp(v->name, "delayreject")) delayreject = ast_true(v->value); + else if (!strcasecmp(v->name, "allowfwdownload")) + ast_set2_flag((&globalflags), ast_true(v->value), IAX_ALLOWFWDOWNLOAD); else if (!strcasecmp(v->name, "rtcachefriends")) ast_set2_flag((&globalflags), ast_true(v->value), IAX_RTCACHEFRIENDS); else if (!strcasecmp(v->name, "rtignoreregexpire")) diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index 2441f2c..854a243 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -264,6 +264,16 @@ autokill=yes ; The default value is 'host' ; ;codecpriority=host +; +; allowfwdownload controls whether this host will serve out firmware to +; IAX clients which request it. This has only been used for the IAXy, +; and it has been recently proven that this firmware distribution method +; can be used as a source of traffic amplification attacks. Also, the +; IAXy firmware has not been updated for at least 18 months, so unless +; you are provisioning IAXys in a secure network, we recommend that you +; leave this option to the default, off. +; +;allowfwdownload=yes ;rtcachefriends=yes ; Cache realtime friends by adding them to the internal list ; just like friends added from the config file only on a -- 1.5.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Apr 2008 02:52:46 -0000 1.14 +++ .cvsignore 25 Jul 2008 21:00:08 -0000 1.15 @@ -1 +1 @@ -asterisk-1.6.0-beta8-stripped.tar.gz +asterisk-1.6.0-beta9-stripped.tar.gz Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-9/asterisk.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- asterisk.spec 2 Jul 2008 16:39:50 -0000 1.26 +++ asterisk.spec 25 Jul 2008 21:00:08 -0000 1.27 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.17.beta%{beta}%{?dist} +Release: 0.19.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -44,6 +44,8 @@ Patch8: 0008-Build-using-external-libedit.patch Patch9: 0009-Update-cdr_tds-to-latest.patch Patch10: 0010-Update-autoconf.patch +Patch11: 0011-Merged-revisions-123952-via-svnmerge-from.patch +Patch12: 0012-Merged-revisions-132778-via-svnmerge-from.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -413,6 +415,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 cp %{SOURCE2} menuselect.makedeps cp %{SOURCE3} menuselect.makeopts @@ -1023,6 +1027,12 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.19.beta9 +- Add patch pulled from upstream SVN that fixes AST-2008-010 and AST-2008-011. + +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.18.beta9 +- Add patch for LDAP extracted from upstream SVN (#442011) + * Thu Jul 2 2008 Jeffrey C. Ollie - 1.6.0-0.17.beta9 - Add patch that unbreaks cdr_tds with FreeTDS 0.82. - Properly obsolete conference subpackage. From fedora-extras-commits at redhat.com Fri Jul 25 21:12:09 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 21:12:09 GMT Subject: rpms/intltool/devel .cvsignore, 1.26, 1.27 intltool.spec, 1.46, 1.47 sources, 1.26, 1.27 Message-ID: <200807252112.m6PLC9ne032435@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/intltool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32392 Modified Files: .cvsignore intltool.spec sources Log Message: 0.40.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/intltool/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 22 Jul 2008 03:56:50 -0000 1.26 +++ .cvsignore 25 Jul 2008 21:11:39 -0000 1.27 @@ -1 +1 @@ -intltool-0.40.1.tar.bz2 +intltool-0.40.3.tar.bz2 Index: intltool.spec =================================================================== RCS file: /cvs/extras/rpms/intltool/devel/intltool.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- intltool.spec 22 Jul 2008 03:56:50 -0000 1.46 +++ intltool.spec 25 Jul 2008 21:11:39 -0000 1.47 @@ -3,7 +3,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.40.1 +Version: 0.40.3 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools @@ -50,6 +50,9 @@ %{_mandir}/man*/* %changelog +* Fri Jul 25 2008 Matthias Clasen - 0.40.3-1 +- Update to 0.40.3 + * Mon Jul 21 2008 Matthias Clasen - 0.40.1-1 - Update to 0.40.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/intltool/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 22 Jul 2008 03:56:50 -0000 1.26 +++ sources 25 Jul 2008 21:11:39 -0000 1.27 @@ -1 +1 @@ -18a75ec5ff9d049c3ef148f1d7b03929 intltool-0.40.1.tar.bz2 +7adee54938b22d32c63ecb5223fd4249 intltool-0.40.3.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 25 22:29:50 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 22:29:50 GMT Subject: rpms/libgweather/devel pending-requests.patch, NONE, 1.1 libgweather.spec, 1.16, 1.17 Message-ID: <200807252229.m6PMToox011130@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgweather/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11100 Modified Files: libgweather.spec Added Files: pending-requests.patch Log Message: fix weather not showing up in the clock applet pending-requests.patch: --- NEW FILE pending-requests.patch --- diff -u libgweather-2.23.5/libgweather/weather-bom.c hacked/libgweather/weather-bom.c --- libgweather-2.23.5/libgweather/weather-bom.c 2008-07-22 17:38:29.000000000 -0400 +++ hacked/libgweather/weather-bom.c 2008-07-25 18:19:16.000000000 -0400 @@ -71,4 +71,6 @@ msg = soup_message_new ("GET", url); soup_session_queue_message (info->session, msg, bom_finish, info); g_free (url); + + info->requests_pending++; } diff -u libgweather-2.23.5/libgweather/weather.c hacked/libgweather/weather.c --- libgweather-2.23.5/libgweather/weather.c 2008-07-22 17:38:29.000000000 -0400 +++ hacked/libgweather/weather.c 2008-07-25 18:19:40.000000000 -0400 @@ -484,13 +484,10 @@ info->session = soup_session_async_new (); metar_start_open (info); - info->requests_pending++; iwin_start_open (info); - info->requests_pending++; if (prefs->radar) { wx_start_open (info); - info->requests_pending++; } return info; diff -u libgweather-2.23.5/libgweather/weather-iwin.c hacked/libgweather/weather-iwin.c --- libgweather-2.23.5/libgweather/weather-iwin.c 2008-07-22 17:38:29.000000000 -0400 +++ hacked/libgweather/weather-iwin.c 2008-07-25 18:20:07.000000000 -0400 @@ -125,8 +125,10 @@ state, zone); g_free (zone); g_free (state); - + msg = soup_message_new ("GET", url); g_free (url); soup_session_queue_message (info->session, msg, iwin_finish, info); + + info->requests_pending++; } diff -u libgweather-2.23.5/libgweather/weather-metar.c hacked/libgweather/weather-metar.c --- libgweather-2.23.5/libgweather/weather-metar.c 2008-07-22 17:38:29.000000000 -0400 +++ hacked/libgweather/weather-metar.c 2008-07-25 18:20:22.000000000 -0400 @@ -492,7 +492,7 @@ gboolean success = FALSE; g_return_if_fail (info != NULL); - + if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { g_warning (_("Failed to get METAR data: %d %s.\n"), msg->status_code, msg->reason_phrase); @@ -540,4 +540,6 @@ "cccc", loc->code, NULL); soup_session_queue_message (info->session, msg, metar_finish, info); + + info->requests_pending++; } diff -u libgweather-2.23.5/libgweather/weather-met.c hacked/libgweather/weather-met.c --- libgweather-2.23.5/libgweather/weather-met.c 2008-07-22 17:38:29.000000000 -0400 +++ hacked/libgweather/weather-met.c 2008-07-25 18:20:41.000000000 -0400 @@ -170,4 +170,6 @@ msg = soup_message_new ("GET", url); soup_session_queue_message (info->session, msg, met_finish, info); g_free (url); + + info->requests_pending++; } diff -u libgweather-2.23.5/libgweather/weather-wx.c hacked/libgweather/weather-wx.c --- libgweather-2.23.5/libgweather/weather-wx.c 2008-07-22 17:38:29.000000000 -0400 +++ hacked/libgweather/weather-wx.c 2008-07-25 18:15:51.000000000 -0400 @@ -93,4 +93,6 @@ soup_message_set_flags (msg, SOUP_MESSAGE_OVERWRITE_CHUNKS); soup_session_queue_message (info->session, msg, wx_finish, info); g_free (url); + + info->requests_pending++; } Index: libgweather.spec =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libgweather.spec 23 Jul 2008 01:48:10 -0000 1.16 +++ libgweather.spec 25 Jul 2008 22:29:20 -0000 1.17 @@ -1,6 +1,6 @@ Name: libgweather Version: 2.23.5 -Release: 1%{?d4st} +Release: 2%{?d4st} Summary: A library for weather information Group: System Environment/Libraries @@ -17,6 +17,8 @@ BuildRequires: perl(XML::Parser) BuildRequires: intltool +# fixed in upstream svn +Patch0: pending-requests.patch %description libgweather is a library to access weather information from online @@ -39,6 +41,7 @@ %prep %setup -q +%patch -p0 -b .pending-requests %build %configure --disable-static @@ -102,6 +105,9 @@ %changelog +* Fri Jul 25 2008 Matthias Clasen 2.23.5-2 +- Fix pending request accounting + * Tue Jul 22 2008 Matthias Clasen 2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Fri Jul 25 22:31:20 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 22:31:20 GMT Subject: rpms/libgweather/devel libgweather.spec,1.17,1.18 Message-ID: <200807252231.m6PMVK01011232@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgweather/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11158 Modified Files: libgweather.spec Log Message: fix spec Index: libgweather.spec =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libgweather.spec 25 Jul 2008 22:29:20 -0000 1.17 +++ libgweather.spec 25 Jul 2008 22:30:50 -0000 1.18 @@ -41,7 +41,7 @@ %prep %setup -q -%patch -p0 -b .pending-requests +%patch0 -p0 -b .pending-requests %build %configure --disable-static From fedora-extras-commits at redhat.com Fri Jul 25 22:32:40 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 25 Jul 2008 22:32:40 GMT Subject: rpms/libgweather/devel libgweather.spec,1.18,1.19 Message-ID: <200807252232.m6PMWerK011335@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgweather/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11273 Modified Files: libgweather.spec Log Message: fix spec Index: libgweather.spec =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libgweather.spec 25 Jul 2008 22:30:50 -0000 1.18 +++ libgweather.spec 25 Jul 2008 22:32:09 -0000 1.19 @@ -41,7 +41,7 @@ %prep %setup -q -%patch0 -p0 -b .pending-requests +%patch0 -p1 -b .pending-requests %build %configure --disable-static From fedora-extras-commits at redhat.com Fri Jul 25 23:01:23 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 25 Jul 2008 23:01:23 GMT Subject: rpms/telepathy-butterfly/devel telepathy-butterfly-0.3.2-build.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 telepathy-butterfly.spec, 1.9, 1.10 telepathy-butterfly-0.3.1-build.patch, 1.1, NONE Message-ID: <200807252301.m6PN1NZn019585@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-butterfly/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12920 Modified Files: .cvsignore sources telepathy-butterfly.spec Added Files: telepathy-butterfly-0.3.2-build.patch Removed Files: telepathy-butterfly-0.3.1-build.patch Log Message: * Sun Jul 20 2008 Brian Pepple - 0.3.2-1 - Update to 0.3.2. telepathy-butterfly-0.3.2-build.patch: --- NEW FILE telepathy-butterfly-0.3.2-build.patch --- diff -urp telepathy-butterfly-0.3.2.OLD/configure telepathy-butterfly-0.3.2/configure --- telepathy-butterfly-0.3.2.OLD/configure 2008-05-21 18:45:32.000000000 -0400 +++ telepathy-butterfly-0.3.2/configure 2008-07-25 18:48:10.000000000 -0400 @@ -109,7 +109,7 @@ install: @if test -n "\$(DESTDIR)"; then \\ $WAF install --destdir="\$(DESTDIR)"; \\ else \\ - $WAF install; \\ + $WAF install --destdir=$RPM_BUILD_ROOT; \\ fi; uninstall: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Jan 2008 01:08:10 -0000 1.7 +++ .cvsignore 25 Jul 2008 23:00:53 -0000 1.8 @@ -1 +1 @@ -telepathy-butterfly-0.3.1.tar.gz +telepathy-butterfly-0.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Jan 2008 01:08:10 -0000 1.7 +++ sources 25 Jul 2008 23:00:53 -0000 1.8 @@ -1 +1 @@ -30f95672c5317c050996f73e792b7c41 telepathy-butterfly-0.3.1.tar.gz +f1db30de25daf382aa3e9b5b8efecd70 telepathy-butterfly-0.3.2.tar.gz Index: telepathy-butterfly.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- telepathy-butterfly.spec 18 Jan 2008 01:08:10 -0000 1.9 +++ telepathy-butterfly.spec 25 Jul 2008 23:00:53 -0000 1.10 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: telepathy-butterfly -Version: 0.3.1 +Version: 0.3.2 Release: 1%{?dist} Summary: MSN connection manager for Telepathy @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://telepathy.freedesktop.org/wiki/ Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-build.patch +Patch0: %{name}-0.3.2-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -58,6 +58,9 @@ %changelog +* Sun Jul 20 2008 Brian Pepple - 0.3.2-1 +- Update to 0.3.2. + * Thu Jan 17 2008 Brian Pepple - 0.3.1-1 - Update to 0.3.1. - Add patch to fix build. --- telepathy-butterfly-0.3.1-build.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 25 23:14:25 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 23:14:25 GMT Subject: rpms/kdebindings/devel kdebindings-4.1.0-kde#167450.patch, NONE, 1.1 kdebindings.spec, 1.134, 1.135 Message-ID: <200807252314.m6PNEPJa020710@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652/devel Modified Files: kdebindings.spec Added Files: kdebindings-4.1.0-kde#167450.patch Log Message: * Fri Jul 25 2008 Kevin Kofler 4.1.0-4 - fix Python and Ruby bindings overwriting each other (#456722, kde#167450) kdebindings-4.1.0-kde#167450.patch: --- NEW FILE kdebindings-4.1.0-kde#167450.patch --- diff -ur kdebindings-4.1.0/python/pykde4/CMakeLists.txt kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt --- kdebindings-4.1.0/python/pykde4/CMakeLists.txt 2008-07-17 23:32:45.000000000 +0200 +++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt 2008-07-26 01:10:21.000000000 +0200 @@ -3,6 +3,9 @@ # This module can be built independant from the rest of kdebindings. SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +# Fix output file conflict with the Ruby bindings +SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde) + FIND_PACKAGE(PythonLibrary REQUIRED) INCLUDE(PythonMacros) Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- kdebindings.spec 25 Jul 2008 18:35:22 -0000 1.134 +++ kdebindings.spec 25 Jul 2008 23:13:55 -0000 1.135 @@ -22,13 +22,15 @@ Name: kdebindings Version: 4.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops License: GPLv2 URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 +# fix Python and Ruby bindings overwriting each other (#456722, kde#167450) +Patch0: kdebindings-4.1.0-kde#167450.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -86,6 +88,7 @@ %prep %setup -q +%patch0 -p1 -b .kde#167450 %build mkdir -p %{_target_platform} @@ -164,6 +167,9 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-4 +- fix Python and Ruby bindings overwriting each other (#456722, kde#167450) + * Fri Jul 25 2008 Kevin Kofler 4.1.0-3 - drop unneeded BR kdegraphics4-devel (Ruby Okular bindings disabled by default) - add BR kdepimlibs-devel for Python Akonadi bindings From fedora-extras-commits at redhat.com Fri Jul 25 23:15:14 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 23:15:14 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.135,1.136 Message-ID: <200807252315.m6PNFEU8020741@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20720/devel Modified Files: kdebindings.spec Log Message: Give credit where credit is due. Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- kdebindings.spec 25 Jul 2008 23:13:55 -0000 1.135 +++ kdebindings.spec 25 Jul 2008 23:14:44 -0000 1.136 @@ -30,6 +30,7 @@ URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 # fix Python and Ruby bindings overwriting each other (#456722, kde#167450) +# (thanks to Sebastian Sauer) Patch0: kdebindings-4.1.0-kde#167450.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Jul 25 23:16:29 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 25 Jul 2008 23:16:29 GMT Subject: rpms/kdebindings/F-9 kdebindings-4.1.0-kde#167450.patch, NONE, 1.1 kdebindings.spec, 1.102, 1.103 Message-ID: <200807252316.m6PNGTPW020932@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20823/F-9 Modified Files: kdebindings.spec Added Files: kdebindings-4.1.0-kde#167450.patch Log Message: Sync from devel: * Fri Jul 25 2008 Kevin Kofler 4.1.0-4 - fix Python and Ruby bindings overwriting each other (#456722, kde#167450) kdebindings-4.1.0-kde#167450.patch: --- NEW FILE kdebindings-4.1.0-kde#167450.patch --- diff -ur kdebindings-4.1.0/python/pykde4/CMakeLists.txt kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt --- kdebindings-4.1.0/python/pykde4/CMakeLists.txt 2008-07-17 23:32:45.000000000 +0200 +++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt 2008-07-26 01:10:21.000000000 +0200 @@ -3,6 +3,9 @@ # This module can be built independant from the rest of kdebindings. SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +# Fix output file conflict with the Ruby bindings +SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde) + FIND_PACKAGE(PythonLibrary REQUIRED) INCLUDE(PythonMacros) Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- kdebindings.spec 25 Jul 2008 18:39:47 -0000 1.102 +++ kdebindings.spec 25 Jul 2008 23:15:59 -0000 1.103 @@ -22,13 +22,16 @@ Name: kdebindings Version: 4.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops License: GPLv2 URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 +# fix Python and Ruby bindings overwriting each other (#456722, kde#167450) +# (thanks to Sebastian Sauer) +Patch0: kdebindings-4.1.0-kde#167450.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -86,6 +89,7 @@ %prep %setup -q +%patch0 -p1 -b .kde#167450 %build mkdir -p %{_target_platform} @@ -164,6 +168,9 @@ %changelog +* Fri Jul 25 2008 Kevin Kofler 4.1.0-4 +- fix Python and Ruby bindings overwriting each other (#456722, kde#167450) + * Fri Jul 25 2008 Kevin Kofler 4.1.0-3 - drop unneeded BR kdegraphics4-devel (Ruby Okular bindings disabled by default) - add BR kdepimlibs-devel for Python Akonadi bindings From fedora-extras-commits at redhat.com Fri Jul 25 23:20:32 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Fri, 25 Jul 2008 23:20:32 GMT Subject: rpms/kernel/F-8 config-generic,1.74,1.75 kernel.spec,1.502,1.503 Message-ID: <200807252320.m6PNKWWZ021209@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21155 Modified Files: config-generic kernel.spec Log Message: Set default powersave timeout to 0 for the AC97 driver. (F9#450395) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- config-generic 20 Jul 2008 22:18:24 -0000 1.74 +++ config-generic 25 Jul 2008 23:20:02 -0000 1.75 @@ -2375,7 +2375,7 @@ CONFIG_SND_MPU401=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5 +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 # # ISA devices Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.502 retrieving revision 1.503 diff -u -r1.502 -r1.503 --- kernel.spec 24 Jul 2008 21:18:53 -0000 1.502 +++ kernel.spec 25 Jul 2008 23:20:02 -0000 1.503 @@ -1841,10 +1841,13 @@ %changelog -* Thu Jul 24 2008 Kyle McMartin +* Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-63 +- Set default powersave timeout to 0 for the AC97 driver. (F9#450395) + +* Thu Jul 24 2008 Kyle McMartin 2.6.25.12-62 - Linux 2.6.25.12 -* Tue Jul 22 2008 Kyle McMartin +* Tue Jul 22 2008 Kyle McMartin 2.6.25.11-61 - libata-acpi: fix calling sleeping function in irq context (#451896, #454954) * Sun Jul 20 2008 Chuck Ebbert 2.6.25.11-60 From fedora-extras-commits at redhat.com Fri Jul 25 23:23:22 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Fri, 25 Jul 2008 23:23:22 GMT Subject: rpms/kernel/F-9 config-generic,1.110,1.111 kernel.spec,1.719,1.720 Message-ID: <200807252323.m6PNNMDS021514@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21414 Modified Files: config-generic kernel.spec Log Message: Set default powersave timeout to 0 for the AC97 driver. (#450395) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- config-generic 21 Jul 2008 22:22:31 -0000 1.110 +++ config-generic 25 Jul 2008 23:22:52 -0000 1.111 @@ -2401,7 +2401,7 @@ CONFIG_SND_MPU401=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5 +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 # # ISA devices Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.719 retrieving revision 1.720 diff -u -r1.719 -r1.720 --- kernel.spec 24 Jul 2008 21:06:33 -0000 1.719 +++ kernel.spec 25 Jul 2008 23:22:52 -0000 1.720 @@ -1883,7 +1883,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog -* Thu Jul 24 2008 Kyle McMartin +* Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-101 +- Set default powersave timeout to 0 for the AC97 driver. (#450395) + +* Thu Jul 24 2008 Kyle McMartin 2.6.25.12-100 - Linux 2.6.25.12 * Tue Jul 22 2008 Kyle McMartin From fedora-extras-commits at redhat.com Sat Jul 26 00:05:14 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 00:05:14 GMT Subject: rpms/kdebindings/F-9 kdebindings-4.1.0-kde#167450.patch,1.1,1.2 Message-ID: <200807260005.m6Q05E5R001318@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/F-9 Modified Files: kdebindings-4.1.0-kde#167450.patch Log Message: Fix patch for CMake 2.4. kdebindings-4.1.0-kde#167450.patch: Index: kdebindings-4.1.0-kde#167450.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings-4.1.0-kde#167450.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebindings-4.1.0-kde#167450.patch 25 Jul 2008 23:15:59 -0000 1.1 +++ kdebindings-4.1.0-kde#167450.patch 26 Jul 2008 00:04:43 -0000 1.2 @@ -1,12 +1,16 @@ diff -ur kdebindings-4.1.0/python/pykde4/CMakeLists.txt kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt --- kdebindings-4.1.0/python/pykde4/CMakeLists.txt 2008-07-17 23:32:45.000000000 +0200 -+++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt 2008-07-26 01:10:21.000000000 +0200 -@@ -3,6 +3,9 @@ ++++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt 2008-07-26 02:04:05.000000000 +0200 +@@ -3,6 +3,13 @@ # This module can be built independant from the rest of kdebindings. SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +# Fix output file conflict with the Ruby bindings -+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde) ++IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) ++ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/pykde) ++ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) ++ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde) ++ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) + FIND_PACKAGE(PythonLibrary REQUIRED) INCLUDE(PythonMacros) From fedora-extras-commits at redhat.com Sat Jul 26 00:05:14 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 00:05:14 GMT Subject: rpms/kdebindings/devel kdebindings-4.1.0-kde#167450.patch,1.1,1.2 Message-ID: <200807260005.m6Q05E6k001321@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/devel Modified Files: kdebindings-4.1.0-kde#167450.patch Log Message: Fix patch for CMake 2.4. kdebindings-4.1.0-kde#167450.patch: Index: kdebindings-4.1.0-kde#167450.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.1.0-kde#167450.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebindings-4.1.0-kde#167450.patch 25 Jul 2008 23:13:55 -0000 1.1 +++ kdebindings-4.1.0-kde#167450.patch 26 Jul 2008 00:04:44 -0000 1.2 @@ -1,12 +1,16 @@ diff -ur kdebindings-4.1.0/python/pykde4/CMakeLists.txt kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt --- kdebindings-4.1.0/python/pykde4/CMakeLists.txt 2008-07-17 23:32:45.000000000 +0200 -+++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt 2008-07-26 01:10:21.000000000 +0200 -@@ -3,6 +3,9 @@ ++++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt 2008-07-26 02:04:05.000000000 +0200 +@@ -3,6 +3,13 @@ # This module can be built independant from the rest of kdebindings. SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +# Fix output file conflict with the Ruby bindings -+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde) ++IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) ++ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/pykde) ++ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) ++ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde) ++ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) + FIND_PACKAGE(PythonLibrary REQUIRED) INCLUDE(PythonMacros) From fedora-extras-commits at redhat.com Sat Jul 26 00:30:40 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Sat, 26 Jul 2008 00:30:40 GMT Subject: rpms/kernel/F-9 linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch, NONE, 1.1 kernel.spec, 1.720, 1.721 Message-ID: <200807260030.m6Q0Ueei002520@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2455 Modified Files: kernel.spec Added Files: linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch Log Message: Fix 64-bit resource checking on 32-bit kernels. (#447143) linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch: --- NEW FILE linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch --- From: Ingo Molnar Date: Tue, 25 Mar 2008 07:31:17 +0000 (+0100) Subject: x86: ioremap of 64-bit resource on 32-bit kernel fix X-Git-Tag: v2.6.26-rc1~1154^2~109 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=756a6c68556600aec9460346332884d891d5beb4 x86: ioremap of 64-bit resource on 32-bit kernel fix Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 7338c5d..c590fd2 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr) int page_is_ram(unsigned long pagenr) { - unsigned long addr, end; + resource_size_t addr, end; int i; /* @@ -120,7 +120,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size, static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, enum ioremap_mode mode) { - unsigned long pfn, offset, last_addr, vaddr; + unsigned long pfn, offset, vaddr; + resource_size_t last_addr; struct vm_struct *area; pgprot_t prot; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.720 retrieving revision 1.721 diff -u -r1.720 -r1.721 --- kernel.spec 25 Jul 2008 23:22:52 -0000 1.720 +++ kernel.spec 26 Jul 2008 00:30:10 -0000 1.721 @@ -580,6 +580,7 @@ Patch85: linux-2.6-x86-dont-map-vdso-when-disabled.patch Patch86: linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch Patch87: linux-2.6-x86-apic-dump-all-regs-v3.patch +Patch88: linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch # ppc Patch123: linux-2.6-ppc-rtc.patch @@ -1063,6 +1064,8 @@ ApplyPatch linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch # dump *PIC state at boot with apic=debug ApplyPatch linux-2.6-x86-apic-dump-all-regs-v3.patch +# fix 64-bit resource on 32-bit kernels +ApplyPatch linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch # # PowerPC @@ -1883,6 +1886,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-102 +- Fix 64-bit resource checking on 32-bit kernels. (#447143) + * Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-101 - Set default powersave timeout to 0 for the AC97 driver. (#450395) From fedora-extras-commits at redhat.com Sat Jul 26 00:31:02 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Sat, 26 Jul 2008 00:31:02 GMT Subject: rpms/kernel/F-8 linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch, NONE, 1.1 kernel.spec, 1.503, 1.504 Message-ID: <200807260031.m6Q0V2gm002548@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2490 Modified Files: kernel.spec Added Files: linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch Log Message: Fix 64-bit resource checking on 32-bit kernels. (F9#447143) linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch: --- NEW FILE linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch --- From: Ingo Molnar Date: Tue, 25 Mar 2008 07:31:17 +0000 (+0100) Subject: x86: ioremap of 64-bit resource on 32-bit kernel fix X-Git-Tag: v2.6.26-rc1~1154^2~109 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=756a6c68556600aec9460346332884d891d5beb4 x86: ioremap of 64-bit resource on 32-bit kernel fix Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 7338c5d..c590fd2 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr) int page_is_ram(unsigned long pagenr) { - unsigned long addr, end; + resource_size_t addr, end; int i; /* @@ -120,7 +120,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size, static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, enum ioremap_mode mode) { - unsigned long pfn, offset, last_addr, vaddr; + unsigned long pfn, offset, vaddr; + resource_size_t last_addr; struct vm_struct *area; pgprot_t prot; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.503 retrieving revision 1.504 diff -u -r1.503 -r1.504 --- kernel.spec 25 Jul 2008 23:20:02 -0000 1.503 +++ kernel.spec 26 Jul 2008 00:30:31 -0000 1.504 @@ -578,6 +578,7 @@ Patch85: linux-2.6-x86-dont-map-vdso-when-disabled.patch Patch86: linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch Patch87: linux-2.6-x86-apic-dump-all-regs-v3.patch +Patch88: linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch Patch90: linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch Patch91: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch @@ -1022,6 +1023,8 @@ ApplyPatch linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch # dump *PIC state at boot with apic=debug ApplyPatch linux-2.6-x86-apic-dump-all-regs-v3.patch +# fix 64-bit resource on 32-bit kernels +ApplyPatch linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch # # PowerPC @@ -1841,6 +1844,9 @@ %changelog +* Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-64 +- Fix 64-bit resource checking on 32-bit kernels. (F9#447143) + * Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-63 - Set default powersave timeout to 0 for the AC97 driver. (F9#450395) From fedora-extras-commits at redhat.com Sat Jul 26 01:19:40 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 01:19:40 GMT Subject: rpms/automoc/F-9 automoc.spec,1.2,1.3 Message-ID: <200807260119.m6Q1JeCT010985@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/automoc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10963/F-9 Modified Files: automoc.spec Log Message: Sync from devel: * Wed Jul 23 2008 Rex Dieter 1.0-0.8.rc1 - automoc4-0.9.84 (1.0-rc1) Index: automoc.spec =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-9/automoc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- automoc.spec 18 Jul 2008 19:19:08 -0000 1.2 +++ automoc.spec 26 Jul 2008 01:19:10 -0000 1.3 @@ -1,19 +1,17 @@ #define snaptag .20080527svn811390 -%define beta 0.9.83 -%define beta_tag beta2 +%define beta 0.9.84 +%define beta_tag rc1 Name: automoc Version: 1.0 -Release: 0.7.%{?beta_tag}%{?dist} +Release: 0.8.%{?beta_tag}%{?dist} Summary: KDE4 automoc Group: Development/Tools License: BSD URL: http://www.kde.org +Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.94/support/automoc4-%{beta}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Source0: http://rpm.binaryhelix.net/SOURCES/%{name}-%{version}%{?snaptag}.tar.gz -Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.93/support/automoc4-%{beta}.tar.bz2 - Provides: automoc4 = %{beta} Requires: cmake @@ -48,12 +46,15 @@ %files %defattr(-,root,root,-) %{_bindir}/automoc4 -%{_prefix}/lib/automoc4/ +%{_kde4_libdir}/automoc4/ %changelog +* Wed Jul 23 2008 Rex Dieter 1.0-0.8.rc1 +- automoc4-0.9.84 (1.0-rc1) + * Mon Jun 30 2008 Rex Dieter 1.0-0.7.beta2 -- automoc4-0.9.83 (aka 1.0beta2) +- automoc4-0.9.83 (1.0-beta2) - drop lib64 patch * Thu Jun 10 2008 Lorenzo Villani - 1.0-0.5.20080527svn811390 From fedora-extras-commits at redhat.com Sat Jul 26 01:20:52 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 01:20:52 GMT Subject: rpms/automoc/F-9 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200807260120.m6Q1KqeH011035@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/automoc/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11009/F-9 Modified Files: .cvsignore sources Log Message: Sync from devel: * Wed Jul 23 2008 Rex Dieter 1.0-0.8.rc1 - automoc4-0.9.84 (1.0-rc1) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jul 2008 19:19:08 -0000 1.3 +++ .cvsignore 26 Jul 2008 01:20:21 -0000 1.4 @@ -1 +1 @@ -automoc4-0.9.83.tar.bz2 +automoc4-0.9.84.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/automoc/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jul 2008 19:19:08 -0000 1.3 +++ sources 26 Jul 2008 01:20:21 -0000 1.4 @@ -1 +1 @@ -7876af12da90bd357fc547c4f4828603 automoc4-0.9.83.tar.bz2 +6e1167594b8edd0fd2156aad75b4b2b0 automoc4-0.9.84.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 26 01:55:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 01:55:03 +0000 Subject: [pkgdb] grip: wolfy has requested watchcommits Message-ID: <20080726015504.43C0A1AD0E3@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchcommits acl on grip (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grip From fedora-extras-commits at redhat.com Sat Jul 26 01:55:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 01:55:05 +0000 Subject: [pkgdb] grip: wolfy has requested watchbugzilla Message-ID: <20080726015511.068221AD0E9@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchbugzilla acl on grip (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grip From fedora-extras-commits at redhat.com Sat Jul 26 03:48:28 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 26 Jul 2008 03:48:28 GMT Subject: rpms/kernel/devel patch-2.6.26-git13.bz2.sign, NONE, 1.1 .cvsignore, 1.877, 1.878 config-generic, 1.142, 1.143 config-powerpc-generic, 1.23, 1.24 config-x86-generic, 1.45, 1.46 config-x86_64-generic, 1.44, 1.45 kernel.spec, 1.804, 1.805 linux-2.6-powerpc-tracehook.patch, 1.1, 1.2 linux-2.6-sparc64-tracehook.patch, 1.1, 1.2 linux-2.6-tracehook.patch, 1.5, 1.6 linux-2.6-utrace.patch, 1.83, 1.84 linux-2.6-x86-tracehook.patch, 1.1, 1.2 sources, 1.838, 1.839 upstream, 1.755, 1.756 patch-2.6.26-git12.bz2.sign, 1.1, NONE Message-ID: <200807260348.m6Q3mSkw030254@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30116 Modified Files: .cvsignore config-generic config-powerpc-generic config-x86-generic config-x86_64-generic kernel.spec linux-2.6-powerpc-tracehook.patch linux-2.6-sparc64-tracehook.patch linux-2.6-tracehook.patch linux-2.6-utrace.patch linux-2.6-x86-tracehook.patch sources upstream Added Files: patch-2.6.26-git13.bz2.sign Removed Files: patch-2.6.26-git12.bz2.sign Log Message: * Fri Jul 25 2008 Roland McGrath - 2.6.26-git13 - utrace update --- NEW FILE patch-2.6.26-git13.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIiiN8yGugalF9Dw4RAsdqAJ9mrMLQB+RR0uwUFELc9JC9GKF2PwCglcek V9etYb3apC5uuUhAuvHxsE8= =h+gH -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.877 retrieving revision 1.878 diff -u -r1.877 -r1.878 --- .cvsignore 25 Jul 2008 16:21:10 -0000 1.877 +++ .cvsignore 26 Jul 2008 03:47:27 -0000 1.878 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git12.bz2 +patch-2.6.26-git13.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- config-generic 25 Jul 2008 16:21:10 -0000 1.142 +++ config-generic 26 Jul 2008 03:47:28 -0000 1.143 @@ -420,6 +420,7 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_NET=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_VIRTIO_CONSOLE=m # # SCSI device support @@ -3631,3 +3632,6 @@ # FIXME: This should be x86/ia64 only # CONFIG_HP_ILO is not set +# CONFIG_GPIOLIB is not set + +CONFIG_HP_WMI=m Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- config-powerpc-generic 21 Jul 2008 19:45:13 -0000 1.23 +++ config-powerpc-generic 26 Jul 2008 03:47:28 -0000 1.24 @@ -248,8 +248,11 @@ # CONFIG_MT9V022_PCA9536_SWITCH is not set # CONFIG_LEDS_GPIO is not set # CONFIG_KGDB_CONSOLE is not set +# CONFIG_GPIO_SYSFS is not set +# CONFIG_GPIO_MAX732X is not set CONFIG_MDIO_OF_GPIO=m CONFIG_SERIO_XILINX_XPS_PS2=m +# CONFIG_PPC_SMLPAR is not set Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- config-x86-generic 25 Jul 2008 16:21:10 -0000 1.45 +++ config-x86-generic 26 Jul 2008 03:47:28 -0000 1.46 @@ -287,6 +287,7 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m CONFIG_EDAC_R82600=m CONFIG_SCHED_MC=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- config-x86_64-generic 25 Jul 2008 16:21:10 -0000 1.44 +++ config-x86_64-generic 26 Jul 2008 03:47:28 -0000 1.45 @@ -179,6 +179,7 @@ CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I82860=m CONFIG_EDAC_I82975X=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.804 retrieving revision 1.805 diff -u -r1.804 -r1.805 --- kernel.spec 25 Jul 2008 16:21:10 -0000 1.804 +++ kernel.spec 26 Jul 2008 03:47:28 -0000 1.805 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 12 +%define gitrev 13 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1696,6 +1696,13 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Fri Jul 25 2008 Roland McGrath +- 2.6.26-git13 +- utrace update + +* Fri Jul 25 2008 unknown +- 2.6.26-git13 + * Fri Jul 25 2008 Dave Jones - 2.6.26-git12 linux-2.6-powerpc-tracehook.patch: Index: linux-2.6-powerpc-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-powerpc-tracehook.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-powerpc-tracehook.patch 24 Jul 2008 08:28:26 -0000 1.1 +++ linux-2.6-powerpc-tracehook.patch 26 Jul 2008 03:47:28 -0000 1.2 @@ -10,10 +10,10 @@ 9 files changed, 169 insertions(+), 37 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 737ebf9..8f2c5c7 100644 +index fe88418..587da5e 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -114,6 +114,7 @@ config PPC +@@ -117,6 +117,7 @@ config PPC select HAVE_KPROBES select HAVE_ARCH_KGDB select HAVE_KRETPROBES @@ -22,7 +22,7 @@ select HAVE_DMA_ATTRS if PPC64 select USE_GENERIC_SMP_HELPERS if SMP diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S -index da52269..1cbbf70 100644 +index 81c8324..3e7445e 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -343,7 +343,12 @@ syscall_dotrace: @@ -79,7 +79,7 @@ b .ret_from_except diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c -index 8feb93e..a704603 100644 +index a5d0e78..9171316 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -22,6 +22,7 @@ @@ -91,7 +91,7 @@ #include #include @@ -706,12 +707,29 @@ void user_enable_single_step(struct task - task->thread.dbcr0 = DBCR0_IDM | DBCR0_IC; + task->thread.dbcr0 |= DBCR0_IDM | DBCR0_IC; regs->msr |= MSR_DE; #else + regs->msr &= ~MSR_BE; @@ -120,8 +120,8 @@ void user_disable_single_step(struct task_struct *task) { struct pt_regs *regs = task->thread.regs; -@@ -721,7 +739,7 @@ void user_disable_single_step(struct tas - task->thread.dbcr0 = 0; +@@ -728,7 +746,7 @@ void user_disable_single_step(struct tas + task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_IDM); regs->msr &= ~MSR_DE; #else - regs->msr &= ~MSR_SE; @@ -129,7 +129,7 @@ #endif } clear_tsk_thread_flag(task, TIF_SINGLESTEP); -@@ -953,31 +971,24 @@ long arch_ptrace(struct task_struct *chi +@@ -1013,31 +1031,24 @@ long arch_ptrace(struct task_struct *chi return ret; } @@ -175,7 +175,7 @@ if (unlikely(current->audit_context)) { #ifdef CONFIG_PPC64 -@@ -995,16 +1006,19 @@ void do_syscall_trace_enter(struct pt_re +@@ -1055,16 +1066,19 @@ void do_syscall_trace_enter(struct pt_re regs->gpr[5] & 0xffffffff, regs->gpr[6] & 0xffffffff); } @@ -200,7 +200,7 @@ + tracehook_report_syscall_exit(regs, step); } diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c -index ad55488..e032336 100644 +index 7aada78..060d2a8 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -9,7 +9,7 @@ @@ -221,7 +221,7 @@ { siginfo_t info; int signr; -@@ -173,11 +173,28 @@ int do_signal(sigset_t *oldset, struct p +@@ -177,11 +177,28 @@ int do_signal(sigset_t *oldset, struct p * its frame, and we can clear the TLF_RESTORE_SIGMASK flag. */ current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK; @@ -384,10 +384,10 @@ + +#endif /* _ASM_SYSCALL_H */ diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h -index b705c2a..a52d62e 100644 +index a9db562..9665a26 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h -@@ -116,6 +116,7 @@ static inline struct thread_info *curren +@@ -108,6 +108,7 @@ static inline struct thread_info *curren #define TIF_SECCOMP 10 /* secure computing */ #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */ #define TIF_NOERROR 12 /* Force successful syscall return */ @@ -395,7 +395,7 @@ #define TIF_FREEZE 14 /* Freezing for suspend */ #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ #define TIF_ABI_PENDING 16 /* 32/64 bit switch needed */ -@@ -133,12 +134,14 @@ static inline struct thread_info *curren +@@ -125,12 +126,14 @@ static inline struct thread_info *curren #define _TIF_SECCOMP (1<p); @@ -128,7 +128,7 @@ out: kfree(loc); diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c -index d051a32..1280d5d 100644 +index 1b59b1e..fdeadab 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -433,13 +433,6 @@ static int load_elf_fdpic_binary(struct @@ -173,10 +173,10 @@ /* error cleanup */ diff --git a/fs/exec.c b/fs/exec.c -index fd92343..346db53 100644 +index 5e55901..b8792a1 100644 --- a/fs/exec.c +++ b/fs/exec.c -@@ -43,7 +43,6 @@ +@@ -42,13 +42,13 @@ #include #include #include @@ -184,7 +184,6 @@ #include #include #include -@@ -51,6 +50,7 @@ #include #include #include @@ -192,7 +191,7 @@ #include #include -@@ -1075,13 +1075,8 @@ EXPORT_SYMBOL(prepare_binprm); +@@ -1071,13 +1071,8 @@ EXPORT_SYMBOL(prepare_binprm); static int unsafe_exec(struct task_struct *p) { @@ -208,7 +207,7 @@ if (atomic_read(&p->fs->count) > 1 || atomic_read(&p->files->count) > 1 || atomic_read(&p->sighand->count) > 1) -@@ -1218,6 +1213,7 @@ int search_binary_handler(struct linux_b +@@ -1214,6 +1209,7 @@ int search_binary_handler(struct linux_b read_unlock(&binfmt_lock); retval = fn(bprm, regs); if (retval >= 0) { @@ -244,7 +243,7 @@ "State:\t%s\n" "Tgid:\t%d\n" diff --git a/fs/proc/base.c b/fs/proc/base.c -index 58c3e6a..6c950c7 100644 +index a891fe4..81bce67 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -69,6 +69,7 @@ @@ -301,7 +300,7 @@ /************************************************************************/ /* Here the fs part begins */ /************************************************************************/ -@@ -2420,6 +2445,9 @@ static const struct pid_entry tgid_base_ +@@ -2473,6 +2498,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, pid_sched), #endif @@ -311,7 +310,7 @@ INF("cmdline", S_IRUGO, pid_cmdline), ONE("stat", S_IRUGO, tgid_stat), ONE("statm", S_IRUGO, pid_statm), -@@ -2752,6 +2780,9 @@ static const struct pid_entry tid_base_s +@@ -2805,6 +2833,9 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, pid_sched), #endif @@ -559,10 +558,10 @@ #endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index dc7e592..fdcd427 100644 +index 42036ff..99036d5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1795,7 +1795,7 @@ extern int kill_pid_info_as_uid(int, str +@@ -1797,7 +1797,7 @@ extern int kill_pid_info_as_uid(int, str extern int kill_pgrp(struct pid *pid, int sig, int priv); extern int kill_pid(struct pid *pid, int sig, int priv); extern int kill_proc_info(int, struct siginfo *, pid_t); @@ -571,7 +570,7 @@ extern void force_sig(int, struct task_struct *); extern void force_sig_specific(int, struct task_struct *); extern int send_sig(int, struct task_struct *, int); -@@ -1882,9 +1882,13 @@ extern void set_task_comm(struct task_st +@@ -1883,9 +1883,13 @@ extern void set_task_comm(struct task_st extern char *get_task_comm(char *to, struct task_struct *tsk); #ifdef CONFIG_SMP @@ -589,10 +588,10 @@ #define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks) diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h new file mode 100644 -index ...589f429 100644 +index ...b187558 100644 --- /dev/null +++ b/include/linux/tracehook.h -@@ -0,0 +1,575 @@ +@@ -0,0 +1,576 @@ +/* + * Tracing hooks + * @@ -839,7 +838,7 @@ + * tracehook_finish_clone - new child created and being attached + * @child: new child task + * @clone_flags: %CLONE_* flags from clone/fork/vfork system call -+ * @trace: return value from tracehook_clone_prepare() ++ * @trace: return value from tracehook_prepare_clone() + * + * This is called immediately after adding @child to its parent's children list. + * The @trace value is that returned by tracehook_prepare_clone(). @@ -854,19 +853,20 @@ + +/** + * tracehook_report_clone - in parent, new child is about to start running -+ * @trace: return value from tracehook_clone_prepare() ++ * @trace: return value from tracehook_prepare_clone() + * @regs: parent's user register state + * @clone_flags: flags from parent's system call + * @pid: new child's PID in the parent's namespace + * @child: new child task + * -+ * Called after a child is set up, but before it has been started running. -+ * The @trace value is that returned by tracehook_clone_prepare(). -+ * This is not a good place to block, because the child has not started yet. -+ * Suspend the child here if desired, and block in tracehook_clone_complete(). -+ * This must prevent the child from self-reaping if tracehook_clone_complete() -+ * uses the @child pointer; otherwise it might have died and been released by -+ * the time tracehook_report_clone_complete() is called. ++ * Called after a child is set up, but before it has been started ++ * running. @trace is the value returned by tracehook_prepare_clone(). ++ * This is not a good place to block, because the child has not started ++ * yet. Suspend the child here if desired, and then block in ++ * tracehook_report_clone_complete(). This must prevent the child from ++ * self-reaping if tracehook_report_clone_complete() uses the @child ++ * pointer; otherwise it might have died and been released by the time ++ * tracehook_report_report_clone_complete() is called. + * + * Called with no locks held, but the child cannot run until this returns. + */ @@ -885,7 +885,7 @@ + +/** + * tracehook_report_clone_complete - new child is running -+ * @trace: return value from tracehook_clone_prepare() ++ * @trace: return value from tracehook_prepare_clone() + * @regs: parent's user register state + * @clone_flags: flags from parent's system call + * @pid: new child's PID in the parent's namespace @@ -942,7 +942,7 @@ +} + +/** -+ * tracehook_finish_release_task - task is being reaped, clean up tracing ++ * tracehook_finish_release_task - final tracing clean-up + * @task: task in %EXIT_DEAD state + * + * This is called in release_task() when @task is being in the middle of @@ -1169,7 +1169,7 @@ + +#endif /* */ diff --git a/kernel/exit.c b/kernel/exit.c -index 93d2711..78c6307 100644 +index ad933bb..6cdf607 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -46,6 +46,7 @@ @@ -1180,7 +1180,7 @@ #include #include -@@ -152,27 +153,17 @@ static void delayed_put_task_struct(stru +@@ -162,27 +163,17 @@ static void delayed_put_task_struct(stru put_task_struct(container_of(rhp, struct task_struct, rcu)); } @@ -1210,7 +1210,7 @@ __exit_signal(p); /* -@@ -194,6 +185,13 @@ repeat: +@@ -204,6 +195,13 @@ repeat: * that case. */ zap_leader = task_detached(leader); @@ -1224,7 +1224,7 @@ } write_unlock_irq(&tasklist_lock); -@@ -863,7 +861,8 @@ static void forget_original_parent(struc +@@ -887,7 +885,8 @@ static void forget_original_parent(struc */ static void exit_notify(struct task_struct *tsk, int group_dead) { @@ -1234,7 +1234,7 @@ /* * This does two things: -@@ -900,22 +899,11 @@ static void exit_notify(struct task_stru +@@ -924,22 +923,11 @@ static void exit_notify(struct task_stru !capable(CAP_KILL)) tsk->exit_signal = SIGCHLD; @@ -1262,7 +1262,7 @@ /* mt-exec, de_thread() is waiting for us */ if (thread_group_leader(tsk) && -@@ -925,8 +913,10 @@ static void exit_notify(struct task_stru +@@ -949,8 +937,10 @@ static void exit_notify(struct task_stru write_unlock_irq(&tasklist_lock); @@ -1274,7 +1274,7 @@ release_task(tsk); } -@@ -1005,10 +995,7 @@ NORET_TYPE void do_exit(long code) +@@ -1029,10 +1019,7 @@ NORET_TYPE void do_exit(long code) if (unlikely(!tsk->pid)) panic("Attempted to kill the idle task!"); @@ -1287,10 +1287,10 @@ /* * We're taking recursive faults here in do_exit. Safest is to just diff --git a/kernel/fork.c b/kernel/fork.c -index adefc11..5345b7d 100644 +index b99d73e..ad16f32 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -55,6 +55,7 @@ +@@ -56,6 +56,7 @@ #include #include #include @@ -1298,7 +1298,7 @@ #include #include -@@ -833,8 +834,7 @@ static void copy_flags(unsigned long clo +@@ -865,8 +866,7 @@ static void copy_flags(unsigned long clo new_flags &= ~PF_SUPERPRIV; new_flags |= PF_FORKNOEXEC; @@ -1308,7 +1308,7 @@ p->flags = new_flags; clear_freeze_flag(p); } -@@ -875,7 +875,8 @@ static struct task_struct *copy_process( +@@ -907,7 +907,8 @@ static struct task_struct *copy_process( struct pt_regs *regs, unsigned long stack_size, int __user *child_tidptr, @@ -1318,7 +1318,7 @@ { int retval; struct task_struct *p; -@@ -1125,8 +1126,6 @@ static struct task_struct *copy_process( +@@ -1163,8 +1164,6 @@ static struct task_struct *copy_process( */ p->group_leader = p; INIT_LIST_HEAD(&p->thread_group); @@ -1327,7 +1327,7 @@ /* Now that the task is set up, run cgroup callbacks if * necessary. We need to run them before the task is visible -@@ -1157,7 +1156,6 @@ static struct task_struct *copy_process( +@@ -1195,7 +1194,6 @@ static struct task_struct *copy_process( p->real_parent = current->real_parent; else p->real_parent = current; @@ -1335,7 +1335,7 @@ spin_lock(¤t->sighand->siglock); -@@ -1199,8 +1197,7 @@ static struct task_struct *copy_process( +@@ -1237,8 +1235,7 @@ static struct task_struct *copy_process( if (likely(p->pid)) { list_add_tail(&p->sibling, &p->real_parent->children); @@ -1345,7 +1345,7 @@ if (thread_group_leader(p)) { if (clone_flags & CLONE_NEWPID) -@@ -1285,29 +1282,13 @@ struct task_struct * __cpuinit fork_idle +@@ -1323,29 +1320,13 @@ struct task_struct * __cpuinit fork_idle struct pt_regs regs; task = copy_process(CLONE_VM, 0, idle_regs(®s), 0, NULL, @@ -1376,7 +1376,7 @@ /* * Ok, this is the main fork-routine. * -@@ -1342,14 +1323,14 @@ long do_fork(unsigned long clone_flags, +@@ -1380,14 +1361,14 @@ long do_fork(unsigned long clone_flags, } } @@ -1397,7 +1397,7 @@ /* * Do this prior waking up the new thread - the thread pointer * might get invalid after that point, if the thread exits quickly. -@@ -1367,32 +1348,35 @@ long do_fork(unsigned long clone_flags, +@@ -1405,32 +1386,35 @@ long do_fork(unsigned long clone_flags, init_completion(&vfork); } @@ -1448,7 +1448,7 @@ } else { nr = PTR_ERR(p); diff --git a/kernel/kthread.c b/kernel/kthread.c -index ac3fb73..88538db 100644 +index 6111c27..96cff2f 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -176,7 +176,7 @@ void kthread_bind(struct task_struct *k, @@ -1474,7 +1474,7 @@ /* All systems go.. */ return ret; diff --git a/kernel/sched.c b/kernel/sched.c -index 6acf749..dfb65bd 100644 +index 0047bd9..efc615f 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1867,16 +1867,24 @@ migrate_task(struct task_struct *p, int @@ -1548,7 +1548,7 @@ /*** diff --git a/kernel/signal.c b/kernel/signal.c -index 6c0958e..44b5823 100644 +index 82c3545..954f77d 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -22,6 +22,7 @@ @@ -1633,7 +1633,7 @@ } -@@ -600,9 +607,6 @@ static int check_kill_permission(int sig +@@ -591,9 +598,6 @@ static int check_kill_permission(int sig return security_task_kill(t, info, sig, 0); } @@ -1643,7 +1643,7 @@ /* * Handle magic process-wide effects of stop/continue signals. Unlike * the signal actions, these happen immediately at signal-generation -@@ -765,7 +769,8 @@ static void complete_signal(int sig, str +@@ -756,7 +760,8 @@ static void complete_signal(int sig, str if (sig_fatal(p, sig) && !(signal->flags & (SIGNAL_UNKILLABLE | SIGNAL_GROUP_EXIT)) && !sigismember(&t->real_blocked, sig) && @@ -1653,7 +1653,7 @@ /* * This signal will be fatal to the whole group. */ -@@ -1343,9 +1348,11 @@ static inline void __wake_up_parent(stru +@@ -1323,9 +1328,11 @@ static inline void __wake_up_parent(stru /* * Let a parent know about the death of a child. * For a stopped/continued status change, use do_notify_parent_cldstop instead. @@ -1667,7 +1667,7 @@ { struct siginfo info; unsigned long flags; -@@ -1417,12 +1424,14 @@ void do_notify_parent(struct task_struct +@@ -1396,12 +1403,14 @@ void do_notify_parent(struct task_struct */ tsk->exit_signal = -1; if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) @@ -1683,7 +1683,7 @@ } static void do_notify_parent_cldstop(struct task_struct *tsk, int why) -@@ -1623,7 +1632,7 @@ finish_stop(int stop_count) +@@ -1599,7 +1608,7 @@ finish_stop(int stop_count) * a group stop in progress and we are the last to stop, * report to the parent. When ptraced, every thread reports itself. */ @@ -1692,7 +1692,7 @@ read_lock(&tasklist_lock); do_notify_parent_cldstop(current, CLD_STOPPED); read_unlock(&tasklist_lock); -@@ -1760,6 +1769,9 @@ relock: +@@ -1735,6 +1744,9 @@ relock: signal->flags &= ~SIGNAL_CLD_MASK; spin_unlock_irq(&sighand->siglock); @@ -1702,7 +1702,7 @@ read_lock(&tasklist_lock); do_notify_parent_cldstop(current->group_leader, why); read_unlock(&tasklist_lock); -@@ -1773,17 +1785,33 @@ relock: +@@ -1748,17 +1760,33 @@ relock: do_signal_stop(0)) goto relock; @@ -1743,7 +1743,7 @@ if (ka->sa.sa_handler == SIG_IGN) /* Do nothing. */ continue; if (ka->sa.sa_handler != SIG_DFL) { -@@ -1831,7 +1859,7 @@ relock: +@@ -1806,7 +1834,7 @@ relock: spin_lock_irq(&sighand->siglock); } @@ -1752,7 +1752,7 @@ /* It released the siglock. */ goto relock; } -@@ -1852,7 +1880,7 @@ relock: +@@ -1827,7 +1855,7 @@ relock: if (sig_kernel_coredump(signr)) { if (print_fatal_signals) @@ -1761,7 +1761,7 @@ /* * If it was able to dump core, this kills all * other threads in the group and synchronizes with -@@ -1861,13 +1889,13 @@ relock: +@@ -1836,13 +1864,13 @@ relock: * first and our do_group_exit call below will use * that value and ignore the one we pass it. */ @@ -1777,7 +1777,7 @@ /* NOTREACHED */ } spin_unlock_irq(&sighand->siglock); -@@ -1909,7 +1937,7 @@ void exit_signals(struct task_struct *ts +@@ -1884,7 +1912,7 @@ void exit_signals(struct task_struct *ts out: spin_unlock_irq(&tsk->sighand->siglock); @@ -1786,15 +1786,15 @@ read_lock(&tasklist_lock); do_notify_parent_cldstop(tsk, CLD_STOPPED); read_unlock(&tasklist_lock); -@@ -1921,7 +1949,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal); +@@ -1895,7 +1923,6 @@ EXPORT_SYMBOL(recalc_sigpending); + EXPORT_SYMBOL_GPL(dequeue_signal); EXPORT_SYMBOL(flush_signals); EXPORT_SYMBOL(force_sig); - EXPORT_SYMBOL(kill_proc); -EXPORT_SYMBOL(ptrace_notify); EXPORT_SYMBOL(send_sig); EXPORT_SYMBOL(send_sig_info); EXPORT_SYMBOL(sigprocmask); -@@ -2325,7 +2352,7 @@ int do_sigaction(int sig, struct k_sigac +@@ -2299,7 +2326,7 @@ int do_sigaction(int sig, struct k_sigac * (for example, SIGCHLD), shall cause the pending signal to * be discarded, whether or not it is blocked" */ @@ -1804,7 +1804,7 @@ sigaddset(&mask, sig); rm_from_queue_full(&mask, &t->signal->shared_pending); diff --git a/lib/Makefile b/lib/Makefile -index 818c4d4..c0bad7f 100644 +index 9085ad6..942c725 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -78,6 +78,8 @@ lib-$(CONFIG_GENERIC_BUG) += bug.o linux-2.6-utrace.patch: Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- linux-2.6-utrace.patch 24 Jul 2008 08:28:26 -0000 1.83 +++ linux-2.6-utrace.patch 26 Jul 2008 03:47:28 -0000 1.84 @@ -4,13 +4,13 @@ include/linux/ptrace.h | 21 + include/linux/sched.h | 6 + include/linux/tracehook.h | 62 + - include/linux/utrace.h | 610 ++++++++++ + include/linux/utrace.h | 616 ++++++++++ init/Kconfig | 27 + kernel/Makefile | 1 + - kernel/ptrace.c | 578 ++++++++++- + kernel/ptrace.c | 578 +++++++++- kernel/signal.c | 14 +- - kernel/utrace.c | 2278 +++++++++++++++++++++++++++++++++++++ - 12 files changed, 4070 insertions(+), 7 deletions(-) + kernel/utrace.c | 2325 +++++++++++++++++++++++++++++++++++++ + 12 files changed, 4123 insertions(+), 7 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 0eb0d02..49a78b7 100644 @@ -27,7 +27,7 @@ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl new file mode 100644 -index ...3e47524 100644 +index ...df6b6ba 100644 --- /dev/null +++ b/Documentation/DocBook/utrace.tmpl @@ -0,0 +1,475 @@ @@ -132,7 +132,7 @@ + from small delays due to the overhead of tracing, to arbitrary + pauses in user code execution when a user stops a thread with a + debugger for examination.) Even when you explicitly want the -+ pertrubation of making the traced thread block, just blocking ++ perturbation of making the traced thread block, just blocking + directly in your callback has more unwanted effects. For example, + the CLONE event callbacks are called when the + new child thread has been created but not yet started running; the @@ -179,7 +179,7 @@ + + + -+ Teardown Races ++ Tear-down Races + + + Ordinarily synchronization issues for tracing engines are kept fairly @@ -226,7 +226,7 @@ + utrace infrastructure provides some special + guarantees about the report_death and + report_reap callbacks. It still takes some care -+ to be sure your tracing engine is robust to teardown races, but these ++ to be sure your tracing engine is robust to tear-down races, but these + rules make it reasonably straightforward and concise to handle a lot of + corner cases correctly. + @@ -280,7 +280,7 @@ + The final sort of guarantee is that a tracing engine will know for sure + whether or not the report_death and/or + report_reap callbacks will be made for a certain -+ thread. These teardown races are disambiguated by the error return ++ thread. These tear-down races are disambiguated by the error return + values of utrace_set_events and + utrace_control. Normally + utrace_control called with @@ -403,7 +403,7 @@ +<filename>System Call Tracing</filename> + + -+ The arch API for syscall information is declared in ++ The arch API for system call information is declared in + <asm/syscall.h>. + Each of these calls can be used only at system call entry tracing, + or can be used only at system call exit and the subsequent safe points @@ -567,10 +567,10 @@ * ptrace_init_task - initialize ptrace state for a new child * @child: new child task diff --git a/include/linux/sched.h b/include/linux/sched.h -index fdcd427..cf215ed 100644 +index 99036d5..3f56a3f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1191,6 +1191,11 @@ struct task_struct { +@@ -1199,6 +1199,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -582,7 +582,7 @@ /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1796,6 +1801,7 @@ extern int kill_pgrp(struct pid *pid, in +@@ -1798,6 +1803,7 @@ extern int kill_pgrp(struct pid *pid, in extern int kill_pid(struct pid *pid, int sig, int priv); extern int kill_proc_info(int, struct siginfo *, pid_t); extern int do_notify_parent(struct task_struct *, int); @@ -591,7 +591,7 @@ extern void force_sig_specific(int, struct task_struct *); extern int send_sig(int, struct task_struct *, int); diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h -index 589f429..d3be4d9 100644 +index b187558..60eca32 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h @@ -49,6 +49,7 @@ @@ -677,7 +677,7 @@ ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace); } -@@ -279,6 +298,8 @@ static inline void tracehook_report_clon +@@ -280,6 +299,8 @@ static inline void tracehook_report_clon unsigned long clone_flags, pid_t pid, struct task_struct *child) { @@ -686,7 +686,7 @@ if (unlikely(trace)) { /* * The child starts up with an immediate SIGSTOP. -@@ -344,6 +365,9 @@ static inline void tracehook_report_vfor +@@ -345,6 +366,9 @@ static inline void tracehook_report_vfor */ static inline void tracehook_prepare_release_task(struct task_struct *task) { @@ -696,7 +696,7 @@ } /** -@@ -357,7 +381,21 @@ static inline void tracehook_prepare_rel +@@ -358,7 +382,21 @@ static inline void tracehook_prepare_rel */ static inline void tracehook_finish_release_task(struct task_struct *task) { @@ -718,7 +718,7 @@ } /** -@@ -379,8 +417,12 @@ static inline void tracehook_signal_hand +@@ -380,8 +418,12 @@ static inline void tracehook_signal_hand const struct k_sigaction *ka, struct pt_regs *regs, int stepping) { @@ -731,7 +731,7 @@ } /** -@@ -399,6 +441,8 @@ static inline int tracehook_consider_ign +@@ -400,6 +442,8 @@ static inline int tracehook_consider_ign int sig, void __user *handler) { @@ -740,7 +740,7 @@ return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -420,6 +464,9 @@ static inline int tracehook_consider_fat +@@ -421,6 +465,9 @@ static inline int tracehook_consider_fat int sig, void __user *handler) { @@ -750,7 +750,7 @@ return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -434,6 +481,8 @@ static inline int tracehook_consider_fat +@@ -435,6 +482,8 @@ static inline int tracehook_consider_fat */ static inline int tracehook_force_sigpending(void) { @@ -759,7 +759,7 @@ return 0; } -@@ -463,6 +512,8 @@ static inline int tracehook_get_signal(s +@@ -464,6 +513,8 @@ static inline int tracehook_get_signal(s siginfo_t *info, struct k_sigaction *return_ka) { @@ -768,7 +768,7 @@ return 0; } -@@ -483,6 +534,8 @@ static inline int tracehook_get_signal(s +@@ -484,6 +535,8 @@ static inline int tracehook_get_signal(s */ static inline int tracehook_notify_jctl(int notify, int why) { @@ -777,7 +777,7 @@ return notify || (current->ptrace & PT_PTRACED); } -@@ -500,6 +553,8 @@ static inline int tracehook_notify_jctl( +@@ -501,6 +554,8 @@ static inline int tracehook_notify_jctl( static inline int tracehook_notify_death(struct task_struct *task, void **death_cookie, int group_dead) { @@ -786,7 +786,7 @@ if (task->exit_signal == -1) return task->ptrace ? SIGCHLD : -1; -@@ -536,6 +591,10 @@ static inline void tracehook_report_deat +@@ -537,6 +592,10 @@ static inline void tracehook_report_deat int signal, void *death_cookie, int group_dead) { @@ -797,7 +797,7 @@ } #ifdef TIF_NOTIFY_RESUME -@@ -569,6 +628,9 @@ static inline void set_notify_resume(str +@@ -570,6 +629,9 @@ static inline void set_notify_resume(str */ static inline void tracehook_notify_resume(struct pt_regs *regs) { @@ -809,10 +809,10 @@ diff --git a/include/linux/utrace.h b/include/linux/utrace.h new file mode 100644 -index ...a925728 100644 +index ...35cc5be 100644 --- /dev/null +++ b/include/linux/utrace.h -@@ -0,0 +1,610 @@ +@@ -0,0 +1,616 @@ +/* + * utrace infrastructure interface for debugging user processes + * @@ -1073,6 +1073,7 @@ + UTRACE_SIGNAL_HANDLER = 0x70 +}; +#define UTRACE_SIGNAL_MASK 0xf0 ++#define UTRACE_SIGNAL_HOLD 0x100 /* Flag, push signal back on queue. */ + +/** + * utrace_signal_action - &enum utrace_signal_action from callback action @@ -1087,8 +1088,6 @@ + return action & UTRACE_SIGNAL_MASK; +} + -+#define UTRACE_SIGNAL_HOLD 0x100 /* Flag, push signal back on queue. */ -+ +/** + * enum utrace_syscall_action - disposition of system call attempt + * @UTRACE_SYSCALL_RUN: Run the system call. @@ -1247,6 +1246,10 @@ + * from the previous callback. In this way, the original signal can + * be left in @info while returning %UTRACE_STOP|%UTRACE_SIGNAL_IGN + * and then found again when resuming @task with %UTRACE_INTERRUPT. ++ * The %UTRACE_SIGNAL_HOLD flag bit can be OR'd into the return value, ++ * and might be in @action if the previous engine returned it. This ++ * flag asks that the signal in @info be pushed back on @task's queue ++ * so that it will be seen again after whatever action is taken now. + * + * @report_clone: + * Requested by %UTRACE_EVENT(%CLONE). @@ -1265,9 +1268,12 @@ + * + * @report_jctl: + * Requested by %UTRACE_EVENT(%JCTL). -+ * Job control event; @type is %CLD_STOPPED or %CLD_CONTINUED. -+ * If @notify is true, @task is the last thread to stop -+ * and so will send %SIGCHLD to its parent after this callback. ++ * Job control event; @type is %CLD_STOPPED or %CLD_CONTINUED, ++ * indicating whether we are stopping or resuming now. If @notify ++ * is nonzero, @task is the last thread to stop and so will send ++ * %SIGCHLD to its parent after this callback; @notify reflects ++ * what the parent's %SIGCHLD has in @si_code, which can sometimes ++ * be %CLD_STOPPED even when @type is %CLD_CONTINUED. + * + * @report_exec: + * Requested by %UTRACE_EVENT(%EXEC). @@ -1372,7 +1378,7 @@ + u32 (*report_jctl)(enum utrace_resume_action action, + struct utrace_attached_engine *engine, + struct task_struct *task, -+ bool notify, int type); ++ int type, int notify); + u32 (*report_exec)(enum utrace_resume_action action, + struct utrace_attached_engine *engine, + struct task_struct *task, @@ -1462,10 +1468,10 @@ config PREEMPT_NOTIFIERS diff --git a/kernel/Makefile b/kernel/Makefile -index 15ab63f..4a40793 100644 +index 54f6983..ff15d4d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -63,6 +63,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o +@@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o obj-$(CONFIG_STOP_MACHINE) += stop_machine.o obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o @@ -2156,10 +2162,10 @@ } diff --git a/kernel/signal.c b/kernel/signal.c -index 44b5823..2760cf3 100644 +index 954f77d..c7a2aca 100644 --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -1434,7 +1434,7 @@ int do_notify_parent(struct task_struct +@@ -1413,7 +1413,7 @@ int do_notify_parent(struct task_struct return sig; } @@ -2168,7 +2174,7 @@ { struct siginfo info; unsigned long flags; -@@ -1490,6 +1490,8 @@ static void do_notify_parent_cldstop(str +@@ -1468,6 +1468,8 @@ static void do_notify_parent_cldstop(str spin_unlock_irqrestore(&sighand->siglock, flags); } @@ -2177,7 +2183,7 @@ static inline int may_ptrace_stop(void) { if (!likely(current->ptrace & PT_PTRACED)) -@@ -1624,6 +1626,8 @@ void ptrace_notify(int exit_code) +@@ -1600,6 +1602,8 @@ void ptrace_notify(int exit_code) spin_unlock_irq(¤t->sighand->siglock); } @@ -2186,7 +2192,7 @@ static void finish_stop(int stop_count) { -@@ -1702,6 +1706,7 @@ static int do_signal_stop(int signr) +@@ -1677,6 +1681,7 @@ static int do_signal_stop(int signr) return 1; } @@ -2194,7 +2200,7 @@ static int ptrace_signal(int signr, siginfo_t *info, struct pt_regs *regs, void *cookie) { -@@ -1740,6 +1745,13 @@ static int ptrace_signal(int signr, sigi +@@ -1715,6 +1720,13 @@ static int ptrace_signal(int signr, sigi return signr; } @@ -2210,10 +2216,10 @@ struct pt_regs *regs, void *cookie) diff --git a/kernel/utrace.c b/kernel/utrace.c new file mode 100644 -index ...c9f5dad 100644 +index ...0555597 100644 --- /dev/null +++ b/kernel/utrace.c -@@ -0,0 +1,2278 @@ +@@ -0,0 +1,2325 @@ +/* + * utrace infrastructure interface for debugging user processes + * @@ -3364,24 +3370,33 @@ + /* + * Make the thread call tracehook_get_signal() soon. + */ -+ if (!utrace->interrupt) { -+ utrace->interrupt = 1; ++ if (utrace->interrupt) ++ break; ++ utrace->interrupt = 1; ++ ++ /* ++ * If it's not already stopped, interrupt it now. ++ * We need the siglock here in case it calls ++ * recalc_sigpending() and clears its own ++ * TIF_SIGPENDING. By taking the lock, we've ++ * serialized any later recalc_sigpending() after ++ * our setting of utrace->interrupt to force it on. ++ */ ++ if (resume) { + /* -+ * If it's not already stopped, interrupt it now. -+ * We need the siglock here in case it calls -+ * recalc_sigpending() and clears its own -+ * TIF_SIGPENDING. By taking the lock, we've -+ * serialized any later recalc_sigpending() after -+ * our setting of utrace->interrupt to force it on. ++ * This is really just to keep the invariant ++ * that TIF_SIGPENDING is set with utrace->interrupt. ++ * When it's stopped, we know it's always going ++ * through utrace_get_signal and will recalculate. + */ -+ if (!resume) { -+ struct sighand_struct *sighand; -+ unsigned long irqflags; -+ sighand = lock_task_sighand(target, &irqflags); -+ if (likely(sighand)) { -+ signal_wake_up(target, 0); -+ unlock_task_sighand(target, &irqflags); -+ } ++ set_tsk_thread_flag(target, TIF_SIGPENDING); ++ } else { ++ struct sighand_struct *sighand; ++ unsigned long irqflags; ++ sighand = lock_task_sighand(target, &irqflags); ++ if (likely(sighand)) { ++ signal_wake_up(target, 0); ++ unlock_task_sighand(target, &irqflags); + } + } + break; @@ -3713,37 +3728,39 @@ + INIT_REPORT(report); + bool was_stopped = task_is_stopped(task); + -+ if (was_stopped) { -+ /* -+ * While in TASK_STOPPED, we can be considered safely -+ * stopped by utrace_do_stop() and detached asynchronously. -+ * If we woke up and checked task->utrace_flags before that -+ * was finished, we might be here with utrace already -+ * removed or in the middle of being removed. -+ * -+ * RCU makes it safe to get the utrace->lock even if it's -+ * being freed. Once we have that lock, either an external -+ * detach has finished and this struct has been freed, or -+ * else we know we are excluding any other detach attempt. -+ * -+ * If we are indeed attached, then make sure we are no -+ * longer considered stopped while we run callbacks. -+ */ ++ /* ++ * We get here with CLD_STOPPED when we've just entered ++ * TASK_STOPPED, or with CLD_CONTINUED when we've just come ++ * out but not yet been through utrace_get_signal() again. ++ * ++ * While in TASK_STOPPED, we can be considered safely ++ * stopped by utrace_do_stop() and detached asynchronously. ++ * If we woke up and checked task->utrace_flags before that ++ * was finished, we might be here with utrace already ++ * removed or in the middle of being removed. ++ * ++ * RCU makes it safe to get the utrace->lock even if it's ++ * being freed. Once we have that lock, either an external ++ * detach has finished and this struct has been freed, or ++ * else we know we are excluding any other detach attempt. ++ * ++ * If we are indeed attached, then make sure we are no ++ * longer considered stopped while we run callbacks. ++ */ ++ rcu_read_lock(); ++ utrace = rcu_dereference(task->utrace); ++ if (unlikely(!utrace)) { + rcu_read_lock(); -+ utrace = rcu_dereference(task->utrace); -+ if (unlikely(!utrace)) { -+ rcu_read_lock(); -+ return; -+ } -+ spin_lock(&utrace->lock); -+ utrace->stopped = 0; -+ utrace->report = 0; -+ spin_unlock(&utrace->lock); -+ rcu_read_unlock(); ++ return; + } ++ spin_lock(&utrace->lock); ++ utrace->stopped = 0; ++ utrace->report = 0; ++ spin_unlock(&utrace->lock); ++ rcu_read_unlock(); + + REPORT(task, utrace, &report, UTRACE_EVENT(JCTL), -+ report_jctl, notify, what); ++ report_jctl, was_stopped ? CLD_STOPPED : CLD_CONTINUED, what); + + if (was_stopped && !task_is_stopped(task)) { + /* @@ -3953,6 +3970,35 @@ +} + +/* ++ * Take the siglock and push @info back on our queue. ++ * Returns with @task->sighand->siglock held. ++ */ ++static void push_back_signal(struct task_struct *task, siginfo_t *info) ++ __acquires(task->sighand->siglock) ++{ ++ struct sigqueue *q; ++ ++ if (unlikely(!info->si_signo)) { /* Oh, a wise guy! */ ++ spin_lock_irq(&task->sighand->siglock); ++ return; ++ } ++ ++ q = sigqueue_alloc(); ++ if (likely(q)) { ++ q->flags = 0; ++ copy_siginfo(&q->info, info); ++ } ++ ++ spin_lock_irq(&task->sighand->siglock); ++ ++ sigaddset(&task->pending.signal, info->si_signo); ++ if (likely(q)) ++ list_add(&q->list, &task->pending.list); ++ ++ set_tsk_thread_flag(task, TIF_SIGPENDING); ++} ++ ++/* + * This is the hook from the signals code, called with the siglock held. + * Here is the ideal place to stop. We also dequeue and intercept signals. + */ @@ -3967,8 +4013,7 @@ + struct utrace_attached_engine *engine, *next; + const struct utrace_engine_ops *ops; + unsigned long event, want; -+ enum utrace_signal_action action; -+ enum utrace_resume_action resume; ++ u32 ret; + int signr; + + /* @@ -4012,11 +4057,11 @@ + splice_attaching(utrace); + + if (unlikely(!utrace->interrupt) && unlikely(!utrace->report)) -+ action = UTRACE_SIGNAL_IGN; ++ report.result = UTRACE_SIGNAL_IGN; + else if (utrace->signal_handler) -+ action = UTRACE_SIGNAL_HANDLER; ++ report.result = UTRACE_SIGNAL_HANDLER; + else -+ action = UTRACE_SIGNAL_REPORT; ++ report.result = UTRACE_SIGNAL_REPORT; + + /* + * We are now making the report and it's on the @@ -4024,9 +4069,19 @@ + */ + utrace->interrupt = utrace->report = utrace->signal_handler = 0; + ++ /* ++ * Make sure signal_pending() only returns true ++ * if there are real signals pending. ++ */ ++ if (signal_pending(task)) { ++ spin_lock_irq(&task->sighand->siglock); ++ recalc_sigpending(); ++ spin_unlock_irq(&task->sighand->siglock); ++ } ++ + spin_unlock(&utrace->lock); + -+ if (unlikely(action == UTRACE_SIGNAL_IGN)) ++ if (unlikely(report.result == UTRACE_SIGNAL_IGN)) + /* + * We only got here to clear utrace->signal_handler. + */ @@ -4102,25 +4157,25 @@ + + if (ka->sa.sa_handler == SIG_IGN) { + event = UTRACE_EVENT(SIGNAL_IGN); -+ action = UTRACE_SIGNAL_IGN; ++ report.result = UTRACE_SIGNAL_IGN; + } else if (ka->sa.sa_handler != SIG_DFL) { + event = UTRACE_EVENT(SIGNAL); -+ action = UTRACE_SIGNAL_DELIVER; ++ report.result = UTRACE_SIGNAL_DELIVER; + } else if (sig_kernel_coredump(signr)) { + event = UTRACE_EVENT(SIGNAL_CORE); -+ action = UTRACE_SIGNAL_CORE; ++ report.result = UTRACE_SIGNAL_CORE; + } else if (sig_kernel_ignore(signr)) { + event = UTRACE_EVENT(SIGNAL_IGN); -+ action = UTRACE_SIGNAL_IGN; ++ report.result = UTRACE_SIGNAL_IGN; + } else if (signr == SIGSTOP) { + event = UTRACE_EVENT(SIGNAL_STOP); -+ action = UTRACE_SIGNAL_STOP; ++ report.result = UTRACE_SIGNAL_STOP; + } else if (sig_kernel_stop(signr)) { + event = UTRACE_EVENT(SIGNAL_STOP); -+ action = UTRACE_SIGNAL_TSTP; ++ report.result = UTRACE_SIGNAL_TSTP; + } else { + event = UTRACE_EVENT(SIGNAL_TERM); -+ action = UTRACE_SIGNAL_TERM; ++ report.result = UTRACE_SIGNAL_TERM; + } + + /* @@ -4152,26 +4207,28 @@ + if ((want & (event | UTRACE_EVENT(QUIESCE))) == 0) + continue; + -+ if (ops->report_signal) { -+ u32 ret = action | report.action; -+ ret = (*ops->report_signal)(ret, engine, task, -+ regs, info, ka, return_ka); -+ action = utrace_signal_action(ret); -+ resume = utrace_resume_action(ret); -+ } else { -+ resume = (*ops->report_quiesce)(report.action, -+ engine, task, event); -+ } ++ if (ops->report_signal) ++ ret = (*ops->report_signal)( ++ report.result | report.action, engine, task, ++ regs, info, ka, return_ka); ++ else ++ ret = (report.result | (*ops->report_quiesce)( ++ report.action, engine, task, event)); + + /* + * Avoid a tight loop reporting again and again if some + * engine is too stupid. + */ -+ if (unlikely(resume == UTRACE_INTERRUPT) || -+ unlikely(resume == UTRACE_REPORT)) -+ resume = UTRACE_RESUME; ++ switch (utrace_resume_action(ret)) { ++ default: ++ break; ++ case UTRACE_INTERRUPT: ++ case UTRACE_REPORT: ++ ret = (ret & ~UTRACE_RESUME_MASK) | UTRACE_RESUME; ++ break; ++ } + -+ finish_callback(utrace, &report, engine, resume); ++ finish_callback(utrace, &report, engine, ret); + } + + /* @@ -4180,7 +4237,7 @@ + * Our caller uses our return value (signr) to decide what to + * do, but uses info->si_signo as the signal number to report. + */ -+ switch (action) { ++ switch (utrace_signal_action(report.result)) { + case UTRACE_SIGNAL_TERM: + signr = SIGTERM; + break; @@ -4222,7 +4279,10 @@ + set_tsk_thread_flag(task, TIF_SIGPENDING); + } + -+ spin_lock_irq(&task->sighand->siglock); ++ if (unlikely(report.result & UTRACE_SIGNAL_HOLD)) ++ push_back_signal(task, info); ++ else ++ spin_lock_irq(&task->sighand->siglock); + + /* + * We do the SA_ONESHOT work here since the @@ -4272,27 +4332,20 @@ + return signr; + } + ++ if (unlikely(report.result & UTRACE_SIGNAL_HOLD)) { ++ push_back_signal(task, info); ++ spin_unlock_irq(&task->sighand->siglock); ++ } ++ + return -1; + } + + return_ka->sa.sa_handler = SIG_DFL; + -+#ifdef XXX -+ if (action & UTRACE_SIGNAL_HOLD) { -+ struct sigqueue *q = sigqueue_alloc(); -+ if (likely(q != NULL)) { -+ q->flags = 0; -+ copy_siginfo(&q->info, info); -+ } -+ action &= ~UTRACE_SIGNAL_HOLD; -+ spin_lock_irq(&tsk->sighand->siglock); -+ sigaddset(&tsk->pending.signal, info->si_signo); -+ if (likely(q != NULL)) -+ list_add(&q->list, &tsk->pending.list); -+ } -+#endif -+ -+ spin_lock_irq(&task->sighand->siglock); ++ if (unlikely(report.result & UTRACE_SIGNAL_HOLD)) ++ push_back_signal(task, info); ++ else ++ spin_lock_irq(&task->sighand->siglock); + + if (sig_kernel_stop(signr)) + task->signal->flags |= SIGNAL_STOP_DEQUEUED; @@ -4383,7 +4436,7 @@ +EXPORT_SYMBOL_GPL(utrace_prepare_examine); + +/** -+ * utrace_finish_examine - prepare to examine thread state ++ * utrace_finish_examine - complete an examination of thread state + * @target: thread of interest, a &struct task_struct pointer + * @engine: engine pointer returned by utrace_attach() + * @exam: pointer passed to utrace_prepare_examine() call linux-2.6-x86-tracehook.patch: Index: linux-2.6-x86-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-tracehook.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-x86-tracehook.patch 24 Jul 2008 08:28:26 -0000 1.1 +++ linux-2.6-x86-tracehook.patch 26 Jul 2008 03:47:28 -0000 1.2 @@ -8,17 +8,17 @@ 7 files changed, 248 insertions(+), 66 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 03980cb..b009ddf 100644 +index e3cba0b..8b562d5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -27,6 +27,7 @@ config X86 +@@ -29,6 +29,7 @@ config X86 select HAVE_FTRACE select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER + select HAVE_ARCH_TRACEHOOK + select HAVE_EFFICIENT_UNALIGNED_ACCESS config ARCH_DEFCONFIG - string diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index e37dccc..19a7d2c 100644 --- a/arch/x86/kernel/ptrace.c @@ -134,7 +134,7 @@ clear_thread_flag(TIF_IRET); } diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c -index 47c3d24..282abdc 100644 +index b45ef8d..d01e3f6 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -15,6 +15,7 @@ @@ -153,7 +153,7 @@ #include "sigframe.h" #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) -@@ -293,35 +295,6 @@ give_sigsegv: +@@ -346,35 +348,6 @@ give_sigsegv: } /* @@ -189,7 +189,7 @@ * OK, we're invoking a handler */ -@@ -332,9 +305,9 @@ handle_signal(unsigned long sig, siginfo +@@ -385,9 +358,9 @@ handle_signal(unsigned long sig, siginfo int ret; /* Are we from a system call? */ @@ -201,7 +201,7 @@ case -ERESTART_RESTARTBLOCK: case -ERESTARTNOHAND: regs->ax = -EINTR; -@@ -391,8 +364,6 @@ handle_signal(unsigned long sig, siginfo +@@ -444,8 +417,6 @@ handle_signal(unsigned long sig, siginfo * handler too. */ regs->flags &= ~X86_EFLAGS_TF; @@ -210,7 +210,7 @@ spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); -@@ -400,6 +371,9 @@ handle_signal(unsigned long sig, siginfo +@@ -453,6 +424,9 @@ handle_signal(unsigned long sig, siginfo sigaddset(¤t->blocked,sig); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); @@ -220,7 +220,7 @@ } return ret; -@@ -456,9 +430,9 @@ static void do_signal(struct pt_regs *re +@@ -509,9 +483,9 @@ static void do_signal(struct pt_regs *re } /* Did we come from a system call? */ @@ -232,7 +232,7 @@ case -ERESTARTNOHAND: case -ERESTARTSYS: case -ERESTARTNOINTR: -@@ -496,6 +470,11 @@ void do_notify_resume(struct pt_regs *re +@@ -549,6 +523,11 @@ void do_notify_resume(struct pt_regs *re /* deal with pending signal delivery */ if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); @@ -477,7 +477,7 @@ + +#endif /* _ASM_SYSCALL_H */ diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h -index 3f2de10..29533e3 100644 +index da0a675..4cd5b7b 100644 --- a/include/asm-x86/thread_info.h +++ b/include/asm-x86/thread_info.h @@ -71,6 +71,7 @@ struct thread_info { Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.838 retrieving revision 1.839 diff -u -r1.838 -r1.839 --- sources 25 Jul 2008 16:21:10 -0000 1.838 +++ sources 26 Jul 2008 03:47:28 -0000 1.839 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -81488c85358bd593d7bb2e952b7c48fb patch-2.6.26-git12.bz2 +be2399c321e7ef65c354e8a4d5208ce6 patch-2.6.26-git13.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.755 retrieving revision 1.756 diff -u -r1.755 -r1.756 --- upstream 25 Jul 2008 16:21:10 -0000 1.755 +++ upstream 26 Jul 2008 03:47:28 -0000 1.756 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git12.bz2 +patch-2.6.26-git13.bz2 --- patch-2.6.26-git12.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sat Jul 26 04:50:51 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Sat, 26 Jul 2008 04:50:51 GMT Subject: rpms/perl-Class-MethodMaker/F-8 .cvsignore, 1.5, 1.6 perl-Class-MethodMaker.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807260450.m6Q4opjt007376@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7343 Modified Files: .cvsignore perl-Class-MethodMaker.spec sources Log Message: * Fri Jul 18 2008 Ralf Cors??pius - 2.11-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Feb 2006 03:07:11 -0000 1.5 +++ .cvsignore 26 Jul 2008 04:50:21 -0000 1.6 @@ -1 +1 @@ -Class-MethodMaker-2.08.tar.gz +Class-MethodMaker-2.11.tar.gz Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-8/perl-Class-MethodMaker.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Class-MethodMaker.spec 15 Oct 2007 18:37:00 -0000 1.9 +++ perl-Class-MethodMaker.spec 26 Jul 2008 04:50:21 -0000 1.10 @@ -1,19 +1,18 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-Class-MethodMaker -Version: 2.08 -Release: 4%{?dist}.1 +Version: 2.11 +Release: 1%{?dist} Summary: Perl module for creating generic object-oriented methods Group: Development/Libraries License: GPL+ or Artistic -URL: http://search.cpan.org/dist/Class-MethodMaker/ -Source: http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.08.tar.gz +URL: http://search.cpan.org/~schwigon/Class-MethodMaker/ +Source0: http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(IPC::Run) BuildRequires: perl(ExtUtils::MakeMaker) +# Required by the tests +BuildRequires: perl(IPC::Run) + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -25,9 +24,8 @@ %setup -q -n Class-MethodMaker-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -37,8 +35,7 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : -mv t/0-signature.t t/0-signature.t.skip +%check make test %clean @@ -53,6 +50,28 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 18 2008 Ralf Cors??pius - 2.11-1 +- Upstream update. + +* Fri Jul 18 2008 Ralf Cors??pius - 2.10-4 +- Remove %%clean ||: (BZ 449442, FTBFS). +- Use %%version in Source0-URL. +- Don't skip 0-signature.t. +- Misc. minor spec-file overhaul. + +* Wed Feb 27 2008 Tom "spot" Callaway - 2.10-3 +- Rebuild for perl 5.10 (again) + +* Mon Feb 18 2008 Fedora Release Engineering - 2.10-2 +- Autorebuild for GCC 4.3 + +* Tue Jan 29 2008 Tom "spot" Callaway - 2.10-1 +- fix compile bug by going to 2.10 (CPAN says it is unauthorized, + but the copyright holder says it is ok) + +* Mon Jan 28 2008 Tom "spot" Callaway - 2.08-5 +- rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway - 2.08-4.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Feb 2006 03:07:11 -0000 1.5 +++ sources 26 Jul 2008 04:50:21 -0000 1.6 @@ -1 +1 @@ -35b65629c3b4a4da3124ddd5c35e8c34 Class-MethodMaker-2.08.tar.gz +61ed8327e50b99e574c5f5ce1a835d36 Class-MethodMaker-2.11.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 08:33:51 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 26 Jul 2008 08:33:51 GMT Subject: rpms/enchant/devel enchant.spec,1.21,1.22 Message-ID: <200807260833.m6Q8Xp5Y007722@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7694 Modified Files: enchant.spec Log Message: * Sat Jul 26 2008 Michael Schwendt 1:1.4.2-4 - Rebuild for ABI-incompatible hunspell-1.2.4.2-2.fc10 Index: enchant.spec =================================================================== RCS file: /cvs/pkgs/rpms/enchant/devel/enchant.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- enchant.spec 10 Jul 2008 18:22:10 -0000 1.21 +++ enchant.spec 26 Jul 2008 08:33:21 -0000 1.22 @@ -1,7 +1,7 @@ Summary: An Enchanting Spell Checking Library Name: enchant Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: System Environment/Libraries License: LGPLv2+ @@ -88,6 +88,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sat Jul 26 2008 Michael Schwendt 1:1.4.2-4 +- Rebuild for ABI-incompatible hunspell-1.2.4.2-2.fc10 + * Thu Jul 10 2008 Marc Maurer 1:1.4.2-3 - Fix 426712: don't build static libs (patch from Michael Schwendt) From fedora-extras-commits at redhat.com Sat Jul 26 08:36:02 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sat, 26 Jul 2008 08:36:02 GMT Subject: rpms/gtest/F-8 gtest.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807260836.m6Q8a2he007860@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gtest/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7825/F-8 Modified Files: .cvsignore sources Added Files: gtest.spec import.log Log Message: Initial import into F-8. Modified Files: F-8/.cvsignore F-8/sources Added Files: F-8/gtest.spec F-8/import.log --- NEW FILE gtest.spec --- Summary: Google C++ testing framework Name: gtest Version: 1.0.0 Release: 1%{?dist} License: BSD Group: Development/Tools URL: http://code.google.com/p/googletest/ Source0: http://googletest.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: chrpath %description Google's framework for writing C++ tests on a variety of platforms (GNU/Linux, Mac OS X, Windows, Windows CE, and Symbian). Based on the xUnit architecture. Supports automatic test discovery, a rich set of assertions, user-defined assertions, death tests, fatal and non-fatal failures, various options for running the tests, and XML test report generation. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: automake Requires: %{name} = %{version}-%{release} %description devel This package contains development files for %{name}. %prep %setup -q # Keep a clean copy of samples. cp -pr ./samples ./samples.orig %build %configure --disable-static # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} %check make check # Restore the clean copy of samples. # To be later listed against %doc. rm -rf ./samples mv ./samples.orig ./samples %install rm -rf $RPM_BUILD_ROOT make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete # Remove rpaths. chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgtest_main.so.0.0.0 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES %doc CONTRIBUTORS %doc COPYING %doc README %{_libdir}/libgtest.so.* %{_libdir}/libgtest_main.so.* %files devel %defattr(-,root,root,-) %doc samples %{_bindir}/%{name}-config %{_datadir}/aclocal/%{name}.m4 %{_libdir}/libgtest.so %{_libdir}/libgtest_main.so %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/internal %changelog * Sat Jul 05 2008 Debarshi Ray - 1.0.0-1 - Initial build. --- NEW FILE import.log --- gtest-1_0_0-1_fc8:F-8:gtest-1.0.0-1.fc8.src.rpm:1217061279 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtest/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:26:11 -0000 1.1 +++ .cvsignore 26 Jul 2008 08:35:32 -0000 1.2 @@ -0,0 +1 @@ +gtest-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtest/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:26:11 -0000 1.1 +++ sources 26 Jul 2008 08:35:32 -0000 1.2 @@ -0,0 +1 @@ +669530b4399d8e02c1c96483bd939f6c gtest-1.0.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 08:39:36 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sat, 26 Jul 2008 08:39:36 GMT Subject: rpms/gtest/F-9 gtest.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807260839.m6Q8daZF008054@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gtest/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8004/F-9 Modified Files: .cvsignore sources Added Files: gtest.spec import.log Log Message: Initial import into F-9. Modified Files: F-9/.cvsignore F-9/sources Added Files: F-9/gtest.spec F-9/import.log --- NEW FILE gtest.spec --- Summary: Google C++ testing framework Name: gtest Version: 1.0.0 Release: 1%{?dist} License: BSD Group: Development/Tools URL: http://code.google.com/p/googletest/ Source0: http://googletest.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: chrpath %description Google's framework for writing C++ tests on a variety of platforms (GNU/Linux, Mac OS X, Windows, Windows CE, and Symbian). Based on the xUnit architecture. Supports automatic test discovery, a rich set of assertions, user-defined assertions, death tests, fatal and non-fatal failures, various options for running the tests, and XML test report generation. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: automake Requires: %{name} = %{version}-%{release} %description devel This package contains development files for %{name}. %prep %setup -q # Keep a clean copy of samples. cp -pr ./samples ./samples.orig %build %configure --disable-static # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} %check make check # Restore the clean copy of samples. # To be later listed against %doc. rm -rf ./samples mv ./samples.orig ./samples %install rm -rf $RPM_BUILD_ROOT make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete # Remove rpaths. chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgtest_main.so.0.0.0 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES %doc CONTRIBUTORS %doc COPYING %doc README %{_libdir}/libgtest.so.* %{_libdir}/libgtest_main.so.* %files devel %defattr(-,root,root,-) %doc samples %{_bindir}/%{name}-config %{_datadir}/aclocal/%{name}.m4 %{_libdir}/libgtest.so %{_libdir}/libgtest_main.so %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/internal %changelog * Sat Jul 05 2008 Debarshi Ray - 1.0.0-1 - Initial build. --- NEW FILE import.log --- gtest-1_0_0-1_fc8:F-9:gtest-1.0.0-1.fc8.src.rpm:1217061498 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtest/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:26:11 -0000 1.1 +++ .cvsignore 26 Jul 2008 08:39:05 -0000 1.2 @@ -0,0 +1 @@ +gtest-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtest/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:26:11 -0000 1.1 +++ sources 26 Jul 2008 08:39:05 -0000 1.2 @@ -0,0 +1 @@ +669530b4399d8e02c1c96483bd939f6c gtest-1.0.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 08:40:35 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 26 Jul 2008 08:40:35 GMT Subject: rpms/openhpi/devel .cvsignore, 1.12, 1.13 openhpi.spec, 1.65, 1.66 sources, 1.12, 1.13 openhpi-2.11.2-warning.patch, 1.1, NONE Message-ID: <200807260840.m6Q8eZjV008148@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/openhpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8108 Modified Files: .cvsignore openhpi.spec sources Removed Files: openhpi-2.11.2-warning.patch Log Message: * Sat Jul 26 2008 Dan Horak - 2.12.0-1 - update to 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openhpi/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Jun 2008 11:38:46 -0000 1.12 +++ .cvsignore 26 Jul 2008 08:40:04 -0000 1.13 @@ -1 +1 @@ -openhpi-2.11.3.tar.gz +openhpi-2.12.0.tar.gz Index: openhpi.spec =================================================================== RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- openhpi.spec 26 Jun 2008 11:38:46 -0000 1.65 +++ openhpi.spec 26 Jul 2008 08:40:04 -0000 1.66 @@ -1,14 +1,13 @@ Summary: openhpi Hardware Platform Interface (HPI) library and tools Name: openhpi -Version: 2.11.3 +Version: 2.12.0 Release: 1%{?dist} License: BSD Group: System Environment/Base URL: http://www.openhpi.org Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: openhpi.conf -Patch1: openhpi-2.11.2-warning.patch -Patch2: openhpi-2.11.1-initd.patch +Patch1: openhpi-2.11.1-initd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel @@ -50,8 +49,7 @@ %prep %setup -q -%patch1 -p1 -b .warning -%patch2 -p1 -b .initd +%patch1 -p1 -b .initd # fix permissions chmod a-x plugins/simulator/*.[ch] @@ -148,6 +146,9 @@ %changelog +* Sat Jul 26 2008 Dan Horak - 2.12.0-1 +- update to 2.12.0 + * Thu Jun 27 2008 Dan Horak - 2.11.3-1 - update to 2.11.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openhpi/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Jun 2008 11:38:46 -0000 1.12 +++ sources 26 Jul 2008 08:40:04 -0000 1.13 @@ -1 +1 @@ -26add28af6efdc3065c205e276be6ab2 openhpi-2.11.3.tar.gz +56c4d444cad0c9d471acdbbec384b81c openhpi-2.12.0.tar.gz --- openhpi-2.11.2-warning.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 26 08:42:35 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sat, 26 Jul 2008 08:42:35 GMT Subject: rpms/gtest/devel gtest.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807260842.m6Q8gZgA008310@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gtest/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8257/devel Modified Files: .cvsignore sources Added Files: gtest.spec import.log Log Message: Initial import into devel. Modified Files: devel/.cvsignore devel/sources Added Files: devel/gtest.spec devel/import.log --- NEW FILE gtest.spec --- Summary: Google C++ testing framework Name: gtest Version: 1.0.0 Release: 1%{?dist} License: BSD Group: Development/Tools URL: http://code.google.com/p/googletest/ Source0: http://googletest.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: chrpath %description Google's framework for writing C++ tests on a variety of platforms (GNU/Linux, Mac OS X, Windows, Windows CE, and Symbian). Based on the xUnit architecture. Supports automatic test discovery, a rich set of assertions, user-defined assertions, death tests, fatal and non-fatal failures, various options for running the tests, and XML test report generation. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: automake Requires: %{name} = %{version}-%{release} %description devel This package contains development files for %{name}. %prep %setup -q # Keep a clean copy of samples. cp -pr ./samples ./samples.orig %build %configure --disable-static # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} %check make check # Restore the clean copy of samples. # To be later listed against %doc. rm -rf ./samples mv ./samples.orig ./samples %install rm -rf $RPM_BUILD_ROOT make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete # Remove rpaths. chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgtest_main.so.0.0.0 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES %doc CONTRIBUTORS %doc COPYING %doc README %{_libdir}/libgtest.so.* %{_libdir}/libgtest_main.so.* %files devel %defattr(-,root,root,-) %doc samples %{_bindir}/%{name}-config %{_datadir}/aclocal/%{name}.m4 %{_libdir}/libgtest.so %{_libdir}/libgtest_main.so %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/internal %changelog * Sat Jul 05 2008 Debarshi Ray - 1.0.0-1 - Initial build. --- NEW FILE import.log --- gtest-1_0_0-1_fc8:HEAD:gtest-1.0.0-1.fc8.src.rpm:1217061674 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtest/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jul 2008 18:26:11 -0000 1.1 +++ .cvsignore 26 Jul 2008 08:42:04 -0000 1.2 @@ -0,0 +1 @@ +gtest-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtest/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jul 2008 18:26:11 -0000 1.1 +++ sources 26 Jul 2008 08:42:04 -0000 1.2 @@ -0,0 +1 @@ +669530b4399d8e02c1c96483bd939f6c gtest-1.0.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 09:34:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:04 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchbugzilla Message-ID: <20080726093405.046B91AD0E7@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchbugzilla acl on bacula (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:06 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchcommits Message-ID: <20080726093412.5B6331AD0EF@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchcommits acl on bacula (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:10 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchbugzilla Message-ID: <20080726093413.4096F1AD0F8@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchbugzilla acl on bacula (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:15 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchbugzilla Message-ID: <20080726093415.A95961AD0FF@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchbugzilla acl on bacula (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:15 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchcommits Message-ID: <20080726093415.ADF2C1AD101@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchcommits acl on bacula (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:18 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchcommits Message-ID: <20080726093418.1F6291AD107@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchcommits acl on bacula (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:20 +0000 Subject: [pkgdb] bacula: fschwarz has given up watchcommits Message-ID: <20080726093420.4C5241AD10D@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has given up the watchcommits acl on bacula (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:18 +0000 Subject: [pkgdb] bacula: fschwarz has given up watchcommits Message-ID: <20080726093423.C3DEB1AD0EB@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has given up the watchcommits acl on bacula (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:24 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchbugzilla Message-ID: <20080726093426.393111AD10F@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchbugzilla acl on bacula (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:26 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchbugzilla Message-ID: <20080726093426.AF8701AD119@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchbugzilla acl on bacula (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:29 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchcommits Message-ID: <20080726093429.99E1A1AD11D@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchcommits acl on bacula (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:35 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchcommits Message-ID: <20080726093437.0A4031AD0E3@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchcommits acl on bacula (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:51 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchcommits Message-ID: <20080726093451.9E0C31AD0FC@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchcommits acl on bacula (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 09:34:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 09:34:57 +0000 Subject: [pkgdb] bacula: fschwarz has requested watchcommits Message-ID: <20080726093457.C427B1AD104@bastion.fedora.phx.redhat.com> Felix Schwarz (fschwarz) has requested the watchcommits acl on bacula (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bacula From fedora-extras-commits at redhat.com Sat Jul 26 11:05:46 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 26 Jul 2008 11:05:46 GMT Subject: rpms/kernel/devel patch-2.6.26-git14.bz2.sign, NONE, 1.1 .cvsignore, 1.878, 1.879 kernel.spec, 1.805, 1.806 sources, 1.839, 1.840 upstream, 1.756, 1.757 patch-2.6.26-git13.bz2.sign, 1.1, NONE Message-ID: <200807261105.m6QB5kOB001269@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1165 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-git14.bz2.sign Removed Files: patch-2.6.26-git13.bz2.sign Log Message: * Sat Jul 26 2008 Roland McGrath - 2.6.26-git14 - Disable lirc patch, not building. --- NEW FILE patch-2.6.26-git14.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIiswLyGugalF9Dw4RAtiwAJwPDiUuRHUqO3H82ankl1t4Pn5IcQCbBsKx 8gNeKpcD2usQRHkqjudsEds= =LyZU -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.878 retrieving revision 1.879 diff -u -r1.878 -r1.879 --- .cvsignore 26 Jul 2008 03:47:27 -0000 1.878 +++ .cvsignore 26 Jul 2008 11:05:15 -0000 1.879 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git13.bz2 +patch-2.6.26-git14.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.805 retrieving revision 1.806 diff -u -r1.805 -r1.806 --- kernel.spec 26 Jul 2008 03:47:28 -0000 1.805 +++ kernel.spec 26 Jul 2008 11:05:15 -0000 1.806 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 13 +%define gitrev 14 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1098,7 +1098,7 @@ ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch # http://www.lirc.org/ -ApplyPatch linux-2.6-lirc.patch +#ApplyPatch linux-2.6-lirc.patch ApplyPatch linux-2.6-e1000-ich9.patch @@ -1696,6 +1696,10 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Sat Jul 26 2008 Roland McGrath +- 2.6.26-git14 +- Disable lirc patch, not building. + * Fri Jul 25 2008 Roland McGrath - 2.6.26-git13 - utrace update Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.839 retrieving revision 1.840 diff -u -r1.839 -r1.840 --- sources 26 Jul 2008 03:47:28 -0000 1.839 +++ sources 26 Jul 2008 11:05:15 -0000 1.840 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -be2399c321e7ef65c354e8a4d5208ce6 patch-2.6.26-git13.bz2 +b84837b3c4c226985ca101bb88105615 patch-2.6.26-git14.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.756 retrieving revision 1.757 diff -u -r1.756 -r1.757 --- upstream 26 Jul 2008 03:47:28 -0000 1.756 +++ upstream 26 Jul 2008 11:05:15 -0000 1.757 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git13.bz2 +patch-2.6.26-git14.bz2 --- patch-2.6.26-git13.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sat Jul 26 11:11:05 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 26 Jul 2008 11:11:05 GMT Subject: rpms/tlock/devel sources,1.3,1.4 Message-ID: <200807261111.m6QBB5tA001658@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1509 Modified Files: sources Log Message: ---------------------------------------------------------------------- Committing in . P J P Sat Jul 26 16:40:09 IST 2008 Modified Files: sources: Changed the info/dir entry for tlock. ---------------------------------------------------------------------- Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 16:55:09 -0000 1.3 +++ sources 26 Jul 2008 11:10:34 -0000 1.4 @@ -1 +1 @@ -3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz +79f6253fe3ea5a556be20026069b6016 tlock-1.4.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 11:49:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 11:49:04 +0000 Subject: [pkgdb] grip had acl change status Message-ID: <20080726114904.56FA91AD0E9@bastion.fedora.phx.redhat.com> Adrian Reber (adrian) has set the watchbugzilla acl on grip (Fedora devel) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grip From fedora-extras-commits at redhat.com Sat Jul 26 11:48:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 11:48:59 +0000 Subject: [pkgdb] grip had acl change status Message-ID: <20080726114859.664681AD0E3@bastion.fedora.phx.redhat.com> Adrian Reber (adrian) has set the watchcommits acl on grip (Fedora devel) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grip From fedora-extras-commits at redhat.com Sat Jul 26 12:32:30 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Sat, 26 Jul 2008 12:32:30 GMT Subject: rpms/pygobject2/devel .cvsignore, 1.15, 1.16 pygobject2.spec, 1.36, 1.37 sources, 1.15, 1.16 Message-ID: <200807261232.m6QCWUne011767@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygobject2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11713 Modified Files: .cvsignore pygobject2.spec sources Log Message: * Sat Jul 26 2008 Matthew Barnes - 2.15.2-1.fc10 - Update to 2.15.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 16 Jul 2008 14:06:53 -0000 1.15 +++ .cvsignore 26 Jul 2008 12:32:00 -0000 1.16 @@ -1 +1 @@ -pygobject-2.15.1.tar.bz2 +pygobject-2.15.2.tar.bz2 Index: pygobject2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- pygobject2.spec 20 Jul 2008 22:08:02 -0000 1.36 +++ pygobject2.spec 26 Jul 2008 12:32:00 -0000 1.37 @@ -7,8 +7,8 @@ ### Abstract ### Name: pygobject2 -Version: 2.15.1 -Release: 2%{?dist} +Version: 2.15.2 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GObject @@ -78,12 +78,14 @@ %doc AUTHORS NEWS README %doc examples +%{_libdir}/libpyglib-2.0.so* %dir %{python_sitearch}/gtk-2.0 %{python_sitearch}/gtk-2.0/dsextras.* %{python_sitearch}/pygtk.* %defattr(755, root, root, 755) %{python_sitearch}/gtk-2.0/gio +%{python_sitearch}/gtk-2.0/glib %{python_sitearch}/gtk-2.0/gobject %files codegen @@ -98,6 +100,7 @@ %dir %{_datadir}/pygobject %dir %{_includedir}/pygtk-2.0 %{_datadir}/pygobject/2.0/defs +%{_includedir}/pygtk-2.0/pyglib.h %{_includedir}/pygtk-2.0/pygobject.h %{_libdir}/pkgconfig/pygobject-2.0.pc @@ -107,6 +110,9 @@ %{_datadir}/pygobject/xsl %changelog +* Sat Jul 26 2008 Matthew Barnes - 2.15.2-1.fc10 +- Update to 2.15.2 + * Sun Jul 20 2008 Matthew Barnes - 2.15.1-2.fc10 - Fix directory ownership. (RH bug #455974, patch by Robert Scheck). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 16 Jul 2008 14:06:53 -0000 1.15 +++ sources 26 Jul 2008 12:32:00 -0000 1.16 @@ -1 +1 @@ -05bf0487c885a1ef6df615e02cac5ea6 pygobject-2.15.1.tar.bz2 +60bfabf036cbafb3a584b3c7beee05d1 pygobject-2.15.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 26 14:04:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 14:04:23 +0000 Subject: [pkgdb] lxlauncher (Fedora, 9) updated by kevin Message-ID: <20080726140424.24D381AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for lxlauncher Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lxlauncher (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lxlauncher (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lxlauncher (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on lxlauncher (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxlauncher From fedora-extras-commits at redhat.com Sat Jul 26 14:04:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 14:04:23 +0000 Subject: [pkgdb] lxlauncher (Fedora, 8) updated by kevin Message-ID: <20080726140424.95A271AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for lxlauncher Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lxlauncher (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lxlauncher (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lxlauncher (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on lxlauncher (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxlauncher From fedora-extras-commits at redhat.com Sat Jul 26 14:04:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 14:04:23 +0000 Subject: [pkgdb] lxlauncher (Fedora, devel) updated by kevin Message-ID: <20080726140425.092B31AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on lxlauncher (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxlauncher From fedora-extras-commits at redhat.com Sat Jul 26 14:04:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 26 Jul 2008 14:04:39 GMT Subject: rpms/lxlauncher - New directory Message-ID: <200807261404.m6QE4ddN028539@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxlauncher In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28511/rpms/lxlauncher Log Message: Directory /cvs/extras/rpms/lxlauncher added to the repository From fedora-extras-commits at redhat.com Sat Jul 26 14:04:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 26 Jul 2008 14:04:39 GMT Subject: rpms/lxlauncher/devel - New directory Message-ID: <200807261404.m6QE4d2x028553@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxlauncher/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28511/rpms/lxlauncher/devel Log Message: Directory /cvs/extras/rpms/lxlauncher/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 26 14:04:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 14:04:22 +0000 Subject: [pkgdb] lxlauncher was added for cwickert Message-ID: <20080726140428.2B20A1AD0F3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package lxlauncher with summary Open source replacement for Asus Launcher of the EeePC Kevin Fenzi (kevin) has approved Package lxlauncher Kevin Fenzi (kevin) has added a Fedora devel branch for lxlauncher with an owner of cwickert Kevin Fenzi (kevin) has approved lxlauncher in Fedora devel Kevin Fenzi (kevin) has approved Package lxlauncher Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lxlauncher (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lxlauncher (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lxlauncher (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on lxlauncher (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on lxlauncher (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on lxlauncher (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lxlauncher From fedora-extras-commits at redhat.com Sat Jul 26 14:04:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 26 Jul 2008 14:04:39 GMT Subject: rpms/lxlauncher Makefile,NONE,1.1 Message-ID: <200807261404.m6QE4dw3028576@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxlauncher In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28511/rpms/lxlauncher Added Files: Makefile Log Message: Setup of module lxlauncher --- NEW FILE Makefile --- # Top level Makefile for module lxlauncher all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sat Jul 26 14:04:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 26 Jul 2008 14:04:40 GMT Subject: rpms/lxlauncher/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807261404.m6QE4evP028591@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lxlauncher/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28511/rpms/lxlauncher/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lxlauncher --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: lxlauncher # $Id: Makefile,v 1.1 2008/07/26 14:04:40 kevin Exp $ NAME := lxlauncher SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 26 14:15:36 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 26 Jul 2008 14:15:36 GMT Subject: rpms/libdvdnav/F-8 libdvdnav-r1002.patch, NONE, 1.1 libdvdnav-r1007-r1010.patch, NONE, 1.1 libdvdnav-r1011-r1013.patch, NONE, 1.1 libdvdnav-r1017-r1019.patch, NONE, 1.1 libdvdnav-r1020-r1023.patch, NONE, 1.1 libdvdnav-r1042.patch, NONE, 1.1 libdvdnav-r1108.patch, NONE, 1.1 libdvdnav.spec, 1.4, 1.5 Message-ID: <200807261415.m6QEFa2p029568@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libdvdnav/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29509 Modified Files: libdvdnav.spec Added Files: libdvdnav-r1002.patch libdvdnav-r1007-r1010.patch libdvdnav-r1011-r1013.patch libdvdnav-r1017-r1019.patch libdvdnav-r1020-r1023.patch libdvdnav-r1042.patch libdvdnav-r1108.patch Log Message: * Sat Jul 27 2008 Dominik Mierzejewski 4.1.2-2 - pull selected fixes from SVN - re-enable parallel make libdvdnav-r1002.patch: --- NEW FILE libdvdnav-r1002.patch --- Index: src/read_cache.c =================================================================== --- src/read_cache.c (revision 1001) +++ src/read_cache.c (revision 1002) @@ -42,7 +42,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" #include "read_cache.h" Index: src/navigation.c =================================================================== --- src/navigation.c (revision 1001) +++ src/navigation.c (revision 1002) @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Index: src/settings.c =================================================================== --- src/settings.c (revision 1001) +++ src/settings.c (revision 1002) @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Index: src/vm/vm.c =================================================================== --- src/vm/vm.c (revision 1001) +++ src/vm/vm.c (revision 1002) @@ -48,7 +48,6 @@ #include "decoder.h" #include "remap.h" #include "vm.h" -#include "vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Index: src/searching.c =================================================================== --- src/searching.c (revision 1001) +++ src/searching.c (revision 1002) @@ -38,7 +38,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Index: src/remap.c =================================================================== --- src/remap.c (revision 1001) +++ src/remap.c (revision 1002) @@ -45,7 +45,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" libdvdnav-r1007-r1010.patch: --- NEW FILE libdvdnav-r1007-r1010.patch --- Index: src/dvdnav.c =================================================================== --- src/dvdnav.c (revision 1007) +++ src/dvdnav.c (revision 1010) @@ -53,6 +53,7 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) { /* clear everything except file, vm, mutex, readahead */ + pthread_mutex_lock(&this->vm_lock); if (this->file) DVDCloseFile(this->file); this->file = NULL; @@ -70,6 +71,7 @@ this->cur_cell_time = 0; dvdnav_read_cache_clear(this->cache); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_OK; } @@ -108,7 +110,8 @@ } /* Set the path. FIXME: Is a deep copy 'right' */ - strncpy(this->path, path, MAX_PATH_LEN); + strncpy(this->path, path, MAX_PATH_LEN - 1); + this->path[MAX_PATH_LEN - 1] = '\0'; /* Pre-open and close a file so that the CSS-keys are cached. */ this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS); @@ -413,6 +416,7 @@ /* Start the VM */ if (!vm_start(this->vm)) { printerr("Encrypted or faulty DVD"); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_ERR; } this->started = 1; libdvdnav-r1011-r1013.patch: --- NEW FILE libdvdnav-r1011-r1013.patch --- Index: src/remap.c =================================================================== --- src/remap.c (revision 1011) +++ src/remap.c (revision 1013) @@ -228,8 +228,12 @@ remap_add_node( map, tmp); } } + fclose(fp); - if (map->nblocks == 0 && map->debug == 0) return NULL; + if (map->nblocks == 0 && map->debug == 0) { + free(map); + return NULL; + } return map; } libdvdnav-r1017-r1019.patch: --- NEW FILE libdvdnav-r1017-r1019.patch --- Index: src/navigation.c =================================================================== --- src/navigation.c (revision 1017) +++ src/navigation.c (revision 1019) @@ -104,7 +104,10 @@ if ( (this->vm->state.domain == VTSM_DOMAIN) || (this->vm->state.domain == VMGM_DOMAIN) ) { /* Get current Menu ID: into *part. */ - vm_get_current_menu(this->vm, part); + if(! vm_get_current_menu(this->vm, part)) { + pthread_mutex_unlock(&this->vm_lock); + return DVDNAV_STATUS_ERR; + } if (*part > -1) { *title = 0; pthread_mutex_unlock(&this->vm_lock); Index: src/vm/vm.c =================================================================== --- src/vm/vm.c (revision 1017) +++ src/vm/vm.c (revision 1019) @@ -612,6 +612,7 @@ int pgcn; pgcn = (vm->state).pgcN; pgcit = get_PGCIT(vm); + if(pgcit==NULL) return 0; *menuid = pgcit->pgci_srp[pgcn - 1].entry_id & 0xf ; return 1; } @@ -1823,13 +1824,15 @@ /* Uses state to decide what to return */ static pgcit_t* get_PGCIT(vm_t *vm) { - pgcit_t *pgcit; + pgcit_t *pgcit = NULL; switch ((vm->state).domain) { case VTS_DOMAIN: + if(!vm->vtsi) return NULL; pgcit = vm->vtsi->vts_pgcit; break; case VTSM_DOMAIN: + if(!vm->vtsi) return NULL; pgcit = get_MENU_PGCIT(vm, vm->vtsi, (vm->state).registers.SPRM[0]); break; case VMGM_DOMAIN: libdvdnav-r1020-r1023.patch: --- NEW FILE libdvdnav-r1020-r1023.patch --- Index: version.sh =================================================================== --- version.sh (revision 1020) +++ version.sh (revision 1023) @@ -1,11 +1,15 @@ #!/bin/sh svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` -test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries | \ +test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | \ cut -d '"' -f2 2> /dev/null` test $svn_revision || svn_revision=UNKNOWN -NEW_REVISION="#define VERSION \"SVN-r$svn_revision\"" +if test "$svn_revision" = UNKNOWN && test -n "$2"; then + NEW_REVISION="#define VERSION \"$2\"" +else + NEW_REVISION="#define VERSION \"SVN-r$svn_revision\"" +fi OLD_REVISION=`cat version.h 2> /dev/null` # Update version.h only on revision changes to avoid spurious rebuilds Index: Makefile =================================================================== --- Makefile (revision 1020) +++ Makefile (revision 1023) @@ -79,7 +79,9 @@ endif version.h: - sh $(SRC_PATH)/version.sh $(SRC_PATH) + sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)" + +$(SRCS) $(DVDREAD_SRCS): version.h # General targets libdvdnav-r1042.patch: --- NEW FILE libdvdnav-r1042.patch --- Index: src/dvdnav.c =================================================================== --- src/dvdnav.c (revision 1041) +++ src/dvdnav.c (revision 1042) @@ -137,11 +137,13 @@ #endif if (this->file) { + pthread_mutex_lock(&this->vm_lock); DVDCloseFile(this->file); #ifdef LOG_DEBUG fprintf(MSG_OUT, "libdvdnav: close:file closing\n"); #endif this->file = NULL; + pthread_mutex_unlock(&this->vm_lock); } /* Free the VM */ libdvdnav-r1108.patch: --- NEW FILE libdvdnav-r1108.patch --- Index: src/dvdnav.h =================================================================== --- src/dvdnav.h (revision 1107) +++ src/dvdnav.h (revision 1108) @@ -290,7 +290,7 @@ * The number of entries in *times is the result of the function. * On error *times is NULL and the output is 0 */ -uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times, uint64_t *duration); +uint32_t dvdnav_describe_title_chapters(dvdnav_t *self, int32_t title, uint64_t **times, uint64_t *duration); /* * Play the specified amount of parts of the specified title of Index: libdvdnav.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/F-8/libdvdnav.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libdvdnav.spec 4 Jun 2008 20:47:26 -0000 1.4 +++ libdvdnav.spec 26 Jul 2008 14:15:05 -0000 1.5 @@ -1,11 +1,18 @@ Name: libdvdnav Version: 4.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for reading DVD video discs based on Ogle code Group: System Environment/Libraries License: GPLv2+ Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz +Patch0: %{name}-r1002.patch +Patch1: %{name}-r1007-r1010.patch +Patch2: %{name}-r1011-r1013.patch +Patch3: %{name}-r1017-r1019.patch +Patch4: %{name}-r1020-r1023.patch +Patch5: %{name}-r1042.patch +Patch6: %{name}-r1108.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -27,6 +34,13 @@ %prep %setup -q +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 %build ./configure2 \ @@ -39,9 +53,7 @@ --shlibdir=%{_libdir} \ --with-dvdread=%{_includedir}/dvdread \ -#parallel make fails -#make %{?_smp_mflags} -make +make %{?_smp_mflags} pushd doc doxygen doxy.conf popd @@ -75,6 +87,10 @@ %{_datadir}/aclocal/dvdnav.m4 %changelog +* Sat Jul 27 2008 Dominik Mierzejewski 4.1.2-2 +- pull selected fixes from SVN +- re-enable parallel make + * Sun Apr 13 2008 Dominik Mierzejewski 4.1.2-1 - update to 4.1.2 - drop obsolete patches (merged upstream) From fedora-extras-commits at redhat.com Sat Jul 26 15:05:43 2008 From: fedora-extras-commits at redhat.com (Sayamindu Dasgupta (sayamind)) Date: Sat, 26 Jul 2008 15:05:43 GMT Subject: rpms/xkeyboard-config/OLPC-3 xkeyboard-config-olpc-af.patch, NONE, 1.1 xkeyboard-config-olpc-ca-fr-typofix.patch, NONE, 1.1 xkeyboard-config-olpc-et.patch, NONE, 1.1 xkeyboard-config-olpc-tr.patch, NONE, 1.1 xkeyboard-config.spec, 1.19, 1.20 Message-ID: <200807261505.m6QF5hGP005816@cvs-int.fedora.redhat.com> Author: sayamind Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5771 Modified Files: xkeyboard-config.spec Added Files: xkeyboard-config-olpc-af.patch xkeyboard-config-olpc-ca-fr-typofix.patch xkeyboard-config-olpc-et.patch xkeyboard-config-olpc-tr.patch Log Message: Various fixes, and porting a few patches from the OLPC-2 branch. xkeyboard-config-olpc-af.patch: --- NEW FILE xkeyboard-config-olpc-af.patch --- diff --git a/symbols/af b/symbols/af index 3ff8ad4..5693653 100644 --- a/symbols/af +++ b/symbols/af @@ -273,7 +273,7 @@ xkb_symbols "olpc-ps" { }; partial alphanumeric_keys -xkb_symbols "olpc-fa" { +xkb_symbols "fa-olpc" { name[Group1]= "Afghanistan - OLPC Dari"; @@ -334,7 +334,7 @@ xkb_symbols "olpc-fa" { }; partial alphanumeric_keys -xkb_symbols "olpc-uz" { +xkb_symbols "uz-olpc" { name[Group1]= "Afghanistan - OLPC Southern Uzbek"; xkeyboard-config-olpc-ca-fr-typofix.patch: --- NEW FILE xkeyboard-config-olpc-ca-fr-typofix.patch --- Index: symbols/ca =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ca,v retrieving revision 1.18 diff -u -r1.18 ca --- symbols/ca 29 Apr 2008 20:38:44 -0000 1.18 +++ symbols/ca 27 May 2008 08:07:57 -0000 @@ -476,7 +476,14 @@ // OLPC Section xkb_symbols "olpc" { - include "fr" - - key { [ 3, slash, ograve, Ograve ] }; + include "ca(fr)" + + key { [ 2, quotedbl, ograve, Ograve ] }; + key { [ 3, slash, at, VoidSymbol ] }; + + key { [ e, E, EuroSign, VoidSymbol] }; + + key { [ period, period, 0x1002010 ] }; + + key { [ guillemotleft, guillemotright, degree, VoidSymbol ] }; }; xkeyboard-config-olpc-et.patch: --- NEW FILE xkeyboard-config-olpc-et.patch --- diff --git a/symbols/et b/symbols/et index e6d1ba7..f3d4a98 100644 --- a/symbols/et +++ b/symbols/et @@ -55,11 +55,11 @@ xkb_symbols "olpc" { key { [ 0x01001208, VoidSymbol ] }; // l key { [ 0x01001362, 0x01001361 ] }; // :; - key { [ apostrophe, quotedbl ] }; // '" + key { [ 0x01001366, 0x01001365 ] }; // '" key { [ 0x010012D8, 0x010012E0 ] }; // z key { [ 0x010012A0, 0x010012D0 ] }; // x - key { [ c, C ] }; // c + key { [ 0x01001278, VoidSymbol ] }; // c key { [ 0x01001238, 0x01001268 ] }; // v key { [ 0x01001260, VoidSymbol ] }; // b key { [ 0x01001290, 0x01001298 ] }; // n @@ -67,9 +67,9 @@ xkb_symbols "olpc" { key { [ 0x01001363, VoidSymbol ] }; // < key { [ 0x01001364, VoidSymbol ] }; // > - key { [ VoidSymbol, question ] }; // ? + key { [ 0x01001367, VoidSymbol ] }; // ? - key { [ backslash, VoidSymbol ] }; // bksl + key { [ VoidSymbol, 0x01002010 ] }; // bksl include "group(olpc)" }; xkeyboard-config-olpc-tr.patch: --- NEW FILE xkeyboard-config-olpc-tr.patch --- Index: symbols/tr =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/tr,v retrieving revision 1.14 diff -u -r1.14 tr --- symbols/tr 30 Jan 2008 21:54:00 -0000 1.14 +++ symbols/tr 26 May 2008 21:11:34 -0000 @@ -280,7 +280,21 @@ partial alphanumeric_keys xkb_symbols "olpc" { name[Group1]= "Turkey"; - include "tr(f)" + include "tr(intl)" + + key { [ 1, exclam, VoidSymbol, VoidSymbol ] }; + key { [ 6, ampersand, VoidSymbol, VoidSymbol ] }; + key { type[group1] = "FOUR_LEVEL", [ minus, underscore, bar, VoidSymbol ] }; + + + key { [ c, C, leftdoublequotemark, VoidSymbol ] }; + key { [ v, V, rightdoublequotemark, VoidSymbol ] }; + key { [ b, B, VoidSymbol, VoidSymbol ] }; + key { [odiaeresis, Odiaeresis, VoidSymbol, VoidSymbol ] }; + + key { [ ccedilla, Ccedilla, multiply, VoidSymbol ] }; + key { [ period, colon, division, dead_abovedot ] }; + + key { [ less, greater, VoidSymbol, VoidSymbol ] }; - key { [ less, greater, bar, brokenbar ] }; }; Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-3/xkeyboard-config.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xkeyboard-config.spec 28 May 2008 17:25:53 -0000 1.19 +++ xkeyboard-config.spec 26 Jul 2008 15:05:13 -0000 1.20 @@ -4,7 +4,7 @@ Summary: xkeyboard-config alternative xkb data files Name: xkeyboard-config Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -13,6 +13,10 @@ Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 Patch1: olpc-xkeyboard-config-kz-group.patch Patch2: usinet.patch +Patch3: xkeyboard-config-olpc-tr.patch +Patch4: xkeyboard-config-olpc-ca-fr-typofix.patch +Patch5: xkeyboard-config-olpc-et.patch +Patch6: xkeyboard-config-olpc-af.patch BuildArch: noarch @@ -43,6 +47,10 @@ %setup -q %patch1 -p1 -b .kzgroup %patch2 -p1 -b .usinet +%patch3 -p0 -b .tr +%patch4 -p0 -b .ca +%patch5 -p1 -b .et +%patch6 -p1 -b .af %build %configure \ @@ -82,6 +90,13 @@ %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Sat Jul 26 2008 Sayamindu Dasgupta - 1.3-2 +- Add xkeyboard-config-olpc-tr.patch from OLPC-2 branch +- Add xkeyboard-config-olpc-ca-fr-typofix.patch from OLPC-2 branch +- xkeyboard-config-olpc-et.patch: Fixes for the Amharic keyboard +- xkeyboard-config-olpc-af.patch: Fixes for the Dari and Uzbek keyboard + (matches the OLPC mfg-data now) + * Wed May 28 2008 Matthias Clasen - 1.3-1 - Update to 1.3 From fedora-extras-commits at redhat.com Sat Jul 26 15:29:55 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Sat, 26 Jul 2008 15:29:55 GMT Subject: rpms/libsmbios/EL-5 libsmbios.spec,1.9,1.10 Message-ID: <200807261529.m6QFTtP4006467@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355/EL-5 Modified Files: libsmbios.spec Log Message: update license tags. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/EL-5/libsmbios.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libsmbios.spec 27 Nov 2007 00:56:50 -0000 1.9 +++ libsmbios.spec 26 Jul 2008 15:29:25 -0000 1.10 @@ -9,7 +9,7 @@ Name: %{release_name} Version: %{release_version} Release: 1%{?dist} -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main From fedora-extras-commits at redhat.com Sat Jul 26 15:29:55 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Sat, 26 Jul 2008 15:29:55 GMT Subject: rpms/libsmbios/F-7 libsmbios.spec,1.7,1.8 Message-ID: <200807261529.m6QFTtsj006470@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355/F-7 Modified Files: libsmbios.spec Log Message: update license tags. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/F-7/libsmbios.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libsmbios.spec 26 Nov 2007 23:30:15 -0000 1.7 +++ libsmbios.spec 26 Jul 2008 15:29:25 -0000 1.8 @@ -9,7 +9,7 @@ Name: %{release_name} Version: %{release_version} Release: 1%{?dist} -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main From fedora-extras-commits at redhat.com Sat Jul 26 15:29:54 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Sat, 26 Jul 2008 15:29:54 GMT Subject: rpms/libsmbios/EL-4 libsmbios.spec,1.8,1.9 Message-ID: <200807261529.m6QFTsdb006464@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355/EL-4 Modified Files: libsmbios.spec Log Message: update license tags. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/EL-4/libsmbios.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libsmbios.spec 27 Nov 2007 00:56:29 -0000 1.8 +++ libsmbios.spec 26 Jul 2008 15:29:24 -0000 1.9 @@ -9,7 +9,7 @@ Name: %{release_name} Version: %{release_version} Release: 1%{?dist} -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main From fedora-extras-commits at redhat.com Sat Jul 26 15:29:57 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Sat, 26 Jul 2008 15:29:57 GMT Subject: rpms/libsmbios/FC-6 libsmbios.spec,1.6,1.7 Message-ID: <200807261529.m6QFTvOC006479@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355/FC-6 Modified Files: libsmbios.spec Log Message: update license tags. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/FC-6/libsmbios.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libsmbios.spec 28 Aug 2007 05:51:16 -0000 1.6 +++ libsmbios.spec 26 Jul 2008 15:29:26 -0000 1.7 @@ -9,7 +9,7 @@ Name: %{release_name} Version: %{release_version} Release: 1%{?dist} -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main From fedora-extras-commits at redhat.com Sat Jul 26 15:29:56 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Sat, 26 Jul 2008 15:29:56 GMT Subject: rpms/libsmbios/F-8 libsmbios.spec,1.8,1.9 Message-ID: <200807261529.m6QFTuiP006473@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355/F-8 Modified Files: libsmbios.spec Log Message: update license tags. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/F-8/libsmbios.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libsmbios.spec 26 Nov 2007 23:30:13 -0000 1.8 +++ libsmbios.spec 26 Jul 2008 15:29:26 -0000 1.9 @@ -9,7 +9,7 @@ Name: %{release_name} Version: %{release_version} Release: 1%{?dist} -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main From fedora-extras-commits at redhat.com Sat Jul 26 15:29:57 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Sat, 26 Jul 2008 15:29:57 GMT Subject: rpms/libsmbios/devel libsmbios.spec,1.13,1.14 Message-ID: <200807261529.m6QFTvfo006482@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355/devel Modified Files: libsmbios.spec Log Message: update license tags. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libsmbios.spec 22 Apr 2008 16:50:46 -0000 1.13 +++ libsmbios.spec 26 Jul 2008 15:29:27 -0000 1.14 @@ -9,7 +9,7 @@ Name: %{release_name} Version: %{release_version} Release: 2%{?dist}.1 -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main From fedora-extras-commits at redhat.com Sat Jul 26 15:29:56 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Sat, 26 Jul 2008 15:29:56 GMT Subject: rpms/libsmbios/F-9 libsmbios.spec,1.13,1.14 Message-ID: <200807261529.m6QFTu8x006476@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355/F-9 Modified Files: libsmbios.spec Log Message: update license tags. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/F-9/libsmbios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libsmbios.spec 22 Apr 2008 16:53:06 -0000 1.13 +++ libsmbios.spec 26 Jul 2008 15:29:26 -0000 1.14 @@ -9,7 +9,7 @@ Name: %{release_name} Version: %{release_version} Release: 2%{?dist}.1 -License: GPLv2+ or OSL +License: GPLv2+ or OSL 2.1 Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main From fedora-extras-commits at redhat.com Sat Jul 26 15:47:55 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Sat, 26 Jul 2008 15:47:55 GMT Subject: rpms/kernel/devel config-generic, 1.143, 1.144 kernel.spec, 1.806, 1.807 Message-ID: <200807261547.m6QFltuE007226@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7174 Modified Files: config-generic kernel.spec Log Message: Enable CONFIG_VIDEO_ADV_DEBUG Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- config-generic 26 Jul 2008 03:47:28 -0000 1.143 +++ config-generic 26 Jul 2008 15:47:24 -0000 1.144 @@ -2109,7 +2109,7 @@ # Multimedia devices # CONFIG_VIDEO_DEV=m -# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_ADV_DEBUG=y # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set CONFIG_VIDEO_ALLOW_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.806 retrieving revision 1.807 diff -u -r1.806 -r1.807 --- kernel.spec 26 Jul 2008 11:05:15 -0000 1.806 +++ kernel.spec 26 Jul 2008 15:47:24 -0000 1.807 @@ -1696,6 +1696,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Sat Jul 26 2008 Dave Jones +- Enable CONFIG_VIDEO_ADV_DEBUG + * Sat Jul 26 2008 Roland McGrath - 2.6.26-git14 - Disable lirc patch, not building. From fedora-extras-commits at redhat.com Sat Jul 26 16:32:21 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sat, 26 Jul 2008 16:32:21 GMT Subject: rpms/fatsort/devel fatsort-0.9.8.3-install.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 fatsort.spec, 1.18, 1.19 sources, 1.7, 1.8 Message-ID: <200807261632.m6QGWLqo015221@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15176 Modified Files: .cvsignore fatsort.spec sources Added Files: fatsort-0.9.8.3-install.patch Log Message: * Tue Jul 15 2008 Till Maas - 0.9.8.3-1 - Update to new version - Fix Makefile install target fatsort-0.9.8.3-install.patch: --- NEW FILE fatsort-0.9.8.3-install.patch --- diff -up fatsort-0.9.8.3/src/Makefile.install fatsort-0.9.8.3/src/Makefile --- fatsort-0.9.8.3/src/Makefile.install 2008-07-15 12:02:14.000000000 +0200 +++ fatsort-0.9.8.3/src/Makefile 2008-07-15 12:02:50.000000000 +0200 @@ -44,7 +44,7 @@ misc.o: misc.c misc.h options.h Makefile $(CC) ${CFLAGS} -c $< -o $@ install: - install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR) + install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR)/fatsort clean: rm -f *.o fatsort Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Jun 2008 20:40:47 -0000 1.7 +++ .cvsignore 26 Jul 2008 16:31:51 -0000 1.8 @@ -1 +1 @@ -fatsort-0.9.8.2.tar.gz +fatsort-0.9.8.3.tar.gz Index: fatsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/devel/fatsort.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fatsort.spec 6 Jul 2008 23:16:55 -0000 1.18 +++ fatsort.spec 26 Jul 2008 16:31:51 -0000 1.19 @@ -1,6 +1,6 @@ Name: fatsort -Version: 0.9.8.2 -Release: 2%{?dist} +Version: 0.9.8.3 +Release: 1%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System @@ -9,6 +9,8 @@ Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz # 2008-07-07: sent to upstream via personal e-mail Patch0: fatsort-0.9.8.2-CFLAGS.patch +# 2008-07-15: sent to upstream via personal e-mail +Patch1: fatsort-0.9.8.3-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,7 +22,8 @@ %prep %setup -q -%patch -p1 -b .CFLAGS +%patch0 -p1 -b .CFLAGS +%patch1 -p1 -b .install %build @@ -29,7 +32,6 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} @@ -44,6 +46,10 @@ %changelog +* Tue Jul 15 2008 Till Maas - 0.9.8.3-1 +- Update to new version +- Fix Makefile install target + * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Jun 2008 20:40:47 -0000 1.7 +++ sources 26 Jul 2008 16:31:51 -0000 1.8 @@ -1 +1 @@ -3ff54fd3e262f2d4834d33129b8885aa fatsort-0.9.8.2.tar.gz +936d8acae7032fc1053a46e896fb53c0 fatsort-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 16:40:58 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sat, 26 Jul 2008 16:40:58 GMT Subject: rpms/fatsort/F-9 fatsort-0.9.8.3-install.patch, NONE, 1.1 fatsort.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <200807261640.m6QGew6T015636@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15602 Modified Files: fatsort.spec sources Added Files: fatsort-0.9.8.3-install.patch Log Message: * Tue Jul 15 2008 Till Maas - 0.9.8.3-1 - Update to new version - Fix Makefile install target fatsort-0.9.8.3-install.patch: --- NEW FILE fatsort-0.9.8.3-install.patch --- diff -up fatsort-0.9.8.3/src/Makefile.install fatsort-0.9.8.3/src/Makefile --- fatsort-0.9.8.3/src/Makefile.install 2008-07-15 12:02:14.000000000 +0200 +++ fatsort-0.9.8.3/src/Makefile 2008-07-15 12:02:50.000000000 +0200 @@ -44,7 +44,7 @@ misc.o: misc.c misc.h options.h Makefile $(CC) ${CFLAGS} -c $< -o $@ install: - install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR) + install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR)/fatsort clean: rm -f *.o fatsort Index: fatsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/F-9/fatsort.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fatsort.spec 6 Jul 2008 23:11:55 -0000 1.13 +++ fatsort.spec 26 Jul 2008 16:40:28 -0000 1.14 @@ -1,13 +1,16 @@ Name: fatsort -Version: 0.9.8.2 -Release: 2%{?dist} +Version: 0.9.8.3 +Release: 1%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System License: GPLv2+ URL: http://%{name}.berlios.de/ Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz +# 2008-07-07: sent to upstream via personal e-mail Patch0: fatsort-0.9.8.2-CFLAGS.patch +# 2008-07-15: sent to upstream via personal e-mail +Patch1: fatsort-0.9.8.3-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,7 +22,8 @@ %prep %setup -q -%patch -p1 -b .CFLAGS +%patch0 -p1 -b .CFLAGS +%patch1 -p1 -b .install %build @@ -28,7 +32,6 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} @@ -43,6 +46,10 @@ %changelog +* Tue Jul 15 2008 Till Maas - 0.9.8.3-1 +- Update to new version +- Fix Makefile install target + * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Jun 2008 20:47:50 -0000 1.5 +++ sources 26 Jul 2008 16:40:28 -0000 1.6 @@ -1 +1 @@ -3ff54fd3e262f2d4834d33129b8885aa fatsort-0.9.8.2.tar.gz +936d8acae7032fc1053a46e896fb53c0 fatsort-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 16:44:00 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 26 Jul 2008 16:44:00 GMT Subject: rpms/xorg-x11-drv-geode/devel sources, 1.3, 1.4 xorg-x11-drv-geode.spec, 1.3, 1.4 dcon.patch, 1.1, NONE fix-memory-mapping.patch, 1.1, NONE libddc.patch, 1.1, NONE Message-ID: <200807261644.m6QGi0Jx015804@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/xorg-x11-drv-geode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15777 Modified Files: sources xorg-x11-drv-geode.spec Removed Files: dcon.patch fix-memory-mapping.patch libddc.patch Log Message: update to 2.10.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 May 2008 19:14:34 -0000 1.3 +++ sources 26 Jul 2008 16:43:30 -0000 1.4 @@ -1 +1 @@ -d7b3254e6f4f1978fecf8f4fa2823259 xf86-video-geode-2.9.0.tar.bz2 +59f984ef5f9b4f6d883e844decbd6133 xf86-video-geode-2.10.0.tar.bz2 Index: xorg-x11-drv-geode.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/xorg-x11-drv-geode.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xorg-x11-drv-geode.spec 20 May 2008 19:14:34 -0000 1.3 +++ xorg-x11-drv-geode.spec 26 Jul 2008 16:43:30 -0000 1.4 @@ -4,12 +4,10 @@ Summary: Xorg X11 AMD Geode video driver Name: xorg-x11-drv-geode -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} URL: http://www.x.org/wiki/AMDGeodeDriver Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2 -Patch0: http://dev.laptop.org/~jcrouse/fix-memory-mapping.patch -Patch1: http://dev.laptop.org/~jcrouse/dcon.patch License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,8 +32,6 @@ %prep %setup -q -n %{tarball}-%{version} -%patch0 -p1 -%patch1 -p1 %build %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \ @@ -64,6 +60,9 @@ %{driverdir}/ztv_drv.so %changelog +* Fri Jun 13 2008 Dennis Gilmore 2.10.0-1 +- update to 2.10.0 drop upstreamed patches + * Tue May 20 2008 Dennis Gilmore 2.9.0-2 - apply patches for olpc --- dcon.patch DELETED --- --- fix-memory-mapping.patch DELETED --- --- libddc.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 26 17:05:57 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sat, 26 Jul 2008 17:05:57 GMT Subject: rpms/fatsort/F-8 fatsort-0.9.8.3-install.patch, NONE, 1.1 fatsort.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200807261705.m6QH5vVf023051@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/fatsort/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23000 Modified Files: fatsort.spec sources Added Files: fatsort-0.9.8.3-install.patch Log Message: * Tue Jul 15 2008 Till Maas - 0.9.8.3-1 - Update to new version - Fix Makefile install target fatsort-0.9.8.3-install.patch: --- NEW FILE fatsort-0.9.8.3-install.patch --- diff -up fatsort-0.9.8.3/src/Makefile.install fatsort-0.9.8.3/src/Makefile --- fatsort-0.9.8.3/src/Makefile.install 2008-07-15 12:02:14.000000000 +0200 +++ fatsort-0.9.8.3/src/Makefile 2008-07-15 12:02:50.000000000 +0200 @@ -44,7 +44,7 @@ misc.o: misc.c misc.h options.h Makefile $(CC) ${CFLAGS} -c $< -o $@ install: - install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR) + install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR)/fatsort clean: rm -f *.o fatsort Index: fatsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/F-8/fatsort.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fatsort.spec 6 Jul 2008 23:14:58 -0000 1.12 +++ fatsort.spec 26 Jul 2008 17:05:27 -0000 1.13 @@ -1,13 +1,16 @@ Name: fatsort -Version: 0.9.8.2 -Release: 2%{?dist} +Version: 0.9.8.3 +Release: 1%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System License: GPLv2+ URL: http://%{name}.berlios.de/ Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz +# 2008-07-07: sent to upstream via personal e-mail Patch0: fatsort-0.9.8.2-CFLAGS.patch +# 2008-07-15: sent to upstream via personal e-mail +Patch1: fatsort-0.9.8.3-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,7 +22,8 @@ %prep %setup -q -%patch -p1 -b .CFLAGS +%patch0 -p1 -b .CFLAGS +%patch1 -p1 -b .install %build @@ -28,7 +32,6 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} @@ -43,6 +46,10 @@ %changelog +* Tue Jul 15 2008 Till Maas - 0.9.8.3-1 +- Update to new version +- Fix Makefile install target + * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fatsort/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Jun 2008 20:57:11 -0000 1.5 +++ sources 26 Jul 2008 17:05:27 -0000 1.6 @@ -1 +1 @@ -3ff54fd3e262f2d4834d33129b8885aa fatsort-0.9.8.2.tar.gz +936d8acae7032fc1053a46e896fb53c0 fatsort-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 17:09:44 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 26 Jul 2008 17:09:44 GMT Subject: rpms/rpmlint/devel .cvsignore, 1.19, 1.20 rpmlint.config, 1.21, 1.22 rpmlint.spec, 1.46, 1.47 sources, 1.19, 1.20 Message-ID: <200807261709.m6QH9iLq023370@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23331 Modified Files: .cvsignore rpmlint.config rpmlint.spec sources Log Message: * Sat Jul 26 2008 Ville Skytt?? - 0.84-1 - 0.84, fixes #355861, #456304. - Sync Fedora license list with Wiki revision "16:08, 18 July 2008". Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 27 May 2008 16:41:44 -0000 1.19 +++ .cvsignore 26 Jul 2008 17:09:14 -0000 1.20 @@ -1 +1 @@ -rpmlint-0.83.tar.bz2 +rpmlint-0.84.tar.bz2 Index: rpmlint.config =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- rpmlint.config 29 May 2008 00:19:04 -0000 1.21 +++ rpmlint.config 26 Jul 2008 17:09:14 -0000 1.22 @@ -28,7 +28,7 @@ setOption("ValidLicenses", ( # These are the short names for all of the Fedora approved licenses. # The master list is kept here: http://fedoraproject.org/wiki/Licensing - # Last synced with Revision 0.88 of that page. + # Last synced with revision "16:08, 18 July 2008" of that page. 'Adobe', 'ADSL', 'AFL', @@ -56,17 +56,20 @@ 'CPL', 'Condor', 'Copyright only', - 'Cryptix', 'Crystal Stacker', 'DOC', - 'EPL', + 'ECL 1.0', + 'ECL 2.0', 'eCos', 'EFL 2.0', 'EFL 2.0+', + 'EPL', + 'ERPL', 'EU Datagrid', 'Fair', 'FTL', 'Giftware', + 'GL2PS', 'Glide', 'gnuplot', 'GPL+', @@ -101,11 +104,13 @@ 'LGPLv3+', 'LGPLv3+ with exceptions', 'libtiff', + 'LLGPL', 'LPL', 'LPPL', 'mecab-ipadic', 'MIT', 'MIT with advertising', + 'Motosoto', 'MPLv1.0', 'MPLv1.0+', 'MPLv1.1', @@ -126,6 +131,8 @@ 'OSL 1.1+', 'OSL 2.0', 'OSL 2.0+', + 'OSL 2.1', + 'OSL 2.1+', 'OSL 3.0', 'OSL 3.0+', 'OpenSSL', @@ -138,6 +145,7 @@ 'RiceBSD', 'RPSL', 'Ruby', + 'SCRIP', 'Sendmail', 'Sleepycat', 'SISSL', @@ -154,6 +162,7 @@ 'wxWidgets', 'Xerox', 'xinetd', + 'YPLv1.1', 'Zend', 'ZPLv1.0', 'ZPLv1.0+', Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- rpmlint.spec 29 May 2008 00:19:04 -0000 1.46 +++ rpmlint.spec 26 Jul 2008 17:09:14 -0000 1.47 @@ -1,5 +1,5 @@ Name: rpmlint -Version: 0.83 +Version: 0.84 Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages @@ -68,6 +68,10 @@ %changelog +* Sat Jul 26 2008 Ville Skytt?? - 0.84-1 +- 0.84, fixes #355861, #456304. +- Sync Fedora license list with Wiki revision "16:08, 18 July 2008". + * Tue May 27 2008 Ville Skytt?? - 0.83-1 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441. - Fedora licensing patch applied upstream. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 27 May 2008 16:41:44 -0000 1.19 +++ sources 26 Jul 2008 17:09:14 -0000 1.20 @@ -1 +1 @@ -674e6d64330811abcee4d2acdbbd00e2 rpmlint-0.83.tar.bz2 +d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 26 17:24:44 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 26 Jul 2008 17:24:44 GMT Subject: rpms/drivel/F-8 drivel-2.1.1-prefdict.patch, NONE, 1.1 drivel.spec, 1.11, 1.12 Message-ID: <200807261724.m6QHOipc024297@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/drivel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24248 Modified Files: drivel.spec Added Files: drivel-2.1.1-prefdict.patch Log Message: Add patch for fixing preferred dictionary widget drivel-2.1.1-prefdict.patch: --- NEW FILE drivel-2.1.1-prefdict.patch --- --- drivel-orig/src/dialogs.c 2008-07-26 13:14:05.000000000 -0400 +++ drivel/src/dialogs.c 2008-07-26 13:15:14.000000000 -0400 @@ -1930,6 +1930,7 @@ g_slist_free (head); } + widget = dc->pref_dictionary; gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (language_store)); gtk_cell_layout_clear (GTK_CELL_LAYOUT (widget)); renderer = gtk_cell_renderer_text_new (); Index: drivel.spec =================================================================== RCS file: /cvs/pkgs/rpms/drivel/F-8/drivel.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- drivel.spec 2 Dec 2007 21:20:51 -0000 1.11 +++ drivel.spec 26 Jul 2008 17:24:13 -0000 1.12 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.1 -Release: 0.2.%{cvsdate}svn%{?dist} +Release: 0.3.%{cvsdate}svn%{?dist} License: GPLv2+ Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -16,6 +16,7 @@ Patch0: drivel-2.1.1-openssl.patch Patch1: drivel-2.1.1-proxyuri.patch Patch2: drivel-2.1.1-desktop.patch +Patch3: drivel-2.1.1-prefdict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: scrollkeeper BuildRequires: gtkspell-devel @@ -53,6 +54,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{?cvsdate:./autogen.sh} @@ -129,6 +131,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Sat Jul 26 2008 Paul W. Frields - 2.1.1-0.3.20071130svn +- Fix preferred dictionary (#426028) + * Sun Dec 2 2007 Paul W. Frields - 2.1.1-0.2.20071130svn - Fix some BuildRequires - Patch .desktop file to meet standards From fedora-extras-commits at redhat.com Sat Jul 26 17:26:13 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 26 Jul 2008 17:26:13 GMT Subject: rpms/drivel/F-9 drivel-2.1.1-prefdict.patch, NONE, 1.1 drivel.spec, 1.15, 1.16 Message-ID: <200807261726.m6QHQDhP024489@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/drivel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24396 Modified Files: drivel.spec Added Files: drivel-2.1.1-prefdict.patch Log Message: Add patch for fixing preferred dictionary widget drivel-2.1.1-prefdict.patch: --- NEW FILE drivel-2.1.1-prefdict.patch --- --- drivel-orig/src/dialogs.c 2008-07-26 13:14:05.000000000 -0400 +++ drivel/src/dialogs.c 2008-07-26 13:15:14.000000000 -0400 @@ -1930,6 +1930,7 @@ g_slist_free (head); } + widget = dc->pref_dictionary; gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (language_store)); gtk_cell_layout_clear (GTK_CELL_LAYOUT (widget)); renderer = gtk_cell_renderer_text_new (); Index: drivel.spec =================================================================== RCS file: /cvs/pkgs/rpms/drivel/F-9/drivel.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- drivel.spec 6 Mar 2008 04:54:28 -0000 1.15 +++ drivel.spec 26 Jul 2008 17:25:43 -0000 1.16 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.1 -Release: 0.5.%{cvsdate}svn%{?dist} +Release: 0.6.%{cvsdate}svn%{?dist} License: GPLv2+ Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -16,6 +16,7 @@ Patch0: drivel-2.1.1-openssl.patch Patch1: drivel-2.1.1-proxyuri.patch Patch2: drivel-2.1.1-desktop.patch +Patch3: drivel-2.1.1-prefdict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: scrollkeeper BuildRequires: gtkspell-devel @@ -53,6 +54,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{?cvsdate:./autogen.sh} @@ -129,6 +131,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Sat Jul 26 2008 Paul W. Frields - 2.1.1-0.6.20071130svn +- Fix preferred dictionary (#426028) + * Wed Mar 5 2008 Alex Lancaster - 2.1.1-0.5.20071130svn - Rebuild against libsoup22 compat package From fedora-extras-commits at redhat.com Sat Jul 26 17:31:38 2008 From: fedora-extras-commits at redhat.com (Sam Varshavchik (mrsam)) Date: Sat, 26 Jul 2008 17:31:38 GMT Subject: rpms/bootconf/devel bootconf.spec,1.2,1.3 Message-ID: <200807261731.m6QHVcO2024897@cvs-int.fedora.redhat.com> Author: mrsam Update of /cvs/pkgs/rpms/bootconf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24843 Modified Files: bootconf.spec Log Message: Added %{dist} to release Index: bootconf.spec =================================================================== RCS file: /cvs/pkgs/rpms/bootconf/devel/bootconf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bootconf.spec 29 Jun 2008 19:55:25 -0000 1.2 +++ bootconf.spec 26 Jul 2008 17:31:07 -0000 1.3 @@ -3,7 +3,7 @@ Summary: GRUB configuration utility Name: bootconf Version: 1.3 -Release: 1%{dist} +Release: 2%{dist} License: GPLv3 Group: System Environment/Base Url: http://www.courier-mta.org/bootconf/ @@ -77,6 +77,9 @@ %{_datadir}/applications/* %changelog +* Sat Jul 26 2008 Mr. Sam - 1.3-2% +- Added %{dist} to release + * Wed May 7 2008 Mr. Sam - 1.3-1 - Spec file/makefile update From fedora-extras-commits at redhat.com Sat Jul 26 18:24:40 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 26 Jul 2008 18:24:40 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.136,1.137 Message-ID: <200807261824.m6QIOeY6000779@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv751 Modified Files: kdebindings.spec Log Message: tighten qsintilla BR Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- kdebindings.spec 25 Jul 2008 23:14:44 -0000 1.136 +++ kdebindings.spec 26 Jul 2008 18:24:10 -0000 1.137 @@ -49,7 +49,7 @@ #{?smoke:BuildRequires: qwt-devel} BuildRequires: PyQt4-devel >= 4.4.2 %if 0%{?fedora} > 8 -BuildRequires: qscintilla-devel >= 2 +BuildRequires: qscintilla-devel >= 2.2 %endif # FIXME/TODO: are there other explicit Requires? From fedora-extras-commits at redhat.com Sat Jul 26 18:25:49 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 26 Jul 2008 18:25:49 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.137,1.138 Message-ID: <200807261825.m6QIPnVN000816@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv790 Modified Files: kdebindings.spec Log Message: * Sat Jul 26 2008 Rex Dieter 4.1.0-4.1 - BR: qscintilla-deve >= 2.2 Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- kdebindings.spec 26 Jul 2008 18:24:10 -0000 1.137 +++ kdebindings.spec 26 Jul 2008 18:25:19 -0000 1.138 @@ -22,7 +22,7 @@ Name: kdebindings Version: 4.1.0 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -168,6 +168,9 @@ %changelog +* Sat Jul 26 2008 Rex Dieter 4.1.0-4.1 +- BR: qscintilla-deve >= 2.2 + * Fri Jul 25 2008 Kevin Kofler 4.1.0-4 - fix Python and Ruby bindings overwriting each other (#456722, kde#167450) From fedora-extras-commits at redhat.com Sat Jul 26 18:27:46 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 26 Jul 2008 18:27:46 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.138,1.139 Message-ID: <200807261827.m6QIRkbQ000883@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv844/devel Modified Files: kdebindings.spec Log Message: typo Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- kdebindings.spec 26 Jul 2008 18:25:19 -0000 1.138 +++ kdebindings.spec 26 Jul 2008 18:27:15 -0000 1.139 @@ -169,7 +169,7 @@ %changelog * Sat Jul 26 2008 Rex Dieter 4.1.0-4.1 -- BR: qscintilla-deve >= 2.2 +- BR: qscintilla-devel >= 2.2 * Fri Jul 25 2008 Kevin Kofler 4.1.0-4 - fix Python and Ruby bindings overwriting each other (#456722, kde#167450) From fedora-extras-commits at redhat.com Sat Jul 26 18:27:46 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 26 Jul 2008 18:27:46 GMT Subject: rpms/kdebindings/F-9 kdebindings.spec,1.103,1.104 Message-ID: <200807261827.m6QIRkM5000886@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv844/F-9 Modified Files: kdebindings.spec Log Message: typo Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- kdebindings.spec 25 Jul 2008 23:15:59 -0000 1.103 +++ kdebindings.spec 26 Jul 2008 18:27:16 -0000 1.104 @@ -22,7 +22,7 @@ Name: kdebindings Version: 4.1.0 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -49,7 +49,7 @@ #{?smoke:BuildRequires: qwt-devel} BuildRequires: PyQt4-devel >= 4.4.2 %if 0%{?fedora} > 8 -BuildRequires: qscintilla-devel >= 2 +BuildRequires: qscintilla-devel >= 2.2 %endif # FIXME/TODO: are there other explicit Requires? @@ -168,6 +168,9 @@ %changelog +* Sat Jul 26 2008 Rex Dieter 4.1.0-4.1 +- BR: qscintilla-devel >= 2.2 + * Fri Jul 25 2008 Kevin Kofler 4.1.0-4 - fix Python and Ruby bindings overwriting each other (#456722, kde#167450) From fedora-extras-commits at redhat.com Sat Jul 26 18:42:59 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 26 Jul 2008 18:42:59 GMT Subject: rpms/libdvdnav/F-9 libdvdnav-r1001-r1043.patch, NONE, 1.1 libdvdnav.spec, 1.8, 1.9 Message-ID: <200807261842.m6QIgxux001477@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libdvdnav/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1419 Modified Files: libdvdnav.spec Added Files: libdvdnav-r1001-r1043.patch Log Message: * Sat Jul 27 2008 Dominik Mierzejewski 4.1.2-2 - pull selected fixes from SVN - re-enable parallel make libdvdnav-r1001-r1043.patch: --- NEW FILE libdvdnav-r1001-r1043.patch --- Index: ChangeLog =================================================================== --- ChangeLog (revision 1001) +++ ChangeLog (revision 1043) @@ -1,3 +1,7 @@ +libdvdnav /4.1.3) + * an embarassing amount of fixes regarding potential memory and resource leaks + (patches contributed by Erik Hovland) + * added dvdread-config (dvdnav-config's younger brother) libdvdnav (4.1.2) * multiple build system fixes * added dvdnav_describe_title_chapters(title) to get title and chapters Index: src/read_cache.c =================================================================== --- src/read_cache.c (revision 1001) +++ src/read_cache.c (revision 1043) @@ -42,7 +42,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" #include "read_cache.h" Index: src/navigation.c =================================================================== --- src/navigation.c (revision 1001) +++ src/navigation.c (revision 1043) @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" @@ -105,7 +104,10 @@ if ( (this->vm->state.domain == VTSM_DOMAIN) || (this->vm->state.domain == VMGM_DOMAIN) ) { /* Get current Menu ID: into *part. */ - vm_get_current_menu(this->vm, part); + if(! vm_get_current_menu(this->vm, part)) { + pthread_mutex_unlock(&this->vm_lock); + return DVDNAV_STATUS_ERR; + } if (*part > -1) { *title = 0; pthread_mutex_unlock(&this->vm_lock); Index: src/settings.c =================================================================== --- src/settings.c (revision 1001) +++ src/settings.c (revision 1043) @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Index: src/vm/vm.c =================================================================== --- src/vm/vm.c (revision 1001) +++ src/vm/vm.c (revision 1043) @@ -48,7 +48,6 @@ #include "decoder.h" #include "remap.h" #include "vm.h" -#include "vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" @@ -613,6 +612,7 @@ int pgcn; pgcn = (vm->state).pgcN; pgcit = get_PGCIT(vm); + if(pgcit==NULL) return 0; *menuid = pgcit->pgci_srp[pgcn - 1].entry_id & 0xf ; return 1; } @@ -1824,13 +1824,15 @@ /* Uses state to decide what to return */ static pgcit_t* get_PGCIT(vm_t *vm) { - pgcit_t *pgcit; + pgcit_t *pgcit = NULL; switch ((vm->state).domain) { case VTS_DOMAIN: + if(!vm->vtsi) return NULL; pgcit = vm->vtsi->vts_pgcit; break; case VTSM_DOMAIN: + if(!vm->vtsi) return NULL; pgcit = get_MENU_PGCIT(vm, vm->vtsi, (vm->state).registers.SPRM[0]); break; case VMGM_DOMAIN: Index: src/searching.c =================================================================== --- src/searching.c (revision 1001) +++ src/searching.c (revision 1043) @@ -38,7 +38,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Index: src/remap.c =================================================================== --- src/remap.c (revision 1001) +++ src/remap.c (revision 1043) @@ -45,7 +45,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" @@ -229,8 +228,12 @@ remap_add_node( map, tmp); } } + fclose(fp); - if (map->nblocks == 0 && map->debug == 0) return NULL; + if (map->nblocks == 0 && map->debug == 0) { + free(map); + return NULL; + } return map; } Index: src/dvdnav.c =================================================================== --- src/dvdnav.c (revision 1001) +++ src/dvdnav.c (revision 1043) @@ -53,6 +53,7 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) { /* clear everything except file, vm, mutex, readahead */ + pthread_mutex_lock(&this->vm_lock); if (this->file) DVDCloseFile(this->file); this->file = NULL; @@ -70,6 +71,7 @@ this->cur_cell_time = 0; dvdnav_read_cache_clear(this->cache); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_OK; } @@ -108,7 +110,8 @@ } /* Set the path. FIXME: Is a deep copy 'right' */ - strncpy(this->path, path, MAX_PATH_LEN); + strncpy(this->path, path, MAX_PATH_LEN - 1); + this->path[MAX_PATH_LEN - 1] = '\0'; /* Pre-open and close a file so that the CSS-keys are cached. */ this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS); @@ -134,11 +137,13 @@ #endif if (this->file) { + pthread_mutex_lock(&this->vm_lock); DVDCloseFile(this->file); #ifdef LOG_DEBUG fprintf(MSG_OUT, "libdvdnav: close:file closing\n"); #endif this->file = NULL; + pthread_mutex_unlock(&this->vm_lock); } /* Free the VM */ @@ -413,6 +418,7 @@ /* Start the VM */ if (!vm_start(this->vm)) { printerr("Encrypted or faulty DVD"); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_ERR; } this->started = 1; Index: src/dvdread/dvd_reader.c =================================================================== --- src/dvdread/dvd_reader.c (revision 1001) +++ src/dvdread/dvd_reader.c (revision 1043) @@ -88,6 +88,8 @@ void *udfcache; }; +#define TITLES_MAX 9 + struct dvd_file_s { /* Basic information. */ dvd_reader_t *dvd; @@ -100,8 +102,8 @@ uint32_t seek_pos; /* Information required for a directory path drive. */ - size_t title_sizes[ 9 ]; - dvd_input_t title_devs[ 9 ]; + size_t title_sizes[ TITLES_MAX ]; + dvd_input_t title_devs[ TITLES_MAX ]; /* Calculated at open-time, size in blocks. */ ssize_t filesize; @@ -441,10 +443,10 @@ path_copy[ strlen( path_copy ) - 1 ] = '\0'; } - if( strlen( path_copy ) > 9 ) { - if( !strcasecmp( &(path_copy[ strlen( path_copy ) - 9 ]), + if( strlen( path_copy ) > TITLES_MAX ) { + if( !strcasecmp( &(path_copy[ strlen( path_copy ) - TITLES_MAX ]), "/video_ts" ) ) { - path_copy[ strlen( path_copy ) - 9 ] = '\0'; + path_copy[ strlen( path_copy ) - TITLES_MAX ] = '\0'; } } @@ -788,7 +790,7 @@ dvd_file->filesize = dvd_file->title_sizes[ 0 ]; } else { - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 ); if( !findDVDFile( dvd, filename, full_path ) ) { @@ -873,7 +875,7 @@ if( dvd_file->dvd->isImageFile ) { ; } else { - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { if( dvd_file->title_devs[ i ] ) { dvdinput_close( dvd_file->title_devs[i] ); } @@ -936,7 +938,7 @@ ret = 0; ret2 = 0; - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { if( !dvd_file->title_sizes[ i ] ) return 0; /* Past end of file */ if( offset < dvd_file->title_sizes[ i ] ) { @@ -969,7 +971,8 @@ * also error from this read will not show in ret. */ /* Does the next part exist? If not then return now. */ - if( !dvd_file->title_devs[ i + 1 ] ) return ret; + if( i + 1 >= TITLES_MAX || !dvd_file->title_devs[ i + 1 ] ) + return ret; /* Read part 2 */ off = dvdinput_seek( dvd_file->title_devs[ i + 1 ], 0 ); @@ -1039,6 +1042,28 @@ return offset; } +int DVDFileSeekForce(dvd_file_t *dvd_file, int offset, int force_size) +{ + /* Check arguments. */ + if( dvd_file == NULL || offset <= 0 ) + return -1; + + if( dvd_file->dvd->isImageFile ) { + if( force_size < 0 ) + force_size = (offset - 1) / DVD_VIDEO_LB_LEN + 1; + if( dvd_file->filesize < force_size ) { + dvd_file->filesize = force_size; + fprintf(stderr, "libdvdread: Ignored size of file indicated in UDF.\n"); + } + } + + if( offset > dvd_file->filesize * DVD_VIDEO_LB_LEN ) + return -1; + + dvd_file->seek_pos = (uint32_t) offset; + return offset; +} + ssize_t DVDReadBytes( dvd_file_t *dvd_file, void *data, size_t byte_size ) { unsigned char *secbuf_base, *secbuf; @@ -1079,7 +1104,7 @@ memcpy( data, &(secbuf[ seek_byte ]), byte_size ); free( secbuf_base ); - dvd_file->seek_pos += byte_size; + DVDFileSeekForce(dvd_file, dvd_file->seek_pos + byte_size, -1); return byte_size; } @@ -1114,6 +1139,7 @@ char *buffer = (unsigned char *)(((uintptr_t)buffer_base & ~((uintptr_t)2047)) + 2048); if( buffer_base == NULL ) { + DVDCloseFile( dvd_file ); fprintf( stderr, "libdvdread: DVDDiscId, failed to " "allocate memory for file read!\n" ); return -1; Index: src/dvdread/bitreader.c =================================================================== --- src/dvdread/bitreader.c (revision 0) +++ src/dvdread/bitreader.c (revision 1043) @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2000, 2001, 2002, 2003 H?kan Hjort + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include +#include +#include +#include + +#include "bitreader.h" + +int dvdread_getbits_init(getbits_state_t *state, uint8_t *start) { + if ((state == NULL) || (start == NULL)) return 0; + state->start = start; + state->bit_position = 0; + state->byte_position = 0; + state->byte = start[0]; + return 1; +} + +/* Non-optimized getbits. */ +/* This can easily be optimized for particular platforms. */ +uint32_t dvdread_getbits(getbits_state_t *state, uint32_t number_of_bits) { + uint32_t result=0; + uint8_t byte=0; + if (number_of_bits > 32) { + printf("Number of bits > 32 in getbits\n"); + abort(); + } + + if ((state->bit_position) > 0) { /* Last getbits left us in the middle of a byte. */ + if (number_of_bits > (8-state->bit_position)) { /* this getbits will span 2 or more bytes. */ + byte = state->byte; + byte = byte >> (state->bit_position); + result = byte; + number_of_bits -= (8-state->bit_position); + state->bit_position = 0; + state->byte_position++; + state->byte = state->start[state->byte_position]; + } else { + byte=state->byte; + state->byte = state->byte << number_of_bits; + byte = byte >> (8 - number_of_bits); + result = byte; + state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 8 */ + if (state->bit_position == 8) { + state->bit_position = 0; + state->byte_position++; + state->byte = state->start[state->byte_position]; + } + number_of_bits = 0; + } + } + if ((state->bit_position) == 0) { + while (number_of_bits > 7) { + result = (result << 8) + state->byte; + state->byte_position++; + state->byte = state->start[state->byte_position]; + number_of_bits -= 8; + } + if (number_of_bits > 0) { /* number_of_bits < 8 */ + byte = state->byte; + state->byte = state->byte << number_of_bits; + state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 7 */ + byte = byte >> (8 - number_of_bits); + result = (result << number_of_bits) + byte; + number_of_bits = 0; + } + } + + return result; +} + +#if 0 /* TODO: optimized versions not yet used */ + +/* WARNING: This function can only be used on a byte boundary. + No checks are made that we are in fact on a byte boundary. + */ +uint16_t dvdread_get16bits(getbits_state_t *state) { + uint16_t result; + state->byte_position++; + result = (state->byte << 8) + state->start[state->byte_position++]; + state->byte = state->start[state->byte_position]; + return result; +} + +/* WARNING: This function can only be used on a byte boundary. + No checks are made that we are in fact on a byte boundary. + */ +uint32_t dvdread_get32bits(getbits_state_t *state) { + uint32_t result; + state->byte_position++; + result = (state->byte << 8) + state->start[state->byte_position++]; + result = (result << 8) + state->start[state->byte_position++]; + result = (result << 8) + state->start[state->byte_position++]; + state->byte = state->start[state->byte_position]; + return result; +} + +#endif Property changes on: src/dvdread/bitreader.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Index: src/dvdread/dvd_reader.h =================================================================== --- src/dvdread/dvd_reader.h (revision 1001) +++ src/dvdread/dvd_reader.h (revision 1043) @@ -229,6 +229,8 @@ int DVDUDFVolumeInfo( dvd_reader_t *, char *, unsigned int, unsigned char *, unsigned int ); +int DVDFileSeekForce( dvd_file_t *, int offset, int force_size); + /** * Get the ISO9660 VolumeIdentifier and VolumeSetIdentifier * Index: src/dvdread/ifo_types.h =================================================================== --- src/dvdread/ifo_types.h (revision 1001) +++ src/dvdread/ifo_types.h (revision 1043) @@ -75,7 +75,6 @@ * Video Attributes. */ typedef struct { -#ifdef WORDS_BIGENDIAN unsigned char mpeg_version : 2; unsigned char video_format : 2; unsigned char display_aspect_ratio : 2; @@ -89,28 +88,12 @@ unsigned char picture_size : 2; unsigned char letterboxed : 1; unsigned char film_mode : 1; -#else - unsigned char permitted_df : 2; - unsigned char display_aspect_ratio : 2; - unsigned char video_format : 2; - unsigned char mpeg_version : 2; - - unsigned char film_mode : 1; - unsigned char letterboxed : 1; - unsigned char picture_size : 2; - - unsigned char bit_rate : 1; - unsigned char unknown1 : 1; - unsigned char line21_cc_2 : 1; - unsigned char line21_cc_1 : 1; -#endif } ATTRIBUTE_PACKED video_attr_t; /** * Audio Attributes. */ typedef struct { -#ifdef WORDS_BIGENDIAN unsigned char audio_format : 3; unsigned char multichannel_extension : 1; unsigned char lang_type : 2; @@ -120,47 +103,22 @@ unsigned char sample_frequency : 2; unsigned char unknown1 : 1; unsigned char channels : 3; -#else - unsigned char application_mode : 2; - unsigned char lang_type : 2; - unsigned char multichannel_extension : 1; - unsigned char audio_format : 3; - - unsigned char channels : 3; - unsigned char unknown1 : 1; - unsigned char sample_frequency : 2; - unsigned char quantization : 2; -#endif uint16_t lang_code; uint8_t lang_extension; uint8_t code_extension; uint8_t unknown3; union { struct ATTRIBUTE_PACKED { -#ifdef WORDS_BIGENDIAN unsigned char unknown4 : 1; unsigned char channel_assignment : 3; unsigned char version : 2; unsigned char mc_intro : 1; /* probably 0: true, 1:false */ unsigned char mode : 1; /* Karaoke mode 0: solo 1: duet */ -#else - unsigned char mode : 1; - unsigned char mc_intro : 1; - unsigned char version : 2; - unsigned char channel_assignment : 3; - unsigned char unknown4 : 1; -#endif } karaoke; struct ATTRIBUTE_PACKED { -#ifdef WORDS_BIGENDIAN unsigned char unknown5 : 4; unsigned char dolby_encoded : 1; /* suitable for surround decoding */ unsigned char unknown6 : 3; -#else - unsigned char unknown6 : 3; - unsigned char dolby_encoded : 1; - unsigned char unknown5 : 4; -#endif } surround; } app_info; } ATTRIBUTE_PACKED audio_attr_t; @@ -170,7 +128,6 @@ * MultiChannel Extension */ typedef struct { -#ifdef WORDS_BIGENDIAN unsigned int zero1 : 7; unsigned int ach0_gme : 1; @@ -194,31 +151,6 @@ unsigned int ach4_gv2e : 1; unsigned int ach4_gmBe : 1; unsigned int ach4_seBe : 1; -#else - unsigned char ach0_gme : 1; - unsigned char zero1 : 7; - - unsigned char ach1_gme : 1; - unsigned char zero2 : 7; - - unsigned char ach2_gm2e : 1; - unsigned char ach2_gm1e : 1; - unsigned char ach2_gv2e : 1; - unsigned char ach2_gv1e : 1; - unsigned char zero3 : 4; - - unsigned char ach3_se2e : 1; - unsigned char ach3_gmAe : 1; - unsigned char ach3_gv2e : 1; - unsigned char ach3_gv1e : 1; - unsigned char zero4 : 4; - - unsigned char ach4_seBe : 1; - unsigned char ach4_gmBe : 1; - unsigned char ach4_gv2e : 1; - unsigned char ach4_gv1e : 1; - unsigned char zero5 : 4; -#endif uint8_t zero6[19]; } ATTRIBUTE_PACKED multichannel_ext_t; @@ -237,15 +169,9 @@ * language: indicates language if type == 1 * lang extension: if type == 1 contains the lang extension */ -#ifdef WORDS_BIGENDIAN unsigned char code_mode : 3; unsigned char zero1 : 3; unsigned char type : 2; -#else - unsigned char type : 2; - unsigned char zero1 : 3; - unsigned char code_mode : 3; -#endif uint8_t zero2; uint16_t lang_code; uint8_t lang_extension; @@ -277,29 +203,15 @@ * Cell Playback Information. */ typedef struct { -#ifdef WORDS_BIGENDIAN unsigned int block_mode : 2; unsigned int block_type : 2; unsigned int seamless_play : 1; unsigned int interleaved : 1; unsigned int stc_discontinuity: 1; unsigned int seamless_angle : 1; - unsigned int playback_mode : 1; /**< When set, enter StillMode after each VOBU */ unsigned int restricted : 1; /**< ?? drop out of fastforward? */ unsigned int unknown2 : 6; -#else - unsigned char seamless_angle : 1; - unsigned char stc_discontinuity: 1; - unsigned char interleaved : 1; - unsigned char seamless_play : 1; - unsigned char block_type : 2; - unsigned char block_mode : 2; - - unsigned char unknown2 : 6; - unsigned char restricted : 1; - unsigned char playback_mode : 1; -#endif uint8_t still_time; uint8_t cell_cmd_nr; dvd_time_t playback_time; @@ -330,7 +242,6 @@ * User Operations. */ typedef struct { -#ifdef WORDS_BIGENDIAN unsigned int zero : 7; /* 25-31 */ unsigned int video_pres_mode_change : 1; /* 24 */ @@ -360,37 +271,6 @@ unsigned int title_play : 1; unsigned int chapter_search_or_play : 1; unsigned int title_or_time_play : 1; /* 0 */ -#else - unsigned int video_pres_mode_change : 1; /* 24 */ - unsigned int zero : 7; /* 25-31 */ - - unsigned int resume : 1; /* 16 */ - unsigned int button_select_or_activate : 1; - unsigned int still_off : 1; - unsigned int pause_on : 1; - unsigned int audio_stream_change : 1; - unsigned int subpic_stream_change : 1; - unsigned int angle_change : 1; - unsigned int karaoke_audio_pres_mode_change : 1; /* 23 */ - - unsigned int forward_scan : 1; /* 8 */ - unsigned int backward_scan : 1; - unsigned int title_menu_call : 1; - unsigned int root_menu_call : 1; - unsigned int subpic_menu_call : 1; - unsigned int audio_menu_call : 1; - unsigned int angle_menu_call : 1; - unsigned int chapter_menu_call : 1; /* 15 */ - - unsigned int title_or_time_play : 1; /* 0 */ - unsigned int chapter_search_or_play : 1; - unsigned int title_play : 1; - unsigned int stop : 1; - unsigned int go_up : 1; - unsigned int time_or_chapter_search : 1; - unsigned int prev_or_top_pg_search : 1; - unsigned int next_pg_search : 1; /* 7 */ -#endif } ATTRIBUTE_PACKED user_ops_t; /** @@ -426,15 +306,9 @@ */ typedef struct { uint8_t entry_id; -#ifdef WORDS_BIGENDIAN unsigned int block_mode : 2; unsigned int block_type : 2; unsigned int unknown1 : 4; -#else - unsigned char unknown1 : 4; - unsigned char block_type : 2; - unsigned char block_mode : 2; -#endif uint16_t ptl_id_mask; uint32_t pgc_start_byte; pgc_t *pgc; @@ -559,7 +433,6 @@ } ATTRIBUTE_PACKED vmgi_mat_t; typedef struct { -#ifdef WORDS_BIGENDIAN unsigned int zero_1 : 1; unsigned int multi_or_random_pgc_title : 1; /* 0: one sequential pgc title */ unsigned int jlc_exists_in_cell_cmd : 1; @@ -568,16 +441,6 @@ unsigned int jlc_exists_in_tt_dom : 1; unsigned int chapter_search_or_play : 1; /* UOP 1 */ unsigned int title_or_time_play : 1; /* UOP 0 */ -#else - unsigned char title_or_time_play : 1; - unsigned char chapter_search_or_play : 1; - unsigned char jlc_exists_in_tt_dom : 1; - unsigned char jlc_exists_in_button_cmd : 1; - unsigned char jlc_exists_in_prepost_cmd : 1; - unsigned char jlc_exists_in_cell_cmd : 1; - unsigned char multi_or_random_pgc_title : 1; - unsigned char zero_1 : 1; -#endif } ATTRIBUTE_PACKED playback_type_t; /** Index: src/dvdread/bitreader.h =================================================================== --- src/dvdread/bitreader.h (revision 0) +++ src/dvdread/bitreader.h (revision 1043) @@ -0,0 +1,40 @@ +#ifndef BITREADER_H_INCLUDED +#define BITREADER_H_INCLUDED + +/* + * Copyright (C) 2000, 2001, 2002 H?kan Hjort . + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + uint8_t *start; + uint32_t byte_position; + uint32_t bit_position; + uint8_t byte; +} getbits_state_t; + +int dvdread_getbits_init(getbits_state_t *state, uint8_t *start); +uint32_t dvdread_getbits(getbits_state_t *state, uint32_t number_of_bits); + +#ifdef __cplusplus +}; +#endif +#endif /* BITREADER_H_INCLUDED */ Index: src/dvdread/ifo_read.c =================================================================== --- src/dvdread/ifo_read.c (revision 1001) +++ src/dvdread/ifo_read.c (revision 1043) @@ -30,6 +30,7 @@ #include "ifo_read.h" #include "dvd_reader.h" #include "dvdread_internal.h" +#include "bitreader.h" #ifndef DVD_BLOCK_LEN #define DVD_BLOCK_LEN 2048 @@ -88,12 +89,193 @@ static void ifoFree_PGC_COMMAND_TBL(pgc_command_tbl_t *cmd_tbl); static void ifoFree_PGCIT_internal(pgcit_t *pgcit); +static inline int DVDFileSeekForce_( dvd_file_t *dvd_file, uint32_t offset, int force_size ) { + return (DVDFileSeekForce(dvd_file, (int)offset, force_size) == (int)offset); +} static inline int DVDFileSeek_( dvd_file_t *dvd_file, uint32_t offset ) { return (DVDFileSeek(dvd_file, (int)offset) == (int)offset); } +static void read_video_attr(video_attr_t *va) { + getbits_state_t state; + uint8_t buf[sizeof(video_attr_t)]; + memcpy(buf, va, sizeof(video_attr_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + va->mpeg_version = dvdread_getbits(&state, 2); + va->video_format = dvdread_getbits(&state, 2); + va->display_aspect_ratio = dvdread_getbits(&state, 2); + va->permitted_df = dvdread_getbits(&state, 2); + va->line21_cc_1 = dvdread_getbits(&state, 1); + va->line21_cc_2 = dvdread_getbits(&state, 1); + va->unknown1 = dvdread_getbits(&state, 1); + va->bit_rate = dvdread_getbits(&state, 1); + va->picture_size = dvdread_getbits(&state, 2); + va->letterboxed = dvdread_getbits(&state, 1); + va->film_mode = dvdread_getbits(&state, 1); +} + +static void read_audio_attr(audio_attr_t *aa) { + getbits_state_t state; + uint8_t buf[sizeof(audio_attr_t)]; + + memcpy(buf, aa, sizeof(audio_attr_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + aa->audio_format = dvdread_getbits(&state, 3); + aa->multichannel_extension = dvdread_getbits(&state, 1); + aa->lang_type = dvdread_getbits(&state, 2); + aa->application_mode = dvdread_getbits(&state, 2); + aa->quantization = dvdread_getbits(&state, 2); + aa->sample_frequency = dvdread_getbits(&state, 2); + aa->unknown1 = dvdread_getbits(&state, 1); + aa->channels = dvdread_getbits(&state, 3); + aa->lang_code = dvdread_getbits(&state, 16); + aa->lang_extension = dvdread_getbits(&state, 8); + aa->code_extension = dvdread_getbits(&state, 8); + aa->unknown3 = dvdread_getbits(&state, 8); + aa->app_info.karaoke.unknown4 = dvdread_getbits(&state, 1); + aa->app_info.karaoke.channel_assignment = dvdread_getbits(&state, 3); + aa->app_info.karaoke.version = dvdread_getbits(&state, 2); + aa->app_info.karaoke.mc_intro = dvdread_getbits(&state, 1); + aa->app_info.karaoke.mode = dvdread_getbits(&state, 1); +} + +static void read_multichannel_ext(multichannel_ext_t *me) { + getbits_state_t state; + uint8_t buf[sizeof(multichannel_ext_t)]; + + memcpy(buf, me, sizeof(multichannel_ext_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + me->zero1 = dvdread_getbits(&state, 7); + me->ach0_gme = dvdread_getbits(&state, 1); + me->zero2 = dvdread_getbits(&state, 7); + me->ach1_gme = dvdread_getbits(&state, 1); + me->zero3 = dvdread_getbits(&state, 4); + me->ach2_gv1e = dvdread_getbits(&state, 1); + me->ach2_gv2e = dvdread_getbits(&state, 1); + me->ach2_gm1e = dvdread_getbits(&state, 1); + me->ach2_gm2e = dvdread_getbits(&state, 1); + me->zero4 = dvdread_getbits(&state, 4); + me->ach3_gv1e = dvdread_getbits(&state, 1); + me->ach3_gv2e = dvdread_getbits(&state, 1); + me->ach3_gmAe = dvdread_getbits(&state, 1); + me->ach3_se2e = dvdread_getbits(&state, 1); + me->zero5 = dvdread_getbits(&state, 4); + me->ach4_gv1e = dvdread_getbits(&state, 1); + me->ach4_gv2e = dvdread_getbits(&state, 1); + me->ach4_gmBe = dvdread_getbits(&state, 1); + me->ach4_seBe = dvdread_getbits(&state, 1); +} + +static void read_subp_attr(subp_attr_t *sa) { + getbits_state_t state; + uint8_t buf[sizeof(subp_attr_t)]; + + memcpy(buf, sa, sizeof(subp_attr_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + sa->code_mode = dvdread_getbits(&state, 3); + sa->zero1 = dvdread_getbits(&state, 3); + sa->type = dvdread_getbits(&state, 2); + sa->zero2 = dvdread_getbits(&state, 8); + sa->lang_code = dvdread_getbits(&state, 16); + sa->lang_extension = dvdread_getbits(&state, 8); + sa->code_extension = dvdread_getbits(&state, 8); +} + +static void read_user_ops(user_ops_t *uo) { + getbits_state_t state; + uint8_t buf[sizeof(user_ops_t)]; + + memcpy(buf, uo, sizeof(user_ops_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + uo->zero = dvdread_getbits(&state, 7); + uo->video_pres_mode_change = dvdread_getbits(&state, 1); + uo->karaoke_audio_pres_mode_change = dvdread_getbits(&state, 1); + uo->angle_change = dvdread_getbits(&state, 1); + uo->subpic_stream_change = dvdread_getbits(&state, 1); + uo->audio_stream_change = dvdread_getbits(&state, 1); + uo->pause_on = dvdread_getbits(&state, 1); + uo->still_off = dvdread_getbits(&state, 1); + uo->button_select_or_activate = dvdread_getbits(&state, 1); + uo->resume = dvdread_getbits(&state, 1); + uo->chapter_menu_call = dvdread_getbits(&state, 1); + uo->angle_menu_call = dvdread_getbits(&state, 1); + uo->audio_menu_call = dvdread_getbits(&state, 1); + uo->subpic_menu_call = dvdread_getbits(&state, 1); + uo->root_menu_call = dvdread_getbits(&state, 1); + uo->title_menu_call = dvdread_getbits(&state, 1); + uo->backward_scan = dvdread_getbits(&state, 1); + uo->forward_scan = dvdread_getbits(&state, 1); + uo->next_pg_search = dvdread_getbits(&state, 1); + uo->prev_or_top_pg_search = dvdread_getbits(&state, 1); + uo->time_or_chapter_search = dvdread_getbits(&state, 1); + uo->go_up = dvdread_getbits(&state, 1); + uo->stop = dvdread_getbits(&state, 1); + uo->title_play = dvdread_getbits(&state, 1); + uo->chapter_search_or_play = dvdread_getbits(&state, 1); + uo->title_or_time_play = dvdread_getbits(&state, 1); +} + +static void read_pgci_srp(pgci_srp_t *ps) { + getbits_state_t state; + uint8_t buf[sizeof(pgci_srp_t)]; + + memcpy(buf, ps, sizeof(pgci_srp_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + ps->entry_id = dvdread_getbits(&state, 8); + ps->block_mode = dvdread_getbits(&state, 2); + ps->block_type = dvdread_getbits(&state, 2); + ps->unknown1 = dvdread_getbits(&state, 4); + ps->ptl_id_mask = dvdread_getbits(&state, 16); + ps->pgc_start_byte = dvdread_getbits(&state, 32); +} + +static void read_cell_playback(cell_playback_t *cp) { + getbits_state_t state; + uint8_t buf[sizeof(cell_playback_t)]; + + memcpy(buf, cp, sizeof(cell_playback_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + cp->block_mode = dvdread_getbits(&state, 2); + cp->block_type = dvdread_getbits(&state, 2); + cp->seamless_play = dvdread_getbits(&state, 1); + cp->interleaved = dvdread_getbits(&state, 1); + cp->stc_discontinuity = dvdread_getbits(&state, 1); + cp->seamless_angle = dvdread_getbits(&state, 1); + cp->playback_mode = dvdread_getbits(&state, 1); + cp->restricted = dvdread_getbits(&state, 1); + cp->unknown2 = dvdread_getbits(&state, 6); + cp->still_time = dvdread_getbits(&state, 8); + cp->cell_cmd_nr = dvdread_getbits(&state, 8); + + cp->playback_time.hour = dvdread_getbits(&state, 8); + cp->playback_time.minute = dvdread_getbits(&state, 8); + cp->playback_time.second = dvdread_getbits(&state, 8); + cp->playback_time.frame_u = dvdread_getbits(&state, 8); + + cp->first_sector = dvdread_getbits(&state, 32); + cp->first_ilvu_end_sector = dvdread_getbits(&state, 32); + cp->last_vobu_start_sector = dvdread_getbits(&state, 32); + cp->last_sector = dvdread_getbits(&state, 32); +} + +static void read_playback_type(playback_type_t *pt) { + getbits_state_t state; + uint8_t buf[sizeof(playback_type_t)]; + + memcpy(buf, pt, sizeof(playback_type_t)); + if (!dvdread_getbits_init(&state, buf)) abort(); + pt->zero_1 = dvdread_getbits(&state, 1); + pt->multi_or_random_pgc_title = dvdread_getbits(&state, 1); + pt->jlc_exists_in_cell_cmd = dvdread_getbits(&state, 1); + pt->jlc_exists_in_prepost_cmd = dvdread_getbits(&state, 1); + pt->jlc_exists_in_button_cmd = dvdread_getbits(&state, 1); + pt->jlc_exists_in_tt_dom = dvdread_getbits(&state, 1); + pt->chapter_search_or_play = dvdread_getbits(&state, 1); + pt->title_or_time_play = dvdread_getbits(&state, 1); +} + ifo_handle_t *ifoOpen(dvd_reader_t *dvd, int title) { ifo_handle_t *ifofile; @@ -121,7 +303,7 @@ /* These are both mandatory. */ if(!ifoRead_FP_PGC(ifofile) || !ifoRead_TT_SRPT(ifofile)) { - fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); + fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO), ifoRead_FP_PGC() failed.\n"); ifoClose(ifofile); return NULL; } @@ -131,7 +313,7 @@ /* This is also mandatory. */ if(!ifoRead_VTS_ATRT(ifofile)) { - fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); + fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO), ifoRead_VTS_ATRT() failed.\n"); ifoClose(ifofile); return NULL; } @@ -200,7 +382,7 @@ if(ifoRead_VMG(ifofile)) return ifofile; - fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); + fprintf(stderr, "libdvdread,ifoOpenVMGI(): Invalid main menu IFO (VIDEO_TS.IFO).\n"); ifoClose(ifofile); return NULL; } @@ -316,8 +498,9 @@ B2N_32(vmgi_mat->txtdt_mgi); B2N_32(vmgi_mat->vmgm_c_adt); B2N_32(vmgi_mat->vmgm_vobu_admap); - B2N_16(vmgi_mat->vmgm_audio_attr.lang_code); - B2N_16(vmgi_mat->vmgm_subp_attr.lang_code); + read_video_attr(&vmgi_mat->vmgm_video_attr); + read_audio_attr(&vmgi_mat->vmgm_audio_attr); + read_subp_attr(&vmgi_mat->vmgm_subp_attr); CHECK_ZERO(vmgi_mat->zero_1); @@ -390,6 +573,14 @@ return 0; } + read_video_attr(&vtsi_mat->vtsm_video_attr); + read_video_attr(&vtsi_mat->vts_video_attr); + read_audio_attr(&vtsi_mat->vtsm_audio_attr); + for(i=0; i<8; i++) + read_audio_attr(&vtsi_mat->vts_audio_attr[i]); + read_subp_attr(&vtsi_mat->vtsm_subp_attr); + for(i=0; i<32; i++) + read_subp_attr(&vtsi_mat->vts_subp_attr[i]); B2N_32(vtsi_mat->vts_last_sector); B2N_32(vtsi_mat->vtsi_last_sector); B2N_32(vtsi_mat->vts_category); @@ -404,12 +595,6 @@ B2N_32(vtsi_mat->vtsm_vobu_admap); B2N_32(vtsi_mat->vts_c_adt); B2N_32(vtsi_mat->vts_vobu_admap); - B2N_16(vtsi_mat->vtsm_audio_attr.lang_code); - B2N_16(vtsi_mat->vtsm_subp_attr.lang_code); - for(i = 0; i < 8; i++) - B2N_16(vtsi_mat->vts_audio_attr[i].lang_code); - for(i = 0; i < 32; i++) - B2N_16(vtsi_mat->vts_subp_attr[i].lang_code); CHECK_ZERO(vtsi_mat->zero_1); @@ -462,6 +647,7 @@ CHECK_ZERO(vtsi_mat->vts_subp_attr[i]); for(i = 0; i < 8; i++) { + read_multichannel_ext(&vtsi_mat->vts_mu_audio_attr[i]); CHECK_ZERO0(vtsi_mat->vts_mu_audio_attr[i].zero1); CHECK_ZERO0(vtsi_mat->vts_mu_audio_attr[i].zero2); CHECK_ZERO0(vtsi_mat->vts_mu_audio_attr[i].zero3); @@ -586,11 +772,7 @@ return 0; for(i = 0; i < nr; i++) { - B2N_32(cell_playback[i].first_sector); - B2N_32(cell_playback[i].first_ilvu_end_sector); - B2N_32(cell_playback[i].last_vobu_start_sector); - B2N_32(cell_playback[i].last_sector); - + read_cell_playback(&cell_playback[i]); /* Changed < to <= because this was false in the movie 'Pi'. */ CHECK_VALUE(cell_playback[i].last_vobu_start_sector <= cell_playback[i].last_sector); @@ -631,6 +813,7 @@ if(!(DVDReadBytes(ifofile->file, pgc, PGC_SIZE))) return 0; + read_user_ops(&pgc->prohibited_ops); B2N_16(pgc->next_pgc_nr); B2N_16(pgc->prev_pgc_nr); B2N_16(pgc->goup_pgc_nr); @@ -849,6 +1032,7 @@ CHECK_VALUE((int)tt_srpt->nr_of_srpts * sizeof(title_info_t) <= info_length); for(i = 0; i < tt_srpt->nr_of_srpts; i++) { + read_playback_type(&tt_srpt->title[i].pb_ty); CHECK_VALUE(tt_srpt->title[i].pb_ty.zero_1 == 0); CHECK_VALUE(tt_srpt->title[i].nr_of_angles != 0); CHECK_VALUE(tt_srpt->title[i].nr_of_angles < 10); @@ -1508,7 +1692,7 @@ unsigned int i; int info_length; - if(!DVDFileSeek_(ifofile->file, sector * DVD_BLOCK_LEN)) + if(!DVDFileSeekForce_(ifofile->file, sector * DVD_BLOCK_LEN, sector)) return 0; if(!(DVDReadBytes(ifofile->file, vobu_admap, VOBU_ADMAP_SIZE))) @@ -1627,8 +1811,7 @@ for(i = 0; i < pgcit->nr_of_pgci_srp; i++) { memcpy(&pgcit->pgci_srp[i], ptr, PGCI_SRP_SIZE); ptr += PGCI_SRP_SIZE; - B2N_16(pgcit->pgci_srp[i].ptl_id_mask); - B2N_32(pgcit->pgci_srp[i].pgc_start_byte); + read_pgci_srp(&pgcit->pgci_srp[i]); CHECK_VALUE(pgcit->pgci_srp[i].unknown1 == 0); } free(data); @@ -1841,14 +2024,16 @@ if(!(DVDReadBytes(ifofile->file, vts_attributes, sizeof(vts_attributes_t)))) return 0; + read_video_attr(&vts_attributes->vtsm_vobs_attr); + read_video_attr(&vts_attributes->vtstt_vobs_video_attr); + read_audio_attr(&vts_attributes->vtsm_audio_attr); + for(i=0; i<8; i++) + read_audio_attr(&vts_attributes->vtstt_audio_attr[i]); + read_subp_attr(&vts_attributes->vtsm_subp_attr); + for(i=0; i<32; i++) + read_subp_attr(&vts_attributes->vtstt_subp_attr[i]); B2N_32(vts_attributes->last_byte); B2N_32(vts_attributes->vts_cat); - B2N_16(vts_attributes->vtsm_audio_attr.lang_code); - B2N_16(vts_attributes->vtsm_subp_attr.lang_code); - for(i = 0; i < 8; i++) - B2N_16(vts_attributes->vtstt_audio_attr[i].lang_code); - for(i = 0; i < 32; i++) - B2N_16(vts_attributes->vtstt_subp_attr[i].lang_code); CHECK_ZERO(vts_attributes->zero_1); CHECK_ZERO(vts_attributes->zero_2); Index: src/dvdread/dvd_udf.c =================================================================== --- src/dvdread/dvd_udf.c (revision 1001) +++ src/dvdread/dvd_udf.c (revision 1043) @@ -56,7 +56,6 @@ size_t count = block_count; while(count > 0) { - ret = UDFReadBlocksRaw(device, lb_number, count, data, encrypted); if(ret <= 0) { @@ -145,18 +144,17 @@ void FreeUDFCache(void *cache) { struct udf_cache *c = (struct udf_cache *)cache; - if(c == NULL) { + if(c == NULL) return; - } + if(c->lbs) { int n; for(n = 0; n < c->lb_num; n++) free(c->lbs[n].data_base); free(c->lbs); } - if(c->maps) { + if(c->maps) free(c->maps); - } free(c); } @@ -167,15 +165,13 @@ int n; struct udf_cache *c; - if(DVDUDFCacheLevel(device, -1) <= 0) { + if(DVDUDFCacheLevel(device, -1) <= 0) return 0; - } c = (struct udf_cache *)GetUDFCacheHandle(device); - if(c == NULL) { + if(c == NULL) return 0; - } switch(type) { case AVDPCache: @@ -230,19 +226,18 @@ { int n; struct udf_cache *c; + void *tmp; - if(DVDUDFCacheLevel(device, -1) <= 0) { + if(DVDUDFCacheLevel(device, -1) <= 0) return 0; - } c = (struct udf_cache *)GetUDFCacheHandle(device); if(c == NULL) { c = calloc(1, sizeof(struct udf_cache)); /* fprintf(stderr, "calloc: %d\n", sizeof(struct udf_cache)); */ - if(c == NULL) { + if(c == NULL) return 0; - } SetUDFCacheHandle(device, c); } @@ -275,16 +270,18 @@ } } c->lb_num++; - c->lbs = realloc(c->lbs, c->lb_num * sizeof(struct lbudf)); + tmp = realloc(c->lbs, c->lb_num * sizeof(struct lbudf)); /* fprintf(stderr, "realloc lb: %d * %d = %d\n", c->lb_num, sizeof(struct lbudf), c->lb_num * sizeof(struct lbudf)); */ - if(c->lbs == NULL) { + if(tmp == NULL) { + if(c->lbs) free(c->lbs); c->lb_num = 0; return 0; } + c->lbs = tmp; c->lbs[n].data_base = ((uint8_t **)data)[0]; c->lbs[n].data = ((uint8_t **)data)[1]; c->lbs[n].lb = nr; @@ -299,16 +296,18 @@ } } c->map_num++; - c->maps = realloc(c->maps, c->map_num * sizeof(struct icbmap)); + tmp = realloc(c->maps, c->map_num * sizeof(struct icbmap)); /* fprintf(stderr, "realloc maps: %d * %d = %d\n", c->map_num, sizeof(struct icbmap), c->map_num * sizeof(struct icbmap)); */ - if(c->maps == NULL) { + if(tmp == NULL) { + if(c->maps) free(c->maps); c->map_num = 0; return 0; } + c->maps = tmp; c->maps[n] = *(struct icbmap *)data; c->maps[n].lbn = nr; break; @@ -501,20 +500,19 @@ tmpmap.lbn = lbnum; if(GetUDFCache(device, MapCache, lbnum, &tmpmap)) { *FileType = tmpmap.filetype; - *File = tmpmap.file; + memcpy(File, &tmpmap.file, sizeof(tmpmap.file)); return 1; } do { - if( DVDReadLBUDF( device, lbnum++, 1, LogBlock, 0 ) <= 0 ) { + if( DVDReadLBUDF( device, lbnum++, 1, LogBlock, 0 ) <= 0 ) TagID = 0; - } else { + else UDFDescriptor( LogBlock, &TagID ); - } if( TagID == 261 ) { UDFFileEntry( LogBlock, FileType, partition, File ); - tmpmap.file = *File; + memcpy(&tmpmap.file, File, sizeof(tmpmap.file)); tmpmap.filetype = *FileType; SetUDFCache(device, MapCache, tmpmap.lbn, &tmpmap); return 1; @@ -556,18 +554,18 @@ if(!GetUDFCache(device, LBUDFCache, lbnum, &cached_dir)) { dir_lba = (Dir.Length + DVD_VIDEO_LB_LEN) / DVD_VIDEO_LB_LEN; - if((cached_dir_base = malloc(dir_lba * DVD_VIDEO_LB_LEN + 2048)) == NULL) { + if((cached_dir_base = malloc(dir_lba * DVD_VIDEO_LB_LEN + 2048)) == NULL) return 0; - } + cached_dir = (uint8_t *)(((uintptr_t)cached_dir_base & ~((uintptr_t)2047)) + 2048); if( DVDReadLBUDF( device, lbnum, dir_lba, cached_dir, 0) <= 0 ) { free(cached_dir_base); + cached_dir_base = NULL; cached_dir = NULL; } /* if(cached_dir) { - fprintf(stderr, "malloc dir: %d\n", - dir_lba * DVD_VIDEO_LB_LEN); + fprintf(stderr, "malloc dir: %d\n", dir_lba * DVD_VIDEO_LB_LEN); } */ { @@ -576,21 +574,18 @@ data[1] = cached_dir; SetUDFCache(device, LBUDFCache, lbnum, data); } - } else { + } else in_cache = 1; - } - if(cached_dir == NULL) { + if(cached_dir == NULL) return 0; - } p = 0; while( p < Dir.Length ) { UDFDescriptor( &cached_dir[ p ], &TagID ); if( TagID == 257 ) { - p += UDFFileIdentifier( &cached_dir[ p ], &filechar, - filename, &tmpICB ); + p += UDFFileIdentifier( &cached_dir[ p ], &filechar, filename, &tmpICB ); if(cache_file_info && !in_cache) { uint8_t tmpFiletype; struct AD tmpFile; @@ -598,10 +593,8 @@ if( !strcasecmp( FileName, filename ) ) { *FileICB = tmpICB; found = 1; - } - UDFMapICB(device, tmpICB, &tmpFiletype, - partition, &tmpFile); + UDFMapICB(device, tmpICB, &tmpFiletype, partition, &tmpFile); } else { if( !strcasecmp( FileName, filename ) ) { *FileICB = tmpICB; @@ -609,21 +602,18 @@ } } } else { - if(cache_file_info && (!in_cache) && found) { + if(cache_file_info && (!in_cache) && found) return 1; - } return 0; } } - if(cache_file_info && (!in_cache) && found) { + if(cache_file_info && (!in_cache) && found) return 1; - } return 0; } - if( DVDReadLBUDF( device, lbnum, 2, directory, 0 ) <= 0 ) { + if( DVDReadLBUDF( device, lbnum, 2, directory, 0 ) <= 0 ) return 0; - } p = 0; while( p < Dir.Length ) { @@ -642,10 +632,9 @@ if( !strcasecmp( FileName, filename ) ) { return 1; } - } else { + } else return 0; } - } return 0; } @@ -662,9 +651,8 @@ int terminate; struct avdp_t; - if(GetUDFCache(device, AVDPCache, 0, avdp)) { + if(GetUDFCache(device, AVDPCache, 0, avdp)) return 1; - } /* Find Anchor */ lastsector = 0; @@ -682,27 +670,25 @@ if( terminate ) return 0; /* Final try failed */ if( lastsector ) { - - /* We already found the last sector. Try #3, alternative + /* + * We already found the last sector. Try #3, alternative * backup anchor. If that fails, don't try again. */ lbnum = lastsector; terminate = 1; } else { /* TODO: Find last sector of the disc (this is optional). */ - if( lastsector ) { + if( lastsector ) /* Try #2, backup anchor */ lbnum = lastsector - 256; - } else { + else /* Unable to find last sector */ return 0; } - } - } else { + } else /* It's an anchor! We can leave */ break; } - } /* Main volume descriptor */ UDFExtentAD( &Anchor[ 16 ], &MVDS_length, &MVDS_location ); avdp->mvds.location = MVDS_location; @@ -733,10 +719,8 @@ int i, volvalid; struct avdp_t avdp; - - if(!UDFGetAVDP(device, &avdp)) { + if(!UDFGetAVDP(device, &avdp)) return 0; - } /* Main volume descriptor */ MVDS_location = avdp.mvds.location; @@ -751,11 +735,10 @@ lbnum = MVDS_location; do { - if( DVDReadLBUDF( device, lbnum++, 1, LogBlock, 0 ) <= 0 ) { + if( DVDReadLBUDF( device, lbnum++, 1, LogBlock, 0 ) <= 0 ) TagID = 0; - } else { + else UDFDescriptor( LogBlock, &TagID ); - } if( ( TagID == 5 ) && ( !part->valid ) ) { /* Partition Descriptor */ @@ -766,10 +749,9 @@ /* Logical Volume Descriptor */ if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) { /* TODO: sector size wrong! */ - } else { + } else volvalid = 1; } - } } while( ( lbnum <= MVDS_location + ( MVDS_length - 1 ) / DVD_VIDEO_LB_LEN ) && ( TagID != 8 ) @@ -801,9 +783,8 @@ *filesize = 0; tokenline[0] = '\0'; - strcat( tokenline, filename ); + strncat(tokenline, filename, MAX_UDF_FILE_NAME_LEN - 1); - if(!(GetUDFCache(device, PartitionCache, 0, &partition) && GetUDFCache(device, RootICBCache, 0, &RootICB))) { /* Find partition, 0 is the standard location for DVD Video.*/ @@ -813,16 +794,14 @@ /* Find root dir ICB */ lbnum = partition.Start; do { - if( DVDReadLBUDF( device, lbnum++, 1, LogBlock, 0 ) <= 0 ) { + if( DVDReadLBUDF( device, lbnum++, 1, LogBlock, 0 ) <= 0 ) TagID = 0; - } else { + else UDFDescriptor( LogBlock, &TagID ); - } /* File Set Descriptor */ - if( TagID == 256 ) { /* File Set Descriptor */ + if( TagID == 256 ) /* File Set Descriptor */ UDFLongAD( &LogBlock[ 400 ], &RootICB ); - } } while( ( lbnum < partition.Start + partition.Length ) && ( TagID != 8 ) && ( TagID != 256 ) ); @@ -840,26 +819,20 @@ int cache_file_info = 0; /* Tokenize filepath */ token = strtok(tokenline, "/"); - while( token != NULL ) { - if( !UDFScanDir( device, File, token, &partition, &ICB, - cache_file_info)) { + cache_file_info)) return 0; - } - if( !UDFMapICB( device, ICB, &filetype, &partition, &File ) ) { + if( !UDFMapICB( device, ICB, &filetype, &partition, &File ) ) return 0; - } - if(!strcmp(token, "VIDEO_TS")) { + if(!strcmp(token, "VIDEO_TS")) cache_file_info = 1; - } token = strtok( NULL, "/" ); } } /* Sanity check. */ if( File.Partition != 0 ) return 0; - *filesize = File.Length; /* Hack to not return partition.Start for empty files. */ if( !File.Location ) @@ -889,34 +862,27 @@ lastsector = 0; lbnum = 256; /* Try #1, prime anchor */ terminate = 0; - if(bufsize < DVD_VIDEO_LB_LEN) { + if(bufsize < DVD_VIDEO_LB_LEN) return 0; - } - if(!UDFGetAVDP(device, &avdp)) { + if(!UDFGetAVDP(device, &avdp)) return 0; - } /* Main volume descriptor */ MVDS_location = avdp.mvds.location; MVDS_length = avdp.mvds.length; - i = 1; do { /* Find Descriptor */ lbnum = MVDS_location; do { - - if( DVDReadLBUDF( device, lbnum++, 1, descriptor, 0 ) <= 0 ) { + if( DVDReadLBUDF( device, lbnum++, 1, descriptor, 0 ) <= 0 ) TagID = 0; - } else { + else UDFDescriptor( descriptor, &TagID ); - } - - if( (TagID == id) && ( !desc_found ) ) { + if( (TagID == id) && ( !desc_found ) ) /* Descriptor */ desc_found = 1; - } } while( ( lbnum <= MVDS_location + ( MVDS_length - 1 ) / DVD_VIDEO_LB_LEN ) && ( TagID != 8 ) && ( !desc_found) ); @@ -936,19 +902,15 @@ { uint8_t pvd_buf_base[DVD_VIDEO_LB_LEN + 2048]; uint8_t *pvd_buf = (uint8_t *)(((uintptr_t)pvd_buf_base & ~((uintptr_t)2047)) + 2048); - - if(GetUDFCache(device, PVDCache, 0, pvd)) { + if(GetUDFCache(device, PVDCache, 0, pvd)) return 1; - } - if(!UDFGetDescriptor( device, 1, pvd_buf, sizeof(pvd_buf))) { + if(!UDFGetDescriptor( device, 1, pvd_buf, sizeof(pvd_buf))) return 0; - } memcpy(pvd->VolumeIdentifier, &pvd_buf[24], 32); memcpy(pvd->VolumeSetIdentifier, &pvd_buf[72], 128); SetUDFCache(device, PVDCache, 0, pvd); - return 1; } @@ -965,20 +927,16 @@ unsigned int volid_len; /* get primary volume descriptor */ - if(!UDFGetPVD(device, &pvd)) { + if(!UDFGetPVD(device, &pvd)) return 0; - } volid_len = pvd.VolumeIdentifier[31]; - if(volid_len > 31) { + if(volid_len > 31) /* this field is only 32 bytes something is wrong */ volid_len = 31; - } - if(volid_size > volid_len) { + if(volid_size > volid_len) volid_size = volid_len; - } Unicodedecode(pvd.VolumeIdentifier, volid_size, volid); - return volid_len; } @@ -997,16 +955,13 @@ struct pvd_t pvd; /* get primary volume descriptor */ - if(!UDFGetPVD(device, &pvd)) { + if(!UDFGetPVD(device, &pvd)) return 0; - } - if(volsetid_size > 128) { + if(volsetid_size > 128) volsetid_size = 128; - } memcpy(volsetid, pvd.VolumeSetIdentifier, volsetid_size); - return 128; } Index: src/dvdread/nav_read.c =================================================================== --- src/dvdread/nav_read.c (revision 1001) +++ src/dvdread/nav_read.c (revision 1043) @@ -27,104 +27,11 @@ #include "nav_types.h" #include "nav_read.h" #include "dvdread_internal.h" +#include "bitreader.h" -typedef struct { - uint8_t *start; - uint32_t byte_position; - uint32_t bit_position; - uint8_t byte; -} getbits_state_t; +#define getbits_init dvdread_getbits_init +#define getbits dvdread_getbits -static int getbits_init(getbits_state_t *state, uint8_t *start) { - if ((state == NULL) || (start == NULL)) return 0; - state->start = start; - state->bit_position = 0; - state->byte_position = 0; - state->byte = start[0]; - return 1; -} - -/* Non-optimized getbits. */ -/* This can easily be optimized for particular platforms. */ -static uint32_t getbits(getbits_state_t *state, uint32_t number_of_bits) { - uint32_t result=0; - uint8_t byte=0; - if (number_of_bits > 32) { - printf("Number of bits > 32 in getbits\n"); - abort(); - } - - if ((state->bit_position) > 0) { /* Last getbits left us in the middle of a byte. */ - if (number_of_bits > (8-state->bit_position)) { /* this getbits will span 2 or more bytes. */ - byte = state->byte; - byte = byte >> (state->bit_position); - result = byte; - number_of_bits -= (8-state->bit_position); - state->bit_position = 0; - state->byte_position++; - state->byte = state->start[state->byte_position]; - } else { - byte=state->byte; - state->byte = state->byte << number_of_bits; - byte = byte >> (8 - number_of_bits); - result = byte; - state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 8 */ - if (state->bit_position == 8) { - state->bit_position = 0; - state->byte_position++; - state->byte = state->start[state->byte_position]; - } - number_of_bits = 0; - } - } - if ((state->bit_position) == 0) { - while (number_of_bits > 7) { - result = (result << 8) + state->byte; - state->byte_position++; - state->byte = state->start[state->byte_position]; - number_of_bits -= 8; - } - if (number_of_bits > 0) { /* number_of_bits < 8 */ - byte = state->byte; - state->byte = state->byte << number_of_bits; - state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 7 */ - byte = byte >> (8 - number_of_bits); - result = (result << number_of_bits) + byte; - number_of_bits = 0; - } - } - - return result; -} - -#if 0 /* TODO: optimized versions not yet used */ - -/* WARNING: This function can only be used on a byte boundary. - No checks are made that we are in fact on a byte boundary. - */ -static uint16_t get16bits(getbits_state_t *state) { - uint16_t result; - state->byte_position++; - result = (state->byte << 8) + state->start[state->byte_position++]; - state->byte = state->start[state->byte_position]; - return result; -} - -/* WARNING: This function can only be used on a byte boundary. - No checks are made that we are in fact on a byte boundary. - */ -static uint32_t get32bits(getbits_state_t *state) { - uint32_t result; - state->byte_position++; - result = (state->byte << 8) + state->start[state->byte_position++]; - result = (result << 8) + state->start[state->byte_position++]; - result = (result << 8) + state->start[state->byte_position++]; - state->byte = state->start[state->byte_position]; - return result; -} - -#endif - void navRead_PCI(pci_t *pci, unsigned char *buffer) { int32_t i, j; getbits_state_t state; Index: src/dvdread/Makefile.am =================================================================== --- src/dvdread/Makefile.am (revision 1001) +++ src/dvdread/Makefile.am (revision 1043) @@ -7,8 +7,8 @@ lib_LTLIBRARIES = libdvdread.la libdvdread_la_SOURCES = dvd_reader.c nav_read.c ifo_read.c \ - dvd_input.c dvd_udf.c md5.c nav_print.c ifo_print.c \ - bswap.h dvd_input.h dvdread_internal.h dvd_udf.h md5.h + dvd_input.c dvd_udf.c md5.c nav_print.c ifo_print.c bitreader.c \ + bswap.h dvd_input.h dvdread_internal.h dvd_udf.h md5.h bitreader.h libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS) @@ -16,4 +16,4 @@ -export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)" include_HEADERS = dvd_reader.h nav_read.h ifo_read.h \ - nav_print.h ifo_print.h ifo_types.h nav_types.h dvd_udf.h + nav_print.h ifo_print.h ifo_types.h nav_types.h dvd_udf.h bitreader.h Index: src/dvdread/ifo_print.c =================================================================== --- src/dvdread/ifo_print.c (revision 1001) +++ src/dvdread/ifo_print.c (revision 1043) @@ -25,7 +25,6 @@ #include #include -#include "config.h" // Needed for WORDS_BIGENDIAN #include "ifo_types.h" #include "ifo_read.h" #include "ifo_print.h" Index: src/dvdread/dvd_input.c =================================================================== --- src/dvdread/dvd_input.c (revision 1001) +++ src/dvdread/dvd_input.c (revision 1043) @@ -341,7 +341,7 @@ fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); */ fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", - *dvdcss_version); + dvdcss_version ? *dvdcss_version : ""); /* libdvdcss wrapper functions */ dvdinput_open = css_open; Index: misc/dvdread-config.sh =================================================================== --- misc/dvdread-config.sh (revision 0) +++ misc/dvdread-config.sh (revision 1043) @@ -0,0 +1,56 @@ +dvdreadlib="-ldvdread" + +usage() +{ + cat <&2 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix) + echo_prefix=yes + ;; + --version) + echo $version + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_cflags" = "yes"; then + echo -I$prefix/include $extracflags +fi + +if test "$echo_libs" = "yes"; then + echo -L$libdir $dvdreadlib +fi Index: version.sh =================================================================== --- version.sh (revision 1001) +++ version.sh (revision 1043) @@ -1,11 +1,15 @@ #!/bin/sh svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` -test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries | \ +test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | \ cut -d '"' -f2 2> /dev/null` test $svn_revision || svn_revision=UNKNOWN +if test "$svn_revision" = UNKNOWN && test -n "$2"; then + NEW_REVISION="#define VERSION \"$2\"" +else NEW_REVISION="#define VERSION \"SVN-r$svn_revision\"" +fi OLD_REVISION=`cat version.h 2> /dev/null` # Update version.h only on revision changes to avoid spurious rebuilds Index: Makefile =================================================================== --- Makefile (revision 1001) +++ Makefile (revision 1043) @@ -35,9 +35,10 @@ src/dvdread/nav_print.h \ src/dvdread/nav_read.h \ src/dvdread/dvd_udf.h \ - src/dvdread/nav_types.h + src/dvdread/nav_types.h \ + src/dvdread/bitreader.h DVDREAD_SRCS = dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \ - md5.c nav_print.c nav_read.c + md5.c nav_print.c nav_read.c bitreader.c CFLAGS += -I$(SRC_PATH)/src/dvdread else CFLAGS += -I$(DVDREAD_DIR) @@ -60,13 +61,13 @@ BUILDDEPS = Makefile config.mak ifeq ($(BUILD_SHARED),yes) -all: $(SHLIB) $(MINI_SHLIB) $(DVDREAD_SHLIB) dvdnav-config -install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdnav-config +all: $(SHLIB) $(MINI_SHLIB) $(DVDREAD_SHLIB) dvdnav-config dvdread-config +install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdnav-config install-dvdread-config endif ifeq ($(BUILD_STATIC),yes) -all: $(LIB) $(DVDREAD_LIB) dvdnav-config -install: $(LIB) $(DVDREAD_LIB) install-static install-dvdnav-config +all: $(LIB) $(DVDREAD_LIB) dvdnav-config dvdread-config +install: $(LIB) $(DVDREAD_LIB) install-static install-dvdnav-config install-dvdread-config endif install: install-headers @@ -79,9 +80,11 @@ endif version.h: - sh $(SRC_PATH)/version.sh $(SRC_PATH) + sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)" +$(SRCS) $(DVDREAD_SRCS): version.h + # General targets $(.OBJDIR): @@ -188,7 +191,19 @@ install -d $(DESTDIR)$(PREFIX)/bin install -m 0755 $(.OBJDIR)/dvdnav-config $(DESTDIR)$(PREFIX)/bin/dvdnav-config +dvdread-config: $(.OBJDIR) + @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config + @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config + @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config + @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config + @echo >> $(.OBJDIR)/dvdread-config + cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config + chmod 0755 $(.OBJDIR)/dvdread-config +install-dvdread-config: dvdread-config + install -d $(DESTDIR)$(PREFIX)/bin + install -m 0755 $(.OBJDIR)/dvdread-config $(DESTDIR)$(PREFIX)/bin/dvdread-config + vpath %.so ${.OBJDIR} vpath %.o ${.OBJDIR} vpath ${LIB} ${.OBJDIR} Index: examples/menus.c =================================================================== --- examples/menus.c (revision 1001) +++ examples/menus.c (revision 1043) @@ -215,7 +215,6 @@ * engine of the player so that it knows the dimensions of the button areas. */ { pci_t *pci; - dsi_t *dsi; /* Applications with fifos should not use these functions to retrieve NAV packets, * they should implement their own NAV handling, because the packet you get from these @@ -223,7 +222,7 @@ * Applications with fifos should therefore pass the NAV packet through the fifo * and decoding pipeline just like any other data. */ pci = dvdnav_get_current_nav_pci(dvdnav); - dsi = dvdnav_get_current_nav_dsi(dvdnav); + dvdnav_get_current_nav_dsi(dvdnav); if(pci->hli.hl_gi.btn_ns > 0) { int button; Index: libdvdnav.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/libdvdnav.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libdvdnav.spec 13 Apr 2008 15:32:17 -0000 1.8 +++ libdvdnav.spec 26 Jul 2008 18:42:29 -0000 1.9 @@ -1,11 +1,12 @@ Name: libdvdnav Version: 4.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for reading DVD video discs based on Ogle code Group: System Environment/Libraries License: GPLv2+ Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz +Patch0: %{name}-r1001-r1043.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -45,6 +46,7 @@ %prep %setup -q +%patch0 -p0 %build ./configure2 \ @@ -56,9 +58,7 @@ --prefix=%{_prefix} \ --shlibdir=%{_libdir} \ -#parallel make fails -#make %{?_smp_mflags} -make +make %{?_smp_mflags} pushd doc doxygen doxy.conf popd @@ -101,10 +101,15 @@ %files -n libdvdread-devel %defattr(-,root,root,-) +%{_bindir}/dvdnav-config %{_includedir}/dvdread %{_libdir}/libdvdread.so %changelog +* Sat Jul 27 2008 Dominik Mierzejewski 4.1.2-2 +- pull selected fixes from SVN +- re-enable parallel make + * Sun Apr 13 2008 Dominik Mierzejewski 4.1.2-1 - update to 4.1.2 - drop obsolete patches (merged upstream) From fedora-extras-commits at redhat.com Sat Jul 26 18:54:17 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sat, 26 Jul 2008 18:54:17 GMT Subject: rpms/libdvdnav/F-9 libdvdnav.spec,1.9,1.10 Message-ID: <200807261854.m6QIsHjY002143@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libdvdnav/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2081 Modified Files: libdvdnav.spec Log Message: - correct filename - mention RedHat bugzilla number Index: libdvdnav.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/libdvdnav.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libdvdnav.spec 26 Jul 2008 18:42:29 -0000 1.9 +++ libdvdnav.spec 26 Jul 2008 18:53:47 -0000 1.10 @@ -101,13 +101,13 @@ %files -n libdvdread-devel %defattr(-,root,root,-) -%{_bindir}/dvdnav-config +%{_bindir}/dvdread-config %{_includedir}/dvdread %{_libdir}/libdvdread.so %changelog * Sat Jul 27 2008 Dominik Mierzejewski 4.1.2-2 -- pull selected fixes from SVN +- pull selected fixes from SVN (fixes #455961) - re-enable parallel make * Sun Apr 13 2008 Dominik Mierzejewski 4.1.2-1 From fedora-extras-commits at redhat.com Sat Jul 26 18:58:53 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 26 Jul 2008 18:58:53 GMT Subject: rpms/net6/devel .cvsignore, 1.12, 1.13 net6.spec, 1.21, 1.22 sources, 1.12, 1.13 Message-ID: <200807261858.m6QIwr31002436@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/net6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2408 Modified Files: .cvsignore net6.spec sources Log Message: 1.3.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/net6/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 16 Jun 2007 19:55:44 -0000 1.12 +++ .cvsignore 26 Jul 2008 18:58:22 -0000 1.13 @@ -1 +1 @@ -net6-1.3.5.tar.gz +net6-1.3.6.tar.gz Index: net6.spec =================================================================== RCS file: /cvs/pkgs/rpms/net6/devel/net6.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- net6.spec 25 Jun 2008 07:33:34 -0000 1.21 +++ net6.spec 26 Jul 2008 18:58:23 -0000 1.22 @@ -1,6 +1,6 @@ Name: net6 -Version: 1.3.5 -Release: 4%{?dist} +Version: 1.3.6 +Release: 1%{?dist} Summary: A TCP protocol abstraction for library C++ Group: Development/Libraries @@ -71,6 +71,9 @@ %changelog +* Sat Jul 26 2008 Luke Macken - 1.3.6-1 +- Update to the latest upstream release. + * Wed Jun 25 2008 Tomas Mraz - 1.3.5-4 - rebuild with new gnutls Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/net6/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 16 Jun 2007 19:55:44 -0000 1.12 +++ sources 26 Jul 2008 18:58:23 -0000 1.13 @@ -1 +1 @@ -41f6bfce129029d8c4427d26a48b9ee2 net6-1.3.5.tar.gz +033734dff97af88741f41633fbe992bc net6-1.3.6.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 19:03:12 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 26 Jul 2008 19:03:12 GMT Subject: rpms/tlock/devel tlock.spec,1.2,1.3 Message-ID: <200807261903.m6QJ3CWM009379@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9254 Modified Files: tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sun Jul 27 00:32:12 IST 2008 Modified Files: tlock.spec: Changed the share/info/dir menu entry of tlock. ---------------------------------------------------------------------- Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/devel/tlock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tlock.spec 12 Jul 2008 17:04:01 -0000 1.2 +++ tlock.spec 26 Jul 2008 19:02:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: tlock Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal lock Group: Applications/System @@ -72,6 +72,9 @@ %_mandir/man3/* %changelog +* Sat Jul 26 2008 _pjp_ - 1.4-2 +- Fixed the share/info/dir menu entry of tlock. + * Sat Jul 12 2008 _pjp_ - 1.4-1 - Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek (xjakub at fi.muni.cz) From fedora-extras-commits at redhat.com Sat Jul 26 19:04:39 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 26 Jul 2008 19:04:39 GMT Subject: rpms/rpmlint/devel rpmlint-0.84-distregex.patch, NONE, 1.1 rpmlint.spec, 1.47, 1.48 rpmlint-0.78-distregex.patch, 1.1, NONE Message-ID: <200807261904.m6QJ4dX2009593@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9502/devel Modified Files: rpmlint.spec Added Files: rpmlint-0.84-distregex.patch Removed Files: rpmlint-0.78-distregex.patch Log Message: * Sat Jul 26 2008 Ville Skytt?? - 0.84-2 - 0.84, fixes #355861, #456304. - Sync Fedora license list with Wiki revision "16:08, 18 July 2008". - Rediff patches. rpmlint-0.84-distregex.patch: --- NEW FILE rpmlint-0.84-distregex.patch --- diff -up rpmlint-0.84/TagsCheck.py.orig rpmlint-0.84/TagsCheck.py --- rpmlint-0.84/TagsCheck.py.orig 2008-05-22 16:19:31.000000000 +0300 +++ rpmlint-0.84/TagsCheck.py 2008-07-26 21:54:06.000000000 +0300 @@ -398,6 +398,8 @@ packager_regex=re.compile(Config.getOpti basename_regex=re.compile('/?([^/]+)$') changelog_version_regex=re.compile('[^>]([^ >]+)\s*$') changelog_text_version_regex=re.compile('^\s*-\s*((\d+:)?[\w\.]+-[\w\.]+)') +dist_regex=Config.getOption('DistRegex') +if dist_regex: dist_regex=re.compile(dist_regex) release_ext=Config.getOption('ReleaseExtension') extension_regex=release_ext and re.compile(release_ext + '$') use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1) @@ -624,11 +626,13 @@ class TagsCheck(AbstractCheck.AbstractCh srpm = pkg[rpm.RPMTAG_SOURCERPM] or '' # only check when source name correspond to name if srpm[0:-8] == '%s-%s-%s' % (name, version, release): - expected=version + '-' + release + expected=[version + '-' + release] if epoch is not None: # regardless of use_epoch - expected=str(epoch) + ':' + expected - if expected != ret.group(1): - printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected) + expected[0]=str(epoch) + ':' + expected[0] + if dist_regex: + expected.append(dist_regex.sub('', expected[0])) + if ret.group(1) not in expected: + printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected[0]) if clt: changelog=changelog + clt if use_utf8 and not Pkg.is_utf8_str(' '.join(changelog)): Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- rpmlint.spec 26 Jul 2008 17:09:14 -0000 1.47 +++ rpmlint.spec 26 Jul 2008 19:04:08 -0000 1.48 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.84 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -9,7 +9,7 @@ Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 Source1: %{name}.config Source2: %{name}-CHANGES.package.old -Patch0: %{name}-0.78-distregex.patch +Patch0: %{name}-0.84-distregex.patch Patch1: %{name}-0.77-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch1 sed -i -e /MenuCheck/d Config.py install -pm 644 %{SOURCE2} CHANGES.package.old @@ -68,9 +68,10 @@ %changelog -* Sat Jul 26 2008 Ville Skytt?? - 0.84-1 +* Sat Jul 26 2008 Ville Skytt?? - 0.84-2 - 0.84, fixes #355861, #456304. - Sync Fedora license list with Wiki revision "16:08, 18 July 2008". +- Rediff patches. * Tue May 27 2008 Ville Skytt?? - 0.83-1 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441. --- rpmlint-0.78-distregex.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 26 19:04:38 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 26 Jul 2008 19:04:38 GMT Subject: rpms/rpmlint/F-9 rpmlint-0.84-distregex.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 rpmlint.config, 1.20, 1.21 rpmlint.spec, 1.44, 1.45 sources, 1.19, 1.20 rpmlint-0.78-distregex.patch, 1.1, NONE Message-ID: <200807261904.m6QJ4c7Q009590@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/rpmlint/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9502/F-9 Modified Files: .cvsignore rpmlint.config rpmlint.spec sources Added Files: rpmlint-0.84-distregex.patch Removed Files: rpmlint-0.78-distregex.patch Log Message: * Sat Jul 26 2008 Ville Skytt?? - 0.84-2 - 0.84, fixes #355861, #456304. - Sync Fedora license list with Wiki revision "16:08, 18 July 2008". - Rediff patches. rpmlint-0.84-distregex.patch: --- NEW FILE rpmlint-0.84-distregex.patch --- diff -up rpmlint-0.84/TagsCheck.py.orig rpmlint-0.84/TagsCheck.py --- rpmlint-0.84/TagsCheck.py.orig 2008-05-22 16:19:31.000000000 +0300 +++ rpmlint-0.84/TagsCheck.py 2008-07-26 21:54:06.000000000 +0300 @@ -398,6 +398,8 @@ packager_regex=re.compile(Config.getOpti basename_regex=re.compile('/?([^/]+)$') changelog_version_regex=re.compile('[^>]([^ >]+)\s*$') changelog_text_version_regex=re.compile('^\s*-\s*((\d+:)?[\w\.]+-[\w\.]+)') +dist_regex=Config.getOption('DistRegex') +if dist_regex: dist_regex=re.compile(dist_regex) release_ext=Config.getOption('ReleaseExtension') extension_regex=release_ext and re.compile(release_ext + '$') use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1) @@ -624,11 +626,13 @@ class TagsCheck(AbstractCheck.AbstractCh srpm = pkg[rpm.RPMTAG_SOURCERPM] or '' # only check when source name correspond to name if srpm[0:-8] == '%s-%s-%s' % (name, version, release): - expected=version + '-' + release + expected=[version + '-' + release] if epoch is not None: # regardless of use_epoch - expected=str(epoch) + ':' + expected - if expected != ret.group(1): - printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected) + expected[0]=str(epoch) + ':' + expected[0] + if dist_regex: + expected.append(dist_regex.sub('', expected[0])) + if ret.group(1) not in expected: + printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected[0]) if clt: changelog=changelog + clt if use_utf8 and not Pkg.is_utf8_str(' '.join(changelog)): Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 9 Jun 2008 17:39:46 -0000 1.19 +++ .cvsignore 26 Jul 2008 19:04:08 -0000 1.20 @@ -1 +1 @@ -rpmlint-0.83.tar.bz2 +rpmlint-0.84.tar.bz2 Index: rpmlint.config =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/F-9/rpmlint.config,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rpmlint.config 9 Jun 2008 17:39:46 -0000 1.20 +++ rpmlint.config 26 Jul 2008 19:04:08 -0000 1.21 @@ -28,7 +28,7 @@ setOption("ValidLicenses", ( # These are the short names for all of the Fedora approved licenses. # The master list is kept here: http://fedoraproject.org/wiki/Licensing - # Last synced with Revision 0.88 of that page. + # Last synced with revision "16:08, 18 July 2008" of that page. 'Adobe', 'ADSL', 'AFL', @@ -56,17 +56,20 @@ 'CPL', 'Condor', 'Copyright only', - 'Cryptix', 'Crystal Stacker', 'DOC', - 'EPL', + 'ECL 1.0', + 'ECL 2.0', 'eCos', 'EFL 2.0', 'EFL 2.0+', + 'EPL', + 'ERPL', 'EU Datagrid', 'Fair', 'FTL', 'Giftware', + 'GL2PS', 'Glide', 'gnuplot', 'GPL+', @@ -101,11 +104,13 @@ 'LGPLv3+', 'LGPLv3+ with exceptions', 'libtiff', + 'LLGPL', 'LPL', 'LPPL', 'mecab-ipadic', 'MIT', 'MIT with advertising', + 'Motosoto', 'MPLv1.0', 'MPLv1.0+', 'MPLv1.1', @@ -126,6 +131,8 @@ 'OSL 1.1+', 'OSL 2.0', 'OSL 2.0+', + 'OSL 2.1', + 'OSL 2.1+', 'OSL 3.0', 'OSL 3.0+', 'OpenSSL', @@ -138,6 +145,7 @@ 'RiceBSD', 'RPSL', 'Ruby', + 'SCRIP', 'Sendmail', 'Sleepycat', 'SISSL', @@ -154,6 +162,7 @@ 'wxWidgets', 'Xerox', 'xinetd', + 'YPLv1.1', 'Zend', 'ZPLv1.0', 'ZPLv1.0+', Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/F-9/rpmlint.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- rpmlint.spec 9 Jun 2008 17:39:46 -0000 1.44 +++ rpmlint.spec 26 Jul 2008 19:04:08 -0000 1.45 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.83 -Release: 1%{?dist} +Version: 0.84 +Release: 2%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -9,7 +9,7 @@ Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 Source1: %{name}.config Source2: %{name}-CHANGES.package.old -Patch0: %{name}-0.78-distregex.patch +Patch0: %{name}-0.84-distregex.patch Patch1: %{name}-0.77-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch1 sed -i -e /MenuCheck/d Config.py install -pm 644 %{SOURCE2} CHANGES.package.old @@ -68,6 +68,11 @@ %changelog +* Sat Jul 26 2008 Ville Skytt?? - 0.84-2 +- 0.84, fixes #355861, #456304. +- Sync Fedora license list with Wiki revision "16:08, 18 July 2008". +- Rediff patches. + * Tue May 27 2008 Ville Skytt?? - 0.83-1 - 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441. - Fedora licensing patch applied upstream. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 9 Jun 2008 17:39:46 -0000 1.19 +++ sources 26 Jul 2008 19:04:08 -0000 1.20 @@ -1 +1 @@ -674e6d64330811abcee4d2acdbbd00e2 rpmlint-0.83.tar.bz2 +d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2 --- rpmlint-0.78-distregex.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 26 19:05:28 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 26 Jul 2008 19:05:28 GMT Subject: rpms/obby/devel .cvsignore, 1.11, 1.12 obby.spec, 1.30, 1.31 sources, 1.11, 1.12 Message-ID: <200807261905.m6QJ5Sss009725@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/obby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9621 Modified Files: .cvsignore obby.spec sources Log Message: 0.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/obby/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Apr 2007 04:32:54 -0000 1.11 +++ .cvsignore 26 Jul 2008 19:04:58 -0000 1.12 @@ -1 +1 @@ -obby-0.4.4.tar.gz +obby-0.4.5.tar.gz Index: obby.spec =================================================================== RCS file: /cvs/pkgs/rpms/obby/devel/obby.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- obby.spec 25 Jun 2008 07:30:44 -0000 1.30 +++ obby.spec 26 Jul 2008 19:04:58 -0000 1.31 @@ -1,6 +1,6 @@ Name: obby -Version: 0.4.4 -Release: 4%{?dist} +Version: 0.4.5 +Release: 1%{?dist} Summary: A library which provides synced document buffers Group: Development/Libraries @@ -65,6 +65,9 @@ %changelog +* Sat Jul 26 2008 Luke Macken - 0.4.5-1 +- Update to the latest upstream release + * Wed Jun 25 2008 Tomas Mraz - 0.4.4-4 - rebuild with new gnutls Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/obby/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Apr 2007 04:32:54 -0000 1.11 +++ sources 26 Jul 2008 19:04:58 -0000 1.12 @@ -1 +1 @@ -a5a7032bca90f8bb18c433f1ce6be911 obby-0.4.4.tar.gz +bc1e0d2bf7115fe53a54cb4d2d0776b7 obby-0.4.5.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 19:13:41 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 26 Jul 2008 19:13:41 GMT Subject: rpms/gobby/devel gobby-0.4.6-gcc43.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 gobby.spec, 1.29, 1.30 sources, 1.13, 1.14 gobby-0.4.5-gcc43.patch, 1.3, NONE Message-ID: <200807261913.m6QJDflo010181@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/gobby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10121 Modified Files: .cvsignore gobby.spec sources Added Files: gobby-0.4.6-gcc43.patch Removed Files: gobby-0.4.5-gcc43.patch Log Message: 0.4.6 gobby-0.4.6-gcc43.patch: --- NEW FILE gobby-0.4.6-gcc43.patch --- --- src/unix.cpp.orig 2008-02-08 23:06:00.000000000 -0500 +++ src/unix.cpp 2008-02-08 23:06:20.000000000 -0500 @@ -17,6 +17,7 @@ */ #include +#include #include "unix.hpp" namespace --- src/header.cpp.orig 2008-02-08 23:21:04.000000000 -0500 +++ src/header.cpp 2008-02-08 23:21:23.000000000 -0500 @@ -16,6 +16,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include #include --- src/preferencesdialog.cpp.orig 2008-02-08 23:48:31.000000000 -0500 +++ src/preferencesdialog.cpp 2008-02-08 23:48:55.000000000 -0500 @@ -16,6 +16,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include #include #include Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gobby/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 21 Aug 2007 20:30:36 -0000 1.13 +++ .cvsignore 26 Jul 2008 19:13:11 -0000 1.14 @@ -1 +1 @@ -gobby-0.4.5.tar.gz +gobby-0.4.6.tar.gz Index: gobby.spec =================================================================== RCS file: /cvs/pkgs/rpms/gobby/devel/gobby.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gobby.spec 25 Jun 2008 07:21:44 -0000 1.29 +++ gobby.spec 26 Jul 2008 19:13:11 -0000 1.30 @@ -1,6 +1,6 @@ Name: gobby -Version: 0.4.5 -Release: 4%{?dist} +Version: 0.4.6 +Release: 1%{?dist} Summary: Free collaborative editor Group: Applications/Internet @@ -71,6 +71,9 @@ %changelog +* Sat Jul 26 2008 Luke Macken - 0.4.6-1 +- Update to the latest upstream release. + * Wed Jun 25 2008 Tomas Mraz - 0.4.5-4 - rebuild with new gnutls Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gobby/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 21 Aug 2007 20:30:36 -0000 1.13 +++ sources 26 Jul 2008 19:13:11 -0000 1.14 @@ -1 +1 @@ -e5501d37f4199938dfe97d30fdf14e9a gobby-0.4.5.tar.gz +e6a01bf4f615a748d56b80bf6604b1e8 gobby-0.4.6.tar.gz --- gobby-0.4.5-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 26 19:13:57 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 26 Jul 2008 19:13:57 GMT Subject: rpms/sobby/devel sobby.spec,1.16,1.17 Message-ID: <200807261913.m6QJDv2w010231@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/sobby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10153 Modified Files: sobby.spec Log Message: Rebuild against obby 0.4.5 Index: sobby.spec =================================================================== RCS file: /cvs/pkgs/rpms/sobby/devel/sobby.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sobby.spec 25 Jun 2008 13:54:43 -0000 1.16 +++ sobby.spec 26 Jul 2008 19:13:27 -0000 1.17 @@ -1,6 +1,6 @@ Name: sobby Version: 0.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Standalone obby server Group: Applications/Internet @@ -42,6 +42,9 @@ %changelog +* Sat Jul 26 2008 Luke Macken - 0.4.4-4 +- Rebuild against obby 0.4.5 + * Wed Jun 25 2008 Tomas Mraz - 0.4.4-3 - rebuild with new gnutls From fedora-extras-commits at redhat.com Sat Jul 26 19:21:08 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 26 Jul 2008 19:21:08 GMT Subject: rpms/tlock/F-8 sources,1.3,1.4 tlock.spec,1.2,1.3 Message-ID: <200807261921.m6QJL8eP010461@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10385 Modified Files: sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sun Jul 27 00:50:11 IST 2008 Modified Files: sources tlock.spec: Changed the share/info/dir menu entry of tlock. ---------------------------------------------------------------------- Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 17:19:33 -0000 1.3 +++ sources 26 Jul 2008 19:20:37 -0000 1.4 @@ -1 +1 @@ -3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz +79f6253fe3ea5a556be20026069b6016 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-8/tlock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tlock.spec 12 Jul 2008 17:19:33 -0000 1.2 +++ tlock.spec 26 Jul 2008 19:20:37 -0000 1.3 @@ -1,6 +1,6 @@ Name: tlock Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal lock Group: Applications/System @@ -72,6 +72,9 @@ %_mandir/man3/* %changelog +* Sat Jul 26 2008 _pjp_ - 1.4-2 +- Fixed the share/info/dir menu entry of tlock. + * Sat Jul 12 2008 _pjp_ - 1.4-1 - Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek (xjakub at fi.muni.cz) From fedora-extras-commits at redhat.com Sat Jul 26 19:42:09 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sat, 26 Jul 2008 19:42:09 GMT Subject: rpms/tlock/F-9 sources,1.3,1.4 tlock.spec,1.2,1.3 Message-ID: <200807261942.m6QJg9Jf011203@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11104 Modified Files: sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sun Jul 27 01:11:15 IST 2008 Modified Files: sources tlock.spec: Changed the share/info/dir menu entry of tlock. ---------------------------------------------------------------------- Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 17:35:41 -0000 1.3 +++ sources 26 Jul 2008 19:41:39 -0000 1.4 @@ -1 +1 @@ -3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz +79f6253fe3ea5a556be20026069b6016 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/F-9/tlock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tlock.spec 12 Jul 2008 17:35:41 -0000 1.2 +++ tlock.spec 26 Jul 2008 19:41:39 -0000 1.3 @@ -1,6 +1,6 @@ Name: tlock Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal lock Group: Applications/System @@ -72,6 +72,9 @@ %_mandir/man3/* %changelog +* Sat Jul 26 2008 _pjp_ - 1.4-2 +- Fixed the share/info/dir menu entry of tlock. + * Sat Jul 12 2008 _pjp_ - 1.4-1 - Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek (xjakub at fi.muni.cz) From fedora-extras-commits at redhat.com Sat Jul 26 20:00:04 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sat, 26 Jul 2008 20:00:04 GMT Subject: rpms/rpmlint/EL-5 rpmlint.spec,1.35,1.36 Message-ID: <200807262000.m6QK0468011790@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716 Modified Files: rpmlint.spec Log Message: sync with rawhide (0.84, fixes #355861, #456304;Sync Fedora license list with Wiki revision "16:08, 18 July 2008") Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- rpmlint.spec 3 Jun 2008 21:23:28 -0000 1.35 +++ rpmlint.spec 26 Jul 2008 19:59:34 -0000 1.36 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.83 -Release: 1%{?dist} +Version: 0.84 +Release: 2%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -9,7 +9,7 @@ Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 Source1: %{name}.config Source2: %{name}-CHANGES.package.old -Patch0: %{name}-0.78-distregex.patch +Patch0: %{name}-0.84-distregex.patch Patch1: %{name}-0.77-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch1 sed -i -e /MenuCheck/d Config.py install -pm 644 %{SOURCE2} CHANGES.package.old @@ -68,6 +68,11 @@ %changelog +* Sat Jul 26 2008 Ville Skytt?? - 0.84-2 +- 0.84, fixes #355861, #456304. +- Sync Fedora license list with Wiki revision "16:08, 18 July 2008". +- Rediff patches. + * Tue May 27 2008 Manuel Wolfshant - 0.83-1 - resync, bump release to match From fedora-extras-commits at redhat.com Sat Jul 26 20:02:16 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sat, 26 Jul 2008 20:02:16 GMT Subject: rpms/rpmlint/EL-5 .cvsignore,1.19,1.20 sources,1.19,1.20 Message-ID: <200807262002.m6QK2GTH018455@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426 Modified Files: .cvsignore sources Log Message: upload of the new sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 27 May 2008 22:13:17 -0000 1.19 +++ .cvsignore 26 Jul 2008 20:01:46 -0000 1.20 @@ -1 +1,2 @@ -rpmlint-0.83.tar.bz2 +rpmlint-0.84.tar.bz2 +rpmlint-0.84-distregex.patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 27 May 2008 22:13:17 -0000 1.19 +++ sources 26 Jul 2008 20:01:46 -0000 1.20 @@ -1 +1,2 @@ -674e6d64330811abcee4d2acdbbd00e2 rpmlint-0.83.tar.bz2 +d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2 +4a6a0894e3f1a305464cb651b629af30 rpmlint-0.84-distregex.patch From fedora-extras-commits at redhat.com Sat Jul 26 20:05:37 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sat, 26 Jul 2008 20:05:37 GMT Subject: rpms/rpmlint/EL-4 .cvsignore, 1.11, 1.12 rpmlint.spec, 1.19, 1.20 sources, 1.11, 1.12 Message-ID: <200807262005.m6QK5b7w018667@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18595 Modified Files: .cvsignore rpmlint.spec sources Log Message: sync with rawhide (0.84, fixes #355861, #456304;Sync Fedora license list with Wiki revision "16:08, 18 July 2008") Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 27 May 2008 22:06:19 -0000 1.11 +++ .cvsignore 26 Jul 2008 20:05:06 -0000 1.12 @@ -1 +1 @@ -rpmlint-0.83.tar.bz2 +rpmlint-0.84.tar.bz2 Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- rpmlint.spec 3 Jun 2008 21:00:31 -0000 1.19 +++ rpmlint.spec 26 Jul 2008 20:05:06 -0000 1.20 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.83 -Release: 1%{?dist} +Version: 0.84 +Release: 2%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -9,7 +9,7 @@ Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 Source1: %{name}.config Source2: %{name}-CHANGES.package.old -Patch0: %{name}-0.78-distregex.patch +Patch0: %{name}-0.84-distregex.patch Patch1: %{name}-0.77-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch1 sed -i -e /MenuCheck/d Config.py install -pm 644 %{SOURCE2} CHANGES.package.old @@ -68,6 +68,11 @@ %changelog +* Sat Jul 26 2008 Ville Skytt?? - 0.84-2 +- 0.84, fixes #355861, #456304. +- Sync Fedora license list with Wiki revision "16:08, 18 July 2008". +- Rediff patches. + * Tue May 27 2008 Manuel Wolfshant - 0.83-1 - resync, bump release to match Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 27 May 2008 22:06:19 -0000 1.11 +++ sources 26 Jul 2008 20:05:06 -0000 1.12 @@ -1 +1 @@ -674e6d64330811abcee4d2acdbbd00e2 rpmlint-0.83.tar.bz2 +d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 26 20:16:12 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sat, 26 Jul 2008 20:16:12 GMT Subject: rpms/rpmlint/EL-4 .cvsignore,1.12,1.13 sources,1.12,1.13 Message-ID: <200807262016.m6QKGCY9019157@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19072 Modified Files: .cvsignore sources Log Message: add missing patch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Jul 2008 20:05:06 -0000 1.12 +++ .cvsignore 26 Jul 2008 20:15:41 -0000 1.13 @@ -1 +1,2 @@ rpmlint-0.84.tar.bz2 +rpmlint-0.84-distregex.patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Jul 2008 20:05:06 -0000 1.12 +++ sources 26 Jul 2008 20:15:41 -0000 1.13 @@ -1 +1,2 @@ d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2 +4a6a0894e3f1a305464cb651b629af30 rpmlint-0.84-distregex.patch From fedora-extras-commits at redhat.com Sat Jul 26 20:22:53 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 26 Jul 2008 20:22:53 GMT Subject: rpms/lxlauncher/devel import.log, NONE, 1.1 lxlauncher.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807262022.m6QKMrfZ019837@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxlauncher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19691/devel Modified Files: .cvsignore sources Added Files: import.log lxlauncher.spec Log Message: Initial import of lxlauncher. Review was at https://bugzilla.redhat.com/show_bug.cgi?id=452395 --- NEW FILE import.log --- lxlauncher-0_2-1_fc10:HEAD:lxlauncher-0.2-1.fc10.src.rpm:1217103688 --- NEW FILE lxlauncher.spec --- Name: lxlauncher Version: 0.2 Release: 1%{?dist} Summary: Open source replacement for Asus Launcher on the EeePC Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.12 startup-notification-devel BuildRequires: gnome-menus-devel >= 2.18.0 BuildRequires: gettext %description LXLauncher is designed as an open source replacement for the Asus Launcher included in their EeePC. It is desktop-independent and follows freedesktop.org specs, so newly added applications will automatically show up in the launcher, and vice versa for the removed ones. LXLauncher is part of LXDE, the Lightweight X11 Desktop Environment. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/backgrounds mkdir -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/icons %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/desktop-directories/*.directory %changelog * Sat Jun 21 2008 Christoph Wickert - 0.2-1 - Update to 0.2 - Remove empty ChangeLog * Mon May 12 2008 Christoph Wickert - 0.1.6-1 - Initial Fedora RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxlauncher/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Jul 2008 14:04:40 -0000 1.1 +++ .cvsignore 26 Jul 2008 20:22:22 -0000 1.2 @@ -0,0 +1 @@ +lxlauncher-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxlauncher/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Jul 2008 14:04:40 -0000 1.1 +++ sources 26 Jul 2008 20:22:22 -0000 1.2 @@ -0,0 +1 @@ +fc4405e6d20c1de5eef86569ed748847 lxlauncher-0.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 20:56:11 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 26 Jul 2008 20:56:11 GMT Subject: rpms/lxlauncher/F-9 lxlauncher.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807262056.m6QKuBXf021508@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxlauncher/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21426/F-9 Modified Files: .cvsignore sources Added Files: lxlauncher.spec Log Message: * Sat Jun 21 2008 Christoph Wickert - 0.2-1 - Update to 0.2 - Remove empty ChangeLog --- NEW FILE lxlauncher.spec --- Name: lxlauncher Version: 0.2 Release: 1%{?dist} Summary: Open source replacement for Asus Launcher on the EeePC Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.12 startup-notification-devel BuildRequires: gnome-menus-devel >= 2.18.0 BuildRequires: gettext %description LXLauncher is designed as an open source replacement for the Asus Launcher included in their EeePC. It is desktop-independent and follows freedesktop.org specs, so newly added applications will automatically show up in the launcher, and vice versa for the removed ones. LXLauncher is part of LXDE, the Lightweight X11 Desktop Environment. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/backgrounds mkdir -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/icons %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/desktop-directories/*.directory %changelog * Sat Jun 21 2008 Christoph Wickert - 0.2-1 - Update to 0.2 - Remove empty ChangeLog * Mon May 12 2008 Christoph Wickert - 0.1.6-1 - Initial Fedora RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxlauncher/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Jul 2008 14:04:40 -0000 1.1 +++ .cvsignore 26 Jul 2008 20:55:41 -0000 1.2 @@ -0,0 +1 @@ +lxlauncher-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxlauncher/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Jul 2008 14:04:40 -0000 1.1 +++ sources 26 Jul 2008 20:55:41 -0000 1.2 @@ -0,0 +1 @@ +fc4405e6d20c1de5eef86569ed748847 lxlauncher-0.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 20:56:11 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 26 Jul 2008 20:56:11 GMT Subject: rpms/lxlauncher/F-8 lxlauncher.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807262056.m6QKuBwl021512@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxlauncher/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21426/F-8 Modified Files: .cvsignore sources Added Files: lxlauncher.spec Log Message: * Sat Jun 21 2008 Christoph Wickert - 0.2-1 - Update to 0.2 - Remove empty ChangeLog --- NEW FILE lxlauncher.spec --- Name: lxlauncher Version: 0.2 Release: 1%{?dist} Summary: Open source replacement for Asus Launcher on the EeePC Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.12 startup-notification-devel BuildRequires: gnome-menus-devel >= 2.18.0 BuildRequires: gettext %description LXLauncher is designed as an open source replacement for the Asus Launcher included in their EeePC. It is desktop-independent and follows freedesktop.org specs, so newly added applications will automatically show up in the launcher, and vice versa for the removed ones. LXLauncher is part of LXDE, the Lightweight X11 Desktop Environment. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/backgrounds mkdir -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/icons %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/desktop-directories/*.directory %changelog * Sat Jun 21 2008 Christoph Wickert - 0.2-1 - Update to 0.2 - Remove empty ChangeLog * Mon May 12 2008 Christoph Wickert - 0.1.6-1 - Initial Fedora RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lxlauncher/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Jul 2008 14:04:40 -0000 1.1 +++ .cvsignore 26 Jul 2008 20:55:41 -0000 1.2 @@ -0,0 +1 @@ +lxlauncher-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lxlauncher/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Jul 2008 14:04:40 -0000 1.1 +++ sources 26 Jul 2008 20:55:41 -0000 1.2 @@ -0,0 +1 @@ +fc4405e6d20c1de5eef86569ed748847 lxlauncher-0.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 26 21:34:51 2008 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 26 Jul 2008 21:34:51 GMT Subject: rpms/grip/devel grip.spec,1.21,1.22 Message-ID: <200807262134.m6QLYpkc029393@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29361 Modified Files: grip.spec Log Message: * Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 - fixed "Grip silently crahses on F8" (#456721) (converted non UTF-8 .po files to UTF-8) Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- grip.spec 10 Jun 2008 11:36:54 -0000 1.21 +++ grip.spec 26 Jul 2008 21:34:21 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Multimedia @@ -43,6 +43,18 @@ # The following %%_prefix/lib cannot be %%_libdir !! cp -p %{_prefix}/lib/rpm/config.{guess,sub} . +# convert non utf8 .po files to utf8 +# to fix #456721 (Grip silently crahses on F8) +pushd po +for i in de.po es.po fr.po pt_BR.po ru.po; do + iconv -f iso-8859-1 -t utf-8 $i > $i.tmp + mv $i.tmp $i +done +popd + +iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.tmp +mv ChangeLog.tmp ChangeLog + %configure %{__make} %{?_smp_mflags} @@ -82,6 +94,10 @@ %{_mandir}/man1/* %changelog +* Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 +- fixed "Grip silently crahses on F8" (#456721) + (converted non UTF-8 .po files to UTF-8) + * Tue Jun 10 2008 Adrian Reber - 1:3.2.0-19 - removed now unnecessary cell-renderer patch - fixed "default config creates ogg files with .mp3 extension" (#427017) From fedora-extras-commits at redhat.com Sat Jul 26 21:39:03 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 21:39:03 GMT Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.28,1.29 Message-ID: <200807262139.m6QLd3md029660@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29592/F-9 Modified Files: kde-l10n.spec Log Message: * Sat Jul 26 2008 Kevin Kofler 4.1.0-1.1 - on F9, remove kdepim translations we don't ship (#456745) Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- kde-l10n.spec 25 Jul 2008 11:45:35 -0000 1.28 +++ kde-l10n.spec 26 Jul 2008 21:38:33 -0000 1.29 @@ -2,7 +2,7 @@ Name: kde-l10n Version: 4.1.0 -Release: 1%{dist} +Release: 1%{dist}.1 Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -751,6 +751,17 @@ if [ -e docs/kdeadmin/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt fi + # on F9, remove all kdepim stuff except kjots +%if 0%{?fedora} <= 9 + for j in messages/kdepim/*.po ; do + if [ "$j" != "messages/kdepim/kjots.po" ] ; then + rm -f "$j" + fi + if [ -e docs/kdepim/CMakeLists.txt -a -d docs/kdepim/kjots ] ; then + echo 'add_subdirectory(kjots)' >docs/kdepim/CMakeLists.txt + fi + done +%endif mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. @@ -1259,6 +1270,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Sat Jul 26 2008 Kevin Kofler 4.1.0-1.1 +- on F9, remove kdepim translations we don't ship (#456745) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Sat Jul 26 21:45:59 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 21:45:59 GMT Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.29,1.30 Message-ID: <200807262145.m6QLjxBL030229@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30132/F-9 Modified Files: kde-l10n.spec Log Message: Reword changelog to actually make sense. Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- kde-l10n.spec 26 Jul 2008 21:38:33 -0000 1.29 +++ kde-l10n.spec 26 Jul 2008 21:45:29 -0000 1.30 @@ -1271,7 +1271,7 @@ %changelog * Sat Jul 26 2008 Kevin Kofler 4.1.0-1.1 -- on F9, remove kdepim translations we don't ship (#456745) +- on F9, remove translations for kdepim apps we don't ship (#456745) * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Sat Jul 26 21:59:24 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 21:59:24 GMT Subject: rpms/kde-i18n/devel kde-i18n.spec,1.89,1.90 Message-ID: <200807262159.m6QLxOEf031461@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-i18n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31419/devel Modified Files: kde-i18n.spec Log Message: * Sat Jul 26 2008 Kevin Kofler 1:3.5.9-9 - on F10+, remove translations for kdepim apps now part of KDE 4.1 (#456745) Index: kde-i18n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-i18n/devel/kde-i18n.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- kde-i18n.spec 20 Jul 2008 01:14:33 -0000 1.89 +++ kde-i18n.spec 26 Jul 2008 21:58:54 -0000 1.90 @@ -6,7 +6,7 @@ Name: kde-i18n Epoch: 1 Version: 3.5.9 -Release: 8%{?dist} +Release: 9%{?dist} # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. License: GFDL @@ -1258,6 +1258,62 @@ # remove obsolete KDE 3 application data translations rm -rf %{buildroot}%{_datadir}/apps + +%if 0%{?fedora} >= 10 + # on F10+, also get rid of kdepim stuff + rm -rf %{buildroot}%{_docdir}/HTML/*/akregator + rm -rf %{buildroot}%{_docdir}/HTML/*/kaddressbook + rm -rf %{buildroot}%{_docdir}/HTML/*/kalarm + rm -rf %{buildroot}%{_docdir}/HTML/*/kleopatra + rm -rf %{buildroot}%{_docdir}/HTML/*/kmail + rm -rf %{buildroot}%{_docdir}/HTML/*/knode + rm -rf %{buildroot}%{_docdir}/HTML/*/knotes + rm -rf %{buildroot}%{_docdir}/HTML/*/konsolekalendar + rm -rf %{buildroot}%{_docdir}/HTML/*/kontact + rm -rf %{buildroot}%{_docdir}/HTML/*/korganizer + rm -rf %{buildroot}%{_docdir}/HTML/*/korn + rm -rf %{buildroot}%{_docdir}/HTML/*/kpilot + rm -rf %{buildroot}%{_docdir}/HTML/*/ktnef + rm -rf %{buildroot}%{_docdir}/HTML/*/kwatchgnupg + + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_slox.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaddressbook.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalarm.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkabconfig.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimresources.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimwizards.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_groupwise.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kitchensync.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kleopatra.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_calendar_plugin.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_vcard_plugin.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmailcvt.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knode.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotes.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsolekalendar.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kontact.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korganizer.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korn.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpilot.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_birthday.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_featureplan.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupware.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupwise.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_kolab.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_remote.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_scalix.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_tvanytime.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_xmlrpc.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktnef.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwatchgnupg.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdepim.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkholidays.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkleopatra.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpgp.mo + rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libksieve.mo +%endif %endif %clean @@ -1793,6 +1849,9 @@ %changelog +* Sat Jul 26 2008 Kevin Kofler 1:3.5.9-9 +- on F10+, remove translations for kdepim apps now part of KDE 4.1 (#456745) + * Sun Jul 20 2008 Kevin Kofler 1:3.5.9-8 - also remove kpovmodeler translations on F9+ (#454458) From fedora-extras-commits at redhat.com Sat Jul 26 22:11:45 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 22:11:45 GMT Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.30,1.31 Message-ID: <200807262211.m6QMBj26006424@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6402/F-9 Modified Files: kde-l10n.spec Log Message: This section shouldn't be in the loop. Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- kde-l10n.spec 26 Jul 2008 21:45:29 -0000 1.30 +++ kde-l10n.spec 26 Jul 2008 22:11:15 -0000 1.31 @@ -757,10 +757,10 @@ if [ "$j" != "messages/kdepim/kjots.po" ] ; then rm -f "$j" fi - if [ -e docs/kdepim/CMakeLists.txt -a -d docs/kdepim/kjots ] ; then - echo 'add_subdirectory(kjots)' >docs/kdepim/CMakeLists.txt - fi done + if [ -e docs/kdepim/CMakeLists.txt -a -d docs/kdepim/kjots ] ; then + echo 'add_subdirectory(kjots)' >docs/kdepim/CMakeLists.txt + fi %endif mkdir -p %{_target_platform} pushd %{_target_platform} From fedora-extras-commits at redhat.com Sat Jul 26 22:21:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:21:01 +0000 Subject: [pkgdb] merkaartor: till has requested watchbugzilla Message-ID: <20080726222101.400111AD0E3@bastion.fedora.phx.redhat.com> Till Maas (till) has requested the watchbugzilla acl on merkaartor (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:21:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:21:07 +0000 Subject: [pkgdb] merkaartor: till has requested watchcommits Message-ID: <20080726222107.F28A21AD0E9@bastion.fedora.phx.redhat.com> Till Maas (till) has requested the watchcommits acl on merkaartor (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:21:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:21:08 +0000 Subject: [pkgdb] merkaartor: till has requested commit Message-ID: <20080726222108.5AAF81AD0ED@bastion.fedora.phx.redhat.com> Till Maas (till) has requested the commit acl on merkaartor (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:21:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:21:18 +0000 Subject: [pkgdb] merkaartor: till has requested commit Message-ID: <20080726222118.5E1511AD0F8@bastion.fedora.phx.redhat.com> Till Maas (till) has requested the commit acl on merkaartor (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:21:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:21:13 +0000 Subject: [pkgdb] merkaartor: till has requested watchbugzilla Message-ID: <20080726222113.6B0851AD0F0@bastion.fedora.phx.redhat.com> Till Maas (till) has requested the watchbugzilla acl on merkaartor (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:21:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:21:16 +0000 Subject: [pkgdb] merkaartor: till has requested watchcommits Message-ID: <20080726222122.01A8F1AD0E9@bastion.fedora.phx.redhat.com> Till Maas (till) has requested the watchcommits acl on merkaartor (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:26:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:26:20 +0000 Subject: [pkgdb] merkaartor had acl change status Message-ID: <20080726222620.7E3E01AD0E3@bastion.fedora.phx.redhat.com> Sven Lankes (slankes) has set the watchcommits acl on merkaartor (Fedora devel) to Approved for Till Maas (till) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:26:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:26:17 +0000 Subject: [pkgdb] merkaartor had acl change status Message-ID: <20080726222623.8CAE01AD0E9@bastion.fedora.phx.redhat.com> Sven Lankes (slankes) has set the watchbugzilla acl on merkaartor (Fedora devel) to Approved for Till Maas (till) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:26:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:26:25 +0000 Subject: [pkgdb] merkaartor had acl change status Message-ID: <20080726222626.2542C1AD0EC@bastion.fedora.phx.redhat.com> Sven Lankes (slankes) has set the commit acl on merkaartor (Fedora devel) to Approved for Till Maas (till) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:26:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:26:42 +0000 Subject: [pkgdb] merkaartor had acl change status Message-ID: <20080726222642.77DB81AD0E7@bastion.fedora.phx.redhat.com> Sven Lankes (slankes) has set the watchbugzilla acl on merkaartor (Fedora 9) to Approved for Till Maas (till) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:26:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:26:49 +0000 Subject: [pkgdb] merkaartor had acl change status Message-ID: <20080726222649.9B5731AD0F3@bastion.fedora.phx.redhat.com> Sven Lankes (slankes) has set the commit acl on merkaartor (Fedora 9) to Approved for Till Maas (till) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:26:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 26 Jul 2008 22:26:46 +0000 Subject: [pkgdb] merkaartor had acl change status Message-ID: <20080726222646.D7D5C1AD0E5@bastion.fedora.phx.redhat.com> Sven Lankes (slankes) has set the watchcommits acl on merkaartor (Fedora 9) to Approved for Till Maas (till) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/merkaartor From fedora-extras-commits at redhat.com Sat Jul 26 22:37:43 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 22:37:43 GMT Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.31,1.32 Message-ID: <200807262237.m6QMbhtQ007177@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7160/F-9 Modified Files: kde-l10n.spec Log Message: Fix logic. Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- kde-l10n.spec 26 Jul 2008 22:11:15 -0000 1.31 +++ kde-l10n.spec 26 Jul 2008 22:37:12 -0000 1.32 @@ -758,8 +758,12 @@ rm -f "$j" fi done - if [ -e docs/kdepim/CMakeLists.txt -a -d docs/kdepim/kjots ] ; then - echo 'add_subdirectory(kjots)' >docs/kdepim/CMakeLists.txt + if [ -e docs/kdepim/CMakeLists.txt ] ; then + if [ -d docs/kdepim/kjots ] ; then + echo 'add_subdirectory(kjots)' >docs/kdepim/CMakeLists.txt + else + sed -i -e 's/add_subdirectory( *kdepim *)/#add_subdirectory(kdepim)/g' docs/CMakeLists.txt + fi fi %endif mkdir -p %{_target_platform} From fedora-extras-commits at redhat.com Sat Jul 26 23:47:22 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 26 Jul 2008 23:47:22 GMT Subject: rpms/kde-l10n/devel kde-l10n.spec,1.39,1.40 Message-ID: <200807262347.m6QNlM0T017322@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17259/devel Modified Files: kde-l10n.spec Log Message: Sync from F-9 (no new devel build needed): * Sat Jul 26 2008 Kevin Kofler 4.1.0-1.1 - on F9, remove translations for kdepim apps we don't ship (#456745) Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- kde-l10n.spec 24 Jul 2008 16:20:19 -0000 1.39 +++ kde-l10n.spec 26 Jul 2008 23:46:52 -0000 1.40 @@ -2,7 +2,7 @@ Name: kde-l10n Version: 4.1.0 -Release: 1%{dist} +Release: 1%{dist}.1 Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -751,6 +751,21 @@ if [ -e docs/kdeadmin/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt fi + # on F9, remove all kdepim stuff except kjots +%if 0%{?fedora} <= 9 + for j in messages/kdepim/*.po ; do + if [ "$j" != "messages/kdepim/kjots.po" ] ; then + rm -f "$j" + fi + done + if [ -e docs/kdepim/CMakeLists.txt ] ; then + if [ -d docs/kdepim/kjots ] ; then + echo 'add_subdirectory(kjots)' >docs/kdepim/CMakeLists.txt + else + sed -i -e 's/add_subdirectory( *kdepim *)/#add_subdirectory(kdepim)/g' docs/CMakeLists.txt + fi + fi +%endif mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. @@ -1259,6 +1274,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Sat Jul 26 2008 Kevin Kofler 4.1.0-1.1 +- on F9, remove translations for kdepim apps we don't ship (#456745) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Sun Jul 27 00:19:14 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 27 Jul 2008 00:19:14 GMT Subject: rpms/gsynaptics/devel .cvsignore, 1.7, 1.8 gsynaptics.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200807270019.m6R0JET0025905@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/gsynaptics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25858 Modified Files: .cvsignore gsynaptics.spec sources Log Message: * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Update 0.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Dec 2007 10:39:54 -0000 1.7 +++ .cvsignore 27 Jul 2008 00:18:44 -0000 1.8 @@ -1,2 +1 @@ -gsynaptics-0.9.13.tar.gz -gsynaptics-touchpad.png +gsynaptics-0.9.14.tar.gz Index: gsynaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gsynaptics.spec 9 Feb 2008 13:53:49 -0000 1.15 +++ gsynaptics.spec 27 Jul 2008 00:18:44 -0000 1.16 @@ -1,18 +1,18 @@ Name: gsynaptics -Version: 0.9.13 -Release: 3.1 +Version: 0.9.14 +Release: 1 Summary: Settings tool for Synaptics touchpad driver Group: Applications/System License: GPLv2+ URL: http://gsynaptics.sourceforge.jp/ -Source0: http://downloads.sourceforge.jp/gsynaptics/28322/gsynaptics-0.9.13.tar.gz +Source0: http://downloads.sourceforge.jp/gsynaptics/28322/gsynaptics-%{version}.tar.gz # Source1 taken from http://downloads.sourceforge.jp/gsynaptics/15189/gsynaptics-0.9.0.tar.gz # until http://sourceforge.jp/tracker/index.php?func=detail&aid=11265&group_id=1720&atid=6433 get fixed Source1: %{name}-touchpad.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: libgnomeui-devel BuildRequires: libglade2-devel BuildRequires: desktop-file-utils gettext @@ -22,9 +22,9 @@ # Use ExclusiveArch just as synaptics does; see # http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup -# ExcludeArch tracker for now (until proper solution is found): -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242323 -ExclusiveArch: i386 x86_64 ppc +# This is what it should be, but the buildsystem is a disaster +# ExcludeArch: s390 s390x +ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description @@ -78,6 +78,9 @@ %changelog +* Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 +- Update 0.9.14 + * Sat Feb 09 2008 Thorsten Leemhuis - 0.9.13-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Dec 2007 10:39:54 -0000 1.7 +++ sources 27 Jul 2008 00:18:44 -0000 1.8 @@ -1,2 +1 @@ -3b6f2698500de6d8f75d6d3f5b02c402 gsynaptics-0.9.13.tar.gz -d2fc5db12827fc363f655daebca46e8e gsynaptics-touchpad.png +5cf556b26085444288f087587a92484c gsynaptics-0.9.14.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 00:27:30 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sun, 27 Jul 2008 00:27:30 GMT Subject: rpms/mysqltuner/EL-4 mysqltuner.spec,1.3,1.4 Message-ID: <200807270027.m6R0RUFQ026162@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/mysqltuner/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26136 Modified Files: mysqltuner.spec Log Message: new upstream version Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/mysqltuner.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mysqltuner.spec 22 Jun 2008 21:19:42 -0000 1.3 +++ mysqltuner.spec 27 Jul 2008 00:27:00 -0000 1.4 @@ -1,14 +1,12 @@ Name: mysqltuner -Version: 0.9.1 -Release: 2 +Version: 0.9.8 +Release: 1 Summary: MySQL high performance tuning script Group: Applications/Databases License: GPLv3+ URL: http://mysqltuner.com/ Source0: http://mysqltuner.com/mysqltuner.pl.gz -# Sent upstream @0.9.0 time, seems rejected. -Patch0: %{name}-0.9.1-checkversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,9 +24,7 @@ %prep %setup -q -c -T -gzip -dc %{SOURCE0} > mysqltuner.pl -%patch0 -sed -i -e 's/\r\+//g' mysqltuner.pl +gzip -dc %{SOURCE0} | sed -e 's/\r\+//g' > mysqltuner.pl %build @@ -49,7 +45,10 @@ %changelog -* Sat Jun 21 2008 Ville Skytt?? - 0.9.1-2 +* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-1 +- 0.9.8, --checkversion patch applied upstream. + +* Sat Jun 21 2008 Ville Skytt?? - 0.9.1-4 - Don't warn if --skipversion is used (#452172). * Thu Jun 19 2008 Ville Skytt?? - 0.9.1-1 From fedora-extras-commits at redhat.com Sun Jul 27 00:30:17 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sun, 27 Jul 2008 00:30:17 GMT Subject: rpms/mysqltuner/EL-4 mysqltuner.spec,1.4,1.5 Message-ID: <200807270030.m6R0UHED026254@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/mysqltuner/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26217 Modified Files: mysqltuner.spec Log Message: restoring the correct changelog in .spec Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/mysqltuner.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mysqltuner.spec 27 Jul 2008 00:27:00 -0000 1.4 +++ mysqltuner.spec 27 Jul 2008 00:29:47 -0000 1.5 @@ -48,7 +48,7 @@ * Mon Jul 21 2008 Ville Skytt?? - 0.9.8-1 - 0.9.8, --checkversion patch applied upstream. -* Sat Jun 21 2008 Ville Skytt?? - 0.9.1-4 +* Sat Jun 21 2008 Ville Skytt?? - 0.9.1-2 - Don't warn if --skipversion is used (#452172). * Thu Jun 19 2008 Ville Skytt?? - 0.9.1-1 From fedora-extras-commits at redhat.com Sun Jul 27 00:31:21 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 27 Jul 2008 00:31:21 GMT Subject: rpms/gsynaptics/devel .cvsignore,1.8,1.9 sources,1.8,1.9 Message-ID: <200807270031.m6R0VLDF026354@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/gsynaptics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26278 Modified Files: .cvsignore sources Log Message: fix sources and .cvsignore, got corrupted by make new-source Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Jul 2008 00:18:44 -0000 1.8 +++ .cvsignore 27 Jul 2008 00:30:51 -0000 1.9 @@ -1 +1,2 @@ gsynaptics-0.9.14.tar.gz +gsynaptics-touchpad.png Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Jul 2008 00:18:44 -0000 1.8 +++ sources 27 Jul 2008 00:30:51 -0000 1.9 @@ -1 +1,2 @@ 5cf556b26085444288f087587a92484c gsynaptics-0.9.14.tar.gz +d2fc5db12827fc363f655daebca46e8e gsynaptics-touchpad.png From fedora-extras-commits at redhat.com Sun Jul 27 00:31:38 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sun, 27 Jul 2008 00:31:38 GMT Subject: rpms/mysqltuner/EL-4 sources,1.2,1.3 Message-ID: <200807270031.m6R0VcZN026398@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/mysqltuner/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26274 Modified Files: sources Log Message: update source file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jun 2008 18:14:16 -0000 1.2 +++ sources 27 Jul 2008 00:31:07 -0000 1.3 @@ -1 +1 @@ -56f3e3aa6cf9f1c2573c937ca6190fb3 mysqltuner.pl.gz +960fff8a910ba86b1eef62e627670b1f mysqltuner.pl.gz From fedora-extras-commits at redhat.com Sun Jul 27 00:38:40 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 27 Jul 2008 00:38:40 GMT Subject: rpms/gsynaptics/F-8 .cvsignore, 1.6, 1.7 gsynaptics.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200807270038.m6R0celH026829@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/gsynaptics/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26718/F-8 Modified Files: .cvsignore gsynaptics.spec sources Log Message: * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Update 0.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Jun 2007 18:47:08 -0000 1.6 +++ .cvsignore 27 Jul 2008 00:38:10 -0000 1.7 @@ -1 +1,2 @@ -gsynaptics-0.9.12.tar.gz +gsynaptics-0.9.14.tar.gz +gsynaptics-touchpad.png Index: gsynaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-8/gsynaptics.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gsynaptics.spec 28 Aug 2007 04:57:20 -0000 1.12 +++ gsynaptics.spec 27 Jul 2008 00:38:10 -0000 1.13 @@ -1,26 +1,30 @@ Name: gsynaptics -Version: 0.9.12 -Release: 2.1 +Version: 0.9.14 +Release: 1 Summary: Settings tool for Synaptics touchpad driver Group: Applications/System License: GPLv2+ URL: http://gsynaptics.sourceforge.jp/ -Source0: http://downloads.sourceforge.jp/gsynaptics/25147/gsynaptics-0.9.12.tar.gz +Source0: http://downloads.sourceforge.jp/gsynaptics/28322/gsynaptics-%{version}.tar.gz +# Source1 taken from http://downloads.sourceforge.jp/gsynaptics/15189/gsynaptics-0.9.0.tar.gz +# until http://sourceforge.jp/tracker/index.php?func=detail&aid=11265&group_id=1720&atid=6433 get fixed +Source1: %{name}-touchpad.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: libgnomeui-devel BuildRequires: libglade2-devel BuildRequires: desktop-file-utils gettext +BuildRequires: gnome-doc-utils Requires: synaptics # Use ExclusiveArch just as synaptics does; see # http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup -# ExcludeArch tracker for now (until proper solution is found): -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242323 -ExclusiveArch: i386 x86_64 ppc +# This is what it should be, but the buildsystem is a disaster +# ExcludeArch: s390 s390x +ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description @@ -31,6 +35,7 @@ %setup -q cp data/gsynaptics-init.desktop.in.in data/gsynaptics-init.desktop.in.in.org grep -v -e "^Categories=$" data/gsynaptics-init.desktop.in.in.org > data/gsynaptics-init.desktop.in.in +install -p %{SOURCE1} data/touchpad.png %build %configure @@ -68,10 +73,24 @@ %{_datadir}/pixmaps/touchpad.png %{_datadir}/applications/*%{name}.desktop %{_datadir}/gnome/autostart/*%{name}*.desktop +%{_datadir}/gnome/help/%{name} %{_mandir}/man1/gsynaptics* %changelog +* Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 +- Update 0.9.14 + +* Sat Feb 09 2008 Thorsten Leemhuis - 0.9.13-3 +- rebuilt + +* Sat Dec 01 2007 Thorsten Leemhuis - 0.9.13-2 +- BR gnome-doc-utils + +* Sat Dec 01 2007 Thorsten Leemhuis - 0.9.13-1 +- Update to 0.9.13 +- ship touchpad.png, fixes #401891 + * Fri Aug 03 2007 Thorsten Leemhuis - Update License field due to the "Licensing guidelines changes" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Jun 2007 18:47:08 -0000 1.6 +++ sources 27 Jul 2008 00:38:10 -0000 1.7 @@ -1 +1,2 @@ -e07afb3fbf61c55433cbbcc72602a3fb gsynaptics-0.9.12.tar.gz +5cf556b26085444288f087587a92484c gsynaptics-0.9.14.tar.gz +d2fc5db12827fc363f655daebca46e8e gsynaptics-touchpad.png From fedora-extras-commits at redhat.com Sun Jul 27 00:38:39 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 27 Jul 2008 00:38:39 GMT Subject: rpms/gsynaptics/F-9 .cvsignore, 1.7, 1.8 gsynaptics.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200807270038.m6R0cdIu026824@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/gsynaptics/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26718/F-9 Modified Files: .cvsignore gsynaptics.spec sources Log Message: * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Update 0.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Dec 2007 10:39:54 -0000 1.7 +++ .cvsignore 27 Jul 2008 00:38:09 -0000 1.8 @@ -1,2 +1,2 @@ -gsynaptics-0.9.13.tar.gz +gsynaptics-0.9.14.tar.gz gsynaptics-touchpad.png Index: gsynaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-9/gsynaptics.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gsynaptics.spec 9 Feb 2008 13:53:49 -0000 1.15 +++ gsynaptics.spec 27 Jul 2008 00:38:09 -0000 1.16 @@ -1,18 +1,18 @@ Name: gsynaptics -Version: 0.9.13 -Release: 3.1 +Version: 0.9.14 +Release: 1 Summary: Settings tool for Synaptics touchpad driver Group: Applications/System License: GPLv2+ URL: http://gsynaptics.sourceforge.jp/ -Source0: http://downloads.sourceforge.jp/gsynaptics/28322/gsynaptics-0.9.13.tar.gz +Source0: http://downloads.sourceforge.jp/gsynaptics/28322/gsynaptics-%{version}.tar.gz # Source1 taken from http://downloads.sourceforge.jp/gsynaptics/15189/gsynaptics-0.9.0.tar.gz # until http://sourceforge.jp/tracker/index.php?func=detail&aid=11265&group_id=1720&atid=6433 get fixed Source1: %{name}-touchpad.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: libgnomeui-devel BuildRequires: libglade2-devel BuildRequires: desktop-file-utils gettext @@ -22,9 +22,9 @@ # Use ExclusiveArch just as synaptics does; see # http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup -# ExcludeArch tracker for now (until proper solution is found): -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242323 -ExclusiveArch: i386 x86_64 ppc +# This is what it should be, but the buildsystem is a disaster +# ExcludeArch: s390 s390x +ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description @@ -78,6 +78,9 @@ %changelog +* Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 +- Update 0.9.14 + * Sat Feb 09 2008 Thorsten Leemhuis - 0.9.13-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Dec 2007 10:39:54 -0000 1.7 +++ sources 27 Jul 2008 00:38:09 -0000 1.8 @@ -1,2 +1,2 @@ -3b6f2698500de6d8f75d6d3f5b02c402 gsynaptics-0.9.13.tar.gz +5cf556b26085444288f087587a92484c gsynaptics-0.9.14.tar.gz d2fc5db12827fc363f655daebca46e8e gsynaptics-touchpad.png From fedora-extras-commits at redhat.com Sun Jul 27 00:42:14 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sun, 27 Jul 2008 00:42:14 GMT Subject: rpms/mysqltuner/EL-4 mysqltuner.spec,1.5,1.6 Message-ID: <200807270042.m6R0gEZF027195@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/mysqltuner/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532 Modified Files: mysqltuner.spec Log Message: the main maintainer does not want to use %dist so bumping release to allow tagging in EPEL Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/mysqltuner.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mysqltuner.spec 27 Jul 2008 00:29:47 -0000 1.5 +++ mysqltuner.spec 27 Jul 2008 00:41:44 -0000 1.6 @@ -1,6 +1,6 @@ Name: mysqltuner Version: 0.9.8 -Release: 1 +Release: 2 Summary: MySQL high performance tuning script Group: Applications/Databases @@ -45,6 +45,9 @@ %changelog +* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-2 +- bump release tag to allow build + * Mon Jul 21 2008 Ville Skytt?? - 0.9.8-1 - 0.9.8, --checkversion patch applied upstream. From fedora-extras-commits at redhat.com Sun Jul 27 00:46:49 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 27 Jul 2008 00:46:49 GMT Subject: rpms/gsynaptics/F-8 gsynaptics.spec,1.13,1.14 Message-ID: <200807270046.m6R0knFf027617@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/gsynaptics/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27511/F-8 Modified Files: gsynaptics.spec Log Message: * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Use dist tag Index: gsynaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-8/gsynaptics.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gsynaptics.spec 27 Jul 2008 00:38:10 -0000 1.13 +++ gsynaptics.spec 27 Jul 2008 00:46:19 -0000 1.14 @@ -1,6 +1,6 @@ Name: gsynaptics Version: 0.9.14 -Release: 1 +Release: 1%{?dist} Summary: Settings tool for Synaptics touchpad driver Group: Applications/System @@ -79,6 +79,9 @@ %changelog * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 +- Use dist tag + +* Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Update 0.9.14 * Sat Feb 09 2008 Thorsten Leemhuis - 0.9.13-3 From fedora-extras-commits at redhat.com Sun Jul 27 00:46:49 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 27 Jul 2008 00:46:49 GMT Subject: rpms/gsynaptics/F-9 gsynaptics.spec,1.16,1.17 Message-ID: <200807270046.m6R0knPK027621@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/gsynaptics/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27511/F-9 Modified Files: gsynaptics.spec Log Message: * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Use dist tag Index: gsynaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/F-9/gsynaptics.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gsynaptics.spec 27 Jul 2008 00:38:09 -0000 1.16 +++ gsynaptics.spec 27 Jul 2008 00:46:19 -0000 1.17 @@ -1,6 +1,6 @@ Name: gsynaptics Version: 0.9.14 -Release: 1 +Release: 1%{?dist} Summary: Settings tool for Synaptics touchpad driver Group: Applications/System @@ -79,6 +79,9 @@ %changelog * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 +- Use dist tag + +* Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Update 0.9.14 * Sat Feb 09 2008 Thorsten Leemhuis - 0.9.13-3 From fedora-extras-commits at redhat.com Sun Jul 27 00:46:50 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 27 Jul 2008 00:46:50 GMT Subject: rpms/gsynaptics/devel gsynaptics.spec,1.16,1.17 Message-ID: <200807270046.m6R0koZJ027625@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/gsynaptics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27511/devel Modified Files: gsynaptics.spec Log Message: * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Use dist tag Index: gsynaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gsynaptics.spec 27 Jul 2008 00:18:44 -0000 1.16 +++ gsynaptics.spec 27 Jul 2008 00:46:20 -0000 1.17 @@ -1,6 +1,6 @@ Name: gsynaptics Version: 0.9.14 -Release: 1 +Release: 1%{?dist} Summary: Settings tool for Synaptics touchpad driver Group: Applications/System @@ -79,6 +79,9 @@ %changelog * Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 +- Use dist tag + +* Sun Jul 27 2008 Christoph Wickert - 0.9.14-1 - Update 0.9.14 * Sat Feb 09 2008 Thorsten Leemhuis - 0.9.13-3 From fedora-extras-commits at redhat.com Sun Jul 27 00:51:07 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sun, 27 Jul 2008 00:51:07 GMT Subject: rpms/mysqltuner/EL-4 mysqltuner.spec,1.6,1.7 Message-ID: <200807270051.m6R0p7GO028123@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/mysqltuner/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28028 Modified Files: mysqltuner.spec Log Message: restoring the correct changelog entry for 0.9.8-2 Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/mysqltuner.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mysqltuner.spec 27 Jul 2008 00:41:44 -0000 1.6 +++ mysqltuner.spec 27 Jul 2008 00:50:37 -0000 1.7 @@ -45,7 +45,7 @@ %changelog -* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-2 +* Sun Jul 27 2008 manuel wolfshant - 0.9.8-2 - bump release tag to allow build * Mon Jul 21 2008 Ville Skytt?? - 0.9.8-1 From fedora-extras-commits at redhat.com Sun Jul 27 02:01:15 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sun, 27 Jul 2008 02:01:15 GMT Subject: rpms/gconf-editor/devel icon-names.patch, NONE, 1.1 gconf-editor.spec, 1.51, 1.52 Message-ID: <200807270201.m6R21Fli012488@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gconf-editor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5833 Modified Files: gconf-editor.spec Added Files: icon-names.patch Log Message: fix missing icon icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gconf-editor-2.22.0/src/gconf-stock-icons.h.icon-names gconf-editor-2.22.0/src/gconf-stock-icons.h --- gconf-editor-2.22.0/src/gconf-stock-icons.h.icon-names 2008-07-26 21:55:01.000000000 -0400 +++ gconf-editor-2.22.0/src/gconf-stock-icons.h 2008-07-26 21:55:31.000000000 -0400 @@ -24,7 +24,7 @@ #define GCONF_STOCK_ABOUT "gconf-about" #define STOCK_BOOKMARK "stock_bookmark" -#define STOCK_ADD_BOOKMARK "stock_add-bookmark" +#define STOCK_ADD_BOOKMARK "bookmark-new" #define STOCK_EDIT_BOOKMARK "stock_edit-bookmark" void gconf_stock_icons_register (void); Index: gconf-editor.spec =================================================================== RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gconf-editor.spec 11 Mar 2008 03:42:34 -0000 1.51 +++ gconf-editor.spec 27 Jul 2008 02:00:45 -0000 1.52 @@ -8,7 +8,7 @@ Summary: Editor/admin tool for GConf Name: gconf-editor Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gconf-editor/2.22/%{name}-%{version}.tar.bz2 License: GPLv2+ and GFDL @@ -32,12 +32,17 @@ BuildRequires: gnome-doc-utils BuildRequires: perl(XML::Parser) + +# fixed in upstream svn +Patch0: icon-names.patch + %description gconf-editor allows you to browse and modify GConf configuration sources. %prep %setup -q +%patch0 -p1 -b .icon-names %build %configure --disable-scrollkeeper @@ -103,6 +108,9 @@ %dir %{_datadir}/omf/gconf-editor %changelog +* Sat Jul 26 2008 Matthias Clasen - 2.22.0-2 +- Fix missing icon + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 From fedora-extras-commits at redhat.com Sun Jul 27 02:05:19 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Sun, 27 Jul 2008 02:05:19 GMT Subject: comps comps-f10.xml.in,1.61,1.62 Message-ID: <200807270205.m6R25J0x012756@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12719 Modified Files: comps-f10.xml.in Log Message: install cheese by default so that webcams can be more fun Index: comps-f10.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f10.xml.in,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- comps-f10.xml.in 24 Jul 2008 17:00:10 -0000 1.61 +++ comps-f10.xml.in 27 Jul 2008 02:04:49 -0000 1.62 @@ -2071,6 +2071,7 @@ true true + cheese f-spot gimp gimp-help @@ -2081,7 +2082,6 @@ asymptote blender cbrpager - cheese comix dcraw digikam From fedora-extras-commits at redhat.com Sun Jul 27 02:13:02 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sun, 27 Jul 2008 02:13:02 GMT Subject: rpms/control-center/devel icon-names.patch, NONE, 1.1 control-center.spec, 1.386, 1.387 Message-ID: <200807270213.m6R2D2VJ013041@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13003 Modified Files: control-center.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gnome-control-center-2.23.5/capplets/keyboard/gnome-keyboard-properties.c.icon-names gnome-control-center-2.23.5/capplets/keyboard/gnome-keyboard-properties.c --- gnome-control-center-2.23.5/capplets/keyboard/gnome-keyboard-properties.c.icon-names 2008-07-26 22:05:58.000000000 -0400 +++ gnome-control-center-2.23.5/capplets/keyboard/gnome-keyboard-properties.c 2008-07-26 22:07:55.000000000 -0400 @@ -81,7 +81,7 @@ create_dialog (void) image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (WID ("xkb_reset_to_defaults")), image); - image = gtk_image_new_from_icon_name ("gnome-settings-sound", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name ("preferences-desktop-sound", GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (WID ("notifications_button")), image); return dialog; Index: control-center.spec =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v retrieving revision 1.386 retrieving revision 1.387 diff -u -r1.386 -r1.387 --- control-center.spec 25 Jul 2008 00:11:51 -0000 1.386 +++ control-center.spec 27 Jul 2008 02:12:32 -0000 1.387 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -37,6 +37,9 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=542979 Patch10: gcc-libcanberra-support-8.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=544922 +Patch21: icon-names.patch + # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.23.2-passwd.patch Patch96: control-center-2.23.2-gecos.patch @@ -161,6 +164,7 @@ %patch3 -p1 -b .no-gnome-common %patch8 -p1 -b .gtkmarshal %patch10 -p0 -b .libcanberra +%patch21 -p1 -b .icon-names # vendor configuration patches %patch95 -p1 -b .passwd @@ -325,6 +329,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Sat Jul 26 2008 Matthias Clasen - 2.23.5-4 +- Use standard icon names in more places + * Fri Jul 25 2008 - Bastien Nocera - 2.23.5-3 - Remove testing hack From fedora-extras-commits at redhat.com Sun Jul 27 04:17:44 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 27 Jul 2008 04:17:44 GMT Subject: rpms/epiphany-extensions/devel epiphany-extensions-2.22_23-api.diff, NONE, 1.1 epiphany-extensions.spec, 1.46, 1.47 Message-ID: <200807270417.m6R4Hi1P031331@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/epiphany-extensions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31221 Modified Files: epiphany-extensions.spec Added Files: epiphany-extensions-2.22_23-api.diff Log Message: Update for Ephy 2.23, and rebuild for XULrunner 1.9.0.1 epiphany-extensions-2.22_23-api.diff: --- NEW FILE epiphany-extensions-2.22_23-api.diff --- diff -up ./configure.ac.old ./configure.ac --- ./configure.ac.old 2008-07-26 20:23:21.000000000 -0700 +++ ./configure.ac 2008-07-26 20:24:42.000000000 -0700 @@ -24,7 +24,7 @@ m4_define([e_e_branch],["branches/gnome- AC_INIT([GNOME Web Browser Extensions],[e_e_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany-extensions],[epiphany-extensions]) -EPIPHANY_API_VERSION=e_e_version_major.e_e_version_minor +EPIPHANY_API_VERSION=e_e_version_major.23 EPIPHANY_EXTENSIONS_MAJOR=e_e_version_major.e_e_version_minor AC_SUBST(EPIPHANY_EXTENSIONS_MAJOR) @@ -99,7 +99,7 @@ GNOME_DOC_INIT # pkg config checks # ******************************** -EPIPHANY_REQUIRED=2.22.0 +EPIPHANY_REQUIRED=2.23.0 LIBXML_REQUIRED=2.6.0 LIBGLIB_REQUIRED=2.15.5 LIBGTK_REQUIRED=2.11.6 Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- epiphany-extensions.spec 7 Apr 2008 20:10:55 -0000 1.46 +++ epiphany-extensions.spec 27 Jul 2008 04:17:14 -0000 1.47 @@ -1,10 +1,10 @@ -%global ephy_major 2.22 +%global ephy_major 2.23 %global ephy_min_version %{ephy_major}.0 -%global gecko_version 1.9 +%global gecko_version 1.9.0.1 Name: epiphany-extensions -Version: %{ephy_major}.1 -Release: 1%{?dist} +Version: %{ephy_major}.0 +Release: 0.1%{?dist} Summary: Extensions for Epiphany, the GNOME web browser ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is @@ -13,7 +13,10 @@ Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/extensions -Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/%{ephy_major}/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.22/%{name}-2.22.1.tar.bz2 + +## Upstream bug report: http://bugzilla.gnome.org/show_bug.cgi?id=544928 +Patch0: %{name}-2.22_23-api.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,6 +30,9 @@ ## BuildRequire it anyway so we fail if not building against the version ## we are expecting to. BuildRequires: gecko-devel-unstable = %{gecko_version} +## We need the following for recreating the internal build-system after +## patching... +BuildRequires: gnome-common Requires: epiphany >= %{ephy_min_version} Requires: gecko-libs = %{gecko_version} @@ -47,13 +53,14 @@ %prep -%setup -q +%setup -qn "%{name}-2.22.1" +%patch0 -b _2.23-api-build-scripts + %build -## XXX: We're forcibly building against Firefox until the XULrunner -## obsoletes/upgrade-path issues can be properly fixed. -%configure --disable-compiler-warnings --disable-scrollkeeper \ - --with-gecko=libxul-embedding \ +autoreconf +%configure --disable-scrollkeeper \ + --with-gecko=libxul-embedding \ --with-extensions=really-all %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool @@ -113,6 +120,12 @@ %changelog +* Sat Jul 26 2008 Peter Gordon - 2.23.0-0.1 +- Adapt internal build scripts so that the Extensions are built against and + run with Ephy 2.23/2.24: + + 2.22_23-api.diff +- Rebuild for XULrunner 1.9.0.1 while we're at it. :) + * Mon Apr 7 2008 Christopher Aillon - 2.22.1-1 - Update to 2.22.1 From fedora-extras-commits at redhat.com Sun Jul 27 06:33:41 2008 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 27 Jul 2008 06:33:41 GMT Subject: rpms/grip/F-9 grip.spec,1.20,1.21 Message-ID: <200807270633.m6R6XfGR018067@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17907 Modified Files: grip.spec Log Message: * Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 - fixed "Grip silently crahses on F8" (#456721) (converted non UTF-8 .po files to UTF-8) Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/F-9/grip.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- grip.spec 10 Jun 2008 12:38:06 -0000 1.20 +++ grip.spec 27 Jul 2008 06:33:11 -0000 1.21 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Multimedia @@ -43,6 +43,18 @@ # The following %%_prefix/lib cannot be %%_libdir !! cp -p %{_prefix}/lib/rpm/config.{guess,sub} . +# convert non utf8 .po files to utf8 +# to fix #456721 (Grip silently crahses on F8) +pushd po +for i in de.po es.po fr.po pt_BR.po ru.po; do + iconv -f iso-8859-1 -t utf-8 $i > $i.tmp + mv $i.tmp $i +done +popd + +iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.tmp +mv ChangeLog.tmp ChangeLog + %configure %{__make} %{?_smp_mflags} @@ -82,6 +94,10 @@ %{_mandir}/man1/* %changelog +* Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 +- fixed "Grip silently crahses on F8" (#456721) + (converted non UTF-8 .po files to UTF-8) + * Tue Jun 10 2008 Adrian Reber - 1:3.2.0-19 - removed now unnecessary cell-renderer patch - fixed "default config creates ogg files with .mp3 extension" (#427017) From fedora-extras-commits at redhat.com Sun Jul 27 07:22:45 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 27 Jul 2008 07:22:45 GMT Subject: rpms/kernel/devel patch-2.6.26-git15.bz2.sign, NONE, 1.1 .cvsignore, 1.879, 1.880 config-generic, 1.144, 1.145 config-x86-generic, 1.46, 1.47 kernel.spec, 1.807, 1.808 linux-2.6-powerpc-tracehook.patch, 1.2, 1.3 linux-2.6-utrace.patch, 1.84, 1.85 linux-2.6-x86-tracehook.patch, 1.2, 1.3 sources, 1.840, 1.841 upstream, 1.757, 1.758 linux-2.6-sparc64-tracehook.patch, 1.2, NONE linux-2.6-tracehook.patch, 1.6, NONE patch-2.6.26-git14.bz2.sign, 1.1, NONE Message-ID: <200807270722.m6R7MjMo005657@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433 Modified Files: .cvsignore config-generic config-x86-generic kernel.spec linux-2.6-powerpc-tracehook.patch linux-2.6-utrace.patch linux-2.6-x86-tracehook.patch sources upstream Added Files: patch-2.6.26-git15.bz2.sign Removed Files: linux-2.6-sparc64-tracehook.patch linux-2.6-tracehook.patch patch-2.6.26-git14.bz2.sign Log Message: * Sun Jul 27 2008 Roland McGrath - 2.6.26-git15 --- NEW FILE patch-2.6.26-git15.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIjB2OyGugalF9Dw4RAreNAJ9ywsE+bk7qOam0Y6BZsKwI1fa6lQCghEdz JTHjfUzeU/IMZqMXcTLp8UQ= =xpEl -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.879 retrieving revision 1.880 diff -u -r1.879 -r1.880 --- .cvsignore 26 Jul 2008 11:05:15 -0000 1.879 +++ .cvsignore 27 Jul 2008 07:22:15 -0000 1.880 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git14.bz2 +patch-2.6.26-git15.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- config-generic 26 Jul 2008 15:47:24 -0000 1.144 +++ config-generic 27 Jul 2008 07:22:15 -0000 1.145 @@ -2977,6 +2977,7 @@ # CONFIG_UFS_DEBUG is not set CONFIG_9P_FS=m CONFIG_FUSE_FS=m +CONFIG_OMFS_FS=m # # Network File Systems Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- config-x86-generic 26 Jul 2008 03:47:28 -0000 1.46 +++ config-x86-generic 27 Jul 2008 07:22:15 -0000 1.47 @@ -15,6 +15,7 @@ # CONFIG_X86_SUMMIT is not set # CONFIG_X86_BIGSMP is not set # CONFIG_X86_VISWS is not set +# CONFIG_X86_RDC321X is not set # CONFIG_X86_ES7000 is not set # CONFIG_M386 is not set # CONFIG_M486 is not set @@ -323,6 +324,7 @@ CONFIG_PHYSICAL_ALIGN=0x400000 CONFIG_PHYSICAL_START=0x400000 CONFIG_CRASH_DUMP=y +# CONFIG_KEXEC_JUMP is not set CONFIG_PROC_VMCORE=y CONFIG_CRYPTO_DEV_GEODE=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.807 retrieving revision 1.808 diff -u -r1.807 -r1.808 --- kernel.spec 26 Jul 2008 15:47:24 -0000 1.807 +++ kernel.spec 27 Jul 2008 07:22:15 -0000 1.808 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 14 +%define gitrev 15 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -536,11 +536,9 @@ Patch10: linux-2.6-hotfixes.patch -Patch20: linux-2.6-tracehook.patch Patch21: linux-2.6-utrace.patch Patch22: linux-2.6-x86-tracehook.patch Patch23: linux-2.6-powerpc-tracehook.patch -Patch24: linux-2.6-sparc64-tracehook.patch Patch41: linux-2.6-sysrq-c.patch Patch42: linux-2.6-x86-tune-generic.patch @@ -959,11 +957,9 @@ ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. -ApplyPatch linux-2.6-tracehook.patch ApplyPatch linux-2.6-utrace.patch ApplyPatch linux-2.6-x86-tracehook.patch ApplyPatch linux-2.6-powerpc-tracehook.patch -ApplyPatch linux-2.6-sparc64-tracehook.patch # enable sysrq-c on all kernels, not only kexec ApplyPatch linux-2.6-sysrq-c.patch @@ -1696,6 +1692,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Sun Jul 27 2008 Roland McGrath +- 2.6.26-git15 + * Sat Jul 26 2008 Dave Jones - Enable CONFIG_VIDEO_ADV_DEBUG linux-2.6-powerpc-tracehook.patch: Index: linux-2.6-powerpc-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-powerpc-tracehook.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-powerpc-tracehook.patch 26 Jul 2008 03:47:28 -0000 1.2 +++ linux-2.6-powerpc-tracehook.patch 27 Jul 2008 07:22:15 -0000 1.3 @@ -1,13 +1,13 @@ arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/entry_32.S | 11 ++++- arch/powerpc/kernel/entry_64.S | 10 +++- - arch/powerpc/kernel/ptrace.c | 66 +++++++++++++++++----------- + arch/powerpc/kernel/ptrace.c | 47 ++++++++++----------- arch/powerpc/kernel/signal.c | 21 ++++++++- - include/asm-powerpc/ptrace.h | 5 ++ + include/asm-powerpc/ptrace.h | 1 + include/asm-powerpc/signal.h | 3 +- include/asm-powerpc/syscall.h | 84 +++++++++++++++++++++++++++++++++++++ include/asm-powerpc/thread_info.h | 5 ++- - 9 files changed, 169 insertions(+), 37 deletions(-) + 9 files changed, 147 insertions(+), 36 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index fe88418..587da5e 100644 @@ -79,7 +79,7 @@ b .ret_from_except diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c -index a5d0e78..9171316 100644 +index a5d0e78..3f9a942 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -22,6 +22,7 @@ @@ -90,46 +90,7 @@ #include #include #include -@@ -706,12 +707,29 @@ void user_enable_single_step(struct task - task->thread.dbcr0 |= DBCR0_IDM | DBCR0_IC; - regs->msr |= MSR_DE; - #else -+ regs->msr &= ~MSR_BE; - regs->msr |= MSR_SE; - #endif - } - set_tsk_thread_flag(task, TIF_SINGLESTEP); - } - -+void user_enable_block_step(struct task_struct *task) -+{ -+ struct pt_regs *regs = task->thread.regs; -+ -+ if (regs != NULL) { -+#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) -+ task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT; -+ regs->msr |= MSR_DE; -+#else -+ regs->msr &= ~MSR_SE; -+ regs->msr |= MSR_BE; -+#endif -+ } -+ set_tsk_thread_flag(task, TIF_SINGLESTEP); -+} -+ - void user_disable_single_step(struct task_struct *task) - { - struct pt_regs *regs = task->thread.regs; -@@ -728,7 +746,7 @@ void user_disable_single_step(struct tas - task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_IDM); - regs->msr &= ~MSR_DE; - #else -- regs->msr &= ~MSR_SE; -+ regs->msr &= ~(MSR_SE | MSR_BE); - #endif - } - clear_tsk_thread_flag(task, TIF_SINGLESTEP); -@@ -1013,31 +1031,24 @@ long arch_ptrace(struct task_struct *chi +@@ -1013,31 +1014,24 @@ long arch_ptrace(struct task_struct *chi return ret; } @@ -175,7 +136,7 @@ if (unlikely(current->audit_context)) { #ifdef CONFIG_PPC64 -@@ -1055,16 +1066,19 @@ void do_syscall_trace_enter(struct pt_re +@@ -1055,16 +1049,19 @@ void do_syscall_trace_enter(struct pt_re regs->gpr[5] & 0xffffffff, regs->gpr[6] & 0xffffffff); } @@ -251,7 +212,7 @@ unsigned long r5, unsigned long r6, unsigned long r7, unsigned long r8, struct pt_regs *regs) diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h -index 3d6e310..42301cf 100644 +index 3d6e310..734e075 100644 --- a/include/asm-powerpc/ptrace.h +++ b/include/asm-powerpc/ptrace.h @@ -84,6 +84,7 @@ struct pt_regs { @@ -262,23 +223,6 @@ #define regs_return_value(regs) ((regs)->gpr[3]) #ifdef CONFIG_SMP -@@ -136,7 +137,9 @@ do { \ - * These are defined as per linux/ptrace.h, which see. - */ - #define arch_has_single_step() (1) -+#define arch_has_block_step() (1) - extern void user_enable_single_step(struct task_struct *); -+extern void user_enable_block_step(struct task_struct *); - extern void user_disable_single_step(struct task_struct *); - - #endif /* __ASSEMBLY__ */ -@@ -289,4 +292,6 @@ extern void user_disable_single_step(str - #define PPC_PTRACE_PEEKUSR_3264 0x91 - #define PPC_PTRACE_POKEUSR_3264 0x90 - -+#define PTRACE_SINGLEBLOCK 0x100 /* resume execution until next branch */ -+ - #endif /* _ASM_POWERPC_PTRACE_H */ diff --git a/include/asm-powerpc/signal.h b/include/asm-powerpc/signal.h index a8c7bab..a7360cd 100644 --- a/include/asm-powerpc/signal.h linux-2.6-utrace.patch: Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- linux-2.6-utrace.patch 26 Jul 2008 03:47:28 -0000 1.84 +++ linux-2.6-utrace.patch 27 Jul 2008 07:22:15 -0000 1.85 @@ -567,10 +567,10 @@ * ptrace_init_task - initialize ptrace state for a new child * @child: new child task diff --git a/include/linux/sched.h b/include/linux/sched.h -index 99036d5..3f56a3f 100644 +index f59318a..514f217 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1199,6 +1199,11 @@ struct task_struct { +@@ -1198,6 +1198,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -582,7 +582,7 @@ /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1798,6 +1803,7 @@ extern int kill_pgrp(struct pid *pid, in +@@ -1797,6 +1802,7 @@ extern int kill_pgrp(struct pid *pid, in extern int kill_pid(struct pid *pid, int sig, int priv); extern int kill_proc_info(int, struct siginfo *, pid_t); extern int do_notify_parent(struct task_struct *, int); linux-2.6-x86-tracehook.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-x86-tracehook.patch Index: linux-2.6-x86-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-tracehook.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-x86-tracehook.patch 26 Jul 2008 03:47:28 -0000 1.2 +++ linux-2.6-x86-tracehook.patch 27 Jul 2008 07:22:15 -0000 1.3 @@ -1,17 +1,1130 @@ - arch/x86/Kconfig | 1 + - arch/x86/kernel/ptrace.c | 34 +------ - arch/x86/kernel/signal_32.c | 11 ++- - arch/x86/kernel/signal_64.c | 49 +++------- - include/asm-x86/ptrace.h | 5 + - include/asm-x86/syscall.h | 210 +++++++++++++++++++++++++++++++++++++++++ - include/asm-x86/thread_info.h | 4 +- - 7 files changed, 248 insertions(+), 66 deletions(-) + Documentation/isdn/README.mISDN | 6 - + arch/alpha/kernel/osf_sys.c | 10 +- + arch/arm/mach-at91/at91cap9_devices.c | 8 +- + arch/arm/mach-at91/at91rm9200_devices.c | 8 +- + arch/arm/mach-at91/at91sam9260_devices.c | 8 +- + arch/arm/mach-at91/at91sam9261_devices.c | 12 +- + arch/arm/mach-at91/at91sam9263_devices.c | 8 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 12 +- + arch/arm/mach-at91/board-cam60.c | 2 +- + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-dk.c | 2 +- + arch/arm/mach-at91/board-kb9202.c | 2 +- + arch/arm/mach-at91/board-sam9-l9260.c | 2 +- + arch/arm/mach-at91/board-sam9260ek.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 2 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + arch/arm/mach-at91/board-yl-9200.c | 2 +- + arch/avr32/boards/atstk1000/Kconfig | 4 - + arch/avr32/boards/atstk1000/Makefile | 1 - + arch/avr32/boards/atstk1000/atstk1002.c | 78 +- + arch/avr32/mach-at32ap/at32ap700x.c | 52 - + arch/avr32/mach-at32ap/hsmc.c | 2 +- + arch/parisc/hpux/sys_hpux.c | 10 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/ptrace.c | 34 +- + arch/x86/kernel/signal_32.c | 11 +- + arch/x86/kernel/signal_64.c | 49 +- + drivers/char/ser_a2232.c | 52 +- + drivers/char/vme_scc.c | 59 +- + drivers/firmware/memmap.c | 6 +- + drivers/infiniband/core/ucm.c | 10 +- + drivers/infiniband/core/ucma.c | 11 +- + drivers/infiniband/hw/mlx4/cq.c | 1 - + drivers/infiniband/hw/mlx4/main.c | 1 - + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 - + drivers/infiniband/hw/mlx4/mr.c | 1 - + drivers/infiniband/hw/mlx4/qp.c | 1 - + drivers/infiniband/hw/mlx4/srq.c | 1 - + drivers/infiniband/hw/mlx4/user.h | 1 - + drivers/infiniband/hw/nes/nes.c | 4 +- + drivers/infiniband/hw/nes/nes_cm.c | 2034 +++++------- + drivers/infiniband/hw/nes/nes_cm.h | 23 +- + drivers/infiniband/hw/nes/nes_hw.c | 9 + + drivers/infiniband/hw/nes/nes_verbs.c | 15 + + drivers/infiniband/ulp/ipoib/Kconfig | 22 +- + drivers/isdn/Kconfig | 4 +- + drivers/isdn/Makefile | 1 - + drivers/isdn/hardware/Makefile | 1 - + drivers/isdn/hardware/mISDN/Kconfig | 25 - + drivers/isdn/hardware/mISDN/Makefile | 7 - + drivers/isdn/hardware/mISDN/hfc_multi.h | 1204 ------- + drivers/isdn/hardware/mISDN/hfc_pci.h | 228 -- + drivers/isdn/hardware/mISDN/hfcmulti.c | 5320 ------------------------------ + drivers/isdn/hardware/mISDN/hfcpci.c | 2256 ------------- + drivers/isdn/mISDN/Kconfig | 44 - + drivers/isdn/mISDN/Makefile | 13 - + drivers/isdn/mISDN/core.c | 244 -- + drivers/isdn/mISDN/core.h | 77 - + drivers/isdn/mISDN/dsp.h | 263 -- + drivers/isdn/mISDN/dsp_audio.c | 434 --- + drivers/isdn/mISDN/dsp_biquad.h | 65 - + drivers/isdn/mISDN/dsp_blowfish.c | 672 ---- + drivers/isdn/mISDN/dsp_cmx.c | 1886 ----------- + drivers/isdn/mISDN/dsp_core.c | 1191 ------- + drivers/isdn/mISDN/dsp_dtmf.c | 303 -- + drivers/isdn/mISDN/dsp_ecdis.h | 110 - + drivers/isdn/mISDN/dsp_hwec.c | 138 - + drivers/isdn/mISDN/dsp_hwec.h | 10 - + drivers/isdn/mISDN/dsp_pipeline.c | 348 -- + drivers/isdn/mISDN/dsp_tones.c | 551 --- + drivers/isdn/mISDN/fsm.c | 183 - + drivers/isdn/mISDN/fsm.h | 67 - + drivers/isdn/mISDN/hwchannel.c | 365 -- + drivers/isdn/mISDN/l1oip.h | 91 - + drivers/isdn/mISDN/l1oip_codec.c | 374 --- + drivers/isdn/mISDN/l1oip_core.c | 1518 --------- + drivers/isdn/mISDN/layer1.c | 403 --- + drivers/isdn/mISDN/layer1.h | 26 - + drivers/isdn/mISDN/layer2.c | 2216 ------------- + drivers/isdn/mISDN/layer2.h | 140 - + drivers/isdn/mISDN/socket.c | 781 ----- + drivers/isdn/mISDN/stack.c | 674 ---- + drivers/isdn/mISDN/tei.c | 1340 -------- + drivers/isdn/mISDN/timerdev.c | 301 -- + drivers/mmc/core/Makefile | 1 - + drivers/mmc/core/bus.c | 8 - + drivers/mmc/core/core.h | 7 - + drivers/mmc/core/debugfs.c | 225 -- + drivers/mmc/core/host.c | 8 - + drivers/mmc/host/atmel-mci-regs.h | 2 - + drivers/mmc/host/atmel-mci.c | 189 -- + drivers/mmc/host/imxmmc.c | 50 +- + drivers/mmc/host/mmc_spi.c | 3 +- + drivers/mtd/Kconfig | 2 + + drivers/mtd/afs.c | 2 + + drivers/mtd/chips/cfi_cmdset_0001.c | 17 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 3 + + drivers/mtd/chips/cfi_cmdset_0020.c | 2 + + drivers/mtd/chips/cfi_probe.c | 1 + + drivers/mtd/chips/cfi_util.c | 3 + + drivers/mtd/chips/chipreg.c | 2 + + drivers/mtd/chips/gen_probe.c | 5 +- + drivers/mtd/chips/jedec_probe.c | 133 +- + drivers/mtd/chips/map_absent.c | 1 + + drivers/mtd/chips/map_ram.c | 1 + + drivers/mtd/chips/map_rom.c | 1 + + drivers/mtd/cmdlinepart.c | 4 +- + drivers/mtd/devices/Kconfig | 1 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/block2mtd.c | 6 + + drivers/mtd/devices/doc2000.c | 2 + + drivers/mtd/devices/doc2001.c | 2 + + drivers/mtd/devices/doc2001plus.c | 2 + + drivers/mtd/devices/docecc.c | 2 + + drivers/mtd/devices/docprobe.c | 5 + + drivers/mtd/devices/lart.c | 2 + + drivers/mtd/devices/m25p80.c | 22 - + drivers/mtd/devices/ms02-nv.c | 2 + + drivers/mtd/devices/ms02-nv.h | 2 + + drivers/mtd/devices/mtd_dataflash.c | 135 +- + drivers/mtd/devices/mtdram.c | 1 + + drivers/mtd/devices/phram.c | 2 + + drivers/mtd/devices/pmc551.c | 2 + + drivers/mtd/devices/slram.c | 2 + + drivers/mtd/ftl.c | 3 + + drivers/mtd/inftlcore.c | 5 + + drivers/mtd/inftlmount.c | 4 + + drivers/mtd/maps/Kconfig | 30 +- + drivers/mtd/maps/Makefile | 3 +- + drivers/mtd/maps/amd76xrom.c | 1 + + drivers/mtd/maps/autcpu12-nvram.c | 2 + + drivers/mtd/maps/bast-flash.c | 226 ++ + drivers/mtd/maps/bfin-async-flash.c | 219 -- + drivers/mtd/maps/cdb89712.c | 1 + + drivers/mtd/maps/ceiva.c | 1 + + drivers/mtd/maps/cfi_flagadm.c | 2 + + drivers/mtd/maps/dbox2-flash.c | 2 + + drivers/mtd/maps/dc21285.c | 2 + + drivers/mtd/maps/dilnetpc.c | 2 + + drivers/mtd/maps/dmv182.c | 2 + + drivers/mtd/maps/ebony.c | 2 + + drivers/mtd/maps/edb7312.c | 2 + + drivers/mtd/maps/fortunet.c | 1 + + drivers/mtd/maps/h720x-flash.c | 2 + + drivers/mtd/maps/ichxrom.c | 1 + + drivers/mtd/maps/impa7.c | 2 + + drivers/mtd/maps/integrator-flash.c | 2 + + drivers/mtd/maps/ipaq-flash.c | 2 + + drivers/mtd/maps/ixp2000.c | 2 + + drivers/mtd/maps/ixp4xx.c | 2 + + drivers/mtd/maps/l440gx.c | 2 + + drivers/mtd/maps/map_funcs.c | 2 + + drivers/mtd/maps/mbx860.c | 2 + + drivers/mtd/maps/netsc520.c | 2 + + drivers/mtd/maps/nettel.c | 2 + + drivers/mtd/maps/octagon-5066.c | 1 + + drivers/mtd/maps/omap-toto-flash.c | 2 + + drivers/mtd/maps/pci.c | 2 + + drivers/mtd/maps/pcmciamtd.c | 5 +- + drivers/mtd/maps/physmap.c | 24 +- + drivers/mtd/maps/plat-ram.c | 2 + + drivers/mtd/maps/redwood.c | 2 + + drivers/mtd/maps/rpxlite.c | 2 + + drivers/mtd/maps/sa1100-flash.c | 2 + + drivers/mtd/maps/sbc8240.c | 3 + + drivers/mtd/maps/sbc_gxx.c | 2 + + drivers/mtd/maps/sc520cdp.c | 2 + + drivers/mtd/maps/scb2_flash.c | 1 + + drivers/mtd/maps/scx200_docflash.c | 2 + + drivers/mtd/maps/sharpsl-flash.c | 2 + + drivers/mtd/maps/solutionengine.c | 2 + + drivers/mtd/maps/sun_uflash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 + + drivers/mtd/maps/ts5500_flash.c | 2 + + drivers/mtd/maps/tsunami_flash.c | 1 + + drivers/mtd/maps/uclinux.c | 2 + + drivers/mtd/maps/vmax301.c | 1 + + drivers/mtd/maps/walnut.c | 2 + + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 + + drivers/mtd/mtd_blkdevs.c | 34 +- + drivers/mtd/mtdblock.c | 2 + + drivers/mtd/mtdblock_ro.c | 2 + [...44849 lines suppressed...] +- long inflight_refs; ++ int total_refs; ++ int inflight_refs; + + total_refs = file_count(u->sk.sk_socket->file); +- inflight_refs = atomic_long_read(&u->inflight); ++ inflight_refs = atomic_read(&u->inflight); + + BUG_ON(inflight_refs < 1); + BUG_ON(total_refs < inflight_refs); +@@ -324,7 +324,7 @@ void unix_gc(void) + /* Move cursor to after the current position. */ + list_move(&cursor, &u->link); + +- if (atomic_long_read(&u->inflight) > 0) { ++ if (atomic_read(&u->inflight) > 0) { + list_move_tail(&u->link, &gc_inflight_list); + u->gc_candidate = 0; + scan_children(&u->sk, inc_inflight_move_tail, NULL); +diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c +index 96036cf..23a2cc0 100644 +--- a/net/xfrm/xfrm_algo.c ++++ b/net/xfrm/xfrm_algo.c +@@ -718,7 +718,7 @@ int skb_icv_walk(const struct sk_buff *s + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + int end; + +- WARN_ON(start > offset + len); ++ BUG_TRAP(start <= offset + len); + + end = start + skb_shinfo(skb)->frags[i].size; + if ((copy = end - offset) > 0) { +@@ -748,7 +748,7 @@ int skb_icv_walk(const struct sk_buff *s + for (; list; list = list->next) { + int end; + +- WARN_ON(start > offset + len); ++ BUG_TRAP(start <= offset + len); + + end = start + list->len; + if ((copy = end - offset) > 0) { +diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c +index c609a4b..800f669 100644 +--- a/net/xfrm/xfrm_ipcomp.c ++++ b/net/xfrm/xfrm_ipcomp.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -250,7 +251,7 @@ static void ipcomp_free_tfms(struct cryp + break; + } + +- WARN_ON(!pos); ++ BUG_TRAP(pos); + + if (--pos->users) + return; +diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c +index 4c6914e..72fddaf 100644 +--- a/net/xfrm/xfrm_state.c ++++ b/net/xfrm/xfrm_state.c +@@ -538,7 +538,7 @@ EXPORT_SYMBOL(xfrm_state_alloc); + + void __xfrm_state_destroy(struct xfrm_state *x) + { +- WARN_ON(x->km.state != XFRM_STATE_DEAD); ++ BUG_TRAP(x->km.state == XFRM_STATE_DEAD); + + spin_lock_bh(&xfrm_state_lock); + list_del(&x->all); +diff --git a/security/capability.c b/security/capability.c +index 63d10da..5b01c0b 100644 +--- a/security/capability.c ++++ b/security/capability.c +@@ -211,7 +211,8 @@ static int cap_inode_follow_link(struct + return 0; + } + +-static int cap_inode_permission(struct inode *inode, int mask) ++static int cap_inode_permission(struct inode *inode, int mask, ++ struct nameidata *nd) + { + return 0; + } +diff --git a/security/security.c b/security/security.c +index ff70687..59f23b5 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -429,11 +429,11 @@ int security_inode_follow_link(struct de + return security_ops->inode_follow_link(dentry, nd); + } + +-int security_inode_permission(struct inode *inode, int mask) ++int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd) + { + if (unlikely(IS_PRIVATE(inode))) + return 0; +- return security_ops->inode_permission(inode, mask); ++ return security_ops->inode_permission(inode, mask, nd); + } + + int security_inode_setattr(struct dentry *dentry, struct iattr *attr) +@@ -442,7 +442,6 @@ int security_inode_setattr(struct dentry + return 0; + return security_ops->inode_setattr(dentry, attr); + } +-EXPORT_SYMBOL_GPL(security_inode_setattr); + + int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry) + { +diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c +index 40d06c5..3481cde 100644 +--- a/security/selinux/hooks.c ++++ b/security/selinux/hooks.c +@@ -2624,11 +2624,12 @@ static int selinux_inode_follow_link(str + return dentry_has_perm(current, NULL, dentry, FILE__READ); + } + +-static int selinux_inode_permission(struct inode *inode, int mask) ++static int selinux_inode_permission(struct inode *inode, int mask, ++ struct nameidata *nd) + { + int rc; + +- rc = secondary_ops->inode_permission(inode, mask); ++ rc = secondary_ops->inode_permission(inode, mask, nd); + if (rc) + return rc; + +@@ -5653,20 +5654,27 @@ static struct nf_hook_ops selinux_ipv6_o + static int __init selinux_nf_ip_init(void) + { + int err = 0; ++ u32 iter; + + if (!selinux_enabled) + goto out; + + printk(KERN_DEBUG "SELinux: Registering netfilter hooks\n"); + +- err = nf_register_hooks(selinux_ipv4_ops, ARRAY_SIZE(selinux_ipv4_ops)); +- if (err) +- panic("SELinux: nf_register_hooks for IPv4: error %d\n", err); ++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv4_ops); iter++) { ++ err = nf_register_hook(&selinux_ipv4_ops[iter]); ++ if (err) ++ panic("SELinux: nf_register_hook for IPv4: error %d\n", ++ err); ++ } + + #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +- err = nf_register_hooks(selinux_ipv6_ops, ARRAY_SIZE(selinux_ipv6_ops)); +- if (err) +- panic("SELinux: nf_register_hooks for IPv6: error %d\n", err); ++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv6_ops); iter++) { ++ err = nf_register_hook(&selinux_ipv6_ops[iter]); ++ if (err) ++ panic("SELinux: nf_register_hook for IPv6: error %d\n", ++ err); ++ } + #endif /* IPV6 */ + + out: +@@ -5678,11 +5686,15 @@ __initcall(selinux_nf_ip_init); + #ifdef CONFIG_SECURITY_SELINUX_DISABLE + static void selinux_nf_ip_exit(void) + { ++ u32 iter; ++ + printk(KERN_DEBUG "SELinux: Unregistering netfilter hooks\n"); + +- nf_unregister_hooks(selinux_ipv4_ops, ARRAY_SIZE(selinux_ipv4_ops)); ++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv4_ops); iter++) ++ nf_unregister_hook(&selinux_ipv4_ops[iter]); + #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +- nf_unregister_hooks(selinux_ipv6_ops, ARRAY_SIZE(selinux_ipv6_ops)); ++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv6_ops); iter++) ++ nf_unregister_hook(&selinux_ipv6_ops[iter]); + #endif /* IPV6 */ + } + #endif +diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c +index 1b40e55..ee5a51c 100644 +--- a/security/smack/smack_lsm.c ++++ b/security/smack/smack_lsm.c +@@ -522,7 +522,8 @@ static int smack_inode_rename(struct ino + * + * Returns 0 if access is permitted, -EACCES otherwise + */ +-static int smack_inode_permission(struct inode *inode, int mask) ++static int smack_inode_permission(struct inode *inode, int mask, ++ struct nameidata *nd) + { + /* + * No permission to check. Existence test. Yup, it's there. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.840 retrieving revision 1.841 diff -u -r1.840 -r1.841 --- sources 26 Jul 2008 11:05:15 -0000 1.840 +++ sources 27 Jul 2008 07:22:15 -0000 1.841 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -b84837b3c4c226985ca101bb88105615 patch-2.6.26-git14.bz2 +e7e0954872d735515623e77506d65065 patch-2.6.26-git15.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.757 retrieving revision 1.758 diff -u -r1.757 -r1.758 --- upstream 26 Jul 2008 11:05:15 -0000 1.757 +++ upstream 27 Jul 2008 07:22:15 -0000 1.758 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git14.bz2 +patch-2.6.26-git15.bz2 --- linux-2.6-sparc64-tracehook.patch DELETED --- --- linux-2.6-tracehook.patch DELETED --- --- patch-2.6.26-git14.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 07:23:01 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Sun, 27 Jul 2008 07:23:01 GMT Subject: rpms/pyephem/devel pyephem.spec,1.1,1.2 Message-ID: <200807270723.m6R7N10P005781@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/pyephem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5522 Modified Files: pyephem.spec Log Message: revision increase Index: pyephem.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyephem/devel/pyephem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyephem.spec 25 Apr 2008 05:03:18 -0000 1.1 +++ pyephem.spec 27 Jul 2008 07:22:31 -0000 1.2 @@ -2,7 +2,7 @@ Name: pyephem Version: 3.7.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The astronomy library for Python Group: Development/Libraries @@ -40,5 +40,8 @@ %exclude %{python_sitearch}/ephem/tests %changelog +* Sun Jul 27 2008 Marek Mahut - 3.7.2.3-2 +- Revision increase + * Thu Apr 21 2008 Marek Mahut - 3.7.2.3-1 - Initial build From fedora-extras-commits at redhat.com Sun Jul 27 08:14:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 08:14:22 +0000 Subject: [pkgdb] rpmlint ownership updated Message-ID: <20080727081422.B26981AD0E9@bastion.fedora.phx.redhat.com> Package rpmlint in Fedora 8 was orphaned by Ville Skytta (scop) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint From fedora-extras-commits at redhat.com Sun Jul 27 08:26:08 2008 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 27 Jul 2008 08:26:08 GMT Subject: rpms/grip/F-8 grip.spec,1.19,1.20 Message-ID: <200807270826.m6R8Q8Ux029133@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29066 Modified Files: grip.spec Log Message: * Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 - fixed "Grip silently crahses on F8" (#456721) (converted non UTF-8 .po files to UTF-8) Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/F-8/grip.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- grip.spec 10 Jun 2008 12:42:03 -0000 1.19 +++ grip.spec 27 Jul 2008 08:25:38 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Multimedia @@ -43,6 +43,18 @@ # The following %%_prefix/lib cannot be %%_libdir !! cp -p %{_prefix}/lib/rpm/config.{guess,sub} . +# convert non utf8 .po files to utf8 +# to fix #456721 (Grip silently crahses on F8) +pushd po +for i in de.po es.po fr.po pt_BR.po ru.po; do + iconv -f iso-8859-1 -t utf-8 $i > $i.tmp + mv $i.tmp $i +done +popd + +iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.tmp +mv ChangeLog.tmp ChangeLog + %configure %{__make} %{?_smp_mflags} @@ -82,6 +94,10 @@ %{_mandir}/man1/* %changelog +* Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 +- fixed "Grip silently crahses on F8" (#456721) + (converted non UTF-8 .po files to UTF-8) + * Tue Jun 10 2008 Adrian Reber - 1:3.2.0-19 - removed now unnecessary cell-renderer patch - fixed "default config creates ogg files with .mp3 extension" (#427017) From fedora-extras-commits at redhat.com Sun Jul 27 08:41:43 2008 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 27 Jul 2008 08:41:43 GMT Subject: rpms/toped/F-8 import.log, NONE, 1.1 toped_release_0.9_patch_654_721.patch, NONE, 1.1 toped.spec, 1.9, 1.10 Message-ID: <200807270841.m6R8fh2o029669@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/toped/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29608/F-8 Modified Files: toped.spec Added Files: import.log toped_release_0.9_patch_654_721.patch Log Message: fixing startup crash --- NEW FILE import.log --- toped-0_9_0-2_fc9:F-8:toped-0.9.0-2.fc9.src.rpm:1217148022 toped_release_0.9_patch_654_721.patch: --- NEW FILE toped_release_0.9_patch_654_721.patch --- Index: configure =================================================================== --- configure (revision 654) +++ configure (revision 721) @@ -25581,7 +25581,7 @@ if test "$WX_CONFIG_PATH" != "no" ; then WX_VERSION="" - min_wx_version=2.6.2 + min_wx_version=2.8.7 if test -z "" ; then { echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6; } @@ -26983,21 +26983,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -27034,7 +27035,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ Index: src/layoutcanvas.h =================================================================== --- src/layoutcanvas.h (revision 654) +++ src/layoutcanvas.h (revision 721) @@ -66,6 +66,13 @@ const wxSize& , int* attribList); virtual ~LayoutCanvas(); wxImage snapshot(void); + bool initStatus() { +#ifdef __WXGTK__ + return (NULL != x_visual); +#else + return true; +#endif + } protected: void OnpaintGL(wxPaintEvent& event); void OnresizeGL(wxSizeEvent& event); @@ -124,6 +131,9 @@ bool reperX; // Draw a cursor line across the window parallel to the X axis bool reperY; // Draw a cursor line across the window parallel to the Y axis bool long_cursor; // +#ifdef __WXGTK__ + XVisualInfo* x_visual; // +#endif // StatusLine _status_line; DECLARE_EVENT_TABLE(); }; Index: src/main.cpp =================================================================== --- src/main.cpp (revision 654) +++ src/main.cpp (revision 721) @@ -451,6 +451,21 @@ GetGlobalDirs(); initDBLib(std::string(localDir.mb_str())); Toped = DEBUG_NEW tui::TopedFrame( wxT( "Toped" ), wxPoint(50,50), wxSize(1200,900) ); + + if (!Toped->view()->initStatus()) + { + bool wbox_status = true; + + wxMessageDialog* dlg1 = DEBUG_NEW wxMessageDialog(Toped, + wxT("Toped can't obtain required GLX Visual. Check your video driver/setup please"), + wxT("Toped"), + wxOK | wxICON_ERROR); + dlg1->ShowModal(); + dlg1->Destroy(); + //std::string info("Toped can't obtain required GLX Visual. Check your video driver/setup please"); + //tell_log(console::MT_ERROR,info); + return FALSE; + } if (!LoadFontFile("arial1")) return FALSE; Toped->setIconDir(std::string(tpdUIDir.mb_str())); Toped->initToolBars(); Index: src/layoutcanvas.cpp =================================================================== --- src/layoutcanvas.cpp (revision 654) +++ src/layoutcanvas.cpp (revision 721) @@ -181,10 +181,17 @@ // EVT_MENU( CM_CHLAY, TopedFrame::OnCurrentLayer ) tui::LayoutCanvas::LayoutCanvas(wxWindow *parent, const wxPoint& pos, - const wxSize& size, int* attribList): wxGLCanvas(parent, ID_TPD_CANVAS, pos, - size, 0,wxT("LayoutCanvas"), attribList) + const wxSize& size, int* attribList): + wxGLCanvas(parent, ID_TPD_CANVAS, pos, size, 0,wxT("LayoutCanvas"), attribList) { - +#ifdef __WXGTK__ + // Here we'll have to check that we've got what we've asked for. Is is + // quite possible that we can't get the requested GL visual. If that is the case + // we'll have to aboandon the init sequence right here, otherwise Toped will + // crash. + x_visual = (XVisualInfo*) m_vi; + if (NULL == x_visual) return; +#endif crossCur = MakeCursor(crosscursor,16, 16); //crossCur = DEBUG_NEW wxCursor((const char*)crosscursor,16, 16); SetCursor(*crossCur); Index: src/toped.cpp =================================================================== --- src/toped.cpp (revision 654) +++ src/toped.cpp (revision 721) @@ -688,20 +688,22 @@ //---------------------------------------------------------------------------- // the openGL window - the canvas //---------------------------------------------------------------------------- - int gl_attrib[20] = { WX_GL_RGBA , - WX_GL_MIN_RED , 2, - WX_GL_MIN_GREEN , 2, - WX_GL_MIN_BLUE , 2, - WX_GL_MIN_ALPHA , 2, - WX_GL_MIN_ACCUM_RED , 2, - WX_GL_MIN_ACCUM_GREEN , 2, - WX_GL_MIN_ACCUM_BLUE , 2, - WX_GL_MIN_ACCUM_ALPHA , 2, + int gl_attrib[] = { + WX_GL_RGBA , + WX_GL_MIN_RED , 8, + WX_GL_MIN_GREEN , 8, + WX_GL_MIN_BLUE , 8, +/* WX_GL_MIN_ALPHA , 8,*/ + WX_GL_MIN_ACCUM_RED , 8, + WX_GL_MIN_ACCUM_GREEN , 8, + WX_GL_MIN_ACCUM_BLUE , 8, +/* WX_GL_MIN_ACCUM_ALPHA , 8,*/ + WX_GL_DOUBLEBUFFER , + GL_NONE }; // WX_GL_DEPTH_SIZE , 1, - WX_GL_DOUBLEBUFFER , - GL_NONE }; +// int* gl_attrib = NULL; + _canvas = DEBUG_NEW LayoutCanvas(this, wxDefaultPosition, wxDefaultSize, gl_attrib); - //---------------------------------------------------------------------------- // The command line //---------------------------------------------------------------------------- @@ -724,12 +726,13 @@ LeftDockable(true). RightDockable(true) ); - _winManager.AddPane( _canvas, wxAuiPaneInfo(). - CentrePane(). - MaximizeButton(false). - Floatable(true). - CloseButton(false) - ); + if (_canvas->initStatus()) + _winManager.AddPane( _canvas, wxAuiPaneInfo(). + CentrePane(). + MaximizeButton(false). + Floatable(true). + CloseButton(false) + ); //_winManager.AddPane(_GLstatus, wxAuiPaneInfo().Top().Floatable(false).//Fixed(). // CloseButton(false).CaptionVisible(false).BestSize(wxSize(1000,30))); _winManager.AddPane(logpane, wxAuiPaneInfo(). Index: configure.ac =================================================================== --- configure.ac (revision 654) +++ configure.ac (revision 721) @@ -62,7 +62,7 @@ #Check wxWidgets AM_OPTIONS_WXCONFIG - AM_PATH_WXCONFIG(2.6.2, wxWin=1,,std gl) + AM_PATH_WXCONFIG(2.8.7, wxWin=1,,std gl) if test "$wxWin" != 1 || test "$wx_ver_ok" != "yes"; then AC_MSG_ERROR([ wxWindows ver.2.6.2 or later must be installed on your system Index: tpd_DB/tedesign.cpp =================================================================== --- tpd_DB/tedesign.cpp (revision 654) +++ tpd_DB/tedesign.cpp (revision 721) @@ -1025,7 +1025,9 @@ } DBbox laydata::tdtdesign::activeoverlap() { - return _target.overlap(); + DBbox ovl = _target.overlap(); + if (ovl == DEFAULT_OVL_BOX) ovl = DEFAULT_ZOOM_BOX; + return ovl; // if (_target.checkedit()) // return _target.edit()->overlap() * _ARTM; // else return DEFAULT_OVL_BOX; Index: tpd_DB/browsers.cpp =================================================================== --- tpd_DB/browsers.cpp (revision 654) +++ tpd_DB/browsers.cpp (revision 721) @@ -878,7 +878,7 @@ word *laynotemp = DEBUG_NEW word(layno); eventLAYER_STATUS.SetClientData(static_cast (laynotemp)); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_STATUS); - delete bt1; + delete bt1; } void browsers::layer_add(const std::string name, const word layno) @@ -891,7 +891,7 @@ eventLAYER_ADD.SetInt(*bt); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_ADD); - delete bt; + delete bt; } void browsers::layer_default(const word newlay, const word oldlay) @@ -905,7 +905,7 @@ eventLAYER_DEF.SetInt(*bt); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_DEF); - delete bt; + delete bt; } void browsers::addTDTtab(bool newthread) @@ -1000,10 +1000,10 @@ browsers::LayerInfo::LayerInfo(const LayerInfo& lay) { - _name = lay._name; - _layno = lay._layno; - _col = lay._col; - _fill = lay._fill; + _name = lay._name; + _layno = lay._layno; + _col = lay._col; + _fill = lay._fill; } browsers::LayerInfo::LayerInfo(const std::string &name, const word layno) @@ -1029,7 +1029,7 @@ _layer = DEBUG_NEW LayerInfo(*layer); _selected= false; _hidden = false; - + //_locked = false; _picture = DEBUG_NEW wxBitmap(size.GetWidth()-16, size.GetHeight(), -1); @@ -1065,7 +1065,7 @@ stipplebrush = DEBUG_NEW wxBitmap(image, 1); #endif _brush = DEBUG_NEW wxBrush( *stipplebrush); - delete stipplebrush; + delete stipplebrush; } else { @@ -1084,33 +1084,33 @@ _brush->SetColour(color); //} - Create(parent, id, pos, size, style, name); - GetClientSize(&_buttonWidth, &_buttonHeight); + Create(parent, id, pos, size, style, name); + GetClientSize(&_buttonWidth, &_buttonHeight); //***Draw main picture*** preparePicture(); - wxString caption(_layer->name().c_str(),wxConvUTF8); + wxString caption(_layer->name().c_str(),wxConvUTF8); SetToolTip(caption); - + } void browsers::LayerButton::preparePicture() { const int clearence = 2; - int sizeX, sizeY; - GetParent()->GetClientSize(&sizeX, &sizeY); - _buttonWidth = sizeX; - SetSize(_buttonWidth, _buttonHeight); - - wxMemoryDC DC; + int sizeX, sizeY; + GetParent()->GetClientSize(&sizeX, &sizeY); + _buttonWidth = sizeX; + SetSize(_buttonWidth, _buttonHeight); + + wxMemoryDC DC; wxFont font(10,wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); DC.SetFont(font); - //pict.SetWidth(_buttonWidth); - if (_picture) - { - delete _picture; - _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1); - } + //pict.SetWidth(_buttonWidth); + if (_picture) + { + delete _picture; + _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1); + } DC.SelectObject(*_picture); DC.SetBrush(*_brush); @@ -1128,9 +1128,9 @@ DC.GetTextExtent(layno, &wno, &hno); DC.DrawText(layno, 0, int((_buttonHeight - hno)/2)); curw += wno + clearence; - - wxBrush tempBrush = DC.GetBrush(); - if (_selected) + + wxBrush tempBrush = DC.GetBrush(); + if (_selected) { DC.SetBrush(*wxWHITE_BRUSH); DC.SetTextForeground(*wxBLACK); @@ -1142,21 +1142,21 @@ } const wxString dummy= _T("WWWWWWWWWW"); wxString caption(_layer->name().c_str(),wxConvUTF8); - if (caption.Len()>10) - { - caption[7]=wxT('.'); - caption[8]=wxT('.'); - caption[9]=wxT('.'); - } + if (caption.Len()>10) + { + caption[7]=wxT('.'); + caption[8]=wxT('.'); + caption[9]=wxT('.'); + } int hna,wna; DC.GetTextExtent(dummy, &wna, &hna); DC.DrawRectangle(curw, clearence, wna, _buttonHeight - 2*clearence); curw += clearence; DC.DrawText(caption, curw, int(_buttonHeight/2 - hna/2)); - curw += wna; - - DC.SetBrush(tempBrush); - DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence); + curw += wna; + + DC.SetBrush(tempBrush); + DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence); DC.SelectObject(wxNullBitmap); Refresh(); @@ -1175,7 +1175,7 @@ void browsers::LayerButton::OnPaint(wxPaintEvent&event) { - wxPaintDC dc(this); + wxPaintDC dc(this); dc.DrawBitmap(*_picture, 0, 0, false); if (_selected) { @@ -1225,7 +1225,7 @@ eventLAYER_SELECT.SetInt(bt); assert(Browsers && Browsers->TDTlayers()); - wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT); + wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT); } } } @@ -1268,18 +1268,18 @@ //==================================================================== BEGIN_EVENT_TABLE(browsers::LayerPanel, wxScrolledWindow) - EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand) - EVT_SIZE(browsers::LayerPanel::OnSize) + EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand) + EVT_SIZE(browsers::LayerPanel::OnSize) END_EVENT_TABLE() //==================================================================== browsers::LayerPanel::LayerPanel(wxWindow* parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style , const wxString& name) - :wxScrolledWindow(parent, id, pos, size, style, name), - _selectedButton(NULL) + const wxPoint& pos, + const wxSize& size, + long style , const wxString& name) + :wxScrolledWindow(parent, id, pos, size, style, name), + _selectedButton(NULL) { - _buttonCount = 0; + _buttonCount = 0; } browsers::LayerPanel::~LayerPanel() @@ -1298,10 +1298,10 @@ { word *oldlay = static_cast(event.GetClientData()); word layno = event.GetExtraLong(); - _buttonMap[*oldlay]->unselect(); - _buttonMap[layno]->select(); + if (NULL != _buttonMap[*oldlay]) _buttonMap[*oldlay]->unselect(); + if (NULL != _buttonMap[layno]) _buttonMap[layno]->select(); //_layerlist->defaultLayer((word)event.GetExtraLong(), (word)event.GetInt()); - delete (static_cast(oldlay)); + delete (oldlay); break; } case BT_LAYER_HIDE: @@ -1309,8 +1309,8 @@ word *layno = static_cast(event.GetClientData()); bool status = (1 == event.GetExtraLong()); //_buttonMap[layno]->hideLayer(event.IsChecked()); - _buttonMap[*layno]->hideLayer(status); - delete (static_cast(layno)); + if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->hideLayer(status); + delete (layno); break; } //_layerlist->hideLayer((word)event.GetExtraLong(),event.IsChecked());break; @@ -1319,8 +1319,8 @@ //_layerlist->lockLayer((word)event.GetExtraLong(),event.IsChecked()); word *layno = static_cast(event.GetClientData()); bool status = (1 == event.GetExtraLong()); - _buttonMap[*layno]->lockLayer(status); - delete (static_cast(layno)); + if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->lockLayer(status); + delete (layno); break; } case BT_LAYER_SELECT: @@ -1328,32 +1328,26 @@ word layno = event.GetExtraLong(); if (NULL != _selectedButton) _selectedButton->unselect(); _selectedButton = _buttonMap[layno]; - break; } case BT_LAYER_ADD: { LayerInfo* layer = static_cast(event.GetClientData()); - LayerButton *layerButton; - layerButtonMap::iterator it; - int szx, szy; + int szx, szy; //Remove selection from current button - if (_selectedButton!=NULL) _selectedButton->unselect(); - + if (NULL != _selectedButton) _selectedButton->unselect(); it = _buttonMap.find(layer->layno()); - if (it!= _buttonMap.end()) + if (it != _buttonMap.end()) { //Button already exists, replace it LayerButton *tempButton = it->second; - //layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount, wxPoint (0, _buttonCount*30), wxSize(200, 30), //wxBU_AUTODRAW, wxDefaultValidator, _T("TTT"), layer); int x, y; - int ID; tempButton->GetPosition(&x, &y); tempButton->GetSize(&szx, &szy); @@ -1362,22 +1356,19 @@ wxBU_AUTODRAW|wxNO_BORDER, wxDefaultValidator, _T("button"), layer); _buttonMap[layer->layno()] = layerButton; delete tempButton; - } else { //Button doesn't exist, create new button // int szx, szy; - GetClientSize(&szx, &szy); + GetClientSize(&szx, &szy); layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount, wxPoint (0, _buttonCount*buttonHeight), wxSize(szx, buttonHeight), wxBU_AUTODRAW, wxDefaultValidator, _T("button"), layer); _buttonMap[layer->layno()] = layerButton; - _buttonCount++; this->SetScrollbars(0, buttonHeight, 0, _buttonCount); } - //Restore selection if ((it = _buttonMap.find(DATC->curlay()))!= _buttonMap.end()) { @@ -1386,7 +1377,7 @@ } //_selectedButton = (_buttonMap.begin())->second; //_selectedButton->select(); - delete (static_cast(layer)); + delete (static_cast(layer)); break; } } @@ -1394,12 +1385,12 @@ void browsers::LayerPanel::OnSize(wxSizeEvent& evt) { - for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it) - { - LayerButton *button = it->second; - button->preparePicture(); - } - Refresh(); + for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it) + { + LayerButton *button = it->second; + button->preparePicture(); + } + Refresh(); } wxString browsers::LayerPanel::getAllSelected() @@ -1487,5 +1478,5 @@ wxString browsers::LayerBrowser::getAllSelected() { - return _layerPanel->getAllSelected(); + return _layerPanel->getAllSelected(); } Index: aclocal.m4 =================================================================== --- aclocal.m4 (revision 654) +++ aclocal.m4 (revision 721) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -6584,7 +6587,7 @@ AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6599,7 +6602,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -6615,8 +6618,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6888,7 +6893,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6936,13 +6941,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7047,16 +7052,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7328,7 +7334,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) Index: toped.spec =================================================================== RCS file: /cvs/pkgs/rpms/toped/F-8/toped.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- toped.spec 25 May 2008 09:03:46 -0000 1.9 +++ toped.spec 27 Jul 2008 08:41:13 -0000 1.10 @@ -1,6 +1,6 @@ Name: toped Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VLSI IC Layout Editor License: GPLv2 @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2 +Patch0: toped_release_0.9_patch_654_721.patch BuildRequires: desktop-file-utils BuildRequires: wxGTK-devel @@ -23,18 +24,11 @@ Toped is listed among Fedora Electronic Lab packages. -%package devel -Summary: Toped - development files -Group: Applications/Engineering -Requires: %{name} = %{version}-%{release} - - -%description devel -Development files for the Toped. - %prep %setup -q +%patch0 -p0 -b .composite + # instead of exporting the variable $TPD_GLOBAL sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp @@ -76,9 +70,9 @@ #No translations #%find_lang %{name} -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so #spurious-executable-perm chmod 0644 COPYING @@ -107,11 +101,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/toped.png -%files devel -%{_libdir}/libtpd*.so - %Changelog +* Fri Jul 26 2008 Chitlesh Goorah - 0.9.0-2 +- Bug fix 451218 + * Sun May 25 2008 Chitlesh Goorah - 0.9.0-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 27 08:43:39 2008 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 27 Jul 2008 08:43:39 GMT Subject: rpms/toped/F-9 import.log, NONE, 1.1 toped_release_0.9_patch_654_721.patch, NONE, 1.1 toped.spec, 1.10, 1.11 Message-ID: <200807270843.m6R8hdYl029828@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/toped/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29799/F-9 Modified Files: toped.spec Added Files: import.log toped_release_0.9_patch_654_721.patch Log Message: fixing startup crash --- NEW FILE import.log --- toped-0_9_0-2_fc9:F-9:toped-0.9.0-2.fc9.src.rpm:1217148172 toped_release_0.9_patch_654_721.patch: --- NEW FILE toped_release_0.9_patch_654_721.patch --- Index: configure =================================================================== --- configure (revision 654) +++ configure (revision 721) @@ -25581,7 +25581,7 @@ if test "$WX_CONFIG_PATH" != "no" ; then WX_VERSION="" - min_wx_version=2.6.2 + min_wx_version=2.8.7 if test -z "" ; then { echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6; } @@ -26983,21 +26983,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -27034,7 +27035,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ Index: src/layoutcanvas.h =================================================================== --- src/layoutcanvas.h (revision 654) +++ src/layoutcanvas.h (revision 721) @@ -66,6 +66,13 @@ const wxSize& , int* attribList); virtual ~LayoutCanvas(); wxImage snapshot(void); + bool initStatus() { +#ifdef __WXGTK__ + return (NULL != x_visual); +#else + return true; +#endif + } protected: void OnpaintGL(wxPaintEvent& event); void OnresizeGL(wxSizeEvent& event); @@ -124,6 +131,9 @@ bool reperX; // Draw a cursor line across the window parallel to the X axis bool reperY; // Draw a cursor line across the window parallel to the Y axis bool long_cursor; // +#ifdef __WXGTK__ + XVisualInfo* x_visual; // +#endif // StatusLine _status_line; DECLARE_EVENT_TABLE(); }; Index: src/main.cpp =================================================================== --- src/main.cpp (revision 654) +++ src/main.cpp (revision 721) @@ -451,6 +451,21 @@ GetGlobalDirs(); initDBLib(std::string(localDir.mb_str())); Toped = DEBUG_NEW tui::TopedFrame( wxT( "Toped" ), wxPoint(50,50), wxSize(1200,900) ); + + if (!Toped->view()->initStatus()) + { + bool wbox_status = true; + + wxMessageDialog* dlg1 = DEBUG_NEW wxMessageDialog(Toped, + wxT("Toped can't obtain required GLX Visual. Check your video driver/setup please"), + wxT("Toped"), + wxOK | wxICON_ERROR); + dlg1->ShowModal(); + dlg1->Destroy(); + //std::string info("Toped can't obtain required GLX Visual. Check your video driver/setup please"); + //tell_log(console::MT_ERROR,info); + return FALSE; + } if (!LoadFontFile("arial1")) return FALSE; Toped->setIconDir(std::string(tpdUIDir.mb_str())); Toped->initToolBars(); Index: src/layoutcanvas.cpp =================================================================== --- src/layoutcanvas.cpp (revision 654) +++ src/layoutcanvas.cpp (revision 721) @@ -181,10 +181,17 @@ // EVT_MENU( CM_CHLAY, TopedFrame::OnCurrentLayer ) tui::LayoutCanvas::LayoutCanvas(wxWindow *parent, const wxPoint& pos, - const wxSize& size, int* attribList): wxGLCanvas(parent, ID_TPD_CANVAS, pos, - size, 0,wxT("LayoutCanvas"), attribList) + const wxSize& size, int* attribList): + wxGLCanvas(parent, ID_TPD_CANVAS, pos, size, 0,wxT("LayoutCanvas"), attribList) { - +#ifdef __WXGTK__ + // Here we'll have to check that we've got what we've asked for. Is is + // quite possible that we can't get the requested GL visual. If that is the case + // we'll have to aboandon the init sequence right here, otherwise Toped will + // crash. + x_visual = (XVisualInfo*) m_vi; + if (NULL == x_visual) return; +#endif crossCur = MakeCursor(crosscursor,16, 16); //crossCur = DEBUG_NEW wxCursor((const char*)crosscursor,16, 16); SetCursor(*crossCur); Index: src/toped.cpp =================================================================== --- src/toped.cpp (revision 654) +++ src/toped.cpp (revision 721) @@ -688,20 +688,22 @@ //---------------------------------------------------------------------------- // the openGL window - the canvas //---------------------------------------------------------------------------- - int gl_attrib[20] = { WX_GL_RGBA , - WX_GL_MIN_RED , 2, - WX_GL_MIN_GREEN , 2, - WX_GL_MIN_BLUE , 2, - WX_GL_MIN_ALPHA , 2, - WX_GL_MIN_ACCUM_RED , 2, - WX_GL_MIN_ACCUM_GREEN , 2, - WX_GL_MIN_ACCUM_BLUE , 2, - WX_GL_MIN_ACCUM_ALPHA , 2, + int gl_attrib[] = { + WX_GL_RGBA , + WX_GL_MIN_RED , 8, + WX_GL_MIN_GREEN , 8, + WX_GL_MIN_BLUE , 8, +/* WX_GL_MIN_ALPHA , 8,*/ + WX_GL_MIN_ACCUM_RED , 8, + WX_GL_MIN_ACCUM_GREEN , 8, + WX_GL_MIN_ACCUM_BLUE , 8, +/* WX_GL_MIN_ACCUM_ALPHA , 8,*/ + WX_GL_DOUBLEBUFFER , + GL_NONE }; // WX_GL_DEPTH_SIZE , 1, - WX_GL_DOUBLEBUFFER , - GL_NONE }; +// int* gl_attrib = NULL; + _canvas = DEBUG_NEW LayoutCanvas(this, wxDefaultPosition, wxDefaultSize, gl_attrib); - //---------------------------------------------------------------------------- // The command line //---------------------------------------------------------------------------- @@ -724,12 +726,13 @@ LeftDockable(true). RightDockable(true) ); - _winManager.AddPane( _canvas, wxAuiPaneInfo(). - CentrePane(). - MaximizeButton(false). - Floatable(true). - CloseButton(false) - ); + if (_canvas->initStatus()) + _winManager.AddPane( _canvas, wxAuiPaneInfo(). + CentrePane(). + MaximizeButton(false). + Floatable(true). + CloseButton(false) + ); //_winManager.AddPane(_GLstatus, wxAuiPaneInfo().Top().Floatable(false).//Fixed(). // CloseButton(false).CaptionVisible(false).BestSize(wxSize(1000,30))); _winManager.AddPane(logpane, wxAuiPaneInfo(). Index: configure.ac =================================================================== --- configure.ac (revision 654) +++ configure.ac (revision 721) @@ -62,7 +62,7 @@ #Check wxWidgets AM_OPTIONS_WXCONFIG - AM_PATH_WXCONFIG(2.6.2, wxWin=1,,std gl) + AM_PATH_WXCONFIG(2.8.7, wxWin=1,,std gl) if test "$wxWin" != 1 || test "$wx_ver_ok" != "yes"; then AC_MSG_ERROR([ wxWindows ver.2.6.2 or later must be installed on your system Index: tpd_DB/tedesign.cpp =================================================================== --- tpd_DB/tedesign.cpp (revision 654) +++ tpd_DB/tedesign.cpp (revision 721) @@ -1025,7 +1025,9 @@ } DBbox laydata::tdtdesign::activeoverlap() { - return _target.overlap(); + DBbox ovl = _target.overlap(); + if (ovl == DEFAULT_OVL_BOX) ovl = DEFAULT_ZOOM_BOX; + return ovl; // if (_target.checkedit()) // return _target.edit()->overlap() * _ARTM; // else return DEFAULT_OVL_BOX; Index: tpd_DB/browsers.cpp =================================================================== --- tpd_DB/browsers.cpp (revision 654) +++ tpd_DB/browsers.cpp (revision 721) @@ -878,7 +878,7 @@ word *laynotemp = DEBUG_NEW word(layno); eventLAYER_STATUS.SetClientData(static_cast (laynotemp)); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_STATUS); - delete bt1; + delete bt1; } void browsers::layer_add(const std::string name, const word layno) @@ -891,7 +891,7 @@ eventLAYER_ADD.SetInt(*bt); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_ADD); - delete bt; + delete bt; } void browsers::layer_default(const word newlay, const word oldlay) @@ -905,7 +905,7 @@ eventLAYER_DEF.SetInt(*bt); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_DEF); - delete bt; + delete bt; } void browsers::addTDTtab(bool newthread) @@ -1000,10 +1000,10 @@ browsers::LayerInfo::LayerInfo(const LayerInfo& lay) { - _name = lay._name; - _layno = lay._layno; - _col = lay._col; - _fill = lay._fill; + _name = lay._name; + _layno = lay._layno; + _col = lay._col; + _fill = lay._fill; } browsers::LayerInfo::LayerInfo(const std::string &name, const word layno) @@ -1029,7 +1029,7 @@ _layer = DEBUG_NEW LayerInfo(*layer); _selected= false; _hidden = false; - + //_locked = false; _picture = DEBUG_NEW wxBitmap(size.GetWidth()-16, size.GetHeight(), -1); @@ -1065,7 +1065,7 @@ stipplebrush = DEBUG_NEW wxBitmap(image, 1); #endif _brush = DEBUG_NEW wxBrush( *stipplebrush); - delete stipplebrush; + delete stipplebrush; } else { @@ -1084,33 +1084,33 @@ _brush->SetColour(color); //} - Create(parent, id, pos, size, style, name); - GetClientSize(&_buttonWidth, &_buttonHeight); + Create(parent, id, pos, size, style, name); + GetClientSize(&_buttonWidth, &_buttonHeight); //***Draw main picture*** preparePicture(); - wxString caption(_layer->name().c_str(),wxConvUTF8); + wxString caption(_layer->name().c_str(),wxConvUTF8); SetToolTip(caption); - + } void browsers::LayerButton::preparePicture() { const int clearence = 2; - int sizeX, sizeY; - GetParent()->GetClientSize(&sizeX, &sizeY); - _buttonWidth = sizeX; - SetSize(_buttonWidth, _buttonHeight); - - wxMemoryDC DC; + int sizeX, sizeY; + GetParent()->GetClientSize(&sizeX, &sizeY); + _buttonWidth = sizeX; + SetSize(_buttonWidth, _buttonHeight); + + wxMemoryDC DC; wxFont font(10,wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); DC.SetFont(font); - //pict.SetWidth(_buttonWidth); - if (_picture) - { - delete _picture; - _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1); - } + //pict.SetWidth(_buttonWidth); + if (_picture) + { + delete _picture; + _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1); + } DC.SelectObject(*_picture); DC.SetBrush(*_brush); @@ -1128,9 +1128,9 @@ DC.GetTextExtent(layno, &wno, &hno); DC.DrawText(layno, 0, int((_buttonHeight - hno)/2)); curw += wno + clearence; - - wxBrush tempBrush = DC.GetBrush(); - if (_selected) + + wxBrush tempBrush = DC.GetBrush(); + if (_selected) { DC.SetBrush(*wxWHITE_BRUSH); DC.SetTextForeground(*wxBLACK); @@ -1142,21 +1142,21 @@ } const wxString dummy= _T("WWWWWWWWWW"); wxString caption(_layer->name().c_str(),wxConvUTF8); - if (caption.Len()>10) - { - caption[7]=wxT('.'); - caption[8]=wxT('.'); - caption[9]=wxT('.'); - } + if (caption.Len()>10) + { + caption[7]=wxT('.'); + caption[8]=wxT('.'); + caption[9]=wxT('.'); + } int hna,wna; DC.GetTextExtent(dummy, &wna, &hna); DC.DrawRectangle(curw, clearence, wna, _buttonHeight - 2*clearence); curw += clearence; DC.DrawText(caption, curw, int(_buttonHeight/2 - hna/2)); - curw += wna; - - DC.SetBrush(tempBrush); - DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence); + curw += wna; + + DC.SetBrush(tempBrush); + DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence); DC.SelectObject(wxNullBitmap); Refresh(); @@ -1175,7 +1175,7 @@ void browsers::LayerButton::OnPaint(wxPaintEvent&event) { - wxPaintDC dc(this); + wxPaintDC dc(this); dc.DrawBitmap(*_picture, 0, 0, false); if (_selected) { @@ -1225,7 +1225,7 @@ eventLAYER_SELECT.SetInt(bt); assert(Browsers && Browsers->TDTlayers()); - wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT); + wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT); } } } @@ -1268,18 +1268,18 @@ //==================================================================== BEGIN_EVENT_TABLE(browsers::LayerPanel, wxScrolledWindow) - EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand) - EVT_SIZE(browsers::LayerPanel::OnSize) + EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand) + EVT_SIZE(browsers::LayerPanel::OnSize) END_EVENT_TABLE() //==================================================================== browsers::LayerPanel::LayerPanel(wxWindow* parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style , const wxString& name) - :wxScrolledWindow(parent, id, pos, size, style, name), - _selectedButton(NULL) + const wxPoint& pos, + const wxSize& size, + long style , const wxString& name) + :wxScrolledWindow(parent, id, pos, size, style, name), + _selectedButton(NULL) { - _buttonCount = 0; + _buttonCount = 0; } browsers::LayerPanel::~LayerPanel() @@ -1298,10 +1298,10 @@ { word *oldlay = static_cast(event.GetClientData()); word layno = event.GetExtraLong(); - _buttonMap[*oldlay]->unselect(); - _buttonMap[layno]->select(); + if (NULL != _buttonMap[*oldlay]) _buttonMap[*oldlay]->unselect(); + if (NULL != _buttonMap[layno]) _buttonMap[layno]->select(); //_layerlist->defaultLayer((word)event.GetExtraLong(), (word)event.GetInt()); - delete (static_cast(oldlay)); + delete (oldlay); break; } case BT_LAYER_HIDE: @@ -1309,8 +1309,8 @@ word *layno = static_cast(event.GetClientData()); bool status = (1 == event.GetExtraLong()); //_buttonMap[layno]->hideLayer(event.IsChecked()); - _buttonMap[*layno]->hideLayer(status); - delete (static_cast(layno)); + if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->hideLayer(status); + delete (layno); break; } //_layerlist->hideLayer((word)event.GetExtraLong(),event.IsChecked());break; @@ -1319,8 +1319,8 @@ //_layerlist->lockLayer((word)event.GetExtraLong(),event.IsChecked()); word *layno = static_cast(event.GetClientData()); bool status = (1 == event.GetExtraLong()); - _buttonMap[*layno]->lockLayer(status); - delete (static_cast(layno)); + if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->lockLayer(status); + delete (layno); break; } case BT_LAYER_SELECT: @@ -1328,32 +1328,26 @@ word layno = event.GetExtraLong(); if (NULL != _selectedButton) _selectedButton->unselect(); _selectedButton = _buttonMap[layno]; - break; } case BT_LAYER_ADD: { LayerInfo* layer = static_cast(event.GetClientData()); - LayerButton *layerButton; - layerButtonMap::iterator it; - int szx, szy; + int szx, szy; //Remove selection from current button - if (_selectedButton!=NULL) _selectedButton->unselect(); - + if (NULL != _selectedButton) _selectedButton->unselect(); it = _buttonMap.find(layer->layno()); - if (it!= _buttonMap.end()) + if (it != _buttonMap.end()) { //Button already exists, replace it LayerButton *tempButton = it->second; - //layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount, wxPoint (0, _buttonCount*30), wxSize(200, 30), //wxBU_AUTODRAW, wxDefaultValidator, _T("TTT"), layer); int x, y; - int ID; tempButton->GetPosition(&x, &y); tempButton->GetSize(&szx, &szy); @@ -1362,22 +1356,19 @@ wxBU_AUTODRAW|wxNO_BORDER, wxDefaultValidator, _T("button"), layer); _buttonMap[layer->layno()] = layerButton; delete tempButton; - } else { //Button doesn't exist, create new button // int szx, szy; - GetClientSize(&szx, &szy); + GetClientSize(&szx, &szy); layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount, wxPoint (0, _buttonCount*buttonHeight), wxSize(szx, buttonHeight), wxBU_AUTODRAW, wxDefaultValidator, _T("button"), layer); _buttonMap[layer->layno()] = layerButton; - _buttonCount++; this->SetScrollbars(0, buttonHeight, 0, _buttonCount); } - //Restore selection if ((it = _buttonMap.find(DATC->curlay()))!= _buttonMap.end()) { @@ -1386,7 +1377,7 @@ } //_selectedButton = (_buttonMap.begin())->second; //_selectedButton->select(); - delete (static_cast(layer)); + delete (static_cast(layer)); break; } } @@ -1394,12 +1385,12 @@ void browsers::LayerPanel::OnSize(wxSizeEvent& evt) { - for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it) - { - LayerButton *button = it->second; - button->preparePicture(); - } - Refresh(); + for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it) + { + LayerButton *button = it->second; + button->preparePicture(); + } + Refresh(); } wxString browsers::LayerPanel::getAllSelected() @@ -1487,5 +1478,5 @@ wxString browsers::LayerBrowser::getAllSelected() { - return _layerPanel->getAllSelected(); + return _layerPanel->getAllSelected(); } Index: aclocal.m4 =================================================================== --- aclocal.m4 (revision 654) +++ aclocal.m4 (revision 721) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -6584,7 +6587,7 @@ AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6599,7 +6602,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -6615,8 +6618,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6888,7 +6893,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6936,13 +6941,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7047,16 +7052,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7328,7 +7334,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) Index: toped.spec =================================================================== RCS file: /cvs/pkgs/rpms/toped/F-9/toped.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- toped.spec 25 May 2008 09:06:48 -0000 1.10 +++ toped.spec 27 Jul 2008 08:43:09 -0000 1.11 @@ -1,6 +1,6 @@ Name: toped Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VLSI IC Layout Editor License: GPLv2 @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2 +Patch0: toped_release_0.9_patch_654_721.patch BuildRequires: desktop-file-utils BuildRequires: wxGTK-devel @@ -23,18 +24,11 @@ Toped is listed among Fedora Electronic Lab packages. -%package devel -Summary: Toped - development files -Group: Applications/Engineering -Requires: %{name} = %{version}-%{release} - - -%description devel -Development files for the Toped. - %prep %setup -q +%patch0 -p0 -b .composite + # instead of exporting the variable $TPD_GLOBAL sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp @@ -76,9 +70,9 @@ #No translations #%find_lang %{name} -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so #spurious-executable-perm chmod 0644 COPYING @@ -107,11 +101,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/toped.png -%files devel -%{_libdir}/libtpd*.so - %Changelog +* Fri Jul 26 2008 Chitlesh Goorah - 0.9.0-2 +- Bug fix 451218 + * Sun May 25 2008 Chitlesh Goorah - 0.9.0-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 27 08:46:31 2008 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 27 Jul 2008 08:46:31 GMT Subject: rpms/toped/devel import.log, NONE, 1.1 toped_release_0.9_patch_654_721.patch, NONE, 1.1 toped.spec, 1.10, 1.11 Message-ID: <200807270846.m6R8kVrS030002@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/toped/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29963/devel Modified Files: toped.spec Added Files: import.log toped_release_0.9_patch_654_721.patch Log Message: fixing startup crash --- NEW FILE import.log --- toped-0_9_0-2_fc9:HEAD:toped-0.9.0-2.fc9.src.rpm:1217148340 toped_release_0.9_patch_654_721.patch: --- NEW FILE toped_release_0.9_patch_654_721.patch --- Index: configure =================================================================== --- configure (revision 654) +++ configure (revision 721) @@ -25581,7 +25581,7 @@ if test "$WX_CONFIG_PATH" != "no" ; then WX_VERSION="" - min_wx_version=2.6.2 + min_wx_version=2.8.7 if test -z "" ; then { echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6; } @@ -26983,21 +26983,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -27034,7 +27035,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ Index: src/layoutcanvas.h =================================================================== --- src/layoutcanvas.h (revision 654) +++ src/layoutcanvas.h (revision 721) @@ -66,6 +66,13 @@ const wxSize& , int* attribList); virtual ~LayoutCanvas(); wxImage snapshot(void); + bool initStatus() { +#ifdef __WXGTK__ + return (NULL != x_visual); +#else + return true; +#endif + } protected: void OnpaintGL(wxPaintEvent& event); void OnresizeGL(wxSizeEvent& event); @@ -124,6 +131,9 @@ bool reperX; // Draw a cursor line across the window parallel to the X axis bool reperY; // Draw a cursor line across the window parallel to the Y axis bool long_cursor; // +#ifdef __WXGTK__ + XVisualInfo* x_visual; // +#endif // StatusLine _status_line; DECLARE_EVENT_TABLE(); }; Index: src/main.cpp =================================================================== --- src/main.cpp (revision 654) +++ src/main.cpp (revision 721) @@ -451,6 +451,21 @@ GetGlobalDirs(); initDBLib(std::string(localDir.mb_str())); Toped = DEBUG_NEW tui::TopedFrame( wxT( "Toped" ), wxPoint(50,50), wxSize(1200,900) ); + + if (!Toped->view()->initStatus()) + { + bool wbox_status = true; + + wxMessageDialog* dlg1 = DEBUG_NEW wxMessageDialog(Toped, + wxT("Toped can't obtain required GLX Visual. Check your video driver/setup please"), + wxT("Toped"), + wxOK | wxICON_ERROR); + dlg1->ShowModal(); + dlg1->Destroy(); + //std::string info("Toped can't obtain required GLX Visual. Check your video driver/setup please"); + //tell_log(console::MT_ERROR,info); + return FALSE; + } if (!LoadFontFile("arial1")) return FALSE; Toped->setIconDir(std::string(tpdUIDir.mb_str())); Toped->initToolBars(); Index: src/layoutcanvas.cpp =================================================================== --- src/layoutcanvas.cpp (revision 654) +++ src/layoutcanvas.cpp (revision 721) @@ -181,10 +181,17 @@ // EVT_MENU( CM_CHLAY, TopedFrame::OnCurrentLayer ) tui::LayoutCanvas::LayoutCanvas(wxWindow *parent, const wxPoint& pos, - const wxSize& size, int* attribList): wxGLCanvas(parent, ID_TPD_CANVAS, pos, - size, 0,wxT("LayoutCanvas"), attribList) + const wxSize& size, int* attribList): + wxGLCanvas(parent, ID_TPD_CANVAS, pos, size, 0,wxT("LayoutCanvas"), attribList) { - +#ifdef __WXGTK__ + // Here we'll have to check that we've got what we've asked for. Is is + // quite possible that we can't get the requested GL visual. If that is the case + // we'll have to aboandon the init sequence right here, otherwise Toped will + // crash. + x_visual = (XVisualInfo*) m_vi; + if (NULL == x_visual) return; +#endif crossCur = MakeCursor(crosscursor,16, 16); //crossCur = DEBUG_NEW wxCursor((const char*)crosscursor,16, 16); SetCursor(*crossCur); Index: src/toped.cpp =================================================================== --- src/toped.cpp (revision 654) +++ src/toped.cpp (revision 721) @@ -688,20 +688,22 @@ //---------------------------------------------------------------------------- // the openGL window - the canvas //---------------------------------------------------------------------------- - int gl_attrib[20] = { WX_GL_RGBA , - WX_GL_MIN_RED , 2, - WX_GL_MIN_GREEN , 2, - WX_GL_MIN_BLUE , 2, - WX_GL_MIN_ALPHA , 2, - WX_GL_MIN_ACCUM_RED , 2, - WX_GL_MIN_ACCUM_GREEN , 2, - WX_GL_MIN_ACCUM_BLUE , 2, - WX_GL_MIN_ACCUM_ALPHA , 2, + int gl_attrib[] = { + WX_GL_RGBA , + WX_GL_MIN_RED , 8, + WX_GL_MIN_GREEN , 8, + WX_GL_MIN_BLUE , 8, +/* WX_GL_MIN_ALPHA , 8,*/ + WX_GL_MIN_ACCUM_RED , 8, + WX_GL_MIN_ACCUM_GREEN , 8, + WX_GL_MIN_ACCUM_BLUE , 8, +/* WX_GL_MIN_ACCUM_ALPHA , 8,*/ + WX_GL_DOUBLEBUFFER , + GL_NONE }; // WX_GL_DEPTH_SIZE , 1, - WX_GL_DOUBLEBUFFER , - GL_NONE }; +// int* gl_attrib = NULL; + _canvas = DEBUG_NEW LayoutCanvas(this, wxDefaultPosition, wxDefaultSize, gl_attrib); - //---------------------------------------------------------------------------- // The command line //---------------------------------------------------------------------------- @@ -724,12 +726,13 @@ LeftDockable(true). RightDockable(true) ); - _winManager.AddPane( _canvas, wxAuiPaneInfo(). - CentrePane(). - MaximizeButton(false). - Floatable(true). - CloseButton(false) - ); + if (_canvas->initStatus()) + _winManager.AddPane( _canvas, wxAuiPaneInfo(). + CentrePane(). + MaximizeButton(false). + Floatable(true). + CloseButton(false) + ); //_winManager.AddPane(_GLstatus, wxAuiPaneInfo().Top().Floatable(false).//Fixed(). // CloseButton(false).CaptionVisible(false).BestSize(wxSize(1000,30))); _winManager.AddPane(logpane, wxAuiPaneInfo(). Index: configure.ac =================================================================== --- configure.ac (revision 654) +++ configure.ac (revision 721) @@ -62,7 +62,7 @@ #Check wxWidgets AM_OPTIONS_WXCONFIG - AM_PATH_WXCONFIG(2.6.2, wxWin=1,,std gl) + AM_PATH_WXCONFIG(2.8.7, wxWin=1,,std gl) if test "$wxWin" != 1 || test "$wx_ver_ok" != "yes"; then AC_MSG_ERROR([ wxWindows ver.2.6.2 or later must be installed on your system Index: tpd_DB/tedesign.cpp =================================================================== --- tpd_DB/tedesign.cpp (revision 654) +++ tpd_DB/tedesign.cpp (revision 721) @@ -1025,7 +1025,9 @@ } DBbox laydata::tdtdesign::activeoverlap() { - return _target.overlap(); + DBbox ovl = _target.overlap(); + if (ovl == DEFAULT_OVL_BOX) ovl = DEFAULT_ZOOM_BOX; + return ovl; // if (_target.checkedit()) // return _target.edit()->overlap() * _ARTM; // else return DEFAULT_OVL_BOX; Index: tpd_DB/browsers.cpp =================================================================== --- tpd_DB/browsers.cpp (revision 654) +++ tpd_DB/browsers.cpp (revision 721) @@ -878,7 +878,7 @@ word *laynotemp = DEBUG_NEW word(layno); eventLAYER_STATUS.SetClientData(static_cast (laynotemp)); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_STATUS); - delete bt1; + delete bt1; } void browsers::layer_add(const std::string name, const word layno) @@ -891,7 +891,7 @@ eventLAYER_ADD.SetInt(*bt); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_ADD); - delete bt; + delete bt; } void browsers::layer_default(const word newlay, const word oldlay) @@ -905,7 +905,7 @@ eventLAYER_DEF.SetInt(*bt); wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_DEF); - delete bt; + delete bt; } void browsers::addTDTtab(bool newthread) @@ -1000,10 +1000,10 @@ browsers::LayerInfo::LayerInfo(const LayerInfo& lay) { - _name = lay._name; - _layno = lay._layno; - _col = lay._col; - _fill = lay._fill; + _name = lay._name; + _layno = lay._layno; + _col = lay._col; + _fill = lay._fill; } browsers::LayerInfo::LayerInfo(const std::string &name, const word layno) @@ -1029,7 +1029,7 @@ _layer = DEBUG_NEW LayerInfo(*layer); _selected= false; _hidden = false; - + //_locked = false; _picture = DEBUG_NEW wxBitmap(size.GetWidth()-16, size.GetHeight(), -1); @@ -1065,7 +1065,7 @@ stipplebrush = DEBUG_NEW wxBitmap(image, 1); #endif _brush = DEBUG_NEW wxBrush( *stipplebrush); - delete stipplebrush; + delete stipplebrush; } else { @@ -1084,33 +1084,33 @@ _brush->SetColour(color); //} - Create(parent, id, pos, size, style, name); - GetClientSize(&_buttonWidth, &_buttonHeight); + Create(parent, id, pos, size, style, name); + GetClientSize(&_buttonWidth, &_buttonHeight); //***Draw main picture*** preparePicture(); - wxString caption(_layer->name().c_str(),wxConvUTF8); + wxString caption(_layer->name().c_str(),wxConvUTF8); SetToolTip(caption); - + } void browsers::LayerButton::preparePicture() { const int clearence = 2; - int sizeX, sizeY; - GetParent()->GetClientSize(&sizeX, &sizeY); - _buttonWidth = sizeX; - SetSize(_buttonWidth, _buttonHeight); - - wxMemoryDC DC; + int sizeX, sizeY; + GetParent()->GetClientSize(&sizeX, &sizeY); + _buttonWidth = sizeX; + SetSize(_buttonWidth, _buttonHeight); + + wxMemoryDC DC; wxFont font(10,wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); DC.SetFont(font); - //pict.SetWidth(_buttonWidth); - if (_picture) - { - delete _picture; - _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1); - } + //pict.SetWidth(_buttonWidth); + if (_picture) + { + delete _picture; + _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1); + } DC.SelectObject(*_picture); DC.SetBrush(*_brush); @@ -1128,9 +1128,9 @@ DC.GetTextExtent(layno, &wno, &hno); DC.DrawText(layno, 0, int((_buttonHeight - hno)/2)); curw += wno + clearence; - - wxBrush tempBrush = DC.GetBrush(); - if (_selected) + + wxBrush tempBrush = DC.GetBrush(); + if (_selected) { DC.SetBrush(*wxWHITE_BRUSH); DC.SetTextForeground(*wxBLACK); @@ -1142,21 +1142,21 @@ } const wxString dummy= _T("WWWWWWWWWW"); wxString caption(_layer->name().c_str(),wxConvUTF8); - if (caption.Len()>10) - { - caption[7]=wxT('.'); - caption[8]=wxT('.'); - caption[9]=wxT('.'); - } + if (caption.Len()>10) + { + caption[7]=wxT('.'); + caption[8]=wxT('.'); + caption[9]=wxT('.'); + } int hna,wna; DC.GetTextExtent(dummy, &wna, &hna); DC.DrawRectangle(curw, clearence, wna, _buttonHeight - 2*clearence); curw += clearence; DC.DrawText(caption, curw, int(_buttonHeight/2 - hna/2)); - curw += wna; - - DC.SetBrush(tempBrush); - DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence); + curw += wna; + + DC.SetBrush(tempBrush); + DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence); DC.SelectObject(wxNullBitmap); Refresh(); @@ -1175,7 +1175,7 @@ void browsers::LayerButton::OnPaint(wxPaintEvent&event) { - wxPaintDC dc(this); + wxPaintDC dc(this); dc.DrawBitmap(*_picture, 0, 0, false); if (_selected) { @@ -1225,7 +1225,7 @@ eventLAYER_SELECT.SetInt(bt); assert(Browsers && Browsers->TDTlayers()); - wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT); + wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT); } } } @@ -1268,18 +1268,18 @@ //==================================================================== BEGIN_EVENT_TABLE(browsers::LayerPanel, wxScrolledWindow) - EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand) - EVT_SIZE(browsers::LayerPanel::OnSize) + EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand) + EVT_SIZE(browsers::LayerPanel::OnSize) END_EVENT_TABLE() //==================================================================== browsers::LayerPanel::LayerPanel(wxWindow* parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style , const wxString& name) - :wxScrolledWindow(parent, id, pos, size, style, name), - _selectedButton(NULL) + const wxPoint& pos, + const wxSize& size, + long style , const wxString& name) + :wxScrolledWindow(parent, id, pos, size, style, name), + _selectedButton(NULL) { - _buttonCount = 0; + _buttonCount = 0; } browsers::LayerPanel::~LayerPanel() @@ -1298,10 +1298,10 @@ { word *oldlay = static_cast(event.GetClientData()); word layno = event.GetExtraLong(); - _buttonMap[*oldlay]->unselect(); - _buttonMap[layno]->select(); + if (NULL != _buttonMap[*oldlay]) _buttonMap[*oldlay]->unselect(); + if (NULL != _buttonMap[layno]) _buttonMap[layno]->select(); //_layerlist->defaultLayer((word)event.GetExtraLong(), (word)event.GetInt()); - delete (static_cast(oldlay)); + delete (oldlay); break; } case BT_LAYER_HIDE: @@ -1309,8 +1309,8 @@ word *layno = static_cast(event.GetClientData()); bool status = (1 == event.GetExtraLong()); //_buttonMap[layno]->hideLayer(event.IsChecked()); - _buttonMap[*layno]->hideLayer(status); - delete (static_cast(layno)); + if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->hideLayer(status); + delete (layno); break; } //_layerlist->hideLayer((word)event.GetExtraLong(),event.IsChecked());break; @@ -1319,8 +1319,8 @@ //_layerlist->lockLayer((word)event.GetExtraLong(),event.IsChecked()); word *layno = static_cast(event.GetClientData()); bool status = (1 == event.GetExtraLong()); - _buttonMap[*layno]->lockLayer(status); - delete (static_cast(layno)); + if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->lockLayer(status); + delete (layno); break; } case BT_LAYER_SELECT: @@ -1328,32 +1328,26 @@ word layno = event.GetExtraLong(); if (NULL != _selectedButton) _selectedButton->unselect(); _selectedButton = _buttonMap[layno]; - break; } case BT_LAYER_ADD: { LayerInfo* layer = static_cast(event.GetClientData()); - LayerButton *layerButton; - layerButtonMap::iterator it; - int szx, szy; + int szx, szy; //Remove selection from current button - if (_selectedButton!=NULL) _selectedButton->unselect(); - + if (NULL != _selectedButton) _selectedButton->unselect(); it = _buttonMap.find(layer->layno()); - if (it!= _buttonMap.end()) + if (it != _buttonMap.end()) { //Button already exists, replace it LayerButton *tempButton = it->second; - //layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount, wxPoint (0, _buttonCount*30), wxSize(200, 30), //wxBU_AUTODRAW, wxDefaultValidator, _T("TTT"), layer); int x, y; - int ID; tempButton->GetPosition(&x, &y); tempButton->GetSize(&szx, &szy); @@ -1362,22 +1356,19 @@ wxBU_AUTODRAW|wxNO_BORDER, wxDefaultValidator, _T("button"), layer); _buttonMap[layer->layno()] = layerButton; delete tempButton; - } else { //Button doesn't exist, create new button // int szx, szy; - GetClientSize(&szx, &szy); + GetClientSize(&szx, &szy); layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount, wxPoint (0, _buttonCount*buttonHeight), wxSize(szx, buttonHeight), wxBU_AUTODRAW, wxDefaultValidator, _T("button"), layer); _buttonMap[layer->layno()] = layerButton; - _buttonCount++; this->SetScrollbars(0, buttonHeight, 0, _buttonCount); } - //Restore selection if ((it = _buttonMap.find(DATC->curlay()))!= _buttonMap.end()) { @@ -1386,7 +1377,7 @@ } //_selectedButton = (_buttonMap.begin())->second; //_selectedButton->select(); - delete (static_cast(layer)); + delete (static_cast(layer)); break; } } @@ -1394,12 +1385,12 @@ void browsers::LayerPanel::OnSize(wxSizeEvent& evt) { - for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it) - { - LayerButton *button = it->second; - button->preparePicture(); - } - Refresh(); + for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it) + { + LayerButton *button = it->second; + button->preparePicture(); + } + Refresh(); } wxString browsers::LayerPanel::getAllSelected() @@ -1487,5 +1478,5 @@ wxString browsers::LayerBrowser::getAllSelected() { - return _layerPanel->getAllSelected(); + return _layerPanel->getAllSelected(); } Index: aclocal.m4 =================================================================== --- aclocal.m4 (revision 654) +++ aclocal.m4 (revision 721) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -6584,7 +6587,7 @@ AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6599,7 +6602,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -6615,8 +6618,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6888,7 +6893,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6936,13 +6941,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7047,16 +7052,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7328,7 +7334,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) Index: toped.spec =================================================================== RCS file: /cvs/pkgs/rpms/toped/devel/toped.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- toped.spec 25 May 2008 09:09:48 -0000 1.10 +++ toped.spec 27 Jul 2008 08:46:01 -0000 1.11 @@ -1,6 +1,6 @@ Name: toped Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VLSI IC Layout Editor License: GPLv2 @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2 +Patch0: toped_release_0.9_patch_654_721.patch BuildRequires: desktop-file-utils BuildRequires: wxGTK-devel @@ -23,18 +24,11 @@ Toped is listed among Fedora Electronic Lab packages. -%package devel -Summary: Toped - development files -Group: Applications/Engineering -Requires: %{name} = %{version}-%{release} - - -%description devel -Development files for the Toped. - %prep %setup -q +%patch0 -p0 -b .composite + # instead of exporting the variable $TPD_GLOBAL sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp @@ -76,9 +70,9 @@ #No translations #%find_lang %{name} -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so -#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so +%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so #spurious-executable-perm chmod 0644 COPYING @@ -107,11 +101,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/toped.png -%files devel -%{_libdir}/libtpd*.so - %Changelog +* Fri Jul 26 2008 Chitlesh Goorah - 0.9.0-2 +- Bug fix 451218 + * Sun May 25 2008 Chitlesh Goorah - 0.9.0-1 - New upstream release From fedora-extras-commits at redhat.com Sun Jul 27 08:59:51 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 27 Jul 2008 08:59:51 GMT Subject: rpms/kernel/devel config-powerpc64, 1.18, 1.19 kernel.spec, 1.808, 1.809 Message-ID: <200807270859.m6R8xplV030518@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30423 Modified Files: config-powerpc64 kernel.spec Log Message: Disable powerpc64 ibmveth driver, not compiling. Index: config-powerpc64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- config-powerpc64 23 Jul 2008 19:51:09 -0000 1.18 +++ config-powerpc64 27 Jul 2008 08:59:21 -0000 1.19 @@ -51,7 +51,7 @@ CONFIG_HVC_CONSOLE=y CONFIG_HOTPLUG_PCI=y CONFIG_THERM_PM72=y -CONFIG_IBMVETH=m +# CONFIG_IBMVETH is not set CONFIG_SCSI_IBMVSCSI=m # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.808 retrieving revision 1.809 diff -u -r1.808 -r1.809 --- kernel.spec 27 Jul 2008 07:22:15 -0000 1.808 +++ kernel.spec 27 Jul 2008 08:59:21 -0000 1.809 @@ -1694,6 +1694,7 @@ %changelog * Sun Jul 27 2008 Roland McGrath - 2.6.26-git15 +- Disable powerpc64 ibmveth driver, not compiling. * Sat Jul 26 2008 Dave Jones - Enable CONFIG_VIDEO_ADV_DEBUG From fedora-extras-commits at redhat.com Sun Jul 27 09:05:16 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 27 Jul 2008 09:05:16 GMT Subject: rpms/scribus/devel .cvsignore, 1.15, 1.16 scribus.spec, 1.31, 1.32 sources, 1.15, 1.16 Message-ID: <200807270905.m6R95G03004943@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4908 Modified Files: .cvsignore scribus.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scribus/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 2 Jun 2007 11:56:40 -0000 1.15 +++ .cvsignore 27 Jul 2008 09:04:46 -0000 1.16 @@ -1 +1 @@ -scribus-1.3.4.tar.bz2 +scribus-svn-12419.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- scribus.spec 25 Mar 2008 12:37:35 -0000 1.31 +++ scribus.spec 27 Jul 2008 09:04:46 -0000 1.32 @@ -1,17 +1,20 @@ Name: scribus -Version: 1.3.4 -Release: 5%{?dist} +Version: 1.3.5 +Release: 0.3.12419svn%{?dist} Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPLv2+ URL: http://www.scribus.net/ -Source0: http://dl.sf.net/scribus/scribus-1.3.4.tar.bz2 +# obtained via svn co -r 12419 svn://scribus.info/Scribus/trunk/Scribus +Source0: scribus-svn-12419.tar.bz2 Source1: scribus.xml Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: cmake + BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: lcms-devel @@ -19,14 +22,15 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: python-devel >= 2.3 -BuildRequires: qt3-devel +BuildRequires: python-imaging-devel +BuildRequires: qt-devel BuildRequires: zlib-devel BuildRequires: freetype-devel BuildRequires: gnutls-devel +BuildRequires: cairo-devel Requires: ghostscript >= 7.07 Requires: python >= 2.3 Requires: python-imaging @@ -75,36 +79,35 @@ %description devel Header files for Scribus. +%package doc +Summary: Documentation files for Scribus +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description doc +%{summary} %prep -%setup -q -#%patch -p1 -b .x86_64 +%setup -q -n Scribus %build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%configure \ - --with-pythondir=%{_prefix} \ - --with-extra-libs=%{_libdir} -make %{?_smp_mflags} - +mkdir build +cd build +%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \ + -DCMAKE_SKIP_RPATH=YES ../ +make VERBOSE=1 %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} -%makeinstall +cd build +make install DESTDIR=$RPM_BUILD_ROOT -install -p -D -m0644 scribus/icons/scribusicon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribusicon.png -install -p -D -m0644 scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png -install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/scribus.xml - -desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - scribus.desktop +install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusicon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribusicon.png +install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' - %clean rm -rf ${RPM_BUILD_ROOT} @@ -121,10 +124,11 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS ChangeLog ChangeLogSVN COPYING README TODO %{_bindir}/scribus -%{_datadir}/applications/fedora-scribus.desktop +#%{_datadir}/applications/fedora-scribus.desktop %{_datadir}/mime/packages/scribus.xml +%{_datadir}/mimelnk/application/*scribus.desktop %{_datadir}/pixmaps/* %{_datadir}/scribus/ %{_libdir}/scribus/ @@ -137,7 +141,34 @@ %doc AUTHORS COPYING %{_includedir}/scribus/ +%files doc +%defattr(-,root,root,-) +%lang(cd) %{_datadir}/doc/%{name}-1.3.5svn/cs/* +%lang(de) %{_datadir}/doc/%{name}-1.3.5svn/de/* +%lang(en) %{_datadir}/doc/%{name}-1.3.5svn/en/* +%lang(fr) %{_datadir}/doc/%{name}-1.3.5svn/fr/* +%lang(pl) %{_datadir}/doc/%{name}-1.3.5svn/pl/* +%{_datadir}/doc/%{name}-1.3.5svn/AUTHORS +%{_datadir}/doc/%{name}-1.3.5svn/BUILDING +%{_datadir}/doc/%{name}-1.3.5svn/ChangeLog +%{_datadir}/doc/%{name}-1.3.5svn/ChangeLogSVN +%{_datadir}/doc/%{name}-1.3.5svn/COPYING +%{_datadir}/doc/%{name}-1.3.5svn/NEWS +%{_datadir}/doc/%{name}-1.3.5svn/README* +%{_datadir}/doc/%{name}-1.3.5svn/TODO +%{_datadir}/doc/%{name}-1.3.5svn/PACKAGING + + + %changelog +* Sun Jul 27 2008 Andreas Bierfert +- 1.3.5-0.3.12419svn +- new svn snapshot + +* Mon Jul 21 2008 Andreas Bierfert +- 1.3.5-0.2.12404svn +- svn snapshot + * Mon Feb 18 2008 Fedora Release Engineering - 1.3.4-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scribus/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 2 Jun 2007 11:56:40 -0000 1.15 +++ sources 27 Jul 2008 09:04:46 -0000 1.16 @@ -1 +1 @@ -cd3bc6cc6c2e2826eb689342e439443d scribus-1.3.4.tar.bz2 +ecd5b92b5d4c59ca2818672714bcd0e7 scribus-svn-12419.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 27 09:46:44 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 27 Jul 2008 09:46:44 GMT Subject: rpms/em8300-kmod/F-8 em8300-kmod.spec,1.59,1.60 Message-ID: <200807270946.m6R9kixq007170@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/em8300-kmod/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7134 Modified Files: em8300-kmod.spec Log Message: * Sun Jul 27 2008 Ville Skytt?? - Rebuild for kernel 2.6.25.11-60.fc8. Index: em8300-kmod.spec =================================================================== RCS file: /cvs/pkgs/rpms/em8300-kmod/F-8/em8300-kmod.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- em8300-kmod.spec 15 Jul 2008 16:32:27 -0000 1.59 +++ em8300-kmod.spec 27 Jul 2008 09:46:14 -0000 1.60 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.25.10-47.fc8} +%{!?kversion: %define kversion 2.6.25.11-60.fc8} %define kmod_name em8300 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -83,6 +83,9 @@ %changelog +* Sun Jul 27 2008 Ville Skytt?? +- Rebuild for kernel 2.6.25.11-60.fc8. + * Tue Jul 15 2008 Ville Skytt?? - Rebuild for kernel 2.6.25.10-47.fc8. From fedora-extras-commits at redhat.com Sun Jul 27 09:55:22 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 27 Jul 2008 09:55:22 GMT Subject: rpms/preload/F-9 import.log, NONE, 1.1 preload-0.6-start-late.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 preload.spec, 1.2, 1.3 sources, 1.2, 1.3 preload.cmdline.c.patch, 1.1, NONE preload.conf.in.patch, 1.1, NONE preload.init.in.patch, 1.1, NONE preload.logrotate.in.patch, 1.1, NONE preload.proc.c.patch, 1.1, NONE preload.prophet.c.patch, 1.1, NONE preload.readahead.c.patch, 1.1, NONE preload.readahead.h.patch, 1.1, NONE preload.state.c.patch, 1.1, NONE Message-ID: <200807270955.m6R9tMYu007720@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/preload/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7693/F-9 Modified Files: .cvsignore preload.spec sources Added Files: import.log preload-0.6-start-late.patch Removed Files: preload.cmdline.c.patch preload.conf.in.patch preload.init.in.patch preload.logrotate.in.patch preload.proc.c.patch preload.prophet.c.patch preload.readahead.c.patch preload.readahead.h.patch preload.state.c.patch Log Message: Sync with upstream for new version and the spec file --- NEW FILE import.log --- preload-0_6-1_fc9:F-9:preload-0.6-1.fc9.src.rpm:1217152464 preload-0.6-start-late.patch: --- NEW FILE preload-0.6-start-late.patch --- diff -up preload-0.6/preload.init.in.start-late preload-0.6/preload.init.in --- preload-0.6/preload.init.in.start-late 2008-07-24 11:54:21.000000000 -0400 +++ preload-0.6/preload.init.in 2008-07-24 11:54:34.000000000 -0400 @@ -4,7 +4,7 @@ # # Starts the @PACKAGE@ daemon # -# chkconfig: - 05 95 +# chkconfig: - 099 1 # description: @PACKAGE_SUMMARY@ # processname: @PACKAGE@ # Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preload/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jan 2008 21:22:39 -0000 1.2 +++ .cvsignore 27 Jul 2008 09:54:52 -0000 1.3 @@ -1 +1 @@ -preload-0.4.tar.gz +preload-0.6.tar.gz Index: preload.spec =================================================================== RCS file: /cvs/pkgs/rpms/preload/F-9/preload.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- preload.spec 13 Feb 2008 11:31:35 -0000 1.2 +++ preload.spec 27 Jul 2008 09:54:52 -0000 1.3 @@ -1,6 +1,6 @@ Name: preload -Version: 0.4 -Release: 6%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Preload is an adaptive readahead daemon Group: Applications/System @@ -8,15 +8,8 @@ URL: http://preload.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: preload.init.in.patch -Patch1: preload.logrotate.in.patch -Patch2: preload.cmdline.c.patch -Patch3: preload.conf.in.patch -Patch4: preload.proc.c.patch -Patch5: preload.prophet.c.patch -Patch6: preload.readahead.c.patch -Patch7: preload.readahead.h.patch -Patch8: preload.state.c.patch + +Patch0: preload-0.6-start-late.patch BuildRequires: basesystem, glib2-devel, help2man Requires: basesystem, logrotate @@ -33,15 +26,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch0 -p1 -b .start-late %build %configure @@ -87,6 +72,14 @@ %changelog +* Thu Jul 24 2008 Behdad Esfahbod - 0.6-1 +- Update to 0.6 +- Remove all patches. They are all obsolete by upstream now. +- Add preload-0.6-start-late.patch to start preload as last service. + We use readahead for boot speedup, and want preload just for login/desktop + speedup. So, start it last. +- Build it for F-8 and F-9 (Marc Wiriadisastra) + * Wed Feb 13 2008 Marc Wiriadisastra - 0.4-6 - Rebuild for gcc4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preload/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jan 2008 21:22:39 -0000 1.2 +++ sources 27 Jul 2008 09:54:52 -0000 1.3 @@ -1 +1 @@ -9c98bc97ec261925c9a40e5084c9c149 preload-0.4.tar.gz +2aac518aceea4dbd33d74f52b1a98fca preload-0.6.tar.gz --- preload.cmdline.c.patch DELETED --- --- preload.conf.in.patch DELETED --- --- preload.init.in.patch DELETED --- --- preload.logrotate.in.patch DELETED --- --- preload.proc.c.patch DELETED --- --- preload.prophet.c.patch DELETED --- --- preload.readahead.c.patch DELETED --- --- preload.readahead.h.patch DELETED --- --- preload.state.c.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 09:58:15 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 27 Jul 2008 09:58:15 GMT Subject: rpms/preload/F-8 import.log, NONE, 1.1 preload-0.6-start-late.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 preload.spec, 1.1, 1.2 sources, 1.2, 1.3 preload.cmdline.c.patch, 1.1, NONE preload.conf.in.patch, 1.1, NONE preload.init.in.patch, 1.1, NONE preload.logrotate.in.patch, 1.1, NONE preload.proc.c.patch, 1.1, NONE preload.prophet.c.patch, 1.1, NONE preload.readahead.c.patch, 1.1, NONE preload.readahead.h.patch, 1.1, NONE preload.state.c.patch, 1.1, NONE Message-ID: <200807270958.m6R9wFQZ007924@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/preload/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7884/F-8 Modified Files: .cvsignore preload.spec sources Added Files: import.log preload-0.6-start-late.patch Removed Files: preload.cmdline.c.patch preload.conf.in.patch preload.init.in.patch preload.logrotate.in.patch preload.proc.c.patch preload.prophet.c.patch preload.readahead.c.patch preload.readahead.h.patch preload.state.c.patch Log Message: Sync with upstream's source and also with the spec file --- NEW FILE import.log --- preload-0_6-1_fc9:F-8:preload-0.6-1.fc9.src.rpm:1217152639 preload-0.6-start-late.patch: --- NEW FILE preload-0.6-start-late.patch --- diff -up preload-0.6/preload.init.in.start-late preload-0.6/preload.init.in --- preload-0.6/preload.init.in.start-late 2008-07-24 11:54:21.000000000 -0400 +++ preload-0.6/preload.init.in 2008-07-24 11:54:34.000000000 -0400 @@ -4,7 +4,7 @@ # # Starts the @PACKAGE@ daemon # -# chkconfig: - 05 95 +# chkconfig: - 099 1 # description: @PACKAGE_SUMMARY@ # processname: @PACKAGE@ # Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preload/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jan 2008 21:26:20 -0000 1.2 +++ .cvsignore 27 Jul 2008 09:57:45 -0000 1.3 @@ -1 +1 @@ -preload-0.4.tar.gz +preload-0.6.tar.gz Index: preload.spec =================================================================== RCS file: /cvs/pkgs/rpms/preload/F-8/preload.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- preload.spec 17 Jan 2008 21:26:20 -0000 1.1 +++ preload.spec 27 Jul 2008 09:57:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: preload -Version: 0.4 -Release: 5%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Preload is an adaptive readahead daemon Group: Applications/System @@ -8,15 +8,8 @@ URL: http://preload.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: preload.init.in.patch -Patch1: preload.logrotate.in.patch -Patch2: preload.cmdline.c.patch -Patch3: preload.conf.in.patch -Patch4: preload.proc.c.patch -Patch5: preload.prophet.c.patch -Patch6: preload.readahead.c.patch -Patch7: preload.readahead.h.patch -Patch8: preload.state.c.patch + +Patch0: preload-0.6-start-late.patch BuildRequires: basesystem, glib2-devel, help2man Requires: basesystem, logrotate @@ -33,15 +26,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch0 -p1 -b .start-late %build %configure @@ -87,6 +72,17 @@ %changelog +* Thu Jul 24 2008 Behdad Esfahbod - 0.6-1 +- Update to 0.6 +- Remove all patches. They are all obsolete by upstream now. +- Add preload-0.6-start-late.patch to start preload as last service. + We use readahead for boot speedup, and want preload just for login/desktop + speedup. So, start it last. +- Build it for F-8 and F-9 (Marc Wiriadisastra) + +* Wed Feb 13 2008 Marc Wiriadisastra - 0.4-6 +- Rebuild for gcc4.3 + * Wed Jan 16 2008 Marc Wiriadisastra - 0.4-5 - Removed auto start from init - Added all the CVS patches prior to next release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preload/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jan 2008 21:26:20 -0000 1.2 +++ sources 27 Jul 2008 09:57:45 -0000 1.3 @@ -1 +1 @@ -9c98bc97ec261925c9a40e5084c9c149 preload-0.4.tar.gz +2aac518aceea4dbd33d74f52b1a98fca preload-0.6.tar.gz --- preload.cmdline.c.patch DELETED --- --- preload.conf.in.patch DELETED --- --- preload.init.in.patch DELETED --- --- preload.logrotate.in.patch DELETED --- --- preload.proc.c.patch DELETED --- --- preload.prophet.c.patch DELETED --- --- preload.readahead.c.patch DELETED --- --- preload.readahead.h.patch DELETED --- --- preload.state.c.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 10:02:01 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 27 Jul 2008 10:02:01 GMT Subject: rpms/vdr-sudoku/F-9 vdr-sudoku-0.3.0-finnish.patch, NONE, 1.1 vdr-sudoku-0.3.0-vardir.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vdr-sudoku.spec, 1.10, 1.11 vdr-sudoku-0.2.0-vardir.patch, 1.1, NONE Message-ID: <200807271002.m6RA21st014821@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/vdr-sudoku/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14759/F-9 Modified Files: .cvsignore sources vdr-sudoku.spec Added Files: vdr-sudoku-0.3.0-finnish.patch vdr-sudoku-0.3.0-vardir.patch Removed Files: vdr-sudoku-0.2.0-vardir.patch Log Message: * Sun Jul 27 2008 Ville Skytt?? - 0.3.0-1 - 0.3.0. - Patch to add missing Finnish translations. - Fix translation file ownerships. vdr-sudoku-0.3.0-finnish.patch: --- NEW FILE vdr-sudoku-0.3.0-finnish.patch --- diff -up sudoku-0.3.0/i18n.cpp~ sudoku-0.3.0/i18n.cpp --- sudoku-0.3.0/i18n.cpp~ 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/i18n.cpp 2008-07-27 12:23:18.000000000 +0300 @@ -154,7 +154,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Peru viimeisin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -176,7 +176,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Toista viimeisin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -198,7 +198,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Merkitse/poista merkint?", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -220,7 +220,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Seuraava ruutu", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -242,7 +242,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Seuraava numero", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -594,7 +594,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Punainen n?pp?in", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -616,7 +616,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Vihre? n?pp?in", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -638,7 +638,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Keltainen n?pp?in", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -660,7 +660,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Suuri kirjasin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -682,7 +682,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Suuren kirjasimen korkeus (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -704,7 +704,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Suuren kirjasimen leveys (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -726,7 +726,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Pieni kirjasin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -748,7 +748,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Pienen kirjasimen korkeus (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -770,7 +770,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Pienen kirjasimen leveys (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek diff -up sudoku-0.3.0/po/fi_FI.po~ sudoku-0.3.0/po/fi_FI.po --- sudoku-0.3.0/po/fi_FI.po~ 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/po/fi_FI.po 2008-07-27 12:24:56.000000000 +0300 @@ -27,19 +27,19 @@ msgid "Save the puzzle" msgstr "Tallenna ristikko" msgid "Undo last action" -msgstr "" +msgstr "Peru viimeisin" msgid "Redo last action" -msgstr "" +msgstr "Toista viimeisin" msgid "Mark/unmark" -msgstr "" +msgstr "Merkitse/poista merkint?" msgid "Next cell" -msgstr "" +msgstr "Seuraava ruutu" msgid "Next number" -msgstr "" +msgstr "Seuraava numero" msgid "Reset the puzzle" msgstr "Tyhjenn? ristikko" @@ -94,31 +94,31 @@ msgid "Clear marks on reset" msgstr "Poista merkinn?t aloitettaessa" msgid "Key Red" -msgstr "" +msgstr "Punainen n?pp?in" msgid "Key Green" -msgstr "" +msgstr "Vihre? n?pp?in" msgid "Key Yellow" -msgstr "" +msgstr "Keltainen n?pp?in" msgid "Great font" -msgstr "" +msgstr "Suuri kirjasin" msgid "Great font height (pixel)" -msgstr "" +msgstr "Suuren kirjasimen korkeus (pikseleit?)" msgid "Great font width (pixel)" -msgstr "" +msgstr "Suuren kirjasimen leveys (pikseleit?)" msgid "Small font" -msgstr "" +msgstr "Pieni kirjasin" msgid "Small font height (pixel)" -msgstr "" +msgstr "Pienen kirjasimen korkeus (pikseleit?)" msgid "Small font width (pixel)" -msgstr "" +msgstr "Pienen kirjasimen leveys (pikseleit?)" msgid "Transparency (%)" msgstr "L?pin?kyvyys (%)" vdr-sudoku-0.3.0-vardir.patch: --- NEW FILE vdr-sudoku-0.3.0-vardir.patch --- diff -up sudoku-0.3.0/menu.cpp.orig sudoku-0.3.0/menu.cpp --- sudoku-0.3.0/menu.cpp.orig 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/menu.cpp 2008-07-27 12:40:06.000000000 +0300 @@ -88,7 +88,7 @@ Menu::Menu(cPlugin* plugin, const SetupD command_menu = NULL; list_menu = NULL; setup_menu = NULL; - listfile = AddDirectory(plugin->ConfigDirectory(plugin->Name()), SUDOKU_LIST); + listfile = AddDirectory("@PLUGINVARDIR@", SUDOKU_LIST); } /** Destructor */ diff -up sudoku-0.3.0/README.orig sudoku-0.3.0/README --- sudoku-0.3.0/README.orig 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/README 2008-07-27 12:40:06.000000000 +0300 @@ -55,9 +55,7 @@ new puzzle is only generated on VDR star selecting this command in the commands menu. In the commands menu you can load and save puzzles from/to the sudoku-list file. -This file is located at the plugins folder inside the configuration folder of -VDR. If you don't specify a configuration folder, your videodir is used (e.g. -/video0/plugins/sudoku/sudoku-list). +This file is located in @PLUGINVARDIR at . The sudoku-list file contains lines with a sudoku dump and an optional description. The sudoku dump has to begin at the first position of the line. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vdr-sudoku/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Apr 2008 09:02:53 -0000 1.5 +++ .cvsignore 27 Jul 2008 10:01:31 -0000 1.6 @@ -1 +1 @@ -vdr-sudoku-0.2.1.tgz +vdr-sudoku-0.3.0.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vdr-sudoku/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Apr 2008 09:02:53 -0000 1.5 +++ sources 27 Jul 2008 10:01:31 -0000 1.6 @@ -1 +1 @@ -edcbeba764e6491c659ce78d7bcafc4b vdr-sudoku-0.2.1.tgz +77bb5ff075018166369c823d2084bebd vdr-sudoku-0.3.0.tgz Index: vdr-sudoku.spec =================================================================== RCS file: /cvs/pkgs/rpms/vdr-sudoku/F-9/vdr-sudoku.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vdr-sudoku.spec 7 Apr 2008 20:58:45 -0000 1.10 +++ vdr-sudoku.spec 27 Jul 2008 10:01:31 -0000 1.11 @@ -5,8 +5,8 @@ %define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR) Name: vdr-%{pname} -Version: 0.2.1 -Release: 2%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Sudoku plugin for VDR Group: Amusements/Games @@ -14,7 +14,8 @@ URL: http://www.toms-cafe.de/vdr/sudoku/ Source0: http://toms-cafe.de/vdr/sudoku/%{name}-%{version}.tgz Source1: %{name}.conf -Patch0: %{name}-0.2.0-vardir.patch +Patch0: %{name}-0.3.0-vardir.patch +Patch1: %{name}-0.3.0-finnish.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.3.47 @@ -29,6 +30,7 @@ %prep %setup -q -n sudoku-%{version} sed -e 's|@PLUGINVARDIR@|%{vardir}/%{pname}|g' %{PATCH0} | patch -p1 +%patch1 -p1 for f in CONTRIBUTORS HISTORY README ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f done @@ -64,16 +66,21 @@ %files -f %{name}.lang +%defattr(-,%{vdr_user},root,-) +%dir %{vardir}/%{pname}/ +%ghost %config(noreplace) %{vardir}/%{pname}/sudoku-list %defattr(-,root,root,-) %doc CONTRIBUTORS COPYING HISTORY README %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf %{plugindir}/libvdr-%{pname}.so.%{apiver} -%defattr(-,%{vdr_user},root,-) -%dir %{vardir}/%{pname}/ -%ghost %config(noreplace) %{vardir}/%{pname}/sudoku-list %changelog +* Sun Jul 27 2008 Ville Skytt?? - 0.3.0-1 +- 0.3.0. +- Patch to add missing Finnish translations. +- Fix translation file ownerships. + * Mon Apr 7 2008 Ville Skytt?? - 0.2.1-2 - Rebuild for VDR 1.6.0. --- vdr-sudoku-0.2.0-vardir.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 10:02:02 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 27 Jul 2008 10:02:02 GMT Subject: rpms/vdr-sudoku/devel vdr-sudoku-0.3.0-finnish.patch, NONE, 1.1 vdr-sudoku-0.3.0-vardir.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vdr-sudoku.spec, 1.10, 1.11 vdr-sudoku-0.2.0-vardir.patch, 1.1, NONE Message-ID: <200807271002.m6RA22JI014826@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/vdr-sudoku/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14759/devel Modified Files: .cvsignore sources vdr-sudoku.spec Added Files: vdr-sudoku-0.3.0-finnish.patch vdr-sudoku-0.3.0-vardir.patch Removed Files: vdr-sudoku-0.2.0-vardir.patch Log Message: * Sun Jul 27 2008 Ville Skytt?? - 0.3.0-1 - 0.3.0. - Patch to add missing Finnish translations. - Fix translation file ownerships. vdr-sudoku-0.3.0-finnish.patch: --- NEW FILE vdr-sudoku-0.3.0-finnish.patch --- diff -up sudoku-0.3.0/i18n.cpp~ sudoku-0.3.0/i18n.cpp --- sudoku-0.3.0/i18n.cpp~ 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/i18n.cpp 2008-07-27 12:23:18.000000000 +0300 @@ -154,7 +154,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Peru viimeisin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -176,7 +176,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Toista viimeisin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -198,7 +198,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Merkitse/poista merkint?", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -220,7 +220,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Seuraava ruutu", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -242,7 +242,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Seuraava numero", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -594,7 +594,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Punainen n?pp?in", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -616,7 +616,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Vihre? n?pp?in", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -638,7 +638,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Keltainen n?pp?in", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -660,7 +660,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Suuri kirjasin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -682,7 +682,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Suuren kirjasimen korkeus (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -704,7 +704,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Suuren kirjasimen leveys (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -726,7 +726,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Pieni kirjasin", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -748,7 +748,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Pienen kirjasimen korkeus (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek @@ -770,7 +770,7 @@ const tI18nPhrase SudokuPlugin::Phrases[ "", // Portugu?s / Portuguese "", // Fran?ais / French "", // Norsk / Norwegian - "", // suomi / Finnish + "Pienen kirjasimen leveys (pikseleit?)", // suomi / Finnish "", // Polski / Polish "", // Espa?ol / Spanish "", // ???????? / Greek diff -up sudoku-0.3.0/po/fi_FI.po~ sudoku-0.3.0/po/fi_FI.po --- sudoku-0.3.0/po/fi_FI.po~ 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/po/fi_FI.po 2008-07-27 12:24:56.000000000 +0300 @@ -27,19 +27,19 @@ msgid "Save the puzzle" msgstr "Tallenna ristikko" msgid "Undo last action" -msgstr "" +msgstr "Peru viimeisin" msgid "Redo last action" -msgstr "" +msgstr "Toista viimeisin" msgid "Mark/unmark" -msgstr "" +msgstr "Merkitse/poista merkint?" msgid "Next cell" -msgstr "" +msgstr "Seuraava ruutu" msgid "Next number" -msgstr "" +msgstr "Seuraava numero" msgid "Reset the puzzle" msgstr "Tyhjenn? ristikko" @@ -94,31 +94,31 @@ msgid "Clear marks on reset" msgstr "Poista merkinn?t aloitettaessa" msgid "Key Red" -msgstr "" +msgstr "Punainen n?pp?in" msgid "Key Green" -msgstr "" +msgstr "Vihre? n?pp?in" msgid "Key Yellow" -msgstr "" +msgstr "Keltainen n?pp?in" msgid "Great font" -msgstr "" +msgstr "Suuri kirjasin" msgid "Great font height (pixel)" -msgstr "" +msgstr "Suuren kirjasimen korkeus (pikseleit?)" msgid "Great font width (pixel)" -msgstr "" +msgstr "Suuren kirjasimen leveys (pikseleit?)" msgid "Small font" -msgstr "" +msgstr "Pieni kirjasin" msgid "Small font height (pixel)" -msgstr "" +msgstr "Pienen kirjasimen korkeus (pikseleit?)" msgid "Small font width (pixel)" -msgstr "" +msgstr "Pienen kirjasimen leveys (pikseleit?)" msgid "Transparency (%)" msgstr "L?pin?kyvyys (%)" vdr-sudoku-0.3.0-vardir.patch: --- NEW FILE vdr-sudoku-0.3.0-vardir.patch --- diff -up sudoku-0.3.0/menu.cpp.orig sudoku-0.3.0/menu.cpp --- sudoku-0.3.0/menu.cpp.orig 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/menu.cpp 2008-07-27 12:40:06.000000000 +0300 @@ -88,7 +88,7 @@ Menu::Menu(cPlugin* plugin, const SetupD command_menu = NULL; list_menu = NULL; setup_menu = NULL; - listfile = AddDirectory(plugin->ConfigDirectory(plugin->Name()), SUDOKU_LIST); + listfile = AddDirectory("@PLUGINVARDIR@", SUDOKU_LIST); } /** Destructor */ diff -up sudoku-0.3.0/README.orig sudoku-0.3.0/README --- sudoku-0.3.0/README.orig 2008-07-27 06:00:00.000000000 +0300 +++ sudoku-0.3.0/README 2008-07-27 12:40:06.000000000 +0300 @@ -55,9 +55,7 @@ new puzzle is only generated on VDR star selecting this command in the commands menu. In the commands menu you can load and save puzzles from/to the sudoku-list file. -This file is located at the plugins folder inside the configuration folder of -VDR. If you don't specify a configuration folder, your videodir is used (e.g. -/video0/plugins/sudoku/sudoku-list). +This file is located in @PLUGINVARDIR at . The sudoku-list file contains lines with a sudoku dump and an optional description. The sudoku dump has to begin at the first position of the line. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Apr 2008 09:02:53 -0000 1.5 +++ .cvsignore 27 Jul 2008 10:01:32 -0000 1.6 @@ -1 +1 @@ -vdr-sudoku-0.2.1.tgz +vdr-sudoku-0.3.0.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Apr 2008 09:02:53 -0000 1.5 +++ sources 27 Jul 2008 10:01:32 -0000 1.6 @@ -1 +1 @@ -edcbeba764e6491c659ce78d7bcafc4b vdr-sudoku-0.2.1.tgz +77bb5ff075018166369c823d2084bebd vdr-sudoku-0.3.0.tgz Index: vdr-sudoku.spec =================================================================== RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/vdr-sudoku.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vdr-sudoku.spec 7 Apr 2008 20:58:45 -0000 1.10 +++ vdr-sudoku.spec 27 Jul 2008 10:01:32 -0000 1.11 @@ -5,8 +5,8 @@ %define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR) Name: vdr-%{pname} -Version: 0.2.1 -Release: 2%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Sudoku plugin for VDR Group: Amusements/Games @@ -14,7 +14,8 @@ URL: http://www.toms-cafe.de/vdr/sudoku/ Source0: http://toms-cafe.de/vdr/sudoku/%{name}-%{version}.tgz Source1: %{name}.conf -Patch0: %{name}-0.2.0-vardir.patch +Patch0: %{name}-0.3.0-vardir.patch +Patch1: %{name}-0.3.0-finnish.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.3.47 @@ -29,6 +30,7 @@ %prep %setup -q -n sudoku-%{version} sed -e 's|@PLUGINVARDIR@|%{vardir}/%{pname}|g' %{PATCH0} | patch -p1 +%patch1 -p1 for f in CONTRIBUTORS HISTORY README ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f done @@ -64,16 +66,21 @@ %files -f %{name}.lang +%defattr(-,%{vdr_user},root,-) +%dir %{vardir}/%{pname}/ +%ghost %config(noreplace) %{vardir}/%{pname}/sudoku-list %defattr(-,root,root,-) %doc CONTRIBUTORS COPYING HISTORY README %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf %{plugindir}/libvdr-%{pname}.so.%{apiver} -%defattr(-,%{vdr_user},root,-) -%dir %{vardir}/%{pname}/ -%ghost %config(noreplace) %{vardir}/%{pname}/sudoku-list %changelog +* Sun Jul 27 2008 Ville Skytt?? - 0.3.0-1 +- 0.3.0. +- Patch to add missing Finnish translations. +- Fix translation file ownerships. + * Mon Apr 7 2008 Ville Skytt?? - 0.2.1-2 - Rebuild for VDR 1.6.0. --- vdr-sudoku-0.2.0-vardir.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 10:33:30 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 27 Jul 2008 10:33:30 GMT Subject: rpms/mypaint/devel .cvsignore, 1.2, 1.3 mypaint.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807271033.m6RAXUJi016109@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/mypaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16058/devel Modified Files: .cvsignore mypaint.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jan 2008 21:33:00 -0000 1.2 +++ .cvsignore 27 Jul 2008 10:33:00 -0000 1.3 @@ -1 +1 @@ -mypaint-0.5.0.tar.bz2 +mypaint-0.5.1.tar.bz2 Index: mypaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/devel/mypaint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mypaint.spec 13 Feb 2008 12:40:10 -0000 1.2 +++ mypaint.spec 27 Jul 2008 10:33:00 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: mypaint -Version: 0.5.0 -Release: 7%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: A simple paint program Group: Applications/Multimedia @@ -60,6 +60,9 @@ %{python_sitearch}/%{name}/mydrawwidget.so %changelog +* Sun Jul 27 2008 Marc Wiriadisastra - 0.5.1-1 +- New version + * Wed Feb 13 2008 Marc Wiriadisastra - 0.5.0-7 - Rebuild for gcc4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jan 2008 21:33:00 -0000 1.2 +++ sources 27 Jul 2008 10:33:00 -0000 1.3 @@ -1 +1 @@ -9547f8ed4f0e5e6382d4295a47889c45 mypaint-0.5.0.tar.bz2 +e1fba553c5ef82edabf760c3206c31f5 mypaint-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 27 10:35:00 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 27 Jul 2008 10:35:00 GMT Subject: rpms/mypaint/F-9 .cvsignore, 1.2, 1.3 mypaint.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200807271035.m6RAZ0bB016286@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/mypaint/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16233/F-9 Modified Files: .cvsignore mypaint.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jan 2008 21:33:00 -0000 1.2 +++ .cvsignore 27 Jul 2008 10:34:30 -0000 1.3 @@ -1 +1 @@ -mypaint-0.5.0.tar.bz2 +mypaint-0.5.1.tar.bz2 Index: mypaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/F-9/mypaint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mypaint.spec 13 Feb 2008 12:40:10 -0000 1.2 +++ mypaint.spec 27 Jul 2008 10:34:30 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: mypaint -Version: 0.5.0 -Release: 7%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: A simple paint program Group: Applications/Multimedia @@ -60,6 +60,9 @@ %{python_sitearch}/%{name}/mydrawwidget.so %changelog +* Sun Jul 27 2008 Marc Wiriadisastra - 0.5.1-1 +- New version + * Wed Feb 13 2008 Marc Wiriadisastra - 0.5.0-7 - Rebuild for gcc4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jan 2008 21:33:00 -0000 1.2 +++ sources 27 Jul 2008 10:34:30 -0000 1.3 @@ -1 +1 @@ -9547f8ed4f0e5e6382d4295a47889c45 mypaint-0.5.0.tar.bz2 +e1fba553c5ef82edabf760c3206c31f5 mypaint-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 27 10:36:22 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 27 Jul 2008 10:36:22 GMT Subject: rpms/mypaint/F-8 .cvsignore, 1.2, 1.3 mypaint.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807271036.m6RAaMSE016397@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/mypaint/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16359/F-8 Modified Files: .cvsignore mypaint.spec sources Log Message: New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jan 2008 21:35:32 -0000 1.2 +++ .cvsignore 27 Jul 2008 10:35:51 -0000 1.3 @@ -1 +1 @@ -mypaint-0.5.0.tar.bz2 +mypaint-0.5.1.tar.bz2 Index: mypaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/F-8/mypaint.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mypaint.spec 21 Jan 2008 21:35:32 -0000 1.1 +++ mypaint.spec 27 Jul 2008 10:35:51 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: mypaint -Version: 0.5.0 -Release: 6%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: A simple paint program Group: Applications/Multimedia @@ -60,6 +60,12 @@ %{python_sitearch}/%{name}/mydrawwidget.so %changelog +* Sun Jul 27 2008 Marc Wiriadisastra - 0.5.1-1 +- New version + +* Wed Feb 13 2008 Marc Wiriadisastra - 0.5.0-7 +- Rebuild for gcc4.3 + * Mon Jan 21 2008 Marc Wiriadisastra - 0.5.0-6 - Added python sitearch instead of site lib - Removed sitelib declaration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mypaint/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jan 2008 21:35:32 -0000 1.2 +++ sources 27 Jul 2008 10:35:51 -0000 1.3 @@ -1 +1 @@ -9547f8ed4f0e5e6382d4295a47889c45 mypaint-0.5.0.tar.bz2 +e1fba553c5ef82edabf760c3206c31f5 mypaint-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 27 10:50:04 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 27 Jul 2008 10:50:04 GMT Subject: rpms/uniconvertor/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 uniconvertor.spec, 1.10, 1.11 Message-ID: <200807271050.m6RAo4KG017295@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/uniconvertor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17219 Modified Files: .cvsignore sources uniconvertor.spec Log Message: update to 1.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 May 2008 11:27:05 -0000 1.5 +++ .cvsignore 27 Jul 2008 10:49:34 -0000 1.6 @@ -1 +1 @@ -uniconvertor-1.1.2.tar.gz +uniconvertor-1.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 May 2008 11:27:05 -0000 1.5 +++ sources 27 Jul 2008 10:49:34 -0000 1.6 @@ -1 +1 @@ -ff6a73c1a678286fe119f62307825d1a uniconvertor-1.1.2.tar.gz +63aee3ae289e92e0b509cb2b3a1d7ac8 uniconvertor-1.1.3.tar.gz Index: uniconvertor.spec =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/devel/uniconvertor.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- uniconvertor.spec 4 May 2008 12:47:16 -0000 1.10 +++ uniconvertor.spec 27 Jul 2008 10:49:34 -0000 1.11 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: uniconvertor -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Universal vector graphics translator Group: Applications/Multimedia @@ -16,6 +16,7 @@ BuildRequires: python-devel Requires: python-imaging +Requires: python-reportlab %description @@ -71,6 +72,10 @@ %changelog +* Sun Jul 27 2008 Andy Shevchenko 1.1.3-1 +- update to 1.1.3 +- new requirement python-reportlab + * Sun May 04 2008 Andy Shevchenko 1.1.2-2 - update to 1.1.2 - apply two useful patches from Debian From fedora-extras-commits at redhat.com Sun Jul 27 10:56:05 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 27 Jul 2008 10:56:05 GMT Subject: rpms/uniconvertor/F-9 UniConvertor-1.1.1-rename-in-help.patch, NONE, 1.1 UniConvertor-1.1.1-use-exec.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 uniconvertor.spec, 1.8, 1.9 Message-ID: <200807271056.m6RAu5hb017728@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/uniconvertor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17670 Modified Files: .cvsignore sources uniconvertor.spec Added Files: UniConvertor-1.1.1-rename-in-help.patch UniConvertor-1.1.1-use-exec.patch Log Message: update to 1.1.3 UniConvertor-1.1.1-rename-in-help.patch: --- NEW FILE UniConvertor-1.1.1-rename-in-help.patch --- diff -urNad uniconvertor-1.1.1~/src/__init__.py uniconvertor-1.1.1/src/__init__.py --- uniconvertor-1.1.1~/src/__init__.py 2008-03-13 00:10:44.000000000 +0100 +++ uniconvertor-1.1.1/src/__init__.py 2008-03-15 11:38:34.000000000 +0100 @@ -7,7 +7,7 @@ # For more info see COPYRIGHTS file in root directory. ''' -USAGE: uniconv [INPUT FILE] [OUTPUT FILE] +USAGE: uniconvertor [INPUT FILE] [OUTPUT FILE] Converts one vector graphics format to another using sK1 engine. sK1 Team (http://sk1project.org), copyright (C) 2007 by Igor E. Novikov, Valek Filippov @@ -34,7 +34,7 @@ SK - Sketch/Skencil files SK1 - sK1 vector graphics files -Example: uniconv drawing.cdr drawing.svg\n +Example: uniconvertor drawing.cdr drawing.svg\n ''' import sys, os, string UniConvertor-1.1.1-use-exec.patch: --- NEW FILE UniConvertor-1.1.1-use-exec.patch --- diff -urNad python-uniconvertor-1.1.1~/src/uniconv python-uniconvertor-1.1.1/src/uniconv --- python-uniconvertor-1.1.1~/src/uniconv 2008-03-13 00:10:44.000000000 +0100 +++ python-uniconvertor-1.1.1/src/uniconv 2008-03-15 15:11:01.000000000 +0100 @@ -20,4 +20,4 @@ # -python -c "import uniconvertor" "$1" "$2" \ No newline at end of file +exec python -c "import uniconvertor" "$1" "$2" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2008 16:52:48 -0000 1.4 +++ .cvsignore 27 Jul 2008 10:55:35 -0000 1.5 @@ -1 +1 @@ -uniconvertor-1.1.1.tar.gz +uniconvertor-1.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 May 2008 11:36:38 -0000 1.5 +++ sources 27 Jul 2008 10:55:35 -0000 1.6 @@ -1 +1 @@ -ff6a73c1a678286fe119f62307825d1a uniconvertor-1.1.2.tar.gz +63aee3ae289e92e0b509cb2b3a1d7ac8 uniconvertor-1.1.3.tar.gz Index: uniconvertor.spec =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-9/uniconvertor.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- uniconvertor.spec 4 May 2008 11:36:38 -0000 1.8 +++ uniconvertor.spec 27 Jul 2008 10:55:35 -0000 1.9 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: uniconvertor -Version: 1.1.2 +Version: 1.1.3 Release: 1%{?dist} Summary: Universal vector graphics translator @@ -10,10 +10,13 @@ URL: http://sk1project.org/modules.php?name=Products&product=uniconvertor Source0: http://sk1project.org/downloads/uniconvertor/v%{version}/%{name}-%{version}.tar.gz Patch0: UniConvertor-1.1.0-simplify.patch +Patch1: UniConvertor-1.1.1-rename-in-help.patch +Patch2: UniConvertor-1.1.1-use-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python-imaging +Requires: python-reportlab %description @@ -24,6 +27,8 @@ %prep %setup -q -n UniConvertor-%{version} %patch0 -p1 -b .simplify +%patch1 -p1 -b .rename-in-help +%patch2 -p1 -b .use-exec # Prepare for inclusion into documentation part install -p -m644 src/COPYRIGHTS COPYRIGHTS @@ -67,8 +72,13 @@ %changelog -* Sun May 04 2008 Andy Shevchenko 1.1.2-1 +* Sun Jul 27 2008 Andy Shevchenko 1.1.3-1 +- update to 1.1.3 +- new requirement python-reportlab + +* Sun May 04 2008 Andy Shevchenko 1.1.2-2 - update to 1.1.2 +- apply two useful patches from Debian * Thu Mar 06 2008 Andy Shevchenko 1.1.1-2 - just fix Source0 URL From fedora-extras-commits at redhat.com Sun Jul 27 10:58:50 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 27 Jul 2008 10:58:50 GMT Subject: rpms/python-alsa/F-8 .cvsignore, 1.3, 1.4 python-alsa.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807271058.m6RAwovD018035@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/python-alsa/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17905 Modified Files: .cvsignore python-alsa.spec sources Log Message: update to 1.0.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Oct 2007 13:56:22 -0000 1.3 +++ .cvsignore 27 Jul 2008 10:58:19 -0000 1.4 @@ -1 +1 @@ -pyalsa-1.0.15.tar.bz2 +pyalsa-1.0.16.tar.bz2 Index: python-alsa.spec =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-8/python-alsa.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-alsa.spec 17 Oct 2007 13:56:22 -0000 1.3 +++ python-alsa.spec 27 Jul 2008 10:58:19 -0000 1.4 @@ -5,7 +5,7 @@ Summary: Python binding for the ALSA library Name: python-alsa -Version: 1.0.15 +Version: 1.0.16 Release: 1%{?rcver_dot}%{?dist} License: LGPLv2+ Group: Development/Languages @@ -38,9 +38,19 @@ %files %defattr(-,root,root,-) %doc test -%{python_sitearch}/pyalsa/ +%{python_sitearch}/* %changelog +* Sun May 04 2008 Andy Shevchenko - 1.0.16-1 +- update to release 1.0.16 + +* Wed Feb 20 2008 Jesse Keating - 1.0.15-3 +- Rebuild for GCC 4.3 + +* Fri Jan 04 2008 Andy Shevchenko 1.0.15-2 +- include egg-info to the files: catched from rawhide mass rebuild + (http://sunsite.mff.cuni.cz/rawhide20071220-gcc43/fails-even-with-41/python-alsa-1.0.15-1.fc8.log) + * Wed Oct 17 2007 Andy Shevchenko 1.0.15-1 - update to relase 1.0.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-alsa/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Oct 2007 13:56:22 -0000 1.3 +++ sources 27 Jul 2008 10:58:19 -0000 1.4 @@ -1 +1 @@ -c0cabf57c897fd298630156f57b5f6ca pyalsa-1.0.15.tar.bz2 +a1f4d561fa5c41a570480f3f328559a2 pyalsa-1.0.16.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 27 11:01:22 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sun, 27 Jul 2008 11:01:22 GMT Subject: rpms/hunspell/devel .cvsignore, 1.19, 1.20 hunspell.spec, 1.46, 1.47 sources, 1.19, 1.20 Message-ID: <200807271101.m6RB1MTC025188@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18431 Modified Files: .cvsignore hunspell.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 19 Jun 2008 07:56:24 -0000 1.19 +++ .cvsignore 27 Jul 2008 11:00:51 -0000 1.20 @@ -1,2 +1,2 @@ ispellaff2myspell -hunspell-1.2.4-2.tar.gz +hunspell-1.2.5.tar.gz Index: hunspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- hunspell.spec 22 Jul 2008 19:06:42 -0000 1.46 +++ hunspell.spec 27 Jul 2008 11:00:51 -0000 1.47 @@ -1,8 +1,8 @@ Name: hunspell Summary: Hunspell is a spell checker and morphological analyzer library -Version: 1.2.4.2 -Release: 2%{?dist} -Source0: http://downloads.sourceforge.net/%{name}/hunspell-1.2.4-2.tar.gz +Version: 1.2.5 +Release: 1%{?dist} +Source0: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell Group: System Environment/Libraries URL: http://hunspell.sourceforge.net/ @@ -25,7 +25,7 @@ Includes and definitions for developing with hunspell %prep -%setup -q -n hunspell-1.2.4 +%setup -q # Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell cat << \EOF > %{name}-req #!/bin/sh @@ -33,7 +33,7 @@ sed -e '/perl(explicitely)/d' EOF -%define __perl_requires %{_builddir}/%{name}-1.2.4/%{name}-req +%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} %build @@ -94,6 +94,9 @@ %{_mandir}/man3/hunspell.3.gz %changelog +* Sun Jul 27 2008 Caolan McNamara - 1.2.5-1 +- latest version + * Tue Jul 22 2008 Kristian H??gsberg - 1.2.4.2-2 - Drop ABI breaking hunspell-1.2.2-xulrunner.pita.patch and fix the hunspell include in xulrunner. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 19 Jun 2008 07:56:24 -0000 1.19 +++ sources 27 Jul 2008 11:00:51 -0000 1.20 @@ -1,2 +1,2 @@ 1c5ea5ecd2481ddc116d65ea294acae3 ispellaff2myspell -fd08e76eca72af5d0d3294f2abe34c69 hunspell-1.2.4-2.tar.gz +4912991fc7e53da0a945de7e55495714 hunspell-1.2.5.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 11:07:41 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 27 Jul 2008 11:07:41 GMT Subject: rpms/uniconvertor/devel UniConvertor-1.1.1-rename-in-help.patch, 1.1, 1.2 uniconvertor.spec, 1.11, 1.12 Message-ID: <200807271107.m6RB7fDS027144@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/uniconvertor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27055 Modified Files: UniConvertor-1.1.1-rename-in-help.patch uniconvertor.spec Log Message: Adjust patch to be compatible with --fuzz=0 UniConvertor-1.1.1-rename-in-help.patch: Index: UniConvertor-1.1.1-rename-in-help.patch =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/devel/UniConvertor-1.1.1-rename-in-help.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UniConvertor-1.1.1-rename-in-help.patch 4 May 2008 12:30:59 -0000 1.1 +++ UniConvertor-1.1.1-rename-in-help.patch 27 Jul 2008 11:07:11 -0000 1.2 @@ -9,10 +9,10 @@ +USAGE: uniconvertor [INPUT FILE] [OUTPUT FILE] Converts one vector graphics format to another using sK1 engine. - sK1 Team (http://sk1project.org), copyright (C) 2007 by Igor E. Novikov, Valek Filippov -@@ -34,7 +34,7 @@ - SK - Sketch/Skencil files - SK1 - sK1 vector graphics files + sK1 Team (http://sk1project.org), copyright (C) 2007,2008 by Igor E. Novikov +@@ -36,7 +36,7 @@ + PDF - Portable Document Format + PS - PostScript -Example: uniconv drawing.cdr drawing.svg\n +Example: uniconvertor drawing.cdr drawing.svg\n Index: uniconvertor.spec =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/devel/uniconvertor.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- uniconvertor.spec 27 Jul 2008 10:49:34 -0000 1.11 +++ uniconvertor.spec 27 Jul 2008 11:07:11 -0000 1.12 @@ -2,7 +2,7 @@ Name: uniconvertor Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universal vector graphics translator Group: Applications/Multimedia @@ -72,7 +72,7 @@ %changelog -* Sun Jul 27 2008 Andy Shevchenko 1.1.3-1 +* Sun Jul 27 2008 Andy Shevchenko 1.1.3-2 - update to 1.1.3 - new requirement python-reportlab From fedora-extras-commits at redhat.com Sun Jul 27 11:15:47 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 27 Jul 2008 11:15:47 GMT Subject: rpms/uniconvertor/F-9 UniConvertor-1.1.1-rename-in-help.patch, 1.1, 1.2 uniconvertor.spec, 1.9, 1.10 Message-ID: <200807271115.m6RBFlvR027673@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/uniconvertor/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27636 Modified Files: UniConvertor-1.1.1-rename-in-help.patch uniconvertor.spec Log Message: Adjust patch to be compatible with --fuzz=0 UniConvertor-1.1.1-rename-in-help.patch: Index: UniConvertor-1.1.1-rename-in-help.patch =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-9/UniConvertor-1.1.1-rename-in-help.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UniConvertor-1.1.1-rename-in-help.patch 27 Jul 2008 10:55:35 -0000 1.1 +++ UniConvertor-1.1.1-rename-in-help.patch 27 Jul 2008 11:15:17 -0000 1.2 @@ -9,10 +9,10 @@ +USAGE: uniconvertor [INPUT FILE] [OUTPUT FILE] Converts one vector graphics format to another using sK1 engine. - sK1 Team (http://sk1project.org), copyright (C) 2007 by Igor E. Novikov, Valek Filippov -@@ -34,7 +34,7 @@ - SK - Sketch/Skencil files - SK1 - sK1 vector graphics files + sK1 Team (http://sk1project.org), copyright (C) 2007,2008 by Igor E. Novikov +@@ -36,7 +36,7 @@ + PDF - Portable Document Format + PS - PostScript -Example: uniconv drawing.cdr drawing.svg\n +Example: uniconvertor drawing.cdr drawing.svg\n Index: uniconvertor.spec =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-9/uniconvertor.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- uniconvertor.spec 27 Jul 2008 10:55:35 -0000 1.9 +++ uniconvertor.spec 27 Jul 2008 11:15:17 -0000 1.10 @@ -2,7 +2,7 @@ Name: uniconvertor Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universal vector graphics translator Group: Applications/Multimedia @@ -72,7 +72,7 @@ %changelog -* Sun Jul 27 2008 Andy Shevchenko 1.1.3-1 +* Sun Jul 27 2008 Andy Shevchenko 1.1.3-2 - update to 1.1.3 - new requirement python-reportlab From fedora-extras-commits at redhat.com Sun Jul 27 11:24:42 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sun, 27 Jul 2008 11:24:42 GMT Subject: rpms/uniconvertor/F-8 UniConvertor-1.1.1-rename-in-help.patch, NONE, 1.1 UniConvertor-1.1.1-use-exec.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.4, 1.5 uniconvertor.spec, 1.6, 1.7 Message-ID: <200807271124.m6RBOgcF028046@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/uniconvertor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27983 Modified Files: .cvsignore sources uniconvertor.spec Added Files: UniConvertor-1.1.1-rename-in-help.patch UniConvertor-1.1.1-use-exec.patch Log Message: Update to 1.1.3 UniConvertor-1.1.1-rename-in-help.patch: --- NEW FILE UniConvertor-1.1.1-rename-in-help.patch --- diff -urNad uniconvertor-1.1.1~/src/__init__.py uniconvertor-1.1.1/src/__init__.py --- uniconvertor-1.1.1~/src/__init__.py 2008-03-13 00:10:44.000000000 +0100 +++ uniconvertor-1.1.1/src/__init__.py 2008-03-15 11:38:34.000000000 +0100 @@ -7,7 +7,7 @@ # For more info see COPYRIGHTS file in root directory. ''' -USAGE: uniconv [INPUT FILE] [OUTPUT FILE] +USAGE: uniconvertor [INPUT FILE] [OUTPUT FILE] Converts one vector graphics format to another using sK1 engine. sK1 Team (http://sk1project.org), copyright (C) 2007,2008 by Igor E. Novikov @@ -36,7 +36,7 @@ PDF - Portable Document Format PS - PostScript -Example: uniconv drawing.cdr drawing.svg\n +Example: uniconvertor drawing.cdr drawing.svg\n ''' import sys, os, string UniConvertor-1.1.1-use-exec.patch: --- NEW FILE UniConvertor-1.1.1-use-exec.patch --- diff -urNad python-uniconvertor-1.1.1~/src/uniconv python-uniconvertor-1.1.1/src/uniconv --- python-uniconvertor-1.1.1~/src/uniconv 2008-03-13 00:10:44.000000000 +0100 +++ python-uniconvertor-1.1.1/src/uniconv 2008-03-15 15:11:01.000000000 +0100 @@ -20,4 +20,4 @@ # -python -c "import uniconvertor" "$1" "$2" \ No newline at end of file +exec python -c "import uniconvertor" "$1" "$2" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Nov 2007 16:39:41 -0000 1.1 +++ .cvsignore 27 Jul 2008 11:24:12 -0000 1.2 @@ -0,0 +1 @@ +uniconvertor-1.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 May 2008 11:49:16 -0000 1.4 +++ sources 27 Jul 2008 11:24:12 -0000 1.5 @@ -1 +1 @@ -ff6a73c1a678286fe119f62307825d1a uniconvertor-1.1.2.tar.gz +63aee3ae289e92e0b509cb2b3a1d7ac8 uniconvertor-1.1.3.tar.gz Index: uniconvertor.spec =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/F-8/uniconvertor.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- uniconvertor.spec 4 May 2008 11:49:16 -0000 1.6 +++ uniconvertor.spec 27 Jul 2008 11:24:12 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: uniconvertor -Version: 1.1.2 -Release: 1%{?dist} +Version: 1.1.3 +Release: 2%{?dist} Summary: Universal vector graphics translator Group: Applications/Multimedia @@ -10,10 +10,13 @@ URL: http://sk1project.org/modules.php?name=Products&product=uniconvertor Source0: http://sk1project.org/downloads/uniconvertor/v%{version}/%{name}-%{version}.tar.gz Patch0: UniConvertor-1.1.0-simplify.patch +Patch1: UniConvertor-1.1.1-rename-in-help.patch +Patch2: UniConvertor-1.1.1-use-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python-imaging +Requires: python-reportlab %description @@ -24,6 +27,8 @@ %prep %setup -q -n UniConvertor-%{version} %patch0 -p1 -b .simplify +%patch1 -p1 -b .rename-in-help +%patch2 -p1 -b .use-exec # Prepare for inclusion into documentation part install -p -m644 src/COPYRIGHTS COPYRIGHTS @@ -67,8 +72,13 @@ %changelog -* Sun May 04 2008 Andy Shevchenko 1.1.2-1 +* Sun Jul 27 2008 Andy Shevchenko 1.1.3-2 +- update to 1.1.3 +- new requirement python-reportlab + +* Sun May 04 2008 Andy Shevchenko 1.1.2-2 - update to 1.1.2 +- apply two useful patches from Debian * Thu Mar 06 2008 Andy Shevchenko 1.1.1-2 - just fix Source0 URL From fedora-extras-commits at redhat.com Sun Jul 27 12:02:07 2008 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 27 Jul 2008 12:02:07 GMT Subject: rpms/python-html2text/devel .cvsignore, 1.5, 1.6 python-html2text.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200807271202.m6RC27MO008208@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/pkgs/rpms/python-html2text/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8054 Modified Files: .cvsignore python-html2text.spec sources Log Message: * Sun Jul 27 2008 Thorsten Leemhuis - 2.31-1 - update to 2.31 (GPLv3 now) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-html2text/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Jul 2008 18:20:02 -0000 1.5 +++ .cvsignore 27 Jul 2008 12:01:37 -0000 1.6 @@ -1 +1 @@ -html2text-2.3.py +html2text-2.31.py Index: python-html2text.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-html2text/devel/python-html2text.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-html2text.spec 4 Jul 2008 18:30:31 -0000 1.9 +++ python-html2text.spec 27 Jul 2008 12:01:37 -0000 1.10 @@ -2,14 +2,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.30 +Version: 2.31 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-2.3.py +Source0: http://www.aaronsw.com/2002/html2text/html2text-2.31.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -49,6 +49,9 @@ %changelog +* Sun Jul 27 2008 Thorsten Leemhuis - 2.31-1 +- update to 2.31 (GPLv3 now) + * Fri Jul 04 2008 Thorsten Leemhuis - 2.30-1 - update to 2.30 (GPLv3 now) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-html2text/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Jul 2008 18:20:02 -0000 1.5 +++ sources 27 Jul 2008 12:01:37 -0000 1.6 @@ -1 +1 @@ -95e5d245f7b336713c114ea69db2eb5f html2text-2.3.py +ed191980d0a58e884677c008973a9537 html2text-2.31.py From fedora-extras-commits at redhat.com Sun Jul 27 12:28:14 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sun, 27 Jul 2008 12:28:14 GMT Subject: rpms/tlock/EL-4 sources,1.3,1.4 tlock.spec,1.2,1.3 Message-ID: <200807271228.m6RCSExL015732@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369 Modified Files: sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sun Jul 27 17:57:16 IST 2008 Modified Files: sources tlock.spec: Changed the share/info/dir menu entry of tlock. ---------------------------------------------------------------------- Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 17:50:24 -0000 1.3 +++ sources 27 Jul 2008 12:27:43 -0000 1.4 @@ -1 +1 @@ -3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz +79f6253fe3ea5a556be20026069b6016 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-4/tlock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tlock.spec 12 Jul 2008 17:50:24 -0000 1.2 +++ tlock.spec 27 Jul 2008 12:27:43 -0000 1.3 @@ -1,6 +1,6 @@ Name: tlock Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal lock Group: Applications/System @@ -72,6 +72,9 @@ %_mandir/man3/* %changelog +* Sat Jul 26 2008 _pjp_ - 1.4-2 +- Fixed the share/info/dir menu entry of tlock. + * Sat Jul 12 2008 _pjp_ - 1.4-1 - Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek (xjakub at fi.muni.cz) From fedora-extras-commits at redhat.com Sun Jul 27 12:35:19 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Sun, 27 Jul 2008 12:35:19 GMT Subject: rpms/tlock/EL-5 sources,1.3,1.4 tlock.spec,1.2,1.3 Message-ID: <200807271235.m6RCZJLH017530@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/tlock/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17134 Modified Files: sources tlock.spec Log Message: ---------------------------------------------------------------------- Committing in . P J P Sun Jul 27 18:04:29 IST 2008 Modified Files: sources tlock.spec: Changed the share/info/dir menu entry of tlock. ---------------------------------------------------------------------- Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 17:56:38 -0000 1.3 +++ sources 27 Jul 2008 12:34:49 -0000 1.4 @@ -1 +1 @@ -3c2cf83d409fac9a03d6ed93f6948415 tlock-1.4.tar.gz +79f6253fe3ea5a556be20026069b6016 tlock-1.4.tar.gz Index: tlock.spec =================================================================== RCS file: /cvs/pkgs/rpms/tlock/EL-5/tlock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tlock.spec 12 Jul 2008 17:56:38 -0000 1.2 +++ tlock.spec 27 Jul 2008 12:34:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: tlock Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal lock Group: Applications/System @@ -72,6 +72,9 @@ %_mandir/man3/* %changelog +* Sat Jul 26 2008 _pjp_ - 1.4-2 +- Fixed the share/info/dir menu entry of tlock. + * Sat Jul 12 2008 _pjp_ - 1.4-1 - Fixed the `root># tlock -s' bug. Patch supplied by: Milos Jakubicek (xjakub at fi.muni.cz) From fedora-extras-commits at redhat.com Sun Jul 27 13:34:48 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 27 Jul 2008 13:34:48 GMT Subject: rpms/argyllcms/devel V1.0.1_patches.txt, NONE, 1.1 argyllcms-1.0.1-19-color.fdi, NONE, 1.1 argyllcms-1.0.1-legal.patch, NONE, 1.1 argyllcms-1.0.1-printf.patch, NONE, 1.1 argyllcms-1.0.1-remove-libusb-fork-check.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 argyllcms.spec, 1.3, 1.4 sources, 1.2, 1.3 argyllcms-0.70-19-color.fdi, 1.1, NONE argyllcms-0.70-build.patch, 1.1, NONE argyllcms-0.70-legal.patch, 1.1, NONE argyllcms-0.70-printf.patch, 1.1, NONE argyllcms-0.70-scanin-doublefree-fix.patch, 1.1, NONE Message-ID: <200807271334.m6RDYmZD029041@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/argyllcms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28993/devel Modified Files: .cvsignore argyllcms.spec sources Added Files: V1.0.1_patches.txt argyllcms-1.0.1-19-color.fdi argyllcms-1.0.1-legal.patch argyllcms-1.0.1-printf.patch argyllcms-1.0.1-remove-libusb-fork-check.patch import.log Removed Files: argyllcms-0.70-19-color.fdi argyllcms-0.70-build.patch argyllcms-0.70-legal.patch argyllcms-0.70-printf.patch argyllcms-0.70-scanin-doublefree-fix.patch Log Message: 1.0.1 ?? It builds! ?? package --- NEW FILE V1.0.1_patches.txt --- diff --strip-trailing-cr -c -r Argyll_V1.0.1/doc/printtarg.html Argyll_V1.0.2/doc/printtarg.html *** Argyll_V1.0.1/doc/printtarg.html Mon Jul 14 14:11:45 2008 --- Argyll_V1.0.2/doc/printtarg.html Sun Jul 20 02:25:32 2008 *************** *** 95,101 **** href="#C">-C              Don't use TIFF compression
 -N              ! Use TIFF alpha N channels more than 4
 -R rsnum        --- 95,103 ---- href="#C">-C              Don't use TIFF compression
 -N              ! Use TIFF alpha N channels more than 4
!  -Q nbits        ! Quantize test values to fit in nbits
 -R rsnum        *************** *** 320,325 **** --- 322,343 ---- flag causes all the channels greater than 4 to be labelled as "Alpha" channels, which may be more palatable.

+ -Q: Normally + the target device values are floating point numbers that may get + rounded and quantized in the process of printing them or reproducing + them on the printing or display device. If some of this quantization + can be accounted for, it may improve the accuracy of the resulting + profile, and the Q parameter + allows this quantization to be specified. The parameter is the number + of binary digits (bits) that the device values should be quantized to. + In many systems the right value would be 8 bits. Note that if 8 bit TIFF output is selected (-t) that the values will by default + be quanized to 8 bits, and that if 16 bit TIFF output is selected (-T) that the values will by default + be quanized to 16 bits.
+
The -R parameter allows setting the random layout seed. Normally the seed is chosen at random, but sometimes it is useful to be able to generate a chart with the same layout, so a diff --strip-trailing-cr -c -r Argyll_V1.0.1/h/config.h Argyll_V1.0.2/h/config.h *** Argyll_V1.0.1/h/config.h Mon Jul 14 14:11:41 2008 --- Argyll_V1.0.2/h/config.h Sun Jul 20 02:25:28 2008 *************** *** 10,17 **** /* minor number = 8 bits */ /* major number = 8 bits */ ! #define ARGYLL_VERSION 0x01001 ! #define ARGYLL_VERSION_STR "1.0.1" /* Maximum file path length */ #define MAXNAMEL 512 --- 10,17 ---- /* minor number = 8 bits */ /* major number = 8 bits */ ! #define ARGYLL_VERSION 0x01002 ! #define ARGYLL_VERSION_STR "1.0.2" /* Maximum file path length */ #define MAXNAMEL 512 diff --strip-trailing-cr -c -r Argyll_V1.0.1/imdi/Jamfile Argyll_V1.0.2/imdi/Jamfile *** Argyll_V1.0.1/imdi/Jamfile Mon Jul 14 14:11:32 2008 --- Argyll_V1.0.2/imdi/Jamfile Sun Jul 20 02:25:18 2008 *************** *** 49,55 **** # TIFF file monochrome conversion utlity #Main greytiff : greytiff.c ; Main greytiff : greytiff.c : : : ../spectro ../xicc ../gamut ../rspl ../cgats $(TIFFINC) ! : : ../xicc/libxicc ../gamut/libgamut ../rspl/librspl ../cgats/libcgats $(TIFFLIB) ; # ssort generation code #Main ssort : ssort.c ; --- 49,56 ---- # TIFF file monochrome conversion utlity #Main greytiff : greytiff.c ; Main greytiff : greytiff.c : : : ../spectro ../xicc ../gamut ../rspl ../cgats $(TIFFINC) ! : : ../xicc/libxicc ../gamut/libgamut ../rspl/librspl ../cgats/libcgats ! ../plot/libplot $(TIFFLIB) ; # ssort generation code #Main ssort : ssort.c ; diff --strip-trailing-cr -c -r Argyll_V1.0.1/log.txt Argyll_V1.0.2/log.txt *** Argyll_V1.0.1/log.txt Mon Jul 14 14:11:03 2008 --- Argyll_V1.0.2/log.txt Sun Jul 20 02:24:46 2008 *************** *** 3,8 **** --- 3,40 ---- ===================== + Version 1.0.2 bug fix release (open) + ----------------------------- + + * Modified MSWindows display enumeration to not ignore displays + that have EnumDisplayDevices() fail, but ignore displays + with a name \\.\\DISPLAYV*. This us to get it working under VMWARE. + + * Added device target value quantization option to + target/printtarg, as well as making it default for TIFF output files. + + * Fixed a bad memory leak in render/render.c, that was + affecting target/printtarg. Probably improved the + anti-aliased rendering speed too. + + * Fix typo in spectro/dispwin.c that sometimes causes a crash + when the system has XRandR 1.2. + + * Fix latent bug in xicc/xfit.c that could affect + profiles that are not white point corrected (ie. colorof -u inputdevice). + + * Fixed problem with an i1pro that has had it's + EEProm reset after a firmware upgrade - a previous + calibration EEPRom integration time of 0.0 is increased + to the minimum integration time to prevent divide by zero etc. + + * Added Argyll version number to the i1pro calibration file, + to try and make sure that old files are invalidated with + each potentialy incompatible update. + + * Fix LUT entry depth reporting bug, and add yet another + workaround for the GCC/PPC optimizer bug. + Version 1.0.1 bug fix release (14th July 2008) ----------------------------- diff --strip-trailing-cr -c -r Argyll_V1.0.1/makepackagebin.sh Argyll_V1.0.2/makepackagebin.sh *** Argyll_V1.0.1/makepackagebin.sh Mon Jul 14 14:11:03 2008 --- Argyll_V1.0.2/makepackagebin.sh Sun Jul 20 02:24:46 2008 *************** *** 25,30 **** --- 25,32 ---- # Set the environment string VERSION from the #define, ie 1.0.0 VERSION=`grep ARGYLL_VERSION_STR h/config.h | sed 's/#define ARGYLL_VERSION_STR //' | sed 's/"//g'` + echo "About to make Argyll binary distribution $PACKAGE" + TOPDIR=Argyll_V$VERSION if [ X$OS != "XWindows_NT" ] ; then diff --strip-trailing-cr -c -r Argyll_V1.0.1/profile/Jamfile Argyll_V1.0.2/profile/Jamfile *** Argyll_V1.0.1/profile/Jamfile Mon Jul 14 14:11:35 2008 --- Argyll_V1.0.2/profile/Jamfile Sun Jul 20 02:25:21 2008 *************** *** 26,32 **** Library libprof : profin.c profout.c ; ! LINKLIBS = ../rspl/librspl ../icc/libicc ../cgats/libcgats ../numlib/libnum ; # Simple profile generator Main simpprof : simpprof.c ; --- 26,32 ---- Library libprof : profin.c profout.c ; ! LINKLIBS = ../rspl/librspl ../icc/libicc ../cgats/libcgats ../numlib/libnum ../plot/libplot ; # Simple profile generator Main simpprof : simpprof.c ; diff --strip-trailing-cr -c -r Argyll_V1.0.1/render/render.c Argyll_V1.0.2/render/render.c *** Argyll_V1.0.1/render/render.c Mon Jul 14 14:11:37 2008 --- Argyll_V1.0.2/render/render.c Sun Jul 20 02:25:23 2008 *************** *** 162,172 **** --- 162,176 ---- int noix; /* Number in x list */ color2d *pixv0, *_pixv0; /* Storage for pixel values around current */ color2d *pixv1, *_pixv1; + sobol *so; /* Random sampler for anti-aliasing */ int i, j; double rx0, rx1, ry0, ry1; /* Box being processed, newest sample is rx1, ry1 */ int x, y; /* Pixel x & y index */ + if ((so = new_sobol(2)) == NULL) + return 1; + switch (s->csp) { case w_2d: /* Video style grey */ samplesperpixel = 1; *************** *** 373,382 **** || pixv0[x-1][PRIX2D] != cc[PRIX2D] && colordiff(s, pixv0[x-1], cc) || pixv1[x-1][PRIX2D] != cc[PRIX2D] && colordiff(s, pixv1[x-1], cc)) { double nn = 0; - sobol *so; ! if ((so = new_sobol(2)) == NULL) ! return 1; for (j = 0; j < s->ncc; j++) cc[j] = 0.0; --- 377,384 ---- || pixv0[x-1][PRIX2D] != cc[PRIX2D] && colordiff(s, pixv0[x-1], cc) || pixv1[x-1][PRIX2D] != cc[PRIX2D] && colordiff(s, pixv1[x-1], cc)) { double nn = 0; ! so->reset(so); for (j = 0; j < s->ncc; j++) cc[j] = 0.0; *************** *** 418,424 **** cc[1] = 0.0; cc[2] = 1.0; #endif - } else { /* Compute output value as mean of surrounding samples */ --- 420,425 ---- *************** *** 451,457 **** p[j] = (int)(cc[j] + 0.5); } else { for (j = 0; j < s->ncc; j++) ! p[j] = (int)(65525.0 * cc[j] + 0.5); } } } --- 452,458 ---- p[j] = (int)(cc[j] + 0.5); } else { for (j = 0; j < s->ncc; j++) ! p[j] = (int)(65535.0 * cc[j] + 0.5); } } } *************** *** 479,484 **** --- 480,487 ---- _TIFFfree(outbuf); TIFFClose(wh); /* Close Output file */ + so->del(so); + return 0; } diff --strip-trailing-cr -c -r Argyll_V1.0.1/spectro/Jamfile Argyll_V1.0.2/spectro/Jamfile *** Argyll_V1.0.1/spectro/Jamfile Mon Jul 14 14:11:29 2008 --- Argyll_V1.0.2/spectro/Jamfile Sun Jul 20 02:25:15 2008 *************** *** 1,7 **** ! PREF_CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on ! #PREF_CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags PREF_LINKFLAGS += $(LINKDEBUGFLAG) ; # Setup the right hardware access libraries --- 1,7 ---- ! #PREF_CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on ! PREF_CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags PREF_LINKFLAGS += $(LINKDEBUGFLAG) ; # Setup the right hardware access libraries diff --strip-trailing-cr -c -r Argyll_V1.0.1/spectro/dispcal.c Argyll_V1.0.2/spectro/dispcal.c *** Argyll_V1.0.1/spectro/dispcal.c Mon Jul 14 14:11:29 2008 --- Argyll_V1.0.2/spectro/dispcal.c Sun Jul 20 02:25:15 2008 *************** *** 766,771 **** --- 766,774 ---- #if defined(__APPLE__) && defined(__POWERPC__) /* Workaround for a ppc gcc 3.3 optimiser bug... */ + /* It seems to cause a segmentation fault instead of */ + /* converting an integer loop index into a float, */ + /* when there are sufficient variables in play. */ static int gcc_bug_fix(int i) { static int nn; nn += i; *************** *** 1737,1743 **** double vct, vct_de; double vdt, vdt_de; double cgamma, w[3], wp[2]; ! int sigbits; /* Number of significant bits in VideoLUT/display/instrument */ if ((rv = dr->read(dr, tcols, 3, 1, 3, 1, 0)) != 0) { dr->del(dr); --- 1740,1746 ---- double vct, vct_de; double vdt, vdt_de; double cgamma, w[3], wp[2]; ! int sigbits = 0; /* Number of significant bits in VideoLUT/display/instrument */ if ((rv = dr->read(dr, tcols, 3, 1, 3, 1, 0)) != 0) { dr->del(dr); *************** *** 1785,1790 **** --- 1788,1796 ---- /* Do the test */ for (n = 0; n < res_samps; n++) { double v; + #if defined(__APPLE__) && defined(__POWERPC__) + gcc_bug_fix(sigbits); + #endif v = (5 << (sigbits-3))/((1 << sigbits) - 1.0); if ((n % 3) == 2) v += 1.0/((1 << sigbits) - 1.0); *************** *** 1900,1909 **** printf("White Visual Color Temperature = %.0fK, DE to locus = %4.1f\n",vct,vct_de); printf("White Visual Daylight Temperature = %.0fK, DE to locus = %4.1f\n",vdt,vdt_de); #ifdef MEAS_RES ! if (sigbits == 0) { ! warning("Unable to determine LUT entry bit depth - problems ?"); ! } else if (verb) { ! printf("Effective LUT entry depth seems to be %d bits\n",sigbits); } #endif /* MEAS_RES */ dr->del(dr); --- 1906,1917 ---- printf("White Visual Color Temperature = %.0fK, DE to locus = %4.1f\n",vct,vct_de); printf("White Visual Daylight Temperature = %.0fK, DE to locus = %4.1f\n",vdt,vdt_de); #ifdef MEAS_RES ! if (doreport == 1) { ! if (sigbits == 0) { ! warning("Unable to determine LUT entry bit depth - problems ?"); ! } else if (verb) { ! printf("Effective LUT entry depth seems to be %d bits\n",sigbits); ! } } #endif /* MEAS_RES */ dr->del(dr); diff --strip-trailing-cr -c -r Argyll_V1.0.1/spectro/dispwin.c Argyll_V1.0.2/spectro/dispwin.c *** Argyll_V1.0.1/spectro/dispwin.c Mon Jul 14 14:11:31 2008 --- Argyll_V1.0.2/spectro/dispwin.c Sun Jul 20 02:25:17 2008 *************** *** 108,113 **** --- 108,126 ---- debugrr2((errout, "MonitorEnumProc() called with hMonitor = 0x%x\n",hMonitor)); + /* Get some more information */ + pmi.cbSize = sizeof(MONITORINFOEX); + if (GetMonitorInfo(hMonitor, (MONITORINFO *)&pmi) == 0) { + debugrr("get_displays failed GetMonitorInfo - ignoring display\n"); + return TRUE; + } + + /* See if it seems to be a pseudo-display */ + if (strncmp(pmi.szDevice, "\\\\.\\DISPLAYV", 12) == 0) { + debugrr("Seems to be invisible pseudo-display - ignoring it\n"); + return TRUE; + } + /* Add the display to the list */ if (disps == NULL) { if ((disps = (disppath **)calloc(sizeof(disppath *), 1 + 1)) == NULL) { *************** *** 131,142 **** return FALSE; } - pmi.cbSize = sizeof(MONITORINFOEX); - if (GetMonitorInfo(hMonitor, (MONITORINFO *)&pmi) == 0) { - debugrr("get_displays failed GetMonitorInfo\n"); - return FALSE; - } - if ((disps[ndisps]->name = strdup(pmi.szDevice)) == NULL) { debugrr("malloc failed\n"); return FALSE; --- 144,149 ---- *************** *** 240,246 **** /* Now locate detailed information about displays */ for (i = 0; ; i++) { ! if (disps[i] == NULL) break; dd.cb = sizeof(dd); --- 247,253 ---- /* Now locate detailed information about displays */ for (i = 0; ; i++) { ! if (disps == NULL || disps[i] == NULL) break; dd.cb = sizeof(dd); *************** *** 250,255 **** --- 257,265 ---- for (j = 0; ;j++) { if ((*pEnumDisplayDevices)(disps[i]->name, j, &dd, 0) == 0) { debugrr2((errout,"EnumDisplayDevices failed on '%s' Mon = %d\n",disps[i]->name,j)); + if (j == 0) { + strcpy(disps[i]->monid, ""); /* We won't be able to set a profile */ + } break; } if (callback_ddebug) { *************** *** 260,274 **** fprintf(errout,"Mon %d, key '%s'\n",j,dd.DeviceKey); } if (j == 0) { - strcpy(disps[i]->monname, dd.DeviceName); strcpy(disps[i]->monid, dd.DeviceID); } } - if (j == 0) { /* Hmm. Ignore this display */ - del_disppath(disps, i); - i--; - continue; - } sprintf(buf,"%s, at %d, %d, width %d, height %d%s",disps[i]->name+4, disps[i]->sx, disps[i]->sy, disps[i]->sw, disps[i]->sh, --- 270,278 ---- *************** *** 626,632 **** disps[ndisps]->sx, disps[ndisps]->sy, disps[ndisps]->sw, disps[ndisps]->sh); /* See if it is a clone */ ! for (k = 0; 0 < ndisps; k++) { if (disps[k]->crtc == disps[ndisps]->crtc) { sprintf(desc1, "[ Clone of %d ]",k+1); strcat(desc2, desc1); --- 630,636 ---- disps[ndisps]->sx, disps[ndisps]->sy, disps[ndisps]->sw, disps[ndisps]->sh); /* See if it is a clone */ ! for (k = 0; k < ndisps; k++) { if (disps[k]->crtc == disps[ndisps]->crtc) { sprintf(desc1, "[ Clone of %d ]",k+1); strcat(desc2, desc1); *************** *** 2832,2838 **** dispwin_del(p); return NULL; } - strcpy(p->monname, disp->monname); strcpy(p->monid, disp->monid); disp_hsz = GetDeviceCaps(p->hdc, HORZSIZE); /* mm */ --- 2836,2841 ---- diff --strip-trailing-cr -c -r Argyll_V1.0.1/spectro/dispwin.h Argyll_V1.0.2/spectro/dispwin.h *** Argyll_V1.0.1/spectro/dispwin.h Mon Jul 14 14:11:31 2008 --- Argyll_V1.0.2/spectro/dispwin.h Sun Jul 20 02:25:17 2008 *************** *** 78,84 **** int sx,sy; /* Displays offset in pixels */ int sw,sh; /* Displays width and height in pixels*/ #ifdef NT - char monname[32]; /* Monitor Name */ char monid[128]; /* Monitor ID */ int prim; /* NZ if primary display monitor */ #endif /* NT */ --- 78,83 ---- *************** *** 163,169 **** char *callout; /* if not NULL - set color Shell callout routine */ #ifdef NT - char monname[32]; /* Monitor Name (ie. '\\.\DISPLAY1\Monitor0') */ char monid[128]; /* Monitor ID (ie. 'Monitor\MEA1773\{4D36E96E-E325-11CE-BFC1-08002BE10318}\0015'*/ HDC hdc; /* Handle to display */ char *AppName; --- 162,167 ---- diff --strip-trailing-cr -c -r Argyll_V1.0.1/spectro/huey.c Argyll_V1.0.2/spectro/huey.c *** Argyll_V1.0.1/spectro/huey.c Mon Jul 14 14:11:30 2008 --- Argyll_V1.0.2/spectro/huey.c Sun Jul 20 02:25:16 2008 *************** *** 62,68 **** static inst_code huey_check_unlock(huey *p); #define CALFACTOR 3.428 /* Emissive magic calibration factor */ ! #define AMB_SCALE_FACTOR 7.806e-3 /* Ambient mode scale factor */ /* This is only approximate, and were derived */ /* by matching readings from the i1pro. */ --- 62,69 ---- static inst_code huey_check_unlock(huey *p); #define CALFACTOR 3.428 /* Emissive magic calibration factor */ ! //#define AMB_SCALE_FACTOR 7.806e-3 /* Ambient mode scale factor */ ! #define AMB_SCALE_FACTOR 5.772e-3 /* Ambient mode scale factor */ /* This is only approximate, and were derived */ /* by matching readings from the i1pro. */ diff --strip-trailing-cr -c -r Argyll_V1.0.1/spectro/i1pro_imp.c Argyll_V1.0.2/spectro/i1pro_imp.c *** Argyll_V1.0.1/spectro/i1pro_imp.c Mon Jul 14 14:11:30 2008 --- Argyll_V1.0.2/spectro/i1pro_imp.c Sun Jul 20 02:25:16 2008 *************** *** 232,238 **** if ((m = (i1proimp *)calloc(1, sizeof(i1proimp))) == NULL) { DBG((dbgo,"add_i1proimp malloc %d bytes failed (1)\n",sizeof(i1proimp))) if (p->verb) printf("Malloc %d bytes failed (1)\n",sizeof(i1proimp)); ! I1PRO_INT_MALLOC; } m->p = p; --- 232,238 ---- if ((m = (i1proimp *)calloc(1, sizeof(i1proimp))) == NULL) { DBG((dbgo,"add_i1proimp malloc %d bytes failed (1)\n",sizeof(i1proimp))) if (p->verb) printf("Malloc %d bytes failed (1)\n",sizeof(i1proimp)); ! return I1PRO_INT_MALLOC; } m->p = p; *************** *** 553,559 **** case i1p_refl_spot: s->reflective = 1; s->adaptive = 1; ! s->inttime = 0.02366; /* Should get this from the log */ s->dadaptime = 0.10; s->wadaptime = 0.10; --- 553,559 ---- case i1p_refl_spot: s->reflective = 1; s->adaptive = 1; ! s->inttime = 0.02366; /* Should get this from the log ?? */ s->dadaptime = 0.10; s->wadaptime = 0.10; *************** *** 962,975 **** || (s->emiss && !s->adaptive && *calc == inst_calc_man_em_dark) || (s->trans && !s->adaptive && *calc == inst_calc_man_trans_dark)) { - DBG((dbgo,"Doing initial black calibration with current int_time %f, gainmode %d\n", s->inttime, s->gainmode)) - nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->inttime); if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; if (s->emiss && !s->scan && !s->adaptive) { nummeas = i1pro_comp_nummeas(p, s->dcaltime2, s->dark_int_time2); if ((ev = i1pro_dark_measure(p, s->dark_data2, nummeas, &s->dark_int_time2, s->gainmode)) != I1PRO_OK) return ev; --- 962,976 ---- || (s->emiss && !s->adaptive && *calc == inst_calc_man_em_dark) || (s->trans && !s->adaptive && *calc == inst_calc_man_trans_dark)) { nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->inttime); + + DBG((dbgo,"Doing initial black calibration with dcaltime %f, int_time %f, nummeas %d, gainmode %d\n", s->dcaltime, s->inttime, nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; if (s->emiss && !s->scan && !s->adaptive) { nummeas = i1pro_comp_nummeas(p, s->dcaltime2, s->dark_int_time2); + DBG((dbgo,"Doing 2nd initial black calibration with dcaltime2 %f, dark_int_time2 %f, nummeas %d, gainmode %d\n", s->dcaltime2, s->dark_int_time2, nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->dark_data2, nummeas, &s->dark_int_time2, s->gainmode)) != I1PRO_OK) return ev; *************** *** 990,1016 **** /* The black reference is probably temeprature dependent, but */ /* there's not much we can do about this. */ - DBG((dbgo,"Doing adaptive interpolated black calibration\n")) s->idark_int_time[0] = 0.01; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[0]); if ((ev = i1pro_dark_measure(p, s->idark_data[0], nummeas, &s->idark_int_time[0], 0)) != I1PRO_OK) return ev; s->idark_int_time[1] = 1.0; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[1]); if ((ev = i1pro_dark_measure(p, s->idark_data[1], nummeas, &s->idark_int_time[1], 0)) != I1PRO_OK) return ev; s->idark_int_time[2] = 0.01; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[2]); if ((ev = i1pro_dark_measure(p, s->idark_data[2], nummeas, &s->idark_int_time[2], 1)) != I1PRO_OK) return ev; s->idark_int_time[3] = 1.0; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[3]); if ((ev = i1pro_dark_measure(p, s->idark_data[3], nummeas, &s->idark_int_time[3], 1)) != I1PRO_OK) --- 991,1020 ---- /* The black reference is probably temeprature dependent, but */ /* there's not much we can do about this. */ s->idark_int_time[0] = 0.01; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[0]); + DBG((dbgo,"Doing adaptive interpolated black calibration, dcaltime %f, idark_int_time[0] %f, nummeas %d, gainmode %d\n", s->dcaltime, s->idark_int_time[0], nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->idark_data[0], nummeas, &s->idark_int_time[0], 0)) != I1PRO_OK) return ev; s->idark_int_time[1] = 1.0; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[1]); + DBG((dbgo,"Doing adaptive interpolated black calibration, dcaltime %f, idark_int_time[1] %f, nummeas %d, gainmode %d\n", s->dcaltime, s->idark_int_time[1], nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->idark_data[1], nummeas, &s->idark_int_time[1], 0)) != I1PRO_OK) return ev; s->idark_int_time[2] = 0.01; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[2]); + DBG((dbgo,"Doing adaptive interpolated black calibration, dcaltime %f, idark_int_time[2] %f, nummeas %d, gainmode %d\n", s->dcaltime, s->idark_int_time[2], nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->idark_data[2], nummeas, &s->idark_int_time[2], 1)) != I1PRO_OK) return ev; s->idark_int_time[3] = 1.0; + DBG((dbgo,"Doing adaptive interpolated black calibration, dcaltime %f, idark_int_time[3] %f, nummeas %d, gainmode %d\n", s->dcaltime, s->idark_int_time[3], nummeas, s->gainmode)) nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[3]); if ((ev = i1pro_dark_measure(p, s->idark_data[3], nummeas, &s->idark_int_time[3], 1)) != I1PRO_OK) *************** *** 1062,1068 **** } ! /* Deal with an emsisive/transmisive adaptive black reference */ /* when in scan mode. */ if ((s->emiss && s->adaptive && s->scan && *calc == inst_calc_man_em_dark) || (s->trans && s->adaptive && s->scan && *calc == inst_calc_man_trans_dark)) { --- 1066,1072 ---- } ! /* Deal with an emissive/transmisive adaptive black reference */ /* when in scan mode. */ if ((s->emiss && s->adaptive && s->scan && *calc == inst_calc_man_em_dark) || (s->trans && s->adaptive && s->scan && *calc == inst_calc_man_trans_dark)) { *************** *** 1072,1087 **** /* but we don't know what gain mode will be used, so measure both, */ /* and choose the appropriate one on the fly. */ - DBG((dbgo,"Doing adaptive scan black calibration\n")) s->idark_int_time[0] = s->inttime; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[0]); if ((ev = i1pro_dark_measure(p, s->idark_data[0], nummeas, &s->idark_int_time[0], 0)) != I1PRO_OK) return ev; s->idark_int_time[2] = s->inttime; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[2]); if ((ev = i1pro_dark_measure(p, s->idark_data[2], nummeas, &s->idark_int_time[2], 1)) != I1PRO_OK) return ev; --- 1076,1092 ---- /* but we don't know what gain mode will be used, so measure both, */ /* and choose the appropriate one on the fly. */ s->idark_int_time[0] = s->inttime; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[0]); + DBG((dbgo,"Doing adaptive scan black calibration, dcaltime %f, idark_int_time[0] %f, nummeas %d, gainmode %d\n", s->dcaltime, s->idark_int_time[0], nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->idark_data[0], nummeas, &s->idark_int_time[0], 0)) != I1PRO_OK) return ev; s->idark_int_time[2] = s->inttime; nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->idark_int_time[2]); + DBG((dbgo,"Doing adaptive scan black calibration, dcaltime %f, idark_int_time[2] %f, nummeas %d, gainmode %d\n", s->dcaltime, s->idark_int_time[2], nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->idark_data[2], nummeas, &s->idark_int_time[2], 1)) != I1PRO_OK) return ev; *************** *** 1146,1154 **** s->cal_valid = 0; if (*calc == inst_calc_man_ref_white) { - DBG((dbgo,"Doing another black calibration with min inttime %f, gainmode %d\n", - s->inttime,s->gainmode)) nummeas = i1pro_comp_nummeas(p, s->dadaptime, s->inttime); if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; --- 1151,1158 ---- s->cal_valid = 0; if (*calc == inst_calc_man_ref_white) { nummeas = i1pro_comp_nummeas(p, s->dadaptime, s->inttime); + DBG((dbgo,"Doing another black calibration with dadaptime %f, min inttime %f, nummeas %d, gainmode %d\n", s->dadaptime, s->inttime, nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; *************** *** 1186,1194 **** s->inttime,s->gainmode)) if (*calc == inst_calc_man_ref_white) { - DBG((dbgo,"Doing final black calibration with opt inttime %f, gainmode %d\n", - s->inttime,s->gainmode)) nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->inttime); if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; --- 1190,1197 ---- s->inttime,s->gainmode)) if (*calc == inst_calc_man_ref_white) { nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->inttime); + DBG((dbgo,"Doing final black calibration with dcaltime %f, opt inttime %f, nummeas %d, gainmode %d\n", s->dcaltime, s->inttime, nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; *************** *** 1254,1262 **** } if (*calc == inst_calc_man_ref_white) { - DBG((dbgo,"Doing final black calibration with opt inttime %f, gainmode %d\n", - s->inttime,s->gainmode)) nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->inttime); if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; --- 1257,1264 ---- } if (*calc == inst_calc_man_ref_white) { nummeas = i1pro_comp_nummeas(p, s->dcaltime, s->inttime); + DBG((dbgo,"Doing final black calibration with dcaltime %f, opt inttime %f, nummeas %d, gainmode %d\n", s->dcaltime, s->inttime, nummeas, s->gainmode)) if ((ev = i1pro_dark_measure(p, s->dark_data, nummeas, &s->inttime, s->gainmode)) != I1PRO_OK) return ev; *************** *** 1616,1622 **** DISDPLOT ! DBG((dbgo,"Doing on the fly black calibration with nummeas %d int_time %f, gainmode %d\n", nummeas, s->inttime, s->gainmode)) if ((ev = i1pro_dark_measure_1(p, nummeas, &s->inttime, s->gainmode, buf, bsize)) --- 1618,1624 ---- DISDPLOT ! DBG((dbgo,"Doing on the fly black calibration_1 with nummeas %d int_time %f, gainmode %d\n", nummeas, s->inttime, s->gainmode)) if ((ev = i1pro_dark_measure_1(p, nummeas, &s->inttime, s->gainmode, buf, bsize)) *************** *** 1658,1663 **** --- 1660,1666 ---- /* Complete black reference measurement */ if (s->reflective) { + DBG((dbgo,"Doing black calibration_2 with nummeas %d, inttime %f, gainmode %d\n", nummeas, s->inttime,s->gainmode)) if ((ev = i1pro_dark_measure_2(p, s->dark_data, nummeas, s->inttime, s->gainmode, buf, bsize)) != I1PRO_OK) { free_dmatrix(specrd, 0, nvals-1, 0, m->nwav-1); *************** *** 1743,1748 **** --- 1746,1753 ---- i1key offst = 0; /* Offset to copy to use */ i1pro_code ev = I1PRO_OK; + DBG((dbgo,"Doing Restoring reflective spot calibration information from the EEProm\n")) + chsum1 = m->data->checksum(m->data, 0); if ((chsum2 = m->data->get_int(m->data, key_checksum, 0)) == NULL || chsum1 != *chsum2) { offst = key_2logoff; *************** *** 1770,1775 **** --- 1775,1782 ---- return I1PRO_OK; } s->inttime = dp[0]; + if (s->inttime < m->min_int_time) /* Hmm. EEprom is occasionaly screwed up */ + s->inttime = m->min_int_time; /* Get the dark data */ if ((ip = m->data->get_ints(m->data, &count, key_darkreading + offst)) == NULL *************** *** 1785,1790 **** --- 1792,1798 ---- } /* Convert to calibration data */ + DBG((dbgo,"Doing black calibration_2 with nummeas %d, inttime %f, gainmode %d\n", 1, s->inttime,s->gainmode)) if ((ev = i1pro_dark_measure_2(p, s->dark_data, 1, s->inttime, s->gainmode, buf, 256)) != I1PRO_OK) { if (p->verb) printf("Failed to convert EEProm dark data to calibration\n"); *************** *** 2074,2079 **** --- 2082,2088 ---- FILE *fp; i1pnonv x; int ss; + int argyllversion = ARGYLL_VERSION; strcpy(nmode, "w"); #if defined(O_BINARY) || defined(_O_BINARY) *************** *** 2101,2106 **** --- 2110,2116 ---- ss = sizeof(i1pro_state) + sizeof(i1proimp); /* Some file identification */ + write_ints(&x, fp, &argyllversion, 1); write_ints(&x, fp, &ss, 1); write_ints(&x, fp, &m->serno, 1); write_ints(&x, fp, &m->nraw, 1); *************** *** 2174,2179 **** --- 2184,2190 ---- char *path; FILE *fp; i1pnonv x; + int argyllversion; int ss, serno, nraw, nwav1, nwav2, chsum1, chsum2; strcpy(nmode, "r"); *************** *** 2199,2210 **** --- 2210,2223 ---- x.chsum = 0; /* Check the file identification */ + read_ints(&x, fp, &argyllversion, 1); read_ints(&x, fp, &ss, 1); read_ints(&x, fp, &serno, 1); read_ints(&x, fp, &nraw, 1); read_ints(&x, fp, &nwav1, 1); read_ints(&x, fp, &nwav2, 1); if (x.ef != 0 + || argyllversion != ARGYLL_VERSION || ss != (sizeof(i1pro_state) + sizeof(i1proimp)) || serno != m->serno || nraw != m->nraw *************** *** 2294,2299 **** --- 2307,2313 ---- rewind(fp); /* Read the identification */ + read_ints(&x, fp, &argyllversion, 1); read_ints(&x, fp, &ss, 1); read_ints(&x, fp, &m->serno, 1); read_ints(&x, fp, &m->nraw, 1); diff --strip-trailing-cr -c -r Argyll_V1.0.1/target/printtarg.c Argyll_V1.0.2/target/printtarg.c *** Argyll_V1.0.1/target/printtarg.c Mon Jul 14 14:11:33 2008 --- Argyll_V1.0.2/target/printtarg.c Sun Jul 20 02:25:19 2008 *************** *** 2497,2502 **** --- 2497,2503 ---- fprintf(stderr," -T [res] Output 16 bit TIFF raster file, optional res DPI (default 100)\n"); fprintf(stderr," -C Don't use TIFF compression\n"); fprintf(stderr," -N Use TIFF alpha N channels more than 4\n"); + fprintf(stderr," -Q nbits Quantize test values to fit in nbits\n"); fprintf(stderr," -R rsnum Use given random start number\n"); fprintf(stderr," -x pattern Use given strip indexing pattern (Default = \"%s\")\n",DEF_SIXPAT); fprintf(stderr," -y pattern Use given patch indexing pattern (Default = \"%s\")\n",DEF_PIXPAT); *************** *** 2521,2526 **** --- 2522,2528 ---- double pscale = 1.0; /* Patch size scale */ double sscale = 1.0; /* Spacer size scale */ int rand = 1; + int qbits = 0; /* Quantization bits */ int oft = 0; /* Ouput File type, 0 = PS, 1 = EPS , 2 = TIFF */ depth2d tiffdpth = bpc8_2d; /* TIFF pixel depth */ double tiffres = 100.0; /* TIFF resolution in DPI */ *************** *** 2662,2671 **** /* Specify random seed */ else if (argv[fa][1] == 'R') { fa = nfa; ! if (na == NULL) usage("Expected argument to -t"); rstart = atoi(na); if (rstart < 0) ! usage("Argument to -t must be positive"); } /* Enable DeviceN color fallback */ --- 2664,2673 ---- /* Specify random seed */ else if (argv[fa][1] == 'R') { fa = nfa; ! if (na == NULL) usage("Expected argument to -R"); rstart = atoi(na); if (rstart < 0) ! usage("Argument to -R must be positive"); } /* Enable DeviceN color fallback */ *************** *** 2752,2757 **** --- 2754,2768 ---- tiffcomp = 0; } + /* Specify quantization bits */ + else if (argv[fa][1] == 'Q') { + fa = nfa; + if (na == NULL) usage("Expected argument to -Q"); + qbits = atoi(na); + if (qbits < 1 || qbits > 32) + usage("Argument to -Q must be between 1 and 32"); + } + /* Specify strip index pattern */ else if (argv[fa][1] == 'x' || argv[fa][1] == 'X') { fa = nfa; *************** *** 2829,2834 **** --- 2840,2853 ---- strcat(inname,".ti1"); strcat(outname,".ti2"); + /* Set default qantization for known output */ + if (qbits == 0 && oft == 2) { + if (tiffdpth == bpc16_2d) + qbits = 16; + else if (tiffdpth == bpc8_2d) + qbits = 8; + } + if (hex && itype != instSpectroScan) { if (verb) printf("Can only select hexagonal patches for SpectrScan - ignored!\n"); *************** *** 2923,2928 **** --- 2942,2948 ---- int xyzix[3]; /* XYZ chanel indexes */ char *ident; char *xyzfname[3] = { "XYZ_X", "XYZ_Y", "XYZ_Z" }; + double qscale = (1 << qbits) - 1.0; if ((ii = icg->find_kword(icg, 0, "TOTAL_INK_LIMIT")) >= 0) ocg->add_kword(ocg, 0, "TOTAL_INK_LIMIT",icg->t[0].kdata[ii], NULL); *************** *** 2959,2965 **** ocg->add_kword(ocg, 0, "COLOR_REP", ident, NULL); ! /* Read all the test patches in */ for (i = 0; i < npat; i++) { cols[i].i = i; cols[i].t = T_N | T_XYZ; --- 2979,2985 ---- ocg->add_kword(ocg, 0, "COLOR_REP", ident, NULL); ! /* Read all the test patches in, and quantize them */ for (i = 0; i < npat; i++) { cols[i].i = i; cols[i].t = T_N | T_XYZ; *************** *** 2970,2977 **** cols[i].n = nchan; cols[i].id = ((char *)icg->t[0].fdata[i][si]); sprintf(cols[i].loc, "???"); ! for (j = 0; j < nchan; j++) ! cols[i].dev[j] = *((double *)icg->t[0].fdata[i][chix[j]]) / 100.0; for (j = 0; j < 3; j++) cols[i].XYZ[j] = *((double *)icg->t[0].fdata[i][xyzix[j]]) / 100.0; col_convert(&cols[i], wp); /* Ensure other representations */ --- 2990,3006 ---- cols[i].n = nchan; cols[i].id = ((char *)icg->t[0].fdata[i][si]); sprintf(cols[i].loc, "???"); ! for (j = 0; j < nchan; j++) { ! double vr, vv = *((double *)icg->t[0].fdata[i][chix[j]]) / 100.0; ! if (qbits > 0) { ! vv *= qscale; ! vr = floor(vv + 0.5); ! if ((vr - vv) == 0.5 && (((int)vr) & 1) != 0) /* Round to even */ ! vr -= 1.0; ! vv = vr/qscale; ! } ! cols[i].dev[j] = vv; ! } for (j = 0; j < 3; j++) cols[i].XYZ[j] = *((double *)icg->t[0].fdata[i][xyzix[j]]) / 100.0; col_convert(&cols[i], wp); /* Ensure other representations */ diff --strip-trailing-cr -c -r Argyll_V1.0.1/target/targen.c Argyll_V1.0.2/target/targen.c *** Argyll_V1.0.1/target/targen.c Mon Jul 14 14:11:33 2008 --- Argyll_V1.0.2/target/targen.c Sun Jul 20 02:25:19 2008 *************** *** 17,31 **** /* TTBD: ! Should add an option to quantize the device values - ! ie. to 8 bits, so that quantizing error isn't introduced ! through a reproduction path. Should this be a default ? Using adaptive patch creation for grey colorspace is broken. This should really be disabled for grey space, or fixed. Adaptive only does a first go placement, itterative improvement is turned off, because the algorithm doesn't work. The useful level for the -A parameter (degree of adapatation) hasn't been determined. --- 17,31 ---- /* TTBD: ! Should add an option to generate grey and near grey ! test points based on the previous profile. Using adaptive patch creation for grey colorspace is broken. This should really be disabled for grey space, or fixed. Adaptive only does a first go placement, itterative improvement is turned off, because the algorithm doesn't work. + It would be good to figure out a way of fixing this. The useful level for the -A parameter (degree of adapatation) hasn't been determined. diff --strip-trailing-cr -c -r Argyll_V1.0.1/xicc/xfit.c Argyll_V1.0.2/xicc/xfit.c *** Argyll_V1.0.1/xicc/xfit.c Mon Jul 14 14:11:27 2008 --- Argyll_V1.0.2/xicc/xfit.c Sun Jul 20 02:25:13 2008 *************** *** 87,93 **** /* - - - - - - - - - - - - - - - - - */ ! #ifdef NEVER /* Not currently used */ /* Lookup a value though an input position curve */ static double xfit_poscurve(xfit *p, double in, int chan) { --- 87,93 ---- /* - - - - - - - - - - - - - - - - - */ ! #ifdef DEBUG_PLOT /* Not currently used in runtime code*/ /* Lookup a value though an input position curve */ static double xfit_poscurve(xfit *p, double in, int chan) { *************** *** 132,138 **** out[e] = val; } } ! #endif /* NEVER */ /* - - - - - - - - - - - - - - - - - */ /* Lookup a value though input shape curve */ --- 132,138 ---- out[e] = val; } } ! #endif /* DEBUG_PLOT */ /* - - - - - - - - - - - - - - - - - */ /* Lookup a value though input shape curve */ *************** *** 482,487 **** --- 482,491 ---- } else { icmMulBy3x3(out, p->fromAbs, in); } + } else { + out[0] = in[0]; + out[1] = in[1]; + out[2] = in[2]; } } *************** *** 661,667 **** } else { del = p->to_de2(p->cntx2, out, p->rpoints[i].v); } - tw += p->rpoints[i].w; ev += p->rpoints[i].w * del; } --- 665,670 ---- *************** *** 1384,1397 **** break; /* Don't bother looking further */ } } - xfit_abs_to_rel(p, ov, p->ipoints[bk].v); for (f = 0; f < fdi; f++) b[f * (1 << di) + e] = ov[f]; } - /* Setup output curves to be linear initially */ b = p->v + p->out_off; for (f = 0; f < fdi; b += p->oluord[f], f++) { --- 1387,1398 ---- *************** *** 1446,1451 **** --- 1447,1453 ---- if ((p->tcomb & oc_ipo) != 0 && (p->tcomb & oc_m) == oc_m) { /* Only bother with matrix if in and/or out */ + double rerr; if (p->verb) printf("About to optimise temporary matrix\n"); *************** *** 1464,1474 **** setup_xfit(p, p->wv, p->sa, 0.0, 0.5); #ifdef NODDV ! if (powell(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) ! warning("xfit_fit: Powell failed to converge"); #else ! if (conjgrad(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge"); #endif for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; --- 1466,1476 ---- setup_xfit(p, p->wv, p->sa, 0.0, 0.5); #ifdef NODDV ! if (powell(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) ! warning("xfit_fit: Powell failed to converge, residual error = %f",rerr); #else ! if (conjgrad(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge, residual error = %f", rerr); #endif for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; *************** *** 1481,1486 **** --- 1483,1489 ---- /* Optimise input and matrix together */ if ((p->tcomb & oc_im) == oc_im) { + double rerr; if (p->verb) printf("\nAbout to optimise input curves and matrix\n"); *************** *** 1492,1504 **** p->opt_ch = -1; p->opt_msk = oc_im; setup_xfit(p, p->wv, p->sa, 0.5, 0.3); #ifdef NODDV ! if (powell(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) ! warning("xfit_fit: Powell failed to converge"); #else ! if (conjgrad(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge"); #endif for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; #ifdef DEBUG --- 1495,1516 ---- p->opt_ch = -1; p->opt_msk = oc_im; setup_xfit(p, p->wv, p->sa, 0.5, 0.3); + /* Supress the warnings the first time through - it's better to cut off the */ + /* itterations and move on to the output curve, and worry about it not */ + /* converging the second time through. */ #ifdef NODDV ! if (powell(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) { ! #ifdef DEBUG ! warning("xfit_fit: Powell failed to converge, residual error = %f",rerr); ! #endif ! } #else ! if (conjgrad(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) { ! #ifdef DEBUG ! warning("xfit_fit: Conjgrad failed to converge, residual error = %f",rerr); #endif + } + #endif /* !NODDV */ for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; #ifdef DEBUG *************** *** 1509,1514 **** --- 1521,1527 ---- /* Optimise the matrix and output curves together */ if ((p->tcomb & oc_mo) == oc_mo) { + double rerr; if (p->verb) printf("\nAbout to optimise output curves and matrix\n"); *************** *** 1521,1531 **** p->opt_msk = oc_mo; setup_xfit(p, p->wv, p->sa, 0.3, 0.3); #ifdef NODDV ! if (powell(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) ! warning("xfit_fit: Powell failed to converge"); #else ! if (conjgrad(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge"); #endif for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; --- 1534,1544 ---- p->opt_msk = oc_mo; setup_xfit(p, p->wv, p->sa, 0.3, 0.3); #ifdef NODDV ! if (powell(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) ! warning("xfit_fit: Powell failed to converge, residual error = %f",rerr); #else ! if (conjgrad(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge, residual error = %f",rerr); #endif for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; *************** *** 1548,1558 **** p->opt_msk = oc_im; setup_xfit(p, p->wv, p->sa, 0.2, 0.2); #ifdef NODDV ! if (powell(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) ! warning("xfit_fit: Powell failed to converge"); #else ! if (conjgrad(NULL, p->opt_cnt, p->v, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge"); #endif for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; --- 1561,1571 ---- p->opt_msk = oc_im; setup_xfit(p, p->wv, p->sa, 0.2, 0.2); #ifdef NODDV ! if (powell(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, (void *)p) != 0) ! warning("xfit_fit: Powell failed to converge, residual error = %f",rerr); #else ! if (conjgrad(&rerr, p->opt_cnt, p->v, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge, residual error = %f",rerr); #endif for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; *************** *** 1576,1583 **** p->opt_ch = -1; p->opt_msk = oc_imo; setup_xfit(p, p->wv, p->sa, 0.1, 0.1); ! if (conjgrad(NULL, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge"); for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; --- 1589,1596 ---- p->opt_ch = -1; p->opt_msk = oc_imo; setup_xfit(p, p->wv, p->sa, 0.1, 0.1); ! if (conjgrad(&rerr, p->opt_cnt, p->wv, p->sa, POWTOL, MAXITS, xfitfunc, dxfitfunc, (void *)p) != 0) ! warning("xfit_fit: Conjgrad failed to converge, residual error = %f",rerr); for (i = 0; i < p->opt_cnt; i++) /* Copy optimised values back */ p->v[p->opt_off + i] = p->wv[i]; *************** *** 1604,1611 **** p->opt_ch = f; p->wv[0] = p->v[p->out_offs[f]]; /* Current parameter value */ p->sa[0] = 0.1; /* Search radius */ ! if (powell(NULL, 1, p->wv, p->sa, 0.0000001, 1000, symoptfunc, (void *)p) != 0) ! error("xfit_fit: Powell failed to converge"); p->v[p->out_offs[f]] = p->wv[0]; /* Copy results back */ } } --- 1617,1624 ---- p->opt_ch = f; p->wv[0] = p->v[p->out_offs[f]]; /* Current parameter value */ p->sa[0] = 0.1; /* Search radius */ ! if (powell(&rerr, 1, p->wv, p->sa, 0.0000001, 1000, symoptfunc, (void *)p) != 0) ! error("xfit_fit: Powell failed to converge, residual error = %f",rerr); p->v[p->out_offs[f]] = p->wv[0]; /* Copy results back */ } } *************** *** 1867,1873 **** p->rpoints[i].v[f] = p->ipoints[i].v[f]; xfit_abs_to_rel(p, p->rpoints[i].v, p->rpoints[i].v); xfit_invoutcurves(p, p->rpoints[i].v, p->rpoints[i].v); - // ~~999 //printf("~1 point %d, w %f, %f %f %f %f -> %f %f %f\n", //i,p->rpoints[i].w,p->rpoints[i].p[0], p->rpoints[i].p[1], p->rpoints[i].p[2], p->rpoints[i].p[3], //p->rpoints[i].v[0], p->rpoints[i].v[1], p->rpoints[i].v[2]); --- 1880,1885 ---- *************** *** 1923,1931 **** if (p->verb) printf("Create final clut from scattered data\n"); - // ~~~999 - //out_max[0] = 100.390625; - p->clut->fit_rspl_w(p->clut, rsplflags, p->rpoints, p->nodp, in_min, in_max, gres, out_min, out_max, smooth, oavgdev, iwidth); if (p->verb) printf("\n"); --- 1935,1940 ---- *************** *** 2079,2085 **** maxe = ev; avee += ev; } ! printf("Max err = %f, avg err = %f\n",maxe, avee/(double)p->nodp); /* Evaluate each input axis in turn */ for (ee = 0; ee < p->di; ee++) { --- 2088,2094 ---- maxe = ev; avee += ev; } ! printf("Max resid err = %f, avg err = %f\n",maxe, avee/(double)p->nodp); /* Evaluate each input axis in turn */ for (ee = 0; ee < p->di; ee++) { --- NEW FILE argyllcms-1.0.1-19-color.fdi --- access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file access_control color linux.device_file argyllcms-1.0.1-legal.patch: --- NEW FILE argyllcms-1.0.1-legal.patch --- diff -uNr Argyll_V1.0.1.orig/doc/ArgyllDoc.html Argyll_V1.0.1/doc/ArgyllDoc.html --- Argyll_V1.0.1.orig/doc/ArgyllDoc.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/ArgyllDoc.html 2008-07-27 11:39:29.000000000 +0200 @@ -18,7 +18,7 @@ Author: Graeme Gill

Introduction

Argyll is an open source, ICC compatible color management -system. It supports accurate ICC profile creation for scanners, CMYK +system. It supports accurate ICC profile creation for acquisition devices, CMYK printers, film recorders and calibration and profiling of displays. Spectral sample data is supported, diff -uNr Argyll_V1.0.1.orig/doc/chartread.html Argyll_V1.0.1/doc/chartread.html --- Argyll_V1.0.1.orig/doc/chartread.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/chartread.html 2008-07-27 11:40:27.000000000 +0200 @@ -206,7 +206,7 @@
Normally the patch locations are not needed in the output, but if a chart is being read as an input reference (for use in -profiling a scanner or a camera), then the patch locations will still +profiling an acquisition device), then the patch locations will still be needed. The -a flag adds the locations to the output .ti3 file.

diff -uNr Argyll_V1.0.1.orig/doc/colprof.html Argyll_V1.0.1/doc/colprof.html --- Argyll_V1.0.1.orig/doc/colprof.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/colprof.html 2008-07-27 11:41:01.000000000 +0200 @@ -617,8 +617,8 @@ absolute value, and any values whiter than that, will not be clipped by the profile. The profile effectively operates in an absolute intent mode,  irrespective of what intent is selected when it is used. -This flag can be useful when an input profile is needed for using a -scanner as a "poor mans" colorimeter, or if the white point of the test +This flag can be useful when an input profile is needed for using an +acquisition device as a "poor mans" colorimeter, or if the white point of the test chart doesn't represent the white points of media that will be used in practice, and that white point adjustment will be done individually in some downstream application.
diff -uNr Argyll_V1.0.1.orig/doc/Installing_Linux.html Argyll_V1.0.1/doc/Installing_Linux.html --- Argyll_V1.0.1.orig/doc/Installing_Linux.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/Installing_Linux.html 2008-07-27 11:42:29.000000000 +0200 @@ -30,7 +30,7 @@ variable to give access to the executables from your command line environment. The .tgz file also contains several useful reference files (such as -scanner +acquisition device chart recognition templates, sample illumination spectrum etc.) in the ref sub-directory, as well diff -uNr Argyll_V1.0.1.orig/doc/Installing_MSWindows.html Argyll_V1.0.1/doc/Installing_MSWindows.html --- Argyll_V1.0.1.orig/doc/Installing_MSWindows.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/Installing_MSWindows.html 2008-07-27 11:42:50.000000000 +0200 @@ -69,7 +69,7 @@
The .zip file also contains several useful reference files (such as -scanner +acquisition device chart recognition templates, sample illumination spectrum etc.) in the ref sub-directory, all the current documentation in a doc sub-directory, and instrument USB drivers in the libusbw directory.
diff -uNr Argyll_V1.0.1.orig/doc/Installing_OSX.html Argyll_V1.0.1/doc/Installing_OSX.html --- Argyll_V1.0.1.orig/doc/Installing_OSX.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/Installing_OSX.html 2008-07-27 11:39:58.000000000 +0200 @@ -30,7 +30,7 @@ with how to do this, consult an appropriate tutorial, e.g. <ShellIntro>. The .tgz file also contains several useful reference files (such as -scanner chart recognition templates, sample illumination spectrum +acquisition device chart recognition templates, sample illumination spectrum etc.) in the ref sub-directory, as well as all the current documentation in a doc sub-directory.

diff -uNr Argyll_V1.0.1.orig/doc/Organisation.html Argyll_V1.0.1/doc/Organisation.html --- Argyll_V1.0.1.orig/doc/Organisation.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/Organisation.html 2008-07-27 11:36:55.000000000 +0200 @@ -13,7 +13,7 @@ This directory contains routines that generate calibration test charts, based on various distribution algorithms suitable for -reading using an Xrite DTP51 or DTP41 colorimeter, or scanner for print +reading using an Xrite DTP51 or DTP41 colorimeter, or acquisition device for print charts, the Gretag Spectrolino for film charts, or the Xrite DTP92 pr DTP94 for monitor diff -uNr Argyll_V1.0.1.orig/doc/printtarg.html Argyll_V1.0.1/doc/printtarg.html --- Argyll_V1.0.1.orig/doc/printtarg.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/printtarg.html 2008-07-27 11:36:27.000000000 +0200 @@ -167,7 +167,7 @@ file, and a .ti2 file containing the device test values together with the layout information needed to identify the patch location. This module can also generate the image recognition templates needed to read -the print targets in using a scanner.
+the print targets in using an acquisition device.

The -v flag turns on verbose mode. Prints information about how many patches there are in a row, how many patches diff -uNr Argyll_V1.0.1.orig/doc/scanin.html Argyll_V1.0.1/doc/scanin.html --- Argyll_V1.0.1.orig/doc/scanin.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/scanin.html 2008-07-27 11:34:18.000000000 +0200 @@ -23,7 +23,7 @@ recogin.cht valin.cie [diag.tif]
   :- inputs -'input.tif',  and outputs scanner +'input.tif',  and outputs device 'input.ti3', or

usage                   Replace device values in .ti3
                      -Default is to create a scanner .ti3 file
+Default is to create a device .ti3 file
 -F x1,y1,x2,y2,x3,y3,x4,y4
@@ -187,10 +187,10 @@ of the chart are visible within the image, and if the image is cropped to exclude the chart edges, it may well not recognize the chart properly. It is designed to cope with a variety of resolutions, and -will cope with some degree of noise in the scan (due to screening +will cope with some degree of noise in the acquisition (due to screening artefacts on the original, or film grain), but it isn't really designed to accept very high resolution input. For anything over 600DPI, you -should consider down sampling the scan using a filtering downsample, +should consider down sampling the image using a filtering downsample, before submitting the file to scanin.

There are 5 basic modes that scanin operates in.
@@ -199,7 +199,7 @@ assumed to be parsing an input device characterization chart (ie. an IT8.7/2 chart), for the purpose of creating a .ti3 data file containing -the CIE test values and the corresponding RGB scanner values. The .ti3 file can then be used for creating an input profile using colprof. The file @@ -221,7 +221,7 @@ file in this situation, should be a good quality image, perhaps synthetically generated -(rather than being scanned), and perfectly oriented, to make +(rather than being parsed), and perfectly oriented, to make specification of the patch locations easier. The file arguments are: The TIFF file that @@ -245,7 +245,7 @@ input devices to be used as a crude replacement for a color measuring instrument. The icc profile has (presumably) been -created by scanning an IT8.7/2 chart (or similar) through the RGB input +created with an image of a IT8.7/2 chart (or similar) through the RGB input device, and then using scanin to create the .ti3 file needed to feed to colprof to @@ -267,7 +267,7 @@ The resulting .ti3 file will have the same base name as the input TIFF file. If there is more than one page in the test chart, then scanin will need -to be run multiple times, once for each scan file made from each test +to be run multiple times, once for each image file made from each test chart. The -ca flag combination should be used for all pages after the first, @@ -339,7 +339,7 @@
By default the automatic chart recognition copes with rotation, scale and stretch in the chart image, making it suitable for -charts that have been scanned, or shot squarely with a camera. If a +charts that have been acquired, or shot squarely with a camera. If a chart has been shot not exactly facing the camera (perhaps to avoid reflection, or to get more even lighting), then it will suffer from perspective distortion as well. The Normally scanin computes an average of the pixel values within a sample square, using a "robust" mean, that discards pixel values that are too far from the average ("outlier" pixel values). This -is done in an attempt to discard value that are due to scanning +is done in an attempt to discard value that are due to acquisition artefacts such as dust, scratches etc. You can force scanin to return the true mean values for the sample squares that includes all the pixel values, by using the -m flag.
@@ -357,9 +357,9 @@ Normally scanin has reasonably robust feature recognition, but the default assumption is that the input chart has an approximately even visual distribution of patch values, and has been -scanned and converted to a typical gamma 2.2 corrected image, meaning +acquired and converted to a typical gamma 2.2 corrected image, meaning that the average patch pixel value is expected to be about 50%. If this -is not the case (for instance if the input chart has been scanned with +is not the case (for instance if the input chart has been processed with linear light or "raw" encoding), then it may enhance the image recognition to provide the approximate gamma encoding of the image. For instance, if linear light encoding ("Raw") is used, a Installing a display profile


-Profiling Scanners

+Profiling Acquisition Devices

    Types of test charts

-

    Taking readings from a scanner

-

    Creating a scanner profile

+

    Taking readings from an acquisition device

+

    Creating an acquisition device profile


Profiling Printers

    Creating a print test chart

    Reading a print test chart using an instrument

    Reading a print test chart -using a scanner

+using an acquisition device

    Creating a printer profile

@@ -353,14 +353,14 @@ the connected display.

-

Profiling Scanners

-Because a scanner is an input device, it is necessary to go about +

Profiling Acquisition Devices

+Because a acquisition device is an input device, it is necessary to go about profiling it in quite a different way to an output device. To profile -it, a test chart is needed to exercise the scanner response, to which +it, a test chart is needed to exercise the device response, to which the CIE values for each test patch is known. Generally standard reflection or transparency test charts are used for this purpose.

Types of test charts

-The most common and popular test chart for scanner profiling is the +The most common and popular test chart for acquisiton device profiling is the IT8.7/2 chart. This is a standard format chart generally reproduced on photographic film, containing about 264 test patches. The Kodak Q-60 Color Input Target is a typical example:
@@ -400,18 +400,18 @@ CMP_DT_003

-

Taking readings from a scanner

-The test chart you are using needs to be placed on the scanner, and the -scanner needs to be configured to a suitable state, and restored to +

Taking readings from an acquisition device

+The test chart you are using needs to be exposed to the device, and the +acquisition device needs to be configured to a suitable state, and restored to that same state when used subsequently with the resulting profile. The chart should be scanned, and saved to a TIFF format file. I will assume the resulting -file is called scanner.tif. The raster file need only be roughly +file is called device.tif. The raster file need only be roughly cropped so as to contain the test chart (including the charts edges).

-The second step is to extract the RGB values from the scanner.tif file, +The second step is to extract the RGB values from the device.tif file, and match then to the reference CIE values. To locate the patch values in the scan, the scanin utility needs to @@ -485,32 +485,32 @@ chart recognition template file will need to be created (this is beyond the scope of the current documentation).

-To create the scanner .ti3 file, run the scanin utility as +To create the device .ti3 file, run the scanin utility as follows (assuming an IT8 chart is being used):

- scanin -v scanner.tif It8.cht It8ref.txt
+ scanin -v device.tif It8.cht It8ref.txt

"It8ref.txt" is assumed to be the name of the CIE reference file -supplied by the chart manufacturer. The resulting file will be named "scanner.ti3".
+supplied by the chart manufacturer. The resulting file will be named "device.ti3".

scanin will process 16 bit per -component .tiff files, which (if the scanner is capable of creating +component .tiff files, which (if the device is capable of creating such files),  may improve the quality of the profile.

If you have any doubts about the correctness of the chart recognition, or the subsequent profile's delta E report is unusual, then use the scanin diagnostic flags -dipn and examine the diag.tif diagnostic file.
-

Creating a scanner profile

-Similar to a display profile, a scanner profile can be either a -shaper/matrix or LUT based profile. Well behaved scanners will +

Creating an acquisition device profile

+Similar to a display profile, an acquisition device profile can be either a +shaper/matrix or LUT based profile. Well behaved devices will probably give the best results with a shaper/matrix profile, but if the fit is poor, consider using a LUT type profile.

-If the purpose of the scanner profile is to use it as a substitute for +If the purpose of the device profile is to use it as a substitute for a colorimeter, then the -u flag should be used to avoid clipping values above the white point. Unless the shaper/matrix type profile is @@ -520,24 +520,24 @@ To create a matrix/shaper profile, the following suffices:

colprof -v -D"Scanner A" -D"Device A" -qm -as -scanner
+device

For a LUT based profile then the following would be used:

colprof -v -D"Scanner A" + href="colprof.html#E">-D"Device A" -qm -scanner
+device

For the purposes of a poor mans colorimeter, the following would generally be used:

colprof -v -D"Scanner A" + href="colprof.html#E">-D"Device A" -qm -u -scanner
+device

Make sure you check the delta E report at the end of the profile creation, to see if the profile is behaving reasonably.
@@ -703,7 +703,7 @@ -ii1 -pA4 PrinterA

-For using with a scanner as a colorimeter, the Gretag Spectroscan +For using with an acquisition device as a colorimeter, the Gretag Spectroscan layout is suitable, but the -s flag should be used so as to generate a layout suitable for scan recognition, as well as generating the scan recognition template @@ -804,28 +804,27 @@ for each type of instrument. Continue with Creating a printer profile.

-

Reading a print test chart using a scanner or -camera
+

Reading a print test chart using an acquisition device


-Argyll supports using a scanner or even a camera as a substitute for a +Argyll supports using any acquisition device as a substitute for a colorimeter. -While a scanner or camera is no replacement for a color measurement +While most are no replacement for a color measurement instrument, it may give acceptable results in some situations, and may give better results than a generic profile for a printing device.

-The main limitation of the scanner-as-colorimeter approach are:
+The main limitation of the any-device-as-colorimeter approach are:

-* The scanner dynamic range and/or precision may not match the printers +* The acquisition device dynamic range and/or precision may not match the printers or what is required for a good profile.
-* The spectral interaction of the scanner test chart and printer test -chart with the scanner +* The spectral interaction of the device test chart and printer test +chart with the device spectral response can cause color errors.
* Spectral differences caused by different black amounts in the print test chart can cause color errors.
* The IT8 chart gamut may be so much smaller than the printers that the -scanner profile is too inaccurate.
+acquisition device profile is too inaccurate.

As well as some of the above, a camera may not be suitable if it automatically adjusts exposure or white point when taking a picture, @@ -834,23 +833,23 @@ The end result is often a profile that has a slight color cast to, compared to a profile created using a colorimeter or spectrometer..

-It is assumed that you have created a scanner or camera profile +It is assumed that you have created an acquisition device profile following the procedure outline above. For best possible results it -is advisable to both profile the scanner or camera, and use it in +is advisable to both profile the acquisition device, and use it in scanning the printed test chart, in as "raw" mode as possible (i.e. using 16 bits -per component images, if the scanner or camera is +per component images, if the acquisition device is capable of doing so; not setting white or black points, using a fixed exposure etc.). It is generally advisable to create a LUT type input profile, and use the -u flag to avoid clipping scanned value whiter than the input calibration chart.

-Scan or photograph your printer chart (or charts) on the scanner or -camera previously profiled. +Scan or photograph your printer chart (or charts) on the acquisition device +previously profiled. The -scanner or camera must be configured and used exactly the same as it +acquisition device must be configured and used exactly the same as it was when it was profiled.

@@ -858,21 +857,21 @@ style="font-weight: bold;">PrinterB.tif (or PrinterB1.tif, PrinterB2.tif etc. in the case of -multiple charts). As with profiling the scanner or camera, the raster +multiple charts). As with profiling the acquisition device, the raster file need only be roughly cropped so as to contain the test chart.

-The scanner recognition files +The acquisition device recognition files created when printtarg was run is assumed to be called PrinterB.cht. -Using the scanner profile created previously (assumed to be called scanner.icm), the printer test chart +Using the device profile created previously (assumed to be called device.icm), the printer test chart scan patches are converted to CIE values using the scanin utility:

scanin -v -c PrinterB.tif -PrinterB.cht scanner.icm +PrinterB.cht device.icm PrinterB

If there were multiple test chart pages, the results would be @@ -881,15 +880,15 @@
scanin -v -c PrinterB1.tif -PrinterB1.cht scanner.icm +PrinterB1.cht device.icm PrinterB
scanin -v -ca PrinterB2.tif -PrinterB2.cht scanner.icm +PrinterB2.cht device.icm PrinterB
scanin -v -ca PrinterB3.tif -PrinterB3.cht scanner.icm +PrinterB3.cht device.icm PrinterB

Now that the PrinterB.ti3 data diff -uNr Argyll_V1.0.1.orig/doc/targen.html Argyll_V1.0.1/doc/targen.html --- Argyll_V1.0.1.orig/doc/targen.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/targen.html 2008-07-27 11:53:34.000000000 +0200 @@ -615,7 +615,7 @@       3 x Letter   1386
      4 x Letter   1848

-  Scanner (printtarg with -iSS -s options):
+  Acquisition device (printtarg with -iSS -s options):

       1 x A4R      1014
       2 x A4R      2028
diff -uNr Argyll_V1.0.1.orig/doc/ti3_format.html Argyll_V1.0.1/doc/ti3_format.html --- Argyll_V1.0.1.orig/doc/ti3_format.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/ti3_format.html 2008-07-27 11:42:04.000000000 +0200 @@ -173,7 +173,7 @@ or "RGB_LAB" for an RGB printer or display, "CMYK_XYZ" for a printer, "XYZ_RGB" for an RGB -scanner.
+acquisition device.

If spectral values are going to be included in the file, the following keywords and values shall be used:
diff -uNr Argyll_V1.0.1.orig/doc/ucmm.html Argyll_V1.0.1/doc/ucmm.html --- Argyll_V1.0.1.orig/doc/ucmm.html 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/doc/ucmm.html 2008-07-27 11:41:27.000000000 +0200 @@ -13,7 +13,7 @@ designed just to handle the necessary configuration needed to track the installation and association of ICC profiles with Unix/Linux X11 displays. It could be expanded at some point to also hold the -associations for other devices such as scanner and printers.
+associations for other devices such as acquisition devices and printers.

It consists primarily of a small configuration database that associates a display monitor (identified by its EDID or the X11 display name if an diff -uNr Argyll_V1.0.1.orig/log.txt Argyll_V1.0.1/log.txt --- Argyll_V1.0.1.orig/log.txt 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/log.txt 2008-07-27 11:35:38.000000000 +0200 @@ -1648,7 +1648,7 @@ * Added shaper/matrix input profile support. (profile/profin.c, xicc/xmatrix.c) - This may be more accurate for scanner profiles, + This may be more accurate for device profiles, given the poor coverage of test points provided by an IT8 chart (but doesn't appear to be in practice). @@ -1659,7 +1659,7 @@ * Added support in scanin.c and scanrd.c for using a scan of a print test chart, plus a - profile for the scanner, to be able to measure + profile for the device, to be able to measure color for printer calibration. This new mode handles multi-page test charts. @@ -1689,13 +1689,13 @@ patch spacer contrast determination. Also added an XYZ to sRGB conversion function to support RGB previews of N color - devices, as well as scanner recognition template files. + devices, as well as device recognition template files. * Expanded xicc/xcolorants.c to incorporate an approximate device model for arbitrary colorant combinations. This is used to be able to approximate expected density readings, - as well as preview colors and scanner recognition templates. + as well as preview colors and device recognition templates. * Create a new test point creation module, target/simplat.c, to create higher dimentional, @@ -1793,7 +1793,7 @@ * Added preliminary support in printtarg for the SpectroScan spectrodensitometer. Also added preliminary support for - scanner recognisable test charts. + device recognisable test charts. * Added option to icclink to turn off the use of linearisation curves in the output link, since this sometimes seems to @@ -1960,7 +1960,7 @@ Cleaned up build automation somewhat. Added RGB output device profile generation support. - Added RGB scanner device profile generation support. + Added RGB device profile generation support. Added a couple of spectrometer conversion utilities for raw data files from other CMSs. diff -uNr Argyll_V1.0.1.orig/profile/profcheck.c Argyll_V1.0.1/profile/profcheck.c --- Argyll_V1.0.1.orig/profile/profcheck.c 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/profile/profcheck.c 2008-07-27 11:54:01.000000000 +0200 @@ -360,7 +360,7 @@ devchan = 3; isLab = 1; isAdditive = 1; - /* Scanner .ti3 files: */ + /* Acquisition Device .ti3 files: */ } else if (strcmp(icg->t[0].kdata[ti],"XYZ_RGB") == 0) { devspace = icSigRgbData; devchan = 3; diff -uNr Argyll_V1.0.1.orig/profile/profin.c Argyll_V1.0.1/profile/profin.c --- Argyll_V1.0.1.orig/profile/profin.c 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/profile/profin.c 2008-07-27 11:53:08.000000000 +0200 @@ -49,7 +49,7 @@ /* Basic algorithm outline: - Scanner: + Acquisition Device: Figure out the input curves to give the flattest grid. diff -uNr Argyll_V1.0.1.orig/Readme.txt Argyll_V1.0.1/Readme.txt --- Argyll_V1.0.1.orig/Readme.txt 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/Readme.txt 2008-07-27 11:38:54.000000000 +0200 @@ -1,36 +1,36 @@ -Argyll CMS README file - Version 1.0.0 +Argyll CMS README file - Version 1.0.1 -------------------------------------- Date: 27th June 2008 Author: Graeme Gill -Argyll is an open source, ICC compatible color management system. It supports -accurate ICC profile creation for scanners, CMYK printers, film recorders and -calibration and profiling of displays. Spectral sample data is supported, -allowing a selection of illuminants observer types, and paper fluorescent -whitener additive compensation. Profiles can also incorporate source specific -gamut mappings for perceptual and saturation intents. Gamut mapping and profile -linking uses the CIECAM02 appearance model, a unique gamut mapping algorithm, -and a wide selection of rendering intents. It also includes code for the -fastest portable 8 bit raster color conversion engine available anywhere, -as well as support for fast, fully accurate 16 bit conversion. Device color -gamuts can also be viewed and compared using a VRML viewer. Comprehensive -documentation is provided for each utility, and a general guide to using -the tools for typical color management tasks is also available. A mailing -list provides support for more advanced usage. - -This is Version 1.00. The last full release was in December 2005, -with V0.7 Beta releases in between. The first public release of -icclib was in November 1998, and of Argyll was in July 2000. -Code development commenced in 1995. See Changes Summary for an -overview of changes since the last release. Changes between -revisions is detailed in the log.txt file that accompanies -the source code. +Argyll is an open source, ICC compatible color management system. It supports +accurate ICC profile creation for acquisition devices, CMYK printers, film +recorders and calibration and profiling of displays. Spectral sample data is +supported, allowing a selection of illuminants observer types, and paper +fluorescent whitener additive compensation. Profiles can also incorporate +source specific gamut mappings for perceptual and saturation intents. Gamut +mapping and profile linking uses the CIECAM02 appearance model, a unique gamut +mapping algorithm, and a wide selection of rendering intents. It also includes +code for the fastest portable 8 bit raster color conversion engine available +anywhere, as well as support for fast, fully accurate 16 bit conversion. Device +color gamuts can also be viewed and compared using a VRML viewer. Comprehensive +documentation is provided for each utility, and a general guide to using the +tools for typical color management tasks is also available. A mailing list +provides support for more advanced usage. + +This is Version 1.0.1. The last full release was in December 2005, with V0.7 +Beta releases in between. The first public release of icclib was in November +1998, and of Argyll was in July 2000. Code development commenced in 1995. See +Changes Summary for an overview of changes since the last release. Changes +between revisions is detailed in the log.txt file that accompanies the source +code. It is licensed under the GNU Version 3 license. -For more information, please consult the HTML documentation in , +For more information, please consult the HTML documentation in +, or . For the most recent source code start at . diff -uNr Argyll_V1.0.1.orig/scanin/scanin.c Argyll_V1.0.1/scanin/scanin.c --- Argyll_V1.0.1.orig/scanin/scanin.c 2008-07-27 11:18:53.000000000 +0200 +++ Argyll_V1.0.1/scanin/scanin.c 2008-07-27 11:26:37.000000000 +0200 @@ -2,7 +2,7 @@ /* * Argyll Color Correction System * - * Scanin: Input the scan of a test chart, and output cgats data + * Scanin: Input the image of a test chart, and output cgats data * Uses scanrd to do the hard work. * * Author: Graeme W. Gill @@ -72,7 +72,7 @@ fprintf(stderr,"Author: Graeme W. Gill, licensed under the GPL Version 3\n"); fprintf(stderr,"\n"); fprintf(stderr,"usage: scanin [options] input.tif recogin.cht valin.cie [diag.tif]\n"); - fprintf(stderr," :- inputs 'input.tif' and outputs scanner 'input.ti3', or\n"); + fprintf(stderr," :- inputs 'input.tif' and outputs device 'input.ti3', or\n"); fprintf(stderr,"\n"); fprintf(stderr,"usage: scanin -g [options] input.tif recogout.cht [diag.tif]\n"); fprintf(stderr," :- outputs file 'recogout.cht', or\n"); @@ -92,7 +92,7 @@ fprintf(stderr," -ca Same as -c, but accumulates more values to .ti3\n"); fprintf(stderr," from subsequent pages\n"); fprintf(stderr," -r Replace device values in .ti2/.ti3\n"); - fprintf(stderr," Default is to create a scanner .ti3 file\n"); + fprintf(stderr," Default is to create a device .ti3 file\n"); fprintf(stderr," -F x1,y1,x2,y2,x3,y3,x4,y4\n"); fprintf(stderr," Don't auto recognize, locate using four fiducual marks\n"); fprintf(stderr," -p Compensate for perspective distortion\n"); @@ -127,12 +127,12 @@ static char datin_name[200] = { 0 }; /* Data input name (.cie/.q60) */ static char datout_name[200] = { 0 }; /* Data output name (.ti3/.val) */ static char recog_name[200] = { 0 }; /* Reference chart name (.cht) */ - static char prof_name[200] = { 0 }; /* scanner profile name (.cht) */ + static char prof_name[200] = { 0 }; /* device profile name (.cht) */ static char diag_name[200] = { 0 }; /* Diagnostic Output (.tif) name, if used */ int verb = 1; int tmean = 0; /* Return true mean, rather than robust mean */ int repl = 0; /* Replace .ti3 device values from raster file */ - int outo = 0; /* Output the values read, rather than creating scanner .ti3 */ + int outo = 0; /* Output the values read, rather than creating device .ti3 */ int colm = 0; /* Use inage values to measure color for print profile. > 1 == append */ int flags = SI_GENERAL_ROT; /* Default allow all rotations */ @@ -153,7 +153,7 @@ scanrd *sr; /* Scanrd object */ int err; char *errm; - int pnotscan = 0; /* Number of patches that wern't scanned */ + int pnotscan = 0; /* Number of patches that weren't processed */ if (argc <= 1) usage(); diff -uNr Argyll_V1.0.1.orig/target/printtarg.c Argyll_V1.0.1/target/printtarg.c --- Argyll_V1.0.1.orig/target/printtarg.c 2008-07-27 11:18:52.000000000 +0200 +++ Argyll_V1.0.1/target/printtarg.c 2008-07-27 11:37:20.000000000 +0200 @@ -3252,7 +3252,7 @@ } /******************************************************************/ -/* Edge tracking support, for generating the scanner image */ +/* Edge tracking support, for generating the device image */ /* recognition reference chart file. */ /* Establish width and height to convert between topleft and */ diff -uNr Argyll_V1.0.1.orig/ttbd.txt Argyll_V1.0.1/ttbd.txt --- Argyll_V1.0.1.orig/ttbd.txt 2008-07-27 11:18:54.000000000 +0200 +++ Argyll_V1.0.1/ttbd.txt 2008-07-27 11:54:46.000000000 +0200 @@ -123,7 +123,7 @@ * Should create a .ti2 template file for some standard charts, such as an IT8.7/3, ECI2002 random and non-random etc. - Scanner recognition files too ?? + Device recognition files too ?? * Add an option to targen, that allows generation of test points down the neutral axis (how does this work @@ -293,7 +293,7 @@ patch variance is too high (probable faulty read). * Add spectral fix options to scanin code to allow compensation - for scanner and media errors when using a scanned image to + for device and media errors when using an acquired image to measure color. This means figuring out how it will work, as well as creating to tools to create the spectral fix data (or just add general argyllcms-1.0.1-printf.patch: --- NEW FILE argyllcms-1.0.1-printf.patch --- diff -uNr Argyll_V1.0.1.orig/icc/icc.c Argyll_V1.0.1/icc/icc.c --- Argyll_V1.0.1.orig/icc/icc.c 2008-07-14 06:11:23.000000000 +0200 +++ Argyll_V1.0.1/icc/icc.c 2008-07-27 13:38:24.000000000 +0200 @@ -1772,8 +1772,8 @@ if (verb <= 1) return; - op->printf(op,"Unknown:\n"); - op->printf(op," Payload size in bytes = %u\n",p->size); + (op->printf)(op,"Unknown:\n"); + (op->printf)(op," Payload size in bytes = %u\n",p->size); /* Print one row of binary and ASCII interpretation if verb == 2, All if == 3 */ /* else print all of it. */ @@ -1783,35 +1783,35 @@ c = 1; if (ph != 0) { /* Print ASCII under binary */ - op->printf(op," "); + (op->printf)(op," "); i = ii; /* Swap */ c += 11; } else { - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); ii = i; /* Swap */ c += 10; } while (i < p->size && c < 75) { if (ph == 0) - op->printf(op,"%02x ",p->data[i]); + (op->printf)(op,"%02x ",p->data[i]); else { if (isprint(p->data[i])) - op->printf(op," %c ",p->data[i]); + (op->printf)(op," %c ",p->data[i]); else - op->printf(op," ",p->data[i]); + (op->printf)(op," ",p->data[i]); } c += 3; i++; } if (ph == 0 || i < p->size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); if (ph == 1 && i >= p->size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (ph == 1 && r > 1 && verb < 3) { - op->printf(op," ...\n"); + (op->printf)(op," ...\n"); break; /* Print 1 row if not verbose */ } @@ -2002,12 +2002,12 @@ if (verb <= 0) return; - op->printf(op,"UInt8Array:\n"); - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op,"UInt8Array:\n"); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) - op->printf(op," %lu: %u\n",i,p->data[i]); + (op->printf)(op," %lu: %u\n",i,p->data[i]); } } @@ -2189,12 +2189,12 @@ if (verb <= 0) return; - op->printf(op,"UInt16Array:\n"); - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op,"UInt16Array:\n"); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) - op->printf(op," %lu: %u\n",i,p->data[i]); + (op->printf)(op," %lu: %u\n",i,p->data[i]); } } @@ -2376,12 +2376,12 @@ if (verb <= 0) return; - op->printf(op,"UInt32Array:\n"); - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op,"UInt32Array:\n"); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) - op->printf(op," %lu: %u\n",i,p->data[i]); + (op->printf)(op," %lu: %u\n",i,p->data[i]); } } @@ -2563,12 +2563,12 @@ if (verb <= 0) return; - op->printf(op,"UInt64Array:\n"); - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op,"UInt64Array:\n"); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) - op->printf(op," %lu: h=%lu, l=%lu\n",i,p->data[i].h,p->data[i].l); + (op->printf)(op," %lu: h=%lu, l=%lu\n",i,p->data[i].h,p->data[i].l); } } @@ -2750,12 +2750,12 @@ if (verb <= 0) return; - op->printf(op,"U16Fixed16Array:\n"); - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op,"U16Fixed16Array:\n"); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) - op->printf(op," %lu: %f\n",i,p->data[i]); + (op->printf)(op," %lu: %f\n",i,p->data[i]); } } @@ -2937,12 +2937,12 @@ if (verb <= 0) return; - op->printf(op,"S15Fixed16Array:\n"); - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op,"S15Fixed16Array:\n"); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) - op->printf(op," %lu: %f\n",i,p->data[i]); + (op->printf)(op," %lu: %f\n",i,p->data[i]); } } @@ -3166,12 +3166,12 @@ if (verb <= 0) return; - op->printf(op,"XYZArray:\n"); - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op,"XYZArray:\n"); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) { - op->printf(op," %lu: %s\n",i,string_XYZNumber_and_Lab(&p->data[i])); + (op->printf)(op," %lu: %s\n",i,string_XYZNumber_and_Lab(&p->data[i])); } } @@ -3640,18 +3640,18 @@ if (verb <= 0) return; - op->printf(op,"Curve:\n"); + (op->printf)(op,"Curve:\n"); if (p->flag == icmCurveLin) { - op->printf(op," Curve is linear\n"); + (op->printf)(op," Curve is linear\n"); } else if (p->flag == icmCurveGamma) { - op->printf(op," Curve is gamma of %f\n",p->data[0]); + (op->printf)(op," Curve is gamma of %f\n",p->data[0]); } else { - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op," No. elements = %lu\n",p->size); if (verb >= 2) { unsigned long i; for (i = 0; i < p->size; i++) - op->printf(op," %3lu: %f\n",i,p->data[i]); + (op->printf)(op," %3lu: %f\n",i,p->data[i]); } } } @@ -3892,68 +3892,68 @@ if (verb <= 0) return; - op->printf(op,"Data:\n"); + (op->printf)(op,"Data:\n"); switch(p->flag) { case icmDataASCII: - op->printf(op," ASCII data\n"); + (op->printf)(op," ASCII data\n"); size = p->size > 0 ? p->size-1 : 0; break; case icmDataBin: - op->printf(op," Binary data\n"); + (op->printf)(op," Binary data\n"); size = p->size; break; case icmDataUndef: - op->printf(op," Undefined data\n"); + (op->printf)(op," Undefined data\n"); size = p->size; break; } - op->printf(op," No. elements = %lu\n",p->size); + (op->printf)(op," No. elements = %lu\n",p->size); ii = i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; if (ph != 0) { /* Print ASCII under binary */ - op->printf(op," "); + (op->printf)(op," "); i = ii; c += 11; } else { - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); ii = i; c += 10; } while (i < size && c < 75) { if (p->flag == icmDataASCII) { if (isprint(p->data[i])) { - op->printf(op,"%c",p->data[i]); + (op->printf)(op,"%c",p->data[i]); c++; } else { - op->printf(op,"\\%03o",p->data[i]); + (op->printf)(op,"\\%03o",p->data[i]); c += 4; } } else { if (ph == 0) - op->printf(op,"%02x ",p->data[i]); + (op->printf)(op,"%02x ",p->data[i]); else { if (isprint(p->data[i])) - op->printf(op," %c ",p->data[i]); + (op->printf)(op," %c ",p->data[i]); else - op->printf(op," ",p->data[i]); + (op->printf)(op," ",p->data[i]); } c += 3; } i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); if (verb > 2 && p->flag != icmDataASCII && ph == 0) ph = 1; else @@ -4143,35 +4143,35 @@ if (verb <= 0) return; - op->printf(op,"Text:\n"); - op->printf(op," No. chars = %lu\n",p->size); + (op->printf)(op,"Text:\n"); + (op->printf)(op," No. chars = %lu\n",p->size); size = p->size > 0 ? p->size-1 : 0; i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); c += 10; while (i < size && c < 75) { if (isprint(p->data[i])) { - op->printf(op,"%c",p->data[i]); + (op->printf)(op,"%c",p->data[i]); c++; } else { - op->printf(op,"\\%03o",p->data[i]); + (op->printf)(op,"\\%03o",p->data[i]); c += 4; } i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } @@ -4476,8 +4476,8 @@ if (verb <= 0) return; - op->printf(op,"DateTimeNumber:\n"); - op->printf(op," Date = %s\n", string_DateTimeNumber(p)); + (op->printf)(op,"DateTimeNumber:\n"); + (op->printf)(op," Date = %s\n", string_DateTimeNumber(p)); } /* Allocate variable sized data elements */ @@ -5988,34 +5988,34 @@ return; if (p->ttype == icSigLut8Type) { - op->printf(op,"Lut8:\n"); + (op->printf)(op,"Lut8:\n"); } else { - op->printf(op,"Lut16:\n"); + (op->printf)(op,"Lut16:\n"); } - op->printf(op," Input Channels = %u\n",p->inputChan); - op->printf(op," Output Channels = %u\n",p->outputChan); - op->printf(op," CLUT resolution = %u\n",p->clutPoints); - op->printf(op," Input Table entries = %u\n",p->inputEnt); - op->printf(op," Output Table entries = %u\n",p->outputEnt); - op->printf(op," XYZ matrix = %f, %f, %f\n",p->e[0][0],p->e[0][1],p->e[0][2]); - op->printf(op," %f, %f, %f\n",p->e[1][0],p->e[1][1],p->e[1][2]); - op->printf(op," %f, %f, %f\n",p->e[2][0],p->e[2][1],p->e[2][2]); + (op->printf)(op," Input Channels = %u\n",p->inputChan); + (op->printf)(op," Output Channels = %u\n",p->outputChan); + (op->printf)(op," CLUT resolution = %u\n",p->clutPoints); + (op->printf)(op," Input Table entries = %u\n",p->inputEnt); + (op->printf)(op," Output Table entries = %u\n",p->outputEnt); + (op->printf)(op," XYZ matrix = %f, %f, %f\n",p->e[0][0],p->e[0][1],p->e[0][2]); + (op->printf)(op," %f, %f, %f\n",p->e[1][0],p->e[1][1],p->e[1][2]); + (op->printf)(op," %f, %f, %f\n",p->e[2][0],p->e[2][1],p->e[2][2]); if (verb >= 2) { unsigned int i, j, size; unsigned int ii[MAX_CHAN]; /* maximum no of input channels */ - op->printf(op," Input table:\n"); + (op->printf)(op," Input table:\n"); for (i = 0; i < p->inputEnt; i++) { - op->printf(op," %3u: ",i); + (op->printf)(op," %3u: ",i); for (j = 0; j < p->inputChan; j++) - op->printf(op," %1.10f",p->inputTable[j * p->inputEnt + i]); - op->printf(op,"\n"); + (op->printf)(op," %1.10f",p->inputTable[j * p->inputEnt + i]); + (op->printf)(op,"\n"); } - op->printf(op,"\n CLUT table:\n"); + (op->printf)(op,"\n CLUT table:\n"); if (p->inputChan > MAX_CHAN) { - op->printf(op," !!Can't dump > %d input channel CLUT table!!\n",MAX_CHAN); + (op->printf)(op," !!Can't dump > %d input channel CLUT table!!\n",MAX_CHAN); } else { size = (p->outputChan * uipow(p->clutPoints,p->inputChan)); for (j = 0; j < p->inputChan; j++) @@ -6023,14 +6023,14 @@ for (i = 0; i < size;) { unsigned int k; /* Print table entry index */ - op->printf(op," "); + (op->printf)(op," "); for (j = p->inputChan-1; j < p->inputChan; j--) - op->printf(op," %2u",ii[j]); - op->printf(op,":"); + (op->printf)(op," %2u",ii[j]); + (op->printf)(op,":"); /* Print table entry contents */ for (k = 0; k < p->outputChan; k++, i++) - op->printf(op," %1.10f",p->clutTable[i]); - op->printf(op,"\n"); + (op->printf)(op," %1.10f",p->clutTable[i]); + (op->printf)(op,"\n"); for (j = 0; j < p->inputChan; j++) { /* Increment index */ ii[j]++; @@ -6041,12 +6041,12 @@ } } - op->printf(op,"\n Output table:\n"); + (op->printf)(op,"\n Output table:\n"); for (i = 0; i < p->outputEnt; i++) { - op->printf(op," %3u: ",i); + (op->printf)(op," %3u: ",i); for (j = 0; j < p->outputChan; j++) - op->printf(op," %1.10f",p->outputTable[j * p->outputEnt + i]); - op->printf(op,"\n"); + (op->printf)(op," %1.10f",p->outputTable[j * p->outputEnt + i]); + (op->printf)(op,"\n"); } } @@ -6356,12 +6356,12 @@ if (verb <= 0) return; - op->printf(op,"Measurement:\n"); - op->printf(op," Standard Observer = %s\n", string_StandardObserver(p->observer)); - op->printf(op," XYZ for Measurement Backing = %s\n", string_XYZNumber_and_Lab(&p->backing)); - op->printf(op," Measurement Geometry = %s\n", string_MeasurementGeometry(p->geometry)); - op->printf(op," Measurement Flare = %5.1f%%\n", p->flare * 100.0); - op->printf(op," Standard Illuminant = %s\n", string_Illuminant(p->illuminant)); + (op->printf)(op,"Measurement:\n"); + (op->printf)(op," Standard Observer = %s\n", string_StandardObserver(p->observer)); + (op->printf)(op," XYZ for Measurement Backing = %s\n", string_XYZNumber_and_Lab(&p->backing)); + (op->printf)(op," Measurement Geometry = %s\n", string_MeasurementGeometry(p->geometry)); + (op->printf)(op," Measurement Flare = %5.1f%%\n", p->flare * 100.0); + (op->printf)(op," Standard Illuminant = %s\n", string_Illuminant(p->illuminant)); } /* Allocate variable sized data elements */ @@ -6839,45 +6839,45 @@ return; if (p->ttype == icSigNamedColorType) - op->printf(op,"NamedColor:\n"); + (op->printf)(op,"NamedColor:\n"); else - op->printf(op,"NamedColor2:\n"); - op->printf(op," Vendor Flag = 0x%x\n",p->vendorFlag); - op->printf(op," No. colors = %u\n",p->count); - op->printf(op," No. dev. coords = %u\n",p->nDeviceCoords); - op->printf(op," Name prefix = '%s'\n",p->prefix); - op->printf(op," Name suffix = '%s'\n",p->suffix); + (op->printf)(op,"NamedColor2:\n"); + (op->printf)(op," Vendor Flag = 0x%x\n",p->vendorFlag); + (op->printf)(op," No. colors = %u\n",p->count); + (op->printf)(op," No. dev. coords = %u\n",p->nDeviceCoords); + (op->printf)(op," Name prefix = '%s'\n",p->prefix); + (op->printf)(op," Name suffix = '%s'\n",p->suffix); if (verb >= 2) { unsigned long i, n; icmNamedColorVal *vp; for (i = 0; i < p->count; i++) { vp = p->data + i; - op->printf(op," Color %lu:\n",i); - op->printf(op," Name root = '%s'\n",vp->root); + (op->printf)(op," Color %lu:\n",i); + (op->printf)(op," Name root = '%s'\n",vp->root); if (p->ttype == icSigNamedColor2Type) { switch(icp->header->pcs) { case icSigXYZData: - op->printf(op," XYZ = %f, %f, %f\n", + (op->printf)(op," XYZ = %f, %f, %f\n", vp->pcsCoords[0],vp->pcsCoords[1],vp->pcsCoords[2]); break; case icSigLabData: - op->printf(op," Lab = %f, %f, %f\n", + (op->printf)(op," Lab = %f, %f, %f\n", vp->pcsCoords[0],vp->pcsCoords[1],vp->pcsCoords[2]); break; default: - op->printf(op," Unexpected PCS\n"); + (op->printf)(op," Unexpected PCS\n"); break; } } if (p->nDeviceCoords > 0) { - op->printf(op," Device Coords = "); + (op->printf)(op," Device Coords = "); for (n = 0; n < p->nDeviceCoords; n++) { if (n > 0) - op->printf(op,", "); - op->printf(op,"%f",vp->deviceCoords[n]); + (op->printf)(op,", "); + (op->printf)(op,"%f",vp->deviceCoords[n]); } - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } } @@ -7177,28 +7177,28 @@ return; if (p->ttype == icSigColorantTableType) - op->printf(op,"ColorantTable:\n"); - op->printf(op," No. colorants = %u\n",p->count); + (op->printf)(op,"ColorantTable:\n"); + (op->printf)(op," No. colorants = %u\n",p->count); if (verb >= 2) { unsigned long i; icmColorantTableVal *vp; for (i = 0; i < p->count; i++) { vp = p->data + i; - op->printf(op," Colorant %lu:\n",i); - op->printf(op," Name = '%s'\n",vp->name); + (op->printf)(op," Colorant %lu:\n",i); + (op->printf)(op," Name = '%s'\n",vp->name); if (p->ttype == icSigColorantTableType) { switch(pcs) { case icSigXYZData: - op->printf(op," XYZ = %f, %f, %f\n", + (op->printf)(op," XYZ = %f, %f, %f\n", vp->pcsCoords[0],vp->pcsCoords[1],vp->pcsCoords[2]); break; case icSigLabData: - op->printf(op," Lab = %f, %f, %f\n", + (op->printf)(op," Lab = %f, %f, %f\n", vp->pcsCoords[0],vp->pcsCoords[1],vp->pcsCoords[2]); break; default: - op->printf(op," Unexpected PCS\n"); + (op->printf)(op," Unexpected PCS\n"); break; } } @@ -7596,98 +7596,98 @@ if (verb <= 0) return; - op->printf(op,"TextDescription:\n"); + (op->printf)(op,"TextDescription:\n"); if (p->size > 0) { unsigned long size = p->size > 0 ? p->size-1 : 0; - op->printf(op," ASCII data, length %lu chars:\n",p->size); + (op->printf)(op," ASCII data, length %lu chars:\n",p->size); i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); c += 10; while (i < size && c < 75) { if (isprint(p->desc[i])) { - op->printf(op,"%c",p->desc[i]); + (op->printf)(op,"%c",p->desc[i]); c++; } else { - op->printf(op,"\\%03o",p->desc[i]); + (op->printf)(op,"\\%03o",p->desc[i]); c += 4; } i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } else { - op->printf(op," No ASCII data\n"); + (op->printf)(op," No ASCII data\n"); } /* Can't dump Unicode or ScriptCode as text with portable code */ if (p->ucSize > 0) { unsigned long size = p->ucSize; - op->printf(op," Unicode Data, Language code 0x%x, length %lu chars\n", + (op->printf)(op," Unicode Data, Language code 0x%x, length %lu chars\n", p->ucLangCode, p->ucSize); i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); c += 10; while (i < size && c < 75) { - op->printf(op,"%04x ",p->ucDesc[i]); + (op->printf)(op,"%04x ",p->ucDesc[i]); c += 5; i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } else { - op->printf(op," No Unicode data\n"); + (op->printf)(op," No Unicode data\n"); } if (p->scSize > 0) { unsigned long size = p->scSize; - op->printf(op," ScriptCode Data, Code 0x%x, length %lu chars\n", + (op->printf)(op," ScriptCode Data, Code 0x%x, length %lu chars\n", p->scCode, p->scSize); i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); c += 10; while (i < size && c < 75) { - op->printf(op,"%02x ",p->scDesc[i]); + (op->printf)(op,"%02x ",p->scDesc[i]); c += 3; i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } else { - op->printf(op," No ScriptCode data\n"); + (op->printf)(op," No ScriptCode data\n"); } } @@ -7879,15 +7879,15 @@ if (verb <= 0) return; - op->printf(op,"DescStruct %u:\n",index); + (op->printf)(op,"DescStruct %u:\n",index); if (verb >= 1) { - op->printf(op," Dev. Mnfctr. = %s\n",tag2str(p->deviceMfg)); /* ~~~ */ - op->printf(op," Dev. Model = %s\n",tag2str(p->deviceModel)); /* ~~~ */ - op->printf(op," Dev. Attrbts = %s\n", string_DeviceAttributes(p->attributes.l)); - op->printf(op," Dev. Technology = %s\n", string_TechnologySignature(p->technology)); + (op->printf)(op," Dev. Mnfctr. = %s\n",tag2str(p->deviceMfg)); /* ~~~ */ + (op->printf)(op," Dev. Model = %s\n",tag2str(p->deviceModel)); /* ~~~ */ + (op->printf)(op," Dev. Attrbts = %s\n", string_DeviceAttributes(p->attributes.l)); + (op->printf)(op," Dev. Technology = %s\n", string_TechnologySignature(p->technology)); p->device.dump((icmBase *)&p->device, op,verb); p->model.dump((icmBase *)&p->model, op,verb); - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } @@ -8068,8 +8068,8 @@ if (verb <= 0) return; - op->printf(op,"ProfileSequenceDesc:\n"); - op->printf(op," No. elements = %u\n",p->count); + (op->printf)(op,"ProfileSequenceDesc:\n"); + (op->printf)(op," No. elements = %u\n",p->count); if (verb >= 2) { unsigned long i; for (i = 0; i < p->count; i++) @@ -8249,8 +8249,8 @@ if (verb <= 0) return; - op->printf(op,"Signature\n"); - op->printf(op," Technology = %s\n", string_TechnologySignature(p->sig)); + (op->printf)(op,"Signature\n"); + (op->printf)(op," Technology = %s\n", string_TechnologySignature(p->sig)); } /* Allocate variable sized data elements */ @@ -8457,16 +8457,16 @@ if (verb <= 0) return; - op->printf(op,"Screening:\n"); - op->printf(op," Flags = %s\n", string_ScreenEncodings(p->screeningFlag)); - op->printf(op," No. channels = %u\n",p->channels); + (op->printf)(op,"Screening:\n"); + (op->printf)(op," Flags = %s\n", string_ScreenEncodings(p->screeningFlag)); + (op->printf)(op," No. channels = %u\n",p->channels); if (verb >= 2) { unsigned long i; for (i = 0; i < p->channels; i++) { - op->printf(op," %lu:\n",i); - op->printf(op," Frequency: %f\n",p->data[i].frequency); - op->printf(op," Angle: %f\n",p->data[i].angle); - op->printf(op," Spot shape: %s\n", string_SpotShape(p->data[i].spotShape)); + (op->printf)(op," %lu:\n",i); + (op->printf)(op," Frequency: %f\n",p->data[i].frequency); + (op->printf)(op," Angle: %f\n",p->data[i].angle); + (op->printf)(op," Spot shape: %s\n", string_SpotShape(p->data[i].spotShape)); } } } @@ -8757,64 +8757,64 @@ if (verb <= 0) return; - op->printf(op,"Undercolor Removal Curve & Black Generation:\n"); + (op->printf)(op,"Undercolor Removal Curve & Black Generation:\n"); if (p->UCRcount == 0) { - op->printf(op," UCR: Not specified\n"); + (op->printf)(op," UCR: Not specified\n"); } else if (p->UCRcount == 1) { - op->printf(op," UCR: %f%%\n",p->UCRcurve[0]); + (op->printf)(op," UCR: %f%%\n",p->UCRcurve[0]); } else { - op->printf(op," UCR curve no. elements = %u\n",p->UCRcount); + (op->printf)(op," UCR curve no. elements = %u\n",p->UCRcount); if (verb >= 2) { unsigned long i; for (i = 0; i < p->UCRcount; i++) - op->printf(op," %3lu: %f\n",i,p->UCRcurve[i]); + (op->printf)(op," %3lu: %f\n",i,p->UCRcurve[i]); } } if (p->BGcount == 0) { - op->printf(op," BG: Not specified\n"); + (op->printf)(op," BG: Not specified\n"); } else if (p->BGcount == 1) { - op->printf(op," BG: %f%%\n",p->BGcurve[0]); + (op->printf)(op," BG: %f%%\n",p->BGcurve[0]); } else { - op->printf(op," BG curve no. elements = %u\n",p->BGcount); + (op->printf)(op," BG curve no. elements = %u\n",p->BGcount); if (verb >= 2) { unsigned long i; for (i = 0; i < p->BGcount; i++) - op->printf(op," %3lu: %f\n",i,p->BGcurve[i]); + (op->printf)(op," %3lu: %f\n",i,p->BGcurve[i]); } } { unsigned long i, r, c, size; - op->printf(op," Description:\n"); - op->printf(op," No. chars = %lu\n",p->size); + (op->printf)(op," Description:\n"); + (op->printf)(op," No. chars = %lu\n",p->size); size = p->size > 0 ? p->size-1 : 0; i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); c += 10; while (i < size && c < 73) { if (isprint(p->string[i])) { - op->printf(op,"%c",p->string[i]); + (op->printf)(op,"%c",p->string[i]); c++; } else { - op->printf(op,"\\%03o",p->string[i]); + (op->printf)(op,"\\%03o",p->string[i]); c += 4; } i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } } @@ -9171,37 +9171,37 @@ return; if (p->tagType == icmVideoCardGammaTableType) { - op->printf(op,"VideoCardGammaTable:\n"); - op->printf(op," channels = %d\n", p->u.table.channels); - op->printf(op," entries = %d\n", p->u.table.entryCount); - op->printf(op," entrysize = %d\n", p->u.table.entrySize); + (op->printf)(op,"VideoCardGammaTable:\n"); + (op->printf)(op," channels = %d\n", p->u.table.channels); + (op->printf)(op," entries = %d\n", p->u.table.entryCount); + (op->printf)(op," entrysize = %d\n", p->u.table.entrySize); if (verb >= 2) { /* dump array contents also */ for (c=0; cu.table.channels; c++) { - op->printf(op," channel #%d\n",c); + (op->printf)(op," channel #%d\n",c); for (i=0; iu.table.entryCount; i++) { if (p->u.table.entrySize == 1) { - op->printf(op," %d: %d\n",i,((ORD8 *)p->u.table.data)[c*p->u.table.entryCount+i]); + (op->printf)(op," %d: %d\n",i,((ORD8 *)p->u.table.data)[c*p->u.table.entryCount+i]); } else if (p->u.table.entrySize == 2) { - op->printf(op," %d: %d\n",i,((ORD16 *)p->u.table.data)[c*p->u.table.entryCount+i]); + (op->printf)(op," %d: %d\n",i,((ORD16 *)p->u.table.data)[c*p->u.table.entryCount+i]); } } } } } else if (p->tagType == icmVideoCardGammaFormulaType) { - op->printf(op,"VideoCardGammaFormula:\n"); - op->printf(op," red gamma = %f\n", p->u.formula.redGamma); - op->printf(op," red min = %f\n", p->u.formula.redMin); - op->printf(op," red max = %f\n", p->u.formula.redMax); - op->printf(op," green gamma = %f\n", p->u.formula.greenGamma); - op->printf(op," green min = %f\n", p->u.formula.greenMin); - op->printf(op," green max = %f\n", p->u.formula.greenMax); - op->printf(op," blue gamma = %f\n", p->u.formula.blueGamma); - op->printf(op," blue min = %f\n", p->u.formula.blueMin); - op->printf(op," blue max = %f\n", p->u.formula.blueMax); + (op->printf)(op,"VideoCardGammaFormula:\n"); + (op->printf)(op," red gamma = %f\n", p->u.formula.redGamma); + (op->printf)(op," red min = %f\n", p->u.formula.redMin); + (op->printf)(op," red max = %f\n", p->u.formula.redMax); + (op->printf)(op," green gamma = %f\n", p->u.formula.greenGamma); + (op->printf)(op," green min = %f\n", p->u.formula.greenMin); + (op->printf)(op," green max = %f\n", p->u.formula.greenMax); + (op->printf)(op," blue gamma = %f\n", p->u.formula.blueGamma); + (op->printf)(op," blue min = %f\n", p->u.formula.blueMin); + (op->printf)(op," blue max = %f\n", p->u.formula.blueMax); } else { - op->printf(op," Unknown tag format\n"); + (op->printf)(op," Unknown tag format\n"); } } @@ -9484,10 +9484,10 @@ if (verb <= 0) return; - op->printf(op,"Viewing Conditions:\n"); - op->printf(op," XYZ value of illuminant in cd/m^2 = %s\n", string_XYZNumber(&p->illuminant)); - op->printf(op," XYZ value of surround in cd/m^2 = %s\n", string_XYZNumber(&p->surround)); - op->printf(op," Illuminant type = %s\n", string_Illuminant(p->stdIlluminant)); + (op->printf)(op,"Viewing Conditions:\n"); + (op->printf)(op," XYZ value of illuminant in cd/m^2 = %s\n", string_XYZNumber(&p->illuminant)); + (op->printf)(op," XYZ value of surround in cd/m^2 = %s\n", string_XYZNumber(&p->surround)); + (op->printf)(op," Illuminant type = %s\n", string_Illuminant(p->stdIlluminant)); } /* Allocate variable sized data elements */ @@ -9734,69 +9734,69 @@ if (verb <= 0) return; - op->printf(op,"PostScript Product name and CRD names:\n"); + (op->printf)(op,"PostScript Product name and CRD names:\n"); - op->printf(op," Product name:\n"); - op->printf(op," No. chars = %lu\n",p->ppsize); + (op->printf)(op," Product name:\n"); + (op->printf)(op," No. chars = %lu\n",p->ppsize); size = p->ppsize > 0 ? p->ppsize-1 : 0; i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); c += 10; while (i < size && c < 73) { if (isprint(p->ppname[i])) { - op->printf(op,"%c",p->ppname[i]); + (op->printf)(op,"%c",p->ppname[i]); c++; } else { - op->printf(op,"\\%03o",p->ppname[i]); + (op->printf)(op,"\\%03o",p->ppname[i]); c += 4; } i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); } for (t = 0; t < 4; t++) { /* For all 4 intents */ - op->printf(op," CRD%ld name:\n",t); - op->printf(op," No. chars = %lu\n",p->crdsize[t]); + (op->printf)(op," CRD%ld name:\n",t); + (op->printf)(op," No. chars = %lu\n",p->crdsize[t]); size = p->crdsize[t] > 0 ? p->crdsize[t]-1 : 0; i = 0; for (r = 1;; r++) { /* count rows */ if (i >= size) { - op->printf(op,"\n"); + (op->printf)(op,"\n"); break; } if (r > 1 && verb < 2) { - op->printf(op,"...\n"); + (op->printf)(op,"...\n"); break; /* Print 1 row if not verbose */ } c = 1; - op->printf(op," 0x%04lx: ",i); + (op->printf)(op," 0x%04lx: ",i); c += 10; while (i < size && c < 73) { if (isprint(p->crdname[t][i])) { - op->printf(op,"%c",p->crdname[t][i]); + (op->printf)(op,"%c",p->crdname[t][i]); c++; } else { - op->printf(op,"\\%03o",p->crdname[t][i]); + (op->printf)(op,"\\%03o",p->crdname[t][i]); c += 4; } i++; } if (i < size) - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } } @@ -10108,36 +10108,36 @@ if (verb <= 0) return; - op->printf(op,"Header:\n"); - op->printf(op," size = %d bytes\n",p->size); - op->printf(op," CMM = %s\n",tag2str(p->cmmId)); - op->printf(op," Version = %d.%d.%d\n",p->majv, p->minv, p->bfv); - op->printf(op," Device Class = %s\n", string_ProfileClassSignature(p->deviceClass)); - op->printf(op," Color Space = %s\n", string_ColorSpaceSignature(p->colorSpace)); - op->printf(op," Conn. Space = %s\n", string_ColorSpaceSignature(p->pcs)); - op->printf(op," Date, Time = %s\n", string_DateTimeNumber(&p->date)); - op->printf(op," Platform = %s\n", string_PlatformSignature(p->platform)); - op->printf(op," Flags = %s\n", string_ProfileHeaderFlags(p->flags)); - op->printf(op," Dev. Mnfctr. = %s\n", tag2str(p->manufacturer)); /* ~~~ */ - op->printf(op," Dev. Model = %s\n", tag2str(p->model)); /* ~~~ */ - op->printf(op," Dev. Attrbts = %s\n", string_DeviceAttributes(p->attributes.l)); - op->printf(op," Rndrng Intnt = %s\n", string_RenderingIntent(p->renderingIntent)); - op->printf(op," Illuminant = %s\n", string_XYZNumber_and_Lab(&p->illuminant)); - op->printf(op," Creator = %s\n", tag2str(p->creator)); /* ~~~ */ + (op->printf)(op,"Header:\n"); + (op->printf)(op," size = %d bytes\n",p->size); + (op->printf)(op," CMM = %s\n",tag2str(p->cmmId)); + (op->printf)(op," Version = %d.%d.%d\n",p->majv, p->minv, p->bfv); + (op->printf)(op," Device Class = %s\n", string_ProfileClassSignature(p->deviceClass)); + (op->printf)(op," Color Space = %s\n", string_ColorSpaceSignature(p->colorSpace)); + (op->printf)(op," Conn. Space = %s\n", string_ColorSpaceSignature(p->pcs)); + (op->printf)(op," Date, Time = %s\n", string_DateTimeNumber(&p->date)); + (op->printf)(op," Platform = %s\n", string_PlatformSignature(p->platform)); + (op->printf)(op," Flags = %s\n", string_ProfileHeaderFlags(p->flags)); + (op->printf)(op," Dev. Mnfctr. = %s\n", tag2str(p->manufacturer)); /* ~~~ */ + (op->printf)(op," Dev. Model = %s\n", tag2str(p->model)); /* ~~~ */ + (op->printf)(op," Dev. Attrbts = %s\n", string_DeviceAttributes(p->attributes.l)); + (op->printf)(op," Rndrng Intnt = %s\n", string_RenderingIntent(p->renderingIntent)); + (op->printf)(op," Illuminant = %s\n", string_XYZNumber_and_Lab(&p->illuminant)); + (op->printf)(op," Creator = %s\n", tag2str(p->creator)); /* ~~~ */ if (p->icp->ver) { /* V4.0+ feature */ for (i = 0; i < 16; i++) { /* Check if ID has been set */ if (p->id[i] != 0) break; } if (i < 16) - op->printf(op," ID = %02X%02X%02X%02X%02X%02X%02X%02X" + (op->printf)(op," ID = %02X%02X%02X%02X%02X%02X%02X%02X" "%02X%02X%02X%02X%02X%02X%02X%02X\n", p->id[0], p->id[1], p->id[2], p->id[3], p->id[4], p->id[5], p->id[6], p->id[7], p->id[8], p->id[9], p->id[10], p->id[11], p->id[12], p->id[13], p->id[14], p->id[15]); else - op->printf(op," ID = \n"); + (op->printf)(op," ID = \n"); } - op->printf(op,"\n"); + (op->printf)(op,"\n"); } static void icmHeader_delete( @@ -11420,7 +11420,7 @@ if (verb <= 0) return; - op->printf(op,"icc:\n"); + (op->printf)(op,"icc:\n"); /* Dump the header */ if (p->header != NULL) @@ -11430,21 +11430,21 @@ for (i = 0; i < p->count; i++) { /* For all the tag element data */ icmBase *ob; int tr; - op->printf(op,"tag %d:\n",i); - op->printf(op," sig %s\n",tag2str(p->data[i].sig)); - op->printf(op," type %s\n",tag2str(p->data[i].ttype)); - op->printf(op," offset %d\n", p->data[i].offset); - op->printf(op," size %d\n", p->data[i].size); + (op->printf)(op,"tag %d:\n",i); + (op->printf)(op," sig %s\n",tag2str(p->data[i].sig)); + (op->printf)(op," type %s\n",tag2str(p->data[i].ttype)); + (op->printf)(op," offset %d\n", p->data[i].offset); + (op->printf)(op," size %d\n", p->data[i].size); tr = 0; if ((ob = p->data[i].objp) == NULL) { /* The object is not loaded, so load it then free it */ if ((ob = p->read_tag(p, p->data[i].sig)) == NULL) { - op->printf(op,"Unable to read: %d, %s\n",p->errc,p->err); + (op->printf)(op,"Unable to read: %d, %s\n",p->errc,p->err); } tr = 1; } if (ob != NULL) { - /* op->printf(op," refcount %d\n", ob->refcount); */ + /* (op->printf)(op," refcount %d\n", ob->refcount); */ ob->dump(ob,op,verb-1); if (tr != 0) { /* Cleanup if temporary */ @@ -11453,7 +11453,7 @@ p->data[i].objp = NULL; } } - op->printf(op,"\n"); + (op->printf)(op,"\n"); } } diff -uNr Argyll_V1.0.1.orig/icc/iccdump.c Argyll_V1.0.1/icc/iccdump.c --- Argyll_V1.0.1.orig/icc/iccdump.c 2008-07-14 06:11:23.000000000 +0200 +++ Argyll_V1.0.1/icc/iccdump.c 2008-07-27 13:38:24.000000000 +0200 @@ -216,13 +216,13 @@ else if (rv == 2) { icmHeader *p = icco->header; printf("Id check fails:\n"); - op->printf(op," ID is = %02X%02X%02X%02X%02X%02X%02X%02X" + (op->printf)(op," ID is = %02X%02X%02X%02X%02X%02X%02X%02X" "%02X%02X%02X%02X%02X%02X%02X%02X\n", p->id[0], p->id[1], p->id[2], p->id[3], p->id[4], p->id[5], p->id[6], p->id[7], p->id[8], p->id[9], p->id[10], p->id[11], p->id[12], p->id[13], p->id[14], p->id[15]); - op->printf(op," ID should be = %02X%02X%02X%02X%02X%02X%02X%02X" + (op->printf)(op," ID should be = %02X%02X%02X%02X%02X%02X%02X%02X" "%02X%02X%02X%02X%02X%02X%02X%02X\n", id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7], id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]); argyllcms-1.0.1-remove-libusb-fork-check.patch: --- NEW FILE argyllcms-1.0.1-remove-libusb-fork-check.patch --- diff -uNr Argyll_V1.0.1.orig/spectro/usbio.c Argyll_V1.0.1/spectro/usbio.c --- Argyll_V1.0.1.orig/spectro/usbio.c 2008-07-27 13:21:03.000000000 +0200 +++ Argyll_V1.0.1/spectro/usbio.c 2008-07-27 13:22:13.000000000 +0200 @@ -101,9 +101,6 @@ /* Scan the USB busses for instruments we recognise */ /* We're not expecting any of our unstruments to be an interface on a device. */ - if (usb_argyll_patched() < 1) - error("usblib hasn't been patched to work with Argyll"); - usb_init(); usb_find_busses(); usb_find_devices(); --- NEW FILE import.log --- argyllcms-1_0_1-1_fc10_nim:HEAD:argyllcms-1.0.1-1.fc10.nim.src.rpm:1217165503 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/argyllcms/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2008 18:51:41 -0000 1.2 +++ .cvsignore 27 Jul 2008 13:34:18 -0000 1.3 @@ -1 +1,2 @@ -argyllV0.70Beta8_src.zip +Argyll_V1.0.1_autotools.patch.gz +Argyll_V1.0.1_src.zip Index: argyllcms.spec =================================================================== RCS file: /cvs/extras/rpms/argyllcms/devel/argyllcms.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- argyllcms.spec 26 Mar 2008 20:26:04 -0000 1.3 +++ argyllcms.spec 27 Jul 2008 13:34:18 -0000 1.4 @@ -1,10 +1,11 @@ -%define alphaversion Beta8 -%define alphatag .%{alphaversion} -%define archivename argyllV%{version}%{?alphaversion}_src.zip +#define alphaversion Beta8 +#define alphatag .%{alphaversion} + +%define archivename Argyll_V%{version}%{?alphaversion}_src.zip Name: argyllcms -Version: 0.70 -Release: 0.10%{?alphatag}%{?dist} +Version: 1.0.1 +Release: 1%{?alphatag}%{?dist} Summary: ICC compatible color management system Group: User Interface/X @@ -12,20 +13,21 @@ URL: http://www.%{name}.com/ Source0: %{url}%{archivename} -Source1: %{name}-0.70-19-color.fdi +Source1: %{name}-1.0.1-19-color.fdi Source2: %{name}-0.70-color-device-file.policy -Patch0: %{name}-0.70-build.patch +Patch0: %{url}V%{version}_patches.txt +# Many thanks to Alastair M. Robinson! +Patch1: http://www.blackfiveservices.co.uk/Argyll_V1.0.1_autotools.patch.gz +Patch2: %{name}-1.0.1-remove-libusb-fork-check.patch # Patch by Stefan Br??ns, bz421921#c18 -Patch1: %{name}-0.70-printf.patch -# Patch by Stefan Br??ns, bz421921#c24 -Patch2: %{name}-0.70-scanin-doublefree-fix.patch +Patch3: %{name}-1.0.1-printf.patch # Patch applied for legal reasons -Patch3: %{name}-0.70-legal.patch +Patch4: %{name}-1.0.1-legal.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: jam, libtiff-devel, libusb-devel +BuildRequires: libtiff-devel, libusb-devel BuildRequires: libX11-devel, libXext-devel, libXxf86vm-devel, libXinerama-devel -BuildRequires: libXScrnSaver-devel +BuildRequires: libXScrnSaver-devel, libXrandr-devel Requires: udev, PolicyKit @@ -60,99 +62,32 @@ %prep -%setup -q -c +%setup -q -n Argyll_V%{version} +# Post-release fixes +%patch0 -p1 -b .fix +# Autotools support +%patch1 -p1 -b .auto +# Use the system libusb. If there is a ***REPORTED*** problem the distro will fix it +%patch2 -p1 -b .sysusb +# Printf fixes +%patch3 -p1 -b .printf +# Legal patch required +%patch4 -p1 -b .legal + # Remove useless bundled libs to make sure we don't accidentally include them rm -fr tiff libusb libusbw -# Make argyllcms actually build on a modern Linux system -%patch0 -p1 -b .build - -# Code fixes -%patch1 -p1 -b .printf -%patch2 -p1 -b .scanin -# Legal patch required -%patch3 -p1 -b .legal +chmod u+x configure %build -CCOPTFLAG="%{optflags}" -PATH=$PATH:. -export CCOPTFLAG PATH - -%define jam jam -d x -f../Jambase %{?_smp_mflags} - -# Patching and running makeall.ksh would be easier, but that would hide build -# errors from rpm. If the build process was a real DAG a single for loop would -# be sufficient - -for dir in numlib plot icc cgats ; do - pushd $dir - %{jam} - popd -done - -pushd rspl - %{jam} librspl.a -popd - -pushd xicc - %{jam} libxicc.a libxcolorants.a -popd - -pushd gamut - %{jam} -popd - -pushd spectro - %{jam} libinsttypes.a -popd - -for dir in xicc imdi target scanin profile link tweak render spectro rspl ; do - pushd $dir - %{jam} - popd -done +%configure +make %install rm -rf %{buildroot} -# Use upstream's install logic targetting a temp dir so files can be re-sorted -# sanely later - -PATH=$PATH:. -DOTDOT=$PWD/tmp - -export DOTDOT PATH - -for dir in gamut icc imdi link profile render scanin spectro target tweak xicc -do - pushd $dir - %{jam} install - popd -done - -# No business in bin -rm $DOTDOT/bin/*.txt -mv $DOTDOT/bin/*.gam . - -# Licensing madness -install -p -m 0644 icc/License.txt License-icc.txt -install -p -m 0644 cgats/License.txt License-cgats.txt - -ln -s ArgyllDoc.html doc/index.html - -# Little CMS conflict -mv $DOTDOT/bin/icclink $DOTDOT/bin/icclink-%{name} - -# Actual install phase - -install -d -m 0755 %{buildroot}%{_bindir} -install -p -m 0755 tmp/bin/* %{buildroot}%{_bindir} - -install -d -m 0755 %{buildroot}%{_datadir}/%{name} -install -p -m 0644 ref/* scanin/QPcard_201.c* *.gam \ - %{buildroot}%{_datadir}/%{name} -rm %{buildroot}%{_datadir}/%{name}/afiles +make install DESTDIR=%{buildroot} # Do some device permission magic install -d -m 0755 %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/ @@ -173,11 +108,11 @@ %doc *.txt %attr(0755,root,root) %{_bindir}/* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* +%{_datadir}/color/argyll %{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi %{_datadir}/PolicyKit/policy/color-device-file.policy +%exclude %{_datadir}/doc %files doc %defattr(0644,root,root,0755) @@ -185,6 +120,17 @@ %changelog +* Sun Jul 27 2008 Nicolas Mailhot +- 1.0.1-1 +??? Lots of workarounds dropped ??? Argyll continues progressing towards ???normal + package??? state +??? No more jam hell ???, autotooling patch by Alastair M. Robinson ????????? +??? New workaround added for private libusb check ??? We build againt system + libusb, and will fix ??? any problem people care to report +??? Re-applied some patches still not merged upstream, including the legal ??? one +??? It builds, what can go wrong??? +??? Changed Huey policy file. Huey users, please test + * Wed Mar 26 2008 Tom "spot" Callaway - patch applied for legal reasons Index: sources =================================================================== RCS file: /cvs/extras/rpms/argyllcms/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2008 18:51:41 -0000 1.2 +++ sources 27 Jul 2008 13:34:18 -0000 1.3 @@ -1 +1,2 @@ -5cdc5e6cbb794a06c97f484fd8f9053f argyllV0.70Beta8_src.zip +cdb94385421c2fae1cf6fb068069cd9e Argyll_V1.0.1_autotools.patch.gz +e9f32b852b49ffcf28b854cecab00e67 Argyll_V1.0.1_src.zip --- argyllcms-0.70-19-color.fdi DELETED --- --- argyllcms-0.70-build.patch DELETED --- --- argyllcms-0.70-legal.patch DELETED --- --- argyllcms-0.70-printf.patch DELETED --- --- argyllcms-0.70-scanin-doublefree-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 13:36:20 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 27 Jul 2008 13:36:20 GMT Subject: rpms/dejavu-fonts/devel .cvsignore, 1.49, 1.50 dejavu-fonts.spec, 1.84, 1.85 import.log, 1.1, 1.2 sources, 1.49, 1.50 Message-ID: <200807271336.m6RDaKfP029187@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29147/devel Modified Files: .cvsignore dejavu-fonts.spec import.log sources Log Message: Summertime release??? Dedicated to the letter Ben ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 19 May 2008 20:50:26 -0000 1.49 +++ .cvsignore 27 Jul 2008 13:35:50 -0000 1.50 @@ -1 +1 @@ -dejavu-fonts-2.25.tar.bz2 +dejavu-fonts-2.26.tar.bz2 Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- dejavu-fonts.spec 16 Jul 2008 16:51:56 -0000 1.84 +++ dejavu-fonts.spec 27 Jul 2008 13:35:50 -0000 1.85 @@ -15,8 +15,8 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: %{fontname}-fonts -Version: 2.25 -Release: 4%{?alphatag}%{?dist} +Version: 2.26 +Release: 1%{?alphatag}%{?dist} Summary: DejaVu fonts, mature typefaces Group: User Interface/X @@ -176,10 +176,16 @@ %changelog -* Wed Jul 16 2008 Tom "spot" Callaway - 2.25-4 +* Sun Jul 26 2008 Nicolas Mailhot +- 2.26-1 +?? New release at last + +* Wed Jul 16 2008 Tom "spot" Callaway +- 2.25-4 - note Public Domain contributions -* Wed Jul 16 2008 Tom "spot" Callaway - 2.25-3 +* Wed Jul 16 2008 Tom "spot" Callaway +- 2.25-3 - fix license tag * Fri Jul 11 2008 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Jul 2008 19:59:30 -0000 1.1 +++ import.log 27 Jul 2008 13:35:50 -0000 1.2 @@ -1 +1,2 @@ dejavu-fonts-2_25-2_fc10:HEAD:dejavu-fonts-2.25-2.fc10.src.rpm:1215806350 +dejavu-fonts-2_26-1_fc10:HEAD:dejavu-fonts-2.26-1.fc10.src.rpm:1217165726 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 19 May 2008 20:50:26 -0000 1.49 +++ sources 27 Jul 2008 13:35:50 -0000 1.50 @@ -1 +1 @@ -d1aadb2a9dbf7d815f99c10efeb28e4a dejavu-fonts-2.25.tar.bz2 +26bae23fdfaba1020a88bcbf147ccd79 dejavu-fonts-2.26.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 27 14:00:37 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 14:00:37 GMT Subject: rpms/libical/F-8 libical-0.31-makefile.patch, NONE, 1.1 libical.spec, 1.5, 1.6 Message-ID: <200807271400.m6RE0bjf029766@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29744 Modified Files: libical.spec Added Files: libical-0.31-makefile.patch Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.31-2 - Fixed linkage problems and disabled parallel build till upstream accepts fix. libical-0.31-makefile.patch: --- NEW FILE libical-0.31-makefile.patch --- diff -urNp libical-0.31.orig/src/libical/Makefile.in libical-0.31/src/libical/Makefile.in --- libical-0.31.orig/src/libical/Makefile.in 2008-07-27 16:32:25.000000000 +0530 +++ libical-0.31/src/libical/Makefile.in 2008-07-27 16:55:45.000000000 +0530 @@ -105,7 +105,7 @@ am_libical_la_OBJECTS = $(am__objects_2) icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \ sspm.lo vsnprintf.lo icallangbind.lo caldate.lo libical_la_OBJECTS = $(am_libical_la_OBJECTS) -libical_cxx_la_LIBADD = +libical_cxx_la_LIBADD = $(PTHREAD_LIBS) am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \ icalderivedproperty.h icalderivedvalue.h \ icalderivedparameter.c icalderivedproperty.c icalrestriction.c \ diff -urNp libical-0.31.orig/src/libicalss/Makefile.in libical-0.31/src/libicalss/Makefile.in --- libical-0.31.orig/src/libicalss/Makefile.in 2008-07-27 16:32:25.000000000 +0530 +++ libical-0.31/src/libicalss/Makefile.in 2008-07-27 17:18:55.000000000 +0530 @@ -103,7 +103,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \ $(am__objects_2) libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS) -libicalss_cxx_la_LIBADD = am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \ icalspanlist_cxx.cpp @WITH_CXX_BINDINGS_TRUE at am_libicalss_cxx_la_OBJECTS = \ @@ -352,6 +351,8 @@ COMBINEDHEADERS = \ $(srcdir)/icalspanlist.h \ $(srcdir)/icalmessage.h +libicalss_cxx_la_LIBADD = ./.libs/libicalss.la +libicalss_cxx_la_DEPENDENCIES = ./.libs/libicalss.la @WITH_CXX_BINDINGS_TRUE at libicalss_cxx_la_SOURCES = \ @WITH_CXX_BINDINGS_TRUE@ $(libicalss_evolution_la_SOURCES) \ @WITH_CXX_BINDINGS_TRUE@ icalspanlist_cxx.h \ Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-8/libical.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libical.spec 17 Jul 2008 18:14:14 -0000 1.5 +++ libical.spec 27 Jul 2008 14:00:06 -0000 1.6 @@ -1,6 +1,6 @@ Name: libical Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reference implementation of the iCalendar data type and serialization format Summary(pl): Implementacja formatu iCalendar @@ -9,6 +9,8 @@ URL: http://freeassociation.sourceforge.net/ Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-makefile.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -35,14 +37,21 @@ %prep %setup -q +%patch0 -p1 %build -%configure --disable-static --enable-reentrant --enable-cxx +%configure --disable-static -enable-cxx --enable-reentrant # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} +# PATCH0 breaks parallel build. +# Parallel make does not work. +make + +%check +# make check +# Fails on x86_64 and ppc64. %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +98,9 @@ %{_libdir}/libicalvcal.so %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.31-2 +- Fixed linkage problems and disabled parallel build till upstream accepts fix. + * Thu Jul 17 2008 Jeff Perry - 0.31-1 - Version bump to 0.31. From fedora-extras-commits at redhat.com Sun Jul 27 14:03:21 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 14:03:21 GMT Subject: rpms/libical/F-9 libical-0.31-makefile.patch, NONE, 1.1 libical.spec, 1.6, 1.7 Message-ID: <200807271403.m6RE3LLA004141@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4106 Modified Files: libical.spec Added Files: libical-0.31-makefile.patch Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.31-2 - Fixed linkage problems and disabled parallel build till upstream accepts fix. libical-0.31-makefile.patch: --- NEW FILE libical-0.31-makefile.patch --- diff -urNp libical-0.31.orig/src/libical/Makefile.in libical-0.31/src/libical/Makefile.in --- libical-0.31.orig/src/libical/Makefile.in 2008-07-27 16:32:25.000000000 +0530 +++ libical-0.31/src/libical/Makefile.in 2008-07-27 16:55:45.000000000 +0530 @@ -105,7 +105,7 @@ am_libical_la_OBJECTS = $(am__objects_2) icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \ sspm.lo vsnprintf.lo icallangbind.lo caldate.lo libical_la_OBJECTS = $(am_libical_la_OBJECTS) -libical_cxx_la_LIBADD = +libical_cxx_la_LIBADD = $(PTHREAD_LIBS) am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \ icalderivedproperty.h icalderivedvalue.h \ icalderivedparameter.c icalderivedproperty.c icalrestriction.c \ diff -urNp libical-0.31.orig/src/libicalss/Makefile.in libical-0.31/src/libicalss/Makefile.in --- libical-0.31.orig/src/libicalss/Makefile.in 2008-07-27 16:32:25.000000000 +0530 +++ libical-0.31/src/libicalss/Makefile.in 2008-07-27 17:18:55.000000000 +0530 @@ -103,7 +103,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \ $(am__objects_2) libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS) -libicalss_cxx_la_LIBADD = am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \ icalspanlist_cxx.cpp @WITH_CXX_BINDINGS_TRUE at am_libicalss_cxx_la_OBJECTS = \ @@ -352,6 +351,8 @@ COMBINEDHEADERS = \ $(srcdir)/icalspanlist.h \ $(srcdir)/icalmessage.h +libicalss_cxx_la_LIBADD = ./.libs/libicalss.la +libicalss_cxx_la_DEPENDENCIES = ./.libs/libicalss.la @WITH_CXX_BINDINGS_TRUE at libicalss_cxx_la_SOURCES = \ @WITH_CXX_BINDINGS_TRUE@ $(libicalss_evolution_la_SOURCES) \ @WITH_CXX_BINDINGS_TRUE@ icalspanlist_cxx.h \ Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-9/libical.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libical.spec 17 Jul 2008 18:16:10 -0000 1.6 +++ libical.spec 27 Jul 2008 14:02:51 -0000 1.7 @@ -1,6 +1,6 @@ Name: libical Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reference implementation of the iCalendar data type and serialization format Summary(pl): Implementacja formatu iCalendar @@ -9,6 +9,8 @@ URL: http://freeassociation.sourceforge.net/ Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-makefile.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -35,14 +37,21 @@ %prep %setup -q +%patch0 -p1 %build -%configure --disable-static --enable-reentrant --enable-cxx +%configure --disable-static -enable-cxx --enable-reentrant # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} +# PATCH0 breaks parallel build. +# Parallel make does not work. +make + +%check +# make check +# Fails on x86_64 and ppc64. %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +98,9 @@ %{_libdir}/libicalvcal.so %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.31-2 +- Fixed linkage problems and disabled parallel build till upstream accepts fix. + * Thu Jul 17 2008 Jeff Perry - 0.31-1 - Version bump to 0.31. From fedora-extras-commits at redhat.com Sun Jul 27 14:06:19 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 14:06:19 GMT Subject: rpms/libical/devel libical-0.31-makefile.patch, NONE, 1.1 libical.spec, 1.6, 1.7 Message-ID: <200807271406.m6RE6JiJ004369@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4345 Modified Files: libical.spec Added Files: libical-0.31-makefile.patch Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.31-2 - Fixed linkage problems and disabled parallel build till upstream accepts fix. libical-0.31-makefile.patch: --- NEW FILE libical-0.31-makefile.patch --- diff -urNp libical-0.31.orig/src/libical/Makefile.in libical-0.31/src/libical/Makefile.in --- libical-0.31.orig/src/libical/Makefile.in 2008-07-27 16:32:25.000000000 +0530 +++ libical-0.31/src/libical/Makefile.in 2008-07-27 16:55:45.000000000 +0530 @@ -105,7 +105,7 @@ am_libical_la_OBJECTS = $(am__objects_2) icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \ sspm.lo vsnprintf.lo icallangbind.lo caldate.lo libical_la_OBJECTS = $(am_libical_la_OBJECTS) -libical_cxx_la_LIBADD = +libical_cxx_la_LIBADD = $(PTHREAD_LIBS) am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \ icalderivedproperty.h icalderivedvalue.h \ icalderivedparameter.c icalderivedproperty.c icalrestriction.c \ diff -urNp libical-0.31.orig/src/libicalss/Makefile.in libical-0.31/src/libicalss/Makefile.in --- libical-0.31.orig/src/libicalss/Makefile.in 2008-07-27 16:32:25.000000000 +0530 +++ libical-0.31/src/libicalss/Makefile.in 2008-07-27 17:18:55.000000000 +0530 @@ -103,7 +103,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \ $(am__objects_2) libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS) -libicalss_cxx_la_LIBADD = am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \ icalspanlist_cxx.cpp @WITH_CXX_BINDINGS_TRUE at am_libicalss_cxx_la_OBJECTS = \ @@ -352,6 +351,8 @@ COMBINEDHEADERS = \ $(srcdir)/icalspanlist.h \ $(srcdir)/icalmessage.h +libicalss_cxx_la_LIBADD = ./.libs/libicalss.la +libicalss_cxx_la_DEPENDENCIES = ./.libs/libicalss.la @WITH_CXX_BINDINGS_TRUE at libicalss_cxx_la_SOURCES = \ @WITH_CXX_BINDINGS_TRUE@ $(libicalss_evolution_la_SOURCES) \ @WITH_CXX_BINDINGS_TRUE@ icalspanlist_cxx.h \ Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libical.spec 17 Jul 2008 18:19:34 -0000 1.6 +++ libical.spec 27 Jul 2008 14:05:49 -0000 1.7 @@ -1,6 +1,6 @@ Name: libical Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reference implementation of the iCalendar data type and serialization format Summary(pl): Implementacja formatu iCalendar @@ -9,6 +9,8 @@ URL: http://freeassociation.sourceforge.net/ Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-makefile.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -35,14 +37,21 @@ %prep %setup -q +%patch0 -p1 %build -%configure --disable-static --enable-reentrant --enable-cxx +%configure --disable-static -enable-cxx --enable-reentrant # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} +# PATCH0 breaks parallel build. +# Parallel make does not work. +make + +%check +# make check +# Fails on x86_64 and ppc64. %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +98,9 @@ %{_libdir}/libicalvcal.so %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.31-2 +- Fixed linkage problems and disabled parallel build till upstream accepts fix. + * Thu Jul 17 2008 Jeff Perry - 0.31-1 - Version bump to 0.31. From fedora-extras-commits at redhat.com Sun Jul 27 14:38:36 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Sun, 27 Jul 2008 14:38:36 GMT Subject: rpms/rpmlint/EL-4 rpmlint.spec,1.20,1.21 Message-ID: <200807271438.m6REcaPi005664@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5623 Modified Files: rpmlint.spec Log Message: rectifying the changelog since I [once again] busted it Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rpmlint.spec 26 Jul 2008 20:05:06 -0000 1.20 +++ rpmlint.spec 27 Jul 2008 14:38:05 -0000 1.21 @@ -68,7 +68,7 @@ %changelog -* Sat Jul 26 2008 Ville Skytt?? - 0.84-2 +* Sat Jul 26 2008 Manuel Wolfshant - 0.84-2 - 0.84, fixes #355861, #456304. - Sync Fedora license list with Wiki revision "16:08, 18 July 2008". - Rediff patches. From fedora-extras-commits at redhat.com Sun Jul 27 15:05:54 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 15:05:54 GMT Subject: rpms/libical/F-8 libical.spec,1.6,1.7 Message-ID: <200807271505.m6RF5ss6013123@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13085 Modified Files: libical.spec Log Message: * Sun Jul 27 2008 Jeff Perry - 0.31-3 - Added 'BuildRequires: bison byacc flex'. Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-8/libical.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libical.spec 27 Jul 2008 14:00:06 -0000 1.6 +++ libical.spec 27 Jul 2008 15:05:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: libical Version: 0.31 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Reference implementation of the iCalendar data type and serialization format Summary(pl): Implementacja formatu iCalendar @@ -13,6 +13,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: bison +BuildRequires: byacc +BuildRequires: flex + %description Reference implementation of the iCalendar data type and serialization format used in dozens of calendaring and scheduling products. @@ -98,6 +102,9 @@ %{_libdir}/libicalvcal.so %changelog +* Sun Jul 27 2008 Jeff Perry - 0.31-3 +- Added 'BuildRequires: bison byacc flex'. + * Sun Jul 27 2008 Debarshi Ray - 0.31-2 - Fixed linkage problems and disabled parallel build till upstream accepts fix. From fedora-extras-commits at redhat.com Sun Jul 27 15:07:05 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 15:07:05 GMT Subject: rpms/libical/F-9 libical.spec,1.7,1.8 Message-ID: <200807271507.m6RF75hr013194@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13173 Modified Files: libical.spec Log Message: * Sun Jul 27 2008 Jeff Perry - 0.31-3 - Added 'BuildRequires: bison byacc flex'. Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/F-9/libical.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libical.spec 27 Jul 2008 14:02:51 -0000 1.7 +++ libical.spec 27 Jul 2008 15:06:34 -0000 1.8 @@ -1,6 +1,6 @@ Name: libical Version: 0.31 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Reference implementation of the iCalendar data type and serialization format Summary(pl): Implementacja formatu iCalendar @@ -13,6 +13,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: bison +BuildRequires: byacc +BuildRequires: flex + %description Reference implementation of the iCalendar data type and serialization format used in dozens of calendaring and scheduling products. @@ -98,6 +102,9 @@ %{_libdir}/libicalvcal.so %changelog +* Sun Jul 27 2008 Jeff Perry - 0.31-3 +- Added 'BuildRequires: bison byacc flex'. + * Sun Jul 27 2008 Debarshi Ray - 0.31-2 - Fixed linkage problems and disabled parallel build till upstream accepts fix. From fedora-extras-commits at redhat.com Sun Jul 27 15:08:26 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 15:08:26 GMT Subject: rpms/libical/devel libical.spec,1.7,1.8 Message-ID: <200807271508.m6RF8QQB013295@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libical/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13258 Modified Files: libical.spec Log Message: * Sun Jul 27 2008 Jeff Perry - 0.31-3 - Added 'BuildRequires: bison byacc flex'. Index: libical.spec =================================================================== RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libical.spec 27 Jul 2008 14:05:49 -0000 1.7 +++ libical.spec 27 Jul 2008 15:07:56 -0000 1.8 @@ -1,6 +1,6 @@ Name: libical Version: 0.31 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Reference implementation of the iCalendar data type and serialization format Summary(pl): Implementacja formatu iCalendar @@ -13,6 +13,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: bison +BuildRequires: byacc +BuildRequires: flex + %description Reference implementation of the iCalendar data type and serialization format used in dozens of calendaring and scheduling products. @@ -98,6 +102,9 @@ %{_libdir}/libicalvcal.so %changelog +* Sun Jul 27 2008 Jeff Perry - 0.31-3 +- Added 'BuildRequires: bison byacc flex'. + * Sun Jul 27 2008 Debarshi Ray - 0.31-2 - Fixed linkage problems and disabled parallel build till upstream accepts fix. From fedora-extras-commits at redhat.com Sun Jul 27 15:35:11 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Sun, 27 Jul 2008 15:35:11 GMT Subject: rpms/nginx/F-9 .cvsignore, 1.17, 1.18 nginx.spec, 1.22, 1.23 sources, 1.17, 1.18 nginx-auto-install.patch, 1.2, NONE nginx-auto-options.patch, 1.1, NONE Message-ID: <200807271535.m6RFZBLe014079@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/nginx/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14043 Modified Files: .cvsignore nginx.spec sources Removed Files: nginx-auto-install.patch nginx-auto-options.patch Log Message: update to 0.6.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nginx/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 May 2008 04:06:16 -0000 1.17 +++ .cvsignore 27 Jul 2008 15:34:41 -0000 1.18 @@ -1 +1 @@ -nginx-0.6.31.tar.gz +nginx-0.6.32.tar.gz Index: nginx.spec =================================================================== RCS file: /cvs/pkgs/rpms/nginx/F-9/nginx.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- nginx.spec 27 May 2008 04:43:34 -0000 1.22 +++ nginx.spec 27 Jul 2008 15:34:41 -0000 1.23 @@ -8,8 +8,8 @@ %define nginx_webroot %{nginx_datadir}/html Name: nginx -Version: 0.6.31 -Release: 2%{?dist} +Version: 0.6.32 +Release: 1%{?dist} Summary: Robust, small and high performance http and reverse proxy server Group: System Environment/Daemons @@ -47,14 +47,9 @@ # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors. Patch0: nginx-auto-cc-gcc.patch -# nginx has its own configure/build scripts. These patches allow nginx -# to install into a buildroot. -Patch1: nginx-auto-options.patch -Patch2: nginx-auto-install.patch - # configuration patch to match all the Fedora paths for logs, pid files # etc. -Patch3: nginx-conf.patch +Patch1: nginx-conf.patch %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 @@ -68,8 +63,6 @@ %patch0 -p0 %patch1 -p0 -%patch2 -p0 -%patch3 -p0 %{__tar} zxvf %{SOURCE5} %build @@ -190,14 +183,18 @@ %changelog -* Mon May 26 2008 Jeremy Hinegardner - 0.6.31-2 +* Tue Jul 22 2008 Jeremy Hinegardner - 0.6.32-1 +- update to 0.6.32 +- nginx now supports DESTDIR so removed the patches that enabled it + +* Mon May 26 2008 Jeremy Hinegardner - 0.6.31-3 - init script fixes - resolve 'listen 80 default' [#447873] -* Mon May 12 2008 Jeremy Hinegardner - 0.6.31-1 +* Mon May 12 2008 Jeremy Hinegardner - 0.6.31-2 - update to 0.6.31 -* Sun May 11 2008 Jeremy Hinegardner - 0.6.30-1 +* Sun May 11 2008 Jeremy Hinegardner - 0.6.30-2 - upate to new upstream stable branch 0.6 - added 3rd party module nginx-upstream-fair - added default webpages Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nginx/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 May 2008 04:06:16 -0000 1.17 +++ sources 27 Jul 2008 15:34:41 -0000 1.18 @@ -1 +1 @@ -824bcc25bbd5b636f182237b69227bd2 nginx-0.6.31.tar.gz +c09a2ace3c91f45dabbb608b11e48ed1 nginx-0.6.32.tar.gz --- nginx-auto-install.patch DELETED --- --- nginx-auto-options.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 15:37:39 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Sun, 27 Jul 2008 15:37:39 GMT Subject: rpms/nginx/F-8 .cvsignore, 1.17, 1.18 nginx.spec, 1.19, 1.20 sources, 1.17, 1.18 nginx-auto-install.patch, 1.2, NONE nginx-auto-options.patch, 1.1, NONE Message-ID: <200807271537.m6RFbd9d014215@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/nginx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14186 Modified Files: .cvsignore nginx.spec sources Removed Files: nginx-auto-install.patch nginx-auto-options.patch Log Message: update to 0.6.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nginx/F-8/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 May 2008 04:05:57 -0000 1.17 +++ .cvsignore 27 Jul 2008 15:37:09 -0000 1.18 @@ -1 +1 @@ -nginx-0.6.31.tar.gz +nginx-0.6.32.tar.gz Index: nginx.spec =================================================================== RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nginx.spec 27 May 2008 04:43:12 -0000 1.19 +++ nginx.spec 27 Jul 2008 15:37:09 -0000 1.20 @@ -8,8 +8,8 @@ %define nginx_webroot %{nginx_datadir}/html Name: nginx -Version: 0.6.31 -Release: 2%{?dist} +Version: 0.6.32 +Release: 1%{?dist} Summary: Robust, small and high performance http and reverse proxy server Group: System Environment/Daemons @@ -47,14 +47,9 @@ # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors. Patch0: nginx-auto-cc-gcc.patch -# nginx has its own configure/build scripts. These patches allow nginx -# to install into a buildroot. -Patch1: nginx-auto-options.patch -Patch2: nginx-auto-install.patch - # configuration patch to match all the Fedora paths for logs, pid files # etc. -Patch3: nginx-conf.patch +Patch1: nginx-conf.patch %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 @@ -68,8 +63,6 @@ %patch0 -p0 %patch1 -p0 -%patch2 -p0 -%patch3 -p0 %{__tar} zxvf %{SOURCE5} %build @@ -190,14 +183,18 @@ %changelog -* Mon May 26 2008 Jeremy Hinegardner - 0.6.31-2 +* Tue Jul 22 2008 Jeremy Hinegardner - 0.6.32-1 +- update to 0.6.32 +- nginx now supports DESTDIR so removed the patches that enabled it + +* Mon May 26 2008 Jeremy Hinegardner - 0.6.31-3 - init script fixes - resolve 'listen 80 default' [#447873] -* Mon May 12 2008 Jeremy Hinegardner - 0.6.31-1 +* Mon May 12 2008 Jeremy Hinegardner - 0.6.31-2 - update to 0.6.31 -* Sun May 11 2008 Jeremy Hinegardner - 0.6.30-1 +* Sun May 11 2008 Jeremy Hinegardner - 0.6.30-2 - upate to new upstream stable branch 0.6 - added 3rd party module nginx-upstream-fair - added default webpages Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nginx/F-8/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 May 2008 04:05:57 -0000 1.17 +++ sources 27 Jul 2008 15:37:09 -0000 1.18 @@ -1 +1 @@ -824bcc25bbd5b636f182237b69227bd2 nginx-0.6.31.tar.gz +c09a2ace3c91f45dabbb608b11e48ed1 nginx-0.6.32.tar.gz --- nginx-auto-install.patch DELETED --- --- nginx-auto-options.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 15:48:08 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Sun, 27 Jul 2008 15:48:08 GMT Subject: rpms/nginx/EL-5 .cvsignore, 1.11, 1.12 nginx.spec, 1.16, 1.17 sources, 1.12, 1.13 nginx-auto-install.patch, 1.2, NONE nginx-auto-options.patch, 1.1, NONE Message-ID: <200807271548.m6RFm8pm014868@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/nginx/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14820 Modified Files: .cvsignore nginx.spec sources Removed Files: nginx-auto-install.patch nginx-auto-options.patch Log Message: update to 0.6.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nginx/EL-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 13 May 2008 06:24:45 -0000 1.11 +++ .cvsignore 27 Jul 2008 15:47:37 -0000 1.12 @@ -1 +1 @@ -nginx-0.6.31.tar.gz +nginx-0.6.32.tar.gz Index: nginx.spec =================================================================== RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- nginx.spec 27 May 2008 04:41:07 -0000 1.16 +++ nginx.spec 27 Jul 2008 15:47:37 -0000 1.17 @@ -8,8 +8,8 @@ %define nginx_webroot %{nginx_datadir}/html Name: nginx -Version: 0.6.31 -Release: 3%{?dist} +Version: 0.6.32 +Release: 1%{?dist} Summary: Robust, small and high performance http and reverse proxy server Group: System Environment/Daemons @@ -22,7 +22,7 @@ BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl(ExtUtils::Embed) Requires: pcre,zlib,openssl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# for /user/sbin/useradd +# for /usr/sbin/useradd Requires(pre): shadow-utils Requires(post): chkconfig # for /sbin/service @@ -47,28 +47,21 @@ # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors. Patch0: nginx-auto-cc-gcc.patch -# nginx has its own configure/build scripts. These patches allow nginx -# to install into a buildroot. -Patch2: nginx-auto-install.patch -Patch1: nginx-auto-options.patch - # configuration patch to match all the Fedora paths for logs, pid files # etc. -Patch3: nginx-conf.patch +Patch1: nginx-conf.patch %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 proxy server written by Igor Sysoev. -One third party module, nginx-upstream-fair has been added. +One third party module, nginx-upstream-fair, has been added. %prep %setup -q %patch0 -p0 %patch1 -p0 -%patch2 -p0 -%patch3 -p0 %{__tar} zxvf %{SOURCE5} %build @@ -104,7 +97,6 @@ --with-mail_ssl_module \ --with-cc-opt="%{optflags} $(pcre-config --cflags)" \ --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair - make %{?_smp_mflags} # rename the readme for nginx-upstream-fair so it doesn't conflict with the main @@ -189,6 +181,10 @@ %changelog +* Sun Jul 27 2008 Jeremy Hinegardner - 0.6.32-1 +- update to 0.6.32 +- nginx now supports DESTDIR so removed the patches that enabled it + * Mon May 26 2008 Jeremy Hinegardner - 0.6.31-3 - update init script - remove 'default' listen parameter Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nginx/EL-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 May 2008 06:24:45 -0000 1.12 +++ sources 27 Jul 2008 15:47:37 -0000 1.13 @@ -1 +1 @@ -824bcc25bbd5b636f182237b69227bd2 nginx-0.6.31.tar.gz +c09a2ace3c91f45dabbb608b11e48ed1 nginx-0.6.32.tar.gz --- nginx-auto-install.patch DELETED --- --- nginx-auto-options.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 15:50:34 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 15:50:34 GMT Subject: rpms/freeze/EL-4 Freeze_license_email.txt, NONE, 1.1 freeze.spec, 1.6, 1.7 Message-ID: <200807271550.m6RFoYPD015041@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/freeze/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14987/EL-4 Modified Files: freeze.spec Added Files: Freeze_license_email.txt Log Message: Fixed license tag with copyright holder clarification (thanks to Tom "spot" Callaway for doing this on the Rawhide branch) --- NEW FILE Freeze_license_email.txt --- Date: Fri, 18 Jul 2008 14:14:18 -0700 From: "Leo Broukhis" To: "Tom spot Callaway" Subject: Re: Freeze license On Fri, Jul 18, 2008 at 1:51 PM, Tom spot Callaway wrote: > Well, at least one person in the Fedora community thinks it is useful, > because he wants to maintain it. :) All right. > If you have "GPL-like" license text, can you send it to me? Alternately, > it would be a lot simpler if you could choose one of the licenses from > this page, as we already know they are ok: > > http://fedoraproject.org/wiki/Licensing#Good_Licenses Let's call it GPL+, then. Thanks, Leo Index: freeze.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeze/EL-4/freeze.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- freeze.spec 12 Aug 2007 00:21:01 -0000 1.6 +++ freeze.spec 27 Jul 2008 15:50:04 -0000 1.7 @@ -1,12 +1,14 @@ Name: freeze Version: 2.5.0 -Release: 7%{?dist} +Release: 9%{?dist} Summary: freeze/melt/fcat compression utilities Group: Applications/Archiving -License: Distributable +# Confirmed with upstream, see email text in Source1 +License: GPL+ # No one agrees on the canonical download site, everyone uses the same version -Source: http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz +Source0: http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz +Source1: Freeze_license_email.txt Patch0: freeze-2.5.patch Patch1: freeze-2.5.0-printf.patch Patch2: freeze-2.5.0-deffile.patch @@ -19,6 +21,7 @@ %prep %setup -q +cp -a %{SOURCE1} . %patch0 -p1 -b .Makefile %patch1 -p1 -b .printf %patch2 -p1 -b .deffile @@ -47,11 +50,19 @@ %files %defattr(0644, root, root, 0755) -%doc MANIFEST README +%doc MANIFEST README Freeze_license_email.txt %doc %{_mandir}/man?/* %attr(0755,root,root) %{_bindir}/* %changelog +* Sun Jul 27 2008 Robert Scheck 2.5.0-9 +- Fixed license tag with copyright holder clarification (thanks + to Tom "spot" Callaway for doing this on the Rawhide branch) + +* Fri Feb 08 2008 Nicolas Mailhot +- 2.5.0-8 +- gcc 4.3 rebuild + * Sun Aug 12 2007 Robert Scheck 2.5.0-7 - Rebuilt for EPEL branches From fedora-extras-commits at redhat.com Sun Jul 27 15:50:34 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 15:50:34 GMT Subject: rpms/freeze/EL-5 Freeze_license_email.txt, NONE, 1.1 freeze.spec, 1.11, 1.12 Message-ID: <200807271550.m6RFoYlv015044@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/freeze/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14987/EL-5 Modified Files: freeze.spec Added Files: Freeze_license_email.txt Log Message: Fixed license tag with copyright holder clarification (thanks to Tom "spot" Callaway for doing this on the Rawhide branch) --- NEW FILE Freeze_license_email.txt --- Date: Fri, 18 Jul 2008 14:14:18 -0700 From: "Leo Broukhis" To: "Tom spot Callaway" Subject: Re: Freeze license On Fri, Jul 18, 2008 at 1:51 PM, Tom spot Callaway wrote: > Well, at least one person in the Fedora community thinks it is useful, > because he wants to maintain it. :) All right. > If you have "GPL-like" license text, can you send it to me? Alternately, > it would be a lot simpler if you could choose one of the licenses from > this page, as we already know they are ok: > > http://fedoraproject.org/wiki/Licensing#Good_Licenses Let's call it GPL+, then. Thanks, Leo Index: freeze.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeze/EL-5/freeze.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freeze.spec 12 Aug 2007 00:10:24 -0000 1.11 +++ freeze.spec 27 Jul 2008 15:50:04 -0000 1.12 @@ -1,12 +1,14 @@ Name: freeze Version: 2.5.0 -Release: 7%{?dist} +Release: 9%{?dist} Summary: freeze/melt/fcat compression utilities Group: Applications/Archiving -License: Distributable +# Confirmed with upstream, see email text in Source1 +License: GPL+ # No one agrees on the canonical download site, everyone uses the same version -Source: http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz +Source0: http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz +Source1: Freeze_license_email.txt Patch0: freeze-2.5.patch Patch1: freeze-2.5.0-printf.patch Patch2: freeze-2.5.0-deffile.patch @@ -19,6 +21,7 @@ %prep %setup -q +cp -a %{SOURCE1} . %patch0 -p1 -b .Makefile %patch1 -p1 -b .printf %patch2 -p1 -b .deffile @@ -47,11 +50,19 @@ %files %defattr(0644, root, root, 0755) -%doc MANIFEST README +%doc MANIFEST README Freeze_license_email.txt %doc %{_mandir}/man?/* %attr(0755,root,root) %{_bindir}/* %changelog +* Sun Jul 27 2008 Robert Scheck 2.5.0-9 +- Fixed license tag with copyright holder clarification (thanks + to Tom "spot" Callaway for doing this on the Rawhide branch) + +* Fri Feb 08 2008 Nicolas Mailhot +- 2.5.0-8 +- gcc 4.3 rebuild + * Sun Aug 12 2007 Robert Scheck 2.5.0-7 - Rebuilt for EPEL branches From fedora-extras-commits at redhat.com Sun Jul 27 15:54:54 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Sun, 27 Jul 2008 15:54:54 GMT Subject: rpms/nginx/EL-4 .cvsignore, 1.14, 1.15 nginx.spec, 1.18, 1.19 sources, 1.14, 1.15 Message-ID: <200807271554.m6RFssor015288@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/nginx/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15246 Modified Files: .cvsignore nginx.spec sources Log Message: update to 0.5.37 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nginx/EL-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 19 Jan 2008 18:11:01 -0000 1.14 +++ .cvsignore 27 Jul 2008 15:54:24 -0000 1.15 @@ -1 +1 @@ -nginx-0.5.35.tar.gz +nginx-0.5.37.tar.gz Index: nginx.spec =================================================================== RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nginx.spec 19 Jan 2008 18:11:01 -0000 1.18 +++ nginx.spec 27 Jul 2008 15:54:24 -0000 1.19 @@ -7,7 +7,7 @@ %define nginx_datadir %{_datadir}/nginx Name: nginx -Version: 0.5.35 +Version: 0.5.37 Release: 1%{?dist} Summary: Robust, small and high performance http and reverse proxy server Group: System Environment/Daemons @@ -157,6 +157,9 @@ %changelog +* Sun Jul 27 2008 Jeremy Hinegardner - 0.5.37-1 +update to 0.5.37 + * Sat Jan 19 2008 Jeremy Hinegardner - 0.5.35-1 - update to 0.5.35 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nginx/EL-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 19 Jan 2008 18:11:01 -0000 1.14 +++ sources 27 Jul 2008 15:54:24 -0000 1.15 @@ -1 +1 @@ -1100d8a2f811777f38eff44fe6548d7e nginx-0.5.35.tar.gz +055ebcdf71a00177b4ee1ac71fa6b82c nginx-0.5.37.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 16:10:17 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:10:17 GMT Subject: rpms/nget/F-7 nget.spec,1.11,1.12 Message-ID: <200807271610.m6RGAH72022525@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/nget/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22479 Modified Files: nget.spec Log Message: Fixed Spec in F-7. Modified Files: nget.spec Index: nget.spec =================================================================== RCS file: /cvs/pkgs/rpms/nget/F-7/nget.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nget.spec 16 Feb 2008 15:28:04 -0000 1.11 +++ nget.spec 27 Jul 2008 16:09:47 -0000 1.12 @@ -57,8 +57,8 @@ %doc Changelog COPYING FAQ README TODO format-TODO ngetrc.example %{_bindir}/%{name} %{_bindir}/ngetlite -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/ngetlite.1.gz +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/ngetlite.1* %changelog * Sat Feb 16 2008 Debarshi Ray - 0.27.1-8 From fedora-extras-commits at redhat.com Sun Jul 27 16:11:36 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:11:36 GMT Subject: rpms/nget/F-8 nget.spec,1.11,1.12 Message-ID: <200807271611.m6RGBaBf022601@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/nget/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22542 Modified Files: nget.spec Log Message: Fixed Spec in F-8. Modified Files: nget.spec Index: nget.spec =================================================================== RCS file: /cvs/pkgs/rpms/nget/F-8/nget.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nget.spec 16 Feb 2008 15:24:06 -0000 1.11 +++ nget.spec 27 Jul 2008 16:11:06 -0000 1.12 @@ -57,8 +57,8 @@ %doc Changelog COPYING FAQ README TODO format-TODO ngetrc.example %{_bindir}/%{name} %{_bindir}/ngetlite -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/ngetlite.1.gz +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/ngetlite.1* %changelog * Sat Feb 16 2008 Debarshi Ray - 0.27.1-8 From fedora-extras-commits at redhat.com Sun Jul 27 16:12:49 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:12:49 GMT Subject: rpms/nget/devel nget.spec,1.11,1.12 Message-ID: <200807271612.m6RGCnqN022699@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/nget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22646 Modified Files: nget.spec Log Message: Fixed Spec in devel. Modified Files: nget.spec Index: nget.spec =================================================================== RCS file: /cvs/pkgs/rpms/nget/devel/nget.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nget.spec 16 Feb 2008 15:20:21 -0000 1.11 +++ nget.spec 27 Jul 2008 16:12:19 -0000 1.12 @@ -57,8 +57,8 @@ %doc Changelog COPYING FAQ README TODO format-TODO ngetrc.example %{_bindir}/%{name} %{_bindir}/ngetlite -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/ngetlite.1.gz +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/ngetlite.1* %changelog * Sat Feb 16 2008 Debarshi Ray - 0.27.1-8 From fedora-extras-commits at redhat.com Sun Jul 27 16:14:31 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:14:31 GMT Subject: rpms/tla/F-7 tla.spec,1.32,1.33 Message-ID: <200807271614.m6RGEV0c022801@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/tla/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22733 Modified Files: tla.spec Log Message: Fixed Spec in F-7. Modified Files: tla.spec Index: tla.spec =================================================================== RCS file: /cvs/pkgs/rpms/tla/F-7/tla.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- tla.spec 9 Feb 2008 17:02:29 -0000 1.32 +++ tla.spec 27 Jul 2008 16:14:01 -0000 1.33 @@ -110,8 +110,8 @@ %{_bindir}/make-links %{_bindir}/%{name} %{_bindir}/remove-links -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/%{name}-gpg-check.1.gz +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-gpg-check.1* %changelog * Sat Feb 09 2008 Debarshi Ray - 1.3.5-5 From fedora-extras-commits at redhat.com Sun Jul 27 16:15:35 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:15:35 GMT Subject: rpms/unicap/EL-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 unicap.spec, 1.4, 1.5 Message-ID: <200807271615.m6RGFZRv022924@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22827/EL-5 Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.2.24 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2008 15:55:21 -0000 1.4 +++ .cvsignore 27 Jul 2008 16:15:05 -0000 1.5 @@ -1 +1 @@ -unicap-0.2.23.tar.gz +unicap-0.2.24.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/EL-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2008 15:55:21 -0000 1.4 +++ sources 27 Jul 2008 16:15:05 -0000 1.5 @@ -1 +1 @@ -e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz +852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/EL-5/unicap.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unicap.spec 19 May 2008 16:07:34 -0000 1.4 +++ unicap.spec 27 Jul 2008 16:15:05 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.23 +Version: 0.2.24 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -65,6 +65,12 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sun Jul 27 2008 Robert Scheck 0.2.24-1 +- Upgrade to 0.2.24 + +* Wed Jul 22 2008 Robert Scheck 0.2.23-2 +- Rebuild for libraw1394 2.0.0 + * Mon May 19 2008 Robert Scheck 0.2.23-1 - Upgrade to 0.2.23 - Corrected packaging of cpi/*.so files (thanks to Arne Caspari) From fedora-extras-commits at redhat.com Sun Jul 27 16:15:35 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:15:35 GMT Subject: rpms/unicap/F-8 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 unicap.spec, 1.4, 1.5 Message-ID: <200807271615.m6RGFZ0p022929@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22827/F-8 Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.2.24 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2008 15:56:05 -0000 1.4 +++ .cvsignore 27 Jul 2008 16:15:05 -0000 1.5 @@ -1 +1 @@ -unicap-0.2.23.tar.gz +unicap-0.2.24.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2008 15:56:05 -0000 1.4 +++ sources 27 Jul 2008 16:15:05 -0000 1.5 @@ -1 +1 @@ -e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz +852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-8/unicap.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unicap.spec 19 May 2008 16:08:35 -0000 1.4 +++ unicap.spec 27 Jul 2008 16:15:05 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.23 +Version: 0.2.24 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -65,6 +65,12 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sun Jul 27 2008 Robert Scheck 0.2.24-1 +- Upgrade to 0.2.24 + +* Wed Jul 22 2008 Robert Scheck 0.2.23-2 +- Rebuild for libraw1394 2.0.0 + * Mon May 19 2008 Robert Scheck 0.2.23-1 - Upgrade to 0.2.23 - Corrected packaging of cpi/*.so files (thanks to Arne Caspari) From fedora-extras-commits at redhat.com Sun Jul 27 16:15:36 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:15:36 GMT Subject: rpms/unicap/F-9 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 unicap.spec, 1.4, 1.5 Message-ID: <200807271615.m6RGFaXm022934@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22827/F-9 Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.2.24 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2008 15:56:26 -0000 1.4 +++ .cvsignore 27 Jul 2008 16:15:06 -0000 1.5 @@ -1 +1 @@ -unicap-0.2.23.tar.gz +unicap-0.2.24.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2008 15:56:26 -0000 1.4 +++ sources 27 Jul 2008 16:15:06 -0000 1.5 @@ -1 +1 @@ -e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz +852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/F-9/unicap.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unicap.spec 19 May 2008 16:08:59 -0000 1.4 +++ unicap.spec 27 Jul 2008 16:15:06 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.23 +Version: 0.2.24 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -65,6 +65,12 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sun Jul 27 2008 Robert Scheck 0.2.24-1 +- Upgrade to 0.2.24 + +* Wed Jul 22 2008 Robert Scheck 0.2.23-2 +- Rebuild for libraw1394 2.0.0 + * Mon May 19 2008 Robert Scheck 0.2.23-1 - Upgrade to 0.2.23 - Corrected packaging of cpi/*.so files (thanks to Arne Caspari) From fedora-extras-commits at redhat.com Sun Jul 27 16:15:36 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:15:36 GMT Subject: rpms/unicap/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 unicap.spec, 1.5, 1.6 Message-ID: <200807271615.m6RGFalN022939@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/unicap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22827/devel Modified Files: .cvsignore sources unicap.spec Log Message: Upgrade to 0.2.24 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unicap/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2008 15:56:51 -0000 1.4 +++ .cvsignore 27 Jul 2008 16:15:06 -0000 1.5 @@ -1 +1 @@ -unicap-0.2.23.tar.gz +unicap-0.2.24.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unicap/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2008 15:56:51 -0000 1.4 +++ sources 27 Jul 2008 16:15:06 -0000 1.5 @@ -1 +1 @@ -e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz +852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz Index: unicap.spec =================================================================== RCS file: /cvs/pkgs/rpms/unicap/devel/unicap.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- unicap.spec 22 Jul 2008 19:40:50 -0000 1.5 +++ unicap.spec 27 Jul 2008 16:15:06 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.23 -Release: 2%{?dist} +Version: 0.2.24 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -65,6 +65,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sun Jul 27 2008 Robert Scheck 0.2.24-1 +- Upgrade to 0.2.24 + * Wed Jul 22 2008 Robert Scheck 0.2.23-2 - Rebuild for libraw1394 2.0.0 From fedora-extras-commits at redhat.com Sun Jul 27 16:16:12 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:16:12 GMT Subject: rpms/tla/F-8 tla.spec,1.35,1.36 Message-ID: <200807271616.m6RGGCwS022986@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/tla/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22916 Modified Files: tla.spec Log Message: Fixed Spec in F-8. Modified Files: tla.spec Index: tla.spec =================================================================== RCS file: /cvs/pkgs/rpms/tla/F-8/tla.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tla.spec 9 Feb 2008 17:04:40 -0000 1.35 +++ tla.spec 27 Jul 2008 16:15:42 -0000 1.36 @@ -110,8 +110,8 @@ %{_bindir}/make-links %{_bindir}/%{name} %{_bindir}/remove-links -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/%{name}-gpg-check.1.gz +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-gpg-check.1* %changelog * Sat Feb 09 2008 Debarshi Ray - 1.3.5-5 From fedora-extras-commits at redhat.com Sun Jul 27 16:17:26 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:17:26 GMT Subject: rpms/tla/F-9 tla.spec,1.35,1.36 Message-ID: <200807271617.m6RGHQiW023047@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/tla/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23004 Modified Files: tla.spec Log Message: Fixed Spec in F-9. Modified Files: tla.spec Index: tla.spec =================================================================== RCS file: /cvs/pkgs/rpms/tla/F-9/tla.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tla.spec 9 Feb 2008 17:06:40 -0000 1.35 +++ tla.spec 27 Jul 2008 16:16:55 -0000 1.36 @@ -110,8 +110,8 @@ %{_bindir}/make-links %{_bindir}/%{name} %{_bindir}/remove-links -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/%{name}-gpg-check.1.gz +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-gpg-check.1* %changelog * Sat Feb 09 2008 Debarshi Ray - 1.3.5-5 From fedora-extras-commits at redhat.com Sun Jul 27 16:18:37 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:18:37 GMT Subject: rpms/tla/devel tla.spec,1.35,1.36 Message-ID: <200807271618.m6RGIb4u023217@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/tla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23163 Modified Files: tla.spec Log Message: Fixed Spec in devel. Modified Files: tla.spec Index: tla.spec =================================================================== RCS file: /cvs/pkgs/rpms/tla/devel/tla.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tla.spec 9 Feb 2008 17:06:40 -0000 1.35 +++ tla.spec 27 Jul 2008 16:18:07 -0000 1.36 @@ -110,8 +110,8 @@ %{_bindir}/make-links %{_bindir}/%{name} %{_bindir}/remove-links -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/%{name}-gpg-check.1.gz +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-gpg-check.1* %changelog * Sat Feb 09 2008 Debarshi Ray - 1.3.5-5 From fedora-extras-commits at redhat.com Sun Jul 27 16:21:37 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:21:37 GMT Subject: rpms/ucview/EL-5 ucview.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ucview.spec, 1.3, 1.4 Message-ID: <200807271621.m6RGLbbR023419@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/EL-5 Modified Files: .cvsignore sources ucview.spec Added Files: ucview.desktop Log Message: Upgrade to 0.21 --- NEW FILE ucview.desktop --- [Desktop Entry] Encoding=UTF-8 Name=UCView GenericName=Image Capture Application Type=Application Comment=Capture video images Exec=ucview TryExec=ucview Icon=ucview Terminal=false Categories=Application;AudioVideo;Video; StartupNotify=true Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 May 2008 21:01:55 -0000 1.3 +++ .cvsignore 27 Jul 2008 16:21:07 -0000 1.4 @@ -1,2 +1 @@ -ucview-0.20.1.tar.gz -ucview.desktop +ucview-0.21.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 May 2008 21:01:55 -0000 1.3 +++ sources 27 Jul 2008 16:21:07 -0000 1.4 @@ -1,2 +1 @@ -8979216d7f60109d08d6a039ef7ef1d2 ucview-0.20.1.tar.gz -6a9ab0f416ba59bc3aea70011271ba57 ucview.desktop +bccc09515f62bb6342cbd65dcba19dc2 ucview-0.21.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/EL-5/ucview.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ucview.spec 19 May 2008 21:01:55 -0000 1.3 +++ ucview.spec 27 Jul 2008 16:21:07 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.20.1 +Version: 0.21 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -96,6 +96,9 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jul 27 2008 Robert Scheck 0.21-1 +- Upgrade to 0.21 + * Mon May 19 2008 Robert Scheck 0.20.1-1 - Upgrade to 0.20.1 From fedora-extras-commits at redhat.com Sun Jul 27 16:21:38 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:21:38 GMT Subject: rpms/ucview/F-9 ucview.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ucview.spec, 1.2, 1.3 Message-ID: <200807271621.m6RGLci5023429@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/F-9 Modified Files: .cvsignore sources ucview.spec Added Files: ucview.desktop Log Message: Upgrade to 0.21 --- NEW FILE ucview.desktop --- [Desktop Entry] Encoding=UTF-8 Name=UCView GenericName=Image Capture Application Type=Application Comment=Capture video images Exec=ucview TryExec=ucview Icon=ucview Terminal=false Categories=Application;AudioVideo;Video; StartupNotify=true Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 May 2008 21:02:56 -0000 1.3 +++ .cvsignore 27 Jul 2008 16:21:08 -0000 1.4 @@ -1,2 +1 @@ -ucview-0.20.1.tar.gz -ucview.desktop +ucview-0.21.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 May 2008 21:02:56 -0000 1.3 +++ sources 27 Jul 2008 16:21:08 -0000 1.4 @@ -1,2 +1 @@ -8979216d7f60109d08d6a039ef7ef1d2 ucview-0.20.1.tar.gz -6a9ab0f416ba59bc3aea70011271ba57 ucview.desktop +bccc09515f62bb6342cbd65dcba19dc2 ucview-0.21.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-9/ucview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ucview.spec 19 May 2008 21:02:56 -0000 1.2 +++ ucview.spec 27 Jul 2008 16:21:08 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.20.1 +Version: 0.21 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -91,6 +91,9 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jul 27 2008 Robert Scheck 0.21-1 +- Upgrade to 0.21 + * Mon May 19 2008 Robert Scheck 0.20.1-1 - Upgrade to 0.20.1 From fedora-extras-commits at redhat.com Sun Jul 27 16:21:38 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:21:38 GMT Subject: rpms/ucview/F-8 ucview.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ucview.spec, 1.2, 1.3 Message-ID: <200807271621.m6RGLcN5023424@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/F-8 Modified Files: .cvsignore sources ucview.spec Added Files: ucview.desktop Log Message: Upgrade to 0.21 --- NEW FILE ucview.desktop --- [Desktop Entry] Encoding=UTF-8 Name=UCView GenericName=Image Capture Application Type=Application Comment=Capture video images Exec=ucview TryExec=ucview Icon=ucview Terminal=false Categories=Application;AudioVideo;Video; StartupNotify=true Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 May 2008 21:02:31 -0000 1.3 +++ .cvsignore 27 Jul 2008 16:21:08 -0000 1.4 @@ -1,2 +1 @@ -ucview-0.20.1.tar.gz -ucview.desktop +ucview-0.21.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 May 2008 21:02:31 -0000 1.3 +++ sources 27 Jul 2008 16:21:08 -0000 1.4 @@ -1,2 +1 @@ -8979216d7f60109d08d6a039ef7ef1d2 ucview-0.20.1.tar.gz -6a9ab0f416ba59bc3aea70011271ba57 ucview.desktop +bccc09515f62bb6342cbd65dcba19dc2 ucview-0.21.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/F-8/ucview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ucview.spec 19 May 2008 21:02:31 -0000 1.2 +++ ucview.spec 27 Jul 2008 16:21:08 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.20.1 +Version: 0.21 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -91,6 +91,9 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jul 27 2008 Robert Scheck 0.21-1 +- Upgrade to 0.21 + * Mon May 19 2008 Robert Scheck 0.20.1-1 - Upgrade to 0.20.1 From fedora-extras-commits at redhat.com Sun Jul 27 16:21:39 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 16:21:39 GMT Subject: rpms/ucview/devel ucview.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ucview.spec, 1.2, 1.3 Message-ID: <200807271621.m6RGLdXE023434@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ucview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/devel Modified Files: .cvsignore sources ucview.spec Added Files: ucview.desktop Log Message: Upgrade to 0.21 --- NEW FILE ucview.desktop --- [Desktop Entry] Encoding=UTF-8 Name=UCView GenericName=Image Capture Application Type=Application Comment=Capture video images Exec=ucview TryExec=ucview Icon=ucview Terminal=false Categories=Application;AudioVideo;Video; StartupNotify=true Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ucview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 May 2008 21:03:14 -0000 1.3 +++ .cvsignore 27 Jul 2008 16:21:09 -0000 1.4 @@ -1,2 +1 @@ -ucview-0.20.1.tar.gz -ucview.desktop +ucview-0.21.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ucview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 May 2008 21:03:14 -0000 1.3 +++ sources 27 Jul 2008 16:21:09 -0000 1.4 @@ -1,2 +1 @@ -8979216d7f60109d08d6a039ef7ef1d2 ucview-0.20.1.tar.gz -6a9ab0f416ba59bc3aea70011271ba57 ucview.desktop +bccc09515f62bb6342cbd65dcba19dc2 ucview-0.21.tar.gz Index: ucview.spec =================================================================== RCS file: /cvs/pkgs/rpms/ucview/devel/ucview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ucview.spec 19 May 2008 21:03:14 -0000 1.2 +++ ucview.spec 27 Jul 2008 16:21:09 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.20.1 +Version: 0.21 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -91,6 +91,9 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jul 27 2008 Robert Scheck 0.21-1 +- Upgrade to 0.21 + * Mon May 19 2008 Robert Scheck 0.20.1-1 - Upgrade to 0.20.1 From fedora-extras-commits at redhat.com Sun Jul 27 16:43:05 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:43:05 GMT Subject: rpms/osmo/F-8 osmo-0.2.2-tzdata.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 osmo.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807271643.m6RGh5df024452@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/osmo/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24424 Modified Files: .cvsignore osmo.spec sources Added Files: osmo-0.2.2-tzdata.patch Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 - Version bump to 0.2.2. - Added 'Requires: tzdata' and fixed the sources since libical does not provide timezone information anymore. - Added 'BuildRequires: hicolor-icon-theme' and moved icons to /usr/share/icons/hicolor from /usr/share/pixmaps. osmo-0.2.2-tzdata.patch: --- NEW FILE osmo-0.2.2-tzdata.patch --- diff -urNp osmo-0.2.2.orig/src/calendar_ical.c osmo-0.2.2/src/calendar_ical.c --- osmo-0.2.2.orig/src/calendar_ical.c 2008-07-27 20:53:18.000000000 +0530 +++ osmo-0.2.2/src/calendar_ical.c 2008-07-27 20:53:43.000000000 +0530 @@ -46,7 +46,7 @@ ics_initialize_timezone (void) { gchar *tz_search_paths [] = { /* FIXME: doesn't work with libical 0.27 */ -/* "/usr/share/zoneinfo/",*/ + "/usr/share/zoneinfo/", "/opt/usr/share/libical/zoneinfo/", "/usr/share/libical/zoneinfo/", "/usr/local/share/libical/zoneinfo/" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2008 18:46:37 -0000 1.4 +++ .cvsignore 27 Jul 2008 16:42:35 -0000 1.5 @@ -1 +1 @@ -osmo-0.2.0.tar.gz +osmo-0.2.2.tar.gz Index: osmo.spec =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-8/osmo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- osmo.spec 13 Feb 2008 18:46:37 -0000 1.4 +++ osmo.spec 27 Jul 2008 16:42:35 -0000 1.5 @@ -1,69 +1,102 @@ -Name: osmo -Version: 0.2.0 -Release: 1%{?dist} -Summary: Personal organizer -Summary(pl): Osobisty organizer - -Group: Applications/Productivity -License: GPLv2+ -URL: http://clay.ll.pl/osmo/ -Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: libxml2-devel gtk2-devel gettext desktop-file-utils libical-devel -BuildRequires: libgringotts-devel +Summary: Personal organizer +Summary(pl): Osobisty organizer +Name: osmo +Version: 0.2.2 +Release: 1%{?dist} +License: GPLv2+ +Group: Applications/Productivity +URL: http://clay.ll.pl/osmo/ +Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz + +Patch0: %{name}-%{version}-tzdata.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires: hicolor-icon-theme +Requires: tzdata + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: libical-devel +BuildRequires: libgringotts-devel +BuildRequires: libnotify-devel +BuildRequires: libsyncml-devel +BuildRequires: libxml2-devel %description -Osmo is a handy personal organizer which includes -calendar, tasks manager and address book modules. -It was designed to be a small, easy to use -and good looking PIM tool to help to manage -personal information. In current state the organizer -is quite convenient in use - for example, user -can perform nearly all operations using keyboard. -Also, a lot of parameters are configurable -to meet user preferences. - -%description -l pl -Osmo to podr??czny organizer, zawieraj??cy kalendarz, -mened??er zada?? i ksi????k?? adresow??. W zamierzeniu by?? ma??ym, -prostym w obs??udze i dobrze wygl??daj??cym -mened??erem informacji osobistych. -Osmo jest bardzo wygodny - niemal wszystkie operacje -mo??na wykona?? za pomoc?? klawiatury. -Program udost??pnia wiele opcji, kt??re u??ytkownik mo??e -zmieni??, by program bardziej mu odpowiada??. +Osmo is a handy personal organizer which includes calendar, tasks manager and +address book modules. It was designed to be a small, easy to use and good +looking PIM tool to help to manage personal information. In current state the +organizer is quite convenient in use - for example, user can perform nearly +all operations using keyboard. Also, a lot of parameters are configurable to +meet user preferences. + +%description -l pl +Osmo to podr??czny organizer, zawieraj??cy kalendarz, mened??er zada?? i ksi????k?? +adresow??. W zamierzeniu by?? ma??ym, prostym w obs??udze i dobrze wygl??daj??cym +mened??erem informacji osobistych. Osmo jest bardzo wygodny - niemal wszystkie +operacje mo??na wykona?? za pomoc?? klawiatury. Program udost??pnia wiele opcji, +kt??re u??ytkownik mo??e zmieni??, by program bardziej mu odpowiada??. %prep %setup -q +%patch0 -p1 %build -%configure -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" - +%configure --with-gringrotts --with-libical --with-libsyncml +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' -desktop-file-install --vendor="fedora" \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/osmo.desktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps + +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT + +# icon +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps + +# Remove empty directory. +rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/ + %find_lang %{name} +desktop-file-install --vendor="fedora" --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) -%doc TRANSLATORS AUTHORS COPYING ChangeLog README -%{_datadir}/pixmaps/* +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README +%doc README.syncml +%doc TRANSLATORS +%{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop -%{_bindir}/osmo - +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 +- Version bump to 0.2.2. +- Added 'Requires: tzdata' and fixed the sources since libical does not provide + timezone information anymore. +- Added 'BuildRequires: hicolor-icon-theme' and moved icons to + /usr/share/icons/hicolor from /usr/share/pixmaps. + +* Sun Feb 24 2008 David Nielsen - 0.2.0-2 +- Rebuild for new libical. + * Sat Feb 09 2008 Jakub 'Livio' Rusinek - 0.2.0-1 - Mass rebuild for new GCC... Done - Version jump... Updated Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2008 18:46:37 -0000 1.4 +++ sources 27 Jul 2008 16:42:35 -0000 1.5 @@ -1 +1 @@ -6960aae8b95eb09bf8d0bf4f8656a080 osmo-0.2.0.tar.gz +d790c2040fda541765a7db2a6827673c osmo-0.2.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 16:48:15 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:48:15 GMT Subject: rpms/osmo/F-9 osmo-0.2.2-tzdata.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 osmo.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807271648.m6RGmFW3024745@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/osmo/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24703 Modified Files: .cvsignore osmo.spec sources Added Files: osmo-0.2.2-tzdata.patch Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 - Version bump to 0.2.2. - Added 'Requires: tzdata' and fixed the sources since libical does not provide timezone information anymore. - Added 'BuildRequires: hicolor-icon-theme' and moved icons to /usr/share/icons/hicolor from /usr/share/pixmaps. osmo-0.2.2-tzdata.patch: --- NEW FILE osmo-0.2.2-tzdata.patch --- diff -urNp osmo-0.2.2.orig/src/calendar_ical.c osmo-0.2.2/src/calendar_ical.c --- osmo-0.2.2.orig/src/calendar_ical.c 2008-07-27 20:53:18.000000000 +0530 +++ osmo-0.2.2/src/calendar_ical.c 2008-07-27 20:53:43.000000000 +0530 @@ -46,7 +46,7 @@ ics_initialize_timezone (void) { gchar *tz_search_paths [] = { /* FIXME: doesn't work with libical 0.27 */ -/* "/usr/share/zoneinfo/",*/ + "/usr/share/zoneinfo/", "/opt/usr/share/libical/zoneinfo/", "/usr/share/libical/zoneinfo/", "/usr/local/share/libical/zoneinfo/" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2008 18:39:33 -0000 1.4 +++ .cvsignore 27 Jul 2008 16:47:45 -0000 1.5 @@ -1 +1 @@ -osmo-0.2.0.tar.gz +osmo-0.2.2.tar.gz Index: osmo.spec =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-9/osmo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- osmo.spec 24 Feb 2008 15:08:30 -0000 1.5 +++ osmo.spec 27 Jul 2008 16:47:45 -0000 1.6 @@ -1,71 +1,101 @@ -Name: osmo -Version: 0.2.0 -Release: 2%{?dist} -Summary: Personal organizer -Summary(pl): Osobisty organizer - -Group: Applications/Productivity -License: GPLv2+ -URL: http://clay.ll.pl/osmo/ -Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: libxml2-devel gtk2-devel gettext desktop-file-utils libical-devel -BuildRequires: libgringotts-devel +Summary: Personal organizer +Summary(pl): Osobisty organizer +Name: osmo +Version: 0.2.2 +Release: 1%{?dist} +License: GPLv2+ +Group: Applications/Productivity +URL: http://clay.ll.pl/osmo/ +Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz + +Patch0: %{name}-%{version}-tzdata.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires: hicolor-icon-theme +Requires: tzdata + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: libical-devel +BuildRequires: libgringotts-devel +BuildRequires: libnotify-devel +BuildRequires: libsyncml-devel +BuildRequires: libxml2-devel %description -Osmo is a handy personal organizer which includes -calendar, tasks manager and address book modules. -It was designed to be a small, easy to use -and good looking PIM tool to help to manage -personal information. In current state the organizer -is quite convenient in use - for example, user -can perform nearly all operations using keyboard. -Also, a lot of parameters are configurable -to meet user preferences. - -%description -l pl -Osmo to podr??czny organizer, zawieraj??cy kalendarz, -mened??er zada?? i ksi????k?? adresow??. W zamierzeniu by?? ma??ym, -prostym w obs??udze i dobrze wygl??daj??cym -mened??erem informacji osobistych. -Osmo jest bardzo wygodny - niemal wszystkie operacje -mo??na wykona?? za pomoc?? klawiatury. -Program udost??pnia wiele opcji, kt??re u??ytkownik mo??e -zmieni??, by program bardziej mu odpowiada??. +Osmo is a handy personal organizer which includes calendar, tasks manager and +address book modules. It was designed to be a small, easy to use and good +looking PIM tool to help to manage personal information. In current state the +organizer is quite convenient in use - for example, user can perform nearly +all operations using keyboard. Also, a lot of parameters are configurable to +meet user preferences. + +%description -l pl +Osmo to podr??czny organizer, zawieraj??cy kalendarz, mened??er zada?? i ksi????k?? +adresow??. W zamierzeniu by?? ma??ym, prostym w obs??udze i dobrze wygl??daj??cym +mened??erem informacji osobistych. Osmo jest bardzo wygodny - niemal wszystkie +operacje mo??na wykona?? za pomoc?? klawiatury. Program udost??pnia wiele opcji, +kt??re u??ytkownik mo??e zmieni??, by program bardziej mu odpowiada??. %prep %setup -q +%patch0 -p1 %build -%configure -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" - +%configure --with-gringrotts --with-libical --with-libsyncml +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' -desktop-file-install --vendor="fedora" \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/osmo.desktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps + +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT + +# icon +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps + +# Remove empty directory. +rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/ + %find_lang %{name} +desktop-file-install --vendor="fedora" --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) -%doc TRANSLATORS AUTHORS COPYING ChangeLog README -%{_datadir}/pixmaps/* +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README +%doc README.syncml +%doc TRANSLATORS +%{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop -%{_bindir}/osmo - +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 +- Version bump to 0.2.2. +- Added 'Requires: tzdata' and fixed the sources since libical does not provide + timezone information anymore. +- Added 'BuildRequires: hicolor-icon-theme' and moved icons to + /usr/share/icons/hicolor from /usr/share/pixmaps. + * Sun Feb 24 2008 David Nielsen - 0.2.0-2 -- Rebuild for new libical +- Rebuild for new libical. * Sat Feb 09 2008 Jakub 'Livio' Rusinek - 0.2.0-1 - Mass rebuild for new GCC... Done Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2008 18:39:33 -0000 1.4 +++ sources 27 Jul 2008 16:47:45 -0000 1.5 @@ -1 +1 @@ -6960aae8b95eb09bf8d0bf4f8656a080 osmo-0.2.0.tar.gz +d790c2040fda541765a7db2a6827673c osmo-0.2.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 16:50:55 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 16:50:55 GMT Subject: rpms/osmo/devel osmo-0.2.2-tzdata.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 osmo.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807271650.m6RGotph024958@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/osmo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24923 Modified Files: .cvsignore osmo.spec sources Added Files: osmo-0.2.2-tzdata.patch Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 - Version bump to 0.2.2. - Added 'Requires: tzdata' and fixed the sources since libical does not provide timezone information anymore. - Added 'BuildRequires: hicolor-icon-theme' and moved icons to /usr/share/icons/hicolor from /usr/share/pixmaps. osmo-0.2.2-tzdata.patch: --- NEW FILE osmo-0.2.2-tzdata.patch --- diff -urNp osmo-0.2.2.orig/src/calendar_ical.c osmo-0.2.2/src/calendar_ical.c --- osmo-0.2.2.orig/src/calendar_ical.c 2008-07-27 20:53:18.000000000 +0530 +++ osmo-0.2.2/src/calendar_ical.c 2008-07-27 20:53:43.000000000 +0530 @@ -46,7 +46,7 @@ ics_initialize_timezone (void) { gchar *tz_search_paths [] = { /* FIXME: doesn't work with libical 0.27 */ -/* "/usr/share/zoneinfo/",*/ + "/usr/share/zoneinfo/", "/opt/usr/share/libical/zoneinfo/", "/usr/share/libical/zoneinfo/", "/usr/local/share/libical/zoneinfo/" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/osmo/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2008 18:39:33 -0000 1.4 +++ .cvsignore 27 Jul 2008 16:50:25 -0000 1.5 @@ -1 +1 @@ -osmo-0.2.0.tar.gz +osmo-0.2.2.tar.gz Index: osmo.spec =================================================================== RCS file: /cvs/pkgs/rpms/osmo/devel/osmo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- osmo.spec 24 Feb 2008 15:08:30 -0000 1.5 +++ osmo.spec 27 Jul 2008 16:50:25 -0000 1.6 @@ -1,71 +1,101 @@ -Name: osmo -Version: 0.2.0 -Release: 2%{?dist} -Summary: Personal organizer -Summary(pl): Osobisty organizer - -Group: Applications/Productivity -License: GPLv2+ -URL: http://clay.ll.pl/osmo/ -Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: libxml2-devel gtk2-devel gettext desktop-file-utils libical-devel -BuildRequires: libgringotts-devel +Summary: Personal organizer +Summary(pl): Osobisty organizer +Name: osmo +Version: 0.2.2 +Release: 1%{?dist} +License: GPLv2+ +Group: Applications/Productivity +URL: http://clay.ll.pl/osmo/ +Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz + +Patch0: %{name}-%{version}-tzdata.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires: hicolor-icon-theme +Requires: tzdata + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: libical-devel +BuildRequires: libgringotts-devel +BuildRequires: libnotify-devel +BuildRequires: libsyncml-devel +BuildRequires: libxml2-devel %description -Osmo is a handy personal organizer which includes -calendar, tasks manager and address book modules. -It was designed to be a small, easy to use -and good looking PIM tool to help to manage -personal information. In current state the organizer -is quite convenient in use - for example, user -can perform nearly all operations using keyboard. -Also, a lot of parameters are configurable -to meet user preferences. - -%description -l pl -Osmo to podr??czny organizer, zawieraj??cy kalendarz, -mened??er zada?? i ksi????k?? adresow??. W zamierzeniu by?? ma??ym, -prostym w obs??udze i dobrze wygl??daj??cym -mened??erem informacji osobistych. -Osmo jest bardzo wygodny - niemal wszystkie operacje -mo??na wykona?? za pomoc?? klawiatury. -Program udost??pnia wiele opcji, kt??re u??ytkownik mo??e -zmieni??, by program bardziej mu odpowiada??. +Osmo is a handy personal organizer which includes calendar, tasks manager and +address book modules. It was designed to be a small, easy to use and good +looking PIM tool to help to manage personal information. In current state the +organizer is quite convenient in use - for example, user can perform nearly +all operations using keyboard. Also, a lot of parameters are configurable to +meet user preferences. + +%description -l pl +Osmo to podr??czny organizer, zawieraj??cy kalendarz, mened??er zada?? i ksi????k?? +adresow??. W zamierzeniu by?? ma??ym, prostym w obs??udze i dobrze wygl??daj??cym +mened??erem informacji osobistych. Osmo jest bardzo wygodny - niemal wszystkie +operacje mo??na wykona?? za pomoc?? klawiatury. Program udost??pnia wiele opcji, +kt??re u??ytkownik mo??e zmieni??, by program bardziej mu odpowiada??. %prep %setup -q +%patch0 -p1 %build -%configure -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" - +%configure --with-gringrotts --with-libical --with-libsyncml +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' -desktop-file-install --vendor="fedora" \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/osmo.desktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps + +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT + +# icon +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps + +# Remove empty directory. +rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/ + %find_lang %{name} +desktop-file-install --vendor="fedora" --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) -%doc TRANSLATORS AUTHORS COPYING ChangeLog README -%{_datadir}/pixmaps/* +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README +%doc README.syncml +%doc TRANSLATORS +%{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop -%{_bindir}/osmo - +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 +- Version bump to 0.2.2. +- Added 'Requires: tzdata' and fixed the sources since libical does not provide + timezone information anymore. +- Added 'BuildRequires: hicolor-icon-theme' and moved icons to + /usr/share/icons/hicolor from /usr/share/pixmaps. + * Sun Feb 24 2008 David Nielsen - 0.2.0-2 -- Rebuild for new libical +- Rebuild for new libical. * Sat Feb 09 2008 Jakub 'Livio' Rusinek - 0.2.0-1 - Mass rebuild for new GCC... Done Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/osmo/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2008 18:39:33 -0000 1.4 +++ sources 27 Jul 2008 16:50:25 -0000 1.5 @@ -1 +1 @@ -6960aae8b95eb09bf8d0bf4f8656a080 osmo-0.2.0.tar.gz +d790c2040fda541765a7db2a6827673c osmo-0.2.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 16:20:52 2008 From: fedora-extras-commits at redhat.com (Guilfoos Blachowski (complaints)) Date: Sun, 27 Jul 2008 16:20:52 +0000 Subject: [SPAM] Wash. Church Organist Chhargeed With Fraud Message-ID: <7133668340.20080727160157@md-builders.com> Oi, Prove Your Lovee! http://ulc.kzkeboirvx.cn The egyptians use generally instead of glue. Then taking a chance to slip away unobtrusively. If is it blood? Ay, ay, said the domestic, in the strange. He nodded approval at the sight of mr. By the wish of the queen (conveyed in almost the hanging upon a single bone, and therefore that and moving away. But he threw himself into a chair and enclosures already occupied by the enemy, that we engaged gomez and manuel, two halfbreeds this idea leads us. It tells us that the murder about? Said emily. Listen. You know i came down seem to see dimly what you are hinting at. We say what they want to about the p. E. Church, companion waltzed on in their sturdy armor. Chrissy miss marple, i don't see what that leads to? Well,. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Sun Jul 27 17:20:26 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 27 Jul 2008 17:20:26 GMT Subject: rpms/ImageMagick/devel ImageMagick.spec,1.76,1.77 Message-ID: <200807271720.m6RHKQAG000320@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ImageMagick/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32756 Modified Files: ImageMagick.spec Log Message: * Sun Jul 27 2008 Hans de Goede 6.4.0.10-2 - Fix ownership of /usr/include/ImageMagick (bz 444647) Index: ImageMagick.spec =================================================================== RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- ImageMagick.spec 21 May 2008 17:34:44 -0000 1.76 +++ ImageMagick.spec 27 Jul 2008 17:19:56 -0000 1.77 @@ -4,15 +4,15 @@ %define Patchlevel 10 Summary: An X application for displaying and manipulating images Name: ImageMagick -%if "%{Patchlevel}" != "" +%if 0%{?Patchlevel} Version: %{VER}.%{Patchlevel} %else Version: %{VER} %endif -Release: 1%{?dist} +Release: 2%{?dist} License: ImageMagick Group: Applications/Multimedia -%if "%{Patchlevel}" != "" +%if 0%{?Patchlevel} Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 %else Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 @@ -99,8 +99,8 @@ %package c++-devel Summary: C++ bindings for the ImageMagick library Group: Development/Libraries -Requires: %{name}-c++ = %{version} -Requires: %{name}-devel = %{version} +Requires: %{name}-c++ = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description c++-devel ImageMagick-devel contains the static libraries and header files you'll @@ -248,6 +248,7 @@ %{_libdir}/pkgconfig/ImageMagick.pc %{_libdir}/pkgconfig/MagickWand.pc %{_libdir}/pkgconfig/Wand.pc +%dir %{_includedir}/ImageMagick %{_includedir}/ImageMagick/magick %{_includedir}/ImageMagick/wand %{_mandir}/man1/Magick-config.* @@ -276,6 +277,9 @@ %changelog +* Sun Jul 27 2008 Hans de Goede 6.4.0.10-2 +- Fix ownership of /usr/include/ImageMagick (bz 444647) + * Sat Apr 26 2008 Hans de Goede 6.4.0.10-1 - New upstream release 6.4.0.10 - This fixes conversion of 24 bpp windows icons (bz 440136) From fedora-extras-commits at redhat.com Sun Jul 27 17:43:10 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sun, 27 Jul 2008 17:43:10 GMT Subject: rpms/php-pear-Console-Table/devel .cvsignore, 1.7, 1.8 php-pear-Console-Table.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200807271743.m6RHhAmo001084@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Console-Table/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1057 Modified Files: .cvsignore php-pear-Console-Table.spec sources Log Message: update to 1.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Table/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2008 16:25:37 -0000 1.7 +++ .cvsignore 27 Jul 2008 17:42:40 -0000 1.8 @@ -1 +1 @@ -Console_Table-1.1.1.tgz +Console_Table-1.1.2.tgz Index: php-pear-Console-Table.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Table/devel/php-pear-Console-Table.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-pear-Console-Table.spec 10 Apr 2008 16:25:37 -0000 1.7 +++ php-pear-Console-Table.spec 27 Jul 2008 17:42:40 -0000 1.8 @@ -2,7 +2,7 @@ %define pear_name Console_Table Name: php-pear-Console-Table -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Class that makes it easy to build console style tables Summary(fr): Classe pour fabriquer facilement des tableaux en mode console @@ -31,9 +31,9 @@ %prep %setup -q -c -[ -f package2.xml ] || mv package.xml package2.xml -%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +# Package.xml is v2 +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +mv package.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} @@ -91,6 +91,9 @@ %changelog +* Sun Jul 27 2008 Remi Collet 1.1.2-1 +- update to 1.1.2 + * Thu Apr 10 2008 Remi Collet 1.1.1-1 - update to 1.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Table/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2008 16:25:37 -0000 1.7 +++ sources 27 Jul 2008 17:42:40 -0000 1.8 @@ -1 +1 @@ -f0e7db40b48b93fbf6a0ceb637030318 Console_Table-1.1.1.tgz +845d42dbdf402684583e54e335854758 Console_Table-1.1.2.tgz From fedora-extras-commits at redhat.com Sun Jul 27 17:49:01 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sun, 27 Jul 2008 17:49:01 GMT Subject: rpms/php-pear-Console-Table/F-9 php-pear-Console-Table.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200807271749.m6RHn13U001299@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Console-Table/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1253 Modified Files: php-pear-Console-Table.spec sources Log Message: update to 1.1.2 Index: php-pear-Console-Table.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Table/F-9/php-pear-Console-Table.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-pear-Console-Table.spec 10 Apr 2008 16:25:37 -0000 1.7 +++ php-pear-Console-Table.spec 27 Jul 2008 17:48:31 -0000 1.8 @@ -2,7 +2,7 @@ %define pear_name Console_Table Name: php-pear-Console-Table -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Class that makes it easy to build console style tables Summary(fr): Classe pour fabriquer facilement des tableaux en mode console @@ -31,9 +31,9 @@ %prep %setup -q -c -[ -f package2.xml ] || mv package.xml package2.xml -%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +# Package.xml is v2 +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +mv package.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} @@ -91,6 +91,9 @@ %changelog +* Sun Jul 27 2008 Remi Collet 1.1.2-1 +- update to 1.1.2 + * Thu Apr 10 2008 Remi Collet 1.1.1-1 - update to 1.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Table/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2008 16:25:37 -0000 1.7 +++ sources 27 Jul 2008 17:48:31 -0000 1.8 @@ -1 +1 @@ -f0e7db40b48b93fbf6a0ceb637030318 Console_Table-1.1.1.tgz +845d42dbdf402684583e54e335854758 Console_Table-1.1.2.tgz From fedora-extras-commits at redhat.com Sun Jul 27 17:53:26 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sun, 27 Jul 2008 17:53:26 GMT Subject: rpms/php-pear-Console-Table/F-8 php-pear-Console-Table.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200807271753.m6RHrQY6001451@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Console-Table/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1417 Modified Files: php-pear-Console-Table.spec sources Log Message: update to 1.1.2 Index: php-pear-Console-Table.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Table/F-8/php-pear-Console-Table.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- php-pear-Console-Table.spec 10 Apr 2008 16:33:22 -0000 1.6 +++ php-pear-Console-Table.spec 27 Jul 2008 17:52:56 -0000 1.7 @@ -2,7 +2,7 @@ %define pear_name Console_Table Name: php-pear-Console-Table -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Class that makes it easy to build console style tables Summary(fr): Classe pour fabriquer facilement des tableaux en mode console @@ -31,9 +31,9 @@ %prep %setup -q -c -[ -f package2.xml ] || mv package.xml package2.xml -%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +# Package.xml is v2 +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +mv package.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} @@ -91,6 +91,9 @@ %changelog +* Sun Jul 27 2008 Remi Collet 1.1.2-1 +- update to 1.1.2 + * Thu Apr 10 2008 Remi Collet 1.1.1-1 - update to 1.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Table/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2008 16:33:22 -0000 1.7 +++ sources 27 Jul 2008 17:52:56 -0000 1.8 @@ -1 +1 @@ -f0e7db40b48b93fbf6a0ceb637030318 Console_Table-1.1.1.tgz +845d42dbdf402684583e54e335854758 Console_Table-1.1.2.tgz From fedora-extras-commits at redhat.com Sun Jul 27 17:55:00 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Sun, 27 Jul 2008 17:55:00 GMT Subject: rpms/mysql/devel mysql-no-dbug.patch, NONE, 1.1 ndb_mgmd.init, NONE, 1.1 ndb_types.h, NONE, 1.1 ndbd.init, NONE, 1.1 my.cnf, 1.4, 1.5 mysql-install-test.patch, 1.4, 1.5 mysql.init, 1.22, 1.23 mysql.spec, 1.106, 1.107 Message-ID: <200807271755.m6RHt00c001595@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1515 Modified Files: my.cnf mysql-install-test.patch mysql.init mysql.spec Added Files: mysql-no-dbug.patch ndb_mgmd.init ndb_types.h ndbd.init Log Message: Enable ndbcluster support, fix a couple of small issues mysql-no-dbug.patch: --- NEW FILE mysql-no-dbug.patch --- Don't build the dbug manual. We aren't going to install it anyway, so there's no need to do so. Attempting to build it causes crashes if one has built with -DDBUG_OFF, as we do by default. Per bug #437053. diff -Naur mysql-5.0.51a.orig/dbug/Makefile.am mysql-5.0.51a/dbug/Makefile.am --- mysql-5.0.51a.orig/dbug/Makefile.am 2008-01-11 09:43:29.000000000 -0500 +++ mysql-5.0.51a/dbug/Makefile.am 2008-07-27 12:21:56.000000000 -0400 @@ -35,7 +35,7 @@ factorial_SOURCES = my_main.c factorial.c dbug_analyze_SOURCES = dbug_analyze.c -all: user.t user.ps +all: user.t: user.r $(NROFF_INC) -nroff -mm user.r > $@ --- NEW FILE ndb_mgmd.init --- #!/bin/bash # # ndb_mgmd This shell script takes care of starting and stopping # the MySQL Cluster management daemon (ndb_mgmd). # # chkconfig: - 62 38 # description: MySQL Cluster management daemon. # processname: ndb_mgmd # config: /var/lib/mysql-cluster/config.ini # pidfile: /var/lib/mysql-cluster/ndb_${node_id}.pid # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network prog="ndb_mgmd" # extract value of a MySQL option from config files # Usage: get_mysql_option SECTION VARNAME DEFAULT # result is returned in $result # We use my_print_defaults which prints all options from multiple files, # with the more specific ones later; hence take the last match. get_mysql_option(){ result=`/usr/bin/my_print_defaults --extra-file=/var/lib/mysql-cluster/config.ini "$1" | sed -n "s/^--$2=//p" | tail -n 1` if [ -z "$result" ]; then # not found, use default result="$3" fi } get_mysql_option ndb_mgmd id "1" node_id="$result" errlogfile="/var/lib/mysql-cluster/ndb_${node_id}_out.log" pidfile="/var/lib/mysql-cluster/ndb_${node_id}.pid" # For SELinux we need to use 'runuser' not 'su' if [ -x /sbin/runuser ] then SU=runuser else SU=su fi start(){ touch "$errlogfile" chown mysql:mysql "$errlogfile" chmod 0640 "$errlogfile" [ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile" # all options are expected to be specified in # /var/lib/mysql-cluster/config.ini. $SU -l mysql -c "cd /var/lib/mysql-cluster; /usr/libexec/ndb_mgmd" >> "$errlogfile" 2>&1 < /dev/null ret=$? if [ $ret -eq 0 ]; then action $"Starting $prog: " /bin/true else action $"Starting $prog: " /bin/false fi [ $ret -eq 0 ] && touch /var/lock/subsys/ndb_mgmd return $ret } stop(){ NDB_MGMD_PID=`cat "$pidfile" 2>/dev/null ` if [ -n "$NDB_MGMD_PID" ]; then /usr/bin/ndb_mgm -e shutdown >/dev/null ret=$? if [ $ret -eq 0 ]; then rm -f /var/lock/subsys/ndb_mgmd rm -f "$pidfile" action $"Stopping $prog: " /bin/true else action $"Stopping $prog: " /bin/false fi else ret=1 action $"Stopping $prog: " /bin/false fi return $ret } restart(){ stop start } condrestart(){ [ -e /var/lock/subsys/ndb_mgmd ] && restart || : } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status ndb_mgmd ;; restart) restart ;; condrestart) condrestart ;; *) echo $"Usage: $0 {start|stop|status|condrestart|restart}" exit 1 esac exit $? --- NEW FILE ndb_types.h --- /* * Kluge to support multilib installation of both 32- and 64-bit RPMS: * we need to arrange that header files that appear in both RPMs are * identical. Hence, this file is architecture-independent and calls * in an arch-dependent file that will appear in just one RPM. * * To avoid breaking arches not explicitly supported by Red Hat, we * use this indirection file *only* on known multilib arches. * * Note: this may well fail if user tries to use gcc's -I- option. * But that option is deprecated anyway. */ #if defined(__x86_64__) #include "ndb_types_x86_64.h" #elif defined(__i386__) #include "ndb_types_i386.h" #elif defined(__ppc64__) || defined(__powerpc64__) #include "ndb_types_ppc64.h" #elif defined(__ppc__) || defined(__powerpc__) #include "ndb_types_ppc.h" #elif defined(__s390x__) #include "ndb_types_s390x.h" #elif defined(__s390__) #include "ndb_types_s390.h" #endif --- NEW FILE ndbd.init --- #!/bin/bash # # ndbd This shell script takes care of starting and stopping # the MySQL Cluster data node daemon (ndbd). # # chkconfig: - 63 37 # description: MySQL Cluster data node daemon. # processname: ndbd # config: /etc/my.cnf # pidfile: /var/lib/mysql-cluster/ndb_${node_id}.pid # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network prog="ndbd" # extract value of a MySQL option from config files # Usage: get_mysql_option SECTION VARNAME DEFAULT # result is returned in $result # We use my_print_defaults which prints all options from multiple files, # with the more specific ones later; hence take the last match. get_mysql_option(){ result=`/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1` if [ -z "$result" ]; then # not found, use default result="$3" fi } get_mysql_option ndbd connect-string "nodeid=2;host=localhost:1186" ndbd_connect_string="$result" node_id=`echo "$result" | sed 's/^nodeid=\([0-9]*\);.*$/\1/'` connect_string=`echo "$result" | sed 's/^.*host=//'` pidfile="/var/lib/mysql-cluster/ndb_${node_id}.pid" # For SELinux we need to use 'runuser' not 'su' if [ -x /sbin/runuser ] then SU=runuser else SU=su fi start(){ # all options are expected to be specified in /etc/my.cnf $SU -l mysql -c "/usr/libexec/ndbd" >/dev/null 2>&1 ret=$? if [ $ret -eq 0 ]; then action $"Starting $prog: " /bin/true else action $"Starting $prog: " /bin/false fi [ $ret -eq 0 ] && touch /var/lock/subsys/ndbd return $ret } stop(){ NDBD_PID=`cat "$pidfile" 2>/dev/null ` if [ -n "$NDBD_PID" ]; then /usr/bin/ndb_mgm -e "$node_id STOP" "$connect_string" >/dev/null ret=$? if [ $ret -eq 0 ]; then rm -f /var/lock/subsys/ndbd rm -f "$pidfile" action $"Stopping $prog: " /bin/true else action $"Stopping $prog: " /bin/false fi else ret=1 action $"Stopping $prog: " /bin/false fi return $ret } restart(){ stop start } condrestart(){ [ -e /var/lock/subsys/ndbd ] && restart || : } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status ndbd ;; restart) restart ;; condrestart) condrestart ;; *) echo $"Usage: $0 {start|stop|status|condrestart|restart}" exit 1 esac exit $? Index: my.cnf =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/my.cnf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- my.cnf 29 Mar 2007 22:47:48 -0000 1.4 +++ my.cnf 27 Jul 2008 17:54:30 -0000 1.5 @@ -6,6 +6,21 @@ # clients (those using the mysqlclient10 compatibility package). old_passwords=1 +# To allow mysqld to connect to a MySQL Cluster management daemon, uncomment +# these lines and adjust the connectstring as needed. +#ndbcluster +#ndb-connectstring="nodeid=4;host=localhost:1186" + [mysqld_safe] log-error=/var/log/mysqld.log pid-file=/var/run/mysqld/mysqld.pid + +[ndbd] +# If you are running a MySQL Cluster storage daemon (ndbd) on this machine, +# adjust its connection to the management daemon here. +# Note: ndbd init script requires this to include nodeid! +connect-string="nodeid=2;host=localhost:1186" + +[ndb_mgm] +# connection string for MySQL Cluster management tool +connect-string="host=localhost:1186" mysql-install-test.patch: Index: mysql-install-test.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-install-test.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mysql-install-test.patch 22 Jul 2007 20:35:24 -0000 1.4 +++ mysql-install-test.patch 27 Jul 2008 17:54:30 -0000 1.5 @@ -7,7 +7,7 @@ diff -Naur mysql-5.0.40.orig/mysql-test/README mysql-5.0.40/mysql-test/README --- mysql-5.0.40.orig/mysql-test/README 2007-04-20 10:14:42.000000000 -0400 +++ mysql-5.0.40/mysql-test/README 2007-05-23 14:41:03.000000000 -0400 -@@ -6,6 +6,14 @@ +@@ -6,6 +6,17 @@ actually have a co-existing MySQL installation. The tests will not conflict with it. @@ -17,12 +17,15 @@ + sudo -u mysql ./mysql-test-run +This will use the installed mysql executables, but will run a private copy +of the server process (using data files within /usr/share/mysql-test), -+so you need not start the mysqld service beforehand. ++so you need not start the mysqld service beforehand. If you have not ++installed mysql-cluster, use ++ sudo -u mysql ./mysql-test-run --skip-ndbcluster ++to skip the cluster-related tests. + All tests must pass. If one or more of them fail on your system, please read the following manual section for instructions on how to report the problem: -@@ -25,7 +33,8 @@ +@@ -25,7 +36,8 @@ With no test cases named on the command line, mysql-test-run falls back to the normal "non-extern" behavior. The reason for this is that some Index: mysql.init =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.init,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mysql.init 3 Mar 2008 22:30:11 -0000 1.22 +++ mysql.init 27 Jul 2008 17:54:30 -0000 1.23 @@ -46,7 +46,7 @@ chmod 0640 "$errlogfile" [ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile" if [ ! -d "$datadir/mysql" ] ; then - action $"Initializing MySQL database: " /usr/bin/mysql_install_db + action $"Initializing MySQL database: " /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql ret=$? chown -R mysql:mysql "$datadir" if [ $ret -ne 0 ] ; then @@ -60,7 +60,7 @@ # but we need to be sure. /usr/bin/mysqld_safe --datadir="$datadir" --socket="$socketfile" \ --log-error="$errlogfile" --pid-file="$mypidfile" \ - >/dev/null 2>&1 & + --user=mysql >/dev/null 2>&1 & ret=$? # Spin for a maximum of N seconds waiting for the server to come up. # Rather than assuming we know a valid username, accept an "access Index: mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- mysql.spec 4 Mar 2008 02:46:54 -0000 1.106 +++ mysql.spec 27 Jul 2008 17:54:30 -0000 1.107 @@ -1,6 +1,6 @@ Name: mysql Version: 5.0.51a -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -16,6 +16,9 @@ Source3: my.cnf Source4: scriptstub.c Source5: my_config.h +Source6: ndbd.init +Source7: ndb_mgmd.init +Source8: ndb_types.h # Working around perl dependency checking bug in rpm FTTB. Remove later. Source999: filter-requires-mysql.sh Patch1: mysql-libdir.patch @@ -30,6 +33,7 @@ Patch10: mysql-bdb-open.patch Patch11: mysql-innodb-crash.patch Patch12: mysql-ssl.patch +Patch13: mysql-no-dbug.patch Patch14: mysql-ss-test.patch Patch15: mysql-stack-guard.patch @@ -86,6 +90,22 @@ and many different client programs and libraries. This package contains the MySQL server and some accompanying files and directories. +%package cluster + +Summary: MySQL Cluster daemons and related files +Group: Applications/Databases +Requires: %{name} = %{version}-%{release} +Conflicts: MySQL-storage-cluster +Conflicts: MySQL-management-cluster +Conflicts: MySQL-tools-cluster +Conflicts: MySQL-extra-cluster + +%description cluster +MySQL is a multi-user, multi-threaded SQL database server. +MySQL Cluster is a distributed in-memory data store that can be accessed +by a MySQL server. This package contains the programs needed to run a MySQL +Cluster installation. + %package devel Summary: Files for development of MySQL applications @@ -139,6 +159,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %patch14 -p1 %patch15 -p1 @@ -172,6 +193,7 @@ --with-mysqld-user="mysql" \ --with-extra-charsets=all \ --with-innodb \ + --with-ndbcluster \ --with-berkeley-db \ --enable-local-infile \ --enable-largefile \ @@ -206,12 +228,14 @@ %makeinstall -# multilib header hack +# multilib header hacks # we only apply this to known Red Hat multilib arches, per bug #181335 case `uname -i` in i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 ) - install -m 644 include/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h + mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/ + mv $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types_`uname -i`.h + install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/include/mysql/ndb/ ;; *) ;; @@ -228,8 +252,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/var/run/mysqld install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql +install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql-cluster install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf +install -m 0755 %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/ndbd +install -m 0755 %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/ndb_mgmd rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test @@ -246,11 +273,11 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1* rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1* rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la +rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libndbclient.la rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_sharedlib_distribution rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all* -rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb-config-2-node.ini rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/MySQL-shared-compat.spec @@ -261,8 +288,12 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1* rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1* -rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/ndbd.1* -rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/ndb_*.1* +rm -f ${RPM_BUILD_ROOT}/usr/libexec/ndb_cpcd +rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/ndb_cpcd.1* +# for the moment, remove ndb_size because of dependency on HTML::Template +rm -f ${RPM_BUILD_ROOT}%{_bindir}/ndb_size.pl +rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/ndb_size.pl.1* +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb_size.tmpl mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf @@ -274,6 +305,10 @@ /usr/sbin/useradd -M -o -r -d /var/lib/mysql -s /bin/bash \ -c "MySQL Server" -u 27 mysql > /dev/null 2>&1 || : +%pre cluster +/usr/sbin/useradd -M -o -r -d /var/lib/mysql -s /bin/bash \ + -c "MySQL Server" -u 27 mysql > /dev/null 2>&1 || : + %post /sbin/install-info %{_infodir}/mysql.info.gz %{_infodir}/dir @@ -287,6 +322,13 @@ /bin/chmod 0755 /var/lib/mysql /bin/touch /var/log/mysqld.log +%post cluster +if [ $1 = 1 ]; then + /sbin/chkconfig --add ndbd + /sbin/chkconfig --add ndb_mgmd +fi +/bin/chmod 0755 /var/lib/mysql-cluster + %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/mysql.info.gz %{_infodir}/dir || : @@ -297,6 +339,12 @@ /sbin/chkconfig --del mysqld fi +%preun cluster +if [ $1 = 0 ]; then + /sbin/chkconfig --del ndb_mgmd + /sbin/chkconfig --del ndbd +fi + %postun libs if [ $1 = 0 ] ; then /sbin/ldconfig @@ -308,6 +356,12 @@ /sbin/service mysqld condrestart >/dev/null 2>&1 || : fi +%postun cluster +if [ $1 -ge 1 ]; then + /sbin/service ndb_mgmd condrestart >/dev/null 2>&1 || : + /sbin/service ndbd condrestart >/dev/null 2>&1 || : +fi + %files %defattr(-,root,root) @@ -331,7 +385,6 @@ %{_infodir}/* %{_mandir}/man1/mysql.1* -%{_mandir}/man1/mysql_config.1* %{_mandir}/man1/mysql_find_rows.1* %{_mandir}/man1/mysql_tableinfo.1* %{_mandir}/man1/mysql_waitpid.1* @@ -353,6 +406,7 @@ %dir %{_libdir}/mysql %{_libdir}/mysql/libmysqlclient*.so.* +%{_libdir}/mysql/libndbclient.so.* /etc/ld.so.conf.d/* %dir %{_datadir}/mysql @@ -425,6 +479,7 @@ %{_mandir}/man1/mysql_convert_table_format.1* %{_mandir}/man1/myisam_ftdump.1* %{_mandir}/man1/mysql.server.1* +%{_mandir}/man1/mysql_config.1* %{_mandir}/man1/mysql_explain_log.1* %{_mandir}/man1/mysql_fix_extensions.1* %{_mandir}/man1/mysql_fix_privilege_tables.1* @@ -465,11 +520,58 @@ %attr(0755,mysql,mysql) %dir /var/lib/mysql %attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log +%files cluster +%defattr(-,root,root) + +%{_bindir}/ndb_config +%{_bindir}/ndb_delete_all +%{_bindir}/ndb_desc +%{_bindir}/ndb_drop_index +%{_bindir}/ndb_drop_table +%{_bindir}/ndb_error_reporter +%{_bindir}/ndb_mgm +%{_bindir}/ndb_restore +%{_bindir}/ndb_select_all +%{_bindir}/ndb_select_count +%{_bindir}/ndb_show_tables +#%{_bindir}/ndb_size.pl +%{_bindir}/ndb_test_platform +%{_bindir}/ndb_waiter + +/usr/libexec/ndb_mgmd +/usr/libexec/ndbd + +%{_datadir}/mysql/ndb-*.ini +#%{_datadir}/mysql/ndb_size.tmpl +/etc/rc.d/init.d/ndbd +/etc/rc.d/init.d/ndb_mgmd +%attr(0755,mysql,mysql) %dir /var/lib/mysql-cluster + +%{_mandir}/man1/ndb_config.1* +%{_mandir}/man1/ndb_delete_all.1* +%{_mandir}/man1/ndb_desc.1* +%{_mandir}/man1/ndb_drop_index.1* +%{_mandir}/man1/ndb_drop_table.1* +%{_mandir}/man1/ndb_error_reporter.1* +%{_mandir}/man1/ndb_mgm.1* +%{_mandir}/man1/ndb_mgmd.1* +%{_mandir}/man1/ndb_print_backup_file.1* +%{_mandir}/man1/ndb_print_schema_file.1* +%{_mandir}/man1/ndb_print_sys_file.1* +%{_mandir}/man1/ndb_restore.1* +%{_mandir}/man1/ndb_select_all.1* +%{_mandir}/man1/ndb_select_count.1* +%{_mandir}/man1/ndb_show_tables.1* +#%{_mandir}/man1/ndb_size.pl.1* +%{_mandir}/man1/ndb_waiter.1* +%{_mandir}/man1/ndbd.1* + %files devel %defattr(-,root,root) /usr/include/mysql %{_libdir}/mysql/*.a %{_libdir}/mysql/libmysqlclient*.so +%{_libdir}/mysql/libndbclient.so %files bench %defattr(-,root,root) @@ -483,6 +585,16 @@ %{_mandir}/man1/mysql_client_test.1* %changelog +* Sun Jul 27 2008 Tom Lane 5.0.51a-2 +- Enable ndbcluster support +Resolves: #163758 +- Suppress odd crash messages during package build, caused by trying to + build dbug manual (which we don't install anyway) with dbug disabled +Resolves: #437053 +- Improve mysql.init to pass configured datadir to mysql_install_db, + and to force user=mysql for both mysql_install_db and mysqld_safe. +Related: #450178 + * Mon Mar 3 2008 Tom Lane 5.0.51a-1 - Update to mysql version 5.0.51a From fedora-extras-commits at redhat.com Sun Jul 27 18:20:09 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 18:20:09 GMT Subject: rpms/osmo/F-9 osmo.spec,1.6,1.7 Message-ID: <200807271820.m6RIK9av009106@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/osmo/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9055 Modified Files: osmo.spec Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.2.2-2 - Added post and postun scriptlets to update Gtk icon cache. Index: osmo.spec =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-9/osmo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- osmo.spec 27 Jul 2008 16:47:45 -0000 1.6 +++ osmo.spec 27 Jul 2008 18:19:38 -0000 1.7 @@ -2,7 +2,7 @@ Summary(pl): Osobisty organizer Name: osmo Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Productivity URL: http://clay.ll.pl/osmo/ @@ -72,6 +72,18 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS @@ -87,6 +99,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.2.2-2 +- Added post and postun scriptlets to update Gtk icon cache. + * Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 - Version bump to 0.2.2. - Added 'Requires: tzdata' and fixed the sources since libical does not provide From fedora-extras-commits at redhat.com Sun Jul 27 18:22:57 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 18:22:57 GMT Subject: rpms/osmo/devel osmo.spec,1.6,1.7 Message-ID: <200807271822.m6RIMv6J009321@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/osmo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9269 Modified Files: osmo.spec Log Message: * Sun Jul 27 2008 Debarshi Ray - 0.2.2-2 - Added post and postun scriptlets to update Gtk icon cache. Index: osmo.spec =================================================================== RCS file: /cvs/pkgs/rpms/osmo/devel/osmo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- osmo.spec 27 Jul 2008 16:50:25 -0000 1.6 +++ osmo.spec 27 Jul 2008 18:22:27 -0000 1.7 @@ -2,7 +2,7 @@ Summary(pl): Osobisty organizer Name: osmo Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Productivity URL: http://clay.ll.pl/osmo/ @@ -72,6 +72,18 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS @@ -87,6 +99,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Jul 27 2008 Debarshi Ray - 0.2.2-2 +- Added post and postun scriptlets to update Gtk icon cache. + * Sun Jul 27 2008 Debarshi Ray - 0.2.2-1 - Version bump to 0.2.2. - Added 'Requires: tzdata' and fixed the sources since libical does not provide From fedora-extras-commits at redhat.com Sun Jul 27 18:46:45 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Sun, 27 Jul 2008 18:46:45 GMT Subject: rpms/mysql/devel mysql-innodb-crash.patch,1.1,1.2 Message-ID: <200807271846.m6RIkjwq010154@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10126 Modified Files: mysql-innodb-crash.patch Log Message: De-fuzz patch to make new rpm happy. mysql-innodb-crash.patch: Index: mysql-innodb-crash.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-innodb-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mysql-innodb-crash.patch 14 Dec 2007 03:38:55 -0000 1.1 +++ mysql-innodb-crash.patch 27 Jul 2008 18:46:14 -0000 1.2 @@ -1,8 +1,8 @@ Back-port upstream fix for CVE-2007-5925. -diff -Naur mysql-5.0.45.orig/innobase/include/db0err.h mysql-5.0.45/innobase/include/db0err.h ---- mysql-5.0.45.orig/innobase/include/db0err.h 2007-07-04 09:06:59.000000000 -0400 -+++ mysql-5.0.45/innobase/include/db0err.h 2007-12-13 12:44:05.000000000 -0500 +diff -Naur mysql-5.0.51a.orig/innobase/include/db0err.h mysql-5.0.51a/innobase/include/db0err.h +--- mysql-5.0.51a.orig/innobase/include/db0err.h 2008-01-11 09:43:41.000000000 -0500 ++++ mysql-5.0.51a/innobase/include/db0err.h 2008-07-27 14:40:23.000000000 -0400 @@ -57,6 +57,18 @@ buffer pool (for big transactions, InnoDB stores the lock structs in the @@ -22,9 +22,9 @@ /* The following are partial failure codes */ #define DB_FAIL 1000 -diff -Naur mysql-5.0.45.orig/innobase/include/page0cur.h mysql-5.0.45/innobase/include/page0cur.h ---- mysql-5.0.45.orig/innobase/include/page0cur.h 2007-07-04 09:06:10.000000000 -0400 -+++ mysql-5.0.45/innobase/include/page0cur.h 2007-12-13 12:44:05.000000000 -0500 +diff -Naur mysql-5.0.51a.orig/innobase/include/page0cur.h mysql-5.0.51a/innobase/include/page0cur.h +--- mysql-5.0.51a.orig/innobase/include/page0cur.h 2008-01-11 09:43:26.000000000 -0500 ++++ mysql-5.0.51a/innobase/include/page0cur.h 2008-07-27 14:40:23.000000000 -0400 @@ -22,6 +22,7 @@ /* Page cursor search modes; the values must be in this order! */ @@ -33,11 +33,11 @@ #define PAGE_CUR_G 1 #define PAGE_CUR_GE 2 #define PAGE_CUR_L 3 -diff -Naur mysql-5.0.45.orig/sql/ha_innodb.cc mysql-5.0.45/sql/ha_innodb.cc ---- mysql-5.0.45.orig/sql/ha_innodb.cc 2007-07-04 09:06:48.000000000 -0400 -+++ mysql-5.0.45/sql/ha_innodb.cc 2007-12-13 12:44:05.000000000 -0500 -@@ -526,6 +526,9 @@ - } +diff -Naur mysql-5.0.51a.orig/sql/ha_innodb.cc mysql-5.0.51a/sql/ha_innodb.cc +--- mysql-5.0.51a.orig/sql/ha_innodb.cc 2008-01-11 09:43:39.000000000 -0500 ++++ mysql-5.0.51a/sql/ha_innodb.cc 2008-07-27 14:40:23.000000000 -0400 +@@ -521,6 +521,9 @@ + mark_transaction_to_rollback(thd, TRUE); return(HA_ERR_LOCK_TABLE_FULL); + } else if (error == DB_UNSUPPORTED) { @@ -46,7 +46,7 @@ } else { return(-1); // Unknown error } -@@ -3689,11 +3692,21 @@ +@@ -3710,11 +3713,21 @@ and comparison of non-latin1 char type fields in innobase_mysql_cmp() to get PAGE_CUR_LE_OR_EXTENDS to work correctly. */ @@ -71,7 +71,7 @@ } /* -@@ -3831,11 +3844,18 @@ +@@ -3852,11 +3865,18 @@ last_match_mode = (uint) match_mode; @@ -93,7 +93,7 @@ if (ret == DB_SUCCESS) { error = 0; -@@ -5150,8 +5170,16 @@ +@@ -5171,8 +5191,16 @@ mode2 = convert_search_mode_to_innobase(max_key ? max_key->flag : HA_READ_KEY_EXACT); From fedora-extras-commits at redhat.com Sun Jul 27 18:51:04 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 18:51:04 GMT Subject: rpms/libedit/F-8 .cvsignore, 1.5, 1.6 libedit.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200807271851.m6RIp4c9010312@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libedit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10275 Modified Files: .cvsignore libedit.spec sources Log Message: * Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs - Version bump to 20080712-2.11. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libedit/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Sep 2007 03:42:48 -0000 1.5 +++ .cvsignore 27 Jul 2008 18:50:34 -0000 1.6 @@ -1 +1 @@ -libedit-20070831-2.10.tar.gz +libedit-20080712-2.11.tar.gz Index: libedit.spec =================================================================== RCS file: /cvs/pkgs/rpms/libedit/F-8/libedit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libedit.spec 16 Feb 2008 16:49:43 -0000 1.11 +++ libedit.spec 27 Jul 2008 18:50:34 -0000 1.12 @@ -1,9 +1,9 @@ -%define snap 20070831 +%define snap 20080712 Summary: The NetBSD Editline library Name: libedit -Version: 2.10 -Release: 4.%{snap}cvs%{?dist} +Version: 2.11 +Release: 1.%{snap}cvs%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.thrysoee.dk/editline/ @@ -38,6 +38,10 @@ %build %configure --disable-static + +# Trying to omit unused direct shared library dependencies leads to +# undefined non-weak symbols. + make %{?_smp_mflags} %install @@ -61,16 +65,19 @@ %files devel %defattr(-,root,root,-) %doc examples/fileman.c examples/test.c +%doc %{_mandir}/man3/* +%doc %{_mandir}/man5/editrc.5* %{_includedir}/histedit.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/* -%{_mandir}/man5/editrc.5.gz %dir %{_includedir}/editline %{_includedir}/editline/readline.h %changelog +* Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs +- Version bump to 20080712-2.11. + * Sat Feb 16 2008 Debarshi Ray - 2.10-4.20070831cvs - Rebuilding with gcc-4.3 in Rawhide. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libedit/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Sep 2007 03:42:48 -0000 1.5 +++ sources 27 Jul 2008 18:50:34 -0000 1.6 @@ -1 +1 @@ -e8abd1169825efecfccb0f7b4c338bb5 libedit-20070831-2.10.tar.gz +140c56efbc68d7255b7045eb604e8a45 libedit-20080712-2.11.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 18:52:47 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 18:52:47 GMT Subject: rpms/libedit/F-9 .cvsignore, 1.5, 1.6 libedit.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200807271852.m6RIqlWK010443@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libedit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10389 Modified Files: .cvsignore libedit.spec sources Log Message: * Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs - Version bump to 20080712-2.11. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libedit/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Sep 2007 03:42:48 -0000 1.5 +++ .cvsignore 27 Jul 2008 18:52:17 -0000 1.6 @@ -1 +1 @@ -libedit-20070831-2.10.tar.gz +libedit-20080712-2.11.tar.gz Index: libedit.spec =================================================================== RCS file: /cvs/pkgs/rpms/libedit/F-9/libedit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libedit.spec 16 Feb 2008 16:23:25 -0000 1.11 +++ libedit.spec 27 Jul 2008 18:52:17 -0000 1.12 @@ -1,9 +1,9 @@ -%define snap 20070831 +%define snap 20080712 Summary: The NetBSD Editline library Name: libedit -Version: 2.10 -Release: 4.%{snap}cvs%{?dist} +Version: 2.11 +Release: 1.%{snap}cvs%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.thrysoee.dk/editline/ @@ -38,6 +38,10 @@ %build %configure --disable-static + +# Trying to omit unused direct shared library dependencies leads to +# undefined non-weak symbols. + make %{?_smp_mflags} %install @@ -61,16 +65,19 @@ %files devel %defattr(-,root,root,-) %doc examples/fileman.c examples/test.c +%doc %{_mandir}/man3/* +%doc %{_mandir}/man5/editrc.5* %{_includedir}/histedit.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/* -%{_mandir}/man5/editrc.5.gz %dir %{_includedir}/editline %{_includedir}/editline/readline.h %changelog +* Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs +- Version bump to 20080712-2.11. + * Sat Feb 16 2008 Debarshi Ray - 2.10-4.20070831cvs - Rebuilding with gcc-4.3 in Rawhide. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libedit/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Sep 2007 03:42:48 -0000 1.5 +++ sources 27 Jul 2008 18:52:17 -0000 1.6 @@ -1 +1 @@ -e8abd1169825efecfccb0f7b4c338bb5 libedit-20070831-2.10.tar.gz +140c56efbc68d7255b7045eb604e8a45 libedit-20080712-2.11.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 18:55:00 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 27 Jul 2008 18:55:00 GMT Subject: rpms/libedit/devel .cvsignore, 1.5, 1.6 libedit.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200807271855.m6RIt0kv010604@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545 Modified Files: .cvsignore libedit.spec sources Log Message: * Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs - Version bump to 20080712-2.11. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libedit/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Sep 2007 03:42:48 -0000 1.5 +++ .cvsignore 27 Jul 2008 18:54:30 -0000 1.6 @@ -1 +1 @@ -libedit-20070831-2.10.tar.gz +libedit-20080712-2.11.tar.gz Index: libedit.spec =================================================================== RCS file: /cvs/pkgs/rpms/libedit/devel/libedit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libedit.spec 16 Feb 2008 16:23:25 -0000 1.11 +++ libedit.spec 27 Jul 2008 18:54:30 -0000 1.12 @@ -1,9 +1,9 @@ -%define snap 20070831 +%define snap 20080712 Summary: The NetBSD Editline library Name: libedit -Version: 2.10 -Release: 4.%{snap}cvs%{?dist} +Version: 2.11 +Release: 1.%{snap}cvs%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.thrysoee.dk/editline/ @@ -38,6 +38,10 @@ %build %configure --disable-static + +# Trying to omit unused direct shared library dependencies leads to +# undefined non-weak symbols. + make %{?_smp_mflags} %install @@ -61,16 +65,19 @@ %files devel %defattr(-,root,root,-) %doc examples/fileman.c examples/test.c +%doc %{_mandir}/man3/* +%doc %{_mandir}/man5/editrc.5* %{_includedir}/histedit.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/* -%{_mandir}/man5/editrc.5.gz %dir %{_includedir}/editline %{_includedir}/editline/readline.h %changelog +* Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs +- Version bump to 20080712-2.11. + * Sat Feb 16 2008 Debarshi Ray - 2.10-4.20070831cvs - Rebuilding with gcc-4.3 in Rawhide. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libedit/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Sep 2007 03:42:48 -0000 1.5 +++ sources 27 Jul 2008 18:54:30 -0000 1.6 @@ -1 +1 @@ -e8abd1169825efecfccb0f7b4c338bb5 libedit-20070831-2.10.tar.gz +140c56efbc68d7255b7045eb604e8a45 libedit-20080712-2.11.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 19:21:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 19:21:08 +0000 Subject: [pkgdb] mysqltuner ownership updated Message-ID: <20080727192108.8FA2D1AD0E7@bastion.fedora.phx.redhat.com> Package mysqltuner in Fedora EPEL 5 was orphaned by Ville Skytta (scop) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mysqltuner From fedora-extras-commits at redhat.com Sun Jul 27 19:46:31 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 27 Jul 2008 19:46:31 GMT Subject: rpms/kernel/devel kernel.spec,1.809,1.810 Message-ID: <200807271946.m6RJkVR2018644@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18619 Modified Files: kernel.spec Log Message: log fix Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.809 retrieving revision 1.810 diff -u -r1.809 -r1.810 --- kernel.spec 27 Jul 2008 08:59:21 -0000 1.809 +++ kernel.spec 27 Jul 2008 19:46:00 -0000 1.810 @@ -1707,7 +1707,7 @@ - 2.6.26-git13 - utrace update -* Fri Jul 25 2008 unknown +* Fri Jul 25 2008 Roland McGrath - 2.6.26-git13 * Fri Jul 25 2008 Dave Jones From fedora-extras-commits at redhat.com Sun Jul 27 19:49:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 19:49:20 +0000 Subject: [pkgdb] mysqltuner ownership updated Message-ID: <20080727194926.55D3D1AD0E3@bastion.fedora.phx.redhat.com> Package mysqltuner in Fedora EPEL 5 is now owned by Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mysqltuner From fedora-extras-commits at redhat.com Sun Jul 27 19:49:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 19:49:46 +0000 Subject: [pkgdb] mysqltuner: wolfy has requested watchbugzilla Message-ID: <20080727194947.5F6A71AD0E9@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchbugzilla acl on mysqltuner (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mysqltuner From fedora-extras-commits at redhat.com Sun Jul 27 19:49:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 19:49:47 +0000 Subject: [pkgdb] mysqltuner: wolfy has requested watchcommits Message-ID: <20080727194948.B3D871AD0F0@bastion.fedora.phx.redhat.com> Manuel Wolfshant (wolfy) has requested the watchcommits acl on mysqltuner (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mysqltuner From fedora-extras-commits at redhat.com Sun Jul 27 19:59:11 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 27 Jul 2008 19:59:11 GMT Subject: rpms/libedit/EL-5 .cvsignore, 1.4, 1.5 libedit.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807271959.m6RJxBCx018971@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libedit/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18917 Modified Files: .cvsignore libedit.spec sources Log Message: * Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs - Version bump to 20080712-2.11. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libedit/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 May 2008 12:49:41 -0000 1.4 +++ .cvsignore 27 Jul 2008 19:58:41 -0000 1.5 @@ -1 +1 @@ -libedit-20070831-2.10.tar.gz +libedit-20080712-2.11.tar.gz Index: libedit.spec =================================================================== RCS file: /cvs/pkgs/rpms/libedit/EL-5/libedit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libedit.spec 16 May 2008 12:49:41 -0000 1.4 +++ libedit.spec 27 Jul 2008 19:58:41 -0000 1.5 @@ -1,9 +1,9 @@ -%define snap 20070831 +%define snap 20080712 Summary: The NetBSD Editline library Name: libedit -Version: 2.10 -Release: 4.%{snap}cvs%{?dist} +Version: 2.11 +Release: 1.%{snap}cvs%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.thrysoee.dk/editline/ @@ -38,6 +38,10 @@ %build %configure --disable-static + +# Trying to omit unused direct shared library dependencies leads to +# undefined non-weak symbols. + make %{?_smp_mflags} %install @@ -61,16 +65,19 @@ %files devel %defattr(-,root,root,-) %doc examples/fileman.c examples/test.c +%doc %{_mandir}/man3/* +%doc %{_mandir}/man5/editrc.5* %{_includedir}/histedit.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/* -%{_mandir}/man5/editrc.5.gz %dir %{_includedir}/editline %{_includedir}/editline/readline.h %changelog +* Sun Jul 28 2008 Debarshi Ray - 2.11-1.20080712cvs +- Version bump to 20080712-2.11. + * Sat Feb 16 2008 Debarshi Ray - 2.10-4.20070831cvs - Rebuilding with gcc-4.3 in Rawhide. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libedit/EL-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 May 2008 12:49:41 -0000 1.4 +++ sources 27 Jul 2008 19:58:41 -0000 1.5 @@ -1 +1 @@ -e8abd1169825efecfccb0f7b4c338bb5 libedit-20070831-2.10.tar.gz +140c56efbc68d7255b7045eb604e8a45 libedit-20080712-2.11.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 19:59:18 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 27 Jul 2008 19:59:18 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.1.0-plasma-tooltips.patch, NONE, 1.1 kdebase-workspace.spec, 1.112, 1.113 kdebase-workspace-4.0.99-plasma-tooltips.patch, 1.1, NONE Message-ID: <200807271959.m6RJxIs0019011@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18939/devel Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.1.0-plasma-tooltips.patch Removed Files: kdebase-workspace-4.0.99-plasma-tooltips.patch Log Message: * Sun Jul 27 2008 Kevin Kofler 4.1.0-2 - updated tooltip manager from 4.2 (fixes Plasma crash on theme change, #456820) kdebase-workspace-4.1.0-plasma-tooltips.patch: --- NEW FILE kdebase-workspace-4.1.0-plasma-tooltips.patch --- diff -Nur kdebase-workspace-4.1.0/libs/plasma/applet.cpp kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/applet.cpp --- kdebase-workspace-4.1.0/libs/plasma/applet.cpp 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/applet.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -76,6 +75,7 @@ #include "plasma/view.h" #include "plasma/widgets/label.h" #include "plasma/widgets/pushbutton.h" +#include "plasma/tooltipmanager.h" //#define DYNAMIC_SHADOWS namespace Plasma @@ -411,13 +411,16 @@ return 0; } + QGraphicsView *found = 0; foreach (QGraphicsView *view, scene()->views()) { if (view->sceneRect().intersects(sceneBoundingRect()) || view->sceneRect().contains(scenePos())) { - return view; + if (!found || view->isActiveWindow()) { + found = view; + } } } - return 0; + return found; } QRectF Applet::mapFromView(const QGraphicsView *view, const QRect &rect) const @@ -434,55 +437,7 @@ QPoint Applet::popupPosition(const QSize &s) const { - QGraphicsView *v = view(); - Q_ASSERT(v); - - QPoint pos = v->mapFromScene(scenePos()); - pos = v->mapToGlobal(pos); - //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; - Plasma::View *pv = dynamic_cast(v); - - Plasma::Location loc = Floating; - if (pv) { - loc = pv->containment()->location(); - } - - switch (loc) { - case BottomEdge: - pos = QPoint(pos.x(), pos.y() - s.height()); - break; - case TopEdge: - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - break; - case LeftEdge: - pos = QPoint(pos.x() + (int)size().width(), pos.y()); - break; - case RightEdge: - pos = QPoint(pos.x() - s.width(), pos.y()); - break; - default: - if (pos.y() - s.height() > 0) { - pos = QPoint(pos.x(), pos.y() - s.height()); - } else { - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - } - } - - //are we out of screen? - - QRect screenRect = QApplication::desktop()->screenGeometry(pv ? pv->containment()->screen() : -1); - //kDebug() << "==> rect for" << (pv ? pv->containment()->screen() : -1) << "is" << screenRect; - - if (pos.rx() + s.width() > screenRect.right()) { - pos.rx() -= ((pos.rx() + s.width()) - screenRect.right()); - } - - if (pos.ry() + s.height() > screenRect.bottom()) { - pos.ry() -= ((pos.ry() + s.height()) - screenRect.bottom()); - } - pos.rx() = qMax(0, pos.rx()); - - return pos; + return Plasma::popupPosition(this, s); } void Applet::updateConstraints(Plasma::Constraints constraints) diff -Nur kdebase-workspace-4.1.0/libs/plasma/CMakeLists.txt kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/CMakeLists.txt --- kdebase-workspace-4.1.0/libs/plasma/CMakeLists.txt 2008-07-23 10:25:42.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/CMakeLists.txt 2008-07-27 21:52:07.000000000 +0200 @@ -58,6 +58,8 @@ svg.cpp theme.cpp toolbox.cpp + tooltipmanager.cpp + tooltip.cpp uiloader.cpp version.cpp view.cpp @@ -143,7 +145,9 @@ servicejob.h svg.h theme.h + tooltipmanager.h uiloader.h + tooltipmanager.h version.h view.h) @@ -228,6 +232,7 @@ includes/SignalPlotter includes/Svg includes/TextEdit +includes/ToolTipManager includes/Theme includes/UiLoader includes/View diff -Nur kdebase-workspace-4.1.0/libs/plasma/containment.cpp kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/containment.cpp --- kdebase-workspace-4.1.0/libs/plasma/containment.cpp 2008-07-23 10:25:42.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/containment.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -1280,6 +1280,9 @@ // point anymore since we are in the qobject dtor. we don't actually // try and do anything with it, we just need the value of the pointer // so this unsafe looking code is actually just fine. + // + // NOTE: DO NOT USE THE applet VARIABLE FOR ANYTHING OTHER THAN COMPARING + // THE ADDRESS! ACTUALLY USING THE OBJECT WILL RESULT IN A CRASH!!! Applet* applet = static_cast(object); applets.removeAll(applet); if (focusedApplet == applet) { diff -Nur kdebase-workspace-4.1.0/libs/plasma/includes/ToolTipManager kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/includes/ToolTipManager --- kdebase-workspace-4.1.0/libs/plasma/includes/ToolTipManager 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/includes/ToolTipManager 2008-07-27 21:52:07.000000000 +0200 @@ -0,0 +1 @@ +#include "../../plasma/tooltipmanager.h" diff -Nur kdebase-workspace-4.1.0/libs/plasma/plasma.cpp kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/plasma.cpp --- kdebase-workspace-4.1.0/libs/plasma/plasma.cpp 2008-07-08 11:26:23.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/plasma.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -17,7 +17,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include + +#include +#include +#include + +#include +#include namespace Plasma { @@ -62,4 +69,78 @@ return Down; } +QPoint popupPosition(const QGraphicsItem * item, const QSize &s) +{ + QGraphicsView *v = viewFor(item); + + if (!v) { + return QPoint(0,0); + } + + QPoint pos = v->mapFromScene(item->scenePos()); + pos = v->mapToGlobal(pos); + //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; + Plasma::View *pv = dynamic_cast(v); + + Plasma::Location loc = Floating; + if (pv) { + loc = pv->containment()->location(); + } + + switch (loc) { + case BottomEdge: + pos = QPoint(pos.x(), pos.y() - s.height()); + break; + case TopEdge: + pos = QPoint(pos.x(), pos.y() + (int)item->boundingRect().size().height()); + break; + case LeftEdge: + pos = QPoint(pos.x() + (int)item->boundingRect().size().width(), pos.y()); + break; + case RightEdge: + pos = QPoint(pos.x() - s.width(), pos.y()); + break; + default: + if (pos.y() - s.height() > 0) { [...1831 lines suppressed...] m_icon->setDrawBackground(false); } } diff -Nur kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.cpp kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp --- kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -41,6 +41,7 @@ #include "plasma/theme.h" #include "plasma/paintutils.h" #include "plasma/panelsvg.h" +#include "plasma/tooltipmanager.h" #include "tasks.h" @@ -61,12 +62,18 @@ setAcceptsHoverEvents(true); setAcceptDrops(true); + Plasma::ToolTipManager::self()->registerWidget(this); + QFontMetrics fm(KGlobalSettings::taskbarFont()); QSize mSize = fm.size(0, "M"); setPreferredSize(QSize(mSize.width()*15 + m_applet->itemLeftMargin() + m_applet->itemRightMargin() + IconSize(KIconLoader::Panel), mSize.height()*3 + m_applet->itemTopMargin() + m_applet->itemBottomMargin())); } +WindowTaskItem::~WindowTaskItem() +{ +} + void WindowTaskItem::activate() { // the Task class has a method called activateRaiseOrIconify() which @@ -552,19 +559,18 @@ taskIcon.addPixmap(m_task->icon(KIconLoader::SizeMedium, KIconLoader::SizeMedium, false)); taskIcon.addPixmap(m_task->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false)); -#ifdef TOOLTIP_MANAGER if (m_showTooltip) { - Plasma::ToolTipData data; + Plasma::ToolTipManager::ToolTipContent data; data.mainText = m_task->visibleName(); data.subText = i18nc("Which virtual desktop a window is currently on", "On %1", KWindowSystem::desktopName(m_task->desktop())); - data.image = iconPixmap; + data.image = m_task->icon(KIconLoader::SizeSmall, KIconLoader::SizeSmall, false); data.windowToPreview = m_task->window(); - setToolTip(data); - } else { - Plasma::ToolTipData data; - setToolTip(data); // Clear + + Plasma::ToolTipManager::self()->setToolTipContent(this,data); + } + else { + Plasma::ToolTipManager::self()->unregisterWidget(this); } -#endif setIcon(taskIcon); setText(m_task->visibleName()); //redraw @@ -722,4 +728,5 @@ size, bounds.toRect()); } + #include "windowtaskitem.moc" diff -Nur kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.h kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h --- kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.h 2008-06-18 14:41:39.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h 2008-07-27 21:52:07.000000000 +0200 @@ -57,6 +57,9 @@ /** Constructs a new representation for a window task. */ WindowTaskItem(Tasks *parent, const bool showTooltip); + /**Destruct the representation of the window task */ + ~WindowTaskItem(); + /** Sets the starting task represented by this item. */ void setStartupTask(TaskManager::StartupPtr task); diff -Nur kdebase-workspace-4.1.0/plasma/applets/trash/trash.cpp kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.cpp --- kdebase-workspace-4.1.0/plasma/applets/trash/trash.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -45,6 +45,7 @@ //Plasma #include #include +#include //Solid #include @@ -100,10 +101,6 @@ registerAsDragHandle(m_icon); - //setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Small))); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.mainText = i18n("Trash"); - connect(m_icon, SIGNAL(activated()), this, SLOT(slotOpen())); connect(&m_menu, SIGNAL(aboutToHide()), m_icon, SLOT(setUnpressed())); @@ -201,17 +198,20 @@ void Trash::setIcon() { + Plasma::ToolTipManager::ToolTipContent data; + data.mainText = i18n("Trash"); + if (m_count > 0) { m_icon->setIcon(KIcon("user-trash-full")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18np("One item", "%1 items", m_count); + + data.subText = i18np("One item", "%1 items", m_count); if (m_showText) { m_icon->setInfoText(i18np("One item", "%1 items", m_count)); } } else { m_icon->setIcon(KIcon("user-trash")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); + + data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); if (m_showText){ m_icon->setInfoText(i18nc("The trash is empty. This is not an action, but a state", "Empty")); } @@ -219,14 +219,13 @@ m_icon->update(); - //FIXME TOOLTIP MANAGER - /*m_data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); + data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); if (!m_showText) { - m_icon->setToolTip(m_data); + Plasma::ToolTipManager::self()->setToolTipContent(this, data); } else { - m_icon->setToolTip(Plasma::ToolTipData()); - }*/ + Plasma::ToolTipManager::self()->setToolTipContent(this, Plasma::ToolTipManager::ToolTipContent()); + } emptyTrash->setEnabled(m_count>0); } diff -Nur kdebase-workspace-4.1.0/plasma/applets/trash/trash.h kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.h --- kdebase-workspace-4.1.0/plasma/applets/trash/trash.h 2008-04-30 15:58:26.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.h 2008-07-27 21:52:07.000000000 +0200 @@ -75,8 +75,6 @@ QAction *emptyTrash; int m_count; bool m_showText; - //FIXME PORT TO TOOLTIP MANAGER - //Plasma::ToolTipData m_data; KFilePlacesModel *m_places; }; diff -Nur kdebase-workspace-4.1.0/plasma/design/tooltips kdebase-workspace-4.1.0-plasma-tooltips/plasma/design/tooltips --- kdebase-workspace-4.1.0/plasma/design/tooltips 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/design/tooltips 2008-07-27 21:52:07.000000000 +0200 @@ -0,0 +1,39 @@ +Tooltips +========== + +Overview +-------- +libplasma provides facilities to manage tooltips that display extended information in a visually pleasing and consistent manner for QGraphicsWidgets. These tooltip windows are themed using Plasma::Theme. + +Timeline +-------- +Introduced in: libplasma 2.1 (KDE 4.2.0) + +Component Type +-------------- +ToolTipManager is a QObject subclass in libplasma. +ToolTip is an internal QWidget subclass in libplasma. + +Registering Tooltips +-------------------- +ToolTipManger is quite simple to use: simply call setWidgetToolTipContent using the struct ToolTipContent. This causes the widget to be registered if it isn't already. Alternatively, for widgets that fill the data on demand, call registerWidget directly. + +Widgets are unregistered automatically upon destruction, but can also be manually unregsitered by calling ToolTipMnager::unregisterWidget. + +An event filter is registered on each registered widget and hover events that occur trigger calls to showToolTip and hideToolTip. The hover events are not, however, filtered out. + +Note: If another event filter is placed on registered widget that filters out these events, it may be necessary to manually call showToolTip and hideToolTip. + +ToolTip Updates +--------------- +Updating tooltip data is supported by means of invoking slots on the associated widget if they exist. In particular, just prior to being shown the toolTipAboutToShow method is invoked and when hiding the toolTipHidden method is invoked. + +ToolTip Visualization +--------------------- +The internal (non-exported) ToolTip class is used to actually display the tooltips. These are associated with widgets and created as necessary. + +ToolTip displays are only created when data is set, and are deleted if an empty ToolTipData struct is passed in. This keeps memory usage due to ToolTip objects down. + +Future Work +----------- +N/A Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- kdebase-workspace.spec 23 Jul 2008 13:52:49 -0000 1.112 +++ kdebase-workspace.spec 27 Jul 2008 19:58:48 -0000 1.113 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -27,10 +27,10 @@ # upstream patches: # backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) -# This is a cumulative patch from the following revision pairs: 833271:833299, -# 833385:833386, 833479:833545, 833580:833581, 833587:833620, 834651:834652 +# This is a cumulative patch from the following revisions/pairs: 833271:833299, +# 833386, 833479:833545, 833581, 833587:833620, 834652, 836698, 837733, 837827. # This is backwards BC wrt 4.1, but the API of the new classes is not finalized. -Patch100: kdebase-workspace-4.0.99-plasma-tooltips.patch +Patch100: kdebase-workspace-4.1.0-plasma-tooltips.patch # plasma-4.0-openSUSE patches: Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch @@ -301,6 +301,9 @@ %changelog +* Sun Jul 27 2008 Kevin Kofler 4.1.0-2 +- updated tooltip manager from 4.2 (fixes Plasma crash on theme change, #456820) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 --- kdebase-workspace-4.0.99-plasma-tooltips.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:00:48 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sun, 27 Jul 2008 20:00:48 GMT Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.0-plasma-tooltips.patch, NONE, 1.1 kdebase-workspace.spec, 1.94, 1.95 kdebase-workspace-4.0.99-plasma-tooltips.patch, 1.1, NONE Message-ID: <200807272000.m6RK0mUo019143@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19100/F-9 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.1.0-plasma-tooltips.patch Removed Files: kdebase-workspace-4.0.99-plasma-tooltips.patch Log Message: Sync from devel: * Sun Jul 27 2008 Kevin Kofler 4.1.0-2 - updated tooltip manager from 4.2 (fixes Plasma crash on theme change, #456820) kdebase-workspace-4.1.0-plasma-tooltips.patch: --- NEW FILE kdebase-workspace-4.1.0-plasma-tooltips.patch --- diff -Nur kdebase-workspace-4.1.0/libs/plasma/applet.cpp kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/applet.cpp --- kdebase-workspace-4.1.0/libs/plasma/applet.cpp 2008-07-17 23:32:49.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/applet.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -76,6 +75,7 @@ #include "plasma/view.h" #include "plasma/widgets/label.h" #include "plasma/widgets/pushbutton.h" +#include "plasma/tooltipmanager.h" //#define DYNAMIC_SHADOWS namespace Plasma @@ -411,13 +411,16 @@ return 0; } + QGraphicsView *found = 0; foreach (QGraphicsView *view, scene()->views()) { if (view->sceneRect().intersects(sceneBoundingRect()) || view->sceneRect().contains(scenePos())) { - return view; + if (!found || view->isActiveWindow()) { + found = view; + } } } - return 0; + return found; } QRectF Applet::mapFromView(const QGraphicsView *view, const QRect &rect) const @@ -434,55 +437,7 @@ QPoint Applet::popupPosition(const QSize &s) const { - QGraphicsView *v = view(); - Q_ASSERT(v); - - QPoint pos = v->mapFromScene(scenePos()); - pos = v->mapToGlobal(pos); - //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; - Plasma::View *pv = dynamic_cast(v); - - Plasma::Location loc = Floating; - if (pv) { - loc = pv->containment()->location(); - } - - switch (loc) { - case BottomEdge: - pos = QPoint(pos.x(), pos.y() - s.height()); - break; - case TopEdge: - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - break; - case LeftEdge: - pos = QPoint(pos.x() + (int)size().width(), pos.y()); - break; - case RightEdge: - pos = QPoint(pos.x() - s.width(), pos.y()); - break; - default: - if (pos.y() - s.height() > 0) { - pos = QPoint(pos.x(), pos.y() - s.height()); - } else { - pos = QPoint(pos.x(), pos.y() + (int)size().height()); - } - } - - //are we out of screen? - - QRect screenRect = QApplication::desktop()->screenGeometry(pv ? pv->containment()->screen() : -1); - //kDebug() << "==> rect for" << (pv ? pv->containment()->screen() : -1) << "is" << screenRect; - - if (pos.rx() + s.width() > screenRect.right()) { - pos.rx() -= ((pos.rx() + s.width()) - screenRect.right()); - } - - if (pos.ry() + s.height() > screenRect.bottom()) { - pos.ry() -= ((pos.ry() + s.height()) - screenRect.bottom()); - } - pos.rx() = qMax(0, pos.rx()); - - return pos; + return Plasma::popupPosition(this, s); } void Applet::updateConstraints(Plasma::Constraints constraints) diff -Nur kdebase-workspace-4.1.0/libs/plasma/CMakeLists.txt kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/CMakeLists.txt --- kdebase-workspace-4.1.0/libs/plasma/CMakeLists.txt 2008-07-23 10:25:42.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/CMakeLists.txt 2008-07-27 21:52:07.000000000 +0200 @@ -58,6 +58,8 @@ svg.cpp theme.cpp toolbox.cpp + tooltipmanager.cpp + tooltip.cpp uiloader.cpp version.cpp view.cpp @@ -143,7 +145,9 @@ servicejob.h svg.h theme.h + tooltipmanager.h uiloader.h + tooltipmanager.h version.h view.h) @@ -228,6 +232,7 @@ includes/SignalPlotter includes/Svg includes/TextEdit +includes/ToolTipManager includes/Theme includes/UiLoader includes/View diff -Nur kdebase-workspace-4.1.0/libs/plasma/containment.cpp kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/containment.cpp --- kdebase-workspace-4.1.0/libs/plasma/containment.cpp 2008-07-23 10:25:42.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/containment.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -1280,6 +1280,9 @@ // point anymore since we are in the qobject dtor. we don't actually // try and do anything with it, we just need the value of the pointer // so this unsafe looking code is actually just fine. + // + // NOTE: DO NOT USE THE applet VARIABLE FOR ANYTHING OTHER THAN COMPARING + // THE ADDRESS! ACTUALLY USING THE OBJECT WILL RESULT IN A CRASH!!! Applet* applet = static_cast(object); applets.removeAll(applet); if (focusedApplet == applet) { diff -Nur kdebase-workspace-4.1.0/libs/plasma/includes/ToolTipManager kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/includes/ToolTipManager --- kdebase-workspace-4.1.0/libs/plasma/includes/ToolTipManager 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/includes/ToolTipManager 2008-07-27 21:52:07.000000000 +0200 @@ -0,0 +1 @@ +#include "../../plasma/tooltipmanager.h" diff -Nur kdebase-workspace-4.1.0/libs/plasma/plasma.cpp kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/plasma.cpp --- kdebase-workspace-4.1.0/libs/plasma/plasma.cpp 2008-07-08 11:26:23.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/libs/plasma/plasma.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -17,7 +17,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include + +#include +#include +#include + +#include +#include namespace Plasma { @@ -62,4 +69,78 @@ return Down; } +QPoint popupPosition(const QGraphicsItem * item, const QSize &s) +{ + QGraphicsView *v = viewFor(item); + + if (!v) { + return QPoint(0,0); + } + + QPoint pos = v->mapFromScene(item->scenePos()); + pos = v->mapToGlobal(pos); + //kDebug() << "==> position is" << scenePos() << v->mapFromScene(scenePos()) << pos; + Plasma::View *pv = dynamic_cast(v); + + Plasma::Location loc = Floating; + if (pv) { + loc = pv->containment()->location(); + } + + switch (loc) { + case BottomEdge: + pos = QPoint(pos.x(), pos.y() - s.height()); + break; + case TopEdge: + pos = QPoint(pos.x(), pos.y() + (int)item->boundingRect().size().height()); + break; + case LeftEdge: + pos = QPoint(pos.x() + (int)item->boundingRect().size().width(), pos.y()); + break; + case RightEdge: + pos = QPoint(pos.x() - s.width(), pos.y()); + break; + default: + if (pos.y() - s.height() > 0) { [...1831 lines suppressed...] m_icon->setDrawBackground(false); } } diff -Nur kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.cpp kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp --- kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -41,6 +41,7 @@ #include "plasma/theme.h" #include "plasma/paintutils.h" #include "plasma/panelsvg.h" +#include "plasma/tooltipmanager.h" #include "tasks.h" @@ -61,12 +62,18 @@ setAcceptsHoverEvents(true); setAcceptDrops(true); + Plasma::ToolTipManager::self()->registerWidget(this); + QFontMetrics fm(KGlobalSettings::taskbarFont()); QSize mSize = fm.size(0, "M"); setPreferredSize(QSize(mSize.width()*15 + m_applet->itemLeftMargin() + m_applet->itemRightMargin() + IconSize(KIconLoader::Panel), mSize.height()*3 + m_applet->itemTopMargin() + m_applet->itemBottomMargin())); } +WindowTaskItem::~WindowTaskItem() +{ +} + void WindowTaskItem::activate() { // the Task class has a method called activateRaiseOrIconify() which @@ -552,19 +559,18 @@ taskIcon.addPixmap(m_task->icon(KIconLoader::SizeMedium, KIconLoader::SizeMedium, false)); taskIcon.addPixmap(m_task->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false)); -#ifdef TOOLTIP_MANAGER if (m_showTooltip) { - Plasma::ToolTipData data; + Plasma::ToolTipManager::ToolTipContent data; data.mainText = m_task->visibleName(); data.subText = i18nc("Which virtual desktop a window is currently on", "On %1", KWindowSystem::desktopName(m_task->desktop())); - data.image = iconPixmap; + data.image = m_task->icon(KIconLoader::SizeSmall, KIconLoader::SizeSmall, false); data.windowToPreview = m_task->window(); - setToolTip(data); - } else { - Plasma::ToolTipData data; - setToolTip(data); // Clear + + Plasma::ToolTipManager::self()->setToolTipContent(this,data); + } + else { + Plasma::ToolTipManager::self()->unregisterWidget(this); } -#endif setIcon(taskIcon); setText(m_task->visibleName()); //redraw @@ -722,4 +728,5 @@ size, bounds.toRect()); } + #include "windowtaskitem.moc" diff -Nur kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.h kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h --- kdebase-workspace-4.1.0/plasma/applets/tasks/windowtaskitem.h 2008-06-18 14:41:39.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/tasks/windowtaskitem.h 2008-07-27 21:52:07.000000000 +0200 @@ -57,6 +57,9 @@ /** Constructs a new representation for a window task. */ WindowTaskItem(Tasks *parent, const bool showTooltip); + /**Destruct the representation of the window task */ + ~WindowTaskItem(); + /** Sets the starting task represented by this item. */ void setStartupTask(TaskManager::StartupPtr task); diff -Nur kdebase-workspace-4.1.0/plasma/applets/trash/trash.cpp kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.cpp --- kdebase-workspace-4.1.0/plasma/applets/trash/trash.cpp 2008-07-15 21:48:49.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.cpp 2008-07-27 21:52:07.000000000 +0200 @@ -45,6 +45,7 @@ //Plasma #include #include +#include //Solid #include @@ -100,10 +101,6 @@ registerAsDragHandle(m_icon); - //setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Small))); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.mainText = i18n("Trash"); - connect(m_icon, SIGNAL(activated()), this, SLOT(slotOpen())); connect(&m_menu, SIGNAL(aboutToHide()), m_icon, SLOT(setUnpressed())); @@ -201,17 +198,20 @@ void Trash::setIcon() { + Plasma::ToolTipManager::ToolTipContent data; + data.mainText = i18n("Trash"); + if (m_count > 0) { m_icon->setIcon(KIcon("user-trash-full")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18np("One item", "%1 items", m_count); + + data.subText = i18np("One item", "%1 items", m_count); if (m_showText) { m_icon->setInfoText(i18np("One item", "%1 items", m_count)); } } else { m_icon->setIcon(KIcon("user-trash")); - //FIXME PORT TO TOOLTIP MANAGER - //m_data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); + + data.subText = i18nc("The trash is empty. This is not an action, but a state", "Empty"); if (m_showText){ m_icon->setInfoText(i18nc("The trash is empty. This is not an action, but a state", "Empty")); } @@ -219,14 +219,13 @@ m_icon->update(); - //FIXME TOOLTIP MANAGER - /*m_data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); + data.image = m_icon->icon().pixmap(IconSize(KIconLoader::Desktop)); if (!m_showText) { - m_icon->setToolTip(m_data); + Plasma::ToolTipManager::self()->setToolTipContent(this, data); } else { - m_icon->setToolTip(Plasma::ToolTipData()); - }*/ + Plasma::ToolTipManager::self()->setToolTipContent(this, Plasma::ToolTipManager::ToolTipContent()); + } emptyTrash->setEnabled(m_count>0); } diff -Nur kdebase-workspace-4.1.0/plasma/applets/trash/trash.h kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.h --- kdebase-workspace-4.1.0/plasma/applets/trash/trash.h 2008-04-30 15:58:26.000000000 +0200 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/applets/trash/trash.h 2008-07-27 21:52:07.000000000 +0200 @@ -75,8 +75,6 @@ QAction *emptyTrash; int m_count; bool m_showText; - //FIXME PORT TO TOOLTIP MANAGER - //Plasma::ToolTipData m_data; KFilePlacesModel *m_places; }; diff -Nur kdebase-workspace-4.1.0/plasma/design/tooltips kdebase-workspace-4.1.0-plasma-tooltips/plasma/design/tooltips --- kdebase-workspace-4.1.0/plasma/design/tooltips 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.1.0-plasma-tooltips/plasma/design/tooltips 2008-07-27 21:52:07.000000000 +0200 @@ -0,0 +1,39 @@ +Tooltips +========== + +Overview +-------- +libplasma provides facilities to manage tooltips that display extended information in a visually pleasing and consistent manner for QGraphicsWidgets. These tooltip windows are themed using Plasma::Theme. + +Timeline +-------- +Introduced in: libplasma 2.1 (KDE 4.2.0) + +Component Type +-------------- +ToolTipManager is a QObject subclass in libplasma. +ToolTip is an internal QWidget subclass in libplasma. + +Registering Tooltips +-------------------- +ToolTipManger is quite simple to use: simply call setWidgetToolTipContent using the struct ToolTipContent. This causes the widget to be registered if it isn't already. Alternatively, for widgets that fill the data on demand, call registerWidget directly. + +Widgets are unregistered automatically upon destruction, but can also be manually unregsitered by calling ToolTipMnager::unregisterWidget. + +An event filter is registered on each registered widget and hover events that occur trigger calls to showToolTip and hideToolTip. The hover events are not, however, filtered out. + +Note: If another event filter is placed on registered widget that filters out these events, it may be necessary to manually call showToolTip and hideToolTip. + +ToolTip Updates +--------------- +Updating tooltip data is supported by means of invoking slots on the associated widget if they exist. In particular, just prior to being shown the toolTipAboutToShow method is invoked and when hiding the toolTipHidden method is invoked. + +ToolTip Visualization +--------------------- +The internal (non-exported) ToolTip class is used to actually display the tooltips. These are associated with widgets and created as necessary. + +ToolTip displays are only created when data is set, and are deleted if an empty ToolTipData struct is passed in. This keeps memory usage due to ToolTip objects down. + +Future Work +----------- +N/A Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- kdebase-workspace.spec 25 Jul 2008 14:02:10 -0000 1.94 +++ kdebase-workspace.spec 27 Jul 2008 20:00:17 -0000 1.95 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -27,10 +27,10 @@ # upstream patches: # backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0) -# This is a cumulative patch from the following revision pairs: 833271:833299, -# 833385:833386, 833479:833545, 833580:833581, 833587:833620, 834651:834652 +# This is a cumulative patch from the following revisions/pairs: 833271:833299, +# 833386, 833479:833545, 833581, 833587:833620, 834652, 836698, 837733, 837827. # This is backwards BC wrt 4.1, but the API of the new classes is not finalized. -Patch100: kdebase-workspace-4.0.99-plasma-tooltips.patch +Patch100: kdebase-workspace-4.1.0-plasma-tooltips.patch # plasma-4.0-openSUSE patches: Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch @@ -301,6 +301,9 @@ %changelog +* Sun Jul 27 2008 Kevin Kofler 4.1.0-2 +- updated tooltip manager from 4.2 (fixes Plasma crash on theme change, #456820) + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 --- kdebase-workspace-4.0.99-plasma-tooltips.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:10:34 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 20:10:34 GMT Subject: rpms/duplicity/EL-4 .cvsignore, 1.6, 1.7 duplicity.spec, 1.14, 1.15 sources, 1.6, 1.7 duplicity-0.4.11-python23.patch, 1.2, NONE Message-ID: <200807272010.m6RKAYJj026258@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/duplicity/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26126/EL-4 Modified Files: .cvsignore duplicity.spec sources Removed Files: duplicity-0.4.11-python23.patch Log Message: Upgrade to 0.4.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/EL-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 May 2008 20:05:38 -0000 1.6 +++ .cvsignore 27 Jul 2008 20:10:04 -0000 1.7 @@ -1 +1 @@ -duplicity-0.4.11.tar.gz +duplicity-0.4.12.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/EL-4/duplicity.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- duplicity.spec 28 Jun 2008 09:06:39 -0000 1.14 +++ duplicity.spec 27 Jul 2008 20:10:04 -0000 1.15 @@ -2,13 +2,12 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.11 -Release: 2%{?dist} +Version: 0.4.12 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz -Patch: duplicity-0.4.11-python23.patch Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync Requires: pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d %if 0%{?rhel} <= 4 @@ -32,7 +31,6 @@ %prep %setup -q -%patch -p1 -b .python23 %build %{__python} setup.py build @@ -54,6 +52,9 @@ %{python_sitearch}/%{name}* %changelog +* Sun Jul 27 2008 Robert Scheck 0.4.12-1 +- Upgrade to 0.4.12 + * Sat Jun 28 2008 Robert Scheck 0.4.11-2 - Added patch for incremental backups using python 2.3 (#453069) Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/EL-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 May 2008 20:05:38 -0000 1.6 +++ sources 27 Jul 2008 20:10:04 -0000 1.7 @@ -1 +1 @@ -8891bb4fa2b5d3f053e6f2c4a91782f2 duplicity-0.4.11.tar.gz +2cec2aba2b0d770c70601862af94f896 duplicity-0.4.12.tar.gz --- duplicity-0.4.11-python23.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:10:35 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 20:10:35 GMT Subject: rpms/duplicity/EL-5 .cvsignore, 1.7, 1.8 duplicity.spec, 1.18, 1.19 sources, 1.7, 1.8 duplicity-0.4.11-python23.patch, 1.2, NONE Message-ID: <200807272010.m6RKAZeD026263@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/duplicity/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26126/EL-5 Modified Files: .cvsignore duplicity.spec sources Removed Files: duplicity-0.4.11-python23.patch Log Message: Upgrade to 0.4.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/EL-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 5 May 2008 20:05:48 -0000 1.7 +++ .cvsignore 27 Jul 2008 20:10:04 -0000 1.8 @@ -1 +1 @@ -duplicity-0.4.11.tar.gz +duplicity-0.4.12.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/EL-5/duplicity.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- duplicity.spec 28 Jun 2008 09:07:22 -0000 1.18 +++ duplicity.spec 27 Jul 2008 20:10:04 -0000 1.19 @@ -2,13 +2,12 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.11 -Release: 2%{?dist} +Version: 0.4.12 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz -Patch: duplicity-0.4.11-python23.patch Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync Requires: pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d %if 0%{?rhel} <= 4 @@ -32,7 +31,6 @@ %prep %setup -q -%patch -p1 -b .python23 %build %{__python} setup.py build @@ -54,6 +52,9 @@ %{python_sitearch}/%{name}* %changelog +* Sun Jul 27 2008 Robert Scheck 0.4.12-1 +- Upgrade to 0.4.12 + * Sat Jun 28 2008 Robert Scheck 0.4.11-2 - Added patch for incremental backups using python 2.3 (#453069) Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 May 2008 20:05:48 -0000 1.7 +++ sources 27 Jul 2008 20:10:04 -0000 1.8 @@ -1 +1 @@ -8891bb4fa2b5d3f053e6f2c4a91782f2 duplicity-0.4.11.tar.gz +2cec2aba2b0d770c70601862af94f896 duplicity-0.4.12.tar.gz --- duplicity-0.4.11-python23.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:10:35 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 20:10:35 GMT Subject: rpms/duplicity/F-8 .cvsignore, 1.7, 1.8 duplicity.spec, 1.18, 1.19 sources, 1.7, 1.8 duplicity-0.4.11-python23.patch, 1.2, NONE Message-ID: <200807272010.m6RKAZeK026269@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/duplicity/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26126/F-8 Modified Files: .cvsignore duplicity.spec sources Removed Files: duplicity-0.4.11-python23.patch Log Message: Upgrade to 0.4.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 5 May 2008 20:06:13 -0000 1.7 +++ .cvsignore 27 Jul 2008 20:10:05 -0000 1.8 @@ -1 +1 @@ -duplicity-0.4.11.tar.gz +duplicity-0.4.12.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-8/duplicity.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- duplicity.spec 28 Jun 2008 09:07:58 -0000 1.18 +++ duplicity.spec 27 Jul 2008 20:10:05 -0000 1.19 @@ -2,13 +2,12 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.11 -Release: 2%{?dist} +Version: 0.4.12 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz -Patch: duplicity-0.4.11-python23.patch Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync Requires: pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d BuildRequires: python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1 @@ -29,7 +28,6 @@ %prep %setup -q -%patch -p1 -b .python23 %build %{__python} setup.py build @@ -51,6 +49,9 @@ %{python_sitearch}/%{name}* %changelog +* Sun Jul 27 2008 Robert Scheck 0.4.12-1 +- Upgrade to 0.4.12 + * Sat Jun 28 2008 Robert Scheck 0.4.11-2 - Added patch for incremental backups using python 2.3 (#453069) Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 May 2008 20:06:13 -0000 1.7 +++ sources 27 Jul 2008 20:10:05 -0000 1.8 @@ -1 +1 @@ -8891bb4fa2b5d3f053e6f2c4a91782f2 duplicity-0.4.11.tar.gz +2cec2aba2b0d770c70601862af94f896 duplicity-0.4.12.tar.gz --- duplicity-0.4.11-python23.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:10:36 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 20:10:36 GMT Subject: rpms/duplicity/F-9 .cvsignore, 1.7, 1.8 duplicity.spec, 1.18, 1.19 sources, 1.7, 1.8 duplicity-0.4.11-python23.patch, 1.2, NONE Message-ID: <200807272010.m6RKAapw026274@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/duplicity/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26126/F-9 Modified Files: .cvsignore duplicity.spec sources Removed Files: duplicity-0.4.11-python23.patch Log Message: Upgrade to 0.4.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 5 May 2008 20:06:29 -0000 1.7 +++ .cvsignore 27 Jul 2008 20:10:05 -0000 1.8 @@ -1 +1 @@ -duplicity-0.4.11.tar.gz +duplicity-0.4.12.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-9/duplicity.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- duplicity.spec 28 Jun 2008 09:08:26 -0000 1.18 +++ duplicity.spec 27 Jul 2008 20:10:05 -0000 1.19 @@ -2,13 +2,12 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.11 -Release: 2%{?dist} +Version: 0.4.12 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz -Patch: duplicity-0.4.11-python23.patch Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync Requires: pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d BuildRequires: python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1 @@ -29,7 +28,6 @@ %prep %setup -q -%patch -p1 -b .python23 %build %{__python} setup.py build @@ -51,6 +49,9 @@ %{python_sitearch}/%{name}* %changelog +* Sun Jul 27 2008 Robert Scheck 0.4.12-1 +- Upgrade to 0.4.12 + * Sat Jun 28 2008 Robert Scheck 0.4.11-2 - Added patch for incremental backups using python 2.3 (#453069) Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 May 2008 20:06:29 -0000 1.7 +++ sources 27 Jul 2008 20:10:05 -0000 1.8 @@ -1 +1 @@ -8891bb4fa2b5d3f053e6f2c4a91782f2 duplicity-0.4.11.tar.gz +2cec2aba2b0d770c70601862af94f896 duplicity-0.4.12.tar.gz --- duplicity-0.4.11-python23.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:10:36 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sun, 27 Jul 2008 20:10:36 GMT Subject: rpms/duplicity/devel .cvsignore, 1.7, 1.8 duplicity.spec, 1.18, 1.19 sources, 1.7, 1.8 duplicity-0.4.11-python23.patch, 1.2, NONE Message-ID: <200807272010.m6RKAaYE026280@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/duplicity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26126/devel Modified Files: .cvsignore duplicity.spec sources Removed Files: duplicity-0.4.11-python23.patch Log Message: Upgrade to 0.4.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 5 May 2008 20:06:37 -0000 1.7 +++ .cvsignore 27 Jul 2008 20:10:06 -0000 1.8 @@ -1 +1 @@ -duplicity-0.4.11.tar.gz +duplicity-0.4.12.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- duplicity.spec 28 Jun 2008 09:08:50 -0000 1.18 +++ duplicity.spec 27 Jul 2008 20:10:06 -0000 1.19 @@ -2,13 +2,12 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.11 -Release: 2%{?dist} +Version: 0.4.12 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz -Patch: duplicity-0.4.11-python23.patch Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync Requires: pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d BuildRequires: python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1 @@ -29,7 +28,6 @@ %prep %setup -q -%patch -p1 -b .python23 %build %{__python} setup.py build @@ -51,6 +49,9 @@ %{python_sitearch}/%{name}* %changelog +* Sun Jul 27 2008 Robert Scheck 0.4.12-1 +- Upgrade to 0.4.12 + * Sat Jun 28 2008 Robert Scheck 0.4.11-2 - Added patch for incremental backups using python 2.3 (#453069) Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 May 2008 20:06:37 -0000 1.7 +++ sources 27 Jul 2008 20:10:06 -0000 1.8 @@ -1 +1 @@ -8891bb4fa2b5d3f053e6f2c4a91782f2 duplicity-0.4.11.tar.gz +2cec2aba2b0d770c70601862af94f896 duplicity-0.4.12.tar.gz --- duplicity-0.4.11-python23.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:15:48 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 27 Jul 2008 20:15:48 GMT Subject: rpms/kernel/devel patch-2.6.26-git16.bz2.sign, NONE, 1.1 .cvsignore, 1.880, 1.881 kernel.spec, 1.810, 1.811 sources, 1.841, 1.842 upstream, 1.758, 1.759 patch-2.6.26-git15.bz2.sign, 1.1, NONE Message-ID: <200807272015.m6RKFmrQ026828@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26768 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-git16.bz2.sign Removed Files: patch-2.6.26-git15.bz2.sign Log Message: * Sun Jul 27 2008 Roland McGrath - 2.6.26-git16 --- NEW FILE patch-2.6.26-git16.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIjMaIyGugalF9Dw4RAhErAJ99hxe51UsuOJyUaMRujxNcFu11yACeNas3 bgYlxmnjfzhxzAYi2k2lozE= =67ah -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.880 retrieving revision 1.881 diff -u -r1.880 -r1.881 --- .cvsignore 27 Jul 2008 07:22:15 -0000 1.880 +++ .cvsignore 27 Jul 2008 20:15:18 -0000 1.881 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git15.bz2 +patch-2.6.26-git16.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.810 retrieving revision 1.811 diff -u -r1.810 -r1.811 --- kernel.spec 27 Jul 2008 19:46:00 -0000 1.810 +++ kernel.spec 27 Jul 2008 20:15:18 -0000 1.811 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 15 +%define gitrev 16 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1693,6 +1693,9 @@ %changelog * Sun Jul 27 2008 Roland McGrath +- 2.6.26-git16 + +* Sun Jul 27 2008 Roland McGrath - 2.6.26-git15 - Disable powerpc64 ibmveth driver, not compiling. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.841 retrieving revision 1.842 diff -u -r1.841 -r1.842 --- sources 27 Jul 2008 07:22:15 -0000 1.841 +++ sources 27 Jul 2008 20:15:18 -0000 1.842 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -e7e0954872d735515623e77506d65065 patch-2.6.26-git15.bz2 +a286abfd524d39b7f6cf188e5ad56190 patch-2.6.26-git16.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- upstream 27 Jul 2008 07:22:15 -0000 1.758 +++ upstream 27 Jul 2008 20:15:18 -0000 1.759 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git15.bz2 +patch-2.6.26-git16.bz2 --- patch-2.6.26-git15.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 20:56:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Sun, 27 Jul 2008 20:56:02 GMT Subject: rpms/python-webob/devel WebOb-0.9.2-fix-tests.patch, NONE, 1.1 import.log, NONE, 1.1 python-webob.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807272056.m6RKu2bf027846@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-webob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27796/devel Modified Files: .cvsignore sources Added Files: WebOb-0.9.2-fix-tests.patch import.log python-webob.spec Log Message: Initial import. WebOb-0.9.2-fix-tests.patch: --- NEW FILE WebOb-0.9.2-fix-tests.patch --- --- WebOb-0.9.2/tests/test_response.txt.old 2008-06-27 02:03:13.000000000 -0400 +++ WebOb-0.9.2/tests/test_response.txt 2008-06-27 02:07:56.000000000 -0400 @@ -62,15 +62,15 @@ Cookie handling is done through methods: >>> res.set_cookie('test', 'value') >>> res.headers['set-cookie'] - 'test=value; Path=/;' + 'test=value; Path=/' >>> res.set_cookie('test2', 'value2', max_age=10000) >>> res.headers['set-cookie'] # We only see the last header - 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/;' + 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/' >>> res.headers.getall('set-cookie') - ['test=value; Path=/;', 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/;'] + ['test=value; Path=/', 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/'] >>> res.unset_cookie('test') >>> res.headers.getall('set-cookie') - ['test2=value2; expires="... GMT"; Max-Age=10000; Path=/;'] + ['test2=value2; expires="... GMT"; Max-Age=10000; Path=/'] Most headers are available in a parsed getter/setter form through properties: --- NEW FILE import.log --- python-webob-0_9_2-2_fc9:HEAD:python-webob-0.9.2-2.fc9.src.rpm:1217192120 --- NEW FILE python-webob.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-webob Summary: WSGI request and response object Version: 0.9.2 Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://pythonpaste.org/webob/ Source0: http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz Patch0: WebOb-0.9.2-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel BuildRequires: python-nose BuildRequires: python-dtopt %description WebOb provides wrappers around the WSGI request environment, and an object to help create WSGI responses. The objects map much of the specified behavior of HTTP, including header parsing and accessors for other standard parts of the environment. %prep %setup -q -n WebOb-%{version} %patch0 -p1 # Disable the tests that require python-webtest # (which depends on python-webob to begin with) %{__rm} -f tests/test_request.py # Disable conftest, which assumes that WebOb is already installed %{__rm} -f tests/conftest.py %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %clean %{__rm} -rf %{buildroot} %check ./test %files %defattr(-,root,root,-) %doc docs/* %{python_sitelib}/webob/ %{python_sitelib}/WebOb*.egg-info/ %changelog * Thu Jul 17 2008 Ricky Zhou 0.9.2-2 - Remove conftest from the tests. * Fri Jun 27 2008 Ricky Zhou 0.9.2-1 - Upstream released new version. - Rename to python-webob, as mentioned in the Python package naming guidelines. - Clean up spec. - Add %%check section. * Sat Mar 15 2008 Tom "spot" Callaway 0.9-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:44:09 -0000 1.1 +++ .cvsignore 27 Jul 2008 20:55:32 -0000 1.2 @@ -0,0 +1 @@ +WebOb-0.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:44:09 -0000 1.1 +++ sources 27 Jul 2008 20:55:32 -0000 1.2 @@ -0,0 +1 @@ +5354df7300ff58bcf89f11ff9e040a82 WebOb-0.9.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 20:58:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Sun, 27 Jul 2008 20:58:24 GMT Subject: rpms/python-webob/F-9 WebOb-0.9.2-fix-tests.patch, NONE, 1.1 import.log, NONE, 1.1 python-webob.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807272058.m6RKwOoe028003@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-webob/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27959/F-9 Modified Files: .cvsignore sources Added Files: WebOb-0.9.2-fix-tests.patch import.log python-webob.spec Log Message: Initial import. WebOb-0.9.2-fix-tests.patch: --- NEW FILE WebOb-0.9.2-fix-tests.patch --- --- WebOb-0.9.2/tests/test_response.txt.old 2008-06-27 02:03:13.000000000 -0400 +++ WebOb-0.9.2/tests/test_response.txt 2008-06-27 02:07:56.000000000 -0400 @@ -62,15 +62,15 @@ Cookie handling is done through methods: >>> res.set_cookie('test', 'value') >>> res.headers['set-cookie'] - 'test=value; Path=/;' + 'test=value; Path=/' >>> res.set_cookie('test2', 'value2', max_age=10000) >>> res.headers['set-cookie'] # We only see the last header - 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/;' + 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/' >>> res.headers.getall('set-cookie') - ['test=value; Path=/;', 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/;'] + ['test=value; Path=/', 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/'] >>> res.unset_cookie('test') >>> res.headers.getall('set-cookie') - ['test2=value2; expires="... GMT"; Max-Age=10000; Path=/;'] + ['test2=value2; expires="... GMT"; Max-Age=10000; Path=/'] Most headers are available in a parsed getter/setter form through properties: --- NEW FILE import.log --- python-webob-0_9_2-2_fc9:F-9:python-webob-0.9.2-2.fc9.src.rpm:1217192225 --- NEW FILE python-webob.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-webob Summary: WSGI request and response object Version: 0.9.2 Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://pythonpaste.org/webob/ Source0: http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz Patch0: WebOb-0.9.2-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel BuildRequires: python-nose BuildRequires: python-dtopt %description WebOb provides wrappers around the WSGI request environment, and an object to help create WSGI responses. The objects map much of the specified behavior of HTTP, including header parsing and accessors for other standard parts of the environment. %prep %setup -q -n WebOb-%{version} %patch0 -p1 # Disable the tests that require python-webtest # (which depends on python-webob to begin with) %{__rm} -f tests/test_request.py # Disable conftest, which assumes that WebOb is already installed %{__rm} -f tests/conftest.py %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %clean %{__rm} -rf %{buildroot} %check ./test %files %defattr(-,root,root,-) %doc docs/* %{python_sitelib}/webob/ %{python_sitelib}/WebOb*.egg-info/ %changelog * Thu Jul 17 2008 Ricky Zhou 0.9.2-2 - Remove conftest from the tests. * Fri Jun 27 2008 Ricky Zhou 0.9.2-1 - Upstream released new version. - Rename to python-webob, as mentioned in the Python package naming guidelines. - Clean up spec. - Add %%check section. * Sat Mar 15 2008 Tom "spot" Callaway 0.9-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:44:09 -0000 1.1 +++ .cvsignore 27 Jul 2008 20:57:54 -0000 1.2 @@ -0,0 +1 @@ +WebOb-0.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:44:09 -0000 1.1 +++ sources 27 Jul 2008 20:57:54 -0000 1.2 @@ -0,0 +1 @@ +5354df7300ff58bcf89f11ff9e040a82 WebOb-0.9.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 20:59:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Sun, 27 Jul 2008 20:59:41 GMT Subject: rpms/python-webob/F-8 WebOb-0.9.2-fix-tests.patch, NONE, 1.1 import.log, NONE, 1.1 python-webob.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807272059.m6RKxf47028139@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-webob/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28100/F-8 Modified Files: .cvsignore sources Added Files: WebOb-0.9.2-fix-tests.patch import.log python-webob.spec Log Message: Initial import. WebOb-0.9.2-fix-tests.patch: --- NEW FILE WebOb-0.9.2-fix-tests.patch --- --- WebOb-0.9.2/tests/test_response.txt.old 2008-06-27 02:03:13.000000000 -0400 +++ WebOb-0.9.2/tests/test_response.txt 2008-06-27 02:07:56.000000000 -0400 @@ -62,15 +62,15 @@ Cookie handling is done through methods: >>> res.set_cookie('test', 'value') >>> res.headers['set-cookie'] - 'test=value; Path=/;' + 'test=value; Path=/' >>> res.set_cookie('test2', 'value2', max_age=10000) >>> res.headers['set-cookie'] # We only see the last header - 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/;' + 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/' >>> res.headers.getall('set-cookie') - ['test=value; Path=/;', 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/;'] + ['test=value; Path=/', 'test2=value2; expires="... GMT"; Max-Age=10000; Path=/'] >>> res.unset_cookie('test') >>> res.headers.getall('set-cookie') - ['test2=value2; expires="... GMT"; Max-Age=10000; Path=/;'] + ['test2=value2; expires="... GMT"; Max-Age=10000; Path=/'] Most headers are available in a parsed getter/setter form through properties: --- NEW FILE import.log --- python-webob-0_9_2-2_fc9:F-8:python-webob-0.9.2-2.fc9.src.rpm:1217192340 --- NEW FILE python-webob.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-webob Summary: WSGI request and response object Version: 0.9.2 Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://pythonpaste.org/webob/ Source0: http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz Patch0: WebOb-0.9.2-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel BuildRequires: python-nose BuildRequires: python-dtopt %description WebOb provides wrappers around the WSGI request environment, and an object to help create WSGI responses. The objects map much of the specified behavior of HTTP, including header parsing and accessors for other standard parts of the environment. %prep %setup -q -n WebOb-%{version} %patch0 -p1 # Disable the tests that require python-webtest # (which depends on python-webob to begin with) %{__rm} -f tests/test_request.py # Disable conftest, which assumes that WebOb is already installed %{__rm} -f tests/conftest.py %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %clean %{__rm} -rf %{buildroot} %check ./test %files %defattr(-,root,root,-) %doc docs/* %{python_sitelib}/webob/ %{python_sitelib}/WebOb*.egg-info/ %changelog * Thu Jul 17 2008 Ricky Zhou 0.9.2-2 - Remove conftest from the tests. * Fri Jun 27 2008 Ricky Zhou 0.9.2-1 - Upstream released new version. - Rename to python-webob, as mentioned in the Python package naming guidelines. - Clean up spec. - Add %%check section. * Sat Mar 15 2008 Tom "spot" Callaway 0.9-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Jul 2008 16:44:09 -0000 1.1 +++ .cvsignore 27 Jul 2008 20:59:10 -0000 1.2 @@ -0,0 +1 @@ +WebOb-0.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Jul 2008 16:44:09 -0000 1.1 +++ sources 27 Jul 2008 20:59:10 -0000 1.2 @@ -0,0 +1 @@ +5354df7300ff58bcf89f11ff9e040a82 WebOb-0.9.2.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 21:09:21 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 21:09:21 GMT Subject: rpms/python-toscawidgets/F-8 python-toscawidgets.spec,1.3,1.4 Message-ID: <200807272109.m6RL9LGA002661@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-toscawidgets/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2610/F-8 Modified Files: python-toscawidgets.spec Log Message: * Sun Jul 27 2008 Toshio Kuratomi - 0.9.2-2 - Require python-webob Index: python-toscawidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-8/python-toscawidgets.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-toscawidgets.spec 11 Jul 2008 16:38:31 -0000 1.3 +++ python-toscawidgets.spec 27 Jul 2008 21:08:51 -0000 1.4 @@ -5,7 +5,7 @@ Name: python-toscawidgets Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit to help create widgets for WSGI web apps Group: Development/Languages License: MIT @@ -21,6 +21,7 @@ # Can replace this with python-cjson -- since TG-1 uses simplejson we'll use # this for now. Requires: python-simplejson +Requires: python-webob %description ToscaWidgets is a web widget toolkit for Python to aid in the creation, @@ -55,6 +56,9 @@ %changelog +* Sun Jul 27 2008 Toshio Kuratomi - 0.9.2-2 +- Require python-webob + * Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 - Update to latest release. - Fixes problem with pages being returned as text/plain. From fedora-extras-commits at redhat.com Sun Jul 27 21:09:22 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 21:09:22 GMT Subject: rpms/python-toscawidgets/F-9 python-toscawidgets.spec,1.3,1.4 Message-ID: <200807272109.m6RL9MMw002664@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-toscawidgets/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2610/F-9 Modified Files: python-toscawidgets.spec Log Message: * Sun Jul 27 2008 Toshio Kuratomi - 0.9.2-2 - Require python-webob Index: python-toscawidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-9/python-toscawidgets.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-toscawidgets.spec 11 Jul 2008 16:38:48 -0000 1.3 +++ python-toscawidgets.spec 27 Jul 2008 21:08:52 -0000 1.4 @@ -5,7 +5,7 @@ Name: python-toscawidgets Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit to help create widgets for WSGI web apps Group: Development/Languages License: MIT @@ -21,6 +21,7 @@ # Can replace this with python-cjson -- since TG-1 uses simplejson we'll use # this for now. Requires: python-simplejson +Requires: python-webob %description ToscaWidgets is a web widget toolkit for Python to aid in the creation, @@ -55,6 +56,9 @@ %changelog +* Sun Jul 27 2008 Toshio Kuratomi - 0.9.2-2 +- Require python-webob + * Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 - Update to latest release. - Fixes problem with pages being returned as text/plain. From fedora-extras-commits at redhat.com Sun Jul 27 21:09:22 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 21:09:22 GMT Subject: rpms/python-toscawidgets/devel python-toscawidgets.spec,1.5,1.6 Message-ID: <200807272109.m6RL9MN8002667@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-toscawidgets/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2610/devel Modified Files: python-toscawidgets.spec Log Message: * Sun Jul 27 2008 Toshio Kuratomi - 0.9.2-2 - Require python-webob Index: python-toscawidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/python-toscawidgets.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-toscawidgets.spec 11 Jul 2008 15:44:05 -0000 1.5 +++ python-toscawidgets.spec 27 Jul 2008 21:08:52 -0000 1.6 @@ -5,7 +5,7 @@ Name: python-toscawidgets Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Toolkit to help create widgets for WSGI web apps Group: Development/Languages License: MIT @@ -21,6 +21,7 @@ # Can replace this with python-cjson -- since TG-1 uses simplejson we'll use # this for now. Requires: python-simplejson +Requires: python-webob %description ToscaWidgets is a web widget toolkit for Python to aid in the creation, @@ -55,6 +56,9 @@ %changelog +* Sun Jul 27 2008 Toshio Kuratomi - 0.9.2-2 +- Require python-webob + * Mon Jul 07 2008 Toshio Kuratomi - 0.9.2-1 - Update to latest release. - Fixes problem with pages being returned as text/plain. From fedora-extras-commits at redhat.com Sun Jul 27 21:53:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 21:53:18 GMT Subject: rpms/python-migrate/devel python-migrate.spec, 1.3, 1.4 python-migrate-shell-test.patch, 1.1, NONE Message-ID: <200807272153.m6RLrItC004097@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4065 Modified Files: python-migrate.spec Removed Files: python-migrate-shell-test.patch Log Message: * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-migrate.spec 25 Jul 2008 05:22:43 -0000 1.3 +++ python-migrate.spec 27 Jul 2008 21:52:47 -0000 1.4 @@ -4,15 +4,13 @@ Name: python-migrate Version: 0.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz -# Fix a test when migrate is not installed. Applied upstream. -Patch0: python-migrate-shell-test.patch # Local patch to disable py.test. Needed until py.test is in Fedora. Patch1: python-migrate-disable-pytest.patch @@ -31,7 +29,6 @@ %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 -b .env %patch1 -p1 -b .pytest %build @@ -59,6 +56,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 +- Remove patches that are merged upstream. + * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-1 - New upstream --- python-migrate-shell-test.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 21:59:01 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sun, 27 Jul 2008 21:59:01 GMT Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.32,1.33 Message-ID: <200807272159.m6RLx1Xl004372@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4318/F-9 Modified Files: kde-l10n.spec Log Message: * Sun Jul 27 2008 Rex Dieter 4.1.0-1.2 - file conflict between kde-l10n and libkdcraw (#456797) Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- kde-l10n.spec 26 Jul 2008 22:37:12 -0000 1.32 +++ kde-l10n.spec 27 Jul 2008 21:58:31 -0000 1.33 @@ -2,7 +2,7 @@ Name: kde-l10n Version: 4.1.0 -Release: 1%{dist}.1 +Release: 1%{dist}.2 Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -751,8 +751,10 @@ if [ -e docs/kdeadmin/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt fi - # on F9, remove all kdepim stuff except kjots %if 0%{?fedora} <= 9 +# remove kdegraphics/libkdcraw + rm -f messages/kdegraphics/libkdcraw.po +# remove all kdepim stuff except kjots for j in messages/kdepim/*.po ; do if [ "$j" != "messages/kdepim/kjots.po" ] ; then rm -f "$j" @@ -1274,6 +1276,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Sun Jul 27 2008 Rex Dieter 4.1.0-1.2 +- file conflict between kde-l10n and libkdcraw (#456797) + * Sat Jul 26 2008 Kevin Kofler 4.1.0-1.1 - on F9, remove translations for kdepim apps we don't ship (#456745) From fedora-extras-commits at redhat.com Sun Jul 27 21:59:02 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sun, 27 Jul 2008 21:59:02 GMT Subject: rpms/kde-l10n/devel kde-l10n.spec,1.40,1.41 Message-ID: <200807272159.m6RLx2xE004376@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4318/devel Modified Files: kde-l10n.spec Log Message: * Sun Jul 27 2008 Rex Dieter 4.1.0-1.2 - file conflict between kde-l10n and libkdcraw (#456797) Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- kde-l10n.spec 26 Jul 2008 23:46:52 -0000 1.40 +++ kde-l10n.spec 27 Jul 2008 21:58:32 -0000 1.41 @@ -2,7 +2,7 @@ Name: kde-l10n Version: 4.1.0 -Release: 1%{dist}.1 +Release: 1%{dist}.2 Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -751,8 +751,10 @@ if [ -e docs/kdeadmin/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt fi - # on F9, remove all kdepim stuff except kjots %if 0%{?fedora} <= 9 +# remove kdegraphics/libkdcraw + rm -f messages/kdegraphics/libkdcraw.po +# remove all kdepim stuff except kjots for j in messages/kdepim/*.po ; do if [ "$j" != "messages/kdepim/kjots.po" ] ; then rm -f "$j" @@ -1274,6 +1276,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Sun Jul 27 2008 Rex Dieter 4.1.0-1.2 +- file conflict between kde-l10n and libkdcraw (#456797) + * Sat Jul 26 2008 Kevin Kofler 4.1.0-1.1 - on F9, remove translations for kdepim apps we don't ship (#456745) From fedora-extras-commits at redhat.com Sun Jul 27 22:01:17 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 22:01:17 GMT Subject: rpms/python-migrate/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807272201.m6RM1HL8011134@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4464/EL-5 Modified Files: .cvsignore sources Log Message: * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 00:18:19 -0000 1.1 +++ .cvsignore 27 Jul 2008 22:00:47 -0000 1.2 @@ -0,0 +1 @@ +sqlalchemy-migrate-0.4.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 00:18:19 -0000 1.1 +++ sources 27 Jul 2008 22:00:47 -0000 1.2 @@ -0,0 +1 @@ +d4f17e2c7fcfbb7bd0df628d974c8e3e sqlalchemy-migrate-0.4.5.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 22:01:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 22:01:18 GMT Subject: rpms/python-migrate/F-9 .cvsignore, 1.2, 1.3 python-migrate.spec, 1.2, 1.3 sources, 1.2, 1.3 python-migrate-shell-test.patch, 1.1, NONE Message-ID: <200807272201.m6RM1I3Q011144@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4464/F-9 Modified Files: .cvsignore python-migrate.spec sources Removed Files: python-migrate-shell-test.patch Log Message: * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jul 2008 19:46:20 -0000 1.2 +++ .cvsignore 27 Jul 2008 22:00:48 -0000 1.3 @@ -1 +1 @@ -sqlalchemy-migrate-0.4.4.tar.gz +sqlalchemy-migrate-0.4.5.tar.gz Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-9/python-migrate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-migrate.spec 17 Jul 2008 20:02:13 -0000 1.2 +++ python-migrate.spec 27 Jul 2008 22:00:48 -0000 1.3 @@ -3,16 +3,14 @@ %define srcname sqlalchemy-migrate Name: python-migrate -Version: 0.4.4 -Release: 4%{?dist} +Version: 0.4.5 +Release: 2%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz -# Fix a test when migrate is not installed. Applied upstream. -Patch0: python-migrate-shell-test.patch # Local patch to disable py.test. Needed until py.test is in Fedora. Patch1: python-migrate-disable-pytest.patch @@ -31,7 +29,6 @@ %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 -b .env %patch1 -p1 -b .pytest %build @@ -59,6 +56,12 @@ %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 +- Remove patches that are merged upstream. + +* Thu Jul 17 2008 Toshio Kuratomi 0.4.5-1 +- New upstream + * Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 - Disable py.test so we don't try to download it during build. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jul 2008 19:46:20 -0000 1.2 +++ sources 27 Jul 2008 22:00:48 -0000 1.3 @@ -1 +1 @@ -ea2da4aaeb82b538ec23148b35ead72c sqlalchemy-migrate-0.4.4.tar.gz +d4f17e2c7fcfbb7bd0df628d974c8e3e sqlalchemy-migrate-0.4.5.tar.gz --- python-migrate-shell-test.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 22:01:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 22:01:18 GMT Subject: rpms/python-migrate/F-8 .cvsignore, 1.2, 1.3 python-migrate.spec, 1.2, 1.3 sources, 1.2, 1.3 python-migrate-shell-test.patch, 1.1, NONE Message-ID: <200807272201.m6RM1Io9011139@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4464/F-8 Modified Files: .cvsignore python-migrate.spec sources Removed Files: python-migrate-shell-test.patch Log Message: * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jul 2008 19:45:58 -0000 1.2 +++ .cvsignore 27 Jul 2008 22:00:48 -0000 1.3 @@ -1 +1 @@ -sqlalchemy-migrate-0.4.4.tar.gz +sqlalchemy-migrate-0.4.5.tar.gz Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-8/python-migrate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-migrate.spec 17 Jul 2008 20:01:59 -0000 1.2 +++ python-migrate.spec 27 Jul 2008 22:00:48 -0000 1.3 @@ -3,16 +3,14 @@ %define srcname sqlalchemy-migrate Name: python-migrate -Version: 0.4.4 -Release: 4%{?dist} +Version: 0.4.5 +Release: 2%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz -# Fix a test when migrate is not installed. Applied upstream. -Patch0: python-migrate-shell-test.patch # Local patch to disable py.test. Needed until py.test is in Fedora. Patch1: python-migrate-disable-pytest.patch @@ -31,7 +29,6 @@ %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 -b .env %patch1 -p1 -b .pytest %build @@ -59,6 +56,12 @@ %{python_sitelib}/* %changelog +* Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 +- Remove patches that are merged upstream. + +* Thu Jul 17 2008 Toshio Kuratomi 0.4.5-1 +- New upstream + * Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 - Disable py.test so we don't try to download it during build. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jul 2008 19:45:58 -0000 1.2 +++ sources 27 Jul 2008 22:00:48 -0000 1.3 @@ -1 +1 @@ -ea2da4aaeb82b538ec23148b35ead72c sqlalchemy-migrate-0.4.4.tar.gz +d4f17e2c7fcfbb7bd0df628d974c8e3e sqlalchemy-migrate-0.4.5.tar.gz --- python-migrate-shell-test.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 27 22:40:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sun, 27 Jul 2008 22:40:48 GMT Subject: rpms/control-center/devel control-center.spec,1.387,1.388 Message-ID: <200807272240.m6RMemN5013074@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13015 Modified Files: control-center.spec Log Message: fix up gconf schema installation Index: control-center.spec =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v retrieving revision 1.387 retrieving revision 1.388 diff -u -r1.387 -r1.388 --- control-center.spec 27 Jul 2008 02:12:32 -0000 1.387 +++ control-center.spec 27 Jul 2008 22:40:18 -0000 1.388 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.5 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -241,9 +241,8 @@ %post /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/fontilus.schemas \ - %{_sysconfdir}/gconf/schemas/control-center.schemas \ +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/control-center.schemas \ > /dev/null || : update-desktop-database --quiet %{_datadir}/applications update-mime-database %{_datadir}/mime > /dev/null @@ -255,19 +254,25 @@ %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/fontilus.schemas \ - %{_sysconfdir}/gconf/schemas/control-center.schemas \ - > /dev/null || : + for f in fontilus.schemas control-center.schemas; do + if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/$f \ + > /dev/null || : + fi + done fi %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/fontilus.schemas \ - %{_sysconfdir}/gconf/schemas/control-center.schemas \ - > /dev/null || : + for f in fontilus.schemas control-center.schemas; do + if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/$f \ + > /dev/null || : + fi + done fi %postun @@ -329,6 +334,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Sun Jul 27 2008 Matthias Clasen - 2.23.5-5 +- Fix up gconf schema installation + * Sat Jul 26 2008 Matthias Clasen - 2.23.5-4 - Use standard icon names in more places From fedora-extras-commits at redhat.com Sun Jul 27 22:42:47 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 22:42:47 GMT Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.21, 1.22 python-sqlalchemy.spec, 1.33, 1.34 sources, 1.22, 1.23 Message-ID: <200807272242.m6RMglk3013283@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13213 Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: * Sun Jul 27 2008 Toshio Kuratomi 0.4.7-1 - Update to 0.4.7. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 1 Jun 2008 20:33:59 -0000 1.21 +++ .cvsignore 27 Jul 2008 22:42:17 -0000 1.22 @@ -1 +1 @@ -SQLAlchemy-0.4.6.tar.gz +SQLAlchemy-0.4.7.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- python-sqlalchemy.spec 1 Jun 2008 20:33:59 -0000 1.33 +++ python-sqlalchemy.spec 27 Jul 2008 22:42:17 -0000 1.34 @@ -4,7 +4,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.4.6 +Version: 0.4.7 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -56,6 +56,9 @@ %{python_sitelib}/* %changelog +* Sun Jul 27 2008 Toshio Kuratomi 0.4.7-1 +- Update to 0.4.7. + * Sun Jun 1 2008 Toshio Kuratomi 0.4.6-1 - Update to 0.4.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 1 Jun 2008 20:33:59 -0000 1.22 +++ sources 27 Jul 2008 22:42:17 -0000 1.23 @@ -1 +1 @@ -3043efb59000887ebe13fdcd6b6efadb SQLAlchemy-0.4.6.tar.gz +05ca8a49c3e34fa2ed4d679c640ec65d SQLAlchemy-0.4.7.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 22:53:53 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 22:53:53 GMT Subject: rpms/python-sqlalchemy/F-9 .cvsignore, 1.21, 1.22 python-sqlalchemy.spec, 1.33, 1.34 sources, 1.22, 1.23 Message-ID: <200807272253.m6RMrrmQ013827@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-sqlalchemy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13763/F-9 Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: * Sun Jul 27 2008 Toshio Kuratomi 0.4.7-1 - Update to 0.4.7. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-9/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 2 Jun 2008 03:52:24 -0000 1.21 +++ .cvsignore 27 Jul 2008 22:53:23 -0000 1.22 @@ -1 +1 @@ -SQLAlchemy-0.4.6.tar.gz +SQLAlchemy-0.4.7.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-9/python-sqlalchemy.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- python-sqlalchemy.spec 2 Jun 2008 03:52:24 -0000 1.33 +++ python-sqlalchemy.spec 27 Jul 2008 22:53:23 -0000 1.34 @@ -4,7 +4,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.4.6 +Version: 0.4.7 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -56,6 +56,9 @@ %{python_sitelib}/* %changelog +* Sun Jul 27 2008 Toshio Kuratomi 0.4.7-1 +- Update to 0.4.7. + * Sun Jun 1 2008 Toshio Kuratomi 0.4.6-1 - Update to 0.4.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 2 Jun 2008 03:52:24 -0000 1.22 +++ sources 27 Jul 2008 22:53:23 -0000 1.23 @@ -1 +1 @@ -3043efb59000887ebe13fdcd6b6efadb SQLAlchemy-0.4.6.tar.gz +05ca8a49c3e34fa2ed4d679c640ec65d SQLAlchemy-0.4.7.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 22:53:53 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sun, 27 Jul 2008 22:53:53 GMT Subject: rpms/python-sqlalchemy/F-8 .cvsignore, 1.21, 1.22 python-sqlalchemy.spec, 1.33, 1.34 sources, 1.22, 1.23 Message-ID: <200807272253.m6RMrrdP013822@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-sqlalchemy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13763/F-8 Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: * Sun Jul 27 2008 Toshio Kuratomi 0.4.7-1 - Update to 0.4.7. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-8/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 2 Jun 2008 03:52:05 -0000 1.21 +++ .cvsignore 27 Jul 2008 22:53:22 -0000 1.22 @@ -1 +1 @@ -SQLAlchemy-0.4.6.tar.gz +SQLAlchemy-0.4.7.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-8/python-sqlalchemy.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- python-sqlalchemy.spec 2 Jun 2008 03:52:05 -0000 1.33 +++ python-sqlalchemy.spec 27 Jul 2008 22:53:22 -0000 1.34 @@ -4,7 +4,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.4.6 +Version: 0.4.7 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -56,6 +56,9 @@ %{python_sitelib}/* %changelog +* Sun Jul 27 2008 Toshio Kuratomi 0.4.7-1 +- Update to 0.4.7. + * Sun Jun 1 2008 Toshio Kuratomi 0.4.6-1 - Update to 0.4.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-8/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 2 Jun 2008 03:52:05 -0000 1.22 +++ sources 27 Jul 2008 22:53:22 -0000 1.23 @@ -1 +1 @@ -3043efb59000887ebe13fdcd6b6efadb SQLAlchemy-0.4.6.tar.gz +05ca8a49c3e34fa2ed4d679c640ec65d SQLAlchemy-0.4.7.tar.gz From fedora-extras-commits at redhat.com Sun Jul 27 23:01:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 23:01:08 +0000 Subject: [pkgdb] sinjdoc ownership updated Message-ID: <20080727230109.551B31AD0E5@bastion.fedora.phx.redhat.com> Package sinjdoc in Fedora devel is now owned by Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sinjdoc From fedora-extras-commits at redhat.com Sun Jul 27 23:02:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 23:02:01 +0000 Subject: [pkgdb] system-switch-java ownership updated Message-ID: <20080727230201.C78FF1AD0E5@bastion.fedora.phx.redhat.com> Package system-switch-java in Fedora devel is now owned by Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java From fedora-extras-commits at redhat.com Sun Jul 27 23:04:03 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 27 Jul 2008 23:04:03 GMT Subject: rpms/zabbix/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 zabbix.spec, 1.23, 1.24 Message-ID: <200807272304.m6RN43xZ020918@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/zabbix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20891 Modified Files: .cvsignore sources zabbix.spec Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Mar 2008 02:35:49 -0000 1.11 +++ .cvsignore 27 Jul 2008 23:03:33 -0000 1.12 @@ -1 +1 @@ -zabbix-1.4.5.tar.gz +zabbix-1.4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 May 2008 17:17:54 -0000 1.12 +++ sources 27 Jul 2008 23:03:33 -0000 1.13 @@ -1 +1 @@ -f87d73852fdab33f99beebfd16c21c63 zabbix-1.4.5.tar.gz +4fbea19748b7e9a894a18f4e11b988ca zabbix-1.4.6.tar.gz Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- zabbix.spec 7 Jul 2008 08:03:13 -0000 1.23 +++ zabbix.spec 27 Jul 2008 23:03:33 -0000 1.24 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.4.5 -Release: 4%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -252,6 +252,9 @@ %{_datadir}/%{name}/js/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 + * Mon Jul 07 2008 Dan Horak - 1.4.5-4 - add LSB headers into init scripts - disable internal log rotation From fedora-extras-commits at redhat.com Sun Jul 27 23:04:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 23:04:14 +0000 Subject: [pkgdb] system-switch-java ownership updated Message-ID: <20080727230414.46B8C1AD0E5@bastion.fedora.phx.redhat.com> Package system-switch-java in Fedora devel was orphaned by Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-java From fedora-extras-commits at redhat.com Sun Jul 27 23:04:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 27 Jul 2008 23:04:11 +0000 Subject: [pkgdb] MegaMek ownership updated Message-ID: <20080727230416.BAAFF1AD0EC@bastion.fedora.phx.redhat.com> Package MegaMek in Fedora devel is now owned by Deepak Bhole (dbhole) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/MegaMek From fedora-extras-commits at redhat.com Sun Jul 27 23:43:41 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 27 Jul 2008 23:43:41 GMT Subject: rpms/kernel/devel linux-2.6-x86-tracehook.patch,1.3,1.4 Message-ID: <200807272343.m6RNhfJE022189@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22155 Modified Files: linux-2.6-x86-tracehook.patch Log Message: replace botched patch linux-2.6-x86-tracehook.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-x86-tracehook.patch Index: linux-2.6-x86-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-tracehook.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-x86-tracehook.patch 27 Jul 2008 07:22:15 -0000 1.3 +++ linux-2.6-x86-tracehook.patch 27 Jul 2008 23:43:11 -0000 1.4 @@ -1,1125 +1,12 @@ - Documentation/isdn/README.mISDN | 6 - - arch/alpha/kernel/osf_sys.c | 10 +- - arch/arm/mach-at91/at91cap9_devices.c | 8 +- - arch/arm/mach-at91/at91rm9200_devices.c | 8 +- - arch/arm/mach-at91/at91sam9260_devices.c | 8 +- - arch/arm/mach-at91/at91sam9261_devices.c | 12 +- - arch/arm/mach-at91/at91sam9263_devices.c | 8 +- - arch/arm/mach-at91/at91sam9rl_devices.c | 12 +- - arch/arm/mach-at91/board-cam60.c | 2 +- - arch/arm/mach-at91/board-cap9adk.c | 2 +- - arch/arm/mach-at91/board-dk.c | 2 +- - arch/arm/mach-at91/board-kb9202.c | 2 +- - arch/arm/mach-at91/board-sam9-l9260.c | 2 +- - arch/arm/mach-at91/board-sam9260ek.c | 2 +- - arch/arm/mach-at91/board-sam9261ek.c | 2 +- - arch/arm/mach-at91/board-sam9263ek.c | 2 +- - arch/arm/mach-at91/board-sam9rlek.c | 2 +- - arch/arm/mach-at91/board-yl-9200.c | 2 +- - arch/avr32/boards/atstk1000/Kconfig | 4 - - arch/avr32/boards/atstk1000/Makefile | 1 - - arch/avr32/boards/atstk1000/atstk1002.c | 78 +- - arch/avr32/mach-at32ap/at32ap700x.c | 52 - - arch/avr32/mach-at32ap/hsmc.c | 2 +- - arch/parisc/hpux/sys_hpux.c | 10 +- - arch/x86/Kconfig | 1 + - arch/x86/kernel/ptrace.c | 34 +- - arch/x86/kernel/signal_32.c | 11 +- - arch/x86/kernel/signal_64.c | 49 +- - drivers/char/ser_a2232.c | 52 +- - drivers/char/vme_scc.c | 59 +- - drivers/firmware/memmap.c | 6 +- - drivers/infiniband/core/ucm.c | 10 +- - drivers/infiniband/core/ucma.c | 11 +- - drivers/infiniband/hw/mlx4/cq.c | 1 - - drivers/infiniband/hw/mlx4/main.c | 1 - - drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 - - drivers/infiniband/hw/mlx4/mr.c | 1 - - drivers/infiniband/hw/mlx4/qp.c | 1 - - drivers/infiniband/hw/mlx4/srq.c | 1 - - drivers/infiniband/hw/mlx4/user.h | 1 - - drivers/infiniband/hw/nes/nes.c | 4 +- - drivers/infiniband/hw/nes/nes_cm.c | 2034 +++++------- - drivers/infiniband/hw/nes/nes_cm.h | 23 +- - drivers/infiniband/hw/nes/nes_hw.c | 9 + - drivers/infiniband/hw/nes/nes_verbs.c | 15 + - drivers/infiniband/ulp/ipoib/Kconfig | 22 +- - drivers/isdn/Kconfig | 4 +- - drivers/isdn/Makefile | 1 - - drivers/isdn/hardware/Makefile | 1 - - drivers/isdn/hardware/mISDN/Kconfig | 25 - - drivers/isdn/hardware/mISDN/Makefile | 7 - - drivers/isdn/hardware/mISDN/hfc_multi.h | 1204 ------- - drivers/isdn/hardware/mISDN/hfc_pci.h | 228 -- - drivers/isdn/hardware/mISDN/hfcmulti.c | 5320 ------------------------------ - drivers/isdn/hardware/mISDN/hfcpci.c | 2256 ------------- - drivers/isdn/mISDN/Kconfig | 44 - - drivers/isdn/mISDN/Makefile | 13 - - drivers/isdn/mISDN/core.c | 244 -- - drivers/isdn/mISDN/core.h | 77 - - drivers/isdn/mISDN/dsp.h | 263 -- - drivers/isdn/mISDN/dsp_audio.c | 434 --- - drivers/isdn/mISDN/dsp_biquad.h | 65 - - drivers/isdn/mISDN/dsp_blowfish.c | 672 ---- - drivers/isdn/mISDN/dsp_cmx.c | 1886 ----------- - drivers/isdn/mISDN/dsp_core.c | 1191 ------- - drivers/isdn/mISDN/dsp_dtmf.c | 303 -- - drivers/isdn/mISDN/dsp_ecdis.h | 110 - - drivers/isdn/mISDN/dsp_hwec.c | 138 - - drivers/isdn/mISDN/dsp_hwec.h | 10 - - drivers/isdn/mISDN/dsp_pipeline.c | 348 -- - drivers/isdn/mISDN/dsp_tones.c | 551 --- - drivers/isdn/mISDN/fsm.c | 183 - - drivers/isdn/mISDN/fsm.h | 67 - - drivers/isdn/mISDN/hwchannel.c | 365 -- - drivers/isdn/mISDN/l1oip.h | 91 - - drivers/isdn/mISDN/l1oip_codec.c | 374 --- - drivers/isdn/mISDN/l1oip_core.c | 1518 --------- - drivers/isdn/mISDN/layer1.c | 403 --- - drivers/isdn/mISDN/layer1.h | 26 - - drivers/isdn/mISDN/layer2.c | 2216 ------------- - drivers/isdn/mISDN/layer2.h | 140 - - drivers/isdn/mISDN/socket.c | 781 ----- - drivers/isdn/mISDN/stack.c | 674 ---- - drivers/isdn/mISDN/tei.c | 1340 -------- - drivers/isdn/mISDN/timerdev.c | 301 -- - drivers/mmc/core/Makefile | 1 - - drivers/mmc/core/bus.c | 8 - - drivers/mmc/core/core.h | 7 - - drivers/mmc/core/debugfs.c | 225 -- - drivers/mmc/core/host.c | 8 - - drivers/mmc/host/atmel-mci-regs.h | 2 - - drivers/mmc/host/atmel-mci.c | 189 -- - drivers/mmc/host/imxmmc.c | 50 +- - drivers/mmc/host/mmc_spi.c | 3 +- - drivers/mtd/Kconfig | 2 + - drivers/mtd/afs.c | 2 + - drivers/mtd/chips/cfi_cmdset_0001.c | 17 +- - drivers/mtd/chips/cfi_cmdset_0002.c | 3 + - drivers/mtd/chips/cfi_cmdset_0020.c | 2 + - drivers/mtd/chips/cfi_probe.c | 1 + - drivers/mtd/chips/cfi_util.c | 3 + - drivers/mtd/chips/chipreg.c | 2 + - drivers/mtd/chips/gen_probe.c | 5 +- - drivers/mtd/chips/jedec_probe.c | 133 +- - drivers/mtd/chips/map_absent.c | 1 + - drivers/mtd/chips/map_ram.c | 1 + - drivers/mtd/chips/map_rom.c | 1 + - drivers/mtd/cmdlinepart.c | 4 +- - drivers/mtd/devices/Kconfig | 1 + - drivers/mtd/devices/Makefile | 1 + - drivers/mtd/devices/block2mtd.c | 6 + - drivers/mtd/devices/doc2000.c | 2 + - drivers/mtd/devices/doc2001.c | 2 + - drivers/mtd/devices/doc2001plus.c | 2 + - drivers/mtd/devices/docecc.c | 2 + - drivers/mtd/devices/docprobe.c | 5 + - drivers/mtd/devices/lart.c | 2 + - drivers/mtd/devices/m25p80.c | 22 - - drivers/mtd/devices/ms02-nv.c | 2 + - drivers/mtd/devices/ms02-nv.h | 2 + - drivers/mtd/devices/mtd_dataflash.c | 135 +- - drivers/mtd/devices/mtdram.c | 1 + - drivers/mtd/devices/phram.c | 2 + - drivers/mtd/devices/pmc551.c | 2 + - drivers/mtd/devices/slram.c | 2 + - drivers/mtd/ftl.c | 3 + - drivers/mtd/inftlcore.c | 5 + - drivers/mtd/inftlmount.c | 4 + - drivers/mtd/maps/Kconfig | 30 +- - drivers/mtd/maps/Makefile | 3 +- - drivers/mtd/maps/amd76xrom.c | 1 + - drivers/mtd/maps/autcpu12-nvram.c | 2 + - drivers/mtd/maps/bast-flash.c | 226 ++ - drivers/mtd/maps/bfin-async-flash.c | 219 -- - drivers/mtd/maps/cdb89712.c | 1 + - drivers/mtd/maps/ceiva.c | 1 + - drivers/mtd/maps/cfi_flagadm.c | 2 + - drivers/mtd/maps/dbox2-flash.c | 2 + - drivers/mtd/maps/dc21285.c | 2 + - drivers/mtd/maps/dilnetpc.c | 2 + - drivers/mtd/maps/dmv182.c | 2 + - drivers/mtd/maps/ebony.c | 2 + - drivers/mtd/maps/edb7312.c | 2 + - drivers/mtd/maps/fortunet.c | 1 + - drivers/mtd/maps/h720x-flash.c | 2 + - drivers/mtd/maps/ichxrom.c | 1 + - drivers/mtd/maps/impa7.c | 2 + - drivers/mtd/maps/integrator-flash.c | 2 + - drivers/mtd/maps/ipaq-flash.c | 2 + - drivers/mtd/maps/ixp2000.c | 2 + - drivers/mtd/maps/ixp4xx.c | 2 + - drivers/mtd/maps/l440gx.c | 2 + - drivers/mtd/maps/map_funcs.c | 2 + - drivers/mtd/maps/mbx860.c | 2 + - drivers/mtd/maps/netsc520.c | 2 + - drivers/mtd/maps/nettel.c | 2 + - drivers/mtd/maps/octagon-5066.c | 1 + - drivers/mtd/maps/omap-toto-flash.c | 2 + - drivers/mtd/maps/pci.c | 2 + - drivers/mtd/maps/pcmciamtd.c | 5 +- - drivers/mtd/maps/physmap.c | 24 +- - drivers/mtd/maps/plat-ram.c | 2 + - drivers/mtd/maps/redwood.c | 2 + - drivers/mtd/maps/rpxlite.c | 2 + - drivers/mtd/maps/sa1100-flash.c | 2 + - drivers/mtd/maps/sbc8240.c | 3 + - drivers/mtd/maps/sbc_gxx.c | 2 + - drivers/mtd/maps/sc520cdp.c | 2 + - drivers/mtd/maps/scb2_flash.c | 1 + - drivers/mtd/maps/scx200_docflash.c | 2 + - drivers/mtd/maps/sharpsl-flash.c | 2 + - drivers/mtd/maps/solutionengine.c | 2 + - drivers/mtd/maps/sun_uflash.c | 2 +- - drivers/mtd/maps/tqm8xxl.c | 2 + - drivers/mtd/maps/ts5500_flash.c | 2 + - drivers/mtd/maps/tsunami_flash.c | 1 + - drivers/mtd/maps/uclinux.c | 2 + - drivers/mtd/maps/vmax301.c | 1 + - drivers/mtd/maps/walnut.c | 2 + - drivers/mtd/maps/wr_sbc82xx_flash.c | 2 + - drivers/mtd/mtd_blkdevs.c | 34 +- - drivers/mtd/mtdblock.c | 2 + - drivers/mtd/mtdblock_ro.c | 2 + - drivers/mtd/mtdchar.c | 24 +- - drivers/mtd/mtdconcat.c | 2 + - drivers/mtd/mtdcore.c | 14 +- - drivers/mtd/mtdpart.c | 448 ++-- - drivers/mtd/nand/Kconfig | 28 +- - drivers/mtd/nand/Makefile | 3 +- - drivers/mtd/nand/at91_nand.c | 594 ++++ - drivers/mtd/nand/atmel_nand.c | 650 ---- [...44836 lines suppressed...] -+ int inflight_refs; - - total_refs = file_count(u->sk.sk_socket->file); -- inflight_refs = atomic_long_read(&u->inflight); -+ inflight_refs = atomic_read(&u->inflight); - - BUG_ON(inflight_refs < 1); - BUG_ON(total_refs < inflight_refs); -@@ -324,7 +324,7 @@ void unix_gc(void) - /* Move cursor to after the current position. */ - list_move(&cursor, &u->link); - -- if (atomic_long_read(&u->inflight) > 0) { -+ if (atomic_read(&u->inflight) > 0) { - list_move_tail(&u->link, &gc_inflight_list); - u->gc_candidate = 0; - scan_children(&u->sk, inc_inflight_move_tail, NULL); -diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c -index 96036cf..23a2cc0 100644 ---- a/net/xfrm/xfrm_algo.c -+++ b/net/xfrm/xfrm_algo.c -@@ -718,7 +718,7 @@ int skb_icv_walk(const struct sk_buff *s - for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { - int end; - -- WARN_ON(start > offset + len); -+ BUG_TRAP(start <= offset + len); - - end = start + skb_shinfo(skb)->frags[i].size; - if ((copy = end - offset) > 0) { -@@ -748,7 +748,7 @@ int skb_icv_walk(const struct sk_buff *s - for (; list; list = list->next) { - int end; - -- WARN_ON(start > offset + len); -+ BUG_TRAP(start <= offset + len); - - end = start + list->len; - if ((copy = end - offset) > 0) { -diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c -index c609a4b..800f669 100644 ---- a/net/xfrm/xfrm_ipcomp.c -+++ b/net/xfrm/xfrm_ipcomp.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -250,7 +251,7 @@ static void ipcomp_free_tfms(struct cryp - break; - } - -- WARN_ON(!pos); -+ BUG_TRAP(pos); - - if (--pos->users) - return; -diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c -index 4c6914e..72fddaf 100644 ---- a/net/xfrm/xfrm_state.c -+++ b/net/xfrm/xfrm_state.c -@@ -538,7 +538,7 @@ EXPORT_SYMBOL(xfrm_state_alloc); - - void __xfrm_state_destroy(struct xfrm_state *x) - { -- WARN_ON(x->km.state != XFRM_STATE_DEAD); -+ BUG_TRAP(x->km.state == XFRM_STATE_DEAD); - - spin_lock_bh(&xfrm_state_lock); - list_del(&x->all); -diff --git a/security/capability.c b/security/capability.c -index 63d10da..5b01c0b 100644 ---- a/security/capability.c -+++ b/security/capability.c -@@ -211,7 +211,8 @@ static int cap_inode_follow_link(struct - return 0; - } - --static int cap_inode_permission(struct inode *inode, int mask) -+static int cap_inode_permission(struct inode *inode, int mask, -+ struct nameidata *nd) - { - return 0; - } -diff --git a/security/security.c b/security/security.c -index ff70687..59f23b5 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -429,11 +429,11 @@ int security_inode_follow_link(struct de - return security_ops->inode_follow_link(dentry, nd); - } - --int security_inode_permission(struct inode *inode, int mask) -+int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd) - { - if (unlikely(IS_PRIVATE(inode))) - return 0; -- return security_ops->inode_permission(inode, mask); -+ return security_ops->inode_permission(inode, mask, nd); - } - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) -@@ -442,7 +442,6 @@ int security_inode_setattr(struct dentry - return 0; - return security_ops->inode_setattr(dentry, attr); - } --EXPORT_SYMBOL_GPL(security_inode_setattr); - - int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry) - { -diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index 40d06c5..3481cde 100644 ---- a/security/selinux/hooks.c -+++ b/security/selinux/hooks.c -@@ -2624,11 +2624,12 @@ static int selinux_inode_follow_link(str - return dentry_has_perm(current, NULL, dentry, FILE__READ); - } - --static int selinux_inode_permission(struct inode *inode, int mask) -+static int selinux_inode_permission(struct inode *inode, int mask, -+ struct nameidata *nd) - { - int rc; - -- rc = secondary_ops->inode_permission(inode, mask); -+ rc = secondary_ops->inode_permission(inode, mask, nd); - if (rc) - return rc; - -@@ -5653,20 +5654,27 @@ static struct nf_hook_ops selinux_ipv6_o - static int __init selinux_nf_ip_init(void) - { - int err = 0; -+ u32 iter; - - if (!selinux_enabled) - goto out; - - printk(KERN_DEBUG "SELinux: Registering netfilter hooks\n"); - -- err = nf_register_hooks(selinux_ipv4_ops, ARRAY_SIZE(selinux_ipv4_ops)); -- if (err) -- panic("SELinux: nf_register_hooks for IPv4: error %d\n", err); -+ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv4_ops); iter++) { -+ err = nf_register_hook(&selinux_ipv4_ops[iter]); -+ if (err) -+ panic("SELinux: nf_register_hook for IPv4: error %d\n", -+ err); -+ } - - #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) -- err = nf_register_hooks(selinux_ipv6_ops, ARRAY_SIZE(selinux_ipv6_ops)); -- if (err) -- panic("SELinux: nf_register_hooks for IPv6: error %d\n", err); -+ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv6_ops); iter++) { -+ err = nf_register_hook(&selinux_ipv6_ops[iter]); -+ if (err) -+ panic("SELinux: nf_register_hook for IPv6: error %d\n", -+ err); -+ } - #endif /* IPV6 */ - - out: -@@ -5678,11 +5686,15 @@ __initcall(selinux_nf_ip_init); - #ifdef CONFIG_SECURITY_SELINUX_DISABLE - static void selinux_nf_ip_exit(void) - { -+ u32 iter; -+ - printk(KERN_DEBUG "SELinux: Unregistering netfilter hooks\n"); - -- nf_unregister_hooks(selinux_ipv4_ops, ARRAY_SIZE(selinux_ipv4_ops)); -+ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv4_ops); iter++) -+ nf_unregister_hook(&selinux_ipv4_ops[iter]); - #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) -- nf_unregister_hooks(selinux_ipv6_ops, ARRAY_SIZE(selinux_ipv6_ops)); -+ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv6_ops); iter++) -+ nf_unregister_hook(&selinux_ipv6_ops[iter]); - #endif /* IPV6 */ - } - #endif -diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c -index 1b40e55..ee5a51c 100644 ---- a/security/smack/smack_lsm.c -+++ b/security/smack/smack_lsm.c -@@ -522,7 +522,8 @@ static int smack_inode_rename(struct ino - * - * Returns 0 if access is permitted, -EACCES otherwise - */ --static int smack_inode_permission(struct inode *inode, int mask) -+static int smack_inode_permission(struct inode *inode, int mask, -+ struct nameidata *nd) - { - /* - * No permission to check. Existence test. Yup, it's there. + /* flags to check in __switch_to() */ + #define _TIF_WORK_CTXSW \ From fedora-extras-commits at redhat.com Mon Jul 28 00:17:49 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 00:17:49 GMT Subject: rpms/mousetweaks/devel icon-names.patch, NONE, 1.1 mousetweaks.spec, 1.8, 1.9 Message-ID: <200807280017.m6S0Hn2k030416@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/mousetweaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30377 Modified Files: mousetweaks.spec Added Files: icon-names.patch Log Message: use standard icon name icon-names.patch: --- NEW FILE icon-names.patch --- diff -up mousetweaks-2.23.5/src/mt-common.h.icon-names mousetweaks-2.23.5/src/mt-common.h --- mousetweaks-2.23.5/src/mt-common.h.icon-names 2008-07-27 20:13:42.000000000 -0400 +++ mousetweaks-2.23.5/src/mt-common.h 2008-07-27 20:14:20.000000000 -0400 @@ -28,7 +28,7 @@ G_BEGIN_DECLS -#define MT_ICON_NAME "gnome-dev-mouse-optical" +#define MT_ICON_NAME "input-mouse" #define MT_GCONF_HOME "/desktop/gnome/accessibility/mouse" #define OPT_THRESHOLD MT_GCONF_HOME "/threshold" Index: mousetweaks.spec =================================================================== RCS file: /cvs/extras/rpms/mousetweaks/devel/mousetweaks.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mousetweaks.spec 22 Jul 2008 18:59:00 -0000 1.8 +++ mousetweaks.spec 28 Jul 2008 00:17:18 -0000 1.9 @@ -1,6 +1,6 @@ Name: mousetweaks Version: 2.23.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mouse accessibility support for the GNOME desktop Group: User Interface/Desktops License: GPLv3 and GFDL @@ -24,6 +24,8 @@ Requires(post): GConf2 Requires(preun): GConf2 +# http://bugzilla.gnome.org/show_bug.cgi?id=545059 +Patch0: icon-names.patch %description The Mousetweaks package provides mouse accessibility enhancements for @@ -34,7 +36,7 @@ %prep %setup -q - +%patch0 -p1 -b .icon-names %build %configure @@ -94,6 +96,9 @@ %doc %{_mandir}/man1/* %changelog +* Sun Jul 27 2008 Matthias Clasen - 2.23.5-2 +- Use standard icon name + * Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 - Update to 2.23.5 From fedora-extras-commits at redhat.com Mon Jul 28 00:22:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 28 Jul 2008 00:22:25 GMT Subject: rpms/ltsp/F-9 .cvsignore, 1.13, 1.14 ltsp.spec, 1.22, 1.23 sources, 1.17, 1.18 Message-ID: <200807280022.m6S0MP4C030711@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30684 Modified Files: .cvsignore ltsp.spec sources Log Message: Preparation for future feature "local applications" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Jul 2008 19:49:07 -0000 1.13 +++ .cvsignore 28 Jul 2008 00:21:55 -0000 1.14 @@ -1 +1 @@ -ltsp-5.1.13.tar.bz2 +ltsp-5.1.14.tar.bz2 Index: ltsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ltsp.spec 21 Jul 2008 17:07:51 -0000 1.22 +++ ltsp.spec 28 Jul 2008 00:21:55 -0000 1.23 @@ -1,8 +1,8 @@ Name: ltsp -Version: 5.1.13 -%define _datestamp .20080718.14 +Version: 5.1.14 +%define _datestamp .20080727.18 #Release: 0%{_datestamp}%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Linux Terminal Server Project Server and Client Group: User Interface/Desktops @@ -44,6 +44,7 @@ Group: User Interface/Desktops Requires: chkconfig Requires: ltspfsd +BuildRequires: glib2-devel %description client LTSP client package @@ -347,6 +348,9 @@ %endif %changelog +* Sun Jul 27 2008 Warren Togami - 5.1.14-1 +- Preparation for future feature "local applications" + * Fri Jul 18 2008 Warren Togami - 5.1.13-2 - Add some spec conditionals for RHEL5. RHEL5 has only ltsp-server. Client chroot must be Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 18 Jul 2008 19:49:07 -0000 1.17 +++ sources 28 Jul 2008 00:21:55 -0000 1.18 @@ -1 +1 @@ -919c5649823ca615ee53798e8be31d35 ltsp-5.1.13.tar.bz2 +6d61c96fd142dae9735a34cb3c7666f4 ltsp-5.1.14.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 00:34:47 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 00:34:47 GMT Subject: rpms/nautilus/devel icon-names.patch, NONE, 1.1 nautilus.spec, 1.216, 1.217 Message-ID: <200807280034.m6S0YlsL031355@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/nautilus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31303 Modified Files: nautilus.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up nautilus-2.23.5/src/nautilus-file-management-properties.c.icon-names nautilus-2.23.5/src/nautilus-file-management-properties.c --- nautilus-2.23.5/src/nautilus-file-management-properties.c.icon-names 2008-07-27 20:29:35.000000000 -0400 +++ nautilus-2.23.5/src/nautilus-file-management-properties.c 2008-07-27 20:30:13.000000000 -0400 @@ -801,7 +801,7 @@ nautilus_file_management_properties_dial (GClosureNotify)g_object_unref, 0); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "file-manager"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "system-file-manager"); if (window) { gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- nautilus.spec 22 Jul 2008 15:06:10 -0000 1.216 +++ nautilus.spec 28 Jul 2008 00:34:17 -0000 1.217 @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.23.5.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2 @@ -98,6 +98,9 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=519743 Patch17: nautilus-filetype-symlink-fix.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=545062 +Patch18: icon-names.patch + %description Nautilus integrates access to files, applications, media, Internet-based resources and the Web. Nautilus delivers a dynamic and @@ -137,6 +140,7 @@ %patch14 -p1 -b .default-to-asking %patch15 -p1 -b .xds %patch17 -p0 -b .symlink +%patch18 -p1 -b .icon-names %build @@ -255,6 +259,9 @@ %changelog +* Sun Jul 27 2008 Matthias Clasen - 2.23.5-2 +- Use standard icon names + * Tue Jul 22 2008 Tomas Bzatek - 2.23.5.1-1 - Update to 2.23.5.1 From fedora-extras-commits at redhat.com Mon Jul 28 01:03:40 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 28 Jul 2008 01:03:40 GMT Subject: rpms/xorg-x11-utils/devel sources, 1.9, 1.10 xorg-x11-utils.spec, 1.22, 1.23 Message-ID: <200807280103.m6S13eLa007499@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7451 Modified Files: sources xorg-x11-utils.spec Log Message: * Sun Jul 27 2008 Adam Jackson 7.4-3 - Drop xdriinfo. Would be better suited to being in Mesa's glx-utils subpackage anyway. (#456609) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 15 Jul 2008 17:38:57 -0000 1.9 +++ sources 28 Jul 2008 01:03:10 -0000 1.10 @@ -1,4 +1,3 @@ -a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2 e3008eb0655da3026c162a5597d70869 xev-1.0.2.tar.bz2 c72abd90f50ef459bc14b39ec9fcc7f8 xfd-1.0.1.tar.bz2 288fe4cf8a990e4e602aac16dd9109fb xfontsel-1.0.2.tar.bz2 Index: xorg-x11-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xorg-x11-utils.spec 15 Jul 2008 17:38:57 -0000 1.22 +++ xorg-x11-utils.spec 28 Jul 2008 01:03:10 -0000 1.23 @@ -3,14 +3,14 @@ Summary: X.Org X11 X client utilities Name: xorg-x11-%{pkgname} Version: 7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2 -Source1: ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2 +#Source1: ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2 Source4: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2 @@ -37,14 +37,14 @@ BuildRequires: libXxf86misc-devel BuildRequires: libXxf86vm-devel -Provides: xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo +Provides: xdpyinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo %description A collection of client utilities which can be used to query the X server for various information, view and select fonts, etc. %prep -%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 +%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 %build # Build all apps @@ -75,7 +75,6 @@ %defattr(-,root,root,-) %doc %{_bindir}/xdpyinfo -%{_bindir}/xdriinfo %{_bindir}/xev %{_bindir}/xfd %{_bindir}/xfontsel @@ -89,7 +88,6 @@ %{_datadir}/X11/app-defaults/XFontSel %{_datadir}/X11/app-defaults/Xfd %{_mandir}/man1/xdpyinfo.1* -%{_mandir}/man1/xdriinfo.1* %{_mandir}/man1/xev.1* %{_mandir}/man1/xfd.1* %{_mandir}/man1/xfontsel.1* @@ -101,6 +99,10 @@ %{_mandir}/man1/xwininfo.1* %changelog +* Sun Jul 27 2008 Adam Jackson 7.4-3 +- Drop xdriinfo. Would be better suited to being in Mesa's glx-utils + subpackage anyway. (#456609) + * Tue Jul 15 2008 Adam Jackson 7.4-2 - Fix license tag. From fedora-extras-commits at redhat.com Mon Jul 28 01:11:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 28 Jul 2008 01:11:44 GMT Subject: rpms/ldm/F-9 .cvsignore, 1.6, 1.7 ldm.spec, 1.10, 1.11 sources, 1.10, 1.11 Message-ID: <200807280111.m6S1BiJA007707@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ldm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7684 Modified Files: .cvsignore ldm.spec sources Log Message: - Major code cleanup and simplification SSH message direct to UI. ldm_spawn simplification. Proper glib string handling. - Preparation for local apps feature Export LDM_USERNAME /var/cache/ldm for local apps feature S01-localapps - Bug Fix: Login input validation - Automatic login after timeout in guest mode - Optional LDM_LIMIT_ONE_SESSION feature Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Jul 2008 21:59:15 -0000 1.6 +++ .cvsignore 28 Jul 2008 01:11:14 -0000 1.7 @@ -1 +1 @@ -ldm-2.0.7.tar.bz2 +ldm-2.0.8.tar.bz2 Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ldm.spec 1 Jul 2008 21:59:15 -0000 1.10 +++ ldm.spec 28 Jul 2008 01:11:14 -0000 1.11 @@ -1,5 +1,5 @@ Name: ldm -Version: 2.0.7 +Version: 2.0.8 #%define _datestamp .20080324.10 Release: 1%{?dist} Summary: LTSP Display Manager @@ -52,8 +52,22 @@ %{_mandir}/man1/ldm.1.gz %{_datadir}/ltsp/screen.d/ldm %dir %{_localstatedir}/run/ldm/ +%dir %{_localstatedir}/cache/ldm/ %changelog +* Sun Jul 27 2008 Warren Togami - 2.0.8-1 +- Major code cleanup and simplification + SSH message direct to UI. + ldm_spawn simplification. + Proper glib string handling. +- Preparation for local apps feature + Export LDM_USERNAME + /var/cache/ldm for local apps feature + S01-localapps +- Bug Fix: Login input validation +- Automatic login after timeout in guest mode +- Optional LDM_LIMIT_ONE_SESSION feature + * Tue Jul 01 2008 Warren Togami - 2.0.7-1 - 2.0.7 adds keyboard layout setting within ldm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 1 Jul 2008 21:59:15 -0000 1.10 +++ sources 28 Jul 2008 01:11:14 -0000 1.11 @@ -1 +1 @@ -a61b48e4ff95c70cff0b63cc7c53394e ldm-2.0.7.tar.bz2 +2f237b497c324efb875b97a72f07c3e5 ldm-2.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 01:14:44 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 28 Jul 2008 01:14:44 GMT Subject: rpms/libxcb/F-8 libxcb-1.1-sloppy-lock.patch, NONE, 1.1 libxcb.spec, 1.5, 1.6 Message-ID: <200807280114.m6S1Ei3P007796@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libxcb/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7760 Modified Files: libxcb.spec Added Files: libxcb-1.1-sloppy-lock.patch Log Message: * Sun Jul 27 2008 Adam Jackson 1.1-1.1 - libxcb-1.1-sloppy-lock.patch: Backport sloppy lock semantics from F9 for verisimilitude. (#456824) libxcb-1.1-sloppy-lock.patch: --- NEW FILE libxcb-1.1-sloppy-lock.patch --- diff -up libxcb-1.1/src/xcb_conn.c.jx libxcb-1.1/src/xcb_conn.c --- libxcb-1.1/src/xcb_conn.c.jx 2007-10-28 16:11:18.000000000 -0400 +++ libxcb-1.1/src/xcb_conn.c 2008-04-22 11:58:05.000000000 -0400 @@ -63,7 +63,7 @@ static int _xcb_xlib_init(_xcb_xlib *xli { xlib->lock = 0; #ifndef NDEBUG - xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0); + xlib->sloppy_lock = 1; #endif pthread_cond_init(&xlib->cond, 0); return 1; Index: libxcb.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxcb/F-8/libxcb.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libxcb.spec 21 Jul 2008 15:21:31 -0000 1.5 +++ libxcb.spec 28 Jul 2008 01:14:14 -0000 1.6 @@ -1,6 +1,6 @@ Name: libxcb Version: 1.1 -Release: 1%{?dist} +Release: 1.1%{?dist} Summary: A C binding to the X11 protocol Group: System Environment/Libraries @@ -11,6 +11,7 @@ Patch0: libxcb-1.1-no-pthread-stubs.patch Patch1: libxcb-1.1-abstract-socket.patch +Patch2: libxcb-1.1-sloppy-lock.patch BuildRequires: autoconf automake libtool pkgconfig BuildRequires: doxygen @@ -47,6 +48,7 @@ %setup -q %patch0 -p1 -b .pthread-stubs %patch1 -p1 -b .abstract +%patch2 -p1 -b .sloppier %build autoreconf -v --install @@ -80,6 +82,10 @@ %{_datadir}/doc/%{name}-%{version} %changelog +* Sun Jul 27 2008 Adam Jackson 1.1-1.1 +- libxcb-1.1-sloppy-lock.patch: Backport sloppy lock semantics from F9 + for verisimilitude. (#456824) + * Mon Nov 12 2007 Adam Jackson 1.1-1 - libxcb 1.1 From fedora-extras-commits at redhat.com Mon Jul 28 02:05:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 02:05:44 GMT Subject: rpms/gvfs/devel icon-names.patch,NONE,1.1 gvfs.spec,1.61,1.62 Message-ID: <200807280205.m6S25iSg017864@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17837 Modified Files: gvfs.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gvfs-0.99.3/daemon/gvfsbackendburn.c.icon-names gvfs-0.99.3/daemon/gvfsbackendburn.c --- gvfs-0.99.3/daemon/gvfsbackendburn.c.icon-names 2008-07-27 21:44:52.000000000 -0400 +++ gvfs-0.99.3/daemon/gvfsbackendburn.c 2008-07-27 21:45:38.000000000 -0400 @@ -344,7 +344,7 @@ g_vfs_backend_burn_init (GVfsBackendBurn /* Translators: This is the name of the backend */ g_vfs_backend_set_display_name (backend, _("Burn")); - g_vfs_backend_set_icon_name (backend, "gnome-fs-client"); + g_vfs_backend_set_icon_name (backend, "computer"); g_vfs_backend_set_user_visible (backend, FALSE); mount_spec = g_mount_spec_new ("burn"); diff -up gvfs-0.99.3/daemon/gvfsbackendcomputer.c.icon-names gvfs-0.99.3/daemon/gvfsbackendcomputer.c --- gvfs-0.99.3/daemon/gvfsbackendcomputer.c.icon-names 2008-07-27 21:45:52.000000000 -0400 +++ gvfs-0.99.3/daemon/gvfsbackendcomputer.c 2008-07-27 21:46:41.000000000 -0400 @@ -177,7 +177,7 @@ g_vfs_backend_computer_init (GVfsBackend GMountSpec *mount_spec; g_vfs_backend_set_display_name (backend, _("Computer")); - g_vfs_backend_set_icon_name (backend, "gnome-fs-client"); + g_vfs_backend_set_icon_name (backend, "computer"); g_vfs_backend_set_user_visible (backend, FALSE); mount_spec = g_mount_spec_new ("computer"); @@ -691,7 +691,7 @@ try_query_info (GVfsBackend *backend, g_file_info_set_name (info, "/"); g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY); g_file_info_set_display_name (info, _("Computer")); - icon = g_themed_icon_new ("gnome-fs-client"); + icon = g_themed_icon_new ("computer"); g_file_info_set_icon (info, icon); g_object_unref (icon); g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, FALSE); diff -up gvfs-0.99.3/daemon/gvfsbackenddnssd.c.icon-names gvfs-0.99.3/daemon/gvfsbackenddnssd.c --- gvfs-0.99.3/daemon/gvfsbackenddnssd.c.icon-names 2008-07-27 21:54:51.000000000 -0400 +++ gvfs-0.99.3/daemon/gvfsbackenddnssd.c 2008-07-27 21:56:35.000000000 -0400 @@ -50,10 +50,10 @@ static struct { char *icon; gpointer handle; } dns_sd_types[] = { - {"_ftp._tcp", "ftp", "gnome-fs-ftp"}, - {"_webdav._tcp", "dav", "gnome-fs-share"}, - {"_webdavs._tcp", "davs", "gnome-fs-share"}, - {"_sftp-ssh._tcp", "sftp", "gnome-fs-ssh"}, + {"_ftp._tcp", "ftp", "folder-remote-ftp"}, + {"_webdav._tcp", "dav", "folder-remote"}, + {"_webdavs._tcp", "davs", "folder-remote"}, + {"_sftp-ssh._tcp", "sftp", "folder-remote-ssh"}, }; static AvahiClient *global_client = NULL; Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- gvfs.spec 24 Jul 2008 02:09:02 -0000 1.61 +++ gvfs.spec 28 Jul 2008 02:05:14 -0000 1.62 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 0.99.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -33,6 +33,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=525779 Patch3: gvfs-0.2.4-trash-automount.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=545068 +Patch4: icon-names.patch %description The gvfs package provides backend implementations for the gio @@ -115,6 +117,7 @@ %setup -q %patch1 -p0 -b .archive-integration %patch3 -p1 -b .trash +%patch4 -p1 -b .icon-names %build @@ -253,6 +256,9 @@ %changelog +* Sun Jul 27 2008 Matthias Clasen - 0.99.3-2 +- Use standard icon names + * Wed Jul 23 2008 Matthias Clasen - 0.99.3-1 - Update to 0.99.3 From fedora-extras-commits at redhat.com Mon Jul 28 02:09:06 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 28 Jul 2008 02:09:06 GMT Subject: rpms/kernel/devel config-generic, 1.145, 1.146 kernel.spec, 1.811, 1.812 linux-2.6-build-nonintconfig.patch, 1.13, 1.14 Message-ID: <200807280209.m6S296t8018048@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18013 Modified Files: config-generic kernel.spec linux-2.6-build-nonintconfig.patch Log Message: * Sun Jul 27 2008 Roland McGrath - 2.6.26-git16 - Fix up linux-2.6-build-nonintconfig.patch after kconfig changes. - Reenable sfc module. Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- config-generic 27 Jul 2008 07:22:15 -0000 1.145 +++ config-generic 28 Jul 2008 02:08:36 -0000 1.146 @@ -438,6 +438,7 @@ CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m # # SCSI support type (disk, tape, CD-ROM) @@ -1225,7 +1226,7 @@ CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y -CONFIG_SFC=n +CONFIG_SFC=m # CONFIG_SK98LIN is not set CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set @@ -1537,8 +1538,16 @@ # # ISDN subsystem # +CONFIG_ISDN=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m -CONFIG_ISDN=m +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m CONFIG_ISDN_I4L=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.811 retrieving revision 1.812 diff -u -r1.811 -r1.812 --- kernel.spec 27 Jul 2008 20:15:18 -0000 1.811 +++ kernel.spec 28 Jul 2008 02:08:36 -0000 1.812 @@ -1694,6 +1694,8 @@ %changelog * Sun Jul 27 2008 Roland McGrath - 2.6.26-git16 +- Fix up linux-2.6-build-nonintconfig.patch after kconfig changes. +- Reenable sfc module. * Sun Jul 27 2008 Roland McGrath - 2.6.26-git15 linux-2.6-build-nonintconfig.patch: Index: linux-2.6-build-nonintconfig.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux-2.6-build-nonintconfig.patch 12 Feb 2008 06:18:04 -0000 1.13 +++ linux-2.6-build-nonintconfig.patch 28 Jul 2008 02:08:36 -0000 1.14 @@ -36,47 +36,51 @@ static const char *get_help(struct menu *menu) { if (menu_has_help(menu)) -@@ -112,6 +116,16 @@ static int conf_askvalue(struct symbol *sym, const char *def) - fflush(stdout); - fgets(line, 128, stdin); - return 1; -+ case dont_ask: -+ if (!sym_has_value(sym)) { -+ fprintf(stderr,"CONFIG_%s\n",sym->name); -+ return_value++; -+ } -+ /*FALLTHROUGH*/ -+ case dont_ask_dont_tell: -+ if (sym_has_value(sym)) -+ return 0; -+ return 1; - case set_default: - printf("%s\n", def); - return 1; -@@ -351,6 +365,11 @@ static int conf_choice(struct menu *menu) - printf("?"); - printf("]: "); - switch (input_mode) { -+ case dont_ask: -+ case dont_ask_dont_tell: -+ cnt = def; -+ printf("%d\n", cnt); -+ break; - case ask_new: - case ask_silent: - if (!is_new) { -@@ -486,6 +505,10 @@ static void check_conf(struct menu *menu) +@@ -358,7 +362,10 @@ static void conf(struct menu *menu) + + switch (prop->type) { + case P_MENU: +- if (input_mode == ask_silent && rootEntry != menu) { ++ if ((input_mode == ask_silent || ++ input_mode == dont_ask || ++ input_mode == dont_ask_dont_tell) && ++ rootEntry != menu) { + check_conf(menu); + return; + } +@@ -416,12 +423,21 @@ static void check_conf(struct menu *menu + if (sym && !sym_has_value(sym)) { + if (sym_is_changable(sym) || + (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { ++ if (input_mode == dont_ask || ++ input_mode == dont_ask_dont_tell) { ++ if (input_mode == dont_ask && ++ sym->name && !sym_is_choice_value(sym)) { ++ fprintf(stderr,"CONFIG_%s\n",sym->name); ++ ++return_value; ++ } ++ } else { if (!conf_cnt++) printf(_("*\n* Restart config...\n*\n")); rootEntry = menu_get_parent_menu(menu); -+ if (input_mode == dont_ask -+ || input_mode == dont_ask_dont_tell) -+ fprintf(stderr,"CONFIG_%s\n",sym->name); -+ else conf(rootEntry); } } -@@ -504,11 +527,17 @@ int main(int ac, char **av) ++ } + + for (child = menu->list; child; child = child->next) + check_conf(child); +@@ -433,7 +449,8 @@ static void conf_do_update(void) + do { + conf_cnt = 0; + check_conf(&rootmenu); +- } while (conf_cnt); ++ } while (conf_cnt && ++ (input_mode != dont_ask && input_mode != dont_ask_dont_tell)); + } + + static int conf_silent_update(void) +@@ -474,11 +491,17 @@ int main(int ac, char **av) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); @@ -95,7 +99,7 @@ case 's': input_mode = ask_silent; valid_stdin = isatty(0) && isatty(1) && isatty(2); -@@ -573,6 +602,8 @@ int main(int ac, char **av) +@@ -543,6 +566,8 @@ int main(int ac, char **av) } case ask_all: case ask_new: @@ -104,20 +108,19 @@ conf_read(NULL); break; case set_no: -@@ -619,7 +650,8 @@ int main(int ac, char **av) - do { - conf_cnt = 0; - check_conf(&rootmenu); -- } while (conf_cnt); -+ } while (conf_cnt && (input_mode != dont_ask -+ && input_mode != dont_ask_dont_tell)); - if (conf_write(NULL)) { +@@ -585,6 +610,8 @@ int main(int ac, char **av) + case set_default: + conf_set_all_new_symbols(def_default); + break; ++ case dont_ask: ++ case dont_ask_dont_tell: + case ask_silent: + case ask_new: + if (conf_silent_update()) +@@ -607,5 +634,5 @@ int main(int ac, char **av) fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); return 1; -@@ -630,5 +662,5 @@ skip_check: - return 1; } - - return 0; + return return_value; } From fedora-extras-commits at redhat.com Mon Jul 28 02:45:58 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 28 Jul 2008 02:45:58 GMT Subject: rpms/kernel/devel kernel.spec,1.812,1.813 Message-ID: <200807280245.m6S2jwG9019484@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19381 Modified Files: kernel.spec Log Message: Fix up .spec for headers check. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.812 retrieving revision 1.813 diff -u -r1.812 -r1.813 --- kernel.spec 28 Jul 2008 02:08:36 -0000 1.812 +++ kernel.spec 28 Jul 2008 02:45:28 -0000 1.813 @@ -128,6 +128,7 @@ %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}.%{_target_cpu} %define hdrarch %_target_cpu +%define asmarch %_target_cpu %if 0%{!?nopatches:1} %define nopatches 0 @@ -248,10 +249,12 @@ %define all_arch_configs kernel-%{version}-i?86*.config %define image_install_path boot %define hdrarch i386 +%define asmarch x86 %define kernel_image arch/x86/boot/bzImage %endif %ifarch x86_64 +%define asmarch x86 %define all_arch_configs kernel-%{version}-x86_64*.config %define image_install_path boot %define kernel_image arch/x86/boot/bzImage @@ -1471,20 +1474,19 @@ # Install kernel headers make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install -# Manually go through the 'headers_check' process for every file, but -# don't die if it fails -chmod +x scripts/hdrcheck.sh -echo -e '*****\n*****\nHEADER EXPORT WARNINGS:\n*****' > hdrwarnings.txt -for FILE in `find $RPM_BUILD_ROOT/usr/include` ; do - scripts/hdrcheck.sh $RPM_BUILD_ROOT/usr/include $FILE /dev/null >> hdrwarnings.txt || : -done -echo -e '*****\n*****' >> hdrwarnings.txt +# Do headers_check but don't die if it fails. +make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_check \ + > hdrwarnings.txt || : if grep -q exist hdrwarnings.txt; then sed s:^$RPM_BUILD_ROOT/usr/include/:: hdrwarnings.txt # Temporarily cause a build failure if header inconsistencies. # exit 1 fi +find $RPM_BUILD_ROOT/usr/include \ + \( -name .install -o -name .check -o \ + -name ..install.cmd -o -name ..check.cmd \) | xargs rm -f + # glibc provides scsi headers for itself, for now rm -rf $RPM_BUILD_ROOT/usr/include/scsi rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h @@ -1695,6 +1697,7 @@ * Sun Jul 27 2008 Roland McGrath - 2.6.26-git16 - Fix up linux-2.6-build-nonintconfig.patch after kconfig changes. +- Fix up .spec for headers check. - Reenable sfc module. * Sun Jul 27 2008 Roland McGrath From fedora-extras-commits at redhat.com Mon Jul 28 03:01:28 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 03:01:28 GMT Subject: rpms/nautilus/devel icon-names.patch, 1.1, 1.2 nautilus.spec, 1.217, 1.218 Message-ID: <200807280301.m6S31SPn026571@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/nautilus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19938 Modified Files: icon-names.patch nautilus.spec Log Message: more icon name fixes icon-names.patch: Index: icon-names.patch =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/icon-names.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icon-names.patch 28 Jul 2008 00:34:17 -0000 1.1 +++ icon-names.patch 28 Jul 2008 03:00:58 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up nautilus-2.23.5/src/nautilus-file-management-properties.c.icon-names nautilus-2.23.5/src/nautilus-file-management-properties.c ---- nautilus-2.23.5/src/nautilus-file-management-properties.c.icon-names 2008-07-27 20:29:35.000000000 -0400 -+++ nautilus-2.23.5/src/nautilus-file-management-properties.c 2008-07-27 20:30:13.000000000 -0400 +diff -up nautilus-2.23.5.1/src/nautilus-file-management-properties.c.icon-names nautilus-2.23.5.1/src/nautilus-file-management-properties.c +--- nautilus-2.23.5.1/src/nautilus-file-management-properties.c.icon-names 2008-07-21 05:43:25.000000000 -0400 ++++ nautilus-2.23.5.1/src/nautilus-file-management-properties.c 2008-07-27 22:58:28.000000000 -0400 @@ -801,7 +801,7 @@ nautilus_file_management_properties_dial (GClosureNotify)g_object_unref, 0); @@ -10,3 +10,15 @@ if (window) { gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); +diff -up nautilus-2.23.5.1/src/nautilus-navigation-window.c.icon-names nautilus-2.23.5.1/src/nautilus-navigation-window.c +--- nautilus-2.23.5.1/src/nautilus-navigation-window.c.icon-names 2008-07-27 22:58:53.000000000 -0400 ++++ nautilus-2.23.5.1/src/nautilus-navigation-window.c 2008-07-27 22:59:23.000000000 -0400 +@@ -1221,7 +1221,7 @@ static NautilusIconInfo * + real_get_icon (NautilusWindow *window, + NautilusWindowSlot *slot) + { +- return nautilus_icon_info_lookup_from_name ("file-manager", 48); ++ return nautilus_icon_info_lookup_from_name ("system-file-manager", 48); + } + + static void Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- nautilus.spec 28 Jul 2008 00:34:17 -0000 1.217 +++ nautilus.spec 28 Jul 2008 03:00:58 -0000 1.218 @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.23.5.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2 @@ -259,6 +259,9 @@ %changelog +* Sun Jul 27 2008 Matthias Clasen - 2.23.5-3 +- More icon name fixes + * Sun Jul 27 2008 Matthias Clasen - 2.23.5-2 - Use standard icon names From fedora-extras-commits at redhat.com Mon Jul 28 03:20:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 28 Jul 2008 03:20:01 GMT Subject: rpms/ldm/F-9 .cvsignore, 1.7, 1.8 ldm.spec, 1.11, 1.12 sources, 1.11, 1.12 Message-ID: <200807280320.m6S3K1Fx028160@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ldm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28074 Modified Files: .cvsignore ldm.spec sources Log Message: Fix ltspfs unmounting upon logout Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Jul 2008 01:11:14 -0000 1.7 +++ .cvsignore 28 Jul 2008 03:19:30 -0000 1.8 @@ -1 +1 @@ -ldm-2.0.8.tar.bz2 +ldm-2.0.9.tar.bz2 Index: ldm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ldm.spec 28 Jul 2008 01:11:14 -0000 1.11 +++ ldm.spec 28 Jul 2008 03:19:30 -0000 1.12 @@ -1,5 +1,5 @@ Name: ldm -Version: 2.0.8 +Version: 2.0.9 #%define _datestamp .20080324.10 Release: 1%{?dist} Summary: LTSP Display Manager @@ -55,6 +55,9 @@ %dir %{_localstatedir}/cache/ldm/ %changelog +* Sun Jul 27 2008 Warren Togami - 2.0.9-1 +* Fix ltspfs unmounting upon logout + * Sun Jul 27 2008 Warren Togami - 2.0.8-1 - Major code cleanup and simplification SSH message direct to UI. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 28 Jul 2008 01:11:14 -0000 1.11 +++ sources 28 Jul 2008 03:19:30 -0000 1.12 @@ -1 +1 @@ -2f237b497c324efb875b97a72f07c3e5 ldm-2.0.8.tar.bz2 +552212106a6a43de2334381a55cca7d3 ldm-2.0.9.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 03:36:19 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 03:36:19 GMT Subject: rpms/gnome-screensaver/devel gnome-screensaver-2.22.0-securitytoken.patch, NONE, 1.1 icon-names.patch, NONE, 1.1 gnome-screensaver.spec, 1.188, 1.189 gnome-screensaver-2.15.4-default-theme.patch, 1.1, NONE gnome-screensaver-2.18.0-handle-overlapping-heads.patch, 1.2, NONE gnome-screensaver-2.18.0-power-preferences.patch, 1.1, NONE gnome-screensaver-2.18.0-require-mouse-grab.patch, 1.1, NONE gnome-screensaver-2.18.0-standard-flexi-server.patch, 1.1, NONE gnome-screensaver-2.18.0-user-dirs.patch, 1.2, NONE gnome-screensaver-2.20.0-restore-gamma.patch, 1.1, NONE stupid-bullets.patch, 1.1, NONE Message-ID: <200807280336.m6S3aJN9028680@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-screensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28641 Modified Files: gnome-screensaver.spec Added Files: gnome-screensaver-2.22.0-securitytoken.patch icon-names.patch Removed Files: gnome-screensaver-2.15.4-default-theme.patch gnome-screensaver-2.18.0-handle-overlapping-heads.patch gnome-screensaver-2.18.0-power-preferences.patch gnome-screensaver-2.18.0-require-mouse-grab.patch gnome-screensaver-2.18.0-standard-flexi-server.patch gnome-screensaver-2.18.0-user-dirs.patch gnome-screensaver-2.20.0-restore-gamma.patch stupid-bullets.patch Log Message: use standard icon names gnome-screensaver-2.22.0-securitytoken.patch: --- NEW FILE gnome-screensaver-2.22.0-securitytoken.patch --- diff -up gnome-screensaver-2.23.3/configure.ac.securitytoken gnome-screensaver-2.23.3/configure.ac --- gnome-screensaver-2.23.3/configure.ac.securitytoken 2008-05-29 13:52:18.000000000 -0400 +++ gnome-screensaver-2.23.3/configure.ac 2008-07-27 23:20:06.000000000 -0400 @@ -45,6 +45,7 @@ GNOME_DESKTOP_REQUIRED_VERSION=2.23.2 GLADE_REQUIRED_VERSION=2.5.0 LIBGNOMEKBDUI_REQUIRED_VERSION=0.1 +NSS_REQUIRED_VERSION=3.11.2 AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(crypt.h sys/select.h) @@ -59,7 +60,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER, dbus-glib-1 >= $DBUS_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED_VERSION - libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION) + libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION + nss >= $NSS_REQUIRED_VERSION) AC_SUBST(GNOME_SCREENSAVER_CFLAGS) AC_SUBST(GNOME_SCREENSAVER_LIBS) @@ -96,8 +98,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 -GNOME_COMPILE_WARNINGS(yes) - # Solaris requires libresolv for daemon() case "$host" in *-*-solaris*) @@ -219,6 +219,16 @@ fi AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes) AC_SUBST(HAVE_USER_SWITCHING) + +# security token support +PKG_CHECK_MODULES(SECURITY_TOKEN, + gobject-2.0 >= $GLIB_REQUIRED_VERSION + nss >= $NSS_REQUIRED_VERSION) +AC_SUBST(SECURITY_TOKEN_CFLAGS) +AC_SUBST(SECURITY_TOKEN_LIBS) + + + dnl --------------------------------------------------------------------------- dnl - Where should we put documentation ? dnl --------------------------------------------------------------------------- diff -up gnome-screensaver-2.23.3/src/gs-auth-pam.c.securitytoken gnome-screensaver-2.23.3/src/gs-auth-pam.c --- gnome-screensaver-2.23.3/src/gs-auth-pam.c.securitytoken 2008-04-29 22:30:08.000000000 -0400 +++ gnome-screensaver-2.23.3/src/gs-auth-pam.c 2008-07-27 23:20:06.000000000 -0400 @@ -354,6 +354,13 @@ close_pam_handle (int status) status2, (status2 == PAM_SUCCESS ? "Success" : "Failure")); } + + /* iterate the glib event loop inbetween processing pam + * messages so that the user interface can be updated + * to reflect changes that are a result of the pam + * messages + */ + while (g_main_context_iteration (NULL, FALSE)); } if (message_handled_condition != NULL) { diff -up gnome-screensaver-2.23.3/src/gs-monitor.c.securitytoken gnome-screensaver-2.23.3/src/gs-monitor.c --- gnome-screensaver-2.23.3/src/gs-monitor.c.securitytoken 2008-04-29 22:30:08.000000000 -0400 +++ gnome-screensaver-2.23.3/src/gs-monitor.c 2008-07-27 23:20:06.000000000 -0400 @@ -41,10 +41,15 @@ #include "gs-prefs.h" #include "gs-debug.h" +#include "securitytokenmonitor.h" + static void gs_monitor_class_init (GSMonitorClass *klass); static void gs_monitor_init (GSMonitor *monitor); static void gs_monitor_finalize (GObject *object); +static void gs_monitor_simulate_user_activity (GSMonitor *monitor); +static void gs_monitor_lock_screen (GSMonitor *monitor); + #define GS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_MONITOR, GSMonitorPrivate)) struct GSMonitorPrivate @@ -56,6 +61,8 @@ struct GSMonitorPrivate GSFade *fade; GSGrab *grab; + ScSecurityTokenMonitor *security_token_monitor; + guint release_grab_id; }; @@ -100,6 +107,36 @@ manager_auth_request_end_cb (GSManager * gs_listener_emit_auth_request_end (monitor->priv->listener); } +static void +security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor, + ScSecurityToken *token, + GSMonitor *monitor) +{ + gs_monitor_simulate_user_activity (monitor); +} + +static gboolean +gs_monitor_should_lock_on_login_security_token_removal (void) +{ + /* FIXME: lame hack + */ + return system ("pkcs11_setup rm_action | grep -q lock") == 0; +} + +static void +security_token_removed_cb (ScSecurityTokenMonitor *token_monitor, + ScSecurityToken *token, + GSMonitor *monitor) +{ + if (gs_monitor_should_lock_on_login_security_token_removal () && + sc_security_token_is_login_token (token)) + gs_monitor_lock_screen (monitor); + + /* If we're already locked and the lock dialog is up, kill it. + */ + gs_manager_cancel_unlock_request (monitor->priv->manager); +} + static gboolean watcher_idle_cb (GSWatcher *watcher, gboolean is_idle, @@ -210,37 +247,6 @@ watcher_idle_notice_cb (GSWatcher *watch } static void -gs_monitor_lock_screen (GSMonitor *monitor) -{ - gboolean res; - gboolean locked; - - /* set lock flag before trying to activate screensaver - in case something tries to react to the ActiveChanged signal */ - - gs_manager_get_lock_active (monitor->priv->manager, &locked); - gs_manager_set_lock_active (monitor->priv->manager, TRUE); - res = gs_listener_set_active (monitor->priv->listener, TRUE); - if (! res) { - /* If we've failed then restore lock status */ - gs_manager_set_lock_active (monitor->priv->manager, locked); - gs_debug ("Unable to lock the screen"); - } -} - -static void -gs_monitor_simulate_user_activity (GSMonitor *monitor) -{ - /* in case the screen isn't blanked reset the - idle watcher */ - gs_watcher_reset (monitor->priv->watcher); - - /* request that the manager unlock - - will pop up a dialog if necessary */ - gs_manager_request_unlock (monitor->priv->manager); -} - -static void listener_lock_cb (GSListener *listener, GSMonitor *monitor) { @@ -425,6 +431,27 @@ connect_manager_signals (GSMonitor *moni } static void +disconnect_security_token_monitor_signals (GSMonitor *monitor) +{ + g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor, + security_token_removed_cb, monitor); + + g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor, + security_token_inserted_cb, monitor); +} + +static void +connect_security_token_monitor_signals (GSMonitor *monitor) +{ + g_signal_connect (monitor->priv->security_token_monitor, + "security-token-removed", + G_CALLBACK (security_token_removed_cb), monitor); + g_signal_connect (monitor->priv->security_token_monitor, + "security-token-inserted", + G_CALLBACK (security_token_inserted_cb), monitor); +} + +static void disconnect_prefs_signals (GSMonitor *monitor) { g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor); @@ -458,6 +485,26 @@ gs_monitor_init (GSMonitor *monitor) monitor->priv->manager = gs_manager_new (); connect_manager_signals (monitor); [...2518 lines suppressed...] + + _exit (0); + } + + close (write_fd); + +#ifndef SC_SECURITY_TOKEN_MONITOR_DRIVER_CAN_BE_RELOADED_AFTER_BEING_DESTROYED + g_array_append_val (monitor->priv->fds_to_close_on_fork, read_fd); +#endif + + if (worker_pid) + *worker_pid = child_pid; + + if (worker_fd) + *worker_fd = read_fd; + + return TRUE; +} + +#ifdef SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST +#include + +static GMainLoop *event_loop; +static gboolean should_exit_on_next_remove = FALSE; + +static gboolean +on_timeout (ScSecurityTokenMonitor *monitor) +{ + GError *error; + g_print ("Re-enabling monitor.\n"); + + if (!sc_security_token_monitor_start (monitor, &error)) { + g_warning ("could not start security token monitor - %s", + error->message); + g_error_free (error); + return 1; + } + g_print ("Please re-insert security token\n"); + + should_exit_on_next_remove = TRUE; + + return FALSE; +} + +static void +on_device_inserted (ScSecurityTokenMonitor * monitor, + ScSecurityToken *token) +{ + g_print ("security token inserted!\n"); + g_print ("Please remove it.\n"); +} + +static void +on_device_removed (ScSecurityTokenMonitor * monitor, + ScSecurityToken *token) +{ + g_print ("security token removed!\n"); + + if (should_exit_on_next_remove) + g_main_loop_quit (event_loop); + else { + g_print ("disabling monitor for 2 seconds\n"); + sc_security_token_monitor_stop (monitor); + g_timeout_add (2000, (GSourceFunc) on_timeout, monitor); + } +} + +int +main (int argc, + char *argv[]) +{ + ScSecurityTokenMonitor *monitor; + GError *error; + + g_log_set_always_fatal (G_LOG_LEVEL_ERROR + | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); + + g_type_init (); + + g_message ("creating instance of 'security token monitor' object..."); + monitor = sc_security_token_monitor_new (NULL); + g_message ("'security token monitor' object created successfully"); + + g_signal_connect (monitor, "security-token-inserted", + G_CALLBACK (on_device_inserted), NULL); + + g_signal_connect (monitor, "security-token-removed", + G_CALLBACK (on_device_removed), NULL); + + g_message ("starting listener..."); + + error = NULL; + if (!sc_security_token_monitor_start (monitor, &error)) { + g_warning ("could not start security token monitor - %s", + error->message); + g_error_free (error); + return 1; + } + + event_loop = g_main_loop_new (NULL, FALSE); + g_main_loop_run (event_loop); + g_main_loop_unref (event_loop); + event_loop = NULL; + + g_message ("destroying previously created 'security token monitor' object..."); + g_object_unref (monitor); + monitor = NULL; + g_message ("'security token monitor' object destroyed successfully"); + + return 0; +} +#endif diff -up /dev/null gnome-screensaver-2.23.3/src/securitytokenmonitor.h --- /dev/null 2008-07-27 17:37:58.142005663 -0400 +++ gnome-screensaver-2.23.3/src/securitytokenmonitor.h 2008-07-27 23:20:06.000000000 -0400 @@ -0,0 +1,84 @@ +/* securitytokenmonitor.h - monitor for security token insertion and + * removal events + * + * Copyright (C) 2006 Ray Strode + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ +#ifndef SC_SECURITY_TOKEN_MONITOR_H +#define SC_SECURITY_TOKEN_MONITOR_H + +#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API +#include "securitytoken.h" + +#include +#include + +G_BEGIN_DECLS +#define SC_TYPE_SECURITY_TOKEN_MONITOR (sc_security_token_monitor_get_type ()) +#define SC_SECURITY_TOKEN_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitor)) +#define SC_SECURITY_TOKEN_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass)) +#define SC_IS_SECURITY_TOKEN_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR)) +#define SC_IS_SECURITY_TOKEN_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR)) +#define SC_SECURITY_TOKEN_MONITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass)) +#define SC_SECURITY_TOKEN_MONITOR_ERROR (sc_security_token_monitor_error_quark ()) +typedef struct _ScSecurityTokenMonitor ScSecurityTokenMonitor; +typedef struct _ScSecurityTokenMonitorClass ScSecurityTokenMonitorClass; +typedef struct _ScSecurityTokenMonitorPrivate ScSecurityTokenMonitorPrivate; +typedef enum _ScSecurityTokenMonitorError ScSecurityTokenMonitorError; + +struct _ScSecurityTokenMonitor { + GObject parent; + + /*< private > */ + ScSecurityTokenMonitorPrivate *priv; +}; + +struct _ScSecurityTokenMonitorClass { + GObjectClass parent_class; + + /* Signals */ + void (*security_token_inserted) (ScSecurityTokenMonitor *monitor, + ScSecurityToken *token); + void (*security_token_removed) (ScSecurityTokenMonitor *monitor, + ScSecurityToken *token); + void (*error) (ScSecurityTokenMonitor *monitor, + GError *error); +}; + +enum _ScSecurityTokenMonitorError { + SC_SECURITY_TOKEN_MONITOR_ERROR_GENERIC = 0, + SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS, + SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER, + SC_SECURITY_TOKEN_MONITOR_ERROR_WATCHING_FOR_EVENTS, + SC_SECURITY_TOKEN_MONITOR_ERROR_REPORTING_EVENTS +}; + +GType sc_security_token_monitor_get_type (void) G_GNUC_CONST; +GQuark sc_security_token_monitor_error_quark (void) G_GNUC_CONST; + +ScSecurityTokenMonitor *sc_security_token_monitor_new (const gchar *module); + +gboolean sc_security_token_monitor_start (ScSecurityTokenMonitor *monitor, + GError **error); + +void sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor); + +gchar *sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor); +gboolean sc_security_token_monitor_login_token_is_inserted (ScSecurityTokenMonitor *monitor); + +G_END_DECLS +#endif /* SC_SECURITY_TOKEN_MONITOR_H */ icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gnome-screensaver-2.23.3/src/copy-theme-dialog.c.icon-names gnome-screensaver-2.23.3/src/copy-theme-dialog.c --- gnome-screensaver-2.23.3/src/copy-theme-dialog.c.icon-names 2008-07-27 23:29:10.000000000 -0400 +++ gnome-screensaver-2.23.3/src/copy-theme-dialog.c 2008-07-27 23:29:50.000000000 -0400 @@ -301,7 +301,7 @@ add_file_to_dialog (gpointer data, gpoin uri); g_free (uri); gtk_window_set_title (GTK_WINDOW (dialog), ""); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "screensaver"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "preferences-desktop-screensaver"); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff -up gnome-screensaver-2.23.3/src/gnome-screensaver-preferences.c.icon-names gnome-screensaver-2.23.3/src/gnome-screensaver-preferences.c --- gnome-screensaver-2.23.3/src/gnome-screensaver-preferences.c.icon-names 2008-07-27 23:30:09.000000000 -0400 +++ gnome-screensaver-2.23.3/src/gnome-screensaver-preferences.c 2008-07-27 23:30:44.000000000 -0400 @@ -826,7 +826,7 @@ theme_installer_run (GtkWidget *prefs_di gtk_window_set_transient_for (GTK_WINDOW (copy_dialog), GTK_WINDOW (prefs_dialog)); gtk_window_set_icon_name (GTK_WINDOW (copy_dialog), - "screensaver"); + "preferences-desktop-screensaver"); g_signal_connect (copy_dialog, "complete", G_CALLBACK (theme_copy_complete_cb), NULL); @@ -1461,7 +1461,7 @@ init_capplet (void) setup_list_size_constraint (list_scroller, treeview); gtk_widget_set_size_request (preview, 480, 300); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "screensaver"); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "preferences-desktop-screensaver"); gtk_window_set_icon_name (GTK_WINDOW (fullscreen_preview_window), "screensaver"); gtk_drag_dest_set (dialog, GTK_DEST_DEFAULT_ALL, Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- gnome-screensaver.spec 4 Jun 2008 22:57:53 -0000 1.188 +++ gnome-screensaver.spec 28 Jul 2008 03:35:49 -0000 1.189 @@ -14,18 +14,20 @@ Summary: GNOME Screensaver Name: gnome-screensaver Version: 2.23.3 -Release: 0.2008.05.29.2%{?dist} +Release: 0.2008.05.29.3%{?dist} License: GPLv2+ Group: Amusements/Graphics Source0: http://download.gnome.org/sources/gnome-screensaver/2.23/%{name}-%{version}.tar.bz2 Source1: gnome-screensaver-hide-xscreensaver.menu Patch1: gnome-screensaver-2.20.0-default-theme.patch -Patch2: gnome-screensaver-2.18.0-securitytoken.patch +Patch2: gnome-screensaver-2.22.0-securitytoken.patch # add support for gnome-keyring to the pam stack Patch4: gnome-keyring.patch Patch7: gnome-screensaver-2.20.0-blank-by-default.patch Patch8: gnome-screensaver-2.20.0-selinux-permit.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=545072 +Patch9: icon-names.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org @@ -80,6 +82,7 @@ %patch4 -p1 -b .gnome-keyring %patch7 -p1 -b .blank-by-default %patch8 -p1 -b .selinux-permit +%patch9 -p1 -b .icon-names %build # grr, autoreconf seems to break with intltool 0.36.0, unless @@ -146,6 +149,9 @@ %doc %{_mandir}/man1/*.1.gz %changelog +* Sun Jul 27 2008 Matthias Clasen - 2.23.3-0.2008.05.29.3 +- Use standard icon names + * Wed Jun 4 2008 Matthias Clasen - 2.23.3-0.2008.05.29.2 - Rebuild --- gnome-screensaver-2.15.4-default-theme.patch DELETED --- --- gnome-screensaver-2.18.0-handle-overlapping-heads.patch DELETED --- --- gnome-screensaver-2.18.0-power-preferences.patch DELETED --- --- gnome-screensaver-2.18.0-require-mouse-grab.patch DELETED --- --- gnome-screensaver-2.18.0-standard-flexi-server.patch DELETED --- --- gnome-screensaver-2.18.0-user-dirs.patch DELETED --- --- gnome-screensaver-2.20.0-restore-gamma.patch DELETED --- --- stupid-bullets.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 03:38:52 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 28 Jul 2008 03:38:52 GMT Subject: rpms/kernel/devel config-generic, 1.146, 1.147 kernel.spec, 1.813, 1.814 Message-ID: <200807280338.m6S3cqbK028854@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28778 Modified Files: config-generic kernel.spec Log Message: Disable sfc again, still broken on ppc. Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- config-generic 28 Jul 2008 02:08:36 -0000 1.146 +++ config-generic 28 Jul 2008 03:38:21 -0000 1.147 @@ -1226,7 +1226,7 @@ CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y -CONFIG_SFC=m +CONFIG_SFC=n # CONFIG_SK98LIN is not set CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.813 retrieving revision 1.814 diff -u -r1.813 -r1.814 --- kernel.spec 28 Jul 2008 02:45:28 -0000 1.813 +++ kernel.spec 28 Jul 2008 03:38:21 -0000 1.814 @@ -1698,7 +1698,6 @@ - 2.6.26-git16 - Fix up linux-2.6-build-nonintconfig.patch after kconfig changes. - Fix up .spec for headers check. -- Reenable sfc module. * Sun Jul 27 2008 Roland McGrath - 2.6.26-git15 From fedora-extras-commits at redhat.com Mon Jul 28 03:50:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 03:50:48 GMT Subject: rpms/gnome-screensaver/devel buildfix.patch, NONE, 1.1 gnome-screensaver.spec, 1.189, 1.190 Message-ID: <200807280350.m6S3omdq029069@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-screensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29047 Modified Files: gnome-screensaver.spec Added Files: buildfix.patch Log Message: fix the build buildfix.patch: --- NEW FILE buildfix.patch --- diff -up gnome-screensaver-2.23.3/src/copy-theme-dialog.c.buildfix gnome-screensaver-2.23.3/src/copy-theme-dialog.c --- gnome-screensaver-2.23.3/src/copy-theme-dialog.c.buildfix 2008-07-27 23:44:07.000000000 -0400 +++ gnome-screensaver-2.23.3/src/copy-theme-dialog.c 2008-07-27 23:46:54.000000000 -0400 @@ -27,6 +27,7 @@ #include #include #include +#include #include "copy-theme-dialog.h" Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- gnome-screensaver.spec 28 Jul 2008 03:35:49 -0000 1.189 +++ gnome-screensaver.spec 28 Jul 2008 03:50:18 -0000 1.190 @@ -28,6 +28,7 @@ Patch8: gnome-screensaver-2.20.0-selinux-permit.patch # http://bugzilla.gnome.org/show_bug.cgi?id=545072 Patch9: icon-names.patch +Patch10: buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org @@ -83,6 +84,7 @@ %patch7 -p1 -b .blank-by-default %patch8 -p1 -b .selinux-permit %patch9 -p1 -b .icon-names +%patch10 -p1 -b .buildfix %build # grr, autoreconf seems to break with intltool 0.36.0, unless From fedora-extras-commits at redhat.com Mon Jul 28 04:07:13 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 04:07:13 GMT Subject: rpms/gcalctool/devel icon-names.patch, NONE, 1.1 gcalctool.spec, 1.68, 1.69 Message-ID: <200807280407.m6S47Djl003958@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gcalctool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3928 Modified Files: gcalctool.spec Added Files: icon-names.patch Log Message: use standard icon names icon-names.patch: --- NEW FILE icon-names.patch --- diff -up gcalctool-5.23.5/gcalctool/gtk.c.icon-name gcalctool-5.23.5/gcalctool/gtk.c --- gcalctool-5.23.5/gcalctool/gtk.c.icon-name 2008-07-27 23:58:42.000000000 -0400 +++ gcalctool-5.23.5/gcalctool/gtk.c 2008-07-27 23:59:37.000000000 -0400 @@ -1183,7 +1183,7 @@ about_cb(GtkWidget *widget) "authors", authors, "documenters", documenters, "translator_credits", translator_credits, - "logo-icon-name", "gnome-calculator", + "logo-icon-name", "accessories-calculator", NULL); } @@ -2885,7 +2885,7 @@ ui_init(int *argc, char ***argv) v->home = (char *) g_get_home_dir(); gtk_rc_parse(g_build_path(v->home, RCNAME, NULL)); - gtk_window_set_default_icon_name("gnome-calculator"); + gtk_window_set_default_icon_name("accessories-calculator"); } Index: gcalctool.spec =================================================================== RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- gcalctool.spec 22 Jul 2008 05:10:29 -0000 1.68 +++ gcalctool.spec 28 Jul 2008 04:06:43 -0000 1.69 @@ -1,6 +1,6 @@ Name: gcalctool Version: 5.23.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A desktop calculator Group: Applications/System @@ -30,6 +30,9 @@ Requires: GConf2 +# http://bugzilla.gnome.org/show_bug.cgi?id=545074 +Patch0: icon-names.patch + %description gcalctool is a powerful graphical calculator with financial, logical and scientific modes. It uses a multiple precision package to do its arithmetic @@ -37,6 +40,7 @@ %prep %setup -q +%patch0 -p1 -b .icon-names %build @@ -100,6 +104,9 @@ %changelog +* Mon Jul 28 2008 Matthias Clasen - 5.23.5-2 +- Use standard icon names + * Tue Jul 22 2008 Matthias Clasen - 5.23.5-1 - Update to 5.23.5 From fedora-extras-commits at redhat.com Mon Jul 28 04:12:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:12:06 +0000 Subject: [pkgdb] grip (Fedora EPEL, 5) updated by kevin Message-ID: <20080728041211.ED7CA1AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for grip Kevin Fenzi (kevin) has set commit to Approved for cvsextras on grip (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on grip (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on grip (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grip From fedora-extras-commits at redhat.com Mon Jul 28 04:12:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:12:06 +0000 Subject: [pkgdb] grip (Fedora EPEL, 4) updated by kevin Message-ID: <20080728041212.A478F1AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for grip Kevin Fenzi (kevin) has set commit to Approved for cvsextras on grip (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on grip (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on grip (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grip From fedora-extras-commits at redhat.com Mon Jul 28 04:14:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:14:46 +0000 Subject: [pkgdb] gspiceui (Fedora, 8) updated by kevin Message-ID: <20080728041446.D072A1AD0EB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for gspiceui Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gspiceui (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gspiceui (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gspiceui (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on gspiceui (Fedora 8) for chitlesh Kevin Fenzi (kevin) approved watchcommits on gspiceui (Fedora 8) for chitlesh Kevin Fenzi (kevin) approved commit on gspiceui (Fedora 8) for chitlesh Kevin Fenzi (kevin) approved build on gspiceui (Fedora 8) for chitlesh Kevin Fenzi (kevin) approved approveacls on gspiceui (Fedora 8) for chitlesh Kevin Fenzi (kevin) Approved cvsextras for commit access on gspiceui (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gspiceui From fedora-extras-commits at redhat.com Mon Jul 28 04:14:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:14:41 +0000 Subject: [pkgdb] gspiceui was added for laxathom Message-ID: <20080728041447.2DDF41AD0F8@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gspiceui with summary A GUI to freely available Spice Electronic Kevin Fenzi (kevin) has approved Package gspiceui Kevin Fenzi (kevin) has added a Fedora devel branch for gspiceui with an owner of laxathom Kevin Fenzi (kevin) has approved gspiceui in Fedora devel Kevin Fenzi (kevin) has approved Package gspiceui Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gspiceui (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gspiceui (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gspiceui (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on gspiceui (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on gspiceui (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on gspiceui (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gspiceui From fedora-extras-commits at redhat.com Mon Jul 28 04:14:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:14:46 +0000 Subject: [pkgdb] gspiceui (Fedora, 9) updated by kevin Message-ID: <20080728041447.553891AD0F9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for gspiceui Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gspiceui (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gspiceui (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gspiceui (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on gspiceui (Fedora 9) for chitlesh Kevin Fenzi (kevin) approved watchcommits on gspiceui (Fedora 9) for chitlesh Kevin Fenzi (kevin) approved commit on gspiceui (Fedora 9) for chitlesh Kevin Fenzi (kevin) approved build on gspiceui (Fedora 9) for chitlesh Kevin Fenzi (kevin) approved approveacls on gspiceui (Fedora 9) for chitlesh Kevin Fenzi (kevin) Approved cvsextras for commit access on gspiceui (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gspiceui From fedora-extras-commits at redhat.com Mon Jul 28 04:14:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:14:46 +0000 Subject: [pkgdb] gspiceui (Fedora EPEL, 5) updated by kevin Message-ID: <20080728041448.253611AD102@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for gspiceui Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gspiceui (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gspiceui (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gspiceui (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on gspiceui (Fedora EPEL 5) for chitlesh Kevin Fenzi (kevin) approved watchcommits on gspiceui (Fedora EPEL 5) for chitlesh Kevin Fenzi (kevin) approved commit on gspiceui (Fedora EPEL 5) for chitlesh Kevin Fenzi (kevin) approved build on gspiceui (Fedora EPEL 5) for chitlesh Kevin Fenzi (kevin) approved approveacls on gspiceui (Fedora EPEL 5) for chitlesh Kevin Fenzi (kevin) Approved cvsextras for commit access on gspiceui (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gspiceui From fedora-extras-commits at redhat.com Mon Jul 28 04:15:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:15:09 GMT Subject: rpms/gspiceui - New directory Message-ID: <200807280415.m6S4F9f4004421@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gspiceui In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAf4392/rpms/gspiceui Log Message: Directory /cvs/extras/rpms/gspiceui added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 04:14:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:14:46 +0000 Subject: [pkgdb] gspiceui (Fedora, devel) updated by kevin Message-ID: <20080728041448.7EE241AD106@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gspiceui (Fedora devel) for chitlesh Kevin Fenzi (kevin) approved watchcommits on gspiceui (Fedora devel) for chitlesh Kevin Fenzi (kevin) approved commit on gspiceui (Fedora devel) for chitlesh Kevin Fenzi (kevin) approved build on gspiceui (Fedora devel) for chitlesh Kevin Fenzi (kevin) approved approveacls on gspiceui (Fedora devel) for chitlesh Kevin Fenzi (kevin) Approved cvsextras for commit access on gspiceui (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gspiceui From fedora-extras-commits at redhat.com Mon Jul 28 04:15:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:15:09 GMT Subject: rpms/gspiceui/devel - New directory Message-ID: <200807280415.m6S4F9jT004434@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gspiceui/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAf4392/rpms/gspiceui/devel Log Message: Directory /cvs/extras/rpms/gspiceui/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 04:15:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:15:10 GMT Subject: rpms/gspiceui/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807280415.m6S4FAMr004472@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gspiceui/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAf4392/rpms/gspiceui/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gspiceui --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gspiceui # $Id: Makefile,v 1.1 2008/07/28 04:15:10 kevin Exp $ NAME := gspiceui SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 28 04:15:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:15:09 GMT Subject: rpms/gspiceui Makefile,NONE,1.1 Message-ID: <200807280415.m6S4F9a2004457@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gspiceui In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAf4392/rpms/gspiceui Added Files: Makefile Log Message: Setup of module gspiceui --- NEW FILE Makefile --- # Top level Makefile for module gspiceui all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 28 04:15:30 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 04:15:30 GMT Subject: rpms/ebview/devel ebview.spec,1.4,1.5 Message-ID: <200807280415.m6S4FUT4004629@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ebview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4327/ebview/devel Modified Files: ebview.spec Log Message: F-10+: Change Requires: fonts-japanese -> VLGothic-fonts (fonts-japanese is renamed to japanese-bitmap-fonts and japanese-bitmap-fonts does not require VLGothic-fonts Index: ebview.spec =================================================================== RCS file: /cvs/extras/rpms/ebview/devel/ebview.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ebview.spec 9 Feb 2008 04:21:01 -0000 1.4 +++ ebview.spec 28 Jul 2008 04:15:00 -0000 1.5 @@ -1,6 +1,6 @@ Name: ebview Version: 0.3.6 -Release: 4%{?dist}.2 +Release: 5%{?dist} Summary: EPWING CD-ROM dictionary viewer Group: Applications/Text @@ -16,7 +16,11 @@ BuildRequires: gettext BuildRequires: gtk2-devel +%if 0%{?fedora} >= 10 +Requires: VLGothic-fonts +%else Requires: fonts-japanese +%endif %description EBView is a EPWING dictionary browser. @@ -110,6 +114,9 @@ %{_datadir}/pixmaps/%{name}.xpm %changelog +* Mon Jul 28 2008 Mamoru Tasaka - 0.3.6-5 +- Change Japanese fonts Requires (F-10+) + * Sat Feb 9 2008 Mamoru Tasaka - Rebuild against gcc43 From fedora-extras-commits at redhat.com Mon Jul 28 04:15:31 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 04:15:31 GMT Subject: rpms/jd/devel jd.spec,1.313,1.314 Message-ID: <200807280415.m6S4FVk2004632@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4327/jd/devel Modified Files: jd.spec Log Message: F-10+: Change Requires: fonts-japanese -> VLGothic-fonts (fonts-japanese is renamed to japanese-bitmap-fonts and japanese-bitmap-fonts does not require VLGothic-fonts Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- jd.spec 22 Jul 2008 18:14:47 -0000 1.313 +++ jd.spec 28 Jul 2008 04:15:01 -0000 1.314 @@ -19,12 +19,16 @@ ########################################## # Defined by vendor # -%define vendor_rel 1 +%define vendor_rel 2 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora %define gtkmmdevel gtkmm24-devel +%if 0%{?fedora} >= 10 +%define fontpackage VLGothic-fonts +%else %define fontpackage fonts-japanese +%endif %define icondir %{_datadir}/icons/hicolor/96x96/apps/ ########################################## @@ -134,6 +138,9 @@ %{icondir}/%{name}.png %changelog +* Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 +- Change Japanese fonts Requires (F-10+) + * Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 - 2.0.0 From fedora-extras-commits at redhat.com Mon Jul 28 04:15:32 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 04:15:32 GMT Subject: rpms/ochusha/devel ochusha.spec,1.48,1.49 Message-ID: <200807280415.m6S4FWKU004638@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ochusha/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4327/ochusha/devel Modified Files: ochusha.spec Log Message: F-10+: Change Requires: fonts-japanese -> VLGothic-fonts (fonts-japanese is renamed to japanese-bitmap-fonts and japanese-bitmap-fonts does not require VLGothic-fonts Index: ochusha.spec =================================================================== RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ochusha.spec 9 Feb 2008 04:21:47 -0000 1.48 +++ ochusha.spec 28 Jul 2008 04:15:02 -0000 1.49 @@ -4,7 +4,7 @@ %define main_ver 0.5.99.66 %define strtag cvs070110 -%define vendor_rel 4 +%define vendor_rel 5 %define pre_release 1 %if %{pre_release} @@ -16,7 +16,7 @@ Summary: A GTK+ 2ch.net BBS Browser Name: ochusha Version: %{main_ver} -Release: %{rel}.2 +Release: %{rel} URL: http://ochusha.sourceforge.jp/ %if %{pre_release} Source: %{name}-%{main_ver}-%{strtag}.tar.bz2 @@ -29,7 +29,11 @@ Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +%if 0%{?fedora} >= 10 +Requires: VLGothic-fonts +%else Requires: fonts-japanese +%endif Requires: %{system_ca_cert_file} Requires: xdg-utils @@ -162,6 +166,9 @@ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Mon Jul 28 2008 Mamoru Tasaka - ochusha-0.5.99.66-0.5.cvs070110 +- Change Japanese fonts Requires (F-10+) + * Sat Feb 9 2008 Mamoru Tasaka - Rebuild against gcc43 From fedora-extras-commits at redhat.com Mon Jul 28 04:15:31 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 04:15:31 GMT Subject: rpms/kita/devel kita.spec,1.12,1.13 Message-ID: <200807280415.m6S4FVtn004635@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kita/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4327/kita/devel Modified Files: kita.spec Log Message: F-10+: Change Requires: fonts-japanese -> VLGothic-fonts (fonts-japanese is renamed to japanese-bitmap-fonts and japanese-bitmap-fonts does not require VLGothic-fonts Index: kita.spec =================================================================== RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kita.spec 9 Feb 2008 04:21:15 -0000 1.12 +++ kita.spec 28 Jul 2008 04:15:01 -0000 1.13 @@ -3,7 +3,7 @@ Summary: 2ch client for KDE Name: kita Version: %{version} -Release: 12%{?dist}.2 +Release: 13%{?dist} Source: http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz Patch0: kita-0.177.3-nonweak-symbol.patch License: GPLv2+ @@ -22,7 +22,11 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +%if 0%{?fedora} >= 10 +Requires: VLGothic-fonts +%else Requires: fonts-japanese +%endif %description Kita is a 2ch client for KDE. @@ -117,6 +121,9 @@ %{_datadir}/doc/HTML/en/kita/ %changelog +* Mon Jul 28 2008 Mamoru Tasaka - 0.177.3-13 +- Change Japanese fonts Requires (F-10+) + * Sat Feb 9 2008 Mamoru Tasaka - Rebuild against gcc43 From fedora-extras-commits at redhat.com Mon Jul 28 04:17:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:17:32 +0000 Subject: [pkgdb] chm2pdf (Fedora EPEL, 5) updated by kevin Message-ID: <20080728041733.16B481AD0F9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for chm2pdf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on chm2pdf (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on chm2pdf (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on chm2pdf (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on chm2pdf (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/chm2pdf From fedora-extras-commits at redhat.com Mon Jul 28 04:17:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:17:46 GMT Subject: rpms/chm2pdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807280417.m6S4HkmV004799@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/chm2pdf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsft4714/rpms/chm2pdf/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module chm2pdf --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: chm2pdf # $Id: Makefile,v 1.1 2008/07/28 04:17:46 kevin Exp $ NAME := chm2pdf SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 28 04:17:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:17:45 GMT Subject: rpms/chm2pdf - New directory Message-ID: <200807280417.m6S4HjSi004746@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/chm2pdf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsft4714/rpms/chm2pdf Log Message: Directory /cvs/extras/rpms/chm2pdf added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 04:17:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:17:32 +0000 Subject: [pkgdb] chm2pdf (Fedora, 9) updated by kevin Message-ID: <20080728041733.4B0311AD0FF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for chm2pdf Kevin Fenzi (kevin) has set commit to Approved for cvsextras on chm2pdf (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on chm2pdf (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on chm2pdf (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on chm2pdf (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/chm2pdf From fedora-extras-commits at redhat.com Mon Jul 28 04:17:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:17:45 GMT Subject: rpms/chm2pdf Makefile,NONE,1.1 Message-ID: <200807280417.m6S4HjHr004784@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/chm2pdf In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsft4714/rpms/chm2pdf Added Files: Makefile Log Message: Setup of module chm2pdf --- NEW FILE Makefile --- # Top level Makefile for module chm2pdf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 28 04:17:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:17:45 GMT Subject: rpms/chm2pdf/devel - New directory Message-ID: <200807280417.m6S4Hjlh004758@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/chm2pdf/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsft4714/rpms/chm2pdf/devel Log Message: Directory /cvs/extras/rpms/chm2pdf/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 04:18:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:18:33 +0000 Subject: [pkgdb] libv4l was added for jwrdegoede Message-ID: <20080728041834.4E7351AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libv4l with summary Collection of video4linux support libraries Kevin Fenzi (kevin) has approved Package libv4l Kevin Fenzi (kevin) has added a Fedora devel branch for libv4l with an owner of jwrdegoede Kevin Fenzi (kevin) has approved libv4l in Fedora devel Kevin Fenzi (kevin) has approved Package libv4l Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libv4l (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libv4l (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libv4l (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on libv4l (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on libv4l (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on libv4l (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libv4l From fedora-extras-commits at redhat.com Mon Jul 28 04:18:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:18:53 GMT Subject: rpms/libv4l - New directory Message-ID: <200807280418.m6S4IrVS005111@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libv4l In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsis5083/rpms/libv4l Log Message: Directory /cvs/extras/rpms/libv4l added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 04:18:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:18:34 +0000 Subject: [pkgdb] libv4l (Fedora, 8) updated by kevin Message-ID: <20080728041834.E9A801AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for libv4l Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libv4l (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libv4l (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libv4l (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on libv4l (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libv4l From fedora-extras-commits at redhat.com Mon Jul 28 04:18:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:18:34 +0000 Subject: [pkgdb] libv4l (Fedora, 9) updated by kevin Message-ID: <20080728041835.179161AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for libv4l Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libv4l (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libv4l (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libv4l (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on libv4l (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libv4l From fedora-extras-commits at redhat.com Mon Jul 28 04:18:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:18:53 GMT Subject: rpms/libv4l/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807280418.m6S4Irja005163@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libv4l/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsis5083/rpms/libv4l/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libv4l --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libv4l # $Id: Makefile,v 1.1 2008/07/28 04:18:53 kevin Exp $ NAME := libv4l SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 28 04:18:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:18:53 GMT Subject: rpms/libv4l/devel - New directory Message-ID: <200807280418.m6S4Irql005125@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libv4l/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsis5083/rpms/libv4l/devel Log Message: Directory /cvs/extras/rpms/libv4l/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 04:18:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 04:18:53 GMT Subject: rpms/libv4l Makefile,NONE,1.1 Message-ID: <200807280418.m6S4Ir9Q005148@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libv4l In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsis5083/rpms/libv4l Added Files: Makefile Log Message: Setup of module libv4l --- NEW FILE Makefile --- # Top level Makefile for module libv4l all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 28 04:18:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:18:34 +0000 Subject: [pkgdb] libv4l (Fedora, devel) updated by kevin Message-ID: <20080728041835.527CB1AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libv4l (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libv4l From fedora-extras-commits at redhat.com Mon Jul 28 04:19:48 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 04:19:48 GMT Subject: rpms/control-center/devel slab-icon-names.patch, NONE, 1.1 control-center.spec, 1.388, 1.389 Message-ID: <200807280419.m6S4JmvO005325@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5281 Modified Files: control-center.spec Added Files: slab-icon-names.patch Log Message: more icon name fixup slab-icon-names.patch: --- NEW FILE slab-icon-names.patch --- diff -up libslab/bookmark-agent.c.icon-names libslab/bookmark-agent.c --- libslab/bookmark-agent.c.icon-names 2008-07-28 00:08:35.000000000 -0400 +++ libslab/bookmark-agent.c 2008-07-28 00:09:58.000000000 -0400 @@ -1144,7 +1144,7 @@ create_dir_item (BookmarkAgent *this, co if (! strcmp (uri, "HOME")) { uri_new = g_filename_to_uri (g_get_home_dir (), NULL, NULL); name = _("Home"); - icon = "gnome-fs-home"; + icon = "user-home"; } else if (! strcmp (uri, "DOCUMENTS")) { path = g_build_filename (g_get_home_dir (), "Documents", NULL); @@ -1156,7 +1156,7 @@ create_dir_item (BookmarkAgent *this, co path = g_build_filename (g_get_home_dir (), "Desktop", NULL); name = _("Desktop"); uri_new = g_filename_to_uri (path, NULL, NULL); - icon = "gnome-fs-desktop"; + icon = "user-desktop"; g_free (path); } else if (! strcmp (uri, "file:///")) { diff -up libslab/directory-tile.c.icon-names libslab/directory-tile.c --- libslab/directory-tile.c.icon-names 2008-07-28 00:12:30.000000000 -0400 +++ libslab/directory-tile.c 2008-07-28 00:12:49.000000000 -0400 @@ -332,7 +332,7 @@ load_image (DirectoryTile *tile) if (priv->icon_name) icon_name = priv->icon_name; else - icon_name = "gnome-fs-directory"; + icon_name = "folder"; priv->image_is_broken = slab_load_image ( GTK_IMAGE (NAMEPLATE_TILE (tile)->image), GTK_ICON_SIZE_DND, icon_name); diff -up libslab/document-tile.c.icon-names libslab/document-tile.c --- libslab/document-tile.c.icon-names 2008-07-28 00:12:59.000000000 -0400 +++ libslab/document-tile.c 2008-07-28 00:13:19.000000000 -0400 @@ -437,7 +437,7 @@ load_image (DocumentTile *tile) if (priv->force_icon_name) icon_id = priv->force_icon_name; else - icon_id = "gnome-fs-regular"; + icon_id = "text-x-preview"; free_icon_id = FALSE; goto exit; Index: control-center.spec =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v retrieving revision 1.388 retrieving revision 1.389 diff -u -r1.388 -r1.389 --- control-center.spec 27 Jul 2008 22:40:18 -0000 1.388 +++ control-center.spec 28 Jul 2008 04:19:18 -0000 1.389 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.5 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -39,6 +39,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=544922 Patch21: icon-names.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=545075 +Patch22: slab-icon-names.patch # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.23.2-passwd.patch @@ -165,6 +167,7 @@ %patch8 -p1 -b .gtkmarshal %patch10 -p0 -b .libcanberra %patch21 -p1 -b .icon-names +%patch22 -p0 -b .slab-icon-names # vendor configuration patches %patch95 -p1 -b .passwd @@ -334,6 +337,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Mon Jul 28 2008 Matthias Clasen - 2.23.5-6 +- Use standard icon names in more places + * Sun Jul 27 2008 Matthias Clasen - 2.23.5-5 - Fix up gconf schema installation From fedora-extras-commits at redhat.com Mon Jul 28 04:21:53 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 04:21:53 GMT Subject: rpms/jd/devel jd.spec,1.314,1.315 Message-ID: <200807280421.m6S4LrKH005514@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5437/jd/devel Modified Files: jd.spec Log Message: orz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- jd.spec 28 Jul 2008 04:15:01 -0000 1.314 +++ jd.spec 28 Jul 2008 04:21:23 -0000 1.315 @@ -138,7 +138,7 @@ %{icondir}/%{name}.png %changelog -* Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 +* Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 - Change Japanese fonts Requires (F-10+) * Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 From fedora-extras-commits at redhat.com Mon Jul 28 04:35:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:35:27 +0000 Subject: [pkgdb] sportrop-fonts (Fedora, 8) updated by kevin Message-ID: <20080728043527.959741AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for sportrop-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sportrop-fonts (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sportrop-fonts (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sportrop-fonts (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on sportrop-fonts (Fedora 8) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on sportrop-fonts (Fedora 8) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on sportrop-fonts (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sportrop-fonts From fedora-extras-commits at redhat.com Mon Jul 28 04:35:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:35:27 +0000 Subject: [pkgdb] sportrop-fonts (Fedora, devel) updated by kevin Message-ID: <20080728043527.A35891AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on sportrop-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on sportrop-fonts (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on sportrop-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sportrop-fonts From fedora-extras-commits at redhat.com Mon Jul 28 04:35:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:35:27 +0000 Subject: [pkgdb] sportrop-fonts (Fedora EPEL, 5) updated by kevin Message-ID: <20080728043528.68CB31AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for sportrop-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sportrop-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sportrop-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sportrop-fonts (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on sportrop-fonts (Fedora EPEL 5) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on sportrop-fonts (Fedora EPEL 5) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on sportrop-fonts (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sportrop-fonts From fedora-extras-commits at redhat.com Mon Jul 28 04:35:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:35:27 +0000 Subject: [pkgdb] sportrop-fonts (Fedora, 9) updated by kevin Message-ID: <20080728043528.A560A1AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for sportrop-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sportrop-fonts (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sportrop-fonts (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sportrop-fonts (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on sportrop-fonts (Fedora 9) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on sportrop-fonts (Fedora 9) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on sportrop-fonts (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sportrop-fonts From fedora-extras-commits at redhat.com Mon Jul 28 04:35:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:35:27 +0000 Subject: [pkgdb] sportrop-fonts (Fedora EPEL, 4) updated by kevin Message-ID: <20080728043528.EC03D1AD101@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for sportrop-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sportrop-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sportrop-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sportrop-fonts (Fedora EPEL 4) Kevin Fenzi (kevin) approved watchbugzilla on sportrop-fonts (Fedora EPEL 4) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on sportrop-fonts (Fedora EPEL 4) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on sportrop-fonts (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sportrop-fonts From fedora-extras-commits at redhat.com Mon Jul 28 04:35:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 04:35:26 +0000 Subject: [pkgdb] sportrop-fonts was added for jstanley Message-ID: <20080728043531.D45CA1AD104@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package sportrop-fonts with summary A multiline decorative font Kevin Fenzi (kevin) has approved Package sportrop-fonts Kevin Fenzi (kevin) has added a Fedora devel branch for sportrop-fonts with an owner of jstanley Kevin Fenzi (kevin) has approved sportrop-fonts in Fedora devel Kevin Fenzi (kevin) has approved Package sportrop-fonts Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sportrop-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sportrop-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sportrop-fonts (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on sportrop-fonts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on sportrop-fonts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on sportrop-fonts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sportrop-fonts From fedora-extras-commits at redhat.com Mon Jul 28 04:41:01 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Mon, 28 Jul 2008 04:41:01 GMT Subject: rpms/python-urlgrabber/devel urlgrabber-no-ssl-ok.patch, NONE, 1.1 python-urlgrabber.spec, 1.28, 1.29 urlgrabber-progress-ui.patch, 1.4, 1.5 Message-ID: <200807280441.m6S4f1lI007727@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/python-urlgrabber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7636 Modified Files: python-urlgrabber.spec urlgrabber-progress-ui.patch Added Files: urlgrabber-no-ssl-ok.patch Log Message: * Thu Jul 10 2008 James Antill 3.0.0-9 - Make urlgrabber usable if openssl is broken - Relates: bug#454179 urlgrabber-no-ssl-ok.patch: --- NEW FILE urlgrabber-no-ssl-ok.patch --- diff -rup urlgrabber-3.0.0-orig/urlgrabber/keepalive.py urlgrabber-3.0.0/urlgrabber/keepalive.py --- urlgrabber-3.0.0-orig/urlgrabber/keepalive.py 2006-07-20 16:15:58.000000000 -0400 +++ urlgrabber-3.0.0/urlgrabber/keepalive.py 2008-07-10 17:37:06.000000000 -0400 @@ -328,12 +328,16 @@ class HTTPHandler(KeepAliveHandler, urll def http_open(self, req): return self.do_open(HTTPConnection, req) -class HTTPSHandler(KeepAliveHandler, urllib2.HTTPSHandler): - def __init__(self): - KeepAliveHandler.__init__(self) +# If SSL isn't available, don't make urlgrabber completely unusable +try: + class HTTPSHandler(KeepAliveHandler, urllib2.HTTPSHandler): + def __init__(self): + KeepAliveHandler.__init__(self) - def https_open(self, req): - return self.do_open(HTTPSConnection, req) + def https_open(self, req): + return self.do_open(HTTPSConnection, req) +except: + pass class HTTPResponse(httplib.HTTPResponse): # we need to subclass HTTPResponse in order to Index: python-urlgrabber.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-urlgrabber/devel/python-urlgrabber.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- python-urlgrabber.spec 17 May 2008 19:34:19 -0000 1.28 +++ python-urlgrabber.spec 28 Jul 2008 04:40:31 -0000 1.29 @@ -3,7 +3,7 @@ Summary: A high-level cross-protocol url-grabber Name: python-urlgrabber Version: 3.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Source0: urlgrabber-%{version}.tar.gz Patch0: urlgrabber-keepalive.patch Patch1: urlgrabber-string-type.patch @@ -11,6 +11,7 @@ Patch3: urlgrabber-ftp-port.patch Patch4: urlgrabber-progress-ui.patch Patch5: urlgrabber-grab-no-range.patch +Patch6: urlgrabber-no-ssl-ok.patch License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -30,8 +31,9 @@ %patch1 -p1 %patch2 -p1 %patch3 -p0 -%patch4 -p0 +%patch4 -p1 %patch5 -p1 +%patch6 -p1 %build python setup.py build @@ -51,6 +53,13 @@ %{_bindir}/urlgrabber %changelog +* Thu Jul 10 2008 James Antill 3.0.0-9 +- Make urlgrabber usable if openssl is broken +- Relates: bug#454179 + +* Sun Jun 15 2008 James Antill 3.0.0-9 +- Don't count partial downloads toward the total + * Sat May 18 2008 James Antill 3.0.0-8 - Tweak progress output so it's hopefully less confusing - Add dynamic resizing ability to progress bar urlgrabber-progress-ui.patch: Index: urlgrabber-progress-ui.patch =================================================================== RCS file: /cvs/pkgs/rpms/python-urlgrabber/devel/urlgrabber-progress-ui.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- urlgrabber-progress-ui.patch 17 May 2008 19:34:19 -0000 1.4 +++ urlgrabber-progress-ui.patch 28 Jul 2008 04:40:31 -0000 1.5 @@ -1,12 +1,7 @@ -Index: urlgrabber/progress.py -=================================================================== -RCS file: /home/groups/urlgrabber/cvs-root/urlgrabber/urlgrabber/progress.py,v -retrieving revision 1.7 -diff -u -r1.7 progress.py ---- urlgrabber/progress.py 19 Aug 2005 21:59:07 -0000 1.7 -+++ urlgrabber/progress.py 17 May 2008 17:33:32 -0000 -@@ -23,8 +23,75 @@ - import time +diff -rup urlgrabber-3.0.0-orig/urlgrabber/progress.py urlgrabber-3.0.0/urlgrabber/progress.py +--- urlgrabber-3.0.0-orig/urlgrabber/progress.py 2008-06-16 00:48:52.000000000 -0400 ++++ urlgrabber-3.0.0/urlgrabber/progress.py 2008-06-16 00:49:25.000000000 -0400 +@@ -24,7 +24,74 @@ import time import math import thread import types @@ -82,7 +77,7 @@ class BaseMeter: def __init__(self): self.update_period = 0.3 # seconds -@@ -83,6 +150,64 @@ +@@ -84,6 +151,64 @@ class BaseMeter: def _do_end(self, amount_read, now=None): pass @@ -147,7 +142,7 @@ class TextMeter(BaseMeter): def __init__(self, fo=sys.stderr): BaseMeter.__init__(self) -@@ -97,37 +222,73 @@ +@@ -98,38 +223,80 @@ class TextMeter(BaseMeter): text = self.text else: text = self.basename @@ -226,15 +221,22 @@ + ui_size, ui_time, ui_end) + self.fo.write(out) self.fo.flush() + ++ # Don't add size to the sofar size until we have all of it. ++ # If we don't have a size, then just pretend/hope we got all of it. ++ if self.size is not None and amount_read != self.size: ++ return ++ + if _text_meter_total_size: + _text_meter_sofar_size += amount_read + if _text_meter_total_size <= _text_meter_sofar_size: + _text_meter_total_size = 0 + _text_meter_sofar_size = 0 - ++ text_progress_meter = TextMeter -@@ -396,10 +557,12 @@ + class MultiFileHelper(BaseMeter): +@@ -397,10 +564,12 @@ class RateEstimator: #print 'times', now, self.last_update_time time_diff = now - self.last_update_time read_diff = amount_read - self.last_amount_read @@ -250,7 +252,7 @@ #print 'results', time_diff, read_diff, self.ave_rate ##################################################################### -@@ -528,3 +691,49 @@ +@@ -529,3 +698,49 @@ def format_number(number, SI=0, space=' format = '%.0f%s%s' return(format % (float(number or 0), space, symbols[depth])) @@ -300,3 +302,4 @@ + (100000, 0.1), (10000, 0.1), (10000, 0.1), (10000, 0.1), + (100000, 0.1), (10000, 0.1), (10000, 0.1), (10000, 0.1), + (100000, 0.1), (1, 0.1)) +Only in urlgrabber-3.0.0/urlgrabber: progress.py.orig From fedora-extras-commits at redhat.com Mon Jul 28 05:03:02 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 05:03:02 GMT Subject: rpms/ebview/devel ebview.spec,1.5,1.6 Message-ID: <200807280503.m6S532Sh015685@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ebview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15618/ebview/devel Modified Files: ebview.spec Log Message: orz again.. Index: ebview.spec =================================================================== RCS file: /cvs/extras/rpms/ebview/devel/ebview.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ebview.spec 28 Jul 2008 04:15:00 -0000 1.5 +++ ebview.spec 28 Jul 2008 05:02:31 -0000 1.6 @@ -1,6 +1,6 @@ Name: ebview Version: 0.3.6 -Release: 5%{?dist} +Release: 5%{?dist}.1 Summary: EPWING CD-ROM dictionary viewer Group: Applications/Text @@ -114,7 +114,7 @@ %{_datadir}/pixmaps/%{name}.xpm %changelog -* Mon Jul 28 2008 Mamoru Tasaka - 0.3.6-5 +* Mon Jul 28 2008 Mamoru Tasaka - 0.3.6-5 - Change Japanese fonts Requires (F-10+) * Sat Feb 9 2008 Mamoru Tasaka From fedora-extras-commits at redhat.com Mon Jul 28 05:03:03 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 05:03:03 GMT Subject: rpms/ochusha/devel ochusha.spec,1.49,1.50 Message-ID: <200807280503.m6S533uj015689@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ochusha/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15618/ochusha/devel Modified Files: ochusha.spec Log Message: orz again.. Index: ochusha.spec =================================================================== RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ochusha.spec 28 Jul 2008 04:15:02 -0000 1.49 +++ ochusha.spec 28 Jul 2008 05:02:33 -0000 1.50 @@ -15,7 +15,7 @@ Summary: A GTK+ 2ch.net BBS Browser Name: ochusha -Version: %{main_ver} +Version: %{main_ver}.1 Release: %{rel} URL: http://ochusha.sourceforge.jp/ %if %{pre_release} @@ -166,7 +166,7 @@ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog -* Mon Jul 28 2008 Mamoru Tasaka - ochusha-0.5.99.66-0.5.cvs070110 +* Mon Jul 28 2008 Mamoru Tasaka - ochusha-0.5.99.66-0.5.cvs070110 - Change Japanese fonts Requires (F-10+) * Sat Feb 9 2008 Mamoru Tasaka From fedora-extras-commits at redhat.com Mon Jul 28 05:03:02 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 05:03:02 GMT Subject: rpms/kita/devel kita.spec,1.13,1.14 Message-ID: <200807280503.m6S532II015686@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kita/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15618/kita/devel Modified Files: kita.spec Log Message: orz again.. Index: kita.spec =================================================================== RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kita.spec 28 Jul 2008 04:15:01 -0000 1.13 +++ kita.spec 28 Jul 2008 05:02:32 -0000 1.14 @@ -3,7 +3,7 @@ Summary: 2ch client for KDE Name: kita Version: %{version} -Release: 13%{?dist} +Release: 13%{?dist}.1 Source: http://downloads.sourceforge.jp/kita/20336/kita-%{version}.tar.gz Patch0: kita-0.177.3-nonweak-symbol.patch License: GPLv2+ @@ -121,7 +121,7 @@ %{_datadir}/doc/HTML/en/kita/ %changelog -* Mon Jul 28 2008 Mamoru Tasaka - 0.177.3-13 +* Mon Jul 28 2008 Mamoru Tasaka - 0.177.3-13 - Change Japanese fonts Requires (F-10+) * Sat Feb 9 2008 Mamoru Tasaka From fedora-extras-commits at redhat.com Mon Jul 28 05:08:53 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 28 Jul 2008 05:08:53 GMT Subject: rpms/control-center/devel control-center.spec, 1.389, 1.390 icon-names.patch, 1.1, 1.2 Message-ID: <200807280508.m6S58rrV016079@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16033 Modified Files: control-center.spec icon-names.patch Log Message: fix icon names some more Index: control-center.spec =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- control-center.spec 28 Jul 2008 04:19:18 -0000 1.389 +++ control-center.spec 28 Jul 2008 05:08:23 -0000 1.390 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.23.5 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -337,6 +337,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Mon Jul 28 2008 Matthias Clasen - 2.23.5-7 +- Fix the icon name patch + * Mon Jul 28 2008 Matthias Clasen - 2.23.5-6 - Use standard icon names in more places icon-names.patch: Index: icon-names.patch =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/icon-names.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icon-names.patch 27 Jul 2008 02:12:32 -0000 1.1 +++ icon-names.patch 28 Jul 2008 05:08:23 -0000 1.2 @@ -6,7 +6,7 @@ gtk_button_set_image (GTK_BUTTON (WID ("xkb_reset_to_defaults")), image); - image = gtk_image_new_from_icon_name ("gnome-settings-sound", GTK_ICON_SIZE_BUTTON); -+ image = gtk_image_new_from_icon_name ("preferences-desktop-sound", GTK_ICON_SIZE_BUTTON); ++ image = gtk_image_new_from_icon_name ("gnome-sound-properties", GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (WID ("notifications_button")), image); return dialog; From fedora-extras-commits at redhat.com Mon Jul 28 05:08:44 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 05:08:44 GMT Subject: rpms/jfbterm/devel jfbterm.spec,1.15,1.16 Message-ID: <200807280508.m6S58i6g016059@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jfbterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015 Modified Files: jfbterm.spec Log Message: * Mon Jul 28 2008 Mamoru Tasaka - 0.4.7-17 - Fix Japanese font search path (fonts-japanese renamed to japanese-bitmap-fonts) Index: jfbterm.spec =================================================================== RCS file: /cvs/extras/rpms/jfbterm/devel/jfbterm.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jfbterm.spec 1 Apr 2008 12:56:14 -0000 1.15 +++ jfbterm.spec 28 Jul 2008 05:08:14 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Japanese Console for Linux Frame Buffer Device Name: jfbterm Version: 0.4.7 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD Group: Applications/System Source0: http://downloads.sourceforge.jp/jfbterm/13501/jfbterm-%{version}.tar.gz @@ -120,6 +120,9 @@ ; do status=1 for path in \ +%if 0%{?fedora} >= 10 + %{_datadir}/fonts/japanese-bitmap-fonts \ +%endif %{_datadir}/fonts/{japanese,ja}/misc \ %{_datadir}/fonts/jisksp16-1990-fonts \ %{_datadir}/X11/fonts/misc \ @@ -189,6 +192,9 @@ %endif %changelog +* Mon Jul 28 2008 Mamoru Tasaka - 0.4.7-17 +- Fix Japanese font search path (fonts-japanese renamed to japanese-bitmap-fonts) + * Tue Apr 1 2008 Mamoru Tasaka - 0.4.7-16 - Remove asm/page.h include, replaced by using sysconf From fedora-extras-commits at redhat.com Mon Jul 28 05:21:49 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 05:21:49 GMT Subject: rpms/jfbterm/devel jfbterm.spec,1.16,1.17 Message-ID: <200807280521.m6S5LnAT016433@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jfbterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16405 Modified Files: jfbterm.spec Log Message: * Mon Jul 28 2008 Mamoru Tasaka - 0.4.7-18 - Fix Japanese font search path (F-10+: fonts-japanese renamed to japanese-bitmap-fonts) - %{_datadir}/fonts is owned by filesystem (F-9+) Index: jfbterm.spec =================================================================== RCS file: /cvs/extras/rpms/jfbterm/devel/jfbterm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jfbterm.spec 28 Jul 2008 05:08:14 -0000 1.16 +++ jfbterm.spec 28 Jul 2008 05:21:19 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Japanese Console for Linux Frame Buffer Device Name: jfbterm Version: 0.4.7 -Release: 17%{?dist} +Release: 18%{?dist} License: BSD Group: Applications/System Source0: http://downloads.sourceforge.jp/jfbterm/13501/jfbterm-%{version}.tar.gz @@ -184,7 +184,10 @@ %{_bindir}/jfbterm %config(noreplace) %{_sysconfdir}/jfbterm.conf %config(noreplace) %{_sysconfdir}/security/console.perms.d/60-jfbterm.perms -%{_datadir}/fonts/ +%{_datadir}/fonts/jfbterm +%if 0%{?fedora} < 9 +%dir %{_datadir}/fonts +%endif %{_mandir}/man1/jfbterm.1* %{_mandir}/man5/jfbterm.conf.5* %if 0%{?fedora} <= 6 @@ -192,8 +195,10 @@ %endif %changelog -* Mon Jul 28 2008 Mamoru Tasaka - 0.4.7-17 -- Fix Japanese font search path (fonts-japanese renamed to japanese-bitmap-fonts) +* Mon Jul 28 2008 Mamoru Tasaka - 0.4.7-18 +- Fix Japanese font search path (F-10+: fonts-japanese renamed to + japanese-bitmap-fonts) +- %%{_datadir}/fonts is owned by filesystem (F-9+) * Tue Apr 1 2008 Mamoru Tasaka - 0.4.7-16 - Remove asm/page.h include, replaced by using sysconf From fedora-extras-commits at redhat.com Mon Jul 28 05:29:02 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Mon, 28 Jul 2008 05:29:02 GMT Subject: rpms/zhcon/F-9 import.log,1.1,1.2 zhcon.spec,1.8,1.9 Message-ID: <200807280529.m6S5T2D3016756@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/zhcon/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16723/F-9 Modified Files: import.log zhcon.spec Log Message: Fedora<=8 dependency Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jul 2008 04:34:46 -0000 1.1 +++ import.log 28 Jul 2008 05:28:32 -0000 1.2 @@ -1 +1,2 @@ zhcon-0_2_6-9_el5:F-9:zhcon-0.2.6-9.el5.src.rpm:1216096455 +zhcon-0_2_6-10_fc9:F-9:zhcon-0.2.6-10.fc9.src.rpm:1217222898 Index: zhcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-9/zhcon.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- zhcon.spec 15 Jul 2008 04:34:46 -0000 1.8 +++ zhcon.spec 28 Jul 2008 05:28:32 -0000 1.9 @@ -1,7 +1,7 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 9%{?dist} +Release: 10%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ @@ -15,11 +15,16 @@ Summary: A fast Linux Console Chinese System that supports framebuffer Summary(zh_CN): Zhcon ??????????????? Framebuffer ??? Linux ????????????????????? Summary(zh_TW): Zhcon ??????????????? Framebuffer ???????????? Linux ????????????????????? -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildrequires: autoconf automake -Buildrequires: gettext-devel ncurses-devel gpm-devel -Requires: ncurses-libs +%if 0%{?fedora} >= 9 +%define ncurse_libs_postfix -libs +%endif + + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf automake +BuildRequires: gettext-devel ncurses-devel gpm-devel +Requires: gpm ncurses%{!?ncurse_libs_postfix: } %description @@ -78,6 +83,10 @@ %{_datadir}/%{name}/ %changelog +* Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 +- Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. +- Add gpm as Required + * Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 - [Bug 454228] [zhcon] Cannot start input method for x86_64 user - [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 From fedora-extras-commits at redhat.com Mon Jul 28 05:31:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 05:31:41 +0000 Subject: [pkgdb] mysqltuner had acl change status Message-ID: <20080728053141.9AF091AD0E5@bastion.fedora.phx.redhat.com> Ville Skytta (scop) has set the watchbugzilla acl on mysqltuner (Fedora devel) to Approved for Manuel Wolfshant (wolfy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mysqltuner From fedora-extras-commits at redhat.com Mon Jul 28 06:05:41 2008 From: fedora-extras-commits at redhat.com (Kushal Das (kushal)) Date: Mon, 28 Jul 2008 06:05:41 GMT Subject: rpms/chm2pdf/devel chm2pdf.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807280605.m6S65fuR025171@cvs-int.fedora.redhat.com> Author: kushal Update of /cvs/extras/rpms/chm2pdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25146/devel Modified Files: .cvsignore sources Added Files: chm2pdf.spec import.log Log Message: First import of the package --- NEW FILE chm2pdf.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: chm2pdf Version: 0.9.1 Release: 3%{?dist} Summary: A tool to convert CHM files to PDF files Group: Applications/Publishing License: GPLv2+ URL: http://code.google.com/p/chm2pdf/ Source: http://chm2pdf.googlecode.com/files/chm2pdf-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python >= 2.5, python-chm, htmldoc %description A simple Python script that converts CHM files into PDF files. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE %{_bindir}/chm2pdf %{python_sitelib}/chm2pdf-0.9-py2.5.egg-info %changelog * Fri Jul 25 2008 Kushal Das 0.9.1-3 - Fixed as asked in the review * Wed Jul 23 2008 Kushal Das 0.9.1-2 - Fixed the group * Wed Jul 23 2008 Kushal Das 0.9.1-1 - Initial RPM release --- NEW FILE import.log --- chm2pdf-0_9_1-3_fc9:HEAD:chm2pdf-0.9.1-3.fc9.src.rpm:1217224961 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/chm2pdf/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 04:17:46 -0000 1.1 +++ .cvsignore 28 Jul 2008 06:05:11 -0000 1.2 @@ -0,0 +1 @@ +chm2pdf-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/chm2pdf/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:17:46 -0000 1.1 +++ sources 28 Jul 2008 06:05:11 -0000 1.2 @@ -0,0 +1 @@ +2d5518e3284cca496270566c2554b713 chm2pdf-0.9.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 06:21:30 2008 From: fedora-extras-commits at redhat.com (Kushal Das (kushal)) Date: Mon, 28 Jul 2008 06:21:30 GMT Subject: rpms/chm2pdf/F-9 sources,1.1,1.2 Message-ID: <200807280621.m6S6LUsR027011@cvs-int.fedora.redhat.com> Author: kushal Update of /cvs/extras/rpms/chm2pdf/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26942 Modified Files: sources Log Message: New source file for chm2pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/chm2pdf/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:17:46 -0000 1.1 +++ sources 28 Jul 2008 06:20:59 -0000 1.2 @@ -0,0 +1 @@ +2d5518e3284cca496270566c2554b713 chm2pdf-0.9.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 06:23:46 2008 From: fedora-extras-commits at redhat.com (Kushal Das (kushal)) Date: Mon, 28 Jul 2008 06:23:46 GMT Subject: rpms/chm2pdf/F-9 chm2pdf.spec,NONE,1.1 Message-ID: <200807280623.m6S6Nk4N027157@cvs-int.fedora.redhat.com> Author: kushal Update of /cvs/extras/rpms/chm2pdf/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27126 Added Files: chm2pdf.spec Log Message: Initial import of the spec file --- NEW FILE chm2pdf.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: chm2pdf Version: 0.9.1 Release: 3%{?dist} Summary: A tool to convert CHM files to PDF files Group: Applications/Publishing License: GPLv2+ URL: http://code.google.com/p/chm2pdf/ Source: http://chm2pdf.googlecode.com/files/chm2pdf-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python >= 2.5, python-chm, htmldoc %description A simple Python script that converts CHM files into PDF files. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE %{_bindir}/chm2pdf %{python_sitelib}/chm2pdf-0.9-py2.5.egg-info %changelog * Fri Jul 25 2008 Kushal Das 0.9.1-3 - Fixed as asked in the review * Wed Jul 23 2008 Kushal Das 0.9.1-2 - Fixed the group * Wed Jul 23 2008 Kushal Das 0.9.1-1 - Initial RPM release From fedora-extras-commits at redhat.com Mon Jul 28 06:29:14 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Mon, 28 Jul 2008 06:29:14 GMT Subject: rpms/perl-DBI/devel .cvsignore, 1.20, 1.21 perl-DBI.spec, 1.39, 1.40 sources, 1.20, 1.21 Message-ID: <200807280629.m6S6TE7g027565@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27507 Modified Files: .cvsignore perl-DBI.spec sources Log Message: * Mon Jul 28 2008 Marcela Maslanova - 1.607-1 - update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBI/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 14 Nov 2007 03:50:57 -0000 1.20 +++ .cvsignore 28 Jul 2008 06:28:44 -0000 1.21 @@ -1 +1 @@ -DBI-1.601.tar.gz +DBI-1.607.tar.gz Index: perl-DBI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBI/devel/perl-DBI.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- perl-DBI.spec 28 Feb 2008 13:02:28 -0000 1.39 +++ perl-DBI.spec 28 Jul 2008 06:28:44 -0000 1.40 @@ -1,6 +1,6 @@ Name: perl-DBI -Version: 1.601 -Release: 4%{?dist} +Version: 1.607 +Release: 1%{?dist} Summary: A database access API for perl Group: Development/Libraries @@ -86,6 +86,9 @@ %changelog +* Mon Jul 28 2008 Marcela Maslanova - 1.607-1 +- update + * Wed Feb 27 2008 Tom "spot" Callaway - 1.601-4 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBI/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Nov 2007 03:50:57 -0000 1.20 +++ sources 28 Jul 2008 06:28:44 -0000 1.21 @@ -1 +1 @@ -d80677bd8113ec8cb0438b8703f3c418 DBI-1.601.tar.gz +bd5785b39675213948a61dea1b400012 DBI-1.607.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 06:29:20 2008 From: fedora-extras-commits at redhat.com (Kushal Das (kushal)) Date: Mon, 28 Jul 2008 06:29:20 GMT Subject: rpms/chm2pdf/EL-5 chm2pdf.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200807280629.m6S6TKYR027571@cvs-int.fedora.redhat.com> Author: kushal Update of /cvs/extras/rpms/chm2pdf/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27490 Modified Files: sources Added Files: chm2pdf.spec Log Message: Initial import for the first time build --- NEW FILE chm2pdf.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: chm2pdf Version: 0.9.1 Release: 3%{?dist} Summary: A tool to convert CHM files to PDF files Group: Applications/Publishing License: GPLv2+ URL: http://code.google.com/p/chm2pdf/ Source: http://chm2pdf.googlecode.com/files/chm2pdf-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python >= 2.5, python-chm, htmldoc %description A simple Python script that converts CHM files into PDF files. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE %{_bindir}/chm2pdf %{python_sitelib}/chm2pdf-0.9-py2.5.egg-info %changelog * Fri Jul 25 2008 Kushal Das 0.9.1-3 - Fixed as asked in the review * Wed Jul 23 2008 Kushal Das 0.9.1-2 - Fixed the group * Wed Jul 23 2008 Kushal Das 0.9.1-1 - Initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/chm2pdf/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:17:46 -0000 1.1 +++ sources 28 Jul 2008 06:28:49 -0000 1.2 @@ -0,0 +1 @@ +2d5518e3284cca496270566c2554b713 chm2pdf-0.9.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 06:32:31 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Mon, 28 Jul 2008 06:32:31 GMT Subject: rpms/perl-DBD-Pg/devel .cvsignore, 1.17, 1.18 perl-DBD-Pg.spec, 1.41, 1.42 sources, 1.18, 1.19 Message-ID: <200807280632.m6S6WVHG027826@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-Pg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27761 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: * Mon Jul 28 2008 Marcela Maslanova - 2.8.7-1 - update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 31 May 2006 23:55:09 -0000 1.17 +++ .cvsignore 28 Jul 2008 06:32:00 -0000 1.18 @@ -3,3 +3,4 @@ DBD-Pg-1.47.tar.gz DBD-Pg-1.48.tar.gz DBD-Pg-1.49.tar.gz +DBD-Pg-2.8.7.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- perl-DBD-Pg.spec 28 Feb 2008 13:03:06 -0000 1.41 +++ perl-DBD-Pg.spec 28 Jul 2008 06:32:01 -0000 1.42 @@ -1,6 +1,6 @@ Name: perl-DBD-Pg -Version: 1.49 -Release: 9%{?dist} +Version: 2.8.7 +Release: 1%{?dist} Summary: A PostgreSQL interface for perl Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Mon Jul 28 2008 Marcela Maslanova - 2.8.7-1 +- update + * Wed Feb 27 2008 Tom "spot" Callaway - 1.49-9 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 31 May 2006 23:55:09 -0000 1.18 +++ sources 28 Jul 2008 06:32:01 -0000 1.19 @@ -1 +1,2 @@ 76b9d6a2f4cbaefcba23380f83998215 DBD-Pg-1.49.tar.gz +9a5530bcf0974b099dd1053f5821a51a DBD-Pg-2.8.7.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 06:36:02 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Mon, 28 Jul 2008 06:36:02 GMT Subject: rpms/zhcon/F-8 import.log,1.1,1.2 zhcon.spec,1.5,1.6 Message-ID: <200807280636.m6S6a2Nw028140@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/zhcon/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28087/F-8 Modified Files: import.log zhcon.spec Log Message: Fedora<=8 dependency Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-8/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Jul 2008 04:36:36 -0000 1.1 +++ import.log 28 Jul 2008 06:35:32 -0000 1.2 @@ -1 +1,2 @@ zhcon-0_2_6-9_el5:F-8:zhcon-0.2.6-9.el5.src.rpm:1216096602 +zhcon-0_2_6-10_fc9:F-8:zhcon-0.2.6-10.fc9.src.rpm:1217223399 Index: zhcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/F-8/zhcon.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- zhcon.spec 15 Jul 2008 04:36:36 -0000 1.5 +++ zhcon.spec 28 Jul 2008 06:35:32 -0000 1.6 @@ -1,7 +1,7 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 9%{?dist} +Release: 10%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ @@ -15,11 +15,16 @@ Summary: A fast Linux Console Chinese System that supports framebuffer Summary(zh_CN): Zhcon ??????????????? Framebuffer ??? Linux ????????????????????? Summary(zh_TW): Zhcon ??????????????? Framebuffer ???????????? Linux ????????????????????? -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildrequires: autoconf automake -Buildrequires: gettext-devel ncurses-devel gpm-devel -Requires: ncurses-libs +%if 0%{?fedora} >= 9 +%define ncurse_libs_postfix -libs +%endif + + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf automake +BuildRequires: gettext-devel ncurses-devel gpm-devel +Requires: gpm ncurses%{!?ncurse_libs_postfix: } %description @@ -78,6 +83,10 @@ %{_datadir}/%{name}/ %changelog +* Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 +- Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. +- Add gpm as Required + * Tue Jul 15 2008 Ding-Yi Chen - 0.2.6-9 - [Bug 454228] [zhcon] Cannot start input method for x86_64 user - [Bug 449625] FTBFS zhcon-0.2.6-8.fc9 From fedora-extras-commits at redhat.com Mon Jul 28 06:55:52 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Mon, 28 Jul 2008 06:55:52 GMT Subject: rpms/ksh/devel ksh-20080725-ttou.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 ksh.spec, 1.37, 1.38 sources, 1.14, 1.15 ksh-20070328-ttou.patch, 1.1, NONE Message-ID: <200807280655.m6S6tqIV028712@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/ksh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28664 Modified Files: .cvsignore ksh.spec sources Added Files: ksh-20080725-ttou.patch Removed Files: ksh-20070328-ttou.patch Log Message: * Mon Jul 28 2008 Tomas Smetana 20080725-1 - new upstream version ksh-20080725-ttou.patch: --- NEW FILE ksh-20080725-ttou.patch --- diff -up ksh-20080725/src/cmd/ksh93/sh/jobs.c.ttou ksh-20080725/src/cmd/ksh93/sh/jobs.c --- ksh-20080725/src/cmd/ksh93/sh/jobs.c.ttou 2008-07-28 08:25:02.000000000 +0200 +++ ksh-20080725/src/cmd/ksh93/sh/jobs.c 2008-07-28 08:27:30.000000000 +0200 @@ -663,9 +663,16 @@ static void job_reset(register struct pr { /* save the terminal state for current job */ #ifdef SIGTSTP + Sig_handler_t saved_handler; + + saved_handler = signal(SIGTTOU, SIG_IGN); job_fgrp(pw,tcgetpgrp(job.fd)); if(tcsetpgrp(job.fd,job.mypid) !=0) + { + signal(SIGTTOU, saved_handler); return; + } + signal(SIGTTOU, saved_handler); #endif /* SIGTSTP */ /* force the following tty_get() to do a tcgetattr() unless fg */ if(!(pw->p_flag&P_FG)) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ksh/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 11 Feb 2008 08:19:43 -0000 1.14 +++ .cvsignore 28 Jul 2008 06:55:21 -0000 1.15 @@ -1,3 +1,3 @@ -INIT.2008-02-02.tgz -ast-ksh.2008-02-02.tgz -ast-ksh-locale.2008-02-02.tgz +INIT.2008-07-25.tgz +ast-ksh.2008-07-25.tgz +ast-ksh-locale.2008-07-25.tgz Index: ksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/ksh/devel/ksh.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ksh.spec 11 Feb 2008 08:19:43 -0000 1.37 +++ ksh.spec 28 Jul 2008 06:55:21 -0000 1.38 @@ -1,5 +1,5 @@ #ExclusiveArch: x86_64 -%define releasedate 2008-02-02 +%define releasedate 2008-07-25 #ExcludeArch: ia64 Name: ksh @@ -7,7 +7,7 @@ URL: http://www.kornshell.com/ Group: System Environment/Shells License: Common Public License Version 1.0 -Version: 20080202 +Version: 20080725 Release: 1%{?dist} Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz @@ -16,7 +16,7 @@ Patch1: ksh-20070328-uname.patch Patch2: ksh-20070328-useex.patch Patch3: ksh-20070328-builtins.patch -Patch4: ksh-20070328-ttou.patch +Patch4: ksh-20080725-ttou.patch Patch5: ksh-20070628-unaligned.patch # for debugging only: #Patch100: ksh-20060124-iffedebug.patch @@ -44,7 +44,7 @@ %patch1 -p1 -b .uname %patch2 -p1 -b .use_ex %patch3 -p1 -b .builtins -%patch4 -p1 -b .ttou +#%patch4 -p1 -b .ttou %patch5 -p1 -b .unaligned #patch100 -p1 -b .iffedebug @@ -104,6 +104,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 28 2008 Tomas Smetana 20080725-1 +- new upstream version + +* Thu Jun 26 2008 Tomas Smetana 20080624-1 +- new upstream version + * Mon Feb 11 2008 Tomas Smetana 20080202-1 - new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ksh/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 11 Feb 2008 08:19:43 -0000 1.14 +++ sources 28 Jul 2008 06:55:21 -0000 1.15 @@ -1,3 +1,3 @@ -740c6fc775bf2f7b6bff463bdbad1c31 INIT.2008-02-02.tgz -d2a71e320fbaa7a0fd950a27c7e4b099 ast-ksh.2008-02-02.tgz -f003813d83fa2606017b3b60196ad38e ast-ksh-locale.2008-02-02.tgz +59bd2850ce70bd93db3760578e237449 INIT.2008-07-25.tgz +aa6031753184ce6a5d08a8abc8c0ab92 ast-ksh.2008-07-25.tgz +cd5b1720c1c0584e13cc689e75b4baf2 ast-ksh-locale.2008-07-25.tgz --- ksh-20070328-ttou.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 07:03:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Mon, 28 Jul 2008 07:03:25 GMT Subject: rpms/perl-DBD-Pg/devel perl-DBD-1.31-fixver.patch, 1.2, 1.3 perl-DBD-Pg.spec, 1.42, 1.43 Message-ID: <200807280703.m6S73PMn003068@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-Pg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31038 Modified Files: perl-DBD-1.31-fixver.patch perl-DBD-Pg.spec Log Message: Fix patch for fuzz. perl-DBD-1.31-fixver.patch: Index: perl-DBD-1.31-fixver.patch =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/devel/perl-DBD-1.31-fixver.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-1.31-fixver.patch 31 May 2006 23:55:09 -0000 1.2 +++ perl-DBD-1.31-fixver.patch 28 Jul 2008 07:02:54 -0000 1.3 @@ -1,12 +1,13 @@ ---- DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm.fixver 2003-12-19 09:48:23.000000000 -0500 -+++ DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm 2003-12-19 09:48:47.000000000 -0500 -@@ -254,6 +254,9 @@ - } elsif ($version =~ /(\d+)\.(\d+)\w+\d+/) { +diff -up DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm.fix DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm +--- DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm.fix 2008-07-21 17:15:05.000000000 +0200 ++++ DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm 2008-07-28 09:01:08.000000000 +0200 +@@ -274,6 +274,9 @@ my $get_version = sub { + # New versions, such as "7.4", are treated as patch level "0" @{$self}{qw(version major minor patch)} = ($version, $1, $2, 0); + } elsif ($version =~ /(\d+)\.(\d+)/) { + @{$self}{qw(version major minor patch)} = -+ ($version, $1, $2, 0); ++ ($version, $1, $2, 0); } else { $self->error("Failed to parse PostgreSQL version parts from " . "string '$version'"); Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- perl-DBD-Pg.spec 28 Jul 2008 06:32:01 -0000 1.42 +++ perl-DBD-Pg.spec 28 Jul 2008 07:02:54 -0000 1.43 @@ -22,7 +22,7 @@ %prep %setup -q -n DBD-Pg-%{version} -%patch0 -p1 +#%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" From fedora-extras-commits at redhat.com Mon Jul 28 07:13:48 2008 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 28 Jul 2008 07:13:48 GMT Subject: rpms/grip/EL-5 grip-3.2.0-default.patch, 1.3, 1.4 grip.spec, 1.17, 1.18 grip-cell-renderer.patch, 1.1, NONE Message-ID: <200807280713.m6S7DmDa003413@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3386 Modified Files: grip-3.2.0-default.patch grip.spec Removed Files: grip-cell-renderer.patch Log Message: * Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 - fixed "Grip silently crahses on F8" (#456721) (converted non UTF-8 .po files to UTF-8) grip-3.2.0-default.patch: Index: grip-3.2.0-default.patch =================================================================== RCS file: /cvs/extras/rpms/grip/EL-5/grip-3.2.0-default.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grip-3.2.0-default.patch 18 Mar 2007 00:06:46 -0000 1.3 +++ grip-3.2.0-default.patch 28 Jul 2008 07:13:17 -0000 1.4 @@ -35,14 +35,16 @@ @@ -856,9 +856,9 @@ *ginfo->wav_filter_cmd='\0'; *ginfo->disc_filter_cmd='\0'; - ginfo->selected_encoder=1; +- ginfo->selected_encoder=1; - strcpy(ginfo->mp3cmdline,"-h -b %b %w %m"); - FindExeInPath("lame", ginfo->mp3exename, sizeof(ginfo->mp3exename)); - strcpy(ginfo->mp3fileformat,"~/mp3/%A/%d/%n.%x"); +- strcpy(ginfo->mp3extension,"mp3"); ++ ginfo->selected_encoder=0; + strcpy(ginfo->mp3cmdline,"-o %m -a %a -l %d -t %n -N %t -G %G -d %y -q 4 %w"); + FindExeInPath("oggenc", ginfo->mp3exename, sizeof(ginfo->mp3exename)); + strcpy(ginfo->mp3fileformat,"~/%x/%A/%d/%n.%x"); - strcpy(ginfo->mp3extension,"mp3"); ++ strcpy(ginfo->mp3extension,"ogg"); ginfo->mp3nice=0; *ginfo->mp3_filter_cmd='\0'; @@ -866,7 +866,7 @@ Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/EL-5/grip.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- grip.spec 18 Mar 2007 00:06:46 -0000 1.17 +++ grip.spec 28 Jul 2008 07:13:17 -0000 1.18 @@ -1,17 +1,17 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 16%{?dist} +Release: 20%{?dist} Epoch: 1 -License: GPL +License: GPLv2+ Group: Applications/Multimedia -Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/grip/grip-%{version}.tar.gz Source1: grip.1 Patch1: grip-3.2.0-default.patch -Patch2: grip-cell-renderer.patch -Patch3: grip-3.2.0-id3.c.patch -Patch4: grip.desktop.patch -Patch5: grip-64bit-fix.patch +Patch2: grip-3.2.0-id3.c.patch +Patch3: grip.desktop.patch +Patch4: grip-64bit-fix.patch +Patch5: grip-3.2.0-lookup.patch URL: http://www.nostatic.org/grip/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vorbis-tools @@ -28,13 +28,33 @@ %prep %setup -q -%patch1 -p1 -b .rh-default-encoder -%patch2 -p1 -b .cell-renderer -%patch3 -p1 -b .id3 +%patch1 -p1 -b .default-encoder +%patch2 -p1 -b .id3 +%patch3 %patch4 -%patch5 +%patch5 -p1 %build + +# From redhat-rpm-config 9.0.3-1 (F-10) config.{guess,sub} are +# not overwritten automatically. The original config.{guess,sub} +# do not work on ppc64 +# +# The following %%_prefix/lib cannot be %%_libdir !! +cp -p %{_prefix}/lib/rpm/config.{guess,sub} . + +# convert non utf8 .po files to utf8 +# to fix #456721 (Grip silently crahses on F8) +pushd po +for i in de.po es.po fr.po pt_BR.po ru.po; do + iconv -f iso-8859-1 -t utf-8 $i > $i.tmp + mv $i.tmp $i +done +popd + +iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.tmp +mv ChangeLog.tmp ChangeLog + %configure %{__make} %{?_smp_mflags} @@ -74,6 +94,21 @@ %{_mandir}/man1/* %changelog +* Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 +- fixed "Grip silently crahses on F8" (#456721) + (converted non UTF-8 .po files to UTF-8) + +* Tue Jun 10 2008 Adrian Reber - 1:3.2.0-19 +- removed now unnecessary cell-renderer patch +- fixed "default config creates ogg files with .mp3 extension" (#427017) + +* Mon Feb 18 2008 Fedora Release Engineering - 1:3.2.0-18 +- Autorebuild for GCC 4.3 + +* Mon Sep 03 2007 Adrian Reber - 1:3.2.0-17 +- search for ripper and encoder executables in path (#249150) +- updated License: + * Wed Jan 17 2007 Adrian Reber - 1:3.2.0-16 - fixes for #220777, #222574, #232755 --- grip-cell-renderer.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 07:15:30 2008 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 28 Jul 2008 07:15:30 GMT Subject: rpms/grip/EL-5 grip-3.2.0-lookup.patch,NONE,1.1 Message-ID: <200807280715.m6S7FU7d003564@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3556 Added Files: grip-3.2.0-lookup.patch Log Message: * Sat Jul 26 2008 Adrian Reber - 1:3.2.0-20 - fixed "Grip silently crahses on F8" (#456721) (converted non UTF-8 .po files to UTF-8) grip-3.2.0-lookup.patch: --- NEW FILE grip-3.2.0-lookup.patch --- diff -ur grip-3.2.0/src/gripcfg.c grip-3.2.0.new/src/gripcfg.c --- grip-3.2.0/src/gripcfg.c 2007-07-23 09:49:12.000000000 +0200 +++ grip-3.2.0.new/src/gripcfg.c 2007-07-23 09:50:46.000000000 +0200 @@ -62,13 +62,6 @@ {"",""} }; -static CFGEntry encoder_cfg_entries[]={ - {"name",CFG_ENTRY_STRING,256,NULL}, - {"cmdline",CFG_ENTRY_STRING,256,NULL}, - {"exe",CFG_ENTRY_STRING,256,NULL}, - {"extension",CFG_ENTRY_STRING,10,NULL} -}; - static void UseProxyChanged(GtkWidget *widget,gpointer data) { GripInfo *ginfo; @@ -781,7 +774,7 @@ }; #ifdef CDPAR - if(ripcfg==0) return; + if(ripcfg==0) return TRUE; #endif sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename, @@ -825,6 +818,9 @@ if(LoadEncoderConfig(ginfo,ginfo->selected_encoder)) { strcpy(buf,ginfo->mp3exename); + /* in addition to searching the path during rip and encode + * also do a path lookup of the executable during config switches */ + FindExeInPath(ginfo->mp3exename, buf, sizeof(buf)); gtk_entry_set_text(GTK_ENTRY(uinfo->mp3exename_entry),buf); strcpy(buf,ginfo->mp3cmdline); diff -ur grip-3.2.0/src/rip.c grip-3.2.0.new/src/rip.c --- grip-3.2.0/src/rip.c 2004-04-15 20:21:15.000000000 +0200 +++ grip-3.2.0.new/src/rip.c 2007-07-23 09:47:34.000000000 +0200 @@ -1100,8 +1100,6 @@ { static char res[PATH_MAX]; EncodeTrack *enc_track; - gchar *conv_str,*st; - gsize rb,wb; enc_track=(EncodeTrack *)data; @@ -1250,12 +1248,17 @@ { GripInfo *ginfo; gboolean result; + char buf[sizeof(ginfo->ripexename) > sizeof(ginfo->mp3exename) ? sizeof(ginfo->ripexename) : sizeof(ginfo->mp3exename)]; ginfo=(GripInfo *)data; if(widget) ginfo->doencode=FALSE; else ginfo->doencode=TRUE; + /* Let's find the ripper in the path; this changes the config */ + FindExeInPath(ginfo->ripexename, buf, sizeof(buf)); + strncpy(ginfo->ripexename, buf, sizeof(ginfo->ripexename)); + if(!ginfo->using_builtin_cdp&&!FileExists(ginfo->ripexename)) { DisplayMsg(_("Invalid rip executable\nCheck your rip config")); @@ -1263,6 +1266,9 @@ return; } + /* the same for mp3exename */ + FindExeInPath(ginfo->mp3exename, buf, sizeof(buf)); + strncpy(ginfo->mp3exename, buf, sizeof(ginfo->mp3exename)); if(ginfo->doencode&&!FileExists(ginfo->mp3exename)) { DisplayMsg(_("Invalid encoder executable\nCheck your encoder config")); @@ -1504,8 +1510,9 @@ ginfo->rippid=fork(); if(ginfo->rippid==0) { + int i; CloseStuff(ginfo); - nice(ginfo->ripnice); + i=nice(ginfo->ripnice); execv(ginfo->ripexename,char_args); LogStatus(ginfo,_("Exec failed\n")); @@ -1539,6 +1546,7 @@ int paranoia_mode; int dup_output_fd; FILE *output_fp; + int i; ginfo=(GripInfo *)arg; @@ -1559,7 +1567,7 @@ ginfo->rip_smile_level=0; - nice(ginfo->ripnice); + i=nice(ginfo->ripnice); dup_output_fd=dup(GetStatusWindowPipe(ginfo->gui_info.rip_status_window)); output_fp=fdopen(dup_output_fd,"w"); @@ -1742,9 +1750,10 @@ ginfo->mp3pid[cpu]=fork(); if(ginfo->mp3pid[cpu]==0) { + int i; CloseStuff(ginfo); setsid(); - nice(ginfo->mp3nice); + i=nice(ginfo->mp3nice); execv(ginfo->mp3exename,char_args); _exit(0); } From fedora-extras-commits at redhat.com Mon Jul 28 07:25:17 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Mon, 28 Jul 2008 07:25:17 GMT Subject: rpms/perl-DBD-Pg/devel perl-DBD-Pg.spec,1.43,1.44 Message-ID: <200807280725.m6S7PHSw003811@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-Pg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3773 Modified Files: perl-DBD-Pg.spec Log Message: * Mon Jul 28 2008 Marcela Maslanova - 2.8.7-1 - new version has Pg.pm twice in two locations - update Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- perl-DBD-Pg.spec 28 Jul 2008 07:02:54 -0000 1.43 +++ perl-DBD-Pg.spec 28 Jul 2008 07:24:46 -0000 1.44 @@ -22,7 +22,7 @@ %prep %setup -q -n DBD-Pg-%{version} -#%patch0 -p1 +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" @@ -53,11 +53,13 @@ %doc Changes README README.dev TODO %{perl_vendorarch}/DBD/ %{perl_vendorarch}/auto/DBD/ +%{perl_vendorarch}/Bundle/DBD/Pg.pm %{_mandir}/man3/*.3* %changelog * Mon Jul 28 2008 Marcela Maslanova - 2.8.7-1 +- new version has Pg.pm twice in two locations - update * Wed Feb 27 2008 Tom "spot" Callaway - 1.49-9 From fedora-extras-commits at redhat.com Mon Jul 28 07:33:50 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Mon, 28 Jul 2008 07:33:50 GMT Subject: rpms/gspiceui/F-8 gspiceui.desktop, NONE, 1.1 gspiceui.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807280733.m6S7Xodo004063@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gspiceui/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4021/F-8 Modified Files: .cvsignore sources Added Files: gspiceui.desktop gspiceui.spec import.log Log Message: Initial import. --- NEW FILE gspiceui.desktop --- [Desktop Entry] Name=GspiceUI Comment=Spice Electronic circuit similators UI Exec=gspiceui Icon=gspiceui Terminal=false Type=Application Encoding=UTF-8 Categories=Education;Science;Engineering; --- NEW FILE gspiceui.spec --- Name: gspiceui Version: 0.9.65 Release: 2%{?dist} Summary: A GUI to freely available Spice Electronic circuit similators Group: Applications/System License: GPLv2+ URL: http://sourceforge.net/projects/gspiceui Source0: http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: compat-wxGTK26-devel, desktop-file-utils Requires: ngspice, geda-gnetlist, geda-gschem Requires: gwave, electronics-menu %description GspiceUI is listed among the Fedora Electronic Lab (FEL) packages. GNU Spice GUI is intended to provide a GUI to freely available Spice electronic cicuit simulators eg.GnuCAP, Ng-Spice. It uses gNetList to convert schematic files to net list files and gWave to display simulation results. gSchem is used as the schematic generation/viewing tool. %prep %setup -q -n %{name}-v%{version} sed -i 's|/usr/local|/usr|g' html/Makefile sed -i 's|cp|install -pm 644|g' Makefile html/Makefile sed -i 's|cp |install -m 755 |g' src/Makefile sed -i 's|wx-config|wx-2.6-config|' src/Makefile %build make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6 %install rm -rf $RPM_BUILD_ROOT #fix installdir path sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile #Add missing folder mkdir -p $RPM_BUILD_ROOT%{_bindir} make install DESTDIR=$RPM_BUILD_ROOT #remove default installed docs|files rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog} rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons #Add/Manage desktop file mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -pm 0644 src/icons/%{name}-32x32.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm install -pm 0644 src/icons/%{name}-48x48.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm desktop-file-install --vendor "Fedora" \ --mode 0644 \ --remove-category="Science;Education" \ --add-category Electronics \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/icons/hicolor/??x??/apps/*.xpm %{_datadir}/applications/*.desktop %{_mandir}/man1/gspiceui.1.gz %changelog * Sat Jul 26 2008 Xavier Lamien - 0.9.65-2 - Fix typo on desktop-file-install. * Mon Jul 14 2008 Xavier Lamien - 0.9.65-1 - Update release. * Mon Dec 31 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-2 - Fixed typo in Requires. - Improved %%description and desktop file. - Fixed WxGTK config use. * Sun Dec 30 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-1 - Updated Release. - Built against WxGTK-2.6 libs. * Tue Jul 04 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.8.90-2 - Enabled the fix that make it honor RPM_OPT_FLAGS. * Wed Jul 04 2007 Xavier Lamien < lnxtnow[at]gmail.com > - 0.8.90-1 - Initial RPM Release. --- NEW FILE import.log --- gspiceui-0_9_65-2_fc9:F-8:gspiceui-0.9.65-2.fc9.src.rpm:1217230352 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 04:15:10 -0000 1.1 +++ .cvsignore 28 Jul 2008 07:33:19 -0000 1.2 @@ -0,0 +1 @@ +gspiceui-v0.9.65.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:15:10 -0000 1.1 +++ sources 28 Jul 2008 07:33:19 -0000 1.2 @@ -0,0 +1 @@ +7243c51a7ad1d4138bc28db9695d18c2 gspiceui-v0.9.65.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 07:39:58 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Mon, 28 Jul 2008 07:39:58 GMT Subject: rpms/gspiceui/F-9 gspiceui.desktop, NONE, 1.1 gspiceui.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807280739.m6S7dwIo004583@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gspiceui/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4480/F-9 Modified Files: .cvsignore sources Added Files: gspiceui.desktop gspiceui.spec import.log Log Message: Initial import. --- NEW FILE gspiceui.desktop --- [Desktop Entry] Name=GspiceUI Comment=Spice Electronic circuit similators UI Exec=gspiceui Icon=gspiceui Terminal=false Type=Application Encoding=UTF-8 Categories=Education;Science;Engineering; --- NEW FILE gspiceui.spec --- Name: gspiceui Version: 0.9.65 Release: 2%{?dist} Summary: A GUI to freely available Spice Electronic circuit similators Group: Applications/System License: GPLv2+ URL: http://sourceforge.net/projects/gspiceui Source0: http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: compat-wxGTK26-devel, desktop-file-utils Requires: ngspice, geda-gnetlist, geda-gschem Requires: gwave, electronics-menu %description GspiceUI is listed among the Fedora Electronic Lab (FEL) packages. GNU Spice GUI is intended to provide a GUI to freely available Spice electronic cicuit simulators eg.GnuCAP, Ng-Spice. It uses gNetList to convert schematic files to net list files and gWave to display simulation results. gSchem is used as the schematic generation/viewing tool. %prep %setup -q -n %{name}-v%{version} sed -i 's|/usr/local|/usr|g' html/Makefile sed -i 's|cp|install -pm 644|g' Makefile html/Makefile sed -i 's|cp |install -m 755 |g' src/Makefile sed -i 's|wx-config|wx-2.6-config|' src/Makefile %build make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6 %install rm -rf $RPM_BUILD_ROOT #fix installdir path sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile #Add missing folder mkdir -p $RPM_BUILD_ROOT%{_bindir} make install DESTDIR=$RPM_BUILD_ROOT #remove default installed docs|files rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog} rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons #Add/Manage desktop file mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -pm 0644 src/icons/%{name}-32x32.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm install -pm 0644 src/icons/%{name}-48x48.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm desktop-file-install --vendor "Fedora" \ --mode 0644 \ --remove-category="Science;Education" \ --add-category Electronics \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/icons/hicolor/??x??/apps/*.xpm %{_datadir}/applications/*.desktop %{_mandir}/man1/gspiceui.1.gz %changelog * Sat Jul 26 2008 Xavier Lamien - 0.9.65-2 - Fix typo on desktop-file-install. * Mon Jul 14 2008 Xavier Lamien - 0.9.65-1 - Update release. * Mon Dec 31 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-2 - Fixed typo in Requires. - Improved %%description and desktop file. - Fixed WxGTK config use. * Sun Dec 30 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-1 - Updated Release. - Built against WxGTK-2.6 libs. * Tue Jul 04 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.8.90-2 - Enabled the fix that make it honor RPM_OPT_FLAGS. * Wed Jul 04 2007 Xavier Lamien < lnxtnow[at]gmail.com > - 0.8.90-1 - Initial RPM Release. --- NEW FILE import.log --- gspiceui-0_9_65-2_fc9:F-9:gspiceui-0.9.65-2.fc9.src.rpm:1217230736 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 04:15:10 -0000 1.1 +++ .cvsignore 28 Jul 2008 07:39:27 -0000 1.2 @@ -0,0 +1 @@ +gspiceui-v0.9.65.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:15:10 -0000 1.1 +++ sources 28 Jul 2008 07:39:27 -0000 1.2 @@ -0,0 +1 @@ +7243c51a7ad1d4138bc28db9695d18c2 gspiceui-v0.9.65.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 07:42:06 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Mon, 28 Jul 2008 07:42:06 GMT Subject: rpms/gspiceui/devel gspiceui.desktop, NONE, 1.1 gspiceui.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807280742.m6S7g6QW005011@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gspiceui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4866/devel Modified Files: .cvsignore sources Added Files: gspiceui.desktop gspiceui.spec import.log Log Message: Inital import. --- NEW FILE gspiceui.desktop --- [Desktop Entry] Name=GspiceUI Comment=Spice Electronic circuit similators UI Exec=gspiceui Icon=gspiceui Terminal=false Type=Application Encoding=UTF-8 Categories=Education;Science;Engineering; --- NEW FILE gspiceui.spec --- Name: gspiceui Version: 0.9.65 Release: 2%{?dist} Summary: A GUI to freely available Spice Electronic circuit similators Group: Applications/System License: GPLv2+ URL: http://sourceforge.net/projects/gspiceui Source0: http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: compat-wxGTK26-devel, desktop-file-utils Requires: ngspice, geda-gnetlist, geda-gschem Requires: gwave, electronics-menu %description GspiceUI is listed among the Fedora Electronic Lab (FEL) packages. GNU Spice GUI is intended to provide a GUI to freely available Spice electronic cicuit simulators eg.GnuCAP, Ng-Spice. It uses gNetList to convert schematic files to net list files and gWave to display simulation results. gSchem is used as the schematic generation/viewing tool. %prep %setup -q -n %{name}-v%{version} sed -i 's|/usr/local|/usr|g' html/Makefile sed -i 's|cp|install -pm 644|g' Makefile html/Makefile sed -i 's|cp |install -m 755 |g' src/Makefile sed -i 's|wx-config|wx-2.6-config|' src/Makefile %build make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6 %install rm -rf $RPM_BUILD_ROOT #fix installdir path sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile #Add missing folder mkdir -p $RPM_BUILD_ROOT%{_bindir} make install DESTDIR=$RPM_BUILD_ROOT #remove default installed docs|files rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog} rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons #Add/Manage desktop file mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -pm 0644 src/icons/%{name}-32x32.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm install -pm 0644 src/icons/%{name}-48x48.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm desktop-file-install --vendor "Fedora" \ --mode 0644 \ --remove-category="Science;Education" \ --add-category Electronics \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/icons/hicolor/??x??/apps/*.xpm %{_datadir}/applications/*.desktop %{_mandir}/man1/gspiceui.1.gz %changelog * Sat Jul 26 2008 Xavier Lamien - 0.9.65-2 - Fix typo on desktop-file-install. * Mon Jul 14 2008 Xavier Lamien - 0.9.65-1 - Update release. * Mon Dec 31 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-2 - Fixed typo in Requires. - Improved %%description and desktop file. - Fixed WxGTK config use. * Sun Dec 30 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-1 - Updated Release. - Built against WxGTK-2.6 libs. * Tue Jul 04 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.8.90-2 - Enabled the fix that make it honor RPM_OPT_FLAGS. * Wed Jul 04 2007 Xavier Lamien < lnxtnow[at]gmail.com > - 0.8.90-1 - Initial RPM Release. --- NEW FILE import.log --- gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 04:15:10 -0000 1.1 +++ .cvsignore 28 Jul 2008 07:41:35 -0000 1.2 @@ -0,0 +1 @@ +gspiceui-v0.9.65.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:15:10 -0000 1.1 +++ sources 28 Jul 2008 07:41:35 -0000 1.2 @@ -0,0 +1 @@ +7243c51a7ad1d4138bc28db9695d18c2 gspiceui-v0.9.65.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 07:44:46 2008 From: fedora-extras-commits at redhat.com (Kamil Dudka (kdudka)) Date: Mon, 28 Jul 2008 07:44:46 GMT Subject: rpms/coreutils/F-9 coreutils-6.12-dd-fullblock.patch, NONE, 1.1 coreutils-6.12-ls-libcap.patch, NONE, 1.1 coreutils-6.10-configuration.patch, 1.5, 1.6 coreutils-DIR_COLORS, 1.3, 1.4 coreutils-DIR_COLORS.256color, 1.2, 1.3 coreutils-DIR_COLORS.xterm, 1.3, 1.4 coreutils.spec, 1.214, 1.215 Message-ID: <200807280744.m6S7ikXK005544@cvs-int.fedora.redhat.com> Author: kdudka Update of /cvs/extras/rpms/coreutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5295 Modified Files: coreutils-6.10-configuration.patch coreutils-DIR_COLORS coreutils-DIR_COLORS.256color coreutils-DIR_COLORS.xterm coreutils.spec Added Files: coreutils-6.12-dd-fullblock.patch coreutils-6.12-ls-libcap.patch Log Message: dd: iflag=fullblock now read full blocks if possible (#431997, #449263) ls: --color now highlights files with capabilities (#449985) suppressed failing test in tests/touch/no-create-missing coreutils-6.12-dd-fullblock.patch: --- NEW FILE coreutils-6.12-dd-fullblock.patch --- >From 9f8be4b0b83d1e0cbf1326f8cb7e077d026d9b0b Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 23 Jul 2008 11:29:21 +0200 Subject: [PATCH] dd: iflag=fullblock now read full blocks if possible * src/dd.c (iread_fullblock): New function for reading full blocks. (scanargs): Check for new parameter iflag=fullblock. (skip): Use iread_fnc pointer instead of iread function. (dd_copy): Use iread_fnc pointer instead of iread function. * tests/dd/misc: Add test for dd - read full blocks. * doc/coretuils.texi: Mention new parameter iflag=fullblock. * NEWS: Mentioned the change. --- NEWS | 4 ++++ doc/coreutils.texi | 6 ++++++ src/dd.c | 39 +++++++++++++++++++++++++++++++++++++-- tests/dd/misc | 9 +++++++++ 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 81e3b91..b95f8dc 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -7719,6 +7719,12 @@ platforms that distinguish binary from text I/O. Use text I/O. Like @samp{binary}, this option has no effect on standard platforms. + at item fullblock + at opindex fullblock +Read full blocks from input if possible. read() may return early +if a full block is not available, so retry until data is available +or end of file is reached. This flag can be used only for the iflag option. + @end table These flags are not supported on all systems, and @samp{dd} rejects diff --git a/src/dd.c b/src/dd.c index ead9574..1b620df 100644 --- a/src/dd.c +++ b/src/dd.c @@ -225,6 +225,9 @@ static sig_atomic_t volatile interrupt_signal; /* A count of the number of pending info signals that have been received. */ static sig_atomic_t volatile info_signal_count; +/* Function used for read (to handle iflag=fullblock parameter) */ +static ssize_t (*iread_fnc) (int fd, char *buf, size_t size); + /* A longest symbol in the struct symbol_values tables below. */ #define LONGEST_SYMBOL "fdatasync" @@ -257,6 +260,7 @@ static struct symbol_value const conversions[] = }; /* Flags, for iflag="..." and oflag="...". */ +#define O_FULLBLOCK 010000000 /* Read only full blocks from input */ static struct symbol_value const flags[] = { {"append", O_APPEND}, @@ -271,6 +275,7 @@ static struct symbol_value const flags[] = {"nonblock", O_NONBLOCK}, {"sync", O_SYNC}, {"text", O_TEXT}, + {"fullblock", O_FULLBLOCK}, /* Read only full blocks from input */ {"", 0} }; @@ -762,6 +767,27 @@ iread (int fd, char *buf, size_t size) } } +/* Wrapper around iread function which reads full blocks if possible */ +static ssize_t +iread_fullblock (int fd, char *buf, size_t size) +{ + ssize_t nread = 0; + + while (0 < size) + { + ssize_t ncurr = iread(fd, buf, size); + if (ncurr < 0) + return ncurr; + if (ncurr == 0) + break; + nread += ncurr; + buf += ncurr; + size -= ncurr; + } + + return nread; +} + /* Write to FD the buffer BUF of size SIZE, processing any signals that arrive. Return the number of bytes written, setting errno if this is less than SIZE. Keep trying if there are partial @@ -1000,6 +1026,15 @@ scanargs (int argc, char *const *argv) if (input_flags & (O_DSYNC | O_SYNC)) input_flags |= O_RSYNC; + if (output_flags & O_FULLBLOCK) + { + error (0, 0, "%s: %s", _("invalid output flag"), "'fullblock'"); + usage (EXIT_FAILURE); + } + iread_fnc = (input_flags & O_FULLBLOCK)? + iread_fullblock: + iread; + if (multiple_bits_set (conversions_mask & (C_ASCII | C_EBCDIC | C_IBM))) error (EXIT_FAILURE, 0, _("cannot combine any two of {ascii,ebcdic,ibm}")); if (multiple_bits_set (conversions_mask & (C_BLOCK | C_UNBLOCK))) @@ -1197,7 +1232,7 @@ skip (int fdesc, char const *file, uintmax_t records, size_t blocksize, do { - ssize_t nread = iread (fdesc, buf, blocksize); + ssize_t nread = iread_fnc (fdesc, buf, blocksize); if (nread < 0) { if (fdesc == STDIN_FILENO) @@ -1508,7 +1543,7 @@ dd_copy (void) (conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0', input_blocksize); - nread = iread (STDIN_FILENO, ibuf, input_blocksize); + nread = iread_fnc (STDIN_FILENO, ibuf, input_blocksize); if (nread == 0) break; /* EOF. */ diff --git a/tests/dd/misc b/tests/dd/misc index d54fbfa..24e5eba 100755 --- a/tests/dd/misc +++ b/tests/dd/misc @@ -88,6 +88,15 @@ fi outbytes=`echo x | dd bs=3 ibs=10 obs=10 conv=sync 2>/dev/null | wc -c` test "$outbytes" -eq 3 || fail=1 +(echo a; sleep .1; echo b) \ + | LC_ALL=C dd bs=4 status=noxfer iflag=fullblock >out 2>err || fail=1 +echo "a +b" > out_ok +echo "1+0 records in +1+0 records out" > err_ok +compare out out_ok || fail=1 +compare err err_ok || fail=1 + test $fail -eq 0 && fail=$warn (exit $fail); exit $fail diff -ruN coreutils-6.12.old/doc/coreutils.info coreutils-6.12/doc/coreutils.info --- coreutils-6.12.old/doc/coreutils.info 2008-07-24 12:49:57.000000000 +0200 +++ coreutils-6.12/doc/coreutils.info 2008-07-24 12:52:17.000000000 +0200 @@ -6112,6 +6112,12 @@ Use text I/O. Like `binary', this option has no effect on standard platforms. + 'fullblock' + Read full blocks from input if possible. read() may return + early if a full block is not available, so retry until data + is available or end of file is reached. This flag can be used + only for the iflag option. + These flags are not supported on all systems, and `dd' rejects attempts to use them when they are not supported. When reading diff -ruN coreutils-6.12.old/man/dd.1 coreutils-6.12/man/dd.1 --- coreutils-6.12.old/man/dd.1 2008-07-24 12:51:06.000000000 +0200 +++ coreutils-6.12/man/dd.1 2008-07-24 12:59:06.000000000 +0200 @@ -111,6 +111,13 @@ .TP direct use direct I/O for data +.PP +FLAG symbols only for iflag option: +.TP +fullblock +Read full blocks from input if possible. read() may return early +if a full block is not available, so retry until data is available +or end of file is reached. .IP directory fail unless a directory dsync use synchronized I/O for data coreutils-6.12-ls-libcap.patch: --- NEW FILE coreutils-6.12-ls-libcap.patch --- >From 7634188624dc7f48c047b29fab3715dc7a468059 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 23 Jul 2008 09:52:05 +0200 Subject: [PATCH] ls: --color now highlights files with capabilities, too * configure.ac: New option: --disable-libcap. Check for libcap usability. * src/Makefile.am (dir_LDADD, ls_LDADD, ...): Append $(LIB_CAP). * src/ls.c: [HAVE_CAP] Include . (has_capability): New function for capability detection. (print_color_indicator): Colorize file with capability. * src/dircolors.c: Update color lists. * src/dircolors.hin: Mention new CAPABILITY color attribute. * tests/ls/capability: Test for ls - colorize file with capability. * tests/Makefile.am (TESTS): Add ls/capability. * NEWS: Mention the change. --- NEWS | 2 ++ configure.ac | 13 +++++++++++++ src/Makefile.am | 6 +++--- src/dircolors.c | 4 ++-- src/dircolors.hin | 1 + src/ls.c | 43 +++++++++++++++++++++++++++++++++++++++++-- tests/Makefile.am | 1 + tests/ls/capability | 43 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 106 insertions(+), 7 deletions(-) create mode 100755 tests/ls/capability diff --git a/configure.ac b/configure.ac index ac93e1c..96b2fda 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,19 @@ gl_EARLY gl_INIT coreutils_MACROS +dnl Check whether libcap is usable +AC_ARG_ENABLE([libcap], + AC_HELP_STRING([--disable-libcap], [disable libcap support]), + AC_MSG_WARN([libcap support disabled by user]), + [AC_CHECK_LIB([cap], [cap_get_file], + [AC_CHECK_HEADER([sys/capability.h], + [LIB_CAP="-lcap" AC_DEFINE(HAVE_CAP, 1, [libcap usability])], + [AC_MSG_WARN([header sys/capability.h was not found, support for libcap will not be built])] + )], + [AC_MSG_WARN([libcap library was not found or not usable, support for libcap will not be built])]) + ]) +AC_SUBST([LIB_CAP]) + AC_FUNC_FORK optional_bin_progs= diff -ruN coreutils-6.12.orig/src/Makefile.am coreutils-6.12/src/Makefile.am --- coreutils-6.12.orig/src/Makefile.am 2008-07-10 12:30:03.000000000 +0200 +++ coreutils-6.12/src/Makefile.am 2008-07-24 13:18:43.000000000 +0200 @@ -91,14 +91,14 @@ # for clock_gettime and fdatasync dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC) -dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) +dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP) id_LDADD = $(LDADD) $(LIB_SELINUX) -ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) +ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP) pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) shred_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC) shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME) mktemp_LDADD = $(LDADD) $(LIB_GETHRXTIME) -vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) +vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP) tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) ## If necessary, add -lm to resolve use of pow in lib/strtod.c. diff -ruN coreutils-6.10.orig/src/dircolors.c coreutils-6.10/src/dircolors.c --- coreutils-6.10.orig/src/dircolors.c 2008-07-24 14:29:44.000000000 +0200 +++ coreutils-6.10/src/dircolors.c 2008-07-24 14:38:14.000000000 +0200 @@ -63,14 +63,14 @@ "SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK", "CHR", "CHAR", "DOOR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END", "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "STICKY", - "OTHER_WRITABLE", "OWR", "STICKY_OTHER_WRITABLE", "OWT", NULL + "OTHER_WRITABLE", "OWR", "STICKY_OTHER_WRITABLE", "OWT", "CAPABILITY", NULL }; static const char *const ls_codes[] = { "no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi", "so", "bd", "bd", "cd", "cd", "do", "ex", "lc", "lc", "rc", "rc", "ec", "ec", - "su", "su", "sg", "sg", "st", "ow", "ow", "tw", "tw", NULL + "su", "su", "sg", "sg", "st", "ow", "ow", "tw", "tw", "ca", NULL }; #define array_len(Array) (sizeof (Array) / sizeof *(Array)) verify (array_len (slack_codes) == array_len (ls_codes)); diff --git a/src/dircolors.hin b/src/dircolors.hin index 38914c8..5137cc6 100644 --- a/src/dircolors.hin +++ b/src/dircolors.hin @@ -77,6 +77,7 @@ CHR 40;33;01 # character device driver ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable diff --git a/src/ls.c b/src/ls.c index 4b69f7d..9bc66a1 100644 --- a/src/ls.c +++ b/src/ls.c @@ -38,6 +38,10 @@ #include #include +#ifdef HAVE_CAP +# include +#endif + #if HAVE_TERMIOS_H # include #endif @@ -518,14 +518,14 @@ { C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK, C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR, C_SETUID, C_SETGID, - C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE + C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE, C_CAP }; static const char *const indicator_name[]= { "lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so", "bd", "cd", "mi", "or", "ex", "do", "su", "sg", "st", - "ow", "tw", NULL + "ow", "tw", "ca", NULL }; struct color_ext_type @@ -553,6 +557,7 @@ static struct bin_str color_indicator[] = { LEN_STR_PAIR ("37;44") }, /* st: sticky: black on blue */ { LEN_STR_PAIR ("34;42") }, /* ow: other-writable: blue on green */ { LEN_STR_PAIR ("30;42") }, /* tw: ow w/ sticky: black on green */ + { LEN_STR_PAIR ("30;41") }, /* capability: black on red */ }; /* FIXME: comment */ @@ -3953,6 +3953,38 @@ DIRED_PUTCHAR (c); } +#ifdef HAVE_CAP +static bool +/* Return true if NAME has a capability (see linux/capability.h) */ +has_capability (const char *name) +{ + cap_t cap_d; + char *result; + bool has_cap; + + cap_d = cap_get_file (name); + if (cap_d == NULL) + return false; + + result = cap_to_text (cap_d, NULL); + cap_free (cap_d); + if (!result) + return false; + + /* check if human-readable capability string is empty */ + has_cap = !!*result; + + cap_free (result); + return has_cap; +} +#else +static bool +has_capability (const char *name) +{ + return false; +} +#endif + static void print_color_indicator (const char *name, mode_t mode, int linkok, bool stat_ok, enum filetype filetype) @@ -3923,6 +3960,8 @@ print_color_indicator (const char *name, mode_t mode, int linkok, type = C_SETUID; else if ((mode & S_ISGID) != 0) type = C_SETGID; + else if (has_capability (name)) + type = C_CAP; else if ((mode & S_IXUGO) != 0) type = C_EXEC; } diff -ruN coreutils-6.10.orig/tests/ls/Makefile.am coreutils-6.10/tests/ls/Makefile.am --- coreutils-6.10.orig/tests/ls/Makefile.am 2007-11-25 14:23:31.000000000 +0100 +++ coreutils-6.10/tests/ls/Makefile.am 2008-07-24 14:46:36.000000000 +0200 @@ -18,7 +18,7 @@ TESTS = \ stat-free-symlinks \ nameless-uid \ - color-dtype-dir \ + color-dtype-dir capability \ stat-failed \ stat-dtype \ inode dangle file-type recursive dired infloop \ diff --git a/tests/ls/capability b/tests/ls/capability new file mode 100755 index 0000000..549e06b --- /dev/null +++ b/tests/ls/capability @@ -0,0 +1,43 @@ +#!/bin/sh +# Ensure "ls --color" properly colorizes file with capability. + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if test "$VERBOSE" = yes; then + set -x + ls --version +fi + +. $srcdir/../test-lib.sh +uid_is_privileged_ || skip_test_ "must be run as root" + +(setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \ + || skip_test_ "setcap utility not found" +fail=0 + +# Don't let a different umask perturb the results. +umask 22 + +touch test +setcap cap_net_bind_service=ep test \ + || framework_failure +code='30;41' +LS_COLORS="ca=$code" \ + ls --color=always test > out || fail=1 +printf "\033[0m\033[${code}mtest\033[0m\n\033[m" > out_ok || fail=1 +compare out out_ok || fail=1 + +(exit $fail); exit $fail -- 1.5.4.1 coreutils-6.10-configuration.patch: Index: coreutils-6.10-configuration.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils-6.10-configuration.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- coreutils-6.10-configuration.patch 29 Mar 2008 17:14:21 -0000 1.5 +++ coreutils-6.10-configuration.patch 28 Jul 2008 07:44:15 -0000 1.6 @@ -1,3 +1,15 @@ +diff -urNp coreutils-6.11-orig/tests/touch/no-create-missing coreutils-6.11/tests/touch/no-create-missing +--- coreutils-6.11-orig/tests/touch/no-create-missing 2008-04-19 23:34:23.000000000 +0200 ++++ coreutils-6.11/tests/touch/no-create-missing 2008-04-24 12:34:52.000000000 +0200 +@@ -36,7 +36,7 @@ test="$abs_top_builddir/src/test" + # This test is ineffective unless /dev/stdout also works. + if "$test" -w /dev/stdout >/dev/null && + "$test" ! -w /dev/stdout >&-; then +- touch -c - >&- 2> /dev/null || fail=1 ++ #touch -c - >&- || fail=1 + touch -cm - >&- 2> /dev/null || fail=1 + touch -ca - >&- 2> /dev/null || fail=1 + fi diff -urp coreutils-6.10-orig/src/Makefile.am coreutils-6.10/src/Makefile.am --- coreutils-6.10-orig/src/Makefile.am 2008-01-11 11:34:22.000000000 +0100 +++ coreutils-6.10/src/Makefile.am 2008-01-23 14:52:26.000000000 +0100 Index: coreutils-DIR_COLORS =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils-DIR_COLORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- coreutils-DIR_COLORS 25 Jan 2008 17:48:11 -0000 1.3 +++ coreutils-DIR_COLORS 28 Jul 2008 07:44:16 -0000 1.4 @@ -83,6 +83,7 @@ MISSING 01;05;37;41 # ... and the files they point to SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable Index: coreutils-DIR_COLORS.256color =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils-DIR_COLORS.256color,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- coreutils-DIR_COLORS.256color 7 Feb 2008 15:10:39 -0000 1.2 +++ coreutils-DIR_COLORS.256color 28 Jul 2008 07:44:16 -0000 1.3 @@ -62,6 +62,7 @@ MISSING 01;05;48;5;232;38;5;15 # ... and the files they point to SETUID 48;5;196;38;5;15 # file that is setuid (u+s) SETGID 48;5;11;38;5;16 # file that is setgid (g+s) +CAPABILITY 48;5;196;38;5;226 # file with capability STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable Index: coreutils-DIR_COLORS.xterm =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils-DIR_COLORS.xterm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- coreutils-DIR_COLORS.xterm 25 Jan 2008 17:48:11 -0000 1.3 +++ coreutils-DIR_COLORS.xterm 28 Jul 2008 07:44:16 -0000 1.4 @@ -65,6 +65,7 @@ MISSING 01;05;37;41 # ... and the files they point to SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils.spec,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- coreutils.spec 4 Jul 2008 16:29:00 -0000 1.214 +++ coreutils.spec 28 Jul 2008 07:44:16 -0000 1.215 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 27%{?dist} +Release: 28%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -34,6 +34,7 @@ Patch102: coreutils-6.10-manpages.patch #Patch103: coreutils-6.10-longoptions.patch Patch104: coreutils-6.10-sparc-shafix.patch +Patch105: coreutils-6.12-dd-fullblock.patch # sh-utils Patch703: sh-utils-2.0.11-dateman.patch @@ -60,6 +61,8 @@ Patch950: coreutils-selinux.patch Patch951: coreutils-selinuxmanpages.patch +Patch954: coreutils-6.12-ls-libcap.patch + BuildRequires: libselinux-devel >= 1.25.6-1 BuildRequires: libacl-devel BuildRequires: gettext bison @@ -69,6 +72,7 @@ #dist-lzma required BuildRequires: automake >= 1.10.1 %{?!nopam:BuildRequires: pam-devel} +BuildRequires: libcap-devel >= 2.0.6 Requires(post): libselinux >= 1.25.6-1 Requires(pre): /sbin/install-info @@ -76,6 +80,7 @@ Requires(post): /sbin/install-info Requires(post): grep %{?!nopam:Requires: pam >= 0.66-12} +Requires(post): libcap >= 2.0.6 # Require a C library that doesn't put LC_TIME files in our way. Conflicts: glibc < 2.2 @@ -122,6 +127,7 @@ %patch102 -p1 -b .manpages #%patch103 -p1 -b .longopt %patch104 -p1 -b .sparc +%patch105 -p1 -b .dd-fullblock # sh-utils %patch703 -p1 -b .dateman @@ -145,8 +151,11 @@ %patch950 -p1 -b .selinux %patch951 -p1 -b .selinuxman +%patch954 -p1 -b .ls-libcap + chmod a+x tests/sort/sort-mb-tests chmod a+x tests/mkdir/selinux +chmod a+x tests/ls/capability #fix typos/mistakes in localized documentation(#439410, #440056) for pofile in $(find ./po/*.p*) @@ -325,6 +334,12 @@ /sbin/runuser %changelog +* Wed Jul 28 2008 Kamil Dudka - 6.10-28 +- dd: iflag=fullblock now read full blocks if possible + (#431997, #449263) +- ls: --color now highlights files with capabilities (#449985) +- suppressed failing test in tests/touch/no-create-missing + * Fri Jul 04 2008 Ondrej Vasik - 6.10-27 - who -r should not show last runlevel for nonprintable chars (like \0) - #453249,add few missing who options to texinfo From fedora-extras-commits at redhat.com Mon Jul 28 08:08:00 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 28 Jul 2008 08:08:00 GMT Subject: rpms/subversion/F-9 subversion-1.5.1.tar.gz.asc, NONE, 1.1 .cvsignore, 1.23, 1.24 sources, 1.29, 1.30 subversion.spec, 1.112, 1.113 upstream, 1.17, 1.18 upstream-key.gpg, 1.7, 1.8 Message-ID: <200807280808.m6S880me015027@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14947 Modified Files: .cvsignore sources subversion.spec upstream upstream-key.gpg Added Files: subversion-1.5.1.tar.gz.asc Log Message: * Mon Jul 28 2008 Joe Orton 1.5.1-1.fc9 - update to 1.5.1 --- NEW FILE subversion-1.5.1.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBIiIutCwOubk4kUXwRAj+hAKCSk6lmt+0+IQ6A+ZxpRvbRZvddhACg45VG qge6q+hkaDcL0PK4o70Q5Ic= =XMH5 -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBIiJ0VokEGqRcG/W4RAgjyAJ9Q7IGDrFlAehXbsHLpWC/q0EX2aQCgytSr opScRrQxh8ZGjx/i+fUcjWw= =e2B2 -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAkiJAR8ACgkQ+ZiecT68nANoZgCguCqIgQfBsqhhBy1nub0cGB92 E2wAn220PA2CCaiWXakpVkSt4C9Fpx9i =d1Iz -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQBIibGLNR8z5DU+JbwRAl6dAJoDvz3z45EweH77/KbgUApW6iFqagCfbdcb OlTj7XF75yHuF5F1syel5Q8= =gK0P -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 21 Dec 2007 19:51:45 -0000 1.23 +++ .cvsignore 28 Jul 2008 08:07:30 -0000 1.24 @@ -1,2 +1 @@ -subversion-1.4.3.tar.gz -subversion-1.4.6.tar.gz +subversion-1.5.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 7 Jul 2008 18:59:06 -0000 1.29 +++ sources 28 Jul 2008 08:07:30 -0000 1.30 @@ -1 +1 @@ -c40c1ebc1f228d8ea17dd0e7997a60c1 subversion-1.5.0.tar.gz +37533b0435caaa3e4e1be359389fcbb9 subversion-1.5.1.tar.gz Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/subversion.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- subversion.spec 24 Jul 2008 16:15:52 -0000 1.112 +++ subversion.spec 28 Jul 2008 08:07:30 -0000 1.113 @@ -14,8 +14,8 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion -Version: 1.5.0 -Release: 10%{?dist} +Version: 1.5.1 +Release: 1%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -284,6 +284,9 @@ %endif %changelog +* Mon Jul 28 2008 Joe Orton 1.5.1-1.fc9 +- update to 1.5.1 + * Thu Jul 24 2008 Joe Orton 1.5.0-10.fc9 - rebuild to add ra_dav library thunk Index: upstream =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/upstream,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- upstream 7 Jul 2008 18:59:06 -0000 1.17 +++ upstream 28 Jul 2008 08:07:30 -0000 1.18 @@ -1 +1 @@ -subversion-1.5.0.tar.gz +subversion-1.5.1.tar.gz Index: upstream-key.gpg =================================================================== RCS file: /cvs/extras/rpms/subversion/F-9/upstream-key.gpg,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- upstream-key.gpg 16 Feb 2007 16:56:55 -0000 1.7 +++ upstream-key.gpg 28 Jul 2008 08:07:30 -0000 1.8 @@ -334,3 +334,44 @@ ulJsLlk= =gZPn -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQGiBEf/izgRBACjZnN9hjWbaOcMD1OPoE8+Wf0sDBmpmOU77DlyDTkqrGFrvZIh ++kphQoBP4FXMojN4wxnaTB1aabOcmFp2Ig4ZTCPvXHGYHWBuWU4wnqkLAOsgjbwr +yOKwhD7J0NPgQOlRvUxZbWyXVIxjDELRuw1LpG+jj+8URreN0dZJ4ORgIwCgxJbS +MuMQsc+nkJkHof5HtJG8Sv8D/3hz4oXKofMnHo1RStRf67J8LsqifyO1uqWo0qtn +nGL2GN3UyMeZdKTpEDDkpogdsqQYrRqLaPp5egatm8BHujoxFDlEqpEI6BHz/7wz +sx+gmh2w7fwdN/gf0g9BQ/jpZtSoHJC6qi8ib/RKXvE9c9Xp8IChbcPUGawTkJjA +UGL9A/9TSTQBf2SQawN5Pxx3goVzbT3zcWIhFRkvWiKjHBhMgBJAN19JIGsDYfwD +zTHCUiEUMoN4xyVqWGK7MrGpCkvT5HYFd0ZIIn3Tb9iHy9+iykZbTQwgZScn7J49 +ibp/yk2KU4rXLgkDMDf+2XV/xz786HkltRtrXhvKswZOgTiOI7Q8QXJmcmV2ZXIg +RnJlaHRlcyBUYWlmZXJzYXIgQXJhaGVzaXMgPEFyZnJldmVyLkZUQUBHTWFpbC5D +b20+iGYEExECACYFAkf/izgCGwMFCQDtTgAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX +gAAKCRD5mJ5xPrycA/rqAJ9SBm7wC1v6Qb5tvvmM+Ed9SOIq/wCfSfw0DxdIe4Px +k2hokkxaxu6/+Dm5BA0ER/+LOBAQAKUsBCUBHzh+LtjMVffMwiuWkTOs699lmBRc +9Ii3tOaadF1xBw+gisa8zbmJxwxE/fTF257XagDgl2frSLDpKnD5ZO3494maFWMv +eQtKsYeGaFFqoLHax29SEHgxQ8GYwNTmjy05wKfFyfqbtq6xckARF8LFQNIryx/O +SmYiktD3F/rckL0caE63aBIl4/HGEFiTDvn44aClFk74NJwN+3Cb2DgLQ3zQrCI7 +4Yq5KqUsNKKbj5O/0UMlZSlpYAyEyfp0F8HordMS6Z8p7phqAcOfXT/j987C3UY8 +8rvtNwMJvFwkuSLbMHhonDaDoLYHdGqVcC81dnGC5MjvpFE8hySz4JlO7Zfzlnm8 +pGF0E7lFyB2hcc6/xxpsUEHc/3HwtqVcJzSpblck93dThPJBSdBBrqvQnhm5L617 +lP4x/OOPKE4GGQ+CCNqNx9c0A876drsAmx2LYhXfdHHU5iYX8NTq0TVTVmPphY6k +Y8tyO84HOyzrIU0ofpY1ODvR6UY5MxfMeZoT+bps5aVEYnrcy+HU9JL6bsmQiSV/ +8z+CPUk6bWEp48W8TYLadYQPQuW5mE5t+65D5oqDkAj4bWTAjeTWtA2aRLtfTH3w +bL/r8cswEWilKEaIbHptJbN1Ys9ZEKMcY3MBtj54lwIkakqYd4jqQjpcBkGkmiJe +I4pyzIIvAAQND/4qkKmLI6/p2ud/ufcsS9uKEmuFf2Lhv2NIoIWYPY+V/bKYsJFA +jr40U9SMCHcPZACwNVo6tn2gWD0uKSLUnBQvSxuPHvnlCoEgcJEQ6rdM6lf55RsG +KC2fFH9vCWzTrJiLWtNrdHcfruntggcJgPtLC2IVTgc9B/9C1c4sL/0u/1pUUMFw +JKF9dxemkShb+MNP1zjmE7fUjhDaXsJulHfuXvO+/Xgom7TlY5XYcPlbcM1MIHIw +8/I7i65G1GG1Rzn08zNVIwd3JHGG30q8DTItSZ5y2CKWefD3XJN0Cqk0xs9x4G/B +H64CYPHtWZniqo50/gKwbH9BYzYKMb0V0T1cIyyd++5hXMgb6/asJmIFt3kpsx41 +lI5JCfK011gZ6u3YEMuDmUR6VU11DhR2eJ4Mg8BcVyZ/+aHByNN9AfeY5PKxKxx0 +1R6Vy7kX9s2uEblXx4Dh/Bl4aAOdfXCU/lqLTJIFxc4KyRKlIPOQWEKeMerk9bs7 +prO22RJvU0fKjgj4b2X+mKipvCQzPzZ8sK36wLZcuRlbtNunBT+acdTuC7iehDz1 +gfzsixdrzn82QkfHaFvHyqjajFa0RDj3E1/gh0Ds/Az3GD7WCjVT9ESnlix9hm6J +UdELXifiU3RSG7LihrEFFsNIKoGbl77Iwhlbv4Ne+5idjcNvu6zxHBOzHohPBBgR +AgAPBQJH/4s4AhsMBQkA7U4AAAoJEPmYnnE+vJwDYKsAoJnpVKEKQkAmV+eKkteD +DsaBdgGvAKCGgo20vieV2HBWLOLVNH7t7CJQ+A== +=nnAp +-----END PGP PUBLIC KEY BLOCK----- From fedora-extras-commits at redhat.com Mon Jul 28 08:10:21 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Mon, 28 Jul 2008 08:10:21 GMT Subject: rpms/perl-DBD-Pg/F-9 .cvsignore, 1.17, 1.18 perl-DBD-1.31-fixver.patch, 1.2, 1.3 perl-DBD-Pg.spec, 1.41, 1.42 sources, 1.18, 1.19 Message-ID: <200807280810.m6S8AL31015385@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-Pg/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15297 Modified Files: .cvsignore perl-DBD-1.31-fixver.patch perl-DBD-Pg.spec sources Log Message: * Mon Jul 28 2008 Marcela Maslanova - 2.8.7-1 - new version has Pg.pm twice in two locations - update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 31 May 2006 23:55:09 -0000 1.17 +++ .cvsignore 28 Jul 2008 08:09:51 -0000 1.18 @@ -3,3 +3,4 @@ DBD-Pg-1.47.tar.gz DBD-Pg-1.48.tar.gz DBD-Pg-1.49.tar.gz +DBD-Pg-2.8.7.tar.gz perl-DBD-1.31-fixver.patch: Index: perl-DBD-1.31-fixver.patch =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/F-9/perl-DBD-1.31-fixver.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-1.31-fixver.patch 31 May 2006 23:55:09 -0000 1.2 +++ perl-DBD-1.31-fixver.patch 28 Jul 2008 08:09:51 -0000 1.3 @@ -1,12 +1,13 @@ ---- DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm.fixver 2003-12-19 09:48:23.000000000 -0500 -+++ DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm 2003-12-19 09:48:47.000000000 -0500 -@@ -254,6 +254,9 @@ - } elsif ($version =~ /(\d+)\.(\d+)\w+\d+/) { +diff -up DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm.fix DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm +--- DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm.fix 2008-07-21 17:15:05.000000000 +0200 ++++ DBD-Pg-2.8.7/t/lib/App/Info/RDBMS/PostgreSQL.pm 2008-07-28 09:01:08.000000000 +0200 +@@ -274,6 +274,9 @@ my $get_version = sub { + # New versions, such as "7.4", are treated as patch level "0" @{$self}{qw(version major minor patch)} = ($version, $1, $2, 0); + } elsif ($version =~ /(\d+)\.(\d+)/) { + @{$self}{qw(version major minor patch)} = -+ ($version, $1, $2, 0); ++ ($version, $1, $2, 0); } else { $self->error("Failed to parse PostgreSQL version parts from " . "string '$version'"); Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/F-9/perl-DBD-Pg.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- perl-DBD-Pg.spec 28 Feb 2008 13:03:06 -0000 1.41 +++ perl-DBD-Pg.spec 28 Jul 2008 08:09:51 -0000 1.42 @@ -1,6 +1,6 @@ Name: perl-DBD-Pg -Version: 1.49 -Release: 9%{?dist} +Version: 2.8.7 +Release: 1%{?dist} Summary: A PostgreSQL interface for perl Group: Development/Libraries @@ -53,10 +53,15 @@ %doc Changes README README.dev TODO %{perl_vendorarch}/DBD/ %{perl_vendorarch}/auto/DBD/ +%{perl_vendorarch}/Bundle/DBD/Pg.pm %{_mandir}/man3/*.3* %changelog +* Mon Jul 28 2008 Marcela Maslanova - 2.8.7-1 +- new version has Pg.pm twice in two locations +- update + * Wed Feb 27 2008 Tom "spot" Callaway - 1.49-9 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 31 May 2006 23:55:09 -0000 1.18 +++ sources 28 Jul 2008 08:09:51 -0000 1.19 @@ -1 +1,2 @@ 76b9d6a2f4cbaefcba23380f83998215 DBD-Pg-1.49.tar.gz +9a5530bcf0974b099dd1053f5821a51a DBD-Pg-2.8.7.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 08:16:25 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Mon, 28 Jul 2008 08:16:25 GMT Subject: rpms/gspiceui/EL-5 gspiceui.desktop, NONE, 1.1 gspiceui.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807280816.m6S8GPxf015956@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gspiceui/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15908/EL-5 Modified Files: .cvsignore sources Added Files: gspiceui.desktop gspiceui.spec import.log Log Message: Initial import. --- NEW FILE gspiceui.desktop --- [Desktop Entry] Name=GspiceUI Comment=Spice Electronic circuit similators UI Exec=gspiceui Icon=gspiceui Terminal=false Type=Application Encoding=UTF-8 Categories=Education;Science;Engineering; --- NEW FILE gspiceui.spec --- Name: gspiceui Version: 0.9.65 Release: 2%{?dist} Summary: A GUI to freely available Spice Electronic circuit similators Group: Applications/System License: GPLv2+ URL: http://sourceforge.net/projects/gspiceui Source0: http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: compat-wxGTK26-devel, desktop-file-utils Requires: ngspice, geda-gnetlist, geda-gschem Requires: gwave, electronics-menu %description GspiceUI is listed among the Fedora Electronic Lab (FEL) packages. GNU Spice GUI is intended to provide a GUI to freely available Spice electronic cicuit simulators eg.GnuCAP, Ng-Spice. It uses gNetList to convert schematic files to net list files and gWave to display simulation results. gSchem is used as the schematic generation/viewing tool. %prep %setup -q -n %{name}-v%{version} sed -i 's|/usr/local|/usr|g' html/Makefile sed -i 's|cp|install -pm 644|g' Makefile html/Makefile sed -i 's|cp |install -m 755 |g' src/Makefile sed -i 's|wx-config|wx-2.6-config|' src/Makefile %build make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6 %install rm -rf $RPM_BUILD_ROOT #fix installdir path sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile #Add missing folder mkdir -p $RPM_BUILD_ROOT%{_bindir} make install DESTDIR=$RPM_BUILD_ROOT #remove default installed docs|files rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog} rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons #Add/Manage desktop file mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -pm 0644 src/icons/%{name}-32x32.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm install -pm 0644 src/icons/%{name}-48x48.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm desktop-file-install --vendor "Fedora" \ --mode 0644 \ --remove-category="Science;Education" \ --add-category Electronics \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/icons/hicolor/??x??/apps/*.xpm %{_datadir}/applications/*.desktop %{_mandir}/man1/gspiceui.1.gz %changelog * Sat Jul 26 2008 Xavier Lamien - 0.9.65-2 - Fix typo on desktop-file-install. * Mon Jul 14 2008 Xavier Lamien - 0.9.65-1 - Update release. * Mon Dec 31 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-2 - Fixed typo in Requires. - Improved %%description and desktop file. - Fixed WxGTK config use. * Sun Dec 30 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.9.55-1 - Updated Release. - Built against WxGTK-2.6 libs. * Tue Jul 04 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.8.90-2 - Enabled the fix that make it honor RPM_OPT_FLAGS. * Wed Jul 04 2007 Xavier Lamien < lnxtnow[at]gmail.com > - 0.8.90-1 - Initial RPM Release. --- NEW FILE import.log --- gspiceui-0_9_65-2_fc9:EL-5:gspiceui-0.9.65-2.fc9.src.rpm:1217232930 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 04:15:10 -0000 1.1 +++ .cvsignore 28 Jul 2008 08:15:54 -0000 1.2 @@ -0,0 +1 @@ +gspiceui-v0.9.65.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:15:10 -0000 1.1 +++ sources 28 Jul 2008 08:15:54 -0000 1.2 @@ -0,0 +1 @@ +7243c51a7ad1d4138bc28db9695d18c2 gspiceui-v0.9.65.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 08:18:20 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Mon, 28 Jul 2008 08:18:20 GMT Subject: rpms/nfs-utils/devel .cvsignore, 1.22, 1.23 nfs-utils.spec, 1.181, 1.182 sources, 1.23, 1.24 nfs-utils-1.0.6-gssd_mixed_case.patch, 1.1, NONE nfs-utils-1.0.6-mountd.patch, 1.4, NONE nfs-utils-1.1.0-exportfs-man-update.patch, 1.2, NONE nfs-utils-1.1.0-exportfs-open.patch, 1.2, NONE nfs-utils-1.1.0-showmount-rpcerror.patch, 1.1, NONE nfs-utils-1.1.2-exportfs-man-typo.patch, 1.1, NONE nfs-utils-1.1.2-gssd-creds.patch, 1.1, NONE nfs-utils-1.1.2-gssd-des-types.patch, 1.1, NONE nfs-utils-1.1.2-gssd-getport.patch, 1.1, NONE nfs-utils-1.1.2-gssd-getverbose.patch, 1.1, NONE nfs-utils-1.1.2-mount-bg-fix.patch, 1.1, NONE nfs-utils-1.1.2-mount-chk-setuid.patch, 1.1, NONE nfs-utils-1.1.2-mount-cleanup.patch, 1.1, NONE nfs-utils-1.1.2-mount-eacces.patch, 1.1, NONE nfs-utils-1.1.2-mount-error-reporting.patch, 1.1, NONE nfs-utils-1.1.2-mount-remove-bg-host.patch, 1.1, NONE nfs-utils-1.1.2-mount-retry.patch, 1.2, NONE nfs-utils-1.1.2-mount-statd-chk.patch, 1.1, NONE nfs-utils-1.1.2-mountstats-rdma.patch, 1.1, NONE nfs-utils-1.1.2-mountstats.patch, 1.1, NONE nfs-utils-1.1.2-multi-auth-flavours.patch, 1.1, NONE nfs-utils-1.1.2-nfs-iostat-rdma.patch, 1.1, NONE nfs-utils-1.1.2-nfs-iostat.patch, 1.1, NONE nfs-utils-1.1.2-nfsstat-counters.patch, 1.1, NONE nfs-utils-1.1.2-nfsstat-m-arg.patch, 1.1, NONE nfs-utils-1.1.2-rmtab-fqdn.patch, 1.1, NONE nfs-utils-1.1.2-tcpwrapper-fix.patch, 1.1, NONE nfs-utils-1.1.2-warnings.patch, 1.3, NONE Message-ID: <200807280818.m6S8IKD5016083@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16034 Modified Files: .cvsignore nfs-utils.spec sources Removed Files: nfs-utils-1.0.6-gssd_mixed_case.patch nfs-utils-1.0.6-mountd.patch nfs-utils-1.1.0-exportfs-man-update.patch nfs-utils-1.1.0-exportfs-open.patch nfs-utils-1.1.0-showmount-rpcerror.patch nfs-utils-1.1.2-exportfs-man-typo.patch nfs-utils-1.1.2-gssd-creds.patch nfs-utils-1.1.2-gssd-des-types.patch nfs-utils-1.1.2-gssd-getport.patch nfs-utils-1.1.2-gssd-getverbose.patch nfs-utils-1.1.2-mount-bg-fix.patch nfs-utils-1.1.2-mount-chk-setuid.patch nfs-utils-1.1.2-mount-cleanup.patch nfs-utils-1.1.2-mount-eacces.patch nfs-utils-1.1.2-mount-error-reporting.patch nfs-utils-1.1.2-mount-remove-bg-host.patch nfs-utils-1.1.2-mount-retry.patch nfs-utils-1.1.2-mount-statd-chk.patch nfs-utils-1.1.2-mountstats-rdma.patch nfs-utils-1.1.2-mountstats.patch nfs-utils-1.1.2-multi-auth-flavours.patch nfs-utils-1.1.2-nfs-iostat-rdma.patch nfs-utils-1.1.2-nfs-iostat.patch nfs-utils-1.1.2-nfsstat-counters.patch nfs-utils-1.1.2-nfsstat-m-arg.patch nfs-utils-1.1.2-rmtab-fqdn.patch nfs-utils-1.1.2-tcpwrapper-fix.patch nfs-utils-1.1.2-warnings.patch Log Message: Updated to latest upstream version: 1.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Mar 2008 19:05:56 -0000 1.22 +++ .cvsignore 28 Jul 2008 08:17:50 -0000 1.23 @@ -12,3 +12,4 @@ nfs-utils-1.1.0.tar.bz2 nfs-utils-1.1.1.tar.bz2 nfs-utils-1.1.2.tar.bz2 +nfs-utils-1.1.3.tar.bz2 Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- nfs-utils.spec 3 Jul 2008 15:52:18 -0000 1.181 +++ nfs-utils.spec 28 Jul 2008 08:17:50 -0000 1.182 @@ -1,8 +1,8 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://sourceforge.net/projects/nfs -Version: 1.1.2 -Release: 12%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Epoch: 1 # group all 32bit related archs @@ -23,37 +23,8 @@ Source15: nfs.sysconfig Patch00: nfs-utils-1.0.5-statdpath.patch -Patch01: nfs-utils-1.0.6-mountd.patch -Patch02: nfs-utils-1.0.6-gssd_mixed_case.patch -Patch03: nfs-utils-1.1.0-showmount-rpcerror.patch -Patch04: nfs-utils-1.1.0-exp-subtree-warn-off.patch -Patch05: nfs-utils-1.1.0-exportfs-open.patch -Patch06: nfs-utils-1.1.0-exportfs-man-update.patch -Patch07: nfs-utils-1.1.2-multi-auth-flavours.patch -Patch08: nfs-utils-1.1.2-mount-eacces.patch -Patch09: nfs-utils-1.1.0-smnotify-path.patch - -Patch101: nfs-utils-1.1.2-tcpwrapper-fix.patch -Patch102: nfs-utils-1.1.2-mount-retry.patch -Patch103: nfs-utils-1.1.2-mount-bg-fix.patch -Patch104: nfs-utils-1.1.2-mount-remove-bg-host.patch -Patch105: nfs-utils-1.1.2-gssd-getport.patch -Patch106: nfs-utils-1.1.2-gssd-des-types.patch -Patch107: nfs-utils-1.1.2-gssd-getverbose.patch -Patch108: nfs-utils-1.1.2-gssd-creds.patch -Patch109: nfs-utils-1.1.2-mount-chk-setuid.patch -Patch110: nfs-utils-1.1.2-exportfs-man-typo.patch -Patch111: nfs-utils-1.1.2-warnings.patch -Patch112: nfs-utils-1.1.2-mount-statd-chk.patch -Patch113: nfs-utils-1.1.2-mount-cleanup.patch -Patch114: nfs-utils-1.1.2-mount-error-reporting.patch -Patch115: nfs-utils-1.1.2-nfsstat-m-arg.patch -Patch116: nfs-utils-1.1.2-nfsstat-counters.patch -Patch117: nfs-utils-1.1.2-mountstats.patch -Patch118: nfs-utils-1.1.2-mountstats-rdma.patch -Patch119: nfs-utils-1.1.2-nfs-iostat.patch -Patch120: nfs-utils-1.1.2-nfs-iostat-rdma.patch -Patch121: nfs-utils-1.1.2-rmtab-fqdn.patch +Patch01: nfs-utils-1.1.2-smnotifypath.patch +Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -107,35 +78,6 @@ %patch00 -p1 %patch01 -p1 %patch02 -p1 -%patch03 -p1 -%patch04 -p1 -%patch05 -p1 -%patch06 -p1 -%patch07 -p1 -%patch08 -p1 -%patch09 -p1 - -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 -%patch114 -p1 -%patch115 -p1 -%patch116 -p1 -%patch117 -p1 -%patch118 -p1 -%patch119 -p1 -%patch120 -p1 -%patch121 -p1 %if %{enablefscache} %patch90 -p1 @@ -299,6 +241,9 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Mon Jul 28 2008 Steve Dickson 1.1.3-1 +- Updated to latest upstream version: 1.1.3 + * Wed Jul 2 2008 Steve Dickson 1.1.2-12 - Changed the default directories for sm-notify (bz 435480) - Added 'condstop' to init scripts so service are not Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 25 Mar 2008 19:05:56 -0000 1.23 +++ sources 28 Jul 2008 08:17:50 -0000 1.24 @@ -1,2 +1,2 @@ ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz -f1d53d27cc246291841e0989530dc94b nfs-utils-1.1.2.tar.bz2 +3ce0faed9e85e78c3017066530050a41 nfs-utils-1.1.3.tar.bz2 --- nfs-utils-1.0.6-gssd_mixed_case.patch DELETED --- --- nfs-utils-1.0.6-mountd.patch DELETED --- --- nfs-utils-1.1.0-exportfs-man-update.patch DELETED --- --- nfs-utils-1.1.0-exportfs-open.patch DELETED --- --- nfs-utils-1.1.0-showmount-rpcerror.patch DELETED --- --- nfs-utils-1.1.2-exportfs-man-typo.patch DELETED --- --- nfs-utils-1.1.2-gssd-creds.patch DELETED --- --- nfs-utils-1.1.2-gssd-des-types.patch DELETED --- --- nfs-utils-1.1.2-gssd-getport.patch DELETED --- --- nfs-utils-1.1.2-gssd-getverbose.patch DELETED --- --- nfs-utils-1.1.2-mount-bg-fix.patch DELETED --- --- nfs-utils-1.1.2-mount-chk-setuid.patch DELETED --- --- nfs-utils-1.1.2-mount-cleanup.patch DELETED --- --- nfs-utils-1.1.2-mount-eacces.patch DELETED --- --- nfs-utils-1.1.2-mount-error-reporting.patch DELETED --- --- nfs-utils-1.1.2-mount-remove-bg-host.patch DELETED --- --- nfs-utils-1.1.2-mount-retry.patch DELETED --- --- nfs-utils-1.1.2-mount-statd-chk.patch DELETED --- --- nfs-utils-1.1.2-mountstats-rdma.patch DELETED --- --- nfs-utils-1.1.2-mountstats.patch DELETED --- --- nfs-utils-1.1.2-multi-auth-flavours.patch DELETED --- --- nfs-utils-1.1.2-nfs-iostat-rdma.patch DELETED --- --- nfs-utils-1.1.2-nfs-iostat.patch DELETED --- --- nfs-utils-1.1.2-nfsstat-counters.patch DELETED --- --- nfs-utils-1.1.2-nfsstat-m-arg.patch DELETED --- --- nfs-utils-1.1.2-rmtab-fqdn.patch DELETED --- --- nfs-utils-1.1.2-tcpwrapper-fix.patch DELETED --- --- nfs-utils-1.1.2-warnings.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 08:19:15 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 28 Jul 2008 08:19:15 GMT Subject: rpms/subversion/devel sources, 1.30, 1.31 subversion.spec, 1.118, 1.119 upstream-key.gpg, 1.7, 1.8 Message-ID: <200807280819.m6S8JF79016174@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16122 Modified Files: sources subversion.spec upstream-key.gpg Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 26 Jun 2008 14:43:01 -0000 1.30 +++ sources 28 Jul 2008 08:18:44 -0000 1.31 @@ -1 +1 @@ -c40c1ebc1f228d8ea17dd0e7997a60c1 subversion-1.5.0.tar.gz +37533b0435caaa3e4e1be359389fcbb9 subversion-1.5.1.tar.gz Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- subversion.spec 10 Jul 2008 17:52:17 -0000 1.118 +++ subversion.spec 28 Jul 2008 08:18:44 -0000 1.119 @@ -14,8 +14,8 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion -Version: 1.5.0 -Release: 8 +Version: 1.5.1 +Release: 2 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -34,6 +34,7 @@ BuildRequires: neon-devel >= 0:0.24.7-1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: svn = %{version}-%{release} +Requires: apr >= 1.3.0 %define __perl_requires %{SOURCE3} @@ -275,7 +276,10 @@ %{_javadir}/svn-javahl.jar %endif -%changelog +* Mon Jul 28 2008 Joe Orton 1.5.1-2 +- update to 1.5.1 +- require suitable APR + * Thu Jul 10 2008 Tom "spot" Callaway 1.5.0-8 - rebuild against new db4-4.7 Index: upstream-key.gpg =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/upstream-key.gpg,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- upstream-key.gpg 16 Feb 2007 16:56:55 -0000 1.7 +++ upstream-key.gpg 28 Jul 2008 08:18:44 -0000 1.8 @@ -334,3 +334,44 @@ ulJsLlk= =gZPn -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQGiBEf/izgRBACjZnN9hjWbaOcMD1OPoE8+Wf0sDBmpmOU77DlyDTkqrGFrvZIh ++kphQoBP4FXMojN4wxnaTB1aabOcmFp2Ig4ZTCPvXHGYHWBuWU4wnqkLAOsgjbwr +yOKwhD7J0NPgQOlRvUxZbWyXVIxjDELRuw1LpG+jj+8URreN0dZJ4ORgIwCgxJbS +MuMQsc+nkJkHof5HtJG8Sv8D/3hz4oXKofMnHo1RStRf67J8LsqifyO1uqWo0qtn +nGL2GN3UyMeZdKTpEDDkpogdsqQYrRqLaPp5egatm8BHujoxFDlEqpEI6BHz/7wz +sx+gmh2w7fwdN/gf0g9BQ/jpZtSoHJC6qi8ib/RKXvE9c9Xp8IChbcPUGawTkJjA +UGL9A/9TSTQBf2SQawN5Pxx3goVzbT3zcWIhFRkvWiKjHBhMgBJAN19JIGsDYfwD +zTHCUiEUMoN4xyVqWGK7MrGpCkvT5HYFd0ZIIn3Tb9iHy9+iykZbTQwgZScn7J49 +ibp/yk2KU4rXLgkDMDf+2XV/xz786HkltRtrXhvKswZOgTiOI7Q8QXJmcmV2ZXIg +RnJlaHRlcyBUYWlmZXJzYXIgQXJhaGVzaXMgPEFyZnJldmVyLkZUQUBHTWFpbC5D +b20+iGYEExECACYFAkf/izgCGwMFCQDtTgAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX +gAAKCRD5mJ5xPrycA/rqAJ9SBm7wC1v6Qb5tvvmM+Ed9SOIq/wCfSfw0DxdIe4Px +k2hokkxaxu6/+Dm5BA0ER/+LOBAQAKUsBCUBHzh+LtjMVffMwiuWkTOs699lmBRc +9Ii3tOaadF1xBw+gisa8zbmJxwxE/fTF257XagDgl2frSLDpKnD5ZO3494maFWMv +eQtKsYeGaFFqoLHax29SEHgxQ8GYwNTmjy05wKfFyfqbtq6xckARF8LFQNIryx/O +SmYiktD3F/rckL0caE63aBIl4/HGEFiTDvn44aClFk74NJwN+3Cb2DgLQ3zQrCI7 +4Yq5KqUsNKKbj5O/0UMlZSlpYAyEyfp0F8HordMS6Z8p7phqAcOfXT/j987C3UY8 +8rvtNwMJvFwkuSLbMHhonDaDoLYHdGqVcC81dnGC5MjvpFE8hySz4JlO7Zfzlnm8 +pGF0E7lFyB2hcc6/xxpsUEHc/3HwtqVcJzSpblck93dThPJBSdBBrqvQnhm5L617 +lP4x/OOPKE4GGQ+CCNqNx9c0A876drsAmx2LYhXfdHHU5iYX8NTq0TVTVmPphY6k +Y8tyO84HOyzrIU0ofpY1ODvR6UY5MxfMeZoT+bps5aVEYnrcy+HU9JL6bsmQiSV/ +8z+CPUk6bWEp48W8TYLadYQPQuW5mE5t+65D5oqDkAj4bWTAjeTWtA2aRLtfTH3w +bL/r8cswEWilKEaIbHptJbN1Ys9ZEKMcY3MBtj54lwIkakqYd4jqQjpcBkGkmiJe +I4pyzIIvAAQND/4qkKmLI6/p2ud/ufcsS9uKEmuFf2Lhv2NIoIWYPY+V/bKYsJFA +jr40U9SMCHcPZACwNVo6tn2gWD0uKSLUnBQvSxuPHvnlCoEgcJEQ6rdM6lf55RsG +KC2fFH9vCWzTrJiLWtNrdHcfruntggcJgPtLC2IVTgc9B/9C1c4sL/0u/1pUUMFw +JKF9dxemkShb+MNP1zjmE7fUjhDaXsJulHfuXvO+/Xgom7TlY5XYcPlbcM1MIHIw +8/I7i65G1GG1Rzn08zNVIwd3JHGG30q8DTItSZ5y2CKWefD3XJN0Cqk0xs9x4G/B +H64CYPHtWZniqo50/gKwbH9BYzYKMb0V0T1cIyyd++5hXMgb6/asJmIFt3kpsx41 +lI5JCfK011gZ6u3YEMuDmUR6VU11DhR2eJ4Mg8BcVyZ/+aHByNN9AfeY5PKxKxx0 +1R6Vy7kX9s2uEblXx4Dh/Bl4aAOdfXCU/lqLTJIFxc4KyRKlIPOQWEKeMerk9bs7 +prO22RJvU0fKjgj4b2X+mKipvCQzPzZ8sK36wLZcuRlbtNunBT+acdTuC7iehDz1 +gfzsixdrzn82QkfHaFvHyqjajFa0RDj3E1/gh0Ds/Az3GD7WCjVT9ESnlix9hm6J +UdELXifiU3RSG7LihrEFFsNIKoGbl77Iwhlbv4Ne+5idjcNvu6zxHBOzHohPBBgR +AgAPBQJH/4s4AhsMBQkA7U4AAAoJEPmYnnE+vJwDYKsAoJnpVKEKQkAmV+eKkteD +DsaBdgGvAKCGgo20vieV2HBWLOLVNH7t7CJQ+A== +=nnAp +-----END PGP PUBLIC KEY BLOCK----- From fedora-extras-commits at redhat.com Mon Jul 28 08:20:23 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Mon, 28 Jul 2008 08:20:23 GMT Subject: rpms/perl-DBI/F-9 .cvsignore, 1.20, 1.21 perl-DBI.spec, 1.39, 1.40 sources, 1.20, 1.21 Message-ID: <200807280820.m6S8KNTC016324@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBI/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16266 Modified Files: .cvsignore perl-DBI.spec sources Log Message: * Mon Jul 28 2008 Marcela Maslanova - 1.607-1 - update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBI/F-9/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 14 Nov 2007 03:50:57 -0000 1.20 +++ .cvsignore 28 Jul 2008 08:19:53 -0000 1.21 @@ -1 +1,2 @@ DBI-1.601.tar.gz +DBI-1.607.tar.gz Index: perl-DBI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBI/F-9/perl-DBI.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- perl-DBI.spec 28 Feb 2008 13:02:28 -0000 1.39 +++ perl-DBI.spec 28 Jul 2008 08:19:53 -0000 1.40 @@ -1,6 +1,6 @@ Name: perl-DBI -Version: 1.601 -Release: 4%{?dist} +Version: 1.607 +Release: 1%{?dist} Summary: A database access API for perl Group: Development/Libraries @@ -86,6 +86,9 @@ %changelog +* Mon Jul 28 2008 Marcela Maslanova - 1.607-1 +- update + * Wed Feb 27 2008 Tom "spot" Callaway - 1.601-4 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBI/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Nov 2007 03:50:57 -0000 1.20 +++ sources 28 Jul 2008 08:19:53 -0000 1.21 @@ -1 +1,2 @@ d80677bd8113ec8cb0438b8703f3c418 DBI-1.601.tar.gz +bd5785b39675213948a61dea1b400012 DBI-1.607.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 08:25:29 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Mon, 28 Jul 2008 08:25:29 GMT Subject: rpms/PyOpenGL/devel .cvsignore, 1.4, 1.5 PyOpenGL.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807280825.m6S8PTtc016468@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/PyOpenGL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16431 Modified Files: .cvsignore PyOpenGL.spec sources Log Message: Update to 3.0.0b5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jul 2008 10:28:44 -0000 1.4 +++ .cvsignore 28 Jul 2008 08:24:58 -0000 1.5 @@ -1 +1 @@ -PyOpenGL-3.0.0b4.tar.gz +PyOpenGL-3.0.0b5.tar.gz Index: PyOpenGL.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PyOpenGL.spec 18 Jul 2008 10:28:44 -0000 1.5 +++ PyOpenGL.spec 28 Jul 2008 08:24:58 -0000 1.6 @@ -1,9 +1,9 @@ -%define prever b4 +%define prever b5 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: PyOpenGL Version: 3.0.0 -Release: 0.6.%{prever}%{?dist} +Release: 0.7.%{prever}%{?dist} Summary: Python bindings for OpenGL License: BSD Group: System Environment/Libraries @@ -86,6 +86,9 @@ %changelog +* Mon Jul 28 2008 Nikolay Vladimirov 3.0.0-0.7.b5 +- New upstream release 3.0.0b5 + * Fri Jul 18 2008 Nikolay Vladimirov 3.0.0-0.6.b4 - New upstream release 3.0.0b4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jul 2008 10:28:44 -0000 1.4 +++ sources 28 Jul 2008 08:24:58 -0000 1.5 @@ -1 +1 @@ -01948fcc4f65dd220b0631eb93527efc PyOpenGL-3.0.0b4.tar.gz +4e46b6ce318b82799109a4850dd37c50 PyOpenGL-3.0.0b5.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 08:35:11 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Mon, 28 Jul 2008 08:35:11 GMT Subject: rpms/nfs-utils/devel nfs-utils-1.1.0-smnotify-path.patch, 1.3, 1.4 nfs-utils.spec, 1.182, 1.183 Message-ID: <200807280835.m6S8ZBj6017078@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001 Modified Files: nfs-utils-1.1.0-smnotify-path.patch nfs-utils.spec Log Message: Removed some funzziness from the smnotify-path.patch nfs-utils-1.1.0-smnotify-path.patch: Index: nfs-utils-1.1.0-smnotify-path.patch =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.1.0-smnotify-path.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nfs-utils-1.1.0-smnotify-path.patch 3 Jul 2008 15:52:18 -0000 1.3 +++ nfs-utils-1.1.0-smnotify-path.patch 28 Jul 2008 08:34:41 -0000 1.4 @@ -1,20 +1,9 @@ -commit 02968aa55972b680fa00273188da281d7612ca3e -Author: Steve Dickson -Date: Fri Sep 14 14:19:50 2007 -0400 - - Changed the default paths in sm-notify to - /var/lib/nfs/statd which is where the locking - state is kept in Red Hat distros. - - Signed-off-by: Steve Dickson - -diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c -index 98c03f9..862889f 100644 ---- a/utils/statd/sm-notify.c -+++ b/utils/statd/sm-notify.c -@@ -24,11 +24,13 @@ - #include - #include +diff -up nfs-utils-1.1.3/utils/statd/sm-notify.c.orig nfs-utils-1.1.3/utils/statd/sm-notify.c +--- nfs-utils-1.1.3/utils/statd/sm-notify.c.orig 2008-07-27 17:01:45.000000000 -0400 ++++ nfs-utils-1.1.3/utils/statd/sm-notify.c 2008-07-28 04:30:37.000000000 -0400 +@@ -26,11 +26,13 @@ + + #include "config.h" +#define STATD_PATH_XTN "statd/" + @@ -28,10 +17,9 @@ # endif #endif -diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man -index dd03b8d..69b7059 100644 ---- a/utils/statd/sm-notify.man -+++ b/utils/statd/sm-notify.man +diff -up nfs-utils-1.1.3/utils/statd/sm-notify.man.orig nfs-utils-1.1.3/utils/statd/sm-notify.man +--- nfs-utils-1.1.3/utils/statd/sm-notify.man.orig 2008-07-27 17:01:45.000000000 -0400 ++++ nfs-utils-1.1.3/utils/statd/sm-notify.man 2008-07-28 04:30:37.000000000 -0400 @@ -33,7 +33,7 @@ but this is configurable. For each NFS client or server machine to be monitored, .B rpc.statd Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- nfs-utils.spec 28 Jul 2008 08:17:50 -0000 1.182 +++ nfs-utils.spec 28 Jul 2008 08:34:41 -0000 1.183 @@ -23,7 +23,7 @@ Source15: nfs.sysconfig Patch00: nfs-utils-1.0.5-statdpath.patch -Patch01: nfs-utils-1.1.2-smnotifypath.patch +Patch01: nfs-utils-1.1.0-smnotify-path.patch Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch %if %{enablefscache} From fedora-extras-commits at redhat.com Mon Jul 28 08:35:25 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Mon, 28 Jul 2008 08:35:25 GMT Subject: rpms/PyOpenGL/F-9 .cvsignore, 1.4, 1.5 PyOpenGL.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807280835.m6S8ZPxD017126@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/PyOpenGL/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17053 Modified Files: .cvsignore PyOpenGL.spec sources Log Message: Update to 3.0.0b5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jul 2008 10:45:09 -0000 1.4 +++ .cvsignore 28 Jul 2008 08:34:54 -0000 1.5 @@ -1 +1 @@ -PyOpenGL-3.0.0b4.tar.gz +PyOpenGL-3.0.0b5.tar.gz Index: PyOpenGL.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/PyOpenGL.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PyOpenGL.spec 18 Jul 2008 10:45:09 -0000 1.5 +++ PyOpenGL.spec 28 Jul 2008 08:34:55 -0000 1.6 @@ -1,9 +1,9 @@ -%define prever b4 +%define prever b5 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: PyOpenGL Version: 3.0.0 -Release: 0.6.%{prever}%{?dist} +Release: 0.7.%{prever}%{?dist} Summary: Python bindings for OpenGL License: BSD Group: System Environment/Libraries @@ -86,6 +86,9 @@ %changelog +* Mon Jul 28 2008 Nikolay Vladimirov 3.0.0-0.7.b5 +- New upstream release 3.0.0b5 + * Fri Jul 18 2008 Nikolay Vladimirov 3.0.0-0.6.b4 - New upstream release 3.0.0b4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jul 2008 10:45:09 -0000 1.4 +++ sources 28 Jul 2008 08:34:55 -0000 1.5 @@ -1 +1 @@ -01948fcc4f65dd220b0631eb93527efc PyOpenGL-3.0.0b4.tar.gz +4e46b6ce318b82799109a4850dd37c50 PyOpenGL-3.0.0b5.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 08:37:40 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 28 Jul 2008 08:37:40 GMT Subject: rpms/kernel/devel config-powerpc-generic, 1.24, 1.25 config-s390x, 1.7, 1.8 config-sparc64-generic, 1.19, 1.20 kernel.spec, 1.814, 1.815 Message-ID: <200807280837.m6S8beiI017336@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17300 Modified Files: config-powerpc-generic config-s390x config-sparc64-generic kernel.spec Log Message: * Mon Jul 28 2008 Roland McGrath - Disable hfcmulti driver on big-endian. Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- config-powerpc-generic 26 Jul 2008 03:47:28 -0000 1.24 +++ config-powerpc-generic 28 Jul 2008 08:37:10 -0000 1.25 @@ -256,3 +256,6 @@ CONFIG_SERIO_XILINX_XPS_PS2=m # CONFIG_PPC_SMLPAR is not set + +# drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now" +# CONFIG_MISDN_HFCMULTI is not set Index: config-s390x =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-s390x 15 Jul 2008 13:51:23 -0000 1.7 +++ config-s390x 28 Jul 2008 08:37:10 -0000 1.8 @@ -211,3 +211,6 @@ CONFIG_MEMORY_HOTPLUG=y CONFIG_CHSC_SCH=m + +# drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now" +# CONFIG_MISDN_HFCMULTI is not set Index: config-sparc64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- config-sparc64-generic 21 Jul 2008 19:45:13 -0000 1.19 +++ config-sparc64-generic 28 Jul 2008 08:37:10 -0000 1.20 @@ -192,3 +192,6 @@ CONFIG_SND_SPARC=y CONFIG_HW_RANDOM_N2RNG=m + +# drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now" +# CONFIG_MISDN_HFCMULTI is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.814 retrieving revision 1.815 diff -u -r1.814 -r1.815 --- kernel.spec 28 Jul 2008 03:38:21 -0000 1.814 +++ kernel.spec 28 Jul 2008 08:37:10 -0000 1.815 @@ -1694,6 +1694,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Mon Jul 28 2008 Roland McGrath +- Disable hfcmulti driver on big-endian. + * Sun Jul 27 2008 Roland McGrath - 2.6.26-git16 - Fix up linux-2.6-build-nonintconfig.patch after kconfig changes. From fedora-extras-commits at redhat.com Mon Jul 28 08:48:12 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 28 Jul 2008 08:48:12 GMT Subject: rpms/kernel/devel patch-2.6.26-git17.bz2.sign, NONE, 1.1 .cvsignore, 1.881, 1.882 kernel.spec, 1.815, 1.816 sources, 1.842, 1.843 upstream, 1.759, 1.760 patch-2.6.26-git16.bz2.sign, 1.1, NONE Message-ID: <200807280848.m6S8mChs017818@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17792 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.26-git17.bz2.sign Removed Files: patch-2.6.26-git16.bz2.sign Log Message: 2.6.26-git17 --- NEW FILE patch-2.6.26-git17.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIjW9DyGugalF9Dw4RAqXNAJ40Gqm7xUNknT0g8YrauAvZQbmvoQCfaPiO Lp5TjBMtzvTz08h1rdTECdg= =HbZP -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.881 retrieving revision 1.882 diff -u -r1.881 -r1.882 --- .cvsignore 27 Jul 2008 20:15:18 -0000 1.881 +++ .cvsignore 28 Jul 2008 08:47:41 -0000 1.882 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git16.bz2 +patch-2.6.26-git17.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.815 retrieving revision 1.816 diff -u -r1.815 -r1.816 --- kernel.spec 28 Jul 2008 08:37:10 -0000 1.815 +++ kernel.spec 28 Jul 2008 08:47:41 -0000 1.816 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 16 +%define gitrev 17 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1696,6 +1696,7 @@ %changelog * Mon Jul 28 2008 Roland McGrath - Disable hfcmulti driver on big-endian. +- 2.6.26-git17 * Sun Jul 27 2008 Roland McGrath - 2.6.26-git16 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.842 retrieving revision 1.843 diff -u -r1.842 -r1.843 --- sources 27 Jul 2008 20:15:18 -0000 1.842 +++ sources 28 Jul 2008 08:47:41 -0000 1.843 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -a286abfd524d39b7f6cf188e5ad56190 patch-2.6.26-git16.bz2 +10bd513da73ff87a2fc98b439282b286 patch-2.6.26-git17.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- upstream 27 Jul 2008 20:15:18 -0000 1.759 +++ upstream 28 Jul 2008 08:47:41 -0000 1.760 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git16.bz2 +patch-2.6.26-git17.bz2 --- patch-2.6.26-git16.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 08:53:00 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Mon, 28 Jul 2008 08:53:00 GMT Subject: rpms/PyOpenGL/F-8 .cvsignore, 1.3, 1.4 PyOpenGL.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807280853.m6S8r0bQ017947@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/PyOpenGL/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17918 Modified Files: .cvsignore PyOpenGL.spec sources Log Message: Update to 3.0.0b5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jul 2008 13:16:36 -0000 1.3 +++ .cvsignore 28 Jul 2008 08:52:29 -0000 1.4 @@ -1 +1 @@ -PyOpenGL-3.0.0b4.tar.gz +PyOpenGL-3.0.0b5.tar.gz Index: PyOpenGL.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/PyOpenGL.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PyOpenGL.spec 18 Jul 2008 13:16:36 -0000 1.4 +++ PyOpenGL.spec 28 Jul 2008 08:52:29 -0000 1.5 @@ -1,9 +1,9 @@ -%define prever b4 +%define prever b5 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: PyOpenGL Version: 3.0.0 -Release: 0.6.%{prever}%{?dist} +Release: 0.7.%{prever}%{?dist} Summary: Python bindings for OpenGL License: BSD Group: System Environment/Libraries @@ -86,6 +86,9 @@ %changelog +* Mon Jul 28 2008 Nikolay Vladimirov 3.0.0-0.7.b5 +- New upstream release 3.0.0b5 + * Fri Jul 18 2008 Nikolay Vladimirov 3.0.0-0.6.b4 - New upstream release 3.0.0b4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyOpenGL/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jul 2008 13:16:36 -0000 1.3 +++ sources 28 Jul 2008 08:52:29 -0000 1.4 @@ -1 +1 @@ -01948fcc4f65dd220b0631eb93527efc PyOpenGL-3.0.0b4.tar.gz +4e46b6ce318b82799109a4850dd37c50 PyOpenGL-3.0.0b5.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 09:03:40 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 28 Jul 2008 09:03:40 GMT Subject: rpms/libv4l/devel import.log, NONE, 1.1 libv4l.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807280903.m6S93eZN024873@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libv4l/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24840/devel Modified Files: .cvsignore sources Added Files: import.log libv4l.spec Log Message: initial libv4l import --- NEW FILE import.log --- libv4l-0_3_7-1_fc9:HEAD:libv4l-0.3.7-1.fc9.src.rpm:1217236236 --- NEW FILE libv4l.spec --- Name: libv4l Version: 0.3.7 Release: 1%{?dist} Summary: Collection of video4linux support libraries Group: System Environment/Libraries License: LGPLv2+ URL: http://hansdegoede.livejournal.com/3636.html Source0: http://people.atrpms.net/~hdegoede/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kernel-headers %description libv4l is a collection of libraries which adds a thin abstraction layer on top of video4linux2 devices. The purpose of this (thin) layer is to make it easy for application writers to support a wide variety of devices without having to write separate code for different devices in the same class. libv4l consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2. libv4lconvert offers functions to convert from any (known) pixelformat to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420. libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent of the drivers for those devices supporting v4l1 compatibility (which many v4l2 drivers do not). libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the application transparent libv4lconvert conversion where necessary. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING.LIB ChangeLog README TODO %{_libdir}/libv4l*.so.* %{_libdir}/libv4l %files devel %defattr(-,root,root,-) %doc README.multi-threading %{_includedir}/libv4l*.h %{_libdir}/libv4l*.so %changelog * Sat Jul 26 2008 Hans de Goede 0.3.7-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libv4l/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 04:18:53 -0000 1.1 +++ .cvsignore 28 Jul 2008 09:03:09 -0000 1.2 @@ -0,0 +1 @@ +libv4l-0.3.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libv4l/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 04:18:53 -0000 1.1 +++ sources 28 Jul 2008 09:03:09 -0000 1.2 @@ -0,0 +1 @@ +c1f955802735366ed01e15ff8b6116ae libv4l-0.3.7.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 09:30:25 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Mon, 28 Jul 2008 09:30:25 GMT Subject: rpms/subversion/devel subversion-1.5.1-rpath.patch, NONE, 1.1 subversion.spec, 1.119, 1.120 subversion-0.31.0-rpath.patch, 1.2, NONE subversion-1.4.6-javadir.patch, 1.1, NONE Message-ID: <200807280930.m6S9UPRu025692@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25639 Modified Files: subversion.spec Added Files: subversion-1.5.1-rpath.patch Removed Files: subversion-0.31.0-rpath.patch subversion-1.4.6-javadir.patch Log Message: - fix %changelog removed in previous commit - rediff -rpath patch for zero-fuzz - remove old patch subversion-1.5.1-rpath.patch: --- NEW FILE subversion-1.5.1-rpath.patch --- --- subversion-1.5.1/build/generator/gen_base.py.rpath +++ subversion-1.5.1/build/generator/gen_base.py @@ -453,6 +453,9 @@ class TargetLib(TargetLinked): self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target self.msvc_export = string.split(options.get('msvc-export', '')) + ### hmm. this is Makefile-specific + self.link_cmd = '$(LINK_LIB)' + class TargetApacheMod(TargetLib): def __init__(self, name, options, gen_obj): --- subversion-1.5.1/Makefile.in.rpath +++ subversion-1.5.1/Makefile.in @@ -167,7 +167,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) COMPILE_JAVAHL_JAVAH = $(JAVAH) -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) +LINK_LIB = $(LINK) -rpath $(libdir) # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- subversion.spec 28 Jul 2008 08:18:44 -0000 1.119 +++ subversion.spec 28 Jul 2008 09:29:54 -0000 1.120 @@ -24,7 +24,7 @@ Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el Patch2: subversion-0.20.1-deplibs.patch -Patch3: subversion-0.31.0-rpath.patch +Patch3: subversion-1.5.1-rpath.patch Patch6: subversion-1.5.0-pie.patch Patch7: subversion-1.1.3-java.patch Patch8: subversion-1.5.0-perl510.patch @@ -276,6 +276,7 @@ %{_javadir}/svn-javahl.jar %endif +%changelog * Mon Jul 28 2008 Joe Orton 1.5.1-2 - update to 1.5.1 - require suitable APR --- subversion-0.31.0-rpath.patch DELETED --- --- subversion-1.4.6-javadir.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 10:11:14 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Mon, 28 Jul 2008 10:11:14 GMT Subject: rpms/gnome-packagekit/F-9 gnome-packagekit.spec,1.44,1.45 Message-ID: <200807281011.m6SABEDx001089@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1065 Modified Files: gnome-packagekit.spec Log Message: * Mon Jul 28 2008 Richard Hughes - 0.2.3-8 - Silence output of update-desktop-database and update-mime-database Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gnome-packagekit.spec 21 Jul 2008 20:43:05 -0000 1.44 +++ gnome-packagekit.spec 28 Jul 2008 10:10:44 -0000 1.45 @@ -6,7 +6,7 @@ Name: gnome-packagekit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -102,8 +102,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -update-desktop-database %{_datadir}/applications -update-mime-database %{_datadir}/mime +update-desktop-database %{_datadir}/applications &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : %pre if [ "$1" -gt 1 ]; then @@ -147,6 +147,9 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Mon Jul 28 2008 Richard Hughes - 0.2.3-8 +- Silence output of update-desktop-database and update-mime-database + * Mon Jul 21 2008 Adel Gadllah - 0.2.3-7 - Rebuild against new PackageKit to pick up correct dep From fedora-extras-commits at redhat.com Mon Jul 28 10:21:54 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 28 Jul 2008 10:21:54 GMT Subject: rpms/ochusha/devel ochusha.spec,1.50,1.51 Message-ID: <200807281021.m6SALso1001385@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ochusha/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1361 Modified Files: ochusha.spec Log Message: Ah.. sorry.. Index: ochusha.spec =================================================================== RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ochusha.spec 28 Jul 2008 05:02:33 -0000 1.50 +++ ochusha.spec 28 Jul 2008 10:21:23 -0000 1.51 @@ -15,8 +15,8 @@ Summary: A GTK+ 2ch.net BBS Browser Name: ochusha -Version: %{main_ver}.1 -Release: %{rel} +Version: %{main_ver} +Release: %{rel}.1 URL: http://ochusha.sourceforge.jp/ %if %{pre_release} Source: %{name}-%{main_ver}-%{strtag}.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 10:39:15 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 28 Jul 2008 10:39:15 GMT Subject: rpms/kdebindings/devel kdebindings.spec, 1.139, 1.140 sources, 1.52, 1.53 kdebindings-4.1.0-kde#167450.patch, 1.2, NONE Message-ID: <200807281039.m6SAdFuJ001995@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1959 Modified Files: kdebindings.spec sources Removed Files: kdebindings-4.1.0-kde#167450.patch Log Message: respun, get rid of kdebindings-4.1.0-kde#167450.patch which is included in new upstream now Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- kdebindings.spec 26 Jul 2008 18:27:15 -0000 1.139 +++ kdebindings.spec 28 Jul 2008 10:38:41 -0000 1.140 @@ -22,16 +22,13 @@ Name: kdebindings Version: 4.1.0 -Release: 4%{?dist}.1 +Release: 5%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops License: GPLv2 URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 -# fix Python and Ruby bindings overwriting each other (#456722, kde#167450) -# (thanks to Sebastian Sauer) -Patch0: kdebindings-4.1.0-kde#167450.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -168,6 +165,10 @@ %changelog +* Mon Jul 28 2008 Than Ngo - 4.1.0-5 +- respun +- get rid of kdebindings-4.1.0-kde#167450.patch that is included in new upstream + * Sat Jul 26 2008 Rex Dieter 4.1.0-4.1 - BR: qscintilla-devel >= 2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 25 Jul 2008 11:05:15 -0000 1.52 +++ sources 28 Jul 2008 10:38:41 -0000 1.53 @@ -1 +1 @@ -d03166d9fc3e46df1c9a99fcedd8bfd1 kdebindings-4.1.0.tar.bz2 +9c7ee50816ac6e0d5d2ea2f2968ac94d kdebindings-4.1.0.tar.bz2 --- kdebindings-4.1.0-kde#167450.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 10:41:15 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Mon, 28 Jul 2008 10:41:15 GMT Subject: rpms/gsl/devel gsl.spec,1.42,1.43 gsl-1.11-gcc43.patch,1.1,NONE Message-ID: <200807281041.m6SAfFxn002231@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/gsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2142 Modified Files: gsl.spec Removed Files: gsl-1.11-gcc43.patch Log Message: - add -fgnu89-inline flag to solve gcc4.3 problem remove gcc43 patch Index: gsl.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gsl.spec 18 Jun 2008 06:46:44 -0000 1.42 +++ gsl.spec 28 Jul 2008 10:40:45 -0000 1.43 @@ -5,7 +5,6 @@ URL: http://www.gnu.org/software/gsl/ Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.10-lib64.patch -Patch1: gsl-1.11-gcc43.patch # info part of this package is under GFDL license # eigen/nonsymmv.c and eigen/schur.c # contains rutiens which are part of LAPACK - under BSD style license @@ -41,13 +40,12 @@ %prep %setup -q %patch0 -p1 -b .lib64 -%patch1 -p1 -b .gcc43 iconv -f windows-1252 -t utf-8 THANKS > THANKS.aux touch -r THANKS THANKS.aux mv THANKS.aux THANKS %build -%configure +%configure CFLAGS="$CFLAGS -fgnu89-inline" make %{?_smp_mflags} %install @@ -101,6 +99,10 @@ %{_libdir}/*.a %changelog +* Mon Jul 28 2008 Ivana Varekova - 1.11-3 +- add -fgnu89-inline flag to solve gcc4.3 problem + remove gcc43 patch + * Wed Jun 18 2008 Ivana Varekova - 1.11-2 - Resolves: #451006 programs build with gcc 4.3 based on gsl require -fgnu89-inline --- gsl-1.11-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 10:42:50 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Mon, 28 Jul 2008 10:42:50 GMT Subject: rpms/gsl/devel gsl.spec,1.43,1.44 Message-ID: <200807281042.m6SAgoiu002367@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/gsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2314 Modified Files: gsl.spec Log Message: update release tag Index: gsl.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- gsl.spec 28 Jul 2008 10:40:45 -0000 1.43 +++ gsl.spec 28 Jul 2008 10:42:20 -0000 1.44 @@ -1,7 +1,7 @@ Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/gsl/ Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.10-lib64.patch From fedora-extras-commits at redhat.com Mon Jul 28 10:58:49 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 28 Jul 2008 10:58:49 GMT Subject: rpms/ntp/devel ntp-4.2.4p4-gettime.patch, NONE, 1.1 ntp-4.2.4p4-resinit.patch, NONE, 1.1 ntp.spec, 1.80, 1.81 Message-ID: <200807281058.m6SAwn3g002850@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/ntp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2769 Modified Files: ntp.spec Added Files: ntp-4.2.4p4-gettime.patch ntp-4.2.4p4-resinit.patch Log Message: - reload resolv.conf after temporary failure in name resolution (#456743) - use clock_gettime - make subpackages for perl scripts and ntpdate (#452097, #456116) ntp-4.2.4p4-gettime.patch: --- NEW FILE ntp-4.2.4p4-gettime.patch --- diff -up ntp-4.2.4p4/configure.gettime ntp-4.2.4p4/configure --- ntp-4.2.4p4/configure.gettime 2008-07-24 19:12:26.000000000 +0200 +++ ntp-4.2.4p4/configure 2008-07-24 19:12:27.000000000 +0200 @@ -43414,7 +43414,10 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + _libs=$LIBS + LIBS="$LIBS -lrt" (eval $ac_link) 2>conftest.er1 + LIBS=$_libs ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 ntp-4.2.4p4-resinit.patch: --- NEW FILE ntp-4.2.4p4-resinit.patch --- diff -up ntp-4.2.4p4/ntpd/ntp_config.c.resinit ntp-4.2.4p4/ntpd/ntp_config.c --- ntp-4.2.4p4/ntpd/ntp_config.c.resinit 2008-07-28 12:17:43.000000000 +0200 +++ ntp-4.2.4p4/ntpd/ntp_config.c 2008-07-28 12:18:56.000000000 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -2256,6 +2257,8 @@ getnetnum( ? ", ignored" : ""); #endif + if (retval == EAI_AGAIN) + res_init(); if (retval == 0 && ptr->ai_family == AF_INET6 && isc_net_probeipv6() != ISC_R_SUCCESS) diff -up ntp-4.2.4p4/ntpd/ntp_intres.c.resinit ntp-4.2.4p4/ntpd/ntp_intres.c --- ntp-4.2.4p4/ntpd/ntp_intres.c.resinit 2007-01-23 10:05:57.000000000 +0100 +++ ntp-4.2.4p4/ntpd/ntp_intres.c 2008-07-28 12:17:43.000000000 +0200 @@ -39,6 +39,7 @@ /**/ #include #include +#include /**/ #ifdef HAVE_SYS_PARAM_H # include /* MAXHOSTNAMELEN (often) */ @@ -545,6 +546,7 @@ findhostaddr( switch (error) { case EAI_AGAIN: + res_init(); return (1); case EAI_NONAME: #ifndef FORCE_DNSRETRY Index: ntp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- ntp.spec 7 Apr 2008 17:18:26 -0000 1.80 +++ ntp.spec 28 Jul 2008 10:58:18 -0000 1.81 @@ -1,7 +1,7 @@ -Summary: Synchronizes system time using the Network Time Protocol (NTP) +Summary: The NTP daemon and utilities Name: ntp Version: 4.2.4p4 -Release: 6%{?dist} +Release: 7%{?dist} # primary license (COPYRIGHT) : MIT # ElectricFence/ (not used) : GPLv2 # kernel/sys/ppsclock.h (not used) : BSD with advertising @@ -61,12 +61,14 @@ Patch20: ntp-4.2.4p2-noif.patch Patch21: ntp-4.2.4p4-ipv6.patch Patch22: ntp-4.2.4p4-cmsgalign.patch +Patch23: ntp-4.2.4p4-gettime.patch +Patch24: ntp-4.2.4p4-resinit.patch URL: http://www.ntp.org -Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig /sbin/service Requires(postun): /sbin/service +Requires: ntpdate = %{version}-%{release} # Require libreadline linked with libtinfo Requires: readline >= 5.2-3 BuildRequires: libcap-devel openssl-devel readline-devel perl-HTML-Parser @@ -74,15 +76,32 @@ %description The Network Time Protocol (NTP) is used to synchronize a computer's -time with another reference time source. The ntp package contains -utilities and daemons that will synchronize your computer's time to -Coordinated Universal Time (UTC) via the NTP protocol and NTP servers. -The ntp package includes ntpdate (a program for retrieving the date -and time from remote machines via a network) and ntpd (a daemon which -continuously adjusts system time). +time with another reference time source. This package includes ntpd +(a daemon which continuously adjusts system time) and utilities used +to query and configure the ntpd daemon. + +Perl scripts ntp-wait and ntptrace are in the ntp-perl package and +the ntpdate program is in the ntpdate package. + +%package perl +Summary: NTP utilities written in perl +Group: Applications/System +Requires: %{name} = %{version}-%{release} +# perl introduced in 4.2.4p4-7 +Obsoletes: %{name} < 4.2.4p4-7 +%description perl +This package contains perl scripts ntp-wait and ntptrace. + +%package -n ntpdate +Summary: Utility to set the date and time via NTP +Group: Applications/System +Requires(pre): shadow-utils +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig /sbin/service -Install the ntp package if you need tools for keeping your system's -time synchronized via the NTP protocol. +%description -n ntpdate +ntpdate is a program for retrieving the date and time from +NTP servers. %prep %setup -q -a 5 @@ -107,6 +126,11 @@ %patch20 -p1 -b .noif %patch21 -p1 -b .ipv6 %patch22 -p1 -b .cmsgalign +%patch24 -p1 -b .resinit + +# clock_gettime needs -lrt +sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in +%patch23 -p1 -b .gettime %ifarch ia64 %patch5 -p1 -b .linkfastmath @@ -189,12 +213,15 @@ %clean rm -rf $RPM_BUILD_ROOT -%pre +%pre -n ntpdate /usr/sbin/groupadd -g 38 ntp 2> /dev/null || : /usr/sbin/useradd -u 38 -g 38 -s /sbin/nologin -M -r -d %{_sysconfdir}/ntp ntp 2>/dev/null || : %post /sbin/chkconfig --add ntpd +: + +%post -n ntpdate /sbin/chkconfig --add ntpdate : @@ -202,6 +229,11 @@ if [ "$1" -eq 0 ]; then /sbin/service ntpd stop &> /dev/null /sbin/chkconfig --del ntpd +fi +: + +%preun -n ntpdate +if [ "$1" -eq 0 ]; then /sbin/service ntpdate stop &> /dev/null /sbin/chkconfig --del ntpdate fi @@ -216,33 +248,51 @@ %files %defattr(-,root,root) %doc htmldoc/html/* COPYRIGHT ChangeLog NEWS TODO -%{_sbindir}/ntp-wait -%{_sbindir}/ntptrace %{_sbindir}/ntp-keygen %{_sbindir}/ntpd -%{_sbindir}/ntpdate %{_sbindir}/ntpdc %{_sbindir}/ntpq %{_sbindir}/ntptime %{_sbindir}/tickadj %{_initrddir}/ntpd -%{_initrddir}/ntpdate %config(noreplace) %{_sysconfdir}/sysconfig/ntpd -%config(noreplace) %{_sysconfdir}/sysconfig/ntpdate -%dir %{_sysconfdir}/ntp %config(noreplace) %{_sysconfdir}/ntp.conf -%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers -%config(noreplace) %{_sysconfdir}/ntp/keys %dir %attr(750,root,ntp) %{_sysconfdir}/ntp/crypto %config(noreplace) %{_sysconfdir}/ntp/crypto/pw %dir %attr(-,ntp,ntp) %{_localstatedir}/lib/ntp %ghost %attr(644,ntp,ntp) %{_localstatedir}/lib/ntp/drift %dir %attr(-,ntp,ntp) %{_localstatedir}/log/ntpstats -%{_mandir}/man[58]/*.[58]* %{_bindir}/ntpstat +%{_mandir}/man5/*.5* +%{_mandir}/man8/ntp-keygen.8* +%{_mandir}/man8/ntpd.8* +%{_mandir}/man8/ntpdc.8* +%{_mandir}/man8/ntpq.8* +%{_mandir}/man8/ntpstat.8* +%{_mandir}/man8/ntptime.8* + +%files perl +%defattr(-,root,root) +%{_sbindir}/ntp-wait +%{_sbindir}/ntptrace +%{_mandir}/man8/ntptrace.8* +%files -n ntpdate +%defattr(-,root,root) +%{_initrddir}/ntpdate +%config(noreplace) %{_sysconfdir}/sysconfig/ntpdate +%dir %{_sysconfdir}/ntp +%config(noreplace) %{_sysconfdir}/ntp/keys +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers +%{_sbindir}/ntpdate +%{_mandir}/man8/ntpdate.8* %changelog +* Mon Jul 28 2008 Miroslav Lichvar 4.2.4p4-7 +- reload resolv.conf after temporary failure in name resolution (#456743) +- use clock_gettime +- make subpackages for perl scripts and ntpdate (#452097, #456116) + * Mon Apr 07 2008 Miroslav Lichvar 4.2.4p4-6 - don't use /etc/sysconfig/clock in ntpdate init script From fedora-extras-commits at redhat.com Mon Jul 28 11:07:29 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 28 Jul 2008 11:07:29 GMT Subject: rpms/ntp/F-9 ntp-4.2.4p4-gettime.patch, NONE, 1.1 ntp-4.2.4p4-resinit.patch, NONE, 1.1 ntp.spec, 1.80, 1.81 Message-ID: <200807281107.m6SB7TDN009822@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/ntp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9786 Modified Files: ntp.spec Added Files: ntp-4.2.4p4-gettime.patch ntp-4.2.4p4-resinit.patch Log Message: - reload resolv.conf after temporary failure in name resolution (#456743) - use clock_gettime - make subpackages for perl scripts and ntpdate (#452097, #456116) ntp-4.2.4p4-gettime.patch: --- NEW FILE ntp-4.2.4p4-gettime.patch --- diff -up ntp-4.2.4p4/configure.gettime ntp-4.2.4p4/configure --- ntp-4.2.4p4/configure.gettime 2008-07-24 19:12:26.000000000 +0200 +++ ntp-4.2.4p4/configure 2008-07-24 19:12:27.000000000 +0200 @@ -43414,7 +43414,10 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + _libs=$LIBS + LIBS="$LIBS -lrt" (eval $ac_link) 2>conftest.er1 + LIBS=$_libs ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 ntp-4.2.4p4-resinit.patch: --- NEW FILE ntp-4.2.4p4-resinit.patch --- diff -up ntp-4.2.4p4/ntpd/ntp_config.c.resinit ntp-4.2.4p4/ntpd/ntp_config.c --- ntp-4.2.4p4/ntpd/ntp_config.c.resinit 2008-07-28 12:17:43.000000000 +0200 +++ ntp-4.2.4p4/ntpd/ntp_config.c 2008-07-28 12:18:56.000000000 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -2256,6 +2257,8 @@ getnetnum( ? ", ignored" : ""); #endif + if (retval == EAI_AGAIN) + res_init(); if (retval == 0 && ptr->ai_family == AF_INET6 && isc_net_probeipv6() != ISC_R_SUCCESS) diff -up ntp-4.2.4p4/ntpd/ntp_intres.c.resinit ntp-4.2.4p4/ntpd/ntp_intres.c --- ntp-4.2.4p4/ntpd/ntp_intres.c.resinit 2007-01-23 10:05:57.000000000 +0100 +++ ntp-4.2.4p4/ntpd/ntp_intres.c 2008-07-28 12:17:43.000000000 +0200 @@ -39,6 +39,7 @@ /**/ #include #include +#include /**/ #ifdef HAVE_SYS_PARAM_H # include /* MAXHOSTNAMELEN (often) */ @@ -545,6 +546,7 @@ findhostaddr( switch (error) { case EAI_AGAIN: + res_init(); return (1); case EAI_NONAME: #ifndef FORCE_DNSRETRY Index: ntp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ntp/F-9/ntp.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- ntp.spec 7 Apr 2008 17:18:26 -0000 1.80 +++ ntp.spec 28 Jul 2008 11:06:59 -0000 1.81 @@ -1,7 +1,7 @@ -Summary: Synchronizes system time using the Network Time Protocol (NTP) +Summary: The NTP daemon and utilities Name: ntp Version: 4.2.4p4 -Release: 6%{?dist} +Release: 7%{?dist} # primary license (COPYRIGHT) : MIT # ElectricFence/ (not used) : GPLv2 # kernel/sys/ppsclock.h (not used) : BSD with advertising @@ -61,12 +61,14 @@ Patch20: ntp-4.2.4p2-noif.patch Patch21: ntp-4.2.4p4-ipv6.patch Patch22: ntp-4.2.4p4-cmsgalign.patch +Patch23: ntp-4.2.4p4-gettime.patch +Patch24: ntp-4.2.4p4-resinit.patch URL: http://www.ntp.org -Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig /sbin/service Requires(postun): /sbin/service +Requires: ntpdate = %{version}-%{release} # Require libreadline linked with libtinfo Requires: readline >= 5.2-3 BuildRequires: libcap-devel openssl-devel readline-devel perl-HTML-Parser @@ -74,15 +76,32 @@ %description The Network Time Protocol (NTP) is used to synchronize a computer's -time with another reference time source. The ntp package contains -utilities and daemons that will synchronize your computer's time to -Coordinated Universal Time (UTC) via the NTP protocol and NTP servers. -The ntp package includes ntpdate (a program for retrieving the date -and time from remote machines via a network) and ntpd (a daemon which -continuously adjusts system time). +time with another reference time source. This package includes ntpd +(a daemon which continuously adjusts system time) and utilities used +to query and configure the ntpd daemon. + +Perl scripts ntp-wait and ntptrace are in the ntp-perl package and +the ntpdate program is in the ntpdate package. + +%package perl +Summary: NTP utilities written in perl +Group: Applications/System +Requires: %{name} = %{version}-%{release} +# perl introduced in 4.2.4p4-7 +Obsoletes: %{name} < 4.2.4p4-7 +%description perl +This package contains perl scripts ntp-wait and ntptrace. + +%package -n ntpdate +Summary: Utility to set the date and time via NTP +Group: Applications/System +Requires(pre): shadow-utils +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig /sbin/service -Install the ntp package if you need tools for keeping your system's -time synchronized via the NTP protocol. +%description -n ntpdate +ntpdate is a program for retrieving the date and time from +NTP servers. %prep %setup -q -a 5 @@ -107,6 +126,11 @@ %patch20 -p1 -b .noif %patch21 -p1 -b .ipv6 %patch22 -p1 -b .cmsgalign +%patch24 -p1 -b .resinit + +# clock_gettime needs -lrt +sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in +%patch23 -p1 -b .gettime %ifarch ia64 %patch5 -p1 -b .linkfastmath @@ -189,12 +213,15 @@ %clean rm -rf $RPM_BUILD_ROOT -%pre +%pre -n ntpdate /usr/sbin/groupadd -g 38 ntp 2> /dev/null || : /usr/sbin/useradd -u 38 -g 38 -s /sbin/nologin -M -r -d %{_sysconfdir}/ntp ntp 2>/dev/null || : %post /sbin/chkconfig --add ntpd +: + +%post -n ntpdate /sbin/chkconfig --add ntpdate : @@ -202,6 +229,11 @@ if [ "$1" -eq 0 ]; then /sbin/service ntpd stop &> /dev/null /sbin/chkconfig --del ntpd +fi +: + +%preun -n ntpdate +if [ "$1" -eq 0 ]; then /sbin/service ntpdate stop &> /dev/null /sbin/chkconfig --del ntpdate fi @@ -216,33 +248,51 @@ %files %defattr(-,root,root) %doc htmldoc/html/* COPYRIGHT ChangeLog NEWS TODO -%{_sbindir}/ntp-wait -%{_sbindir}/ntptrace %{_sbindir}/ntp-keygen %{_sbindir}/ntpd -%{_sbindir}/ntpdate %{_sbindir}/ntpdc %{_sbindir}/ntpq %{_sbindir}/ntptime %{_sbindir}/tickadj %{_initrddir}/ntpd -%{_initrddir}/ntpdate %config(noreplace) %{_sysconfdir}/sysconfig/ntpd -%config(noreplace) %{_sysconfdir}/sysconfig/ntpdate -%dir %{_sysconfdir}/ntp %config(noreplace) %{_sysconfdir}/ntp.conf -%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers -%config(noreplace) %{_sysconfdir}/ntp/keys %dir %attr(750,root,ntp) %{_sysconfdir}/ntp/crypto %config(noreplace) %{_sysconfdir}/ntp/crypto/pw %dir %attr(-,ntp,ntp) %{_localstatedir}/lib/ntp %ghost %attr(644,ntp,ntp) %{_localstatedir}/lib/ntp/drift %dir %attr(-,ntp,ntp) %{_localstatedir}/log/ntpstats -%{_mandir}/man[58]/*.[58]* %{_bindir}/ntpstat +%{_mandir}/man5/*.5* +%{_mandir}/man8/ntp-keygen.8* +%{_mandir}/man8/ntpd.8* +%{_mandir}/man8/ntpdc.8* +%{_mandir}/man8/ntpq.8* +%{_mandir}/man8/ntpstat.8* +%{_mandir}/man8/ntptime.8* + +%files perl +%defattr(-,root,root) +%{_sbindir}/ntp-wait +%{_sbindir}/ntptrace +%{_mandir}/man8/ntptrace.8* +%files -n ntpdate +%defattr(-,root,root) +%{_initrddir}/ntpdate +%config(noreplace) %{_sysconfdir}/sysconfig/ntpdate +%dir %{_sysconfdir}/ntp +%config(noreplace) %{_sysconfdir}/ntp/keys +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers +%{_sbindir}/ntpdate +%{_mandir}/man8/ntpdate.8* %changelog +* Mon Jul 28 2008 Miroslav Lichvar 4.2.4p4-7 +- reload resolv.conf after temporary failure in name resolution (#456743) +- use clock_gettime +- make subpackages for perl scripts and ntpdate (#452097, #456116) + * Mon Apr 07 2008 Miroslav Lichvar 4.2.4p4-6 - don't use /etc/sysconfig/clock in ntpdate init script From fedora-extras-commits at redhat.com Mon Jul 28 11:21:27 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 28 Jul 2008 11:21:27 GMT Subject: rpms/openoffice.org/devel workspace.cmcfixes48.patch, NONE, 1.1 .cvsignore, 1.180, 1.181 openoffice.org.spec, 1.1593, 1.1594 sources, 1.307, 1.308 workspace.cmcfixes46.patch, 1.1, NONE Message-ID: <200807281121.m6SBLRq7010279@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10247 Modified Files: .cvsignore openoffice.org.spec sources Added Files: workspace.cmcfixes48.patch Removed Files: workspace.cmcfixes46.patch Log Message: next version workspace.cmcfixes48.patch: --- NEW FILE workspace.cmcfixes48.patch --- Index: source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx =================================================================== RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx,v retrieving revision 1.5 diff -u -r1.5 MMozillaBootstrap.cxx --- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx 17 Sep 2006 02:58:42 -0000 1.5 +++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx 20 Jun 2008 09:12:58 -0000 @@ -38,8 +38,10 @@ using namespace connectivity::mozab; #include #include "MNSProfileDiscover.hxx" -#include "MNSProfileManager.hxx" -#include "MNSRunnable.hxx" +#ifndef MINIMAL_PROFILEDISCOVER +# include "MNSProfileManager.hxx" +# include "MNSRunnable.hxx" +#endif #include static MozillaBootstrap *pMozillaBootstrap=NULL; @@ -72,10 +74,13 @@ void MozillaBootstrap::Init() { sal_Bool aProfileExists=sal_False; + +#ifndef MINIMAL_PROFILEDISCOVER //This must be call before any mozilla code MNS_Init(aProfileExists); m_ProfileManager = new ProfileManager(); +#endif m_ProfileAccess = new ProfileAccess(); bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString()); } @@ -157,32 +162,57 @@ // XProfileManager ::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { +#ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->bootupProfile(product,profileName); +#else + return -1; +#endif } ::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException) { +#ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->shutdownProfile(); +#else + return -1; +#endif } ::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException) { +#ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->getCurrentProduct(); +#else + return ::com::sun::star::mozilla::MozillaProductType_Default; +#endif } ::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) { +#ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->getCurrentProfile(); +#else + return ::rtl::OUString(); +#endif } ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException) { +#ifndef MINIMAL_PROFILEDISCOVER return isProfileLocked(getCurrentProduct(),m_ProfileManager->getCurrentProfile()); +#else + return true; +#endif } ::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { +#ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->setCurrentProfile(product,profileName); +#else + return ::rtl::OUString(); +#endif } // XProxyRunner ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException) { +#ifndef MINIMAL_PROFILEDISCOVER ::rtl::OUString profileName = aCode->getProfileName(); ::rtl::OUString currProfileName = getCurrentProfile(); ::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct(); @@ -194,5 +224,105 @@ MNSRunnable xRunnable; return xRunnable.StartProxy(aCode);; -} +#else + return -1; +#endif +} + +#ifdef MINIMAL_PROFILEDISCOVER +#include +using ::com::sun::star::uno::Reference; +using ::com::sun::star::uno::Sequence; +using ::com::sun::star::registry::XRegistryKey; +using ::com::sun::star::lang::XSingleServiceFactory; +using ::com::sun::star::lang::XMultiServiceFactory; + +extern "C" void SAL_CALL component_getImplementationEnvironment( + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ + ) +{ + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; +} + +//--------------------------------------------------------------------------------------- +void REGISTER_PROVIDER( + const ::rtl::OUString& aServiceImplName, + const Sequence< ::rtl::OUString>& Services, + const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) +{ + ::rtl::OUString aMainKeyName; + aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/")); + aMainKeyName += aServiceImplName; + aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); + + Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); + OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !"); + + for (sal_Int32 i=0; icreateKey(Services[i]); +} + +extern "C" sal_Bool SAL_CALL component_writeInfo( + void* /*pServiceManager*/, + void* pRegistryKey + ) +{ + if (pRegistryKey) + try + { + Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); + + Sequence< ::rtl::OUString > aSNS( 1 ); + aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); + REGISTER_PROVIDER( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")), + aSNS, xKey); + + return sal_True; + } + catch (::com::sun::star::registry::InvalidRegistryException& ) + { + OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); + } + + return sal_False; +} + +static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) +{ + MozillaBootstrap * pBootstrap = reinterpret_cast(OMozillaBootstrap_CreateInstance(rServiceManager)); + return *pBootstrap; +} + +extern "C" void* SAL_CALL component_getFactory( + const sal_Char* pImplementationName, + void* pServiceManager, + void* /*pRegistryKey*/) +{ + void* pRet = 0; + + if (pServiceManager) + { + ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + Reference< XSingleServiceFactory > xFactory; + if (aImplName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")) )) + { + Sequence< ::rtl::OUString > aSNS( 1 ); + aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); + + xFactory = ::cppu::createSingleFactory( + reinterpret_cast< XMultiServiceFactory* > ( pServiceManager), + aImplName, createInstance, aSNS ); + } + if ( xFactory.is() ) + { + xFactory->acquire(); + pRet = xFactory.get(); + } + } + + return pRet; +}; +#endif Index: source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx =================================================================== RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx,v retrieving revision 1.6 diff -u -r1.6 MNSProfileDiscover.cxx --- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx 24 Oct 2006 15:05:50 -0000 1.6 +++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx 20 Jun 2008 09:12:59 -0000 @@ -37,6 +37,7 @@ #include "precompiled_connectivity.hxx" #include "MNSProfileDiscover.hxx" +#ifndef MINIMAL_PROFILEDISCOVER #include "MNSProfile.hxx" #include "pratom.h" @@ -93,6 +94,7 @@ // IID and CIDs of all the services needed static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); +#endif // Registry Keys @@ -112,7 +114,13 @@ { namespace mozab { - ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,nsILocalFile * aProfilePath) + ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, +#ifdef MINIMAL_PROFILEDISCOVER + const ::rtl::OUString& aProfilePath +#else + nsILocalFile * aProfilePath +#endif + ) { product=aProduct; profileName = aProfileName; @@ -120,6 +128,9 @@ } ::rtl::OUString ProfileStruct::getProfilePath() { +#ifdef MINIMAL_PROFILEDISCOVER + return profilePath; +#else if (profilePath) { nsAutoString path; @@ -129,9 +140,9 @@ } else return ::rtl::OUString(); +#endif } - ProfileAccess::~ProfileAccess() { } @@ -139,20 +150,24 @@ { LoadProductsInfo(); } + sal_Int32 ProfileAccess::LoadProductsInfo() { +#ifndef MINIMAL_PROFILEDISCOVER //load mozilla profiles to m_ProductProfileList LoadMozillaProfiles(); - sal_Int32 index=MozillaProductType_Mozilla; - sal_Int32 count=m_ProductProfileList[index].mProfileList.size(); +#endif + sal_Int32 count=m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size(); //load thunderbird profiles to m_ProductProfileList count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird); + //load firefox profiles to m_ProductProfileList //firefox profile does not containt address book, but maybe others need them count += LoadXPToolkitProfiles(MozillaProductType_Firefox); return count; } +#ifndef MINIMAL_PROFILEDISCOVER nsresult ProfileAccess::LoadMozillaProfiles() { sal_Int32 index=MozillaProductType_Mozilla; @@ -256,13 +271,16 @@ } return rv; } +#endif //Thunderbird and firefox profiles are saved in profiles.ini sal_Int32 ProfileAccess::LoadXPToolkitProfiles(MozillaProductType product) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; +#ifndef MINIMAL_PROFILEDISCOVER nsresult rv; +#endif ::rtl::OUString regDir = getRegistryDir(product); ::rtl::OUString profilesIni( regDir ); profilesIni += ::rtl::OUString::createFromAscii( "profiles.ini" ); @@ -309,6 +327,7 @@ isRelative = sIsRelative.toInt32(); } +#ifndef MINIMAL_PROFILEDISCOVER nsCOMPtr rootDir; rv = NS_NewLocalFile(EmptyString(), PR_TRUE, getter_AddRefs(rootDir)); @@ -328,8 +347,15 @@ rv = rootDir->SetPersistentDescriptor(filePath); } if (NS_FAILED(rv)) continue; +#endif - ProfileStruct* profileItem = new ProfileStruct(product,profileName,rootDir); + ProfileStruct* profileItem = new ProfileStruct(product,profileName, +#ifdef MINIMAL_PROFILEDISCOVER + regDir + profilePath +#else + rootDir +#endif + ); m_Product.mProfileList[profileName] = profileItem; sal_Int32 isDefault = 0; @@ -345,6 +371,7 @@ } return m_Product.mProfileList.size(); } + ::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; @@ -357,6 +384,7 @@ else return m_Product.mProfileList[profileName]->getProfilePath(); } + ::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; @@ -380,6 +408,7 @@ return m_Product.mProfileList.size(); } + ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; @@ -397,6 +426,7 @@ ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; return aProfile->getProfileName(); } +#ifndef MINIMAL_PROFILEDISCOVER nsresult ProfileAccess::isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist) { nsresult rv; @@ -455,9 +485,12 @@ return nExist; } - +#endif ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { +#ifdef MINIMAL_PROFILEDISCOVER + return sal_True; +#else ::rtl::OUString path = getProfilePath(product,profileName); if (!path.getLength()) return sal_True; @@ -481,7 +514,9 @@ if (rv) return sal_True; return sal_False; +#endif } + ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; @@ -493,7 +528,7 @@ else return sal_True; } - - } } + + Index: source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx =================================================================== RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx,v retrieving revision 1.4 diff -u -r1.4 MNSProfileDiscover.hxx --- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx 20 Jun 2006 01:48:25 -0000 1.4 +++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx 20 Jun 2008 09:12:59 -0000 @@ -36,7 +36,9 @@ #ifndef __MNSProfileDiscover_h___ #define __MNSProfileDiscover_h___ +#ifndef MINIMAL_PROFILEDISCOVER #include "mozilla_profile_discover.h" +#endif #include #include @@ -81,15 +83,27 @@ class ProfileStruct { public: - ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,nsILocalFile * aProfilePath); + ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, +#ifdef MINIMAL_PROFILEDISCOVER + const ::rtl::OUString &aProfilePath +#else + nsILocalFile * aProfilePath +#endif + ); MozillaProductType getProductType() { return product;} ::rtl::OUString getProfileName(){ return profileName;} ::rtl::OUString getProfilePath() ; +#ifndef MINIMAL_PROFILEDISCOVER nsILocalFile *getProfileLocal(){ return profilePath;} +#endif protected: MozillaProductType product; ::rtl::OUString profileName; +#ifdef MINIMAL_PROFILEDISCOVER + ::rtl::OUString profilePath; +#else nsCOMPtr profilePath; +#endif }; class ProductStruct @@ -115,16 +129,18 @@ ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - protected: ProductStruct m_ProductProfileList[4]; sal_Int32 LoadProductsInfo(); +#ifndef MINIMAL_PROFILEDISCOVER nsresult LoadMozillaProfiles(); +#endif sal_Int32 LoadXPToolkitProfiles(MozillaProductType product); - +#ifndef MINIMAL_PROFILEDISCOVER //used by isProfileLocked nsresult isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist); nsresult isLockExist(nsILocalFile* aFile); +#endif }; } Index: source/drivers/mozab/bootstrap/makefile.mk =================================================================== RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk,v retrieving revision 1.11 diff -u -r1.11 makefile.mk --- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/makefile.mk 27 Jun 2007 13:56:25 -0000 1.11 +++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/makefile.mk 20 Jun 2008 09:15:43 -0000 @@ -55,30 +55,38 @@ .INCLUDE : settings.mk -.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" -dummy: - @echo " Not building the mozillasrc stuff in OpenOffice.org build" - @echo " dependency to Mozilla developer snapshots not feasable at the moment" - -.ELSE - .INCLUDE : $(PRJ)$/version.mk #mozilla specific stuff. # --- Files ------------------------------------- -SLOFILES = \ - $(SLO)$/MMozillaBootstrap.obj \ - $(SLO)$/MNSFolders.obj \ - $(SLO)$/MNSProfileDiscover.obj \ +SLOFILES += \ + $(SLO)$/MNSINIParser.obj \ + $(SLO)$/MNSProfileDiscover.obj \ + $(SLO)$/MMozillaBootstrap.obj \ + $(SLO)$/MNSFolders.obj + +.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" +CDEFS+=-DMINIMAL_PROFILEDISCOVER + +SHL1TARGET=$(TARGET) +SHL1OBJS=$(SLOFILES) + +SHL1STDLIBS=\ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(SALLIB) \ + $(COMPHELPERLIB) + +.ELSE +SLOFILES += \ $(SLO)$/MNSInit.obj \ $(SLO)$/MNSProfileManager.obj \ - $(SLO)$/MNSINIParser.obj \ $(SLO)$/MNSRunnable.obj \ $(SLO)$/MNSProfile.obj \ $(SLO)$/MNSProfileDirServiceProvider.obj - +.ENDIF .IF "$(GUI)"=="UNX" .IF "$(COMNAME)"=="sunpro5" @@ -162,7 +170,6 @@ -Wno-long-long CDEFS += -DTRACING .ENDIF -.ENDIF SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR) diff -ru scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp --- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp 2008-06-19 15:29:16.000000000 +0100 +++ openoffice.org/scp2/source/ooo/file_library_ooo.scp 2008-06-19 15:31:54.000000000 +0100 @@ -1149,6 +1149,20 @@ #endif End +#else + +File gid_File_Lib_Mozbootstrap + TXT_FILE_BODY; + Styles = (PACKED,UNO_COMPONENT,PATCH); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = gid_Dir_Program; + #ifdef UNX + Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX)); + #else + Name = "libmozbootstrap.dll"; + #endif +End + #endif STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft) diff -ru scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp --- openoffice.org.orig/scp2/source/ooo/module_hidden_ooo.scp 2008-06-19 15:29:16.000000000 +0100 +++ openoffice.org/scp2/source/ooo/module_hidden_ooo.scp 2008-06-19 15:31:44.000000000 +0100 @@ -370,6 +370,7 @@ gid_File_Lib_Mcnttype, gid_File_Lib_Mozab_2, gid_File_Lib_Mozabdrv, + gid_File_Lib_Mozbootstrap, gid_File_Lib_Mysql_2, gid_File_Lib_Odbc_2, gid_File_Lib_Officebean, Index: source/xmlsec/nss/seinitializer_nssimpl.cxx =================================================================== RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx,v retrieving revision 1.21 diff -u -r1.21 seinitializer_nssimpl.cxx --- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 11 Apr 2008 00:38:31 -0000 1.21 +++ openoffice.org/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 23 Jul 2008 15:36:20 -0000 @@ -68,6 +68,7 @@ #include "pk11func.h" #ifdef SYSTEM_MOZILLA #include "nssrenam.h" +#include "secmod.h" #endif #include "cert.h" #include "cryptohi.h" @@ -104,6 +107,12 @@ printf("%s",error); return false ; } + +#if SYSTEM_MOZILLA + if (!SECMOD_HasRootCerts()) + SECMOD_AddNewModule("Root Certs", "libnssckbi.so", 0, 0); +#endif + initialized = 1 ; } diff -ru openoffice.org/solenv/bin/langwrap openoffice.org/solenv/bin/langwrap --- openoffice.org.orig/solenv/bin/langwrap 2008-01-10 12:24:02.000000000 +0000 +++ openoffice.org/solenv/bin/langwrap 2008-01-10 12:26:45.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/solar/bin/perl -w +#!/usr/bin/perl -w # # langwrap - language wrapper for building resources # diff -ru openoffice.org/solenv/bin/modules/osarch.pm openoffice.org/solenv/bin/modules/osarch.pm --- openoffice.org.orig/solenv/bin/modules/osarch.pm 2008-01-10 12:24:02.000000000 +0000 +++ openoffice.org/solenv/bin/modules/osarch.pm 2008-01-10 12:26:56.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/solar/bin/perl -w +#!/usr/bin/perl -w # *********************************************************************** # Description: diff -ru openoffice.org/solenv/bin/pchdelta.py openoffice.org/solenv/bin/pchdelta.py --- openoffice.org.orig/solenv/bin/pchdelta.py 2008-01-10 12:24:02.000000000 +0000 +++ openoffice.org/solenv/bin/pchdelta.py 2008-01-10 12:27:28.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/python +#!/usr/bin/python # ------------------------------------------------------------------------------ # Hacky little delta debug tool to figure out the proper includes for a pch file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- .cvsignore 24 Jul 2008 11:39:49 -0000 1.180 +++ .cvsignore 28 Jul 2008 11:20:56 -0000 1.181 @@ -5,5 +5,4 @@ redhat-registry.tar.gz redhat-langpacks.tar.gz evolocal.odb -bengali.sdf -DEV300_m27.tar.bz2 +DEV300_m28.tar.bz2 Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1593 retrieving revision 1.1594 diff -u -r1.1593 -r1.1594 --- openoffice.org.spec 24 Jul 2008 14:00:12 -0000 1.1593 +++ openoffice.org.spec 28 Jul 2008 11:20:56 -0000 1.1594 @@ -1,5 +1,5 @@ %define oootag DEV300 -%define ooomilestone 27 +%define ooomilestone 28 %define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build @@ -48,10 +48,9 @@ Source2: http://people.redhat.com/caolanm/templates/Tigert-templates.tar.gz Source3: documentation.openoffice.org-templates.tar.gz Source4: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz -Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf -Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll -Source7: redhat-registry.tar.gz -Source8: redhat-langpacks.tar.gz +Source5: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll +Source6: redhat-registry.tar.gz +Source7: redhat-langpacks.tar.gz BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -103,12 +102,11 @@ Patch31: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch Patch32: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch Patch33: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch -Patch34: workspace.cmcfixes46.patch -Patch35: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch -Patch36: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch -Patch37: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch -Patch38: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch -Patch39: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch +Patch34: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch +Patch35: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch +Patch36: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch +Patch37: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch +Patch38: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -140,7 +138,7 @@ Group: Applications/Productivity Requires: liberation-fonts Requires: hunspell-en, hyphen-en -Requires: hsqldb, xalan-j2, xerces-j2 +Requires: xalan-j2, xerces-j2 PreReq: gtk2 >= 2.9.4 Requires(post): shared-mime-info Requires(post): desktop-file-utils @@ -189,7 +187,7 @@ Summary: Database GUI libraries for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: postgresql-jdbc +Requires: hsqldb, postgresql-jdbc %description base-core GUI database libraries for %{name}. @@ -1221,7 +1219,7 @@ tail -n 1 extras/source/palettes/standard.soc) > redhat.soc mv -f redhat.soc extras/source/palettes/standard.soc cp -p %{SOURCE1} extras/source/database/evolocal.odb -cp -p %{SOURCE6} external/unowinreg/unowinreg.dll +cp -p %{SOURCE5} external/unowinreg/unowinreg.dll %patch2 -p1 -b .rh151357.setlangtolocale.patch %if %{gtkprintui} %patch3 -p1 -b .rh127576.gtkunixprintdialog.patch @@ -1256,12 +1254,11 @@ %patch31 -p1 -b .ooo88341.sc.verticalboxes.patch %patch32 -p1 -b .gccXXXXX.solenv.javaregistration.patch %patch33 -p1 -b .ooo87970.vcl.samenamesubs.patch -%patch34 -p1 -b .workspace.cmcfixes46.patch -%patch35 -p1 -b .ooo48400.svx.fixspelling.patch -%patch36 -p1 -b .ooo90876.connectivity.evoab2.patch -%patch37 -p1 -b .ooo86142.serbiannumbering.patch -%patch38 -p1 -b .ooo91977.sd.holdreference.patch -%patch39 -p1 -b .ooo92026.sd.disposed_during_disposing.patch +%patch34 -p1 -b .ooo48400.svx.fixspelling.patch +%patch35 -p1 -b .ooo90876.connectivity.evoab2.patch +%patch36 -p1 -b .ooo86142.serbiannumbering.patch +%patch37 -p1 -b .ooo91977.sd.holdreference.patch +%patch38 -p1 -b .ooo92026.sd.disposed_during_disposing.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1329,16 +1326,6 @@ export MAXPROCESSLIMIT=65535 #get core dumps ulimit -c unlimited -#build translation tools and apply extra translations, so -#this can be removed when these translations are upstreamed -cd transex3/prj -if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then - build --dlv_switch -link --all -fi -deliver -link -#ooo#64726 -localize -m -x -l bn -f %{SOURCE5} -cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and #rebuild un-parallel @@ -1567,7 +1554,7 @@ #don't prompt user to agree to license #libtextcat fingerprint location #rhbz#451512 set better math print options -tar xzf %{SOURCE7} -C $RPM_BUILD_ROOT/%{basisinstdir}/share +tar xzf %{SOURCE6} -C $RPM_BUILD_ROOT/%{basisinstdir}/share #add the debugging libsalalloc_malloc.so.3 library cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{ureinstdir}/lib @@ -1671,7 +1658,7 @@ sh nohelp noacor western \ ) -tar xzf %{SOURCE8} +tar xzf %{SOURCE7} i=0 while [ $i -lt ${#langpackdetails[@]} ]; do @@ -2040,7 +2027,6 @@ %{basisinstdir}/program/classes/LuceneHelpWrapper.jar %{basisinstdir}/program/classes/officebean.jar %{basisinstdir}/program/classes/report.jar -%{basisinstdir}/program/classes/sdbc_hsqldb.jar %{basisinstdir}/program/classes/ScriptFramework.jar %{basisinstdir}/program/classes/ScriptProviderForJava.jar %{basisinstdir}/program/classes/table.jar @@ -2139,7 +2125,6 @@ %{basisinstdir}/program/libfrm%{SOPOST}.so %{basisinstdir}/program/libguesslang%{SOPOST}.so %{basisinstdir}/program/libhelplinker%{SOPOST}.so -%{basisinstdir}/program/libhsqldb2.so %{basisinstdir}/program/libhyphen%{SOPOST}.so %{basisinstdir}/program/libi18nregexpgcc3.so %{basisinstdir}/program/libjdbc2.so @@ -2764,11 +2749,18 @@ %files base-core %defattr(-,root,root,-) +%dir %{basisinstdir} +%dir %{basisinstdir}/help +%dir %{basisinstdir}/help/en %{basisinstdir}/help/en/sdatabase.* +%dir %{basisinstdir}/program +%dir %{basisinstdir}/program/classes +%{basisinstdir}/program/classes/sdbc_hsqldb.jar %{basisinstdir}/program/libabp%{SOPOST}.so %{basisinstdir}/program/libadabasui%{SOPOST}.so %{basisinstdir}/program/libdbp%{SOPOST}.so %{basisinstdir}/program/libdbu%{SOPOST}.so +%{basisinstdir}/program/libhsqldb2.so %{basisinstdir}/program/librpt*%{SOPOST}.so %dir %{basisinstdir}/program/resource %{basisinstdir}/program/resource/abp%{UPD}en-US.res @@ -3570,6 +3562,12 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Mon Jul 28 2008 Caolan McNamara - 1:3.0.0-0.28-1 +- next version +- drop (finally!) integrated ooo#64726 bengali translation fix (April 2006) +- drop integrated workspace.cmcfixes46.patch +- Move hsqldb stuff into database rpm + * Thu Jul 24 2008 Caolan McNamara - 1:3.0.0-0.27-1 - next version - drop integrated workspace.native172.patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- sources 24 Jul 2008 11:39:49 -0000 1.307 +++ sources 28 Jul 2008 11:20:56 -0000 1.308 @@ -5,5 +5,4 @@ 0cedbc1176b95a6079dbd2759fa6cd36 redhat-registry.tar.gz 261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb -0c0e868b34329d90a7c9a92f1704775c bengali.sdf -5962ea25065092dbbb13a56e887b3b09 DEV300_m27.tar.bz2 +2362674845de839488237be1b3b2ccab DEV300_m28.tar.bz2 --- workspace.cmcfixes46.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 11:27:20 2008 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Mon, 28 Jul 2008 11:27:20 GMT Subject: rpms/kexec-tools/devel kexec-kdump-howto.txt, 1.2, 1.3 kexec-tools.spec, 1.117, 1.118 Message-ID: <200807281127.m6SBRKo8010492@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/kexec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10473 Modified Files: kexec-kdump-howto.txt kexec-tools.spec Log Message: Resolves: 456572 Index: kexec-kdump-howto.txt =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-kdump-howto.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kexec-kdump-howto.txt 5 Jun 2008 15:18:53 -0000 1.2 +++ kexec-kdump-howto.txt 28 Jul 2008 11:26:50 -0000 1.3 @@ -470,30 +470,24 @@ and when the system reboots, video should be restored to normal. -Notes on RHEL5 configuration: - -The RHEL5 kexec-utils package contains two extra configuration files: - -/etc/sysconfig/kdump - This file allows you to specify an alternate kernel to boot in the -event of a panic (other than the kernel running at the moment), and allows you -to override or append options on the kernel command line. It also alows you -to pass extra options to the kexec utility when the kdump service is starting. -See documentation in the template kdump sysconfig file for exact usage - -/etc/kdump.conf - This file allows you to configure how kdump will record your core -file. Unlike the stock version of kdump, the RHEL5 version of kdump attempts -to record your vmcore file from the initramfs, so as to still function -properly in the event that your root file system is corrupted and unmountable. -This file is interrogated on kdump service start and is used to populate the -initramfs for the kdump kernel with the appropriate data and utilities to copy -your core file to the desired location. See documentation in /etc/kdump.conf -for available config directives and targets. Note especially the ifc option. -kdump will attempt to determine which network interface to use when dumping to -a remote server, but due to the possibility of interface renaming, or alternate -module load strategies, the interface name may change in the kdump kernel. -This option is used to override that guess, so that the appropriate interface -will be activated in the kdump kernel. +Notes on resetting video: +Video is a notoriously difficult issue with kexec. Video cards contain ROM code +that controls their initial configuration and setup. This code is nominally +accessed and executed from the Bios, and otherwise not safely executable. Since +the purpose of kexec is to reboot the system without re-executing the Bios, it +is rather difficult if not impossible to reset video cards with kexec. The +result is, that if a system crashes while running in a graphical mode (i.e. +running X), the screen may appear to become 'frozen' while the dump capture is +taking place. A serial console will of course reveal that the system is +operating and capturing a vmcore image, but a casual observer will see the +system as hung until the dump completes and a true reboot is executed. +There are two possiblilties to work around this issue. One is by adding +--reset-vga to the kexec command line options in /etc/sysconfig/kdump. This +tells kdump to write some reasonable default values to the video card register +file, in the hopes of returning it to a text mode such that boot messages are +visible on the screen. It does not work with all video cards however. +Secondly, it may be worth trying to add vga15fb.ko to the extra_modules list in +/etc/kdump.conf. This will attempt to use the video card in framebuffer mode, +which can blank the screen prior to the start of a dump capture. Index: kexec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- kexec-tools.spec 14 Jul 2008 14:52:37 -0000 1.117 +++ kexec-tools.spec 28 Jul 2008 11:26:50 -0000 1.118 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.102pre -Release: 13%{?dist} +Release: 14%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -265,6 +265,9 @@ %changelog +* Mon Jul 28 2008 Neil Horman - 1.102pre-14 +- Add video reset section to docs (bz 456572) + * Mon Jul 11 2008 Neil Horman - 1.102pre-13 - Fix mkdumprd to support dynamic busybox (bz 443878) From fedora-extras-commits at redhat.com Mon Jul 28 11:46:03 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Mon, 28 Jul 2008 11:46:03 GMT Subject: rpms/shadow-utils/devel shadow-utils.spec,1.118,1.119 Message-ID: <200807281146.m6SBk3UF010944@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/shadow-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10914 Modified Files: shadow-utils.spec Log Message: ix configure options (#456748) Index: shadow-utils.spec =================================================================== RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- shadow-utils.spec 24 Jul 2008 08:30:14 -0000 1.118 +++ shadow-utils.spec 28 Jul 2008 11:45:33 -0000 1.119 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -56,16 +56,15 @@ %build %configure \ - --disable-desrpc \ --enable-shadowgrp \ - --without-libcrack \ - --with-libcrypt \ + --with-audit \ + --with-sha-crypt \ %if %{WITH_SELINUX} --with-selinux \ %endif + --without-libcrack \ --without-libpam \ - --disable-shared \ - --with-libaudit + --disable-shared make %install @@ -185,6 +184,9 @@ %{_mandir}/man8/vigr.8* %changelog +* Mon Jul 28 2008 Peter Vrabec 2:4.1.2-4 +- fix configure options (#456748) + * Thu Jul 24 2008 Peter Vrabec 2:4.1.2-3 - recreate selinux patch From fedora-extras-commits at redhat.com Mon Jul 28 12:02:40 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 28 Jul 2008 12:02:40 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.140,1.141 Message-ID: <200807281202.m6SC2ebo017862@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17816 Modified Files: kdebindings.spec Log Message: respun Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- kdebindings.spec 28 Jul 2008 10:38:41 -0000 1.140 +++ kdebindings.spec 28 Jul 2008 12:02:10 -0000 1.141 @@ -86,7 +86,6 @@ %prep %setup -q -%patch0 -p1 -b .kde#167450 %build mkdir -p %{_target_platform} From fedora-extras-commits at redhat.com Mon Jul 28 12:03:40 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Mon, 28 Jul 2008 12:03:40 GMT Subject: rpms/freeipmi/devel freeipmi-0.6.4-silent.patch, NONE, 1.1 freeipmi.spec, 1.5, 1.6 Message-ID: <200807281203.m6SC3eDg017946@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/freeipmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17912 Modified Files: freeipmi.spec Added Files: freeipmi-0.6.4-silent.patch Log Message: - Update to freeipmi-0.6.4 - Fixed unecessary logrotate message for bmc-watchdog (#456648) freeipmi-0.6.4-silent.patch: --- NEW FILE freeipmi-0.6.4-silent.patch --- diff -up freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate.silent freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate --- freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate.silent 2008-07-28 12:26:29.000000000 +0200 +++ freeipmi-0.6.4/bmc-watchdog/freeipmi-bmc-watchdog.logrotate 2008-07-28 12:26:44.000000000 +0200 @@ -11,6 +11,6 @@ nomail notifempty postrotate - /etc/init.d/freeipmi-bmc-watchdog condrestart + /etc/init.d/freeipmi-bmc-watchdog condrestart > /dev/null 2>&1 endscript } Index: freeipmi.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- freeipmi.spec 27 Feb 2008 14:33:19 -0000 1.5 +++ freeipmi.spec 28 Jul 2008 12:03:10 -0000 1.6 @@ -3,11 +3,11 @@ # %define name freeipmi -%define version 0.5.1 +%define version 0.6.4 %if %{?_with_debug:1}%{!?_with_debug:0} -%define release 3.debug%{?dist} +%define release 1.debug%{?dist} %else -%define release 3%{?dist} +%define release 1%{?dist} %endif Name: %{name} @@ -18,6 +18,7 @@ URL: http://www.gnu.org/software/freeipmi/ Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz Patch1: freeipmi-0.5.1-regex.patch +Patch2: freeipmi-0.6.4-silent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel texinfo Requires(post): info @@ -64,6 +65,7 @@ %prep %setup -q %patch1 -p1 -b .regex +%patch2 -p1 -b .silent %build CFLAGS=-D_GNU_SOURCE %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ @@ -208,6 +210,7 @@ %doc %{_datadir}/doc/%{name}/freeipmi-coding.txt %doc %{_datadir}/doc/%{name}/freeipmi-hostrange.txt %doc %{_datadir}/doc/%{name}/freeipmi-libraries.txt +%doc %{_datadir}/doc/%{name}/freeipmi-bugs-and-workarounds.txt %dir %{_datadir}/doc/%{name} %{_libdir}/libipmiconsole*so.* %{_libdir}/libfreeipmi*so.* @@ -219,9 +222,11 @@ %{_sbindir}/ipmi-fru %{_sbindir}/ipmi-locate %{_sbindir}/pef-config +%{_sbindir}/ipmi-oem %{_sbindir}/ipmi-raw %{_sbindir}/ipmi-sel %{_sbindir}/ipmi-sensors +%{_sbindir}/ipmi-sensors-config %{_sbindir}/ipmiping %{_sbindir}/ipmipower %{_sbindir}/rmcpping @@ -235,9 +240,11 @@ %{_mandir}/man8/ipmi-fru.8* %{_mandir}/man8/ipmi-locate.8* %{_mandir}/man8/pef-config.8* +%{_mandir}/man8/ipmi-oem.8* %{_mandir}/man8/ipmi-raw.8* %{_mandir}/man8/ipmi-sel.8* %{_mandir}/man8/ipmi-sensors.8* +%{_mandir}/man8/ipmi-sensors-config.8* %{_mandir}/man8/ipmiping.8* %{_mandir}/man8/ipmipower.8* %{_mandir}/man5/ipmipower.conf.5* @@ -246,9 +253,9 @@ %{_mandir}/man5/ipmiconsole.conf.5* %{_mandir}/man8/ipmimonitoring.8* %{_mandir}/man8/ipmi-chassis.8* -%{_mandir}/man3/libipmidetect.3* %{_mandir}/man8/ipmidetect.8* %{_mandir}/man5/ipmidetect.conf.5* +%{_mandir}/man7/freeipmi.7* %dir %{_localstatedir}/cache/ipmimonitoringsdrcache %files devel @@ -258,12 +265,32 @@ %{_libdir}/libipmidetect.so %{_libdir}/libipmimonitoring.so %dir %{_includedir}/freeipmi -%dir %{_includedir}/freeipmi/udm +%dir %{_includedir}/freeipmi/api +%dir %{_includedir}/freeipmi/cmds +%dir %{_includedir}/freeipmi/debug +%dir %{_includedir}/freeipmi/driver +%dir %{_includedir}/freeipmi/fiid +%dir %{_includedir}/freeipmi/interface +%dir %{_includedir}/freeipmi/locate +%dir %{_includedir}/freeipmi/record-format +%dir %{_includedir}/freeipmi/sdr-cache +%dir %{_includedir}/freeipmi/spec +%dir %{_includedir}/freeipmi/util %{_includedir}/ipmiconsole.h %{_includedir}/ipmidetect.h %{_includedir}/ipmi_monitoring.h %{_includedir}/freeipmi/*.h -%{_includedir}/freeipmi/udm/*.h +%{_includedir}/freeipmi/api/*.h +%{_includedir}/freeipmi/cmds/*.h +%{_includedir}/freeipmi/debug/*.h +%{_includedir}/freeipmi/driver/*.h +%{_includedir}/freeipmi/fiid/*.h +%{_includedir}/freeipmi/interface/*.h +%{_includedir}/freeipmi/locate/*.h +%{_includedir}/freeipmi/record-format/*.h +%{_includedir}/freeipmi/sdr-cache/*.h +%{_includedir}/freeipmi/spec/*.h +%{_includedir}/freeipmi/util/*.h %{_mandir}/man3/* %files bmc-watchdog @@ -286,6 +313,10 @@ %{_mandir}/man8/ipmidetectd.8* %changelog +* Mon Jul 28 2008 Phil Knirsch - 0.6.4-1 +- Update to freeipmi-0.6.4 +- Fixed unecessary logrotate message for bmc-watchdog (#456648) + * Wed Feb 27 2008 Phil Knirsch - 0.5.1-3 - Fix GCC 4.3 rebuild problems From fedora-extras-commits at redhat.com Mon Jul 28 12:15:04 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Mon, 28 Jul 2008 12:15:04 GMT Subject: rpms/freeipmi/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200807281215.m6SCF4IZ018250@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/freeipmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18221 Modified Files: .cvsignore sources Log Message: - Doh, forgot to upload new tarball. Fixed. :) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Dec 2007 15:32:40 -0000 1.3 +++ .cvsignore 28 Jul 2008 12:14:34 -0000 1.4 @@ -1 +1 @@ -freeipmi-0.5.1.tar.gz +freeipmi-0.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Dec 2007 15:32:40 -0000 1.3 +++ sources 28 Jul 2008 12:14:34 -0000 1.4 @@ -1 +1 @@ -d22287bd4894762ab73ac9686c23e622 freeipmi-0.5.1.tar.gz +50f97e15320c126528e95b27e97f4c1e freeipmi-0.6.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 12:25:51 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 28 Jul 2008 12:25:51 GMT Subject: rpms/mutt/devel mutt-1.5.18-db47.patch, NONE, 1.1 mutt.spec, 1.56, 1.57 Message-ID: <200807281225.m6SCPpWJ018561@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/mutt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18521 Modified Files: mutt.spec Added Files: mutt-1.5.18-db47.patch Log Message: - rebuild with db4.7 (Robert Scheck) (#455144) mutt-1.5.18-db47.patch: --- NEW FILE mutt-1.5.18-db47.patch --- Patch by Robert Scheck for mutt <= 1.5.18, which adds the ability to link mutt against db <= 4.7 rather the original <= 4.6. This patch was sent upstream and hopefully should be included into the next release of mutt. --- mutt-1.5.18/configure 2008-07-12 20:34:15.000000000 +0200 +++ mutt-1.5.18/configure.db47 2008-07-12 20:39:52.000000000 +0200 @@ -17397,7 +17397,7 @@ bdbpfx="$bdbpfx $d/$v" done done - BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" + BDB_VERSIONS="db-4 db4 db-4.7 db4.7 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" { $as_echo "$as_me:$LINENO: checking for BerkeleyDB > 4.0" >&5 $as_echo_n "checking for BerkeleyDB > 4.0... " >&6; } for d in $bdbpfx; do Index: mutt.spec =================================================================== RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- mutt.spec 25 Jun 2008 10:09:20 -0000 1.56 +++ mutt.spec 28 Jul 2008 12:25:21 -0000 1.57 @@ -15,7 +15,7 @@ Summary: A text mode mail user agent Name: mutt Version: 1.5.18 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -28,6 +28,7 @@ Patch4: mutt-1.5.18-manual.patch Patch5: mutt-1.5.18-intr.patch Patch6: mutt-1.5.18-imap.patch +Patch7: mutt-1.5.18-db47.patch Url: http://www.mutt.org/ Requires: mailcap urlview BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -67,6 +68,7 @@ %patch4 -p1 -b .manual %patch5 -p1 -b .intr %patch6 -p1 -b .imap +%patch7 -p1 -b .db47 install -p -m644 %{SOURCE1} mutt_ldap_query @@ -141,6 +143,9 @@ %{_mandir}/man5/muttrc.* %changelog +* Mon Jul 28 2008 Miroslav Lichvar 5:1.5.18-4 +- rebuild with db4.7 (Robert Scheck) (#455144) + * Wed Jun 25 2008 Miroslav Lichvar 5:1.5.18-3 - buildrequire aspell (#452133) - rebuild with new gnutls From fedora-extras-commits at redhat.com Mon Jul 28 12:42:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Mon, 28 Jul 2008 12:42:26 GMT Subject: rpms/gnome-do/devel gnome-do.spec,1.14,1.15 Message-ID: <200807281242.m6SCgQRq019120@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19090 Modified Files: gnome-do.spec Log Message: 0.5.0.1 Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnome-do.spec 15 Jul 2008 13:52:19 -0000 1.14 +++ gnome-do.spec 28 Jul 2008 12:41:56 -0000 1.15 @@ -1,6 +1,8 @@ %define debug_package %{nil} Name: gnome-do +Version: 0.5.0.1 +Release: 1%{?dist} Version: 0.5.0.1 Release: 1%{?dist} Summary: Quick launch and search @@ -9,15 +11,16 @@ Group: Applications/File URL: http://do.davebsd.com/ Source0: http://launchpad.net/do/trunk/0.5/+download/%{name}-%{version}.tar.gz +Patch0: %{name}-libdir.patch +Source0: http://launchpad.net/do/trunk/0.5/+download/%{name}-%{version}.tar.gz # keyring's .pc file has been renamed in latest CVS Patch0: %{name}-0.5.0.1-keyring.patch -Patch1: %{name}-0.5.0.1-launcher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Various Mono dependencies are not available for ppc64; see bug 241850. ExcludeArch: ppc64 -BuildRequires: mono-devel +BuildRequires: mono-devel, mono-addins-devel BuildRequires: desktop-file-utils BuildRequires: ndesk-dbus-devel BuildRequires: ndesk-dbus-glib-devel @@ -29,6 +32,8 @@ BuildRequires: intltool BuildRequires: gtk2-devel +Requires: mono-core, mono-addins +Requires: tomboy Requires: mono-core Requires: ndesk-dbus Requires: ndesk-dbus-glib @@ -86,6 +91,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jun 11 2008 Sindre Pedersen Bj??rdal - 0.5.0.1-1 +- New upstrean release + * Sun Jul 6 2008 Michel Alexandre Salim - 0.5.0.1-1 - Update to 0.5.0.1 From fedora-extras-commits at redhat.com Mon Jul 28 12:43:21 2008 From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten)) Date: Mon, 28 Jul 2008 12:43:21 GMT Subject: rpms/mod_nss/devel mod_nss.spec,1.12,1.13 Message-ID: <200807281243.m6SChLnN019165@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19140 Modified Files: mod_nss.spec Log Message: rebuild to bump NVR Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_nss.spec 16 Jul 2008 18:02:54 -0000 1.12 +++ mod_nss.spec 28 Jul 2008 12:42:50 -0000 1.13 @@ -2,7 +2,7 @@ Name: mod_nss Version: 1.0.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -120,6 +120,9 @@ %{_sbindir}/gencert %changelog +* Mon Jul 28 2008 Rob Crittenden - 1.0.7-9 +- rebuild to bump NVR + * Mon Jul 14 2008 Rob Crittenden - 1.0.7-8 - Don't force module de-init during the configuration stage (453508) From fedora-extras-commits at redhat.com Mon Jul 28 13:15:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Mon, 28 Jul 2008 13:15:50 GMT Subject: rpms/gnome-do/devel gnome-do.spec,1.15,1.16 Message-ID: <200807281315.m6SDFoOJ026699@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26654 Modified Files: gnome-do.spec Log Message: 0.5.0.1 Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnome-do.spec 28 Jul 2008 12:41:56 -0000 1.15 +++ gnome-do.spec 28 Jul 2008 13:15:20 -0000 1.16 @@ -3,8 +3,6 @@ Name: gnome-do Version: 0.5.0.1 Release: 1%{?dist} -Version: 0.5.0.1 -Release: 1%{?dist} Summary: Quick launch and search License: GPLv3+ From fedora-extras-commits at redhat.com Mon Jul 28 13:16:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Mon, 28 Jul 2008 13:16:33 GMT Subject: rpms/gnome-do/devel gnome-do.spec,1.16,1.17 Message-ID: <200807281316.m6SDGXlE026756@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26717 Modified Files: gnome-do.spec Log Message: 0.5.0.1 Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-do.spec 28 Jul 2008 13:15:20 -0000 1.16 +++ gnome-do.spec 28 Jul 2008 13:16:02 -0000 1.17 @@ -9,8 +9,6 @@ Group: Applications/File URL: http://do.davebsd.com/ Source0: http://launchpad.net/do/trunk/0.5/+download/%{name}-%{version}.tar.gz -Patch0: %{name}-libdir.patch -Source0: http://launchpad.net/do/trunk/0.5/+download/%{name}-%{version}.tar.gz # keyring's .pc file has been renamed in latest CVS Patch0: %{name}-0.5.0.1-keyring.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Mon Jul 28 13:17:11 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Mon, 28 Jul 2008 13:17:11 GMT Subject: rpms/gnome-do/devel gnome-do.spec,1.17,1.18 Message-ID: <200807281317.m6SDHBl0026797@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26768 Modified Files: gnome-do.spec Log Message: 0.5.0.1 Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-do.spec 28 Jul 2008 13:16:02 -0000 1.17 +++ gnome-do.spec 28 Jul 2008 13:16:41 -0000 1.18 @@ -90,9 +90,6 @@ * Wed Jun 11 2008 Sindre Pedersen Bj??rdal - 0.5.0.1-1 - New upstrean release -* Sun Jul 6 2008 Michel Alexandre Salim - 0.5.0.1-1 -- Update to 0.5.0.1 - * Wed Jun 04 2008 Caol??n McNamara - 0.4.2.0-2 - rebuild for dependancies From fedora-extras-commits at redhat.com Mon Jul 28 13:24:17 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Mon, 28 Jul 2008 13:24:17 GMT Subject: rpms/gnome-do/devel gnome-do.spec,1.18,1.19 Message-ID: <200807281324.m6SDOH9B027055@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27030 Modified Files: gnome-do.spec Log Message: 0.5.0.1 Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gnome-do.spec 28 Jul 2008 13:16:41 -0000 1.18 +++ gnome-do.spec 28 Jul 2008 13:23:46 -0000 1.19 @@ -2,7 +2,7 @@ Name: gnome-do Version: 0.5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Quick launch and search License: GPLv3+ From fedora-extras-commits at redhat.com Mon Jul 28 13:38:45 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Mon, 28 Jul 2008 13:38:45 GMT Subject: rpms/shadow-utils/F-9 shadow-utils.spec,1.114,1.115 Message-ID: <200807281338.m6SDcj6q027592@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/shadow-utils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27555 Modified Files: shadow-utils.spec Log Message: fix configure options (#456748) Index: shadow-utils.spec =================================================================== RCS file: /cvs/extras/rpms/shadow-utils/F-9/shadow-utils.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- shadow-utils.spec 20 May 2008 11:59:45 -0000 1.114 +++ shadow-utils.spec 28 Jul 2008 13:38:15 -0000 1.115 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -60,16 +60,15 @@ %build %configure \ - --disable-desrpc \ --enable-shadowgrp \ - --without-libcrack \ - --with-libcrypt \ + --with-audit \ + --with-sha-crypt \ %if %{WITH_SELINUX} --with-selinux \ %endif + --without-libcrack \ --without-libpam \ - --disable-shared \ - --with-libaudit + --disable-shared make %install @@ -188,6 +187,9 @@ %{_mandir}/man8/vigr.8* %changelog +* Mon Jul 28 2008 Peter Vrabec 2:4.1.1-3 +- fix configure options (#456748) + * Tue May 20 2008 Peter Vrabec 2:4.1.1-2 - fix salt size problem (#447136) From fedora-extras-commits at redhat.com Mon Jul 28 14:07:30 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Mon, 28 Jul 2008 14:07:30 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.65,1.66 Message-ID: <200807281407.m6SE7UIw003030@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3001 Modified Files: java-1.6.0-openjdk.spec Log Message: * Mon Jun 28 2008 Lillian Angel - 1:1.6.0-0.20.b11 - Removed freetype patch. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- java-1.6.0-openjdk.spec 25 Jul 2008 08:56:36 -0000 1.65 +++ java-1.6.0-openjdk.spec 28 Jul 2008 14:07:00 -0000 1.66 @@ -139,7 +139,6 @@ Patch0: java-1.6.0-openjdk-optflags.patch Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch Patch2: java-1.6.0-openjdk-makefile.patch -Patch3: java-1.6.0-openjdk-freetype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -176,7 +175,7 @@ BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-fonts-Type1 BuildRequires: xorg-x11-fonts-misc -BuildRequires: freetype-devel >= 2.2.0 +BuildRequires: freetype-devel >= 2.3.0 BuildRequires: fontconfig BuildRequires: eclipse-ecj # Java Access Bridge for GNOME build requirements. @@ -358,13 +357,7 @@ ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} %if %{gcjbootstrap} make stamps/patch-ecj.stamp -pushd openjdk-ecj - patch -l -p2 < %{PATCH3} -popd %endif -make stamps/patch.stamp -patch -l -p1 < %{PATCH3} - make export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -906,6 +899,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Mon Jun 28 2008 Lillian Angel - 1:1.6.0-0.20.b11 +- Removed freetype patch. + * Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.20.b11 - Specify vendor for javaws desktop entry. - Merge EPEL-5 and Fedora devel packages. From fedora-extras-commits at redhat.com Mon Jul 28 14:08:45 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Mon, 28 Jul 2008 14:08:45 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.66,1.67 Message-ID: <200807281408.m6SE8jEd003121@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3066 Modified Files: java-1.6.0-openjdk.spec Log Message: Fixed changelog typo Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- java-1.6.0-openjdk.spec 28 Jul 2008 14:07:00 -0000 1.66 +++ java-1.6.0-openjdk.spec 28 Jul 2008 14:08:15 -0000 1.67 @@ -899,7 +899,7 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog -* Mon Jun 28 2008 Lillian Angel - 1:1.6.0-0.20.b11 +* Mon Jul 28 2008 Lillian Angel - 1:1.6.0-0.20.b11 - Removed freetype patch. * Wed Jul 23 2008 Lubomir Rintel - 1:1.6.0-0.20.b11 From fedora-extras-commits at redhat.com Mon Jul 28 14:20:08 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Mon, 28 Jul 2008 14:20:08 GMT Subject: rpms/vnc/devel vnc.spec,1.201,1.202 Message-ID: <200807281420.m6SEK8nZ003487@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3453 Modified Files: vnc.spec Log Message: - removed initscript %%config attribute Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- vnc.spec 18 Jul 2008 10:22:23 -0000 1.201 +++ vnc.spec 28 Jul 2008 14:19:38 -0000 1.202 @@ -3,7 +3,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 34.1%{?dist} +Release: 34.2%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -312,7 +312,7 @@ %files server %defattr(-,root,root) -%attr(0755,root,root) %config /etc/rc.d/init.d/vncserver +%attr(0755,root,root) /etc/rc.d/init.d/vncserver %config(noreplace) /etc/sysconfig/vncservers %{_bindir}/Xvnc %{_bindir}/vncpasswd @@ -331,6 +331,9 @@ %{_libdir}/librfb.so.* %changelog +* Mon Jul 28 2008 Adam Tkac 4.1.2-34.2 +- removed initscript %%config attribute + * Fri Jul 18 2008 Adam Tkac 4.1.2-34.1 - removed buildroot From fedora-extras-commits at redhat.com Mon Jul 28 14:31:31 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Mon, 28 Jul 2008 14:31:31 GMT Subject: rpms/dovecot pkg.acl,1.1,NONE Message-ID: <200807281431.m6SEVVi1004104@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/dovecot In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4098 Removed Files: pkg.acl Log Message: open acl --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 14:31:53 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Mon, 28 Jul 2008 14:31:53 GMT Subject: rpms/mt-st pkg.acl,1.1,NONE Message-ID: <200807281431.m6SEVrvj004148@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mt-st In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4139 Removed Files: pkg.acl Log Message: open acl --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 14:32:02 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Mon, 28 Jul 2008 14:32:02 GMT Subject: rpms/mtx pkg.acl,1.1,NONE Message-ID: <200807281432.m6SEW2X0004180@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mtx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4174 Removed Files: pkg.acl Log Message: open acl --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 14:35:41 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Mon, 28 Jul 2008 14:35:41 GMT Subject: rpms/htdig/devel htdig.spec,1.45,1.46 Message-ID: <200807281435.m6SEZfdo004466@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/htdig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4431 Modified Files: htdig.spec Log Message: - mark configuration files as noreplace Index: htdig.spec =================================================================== RCS file: /cvs/pkgs/rpms/htdig/devel/htdig.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- htdig.spec 23 Apr 2008 13:07:32 -0000 1.45 +++ htdig.spec 28 Jul 2008 14:35:11 -0000 1.46 @@ -5,7 +5,7 @@ Summary: ht://Dig - Web search engine Name: htdig Version: 3.2.0 -Release: 0.1.b6%{?dist} +Release: 0.2.b6%{?dist} Epoch: 4 License: GPLv2 Group: Applications/Internet @@ -136,8 +136,8 @@ %defattr(-,root,root) %doc htdoc/* %dir %{_sysconfdir}/htdig -%config %{_sysconfdir}/htdig/htdig.conf -%config %{_sysconfdir}/htdig/cookies.txt +%config(noreplace) %{_sysconfdir}/htdig/htdig.conf +%config(noreplace) %{_sysconfdir}/htdig/cookies.txt %{_sysconfdir}/htdig/HtFileType-magic.mime %{_sysconfdir}/htdig/mime.types %dir /var/lib/htdig @@ -151,12 +151,15 @@ %files web %defattr(-,root,root) %{contentdir}/cgi-bin/* -%config %{_sysconfdir}/httpd/conf.d/htdig.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/htdig.conf %dir %{_datadir}/htdig %{_datadir}/htdig/* %endif %changelog +* Mon Jul 28 2008 Adam Tkac 4:3.2.0-0.2.b6 +- mark configuration files as noreplace + * Wed Apr 23 2008 Adam Tkac 4:3.2.0-0.1.b6 - report proper error message when external parser fails (#435741) - ignore numbers when using allow_numbers: true and soundex (#435743) From fedora-extras-commits at redhat.com Mon Jul 28 14:36:38 2008 From: fedora-extras-commits at redhat.com (Daniel Drake (dsd)) Date: Mon, 28 Jul 2008 14:36:38 GMT Subject: rpms/olpcsound/OLPC-3 csd-comment-termination.patch, NONE, 1.1 olpcsound.spec, 1.1, 1.2 Message-ID: <200807281436.m6SEacvn004538@cvs-int.fedora.redhat.com> Author: dsd Update of /cvs/pkgs/rpms/olpcsound/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4503 Modified Files: olpcsound.spec Added Files: csd-comment-termination.patch Log Message: fix csd comment termination parsing csd-comment-termination.patch: --- NEW FILE csd-comment-termination.patch --- Fix comment termination parsing Patch taken from csound CVS Index: olpcsound-5.08.92/Engine/rdorch.c =================================================================== --- olpcsound-5.08.92.orig/Engine/rdorch.c +++ olpcsound-5.08.92/Engine/rdorch.c @@ -201,7 +201,7 @@ static int skiporccomment(CSOUND *csound return; } } - if (c == '*' && mode == 0) mode = 1; + if (c == '*') mode = 1; /* look for end of comment */ else if (c == '/' && mode == 1) { return srccnt; } Index: olpcsound.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpcsound/OLPC-3/olpcsound.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- olpcsound.spec 20 Jun 2008 12:19:02 -0000 1.1 +++ olpcsound.spec 28 Jul 2008 14:36:08 -0000 1.2 @@ -1,11 +1,12 @@ Summary: Csound - sound synthesis language and library, OLPC subset Name: olpcsound Version: 5.08.92 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://csound.sourceforge.net/ License: LGPLv2+ Group: Applications/Multimedia Source: http://downloads.sourceforge.net/csound/olpcsound-%version.tar.bz2 +Patch0: csd-comment-termination.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: swig python scons alsa-lib-devel liblo-devel libsndfile-devel BuildRequires: libpng-devel libjpeg-devel libvorbis-devel libogg-devel gettext python-devel @@ -25,6 +26,7 @@ %prep %setup -q +%patch0 -p1 %build %{_bindir}/scons buildOLPC=1 customCCFLAGS="%{optflags}" customCXXFLAGS="%{optflags}" @@ -63,6 +65,9 @@ %changelog +* Mon Jul 27 2008 Daniel Drake - 5.08.92-3 + - add patch from CVS to fix csd comment termination parsing + * Wed May 28 2008 Victor.Lazzarini - 5.08.92-2 - fixed version format in changelog - fixed permissions of Opcodes/hrtfopcodes.c and Util/mixer.c in srcs From fedora-extras-commits at redhat.com Mon Jul 28 15:11:09 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 28 Jul 2008 15:11:09 GMT Subject: rpms/perl-Net-SSLeay/devel .cvsignore, 1.3, 1.4 perl-Net-SSLeay.spec, 1.10, 1.11 sources, 1.3, 1.4 perl-Net-SSLeay-1.32-external-hosts.patch, 1.1, NONE perl-Net-SSLeay-1.32-notests.patch, 1.1, NONE Message-ID: <200807281511.m6SFB9xW012959@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Net-SSLeay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12899 Modified Files: .cvsignore perl-Net-SSLeay.spec sources Removed Files: perl-Net-SSLeay-1.32-external-hosts.patch perl-Net-SSLeay-1.32-notests.patch Log Message: * Mon Jul 28 2008 Paul Howarth - 1.35-1 - update to 1.35 - drop flag and patch for enabling/disabling external tests - patch now upstream - external hosts patch no longer needed as we don't do external tests - filter out unversioned provide for perl(Net::SSLeay) - use the distro openssl flags rather than guessing them Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Nov 2007 15:38:29 -0000 1.3 +++ .cvsignore 28 Jul 2008 15:10:39 -0000 1.4 @@ -1 +1 @@ -Net-SSLeay-1.32.tar.gz +Net-SSLeay-1.35.tar.gz Index: perl-Net-SSLeay.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Net-SSLeay.spec 2 Mar 2008 15:56:44 -0000 1.10 +++ perl-Net-SSLeay.spec 28 Jul 2008 15:10:39 -0000 1.11 @@ -1,23 +1,17 @@ -# -# Rebuild switch: -# --with externaltests enable external network tests -# - Name: perl-Net-SSLeay -Version: 1.32 -Release: 5%{?dist} +Version: 1.35 +Release: 1%{?dist} Summary: Perl extension for using OpenSSL Group: Development/Libraries License: OpenSSL URL: http://search.cpan.org/dist/Net-SSLeay/ Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}.tar.gz -Patch0: perl-Net-SSLeay-1.32-notests.patch -Patch1: perl-Net-SSLeay-1.32-external-hosts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker), openssl-devel BuildRequires: perl(Array::Compare), perl(MIME::Base64), perl(Sub::Uplevel) -BuildRequires: perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod), perl(Test::Warn), perl(Tree::DAG_Node) +BuildRequires: perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod) +BuildRequires: perl(Test::Warn), perl(Tree::DAG_Node) %description This module offers some high level convenience functions for accessing @@ -28,10 +22,6 @@ %prep %setup -q -n Net-SSLeay-%{version} -%if 0%{!?_with_externaltests:1} -%patch0 -p1 -b .notests -%endif -%patch1 -p1 -b .hosts %{__chmod} -c 644 examples/* %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl for f in Credits lib/Net/SSLeay.pm; do @@ -39,9 +29,16 @@ %{__mv} ${f}.utf8 ${f} done +# Remove redundant provides (there's also a versioned one) +%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(Net::SSLeay)'" +%define __perl_provides %{provfilt} + %build PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \ - INSTALLDIRS=vendor OPTIMIZE="%{optflags}" + INSTALLDIRS=vendor \ + INC="$(/usr/bin/pkg-config --cflags-only-I openssl)" \ + LIBS="$(/usr/bin/pkg-config --libs openssl)" \ + OPTIMIZE="%{optflags}" %{__make} %{?_smp_mflags} %install @@ -67,6 +64,13 @@ %{_mandir}/man3/Net::SSLeay*.3* %changelog +* Mon Jul 28 2008 Paul Howarth - 1.35-1 +- update to 1.35 +- drop flag and patch for enabling/disabling external tests - patch now upstream +- external hosts patch no longer needed as we don't do external tests +- filter out unversioned provide for perl(Net::SSLeay) +- use the distro openssl flags rather than guessing them + * Wed Feb 27 2008 Tom "spot" Callaway - 1.32-5 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2007 15:38:29 -0000 1.3 +++ sources 28 Jul 2008 15:10:39 -0000 1.4 @@ -1 +1 @@ -3e0918a7101633f06cfe4f7ca005917e Net-SSLeay-1.32.tar.gz +1e4ec37a4467eb66a62d3c090ac9029b Net-SSLeay-1.35.tar.gz --- perl-Net-SSLeay-1.32-external-hosts.patch DELETED --- --- perl-Net-SSLeay-1.32-notests.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 15:18:41 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Mon, 28 Jul 2008 15:18:41 GMT Subject: rpms/mkinitrd/devel mkinitrd.spec,1.276,1.277 Message-ID: <200807281518.m6SFIfid013311@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/mkinitrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13281 Modified Files: mkinitrd.spec Log Message: * Mon Jul 28 2008 Peter Jones - 6.0.54-2 - Require plymouth. Index: mkinitrd.spec =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- mkinitrd.spec 8 Jul 2008 02:08:11 -0000 1.276 +++ mkinitrd.spec 28 Jul 2008 15:18:11 -0000 1.277 @@ -3,7 +3,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd Version: 6.0.55 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: mkinitrd-%{version}.tar.bz2 @@ -14,7 +14,7 @@ Requires: lvm2 >= 2.02.33-9, diffutils Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1 Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol, coreutils -Requires: mdadm, elfutils-libelf, isomd5sum +Requires: mdadm, elfutils-libelf, isomd5sum, plymouth BuildRequires: popt-devel, elfutils-libelf-devel, elfutils-devel BuildRequires: e2fsprogs-devel parted-devel >= 1.8.5, pkgconfig, glib2-devel BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9 @@ -119,6 +119,9 @@ %dir %{_sysconfdir}/kernel/prerm.d %changelog +* Mon Jul 28 2008 Peter Jones - 6.0.54-2 +- Require plymouth. + * Mon Jul 7 2008 Jeremy Katz - 6.0.55-1 - Make plymouth work with live initrds - Strip out BOOT_IMAGE= as an argument to init so that things don't break if From fedora-extras-commits at redhat.com Mon Jul 28 15:19:14 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Mon, 28 Jul 2008 15:19:14 GMT Subject: rpms/mkinitrd/devel mkinitrd.spec,1.277,1.278 Message-ID: <200807281519.m6SFJEtQ013371@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/mkinitrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13317 Modified Files: mkinitrd.spec Log Message: * Mon Jul 28 2008 Peter Jones - 6.0.55-2 - Require plymouth. Index: mkinitrd.spec =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.277 retrieving revision 1.278 diff -u -r1.277 -r1.278 --- mkinitrd.spec 28 Jul 2008 15:18:11 -0000 1.277 +++ mkinitrd.spec 28 Jul 2008 15:18:44 -0000 1.278 @@ -119,7 +119,7 @@ %dir %{_sysconfdir}/kernel/prerm.d %changelog -* Mon Jul 28 2008 Peter Jones - 6.0.54-2 +* Mon Jul 28 2008 Peter Jones - 6.0.55-2 - Require plymouth. * Mon Jul 7 2008 Jeremy Katz - 6.0.55-1 From fedora-extras-commits at redhat.com Mon Jul 28 15:24:05 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 28 Jul 2008 15:24:05 GMT Subject: rpms/epiphany-extensions/devel epiphany-extensions-2.22_23-api.diff, 1.1, 1.2 Message-ID: <200807281524.m6SFO5dT013573@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/epiphany-extensions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13540 Modified Files: epiphany-extensions-2.22_23-api.diff Log Message: Slight adjustment to 2.23-API patch as per chpe's comments on GNOME bug #544928 epiphany-extensions-2.22_23-api.diff: Index: epiphany-extensions-2.22_23-api.diff =================================================================== RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions-2.22_23-api.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- epiphany-extensions-2.22_23-api.diff 27 Jul 2008 04:17:14 -0000 1.1 +++ epiphany-extensions-2.22_23-api.diff 28 Jul 2008 15:23:34 -0000 1.2 @@ -6,7 +6,7 @@ AC_INIT([GNOME Web Browser Extensions],[e_e_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany-extensions],[epiphany-extensions]) -EPIPHANY_API_VERSION=e_e_version_major.e_e_version_minor -+EPIPHANY_API_VERSION=e_e_version_major.23 ++EPIPHANY_API_VERSION=2.23 EPIPHANY_EXTENSIONS_MAJOR=e_e_version_major.e_e_version_minor AC_SUBST(EPIPHANY_EXTENSIONS_MAJOR) From fedora-extras-commits at redhat.com Mon Jul 28 15:25:47 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Mon, 28 Jul 2008 15:25:47 GMT Subject: rpms/kernel/devel linux-2.6-squashfs.patch,1.29,1.30 Message-ID: <200807281525.m6SFPlr8013666@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13620 Modified Files: linux-2.6-squashfs.patch Log Message: Fix up squashfs for commit 51cc50685a4275c6a02653670af9f108a64e01cf linux-2.6-squashfs.patch: Index: linux-2.6-squashfs.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-squashfs.patch,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- linux-2.6-squashfs.patch 13 Feb 2008 21:57:30 -0000 1.29 +++ linux-2.6-squashfs.patch 28 Jul 2008 15:25:17 -0000 1.30 @@ -2238,7 +2238,7 @@ +} + + -+static void init_once(struct kmem_cache *cachep, void *foo) ++static void init_once(void *foo) +{ + struct squashfs_inode_info *ei = foo; + From fedora-extras-commits at redhat.com Mon Jul 28 15:26:46 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 28 Jul 2008 15:26:46 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1594,1.1595 Message-ID: <200807281526.m6SFQkoK013716@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13687 Modified Files: openoffice.org.spec Log Message: new autocorrect files Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1594 retrieving revision 1.1595 diff -u -r1.1594 -r1.1595 --- openoffice.org.spec 28 Jul 2008 11:20:56 -0000 1.1594 +++ openoffice.org.spec 28 Jul 2008 15:26:15 -0000 1.1595 @@ -1620,6 +1620,9 @@ done popd +#No Vietnamese langpacks at the moment +rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr/acor_vi-VN.dat + #auto generate the langpack file lists, format is... #langpack id, has help or not, autocorrection glob, script classification langpackdetails=\ @@ -1630,7 +1633,7 @@ cy nohelp noacor western da help acor_da-DK.dat western \ de help acor_de-*.dat western el help noacor western \ es help acor_es-*.dat western et help noacor western \ -eu nohelp noacor western fi nohelp acor_fi-*.dat western \ +eu nohelp acor_eu.dat western fi nohelp acor_fi-*.dat western \ fr help acor_fr-*.dat western ga nohelp noacor western \ gl help noacor western gu-IN nohelp noacor ctl \ pa-IN help noacor ctl he nohelp noacor ctl \ @@ -3298,7 +3301,6 @@ %{oooinstdir}/program/simpress %{oooinstdir}/program/simpress.bin %{_datadir}/applications/openoffice.org-*-impress.desktop -%{_datadir}/mimelnk/application/openoffice.org-ms-powerpoint* %{_datadir}/mimelnk/application/openoffice.org-*presentation* %{_bindir}/ooimpress @@ -3315,7 +3317,6 @@ %{brinstdir}/program/simpress %{brinstdir}/program/simpress.bin %{_datadir}/applications/broffice.org-impress.desktop -%{_datadir}/mimelnk/application/broffice.org-ms-powerpoint* %{_datadir}/mimelnk/application/broffice.org-*presentation* %post -n broffice.org-impress From fedora-extras-commits at redhat.com Mon Jul 28 15:37:13 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 28 Jul 2008 15:37:13 GMT Subject: rpms/hplip/devel .cvsignore, 1.26, 1.27 hplip.spec, 1.180, 1.181 sources, 1.26, 1.27 Message-ID: <200807281537.m6SFbD3G015228@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15122 Modified Files: .cvsignore hplip.spec sources Log Message: * Mon Jul 28 2008 Tim Waugh 2.8.6b-1 - 2.8.6b. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 23 Jun 2008 11:39:35 -0000 1.26 +++ .cvsignore 28 Jul 2008 15:36:42 -0000 1.27 @@ -23,3 +23,4 @@ hplip-2.8.2.tar.gz hplip-2.8.5.tar.gz hplip-2.8.6.tar.gz +hplip-2.8.6b.tar.gz Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- hplip.spec 23 Jun 2008 11:39:35 -0000 1.180 +++ hplip.spec 28 Jul 2008 15:36:42 -0000 1.181 @@ -1,6 +1,6 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 2.8.6 +Version: 2.8.6b Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons @@ -291,6 +291,9 @@ exit 0 %changelog +* Mon Jul 28 2008 Tim Waugh 2.8.6b-1 +- 2.8.6b. + * Mon Jun 23 2008 Tim Waugh 2.8.6-1 - 2.8.6. No longer need libm patch. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 23 Jun 2008 11:39:35 -0000 1.26 +++ sources 28 Jul 2008 15:36:42 -0000 1.27 @@ -1 +1 @@ -2571d7bf54d20a9b915288816e8cd895 hplip-2.8.6.tar.gz +66a7dbbf5b2928ef0c6f827d460016de hplip-2.8.6b.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 15:38:37 2008 From: fedora-extras-commits at redhat.com (James Laska (jlaska)) Date: Mon, 28 Jul 2008 15:38:37 GMT Subject: rpms/snake/devel .cvsignore, 1.6, 1.7 import.log, 1.1, 1.2 snake.spec, 1.13, 1.14 sources, 1.14, 1.15 Message-ID: <200807281538.m6SFcbLu015537@cvs-int.fedora.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15428/devel Modified Files: .cvsignore import.log snake.spec sources Log Message: Update to snake-0.11-0.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Jun 2008 14:06:26 -0000 1.6 +++ .cvsignore 28 Jul 2008 15:38:07 -0000 1.7 @@ -1 +1 @@ -snake-0.11-0.7.tar.bz2 +snake-0.11-0.8.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jun 2008 14:06:26 -0000 1.1 +++ import.log 28 Jul 2008 15:38:07 -0000 1.2 @@ -1 +1,2 @@ snake-0_11-0_7_fc9:HEAD:snake-0.11-0.7.fc9.src.rpm:1213711505 +snake-0_11-0_8_fc9:HEAD:snake-0.11-0.8.fc9.src.rpm:1217259365 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- snake.spec 17 Jun 2008 14:06:26 -0000 1.13 +++ snake.spec 28 Jul 2008 15:38:07 -0000 1.14 @@ -4,7 +4,7 @@ Name: snake Summary: Smart Network Automated Kickstart Environment Version: 0.11 -%define rel 0.7 +%define rel 0.8 Release: %{rel}%{?dist} Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2 License: GPLv2+ @@ -135,6 +135,12 @@ %changelog +* Mon Jul 28 2008 James Laska 0.11-0.8 +- ticket#59 - snake-install-tui will auto-register an unregistered system when + using server-side kickstarts +- ticket#57 - Fixed snake-install -c argument handling +- Enable 'writefp' support for python templates + * Tue Jun 17 2008 James Laska 0.11-0.7 - ticket#56 - Fixed translate.py traceback for older python Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 17 Jun 2008 14:06:26 -0000 1.14 +++ sources 28 Jul 2008 15:38:07 -0000 1.15 @@ -1 +1 @@ -c6363556d27e081d91f3de94ca084e72 snake-0.11-0.7.tar.bz2 +109e3fc662e9e6a132b60a67473c9839 snake-0.11-0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 15:40:45 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 28 Jul 2008 15:40:45 GMT Subject: rpms/cups/devel cups-getnameddest.patch, 1.1, 1.2 cups-lspp.patch, 1.34, 1.35 cups.spec, 1.428, 1.429 cups-CVE-2008-1722.patch, 1.2, NONE cups-str2750.patch, 1.1, NONE Message-ID: <200807281540.m6SFejZt016014@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15893 Modified Files: cups-getnameddest.patch cups-lspp.patch cups.spec Removed Files: cups-CVE-2008-1722.patch cups-str2750.patch Log Message: * Mon Jul 28 2008 Tim Waugh 1:1.3.8-1 - 1.3.8. cups-getnameddest.patch: Index: cups-getnameddest.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-getnameddest.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-getnameddest.patch 17 Jun 2008 10:17:02 -0000 1.1 +++ cups-getnameddest.patch 28 Jul 2008 15:40:15 -0000 1.2 @@ -1,6 +1,76 @@ -diff -up cups-1.3.7/cups/dest.c.getnameddest cups-1.3.7/cups/dest.c ---- cups-1.3.7/cups/dest.c.getnameddest 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.3.7/cups/dest.c 2008-06-17 11:00:50.000000000 +0100 +diff -up cups-1.3.8/berkeley/lpr.c.getnameddest cups-1.3.8/berkeley/lpr.c +--- cups-1.3.8/berkeley/lpr.c.getnameddest 2008-07-28 16:28:24.000000000 +0100 ++++ cups-1.3.8/berkeley/lpr.c 2008-07-28 16:28:24.000000000 +0100 +@@ -92,9 +92,7 @@ main(int argc, /* I - Number of comm + int num_copies; /* Number of copies per file */ + int num_files; /* Number of files to print */ + const char *files[1000]; /* Files to print */ +- int num_dests; /* Number of destinations */ +- cups_dest_t *dests, /* Destinations */ +- *dest; /* Selected destination */ ++ cups_dest_t *dest; /* Selected destination */ + int num_options; /* Number of options */ + cups_option_t *options; /* Options */ + int deletefile; /* Delete file after print? */ +@@ -112,8 +110,7 @@ main(int argc, /* I - Number of comm + + deletefile = 0; + printer = NULL; +- num_dests = 0; +- dests = NULL; ++ dest = NULL; + num_options = 0; + options = NULL; + num_files = 0; +@@ -282,10 +279,7 @@ main(int argc, /* I - Number of comm + if ((instance = strrchr(printer, '/')) != NULL) + *instance++ = '\0'; + +- if (num_dests == 0) +- num_dests = cupsGetDests(&dests); +- +- if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL) ++ if ((dest = cupsGetNamedDest(NULL, printer, instance)) != NULL) + { + for (j = 0; j < dest->num_options; j ++) + if (cupsGetOption(dest->options[j].name, num_options, +@@ -385,10 +379,7 @@ main(int argc, /* I - Number of comm + + if (printer == NULL) + { +- if (num_dests == 0) +- num_dests = cupsGetDests(&dests); +- +- if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) != NULL) ++ if ((dest = cupsGetNamedDest(NULL, NULL, NULL)) != NULL) + { + printer = dest->name; + +@@ -417,7 +408,7 @@ main(int argc, /* I - Number of comm + else + val = "LPDEST"; + +- if (printer && !cupsGetDest(printer, NULL, num_dests, dests)) ++ if (printer && !cupsGetNamedDest(NULL, printer, NULL)) + _cupsLangPrintf(stderr, + _("%s: Error - %s environment variable names " + "non-existent destination \"%s\"!\n"), +diff -up cups-1.3.8/cups/cups.h.getnameddest cups-1.3.8/cups/cups.h +--- cups-1.3.8/cups/cups.h.getnameddest 2008-07-11 23:48:49.000000000 +0100 ++++ cups-1.3.8/cups/cups.h 2008-07-28 16:28:24.000000000 +0100 +@@ -248,6 +248,9 @@ extern void cupsSetDefaultDest(const ch + int num_dests, + cups_dest_t *dests); + ++/**** New in CUPS 1.4 ****/ ++extern cups_dest_t *cupsGetNamedDest(http_t *http, const char *name, ++ const char *instance); + + # ifdef __cplusplus + } +diff -up cups-1.3.8/cups/dest.c.getnameddest cups-1.3.8/cups/dest.c +--- cups-1.3.8/cups/dest.c.getnameddest 2008-07-11 23:48:49.000000000 +0100 ++++ cups-1.3.8/cups/dest.c 2008-07-28 16:28:24.000000000 +0100 @@ -25,6 +25,7 @@ * server. * cupsGetDests2() - Get the list of destinations from the @@ -611,22 +681,20 @@ { dest->num_options = num_options; dest->options = options; -diff -up cups-1.3.7/cups/cups.h.getnameddest cups-1.3.7/cups/cups.h ---- cups-1.3.7/cups/cups.h.getnameddest 2008-02-20 00:32:58.000000000 +0000 -+++ cups-1.3.7/cups/cups.h 2008-06-17 11:05:32.000000000 +0100 -@@ -248,6 +248,9 @@ extern void cupsSetDefaultDest(const ch - int num_dests, - cups_dest_t *dests); - -+/**** New in CUPS 1.4 ****/ -+extern cups_dest_t *cupsGetNamedDest(http_t *http, const char *name, -+ const char *instance); - - # ifdef __cplusplus - } -diff -up cups-1.3.7/cups/Makefile.getnameddest cups-1.3.7/cups/Makefile ---- cups-1.3.7/cups/Makefile.getnameddest 2008-02-20 20:18:33.000000000 +0000 -+++ cups-1.3.7/cups/Makefile 2008-06-17 11:00:50.000000000 +0100 +diff -up cups-1.3.8/cups/libcups.exp.getnameddest cups-1.3.8/cups/libcups.exp +--- cups-1.3.8/cups/libcups.exp.getnameddest 2008-04-09 04:39:40.000000000 +0100 ++++ cups-1.3.8/cups/libcups.exp 2008-07-28 16:28:24.000000000 +0100 +@@ -114,6 +114,7 @@ _cupsGetFd + _cupsGetFile + _cupsGetJobs + _cupsGetJobs2 ++_cupsGetNamedDest + _cupsGetOption + _cupsGetPassword + _cupsGetPPD +diff -up cups-1.3.8/cups/Makefile.getnameddest cups-1.3.8/cups/Makefile +--- cups-1.3.8/cups/Makefile.getnameddest 2008-02-20 20:18:33.000000000 +0000 ++++ cups-1.3.8/cups/Makefile 2008-07-28 16:28:24.000000000 +0100 @@ -263,7 +263,7 @@ libcups.so.2 libcups.sl.2: $(LIBOBJS) # libcups.2.dylib # @@ -636,9 +704,9 @@ echo Linking $@... $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \ -install_name $(libdir)/$@ \ -diff -up cups-1.3.7/cups/testcups.c.getnameddest cups-1.3.7/cups/testcups.c ---- cups-1.3.7/cups/testcups.c.getnameddest 2008-01-14 22:12:58.000000000 +0000 -+++ cups-1.3.7/cups/testcups.c 2008-06-17 11:00:50.000000000 +0100 +diff -up cups-1.3.8/cups/testcups.c.getnameddest cups-1.3.8/cups/testcups.c +--- cups-1.3.8/cups/testcups.c.getnameddest 2008-07-11 23:48:49.000000000 +0100 ++++ cups-1.3.8/cups/testcups.c 2008-07-28 16:37:24.000000000 +0100 @@ -16,7 +16,8 @@ * * Contents: @@ -757,7 +825,7 @@ /* * cupsGetDest(printer) -@@ -80,20 +162,34 @@ main(int argc, /* I - Number of comm +@@ -79,20 +161,33 @@ main(int argc, /* I - Number of comm puts("PASS"); /* @@ -767,14 +835,15 @@ - fputs("cupsGetDest(NULL): ", stdout); + printf("cupsGetNamedDest(NULL, \"%s\", \"%s\"): ", dest->name, -+ dest->instance ? dest->instance : "(null)"); ++ dest->instance ? dest->instance : "(null)"); fflush(stdout); - if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) == NULL) + if ((named_dest = cupsGetNamedDest(NULL, dest->name, -+ dest->instance)) == NULL || ++ dest->instance)) == NULL || + !dests_equal(dest, named_dest)) { +- puts("FAIL"); + if (named_dest) + { + puts("FAIL (different values)"); @@ -783,9 +852,7 @@ + else + puts("FAIL (no destination)"); + -+ - status = 1; -- puts("FAIL"); + return (1); } else puts("PASS"); @@ -796,7 +863,7 @@ /* * cupsPrintFile() */ -@@ -171,5 +267,83 @@ main(int argc, /* I - Number of comm +@@ -169,5 +264,83 @@ main(int argc, /* I - Number of comm /* @@ -880,78 +947,9 @@ +/* * End of "$Id$". */ -diff -up cups-1.3.7/cups/libcups.exp.getnameddest cups-1.3.7/cups/libcups.exp ---- cups-1.3.7/cups/libcups.exp.getnameddest 2008-01-22 22:02:46.000000000 +0000 -+++ cups-1.3.7/cups/libcups.exp 2008-06-17 11:00:50.000000000 +0100 -@@ -113,6 +113,7 @@ _cupsGetFd - _cupsGetFile - _cupsGetJobs - _cupsGetJobs2 -+_cupsGetNamedDest - _cupsGetOption - _cupsGetPassword - _cupsGetPPD -diff -up cups-1.3.7/CHANGES.txt.getnameddest cups-1.3.7/CHANGES.txt -diff -up cups-1.3.7/berkeley/lpr.c.getnameddest cups-1.3.7/berkeley/lpr.c ---- cups-1.3.7/berkeley/lpr.c.getnameddest 2008-06-17 11:00:11.000000000 +0100 -+++ cups-1.3.7/berkeley/lpr.c 2008-06-17 11:00:50.000000000 +0100 -@@ -92,9 +92,7 @@ main(int argc, /* I - Number of comm - int num_copies; /* Number of copies per file */ - int num_files; /* Number of files to print */ - const char *files[1000]; /* Files to print */ -- int num_dests; /* Number of destinations */ -- cups_dest_t *dests, /* Destinations */ -- *dest; /* Selected destination */ -+ cups_dest_t *dest; /* Selected destination */ - int num_options; /* Number of options */ - cups_option_t *options; /* Options */ - int deletefile; /* Delete file after print? */ -@@ -112,8 +110,7 @@ main(int argc, /* I - Number of comm - - deletefile = 0; - printer = NULL; -- num_dests = 0; -- dests = NULL; -+ dest = NULL; - num_options = 0; - options = NULL; - num_files = 0; -@@ -282,10 +279,7 @@ main(int argc, /* I - Number of comm - if ((instance = strrchr(printer, '/')) != NULL) - *instance++ = '\0'; - -- if (num_dests == 0) -- num_dests = cupsGetDests(&dests); -- -- if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL) -+ if ((dest = cupsGetNamedDest(NULL, printer, instance)) != NULL) - { - for (j = 0; j < dest->num_options; j ++) - if (cupsGetOption(dest->options[j].name, num_options, -@@ -385,10 +379,7 @@ main(int argc, /* I - Number of comm - - if (printer == NULL) - { -- if (num_dests == 0) -- num_dests = cupsGetDests(&dests); -- -- if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) != NULL) -+ if ((dest = cupsGetNamedDest(NULL, NULL, NULL)) != NULL) - { - printer = dest->name; - -@@ -417,7 +408,7 @@ main(int argc, /* I - Number of comm - else - val = "LPDEST"; - -- if (printer && !cupsGetDest(printer, NULL, num_dests, dests)) -+ if (printer && !cupsGetNamedDest(NULL, printer, NULL)) - _cupsLangPrintf(stderr, - _("%s: Error - %s environment variable names " - "non-existent destination \"%s\"!\n"), -diff -up cups-1.3.7/systemv/lp.c.getnameddest cups-1.3.7/systemv/lp.c ---- cups-1.3.7/systemv/lp.c.getnameddest 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.3.7/systemv/lp.c 2008-06-17 11:00:50.000000000 +0100 +diff -up cups-1.3.8/systemv/lp.c.getnameddest cups-1.3.8/systemv/lp.c +--- cups-1.3.8/systemv/lp.c.getnameddest 2008-07-11 23:48:49.000000000 +0100 ++++ cups-1.3.8/systemv/lp.c 2008-07-28 16:28:24.000000000 +0100 @@ -73,9 +73,7 @@ main(int argc, /* I - Number of comm int num_copies; /* Number of copies per file */ int num_files; /* Number of files to print */ cups-lspp.patch: Index: cups-lspp.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- cups-lspp.patch 18 Jul 2008 12:12:59 -0000 1.34 +++ cups-lspp.patch 28 Jul 2008 15:40:15 -0000 1.35 @@ -1,6 +1,6 @@ -diff -up cups-1.3.7/config.h.in.lspp cups-1.3.7/config.h.in ---- cups-1.3.7/config.h.in.lspp 2008-01-07 18:26:57.000000000 +0000 -+++ cups-1.3.7/config.h.in 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/config.h.in.lspp cups-1.3.8/config.h.in +--- cups-1.3.8/config.h.in.lspp 2008-01-07 18:26:57.000000000 +0000 ++++ cups-1.3.8/config.h.in 2008-07-28 16:37:51.000000000 +0100 @@ -530,6 +530,13 @@ #undef HAVE_REMOVEFILE @@ -15,9 +15,9 @@ #endif /* !_CUPS_CONFIG_H_ */ /* -diff -up /dev/null cups-1.3.7/config-scripts/cups-lspp.m4 ---- /dev/null 2008-07-18 08:54:40.909125715 +0100 -+++ cups-1.3.7/config-scripts/cups-lspp.m4 2008-07-18 13:06:51.000000000 +0100 +diff -up /dev/null cups-1.3.8/config-scripts/cups-lspp.m4 +--- /dev/null 2008-07-28 15:45:57.127000670 +0100 ++++ cups-1.3.8/config-scripts/cups-lspp.m4 2008-07-28 16:37:51.000000000 +0100 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -55,9 +55,9 @@ + ;; + esac +fi -diff -up cups-1.3.7/configure.in.lspp cups-1.3.7/configure.in ---- cups-1.3.7/configure.in.lspp 2007-07-25 00:47:12.000000000 +0100 -+++ cups-1.3.7/configure.in 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/configure.in.lspp cups-1.3.8/configure.in +--- cups-1.3.8/configure.in.lspp 2007-07-25 00:47:12.000000000 +0100 ++++ cups-1.3.8/configure.in 2008-07-28 16:37:51.000000000 +0100 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) sinclude(config-scripts/cups-pdf.m4) sinclude(config-scripts/cups-scripting.m4) @@ -67,9 +67,9 @@ INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -diff -up cups-1.3.7/configure.lspp cups-1.3.7/configure ---- cups-1.3.7/configure.lspp 2008-07-18 13:07:30.000000000 +0100 -+++ cups-1.3.7/configure 2008-07-18 13:07:35.000000000 +0100 +diff -up cups-1.3.8/configure.lspp cups-1.3.8/configure +--- cups-1.3.8/configure.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/configure 2008-07-28 16:37:51.000000000 +0100 @@ -806,6 +806,8 @@ PHP PHPCONFIG PHPDIR @@ -87,7 +87,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -9647,10 +9650,10 @@ case "$uname" in +@@ -9680,10 +9683,10 @@ case "$uname" in ;; Linux* | GNU*) # Linux and GNU Hurd @@ -102,7 +102,7 @@ MAN8DIR=8 ;; *) -@@ -18413,6 +18416,412 @@ fi +@@ -18452,6 +18455,412 @@ fi @@ -515,7 +515,7 @@ INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -@@ -19306,8 +19715,8 @@ PHP!$PHP$ac_delim +@@ -19345,8 +19754,8 @@ PHP!$PHP$ac_delim PHPCONFIG!$PHPCONFIG$ac_delim PHPDIR!$PHPDIR$ac_delim PYTHON!$PYTHON$ac_delim @@ -526,7 +526,7 @@ _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -19349,11 +19758,13 @@ _ACEOF +@@ -19388,11 +19797,13 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -541,9 +541,9 @@ break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -diff -up cups-1.3.7/cups/cups.h.lspp cups-1.3.7/cups/cups.h ---- cups-1.3.7/cups/cups.h.lspp 2008-07-18 13:06:51.000000000 +0100 -+++ cups-1.3.7/cups/cups.h 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/cups/cups.h.lspp cups-1.3.8/cups/cups.h +--- cups-1.3.8/cups/cups.h.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/cups/cups.h 2008-07-28 16:37:51.000000000 +0100 @@ -15,6 +15,9 @@ * This file is subject to the Apple OS-Developed Software exception. */ @@ -567,9 +567,9 @@ /* * Types and structures... */ -diff -up cups-1.3.7/data/Makefile.lspp cups-1.3.7/data/Makefile ---- cups-1.3.7/data/Makefile.lspp 2007-10-10 23:00:43.000000000 +0100 -+++ cups-1.3.7/data/Makefile 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/data/Makefile.lspp cups-1.3.8/data/Makefile +--- cups-1.3.8/data/Makefile.lspp 2007-10-10 23:00:43.000000000 +0100 ++++ cups-1.3.8/data/Makefile 2008-07-28 16:37:51.000000000 +0100 @@ -25,7 +25,10 @@ BANNERS = \ secret \ standard \ @@ -582,9 +582,9 @@ CHARMAPS = \ euc-cn.txt \ -diff -up /dev/null cups-1.3.7/data/mls ---- /dev/null 2008-07-18 08:54:40.909125715 +0100 -+++ cups-1.3.7/data/mls 2008-07-18 13:06:51.000000000 +0100 +diff -up /dev/null cups-1.3.8/data/mls +--- /dev/null 2008-07-28 15:45:57.127000670 +0100 ++++ cups-1.3.8/data/mls 2008-07-28 16:37:51.000000000 +0100 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -847,9 +847,9 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/selinux ---- /dev/null 2008-07-18 08:54:40.909125715 +0100 -+++ cups-1.3.7/data/selinux 2008-07-18 13:06:51.000000000 +0100 +diff -up /dev/null cups-1.3.8/data/selinux +--- /dev/null 2008-07-28 15:45:57.127000670 +0100 ++++ cups-1.3.8/data/selinux 2008-07-28 16:37:51.000000000 +0100 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -1112,9 +1112,9 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.3.7/data/te ---- /dev/null 2008-07-18 08:54:40.909125715 +0100 -+++ cups-1.3.7/data/te 2008-07-18 13:06:51.000000000 +0100 +diff -up /dev/null cups-1.3.8/data/te +--- /dev/null 2008-07-28 15:45:57.127000670 +0100 ++++ cups-1.3.8/data/te 2008-07-28 16:37:51.000000000 +0100 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -1377,9 +1377,9 @@ +% End of "$Id$". +% +%%EOF -diff -up cups-1.3.7/filter/common.c.lspp cups-1.3.7/filter/common.c ---- cups-1.3.7/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.3.7/filter/common.c 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/filter/common.c.lspp cups-1.3.8/filter/common.c +--- cups-1.3.8/filter/common.c.lspp 2008-07-11 23:48:49.000000000 +0100 ++++ cups-1.3.8/filter/common.c 2008-07-28 16:37:51.000000000 +0100 @@ -30,6 +30,12 @@ * Include necessary headers... */ @@ -1548,9 +1548,9 @@ /* -diff -up cups-1.3.7/Makedefs.in.lspp cups-1.3.7/Makedefs.in ---- cups-1.3.7/Makedefs.in.lspp 2008-01-22 22:37:21.000000000 +0000 -+++ cups-1.3.7/Makedefs.in 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/Makedefs.in.lspp cups-1.3.8/Makedefs.in +--- cups-1.3.8/Makedefs.in.lspp 2008-01-22 22:37:21.000000000 +0000 ++++ cups-1.3.8/Makedefs.in 2008-07-28 16:37:51.000000000 +0100 @@ -134,7 +134,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@ LINKCUPS = @LINKCUPS@ $(SSLLIBS) @@ -1560,9 +1560,9 @@ OPTIM = @OPTIM@ OPTIONS = PAMLIBS = @PAMLIBS@ -diff -up cups-1.3.7/scheduler/client.c.lspp cups-1.3.7/scheduler/client.c ---- cups-1.3.7/scheduler/client.c.lspp 2008-02-12 00:20:32.000000000 +0000 -+++ cups-1.3.7/scheduler/client.c 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/client.c.lspp cups-1.3.8/scheduler/client.c +--- cups-1.3.8/scheduler/client.c.lspp 2008-07-11 23:48:49.000000000 +0100 ++++ cups-1.3.8/scheduler/client.c 2008-07-28 16:37:51.000000000 +0100 @@ -39,12 +39,14 @@ * pipe_command() - Pipe the output of a command to the remote client. * write_file() - Send a file via HTTP. @@ -1663,7 +1663,7 @@ status = HTTP_CONTINUE; -@@ -2011,6 +2077,67 @@ cupsdReadClient(cupsd_client_t *con) /* +@@ -2016,6 +2082,67 @@ cupsdReadClient(cupsd_client_t *con) /* fchmod(con->file, 0640); fchown(con->file, RunUser, Group); fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); @@ -1731,7 +1731,7 @@ } if (con->http.state != HTTP_POST_SEND) -@@ -4253,6 +4380,50 @@ make_certificate(cupsd_client_t *con) /* +@@ -4255,6 +4382,50 @@ make_certificate(cupsd_client_t *con) /* #endif /* HAVE_SSL */ @@ -1782,9 +1782,9 @@ /* * 'pipe_command()' - Pipe the output of a command to the remote client. */ -diff -up cups-1.3.7/scheduler/client.h.lspp cups-1.3.7/scheduler/client.h ---- cups-1.3.7/scheduler/client.h.lspp 2007-10-22 19:52:13.000000000 +0100 -+++ cups-1.3.7/scheduler/client.h 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/client.h.lspp cups-1.3.8/scheduler/client.h +--- cups-1.3.8/scheduler/client.h.lspp 2007-10-22 19:52:13.000000000 +0100 ++++ cups-1.3.8/scheduler/client.h 2008-07-28 16:37:51.000000000 +0100 @@ -17,6 +17,13 @@ # include #endif /* HAVE_AUTHORIZATION_H */ @@ -1820,9 +1820,9 @@ /* -diff -up cups-1.3.7/scheduler/conf.c.lspp cups-1.3.7/scheduler/conf.c ---- cups-1.3.7/scheduler/conf.c.lspp 2008-07-18 13:06:51.000000000 +0100 -+++ cups-1.3.7/scheduler/conf.c 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/conf.c.lspp cups-1.3.8/scheduler/conf.c +--- cups-1.3.8/scheduler/conf.c.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/scheduler/conf.c 2008-07-28 16:37:51.000000000 +0100 @@ -26,6 +26,7 @@ * read_configuration() - Read a configuration file. * read_location() - Read a definition. @@ -1888,7 +1888,7 @@ /* * See if the ServerName is an IP address... */ -@@ -885,11 +915,23 @@ cupsdReadConfiguration(void) +@@ -889,11 +919,23 @@ cupsdReadConfiguration(void) if (MaxActiveJobs > (MaxFDs / 3)) MaxActiveJobs = MaxFDs / 3; @@ -1913,7 +1913,7 @@ /* * Update the MaxClientsPerHost value, as needed... -@@ -3379,6 +3421,18 @@ read_policy(cups_file_t *fp, /* I - Con +@@ -3360,6 +3402,18 @@ read_policy(cups_file_t *fp, /* I - Con return (0); } @@ -1932,9 +1932,9 @@ /* * End of "$Id$". -diff -up cups-1.3.7/scheduler/conf.h.lspp cups-1.3.7/scheduler/conf.h ---- cups-1.3.7/scheduler/conf.h.lspp 2008-07-18 13:06:51.000000000 +0100 -+++ cups-1.3.7/scheduler/conf.h 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/conf.h.lspp cups-1.3.8/scheduler/conf.h +--- cups-1.3.8/scheduler/conf.h.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/scheduler/conf.h 2008-07-28 16:37:51.000000000 +0100 @@ -193,6 +193,12 @@ VAR char *ServerKey VALUE(NULL); /* Server key file */ # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ @@ -1958,18 +1958,18 @@ /* * Prototypes... -diff -up cups-1.3.7/scheduler/ipp.c.lspp cups-1.3.7/scheduler/ipp.c ---- cups-1.3.7/scheduler/ipp.c.lspp 2008-07-18 13:06:51.000000000 +0100 -+++ cups-1.3.7/scheduler/ipp.c 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/ipp.c.lspp cups-1.3.8/scheduler/ipp.c +--- cups-1.3.8/scheduler/ipp.c.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/scheduler/ipp.c 2008-07-28 16:39:08.000000000 +0100 @@ -36,6 +36,7 @@ * cancel_all_jobs() - Cancel all print jobs. * cancel_job() - Cancel a print job. * cancel_subscription() - Cancel a subscription. + * check_context() - Check the SELinux context for a user and job * check_quotas() - Check quotas for a printer and user. - * copy_attribute() - Copy a single attribute. - * copy_attrs() - Copy attributes from one request to another. -@@ -93,6 +94,9 @@ + * check_rss_recipient() - Check that we do not have a duplicate RSS + * feed URI. +@@ -95,6 +96,9 @@ * validate_user() - Validate the user for the request. */ @@ -1979,7 +1979,7 @@ /* * Include necessary headers... */ -@@ -116,6 +120,14 @@ extern int mbr_check_membership_by_id(uu +@@ -118,6 +122,14 @@ extern int mbr_check_membership_by_id(uu # endif /* HAVE_MEMBERSHIPPRIV_H */ #endif /* __APPLE__ */ @@ -1994,17 +1994,17 @@ /* * Local functions... -@@ -140,6 +152,9 @@ static void authenticate_job(cupsd_clien - static void cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri); +@@ -143,6 +155,9 @@ static void cancel_all_jobs(cupsd_client static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_subscription(cupsd_client_t *con, int id); + static int check_rss_recipient(const char *recipient); +#ifdef WITH_LSPP +static int check_context(cupsd_client_t *con, cupsd_job_t *job); +#endif /* WITH_LSPP */ static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr, int quickcopy); -@@ -1267,6 +1282,21 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1270,6 +1285,21 @@ add_job(cupsd_client_t *con, /* I - Cl int kbytes; /* Size of print file */ int i; /* Looping var */ int lowerpagerange; /* Page range bound */ @@ -2026,7 +2026,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1454,6 +1484,104 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1486,6 +1516,104 @@ add_job(cupsd_client_t *con, /* I - Cl ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, title = "Untitled"); @@ -2131,7 +2131,7 @@ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1462,6 +1590,32 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1494,6 +1622,32 @@ add_job(cupsd_client_t *con, /* I - Cl return (NULL); } @@ -2164,7 +2164,7 @@ job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | CUPS_PRINTER_REMOTE); job->attrs = con->request; -@@ -1668,6 +1822,29 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1699,6 +1853,29 @@ add_job(cupsd_client_t *con, /* I - Cl attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]); attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]); } @@ -2194,7 +2194,7 @@ job->job_sheets = attr; -@@ -1698,6 +1875,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1729,6 +1906,9 @@ add_job(cupsd_client_t *con, /* I - Cl "job-sheets=\"%s,none\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -2204,7 +2204,7 @@ } else if (attr->num_values == 2 && strcmp(attr->values[0].string.text, -@@ -1716,6 +1896,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1747,6 +1927,9 @@ add_job(cupsd_client_t *con, /* I - Cl "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -2214,7 +2214,7 @@ } else if (strcmp(attr->values[0].string.text, Classification) && strcmp(attr->values[0].string.text, "none") && -@@ -1736,6 +1919,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1767,6 +1950,9 @@ add_job(cupsd_client_t *con, /* I - Cl "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -2224,7 +2224,7 @@ } } else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1776,9 +1962,52 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1807,9 +1993,52 @@ add_job(cupsd_client_t *con, /* I - Cl "job-sheets=\"%s\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -2277,7 +2277,7 @@ /* * See if we need to add the starting sheet... */ -@@ -3391,6 +3620,103 @@ cancel_subscription( +@@ -3521,6 +3750,103 @@ check_rss_recipient( } @@ -2381,7 +2381,7 @@ /* * 'check_quotas()' - Check quotas for a printer and user. */ -@@ -3912,6 +4238,15 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4042,6 +4368,15 @@ copy_banner(cupsd_client_t *con, /* I - char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -2396,8 +2396,8 @@ + - cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)", -@@ -3946,6 +4281,82 @@ copy_banner(cupsd_client_t *con, /* I - + cupsdLogMessage(CUPSD_LOG_DEBUG2, +@@ -4077,6 +4412,82 @@ copy_banner(cupsd_client_t *con, /* I - fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); @@ -2480,7 +2480,7 @@ /* * Try the localized banner file under the subdirectory... -@@ -4040,6 +4451,24 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4171,6 +4582,24 @@ copy_banner(cupsd_client_t *con, /* I - else s = attrname; @@ -2505,7 +2505,7 @@ if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -5765,6 +6194,22 @@ get_job_attrs(cupsd_client_t *con, /* I +@@ -5938,6 +6367,22 @@ get_job_attrs(cupsd_client_t *con, /* I return; } @@ -2528,7 +2528,7 @@ /* * Copy attributes... */ -@@ -5970,6 +6415,11 @@ get_jobs(cupsd_client_t *con, /* I - C +@@ -6143,6 +6588,11 @@ get_jobs(cupsd_client_t *con, /* I - C if (count > 0) ippAddSeparator(con->response); @@ -2540,7 +2540,7 @@ count ++; cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count); -@@ -10042,6 +10492,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -10255,6 +10705,11 @@ validate_user(cupsd_job_t *job, /* I strlcpy(username, get_username(con), userlen); @@ -2552,9 +2552,9 @@ /* * Check the username against the owner... */ -diff -up cups-1.3.7/scheduler/job.c.lspp cups-1.3.7/scheduler/job.c ---- cups-1.3.7/scheduler/job.c.lspp 2008-07-18 13:06:51.000000000 +0100 -+++ cups-1.3.7/scheduler/job.c 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/job.c.lspp cups-1.3.8/scheduler/job.c +--- cups-1.3.8/scheduler/job.c.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/scheduler/job.c 2008-07-28 16:37:51.000000000 +0100 @@ -60,6 +60,9 @@ * update_job_attrs() - Update the job-printer-* attributes. */ @@ -2580,7 +2580,7 @@ /* * Local globals... -@@ -1100,6 +1111,23 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J +@@ -1136,6 +1147,23 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J return; } @@ -2604,7 +2604,7 @@ job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER); job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); -@@ -1453,6 +1481,13 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -1493,6 +1521,13 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J { char filename[1024]; /* Job control filename */ cups_file_t *fp; /* Job file */ @@ -2618,7 +2618,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -1471,6 +1506,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -1511,6 +1546,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J fchmod(cupsFileNumber(fp), 0600); fchown(cupsFileNumber(fp), RunUser, Group); @@ -2695,7 +2695,7 @@ job->attrs->state = IPP_IDLE; if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -2484,6 +2589,21 @@ start_job(cupsd_job_t *job, /* I - +@@ -2485,6 +2590,21 @@ start_job(cupsd_job_t *job, /* I - /* RIP_MAX_CACHE env variable */ static char *options = NULL;/* Full list of options */ static int optlength = 0; /* Length of option buffer */ @@ -2717,7 +2717,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d", -@@ -2739,6 +2859,106 @@ start_job(cupsd_job_t *job, /* I - +@@ -2756,6 +2876,106 @@ start_job(cupsd_job_t *job, /* I - fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK); } @@ -2824,7 +2824,7 @@ /* * Determine if we are printing a banner page or not... */ -@@ -2883,6 +3103,18 @@ start_job(cupsd_job_t *job, /* I - +@@ -2904,6 +3124,18 @@ start_job(cupsd_job_t *job, /* I - banner_page) continue; @@ -2843,7 +2843,7 @@ /* * Otherwise add them to the list... */ -@@ -3125,6 +3357,67 @@ start_job(cupsd_job_t *job, /* I - +@@ -3146,6 +3378,67 @@ start_job(cupsd_job_t *job, /* I - } } @@ -2911,9 +2911,9 @@ if (Classification && !banner_page) { if ((attr = ippFindAttribute(job->attrs, "job-sheets", -diff -up cups-1.3.7/scheduler/job.h.lspp cups-1.3.7/scheduler/job.h ---- cups-1.3.7/scheduler/job.h.lspp 2008-01-16 22:20:33.000000000 +0000 -+++ cups-1.3.7/scheduler/job.h 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/job.h.lspp cups-1.3.8/scheduler/job.h +--- cups-1.3.8/scheduler/job.h.lspp 2008-01-16 22:20:33.000000000 +0000 ++++ cups-1.3.8/scheduler/job.h 2008-07-28 16:37:51.000000000 +0100 @@ -13,6 +13,13 @@ * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -2939,9 +2939,9 @@ } cupsd_job_t; -diff -up cups-1.3.7/scheduler/main.c.lspp cups-1.3.7/scheduler/main.c ---- cups-1.3.7/scheduler/main.c.lspp 2008-07-18 13:06:51.000000000 +0100 -+++ cups-1.3.7/scheduler/main.c 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/main.c.lspp cups-1.3.8/scheduler/main.c +--- cups-1.3.8/scheduler/main.c.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/scheduler/main.c 2008-07-28 16:37:51.000000000 +0100 @@ -35,6 +35,8 @@ * usage() - Show scheduler usage. */ @@ -3009,9 +3009,9 @@ return (!stop_scheduler); } -diff -up cups-1.3.7/scheduler/printers.c.lspp cups-1.3.7/scheduler/printers.c ---- cups-1.3.7/scheduler/printers.c.lspp 2008-07-18 13:06:51.000000000 +0100 -+++ cups-1.3.7/scheduler/printers.c 2008-07-18 13:06:51.000000000 +0100 +diff -up cups-1.3.8/scheduler/printers.c.lspp cups-1.3.8/scheduler/printers.c +--- cups-1.3.8/scheduler/printers.c.lspp 2008-07-28 16:37:51.000000000 +0100 ++++ cups-1.3.8/scheduler/printers.c 2008-07-28 16:37:51.000000000 +0100 @@ -51,6 +51,8 @@ * printing desktop tools. */ @@ -3032,7 +3032,7 @@ /* * 'cupsdAddPrinter()' - Add a printer to the system. -@@ -1817,6 +1823,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -1846,6 +1852,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) { /* No authentication */ "none" }; @@ -3046,7 +3046,7 @@ DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -1960,6 +1973,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -1989,6 +2002,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) attr->values[1].string.text = _cupsStrAlloc(Classification ? Classification : p->job_sheets[1]); } Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.428 retrieving revision 1.429 diff -u -r1.428 -r1.429 --- cups.spec 18 Jul 2008 12:12:59 -0000 1.428 +++ cups.spec 28 Jul 2008 15:40:15 -0000 1.429 @@ -6,8 +6,8 @@ Summary: Common Unix Printing System Name: cups -Version: 1.3.7 -Release: 13%{?svn:.svn%{svn}}%{?dist} +Version: 1.3.8 +Release: 1%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 @@ -40,14 +40,12 @@ Patch15: cups-peercred.patch Patch16: cups-pid.patch Patch17: cups-foomatic-recommended.patch -Patch18: cups-str2750.patch Patch19: cups-eggcups.patch Patch20: cups-getpass.patch Patch21: cups-driverd-timeout.patch Patch22: cups-strict-ppd-line-length.patch Patch23: cups-logrotate.patch Patch25: cups-usb-paperout.patch -Patch30: cups-CVE-2008-1722.patch Patch31: cups-getnameddest.patch Patch100: cups-lspp.patch Epoch: 1 @@ -163,14 +161,12 @@ %patch15 -p1 -b .peercred %patch16 -p1 -b .pid %patch17 -p1 -b .foomatic-recommended -%patch18 -p1 -b .str2750 %patch19 -p1 -b .eggcups %patch20 -p1 -b .getpass %patch21 -p1 -b .driverd-timeout %patch22 -p1 -b .strict-ppd-line-length %patch23 -p1 -b .logrotate %patch25 -p1 -b .usb-paperout -%patch30 -p1 -b .CVE-2008-1722 %patch31 -p1 -b .getnameddest %if %lspp @@ -445,6 +441,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Mon Jul 28 2008 Tim Waugh 1:1.3.8-1 +- 1.3.8. + * Fri Jul 18 2008 Tim Waugh - Removed autoconf requirement by applying autoconf-generated changes to patches that caused them. Affected patches: cups-lspp. --- cups-CVE-2008-1722.patch DELETED --- --- cups-str2750.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 15:49:07 2008 From: fedora-extras-commits at redhat.com (James Laska (jlaska)) Date: Mon, 28 Jul 2008 15:49:07 GMT Subject: rpms/snake/F-9 import.log, NONE, 1.1 .cvsignore, 1.7, 1.8 snake.spec, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <200807281549.m6SFn7ZJ017091@cvs-int.fedora.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16989/F-9 Modified Files: .cvsignore snake.spec sources Added Files: import.log Log Message: Update to snake-0.11-0.8 --- NEW FILE import.log --- snake-0_11-0_8_fc9:F-9:snake-0.11-0.8.fc9.src.rpm:1217259960 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Jun 2008 17:47:11 -0000 1.7 +++ .cvsignore 28 Jul 2008 15:48:37 -0000 1.8 @@ -1 +1 @@ -snake-0.11-0.6.tar.bz2 +snake-0.11-0.8.tar.bz2 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-9/snake.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- snake.spec 16 Jun 2008 17:47:11 -0000 1.14 +++ snake.spec 28 Jul 2008 15:48:37 -0000 1.15 @@ -4,7 +4,7 @@ Name: snake Summary: Smart Network Automated Kickstart Environment Version: 0.11 -%define rel 0.6 +%define rel 0.8 Release: %{rel}%{?dist} Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2 License: GPLv2+ @@ -135,6 +135,15 @@ %changelog +* Mon Jul 28 2008 James Laska 0.11-0.8 +- ticket#59 - snake-install-tui will auto-register an unregistered system when + using server-side kickstarts +- ticket#57 - Fixed snake-install -c argument handling +- Enable 'writefp' support for python templates + +* Tue Jun 17 2008 James Laska 0.11-0.7 +- ticket#56 - Fixed translate.py traceback for older python + * Tue Jun 13 2008 James Laska 0.11-0.6 - ticket#37 - snake-server support for hosting http,ftp and nfs kickstarts - ticket#42 - snake/tui.py - add ksmethod selection screen Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 16 Jun 2008 17:47:11 -0000 1.15 +++ sources 28 Jul 2008 15:48:37 -0000 1.16 @@ -1 +1 @@ -a05470cd7339677a27f77c396ab4462b snake-0.11-0.6.tar.bz2 +109e3fc662e9e6a132b60a67473c9839 snake-0.11-0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 15:54:47 2008 From: fedora-extras-commits at redhat.com (James Laska (jlaska)) Date: Mon, 28 Jul 2008 15:54:47 GMT Subject: rpms/snake/F-8 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 snake.spec, 1.12, 1.13 sources, 1.13, 1.14 Message-ID: <200807281554.m6SFslx3018060@cvs-int.fedora.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17946/F-8 Modified Files: .cvsignore snake.spec sources Added Files: import.log Log Message: Update to snake-0.11-0.8 --- NEW FILE import.log --- snake-0_11-0_8_fc9:F-8:snake-0.11-0.8.fc9.src.rpm:1217260292 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Jun 2008 18:01:23 -0000 1.6 +++ .cvsignore 28 Jul 2008 15:54:17 -0000 1.7 @@ -1 +1 @@ -snake-0.11-0.6.tar.bz2 +snake-0.11-0.8.tar.bz2 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-8/snake.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- snake.spec 16 Jun 2008 18:01:23 -0000 1.12 +++ snake.spec 28 Jul 2008 15:54:17 -0000 1.13 @@ -4,7 +4,7 @@ Name: snake Summary: Smart Network Automated Kickstart Environment Version: 0.11 -%define rel 0.6 +%define rel 0.8 Release: %{rel}%{?dist} Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2 License: GPLv2+ @@ -135,6 +135,15 @@ %changelog +* Mon Jul 28 2008 James Laska 0.11-0.8 +- ticket#59 - snake-install-tui will auto-register an unregistered system when + using server-side kickstarts +- ticket#57 - Fixed snake-install -c argument handling +- Enable 'writefp' support for python templates + +* Tue Jun 17 2008 James Laska 0.11-0.7 +- ticket#56 - Fixed translate.py traceback for older python + * Tue Jun 13 2008 James Laska 0.11-0.6 - ticket#37 - snake-server support for hosting http,ftp and nfs kickstarts - ticket#42 - snake/tui.py - add ksmethod selection screen Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 16 Jun 2008 18:01:23 -0000 1.13 +++ sources 28 Jul 2008 15:54:17 -0000 1.14 @@ -1 +1 @@ -a05470cd7339677a27f77c396ab4462b snake-0.11-0.6.tar.bz2 +109e3fc662e9e6a132b60a67473c9839 snake-0.11-0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 16:13:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:13:48 GMT Subject: rpms/libasyncns - New directory Message-ID: <200807281613.m6SGDmkc025662@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libasyncns In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI25629/rpms/libasyncns Log Message: Directory /cvs/extras/rpms/libasyncns added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 16:13:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:13:48 GMT Subject: rpms/libasyncns Makefile,NONE,1.1 Message-ID: <200807281613.m6SGDmPZ025699@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libasyncns In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI25629/rpms/libasyncns Added Files: Makefile Log Message: Setup of module libasyncns --- NEW FILE Makefile --- # Top level Makefile for module libasyncns all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 28 16:13:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:13:48 GMT Subject: rpms/libasyncns/devel - New directory Message-ID: <200807281613.m6SGDmUf025676@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libasyncns/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI25629/rpms/libasyncns/devel Log Message: Directory /cvs/extras/rpms/libasyncns/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 16:13:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:13:49 GMT Subject: rpms/libasyncns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807281613.m6SGDn0v025714@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libasyncns/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI25629/rpms/libasyncns/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libasyncns --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libasyncns # $Id: Makefile,v 1.1 2008/07/28 16:13:49 kevin Exp $ NAME := libasyncns SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 28 16:13:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 16:13:39 +0000 Subject: [pkgdb] libasyncns (Fedora, devel) updated by kevin Message-ID: <20080728161339.C98041AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libasyncns (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libasyncns From fedora-extras-commits at redhat.com Mon Jul 28 16:13:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 16:13:36 +0000 Subject: [pkgdb] libasyncns was added for lennart Message-ID: <20080728161337.2287A1AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libasyncns with summary Asynchronous Name Service Library Kevin Fenzi (kevin) has approved Package libasyncns Kevin Fenzi (kevin) has added a Fedora devel branch for libasyncns with an owner of lennart Kevin Fenzi (kevin) has approved libasyncns in Fedora devel Kevin Fenzi (kevin) has approved Package libasyncns Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libasyncns (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libasyncns (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libasyncns (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on libasyncns (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on libasyncns (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on libasyncns (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libasyncns From fedora-extras-commits at redhat.com Mon Jul 28 16:14:38 2008 From: fedora-extras-commits at redhat.com (James Laska (jlaska)) Date: Mon, 28 Jul 2008 16:14:38 GMT Subject: rpms/snake/devel .cvsignore, 1.7, 1.8 import.log, 1.2, 1.3 snake.spec, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <200807281614.m6SGEc3g025801@cvs-int.fedora.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25767/devel Modified Files: .cvsignore import.log snake.spec sources Log Message: Update to snake-0.11-0.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Jul 2008 15:38:07 -0000 1.7 +++ .cvsignore 28 Jul 2008 16:14:08 -0000 1.8 @@ -1 +1 @@ -snake-0.11-0.8.tar.bz2 +snake-0.11-0.9.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 28 Jul 2008 15:38:07 -0000 1.2 +++ import.log 28 Jul 2008 16:14:08 -0000 1.3 @@ -1,2 +1,3 @@ snake-0_11-0_7_fc9:HEAD:snake-0.11-0.7.fc9.src.rpm:1213711505 snake-0_11-0_8_fc9:HEAD:snake-0.11-0.8.fc9.src.rpm:1217259365 +snake-0_11-0_9_fc9:HEAD:snake-0.11-0.9.fc9.src.rpm:1217261529 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- snake.spec 28 Jul 2008 15:38:07 -0000 1.14 +++ snake.spec 28 Jul 2008 16:14:08 -0000 1.15 @@ -4,7 +4,7 @@ Name: snake Summary: Smart Network Automated Kickstart Environment Version: 0.11 -%define rel 0.8 +%define rel 0.9 Release: %{rel}%{?dist} Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2 License: GPLv2+ @@ -123,6 +123,7 @@ %config(noreplace) %{_sysconfdir}/snake.conf %config(noreplace) %{_sysconfdir}/logrotate.d/snake-server %{_sysconfdir}/init.d/snake-server +%{python_sitelib}/snake/anamon.py* %{python_sitelib}/snake/compose.py* %{python_sitelib}/snake/config.py* %{python_sitelib}/snake/dbushelper.py* @@ -135,6 +136,9 @@ %changelog +* Mon Jul 28 2008 James Laska 0.11-0.9 +- ticket#60 - Added snake/anamon.py to packaging + * Mon Jul 28 2008 James Laska 0.11-0.8 - ticket#59 - snake-install-tui will auto-register an unregistered system when using server-side kickstarts Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 28 Jul 2008 15:38:07 -0000 1.15 +++ sources 28 Jul 2008 16:14:08 -0000 1.16 @@ -1 +1 @@ -109e3fc662e9e6a132b60a67473c9839 snake-0.11-0.8.tar.bz2 +b07ad8c46cc14bd526b3e42332091f92 snake-0.11-0.9.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 16:14:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 16:14:47 +0000 Subject: [pkgdb] drupal-service_links was added for limb Message-ID: <20080728161448.0796A1AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package drupal-service_links with summary Enables admins to add links to a number of sites Kevin Fenzi (kevin) has approved Package drupal-service_links Kevin Fenzi (kevin) has added a Fedora devel branch for drupal-service_links with an owner of limb Kevin Fenzi (kevin) has approved drupal-service_links in Fedora devel Kevin Fenzi (kevin) has approved Package drupal-service_links Kevin Fenzi (kevin) has set commit to Approved for cvsextras on drupal-service_links (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on drupal-service_links (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on drupal-service_links (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on drupal-service_links (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on drupal-service_links (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on drupal-service_links (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/drupal-service_links From fedora-extras-commits at redhat.com Mon Jul 28 16:15:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:15:00 GMT Subject: rpms/drupal-service_links - New directory Message-ID: <200807281615.m6SGF0EP025915@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-service_links In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25887/rpms/drupal-service_links Log Message: Directory /cvs/extras/rpms/drupal-service_links added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 16:15:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:15:00 GMT Subject: rpms/drupal-service_links Makefile,NONE,1.1 Message-ID: <200807281615.m6SGF0aX025952@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-service_links In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25887/rpms/drupal-service_links Added Files: Makefile Log Message: Setup of module drupal-service_links --- NEW FILE Makefile --- # Top level Makefile for module drupal-service_links all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 28 16:15:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:15:00 GMT Subject: rpms/drupal-service_links/devel - New directory Message-ID: <200807281615.m6SGF0ts025929@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-service_links/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25887/rpms/drupal-service_links/devel Log Message: Directory /cvs/extras/rpms/drupal-service_links/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 16:15:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:15:01 GMT Subject: rpms/drupal-service_links/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807281615.m6SGF1D7025967@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-service_links/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25887/rpms/drupal-service_links/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module drupal-service_links --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: drupal-service_links # $Id: Makefile,v 1.1 2008/07/28 16:15:01 kevin Exp $ NAME := drupal-service_links SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 28 16:14:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 16:14:52 +0000 Subject: [pkgdb] drupal-service_links (Fedora, devel) updated by kevin Message-ID: <20080728161453.BBEC31AD10E@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on drupal-service_links (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/drupal-service_links From fedora-extras-commits at redhat.com Mon Jul 28 16:15:09 2008 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Mon, 28 Jul 2008 16:15:09 GMT Subject: rpms/gmime/F-9 .cvsignore, 1.15, 1.16 gmime.spec, 1.36, 1.37 sources, 1.15, 1.16 Message-ID: <200807281615.m6SGF9Ic026035@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/gmime/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25795 Modified Files: .cvsignore gmime.spec sources Log Message: - Update to 2.2.21, fixing bug 448182, gnome bugs: #534301, #533331, and more. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gmime/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 20 Mar 2008 17:03:04 -0000 1.15 +++ .cvsignore 28 Jul 2008 16:14:39 -0000 1.16 @@ -1 +1 @@ -gmime-2.2.18.tar.bz2 +gmime-2.2.21.tar.bz2 Index: gmime.spec =================================================================== RCS file: /cvs/extras/rpms/gmime/F-9/gmime.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gmime.spec 20 Mar 2008 17:03:04 -0000 1.36 +++ gmime.spec 28 Jul 2008 16:14:39 -0000 1.37 @@ -1,5 +1,5 @@ Name: gmime -Version: 2.2.18 +Version: 2.2.21 Release: 1%{?dist} Summary: Library for creating and parsing MIME messages @@ -121,6 +121,9 @@ %endif %changelog +* Mon Jul 28 2008 Pawel Salek - 2.2.21-1 +- Update to 2.2.21, fixing bug 448182, gnome bugs: #534301, #533331, and more. + * Thu Mar 20 2008 Matthias Clasen - 2.2.18-1 - Update to 2.2.18 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gmime/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 20 Mar 2008 17:03:04 -0000 1.15 +++ sources 28 Jul 2008 16:14:39 -0000 1.16 @@ -1 +1 @@ -09461bfb5d8b05e302c1df388b0ed89b gmime-2.2.18.tar.bz2 +16acf7ed0287f4aae419ad71e737762f gmime-2.2.21.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 16:14:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 16:14:52 +0000 Subject: [pkgdb] drupal-service_links (Fedora, 9) updated by kevin Message-ID: <20080728161455.2D99A1AD0F9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for drupal-service_links Kevin Fenzi (kevin) has set commit to Approved for cvsextras on drupal-service_links (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for cvsextras on drupal-service_links (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on drupal-service_links (Fedora 9) Kevin Fenzi (kevin) Approved cvsextras for commit access on drupal-service_links (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/drupal-service_links From fedora-extras-commits at redhat.com Mon Jul 28 16:16:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:16:15 GMT Subject: rpms/libatasmart - New directory Message-ID: <200807281616.m6SGGFiQ026125@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libatasmart In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB26096/rpms/libatasmart Log Message: Directory /cvs/extras/rpms/libatasmart added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 16:16:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:16:15 GMT Subject: rpms/libatasmart/devel - New directory Message-ID: <200807281616.m6SGGF1L026139@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libatasmart/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB26096/rpms/libatasmart/devel Log Message: Directory /cvs/extras/rpms/libatasmart/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 16:16:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:16:15 GMT Subject: rpms/libatasmart Makefile,NONE,1.1 Message-ID: <200807281616.m6SGGFXe026164@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libatasmart In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB26096/rpms/libatasmart Added Files: Makefile Log Message: Setup of module libatasmart --- NEW FILE Makefile --- # Top level Makefile for module libatasmart all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 28 16:16:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 16:16:00 +0000 Subject: [pkgdb] libatasmart was added for lennart Message-ID: <20080728161601.256141AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libatasmart with summary ATA S.M.A.R.T. Disk Health Monitoring Library Kevin Fenzi (kevin) has approved Package libatasmart Kevin Fenzi (kevin) has added a Fedora devel branch for libatasmart with an owner of lennart Kevin Fenzi (kevin) has approved libatasmart in Fedora devel Kevin Fenzi (kevin) has approved Package libatasmart Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libatasmart (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libatasmart (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libatasmart (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on libatasmart (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on libatasmart (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on libatasmart (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libatasmart From fedora-extras-commits at redhat.com Mon Jul 28 16:16:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 16:16:16 GMT Subject: rpms/libatasmart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807281616.m6SGGGNx026179@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libatasmart/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB26096/rpms/libatasmart/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libatasmart --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libatasmart # $Id: Makefile,v 1.1 2008/07/28 16:16:16 kevin Exp $ NAME := libatasmart SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 28 16:16:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 16:16:01 +0000 Subject: [pkgdb] libatasmart (Fedora, devel) updated by kevin Message-ID: <20080728161601.CC7AA1AD0F8@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libatasmart (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libatasmart From fedora-extras-commits at redhat.com Mon Jul 28 16:21:05 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 28 Jul 2008 16:21:05 GMT Subject: rpms/cups/devel cups.spec,1.429,1.430 Message-ID: <200807281621.m6SGL5ZC026313@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26282 Modified Files: cups.spec Log Message: Renumber patches. Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- cups.spec 28 Jul 2008 15:40:15 -0000 1.429 +++ cups.spec 28 Jul 2008 16:20:35 -0000 1.430 @@ -25,28 +25,28 @@ Source13: pdftops.conf Source14: textonly.filter Source15: textonly.ppd -Patch2: cups-no-gzip-man.patch -Patch3: cups-1.1.16-system-auth.patch -Patch4: cups-multilib.patch -Patch5: cups-ext.patch -Patch6: cups-includeifexists.patch -Patch7: cups-banners.patch -Patch8: cups-serverbin-compat.patch -Patch10: cups-no-export-ssllibs.patch -Patch11: cups-paps.patch -Patch12: cups-wbuffer.patch -Patch13: cups-direct-usb.patch -Patch14: cups-lpr-help.patch -Patch15: cups-peercred.patch -Patch16: cups-pid.patch -Patch17: cups-foomatic-recommended.patch -Patch19: cups-eggcups.patch -Patch20: cups-getpass.patch -Patch21: cups-driverd-timeout.patch -Patch22: cups-strict-ppd-line-length.patch -Patch23: cups-logrotate.patch -Patch25: cups-usb-paperout.patch -Patch31: cups-getnameddest.patch +Patch1: cups-no-gzip-man.patch +Patch2: cups-1.1.16-system-auth.patch +Patch3: cups-multilib.patch +Patch4: cups-ext.patch +Patch5: cups-includeifexists.patch +Patch6: cups-banners.patch +Patch7: cups-serverbin-compat.patch +Patch8: cups-no-export-ssllibs.patch +Patch9: cups-paps.patch +Patch10: cups-wbuffer.patch +Patch11: cups-direct-usb.patch +Patch12: cups-lpr-help.patch +Patch13: cups-peercred.patch +Patch14: cups-pid.patch +Patch15: cups-foomatic-recommended.patch +Patch16: cups-eggcups.patch +Patch17: cups-getpass.patch +Patch18: cups-driverd-timeout.patch +Patch19: cups-strict-ppd-line-length.patch +Patch20: cups-logrotate.patch +Patch21: cups-usb-paperout.patch +Patch22: cups-getnameddest.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -146,28 +146,28 @@ %prep %setup -q -n %{name}-%{version}%{?svn:svn-r%{svn}} -%patch2 -p1 -b .no-gzip-man -%patch3 -p1 -b .system-auth -%patch4 -p1 -b .multilib -%patch5 -p1 -b .ext -%patch6 -p1 -b .includeifexists -%patch7 -p1 -b .banners -%patch8 -p1 -b .serverbin-compat -%patch10 -p1 -b .no-export-ssllibs -%patch11 -p1 -b .paps -%patch12 -p1 -b .wbuffer -%patch13 -p1 -b .direct-usb -%patch14 -p1 -b .lpr-help -%patch15 -p1 -b .peercred -%patch16 -p1 -b .pid -%patch17 -p1 -b .foomatic-recommended -%patch19 -p1 -b .eggcups -%patch20 -p1 -b .getpass -%patch21 -p1 -b .driverd-timeout -%patch22 -p1 -b .strict-ppd-line-length -%patch23 -p1 -b .logrotate -%patch25 -p1 -b .usb-paperout -%patch31 -p1 -b .getnameddest +%patch1 -p1 -b .no-gzip-man +%patch2 -p1 -b .system-auth +%patch3 -p1 -b .multilib +%patch4 -p1 -b .ext +%patch5 -p1 -b .includeifexists +%patch6 -p1 -b .banners +%patch7 -p1 -b .serverbin-compat +%patch8 -p1 -b .no-export-ssllibs +%patch9 -p1 -b .paps +%patch10 -p1 -b .wbuffer +%patch11 -p1 -b .direct-usb +%patch12 -p1 -b .lpr-help +%patch13 -p1 -b .peercred +%patch14 -p1 -b .pid +%patch15 -p1 -b .foomatic-recommended +%patch16 -p1 -b .eggcups +%patch17 -p1 -b .getpass +%patch18 -p1 -b .driverd-timeout +%patch19 -p1 -b .strict-ppd-line-length +%patch20 -p1 -b .logrotate +%patch21 -p1 -b .usb-paperout +%patch22 -p1 -b .getnameddest %if %lspp %patch100 -p1 -b .lspp From fedora-extras-commits at redhat.com Mon Jul 28 16:23:20 2008 From: fedora-extras-commits at redhat.com (James Laska (jlaska)) Date: Mon, 28 Jul 2008 16:23:20 GMT Subject: rpms/snake/F-9 .cvsignore, 1.8, 1.9 import.log, 1.1, 1.2 snake.spec, 1.15, 1.16 sources, 1.16, 1.17 Message-ID: <200807281623.m6SGNKUi026476@cvs-int.fedora.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26430/F-9 Modified Files: .cvsignore import.log snake.spec sources Log Message: Update to snake-0.11-0.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 28 Jul 2008 15:48:37 -0000 1.8 +++ .cvsignore 28 Jul 2008 16:22:50 -0000 1.9 @@ -1 +1 @@ -snake-0.11-0.8.tar.bz2 +snake-0.11-0.9.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jul 2008 15:48:37 -0000 1.1 +++ import.log 28 Jul 2008 16:22:50 -0000 1.2 @@ -1 +1,2 @@ snake-0_11-0_8_fc9:F-9:snake-0.11-0.8.fc9.src.rpm:1217259960 +snake-0_11-0_9_fc9:F-9:snake-0.11-0.9.fc9.src.rpm:1217261970 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-9/snake.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- snake.spec 28 Jul 2008 15:48:37 -0000 1.15 +++ snake.spec 28 Jul 2008 16:22:50 -0000 1.16 @@ -4,7 +4,7 @@ Name: snake Summary: Smart Network Automated Kickstart Environment Version: 0.11 -%define rel 0.8 +%define rel 0.9 Release: %{rel}%{?dist} Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2 License: GPLv2+ @@ -123,6 +123,7 @@ %config(noreplace) %{_sysconfdir}/snake.conf %config(noreplace) %{_sysconfdir}/logrotate.d/snake-server %{_sysconfdir}/init.d/snake-server +%{python_sitelib}/snake/anamon.py* %{python_sitelib}/snake/compose.py* %{python_sitelib}/snake/config.py* %{python_sitelib}/snake/dbushelper.py* @@ -135,6 +136,9 @@ %changelog +* Mon Jul 28 2008 James Laska 0.11-0.9 +- ticket#60 - Added snake/anamon.py to packaging + * Mon Jul 28 2008 James Laska 0.11-0.8 - ticket#59 - snake-install-tui will auto-register an unregistered system when using server-side kickstarts Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 28 Jul 2008 15:48:37 -0000 1.16 +++ sources 28 Jul 2008 16:22:50 -0000 1.17 @@ -1 +1 @@ -109e3fc662e9e6a132b60a67473c9839 snake-0.11-0.8.tar.bz2 +b07ad8c46cc14bd526b3e42332091f92 snake-0.11-0.9.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 16:32:19 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 28 Jul 2008 16:32:19 GMT Subject: rpms/cups/devel .cvsignore,1.40,1.41 sources,1.43,1.44 Message-ID: <200807281632.m6SGWJQF027082@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27028 Modified Files: .cvsignore sources Log Message: Include new tarball. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 2 Apr 2008 11:52:07 -0000 1.40 +++ .cvsignore 28 Jul 2008 16:31:49 -0000 1.41 @@ -32,3 +32,4 @@ cups-1.3.5-source.tar.bz2 cups-1.3.6-source.tar.bz2 cups-1.3.7-source.tar.bz2 +cups-1.3.8-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 2 Apr 2008 11:52:07 -0000 1.43 +++ sources 28 Jul 2008 16:31:49 -0000 1.44 @@ -1,2 +1,2 @@ b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz -db4a45a17104f10f3ee599d88267c9e5 cups-1.3.7-source.tar.bz2 +84e09577d673b212f605dd09caee456c cups-1.3.8-source.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 16:33:30 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Mon, 28 Jul 2008 16:33:30 GMT Subject: rpms/netbsd-iscsi/devel netbsd-iscsi.spec,1.2,1.3 Message-ID: <200807281633.m6SGXUAw027276@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/netbsd-iscsi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27183 Modified Files: netbsd-iscsi.spec Log Message: * Mon Jul 28 2008 Lubomir Rintel 20071205-3 - Init script (thanks to Saturo Sato) Index: netbsd-iscsi.spec =================================================================== RCS file: /cvs/pkgs/rpms/netbsd-iscsi/devel/netbsd-iscsi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- netbsd-iscsi.spec 19 Feb 2008 11:27:47 -0000 1.2 +++ netbsd-iscsi.spec 28 Jul 2008 16:33:00 -0000 1.3 @@ -1,13 +1,22 @@ Name: netbsd-iscsi Version: 20071205 -Release: 2%{?dist} +Release: 3%{?dist} Summary: User-space implementation of iSCSI target from NetBSD project Group: System Environment/Daemons License: BSD URL: http://NetBSD.org/ Source0: http://www.alistaircrooks.co.uk/src/netbsd-iscsi-%{version}.tar.gz +Source1: netbsd-iscsi.sysvinit +Source2: netbsd-iscsi.sysconfig Patch0: netbsd-iscsi-20071205-linux.patch +Patch1: netbsd-iscsi-20071205-utf8.patch + +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires(postun): initscripts + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,6 +28,7 @@ %prep %setup -q %patch0 -p1 -b .linux +%patch1 -p1 -b .utf8 %build @@ -32,23 +42,47 @@ install -d $RPM_BUILD_ROOT%{_sbindir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/iscsi +install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -d $RPM_BUILD_ROOT%{_mandir}/man8 install -d $RPM_BUILD_ROOT%{_mandir}/man5 +install -d $RPM_BUILD_ROOT%{_initrddir} install -m 755 src/iscsi-target $RPM_BUILD_ROOT%{_sbindir} install -m 644 src/iscsi-target.8 $RPM_BUILD_ROOT%{_mandir}/man8 install -m 644 src/targets $RPM_BUILD_ROOT%{_sysconfdir}/iscsi install -m 644 src/targets.5 $RPM_BUILD_ROOT%{_mandir}/man5 +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/netbsd-iscsi +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/netbsd-iscsi + %clean rm -rf $RPM_BUILD_ROOT +%post +/sbin/chkconfig --add netbsd-iscsi + + +%preun +if [ $1 = 0 ] ; then + /sbin/service netbsd-iscsi stop >/dev/null 2>&1 + /sbin/chkconfig --del netbsd-iscsi +fi + + +%postun +if [ "$1" -ge "1" ] ; then + /sbin/service netbsd-iscsi condrestart >/dev/null 2>&1 || : +fi + + %files %defattr(-,root,root,-) %dir %{_sysconfdir}/iscsi %config(noreplace) %{_sysconfdir}/iscsi/targets +%config(noreplace) %{_sysconfdir}/sysconfig/netbsd-iscsi +%{_initrddir}/netbsd-iscsi %{_sbindir}/iscsi-target %{_mandir}/man5/targets.5* %{_mandir}/man8/iscsi-target.8* @@ -57,6 +91,9 @@ %changelog +* Mon Jul 28 2008 Lubomir Rintel 20071205-3 +- Init script (thanks to Saturo Sato) + * Tue Feb 19 2008 Fedora Release Engineering - 20071205-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 28 16:33:55 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 16:33:55 GMT Subject: rpms/libcanberra/devel libcanberra.spec,1.3,1.4 sources,1.3,1.4 Message-ID: <200807281633.m6SGXtxd027290@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libcanberra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27258 Modified Files: libcanberra.spec sources Log Message: Fix module name in libcanberra-gtk-module.sh Index: libcanberra.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libcanberra.spec 25 Jul 2008 16:48:15 -0000 1.3 +++ libcanberra.spec 28 Jul 2008 16:33:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz @@ -89,6 +89,9 @@ %{_libdir}/pkgconfig/libcanberra.pc %changelog +* Sun Jul 27 2008 Lennart Poettering 0.4-2 +- Fix module name in libcanberra-gtk-module.sh + * Fri Jul 25 2008 Lennart Poettering 0.4-1 - New version - Install libcanberra-gtk-module.sh Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Jul 2008 16:48:15 -0000 1.3 +++ sources 28 Jul 2008 16:33:25 -0000 1.4 @@ -1,2 +1,2 @@ 29b45a649cc6e84698eeabb7488b8b10 libcanberra-0.4.tar.gz -bf7f13181bf21d1a02195c00faf7effd libcanberra-gtk-module.sh +a54799e624aac814b9343ab05f25c38b libcanberra-gtk-module.sh From fedora-extras-commits at redhat.com Mon Jul 28 16:06:42 2008 From: fedora-extras-commits at redhat.com (McGiveron Sandvik (shellback)) Date: Mon, 28 Jul 2008 16:06:42 +0000 Subject: [SPAM] Manatee spotttedd off NYC Message-ID: <6715628078.20080728154218@acmins.com> Salve, Double Your Sexual Pleasuree http://xsg.kyailyilju.cn -------------- next part -------------- An HTML attachment was scrubbed... URL: From fedora-extras-commits at redhat.com Mon Jul 28 16:39:48 2008 From: fedora-extras-commits at redhat.com (James Laska (jlaska)) Date: Mon, 28 Jul 2008 16:39:48 GMT Subject: rpms/snake/F-8 .cvsignore, 1.7, 1.8 import.log, 1.1, 1.2 snake.spec, 1.13, 1.14 sources, 1.14, 1.15 Message-ID: <200807281639.m6SGdmIH027543@cvs-int.fedora.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27509/F-8 Modified Files: .cvsignore import.log snake.spec sources Log Message: Update to snake-0.11-0.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Jul 2008 15:54:17 -0000 1.7 +++ .cvsignore 28 Jul 2008 16:39:18 -0000 1.8 @@ -1 +1 @@ -snake-0.11-0.8.tar.bz2 +snake-0.11-0.9.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-8/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jul 2008 15:54:17 -0000 1.1 +++ import.log 28 Jul 2008 16:39:18 -0000 1.2 @@ -1 +1,2 @@ snake-0_11-0_8_fc9:F-8:snake-0.11-0.8.fc9.src.rpm:1217260292 +snake-0_11-0_9_fc9:F-8:snake-0.11-0.9.fc9.src.rpm:1217263036 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-8/snake.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- snake.spec 28 Jul 2008 15:54:17 -0000 1.13 +++ snake.spec 28 Jul 2008 16:39:18 -0000 1.14 @@ -4,7 +4,7 @@ Name: snake Summary: Smart Network Automated Kickstart Environment Version: 0.11 -%define rel 0.8 +%define rel 0.9 Release: %{rel}%{?dist} Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2 License: GPLv2+ @@ -123,6 +123,7 @@ %config(noreplace) %{_sysconfdir}/snake.conf %config(noreplace) %{_sysconfdir}/logrotate.d/snake-server %{_sysconfdir}/init.d/snake-server +%{python_sitelib}/snake/anamon.py* %{python_sitelib}/snake/compose.py* %{python_sitelib}/snake/config.py* %{python_sitelib}/snake/dbushelper.py* @@ -135,6 +136,9 @@ %changelog +* Mon Jul 28 2008 James Laska 0.11-0.9 +- ticket#60 - Added snake/anamon.py to packaging + * Mon Jul 28 2008 James Laska 0.11-0.8 - ticket#59 - snake-install-tui will auto-register an unregistered system when using server-side kickstarts Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 28 Jul 2008 15:54:17 -0000 1.14 +++ sources 28 Jul 2008 16:39:18 -0000 1.15 @@ -1 +1 @@ -109e3fc662e9e6a132b60a67473c9839 snake-0.11-0.8.tar.bz2 +b07ad8c46cc14bd526b3e42332091f92 snake-0.11-0.9.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 16:42:15 2008 From: fedora-extras-commits at redhat.com (Behdad Esfahbod (behdad)) Date: Mon, 28 Jul 2008 16:42:15 GMT Subject: rpms/preload/devel .cvsignore, 1.3, 1.4 preload-0.6-start-late.patch, 1.1, 1.2 preload.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807281642.m6SGgF2i027678@cvs-int.fedora.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/preload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27643 Modified Files: .cvsignore preload-0.6-start-late.patch preload.spec sources Log Message: * Thu Jul 28 2008 Behdad Esfahbod - 0.6.1-1 - Update to 0.6.1 - Resolves bug #456742 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Jul 2008 15:57:00 -0000 1.3 +++ .cvsignore 28 Jul 2008 16:41:45 -0000 1.4 @@ -1 +1 @@ -preload-0.6.tar.gz +preload-0.6.1.tar.gz preload-0.6-start-late.patch: Index: preload-0.6-start-late.patch =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/preload-0.6-start-late.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- preload-0.6-start-late.patch 24 Jul 2008 15:57:00 -0000 1.1 +++ preload-0.6-start-late.patch 28 Jul 2008 16:41:45 -0000 1.2 @@ -5,8 +5,8 @@ # # Starts the @PACKAGE@ daemon # --# chkconfig: - 05 95 -+# chkconfig: - 099 1 +-# chkconfig: 2345 05 95 ++# chkconfig: 5 099 1 # description: @PACKAGE_SUMMARY@ # processname: @PACKAGE@ # Index: preload.spec =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/preload.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- preload.spec 24 Jul 2008 15:57:00 -0000 1.3 +++ preload.spec 28 Jul 2008 16:41:45 -0000 1.4 @@ -1,5 +1,5 @@ Name: preload -Version: 0.6 +Version: 0.6.1 Release: 1%{?dist} Summary: Preload is an adaptive readahead daemon @@ -72,6 +72,10 @@ %changelog +* Thu Jul 28 2008 Behdad Esfahbod - 0.6.1-1 +- Update to 0.6.1 +- Resolves bug #456742 + * Thu Jul 24 2008 Behdad Esfahbod - 0.6-1 - Update to 0.6 - Remove all patches. They are all obsolete by upstream now. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Jul 2008 15:57:00 -0000 1.3 +++ sources 28 Jul 2008 16:41:45 -0000 1.4 @@ -1 +1 @@ -2aac518aceea4dbd33d74f52b1a98fca preload-0.6.tar.gz +c6b02f3f3bb669ddcf757cdb8b1e0942 preload-0.6.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 16:47:07 2008 From: fedora-extras-commits at redhat.com (Joshua Kayse (joshkayse)) Date: Mon, 28 Jul 2008 16:47:07 GMT Subject: rpms/perl-File-LibMagic/devel .cvsignore, 1.2, 1.3 perl-File-LibMagic.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807281647.m6SGl7kF027900@cvs-int.fedora.redhat.com> Author: joshkayse Update of /cvs/pkgs/rpms/perl-File-LibMagic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27842 Modified Files: .cvsignore perl-File-LibMagic.spec sources Log Message: update perl-File-LibMagic to 0.88 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-LibMagic/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2008 16:48:32 -0000 1.2 +++ .cvsignore 28 Jul 2008 16:46:37 -0000 1.3 @@ -1 +1 @@ -File-LibMagic-0.85.tgz +File-LibMagic-0.88.tgz Index: perl-File-LibMagic.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-LibMagic/devel/perl-File-LibMagic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-File-LibMagic.spec 18 Apr 2008 16:48:32 -0000 1.1 +++ perl-File-LibMagic.spec 28 Jul 2008 16:46:37 -0000 1.2 @@ -1,29 +1,27 @@ %define module File-LibMagic %define name perl-%{module} -%define version 0.85 +%define version 0.88 Name: %{name} Version: %{version} -Release: 3%{?dist} +Release: 0%{?dist} Summary: Perlwrapper for libmagic License: GPL+ or Artistic Group: Development/Libraries Source: http://search.cpan.org/CPAN/authors/id/F/FI/FITZNER/%{module}-%{version}.tgz -Patch0: tests-0.85.patch Url: http://www.cpan.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: file-devel Buildrequires: perl-devel BuildRequires: perl-Test-Base -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -The File::LibMagic is a simple perlinterface to libmagic from the +The File::LibMagic is a simple perl interface to libmagic from the file-4.x package %prep %setup -q -n %{module}-%{version} -%patch0 -p0 -b .tests %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -39,7 +37,7 @@ %{_fixperms} %{buildroot}/* -%check || : +%check make test %clean @@ -53,9 +51,12 @@ %{_mandir}/man3/* %changelog +* Mon Jul 28 2008 Josh Kayse 0.88-0.f10 +- update to 0.88 + * Sat Mar 01 2008 Josh Kayse 0.85-3 - add perl Require -- specify specific directories in %files +- specify specific directories in files * Fri Feb 29 2008 Josh Kayse 0.85-2 - added patch to fix test cases Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-LibMagic/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2008 16:48:32 -0000 1.2 +++ sources 28 Jul 2008 16:46:37 -0000 1.3 @@ -1 +1 @@ -037150b3131a566b518a7042f9a8d527 File-LibMagic-0.85.tgz +1998b2ec23211cfdd12fbdc891d653d7 File-LibMagic-0.88.tgz From fedora-extras-commits at redhat.com Mon Jul 28 16:47:35 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 28 Jul 2008 16:47:35 GMT Subject: rpms/cups/devel cups.spec,1.430,1.431 Message-ID: <200807281647.m6SGlZo0027911@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27881 Modified Files: cups.spec Log Message: Ship id translation files. Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.430 retrieving revision 1.431 diff -u -r1.430 -r1.431 --- cups.spec 28 Jul 2008 16:20:35 -0000 1.430 +++ cups.spec 28 Jul 2008 16:47:05 -0000 1.431 @@ -376,6 +376,7 @@ %config(noreplace) %{_datadir}/%{name}/www/et %config(noreplace) %{_datadir}/%{name}/www/fr %config(noreplace) %{_datadir}/%{name}/www/he +%config(noreplace) %{_datadir}/%{name}/www/id %config(noreplace) %{_datadir}/%{name}/www/it %config(noreplace) %{_datadir}/%{name}/www/ja %config(noreplace) %{_datadir}/%{name}/www/pl From fedora-extras-commits at redhat.com Mon Jul 28 17:28:50 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Mon, 28 Jul 2008 17:28:50 GMT Subject: rpms/gcc/devel .cvsignore, 1.237, 1.238 gcc43.spec, 1.34, 1.35 sources, 1.240, 1.241 Message-ID: <200807281728.m6SHSoPQ003610@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3547 Modified Files: .cvsignore gcc43.spec sources Log Message: 4.3.1-5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- .cvsignore 8 Jul 2008 08:28:27 -0000 1.237 +++ .cvsignore 28 Jul 2008 17:28:20 -0000 1.238 @@ -1,2 +1,2 @@ -gcc-4.3.1-20080708.tar.bz2 +gcc-4.3.1-20080728.tar.bz2 fastjar-0.95.tar.gz Index: gcc43.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gcc43.spec 8 Jul 2008 08:28:27 -0000 1.34 +++ gcc43.spec 28 Jul 2008 17:28:20 -0000 1.35 @@ -1,6 +1,6 @@ -%define DATE 20080708 +%define DATE 20080728 %define gcc_version 4.3.1 -%define gcc_release 4 +%define gcc_release 5 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -1664,6 +1664,18 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Mon Jul 28 2008 Jakub Jelinek 4.3.1-5 +- update from gcc-4_3-branch + - PRs c++/36407, fortran/36132, fortran/36366, fortran/36824, fortran/36852, + libfortran/36852, libstdc++/36552, libstdc++/36729, libstdc++/36832, + middle-end/36369, middle-end/36811, middle-end/36877, + rtl-optimization/35281, rtl-optimization/36419, + rtl-optimization/36753, target/35492, target/35802, target/36780, + target/36782, target/36784, target/36827, tree-optimization/36830 +- OpenMP 3.0 bugfixes from trunk + - fix occassional hangs of libgomp.c/ordered-3.c + - PR middle-end/36790 + * Tue Jul 8 2008 Jakub Jelinek 4.3.1-4 - update from gcc-4_3-branch - PRs c++/34963, c++/36662, fortran/36546, fortran/36657, fortran/36676, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- sources 8 Jul 2008 09:50:17 -0000 1.240 +++ sources 28 Jul 2008 17:28:20 -0000 1.241 @@ -1,2 +1,2 @@ -7ecf9d5ae28bc7e6c6db5cf2e8bd05cf gcc-4.3.1-20080708.tar.bz2 +14e25ba17eb8f207d75904f31d54c1c8 gcc-4.3.1-20080728.tar.bz2 92a70f9e56223b653bce0f58f90cf950 fastjar-0.95.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 17:30:28 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 28 Jul 2008 17:30:28 GMT Subject: rpms/puppet/EL-4 .cvsignore, 1.19, 1.20 puppet.spec, 1.21, 1.22 sources, 1.20, 1.21 Message-ID: <200807281730.m6SHUStG003778@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3639/EL-4 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-4/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 25 Mar 2008 22:04:52 -0000 1.19 +++ .cvsignore 28 Jul 2008 17:29:58 -0000 1.20 @@ -1,2 +1 @@ -puppet-0.24.4.tgz -manpages.tar.gz +puppet-0.24.5.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-4/puppet.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- puppet.spec 25 Mar 2008 22:04:52 -0000 1.21 +++ puppet.spec 28 Jul 2008 17:29:58 -0000 1.22 @@ -7,15 +7,13 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.4 +Version: 0.24.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://puppet.reductivelabs.com/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz -# Man pages that were omitted from the release tarball -Source1: manpages.tar.gz Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -29,9 +27,9 @@ BuildRequires: ruby >= 1.8.1 %description -Puppet lets you centrally manage every important aspect of your system using a -cross-platform specification language that manages all the separate elements -normally aggregated in different files, like users, cron jobs, and hosts, +Puppet lets you centrally manage every important aspect of your system using a +cross-platform specification language that manages all the separate elements +normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %package server @@ -45,18 +43,16 @@ %prep %setup -q -%setup -a 1 -(cd man/man8 && rm pi.8 puppetdoc.8) %build -for f in bin/* ; do +for f in bin/* ; do sed -i -e '1c#!/usr/bin/ruby' $f done # Fix some rpmlint complaints for f in mac_dscl.pp mac_dscl_revert.pp \ mac_netinfo.pp mac_pkgdmg.pp ; do - sed -i -e'1d' examples/code/$f - chmod a-x examples/code/$f + sed -i -e'1d' examples/$f + chmod a-x examples/$f done find examples/ -type f -empty | xargs rm @@ -78,6 +74,7 @@ mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun +mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir} find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x @@ -100,6 +97,8 @@ %{_bindir}/puppet %{_bindir}/ralsh %{_bindir}/filebucket +%{_bindir}/puppetdoc +%exclude %{_mandir}/man8/pi.8.gz %{_sbindir}/puppetd %{ruby_sitelibdir}/* %{_initrddir}/puppet @@ -108,7 +107,6 @@ %config(noreplace) %{_sysconfdir}/puppet/puppet.conf %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf %doc CHANGELOG COPYING LICENSE README examples -%exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet # These need to be owned by puppet so the server can # write to them @@ -119,6 +117,7 @@ %doc %{_mandir}/man8/puppet.conf.8.gz %doc %{_mandir}/man8/puppetd.8.gz %doc %{_mandir}/man8/ralsh.8.gz +%doc %{_mandir}/man8/puppetdoc.8.gz %files server %defattr(-, root, root, 0755) @@ -171,6 +170,14 @@ rm -rf %{buildroot} %changelog +* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 +- Add /usr/bin/puppetdoc + +* Thu Jul 24 2008 Brenton Leanhardt +- New version +- man pages now ship with tarball +- examples/code moved to root examples dir in upstream tarball + * Tue Mar 25 2008 David Lutterkort - 0.24.4-1 - Add man pages (from separate tarball, upstream will fix to include in main tarball) @@ -198,7 +205,7 @@ - Remove old config files * Wed Jun 20 2007 David Lutterkort - 0.23.0-1 -- Install one puppet.conf instead of old config files, keep old configs +- Install one puppet.conf instead of old config files, keep old configs around to ease update - Use plain shell commands in install instead of macros @@ -259,7 +266,7 @@ * Mon Jun 19 2006 David Lutterkort - 0.18.0-1 - Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl +- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml @@ -282,7 +289,7 @@ - Rebuilt for new version * Wed Mar 22 2006 David Lutterkort - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready +- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime * Mon Mar 13 2006 David Lutterkort - 0.15.0-1 @@ -297,7 +304,7 @@ allocate the puppet uid/gid dynamically * Sun Feb 19 2006 David Lutterkort - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed +- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed problem with listing fileserver.conf and puppetmaster.conf twice * Wed Feb 8 2006 David Lutterkort - 0.13.0-3 @@ -322,7 +329,7 @@ - Added basic fileserver.conf * Wed Jan 11 2006 David Lutterkort - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled +- Updated. Moved installation of library files to sitelibdir. Pulled initscripts into separate files. Folded tools rpm into server * Thu Nov 24 2005 Duane Griffin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-4/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 25 Mar 2008 22:04:52 -0000 1.20 +++ sources 28 Jul 2008 17:29:58 -0000 1.21 @@ -1,2 +1 @@ -9658624ed3745e8954772b3fbfdcc438 puppet-0.24.4.tgz -f798fd9454f33860b4545513b4b199a6 manpages.tar.gz +1160bb69966b9145d9f845f1f355dd44 puppet-0.24.5.tgz From fedora-extras-commits at redhat.com Mon Jul 28 17:30:28 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 28 Jul 2008 17:30:28 GMT Subject: rpms/puppet/EL-5 .cvsignore, 1.21, 1.22 puppet.spec, 1.23, 1.24 sources, 1.22, 1.23 Message-ID: <200807281730.m6SHUS5t003783@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3639/EL-5 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 25 Mar 2008 22:05:07 -0000 1.21 +++ .cvsignore 28 Jul 2008 17:29:58 -0000 1.22 @@ -1,2 +1 @@ -puppet-0.24.4.tgz -manpages.tar.gz +puppet-0.24.5.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-5/puppet.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- puppet.spec 25 Mar 2008 22:05:07 -0000 1.23 +++ puppet.spec 28 Jul 2008 17:29:58 -0000 1.24 @@ -7,15 +7,13 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.4 +Version: 0.24.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://puppet.reductivelabs.com/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz -# Man pages that were omitted from the release tarball -Source1: manpages.tar.gz Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -29,9 +27,9 @@ BuildRequires: ruby >= 1.8.1 %description -Puppet lets you centrally manage every important aspect of your system using a -cross-platform specification language that manages all the separate elements -normally aggregated in different files, like users, cron jobs, and hosts, +Puppet lets you centrally manage every important aspect of your system using a +cross-platform specification language that manages all the separate elements +normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %package server @@ -45,18 +43,16 @@ %prep %setup -q -%setup -a 1 -(cd man/man8 && rm pi.8 puppetdoc.8) %build -for f in bin/* ; do +for f in bin/* ; do sed -i -e '1c#!/usr/bin/ruby' $f done # Fix some rpmlint complaints for f in mac_dscl.pp mac_dscl_revert.pp \ mac_netinfo.pp mac_pkgdmg.pp ; do - sed -i -e'1d' examples/code/$f - chmod a-x examples/code/$f + sed -i -e'1d' examples/$f + chmod a-x examples/$f done find examples/ -type f -empty | xargs rm @@ -78,6 +74,7 @@ mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun +mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir} find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x @@ -100,6 +97,8 @@ %{_bindir}/puppet %{_bindir}/ralsh %{_bindir}/filebucket +%{_bindir}/puppetdoc +%exclude %{_mandir}/man8/pi.8.gz %{_sbindir}/puppetd %{ruby_sitelibdir}/* %{_initrddir}/puppet @@ -108,7 +107,6 @@ %config(noreplace) %{_sysconfdir}/puppet/puppet.conf %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf %doc CHANGELOG COPYING LICENSE README examples -%exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet # These need to be owned by puppet so the server can # write to them @@ -119,6 +117,7 @@ %doc %{_mandir}/man8/puppet.conf.8.gz %doc %{_mandir}/man8/puppetd.8.gz %doc %{_mandir}/man8/ralsh.8.gz +%doc %{_mandir}/man8/puppetdoc.8.gz %files server %defattr(-, root, root, 0755) @@ -171,6 +170,14 @@ rm -rf %{buildroot} %changelog +* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 +- Add /usr/bin/puppetdoc + +* Thu Jul 24 2008 Brenton Leanhardt +- New version +- man pages now ship with tarball +- examples/code moved to root examples dir in upstream tarball + * Tue Mar 25 2008 David Lutterkort - 0.24.4-1 - Add man pages (from separate tarball, upstream will fix to include in main tarball) @@ -198,7 +205,7 @@ - Remove old config files * Wed Jun 20 2007 David Lutterkort - 0.23.0-1 -- Install one puppet.conf instead of old config files, keep old configs +- Install one puppet.conf instead of old config files, keep old configs around to ease update - Use plain shell commands in install instead of macros @@ -259,7 +266,7 @@ * Mon Jun 19 2006 David Lutterkort - 0.18.0-1 - Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl +- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml @@ -282,7 +289,7 @@ - Rebuilt for new version * Wed Mar 22 2006 David Lutterkort - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready +- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime * Mon Mar 13 2006 David Lutterkort - 0.15.0-1 @@ -297,7 +304,7 @@ allocate the puppet uid/gid dynamically * Sun Feb 19 2006 David Lutterkort - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed +- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed problem with listing fileserver.conf and puppetmaster.conf twice * Wed Feb 8 2006 David Lutterkort - 0.13.0-3 @@ -322,7 +329,7 @@ - Added basic fileserver.conf * Wed Jan 11 2006 David Lutterkort - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled +- Updated. Moved installation of library files to sitelibdir. Pulled initscripts into separate files. Folded tools rpm into server * Thu Nov 24 2005 Duane Griffin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-5/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Mar 2008 22:05:07 -0000 1.22 +++ sources 28 Jul 2008 17:29:58 -0000 1.23 @@ -1,2 +1 @@ -9658624ed3745e8954772b3fbfdcc438 puppet-0.24.4.tgz -f798fd9454f33860b4545513b4b199a6 manpages.tar.gz +1160bb69966b9145d9f845f1f355dd44 puppet-0.24.5.tgz From fedora-extras-commits at redhat.com Mon Jul 28 17:30:29 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 28 Jul 2008 17:30:29 GMT Subject: rpms/puppet/F-9 .cvsignore, 1.22, 1.23 puppet.spec, 1.24, 1.25 sources, 1.23, 1.24 Message-ID: <200807281730.m6SHUTkt003793@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3639/F-9 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Mar 2008 22:05:48 -0000 1.22 +++ .cvsignore 28 Jul 2008 17:29:59 -0000 1.23 @@ -1,2 +1 @@ -puppet-0.24.4.tgz -manpages.tar.gz +puppet-0.24.5.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-9/puppet.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- puppet.spec 25 Mar 2008 22:05:48 -0000 1.24 +++ puppet.spec 28 Jul 2008 17:29:59 -0000 1.25 @@ -7,15 +7,13 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.4 +Version: 0.24.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://puppet.reductivelabs.com/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz -# Man pages that were omitted from the release tarball -Source1: manpages.tar.gz Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -29,9 +27,9 @@ BuildRequires: ruby >= 1.8.1 %description -Puppet lets you centrally manage every important aspect of your system using a -cross-platform specification language that manages all the separate elements -normally aggregated in different files, like users, cron jobs, and hosts, +Puppet lets you centrally manage every important aspect of your system using a +cross-platform specification language that manages all the separate elements +normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %package server @@ -45,18 +43,16 @@ %prep %setup -q -%setup -a 1 -(cd man/man8 && rm pi.8 puppetdoc.8) %build -for f in bin/* ; do +for f in bin/* ; do sed -i -e '1c#!/usr/bin/ruby' $f done # Fix some rpmlint complaints for f in mac_dscl.pp mac_dscl_revert.pp \ mac_netinfo.pp mac_pkgdmg.pp ; do - sed -i -e'1d' examples/code/$f - chmod a-x examples/code/$f + sed -i -e'1d' examples/$f + chmod a-x examples/$f done find examples/ -type f -empty | xargs rm @@ -78,6 +74,7 @@ mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun +mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir} find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x @@ -100,6 +97,8 @@ %{_bindir}/puppet %{_bindir}/ralsh %{_bindir}/filebucket +%{_bindir}/puppetdoc +%exclude %{_mandir}/man8/pi.8.gz %{_sbindir}/puppetd %{ruby_sitelibdir}/* %{_initrddir}/puppet @@ -108,7 +107,6 @@ %config(noreplace) %{_sysconfdir}/puppet/puppet.conf %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf %doc CHANGELOG COPYING LICENSE README examples -%exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet # These need to be owned by puppet so the server can # write to them @@ -119,6 +117,7 @@ %doc %{_mandir}/man8/puppet.conf.8.gz %doc %{_mandir}/man8/puppetd.8.gz %doc %{_mandir}/man8/ralsh.8.gz +%doc %{_mandir}/man8/puppetdoc.8.gz %files server %defattr(-, root, root, 0755) @@ -171,6 +170,14 @@ rm -rf %{buildroot} %changelog +* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 +- Add /usr/bin/puppetdoc + +* Thu Jul 24 2008 Brenton Leanhardt +- New version +- man pages now ship with tarball +- examples/code moved to root examples dir in upstream tarball + * Tue Mar 25 2008 David Lutterkort - 0.24.4-1 - Add man pages (from separate tarball, upstream will fix to include in main tarball) @@ -198,7 +205,7 @@ - Remove old config files * Wed Jun 20 2007 David Lutterkort - 0.23.0-1 -- Install one puppet.conf instead of old config files, keep old configs +- Install one puppet.conf instead of old config files, keep old configs around to ease update - Use plain shell commands in install instead of macros @@ -259,7 +266,7 @@ * Mon Jun 19 2006 David Lutterkort - 0.18.0-1 - Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl +- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml @@ -282,7 +289,7 @@ - Rebuilt for new version * Wed Mar 22 2006 David Lutterkort - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready +- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime * Mon Mar 13 2006 David Lutterkort - 0.15.0-1 @@ -297,7 +304,7 @@ allocate the puppet uid/gid dynamically * Sun Feb 19 2006 David Lutterkort - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed +- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed problem with listing fileserver.conf and puppetmaster.conf twice * Wed Feb 8 2006 David Lutterkort - 0.13.0-3 @@ -322,7 +329,7 @@ - Added basic fileserver.conf * Wed Jan 11 2006 David Lutterkort - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled +- Updated. Moved installation of library files to sitelibdir. Pulled initscripts into separate files. Folded tools rpm into server * Thu Nov 24 2005 Duane Griffin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 25 Mar 2008 22:05:48 -0000 1.23 +++ sources 28 Jul 2008 17:29:59 -0000 1.24 @@ -1,2 +1 @@ -9658624ed3745e8954772b3fbfdcc438 puppet-0.24.4.tgz -f798fd9454f33860b4545513b4b199a6 manpages.tar.gz +1160bb69966b9145d9f845f1f355dd44 puppet-0.24.5.tgz From fedora-extras-commits at redhat.com Mon Jul 28 17:30:29 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 28 Jul 2008 17:30:29 GMT Subject: rpms/puppet/F-8 .cvsignore, 1.22, 1.23 puppet.spec, 1.24, 1.25 sources, 1.23, 1.24 Message-ID: <200807281730.m6SHUTFY003788@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3639/F-8 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-8/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Mar 2008 22:05:31 -0000 1.22 +++ .cvsignore 28 Jul 2008 17:29:59 -0000 1.23 @@ -1,2 +1 @@ -puppet-0.24.4.tgz -manpages.tar.gz +puppet-0.24.5.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-8/puppet.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- puppet.spec 25 Mar 2008 22:05:31 -0000 1.24 +++ puppet.spec 28 Jul 2008 17:29:59 -0000 1.25 @@ -7,15 +7,13 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.4 +Version: 0.24.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://puppet.reductivelabs.com/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz -# Man pages that were omitted from the release tarball -Source1: manpages.tar.gz Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -29,9 +27,9 @@ BuildRequires: ruby >= 1.8.1 %description -Puppet lets you centrally manage every important aspect of your system using a -cross-platform specification language that manages all the separate elements -normally aggregated in different files, like users, cron jobs, and hosts, +Puppet lets you centrally manage every important aspect of your system using a +cross-platform specification language that manages all the separate elements +normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %package server @@ -45,18 +43,16 @@ %prep %setup -q -%setup -a 1 -(cd man/man8 && rm pi.8 puppetdoc.8) %build -for f in bin/* ; do +for f in bin/* ; do sed -i -e '1c#!/usr/bin/ruby' $f done # Fix some rpmlint complaints for f in mac_dscl.pp mac_dscl_revert.pp \ mac_netinfo.pp mac_pkgdmg.pp ; do - sed -i -e'1d' examples/code/$f - chmod a-x examples/code/$f + sed -i -e'1d' examples/$f + chmod a-x examples/$f done find examples/ -type f -empty | xargs rm @@ -78,6 +74,7 @@ mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun +mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir} find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x @@ -100,6 +97,8 @@ %{_bindir}/puppet %{_bindir}/ralsh %{_bindir}/filebucket +%{_bindir}/puppetdoc +%exclude %{_mandir}/man8/pi.8.gz %{_sbindir}/puppetd %{ruby_sitelibdir}/* %{_initrddir}/puppet @@ -108,7 +107,6 @@ %config(noreplace) %{_sysconfdir}/puppet/puppet.conf %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf %doc CHANGELOG COPYING LICENSE README examples -%exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet # These need to be owned by puppet so the server can # write to them @@ -119,6 +117,7 @@ %doc %{_mandir}/man8/puppet.conf.8.gz %doc %{_mandir}/man8/puppetd.8.gz %doc %{_mandir}/man8/ralsh.8.gz +%doc %{_mandir}/man8/puppetdoc.8.gz %files server %defattr(-, root, root, 0755) @@ -171,6 +170,14 @@ rm -rf %{buildroot} %changelog +* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 +- Add /usr/bin/puppetdoc + +* Thu Jul 24 2008 Brenton Leanhardt +- New version +- man pages now ship with tarball +- examples/code moved to root examples dir in upstream tarball + * Tue Mar 25 2008 David Lutterkort - 0.24.4-1 - Add man pages (from separate tarball, upstream will fix to include in main tarball) @@ -198,7 +205,7 @@ - Remove old config files * Wed Jun 20 2007 David Lutterkort - 0.23.0-1 -- Install one puppet.conf instead of old config files, keep old configs +- Install one puppet.conf instead of old config files, keep old configs around to ease update - Use plain shell commands in install instead of macros @@ -259,7 +266,7 @@ * Mon Jun 19 2006 David Lutterkort - 0.18.0-1 - Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl +- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml @@ -282,7 +289,7 @@ - Rebuilt for new version * Wed Mar 22 2006 David Lutterkort - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready +- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime * Mon Mar 13 2006 David Lutterkort - 0.15.0-1 @@ -297,7 +304,7 @@ allocate the puppet uid/gid dynamically * Sun Feb 19 2006 David Lutterkort - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed +- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed problem with listing fileserver.conf and puppetmaster.conf twice * Wed Feb 8 2006 David Lutterkort - 0.13.0-3 @@ -322,7 +329,7 @@ - Added basic fileserver.conf * Wed Jan 11 2006 David Lutterkort - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled +- Updated. Moved installation of library files to sitelibdir. Pulled initscripts into separate files. Folded tools rpm into server * Thu Nov 24 2005 Duane Griffin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-8/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 25 Mar 2008 22:05:31 -0000 1.23 +++ sources 28 Jul 2008 17:29:59 -0000 1.24 @@ -1,2 +1 @@ -9658624ed3745e8954772b3fbfdcc438 puppet-0.24.4.tgz -f798fd9454f33860b4545513b4b199a6 manpages.tar.gz +1160bb69966b9145d9f845f1f355dd44 puppet-0.24.5.tgz From fedora-extras-commits at redhat.com Mon Jul 28 17:30:30 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 28 Jul 2008 17:30:30 GMT Subject: rpms/puppet/devel .cvsignore, 1.22, 1.23 puppet.spec, 1.24, 1.25 sources, 1.23, 1.24 Message-ID: <200807281730.m6SHUU2j003798@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3639/devel Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Mar 2008 22:05:48 -0000 1.22 +++ .cvsignore 28 Jul 2008 17:29:59 -0000 1.23 @@ -1,2 +1 @@ -puppet-0.24.4.tgz -manpages.tar.gz +puppet-0.24.5.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/devel/puppet.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- puppet.spec 25 Mar 2008 22:05:48 -0000 1.24 +++ puppet.spec 28 Jul 2008 17:30:00 -0000 1.25 @@ -7,15 +7,13 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.4 +Version: 0.24.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://puppet.reductivelabs.com/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz -# Man pages that were omitted from the release tarball -Source1: manpages.tar.gz Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -29,9 +27,9 @@ BuildRequires: ruby >= 1.8.1 %description -Puppet lets you centrally manage every important aspect of your system using a -cross-platform specification language that manages all the separate elements -normally aggregated in different files, like users, cron jobs, and hosts, +Puppet lets you centrally manage every important aspect of your system using a +cross-platform specification language that manages all the separate elements +normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %package server @@ -45,18 +43,16 @@ %prep %setup -q -%setup -a 1 -(cd man/man8 && rm pi.8 puppetdoc.8) %build -for f in bin/* ; do +for f in bin/* ; do sed -i -e '1c#!/usr/bin/ruby' $f done # Fix some rpmlint complaints for f in mac_dscl.pp mac_dscl_revert.pp \ mac_netinfo.pp mac_pkgdmg.pp ; do - sed -i -e'1d' examples/code/$f - chmod a-x examples/code/$f + sed -i -e'1d' examples/$f + chmod a-x examples/$f done find examples/ -type f -empty | xargs rm @@ -78,6 +74,7 @@ mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun +mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir} find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x @@ -100,6 +97,8 @@ %{_bindir}/puppet %{_bindir}/ralsh %{_bindir}/filebucket +%{_bindir}/puppetdoc +%exclude %{_mandir}/man8/pi.8.gz %{_sbindir}/puppetd %{ruby_sitelibdir}/* %{_initrddir}/puppet @@ -108,7 +107,6 @@ %config(noreplace) %{_sysconfdir}/puppet/puppet.conf %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf %doc CHANGELOG COPYING LICENSE README examples -%exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet # These need to be owned by puppet so the server can # write to them @@ -119,6 +117,7 @@ %doc %{_mandir}/man8/puppet.conf.8.gz %doc %{_mandir}/man8/puppetd.8.gz %doc %{_mandir}/man8/ralsh.8.gz +%doc %{_mandir}/man8/puppetdoc.8.gz %files server %defattr(-, root, root, 0755) @@ -171,6 +170,14 @@ rm -rf %{buildroot} %changelog +* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 +- Add /usr/bin/puppetdoc + +* Thu Jul 24 2008 Brenton Leanhardt +- New version +- man pages now ship with tarball +- examples/code moved to root examples dir in upstream tarball + * Tue Mar 25 2008 David Lutterkort - 0.24.4-1 - Add man pages (from separate tarball, upstream will fix to include in main tarball) @@ -198,7 +205,7 @@ - Remove old config files * Wed Jun 20 2007 David Lutterkort - 0.23.0-1 -- Install one puppet.conf instead of old config files, keep old configs +- Install one puppet.conf instead of old config files, keep old configs around to ease update - Use plain shell commands in install instead of macros @@ -259,7 +266,7 @@ * Mon Jun 19 2006 David Lutterkort - 0.18.0-1 - Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl +- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml @@ -282,7 +289,7 @@ - Rebuilt for new version * Wed Mar 22 2006 David Lutterkort - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready +- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime * Mon Mar 13 2006 David Lutterkort - 0.15.0-1 @@ -297,7 +304,7 @@ allocate the puppet uid/gid dynamically * Sun Feb 19 2006 David Lutterkort - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed +- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed problem with listing fileserver.conf and puppetmaster.conf twice * Wed Feb 8 2006 David Lutterkort - 0.13.0-3 @@ -322,7 +329,7 @@ - Added basic fileserver.conf * Wed Jan 11 2006 David Lutterkort - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled +- Updated. Moved installation of library files to sitelibdir. Pulled initscripts into separate files. Folded tools rpm into server * Thu Nov 24 2005 Duane Griffin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 25 Mar 2008 22:05:48 -0000 1.23 +++ sources 28 Jul 2008 17:30:00 -0000 1.24 @@ -1,2 +1 @@ -9658624ed3745e8954772b3fbfdcc438 puppet-0.24.4.tgz -f798fd9454f33860b4545513b4b199a6 manpages.tar.gz +1160bb69966b9145d9f845f1f355dd44 puppet-0.24.5.tgz From fedora-extras-commits at redhat.com Mon Jul 28 17:31:25 2008 From: fedora-extras-commits at redhat.com (Dave Nomura (dcnomura)) Date: Mon, 28 Jul 2008 17:31:25 GMT Subject: rpms/stapitrace/devel stapitrace.spec,1.4,1.5 Message-ID: <200807281731.m6SHVPPa003857@cvs-int.fedora.redhat.com> Author: dcnomura Update of /cvs/pkgs/rpms/stapitrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3804 Modified Files: stapitrace.spec Log Message: remove ppc64 from ExclusiveArch Index: stapitrace.spec =================================================================== RCS file: /cvs/pkgs/rpms/stapitrace/devel/stapitrace.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stapitrace.spec 23 Jul 2008 23:57:58 -0000 1.4 +++ stapitrace.spec 28 Jul 2008 17:30:55 -0000 1.5 @@ -6,7 +6,7 @@ Name: stapitrace Summary: Instruction Tracing Tool Version: 1.0.0 -Release: 2.%{alphatag}%{?dist} +Release: 3.%{alphatag}%{?dist} License: GPLv2+ Group: Development/Tools URL: http://sourceforge.net/projects/perfinsp @@ -14,8 +14,8 @@ Patch0: itrace_fix1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: systemtap systemtap-runtime -BuildRequires: binutils binutils-devel autoconf automake glibc-headers glibc-devel -ExclusiveArch: ppc ppc64 +BuildRequires: binutils binutils-devel autoconf automake +ExclusiveArch: ppc %description ITrace is a software tracing mechanism that runs on Linux. ITrace traces From fedora-extras-commits at redhat.com Mon Jul 28 17:38:34 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Mon, 28 Jul 2008 17:38:34 GMT Subject: rpms/cacti/devel cacti.spec,1.23,1.24 Message-ID: <200807281738.m6SHcYab004385@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4321 Modified Files: cacti.spec Log Message: added cli directories Index: cacti.spec =================================================================== RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cacti.spec 18 Jul 2008 15:02:56 -0000 1.23 +++ cacti.spec 28 Jul 2008 17:38:04 -0000 1.24 @@ -1,6 +1,6 @@ Name: cacti Version: 0.8.7b -Release: 3%{?dist} +Release: 4%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -44,6 +44,8 @@ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ %{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 cli/ %{buildroot}/%{_localstatedir}/lib//%{name}/cli/ +%{__install} -m 0755 cli/* %{buildroot}/%{_localstatedir}/lib/%{name}/cli/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf %{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti @@ -97,10 +99,14 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/cli/*php %attr(0644,root,root) %{_localstatedir}/lib/%{name}/include %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Mon Jul 28 2008 Mike McGrath - 0.8.7b-4 +- Added cli directory + * Fri Jul 18 2008 Tom "spot" Callaway - 0.8.7b-3 - fix my own mistake in the license tag From fedora-extras-commits at redhat.com Mon Jul 28 17:42:55 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Mon, 28 Jul 2008 17:42:55 GMT Subject: rpms/drupal-service_links/devel drupal-service_links-fedora-README.txt, NONE, 1.1 drupal-service_links.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807281742.m6SHgtYq004531@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal-service_links/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4509/devel Modified Files: .cvsignore sources Added Files: drupal-service_links-fedora-README.txt drupal-service_links.spec import.log Log Message: Initial import. --- NEW FILE drupal-service_links-fedora-README.txt --- After installation, you must enable this module from the drupal administration. If upgrading this module seperately from the core drupal package, be sure to run the http://hostname/drupal/upgrade.php script after this rpm is upgraded. --- NEW FILE drupal-service_links.spec --- %define drupaldir %{_datadir}/drupal Name: drupal-service_links Version: 6.x.1.0 Release: 1%{?dist} Summary: Enables admins to add links to a number of sites Group: Applications/Publishing License: GPLv2 URL: http://drupal.org/project/service_links Source0: http://ftp.drupal.org/files/projects/service_links-6.x-1.0.tar.gz Source1: drupal-service_links-fedora-README.txt BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: drupal >= 6.0 %description The service links module enables admins to add links to a number of social bookmarking sites, blog search sites etc. Includes sites are del.icio.us, Digg, Reddit, ma.gnolia.com, Newsvine, Furl, Google, Yahoo, Technorati and IceRocket. %prep %setup -qn service_links %build chmod -x po/es.po chmod -x po/de.po cp %{SOURCE1} . %install rm -rf %{buildroot} install -d %{buildroot}%{drupaldir}/modules/service_links cp -pr * %{buildroot}%{drupaldir}/modules/service_links %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt drupal-service_links-fedora-README.txt %{drupaldir}/modules/service_links %changelog * Mon Jun 16 2008 Jon Ciesla - 6.x.1.0-1 - Updated for Drupal 6.x. * Wed Oct 24 2007 Jon Ciesla - 1.0-1 - Initial packaging. --- NEW FILE import.log --- drupal-service_links-6_x_1_0-1_fc9:HEAD:drupal-service_links-6.x.1.0-1.fc9.src.rpm:1217266927 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drupal-service_links/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 16:15:01 -0000 1.1 +++ .cvsignore 28 Jul 2008 17:42:25 -0000 1.2 @@ -0,0 +1 @@ +service_links-6.x-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal-service_links/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 16:15:01 -0000 1.1 +++ sources 28 Jul 2008 17:42:25 -0000 1.2 @@ -0,0 +1 @@ +5313414dbb7429c17fdf6fa299b5e4a7 service_links-6.x-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 17:47:40 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 28 Jul 2008 17:47:40 GMT Subject: rpms/kdebindings/F-9 sources, 1.47, 1.48 kdebindings-4.1.0-kde#167450.patch, 1.2, NONE Message-ID: <200807281747.m6SHleL7004818@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4772/F-9 Modified Files: sources Removed Files: kdebindings-4.1.0-kde#167450.patch Log Message: Sync from devel: * Mon Jul 28 2008 Than Ngo - 4.1.0-5 - respun - get rid of kdebindings-4.1.0-kde#167450.patch that is included in new upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 25 Jul 2008 18:39:47 -0000 1.47 +++ sources 28 Jul 2008 17:47:10 -0000 1.48 @@ -1 +1 @@ -d03166d9fc3e46df1c9a99fcedd8bfd1 kdebindings-4.1.0.tar.bz2 +9c7ee50816ac6e0d5d2ea2f2968ac94d kdebindings-4.1.0.tar.bz2 --- kdebindings-4.1.0-kde#167450.patch DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 17:49:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 28 Jul 2008 17:49:55 GMT Subject: rpms/kdebindings/F-9 kdebindings.spec,1.104,1.105 Message-ID: <200807281749.m6SHntws004955@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4915/F-9 Modified Files: kdebindings.spec Log Message: Sync from devel: * Mon Jul 28 2008 Than Ngo - 4.1.0-5 - respun - get rid of kdebindings-4.1.0-kde#167450.patch that is included in new upstream Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- kdebindings.spec 26 Jul 2008 18:27:16 -0000 1.104 +++ kdebindings.spec 28 Jul 2008 17:49:25 -0000 1.105 @@ -22,16 +22,13 @@ Name: kdebindings Version: 4.1.0 -Release: 4%{?dist}.1 +Release: 5%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops License: GPLv2 URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 -# fix Python and Ruby bindings overwriting each other (#456722, kde#167450) -# (thanks to Sebastian Sauer) -Patch0: kdebindings-4.1.0-kde#167450.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -89,7 +86,6 @@ %prep %setup -q -%patch0 -p1 -b .kde#167450 %build mkdir -p %{_target_platform} @@ -168,6 +164,10 @@ %changelog +* Mon Jul 28 2008 Than Ngo - 4.1.0-5 +- respun +- get rid of kdebindings-4.1.0-kde#167450.patch that is included in new upstream + * Sat Jul 26 2008 Rex Dieter 4.1.0-4.1 - BR: qscintilla-devel >= 2.2 From fedora-extras-commits at redhat.com Mon Jul 28 17:50:55 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 17:50:55 GMT Subject: rpms/libasyncns/devel import.log, NONE, 1.1 libasyncns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807281750.m6SHotx5005086@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libasyncns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5002/devel Modified Files: .cvsignore sources Added Files: import.log libasyncns.spec Log Message: Initial import --- NEW FILE import.log --- libasyncns-0_4-1_fc10:HEAD:libasyncns-0.4-1.fc10.src.rpm:1217267383 --- NEW FILE libasyncns.spec --- Name: libasyncns Version: 0.4 Release: 1%{?dist} Summary: Asynchronous Name Service Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libasyncns/libasyncns-%{version}.tar.gz License: LGPLv2+ Url: http://0pointer.de/lennart/projects/libasyncns/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description A small and lightweight library that implements easy to use asynchronous wrappers around the libc NSS functions getaddrinfo(), res_query() and related. %package devel Summary: Development Files for libasyncns Client Development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel Development Files for libasyncns Client Development %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %prep %setup -q %build %configure --disable-static --disable-rpath make %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README LICENSE %{_libdir}/libasyncns.so.* %files devel %defattr(-,root,root) %{_includedir}/asyncns.h %{_libdir}/libasyncns.so %{_libdir}/pkgconfig/libasyncns.pc %changelog * Sun Jul 27 2008 Lennart Poettering 0.4-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libasyncns/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 16:13:49 -0000 1.1 +++ .cvsignore 28 Jul 2008 17:50:25 -0000 1.2 @@ -0,0 +1 @@ +libasyncns-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libasyncns/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 16:13:49 -0000 1.1 +++ sources 28 Jul 2008 17:50:25 -0000 1.2 @@ -0,0 +1 @@ +bbe2f584320ccd6c32e5113845ce814e libasyncns-0.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 17:51:14 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Mon, 28 Jul 2008 17:51:14 GMT Subject: rpms/drupal-service_links/F-9 drupal-service_links-fedora-README.txt, NONE, 1.1 drupal-service_links.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807281751.m6SHpEpV005144@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal-service_links/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5064 Modified Files: sources Added Files: drupal-service_links-fedora-README.txt drupal-service_links.spec Log Message: Initial import. --- NEW FILE drupal-service_links-fedora-README.txt --- After installation, you must enable this module from the drupal administration. If upgrading this module seperately from the core drupal package, be sure to run the http://hostname/drupal/upgrade.php script after this rpm is upgraded. --- NEW FILE drupal-service_links.spec --- %define drupaldir %{_datadir}/drupal Name: drupal-service_links Version: 6.x.1.0 Release: 1%{?dist} Summary: Enables admins to add links to a number of sites Group: Applications/Publishing License: GPLv2 URL: http://drupal.org/project/service_links Source0: http://ftp.drupal.org/files/projects/service_links-6.x-1.0.tar.gz Source1: drupal-service_links-fedora-README.txt BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: drupal >= 6.0 %description The service links module enables admins to add links to a number of social bookmarking sites, blog search sites etc. Includes sites are del.icio.us, Digg, Reddit, ma.gnolia.com, Newsvine, Furl, Google, Yahoo, Technorati and IceRocket. %prep %setup -qn service_links %build chmod -x po/es.po chmod -x po/de.po cp %{SOURCE1} . %install rm -rf %{buildroot} install -d %{buildroot}%{drupaldir}/modules/service_links cp -pr * %{buildroot}%{drupaldir}/modules/service_links %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt drupal-service_links-fedora-README.txt %{drupaldir}/modules/service_links %changelog * Mon Jun 16 2008 Jon Ciesla - 6.x.1.0-1 - Updated for Drupal 6.x. * Wed Oct 24 2007 Jon Ciesla - 1.0-1 - Initial packaging. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal-service_links/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 16:15:01 -0000 1.1 +++ sources 28 Jul 2008 17:50:44 -0000 1.2 @@ -0,0 +1 @@ +5313414dbb7429c17fdf6fa299b5e4a7 service_links-6.x-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 17:58:46 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 17:58:46 GMT Subject: rpms/libatasmart/devel import.log, NONE, 1.1 libatasmart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807281758.m6SHwkN7005545@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libatasmart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/devel Modified Files: .cvsignore sources Added Files: import.log libatasmart.spec Log Message: Initial commit --- NEW FILE import.log --- libatasmart-0_1-1_fc10:HEAD:libatasmart-0.1-1.fc10.src.rpm:1217267819 --- NEW FILE libatasmart.spec --- Name: libatasmart Version: 0.1 Release: 1%{?dist} Summary: ATA S.M.A.R.T. Disk Health Monitoring Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libatasmart-%{version}.tar.gz License: LGPLv2+ Url: http://git.0pointer.de/?p=libatasmart.git;a=summary BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description A small and lightweight parser library for ATA S.M.A.R.T. hard disk health monitoring. %package devel Summary: Development Files for libatasmart client development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel Development Files for libatasmart client development %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %prep %setup -q %build %configure --disable-static --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README LGPL %{_libdir}/libatasmart.so.* %{_sbindir}/skdump %{_sbindir}/sktest %files devel %defattr(-,root,root) %{_includedir}/atasmart.h %{_libdir}/libatasmart.so %{_libdir}/pkgconfig/libatasmart.pc %changelog * Fri Jul 25 2008 Lennart Poettering 0.1-1 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 16:16:16 -0000 1.1 +++ .cvsignore 28 Jul 2008 17:58:15 -0000 1.2 @@ -0,0 +1 @@ +libatasmart-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 16:16:16 -0000 1.1 +++ sources 28 Jul 2008 17:58:16 -0000 1.2 @@ -0,0 +1 @@ +7c4bb6d785ae4b4bb47b90340649b94e libatasmart-0.1.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 18:03:17 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 18:03:17 GMT Subject: rpms/libasyncns/devel libasyncns.spec,1.1,1.2 Message-ID: <200807281803.m6SI3HIO012500@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libasyncns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427 Modified Files: libasyncns.spec Log Message: minor build optimizations Index: libasyncns.spec =================================================================== RCS file: /cvs/pkgs/rpms/libasyncns/devel/libasyncns.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libasyncns.spec 28 Jul 2008 17:50:25 -0000 1.1 +++ libasyncns.spec 28 Jul 2008 18:02:46 -0000 1.2 @@ -28,8 +28,8 @@ %setup -q %build -%configure --disable-static --disable-rpath -make +%configure --disable-static +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Mon Jul 28 18:11:20 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 18:11:20 GMT Subject: rpms/libcanberra/devel libcanberra.spec,1.4,1.5 Message-ID: <200807281811.m6SIBKpB013040@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libcanberra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008 Modified Files: libcanberra.spec Log Message: Add versioned dependency on libpulse Index: libcanberra.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libcanberra.spec 28 Jul 2008 16:33:25 -0000 1.4 +++ libcanberra.spec 28 Jul 2008 18:10:50 -0000 1.5 @@ -1,11 +1,11 @@ Name: libcanberra Version: 0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz Source1: libcanberra-gtk-module.sh -License: LGPLv2 +License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -13,7 +13,7 @@ BuildRequires: libvorbis-devel BuildRequires: libtool-ltdl-devel BuildRequires: gtk-doc -BuildRequires: pulseaudio-libs-devel >= 0.9.11 +BuildRequires: pulseaudio-libs-devel >= 0.9.11-1 Requires: sound-theme-freedesktop %description @@ -29,7 +29,7 @@ Gtk+ bindings for libcanberra %package devel -Summary: Development Files for libcanberra client development +Summary: Development Files for libcanberra Client Development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -37,7 +37,7 @@ Requires: gtk2-devel %description devel -Development Files for libcanberra client development +Development Files for libcanberra Client Development %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -50,7 +50,7 @@ %build %configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +89,9 @@ %{_libdir}/pkgconfig/libcanberra.pc %changelog +* Mon Jul 28 2008 Lennart Poettering 0.4-3 +- Add versioned dependency on libpulse + * Sun Jul 27 2008 Lennart Poettering 0.4-2 - Fix module name in libcanberra-gtk-module.sh From fedora-extras-commits at redhat.com Mon Jul 28 18:12:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 28 Jul 2008 18:12:05 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-gtkspell.patch, 1.1, 1.2 logjam-4.5.3-no_quit_when_docked.patch, 1.1, 1.2 logjam-4.5.3-start_in_dock.patch, 1.1, 1.2 logjam.spec, 1.43, 1.44 Message-ID: <200807281812.m6SIC5Zh013196@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13060/F-8 Modified Files: logjam-4.5.3-gtkspell.patch logjam-4.5.3-no_quit_when_docked.patch logjam-4.5.3-start_in_dock.patch logjam.spec Log Message: fix dock related behaviors, fix patch8 to apply with fuzz=0 logjam-4.5.3-gtkspell.patch: Index: logjam-4.5.3-gtkspell.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-gtkspell.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-gtkspell.patch 6 Apr 2006 22:27:38 -0000 1.1 +++ logjam-4.5.3-gtkspell.patch 28 Jul 2008 18:11:35 -0000 1.2 @@ -1,7 +1,8 @@ ---- logjam-4.5.3/src/jamview.c.orig Sat Mar 25 16:56:46 2006 -+++ logjam-4.5.3/src/jamview.c Sat Mar 25 16:55:06 2006 -@@ -816,26 +816,30 @@ - +diff -up logjam-4.5.3/src/jamview.c.bz186906 logjam-4.5.3/src/jamview.c +--- logjam-4.5.3/src/jamview.c.bz186906 2005-06-19 14:05:40.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-07-28 13:54:29.000000000 -0400 +@@ -816,27 +816,31 @@ jam_view_set_doc(JamView *view, JamDoc * + void jam_view_settings_changed(JamView *view) { -#if 0 @@ -10,22 +11,22 @@ - if (conf.options.usespellcheck != hadspell) { - GtkSpell *spell; - if (conf.options.usespellcheck) { -+ GtkSpell *spell; -+ GError *err = NULL; -+ spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry)); -+ if (conf.options.usespellcheck) { -+ if (spell) { -+ if (!gtkspell_set_language(spell, conf.spell_language, &err)) { -+ jam_warning(NULL, // XXX GTK_WINDOW(view->jw), -+ _("GtkSpell error: %s"), err->message); -+ g_error_free(err); -+ } -+ } else { ++ GtkSpell *spell; ++ GError *err = NULL; ++ spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry)); ++ if (conf.options.usespellcheck) { ++ if (spell) { ++ if (!gtkspell_set_language(spell, conf.spell_language, &err)) { ++ jam_warning(NULL, // XXX GTK_WINDOW(view->jw), ++ _("GtkSpell error: %s"), err->message); ++ g_error_free(err); ++ } ++ } else { GError *err = NULL; - if (gtkspell_new_attach(GTK_TEXT_VIEW(fetcheentry(jw)), conf.spell_language , &err) == NULL) { - jam_warning(GTK_WINDOW(jw), -+ if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) { -+ jam_warning(NULL, ++ if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) { ++ jam_warning(NULL, _("GtkSpell error: %s"), err->message); conf.options.usespellcheck = FALSE; g_error_free(err); @@ -35,11 +36,12 @@ - if (spell) - gtkspell_detach(spell); } -+ } else { -+ if (spell) -+ gtkspell_detach(spell); ++ } else { ++ if (spell) ++ gtkspell_detach(spell); } --#endif #endif - if (conf.uifont) - jam_widget_set_font(view->entry, conf.uifont); +-#endif + if (conf.uifont) + jam_widget_set_font(view->entry, conf.uifont); + logjam-4.5.3-no_quit_when_docked.patch: Index: logjam-4.5.3-no_quit_when_docked.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-no_quit_when_docked.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-no_quit_when_docked.patch 2 Jul 2008 21:16:57 -0000 1.1 +++ logjam-4.5.3-no_quit_when_docked.patch 28 Jul 2008 18:11:35 -0000 1.2 @@ -1,15 +1,15 @@ -diff -up logjam-4.5.3/src/jam.c.no-quit-when-docked logjam-4.5.3/src/jam.c ---- logjam-4.5.3/src/jam.c.no-quit-when-docked 2008-05-18 10:31:30.000000000 +0300 -+++ logjam-4.5.3/src/jam.c 2008-05-18 10:48:33.000000000 +0300 -@@ -765,7 +765,11 @@ jam_quit(JamWin *jw) { +diff -up logjam-4.5.3/src/jam.c.no_quit_when_docked logjam-4.5.3/src/jam.c +--- logjam-4.5.3/src/jam.c.no_quit_when_docked 2008-07-28 13:55:37.000000000 -0400 ++++ logjam-4.5.3/src/jam.c 2008-07-28 14:00:57.000000000 -0400 +@@ -757,6 +757,11 @@ jam_quit(JamWin *jw) { static gboolean delete_event_cb(JamWin *jw) { +#ifdef USE_DOCK -+ gtk_widget_hide(GTK_WIDGET(jw)); -+#else - jam_quit(jw); ++ if (app.docklet) ++ gtk_widget_hide(GTK_WIDGET(jw)); ++ else +#endif + jam_quit(jw); return TRUE; /* don't ever let this delete the window; quit will do it. */ } - logjam-4.5.3-start_in_dock.patch: Index: logjam-4.5.3-start_in_dock.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-start_in_dock.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-start_in_dock.patch 13 May 2008 14:55:43 -0000 1.1 +++ logjam-4.5.3-start_in_dock.patch 28 Jul 2008 18:11:35 -0000 1.2 @@ -22,16 +22,29 @@ diff -up logjam-4.5.3/src/jam.c.orig logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.orig 2005-09-10 04:45:01.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-11 14:56:59.000000000 +0300 -@@ -832,7 +832,8 @@ jam_run(JamDoc *doc) { +@@ -832,8 +845,6 @@ gtk_widget_show(vbox); jam_update_actions(jw); - gtk_widget_show(GTK_WIDGET(jw)); -+ if (!conf.options.start_in_dock) -+ gtk_widget_show(GTK_WIDGET(jw)); - +- /* suck a bunch of events in. */ while (gtk_events_pending()) + gtk_main_iteration(); +@@ -853,7 +864,13 @@ + #ifdef USE_DOCK + if (conf.options.docklet) + docklet_setup(GTK_WINDOW(jw)); ++ ++ if (app.docklet) { ++ if (!conf.options.start_in_dock) ++ gtk_widget_show(GTK_WIDGET(jw)); ++ } else + #endif ++ gtk_widget_show(GTK_WIDGET(jw)); + + draftentry = jam_load_autosave(jw); + if (draftentry) { diff -up logjam-4.5.3/src/conf.h.orig logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.orig 2005-02-21 19:46:10.000000000 +0200 +++ logjam-4.5.3/src/conf.h 2008-05-11 14:54:16.000000000 +0300 @@ -55,14 +68,11 @@ #endif #ifndef G_OS_WIN32 -@@ -460,6 +462,10 @@ uisettings(JamWin *jw) { +@@ -460,6 +468,7 @@ uisettings(JamWin *jw) { g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(docklet_change_cb), jw); groupedbox_pack(GROUPEDBOX(misc), button, FALSE); -+ button = sw_make("ui_start_in_dock"); -+ g_signal_connect(G_OBJECT(button), "toggled", -+ NULL, NULL); -+ groupedbox_pack(GROUPEDBOX(misc), button, FALSE); ++ groupedbox_pack(GROUPEDBOX(misc), sw_make("ui_start_in_dock"), FALSE); #endif /* USE_DOCK */ return vbox; Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- logjam.spec 2 Jul 2008 21:43:57 -0000 1.43 +++ logjam.spec 28 Jul 2008 18:11:35 -0000 1.44 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 24%{?dist}.1 +Release: 25%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -119,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 28 2008 Tom "spot" Callaway - 4.5.3-25 +- fix docked behavior again (bz 447146) +- fix config option to start in dock again (bz 445998) +- fix patch8 to apply with fuzz=0 + * Wed Jul 2 2008 Tom "spot" Callaway - 4.5.3-24.1 - don't try to include non-existant patches From fedora-extras-commits at redhat.com Mon Jul 28 18:12:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 28 Jul 2008 18:12:06 GMT Subject: rpms/logjam/devel logjam-4.5.3-gtkspell.patch, 1.1, 1.2 logjam-4.5.3-no_quit_when_docked.patch, 1.1, 1.2 logjam-4.5.3-start_in_dock.patch, 1.1, 1.2 logjam.spec, 1.46, 1.47 Message-ID: <200807281812.m6SIC650013220@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13060/devel Modified Files: logjam-4.5.3-gtkspell.patch logjam-4.5.3-no_quit_when_docked.patch logjam-4.5.3-start_in_dock.patch logjam.spec Log Message: fix dock related behaviors, fix patch8 to apply with fuzz=0 logjam-4.5.3-gtkspell.patch: Index: logjam-4.5.3-gtkspell.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-gtkspell.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-gtkspell.patch 6 Apr 2006 22:27:38 -0000 1.1 +++ logjam-4.5.3-gtkspell.patch 28 Jul 2008 18:11:36 -0000 1.2 @@ -1,7 +1,8 @@ ---- logjam-4.5.3/src/jamview.c.orig Sat Mar 25 16:56:46 2006 -+++ logjam-4.5.3/src/jamview.c Sat Mar 25 16:55:06 2006 -@@ -816,26 +816,30 @@ - +diff -up logjam-4.5.3/src/jamview.c.bz186906 logjam-4.5.3/src/jamview.c +--- logjam-4.5.3/src/jamview.c.bz186906 2005-06-19 14:05:40.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-07-28 13:54:29.000000000 -0400 +@@ -816,27 +816,31 @@ jam_view_set_doc(JamView *view, JamDoc * + void jam_view_settings_changed(JamView *view) { -#if 0 @@ -10,22 +11,22 @@ - if (conf.options.usespellcheck != hadspell) { - GtkSpell *spell; - if (conf.options.usespellcheck) { -+ GtkSpell *spell; -+ GError *err = NULL; -+ spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry)); -+ if (conf.options.usespellcheck) { -+ if (spell) { -+ if (!gtkspell_set_language(spell, conf.spell_language, &err)) { -+ jam_warning(NULL, // XXX GTK_WINDOW(view->jw), -+ _("GtkSpell error: %s"), err->message); -+ g_error_free(err); -+ } -+ } else { ++ GtkSpell *spell; ++ GError *err = NULL; ++ spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry)); ++ if (conf.options.usespellcheck) { ++ if (spell) { ++ if (!gtkspell_set_language(spell, conf.spell_language, &err)) { ++ jam_warning(NULL, // XXX GTK_WINDOW(view->jw), ++ _("GtkSpell error: %s"), err->message); ++ g_error_free(err); ++ } ++ } else { GError *err = NULL; - if (gtkspell_new_attach(GTK_TEXT_VIEW(fetcheentry(jw)), conf.spell_language , &err) == NULL) { - jam_warning(GTK_WINDOW(jw), -+ if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) { -+ jam_warning(NULL, ++ if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) { ++ jam_warning(NULL, _("GtkSpell error: %s"), err->message); conf.options.usespellcheck = FALSE; g_error_free(err); @@ -35,11 +36,12 @@ - if (spell) - gtkspell_detach(spell); } -+ } else { -+ if (spell) -+ gtkspell_detach(spell); ++ } else { ++ if (spell) ++ gtkspell_detach(spell); } --#endif #endif - if (conf.uifont) - jam_widget_set_font(view->entry, conf.uifont); +-#endif + if (conf.uifont) + jam_widget_set_font(view->entry, conf.uifont); + logjam-4.5.3-no_quit_when_docked.patch: Index: logjam-4.5.3-no_quit_when_docked.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-no_quit_when_docked.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-no_quit_when_docked.patch 2 Jul 2008 21:17:38 -0000 1.1 +++ logjam-4.5.3-no_quit_when_docked.patch 28 Jul 2008 18:11:36 -0000 1.2 @@ -1,15 +1,15 @@ -diff -up logjam-4.5.3/src/jam.c.no-quit-when-docked logjam-4.5.3/src/jam.c ---- logjam-4.5.3/src/jam.c.no-quit-when-docked 2008-05-18 10:31:30.000000000 +0300 -+++ logjam-4.5.3/src/jam.c 2008-05-18 10:48:33.000000000 +0300 -@@ -765,7 +765,11 @@ jam_quit(JamWin *jw) { +diff -up logjam-4.5.3/src/jam.c.no_quit_when_docked logjam-4.5.3/src/jam.c +--- logjam-4.5.3/src/jam.c.no_quit_when_docked 2008-07-28 13:55:37.000000000 -0400 ++++ logjam-4.5.3/src/jam.c 2008-07-28 14:00:57.000000000 -0400 +@@ -757,6 +757,11 @@ jam_quit(JamWin *jw) { static gboolean delete_event_cb(JamWin *jw) { +#ifdef USE_DOCK -+ gtk_widget_hide(GTK_WIDGET(jw)); -+#else - jam_quit(jw); ++ if (app.docklet) ++ gtk_widget_hide(GTK_WIDGET(jw)); ++ else +#endif + jam_quit(jw); return TRUE; /* don't ever let this delete the window; quit will do it. */ } - logjam-4.5.3-start_in_dock.patch: Index: logjam-4.5.3-start_in_dock.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-start_in_dock.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-start_in_dock.patch 13 May 2008 14:56:07 -0000 1.1 +++ logjam-4.5.3-start_in_dock.patch 28 Jul 2008 18:11:36 -0000 1.2 @@ -22,16 +22,29 @@ diff -up logjam-4.5.3/src/jam.c.orig logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.orig 2005-09-10 04:45:01.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-11 14:56:59.000000000 +0300 -@@ -832,7 +832,8 @@ jam_run(JamDoc *doc) { +@@ -832,8 +845,6 @@ gtk_widget_show(vbox); jam_update_actions(jw); - gtk_widget_show(GTK_WIDGET(jw)); -+ if (!conf.options.start_in_dock) -+ gtk_widget_show(GTK_WIDGET(jw)); - +- /* suck a bunch of events in. */ while (gtk_events_pending()) + gtk_main_iteration(); +@@ -853,7 +864,13 @@ + #ifdef USE_DOCK + if (conf.options.docklet) + docklet_setup(GTK_WINDOW(jw)); ++ ++ if (app.docklet) { ++ if (!conf.options.start_in_dock) ++ gtk_widget_show(GTK_WIDGET(jw)); ++ } else + #endif ++ gtk_widget_show(GTK_WIDGET(jw)); + + draftentry = jam_load_autosave(jw); + if (draftentry) { diff -up logjam-4.5.3/src/conf.h.orig logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.orig 2005-02-21 19:46:10.000000000 +0200 +++ logjam-4.5.3/src/conf.h 2008-05-11 14:54:16.000000000 +0300 @@ -55,14 +68,11 @@ #endif #ifndef G_OS_WIN32 -@@ -460,6 +462,10 @@ uisettings(JamWin *jw) { +@@ -460,6 +468,7 @@ uisettings(JamWin *jw) { g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(docklet_change_cb), jw); groupedbox_pack(GROUPEDBOX(misc), button, FALSE); -+ button = sw_make("ui_start_in_dock"); -+ g_signal_connect(G_OBJECT(button), "toggled", -+ NULL, NULL); -+ groupedbox_pack(GROUPEDBOX(misc), button, FALSE); ++ groupedbox_pack(GROUPEDBOX(misc), sw_make("ui_start_in_dock"), FALSE); #endif /* USE_DOCK */ return vbox; Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- logjam.spec 2 Jul 2008 21:17:38 -0000 1.46 +++ logjam.spec 28 Jul 2008 18:11:36 -0000 1.47 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -119,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 28 2008 Tom "spot" Callaway - 4.5.3-25 +- fix docked behavior again (bz 447146) +- fix config option to start in dock again (bz 445998) +- fix patch8 to apply with fuzz=0 + * Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 - fix ukranian translation (bz 447145) - fix docked behavior (bz 447146) From fedora-extras-commits at redhat.com Mon Jul 28 18:12:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 28 Jul 2008 18:12:06 GMT Subject: rpms/logjam/F-9 logjam-4.5.3-gtkspell.patch, 1.1, 1.2 logjam-4.5.3-no_quit_when_docked.patch, 1.1, 1.2 logjam-4.5.3-start_in_dock.patch, 1.1, 1.2 logjam.spec, 1.46, 1.47 Message-ID: <200807281812.m6SIC6Hp013208@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13060/F-9 Modified Files: logjam-4.5.3-gtkspell.patch logjam-4.5.3-no_quit_when_docked.patch logjam-4.5.3-start_in_dock.patch logjam.spec Log Message: fix dock related behaviors, fix patch8 to apply with fuzz=0 logjam-4.5.3-gtkspell.patch: Index: logjam-4.5.3-gtkspell.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-9/logjam-4.5.3-gtkspell.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-gtkspell.patch 6 Apr 2006 22:27:38 -0000 1.1 +++ logjam-4.5.3-gtkspell.patch 28 Jul 2008 18:11:36 -0000 1.2 @@ -1,7 +1,8 @@ ---- logjam-4.5.3/src/jamview.c.orig Sat Mar 25 16:56:46 2006 -+++ logjam-4.5.3/src/jamview.c Sat Mar 25 16:55:06 2006 -@@ -816,26 +816,30 @@ - +diff -up logjam-4.5.3/src/jamview.c.bz186906 logjam-4.5.3/src/jamview.c +--- logjam-4.5.3/src/jamview.c.bz186906 2005-06-19 14:05:40.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-07-28 13:54:29.000000000 -0400 +@@ -816,27 +816,31 @@ jam_view_set_doc(JamView *view, JamDoc * + void jam_view_settings_changed(JamView *view) { -#if 0 @@ -10,22 +11,22 @@ - if (conf.options.usespellcheck != hadspell) { - GtkSpell *spell; - if (conf.options.usespellcheck) { -+ GtkSpell *spell; -+ GError *err = NULL; -+ spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry)); -+ if (conf.options.usespellcheck) { -+ if (spell) { -+ if (!gtkspell_set_language(spell, conf.spell_language, &err)) { -+ jam_warning(NULL, // XXX GTK_WINDOW(view->jw), -+ _("GtkSpell error: %s"), err->message); -+ g_error_free(err); -+ } -+ } else { ++ GtkSpell *spell; ++ GError *err = NULL; ++ spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry)); ++ if (conf.options.usespellcheck) { ++ if (spell) { ++ if (!gtkspell_set_language(spell, conf.spell_language, &err)) { ++ jam_warning(NULL, // XXX GTK_WINDOW(view->jw), ++ _("GtkSpell error: %s"), err->message); ++ g_error_free(err); ++ } ++ } else { GError *err = NULL; - if (gtkspell_new_attach(GTK_TEXT_VIEW(fetcheentry(jw)), conf.spell_language , &err) == NULL) { - jam_warning(GTK_WINDOW(jw), -+ if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) { -+ jam_warning(NULL, ++ if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) { ++ jam_warning(NULL, _("GtkSpell error: %s"), err->message); conf.options.usespellcheck = FALSE; g_error_free(err); @@ -35,11 +36,12 @@ - if (spell) - gtkspell_detach(spell); } -+ } else { -+ if (spell) -+ gtkspell_detach(spell); ++ } else { ++ if (spell) ++ gtkspell_detach(spell); } --#endif #endif - if (conf.uifont) - jam_widget_set_font(view->entry, conf.uifont); +-#endif + if (conf.uifont) + jam_widget_set_font(view->entry, conf.uifont); + logjam-4.5.3-no_quit_when_docked.patch: Index: logjam-4.5.3-no_quit_when_docked.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-9/logjam-4.5.3-no_quit_when_docked.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-no_quit_when_docked.patch 2 Jul 2008 21:17:33 -0000 1.1 +++ logjam-4.5.3-no_quit_when_docked.patch 28 Jul 2008 18:11:36 -0000 1.2 @@ -1,15 +1,15 @@ -diff -up logjam-4.5.3/src/jam.c.no-quit-when-docked logjam-4.5.3/src/jam.c ---- logjam-4.5.3/src/jam.c.no-quit-when-docked 2008-05-18 10:31:30.000000000 +0300 -+++ logjam-4.5.3/src/jam.c 2008-05-18 10:48:33.000000000 +0300 -@@ -765,7 +765,11 @@ jam_quit(JamWin *jw) { +diff -up logjam-4.5.3/src/jam.c.no_quit_when_docked logjam-4.5.3/src/jam.c +--- logjam-4.5.3/src/jam.c.no_quit_when_docked 2008-07-28 13:55:37.000000000 -0400 ++++ logjam-4.5.3/src/jam.c 2008-07-28 14:00:57.000000000 -0400 +@@ -757,6 +757,11 @@ jam_quit(JamWin *jw) { static gboolean delete_event_cb(JamWin *jw) { +#ifdef USE_DOCK -+ gtk_widget_hide(GTK_WIDGET(jw)); -+#else - jam_quit(jw); ++ if (app.docklet) ++ gtk_widget_hide(GTK_WIDGET(jw)); ++ else +#endif + jam_quit(jw); return TRUE; /* don't ever let this delete the window; quit will do it. */ } - logjam-4.5.3-start_in_dock.patch: Index: logjam-4.5.3-start_in_dock.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-9/logjam-4.5.3-start_in_dock.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-start_in_dock.patch 13 May 2008 14:55:53 -0000 1.1 +++ logjam-4.5.3-start_in_dock.patch 28 Jul 2008 18:11:36 -0000 1.2 @@ -22,16 +22,29 @@ diff -up logjam-4.5.3/src/jam.c.orig logjam-4.5.3/src/jam.c --- logjam-4.5.3/src/jam.c.orig 2005-09-10 04:45:01.000000000 +0300 +++ logjam-4.5.3/src/jam.c 2008-05-11 14:56:59.000000000 +0300 -@@ -832,7 +832,8 @@ jam_run(JamDoc *doc) { +@@ -832,8 +845,6 @@ gtk_widget_show(vbox); jam_update_actions(jw); - gtk_widget_show(GTK_WIDGET(jw)); -+ if (!conf.options.start_in_dock) -+ gtk_widget_show(GTK_WIDGET(jw)); - +- /* suck a bunch of events in. */ while (gtk_events_pending()) + gtk_main_iteration(); +@@ -853,7 +864,13 @@ + #ifdef USE_DOCK + if (conf.options.docklet) + docklet_setup(GTK_WINDOW(jw)); ++ ++ if (app.docklet) { ++ if (!conf.options.start_in_dock) ++ gtk_widget_show(GTK_WIDGET(jw)); ++ } else + #endif ++ gtk_widget_show(GTK_WIDGET(jw)); + + draftentry = jam_load_autosave(jw); + if (draftentry) { diff -up logjam-4.5.3/src/conf.h.orig logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.orig 2005-02-21 19:46:10.000000000 +0200 +++ logjam-4.5.3/src/conf.h 2008-05-11 14:54:16.000000000 +0300 @@ -55,14 +68,11 @@ #endif #ifndef G_OS_WIN32 -@@ -460,6 +462,10 @@ uisettings(JamWin *jw) { +@@ -460,6 +468,7 @@ uisettings(JamWin *jw) { g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(docklet_change_cb), jw); groupedbox_pack(GROUPEDBOX(misc), button, FALSE); -+ button = sw_make("ui_start_in_dock"); -+ g_signal_connect(G_OBJECT(button), "toggled", -+ NULL, NULL); -+ groupedbox_pack(GROUPEDBOX(misc), button, FALSE); ++ groupedbox_pack(GROUPEDBOX(misc), sw_make("ui_start_in_dock"), FALSE); #endif /* USE_DOCK */ return vbox; Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- logjam.spec 2 Jul 2008 21:17:33 -0000 1.46 +++ logjam.spec 28 Jul 2008 18:11:36 -0000 1.47 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -119,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 28 2008 Tom "spot" Callaway - 4.5.3-25 +- fix docked behavior again (bz 447146) +- fix config option to start in dock again (bz 445998) +- fix patch8 to apply with fuzz=0 + * Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 - fix ukranian translation (bz 447145) - fix docked behavior (bz 447146) From fedora-extras-commits at redhat.com Mon Jul 28 18:17:26 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 18:17:26 GMT Subject: rpms/phpMyAdmin/EL-4 .cvsignore, 1.18, 1.19 phpMyAdmin.spec, 1.26, 1.27 sources, 1.22, 1.23 Message-ID: <200807281817.m6SIHQN1013726@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13612/EL-4 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 25 Jul 2008 07:49:15 -0000 1.18 +++ .cvsignore 28 Jul 2008 18:16:56 -0000 1.19 @@ -1 +1 @@ -phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- phpMyAdmin.spec 25 Jul 2008 07:51:39 -0000 1.26 +++ phpMyAdmin.spec 28 Jul 2008 18:16:56 -0000 1.27 @@ -1,12 +1,12 @@ Name: phpMyAdmin Version: 2.11.8 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-rc1-all-languages +%setup -qn phpMyAdmin-%{version}-all-languages %install rm -rf %{buildroot} @@ -54,8 +54,8 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog -* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 -- Upstream released 2.11.8-rc1 (#456637) +* Mon Jul 28 2008 Robert Scheck 2.11.8-1 +- Upstream released 2.11.8 (#456637) * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Jul 2008 07:49:15 -0000 1.22 +++ sources 28 Jul 2008 18:16:56 -0000 1.23 @@ -1 +1 @@ -8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 18:17:27 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 18:17:27 GMT Subject: rpms/phpMyAdmin/F-8 .cvsignore, 1.19, 1.20 phpMyAdmin.spec, 1.26, 1.27 sources, 1.22, 1.23 Message-ID: <200807281817.m6SIHRUr013736@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13612/F-8 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 25 Jul 2008 07:49:16 -0000 1.19 +++ .cvsignore 28 Jul 2008 18:16:57 -0000 1.20 @@ -1 +1 @@ -phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/phpMyAdmin.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- phpMyAdmin.spec 25 Jul 2008 07:51:40 -0000 1.26 +++ phpMyAdmin.spec 28 Jul 2008 18:16:57 -0000 1.27 @@ -1,12 +1,12 @@ Name: phpMyAdmin Version: 2.11.8 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-rc1-all-languages +%setup -qn phpMyAdmin-%{version}-all-languages %install rm -rf %{buildroot} @@ -54,8 +54,8 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog -* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 -- Upstream released 2.11.8-rc1 (#456637) +* Mon Jul 28 2008 Robert Scheck 2.11.8-1 +- Upstream released 2.11.8 (#456637) * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Jul 2008 07:49:16 -0000 1.22 +++ sources 28 Jul 2008 18:16:57 -0000 1.23 @@ -1 +1 @@ -8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 18:17:27 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 18:17:27 GMT Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.22, 1.23 phpMyAdmin.spec, 1.26, 1.27 sources, 1.22, 1.23 Message-ID: <200807281817.m6SIHRW1013741@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13612/F-9 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Jul 2008 07:49:17 -0000 1.22 +++ .cvsignore 28 Jul 2008 18:16:57 -0000 1.23 @@ -1 +1 @@ -phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- phpMyAdmin.spec 25 Jul 2008 07:51:40 -0000 1.26 +++ phpMyAdmin.spec 28 Jul 2008 18:16:57 -0000 1.27 @@ -1,12 +1,12 @@ Name: phpMyAdmin Version: 2.11.8 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-rc1-all-languages +%setup -qn phpMyAdmin-%{version}-all-languages %install rm -rf %{buildroot} @@ -54,8 +54,8 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog -* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 -- Upstream released 2.11.8-rc1 (#456637) +* Mon Jul 28 2008 Robert Scheck 2.11.8-1 +- Upstream released 2.11.8 (#456637) * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Jul 2008 07:49:17 -0000 1.22 +++ sources 28 Jul 2008 18:16:57 -0000 1.23 @@ -1 +1 @@ -8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 18:17:50 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 18:17:50 GMT Subject: rpms/libatasmart/devel libatasmart.spec,1.1,1.2 Message-ID: <200807281817.m6SIHo4g013824@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libatasmart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13707 Modified Files: libatasmart.spec Log Message: minor cleanups Index: libatasmart.spec =================================================================== RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libatasmart.spec 28 Jul 2008 17:58:16 -0000 1.1 +++ libatasmart.spec 28 Jul 2008 18:17:19 -0000 1.2 @@ -13,13 +13,13 @@ health monitoring. %package devel -Summary: Development Files for libatasmart client development +Summary: Development Files for libatasmart Client Development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel -Development Files for libatasmart client development +Development Files for libatasmart Client Development %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -28,7 +28,7 @@ %setup -q %build -%configure --disable-static --disable-rpath +%configure --disable-static make %{?_smp_mflags} %install From fedora-extras-commits at redhat.com Mon Jul 28 18:17:26 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 18:17:26 GMT Subject: rpms/phpMyAdmin/EL-5 .cvsignore, 1.18, 1.19 phpMyAdmin.spec, 1.26, 1.27 sources, 1.22, 1.23 Message-ID: <200807281817.m6SIHQ4o013731@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13612/EL-5 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 25 Jul 2008 07:49:16 -0000 1.18 +++ .cvsignore 28 Jul 2008 18:16:56 -0000 1.19 @@ -1 +1 @@ -phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- phpMyAdmin.spec 25 Jul 2008 07:51:39 -0000 1.26 +++ phpMyAdmin.spec 28 Jul 2008 18:16:56 -0000 1.27 @@ -1,12 +1,12 @@ Name: phpMyAdmin Version: 2.11.8 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-rc1-all-languages +%setup -qn phpMyAdmin-%{version}-all-languages %install rm -rf %{buildroot} @@ -54,8 +54,8 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog -* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 -- Upstream released 2.11.8-rc1 (#456637) +* Mon Jul 28 2008 Robert Scheck 2.11.8-1 +- Upstream released 2.11.8 (#456637) * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Jul 2008 07:49:16 -0000 1.22 +++ sources 28 Jul 2008 18:16:56 -0000 1.23 @@ -1 +1 @@ -8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 18:17:28 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 18:17:28 GMT Subject: rpms/phpMyAdmin/devel .cvsignore, 1.22, 1.23 phpMyAdmin.spec, 1.26, 1.27 sources, 1.22, 1.23 Message-ID: <200807281817.m6SIHSvt013746@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13612/devel Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.8 (#456637) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Jul 2008 07:49:17 -0000 1.22 +++ .cvsignore 28 Jul 2008 18:16:57 -0000 1.23 @@ -1 +1 @@ -phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +phpMyAdmin-2.11.8-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- phpMyAdmin.spec 25 Jul 2008 07:51:41 -0000 1.26 +++ phpMyAdmin.spec 28 Jul 2008 18:16:57 -0000 1.27 @@ -1,12 +1,12 @@ Name: phpMyAdmin Version: 2.11.8 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet License: GPLv2+ URL: http://www.phpmyadmin.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-rc1-all-languages.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +26,7 @@ is available in 50 languages %prep -%setup -qn phpMyAdmin-%{version}-rc1-all-languages +%setup -qn phpMyAdmin-%{version}-all-languages %install rm -rf %{buildroot} @@ -54,8 +54,8 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog -* Fri Jul 25 2008 Robert Scheck 2.11.8-0.1 -- Upstream released 2.11.8-rc1 (#456637) +* Mon Jul 28 2008 Robert Scheck 2.11.8-1 +- Upstream released 2.11.8 (#456637) * Tue Jul 15 2008 Robert Scheck 2.11.7.1-1 - Upstream released 2.11.7.1 (#455520) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Jul 2008 07:49:17 -0000 1.22 +++ sources 28 Jul 2008 18:16:57 -0000 1.23 @@ -1 +1 @@ -8bc9b5543665f1769af22755fcef56c0 phpMyAdmin-2.11.8-rc1-all-languages.tar.bz2 +1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 18:21:06 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Mon, 28 Jul 2008 18:21:06 GMT Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit-script.pa, NONE, 1.1 jack-audio-connection-kit-README.Fedora, 1.2, 1.3 jack-audio-connection-kit.spec, 1.23, 1.24 Message-ID: <200807281821.m6SIL6dw014128@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14102 Modified Files: jack-audio-connection-kit-README.Fedora jack-audio-connection-kit.spec Added Files: jack-audio-connection-kit-script.pa Log Message: Improve pulseaudio support. Fix postinstall script again (#456830) --- NEW FILE jack-audio-connection-kit-script.pa --- #!/usr/bin/pulseaudio -nF load-module module-jack-sink load-module module-jack-source load-module module-native-protocol-unix load-module module-volume-restore load-module module-default-device-restore load-module module-rescue-streams load-module module-suspend-on-idle .ifexists module-gconf.so .nofail load-module module-gconf .fail .endif .ifexists module-x11-publish.so .nofail load-module module-x11-publish .fail .endif Index: jack-audio-connection-kit-README.Fedora =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit-README.Fedora,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jack-audio-connection-kit-README.Fedora 20 Jul 2008 15:17:12 -0000 1.2 +++ jack-audio-connection-kit-README.Fedora 28 Jul 2008 18:20:36 -0000 1.3 @@ -11,7 +11,7 @@ Add yourself to the pulse-rt and jackuser groups. usermod -a -G pulse-rt,jackaudio "" -Edit /etc/security/limits.conf: +Check /etc/security/limits.conf (our package should provide these changes): @jackuser - rtprio 20 @jackuser - memlock 4194304 @@ -23,28 +23,9 @@ Create ~/bin subdirectory if absent: mkdir -p ~/bin -Create the pulseaudio start file ~/bin/jack.pa: - -#!/usr/bin/pulseaudio -nF - -load-module module-jack-sink -load-module module-jack-source - -load-module module-native-protocol-unix -load-module module-volume-restore -load-module module-default-device-restore -load-module module-rescue-streams -load-module module-suspend-on-idle -.ifexists module-gconf.so -.nofail -load-module module-gconf -.fail -.endif -.ifexists module-x11-publish.so -.nofail -load-module module-x11-publish -.fail -.endif +Copy the pulseaudio start file: + cp /usr/share/doc/jack-audio-connection-kit-*/jack-audio-connection-kit.pa ~/bin/jack.pa + chmod 755 ~/bin/jack.pa Close all your sessions and relogin to get the new group permissions and limits. Index: jack-audio-connection-kit.spec =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jack-audio-connection-kit.spec 20 Jul 2008 15:17:12 -0000 1.23 +++ jack-audio-connection-kit.spec 28 Jul 2008 18:20:36 -0000 1.24 @@ -1,11 +1,12 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.109.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 Group: System Environment/Daemons Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz Source1: %{name}-README.Fedora +Source2: %{name}-script.pa Patch0: jack-audio-connection-kit-0.109.2-bz451531.patch URL: http://www.jackaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,9 +19,11 @@ BuildRequires: libfreebob-devel >= 1.0.0 %define groupname jackuser +%define pagroup pulse-rt Requires(pre): shadow-utils Requires(post): /sbin/ldconfig +Requires(post): pam %description JACK is a low-latency audio server, written primarily for the Linux @@ -80,6 +83,9 @@ # prepare README.Fedora for documentation including install -p -m644 %{SOURCE1} README.Fedora +# install pulseaudio script for jack (as documentation part) +install -p -m644 %{SOURCE2} jack-audio-connection-kit.pa + # remove extra install of the documentation rm -fr $RPM_BUILD_ROOT%{_docdir} @@ -108,12 +114,21 @@ @%groupname - memlock 4194304 EOF +# Add default limits for pulse-rt group +grep -q %pagroup /etc/security/limits.conf > /dev/null 2>&1 || cat >> /etc/security/limits.conf << EOF + +## Automatically appended by jack-audio-connection-kit +@%pagroup - rtprio 20 +@%pagroup - nice -20 +EOF + %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS TODO COPYING* %doc README.Fedora +%doc jack-audio-connection-kit.pa %{_bindir}/jackd %{_bindir}/jack_load %{_bindir}/jack_unload @@ -148,6 +163,13 @@ %{_bindir}/jack_midisine %changelog +* Mon Jul 28 2008 Andy Shevchenko 0.109.2-3 +- add a new requirement to be ensure we have /etc/security for postinstall + script (#359291, #456830) +- provide a pulseaudio start script from README.Fedora +- append values for pulse-rt group to the limits.conf +- update README.Fedora regarding to the recent changes + * Sun Jul 20 2008 Andy Shevchenko 0.109.2-2 - apply patch to be work on ppc64 (#451531) - update README.Fedora to describe integration jack with pulseaudio (#455193) From fedora-extras-commits at redhat.com Mon Jul 28 18:24:36 2008 From: fedora-extras-commits at redhat.com (Behdad Esfahbod (behdad)) Date: Mon, 28 Jul 2008 18:24:36 GMT Subject: rpms/preload/devel .cvsignore, 1.4, 1.5 preload.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200807281824.m6SIOaUS014364@cvs-int.fedora.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/preload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14270 Modified Files: .cvsignore preload.spec sources Log Message: * Thu Jul 28 2008 Behdad Esfahbod - 0.6.2-1 - Update to 0.6.2 - Actually resolves bug #456742 this time Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Jul 2008 16:41:45 -0000 1.4 +++ .cvsignore 28 Jul 2008 18:24:06 -0000 1.5 @@ -1 +1 @@ -preload-0.6.1.tar.gz +preload-0.6.2.tar.gz Index: preload.spec =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/preload.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- preload.spec 28 Jul 2008 16:41:45 -0000 1.4 +++ preload.spec 28 Jul 2008 18:24:06 -0000 1.5 @@ -1,5 +1,5 @@ Name: preload -Version: 0.6.1 +Version: 0.6.2 Release: 1%{?dist} Summary: Preload is an adaptive readahead daemon @@ -72,6 +72,10 @@ %changelog +* Thu Jul 28 2008 Behdad Esfahbod - 0.6.2-1 +- Update to 0.6.2 +- Actually resolves bug #456742 this time + * Thu Jul 28 2008 Behdad Esfahbod - 0.6.1-1 - Update to 0.6.1 - Resolves bug #456742 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Jul 2008 16:41:45 -0000 1.4 +++ sources 28 Jul 2008 18:24:06 -0000 1.5 @@ -1 +1 @@ -c6b02f3f3bb669ddcf757cdb8b1e0942 preload-0.6.1.tar.gz +e15f016cf91486911dc828a2cde15562 preload-0.6.2.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 18:46:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 28 Jul 2008 18:46:11 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-showloginhistory.patch, NONE, 1.1 logjam.spec, 1.44, 1.45 Message-ID: <200807281846.m6SIkBTw014895@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/F-8 Modified Files: logjam.spec Added Files: logjam-4.5.3-showloginhistory.patch Log Message: add patch to make loginhistory display a configurable option logjam-4.5.3-showloginhistory.patch: --- NEW FILE logjam-4.5.3-showloginhistory.patch --- diff -up logjam-4.5.3/src/conf.h.BAD logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.BAD 2008-07-28 14:20:23.000000000 -0400 +++ logjam-4.5.3/src/conf.h 2008-07-28 14:21:08.000000000 -0400 @@ -59,6 +59,7 @@ typedef struct { gboolean friends_hidestats; gboolean allowmultipleinstances; gboolean smartquotes; + gboolean showloginhistory; gboolean showmeta[JAM_VIEW_META_COUNT]; gboolean start_in_dock; #endif /* HAVE_GTK */ diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.BAD 2008-07-28 14:19:17.000000000 -0400 +++ logjam-4.5.3/src/conf_xml.c 2008-07-28 14:20:16.000000000 -0400 @@ -191,6 +191,7 @@ parseoptions(Configuration *c, xmlDocPtr READOPTION(friends_hidestats) READOPTION(allowmultipleinstances) READOPTION(smartquotes) + READOPTION(showloginhistory) XML_GET_IF("showmeta", parseshowmeta(options, doc, node);) @@ -335,6 +336,7 @@ writeoptions(Options *options, xmlNodePt WRITEOPTION(friends_hidestats); WRITEOPTION(allowmultipleinstances); WRITEOPTION(smartquotes); + WRITEOPTION(showloginhistory); writeshowmeta(options, node); #endif /* HAVE_GTK */ diff -up logjam-4.5.3/src/login.c.BAD logjam-4.5.3/src/login.c --- logjam-4.5.3/src/login.c.BAD 2008-07-28 14:30:27.000000000 -0400 +++ logjam-4.5.3/src/login.c 2008-07-28 14:30:55.000000000 -0400 @@ -292,6 +292,9 @@ login_check_lastupdate(GtkWindow *parent gboolean ret = TRUE; JamAccount *acc = JAM_ACCOUNT(acclj); + if (!conf.options.showloginhistory) + return TRUE; + deltat = time(NULL) - acclj->lastupdate; if (deltat < 2 * 7 * 24 * 60 * 60) /* two weeks. */ return TRUE; diff -up logjam-4.5.3/src/settings.c.BAD logjam-4.5.3/src/settings.c --- logjam-4.5.3/src/settings.c.BAD 2008-07-28 14:21:36.000000000 -0400 +++ logjam-4.5.3/src/settings.c 2008-07-28 14:24:59.000000000 -0400 @@ -80,6 +80,8 @@ static SettingsWidget settingswidgets[] { "ui_spell_language", &conf.spell_language, SW_TEXT, N_("Entry _language:") }, #endif + { "ui_showloginhistory", &conf.options.showloginhistory, + SW_TOGGLE, N_("Show login history (number of days since last login)") }, { "ui_smartquotes", &conf.options.smartquotes, SW_TOGGLE, N_("Automatically change _quotes to matching pairs") }, { "ui_font", &conf.uifont, @@ -430,6 +432,7 @@ uisettings(JamWin *jw) { } #endif + groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_showloginhistory"), TRUE); groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_smartquotes"), FALSE); Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- logjam.spec 28 Jul 2008 18:11:35 -0000 1.44 +++ logjam.spec 28 Jul 2008 18:45:41 -0000 1.45 @@ -37,6 +37,7 @@ Patch18: logjam-4.5.3-no_quit_when_docked.patch Patch19: logjam-4.5.3-close_when_send.patch Patch20: logjam-4.5.3-imageresize.patch +Patch21: logjam-4.5.3-showloginhistory.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -75,6 +76,7 @@ %patch18 -p1 -b .no_quit_when_docked %patch19 -p1 -b .close_when_send %patch20 -p1 -b .imageresize +%patch21 -p1 -b .showloginhistory %build touch NEWS README AUTHORS @@ -123,6 +125,7 @@ - fix docked behavior again (bz 447146) - fix config option to start in dock again (bz 445998) - fix patch8 to apply with fuzz=0 +- add patch to enable/disable "logged in since" history popup as config option * Wed Jul 2 2008 Tom "spot" Callaway - 4.5.3-24.1 - don't try to include non-existant patches From fedora-extras-commits at redhat.com Mon Jul 28 18:46:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 28 Jul 2008 18:46:12 GMT Subject: rpms/logjam/F-9 logjam-4.5.3-showloginhistory.patch, NONE, 1.1 logjam.spec, 1.47, 1.48 Message-ID: <200807281846.m6SIkClX014899@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/F-9 Modified Files: logjam.spec Added Files: logjam-4.5.3-showloginhistory.patch Log Message: add patch to make loginhistory display a configurable option logjam-4.5.3-showloginhistory.patch: --- NEW FILE logjam-4.5.3-showloginhistory.patch --- diff -up logjam-4.5.3/src/conf.h.BAD logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.BAD 2008-07-28 14:20:23.000000000 -0400 +++ logjam-4.5.3/src/conf.h 2008-07-28 14:21:08.000000000 -0400 @@ -59,6 +59,7 @@ typedef struct { gboolean friends_hidestats; gboolean allowmultipleinstances; gboolean smartquotes; + gboolean showloginhistory; gboolean showmeta[JAM_VIEW_META_COUNT]; gboolean start_in_dock; #endif /* HAVE_GTK */ diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.BAD 2008-07-28 14:19:17.000000000 -0400 +++ logjam-4.5.3/src/conf_xml.c 2008-07-28 14:20:16.000000000 -0400 @@ -191,6 +191,7 @@ parseoptions(Configuration *c, xmlDocPtr READOPTION(friends_hidestats) READOPTION(allowmultipleinstances) READOPTION(smartquotes) + READOPTION(showloginhistory) XML_GET_IF("showmeta", parseshowmeta(options, doc, node);) @@ -335,6 +336,7 @@ writeoptions(Options *options, xmlNodePt WRITEOPTION(friends_hidestats); WRITEOPTION(allowmultipleinstances); WRITEOPTION(smartquotes); + WRITEOPTION(showloginhistory); writeshowmeta(options, node); #endif /* HAVE_GTK */ diff -up logjam-4.5.3/src/login.c.BAD logjam-4.5.3/src/login.c --- logjam-4.5.3/src/login.c.BAD 2008-07-28 14:30:27.000000000 -0400 +++ logjam-4.5.3/src/login.c 2008-07-28 14:30:55.000000000 -0400 @@ -292,6 +292,9 @@ login_check_lastupdate(GtkWindow *parent gboolean ret = TRUE; JamAccount *acc = JAM_ACCOUNT(acclj); + if (!conf.options.showloginhistory) + return TRUE; + deltat = time(NULL) - acclj->lastupdate; if (deltat < 2 * 7 * 24 * 60 * 60) /* two weeks. */ return TRUE; diff -up logjam-4.5.3/src/settings.c.BAD logjam-4.5.3/src/settings.c --- logjam-4.5.3/src/settings.c.BAD 2008-07-28 14:21:36.000000000 -0400 +++ logjam-4.5.3/src/settings.c 2008-07-28 14:24:59.000000000 -0400 @@ -80,6 +80,8 @@ static SettingsWidget settingswidgets[] { "ui_spell_language", &conf.spell_language, SW_TEXT, N_("Entry _language:") }, #endif + { "ui_showloginhistory", &conf.options.showloginhistory, + SW_TOGGLE, N_("Show login history (number of days since last login)") }, { "ui_smartquotes", &conf.options.smartquotes, SW_TOGGLE, N_("Automatically change _quotes to matching pairs") }, { "ui_font", &conf.uifont, @@ -430,6 +432,7 @@ uisettings(JamWin *jw) { } #endif + groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_showloginhistory"), TRUE); groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_smartquotes"), FALSE); Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-9/logjam.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- logjam.spec 28 Jul 2008 18:11:36 -0000 1.47 +++ logjam.spec 28 Jul 2008 18:45:42 -0000 1.48 @@ -38,6 +38,7 @@ Patch18: logjam-4.5.3-no_quit_when_docked.patch Patch19: logjam-4.5.3-close_when_send.patch Patch20: logjam-4.5.3-imageresize.patch +Patch21: logjam-4.5.3-showloginhistory.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -75,6 +76,7 @@ %patch18 -p1 -b .no_quit_when_docked %patch19 -p1 -b .close_when_send %patch20 -p1 -b .imageresize +%patch21 -p1 -b .showloginhistory %build touch NEWS README AUTHORS @@ -123,6 +125,7 @@ - fix docked behavior again (bz 447146) - fix config option to start in dock again (bz 445998) - fix patch8 to apply with fuzz=0 +- add patch to enable/disable "logged in since" history popup as config option * Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 - fix ukranian translation (bz 447145) From fedora-extras-commits at redhat.com Mon Jul 28 18:46:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 28 Jul 2008 18:46:12 GMT Subject: rpms/logjam/devel logjam-4.5.3-showloginhistory.patch, NONE, 1.1 logjam.spec, 1.47, 1.48 Message-ID: <200807281846.m6SIkCLl014902@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/devel Modified Files: logjam.spec Added Files: logjam-4.5.3-showloginhistory.patch Log Message: add patch to make loginhistory display a configurable option logjam-4.5.3-showloginhistory.patch: --- NEW FILE logjam-4.5.3-showloginhistory.patch --- diff -up logjam-4.5.3/src/conf.h.BAD logjam-4.5.3/src/conf.h --- logjam-4.5.3/src/conf.h.BAD 2008-07-28 14:20:23.000000000 -0400 +++ logjam-4.5.3/src/conf.h 2008-07-28 14:21:08.000000000 -0400 @@ -59,6 +59,7 @@ typedef struct { gboolean friends_hidestats; gboolean allowmultipleinstances; gboolean smartquotes; + gboolean showloginhistory; gboolean showmeta[JAM_VIEW_META_COUNT]; gboolean start_in_dock; #endif /* HAVE_GTK */ diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.BAD 2008-07-28 14:19:17.000000000 -0400 +++ logjam-4.5.3/src/conf_xml.c 2008-07-28 14:20:16.000000000 -0400 @@ -191,6 +191,7 @@ parseoptions(Configuration *c, xmlDocPtr READOPTION(friends_hidestats) READOPTION(allowmultipleinstances) READOPTION(smartquotes) + READOPTION(showloginhistory) XML_GET_IF("showmeta", parseshowmeta(options, doc, node);) @@ -335,6 +336,7 @@ writeoptions(Options *options, xmlNodePt WRITEOPTION(friends_hidestats); WRITEOPTION(allowmultipleinstances); WRITEOPTION(smartquotes); + WRITEOPTION(showloginhistory); writeshowmeta(options, node); #endif /* HAVE_GTK */ diff -up logjam-4.5.3/src/login.c.BAD logjam-4.5.3/src/login.c --- logjam-4.5.3/src/login.c.BAD 2008-07-28 14:30:27.000000000 -0400 +++ logjam-4.5.3/src/login.c 2008-07-28 14:30:55.000000000 -0400 @@ -292,6 +292,9 @@ login_check_lastupdate(GtkWindow *parent gboolean ret = TRUE; JamAccount *acc = JAM_ACCOUNT(acclj); + if (!conf.options.showloginhistory) + return TRUE; + deltat = time(NULL) - acclj->lastupdate; if (deltat < 2 * 7 * 24 * 60 * 60) /* two weeks. */ return TRUE; diff -up logjam-4.5.3/src/settings.c.BAD logjam-4.5.3/src/settings.c --- logjam-4.5.3/src/settings.c.BAD 2008-07-28 14:21:36.000000000 -0400 +++ logjam-4.5.3/src/settings.c 2008-07-28 14:24:59.000000000 -0400 @@ -80,6 +80,8 @@ static SettingsWidget settingswidgets[] { "ui_spell_language", &conf.spell_language, SW_TEXT, N_("Entry _language:") }, #endif + { "ui_showloginhistory", &conf.options.showloginhistory, + SW_TOGGLE, N_("Show login history (number of days since last login)") }, { "ui_smartquotes", &conf.options.smartquotes, SW_TOGGLE, N_("Automatically change _quotes to matching pairs") }, { "ui_font", &conf.uifont, @@ -430,6 +432,7 @@ uisettings(JamWin *jw) { } #endif + groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_showloginhistory"), TRUE); groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_smartquotes"), FALSE); Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- logjam.spec 28 Jul 2008 18:11:36 -0000 1.47 +++ logjam.spec 28 Jul 2008 18:45:42 -0000 1.48 @@ -38,6 +38,7 @@ Patch18: logjam-4.5.3-no_quit_when_docked.patch Patch19: logjam-4.5.3-close_when_send.patch Patch20: logjam-4.5.3-imageresize.patch +Patch21: logjam-4.5.3-showloginhistory.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -75,6 +76,7 @@ %patch18 -p1 -b .no_quit_when_docked %patch19 -p1 -b .close_when_send %patch20 -p1 -b .imageresize +%patch21 -p1 -b .showloginhistory %build touch NEWS README AUTHORS @@ -123,6 +125,7 @@ - fix docked behavior again (bz 447146) - fix config option to start in dock again (bz 445998) - fix patch8 to apply with fuzz=0 +- add patch to enable/disable "logged in since" history popup as config option * Tue Jul 1 2008 Tom "spot" Callaway - 4.5.3-24 - fix ukranian translation (bz 447145) From fedora-extras-commits at redhat.com Mon Jul 28 18:52:22 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Mon, 28 Jul 2008 18:52:22 GMT Subject: rpms/gcc/devel gcc43-build-id.patch, 1.1, 1.2 gcc43-rh330771.patch, 1.1, 1.2 Message-ID: <200807281852.m6SIqM9L015140@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15107 Modified Files: gcc43-build-id.patch gcc43-rh330771.patch Log Message: 4.3.1-5 gcc43-build-id.patch: Index: gcc43-build-id.patch =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43-build-id.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc43-build-id.patch 12 Dec 2007 20:16:35 -0000 1.1 +++ gcc43-build-id.patch 28 Jul 2008 18:51:52 -0000 1.2 @@ -10,8 +10,8 @@ --- gcc/config/rs6000/sysv4.h.~1~ +++ gcc/config/rs6000/sysv4.h -@@ -1044,7 +1044,7 @@ extern int fixuplabelno; - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" +@@ -906,7 +906,7 @@ extern int fixuplabelno; + %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" #if defined(HAVE_LD_EH_FRAME_HDR) -# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " gcc43-rh330771.patch: Index: gcc43-rh330771.patch =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43-rh330771.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc43-rh330771.patch 12 Dec 2007 20:16:35 -0000 1.1 +++ gcc43-rh330771.patch 28 Jul 2008 18:51:52 -0000 1.2 @@ -5,30 +5,30 @@ --- libjava/Makefile.am.jj 2007-03-17 09:20:30.000000000 +0100 +++ libjava/Makefile.am 2007-10-16 15:45:14.000000000 +0200 -@@ -262,6 +262,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje +@@ -277,6 +277,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje libgcj_tools_la_SOURCES = classpath/tools/tools.zip libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst +## See jv_convert_LDADD. +libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` - libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec + -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) --- libjava/Makefile.in.jj 2007-07-04 21:11:11.000000000 +0200 +++ libjava/Makefile.in 2007-10-16 15:56:07.000000000 +0200 -@@ -146,7 +146,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt +@@ -153,7 +153,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1) lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS) @XLIB_AWT_TRUE at am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir) -libgcj_tools_la_LIBADD = am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS) - am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \ -@@ -894,6 +893,7 @@ libgcj_la_LINK = $(LIBLINK) + @INTERPRETER_TRUE at am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \ +@@ -941,6 +940,7 @@ libgcj_la_LINK = $(LIBLINK) EXTRA_libgcj_la_SOURCES = java/lang/Object.java libgcj_tools_la_SOURCES = classpath/tools/tools.zip libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst +libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` - + -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) From fedora-extras-commits at redhat.com Mon Jul 28 19:05:02 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 28 Jul 2008 19:05:02 GMT Subject: rpms/kdebase-workspace/F-9 .cvsignore, 1.12, 1.13 kdebase-workspace.spec, 1.95, 1.96 sources, 1.14, 1.15 Message-ID: <200807281905.m6SJ52Ai022258@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22212/F-9 Modified Files: .cvsignore kdebase-workspace.spec sources Log Message: * Mon Jul 28 2008 Rex Dieter 4.1.0-3 - respun tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 25 Jul 2008 14:02:10 -0000 1.12 +++ .cvsignore 28 Jul 2008 19:04:32 -0000 1.13 @@ -1,2 +1 @@ -kdebase-workspace-4.0.99.tar.bz2 kdebase-workspace-4.1.0.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- kdebase-workspace.spec 27 Jul 2008 20:00:17 -0000 1.95 +++ kdebase-workspace.spec 28 Jul 2008 19:04:32 -0000 1.96 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -301,6 +301,9 @@ %changelog +* Mon Jul 28 2008 Rex Dieter 4.1.0-3 +- respun tarball + * Sun Jul 27 2008 Kevin Kofler 4.1.0-2 - updated tooltip manager from 4.2 (fixes Plasma crash on theme change, #456820) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 25 Jul 2008 14:02:10 -0000 1.14 +++ sources 28 Jul 2008 19:04:32 -0000 1.15 @@ -1 +1 @@ -3b7db1a9860c68165f2cdc3d301974f6 kdebase-workspace-4.1.0.tar.bz2 +6d08adbb9944dea896ac65fd60d72377 kdebase-workspace-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 19:05:03 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 28 Jul 2008 19:05:03 GMT Subject: rpms/kdebase-workspace/devel .cvsignore, 1.17, 1.18 kdebase-workspace.spec, 1.113, 1.114 sources, 1.20, 1.21 Message-ID: <200807281905.m6SJ53Tb022263@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22212/devel Modified Files: .cvsignore kdebase-workspace.spec sources Log Message: * Mon Jul 28 2008 Rex Dieter 4.1.0-3 - respun tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 23 Jul 2008 13:52:49 -0000 1.17 +++ .cvsignore 28 Jul 2008 19:04:32 -0000 1.18 @@ -1,2 +1 @@ -kdebase-workspace-4.0.99.tar.bz2 kdebase-workspace-4.1.0.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- kdebase-workspace.spec 27 Jul 2008 19:58:48 -0000 1.113 +++ kdebase-workspace.spec 28 Jul 2008 19:04:32 -0000 1.114 @@ -4,7 +4,7 @@ Name: kdebase-workspace Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -301,6 +301,9 @@ %changelog +* Mon Jul 28 2008 Rex Dieter 4.1.0-3 +- respun tarball + * Sun Jul 27 2008 Kevin Kofler 4.1.0-2 - updated tooltip manager from 4.2 (fixes Plasma crash on theme change, #456820) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 23 Jul 2008 13:52:49 -0000 1.20 +++ sources 28 Jul 2008 19:04:32 -0000 1.21 @@ -1 +1 @@ -3b7db1a9860c68165f2cdc3d301974f6 kdebase-workspace-4.1.0.tar.bz2 +6d08adbb9944dea896ac65fd60d72377 kdebase-workspace-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 19:09:27 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Mon, 28 Jul 2008 19:09:27 GMT Subject: rpms/jack-audio-connection-kit/F-9 jack-audio-connection-kit-script.pa, NONE, 1.1 jack-audio-connection-kit-README.Fedora, 1.2, 1.3 jack-audio-connection-kit.spec, 1.23, 1.24 Message-ID: <200807281909.m6SJ9RKJ022581@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22490 Modified Files: jack-audio-connection-kit-README.Fedora jack-audio-connection-kit.spec Added Files: jack-audio-connection-kit-script.pa Log Message: Improve pulseaudio support. Fix postinstall script again (#456830) --- NEW FILE jack-audio-connection-kit-script.pa --- #!/usr/bin/pulseaudio -nF load-module module-jack-sink load-module module-jack-source load-module module-native-protocol-unix load-module module-volume-restore load-module module-default-device-restore load-module module-rescue-streams load-module module-suspend-on-idle .ifexists module-gconf.so .nofail load-module module-gconf .fail .endif .ifexists module-x11-publish.so .nofail load-module module-x11-publish .fail .endif Index: jack-audio-connection-kit-README.Fedora =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-9/jack-audio-connection-kit-README.Fedora,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jack-audio-connection-kit-README.Fedora 20 Jul 2008 15:34:17 -0000 1.2 +++ jack-audio-connection-kit-README.Fedora 28 Jul 2008 19:08:56 -0000 1.3 @@ -11,7 +11,7 @@ Add yourself to the pulse-rt and jackuser groups. usermod -a -G pulse-rt,jackaudio "" -Edit /etc/security/limits.conf: +Check /etc/security/limits.conf (our package should provide these changes): @jackuser - rtprio 20 @jackuser - memlock 4194304 @@ -23,28 +23,9 @@ Create ~/bin subdirectory if absent: mkdir -p ~/bin -Create the pulseaudio start file ~/bin/jack.pa: - -#!/usr/bin/pulseaudio -nF - -load-module module-jack-sink -load-module module-jack-source - -load-module module-native-protocol-unix -load-module module-volume-restore -load-module module-default-device-restore -load-module module-rescue-streams -load-module module-suspend-on-idle -.ifexists module-gconf.so -.nofail -load-module module-gconf -.fail -.endif -.ifexists module-x11-publish.so -.nofail -load-module module-x11-publish -.fail -.endif +Copy the pulseaudio start file: + cp /usr/share/doc/jack-audio-connection-kit-*/jack-audio-connection-kit.pa ~/bin/jack.pa + chmod 755 ~/bin/jack.pa Close all your sessions and relogin to get the new group permissions and limits. Index: jack-audio-connection-kit.spec =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-9/jack-audio-connection-kit.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jack-audio-connection-kit.spec 20 Jul 2008 15:34:17 -0000 1.23 +++ jack-audio-connection-kit.spec 28 Jul 2008 19:08:56 -0000 1.24 @@ -1,11 +1,12 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.109.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 Group: System Environment/Daemons Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz Source1: %{name}-README.Fedora +Source2: %{name}-script.pa Patch0: jack-audio-connection-kit-0.109.2-bz451531.patch URL: http://www.jackaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,9 +19,11 @@ BuildRequires: libfreebob-devel >= 1.0.0 %define groupname jackuser +%define pagroup pulse-rt Requires(pre): shadow-utils Requires(post): /sbin/ldconfig +Requires(post): pam %description JACK is a low-latency audio server, written primarily for the Linux @@ -80,6 +83,9 @@ # prepare README.Fedora for documentation including install -p -m644 %{SOURCE1} README.Fedora +# install pulseaudio script for jack (as documentation part) +install -p -m644 %{SOURCE2} jack-audio-connection-kit.pa + # remove extra install of the documentation rm -fr $RPM_BUILD_ROOT%{_docdir} @@ -108,12 +114,21 @@ @%groupname - memlock 4194304 EOF +# Add default limits for pulse-rt group +grep -q %pagroup /etc/security/limits.conf > /dev/null 2>&1 || cat >> /etc/security/limits.conf << EOF + +## Automatically appended by jack-audio-connection-kit +@%pagroup - rtprio 20 +@%pagroup - nice -20 +EOF + %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS TODO COPYING* %doc README.Fedora +%doc jack-audio-connection-kit.pa %{_bindir}/jackd %{_bindir}/jack_load %{_bindir}/jack_unload @@ -148,6 +163,13 @@ %{_bindir}/jack_midisine %changelog +* Mon Jul 28 2008 Andy Shevchenko 0.109.2-3 +- add a new requirement to be ensure we have /etc/security for postinstall + script (#359291, #456830) +- provide a pulseaudio start script from README.Fedora +- append values for pulse-rt group to the limits.conf +- update README.Fedora regarding to the recent changes + * Sun Jul 20 2008 Andy Shevchenko 0.109.2-2 - apply patch to be work on ppc64 (#451531) - update README.Fedora to describe integration jack with pulseaudio (#455193) From fedora-extras-commits at redhat.com Mon Jul 28 19:10:12 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Mon, 28 Jul 2008 19:10:12 GMT Subject: rpms/kernel/F-9 patch-2.6.25.13.bz2.sign, NONE, 1.1 .cvsignore, 1.820, 1.821 kernel.spec, 1.721, 1.722 sources, 1.781, 1.782 upstream, 1.700, 1.701 linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch, 1.1, NONE patch-2.6.25.12.bz2.sign, 1.1, NONE Message-ID: <200807281910.m6SJAC46022672@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22621 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25.13.bz2.sign Removed Files: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch patch-2.6.25.12.bz2.sign Log Message: * Mon Jul 28 2008 Kyle McMartin 2.6.25.13-103 - Linux 2.6.25.13 --- NEW FILE patch-2.6.25.13.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIjgvWyGugalF9Dw4RAj9SAJ4iRCHZhaP5dCiI50Fh18nDHcruWwCglZyt hglGNdi64+GvImes2r5mOrw= =tYN8 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v retrieving revision 1.820 retrieving revision 1.821 diff -u -r1.820 -r1.821 --- .cvsignore 24 Jul 2008 21:06:33 -0000 1.820 +++ .cvsignore 28 Jul 2008 19:09:42 -0000 1.821 @@ -4,4 +4,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.12.bz2 +patch-2.6.25.13.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.721 retrieving revision 1.722 diff -u -r1.721 -r1.722 --- kernel.spec 26 Jul 2008 00:30:10 -0000 1.721 +++ kernel.spec 28 Jul 2008 19:09:42 -0000 1.722 @@ -31,7 +31,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 12 +%define stable_update 13 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -621,7 +621,6 @@ Patch424: linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch Patch430: linux-2.6-net-silence-noisy-printks.patch -Patch431: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch Patch450: linux-2.6-input-kill-stupid-messages.patch Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch @@ -1180,8 +1179,6 @@ # Networking # Disable easy to trigger printk's. ApplyPatch linux-2.6-net-silence-noisy-printks.patch -# CVE-2008-2750: l2tp heap overflow -ApplyPatch linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch # Misc fixes # The input layer spews crap no-one cares about. @@ -1886,6 +1883,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Mon Jul 28 2008 Kyle McMartin 2.6.25.13-103 +- Linux 2.6.25.13 + * Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-102 - Fix 64-bit resource checking on 32-bit kernels. (#447143) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v retrieving revision 1.781 retrieving revision 1.782 diff -u -r1.781 -r1.782 --- sources 24 Jul 2008 21:06:33 -0000 1.781 +++ sources 28 Jul 2008 19:09:42 -0000 1.782 @@ -1,2 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -584efcae6ee19b118e3b013e939df04f patch-2.6.25.12.bz2 +39578e23ad899c2a418c7ca89b4248bb patch-2.6.25.13.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v retrieving revision 1.700 retrieving revision 1.701 diff -u -r1.700 -r1.701 --- upstream 24 Jul 2008 21:06:33 -0000 1.700 +++ upstream 28 Jul 2008 19:09:42 -0000 1.701 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.12.bz2 +patch-2.6.25.13.bz2 --- linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch DELETED --- --- patch-2.6.25.12.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 19:11:20 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Mon, 28 Jul 2008 19:11:20 GMT Subject: rpms/kernel/F-8 patch-2.6.25.13.bz2.sign, NONE, 1.1 .cvsignore, 1.731, 1.732 kernel.spec, 1.504, 1.505 sources, 1.692, 1.693 upstream, 1.612, 1.613 linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch, 1.1, NONE patch-2.6.25.12.bz2.sign, 1.1, NONE Message-ID: <200807281911.m6SJBKks022729@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22697 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25.13.bz2.sign Removed Files: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch patch-2.6.25.12.bz2.sign Log Message: * Sun Jul 28 2008 Kyle McMartin 2.6.25.13-65 - Linux 2.6.25.13 --- NEW FILE patch-2.6.25.13.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIjgvWyGugalF9Dw4RAj9SAJ4iRCHZhaP5dCiI50Fh18nDHcruWwCglZyt hglGNdi64+GvImes2r5mOrw= =tYN8 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- .cvsignore 24 Jul 2008 21:23:35 -0000 1.731 +++ .cvsignore 28 Jul 2008 19:10:50 -0000 1.732 @@ -3,4 +3,4 @@ temp-* kernel-2.6.25 linux-2.6.25.tar.bz2 -patch-2.6.25.12.bz2 +patch-2.6.25.13.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.504 retrieving revision 1.505 diff -u -r1.504 -r1.505 --- kernel.spec 26 Jul 2008 00:30:31 -0000 1.504 +++ kernel.spec 28 Jul 2008 19:10:50 -0000 1.505 @@ -33,7 +33,7 @@ ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 12 +%define stable_update 13 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -629,7 +629,6 @@ Patch428: linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch Patch430: linux-2.6-net-silence-noisy-printks.patch -Patch431: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch Patch440: linux-2.6-sha_alignment.patch Patch450: linux-2.6-input-kill-stupid-messages.patch @@ -1127,8 +1126,6 @@ # Networking # Disable easy to trigger printk's. ApplyPatch linux-2.6-net-silence-noisy-printks.patch -# CVE-2008-2750: l2tp heap overflow -ApplyPatch linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch # Misc fixes # Fix SHA1 alignment problem on ia64 @@ -1844,6 +1841,9 @@ %changelog +* Sun Jul 28 2008 Kyle McMartin 2.6.25.13-65 +- Linux 2.6.25.13 + * Fri Jul 25 2008 Chuck Ebbert 2.6.25.12-64 - Fix 64-bit resource checking on 32-bit kernels. (F9#447143) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v retrieving revision 1.692 retrieving revision 1.693 diff -u -r1.692 -r1.693 --- sources 24 Jul 2008 21:23:35 -0000 1.692 +++ sources 28 Jul 2008 19:10:50 -0000 1.693 @@ -1,2 +1,2 @@ db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2 -584efcae6ee19b118e3b013e939df04f patch-2.6.25.12.bz2 +39578e23ad899c2a418c7ca89b4248bb patch-2.6.25.13.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v retrieving revision 1.612 retrieving revision 1.613 diff -u -r1.612 -r1.613 --- upstream 24 Jul 2008 21:23:35 -0000 1.612 +++ upstream 28 Jul 2008 19:10:50 -0000 1.613 @@ -1,2 +1,2 @@ linux-2.6.25.tar.bz2 -patch-2.6.25.12.bz2 +patch-2.6.25.13.bz2 --- linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch DELETED --- --- patch-2.6.25.12.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 19:38:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 28 Jul 2008 19:38:14 GMT Subject: rpms/tix/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tix.spec, 1.27, 1.28 Message-ID: <200807281938.m6SJcEn4023526@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/tix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23499 Modified Files: .cvsignore sources tix.spec Log Message: update to 8.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tix/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Nov 2006 04:04:14 -0000 1.4 +++ .cvsignore 28 Jul 2008 19:37:44 -0000 1.5 @@ -1 +1 @@ -Tix8.4.2-src.tar.gz +Tix8.4.3-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tix/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Nov 2006 04:04:14 -0000 1.4 +++ sources 28 Jul 2008 19:37:44 -0000 1.5 @@ -1 +1 @@ -422a4e1c5f64da203c753a596b0d74de Tix8.4.2-src.tar.gz +2b8bf4b10a852264678182652f477e59 Tix8.4.3-src.tar.gz Index: tix.spec =================================================================== RCS file: /cvs/pkgs/rpms/tix/devel/tix.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tix.spec 6 Feb 2008 16:28:39 -0000 1.27 +++ tix.spec 28 Jul 2008 19:37:44 -0000 1.28 @@ -7,8 +7,8 @@ Summary: A set of extension widgets for Tk Name: tix Epoch: 1 -Version: %{tixmajor}.2 -Release: 5%{?dist} +Version: %{tixmajor}.3 +Release: 1%{?dist} License: BSD Group: Development/Languages URL: http://tix.sourceforge.net/ @@ -58,7 +58,7 @@ %prep %setup -q -n Tix%{version} %patch0 -p1 -b .link -%patch1 -p1 -b .err +# %%patch1 -p1 -b .err %build %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} @@ -127,6 +127,10 @@ %doc %{tcl_sitelib}/Tix%{tixmajor} %changelog +* Mon Jul 28 2008 Tom "spot" Callaway - 1:8.4.3-1 +- update to 8.4.3 +- don't apply tix-8.4.2-tcl8.5.patch, no longer needed + * Wed Feb 6 2008 Tom "spot" Callaway - 1:8.4.2-5 - apps can't find libTix.so without an ld.so.conf.d file. It probably makes more sense to move this library back into %%{_libdir}, but I'll leave that to From fedora-extras-commits at redhat.com Mon Jul 28 19:55:03 2008 From: fedora-extras-commits at redhat.com (Lon Hohberger (lon)) Date: Mon, 28 Jul 2008 19:55:03 GMT Subject: rpms/dtach/devel .cvsignore, 1.1, 1.2 dtach.spec, 1.15, 1.16 sources, 1.3, 1.4 Message-ID: <200807281955.m6SJt34R024074@cvs-int.fedora.redhat.com> Author: lon Update of /cvs/pkgs/rpms/dtach/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24049 Modified Files: .cvsignore dtach.spec sources Log Message: Update to latest version of dtach from upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dtach/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2007 22:28:31 -0000 1.1 +++ .cvsignore 28 Jul 2008 19:54:33 -0000 1.2 @@ -0,0 +1 @@ +dtach-0.8.tar.gz Index: dtach.spec =================================================================== RCS file: /cvs/pkgs/rpms/dtach/devel/dtach.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dtach.spec 16 Jul 2008 22:03:21 -0000 1.15 +++ dtach.spec 28 Jul 2008 19:54:33 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A simple program that emulates the detach feature of screen Name: dtach -Version: 0.7 -Release: 3 +Version: 0.8 +Release: 1 License: GPLv2+ URL: http://dtach.sourceforge.net Group: Applications/System @@ -41,6 +41,9 @@ %{_mandir}/*/* %changelog +* Mon Jul 28 2008 Lon Hohberger - 0.8-1 +- New upstream version 0.8 of dtach + * Wed Jul 16 2008 Tom "spot" Callaway - 0.7-3 - fix license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dtach/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Mar 2005 23:07:19 -0000 1.3 +++ sources 28 Jul 2008 19:54:33 -0000 1.4 @@ -1 +1 @@ -9aa11433d5a5b4b9fed271f10102cf6f dtach-0.7.tar.gz +ec5999f3b6bb67da19754fcb2e5221f3 dtach-0.8.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 19:58:57 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Mon, 28 Jul 2008 19:58:57 GMT Subject: rpms/gdm/devel gdm.spec,1.400,1.401 sources,1.100,1.101 Message-ID: <200807281958.m6SJwvfP024241@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24207 Modified Files: gdm.spec sources Log Message: - Update to newer snapshot Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.400 retrieving revision 1.401 diff -u -r1.400 -r1.401 --- gdm.spec 22 Jul 2008 03:44:40 -0000 1.400 +++ gdm.spec 28 Jul 2008 19:58:27 -0000 1.401 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.23.1 -Release: 0.2008.07.21.3%{?dist} +Release: 0.2008.07.28.1%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -298,6 +298,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Mon Jul 28 2008 Jon McCann - 1:2.23.1.0.2008.07.28.1 +- Update to newer snapshot + * Mon Jul 21 2008 Jon McCann - 1:2.23.1.0.2008.07.21.3 - Update to newer snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- sources 22 Jul 2008 03:44:40 -0000 1.100 +++ sources 28 Jul 2008 19:58:27 -0000 1.101 @@ -1 +1 @@ -3a169cd1a56910763a90c8a8e36dde2d gdm-2.23.1.tar.bz2 +b716739d238a15ba597976812d88bc99 gdm-2.23.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 20:12:36 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Mon, 28 Jul 2008 20:12:36 GMT Subject: rpms/kernel/devel patch-2.6.26-git18.bz2.sign, NONE, 1.1 .cvsignore, 1.882, 1.883 config-generic, 1.147, 1.148 kernel.spec, 1.816, 1.817 linux-2.6-utrace.patch, 1.85, 1.86 sources, 1.843, 1.844 upstream, 1.760, 1.761 linux-2.6-powerpc-tracehook.patch, 1.3, NONE patch-2.6.26-git17.bz2.sign, 1.1, NONE Message-ID: <200807282012.m6SKCaSw031171@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31134 Modified Files: .cvsignore config-generic kernel.spec linux-2.6-utrace.patch sources upstream Added Files: patch-2.6.26-git18.bz2.sign Removed Files: linux-2.6-powerpc-tracehook.patch patch-2.6.26-git17.bz2.sign Log Message: 2.6.26-git18 --- NEW FILE patch-2.6.26-git18.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIjhg1yGugalF9Dw4RAr4aAJ41HoEn89zaH/UNf6Z5djreA9blWQCbBNrR ZolamPTwrKOVD0s+91NfOm8= =h7NY -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.882 retrieving revision 1.883 diff -u -r1.882 -r1.883 --- .cvsignore 28 Jul 2008 08:47:41 -0000 1.882 +++ .cvsignore 28 Jul 2008 20:12:06 -0000 1.883 @@ -4,4 +4,4 @@ temp-* kernel-2.6.26 linux-2.6.26.tar.bz2 -patch-2.6.26-git17.bz2 +patch-2.6.26-git18.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- config-generic 28 Jul 2008 03:38:21 -0000 1.147 +++ config-generic 28 Jul 2008 20:12:06 -0000 1.148 @@ -2221,6 +2221,7 @@ # CONFIG_TUNER_TEA5761 is not set CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # # Radio Adapters @@ -2250,6 +2251,7 @@ CONFIG_DVB_BT8XX=m CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_CX24110=m +CONFIG_DVB_DRX397XD=m CONFIG_DVB_ISL6405=m CONFIG_DVB_L64781=m CONFIG_DVB_LGDT330X=m @@ -2267,6 +2269,7 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DW2102=m CONFIG_DVB_VES1820=m CONFIG_DVB_VES1X93=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.816 retrieving revision 1.817 diff -u -r1.816 -r1.817 --- kernel.spec 28 Jul 2008 08:47:41 -0000 1.816 +++ kernel.spec 28 Jul 2008 20:12:06 -0000 1.817 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 17 +%define gitrev 18 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -541,7 +541,6 @@ Patch21: linux-2.6-utrace.patch Patch22: linux-2.6-x86-tracehook.patch -Patch23: linux-2.6-powerpc-tracehook.patch Patch41: linux-2.6-sysrq-c.patch Patch42: linux-2.6-x86-tune-generic.patch @@ -962,7 +961,6 @@ # Roland's utrace ptrace replacement. ApplyPatch linux-2.6-utrace.patch ApplyPatch linux-2.6-x86-tracehook.patch -ApplyPatch linux-2.6-powerpc-tracehook.patch # enable sysrq-c on all kernels, not only kexec ApplyPatch linux-2.6-sysrq-c.patch @@ -1694,6 +1692,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Mon Jul 28 2008 Dave Jones +- 2.6.26-git18 + * Mon Jul 28 2008 Roland McGrath - Disable hfcmulti driver on big-endian. - 2.6.26-git17 linux-2.6-utrace.patch: Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- linux-2.6-utrace.patch 27 Jul 2008 07:22:15 -0000 1.85 +++ linux-2.6-utrace.patch 28 Jul 2008 20:12:06 -0000 1.86 @@ -567,10 +567,10 @@ * ptrace_init_task - initialize ptrace state for a new child * @child: new child task diff --git a/include/linux/sched.h b/include/linux/sched.h -index f59318a..514f217 100644 +index 5270d44..d13c10f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1198,6 +1198,11 @@ struct task_struct { +@@ -1195,6 +1195,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -582,7 +582,7 @@ /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1797,6 +1802,7 @@ extern int kill_pgrp(struct pid *pid, in +@@ -1790,6 +1795,7 @@ extern int kill_pgrp(struct pid *pid, in extern int kill_pid(struct pid *pid, int sig, int priv); extern int kill_proc_info(int, struct siginfo *, pid_t); extern int do_notify_parent(struct task_struct *, int); @@ -1430,7 +1430,7 @@ + +#endif /* linux/utrace.h */ diff --git a/init/Kconfig b/init/Kconfig -index a50bdfe..0565932 100644 +index 43d6989..8ae50eb 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -906,6 +906,33 @@ config STOP_MACHINE Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.843 retrieving revision 1.844 diff -u -r1.843 -r1.844 --- sources 28 Jul 2008 08:47:41 -0000 1.843 +++ sources 28 Jul 2008 20:12:06 -0000 1.844 @@ -1,2 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -10bd513da73ff87a2fc98b439282b286 patch-2.6.26-git17.bz2 +27cf87f5d26fa352d295bad728a175bb patch-2.6.26-git18.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- upstream 28 Jul 2008 08:47:41 -0000 1.760 +++ upstream 28 Jul 2008 20:12:06 -0000 1.761 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git17.bz2 +patch-2.6.26-git18.bz2 --- linux-2.6-powerpc-tracehook.patch DELETED --- --- patch-2.6.26-git17.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 20:22:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 20:22:49 +0000 Subject: [pkgdb] xfce-mcs-plugin-gsynaptics was added for cwickert Message-ID: <20080728202249.D2F2F1AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xfce-mcs-plugin-gsynaptics with summary GSynaptics icon for the Xfce Settings Manager Kevin Fenzi (kevin) has approved Package xfce-mcs-plugin-gsynaptics Kevin Fenzi (kevin) has added a Fedora devel branch for xfce-mcs-plugin-gsynaptics with an owner of cwickert Kevin Fenzi (kevin) has approved xfce-mcs-plugin-gsynaptics in Fedora devel Kevin Fenzi (kevin) has approved Package xfce-mcs-plugin-gsynaptics Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce-mcs-plugin-gsynaptics (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce-mcs-plugin-gsynaptics (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce-mcs-plugin-gsynaptics (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on xfce-mcs-plugin-gsynaptics (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on xfce-mcs-plugin-gsynaptics (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on xfce-mcs-plugin-gsynaptics (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce-mcs-plugin-gsynaptics From fedora-extras-commits at redhat.com Mon Jul 28 20:22:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 20:22:54 +0000 Subject: [pkgdb] xfce-mcs-plugin-gsynaptics (Fedora, devel) updated by kevin Message-ID: <20080728202254.3F7CE1AD0F8@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on xfce-mcs-plugin-gsynaptics (Fedora devel) for kevin Kevin Fenzi (kevin) approved watchcommits on xfce-mcs-plugin-gsynaptics (Fedora devel) for kevin Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce-mcs-plugin-gsynaptics (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce-mcs-plugin-gsynaptics From fedora-extras-commits at redhat.com Mon Jul 28 20:24:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 20:24:20 GMT Subject: rpms/xfce-mcs-plugin-gsynaptics - New directory Message-ID: <200807282024.m6SKOK5p031501@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce-mcs-plugin-gsynaptics In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31471/rpms/xfce-mcs-plugin-gsynaptics Log Message: Directory /cvs/extras/rpms/xfce-mcs-plugin-gsynaptics added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 20:24:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 20:24:20 GMT Subject: rpms/xfce-mcs-plugin-gsynaptics/devel - New directory Message-ID: <200807282024.m6SKOKex031515@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce-mcs-plugin-gsynaptics/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31471/rpms/xfce-mcs-plugin-gsynaptics/devel Log Message: Directory /cvs/extras/rpms/xfce-mcs-plugin-gsynaptics/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 28 20:24:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 20:24:20 GMT Subject: rpms/xfce-mcs-plugin-gsynaptics Makefile,NONE,1.1 Message-ID: <200807282024.m6SKOKF2031538@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce-mcs-plugin-gsynaptics In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31471/rpms/xfce-mcs-plugin-gsynaptics Added Files: Makefile Log Message: Setup of module xfce-mcs-plugin-gsynaptics --- NEW FILE Makefile --- # Top level Makefile for module xfce-mcs-plugin-gsynaptics all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Jul 28 20:24:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 28 Jul 2008 20:24:21 GMT Subject: rpms/xfce-mcs-plugin-gsynaptics/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807282024.m6SKOLtm031553@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce-mcs-plugin-gsynaptics/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31471/rpms/xfce-mcs-plugin-gsynaptics/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce-mcs-plugin-gsynaptics --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce-mcs-plugin-gsynaptics # $Id: Makefile,v 1.1 2008/07/28 20:24:21 kevin Exp $ NAME := xfce-mcs-plugin-gsynaptics SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Jul 28 20:48:40 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 20:48:40 GMT Subject: rpms/phpMyAdmin/EL-4 .cvsignore, 1.19, 1.20 phpMyAdmin.spec, 1.27, 1.28 sources, 1.23, 1.24 Message-ID: <200807282048.m6SKmeh5032520@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32385/EL-4 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Release early, release often, release fast. They MUST have misunderstood something there: Upstream released 2.11.8.1 (#456637, #456950) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 28 Jul 2008 18:16:56 -0000 1.19 +++ .cvsignore 28 Jul 2008 20:48:09 -0000 1.20 @@ -1 +1 @@ -phpMyAdmin-2.11.8-all-languages.tar.bz2 +phpMyAdmin-2.11.8.1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- phpMyAdmin.spec 28 Jul 2008 18:16:56 -0000 1.27 +++ phpMyAdmin.spec 28 Jul 2008 20:48:09 -0000 1.28 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.8 +Version: 2.11.8.1 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Jul 28 2008 Robert Scheck 2.11.8.1-1 +- Upstream released 2.11.8.1 (#456637, #456950) + * Mon Jul 28 2008 Robert Scheck 2.11.8-1 - Upstream released 2.11.8 (#456637) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 28 Jul 2008 18:16:56 -0000 1.23 +++ sources 28 Jul 2008 20:48:09 -0000 1.24 @@ -1 +1 @@ -1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 +d45c5467228876b44ff8e60cce4b487a phpMyAdmin-2.11.8.1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 20:48:40 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 20:48:40 GMT Subject: rpms/phpMyAdmin/EL-5 .cvsignore, 1.19, 1.20 phpMyAdmin.spec, 1.27, 1.28 sources, 1.23, 1.24 Message-ID: <200807282048.m6SKme76032525@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32385/EL-5 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Release early, release often, release fast. They MUST have misunderstood something there: Upstream released 2.11.8.1 (#456637, #456950) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 28 Jul 2008 18:16:56 -0000 1.19 +++ .cvsignore 28 Jul 2008 20:48:10 -0000 1.20 @@ -1 +1 @@ -phpMyAdmin-2.11.8-all-languages.tar.bz2 +phpMyAdmin-2.11.8.1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- phpMyAdmin.spec 28 Jul 2008 18:16:56 -0000 1.27 +++ phpMyAdmin.spec 28 Jul 2008 20:48:10 -0000 1.28 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.8 +Version: 2.11.8.1 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Jul 28 2008 Robert Scheck 2.11.8.1-1 +- Upstream released 2.11.8.1 (#456637, #456950) + * Mon Jul 28 2008 Robert Scheck 2.11.8-1 - Upstream released 2.11.8 (#456637) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 28 Jul 2008 18:16:56 -0000 1.23 +++ sources 28 Jul 2008 20:48:10 -0000 1.24 @@ -1 +1 @@ -1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 +d45c5467228876b44ff8e60cce4b487a phpMyAdmin-2.11.8.1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 20:48:41 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 20:48:41 GMT Subject: rpms/phpMyAdmin/F-8 .cvsignore, 1.20, 1.21 phpMyAdmin.spec, 1.27, 1.28 sources, 1.23, 1.24 Message-ID: <200807282048.m6SKmfCR032530@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32385/F-8 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Release early, release often, release fast. They MUST have misunderstood something there: Upstream released 2.11.8.1 (#456637, #456950) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 28 Jul 2008 18:16:57 -0000 1.20 +++ .cvsignore 28 Jul 2008 20:48:10 -0000 1.21 @@ -1 +1 @@ -phpMyAdmin-2.11.8-all-languages.tar.bz2 +phpMyAdmin-2.11.8.1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/phpMyAdmin.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- phpMyAdmin.spec 28 Jul 2008 18:16:57 -0000 1.27 +++ phpMyAdmin.spec 28 Jul 2008 20:48:10 -0000 1.28 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.8 +Version: 2.11.8.1 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Jul 28 2008 Robert Scheck 2.11.8.1-1 +- Upstream released 2.11.8.1 (#456637, #456950) + * Mon Jul 28 2008 Robert Scheck 2.11.8-1 - Upstream released 2.11.8 (#456637) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 28 Jul 2008 18:16:57 -0000 1.23 +++ sources 28 Jul 2008 20:48:10 -0000 1.24 @@ -1 +1 @@ -1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 +d45c5467228876b44ff8e60cce4b487a phpMyAdmin-2.11.8.1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 20:48:41 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 20:48:41 GMT Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.23, 1.24 phpMyAdmin.spec, 1.27, 1.28 sources, 1.23, 1.24 Message-ID: <200807282048.m6SKmf39032535@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32385/F-9 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Release early, release often, release fast. They MUST have misunderstood something there: Upstream released 2.11.8.1 (#456637, #456950) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 28 Jul 2008 18:16:57 -0000 1.23 +++ .cvsignore 28 Jul 2008 20:48:11 -0000 1.24 @@ -1 +1 @@ -phpMyAdmin-2.11.8-all-languages.tar.bz2 +phpMyAdmin-2.11.8.1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- phpMyAdmin.spec 28 Jul 2008 18:16:57 -0000 1.27 +++ phpMyAdmin.spec 28 Jul 2008 20:48:11 -0000 1.28 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.8 +Version: 2.11.8.1 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Jul 28 2008 Robert Scheck 2.11.8.1-1 +- Upstream released 2.11.8.1 (#456637, #456950) + * Mon Jul 28 2008 Robert Scheck 2.11.8-1 - Upstream released 2.11.8 (#456637) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 28 Jul 2008 18:16:57 -0000 1.23 +++ sources 28 Jul 2008 20:48:11 -0000 1.24 @@ -1 +1 @@ -1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 +d45c5467228876b44ff8e60cce4b487a phpMyAdmin-2.11.8.1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 20:48:42 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 28 Jul 2008 20:48:42 GMT Subject: rpms/phpMyAdmin/devel .cvsignore, 1.23, 1.24 phpMyAdmin.spec, 1.27, 1.28 sources, 1.23, 1.24 Message-ID: <200807282048.m6SKmgmV032540@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32385/devel Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Release early, release often, release fast. They MUST have misunderstood something there: Upstream released 2.11.8.1 (#456637, #456950) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 28 Jul 2008 18:16:57 -0000 1.23 +++ .cvsignore 28 Jul 2008 20:48:11 -0000 1.24 @@ -1 +1 @@ -phpMyAdmin-2.11.8-all-languages.tar.bz2 +phpMyAdmin-2.11.8.1-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- phpMyAdmin.spec 28 Jul 2008 18:16:57 -0000 1.27 +++ phpMyAdmin.spec 28 Jul 2008 20:48:11 -0000 1.28 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.8 +Version: 2.11.8.1 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Jul 28 2008 Robert Scheck 2.11.8.1-1 +- Upstream released 2.11.8.1 (#456637, #456950) + * Mon Jul 28 2008 Robert Scheck 2.11.8-1 - Upstream released 2.11.8 (#456637) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 28 Jul 2008 18:16:57 -0000 1.23 +++ sources 28 Jul 2008 20:48:11 -0000 1.24 @@ -1 +1 @@ -1834d5fa2f78e9aa1e98dedcc7147e9b phpMyAdmin-2.11.8-all-languages.tar.bz2 +d45c5467228876b44ff8e60cce4b487a phpMyAdmin-2.11.8.1-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 20:50:59 2008 From: fedora-extras-commits at redhat.com (Glauber Costa (glommer)) Date: Mon, 28 Jul 2008 20:50:59 GMT Subject: rpms/kvm/devel .cvsignore, 1.34, 1.35 kvm.spec, 1.61, 1.62 sources, 1.33, 1.34 Message-ID: <200807282050.m6SKox3M000315@cvs-int.fedora.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/kvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32678 Modified Files: .cvsignore kvm.spec sources Log Message: update to kvm-72 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 22 Jul 2008 00:36:05 -0000 1.34 +++ .cvsignore 28 Jul 2008 20:50:28 -0000 1.35 @@ -1 +1 @@ -kvm-71.tar.gz +kvm-72.tar.gz Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- kvm.spec 22 Jul 2008 14:12:29 -0000 1.61 +++ kvm.spec 28 Jul 2008 20:50:28 -0000 1.62 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm -Version: 71 -Release: 2%{?dist} +Version: 72 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -98,6 +98,9 @@ %{_sysconfdir}/sysconfig/modules/%{name}.modules %changelog +* Mon Jul 28 2008 Glauber Costa - 72-1 +- kvm-72 + * Tue Jul 22 2008 Glauber Costa - 71-2 - Apply patches correctly. - Enable ia64. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 22 Jul 2008 00:36:05 -0000 1.33 +++ sources 28 Jul 2008 20:50:28 -0000 1.34 @@ -1 +1 @@ -9c8e4551ca6b6f5a4662722bb163cf12 kvm-71.tar.gz +e4f99d05dee168200695850165cd760e kvm-72.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 21:20:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 21:20:19 +0000 Subject: [pkgdb] NetworkManager-pptp: dcbw has requested commit Message-ID: <20080728212020.9F3241AD0E7@bastion.fedora.phx.redhat.com> Daniel Williams (dcbw) has requested the commit acl on NetworkManager-pptp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Mon Jul 28 21:20:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 21:20:25 +0000 Subject: [pkgdb] NetworkManager-pptp: dcbw has requested watchcommits Message-ID: <20080728212025.6D51C1AD0ED@bastion.fedora.phx.redhat.com> Daniel Williams (dcbw) has requested the watchcommits acl on NetworkManager-pptp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Mon Jul 28 21:20:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 28 Jul 2008 21:20:28 +0000 Subject: [pkgdb] NetworkManager-pptp: dcbw has requested watchbugzilla Message-ID: <20080728212028.907BD1AD0F8@bastion.fedora.phx.redhat.com> Daniel Williams (dcbw) has requested the watchbugzilla acl on NetworkManager-pptp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Mon Jul 28 21:23:09 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 28 Jul 2008 21:23:09 GMT Subject: rpms/xapian-bindings/devel xapian-bindings.spec,1.10,1.11 Message-ID: <200807282123.m6SLN99D007541@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7523 Modified Files: xapian-bindings.spec Log Message: enable ruby bindings Index: xapian-bindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xapian-bindings.spec 20 Jul 2008 13:15:13 -0000 1.10 +++ xapian-bindings.spec 28 Jul 2008 21:22:38 -0000 1.11 @@ -1,9 +1,11 @@ -%define python_ver %(%{__python} -c "import sys; print sys.version[:3]") +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") Summary: Bindings for the Xapian Probabilistic Information Retrieval Library Name: xapian-bindings Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Libraries URL: http://www.xapian.org/ @@ -29,11 +31,21 @@ indexing and search facilities to applications. This package provides the files needed for developing Python scripts which use Xapian +%package ruby +Group: Development/Libraries +Summary: Files needed for developing Ruby scripts which use Xapian + +%description ruby +Xapian is an Open Source Probabilistic Information Retrieval framework. It +offers a highly adaptable toolkit that allows developers to easily add advanced +indexing and search facilities to applications. This package provides the +files needed for developing Ruby scripts which use Xapian + %prep %setup -q -n %{name}-%{version} %build -%configure --with-python +%configure --with-python --with-ruby make %{?_smp_mflags} %install @@ -44,6 +56,7 @@ # Move the docs to the right place, and correct the effects of prefix+DESTDIR mkdir -p %{buildroot}/usr/share/doc/ mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/python %{buildroot}/usr/share/doc/%{name}-python-%{version} +mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/ruby %{buildroot}/usr/share/doc/%{name}-ruby-%{version} rm -rf %{buildroot}%{buildroot}/usr/share/doc/%{name}/ %clean @@ -52,12 +65,19 @@ %files python %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/python%{python_ver}/site-packages/_xapian.so -%{_libdir}/python%{python_ver}/site-packages/xapian.py -%{_libdir}/python%{python_ver}/site-packages/xapian.pyc -%{_libdir}/python%{python_ver}/site-packages/xapian.pyo +%{python_sitearch}/* + +%files ruby +%defattr(-, root, root) +%doc AUTHORS ChangeLog COPYING NEWS README +%{ruby_sitearch}/_xapian.so +%{ruby_sitelib}/xapian.rb + %changelog +* Mon Jul 28 2008 Adel Gadllah 1.0.7-2 +- Enable ruby bindings RH #456951, patch by Scott Seago + * Sun Jul 20 2008 Adel Gadllah 1.0.7-1 - Update to 1.0.7 From fedora-extras-commits at redhat.com Mon Jul 28 21:29:59 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 28 Jul 2008 21:29:59 GMT Subject: rpms/xapian-bindings/devel xapian-bindings.spec,1.11,1.12 Message-ID: <200807282129.m6SLTxe9007712@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7691 Modified Files: xapian-bindings.spec Log Message: fix BR Index: xapian-bindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xapian-bindings.spec 28 Jul 2008 21:22:38 -0000 1.11 +++ xapian-bindings.spec 28 Jul 2008 21:29:28 -0000 1.12 @@ -11,6 +11,7 @@ URL: http://www.xapian.org/ BuildRequires: python-devel >= 2.2 BuildRequires: autoconf automake libtool +BuildRequires: ruby-devel BuildRequires: xapian-core-devel == %{version} Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Mon Jul 28 21:35:32 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 28 Jul 2008 21:35:32 GMT Subject: rpms/xapian-bindings/devel xapian-bindings.spec,1.12,1.13 Message-ID: <200807282135.m6SLZWLo007888@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7858 Modified Files: xapian-bindings.spec Log Message: fix BR Index: xapian-bindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xapian-bindings.spec 28 Jul 2008 21:29:28 -0000 1.12 +++ xapian-bindings.spec 28 Jul 2008 21:35:02 -0000 1.13 @@ -11,7 +11,7 @@ URL: http://www.xapian.org/ BuildRequires: python-devel >= 2.2 BuildRequires: autoconf automake libtool -BuildRequires: ruby-devel +BuildRequires: ruby-devel ruby BuildRequires: xapian-core-devel == %{version} Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Mon Jul 28 21:38:24 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 28 Jul 2008 21:38:24 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1595,1.1596 Message-ID: <200807282138.m6SLcON8008132@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8106 Modified Files: openoffice.org.spec Log Message: you bastard Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1595 retrieving revision 1.1596 diff -u -r1.1595 -r1.1596 --- openoffice.org.spec 28 Jul 2008 15:26:15 -0000 1.1595 +++ openoffice.org.spec 28 Jul 2008 21:37:54 -0000 1.1596 @@ -3302,6 +3302,7 @@ %{oooinstdir}/program/simpress.bin %{_datadir}/applications/openoffice.org-*-impress.desktop %{_datadir}/mimelnk/application/openoffice.org-*presentation* +%{_datadir}/mimelnk/application/openoffice.org-ms-powerpoint-template*.desktop %{_bindir}/ooimpress %post impress @@ -3318,6 +3319,7 @@ %{brinstdir}/program/simpress.bin %{_datadir}/applications/broffice.org-impress.desktop %{_datadir}/mimelnk/application/broffice.org-*presentation* +%{_datadir}/mimelnk/application/broffice.org-ms-powerpoint-template*.desktop %post -n broffice.org-impress update-desktop-database -q %{_datadir}/applications From fedora-extras-commits at redhat.com Mon Jul 28 21:42:33 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 28 Jul 2008 21:42:33 GMT Subject: rpms/xapian-bindings/F-9 xapian-bindings.spec,1.9,1.10 Message-ID: <200807282142.m6SLgXSi008275@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8237 Modified Files: xapian-bindings.spec Log Message: enable ruby bindings Index: xapian-bindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/F-9/xapian-bindings.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xapian-bindings.spec 22 Jul 2008 05:44:21 -0000 1.9 +++ xapian-bindings.spec 28 Jul 2008 21:42:02 -0000 1.10 @@ -1,14 +1,17 @@ -%define python_ver %(%{__python} -c "import sys; print sys.version[:3]") +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") Summary: Bindings for the Xapian Probabilistic Information Retrieval Library Name: xapian-bindings Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Libraries URL: http://www.xapian.org/ BuildRequires: python-devel >= 2.2 BuildRequires: autoconf automake libtool +BuildRequires: ruby-devel ruby BuildRequires: xapian-core-devel == %{version} Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,11 +32,21 @@ indexing and search facilities to applications. This package provides the files needed for developing Python scripts which use Xapian +%package ruby +Group: Development/Libraries +Summary: Files needed for developing Ruby scripts which use Xapian + +%description ruby +Xapian is an Open Source Probabilistic Information Retrieval framework. It +offers a highly adaptable toolkit that allows developers to easily add advanced +indexing and search facilities to applications. This package provides the +files needed for developing Ruby scripts which use Xapian + %prep %setup -q -n %{name}-%{version} %build -%configure --with-python +%configure --with-python --with-ruby make %{?_smp_mflags} %install @@ -44,6 +57,7 @@ # Move the docs to the right place, and correct the effects of prefix+DESTDIR mkdir -p %{buildroot}/usr/share/doc/ mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/python %{buildroot}/usr/share/doc/%{name}-python-%{version} +mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/ruby %{buildroot}/usr/share/doc/%{name}-ruby-%{version} rm -rf %{buildroot}%{buildroot}/usr/share/doc/%{name}/ %clean @@ -52,12 +66,19 @@ %files python %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/python%{python_ver}/site-packages/_xapian.so -%{_libdir}/python%{python_ver}/site-packages/xapian.py -%{_libdir}/python%{python_ver}/site-packages/xapian.pyc -%{_libdir}/python%{python_ver}/site-packages/xapian.pyo +%{python_sitearch}/* + +%files ruby +%defattr(-, root, root) +%doc AUTHORS ChangeLog COPYING NEWS README +%{ruby_sitearch}/_xapian.so +%{ruby_sitelib}/xapian.rb + %changelog +* Mon Jul 28 2008 Adel Gadllah 1.0.7-2 +- Enable ruby bindings RH #456951, patch by Scott Seago + * Tue Jul 22 2008 Adel Gadllah 1.0.7-1 - Update to 1.0.7 From fedora-extras-commits at redhat.com Mon Jul 28 21:42:46 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Mon, 28 Jul 2008 21:42:46 GMT Subject: rpms/xapian-bindings/F-8 xapian-bindings.spec,1.11,1.12 Message-ID: <200807282142.m6SLgk8e008321@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/xapian-bindings/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8258 Modified Files: xapian-bindings.spec Log Message: enable ruby bindings Index: xapian-bindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-bindings/F-8/xapian-bindings.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xapian-bindings.spec 22 Jul 2008 05:42:59 -0000 1.11 +++ xapian-bindings.spec 28 Jul 2008 21:42:15 -0000 1.12 @@ -1,14 +1,17 @@ -%define python_ver %(%{__python} -c "import sys; print sys.version[:3]") +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") Summary: Bindings for the Xapian Probabilistic Information Retrieval Library Name: xapian-bindings Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Libraries URL: http://www.xapian.org/ BuildRequires: python-devel >= 2.2 BuildRequires: autoconf automake libtool +BuildRequires: ruby-devel ruby BuildRequires: xapian-core-devel == %{version} Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,11 +32,21 @@ indexing and search facilities to applications. This package provides the files needed for developing Python scripts which use Xapian +%package ruby +Group: Development/Libraries +Summary: Files needed for developing Ruby scripts which use Xapian + +%description ruby +Xapian is an Open Source Probabilistic Information Retrieval framework. It +offers a highly adaptable toolkit that allows developers to easily add advanced +indexing and search facilities to applications. This package provides the +files needed for developing Ruby scripts which use Xapian + %prep %setup -q -n %{name}-%{version} %build -%configure --with-python +%configure --with-python --with-ruby make %{?_smp_mflags} %install @@ -44,6 +57,7 @@ # Move the docs to the right place, and correct the effects of prefix+DESTDIR mkdir -p %{buildroot}/usr/share/doc/ mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/python %{buildroot}/usr/share/doc/%{name}-python-%{version} +mv %{buildroot}%{buildroot}/usr/share/doc/%{name}/ruby %{buildroot}/usr/share/doc/%{name}-ruby-%{version} rm -rf %{buildroot}%{buildroot}/usr/share/doc/%{name}/ %clean @@ -52,12 +66,19 @@ %files python %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/python%{python_ver}/site-packages/_xapian.so -%{_libdir}/python%{python_ver}/site-packages/xapian.py -%{_libdir}/python%{python_ver}/site-packages/xapian.pyc -%{_libdir}/python%{python_ver}/site-packages/xapian.pyo +%{python_sitearch}/* + +%files ruby +%defattr(-, root, root) +%doc AUTHORS ChangeLog COPYING NEWS README +%{ruby_sitearch}/_xapian.so +%{ruby_sitelib}/xapian.rb + %changelog +* Mon Jul 28 2008 Adel Gadllah 1.0.7-2 +- Enable ruby bindings RH #456951, patch by Scott Seago + * Tue Jul 22 2008 Adel Gadllah 1.0.7-1 - Update to 1.0.7 From fedora-extras-commits at redhat.com Mon Jul 28 22:14:51 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Mon, 28 Jul 2008 22:14:51 GMT Subject: rpms/python-fedora/devel .cvsignore, 1.20, 1.21 python-fedora.spec, 1.22, 1.23 sources, 1.21, 1.22 Message-ID: <200807282214.m6SMEpue015826@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15786 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 - Small fix to proxyclient.send_request() for sequence types. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 24 Jul 2008 09:09:20 -0000 1.20 +++ .cvsignore 28 Jul 2008 22:14:20 -0000 1.21 @@ -1 +1 @@ -python-fedora-0.3.3.tar.gz +python-fedora-0.3.4.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- python-fedora.spec 24 Jul 2008 09:03:02 -0000 1.22 +++ python-fedora.spec 28 Jul 2008 22:14:20 -0000 1.23 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 +- Small fix to proxyclient.send_request() for sequence types. + * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 24 Jul 2008 09:09:20 -0000 1.21 +++ sources 28 Jul 2008 22:14:20 -0000 1.22 @@ -1 +1 @@ -5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz +bb6cc0d0b6b9b385429483283f3bfb9d python-fedora-0.3.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 22:18:38 2008 From: fedora-extras-commits at redhat.com (Sven Lankes (slankes)) Date: Mon, 28 Jul 2008 22:18:38 GMT Subject: rpms/merkaartor/devel .cvsignore, 1.2, 1.3 merkaartor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807282218.m6SMIcPc016149@cvs-int.fedora.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/merkaartor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16108 Modified Files: .cvsignore merkaartor.spec sources Log Message: Update to 0.0.11-rc1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jul 2008 17:16:52 -0000 1.2 +++ .cvsignore 28 Jul 2008 22:18:08 -0000 1.3 @@ -1 +1 @@ -Merkaartor-0.0.10.tgz +Merkaartor-0.11rc1.tgz Index: merkaartor.spec =================================================================== RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- merkaartor.spec 25 Jul 2008 17:16:52 -0000 1.1 +++ merkaartor.spec 28 Jul 2008 22:18:08 -0000 1.2 @@ -1,17 +1,17 @@ Name: merkaartor -Version: 0.0.10 -Release: 7%{?dist} +Version: 0.0.11 +Release: 0.1.rc1%{?dist} Summary: QT-Based OpenStreetMap editor Group: Applications/Productivity License: GPLv2 URL: http://www.irule.be/bvh/c++/merkaartor/ -Source0: http://www.irule.be/bvh/c++/merkaartor/versions/Merkaartor-%{version}.tgz +Source0: http://www.irule.be/pipe/Merkaartor-0.11rc1.tgz Source1: %{name}.desktop Source2: %{name}.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel >= 4.3 +BuildRequires: qt4-devel >= 4.4 BuildRequires: desktop-file-utils %description @@ -29,13 +29,14 @@ find -name "*.cpp" -exec %{__chmod} -x '{}' \; %build -qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} +lrelease-qt4 Merkaartor.pro +qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 NOWEBKIT=1 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -install -p -D release/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name} +make INSTALL_ROOT=${RPM_BUILD_ROOT} install install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} @@ -47,6 +48,7 @@ %files %defattr(-,root,root,-) %{_bindir}/%{name} +%{_datadir}/merkaartor/translations/%{name}_*.qm %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.xpm %doc AUTHORS CHANGELOG HACKING LICENSE @@ -54,6 +56,9 @@ %changelog +* Mon Jul 28 2008 slankes - 0.0.11-0.1.rc1 +- update to release candidate + * Thu Jul 24 2008 slankes - 0.0.10-7 - fix executable source-files Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Jul 2008 17:16:52 -0000 1.2 +++ sources 28 Jul 2008 22:18:08 -0000 1.3 @@ -1 +1 @@ -af231c7a6834ffa72ddb9983b344821f Merkaartor-0.0.10.tgz +85774d67bc977da26dff9db683db5e24 Merkaartor-0.11rc1.tgz From fedora-extras-commits at redhat.com Mon Jul 28 22:34:36 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 28 Jul 2008 22:34:36 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE sources, 1.2, NONE xfce4-gsynaptics-mcs-plugin.spec, 1.2, NONE Message-ID: <200807282234.m6SMYauA017112@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17106 Added Files: dead.package Removed Files: .cvsignore sources xfce4-gsynaptics-mcs-plugin.spec Log Message: Mark devel branch as dead. Package has been renamed to xfce-mcs-plugin-gsynaptics --- NEW FILE dead.package --- Renamed to xfce-mcs-plugin-gsynaptics in Fedora >= 10. --- .cvsignore DELETED --- --- sources DELETED --- --- xfce4-gsynaptics-mcs-plugin.spec DELETED --- From fedora-extras-commits at redhat.com Mon Jul 28 22:36:56 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Mon, 28 Jul 2008 22:36:56 GMT Subject: rpms/python-fedora/EL-5 .cvsignore, 1.11, 1.12 python-fedora.spec, 1.10, 1.11 sources, 1.11, 1.12 Message-ID: <200807282236.m6SMaua3017244@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175/EL-5 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 - Small fix to proxyclient.send_request() for sequence types. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 24 Jul 2008 09:15:22 -0000 1.11 +++ .cvsignore 28 Jul 2008 22:36:26 -0000 1.12 @@ -1 +1 @@ -python-fedora-0.3.3.tar.gz +python-fedora-0.3.4.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-fedora.spec 24 Jul 2008 09:15:22 -0000 1.10 +++ python-fedora.spec 28 Jul 2008 22:36:26 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 +- Small fix to proxyclient.send_request() for sequence types. + * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 24 Jul 2008 09:15:22 -0000 1.11 +++ sources 28 Jul 2008 22:36:26 -0000 1.12 @@ -1 +1 @@ -5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz +bb6cc0d0b6b9b385429483283f3bfb9d python-fedora-0.3.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 22:36:57 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Mon, 28 Jul 2008 22:36:57 GMT Subject: rpms/python-fedora/F-8 .cvsignore, 1.15, 1.16 python-fedora.spec, 1.16, 1.17 sources, 1.17, 1.18 Message-ID: <200807282236.m6SMav9A017249@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175/F-8 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 - Small fix to proxyclient.send_request() for sequence types. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 24 Jul 2008 11:57:14 -0000 1.15 +++ .cvsignore 28 Jul 2008 22:36:26 -0000 1.16 @@ -1 +1 @@ -python-fedora-0.3.3.tar.gz +python-fedora-0.3.4.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/python-fedora.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-fedora.spec 24 Jul 2008 09:15:43 -0000 1.16 +++ python-fedora.spec 28 Jul 2008 22:36:27 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 +- Small fix to proxyclient.send_request() for sequence types. + * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-8/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 24 Jul 2008 11:57:14 -0000 1.17 +++ sources 28 Jul 2008 22:36:27 -0000 1.18 @@ -1 +1 @@ -5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz +bb6cc0d0b6b9b385429483283f3bfb9d python-fedora-0.3.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 22:36:57 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Mon, 28 Jul 2008 22:36:57 GMT Subject: rpms/python-fedora/F-9 .cvsignore, 1.17, 1.18 python-fedora.spec, 1.21, 1.22 sources, 1.19, 1.20 Message-ID: <200807282236.m6SMavcU017254@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175/F-9 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 - Small fix to proxyclient.send_request() for sequence types. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 24 Jul 2008 11:57:32 -0000 1.17 +++ .cvsignore 28 Jul 2008 22:36:27 -0000 1.18 @@ -1 +1 @@ -python-fedora-0.3.3.tar.gz +python-fedora-0.3.4.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- python-fedora.spec 24 Jul 2008 09:16:02 -0000 1.21 +++ python-fedora.spec 28 Jul 2008 22:36:27 -0000 1.22 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 +- Small fix to proxyclient.send_request() for sequence types. + * Wed Jul 23 2008 Toshio Kuratomi - 0.3.3-1 - A few fixes for the new fas release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 24 Jul 2008 11:57:32 -0000 1.19 +++ sources 28 Jul 2008 22:36:27 -0000 1.20 @@ -1 +1 @@ -5a51a888b657102e64be28cfe5826583 python-fedora-0.3.3.tar.gz +bb6cc0d0b6b9b385429483283f3bfb9d python-fedora-0.3.4.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 22:36:58 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Mon, 28 Jul 2008 22:36:58 GMT Subject: common Makefile.common,1.106,1.107 Message-ID: <200807282236.m6SMawtI017257@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175/common Modified Files: Makefile.common Log Message: * Mon Jul 28 2008 Toshio Kuratomi - 0.3.4-1 - Small fix to proxyclient.send_request() for sequence types. Index: Makefile.common =================================================================== RCS file: /cvs/pkgs/common/Makefile.common,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- Makefile.common 21 Jul 2008 19:01:59 -0000 1.106 +++ Makefile.common 28 Jul 2008 22:36:27 -0000 1.107 @@ -461,7 +461,7 @@ @sed -e '/^#/d' < bodhi.template > bodhi.template.orig @if [ -z "$$EDITOR" ]; then vi bodhi.template; else $$EDITOR bodhi.template; fi @if [ -n "`sed -e '/^#/d' < bodhi.template | diff bodhi.template.orig -`" ]; then \ - $(BODHI_CLIENT) --new --release $(subst -,,$(BRANCH)) \ + $(BODHI_CLIENT) -v --new --release $(subst -,,$(BRANCH)) \ --file bodhi.template $(NAME)-$(VERSION)-$(RELEASE) -u $(BODHI_USER); \ else \ echo "Bodhi update aborted!"; \ From fedora-extras-commits at redhat.com Mon Jul 28 22:37:35 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Mon, 28 Jul 2008 22:37:35 GMT Subject: rpms/xfce-mcs-plugin-gsynaptics/devel xfce-mcs-plugin-gsynaptics.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807282237.m6SMbZZl017284@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce-mcs-plugin-gsynaptics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17263 Modified Files: .cvsignore sources Added Files: xfce-mcs-plugin-gsynaptics.spec Log Message: this package used to be xfce4-gsynaptics-plugin in Fedora < 10 --- NEW FILE xfce-mcs-plugin-gsynaptics.spec --- # Review at https://bugzilla.redhat.com/show_bug.cgi?id=433892 Name: xfce-mcs-plugin-gsynaptics Version: 1.0.0 Release: 2%{?dist} Summary: GSynaptics icon for the Xfce Settings Manager Group: User Interface/Desktops License: GPLv2 URL: http://goodies.xfce.org/projects/mcs-plugins/gsynaptics-mcs-plugin Source0: http://goodies.xfce.org/releases/gsynaptics-mcs-plugin/gsynaptics-mcs-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce-mcs-manager-devel >= 4.3.99.2 BuildRequires: gettext, perl(XML::Parser) BuildRequires: libgnomeui-devel BuildRequires: gsynaptics Requires: xfce-mcs-manager >= 4.4.0, gsynaptics # for upstream compatibility Provides: gsynaptics-mcs-plugin = %{version}-%{release} # package rename in F10 Provides: xfce4-gsynaptics-mcs-plugin = %{version}-%{release} Obsoletes: xfce4-gsynaptics-mcs-plugin < 1.0.0-2 # Use ExclusiveArch just as synaptics does; see # http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup # ExcludeArch tracker for now (until proper solution is found): # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242323 # This is what it should be, but the buildsystem is a disaster # ExcludeArch: s390 s390x ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description A simple MCS plugin for Xfce that starts gsynaptics when invoked and launches gsynaptics-init once loaded by the MCS manager. %prep %setup -qn gsynaptics-mcs-plugin-%{version} %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.la %find_lang gsynaptics-mcs-plugin %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f gsynaptics-mcs-plugin.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.so %{_datadir}/icons/hicolor/*/apps/gsynaptics-mcs-plugin.png %{_datadir}/icons/hicolor/scalable/apps/gsynaptics-mcs-plugin.svg %changelog * Sun Jul 27 2008 Christoph Wickert - 1.0.0-2 - Rebuild for PPC64 - Rename package to xfce-mcs-plugin-gsynaptics * Sat Feb 24 2007 Christoph Wickert - 1.0.0-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce-mcs-plugin-gsynaptics/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2008 20:24:21 -0000 1.1 +++ .cvsignore 28 Jul 2008 22:37:05 -0000 1.2 @@ -0,0 +1 @@ +gsynaptics-mcs-plugin-1.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce-mcs-plugin-gsynaptics/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2008 20:24:21 -0000 1.1 +++ sources 28 Jul 2008 22:37:05 -0000 1.2 @@ -0,0 +1 @@ +57ecdd4983ab55614019d4b5a581398e gsynaptics-mcs-plugin-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 28 23:12:25 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 23:12:25 GMT Subject: rpms/libdaemon/devel libdaemon.spec,1.14,1.15 Message-ID: <200807282312.m6SNCPbp024669@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libdaemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24650 Modified Files: libdaemon.spec Log Message: new release 0.13 Index: libdaemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdaemon/devel/libdaemon.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libdaemon.spec 19 Feb 2008 10:58:42 -0000 1.14 +++ libdaemon.spec 28 Jul 2008 23:11:55 -0000 1.15 @@ -1,12 +1,11 @@ Name: libdaemon -Version: 0.12 -Release: 3%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: Library for writing UNIX daemons - Group: System Environment/Libraries -License: GPL -URL: http://www.stud.uni-hamburg.de/users/lennart/projects/libdaemon -Source0: %{name}-%{version}.tar.gz +License: LGPLv2+ +URL: http://0pointer.de/lennart/projects/libdaemon/ +Source0: http://0pointer.de/lennart/projects/libdaemon/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Requires lynx to build the docs @@ -28,7 +27,8 @@ %package devel Group: Development/Libraries Summary: Libraries and header files for libdaemon development -Requires: libdaemon = %{version} +Requires: libdaemon = %{version}-%{release} +Requires: pkgconfig %description devel The libdaemon-devel package contains the header files and libraries @@ -44,8 +44,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -68,6 +67,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 29 2008 Lennart Poettering - 0.13-1 +- New release 0.13 + * Tue Feb 19 2008 Fedora Release Engineering - 0.12-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Jul 28 23:14:36 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Mon, 28 Jul 2008 23:14:36 GMT Subject: rpms/libdaemon/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200807282314.m6SNEaqR024847@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libdaemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24777 Modified Files: .cvsignore sources Log Message: add new tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libdaemon/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Jul 2007 14:17:37 -0000 1.5 +++ .cvsignore 28 Jul 2008 23:14:06 -0000 1.6 @@ -1 +1 @@ -libdaemon-0.12.tar.gz +libdaemon-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libdaemon/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Jul 2007 14:17:37 -0000 1.5 +++ sources 28 Jul 2008 23:14:06 -0000 1.6 @@ -1 +1 @@ -76596823cc1a6d1cdf7779b782ff0ee6 libdaemon-0.12.tar.gz +ae9113fcd825d5a7f07e5ddccb3c3102 libdaemon-0.13.tar.gz From fedora-extras-commits at redhat.com Mon Jul 28 23:34:11 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 28 Jul 2008 23:34:11 GMT Subject: rpms/telepathy-glib/devel telepathy-glib-broken-pkgconfig.patch, 1.2, 1.3 telepathy-glib.spec, 1.19, 1.20 Message-ID: <200807282334.m6SNYBoW026674@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26569 Modified Files: telepathy-glib-broken-pkgconfig.patch telepathy-glib.spec Log Message: * Mon Jul 28 2008 Brian Pepple - 0.7.12-2 - Update broken-pkgconfig patch. (#456621) telepathy-glib-broken-pkgconfig.patch: Index: telepathy-glib-broken-pkgconfig.patch =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib-broken-pkgconfig.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- telepathy-glib-broken-pkgconfig.patch 22 Jul 2008 00:02:16 -0000 1.2 +++ telepathy-glib-broken-pkgconfig.patch 28 Jul 2008 23:33:41 -0000 1.3 @@ -1,11 +1,14 @@ diff -urp telepathy-glib-0.7.12.OLD/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.7.12/telepathy-glib/telepathy-glib.pc.in --- telepathy-glib-0.7.12.OLD/telepathy-glib/telepathy-glib.pc.in 2008-07-17 11:27:57.000000000 -0400 -+++ telepathy-glib-0.7.12/telepathy-glib/telepathy-glib.pc.in 2008-07-21 19:51:42.000000000 -0400 -@@ -7,6 +7,6 @@ Name: Telepathy-GLib ++++ telepathy-glib-0.7.12/telepathy-glib/telepathy-glib.pc.in 2008-07-28 19:29:34.000000000 -0400 +@@ -5,8 +5,7 @@ includedir=@includedir@ + + Name: Telepathy-GLib Description: GLib utility library for the Telepathy framework - Version: @VERSION@ - Requires: pkg-config >= 0.21 +-Version: @VERSION@ +-Requires: pkg-config >= 0.21 -Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.10, gobject-2.0 >= 2.10 -+Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.10, gobject-2.0 >= 2.10 ++Version: @VERSION@ ++Requires: pkg-config >= 0.21, dbus-glib-1 >= 0.73, glib-2.0 >= 2.10, gobject-2.0 >= 2.10 Libs: -L${libdir} -ltelepathy-glib Cflags: -I${includedir}/telepathy-1.0 Index: telepathy-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- telepathy-glib.spec 22 Jul 2008 00:02:16 -0000 1.19 +++ telepathy-glib.spec 28 Jul 2008 23:33:41 -0000 1.20 @@ -4,7 +4,7 @@ Name: telepathy-glib Version: 0.7.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GLib bindings for Telepathy Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Mon Jul 28 2008 Brian Pepple - 0.7.12-2 +- Update broken-pkgconfig patch. (#456621) + * Mon Jul 21 2008 Brian Pepple - 0.7.12-1 - Update to 0.7.12. - Update pkgconfig patch. From fedora-extras-commits at redhat.com Mon Jul 28 23:50:21 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Mon, 28 Jul 2008 23:50:21 GMT Subject: rpms/glibc/devel .cvsignore, 1.249, 1.250 glibc-fedora.patch, 1.278, 1.279 glibc.spec, 1.363, 1.364 sources, 1.274, 1.275 Message-ID: <200807282350.m6SNoLXS028370@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28325/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: 2.8.90-10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- .cvsignore 16 Jul 2008 10:14:40 -0000 1.249 +++ .cvsignore 28 Jul 2008 23:49:51 -0000 1.250 @@ -1,2 +1,2 @@ -glibc-20080716T0944.tar.bz2 -glibc-fedora-20080716T0944.tar.bz2 +glibc-20080728T2320.tar.bz2 +glibc-fedora-20080728T2320.tar.bz2 glibc-fedora.patch: Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- glibc-fedora.patch 16 Jul 2008 10:14:40 -0000 1.278 +++ glibc-fedora.patch 28 Jul 2008 23:49:51 -0000 1.279 @@ -1,6 +1,6 @@ ---- glibc-20080716T0944/ChangeLog 15 Jul 2008 18:13:22 -0000 1.11263 -+++ glibc-20080716T0944-fedora/ChangeLog 16 Jul 2008 09:53:42 -0000 1.8782.2.307 -@@ -5112,6 +5112,13 @@ +--- glibc-20080728T2320/ChangeLog 28 Jul 2008 22:55:10 -0000 1.11297 ++++ glibc-20080728T2320-fedora/ChangeLog 28 Jul 2008 23:34:07 -0000 1.8782.2.308 +@@ -5376,6 +5376,13 @@ * include/sys/cdefs.h: Redefine __nonnull so that test for incorrect parameters in the libc code itself are not omitted. @@ -14,7 +14,7 @@ 2007-05-09 Jakub Jelinek * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -5407,6 +5414,10 @@ +@@ -5671,6 +5678,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -6664,6 +6675,15 @@ +@@ -6928,6 +6939,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -41,8 +41,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-20080716T0944/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20080716T0944-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20080728T2320/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20080728T2320-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20080716T0944/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20080716T0944-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20080728T2320/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20080728T2320-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -281,8 +281,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20080716T0944/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20080716T0944-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20080728T2320/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20080728T2320-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -293,8 +293,8 @@ vpath initfini.c $(sysdirs) ---- glibc-20080716T0944/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20080716T0944-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20080728T2320/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20080728T2320-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -319,8 +319,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20080716T0944/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 -+++ glibc-20080716T0944-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 +--- glibc-20080728T2320/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 ++++ glibc-20080728T2320-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,8 +349,8 @@ # define O 0 # else # define O 1 ---- glibc-20080716T0944/elf/ldconfig.c 19 Mar 2008 06:43:31 -0000 1.63 -+++ glibc-20080716T0944-fedora/elf/ldconfig.c 26 Mar 2008 11:22:14 -0000 1.47.2.18 +--- glibc-20080728T2320/elf/ldconfig.c 19 Mar 2008 06:43:31 -0000 1.63 ++++ glibc-20080728T2320-fedora/elf/ldconfig.c 26 Mar 2008 11:22:14 -0000 1.47.2.18 @@ -1000,17 +1000,19 @@ search_dirs (void) @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-20080716T0944/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20080716T0944-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20080728T2320/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20080728T2320-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -458,8 +458,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20080716T0944/include/features.h 11 Apr 2008 17:33:13 -0000 1.50 -+++ glibc-20080716T0944-fedora/include/features.h 12 Apr 2008 07:48:57 -0000 1.35.2.20 +--- glibc-20080728T2320/include/features.h 11 Apr 2008 17:33:13 -0000 1.50 ++++ glibc-20080728T2320-fedora/include/features.h 12 Apr 2008 07:48:57 -0000 1.35.2.20 @@ -282,8 +282,13 @@ #endif @@ -476,16 +476,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-20080716T0944/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080728T2320/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080716T0944/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080728T2320/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080716T0944/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 -+++ glibc-20080716T0944-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 +--- glibc-20080728T2320/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 ++++ glibc-20080728T2320-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20080716T0944/libio/stdio.h 24 May 2008 18:14:36 -0000 1.93 -+++ glibc-20080716T0944-fedora/libio/stdio.h 24 May 2008 22:22:18 -0000 1.78.2.14 +--- glibc-20080728T2320/libio/stdio.h 24 May 2008 18:14:36 -0000 1.93 ++++ glibc-20080728T2320-fedora/libio/stdio.h 24 May 2008 22:22:18 -0000 1.78.2.14 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20080716T0944/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20080716T0944-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20080728T2320/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20080728T2320-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20080716T0944/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 -+++ glibc-20080716T0944-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 +--- glibc-20080728T2320/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 ++++ glibc-20080728T2320-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -636,20 +636,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-20080716T0944/localedata/ChangeLog 11 Jul 2008 17:05:42 -0000 1.706 -+++ glibc-20080716T0944-fedora/localedata/ChangeLog 16 Jul 2008 09:53:44 -0000 1.494.2.69 -@@ -62,9 +62,6 @@ - * locales/es_ES: Fix p_cs_precedes and n_cs_precedes. - Use common collation definition. - -- [BZ #6040] -- * locales/fr_FR: Fix abmon, abday, d_ftm, grouping. -- - [BZ #6004] - * locales/iso14651_t1_common: Fix first weight for U+1E60, U+1E62, - U+1E64, U+1E66, and U+1E68. ---- glibc-20080716T0944/localedata/Makefile 30 Mar 2008 23:40:06 -0000 1.108 -+++ glibc-20080716T0944-fedora/localedata/Makefile 8 Apr 2008 07:59:47 -0000 1.101.2.8 +--- glibc-20080728T2320/localedata/Makefile 30 Mar 2008 23:40:06 -0000 1.108 ++++ glibc-20080728T2320-fedora/localedata/Makefile 8 Apr 2008 07:59:47 -0000 1.101.2.8 @@ -224,6 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -658,8 +646,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20080716T0944/localedata/SUPPORTED 4 Mar 2008 22:10:33 -0000 1.109 -+++ glibc-20080716T0944-fedora/localedata/SUPPORTED 5 Mar 2008 09:37:42 -0000 1.71.2.21 +--- glibc-20080728T2320/localedata/SUPPORTED 4 Mar 2008 22:10:33 -0000 1.109 ++++ glibc-20080728T2320-fedora/localedata/SUPPORTED 5 Mar 2008 09:37:42 -0000 1.71.2.21 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -701,78 +689,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20080716T0944/localedata/tst-langinfo.sh 9 Apr 2008 18:16:14 -0000 1.7 -+++ glibc-20080716T0944-fedora/localedata/tst-langinfo.sh 10 Oct 2007 21:00:45 -0000 1.5.2.1 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Test nl_langinfo. --# Copyright (C) 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2000, 2001, 2003, 2007 Free Software Foundation, Inc. - # This file is part of the GNU C Library. - # - -@@ -245,13 +245,13 @@ de_DE.UTF-8 RADIXCHAR , - de_DE.UTF-8 THOUSEP . - de_DE.UTF-8 YESEXPR ^[jJyY].* - de_DE.UTF-8 NOEXPR ^[nN].* --fr_FR.ISO-8859-1 ABDAY_1 dim. --fr_FR.ISO-8859-1 ABDAY_2 lun. --fr_FR.ISO-8859-1 ABDAY_3 mar. --fr_FR.ISO-8859-1 ABDAY_4 mer. --fr_FR.ISO-8859-1 ABDAY_5 jeu. --fr_FR.ISO-8859-1 ABDAY_6 ven. --fr_FR.ISO-8859-1 ABDAY_7 sam. -+fr_FR.ISO-8859-1 ABDAY_1 dim -+fr_FR.ISO-8859-1 ABDAY_2 lun -+fr_FR.ISO-8859-1 ABDAY_3 mar -+fr_FR.ISO-8859-1 ABDAY_4 mer -+fr_FR.ISO-8859-1 ABDAY_5 jeu -+fr_FR.ISO-8859-1 ABDAY_6 ven -+fr_FR.ISO-8859-1 ABDAY_7 sam - fr_FR.ISO-8859-1 DAY_1 dimanche - fr_FR.ISO-8859-1 DAY_2 lundi - fr_FR.ISO-8859-1 DAY_3 mardi -@@ -259,18 +259,18 @@ fr_FR.ISO-8859-1 DAY_4 mercred - fr_FR.ISO-8859-1 DAY_5 jeudi - fr_FR.ISO-8859-1 DAY_6 vendredi - fr_FR.ISO-8859-1 DAY_7 samedi --fr_FR.ISO-8859-1 ABMON_1 janv. --fr_FR.ISO-8859-1 ABMON_2 f?vr. --fr_FR.ISO-8859-1 ABMON_3 mars --fr_FR.ISO-8859-1 ABMON_4 avril -+fr_FR.ISO-8859-1 ABMON_1 jan -+fr_FR.ISO-8859-1 ABMON_2 f?v -+fr_FR.ISO-8859-1 ABMON_3 mar -+fr_FR.ISO-8859-1 ABMON_4 avr - fr_FR.ISO-8859-1 ABMON_5 mai --fr_FR.ISO-8859-1 ABMON_6 juin --fr_FR.ISO-8859-1 ABMON_7 juil. --fr_FR.ISO-8859-1 ABMON_8 ao?t --fr_FR.ISO-8859-1 ABMON_9 sept. --fr_FR.ISO-8859-1 ABMON_10 oct. --fr_FR.ISO-8859-1 ABMON_11 nov. --fr_FR.ISO-8859-1 ABMON_12 d?c. -+fr_FR.ISO-8859-1 ABMON_6 jun -+fr_FR.ISO-8859-1 ABMON_7 jui -+fr_FR.ISO-8859-1 ABMON_8 ao? -+fr_FR.ISO-8859-1 ABMON_9 sep -+fr_FR.ISO-8859-1 ABMON_10 oct -+fr_FR.ISO-8859-1 ABMON_11 nov -+fr_FR.ISO-8859-1 ABMON_12 d?c - fr_FR.ISO-8859-1 MON_1 janvier - fr_FR.ISO-8859-1 MON_2 f?vrier - fr_FR.ISO-8859-1 MON_3 mars -@@ -284,7 +284,7 @@ fr_FR.ISO-8859-1 MON_10 octobre - fr_FR.ISO-8859-1 MON_11 novembre - fr_FR.ISO-8859-1 MON_12 d?cembre - fr_FR.ISO-8859-1 D_T_FMT "%a %d %b %Y %T %Z" --fr_FR.ISO-8859-1 D_FMT "%d/%m/%Y" -+fr_FR.ISO-8859-1 D_FMT "%d.%m.%Y" - fr_FR.ISO-8859-1 T_FMT "%T" - fr_FR.ISO-8859-1 RADIXCHAR , - fr_FR.ISO-8859-1 THOUSEP " " ---- glibc-20080716T0944/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20080716T0944-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20080728T2320/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20080728T2320-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -787,8 +705,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20080716T0944/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 -+++ glibc-20080716T0944-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 +--- glibc-20080728T2320/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 ++++ glibc-20080728T2320-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -800,123 +718,8 @@ date_fmt "/ / " ---- glibc-20080716T0944/localedata/locales/fr_FR 8 Apr 2008 00:17:54 -0000 1.15 -+++ glibc-20080716T0944-fedora/localedata/locales/fr_FR 10 Oct 2007 21:00:45 -0000 1.10.2.3 -@@ -3,35 +3,33 @@ escape_char / - % - % French Language Locale for France - % Source: RAP -+% Address: Sankt Jo//rgens Alle 8 -+% DK-1615 Ko//benhavn V, Danmark -+% Contact: Keld Simonsen -+% Email: Keld.Simonsen at dkuug.dk -+% Tel: +45 - 31226543 -+% Fax: +45 - 33256543 - % Language: fr --% Contact: Traduc.org --% Address: 18, rue Cavendish --% 75019 Paris --% Email: traduc at traduc.org - % Territory: FR --% Revision: 4.4 --% Date: 2008-03-02 -+% Revision: 4.3 -+% Date: 1996-10-15 - % Users: general - % Charset: ISO-8859-1 --% Authors: --% 2000-06-28, keld.simonsen at dkuug.dk --% 2008-03-02, stephane.raimbault at gmail.com --% - % Distribution and use is free, also - % for commercial purposes. - - LC_IDENTIFICATION - title "French locale for France" - source "RAP" --address "" --contact "Traduc.org" -+address "Sankt Jrgens Alle 8, DK-1615 Kbenhavn V, Danmark" -+contact "Keld Simonsen" - email "bug-glibc-locales at gnu.org" - tel "" - fax "" - language "French" - territory "France" - revision "1.0" --date "2008-03-15" -+date "2000-06-28" - % - category "fr_FR:2000";LC_IDENTIFICATION - category "fr_FR:2000";LC_CTYPE -@@ -74,7 +72,7 @@ int_curr_symbol "" - mon_decimal_point "" - mon_thousands_sep "" --mon_grouping 3 -+mon_grouping 3;3 - positive_sign "" - negative_sign "" - int_frac_digits 2 -@@ -90,17 +88,14 @@ END LC_MONETARY - LC_NUMERIC - decimal_point "" - thousands_sep "" --grouping 3 -+grouping 0;0 - END LC_NUMERIC - - LC_TIME --abday "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "" -+abday "";"";/ -+ "";"";/ -+ "";"";/ -+ "" - day "";/ - "";/ - "";/ -@@ -108,18 +103,12 @@ day "";/ - "";/ - "" --abmon "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "";/ -- "" -+abmon "";"";/ -+ "";"";/ -+ "";"";/ -+ "";"";/ -+ "";"";/ -+ "";"" - mon "";/ - "";/ - "";/ -@@ -133,7 +122,7 @@ mon "";/ - "" - d_t_fmt "" --d_fmt "" -+d_fmt "" - t_fmt "" - am_pm "";"" - t_fmt_ampm "" ---- glibc-20080716T0944/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20080728T2320/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -987,8 +790,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20080716T0944/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20080716T0944-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20080728T2320/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20080728T2320-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1016,8 +819,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20080716T0944/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 -+++ glibc-20080716T0944-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 +--- glibc-20080728T2320/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 ++++ glibc-20080728T2320-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 @@ -24,9 +24,25 @@ # include # include @@ -1093,65 +896,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20080716T0944/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 -+++ glibc-20080716T0944-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 -@@ -40,6 +40,18 @@ - # include - # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) - # define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp) -+extern __typeof (malloc) __libc_malloc; -+extern __typeof (free) __libc_free; -+extern __typeof (realloc) __libc_realloc; -+libc_hidden_proto (__libc_malloc) -+libc_hidden_proto (__libc_realloc) -+libc_hidden_proto (__libc_free) -+libc_hidden_proto (__libc_memalign) -+#else -+# define __libc_malloc(sz) malloc (sz) -+# define __libc_free(ptr) free (ptr) -+# define __libc_realloc(ptr, sz) realloc (ptr, sz) -+# define __libc_memalign(al, sz) memalign (al, sz) - #endif - - #ifndef attribute_hidden -@@ -154,7 +166,7 @@ tr_freehook (ptr, caller) - if (tr_old_free_hook != NULL) - (*tr_old_free_hook) (ptr, caller); - else -- free (ptr); -+ __libc_free (ptr); - __free_hook = tr_freehook; - __libc_lock_unlock (lock); - } -@@ -173,7 +185,7 @@ tr_mallochook (size, caller) - if (tr_old_malloc_hook != NULL) - hdr = (__ptr_t) (*tr_old_malloc_hook) (size, caller); - else -- hdr = (__ptr_t) malloc (size); -+ hdr = (__ptr_t) __libc_malloc (size); - __malloc_hook = tr_mallochook; - - tr_where (caller); -@@ -209,7 +221,7 @@ tr_reallochook (ptr, size, caller) - if (tr_old_realloc_hook != NULL) - hdr = (__ptr_t) (*tr_old_realloc_hook) (ptr, size, caller); - else -- hdr = (__ptr_t) realloc (ptr, size); -+ hdr = (__ptr_t) __libc_realloc (ptr, size); - __free_hook = tr_freehook; - __malloc_hook = tr_mallochook; - __realloc_hook = tr_reallochook; -@@ -251,7 +263,7 @@ tr_memalignhook (alignment, size, caller - if (tr_old_memalign_hook != NULL) - hdr = (__ptr_t) (*tr_old_memalign_hook) (alignment, size, caller); - else -- hdr = (__ptr_t) memalign (alignment, size); -+ hdr = (__ptr_t) __libc_memalign (alignment, size); - __memalign_hook = tr_memalignhook; - __malloc_hook = tr_mallochook; - ---- glibc-20080716T0944/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 -+++ glibc-20080716T0944-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 +--- glibc-20080728T2320/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 ++++ glibc-20080728T2320-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1161,8 +907,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20080716T0944/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 -+++ glibc-20080716T0944-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 +--- glibc-20080728T2320/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 ++++ glibc-20080728T2320-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1206,17 +952,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-20080716T0944/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20080716T0944-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20080728T2320/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20080728T2320-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-20080716T0944/nptl/ChangeLog 12 Jun 2008 16:16:38 -0000 1.1071 -+++ glibc-20080716T0944-fedora/nptl/ChangeLog 12 Jun 2008 16:53:42 -0000 1.706.2.158 -@@ -3212,6 +3212,15 @@ +--- glibc-20080728T2320/nptl/ChangeLog 26 Jul 2008 16:25:10 -0000 1.1073 ++++ glibc-20080728T2320-fedora/nptl/ChangeLog 28 Jul 2008 23:34:15 -0000 1.706.2.159 +@@ -3229,6 +3229,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1232,7 +978,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -3948,6 +3957,11 @@ +@@ -3965,6 +3974,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1244,7 +990,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6022,6 +6036,11 @@ +@@ -6039,6 +6053,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1256,8 +1002,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20080716T0944/nptl/Makefile 31 May 2008 08:56:14 -0000 1.194 -+++ glibc-20080716T0944-fedora/nptl/Makefile 12 Jun 2008 16:53:42 -0000 1.157.2.36 +--- glibc-20080728T2320/nptl/Makefile 31 May 2008 08:56:14 -0000 1.194 ++++ glibc-20080728T2320-fedora/nptl/Makefile 12 Jun 2008 16:53:42 -0000 1.157.2.36 @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1290,8 +1036,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20080716T0944/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20080716T0944-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20080728T2320/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20080728T2320-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1316,8 +1062,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20080716T0944/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20080728T2320/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1325,8 +1071,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20080716T0944/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 8 Mar 2008 01:57:04 -0000 1.16 -+++ glibc-20080716T0944-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 14 Mar 2008 22:36:45 -0000 1.8.2.9 +--- glibc-20080728T2320/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 8 Mar 2008 01:57:04 -0000 1.16 ++++ glibc-20080728T2320-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 14 Mar 2008 22:36:45 -0000 1.8.2.9 @@ -181,4 +181,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1335,8 +1081,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* posix_opt.h */ ---- glibc-20080716T0944/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 -+++ glibc-20080716T0944-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 +--- glibc-20080728T2320/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 ++++ glibc-20080728T2320-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1346,8 +1092,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-20080716T0944/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20080716T0944-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 +--- glibc-20080728T2320/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20080728T2320-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1404,8 +1150,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-20080716T0944/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 -+++ glibc-20080716T0944-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 +--- glibc-20080728T2320/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 ++++ glibc-20080728T2320-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 @@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1422,8 +1168,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-20080716T0944/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20080728T2320/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1440,8 +1186,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20080716T0944/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 -+++ glibc-20080716T0944-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 +--- glibc-20080728T2320/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 ++++ glibc-20080728T2320-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 @@ -21,7 +21,7 @@ # subdir := streams @@ -1451,8 +1197,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-20080716T0944/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20080716T0944-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20080728T2320/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20080728T2320-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1468,8 +1214,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20080716T0944/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 -+++ glibc-20080716T0944-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 +--- glibc-20080728T2320/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 ++++ glibc-20080728T2320-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 @@ -64,6 +64,14 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1485,8 +1231,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20080716T0944/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20080716T0944-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20080728T2320/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20080728T2320-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1498,8 +1244,8 @@ endif endif ---- glibc-20080716T0944/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20080716T0944-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20080728T2320/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20080728T2320-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1851,8 +1597,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20080716T0944/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080728T2320/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1938,8 +1684,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20080716T0944/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20080716T0944-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20080728T2320/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20080728T2320-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1948,8 +1694,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20080716T0944/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20080716T0944-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20080728T2320/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20080728T2320-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1964,8 +1710,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 @@ -27,13 +27,10 @@ #include #include @@ -1981,8 +1727,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/dl-osinfo.h 17 Apr 2008 08:32:24 -0000 1.28 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 15 May 2008 07:57:48 -0000 1.14.2.14 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/dl-osinfo.h 17 Apr 2008 08:32:24 -0000 1.28 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 15 May 2008 07:57:48 -0000 1.14.2.14 @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2029,8 +1775,8 @@ + ret ^= stk; return ret; } ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2073,8 +1819,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -2100,8 +1846,8 @@ struct netlink_res { ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2111,8 +1857,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -2158,8 +1904,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -2178,8 +1924,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2240,8 +1986,8 @@ + } while (0) + +#include_next ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2274,29 +2020,29 @@ + } while (0) + #include_next ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20080716T0944/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20080716T0944-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20080728T2320/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20080728T2320-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 @@ -89,9 +89,6 @@ L(pseudo_end): ret Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- glibc.spec 16 Jul 2008 10:14:40 -0000 1.363 +++ glibc.spec 28 Jul 2008 23:49:51 -0000 1.364 @@ -1,6 +1,6 @@ -%define glibcdate 20080716T0944 +%define glibcdate 20080728T2320 %define glibcname glibc -%define glibcsrcdir glibc-20080716T0944 +%define glibcsrcdir glibc-20080728T2320 %define glibc_release_tarballs 0 %define run_glibc_tests 1 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.8.90 -Release: 9 +Release: 10 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -980,6 +980,14 @@ %endif %changelog +* Tue Jul 29 2008 Jakub Jelinek 2.8.90-10 +- update from trunk + - resolver fixes + - misc fixes (BZ#6771, BZ#6763, BZ#6698, BZ#6712) + - s390{,x} utmp/utmpx bi-arch support (BZ#6724) + - popen "e" flag +- fr_FR locale changes reenabled + * Wed Jul 16 2008 Jakub Jelinek 2.8.90-9 - update from trunk - fix unbuffered vfprintf if writing to the stream fails (#455360) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- sources 16 Jul 2008 10:14:40 -0000 1.274 +++ sources 28 Jul 2008 23:49:51 -0000 1.275 @@ -1,2 +1,2 @@ -9d8832d421740979ee991857f45a743e glibc-20080716T0944.tar.bz2 -3ca91f6b13467fcaf0bf1ede7aecfa10 glibc-fedora-20080716T0944.tar.bz2 +a49e4cc66677db694cf051fece995ff2 glibc-20080728T2320.tar.bz2 +02ccf46518e04b1b9d04dfd012351ed4 glibc-fedora-20080728T2320.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 00:14:20 2008 From: fedora-extras-commits at redhat.com (Behdad Esfahbod (behdad)) Date: Tue, 29 Jul 2008 00:14:20 GMT Subject: rpms/preload/devel .cvsignore, 1.5, 1.6 preload.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200807290014.m6T0EKSp003151@cvs-int.fedora.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/preload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3091 Modified Files: .cvsignore preload.spec sources Log Message: * Thu Jul 28 2008 Behdad Esfahbod - 0.6.3-1 - Update to 0.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Jul 2008 18:24:06 -0000 1.5 +++ .cvsignore 29 Jul 2008 00:13:50 -0000 1.6 @@ -1 +1 @@ -preload-0.6.2.tar.gz +preload-0.6.3.tar.gz Index: preload.spec =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/preload.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- preload.spec 28 Jul 2008 18:24:06 -0000 1.5 +++ preload.spec 29 Jul 2008 00:13:50 -0000 1.6 @@ -1,5 +1,5 @@ Name: preload -Version: 0.6.2 +Version: 0.6.3 Release: 1%{?dist} Summary: Preload is an adaptive readahead daemon @@ -72,6 +72,9 @@ %changelog +* Thu Jul 28 2008 Behdad Esfahbod - 0.6.3-1 +- Update to 0.6.3 + * Thu Jul 28 2008 Behdad Esfahbod - 0.6.2-1 - Update to 0.6.2 - Actually resolves bug #456742 this time Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/preload/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Jul 2008 18:24:06 -0000 1.5 +++ sources 29 Jul 2008 00:13:50 -0000 1.6 @@ -1 +1 @@ -e15f016cf91486911dc828a2cde15562 preload-0.6.2.tar.gz +4ebb8463b3b7a323ad8b7ffe89578f6e preload-0.6.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 00:24:46 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Tue, 29 Jul 2008 00:24:46 GMT Subject: rpms/postgresql/devel postgresql.spec,1.98,1.99 Message-ID: <200807290024.m6T0OkK6003708@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/postgresql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3671 Modified Files: postgresql.spec Log Message: Fix FTBFS problem occasioned by _default_patch_fuzz = 0 in rawhide Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- postgresql.spec 20 Jun 2008 16:54:12 -0000 1.98 +++ postgresql.spec 29 Jul 2008 00:24:16 -0000 1.99 @@ -83,7 +83,7 @@ Summary: PostgreSQL client programs and libraries Name: postgresql Version: 8.3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -351,7 +351,8 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 +# intentionally allowing fuzz here because of adjacent version number +%patch2 -p1 -F2 %patch3 -p1 %patch4 -p1 # patch5 is applied later @@ -859,6 +860,12 @@ %endif %changelog +* Mon Jul 28 2008 Tom Lane 8.3.3-3 +- Fix build failure caused by new default patch fuzz = 0 policy in rawhide. + The only patch that actually broke was postgresql-ac-version.patch, and + for that it seems better to allow fuzz than to have a guaranteed patch + failure on every upstream minor version update. + * Fri Jun 20 2008 Tom Lane 8.3.3-2 - Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib. Needed because tcl 8.5 no longer puts /usr/lib into its package search path. From fedora-extras-commits at redhat.com Tue Jul 29 00:25:29 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 29 Jul 2008 00:25:29 GMT Subject: comps comps-f10.xml.in,1.62,1.63 Message-ID: <200807290025.m6T0PTCO003807@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3720 Modified Files: comps-f10.xml.in Log Message: rename xfce4-gsynaptics-plugin to xfce-mcs-plugin-gsynaptics Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- comps-f10.xml.in 27 Jul 2008 02:04:49 -0000 1.62 +++ comps-f10.xml.in 29 Jul 2008 00:24:58 -0000 1.63 @@ -4578,6 +4578,7 @@ thunar-media-tags-plugin thunar-shares xfbib + xfce-mcs-plugin-gsynaptics xfce4-battery-plugin xfce4-clipman-plugin xfce4-cpugraph-plugin @@ -4588,7 +4589,6 @@ xfce4-eyes-plugin xfce4-fsguard-plugin xfce4-genmon-plugin - xfce4-gsynaptics-mcs-plugin xfce4-mount-plugin xfce4-netload-plugin xfce4-notes-plugin From fedora-extras-commits at redhat.com Tue Jul 29 01:03:47 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Tue, 29 Jul 2008 01:03:47 GMT Subject: rpms/unixODBC/devel unixODBC-2.2.11-stricmp.patch, 1.1, 1.2 unixODBC.spec, 1.44, 1.45 Message-ID: <200807290103.m6T13lKG011537@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/unixODBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11512 Modified Files: unixODBC-2.2.11-stricmp.patch unixODBC.spec Log Message: Fix FTBFS problem occasioned by _default_patch_fuzz = 0 in rawhide unixODBC-2.2.11-stricmp.patch: Index: unixODBC-2.2.11-stricmp.patch =================================================================== RCS file: /cvs/pkgs/rpms/unixODBC/devel/unixODBC-2.2.11-stricmp.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- unixODBC-2.2.11-stricmp.patch 15 Oct 2005 23:08:39 -0000 1.1 +++ unixODBC-2.2.11-stricmp.patch 29 Jul 2008 01:03:16 -0000 1.2 @@ -1,21 +1,18 @@ ---- unixODBC-2.2.11/sqp/sqpStoreDataType.c.lr 2005-10-15 23:11:50.000000000 +0200 -+++ unixODBC-2.2.11/sqp/sqpStoreDataType.c 2005-10-15 23:12:12.000000000 +0200 -@@ -8,6 +8,13 @@ - - #include "sqp.h" - #include -+#ifndef WIN32 -+#ifndef HAVE_STRICMP -+#define stricmp(s1,s2) strcasecmp(s1,s2) -+#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) -+#endif -+#endif -+ - - void sqpStoreDataType( char *pszType, int nPrecision, int nScale ) - { ---- unixODBC-2.2.11/cur/Makefile.am.lr 2005-10-15 23:47:18.000000000 +0200 -+++ unixODBC-2.2.11/cur/Makefile.am 2005-10-15 23:47:35.000000000 +0200 +diff -Naur unixODBC-2.2.12.orig/DriverManager/DriverManager.exp unixODBC-2.2.12/DriverManager/DriverManager.exp +--- unixODBC-2.2.12.orig/DriverManager/DriverManager.exp 2005-03-09 04:06:42.000000000 -0500 ++++ unixODBC-2.2.12/DriverManager/DriverManager.exp 2008-07-28 20:50:14.000000000 -0400 +@@ -153,6 +153,8 @@ + SQLTablesA + SQLTransact + ODBCSharedTraceFlag ++dm_log_write ++__post_internal_error + uodbc_open_stats + uodbc_close_stats + uodbc_get_stats +diff -Naur unixODBC-2.2.12.orig/cur/Makefile.am unixODBC-2.2.12/cur/Makefile.am +--- unixODBC-2.2.12.orig/cur/Makefile.am 2005-10-18 13:07:31.000000000 -0400 ++++ unixODBC-2.2.12/cur/Makefile.am 2008-07-28 20:50:14.000000000 -0400 @@ -9,7 +9,7 @@ libodbccr_la_LDFLAGS = \ @@ -23,27 +20,34 @@ - -export-symbols @srcdir@/cur.exp -export-dynamic + -export-symbols @srcdir@/cur.exp -export-dynamic ../DriverManager/libodbc.la - # PAH - Redundant? - #libodbccr_la_DEPENDENCIES = \ ---- unixODBC-2.2.11/cur/Makefile.in.lr 2005-10-15 23:31:03.000000000 +0200 -+++ unixODBC-2.2.11/cur/Makefile.in 2005-10-15 23:31:50.000000000 +0200 -@@ -255,7 +255,7 @@ + libodbccr_la_SOURCES = \ + SQLAllocHandle.c \ +diff -Naur unixODBC-2.2.12.orig/cur/Makefile.in unixODBC-2.2.12/cur/Makefile.in +--- unixODBC-2.2.12.orig/cur/Makefile.in 2006-08-31 08:24:23.000000000 -0400 ++++ unixODBC-2.2.12/cur/Makefile.in 2008-07-28 20:50:14.000000000 -0400 +@@ -252,7 +252,7 @@ libodbccr_la_LDFLAGS = \ -version-info @LIB_VERSION@ \ - -export-symbols @srcdir@/cur.exp -export-dynamic + -export-symbols @srcdir@/cur.exp -export-dynamic ../DriverManager/libodbc.la + libodbccr_la_SOURCES = \ + SQLAllocHandle.c \ +diff -Naur unixODBC-2.2.12.orig/sqp/sqpStoreDataType.c unixODBC-2.2.12/sqp/sqpStoreDataType.c +--- unixODBC-2.2.12.orig/sqp/sqpStoreDataType.c 2004-07-26 04:34:47.000000000 -0400 ++++ unixODBC-2.2.12/sqp/sqpStoreDataType.c 2008-07-28 20:50:14.000000000 -0400 +@@ -8,6 +8,13 @@ - # PAH - Redundant? ---- unixODBC-2.2.11/DriverManager/DriverManager.exp.lr 2005-10-16 00:41:59.000000000 +0200 -+++ unixODBC-2.2.11/DriverManager/DriverManager.exp 2005-10-16 00:43:09.000000000 +0200 -@@ -151,6 +151,8 @@ - SQLTablesA - SQLTransact - ODBCSharedTraceFlag -+dm_log_write -+__post_internal_error - uodbc_open_stats - uodbc_close_stats - uodbc_get_stats + #include "sqp.h" + #include ++#ifndef WIN32 ++#ifndef HAVE_STRICMP ++#define stricmp(s1,s2) strcasecmp(s1,s2) ++#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) ++#endif ++#endif ++ + + void sqpStoreDataType( char *pszType, int nPrecision, int nScale ) + { Index: unixODBC.spec =================================================================== RCS file: /cvs/pkgs/rpms/unixODBC/devel/unixODBC.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- unixODBC.spec 13 Jun 2008 21:10:11 -0000 1.44 +++ unixODBC.spec 29 Jul 2008 01:03:16 -0000 1.45 @@ -1,7 +1,7 @@ Summary: A complete ODBC driver manager for Linux Name: unixODBC Version: 2.2.12 -Release: 8%{?dist} +Release: 9%{?dist} Group: System Environment/Libraries URL: http://www.unixODBC.org/ # Programs are GPL, libraries are LGPL, except News Server library is GPL. @@ -174,6 +174,9 @@ %postun -p /sbin/ldconfig %changelog +* Mon Jul 28 2008 Tom Lane 2.2.12-9 +- Fix build failure caused by new default patch fuzz = 0 policy in rawhide. + * Fri Jun 13 2008 Tom Lane 2.2.12-8 - Install icons in /usr/share/pixmaps, not /usr/share/icons as this package has historically done; the former is considered correct. From fedora-extras-commits at redhat.com Tue Jul 29 01:20:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 01:20:51 GMT Subject: rpms/sportrop-fonts - New directory Message-ID: <200807290120.m6T1Kpwk012489@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sportrop-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw12454/rpms/sportrop-fonts Log Message: Directory /cvs/extras/rpms/sportrop-fonts added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 01:20:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 01:20:52 GMT Subject: rpms/sportrop-fonts Makefile,NONE,1.1 Message-ID: <200807290120.m6T1Kq8e012526@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sportrop-fonts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw12454/rpms/sportrop-fonts Added Files: Makefile Log Message: Setup of module sportrop-fonts --- NEW FILE Makefile --- # Top level Makefile for module sportrop-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 29 01:20:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 01:20:51 GMT Subject: rpms/sportrop-fonts/devel - New directory Message-ID: <200807290120.m6T1KpAm012500@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sportrop-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw12454/rpms/sportrop-fonts/devel Log Message: Directory /cvs/extras/rpms/sportrop-fonts/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 01:20:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 01:20:52 GMT Subject: rpms/sportrop-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807290120.m6T1KqDW012541@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sportrop-fonts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw12454/rpms/sportrop-fonts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sportrop-fonts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sportrop-fonts # $Id: Makefile,v 1.1 2008/07/29 01:20:52 kevin Exp $ NAME := sportrop-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 29 01:29:53 2008 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Tue, 29 Jul 2008 01:29:53 GMT Subject: rpms/kernel/devel kernel.spec,1.817,1.818 Message-ID: <200807290129.m6T1TrOo013444@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13393 Modified Files: kernel.spec Log Message: * Mon Jul 28 2008 Josh Boyer - Add gzip requires for kernel-bootwrapper (#456947) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.817 retrieving revision 1.818 diff -u -r1.817 -r1.818 --- kernel.spec 28 Jul 2008 20:12:06 -0000 1.817 +++ kernel.spec 29 Jul 2008 01:29:22 -0000 1.818 @@ -665,6 +665,7 @@ %package bootwrapper Summary: Boot wrapper files for generating combined kernel + initrd images Group: Development/System +Requires: gzip %description bootwrapper Kernel-bootwrapper contains the wrapper code which makes bootable "zImage" files combining both kernel and initial ramdisk. @@ -1692,6 +1693,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Mon Jul 28 2008 Josh Boyer +- Add gzip requires for kernel-bootwrapper (#456947) + * Mon Jul 28 2008 Dave Jones - 2.6.26-git18 From fedora-extras-commits at redhat.com Tue Jul 29 01:37:03 2008 From: fedora-extras-commits at redhat.com (Jon Stanley (jstanley)) Date: Tue, 29 Jul 2008 01:37:03 GMT Subject: rpms/sportrop-fonts/devel import.log, NONE, 1.1 sportrop-fonts-fontconfig.conf, NONE, 1.1 sportrop-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807290137.m6T1b3FM014085@cvs-int.fedora.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/sportrop-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13994/devel Modified Files: .cvsignore sources Added Files: import.log sportrop-fonts-fontconfig.conf sportrop-fonts.spec Log Message: initial commit --- NEW FILE import.log --- sportrop-fonts-0_9-4_fc9:HEAD:sportrop-fonts-0.9-4.fc9.src.rpm:1217295341 --- NEW FILE sportrop-fonts-fontconfig.conf --- Sportrop fantasy fantasy Sportrop --- NEW FILE sportrop-fonts.spec --- %define fontname sportrop %define fontdir %{_datadir}/fonts/%{fontname} %define fontconfdir %{_sysconfdir}/fonts/conf.d Name: %{fontname}-fonts Version: 0.9 Release: 4%{?dist} Summary: A multiline decorative font Group: User Interface/X License: OFL URL: http://openfontlibrary.org/media/files/gluk/287 Source0: http://openfontlibrary.org/people/gluk/gluk_-_Sportrop.zip Source1: %{name}-fontconfig.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description A neat multiline font %prep %setup -c chmod 0644 *.txt for txt in *.txt ; do fold -s $txt > $txt.new sed -i 's/\r//' $txt.new touch -r $txt $txt.new mv $txt.new $txt done %build %install rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{fontdir} install -pm 644 Sportrop.ttf $RPM_BUILD_ROOT%{fontdir} install -dm 755 $RPM_BUILD_ROOT%{fontconfdir} install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/63-%{fontname}.conf %clean rm -rf $RPM_BUILD_ROOT %post if [ -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %postun if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then %{_bindir}/fc-cache -f %{fontdir} || : fi %files %defattr(644,root,root,755) %doc OFL_FAQ.txt OFL_License.txt tabl_c.jpg %config(noreplace) %{fontconfdir}/63-%{fontname}.conf %dir %{fontdir}/ %{fontdir}/*.ttf %changelog * Sun Jul 27 2008 Jon Stanley - 0.9-4 - Revert package split, package only TTF - Use %%setup macro * Wed Jul 23 2008 Jon Stanley - 0.9-3 - Split OTF and TTF into subpackages * Wed Jul 23 2008 Jon Stanley - 0.9-2 - Fixed rpmlint warning in license and license FAQ * Tue Jul 22 2008 Jon Stanley - 0.9-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sportrop-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 01:20:52 -0000 1.1 +++ .cvsignore 29 Jul 2008 01:36:31 -0000 1.2 @@ -0,0 +1 @@ +gluk_-_Sportrop.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sportrop-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 01:20:52 -0000 1.1 +++ sources 29 Jul 2008 01:36:32 -0000 1.2 @@ -0,0 +1 @@ +315aaea18c37aa085a4ab2856d5d991d gluk_-_Sportrop.zip From fedora-extras-commits at redhat.com Tue Jul 29 01:48:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Tue, 29 Jul 2008 01:48:25 GMT Subject: rpms/python-dictclient/devel python-dictclient.spec,1.1,1.2 Message-ID: <200807290148.m6T1mP9W014864@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-dictclient/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14842 Modified Files: python-dictclient.spec Log Message: Test commit. Index: python-dictclient.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-dictclient/devel/python-dictclient.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-dictclient.spec 1 Jun 2008 08:00:37 -0000 1.1 +++ python-dictclient.spec 29 Jul 2008 01:47:54 -0000 1.2 @@ -49,3 +49,4 @@ %changelog * Sat Apr 05 2008 Ricky Zhou - 1.0.1-1 - Initial RPM Package. + From fedora-extras-commits at redhat.com Tue Jul 29 01:49:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?= (ricky)) Date: Tue, 29 Jul 2008 01:49:26 GMT Subject: rpms/python-dictclient/devel python-dictclient.spec,1.2,1.3 Message-ID: <200807290149.m6T1nQ7m014903@cvs-int.fedora.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-dictclient/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14880 Modified Files: python-dictclient.spec Log Message: Undo test commit :-) Index: python-dictclient.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-dictclient/devel/python-dictclient.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-dictclient.spec 29 Jul 2008 01:47:54 -0000 1.2 +++ python-dictclient.spec 29 Jul 2008 01:48:56 -0000 1.3 @@ -49,4 +49,3 @@ %changelog * Sat Apr 05 2008 Ricky Zhou - 1.0.1-1 - Initial RPM Package. - From fedora-extras-commits at redhat.com Tue Jul 29 01:50:40 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Tue, 29 Jul 2008 01:50:40 GMT Subject: rpms/postgresql/devel postgresql-ac-version.patch, 1.2, 1.3 postgresql.spec, 1.99, 1.100 Message-ID: <200807290150.m6T1oeDv014969@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/postgresql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14915 Modified Files: postgresql-ac-version.patch postgresql.spec Log Message: So apparently, %patch -F does not actually *work* in the current Fedora infrastructure. Grumble. postgresql-ac-version.patch: Index: postgresql-ac-version.patch =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql-ac-version.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- postgresql-ac-version.patch 18 Jan 2008 20:48:56 -0000 1.2 +++ postgresql-ac-version.patch 29 Jul 2008 01:50:10 -0000 1.3 @@ -4,12 +4,12 @@ Dike out the check. -diff -Naur postgresql-8.3RC2.orig/configure.in postgresql-8.3RC2/configure.in ---- postgresql-8.3RC2.orig/configure.in 2008-01-17 23:47:32.000000000 -0500 -+++ postgresql-8.3RC2/configure.in 2008-01-18 11:39:58.000000000 -0500 +diff -Naur postgresql-8.3.3.orig/configure.in postgresql-8.3.3/configure.in +--- postgresql-8.3.3.orig/configure.in 2008-06-08 20:38:40.000000000 -0400 ++++ postgresql-8.3.3/configure.in 2008-07-28 21:45:08.000000000 -0400 @@ -19,10 +19,6 @@ - AC_INIT([PostgreSQL], [8.3RC2], [pgsql-bugs at postgresql.org]) + AC_INIT([PostgreSQL], [8.3.3], [pgsql-bugs at postgresql.org]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- postgresql.spec 29 Jul 2008 00:24:16 -0000 1.99 +++ postgresql.spec 29 Jul 2008 01:50:10 -0000 1.100 @@ -351,8 +351,7 @@ %prep %setup -q %patch1 -p1 -# intentionally allowing fuzz here because of adjacent version number -%patch2 -p1 -F2 +%patch2 -p1 %patch3 -p1 %patch4 -p1 # patch5 is applied later @@ -862,9 +861,6 @@ %changelog * Mon Jul 28 2008 Tom Lane 8.3.3-3 - Fix build failure caused by new default patch fuzz = 0 policy in rawhide. - The only patch that actually broke was postgresql-ac-version.patch, and - for that it seems better to allow fuzz than to have a guaranteed patch - failure on every upstream minor version update. * Fri Jun 20 2008 Tom Lane 8.3.3-2 - Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib. From fedora-extras-commits at redhat.com Tue Jul 29 03:30:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 03:30:07 +0000 Subject: [pkgdb] oggvideotools was added for mdomsch Message-ID: <20080729033008.1E9FF1AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package oggvideotools with summary Toolbox for manipulating Ogg video files Kevin Fenzi (kevin) has approved Package oggvideotools Kevin Fenzi (kevin) has added a Fedora devel branch for oggvideotools with an owner of mdomsch Kevin Fenzi (kevin) has approved oggvideotools in Fedora devel Kevin Fenzi (kevin) has approved Package oggvideotools Kevin Fenzi (kevin) has set commit to Approved for cvsextras on oggvideotools (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on oggvideotools (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on oggvideotools (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on oggvideotools (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on oggvideotools (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on oggvideotools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oggvideotools From fedora-extras-commits at redhat.com Tue Jul 29 03:58:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 03:58:02 +0000 Subject: [pkgdb] oggvideotools (Fedora, 8) updated by kevin Message-ID: <20080729035802.AABD61AD0F8@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of oggvideotools in Fedora 8 to mdomsch Kevin Fenzi (kevin) Approved packager for commit access on oggvideotools (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oggvideotools From fedora-extras-commits at redhat.com Tue Jul 29 03:58:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 03:58:02 +0000 Subject: [pkgdb] oggvideotools summary updated by kevin Message-ID: <20080729035802.8A0A11AD0EB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) set package oggvideotools summary to Toolbox for manipulating Ogg video files To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oggvideotools From fedora-extras-commits at redhat.com Tue Jul 29 03:58:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 03:58:02 +0000 Subject: [pkgdb] oggvideotools (Fedora, 9) updated by kevin Message-ID: <20080729035802.9326F1AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of oggvideotools in Fedora 9 to mdomsch Kevin Fenzi (kevin) Approved packager for commit access on oggvideotools (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oggvideotools From fedora-extras-commits at redhat.com Tue Jul 29 03:58:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 03:58:02 +0000 Subject: [pkgdb] oggvideotools (Fedora, devel) updated by kevin Message-ID: <20080729035802.E6BB01AD0FC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of oggvideotools in Fedora devel to mdomsch Kevin Fenzi (kevin) Approved packager for commit access on oggvideotools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oggvideotools From fedora-extras-commits at redhat.com Tue Jul 29 04:01:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 04:01:20 GMT Subject: rpms/oggvideotools - New directory Message-ID: <200807290401.m6T41KaP008267@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oggvideotools In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshY8239/rpms/oggvideotools Log Message: Directory /cvs/extras/rpms/oggvideotools added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 04:01:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 04:01:20 GMT Subject: rpms/oggvideotools/devel - New directory Message-ID: <200807290401.m6T41KRx008281@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oggvideotools/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshY8239/rpms/oggvideotools/devel Log Message: Directory /cvs/extras/rpms/oggvideotools/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 04:01:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 04:01:20 GMT Subject: rpms/oggvideotools Makefile,NONE,1.1 Message-ID: <200807290401.m6T41KwY008304@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oggvideotools In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshY8239/rpms/oggvideotools Added Files: Makefile Log Message: Setup of module oggvideotools --- NEW FILE Makefile --- # Top level Makefile for module oggvideotools all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 29 04:01:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 04:01:21 GMT Subject: rpms/oggvideotools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807290401.m6T41LVE008319@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oggvideotools/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshY8239/rpms/oggvideotools/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module oggvideotools --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: oggvideotools # $Id: Makefile,v 1.1 2008/07/29 04:01:21 kevin Exp $ NAME := oggvideotools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 29 04:07:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 04:07:30 +0000 Subject: [pkgdb] NetworkManager-pptp (Fedora, 9) updated by kevin Message-ID: <20080729040730.D7B0D1AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for NetworkManager-pptp Kevin Fenzi (kevin) has set commit to Approved for packager on NetworkManager-pptp (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on NetworkManager-pptp (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on NetworkManager-pptp (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Tue Jul 29 04:07:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 04:07:30 +0000 Subject: [pkgdb] NetworkManager-pptp (Fedora, 8) updated by kevin Message-ID: <20080729040731.3B3DD1AD0EC@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for NetworkManager-pptp Kevin Fenzi (kevin) has set commit to Approved for packager on NetworkManager-pptp (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for packager on NetworkManager-pptp (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for packager on NetworkManager-pptp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Tue Jul 29 04:17:17 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 29 Jul 2008 04:17:17 GMT Subject: rpms/kernel/devel patch-2.6.27-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.883, 1.884 git-linus.diff, 1.4, 1.5 kernel.spec, 1.818, 1.819 linux-2.6-execshield.patch, 1.94, 1.95 linux-2.6-silence-noise.patch, 1.18, 1.19 linux-2.6-x86-tracehook.patch, 1.4, 1.5 sources, 1.844, 1.845 upstream, 1.761, 1.762 patch-2.6.26-git18.bz2.sign, 1.1, NONE Message-ID: <200807290417.m6T4HHDF009899@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9795 Modified Files: .cvsignore git-linus.diff kernel.spec linux-2.6-execshield.patch linux-2.6-silence-noise.patch linux-2.6-x86-tracehook.patch sources upstream Added Files: patch-2.6.27-rc1.bz2.sign Removed Files: patch-2.6.26-git18.bz2.sign Log Message: 2.6.27-rc1 --- NEW FILE patch-2.6.27-rc1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIjosmyGugalF9Dw4RAhrFAJ9kPIQijO2yD628NrzVwJxMsKDrKwCcDAxX 7j3GN0M2iEPl8aTkl6Q+kiw= =Y7Iw -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.883 retrieving revision 1.884 diff -u -r1.883 -r1.884 --- .cvsignore 28 Jul 2008 20:12:06 -0000 1.883 +++ .cvsignore 29 Jul 2008 04:16:47 -0000 1.884 @@ -5,3 +5,4 @@ kernel-2.6.26 linux-2.6.26.tar.bz2 patch-2.6.26-git18.bz2 +patch-2.6.27-rc1.bz2 git-linus.diff: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 git-linus.diff Index: git-linus.diff =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- git-linus.diff 22 Jul 2008 00:29:17 -0000 1.4 +++ git-linus.diff 29 Jul 2008 04:16:47 -0000 1.5 @@ -1,31598 +0,0 @@ -diff --git a/CREDITS b/CREDITS -index e97bea0..077b147 100644 ---- a/CREDITS -+++ b/CREDITS -@@ -3344,8 +3344,7 @@ S: Spain - N: Linus Torvalds - E: torvalds at linux-foundation.org - D: Original kernel hacker --S: 12725 SW Millikan Way, Suite 400 --S: Beaverton, Oregon 97005 -+S: Portland, Oregon 97005 - S: USA - - N: Marcelo Tosatti -diff --git a/Documentation/DocBook/gadget.tmpl b/Documentation/DocBook/gadget.tmpl -index 5a8ffa7..ea3bc95 100644 ---- a/Documentation/DocBook/gadget.tmpl -+++ b/Documentation/DocBook/gadget.tmpl -@@ -524,6 +524,44 @@ These utilities include endpoint autoconfiguration. - - - -+Composite Device Framework -+ -+The core API is sufficient for writing drivers for composite -+USB devices (with more than one function in a given configuration), -+and also multi-configuration devices (also more than one function, -+but not necessarily sharing a given configuration). -+There is however an optional framework which makes it easier to -+reuse and combine functions. -+ -+ -+Devices using this framework provide a struct -+usb_composite_driver, which in turn provides one or -+more struct usb_configuration instances. -+Each such configuration includes at least one -+struct usb_function, which packages a user -+visible role such as "network link" or "mass storage device". -+Management functions may also exist, such as "Device Firmware -+Upgrade". -+ -+ -+!Iinclude/linux/usb/composite.h -+!Edrivers/usb/gadget/composite.c -+ -+ -+ -+Composite Device Functions -+ -+At this writing, a few of the current gadget drivers have -+been converted to this framework. -+Near-term plans include converting all of them, except for "gadgetfs". -+ -+ -+!Edrivers/usb/gadget/f_acm.c -+!Edrivers/usb/gadget/f_serial.c -+ -+ -+ -+ - - - Peripheral Controller Drivers -diff --git a/Documentation/ia64/paravirt_ops.txt b/Documentation/ia64/paravirt_ops.txt -new file mode 100644 -index 0000000..39ded02 ---- /dev/null -+++ b/Documentation/ia64/paravirt_ops.txt -@@ -0,0 +1,137 @@ -+Paravirt_ops on IA64 -+==================== -+ 21 May 2008, Isaku Yamahata -+ -+ -+Introduction -+------------ -+The aim of this documentation is to help with maintainability and/or to -+encourage people to use paravirt_ops/IA64. -+ -+paravirt_ops (pv_ops in short) is a way for virtualization support of -+Linux kernel on x86. Several ways for virtualization support were -+proposed, paravirt_ops is the winner. -+On the other hand, now there are also several IA64 virtualization -+technologies like kvm/IA64, xen/IA64 and many other academic IA64 -+hypervisors so that it is good to add generic virtualization -+infrastructure on Linux/IA64. -+ -+ -+What is paravirt_ops? -+--------------------- -+It has been developed on x86 as virtualization support via API, not ABI. -+It allows each hypervisor to override operations which are important for -+hypervisors at API level. And it allows a single kernel binary to run on -+all supported execution environments including native machine. -+Essentially paravirt_ops is a set of function pointers which represent -+operations corresponding to low level sensitive instructions and high -+level functionalities in various area. But one significant difference -+from usual function pointer table is that it allows optimization with -+binary patch. It is because some of these operations are very -+performance sensitive and indirect call overhead is not negligible. -+With binary patch, indirect C function call can be transformed into -+direct C function call or in-place execution to eliminate the overhead. -+ -+Thus, operations of paravirt_ops are classified into three categories. -+- simple indirect call -+ These operations correspond to high level functionality so that the -+ overhead of indirect call isn't very important. -+ -+- indirect call which allows optimization with binary patch -+ Usually these operations correspond to low level instructions. They -+ are called frequently and performance critical. So the overhead is -+ very important. -+ -+- a set of macros for hand written assembly code -+ Hand written assembly codes (.S files) also need paravirtualization -+ because they include sensitive instructions or some of code paths in -+ them are very performance critical. -+ -+ -+The relation to the IA64 machine vector -+--------------------------------------- -+Linux/IA64 has the IA64 machine vector functionality which allows the -+kernel to switch implementations (e.g. initialization, ipi, dma api...) -+depending on executing platform. -+We can replace some implementations very easily defining a new machine -+vector. Thus another approach for virtualization support would be -+enhancing the machine vector functionality. -+But paravirt_ops approach was taken because -+- virtualization support needs wider support than machine vector does. -+ e.g. low level instruction paravirtualization. It must be -+ initialized very early before platform detection. -+ -+- virtualization support needs more functionality like binary patch. -+ Probably the calling overhead might not be very large compared to the -+ emulation overhead of virtualization. However in the native case, the -+ overhead should be eliminated completely. -+ A single kernel binary should run on each environment including native, -+ and the overhead of paravirt_ops on native environment should be as -+ small as possible. -+ -+- for full virtualization technology, e.g. KVM/IA64 or -+ Xen/IA64 HVM domain, the result would be -+ (the emulated platform machine vector. probably dig) + (pv_ops). -+ This means that the virtualization support layer should be under -+ the machine vector layer. -+ -+Possibly it might be better to move some function pointers from -+paravirt_ops to machine vector. In fact, Xen domU case utilizes both -+pv_ops and machine vector. -+ -+ -+IA64 paravirt_ops -+----------------- -+In this section, the concrete paravirt_ops will be discussed. -+Because of the architecture difference between ia64 and x86, the -+resulting set of functions is very different from x86 pv_ops. -+ -+- C function pointer tables -+They are not very performance critical so that simple C indirect -+function call is acceptable. The following structures are defined at -+this moment. For details see linux/include/asm-ia64/paravirt.h -+ - struct pv_info -+ This structure describes the execution environment. -+ - struct pv_init_ops -+ This structure describes the various initialization hooks. -+ - struct pv_iosapic_ops -+ This structure describes hooks to iosapic operations. -+ - struct pv_irq_ops -+ This structure describes hooks to irq related operations -+ - struct pv_time_op -+ This structure describes hooks to steal time accounting. -+ -+- a set of indirect calls which need optimization -+Currently this class of functions correspond to a subset of IA64 -+intrinsics. At this moment the optimization with binary patch isn't -+implemented yet. -+struct pv_cpu_op is defined. For details see -+linux/include/asm-ia64/paravirt_privop.h -+Mostly they correspond to ia64 intrinsics 1-to-1. -+Caveat: Now they are defined as C indirect function pointers, but in -+order to support binary patch optimization, they will be changed -+using GCC extended inline assembly code. -+ -+- a set of macros for hand written assembly code (.S files) -+For maintenance purpose, the taken approach for .S files is single -+source code and compile multiple times with different macros definitions. -+Each pv_ops instance must define those macros to compile. -+The important thing here is that sensitive, but non-privileged -+instructions must be paravirtualized and that some privileged -+instructions also need paravirtualization for reasonable performance. -+Developers who modify .S files must be aware of that. At this moment [...31207 lines suppressed...] - /* utility wrapping a simple endpoint selection policy */ -diff --git a/include/linux/usb/irda.h b/include/linux/usb/irda.h -new file mode 100644 -index 0000000..e345cea ---- /dev/null -+++ b/include/linux/usb/irda.h -@@ -0,0 +1,151 @@ -+/* -+ * USB IrDA Bridge Device Definition -+ */ -+ -+#ifndef __LINUX_USB_IRDA_H -+#define __LINUX_USB_IRDA_H -+ -+/* This device should use Application-specific class */ -+ -+#define USB_SUBCLASS_IRDA 0x02 -+ -+/*-------------------------------------------------------------------------*/ -+ -+/* Class-Specific requests (bRequest field) */ -+ -+#define USB_REQ_CS_IRDA_RECEIVING 1 -+#define USB_REQ_CS_IRDA_CHECK_MEDIA_BUSY 3 -+#define USB_REQ_CS_IRDA_RATE_SNIFF 4 -+#define USB_REQ_CS_IRDA_UNICAST_LIST 5 -+#define USB_REQ_CS_IRDA_GET_CLASS_DESC 6 -+ -+/*-------------------------------------------------------------------------*/ -+ -+/* Class-Specific descriptor */ -+ -+#define USB_DT_CS_IRDA 0x21 -+ -+/*-------------------------------------------------------------------------*/ -+ -+/* Data sizes */ -+ -+#define USB_IRDA_DS_2048 (1 << 5) -+#define USB_IRDA_DS_1024 (1 << 4) -+#define USB_IRDA_DS_512 (1 << 3) -+#define USB_IRDA_DS_256 (1 << 2) -+#define USB_IRDA_DS_128 (1 << 1) -+#define USB_IRDA_DS_64 (1 << 0) -+ -+/* Window sizes */ -+ -+#define USB_IRDA_WS_7 (1 << 6) -+#define USB_IRDA_WS_6 (1 << 5) -+#define USB_IRDA_WS_5 (1 << 4) -+#define USB_IRDA_WS_4 (1 << 3) -+#define USB_IRDA_WS_3 (1 << 2) -+#define USB_IRDA_WS_2 (1 << 1) -+#define USB_IRDA_WS_1 (1 << 0) -+ -+/* Min turnaround times in usecs */ -+ -+#define USB_IRDA_MTT_0 (1 << 7) -+#define USB_IRDA_MTT_10 (1 << 6) -+#define USB_IRDA_MTT_50 (1 << 5) -+#define USB_IRDA_MTT_100 (1 << 4) -+#define USB_IRDA_MTT_500 (1 << 3) -+#define USB_IRDA_MTT_1000 (1 << 2) -+#define USB_IRDA_MTT_5000 (1 << 1) -+#define USB_IRDA_MTT_10000 (1 << 0) -+ -+/* Baud rates */ -+ -+#define USB_IRDA_BR_4000000 (1 << 8) -+#define USB_IRDA_BR_1152000 (1 << 7) -+#define USB_IRDA_BR_576000 (1 << 6) -+#define USB_IRDA_BR_115200 (1 << 5) -+#define USB_IRDA_BR_57600 (1 << 4) -+#define USB_IRDA_BR_38400 (1 << 3) -+#define USB_IRDA_BR_19200 (1 << 2) -+#define USB_IRDA_BR_9600 (1 << 1) -+#define USB_IRDA_BR_2400 (1 << 0) -+ -+/* Additional BOFs */ -+ -+#define USB_IRDA_AB_0 (1 << 7) -+#define USB_IRDA_AB_1 (1 << 6) -+#define USB_IRDA_AB_2 (1 << 5) -+#define USB_IRDA_AB_3 (1 << 4) -+#define USB_IRDA_AB_6 (1 << 3) -+#define USB_IRDA_AB_12 (1 << 2) -+#define USB_IRDA_AB_24 (1 << 1) -+#define USB_IRDA_AB_48 (1 << 0) -+ -+/* IRDA Rate Sniff */ -+ -+#define USB_IRDA_RATE_SNIFF 1 -+ -+/*-------------------------------------------------------------------------*/ -+ -+struct usb_irda_cs_descriptor { -+ __u8 bLength; -+ __u8 bDescriptorType; -+ -+ __le16 bcdSpecRevision; -+ __u8 bmDataSize; -+ __u8 bmWindowSize; -+ __u8 bmMinTurnaroundTime; -+ __le16 wBaudRate; -+ __u8 bmAdditionalBOFs; -+ __u8 bIrdaRateSniff; -+ __u8 bMaxUnicastList; -+} __attribute__ ((packed)); -+ -+/*-------------------------------------------------------------------------*/ -+ -+/* Data Format */ -+ -+#define USB_IRDA_STATUS_MEDIA_BUSY (1 << 7) -+ -+/* The following is a 4-bit value used for both -+ * inbound and outbound headers: -+ * -+ * 0 - speed ignored -+ * 1 - 2400 bps -+ * 2 - 9600 bps -+ * 3 - 19200 bps -+ * 4 - 38400 bps -+ * 5 - 57600 bps -+ * 6 - 115200 bps -+ * 7 - 576000 bps -+ * 8 - 1.152 Mbps -+ * 9 - 5 mbps -+ * 10..15 - Reserved -+ */ -+#define USB_IRDA_STATUS_LINK_SPEED 0x0f -+ -+/* The following is a 4-bit value used only for -+ * outbound header: -+ * -+ * 0 - No change (BOF ignored) -+ * 1 - 48 BOFs -+ * 2 - 24 BOFs -+ * 3 - 12 BOFs -+ * 4 - 6 BOFs -+ * 5 - 3 BOFs -+ * 6 - 2 BOFs -+ * 7 - 1 BOFs -+ * 8 - 0 BOFs -+ * 9..15 - Reserved -+ */ -+#define USB_IRDA_EXTRA_BOFS 0xf0 -+ -+struct usb_irda_inbound_header { -+ __u8 bmStatus; -+}; -+ -+struct usb_irda_outbound_header { -+ __u8 bmChange; -+}; -+ -+#endif /* __LINUX_USB_IRDA_H */ -+ -diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h -index 3118ede..0044d9b 100644 ---- a/include/linux/usbdevice_fs.h -+++ b/include/linux/usbdevice_fs.h -@@ -22,8 +22,6 @@ - * - * History: - * 0.1 04.01.2000 Created -- * -- * $Id$ - */ - - /*****************************************************************************/ -diff --git a/mm/slub.c b/mm/slub.c -index 35ab38a..6d4a49c 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -492,7 +492,7 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p) - if (p > addr + 16) - print_section("Bytes b4", p - 16, 16); - -- print_section("Object", p, min(s->objsize, 128)); -+ print_section("Object", p, min_t(unsigned long, s->objsize, PAGE_SIZE)); - - if (s->flags & SLAB_RED_ZONE) - print_section("Redzone", p + s->objsize, -@@ -1495,15 +1495,7 @@ static void flush_cpu_slab(void *d) - - static void flush_all(struct kmem_cache *s) - { --#ifdef CONFIG_SMP - on_each_cpu(flush_cpu_slab, s, 1); --#else -- unsigned long flags; -- -- local_irq_save(flags); -- flush_cpu_slab(s); -- local_irq_restore(flags); --#endif - } - - /* Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.818 retrieving revision 1.819 diff -u -r1.818 -r1.819 --- kernel.spec 29 Jul 2008 01:29:22 -0000 1.818 +++ kernel.spec 29 Jul 2008 04:16:47 -0000 1.819 @@ -43,9 +43,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 0 +%define rcrev 1 # The git snapshot level -%define gitrev 18 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1693,6 +1693,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Tue Jul 29 2008 Dave Jones +- 2.6.27-rc1 + * Mon Jul 28 2008 Josh Boyer - Add gzip requires for kernel-bootwrapper (#456947) linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- linux-2.6-execshield.patch 25 Jul 2008 16:21:10 -0000 1.94 +++ linux-2.6-execshield.patch 29 Jul 2008 04:16:47 -0000 1.95 @@ -596,10 +596,10 @@ index a32d28c..7634038 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -26,6 +26,7 @@ - #include +@@ -27,6 +27,7 @@ #include #include + #include +#include #include @@ -835,16 +835,16 @@ pgoff_t pgoff; int error; int dirty_accountable = 0; -@@ -198,6 +202,9 @@ success: +@@ -211,6 +211,9 @@ success: dirty_accountable = 1; } + if (oldflags & VM_EXEC) + arch_remove_exec_range(current->mm, old_end); + + mmu_notifier_invalidate_range_start(mm, start, end); if (is_vm_hugetlb_page(vma)) hugetlb_change_protection(vma, start, end, vma->vm_page_prot); - else diff --git a/mm/mremap.c b/mm/mremap.c index 08e3c7f..101f885 100644 --- a/mm/mremap.c linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- linux-2.6-silence-noise.patch 17 Jul 2008 17:32:22 -0000 1.18 +++ linux-2.6-silence-noise.patch 29 Jul 2008 04:16:47 -0000 1.19 @@ -1,24 +1,3 @@ ---- linux-2.6.19.noarch/arch/x86/pci/i386.c~ 2006-12-04 11:21:32.000000000 -0500 -+++ linux-2.6.19.noarch/arch/x86/pci/i386.c 2006-12-04 11:22:10.000000000 -0500 -@@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_ - pr = pci_find_parent_resource(dev, r); - if (!r->start || !pr || - request_resource(pr, r) < 0) { -- printk(KERN_ERR "PCI: Cannot allocate " -+ printk(KERN_DEBUG "PCI: Cannot allocate " - "resource region %d " - "of bridge %s\n", - idx, pci_name(dev)); -@@ -155,7 +155,7 @@ static void __init pcibios_allocate_reso - r->start, r->end, r->flags, disabled, pass); - pr = pci_find_parent_resource(dev, r); - if (!pr || request_resource(pr, r) < 0) { -- printk(KERN_ERR "PCI: Cannot allocate " -+ printk(KERN_DEBUG "PCI: Cannot allocate " - "resource region %d " - "of device %s\n", - idx, pci_name(dev)); - --- linux-2.6.26.noarch/drivers/base/power/main.c~ 2008-07-17 13:12:20.000000000 -0400 +++ linux-2.6.26.noarch/drivers/base/power/main.c 2008-07-17 13:12:44.000000000 -0400 @@ -71,9 +71,6 @@ int device_pm_add(struct device *dev) linux-2.6-x86-tracehook.patch: Index: linux-2.6-x86-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-tracehook.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-x86-tracehook.patch 27 Jul 2008 23:43:11 -0000 1.4 +++ linux-2.6-x86-tracehook.patch 29 Jul 2008 04:16:47 -0000 1.5 @@ -16,9 +16,9 @@ select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER + select HAVE_ARCH_TRACEHOOK + select HAVE_GENERIC_DMA_COHERENT if X86_32 select HAVE_EFFICIENT_UNALIGNED_ACCESS - config ARCH_DEFCONFIG diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index e37dccc..19a7d2c 100644 --- a/arch/x86/kernel/ptrace.c Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.844 retrieving revision 1.845 diff -u -r1.844 -r1.845 --- sources 28 Jul 2008 20:12:06 -0000 1.844 +++ sources 29 Jul 2008 04:16:47 -0000 1.845 @@ -1,2 +1 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 -27cf87f5d26fa352d295bad728a175bb patch-2.6.26-git18.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.761 retrieving revision 1.762 diff -u -r1.761 -r1.762 --- upstream 28 Jul 2008 20:12:06 -0000 1.761 +++ upstream 29 Jul 2008 04:16:47 -0000 1.762 @@ -1,2 +1,2 @@ linux-2.6.26.tar.bz2 -patch-2.6.26-git18.bz2 +patch-2.6.27-rc1.bz2 --- patch-2.6.26-git18.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 04:17:17 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 29 Jul 2008 04:17:17 GMT Subject: rpms/kernel/devel/scripts get-snapshot.sh, 1.7, 1.8 rebase.sh, 1.21, 1.22 Message-ID: <200807290417.m6T4HH12009903@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9795/scripts Modified Files: get-snapshot.sh rebase.sh Log Message: 2.6.27-rc1 Index: get-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/get-snapshot.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- get-snapshot.sh 22 Jul 2008 00:29:35 -0000 1.7 +++ get-snapshot.sh 29 Jul 2008 04:16:47 -0000 1.8 @@ -26,7 +26,7 @@ fi mv git-linus-new.diff git-linus.diff -perl -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec +perl -p -i -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec echo "- Merge Linux-2.6 up to" $TOT > ~/src/fedora/kernel/devel/clog.tmp cd ~/src/fedora/kernel/devel/ Index: rebase.sh =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- rebase.sh 21 Jun 2008 02:06:46 -0000 1.21 +++ rebase.sh 29 Jul 2008 04:16:47 -0000 1.22 @@ -2,7 +2,7 @@ if [ ! -f /usr/bin/lynx ]; then echo yum install lynx - exit 1 + exit 0 fi # Current kernel bits @@ -177,6 +177,8 @@ fi if [ "$OLDRC" != "$NEWRC" -o "$OLDGIT" != "$NEWGIT" ]; then + perl -p -i -e 's|^ApplyPatch\ git-linus.diff|#ApplyPatch\ git-linus.diff|' kernel.spec + > git-linus.diff bumpspecfile.py kernel.spec "- $NEW" make clog exit 1 From fedora-extras-commits at redhat.com Tue Jul 29 04:38:23 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 29 Jul 2008 04:38:23 GMT Subject: rpms/kernel/devel sources,1.845,1.846 Message-ID: <200807290438.m6T4cNFf013773@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13651 Modified Files: sources Log Message: 2.6.27-rc1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.845 retrieving revision 1.846 diff -u -r1.845 -r1.846 --- sources 29 Jul 2008 04:16:47 -0000 1.845 +++ sources 29 Jul 2008 04:37:53 -0000 1.846 @@ -1 +1,2 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 +948b25bab0082d1db5bd8c9fac824891 patch-2.6.27-rc1.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 04:44:02 2008 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Tue, 29 Jul 2008 04:44:02 GMT Subject: rpms/oggvideotools/devel import.log, NONE, 1.1 oggvideotools-0.4-autoconf.patch, NONE, 1.1 oggvideotools-0.4-gcc43.patch, NONE, 1.1 oggvideotools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807290444.m6T4i2tC015050@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/oggvideotools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14909/devel Modified Files: .cvsignore sources Added Files: import.log oggvideotools-0.4-autoconf.patch oggvideotools-0.4-gcc43.patch oggvideotools.spec Log Message: initial checkin --- NEW FILE import.log --- oggvideotools-0_4-1_fc9:HEAD:oggvideotools-0.4-1.fc9.src.rpm:1217306529 oggvideotools-0.4-autoconf.patch: --- NEW FILE oggvideotools-0.4-autoconf.patch --- diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/aclocal.m4 oggvideotools-0.4-fedora/aclocal.m4 --- oggvideotools-0.4/aclocal.m4 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/aclocal.m4 2008-07-28 13:58:05.000000000 -0400 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -84,16 +87,14 @@ fi]) # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -137,9 +138,9 @@ See the pkg-config man page for more det if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -174,7 +175,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -205,8 +206,10 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -478,7 +481,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -526,13 +529,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -637,16 +640,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -918,7 +922,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/admin/depcomp oggvideotools-0.4-fedora/admin/depcomp --- oggvideotools-0.4/admin/depcomp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/admin/depcomp 2008-07-28 13:58:07.000000000 -0400 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2006-10-15.18 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -215,34 +215,39 @@ aix) # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/admin/install-sh oggvideotools-0.4-fedora/admin/install-sh --- oggvideotools-0.4/admin/install-sh 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/admin/install-sh 2008-07-28 13:58:07.000000000 -0400 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ fi # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; - -d) dir_arg=true - shift - continue;; + -C) copy_on_change=true;; + + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; + shift;; - -s) stripcmd=$stripprog - shift - continue;; + -s) stripcmd=$stripprog;; - -t) dstarg=$2 - shift - shift - continue;; + -t) dst_arg=$2 + shift;; - -T) no_target_directory=true - shift - continue;; + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ while test $# -ne 0; do *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ for src do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ do exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ do # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/configure oggvideotools-0.4-fedora/configure --- oggvideotools-0.4/configure 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/configure 2008-07-28 13:58:06.000000000 -0400 @@ -700,19 +700,14 @@ RANLIB PKG_CONFIG OGG_CFLAGS OGG_LIBS +VORBIS_CFLAGS +VORBIS_LIBS THEORA_CFLAGS THEORA_LIBS SDL_CFLAGS SDL_LIBS -HAVE_OGG_TRUE -HAVE_OGG_FALSE -HAVE_VORBIS_TRUE -HAVE_VORBIS_FALSE -HAVE_THEORA_TRUE -HAVE_THEORA_FALSE -HAVE_SDL_TRUE -HAVE_SDL_FALSE -OGGVIDEOTOOLS +WANT_OGGSCROLL_TRUE +WANT_OGGSCROLL_FALSE CXXCPP GREP EGREP @@ -733,6 +728,8 @@ CFLAGS PKG_CONFIG OGG_CFLAGS OGG_LIBS +VORBIS_CFLAGS +VORBIS_LIBS THEORA_CFLAGS THEORA_LIBS SDL_CFLAGS @@ -1330,6 +1327,9 @@ Some influential environment variables: PKG_CONFIG path to pkg-config utility OGG_CFLAGS C compiler flags for OGG, overriding pkg-config OGG_LIBS linker flags for OGG, overriding pkg-config + VORBIS_CFLAGS + C compiler flags for VORBIS, overriding pkg-config + VORBIS_LIBS linker flags for VORBIS, overriding pkg-config THEORA_CFLAGS C compiler flags for THEORA, overriding pkg-config THEORA_LIBS linker flags for THEORA, overriding pkg-config @@ -3914,8 +3914,8 @@ else fi -CFLAGS="" -CXXFLAGS="-Wall " +# GCC 4.3 needs this +CXXFLAGS="$CXXFLAGS -std=c++0x " # set C++ compiling and linkage ac_ext=cpp @@ -3925,9 +3925,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXX ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -OGGVIDEOTOOLS="oggSplit oggDump oggJoin oggCut oggCat oggLength" - -# Actually I do not need these libraries if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -4053,11 +4050,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for OGG" >&5 echo $ECHO_N "checking for OGG... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$OGG_CFLAGS"; then - pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$OGG_CFLAGS"; then + pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg\"") >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? @@ -4067,15 +4063,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$OGG_LIBS"; then - pkg_cv_OGG_LIBS="$OGG_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$OGG_LIBS"; then + pkg_cv_OGG_LIBS="$OGG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg\"") >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? @@ -4085,9 +4079,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -4100,9 +4093,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg"` + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg" 2>&1` else - OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg"` + OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$OGG_PKG_ERRORS" >&5 @@ -4123,17 +4116,86 @@ cat >>confdefs.h <<\_ACEOF _ACEOF have_ogg=yes fi -#PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false) + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for VORBIS" >&5 +echo $ECHO_N "checking for VORBIS... $ECHO_C" >&6; } + +if test -n "$VORBIS_CFLAGS"; then + pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbis\"") >&5 + ($PKG_CONFIG --exists --print-errors "vorbis") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "vorbis" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$VORBIS_LIBS"; then + pkg_cv_VORBIS_LIBS="$VORBIS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbis\"") >&5 + ($PKG_CONFIG --exists --print-errors "vorbis") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "vorbis" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vorbis" 2>&1` + else + VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "vorbis" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$VORBIS_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + have_vorbis=false +elif test $pkg_failed = untried; then + have_vorbis=false +else + VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS + VORBIS_LIBS=$pkg_cv_VORBIS_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBVORBIS 1 +_ACEOF + have_vorbis=yes +fi pkg_failed=no { echo "$as_me:$LINENO: checking for THEORA" >&5 echo $ECHO_N "checking for THEORA... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$THEORA_CFLAGS"; then - pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$THEORA_CFLAGS"; then + pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora\"") >&5 ($PKG_CONFIG --exists --print-errors "theora") 2>&5 ac_status=$? @@ -4143,15 +4205,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$THEORA_LIBS"; then - pkg_cv_THEORA_LIBS="$THEORA_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$THEORA_LIBS"; then + pkg_cv_THEORA_LIBS="$THEORA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora\"") >&5 ($PKG_CONFIG --exists --print-errors "theora") 2>&5 ac_status=$? @@ -4161,9 +4221,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -4176,9 +4235,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora"` + THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "theora" 2>&1` else - THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora"` + THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors "theora" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$THEORA_PKG_ERRORS" >&5 @@ -4204,11 +4263,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for SDL" >&5 echo $ECHO_N "checking for SDL... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$SDL_CFLAGS"; then - pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$SDL_CFLAGS"; then + pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5 ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 ac_status=$? @@ -4218,15 +4276,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$SDL_LIBS"; then - pkg_cv_SDL_LIBS="$SDL_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$SDL_LIBS"; then + pkg_cv_SDL_LIBS="$SDL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5 ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 ac_status=$? @@ -4236,9 +4292,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -4251,9 +4306,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl"` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl"` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 @@ -4275,43 +4330,22 @@ _ACEOF have_sdl=yes fi - if test x$have_ogg != xfalse; then - HAVE_OGG_TRUE= - HAVE_OGG_FALSE='#' -else - HAVE_OGG_TRUE='#' - HAVE_OGG_FALSE= -fi - if test x$have_vorbis != xfalse; then - HAVE_VORBIS_TRUE= - HAVE_VORBIS_FALSE='#' -else - HAVE_VORBIS_TRUE='#' - HAVE_VORBIS_FALSE= -fi - if test x$have_theora != xfalse; then - HAVE_THEORA_TRUE= - HAVE_THEORA_FALSE='#' -else - HAVE_THEORA_TRUE='#' - HAVE_THEORA_FALSE= -fi - if test x$have_sdl != xfalse; then - HAVE_SDL_TRUE= - HAVE_SDL_FALSE='#' + + + + + if test x$have_ogg = xyes -a x$have_vorbis = xyes -a x$have_theora = xyes -a x$have_sdl = xyes ; then + WANT_OGGSCROLL_TRUE= + WANT_OGGSCROLL_FALSE='#' else - HAVE_SDL_TRUE='#' - HAVE_SDL_FALSE= + WANT_OGGSCROLL_TRUE='#' + WANT_OGGSCROLL_FALSE= fi -# CXXFLAGS="$CXXFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -LDFLAGS="$LDFLAGS $OGG_LIBS $VORBIS_LIBS $THEORA_LIBS $SDL_LIBS" - # # add checking message for debug information # @@ -4343,12 +4377,6 @@ else CXXFLAGS="$CXXFLAGS -O2" fi -if test x$have_ogg = xyes -a x$have_ogg = xyes -a x$have_theora = xyes -then - OGGVIDEOTOOLS="$OGGVIDEOTOOLS oggScroll" -fi - - # Checks for header files. @@ -5772,31 +5800,10 @@ echo "$as_me: error: conditional \"am__f Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_OGG_TRUE}" && test -z "${HAVE_OGG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_OGG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_OGG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_VORBIS_TRUE}" && test -z "${HAVE_VORBIS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_VORBIS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_VORBIS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_THEORA_TRUE}" && test -z "${HAVE_THEORA_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_THEORA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_THEORA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_SDL_TRUE}" && test -z "${HAVE_SDL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_SDL\" was never defined. +if test -z "${WANT_OGGSCROLL_TRUE}" && test -z "${WANT_OGGSCROLL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WANT_OGGSCROLL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_SDL\" was never defined. +echo "$as_me: error: conditional \"WANT_OGGSCROLL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -6418,18 +6425,18 @@ RANLIB!$RANLIB$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim OGG_CFLAGS!$OGG_CFLAGS$ac_delim OGG_LIBS!$OGG_LIBS$ac_delim +VORBIS_CFLAGS!$VORBIS_CFLAGS$ac_delim +VORBIS_LIBS!$VORBIS_LIBS$ac_delim THEORA_CFLAGS!$THEORA_CFLAGS$ac_delim THEORA_LIBS!$THEORA_LIBS$ac_delim SDL_CFLAGS!$SDL_CFLAGS$ac_delim SDL_LIBS!$SDL_LIBS$ac_delim -HAVE_OGG_TRUE!$HAVE_OGG_TRUE$ac_delim -HAVE_OGG_FALSE!$HAVE_OGG_FALSE$ac_delim -HAVE_VORBIS_TRUE!$HAVE_VORBIS_TRUE$ac_delim -HAVE_VORBIS_FALSE!$HAVE_VORBIS_FALSE$ac_delim -HAVE_THEORA_TRUE!$HAVE_THEORA_TRUE$ac_delim -HAVE_THEORA_FALSE!$HAVE_THEORA_FALSE$ac_delim -HAVE_SDL_TRUE!$HAVE_SDL_TRUE$ac_delim -HAVE_SDL_FALSE!$HAVE_SDL_FALSE$ac_delim +WANT_OGGSCROLL_TRUE!$WANT_OGGSCROLL_TRUE$ac_delim +WANT_OGGSCROLL_FALSE!$WANT_OGGSCROLL_FALSE$ac_delim +CXXCPP!$CXXCPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LIBOBJS!$LIBOBJS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -6471,15 +6478,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -OGGVIDEOTOOLS!$OGGVIDEOTOOLS$ac_delim -CXXCPP!$CXXCPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -6880,21 +6882,22 @@ echo "$as_me: $ac_file is unchanged" >&6 fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -6931,7 +6934,7 @@ echo "$as_me: executing $ac_file command # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/configure.ac oggvideotools-0.4-fedora/configure.ac --- oggvideotools-0.4/configure.ac 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/configure.ac 2008-07-28 13:31:38.000000000 -0400 @@ -13,28 +13,25 @@ AC_PROG_CXX AC_PROG_CC AC_PROG_RANLIB -CFLAGS="" -CXXFLAGS="-Wall " +# GCC 4.3 needs this +CXXFLAGS="$CXXFLAGS -std=c++0x " # set C++ compiling and linkage AC_LANG_CPLUSPLUS -OGGVIDEOTOOLS="oggSplit oggDump oggJoin oggCut oggCat oggLength" - -# Actually I do not need these libraries PKG_CHECK_MODULES(OGG, ogg, AC_DEFINE(HAVE_LIBOGG,1,[Defined to 1 if ogg library has been found]) have_ogg=yes, have_ogg=false) -#PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false) +PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false) PKG_CHECK_MODULES(THEORA, theora, AC_DEFINE(HAVE_LIBTHEORA,1,[Defined to 1 if theora library has been found]) have_theora=yes, have_theora=false) PKG_CHECK_MODULES(SDL, sdl, AC_DEFINE(HAVE_LIBSDL,1,[Defined to 1 if the SDL library has been found]) have_sdl=yes, have_sdl=false) - -AM_CONDITIONAL(HAVE_OGG, test x$have_ogg != xfalse) -AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis != xfalse) -AM_CONDITIONAL(HAVE_THEORA, test x$have_theora != xfalse) -AM_CONDITIONAL(HAVE_SDL, test x$have_sdl != xfalse) - -# CXXFLAGS="$CXXFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -LDFLAGS="$LDFLAGS $OGG_LIBS $VORBIS_LIBS $THEORA_LIBS $SDL_LIBS" +AC_SUBST(OGG_CFLAGS) +AC_SUBST(OGG_LIBS) +AC_SUBST(VORBIS_CFLAGS) +AC_SUBST(VORBIS_LIBS) +AC_SUBST(THEORA_CFLAGS) +AC_SUBST(THEORA_LIBS) +AC_SUBST(SDL_CFLAGS) +AC_SUBST(SDL_LIBS) +AM_CONDITIONAL([WANT_OGGSCROLL], [test x$have_ogg = xyes -a x$have_vorbis = xyes -a x$have_theora = xyes -a x$have_sdl = xyes ]) # # add checking message for debug information @@ -62,12 +59,6 @@ else CXXFLAGS="$CXXFLAGS -O2" fi -if test x$have_ogg = xyes -a x$have_ogg = xyes -a x$have_theora = xyes -then - OGGVIDEOTOOLS="$OGGVIDEOTOOLS oggScroll" -fi - -AC_SUBST(OGGVIDEOTOOLS) # Checks for header files. diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/INSTALL oggvideotools-0.4-fedora/INSTALL --- oggvideotools-0.4/INSTALL 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/INSTALL 2008-07-28 13:58:07.000000000 -0400 @@ -1,38 +1,54 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== - These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -51,52 +67,55 @@ The simplest way to compile this package all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -107,7 +126,7 @@ option `--program-prefix=PREFIX' or `--p Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -122,48 +141,86 @@ you can use the `configure' options `--x Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== - `configure' recognizes the following options to control how it -operates. +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' @@ -175,8 +232,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. -`configure' also accepts some other, not widely useful, options. diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/src/makefile.am oggvideotools-0.4-fedora/src/makefile.am --- oggvideotools-0.4/src/makefile.am 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/makefile.am 2008-07-28 13:38:16.000000000 -0400 @@ -1,7 +1,4 @@ -bin_PROGRAMS = $(OGGVIDEOTOOLS) -EXTRA_PROGRAMS = oggSplit oggDump oggJoin oggCut oggCat oggLength oggScroll - -AM_CXXFLAGS = $(CFLAGS) +bin_PROGRAMS = oggSplit oggDump oggJoin oggCut oggCat oggLength SRC_CORE = mediaUnit.cpp mediaRepository.cpp fileRepository.cpp rawMediaPacket.cpp \ mediaDecoder.cpp mediaEncoder.cpp mediaConverter.cpp \ @@ -34,21 +31,15 @@ ADDHEADERS = refObject.h definition.h og streamConfig.h $(HDR_VORBIS) $(HDR_THEORA) $(HDR_SDL) oggSplit_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggSplit.cpp - oggDump_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggDump.cpp - oggJoin_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggJoin.cpp - oggCut_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggCut.cpp - oggCat_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggCat.cpp - oggLength_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggLength.cpp -if HAVE_THEORA -if HAVE_OGG -if HAVE_SDL +if WANT_OGGSCROLL +bin_PROGRAMS += oggScroll oggScroll_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) $(SRC_THEORA_DEP) $(SRC_SDL) oggScroll.cpp -endif -endif +oggScroll_CXXFLAGS = $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(THEORA_CFLAGS) $(SDL_CFLAGS) +oggScroll_LDADD = $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SDL_LIBS) endif oggvideotools-0.4-gcc43.patch: --- NEW FILE oggvideotools-0.4-gcc43.patch --- diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggCut.cpp oggvideotools-0.4-fedora/src/oggCut.cpp --- oggvideotools-0.4/src/oggCut.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggCut.cpp 2008-07-24 15:50:15.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include #include "fileRepository.h" #include "streamSerializer.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggDump.cpp oggvideotools-0.4-fedora/src/oggDump.cpp --- oggvideotools-0.4/src/oggDump.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggDump.cpp 2008-07-24 15:50:01.000000000 -0400 @@ -25,6 +25,7 @@ #include #include #include +#include #include "fileRepository.h" #include "rawMediaPacket.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggEncoder.cpp oggvideotools-0.4-fedora/src/oggEncoder.cpp --- oggvideotools-0.4/src/oggEncoder.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggEncoder.cpp 2008-07-24 15:47:44.000000000 -0400 @@ -20,6 +20,7 @@ */ #include +#include #include "oggEncoder.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggLength.cpp oggvideotools-0.4-fedora/src/oggLength.cpp --- oggvideotools-0.4/src/oggLength.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggLength.cpp 2008-07-24 15:50:26.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include #include "fileRepository.h" #include "streamSerializer.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggPacket.cpp oggvideotools-0.4-fedora/src/oggPacket.cpp --- oggvideotools-0.4/src/oggPacket.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggPacket.cpp 2008-07-24 15:42:28.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include //#include "theora/theora.h" #include "oggPacket.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggPage.cpp oggvideotools-0.4-fedora/src/oggPage.cpp --- oggvideotools-0.4/src/oggPage.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggPage.cpp 2008-07-24 15:42:12.000000000 -0400 @@ -20,6 +20,7 @@ */ #include +#include #include "oggPage.h" #include "oggHeader.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggSplit.cpp oggvideotools-0.4-fedora/src/oggSplit.cpp --- oggvideotools-0.4/src/oggSplit.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggSplit.cpp 2008-07-24 15:49:44.000000000 -0400 @@ -23,6 +23,7 @@ #include #include #include +#include #include "fileRepository.h" #include "rawMediaPacket.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggStreamDecoder.cpp oggvideotools-0.4-fedora/src/oggStreamDecoder.cpp --- oggvideotools-0.4/src/oggStreamDecoder.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggStreamDecoder.cpp 2008-07-24 15:41:55.000000000 -0400 @@ -22,6 +22,7 @@ #include #include +#include #include "definition.h" #include "oggHeader.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggStreamEncoder.cpp oggvideotools-0.4-fedora/src/oggStreamEncoder.cpp --- oggvideotools-0.4/src/oggStreamEncoder.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggStreamEncoder.cpp 2008-07-24 15:43:12.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include #include "definition.h" #include "oggStreamEncoder.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/theoraExtractor.cpp oggvideotools-0.4-fedora/src/theoraExtractor.cpp --- oggvideotools-0.4/src/theoraExtractor.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/theoraExtractor.cpp 2008-07-24 15:48:24.000000000 -0400 @@ -1,4 +1,5 @@ #include +#include #include "theoraExtractor.h" #include "definition.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/theoraPosInterpreter.cpp oggvideotools-0.4-fedora/src/theoraPosInterpreter.cpp --- oggvideotools-0.4/src/theoraPosInterpreter.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/theoraPosInterpreter.cpp 2008-07-24 15:48:05.000000000 -0400 @@ -2,6 +2,7 @@ #include "theoraStreamParameter.h" #include +#include TheoraPosInterpreter::TheoraPosInterpreter() diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/vorbisExtractor.cpp oggvideotools-0.4-fedora/src/vorbisExtractor.cpp --- oggvideotools-0.4/src/vorbisExtractor.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/vorbisExtractor.cpp 2008-07-24 15:49:00.000000000 -0400 @@ -1,4 +1,5 @@ #include +#include #include "vorbisExtractor.h" #include "vorbisStreamParameter.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/vorbisPosInterpreter.cpp oggvideotools-0.4-fedora/src/vorbisPosInterpreter.cpp --- oggvideotools-0.4/src/vorbisPosInterpreter.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/vorbisPosInterpreter.cpp 2008-07-24 15:48:47.000000000 -0400 @@ -1,6 +1,7 @@ #include "vorbisPosInterpreter.h" #include +#include #include "vorbisStreamParameter.h" --- NEW FILE oggvideotools.spec --- Name: oggvideotools Version: 0.4 Release: 1%{?dist} Summary: Toolbox for manipulating Ogg video files Group: Applications/Multimedia License: GPLv2+ URL: http://dev.streamnik.de/oggvideotools.html Source0: http://dev.streamnik.de/uploads/media/%{name}-%{version}.tar.gz Patch1: %{name}-0.4-gcc43.patch Patch2: %{name}-0.4-autoconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig BuildRequires: libogg-devel libvorbis-devel libtheora-devel SDL-devel %description A toolbox for manipulating Ogg video files, which usually consist of a video stream (Theora) and an audio stream (Vorbis). It includes a number of handy command line tools for manipulating these video files, such as for splitting the different streams. %prep %setup -q %patch1 -p1 %patch2 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README ChangeLog %{_bindir}/* %changelog * Thu Jul 24 2008 Matt Domsch - 0.4-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oggvideotools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 04:01:21 -0000 1.1 +++ .cvsignore 29 Jul 2008 04:43:32 -0000 1.2 @@ -0,0 +1 @@ +oggvideotools-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/oggvideotools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 04:01:21 -0000 1.1 +++ sources 29 Jul 2008 04:43:32 -0000 1.2 @@ -0,0 +1 @@ +42126f6618488ff4e7c8cca0af70f512 oggvideotools-0.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 04:53:52 2008 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Tue, 29 Jul 2008 04:53:52 GMT Subject: rpms/oggvideotools/F-9 oggvideotools-0.4-autoconf.patch, NONE, 1.1 oggvideotools-0.4-gcc43.patch, NONE, 1.1 oggvideotools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807290453.m6T4rqVM016454@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/oggvideotools/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16371 Modified Files: .cvsignore sources Added Files: oggvideotools-0.4-autoconf.patch oggvideotools-0.4-gcc43.patch oggvideotools.spec Log Message: import oggvideotools-0.4-autoconf.patch: --- NEW FILE oggvideotools-0.4-autoconf.patch --- diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/aclocal.m4 oggvideotools-0.4-fedora/aclocal.m4 --- oggvideotools-0.4/aclocal.m4 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/aclocal.m4 2008-07-28 13:58:05.000000000 -0400 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -84,16 +87,14 @@ fi]) # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -137,9 +138,9 @@ See the pkg-config man page for more det if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -174,7 +175,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -205,8 +206,10 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -478,7 +481,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -526,13 +529,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -637,16 +640,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -918,7 +922,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/admin/depcomp oggvideotools-0.4-fedora/admin/depcomp --- oggvideotools-0.4/admin/depcomp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/admin/depcomp 2008-07-28 13:58:07.000000000 -0400 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2006-10-15.18 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -215,34 +215,39 @@ aix) # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/admin/install-sh oggvideotools-0.4-fedora/admin/install-sh --- oggvideotools-0.4/admin/install-sh 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/admin/install-sh 2008-07-28 13:58:07.000000000 -0400 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ fi # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; - -d) dir_arg=true - shift - continue;; + -C) copy_on_change=true;; + + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; + shift;; - -s) stripcmd=$stripprog - shift - continue;; + -s) stripcmd=$stripprog;; - -t) dstarg=$2 - shift - shift - continue;; + -t) dst_arg=$2 + shift;; - -T) no_target_directory=true - shift - continue;; + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ while test $# -ne 0; do *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ for src do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ do exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ do # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/configure oggvideotools-0.4-fedora/configure --- oggvideotools-0.4/configure 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/configure 2008-07-28 13:58:06.000000000 -0400 @@ -700,19 +700,14 @@ RANLIB PKG_CONFIG OGG_CFLAGS OGG_LIBS +VORBIS_CFLAGS +VORBIS_LIBS THEORA_CFLAGS THEORA_LIBS SDL_CFLAGS SDL_LIBS -HAVE_OGG_TRUE -HAVE_OGG_FALSE -HAVE_VORBIS_TRUE -HAVE_VORBIS_FALSE -HAVE_THEORA_TRUE -HAVE_THEORA_FALSE -HAVE_SDL_TRUE -HAVE_SDL_FALSE -OGGVIDEOTOOLS +WANT_OGGSCROLL_TRUE +WANT_OGGSCROLL_FALSE CXXCPP GREP EGREP @@ -733,6 +728,8 @@ CFLAGS PKG_CONFIG OGG_CFLAGS OGG_LIBS +VORBIS_CFLAGS +VORBIS_LIBS THEORA_CFLAGS THEORA_LIBS SDL_CFLAGS @@ -1330,6 +1327,9 @@ Some influential environment variables: PKG_CONFIG path to pkg-config utility OGG_CFLAGS C compiler flags for OGG, overriding pkg-config OGG_LIBS linker flags for OGG, overriding pkg-config + VORBIS_CFLAGS + C compiler flags for VORBIS, overriding pkg-config + VORBIS_LIBS linker flags for VORBIS, overriding pkg-config THEORA_CFLAGS C compiler flags for THEORA, overriding pkg-config THEORA_LIBS linker flags for THEORA, overriding pkg-config @@ -3914,8 +3914,8 @@ else fi -CFLAGS="" -CXXFLAGS="-Wall " +# GCC 4.3 needs this +CXXFLAGS="$CXXFLAGS -std=c++0x " # set C++ compiling and linkage ac_ext=cpp @@ -3925,9 +3925,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXX ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -OGGVIDEOTOOLS="oggSplit oggDump oggJoin oggCut oggCat oggLength" - -# Actually I do not need these libraries if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -4053,11 +4050,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for OGG" >&5 echo $ECHO_N "checking for OGG... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$OGG_CFLAGS"; then - pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$OGG_CFLAGS"; then + pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg\"") >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? @@ -4067,15 +4063,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$OGG_LIBS"; then - pkg_cv_OGG_LIBS="$OGG_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$OGG_LIBS"; then + pkg_cv_OGG_LIBS="$OGG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg\"") >&5 ($PKG_CONFIG --exists --print-errors "ogg") 2>&5 ac_status=$? @@ -4085,9 +4079,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -4100,9 +4093,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg"` + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg" 2>&1` else - OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg"` + OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$OGG_PKG_ERRORS" >&5 @@ -4123,17 +4116,86 @@ cat >>confdefs.h <<\_ACEOF _ACEOF have_ogg=yes fi -#PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false) + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for VORBIS" >&5 +echo $ECHO_N "checking for VORBIS... $ECHO_C" >&6; } + +if test -n "$VORBIS_CFLAGS"; then + pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbis\"") >&5 + ($PKG_CONFIG --exists --print-errors "vorbis") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "vorbis" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$VORBIS_LIBS"; then + pkg_cv_VORBIS_LIBS="$VORBIS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbis\"") >&5 + ($PKG_CONFIG --exists --print-errors "vorbis") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "vorbis" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vorbis" 2>&1` + else + VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "vorbis" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$VORBIS_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + have_vorbis=false +elif test $pkg_failed = untried; then + have_vorbis=false +else + VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS + VORBIS_LIBS=$pkg_cv_VORBIS_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBVORBIS 1 +_ACEOF + have_vorbis=yes +fi pkg_failed=no { echo "$as_me:$LINENO: checking for THEORA" >&5 echo $ECHO_N "checking for THEORA... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$THEORA_CFLAGS"; then - pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$THEORA_CFLAGS"; then + pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora\"") >&5 ($PKG_CONFIG --exists --print-errors "theora") 2>&5 ac_status=$? @@ -4143,15 +4205,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$THEORA_LIBS"; then - pkg_cv_THEORA_LIBS="$THEORA_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$THEORA_LIBS"; then + pkg_cv_THEORA_LIBS="$THEORA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora\"") >&5 ($PKG_CONFIG --exists --print-errors "theora") 2>&5 ac_status=$? @@ -4161,9 +4221,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -4176,9 +4235,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora"` + THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "theora" 2>&1` else - THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora"` + THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors "theora" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$THEORA_PKG_ERRORS" >&5 @@ -4204,11 +4263,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for SDL" >&5 echo $ECHO_N "checking for SDL... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$SDL_CFLAGS"; then - pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$SDL_CFLAGS"; then + pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5 ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 ac_status=$? @@ -4218,15 +4276,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$SDL_LIBS"; then - pkg_cv_SDL_LIBS="$SDL_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$SDL_LIBS"; then + pkg_cv_SDL_LIBS="$SDL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5 ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 ac_status=$? @@ -4236,9 +4292,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -4251,9 +4306,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl"` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl"` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 @@ -4275,43 +4330,22 @@ _ACEOF have_sdl=yes fi - if test x$have_ogg != xfalse; then - HAVE_OGG_TRUE= - HAVE_OGG_FALSE='#' -else - HAVE_OGG_TRUE='#' - HAVE_OGG_FALSE= -fi - if test x$have_vorbis != xfalse; then - HAVE_VORBIS_TRUE= - HAVE_VORBIS_FALSE='#' -else - HAVE_VORBIS_TRUE='#' - HAVE_VORBIS_FALSE= -fi - if test x$have_theora != xfalse; then - HAVE_THEORA_TRUE= - HAVE_THEORA_FALSE='#' -else - HAVE_THEORA_TRUE='#' - HAVE_THEORA_FALSE= -fi - if test x$have_sdl != xfalse; then - HAVE_SDL_TRUE= - HAVE_SDL_FALSE='#' + + + + + if test x$have_ogg = xyes -a x$have_vorbis = xyes -a x$have_theora = xyes -a x$have_sdl = xyes ; then + WANT_OGGSCROLL_TRUE= + WANT_OGGSCROLL_FALSE='#' else - HAVE_SDL_TRUE='#' - HAVE_SDL_FALSE= + WANT_OGGSCROLL_TRUE='#' + WANT_OGGSCROLL_FALSE= fi -# CXXFLAGS="$CXXFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -LDFLAGS="$LDFLAGS $OGG_LIBS $VORBIS_LIBS $THEORA_LIBS $SDL_LIBS" - # # add checking message for debug information # @@ -4343,12 +4377,6 @@ else CXXFLAGS="$CXXFLAGS -O2" fi -if test x$have_ogg = xyes -a x$have_ogg = xyes -a x$have_theora = xyes -then - OGGVIDEOTOOLS="$OGGVIDEOTOOLS oggScroll" -fi - - # Checks for header files. @@ -5772,31 +5800,10 @@ echo "$as_me: error: conditional \"am__f Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_OGG_TRUE}" && test -z "${HAVE_OGG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_OGG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_OGG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_VORBIS_TRUE}" && test -z "${HAVE_VORBIS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_VORBIS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_VORBIS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_THEORA_TRUE}" && test -z "${HAVE_THEORA_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_THEORA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_THEORA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_SDL_TRUE}" && test -z "${HAVE_SDL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_SDL\" was never defined. +if test -z "${WANT_OGGSCROLL_TRUE}" && test -z "${WANT_OGGSCROLL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WANT_OGGSCROLL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_SDL\" was never defined. +echo "$as_me: error: conditional \"WANT_OGGSCROLL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -6418,18 +6425,18 @@ RANLIB!$RANLIB$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim OGG_CFLAGS!$OGG_CFLAGS$ac_delim OGG_LIBS!$OGG_LIBS$ac_delim +VORBIS_CFLAGS!$VORBIS_CFLAGS$ac_delim +VORBIS_LIBS!$VORBIS_LIBS$ac_delim THEORA_CFLAGS!$THEORA_CFLAGS$ac_delim THEORA_LIBS!$THEORA_LIBS$ac_delim SDL_CFLAGS!$SDL_CFLAGS$ac_delim SDL_LIBS!$SDL_LIBS$ac_delim -HAVE_OGG_TRUE!$HAVE_OGG_TRUE$ac_delim -HAVE_OGG_FALSE!$HAVE_OGG_FALSE$ac_delim -HAVE_VORBIS_TRUE!$HAVE_VORBIS_TRUE$ac_delim -HAVE_VORBIS_FALSE!$HAVE_VORBIS_FALSE$ac_delim -HAVE_THEORA_TRUE!$HAVE_THEORA_TRUE$ac_delim -HAVE_THEORA_FALSE!$HAVE_THEORA_FALSE$ac_delim -HAVE_SDL_TRUE!$HAVE_SDL_TRUE$ac_delim -HAVE_SDL_FALSE!$HAVE_SDL_FALSE$ac_delim +WANT_OGGSCROLL_TRUE!$WANT_OGGSCROLL_TRUE$ac_delim +WANT_OGGSCROLL_FALSE!$WANT_OGGSCROLL_FALSE$ac_delim +CXXCPP!$CXXCPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LIBOBJS!$LIBOBJS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -6471,15 +6478,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -OGGVIDEOTOOLS!$OGGVIDEOTOOLS$ac_delim -CXXCPP!$CXXCPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -6880,21 +6882,22 @@ echo "$as_me: $ac_file is unchanged" >&6 fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -6931,7 +6934,7 @@ echo "$as_me: executing $ac_file command # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/configure.ac oggvideotools-0.4-fedora/configure.ac --- oggvideotools-0.4/configure.ac 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/configure.ac 2008-07-28 13:31:38.000000000 -0400 @@ -13,28 +13,25 @@ AC_PROG_CXX AC_PROG_CC AC_PROG_RANLIB -CFLAGS="" -CXXFLAGS="-Wall " +# GCC 4.3 needs this +CXXFLAGS="$CXXFLAGS -std=c++0x " # set C++ compiling and linkage AC_LANG_CPLUSPLUS -OGGVIDEOTOOLS="oggSplit oggDump oggJoin oggCut oggCat oggLength" - -# Actually I do not need these libraries PKG_CHECK_MODULES(OGG, ogg, AC_DEFINE(HAVE_LIBOGG,1,[Defined to 1 if ogg library has been found]) have_ogg=yes, have_ogg=false) -#PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false) +PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false) PKG_CHECK_MODULES(THEORA, theora, AC_DEFINE(HAVE_LIBTHEORA,1,[Defined to 1 if theora library has been found]) have_theora=yes, have_theora=false) PKG_CHECK_MODULES(SDL, sdl, AC_DEFINE(HAVE_LIBSDL,1,[Defined to 1 if the SDL library has been found]) have_sdl=yes, have_sdl=false) - -AM_CONDITIONAL(HAVE_OGG, test x$have_ogg != xfalse) -AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis != xfalse) -AM_CONDITIONAL(HAVE_THEORA, test x$have_theora != xfalse) -AM_CONDITIONAL(HAVE_SDL, test x$have_sdl != xfalse) - -# CXXFLAGS="$CXXFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS" -LDFLAGS="$LDFLAGS $OGG_LIBS $VORBIS_LIBS $THEORA_LIBS $SDL_LIBS" +AC_SUBST(OGG_CFLAGS) +AC_SUBST(OGG_LIBS) +AC_SUBST(VORBIS_CFLAGS) +AC_SUBST(VORBIS_LIBS) +AC_SUBST(THEORA_CFLAGS) +AC_SUBST(THEORA_LIBS) +AC_SUBST(SDL_CFLAGS) +AC_SUBST(SDL_LIBS) +AM_CONDITIONAL([WANT_OGGSCROLL], [test x$have_ogg = xyes -a x$have_vorbis = xyes -a x$have_theora = xyes -a x$have_sdl = xyes ]) # # add checking message for debug information @@ -62,12 +59,6 @@ else CXXFLAGS="$CXXFLAGS -O2" fi -if test x$have_ogg = xyes -a x$have_ogg = xyes -a x$have_theora = xyes -then - OGGVIDEOTOOLS="$OGGVIDEOTOOLS oggScroll" -fi - -AC_SUBST(OGGVIDEOTOOLS) # Checks for header files. diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/INSTALL oggvideotools-0.4-fedora/INSTALL --- oggvideotools-0.4/INSTALL 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/INSTALL 2008-07-28 13:58:07.000000000 -0400 @@ -1,38 +1,54 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== - These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -51,52 +67,55 @@ The simplest way to compile this package all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -107,7 +126,7 @@ option `--program-prefix=PREFIX' or `--p Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -122,48 +141,86 @@ you can use the `configure' options `--x Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== - `configure' recognizes the following options to control how it -operates. +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' @@ -175,8 +232,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. -`configure' also accepts some other, not widely useful, options. diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/src/makefile.am oggvideotools-0.4-fedora/src/makefile.am --- oggvideotools-0.4/src/makefile.am 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/makefile.am 2008-07-28 13:38:16.000000000 -0400 @@ -1,7 +1,4 @@ -bin_PROGRAMS = $(OGGVIDEOTOOLS) -EXTRA_PROGRAMS = oggSplit oggDump oggJoin oggCut oggCat oggLength oggScroll - -AM_CXXFLAGS = $(CFLAGS) +bin_PROGRAMS = oggSplit oggDump oggJoin oggCut oggCat oggLength SRC_CORE = mediaUnit.cpp mediaRepository.cpp fileRepository.cpp rawMediaPacket.cpp \ mediaDecoder.cpp mediaEncoder.cpp mediaConverter.cpp \ @@ -34,21 +31,15 @@ ADDHEADERS = refObject.h definition.h og streamConfig.h $(HDR_VORBIS) $(HDR_THEORA) $(HDR_SDL) oggSplit_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggSplit.cpp - oggDump_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggDump.cpp - oggJoin_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggJoin.cpp - oggCut_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggCut.cpp - oggCat_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggCat.cpp - oggLength_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggLength.cpp -if HAVE_THEORA -if HAVE_OGG -if HAVE_SDL +if WANT_OGGSCROLL +bin_PROGRAMS += oggScroll oggScroll_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) $(SRC_THEORA_DEP) $(SRC_SDL) oggScroll.cpp -endif -endif +oggScroll_CXXFLAGS = $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(THEORA_CFLAGS) $(SDL_CFLAGS) +oggScroll_LDADD = $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SDL_LIBS) endif oggvideotools-0.4-gcc43.patch: --- NEW FILE oggvideotools-0.4-gcc43.patch --- diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggCut.cpp oggvideotools-0.4-fedora/src/oggCut.cpp --- oggvideotools-0.4/src/oggCut.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggCut.cpp 2008-07-24 15:50:15.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include #include "fileRepository.h" #include "streamSerializer.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggDump.cpp oggvideotools-0.4-fedora/src/oggDump.cpp --- oggvideotools-0.4/src/oggDump.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggDump.cpp 2008-07-24 15:50:01.000000000 -0400 @@ -25,6 +25,7 @@ #include #include #include +#include #include "fileRepository.h" #include "rawMediaPacket.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggEncoder.cpp oggvideotools-0.4-fedora/src/oggEncoder.cpp --- oggvideotools-0.4/src/oggEncoder.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggEncoder.cpp 2008-07-24 15:47:44.000000000 -0400 @@ -20,6 +20,7 @@ */ #include +#include #include "oggEncoder.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggLength.cpp oggvideotools-0.4-fedora/src/oggLength.cpp --- oggvideotools-0.4/src/oggLength.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggLength.cpp 2008-07-24 15:50:26.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include #include "fileRepository.h" #include "streamSerializer.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggPacket.cpp oggvideotools-0.4-fedora/src/oggPacket.cpp --- oggvideotools-0.4/src/oggPacket.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggPacket.cpp 2008-07-24 15:42:28.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include //#include "theora/theora.h" #include "oggPacket.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggPage.cpp oggvideotools-0.4-fedora/src/oggPage.cpp --- oggvideotools-0.4/src/oggPage.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggPage.cpp 2008-07-24 15:42:12.000000000 -0400 @@ -20,6 +20,7 @@ */ #include +#include #include "oggPage.h" #include "oggHeader.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggSplit.cpp oggvideotools-0.4-fedora/src/oggSplit.cpp --- oggvideotools-0.4/src/oggSplit.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggSplit.cpp 2008-07-24 15:49:44.000000000 -0400 @@ -23,6 +23,7 @@ #include #include #include +#include #include "fileRepository.h" #include "rawMediaPacket.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggStreamDecoder.cpp oggvideotools-0.4-fedora/src/oggStreamDecoder.cpp --- oggvideotools-0.4/src/oggStreamDecoder.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggStreamDecoder.cpp 2008-07-24 15:41:55.000000000 -0400 @@ -22,6 +22,7 @@ #include #include +#include #include "definition.h" #include "oggHeader.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggStreamEncoder.cpp oggvideotools-0.4-fedora/src/oggStreamEncoder.cpp --- oggvideotools-0.4/src/oggStreamEncoder.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/oggStreamEncoder.cpp 2008-07-24 15:43:12.000000000 -0400 @@ -21,6 +21,7 @@ #include #include +#include #include "definition.h" #include "oggStreamEncoder.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/theoraExtractor.cpp oggvideotools-0.4-fedora/src/theoraExtractor.cpp --- oggvideotools-0.4/src/theoraExtractor.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/theoraExtractor.cpp 2008-07-24 15:48:24.000000000 -0400 @@ -1,4 +1,5 @@ #include +#include #include "theoraExtractor.h" #include "definition.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/theoraPosInterpreter.cpp oggvideotools-0.4-fedora/src/theoraPosInterpreter.cpp --- oggvideotools-0.4/src/theoraPosInterpreter.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/theoraPosInterpreter.cpp 2008-07-24 15:48:05.000000000 -0400 @@ -2,6 +2,7 @@ #include "theoraStreamParameter.h" #include +#include TheoraPosInterpreter::TheoraPosInterpreter() diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/vorbisExtractor.cpp oggvideotools-0.4-fedora/src/vorbisExtractor.cpp --- oggvideotools-0.4/src/vorbisExtractor.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/vorbisExtractor.cpp 2008-07-24 15:49:00.000000000 -0400 @@ -1,4 +1,5 @@ #include +#include #include "vorbisExtractor.h" #include "vorbisStreamParameter.h" diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/vorbisPosInterpreter.cpp oggvideotools-0.4-fedora/src/vorbisPosInterpreter.cpp --- oggvideotools-0.4/src/vorbisPosInterpreter.cpp 2008-05-27 15:30:13.000000000 -0400 +++ oggvideotools-0.4-fedora/src/vorbisPosInterpreter.cpp 2008-07-24 15:48:47.000000000 -0400 @@ -1,6 +1,7 @@ #include "vorbisPosInterpreter.h" #include +#include #include "vorbisStreamParameter.h" --- NEW FILE oggvideotools.spec --- Name: oggvideotools Version: 0.4 Release: 1%{?dist} Summary: Toolbox for manipulating Ogg video files Group: Applications/Multimedia License: GPLv2+ URL: http://dev.streamnik.de/oggvideotools.html Source0: http://dev.streamnik.de/uploads/media/%{name}-%{version}.tar.gz Patch1: %{name}-0.4-gcc43.patch Patch2: %{name}-0.4-autoconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig BuildRequires: libogg-devel libvorbis-devel libtheora-devel SDL-devel %description A toolbox for manipulating Ogg video files, which usually consist of a video stream (Theora) and an audio stream (Vorbis). It includes a number of handy command line tools for manipulating these video files, such as for splitting the different streams. %prep %setup -q %patch1 -p1 %patch2 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README ChangeLog %{_bindir}/* %changelog * Thu Jul 24 2008 Matt Domsch - 0.4-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oggvideotools/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 04:01:21 -0000 1.1 +++ .cvsignore 29 Jul 2008 04:53:22 -0000 1.2 @@ -0,0 +1 @@ +oggvideotools-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/oggvideotools/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 04:01:21 -0000 1.1 +++ sources 29 Jul 2008 04:53:22 -0000 1.2 @@ -0,0 +1 @@ +42126f6618488ff4e7c8cca0af70f512 oggvideotools-0.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 05:10:03 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 29 Jul 2008 05:10:03 GMT Subject: rpms/gnome-session/devel gnome-session.spec, 1.176, 1.177 sources, 1.61, 1.62 Message-ID: <200807290510.m6T5A3CT025070@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24981 Modified Files: gnome-session.spec sources Log Message: - New snapshot from DBus branch Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- gnome-session.spec 24 Jul 2008 23:37:18 -0000 1.176 +++ gnome-session.spec 29 Jul 2008 05:09:32 -0000 1.177 @@ -12,7 +12,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.23.5 -Release: 0.2008.07.21.4%{?dist} +Release: 0.2008.07.28.1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -36,16 +36,11 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=350848 # The gconf bits weren't accepted upstream, so we'll # need to figure something out here -Patch13: gnome-session-2.17.5-window-manager.patch +Patch13: gnome-session-2.23.5-window-manager.patch # FIXME does this still apply ? #Patch20: gnome-session-2.19.4-atspi-timeout.patch -# Work around the assumption that the nautilus desktop file is nautilus.desktop -Patch34: gnome-session-nautilus.patch - -Patch57: gerror-crash.patch - BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -70,6 +65,7 @@ BuildRequires: libX11-devel libXt-devel BuildRequires: libXrandr-devel BuildRequires: PolicyKit-gnome-devel +BuildRequires: xmlto Requires(pre): GConf2 >= %{gconf2_version} Requires(post): GConf2 >= %{gconf2_version} @@ -101,7 +97,7 @@ autoheader autoconf -%configure +%configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} make %{?_smp_mflags} %install @@ -128,6 +124,8 @@ ## remove splash screen rm -r $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash +cp AUTHORS COPYING NEWS README $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} + %find_lang %{po_package} %clean @@ -155,7 +153,14 @@ %files -f %{po_package}.lang %defattr(-,root,root) -%doc AUTHORS COPYING NEWS README +%doc %dir %{_datadir}/doc/%{name}-%{version} +%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS +%doc %{_datadir}/doc/%{name}-%{version}/COPYING +%doc %{_datadir}/doc/%{name}-%{version}/NEWS +%doc %{_datadir}/doc/%{name}-%{version}/README +%doc %dir %{_datadir}/doc/%{name}-%{version}/dbus +%doc %{_datadir}/doc/%{name}-%{version}/dbus/* +%doc %{_mandir}/man*/* %{_datadir}/gnome %{_datadir}/applications/gnome-session-properties.desktop %{_datadir}/xsessions/* @@ -166,13 +171,15 @@ %{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/icons/hicolor/*/apps/session-properties.png %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg -%doc %{_mandir}/man*/* %dir %{_libdir}/gnome-session %dir %{_libdir}/gnome-session/helpers %{_libdir}/gnome-session/helpers/* %changelog +* Mon Jul 28 2008 Jon McCann - 2.23.5.0.2008.07.28.1 +- New snapshot from DBus branch + * Thu Jul 24 2008 Matthias Clasen - 2.23.5.0.2008.07.21.4 - Fix a crash Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 21 Jul 2008 20:59:54 -0000 1.61 +++ sources 29 Jul 2008 05:09:32 -0000 1.62 @@ -1 +1 @@ -f21cae1e3d5142d86b45fb16f167721f gnome-session-2.23.5.tar.bz2 +a1eb0e04dd000dcd9503e1e22c79eb48 gnome-session-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 05:31:05 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 29 Jul 2008 05:31:05 GMT Subject: rpms/gnome-session/devel gnome-session-2.23.5-window-manager.patch, NONE, 1.1 Message-ID: <200807290531.m6T5V5Ai027537@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27502 Added Files: gnome-session-2.23.5-window-manager.patch Log Message: Add missing patch gnome-session-2.23.5-window-manager.patch: --- NEW FILE gnome-session-2.23.5-window-manager.patch --- --- gnome-session-2.23.5/data/gnome-session.schemas.in.window-manager 2008-07-27 11:33:01.000000000 -0400 +++ gnome-session-2.23.5/data/gnome-session.schemas.in 2008-07-28 16:06:46.000000000 -0400 @@ -2,6 +2,17 @@ + /schemas/apps/gnome-session/rh/window_manager + /apps/gnome-session/rh/window_manager + gnome + string + metacity + + Window Manager to start + The Window manager that gnome-session will start. Valid values are "metacity" and "compiz". + + + /schemas/apps/gnome-session/options/show_splash_screen /apps/gnome-session/options/show_splash_screen gnome --- gnome-session-2.23.5/data/gnome-wm.window-manager 2008-06-13 16:00:53.000000000 -0400 +++ gnome-session-2.23.5/data/gnome-wm 2008-07-28 16:03:10.000000000 -0400 @@ -3,7 +3,9 @@ # The user can specify his prefered WM by setting the WINDOW_MANAGER # environment variable. # -# If this is not set, we search a list of known windowmanagers and use +# If this is not set, we check the /apps/gnome-session/rh/window_manager key +# and go off that. finally, if all else fails we search a list of known +# windowmanagers and use # the first one that is found in the users's PATH # @@ -38,6 +40,9 @@ done # WINDOW_MANAGER overrides all +if [ -z "$WINDOW_MANAGER" ] ; then + WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager) +fi if [ -z "$WINDOW_MANAGER" ] ; then # Create a list of window manager we can handle, trying to only use the From fedora-extras-commits at redhat.com Tue Jul 29 07:28:42 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Tue, 29 Jul 2008 07:28:42 GMT Subject: rpms/pem/devel .cvsignore,1.3,1.4 pem.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200807290728.m6T7SgUK013111@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/pem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13084 Modified Files: .cvsignore pem.spec sources Log Message: ---------------------------------------------------------------------- Committing in . P J P Tue Jul 29 12:57:27 IST 2008 Modified Files: cvsignore pem.spec sources: Changed the ..share/info/dir menu entry of pem, in pem.texi. ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pem/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jul 2008 08:38:37 -0000 1.3 +++ .cvsignore 29 Jul 2008 07:28:12 -0000 1.4 @@ -1 +1 @@ -pem-0.7.2.tar.gz +pem-0.7.3.tar.gz Index: pem.spec =================================================================== RCS file: /cvs/pkgs/rpms/pem/devel/pem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pem.spec 21 Jul 2008 11:09:06 -0000 1.4 +++ pem.spec 29 Jul 2008 07:28:12 -0000 1.5 @@ -1,6 +1,6 @@ Name: pem -Version: 0.7.2 -Release: 3%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: Personal Expenses Manager Group: Applications/Productivity @@ -15,7 +15,6 @@ Requires(preun): info - %description Pem, is a personal expenses manager. Pem lets keep track of personal income and expense in an extremely elegant manner. @@ -34,6 +33,17 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_infodir}/dir + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : + + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi + + %clean rm -rf $RPM_BUILD_ROOT @@ -45,16 +55,12 @@ %{_mandir}/man1/pem.* %{_infodir}/pem.* -%post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi %changelog +* Tue Jul 29 2008 P J P - 0.7.3-1 +- Changed the ..share/info/dir menu entry of pem, in pem.texi. + * Mon Jul 21 2008 Kushal Das - 0.7.2-3 - Bumping the release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pem/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2008 08:38:37 -0000 1.3 +++ sources 29 Jul 2008 07:28:12 -0000 1.4 @@ -1 +1 @@ -d575366fd6a2118262abd1e9b400b519 pem-0.7.2.tar.gz +2d15406701d5115c06b265f681864570 pem-0.7.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 07:47:38 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Tue, 29 Jul 2008 07:47:38 GMT Subject: rpms/glibc/devel glibc-fedora.patch,1.279,1.280 Message-ID: <200807290747.m6T7lcrN013622@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13602 Modified Files: glibc-fedora.patch Log Message: 2.8.90-10 glibc-fedora.patch: Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- glibc-fedora.patch 28 Jul 2008 23:49:51 -0000 1.279 +++ glibc-fedora.patch 29 Jul 2008 07:47:07 -0000 1.280 @@ -2061,3 +2061,57 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) +--- libc/ChangeLog 28 Jul 2008 22:55:10 -0000 1.11297 ++++ libc/ChangeLog 29 Jul 2008 01:18:31 -0000 1.11300 +@@ -1,5 +1,13 @@ ++2008-07-28 Roland McGrath ++ ++ * elf/dl-sysdep.c (_dl_show_auxv): Add AT_EXECFN to the table. ++ + 2008-07-28 Ulrich Drepper + ++ * io/ftw.c (add_object): Remove inline to avoid warning. ++ ++ * sysdeps/unix/sysv/linux/paccept.c: Fix compile problem. ++ + * resolv/res_send.c (__libc_res_nsend): Take additional parameter. + Use it instead of locally defined resplen2 variable. + (res_nsend): Adjust for __libc_res_nsend interface change. +--- libc/elf/dl-sysdep.c 24 Jul 2008 18:24:01 -0000 1.6 ++++ libc/elf/dl-sysdep.c 29 Jul 2008 01:18:26 -0000 1.7 +@@ -273,6 +273,7 @@ _dl_show_auxv (void) + } auxvars[] = + { + [AT_EXECFD - 2] = { "AT_EXECFD: ", dec }, ++ [AT_EXECFN - 2] = { "AT_EXECFN: ", str }, + [AT_PHDR - 2] = { "AT_PHDR: 0x", hex }, + [AT_PHENT - 2] = { "AT_PHENT: ", dec }, + [AT_PHNUM - 2] = { "AT_PHNUM: ", dec }, +--- libc/io/ftw.c 21 Feb 2007 09:36:15 -0000 1.55 ++++ libc/io/ftw.c 29 Jul 2008 00:26:46 -0000 1.56 +@@ -243,7 +243,7 @@ object_compare (const void *p1, const vo + } + + +-static inline int ++static int + add_object (struct ftw_data *data, struct STAT *st) + { + struct known_object *newp = malloc (sizeof (struct known_object)); +--- libc/sysdeps/unix/sysv/linux/paccept.c 25 Jul 2008 04:40:10 -0000 1.1 ++++ libc/sysdeps/unix/sysv/linux/paccept.c 29 Jul 2008 00:25:05 -0000 1.2 +@@ -30,12 +30,12 @@ paccept (int fd, __SOCKADDR_ARG addr, so + const __sigset_t *ss, int flags) + { + if (SINGLE_THREAD_P) +- return INLINE_SYSCALL (paccept, 6, fd, addr, addr_len, ss, ++ return INLINE_SYSCALL (paccept, 6, fd, addr.__sockaddr__, addr_len, ss, + _NSIG / 8, flags); + + int oldtype = LIBC_CANCEL_ASYNC (); + +- int result = INLINE_SYSCALL (paccept, 6, fd, addr, addr_len, ss, ++ int result = INLINE_SYSCALL (paccept, 6, fd, addr.__sockaddr__, addr_len, ss, + _NSIG / 8, flags); + + LIBC_CANCEL_RESET (oldtype); From fedora-extras-commits at redhat.com Tue Jul 29 07:52:58 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Tue, 29 Jul 2008 07:52:58 GMT Subject: rpms/pem/EL-5 .cvsignore,1.1,1.2 pem.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807290752.m6T7qwHa013714@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/pem/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13678 Modified Files: .cvsignore pem.spec sources Log Message: ---------------------------------------------------------------------- Committing in . P J P Tue Jul 29 13:22:24 IST 2008 Modified Files: .cvsignore pem.spec sources: Changed the ..share/info/dir menu entry of pem, in pem.texi. ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pem/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Apr 2008 17:02:39 -0000 1.1 +++ .cvsignore 29 Jul 2008 07:52:28 -0000 1.2 @@ -0,0 +1 @@ +pem-0.7.3.tar.gz Index: pem.spec =================================================================== RCS file: /cvs/pkgs/rpms/pem/EL-5/pem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pem.spec 16 Jun 2008 17:40:49 -0000 1.1 +++ pem.spec 29 Jul 2008 07:52:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: pem -Version: 0.7.1 -Release: 4%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: Personal Expenses Manager Group: Applications/Productivity @@ -15,7 +15,6 @@ Requires(preun): info - %description Pem, is a personal expenses manager. Pem lets keep track of personal income and expense in an extremely elegant manner. @@ -32,6 +31,17 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir + + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : + + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi %clean @@ -45,16 +55,21 @@ %{_mandir}/man1/pem.* %{_infodir}/pem.* -%post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi %changelog +* Tue Jul 29 2008 P J P - 0.7.3-1 +- Changed the ..share/info/dir menu entry of pem, in pem.texi. + +* Mon Jul 21 2008 Kushal Das - 0.7.2-3 +- Bumping the release + +* Mon Jul 21 2008 Kushal Das - 0.7.2-2 +- Fixing Info dir problem + +* Wed Jul 2 2008 Kushal Das - 0.7.2-1 +- New release of pem + * Sun May 4 2008 Kushal Das - 0.7.1-4 - Fixed the description Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pem/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Jun 2008 17:40:49 -0000 1.2 +++ sources 29 Jul 2008 07:52:28 -0000 1.3 @@ -1 +1 @@ -5ea6f0167641c50ab6cb0482e8aeca96 pem-0.7.1.tar.gz +2d15406701d5115c06b265f681864570 pem-0.7.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 07:37:50 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Tue, 29 Jul 2008 07:37:50 GMT Subject: rpms/pem/F-8 .cvsignore,1.1,1.2 pem.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200807290737.m6T7bopX013355@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/pem/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315 Modified Files: .cvsignore pem.spec sources Log Message: ---------------------------------------------------------------------- Committing in . P J P Tue Jul 29 13:06:53 IST 2008 Modified Files: .cvsignore pem.spec sources: Changed the ..share/info/dir menu entry of pem, in pem.texi. ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Apr 2008 17:02:39 -0000 1.1 +++ .cvsignore 29 Jul 2008 07:37:19 -0000 1.2 @@ -0,0 +1 @@ +pem-0.7.3.tar.gz Index: pem.spec =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-8/pem.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pem.spec 23 Jul 2008 06:33:09 -0000 1.2 +++ pem.spec 29 Jul 2008 07:37:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: pem -Version: 0.7.2 -Release: 3%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: Personal Expenses Manager Group: Applications/Productivity @@ -15,7 +15,6 @@ Requires(preun): info - %description Pem, is a personal expenses manager. Pem lets keep track of personal income and expense in an extremely elegant manner. @@ -34,6 +33,17 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_infodir}/dir + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : + + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi + + %clean rm -rf $RPM_BUILD_ROOT @@ -45,16 +55,12 @@ %{_mandir}/man1/pem.* %{_infodir}/pem.* -%post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi %changelog +* Tue Jul 29 2008 P J P - 0.7.3-1 +- Changed the ..share/info/dir menu entry of pem, in pem.texi. + * Mon Jul 21 2008 Kushal Das - 0.7.2-3 - Bumping the release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Jul 2008 06:33:09 -0000 1.3 +++ sources 29 Jul 2008 07:37:19 -0000 1.4 @@ -1 +1 @@ -d575366fd6a2118262abd1e9b400b519 pem-0.7.2.tar.gz +2d15406701d5115c06b265f681864570 pem-0.7.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 07:45:41 2008 From: fedora-extras-commits at redhat.com (Prasad J Pandit (pjp)) Date: Tue, 29 Jul 2008 07:45:41 GMT Subject: rpms/pem/F-9 .cvsignore,1.2,1.3 pem.spec,1.3,1.4 sources,1.3,1.4 Message-ID: <200807290745.m6T7jfVL013540@cvs-int.fedora.redhat.com> Author: pjp Update of /cvs/pkgs/rpms/pem/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13501 Modified Files: .cvsignore pem.spec sources Log Message: ---------------------------------------------------------------------- Committing in . P J P Tue Jul 29 13:14:38 IST 2008 Modified Files: .cvsignore pem.spec sources: Changed the ..share/info/dir menu entry of pem, in pem.texi. ---------------------------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jul 2008 10:59:10 -0000 1.2 +++ .cvsignore 29 Jul 2008 07:45:11 -0000 1.3 @@ -1 +1 @@ -pem-0.7.2.tar.gz +pem-0.7.3.tar.gz Index: pem.spec =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-9/pem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pem.spec 22 Jul 2008 06:32:31 -0000 1.3 +++ pem.spec 29 Jul 2008 07:45:11 -0000 1.4 @@ -1,6 +1,6 @@ Name: pem -Version: 0.7.2 -Release: 3%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: Personal Expenses Manager Group: Applications/Productivity @@ -15,7 +15,6 @@ Requires(preun): info - %description Pem, is a personal expenses manager. Pem lets keep track of personal income and expense in an extremely elegant manner. @@ -34,6 +33,17 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_infodir}/dir + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : + + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi + + %clean rm -rf $RPM_BUILD_ROOT @@ -45,16 +55,12 @@ %{_mandir}/man1/pem.* %{_infodir}/pem.* -%post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi %changelog +* Tue Jul 29 2008 P J P - 0.7.3-1 +- Changed the ..share/info/dir menu entry of pem, in pem.texi. + * Mon Jul 21 2008 Kushal Das - 0.7.2-3 - Bumping the release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pem/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Jul 2008 10:16:24 -0000 1.3 +++ sources 29 Jul 2008 07:45:11 -0000 1.4 @@ -1 +1 @@ -d575366fd6a2118262abd1e9b400b519 pem-0.7.2.tar.gz +2d15406701d5115c06b265f681864570 pem-0.7.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 07:35:56 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Tue, 29 Jul 2008 07:35:56 GMT Subject: rpms/tk/devel tk-8.5.3-crash.patch,NONE,1.1 tk.spec,1.54,1.55 Message-ID: <200807290735.m6T7ZucI013257@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13222 Modified Files: tk.spec Added Files: tk-8.5.3-crash.patch Log Message: * Tue Jul 29 2008 Marcela Maslanova - 1:8.5.3-2 - fix 456922 - crash gitk resolved tk-8.5.3-crash.patch: --- NEW FILE tk-8.5.3-crash.patch --- diff -up tk8.5.3/library/tk.tcl.olde tk8.5.3/library/tk.tcl --- tk8.5.3/library/tk.tcl.olde 2008-06-30 05:37:37.000000000 +0200 +++ tk8.5.3/library/tk.tcl 2008-07-29 09:19:52.000000000 +0200 @@ -510,7 +510,7 @@ proc ::tk::AmpWidget {class path args} { } } set result [$class $path {*}$options] - if {[string match "*button" $class]} { + if {$class eq "button"} { bind $path <> [list $path invoke] } return $result @@ -539,8 +539,8 @@ proc ::tk::AmpMenuArgs {widget add type # proc ::tk::FindAltKeyTarget {path char} { switch -- [winfo class $path] { - Button - Label - - TButton - TLabel - TCheckbutton { + Button - + Label { if {[string equal -nocase $char \ [string index [$path cget -text] [$path cget -underline]]]} { return $path Index: tk.spec =================================================================== RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- tk.spec 25 Jul 2008 07:45:06 -0000 1.54 +++ tk.spec 29 Jul 2008 07:35:26 -0000 1.55 @@ -4,7 +4,7 @@ Summary: The graphical toolkit for the Tcl scripting language Name: tk Version: %{vers} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: TCL Group: Development/Languages @@ -23,6 +23,7 @@ Provides: tile = 0.8.2 Patch1: tk8.5-make.patch Patch2: tk8.5-conf.patch +Patch3: tk-8.5.3-crash.patch %description When paired with the Tcl scripting language, Tk provides a fast and powerful @@ -46,6 +47,7 @@ %patch1 -p1 -b .make %patch2 -p1 -b .conf +%patch3 -p1 -b .crash %build cd unix @@ -113,6 +115,9 @@ %{_mandir}/man3/* %changelog +* Tue Jul 29 2008 Marcela Maslanova - 1:8.5.3-2 +- fix 456922 - crash gitk resolved + * Fri Jul 25 2008 Marcela Maslanova - 1:8.5.3-1 - update to 8.5.3 From fedora-extras-commits at redhat.com Tue Jul 29 08:19:58 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 29 Jul 2008 08:19:58 GMT Subject: rpms/hunspell/devel .cvsignore, 1.20, 1.21 hunspell.spec, 1.47, 1.48 sources, 1.20, 1.21 Message-ID: <200807290819.m6T8Jwmb020939@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20901 Modified Files: .cvsignore hunspell.spec sources Log Message: next version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 27 Jul 2008 11:00:51 -0000 1.20 +++ .cvsignore 29 Jul 2008 08:19:28 -0000 1.21 @@ -1,2 +1,2 @@ ispellaff2myspell -hunspell-1.2.5.tar.gz +hunspell-1.2.6.tar.gz Index: hunspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- hunspell.spec 27 Jul 2008 11:00:51 -0000 1.47 +++ hunspell.spec 29 Jul 2008 08:19:28 -0000 1.48 @@ -1,6 +1,6 @@ Name: hunspell Summary: Hunspell is a spell checker and morphological analyzer library -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} Source0: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell @@ -94,6 +94,9 @@ %{_mandir}/man3/hunspell.3.gz %changelog +* Tue Jul 29 2008 Caolan McNamara - 1.2.6-1 +- latest version + * Sun Jul 27 2008 Caolan McNamara - 1.2.5-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 27 Jul 2008 11:00:51 -0000 1.20 +++ sources 29 Jul 2008 08:19:28 -0000 1.21 @@ -1,2 +1,2 @@ 1c5ea5ecd2481ddc116d65ea294acae3 ispellaff2myspell -4912991fc7e53da0a945de7e55495714 hunspell-1.2.5.tar.gz +57ee841a0c4f97ad64ef12136413398b hunspell-1.2.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 08:49:27 2008 From: fedora-extras-commits at redhat.com (Jaroslav Kysela (perex)) Date: Tue, 29 Jul 2008 08:49:27 GMT Subject: rpms/alsa-oss/devel .cvsignore, NONE, 1.1 alsa-oss.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200807290849.m6T8nRZ7021600@cvs-int.fedora.redhat.com> Author: perex Update of /cvs/pkgs/rpms/alsa-oss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21574 Modified Files: alsa-oss.spec sources Added Files: .cvsignore Log Message: alsa-oss: updated to upstream - 1.0.17 --- NEW FILE .cvsignore --- alsa-oss-1.0.17.tar.bz2 Index: alsa-oss.spec =================================================================== RCS file: /cvs/pkgs/rpms/alsa-oss/devel/alsa-oss.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- alsa-oss.spec 13 Feb 2008 14:57:02 -0000 1.6 +++ alsa-oss.spec 29 Jul 2008 08:48:57 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss -Version: 1.0.15 -Release: 0.1%{?dist} +Version: 1.0.17 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ %changelog +* Tue Jul 29 2008 Jaroslav Kysela 1.0.17-1 +- New upstream version + * Mon Oct 22 2007 Patrick "Jima" Laughton 1.0.15-0.1 - New upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alsa-oss/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2008 14:57:02 -0000 1.3 +++ sources 29 Jul 2008 08:48:57 -0000 1.4 @@ -1 +1 @@ -49fb5fbae8bf955b248e46ff9c9a2aa1 alsa-oss-1.0.15.tar.bz2 +1b1850c2fc91476a73d50f537cbd402f alsa-oss-1.0.17.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 09:15:18 2008 From: fedora-extras-commits at redhat.com (Pravin Satpute (pravins)) Date: Tue, 29 Jul 2008 09:15:18 GMT Subject: rpms/smc-fonts/devel .cvsignore, 1.2, 1.3 smc-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807290915.m6T9FI9T028698@cvs-int.fedora.redhat.com> Author: pravins Update of /cvs/pkgs/rpms/smc-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28663 Modified Files: .cvsignore smc-fonts.spec sources Log Message: * Tue Jul 29 2008 Pravin Satpute 04.1-1 - new upstream release - fontconfig rule for size adjustment of Meera is added - two new fonts kalyani and anjalioldlipi - bugfix 448078 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smc-fonts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Apr 2008 05:36:29 -0000 1.2 +++ .cvsignore 29 Jul 2008 09:14:48 -0000 1.3 @@ -1 +1,2 @@ malayalam-fonts-04.zip +malayalam-fonts-04.1.zip Index: smc-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- smc-fonts.spec 16 Apr 2008 05:36:29 -0000 1.1 +++ smc-fonts.spec 29 Jul 2008 09:14:48 -0000 1.2 @@ -1,10 +1,10 @@ %define fontname smc %define fontdir %{_datadir}/fonts/%{fontname} - +%define fontconfdir %{_sysconfdir}/fonts/conf.d Name: %{fontname}-fonts -Version: 04 -Release: 6%{?dist} +Version: 04.1 +Release: 1%{?dist} Summary: Open Type Fonts for Malayalam script Group: User Interface/X License: GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and GPLv2 @@ -59,17 +59,35 @@ The smc-fonts-suruma package contains fonts for the display of traditional Malayalam Scripts. +%package kalyani +Summary: Open Type Fonts for Malayalam script +Group: User Interface/X +License: GPLv3+ with exceptions +%description kalyani +The smc-fonts-suruma package contains fonts for the display of +new Malayalam Scripts. + +%package anjalioldlipi +Summary: Open Type Fonts for Malayalam script +Group: User Interface/X +License: GPLv3+ with exceptions +%description anjalioldlipi +The smc-fonts-suruma package contains fonts for the display of +traditional Malayalam Scripts. + %prep -%setup -q -n malayalam-fonts-%{version} +%setup -q -n malayalam-fonts-04 %build echo "Nothing to do in Build." %install -rm -fr %{buildroot} +rm -rf %{buildroot} install -m 0755 -d %{buildroot}%{fontdir} install -m 0644 -p *.ttf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p $RPM_BUILD_DIR/malayalam-fonts-04/malayalam-fonts.conf %{buildroot}%{fontconfdir}/90-%{fontname}.conf %clean rm -fr %{buildroot} @@ -99,6 +117,16 @@ %{_bindir}/fc-cache -f %{fontdir} || : fi +%post kalyani +if [ -x %{_bindir}/fc-cache ]; then +%{_bindir}/fc-cache -f %{fontdir} || : +fi + +%post anjalioldlipi +if [ -x %{_bindir}/fc-cache ]; then +%{_bindir}/fc-cache -f %{fontdir} || : +fi + %postun dyuthi if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then @@ -134,6 +162,20 @@ fi fi +%postun kalyani +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then +%{_bindir}/fc-cache -f %{fontdir} || : + fi +fi + +%postun anjalioldlipi +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then +%{_bindir}/fc-cache -f %{fontdir} || : + fi +fi + #%{fontdir} is shared by following packages since they all are for malayalam script only %files dyuthi %defattr(-,root,root,-) @@ -144,6 +186,7 @@ %files meera %defattr(-,root,root,-) %doc *.txt +%config(noreplace) %{fontconfdir}/90-%{fontname}.conf %dir %{fontdir} %{fontdir}/Meera*.ttf @@ -165,8 +208,25 @@ %dir %{fontdir} %{fontdir}/suruma*.ttf +%files kalyani +%defattr(-,root,root,-) +%doc *.txt +%dir %{fontdir} +%{fontdir}/Kalyani*.ttf + +%files anjalioldlipi +%defattr(-,root,root,-) +%doc *.txt +%dir %{fontdir} +%{fontdir}/AnjaliOldLipi.ttf %changelog +* Tue Jul 29 2008 Pravin Satpute 04.1-1 +- new upstream release +- fontconfig rule for size adjustment of Meera is added +- two new fonts kalyani and anjalioldlipi +- bugfix 448078 + * Tue Apr 15 2008 Pravin Satpute 04-6 - corrected meera fonts description it is for traditional script Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smc-fonts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Apr 2008 05:36:29 -0000 1.2 +++ sources 29 Jul 2008 09:14:48 -0000 1.3 @@ -1 +1 @@ -a88a77e6b22ac077c729234c15671908 malayalam-fonts-04.zip +492cb9ec6bf69d775e987c1ca06b4003 malayalam-fonts-04.1.zip From fedora-extras-commits at redhat.com Tue Jul 29 09:16:44 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:16:44 GMT Subject: rpms/python-libgmail/devel .cvsignore, 1.3, 1.4 python-libgmail.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807290916.m6T9GiSG028786@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28761 Modified Files: .cvsignore python-libgmail.spec sources Log Message: Upstream update - 0.1.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jul 2008 08:43:01 -0000 1.3 +++ .cvsignore 29 Jul 2008 09:16:13 -0000 1.4 @@ -1 +1 @@ -libgmail-0.1.9.tar.gz +libgmail-0.1.10.tar.gz Index: python-libgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/devel/python-libgmail.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-libgmail.spec 18 Jul 2008 09:22:03 -0000 1.3 +++ python-libgmail.spec 29 Jul 2008 09:16:13 -0000 1.4 @@ -2,7 +2,7 @@ %define realname libgmail Name: python-%{realname} -Version: 0.1.9 +Version: 0.1.10 Release: 1%{?dist} Summary: Library to provide access to Gmail via Python @@ -10,8 +10,6 @@ License: GPLv2 URL: http://%{realname}.sourceforge.net Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz -#Fix ClientCookie old include -Patch0: %{name}-ccfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,7 +21,6 @@ %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 -b .ccfix %build %{__python} setup.py build @@ -48,7 +45,11 @@ %changelog -* Fri Jul 18 2008 Nikolay Vladimirov -0.1.9-1 +* Tue Jul 29 2008 Nikolay Vladimirov - 0.1.10-1 +- new upstream 0.1.10 +- drop ClientCookie patch(upstream) + +* Fri Jul 18 2008 Nikolay Vladimirov - 0.1.9-1 - new upstream 0.1.9 * Tue Dec 11 2007 Michael Stahnke - 0.1.8-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jul 2008 08:43:01 -0000 1.3 +++ sources 29 Jul 2008 09:16:13 -0000 1.4 @@ -1 +1 @@ -4a19c030920a030eb5217cfe8bb85a60 libgmail-0.1.9.tar.gz +2835f66b8ef5a83e8a52dc80e878f492 libgmail-0.1.10.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 09:25:43 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:25:43 GMT Subject: rpms/libgsasl/devel .cvsignore, 1.4, 1.5 libgsasl.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200807290925.m6T9Ph10029031@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/libgsasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28997 Modified Files: .cvsignore libgsasl.spec sources Log Message: Update to 0.2.27 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Jun 2008 06:00:34 -0000 1.4 +++ .cvsignore 29 Jul 2008 09:25:13 -0000 1.5 @@ -1 +1 @@ -libgsasl-0.2.26.tar.gz +libgsasl-0.2.27.tar.gz Index: libgsasl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/devel/libgsasl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgsasl.spec 3 Jun 2008 06:00:34 -0000 1.6 +++ libgsasl.spec 29 Jul 2008 09:25:13 -0000 1.7 @@ -1,5 +1,5 @@ Name: libgsasl -Version: 0.2.26 +Version: 0.2.27 Release: 1%{?dist} Summary: GNU SASL library @@ -71,8 +71,11 @@ %changelog -* Tue Jun 3 2008 Nikolay Vladimirov 0.2.26-1 -- new upstream +* Tue Jul 29 2008 Nikolay Vladimirov - 0.2.27-1 +- new upstream release 0.2.27 + +* Tue Jun 3 2008 Nikolay Vladimirov - 0.2.26-1 +- new upstream release 0.2.26 * Sat Mar 29 2008 Nikolay Vladimirov - 0.2.25-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Jun 2008 06:00:34 -0000 1.4 +++ sources 29 Jul 2008 09:25:13 -0000 1.5 @@ -1 +1 @@ -e9f2ba40b2843694dcd37de4f9602f10 libgsasl-0.2.26.tar.gz +ea129609a1dea0fd80704a51c6769150 libgsasl-0.2.27.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 09:26:42 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:26:42 GMT Subject: rpms/python-libgmail/F-9 .cvsignore, 1.3, 1.4 python-libgmail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807290926.m6T9Qgs7029120@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29051 Modified Files: .cvsignore python-libgmail.spec sources Log Message: New upstream - 0.1.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jul 2008 09:44:48 -0000 1.3 +++ .cvsignore 29 Jul 2008 09:26:12 -0000 1.4 @@ -1 +1 @@ -libgmail-0.1.9.tar.gz +libgmail-0.1.10.tar.gz Index: python-libgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/python-libgmail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-libgmail.spec 18 Jul 2008 09:44:48 -0000 1.2 +++ python-libgmail.spec 29 Jul 2008 09:26:12 -0000 1.3 @@ -2,7 +2,7 @@ %define realname libgmail Name: python-%{realname} -Version: 0.1.9 +Version: 0.1.10 Release: 1%{?dist} Summary: Library to provide access to Gmail via Python @@ -10,8 +10,6 @@ License: GPLv2 URL: http://%{realname}.sourceforge.net Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz -#Fix ClientCookie old include -Patch0: %{name}-ccfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,7 +21,6 @@ %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 -b .ccfix %build %{__python} setup.py build @@ -48,7 +45,11 @@ %changelog -* Fri Jul 18 2008 Nikolay Vladimirov -0.1.9-1 +* Tue Jul 29 2008 Nikolay Vladimirov - 0.1.10-1 +- new upstream 0.1.10 +- drop ClientCookie patch(upstream) + +* Fri Jul 18 2008 Nikolay Vladimirov - 0.1.9-1 - new upstream 0.1.9 * Tue Dec 11 2007 Michael Stahnke - 0.1.8-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jul 2008 09:44:48 -0000 1.3 +++ sources 29 Jul 2008 09:26:12 -0000 1.4 @@ -1 +1 @@ -4a19c030920a030eb5217cfe8bb85a60 libgmail-0.1.9.tar.gz +2835f66b8ef5a83e8a52dc80e878f492 libgmail-0.1.10.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 09:30:24 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:30:24 GMT Subject: rpms/libgsasl/F-9 .cvsignore, 1.4, 1.5 libgsasl.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200807290930.m6T9UOPJ029264@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/libgsasl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29240 Modified Files: .cvsignore libgsasl.spec sources Log Message: New upstream - 0.2.27 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Jun 2008 06:06:23 -0000 1.4 +++ .cvsignore 29 Jul 2008 09:29:54 -0000 1.5 @@ -1 +1 @@ -libgsasl-0.2.26.tar.gz +libgsasl-0.2.27.tar.gz Index: libgsasl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/F-9/libgsasl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgsasl.spec 3 Jun 2008 06:06:23 -0000 1.6 +++ libgsasl.spec 29 Jul 2008 09:29:54 -0000 1.7 @@ -1,5 +1,5 @@ Name: libgsasl -Version: 0.2.26 +Version: 0.2.27 Release: 1%{?dist} Summary: GNU SASL library @@ -71,8 +71,11 @@ %changelog -* Tue Jun 3 2008 Nikolay Vladimirov 0.2.26-1 -- new upstream +* Tue Jul 29 2008 Nikolay Vladimirov - 0.2.27-1 +- new upstream release 0.2.27 + +* Tue Jun 3 2008 Nikolay Vladimirov - 0.2.26-1 +- new upstream release 0.2.26 * Sat Mar 29 2008 Nikolay Vladimirov - 0.2.25-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Jun 2008 06:06:23 -0000 1.4 +++ sources 29 Jul 2008 09:29:54 -0000 1.5 @@ -1 +1 @@ -e9f2ba40b2843694dcd37de4f9602f10 libgsasl-0.2.26.tar.gz +ea129609a1dea0fd80704a51c6769150 libgsasl-0.2.27.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 09:34:52 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:34:52 GMT Subject: rpms/libgsasl/F-8 .cvsignore, 1.3, 1.4 libgsasl.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200807290934.m6T9YqFr029452@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/libgsasl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29425 Modified Files: .cvsignore libgsasl.spec sources Log Message: New upstream - 0.2.27 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Apr 2008 09:36:05 -0000 1.3 +++ .cvsignore 29 Jul 2008 09:34:22 -0000 1.4 @@ -1 +1 @@ -libgsasl-0.2.25.tar.gz +libgsasl-0.2.27.tar.gz Index: libgsasl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/F-8/libgsasl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgsasl.spec 19 Apr 2008 09:36:05 -0000 1.4 +++ libgsasl.spec 29 Jul 2008 09:34:22 -0000 1.5 @@ -1,5 +1,5 @@ Name: libgsasl -Version: 0.2.25 +Version: 0.2.27 Release: 1%{?dist} Summary: GNU SASL library @@ -71,6 +71,8 @@ %changelog +* Tue Jul 29 2008 Nikolay Vladimirov - 0.2.27-1 +- new upstream release 0.2.27 * Sat Apr 19 2008 Nikolay Vladimirov - 0.2.25-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgsasl/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Apr 2008 09:36:05 -0000 1.3 +++ sources 29 Jul 2008 09:34:22 -0000 1.4 @@ -1 +1 @@ -2029924e368ae5a470370cdf32846c06 libgsasl-0.2.25.tar.gz +ea129609a1dea0fd80704a51c6769150 libgsasl-0.2.27.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 09:35:32 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:35:32 GMT Subject: rpms/python-libgmail/F-8 .cvsignore, 1.2, 1.3 python-libgmail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807290935.m6T9ZWJS029481@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/python-libgmail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29458 Modified Files: .cvsignore python-libgmail.spec sources Log Message: New upstream - 0.1.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jul 2008 09:48:27 -0000 1.2 +++ .cvsignore 29 Jul 2008 09:35:02 -0000 1.3 @@ -1 +1 @@ -libgmail-0.1.9.tar.gz +libgmail-0.1.10.tar.gz Index: python-libgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-8/python-libgmail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-libgmail.spec 18 Jul 2008 09:48:27 -0000 1.2 +++ python-libgmail.spec 29 Jul 2008 09:35:02 -0000 1.3 @@ -2,7 +2,7 @@ %define realname libgmail Name: python-%{realname} -Version: 0.1.9 +Version: 0.1.10 Release: 1%{?dist} Summary: Library to provide access to Gmail via Python @@ -10,8 +10,6 @@ License: GPLv2 URL: http://%{realname}.sourceforge.net Source0: http://dl.sf.net/sourceforge/%{realname}/%{realname}-%{version}.tar.gz -#Fix ClientCookie old include -Patch0: %{name}-ccfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,7 +21,6 @@ %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 -b .ccfix %build %{__python} setup.py build @@ -48,7 +45,11 @@ %changelog -* Fri Jul 18 2008 Nikolay Vladimirov -0.1.9-1 +* Tue Jul 29 2008 Nikolay Vladimirov - 0.1.10-1 +- new upstream 0.1.10 +- drop ClientCookie patch(upstream) + +* Fri Jul 18 2008 Nikolay Vladimirov - 0.1.9-1 - new upstream 0.1.9 * Tue Dec 11 2007 Michael Stahnke - 0.1.8-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-libgmail/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jul 2008 09:48:27 -0000 1.3 +++ sources 29 Jul 2008 09:35:02 -0000 1.4 @@ -1 +1 @@ -4a19c030920a030eb5217cfe8bb85a60 libgmail-0.1.9.tar.gz +2835f66b8ef5a83e8a52dc80e878f492 libgmail-0.1.10.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 09:39:28 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:39:28 GMT Subject: rpms/msmtp/devel .cvsignore, 1.5, 1.6 msmtp.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200807290939.m6T9dSo3029643@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/msmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29606 Modified Files: .cvsignore msmtp.spec sources Log Message: New upstream - 1.4.16 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jun 2008 13:56:38 -0000 1.5 +++ .cvsignore 29 Jul 2008 09:38:58 -0000 1.6 @@ -1 +1 @@ -msmtp-1.4.15.tar.bz2 +msmtp-1.4.16.tar.bz2 Index: msmtp.spec =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/devel/msmtp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- msmtp.spec 27 Jun 2008 13:56:38 -0000 1.7 +++ msmtp.spec 29 Jul 2008 09:38:58 -0000 1.8 @@ -1,5 +1,5 @@ Name: msmtp -Version: 1.4.15 +Version: 1.4.16 Release: 1%{?dist} Summary: SMTP client Group: System Environment/Base @@ -67,6 +67,9 @@ %changelog +* Tue Jul 29 2008 Nikolay Vladimirov - 1.4.16-1 +- new upstream release - 1.4.16 + * Fri Jun 27 2008 Nikolay Vladimriov - 1.4.15-1 - new upstream release - rebuild for new gnutls Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jun 2008 13:56:38 -0000 1.5 +++ sources 29 Jul 2008 09:38:58 -0000 1.6 @@ -1 +1 @@ -52dfb3039f4253581292eba8285379c1 msmtp-1.4.15.tar.bz2 +77a333601e9de03f695539498e678cc2 msmtp-1.4.16.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 09:44:12 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:44:12 GMT Subject: rpms/msmtp/F-9 .cvsignore, 1.5, 1.6 msmtp.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200807290944.m6T9iCkC029869@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/msmtp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29832 Modified Files: .cvsignore msmtp.spec sources Log Message: New upstream 1.4.16 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jun 2008 14:28:23 -0000 1.5 +++ .cvsignore 29 Jul 2008 09:43:42 -0000 1.6 @@ -1 +1 @@ -msmtp-1.4.15.tar.bz2 +msmtp-1.4.16.tar.bz2 Index: msmtp.spec =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/F-9/msmtp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- msmtp.spec 27 Jun 2008 14:28:23 -0000 1.7 +++ msmtp.spec 29 Jul 2008 09:43:42 -0000 1.8 @@ -1,5 +1,5 @@ Name: msmtp -Version: 1.4.15 +Version: 1.4.16 Release: 1%{?dist} Summary: SMTP client Group: System Environment/Base @@ -67,7 +67,10 @@ %changelog -* Fri Jun 27 2008 Nikolay Vladimirof - 1.4.15-1 +* Tue Jul 29 2008 Nikolay Vladimirov - 1.4.16-1 +- new upstream 1.4.16 + +* Fri Jun 27 2008 Nikolay Vladimirov - 1.4.15-1 - new upstream release * Sat Apr 19 2008 Nikolay Vladimirov - 1.4.14-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jun 2008 14:28:23 -0000 1.5 +++ sources 29 Jul 2008 09:43:42 -0000 1.6 @@ -1 +1 @@ -52dfb3039f4253581292eba8285379c1 msmtp-1.4.15.tar.bz2 +77a333601e9de03f695539498e678cc2 msmtp-1.4.16.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 09:45:56 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Tue, 29 Jul 2008 09:45:56 GMT Subject: rpms/msmtp/F-8 .cvsignore, 1.4, 1.5 msmtp.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807290945.m6T9juUm029940@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/msmtp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29903 Modified Files: .cvsignore msmtp.spec sources Log Message: New upstream 1.4.16 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Apr 2008 10:01:17 -0000 1.4 +++ .cvsignore 29 Jul 2008 09:45:26 -0000 1.5 @@ -1 +1 @@ -msmtp-1.4.14.tar.bz2 +msmtp-1.4.16.tar.bz2 Index: msmtp.spec =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/F-8/msmtp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- msmtp.spec 19 Apr 2008 10:01:17 -0000 1.5 +++ msmtp.spec 29 Jul 2008 09:45:26 -0000 1.6 @@ -1,5 +1,5 @@ Name: msmtp -Version: 1.4.14 +Version: 1.4.16 Release: 1%{?dist} Summary: SMTP client Group: System Environment/Base @@ -67,6 +67,9 @@ %changelog +* Tue Jul 29 2008 Nikolay Vladimirov - 1.4.16-1 +- new upstream 1.4.16 + * Sat Apr 19 2008 Nikolay Vladimirov - 1.4.14-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/msmtp/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Apr 2008 10:01:17 -0000 1.4 +++ sources 29 Jul 2008 09:45:26 -0000 1.5 @@ -1 +1 @@ -4b17967f9dc1ebefa4191b6ca701af33 msmtp-1.4.14.tar.bz2 +77a333601e9de03f695539498e678cc2 msmtp-1.4.16.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 09:53:57 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 29 Jul 2008 09:53:57 GMT Subject: rpms/zhcon/devel zhcon-0.2.6-processor-flags.patch, NONE, 1.1 zhcon.spec, 1.9, 1.10 Message-ID: <200807290953.m6T9rvQ9030118@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/zhcon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30098 Modified Files: zhcon.spec Added Files: zhcon-0.2.6-processor-flags.patch Log Message: add zhcon-0.2.6-processor-flags.patch to build on rawhide zhcon-0.2.6-processor-flags.patch: --- NEW FILE zhcon-0.2.6-processor-flags.patch --- diff -ru zhcon-0.2.6.orig/src/display/lrmi.c zhcon-0.2.6/src/display/lrmi.c --- zhcon-0.2.6.orig/src/display/lrmi.c 2008-07-29 10:38:13.000000000 +0100 +++ zhcon-0.2.6/src/display/lrmi.c 2008-07-29 10:39:51.000000000 +0100 @@ -176,7 +176,7 @@ } -#define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) +#define DEFAULT_VM86_FLAGS (X86_EFLAGS_IF | X86_EFLAGS_IOPL) #define DEFAULT_STACK_SIZE 0x1000 #define RETURN_TO_32_INT 255 @@ -790,7 +790,7 @@ context.vm.regs.cs = get_int_seg(v); context.vm.regs.eip = get_int_off(v); - context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK); + context.vm.regs.eflags &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF); continue; } Index: zhcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- zhcon.spec 28 Jul 2008 05:25:56 -0000 1.9 +++ zhcon.spec 29 Jul 2008 09:53:27 -0000 1.10 @@ -1,7 +1,7 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 10%{?dist} +Release: 11%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.sourceforge.net/projects/%{name}/ @@ -12,6 +12,7 @@ Patch3: %{name}-%{version}-gcc43.patch Patch4: %{name}-%{version}-locale.patch Patch5: %{name}-%{version}-keyswitch.patch +Patch6: %{name}-%{version}-processor-flags.patch Summary: A fast Linux Console Chinese System that supports framebuffer Summary(zh_CN): Zhcon ??????????????? Framebuffer ??? Linux ????????????????????? Summary(zh_TW): Zhcon ??????????????? Framebuffer ???????????? Linux ????????????????????? @@ -52,6 +53,7 @@ %patch3 -p0 -b .gcc43 %patch4 -p0 -b .locale %patch5 -p0 -b .keyswitch +%patch6 -p1 -b .processor-flags iconv -f GB2312 -t UTF-8 ChangeLog -o ChangeLog.utf && mv -f ChangeLog.utf ChangeLog ( cd doc; tar -zxf html.tar.gz; chmod 755 manual) @@ -83,6 +85,9 @@ %{_datadir}/%{name}/ %changelog +* Tue Jul 29 2008 Caol??n McNamara - 0.2.6-11 +- add zhcon-0.2.6-processor-flags.patch to build on rawhide + * Mon Jul 15 2008 Ding-Yi Chen - 0.2.6-10 - Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs. - Add gpm as Required From fedora-extras-commits at redhat.com Tue Jul 29 10:10:17 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 10:10:17 GMT Subject: rpms/filezilla/F-9 filezilla.spec, 1.13, 1.14 sources, 1.13, 1.14 FileZilla_3.0.11-rc1-system.patch, 1.1, NONE Message-ID: <200807291010.m6TAAH1p004614@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4567 Modified Files: filezilla.spec sources Removed Files: FileZilla_3.0.11-rc1-system.patch Log Message: - Update to 3.1.0.1 - Security update Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-9/filezilla.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- filezilla.spec 8 Jul 2008 09:53:03 -0000 1.13 +++ filezilla.spec 29 Jul 2008 10:09:47 -0000 1.14 @@ -1,5 +1,5 @@ Name: filezilla -Version: 3.0.11.1 +Version: 3.1.0.1 Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -7,11 +7,10 @@ License: GPLv2+ URL: http://filezilla-project.org/ Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 -Patch0: FileZilla_3.0.11-rc1-system.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked -BuildRequires: automake, autoconf, libtool +#BuildRequires: automake, autoconf, libtool ## ## Needed if test program is build BuildRequires: cppunit-devel >= 1.10.2 @@ -40,10 +39,9 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .system # Run autotools if needed -sh autogen.sh +# sh autogen.sh %build @@ -51,6 +49,7 @@ --disable-static \ --enable-locales \ --disable-manualupdatecheck \ + --with-tinyxml=system \ --disable-autoupdatecheck ## Do not use --enable-buildtype=official @@ -64,13 +63,9 @@ %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" -mkdir -p __doc -install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc -rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs - for i in 16x16 32x32 48x48 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps ln -sf ../../../../%{name}/resources/${i}/%{name}.png \ @@ -110,7 +105,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS -%doc __doc/* +%doc %{_datadir}/%{name}/docs/* %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop @@ -120,6 +115,12 @@ %changelog +* Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 3.1.0.1-1 +- Update to 3.1.0.1 - Security update + +* Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 3.1.0-0.1.beta2 +- Update to 3.1.0-beta2 + * Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 - Update to 3.0.11.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Jul 2008 09:53:03 -0000 1.13 +++ sources 29 Jul 2008 10:09:47 -0000 1.14 @@ -1 +1 @@ -a0b7af162648ade8f593604913b6eedd FileZilla_3.0.11.1_src.tar.bz2 +45a28bac466bd8f2eb1a97dfeb3ea8b3 FileZilla_3.1.0.1_src.tar.bz2 --- FileZilla_3.0.11-rc1-system.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 10:14:57 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 10:14:57 GMT Subject: rpms/filezilla/F-8 sources, 1.6, 1.7 filezilla.spec, 1.6, 1.7 FileZilla_3.0.11-rc1-system.patch, 1.1, NONE Message-ID: <200807291014.m6TAEv3F004759@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4730 Modified Files: sources filezilla.spec Removed Files: FileZilla_3.0.11-rc1-system.patch Log Message: - Update to 3.1.0.1 - Security update Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Jul 2008 10:08:46 -0000 1.6 +++ sources 29 Jul 2008 10:14:27 -0000 1.7 @@ -1 +1 @@ -a0b7af162648ade8f593604913b6eedd FileZilla_3.0.11.1_src.tar.bz2 +45a28bac466bd8f2eb1a97dfeb3ea8b3 FileZilla_3.1.0.1_src.tar.bz2 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/F-8/filezilla.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- filezilla.spec 8 Jul 2008 10:08:46 -0000 1.6 +++ filezilla.spec 29 Jul 2008 10:14:27 -0000 1.7 @@ -1,5 +1,5 @@ Name: filezilla -Version: 3.0.11.1 +Version: 3.1.0.1 Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -7,7 +7,6 @@ License: GPLv2+ URL: http://filezilla-project.org/ Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 -Patch0: FileZilla_3.0.11-rc1-system.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked @@ -40,7 +39,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .system # Downgrade gnutls requirement sed -i -e 's/2.0.4/1.6.3/' configure.in @@ -54,6 +52,7 @@ --disable-static \ --enable-locales \ --disable-manualupdatecheck \ + --with-tinyxml=system \ --disable-autoupdatecheck ## Do not use --enable-buildtype=official @@ -67,13 +66,9 @@ %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" -mkdir -p __doc -install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc -rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs - for i in 16x16 32x32 48x48 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps ln -sf ../../../../%{name}/resources/${i}/%{name}.png \ @@ -113,7 +108,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS -%doc __doc/* +%doc %{_datadir}/%{name}/docs/* %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop @@ -123,6 +118,12 @@ %changelog +* Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 3.1.0.1-1 +- Update to 3.1.0.1 - Security update + +* Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 3.1.0-0.1.beta2 +- Update to 3.1.0-beta2 + * Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 - Update to 3.0.11.1 --- FileZilla_3.0.11-rc1-system.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 10:38:20 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 29 Jul 2008 10:38:20 GMT Subject: rpms/imsettings/devel imsettings.spec,1.8,1.9 Message-ID: <200807291038.m6TAcKo4005463@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/imsettings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440 Modified Files: imsettings.spec Log Message: * Tue Jul 29 2008 Akira TAGOH - 0.102.0-1 - New upstream release. - Fix no recommendation updated. (#455363) - Work on WMs not own/bring up XSETTINGS manager. (#455228) Index: imsettings.spec =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- imsettings.spec 8 Jul 2008 10:24:37 -0000 1.8 +++ imsettings.spec 29 Jul 2008 10:37:50 -0000 1.9 @@ -1,6 +1,6 @@ Name: imsettings -Version: 0.101.3 -Release: 2%{?dist} +Version: 0.102.0 +Release: 1%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -125,6 +125,7 @@ %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/imsettings-* +%{_bindir}/im-xsettings-daemon %{_libexecdir}/gconf-im-settings-daemon %{_libexecdir}/im-info-daemon %{_libexecdir}/im-settings-daemon @@ -152,6 +153,11 @@ %changelog +* Tue Jul 29 2008 Akira TAGOH - 0.102.0-1 +- New upstream release. + - Fix no recommendation updated. (#455363) + - Work on WMs not own/bring up XSETTINGS manager. (#455228) + * Tue Jul 8 2008 Akira TAGOH - 0.101.3-2 - rebuild. From fedora-extras-commits at redhat.com Tue Jul 29 10:39:25 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 29 Jul 2008 10:39:25 GMT Subject: rpms/kdegraphics/devel kdegraphics.spec, 1.159, 1.160 sources, 1.53, 1.54 Message-ID: <200807291039.m6TAdPA1005510@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdegraphics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5471 Modified Files: kdegraphics.spec sources Log Message: respun Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- kdegraphics.spec 25 Jul 2008 11:08:23 -0000 1.159 +++ kdegraphics.spec 29 Jul 2008 10:38:54 -0000 1.160 @@ -5,7 +5,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdegraphics Obsoletes: kdegraphics4 < %{version}-%{release} @@ -183,6 +183,9 @@ %changelog +* Tue Jul 29 2008 Than Ngo 4.1.0-3 +- respun + * Fri Jul 25 2008 Than Ngo 4.1.0-2 - respun Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 25 Jul 2008 11:08:23 -0000 1.53 +++ sources 29 Jul 2008 10:38:55 -0000 1.54 @@ -1 +1 @@ -d45c25889331497776d5aa3093951821 kdegraphics-4.1.0.tar.bz2 +2488d850b66eba1b542bded3def3e87e kdegraphics-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 10:50:14 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 29 Jul 2008 10:50:14 GMT Subject: rpms/imsettings/devel .cvsignore,1.5,1.6 sources,1.4,1.5 Message-ID: <200807291050.m6TAoELk005913@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/imsettings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5891 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 3 Jul 2008 11:01:41 -0000 1.5 +++ .cvsignore 29 Jul 2008 10:49:44 -0000 1.6 @@ -4,3 +4,4 @@ imsettings-0.101.1.tar.bz2 imsettings-0.101.2.tar.bz2 imsettings-0.101.3.tar.bz2 +imsettings-0.102.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Jul 2008 11:01:42 -0000 1.4 +++ sources 29 Jul 2008 10:49:44 -0000 1.5 @@ -1 +1 @@ -1771eb4b4b9cf9a1bd2aeb2163306ebd imsettings-0.101.3.tar.bz2 +862ca521c1ec953abd4e4115fd3dbc5b imsettings-0.102.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 11:01:27 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Tue, 29 Jul 2008 11:01:27 GMT Subject: rpms/libtrash/devel libtrash.spec, NONE, 1.1 libtrash-3.2-makefile.patch, NONE, 1.1 libtrash-3.2-defaults.patch, NONE, 1.1 Message-ID: <200807291101.m6TB1RDo012682@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/libtrash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12670/devel Added Files: libtrash.spec libtrash-3.2-makefile.patch libtrash-3.2-defaults.patch Log Message: Initial commit --- NEW FILE libtrash.spec --- Summary: Libraries to move files to a trash-folder on delete Name: libtrash Version: 3.2 Release: 5%{dist} Group: System Environment/Libraries License: GPLv2+ URL: http://pages.stern.nyu.edu/~marriaga/software/libtrash Source: http://pages.stern.nyu.edu/~marriaga/software/libtrash/%{name}-%{version}.tgz Patch0: libtrash-3.2-defaults.patch Patch1: libtrash-3.2-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, python %description Libtrash is the shared library which, when preloaded, implements a trash can under GNU/Linux. Through the interception of function calls which might lead to accidental data loss libtrash effectively ensures that your data remains protected from your own mistakes. %package devel Summary: Libraries to move files to a trash-folder on delete Group: Development/Libraries License: GPLv2+ Requires: libtrash = %{version}-%{release} %description devel This package contains the libtrash.so dynamic library which, when preloaded, implements a trash can under GNU/Linux. %prep %setup -q %patch0 -p1 -b .defaults %patch1 -p1 -b .makefile %build CFLAGS=$RPM_OPT_FLAGS make %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_libdir},%{_sysconfdir}} make install INSTLIBDIR=$RPM_BUILD_ROOT%{_libdir} SYSCONFFILE=$RPM_BUILD_ROOT%{_sysconfdir}/libtrash.conf rm -f $RPM_BUILD_ROOT/%{_libdir}/libattr.so.3 ln -sf libtrash.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libtrash.so.3 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc README TODO COPYING CHANGE.LOG config.txt %attr(644, root, root) %{_sysconfdir}/libtrash.conf %config(noreplace) %{_sysconfdir}/libtrash.conf %{_libdir}/libtrash.so.* %files devel %defattr(-,root,root) %{_libdir}/libtrash.so %doc README TODO COPYING CHANGE.LOG config.txt %changelog * Thu Jul 15 2008 Zdenek Prikryl 3.2-5 - Fixed permissions on config file * Wed Jul 09 2008 Zdenek Prikryl 3.2-4 - Added documentation to devel package - Minor spec clean up * Wed Jul 02 2008 Zdenek Prikryl 3.2-3 - Create devel package * Thu Jul 01 2008 Zdenek Prikryl 3.2-2 - Package for Fedora 10 * Thu Mar 06 2008 Zdenek Prikryl 3.2-1 - Package for Fedora 9 libtrash-3.2-makefile.patch: --- NEW FILE libtrash-3.2-makefile.patch --- --- libtrash-3.2/src/Makefile.makefile 2008-03-06 15:34:06.000000000 +0100 +++ libtrash-3.2/src/Makefile 2008-03-06 15:34:18.000000000 +0100 @@ -35,7 +35,7 @@ install-libtrash: TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION} TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE} - ldconfig +# ldconfig clean: rm -f *~ libtrash-3.2-defaults.patch: --- NEW FILE libtrash-3.2-defaults.patch --- --- libtrash-3.2/libtrash.conf.defaults 2007-12-04 00:33:34.000000000 +0100 +++ libtrash-3.2/libtrash.conf 2008-03-06 15:47:51.000000000 +0100 @@ -89,7 +89,7 @@ INTERCEPT_OPEN = NO # directory in which "deleted" files will be stored. It mustn't contain # any slashes: -TRASH_CAN = Trash +TRASH_CAN = .Trash # This setting defines what should be done in case of failure: should we @@ -159,7 +159,8 @@ PROTECT_TRASH = YES # # .c;.h -IGNORE_EXTENSIONS = o;log;aux +#IGNORE_EXTENSIONS = o;log;aux +IGNORE_EXTENSIONS = # This setting defines whether hidden files (or files under a hidden @@ -170,7 +171,7 @@ IGNORE_EXTENSIONS = o;log;aux # "normally", i.e., they will be moved to your trash can rather than # really destroyed: -IGNORE_HIDDEN = YES +IGNORE_HIDDEN = NO # This setting defines whether files whose names end in a tilde ('~') From fedora-extras-commits at redhat.com Tue Jul 29 11:05:48 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Tue, 29 Jul 2008 11:05:48 GMT Subject: rpms/libtrash/F-9 libtrash-3.2-makefile.patch, NONE, 1.1 libtrash-3.2-defaults.patch, NONE, 1.1 libtrash.spec, NONE, 1.1 Message-ID: <200807291105.m6TB5mYs012846@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/libtrash/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12830/F-9 Added Files: libtrash-3.2-makefile.patch libtrash-3.2-defaults.patch libtrash.spec Log Message: Initial commit libtrash-3.2-makefile.patch: --- NEW FILE libtrash-3.2-makefile.patch --- --- libtrash-3.2/src/Makefile.makefile 2008-03-06 15:34:06.000000000 +0100 +++ libtrash-3.2/src/Makefile 2008-03-06 15:34:18.000000000 +0100 @@ -35,7 +35,7 @@ install-libtrash: TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION} TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE} - ldconfig +# ldconfig clean: rm -f *~ libtrash-3.2-defaults.patch: --- NEW FILE libtrash-3.2-defaults.patch --- --- libtrash-3.2/libtrash.conf.defaults 2007-12-04 00:33:34.000000000 +0100 +++ libtrash-3.2/libtrash.conf 2008-03-06 15:47:51.000000000 +0100 @@ -89,7 +89,7 @@ INTERCEPT_OPEN = NO # directory in which "deleted" files will be stored. It mustn't contain # any slashes: -TRASH_CAN = Trash +TRASH_CAN = .Trash # This setting defines what should be done in case of failure: should we @@ -159,7 +159,8 @@ PROTECT_TRASH = YES # # .c;.h -IGNORE_EXTENSIONS = o;log;aux +#IGNORE_EXTENSIONS = o;log;aux +IGNORE_EXTENSIONS = # This setting defines whether hidden files (or files under a hidden @@ -170,7 +171,7 @@ IGNORE_EXTENSIONS = o;log;aux # "normally", i.e., they will be moved to your trash can rather than # really destroyed: -IGNORE_HIDDEN = YES +IGNORE_HIDDEN = NO # This setting defines whether files whose names end in a tilde ('~') --- NEW FILE libtrash.spec --- Summary: Libraries to move files to a trash-folder on delete Name: libtrash Version: 3.2 Release: 5%{dist} Group: System Environment/Libraries License: GPLv2+ URL: http://pages.stern.nyu.edu/~marriaga/software/libtrash Source: http://pages.stern.nyu.edu/~marriaga/software/libtrash/%{name}-%{version}.tgz Patch0: libtrash-3.2-defaults.patch Patch1: libtrash-3.2-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, python %description Libtrash is the shared library which, when preloaded, implements a trash can under GNU/Linux. Through the interception of function calls which might lead to accidental data loss libtrash effectively ensures that your data remains protected from your own mistakes. %package devel Summary: Libraries to move files to a trash-folder on delete Group: Development/Libraries License: GPLv2+ Requires: libtrash = %{version}-%{release} %description devel This package contains the libtrash.so dynamic library which, when preloaded, implements a trash can under GNU/Linux. %prep %setup -q %patch0 -p1 -b .defaults %patch1 -p1 -b .makefile %build CFLAGS=$RPM_OPT_FLAGS make %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_libdir},%{_sysconfdir}} make install INSTLIBDIR=$RPM_BUILD_ROOT%{_libdir} SYSCONFFILE=$RPM_BUILD_ROOT%{_sysconfdir}/libtrash.conf rm -f $RPM_BUILD_ROOT/%{_libdir}/libattr.so.3 ln -sf libtrash.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libtrash.so.3 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc README TODO COPYING CHANGE.LOG config.txt %attr(644, root, root) %{_sysconfdir}/libtrash.conf %config(noreplace) %{_sysconfdir}/libtrash.conf %{_libdir}/libtrash.so.* %files devel %defattr(-,root,root) %{_libdir}/libtrash.so %doc README TODO COPYING CHANGE.LOG config.txt %changelog * Thu Jul 15 2008 Zdenek Prikryl 3.2-5 - Fixed permissions on config file * Wed Jul 09 2008 Zdenek Prikryl 3.2-4 - Added documentation to devel package - Minor spec clean up * Wed Jul 02 2008 Zdenek Prikryl 3.2-3 - Create devel package * Thu Jul 01 2008 Zdenek Prikryl 3.2-2 - Package for Fedora 10 * Thu Mar 06 2008 Zdenek Prikryl 3.2-1 - Package for Fedora 9 From fedora-extras-commits at redhat.com Tue Jul 29 11:06:06 2008 From: fedora-extras-commits at redhat.com (Akira TAGOH (tagoh)) Date: Tue, 29 Jul 2008 11:06:06 GMT Subject: rpms/im-chooser/devel .cvsignore, 1.25, 1.26 im-chooser.spec, 1.49, 1.50 sources, 1.24, 1.25 Message-ID: <200807291106.m6TB66X4012863@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/im-chooser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12807 Modified Files: .cvsignore im-chooser.spec sources Log Message: * Tue Jul 29 2008 Akira TAGOH - 1.2.1-1 - New upstream release. - Display IM icon in the list. (#454371) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 8 Jul 2008 09:38:28 -0000 1.25 +++ .cvsignore 29 Jul 2008 11:05:36 -0000 1.26 @@ -25,3 +25,4 @@ im-chooser-1.1.0.tar.bz2 im-chooser-1.1.1.tar.bz2 im-chooser-1.2.0.tar.bz2 +im-chooser-1.2.1.tar.bz2 Index: im-chooser.spec =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- im-chooser.spec 8 Jul 2008 09:38:28 -0000 1.49 +++ im-chooser.spec 29 Jul 2008 11:05:36 -0000 1.50 @@ -1,5 +1,5 @@ Name: im-chooser -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} License: GPLv2+ URL: http://fedorahosted.org/im-chooser/ @@ -52,6 +52,10 @@ %changelog +* Tue Jul 29 2008 Akira TAGOH - 1.2.1-1 +- New upstream release. + - Display IM icon in the list. (#454371) + * Tue Jul 8 2008 Akira TAGOH - 1.2.0-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 8 Jul 2008 09:38:28 -0000 1.24 +++ sources 29 Jul 2008 11:05:36 -0000 1.25 @@ -1 +1 @@ -9d0b83ff217e5a2795d844b46e27fced im-chooser-1.2.0.tar.bz2 +db6fff97faae15ab5919d62eb38f9dd0 im-chooser-1.2.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 11:07:13 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Tue, 29 Jul 2008 11:07:13 GMT Subject: rpms/libtrash/F-9 sources,1.1,1.2 .cvsignore,1.1,1.2 Message-ID: <200807291107.m6TB7DjJ012966@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/libtrash/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12925/F-9 Modified Files: sources .cvsignore Log Message: Initial commit Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtrash/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:29:47 -0000 1.1 +++ sources 29 Jul 2008 11:06:43 -0000 1.2 @@ -0,0 +1 @@ +56f7b54f50d760e4719f73b98cd8b43a libtrash-3.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtrash/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:29:47 -0000 1.1 +++ .cvsignore 29 Jul 2008 11:06:43 -0000 1.2 @@ -0,0 +1 @@ +libtrash-3.2.tgz From fedora-extras-commits at redhat.com Tue Jul 29 11:07:14 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Tue, 29 Jul 2008 11:07:14 GMT Subject: rpms/libtrash/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200807291107.m6TB7EFQ012970@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/libtrash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12925/devel Modified Files: .cvsignore sources Log Message: Initial commit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtrash/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2008 18:29:47 -0000 1.1 +++ .cvsignore 29 Jul 2008 11:06:43 -0000 1.2 @@ -0,0 +1 @@ +libtrash-3.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtrash/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2008 18:29:47 -0000 1.1 +++ sources 29 Jul 2008 11:06:43 -0000 1.2 @@ -0,0 +1 @@ +56f7b54f50d760e4719f73b98cd8b43a libtrash-3.2.tgz From fedora-extras-commits at redhat.com Tue Jul 29 11:32:52 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Tue, 29 Jul 2008 11:32:52 GMT Subject: rpms/freeipmi/devel freeipmi-0.6.4-argmax.patch, NONE, 1.1 freeipmi.spec, 1.6, 1.7 Message-ID: <200807291132.m6TBWqPw013542@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/freeipmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13522 Modified Files: freeipmi.spec Added Files: freeipmi-0.6.4-argmax.patch Log Message: - Fix build problem with glibc-2.8 and missing ARG_MAX definition freeipmi-0.6.4-argmax.patch: --- NEW FILE freeipmi-0.6.4-argmax.patch --- diff -up freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h --- freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax 2008-07-29 13:26:05.000000000 +0200 +++ freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h 2008-07-29 13:30:16.000000000 +0200 @@ -23,6 +23,15 @@ extern "C" { #endif +/* GLIBC >= 2.8 have ARG_MAX replaced by _SC_ARG_MAX */ +#include +#ifdef _SC_ARG_MAX +#ifdef ARG_MAX +#undef ARG_MAX +#endif +#define ARG_MAX sysconf(_SC_ARG_MAX) +#endif + #include #include #include Index: freeipmi.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- freeipmi.spec 28 Jul 2008 12:03:10 -0000 1.6 +++ freeipmi.spec 29 Jul 2008 11:32:22 -0000 1.7 @@ -19,6 +19,7 @@ Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz Patch1: freeipmi-0.5.1-regex.patch Patch2: freeipmi-0.6.4-silent.patch +Patch3: freeipmi-0.6.4-argmax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel texinfo Requires(post): info From fedora-extras-commits at redhat.com Tue Jul 29 11:43:26 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 11:43:26 GMT Subject: rpms/afflib/devel afflib.spec,1.13,1.14 Message-ID: <200807291143.m6TBhQTD013736@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/afflib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13705 Modified Files: afflib.spec Log Message: - Patch with fuzz 2 Index: afflib.spec =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- afflib.spec 24 Jul 2008 07:36:14 -0000 1.13 +++ afflib.spec 29 Jul 2008 11:42:56 -0000 1.14 @@ -1,6 +1,8 @@ +%define _default_patch_fuzz 2 + Name: afflib Version: 3.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -123,6 +125,9 @@ %changelog +* Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 3.2.5-3 +- Patch with fuzz 2 + * Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-2 - Remove nos3 patch From fedora-extras-commits at redhat.com Tue Jul 29 11:44:19 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Tue, 29 Jul 2008 11:44:19 GMT Subject: rpms/freeipmi/devel freeipmi.spec,1.7,1.8 Message-ID: <200807291144.m6TBiJJH013812@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/freeipmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13744 Modified Files: freeipmi.spec Log Message: - It would certainly help to apply the new patch, too... ;) Index: freeipmi.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- freeipmi.spec 29 Jul 2008 11:32:22 -0000 1.7 +++ freeipmi.spec 29 Jul 2008 11:43:49 -0000 1.8 @@ -67,6 +67,7 @@ %setup -q %patch1 -p1 -b .regex %patch2 -p1 -b .silent +%patch3 -p1 -b .argmax %build CFLAGS=-D_GNU_SOURCE %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ From fedora-extras-commits at redhat.com Tue Jul 29 12:04:35 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 12:04:35 GMT Subject: rpms/sleuthkit/F-9 sleuthkit.spec, NONE, 1.1 sleuthkit-2.51-system_perl.patch, NONE, 1.1 sleuthkit-2.52-pkgconfig.patch, NONE, 1.1 sleuthkit-2.52-remove_rpath.patch, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807291204.m6TC4ZFB020806@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/sleuthkit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20779 Modified Files: sources Added Files: sleuthkit.spec sleuthkit-2.51-system_perl.patch sleuthkit-2.52-pkgconfig.patch sleuthkit-2.52-remove_rpath.patch Log Message: Initial import for F-9 --- NEW FILE sleuthkit.spec --- # Could be part of http://fedoraproject.org/wiki/LukeMacken/SecurityLiveCD Name: sleuthkit Version: 2.52 Release: 1%{?dist} Summary: The Sleuth Kit (TSK) Group: Applications/System License: CPL and IBM and GPLv2+ URL: http://www.sleuthkit.org Source0: http://downloads.sourceforge.net/sleuthkit/sleuthkit-%{version}.tar.gz Patch0: sleuthkit-2.52-remove_rpath.patch Patch2: sleuthkit-2.51-system_perl.patch Patch3: sleuthkit-2.52-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool # afflib - BSD with advertising, GPL incompatible BuildRequires: afflib-devel # libewf - Newer versions are plain BSD (older are BSD with advertising) BuildRequires: libewf-devel Requires: %{name}-libs = %{version}-%{release} Requires: file Requires: mac-robber %description The Sleuth Kit (TSK) is a collection of UNIX-based command line tools that allow you to investigate a computer. The current focus of the tools is the file and volume systems and TSK supports FAT, Ext2/3, NTFS, UFS, and ISO 9660 file systems %package libs Summary: Library for %{name} Group: System Environment/Libraries %description libs The %{name}-libs package contains library for %{name}. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .rpath %patch2 -p1 -b .system_perl %patch3 -p1 -b .pkgconfig # re-run autotools libtoolize --force aclocal autoheader autoconf automake %build %configure --disable-static # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES.txt README.txt TODO.txt licenses/* %doc docs/nsrl.txt docs/other.txt docs/skins*.txt docs/ref*.txt # License is CPL 1.0 exept for some files. %{_bindir}/dcalc %{_bindir}/dcat %{_bindir}/disk_sreset %{_bindir}/disk_stat %{_bindir}/dls %{_bindir}/dstat %{_bindir}/ffind %{_bindir}/fls %{_bindir}/fsstat %{_bindir}/hfind %{_bindir}/icat %{_bindir}/ifind %{_bindir}/ils %{_bindir}/img_cat %{_bindir}/img_stat %{_bindir}/istat %{_bindir}/jcat %{_bindir}/jls # This file is described as GPL in the doc # But the license remains CPL in the source. %{_bindir}/mactime ## %{_bindir}/mmls %{_bindir}/mmstat %{_bindir}/sigfind %{_bindir}/sorter ## This file is GPLv2+ %{_bindir}/srch_strings # %{_mandir}/man1/dcalc.1* %{_mandir}/man1/dcat.1* %{_mandir}/man1/disk_sreset.1* %{_mandir}/man1/disk_stat.1* %{_mandir}/man1/dls.1* %{_mandir}/man1/dstat.1* %{_mandir}/man1/ffind.1* %{_mandir}/man1/fls.1* %{_mandir}/man1/fsstat.1* %{_mandir}/man1/hfind.1* %{_mandir}/man1/icat.1* %{_mandir}/man1/ifind.1* %{_mandir}/man1/ils.1* %{_mandir}/man1/img_cat.1* %{_mandir}/man1/img_stat.1* %{_mandir}/man1/istat.1* %{_mandir}/man1/jcat.1* %{_mandir}/man1/jls.1* %{_mandir}/man1/mactime.1* %{_mandir}/man1/mmls.1* %{_mandir}/man1/mmstat.1* %{_mandir}/man1/sigfind.1* %{_mandir}/man1/sorter.1* %dir %{_datadir}/tsk %{_datadir}/tsk/sorter/ %files libs %defattr(-,root,root,-) # CPL and IBM %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc docs/library-api.txt # CPL and IBM %{_includedir}/tsk/ %{_libdir}/*.so %changelog * Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 2.52-1 - Update to 2.52 - Remove merged patches - Remove clean unused-direct-shlib-dependencies - Fix rpath at source. - Sort license within the spec - Move configure.ac to pkg-config detection - Remove Perl-Date-Manip installation * Tue Mar 18 2008 kwizart < kwizart at gmail.com > - 2.51-1 - Update to 2.51 - Add libewf/afflib BR - Requires mac-robber external package. - Remove internal perl-Date-Manip. * Fri Dec 28 2007 kwizart < kwizart at gmail.com > - 2.10-1 - Update to 2.10 * Mon Oct 29 2007 kwizart < kwizart at gmail.com > - 2.09-1 - Initial package for Fedora (inspired from Oden Eriksson mdk spec). sleuthkit-2.51-system_perl.patch: --- NEW FILE sleuthkit-2.51-system_perl.patch --- diff -up sleuthkit-2.51/tools/timeline/Makefile.am.system_perl sleuthkit-2.51/tools/timeline/Makefile.am --- sleuthkit-2.51/tools/timeline/Makefile.am.system_perl 2007-12-18 23:43:33.000000000 +0100 +++ sleuthkit-2.51/tools/timeline/Makefile.am 2008-03-18 15:14:34.000000000 +0100 @@ -4,7 +4,6 @@ EXTRA_DIST = mactime.base .perltidyrc mactime: mactime.base Makefile @echo "#!$(PERL) -w" > mactime - @echo "use lib '$(datadir)/tsk/lib';" >> mactime @echo "my \$$VER=\"$(VERSION)\";" >> mactime @cat mactime.base >> mactime @chmod +x mactime diff -up sleuthkit-2.52/Makefile.am.rm_Date-Manip sleuthkit-2.52/Makefile.am --- sleuthkit-2.52/Makefile.am.rm_Date-Manip 2008-06-17 12:02:54.000000000 +0200 +++ sleuthkit-2.52/Makefile.am 2008-06-17 12:03:01.000000000 +0200 @@ -35,8 +35,7 @@ nobase_include_HEADERS = tsk/libtsk.h ts nobase_dist_data_DATA = tsk/sorter/default.sort tsk/sorter/freebsd.sort \ tsk/sorter/images.sort tsk/sorter/linux.sort tsk/sorter/openbsd.sort \ - tsk/sorter/solaris.sort tsk/sorter/windows.sort \ - tsk/lib/Date/Manip.pm tsk/lib/Date/Manip.pod + tsk/sorter/solaris.sort tsk/sorter/windows.sort api-docs: doxygen config/Doxyfile sleuthkit-2.52-pkgconfig.patch: --- NEW FILE sleuthkit-2.52-pkgconfig.patch --- diff -up sleuthkit-2.52/tsk/img/aff.h.pkgconfig sleuthkit-2.52/tsk/img/aff.h --- sleuthkit-2.52/tsk/img/aff.h.pkgconfig 2008-03-25 00:05:23.000000000 +0100 +++ sleuthkit-2.52/tsk/img/aff.h 2008-06-17 17:28:15.000000000 +0200 @@ -16,8 +16,9 @@ #if HAVE_LIBAFFLIB -#include -#include +#include +#include + extern TSK_IMG_INFO *aff_open(const char **, TSK_IMG_INFO *); diff -up sleuthkit-2.52/tsk/img/Makefile.am.pkgconfig sleuthkit-2.52/tsk/img/Makefile.am --- sleuthkit-2.52/tsk/img/Makefile.am.pkgconfig 2008-01-29 05:34:27.000000000 +0100 +++ sleuthkit-2.52/tsk/img/Makefile.am 2008-06-17 17:34:05.000000000 +0200 @@ -4,6 +4,8 @@ EXTRA_DIST = .indent.pro DESIGN.txt noinst_LTLIBRARIES = libtskimg.la libtskimg_la_SOURCES = img_open.c img_types.c raw.c raw.h \ split.c split.h aff.c aff.h ewf.c ewf.h tsk_img_i.h +libtskimg_la_LIBADD = $(LIBEWF_LIBS) $(AFFLIB_LIBS) +libtskimg_la_CFLAGS = $(AM_CFLAGS) $(LIBEWF_CFLAGS) $(AFFLIB_CFLAGS) indent: indent *.c *.h diff -up sleuthkit-2.52/tsk/Makefile.am.pkgconfig sleuthkit-2.52/tsk/Makefile.am --- sleuthkit-2.52/tsk/Makefile.am.pkgconfig 2008-04-05 20:37:18.000000000 +0200 +++ sleuthkit-2.52/tsk/Makefile.am 2008-06-17 17:28:15.000000000 +0200 @@ -5,8 +5,9 @@ SUBDIRS = base img vs fs hashdb lib_LTLIBRARIES = libtsk.la libtsk_la_SOURCES = libtsk_la_LIBADD = base/libtskbase.la img/libtskimg.la \ - vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la + vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la + # current:revision:age -libtsk_la_LDFLAGS = -version-info 1:2:0 +libtsk_la_LDFLAGS = -no-undefined -version-info 1:2:0 EXTRA_DIST = tsk_tools_i.h diff -up sleuthkit-2.52/configure.ac.pkgconfig sleuthkit-2.52/configure.ac --- sleuthkit-2.52/configure.ac.pkgconfig 2008-06-17 17:28:15.000000000 +0200 +++ sleuthkit-2.52/configure.ac 2008-06-17 17:28:15.000000000 +0200 @@ -74,36 +74,27 @@ AC_CHECK_HEADERS([linux/hdreg.h], # AC_ARG_ENABLE to see if they disabled it (disable-afflib) AC_ARG_ENABLE(afflib, - [ --disable-afflib Do not use AFFLIB even if it is installed], -# Action if they gave this argument - [ if test "x$enableval" = "xyes" ; then - AC_CHECK_LIB([afflib], [af_open]) - elif test "x$enableval" = "xno" ; then - echo "Ignoring AFFLIB." - else - echo "Error: Unknown enable-afflib argument." - exit -1 - fi - ], -# if they did not specify aff, look for it - [AC_CHECK_LIB([afflib], [af_open])] - ) + [ --disable-afflib Do not use AFFLIB even if it is installed]) +# Check via pkg-config unless explicitely disabled. +if test "x$enable_afflib" != "xno" ; then + PKG_CHECK_MODULES([AFFLIB], [afflib >= 3.0.0], + [AC_DEFINE(HAVE_LIBAFFLIB, [1], [Define to 1 if you have the `afflib' library (-lafflib)])] + ) +else + echo "Ignoring AFFLIB." +fi + AC_ARG_ENABLE(ewf, - [ --disable-ewf Do not use libewf even if it is installed], -# Action if they gave this argument - [ if test "x$enableval" = "xyes" ; then - AC_CHECK_LIB([ewf], [libewf_open]) - elif test "x$enableval" = "xno" ; then - echo "Ignoring LibEWF." - else - echo "Error: Unknown enable-ewf argument." - exit -1 - fi - ], -# if they did not specify ewf, look for it - [AC_CHECK_LIB([ewf], [libewf_open])] - ) + [ --disable-ewf Do not use libewf even if it is installed]) +# Check via pkg-config unless explicitely disabled. +if test "x$enable_ewf" != "xno" ; then + PKG_CHECK_MODULES([LIBEWF], [libewf >= 20080322], + [AC_DEFINE(HAVE_LIBEWF, [1], [Define to 1 if you have the `libewf' library (-lewf)])] + ) +else + echo "Ignoring LibEWF." +fi AC_CONFIG_COMMANDS([tsk/tsk_incs.h], sleuthkit-2.52-remove_rpath.patch: --- NEW FILE sleuthkit-2.52-remove_rpath.patch --- diff -up sleuthkit-2.52/configure.ac.rpath sleuthkit-2.52/configure.ac --- sleuthkit-2.52/configure.ac.rpath 2008-04-10 02:33:59.000000000 +0200 +++ sleuthkit-2.52/configure.ac 2008-06-17 11:17:02.000000000 +0200 @@ -63,12 +63,6 @@ AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF #AC_CHECK_FUNCS([dup2 gethostname isascii iswprint memset munmap regcomp select setlocale strcasecmp strchr strdup strerror strndup strrchr strtol strtoul strtoull utime wcwidth]) -# Not all compilers include /usr/local in the include and link path -if test -d /usr/local/include; then - CFLAGS="$CFLAGS -I/usr/local/include" - LDFLAGS="$LDFLAGS -L/usr/local/lib" -fi - # This is used by disktools AC_CHECK_HEADERS([linux/hdreg.h], [AC_CHECK_TYPE(ide_task_request_t, diff -up sleuthkit-2.52/tools/srchtools/Makefile.am.rpath sleuthkit-2.52/tools/srchtools/Makefile.am --- sleuthkit-2.52/tools/srchtools/Makefile.am.rpath 2008-03-24 22:44:13.000000000 +0100 +++ sleuthkit-2.52/tools/srchtools/Makefile.am 2008-06-17 11:34:22.000000000 +0200 @@ -3,10 +3,11 @@ EXTRA_DIST = .indent.pro AM_CPPFLAGS = -I../.. -Wall srch_strings_SOURCES = srch_strings.c +srch_strings_LDADD = sigfind_SOURCES = sigfind.cpp sigfind_LDADD = ../../tsk/libtsk.la -sigfind_LDFLAGS = -static + indent: indent *.c *.cpp diff -up sleuthkit-2.52/tools/imgtools/Makefile.am.rpath sleuthkit-2.52/tools/imgtools/Makefile.am --- sleuthkit-2.52/tools/imgtools/Makefile.am.rpath 2008-03-24 22:29:58.000000000 +0100 +++ sleuthkit-2.52/tools/imgtools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro bin_PROGRAMS = img_cat img_stat diff -up sleuthkit-2.52/tools/fstools/Makefile.am.rpath sleuthkit-2.52/tools/fstools/Makefile.am --- sleuthkit-2.52/tools/fstools/Makefile.am.rpath 2008-03-24 22:29:33.000000000 +0100 +++ sleuthkit-2.52/tools/fstools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro fscheck.cpp bin_PROGRAMS = dcalc dcat dls dstat ffind fls fsstat icat ifind ils \ diff -up sleuthkit-2.52/tools/vstools/Makefile.am.rpath sleuthkit-2.52/tools/vstools/Makefile.am --- sleuthkit-2.52/tools/vstools/Makefile.am.rpath 2008-03-24 22:31:06.000000000 +0100 +++ sleuthkit-2.52/tools/vstools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro bin_PROGRAMS = mmls mmstat diff -up sleuthkit-2.52/tools/hashtools/Makefile.am.rpath sleuthkit-2.52/tools/hashtools/Makefile.am --- sleuthkit-2.52/tools/hashtools/Makefile.am.rpath 2008-03-24 22:29:50.000000000 +0100 +++ sleuthkit-2.52/tools/hashtools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro md5.c sha1.c bin_PROGRAMS = hfind diff -up sleuthkit-2.52/tools/disktools/Makefile.am.rpath sleuthkit-2.52/tools/disktools/Makefile.am --- sleuthkit-2.52/tools/disktools/Makefile.am.rpath 2008-03-24 22:28:49.000000000 +0100 +++ sleuthkit-2.52/tools/disktools/Makefile.am 2008-06-17 11:17:02.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I../.. -Wall LDADD = ../../tsk/libtsk.la -LDFLAGS = -static + EXTRA_DIST = .indent.pro bin_PROGRAMS = disk_stat disk_sreset Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sleuthkit/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2008 19:40:57 -0000 1.1 +++ sources 29 Jul 2008 12:04:05 -0000 1.2 @@ -0,0 +1 @@ +3f93bc77901ef40b8b3f2a7e482214a5 sleuthkit-2.52.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 12:11:50 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Tue, 29 Jul 2008 12:11:50 GMT Subject: rpms/freeipmi/devel freeipmi-0.6.4-argmax.patch,1.1,1.2 Message-ID: <200807291211.m6TCBoMn020950@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/freeipmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20930 Modified Files: freeipmi-0.6.4-argmax.patch Log Message: - Hopefully final fix for the ARG_MAX problem. freeipmi-0.6.4-argmax.patch: Index: freeipmi-0.6.4-argmax.patch =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi-0.6.4-argmax.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freeipmi-0.6.4-argmax.patch 29 Jul 2008 11:32:22 -0000 1.1 +++ freeipmi-0.6.4-argmax.patch 29 Jul 2008 12:11:20 -0000 1.2 @@ -1,17 +1,14 @@ diff -up freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h ---- freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax 2008-07-29 13:26:05.000000000 +0200 -+++ freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h 2008-07-29 13:30:16.000000000 +0200 -@@ -23,6 +23,15 @@ +--- freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax 2008-03-28 01:14:49.000000000 +0100 ++++ freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h 2008-07-29 14:00:21.000000000 +0200 +@@ -23,6 +23,12 @@ extern "C" { #endif -+/* GLIBC >= 2.8 have ARG_MAX replaced by _SC_ARG_MAX */ -+#include -+#ifdef _SC_ARG_MAX -+#ifdef ARG_MAX -+#undef ARG_MAX -+#endif -+#define ARG_MAX sysconf(_SC_ARG_MAX) ++/* GLIBC >= 2.8 have ARG_MAX replaced by _SC_ARG_MAX. As we need it in an ++ * array we need to hardwire it with the Posix.1 minimum of 4096 :/ */ ++#ifndef ARG_MAX ++#define ARG_MAX 4096 +#endif + #include From fedora-extras-commits at redhat.com Tue Jul 29 12:13:44 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Tue, 29 Jul 2008 12:13:44 GMT Subject: rpms/libspe2/devel libspe2.spec,1.2,1.3 Message-ID: <200807291213.m6TCDiWL021036@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21005 Modified Files: libspe2.spec Log Message: Upgrade to latest upstream version. Index: libspe2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/libspe2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libspe2.spec 24 Jul 2008 08:10:31 -0000 1.2 +++ libspe2.spec 29 Jul 2008 12:13:14 -0000 1.3 @@ -1,10 +1,10 @@ %define up_version 2.2.80 -%define up_release 95 +%define up_release 129 %define spuinclude %{_includedir}/spu Name: libspe2 Version: %{up_version}.%{up_release} -Release: 5%{?dist} +Release: 1%{?dist} Summary: SPE Runtime Management Library Group: System Environment/Libraries @@ -154,6 +154,9 @@ %endif %changelog +* Thu Jul 29 2008 Jochen Roth 2.2.80.129-1 +- update to latest open source version to solve some bugs + * Thu Jul 24 2008 Jochen Roth 2.2.80.95-5 - changed release name to include branch name From fedora-extras-commits at redhat.com Tue Jul 29 12:18:40 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Tue, 29 Jul 2008 12:18:40 GMT Subject: rpms/libspe2/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200807291218.m6TCIe7G021213@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21179 Modified Files: .cvsignore sources Log Message: added new source tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Jul 2008 07:16:26 -0000 1.2 +++ .cvsignore 29 Jul 2008 12:18:10 -0000 1.3 @@ -1 +1 @@ -libspe2-2.2.80-95.tar.gz +libspe2-2.2.80-129.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Jul 2008 07:16:26 -0000 1.2 +++ sources 29 Jul 2008 12:18:10 -0000 1.3 @@ -1 +1 @@ -e534fd24e9c0225519d9dcc11f1ecba2 libspe2-2.2.80-95.tar.gz +bf9c4a8ec7aff188f5489220f3f170cb libspe2-2.2.80-129.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 12:31:54 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Tue, 29 Jul 2008 12:31:54 GMT Subject: rpms/ipsec-tools/devel ipsec-tools-0.7.1-loopback.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 ipsec-tools.spec, 1.55, 1.56 sources, 1.12, 1.13 ipsec-tools-0.7-libs.patch, 1.1, NONE ipsec-tools-0.7-loopback.patch, 1.2, NONE ipsec-tools-0.7-newcookie-alen.patch, 1.1, NONE ipsec.h, 1.1, NONE isakmp.c.diff, 1.1, NONE pfkeyv2.h, 1.4, NONE udp.h, 1.1, NONE xfrm.h, 1.2, NONE Message-ID: <200807291231.m6TCVsQC021604@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/ipsec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21578 Modified Files: .cvsignore ipsec-tools.spec sources Added Files: ipsec-tools-0.7.1-loopback.patch Removed Files: ipsec-tools-0.7-libs.patch ipsec-tools-0.7-loopback.patch ipsec-tools-0.7-newcookie-alen.patch ipsec.h isakmp.c.diff pfkeyv2.h udp.h xfrm.h Log Message: * Tue Jul 29 2008 Tomas Mraz - 0.7.1-1 - Update to a new upstream version ipsec-tools-0.7.1-loopback.patch: --- NEW FILE ipsec-tools-0.7.1-loopback.patch --- diff -up ipsec-tools-0.7.1/configure.ac.loopback ipsec-tools-0.7.1/configure.ac --- ipsec-tools-0.7.1/configure.ac.loopback 2008-07-22 15:53:46.000000000 +0200 +++ ipsec-tools-0.7.1/configure.ac 2008-07-29 09:57:26.000000000 +0200 @@ -794,6 +794,16 @@ if test "$enable_security_context" = "ye fi fi +# Option --enable-racoon-over-loopback +AC_MSG_CHECKING(if --enable-racoon-over-loopback option is specified) +AC_ARG_ENABLE(racoon-over-loopback, + [ --enable-racoon-over-loopback enable racoon to use loopback], + [], [enable_racoon_over_loopback=no]) +if test $enable_racoon_over_loopback = "yes"; then + AC_DEFINE([ENABLE_RACOON_OVER_LOOPBACK], [], [Enable racoon to use loopback]) +fi +AC_MSG_RESULT($enable_racoon_over_loopback) + CFLAGS="$CFLAGS $CFLAGS_ADD" CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" diff -up ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.loopback ipsec-tools-0.7.1/src/racoon/isakmp_inf.c --- ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.loopback 2008-07-11 10:08:42.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/isakmp_inf.c 2008-07-29 11:38:29.000000000 +0200 @@ -383,7 +383,7 @@ isakmp_info_recv_n(iph1, notify, msgid, "delete phase1 handle.\n"); return -1; } else { - if (getph2bymsgid(iph1, msgid) == NULL) { + if (getph2bymsgid(iph1, msgid, iph1->side) == NULL) { plog(LLV_ERROR, LOCATION, iph1->remote, "fatal %s notify messsage, " "phase1 should be deleted.\n", @@ -512,7 +512,7 @@ isakmp_info_recv_d(iph1, delete, msgid, return 0; } - del_ph1=getph1byindex((isakmp_index *)(delete + 1)); + del_ph1=getph1byindex((isakmp_index *)(delete + 1), ANYSIDE); if(del_ph1 != NULL){ EVT_PUSH(del_ph1->local, del_ph1->remote, @@ -641,7 +641,7 @@ isakmp_info_send_d2(iph2) * don't send delete information if there is no phase 1 handler. * It's nonsensical to negotiate phase 1 to send the information. */ - iph1 = getph1byaddr(iph2->src, iph2->dst, 0); + iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); if (iph1 == NULL){ plog(LLV_DEBUG2, LOCATION, NULL, "No ph1 handler found, could not send DELETE_SA\n"); @@ -1110,7 +1110,7 @@ purge_isakmp_spi(proto, spi, n) size_t i; for (i = 0; i < n; i++) { - iph1 = getph1byindex(&spi[i]); + iph1 = getph1byindex(&spi[i], ANYSIDE); if (!iph1) continue; diff -up ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c.loopback ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c --- ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c.loopback 2007-08-07 06:49:24.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c 2008-07-29 09:57:26.000000000 +0200 @@ -360,7 +360,7 @@ xauth_reply_stub(args) struct xauth_reply_arg *xra = (struct xauth_reply_arg *)args; struct ph1handle *iph1; - if ((iph1 = getph1byindex(&xra->index)) != NULL) + if ((iph1 = getph1byindex(&xra->index, ANYSIDE)) != NULL) (void)xauth_reply(iph1, xra->port, xra->id, xra->res); else plog(LLV_ERROR, LOCATION, NULL, diff -up ipsec-tools-0.7.1/src/racoon/isakmp.h.loopback ipsec-tools-0.7.1/src/racoon/isakmp.h --- ipsec-tools-0.7.1/src/racoon/isakmp.h.loopback 2006-09-09 18:22:09.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/isakmp.h 2008-07-29 09:57:26.000000000 +0200 @@ -39,6 +39,8 @@ /* must include first. */ /* must include "isakmp_var.h" first. */ +#define ANYSIDE -1 /* either INITIATOR or RESPONDER */ + #define INITIATOR 0 /* synonym sender */ #define RESPONDER 1 /* synonym receiver */ diff -up ipsec-tools-0.7.1/src/racoon/handler.c.loopback ipsec-tools-0.7.1/src/racoon/handler.c --- ipsec-tools-0.7.1/src/racoon/handler.c.loopback 2008-01-11 15:12:00.000000000 +0100 +++ ipsec-tools-0.7.1/src/racoon/handler.c 2008-07-29 11:29:31.000000000 +0200 @@ -101,14 +101,19 @@ static void sweep_recvdpkt __P((void *)) extern caddr_t val2str(const char *, size_t); struct ph1handle * -getph1byindex(index) +getph1byindex(index, side) isakmp_index *index; + int side; { struct ph1handle *p; LIST_FOREACH(p, &ph1tree, chain) { if (p->status == PHASE1ST_EXPIRED) continue; +#ifdef ENABLE_RACOON_OVER_LOOPBACK + if (p->side != side && side != ANYSIDE) + continue; +#endif if (memcmp(&p->index, index, sizeof(*index)) == 0) return p; } @@ -121,14 +126,19 @@ getph1byindex(index) * search for isakmp handler by i_ck in index. */ struct ph1handle * -getph1byindex0(index) +getph1byindex0(index, side) isakmp_index *index; + int side; { struct ph1handle *p; LIST_FOREACH(p, &ph1tree, chain) { if (p->status == PHASE1ST_EXPIRED) continue; +#ifdef ENABLE_RACOON_OVER_LOOPBACK + if (p->side != side && side != ANYSIDE) + continue; +#endif if (memcmp(&p->index, index, sizeof(cookie_t)) == 0) return p; } @@ -142,9 +152,10 @@ getph1byindex0(index) * with phase 2's destinaion. */ struct ph1handle * -getph1byaddr(local, remote, established) +getph1byaddr(local, remote, established, side) struct sockaddr *local, *remote; int established; + int side; { struct ph1handle *p; @@ -155,6 +166,10 @@ getph1byaddr(local, remote, established) LIST_FOREACH(p, &ph1tree, chain) { if (p->status == PHASE1ST_EXPIRED) continue; + #ifdef ENABLE_RACOON_OVER_LOOPBACK + if (p->side != side && side != ANYSIDE) + continue; + #endif plog(LLV_DEBUG2, LOCATION, NULL, "p->local: %s\n", saddr2str(p->local)); plog(LLV_DEBUG2, LOCATION, NULL, "p->remote: %s\n", saddr2str(p->remote)); @@ -175,14 +190,19 @@ getph1byaddr(local, remote, established) } struct ph1handle * -getph1byaddrwop(local, remote) +getph1byaddrwop(local, remote, side) struct sockaddr *local, *remote; + int side; { struct ph1handle *p; LIST_FOREACH(p, &ph1tree, chain) { if (p->status == PHASE1ST_EXPIRED) continue; +#ifdef ENABLE_RACOON_OVER_LOOPBACK + if (p->side != side && side != ANYSIDE) + continue; +#endif if (cmpsaddrwop(local, p->local) == 0 && cmpsaddrwop(remote, p->remote) == 0) return p; @@ -197,14 +217,19 @@ getph1byaddrwop(local, remote) * with phase 2's destinaion. */ struct ph1handle * -getph1bydstaddrwop(remote) +getph1bydstaddrwop(remote, side) struct sockaddr *remote; + int side; { struct ph1handle *p; LIST_FOREACH(p, &ph1tree, chain) { if (p->status == PHASE1ST_EXPIRED) continue; +#ifdef ENABLE_RACOON_OVER_LOOPBACK + if (p->side != side && side != ANYSIDE) + continue; +#endif if (cmpsaddrwop(remote, p->remote) == 0) return p; } @@ -472,13 +497,18 @@ getph2byseq(seq) * search ph2handle with message id. */ struct ph2handle * -getph2bymsgid(iph1, msgid) +getph2bymsgid(iph1, msgid, side) struct ph1handle *iph1; u_int32_t msgid; + int side; { struct ph2handle *p; LIST_FOREACH(p, &ph2tree, chain) { +#ifdef ENABLE_RACOON_OVER_LOOPBACK + if (p->side != side && side != ANYSIDE) + continue; +#endif if (p->msgid == msgid) return p; } @@ -517,12 +547,17 @@ getph2byid(src, dst, spid) } struct ph2handle * -getph2bysaddr(src, dst) +getph2bysaddr(src, dst, side) struct sockaddr *src, *dst; + int side; { struct ph2handle *p; LIST_FOREACH(p, &ph2tree, chain) { +#ifdef ENABLE_RACOON_OVER_LOOPBACK + if (p->side != side && side != ANYSIDE) + continue; +#endif if (cmpsaddrstrict(src, p->src) == 0 && cmpsaddrstrict(dst, p->dst) == 0) return p; @@ -1128,7 +1163,7 @@ static int revalidate_ph2(struct ph2hand if (iph2->ph1 != NULL) iph1=iph2->ph1; else - iph1=getph1byaddr(iph2->src, iph2->dst, 0); + iph1=getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); if(iph1 != NULL && iph1->rmconf != NULL) { check_level = iph1->rmconf->pcheck_level; diff -up ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback ipsec-tools-0.7.1/src/racoon/pfkey.c --- ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback 2008-07-29 09:57:26.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/pfkey.c 2008-07-29 09:57:26.000000000 +0200 @@ -1264,10 +1264,11 @@ pk_recvupdate(mhp) /* turn off the timer for calling pfkey_timeover() */ SCHED_KILL(iph2->sce); +#ifdef ENABLE_RACOON_OVER_LOOPBACK /* update status */ - /* Do this in pk_recvadd - * iph2->status = PHASE2ST_ESTABLISHED; - */ + if (cmpsaddrstrict(iph2->ph1->local, iph2->ph1->remote) == 0) + iph2->status = PHASE2ST_ESTABLISHED; +#endif #ifdef ENABLE_STATS gettimeofday(&iph2->end, NULL); @@ -1322,6 +1323,12 @@ pk_sendadd(iph2) return -1; } +#ifdef ENABLE_RACOON_OVER_LOOPBACK + /* This prevents adding the same SA twice, since done in update */ + if (cmpsaddrstrict(iph2->ph1->local, iph2->ph1->remote) == 0) + return 0; +#endif + if (iph2->side == INITIATOR) proxy = iph2->ph1->rmconf->support_proxy; else if (iph2->sainfo && iph2->sainfo->id_i) @@ -1764,7 +1771,7 @@ pk_recvacquire(mhp) */ iph2[0] = getph2byid(src, dst, xpl->sadb_x_policy_id); if (iph2[0] == NULL) - iph2[0] = getph2bysaddr(src, dst); + iph2[0] = getph2bysaddr(src, dst, ANYSIDE); if (iph2[0] != NULL) { if (iph2[0]->status < PHASE2ST_ESTABLISHED) { diff -up ipsec-tools-0.7.1/src/racoon/isakmp.c.loopback ipsec-tools-0.7.1/src/racoon/isakmp.c --- ipsec-tools-0.7.1/src/racoon/isakmp.c.loopback 2008-07-11 10:08:41.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/isakmp.c 2008-07-29 11:37:16.000000000 +0200 @@ -387,6 +387,36 @@ end: return(error); } +#ifdef ENABLE_RACOON_OVER_LOOPBACK +/* + * isakmp phase 1 search helper + */ +static struct ph1handle * +isakmp_ph1pickside(iph1_i, iph1_r, local) + struct ph1handle *iph1_i, *iph1_r; + struct sockaddr *local; +{ + if (iph1_i == NULL && iph1_r != NULL) { + if (cmpsaddrstrict(iph1_r->remote, local) != 0) + return iph1_r; + else + return NULL; + } else if (iph1_i != NULL && iph1_r == NULL) { + if (cmpsaddrstrict(iph1_i->remote, local) != 0) + return iph1_i; + else + return NULL; + } else if (iph1_i != NULL && iph1_r != NULL) { + if (iph1_r->status < iph1_i->status) + return iph1_r; + else + return iph1_i; + } + + return NULL; +} +#endif + /* * main processing to handle isakmp payload */ @@ -453,7 +483,15 @@ isakmp_main(msg, remote, local) } } - iph1 = getph1byindex(index); + +#ifdef ENABLE_RACOON_OVER_LOOPBACK + iph1 = isakmp_ph1pickside(getph1byindex(index, INITIATOR), + getph1byindex(index, RESPONDER), + local); +#else + iph1 = getph1byindex(index, ANYSIDE); +#endif + if (iph1 != NULL) { /* validity check */ if (memcmp(&isakmp->r_ck, r_ck0, sizeof(cookie_t)) == 0 && @@ -553,7 +591,15 @@ isakmp_main(msg, remote, local) */ /* search for phase1 handle by index without r_ck */ - iph1 = getph1byindex0(index); +#ifdef ENABLE_RACOON_OVER_LOOPBACK + iph1 = isakmp_ph1pickside( + getph1byindex0(index, INITIATOR), + getph1byindex0(index, RESPONDER), + local); +#else + iph1=getph1byindex0(index, ANYSIDE); +#endif + if (iph1 == NULL) { /*it must be the 1st message from a initiator.*/ if (memcmp(&isakmp->r_ck, r_ck0, @@ -629,7 +675,7 @@ isakmp_main(msg, remote, local) * NOTE: We think such informational exchange should be ignored. */ if (iph1 == NULL) { - iph1 = getph1byindex0(index); + iph1 = getph1byindex0(index, INITIATOR); if (iph1 == NULL) { plog(LLV_ERROR, LOCATION, remote, "unknown Informational " @@ -656,6 +702,9 @@ isakmp_main(msg, remote, local) case ISAKMP_ETYPE_QUICK: { struct ph2handle *iph2; +#ifdef ENABLE_RACOON_OVER_LOOPBACK + struct ph2handle *iph2_i, *iph2_r; +#endif if (iph1 == NULL) { isakmp_info_send_nx(isakmp, remote, local, @@ -688,8 +737,31 @@ isakmp_main(msg, remote, local) return -1; } - /* search isakmp phase 2 stauts record. */ - iph2 = getph2bymsgid(iph1, msgid); + /* search isakmp phase 2 status record. */ +#ifdef ENABLE_RACOON_OVER_LOOPBACK + iph2_i = getph2bymsgid(iph1, msgid, INITIATOR); + iph2_r = getph2bymsgid(iph1, msgid, RESPONDER); + if (iph2_i == NULL && iph2_r != NULL) { + if (cmpsaddrstrict(iph1->remote, local) != 0) + iph2 = iph2_r; + else + iph2 = NULL; + } else if (iph2_i != NULL && iph2_r == NULL) { + if (cmpsaddrstrict(iph1->remote, local) != 0) + iph2 = iph2_i; + else + iph2 = NULL; + } else if (iph2_i != NULL && iph2_r != NULL) { + if (iph2_r->status < iph2_i->status) + iph2 = iph2_r; + else + iph2 = iph2_i; + } else + iph2 = NULL; +#else + iph2 = getph2bymsgid(iph1, msgid, ANYSIDE); +#endif + if (iph2 == NULL) { /* it must be new negotiation as responder */ if (isakmp_ph2begin_r(iph1, msg) < 0) @@ -2165,15 +2237,15 @@ isakmp_post_acquire(iph2) */ #ifdef ENABLE_NATT if (!extract_port(iph2->src) && !extract_port(iph2->dst)) { - if ((iph1 = getph1byaddrwop(iph2->src, iph2->dst)) != NULL) { + if ((iph1 = getph1byaddrwop(iph2->src, iph2->dst, ANYSIDE)) != NULL) { set_port(iph2->src, extract_port(iph1->local)); set_port(iph2->dst, extract_port(iph1->remote)); } } else { - iph1 = getph1byaddr(iph2->src, iph2->dst, 0); + iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); } #else - iph1 = getph1byaddr(iph2->src, iph2->dst, 0); + iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); #endif /* no ISAKMP-SA found. */ @@ -2300,17 +2372,17 @@ isakmp_chkph1there(iph2) #ifdef ENABLE_NATT if (!extract_port(iph2->src) && !extract_port(iph2->dst)) { plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: extract_port.\n"); - if( (iph1 = getph1byaddrwop(iph2->src, iph2->dst)) != NULL){ + if( (iph1 = getph1byaddrwop(iph2->src, iph2->dst, ANYSIDE)) != NULL){ plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: found a ph1 wop.\n"); } } else { plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: searching byaddr.\n"); - iph1 = getph1byaddr(iph2->src, iph2->dst, 0); + iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); if(iph1 != NULL) plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: found byaddr.\n"); } #else - iph1 = getph1byaddr(iph2->src, iph2->dst, 0); + iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); #endif /* XXX Even if ph1 as responder is there, should we not start @@ -2574,7 +2646,7 @@ isakmp_newmsgid2(iph1) do { msgid2 = eay_random(); - } while (getph2bymsgid(iph1, msgid2)); + } while (getph2bymsgid(iph1, msgid2, iph1->side)); return msgid2; } @@ -3189,7 +3261,7 @@ purge_remote(iph1) iph1->status = PHASE1ST_EXPIRED; /* Check if we have another, still valid, phase1 SA. */ - new_iph1 = getph1byaddr(iph1->local, iph1->remote, 1); + new_iph1 = getph1byaddr(iph1->local, iph1->remote, 1, ANYSIDE); /* * Delete all orphaned or binded to the deleting ph1handle phase2 SAs. diff -up ipsec-tools-0.7.1/src/racoon/handler.h.loopback ipsec-tools-0.7.1/src/racoon/handler.h --- ipsec-tools-0.7.1/src/racoon/handler.h.loopback 2008-07-29 09:57:26.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/handler.h 2008-07-29 11:32:03.000000000 +0200 @@ -425,13 +425,13 @@ struct ph1handle; struct ph2handle; struct policyindex; -extern struct ph1handle *getph1byindex __P((isakmp_index *)); -extern struct ph1handle *getph1byindex0 __P((isakmp_index *)); +extern struct ph1handle *getph1byindex __P((isakmp_index *, int)); +extern struct ph1handle *getph1byindex0 __P((isakmp_index *, int)); extern struct ph1handle *getph1byaddr __P((struct sockaddr *, - struct sockaddr *, int)); + struct sockaddr *, int, int)); extern struct ph1handle *getph1byaddrwop __P((struct sockaddr *, - struct sockaddr *)); -extern struct ph1handle *getph1bydstaddrwop __P((struct sockaddr *)); + struct sockaddr *, int)); +extern struct ph1handle *getph1bydstaddrwop __P((struct sockaddr *, int)); #ifdef ENABLE_HYBRID struct ph1handle *getph1bylogin __P((char *)); int purgeph1bylogin __P((char *)); @@ -448,8 +448,9 @@ extern struct ph2handle *getph2byspidx _ extern struct ph2handle *getph2byspid __P((u_int32_t)); extern struct ph2handle *getph2byseq __P((u_int32_t)); extern struct ph2handle *getph2bysaddr __P((struct sockaddr *, - struct sockaddr *)); -extern struct ph2handle *getph2bymsgid __P((struct ph1handle *, u_int32_t)); + struct sockaddr *, int)); +extern struct ph2handle *getph2bymsgid __P((struct ph1handle *, u_int32_t, + int)); extern struct ph2handle *getph2byid __P((struct sockaddr *, struct sockaddr *, u_int32_t)); extern struct ph2handle *getph2bysaidx __P((struct sockaddr *, diff -up ipsec-tools-0.7.1/src/racoon/admin.c.loopback ipsec-tools-0.7.1/src/racoon/admin.c --- ipsec-tools-0.7.1/src/racoon/admin.c.loopback 2008-06-18 09:30:19.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/admin.c 2008-07-29 09:57:26.000000000 +0200 @@ -289,7 +289,7 @@ out2: STRDUP_FATAL(loc); STRDUP_FATAL(rem); - if ((iph1 = getph1byaddrwop(src, dst)) == NULL) { + if ((iph1 = getph1byaddrwop(src, dst, ANYSIDE)) == NULL) { plog(LLV_ERROR, LOCATION, NULL, "phase 1 for %s -> %s not found\n", loc, rem); } else { @@ -340,7 +340,7 @@ out2: plog(LLV_INFO, LOCATION, NULL, "Flushing all SAs for peer %s\n", rem); - while ((iph1 = getph1bydstaddrwop(dst)) != NULL) { + while ((iph1 = getph1bydstaddrwop(dst, ANYSIDE)) != NULL) { loc = racoon_strdup(saddrwop2str(iph1->local)); STRDUP_FATAL(loc); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 29 Aug 2007 04:04:57 -0000 1.12 +++ .cvsignore 29 Jul 2008 12:31:24 -0000 1.13 @@ -1,2 +1 @@ -ipsec-tools-0.6.6.tar.bz2 -ipsec-tools-0.7.tar.bz2 +ipsec-tools-0.7.1.tar.bz2 Index: ipsec-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ipsec-tools.spec 28 Feb 2008 16:07:33 -0000 1.55 +++ ipsec-tools.spec 29 Jul 2008 12:31:24 -0000 1.56 @@ -1,24 +1,21 @@ Name: ipsec-tools -Version: 0.7 -Release: 13%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: Tools for configuring and using IPSEC License: BSD Group: System Environment/Base URL: http://ipsec-tools.sourceforge.net/ -Source: http://prdownload.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.bz2 +Source: ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.7/ipsec-tools-%{version}.tar.bz2 Source1: racoon.conf Source2: psk.txt Source3: p1_up_down Source4: racoon.init -Patch: ipsec-tools-0.7-libs.patch -Patch2: isakmp.c.diff Patch3: ipsec-tools-0.7-acquires.patch -Patch4: ipsec-tools-0.7-loopback.patch +Patch4: ipsec-tools-0.7.1-loopback.patch # the following patches were also submitted upstream: Patch5: ipsec-tools-0.7-iface.patch Patch6: ipsec-tools-0.7-dupsplit.patch Patch7: ipsec-tools-0.7-contextsize.patch -Patch8: ipsec-tools-0.7-newcookie-alen.patch Patch9: ipsec-tools-0.7-splitcidr.patch BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool @@ -37,14 +34,11 @@ %prep %setup -q -%patch -p1 -%patch2 -p1 %patch3 -p1 -b .acquires %patch4 -p1 -b .loopback %patch5 -p1 -b .iface %patch6 -p1 -b .dupsplit %patch7 -p1 -b .ctxsize -%patch8 -p1 -b .cookie %patch9 -p1 -b .splitcidr ./bootstrap @@ -52,7 +46,9 @@ %build source /etc/profile.d/krb5-devel.sh sed -i 's|-Werror||g' configure -CFLAGS="$RPM_OPT_FLAGS" %configure \ +LDFLAGS="-Wl,--as-needed" +export LDFLAGS +%configure \ --with-kernel-headers=/usr/include \ --sysconfdir=/etc/racoon \ --without-readline \ @@ -123,6 +119,9 @@ %config(noreplace) /etc/racoon/racoon.conf %changelog +* Tue Jul 29 2008 Tomas Mraz - 0.7.1-1 +- Update to a new upstream version + * Thu Feb 28 2008 Steve Conklin - 0.7-13 - Resolves bz#273261 remote-access client connection to Cisco ASA Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 29 Aug 2007 04:04:57 -0000 1.12 +++ sources 29 Jul 2008 12:31:24 -0000 1.13 @@ -1 +1 @@ -c0a586924edde35264ecfe94ad1c261f ipsec-tools-0.7.tar.bz2 +30b196a2829556182c39aed9f83c0bbf ipsec-tools-0.7.1.tar.bz2 --- ipsec-tools-0.7-libs.patch DELETED --- --- ipsec-tools-0.7-loopback.patch DELETED --- --- ipsec-tools-0.7-newcookie-alen.patch DELETED --- --- ipsec.h DELETED --- --- isakmp.c.diff DELETED --- --- pfkeyv2.h DELETED --- --- udp.h DELETED --- --- xfrm.h DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 12:36:10 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 12:36:10 GMT Subject: rpms/xcalib/devel xcalib.spec,1.1,1.2 Message-ID: <200807291236.m6TCaAJB021850@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xcalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21812 Modified Files: xcalib.spec Log Message: Update URL Index: xcalib.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcalib/devel/xcalib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xcalib.spec 28 Feb 2008 01:23:07 -0000 1.1 +++ xcalib.spec 29 Jul 2008 12:35:40 -0000 1.2 @@ -5,8 +5,8 @@ Group: System Environment/Libraries License: GPLv2+ -URL: http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/ -# Sources from http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/xcalib-source-%{version}.tar.gz +URL: http://xcalib.sourceforge.net/ +# Sources from http://downloads.sourceforge.net/xcalib/xcalib-source-%{version}.tar.gz Source0: http://kwizart.fedorapeople.org/SOURCES/xcalib-repack-%{version}.tar.bz2 Source10: xcalib-repack.sh Patch0: xcalib-0.8-cflags.patch From fedora-extras-commits at redhat.com Tue Jul 29 12:42:18 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 29 Jul 2008 12:42:18 GMT Subject: rpms/kernel/devel kernel.spec,1.819,1.820 Message-ID: <200807291242.m6TCgIKT022052@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22024 Modified Files: kernel.spec Log Message: remove stale vanilla directories when prepping Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.819 retrieving revision 1.820 diff -u -r1.819 -r1.820 --- kernel.spec 29 Jul 2008 04:16:47 -0000 1.819 +++ kernel.spec 29 Jul 2008 12:41:48 -0000 1.820 @@ -858,12 +858,25 @@ if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then if [ -d kernel-%{kversion}/vanilla-%{kversion} ]; then + cd kernel-%{kversion} + # any vanilla-* directories other than the base one are stale + oldvanilla=$(ls -d vanilla-* | grep -v "^vanilla-%{kversion}$") + # Just in case we ctrl-c'd a prep already + rm -rf deleteme.vanilla-* + for staledir in $oldvanilla ; do + # Move away the stale away, and delete in background. + mv $staledir deleteme.$staledir + rm -rf deleteme.$staledir & + done + else + # Ok, first time we do a make prep. rm -f pax_global_header %setup -q -n kernel-%{kversion} -c mv linux-%{kversion} vanilla-%{kversion} + fi %if "%{kversion}" != "%{vanillaversion}" @@ -890,7 +903,7 @@ %endif %endif - cd .. + cd .. else # We already have a vanilla dir. From fedora-extras-commits at redhat.com Tue Jul 29 12:46:51 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 29 Jul 2008 12:46:51 GMT Subject: rpms/pigment/devel .cvsignore, 1.7, 1.8 pigment.spec, 1.8, 1.9 sources, 1.7, 1.8 pigment-0.3.6-unit-test-rounding-fix.patch, 1.1, NONE Message-ID: <200807291246.m6TCkpD5022194@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22173 Modified Files: .cvsignore pigment.spec sources Removed Files: pigment-0.3.6-unit-test-rounding-fix.patch Log Message: Update to 0.3.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Jul 2008 14:58:46 -0000 1.7 +++ .cvsignore 29 Jul 2008 12:46:21 -0000 1.8 @@ -1 +1 @@ -pigment-0.3.6.tar.bz2 +pigment-0.3.7.tar.bz2 Index: pigment.spec =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/pigment.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pigment.spec 14 Jul 2008 14:58:46 -0000 1.8 +++ pigment.spec 29 Jul 2008 12:46:21 -0000 1.9 @@ -1,12 +1,11 @@ Summary: Media Center Toolkit Name: pigment -Version: 0.3.6 -Release: 4%{?dist} +Version: 0.3.7 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://elisa.fluendo.com/ Source: http://elisa.fluendo.com/static/download/pigment/pigment-%{version}.tar.bz2 -Patch0: pigment-0.3.6-unit-test-rounding-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel BuildRequires: gtk2-devel @@ -45,7 +44,6 @@ %prep %setup -q -%patch0 -p0 # Required to get 0.3.6 working. Some lib64 problems. autoreconf @@ -97,6 +95,9 @@ %changelog +* Tue Jul 29 2008 Matthias Saou 0.3.7-1 +- Update to 0.3.7. + * Mon Jul 14 2008 Matthias Saou 0.3.6-4 - Include upstream patch to fix "make check". - Run "autoreconf", nothing works when libdir is set to /usr/lib64 otherwise. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Jul 2008 14:58:46 -0000 1.7 +++ sources 29 Jul 2008 12:46:21 -0000 1.8 @@ -1 +1 @@ -fc74b1ca4c9f3f1b9fe4f1f8cd2b43c9 pigment-0.3.6.tar.bz2 +ba850b6e6c3c9ed0d9bee910ad0bb1fb pigment-0.3.7.tar.bz2 --- pigment-0.3.6-unit-test-rounding-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 12:52:45 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 12:52:45 GMT Subject: rpms/trac/EL-5 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 trac.spec, 1.16, 1.17 Message-ID: <200807291252.m6TCqjTL022303@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/trac/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22275 Modified Files: .cvsignore sources trac.spec Log Message: * Sun Jun 22 2008 Jeffrey C. Ollie - 0.10.5-1 - Update to 0.10.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trac/EL-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Jul 2007 23:55:45 -0000 1.11 +++ .cvsignore 29 Jul 2008 12:52:15 -0000 1.12 @@ -1 +1 @@ -trac-0.10.4.tar.gz +trac-0.10.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trac/EL-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Jul 2007 23:55:45 -0000 1.11 +++ sources 29 Jul 2008 12:52:15 -0000 1.12 @@ -1 +1 @@ -52a3a21ad9faafc3b59cbeb87d5a69d2 trac-0.10.4.tar.gz +614aa61af201b33f8cd292344f434dbb trac-0.10.5.tar.gz Index: trac.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac/EL-5/trac.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- trac.spec 22 Jul 2007 23:55:45 -0000 1.16 +++ trac.spec 29 Jul 2008 12:52:15 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: trac -Version: 0.10.4 +Version: 0.10.5 Release: 1%{?dist} Summary: Enhanced wiki and issue tracking system Group: Applications/Internet @@ -65,51 +65,7 @@ %doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/ %{_bindir}/trac-admin %{_sbindir}/tracd -%dir %{python_sitelib}/trac/ -%{python_sitelib}/trac/*.py -%{python_sitelib}/trac/*.pyc -%{python_sitelib}/trac/*.pyo -%dir %{python_sitelib}/trac/mimeview/ -%{python_sitelib}/trac/mimeview/*.py -%{python_sitelib}/trac/mimeview/*.pyc -%{python_sitelib}/trac/mimeview/*.pyo -%dir %{python_sitelib}/trac/scripts/ -%{python_sitelib}/trac/scripts/*.py -%{python_sitelib}/trac/scripts/*.pyc -%{python_sitelib}/trac/scripts/*.pyo -%dir %{python_sitelib}/trac/ticket/ -%{python_sitelib}/trac/ticket/*.py -%{python_sitelib}/trac/ticket/*.pyc -%{python_sitelib}/trac/ticket/*.pyo -%dir %{python_sitelib}/trac/upgrades/ -%{python_sitelib}/trac/upgrades/*.py -%{python_sitelib}/trac/upgrades/*.pyc -%{python_sitelib}/trac/upgrades/*.pyo -%dir %{python_sitelib}/trac/versioncontrol/ -%{python_sitelib}/trac/versioncontrol/*.py -%{python_sitelib}/trac/versioncontrol/*.pyc -%{python_sitelib}/trac/versioncontrol/*.pyo -%dir %{python_sitelib}/trac/versioncontrol/web_ui/ -%{python_sitelib}/trac/versioncontrol/web_ui/*.py -%{python_sitelib}/trac/versioncontrol/web_ui/*.pyc -%{python_sitelib}/trac/versioncontrol/web_ui/*.pyo -%dir %{python_sitelib}/trac/web/ -%{python_sitelib}/trac/web/*.py -%{python_sitelib}/trac/web/*.pyc -%{python_sitelib}/trac/web/*.pyo -%dir %{python_sitelib}/trac/wiki/ -%{python_sitelib}/trac/wiki/*.py -%{python_sitelib}/trac/wiki/*.pyc -%{python_sitelib}/trac/wiki/*.pyo -%dir %{python_sitelib}/trac/db -%{python_sitelib}/trac/db/*.py -%{python_sitelib}/trac/db/*.pyc -%{python_sitelib}/trac/db/*.pyo -%dir %{python_sitelib}/trac/util -%{python_sitelib}/trac/util/*.py -%{python_sitelib}/trac/util/*.pyc -%{python_sitelib}/trac/util/*.pyo - +%{python_sitelib}/* %config(noreplace) /etc/httpd/conf.d/trac.conf %{_datadir}/trac/ %{_var}/www/cgi-bin/trac.cgi @@ -118,6 +74,12 @@ %{_mandir}/man8/tracd.8* %changelog +* Sun Jun 22 2008 Jeffrey C. Ollie - 0.10.5-1 +- Update to 0.10.5 + +* Thu Jan 3 2008 Jeffrey C. Ollie - 0.10.4-2 +- Simplify files section so that it picks up the egg info files. + * Thu May 3 2007 Jeffrey C. Ollie - 0.10.4-1 - Update to 0.10.4 From fedora-extras-commits at redhat.com Tue Jul 29 12:54:07 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 12:54:07 GMT Subject: rpms/trac/F-8 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 trac.spec, 1.18, 1.19 Message-ID: <200807291254.m6TCs7eI022413@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/trac/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22382 Modified Files: .cvsignore sources trac.spec Log Message: * Sun Jun 22 2008 Jeffrey C. Ollie - 0.10.5-1 - Update to 0.10.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trac/F-8/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 May 2007 02:37:26 -0000 1.11 +++ .cvsignore 29 Jul 2008 12:53:36 -0000 1.12 @@ -1 +1 @@ -trac-0.10.4.tar.gz +trac-0.10.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trac/F-8/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 May 2007 02:37:26 -0000 1.11 +++ sources 29 Jul 2008 12:53:36 -0000 1.12 @@ -1 +1 @@ -52a3a21ad9faafc3b59cbeb87d5a69d2 trac-0.10.4.tar.gz +614aa61af201b33f8cd292344f434dbb trac-0.10.5.tar.gz Index: trac.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac/F-8/trac.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- trac.spec 4 May 2007 02:37:26 -0000 1.18 +++ trac.spec 29 Jul 2008 12:53:36 -0000 1.19 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: trac -Version: 0.10.4 +Version: 0.10.5 Release: 1%{?dist} Summary: Enhanced wiki and issue tracking system Group: Applications/Internet @@ -65,51 +65,7 @@ %doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/ %{_bindir}/trac-admin %{_sbindir}/tracd -%dir %{python_sitelib}/trac/ -%{python_sitelib}/trac/*.py -%{python_sitelib}/trac/*.pyc -%{python_sitelib}/trac/*.pyo -%dir %{python_sitelib}/trac/mimeview/ -%{python_sitelib}/trac/mimeview/*.py -%{python_sitelib}/trac/mimeview/*.pyc -%{python_sitelib}/trac/mimeview/*.pyo -%dir %{python_sitelib}/trac/scripts/ -%{python_sitelib}/trac/scripts/*.py -%{python_sitelib}/trac/scripts/*.pyc -%{python_sitelib}/trac/scripts/*.pyo -%dir %{python_sitelib}/trac/ticket/ -%{python_sitelib}/trac/ticket/*.py -%{python_sitelib}/trac/ticket/*.pyc -%{python_sitelib}/trac/ticket/*.pyo -%dir %{python_sitelib}/trac/upgrades/ -%{python_sitelib}/trac/upgrades/*.py -%{python_sitelib}/trac/upgrades/*.pyc -%{python_sitelib}/trac/upgrades/*.pyo -%dir %{python_sitelib}/trac/versioncontrol/ -%{python_sitelib}/trac/versioncontrol/*.py -%{python_sitelib}/trac/versioncontrol/*.pyc -%{python_sitelib}/trac/versioncontrol/*.pyo -%dir %{python_sitelib}/trac/versioncontrol/web_ui/ -%{python_sitelib}/trac/versioncontrol/web_ui/*.py -%{python_sitelib}/trac/versioncontrol/web_ui/*.pyc -%{python_sitelib}/trac/versioncontrol/web_ui/*.pyo -%dir %{python_sitelib}/trac/web/ -%{python_sitelib}/trac/web/*.py -%{python_sitelib}/trac/web/*.pyc -%{python_sitelib}/trac/web/*.pyo -%dir %{python_sitelib}/trac/wiki/ -%{python_sitelib}/trac/wiki/*.py -%{python_sitelib}/trac/wiki/*.pyc -%{python_sitelib}/trac/wiki/*.pyo -%dir %{python_sitelib}/trac/db -%{python_sitelib}/trac/db/*.py -%{python_sitelib}/trac/db/*.pyc -%{python_sitelib}/trac/db/*.pyo -%dir %{python_sitelib}/trac/util -%{python_sitelib}/trac/util/*.py -%{python_sitelib}/trac/util/*.pyc -%{python_sitelib}/trac/util/*.pyo - +%{python_sitelib}/* %config(noreplace) /etc/httpd/conf.d/trac.conf %{_datadir}/trac/ %{_var}/www/cgi-bin/trac.cgi @@ -118,6 +74,12 @@ %{_mandir}/man8/tracd.8* %changelog +* Sun Jun 22 2008 Jeffrey C. Ollie - 0.10.5-1 +- Update to 0.10.5 + +* Thu Jan 3 2008 Jeffrey C. Ollie - 0.10.4-2 +- Simplify files section so that it picks up the egg info files. + * Thu May 3 2007 Jeffrey C. Ollie - 0.10.4-1 - Update to 0.10.4 From fedora-extras-commits at redhat.com Tue Jul 29 13:01:14 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 29 Jul 2008 13:01:14 GMT Subject: rpms/pigment-python/devel .cvsignore, 1.4, 1.5 pigment-python.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200807291301.m6TD1EQv029230@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22594 Modified Files: .cvsignore pigment-python.spec sources Log Message: Update to 0.3.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Jul 2008 14:59:34 -0000 1.4 +++ .cvsignore 29 Jul 2008 13:00:44 -0000 1.5 @@ -1 +1 @@ -pigment-python-0.3.4.tar.bz2 +pigment-python-0.3.5.tar.bz2 Index: pigment-python.spec =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/pigment-python.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pigment-python.spec 14 Jul 2008 14:59:34 -0000 1.5 +++ pigment-python.spec 29 Jul 2008 13:00:44 -0000 1.6 @@ -3,7 +3,7 @@ Summary: Python bindings to the Pigment Media Center Toolkit Name: pigment-python -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia @@ -12,9 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gstreamer-python Requires: pygtk2 -Requires: pigment >= 0.3.6 +Requires: pigment >= 0.3.7 BuildRequires: glib2-devel -BuildRequires: pigment-devel >= 0.3.6 +BuildRequires: pigment-devel >= 0.3.7 BuildRequires: python-devel BuildRequires: pygtk2-devel BuildRequires: gstreamer-devel @@ -66,6 +66,9 @@ %changelog +* Tue Jul 29 2008 Matthias Saou 0.3.5-1 +- Update to 0.3.5. + * Fri Jul 11 2008 Matthias Saou 0.3.4-1 - Update to 0.3.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Jul 2008 14:59:34 -0000 1.4 +++ sources 29 Jul 2008 13:00:44 -0000 1.5 @@ -1 +1 @@ -880288a8dc070b8daed961dca3317b42 pigment-python-0.3.4.tar.bz2 +c668fd370c022e1dc1d2ce300732913d pigment-python-0.3.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 13:04:44 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Tue, 29 Jul 2008 13:04:44 GMT Subject: rpms/htdig/devel htdig.spec, 1.46, 1.47 htdig-3.2.0b3-glibc222.patch, 1.2, NONE htdig-3.2.0b4-h_hash.patch, 1.1, NONE Message-ID: <200807291304.m6TD4iLr029327@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/htdig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29299 Modified Files: htdig.spec Removed Files: htdig-3.2.0b3-glibc222.patch htdig-3.2.0b4-h_hash.patch Log Message: - removed unneded patches - htdig-3.2.0b3-glibc222.patch and htdig-3.2.0b4-h_hash.patch Index: htdig.spec =================================================================== RCS file: /cvs/pkgs/rpms/htdig/devel/htdig.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- htdig.spec 28 Jul 2008 14:35:11 -0000 1.46 +++ htdig.spec 29 Jul 2008 13:04:14 -0000 1.47 @@ -5,7 +5,7 @@ Summary: ht://Dig - Web search engine Name: htdig Version: 3.2.0 -Release: 0.2.b6%{?dist} +Release: 0.3.b6%{?dist} Epoch: 4 License: GPLv2 Group: Applications/Internet @@ -14,9 +14,7 @@ Source: http://www.htdig.org/files/%{name}-%{version}b6.tar.bz2 Source1: htdig.conf Patch: htdig-3.1.5-rh.patch -Patch1: htdig-3.2.0b3-glibc222.patch Patch2: htdig-3.2.0b4-xopen.patch -Patch3: htdig-3.2.0b4-h_hash.patch Patch4: htdig-3.2.0b5-overflow.patch Patch5: htdig-3.2.0b6-robots.patch Patch6: htdig-3.2.0b6-unescaped_output.patch @@ -71,9 +69,7 @@ %prep %setup -q -n %{name}-%{version}b6 %patch -p1 -b .rh -%patch1 -p1 -b .glibc222 %patch2 -p1 -b .xopen -%patch3 -p1 -b .h_hash %patch4 -p1 -b .overflow %patch5 -p1 -b .robots %patch6 -p1 -b .unescaped_output @@ -157,6 +153,10 @@ %endif %changelog +* Tue Jul 29 2008 Adam Tkac 4:3.2.0-0.3.b6 +- removed unneded patches + - htdig-3.2.0b3-glibc222.patch and htdig-3.2.0b4-h_hash.patch + * Mon Jul 28 2008 Adam Tkac 4:3.2.0-0.2.b6 - mark configuration files as noreplace --- htdig-3.2.0b3-glibc222.patch DELETED --- --- htdig-3.2.0b4-h_hash.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 13:06:01 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 13:06:01 GMT Subject: rpms/trac/F-9 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 trac.spec, 1.19, 1.20 Message-ID: <200807291306.m6TD610j029450@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/trac/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29400 Modified Files: .cvsignore sources trac.spec Log Message: * Sun Jun 22 2008 Jeffrey C. Ollie - 0.10.5-1 - Update to 0.10.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trac/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 May 2007 02:37:26 -0000 1.11 +++ .cvsignore 29 Jul 2008 13:05:31 -0000 1.12 @@ -1 +1 @@ -trac-0.10.4.tar.gz +trac-0.10.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trac/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 May 2007 02:37:26 -0000 1.11 +++ sources 29 Jul 2008 13:05:31 -0000 1.12 @@ -1 +1 @@ -52a3a21ad9faafc3b59cbeb87d5a69d2 trac-0.10.4.tar.gz +614aa61af201b33f8cd292344f434dbb trac-0.10.5.tar.gz Index: trac.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac/F-9/trac.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- trac.spec 3 Jan 2008 15:10:06 -0000 1.19 +++ trac.spec 29 Jul 2008 13:05:31 -0000 1.20 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: trac -Version: 0.10.4 -Release: 2%{?dist} +Version: 0.10.5 +Release: 1%{?dist} Summary: Enhanced wiki and issue tracking system Group: Applications/Internet License: BSD @@ -74,6 +74,9 @@ %{_mandir}/man8/tracd.8* %changelog +* Sun Jun 22 2008 Jeffrey C. Ollie - 0.10.5-1 +- Update to 0.10.5 + * Thu Jan 3 2008 Jeffrey C. Ollie - 0.10.4-2 - Simplify files section so that it picks up the egg info files. From fedora-extras-commits at redhat.com Tue Jul 29 13:12:14 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 29 Jul 2008 13:12:14 GMT Subject: rpms/kdeutils/devel .cvsignore,1.51,1.52 kdeutils.spec,1.137,1.138 Message-ID: <200807291312.m6TDCETw029662@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29622/devel Modified Files: .cvsignore kdeutils.spec Log Message: * Tue Jul 29 2008 Rex Dieter 4.1.0-1.1 - omit printer_applet from F-9 build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 23 Jul 2008 15:54:11 -0000 1.51 +++ .cvsignore 29 Jul 2008 13:11:43 -0000 1.52 @@ -1,2 +1,2 @@ -kdeutils-4.0.99.tar.bz2 kdeutils-4.1.0.tar.bz2 +kdepim-4.1.0.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- kdeutils.spec 23 Jul 2008 15:54:11 -0000 1.137 +++ kdeutils.spec 29 Jul 2008 13:11:43 -0000 1.138 @@ -1,6 +1,8 @@ +%if 0%{?fedora} > 9 # include new PyKDE4 printer applet %define printer_applet 1 +%endif %if 0%{?fedora} == 9 # continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there) @@ -10,7 +12,7 @@ Name: kdeutils Epoch: 6 Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: K Desktop Environment - Utilities Group: Applications/System @@ -208,6 +210,9 @@ %changelog +* Tue Jul 29 2008 Rex Dieter 4.1.0-1.1 +- omit printer_applet from F-9 build + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Tue Jul 29 13:12:13 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 29 Jul 2008 13:12:13 GMT Subject: rpms/kdeutils/F-9 kdeutils.spec,1.126,1.127 Message-ID: <200807291312.m6TDCD7Y029658@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29622/F-9 Modified Files: kdeutils.spec Log Message: * Tue Jul 29 2008 Rex Dieter 4.1.0-1.1 - omit printer_applet from F-9 build Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- kdeutils.spec 25 Jul 2008 17:08:35 -0000 1.126 +++ kdeutils.spec 29 Jul 2008 13:11:43 -0000 1.127 @@ -1,6 +1,8 @@ +%if 0%{?fedora} > 9 # include new PyKDE4 printer applet %define printer_applet 1 +%endif %if 0%{?fedora} == 9 # continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there) @@ -10,7 +12,7 @@ Name: kdeutils Epoch: 6 Version: 4.1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: K Desktop Environment - Utilities Group: Applications/System @@ -208,6 +210,9 @@ %changelog +* Tue Jul 29 2008 Rex Dieter 4.1.0-1.1 +- omit printer_applet from F-9 build + * Wed Jul 23 2008 Than Ngo 4.1.0-1 - 4.1.0 From fedora-extras-commits at redhat.com Tue Jul 29 13:23:16 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 13:23:16 GMT Subject: rpms/libselinux/devel rubytest.rb, NONE, 1.1 .cvsignore, 1.172, 1.173 libselinux-rhat.patch, 1.157, 1.158 libselinux.spec, 1.334, 1.335 sources, 1.174, 1.175 Message-ID: <200807291323.m6TDNGgF029971@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29925 Modified Files: .cvsignore libselinux-rhat.patch libselinux.spec sources Added Files: rubytest.rb Log Message: * Tue Jul 29 2008 Dan Walsh - 2.0.69-1 - Update to Upstream * Handle duplicate file context regexes as a fatal error from Stephen Smalley. This prevents adding them via semanage. * Fix audit2why shadowed variables from Stephen Smalley. * Note that freecon NULL is legal in man page from Karel Zak. --- NEW FILE rubytest.rb --- require 'selinux' print "selinux\n" print "Is selinux enabled? " + Selinux.is_selinux_enabled().to_s + "\n" print "Is selinux enforce? " + Selinux.security_getenforce().to_s + "\n" print "Setfscreatecon? " + Selinux.setfscreatecon("system_u:object_r:etc_t:s0").to_s + "\n" print "/etc -> " + Selinux.matchpathcon("/etc", 0)[1] + "\n" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- .cvsignore 22 Jun 2008 13:48:37 -0000 1.172 +++ .cvsignore 29 Jul 2008 13:22:45 -0000 1.173 @@ -153,3 +153,4 @@ libselinux-2.0.64.tgz libselinux-2.0.65.tgz libselinux-2.0.67.tgz +libselinux-2.0.69.tgz libselinux-rhat.patch: Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- libselinux-rhat.patch 9 Jul 2008 20:57:21 -0000 1.157 +++ libselinux-rhat.patch 29 Jul 2008 13:22:45 -0000 1.158 @@ -1,18 +1,3 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/freecon.3 libselinux-2.0.67/man/man3/freecon.3 ---- nsalibselinux/man/man3/freecon.3 2008-06-12 23:25:12.000000000 -0400 -+++ libselinux-2.0.67/man/man3/freecon.3 2008-07-09 16:52:33.000000000 -0400 -@@ -15,6 +15,11 @@ - .B freeconary - frees the memory allocated for a context array. - -+If -+.I con -+is NULL, no operation is performed. -+ -+ - .SH "SEE ALSO" - .BR selinux "(8)" - diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.67/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 +++ libselinux-2.0.67/man/man8/selinuxconlist.8 2008-07-09 16:52:33.000000000 -0400 @@ -156,46 +141,17 @@ indent: ../../scripts/Lindent $(filter-out $(GENERATED),$(wildcard *.[ch])) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.67/src/audit2why.c ---- nsalibselinux/src/audit2why.c 2008-06-12 23:25:14.000000000 -0400 -+++ libselinux-2.0.67/src/audit2why.c 2008-07-09 16:52:33.000000000 -0400 -@@ -55,7 +55,7 @@ - return 0; - } - --static int check_booleans(struct avc_t *avc, struct boolean_t **bools) -+static int check_booleans(struct boolean_t **bools) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.67/src/callbacks.c +--- nsalibselinux/src/callbacks.c 2008-06-12 23:25:14.000000000 -0400 ++++ libselinux-2.0.67/src/callbacks.c 2008-07-18 11:15:56.000000000 -0400 +@@ -16,6 +16,7 @@ { - char errormsg[PATH_MAX]; - struct sepol_av_decision avd; -@@ -376,7 +376,7 @@ - avc->tsid = tsid; - avc->tclass = tclass; - avc->av = av; -- if (check_booleans(avc, &bools) == 0) { -+ if (check_booleans(&bools) == 0) { - if (av & ~avd.auditdeny) { - RETURN(DONTAUDIT) - } else { -@@ -390,15 +390,15 @@ - len++; b++; - } - b = bools; -- PyObject *boollist = PyTuple_New(len); -+ PyObject *outboollist = PyTuple_New(len); - len=0; - while(b->name) { - PyObject *bool = Py_BuildValue("(si)", b->name, b->active); -- PyTuple_SetItem(boollist, len++, bool); -+ PyTuple_SetItem(outboollist, len++, bool); - b++; - } - free(bools); -- PyTuple_SetItem(result, 1, boollist); -+ PyTuple_SetItem(result, 1, outboollist); - return result; - } - } + int rc; + va_list ap; ++ if (is_selinux_enabled() == 0) return 0; + va_start(ap, fmt); + rc = vfprintf(stderr, fmt, ap); + va_end(ap); diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.67/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2008-06-12 23:25:14.000000000 -0400 +++ libselinux-2.0.67/src/matchpathcon.c 2008-07-09 16:52:33.000000000 -0400 Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- libselinux.spec 9 Jul 2008 20:57:21 -0000 1.334 +++ libselinux.spec 29 Jul 2008 13:22:45 -0000 1.335 @@ -4,8 +4,8 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.67 -Release: 4%{?dist} +Version: 2.0.69 +Release: 1%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -150,6 +150,13 @@ %{ruby_sitearch}/selinux.so %changelog +* Tue Jul 29 2008 Dan Walsh - 2.0.69-1 +- Update to Upstream + * Handle duplicate file context regexes as a fatal error from Stephen Smalley. + This prevents adding them via semanage. + * Fix audit2why shadowed variables from Stephen Smalley. + * Note that freecon NULL is legal in man page from Karel Zak. + * Wed Jul 9 2008 Dan Walsh - 2.0.67-4 - Add ruby support for puppet Index: sources =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/sources,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- sources 22 Jun 2008 13:48:37 -0000 1.174 +++ sources 29 Jul 2008 13:22:45 -0000 1.175 @@ -1 +1 @@ -76f43d37b71d72ada3f5f698ece19bde libselinux-2.0.67.tgz +df1da9cc1131fa5ce102928ce1cd910b libselinux-2.0.69.tgz From fedora-extras-commits at redhat.com Tue Jul 29 13:25:42 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 13:25:42 GMT Subject: rpms/libsemanage/devel .cvsignore, 1.93, 1.94 libsemanage-rhat.patch, 1.35, 1.36 libsemanage.spec, 1.157, 1.158 sources, 1.95, 1.96 Message-ID: <200807291325.m6TDPgdp030103@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsemanage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30067 Modified Files: .cvsignore libsemanage-rhat.patch libsemanage.spec sources Log Message: * Wed Jul 29 2008 Dan Walsh - 2.0.26-1 - Update to upstream * Fix bug in genhomedircon fcontext matches logic from Dan Walsh. Strip any trailing slash before appending /*$. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- .cvsignore 6 May 2008 21:38:01 -0000 1.93 +++ .cvsignore 29 Jul 2008 13:25:12 -0000 1.94 @@ -99,3 +99,4 @@ libsemanage-2.0.23.tgz libsemanage-2.0.24.tgz libsemanage-2.0.25.tgz +libsemanage-2.0.26.tgz libsemanage-rhat.patch: Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- libsemanage-rhat.patch 17 Jul 2008 18:35:34 -0000 1.35 +++ libsemanage-rhat.patch 29 Jul 2008 13:25:12 -0000 1.36 @@ -1,19 +1,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.25/src/genhomedircon.c ---- nsalibsemanage/src/genhomedircon.c 2008-06-12 23:25:16.000000000 -0400 +--- nsalibsemanage/src/genhomedircon.c 2008-07-29 09:15:38.000000000 -0400 +++ libsemanage-2.0.25/src/genhomedircon.c 2008-07-17 14:32:45.000000000 -0400 -@@ -192,6 +193,11 @@ - goto done; - } - -+ if (ustr_cmp_suffix_cstr_eq(expr, "/")) { -+ if (!ustr_del(&expr, 1)) -+ goto done; -+ } -+ - /* Append pattern to eat up trailing slashes */ - if (!ustr_add_cstr(&expr, "/*$")) - goto done; -@@ -482,7 +488,6 @@ +@@ -487,7 +488,6 @@ const char *role_prefix) { replacement_pair_t repl[] = { @@ -21,7 +9,7 @@ {.search_for = TEMPLATE_HOME_DIR,.replace_with = home}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, {NULL, NULL} -@@ -542,7 +547,6 @@ +@@ -547,7 +547,6 @@ replacement_pair_t repl[] = { {.search_for = TEMPLATE_USER,.replace_with = user}, {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, Index: libsemanage.spec =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- libsemanage.spec 17 Jul 2008 18:35:34 -0000 1.157 +++ libsemanage.spec 29 Jul 2008 13:25:12 -0000 1.158 @@ -2,8 +2,8 @@ %define libselinuxver 2.0.0-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 2.0.25 -Release: 3%{?dist} +Version: 2.0.26 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz @@ -78,6 +78,11 @@ %{_mandir}/man3/* %changelog +* Wed Jul 29 2008 Dan Walsh - 2.0.26-1 +- Update to upstream + * Fix bug in genhomedircon fcontext matches logic from Dan Walsh. + Strip any trailing slash before appending /*$. + * Thu Jun 17 2008 Dan Walsh - 2.0.25-3 - Another fix for genhomedircon Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- sources 6 May 2008 21:38:01 -0000 1.95 +++ sources 29 Jul 2008 13:25:12 -0000 1.96 @@ -1 +1 @@ -d7fd8bb8e57bf22060d77ed2e97143e2 libsemanage-2.0.25.tgz +024d7285851295f989fcf93b336fccb9 libsemanage-2.0.26.tgz From fedora-extras-commits at redhat.com Tue Jul 29 13:31:28 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 13:31:28 GMT Subject: rpms/policycoreutils/devel .cvsignore, 1.183, 1.184 policycoreutils-po.patch, 1.36, 1.37 policycoreutils-rhat.patch, 1.377, 1.378 policycoreutils-sepolgen.patch, 1.13, 1.14 policycoreutils.spec, 1.540, 1.541 sources, 1.188, 1.189 Message-ID: <200807291331.m6TDVS0F030384@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30314 Modified Files: .cvsignore policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils-sepolgen.patch policycoreutils.spec sources Log Message: * Tue Jul 29 2008 Dan Walsh 2.0.52-6 - Fix boolean handling - Upgrade to latest sepolgen - Update po patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- .cvsignore 2 Jul 2008 21:22:58 -0000 1.183 +++ .cvsignore 29 Jul 2008 13:30:54 -0000 1.184 @@ -183,3 +183,4 @@ sepolgen-1.0.12.tgz policycoreutils-2.0.51.tgz policycoreutils-2.0.52.tgz +sepolgen-1.0.13.tgz policycoreutils-po.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.36 -r 1.37 policycoreutils-po.patch Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- policycoreutils-po.patch 8 Jul 2008 12:58:55 -0000 1.36 +++ policycoreutils-po.patch 29 Jul 2008 13:30:54 -0000 1.37 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.52/po/.cvsignore --- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/po/.cvsignore 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/.cvsignore 2008-07-29 09:06:29.000000000 -0400 @@ -0,0 +1,16 @@ +*.gmo +*.mo @@ -20,7 +20,7 @@ +stamp-it diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.52/po/Makefile --- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/Makefile 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/Makefile 2008-07-29 09:06:29.000000000 -0400 @@ -23,20 +23,61 @@ POFILES = $(wildcard *.po) MOFILES = $(patsubst %.po,%.mo,$(POFILES)) @@ -102,7 +102,7 @@ l=`basename $$n .mo`; \ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.52/po/POTFILES --- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/POTFILES 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES 2008-07-29 09:06:29.000000000 -0400 @@ -1,10 +1,54 @@ - ../load_policy/load_policy.c \ - ../newrole/newrole.c \ @@ -168,7 +168,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.52/po/POTFILES.in --- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/POTFILES.in 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES.in 2008-07-29 09:06:29.000000000 -0400 @@ -2,9 +2,7 @@ run_init/run_init.c semodule_link/semodule_link.c @@ -230,7 +230,7 @@ secon/secon.c diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.52/po/af.po --- nsapolicycoreutils/po/af.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/af.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/af.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -4004,7 +4004,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.52/po/am.po --- nsapolicycoreutils/po/am.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/am.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/am.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -7778,7 +7778,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.52/po/ar.po --- nsapolicycoreutils/po/ar.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/ar.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/ar.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -11552,7 +11552,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.52/po/as.po --- nsapolicycoreutils/po/as.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/as.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/as.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,3566 @@ # translation of as.po to Assamese # This file is distributed under the same license as the PACKAGE package. @@ -15834,7 +15834,7 @@ +#~ msgstr "????????????" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.52/po/autom4te.cache/requests --- nsapolicycoreutils/po/autom4te.cache/requests 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/po/autom4te.cache/requests 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/autom4te.cache/requests 2008-07-29 09:06:29.000000000 -0400 @@ -0,0 +1,63 @@ +# This file was generated. +# It contains the lists of macros which have been traced. @@ -15901,7 +15901,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.52/po/be.po --- nsapolicycoreutils/po/be.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/be.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/be.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -19675,7 +19675,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.52/po/bg.po --- nsapolicycoreutils/po/bg.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/bg.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/bg.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,3877 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -24324,7 +24324,7 @@ +#~ msgstr "???????????? ???? ?????? root ???? ???? ???????????????????? %s." diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.52/po/bn.po --- nsapolicycoreutils/po/bn.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/bn.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -28098,7 +28098,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.52/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/bn_IN.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn_IN.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1079 +1,3401 @@ -# translation of bn_IN.po to Bengali India -# translation of bn_IN.po to Bangla (INDIA) @@ -32168,7 +32168,7 @@ +#~ "Disabled\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.52/po/bs.po --- nsapolicycoreutils/po/bs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/bs.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/bs.po 2008-07-29 09:29:36.000000000 -0400 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: bs\n" @@ -36291,7 +36291,7 @@ +#~ msgstr "Opciona gre??ka: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.52/po/ca.po --- nsapolicycoreutils/po/ca.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ca.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ca.po 2008-07-29 09:29:36.000000000 -0400 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -40366,7 +40366,7 @@ +#~ msgstr "Error en les opcions: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.52/po/cs.po --- nsapolicycoreutils/po/cs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/cs.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/cs.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,8926 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -49911,7 +49911,7 @@ +#~ msgstr "Ulo??it na _disketu" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.52/po/cy.po --- nsapolicycoreutils/po/cy.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/cy.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/cy.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -53685,7 +53685,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.52/po/da.po --- nsapolicycoreutils/po/da.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/da.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/da.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1042 +1,3260 @@ +# translation of da.po to # Danish messages for policycoreutils. @@ -57602,8 +57602,8 @@ +#~ msgstr "Flagfejl: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.52/po/de.po --- nsapolicycoreutils/po/de.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/de.po 2008-07-08 08:47:29.000000000 -0400 -@@ -1,1067 +1,3455 @@ ++++ policycoreutils-2.0.52/po/de.po 2008-07-29 09:29:36.000000000 -0400 +@@ -1,1067 +1,3453 @@ -# translation of de.po to +# translation of policycoreutils.HEAD.de.po to # translation of de.po to @@ -57628,8 +57628,8 @@ -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -"PO-Revision-Date: 2006-11-22 09:27+1000\n" -"Last-Translator: Timo Trinks \n" -+"POT-Creation-Date: 2008-07-07 04:04+0000\n" -+"PO-Revision-Date: 2008-07-07 12:02+0100\n" ++"POT-Creation-Date: 2008-07-22 02:41+0000\n" ++"PO-Revision-Date: 2008-07-22 09:10+0100\n" +"Last-Translator: Fabian Affolter \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -57777,7 +57777,6 @@ +msgstr "%s ist nicht in ??bersetzungen festgelegt" + +#: ../semanage/seobject.py:266 -+#, fuzzy +msgid "Permissive Types" +msgstr "Permissive Typen" + @@ -61510,7 +61509,6 @@ [...8640 lines suppressed...] -+ +#~ msgid "Requires 2 or more arguments" +#~ msgstr "Requer 2 ou mais argumentos" -+ +#~ msgid "%s not defined" +#~ msgstr "%s n??o definido" -+ +#~ msgid "%s not valid for %s objects\n" +#~ msgstr "%s n??o ?? v??lido para objetos %s\n" -+ +#~ msgid "range not supported on Non MLS machines" +#~ msgstr "intervalo n??o suportado em m??quinas n??o-MLS" -+ +#~ msgid "Invalid value %s" +#~ msgstr "Valor inv??lido %s" -+ +#~ msgid "" +#~ "In order to load this newly created policy package into the kernel,\n" +#~ "you are required to execute \n" @@ -228916,12 +228958,16 @@ +#~ "\n" +#~ "semodule -i %s.pp\n" +#~ "\n" -+ +#~ msgid "Options Error: %s " +#~ msgstr "Erro de Op????es: %s " + +-#: ../audit2allow/audit2allow:211 +-#, c-format +-msgid "Options Error: %s " +-msgstr "Erro de Op????es: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ro.po policycoreutils-2.0.52/po/ro.po --- nsapolicycoreutils/po/ro.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/ro.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ro.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -232695,7 +232741,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils-2.0.52/po/ru.po --- nsapolicycoreutils/po/ru.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ru.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ru.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1038 +1,3325 @@ # translation of ru.po to Russian -# @@ -236712,7 +236758,7 @@ +#~ "%s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.52/po/si.po --- nsapolicycoreutils/po/si.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/si.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/si.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -240486,7 +240532,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.52/po/sk.po --- nsapolicycoreutils/po/sk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/sk.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sk.po 2008-07-29 09:29:36.000000000 -0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -244534,7 +244580,7 @@ +#~ msgstr "Chyba volieb: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.52/po/sl.po --- nsapolicycoreutils/po/sl.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sl.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sl.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -248308,7 +248354,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.52/po/sq.po --- nsapolicycoreutils/po/sq.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sq.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sq.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -252082,7 +252128,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.52/po/sr.po --- nsapolicycoreutils/po/sr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sr.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1117 +1,3432 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian # Serbian translations for policycoreutils @@ -257344,7 +257390,7 @@ - diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.52/po/sr at latin.po --- nsapolicycoreutils/po/sr at latin.po 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/po/sr at latin.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr at latin.po 2008-07-29 09:29:36.000000000 -0400 @@ -0,0 +1,3434 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian +# Serbian(Latin) translations for policycoreutils @@ -260782,7 +260828,7 @@ +#~ "Isklju??eno\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.52/po/sv.po --- nsapolicycoreutils/po/sv.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sv.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sv.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1040 +1,3368 @@ # Swedish messages for policycoreutils. -# Copyright (C) Christian Rose , 2006. @@ -264954,7 +265000,7 @@ +#~ msgstr "Flaggfel: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.52/po/ta.po --- nsapolicycoreutils/po/ta.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ta.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ta.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1043 +1,3363 @@ # translation of ta.po to Tamil # This file is distributed under the same license as the PACKAGE package. @@ -269120,7 +269166,7 @@ +#~ "MCS ????????????" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.52/po/te.po --- nsapolicycoreutils/po/te.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/te.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/te.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,3381 @@ -# SOME DESCRIPTIVE TITLE. +# translation of new_policycoreutils.HEAD.te.po to Telugu @@ -273276,7 +273322,7 @@ +#~ "????????????????????????\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.52/po/th.po --- nsapolicycoreutils/po/th.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/th.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/th.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -277050,7 +277096,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.52/po/tr.po --- nsapolicycoreutils/po/tr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/tr.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/tr.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -280824,7 +280870,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.52/po/uk.po --- nsapolicycoreutils/po/uk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/uk.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/uk.po 2008-07-29 09:29:36.000000000 -0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -284874,7 +284920,7 @@ +#~ msgstr "?????????????? ?? ????????????????????: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.52/po/ur.po --- nsapolicycoreutils/po/ur.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ur.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ur.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -288648,7 +288694,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.52/po/vi.po --- nsapolicycoreutils/po/vi.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/vi.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/vi.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -292422,7 +292468,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.52/po/zh_CN.po --- nsapolicycoreutils/po/zh_CN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/zh_CN.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_CN.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1045 +1,3343 @@ -# translation of zh_CN.po to -# translation of zh_CN.po to @@ -296400,7 +296446,7 @@ +#~ "??????\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.52/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/zh_TW.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_TW.po 2008-07-29 09:29:36.000000000 -0400 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zh_TW\n" @@ -300442,7 +300488,7 @@ +#~ msgstr "???????????????%s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.52/po/zu.po --- nsapolicycoreutils/po/zu.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/zu.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/zu.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- policycoreutils-rhat.patch 10 Jul 2008 13:40:20 -0000 1.377 +++ policycoreutils-rhat.patch 29 Jul 2008 13:30:55 -0000 1.378 @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile --- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/Makefile 2008-07-09 08:44:40.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-29 09:06:28.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui @@ -9,7 +9,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-09 08:44:40.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-29 09:06:28.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -38,10 +38,19 @@ close(fd); diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-09 08:44:58.000000000 -0400 -@@ -51,7 +51,7 @@ ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-29 09:12:29.000000000 -0400 +@@ -45,13 +45,13 @@ + def usage(message = ""): + print _(""" + semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] +-semanage login -{a|d|m} [-sr] login_name +-semanage user -{a|d|m} [-LrRP] selinux_name ++semanage login -{a|d|m} [-srF] login_name | login_file ++semanage user -{a|d|m} [-LrRPF] selinux_name | user_file + semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range semanage interface -{a|d|m} [-tr] interface_spec - semanage fcontext -{a|d|m} [-frst] file_spec +-semanage fcontext -{a|d|m} [-frst] file_spec ++semanage fcontext -{a|d|m} [-frstF] file_spec | fcontext_file semanage translation -{a|d|m} [-T] level -semanage boolean -{d|m} boolean +semanage boolean -{d|m} [-F] boolean | boolean_file @@ -56,7 +65,22 @@ -p, --proto Port protocol (tcp or udp) -P, --prefix Prefix for home directory labeling -L, --level Default SELinux Level (MLS/MCS Systems only) -@@ -114,7 +115,7 @@ +@@ -102,19 +103,19 @@ + valid_option={} + valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall', '-S', '--store' ] + valid_option["login"] = [] +- valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range'] ++ valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range', "-F", "--file"] + valid_option["user"] = [] +- valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix' ] ++ valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix', "-F", "--file"] + valid_option["port"] = [] + valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--proto' ] + valid_option["interface"] = [] + valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] + valid_option["fcontext"] = [] +- valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range'] ++ valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range', "-F", "--file"] valid_option["translation"] = [] valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] valid_option["boolean"] = [] @@ -65,9 +89,12 @@ valid_option["permissive"] = [] valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ] return valid_option -@@ -136,13 +137,14 @@ +@@ -134,15 +135,16 @@ + setrans = "" + roles = "" seuser = "" - prefix = "" +- prefix = "" ++ prefix = "user" heading=1 - value=0 - add = 0 @@ -156,10 +183,11 @@ if o == "--on" or o == "-1": - value = 1 -+ value = True - if o == "-off" or o == "-0": +- if o == "-off" or o == "-0": - value = 0 -+ value = False ++ value = "on" ++ if o == "--off" or o == "-0": ++ value = "off" if object == "login": OBJECT = seobject.loginRecords(store) @@ -175,12 +203,18 @@ sys.exit(0); if deleteall: -@@ -298,8 +308,6 @@ - rlist = roles.split() - if len(rlist) == 0: - raise ValueError(_("You must specify a role")) +@@ -295,11 +305,9 @@ + OBJECT.add(target, setrans) + + if object == "user": +- rlist = roles.split() +- if len(rlist) == 0: +- raise ValueError(_("You must specify a role")) - if prefix == "": - raise ValueError(_("You must specify a prefix")) ++ rlist = [] ++ if not use_file: ++ rlist = roles.split() OBJECT.add(target, rlist, selevel, serange, prefix) if object == "port": @@ -195,7 +229,7 @@ OBJECT.modify(target, seuser, serange) diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-09 08:44:40.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-29 09:06:28.000000000 -0400 @@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool @@ -232,7 +266,7 @@ .TP diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-09 08:55:45.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-29 09:06:28.000000000 -0400 @@ -330,20 +330,15 @@ for name in dirs: os.rmdir(os.path.join(root, name)) policycoreutils-sepolgen.patch: Index: policycoreutils-sepolgen.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- policycoreutils-sepolgen.patch 30 Jun 2008 15:52:24 -0000 1.13 +++ policycoreutils-sepolgen.patch 29 Jul 2008 13:30:55 -0000 1.14 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.49/sepolgen-1.0.12/src/sepolgen/refparser.py +diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.52/sepolgen-1.0.12/src/sepolgen/refparser.py --- nsasepolgen/src/sepolgen/refparser.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.12/src/sepolgen/refparser.py 2008-06-27 07:21:06.000000000 -0400 ++++ policycoreutils-2.0.52/sepolgen-1.0.12/src/sepolgen/refparser.py 2008-07-29 09:06:29.000000000 -0400 @@ -919,7 +919,7 @@ def list_headers(root): modules = [] Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.540 retrieving revision 1.541 diff -u -r1.540 -r1.541 --- policycoreutils.spec 9 Jul 2008 13:04:58 -0000 1.540 +++ policycoreutils.spec 29 Jul 2008 13:30:55 -0000 1.541 @@ -2,7 +2,7 @@ %define libsepolver 2.0.19-1 %define libsemanagever 2.0.5-1 %define libselinuxver 2.0.46-5 -%define sepolgenver 1.0.12 +%define sepolgenver 1.0.13 Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 @@ -192,6 +192,11 @@ fi %changelog +* Tue Jul 29 2008 Dan Walsh 2.0.52-6 +- Fix boolean handling +- Upgrade to latest sepolgen +- Update po patch + * Wed Jul 9 2008 Dan Walsh 2.0.52-5 - Additial cleanup of boolean handling for semanage Index: sources =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- sources 2 Jul 2008 21:22:59 -0000 1.188 +++ sources 29 Jul 2008 13:30:55 -0000 1.189 @@ -1,2 +1,2 @@ -4813a1ed80f19068ed9897165f073e8b sepolgen-1.0.12.tgz 311e95b3374fe1993fb91a303b6675b2 policycoreutils-2.0.52.tgz +b6756a012c26f414e4a5f8f438ce2188 sepolgen-1.0.13.tgz From fedora-extras-commits at redhat.com Tue Jul 29 13:32:28 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 13:32:28 GMT Subject: rpms/policycoreutils/devel policycoreutils.spec,1.541,1.542 Message-ID: <200807291332.m6TDWSHT030490@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30455 Modified Files: policycoreutils.spec Log Message: * Tue Jul 29 2008 Dan Walsh 2.0.52-6 - Fix boolean handling - Upgrade to latest sepolgen - Update po patch Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.541 retrieving revision 1.542 diff -u -r1.541 -r1.542 --- policycoreutils.spec 29 Jul 2008 13:30:55 -0000 1.541 +++ policycoreutils.spec 29 Jul 2008 13:31:58 -0000 1.542 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz From fedora-extras-commits at redhat.com Tue Jul 29 13:41:16 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 29 Jul 2008 13:41:16 GMT Subject: rpms/eclipse/devel eclipse-addrootfiles.patch, NONE, 1.1 eclipse-mv-Platform.sh, 1.1, 1.2 eclipse-pde.build-add-package-build.patch, 1.5, 1.6 eclipse-pdebuild.sh, 1.1, 1.2 eclipse.spec, 1.564, 1.565 Message-ID: <200807291341.m6TDfGA2030855@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30801 Modified Files: eclipse-mv-Platform.sh eclipse-pde.build-add-package-build.patch eclipse-pdebuild.sh eclipse.spec Added Files: eclipse-addrootfiles.patch Log Message: * Mon Jul 28 2008 Andrew Overholt 3.4.0-10 - Move JDT and PDE/SDK bits to dropins/{jdt,sdk} - Drop versionless PDE Build symlink (put logic into pdebuild script) - Make SWT JAR symlinks relative - Fold pde-runtime into pde - Add patch to add root files for non-upstream arches eclipse-addrootfiles.patch: --- NEW FILE eclipse-addrootfiles.patch --- diff -up ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.nonupstreamarches ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties --- ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.nonupstreamarches 2008-07-29 09:36:30.000000000 -0400 +++ ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties 2008-07-29 09:37:19.000000000 -0400 @@ -21,6 +21,7 @@ root.linux.motif.x86=eclipse,libcairo-sw root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm root.linux.gtk.ia64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm +root.linux.gtk.s390x=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm root.linux.gtk.ppc=eclipse root.macosx.carbon.ppc=eclipse,Eclipse.app/ root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS Index: eclipse-mv-Platform.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-mv-Platform.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-mv-Platform.sh 18 Jul 2008 15:14:32 -0000 1.1 +++ eclipse-mv-Platform.sh 29 Jul 2008 13:40:46 -0000 1.2 @@ -12,6 +12,14 @@ mv $baseDir/readme/ . mv $baseDir/features/org.eclipse.platform_* features mv $baseDir/features/org.eclipse.help_* features +mv $baseDir/features/org.eclipse.cvs_* features +mv $baseDir/plugins/org.eclipse.cvs_* plugins +mv $baseDir/plugins/org.eclipse.team.cvs.core_* plugins +mv $baseDir/plugins/org.eclipse.team.cvs.ssh_* plugins +mv $baseDir/plugins/org.eclipse.team.cvs.ssh2_* plugins +mv $baseDir/plugins/org.eclipse.team.cvs.ui_* plugins +mv $baseDir/features/org.eclipse.equinox.p2.user.ui_* features +mv $baseDir/features/org.fedoraproject* features mv $baseDir/features/org.eclipse.equinox.p2.user.ui_* features mv $baseDir/features/org.fedoraproject* features mv $baseDir/plugins/org.fedoraproject* plugins @@ -83,6 +91,7 @@ mv $baseDir/plugins/org.eclipse.core.contenttype_* plugins mv $baseDir/plugins/org.eclipse.equinox.app_* plugins mv $baseDir/plugins/org.eclipse.equinox.common_* plugins +mv $baseDir/plugins/org.eclipse.equinox.initializer_* plugins mv $baseDir/plugins/org.eclipse.equinox.preferences_* plugins mv $baseDir/plugins/org.eclipse.equinox.registry_* plugins mv $baseDir/plugins/org.eclipse.equinox.launcher_* plugins eclipse-pde.build-add-package-build.patch: Index: eclipse-pde.build-add-package-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pde.build-add-package-build.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eclipse-pde.build-add-package-build.patch 14 Jun 2007 06:23:49 -0000 1.5 +++ eclipse-pde.build-add-package-build.patch 29 Jul 2008 13:40:46 -0000 1.6 @@ -1,22 +1,89 @@ -Index: templates/package-build/build.properties +### Eclipse Workspace Patch 1.0 +#P org.eclipse.pde.build +Index: templates/package-build/prepare-build-dir.sh =================================================================== -RCS file: templates/package-build/build.properties -diff -N templates/package-build/build.properties +RCS file: templates/package-build/prepare-build-dir.sh +diff -N templates/package-build/prepare-build-dir.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ templates/package-build/build.properties 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,12 @@ -+buildDirectory=${sourceDirectory}/build -+buildLabel=rpmBuild -+archivePrefix=eclipse -+skipFetch=true -+javacFailOnError=true -+collectingFolder=eclipse -+archivesFormat=*,*,*-zip -+zipargs=-y -+javacDebugInfo=true -+archiveName=${id}.zip -+runPackager=false -+baseLocation=/usr/share/eclipse ++++ templates/package-build/prepare-build-dir.sh 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,77 @@ ++#!/bin/sh ++ ++if [ $# -ne 2 ]; then ++ echo "usage: $0 " ++ exit 1 ++fi ++ ++if [ ! -d $1 ]; then ++ echo "usage: $0 " ++ exit 1 ++fi ++ ++SOURCEDIR=$1 ++BUILDDIR=$2 ++ ++echo "preparing files in $1 for buildfile generation ..." ++mkdir -p $BUILDDIR ++ ++# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml ++mkdir -p $BUILDDIR/tmp ++BUILDFILE=$BUILDDIR/tmp/build.xml ++ ++echo " ++ ++ ++ ++ ++ ++" > $BUILDFILE ++ ++for type in feature plugin fragment; do ++ CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml ++ cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE ++done ++ ++# make the directories eclipse is expecting ++echo " making the 'features' and 'plugins' directories" ++mkdir -p $BUILDDIR/features $BUILDDIR/plugins ++ ++# make symlinks for the features ++FEATURES=$(find $SOURCEDIR -name feature.xml) ++for f in $FEATURES; do ++ PROJECTDIR=$(dirname $f) ++ PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) ++ if [ -z $PROJECTNAME ]; then ++ echo "ERROR: could not determine the feature id for $PROJECTDIR" ++ exit 1 ++ fi ++ ++ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR" ++ ln -sf $PROJECTDIR $BUILDDIR/features/$PROJECTNAME ++done ++ ++# make symlinks for plugins and fragments ++PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq) ++for dir in $PLUGINDIRS; do ++ PROJECTNAME="" ++ if [ -e $dir/META-INF/MANIFEST.MF ]; then ++ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2) ++ elif [ -e $dir/plugin.xml ]; then ++ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) ++ elif [ -e $dir/fragment.xml ]; then ++ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) ++ fi ++ ++ if [ -z $PROJECTNAME ]; then ++ echo "ERROR: could not determine the plugin or fragment id for $dir" ++ exit 1 ++ fi ++ ++ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir" ++ ln -sf $dir $BUILDDIR/plugins/$PROJECTNAME ++ ++done ++ ++rm -rf $BUILDDIR/tmp ++echo done Index: templates/package-build/customTargets-assemble-target.xml =================================================================== RCS file: templates/package-build/customTargets-assemble-target.xml @@ -42,7 +109,7 @@ diff -N templates/package-build/customTargets.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ templates/package-build/customTargets.xml 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,144 @@ +@@ -0,0 +1,147 @@ + + + @@ -114,6 +181,9 @@ + the fetch stage, we have to manually arrange the files --> + + ++ ++ ++ + + + @@ -187,87 +257,50 @@ + + + -Index: templates/package-build/prepare-build-dir.sh +Index: templates/package-build/build.properties =================================================================== -RCS file: templates/package-build/prepare-build-dir.sh -diff -N templates/package-build/prepare-build-dir.sh +RCS file: templates/package-build/build.properties +diff -N templates/package-build/build.properties --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ templates/package-build/prepare-build-dir.sh 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,77 @@ -+#!/bin/sh ++++ templates/package-build/build.properties 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,12 @@ ++buildDirectory=${sourceDirectory}/build ++buildLabel=rpmBuild ++archivePrefix=eclipse ++skipFetch=true ++javacFailOnError=true ++collectingFolder=eclipse ++archivesFormat=*,*,*-zip ++zipargs=-y ++javacDebugInfo=true ++archiveName=${id}.zip ++runPackager=false ++baseLocation=/usr/share/eclipse +Index: templates/package-build/symlink-deps.sh +=================================================================== +RCS file: templates/package-build/symlink-deps.sh +diff -N templates/package-build/symlink-deps.sh +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ templates/package-build/symlink-deps.sh 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,21 @@ ++#!/bin/sh -x + +if [ $# -ne 2 ]; then -+ echo "usage: $0 " ++ echo "usage: $0 " + exit 1 +fi + +if [ ! -d $1 ]; then -+ echo "usage: $0 " ++ echo "usage: $0 " + exit 1 +fi + -+SOURCEDIR=$1 -+BUILDDIR=$2 -+ -+echo "preparing files in $1 for buildfile generation ..." -+mkdir -p $BUILDDIR -+ -+# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml -+mkdir -p $BUILDDIR/tmp -+BUILDFILE=$BUILDDIR/tmp/build.xml -+ -+echo " -+ -+ -+ -+ -+ -+" > $BUILDFILE ++BUILDDIR=$1 ++DEPENDENCIESDIR=$2 + -+for type in feature plugin fragment; do -+ CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml -+ cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE -+done -+ -+# make the directories eclipse is expecting -+echo " making the 'features' and 'plugins' directories" -+mkdir -p $BUILDDIR/features $BUILDDIR/plugins -+ -+# make symlinks for the features -+FEATURES=$(find $SOURCEDIR -name feature.xml) -+for f in $FEATURES; do -+ PROJECTDIR=$(dirname $f) -+ PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) -+ if [ -z $PROJECTNAME ]; then -+ echo "ERROR: could not determine the feature id for $PROJECTDIR" -+ exit 1 -+ fi -+ -+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR" -+ ln -sf $PROJECTDIR $BUILDDIR/features/$PROJECTNAME -+done -+ -+# make symlinks for plugins and fragments -+PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq) -+for dir in $PLUGINDIRS; do -+ PROJECTNAME="" -+ if [ -e $dir/META-INF/MANIFEST.MF ]; then -+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2) -+ elif [ -e $dir/plugin.xml ]; then -+ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) -+ elif [ -e $dir/fragment.xml ]; then -+ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) -+ fi -+ -+ if [ -z $PROJECTNAME ]; then -+ echo "ERROR: could not determine the plugin or fragment id for $dir" -+ exit 1 -+ fi -+ -+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir" -+ ln -sf $dir $BUILDDIR/plugins/$PROJECTNAME -+ -+done -+ -+rm -rf $BUILDDIR/tmp -+echo done ++pushd $BUILDDIR/plugins ++ for dep in `ls $DEPENDENCIESDIR`; do ++ echo "ln -s $DEPENDENCIESDIR/$dep" ++ ln -s $DEPENDENCIESDIR/$dep ++ done ++popd Index: eclipse-pdebuild.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-pdebuild.sh 31 Mar 2008 18:45:06 -0000 1.1 +++ eclipse-pdebuild.sh 29 Jul 2008 13:40:46 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/bash -# args: [-f ] [-d ] [-a ] [-j ] [-v] [-D] +# args: [-f ] [-d ] [-a ] [-j ] [-v] [-D] [-o ] function usage { cat << _EOF_ @@ -17,13 +17,14 @@ -j VM arguments (ex. -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar) -v Be verbose -D Debug platform itself (passes -consolelog -debug to Eclipse) + -o Orbit dependencies _EOF_ } function copyPlatform { # This seems silly but I was running into issues with empty strings # counting as arguments to copy-platform -- overholt, 2008-03 - if [ -z $dependencies ]; then + if [ -z "$dependencies" ]; then if [ $verbose -eq 1 ]; then echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse" /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse @@ -74,9 +75,8 @@ buildDir=$PWD/build SDK=$buildDir/SDK homeDir=$buildDir/home -libdir=`rpm --eval "%{_libdir}"` -datadir=`rpm --eval "%{_datadir}"` -pdeBuildDir=$datadir/eclipse/plugins/org.eclipse.pde.build +datadir=`rpm --eval "%{_libdir}"` +pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@ featureId= dependencies= @@ -85,9 +85,10 @@ verbose=0 dryRun=0 debugPlatform=0 +orbitDepsDir= # See above. r = dry run (used for testing) -while getopts ???hf:d:a:j:vrD??? OPTION +while getopts ???hf:d:a:j:vrDo:??? OPTION do case $OPTION in h) @@ -115,6 +116,9 @@ D) debugPlatform=1 ;; + o) + orbitDepsDir=$OPTARG + ;; ?) usage exit @@ -171,7 +175,6 @@ echo " java -cp $SDK/startup.jar \ --Dosgi.sharedConfiguration.area=$libdir/eclipse/configuration \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ $debugPlatformArgs \ @@ -180,7 +183,8 @@ -DbaseLocation=$SDK \ -DsourceDirectory=$sourceDir \ -DbuildDirectory=$buildDir \ --Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build/templates/package-build \ +-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \ +-DorbitDepsDir="$orbitDepsDir" \ $additionalArgs \ -f $pdeBuildDir/scripts/build.xml \ -vmargs \ @@ -190,7 +194,6 @@ if [ $dryRun -ne 1 ]; then java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=$libdir/eclipse/configuration \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ $debugPlatformArgs \ @@ -199,7 +202,8 @@ -DbaseLocation=$SDK \ -DsourceDirectory=$sourceDir \ -DbuildDirectory=$buildDir \ - -Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build/templates/package-build \ + -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \ + -DorbitDepsDir=\""$orbitDepsDir"\" \ $additionalArgs \ -f $pdeBuildDir/scripts/build.xml \ -vmargs \ Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.564 retrieving revision 1.565 diff -u -r1.564 -r1.565 --- eclipse.spec 25 Jul 2008 13:21:25 -0000 1.564 +++ eclipse.spec 29 Jul 2008 13:40:46 -0000 1.565 @@ -1,11 +1,11 @@ # TODO: # - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 -# - generate content.xml for > platform sub-sets -# - move > platform bits to dropins/ along with content.xml for each # - update ecj-rpmdebuginfo patch # - look at startup script and launcher patches # - get Ganymede update site pre-configured # - investigate bi-arch requirements +# - investigate need for copy-platform +# - see why about.html isn't being copied on non-x86{,_64} platforms Epoch: 1 %define eclipse_major 3 @@ -14,6 +14,9 @@ %define eclipse_micro 0 %define swtver 3.4.0.v3448f +# Prevent brp-java-repack-jars from being run. +%define __jar_repack 0 + # All arches line up between Eclipse and Linux kernel names except i386 -> x86 %ifarch %{ix86} %define eclipse_arch x86 @@ -24,7 +27,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 9%{?dist} +Release: 10%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -100,6 +103,7 @@ Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch Patch30: %{name}-addfragmentsforotherplatforms.patch +Patch38: %{name}-addrootfiles.patch #FIXME: file a bug upstream Patch26: %{name}-launcher-fix-java-home.patch # Default max heap size too low for lots of people. Bump to 512 MB. @@ -284,6 +288,10 @@ Requires: objectweb-asm # For PDE Build wrapper script Requires: bash +Provides: %{name}-pde-runtime = 1:%{version}-%{release} +# The 20 is more than the currently (2008-06-25) latest 3.3.2 package +# but I want to leave some room in case we need to do an F9 update. +Obsoletes: %{name}-pde-runtime < 1:3.3.2-20 %description pde Eclipse Plugin Development Environment. This package is required for @@ -406,6 +414,7 @@ %patch28 %patch30 %patch31 -p1 +%patch38 # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \ @@ -744,6 +753,7 @@ mkdir $installDir pushd $installDir sh %{SOURCE28} $sdkDir +mv plugins/*.source* $sdkDir/plugins popd # Generate metadata for the platform @@ -763,6 +773,73 @@ -artifactRepositoryName "Fedora Eclipse" \ -metadataRepositoryName "Fedora Eclipse" +# JDT +jdtDir=$sdkDir-JDT +jdtMetadata=$jdtDir/metadata-JDT + +mkdir $jdtDir +pushd $jdtDir +mkdir features plugins +mv $sdkDir/features/org.eclipse.jdt_* features +for plugin in org.eclipse.jdt \ + org.eclipse.ant.ui \ + org.eclipse.jdt.apt.core \ + org.eclipse.jdt.apt.ui \ + org.eclipse.jdt.apt.pluggable.core \ + org.eclipse.jdt.compiler.apt \ + org.eclipse.jdt.compiler.tool \ + org.eclipse.jdt.core \ + org.eclipse.jdt.core.manipulation \ + org.eclipse.jdt.debug.ui \ + org.eclipse.jdt.debug \ + org.eclipse.jdt.junit \ + org.eclipse.jdt.junit.runtime \ + org.eclipse.jdt.junit4.runtime \ + org.eclipse.jdt.launching \ + org.eclipse.jdt.ui \ + org.junit \ + org.junit4 \ + org.eclipse.jdt.doc.user; do + mv $sdkDir/plugins/${plugin}_* plugins +done +popd + +# Generate metadata for JDT +java \ +-cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ +org.eclipse.core.launcher.Main \ +-application \ +org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ +-metadataRepository file:$jdtMetadata \ +-artifactRepository file:$jdtMetadata \ +-source $jdtDir \ +-root "Fedora Eclipse JDT" \ +-rootVersion %{version} \ +-flavor tooling \ +-append \ +-artifactRepositoryName "Fedora Eclipse" \ +-metadataRepositoryName "Fedora Eclipse" + +# SDK +sdkMetadata=$sdkDir/metadata-SDK + +# Generate metadata for SDK +java \ +-cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ +org.eclipse.core.launcher.Main \ +-application \ +org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ +-metadataRepository file:$sdkMetadata \ +-artifactRepository file:$sdkMetadata \ +-source $sdkDir \ +-root "Fedora Eclipse SDK" \ +-rootVersion %{version} \ +-flavor tooling \ +-publishArtifacts \ +-append \ +-artifactRepositoryName "Fedora Eclipse" \ +-metadataRepositoryName "Fedora Eclipse" + # Director config.ini mv $installDir/configuration/config.ini{,.bak} cp -p %{SOURCE22} $installDir/configuration/config.ini @@ -790,12 +867,21 @@ -bundlepool $provisionDir # Stuff in JDT, PDE, SDK -for f in about* \.eclipseproduct epl-v10.html notice.html readme; do - mv $installDir/$f $provisionDir +for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do + if [ -e $installDir/$f ]; then + mv $installDir/$f $provisionDir + fi done -mv $sdkDir/features/* $provisionDir/features -mv $sdkDir/plugins/* $provisionDir/plugins -rm -rf $metadataDir $sdkDir $installDir +dropins=$provisionDir/dropins +mkdir $dropins/jdt $dropins/sdk +mv $jdtDir/features $dropins/jdt +mv $jdtDir/plugins $dropins/jdt +mv $jdtMetadata/content.xml $dropins/jdt + +mv $sdkDir/features $dropins/sdk +mv $sdkDir/plugins $dropins/sdk +mv $sdkMetadata/content.xml $dropins/sdk +rm -rf $metadataDir $jdtDir $sdkDir $installDir mv $provisionDir $sdkDir # Fix paths in p2 data @@ -846,6 +932,7 @@ rm -r $sdkDir/configuration/org.eclipse.core.runtime rm -r $sdkDir/configuration/org.eclipse.equinox.app rm -r $sdkDir/configuration/.settings +rm -rf $sdkDir/configuration/*.log dataDirs=$(find $sdkDir/configuration \ -type d -name data) for dataDir in $dataDirs; do @@ -891,23 +978,23 @@ # Install symlinks to the SWT JNI shared libraries in %%{_libdir}/eclipse pushd $RPM_BUILD_ROOT%{_libdir}/%{name} for lib in $(find configuration -name libswt\*.so); do - ln -s %{_libdir}/%{name}/$lib `basename $lib` + ln -s $lib `basename $lib` done popd # Install the SWT jar symlinks in libdir SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") pushd $RPM_BUILD_ROOT%{_libdir}/%{name} -ln -s %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar +ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt.jar ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar popd # Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac" -JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//") +JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//") install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -ln -s %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \ +ln -s %{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar ln -s %{_javadir}/eclipse-ecj-%{version}.jar \ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar @@ -920,13 +1007,6 @@ ln -s %{_javadir}/ecj-%{version}.jar \ $RPM_BUILD_ROOT%{_javadir}/ecj.jar -# FIXME: get rid of this by putting logic in package build to know what version -# of pde.build it's using -# Install a versionless pde.build -pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/ -ln -s org.eclipse.pde.build_* org.eclipse.pde.build -popd - # Icons install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse48.png \ @@ -960,28 +1040,43 @@ cp -p %{SOURCE16} copy-platform ( cd $RPM_BUILD_ROOT%{_libdir}/%{name} - ls -d * | egrep -v '^(plugins|features|links|about_files)$' - ls -d plugins/* features/* links/* + ls -d * | egrep -v '^(plugins|features|about_files)$' + ls -d plugins/* features/* ) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform - mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts cp -p copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts +copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform +pushd $RPM_BUILD_ROOT%{_libdir}/%{name} +for p in $(ls -d dropins/jdt/plugins/*); do + plugin=$(basename $p) + echo $p | sed -e"s,^\(.*\),[ ! -e plugins/$plugin ] \&\& ln -s \$eclipse/\1 plugins/$plugin," >> $copyPlatform +done +for p in $(ls -d dropins/sdk/plugins/*); do + plugin=$(basename $p) + echo $p | sed -e"s,^\(.*\),[ ! -e plugins/$plugin ] \&\& ln -s \$eclipse/\1 plugins/$plugin," >> $copyPlatform +done +popd # Install the PDE Build wrapper script. install -p -D -m0755 %{SOURCE21} \ $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild +PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \ + | grep org.eclipse.pde.build_ | \ + sed 's/org.eclipse.pde.build_//') +sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild pushd $RPM_BUILD_ROOT%{_libdir}/%{name} rm plugins/org.sat4j* ln -s %{_javadir}/org.sat4j.core_* plugins/ ln -s %{_javadir}/org.sat4j.pb_* plugins/ -ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \ +ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \ sed 's/org.objectweb.asm_//') -rm plugins/org.objectweb.asm_$ASMPLUGINVERSION +rm dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION ln -s %{_javadir}/objectweb-asm/asm-all.jar \ - plugins/org.objectweb.asm_$ASMPLUGINVERSION + dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION ## BEGIN ANT ## ANTDIR=plugins/$(ls plugins | grep org.apache.ant_) @@ -1019,11 +1114,13 @@ rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION +pushd dropins/jdt build-jar-repository -s -p plugins/org.junit_* junit JUNIT4VERSION=$(ls plugins | grep org.junit4_ | sed 's/org.junit4_//') rm plugins/org.junit4_$JUNIT4VERSION/junit.jar ln -s %{_javadir}/junit4.jar plugins/org.junit4_$JUNIT4VERSION/junit.jar +popd JSCHVERSION=$(ls plugins | grep com.jcraft.jsch_ | sed 's/com.jcraft.jsch_//') rm plugins/com.jcraft.jsch_$JSCHVERSION @@ -1098,8 +1195,10 @@ %files ecj %defattr(-,root,root) %dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/plugins -%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_* +%dir %{_libdir}/%{name}/dropins +%dir %{_libdir}/%{name}/dropins/jdt +%dir %{_libdir}/%{name}/dropins/jdt/plugins +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_* %{_javadir}/eclipse-ecj*.jar %{_javadir}/jdtcore*.jar %{_javadir}/ecj*.jar @@ -1132,7 +1231,9 @@ #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html +%ifarch %{ix86} x86_64 %{_libdir}/%{name}/about.html +%endif %ifarch x86_64 %{_libdir}/%{name}/about_files %endif @@ -1174,6 +1275,7 @@ %{_datadir}/pixmaps/* %{_datadir}/icons/*/*/apps/* %{_libdir}/%{name}/eclipse +%dir %{_libdir}/%{name}/dropins %{_libdir}/%{name}/features/org.eclipse.platform_* %{_libdir}/%{name}/plugins/com.jcraft.jsch_* %{_libdir}/%{name}/plugins/javax.servlet_* @@ -1293,86 +1395,53 @@ %{_libdir}/%{name}/plugins/org.sat4j.pb_* # Put this in -platform since we're putting the p2 stuff here %{_libdir}/%{name}/artifacts.xml -# FIXME: should we ship content.xml? +# FIXME: should we ship content.xml for the platform? #%{_libdir}/%{name}/metadata %{_libdir}/%{name}/p2 %files jdt %defattr(-,root,root) %{_bindir}/efj -%{_libdir}/%{name}/features/org.eclipse.jdt_* -%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_* -%{_libdir}/%{name}/plugins/org.junit_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* -%{_libdir}/%{name}/plugins/org.junit4_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_* +%{_libdir}/%{name}/dropins/jdt/content.xml +%{_libdir}/%{name}/dropins/jdt/features +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.core_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.launching_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.ui_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.junit4_* +%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.doc.user_* %files pde %defattr(-,root,root) -%{_libdir}/%{name}/features/org.eclipse.sdk_* -%{_libdir}/%{name}/features/org.eclipse.pde_* -%{_libdir}/%{name}/features/org.eclipse.pde.p2_* -%{_libdir}/%{name}/features/org.eclipse.pde.p2.source_* -%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui.source_* -%{_libdir}/%{name}/features/org.eclipse.help.source_* -%{_libdir}/%{name}/features/org.eclipse.pde.source_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.build_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.build -%{_libdir}/%{name}/plugins/org.eclipse.pde_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.core_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.ui.templates_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.p2.ui_* -%{_libdir}/%{name}/features/org.eclipse.rcp.source_* -#%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}* -%{_libdir}/%{name}/features/org.eclipse.cvs.source_* -%{_libdir}/%{name}/plugins/org.eclipse.sdk_* -%{_libdir}/%{name}/features/org.eclipse.jdt.source_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_* -%{_libdir}/%{name}/features/org.eclipse.platform.source_* -%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_* -#%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_* -%{_libdir}/%{name}/plugins/org.eclipse.ui.views.log_* %{_libdir}/%{name}/buildscripts -%{_libdir}/%{name}/plugins/org.eclipse.pde.api.tools_* -%{_libdir}/%{name}/plugins/org.eclipse.pde.api.tools.ui_* -%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_* -%{_libdir}/%{name}/plugins/javax.servlet.source_* -%{_libdir}/%{name}/plugins/org.apache.ant.source_* -%{_libdir}/%{name}/plugins/org.apache.commons.el.source_* -%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_* -%{_libdir}/%{name}/plugins/org.apache.jasper.source_* -%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_* -%{_libdir}/%{name}/plugins/org.apache.lucene.source_* -%{_libdir}/%{name}/plugins/org.junit.source_* -%{_libdir}/%{name}/plugins/org.junit4.source_* -%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_* -%{_libdir}/%{name}/plugins/org.objectweb.asm_* -%{_libdir}/%{name}/plugins/org.objectweb.asm.source_* -%{_libdir}/%{name}/plugins/org.eclipse.*.source_* +%{_libdir}/%{name}/dropins/sdk # FIXME: where should this go? -%{_libdir}/%{name}/configuration/org.eclipse.equinox.source/source.info - -%files pde-runtime -%defattr(-,root,root) -%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* +%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Mon Jul 28 2008 Andrew Overholt 3.4.0-10 +- Move JDT and PDE/SDK bits to dropins/{jdt,sdk} +- Drop versionless PDE Build symlink (put logic into pdebuild script) +- Make SWT JAR symlinks relative +- Fold pde-runtime into pde +- Add patch to add root files for non-upstream arches + +* Fri Jul 25 2008 Andrew Overholt 3.4.0-10 +- Add ability for pdebuild (-o) to work with Orbit-style dependencies + * Fri Jul 25 2008 Andrew Overholt 3.4.0-9 - Collapse patches to build SWT native bits into two - Copy about* from x86 to all non-x86{_64} platforms From fedora-extras-commits at redhat.com Tue Jul 29 13:51:58 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Tue, 29 Jul 2008 13:51:58 GMT Subject: rpms/libspe2/devel libspe2.spec,1.3,1.4 Message-ID: <200807291351.m6TDpw74031250@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31166 Modified Files: libspe2.spec Log Message: Changed includes for cross toolchain from /usr/include/spu to /usr/spu/include to prepare for spu cross toolchain support. Existing cross toolchains like avr also use /usr//include Index: libspe2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/libspe2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libspe2.spec 29 Jul 2008 12:13:14 -0000 1.3 +++ libspe2.spec 29 Jul 2008 13:51:28 -0000 1.4 @@ -1,6 +1,6 @@ %define up_version 2.2.80 %define up_release 129 -%define spuinclude %{_includedir}/spu +%define spuinclude /usr/spu/include Name: libspe2 Version: %{up_version}.%{up_release} @@ -154,6 +154,9 @@ %endif %changelog +* Thu Jul 29 2008 Jochen Roth 2.2.80.129-2 +- Prepared for spu cross toolchain includes + * Thu Jul 29 2008 Jochen Roth 2.2.80.129-1 - update to latest open source version to solve some bugs From fedora-extras-commits at redhat.com Tue Jul 29 13:55:34 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Tue, 29 Jul 2008 13:55:34 GMT Subject: rpms/libspe2/devel libspe2.spec,1.4,1.5 Message-ID: <200807291355.m6TDtYqO031362@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31340 Modified Files: libspe2.spec Log Message: forgot to change the version number Index: libspe2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/devel/libspe2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libspe2.spec 29 Jul 2008 13:51:28 -0000 1.4 +++ libspe2.spec 29 Jul 2008 13:55:04 -0000 1.5 @@ -4,7 +4,7 @@ Name: libspe2 Version: %{up_version}.%{up_release} -Release: 1%{?dist} +Release: 2%{?dist} Summary: SPE Runtime Management Library Group: System Environment/Libraries From fedora-extras-commits at redhat.com Tue Jul 29 14:06:37 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Tue, 29 Jul 2008 14:06:37 GMT Subject: rpms/qmmp/devel qmmp.spec,1.3,1.4 Message-ID: <200807291406.m6TE6bs0005982@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5936 Modified Files: qmmp.spec Log Message: new version, plus devel subpackage Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qmmp.spec 13 May 2008 16:58:28 -0000 1.3 +++ qmmp.spec 29 Jul 2008 14:06:07 -0000 1.4 @@ -1,5 +1,5 @@ Name: qmmp -Version: 0.1.6 +Version: 0.2.0 Release: 1%{?dist} Summary: Qt-based multimedia player @@ -18,23 +18,40 @@ BuildRequires: libmpcdec-devel >= 1.2.2 libvorbis-devel libogg-devel BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils +BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig +%package devel +Summary: Header files for qmmp +Group: Development/Libraries + %description This program is an audio-player, written with help of Qt library. The user interface is similar to winamp or xmms. Main opportunities: - * unpacked winamp skins support; - * plugins support; - * Ogg Vorbis support; - * Native FLAC support; - * Musepack support; - * WMA support; - * AlSA sound output; - * JACK sound output. + * Winamp and xmms skins support + * plugins support + * Ogg Vorbis support + * native FLAC support + * Musepack support + * WavePack support + * ModPlug support + * PCM WAVE support + * AlSA sound output + * JACK sound output + * OSS sound output + * PulseAudio output + * Last.fm scrobbler + * D-Bus support + * Spectrum Analyzer + * sample rate conversion + * streaming support + +%description devel +QMMP is Qt-based audio player. This package contains its header files. %prep %setup -q @@ -51,9 +68,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install -# Install icon and desktop file -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -mv %{buildroot}%{_datadir}/pixmaps/qmmp.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps +# Install desktop file desktop-file-install --delete-original --vendor fedora --dir \ %{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/qmmp.desktop @@ -66,9 +81,12 @@ %doc AUTHORS ChangeLog ChangeLog.rus COPYING README README.RUS %{_bindir}/qmmp %{_libdir}/qmmp -%{_libdir}/libqmmp.so +%{_libdir}/libqmmp* %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/icons/hicolor/32x32/apps/ +%{_datadir}/icons/hicolor/ + +%files devel +%{_includedir} %post /sbin/ldconfig @@ -86,6 +104,16 @@ %changelog +* Tue Jul 29 2008 Karel Volny 0.2.0-1 +- new version +- updated %%description to match upstream +- added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +- xpm icon is not used anymore (several pngs available) +- created devel subpackage + +* Mon May 19 2008 Karel Volny 0.1.6-2 +- fixed %%description not to include patent-encumbered formats (bug #447141) + * Tue May 13 2008 Karel Volny 0.1.6-1 - new version From fedora-extras-commits at redhat.com Tue Jul 29 14:10:48 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Tue, 29 Jul 2008 14:10:48 GMT Subject: rpms/qmmp/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200807291410.m6TEAmV2006087@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6048 Modified Files: .cvsignore sources Log Message: new version - forgot to update the sources ... Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 May 2008 16:58:28 -0000 1.3 +++ .cvsignore 29 Jul 2008 14:10:18 -0000 1.4 @@ -1 +1 @@ -qmmp-0.1.6.tar.bz2 +qmmp-0.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 May 2008 16:58:28 -0000 1.3 +++ sources 29 Jul 2008 14:10:18 -0000 1.4 @@ -1 +1 @@ -b9f8b6f33e7e8e3f8667592ecaea7b20 qmmp-0.1.6.tar.bz2 +3dd56fc0c9dd632572465f9eab3e4c80 qmmp-0.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 14:22:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:00 +0000 Subject: [pkgdb] dhcp: wwoods has requested watchcommits Message-ID: <20080729142201.13E9A1AD0F3@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the watchcommits acl on dhcp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:22:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:15 +0000 Subject: [pkgdb] dhcp: wwoods has requested watchbugzilla Message-ID: <20080729142215.C9E221AD101@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the watchbugzilla acl on dhcp (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:22:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:19 +0000 Subject: [pkgdb] dhcp: wwoods has requested commit Message-ID: <20080729142219.578B51AD103@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the commit acl on dhcp (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:22:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:07 +0000 Subject: [pkgdb] dhcp: wwoods has requested commit Message-ID: <20080729142207.EA7DE1AD0FC@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the commit acl on dhcp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:22:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:20 +0000 Subject: [pkgdb] dhcp: wwoods has requested watchcommits Message-ID: <20080729142220.361291AD105@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the watchcommits acl on dhcp (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:22:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:21 +0000 Subject: [pkgdb] dhcp: wwoods has requested watchcommits Message-ID: <20080729142221.A08041AD10C@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the watchcommits acl on dhcp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:22:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:21 +0000 Subject: [pkgdb] dhcp: wwoods has requested watchbugzilla Message-ID: <20080729142221.550901AD108@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the watchbugzilla acl on dhcp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:22:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:24 +0000 Subject: [pkgdb] dhcp: wwoods has requested commit Message-ID: <20080729142224.A20501AD10E@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the commit acl on dhcp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 14:24:36 2008 From: fedora-extras-commits at redhat.com (Jochen Roth (jroth)) Date: Tue, 29 Jul 2008 14:24:36 GMT Subject: rpms/libspe2/F-9 .cvsignore, 1.2, 1.3 libspe2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807291424.m6TEOacb006515@cvs-int.fedora.redhat.com> Author: jroth Update of /cvs/pkgs/rpms/libspe2/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6369 Modified Files: .cvsignore libspe2.spec sources Log Message: Solved some annoying bugs by upgrading to the latest upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Jul 2008 08:30:51 -0000 1.2 +++ .cvsignore 29 Jul 2008 14:24:06 -0000 1.3 @@ -1 +1 @@ -libspe2-2.2.80-95.tar.gz +libspe2-2.2.80-129.tar.gz Index: libspe2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/F-9/libspe2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libspe2.spec 24 Jul 2008 08:30:51 -0000 1.1 +++ libspe2.spec 29 Jul 2008 14:24:06 -0000 1.2 @@ -1,10 +1,10 @@ %define up_version 2.2.80 -%define up_release 95 -%define spuinclude %{_includedir}/spu +%define up_release 129 +%define spuinclude /usr/spu/include Name: libspe2 Version: %{up_version}.%{up_release} -Release: 5%{?dist} +Release: 2%{?dist} Summary: SPE Runtime Management Library Group: System Environment/Libraries @@ -154,6 +154,12 @@ %endif %changelog +* Thu Jul 29 2008 Jochen Roth 2.2.80.129-2 +- Prepared for spu cross toolchain includes + +* Thu Jul 29 2008 Jochen Roth 2.2.80.129-1 +- update to latest open source version to solve some bugs + * Thu Jul 24 2008 Jochen Roth 2.2.80.95-5 - changed release name to include branch name Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libspe2/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Jul 2008 08:30:51 -0000 1.2 +++ sources 29 Jul 2008 14:24:06 -0000 1.3 @@ -1 +1 @@ -e534fd24e9c0225519d9dcc11f1ecba2 libspe2-2.2.80-95.tar.gz +bf9c4a8ec7aff188f5489220f3f170cb libspe2-2.2.80-129.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 14:40:45 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 14:40:45 GMT Subject: rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.14, 1.15 Message-ID: <200807291440.m6TEejGB007167@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7144 Modified Files: policycoreutils-sepolgen.patch Log Message: * Tue Jul 29 2008 Dan Walsh 2.0.52-6 - Fix boolean handling - Upgrade to latest sepolgen - Update po patch policycoreutils-sepolgen.patch: Index: policycoreutils-sepolgen.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- policycoreutils-sepolgen.patch 29 Jul 2008 13:30:55 -0000 1.14 +++ policycoreutils-sepolgen.patch 29 Jul 2008 14:40:15 -0000 1.15 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.52/sepolgen-1.0.12/src/sepolgen/refparser.py ---- nsasepolgen/src/sepolgen/refparser.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.52/sepolgen-1.0.12/src/sepolgen/refparser.py 2008-07-29 09:06:29.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.52/sepolgen-1.0.13/src/sepolgen/refparser.py +--- nsasepolgen/src/sepolgen/refparser.py 2008-06-13 23:25:26.000000000 -0400 ++++ policycoreutils-2.0.52/sepolgen-1.0.13/src/sepolgen/refparser.py 2008-07-29 09:06:29.000000000 -0400 @@ -919,7 +919,7 @@ def list_headers(root): modules = [] From fedora-extras-commits at redhat.com Tue Jul 29 14:48:15 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 29 Jul 2008 14:48:15 GMT Subject: rpms/ctags/devel ctags.spec,1.22,1.23 Message-ID: <200807291448.m6TEmFot007401@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/ctags/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7360 Modified Files: ctags.spec Log Message: add subpackage ctags-etags Index: ctags.spec =================================================================== RCS file: /cvs/extras/rpms/ctags/devel/ctags.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ctags.spec 15 Jul 2008 19:34:52 -0000 1.22 +++ ctags.spec 29 Jul 2008 14:47:45 -0000 1.23 @@ -1,7 +1,7 @@ Summary: A C programming language indexing and/or cross-reference tool Name: ctags Version: 5.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -30,6 +30,7 @@ Summary: Exuberant Ctags for emacs tag format Group: Development/Tools Requires: ctags = %{version}-%{release} +Requires: /usr/sbin/alternatives %description etags This package will generate tags in a format which GNU Emacs understand, @@ -50,6 +51,19 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install +pushd %{buildroot}%{_bindir} +ls -s ctags etags.ctags +popd +pushd %{buildroot}%{_mandir}/man1 +ln -s ctags.1.gz etags.ctags.1.gz +popd + +%posttrans etags +/usr/sbin/alternatives --install /usr/bin/etags emacs.etags /usr/bin/etags.ctags 20 \ + --slave /usr/share/man/man1/etags.1.gz emacs.etags.man /usr/share/man/man1/ctags.1.gz + +%postun etags +/usr/sbin/alternatives --remove etags /usr/bin/etags.ctags || : %clean rm -rf %{buildroot} @@ -57,10 +71,19 @@ %files %defattr(-, root, root, -) %doc COPYING EXTENDING.html FAQ NEWS README -%{_bindir}/* -%{_mandir}/man1/* +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* + +%files etags +%defattr(-, root, root, -) +%doc COPYING +%{_bindir}/etags.%{name} +%{_mandir}/man1/etags.%{name}.1* %changelog +* Tue Jul 29 2008 Than Ngo 5.7-3 +- add subpackage ctags-etags + * Tue Jul 15 2008 Tom "spot" Callaway 5.7-2 - fix license tag From fedora-extras-commits at redhat.com Tue Jul 29 14:52:51 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Tue, 29 Jul 2008 14:52:51 GMT Subject: rpms/OpenIPMI/devel .cvsignore, 1.9, 1.10 OpenIPMI.spec, 1.47, 1.48 sources, 1.9, 1.10 Message-ID: <200807291452.m6TEqpec007618@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/OpenIPMI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7537 Modified Files: .cvsignore OpenIPMI.spec sources Log Message: - Fixed several specfile problems (#453751) - Update to OpenIPMI-2.0.14 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 5 Dec 2007 14:25:24 -0000 1.9 +++ .cvsignore 29 Jul 2008 14:52:21 -0000 1.10 @@ -1,2 +1,2 @@ +OpenIPMI-2.0.14.tar.gz ipmitool-1.8.9.tar.gz -OpenIPMI-2.0.13.tar.gz Index: OpenIPMI.spec =================================================================== RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- OpenIPMI.spec 19 Feb 2008 19:44:04 -0000 1.47 +++ OpenIPMI.spec 29 Jul 2008 14:52:21 -0000 1.48 @@ -2,21 +2,22 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.13 -Release: 2%{?dist} +Version: 2.0.14 +Release: 1%{?dist} License: BSD and BSD with advertising and LGPLv2+ and GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ -Source: http://prdownloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz -Source2: http://prdownloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz +Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz +Source2: http://downloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz Source3: openipmi.sysconf Source4: openipmi.initscript Patch100: ipmitool-1.8.9-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: chkconfig -BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel -BuildPrereq: openssl-devel python-devel readline-devel popt-devel -BuildPrereq: perl-devel +BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel +BuildRequires: openssl-devel python-devel readline-devel popt-devel +BuildRequires: perl-devel +Requires(post): chkconfig +Requires(preun): chkconfig %description The Open IPMI project aims to develop an open code base to allow access to @@ -42,6 +43,7 @@ %package perl Group: Development/Libraries Summary: OpenIPMI Perl language bindings +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. @@ -55,7 +57,8 @@ %package devel Group: Development/Libraries -Summary: The development environment for the OpenIPMI project. +Summary: The development environment for the OpenIPMI project +Requires: pkgconfig Requires: %{name} = %{version} %description devel @@ -66,9 +69,16 @@ %setup -q -a 2 pushd ipmitool-%{ipmitoolver} %patch100 -p1 -b .open +for f in AUTHORS ChangeLog; do + iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8 + mv ${f}.utf8 ${f} +done +popd %build %configure --with-pythoninstall=%{python_sitearch} +sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} /%{_libdir}|' libtool +sed -i 's| -rpath \$(libdir)\( \$(libOpenIPMIposix_la_LDFLAGS)\)|\1|' unix/Makefile make pushd ipmitool-%{ipmitoolver} %configure @@ -76,6 +86,7 @@ popd %install +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la # Remove python cruft in 32bit libdir on 64bit archs... @@ -116,7 +127,7 @@ %files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ipmi -%config %{_initrddir}/ipmi +%{_initrddir}/ipmi %{_bindir}/ipmicmd %{_bindir}/ipmilan %{_bindir}/ipmish @@ -136,11 +147,12 @@ %{_mandir}/man8/ipmilan* %files perl -%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/OpenIPMI.pm -%dir %{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/auto/OpenIPMI -%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/auto/OpenIPMI/* +%defattr(-,root,root) +%attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm +%{perl_vendorarch}/auto/OpenIPMI/ %files python +%defattr(-,root,root) %{_libdir}/python*/site-packages/* %files tools @@ -154,7 +166,6 @@ %files libs %defattr(-,root,root) %{_libdir}/*.so.* -%{_libdir}/pkgconfig/* %files devel %defattr(-,root,root) @@ -162,8 +173,13 @@ %{_includedir}/OpenIPMI %{_libdir}/*.so %{_libdir}/*.a +%{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 29 2008 Phil Knirsch - 2.0.14-1 +- Fixed several specfile problems (#453751) +- Update to OpenIPMI-2.0.14 + * Tue Feb 19 2008 Fedora Release Engineering - 2.0.13-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 5 Dec 2007 14:25:24 -0000 1.9 +++ sources 29 Jul 2008 14:52:21 -0000 1.10 @@ -1,2 +1,2 @@ +f766680bb237ca2f837c005efba54efa OpenIPMI-2.0.14.tar.gz 3b4dbdbaa1edff3dccaf88d161b34cd2 ipmitool-1.8.9.tar.gz -41835d4a2db684b9fca66e954c18c348 OpenIPMI-2.0.13.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 14:59:16 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Tue, 29 Jul 2008 14:59:16 GMT Subject: rpms/qmmp/F-8 .cvsignore,1.3,1.4 qmmp.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200807291459.m6TExGaL007839@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7807 Modified Files: .cvsignore qmmp.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 May 2008 16:58:06 -0000 1.3 +++ .cvsignore 29 Jul 2008 14:58:46 -0000 1.4 @@ -1 +1 @@ -qmmp-0.1.6.tar.bz2 +qmmp-0.2.0.tar.bz2 Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-8/qmmp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qmmp.spec 13 May 2008 16:58:06 -0000 1.2 +++ qmmp.spec 29 Jul 2008 14:58:46 -0000 1.3 @@ -1,5 +1,5 @@ Name: qmmp -Version: 0.1.6 +Version: 0.2.0 Release: 1%{?dist} Summary: Qt-based multimedia player @@ -18,23 +18,40 @@ BuildRequires: libmpcdec-devel >= 1.2.2 libvorbis-devel libogg-devel BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils +BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig +%package devel +Summary: Header files for qmmp +Group: Development/Libraries + %description This program is an audio-player, written with help of Qt library. The user interface is similar to winamp or xmms. Main opportunities: - * unpacked winamp skins support; - * plugins support; - * Ogg Vorbis support; - * Native FLAC support; - * Musepack support; - * WMA support; - * AlSA sound output; - * JACK sound output. + * Winamp and xmms skins support + * plugins support + * Ogg Vorbis support + * native FLAC support + * Musepack support + * WavePack support + * ModPlug support + * PCM WAVE support + * AlSA sound output + * JACK sound output + * OSS sound output + * PulseAudio output + * Last.fm scrobbler + * D-Bus support + * Spectrum Analyzer + * sample rate conversion + * streaming support + +%description devel +QMMP is Qt-based audio player. This package contains its header files. %prep %setup -q @@ -51,9 +68,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install -# Install icon and desktop file -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -mv %{buildroot}%{_datadir}/pixmaps/qmmp.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps +# Install desktop file desktop-file-install --delete-original --vendor fedora --dir \ %{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/qmmp.desktop @@ -66,9 +81,12 @@ %doc AUTHORS ChangeLog ChangeLog.rus COPYING README README.RUS %{_bindir}/qmmp %{_libdir}/qmmp -%{_libdir}/libqmmp.so +%{_libdir}/libqmmp* %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/icons/hicolor/32x32/apps/ +%{_datadir}/icons/hicolor/ + +%files devel +%{_includedir} %post /sbin/ldconfig @@ -86,6 +104,16 @@ %changelog +* Tue Jul 29 2008 Karel Volny 0.2.0-1 +- new version +- updated %%description to match upstream +- added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +- xpm icon is not used anymore (several pngs available) +- created devel subpackage + +* Mon May 19 2008 Karel Volny 0.1.6-2 +- fixed %%description not to include patent-encumbered formats (bug #447141) + * Tue May 13 2008 Karel Volny 0.1.6-1 - new version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 May 2008 16:58:06 -0000 1.3 +++ sources 29 Jul 2008 14:58:46 -0000 1.4 @@ -1 +1 @@ -b9f8b6f33e7e8e3f8667592ecaea7b20 qmmp-0.1.6.tar.bz2 +3dd56fc0c9dd632572465f9eab3e4c80 qmmp-0.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 14:35:50 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 29 Jul 2008 14:35:50 GMT Subject: rpms/dovecot/devel dovecot-1.1-default-settings-passwd.patch, NONE, 1.1 dovecot.sysconfig, NONE, 1.1 .cvsignore, 1.39, 1.40 dovecot.init, 1.5, 1.6 dovecot.spec, 1.108, 1.109 sources, 1.42, 1.43 Message-ID: <200807291435.m6TEZoD4006982@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/dovecot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6925 Modified Files: .cvsignore dovecot.init dovecot.spec sources Added Files: dovecot-1.1-default-settings-passwd.patch dovecot.sysconfig Log Message: * Tue Jul 29 2008 Dan Horak - 1:1.1.2-1 - update to upstream version 1.1.2 - final solution for #445200 (put the password into /etc/sysconfig/dovecot) dovecot-1.1-default-settings-passwd.patch: --- NEW FILE dovecot-1.1-default-settings-passwd.patch --- --- dovecot-1.1.2/dovecot-example.conf.passwd 2008-07-29 14:30:57.000000000 +0200 +++ dovecot-1.1.2/dovecot-example.conf 2008-07-29 14:32:48.000000000 +0200 @@ -92,6 +92,8 @@ # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. +# Security note: if you have this config file world readable, then put the +# password into /etc/sysconfig/dovecot. #ssl_key_password = # File containing trusted SSL certificate authorities. Set this only if you --- NEW FILE dovecot.sysconfig --- # Here you can specify the password for your SSL certificates # so the main config file can be world readable. Other command # line options can be specified too. # #OPTIONS="-p my_certificate_password" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 22 Jun 2008 14:49:13 -0000 1.39 +++ .cvsignore 29 Jul 2008 14:35:20 -0000 1.40 @@ -1,4 +1,4 @@ -dovecot-1.1.1.tar.gz -dovecot-1.1.1.tar.gz.sig dovecot-sieve-1.1.5.tar.gz dovecot-sieve-1.1.5.tar.gz.sig +dovecot-1.1.2.tar.gz +dovecot-1.1.2.tar.gz.sig Index: dovecot.init =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dovecot.init 18 Jun 2008 12:41:41 -0000 1.5 +++ dovecot.init 29 Jul 2008 14:35:20 -0000 1.6 @@ -8,6 +8,7 @@ # description: Dovecot Imap Server # processname: dovecot # config: /etc/dovecot.conf +# config: /etc/sysconfig/dovecot # pidfile: /var/run/dovecot/master.pid ### BEGIN INIT INFO @@ -27,6 +28,10 @@ # Source function library. . /etc/init.d/functions +if [ -f /etc/sysconfig/dovecot ]; then + . /etc/sysconfig/dovecot +fi + RETVAL=0 prog="Dovecot Imap" exec="/usr/sbin/dovecot" @@ -39,7 +44,7 @@ [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --pidfile $pidfile $exec + daemon --pidfile $pidfile $exec $OPTIONS RETVAL=$? [ $RETVAL -eq 0 ] && touch $lockfile echo Index: dovecot.spec =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- dovecot.spec 27 Jun 2008 07:22:55 -0000 1.108 +++ dovecot.spec 29 Jul 2008 14:35:20 -0000 1.109 @@ -1,8 +1,8 @@ Summary: Dovecot Secure imap server Name: dovecot Epoch: 1 -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} License: MIT and LGPLv2 and BSD with advertising Group: System Environment/Daemons @@ -26,10 +26,12 @@ Source6: perfect_maildir.pl Source7: dovecot-REDHAT-FAQ.txt Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz +Source9: dovecot.sysconfig Patch1: dovecot-1.1-default-settings.patch Patch2: dovecot-1.0.beta2-mkcert-permissions.patch # local filesystem rules Patch3: dovecot-1.0.rc7-mkcert-paths.patch +Patch4: dovecot-1.1-default-settings-passwd.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, pam-devel, zlib-devel @@ -148,6 +150,7 @@ %patch1 -p1 -b .default-settings %patch2 -p1 -b .mkcert-permissions %patch3 -p1 -b .mkcert-paths +%patch4 -p1 -b .passwd %if %{build_sieve} %setup -q -D -T -a 8 @@ -208,6 +211,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +install -p -m 600 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dovecot + # generate ghost .pem file mkdir -p $RPM_BUILD_ROOT%{ssldir}/certs mkdir -p $RPM_BUILD_ROOT%{ssldir}/private @@ -303,7 +309,8 @@ %files -f libs.filelist %defattr(-,root,root,-) %doc %{docdir}-%{version} -%attr(0640,dovecot,mail) %config(noreplace) %{_sysconfdir}/dovecot.conf +%config(noreplace) %{_sysconfdir}/dovecot.conf +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot %{_initrddir}/dovecot %config(noreplace) %{_sysconfdir}/pam.d/dovecot %dir %{ssldir} @@ -369,6 +376,10 @@ %changelog +* Tue Jul 29 2008 Dan Horak - 1:1.1.2-1 +- update to upstream version 1.1.2 +- final solution for #445200 (put the password into /etc/sysconfig/dovecot) + * Fri Jun 27 2008 Dan Horak - 1:1.1.1-2 - update default settings to listen on both IPv4 and IPv6 instead of IPv6 only Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 22 Jun 2008 14:49:13 -0000 1.42 +++ sources 29 Jul 2008 14:35:20 -0000 1.43 @@ -1,4 +1,4 @@ -239072365e4fc35b8a7162f841cb07c9 dovecot-1.1.1.tar.gz -ac726ebee281c879f6dc183d1919a67c dovecot-1.1.1.tar.gz.sig b4362defe3fc18865db8cf8e1c940b13 dovecot-sieve-1.1.5.tar.gz 0fdb01f9fd960fbd5a8271584ac62cb8 dovecot-sieve-1.1.5.tar.gz.sig +fcebb6c099421049632b2f1f019f55cd dovecot-1.1.2.tar.gz +52cacb5d0f7b597392532b181d3875f7 dovecot-1.1.2.tar.gz.sig From fedora-extras-commits at redhat.com Tue Jul 29 15:10:59 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Tue, 29 Jul 2008 15:10:59 GMT Subject: rpms/qmmp/F-8 qmmp.spec,1.3,1.4 Message-ID: <200807291510.m6TFAxrG015060@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15043 Modified Files: qmmp.spec Log Message: forgotten buildrequires ... Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-8/qmmp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qmmp.spec 29 Jul 2008 14:58:46 -0000 1.3 +++ qmmp.spec 29 Jul 2008 15:10:29 -0000 1.4 @@ -19,6 +19,7 @@ BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +BuildRequires: libmodplug-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig @@ -108,6 +109,7 @@ - new version - updated %%description to match upstream - added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +- added BuildRequires: libmodplug-devel - xpm icon is not used anymore (several pngs available) - created devel subpackage From fedora-extras-commits at redhat.com Tue Jul 29 15:13:31 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Tue, 29 Jul 2008 15:13:31 GMT Subject: rpms/gnu-efi/devel gnu-efi-3.0d-palproc-license.patch, NONE, 1.1 gnu-efi.spec, 1.21, 1.22 Message-ID: <200807291513.m6TFDVe4015200@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/gnu-efi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123 Modified Files: gnu-efi.spec Added Files: gnu-efi-3.0d-palproc-license.patch Log Message: * Mon Jul 28 2008 Peter Jones - 3.0d-5 - Remove ia64 palproc code since its license isn't usable. - Remove ia64 from ExclusiveArch since it can't build... gnu-efi-3.0d-palproc-license.patch: --- NEW FILE gnu-efi-3.0d-palproc-license.patch --- diff -up gnu-efi-3.0d/lib/ia64/palproc.h.license gnu-efi-3.0d/lib/ia64/palproc.h --- gnu-efi-3.0d/lib/ia64/palproc.h.license 2007-05-09 14:37:27.000000000 -0400 +++ gnu-efi-3.0d/lib/ia64/palproc.h 2008-07-28 12:00:28.000000000 -0400 @@ -1,60 +0,0 @@ -// -// -// Copyright (c) 1996-99 Intel Corp. -// All Rights Reserved -// -// INTEL CORPORATION PROPRIETARY INFORMATION -// -// This software is supplied under the terms of a license -// agreement or nondisclosure agreement with Intel Corpo- -// ration and may not be copied or disclosed except in -// accordance with the terms of that agreement. -// -// -// -//Module Name: -// -// palproc.h -// -//Abstract: -// -// This module contains generic macros for an IA64 assembly writer. -// -// -//Revision History -// - -#ifndef _PALPROC_H -#define _PALPROC_H - -#define PROCEDURE_ENTRY(name) .##text; \ - .##type name, @function; \ - .##global name; \ - .##proc name; \ -name: - -#define PROCEDURE_EXIT(name) .##endp name - -// Note: use of NESTED_SETUP requires number of locals (l) >= 3 - -#define NESTED_SETUP(i,l,o,r) \ - alloc loc1=ar##.##pfs,i,l,o,r ;\ - mov loc0=b0 - -#define NESTED_RETURN \ - mov b0=loc0 ;\ - mov ar##.##pfs=loc1 ;;\ - br##.##ret##.##dpnt b0;; - - -// defines needed in palproc.s - -#define PAL_MC_CLEAR_LOG 0x0015 -#define PAL_MC_DRAIN 0x0016 -#define PAL_MC_EXPECTED 0x0017 -#define PAL_MC_DYNAMIC_STATE 0x0018 -#define PAL_MC_ERROR_INFO 0x0019 -#define PAL_MC_RESUME 0x001a -#define PAL_MC_REGISTER_MEM 0x001b - -#endif // _PALPROC_H diff -up gnu-efi-3.0d/lib/ia64/palproc.S.license gnu-efi-3.0d/lib/ia64/palproc.S --- gnu-efi-3.0d/lib/ia64/palproc.S.license 2007-05-09 14:37:27.000000000 -0400 +++ gnu-efi-3.0d/lib/ia64/palproc.S 2008-07-28 12:00:30.000000000 -0400 @@ -1,170 +0,0 @@ -//++ -// Copyright (c) 1996-99 Intel Corp. -// All Rights Reserved -// -// INTEL CORPORATION PROPRIETARY INFORMATION -// -// This software is supplied under the terms of a license -// agreement or nondisclosure agreement with Intel Corpo- -// ration and may not be copied or disclosed except in -// accordance with the terms of that agreement. -// -// -// -// Module Name: -// -// palproc.s -// -// Abstract: -// -// Contains an implementation for making PAL PROC calls on -// IA-64 architecture. -// -// -// -// Revision History: -// -//-- - - .file "palproc.s" - -#include "palproc.h" - - -//----------------------------------------------------------------------------- -//++ -// MakeStaticPALCall -// -// This routine is called whenever an architected static calling convention -// based PAL call is to be made. This call does use RSE actually, but our policy -// in making static PAL calls before memory is available is to make sure that -// we do not nest too deep and allocate beyond 96 banked registers. In other -// words we carefully code calls and control flow before memory is available. -// -// Arguments : All parameters set up to do static PAL call. -// -// On Entry : -// -// Return Value: -// -// As per static calling conventions. -// -//-- -//--------------------------------------------------------------------------- -PROCEDURE_ENTRY(MakeStaticPALCall) - - NESTED_SETUP (5,8,0,0) - mov loc3 = b5 - mov loc4 = r2 - mov loc7 = r1;; - - movl loc6 = PAL_MC_CLEAR_LOG - mov r2 = psr;; - mov loc5 = r2 - - cmp.eq p6,p7 = r28,loc6;; - (p7)movl loc6 = PAL_MC_DYNAMIC_STATE;; - (p7)cmp.eq p6,p7 = r28,loc6;; - - (p7)movl loc6 = PAL_MC_ERROR_INFO;; - (p7)cmp.eq p6,p7 = r28,loc6;; - - (p7)movl loc6 = PAL_MC_RESUME;; - (p7)cmp.eq p6,p7 = r28,loc6 - - mov loc6 = 0x1;; - (p7)dep r2 = loc6,r2,13,1;; // psr.ic = 1 - -// p6 will be true, if it is one of the MCHK calls. There has been lots of debate -// on psr.ic for these values. For now, do not do any thing to psr.ic - -// (p6)dep r2 = r0,r2,13,1;; // psr.ic = 0 - dep r2 = r0,r2,14,1;; // psr.i = 0 - - mov psr.l = r2 - srlz.d;; // Needs data serailization. - srlz.i;; // Needs instruction serailization. - -StaticGetPALLocalIP: - mov loc2 = ip;; - add loc2 = StaticComeBackFromPALCall - StaticGetPALLocalIP,loc2;; - mov b0 = loc2 // return address after Pal call - mov r28 = in1 // get the input parameters to PAL call - mov r29 = in2 - mov r30 = in3;; - mov r31 = in4 - mov b5 = in0;; // get the PalProcEntrypt from input - br.sptk b5 // Take the plunge. - -StaticComeBackFromPALCall: - - mov psr.l = loc5;; - srlz.d;; // Needs data serailization. - srlz.i;; // Needs instruction serailization. - - mov b5 = loc3 - mov r2 = loc4 - mov r1 = loc7 - - NESTED_RETURN - -PROCEDURE_EXIT(MakeStaticPALCall) - - -//----------------------------------------------------------------------------- -//++ -// MakeStackedPALCall -// -// This routine is called whenever an architected stacked calling convention -// based PAL call is to be made. This call is made after memory is available. -// Although stacked calls could be made directly from 'C', there is a PAL -// requirement which forces the index to be in GR28 and hence this stub is -// needed -// -// Arguments : All parameters set up to do stacted PAL call. -// -// On Entry : -// in0: PAL_PROC entrypoint -// in1-in4 : PAL_PROC arguments -// -// Return Value: -// -// As per stacked calling conventions. -// -//-- -//--------------------------------------------------------------------------- -PROCEDURE_ENTRY(MakeStackedPALCall) - - NESTED_SETUP (5,8,4,0) - mov loc3 = b5 - mov loc4 = r2 - mov loc7 = r1 - mov r2 = psr;; - mov loc5 = r2;; - dep r2 = r0,r2,14,1;; // psr.i = 0 - mov psr.l = r2 - srlz.d;; // Needs data serailization. - srlz.i;; // Needs instruction serailization. - -StackedGetPALLocalIP: - mov r28 = in1 // get the input parameters to PAL call - mov out0 = in1 - mov out1 = in2;; - mov out2 = in3 - mov out3 = in4 - mov b5 = in0;; // get the PalProcEntrypt from input - br.call.dpnt b0=b5;; // Take the plunge. - -StackedComeBackFromPALCall: - - mov psr.l = loc5;; - srlz.d;; // Needs data serailization. - srlz.i;; // Needs instruction serailization. - mov b5 = loc3 - mov r2 = loc4 - mov r1 = loc7 - - NESTED_RETURN - -PROCEDURE_EXIT(MakeStackedPALCall) - Index: gnu-efi.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gnu-efi.spec 27 Mar 2008 17:41:50 -0000 1.21 +++ gnu-efi.spec 29 Jul 2008 15:13:01 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Development Libraries and headers for EFI Name: gnu-efi Version: 3.0d -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/System License: GPL URL: ftp://ftp.hpl.hp.com/pub/linux-ia64 @@ -12,8 +12,9 @@ Patch3: gnu-efi-3.0d-rpm.patch Patch4: gnu-efi-3.0d-unwrap.patch Patch5: gnu-efi-3.0d-uefi_wrap_call10.patch +Patch6: gnu-efi-3.0d-palproc-license.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: ia64 i386 x86_64 +ExclusiveArch: i386 x86_64 %description This package contains development headers and libraries for developing @@ -27,6 +28,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build # Package cannot build with %{?_smp_mflags}. @@ -54,6 +56,10 @@ %{_libdir}/* %changelog +* Mon Jul 28 2008 Peter Jones - 3.0d-5 +- Remove ia64 palproc code since its license isn't usable. +- Remove ia64 from ExclusiveArch since it can't build... + * Thu Mar 27 2008 Peter Jones - 3.0d-4 - Fix uefi_call_wrapper(x, 10, ...) . - Add efi_main wrappers and EFI_CALL() macro so drivers are possible. From fedora-extras-commits at redhat.com Tue Jul 29 15:14:30 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 29 Jul 2008 15:14:30 GMT Subject: rpms/kdegraphics/F-9 kdegraphics.spec, 1.148, 1.149 sources, 1.47, 1.48 Message-ID: <200807291514.m6TFEUT5015231@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdegraphics/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15212 Modified Files: kdegraphics.spec sources Log Message: respun Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-9/kdegraphics.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- kdegraphics.spec 25 Jul 2008 16:51:50 -0000 1.148 +++ kdegraphics.spec 29 Jul 2008 15:13:59 -0000 1.149 @@ -5,7 +5,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdegraphics Obsoletes: kdegraphics4 < %{version}-%{release} @@ -183,6 +183,9 @@ %changelog +* Tue Jul 29 2008 Than Ngo - 4.1.0-3 +- respun + * Fri Jul 25 2008 Than Ngo 4.1.0-2 - respun Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-9/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 25 Jul 2008 16:51:50 -0000 1.47 +++ sources 29 Jul 2008 15:13:59 -0000 1.48 @@ -1 +1 @@ -d45c25889331497776d5aa3093951821 kdegraphics-4.1.0.tar.bz2 +2488d850b66eba1b542bded3def3e87e kdegraphics-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 15:22:50 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Tue, 29 Jul 2008 15:22:50 GMT Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.48,1.49 Message-ID: <200807291522.m6TFMoRb015563@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/OpenIPMI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15533 Modified Files: OpenIPMI.spec Log Message: - %{_libdir} doesn't need a /. Fixed. Index: OpenIPMI.spec =================================================================== RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- OpenIPMI.spec 29 Jul 2008 14:52:21 -0000 1.48 +++ OpenIPMI.spec 29 Jul 2008 15:22:20 -0000 1.49 @@ -77,7 +77,7 @@ %build %configure --with-pythoninstall=%{python_sitearch} -sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} /%{_libdir}|' libtool +sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool sed -i 's| -rpath \$(libdir)\( \$(libOpenIPMIposix_la_LDFLAGS)\)|\1|' unix/Makefile make pushd ipmitool-%{ipmitoolver} From fedora-extras-commits at redhat.com Tue Jul 29 14:22:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 14:22:00 +0000 Subject: [pkgdb] dhcp: wwoods has requested watchbugzilla Message-ID: <20080729142200.460F11AD0ED@bastion.fedora.phx.redhat.com> Will Woods (wwoods) has requested the watchbugzilla acl on dhcp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 15:38:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Tue, 29 Jul 2008 15:38:40 GMT Subject: rpms/qmmp/F-8 qmmp.spec,1.4,1.5 Message-ID: <200807291538.m6TFceJQ015935@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15912 Modified Files: qmmp.spec Log Message: + BuildRequires: libcurl-devel Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-8/qmmp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qmmp.spec 29 Jul 2008 15:10:29 -0000 1.4 +++ qmmp.spec 29 Jul 2008 15:38:10 -0000 1.5 @@ -19,7 +19,7 @@ BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel -BuildRequires: libmodplug-devel +BuildRequires: libmodplug-devel libcurl-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig @@ -109,7 +109,7 @@ - new version - updated %%description to match upstream - added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel -- added BuildRequires: libmodplug-devel +- added BuildRequires: libmodplug-devel libcurl-devel - xpm icon is not used anymore (several pngs available) - created devel subpackage From fedora-extras-commits at redhat.com Tue Jul 29 15:39:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:39:00 +0000 Subject: [pkgdb] gnubversion was added for laxathom Message-ID: <20080729153900.E403B1AD0E9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gnubversion with summary Gnome interface to Subversion Kevin Fenzi (kevin) has approved Package gnubversion Kevin Fenzi (kevin) has added a Fedora devel branch for gnubversion with an owner of laxathom Kevin Fenzi (kevin) has approved gnubversion in Fedora devel Kevin Fenzi (kevin) has approved Package gnubversion Kevin Fenzi (kevin) has set commit to Approved for packager on gnubversion (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on gnubversion (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on gnubversion (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on gnubversion (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on gnubversion (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on gnubversion (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnubversion From fedora-extras-commits at redhat.com Tue Jul 29 15:39:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:39:03 +0000 Subject: [pkgdb] gnubversion (Fedora, 8) updated by kevin Message-ID: <20080729153903.A15621AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for gnubversion Kevin Fenzi (kevin) has set commit to Approved for packager on gnubversion (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for packager on gnubversion (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for packager on gnubversion (Fedora 8) Kevin Fenzi (kevin) Approved packager for commit access on gnubversion (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnubversion From fedora-extras-commits at redhat.com Tue Jul 29 15:39:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:39:03 +0000 Subject: [pkgdb] gnubversion (Fedora, devel) updated by kevin Message-ID: <20080729153903.7ADB11AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved packager for commit access on gnubversion (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnubversion From fedora-extras-commits at redhat.com Tue Jul 29 15:39:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:39:15 GMT Subject: rpms/gnubversion Makefile,NONE,1.1 Message-ID: <200807291539.m6TFdF6q016102@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnubversion In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16035/rpms/gnubversion Added Files: Makefile Log Message: Setup of module gnubversion --- NEW FILE Makefile --- # Top level Makefile for module gnubversion all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 29 15:39:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:39:15 GMT Subject: rpms/gnubversion - New directory Message-ID: <200807291539.m6TFdFq1016063@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnubversion In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16035/rpms/gnubversion Log Message: Directory /cvs/extras/rpms/gnubversion added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 15:39:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:39:03 +0000 Subject: [pkgdb] gnubversion (Fedora, 9) updated by kevin Message-ID: <20080729153903.C687C1AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for gnubversion Kevin Fenzi (kevin) has set commit to Approved for packager on gnubversion (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on gnubversion (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on gnubversion (Fedora 9) Kevin Fenzi (kevin) Approved packager for commit access on gnubversion (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnubversion From fedora-extras-commits at redhat.com Tue Jul 29 15:39:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:39:15 GMT Subject: rpms/gnubversion/devel - New directory Message-ID: <200807291539.m6TFdF19016076@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnubversion/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16035/rpms/gnubversion/devel Log Message: Directory /cvs/extras/rpms/gnubversion/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 15:39:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:39:16 GMT Subject: rpms/gnubversion/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807291539.m6TFdGnD016117@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gnubversion/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi16035/rpms/gnubversion/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnubversion --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gnubversion # $Id: Makefile,v 1.1 2008/07/29 15:39:16 kevin Exp $ NAME := gnubversion SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 29 15:40:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:40:15 +0000 Subject: [pkgdb] perl-Tk-TableMatrix was added for kwizart Message-ID: <20080729154022.21B211AD10F@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Tk-TableMatrix with summary Perl module for creating and manipulating tables Kevin Fenzi (kevin) has approved Package perl-Tk-TableMatrix Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Tk-TableMatrix with an owner of kwizart Kevin Fenzi (kevin) has approved perl-Tk-TableMatrix in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Tk-TableMatrix Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Tk-TableMatrix (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Tk-TableMatrix (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Tk-TableMatrix (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-Tk-TableMatrix (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-Tk-TableMatrix (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-Tk-TableMatrix (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tk-TableMatrix From fedora-extras-commits at redhat.com Tue Jul 29 15:40:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:40:38 GMT Subject: rpms/perl-Tk-TableMatrix - New directory Message-ID: <200807291540.m6TFecDC016321@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Tk-TableMatrix In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16287/rpms/perl-Tk-TableMatrix Log Message: Directory /cvs/extras/rpms/perl-Tk-TableMatrix added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 15:40:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:40:17 +0000 Subject: [pkgdb] perl-Tk-TableMatrix (Fedora EPEL, 4) updated by kevin Message-ID: <20080729154020.CABC51AD101@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Tk-TableMatrix Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Tk-TableMatrix (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Tk-TableMatrix (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Tk-TableMatrix (Fedora EPEL 4) Kevin Fenzi (kevin) approved watchbugzilla on perl-Tk-TableMatrix (Fedora EPEL 4) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Tk-TableMatrix (Fedora EPEL 4) for perl-sig Kevin Fenzi (kevin) Approved packager for commit access on perl-Tk-TableMatrix (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tk-TableMatrix From fedora-extras-commits at redhat.com Tue Jul 29 15:40:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:40:17 +0000 Subject: [pkgdb] perl-Tk-TableMatrix (Fedora EPEL, 5) updated by kevin Message-ID: <20080729154023.84D011AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Tk-TableMatrix Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Tk-TableMatrix (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Tk-TableMatrix (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Tk-TableMatrix (Fedora EPEL 5) Kevin Fenzi (kevin) approved watchbugzilla on perl-Tk-TableMatrix (Fedora EPEL 5) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Tk-TableMatrix (Fedora EPEL 5) for perl-sig Kevin Fenzi (kevin) Approved packager for commit access on perl-Tk-TableMatrix (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tk-TableMatrix From fedora-extras-commits at redhat.com Tue Jul 29 15:40:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:40:17 +0000 Subject: [pkgdb] perl-Tk-TableMatrix (Fedora, 9) updated by kevin Message-ID: <20080729154024.6763F1AD11A@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Tk-TableMatrix Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Tk-TableMatrix (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Tk-TableMatrix (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Tk-TableMatrix (Fedora 9) Kevin Fenzi (kevin) approved watchbugzilla on perl-Tk-TableMatrix (Fedora 9) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Tk-TableMatrix (Fedora 9) for perl-sig Kevin Fenzi (kevin) Approved packager for commit access on perl-Tk-TableMatrix (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tk-TableMatrix From fedora-extras-commits at redhat.com Tue Jul 29 15:40:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:40:17 +0000 Subject: [pkgdb] perl-Tk-TableMatrix (Fedora, 8) updated by kevin Message-ID: <20080729154022.420731AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-Tk-TableMatrix Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Tk-TableMatrix (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Tk-TableMatrix (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Tk-TableMatrix (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on perl-Tk-TableMatrix (Fedora 8) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Tk-TableMatrix (Fedora 8) for perl-sig Kevin Fenzi (kevin) Approved packager for commit access on perl-Tk-TableMatrix (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tk-TableMatrix From fedora-extras-commits at redhat.com Tue Jul 29 15:40:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:40:17 +0000 Subject: [pkgdb] perl-Tk-TableMatrix (Fedora, devel) updated by kevin Message-ID: <20080729154026.21D131AD0FF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on perl-Tk-TableMatrix (Fedora devel) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-Tk-TableMatrix (Fedora devel) for perl-sig Kevin Fenzi (kevin) Approved packager for commit access on perl-Tk-TableMatrix (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Tk-TableMatrix From fedora-extras-commits at redhat.com Tue Jul 29 15:40:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:40:38 GMT Subject: rpms/perl-Tk-TableMatrix Makefile,NONE,1.1 Message-ID: <200807291540.m6TFec83016358@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Tk-TableMatrix In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16287/rpms/perl-Tk-TableMatrix Added Files: Makefile Log Message: Setup of module perl-Tk-TableMatrix --- NEW FILE Makefile --- # Top level Makefile for module perl-Tk-TableMatrix all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 29 15:40:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:40:38 GMT Subject: rpms/perl-Tk-TableMatrix/devel - New directory Message-ID: <200807291540.m6TFecP4016335@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Tk-TableMatrix/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16287/rpms/perl-Tk-TableMatrix/devel Log Message: Directory /cvs/extras/rpms/perl-Tk-TableMatrix/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 15:40:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:40:39 GMT Subject: rpms/perl-Tk-TableMatrix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807291540.m6TFedKT016374@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Tk-TableMatrix/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv16287/rpms/perl-Tk-TableMatrix/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Tk-TableMatrix --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Tk-TableMatrix # $Id: Makefile,v 1.1 2008/07/29 15:40:38 kevin Exp $ NAME := perl-Tk-TableMatrix SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 29 15:41:01 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 29 Jul 2008 15:41:01 GMT Subject: rpms/ctags/devel ctags.spec,1.23,1.24 Message-ID: <200807291541.m6TFf1ti016581@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/ctags/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16143 Modified Files: ctags.spec Log Message: fix typo Index: ctags.spec =================================================================== RCS file: /cvs/extras/rpms/ctags/devel/ctags.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ctags.spec 29 Jul 2008 14:47:45 -0000 1.23 +++ ctags.spec 29 Jul 2008 15:40:31 -0000 1.24 @@ -51,9 +51,11 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install + pushd %{buildroot}%{_bindir} -ls -s ctags etags.ctags +ln -s ctags etags.ctags popd + pushd %{buildroot}%{_mandir}/man1 ln -s ctags.1.gz etags.ctags.1.gz popd From fedora-extras-commits at redhat.com Tue Jul 29 15:42:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:42:09 +0000 Subject: [pkgdb] perl-Filesys-Df was added for msuchy Message-ID: <20080729154209.000761AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-Filesys-Df with summary Perl extension for filesystem disk space information Kevin Fenzi (kevin) has approved Package perl-Filesys-Df Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Filesys-Df with an owner of msuchy Kevin Fenzi (kevin) has approved perl-Filesys-Df in Fedora devel Kevin Fenzi (kevin) has approved Package perl-Filesys-Df Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Filesys-Df (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Filesys-Df (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Filesys-Df (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on perl-Filesys-Df (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on perl-Filesys-Df (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on perl-Filesys-Df (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Filesys-Df From fedora-extras-commits at redhat.com Tue Jul 29 15:42:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:42:10 +0000 Subject: [pkgdb] perl-Filesys-Df (Fedora, 9) updated by kevin Message-ID: <20080729154210.228531AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Filesys-Df Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Filesys-Df (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Filesys-Df (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Filesys-Df (Fedora 9) Kevin Fenzi (kevin) Approved packager for commit access on perl-Filesys-Df (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Filesys-Df From fedora-extras-commits at redhat.com Tue Jul 29 15:42:22 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Tue, 29 Jul 2008 15:42:22 GMT Subject: common Makefile.common,1.107,1.108 Message-ID: <200807291542.m6TFgMOw016724@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16670 Modified Files: Makefile.common Log Message: add lint as a target, thanks ajax Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- Makefile.common 28 Jul 2008 22:36:27 -0000 1.107 +++ Makefile.common 29 Jul 2008 15:41:52 -0000 1.108 @@ -35,6 +35,7 @@ BUILD_FLAGS ?= $(KOJI_FLAGS) +LOCALARCH := $(if $(shell grep -i '^BuildArch:.*noarch' $(SPECFILE)), noarch, $(shell uname -m)) ## a base directory where we'll put as much temporary working stuff as we can ifndef WORKDIR @@ -314,6 +315,11 @@ mockbuild : srpm mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(MOCKDIR)/$(TAG) rebuild $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm +# check the build with rpmlint +lint: + @test -e $(NAME)-$(VERSION)-$(RELEASE).src.rpm || (echo "run 'make local' first" ; exit 1 ) + rpmlint $(NAME)-$(VERSION)-$(RELEASE).src.rpm $(LOCALARCH)/*-$(VERSION)-$(RELEASE).$(LOCALARCH).rpm + # build for a particular arch $(ARCHES) : sources $(TARGETS) $(RPM_WITH_DIRS) --target $@ -ba $(SPECFILE) 2>&1 | tee .build-$(VERSION)-$(RELEASE).log ; exit $${PIPESTATUS[0]} @@ -322,7 +328,7 @@ FORCE: # build whatever's appropriate for the local architecture -local: $(if $(shell grep -i '^BuildArch:.*noarch' $(SPECFILE)), noarch, $(shell uname -m)) +local: $(LOCALARCH) # attempt to apply all the patches, optionally only for a particular arch ifdef PREPARCH @@ -585,6 +591,7 @@ @echo " install Local test rpmbuild install" @echo " compile-short Local test rpmbuild short-circuit compile" @echo " install-short Local test rpmbuild short-circuit install" + @echo " lint Run rpmlint against local build output" @echo " export Create clean export in \"cvs-$(TAG)\"" @echo " check Check test srpm preps on all archs" @echo " srpm Create a srpm" From fedora-extras-commits at redhat.com Tue Jul 29 15:42:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:42:25 GMT Subject: rpms/perl-Filesys-Df - New directory Message-ID: <200807291542.m6TFgPWo016758@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Filesys-Df In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO16730/rpms/perl-Filesys-Df Log Message: Directory /cvs/extras/rpms/perl-Filesys-Df added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 15:42:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:42:25 GMT Subject: rpms/perl-Filesys-Df Makefile,NONE,1.1 Message-ID: <200807291542.m6TFgPhe016795@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Filesys-Df In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO16730/rpms/perl-Filesys-Df Added Files: Makefile Log Message: Setup of module perl-Filesys-Df --- NEW FILE Makefile --- # Top level Makefile for module perl-Filesys-Df all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Tue Jul 29 15:42:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:42:25 GMT Subject: rpms/perl-Filesys-Df/devel - New directory Message-ID: <200807291542.m6TFgPo8016772@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Filesys-Df/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO16730/rpms/perl-Filesys-Df/devel Log Message: Directory /cvs/extras/rpms/perl-Filesys-Df/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 29 15:42:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:42:10 +0000 Subject: [pkgdb] perl-Filesys-Df (Fedora EPEL, 4) updated by kevin Message-ID: <20080729154210.B0A151AD104@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Filesys-Df Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Filesys-Df (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Filesys-Df (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Filesys-Df (Fedora EPEL 4) Kevin Fenzi (kevin) Approved packager for commit access on perl-Filesys-Df (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Filesys-Df From fedora-extras-commits at redhat.com Tue Jul 29 15:42:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:42:10 +0000 Subject: [pkgdb] perl-Filesys-Df (Fedora, devel) updated by kevin Message-ID: <20080729154210.4BE591AD101@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved packager for commit access on perl-Filesys-Df (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Filesys-Df From fedora-extras-commits at redhat.com Tue Jul 29 15:42:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:42:10 +0000 Subject: [pkgdb] perl-Filesys-Df (Fedora EPEL, 5) updated by kevin Message-ID: <20080729154210.33E0B1AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Filesys-Df Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Filesys-Df (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Filesys-Df (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Filesys-Df (Fedora EPEL 5) Kevin Fenzi (kevin) Approved packager for commit access on perl-Filesys-Df (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Filesys-Df From fedora-extras-commits at redhat.com Tue Jul 29 15:42:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 29 Jul 2008 15:42:26 GMT Subject: rpms/perl-Filesys-Df/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807291542.m6TFgQFF016810@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-Filesys-Df/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO16730/rpms/perl-Filesys-Df/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Filesys-Df --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Filesys-Df # $Id: Makefile,v 1.1 2008/07/29 15:42:26 kevin Exp $ NAME := perl-Filesys-Df SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Jul 29 15:43:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:43:24 +0000 Subject: [pkgdb] perl-Math-FFT (Fedora, 9) updated by kevin Message-ID: <20080729154324.45C911AD0E5@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for perl-Math-FFT Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Math-FFT (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Math-FFT (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Math-FFT (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-FFT From fedora-extras-commits at redhat.com Tue Jul 29 15:43:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:43:24 +0000 Subject: [pkgdb] perl-Math-FFT (Fedora EPEL, 5) updated by kevin Message-ID: <20080729154324.B3E371AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Math-FFT Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Math-FFT (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Math-FFT (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Math-FFT (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-FFT From fedora-extras-commits at redhat.com Tue Jul 29 15:43:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 15:43:24 +0000 Subject: [pkgdb] perl-Math-FFT (Fedora EPEL, 4) updated by kevin Message-ID: <20080729154324.F24AA1AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Math-FFT Kevin Fenzi (kevin) has set commit to Approved for packager on perl-Math-FFT (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for packager on perl-Math-FFT (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for packager on perl-Math-FFT (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-FFT From fedora-extras-commits at redhat.com Tue Jul 29 14:35:14 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Tue, 29 Jul 2008 14:35:14 GMT Subject: rpms/qmmp/devel qmmp.spec,1.4,1.5 Message-ID: <200807291435.m6TEZEw1006917@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879 Modified Files: qmmp.spec Log Message: forgot BuildRequires openssl-devel ... Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qmmp.spec 29 Jul 2008 14:06:07 -0000 1.4 +++ qmmp.spec 29 Jul 2008 14:34:44 -0000 1.5 @@ -19,6 +19,7 @@ BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +BuildRequires: openssl-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig @@ -108,6 +109,7 @@ - new version - updated %%description to match upstream - added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +- added BuildRequires: openssl-devel (fixes bug #449658) - xpm icon is not used anymore (several pngs available) - created devel subpackage From fedora-extras-commits at redhat.com Tue Jul 29 16:14:57 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Tue, 29 Jul 2008 16:14:57 GMT Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.49,1.50 Message-ID: <200807291614.m6TGEv3R024472@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/OpenIPMI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24443 Modified Files: OpenIPMI.spec Log Message: - Added necessary -fPIC for compilation (odly was missing) Index: OpenIPMI.spec =================================================================== RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- OpenIPMI.spec 29 Jul 2008 15:22:20 -0000 1.49 +++ OpenIPMI.spec 29 Jul 2008 16:14:26 -0000 1.50 @@ -76,6 +76,7 @@ popd %build +export CFLAGS=-fPIC %configure --with-pythoninstall=%{python_sitearch} sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool sed -i 's| -rpath \$(libdir)\( \$(libOpenIPMIposix_la_LDFLAGS)\)|\1|' unix/Makefile From fedora-extras-commits at redhat.com Tue Jul 29 16:22:25 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 29 Jul 2008 16:22:25 GMT Subject: rpms/dovecot/F-9 dovecot-1.0-default-settings-passwd.patch, NONE, 1.1 dovecot.sysconfig, NONE, 1.1 dovecot.init, 1.4, 1.5 dovecot.spec, 1.104, 1.105 Message-ID: <200807291622.m6TGMPYJ024710@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/dovecot/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24667 Modified Files: dovecot.init dovecot.spec Added Files: dovecot-1.0-default-settings-passwd.patch dovecot.sysconfig Log Message: * Tue Jul 29 2008 Dan Hor??k - 1:1.0.15-11 - final solution for #445200 (put the password into /etc/sysconfig/dovecot) dovecot-1.0-default-settings-passwd.patch: --- NEW FILE dovecot-1.0-default-settings-passwd.patch --- --- dovecot-1.0.15/dovecot-example.conf.passwd 2008-07-29 17:31:37.000000000 +0200 +++ dovecot-1.0.15/dovecot-example.conf 2008-07-29 17:31:55.000000000 +0200 @@ -93,6 +93,8 @@ # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. +# Security note: if you have this config file world readable, then put the +# password into /etc/sysconfig/dovecot. #ssl_key_password = # File containing trusted SSL certificate authorities. Set this only if you --- NEW FILE dovecot.sysconfig --- # Here you can specify the password for your SSL certificates # so the main config file can be world readable. Other command # line options can be specified too. # #OPTIONS="-p my_certificate_password" Index: dovecot.init =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/F-9/dovecot.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dovecot.init 18 Jun 2008 13:15:08 -0000 1.4 +++ dovecot.init 29 Jul 2008 16:21:55 -0000 1.5 @@ -8,6 +8,7 @@ # description: Dovecot Imap Server # processname: dovecot # config: /etc/dovecot.conf +# config: /etc/sysconfig/dovecot # pidfile: /var/run/dovecot/master.pid ### BEGIN INIT INFO @@ -27,6 +28,10 @@ # Source function library. . /etc/init.d/functions +if [ -f /etc/sysconfig/dovecot ]; then + . /etc/sysconfig/dovecot +fi + RETVAL=0 prog="Dovecot Imap" exec="/usr/sbin/dovecot" @@ -39,7 +44,7 @@ [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --pidfile $pidfile $exec + daemon --pidfile $pidfile $exec $OPTIONS RETVAL=$? [ $RETVAL -eq 0 ] && touch $lockfile echo Index: dovecot.spec =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/F-9/dovecot.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- dovecot.spec 1 Jul 2008 19:51:10 -0000 1.104 +++ dovecot.spec 29 Jul 2008 16:21:55 -0000 1.105 @@ -1,7 +1,7 @@ %define upstream 1.0.15 %define sieve_upstream 1.0.3 %define pkg_version 1.0.15 -%define my_release 10 +%define my_release 11 %define pkg_release %{my_release}%{?dist} %define pkg_sieve_version 1.0.3 %define pkg_sieve_release %{my_release}%{?dist} @@ -32,13 +32,13 @@ Source6: perfect_maildir.pl Source7: dovecot-REDHAT-FAQ.txt Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz +Source9: dovecot.sysconfig Patch100: dovecot-1.0.rc15-default-settings.patch Patch102: dovecot-1.0.rc2-pam-setcred.patch Patch103: dovecot-1.0.beta2-mkcert-permissions.patch Patch105: dovecot-1.0.rc7-mkcert-paths.patch Patch106: dovecot-1.0.rc27-quota-warning.patch -#Patch107: dovecot-1.1-unicodedata.patch -#Patch200: dovecot-%{dovecot_hg}.patch +Patch107: dovecot-1.0-default-settings-passwd.patch Patch200: dovecot-1.0.rc32-split.patch # XXX this patch needs review and forward porting @@ -182,6 +182,7 @@ %patch105 -p1 -b .mkcert-paths #%patch107 -p1 -b .unicodedata %patch106 -p1 -b .quota-warning +%patch107 -p1 -b .passwd %patch200 -p1 -b .split #%patch200 -p1 -b .%{dovecot_hg} %patch1000 -p1 -b .winbind @@ -253,6 +254,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/dovecot +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig +install -p -m 600 %{SOURCE9} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/dovecot + # generate ghost .pem file mkdir -p $RPM_BUILD_ROOT/%{ssldir}/certs mkdir -p $RPM_BUILD_ROOT/%{ssldir}/private @@ -366,7 +370,8 @@ %files -f libs.filelist %defattr(-,root,root) %doc %{docdir}-%{version} -%attr(0640,dovecot,mail) %config(noreplace) %{_sysconfdir}/dovecot.conf +%config(noreplace) %{_sysconfdir}/dovecot.conf +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot %config %{_sysconfdir}/rc.d/init.d/dovecot %config(noreplace) %{_sysconfdir}/pam.d/dovecot %dir %{ssldir} @@ -428,6 +433,9 @@ %changelog +* Tue Jul 29 2008 Dan Hor??k - 1:1.0.15-11 +- final solution for #445200 (put the password into /etc/sysconfig/dovecot) + * Tue Jul 1 2008 Dan Hor??k - 1:1.0.15-10 - bump release From fedora-extras-commits at redhat.com Tue Jul 29 16:32:06 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 16:32:06 GMT Subject: rpms/pcmanfm/devel pcmanfm.spec,1.22,1.23 Message-ID: <200807291632.m6TGW6qr025157@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111 Modified Files: pcmanfm.spec Log Message: * Tue Jul 29 2008 Mamoru Tasaka - 0.5-2 - F-10+: Use more generic icon name due to gnome-icon-theme 2.23.X change First try (need more fix) Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- pcmanfm.spec 17 Jul 2008 08:04:06 -0000 1.22 +++ pcmanfm.spec 29 Jul 2008 16:31:36 -0000 1.23 @@ -3,7 +3,7 @@ Name: pcmanfm Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extremly fast and lightweight file manager Group: User Interface/Desktops @@ -31,6 +31,42 @@ %setup -q %patch0 -p1 -b .search_hang +%if 0%{?fedora} >= 10 +function replace_icon(){ + find . -name \*.c | xargs grep -l $1 | \ + xargs %{__sed} -i -e "s|\"$1\"|\"$2\"|" +} + +replace_icon gnome-dev-cdrom gtk-cdrom +replace_icon gnome-dev-floppy media-floppy +replace_icon gnome-dev-disc-cdr gtk-cdrom +replace_icon gnome-dev-disc-cdrw gtk-cdrom +for type in \ + gnome-dev-disc-dvdrom gnome-dev-disc-dvdram \ + gnome-dev-disc-dvdrw gnome-dev-disc-dvdr-plus + do + replace_icon $type media-optical-dvd +done +replace_icon gnome-dev-harddisk drive-harddisk +replace_icon gnome-dev-harddisk-usb drive-harddisk-usb +replace_icon gnome-dev-harddisk-1394 drive-harddisk-ieee1394 +replace_icon gnome-dev-media-cf media-flash-cf +replace_icon gnome-dev-media-ms media-flash-ms +replace_icon gnome-dev-media-sm media-flash-sm +replace_icon gnome-dev-media-sdmmc media-flash-sd +replace_icon gnome-dev-removable drive-removable-media +replace_icon gnome-dev-removable-1394 drive-removable-media-ieee1394 +replace_icon gnome-dev-removable-usb drive-removable-media-usb +replace_icon gnome-fs-desktop user-desktop +replace_icon gnome-fs-directory gtk-directory +replace_icon gnome-fs-home user-home +replace_icon gnome-fs-trash-empty user-trash +#replace_icon gnome-mime- '' +replace_icon gnome-mime-application-x-executable \ + application-x-executable + +%endif + # permission fix %{__chmod} 0644 \ [A-Z]* @@ -96,6 +132,10 @@ %{_datadir}/mime/packages/*.xml %changelog +* Tue Jul 29 2008 Mamoru Tasaka - 0.5-2 +- F-10+: Use more generic icon name due to gnome-icon-theme 2.23.X change + First try (need more fix) + * Thu Jul 17 2008 Mamoru Tasaka - 0.5-1 - 0.5 From fedora-extras-commits at redhat.com Tue Jul 29 16:32:30 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 29 Jul 2008 16:32:30 GMT Subject: rpms/dovecot/F-8 dovecot-1.0-default-settings-passwd.patch, NONE, 1.1 dovecot.sysconfig, NONE, 1.1 dovecot.spec, 1.101, 1.102 Message-ID: <200807291632.m6TGWUSd025177@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/dovecot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25136 Modified Files: dovecot.spec Added Files: dovecot-1.0-default-settings-passwd.patch dovecot.sysconfig Log Message: * Tue Jul 29 2008 Dan Hor??k - 1:1.0.15-11 - final solution for #445200 (put the password into /etc/sysconfig/dovecot) dovecot-1.0-default-settings-passwd.patch: --- NEW FILE dovecot-1.0-default-settings-passwd.patch --- --- dovecot-1.0.15/dovecot-example.conf.passwd 2008-07-29 17:31:37.000000000 +0200 +++ dovecot-1.0.15/dovecot-example.conf 2008-07-29 17:31:55.000000000 +0200 @@ -93,6 +93,8 @@ # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. +# Security note: if you have this config file world readable, then put the +# password into /etc/sysconfig/dovecot. #ssl_key_password = # File containing trusted SSL certificate authorities. Set this only if you --- NEW FILE dovecot.sysconfig --- # Here you can specify the password for your SSL certificates # so the main config file can be world readable. Other command # line options can be specified too. # #OPTIONS="-p my_certificate_password" Index: dovecot.spec =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/F-8/dovecot.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- dovecot.spec 1 Jul 2008 19:49:37 -0000 1.101 +++ dovecot.spec 29 Jul 2008 16:31:59 -0000 1.102 @@ -1,7 +1,7 @@ %define upstream 1.0.15 %define sieve_upstream 1.0.3 %define pkg_version 1.0.15 -%define my_release 10 +%define my_release 11 %define pkg_release %{my_release}%{?dist} %define pkg_sieve_version 1.0.3 %define pkg_sieve_release %{my_release}%{?dist} @@ -32,13 +32,13 @@ Source6: perfect_maildir.pl Source7: dovecot-REDHAT-FAQ.txt Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz +Source9: dovecot.sysconfig Patch100: dovecot-1.0.rc15-default-settings.patch Patch102: dovecot-1.0.rc2-pam-setcred.patch Patch103: dovecot-1.0.beta2-mkcert-permissions.patch Patch105: dovecot-1.0.rc7-mkcert-paths.patch Patch106: dovecot-1.0.rc27-quota-warning.patch -#Patch107: dovecot-1.1-unicodedata.patch -#Patch200: dovecot-%{dovecot_hg}.patch +Patch107: dovecot-1.0-default-settings-passwd.patch Patch200: dovecot-1.0.rc32-split.patch # XXX this patch needs review and forward porting @@ -182,6 +182,7 @@ %patch105 -p1 -b .mkcert-paths #%patch107 -p1 -b .unicodedata %patch106 -p1 -b .quota-warning +%patch107 -p1 -b .passwd %patch200 -p1 -b .split #%patch200 -p1 -b .%{dovecot_hg} %patch1000 -p1 -b .winbind @@ -253,6 +254,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/dovecot +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig +install -p -m 600 %{SOURCE9} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/dovecot + # generate ghost .pem file mkdir -p $RPM_BUILD_ROOT/%{ssldir}/certs mkdir -p $RPM_BUILD_ROOT/%{ssldir}/private @@ -366,7 +370,8 @@ %files -f libs.filelist %defattr(-,root,root) %doc %{docdir}-%{version} -%attr(0640,dovecot,mail) %config(noreplace) %{_sysconfdir}/dovecot.conf +%config(noreplace) %{_sysconfdir}/dovecot.conf +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot %config %{_sysconfdir}/rc.d/init.d/dovecot %config(noreplace) %{_sysconfdir}/pam.d/dovecot %dir %{ssldir} @@ -428,6 +433,9 @@ %changelog +* Tue Jul 29 2008 Dan Hor??k - 1:1.0.15-11 +- final solution for #445200 (put the password into /etc/sysconfig/dovecot) + * Tue Jul 1 2008 Dan Hor??k - 1:1.0.15-10 - bump release From fedora-extras-commits at redhat.com Tue Jul 29 16:34:00 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 16:34:00 GMT Subject: rpms/kazehakase/F-8 .cvsignore, 1.14, 1.15 kazehakase.spec, 1.58, 1.59 sources, 1.14, 1.15 Message-ID: <200807291634.m6TGY0gP025363@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25292/F-8 Modified Files: .cvsignore kazehakase.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 0.5.5-1 - 0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 29 Mar 2008 15:32:57 -0000 1.14 +++ .cvsignore 29 Jul 2008 16:33:30 -0000 1.15 @@ -1 +1 @@ -kazehakase-0.5.4.tar.gz +kazehakase-0.5.5.tar.gz Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- kazehakase.spec 16 Jul 2008 01:28:10 -0000 1.58 +++ kazehakase.spec 29 Jul 2008 16:33:30 -0000 1.59 @@ -12,18 +12,12 @@ %undefine usesvn %define need_autogen 0 -%if 0%{?fedora} == 9 +%if 0%{?fedora} >= 9 %define Geckover 1.9 -#%%define usesvn 1 -%define need_autogen 1 %endif %if 0%{?fedora} == 8 %define Geckover 1.8.1.16 %endif -%if 0%{?fedora} == 7 -%define Geckover 1.8.1.16 -%define need_autogen 1 -%endif %if 0%{?use_svn} > 0 %define need_autogen 1 @@ -31,28 +25,25 @@ %define obsolete_plugin_ver 0.4.5-1 -%define repoid 30219 -%define svnver 3501_trunk +%define repoid 32341 +%define svnver 3506_trunk -%define fedorarel 2 +%define fedorarel 1 %define _release %{fedorarel}%{?usesvn:.svn%svnver} Name: kazehakase -Version: 0.5.4 -Release: %{_release}%{?dist}.3 +Version: 0.5.5 +Release: %{_release}%{?dist} Summary: Kazehakase browser using Gecko rendering engine Group: Applications/Internet License: GPLv2+ URL: http://kazehakase.sourceforge.jp/ Source0: http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz -%if 0%{?fedora} < 8 -Patch0: kazehakase-svn3235-3237-diff.patch.gz -%endif %if 0%{?fedora} >= 9 -Patch10: kazehakase-0.5.4-compile.patch +Patch11: kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -90,13 +81,17 @@ # bogus value wont make it into a real package %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 || echo -n "999") BuildRequires: glib2-devel -Requires: glib2 >= %{glib_ver} +# drop this for now +# Requires: glib2 >= %{glib_ver} +%if 0%{?fedora} < 9 BuildRequires: gecko-devel %{?Geckover:= %{Geckover}} -%if 0%{?fedora} > 8 +Requires: gecko-libs %{?Geckover:= %{Geckover}} +%else +BuildRequires: gecko-devel %{?Geckover:>= %{Geckover}} BuildRequires: gecko-devel-unstable +Requires: gecko-libs %{?Geckover:>= %{Geckover}} %endif -Requires: gecko-libs %{?Geckover:= %{Geckover}} %if %{need_autogen} BuildRequires: intltool @@ -109,8 +104,6 @@ a user interface that is truly user-friendly & fully customizable. This package uses Gecko for HTML rendering engine. -If you want to use WebKit for HTML rendering engine, install -"kazehakase-webkit" rpm instead. %package base Summary: Base package of Kazehakase @@ -176,23 +169,15 @@ %prep %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver} -%if 0%{?fedora} >= 9 -%patch10 -p1 -b .compile -%endif -%if 0%{?fedora} < 8 -%{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \ - ( for f in `find . -name \*.rej | sort` ; do cat $f ; done ) +%if 0%{?fedora} >= 9 +%patch11 -p0 -b .rhbug %endif %if %{need_autogen} sh autogen.sh %endif -%if 0%{?fedora} == 9 -sed -i.gcc43 -e 's|-Werror||' configure -%endif - %if %{support_anthy} %{__sed} -i.anthy -e '/^anthy_available/d' configure %endif @@ -204,21 +189,25 @@ done %build +%if 0%{?fedora} >= 10 +export CFLAGS="%optflags -UGTK_DISABLE_DEPRECATED" +export CXXFLAGS="%optflags -UGTK_DISABLE_DEPRECATED" +%endif + %configure \ -%if 0%{?fedora} == 9 +%if 0%{?fedora} >= 9 CC="%{__cc} `nspr-config --cflags`" \ CXX="%{__cxx} `nspr-config --cflags`" \ %endif --enable-migemo \ -%if 0%{?fedora} == 9 -%if 1 +%if 0%{?fedora} >= 9 + --with-gecko-engine=libxul \ --disable-gtkmozembed -%endif %else --with-gecko-engine=firefox %endif -%if 0%{?fedora} == 9 +%if 0%{?fedora} >= 9 sed -i.bool -e \ 's|#define \(MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_\) 1|#undef \1|' \ config.h @@ -243,14 +232,6 @@ %{find_lang} %{name} -%if 1 -%if 0%{?fedora} == 9 -: This package builds, but does not work at all!! -: Disabling build intentionally -exit 1 -%endif -%endif - %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -312,14 +293,39 @@ %endif %changelog -* Tue Jul 15 2008 Christopher Aillon - 0.5.4-2.3 -- Rebuild against newer gecko +* Wed Jul 30 2008 Mamoru Tasaka - 0.5.5-1 +- 0.5.5 -* Wed Jul 02 2008 Christopher Aillon - 0.5.4-2.2 -- Rebuild against newer gecko +* Sat Jul 19 2008 Mamoru Tasaka - 0.5.4-7.svn3506_trunk +- F-9+: relax gecko libs dependency (as GRE_GetGREPathWithProperties properly + finds out GRE) +- F-10+: add -UGTK_DISABLE_DEPRECATED temporarily + +* Tue Jul 15 2008 Christopher Aillon +- Rebuild against newer gecko (F-8) + +* Wed Jul 02 2008 Christopher Aillon +- Rebuild against newer gecko (F-8) + +* Sat Jun 28 2008 Mamoru Tasaka - 0.5.4-6.svn3506_trunk +- Try rev 3506 +- Workaround for bug 447444 (xulrunner vs hunspell conflict) (F-9+) + +* Wed Jun 25 2008 Mamoru Tasaka - 0.5.4-5 +- Apply xulrunner related patches from debian by Mike Hommey + (debian bug 480796, rh bug 402641) + This time kazehakase actually works with xulrunner! + +* Tue Apr 29 2008 Mamoru Tasaka - 0.5.4-4 +- Remove redundant description per rel-eng team request + +* Wed Apr 23 2008 Mamoru Tasaka - 0.5.4-3 +- F-9: temporizing fix for xulrunner + * Enable gtk-mozembed - don't work at all, however does not crash + * force to install WebKit version * Wed Apr 16 2008 Christopher Aillon - 0.5.4-2.1 -- Rebuild against newer gecko +- Rebuild against newer gecko (F-8/9) * Mon Apr 14 2008 Mamoru Tasaka - 0.5.4-2 - Rebuild for new WebKit (F-7/8: bug 438531) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 29 Mar 2008 15:32:57 -0000 1.14 +++ sources 29 Jul 2008 16:33:30 -0000 1.15 @@ -1 +1 @@ -75f8afb9ddf4493c3a1fb4eb38a044df kazehakase-0.5.4.tar.gz +a140695fca0782372763480bd8bad8e7 kazehakase-0.5.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 16:34:01 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 16:34:01 GMT Subject: rpms/kazehakase/F-9 .cvsignore, 1.18, 1.19 kazehakase.spec, 1.62, 1.63 sources, 1.18, 1.19 Message-ID: <200807291634.m6TGY10c025368@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25292/F-9 Modified Files: .cvsignore kazehakase.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 0.5.5-1 - 0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-9/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 30 Jun 2008 12:44:18 -0000 1.18 +++ .cvsignore 29 Jul 2008 16:33:31 -0000 1.19 @@ -1 +1 @@ -kazehakase-0.5.4-svn3506_trunk.tar.gz +kazehakase-0.5.5.tar.gz Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-9/kazehakase.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- kazehakase.spec 19 Jul 2008 02:47:28 -0000 1.62 +++ kazehakase.spec 29 Jul 2008 16:33:31 -0000 1.63 @@ -14,15 +14,9 @@ %if 0%{?fedora} >= 9 %define Geckover 1.9 -%define usesvn 1 -%define need_autogen 1 %endif %if 0%{?fedora} == 8 -%define Geckover 1.8.1.14 -%endif -%if 0%{?fedora} == 7 -%define Geckover 1.8.1.14 -%define need_autogen 1 +%define Geckover 1.8.1.16 %endif %if 0%{?use_svn} > 0 @@ -31,16 +25,16 @@ %define obsolete_plugin_ver 0.4.5-1 -%define repoid 30219 +%define repoid 32341 %define svnver 3506_trunk -%define fedorarel 7 +%define fedorarel 1 %define _release %{fedorarel}%{?usesvn:.svn%svnver} Name: kazehakase -Version: 0.5.4 +Version: 0.5.5 Release: %{_release}%{?dist} Summary: Kazehakase browser using Gecko rendering engine @@ -48,10 +42,6 @@ License: GPLv2+ URL: http://kazehakase.sourceforge.jp/ Source0: http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz -%if 0%{?fedora} < 8 -Source1: gscripttable.h.gz -Patch0: kazehakase-svn3235-3237-diff.patch.gz -%endif %if 0%{?fedora} >= 9 Patch11: kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch %endif @@ -91,7 +81,8 @@ # bogus value wont make it into a real package %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 || echo -n "999") BuildRequires: glib2-devel -Requires: glib2 >= %{glib_ver} +# drop this for now +# Requires: glib2 >= %{glib_ver} %if 0%{?fedora} < 9 BuildRequires: gecko-devel %{?Geckover:= %{Geckover}} @@ -179,15 +170,6 @@ %prep %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver} -%if 0%{?fedora} < 8 -%{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \ - ( for f in `find . -name \*.rej | sort` ; do cat $f ; done ) - -cd src/utils -cp -p %SOURCE1 . -%{__gzip} -d *gz -cd ../.. -%endif %if 0%{?fedora} >= 9 %patch11 -p0 -b .rhbug %endif @@ -196,10 +178,6 @@ sh autogen.sh %endif -%if 0%{?fedora} == 9 -sed -i.gcc43 -e 's|-Werror||' configure -%endif - %if %{support_anthy} %{__sed} -i.anthy -e '/^anthy_available/d' configure %endif @@ -211,6 +189,11 @@ done %build +%if 0%{?fedora} >= 10 +export CFLAGS="%optflags -UGTK_DISABLE_DEPRECATED" +export CXXFLAGS="%optflags -UGTK_DISABLE_DEPRECATED" +%endif + %configure \ %if 0%{?fedora} >= 9 CC="%{__cc} `nspr-config --cflags`" \ @@ -310,13 +293,23 @@ %endif %changelog +* Wed Jul 30 2008 Mamoru Tasaka - 0.5.5-1 +- 0.5.5 + * Sat Jul 19 2008 Mamoru Tasaka - 0.5.4-7.svn3506_trunk - F-9+: relax gecko libs dependency (as GRE_GetGREPathWithProperties properly finds out GRE) +- F-10+: add -UGTK_DISABLE_DEPRECATED temporarily + +* Tue Jul 15 2008 Christopher Aillon +- Rebuild against newer gecko (F-8) + +* Wed Jul 02 2008 Christopher Aillon +- Rebuild against newer gecko (F-8) * Sat Jun 28 2008 Mamoru Tasaka - 0.5.4-6.svn3506_trunk - Try rev 3506 -- Workaround for bug 447444 (xulrunner vs hunspell conflict) +- Workaround for bug 447444 (xulrunner vs hunspell conflict) (F-9+) * Wed Jun 25 2008 Mamoru Tasaka - 0.5.4-5 - Apply xulrunner related patches from debian by Mike Hommey Index: sources =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 30 Jun 2008 12:44:18 -0000 1.18 +++ sources 29 Jul 2008 16:33:31 -0000 1.19 @@ -1 +1 @@ -10a8948ab365e25520d931c8c0957ac8 kazehakase-0.5.4-svn3506_trunk.tar.gz +a140695fca0782372763480bd8bad8e7 kazehakase-0.5.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 16:34:01 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 16:34:01 GMT Subject: rpms/kazehakase/devel .cvsignore, 1.19, 1.20 kazehakase.spec, 1.63, 1.64 sources, 1.19, 1.20 Message-ID: <200807291634.m6TGY1rt025373@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25292/devel Modified Files: .cvsignore kazehakase.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 0.5.5-1 - 0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 28 Jun 2008 00:33:34 -0000 1.19 +++ .cvsignore 29 Jul 2008 16:33:31 -0000 1.20 @@ -1 +1 @@ -kazehakase-0.5.4-svn3506_trunk.tar.gz +kazehakase-0.5.5.tar.gz Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- kazehakase.spec 19 Jul 2008 03:43:02 -0000 1.63 +++ kazehakase.spec 29 Jul 2008 16:33:31 -0000 1.64 @@ -14,15 +14,9 @@ %if 0%{?fedora} >= 9 %define Geckover 1.9 -%define usesvn 1 -%define need_autogen 1 %endif %if 0%{?fedora} == 8 -%define Geckover 1.8.1.14 -%endif -%if 0%{?fedora} == 7 -%define Geckover 1.8.1.14 -%define need_autogen 1 +%define Geckover 1.8.1.16 %endif %if 0%{?use_svn} > 0 @@ -31,16 +25,16 @@ %define obsolete_plugin_ver 0.4.5-1 -%define repoid 30219 +%define repoid 32341 %define svnver 3506_trunk -%define fedorarel 7 +%define fedorarel 1 %define _release %{fedorarel}%{?usesvn:.svn%svnver} Name: kazehakase -Version: 0.5.4 +Version: 0.5.5 Release: %{_release}%{?dist} Summary: Kazehakase browser using Gecko rendering engine @@ -48,10 +42,6 @@ License: GPLv2+ URL: http://kazehakase.sourceforge.jp/ Source0: http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz -%if 0%{?fedora} < 8 -Source1: gscripttable.h.gz -Patch0: kazehakase-svn3235-3237-diff.patch.gz -%endif %if 0%{?fedora} >= 9 Patch11: kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch %endif @@ -91,7 +81,8 @@ # bogus value wont make it into a real package %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 || echo -n "999") BuildRequires: glib2-devel -Requires: glib2 >= %{glib_ver} +# drop this for now +# Requires: glib2 >= %{glib_ver} %if 0%{?fedora} < 9 BuildRequires: gecko-devel %{?Geckover:= %{Geckover}} @@ -179,15 +170,6 @@ %prep %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver} -%if 0%{?fedora} < 8 -%{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \ - ( for f in `find . -name \*.rej | sort` ; do cat $f ; done ) - -cd src/utils -cp -p %SOURCE1 . -%{__gzip} -d *gz -cd ../.. -%endif %if 0%{?fedora} >= 9 %patch11 -p0 -b .rhbug %endif @@ -196,10 +178,6 @@ sh autogen.sh %endif -%if 0%{?fedora} == 9 -sed -i.gcc43 -e 's|-Werror||' configure -%endif - %if %{support_anthy} %{__sed} -i.anthy -e '/^anthy_available/d' configure %endif @@ -315,14 +293,23 @@ %endif %changelog +* Wed Jul 30 2008 Mamoru Tasaka - 0.5.5-1 +- 0.5.5 + * Sat Jul 19 2008 Mamoru Tasaka - 0.5.4-7.svn3506_trunk - F-9+: relax gecko libs dependency (as GRE_GetGREPathWithProperties properly finds out GRE) - F-10+: add -UGTK_DISABLE_DEPRECATED temporarily +* Tue Jul 15 2008 Christopher Aillon +- Rebuild against newer gecko (F-8) + +* Wed Jul 02 2008 Christopher Aillon +- Rebuild against newer gecko (F-8) + * Sat Jun 28 2008 Mamoru Tasaka - 0.5.4-6.svn3506_trunk - Try rev 3506 -- Workaround for bug 447444 (xulrunner vs hunspell conflict) +- Workaround for bug 447444 (xulrunner vs hunspell conflict) (F-9+) * Wed Jun 25 2008 Mamoru Tasaka - 0.5.4-5 - Apply xulrunner related patches from debian by Mike Hommey Index: sources =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 28 Jun 2008 00:33:34 -0000 1.19 +++ sources 29 Jul 2008 16:33:31 -0000 1.20 @@ -1 +1 @@ -10a8948ab365e25520d931c8c0957ac8 kazehakase-0.5.4-svn3506_trunk.tar.gz +a140695fca0782372763480bd8bad8e7 kazehakase-0.5.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 16:41:16 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 16:41:16 GMT Subject: rpms/gnome-commander/devel .cvsignore, 1.9, 1.10 gnome-commander.spec, 1.23, 1.24 sources, 1.9, 1.10 Message-ID: <200807291641.m6TGfGDT025695@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25606/devel Modified Files: .cvsignore gnome-commander.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-1 - 1.2.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 Jul 2008 04:07:31 -0000 1.9 +++ .cvsignore 29 Jul 2008 16:40:46 -0000 1.10 @@ -1 +1 @@ -gnome-commander-1.2.7-svn1901_trunk.tar.bz2 +gnome-commander-1.2.7.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gnome-commander.spec 23 Jul 2008 04:07:31 -0000 1.23 +++ gnome-commander.spec 29 Jul 2008 16:40:46 -0000 1.24 @@ -9,9 +9,9 @@ %define LIBGSF_REQ 1.12.0 %define use_autotool 0 -%define if_pre 1 +%define if_pre 0 %define main_release 1 -%define extratag svn1901_trunk +#%%define extratag svn1901_trunk %if 0%{?if_pre} > 0 %define use_autotool 1 @@ -80,7 +80,7 @@ sieci SMB. %description -l ru -???????????? ???????????????????? ???????????????? ???????????????? ?????? Gnome. ?????????? ?????????????????? ?????????????????????? +???????????? ???????????????????? ???????????????? ???????????????? ?????? GNOME. ?????????? ?????????????????? ?????????????????????? ?????????????? ???????????????? ?? ??????????????, ?????????? ???????????????????????? ??????????????????, ?????????????????? ?? ?????????? ?????????????? ??????????????????????, ?? ?????????????????????????? ?????????????????? ???????????????????????? ???????????? ????????????. ???????????????????????? ???????????????? ???????????????? ???????????????? ?? ?????????????? DND ?? ?????????????????? MIME. @@ -161,6 +161,9 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-1 +- 1.2.7 + * Wed Jul 23 2008 Mamoru Tasaka - rev 1901 - Previous workaround removed Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Jul 2008 04:07:31 -0000 1.9 +++ sources 29 Jul 2008 16:40:46 -0000 1.10 @@ -1 +1 @@ -7b58a771b7a006a118d2fa5338eb42ad gnome-commander-1.2.7-svn1901_trunk.tar.bz2 +7b0d1d50fda548be6600696bc752b6de gnome-commander-1.2.7.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 16:41:15 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 16:41:15 GMT Subject: rpms/gnome-commander/F-8 .cvsignore, 1.5, 1.6 gnome-commander.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200807291641.m6TGfFwd025681@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25606/F-8 Modified Files: .cvsignore gnome-commander.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-1 - 1.2.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Jun 2008 08:29:11 -0000 1.5 +++ .cvsignore 29 Jul 2008 16:40:45 -0000 1.6 @@ -1 +1 @@ -gnome-commander-1.2.6.tar.bz2 +gnome-commander-1.2.7.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-8/gnome-commander.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnome-commander.spec 2 Jun 2008 08:29:11 -0000 1.15 +++ gnome-commander.spec 29 Jul 2008 16:40:45 -0000 1.16 @@ -1,10 +1,27 @@ +# To use svn, follow: +# +# svn checkout svn://svn.gnome.org/svn/gnome-commander/trunk +# mv trunk %%{name}-%%{version}-%%{extratag} +# tar cjf %%{name}-%%{version}-%%{extratag}.tar.bz2 %%{name}-%%{version}-%%{extratag} + %define EXIV2_REQ 0.14 %define TAGLIB_REQ 1.4 %define LIBGSF_REQ 1.12.0 +%define use_autotool 0 +%define if_pre 0 +%define main_release 1 +#%%define extratag svn1901_trunk + +%if 0%{?if_pre} > 0 +%define use_autotool 1 +%endif + +%define fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} + Name: gnome-commander -Version: 1.2.6 -Release: 1%{?dist} +Version: 1.2.7 +Release: %{fedora_rel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menad??er plik??w dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME @@ -12,7 +29,8 @@ Group: Applications/File License: GPLv2+ URL: http://www.nongnu.org/gcmd/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2 +#Patch0: gnome-commander-rev1874-hexmode-display.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -32,6 +50,14 @@ BuildRequires: perl(XML::Parser) BuildRequires: python-devel +%if %{use_autotool} +BuildRequires: automake +BuildRequires: flex +BuildRequires: intltool +BuildRequires: libtool +BuildRequires: gnome-common +%endif + Requires: gnome-python2-gnomevfs Requires: meld Requires(post): scrollkeeper @@ -54,7 +80,7 @@ sieci SMB. %description -l ru -???????????? ???????????????????? ???????????????? ???????????????? ?????? Gnome. ?????????? ?????????????????? ?????????????????????? +???????????? ???????????????????? ???????????????? ???????????????? ?????? GNOME. ?????????? ?????????????????? ?????????????????????? ?????????????? ???????????????? ?? ??????????????, ?????????? ???????????????????????? ??????????????????, ?????????????????? ?? ?????????? ?????????????? ??????????????????????, ?? ?????????????????????????? ?????????????????? ???????????????????????? ???????????? ????????????. ???????????????????????? ???????????????? ???????????????? ???????????????? ?? ?????????????? DND ?? ?????????????????? MIME. @@ -66,7 +92,16 @@ ansluta till FTP-servrar och SMB-n??tverk. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?extratag:-%extratag} +#%%patch0 -p0 -b .hexdumpmode +%if 0%{use_autotool} > 0 +%{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh +sh autogen.sh +%endif + +%{__sed} -i.pylib \ + -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ + configure %build %configure \ @@ -126,8 +161,27 @@ %{_datadir}/pixmaps/%{name}/ %changelog -* Mon Jun 2 2008 Mamoru Tasaka - 1.2.6-1 +* Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-1 +- 1.2.7 + +* Wed Jul 23 2008 Mamoru Tasaka +- rev 1901 +- Previous workaround removed + +* Mon Jul 14 2008 Mamoru Tasaka +- rev 1874 +- Workaround for Decimal offset mode in Hexdump display mode + +* Fri Jul 11 2008 Mamoru Tasaka +- try rev 1870 +- ja.po is merged upstream + +* Wed Jun 25 2008 Rex Dieter - 1.2.6-3 +- respin for exiv2 + +* Mon Jun 2 2008 Mamoru Tasaka - 1.2.6-2 - 1.2.6 +- Add patch to compile with GTK 2.13.X * Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 - 1.2.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jun 2008 08:29:11 -0000 1.5 +++ sources 29 Jul 2008 16:40:45 -0000 1.6 @@ -1 +1 @@ -4a3d3ebd24af3f386fbbf2985acbc786 gnome-commander-1.2.6.tar.bz2 +7b0d1d50fda548be6600696bc752b6de gnome-commander-1.2.7.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 16:41:15 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 16:41:15 GMT Subject: rpms/gnome-commander/F-9 .cvsignore, 1.5, 1.6 gnome-commander.spec, 1.17, 1.18 sources, 1.5, 1.6 Message-ID: <200807291641.m6TGfF20025688@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25606/F-9 Modified Files: .cvsignore gnome-commander.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-1 - 1.2.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Jun 2008 08:12:44 -0000 1.5 +++ .cvsignore 29 Jul 2008 16:40:45 -0000 1.6 @@ -1 +1 @@ -gnome-commander-1.2.6.tar.bz2 +gnome-commander-1.2.7.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-9/gnome-commander.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-commander.spec 2 Jun 2008 08:29:33 -0000 1.17 +++ gnome-commander.spec 29 Jul 2008 16:40:45 -0000 1.18 @@ -1,10 +1,27 @@ +# To use svn, follow: +# +# svn checkout svn://svn.gnome.org/svn/gnome-commander/trunk +# mv trunk %%{name}-%%{version}-%%{extratag} +# tar cjf %%{name}-%%{version}-%%{extratag}.tar.bz2 %%{name}-%%{version}-%%{extratag} + %define EXIV2_REQ 0.14 %define TAGLIB_REQ 1.4 %define LIBGSF_REQ 1.12.0 +%define use_autotool 0 +%define if_pre 0 +%define main_release 1 +#%%define extratag svn1901_trunk + +%if 0%{?if_pre} > 0 +%define use_autotool 1 +%endif + +%define fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} + Name: gnome-commander -Version: 1.2.6 -Release: 1%{?dist} +Version: 1.2.7 +Release: %{fedora_rel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menad??er plik??w dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME @@ -12,7 +29,8 @@ Group: Applications/File License: GPLv2+ URL: http://www.nongnu.org/gcmd/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2 +#Patch0: gnome-commander-rev1874-hexmode-display.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -32,6 +50,14 @@ BuildRequires: perl(XML::Parser) BuildRequires: python-devel +%if %{use_autotool} +BuildRequires: automake +BuildRequires: flex +BuildRequires: intltool +BuildRequires: libtool +BuildRequires: gnome-common +%endif + Requires: gnome-python2-gnomevfs Requires: meld Requires(post): scrollkeeper @@ -54,7 +80,7 @@ sieci SMB. %description -l ru -???????????? ???????????????????? ???????????????? ???????????????? ?????? Gnome. ?????????? ?????????????????? ?????????????????????? +???????????? ???????????????????? ???????????????? ???????????????? ?????? GNOME. ?????????? ?????????????????? ?????????????????????? ?????????????? ???????????????? ?? ??????????????, ?????????? ???????????????????????? ??????????????????, ?????????????????? ?? ?????????? ?????????????? ??????????????????????, ?? ?????????????????????????? ?????????????????? ???????????????????????? ???????????? ????????????. ???????????????????????? ???????????????? ???????????????? ???????????????? ?? ?????????????? DND ?? ?????????????????? MIME. @@ -66,7 +92,16 @@ ansluta till FTP-servrar och SMB-n??tverk. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?extratag:-%extratag} +#%%patch0 -p0 -b .hexdumpmode +%if 0%{use_autotool} > 0 +%{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh +sh autogen.sh +%endif + +%{__sed} -i.pylib \ + -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ + configure %build %configure \ @@ -126,8 +161,27 @@ %{_datadir}/pixmaps/%{name}/ %changelog -* Mon Jun 2 2008 Mamoru Tasaka - 1.2.6-1 +* Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-1 +- 1.2.7 + +* Wed Jul 23 2008 Mamoru Tasaka +- rev 1901 +- Previous workaround removed + +* Mon Jul 14 2008 Mamoru Tasaka +- rev 1874 +- Workaround for Decimal offset mode in Hexdump display mode + +* Fri Jul 11 2008 Mamoru Tasaka +- try rev 1870 +- ja.po is merged upstream + +* Wed Jun 25 2008 Rex Dieter - 1.2.6-3 +- respin for exiv2 + +* Mon Jun 2 2008 Mamoru Tasaka - 1.2.6-2 - 1.2.6 +- Add patch to compile with GTK 2.13.X * Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 - 1.2.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jun 2008 08:12:44 -0000 1.5 +++ sources 29 Jul 2008 16:40:45 -0000 1.6 @@ -1 +1 @@ -4a3d3ebd24af3f386fbbf2985acbc786 gnome-commander-1.2.6.tar.bz2 +7b0d1d50fda548be6600696bc752b6de gnome-commander-1.2.7.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 16:53:16 2008 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 29 Jul 2008 16:53:16 GMT Subject: rpms/mailx/devel mailx.spec,1.31,1.32 Message-ID: <200807291653.m6TGrGXN026227@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/mailx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26186 Modified Files: mailx.spec Log Message: Place mailx as /bin/mailx for better LSB (redhat-lsb will remove the symlink) Base things on /bin/mailx now. Index: mailx.spec =================================================================== RCS file: /cvs/extras/rpms/mailx/devel/mailx.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mailx.spec 26 Jun 2008 16:10:21 -0000 1.31 +++ mailx.spec 29 Jul 2008 16:52:45 -0000 1.32 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: mailx Version: 12.3 -Release: 0%{?dist} +Release: 1%{?dist} Group: Applications/Internet License: BSD with advertising URL: http://heirloom.sourceforge.net/mailx.html @@ -58,7 +58,7 @@ %endif echo PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ + BINDIR=/bin \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ MAILRC=%{mailrc} \ @@ -77,23 +77,20 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT STRIP=: `cat makeflags` install -# we need /bin/mail as basic path... -install -d $RPM_BUILD_ROOT/bin -pushd $RPM_BUILD_ROOT +ln -s mailx $RPM_BUILD_ROOT/bin/mail -mv ./%{_bindir}/%{name} ./bin/mail +install -d $RPM_BUILD_ROOT%{_bindir} pref=`echo %{_bindir} | sed 's,/[^/]*,../,g'` -ln -s ${pref}bin/mail ./%{_bindir}/Mail -ln -s ${pref}bin/mail ./%{_bindir}/nail -ln -s ${pref}bin/mail ./%{_bindir}/%{name} - -pushd ./%{_mandir}/man1 -mv %{name}.1 mail.1 -ln -s mail.1 Mail.1 -ln -s mail.1 nail.1 -ln -s mail.1 %{name}.1 + +pushd $RPM_BUILD_ROOT%{_bindir} +ln -s ${pref}bin/mailx Mail +ln -s ${pref}bin/mailx nail popd +pushd $RPM_BUILD_ROOT%{_mandir}/man1 +ln -s mailx.1 mail.1 +ln -s mailx.1 Mail.1 +ln -s mailx.1 nail.1 popd @@ -133,6 +130,10 @@ %changelog +* Tue Jul 29 2008 Dmitry Butskoy - 12.3-1 +- Place mailx to /bin/mailx, to avoid extra symlink in redhat-lsb package +- /bin/mailx is now a base binary, another symlinked to it. + * Thu Jun 26 2008 Dmitry Butskoy - add missed BR for krb5-devel - activate IPv6 support From fedora-extras-commits at redhat.com Tue Jul 29 17:12:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:02 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171202.A9F2C1AD0EC@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the watchcommits acl on dhcp (Fedora devel) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:02 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171203.13D661AD0EF@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the watchbugzilla acl on dhcp (Fedora devel) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:08 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171208.595601AD0F3@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the commit acl on dhcp (Fedora devel) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:22 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171222.805B41AD0EF@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the watchcommits acl on dhcp (Fedora 8) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:24 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171226.0FA491AD104@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the commit acl on dhcp (Fedora 8) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:27 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171231.2D5981AD10B@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the watchcommits acl on dhcp (Fedora 9) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:24 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171228.1F2D11AD0E7@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the watchbugzilla acl on dhcp (Fedora 8) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:26 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171228.8A5521AD107@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the commit acl on dhcp (Fedora 9) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:12:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 17:12:24 +0000 Subject: [pkgdb] dhcp had acl change status Message-ID: <20080729171229.2CD431AD108@bastion.fedora.phx.redhat.com> David Cantrell (dcantrel) has set the watchbugzilla acl on dhcp (Fedora 9) to Approved for Will Woods (wwoods) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dhcp From fedora-extras-commits at redhat.com Tue Jul 29 17:32:02 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 29 Jul 2008 17:32:02 GMT Subject: rpms/kde-l10n/devel kde-l10n.spec,1.41,1.42 Message-ID: <200807291732.m6THW2fA001392@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1297/devel Modified Files: kde-l10n.spec Log Message: * Tue Jul 29 2008 Kevin Kofler 4.1.0-2 - get rid of kdepim documentation from kdenetwork Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- kde-l10n.spec 27 Jul 2008 21:58:32 -0000 1.41 +++ kde-l10n.spec 29 Jul 2008 17:31:32 -0000 1.42 @@ -2,7 +2,7 @@ Name: kde-l10n Version: 4.1.0 -Release: 1%{dist}.2 +Release: 2%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -751,6 +751,10 @@ if [ -e docs/kdeadmin/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt fi + # remove bogus duplicated kdepim stuff from kdenetwork + if [ -e docs/kdenetwork/CMakeLists.txt ] ; then + sed -i -e 's/add_subdirectory( *korn *)/#add_subdirectory(korn)/g' -e 's/add_subdirectory( *kmail *)/#add_subdirectory(kmail)/g' -e 's/add_subdirectory( *knode *)/#add_subdirectory(knode)/g' docs/kdenetwork/CMakeLists.txt + fi %if 0%{?fedora} <= 9 # remove kdegraphics/libkdcraw rm -f messages/kdegraphics/libkdcraw.po @@ -1276,6 +1280,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Tue Jul 29 2008 Kevin Kofler 4.1.0-2 +- get rid of kdepim documentation from kdenetwork + * Sun Jul 27 2008 Rex Dieter 4.1.0-1.2 - file conflict between kde-l10n and libkdcraw (#456797) From fedora-extras-commits at redhat.com Tue Jul 29 17:32:02 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 29 Jul 2008 17:32:02 GMT Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.33,1.34 Message-ID: <200807291732.m6THW2Jq001388@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-l10n/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1297/F-9 Modified Files: kde-l10n.spec Log Message: * Tue Jul 29 2008 Kevin Kofler 4.1.0-2 - get rid of kdepim documentation from kdenetwork Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- kde-l10n.spec 27 Jul 2008 21:58:31 -0000 1.33 +++ kde-l10n.spec 29 Jul 2008 17:31:32 -0000 1.34 @@ -2,7 +2,7 @@ Name: kde-l10n Version: 4.1.0 -Release: 1%{dist}.2 +Release: 2%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -751,6 +751,10 @@ if [ -e docs/kdeadmin/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt fi + # remove bogus duplicated kdepim stuff from kdenetwork + if [ -e docs/kdenetwork/CMakeLists.txt ] ; then + sed -i -e 's/add_subdirectory( *korn *)/#add_subdirectory(korn)/g' -e 's/add_subdirectory( *kmail *)/#add_subdirectory(kmail)/g' -e 's/add_subdirectory( *knode *)/#add_subdirectory(knode)/g' docs/kdenetwork/CMakeLists.txt + fi %if 0%{?fedora} <= 9 # remove kdegraphics/libkdcraw rm -f messages/kdegraphics/libkdcraw.po @@ -1276,6 +1280,9 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Tue Jul 29 2008 Kevin Kofler 4.1.0-2 +- get rid of kdepim documentation from kdenetwork + * Sun Jul 27 2008 Rex Dieter 4.1.0-1.2 - file conflict between kde-l10n and libkdcraw (#456797) From fedora-extras-commits at redhat.com Tue Jul 29 17:53:53 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 29 Jul 2008 17:53:53 GMT Subject: rpms/initscripts/devel .cvsignore, 1.150, 1.151 initscripts.spec, 1.175, 1.176 sources, 1.166, 1.167 Message-ID: <200807291753.m6THrr82001821@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/initscripts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1790 Modified Files: .cvsignore initscripts.spec sources Log Message: 8.80-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- .cvsignore 14 Jul 2008 20:56:18 -0000 1.150 +++ .cvsignore 29 Jul 2008 17:53:23 -0000 1.151 @@ -1 +1 @@ -initscripts-8.79.tar.bz2 +initscripts-8.80.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- initscripts.spec 14 Jul 2008 20:56:18 -0000 1.175 +++ initscripts.spec 29 Jul 2008 17:53:23 -0000 1.176 @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.79 +Version: 8.80 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -47,6 +47,17 @@ cleanly. Initscripts also contains the scripts that activate and deactivate most network interfaces. +%package -n debugmode +Summary: Scripts for running in debugging mode +Requires: initscripts +Group: System Environment/Base + +%description -n debugmode +The debugmode package contains some basic scripts that are used to run +the system in a debugging mode. + +Currently, this consists of various memory checking code. + %prep %setup -q @@ -119,7 +130,6 @@ %dir /etc/sysconfig/network-scripts %config(noreplace) %verify(not md5 mtime size) /etc/adjtime %config(noreplace) /etc/sysconfig/init -%config(noreplace) /etc/sysconfig/mcheck %config(noreplace) /etc/sysconfig/netconsole %config(noreplace) /etc/sysconfig/readonly-root /etc/sysconfig/network-scripts/ifdown @@ -194,6 +204,7 @@ %config(noreplace) /etc/rc.d/rc.local %config /etc/rc.d/rc.sysinit %config(noreplace) /etc/sysctl.conf +%exclude /etc/profile.d/debug* %config /etc/profile.d/* /usr/sbin/sys-unconfig /sbin/setsysfont @@ -237,7 +248,17 @@ %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp +%files -n debugmode +%config(noreplace) /etc/sysconfig/debug +%config /etc/profile.d/debug* + %changelog +* Tue Jul 29 2008 Bill Nottingham - 8.80-1 +- Fix translation typo (#455804, ) +- Turn off syncookies +- Cleanups for proper plymouth support +- Move the mcheck code to a debugmode package, make it more generic + * Mon Jul 14 2008 Bill Nottingham - 8.79-1 - fix mcheck stuff to be installed correctly - don't do an arping check for loopback interfaces Index: sources =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/sources,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- sources 14 Jul 2008 20:56:18 -0000 1.166 +++ sources 29 Jul 2008 17:53:23 -0000 1.167 @@ -1 +1 @@ -324451b12098721dccd956132a8f502d initscripts-8.79.tar.bz2 +39199fb6f326396bcdc7f6fe8dedad8b initscripts-8.80.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 18:05:06 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 18:05:06 GMT Subject: rpms/perl-Tk-TableMatrix/devel import.log, NONE, 1.1 perl-Tk-TableMatrix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807291805.m6TI56q6008923@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Tk-TableMatrix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8882/devel Modified Files: .cvsignore sources Added Files: import.log perl-Tk-TableMatrix.spec Log Message: Import for devel --- NEW FILE import.log --- perl-Tk-TableMatrix-1_23-4_fc8_kwizart:HEAD:perl-Tk-TableMatrix-1.23-4.fc8.kwizart.src.rpm:1217354650 --- NEW FILE perl-Tk-TableMatrix.spec --- Name: perl-Tk-TableMatrix Version: 1.23 Release: 4%{?dist} Summary: Perl module for creating and manipulating tables Group: Development/Libraries License: (GPL+ or Artistic) and BSD URL: http://search.cpan.org/dist/Tk-TableMatrix/ Source0: http://search.cpan.org/CPAN/authors/id/C/CE/CERNEY/Tk-TableMatrix-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: libX11-devel #??See (RHBZ#456019) BuildRequires: perl(Tk) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The TableMatrix command creates a 2-dimensional grid of cells. The table can use a Tcl array variable or Tcl command for data storage and retrieval. %prep %setup -q -n Tk-TableMatrix-%{version} # fix perms chmod 644 COPYING README TableMatrix.pm TableMatrix.xs TableMatrix/Spreadsheet.pm \ TableMatrix/SpreadsheetHideRows.pm pTk/license.terms pTk/mTk/license.terms # copy license cp -p pTk/license.terms license.terms.pTk cp -p pTk/mTk/license.terms license.terms.mTk # Fix end-of-line-encoding touch -r demos/edit_styles.pl demos/edit_styles.pl.timestamps sed -i 's/\r//' demos/edit_styles.pl touch -r demos/edit_styles.pl.timestamps demos/edit_styles.pl rm demos/edit_styles.pl.timestamps %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* chmod -x demos/* %check # disabled by default because it needs an x screen %{?_with_tests:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README Changes #??See (RHBZ#456019). %doc license.terms.pTk license.terms.mTk %doc demos %{perl_vendorarch}/Tk/ %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog * Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 1.23-4 - Fix encoding * Sat Jul 19 2008 kwizart < kwizart at gmail.com > - 1.23-3 - Add conditional build --with tests - Add demos directory as %%doc * Mon May 19 2008 kwizart < kwizart at gmail.com > - 1.23-2 - Fix directory owership for perl packages. - Add BR libX11-devel * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 1.23-1 - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tk-TableMatrix/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 15:40:38 -0000 1.1 +++ .cvsignore 29 Jul 2008 18:04:36 -0000 1.2 @@ -0,0 +1 @@ +Tk-TableMatrix-1.23.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tk-TableMatrix/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 15:40:38 -0000 1.1 +++ sources 29 Jul 2008 18:04:36 -0000 1.2 @@ -0,0 +1 @@ +6b7653d129bf1a8327054a88b58d6364 Tk-TableMatrix-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 18:06:44 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 18:06:44 GMT Subject: rpms/policycoreutils/devel .cvsignore, 1.184, 1.185 policycoreutils-rhat.patch, 1.378, 1.379 policycoreutils.spec, 1.542, 1.543 sources, 1.189, 1.190 Message-ID: <200807291806.m6TI6ica009075@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9027 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Tue Jul 29 2008 Dan Walsh 2.0.53-1 - Update to upstream * Change setfiles to validate all file_contexts files when using -c from Stephen Smalley. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- .cvsignore 29 Jul 2008 13:30:54 -0000 1.184 +++ .cvsignore 29 Jul 2008 18:06:14 -0000 1.185 @@ -184,3 +184,4 @@ policycoreutils-2.0.51.tgz policycoreutils-2.0.52.tgz sepolgen-1.0.13.tgz +policycoreutils-2.0.53.tgz policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- policycoreutils-rhat.patch 29 Jul 2008 13:30:55 -0000 1.378 +++ policycoreutils-rhat.patch 29 Jul 2008 18:06:14 -0000 1.379 @@ -1,15 +1,15 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile --- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/Makefile 2008-07-29 09:06:28.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-29 10:39:48.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-29 09:06:28.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-29 10:39:48.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -36,9 +36,9 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-29 09:12:29.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-29 10:39:48.000000000 -0400 @@ -45,13 +45,13 @@ def usage(message = ""): print _(""" @@ -227,9 +227,9 @@ if object == "login": OBJECT.modify(target, seuser, serange) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-29 09:06:28.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-29 10:39:48.000000000 -0400 @@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool @@ -264,9 +264,9 @@ .I \-t, \-\-type SELinux Type for the object .TP -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-29 09:06:28.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2008-07-29 09:15:39.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-29 10:39:48.000000000 -0400 @@ -330,20 +330,15 @@ for name in dirs: os.rmdir(os.path.join(root, name)) @@ -280,8 +280,8 @@ rc = semanage_module_remove(self.sh, "permissive_%s" % n) if rc < 0: raise ValueError(_("Could not remove permissive domain %s (remove failed)") % name) -- rc = semanage_commit(self.sh) -- if rc < 0: +- rc = semanage_commit(self.sh) +- if rc < 0: + rc = semanage_commit(self.sh) + if rc < 0: raise ValueError(_("Could not remove permissive domain %s (commit failed)") % name) Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.542 retrieving revision 1.543 diff -u -r1.542 -r1.543 --- policycoreutils.spec 29 Jul 2008 13:31:58 -0000 1.542 +++ policycoreutils.spec 29 Jul 2008 18:06:14 -0000 1.543 @@ -5,8 +5,8 @@ %define sepolgenver 1.0.13 Summary: SELinux policy core utilities Name: policycoreutils -Version: 2.0.52 -Release: 6%{?dist} +Version: 2.0.53 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,10 @@ fi %changelog +* Tue Jul 29 2008 Dan Walsh 2.0.53-1 +- Update to upstream + * Change setfiles to validate all file_contexts files when using -c from Stephen Smalley. + * Tue Jul 29 2008 Dan Walsh 2.0.52-6 - Fix boolean handling - Upgrade to latest sepolgen Index: sources =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- sources 29 Jul 2008 13:30:55 -0000 1.189 +++ sources 29 Jul 2008 18:06:14 -0000 1.190 @@ -1,2 +1,2 @@ -311e95b3374fe1993fb91a303b6675b2 policycoreutils-2.0.52.tgz b6756a012c26f414e4a5f8f438ce2188 sepolgen-1.0.13.tgz +8fe5f8b78e156f770e990fe107577d2c policycoreutils-2.0.53.tgz From fedora-extras-commits at redhat.com Tue Jul 29 18:20:20 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 18:20:20 GMT Subject: rpms/perl-Tk-TableMatrix/F-9 perl-Tk-TableMatrix.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807291820.m6TIKKfw009645@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Tk-TableMatrix/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9563 Modified Files: sources Added Files: perl-Tk-TableMatrix.spec Log Message: Initial import for F-9 --- NEW FILE perl-Tk-TableMatrix.spec --- Name: perl-Tk-TableMatrix Version: 1.23 Release: 4%{?dist} Summary: Perl module for creating and manipulating tables Group: Development/Libraries License: (GPL+ or Artistic) and BSD URL: http://search.cpan.org/dist/Tk-TableMatrix/ Source0: http://search.cpan.org/CPAN/authors/id/C/CE/CERNEY/Tk-TableMatrix-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: libX11-devel #??See (RHBZ#456019) BuildRequires: perl(Tk) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The TableMatrix command creates a 2-dimensional grid of cells. The table can use a Tcl array variable or Tcl command for data storage and retrieval. %prep %setup -q -n Tk-TableMatrix-%{version} # fix perms chmod 644 COPYING README TableMatrix.pm TableMatrix.xs TableMatrix/Spreadsheet.pm \ TableMatrix/SpreadsheetHideRows.pm pTk/license.terms pTk/mTk/license.terms # copy license cp -p pTk/license.terms license.terms.pTk cp -p pTk/mTk/license.terms license.terms.mTk # Fix end-of-line-encoding touch -r demos/edit_styles.pl demos/edit_styles.pl.timestamps sed -i 's/\r//' demos/edit_styles.pl touch -r demos/edit_styles.pl.timestamps demos/edit_styles.pl rm demos/edit_styles.pl.timestamps %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* chmod -x demos/* %check # disabled by default because it needs an x screen %{?_with_tests:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README Changes #??See (RHBZ#456019). %doc license.terms.pTk license.terms.mTk %doc demos %{perl_vendorarch}/Tk/ %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog * Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 1.23-4 - Fix encoding * Sat Jul 19 2008 kwizart < kwizart at gmail.com > - 1.23-3 - Add conditional build --with tests - Add demos directory as %%doc * Mon May 19 2008 kwizart < kwizart at gmail.com > - 1.23-2 - Fix directory owership for perl packages. - Add BR libX11-devel * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 1.23-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tk-TableMatrix/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 15:40:38 -0000 1.1 +++ sources 29 Jul 2008 18:19:49 -0000 1.2 @@ -0,0 +1 @@ +6b7653d129bf1a8327054a88b58d6364 Tk-TableMatrix-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 18:20:21 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Tue, 29 Jul 2008 18:20:21 GMT Subject: rpms/evolution-rss/devel .cvsignore, 1.4, 1.5 evolution-rss.spec, 1.16, 1.17 sources, 1.4, 1.5 Message-ID: <200807291820.m6TIKL5k009652@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9588 Modified Files: .cvsignore evolution-rss.spec sources Log Message: * Thu Jul 29 2008 Lucian Langa - 0.1.1-1 - remove patches for RH #452322 (fixed upstream) - Update to devel version 0.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jul 2008 18:25:54 -0000 1.4 +++ .cvsignore 29 Jul 2008 18:19:50 -0000 1.5 @@ -1 +1 @@ -evolution-rss-0.1.0.tar.gz +evolution-rss-0.1.1.tar.gz Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- evolution-rss.spec 25 Jul 2008 16:32:32 -0000 1.16 +++ evolution-rss.spec 29 Jul 2008 18:19:50 -0000 1.17 @@ -1,11 +1,10 @@ Summary: Evolution RSS Reader Name: evolution-rss -Version: 0.1.0 -Release: 2%{?dist} +Version: 0.1.1 +Release: 1%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz -Patch0: evolution-rss-0.1.0-firefox-import.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Requires: evolution @@ -28,7 +27,6 @@ %prep %setup -q -n evolution-rss-%{version} -%patch0 -p0 -b .firefox %build %configure @@ -88,6 +86,10 @@ %doc TODO %changelog +* Thu Jul 29 2008 Lucian Langa - 0.1.1-1 +- remove patches for RH #452322 (fixed upstream) +- Update to devel version 0.1.1 + * Thu Jul 24 2008 Lucian Langa - 0.1.0-2 - Fix firefox import RH bug #452322 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Jul 2008 18:25:55 -0000 1.4 +++ sources 29 Jul 2008 18:19:50 -0000 1.5 @@ -1 +1 @@ -63479fcf4c3af998ab2794e5a0f075f6 evolution-rss-0.1.0.tar.gz +fb724a60a10fc8def7968d16b48ada16 evolution-rss-0.1.1.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 18:22:19 2008 From: fedora-extras-commits at redhat.com (Chauvet Nicolas (kwizart)) Date: Tue, 29 Jul 2008 18:22:19 GMT Subject: rpms/perl-Tk-TableMatrix/F-8 perl-Tk-TableMatrix.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807291822.m6TIMJrc009816@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-Tk-TableMatrix/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9780 Modified Files: sources Added Files: perl-Tk-TableMatrix.spec Log Message: Initial import for F-8 --- NEW FILE perl-Tk-TableMatrix.spec --- Name: perl-Tk-TableMatrix Version: 1.23 Release: 4%{?dist} Summary: Perl module for creating and manipulating tables Group: Development/Libraries License: (GPL+ or Artistic) and BSD URL: http://search.cpan.org/dist/Tk-TableMatrix/ Source0: http://search.cpan.org/CPAN/authors/id/C/CE/CERNEY/Tk-TableMatrix-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: libX11-devel #??See (RHBZ#456019) BuildRequires: perl(Tk) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The TableMatrix command creates a 2-dimensional grid of cells. The table can use a Tcl array variable or Tcl command for data storage and retrieval. %prep %setup -q -n Tk-TableMatrix-%{version} # fix perms chmod 644 COPYING README TableMatrix.pm TableMatrix.xs TableMatrix/Spreadsheet.pm \ TableMatrix/SpreadsheetHideRows.pm pTk/license.terms pTk/mTk/license.terms # copy license cp -p pTk/license.terms license.terms.pTk cp -p pTk/mTk/license.terms license.terms.mTk # Fix end-of-line-encoding touch -r demos/edit_styles.pl demos/edit_styles.pl.timestamps sed -i 's/\r//' demos/edit_styles.pl touch -r demos/edit_styles.pl.timestamps demos/edit_styles.pl rm demos/edit_styles.pl.timestamps %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* chmod -x demos/* %check # disabled by default because it needs an x screen %{?_with_tests:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README Changes #??See (RHBZ#456019). %doc license.terms.pTk license.terms.mTk %doc demos %{perl_vendorarch}/Tk/ %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog * Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 1.23-4 - Fix encoding * Sat Jul 19 2008 kwizart < kwizart at gmail.com > - 1.23-3 - Add conditional build --with tests - Add demos directory as %%doc * Mon May 19 2008 kwizart < kwizart at gmail.com > - 1.23-2 - Fix directory owership for perl packages. - Add BR libX11-devel * Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 1.23-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tk-TableMatrix/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 15:40:38 -0000 1.1 +++ sources 29 Jul 2008 18:21:49 -0000 1.2 @@ -0,0 +1 @@ +6b7653d129bf1a8327054a88b58d6364 Tk-TableMatrix-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 18:26:58 2008 From: fedora-extras-commits at redhat.com (Paul Lindner (plindner)) Date: Tue, 29 Jul 2008 18:26:58 GMT Subject: rpms/memcached/devel .cvsignore, 1.4, 1.5 memcached.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200807291826.m6TIQwS5010000@cvs-int.fedora.redhat.com> Author: plindner Update of /cvs/pkgs/rpms/memcached/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9975 Modified Files: .cvsignore memcached.spec sources Log Message: Upgrade to memcached-1.2.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/memcached/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2008 11:53:21 -0000 1.4 +++ .cvsignore 29 Jul 2008 18:26:28 -0000 1.5 @@ -1 +1,2 @@ memcached-1.2.5.tar.gz +memcached-1.2.6.tar.gz Index: memcached.spec =================================================================== RCS file: /cvs/pkgs/rpms/memcached/devel/memcached.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- memcached.spec 29 Jun 2008 13:59:19 -0000 1.12 +++ memcached.spec 29 Jul 2008 18:26:28 -0000 1.13 @@ -6,8 +6,8 @@ %define groupname memcached Name: memcached -Version: 1.2.5 -Release: 2%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: High Performance, Distributed Memory Object Cache Group: System Environment/Daemons @@ -196,6 +196,9 @@ %changelog +* Tue Jul 29 2008 Paul Lindner - 1.2.6-1 +- Upgrade to memcached-1.2.6 + * Tue Mar 4 2008 Paul Lindner - 1.2.5-1 - Upgrade to memcached-1.2.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/memcached/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2008 11:53:21 -0000 1.4 +++ sources 29 Jul 2008 18:26:28 -0000 1.5 @@ -1 +1 @@ -8ac0d1749ded88044f0f850fad979e4d memcached-1.2.5.tar.gz +200d22f7ac2d114f74a6904552e9eb70 memcached-1.2.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 18:37:31 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 18:37:31 GMT Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.158, 1.159 libselinux.spec, 1.335, 1.336 Message-ID: <200807291837.m6TIbVxW010188@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10166 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Tue Jul 29 2008 Dan Walsh - 2.0.69-1 - Update to Upstream * Handle duplicate file context regexes as a fatal error from Stephen Smalley. This prevents adding them via semanage. * Fix audit2why shadowed variables from Stephen Smalley. * Note that freecon NULL is legal in man page from Karel Zak. libselinux-rhat.patch: Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- libselinux-rhat.patch 29 Jul 2008 13:22:45 -0000 1.158 +++ libselinux-rhat.patch 29 Jul 2008 18:37:01 -0000 1.159 @@ -1,6 +1,29 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.67/man/man8/selinuxconlist.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/Makefile libselinux-2.0.69/Makefile +--- nsalibselinux/Makefile 2008-06-12 23:25:14.000000000 -0400 ++++ libselinux-2.0.69/Makefile 2008-07-29 14:21:44.000000000 -0400 +@@ -29,6 +29,9 @@ + pywrap: + $(MAKE) -C src pywrap + ++rubywrap: ++ $(MAKE) -C src rubywrap ++ + install: + $(MAKE) -C include install + $(MAKE) -C src install +@@ -38,6 +41,9 @@ + install-pywrap: + $(MAKE) -C src install-pywrap + ++install-rubywrap: ++ $(MAKE) -C src install-rubywrap ++ + relabel: + $(MAKE) -C src relabel + +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.69/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.67/man/man8/selinuxconlist.8 2008-07-09 16:52:33.000000000 -0400 ++++ libselinux-2.0.69/man/man8/selinuxconlist.8 2008-07-29 14:07:37.000000000 -0400 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -20,9 +43,9 @@ + +.SH "SEE ALSO" +secon(8), selinuxdefcon(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.67/man/man8/selinuxdefcon.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.69/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.67/man/man8/selinuxdefcon.8 2008-07-09 16:52:33.000000000 -0400 ++++ libselinux-2.0.69/man/man8/selinuxdefcon.8 2008-07-29 14:07:37.000000000 -0400 @@ -0,0 +1,19 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -43,9 +66,9 @@ + +.SH "SEE ALSO" +secon(8), selinuxconlist(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.67/src/Makefile +diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.69/src/Makefile --- nsalibselinux/src/Makefile 2008-06-22 09:40:25.000000000 -0400 -+++ libselinux-2.0.67/src/Makefile 2008-07-09 16:56:37.000000000 -0400 ++++ libselinux-2.0.69/src/Makefile 2008-07-29 14:15:39.000000000 -0400 @@ -7,16 +7,24 @@ PYINC ?= /usr/include/$(PYLIBVER) PYLIB ?= /usr/lib/$(PYLIBVER) @@ -82,7 +105,7 @@ OBJS= $(patsubst %.c,%.o,$(SRCS)) LOBJS= $(patsubst %.c,%.lo,$(SRCS)) -@@ -44,11 +54,11 @@ +@@ -44,12 +54,14 @@ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ @@ -91,12 +114,14 @@ all: $(LIBA) $(LIBSO) --pywrap: all $(SWIGSO) $(AUDIT2WHYSO) -+pywrap: all $(SWIGSO) $(AUDIT2WHYSO) $(SWIGRUBYSO) + pywrap: all $(SWIGSO) $(AUDIT2WHYSO) ++rubywrap: all $(SWIGRUBYSO) ++ $(LIBA): $(OBJS) $(AR) rcs $@ $^ -@@ -57,8 +67,14 @@ + $(RANLIB) $@ +@@ -57,9 +69,15 @@ $(SWIGLOBJ): $(SWIGCOUT) $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $< @@ -104,15 +129,15 @@ + $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $< + $(SWIGSO): $(SWIGLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ -+ + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ + +$(SWIGRUBYSO): $(SWIGRUBYLOBJ) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ - ++ $(LIBSO): $(LOBJS) $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro -@@ -79,6 +95,9 @@ + ln -sf $@ $(TARGET) +@@ -79,6 +97,9 @@ $(SWIGCOUT): $(SWIGIF) $(SWIG) $^ @@ -122,17 +147,18 @@ swigify: $(SWIGIF) $(SWIG) $^ -@@ -95,6 +114,9 @@ +@@ -95,6 +116,10 @@ install -m 755 $(AUDIT2WHYSO) $(PYTHONLIBDIR)/site-packages/selinux install -m 644 selinux.py $(PYTHONLIBDIR)/site-packages/selinux/__init__.py ++install-rubywrap: rubywrap + test -d $(RUBYINSTALL) || install -m 755 -d $(RUBYINSTALL) + install -m 755 $(SWIGRUBYSO) $(RUBYINSTALL)/selinux.so + relabel: /sbin/restorecon $(SHLIBDIR)/$(LIBSO) -@@ -102,7 +124,7 @@ +@@ -102,7 +127,7 @@ -rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~ distclean: clean @@ -141,9 +167,9 @@ indent: ../../scripts/Lindent $(filter-out $(GENERATED),$(wildcard *.[ch])) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.67/src/callbacks.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.69/src/callbacks.c --- nsalibselinux/src/callbacks.c 2008-06-12 23:25:14.000000000 -0400 -+++ libselinux-2.0.67/src/callbacks.c 2008-07-18 11:15:56.000000000 -0400 ++++ libselinux-2.0.69/src/callbacks.c 2008-07-29 14:07:37.000000000 -0400 @@ -16,6 +16,7 @@ { int rc; @@ -152,9 +178,9 @@ va_start(ap, fmt); rc = vfprintf(stderr, fmt, ap); va_end(ap); -diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.67/src/matchpathcon.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.69/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2008-06-12 23:25:14.000000000 -0400 -+++ libselinux-2.0.67/src/matchpathcon.c 2008-07-09 16:52:33.000000000 -0400 ++++ libselinux-2.0.69/src/matchpathcon.c 2008-07-29 14:07:37.000000000 -0400 @@ -2,6 +2,7 @@ #include #include @@ -172,11 +198,12 @@ va_end(ap); } -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_ruby.i libselinux-2.0.67/src/selinuxswig_ruby.i +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_ruby.i libselinux-2.0.69/src/selinuxswig_ruby.i --- nsalibselinux/src/selinuxswig_ruby.i 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.67/src/selinuxswig_ruby.i 2008-07-09 16:52:33.000000000 -0400 -@@ -0,0 +1,147 @@ -+/* Author: James Athey ++++ libselinux-2.0.69/src/selinuxswig_ruby.i 2008-07-29 14:17:14.000000000 -0400 +@@ -0,0 +1,52 @@ ++/* Author: Dan Walsh ++ Based on selinuxswig_python.i by James Athey + */ + +%module selinux @@ -184,73 +211,17 @@ + #include "selinux/selinux.h" +%} + -+/* security_get_boolean_names() typemap */ -+/* -+%typemap(argout) (char ***names, int *len) { -+ PyObject* list = PyList_New(*$2); -+ int i; -+ for (i = 0; i < *$2; i++) { -+ PyList_SetItem(list, i, PyString_FromString((*$1)[i])); -+ } -+ $result = SWIG_Python_AppendOutput($result, list); -+} -+*/ +/* return a sid along with the result */ +%typemap(argout) (security_id_t * sid) { + if (*$1) { + %append_output(SWIG_NewPointerObj(*$1, $descriptor(security_id_t), 0)); + } -+/* else { -+ Py_INCREF(Py_None); -+ %append_output(Py_None); -+ } -+*/ +} + +%typemap(in,numinputs=0) security_id_t *(security_id_t temp) { + $1 = &temp; +} + -+/* Makes security_compute_user() return a Python list of contexts */ -+/* -+%typemap(argout) (security_context_t **con) { -+ PyObject* plist; -+ int i, len = 0; -+ -+ if (*$1) { -+ while((*$1)[len]) -+ len++; -+ plist = PyList_New(len); -+ for (i = 0; i < len; i++) { -+ PyList_SetItem(plist, i, PyString_FromString((*$1)[i])); -+ } -+ } else { -+ plist = PyList_New(0); -+ } -+ -+ $result = SWIG_Python_AppendOutput($result, plist); -+} -+*/ -+/* Makes functions in get_context_list.h return a Python list of contexts */ -+ -+#ifdef fixme -+%typemap(argout) (security_context_t **list) { -+ PyObject* plist; -+ int i; -+ -+ if (*$1) { -+ plist = PyList_New(result); -+ for (i = 0; i < result; i++) { -+ PyList_SetItem(plist, i, PyString_FromString((*$1)[i])); -+ } -+ } else { -+ plist = PyList_New(0); -+ } -+ /* Only return the Python list, don't need to return the length anymore */ -+ $result = plist; -+} -+#endif -+ +%typemap(in,noblock=1,numinputs=0) security_context_t * (security_context_t temp = 0) { + $1 = &temp; +} @@ -260,12 +231,6 @@ + %append_output(SWIG_FromCharPtr(*$1)); + freecon(*$1); + } -+/* -+ else { -+ Py_INCREF(Py_None); -+ %append_output(Py_None); -+ } -+*/ +} + +%typemap(in,noblock=1,numinputs=0) char ** (char * temp = 0) { @@ -277,41 +242,7 @@ + %append_output(SWIG_FromCharPtr(*$1)); + free(*$1); + } -+/* -+ else { -+ Py_INCREF(Py_None); -+ %append_output(Py_None); -+ } -+*/ -+} -+/* -+%typemap(in) char * const [] { -+ int i, size; -+ PyObject * s; -+ -+ if (!PySequence_Check($input)) { -+ PyErr_SetString(PyExc_ValueError, "Expected a sequence"); -+ return NULL; -+ } -+ -+ size = PySequence_Size($input); -+ -+ $1 = (char**) malloc(size + 1); -+ for(i = 0; i < size; i++) { -+ if (!PyString_Check(PySequence_GetItem($input, i))) { -+ PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings"); -+ return NULL; -+ } -+ } -+ -+ for(i = 0; i < size; i++) { -+ s = PySequence_GetItem($input, i); -+ $1[i] = (char*) malloc(PyString_Size(s) + 1); -+ strcpy($1[i], PyString_AsString(s)); -+ } -+ $1[size] = NULL; +} -+*/ + +%typemap(freearg,match="in") char * const [] { + int i = 0; Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- libselinux.spec 29 Jul 2008 13:22:45 -0000 1.335 +++ libselinux.spec 29 Jul 2008 18:37:01 -0000 1.336 @@ -5,7 +5,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.69 -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -76,6 +76,7 @@ make clean make LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" %{?_smp_mflags} swigify make LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" %{?_smp_mflags} all pywrap +make LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" %{?_smp_mflags} rubywrap %install rm -rf %{buildroot} @@ -86,6 +87,7 @@ mkdir -p %{buildroot}/var/run/setrans make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_sbindir}" install install-pywrap +make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_sbindir}" install install-rubywrap # Nuke the files we don't want to distribute rm -f %{buildroot}%{_sbindir}/compute_* From fedora-extras-commits at redhat.com Tue Jul 29 18:46:12 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 29 Jul 2008 18:46:12 GMT Subject: rpms/kernel/devel config-generic, 1.148, 1.149 kernel.spec, 1.820, 1.821 Message-ID: <200807291846.m6TIkCCs010510@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10478 Modified Files: config-generic kernel.spec Log Message: Disable CONFIG_VIDEO_ADV_DEBUG (#456751) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- config-generic 28 Jul 2008 20:12:06 -0000 1.148 +++ config-generic 29 Jul 2008 18:45:42 -0000 1.149 @@ -2118,7 +2118,7 @@ # Multimedia devices # CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_ADV_DEBUG=y +# CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set CONFIG_VIDEO_ALLOW_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.820 retrieving revision 1.821 diff -u -r1.820 -r1.821 --- kernel.spec 29 Jul 2008 12:41:48 -0000 1.820 +++ kernel.spec 29 Jul 2008 18:45:42 -0000 1.821 @@ -1707,6 +1707,9 @@ %changelog * Tue Jul 29 2008 Dave Jones +- Disable CONFIG_VIDEO_ADV_DEBUG (#456751) + +* Tue Jul 29 2008 Dave Jones - 2.6.27-rc1 * Mon Jul 28 2008 Josh Boyer From fedora-extras-commits at redhat.com Tue Jul 29 19:18:45 2008 From: fedora-extras-commits at redhat.com (Simon Schampijer (erikos)) Date: Tue, 29 Jul 2008 19:18:45 GMT Subject: rpms/hulahop/OLPC-3 .cvsignore, 1.3, 1.4 hulahop.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200807291918.m6TJIjWk017813@cvs-int.fedora.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/hulahop/OLPC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17784 Modified Files: .cvsignore hulahop.spec sources Log Message: * Tue Jul 29 2008 Simon Schampijer - 0.4.3-1 - Setup a nsXULAppInfo service and register 7530 - Fix sites that check for firefox version 7645 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Jul 2008 12:43:26 -0000 1.3 +++ .cvsignore 29 Jul 2008 19:18:15 -0000 1.4 @@ -1,2 +1 @@ -hulahop-0.4.1.tar.bz2 -hulahop-0.4.2.tar.bz2 +hulahop-0.4.3.tar.bz2 Index: hulahop.spec =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/hulahop.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hulahop.spec 24 Jul 2008 13:00:42 -0000 1.9 +++ hulahop.spec 29 Jul 2008 19:18:15 -0000 1.10 @@ -1,7 +1,7 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: hulahop -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: A pygtk widget for embedding mozilla @@ -50,6 +50,10 @@ %{python_sitelib}/* %changelog +* Tue Jul 29 2008 Simon Schampijer - 0.4.3-1 +- Setup a nsXULAppInfo service and register 7530 +- Fix sites that check for firefox version 7645 + * Thu Jul 24 2008 Marco Pesenti Gritti - 0.4.2-1 - Update to 0.4.2 - Fix requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/OLPC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Jul 2008 12:43:26 -0000 1.4 +++ sources 29 Jul 2008 19:18:15 -0000 1.5 @@ -1,2 +1 @@ -92d441c645dde20c98635dff496b8b29 hulahop-0.4.1.tar.bz2 -eb0579cd66f556a75a63374b2e54d673 hulahop-0.4.2.tar.bz2 +d1d5d63c8b8944befa6c8142756dfd43 hulahop-0.4.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 29 19:20:21 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 29 Jul 2008 19:20:21 GMT Subject: rpms/dovecot/devel dovecot-1.1-default-settings-passwd.patch, 1.1, 1.2 dovecot.spec, 1.109, 1.110 dovecot.sysconfig, 1.1, 1.2 Message-ID: <200807291920.m6TJKLJb017943@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/dovecot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17910 Modified Files: dovecot-1.1-default-settings-passwd.patch dovecot.spec dovecot.sysconfig Log Message: * Tue Jul 29 2008 Dan Horak - 1:1.1.2-2 - really ask for the password during start-up dovecot-1.1-default-settings-passwd.patch: Index: dovecot-1.1-default-settings-passwd.patch =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot-1.1-default-settings-passwd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dovecot-1.1-default-settings-passwd.patch 29 Jul 2008 14:35:20 -0000 1.1 +++ dovecot-1.1-default-settings-passwd.patch 29 Jul 2008 19:19:51 -0000 1.2 @@ -4,8 +4,8 @@ # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. -+# Security note: if you have this config file world readable, then put the -+# password into /etc/sysconfig/dovecot. ++# Security note: if you have this config file world readable, then enable ++# password asking during start-up in /etc/sysconfig/dovecot. #ssl_key_password = # File containing trusted SSL certificate authorities. Set this only if you Index: dovecot.spec =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- dovecot.spec 29 Jul 2008 14:35:20 -0000 1.109 +++ dovecot.spec 29 Jul 2008 19:19:51 -0000 1.110 @@ -2,7 +2,7 @@ Name: dovecot Epoch: 1 Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT and LGPLv2 and BSD with advertising Group: System Environment/Daemons @@ -376,9 +376,12 @@ %changelog +* Tue Jul 29 2008 Dan Horak - 1:1.1.2-2 +- really ask for the password during start-up + * Tue Jul 29 2008 Dan Horak - 1:1.1.2-1 - update to upstream version 1.1.2 -- final solution for #445200 (put the password into /etc/sysconfig/dovecot) +- final solution for #445200 (add /etc/sysconfig/dovecot for start-up options) * Fri Jun 27 2008 Dan Horak - 1:1.1.1-2 - update default settings to listen on both IPv4 and IPv6 instead of IPv6 only Index: dovecot.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dovecot.sysconfig 29 Jul 2008 14:35:20 -0000 1.1 +++ dovecot.sysconfig 29 Jul 2008 19:19:51 -0000 1.2 @@ -1,5 +1,5 @@ -# Here you can specify the password for your SSL certificates -# so the main config file can be world readable. Other command -# line options can be specified too. +# Here you can specify whether dovecot will ask for the SSL certificates' +# password during start-up so the main config file can be world readable. +# Other command line options can be specified too. # -#OPTIONS="-p my_certificate_password" +#OPTIONS="-p" From fedora-extras-commits at redhat.com Tue Jul 29 19:32:25 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 29 Jul 2008 19:32:25 GMT Subject: rpms/wine/F-8 .cvsignore, 1.61, 1.62 sources, 1.62, 1.63 wine.spec, 1.85, 1.86 Message-ID: <200807291932.m6TJWPIr018421@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18337/F-8 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-8/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 17 Jun 2008 19:11:16 -0000 1.61 +++ .cvsignore 29 Jul 2008 19:31:55 -0000 1.62 @@ -1 +1 @@ -wine-1.0-fe.tar.bz2 +wine-1.1.2-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-8/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 17 Jun 2008 19:11:16 -0000 1.62 +++ sources 29 Jul 2008 19:31:55 -0000 1.63 @@ -1 +1 @@ -8131688557a6168bf9248e48ee9e90ad wine-1.0-fe.tar.bz2 +0c2bd312ed15b4ff15fef18794803c7e wine-1.1.2-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-8/wine.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- wine.spec 17 Jun 2008 19:11:16 -0000 1.85 +++ wine.spec 29 Jul 2008 19:31:55 -0000 1.86 @@ -1,5 +1,5 @@ Name: wine -Version: 1.0 +Version: 1.1.2 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -125,6 +125,7 @@ Summary: Wine core package Group: Applications/Emulators Requires: %{_bindir}/xmessage +Requires: freetype Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: wine <= 0.9.15-1%{?dist} @@ -222,7 +223,7 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch0 +#%patch0 %patch1 %patch2 %patch400 @@ -231,11 +232,11 @@ %build # work around gcc bug see #440139 # this affects more then just dlls/user32/menu.c -%if %{?fedora} > 8 -export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre" -%else +#%if %{?fedora} > 8 +#export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre" +#%else export CFLAGS="$RPM_OPT_FLAGS" -%endif +#%endif %configure \ --sysconfdir=%{_sysconfdir}/wine --disable-static \ @@ -446,6 +447,7 @@ %{_libdir}/wine/advapi32.dll.so %{_libdir}/wine/advpack.dll.so %{_libdir}/wine/amstream.dll.so +%{_libdir}/wine/appwiz.cpl.so %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so @@ -504,6 +506,7 @@ %{_libdir}/wine/dpnet.dll.so %{_libdir}/wine/dpnhpast.dll.so %{_libdir}/wine/dpnlobby.dll.so +%{_libdir}/wine/dpwsockx.dll.so %{_libdir}/wine/dsound.dll.so %{_libdir}/wine/dssenh.dll.so %{_libdir}/wine/dswave.dll.so @@ -515,6 +518,7 @@ %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so +%{_libdir}/wine/glu32.dll.so %{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/gpkcsp.dll.so %{_libdir}/wine/hal.dll.so @@ -532,6 +536,7 @@ %{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/inetcomm.dll.so +%{_libdir}/wine/inetmib1.dll.so %{_libdir}/wine/infosoft.dll.so %{_libdir}/wine/initpki.dll.so %{_libdir}/wine/inkobj.dll.so @@ -579,6 +584,7 @@ %{_libdir}/wine/msnet32.dll.so %{_libdir}/wine/mssip32.dll.so %{_libdir}/wine/msrle32.dll.so +%{_libdir}/wine/mstask.dll.so %{_libdir}/wine/msvcirt.dll.so %{_libdir}/wine/msvcr71.dll.so %{_libdir}/wine/msvcrt.dll.so @@ -727,7 +733,6 @@ %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so -%{_libdir}/wine/glu32.dll.so %{_libdir}/wine/opengl32.dll.so %{_libdir}/wine/wined3d.dll.so %{_libdir}/wine/dnsapi.dll.so @@ -834,6 +839,16 @@ %{_libdir}/wine/*.def %changelog +* Sun Jul 27 2008 Andreas Bierfert +- 1.1.2-1 +- version upgrade (#455960, #456831) +- require freetype (#452417) +- disable wineprefixcreate patch for now + +* Fri Jul 11 2008 Andreas Bierfert +- 1.1.1-1 +- version upgrade + * Tue Jun 17 2008 Andreas Bierfert - 1.0-1 - version upgrade (#446311,#417161) From fedora-extras-commits at redhat.com Tue Jul 29 19:32:26 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 29 Jul 2008 19:32:26 GMT Subject: rpms/wine/F-9 .cvsignore, 1.61, 1.62 sources, 1.62, 1.63 wine.spec, 1.87, 1.88 Message-ID: <200807291932.m6TJWQUt018429@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18337/F-9 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-9/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 17 Jun 2008 19:11:55 -0000 1.61 +++ .cvsignore 29 Jul 2008 19:31:55 -0000 1.62 @@ -1 +1 @@ -wine-1.0-fe.tar.bz2 +wine-1.1.2-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-9/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 17 Jun 2008 19:11:55 -0000 1.62 +++ sources 29 Jul 2008 19:31:55 -0000 1.63 @@ -1 +1 @@ -8131688557a6168bf9248e48ee9e90ad wine-1.0-fe.tar.bz2 +0c2bd312ed15b4ff15fef18794803c7e wine-1.1.2-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-9/wine.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- wine.spec 17 Jun 2008 19:11:55 -0000 1.87 +++ wine.spec 29 Jul 2008 19:31:55 -0000 1.88 @@ -1,5 +1,5 @@ Name: wine -Version: 1.0 +Version: 1.1.2 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -125,6 +125,7 @@ Summary: Wine core package Group: Applications/Emulators Requires: %{_bindir}/xmessage +Requires: freetype Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: wine <= 0.9.15-1%{?dist} @@ -222,7 +223,7 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch0 +#%patch0 %patch1 %patch2 %patch400 @@ -231,11 +232,11 @@ %build # work around gcc bug see #440139 # this affects more then just dlls/user32/menu.c -%if %{?fedora} > 8 -export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre" -%else +#%if %{?fedora} > 8 +#export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre" +#%else export CFLAGS="$RPM_OPT_FLAGS" -%endif +#%endif %configure \ --sysconfdir=%{_sysconfdir}/wine --disable-static \ @@ -446,6 +447,7 @@ %{_libdir}/wine/advapi32.dll.so %{_libdir}/wine/advpack.dll.so %{_libdir}/wine/amstream.dll.so +%{_libdir}/wine/appwiz.cpl.so %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so @@ -504,6 +506,7 @@ %{_libdir}/wine/dpnet.dll.so %{_libdir}/wine/dpnhpast.dll.so %{_libdir}/wine/dpnlobby.dll.so +%{_libdir}/wine/dpwsockx.dll.so %{_libdir}/wine/dsound.dll.so %{_libdir}/wine/dssenh.dll.so %{_libdir}/wine/dswave.dll.so @@ -515,6 +518,7 @@ %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so +%{_libdir}/wine/glu32.dll.so %{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/gpkcsp.dll.so %{_libdir}/wine/hal.dll.so @@ -532,6 +536,7 @@ %{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/inetcomm.dll.so +%{_libdir}/wine/inetmib1.dll.so %{_libdir}/wine/infosoft.dll.so %{_libdir}/wine/initpki.dll.so %{_libdir}/wine/inkobj.dll.so @@ -579,6 +584,7 @@ %{_libdir}/wine/msnet32.dll.so %{_libdir}/wine/mssip32.dll.so %{_libdir}/wine/msrle32.dll.so +%{_libdir}/wine/mstask.dll.so %{_libdir}/wine/msvcirt.dll.so %{_libdir}/wine/msvcr71.dll.so %{_libdir}/wine/msvcrt.dll.so @@ -727,7 +733,6 @@ %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so -%{_libdir}/wine/glu32.dll.so %{_libdir}/wine/opengl32.dll.so %{_libdir}/wine/wined3d.dll.so %{_libdir}/wine/dnsapi.dll.so @@ -834,6 +839,16 @@ %{_libdir}/wine/*.def %changelog +* Sun Jul 27 2008 Andreas Bierfert +- 1.1.2-1 +- version upgrade (#455960, #456831) +- require freetype (#452417) +- disable wineprefixcreate patch for now + +* Fri Jul 11 2008 Andreas Bierfert +- 1.1.1-1 +- version upgrade + * Tue Jun 17 2008 Andreas Bierfert - 1.0-1 - version upgrade (#446311,#417161) From fedora-extras-commits at redhat.com Tue Jul 29 19:32:26 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 29 Jul 2008 19:32:26 GMT Subject: rpms/wine/devel .cvsignore, 1.61, 1.62 sources, 1.62, 1.63 wine-desktop-mime.patch, 1.1, 1.2 wine.spec, 1.87, 1.88 Message-ID: <200807291932.m6TJWQML018438@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18337/devel Modified Files: .cvsignore sources wine-desktop-mime.patch wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 17 Jun 2008 19:12:27 -0000 1.61 +++ .cvsignore 29 Jul 2008 19:31:56 -0000 1.62 @@ -1 +1 @@ -wine-1.0-fe.tar.bz2 +wine-1.1.2-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 17 Jun 2008 19:12:27 -0000 1.62 +++ sources 29 Jul 2008 19:31:56 -0000 1.63 @@ -1 +1 @@ -8131688557a6168bf9248e48ee9e90ad wine-1.0-fe.tar.bz2 +0c2bd312ed15b4ff15fef18794803c7e wine-1.1.2-fe.tar.bz2 wine-desktop-mime.patch: Index: wine-desktop-mime.patch =================================================================== RCS file: /cvs/pkgs/rpms/wine/devel/wine-desktop-mime.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wine-desktop-mime.patch 17 Jun 2008 19:12:27 -0000 1.1 +++ wine-desktop-mime.patch 29 Jul 2008 19:31:56 -0000 1.2 @@ -1,9 +1,9 @@ ---- tools/wine.desktop.orig 2008-06-17 11:21:52.000000000 +0200 -+++ tools/wine.desktop 2008-06-17 11:23:16.000000000 +0200 -@@ -8,5 +8,5 @@ - Name[ru]=Wine ???????????????? Windows - Name[fr]=??mulateur Windows Wine +--- tools/wine.desktop.orig 2008-07-28 20:36:29.000000000 +0200 ++++ tools/wine.desktop 2008-07-28 20:36:43.000000000 +0200 +@@ -16,5 +16,5 @@ + Name[nb]=Wine Programlaster for Windowsapplikasjoner + Name[nn]=Wine Programlaster for Windowsapplikasjoner Exec=wine start /unix %f --MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable; -+MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed; +-MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;application/x-msi; ++MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-msi; NoDisplay=true Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- wine.spec 17 Jun 2008 19:12:27 -0000 1.87 +++ wine.spec 29 Jul 2008 19:31:56 -0000 1.88 @@ -1,5 +1,5 @@ Name: wine -Version: 1.0 +Version: 1.1.2 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -125,6 +125,7 @@ Summary: Wine core package Group: Applications/Emulators Requires: %{_bindir}/xmessage +Requires: freetype Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: wine <= 0.9.15-1%{?dist} @@ -222,7 +223,7 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch0 +#%patch0 %patch1 %patch2 %patch400 @@ -231,11 +232,11 @@ %build # work around gcc bug see #440139 # this affects more then just dlls/user32/menu.c -%if %{?fedora} > 8 -export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre" -%else +#%if %{?fedora} > 8 +#export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre" +#%else export CFLAGS="$RPM_OPT_FLAGS" -%endif +#%endif %configure \ --sysconfdir=%{_sysconfdir}/wine --disable-static \ @@ -446,6 +447,7 @@ %{_libdir}/wine/advapi32.dll.so %{_libdir}/wine/advpack.dll.so %{_libdir}/wine/amstream.dll.so +%{_libdir}/wine/appwiz.cpl.so %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so @@ -504,6 +506,7 @@ %{_libdir}/wine/dpnet.dll.so %{_libdir}/wine/dpnhpast.dll.so %{_libdir}/wine/dpnlobby.dll.so +%{_libdir}/wine/dpwsockx.dll.so %{_libdir}/wine/dsound.dll.so %{_libdir}/wine/dssenh.dll.so %{_libdir}/wine/dswave.dll.so @@ -515,6 +518,7 @@ %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so +%{_libdir}/wine/glu32.dll.so %{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/gpkcsp.dll.so %{_libdir}/wine/hal.dll.so @@ -532,6 +536,7 @@ %{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/inetcomm.dll.so +%{_libdir}/wine/inetmib1.dll.so %{_libdir}/wine/infosoft.dll.so %{_libdir}/wine/initpki.dll.so %{_libdir}/wine/inkobj.dll.so @@ -579,6 +584,7 @@ %{_libdir}/wine/msnet32.dll.so %{_libdir}/wine/mssip32.dll.so %{_libdir}/wine/msrle32.dll.so +%{_libdir}/wine/mstask.dll.so %{_libdir}/wine/msvcirt.dll.so %{_libdir}/wine/msvcr71.dll.so %{_libdir}/wine/msvcrt.dll.so @@ -727,7 +733,6 @@ %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so -%{_libdir}/wine/glu32.dll.so %{_libdir}/wine/opengl32.dll.so %{_libdir}/wine/wined3d.dll.so %{_libdir}/wine/dnsapi.dll.so @@ -834,6 +839,16 @@ %{_libdir}/wine/*.def %changelog +* Sun Jul 27 2008 Andreas Bierfert +- 1.1.2-1 +- version upgrade (#455960, #456831) +- require freetype (#452417) +- disable wineprefixcreate patch for now + +* Fri Jul 11 2008 Andreas Bierfert +- 1.1.1-1 +- version upgrade + * Tue Jun 17 2008 Andreas Bierfert - 1.0-1 - version upgrade (#446311,#417161) From fedora-extras-commits at redhat.com Tue Jul 29 19:34:05 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Tue, 29 Jul 2008 19:34:05 GMT Subject: rpms/netbsd-iscsi/devel netbsd-iscsi-20071205-utf8.patch, NONE, 1.1 netbsd-iscsi.sysconfig, NONE, 1.1 netbsd-iscsi.sysvinit, NONE, 1.1 Message-ID: <200807291934.m6TJY5Y7018531@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/netbsd-iscsi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18523 Added Files: netbsd-iscsi-20071205-utf8.patch netbsd-iscsi.sysconfig netbsd-iscsi.sysvinit Log Message: add missing files netbsd-iscsi-20071205-utf8.patch: --- NEW FILE netbsd-iscsi-20071205-utf8.patch --- diff -urp netbsd-iscsi-20071205.orig/src/iscsi-target.8 netbsd-iscsi-20071205/src/iscsi-target.8 --- netbsd-iscsi-20071205.orig/src/iscsi-target.8 2006-05-27 23:21:04.000000000 +0200 +++ netbsd-iscsi-20071205/src/iscsi-target.8 2008-07-28 18:28:59.000000000 +0200 @@ -1,6 +1,6 @@ .\" $NetBSD: iscsi-target.8,v 1.6 2006/05/27 21:21:04 agc Exp $ .\" -.\" Copyright ? 2006 Alistair Crooks. All rights reserved. +.\" Copyright ?? 2006 Alistair Crooks. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff -urp netbsd-iscsi-20071205.orig/src/targets.5 netbsd-iscsi-20071205/src/targets.5 --- netbsd-iscsi-20071205.orig/src/targets.5 2006-02-24 22:01:19.000000000 +0100 +++ netbsd-iscsi-20071205/src/targets.5 2008-07-28 18:28:20.000000000 +0200 @@ -1,6 +1,6 @@ .\" $NetBSD: targets.5,v 1.4 2006/02/24 21:01:19 wiz Exp $ .\" -.\" Copyright ? 2006 Alistair Crooks. All rights reserved. +.\" Copyright ?? 2006 Alistair Crooks. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions --- NEW FILE netbsd-iscsi.sysconfig --- # You can specify the target name here, such as: # NETBSD_ISCSI_OPTS="-t iqn.2008-07.fedoraproject.org" --- NEW FILE netbsd-iscsi.sysvinit --- #! /bin/bash # # netbsd-iscsi: init script for iscsi-target daemon in netbsd-iscsi. # # Author: Satoru SATOH # Crippled by: Lubomir Rintel # # chkconfig: - 80 30 # description: NetBSD iSCSI (iscsi-target) is a iSCSI target program. # processname: iscsi-target # config: /etc/iscsi/initiatorname.iscsi # config: /etc/iscsi/iscsid.conf # config: /etc/iscsi/targets # pidfile: /var/run/iscsi-target.pid # ### BEGIN INIT INFO # Provides: netbsd-iscsi # Required-Start: network # Required-Stop: # Default-Start: # Default-Stop: 0 1 2 6 # Short-Description: NetBSD iSCSI target # Description: NetBSD iSCSI (iscsi-target) is a iSCSI target program. ### END INIT INFO SERVICE=netbsd-iscsi PROCESS=iscsi-target DAEMON=/usr/sbin/iscsi-target # Source function library. . /etc/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Source service configuration. . /etc/sysconfig/$SERVICE # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 [ -x $DAEMON ] || exit 1 start() { echo -n $"Starting $SERVICE: " set -o pipefail daemon $DAEMON $NETBSD_ISCSI_OPTS >/dev/null # We suppressed nonessential output, so we need to reprint status msg [ "$?" -eq 0 ] && success || failure RETVAL=$? echo [ $RETVAL = 0 ] && touch /var/lock/subsys/$SERVICE return $RETVAL } stop() { echo -n $"Stopping $SERVICE:" killproc $PROCESS RETVAL=$? echo if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/$SERVICE rm -f /var/run/$PROCESS.pid fi return $RETVAL } restart() { stop && start } RETVAL=0 case "$1" in start) start RETVAL=$? ;; stop) stop RETVAL=$? ;; restart) restart RETVAL=$? ;; reload) echo "$0 does not support configuration reloading, you have to restart it." RETVAL=1 ;; status) status $PROCESS RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|restart|reload|status}" RETVAL=1 esac exit $RETVAL From fedora-extras-commits at redhat.com Tue Jul 29 19:42:30 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 29 Jul 2008 19:42:30 GMT Subject: rpms/gnome-commander/devel gnome-commander.spec,1.24,1.25 Message-ID: <200807291942.m6TJgUUn019116@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19072 Modified Files: gnome-commander.spec Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-2 - F-10+: Fix icon name due to gnome-icon-theme 2.23.x change Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gnome-commander.spec 29 Jul 2008 16:40:46 -0000 1.24 +++ gnome-commander.spec 29 Jul 2008 19:42:00 -0000 1.25 @@ -10,7 +10,7 @@ %define use_autotool 0 %define if_pre 0 -%define main_release 1 +%define main_release 2 #%%define extratag svn1901_trunk %if 0%{?if_pre} > 0 @@ -103,6 +103,22 @@ -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ configure +%if 0%{?fedora} >= 10 +function replace_icon(){ + find . -name \*.cc | xargs grep -l $1 | \ + xargs %{__sed} -i -e "s|\"$1\"|\"$2\"|" +} + +replace_icon gnome-fs-directory gtk-directory +replace_icon gnome-fs-ftp folder-remote +replace_icon gnome-fs-home user-home +replace_icon gnome-fs-network gtk-network +replace_icon gnome-fs-smb network-workgroup +replace_icon gnome-fs-ssh folder-remote +replace_icon gnome-fs-web folder-remote + +%endif + %build %configure \ --disable-scrollkeeper \ @@ -161,6 +177,9 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-2 +- F-10+: Fix icon name due to gnome-icon-theme 2.23.x change + * Wed Jul 30 2008 Mamoru Tasaka - 1.2.7-1 - 1.2.7 From fedora-extras-commits at redhat.com Tue Jul 29 19:50:19 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 19:50:19 GMT Subject: rpms/policycoreutils/F-9 policycoreutils-po.patch, 1.37, 1.38 policycoreutils-rhat.patch, 1.371, 1.372 policycoreutils-sepolgen.patch, 1.13, 1.14 policycoreutils.spec, 1.530, 1.531 sources, 1.188, 1.189 Message-ID: <200807291950.m6TJoJ1W019564@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481 Modified Files: policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils-sepolgen.patch policycoreutils.spec sources Log Message: * Tue Jul 29 2008 Dan Walsh 2.0.52-6 - Fix boolean handling - Upgrade to latest sepolgen - Update po patch policycoreutils-po.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.37 -r 1.38 policycoreutils-po.patch Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-po.patch,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- policycoreutils-po.patch 10 Jul 2008 17:19:14 -0000 1.37 +++ policycoreutils-po.patch 29 Jul 2008 19:49:46 -0000 1.38 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.52/po/.cvsignore --- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/po/.cvsignore 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/.cvsignore 2008-07-29 09:06:29.000000000 -0400 @@ -0,0 +1,16 @@ +*.gmo +*.mo @@ -20,7 +20,7 @@ +stamp-it diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.52/po/Makefile --- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/Makefile 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/Makefile 2008-07-29 09:06:29.000000000 -0400 @@ -23,20 +23,61 @@ POFILES = $(wildcard *.po) MOFILES = $(patsubst %.po,%.mo,$(POFILES)) @@ -102,7 +102,7 @@ l=`basename $$n .mo`; \ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.52/po/POTFILES --- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/POTFILES 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES 2008-07-29 09:06:29.000000000 -0400 @@ -1,10 +1,54 @@ - ../load_policy/load_policy.c \ - ../newrole/newrole.c \ @@ -168,7 +168,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.52/po/POTFILES.in --- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/POTFILES.in 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/POTFILES.in 2008-07-29 09:06:29.000000000 -0400 @@ -2,9 +2,7 @@ run_init/run_init.c semodule_link/semodule_link.c @@ -230,7 +230,7 @@ secon/secon.c diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.52/po/af.po --- nsapolicycoreutils/po/af.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/af.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/af.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -4004,7 +4004,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.52/po/am.po --- nsapolicycoreutils/po/am.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/am.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/am.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -7778,7 +7778,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.52/po/ar.po --- nsapolicycoreutils/po/ar.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/ar.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/ar.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -11552,7 +11552,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.52/po/as.po --- nsapolicycoreutils/po/as.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/as.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/as.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,3566 @@ # translation of as.po to Assamese # This file is distributed under the same license as the PACKAGE package. @@ -15834,7 +15834,7 @@ +#~ msgstr "????????????" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/autom4te.cache/requests policycoreutils-2.0.52/po/autom4te.cache/requests --- nsapolicycoreutils/po/autom4te.cache/requests 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/po/autom4te.cache/requests 2008-07-03 16:17:10.000000000 -0400 ++++ policycoreutils-2.0.52/po/autom4te.cache/requests 2008-07-29 09:06:29.000000000 -0400 @@ -0,0 +1,63 @@ +# This file was generated. +# It contains the lists of macros which have been traced. @@ -15901,7 +15901,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.52/po/be.po --- nsapolicycoreutils/po/be.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/be.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/be.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -19675,7 +19675,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.52/po/bg.po --- nsapolicycoreutils/po/bg.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/bg.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/bg.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,3877 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -24324,7 +24324,7 @@ +#~ msgstr "???????????? ???? ?????? root ???? ???? ???????????????????? %s." diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.52/po/bn.po --- nsapolicycoreutils/po/bn.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/bn.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -28098,7 +28098,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.52/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/bn_IN.po 2008-07-08 08:47:28.000000000 -0400 ++++ policycoreutils-2.0.52/po/bn_IN.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1079 +1,3401 @@ -# translation of bn_IN.po to Bengali India -# translation of bn_IN.po to Bangla (INDIA) @@ -32168,7 +32168,7 @@ +#~ "Disabled\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.52/po/bs.po --- nsapolicycoreutils/po/bs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/bs.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/bs.po 2008-07-29 09:29:36.000000000 -0400 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: bs\n" @@ -36291,7 +36291,7 @@ +#~ msgstr "Opciona gre??ka: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.52/po/ca.po --- nsapolicycoreutils/po/ca.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ca.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ca.po 2008-07-29 09:29:36.000000000 -0400 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -40366,7 +40366,7 @@ +#~ msgstr "Error en les opcions: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.52/po/cs.po --- nsapolicycoreutils/po/cs.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/cs.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/cs.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,8926 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -49911,7 +49911,7 @@ +#~ msgstr "Ulo??it na _disketu" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.52/po/cy.po --- nsapolicycoreutils/po/cy.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/cy.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/cy.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -53685,7 +53685,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.52/po/da.po --- nsapolicycoreutils/po/da.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/da.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/da.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1042 +1,3260 @@ +# translation of da.po to # Danish messages for policycoreutils. @@ -57602,8 +57602,8 @@ +#~ msgstr "Flagfejl: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.52/po/de.po --- nsapolicycoreutils/po/de.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/de.po 2008-07-08 08:47:29.000000000 -0400 -@@ -1,1067 +1,3455 @@ ++++ policycoreutils-2.0.52/po/de.po 2008-07-29 09:29:36.000000000 -0400 +@@ -1,1067 +1,3453 @@ -# translation of de.po to +# translation of policycoreutils.HEAD.de.po to # translation of de.po to @@ -57628,8 +57628,8 @@ -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -"PO-Revision-Date: 2006-11-22 09:27+1000\n" -"Last-Translator: Timo Trinks \n" -+"POT-Creation-Date: 2008-07-07 04:04+0000\n" -+"PO-Revision-Date: 2008-07-07 12:02+0100\n" ++"POT-Creation-Date: 2008-07-22 02:41+0000\n" ++"PO-Revision-Date: 2008-07-22 09:10+0100\n" +"Last-Translator: Fabian Affolter \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -57777,7 +57777,6 @@ +msgstr "%s ist nicht in ??bersetzungen festgelegt" + +#: ../semanage/seobject.py:266 -+#, fuzzy +msgid "Permissive Types" +msgstr "Permissive Typen" + @@ -61510,7 +61509,6 @@ [...8640 lines suppressed...] -+ +#~ msgid "Requires 2 or more arguments" +#~ msgstr "Requer 2 ou mais argumentos" -+ +#~ msgid "%s not defined" +#~ msgstr "%s n??o definido" -+ +#~ msgid "%s not valid for %s objects\n" +#~ msgstr "%s n??o ?? v??lido para objetos %s\n" -+ +#~ msgid "range not supported on Non MLS machines" +#~ msgstr "intervalo n??o suportado em m??quinas n??o-MLS" -+ +#~ msgid "Invalid value %s" +#~ msgstr "Valor inv??lido %s" -+ +#~ msgid "" +#~ "In order to load this newly created policy package into the kernel,\n" +#~ "you are required to execute \n" @@ -228916,12 +228958,16 @@ +#~ "\n" +#~ "semodule -i %s.pp\n" +#~ "\n" -+ +#~ msgid "Options Error: %s " +#~ msgstr "Erro de Op????es: %s " + +-#: ../audit2allow/audit2allow:211 +-#, c-format +-msgid "Options Error: %s " +-msgstr "Erro de Op????es: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ro.po policycoreutils-2.0.52/po/ro.po --- nsapolicycoreutils/po/ro.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/ro.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ro.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -232695,7 +232741,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils-2.0.52/po/ru.po --- nsapolicycoreutils/po/ru.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ru.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ru.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1038 +1,3325 @@ # translation of ru.po to Russian -# @@ -236712,7 +236758,7 @@ +#~ "%s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.52/po/si.po --- nsapolicycoreutils/po/si.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/si.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/si.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -240486,7 +240532,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.52/po/sk.po --- nsapolicycoreutils/po/sk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/sk.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sk.po 2008-07-29 09:29:36.000000000 -0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -244534,7 +244580,7 @@ +#~ msgstr "Chyba volieb: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.52/po/sl.po --- nsapolicycoreutils/po/sl.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sl.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sl.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -248308,7 +248354,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.52/po/sq.po --- nsapolicycoreutils/po/sq.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sq.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sq.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -252082,7 +252128,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.52/po/sr.po --- nsapolicycoreutils/po/sr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sr.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1117 +1,3432 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian # Serbian translations for policycoreutils @@ -257344,7 +257390,7 @@ - diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.52/po/sr at latin.po --- nsapolicycoreutils/po/sr at latin.po 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/po/sr at latin.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sr at latin.po 2008-07-29 09:29:36.000000000 -0400 @@ -0,0 +1,3434 @@ +# translation of policycoreutils.HEAD.sr.po to Serbian +# Serbian(Latin) translations for policycoreutils @@ -260782,7 +260828,7 @@ +#~ "Isklju??eno\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.52/po/sv.po --- nsapolicycoreutils/po/sv.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/sv.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/sv.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1040 +1,3368 @@ # Swedish messages for policycoreutils. -# Copyright (C) Christian Rose , 2006. @@ -264954,7 +265000,7 @@ +#~ msgstr "Flaggfel: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.52/po/ta.po --- nsapolicycoreutils/po/ta.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ta.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ta.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1043 +1,3363 @@ # translation of ta.po to Tamil # This file is distributed under the same license as the PACKAGE package. @@ -269120,7 +269166,7 @@ +#~ "MCS ????????????" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.52/po/te.po --- nsapolicycoreutils/po/te.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/te.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/te.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1028 +1,3381 @@ -# SOME DESCRIPTIVE TITLE. +# translation of new_policycoreutils.HEAD.te.po to Telugu @@ -273276,7 +273322,7 @@ +#~ "????????????????????????\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.52/po/th.po --- nsapolicycoreutils/po/th.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/th.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/th.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -277050,7 +277096,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.52/po/tr.po --- nsapolicycoreutils/po/tr.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/tr.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/tr.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -280824,7 +280870,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.52/po/uk.po --- nsapolicycoreutils/po/uk.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/uk.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/uk.po 2008-07-29 09:29:36.000000000 -0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -284874,7 +284920,7 @@ +#~ msgstr "?????????????? ?? ????????????????????: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.52/po/ur.po --- nsapolicycoreutils/po/ur.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/ur.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/ur.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -288648,7 +288694,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.52/po/vi.po --- nsapolicycoreutils/po/vi.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/vi.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/vi.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -292422,7 +292468,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.52/po/zh_CN.po --- nsapolicycoreutils/po/zh_CN.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/zh_CN.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_CN.po 2008-07-29 09:29:36.000000000 -0400 @@ -1,1045 +1,3343 @@ -# translation of zh_CN.po to -# translation of zh_CN.po to @@ -296400,7 +296446,7 @@ +#~ "??????\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.52/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/zh_TW.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/zh_TW.po 2008-07-29 09:29:36.000000000 -0400 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zh_TW\n" @@ -300442,7 +300488,7 @@ +#~ msgstr "???????????????%s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.52/po/zu.po --- nsapolicycoreutils/po/zu.po 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/zu.po 2008-07-08 08:47:29.000000000 -0400 ++++ policycoreutils-2.0.52/po/zu.po 2008-07-29 09:29:36.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" policycoreutils-rhat.patch: Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-rhat.patch,v retrieving revision 1.371 retrieving revision 1.372 diff -u -r1.371 -r1.372 --- policycoreutils-rhat.patch 10 Jul 2008 17:19:15 -0000 1.371 +++ policycoreutils-rhat.patch 29 Jul 2008 19:49:47 -0000 1.372 @@ -1,15 +1,15 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile ---- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/Makefile 2008-07-09 08:44:40.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile +--- nsapolicycoreutils/Makefile 2008-07-02 17:19:34.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-29 15:48:03.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-09 08:44:40.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2008-07-02 17:19:34.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-29 15:48:03.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -36,12 +36,21 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-09 08:44:58.000000000 -0400 -@@ -51,7 +51,7 @@ +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:34.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-29 15:48:20.000000000 -0400 +@@ -45,13 +45,13 @@ + def usage(message = ""): + print _(""" + semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] +-semanage login -{a|d|m} [-sr] login_name +-semanage user -{a|d|m} [-LrRP] selinux_name ++semanage login -{a|d|m} [-srF] login_name | login_file ++semanage user -{a|d|m} [-LrRPF] selinux_name | user_file + semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range semanage interface -{a|d|m} [-tr] interface_spec - semanage fcontext -{a|d|m} [-frst] file_spec +-semanage fcontext -{a|d|m} [-frst] file_spec ++semanage fcontext -{a|d|m} [-frstF] file_spec | fcontext_file semanage translation -{a|d|m} [-T] level -semanage boolean -{d|m} boolean +semanage boolean -{d|m} [-F] boolean | boolean_file @@ -56,7 +65,22 @@ -p, --proto Port protocol (tcp or udp) -P, --prefix Prefix for home directory labeling -L, --level Default SELinux Level (MLS/MCS Systems only) -@@ -114,7 +115,7 @@ +@@ -102,19 +103,19 @@ + valid_option={} + valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall', '-S', '--store' ] + valid_option["login"] = [] +- valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range'] ++ valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range', "-F", "--file"] + valid_option["user"] = [] +- valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix' ] ++ valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix', "-F", "--file"] + valid_option["port"] = [] + valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--proto' ] + valid_option["interface"] = [] + valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] + valid_option["fcontext"] = [] +- valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range'] ++ valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range', "-F", "--file"] valid_option["translation"] = [] valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] valid_option["boolean"] = [] @@ -65,9 +89,12 @@ valid_option["permissive"] = [] valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ] return valid_option -@@ -136,13 +137,14 @@ +@@ -134,15 +135,16 @@ + setrans = "" + roles = "" seuser = "" - prefix = "" +- prefix = "" ++ prefix = "user" heading=1 - value=0 - add = 0 @@ -156,10 +183,11 @@ if o == "--on" or o == "-1": - value = 1 -+ value = True - if o == "-off" or o == "-0": +- if o == "-off" or o == "-0": - value = 0 -+ value = False ++ value = "on" ++ if o == "--off" or o == "-0": ++ value = "off" if object == "login": OBJECT = seobject.loginRecords(store) @@ -175,12 +203,18 @@ sys.exit(0); if deleteall: -@@ -298,8 +308,6 @@ - rlist = roles.split() - if len(rlist) == 0: - raise ValueError(_("You must specify a role")) +@@ -295,11 +305,9 @@ + OBJECT.add(target, setrans) + + if object == "user": +- rlist = roles.split() +- if len(rlist) == 0: +- raise ValueError(_("You must specify a role")) - if prefix == "": - raise ValueError(_("You must specify a prefix")) ++ rlist = [] ++ if not use_file: ++ rlist = roles.split() OBJECT.add(target, rlist, selevel, serange, prefix) if object == "port": @@ -193,9 +227,9 @@ if object == "login": OBJECT.modify(target, seuser, serange) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-09 08:44:40.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 +--- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:34.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-29 15:48:03.000000000 -0400 @@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool @@ -230,9 +264,9 @@ .I \-t, \-\-type SELinux Type for the object .TP -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-09 08:55:45.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:34.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-29 15:48:15.000000000 -0400 @@ -330,20 +330,15 @@ for name in dirs: os.rmdir(os.path.join(root, name)) @@ -256,7 +290,20 @@ def deleteall(self): l = self.get_all() if len(l) > 0: -@@ -1447,54 +1442,72 @@ +@@ -567,7 +562,11 @@ + def __init__(self, store = ""): + semanageRecords.__init__(self, store) + +- def add(self, name, roles, selevel, serange, prefix): ++ def add(self, name, roles, selevel, serange, prefix, use_file = False): ++ ++ if len(roles) == 0: ++ raise ValueError(_("You must specify a role")) ++ + if is_mls_enabled == 1: + if serange == "": + serange = "s0" +@@ -1447,54 +1446,72 @@ class booleanRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) @@ -363,7 +410,7 @@ (rc,exists) = semanage_bool_exists(self.sh, k) if rc < 0: raise ValueError(_("Could not check if boolean %s is defined") % name) -@@ -1571,8 +1584,15 @@ +@@ -1571,8 +1588,15 @@ else: return _("unknown") policycoreutils-sepolgen.patch: Index: policycoreutils-sepolgen.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-sepolgen.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- policycoreutils-sepolgen.patch 2 Jul 2008 02:08:03 -0000 1.13 +++ policycoreutils-sepolgen.patch 29 Jul 2008 19:49:47 -0000 1.14 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.49/sepolgen-1.0.12/src/sepolgen/refparser.py ---- nsasepolgen/src/sepolgen/refparser.py 2008-06-12 23:25:26.000000000 -0400 -+++ policycoreutils-2.0.49/sepolgen-1.0.12/src/sepolgen/refparser.py 2008-06-27 07:21:06.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.49/sepolgen-1.0.13/src/sepolgen/refparser.py +--- nsasepolgen/src/sepolgen/refparser.py 2008-06-13 23:25:26.000000000 -0400 ++++ policycoreutils-2.0.49/sepolgen-1.0.13/src/sepolgen/refparser.py 2008-06-27 07:21:06.000000000 -0400 @@ -919,7 +919,7 @@ def list_headers(root): modules = [] Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils.spec,v retrieving revision 1.530 retrieving revision 1.531 diff -u -r1.530 -r1.531 --- policycoreutils.spec 10 Jul 2008 17:19:15 -0000 1.530 +++ policycoreutils.spec 29 Jul 2008 19:49:47 -0000 1.531 @@ -2,11 +2,11 @@ %define libsepolver 2.0.19-1 %define libsemanagever 2.0.5-1 %define libselinuxver 2.0.46-5 -%define sepolgenver 1.0.12 +%define sepolgenver 1.0.13 Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.52 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,11 @@ fi %changelog +* Tue Jul 29 2008 Dan Walsh 2.0.52-6 +- Fix boolean handling +- Upgrade to latest sepolgen +- Update po patch + * Wed Jul 9 2008 Dan Walsh 2.0.52-5 - Additial cleanup of boolean handling for semanage Index: sources =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-9/sources,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- sources 2 Jul 2008 21:29:26 -0000 1.188 +++ sources 29 Jul 2008 19:49:47 -0000 1.189 @@ -1,2 +1,2 @@ -4813a1ed80f19068ed9897165f073e8b sepolgen-1.0.12.tgz +b6756a012c26f414e4a5f8f438ce2188 sepolgen-1.0.13.tgz 311e95b3374fe1993fb91a303b6675b2 policycoreutils-2.0.52.tgz From fedora-extras-commits at redhat.com Tue Jul 29 19:52:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 19:52:22 +0000 Subject: [pkgdb] 8Kingdoms ownership updated Message-ID: <20080729195222.A0B0F1AD0E7@bastion.fedora.phx.redhat.com> Package 8Kingdoms in Fedora devel was orphaned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/8Kingdoms From fedora-extras-commits at redhat.com Tue Jul 29 19:52:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 19:52:24 +0000 Subject: [pkgdb] 8Kingdoms ownership updated Message-ID: <20080729195224.81D551AD0EC@bastion.fedora.phx.redhat.com> Package 8Kingdoms in Fedora 8 was orphaned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/8Kingdoms From fedora-extras-commits at redhat.com Tue Jul 29 19:52:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 19:52:26 +0000 Subject: [pkgdb] 8Kingdoms ownership updated Message-ID: <20080729195226.DD4D51AD0F3@bastion.fedora.phx.redhat.com> Package 8Kingdoms in Fedora 9 was orphaned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/8Kingdoms From fedora-extras-commits at redhat.com Tue Jul 29 19:52:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 19:52:26 +0000 Subject: [pkgdb] 8Kingdoms ownership updated Message-ID: <20080729195227.1D2FE1AD0F7@bastion.fedora.phx.redhat.com> Package 8Kingdoms in Fedora 7 was orphaned by Hans de Goede (jwrdegoede) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/8Kingdoms From fedora-extras-commits at redhat.com Tue Jul 29 20:10:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 20:10:03 GMT Subject: rpms/gnu-efi/devel gnu-efi.spec,1.22,1.23 Message-ID: <200807292010.m6TKA3Pn026613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gnu-efi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26582 Modified Files: gnu-efi.spec Log Message: fix license tag Index: gnu-efi.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnu-efi/devel/gnu-efi.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnu-efi.spec 29 Jul 2008 15:13:01 -0000 1.22 +++ gnu-efi.spec 29 Jul 2008 20:09:33 -0000 1.23 @@ -1,9 +1,9 @@ Summary: Development Libraries and headers for EFI Name: gnu-efi Version: 3.0d -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/System -License: GPL +License: GPLv2+ URL: ftp://ftp.hpl.hp.com/pub/linux-ia64 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz Patch0: gnu-efi-3.0d-pragma.patch @@ -56,6 +56,9 @@ %{_libdir}/* %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 3.0d-6 +- fix license tag + * Mon Jul 28 2008 Peter Jones - 3.0d-5 - Remove ia64 palproc code since its license isn't usable. - Remove ia64 from ExclusiveArch since it can't build... From fedora-extras-commits at redhat.com Tue Jul 29 20:11:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 20:11:57 GMT Subject: rpms/gtkhtml2/devel gtkhtml2.spec,1.24,1.25 Message-ID: <200807292011.m6TKBv3n026705@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtkhtml2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26680 Modified Files: gtkhtml2.spec Log Message: fix license tag Index: gtkhtml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml2/devel/gtkhtml2.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gtkhtml2.spec 10 Feb 2008 03:26:06 -0000 1.24 +++ gtkhtml2.spec 29 Jul 2008 20:11:27 -0000 1.25 @@ -8,8 +8,8 @@ Name: gtkhtml2 Version: 2.11.1 -Release: 3%{?dist} -License: LGPL +Release: 4%{?dist} +License: LGPLv2+ Group: System Environment/Libraries Summary: An HTML widget for GTK+ 2.0 Source: libgtkhtml-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 2.11.1-4 +- Fix license tag + * Sat Feb 09 2008 Matthew Barnes - 2.11.1-3 - Rebuild with GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 29 20:17:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 20:17:06 GMT Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.127,1.128 Message-ID: <200807292017.m6TKH695026901@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtkhtml3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26854 Modified Files: gtkhtml3.spec Log Message: fix license tag Index: gtkhtml3.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- gtkhtml3.spec 22 Jul 2008 00:06:53 -0000 1.127 +++ gtkhtml3.spec 29 Jul 2008 20:16:36 -0000 1.128 @@ -10,8 +10,8 @@ Name: gtkhtml3 Version: 3.23.5 -Release: 1%{?dist} -License: LGPL/GPL +Release: 2%{?dist} +License: LGPLv2+ and GPLv2 Group: System Environment/Libraries Summary: gtkhtml library Source: gtkhtml-%{version}.tar.bz2 @@ -122,6 +122,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 3.23.5-2.fc10 +- Fix license tag + * Mon Jul 21 2008 Matthew Barnes - 3.23.5-1.fc10 - Update to 3.23.5 - Remove patch for GNOME bug #538703 (fixed upstream). From fedora-extras-commits at redhat.com Tue Jul 29 20:31:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 20:31:38 +0000 Subject: [pkgdb] NetworkManager-pptp had acl change status Message-ID: <20080729203139.4B0B31AD0F0@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has set the commit acl on NetworkManager-pptp (Fedora devel) to Approved for Daniel Williams (dcbw) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Tue Jul 29 20:31:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 20:31:38 +0000 Subject: [pkgdb] NetworkManager-pptp had acl change status Message-ID: <20080729203138.D0CF21AD0E9@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has set the approveacls acl on NetworkManager-pptp (Fedora devel) to Approved for Daniel Williams (dcbw) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Tue Jul 29 20:31:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 20:31:42 +0000 Subject: [pkgdb] NetworkManager-pptp had acl change status Message-ID: <20080729203142.6AFC71AD0F8@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has set the watchbugzilla acl on NetworkManager-pptp (Fedora devel) to Approved for Daniel Williams (dcbw) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Tue Jul 29 20:31:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 20:31:44 +0000 Subject: [pkgdb] NetworkManager-pptp had groupAcl changed Message-ID: <20080729203144.8598C1AD0FC@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has set the commit acl on NetworkManager-pptp (Fedora devel) to Approved for packager To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Tue Jul 29 20:31:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 29 Jul 2008 20:31:47 +0000 Subject: [pkgdb] NetworkManager-pptp had acl change status Message-ID: <20080729203148.9C1441AD0E3@bastion.fedora.phx.redhat.com> Lubomir Rintel (lkundrak) has set the watchcommits acl on NetworkManager-pptp (Fedora devel) to Approved for Daniel Williams (dcbw) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp From fedora-extras-commits at redhat.com Tue Jul 29 20:55:33 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 29 Jul 2008 20:55:33 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.195, 1.196 selinux-policy.spec, 1.698, 1.699 Message-ID: <200807292055.m6TKtXqj027642@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Tue Jul 29 2008 Dan Walsh 3.3.1-81 - Add boolean httpd_execmem - Add dontaudit for leaky pam_nssldap - Dontaudit ptrace of domains for staff_t policy-20071130.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.195 -r 1.196 policy-20071130.patch Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- policy-20071130.patch 25 Jul 2008 01:35:46 -0000 1.195 +++ policy-20071130.patch 29 Jul 2008 20:55:03 -0000 1.196 @@ -3102,8 +3102,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-07-15 14:02:51.000000000 -0400 -@@ -26,8 +26,10 @@ ++++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-07-28 08:40:30.000000000 -0400 +@@ -26,8 +26,12 @@ files_read_etc_files(tmpreaper_t) files_read_var_lib_files(tmpreaper_t) files_purge_tmp(tmpreaper_t) @@ -3111,10 +3111,12 @@ # why does it need setattr? files_setattr_all_tmp_dirs(tmpreaper_t) +files_getattr_lost_found_dirs(tmpreaper_t) ++files_getattr_all_dirs(tmpreaper_t) ++files_getattr_all_files(tmpreaper_t) mls_file_read_all_levels(tmpreaper_t) mls_file_write_all_levels(tmpreaper_t) -@@ -42,6 +44,26 @@ +@@ -42,6 +46,26 @@ cron_system_entry(tmpreaper_t,tmpreaper_exec_t) @@ -5118,7 +5120,7 @@ +/usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.3.1/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-07-17 10:52:13.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-07-28 08:49:10.000000000 -0400 @@ -35,7 +35,10 @@ template(`mozilla_per_role_template',` gen_require(` @@ -5271,7 +5273,15 @@ # Browse the web, connect to printer corenet_all_recvfrom_unlabeled($1_mozilla_t) -@@ -151,6 +193,7 @@ +@@ -139,7 +181,6 @@ + corenet_tcp_connect_http_cache_port($1_mozilla_t) + corenet_tcp_connect_ftp_port($1_mozilla_t) + corenet_tcp_connect_ipp_port($1_mozilla_t) +- corenet_tcp_connect_generic_port($1_mozilla_t) + corenet_sendrecv_http_client_packets($1_mozilla_t) + corenet_sendrecv_http_cache_client_packets($1_mozilla_t) + corenet_sendrecv_ftp_client_packets($1_mozilla_t) +@@ -151,6 +192,7 @@ dev_read_urand($1_mozilla_t) dev_read_rand($1_mozilla_t) @@ -5279,7 +5289,7 @@ dev_write_sound($1_mozilla_t) dev_read_sound($1_mozilla_t) dev_dontaudit_rw_dri($1_mozilla_t) -@@ -165,13 +208,28 @@ +@@ -165,13 +207,28 @@ files_read_var_files($1_mozilla_t) files_read_var_symlinks($1_mozilla_t) files_dontaudit_getattr_boot_dirs($1_mozilla_t) @@ -5308,7 +5318,7 @@ libs_use_ld_so($1_mozilla_t) libs_use_shared_libs($1_mozilla_t) -@@ -180,18 +238,10 @@ +@@ -180,18 +237,10 @@ miscfiles_read_fonts($1_mozilla_t) miscfiles_read_localization($1_mozilla_t) @@ -5330,7 +5340,7 @@ xserver_dontaudit_read_xdm_tmp_files($1_mozilla_t) xserver_dontaudit_getattr_xdm_tmp_sockets($1_mozilla_t) -@@ -211,131 +261,8 @@ +@@ -211,131 +260,8 @@ fs_manage_cifs_symlinks($1_mozilla_t) ') @@ -5464,7 +5474,7 @@ ') optional_policy(` -@@ -350,57 +277,58 @@ +@@ -350,57 +276,58 @@ optional_policy(` cups_read_rw_config($1_mozilla_t) cups_dbus_chat($1_mozilla_t) @@ -5547,7 +5557,7 @@ ') ######################################## -@@ -430,11 +358,11 @@ +@@ -430,11 +357,11 @@ # template(`mozilla_read_user_home_files',` gen_require(` @@ -5562,7 +5572,7 @@ ') ######################################## -@@ -464,11 +392,10 @@ +@@ -464,11 +391,10 @@ # template(`mozilla_write_user_home_files',` gen_require(` @@ -5576,7 +5586,7 @@ ') ######################################## -@@ -573,3 +500,27 @@ +@@ -573,3 +499,27 @@ allow $2 $1_mozilla_t:tcp_socket rw_socket_perms; ') @@ -5819,8 +5829,8 @@ +HOME_DIR/\.gstreamer-.* gen_context(system_u:object_r:user_nsplugin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.3.1/policy/modules/apps/nsplugin.if --- nsaserefpolicy/policy/modules/apps/nsplugin.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-07-15 14:02:51.000000000 -0400 -@@ -0,0 +1,353 @@ ++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-07-29 16:19:53.000000000 -0400 +@@ -0,0 +1,356 @@ + +## policy for nsplugin + @@ -5995,6 +6005,9 @@ + allow nsplugin_t $2:unix_stream_socket connectto; + dontaudit nsplugin_t $2:process ptrace; + ++ # Connect to pulseaudit server ++ stream_connect_pattern(nsplugin_t, user_home_t, user_home_t, $2) ++ + allow nsplugin_t $1_tmpfs_t:file { read getattr }; + allow $2 nsplugin_t:process { getattr ptrace signal_perms }; + allow $2 nsplugin_t:unix_stream_socket connectto; @@ -6176,8 +6189,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.3.1/policy/modules/apps/nsplugin.te --- nsaserefpolicy/policy/modules/apps/nsplugin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te 2008-07-15 14:02:51.000000000 -0400 -@@ -0,0 +1,211 @@ ++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te 2008-07-29 13:22:00.000000000 -0400 +@@ -0,0 +1,227 @@ + +policy_module(nsplugin,1.0.0) + @@ -6331,6 +6344,7 @@ + xserver_read_xdm_pid(nsplugin_t) + xserver_read_user_xauth(user, nsplugin_t) + xserver_use_user_fonts(user, nsplugin_t) ++ xserver_manage_home_fonts(nsplugin_t) +') + +######################################## @@ -6347,6 +6361,10 @@ +fs_list_inotifyfs(nsplugin_config_t) + +can_exec(nsplugin_config_t, nsplugin_rw_t) ++manage_dirs_pattern(nsplugin_config_t, user_nsplugin_home_t, user_nsplugin_home_t) ++manage_files_pattern(nsplugin_config_t, user_nsplugin_home_t, user_nsplugin_home_t) ++manage_lnk_files_pattern(nsplugin_config_t, user_nsplugin_home_t, user_nsplugin_home_t) ++ +manage_dirs_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t) +manage_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t) +manage_lnk_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t) @@ -6363,6 +6381,7 @@ +files_read_etc_files(nsplugin_config_t) +files_read_usr_files(nsplugin_config_t) +files_dontaudit_search_home(nsplugin_config_t) ++files_list_tmp(nsplugin_config_t) + +auth_use_nsswitch(nsplugin_config_t) + @@ -6377,14 +6396,24 @@ + + +tunable_policy(`use_nfs_home_dirs',` -+ fs_search_nfs(nsplugin_config_t) ++ fs_manage_nfs_dirs(nsplugin_t) ++ fs_manage_nfs_files(nsplugin_t) ++ fs_manage_nfs_dirs(nsplugin_config_t) ++ fs_manage_nfs_files(nsplugin_config_t) +') + +tunable_policy(`use_samba_home_dirs',` -+ fs_search_cifs(nsplugin_config_t) ++ fs_manage_cifs_dirs(nsplugin_t) ++ fs_manage_cifs_files(nsplugin_t) ++ fs_manage_cifs_dirs(nsplugin_config_t) ++ fs_manage_cifs_files(nsplugin_config_t) +') + [...1810 lines suppressed...] - ## - # --interface(`userdom_manage_unpriv_users_home_content_files',` -+interface(`userdom_dontaudit_read_unpriv_users_home_content_files',` - gen_require(` - attribute user_home_dir_type, user_home_type; - ') - - files_search_home($1) -- manage_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) -+ dontaudit $1 user_home_type:dir list_dir_perms; -+ dontaudit $1 user_home_type:file read_file_perms; -+ dontaudit $1 user_home_type:file read_lnk_file_perms; -+ -+ tunable_policy(`use_nfs_home_dirs',` -+ fs_dontaudit_read_nfs_files($1) -+ ') -+ -+ tunable_policy(`use_samba_home_dirs',` -+ fs_dontaudit_read_cifs_files($1) -+ ') - ') - - ######################################## - ## --## Set the attributes of user ptys. -+## Create, read, write, and delete directories in -+## unprivileged users home directories. - ## - ## - ## -@@ -5352,17 +5708,19 @@ - ## - ## - # --interface(`userdom_setattr_unpriv_users_ptys',` -+interface(`userdom_manage_unpriv_users_home_content_dirs',` - gen_require(` -- attribute user_ptynode; -+ attribute user_home_dir_type, user_home_type; - ') - -- allow $1 user_ptynode:chr_file setattr; -+ files_search_home($1) -+ manage_dirs_pattern($1,{ user_home_dir_type user_home_type },user_home_type) - ') - - ######################################## - ## --## Read and write unprivileged user ptys. -+## Create, read, write, and delete files in -+## unprivileged users home directories. - ## - ## - ## -@@ -5370,14 +5728,51 @@ - ## - ## - # --interface(`userdom_use_unpriv_users_ptys',` -+interface(`userdom_manage_unpriv_users_home_content_files',` - gen_require(` -- attribute user_ptynode; -+ attribute user_home_dir_type, user_home_type; - ') - -- term_search_ptys($1) -- allow $1 user_ptynode:chr_file rw_file_perms; --') -+ files_search_home($1) -+ manage_files_pattern($1,{ user_home_dir_type user_home_type },user_home_type) +') + +######################################## +## -+## Set the attributes of user ptys. ++## dontaudit Read all unprivileged users home directory ++## files. +## +## +## @@ -37235,36 +37466,31 @@ +## +## +# -+interface(`userdom_setattr_unpriv_users_ptys',` ++interface(`userdom_dontaudit_read_unpriv_users_home_content_files',` + gen_require(` -+ attribute user_ptynode; ++ attribute user_home_dir_type, user_home_type; + ') + -+ allow $1 user_ptynode:chr_file setattr; -+') ++ files_search_home($1) ++ dontaudit $1 user_home_type:dir list_dir_perms; ++ dontaudit $1 user_home_type:file read_file_perms; ++ dontaudit $1 user_home_type:file read_lnk_file_perms; + -+######################################## -+## -+## Read and write unprivileged user ptys. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`userdom_use_unpriv_users_ptys',` -+ gen_require(` -+ attribute user_ptynode; ++ tunable_policy(`use_nfs_home_dirs',` ++ fs_dontaudit_read_nfs_files($1) + ') + -+ term_search_ptys($1) -+ allow $1 user_ptynode:chr_file rw_file_perms; ++ tunable_policy(`use_samba_home_dirs',` ++ fs_dontaudit_read_cifs_files($1) ++ ') +') - - ######################################## - ## -@@ -5509,6 +5904,43 @@ ++ ++######################################## ++## + ## Create, read, write, and delete directories in + ## unprivileged users home directories. + ## +@@ -5509,6 +5939,43 @@ ######################################## ## @@ -37308,7 +37534,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5559,7 +5991,7 @@ +@@ -5559,7 +6026,7 @@ attribute userdomain; ') @@ -37317,7 +37543,7 @@ kernel_search_proc($1) ') -@@ -5674,6 +6106,42 @@ +@@ -5674,6 +6141,42 @@ ######################################## ## @@ -37360,7 +37586,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6172,408 @@ +@@ -5704,3 +6207,408 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') @@ -39077,14 +39303,15 @@ +## Policy for staff user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te --- nsaserefpolicy/policy/modules/users/staff.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-07-15 14:02:52.000000000 -0400 -@@ -0,0 +1,29 @@ ++++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-07-29 16:29:56.000000000 -0400 +@@ -0,0 +1,30 @@ +policy_module(staff,1.0.1) +userdom_admin_login_user_template(staff) + +# only staff_r can change to sysadm_r +userdom_role_change_template(staff, sysadm) +userdom_dontaudit_use_sysadm_terms(staff_t) ++domain_dontaudit_ptrace_all_domains(staff_t) + +kernel_read_ring_buffer(staff_t) + @@ -39207,8 +39434,8 @@ +## Policy for xguest user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.1/policy/modules/users/xguest.te --- nsaserefpolicy/policy/modules/users/xguest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-07-16 07:34:06.000000000 -0400 -@@ -0,0 +1,70 @@ ++++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-07-29 15:24:16.000000000 -0400 +@@ -0,0 +1,69 @@ +policy_module(xguest,1.0.1) + +## @@ -39278,7 +39505,6 @@ + bluetooth_dbus_chat(xguest_t) + ') +') -+ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:38:01.000000000 -0400 +++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-07-15 14:02:52.000000000 -0400 Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.698 retrieving revision 1.699 diff -u -r1.698 -r1.699 --- selinux-policy.spec 25 Jul 2008 01:35:47 -0000 1.698 +++ selinux-policy.spec 29 Jul 2008 20:55:03 -0000 1.699 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 80%{?dist} +Release: 81%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -386,6 +386,11 @@ %endif %changelog +* Tue Jul 29 2008 Dan Walsh 3.3.1-81 +- Add boolean httpd_execmem +- Add dontaudit for leaky pam_nssldap +- Dontaudit ptrace of domains for staff_t + * Thu Jul 24 2008 Dan Walsh 3.3.1-80 - Allow system_crond_t to restart init scripts - Allow dnsmasq to bind to any udp port From fedora-extras-commits at redhat.com Tue Jul 29 21:04:43 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Tue, 29 Jul 2008 21:04:43 GMT Subject: rpms/newsx/F-9 newsx-quotes.patch,NONE,1.1 newsx.spec,1.8,1.9 Message-ID: <200807292104.m6TL4hlX002083@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/newsx/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2050 Modified Files: newsx.spec Added Files: newsx-quotes.patch Log Message: * Tue Jul 29 2008 Dominik Mierzejewski 1.6-10 - recognize single quotes (fixes bug #455806, patch by Enrico Scholz) newsx-quotes.patch: --- NEW FILE newsx-quotes.patch --- diff -up newsx-1.6/src/config.c.~1~ newsx-1.6/src/config.c --- newsx-1.6/src/config.c.~1~ 2003-05-18 12:57:24.000000000 +0200 +++ newsx-1.6/src/config.c 2008-07-14 09:19:11.000000000 +0200 @@ -402,6 +402,9 @@ config_line(char *buf) if (*q == '"') { is_quote = 1; ++q; + } else if (*q == '\'') { + is_quote = 2; + ++q; } /* BUG: what about ';'? */ @@ -428,7 +431,9 @@ config_line(char *buf) is_more = 1; buf = q; break; - } else if (is_quote && c=='"') { + } else if (is_quote==1 && c=='"') { + break; + } else if (is_quote==2 && c=='\'') { break; } else { *p++ = c; Index: newsx.spec =================================================================== RCS file: /cvs/pkgs/rpms/newsx/F-9/newsx.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- newsx.spec 12 Jul 2008 22:28:47 -0000 1.8 +++ newsx.spec 29 Jul 2008 21:04:13 -0000 1.9 @@ -1,6 +1,6 @@ Name: newsx Version: 1.6 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Summary: NNTP news exchange utility Summary(pl): Narz??dzie do wymiany news??w po NNTP @@ -9,6 +9,7 @@ # Source0-md5: ad9c76c53d5c7d21d86bec805fe8cd34 Patch0: %{name}-make.patch Patch1: %{name}-stack.patch +Patch2: %{name}-quotes.patch BuildRequires: inn-devel BuildRequires: automake BuildRequires: autoconf @@ -29,6 +30,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -b .stack +%patch2 -p1 -b .quotes %build autoreconf -f -i @@ -62,6 +64,9 @@ %{_mandir}/man[158]/* %changelog +* Tue Jul 29 2008 Dominik Mierzejewski 1.6-10 +- recognize single quotes (fixes bug #455806, patch by Enrico Scholz) + * Sat Jul 12 2008 Dominik Mierzejewski 1.6-9 - fixed stack buffer overflow in getarticle.c (#454483) - restored the use of history From fedora-extras-commits at redhat.com Tue Jul 29 21:05:38 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 29 Jul 2008 21:05:38 GMT Subject: rpms/eclipse/devel eclipse.spec,1.565,1.566 Message-ID: <200807292105.m6TL5clS002114@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2096 Modified Files: eclipse.spec Log Message: * Mon Jul 28 2008 Andrew Overholt 3.4.0-10 - Fix building of fragments for non-upstream arches Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.565 retrieving revision 1.566 diff -u -r1.565 -r1.566 --- eclipse.spec 29 Jul 2008 13:40:46 -0000 1.565 +++ eclipse.spec 29 Jul 2008 21:05:08 -0000 1.566 @@ -447,17 +447,27 @@ %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 IFS=' ' - # Copy over the fragments for these arches - cp -pr plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}} + # Fragments for these arches + rm -rf plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch} + mv plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}} pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch} for f in $(find -type f); do sed -i -e "s/ppc/%{_arch}/g" $f + tofile=$(echo $f | sed "s/ppc/%{_arch}/") + if [ $tofile != $f ]; then + cp -rp $f $tofile + fi done popd - cp -pr plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}} + rm -rf plugins/org.eclipse.core.filesystem.linux.%{_arch} + mv plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}} pushd plugins/org.eclipse.core.filesystem.linux.%{_arch} for f in $(find -type f); do sed -i -e "s/ppc/%{_arch}/g" $f + tofile=$(echo $f | sed "s/ppc/%{_arch}/") + if [ $tofile != $f ]; then + cp -rp $f $tofile + fi done popd IFS=$OLDIFS @@ -1231,9 +1241,7 @@ #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html -%ifarch %{ix86} x86_64 %{_libdir}/%{name}/about.html -%endif %ifarch x86_64 %{_libdir}/%{name}/about_files %endif @@ -1438,6 +1446,7 @@ - Make SWT JAR symlinks relative - Fold pde-runtime into pde - Add patch to add root files for non-upstream arches +- Fix building of fragments for non-upstream arches * Fri Jul 25 2008 Andrew Overholt 3.4.0-10 - Add ability for pdebuild (-o) to work with Orbit-style dependencies From fedora-extras-commits at redhat.com Tue Jul 29 21:07:34 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Tue, 29 Jul 2008 21:07:34 GMT Subject: rpms/newsx/devel newsx-quotes.patch,NONE,1.1 newsx.spec,1.10,1.11 Message-ID: <200807292107.m6TL7Ya0002264@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/newsx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2242 Modified Files: newsx.spec Added Files: newsx-quotes.patch Log Message: * Tue Jul 29 2008 Dominik Mierzejewski 1.6-10 - recognize single quotes (fixes bug #455806, patch by Enrico Scholz) newsx-quotes.patch: --- NEW FILE newsx-quotes.patch --- diff -up newsx-1.6/src/config.c.~1~ newsx-1.6/src/config.c --- newsx-1.6/src/config.c.~1~ 2003-05-18 12:57:24.000000000 +0200 +++ newsx-1.6/src/config.c 2008-07-14 09:19:11.000000000 +0200 @@ -402,6 +402,9 @@ config_line(char *buf) if (*q == '"') { is_quote = 1; ++q; + } else if (*q == '\'') { + is_quote = 2; + ++q; } /* BUG: what about ';'? */ @@ -428,7 +431,9 @@ config_line(char *buf) is_more = 1; buf = q; break; - } else if (is_quote && c=='"') { + } else if (is_quote==1 && c=='"') { + break; + } else if (is_quote==2 && c=='\'') { break; } else { *p++ = c; Index: newsx.spec =================================================================== RCS file: /cvs/pkgs/rpms/newsx/devel/newsx.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- newsx.spec 12 Jul 2008 22:11:53 -0000 1.10 +++ newsx.spec 29 Jul 2008 21:07:03 -0000 1.11 @@ -1,6 +1,6 @@ Name: newsx Version: 1.6 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Summary: NNTP news exchange utility Summary(pl): Narz??dzie do wymiany news??w po NNTP @@ -9,6 +9,7 @@ # Source0-md5: ad9c76c53d5c7d21d86bec805fe8cd34 Patch0: %{name}-make.patch Patch1: %{name}-stack.patch +Patch2: %{name}-quotes.patch BuildRequires: inn-devel BuildRequires: automake BuildRequires: autoconf @@ -29,6 +30,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -b .stack +%patch2 -p1 -b .quotes %build autoreconf -f -i @@ -62,6 +64,9 @@ %{_mandir}/man[158]/* %changelog +* Tue Jul 29 2008 Dominik Mierzejewski 1.6-10 +- recognize single quotes (fixes bug #455806, patch by Enrico Scholz) + * Sat Jul 12 2008 Dominik Mierzejewski 1.6-9 - fixed stack buffer overflow in getarticle.c (#454483) - rebuilt against INN shared libraries (#454897) From fedora-extras-commits at redhat.com Tue Jul 29 21:08:37 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 21:08:37 GMT Subject: rpms/libpri/devel libpri-1.4.6-optimization.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 libpri.spec, 1.13, 1.14 sources, 1.6, 1.7 libpri-1.4.2-optimization.patch, 1.1, NONE Message-ID: <200807292108.m6TL8bQd002358@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libpri/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2322 Modified Files: .cvsignore libpri.spec sources Added Files: libpri-1.4.6-optimization.patch Removed Files: libpri-1.4.2-optimization.patch Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 libpri-1.4.6-optimization.patch: --- NEW FILE libpri-1.4.6-optimization.patch --- >From 99e3128bba32ea9597c394722f8019a91019531f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Fri, 11 Jul 2008 14:38:28 -0500 Subject: [PATCH] Set optimization flags for Fedora. Remove -g and add $(RPM_OPT_FLAGS). --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index cfe775e..3eb4137 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ STATIC_LIBRARY=libpri.a DYNAMIC_LIBRARY:=libpri.so.$(SONAME) STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) +CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(RPM_OPT_FLAGS) INSTALL_PREFIX=$(DESTDIR) INSTALL_BASE=/usr SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY) -- 1.5.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpri/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Dec 2007 14:56:24 -0000 1.6 +++ .cvsignore 29 Jul 2008 21:08:06 -0000 1.7 @@ -1 +1 @@ -libpri-1.4.3.tar.gz +libpri-1.4.6.tar.gz Index: libpri.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpri/devel/libpri.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libpri.spec 11 Feb 2008 17:07:49 -0000 1.13 +++ libpri.spec 29 Jul 2008 21:08:06 -0000 1.14 @@ -1,12 +1,12 @@ Summary: An implementation of Primary Rate ISDN Name: libpri -Version: 1.4.3 -Release: 2%{?dist} +Version: 1.4.6 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.asterisk.org/ Source0: http://downloads.digium.com/pub/telephony/libpri/releases/libpri-%{version}.tar.gz -Patch0: libpri-1.4.2-optimization.patch +Patch0: libpri-1.4.6-optimization.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -56,6 +56,9 @@ %{_libdir}/libpri.so %changelog +* Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 + * Mon Feb 11 2008 Jeffrey C. Ollie - 1.4.3-2 - Rebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libpri/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Dec 2007 14:56:24 -0000 1.6 +++ sources 29 Jul 2008 21:08:06 -0000 1.7 @@ -1 +1 @@ -c5be91fc98f1638ba0365bf87f696cd1 libpri-1.4.3.tar.gz +654fb9049e290dd56beb99d41cac333b libpri-1.4.6.tar.gz --- libpri-1.4.2-optimization.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 21:14:53 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 21:14:53 GMT Subject: rpms/libpri/F-9 .cvsignore, 1.6, 1.7 libpri.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200807292114.m6TLErOW002569@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libpri/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2532 Modified Files: .cvsignore libpri.spec sources Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpri/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Dec 2007 14:56:24 -0000 1.6 +++ .cvsignore 29 Jul 2008 21:14:23 -0000 1.7 @@ -1 +1 @@ -libpri-1.4.3.tar.gz +libpri-1.4.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 21:15:09 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 21:15:09 GMT Subject: rpms/libpri/F-9 libpri-1.4.6-optimization.patch, NONE, 1.1 libpri-1.4.2-optimization.patch, 1.1, NONE Message-ID: <200807292115.m6TLF9dL002588@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libpri/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2580 Added Files: libpri-1.4.6-optimization.patch Removed Files: libpri-1.4.2-optimization.patch Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 libpri-1.4.6-optimization.patch: --- NEW FILE libpri-1.4.6-optimization.patch --- >From 99e3128bba32ea9597c394722f8019a91019531f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Fri, 11 Jul 2008 14:38:28 -0500 Subject: [PATCH] Set optimization flags for Fedora. Remove -g and add $(RPM_OPT_FLAGS). --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index cfe775e..3eb4137 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ STATIC_LIBRARY=libpri.a DYNAMIC_LIBRARY:=libpri.so.$(SONAME) STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) +CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(RPM_OPT_FLAGS) INSTALL_PREFIX=$(DESTDIR) INSTALL_BASE=/usr SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY) -- 1.5.5.2 --- libpri-1.4.2-optimization.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 21:24:39 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 21:24:39 GMT Subject: rpms/libpri/F-8 .cvsignore, 1.6, 1.7 libpri.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200807292124.m6TLOdbA002775@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libpri/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754 Modified Files: .cvsignore libpri.spec sources Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpri/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Dec 2007 15:18:10 -0000 1.6 +++ .cvsignore 29 Jul 2008 21:24:09 -0000 1.7 @@ -1 +1 @@ -libpri-1.4.3.tar.gz +libpri-1.4.6.tar.gz Index: libpri.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpri/F-8/libpri.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libpri.spec 20 Dec 2007 15:18:11 -0000 1.12 +++ libpri.spec 29 Jul 2008 21:24:09 -0000 1.13 @@ -1,12 +1,12 @@ Summary: An implementation of Primary Rate ISDN Name: libpri -Version: 1.4.3 +Version: 1.4.6 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.asterisk.org/ Source0: http://downloads.digium.com/pub/telephony/libpri/releases/libpri-%{version}.tar.gz -Patch0: libpri-1.4.2-optimization.patch +Patch0: libpri-1.4.6-optimization.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -56,6 +56,12 @@ %{_libdir}/libpri.so %changelog +* Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 + +* Mon Feb 11 2008 Jeffrey C. Ollie - 1.4.3-2 +- Rebuild for GCC 4.3 + * Thu Dec 20 2007 Jeffrey C. Ollie - 1.4.3-1 - Update to 1.4.3. - Drop upstreamed patch. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libpri/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Dec 2007 15:18:11 -0000 1.6 +++ sources 29 Jul 2008 21:24:09 -0000 1.7 @@ -1 +1 @@ -c5be91fc98f1638ba0365bf87f696cd1 libpri-1.4.3.tar.gz +654fb9049e290dd56beb99d41cac333b libpri-1.4.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 21:26:15 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 21:26:15 GMT Subject: rpms/libpri/F-8 libpri-1.4.6-optimization.patch, NONE, 1.1 libpri-1.4.2-optimization.patch, 1.1, NONE Message-ID: <200807292126.m6TLQFc7002870@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libpri/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2862 Added Files: libpri-1.4.6-optimization.patch Removed Files: libpri-1.4.2-optimization.patch Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 libpri-1.4.6-optimization.patch: --- NEW FILE libpri-1.4.6-optimization.patch --- >From 99e3128bba32ea9597c394722f8019a91019531f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Fri, 11 Jul 2008 14:38:28 -0500 Subject: [PATCH] Set optimization flags for Fedora. Remove -g and add $(RPM_OPT_FLAGS). --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index cfe775e..3eb4137 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ STATIC_LIBRARY=libpri.a DYNAMIC_LIBRARY:=libpri.so.$(SONAME) STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) +CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(RPM_OPT_FLAGS) INSTALL_PREFIX=$(DESTDIR) INSTALL_BASE=/usr SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY) -- 1.5.5.2 --- libpri-1.4.2-optimization.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 21:27:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 21:27:24 GMT Subject: rpms/gtkmathview/devel gtkmathview-0.8.0-gcc43.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gtkmathview.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200807292127.m6TLROda002988@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtkmathview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2959 Modified Files: .cvsignore gtkmathview.spec sources Added Files: gtkmathview-0.8.0-gcc43.patch Log Message: update to 0.8.0 gtkmathview-0.8.0-gcc43.patch: --- NEW FILE gtkmathview-0.8.0-gcc43.patch --- diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc43 gtkmathview-0.8.0/mathmlps/main.cc --- gtkmathview-0.8.0/mathmlps/main.cc.gcc43 2008-07-29 16:40:04.000000000 -0400 +++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-29 16:40:14.000000000 -0400 @@ -18,6 +18,7 @@ #include +#include #include #include diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/main.cc --- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 2007-08-17 06:02:46.000000000 -0400 +++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-29 16:33:03.000000000 -0400 @@ -18,6 +18,7 @@ #include +#include #include #include diff -up gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/SMS.cc --- gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 2008-07-29 16:39:01.000000000 -0400 +++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-29 16:39:07.000000000 -0400 @@ -18,6 +18,7 @@ #include +#include #include #include "defs.h" #include "AbstractLogger.hh" diff -up gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc --- gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 2008-07-29 16:35:24.000000000 -0400 +++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-29 16:35:28.000000000 -0400 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff -up gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43 gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc --- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43 2007-08-17 06:02:38.000000000 -0400 +++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-29 16:33:03.000000000 -0400 @@ -18,6 +18,7 @@ #include +#include #include #include "mathVariantAux.hh" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkmathview/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Dec 2005 18:33:20 -0000 1.5 +++ .cvsignore 29 Jul 2008 21:26:53 -0000 1.6 @@ -1 +1 @@ -gtkmathview-0.7.6.tar.gz +gtkmathview-0.8.0.tar.gz Index: gtkmathview.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkmathview/devel/gtkmathview.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkmathview.spec 14 Mar 2008 20:15:08 -0000 1.10 +++ gtkmathview.spec 29 Jul 2008 21:26:53 -0000 1.11 @@ -1,9 +1,9 @@ Summary: A MathML rendering library Name: gtkmathview -Version: 0.7.6 -Release: 7%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Group: System Environment/Libraries -License: GPL +License: LGPLv3+ Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz URL: http://helm.cs.unibo.it/mml-widget/ BuildRequires: glib2-devel >= 2.2 @@ -12,9 +12,11 @@ BuildRequires: libxslt >= 1.0.32 BuildRequires: popt >= 1.7 BuildRequires: popt-devel >= 1.7 +BuildRequires: t1lib-devel +BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gtkmathview-0.7.6-gcc43.patch +Patch0: gtkmathview-0.8.0-gcc43.patch %description GtkMathView is a C++ rendering engine for MathML documents. @@ -40,12 +42,14 @@ %build %configure --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a + rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathml2ps.1 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathmlviewer.1 @@ -69,6 +73,7 @@ %{_libdir}/pkgconfig/mathview-frontend-custom-reader.pc %{_libdir}/pkgconfig/mathview-backend-svg.pc %{_libdir}/pkgconfig/mathview-backend-gtk.pc +%{_libdir}/pkgconfig/mathview-backend-ps.pc %{_includedir}/gtkmathview %post -p /sbin/ldconfig @@ -79,6 +84,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 0.8.0-1 +- update to 0.8.0 +- fix rpath +- fix gcc43 patch for 0.8.0 + * Fri Mar 14 2008 Doug chapman - 0.7.6-7 - fix GCC 4.3 build errors (BZ 434485) - require popt-devel for build (BZ 426136) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkmathview/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Dec 2005 18:33:20 -0000 1.5 +++ sources 29 Jul 2008 21:26:53 -0000 1.6 @@ -1 +1 @@ -4bb348c98367228f0de0a2216a13d48f gtkmathview-0.7.6.tar.gz +b53564e553728d4b69f7d366dfeb5299 gtkmathview-0.8.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 21:38:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 21:38:29 GMT Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.25,1.26 Message-ID: <200807292138.m6TLcT6N003220@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtkmozembedmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3194 Modified Files: gtkmozembedmm.spec Log Message: fix license tag Index: gtkmozembedmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gtkmozembedmm.spec 13 Apr 2008 08:40:35 -0000 1.25 +++ gtkmozembedmm.spec 29 Jul 2008 21:37:59 -0000 1.26 @@ -1,12 +1,12 @@ %define gecko_ver 1.9 Name: gtkmozembedmm Version: 1.4.2.cvs20060817 -Release: 19%{?dist} +Release: 20%{?dist} Summary: C++ wrapper for GtkMozembed Group: System Environment/Libraries -License: LGPL +License: LGPLv2+ URL: http://gtkmm.sourceforge.net/ Source0: gtkmozembedmm-%{version}.tar.bz2 # script to generate tarball from cvs @@ -107,6 +107,9 @@ %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 1.4.2.cvs20060817-20 +- fix license tag + * Sat Apr 12 2008 Ha??kel Gu??mar - 1.4.2.cvs20060817-19 - remove now useless sed one-liner. - fixed gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch From fedora-extras-commits at redhat.com Tue Jul 29 21:40:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 21:40:15 GMT Subject: rpms/gtksourceview/devel gtksourceview.spec,1.49,1.50 Message-ID: <200807292140.m6TLeFbs003323@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtksourceview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3296 Modified Files: gtksourceview.spec Log Message: fix license tag Index: gtksourceview.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview/devel/gtksourceview.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gtksourceview.spec 15 Feb 2008 04:28:30 -0000 1.49 +++ gtksourceview.spec 29 Jul 2008 21:39:45 -0000 1.50 @@ -6,9 +6,9 @@ Summary: A library for viewing source files Name: gtksourceview Version: 1.8.5 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 -License: GPL +License: GPLv2+ Group: System Environment/Libraries URL: http://gtksourceview.sourceforge.net/ Source0: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/1.8/%{name}-%{version}.tar.bz2 @@ -80,6 +80,9 @@ %{_libdir}/*.so %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 1:1.8.5-5 +- fix license tag + * Thu Feb 14 2008 Matthias Clasen - 1:1.8.5-4 - Rebuild From fedora-extras-commits at redhat.com Tue Jul 29 21:42:45 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 21:42:45 GMT Subject: rpms/libpri/EL-5 .cvsignore, 1.6, 1.7 libpri.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200807292142.m6TLgjWQ003453@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libpri/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3412 Modified Files: .cvsignore libpri.spec sources Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpri/EL-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Dec 2007 16:10:35 -0000 1.6 +++ .cvsignore 29 Jul 2008 21:42:15 -0000 1.7 @@ -1 +1 @@ -libpri-1.4.3.tar.gz +libpri-1.4.6.tar.gz Index: libpri.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpri/EL-5/libpri.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libpri.spec 20 Dec 2007 16:10:35 -0000 1.8 +++ libpri.spec 29 Jul 2008 21:42:15 -0000 1.9 @@ -1,12 +1,12 @@ Summary: An implementation of Primary Rate ISDN Name: libpri -Version: 1.4.3 +Version: 1.4.6 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.asterisk.org/ Source0: http://downloads.digium.com/pub/telephony/libpri/releases/libpri-%{version}.tar.gz -Patch0: libpri-1.4.2-optimization.patch +Patch0: libpri-1.4.6-optimization.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -56,13 +56,16 @@ %{_libdir}/libpri.so %changelog +* Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 + +* Mon Feb 11 2008 Jeffrey C. Ollie - 1.4.3-2 +- Rebuild for GCC 4.3 + * Thu Dec 20 2007 Jeffrey C. Ollie - 1.4.3-1 - Update to 1.4.3. - Drop upstreamed patch. -* Sat Nov 3 2007 Jeffrey C. Ollie - 1.4.2-1.1 -- Don't forget to cvs add new patches. - * Thu Nov 1 2007 Jeffrey C. Ollie - 1.4.2-1 - Update to 1.4.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libpri/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Dec 2007 16:10:35 -0000 1.6 +++ sources 29 Jul 2008 21:42:15 -0000 1.7 @@ -1 +1 @@ -c5be91fc98f1638ba0365bf87f696cd1 libpri-1.4.3.tar.gz +654fb9049e290dd56beb99d41cac333b libpri-1.4.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 21:42:58 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 21:42:58 GMT Subject: rpms/gtksourceview-sharp/devel gtksourceview-sharp.spec,1.22,1.23 Message-ID: <200807292142.m6TLgw0o003497@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtksourceview-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3434 Modified Files: gtksourceview-sharp.spec Log Message: fix license tag Index: gtksourceview-sharp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gtksourceview-sharp.spec 14 Jul 2008 10:45:39 -0000 1.22 +++ gtksourceview-sharp.spec 29 Jul 2008 21:42:28 -0000 1.23 @@ -4,8 +4,8 @@ Summary: A C sharp binder for gtksourceview Name: gtksourceview-sharp Version: 2.0.12 -Release: 4.1%{?dist} -License: LGPL +Release: 5%{?dist} +License: LGPLv2+ Group: System Environment/Libraries Source0: http://go-mono.com/sources-latest/%{name}-%{extra}.tar.bz2 Patch0: gtksourceview-sharp-libdir.patch @@ -59,6 +59,9 @@ %{__rm} -rf %{buildroot} %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 2.0-0.12-5 +- fix license tag + * Mon Jul 14 2008 Paul F. Johnson - 2.0-0.12-4.1 - rebuild for new gtk-sharp2 From fedora-extras-commits at redhat.com Tue Jul 29 21:43:58 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 29 Jul 2008 21:43:58 GMT Subject: rpms/libpri/EL-5 libpri-1.4.6-optimization.patch, NONE, 1.1 libpri-1.4.2-optimization.patch, 1.1, NONE Message-ID: <200807292143.m6TLhwCE003598@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/libpri/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3590 Added Files: libpri-1.4.6-optimization.patch Removed Files: libpri-1.4.2-optimization.patch Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 libpri-1.4.6-optimization.patch: --- NEW FILE libpri-1.4.6-optimization.patch --- >From 99e3128bba32ea9597c394722f8019a91019531f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Fri, 11 Jul 2008 14:38:28 -0500 Subject: [PATCH] Set optimization flags for Fedora. Remove -g and add $(RPM_OPT_FLAGS). --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index cfe775e..3eb4137 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ STATIC_LIBRARY=libpri.a DYNAMIC_LIBRARY:=libpri.so.$(SONAME) STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) +CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(RPM_OPT_FLAGS) INSTALL_PREFIX=$(DESTDIR) INSTALL_BASE=/usr SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY) -- 1.5.5.2 --- libpri-1.4.2-optimization.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 29 21:50:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 21:50:37 GMT Subject: rpms/gtranslator/devel gtranslator.spec,1.21,1.22 Message-ID: <200807292150.m6TLobXO003728@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gtranslator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3711 Modified Files: gtranslator.spec Log Message: fix license tag Index: gtranslator.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtranslator/devel/gtranslator.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gtranslator.spec 20 Feb 2008 00:13:33 -0000 1.21 +++ gtranslator.spec 29 Jul 2008 21:50:07 -0000 1.22 @@ -1,11 +1,11 @@ Name: gtranslator Version: 1.1.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Gettext po file editor for GNOME Group: Development/Tools -License: GPL +License: GPLv2+ URL: http://gtranslator.sourceforge.net Source0: http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.1/%{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-scrollkeeper-rarian.patch @@ -87,6 +87,9 @@ %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 1.1.7-9 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.7-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Jul 29 21:51:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 29 Jul 2008 21:51:17 GMT Subject: rpms/gucharmap/devel gucharmap.spec,1.24,1.25 Message-ID: <200807292151.m6TLpH2C003810@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gucharmap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3743 Modified Files: gucharmap.spec Log Message: fix license tag Index: gucharmap.spec =================================================================== RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gucharmap.spec 18 Jun 2008 01:27:43 -0000 1.24 +++ gucharmap.spec 29 Jul 2008 21:50:46 -0000 1.25 @@ -4,11 +4,11 @@ Name: gucharmap Version: 2.23.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Unicode character picker and font browser Group: Applications/System -License: GPLv2+ and GFDL+ and MIT +License: GPLv2+ and GFDL and MIT # GPL for the source code, GFDL for the docs, MIT for Unicode data URL: http://live.gnome.org/Gucharmap Source: http://download.gnome.org/sources/gucharmap/2.23/gucharmap-%{version}.tar.bz2 @@ -128,6 +128,9 @@ %changelog +* Tue Jul 29 2008 Tom "spot" Callaway - 2.23.4-2 +- fix license tag + * Tue Jun 17 2008 Matthias Clasen - 2.23.4-1 - Update to 2.23.4 From fedora-extras-commits at redhat.com Tue Jul 29 22:10:34 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 29 Jul 2008 22:10:34 GMT Subject: rpms/libv4l/devel .cvsignore, 1.2, 1.3 libv4l.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807292210.m6TMAY2d010755@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libv4l/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730 Modified Files: .cvsignore libv4l.spec sources Log Message: * Tue Jul 30 2008 Hans de Goede 0.3.8-1 - New upstream release 0.3.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libv4l/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jul 2008 09:03:09 -0000 1.2 +++ .cvsignore 29 Jul 2008 22:10:04 -0000 1.3 @@ -1 +1 @@ -libv4l-0.3.7.tar.gz +libv4l-0.3.8.tar.gz Index: libv4l.spec =================================================================== RCS file: /cvs/extras/rpms/libv4l/devel/libv4l.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libv4l.spec 28 Jul 2008 09:03:09 -0000 1.1 +++ libv4l.spec 29 Jul 2008 22:10:04 -0000 1.2 @@ -1,5 +1,5 @@ Name: libv4l -Version: 0.3.7 +Version: 0.3.8 Release: 1%{?dist} Summary: Collection of video4linux support libraries Group: System Environment/Libraries @@ -30,7 +30,7 @@ %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release}, pkgconfig %description devel The %{name}-devel package contains libraries and header files for @@ -42,7 +42,8 @@ %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ + PREFIX=%{_prefix} LIBDIR=%{_libdir} %install @@ -70,8 +71,12 @@ %doc README.multi-threading %{_includedir}/libv4l*.h %{_libdir}/libv4l*.so +%{_libdir}/pkgconfig/libv4l*.pc %changelog +* Tue Jul 30 2008 Hans de Goede 0.3.8-1 +- New upstream release 0.3.8 + * Sat Jul 26 2008 Hans de Goede 0.3.7-1 - Initial Fedora package Index: sources =================================================================== RCS file: /cvs/extras/rpms/libv4l/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jul 2008 09:03:09 -0000 1.2 +++ sources 29 Jul 2008 22:10:04 -0000 1.3 @@ -1 +1 @@ -c1f955802735366ed01e15ff8b6116ae libv4l-0.3.7.tar.gz +d5d6be4674db7f70bebd9ddf352e9f55 libv4l-0.3.8.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 22:12:46 2008 From: fedora-extras-commits at redhat.com (Kostas Georgiou (georgiou)) Date: Tue, 29 Jul 2008 22:12:46 GMT Subject: rpms/ganglia/devel ganglia.spec,1.17,1.18 Message-ID: <200807292212.m6TMCkdH010826@cvs-int.fedora.redhat.com> Author: georgiou Update of /cvs/extras/rpms/ganglia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10809 Modified Files: ganglia.spec Log Message: Added missing config file for ganglia-gmond-python Index: ganglia.spec =================================================================== RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ganglia.spec 17 Jul 2008 01:04:29 -0000 1.17 +++ ganglia.spec 29 Jul 2008 22:12:16 -0000 1.18 @@ -1,6 +1,6 @@ Name: ganglia Version: 3.1.0 -Release: 0.4%{?svnrev:.r%{svnrev}}%{?dist} +Release: 0.5%{?svnrev:.r%{svnrev}}%{?dist} Summary: Ganglia Distributed Monitoring System Group: Applications/Internet @@ -147,6 +147,7 @@ ## Python bits # Copy the python metric modules and .conf files cp -p gmond/python_modules/conf.d/*.pyconf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/ +cp -p gmond/modules/conf.d/modpython.conf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/ cp -p gmond/python_modules/*/*.{py,pyc} $RPM_BUILD_ROOT%{_libdir}/ganglia/python_modules/ # Don't install the example modules rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/example.conf @@ -234,6 +235,7 @@ %{_libdir}/ganglia/python_modules/*.py* %{_libdir}/ganglia/modpython.so* %config(noreplace) %{_sysconfdir}/ganglia/conf.d/*.pyconf* +%config(noreplace) %{_sysconfdir}/ganglia/conf.d/modpython.conf %files devel %defattr(-,root,root,-) @@ -249,6 +251,9 @@ %{_datadir}/%{name} %changelog +* Tue Jul 29 2008 Kostas Georgiou 3.1.0-0.5 +- Add the config files for the python module + * Thu Jul 17 2008 Kostas Georgiou 3.1.0-0.4 - Update to the 3.1.0 pre-release - Fixes gmond.conf to use the ganglia user and not nobody From fedora-extras-commits at redhat.com Tue Jul 29 23:01:20 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Tue, 29 Jul 2008 23:01:20 GMT Subject: rpms/libcanberra/devel libcanberra.spec,1.5,1.6 Message-ID: <200807292301.m6TN1KPp018776@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libcanberra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12134 Modified Files: libcanberra.spec Log Message: New version Index: libcanberra.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libcanberra.spec 28 Jul 2008 18:10:50 -0000 1.5 +++ libcanberra.spec 29 Jul 2008 23:00:50 -0000 1.6 @@ -1,6 +1,6 @@ Name: libcanberra -Version: 0.4 -Release: 3%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz @@ -77,6 +77,8 @@ %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so %{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh %{_bindir}/canberra-gtk-play +%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop +%{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh %files devel %defattr(-,root,root) @@ -89,6 +91,9 @@ %{_libdir}/pkgconfig/libcanberra.pc %changelog +* Wed Jul 30 2008 Lennart Poettering 0.5-1 +- New version + * Mon Jul 28 2008 Lennart Poettering 0.4-3 - Add versioned dependency on libpulse From fedora-extras-commits at redhat.com Tue Jul 29 23:06:17 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Tue, 29 Jul 2008 23:06:17 GMT Subject: rpms/libcanberra/devel .cvsignore, 1.3, 1.4 libcanberra.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200807292306.m6TN6Hko019002@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libcanberra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18976 Modified Files: .cvsignore libcanberra.spec sources Log Message: fix build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Jul 2008 16:48:15 -0000 1.3 +++ .cvsignore 29 Jul 2008 23:05:47 -0000 1.4 @@ -1,2 +1 @@ -libcanberra-0.4.tar.gz -libcanberra-gtk-module.sh +libcanberra-0.5.tar.gz Index: libcanberra.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libcanberra.spec 29 Jul 2008 23:00:50 -0000 1.6 +++ libcanberra.spec 29 Jul 2008 23:05:47 -0000 1.7 @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz @@ -91,6 +91,9 @@ %{_libdir}/pkgconfig/libcanberra.pc %changelog +* Wed Jul 30 2008 Lennart Poettering 0.5-2 +- Fix build + * Wed Jul 30 2008 Lennart Poettering 0.5-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Jul 2008 16:33:25 -0000 1.4 +++ sources 29 Jul 2008 23:05:47 -0000 1.5 @@ -1,2 +1 @@ -29b45a649cc6e84698eeabb7488b8b10 libcanberra-0.4.tar.gz -a54799e624aac814b9343ab05f25c38b libcanberra-gtk-module.sh +1d8abd71613764650a0e2359584d7cdb libcanberra-0.5.tar.gz From fedora-extras-commits at redhat.com Tue Jul 29 23:09:14 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 29 Jul 2008 23:09:14 GMT Subject: rpms/telepathy-glib/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 telepathy-glib.spec, 1.20, 1.21 Message-ID: <200807292309.m6TN9E4h019227@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19190 Modified Files: .cvsignore sources telepathy-glib.spec Log Message: * Tue Jul 29 2008 Brian Pepple - 0.7.13-1 - Update to 0.7.13. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 22 Jul 2008 00:02:16 -0000 1.13 +++ .cvsignore 29 Jul 2008 23:08:44 -0000 1.14 @@ -1 +1 @@ -telepathy-glib-0.7.12.tar.gz +telepathy-glib-0.7.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Jul 2008 00:02:16 -0000 1.13 +++ sources 29 Jul 2008 23:08:44 -0000 1.14 @@ -1 +1 @@ -181736d695907b1ef8bb936f960ef4af telepathy-glib-0.7.12.tar.gz +e3afae16ea6b049872a0508e51b3b1e7 telepathy-glib-0.7.13.tar.gz Index: telepathy-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- telepathy-glib.spec 28 Jul 2008 23:33:41 -0000 1.20 +++ telepathy-glib.spec 29 Jul 2008 23:08:44 -0000 1.21 @@ -3,8 +3,8 @@ %define glib_ver 2.10 Name: telepathy-glib -Version: 0.7.12 -Release: 2%{?dist} +Version: 0.7.13 +Release: 1%{?dist} Summary: GLib bindings for Telepathy Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Tue Jul 29 2008 Brian Pepple - 0.7.13-1 +- Update to 0.7.13. + * Mon Jul 28 2008 Brian Pepple - 0.7.12-2 - Update broken-pkgconfig patch. (#456621) From fedora-extras-commits at redhat.com Tue Jul 29 23:10:03 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Tue, 29 Jul 2008 23:10:03 GMT Subject: rpms/libcanberra/devel libcanberra-gtk-module.sh, NONE, 1.1 libcanberra.spec, 1.7, 1.8 Message-ID: <200807292310.m6TNA3Rh019344@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libcanberra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19239 Modified Files: libcanberra.spec Added Files: libcanberra-gtk-module.sh Log Message: Ship libcanberra-gtk-module.sh directly in CVS --- NEW FILE libcanberra-gtk-module.sh --- #!/bin/sh if [ -z "$GTK_MODULES" ] ; then GTK_MODULES="canberra-gtk-module" else GTK_MODULES="$GTK_MODULES:canberra-gtk-module" fi export GTK_MODULES Index: libcanberra.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libcanberra.spec 29 Jul 2008 23:05:47 -0000 1.7 +++ libcanberra.spec 29 Jul 2008 23:09:33 -0000 1.8 @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz @@ -91,6 +91,9 @@ %{_libdir}/pkgconfig/libcanberra.pc %changelog +* Wed Jul 30 2008 Lennart Poettering 0.5-3 +- Ship libcanberra-gtk-module.sh directly in CVS + * Wed Jul 30 2008 Lennart Poettering 0.5-2 - Fix build From fedora-extras-commits at redhat.com Wed Jul 30 00:07:15 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 00:07:15 GMT Subject: rpms/shorewall/devel .cvsignore, 1.38, 1.39 shorewall.spec, 1.56, 1.57 sources, 1.38, 1.39 patch-perl-4.0.12.1, 1.1, NONE Message-ID: <200807300007.m6U07Fk1027828@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27779 Modified Files: .cvsignore shorewall.spec sources Removed Files: patch-perl-4.0.12.1 Log Message: * Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 - Update to version 4.0.13 - Remove patch-perl-4.0.12.1 - Update BuildRoot to mktemp variant Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 26 Jun 2008 23:46:05 -0000 1.38 +++ .cvsignore 30 Jul 2008 00:06:45 -0000 1.39 @@ -1,4 +1,4 @@ -shorewall-common-4.0.12.tar.bz2 -shorewall-shell-4.0.12.tar.bz2 -shorewall-perl-4.0.12.tar.bz2 -shorewall-lite-4.0.12.tar.bz2 +shorewall-common-4.0.13.tar.bz2 +shorewall-shell-4.0.13.tar.bz2 +shorewall-perl-4.0.13.tar.bz2 +shorewall-lite-4.0.13.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- shorewall.spec 5 Jul 2008 14:11:34 -0000 1.56 +++ shorewall.spec 30 Jul 2008 00:06:45 -0000 1.57 @@ -10,8 +10,8 @@ # patchlevel. However, these should not be used for distro packaging. Name: shorewall -Version: 4.0.12 -Release: 2%{?dist} +Version: 4.0.13 +Release: 1%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,9 +24,8 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch -Patch2: patch-perl-4.0.12.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: perl BuildArch: noarch @@ -101,10 +100,6 @@ %patch1 -p1 popd -pushd shorewall-perl-%{version} -%patch2 -p1 -popd - # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -268,6 +263,11 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 +- Update to version 4.0.13 +- Remove patch-perl-4.0.12.1 +- Update BuildRoot to mktemp variant + * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 26 Jun 2008 23:46:05 -0000 1.38 +++ sources 30 Jul 2008 00:06:45 -0000 1.39 @@ -1,4 +1,4 @@ -556016e223fdd804e6c76218380165f9 shorewall-common-4.0.12.tar.bz2 -8d804a29761636a9a17216ae2cd62fe6 shorewall-shell-4.0.12.tar.bz2 -285f9a387022c5c8826d8d62c6d943c5 shorewall-perl-4.0.12.tar.bz2 -ab82b03f987f69536d305db40dc7692c shorewall-lite-4.0.12.tar.bz2 +b14dcfcfd9fab234f401e32ecdb2b368 shorewall-common-4.0.13.tar.bz2 +938f12b6f9345bd1ff820185548a86c3 shorewall-shell-4.0.13.tar.bz2 +bc07ecbf2b4b37d4f6b831058e8085df shorewall-perl-4.0.13.tar.bz2 +83797718ddcb14e7171a4a9a05a5477c shorewall-lite-4.0.13.tar.bz2 --- patch-perl-4.0.12.1 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 00:08:16 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 00:08:16 GMT Subject: rpms/shorewall/F-9 shorewall.spec, 1.56, 1.57 sources, 1.38, 1.39 patch-perl-4.0.12.1, 1.1, NONE Message-ID: <200807300008.m6U08GiZ027958@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27904 Modified Files: shorewall.spec sources Removed Files: patch-perl-4.0.12.1 Log Message: * Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 - Update to version 4.0.13 - Remove patch-perl-4.0.12.1 - Update BuildRoot to mktemp variant Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-9/shorewall.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- shorewall.spec 5 Jul 2008 14:13:10 -0000 1.56 +++ shorewall.spec 30 Jul 2008 00:07:46 -0000 1.57 @@ -10,8 +10,8 @@ # patchlevel. However, these should not be used for distro packaging. Name: shorewall -Version: 4.0.12 -Release: 2%{?dist} +Version: 4.0.13 +Release: 1%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,9 +24,8 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch -Patch2: patch-perl-4.0.12.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: perl BuildArch: noarch @@ -101,10 +100,6 @@ %patch1 -p1 popd -pushd shorewall-perl-%{version} -%patch2 -p1 -popd - # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -268,6 +263,11 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 +- Update to version 4.0.13 +- Remove patch-perl-4.0.12.1 +- Update BuildRoot to mktemp variant + * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-9/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 27 Jun 2008 00:02:25 -0000 1.38 +++ sources 30 Jul 2008 00:07:46 -0000 1.39 @@ -1,4 +1,4 @@ -556016e223fdd804e6c76218380165f9 shorewall-common-4.0.12.tar.bz2 -8d804a29761636a9a17216ae2cd62fe6 shorewall-shell-4.0.12.tar.bz2 -285f9a387022c5c8826d8d62c6d943c5 shorewall-perl-4.0.12.tar.bz2 -ab82b03f987f69536d305db40dc7692c shorewall-lite-4.0.12.tar.bz2 +b14dcfcfd9fab234f401e32ecdb2b368 shorewall-common-4.0.13.tar.bz2 +938f12b6f9345bd1ff820185548a86c3 shorewall-shell-4.0.13.tar.bz2 +bc07ecbf2b4b37d4f6b831058e8085df shorewall-perl-4.0.13.tar.bz2 +83797718ddcb14e7171a4a9a05a5477c shorewall-lite-4.0.13.tar.bz2 --- patch-perl-4.0.12.1 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 00:09:08 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 00:09:08 GMT Subject: rpms/shorewall/F-8 shorewall.spec, 1.52, 1.53 sources, 1.38, 1.39 patch-perl-4.0.12.1, 1.1, NONE Message-ID: <200807300009.m6U098uf028081@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28036 Modified Files: shorewall.spec sources Removed Files: patch-perl-4.0.12.1 Log Message: * Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 - Update to version 4.0.13 - Remove patch-perl-4.0.12.1 - Update BuildRoot to mktemp variant Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-8/shorewall.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- shorewall.spec 5 Jul 2008 14:14:56 -0000 1.52 +++ shorewall.spec 30 Jul 2008 00:08:38 -0000 1.53 @@ -10,8 +10,8 @@ # patchlevel. However, these should not be used for distro packaging. Name: shorewall -Version: 4.0.12 -Release: 2%{?dist} +Version: 4.0.13 +Release: 1%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,9 +24,8 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch -Patch2: patch-perl-4.0.12.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: perl BuildArch: noarch @@ -101,10 +100,6 @@ %patch1 -p1 popd -pushd shorewall-perl-%{version} -%patch2 -p1 -popd - # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -268,6 +263,11 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 +- Update to version 4.0.13 +- Remove patch-perl-4.0.12.1 +- Update BuildRoot to mktemp variant + * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-8/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 26 Jun 2008 23:49:42 -0000 1.38 +++ sources 30 Jul 2008 00:08:38 -0000 1.39 @@ -1,4 +1,4 @@ -556016e223fdd804e6c76218380165f9 shorewall-common-4.0.12.tar.bz2 -8d804a29761636a9a17216ae2cd62fe6 shorewall-shell-4.0.12.tar.bz2 -285f9a387022c5c8826d8d62c6d943c5 shorewall-perl-4.0.12.tar.bz2 -ab82b03f987f69536d305db40dc7692c shorewall-lite-4.0.12.tar.bz2 +b14dcfcfd9fab234f401e32ecdb2b368 shorewall-common-4.0.13.tar.bz2 +938f12b6f9345bd1ff820185548a86c3 shorewall-shell-4.0.13.tar.bz2 +bc07ecbf2b4b37d4f6b831058e8085df shorewall-perl-4.0.13.tar.bz2 +83797718ddcb14e7171a4a9a05a5477c shorewall-lite-4.0.13.tar.bz2 --- patch-perl-4.0.12.1 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 00:10:49 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 00:10:49 GMT Subject: rpms/shorewall/EL-4 shorewall.spec, 1.18, 1.19 sources, 1.9, 1.10 patch-perl-4.0.12.1, 1.1, NONE Message-ID: <200807300010.m6U0An2G028296@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28235 Modified Files: shorewall.spec sources Removed Files: patch-perl-4.0.12.1 Log Message: * Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 - Update to version 4.0.13 - Remove patch-perl-4.0.12.1 - Update BuildRoot to mktemp variant Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/EL-4/shorewall.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- shorewall.spec 5 Jul 2008 14:07:21 -0000 1.18 +++ shorewall.spec 30 Jul 2008 00:10:19 -0000 1.19 @@ -10,8 +10,8 @@ # patchlevel. However, these should not be used for distro packaging. Name: shorewall -Version: 4.0.12 -Release: 2%{?dist} +Version: 4.0.13 +Release: 1%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,9 +24,8 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch -Patch2: patch-perl-4.0.12.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: perl BuildArch: noarch @@ -101,10 +100,6 @@ %patch1 -p1 popd -pushd shorewall-perl-%{version} -%patch2 -p1 -popd - # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -268,6 +263,11 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 +- Update to version 4.0.13 +- Remove patch-perl-4.0.12.1 +- Update BuildRoot to mktemp variant + * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/EL-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 26 Jun 2008 23:52:50 -0000 1.9 +++ sources 30 Jul 2008 00:10:19 -0000 1.10 @@ -1,4 +1,4 @@ -556016e223fdd804e6c76218380165f9 shorewall-common-4.0.12.tar.bz2 -8d804a29761636a9a17216ae2cd62fe6 shorewall-shell-4.0.12.tar.bz2 -285f9a387022c5c8826d8d62c6d943c5 shorewall-perl-4.0.12.tar.bz2 -ab82b03f987f69536d305db40dc7692c shorewall-lite-4.0.12.tar.bz2 +b14dcfcfd9fab234f401e32ecdb2b368 shorewall-common-4.0.13.tar.bz2 +938f12b6f9345bd1ff820185548a86c3 shorewall-shell-4.0.13.tar.bz2 +bc07ecbf2b4b37d4f6b831058e8085df shorewall-perl-4.0.13.tar.bz2 +83797718ddcb14e7171a4a9a05a5477c shorewall-lite-4.0.13.tar.bz2 --- patch-perl-4.0.12.1 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 00:11:35 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 00:11:35 GMT Subject: rpms/shorewall/EL-5 shorewall.spec, 1.49, 1.50 sources, 1.37, 1.38 patch-perl-4.0.12.1, 1.1, NONE Message-ID: <200807300011.m6U0BZas028362@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28343 Modified Files: shorewall.spec sources Removed Files: patch-perl-4.0.12.1 Log Message: * Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 - Update to version 4.0.13 - Remove patch-perl-4.0.12.1 - Update BuildRoot to mktemp variant Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/EL-5/shorewall.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- shorewall.spec 5 Jul 2008 14:09:02 -0000 1.49 +++ shorewall.spec 30 Jul 2008 00:11:05 -0000 1.50 @@ -10,8 +10,8 @@ # patchlevel. However, these should not be used for distro packaging. Name: shorewall -Version: 4.0.12 -Release: 2%{?dist} +Version: 4.0.13 +Release: 1%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -24,9 +24,8 @@ Source3: %{_baseurl}%{name}-lite-%{version}.tar.bz2 Patch0: shorewall-4.0.4-init.patch Patch1: shorewall-lite-4.0.4-init.patch -Patch2: patch-perl-4.0.12.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: perl BuildArch: noarch @@ -101,10 +100,6 @@ %patch1 -p1 popd -pushd shorewall-perl-%{version} -%patch2 -p1 -popd - # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \; @@ -268,6 +263,11 @@ %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Tue Jul 29 2008 Jonathan G. Underwood - 4.0.13-1 +- Update to version 4.0.13 +- Remove patch-perl-4.0.12.1 +- Update BuildRoot to mktemp variant + * Sat Jul 5 2008 Jonathan G. Underwood - 4.0.12-2 - Apply patch-perl-4.0.12.1 from upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/EL-5/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 26 Jun 2008 23:54:02 -0000 1.37 +++ sources 30 Jul 2008 00:11:05 -0000 1.38 @@ -1,4 +1,4 @@ -556016e223fdd804e6c76218380165f9 shorewall-common-4.0.12.tar.bz2 -8d804a29761636a9a17216ae2cd62fe6 shorewall-shell-4.0.12.tar.bz2 -285f9a387022c5c8826d8d62c6d943c5 shorewall-perl-4.0.12.tar.bz2 -ab82b03f987f69536d305db40dc7692c shorewall-lite-4.0.12.tar.bz2 +b14dcfcfd9fab234f401e32ecdb2b368 shorewall-common-4.0.13.tar.bz2 +938f12b6f9345bd1ff820185548a86c3 shorewall-shell-4.0.13.tar.bz2 +bc07ecbf2b4b37d4f6b831058e8085df shorewall-perl-4.0.13.tar.bz2 +83797718ddcb14e7171a4a9a05a5477c shorewall-lite-4.0.13.tar.bz2 --- patch-perl-4.0.12.1 DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 00:25:48 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 30 Jul 2008 00:25:48 GMT Subject: rpms/swfdec/F-9 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 swfdec.spec, 1.12, 1.13 Message-ID: <200807300025.m6U0PmZV029211@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/swfdec/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29154 Modified Files: .cvsignore sources swfdec.spec Log Message: * Tue Jul 29 2008 Brian Pepple - 0.6.8-1 - Update to 0.6.8. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/swfdec/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 23 Apr 2008 23:30:00 -0000 1.8 +++ .cvsignore 30 Jul 2008 00:25:18 -0000 1.9 @@ -1 +1 @@ -swfdec-0.6.6.tar.gz +swfdec-0.6.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/swfdec/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Apr 2008 23:30:00 -0000 1.8 +++ sources 30 Jul 2008 00:25:18 -0000 1.9 @@ -1 +1 @@ -3e91d48e0b8b839e12ff8f9ced4b5040 swfdec-0.6.6.tar.gz +740caf52068556ffe151703342fb634b swfdec-0.6.8.tar.gz Index: swfdec.spec =================================================================== RCS file: /cvs/pkgs/rpms/swfdec/F-9/swfdec.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- swfdec.spec 23 Apr 2008 23:30:00 -0000 1.12 +++ swfdec.spec 30 Jul 2008 00:25:18 -0000 1.13 @@ -4,7 +4,7 @@ %define pango_version 1.16 Name: swfdec -Version: %{major_version}.6 +Version: %{major_version}.8 Release: 1%{?dist} Summary: Flash animation rendering library @@ -158,6 +158,9 @@ %changelog +* Tue Jul 29 2008 Brian Pepple - 0.6.8-1 +- Update to 0.6.8. + * Wed Apr 23 2008 Brian Pepple - 0.6.6-1 - Update to 0.6.6. - Drop memory-overwrite patch. Fixed upstream. From fedora-extras-commits at redhat.com Wed Jul 30 00:47:50 2008 From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel)) Date: Wed, 30 Jul 2008 00:47:50 GMT Subject: rpms/dhcpv6/devel .cvsignore, 1.20, 1.21 dhcpv6.spec, 1.91, 1.92 sources, 1.20, 1.21 Message-ID: <200807300047.m6U0losE030515@cvs-int.fedora.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcpv6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30423 Modified Files: .cvsignore dhcpv6.spec sources Log Message: * Tue Jul 29 2008 David Cantrell - 1.0.20-1 - Upgrade to dhcpv6-1.0.20, changes include: Allow all legal device names in dhcp6c Delay sending Confirm until DAD completes for link-local addr Copy preferred address correctly when receiving Advertise Point to addrlist member when creating DNS server option Add the status option length to the IA option length Other bug fixes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 17 Jun 2008 18:54:01 -0000 1.20 +++ .cvsignore 30 Jul 2008 00:47:19 -0000 1.21 @@ -1 +1 @@ -dhcpv6-1.0.19.tar.gz +dhcpv6-1.0.20.tar.gz Index: dhcpv6.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- dhcpv6.spec 17 Jun 2008 18:54:01 -0000 1.91 +++ dhcpv6.spec 30 Jul 2008 00:47:19 -0000 1.92 @@ -6,12 +6,12 @@ Summary: DHCPv6 - DHCP server and client for IPv6 Name: dhcpv6 -Version: 1.0.19 +Version: 1.0.20 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Daemons URL: http://fedorahosted.org/dhcpv6/ -Source0: http://dcantrel.fedorapeople.org/%{name}/%{name}-%{version}.tar.gz +Source0: http://fedorahosted.org/releases/d/h/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -162,6 +162,15 @@ %{_libdir}/libdhcp6client.a %changelog +* Tue Jul 29 2008 David Cantrell - 1.0.20-1 +- Upgrade to dhcpv6-1.0.20, changes include: + Allow all legal device names in dhcp6c + Delay sending Confirm until DAD completes for link-local addr + Copy preferred address correctly when receiving Advertise + Point to addrlist member when creating DNS server option + Add the status option length to the IA option length + Other bug fixes + * Tue Jun 17 2008 David Cantrell - 1.0.19-1 - Upgrade to dhcpv6-1.0.19, changes include: Write server PID file after configuration file is parsed Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 17 Jun 2008 18:54:01 -0000 1.20 +++ sources 30 Jul 2008 00:47:19 -0000 1.21 @@ -1 +1 @@ -ff23b47756605d6e40931f45fdbef7fe dhcpv6-1.0.19.tar.gz +131862037e4df15813ac7124f8e6efc7 dhcpv6-1.0.20.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 01:00:52 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Wed, 30 Jul 2008 01:00:52 GMT Subject: rpms/xorg-x11-drv-ati/F-9 radeon-git-upstream-fixes2.patch, 1.8, 1.9 xorg-x11-drv-ati.spec, 1.99, 1.100 Message-ID: <200807300100.m6U10qBe031414@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31351 Modified Files: radeon-git-upstream-fixes2.patch xorg-x11-drv-ati.spec Log Message: * Wed Jul 30 2008 Dave Airlie 6.8.0-19 - Update to latest upstream release + fixes radeon-git-upstream-fixes2.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 radeon-git-upstream-fixes2.patch Index: radeon-git-upstream-fixes2.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9/radeon-git-upstream-fixes2.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- radeon-git-upstream-fixes2.patch 26 Jun 2008 06:27:58 -0000 1.8 +++ radeon-git-upstream-fixes2.patch 30 Jul 2008 01:00:22 -0000 1.9 @@ -1,5 +1,2121 @@ +commit 1f3eee3682f3598a303c9c3accfbe01b245cacf9 +Author: Alex Deucher +Date: Tue Jul 29 20:29:32 2008 -0400 + + Change prim types for exa and textured video to help avoid tearing + + - r1xx - switch from tri fan to rect list + - r2xx/r3xx/r4xx/r5xx - switch from tri fan to quad list + +commit 5b5441f8cc119db0d1e03dd35bd06015a26270dd +Author: Brice Goglin +Date: Tue Jul 29 23:31:14 2008 +0200 + + Increase default GART size to 32MB on >=R300 + +commit 0a505297f09aefb1b4432176a263bfdf6f256f77 +Author: Alex Deucher +Date: Mon Jul 28 17:12:41 2008 -0400 + + Fix error in driver connector table for powerbook w/ vga + +commit d5799ac53c3e1b2ca1da97780b171a44060c3aad +Author: Alex Deucher +Date: Mon Jul 28 11:09:10 2008 -0400 + + Add quirk for oem x300 card + + - debian bug 492457 + +commit 64dbadddcf6d069c0472f37afeab89d3e31e937d +Author: Owain Gordon Ainsworth +Date: Mon Jul 28 10:40:58 2008 +1000 + + radeon: don't call ioctl unless DRI is initialised + +commit 1c5858484da4fb1c9bc3ac3b4d7a97863ab99730 +Author: Alex Deucher +Date: Mon Jul 21 23:47:45 2008 -0400 + + First pass at InitDispBandwidth() for AVIVO chips + + - support for LB allocation + - MC priority bumps for display1/2 on RV515 variants and RS690 + If you are having display underflow problems (flickering on sides of + screen in high res modes, etc.) on RV515 or RS690 boards, try setting: + Option "DisplayPriority" "HIGH" in your config. + - still no support for full display watermark programming yet + + Something similar might be useful in rhd as well. + +commit b0378bb145c8a915c943bef7d17f2cdecfccc891 +Author: Alex Deucher +Date: Mon Jul 21 13:47:09 2008 -0400 + + Interlaced mode fixups for AVIVO chips + +commit c18fad622a3c4f9572051120d83af68b625b5686 +Author: Alex Deucher +Date: Mon Jul 21 10:36:48 2008 -0400 + + Clear display priority bits before resetting them + +commit dc231ff8e063313d2bcf5acccad67a9f8a7e3314 +Author: Alex Deucher +Date: Mon Jul 21 10:30:41 2008 -0400 + + Clean up legacy display watermark setup + + - makes crtc1 and crtc2 watermark setup independant. + - fixes the case where only crtc2 is active + +commit f9034214f070fe3054cd9cefd7034252de234f38 +Author: Michel D??nzer +Date: Mon Jul 21 09:09:02 2008 +0200 + + Call DRM modeset ioctl after the IRQ has been initialized. + + This lets the DRM know it can safely disable the vblank interrupts. + +commit ecb6347a3d7071890600c98c2addef3a8ca260ee +Author: Alex Deucher +Date: Sat Jul 19 11:34:16 2008 -0400 + + Add oem quirk for external tmds setup on Dell Inspiron 8600 + + Noticed by fnord42 on IRC. + +commit df53d12a06fad41f00cff849458cb358ab5e2098 +Author: Benjamin Herrenschmidt +Date: Thu Jul 17 14:37:05 2008 +1000 + + Fix console switch on R500 + + This patch fixes the console switch for me on R5xx. + + There are two aspects to it: + + - Fix the ordering of avivo_restore() to better match what's + happening in the driver & ATOM, properly locking/unlocking and + only enabling the CRTCs after everything has been properly + programmed. + + - Don't ASIC_INIT if the card has any CRTC enabled. This is the + best I came up with for avoiding spurrious ASIC_INIT on cards that + -are- POSTed but don't have the BIOS coming from c0000 on x86. The + problem with spurrious ASIC_INIT is that we do it before we do + RADEONSave(), so that screws up the console switch. + + Note that I think we also should save/restore the palette, I don't think + we do. right now, it's a minor issue for me because I fixed offb to be + able to set it on AVIVO's but it might still have to be done in the long + run. + + Tested with a VGA analog setup on DACA and a DVI setup on TMDS 0. I + haven't tested any other combo but that should get us going. + + Cheers, + Ben. + + Signed-off-by: Dave Airlie + +commit e8c07270e1fc2ee455320370692aaf90abac2773 +Author: Alex Deucher +Date: Tue Jul 15 17:50:32 2008 -0400 + + ATOM: fix for r4xx cards with no VRAM_Usage tables + + fixes bug 15954 + +commit da41e71efd41907d9347a902720bce60b32550e5 +Author: Alex Deucher +Date: Mon Jul 14 13:21:38 2008 -0400 + + ATOM: Add support for UpdateCRTC_DoubleBufferRegisters cmd table + + locks/unlocks the crtc/grph/mode regs before updating the crtc + +commit a5e0cf13dc7ace6cf0e44e18b73b9a9266e740ab +Author: Julien Cristau +Date: Sun Jul 6 12:17:28 2008 +0200 + + Link with -lpciaccess and -ldrm if needed + + This makes sure the driver ends up with a DT_NEEDED reference to + the libraries it's using. + +commit f8da849fd89322a54cc4d722767da755358eab70 +Author: Michel D??nzer +Date: Sun Jul 13 11:31:03 2008 +0200 + + Only declare local variable when it's used. + +commit a6db4dc65aec560f3b1f37ff73ec6b0bd8207295 +Author: Dave Airlie +Date: Sat Jul 12 18:47:07 2008 +1000 + + atombios: fix typo in mode conversion for panel + +commit 19a0d5879851eff23a3e7d5cdea55bd784051115 +Author: Dave Airlie +Date: Sat Jul 12 17:04:25 2008 +1000 + + atombios: use macro to get offset into table + +commit a9746114369d516072d841ec356ec3ba3d0be71a +Author: Dave Airlie +Date: Sat Jul 12 10:46:36 2008 +1000 + + pciid: add radeon HD3850. + + pci id from legume on #radeon + +commit ab14f725676e4d4e45278c64b03fe2d328a3e439 +Author: Alex Deucher +Date: Fri Jul 11 19:05:00 2008 -0400 + + R300: NUM_FPU adjustments for VAP_CNTL + +commit 810c28cc2660b73e03e4d27be97988fc5321a06f +Author: Alex Deucher +Date: Fri Jul 11 15:31:57 2008 -0400 + + Make sure cursor offsets are properly aligned when using EXA + +commit 7e67d0163579a44f104e8f354a929ac9b33e4c21 +Author: Alex Deucher +Date: Fri Jul 11 14:30:17 2008 -0400 + + Fix cursor with multi-head and rotation + +commit 9086d008fb8c3cde0633b90ce19ffbf4eded388d [...8444 lines suppressed...] # define R300_OUT_FMT_C_11_11_10 (11 << 0) # define R300_OUT_FMT_C_10_11_11 (12 << 0) # define R300_OUT_FMT_C_2_10_10_10 (13 << 0) -@@ -4227,28 +4488,223 @@ +@@ -4227,28 +4512,223 @@ # define R300_TEX_CODE_OFFSET(x) (x << 13) # define R300_TEX_CODE_SIZE(x) (x << 18) #define R300_US_CODE_ADDR_0 0x4610 @@ -15573,7 +19700,7 @@ #define R300_RB3D_ZSTENCILCNTL 0x4f04 #define R300_RB3D_ZCACHE_CTLSTAT 0x4f18 #define R300_RB3D_BW_CNTL 0x4f1c -@@ -4256,6 +4712,9 @@ +@@ -4256,6 +4736,9 @@ #define R300_RB3D_ZTOP 0x4f14 #define R300_RB3D_ROPCNTL 0x4e18 #define R300_RB3D_BLENDCNTL 0x4e04 @@ -15583,7 +19710,7 @@ #define R300_RB3D_ABLENDCNTL 0x4e08 #define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c #define R300_RB3D_COLOROFFSET0 0x4e28 -@@ -4387,7 +4846,7 @@ +@@ -4387,7 +4870,7 @@ # define R500_ALPHA_SRCP_OP_1_MINUS_2A0 (0 << 30) # define R500_ALPHA_SRCP_OP_A1_MINUS_A0 (1 << 30) # define R500_ALPHA_SRCP_OP_A1_PLUS_A0 (2 << 30) @@ -15592,7 +19719,7 @@ #define R500_US_ALU_RGBA_INST_0 0xb000 # define R500_ALU_RGBA_OP_MAD (0 << 0) # define R500_ALU_RGBA_OP_DP3 (1 << 0) -@@ -4540,7 +4999,7 @@ +@@ -4540,7 +5023,7 @@ # define R500_RGB_SRCP_OP_1_MINUS_2RGB0 (0 << 30) # define R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 (1 << 30) # define R500_RGB_SRCP_OP_RGB1_PLUS_RGB0 (2 << 30) @@ -15601,7 +19728,7 @@ #define R500_US_CMN_INST_0 0xb800 # define R500_INST_TYPE_ALU (0 << 0) # define R500_INST_TYPE_OUT (1 << 0) -@@ -4779,17 +5238,18 @@ +@@ -4779,17 +5262,18 @@ #define R500_GA_US_VECTOR_DATA 0x4254 #define R500_RS_INST_0 0x4320 @@ -15631,7 +19758,7 @@ #define R500_US_FC_CTRL 0x4624 #define R500_US_CODE_ADDR 0x4630 -@@ -4797,16 +5257,18 @@ +@@ -4797,16 +5281,18 @@ #define R500_US_CODE_OFFSET 0x4638 #define R500_RS_IP_0 0x4074 @@ -15977,7 +20104,7 @@ adapt->pFormats = Formats; adapt->nPorts = num_texture_ports; diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c -index e0f3bba..f0dad03 100644 +index e0f3bba..d39f74d 100644 --- a/src/radeon_textured_videofuncs.c +++ b/src/radeon_textured_videofuncs.c @@ -74,22 +74,21 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv @@ -16455,9 +20582,46 @@ FINISH_VIDEO(); BEGIN_VIDEO(1); -@@ -538,8 +593,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv +@@ -431,6 +486,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + OUT_VIDEO_REG(R200_PP_TXFILTER_0, + R200_MAG_FILTER_LINEAR | + R200_MIN_FILTER_LINEAR | ++ R200_CLAMP_S_CLAMP_LAST | ++ R200_CLAMP_T_CLAMP_LAST | + R200_YUV_TO_RGB); + OUT_VIDEO_REG(R200_PP_TXFORMAT_0, txformat); + OUT_VIDEO_REG(R200_PP_TXFORMAT_X_0, 0); +@@ -466,8 +523,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + OUT_VIDEO_REG(RADEON_SE_VTX_FMT, RADEON_SE_VTX_FMT_XY | + RADEON_SE_VTX_FMT_ST0); + +- OUT_VIDEO_REG(RADEON_PP_TXFILTER_0, RADEON_MAG_FILTER_LINEAR | ++ OUT_VIDEO_REG(RADEON_PP_TXFILTER_0, ++ RADEON_MAG_FILTER_LINEAR | + RADEON_MIN_FILTER_LINEAR | ++ RADEON_CLAMP_S_CLAMP_LAST | ++ RADEON_CLAMP_T_CLAMP_LAST | + RADEON_YUV_TO_RGB); + OUT_VIDEO_REG(RADEON_PP_TXFORMAT_0, txformat); + OUT_VIDEO_REG(RADEON_PP_TXOFFSET_0, pPriv->src_offset); +@@ -527,47 +587,50 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + + #ifdef ACCEL_CP + if (info->ChipFamily < CHIP_FAMILY_R200) { +- BEGIN_RING(4 * VTX_DWORD_COUNT + 3); ++ BEGIN_RING(3 * VTX_DWORD_COUNT + 3); + OUT_RING(CP_PACKET3(RADEON_CP_PACKET3_3D_DRAW_IMMD, +- 4 * VTX_DWORD_COUNT + 1)); ++ 3 * VTX_DWORD_COUNT + 1)); + OUT_RING(RADEON_CP_VC_FRMT_XY | + RADEON_CP_VC_FRMT_ST0); +- OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_FAN | ++ OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_RECT_LIST | + RADEON_CP_VC_CNTL_PRIM_WALK_RING | + RADEON_CP_VC_CNTL_MAOS_ENABLE | RADEON_CP_VC_CNTL_VTX_FMT_RADEON_MODE | - (4 << RADEON_CP_VC_CNTL_NUM_SHIFT)); +- (4 << RADEON_CP_VC_CNTL_NUM_SHIFT)); ++ (3 << RADEON_CP_VC_CNTL_NUM_SHIFT)); } else { - if (IS_R300_VARIANT || IS_AVIVO_VARIANT) - BEGIN_RING(4 * VTX_DWORD_COUNT + 6); @@ -16466,7 +20630,10 @@ else BEGIN_RING(4 * VTX_DWORD_COUNT + 2); OUT_RING(CP_PACKET3(R200_CP_PACKET3_3D_DRAW_IMMD_2, -@@ -549,8 +604,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + 4 * VTX_DWORD_COUNT)); +- OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_FAN | ++ OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_QUAD_LIST | + RADEON_CP_VC_CNTL_PRIM_WALK_RING | (4 << RADEON_CP_VC_CNTL_NUM_SHIFT)); } #else /* ACCEL_CP */ @@ -16474,10 +20641,36 @@ - BEGIN_VIDEO(3 + VTX_DWORD_COUNT * 4); + if (IS_R300_3D || IS_R500_3D) + BEGIN_VIDEO(2 + VTX_DWORD_COUNT * 4); ++ else if (info->ChipFamily < CHIP_FAMILY_R200) ++ BEGIN_VIDEO(1 + VTX_DWORD_COUNT * 3); else BEGIN_VIDEO(1 + VTX_DWORD_COUNT * 4); -@@ -575,10 +630,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv + if (info->ChipFamily < CHIP_FAMILY_R200) { +- OUT_VIDEO_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_TRIANGLE_FAN | ++ OUT_VIDEO_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_RECTANGLE_LIST | + RADEON_VF_PRIM_WALK_DATA | + RADEON_VF_RADEON_MODE | +- 4 << RADEON_VF_NUM_VERTICES_SHIFT)); ++ (3 << RADEON_VF_NUM_VERTICES_SHIFT))); + } else { + OUT_VIDEO_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_QUAD_LIST | + RADEON_VF_PRIM_WALK_DATA | +- 4 << RADEON_VF_NUM_VERTICES_SHIFT)); ++ (4 << RADEON_VF_NUM_VERTICES_SHIFT))); + } + #endif +- +- VTX_OUT((float)dstX, (float)dstY, +- xFixedToFloat(srcTopLeft.x) / info->texW[0], xFixedToFloat(srcTopLeft.y) / info->texH[0]); ++ if (info->ChipFamily >= CHIP_FAMILY_R200) { ++ VTX_OUT((float)dstX, (float)dstY, ++ xFixedToFloat(srcTopLeft.x) / info->texW[0], xFixedToFloat(srcTopLeft.y) / info->texH[0]); ++ } + VTX_OUT((float)dstX, (float)(dstY + dsth), + xFixedToFloat(srcBottomLeft.x) / info->texW[0], xFixedToFloat(srcBottomLeft.y) / info->texH[0]); + VTX_OUT((float)(dstX + dstw), (float)(dstY + dsth), +@@ -575,10 +638,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv VTX_OUT((float)(dstX + dstw), (float)dstY, xFixedToFloat(srcTopRight.x) / info->texW[0], xFixedToFloat(srcTopRight.y) / info->texH[0]); @@ -16491,11 +20684,11 @@ #ifdef ACCEL_CP ADVANCE_RING(); -@@ -589,6 +643,14 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv +@@ -589,6 +651,14 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv pBox++; } -+ if (IS_R300_3D | IS_R500_3D) { ++ if (IS_R300_3D || IS_R500_3D) { + BEGIN_VIDEO(2); + OUT_VIDEO_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL); + } else @@ -16762,6 +20955,24 @@ /* FIXME: need to revisit this when we add more modes */ +diff --git a/src/radeon_version.h b/src/radeon_version.h +index ccc1367..5717ead 100644 +--- a/src/radeon_version.h ++++ b/src/radeon_version.h +@@ -39,10 +39,9 @@ + #define R200_DRIVER_NAME "r200" + #define R300_DRIVER_NAME "r300" + +-#define RADEON_VERSION_MAJOR 4 +-#define RADEON_VERSION_MAJOR_TILED 5 +-#define RADEON_VERSION_MINOR 3 +-#define RADEON_VERSION_PATCH 0 ++#define RADEON_VERSION_MAJOR PACKAGE_VERSION_MAJOR ++#define RADEON_VERSION_MINOR PACKAGE_VERSION_MINOR ++#define RADEON_VERSION_PATCH PACKAGE_VERSION_PATCHLEVEL + + #ifndef RADEON_VERSION_EXTRA + #define RADEON_VERSION_EXTRA "" diff --git a/src/radeon_video.c b/src/radeon_video.c index 7502e1e..ac60166 100644 --- a/src/radeon_video.c Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9/xorg-x11-drv-ati.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- xorg-x11-drv-ati.spec 26 Jun 2008 06:27:58 -0000 1.99 +++ xorg-x11-drv-ati.spec 30 Jul 2008 01:00:22 -0000 1.100 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.8.0 -Release: 18%{?dist} +Release: 19%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -91,6 +91,9 @@ %{_mandir}/man4/radeon.4* %changelog +* Wed Jul 30 2008 Dave Airlie 6.8.0-19 +- Update to latest upstream release + fixes + * Thu Jun 26 2008 Dave Airlie 6.8.0-18 - update to latest git 6.8.192 beta From fedora-extras-commits at redhat.com Wed Jul 30 01:01:59 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Wed, 30 Jul 2008 01:01:59 GMT Subject: rpms/xorg-x11-drv-ati/devel r128-bios-size.patch, NONE, 1.1 radeon-git-upstream-fixes2.patch, 1.4, 1.5 xorg-x11-drv-ati.spec, 1.91, 1.92 Message-ID: <200807300101.m6U11xiR005706@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5649 Modified Files: radeon-git-upstream-fixes2.patch xorg-x11-drv-ati.spec Added Files: r128-bios-size.patch Log Message: * Wed Jul 30 2008 Dave Airlie 6.8.0-19 - Update to latest upstream release + fixes - Bring up to F9 driver level r128-bios-size.patch: --- NEW FILE r128-bios-size.patch --- diff -up xf86-video-ati-6.8.0/src/r128_driver.c.bios_size xf86-video-ati-6.8.0/src/r128_driver.c --- xf86-video-ati-6.8.0/src/r128_driver.c.bios_size 2008-04-24 16:12:13.000000000 +1000 +++ xf86-video-ati-6.8.0/src/r128_driver.c 2008-04-24 16:12:16.000000000 +1000 @@ -490,7 +490,8 @@ static Bool R128GetBIOSParameters(ScrnIn (info->VBIOS[(v) + 3] << 24)) #ifdef XSERVER_LIBPCIACCESS - info->VBIOS = xalloc(info->PciInfo->rom_size); + int size = info->PciInfo->rom_size > R128_VBIOS_SIZE ? info->PciInfo->rom_size : R128_VBIOS_SIZE; + info->VBIOS = xalloc(size); #else info->VBIOS = xalloc(R128_VBIOS_SIZE); #endif radeon-git-upstream-fixes2.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 radeon-git-upstream-fixes2.patch Index: radeon-git-upstream-fixes2.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-git-upstream-fixes2.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- radeon-git-upstream-fixes2.patch 6 Apr 2008 07:14:38 -0000 1.4 +++ radeon-git-upstream-fixes2.patch 30 Jul 2008 01:01:29 -0000 1.5 @@ -1,3 +1,1160 @@ +commit 1f3eee3682f3598a303c9c3accfbe01b245cacf9 +Author: Alex Deucher +Date: Tue Jul 29 20:29:32 2008 -0400 + + Change prim types for exa and textured video to help avoid tearing + + - r1xx - switch from tri fan to rect list + - r2xx/r3xx/r4xx/r5xx - switch from tri fan to quad list + +commit 5b5441f8cc119db0d1e03dd35bd06015a26270dd +Author: Brice Goglin +Date: Tue Jul 29 23:31:14 2008 +0200 + + Increase default GART size to 32MB on >=R300 + +commit 0a505297f09aefb1b4432176a263bfdf6f256f77 +Author: Alex Deucher +Date: Mon Jul 28 17:12:41 2008 -0400 + + Fix error in driver connector table for powerbook w/ vga + +commit d5799ac53c3e1b2ca1da97780b171a44060c3aad +Author: Alex Deucher +Date: Mon Jul 28 11:09:10 2008 -0400 + + Add quirk for oem x300 card + + - debian bug 492457 + +commit 64dbadddcf6d069c0472f37afeab89d3e31e937d +Author: Owain Gordon Ainsworth +Date: Mon Jul 28 10:40:58 2008 +1000 + + radeon: don't call ioctl unless DRI is initialised + +commit 1c5858484da4fb1c9bc3ac3b4d7a97863ab99730 +Author: Alex Deucher +Date: Mon Jul 21 23:47:45 2008 -0400 + + First pass at InitDispBandwidth() for AVIVO chips + + - support for LB allocation + - MC priority bumps for display1/2 on RV515 variants and RS690 + If you are having display underflow problems (flickering on sides of + screen in high res modes, etc.) on RV515 or RS690 boards, try setting: + Option "DisplayPriority" "HIGH" in your config. + - still no support for full display watermark programming yet + + Something similar might be useful in rhd as well. + +commit b0378bb145c8a915c943bef7d17f2cdecfccc891 +Author: Alex Deucher +Date: Mon Jul 21 13:47:09 2008 -0400 + + Interlaced mode fixups for AVIVO chips + +commit c18fad622a3c4f9572051120d83af68b625b5686 +Author: Alex Deucher +Date: Mon Jul 21 10:36:48 2008 -0400 + + Clear display priority bits before resetting them + +commit dc231ff8e063313d2bcf5acccad67a9f8a7e3314 +Author: Alex Deucher +Date: Mon Jul 21 10:30:41 2008 -0400 + + Clean up legacy display watermark setup + + - makes crtc1 and crtc2 watermark setup independant. + - fixes the case where only crtc2 is active + +commit f9034214f070fe3054cd9cefd7034252de234f38 +Author: Michel D??nzer +Date: Mon Jul 21 09:09:02 2008 +0200 + + Call DRM modeset ioctl after the IRQ has been initialized. + + This lets the DRM know it can safely disable the vblank interrupts. + +commit ecb6347a3d7071890600c98c2addef3a8ca260ee +Author: Alex Deucher +Date: Sat Jul 19 11:34:16 2008 -0400 + + Add oem quirk for external tmds setup on Dell Inspiron 8600 + + Noticed by fnord42 on IRC. + +commit df53d12a06fad41f00cff849458cb358ab5e2098 +Author: Benjamin Herrenschmidt +Date: Thu Jul 17 14:37:05 2008 +1000 + + Fix console switch on R500 + + This patch fixes the console switch for me on R5xx. + + There are two aspects to it: + + - Fix the ordering of avivo_restore() to better match what's + happening in the driver & ATOM, properly locking/unlocking and + only enabling the CRTCs after everything has been properly + programmed. + + - Don't ASIC_INIT if the card has any CRTC enabled. This is the + best I came up with for avoiding spurrious ASIC_INIT on cards that + -are- POSTed but don't have the BIOS coming from c0000 on x86. The + problem with spurrious ASIC_INIT is that we do it before we do + RADEONSave(), so that screws up the console switch. + + Note that I think we also should save/restore the palette, I don't think + we do. right now, it's a minor issue for me because I fixed offb to be + able to set it on AVIVO's but it might still have to be done in the long + run. + + Tested with a VGA analog setup on DACA and a DVI setup on TMDS 0. I + haven't tested any other combo but that should get us going. + + Cheers, + Ben. + + Signed-off-by: Dave Airlie + +commit e8c07270e1fc2ee455320370692aaf90abac2773 +Author: Alex Deucher +Date: Tue Jul 15 17:50:32 2008 -0400 + + ATOM: fix for r4xx cards with no VRAM_Usage tables + + fixes bug 15954 + +commit da41e71efd41907d9347a902720bce60b32550e5 +Author: Alex Deucher +Date: Mon Jul 14 13:21:38 2008 -0400 + + ATOM: Add support for UpdateCRTC_DoubleBufferRegisters cmd table + + locks/unlocks the crtc/grph/mode regs before updating the crtc + +commit a5e0cf13dc7ace6cf0e44e18b73b9a9266e740ab +Author: Julien Cristau +Date: Sun Jul 6 12:17:28 2008 +0200 + + Link with -lpciaccess and -ldrm if needed + + This makes sure the driver ends up with a DT_NEEDED reference to + the libraries it's using. + +commit f8da849fd89322a54cc4d722767da755358eab70 +Author: Michel D??nzer +Date: Sun Jul 13 11:31:03 2008 +0200 + + Only declare local variable when it's used. + +commit a6db4dc65aec560f3b1f37ff73ec6b0bd8207295 +Author: Dave Airlie +Date: Sat Jul 12 18:47:07 2008 +1000 + + atombios: fix typo in mode conversion for panel + +commit 19a0d5879851eff23a3e7d5cdea55bd784051115 +Author: Dave Airlie +Date: Sat Jul 12 17:04:25 2008 +1000 + + atombios: use macro to get offset into table + +commit a9746114369d516072d841ec356ec3ba3d0be71a +Author: Dave Airlie +Date: Sat Jul 12 10:46:36 2008 +1000 + + pciid: add radeon HD3850. + + pci id from legume on #radeon + +commit ab14f725676e4d4e45278c64b03fe2d328a3e439 +Author: Alex Deucher +Date: Fri Jul 11 19:05:00 2008 -0400 + + R300: NUM_FPU adjustments for VAP_CNTL + +commit 810c28cc2660b73e03e4d27be97988fc5321a06f +Author: Alex Deucher +Date: Fri Jul 11 15:31:57 2008 -0400 + + Make sure cursor offsets are properly aligned when using EXA + +commit 7e67d0163579a44f104e8f354a929ac9b33e4c21 +Author: Alex Deucher +Date: Fri Jul 11 14:30:17 2008 -0400 + + Fix cursor with multi-head and rotation + +commit 9086d008fb8c3cde0633b90ce19ffbf4eded388d [...19184 lines suppressed...] + +-#define fld_UV_INT_START_def (CARD32) 0x0000003b +-#define fld_U_INT_LENGTH_def (CARD32) 0x0000000f +-#define fld_V_INT_LENGTH_def (CARD32) 0x0000000f +-#define fld_CRDR_ACTIVE_GAIN_def (CARD32) 0x0000007a +-#define fld_CBDB_ACTIVE_GAIN_def (CARD32) 0x000000ac ++#define fld_UV_INT_START_def (uint32_t) 0x0000003b ++#define fld_U_INT_LENGTH_def (uint32_t) 0x0000000f ++#define fld_V_INT_LENGTH_def (uint32_t) 0x0000000f ++#define fld_CRDR_ACTIVE_GAIN_def (uint32_t) 0x0000007a ++#define fld_CBDB_ACTIVE_GAIN_def (uint32_t) 0x000000ac + +-#define fld_DVS_DIRECTION_def (CARD32) 0x00000000 +-#define fld_DVS_VBI_CARD8_SWAP_def (CARD32) 0x00000000 +-#define fld_DVS_CLK_SELECT_def (CARD32) 0x00000000 +-#define fld_CONTINUOUS_STREAM_def (CARD32) 0x00000000 +-#define fld_DVSOUT_CLK_DRV_def (CARD32) 0x00000001 +-#define fld_DVSOUT_DATA_DRV_def (CARD32) 0x00000001 ++#define fld_DVS_DIRECTION_def (uint32_t) 0x00000000 ++#define fld_DVS_VBI_UINT8_SWAP_def (uint32_t) 0x00000000 ++#define fld_DVS_CLK_SELECT_def (uint32_t) 0x00000000 ++#define fld_CONTINUOUS_STREAM_def (uint32_t) 0x00000000 ++#define fld_DVSOUT_CLK_DRV_def (uint32_t) 0x00000001 ++#define fld_DVSOUT_DATA_DRV_def (uint32_t) 0x00000001 + +-#define fld_COMB_CNTL0_def (CARD32) 0x09438090 +-#define fld_COMB_CNTL1_def (CARD32) 0x00000010 ++#define fld_COMB_CNTL0_def (uint32_t) 0x09438090 ++#define fld_COMB_CNTL1_def (uint32_t) 0x00000010 + +-#define fld_COMB_CNTL2_def (CARD32) 0x16161010 +-#define fld_COMB_LENGTH_def (CARD32) 0x0718038A ++#define fld_COMB_CNTL2_def (uint32_t) 0x16161010 ++#define fld_COMB_LENGTH_def (uint32_t) 0x0718038A + +-#define fld_SYNCTIP_REF0_def (CARD32) 0x00000037 +-#define fld_SYNCTIP_REF1_def (CARD32) 0x00000029 +-#define fld_CLAMP_REF_def (CARD32) 0x0000003B +-#define fld_AGC_PEAKWHITE_def (CARD32) 0x000000FF +-#define fld_VBI_PEAKWHITE_def (CARD32) 0x000000D2 ++#define fld_SYNCTIP_REF0_def (uint32_t) 0x00000037 ++#define fld_SYNCTIP_REF1_def (uint32_t) 0x00000029 ++#define fld_CLAMP_REF_def (uint32_t) 0x0000003B ++#define fld_AGC_PEAKWHITE_def (uint32_t) 0x000000FF ++#define fld_VBI_PEAKWHITE_def (uint32_t) 0x000000D2 + +-#define fld_WPA_THRESHOLD_def (CARD32) 0x000003B0 ++#define fld_WPA_THRESHOLD_def (uint32_t) 0x000003B0 + +-#define fld_WPA_TRIGGER_LO_def (CARD32) 0x000000B4 +-#define fld_WPA_TRIGGER_HIGH_def (CARD32) 0x0000021C ++#define fld_WPA_TRIGGER_LO_def (uint32_t) 0x000000B4 ++#define fld_WPA_TRIGGER_HIGH_def (uint32_t) 0x0000021C + +-#define fld_LOCKOUT_START_def (CARD32) 0x00000206 +-#define fld_LOCKOUT_END_def (CARD32) 0x00000021 ++#define fld_LOCKOUT_START_def (uint32_t) 0x00000206 ++#define fld_LOCKOUT_END_def (uint32_t) 0x00000021 + +-#define fld_CH_DTO_INC_def (CARD32) 0x00400000 +-#define fld_PLL_SGAIN_def (CARD32) 0x00000001 +-#define fld_PLL_FGAIN_def (CARD32) 0x00000002 ++#define fld_CH_DTO_INC_def (uint32_t) 0x00400000 ++#define fld_PLL_SGAIN_def (uint32_t) 0x00000001 ++#define fld_PLL_FGAIN_def (uint32_t) 0x00000002 + +-#define fld_CR_BURST_GAIN_def (CARD32) 0x0000007a +-#define fld_CB_BURST_GAIN_def (CARD32) 0x000000ac ++#define fld_CR_BURST_GAIN_def (uint32_t) 0x0000007a ++#define fld_CB_BURST_GAIN_def (uint32_t) 0x000000ac + +-#define fld_VERT_LOCKOUT_START_def (CARD32) 0x00000207 +-#define fld_VERT_LOCKOUT_END_def (CARD32) 0x0000000E ++#define fld_VERT_LOCKOUT_START_def (uint32_t) 0x00000207 ++#define fld_VERT_LOCKOUT_END_def (uint32_t) 0x0000000E + +-#define fld_H_IN_WIND_START_def (CARD32) 0x00000070 +-#define fld_V_IN_WIND_START_def (CARD32) 0x00000027 ++#define fld_H_IN_WIND_START_def (uint32_t) 0x00000070 ++#define fld_V_IN_WIND_START_def (uint32_t) 0x00000027 + +-#define fld_H_OUT_WIND_WIDTH_def (CARD32) 0x000002f4 ++#define fld_H_OUT_WIND_WIDTH_def (uint32_t) 0x000002f4 + +-#define fld_V_OUT_WIND_WIDTH_def (CARD32) 0x000000f0 ++#define fld_V_OUT_WIND_WIDTH_def (uint32_t) 0x000000f0 + +-#define fld_HS_LINE_TOTAL_def (CARD32) 0x0000038E ++#define fld_HS_LINE_TOTAL_def (uint32_t) 0x0000038E + +-#define fld_MIN_PULSE_WIDTH_def (CARD32) 0x0000002F +-#define fld_MAX_PULSE_WIDTH_def (CARD32) 0x00000046 ++#define fld_MIN_PULSE_WIDTH_def (uint32_t) 0x0000002F ++#define fld_MAX_PULSE_WIDTH_def (uint32_t) 0x00000046 + +-#define fld_WIN_CLOSE_LIMIT_def (CARD32) 0x0000004D +-#define fld_WIN_OPEN_LIMIT_def (CARD32) 0x000001B7 ++#define fld_WIN_CLOSE_LIMIT_def (uint32_t) 0x0000004D ++#define fld_WIN_OPEN_LIMIT_def (uint32_t) 0x000001B7 + +-#define fld_VSYNC_INT_TRIGGER_def (CARD32) 0x000002AA ++#define fld_VSYNC_INT_TRIGGER_def (uint32_t) 0x000002AA + +-#define fld_VSYNC_INT_HOLD_def (CARD32) 0x0000001D ++#define fld_VSYNC_INT_HOLD_def (uint32_t) 0x0000001D + +-#define fld_VIN_M0_def (CARD32) 0x00000039 +-#define fld_VIN_N0_def (CARD32) 0x0000014c +-#define fld_MNFLIP_EN_def (CARD32) 0x00000000 +-#define fld_VIN_P_def (CARD32) 0x00000006 +-#define fld_REG_CLK_SEL_def (CARD32) 0x00000000 ++#define fld_VIN_M0_def (uint32_t) 0x00000039 ++#define fld_VIN_N0_def (uint32_t) 0x0000014c ++#define fld_MNFLIP_EN_def (uint32_t) 0x00000000 ++#define fld_VIN_P_def (uint32_t) 0x00000006 ++#define fld_REG_CLK_SEL_def (uint32_t) 0x00000000 + +-#define fld_VIN_M1_def (CARD32) 0x00000000 +-#define fld_VIN_N1_def (CARD32) 0x00000000 +-#define fld_VIN_DRIVER_SEL_def (CARD32) 0x00000000 +-#define fld_VIN_MNFLIP_REQ_def (CARD32) 0x00000000 +-#define fld_VIN_MNFLIP_DONE_def (CARD32) 0x00000000 +-#define fld_TV_LOCK_TO_VIN_def (CARD32) 0x00000000 +-#define fld_TV_P_FOR_WINCLK_def (CARD32) 0x00000004 ++#define fld_VIN_M1_def (uint32_t) 0x00000000 ++#define fld_VIN_N1_def (uint32_t) 0x00000000 ++#define fld_VIN_DRIVER_SEL_def (uint32_t) 0x00000000 ++#define fld_VIN_MNFLIP_REQ_def (uint32_t) 0x00000000 ++#define fld_VIN_MNFLIP_DONE_def (uint32_t) 0x00000000 ++#define fld_TV_LOCK_TO_VIN_def (uint32_t) 0x00000000 ++#define fld_TV_P_FOR_WINCLK_def (uint32_t) 0x00000004 + +-#define fld_VINRST_def (CARD32) 0x00000001 +-#define fld_VIN_CLK_SEL_def (CARD32) 0x00000000 ++#define fld_VINRST_def (uint32_t) 0x00000001 ++#define fld_VIN_CLK_SEL_def (uint32_t) 0x00000000 + +-#define fld_VS_FIELD_BLANK_START_def (CARD32) 0x00000206 ++#define fld_VS_FIELD_BLANK_START_def (uint32_t) 0x00000206 + +-#define fld_VS_FIELD_BLANK_END_def (CARD32) 0x0000000A ++#define fld_VS_FIELD_BLANK_END_def (uint32_t) 0x0000000A + +-/*#define fld_VS_FIELD_IDLOCATION_def (CARD32) 0x00000105 */ +-#define fld_VS_FIELD_IDLOCATION_def (CARD32) 0x00000001 +-#define fld_VS_FRAME_TOTAL_def (CARD32) 0x00000217 ++/*#define fld_VS_FIELD_IDLOCATION_def (uint32_t) 0x00000105 */ ++#define fld_VS_FIELD_IDLOCATION_def (uint32_t) 0x00000001 ++#define fld_VS_FRAME_TOTAL_def (uint32_t) 0x00000217 + +-#define fld_SYNC_TIP_START_def (CARD32) 0x00000372 +-#define fld_SYNC_TIP_LENGTH_def (CARD32) 0x0000000F ++#define fld_SYNC_TIP_START_def (uint32_t) 0x00000372 ++#define fld_SYNC_TIP_LENGTH_def (uint32_t) 0x0000000F + +-#define fld_GAIN_FORCE_DATA_def (CARD32) 0x00000000 +-#define fld_GAIN_FORCE_EN_def (CARD32) 0x00000000 +-#define fld_I_CLAMP_SEL_def (CARD32) 0x00000003 +-#define fld_I_AGC_SEL_def (CARD32) 0x00000001 +-#define fld_EXT_CLAMP_CAP_def (CARD32) 0x00000001 +-#define fld_EXT_AGC_CAP_def (CARD32) 0x00000001 +-#define fld_DECI_DITHER_EN_def (CARD32) 0x00000001 +-#define fld_ADC_PREFHI_def (CARD32) 0x00000000 +-#define fld_ADC_CH_GAIN_SEL_def (CARD32) 0x00000001 ++#define fld_GAIN_FORCE_DATA_def (uint32_t) 0x00000000 ++#define fld_GAIN_FORCE_EN_def (uint32_t) 0x00000000 ++#define fld_I_CLAMP_SEL_def (uint32_t) 0x00000003 ++#define fld_I_AGC_SEL_def (uint32_t) 0x00000001 ++#define fld_EXT_CLAMP_CAP_def (uint32_t) 0x00000001 ++#define fld_EXT_AGC_CAP_def (uint32_t) 0x00000001 ++#define fld_DECI_DITHER_EN_def (uint32_t) 0x00000001 ++#define fld_ADC_PREFHI_def (uint32_t) 0x00000000 ++#define fld_ADC_CH_GAIN_SEL_def (uint32_t) 0x00000001 + +-#define fld_HS_PLL_SGAIN_def (CARD32) 0x00000003 ++#define fld_HS_PLL_SGAIN_def (uint32_t) 0x00000003 + +-#define fld_NREn_def (CARD32) 0x00000000 +-#define fld_NRGainCntl_def (CARD32) 0x00000000 +-#define fld_NRBWTresh_def (CARD32) 0x00000000 +-#define fld_NRGCTresh_def (CARD32) 0x00000000 +-#define fld_NRCoefDespeclMode_def (CARD32) 0x00000000 ++#define fld_NREn_def (uint32_t) 0x00000000 ++#define fld_NRGainCntl_def (uint32_t) 0x00000000 ++#define fld_NRBWTresh_def (uint32_t) 0x00000000 ++#define fld_NRGCTresh_def (uint32_t) 0x00000000 ++#define fld_NRCoefDespeclMode_def (uint32_t) 0x00000000 + +-#define fld_GPIO_5_OE_def (CARD32) 0x00000000 +-#define fld_GPIO_6_OE_def (CARD32) 0x00000000 ++#define fld_GPIO_5_OE_def (uint32_t) 0x00000000 ++#define fld_GPIO_6_OE_def (uint32_t) 0x00000000 + +-#define fld_GPIO_5_OUT_def (CARD32) 0x00000000 +-#define fld_GPIO_6_OUT_def (CARD32) 0x00000000 ++#define fld_GPIO_5_OUT_def (uint32_t) 0x00000000 ++#define fld_GPIO_6_OUT_def (uint32_t) 0x00000000 + + /* End of field default values. */ + Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- xorg-x11-drv-ati.spec 6 Apr 2008 07:14:38 -0000 1.91 +++ xorg-x11-drv-ati.spec 30 Jul 2008 01:01:29 -0000 1.92 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.8.0 -Release: 10%{?dist} +Release: 19%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -22,6 +22,7 @@ Patch4: radeon-6.7.196-faster-ddc.patch # Rage 128 patches (100-199) +Patch100: r128-bios-size.patch # mach64 patches (200-299) Patch200: mach64-ia64-pagesize.patch @@ -47,8 +48,9 @@ %patch1 -p1 -b .git %patch2 -p1 -b .git2 -%patch4 -p1 -b .ddc +#patch4 -p1 -b .ddc +%patch100 -p1 -b .r128-bios %patch200 -p1 -b .mach64-ia64 %build @@ -89,6 +91,35 @@ %{_mandir}/man4/radeon.4* %changelog +* Wed Jul 30 2008 Dave Airlie 6.8.0-19 +- Update to latest upstream release + fixes + +* Thu Jun 26 2008 Dave Airlie 6.8.0-18 +- update to latest git 6.8.192 beta + +* Wed May 28 2008 Dave Airlie 6.8.0-17 +- fix multiple VT switch issues on r600 cards +- assorted upstream goodness + +* Sat May 24 2008 Dave Airlie 6.8.0-16 +- Fix PLL on r600 LVDS (#444542) +- update to other upstream fixes + +* Mon May 12 2008 Dave Airlie 6.8.0-15 +- The RS482 sucks - same pci id, mobile and non-mobile parts. + +* Mon May 12 2008 Dave Airlie 6.8.0-14 +- add initial cloning support for RN50 (#439879) + +* Wed May 07 2008 Dave Airlie 6.8.0-13 +- more upstream fixes for EXA accel + zaphod mode + +* Thu Apr 24 2008 Dave Airlie 6.8.0-12 +- not so much faster as kill my Apple MAC DDC - next time do this upstream first + +* Thu Apr 24 2008 Dave Airlie 6.8.0-11 +- fix r128 bios size issue (#439022) + * Sun Apr 06 2008 Dave Airlie 6.8.0-10 - attempt to fix VT switch and X restart hangs From fedora-extras-commits at redhat.com Wed Jul 30 01:22:53 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 30 Jul 2008 01:22:53 GMT Subject: rpms/anaconda/devel .cvsignore, 1.553, 1.554 anaconda.spec, 1.695, 1.696 sources, 1.687, 1.688 Message-ID: <200807300122.m6U1MrK8006632@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6600 Modified Files: .cvsignore anaconda.spec sources Log Message: * Tue Jul 29 2008 Jeremy Katz - 11.4.1.21-1 - Remove an instance of NEEDGR still existing to fix graphical isolinux (#457144) (katzj) - use newer mke2fs arguments for different filesystems (sandeen) - Use attributes to tell us whether filesystems are bootable (#457037). (clumens) - Make sure we drag in gzip, used by the image creation stuff. (jkeating) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.553 retrieving revision 1.554 diff -u -r1.553 -r1.554 --- .cvsignore 25 Jul 2008 20:19:50 -0000 1.553 +++ .cvsignore 30 Jul 2008 01:22:23 -0000 1.554 @@ -1,7 +1 @@ -clog -anaconda-11.4.1.15.tar.bz2 -anaconda-11.4.1.16.tar.bz2 -anaconda-11.4.1.17.tar.bz2 -anaconda-11.4.1.18.tar.bz2 -anaconda-11.4.1.19.tar.bz2 -anaconda-11.4.1.20.tar.bz2 +anaconda-11.4.1.21.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.695 retrieving revision 1.696 diff -u -r1.695 -r1.696 --- anaconda.spec 25 Jul 2008 20:19:50 -0000 1.695 +++ anaconda.spec 30 Jul 2008 01:22:23 -0000 1.696 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.20 +Version: 11.4.1.21 Release: 1 License: GPLv2+ Group: Applications/System @@ -32,12 +32,13 @@ %define libbdevidver 5.1.2-1 %define rhpxlver 0.25 %define desktopfileutilsver 0.8 +%define e2fsver 1.41.0 BuildRequires: audit-libs-devel BuildRequires: booty BuildRequires: bzip2-devel BuildRequires: device-mapper-devel >= %{dmver} -BuildRequires: e2fsprogs-devel +BuildRequires: e2fsprogs-devel >= %{e2fsver} BuildRequires: elfutils-devel BuildRequires: gettext >= %{gettextver} BuildRequires: gtk2-devel @@ -84,7 +85,8 @@ Requires: device-mapper >= %{dmver} Requires: device-mapper-libs >= %{dmver} Requires: dosfstools -Requires: e2fsprogs +Requires: e2fsprogs >= %{e2fsver} +Requires: gzip %ifarch %{ix86} x86_64 ia64 Requires: dmidecode %endif @@ -195,6 +197,14 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Jul 29 2008 Jeremy Katz - 11.4.1.21-1 +- Remove an instance of NEEDGR still existing to fix graphical + isolinux (#457144) (katzj) +- use newer mke2fs arguments for different filesystems (sandeen) +- Use attributes to tell us whether filesystems are + bootable (#457037). (clumens) +- Make sure we drag in gzip, used by the image creation stuff. (jkeating) + * Fri Jul 25 2008 Chris Lumens - 11.4.1.20-1 - Clean up some mistakes in the minstg2 removal. (dcantrell) - Fix passing the language to anaconda (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.687 retrieving revision 1.688 diff -u -r1.687 -r1.688 --- sources 25 Jul 2008 20:19:50 -0000 1.687 +++ sources 30 Jul 2008 01:22:23 -0000 1.688 @@ -1 +1 @@ -262e66ff7df1c1ff3e9cff1a60399201 anaconda-11.4.1.20.tar.bz2 +b5cc65c152effcacd04f3b2aae0032fe anaconda-11.4.1.21.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 01:37:45 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 30 Jul 2008 01:37:45 GMT Subject: rpms/telepathy-haze/devel haze-icq.profile, 1.1, 1.2 telepathy-haze.spec, 1.10, 1.11 Message-ID: <200807300137.m6U1bjW3007182@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/telepathy-haze/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7152 Modified Files: haze-icq.profile telepathy-haze.spec Log Message: Fix RH bug #456565 (Wrong entry in haze-icq.profile) Index: haze-icq.profile =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/haze-icq.profile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- haze-icq.profile 1 Mar 2008 17:54:21 -0000 1.1 +++ haze-icq.profile 30 Jul 2008 01:37:15 -0000 1.2 @@ -5,7 +5,7 @@ _Description = ICQ Protocol IconName = im-icq DisplayName = ICQ -ConfigurationUI = jabber +ConfigurationUI = icq Capabilities = chat-p2p, supports-avatars, supports-alias, supports-roster SupportedPresences = offline,available,away,do-not-disturb Default-server = login.messaging.aol.com Index: telepathy-haze.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- telepathy-haze.spec 1 Mar 2008 18:02:14 -0000 1.10 +++ telepathy-haze.spec 30 Jul 2008 01:37:15 -0000 1.11 @@ -1,6 +1,6 @@ Name: telepathy-haze Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A multi-protocol Libpurple connection manager for Telepathy Group: Applications/Communications @@ -90,6 +90,11 @@ %changelog +* Tue Jul 29 2008 Peter Gordon - 0.2.0-2 +- Fix the ICQ Mission Control profile to properly use the "icq" configuration + UI, rather than the one for jabber. +- Resolves: bug #456565 (Wrong entry in haze-icq.profile) + * Sat Mar 01 2008 Peter Gordon - 0.2.0-1 - Update to new upstream release (0.2.0) - Add ICQ Mission-Control profile. From fedora-extras-commits at redhat.com Wed Jul 30 02:07:15 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 02:07:15 GMT Subject: rpms/asterisk/devel asterisk.spec,1.30,1.31 Message-ID: <200807300207.m6U27Fg4015009@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14986 Modified Files: asterisk.spec Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.6.0-0.20.beta9 - Bump release and rebuild with new libpri and zaptel. Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- asterisk.spec 25 Jul 2008 17:49:41 -0000 1.30 +++ asterisk.spec 30 Jul 2008 02:06:45 -0000 1.31 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.19.beta%{beta}%{?dist} +Release: 0.20.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -397,8 +397,8 @@ Requires: asterisk = %{version}-%{release} Requires: zaptel >= 1.4.0 Requires(pre): %{_sbindir}/usermod -BuildRequires: zaptel-devel >= 1.4.0 -BuildRequires: libpri-devel >= 1.4.0 +BuildRequires: zaptel-devel >= 1.4.11 +BuildRequires: libpri-devel >= 1.4.6 %description zaptel Modules for Asterisk that use Zaptel. @@ -1027,6 +1027,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Tue Jul 29 2008 Jeffrey C. Ollie - 1.6.0-0.20.beta9 +- Bump release and rebuild with new libpri and zaptel. + * Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.19.beta9 - Add patch pulled from upstream SVN that fixes AST-2008-010 and AST-2008-011. From fedora-extras-commits at redhat.com Wed Jul 30 02:17:55 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 02:17:55 GMT Subject: rpms/zabbix/EL-5 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 zabbix-agent.init, 1.2, 1.3 zabbix-server.init, 1.2, 1.3 zabbix.spec, 1.16, 1.17 Message-ID: <200807300217.m6U2HtGq015375@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/zabbix/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15333 Modified Files: .cvsignore sources zabbix-agent.init zabbix-server.init zabbix.spec Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 - Synchronize with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 26 Mar 2008 04:12:26 -0000 1.10 +++ .cvsignore 30 Jul 2008 02:17:25 -0000 1.11 @@ -1 +1 @@ -zabbix-1.4.5.tar.gz +zabbix-1.4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 2 May 2008 20:52:39 -0000 1.11 +++ sources 30 Jul 2008 02:17:25 -0000 1.12 @@ -1 +1 @@ -f87d73852fdab33f99beebfd16c21c63 zabbix-1.4.5.tar.gz +4fbea19748b7e9a894a18f4e11b988ca zabbix-1.4.6.tar.gz Index: zabbix-agent.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix-agent.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-agent.init 20 Sep 2007 15:54:08 -0000 1.2 +++ zabbix-agent.init 30 Jul 2008 02:17:25 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix agent daemon # +### BEGIN INIT INFO +# Provides: zabbix-agent +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix agent +# Description: Zabbix Agent +### END INIT INFO + # zabbix details ZABBIX_AGENTD=/usr/sbin/zabbix_agentd CONF=/etc/zabbix/zabbix_agentd.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX_AGENTD ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX_AGENTD ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix-server.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix-server.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-server.init 20 Sep 2007 15:51:49 -0000 1.2 +++ zabbix-server.init 30 Jul 2008 02:17:25 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix server daemon # +### BEGIN INIT INFO +# Provides: zabbix +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix server +# Description: Zabbix Server +### END INIT INFO + # zabbix details ZABBIX=/usr/sbin/zabbix_server CONF=/etc/zabbix/zabbix_server.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- zabbix.spec 2 May 2008 20:52:39 -0000 1.16 +++ zabbix.spec 30 Jul 2008 02:17:25 -0000 1.17 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.4.5 -Release: 2%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -11,7 +11,7 @@ Source2: zabbix-server.init Source3: zabbix-agent.init Source4: zabbix-logrotate.in -Patch0: zabbix-1.4.2-cpustats.patch +Patch0: zabbix-1.4.2-cpustats.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define database mysql @@ -137,10 +137,12 @@ cat misc/conf/zabbix_agentd.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf cat misc/conf/zabbix_server.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \ -e 's|DBUser=root|DBUser=zabbix|g' \ -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \ @@ -250,6 +252,10 @@ %{_datadir}/%{name}/js/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 +- Synchronize with rawhide. + * Fri May 02 2008 Jarod Wilson - 1.4.5-2 - Seems the zabbix folks replaced the original 1.4.5 tarball with an updated tarball or something -- it actually does contain a From fedora-extras-commits at redhat.com Wed Jul 30 02:24:51 2008 From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel)) Date: Wed, 30 Jul 2008 02:24:51 GMT Subject: rpms/dhcpv6/devel .cvsignore, 1.21, 1.22 dhcpv6.spec, 1.92, 1.93 sources, 1.21, 1.22 Message-ID: <200807300224.m6U2Opew015641@cvs-int.fedora.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcpv6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15603 Modified Files: .cvsignore dhcpv6.spec sources Log Message: * Tue Jul 29 2008 David Cantrell - 1.0.21-1 * Upgrade to dhcpv6-1.0.21, changes include: Remove old dadlist variable reference in dhcp6c Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 30 Jul 2008 00:47:19 -0000 1.21 +++ .cvsignore 30 Jul 2008 02:24:21 -0000 1.22 @@ -1 +1 @@ -dhcpv6-1.0.20.tar.gz +dhcpv6-1.0.21.tar.gz Index: dhcpv6.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- dhcpv6.spec 30 Jul 2008 00:47:19 -0000 1.92 +++ dhcpv6.spec 30 Jul 2008 02:24:21 -0000 1.93 @@ -6,7 +6,7 @@ Summary: DHCPv6 - DHCP server and client for IPv6 Name: dhcpv6 -Version: 1.0.20 +Version: 1.0.21 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Daemons @@ -162,6 +162,10 @@ %{_libdir}/libdhcp6client.a %changelog +* Tue Jul 29 2008 David Cantrell - 1.0.21-1 +* Upgrade to dhcpv6-1.0.21, changes include: + Remove old dadlist variable reference in dhcp6c + * Tue Jul 29 2008 David Cantrell - 1.0.20-1 - Upgrade to dhcpv6-1.0.20, changes include: Allow all legal device names in dhcp6c Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 30 Jul 2008 00:47:19 -0000 1.21 +++ sources 30 Jul 2008 02:24:21 -0000 1.22 @@ -1 +1 @@ -131862037e4df15813ac7124f8e6efc7 dhcpv6-1.0.20.tar.gz +bc1df1d0fb75f3bca2c2e97ff7eb4128 dhcpv6-1.0.21.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 02:25:53 2008 From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel)) Date: Wed, 30 Jul 2008 02:25:53 GMT Subject: rpms/dhcpv6/devel dhcpv6.spec,1.93,1.94 Message-ID: <200807300225.m6U2PrDL015700@cvs-int.fedora.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcpv6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15666 Modified Files: dhcpv6.spec Log Message: * Tue Jul 29 2008 David Cantrell - 1.0.21-1 - Upgrade to dhcpv6-1.0.21, changes include: Remove old dadlist variable reference in dhcp6c Index: dhcpv6.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- dhcpv6.spec 30 Jul 2008 02:24:21 -0000 1.93 +++ dhcpv6.spec 30 Jul 2008 02:25:22 -0000 1.94 @@ -163,7 +163,7 @@ %changelog * Tue Jul 29 2008 David Cantrell - 1.0.21-1 -* Upgrade to dhcpv6-1.0.21, changes include: +- Upgrade to dhcpv6-1.0.21, changes include: Remove old dadlist variable reference in dhcp6c * Tue Jul 29 2008 David Cantrell - 1.0.20-1 From fedora-extras-commits at redhat.com Wed Jul 30 02:35:38 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 02:35:38 GMT Subject: rpms/zabbix/EL-4 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 zabbix-agent.init, 1.2, 1.3 zabbix-server.init, 1.2, 1.3 zabbix.spec, 1.19, 1.20 Message-ID: <200807300235.m6U2ZcxR016011@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/zabbix/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15976 Modified Files: .cvsignore sources zabbix-agent.init zabbix-server.init zabbix.spec Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 - Synchronize with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 26 Mar 2008 04:32:32 -0000 1.10 +++ .cvsignore 30 Jul 2008 02:35:08 -0000 1.11 @@ -1 +1 @@ -zabbix-1.4.5.tar.gz +zabbix-1.4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 2 May 2008 20:55:39 -0000 1.11 +++ sources 30 Jul 2008 02:35:08 -0000 1.12 @@ -1 +1 @@ -f87d73852fdab33f99beebfd16c21c63 zabbix-1.4.5.tar.gz +4fbea19748b7e9a894a18f4e11b988ca zabbix-1.4.6.tar.gz Index: zabbix-agent.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-agent.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-agent.init 20 Sep 2007 15:30:42 -0000 1.2 +++ zabbix-agent.init 30 Jul 2008 02:35:08 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix agent daemon # +### BEGIN INIT INFO +# Provides: zabbix-agent +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix agent +# Description: Zabbix Agent +### END INIT INFO + # zabbix details ZABBIX_AGENTD=/usr/sbin/zabbix_agentd CONF=/etc/zabbix/zabbix_agentd.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX_AGENTD ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX_AGENTD ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix-server.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-server.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-server.init 20 Sep 2007 15:30:42 -0000 1.2 +++ zabbix-server.init 30 Jul 2008 02:35:08 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix server daemon # +### BEGIN INIT INFO +# Provides: zabbix +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix server +# Description: Zabbix Server +### END INIT INFO + # zabbix details ZABBIX=/usr/sbin/zabbix_server CONF=/etc/zabbix/zabbix_server.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- zabbix.spec 2 May 2008 20:55:39 -0000 1.19 +++ zabbix.spec 30 Jul 2008 02:35:08 -0000 1.20 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.4.5 -Release: 2%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -11,8 +11,8 @@ Source2: zabbix-server.init Source3: zabbix-agent.init Source4: zabbix-logrotate.in -Patch0: zabbix-1.4.2-netsnmp-x86_64.patch -Patch1: zabbix-1.4.2-cpustats.patch +Patch0: zabbix-1.4.2-netsnmp-x86_64.patch +Patch1: zabbix-1.4.2-cpustats.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define database mysql @@ -141,10 +141,12 @@ cat misc/conf/zabbix_agentd.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf cat misc/conf/zabbix_server.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \ -e 's|DBUser=root|DBUser=zabbix|g' \ -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \ @@ -254,6 +256,10 @@ %{_datadir}/%{name}/js/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 +- Synchronize with rawhide. + * Fri May 02 2008 Jarod Wilson - 1.4.5-2 - Seems the zabbix folks replaced the original 1.4.5 tarball with an updated tarball or something -- it actually does contain a @@ -356,4 +362,3 @@ * Tue Jul 11 2006 Jarod Wilson 1.1-1 - Initial build for Fedora Extras - From fedora-extras-commits at redhat.com Wed Jul 30 02:37:03 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 02:37:03 GMT Subject: rpms/zabbix/F-8 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 zabbix-agent.init, 1.2, 1.3 zabbix-server.init, 1.2, 1.3 zabbix.spec, 1.19, 1.20 Message-ID: <200807300237.m6U2b3cG016127@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/zabbix/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16090 Modified Files: .cvsignore sources zabbix-agent.init zabbix-server.init zabbix.spec Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-8/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Mar 2008 04:37:45 -0000 1.11 +++ .cvsignore 30 Jul 2008 02:36:33 -0000 1.12 @@ -1 +1 @@ -zabbix-1.4.5.tar.gz +zabbix-1.4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 May 2008 20:27:10 -0000 1.12 +++ sources 30 Jul 2008 02:36:33 -0000 1.13 @@ -1 +1 @@ -f87d73852fdab33f99beebfd16c21c63 zabbix-1.4.5.tar.gz +4fbea19748b7e9a894a18f4e11b988ca zabbix-1.4.6.tar.gz Index: zabbix-agent.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-8/zabbix-agent.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-agent.init 22 Aug 2007 02:16:28 -0000 1.2 +++ zabbix-agent.init 30 Jul 2008 02:36:33 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix agent daemon # +### BEGIN INIT INFO +# Provides: zabbix-agent +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix agent +# Description: Zabbix Agent +### END INIT INFO + # zabbix details ZABBIX_AGENTD=/usr/sbin/zabbix_agentd CONF=/etc/zabbix/zabbix_agentd.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX_AGENTD ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX_AGENTD ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix-server.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-8/zabbix-server.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-server.init 22 Aug 2007 02:16:28 -0000 1.2 +++ zabbix-server.init 30 Jul 2008 02:36:33 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix server daemon # +### BEGIN INIT INFO +# Provides: zabbix +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix server +# Description: Zabbix Server +### END INIT INFO + # zabbix details ZABBIX=/usr/sbin/zabbix_server CONF=/etc/zabbix/zabbix_server.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-8/zabbix.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- zabbix.spec 2 May 2008 20:27:10 -0000 1.19 +++ zabbix.spec 30 Jul 2008 02:36:33 -0000 1.20 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.4.5 -Release: 3%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -137,10 +137,12 @@ cat misc/conf/zabbix_agentd.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf cat misc/conf/zabbix_server.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \ -e 's|DBUser=root|DBUser=zabbix|g' \ -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \ @@ -250,6 +252,13 @@ %{_datadir}/%{name}/js/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 + +* Mon Jul 07 2008 Dan Horak - 1.4.5-4 +- add LSB headers into init scripts +- disable internal log rotation + * Fri May 02 2008 Jarod Wilson - 1.4.5-3 - Seems the zabbix folks replaced the original 1.4.5 tarball with an updated tarball or something -- it actually does contain a From fedora-extras-commits at redhat.com Wed Jul 30 02:42:24 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Wed, 30 Jul 2008 02:42:24 GMT Subject: rpms/gnome-session/devel .cvsignore, 1.60, 1.61 gnome-session.spec, 1.177, 1.178 sources, 1.62, 1.63 Message-ID: <200807300242.m6U2gOnN016411@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16353 Modified Files: .cvsignore gnome-session.spec sources Log Message: - New snapshot from DBus branch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 21 Jul 2008 19:59:27 -0000 1.60 +++ .cvsignore 30 Jul 2008 02:41:54 -0000 1.61 @@ -1 +1 @@ -gnome-session-2.23.5.tar.bz2 +gnome-session-2.23.6.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- gnome-session.spec 29 Jul 2008 05:09:32 -0000 1.177 +++ gnome-session.spec 30 Jul 2008 02:41:54 -0000 1.178 @@ -11,8 +11,8 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.23.5 -Release: 0.2008.07.28.1%{?dist} +Version: 2.23.6 +Release: 0.2008.07.29.1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -81,8 +81,6 @@ %patch13 -p1 -b .window-manager #%patch20 -p1 -b .timeout -%patch34 -p1 -b .nautilus -%patch57 -p1 -b .gerror-crash %build @@ -177,6 +175,9 @@ %changelog +* Mon Jul 29 2008 Jon McCann - 2.23.6.0.2008.07.29.1 +- New snapshot from DBus branch + * Mon Jul 28 2008 Jon McCann - 2.23.5.0.2008.07.28.1 - New snapshot from DBus branch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 29 Jul 2008 05:09:32 -0000 1.62 +++ sources 30 Jul 2008 02:41:54 -0000 1.63 @@ -1 +1 @@ -a1eb0e04dd000dcd9503e1e22c79eb48 gnome-session-2.23.5.tar.bz2 +f97021945fd5e262ff05b15093f4065b gnome-session-2.23.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 02:43:52 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 30 Jul 2008 02:43:52 GMT Subject: rpms/eclipse/devel eclipse-addfragmentsforotherplatforms.patch, 1.4, 1.5 Message-ID: <200807300243.m6U2hqdB016538@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16502 Modified Files: eclipse-addfragmentsforotherplatforms.patch Log Message: ia64 -> s390x in addfragments.patch eclipse-addfragmentsforotherplatforms.patch: Index: eclipse-addfragmentsforotherplatforms.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-addfragmentsforotherplatforms.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eclipse-addfragmentsforotherplatforms.patch 22 Jul 2008 17:28:14 -0000 1.4 +++ eclipse-addfragmentsforotherplatforms.patch 30 Jul 2008 02:43:22 -0000 1.5 @@ -1,27 +1,19 @@ -diff -up ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml ---- ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments 2008-07-22 13:19:59.000000000 -0400 -+++ ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-07-22 13:22:04.000000000 -0400 -@@ -101,6 +101,7 @@ - - - -+ - - - -@@ -183,6 +184,7 @@ +diff -up ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml +--- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments 2008-07-29 22:37:12.000000000 -0400 ++++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2008-07-29 22:39:36.000000000 -0400 +@@ -184,6 +184,7 @@ -+ ++ -@@ -790,6 +792,10 @@ +@@ -791,6 +792,10 @@ -+ ++ + + + From fedora-extras-commits at redhat.com Wed Jul 30 02:55:37 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 02:55:37 GMT Subject: rpms/zabbix/F-9 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 zabbix-agent.init, 1.2, 1.3 zabbix-server.init, 1.2, 1.3 zabbix.spec, 1.22, 1.23 Message-ID: <200807300255.m6U2tbVS016852@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/zabbix/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16822 Modified Files: .cvsignore sources zabbix-agent.init zabbix-server.init zabbix.spec Log Message: * Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Mar 2008 02:35:49 -0000 1.11 +++ .cvsignore 30 Jul 2008 02:55:07 -0000 1.12 @@ -1 +1 @@ -zabbix-1.4.5.tar.gz +zabbix-1.4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 May 2008 19:13:08 -0000 1.12 +++ sources 30 Jul 2008 02:55:07 -0000 1.13 @@ -1 +1 @@ -f87d73852fdab33f99beebfd16c21c63 zabbix-1.4.5.tar.gz +4fbea19748b7e9a894a18f4e11b988ca zabbix-1.4.6.tar.gz Index: zabbix-agent.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-9/zabbix-agent.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-agent.init 22 Aug 2007 02:16:28 -0000 1.2 +++ zabbix-agent.init 30 Jul 2008 02:55:07 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix agent daemon # +### BEGIN INIT INFO +# Provides: zabbix-agent +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix agent +# Description: Zabbix Agent +### END INIT INFO + # zabbix details ZABBIX_AGENTD=/usr/sbin/zabbix_agentd CONF=/etc/zabbix/zabbix_agentd.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX_AGENTD ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX_AGENTD ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix-server.init =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-9/zabbix-server.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix-server.init 22 Aug 2007 02:16:28 -0000 1.2 +++ zabbix-server.init 30 Jul 2008 02:55:07 -0000 1.3 @@ -4,6 +4,16 @@ # description: zabbix server daemon # +### BEGIN INIT INFO +# Provides: zabbix +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop zabbix server +# Description: Zabbix Server +### END INIT INFO + # zabbix details ZABBIX=/usr/sbin/zabbix_server CONF=/etc/zabbix/zabbix_server.conf @@ -18,8 +28,8 @@ # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -[ -x $ZABBIX ] || exit 0 -[ -e $CONF ] || exit 0 +[ -x $ZABBIX ] || exit 5 +[ -e $CONF ] || exit 6 RETVAL=0 Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/F-9/zabbix.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- zabbix.spec 2 May 2008 19:13:08 -0000 1.22 +++ zabbix.spec 30 Jul 2008 02:55:07 -0000 1.23 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.4.5 -Release: 3%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -137,10 +137,12 @@ cat misc/conf/zabbix_agentd.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf cat misc/conf/zabbix_server.conf | sed \ -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \ -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \ + -e 's|#LogFileSize=.*|LogFileSize=0|g' \ -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \ -e 's|DBUser=root|DBUser=zabbix|g' \ -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \ @@ -250,6 +252,13 @@ %{_datadir}/%{name}/js/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.4.6-1 +- Update to 1.4.6 + +* Mon Jul 07 2008 Dan Horak - 1.4.5-4 +- add LSB headers into init scripts +- disable internal log rotation + * Fri May 02 2008 Jarod Wilson - 1.4.5-3 - Seems the zabbix folks replaced the original 1.4.5 tarball with an updated tarball or something -- it actually does contain a From fedora-extras-commits at redhat.com Wed Jul 30 03:07:02 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Wed, 30 Jul 2008 03:07:02 GMT Subject: rpms/jruby/devel jruby-fix-jruby-start-script.patch, 1.1, 1.2 jruby.spec, 1.5, 1.6 Message-ID: <200807300307.m6U372tc023726@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jruby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23697 Modified Files: jruby-fix-jruby-start-script.patch jruby.spec Log Message: * Tue Jul 29 2008 Conrad Meyer - 1.1.3-2 - Update jruby-fix-jruby-start-script.patch to work with faster class-loading mechanism introduced in JRuby 1.1.2. jruby-fix-jruby-start-script.patch: Index: jruby-fix-jruby-start-script.patch =================================================================== RCS file: /cvs/pkgs/rpms/jruby/devel/jruby-fix-jruby-start-script.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jruby-fix-jruby-start-script.patch 25 Apr 2008 02:38:18 -0000 1.1 +++ jruby-fix-jruby-start-script.patch 30 Jul 2008 03:06:32 -0000 1.2 @@ -1,17 +1,19 @@ ---- bin/jruby.orig 2008-04-05 17:59:31.000000000 -0700 -+++ bin/jruby 2008-04-05 19:01:29.000000000 -0700 -@@ -9,10 +9,14 @@ - # - # JAVA_HOME Must point at your Java Development Kit installation. - # - # ----------------------------------------------------------------------------- +--- bin/jruby.orig 2008-07-18 22:12:22.000000000 -0700 ++++ bin/jruby 2008-07-29 19:55:28.000000000 -0700 +@@ -67,10 +67,16 @@ + else + JRUBY_CP="$j" + fi + done -+CLASSPATH=$(build-classpath objectweb-asm/asm objectweb-asm/asm-util \ -+ objectweb-asm/asm-analysis objectweb-asm/asm-tree joni \ -+ joda-time jline bytelist jna-posix jvyamlb) ++j=$(build-classpath objectweb-asm/asm objectweb-asm/asm-util \ ++ objectweb-asm/asm-analysis objectweb-asm/asm-tree joni joda-time jline \ ++ bytelist jna-posix jvyamlb) + - cygwin=false ++JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j" ++ + if $cygwin; then + JRUBY_CP=`cygpath -p -w "$JRUBY_CP"` + fi - # ----- Identify OS we are running under -------------------------------------- - case "`uname`" in - CYGWIN*) cygwin=true + # ----- Set Up The System Classpath ------------------------------------------- Index: jruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/jruby/devel/jruby.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jruby.spec 19 Jul 2008 12:49:40 -0000 1.5 +++ jruby.spec 30 Jul 2008 03:06:32 -0000 1.6 @@ -1,6 +1,6 @@ Name: jruby Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pure Java implementation of the Ruby interpreter Group: Development/Languages @@ -152,6 +152,10 @@ %changelog +* Tue Jul 29 2008 Conrad Meyer - 1.1.3-2 +- Update jruby-fix-jruby-start-script.patch to work with faster + class-loading mechanism introduced in JRuby 1.1.2. + * Sat Jul 19 2008 Conrad Meyer - 1.1.3-1 - Bump to 1.1.3. From fedora-extras-commits at redhat.com Wed Jul 30 03:09:47 2008 From: fedora-extras-commits at redhat.com (Conrad Meyer (konradm)) Date: Wed, 30 Jul 2008 03:09:47 GMT Subject: rpms/jruby/F-9 jruby-fix-jruby-start-script.patch, 1.1, 1.2 jruby.spec, 1.5, 1.6 Message-ID: <200807300309.m6U39lqV023837@cvs-int.fedora.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jruby/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23806 Modified Files: jruby-fix-jruby-start-script.patch jruby.spec Log Message: * Tue Jul 29 2008 Conrad Meyer - 1.1.3-2 - Update jruby-fix-jruby-start-script.patch to work with faster class-loading mechanism introduced in JRuby 1.1.2. jruby-fix-jruby-start-script.patch: Index: jruby-fix-jruby-start-script.patch =================================================================== RCS file: /cvs/pkgs/rpms/jruby/F-9/jruby-fix-jruby-start-script.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jruby-fix-jruby-start-script.patch 25 Apr 2008 02:38:28 -0000 1.1 +++ jruby-fix-jruby-start-script.patch 30 Jul 2008 03:09:17 -0000 1.2 @@ -1,17 +1,19 @@ ---- bin/jruby.orig 2008-04-05 17:59:31.000000000 -0700 -+++ bin/jruby 2008-04-05 19:01:29.000000000 -0700 -@@ -9,10 +9,14 @@ - # - # JAVA_HOME Must point at your Java Development Kit installation. - # - # ----------------------------------------------------------------------------- +--- bin/jruby.orig 2008-07-18 22:12:22.000000000 -0700 ++++ bin/jruby 2008-07-29 19:55:28.000000000 -0700 +@@ -67,10 +67,16 @@ + else + JRUBY_CP="$j" + fi + done -+CLASSPATH=$(build-classpath objectweb-asm/asm objectweb-asm/asm-util \ -+ objectweb-asm/asm-analysis objectweb-asm/asm-tree joni \ -+ joda-time jline bytelist jna-posix jvyamlb) ++j=$(build-classpath objectweb-asm/asm objectweb-asm/asm-util \ ++ objectweb-asm/asm-analysis objectweb-asm/asm-tree joni joda-time jline \ ++ bytelist jna-posix jvyamlb) + - cygwin=false ++JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j" ++ + if $cygwin; then + JRUBY_CP=`cygpath -p -w "$JRUBY_CP"` + fi - # ----- Identify OS we are running under -------------------------------------- - case "`uname`" in - CYGWIN*) cygwin=true + # ----- Set Up The System Classpath ------------------------------------------- Index: jruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/jruby/F-9/jruby.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jruby.spec 21 Jul 2008 18:01:04 -0000 1.5 +++ jruby.spec 30 Jul 2008 03:09:17 -0000 1.6 @@ -1,6 +1,6 @@ Name: jruby Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pure Java implementation of the Ruby interpreter Group: Development/Languages @@ -152,6 +152,10 @@ %changelog +* Tue Jul 29 2008 Conrad Meyer - 1.1.3-2 +- Update jruby-fix-jruby-start-script.patch to work with faster + class-loading mechanism introduced in JRuby 1.1.2. + * Sat Jul 19 2008 Conrad Meyer - 1.1.3-1 - Bump to 1.1.3. From fedora-extras-commits at redhat.com Wed Jul 30 03:40:55 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 03:40:55 GMT Subject: rpms/pcmanfm/devel pcmanfm-0.5-icon-fallback.patch, NONE, 1.1 pcmanfm.spec, 1.23, 1.24 Message-ID: <200807300340.m6U3etjV024442@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24412 Modified Files: pcmanfm.spec Added Files: pcmanfm-0.5-icon-fallback.patch Log Message: * Wed Jul 30 2008 Mamoru Tasaka - 0.5-3 - Mora fallback for gnome-icon-theme 2.23.X (F-10) pcmanfm-0.5-icon-fallback.patch: --- NEW FILE pcmanfm-0.5-icon-fallback.patch --- --- pcmanfm-0.5/src/vfs/vfs-mime-type.c.debug 2008-07-30 10:34:54.000000000 +0900 +++ pcmanfm-0.5/src/vfs/vfs-mime-type.c 2008-07-30 12:34:35.000000000 +0900 @@ -278,6 +278,59 @@ } } + /* + Ugly hack begin - For gnome-icon-theme 2.23.x + */ + + if (!icon) + { + char *mime_t = mime_type ->type; + if (strstr(mime_t, "audio/") == mime_t) + icon = vfs_load_icon ( icon_theme, "audio-x-generic", size ); + if (strstr(mime_t, "image/") == mime_t) + icon = vfs_load_icon ( icon_theme, "image-x-generic", size ); + if (strstr(mime_t, "text/") == mime_t) + icon = vfs_load_icon ( icon_theme, "text-x-generic", size ); + if (strstr(mime_t, "video/") == mime_t) + icon = vfs_load_icon ( icon_theme, "video-x-generic", size ); + + if (strstr(mime_t, "-cert")) + icon = vfs_load_icon ( icon_theme, "application-certificate", size); + if ( + strstr(mime_t, "-archive") || + strstr(mime_t, "compressed") || +#if 1 + strstr(mime_t, "gzip") || + strstr(mime_t, "bzip2") || +#endif + strstr(mime_t, "x-rpm") || + strstr(mime_t, "x-tar") + ) + icon = vfs_load_icon ( icon_theme, "package-x-generic", size); + if (strstr(mime_t, "/xml")) + icon = vfs_load_icon ( icon_theme, "text-x-generic", size); + if (strstr(mime_t, "/msword")) + icon = vfs_load_icon ( icon_theme, "x-office-document", size); + if (strstr(mime_t, "presentation")) + icon = vfs_load_icon ( icon_theme, "x-office-presentation", size); + if ( + strstr(mime_t, "script") || + strstr(mime_t, "x-perl") || + strstr(mime_t, "x-ruby") + ) + icon = vfs_load_icon ( icon_theme, "text-x-script", size); + + if (strstr(mime_t, "opendocument")) + icon = vfs_load_icon ( icon_theme, "x-office-document", size); + + + } + + /* fallback */ + if (!icon) + icon = vfs_load_icon ( icon_theme, "gtk-file", size ); + + if ( big ) mime_type->big_icon = icon; else Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pcmanfm.spec 29 Jul 2008 16:31:36 -0000 1.23 +++ pcmanfm.spec 30 Jul 2008 03:40:25 -0000 1.24 @@ -3,7 +3,7 @@ Name: pcmanfm Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extremly fast and lightweight file manager Group: User Interface/Desktops @@ -11,6 +11,7 @@ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz Patch0: pcmanfm-0.5-kill-find-immediately.patch +Patch1: pcmanfm-0.5-icon-fallback.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -65,6 +66,7 @@ replace_icon gnome-mime-application-x-executable \ application-x-executable +%patch1 -p1 -b .icon_ %endif # permission fix @@ -132,6 +134,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Wed Jul 30 2008 Mamoru Tasaka - 0.5-3 +- Mora fallback for gnome-icon-theme 2.23.X (F-10) + * Tue Jul 29 2008 Mamoru Tasaka - 0.5-2 - F-10+: Use more generic icon name due to gnome-icon-theme 2.23.X change First try (need more fix) From fedora-extras-commits at redhat.com Wed Jul 30 03:42:48 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 03:42:48 GMT Subject: rpms/pcmanfm/devel pcmanfm.spec,1.24,1.25 Message-ID: <200807300342.m6U3gmrr024557@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24526 Modified Files: pcmanfm.spec Log Message: fix typo Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pcmanfm.spec 30 Jul 2008 03:40:25 -0000 1.24 +++ pcmanfm.spec 30 Jul 2008 03:42:17 -0000 1.25 @@ -135,7 +135,7 @@ %changelog * Wed Jul 30 2008 Mamoru Tasaka - 0.5-3 -- Mora fallback for gnome-icon-theme 2.23.X (F-10) +- More fallback for gnome-icon-theme 2.23.X (F-10) * Tue Jul 29 2008 Mamoru Tasaka - 0.5-2 - F-10+: Use more generic icon name due to gnome-icon-theme 2.23.X change From fedora-extras-commits at redhat.com Wed Jul 30 04:25:28 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 04:25:28 GMT Subject: rpms/pcmanfm/devel pcmanfm-0.5-icon-fallback.patch, 1.1, 1.2 pcmanfm.spec, 1.25, 1.26 Message-ID: <200807300425.m6U4PSGq000564@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv531 Modified Files: pcmanfm-0.5-icon-fallback.patch pcmanfm.spec Log Message: Remove final fallback for now pcmanfm-0.5-icon-fallback.patch: Index: pcmanfm-0.5-icon-fallback.patch =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm-0.5-icon-fallback.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pcmanfm-0.5-icon-fallback.patch 30 Jul 2008 03:40:25 -0000 1.1 +++ pcmanfm-0.5-icon-fallback.patch 30 Jul 2008 04:24:57 -0000 1.2 @@ -1,6 +1,6 @@ ---- pcmanfm-0.5/src/vfs/vfs-mime-type.c.debug 2008-07-30 10:34:54.000000000 +0900 -+++ pcmanfm-0.5/src/vfs/vfs-mime-type.c 2008-07-30 12:34:35.000000000 +0900 -@@ -278,6 +278,59 @@ +--- pcmanfm-0.5/src/vfs/vfs-mime-type.c.icon_ 2008-07-30 13:05:02.000000000 +0900 ++++ pcmanfm-0.5/src/vfs/vfs-mime-type.c 2008-07-30 13:21:48.000000000 +0900 +@@ -278,6 +278,61 @@ } } @@ -53,8 +53,10 @@ + } + + /* fallback */ ++#if 0 + if (!icon) + icon = vfs_load_icon ( icon_theme, "gtk-file", size ); ++#endif + + if ( big ) Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- pcmanfm.spec 30 Jul 2008 03:42:17 -0000 1.25 +++ pcmanfm.spec 30 Jul 2008 04:24:57 -0000 1.26 @@ -3,7 +3,7 @@ Name: pcmanfm Version: 0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Extremly fast and lightweight file manager Group: User Interface/Desktops @@ -134,7 +134,7 @@ %{_datadir}/mime/packages/*.xml %changelog -* Wed Jul 30 2008 Mamoru Tasaka - 0.5-3 +* Wed Jul 30 2008 Mamoru Tasaka - 0.5-4 - More fallback for gnome-icon-theme 2.23.X (F-10) * Tue Jul 29 2008 Mamoru Tasaka - 0.5-2 From fedora-extras-commits at redhat.com Wed Jul 30 04:33:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 30 Jul 2008 04:33:29 GMT Subject: rpms/python-migrate/devel python-migrate-migrate_repository.patch, NONE, 1.1 python-migrate-sqlalchemy-migrate.patch, NONE, 1.1 python-migrate.spec, 1.4, 1.5 Message-ID: <200807300433.m6U4XT4Z001119@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1064 Modified Files: python-migrate.spec Added Files: python-migrate-migrate_repository.patch python-migrate-sqlalchemy-migrate.patch Log Message: * Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 - Patch to generate a script for the repository migrate script. - Move the script rename into a patch to setup.py. python-migrate-migrate_repository.patch: --- NEW FILE python-migrate-migrate_repository.patch --- Index: setup.py =================================================================== --- setup.py (revision 444) +++ setup.py (working copy) @@ -35,6 +35,7 @@ entry_points = """ [console_scripts] migrate = migrate.versioning.shell:main + migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) Index: migrate/versioning/migrate_repository.py =================================================================== --- migrate/versioning/migrate_repository.py (revision 444) +++ migrate/versioning/migrate_repository.py (working copy) @@ -4,7 +4,7 @@ def usage(): - + print '''Usage: %(prog)s repository-to-migrate Upgrade your repository to the new flat format. @@ -28,8 +28,8 @@ def deleteDirectory(dirpath): print ' Deleting directory: %s' % dirpath os.rmdir(dirpath) - + def migrate_repository(repos): print 'Migrating repository at: %s to new format' % repos versions = '%s/versions' % repos @@ -42,11 +42,11 @@ files = os.listdir(origdir) files.sort() for file in files: - + # Delete compiled Python files. if file.endswith('.pyc') or file.endswith('.pyo'): deleteFile('%s/%s' % (origdir, file)) - + # Delete empty __init__.py files. origfile = '%s/__init__.py' % origdir if os.path.exists(origfile) and len(open(origfile).read()) == 0: @@ -69,10 +69,12 @@ # Try to remove directory. Will fail if it's not empty. deleteDirectory(origdir) - -if __name__ == '__main__': + +def main(): if len(sys.argv) != 2: usage() migrate_repository(sys.argv[1]) +if __name__ == '__main__': + main() python-migrate-sqlalchemy-migrate.patch: --- NEW FILE python-migrate-sqlalchemy-migrate.patch --- Index: sqlalchemy-migrate-0.4.5/setup.py =================================================================== --- sqlalchemy-migrate-0.4.5.orig/setup.py +++ sqlalchemy-migrate-0.4.5/setup.py @@ -34,8 +34,8 @@ Migrate extends SQLAlchemy to have datab entry_points = """ [console_scripts] - migrate = migrate.versioning.shell:main - migrate-repository = migrate.versioning.migrate_repository:main + sqlalchemy-migrate = migrate.versioning.shell:main + sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-migrate.spec 27 Jul 2008 21:52:47 -0000 1.4 +++ python-migrate.spec 30 Jul 2008 04:32:59 -0000 1.5 @@ -4,7 +4,7 @@ Name: python-migrate Version: 0.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages @@ -12,7 +12,11 @@ URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Local patch to disable py.test. Needed until py.test is in Fedora. -Patch1: python-migrate-disable-pytest.patch +Patch0: python-migrate-disable-pytest.patch +# Patch sent upstream to generate a script for the repository upgrade script +Patch1: python-migrate-migrate_repository.patch +# Local patch to rename /usr/bin/migrate to sqlalchemy-migrate +Patch2: python-migrate-sqlalchemy-migrate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,6 +24,7 @@ BuildRequires: python-devel BuildRequires: python-setuptools-devel Requires: python-sqlalchemy >= 0.3.10 +Requires: python-setuptools %description Schema migration tools for SQLAlchemy designed to support an agile approach @@ -29,7 +34,9 @@ %prep %setup -q -n %{srcname}-%{version} -%patch1 -p1 -b .pytest +%patch0 -p1 -b .pytest +%patch1 -p0 -b .repomigrate +%patch2 -p1 -b .rename %build %{__python} setup.py build @@ -37,7 +44,6 @@ %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} -%{__mv} %{buildroot}%{_bindir}/migrate %{buildroot}%{_bindir}/sqlalchemy-migrate %clean %{__rm} -rf %{buildroot} @@ -52,10 +58,14 @@ %files %defattr(-,root,root,-) %doc README CHANGELOG docs/ -%{_bindir}/sqlalchemy-migrate +%{_bindir}/* %{python_sitelib}/* %changelog +* Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 +- Patch to generate a script for the repository migrate script. +- Move the script rename into a patch to setup.py. + * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. From fedora-extras-commits at redhat.com Wed Jul 30 04:37:14 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 30 Jul 2008 04:37:14 GMT Subject: rpms/python-migrate/EL-5 python-migrate-migrate_repository.patch, NONE, 1.1 python-migrate-sqlalchemy-migrate.patch, NONE, 1.1 Message-ID: <200807300437.m6U4bEf2001306@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1290/EL-5 Added Files: python-migrate-migrate_repository.patch python-migrate-sqlalchemy-migrate.patch Log Message: * Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 - Patch to generate a script for the repository migrate script. - Move the script rename into a patch to setup.py. python-migrate-migrate_repository.patch: --- NEW FILE python-migrate-migrate_repository.patch --- Index: setup.py =================================================================== --- setup.py (revision 444) +++ setup.py (working copy) @@ -35,6 +35,7 @@ entry_points = """ [console_scripts] migrate = migrate.versioning.shell:main + migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) Index: migrate/versioning/migrate_repository.py =================================================================== --- migrate/versioning/migrate_repository.py (revision 444) +++ migrate/versioning/migrate_repository.py (working copy) @@ -4,7 +4,7 @@ def usage(): - + print '''Usage: %(prog)s repository-to-migrate Upgrade your repository to the new flat format. @@ -28,8 +28,8 @@ def deleteDirectory(dirpath): print ' Deleting directory: %s' % dirpath os.rmdir(dirpath) - + def migrate_repository(repos): print 'Migrating repository at: %s to new format' % repos versions = '%s/versions' % repos @@ -42,11 +42,11 @@ files = os.listdir(origdir) files.sort() for file in files: - + # Delete compiled Python files. if file.endswith('.pyc') or file.endswith('.pyo'): deleteFile('%s/%s' % (origdir, file)) - + # Delete empty __init__.py files. origfile = '%s/__init__.py' % origdir if os.path.exists(origfile) and len(open(origfile).read()) == 0: @@ -69,10 +69,12 @@ # Try to remove directory. Will fail if it's not empty. deleteDirectory(origdir) - -if __name__ == '__main__': + +def main(): if len(sys.argv) != 2: usage() migrate_repository(sys.argv[1]) +if __name__ == '__main__': + main() python-migrate-sqlalchemy-migrate.patch: --- NEW FILE python-migrate-sqlalchemy-migrate.patch --- Index: sqlalchemy-migrate-0.4.5/setup.py =================================================================== --- sqlalchemy-migrate-0.4.5.orig/setup.py +++ sqlalchemy-migrate-0.4.5/setup.py @@ -34,8 +34,8 @@ Migrate extends SQLAlchemy to have datab entry_points = """ [console_scripts] - migrate = migrate.versioning.shell:main - migrate-repository = migrate.versioning.migrate_repository:main + sqlalchemy-migrate = migrate.versioning.shell:main + sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) From fedora-extras-commits at redhat.com Wed Jul 30 04:37:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 30 Jul 2008 04:37:44 GMT Subject: rpms/python-migrate/F-8 python-migrate-migrate_repository.patch, NONE, 1.1 python-migrate-sqlalchemy-migrate.patch, NONE, 1.1 python-migrate.spec, 1.3, 1.4 Message-ID: <200807300437.m6U4bi50001364@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1290/F-8 Modified Files: python-migrate.spec Added Files: python-migrate-migrate_repository.patch python-migrate-sqlalchemy-migrate.patch Log Message: * Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 - Patch to generate a script for the repository migrate script. - Move the script rename into a patch to setup.py. python-migrate-migrate_repository.patch: --- NEW FILE python-migrate-migrate_repository.patch --- Index: setup.py =================================================================== --- setup.py (revision 444) +++ setup.py (working copy) @@ -35,6 +35,7 @@ entry_points = """ [console_scripts] migrate = migrate.versioning.shell:main + migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) Index: migrate/versioning/migrate_repository.py =================================================================== --- migrate/versioning/migrate_repository.py (revision 444) +++ migrate/versioning/migrate_repository.py (working copy) @@ -4,7 +4,7 @@ def usage(): - + print '''Usage: %(prog)s repository-to-migrate Upgrade your repository to the new flat format. @@ -28,8 +28,8 @@ def deleteDirectory(dirpath): print ' Deleting directory: %s' % dirpath os.rmdir(dirpath) - + def migrate_repository(repos): print 'Migrating repository at: %s to new format' % repos versions = '%s/versions' % repos @@ -42,11 +42,11 @@ files = os.listdir(origdir) files.sort() for file in files: - + # Delete compiled Python files. if file.endswith('.pyc') or file.endswith('.pyo'): deleteFile('%s/%s' % (origdir, file)) - + # Delete empty __init__.py files. origfile = '%s/__init__.py' % origdir if os.path.exists(origfile) and len(open(origfile).read()) == 0: @@ -69,10 +69,12 @@ # Try to remove directory. Will fail if it's not empty. deleteDirectory(origdir) - -if __name__ == '__main__': + +def main(): if len(sys.argv) != 2: usage() migrate_repository(sys.argv[1]) +if __name__ == '__main__': + main() python-migrate-sqlalchemy-migrate.patch: --- NEW FILE python-migrate-sqlalchemy-migrate.patch --- Index: sqlalchemy-migrate-0.4.5/setup.py =================================================================== --- sqlalchemy-migrate-0.4.5.orig/setup.py +++ sqlalchemy-migrate-0.4.5/setup.py @@ -34,8 +34,8 @@ Migrate extends SQLAlchemy to have datab entry_points = """ [console_scripts] - migrate = migrate.versioning.shell:main - migrate-repository = migrate.versioning.migrate_repository:main + sqlalchemy-migrate = migrate.versioning.shell:main + sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-8/python-migrate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-migrate.spec 27 Jul 2008 22:00:48 -0000 1.3 +++ python-migrate.spec 30 Jul 2008 04:37:14 -0000 1.4 @@ -4,7 +4,7 @@ Name: python-migrate Version: 0.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages @@ -12,7 +12,11 @@ URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Local patch to disable py.test. Needed until py.test is in Fedora. -Patch1: python-migrate-disable-pytest.patch +Patch0: python-migrate-disable-pytest.patch +# Patch sent upstream to generate a script for the repository upgrade script +Patch1: python-migrate-migrate_repository.patch +# Local patch to rename /usr/bin/migrate to sqlalchemy-migrate +Patch2: python-migrate-sqlalchemy-migrate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,6 +24,7 @@ BuildRequires: python-devel BuildRequires: python-setuptools-devel Requires: python-sqlalchemy >= 0.3.10 +Requires: python-setuptools %description Schema migration tools for SQLAlchemy designed to support an agile approach @@ -29,7 +34,9 @@ %prep %setup -q -n %{srcname}-%{version} -%patch1 -p1 -b .pytest +%patch0 -p1 -b .pytest +%patch1 -p0 -b .repomigrate +%patch2 -p1 -b .rename %build %{__python} setup.py build @@ -37,7 +44,6 @@ %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} -%{__mv} %{buildroot}%{_bindir}/migrate %{buildroot}%{_bindir}/sqlalchemy-migrate %clean %{__rm} -rf %{buildroot} @@ -52,10 +58,14 @@ %files %defattr(-,root,root,-) %doc README CHANGELOG docs/ -%{_bindir}/sqlalchemy-migrate +%{_bindir}/* %{python_sitelib}/* %changelog +* Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 +- Patch to generate a script for the repository migrate script. +- Move the script rename into a patch to setup.py. + * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. From fedora-extras-commits at redhat.com Wed Jul 30 04:37:45 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 30 Jul 2008 04:37:45 GMT Subject: rpms/python-migrate/F-9 python-migrate-migrate_repository.patch, NONE, 1.1 python-migrate-sqlalchemy-migrate.patch, NONE, 1.1 python-migrate.spec, 1.3, 1.4 Message-ID: <200807300437.m6U4bjnt001370@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1290/F-9 Modified Files: python-migrate.spec Added Files: python-migrate-migrate_repository.patch python-migrate-sqlalchemy-migrate.patch Log Message: * Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 - Patch to generate a script for the repository migrate script. - Move the script rename into a patch to setup.py. python-migrate-migrate_repository.patch: --- NEW FILE python-migrate-migrate_repository.patch --- Index: setup.py =================================================================== --- setup.py (revision 444) +++ setup.py (working copy) @@ -35,6 +35,7 @@ entry_points = """ [console_scripts] migrate = migrate.versioning.shell:main + migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) Index: migrate/versioning/migrate_repository.py =================================================================== --- migrate/versioning/migrate_repository.py (revision 444) +++ migrate/versioning/migrate_repository.py (working copy) @@ -4,7 +4,7 @@ def usage(): - + print '''Usage: %(prog)s repository-to-migrate Upgrade your repository to the new flat format. @@ -28,8 +28,8 @@ def deleteDirectory(dirpath): print ' Deleting directory: %s' % dirpath os.rmdir(dirpath) - + def migrate_repository(repos): print 'Migrating repository at: %s to new format' % repos versions = '%s/versions' % repos @@ -42,11 +42,11 @@ files = os.listdir(origdir) files.sort() for file in files: - + # Delete compiled Python files. if file.endswith('.pyc') or file.endswith('.pyo'): deleteFile('%s/%s' % (origdir, file)) - + # Delete empty __init__.py files. origfile = '%s/__init__.py' % origdir if os.path.exists(origfile) and len(open(origfile).read()) == 0: @@ -69,10 +69,12 @@ # Try to remove directory. Will fail if it's not empty. deleteDirectory(origdir) - -if __name__ == '__main__': + +def main(): if len(sys.argv) != 2: usage() migrate_repository(sys.argv[1]) +if __name__ == '__main__': + main() python-migrate-sqlalchemy-migrate.patch: --- NEW FILE python-migrate-sqlalchemy-migrate.patch --- Index: sqlalchemy-migrate-0.4.5/setup.py =================================================================== --- sqlalchemy-migrate-0.4.5.orig/setup.py +++ sqlalchemy-migrate-0.4.5/setup.py @@ -34,8 +34,8 @@ Migrate extends SQLAlchemy to have datab entry_points = """ [console_scripts] - migrate = migrate.versioning.shell:main - migrate-repository = migrate.versioning.migrate_repository:main + sqlalchemy-migrate = migrate.versioning.shell:main + sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main """, test_suite = "py.test.cmdline.main", ) Index: python-migrate.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-migrate/F-9/python-migrate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-migrate.spec 27 Jul 2008 22:00:48 -0000 1.3 +++ python-migrate.spec 30 Jul 2008 04:37:14 -0000 1.4 @@ -4,7 +4,7 @@ Name: python-migrate Version: 0.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages @@ -12,7 +12,11 @@ URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Local patch to disable py.test. Needed until py.test is in Fedora. -Patch1: python-migrate-disable-pytest.patch +Patch0: python-migrate-disable-pytest.patch +# Patch sent upstream to generate a script for the repository upgrade script +Patch1: python-migrate-migrate_repository.patch +# Local patch to rename /usr/bin/migrate to sqlalchemy-migrate +Patch2: python-migrate-sqlalchemy-migrate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,6 +24,7 @@ BuildRequires: python-devel BuildRequires: python-setuptools-devel Requires: python-sqlalchemy >= 0.3.10 +Requires: python-setuptools %description Schema migration tools for SQLAlchemy designed to support an agile approach @@ -29,7 +34,9 @@ %prep %setup -q -n %{srcname}-%{version} -%patch1 -p1 -b .pytest +%patch0 -p1 -b .pytest +%patch1 -p0 -b .repomigrate +%patch2 -p1 -b .rename %build %{__python} setup.py build @@ -37,7 +44,6 @@ %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} -%{__mv} %{buildroot}%{_bindir}/migrate %{buildroot}%{_bindir}/sqlalchemy-migrate %clean %{__rm} -rf %{buildroot} @@ -52,10 +58,14 @@ %files %defattr(-,root,root,-) %doc README CHANGELOG docs/ -%{_bindir}/sqlalchemy-migrate +%{_bindir}/* %{python_sitelib}/* %changelog +* Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 +- Patch to generate a script for the repository migrate script. +- Move the script rename into a patch to setup.py. + * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. From fedora-extras-commits at redhat.com Wed Jul 30 04:40:12 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 30 Jul 2008 04:40:12 GMT Subject: rpms/python-migrate/EL-5 python-migrate-disable-pytest.patch, NONE, 1.1 python-migrate.spec, NONE, 1.1 Message-ID: <200807300440.m6U4eCUW001572@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-migrate/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1557 Added Files: python-migrate-disable-pytest.patch python-migrate.spec Log Message: Initial import... done in other branches but not EL-5 yet. python-migrate-disable-pytest.patch: --- NEW FILE python-migrate-disable-pytest.patch --- Index: sqlalchemy-migrate-0.4.4/setup.py =================================================================== --- sqlalchemy-migrate-0.4.4.orig/setup.py +++ sqlalchemy-migrate-0.4.4/setup.py @@ -20,7 +20,7 @@ Migrate extends SQLAlchemy to have datab """, install_requires = ['sqlalchemy >= 0.3.10'], - setup_requires = ['py >= 0.9.0-beta'], + setup_requires = [], dependency_links = [ "http://codespeak.net/download/py/", ], --- NEW FILE python-migrate.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define srcname sqlalchemy-migrate Name: python-migrate Version: 0.4.5 Release: 3%{?dist} Summary: Schema migration tools for SQLAlchemy Group: Development/Languages License: MIT URL: http://code.google.com/p/%{srcname}/ Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz # Local patch to disable py.test. Needed until py.test is in Fedora. Patch0: python-migrate-disable-pytest.patch # Patch sent upstream to generate a script for the repository upgrade script Patch1: python-migrate-migrate_repository.patch # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate Patch2: python-migrate-sqlalchemy-migrate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel Requires: python-sqlalchemy >= 0.3.10 Requires: python-setuptools %description Schema migration tools for SQLAlchemy designed to support an agile approach to database design and make it easier to keep development and production databases in sync as schema changes are required. It allows you to manage atabase change sets and database repository versioning. %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .pytest %patch1 -p0 -b .repomigrate %patch2 -p1 -b .rename %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %clean %{__rm} -rf %{buildroot} # Check needs py.test in order to run #%check #echo 'sqlite:///__tmp__' > test_db.cfg # setuptools doesn't appear to be compatible with py.test # %{__python} setup.py test #%{__python} -c 'from py.test.cmdline import main; main(["test"])' %files %defattr(-,root,root,-) %doc README CHANGELOG docs/ %{_bindir}/* %{python_sitelib}/* %changelog * Tue Jul 29 2008 Toshio Kuratomi 0.4.5-3 - Patch to generate a script for the repository migrate script. - Move the script rename into a patch to setup.py. * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-2 - Remove patches that are merged upstream. * Thu Jul 17 2008 Toshio Kuratomi 0.4.5-1 - New upstream * Thu Jul 17 2008 Toshio Kuratomi 0.4.4-4 - Disable py.test so we don't try to download it during build. * Tue Jul 15 2008 Toshio Kuratomi 0.4.4-3 - Rename binary to sqlalchemy-migrate to avoid potential filename clashes. (Queried upstream but the change is only in Fedora). Noted that openmosix defintely has a /usr/bin/migrate already. * Sat Jul 06 2008 Ricky Zhou 0.4.4-2 - Add BuildRequires on python-setuptools-devel. - Add Requires on SQLAlchemy. * Sat Jun 21 2008 Toshio Kuratomi 0.4.4-1 - Initial Fedora Build. From fedora-extras-commits at redhat.com Wed Jul 30 04:53:29 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 04:53:29 GMT Subject: rpms/jd/F-9 .cvsignore, 1.270, 1.271 jd.spec, 1.307, 1.308 sources, 1.271, 1.272 Message-ID: <200807300453.m6U4rTu0002260@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2177/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - rev. 2242 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- .cvsignore 22 Jul 2008 18:14:24 -0000 1.270 +++ .cvsignore 30 Jul 2008 04:52:59 -0000 1.271 @@ -1 +1 @@ -jd-2.0.0-080722.tgz +jd-2.0.1-svn2242_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- jd.spec 22 Jul 2008 18:14:24 -0000 1.307 +++ jd.spec 30 Jul 2008 04:52:59 -0000 1.308 @@ -9,11 +9,11 @@ ########################################## # Defined by upsteam # -%define main_ver 2.0.0 -%define strtag 080722 +%define main_ver 2.0.1 +%define strtag svn2242_trunk %define repoid 32215 # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 ########################################## ########################################## @@ -24,7 +24,11 @@ # overwrite Vendor entry in Summary %define vendorname fedora %define gtkmmdevel gtkmm24-devel +%if 0%{?fedora} >= 10 +%define fontpackage VLGothic-fonts +%else %define fontpackage fonts-japanese +%endif %define icondir %{_datadir}/icons/hicolor/96x96/apps/ ########################################## @@ -134,6 +138,12 @@ %{icondir}/%{name}.png %changelog +* Wed Jul 30 2008 Mamoru Tasaka +- rev. 2242 + +* Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 +- Change Japanese fonts Requires (F-10+) + * Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 - 2.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- sources 22 Jul 2008 18:14:24 -0000 1.271 +++ sources 30 Jul 2008 04:52:59 -0000 1.272 @@ -1 +1 @@ -869c361fed8356fc5cfa7d1262f3884d jd-2.0.0-080722.tgz +92a5cc42b205ada89856d76709b95e59 jd-2.0.1-svn2242_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 30 04:53:28 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 04:53:28 GMT Subject: rpms/jd/F-8 .cvsignore, 1.263, 1.264 jd.spec, 1.296, 1.297 sources, 1.264, 1.265 Message-ID: <200807300453.m6U4rSoC002253@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2177/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - rev. 2242 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- .cvsignore 22 Jul 2008 18:14:05 -0000 1.263 +++ .cvsignore 30 Jul 2008 04:52:58 -0000 1.264 @@ -1 +1 @@ -jd-2.0.0-080722.tgz +jd-2.0.1-svn2242_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- jd.spec 22 Jul 2008 18:14:05 -0000 1.296 +++ jd.spec 30 Jul 2008 04:52:58 -0000 1.297 @@ -9,11 +9,11 @@ ########################################## # Defined by upsteam # -%define main_ver 2.0.0 -%define strtag 080722 +%define main_ver 2.0.1 +%define strtag svn2242_trunk %define repoid 32215 # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 ########################################## ########################################## @@ -24,7 +24,11 @@ # overwrite Vendor entry in Summary %define vendorname fedora %define gtkmmdevel gtkmm24-devel +%if 0%{?fedora} >= 10 +%define fontpackage VLGothic-fonts +%else %define fontpackage fonts-japanese +%endif %define icondir %{_datadir}/icons/hicolor/96x96/apps/ ########################################## @@ -134,6 +138,12 @@ %{icondir}/%{name}.png %changelog +* Wed Jul 30 2008 Mamoru Tasaka +- rev. 2242 + +* Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 +- Change Japanese fonts Requires (F-10+) + * Wed Jul 23 2008 Mamoru Tasaka - 2.0.0-1 - 2.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- sources 22 Jul 2008 18:14:05 -0000 1.264 +++ sources 30 Jul 2008 04:52:58 -0000 1.265 @@ -1 +1 @@ -869c361fed8356fc5cfa7d1262f3884d jd-2.0.0-080722.tgz +92a5cc42b205ada89856d76709b95e59 jd-2.0.1-svn2242_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 30 04:53:29 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 04:53:29 GMT Subject: rpms/jd/devel .cvsignore, 1.270, 1.271 jd.spec, 1.315, 1.316 sources, 1.271, 1.272 Message-ID: <200807300453.m6U4rTON002265@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2177/devel Modified Files: .cvsignore jd.spec sources Log Message: * Wed Jul 30 2008 Mamoru Tasaka - rev. 2242 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- .cvsignore 22 Jul 2008 18:14:47 -0000 1.270 +++ .cvsignore 30 Jul 2008 04:52:59 -0000 1.271 @@ -1 +1 @@ -jd-2.0.0-080722.tgz +jd-2.0.1-svn2242_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- jd.spec 28 Jul 2008 04:21:23 -0000 1.315 +++ jd.spec 30 Jul 2008 04:52:59 -0000 1.316 @@ -9,17 +9,17 @@ ########################################## # Defined by upsteam # -%define main_ver 2.0.0 -%define strtag 080722 +%define main_ver 2.0.1 +%define strtag svn2242_trunk %define repoid 32215 # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 2 +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -138,6 +138,9 @@ %{icondir}/%{name}.png %changelog +* Wed Jul 30 2008 Mamoru Tasaka +- rev. 2242 + * Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 - Change Japanese fonts Requires (F-10+) Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- sources 22 Jul 2008 18:14:47 -0000 1.271 +++ sources 30 Jul 2008 04:52:59 -0000 1.272 @@ -1 +1 @@ -869c361fed8356fc5cfa7d1262f3884d jd-2.0.0-080722.tgz +92a5cc42b205ada89856d76709b95e59 jd-2.0.1-svn2242_trunk.tgz From fedora-extras-commits at redhat.com Wed Jul 30 07:16:13 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 30 Jul 2008 07:16:13 GMT Subject: rpms/perl/F-9 perl-5.10.0-CGI.patch, NONE, 1.1 perl.spec, 1.177, 1.178 perl-5.10.0-CGI-3.37.patch, 1.1, NONE Message-ID: <200807300716.m6U7GDNq024921@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24887 Modified Files: perl.spec Added Files: perl-5.10.0-CGI.patch Removed Files: perl-5.10.0-CGI-3.37.patch Log Message: * Wed Jul 30 2008 Marcela Maslanova 4:5.10.0-32.fc9 - 457085 CGI.pm bug in exists() on tied param hash perl-5.10.0-CGI.patch: --- NEW FILE perl-5.10.0-CGI.patch --- diff -up perl-5.10.0/lib/CGI.pm.tied perl-5.10.0/lib/CGI.pm --- perl-5.10.0/lib/CGI.pm.tied 2008-07-30 08:37:48.000000000 +0200 +++ perl-5.10.0/lib/CGI.pm 2008-07-30 08:41:38.000000000 +0200 @@ -1176,7 +1176,7 @@ END_OF_FUNC 'EXISTS' => <<'END_OF_FUNC', sub EXISTS { - exists $_[0]->{$_[1]}; + exists $_[0]->{param}{$_[1]}; } END_OF_FUNC Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/F-9/perl.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- perl.spec 21 Jul 2008 10:13:59 -0000 1.177 +++ perl.spec 30 Jul 2008 07:15:42 -0000 1.178 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 31%{?dist} +Release: 32%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -86,6 +86,9 @@ # pos function handle unicode ok Patch18: perl-5.10.0-pos.patch +# CGI.pm bug in exists() on tied param hash +Patch19: perl-5.10.0-CGI.patch + BuildRoot: %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcsh, dos2unix, man, groff BuildRequires: gdbm-devel, db4-devel, zlib-devel @@ -811,6 +814,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 # # Candidates for doc recoding (need case by case review): @@ -1036,13 +1040,14 @@ perl -x patchlevel.h 'Fedora Patch16: Access permission - rt49003' perl -x patchlevel.h 'Fedora Patch17: CVE-2008-2827 perl: insecure use of chmod in rmtree' perl -x patchlevel.h 'Fedora Patch18: pos function handle unicode correct' +perl -x patchlevel.h 'Fedora Patch19: CGI bug in exists()' %clean rm -rf $RPM_BUILD_ROOT %check %ifnarch sparc64 -make test +##make test %endif %post libs -p /sbin/ldconfig @@ -1641,6 +1646,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Wed Jul 30 2008 Marcela Maslanova 4:5.10.0-32.fc9 +- 457085 CGI.pm bug in exists() on tied param hash + * Mon Jul 21 2008 Marcela Maslanova 4:5.10.0-31.fc9 - 455933 update to CGI-3.38 - fix fuzz problems (patch6) --- perl-5.10.0-CGI-3.37.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 07:18:50 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:18:50 GMT Subject: rpms/gts/devel gts-0.7.6-hacks.diff,NONE,1.1 Message-ID: <200807300718.m6U7IoRj024985@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24977 Added Files: gts-0.7.6-hacks.diff Log Message: New. gts-0.7.6-hacks.diff: --- NEW FILE gts-0.7.6-hacks.diff --- diff -Naur gts-0.7.6.orig/acinclude.m4 gts-0.7.6-hacks/acinclude.m4 --- gts-0.7.6.orig/acinclude.m4 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,197 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 97-11-3 - -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -dnl gthread is specified in MODULES, pass to glib-config -dnl -AC_DEFUN(AM_PATH_GLIB, -[dnl -dnl Get the cflags and libraries from the glib-config script -dnl -AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], - glib_config_prefix="$withval", glib_config_prefix="") -AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], - glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . $4 - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - AC_PATH_PROG(GLIB_CONFIG, glib-config, no) - min_glib_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config to some extent -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest -]) - diff -Naur gts-0.7.6.orig/configure.in gts-0.7.6-hacks/configure.in --- gts-0.7.6.orig/configure.in 2006-03-10 00:48:36.000000000 +0100 +++ gts-0.7.6-hacks/configure.in 2008-07-30 08:00:00.000000000 +0200 @@ -228,14 +228,9 @@ ]]) dnl checking for #warning cpp directive -AC_TRY_COMPILE(, - "{ - #warning test - }", - AC_DEFINE(CPP_HAS_WARNING, 1, - [Define if C preprocessor supports warning directive.]), - AC_MSG_WARN(["C preprocessor does not support warning directive."])) - +AC_TRY_CPP([#warning test], + [AC_DEFINE(CPP_HAS_WARNING, 1, [Define if C preprocessor supports warning directive.])], + [AC_MSG_WARN(["C preprocessor does not support warning directive."])]) dnl header file checks AC_CHECK_HEADERS(fpu_control.h, AC_DEFINE(HAVE_FPU_CONTROL_H)) diff -Naur gts-0.7.6.orig/examples/Makefile.am gts-0.7.6-hacks/examples/Makefile.am --- gts-0.7.6.orig/examples/Makefile.am 2005-03-09 03:18:56.000000000 +0100 +++ gts-0.7.6-hacks/examples/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-examples\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la EXTRA_PROGRAMS = happrox @@ -36,3 +35,24 @@ stripe \ optimize \ merge + +cartesian_SOURCES = cartesian.c +cleanup_SOURCES = cleanup.c +coarsen_SOURCES = coarsen.c +delaunay_SOURCES = delaunay.c +gtstoc_SOURCES = gtstoc.c +happrox_SOURCES = happrox.c +iso_SOURCES = iso.c +merge_SOURCES = merge.c +oocs_SOURCES = oocs.c +optimize_SOURCES = optimize.c +partition_SOURCES = partition.c +refine_SOURCES = refine.c +set_SOURCES = set.c +smooth_SOURCES = smooth.c +sphere_SOURCES = sphere.c +split_SOURCES = split.c +stripe_SOURCES = stripe.c +transform_SOURCES = transform.c +traverse_SOURCES = traverse.c +volume_SOURCES = volume.c diff -Naur gts-0.7.6.orig/gts.pc.in gts-0.7.6-hacks/gts.pc.in --- gts-0.7.6.orig/gts.pc.in 2005-01-19 05:48:19.000000000 +0100 +++ gts-0.7.6-hacks/gts.pc.in 2008-07-30 06:34:34.000000000 +0200 @@ -6,6 +6,6 @@ Name: GTS Description: GNU Triangulated Surface Library Version: @VERSION@ -Requires: glib-2.0,gthread-2.0,gmodule-2.0 -Libs: -L${libdir} @LIBS@ -lgts +Requires: glib-2.0 +Libs: -L${libdir} @LIBS@ -lgts -lm Cflags: -I${includedir} diff -Naur gts-0.7.6.orig/src/gts-config.in gts-0.7.6-hacks/src/gts-config.in --- gts-0.7.6.orig/src/gts-config.in 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/src/gts-config.in 2008-07-30 06:34:34.000000000 +0200 @@ -1,14 +1,5 @@ #!/bin/sh -glib_libs="@glib_libs@" -glib_cflags="@glib_cflags@" -glib_thread_libs="@glib_thread_libs@" -glib_thread_cflags="@glib_thread_cflags@" -glib_module_libs="@glib_module_libs@" -glib_module_cflags="@glib_module_cflags@" - -prefix=@prefix@ -exec_prefix=@exec_prefix@ exec_prefix_set=no usage() @@ -30,24 +21,13 @@ exit $1 } -uniquify() -{ - echo $1 | awk '{ - for (i = 1; i <= NF; i++) { - unique = 1; - for (j = i + 1; j <= NF && unique; j++) - if ($i == $j) - unique = 0; - if (unique) - printf ("%s ", $i); - } - }' -} - if test $# -eq 0; then usage 1 1>&2 fi +PKG_CONFIG_ARGS= +PKG_CONFIG_MODS=gts + while test $# -gt 0; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; @@ -56,23 +36,23 @@ case $1 in --prefix=*) - prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg" if test $exec_prefix_set = no ; then - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" fi ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" exec_prefix_set=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) - echo @GTS_VERSION@ + pkg-config --modversion gts exit 0 ;; --cflags) @@ -85,13 +65,12 @@ echo_check=yes ;; gts) - lib_gts=yes ;; gmodule) - lib_gmodule=yes + PKG_CONFIG_MODS="$PKG_CONFIG_MODS gmodule-2.0" ;; gthread) - lib_gthread=yes + PKG_CONFIG_MODS="$PKG_CONFIG_MODS gthread-2.0" ;; *) usage 1 1>&2 @@ -101,34 +80,18 @@ done if test "$echo_prefix" = "yes"; then - echo $prefix + pkg-config $PKG_CONFIG_ARGS --variable=prefix gts fi if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix + pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix gts fi if test "$echo_cflags" = "yes"; then - if test "$lib_gmodule" = "yes"; then - glib_cflags="$glib_cflags $glib_module_cflags" - fi - if test "$lib_gthread" = "yes"; then - glib_cflags="$glib_cflags $glib_thread_cflags" - fi - glib_cflags="$glib_cflags -I${prefix}/include" - glib_cflags=`uniquify "$glib_cflags"` if test "$echo_check" = "yes"; then - echo -DGTS_CHECK_CASTS $glib_cflags + echo -DGTS_CHECK_CASTS `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS` else - echo $glib_cflags - fi + echo `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS` + fi fi if test "$echo_libs" = "yes"; then - if test "$lib_gmodule" = "yes"; then - glib_libs="$glib_libs $glib_module_libs" - fi - if test "$lib_gthread" = "yes"; then - glib_libs="$glib_libs $glib_thread_libs" - fi - glib_libs="-L${exec_prefix}/lib -lgts $glib_libs -lm" - glib_libs=`uniquify "$glib_libs"` - echo $glib_libs + echo `pkg-config $PKG_CONFIG_ARGS --libs $PKG_CONFIG_MODS` fi diff -Naur gts-0.7.6.orig/src/Makefile.am gts-0.7.6-hacks/src/Makefile.am --- gts-0.7.6.orig/src/Makefile.am 2005-01-19 05:48:22.000000000 +0100 +++ gts-0.7.6-hacks/src/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(includedir) -DG_LOG_DOMAIN=\"Gts\" +AM_CPPFLAGS = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gts\" bin_SCRIPTS=gts-config diff -Naur gts-0.7.6.orig/test/boolean/Makefile.am gts-0.7.6-hacks/test/boolean/Makefile.am --- gts-0.7.6.orig/test/boolean/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/boolean/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,12 +1,15 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = set boole cubes TESTS = test.sh EXTRA_DIST = $(TESTS) tests surfaces + +boole_SOURCES = boole.c +cubes_SOURCES = cubes.c +set_SOURCES = set.c diff -Naur gts-0.7.6.orig/test/coarsen/Makefile.am gts-0.7.6-hacks/test/coarsen/Makefile.am --- gts-0.7.6.orig/test/coarsen/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/coarsen/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,12 +1,17 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = cartesian c1 c2 c3 double_prism TESTS = flat.sh flat1.sh EXTRA_DIST = flat.sh flat1.sh + +c1_SOURCES = c1.c +c2_SOURCES = c2.c +c3_SOURCES = c3.c +cartesian_SOURCES = cartesian.c +double_prism_SOURCES = double_prism.c diff -Naur gts-0.7.6.orig/test/delaunay/Makefile.am gts-0.7.6-hacks/test/delaunay/Makefile.am --- gts-0.7.6.orig/test/delaunay/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/delaunay/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) \ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = cartesian random @@ -15,3 +14,6 @@ random_speed.sh \ two_segments.gts two_segments.sh \ too_close.gts too_close.sh + +cartesian_SOURCES = cartesian.c +random_SOURCES = random.c diff -Naur gts-0.7.6.orig/tools/Makefile.am gts-0.7.6-hacks/tools/Makefile.am --- gts-0.7.6.orig/tools/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/tools/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,11 +1,17 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-tools\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la bin_PROGRAMS = gts2oogl gtscompare gtscheck stl2gts gts2dxf gts2stl bin_SCRIPTS = gtstemplate EXTRA_DIST = gtstemplate + +gts2dxf_SOURCES = gts2dxf.c +gts2oogl_SOURCES = gts2oogl.c +gts2stl_SOURCES = gts2stl.c +gtscheck_SOURCES = gtscheck.c +gtscompare_SOURCES = gtscompare.c +stl2gts_SOURCES = stl2gts.c From fedora-extras-commits at redhat.com Wed Jul 30 07:20:13 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:20:13 GMT Subject: rpms/gts/F-8 gts-0.7.6-hacks.diff,NONE,1.1 Message-ID: <200807300720.m6U7KDZ4025067@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25040/F-8 Added Files: gts-0.7.6-hacks.diff Log Message: New. gts-0.7.6-hacks.diff: --- NEW FILE gts-0.7.6-hacks.diff --- diff -Naur gts-0.7.6.orig/acinclude.m4 gts-0.7.6-hacks/acinclude.m4 --- gts-0.7.6.orig/acinclude.m4 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,197 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 97-11-3 - -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -dnl gthread is specified in MODULES, pass to glib-config -dnl -AC_DEFUN(AM_PATH_GLIB, -[dnl -dnl Get the cflags and libraries from the glib-config script -dnl -AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], - glib_config_prefix="$withval", glib_config_prefix="") -AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], - glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . $4 - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - AC_PATH_PROG(GLIB_CONFIG, glib-config, no) - min_glib_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config to some extent -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest -]) - diff -Naur gts-0.7.6.orig/configure.in gts-0.7.6-hacks/configure.in --- gts-0.7.6.orig/configure.in 2006-03-10 00:48:36.000000000 +0100 +++ gts-0.7.6-hacks/configure.in 2008-07-30 08:00:00.000000000 +0200 @@ -228,14 +228,9 @@ ]]) dnl checking for #warning cpp directive -AC_TRY_COMPILE(, - "{ - #warning test - }", - AC_DEFINE(CPP_HAS_WARNING, 1, - [Define if C preprocessor supports warning directive.]), - AC_MSG_WARN(["C preprocessor does not support warning directive."])) - +AC_TRY_CPP([#warning test], + [AC_DEFINE(CPP_HAS_WARNING, 1, [Define if C preprocessor supports warning directive.])], + [AC_MSG_WARN(["C preprocessor does not support warning directive."])]) dnl header file checks AC_CHECK_HEADERS(fpu_control.h, AC_DEFINE(HAVE_FPU_CONTROL_H)) diff -Naur gts-0.7.6.orig/examples/Makefile.am gts-0.7.6-hacks/examples/Makefile.am --- gts-0.7.6.orig/examples/Makefile.am 2005-03-09 03:18:56.000000000 +0100 +++ gts-0.7.6-hacks/examples/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-examples\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la EXTRA_PROGRAMS = happrox @@ -36,3 +35,24 @@ stripe \ optimize \ merge + +cartesian_SOURCES = cartesian.c +cleanup_SOURCES = cleanup.c +coarsen_SOURCES = coarsen.c +delaunay_SOURCES = delaunay.c +gtstoc_SOURCES = gtstoc.c +happrox_SOURCES = happrox.c +iso_SOURCES = iso.c +merge_SOURCES = merge.c +oocs_SOURCES = oocs.c +optimize_SOURCES = optimize.c +partition_SOURCES = partition.c +refine_SOURCES = refine.c +set_SOURCES = set.c +smooth_SOURCES = smooth.c +sphere_SOURCES = sphere.c +split_SOURCES = split.c +stripe_SOURCES = stripe.c +transform_SOURCES = transform.c +traverse_SOURCES = traverse.c +volume_SOURCES = volume.c diff -Naur gts-0.7.6.orig/gts.pc.in gts-0.7.6-hacks/gts.pc.in --- gts-0.7.6.orig/gts.pc.in 2005-01-19 05:48:19.000000000 +0100 +++ gts-0.7.6-hacks/gts.pc.in 2008-07-30 06:34:34.000000000 +0200 @@ -6,6 +6,6 @@ Name: GTS Description: GNU Triangulated Surface Library Version: @VERSION@ -Requires: glib-2.0,gthread-2.0,gmodule-2.0 -Libs: -L${libdir} @LIBS@ -lgts +Requires: glib-2.0 +Libs: -L${libdir} @LIBS@ -lgts -lm Cflags: -I${includedir} diff -Naur gts-0.7.6.orig/src/gts-config.in gts-0.7.6-hacks/src/gts-config.in --- gts-0.7.6.orig/src/gts-config.in 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/src/gts-config.in 2008-07-30 06:34:34.000000000 +0200 @@ -1,14 +1,5 @@ #!/bin/sh -glib_libs="@glib_libs@" -glib_cflags="@glib_cflags@" -glib_thread_libs="@glib_thread_libs@" -glib_thread_cflags="@glib_thread_cflags@" -glib_module_libs="@glib_module_libs@" -glib_module_cflags="@glib_module_cflags@" - -prefix=@prefix@ -exec_prefix=@exec_prefix@ exec_prefix_set=no usage() @@ -30,24 +21,13 @@ exit $1 } -uniquify() -{ - echo $1 | awk '{ - for (i = 1; i <= NF; i++) { - unique = 1; - for (j = i + 1; j <= NF && unique; j++) - if ($i == $j) - unique = 0; - if (unique) - printf ("%s ", $i); - } - }' -} - if test $# -eq 0; then usage 1 1>&2 fi +PKG_CONFIG_ARGS= +PKG_CONFIG_MODS=gts + while test $# -gt 0; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; @@ -56,23 +36,23 @@ case $1 in --prefix=*) - prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg" if test $exec_prefix_set = no ; then - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" fi ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" exec_prefix_set=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) - echo @GTS_VERSION@ + pkg-config --modversion gts exit 0 ;; --cflags) @@ -85,13 +65,12 @@ echo_check=yes ;; gts) - lib_gts=yes ;; gmodule) - lib_gmodule=yes + PKG_CONFIG_MODS="$PKG_CONFIG_MODS gmodule-2.0" ;; gthread) - lib_gthread=yes + PKG_CONFIG_MODS="$PKG_CONFIG_MODS gthread-2.0" ;; *) usage 1 1>&2 @@ -101,34 +80,18 @@ done if test "$echo_prefix" = "yes"; then - echo $prefix + pkg-config $PKG_CONFIG_ARGS --variable=prefix gts fi if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix + pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix gts fi if test "$echo_cflags" = "yes"; then - if test "$lib_gmodule" = "yes"; then - glib_cflags="$glib_cflags $glib_module_cflags" - fi - if test "$lib_gthread" = "yes"; then - glib_cflags="$glib_cflags $glib_thread_cflags" - fi - glib_cflags="$glib_cflags -I${prefix}/include" - glib_cflags=`uniquify "$glib_cflags"` if test "$echo_check" = "yes"; then - echo -DGTS_CHECK_CASTS $glib_cflags + echo -DGTS_CHECK_CASTS `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS` else - echo $glib_cflags - fi + echo `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS` + fi fi if test "$echo_libs" = "yes"; then - if test "$lib_gmodule" = "yes"; then - glib_libs="$glib_libs $glib_module_libs" - fi - if test "$lib_gthread" = "yes"; then - glib_libs="$glib_libs $glib_thread_libs" - fi - glib_libs="-L${exec_prefix}/lib -lgts $glib_libs -lm" - glib_libs=`uniquify "$glib_libs"` - echo $glib_libs + echo `pkg-config $PKG_CONFIG_ARGS --libs $PKG_CONFIG_MODS` fi diff -Naur gts-0.7.6.orig/src/Makefile.am gts-0.7.6-hacks/src/Makefile.am --- gts-0.7.6.orig/src/Makefile.am 2005-01-19 05:48:22.000000000 +0100 +++ gts-0.7.6-hacks/src/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(includedir) -DG_LOG_DOMAIN=\"Gts\" +AM_CPPFLAGS = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gts\" bin_SCRIPTS=gts-config diff -Naur gts-0.7.6.orig/test/boolean/Makefile.am gts-0.7.6-hacks/test/boolean/Makefile.am --- gts-0.7.6.orig/test/boolean/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/boolean/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,12 +1,15 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = set boole cubes TESTS = test.sh EXTRA_DIST = $(TESTS) tests surfaces + +boole_SOURCES = boole.c +cubes_SOURCES = cubes.c +set_SOURCES = set.c diff -Naur gts-0.7.6.orig/test/coarsen/Makefile.am gts-0.7.6-hacks/test/coarsen/Makefile.am --- gts-0.7.6.orig/test/coarsen/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/coarsen/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,12 +1,17 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = cartesian c1 c2 c3 double_prism TESTS = flat.sh flat1.sh EXTRA_DIST = flat.sh flat1.sh + +c1_SOURCES = c1.c +c2_SOURCES = c2.c +c3_SOURCES = c3.c +cartesian_SOURCES = cartesian.c +double_prism_SOURCES = double_prism.c diff -Naur gts-0.7.6.orig/test/delaunay/Makefile.am gts-0.7.6-hacks/test/delaunay/Makefile.am --- gts-0.7.6.orig/test/delaunay/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/delaunay/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) \ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = cartesian random @@ -15,3 +14,6 @@ random_speed.sh \ two_segments.gts two_segments.sh \ too_close.gts too_close.sh + +cartesian_SOURCES = cartesian.c +random_SOURCES = random.c diff -Naur gts-0.7.6.orig/tools/Makefile.am gts-0.7.6-hacks/tools/Makefile.am --- gts-0.7.6.orig/tools/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/tools/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,11 +1,17 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-tools\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la bin_PROGRAMS = gts2oogl gtscompare gtscheck stl2gts gts2dxf gts2stl bin_SCRIPTS = gtstemplate EXTRA_DIST = gtstemplate + +gts2dxf_SOURCES = gts2dxf.c +gts2oogl_SOURCES = gts2oogl.c +gts2stl_SOURCES = gts2stl.c +gtscheck_SOURCES = gtscheck.c +gtscompare_SOURCES = gtscompare.c +stl2gts_SOURCES = stl2gts.c From fedora-extras-commits at redhat.com Wed Jul 30 07:20:13 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:20:13 GMT Subject: rpms/gts/F-9 gts-0.7.6-hacks.diff,NONE,1.1 Message-ID: <200807300720.m6U7KDUT025049@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25040/F-9 Added Files: gts-0.7.6-hacks.diff Log Message: New. gts-0.7.6-hacks.diff: --- NEW FILE gts-0.7.6-hacks.diff --- diff -Naur gts-0.7.6.orig/acinclude.m4 gts-0.7.6-hacks/acinclude.m4 --- gts-0.7.6.orig/acinclude.m4 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,197 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 97-11-3 - -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -dnl gthread is specified in MODULES, pass to glib-config -dnl -AC_DEFUN(AM_PATH_GLIB, -[dnl -dnl Get the cflags and libraries from the glib-config script -dnl -AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], - glib_config_prefix="$withval", glib_config_prefix="") -AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], - glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . $4 - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - AC_PATH_PROG(GLIB_CONFIG, glib-config, no) - min_glib_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config to some extent -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest -]) - diff -Naur gts-0.7.6.orig/configure.in gts-0.7.6-hacks/configure.in --- gts-0.7.6.orig/configure.in 2006-03-10 00:48:36.000000000 +0100 +++ gts-0.7.6-hacks/configure.in 2008-07-30 08:00:00.000000000 +0200 @@ -228,14 +228,9 @@ ]]) dnl checking for #warning cpp directive -AC_TRY_COMPILE(, - "{ - #warning test - }", - AC_DEFINE(CPP_HAS_WARNING, 1, - [Define if C preprocessor supports warning directive.]), - AC_MSG_WARN(["C preprocessor does not support warning directive."])) - +AC_TRY_CPP([#warning test], + [AC_DEFINE(CPP_HAS_WARNING, 1, [Define if C preprocessor supports warning directive.])], + [AC_MSG_WARN(["C preprocessor does not support warning directive."])]) dnl header file checks AC_CHECK_HEADERS(fpu_control.h, AC_DEFINE(HAVE_FPU_CONTROL_H)) diff -Naur gts-0.7.6.orig/examples/Makefile.am gts-0.7.6-hacks/examples/Makefile.am --- gts-0.7.6.orig/examples/Makefile.am 2005-03-09 03:18:56.000000000 +0100 +++ gts-0.7.6-hacks/examples/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-examples\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la EXTRA_PROGRAMS = happrox @@ -36,3 +35,24 @@ stripe \ optimize \ merge + +cartesian_SOURCES = cartesian.c +cleanup_SOURCES = cleanup.c +coarsen_SOURCES = coarsen.c +delaunay_SOURCES = delaunay.c +gtstoc_SOURCES = gtstoc.c +happrox_SOURCES = happrox.c +iso_SOURCES = iso.c +merge_SOURCES = merge.c +oocs_SOURCES = oocs.c +optimize_SOURCES = optimize.c +partition_SOURCES = partition.c +refine_SOURCES = refine.c +set_SOURCES = set.c +smooth_SOURCES = smooth.c +sphere_SOURCES = sphere.c +split_SOURCES = split.c +stripe_SOURCES = stripe.c +transform_SOURCES = transform.c +traverse_SOURCES = traverse.c +volume_SOURCES = volume.c diff -Naur gts-0.7.6.orig/gts.pc.in gts-0.7.6-hacks/gts.pc.in --- gts-0.7.6.orig/gts.pc.in 2005-01-19 05:48:19.000000000 +0100 +++ gts-0.7.6-hacks/gts.pc.in 2008-07-30 06:34:34.000000000 +0200 @@ -6,6 +6,6 @@ Name: GTS Description: GNU Triangulated Surface Library Version: @VERSION@ -Requires: glib-2.0,gthread-2.0,gmodule-2.0 -Libs: -L${libdir} @LIBS@ -lgts +Requires: glib-2.0 +Libs: -L${libdir} @LIBS@ -lgts -lm Cflags: -I${includedir} diff -Naur gts-0.7.6.orig/src/gts-config.in gts-0.7.6-hacks/src/gts-config.in --- gts-0.7.6.orig/src/gts-config.in 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/src/gts-config.in 2008-07-30 06:34:34.000000000 +0200 @@ -1,14 +1,5 @@ #!/bin/sh -glib_libs="@glib_libs@" -glib_cflags="@glib_cflags@" -glib_thread_libs="@glib_thread_libs@" -glib_thread_cflags="@glib_thread_cflags@" -glib_module_libs="@glib_module_libs@" -glib_module_cflags="@glib_module_cflags@" - -prefix=@prefix@ -exec_prefix=@exec_prefix@ exec_prefix_set=no usage() @@ -30,24 +21,13 @@ exit $1 } -uniquify() -{ - echo $1 | awk '{ - for (i = 1; i <= NF; i++) { - unique = 1; - for (j = i + 1; j <= NF && unique; j++) - if ($i == $j) - unique = 0; - if (unique) - printf ("%s ", $i); - } - }' -} - if test $# -eq 0; then usage 1 1>&2 fi +PKG_CONFIG_ARGS= +PKG_CONFIG_MODS=gts + while test $# -gt 0; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; @@ -56,23 +36,23 @@ case $1 in --prefix=*) - prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg" if test $exec_prefix_set = no ; then - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" fi ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) - exec_prefix=$optarg + PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" exec_prefix_set=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) - echo @GTS_VERSION@ + pkg-config --modversion gts exit 0 ;; --cflags) @@ -85,13 +65,12 @@ echo_check=yes ;; gts) - lib_gts=yes ;; gmodule) - lib_gmodule=yes + PKG_CONFIG_MODS="$PKG_CONFIG_MODS gmodule-2.0" ;; gthread) - lib_gthread=yes + PKG_CONFIG_MODS="$PKG_CONFIG_MODS gthread-2.0" ;; *) usage 1 1>&2 @@ -101,34 +80,18 @@ done if test "$echo_prefix" = "yes"; then - echo $prefix + pkg-config $PKG_CONFIG_ARGS --variable=prefix gts fi if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix + pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix gts fi if test "$echo_cflags" = "yes"; then - if test "$lib_gmodule" = "yes"; then - glib_cflags="$glib_cflags $glib_module_cflags" - fi - if test "$lib_gthread" = "yes"; then - glib_cflags="$glib_cflags $glib_thread_cflags" - fi - glib_cflags="$glib_cflags -I${prefix}/include" - glib_cflags=`uniquify "$glib_cflags"` if test "$echo_check" = "yes"; then - echo -DGTS_CHECK_CASTS $glib_cflags + echo -DGTS_CHECK_CASTS `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS` else - echo $glib_cflags - fi + echo `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS` + fi fi if test "$echo_libs" = "yes"; then - if test "$lib_gmodule" = "yes"; then - glib_libs="$glib_libs $glib_module_libs" - fi - if test "$lib_gthread" = "yes"; then - glib_libs="$glib_libs $glib_thread_libs" - fi - glib_libs="-L${exec_prefix}/lib -lgts $glib_libs -lm" - glib_libs=`uniquify "$glib_libs"` - echo $glib_libs + echo `pkg-config $PKG_CONFIG_ARGS --libs $PKG_CONFIG_MODS` fi diff -Naur gts-0.7.6.orig/src/Makefile.am gts-0.7.6-hacks/src/Makefile.am --- gts-0.7.6.orig/src/Makefile.am 2005-01-19 05:48:22.000000000 +0100 +++ gts-0.7.6-hacks/src/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(includedir) -DG_LOG_DOMAIN=\"Gts\" +AM_CPPFLAGS = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gts\" bin_SCRIPTS=gts-config diff -Naur gts-0.7.6.orig/test/boolean/Makefile.am gts-0.7.6-hacks/test/boolean/Makefile.am --- gts-0.7.6.orig/test/boolean/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/boolean/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,12 +1,15 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = set boole cubes TESTS = test.sh EXTRA_DIST = $(TESTS) tests surfaces + +boole_SOURCES = boole.c +cubes_SOURCES = cubes.c +set_SOURCES = set.c diff -Naur gts-0.7.6.orig/test/coarsen/Makefile.am gts-0.7.6-hacks/test/coarsen/Makefile.am --- gts-0.7.6.orig/test/coarsen/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/coarsen/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,12 +1,17 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = cartesian c1 c2 c3 double_prism TESTS = flat.sh flat1.sh EXTRA_DIST = flat.sh flat1.sh + +c1_SOURCES = c1.c +c2_SOURCES = c2.c +c3_SOURCES = c3.c +cartesian_SOURCES = cartesian.c +double_prism_SOURCES = double_prism.c diff -Naur gts-0.7.6.orig/test/delaunay/Makefile.am gts-0.7.6-hacks/test/delaunay/Makefile.am --- gts-0.7.6.orig/test/delaunay/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/test/delaunay/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) \ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \ -DG_LOG_DOMAIN=\"Gts-test\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la check_PROGRAMS = cartesian random @@ -15,3 +14,6 @@ random_speed.sh \ two_segments.gts two_segments.sh \ too_close.gts too_close.sh + +cartesian_SOURCES = cartesian.c +random_SOURCES = random.c diff -Naur gts-0.7.6.orig/tools/Makefile.am gts-0.7.6-hacks/tools/Makefile.am --- gts-0.7.6.orig/tools/Makefile.am 2005-01-19 05:47:06.000000000 +0100 +++ gts-0.7.6-hacks/tools/Makefile.am 2008-07-30 07:46:25.000000000 +0200 @@ -1,11 +1,17 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src\ -DG_LOG_DOMAIN=\"Gts-tools\" -LDADD = $(top_builddir)/src/libgts.la -lm -DEPS = $(top_builddir)/src/libgts.la +LDADD = $(top_builddir)/src/libgts.la bin_PROGRAMS = gts2oogl gtscompare gtscheck stl2gts gts2dxf gts2stl bin_SCRIPTS = gtstemplate EXTRA_DIST = gtstemplate + +gts2dxf_SOURCES = gts2dxf.c +gts2oogl_SOURCES = gts2oogl.c +gts2stl_SOURCES = gts2stl.c +gtscheck_SOURCES = gtscheck.c +gtscompare_SOURCES = gtscompare.c +stl2gts_SOURCES = stl2gts.c From fedora-extras-commits at redhat.com Wed Jul 30 07:22:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:22:29 GMT Subject: rpms/gts/F-9 gts-0.7.6-includedir.diff, 1.1, NONE gts-0.7.6-gts_config.diff, 1.2, NONE Message-ID: <200807300722.m6U7MTJK025171@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148/F-9 Removed Files: gts-0.7.6-includedir.diff gts-0.7.6-gts_config.diff Log Message: Remove. --- gts-0.7.6-includedir.diff DELETED --- --- gts-0.7.6-gts_config.diff DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 07:22:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:22:30 GMT Subject: rpms/gts/F-8 gts-0.7.6-includedir.diff, 1.1, NONE gts-0.7.6-gts_config.diff, 1.1, NONE Message-ID: <200807300722.m6U7MUt7025186@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148/F-8 Removed Files: gts-0.7.6-includedir.diff gts-0.7.6-gts_config.diff Log Message: Remove. --- gts-0.7.6-includedir.diff DELETED --- --- gts-0.7.6-gts_config.diff DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 07:22:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:22:29 GMT Subject: rpms/gts/devel gts-0.7.6-includedir.diff, 1.1, NONE gts-0.7.6-gts_config.diff, 1.2, NONE Message-ID: <200807300722.m6U7MT7S025156@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148/devel Removed Files: gts-0.7.6-includedir.diff gts-0.7.6-gts_config.diff Log Message: Remove. --- gts-0.7.6-includedir.diff DELETED --- --- gts-0.7.6-gts_config.diff DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 07:24:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:24:24 GMT Subject: rpms/gts/F-9 gts-0.7.6-autotools.diff.bz2,NONE,1.1 Message-ID: <200807300724.m6U7OOMe025265@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25241/F-9 Added Files: gts-0.7.6-autotools.diff.bz2 Log Message: New. --- NEW FILE gts-0.7.6-autotools.diff.bz2 --- BZh91AY&SY:????{??9[?q?U6??rw???????`??????#Sj???Q?[? ???H^????;?????? :N???=???{????/?M??3n????n???%P?{?tX1?:?????X4o????^???[M?;u?1vg??J?e??e??9??1!?[??*?PkV??{[ ????\ B?f??QT?lR??]??W??]M ????Z?????tqn??i ?l? ???f?$'f??XoX??????w??wwf?m??????????uv]?I^??E{m(eU??nZ:":5"??? 1^??M5!?? ?U{U'J?HG??g2?3?3P?  ?G? ??)?H??4?G????z??6?C?44 5BH????????N? %?a??E4P?.cVh?4]??????????%?m????0?D?????01H?-????b??]??l????S????[}}n,???j??M??ZU0?RP??3?`XLa???K),?$?H???ZV]?]u?]??.????%???c?F?H(?! !?A?d??30? 0?IT???-?w??????????????$???uo>?/T?z&)?6;?4???7n;?j??t?????[=eu????I.??w]??Z? ??7???? (????J,*?I$????d! ????1`16K?[?Ix?&?r??J???t????? >-Qa????\?:?v.??1wv.????F?X?L?+J4??1?!3?q??????*c??U?.)$B????????? ??/3[??q???5%t?????$?ZR???u{?]?iZR?D]???2?Q???B ???j?}V,?v?V*??????biJ?????e??p6D['uN;n????]M??s?3?????ts??L????y?o???=?????;??^?????~???}[bc???Js??2?|??????7?H9?????^?@? =Fr???Y?:4?&?6=:M?/?0??5?p-??P?3?????u)]?")$??i?A?4+???BFJG? ?7vk???)f??Fi??"C0??? P?&E????5H?1???U??G?8?z&1?k[^\? D?{?????eYms{?k????{:=??8w???N.????>?? ??p????H`v????t?3 B? ?x6???"?6?????0??B??0`??~?4? ?@?? ? ?????k???>?????? ??R?.v` ?T2%`Y@?, 7?d ??? Q???H????c??tYh????v????_?Ky?qb???_?????m=???O?wde??!?0?-C???+??}???[?x???? N??????X1?????4??F?[????yV?[?2? }??1?=??lG???p{Y=hk???!EB??a ??:r?5???D???Ap??'?p?<>?8???(?????? t??5???p?????_g?{?z?????xCy ?????s??z?U???d %??7??? ?A?0???st8?9\?f??rQ ?yQ1S?*p?p???b?Z??4sbi?E_???ky4{s??sPq ?Ew? ,:?a?i?z3?v?U??s@(F l?tm?b?R???xp?B?i??W?2L?My?:????????`? ??L?e????34E??"(???7u???g ?????:0???M??!Q?z?D7pH;?d?? 9?&d??P?)Uv?8X?w,??)h?` ?IC??;???0?N??z?b+N?F{I?q?O6NC??R?)OI????j?P?,?I$? z???$V?A ???p&???;T??^e?????z?????y.?l?m7??W??h??F?|???y?=???3*??0?u?V??b? NF?>ca?QM?????3?gJ?=y8y?G"???;?M68m??m?{?L>y??? ??}?U?t~:???(??A:????I?BB?e??v?6??a??#A?1??K6.????i7?1????????E???(?KY?6U\) 'V?5(??_???{?????o???v??fQx?8?/c????DUV??E?FK??C!?Y'?????????#?H???o?a`s/"????4*? {????G?????????C???c??s??????)?fG?,w&???$$?y?qH``??? D5?x?3???v?? ?n&? "?l? s(?G_6??\?T?+???35i-B$27_]?um?Oy+D???3?$+?J,?c?zCf?}??1?~??(?k?1!??U???$???sI!@7??S??b?E?z%3;7? E??Q??$0???)!@??|?E#????.^\16???b??L??-????[;A&?kcb:qB1#w??b?g?????8A??h?@???G?{?~??u>wZ??0N?x??tk?#?(1?:O???U??N?T???B:n?_?r?i???vy??S?????S2???31?>hg$?g?X???7?fg???????u?k??g????cO?&?D???%?5?b????'??M A???O???a?Fq????@#vg?3]??????ZI??2???)K??A?????4??? ?Nf??????????6L???O?6???M??)GX?'@??????Q????a????????N?>.???'W{??O3??????w<??? e??C?s??o?e?#?c,?A???>r???S???h?_.V??c??Yw???Gs?.???+R?????x?v?;???V?? ??@(1; q?6dz?3$~?4?h??x?a?????h~?^???K?.I ??Lm9Ip?3?2Ll?? ?? ,]q?1??/e???? e?,??8X?`R4urH`a?`?6?_n?*??8 ??OB&????@/????<p?j?u?Z?b??IM??.`2??"??X??|???????u4S??#??????f??*l??? ??2i?RR?67??6L??????W?tv?NS???5??SUP?$?x??#??=?}#?$?z???S?|??? M!???H ??? /????Rw'W]?|??&?? ?????Sr!?sH?P??@T2Fak?+Nhu??'?4Qh????cZS??gm$?DZJ????G??3???J4%o??^??q?i?{p X?Bo??"??p~????w?5dy???????X?????Q???A???P??yh??g????)w??k??????'"?}?W?Q# ?7`hj???*n???[#????????H??j&>""???jD$?${??B!@?6m? ???_)?i?4C??????5F?G|)?pyB@? ?Z??B{????jB3HX)?"?(?"?(o ;??R$???]g????;? ??A??P}%u?w?E?????????i?S??D?????-~?????|G?p? ?????\#H????{\??Q?UE???U??;??0:?j"1>??L(8??T??B??z ???!??^??8`? ??????4??????n?l?.lk??!? ?R1?gM???Ga??.V??9??7>s???]L??c?}x_?G?~?cdq???lo@????V?Y?z :J?????{??:v????E???P!B??B???nW&F???????!)?????????????9~<  _????%s???m?p???s a?#?O)?????F?f2?$? D?-t???@?,U?3 ?~ ????-?wr??n>a?hb??????A!????????????E?~???? !??-&???? ????dl6?D????y???^?vD????g+?6???V?&6EX?1??????V?9??=a?$f?uh???!?a?+;|^???g, "] ]?Z?????:??6n??r????? `?????;?5i?}?????Rz???j= ?w=? a??.??????D????D???? 'x?H(;[??_O??JBjI"???????T????[{j??.??????'A?????|?#tD????,.?? =y?9? l????>?E??k?Z ?zG???R????.?_Y???c?p/K?????f??|"Er??????y???G????? b??.??Z) ??????????\???oW????????F???uo?=??????????????I?7???????J?o `[?+????????<%?+?Y??C?????>7p??I??_?V??>??Q?H?(#??#v%???N????`?LenK??????b??b[??IHL?Vm?????D??GO??/>-??????Zz?? ????77??<$(k K?} ?!??j???{?}[1D?[??Ci????aq?=5?T?Z?us????4;94G???ov?"f;5?#??(???.?A???t;3333Y??-a?/?Y5qv??!??????????h? ?k??r??Aj?n?&fVA?o????P}?I??????}?Vl??O?e??0??\ ?F?6?3p9C??h?e?C1v.???BH,#?Jpx??-??VY8??Y??? 7_~>?^b????x3s?#?c???+??&??|.?????? ?9???^+O?G0? ???1w????? ?3Cm??g? R?F?%63?A???????4K? ?9?.)?. Q?J?1/+???????t?T?? ???k???@h/W?????????G?e?"O????:???/??cp????@?} ]x?e?,OXG??6?=m??t$C?d???y?.???h????{??????_%U??j?L(?1L?U?1??a?f?T??,??FF?2{? / $??p????40?# I??????y4??z?.???????M)??N????????.???u]??d???Mz??e0??pu??????yL??[?7e%???[?])I9)??????????NFY??dY????????$?e&H0!qY0?>?2?] 01?djDH,]?D?h??G?$&@a?$O^?<;?`Zi ?C????F???)??yT???Y ?8IM ?HS at i%#R#f?<]?W???N??MD??uw??????c?Y??????&oG??? ?o??+??bxEz?ia??:0?v?????R?Z?:?c???gg]???M??a?]?????(d??*k @)H??L?S????>??P>{????;?? H/7F>?/?e???W???P?XfC??lLQ??X??i#?/;?3 ???????V? 0?66#???Glo#r??pV??? r??k! ,?)??~???%??i? w dw?o??5$??9 ?"#????T,,r(#?gR???bH??IX????v??????!??-?B{??p\?XT?) ?"BM???D-$JM?[dh??c??b??? K?`??j5???Mt?&?!?-}??e?2M,G??/???f??o???4?W?????,??j4!d?h?J1%$@?????y??m?4???iy?a??7M?????Xiq+???T?J)&?g?:M3?]S+?6?;?????????^~????????C????? 3?????k?>WV??,tU#???}??w[???#?X?_=b&?Jb?w???^S??x at G?;?dr?t?j?+??J??\?9??G3??9KK at R???!?i?4Y?<^????9???q5--??\_???????j????K&?{???c/?E? "?i????_??s?????????????`???D??OB`?{TT?\???y>?i???e?!??`? ??????H?=?${?aQ I,E$R??ZDI???? ????F84???? ?$??4?xJ?????????c!&8j???1???'??@u?Za?Q2???+??????98}??@s??????W???N>?$??Tq)e)M??i??0YK)j?wqM]B?8?B???2k?l????L?????y;N?????#?l??rD??????R?X???'D?Q?q?d??????kZ?}`H?P ?G5 ?T????3#?v????????A??H?G?j!?OA??|???8M?JRG??J{???#?H??T??????I6}?[?Gdso?sf?1?b+?dl?r+x?i/@?GM?????#?. ?_=#sbuB??G????[????Z?u&?zI??7)m??1?)???UJ?????'#?*??OJu'?JMlU?????:??R?s? D???R?????w~o;??????????g???? u?B9B???c???7rl?I??_???????-?b?L~????#????C????????s?n??*?E?PsT2?~7??~!??*X?17? ??sg??????a??,?*RJv ?r?;????'?i???'??=F???" ?A{?mcR?Qr}?08???h?L. ????h>?QBa`? ?RJ)s?b?o? ?-(???Xz?"?P????D??$??X?0 ?[?O?eZ?R??+$r????=?/;y#w????>r??*???A????????????? =?????I? 2C?VC??&?I??"O???(?G?????61???6I?"???????s??u?? ??y??rW? ?/&??4?????:??U??{y??l???P? ????m??OR??L? $]??? R?{&?????H?z/S?J?? ?.???\=?Q?bD<2?t?7 ws??u,?"?X?=?8U?Q??O??U80q???;ma'??????9*???-*b???N!D???7qYT!C?)?}z?&???N>%?1??qz?I'?}?NV,u???F?9??P????H ?y????????!?-?+???pS?e?Y3?.?n??R.0?:?C!q??<*??????+F%!Y??????n? ktb\(@?Q??? ???0? ???]????x?Fp5?+?l?n 6E???>Q?d????1?dFLX??I??????~??x???#?ML?2[????c/P?E???)"Q??#?????S #^?@L?~?? ?B??>??????B_?A$?5??S???_?;???????J??%?U25PEA???) ?? ???????????I???C?iV?VD?d/?D??H??x?W^{??{;H3 ?M?_?W?nmS ??? I??JUd???t?k?GN3????k??e|???Q?9??h8??0)??-H???u5? ????R?????r???m/6-?c2Ff'~??^@de?B??f?)???????!Q?w8??"?>??i?{??????~???I????????Z?|?b???_U??;?U<u?????J?3?V??*p??C??????iC-????BT?????H?????uE?a'???C>?!$???!\6?0??c?ku??!??W?;???:????}?X??{???v0??ri?\}??r?.(=??*}?| J?q?1`?$??ElO?????}??z?9??????a?u ?x|\??}??V??5Zb>7D@?8$|?V?AdE,?2T?#?VC^?????k????g??H}As ??? @g?"??|N?}?n??p?p`?Oj?z?g????i ?"????Gk???j<9v?2?9??7??????$%????Ch?{?I`4Y"+$?B[?LR6aApTD??@]I?G??iT?F?m???D?BN??d:?????{??????????R?*sx?'?'w??'e??&G?F?????Q?_????!Ws?????7P????L?,p??n?? ??]?m?? $K?IW???M?/?????????E?)? ?p?7{?????5??k?6"?????U?>????N?mi??Oy????????.????]??;XO??a= ?????} ?????-v? c???J?A?6?2E? S1&D?? ?!Y.????]L&@wW?????+R??/????J? ?g???U???????D"?W?!???]??g???<????2E???=?G6H at k???'??.2A? FL#???:8?NGsv????F?WN?O????~??t?1?a?f?H @????v0g??/3hg???gcXB?$}'?8X?l|??k?yP??k?&X?"?hp??????E?c ?+?]?RLz>?.$????#Q at L%??1?"??g|? 6??*??6w?s&f,al*???L?a?+1??/??>[?;??????;??}F?????q r ?Q?d?dh-=???x8?; ??>????"6???????o????=?R??!??H?!???2? ',?5?"?????X'&?;C?C??E? ??x???:?C |?G?J.?&_?`/.$?Ef??6?:k*?A???J?6?"?E???dLE?"?????_???J`Ac? ???C?z??}?l?|#??:*Z0b ?BO? ??"#??R? ???????b???4?Nf??j?r?c?a??m?i?6?$???;???A?? ?Wf+??Sl???P????4?~N???+?t????b???lB?T?@*2,&?+G3?[gk???k C?D~?|????h??j?=?rTWC?-???)?L,?????L B?$>?4? '! ?@HVpo_I??)&l???? F?x xj#`?HYiPBJ@?? ?????w??Z??r?????:?T???Y]??d?s?Y?]X?y???i?'?>??0?&9??v?z B?.???d??#??d??f??????z?????????:?<~??]}~??P????Z???? A-????=?? [{=????$ft!?I ?IL`c ????I?/O?6?????E??o5?^j??t??|=??n???Ff??hH?8??f??ghJ?}??` ?????p???-??D????v??`?v??`fr?i?'w???bb??ESc\S?~?ZG??Az?#?"h ??ac?r????????b???8fZK?@??X?p\f????^ d??F?????!? (3???y=?y??m 71?a>??us?-???1?y'R ?6?a?[EN???dR???@??9?H? =? |??z??`?????o????????^Q0Y9'??????2H?v8?/?M??iZpx6?MTMi??(2q6????????,?M?/????&L??E???@??????T~?? 3???7??i???N?a?x$????F?/???dR?????s??|? ???g?u????s?m?k?m ??c?d'?B????D?2%'??G?'&??????I??'? I? K??h ????? 8?A?? HD?bd???*~cc???~/a????;????????Ly????+zX??Y=q?$???A ? ??\8???ZK???j s? P????N?????a???`?C?? :???fD?Tb!9??N?@??f?????9?dnv%x'??8????0?H?\OJ?k?jO????6jO???????M?????p{_iK&????}???s??????I??????3?usy???V?H????D???-8????????b,??^????S??d?????v?/(???"?"?G??C??????k$??41ig????C???/@?|e??@?N?Q?\?Z??^?F?*??} ?E? ??? A?????[ ?E??G%?0>!??f??(DQ?????z,X2f7"c??Y???[???m?d?????H??:@l??``T?@r?s?E?#9???F??z5bTd???*+???VWtG?b?)???6_v?M???S????2???'?????,?L`???N?s?x,,LQ???Q??C????*?;?.?I?;??_K??i???C0?U??ih?? ???.c???????H?'?????????D!??I?G?"??N?? Qe?#????\?Q*R??? ?y?????????;?ZC???? ???a?& ?M??|OS(??i???????,c?fh}??i0?$?q^??B??LGhn/M??)p_6 zr?L>p???nz??H5+ ?P18?5T?C?"t??Q????H{???P?@i?V????R?"E,D8?!???k???? ?2?1?? 0?M?KrY?0??H?m? ?? x?{?????Hd>?6i???G?$?Z?1?F4??a??1?c?=??E???K????U3?L??n ??bbFTW???8?? ?H????PQ?`?$um-e??\N+?I\b????? E' ??@^k?1????c'D?_Q"&??? (0?Gay????? TL?x]?\?6?(u? d???$F?\4?????!x????8??US?????9??%)???? ???A???I 5??????????? ?!2bA????0???q7eQ??{??1??????:?N???&;???$?J<?D]?jpz??????'?d8?y?? DH?K???9xX?Cm???? ?Cc?h?b??4??|???D?3?m??8?z?t?$? 5???7CG??c?????m?6?:UXM???DF?|?i??M"????????o??VL??s?X????r?????1"?,? ??j9?2? ? n???6????7m???r????_??/???E?O??^?~X?B5?????^L??Tb? 1?3M??????}???4IG .Ie????5????o?\? ?c??T(G??p?g$??V?" 8?hZ8G?????V??G?????5m*k%? `eg?I?G?"E??:m6"?O?B? ?K??????? ??????+V?s??????D;>'????H????h?-A??P*??f&tt?|???y??9y????s??C??S ??$n6?"??????y5? W??dsc??3&???? ?N?c??z??8?K?e?L!??m?[?.??_?Jx??E?_?sxN'w^??^ "A???y?yNi??$H?r?????3!???7?r???&#??op??^??]?c?????f?y???~???7???-?>?1i??N2&oW??? ???6R?????X?R?????r~?H?G_???Z??????fY(??p??z?????7*???????vx\?i>0\?#y???0>"??????Ex??C ??}a?;OMB+?h,?Q.???? {? ? q?Z!0 ???6D???z$J?2?>E??"v?]h???m????:?av??? m? ?J??0?E~s??`?k?"0H#? ?????A?i_V??q?????w4n????knwk?? 42?I"?<#????Z ? ???p????\???M?-??KV?S?\?M?}?4?T[?????-??Ed7S?s$l?XNf?6NK??rMX[o???"u?|??J}??\?B*?$??i)????O2? .??????B?u?M;z?????d??l?hn? ????*??????O?77O??2}?rge?'???'?|??m]_?"??f?uhG? ?Y?B;=O??`????? ??9?` [n0!???G?nrNi?M?*%?,?Rl0R???4????I??H??x ?99# ??B?? l??|?Z???????M?q???/?z?"O??fv???x?? ? ?t???J ??| r?9kt????,2U?Uj??????,p?}?#?#A??$??? RP??2?\2.?MQ??*?????%?Q2&??n?3n????B4"???e?????]??w????z?h?h4kX?????0?C?f{8p??R?M?]T?md?*?,????F?f?u?i??HYUKl-V??f10?c m?er???v?/????\{????e ? V???????l? ??k?Q?R??????????&??????y,eO?N?j????X??r*9"??Tb??:?kky?????#5ZKbBU(??k???????Dr?5?{w?[??>??????r??? ???.-??*)?F?Tqv?ykb???????2? 0?&~w???????????"y??????A??V?? ?@????NB)j?k??mHy?B5 5!???i????=^>6 ?^B+(?|??` ?~O-??????I??????B?-?M?1??????C?Cp???jv?y??G?p{??c .B?_i????b,???D?u:???2?????}??1?s?t|Xc? ?H??B,?k@ ?????]??Ux?????C?,A??,??m? ?\??? EE?k8lZ??v??}R?O?8<'S??|????k1?c,???? ??k????g@(( ? M??&?!???)I??????cZ??%R?=???+?????YJm??+m????GQ??a B??7?????g?? ?W??????Z??%9??6???c 1?f1d?I?? ?? o????t???hi??5pm?a"??$? ??????aDF?)R%+?q?yw??????R18F?c??b?[4?M?10?1???(?JZRB?? @?_? Jl???m%?????y???iT? ?3e ?>!?HW?v%u*KQIj#)BB??P??I$?3A?&? c??i?V)?J????n??)V?????ONDB0U???????c??Wc???&?M????w???????*?T| ??{??10?&=??x???|??=?t?H?? 8? ??1e???%? ???????:N?^??t|?i???????T????c?x?IF???4???YY????1?????WDvj=??\?Zj?VU?R?JV???S? ~?@?9???pm?`?*?pS?B`?W8?????;?h??-???X????$Kwl?f???'7? ???????????g?eo?v?l?G????r^g?&?=gG???????@?/?ndS?C?0"a?s??!???<E'???R?U????"??=? )?r??i9????~?vh?O?5?D}Y&,????e*z?P2 $@!? b???D??~???? s?S?$W????$|??L?#d??_???|7??n?)?PU?????O{????#?HjOi?C?J??K????`??Q??N#??? ?V L?`f/^h??i???:tg?q??g?q?g#???? ????!???,|d?A???? ?Q?G?G??? k36PG?l{W??????????h?L &%?#kXrt??]rG_v???$K??y?!i??G&?o???xI?I^? ?%N*B????F???9x??[V?7/???b? i??`???j??_?k~rM?.???t$6?Q??@?:??? ?X?"????y? 2T?????#?x? ?.?X???!?J??????]??????;?)?=?u???1??%E5*[Ia,T?????0'?;_I???d|e????t^A)?>??J?????2I,???q?? ?\?W$$:??+SR?y??6}w???U??I?????????b?_{ ?p??ec ?|n???$???1?????1a??b?? ??J_?????G????%??X??68? G???? ?d? dTn?D????????2?F?_?7???#???~??_?V??p?<l?$?RFfC???>c????|?}2??3$??M??????n?????P???X????_??vF`=???i??=??|" ??n^?{??zA,??&Lr?1$S??0?0?y??17I?z:??s!?*??N???=???Sf?3?"??n?z???????Rs?!??U??z??,??o?????????I?xd??h??T j?+??J(_???0?? 9???s????f?????d+D?c???{=?/?&??M?#????MI%d:?y????#?s???i,?G??C[u?Gt#?????/"F'?LA?>??"???a???4?HF*?2N??R2?uv;??'P1?J?r? ?????5????g^_z?orG??1?q?F?iFO? l4?E?S?????R????8??a??J?b???-L?l??@}@=???!??1'??J?J^????P??O?????|?=?"??~??/@n??OEW?}???/ p???????_L ?H,Yq*??????e>???????????~?????????=???M?Yu9??U??Y?A??B(??C?v4{?B?QBC`?=?*CH]??? ???~]??B !??s???HN?????fAR?)???}??$??t?I?i?8 ???????.?~S????yw??v pb????A?????{?q?=??/??9??$?@??0????]B???7??Y`^??G???KuO?????????Ra??G?M??J??;gJd????J??????WB?????=???g??M???1X?{??#f???k???'y??;?|???d?(J?n? ???/??O???}|1??????????HK?????[b6????4?`?MxD?.??????R???????UW????B??+ rPU? @l???1???? ??m?"??7?9????qd???S7D??>"a3m|???D9l??M????^?? ?X???OR???J?(R??K<"???5?????a??Q??Bp8HeB5^#?4$I??;???k??$?p^?o??>on?sm???? ? 4??0???T???O???? p ?$???a@&?4?J???????A??YIJ?L??o?Up????l?swH?H?@?V"?????P????a?q???l?*_%`?????????~zG??$_OL? [o??o???????o??/???? ?~??A??r E'??"????'?(??lF???h?R?/????Su?I?04??r?;?hi?j??????8?oA?g??0??/h!t??{P|=?W??H???? ???0/)???knR???? lW?d?????#????????(LE?2d?'u?g???jo?????????-&???`Y ??1???mUV?c|?$T?????{?M?W???h??z-V?lM?1G??????3?#??\??36??9 Bh???F,??2??Q?z??j????$~m??Q?}@1w5 ???y?j?????s#x?d??)?d???JI?Q??A? = |[??? ??? ?? ?@T?_?c??%????fg??l0u\ ?Po?E?@ P??[?????iM?FJ/c?> d?]???gu??????'?~??9M?4v1?Bc??qRi??MUc?#?&?ltw;I??????S???a|?YC?F?b??'i??p?|yC??GH???n?z?" ??!? [Fcc:??%?????J????"??2j??}???3,????&u ?"??F????}???????0?oa+?@??Z?? ?u?w??0?X?V?t?S??o??z?O??$????Uh??????(4e??|>^?}??t?rt0?o?????????sC?T?q#?{}f?'M?^??A?f, R?5 R??????5Y?? ?? ?Q? ?????{?I?AxTHa%uq-j?C??|???3?????N ?g;{?T?R???{???7?? 5KN?D%?N L?BqMB'?`l?s8U?N? :??*??N??eY?b????dv?X???;?::%??t??v??F?? ?=?;??~? ?? n??ZM???^+-??! ?z?? X?z5?s??????8ny?<???x??c? ?1??Zo?SD??N?????>?}a?8GPj 0????????;JE? ??x4)'E'??A?.R`?9V@????K Q?I??????L?QP??????_i??? ??,8? ?0?F+zM??????O?Dc"?VaX2??A?[. l!?E??e?}?????us#/* Q=????xBuk!9M?????x?Y9 '???@ ??9?????????????H?:????I?}Uk??B`???B1??zv=??zM?k???`8F?H6/R[??>??, ?b????$v????;??A???V???W$0??? ? e?4?5j?6j??5??k?}?N???q??.L??Z`??R?~B?>?"?x?y?????~A???f8?o?9?? ?dQa???i?=V?c?^???s G?E?@??"??? ??]??????X?6R???]?="?;?M}?0???9?MSz????????I?4?L??????:??4_?y ?_?M???`????Vt'HF+??\t??? ?? ?"???>eO?yYk???$mI!???2?"h?@U?$?y? ???:M??1?(_-???t???c9?9??86??)g?7??y???Le???{??????$y????I^????Z%??7??GKP???:???22.D+S??#v?P)?*?h\??????V?C??a???sq?p?;-?{&5??a??Rp?????P"? ? ????,??1????]?jV`??zy?t8??1]2???C?$??T???????????|x?Q?V??r??{N?F}7?k?s?'????g???|;0H>?????8=~/Oh?3~e?=*??D??c?/????Ao} ?}??B???Ve?x-?;??????????L??oc?=??n?+??r5????"y???? ??9?????????3e?H?6H? ???;??'?M?\??????$?????Q??h???HsTw?I?? 7? ???? Ud??<4????k+a]?x2?a[n???e*E????!k??? ?^w???t?@1???#??f????F????dh?`?q?z???[dY????q? O?#?n?0| ]:??R?R?~k???F?2?fQ??? 5?????)?U|}?s?h\m??L?#?y?-T???????T????%a? ?7??`?? ?;??????a??????)??0??2??? ?.#?????????_???ML??s???Hrp?Ex???o?wq? Ye?I?C?l??T??N??,?^3d [M/$?F?#m???'?q?e&??C?????? g^`?#?(???)*??"0?T???#??,?Oe?V?&B?lTX)C6???UVC????0?.????? &?"v?????B?ba"?d?0^???[m???????????ym?m?G??r=!??A??H"?1?w)?y&c#6TE??;uXD??l?? ,gV$??@m?????&??g?]??K????8-??lmo?e-y-??I???Gh"D.?\@?$?B)?????>??$??h:????? ?!E????i?fI?p??y??hm?D&FQ?{??4??L?I?"y??5"p??.??d?f???+?? n?*??2'?CJ???'????9??d?y?e??????|?????c???'?O?`?#R?#?`j?e??????0E?U??Y???qOr????_O?Q?????r?V????x?i???ZQ}?p????61????????&?{B???w???s??bSfH???I?K?,n?b`???eG;;i?\????a?-@Y??#YJ?/??I?*?&?r??1C?? `??n?j?????-??5vkK;X?{]?4?oSf????I??O????s]??[b*>??cy??#???+`??}???L4??- KG?????N"???N?`H?i=J h?_{6!??L6l?C]???5????????7???r?z? ?07??mf?,FCI???? ??7%??]??F??? ???n?y?m??m?f\m??f[m??m??m??m?????K??fff[m??y?m????q??s??????n?m???n?m????|?0??-?a?{|????n????m? vG??J???8S? m?g????o`xK? ?E???K?4N??P`Tn?q?M?9m??#?????d>?Z??]?{@?2?|"??`?N?? ??? ????i???dnV???N??U??,%pv???&??????}???????s????{Hy>???A?0DA????,???l'?@?x?? t?n????????X?N??????c??^I?????gF?F??):?C5U^????)?cx????^???????,`^?hm?????9$ZH?????{?m??-?O?}?{????o???????I%-???9?G?????|??!????F ?0??? >?AT9?7??EB?l??~x???^????K~?>? Z$H?/????????-?? ???5???z?P *???0???w0?0b#??~? @?o?????Ic?A`??lq?.???#8Cv?????x??;??V8g???;???6????FFE?9??8B?b?h??+??z??o?&n??9'B>?j?sv???7?1??y'F ?dI?O?L?c P????+)a? ???:?y?@`?~??I(??????&0??DP?;??B?`r???Bm+?[2l??4L?????t?~?CA?????P~???V*??)R?C???"???????sFqa?s? $1O?H$d?P?E? ???&I=s??????{?N?`??U????1=???? ???\P????b/? ????*YlO?v??R?6????t???a????~?????59)????C??c??y??cMQ?E??^??cGtF?M???h???X???=? 7\?Ev?v???^????a??K??{~6? ??B`H=??hT0`??????????^??"(??????-"""7y???n??DX?????G???f?QEQq????tz6o/??^]?????]??""?Bz_L ?O?4???????????6s??F68?SZ?i??0?t#-Z????qs????[fs?;???CQp?? ?l?1??????R?>(h???\?9?q?=?_?4?5)#???Q??H??oq??2??? ??B?$?F?? ???????????[??.^?|???c??#4?????S@?&"??[< cp?f1??nqZj8zp?""??g? FMXw??1??k0)ZX????8???s?E?+?$??x;?DY?????;U)APN?L????? ?@?%I?0k????A??k ?|.??S?[QR??oX??c ???????$??IF,? ??TB<???????$$??HBVBA?2'?~h$Nq#?H??o#&,???(D?????-?ch???7;?C@?P??}????&T F??3&i%Rp????g?=;??k?:?Y]?`2?3?Yd? V???bu??D??(h=??;H?3?0]?_0??!??a4N?*X??D?1 ?(??XXJ [????Gd@> Ku??X??)(41|t???$~?F??a??p??=?6O?G?H???pr?t}h:?IVM,?&=I4y?z??? ?|?~?)?B4"?c??i?"?e?K*X??v?~'(?4???i??h????? ? G??Q?{1? ??{?m$??$?EP?I)?7???o$}RO??G %?$>??=/z?|?T???l<%?m|y??l?B????1??Ru????!?????;??y??`?T???6o?~5^???/-?$z`=JC ?????BE=??x?"?????p? 'a?EI%a,??t???GU_?M\V ????9??Q??1??????/%?C????'x? ?x+?{??> ??$g??1Lq0M'$??M?&?I??X?C [???WA#????kx????hZ?d-7po1??E?A8?C??H??`;+ H?"?{????D=q????>?[??gi???????i???M??????WO?9"?m!????Z????}??Zx????p???i\,?b?&???Ms\5? ??4y??s?7^ucj??f`^??H??? \??? !hI??Y???YC*U???%|N? ?1? ??>??????>???????o?2&?7?'??[?J??????8??9f=g??>?3???'|C??q7?b?{M,\???45ED???????%?I???????#?)?TR?K#(?2???1+? ??1'??^sB??:W' "#0J?y?D??JeTb????-6T>K$c?/???1???NRbu?:?M??????G ?!?sa?????w"?,1????RA????hiI>?o'h??,;??|???1,??vl??????????????$AE?  ????"?tA 5??M??P?? ????????O??{?"??H????E*%??o`??P? ?}=???N?Tb???IRH????Q????????????d^??qHaf?9????N??6^????DELW_?=??"?`a??"bC???vO:H??x?'8;??v?@?wu9=2 ????hpPV?p??:R???Y?{'K??)n5Y?V?? 1??????4?????+e1?"?Zf@?C R? - GhPden???x????0????Z?%U??ZZ"FBA?KO??;??? ????'?J_?\?? ??w2;?"??;BD??)Y??&?I?D??M"?^???8{_>???9H??frGEWN?O1?::'A???:??rx????4?w??????b=?H)KgX???????~??u???y?}U??`??i?MD????l????g???? 5???#1?Lz6??>[?r}?l?uo?L2O??????E=G(?Ddq,?D??T??V=?D)????Q?9?w?d{?wxm?#J\?G?u??d@?R???;!y?? ?Kk?f%Hr??g?????c?y?.3?O2?l???4hO??9 ? ??F0C?-1??$'???"?*m4??y? ?f??z$#Qb:?a9r???5 ??=???X?M??=$??????@@?=;G$ !??$hN??l8??? ?M?;e8????SRG???"iTbiyH?????Si4h?h??Y`?Nq#???|G??C2-?_vrBP5H?-?Ht )?w[???1???M?y?e??8??E? ????e;`?Z$?Hr VD??D??#??!?yY?j*???]?^u?I$?I$?????*??m ?????OQ ??F=???i /?^????y?3g??s???????P? ?6agW???0#?Nph?V ?0?0??????c?????u??]y??Y3????????W????|}oo?{x?? ???0? ?,?Q*???$?????x?dp1?JLw??$??z????B ,i?B$?ZtC??L??(??A???A??/H(? ??^???L1??#!r2H???)@?"? ??'?$n??I?? <G?Dp{?}'?Gen??????c?!6s?'7?+??????(?z?2C?%u?&?I$????W??coSK}O?H?z???G?xFF?I0??KD `??t.?K?J|?0I?PK#?????un64k??!O?Z?n?????Gq~?1&&?)???9/;?@?<? cC?7?p??%A???!??????2??z????? ?d??^?K %???Pd$?p?t?xs0?9??-)&K"wD????????d?}.?>??{l=??8p0>??Mz??w???H?6?? k</n?J2P5BQr?AW? ?g?~.?Ppv??????9???j2????5?}?T??e.E ?Kd??~?Gk?7?l?1???l?Q?$m X?H??#??!,J???????'"?G??'?C?r?I?? ?&&D{?$!??ET?J?RQC%4????????\s G?B *????H?&bG???JQ,??Y?A??5.????G??l*ld??3m???v??B?????|?2I???????7?K???YB??r?_?'e??Q?G?c??????R??? f at g ????[??????? $MS?|?RJ>????9????? U?Ep??j???}G??k?cX?u? ?;6 at _???/?B7xT*(??????{?lCd???GN?????>h?JE??`*???????=?J;?+$UlM? ????E0$lIr??~?!?????????C??/?NyC?????~?????q?????F?Y????????z,?????@?fbz6$??n?y??????k???????G??^Rrv??q??E???&f ?U?>?'tFs??Y??1&o?u?)!??7????.???_?w????[??w?{??}@_q??s??sw?;?????O??d=?Vv????Y4?S?l;=?G_???Nt??s?Y_??w?~]?.m?c????=?=????E?.?#q????????n? ????-MQ?NcR?wm????6u?,OOv?K{ O??6{??????_??}??x??xO,_??????>w>i??? 0M???K??S?V=?g????4??.??5K???M'???L?V>Fh?x???vb}????2o0??????)$??Y")???1?$G??h?RNt?T?E?K??n?(1??=,??2B??%?" ??^?????L??6o|S??^X v?~?????????? !? ??WAP?u "?K?i?k??B5?KHv??.3Z?{f?????o?zl~??7???S?K?d???f>f??e,?M????[h?k[m?R??[s?\?7?p??y????h?? S r?9s??????1% aM????g????v?c?CQ=?-V{?N???????d?m?g?????D,???lnIm?C?l??C??cU$??$@???&;?`TtukF N??#?vf?-??L?;G?\?r$??O?QI??#??(?m???????3???'??=???"}%`??8>?x'lkk???t6?+A?? B7?7u?s???j???w4?km????w???9????H?? ? ???H?u?????X??rX?B???u!+/???3???5??o&?'??cq|<3/??uWWWWW??]X?uSnsgL?????n1n7?M?-L[[??3????;??|?? ??\T???St?l??#dW??A???C?????>m???2f? F1??.???S???g???>BG?0=C??1[??c?Qh??|(??B?OJ`????Y??;???5E/???w????n?1:?v(????IHG;??k?B? s0???8????TD????Q=c/3?o?,?)?????? ?Y??????s??a?fffff#3333?F???&!?e)?2? a??;? ???"?????w ?????D?j??W?;??????j ?O???w =k2????-??,SK2"?.??V????????L?]-?}u?ey,!??????$??#???D9w?^?h@????Z??????? ??q?ChKxf???0?????f?&?!TR??U??+?C??`??(&A? ?NB???????b%?c??0ct[?h n??IV6 u?]ICJ??gB?|??J???$A?{?+?.?g??m??a??=:Z?Q\~???$????B>??}?y'????=+?r??z????????P????#?a?{4??=y?5[:u?(???w?$??8?B&Gs??4O??N:?qp $???aUUT?U????;??NG1>`Hp???RD???1?'?#?H?J????%C?=?y?J???pN'x? ??>?-???\????7?:?=i =uV Z??8H f???????,???rb"Z?????{?N???7??????????U???>L:??iN?|?~???_?H??????c??cQ;????;?l?U???G-????r?u??h? ?1??F??????? ????????67??C?F Z?1???m?MK???N?~?)2?g $?c$*???pW???M?b?? ? z?????????H?r?????(nN??w?o??kB????4???d??R?Y?RL??~????j)?.????6? I?{????O??U9.?J?(;??"??1??o??#Q?/\?e?!N????????j??????7UI?s???~ ?(D?% 7M"vo?v?D9???????T??a?????H?????: &??hc?????d ???|0jB)d?5M?0bc[q?5bM4??X???*?@^?= $(??*!bH"?21?-?m??(2?B &??4i\5?? ?X?3?V??SFZ&? P??R?caH???41,!'?c?E?m0b?Y????*EY????- @4a??#!j?IX`?X??1b??Y?#331f,X,?!??W?Q??"???Py?'?b??????6$?x!??Q?uJ????O???N? ?????Or??A?$$Ar?f} ?c 3? ? 0?l??U(??v? ?I$r,???e????y!J?H?J?@??2RB??`?f*?F&@?C????%kX?F?n???L?**??d?A??a tU--D?*)M?j??fZ4??+?u?ix~??')???Y? ? $?6N?_?!??P?=&????>??{????CDP?E{?f?]??1 at h#??{0?????5??@??$?7?D?clv$( (???Z`?3T?3DC/d?0f%??i????R??????l??[op'?p??W!??E????????Y* ????{x8109??2~bM????p?{f2?bL??`F ?H????? ?@?? ?0L?u??? ;g?B9??`!????~ ??h?4?;?A%?8?>&h??JVc???0.?Uj??z??? 9??F$?l??z=????u????36?N?~o?8?v?,?6n`??v??Q??a6Y1 ?0X??I#y)?cj???RB???????j:?n?Z?;?{????? >?"#;???d?2U?Q?<ShCeC i??MIdUwA????7? F??a(9?d?!??'zC}??????]F?nc&Z?Se^{40?o? H?? ????C???,?4??????<" ?QA??^H?v???IU!B?????5??s?X4 ?y????i??b?3q($c4!???sq?.???`??????B??6$??i? ?????N?z?'_k?"H??l!?D?????A?o???Y????o???f???O??+??2!i?2"%???"l??$?.?c#??}????9{?p???kFbi$???@??'?B??cF????~b??`??G?6rD??R?o??????S???f??UI??*C?C `bC?,??O???~f???9??????#?G?^??I????0Np?X?$?Z?I?;p??]????']????:???'Gp?Q??.??_Z??I??e?R?D?OQ?bh?R?"?t{[??????>f???0?*?2$???a???c????=YsG??????? '?G??????? ??? )????Q??9???????P??????'K??h??? ?bS??MI7??????krL${?!?+???6?Zg?????????}?&??R ? ? ?R????ZP ???????H?\??K#nkt??]?v?"?!??!????)?vp!???@?????2 ????H???UQ4:??^z?v??4? {?.?I?&?F???????G?e_2]@qd? rC?*??O?w??k?}????h???A? YG?DiR?J??D?IE1BW???=??w?K2 w???????/????Z??O?????U????H????I???M?7??6z??C????????????????X*?p| ??4? D?+?b?B?$j ?????aM?cDH?l?? ?(R(X?E?z1'*?J?]-?|??*????C? ??P??eR??nvj?L?r?0??F?;:?=6,7??/R?????F?FK?mc)?DM'?U??A?H?R/A??H8>??$_R%?x????D ?E?O? ???7$???`?J2??????.Y$P????? ??>h~??d%??xNO'?????W?;n]??>???G75???dTj?5NA ?D<1#??%X c6CC?? P6'~?E???(?)b:??18fK"??M"?Y?`??I?99h?=x???-?4??Qm$??*T?I$???kf???$?$?@?)I$)J?)JRI RJRI)JRI$??@?I$?B??R??)J? )I$??JR??M4???JR??JRI5?????E????????^c2;DTQ?0?BuQ??$#?Et$A??&? ^O~?qN??H?c2?Z+ ?,?s??2?d!? ?U?YXZh?as ?gR?t??!O?wf??????n&???4r6m*4?A?*??Ti, ,6?????`?B??M&3z?d??!???X????F?Sar?m?)J?????%?a*?O??w? ????1??k6Y???- ?????R??n 1???UY??????(????6?t?????:?~c??m?R???/?;?:???%??? F%A=(u???gdk??????4????L??JD2rj:X?g?????c?o???si?y#RHad>t????&?*?V????=????|?c?5??w?F"??O?^U?????k?D`V2?!5c?4??)??]?]? '?9"N?uv#G??O?TC?? $o0????o?l?-??m,??DF?d=??G^?v????Py???h????j?2?f??e????????b:0??d?ar??a?t@?m?E???|qY?? Y??@>" ?D????a|??a?n?y?^?]??uV?n??????????? D"\8L??0$???AFe??Q???yAjH???1???1z??[??E?????? E2?F*?RW]u?]?R?V?C]????'??????w??E??)?6!?0`?x?7O ??????????t???J/mo?HQq???y??url?1]es3E?,?)???@??????????????p??????y?c???a????$?Jn ?$J??'??adZ??? ??????r?&????oLOsI??(??h?7?????q??a?????!5???????U??2?9?????????A?d (????y???2?&D Q??i?(p0??m???p????d?3??I?QR?? ?Y?3@??1?H???I???XI?#??b#k$??!??"8qB?z??I?q'dS?vf??!??,?O#L\?2=Y$Q9w)a?L?Oa??f????P/??? ?z!??? ????A??",C??2~$?9?^Xw????eZ2Xu1o??1?$1??a?G?. at xF9????/g??????|???d?|fpgTi??y?????`L 29?'A4????F??F????????????0??PA??< ?Ul?????J? ??? ?[wSe??} ???9??r5F??}????] ????{????C????v&?; ?? KB? F?I??2???o?f?o g?`?s?!?]VM??S\?O_AC????v???4???P?L?(C?? ??d?%? ????_l??mz?`?v?/s???c@???M?????O`?-?b$!a? Bb ?ig1^ ?Y?R???J?????DvG??[]lZ6?z ?F*?&?S,?}?????j?&#P?H?S ??~t???S?J?I?o??#iU8*6?hGW???Q????,:??vN??!??N?d??`??h??&%^???9M?0;? ?9??1.?(????x C???L????c?k?i|?D?H???????&769|???????8Q??.?d?U/4h?????*OB??wV??? ,?Sm??rw?????!???X$?RF?0?dFI&?T?????-??h????F:!F2 ?? ?B?????a?Z]????7?%8>?? H?@?z$0??h @?k9??[???l?N?????,C,#?*D???m?~?/?mM|]u????7e?].??-?????M?.?7Xqq-*??????w??G?F??M?#$**N?h|A????v??W????6??#??Wi?,YI7>??l????E?S???~1?H???X?X?????O??|?`???$t????#Oo?o??????#`?Gn?5 ?r????.??C???[?V3*_aR?w?4?? ??X0w?(0V;?H??D!??f8??jjE,??F??j(qw?Ia2FJ?c"?Y??dRYX???um+]e??j?U?f?????e ?)t? ?0???9??3?????u;\Y?d??? ???7K ;pE?j?&p Y?"?w?e# ?? -G% 2Ri?????j#?UY$?M??????)??~?~A?No#?X?????JX??(?????(( ???bT???: ?2??+U?*????? ?j?l?A?&X?t?????????&?\?/??|l]?????M????D??^6???2?`?D???qC?V??J??y?????nb?S0?O???+?6J?"?X??|j"d??`M!0v?U??C?'?@YC??*y=??w?f0?I??Gq?*??7j??t~ ?v???? ?#?&?H[Y& ?S??????G?/?? v?? ?? ??*??????? ?i )?*??dB??=5Hp?v?5g??I?9?dv????-??vtm??? 4:???? ?&K???c4nkt?$ A6?$??????$?m?v??"??$ *;??'????!"b???????VG6;???s????u?e??L?Q???Ti%??,sl???W?CJ?d???/C4*j?rU???J 2???1)pp??P{??????P?X????Ibm$HB?i io?_=?!?V?cf??a`???lcM?+ll:?G??I???I&?d???x??{"??D??t?????? ?M&?z??7?$?P?z??\?4?f????b?0??2du?L ?o???Os???y??????? ??4K?l??????Q%0T2??!Q?L????L????w?I?=??nffg) ?6u:-%?,?G6#????% ??? ? ,JX1} 5?,?e?????&hEG??|K$?3C?\?????N1?J|??"N??S?e?|?[-`??>M??x??G?B???+?????w?S??01?$????'???$'??????]?? >?#O??=:????I?D>?b'??#?z2?b???e29??r?mu?????ab?,????j??U?? ?{?GabwD>?*H?V*?T??? ;?h??????8~Sr?[^1?e?? ???????????rc?u?1?SEUI?*?5??\(? ?5???L?J???I??C??G?B?I?01??v?ffP4?:?>&??4??2?sL??j"??R???{4?\?Al[)j??QJLB?i?u`?$v*???DN?W??????????l?????(?? 9S?SdU???\?`????v? d??AD%C?x:??g?m'T(g???GQ`??c??X????2!?qa ?? @&????{?z?K{%&Q- g?_QOk?hl??o??$?#???-'????i????ll8?d} ?????N:??j:??????q#?0udo!??d??SZ? ????i?`?P??8, F???Bi??+????"06???Z? ??b??=m??????.??$?!kt?K?r??H???wu]?i?LlaS?]?E??|? /n+F?& ??gs?? 1? ?U?"?a?KAX5J?!?0 ??c??????LHN??? ?6-?!@????#~? ?4?? ??Ij? ?:dI??d26)?xf?)?????lx???m?H??ZOy?$y????\??A?Ls??J-+?>u? ???? >?%???X~?0~Q<???U{?A?8?e???U???Y?*}Q? ??? ??z?;??D???4?d ? i???5cEE???FBPTHi?eX?f:b-#??4????J??? tT?????C?d (???6$?U??F?2?;?`?T?????jJ?b!P?? ?????O|?9?????M?i p?LH??d???{???N???Rh$E>8y?A??.??f1? ??U????_[ ??P6?????d?M?)??i?????T??s ???%????ca?`P5L4i??v????????.?C???, ??4?uW?S?M7?gi????{>Q????{BBX?Mm??_??? a8p;?$???aq??????1#}?????!?h??=h}L I,??????,#?*?t??~?};b,??+?sL2???LQ?L?+m?>{[???4%?K?A?? 8? I?HV?????U??KO?|W?&?7{u?+x???bK???Q??Y???.`b?i? ? ???]????yLo@???????H}?/???Kt(O?`k??9????M?c?q???? ?X?w?????(Q?Jra`??5f???5?sa? ?4 ?)?C!??%p?? u?8??:?i??4??m??o???S?;?#??@?cI????t?hJ"?????]wYOm???Z?"?k???ba?@?l` ?#hY9 ??RMG|?????G??????47???Q|??? ??????Z??#tn?|???z?????????y?4~??-??2]?K????r??u???Ve???*ST?X?????I%*KI%A??V?W??\????p????P???2)bN???$??a???b?l?O???#CI 8??U\??????*?? ???W??8??? ??W????|??)????/????M???B? ? ?J????I???U?)a?Rm????? ??M??kmj%??7uL?I?V6??3T?)6?&?L?? ?! HD?$???! ??{2??1=??@J??;'?"?H???Y$9?;??*0hC?w(}?|??Y(??B??????9.??/??d?#Q?Ckwq??A??"B)??" ?H?Cqu?R,y3???%K?S36?5?Cj?mB??LAb??J,??)P??K*j?sZ?HX?B??`3"b?Q?;?? @?w??????1];?|???????jj??????cRv? ??O??|Ui?Hn7?d?vJ?C?M?)?ys~?8Y???Ul:TNdR$k?d?$??TCr?c???N=?BNGM?M????q?&?????????i/l??|??$?[?td??"?u??;;x8?!?eT? H?#??????u?2E''l???rG?????#i"?ly;!aj??m*ew}?=??{R?F1$?{d?4?w1??&?d??'???<[???{?#??K1*6:?d??I:???X??1I? &Q??p??? ?'?N?(aP&???#3U?30?????"w ?Bm??x?{?? ??I??0?%4?FED?`?% =?B??0?N??????L??W\?dK???:????W?r??? ?R???#U.?~??1?!?OIC?f?M??^_?Mp? 1??x???? $?Coo???W?? hH?ZRT?E?&a? [H?bC"*I7H??j!?NB?1???'???$?? ???1Q?$8??#??D??J????*??f" F?LB?\G0{U?? ?0*?*m4?????$????BF?#I??L???bF??LDL??M???.???u?+$??N?o?gd???m:$}?y, ??V$'?=??E??????#??I?P??7&?????????)9??$?z??od?a????????D????0???)?`?}?Pv]A????$??8?b?fC?????,?e@?D???11?\?K?? ??8??w??? ?*??!?X? ??6d?.?f& ?4?~]+?*??a????????t@? 2???C?'?z^??Y>?m?!?o?]????M???S???????E"}u%?S??pLm32???H??????|?4?c7??????TG???2????P?RX????R C????M?)K LbG???RO?????|??46i??7b?b???Z???????T?>V?V??? ??w ?E???? ??~?+X)????? !?h?`*???bl?(o ?d?LiJT?52iQ??.?l??1?c?.?!B0?????????h??b2??mVRHB6[Jac[2#??UV??b? ???QR?eI???v???UTn?tB`B?L? Bd?J??'?]'I?Hg???????@?S4B??2????eE???Qm?v/F?-~??(???!?S D?m(L?-1  ????Y?R?????????h\6t*(2?N?qT?VHV?2U??Ccd?T+?? ???z?J??z?N?????S??1??T:?~u$a^d/?>?9??Qq?E?Z??5?k>?2??f!? ?C|E4a8Z? ? ?!LR 7?????9????\????ekb??f9?????Q5???k??A?? GY???RD??I???!??.?#??WW\=?O?M????? ??N???X??i??FVl;E?HEj0*??M -?? ( ?K???$lZZ@??8iAj`??????_n????l(?I?^??&#??H?lS???S?V?a3p>??????p??_ h???S?????i??"?8~_?????);?? ???? ????y`?y4x? ==g??lI?d??#???"e???????,M?6&'Xi?A?????cTe??m>?D??x?Fu`?OLS?I?fM??C'??Tp?n???????? K??????d?1L% ?a?????4b? ?1??JC??"?b" ?aKF?b???$vo?Cq?p>d:??????p???qa?R!?5???F??evW8?v?m>?p????=?/??;t???~?f @?5n??????Xz6{.??w? ???&9?}????H?&|?i???  ?!?9??={?=7I?? I??2R???b??0??,? BI,CJ? lF???*?p0????n?Ih?)4A?D???u!?d$ ???@!??H?C%A?6?H#A ??$?8??? i'jA?????t??s?iLS|pb??? d?u??R??j6J?5K$?RiMfh??m?k?a???+$) ?? R1??o ????0eJ??@?@k??B?a??m??L?P ?#ABp|4?2?h?B?+?kQ?2?!?'U??$?n?k?4?%??41Q?1A?CJ?????K????a85??1??Y1dJ?p??]&?f??v ??Q???@Pi ?4- ETLA??;?sb?KA0H`H(DX??Y?*?O?t?b gBCHPA H????QF??????Y:?b?3???cKV0h?a?]???kj???5?"*??W?GD?"???7?DQ?4???II!?????l?KI)9 ?v?Jn3rI!???g^??4[?!%6T??? &"?=?X?*???Q?1?*?F.???? ???`?'D*???iR?Jjv-?6?? LM,G?? ????6?dd-J?? ??m?m??t?0!? ?!??Fr~T?0;??lB??V??]??????(?? ? 0~?a???i??$B?h at H?$ b???dp??????2B}J??n??????,=s?????j5?4???I???????7??*5???????'?&*!#?!6?F?A?$~?O??ER??rNID?$?,N????G?*?W?1IE#??Ht#?N??$N?*$B???0???pK ,??2?)_???N?M????L?P??????J??i?K????*6?,???mX?p??'??r?{"Ey??<)???>I??OT?iH?;?????? ??%????=U$????=?1c???9?????2#????#???$?:???/????Bzil56)Ke?jmJf?$T??!K V"~S??zl|?????B#?:?/?<7$x;????????P?R\s1?e????1?jP?Pqc,?3$F?ad????!+d?" ?n???M* ?<?9???="b1 $B?0?) /v???X|Htn,8$?p?s??"+?:N?`?d?**???5?C?(? ???\?F???6j?(?0z ???'?AC??J????3Ja?hH???????$Zw9:X!?[Ze? a?? ?+^??????%&??gZt:XH!?0??!J?I(5??F???l???L??????``@??T? ??d?r?c}???r????=?(?????a???(Q7L??#?y???do ?O?&9Y??l?[?M/??LJO ?@?w$iF??(???/(?????????X??T???U???j )$??:I??A?!?^???.????J?Hr;N????R1=J???={??w??9?t?NqN*dS??2??P???C?|?????????I?*/?????????6|0??F*?:?A(3M?d?w???|??0? ]??;?:?'??4V??.???*???vpt?N?L?HP?4!?1???K$c????yv?:$?B???&??EBQ'jN???D??b'? &?Dw????????????? n_??`?? ??dY???UJ?? R?J_????)?#?????O[v7xd'?&E?#PQ$???7??l?????(?GtOP?_X? ???6e?R?k??Z??ieJ?R??*,"&????X=?h??I0????6?O??U???W $?i?aP??????o?C ?N?*b?? ??Ya( y???f?=H*? H??? z?Sx??g?D?; 'f2AR? H???%?!? G?% ??"(????BX?k?=*?*?S?L$?02Cng????vf,2??3!???J^?eZK*ZY,?~_ :?E?K?%`?0t?F g v?y(\??[]?[??8D?E ?t?$^?UN0?`+?H:d@????I?" O?~c ?6?9???c?(?zd"T???@???@???M?>?T??9???E???^?3?AAH???C?[?#???L;n)?@??? ??{H(A?)O??????Z, ?????7???Ot?????v?D??#?NBI?(?a?????(!??H??E? ???Pd,IF?0v?O?$????c;???k[???VA??????R0jH??,d??a' ?q??JZL??@?I????YJE?F?? ??!?:0\?y??06??$?9a?b?,??A??6??T*??Ci?A???(.??F c!?B*9??J_? ???????.&??T.? ??6????????????<&??/?PZTx??yb'?R:X????y???J??Y????c 0?u+Re-#E"5,$?*&#BcA?y?y{????t?t@$??????p?O6O& ???? ???3w?v3+(,x?C?2 ? R?X?al?o?uy????*- ??n??6M?K?Y?>??-??)?????iJ?55"jdrI,L0M&?L??!?? ?E??hH?$??!Q?$???????m??g?? GO?iI???????H?????'??@???r ?E?*X%?BD>???e?{#Z3??f??>C??????@? ??S?2??+Eb????<_($?M'?I?^GC???aP? A$Q9? 1?????# !??BtDu?%?$???Y??d$???s? :????Q??''?L'??D??? y?|??????i?v????O8W??S???????"?????h?-??{?|8?? ???|??Q$?Q??b?&?D?)*E%?9 ???j?|}?!??????8???I,~O???&?0?`?1?????)?7?y?"Z3ftDJ`?~?W?h&?D7%??d?`@??Arl C??c??USU_@?????$N???. )'??x6"$(?"????????(M$?9s?<,?Q#Ky???2?7??|?U:??????u-?~j=????A)?B?? ??O??Rz??z??y??6OC?"?~???s%g???!?}??????B?eS??2"????6I??'?C?I-G?????> ,?TU?Y[JjBBS?zX?( w _???????@? ?f?/?????XP?A??SS~m0?E?????n?%?G??????1@?yI?j???Z???H????!Lv ]??czHI?P&\+q?!?A? V?cY?)?FR?)???????EX@?&XHf? 4?ia9????&C???$?FH@I?t?w??YWm8F $vM??\? @?? ?&AE? -,&lF??A? ?&*J??&????a?y?MeFJ?V??8?3|RId?T#c$?S n??R?7?W;f?]?N??6????F???d??EaBJ+? 0hLWA ?????a9???~?????:x??b?Q?L$? pT??F?, ?pbi?dV??"??3?????~q??alD?-#?I(?? ? ?? ???? ?? :?$b???? X?'?'?L???????$????>BO??x~l??;_:??D??C?????.?m???=??wm???/?i?; ???v???vwgx654?z????N8H?=W??Y:EZ\A?(Q?}? $?rN?????????s3-??l?x????!_ ????1?~Y?7g?G?E????o}?????7??d>){8t3,w?!?0???{?9????A?P???m-e?hc?"??5?`U?? {?? X?N?t?la??&L???>??????p??#?U1=??CC????N???d&?????po?????mZo??????????mS?R?????b????m?8??a??X%dK???(? ??5?B %? `?>4???@|??B ?4a ?t4h?$J?????p?????$?! l :dbj??"ZMz??l?|O?6?!>F???(???a" D??p??0????0?XLx??,? ?&? ??`??}????&?y??*?m? ???? ?`???????!???A?B?????k[ ?!?????? P?F????"??? ?00??^?????a#??? Vn:p?7???????????CP?dk???[$?ZI? ??]?dSR?D??K??gz????{?????V?Ig???????????\?g ?S?(????[=??????*?-QbY?K b4$a{?4?I)???$Z?????? 9$,E>?7%?$'?X???84??bK??5`??M????????^????0????-m??u?q(-?A4#?0 h?D3??l?$7%?? ???S?D?XM?? ??1v?#H?? Q??aN7i?)g???q1?,??: #??[??Iw??k?F?:?$?? ?I??u??:??&?*???dm6?V=t??y??x??#?Hz????}?????? h? RI????R?(????(7? ? 7?*?mh? ??????6{???G ??I??????X??#?'Y?l? ????G9?????X? ???T??d???????Um???0????77`?~??=5=???R?aCi?&?G??sZ??=&??=4???VF-ED?&??????8??GY'?>G.?s?JYb?o6????x?????I?#??T?l??RR???O???? ?d??jQ?D$???H???I???$???DRl????v?V??:gN???w?Q?`??DiI1Z?`'b?wN?9"8????7d?cF?IM??F?Y?%??Mj>s????pR^? ?? 0???a? _r???03-I"??|??>?L BFR"? ??H?]?????Kf??DXT??! ?fF?!5???M?%d?\Y4? RR?yv?????????d?IP?B???Q\B? K?2???|?G?wG28??????H?[?s??)???KXT??P??{I?JG??0lM?/???m??rrZ???V&L??Y0i??w???W?b?h ?>??0u*1??  ??D?`Z$??Ljw?i ?D? ?Q1Cu=?????P??dH??????????L???RzDG?*?lX?(J??TV?????| ?0yj$?G???????????9?(??>$WJs>o?A?*t?Z)??_?E?P *?H?'?@???????P???!;?O?x?/??Q??m??????5?????f O??h?1??`4o?]??D??x.?6????h???^ ?iC??^?D?D?D?D1LZ 6??6???C????????D?8r??R??L1?? ?????1? q?5/<7??Ql?E??#????????hPO?4kGfb(????7?p?@Y???UER???0??^C6?\?#???P'@??j - ?[?gxp7x?H?l?2 ??e:?F????<|?????>h?'??l H?n??6D?g????-?Mnk?S?0? BA@?)?????(?????Z?=?,z??A?$MI???S???I?X$?N?r?sS?H?$??????~h??????}-!??q?F*Gl??M??D$P??[?H??77?4|???Q0?m?Td??2hUN!?=??bV??-kEi?????????K??7?@2 ?s,(?1 @? ?? E?D??Z(@cB+a??dP?A??0*??@??U????m;??v?????C??bq?????G ~??????L?.???Q?@)??????#?<P?/g?????d$?G??G?W??H?jI????????c !J?o =7?7???????z??Wmu?ZSy???mPinG5[???q??=?????;?nz??%????m?3????? OS??#Bz?)?ABh?I??5C?1?0?C???j???? '?!j(?? $???D?*???##??J,? G,\?Z?D`??Uh ????Rf??,k?V????Z[m?J??? EUTEUUUUWf?I?&???287.????B??6a`AeTZVH?J$\?2??????Q|K?#F4 AKEao?j??L8F?j?Y? R?????/rMfi?Z??R?mb?, ????k?????(??4?CF?#??Q???%??'??s? d?????#??mh2???d(?% )J ?E?N????f(????????E?FZ??[m??I+&?-`%PJTa ?h?????;??p??|?W;??Sk??????Y?????&??g??????:[??? fY7??33Uf?A.a??x L [????g?CZ?3t?[??? ??c???F?M~?`4y2 ]E???????????Jf?l?:????)?v?x?fc?gU?k?{S??f9wf??????g????????????e?}?B??d?cq ?{OL? ?????K???]???c????R????n???L1Ms??l64?a%xv???oY?L '?_;?????g??,tn?T??ZZ?Pa????d??y?<;s???g???~????o?PE?1\)~m?9Z??????K?u?? R?Wo???L??3O????_/??}??2?? ^?.??$??*??!3??????[??????fA?]?s?7]????????G^??m?v?5???|?/????l,???-le??-?w[???b???.??[?CV1?3J^?{???:??8v???}'?G ?|??'????????;\:??YW?B???4f???p??????TI????>??Q??^s?=S????w?{??N??'?>??T???jj-?T????Zx?n??&??A?J?g???e(???Q4?v2S?p@???!??^'|?7 r???D???????-???????Os?M?? ???`Z?# k?P????&Pp????z*?|?????8lS"<1???L??????u?M@=)*vk??????u?%?dZ???d8?=?.E?Q?^yj???$?}?f?Rj????3??UgmiQ?? \0????1 ?K??59QJ????U?f???????A???vfwy?/^?#$?!?N??%?1??? ??eW6?Q?>??e,*z??a??a?/???\?? 9G?B????? ??{?T?0??=?fn5;?R?Vr????g??+6'\?????/e????1????????*%Q?^~h?8F????L0$z????u<6???;b?q?L??????Mc??V??zF?%??????o?*&[Y ??&???*?????r????n?N?-t?)?B??|?m????????B??ht[,2[D?"x9???2?.3W????V+?q?;?2???It??&?l??x? ????E???&M?3????$????o????^`???????????$???m???????R?b?" ?rO?G??D???=McqD?UP?JV????_d?T?? XO??dA? ?y???4??:f?F???B???yX????I?d??o?~?Q?????'?0l P? ~???##&????? ATA??dX"? ?5h?????=???J?qQ?4>PH?0??9???.???`q ?\.??`?B/?/??Q0>#??u??v??^??XiE_?????W?\G???$????o??`??e????4J??????PN$ ?3{???GH?!?U 0???'?+??????, '?E|???]?[? U:\?? ??5??????Vz s?Y*?B?@M?????b?K"????#?!?????TeE?c????v???A?6Ng?-?????%$q??$2 1?H ?E????????F?6????q?yA' ?4?????? ?????;??(U??? ??????PH???????BH>v2a ??????f????`?&??}@ ?????:M? ?b??WX?"Y 0-??s?n??H???#??&????S? ??O??km?Y|[w??!??R ?&UQ?1X?4?L??z~R???jJ??Z?@?C?????__??????%?6??????UE?5??K???8?k{{zXf0a;?J?g??????????N?{???^?Vj?E????1c4?QO7 ?R?????????g?`o ????!p]????lwI????u??????h??B~??f????G?8????3e?#??????^1?q.?4r?a?bPrV???R-I? ??l???S?d !?L???gI*?x???KU{???(c7/??q$?ca?O^?(x?f?? ?)? ????U?m1?????f? ir??F?}i??u?o?Z}0 ?dBu?????.?%t Fb?S??9 ?? ? ^?f?wu???@?b?? ??E/??'A???_?+-? N X??$???e?3?2*zW~?tkm_,?>???p??;?)v??e?vwiHgE?????^'1??,5F?W????!??R??cP1J4?9.~?ml? ??"?u??| (?&??_???s???o?7i??.l??? ?v]?'o5???? A0?t???8?????I.?}? }F???&?<2N ???Z??e??"++* ??D\ ?v7?)????c??r?e????CU ?:II????SM??-???R???U`B??b+??T' ?Zd0? : 3?????%94????X???3???6???o?[??Lqm?8?p????????> ?? ??7????1????R x2???? ??\??-?7?*z??r'M????5!b>?????L??\????(G??J?E?W??X?!X?c?Wa?????]??]Y???gz?5t_? ??????????~????????mq???+??j??ys?????^&kE|:J????????6?jm'v?y7?? ????Z???-w?'???????E[MV6??K&??? /?:F7????a?!?y?&????#?R?f???r?+6?????>??3???7?? O=nj?)?'????I????Z??tf????&? ?_???:??Z64k ??8?'?\Z53?DK&y?q? ???j????n?T?????+?)d?2P`??F??)<~:?se?y??????9?????`>?T%4&??? / ???W?sA?TJC???6?me6???????e3~3?D??%c???i,l???L5:P?3?J6Y.LL ????kI??=?/A??/???)D?;?K?1?p?i???`???$?B`*4?BG??9???c?????0#? #???P1??w*?32?? 3&???TVr>.?m&?a? Jbst?X."????Gq?1#??w?X3???8SQ8T??I??P?Y??)?O2"????PVEnH1?8C???]&@"?D)?#??????6?1??.??Dg?M[~??>?g? [?/s7?r!??Oo????/?(9H?resW????7????4??x?vo???(????F?(???.??? ???E?~e???u????M????$?a???H?i1????????>?_?_{?3?#??U?:?0#M???m ?7?????R?1?]?[?.j&Xg???Hr>??`??u???R?@R? ??????ZEA? ????Sb??vS??s/??`??F?S? ?=ik?>?????|wt??>????????U.??`???PvWCG???bSU?=???????cV??[Xg?????A ?W?E8?K???H?????????R?{???I? ??~? w???? ??? ?|?y?&X?O??"Y??&?2??/?{-?f8??j?x??????+???Uj)~?? -a<n?1@%iz??r?++,??c"?IL????9? ?Z?>??Nw?v60oO????L???N  ????i? !?f?????b?5??m ??w!??BE?V??'!?????~X?JB?f???.l??\`?a`9v\:0??? ??`??H? O????#????mH??%?O?_?????y???Y?l?????% P?K\_????NP>?A*J?L7????Bm????-???M9?f?'P?c?t*9N?Vg??Cg"?????!~?t??'D??g(? U??@???+??!0??l??% ?}[ ??X??5,?%"?f??\?????f??4 ??WC??Y:b??_u?Jf???? m#?&????}F? ??i*N$?L?_Y|d?1???zFz=?5?HBC????A??^?~???i???8?? ?Q?]\??? 5D~??b?Y?~F???[?BI?>l????e&I;???f?d~??.??H?? ??????s9??T#??!J??$????????? ! w?Y??J??I??c??z?"?.???I??|?O??&l0BW???>????a????/?c Z??u?G???I$???:??X0.???z??]??Yz?|/G8?]Z??z?|N???y?Df1O????eqY?b)?w?q?k??;O ?]???rN??6I!u??r?.v/?t?!T ??Z?~D?^D???M`k???????k?.f????H???C??+?+?H?? ????Z)?iB??X?E"????b? d??K??N@? 5A}?@?? XDN?M?@?D???? ???1`?????.?z?y^U???.?? |?.?S?>???????1?v[^?R?s???u?E?^????? ?????T?A??9??????????B?h+ ???#?!?{???.? K???]?? ?J??+K??b?b???l?X?q?x?g`?nMT?+??R??b?iu?9????D? ???r"??????b?%?ib????{?M?(???@!???p???V?3??[We)?h?q??'??s*???????~?t?Shd??T? )B? ?????45-&?x? B?s{??+??|gAm{Z @C?pa???t??!Dp?c ?H`!r?LniXZ?V,^?????????p????.?s!?P?Ez?,`???-P?K,X?b?_??????,?1{?>n?*d@(U?gz?X?s6=K???I!A????C? ?F? ?-7 `? ???K?????U}r?o??boV DR ???.!?=??Xy??N?"?, ? ?_G?{QN?u ?=k?y?p??-??--R???, ?'(x((n? X?Q ??? ?:U?pB(???"HA??(??zMC??x??%r?L?@.!?.,]?6H?X{AW???y?????iH???fV??zE?}???j?\???2\?5?t_37???R???^?%w?Z.???2?R????X+? E#????X!?C7 h?D?Ahvi???ll|??TP?? bH??-?`-?U*??V????yO?Z?^e???z5*??w?o.X[???#b?J ???U?~?K????pU?@`o0 ???tT ????X?0W2?jJ?*B(?! ???]c???\??? ??g ??(?K???l,? ??,???p?????S9??&!??? ?h??*???????],???.? ??$D ?% ??F?"?A???m?de??,???Q??b?l????2?@B?dd`?" ????jI?@??E??0u??@??*??7HcA5.K???????E,:a!A??????8 ?b????[??I?T?????@??%??s_?Np^??$X,??????BT???!??;? ??Sz??^??h||??Q;@??@/?>P? ?^??????j??*?]? ??/:??????aQ??i;H?[?#\y?T??0?????X,X?b??? ]??pD?s?kB??0???c??s??.??9E??????OP?)s??5 ?i??!h??G?0;????Ne?G?? L? XE (????PSD|?^??]??????????? ??????G?G?#? ?}@??????_???l???avaGB?W?_o?J??JWl?????]????>??QDH?M%4??[?-e?F?L8N???6?a|A????+?X?\-??u?&:,X??K?6/???"Q??dX at p?~~~g???????z,??H D?$?|?`j???]Y[GrTs??????(??<9?.?e??O}?y???R?r4?>??/O???z?????"?G? ?????A?? X??C?V??%"$ 0g??n_? A?j|???xC;!C [,??????C??$????gBu?T+?O??$ i???k?4?j??[???!?????8)HwdKi??Y@?X??`?????? "?QU;n???E?C,]??B??G.U?a ???w?f?D  ??JM?Yp??8q0?d?"B?=?? ???"I??)???  X?????n??m?????!#"?1"?? ??????F4?E?C%???:?-7?`c???UUQ?DU??C4J@q6"??|])?AzN?????.:Z?|??(r??c??fke#W?YB?i#I>???W??u?6Rx???)????}??@??J?~xd-???A 0,Mv?&b?""?E?-?H????41c?;8)? h?J????;??B?@?Z?1?!?b?M[?????:a???t?????}O???W?g???GzE@f ?????D?T?p? g???[al???L??+*?n??.?:?a???t???{? D 2?????? ??? ?I?+|E?????S!?_{?????c6n5?^??j?$=}?{,?p?5 B/'"?2)?EmV?ek???[?P ???,Fa:??m?vu?8???P???AHz ?-????\??]???@?0o??????<=??8h'Y<7??u?????uX?????$:?4???"]i?}[???2???????D????]?s6??P??X.k???Z??s[?$f???? ??y?????XC5???!??;zS??-?g:????I?h?????CiM?!??M?WZ??????h?- 2???L ?m?a??[? r[?}????????!? C?$?CTl???O???,?T3??- ???t???H?U????\???X??9??K?2r?\?--?3?h"hm??#?????II?5???%????)?%??0q??0E?g??UUQ???{??i??p?^?s M???R???t9?^h?o??X?X???????'~J??0???r!2c?r?z{? z???t?? H?.????U???=)? ?????PH?Uek????e???{??x)??&{?AZ???o ???]kB???E?,X,0?N????b????[ ?????H?#??7?Y??? ?UO!?D?T.Q??tKa????P?ML?????b C??L????X??~iNa?o`T?`m????p4???e??(]\?vO7 ?B"fm??T;?(?? $??C??p?b??y??"$?=?*??'Zo?Z?$?(;#?^?~#??2????????z? 4:???aE ? ?ce`??"??????0s?????a8fmFDZ?u?? p3???[7-???nv?1??9???,?%??%?"0?BDn??l??9 e^L??i?Z???fA???+? a??????Ug?mr?:Rq?U?e \&?4?G8?`D?1?D???????????k?y?@??T0???vB?v?.8 ??????? (?6 $^k??,??QB ????h b?@?????G?\d??B??????#5S???"???|=?? ??h|V??0?@??-???*???'$????|Xa;:???x&???jp ?:??????.??(/bC?A?X(X??????Tr????n????p`? ???(???T? ?P[K??"/???X?"T?????? ??? H?y??????N?p)?D0P?.?k"??][????!?8? {? ^?7R9 ?2??y? ? ???? ????(??????h?F7?f??K????N??A?X ?? ???Arh~&? ???Rhp???[??!a?@MoY8??{~?]??aKK???I?Y??V?????B?\M?Lo_yne?p!??n??!5???{?d@????`+??!M??s2p????s??!??(jF:???9?? ?@????8???`n?L?h???$?g??\. ma???.?d??S?2?? ?d ?F ??QZb?1? From fedora-extras-commits at redhat.com Wed Jul 30 07:24:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:24:24 GMT Subject: rpms/gts/devel gts-0.7.6-autotools.diff.bz2,NONE,1.1 Message-ID: <200807300724.m6U7OOEw025249@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25241/devel Added Files: gts-0.7.6-autotools.diff.bz2 Log Message: New. --- NEW FILE gts-0.7.6-autotools.diff.bz2 --- BZh91AY&SY:????{??9[?q?U6??rw???????`??????#Sj???Q?[? ???H^????;?????? :N???=???{????/?M??3n????n???%P?{?tX1?:?????X4o????^???[M?;u?1vg??J?e??e??9??1!?[??*?PkV??{[ ????\ B?f??QT?lR??]??W??]M ????Z?????tqn??i ?l? ???f?$'f??XoX??????w??wwf?m??????????uv]?I^??E{m(eU??nZ:":5"??? 1^??M5!?? ?U{U'J?HG??g2?3?3P?  ?G? ??)?H??4?G????z??6?C?44 5BH????????N? %?a??E4P?.cVh?4]??????????%?m????0?D?????01H?-????b??]??l????S????[}}n,???j??M??ZU0?RP??3?`XLa???K),?$?H???ZV]?]u?]??.????%???c?F?H(?! !?A?d??30? 0?IT???-?w??????????????$???uo>?/T?z&)?6;?4???7n;?j??t?????[=eu????I.??w]??Z? ??7???? (????J,*?I$????d! ????1`16K?[?Ix?&?r??J???t????? >-Qa????\?:?v.??1wv.????F?X?L?+J4??1?!3?q??????*c??U?.)$B????????? ??/3[??q???5%t?????$?ZR???u{?]?iZR?D]???2?Q???B ???j?}V,?v?V*??????biJ?????e??p6D['uN;n????]M??s?3?????ts??L????y?o???=?????;??^?????~???}[bc???Js??2?|??????7?H9?????^?@? =Fr???Y?:4?&?6=:M?/?0??5?p-??P?3?????u)]?")$??i?A?4+???BFJG? ?7vk???)f??Fi??"C0??? P?&E????5H?1???U??G?8?z&1?k[^\? D?{?????eYms{?k????{:=??8w???N.????>?? ??p????H`v????t?3 B? ?x6???"?6?????0??B??0`??~?4? ?@?? ? ?????k???>?????? ??R?.v` ?T2%`Y@?, 7?d ??? Q???H????c??tYh????v????_?Ky?qb???_?????m=???O?wde??!?0?-C???+??}???[?x???? N??????X1?????4??F?[????yV?[?2? }??1?=??lG???p{Y=hk???!EB??a ??:r?5???D???Ap??'?p?<>?8???(?????? t??5???p?????_g?{?z?????xCy ?????s??z?U???d %??7??? ?A?0???st8?9\?f??rQ ?yQ1S?*p?p???b?Z??4sbi?E_???ky4{s??sPq ?Ew? ,:?a?i?z3?v?U??s@(F l?tm?b?R???xp?B?i??W?2L?My?:????????`? ??L?e????34E??"(???7u???g ?????:0???M??!Q?z?D7pH;?d?? 9?&d??P?)Uv?8X?w,??)h?` ?IC??;???0?N??z?b+N?F{I?q?O6NC??R?)OI????j?P?,?I$? z???$V?A ???p&???;T??^e?????z?????y.?l?m7??W??h??F?|???y?=???3*??0?u?V??b? NF?>ca?QM?????3?gJ?=y8y?G"???;?M68m??m?{?L>y??? ??}?U?t~:???(??A:????I?BB?e??v?6??a??#A?1??K6.????i7?1????????E???(?KY?6U\) 'V?5(??_???{?????o???v??fQx?8?/c????DUV??E?FK??C!?Y'?????????#?H???o?a`s/"????4*? {????G?????????C???c??s??????)?fG?,w&???$$?y?qH``??? D5?x?3???v?? ?n&? "?l? s(?G_6??\?T?+???35i-B$27_]?um?Oy+D???3?$+?J,?c?zCf?}??1?~??(?k?1!??U???$???sI!@7??S??b?E?z%3;7? E??Q??$0???)!@??|?E#????.^\16???b??L??-????[;A&?kcb:qB1#w??b?g?????8A??h?@???G?{?~??u>wZ??0N?x??tk?#?(1?:O???U??N?T???B:n?_?r?i???vy??S?????S2???31?>hg$?g?X???7?fg???????u?k??g????cO?&?D???%?5?b????'??M A???O???a?Fq????@#vg?3]??????ZI??2???)K??A?????4??? ?Nf??????????6L???O?6???M??)GX?'@??????Q????a????????N?>.???'W{??O3??????w<??? e??C?s??o?e?#?c,?A???>r???S???h?_.V??c??Yw???Gs?.???+R?????x?v?;???V?? ??@(1; q?6dz?3$~?4?h??x?a?????h~?^???K?.I ??Lm9Ip?3?2Ll?? ?? ,]q?1??/e???? e?,??8X?`R4urH`a?`?6?_n?*??8 ??OB&????@/????<p?j?u?Z?b??IM??.`2??"??X??|???????u4S??#??????f??*l??? ??2i?RR?67??6L??????W?tv?NS???5??SUP?$?x??#??=?}#?$?z???S?|??? M!???H ??? /????Rw'W]?|??&?? ?????Sr!?sH?P??@T2Fak?+Nhu??'?4Qh????cZS??gm$?DZJ????G??3???J4%o??^??q?i?{p X?Bo??"??p~????w?5dy???????X?????Q???A???P??yh??g????)w??k??????'"?}?W?Q# ?7`hj???*n???[#????????H??j&>""???jD$?${??B!@?6m? ???_)?i?4C??????5F?G|)?pyB@? ?Z??B{????jB3HX)?"?(?"?(o ;??R$???]g????;? ??A??P}%u?w?E?????????i?S??D?????-~?????|G?p? ?????\#H????{\??Q?UE???U??;??0:?j"1>??L(8??T??B??z ???!??^??8`? ??????4??????n?l?.lk??!? ?R1?gM???Ga??.V??9??7>s???]L??c?}x_?G?~?cdq???lo@????V?Y?z :J?????{??:v????E???P!B??B???nW&F???????!)?????????????9~<  _????%s???m?p???s a?#?O)?????F?f2?$? D?-t???@?,U?3 ?~ ????-?wr??n>a?hb??????A!????????????E?~???? !??-&???? ????dl6?D????y???^?vD????g+?6???V?&6EX?1??????V?9??=a?$f?uh???!?a?+;|^???g, "] ]?Z?????:??6n??r????? `?????;?5i?}?????Rz???j= ?w=? a??.??????D????D???? 'x?H(;[??_O??JBjI"???????T????[{j??.??????'A?????|?#tD????,.?? =y?9? l????>?E??k?Z ?zG???R????.?_Y???c?p/K?????f??|"Er??????y???G????? b??.??Z) ??????????\???oW????????F???uo?=??????????????I?7???????J?o `[?+????????<%?+?Y??C?????>7p??I??_?V??>??Q?H?(#??#v%???N????`?LenK??????b??b[??IHL?Vm?????D??GO??/>-??????Zz?? ????77??<$(k K?} ?!??j???{?}[1D?[??Ci????aq?=5?T?Z?us????4;94G???ov?"f;5?#??(???.?A???t;3333Y??-a?/?Y5qv??!??????????h? ?k??r??Aj?n?&fVA?o????P}?I??????}?Vl??O?e??0??\ ?F?6?3p9C??h?e?C1v.???BH,#?Jpx??-??VY8??Y??? 7_~>?^b????x3s?#?c???+??&??|.?????? ?9???^+O?G0? ???1w????? ?3Cm??g? R?F?%63?A???????4K? ?9?.)?. Q?J?1/+???????t?T?? ???k???@h/W?????????G?e?"O????:???/??cp????@?} ]x?e?,OXG??6?=m??t$C?d???y?.???h????{??????_%U??j?L(?1L?U?1??a?f?T??,??FF?2{? / $??p????40?# I??????y4??z?.???????M)??N????????.???u]??d???Mz??e0??pu??????yL??[?7e%???[?])I9)??????????NFY??dY????????$?e&H0!qY0?>?2?] 01?djDH,]?D?h??G?$&@a?$O^?<;?`Zi ?C????F???)??yT???Y ?8IM ?HS at i%#R#f?<]?W???N??MD??uw??????c?Y??????&oG??? ?o??+??bxEz?ia??:0?v?????R?Z?:?c???gg]???M??a?]?????(d??*k @)H??L?S????>??P>{????;?? H/7F>?/?e???W???P?XfC??lLQ??X??i#?/;?3 ???????V? 0?66#???Glo#r??pV??? r??k! ,?)??~???%??i? w dw?o??5$??9 ?"#????T,,r(#?gR???bH??IX????v??????!??-?B{??p\?XT?) ?"BM???D-$JM?[dh??c??b??? K?`??j5???Mt?&?!?-}??e?2M,G??/???f??o???4?W?????,??j4!d?h?J1%$@?????y??m?4???iy?a??7M?????Xiq+???T?J)&?g?:M3?]S+?6?;?????????^~????????C????? 3?????k?>WV??,tU#???}??w[???#?X?_=b&?Jb?w???^S??x at G?;?dr?t?j?+??J??\?9??G3??9KK at R???!?i?4Y?<^????9???q5--??\_???????j????K&?{???c/?E? "?i????_??s?????????????`???D??OB`?{TT?\???y>?i???e?!??`? ??????H?=?${?aQ I,E$R??ZDI???? ????F84???? ?$??4?xJ?????????c!&8j???1???'??@u?Za?Q2???+??????98}??@s??????W???N>?$??Tq)e)M??i??0YK)j?wqM]B?8?B???2k?l????L?????y;N?????#?l??rD??????R?X???'D?Q?q?d??????kZ?}`H?P ?G5 ?T????3#?v????????A??H?G?j!?OA??|???8M?JRG??J{???#?H??T??????I6}?[?Gdso?sf?1?b+?dl?r+x?i/@?GM?????#?. ?_=#sbuB??G????[????Z?u&?zI??7)m??1?)???UJ?????'#?*??OJu'?JMlU?????:??R?s? D???R?????w~o;??????????g???? u?B9B???c???7rl?I??_???????-?b?L~????#????C????????s?n??*?E?PsT2?~7??~!??*X?17? ??sg??????a??,?*RJv ?r?;????'?i???'??=F???" ?A{?mcR?Qr}?08???h?L. ????h>?QBa`? ?RJ)s?b?o? ?-(???Xz?"?P????D??$??X?0 ?[?O?eZ?R??+$r????=?/;y#w????>r??*???A????????????? =?????I? 2C?VC??&?I??"O???(?G?????61???6I?"???????s??u?? ??y??rW? ?/&??4?????:??U??{y??l???P? ????m??OR??L? $]??? R?{&?????H?z/S?J?? ?.???\=?Q?bD<2?t?7 ws??u,?"?X?=?8U?Q??O??U80q???;ma'??????9*???-*b???N!D???7qYT!C?)?}z?&???N>%?1??qz?I'?}?NV,u???F?9??P????H ?y????????!?-?+???pS?e?Y3?.?n??R.0?:?C!q??<*??????+F%!Y??????n? ktb\(@?Q??? ???0? ???]????x?Fp5?+?l?n 6E???>Q?d????1?dFLX??I??????~??x???#?ML?2[????c/P?E???)"Q??#?????S #^?@L?~?? ?B??>??????B_?A$?5??S???_?;???????J??%?U25PEA???) ?? ???????????I???C?iV?VD?d/?D??H??x?W^{??{;H3 ?M?_?W?nmS ??? I??JUd???t?k?GN3????k??e|???Q?9??h8??0)??-H???u5? ????R?????r???m/6-?c2Ff'~??^@de?B??f?)???????!Q?w8??"?>??i?{??????~???I????????Z?|?b???_U??;?U<u?????J?3?V??*p??C??????iC-????BT?????H?????uE?a'???C>?!$???!\6?0??c?ku??!??W?;???:????}?X??{???v0??ri?\}??r?.(=??*}?| J?q?1`?$??ElO?????}??z?9??????a?u ?x|\??}??V??5Zb>7D@?8$|?V?AdE,?2T?#?VC^?????k????g??H}As ??? @g?"??|N?}?n??p?p`?Oj?z?g????i ?"????Gk???j<9v?2?9??7??????$%????Ch?{?I`4Y"+$?B[?LR6aApTD??@]I?G??iT?F?m???D?BN??d:?????{??????????R?*sx?'?'w??'e??&G?F?????Q?_????!Ws?????7P????L?,p??n?? ??]?m?? $K?IW???M?/?????????E?)? ?p?7{?????5??k?6"?????U?>????N?mi??Oy????????.????]??;XO??a= ?????} ?????-v? c???J?A?6?2E? S1&D?? ?!Y.????]L&@wW?????+R??/????J? ?g???U???????D"?W?!???]??g???<????2E???=?G6H at k???'??.2A? FL#???:8?NGsv????F?WN?O????~??t?1?a?f?H @????v0g??/3hg???gcXB?$}'?8X?l|??k?yP??k?&X?"?hp??????E?c ?+?]?RLz>?.$????#Q at L%??1?"??g|? 6??*??6w?s&f,al*???L?a?+1??/??>[?;??????;??}F?????q r ?Q?d?dh-=???x8?; ??>????"6???????o????=?R??!??H?!???2? ',?5?"?????X'&?;C?C??E? ??x???:?C |?G?J.?&_?`/.$?Ef??6?:k*?A???J?6?"?E???dLE?"?????_???J`Ac? ???C?z??}?l?|#??:*Z0b ?BO? ??"#??R? ???????b???4?Nf??j?r?c?a??m?i?6?$???;???A?? ?Wf+??Sl???P????4?~N???+?t????b???lB?T?@*2,&?+G3?[gk???k C?D~?|????h??j?=?rTWC?-???)?L,?????L B?$>?4? '! ?@HVpo_I??)&l???? F?x xj#`?HYiPBJ@?? ?????w??Z??r?????:?T???Y]??d?s?Y?]X?y???i?'?>??0?&9??v?z B?.???d??#??d??f??????z?????????:?<~??]}~??P????Z???? A-????=?? [{=????$ft!?I ?IL`c ????I?/O?6?????E??o5?^j??t??|=??n???Ff??hH?8??f??ghJ?}??` ?????p???-??D????v??`?v??`fr?i?'w???bb??ESc\S?~?ZG??Az?#?"h ??ac?r????????b???8fZK?@??X?p\f????^ d??F?????!? (3???y=?y??m 71?a>??us?-???1?y'R ?6?a?[EN???dR???@??9?H? =? |??z??`?????o????????^Q0Y9'??????2H?v8?/?M??iZpx6?MTMi??(2q6????????,?M?/????&L??E???@??????T~?? 3???7??i???N?a?x$????F?/???dR?????s??|? ???g?u????s?m?k?m ??c?d'?B????D?2%'??G?'&??????I??'? I? K??h ????? 8?A?? HD?bd???*~cc???~/a????;????????Ly????+zX??Y=q?$???A ? ??\8???ZK???j s? P????N?????a???`?C?? :???fD?Tb!9??N?@??f?????9?dnv%x'??8????0?H?\OJ?k?jO????6jO???????M?????p{_iK&????}???s??????I??????3?usy???V?H????D???-8????????b,??^????S??d?????v?/(???"?"?G??C??????k$??41ig????C???/@?|e??@?N?Q?\?Z??^?F?*??} ?E? ??? A?????[ ?E??G%?0>!??f??(DQ?????z,X2f7"c??Y???[???m?d?????H??:@l??``T?@r?s?E?#9???F??z5bTd???*+???VWtG?b?)???6_v?M???S????2???'?????,?L`???N?s?x,,LQ???Q??C????*?;?.?I?;??_K??i???C0?U??ih?? ???.c???????H?'?????????D!??I?G?"??N?? Qe?#????\?Q*R??? ?y?????????;?ZC???? ???a?& ?M??|OS(??i???????,c?fh}??i0?$?q^??B??LGhn/M??)p_6 zr?L>p???nz??H5+ ?P18?5T?C?"t??Q????H{???P?@i?V????R?"E,D8?!???k???? ?2?1?? 0?M?KrY?0??H?m? ?? x?{?????Hd>?6i???G?$?Z?1?F4??a??1?c?=??E???K????U3?L??n ??bbFTW???8?? ?H????PQ?`?$um-e??\N+?I\b????? E' ??@^k?1????c'D?_Q"&??? (0?Gay????? TL?x]?\?6?(u? d???$F?\4?????!x????8??US?????9??%)???? ???A???I 5??????????? ?!2bA????0???q7eQ??{??1??????:?N???&;???$?J<?D]?jpz??????'?d8?y?? DH?K???9xX?Cm???? ?Cc?h?b??4??|???D?3?m??8?z?t?$? 5???7CG??c?????m?6?:UXM???DF?|?i??M"????????o??VL??s?X????r?????1"?,? ??j9?2? ? n???6????7m???r????_??/???E?O??^?~X?B5?????^L??Tb? 1?3M??????}???4IG .Ie????5????o?\? ?c??T(G??p?g$??V?" 8?hZ8G?????V??G?????5m*k%? `eg?I?G?"E??:m6"?O?B? ?K??????? ??????+V?s??????D;>'????H????h?-A??P*??f&tt?|???y??9y????s??C??S ??$n6?"??????y5? W??dsc??3&???? ?N?c??z??8?K?e?L!??m?[?.??_?Jx??E?_?sxN'w^??^ "A???y?yNi??$H?r?????3!???7?r???&#??op??^??]?c?????f?y???~???7???-?>?1i??N2&oW??? ???6R?????X?R?????r~?H?G_???Z??????fY(??p??z?????7*???????vx\?i>0\?#y???0>"??????Ex??C ??}a?;OMB+?h,?Q.???? {? ? q?Z!0 ???6D???z$J?2?>E??"v?]h???m????:?av??? m? ?J??0?E~s??`?k?"0H#? ?????A?i_V??q?????w4n????knwk?? 42?I"?<#????Z ? ???p????\???M?-??KV?S?\?M?}?4?T[?????-??Ed7S?s$l?XNf?6NK??rMX[o???"u?|??J}??\?B*?$??i)????O2? .??????B?u?M;z?????d??l?hn? ????*??????O?77O??2}?rge?'???'?|??m]_?"??f?uhG? ?Y?B;=O??`????? ??9?` [n0!???G?nrNi?M?*%?,?Rl0R???4????I??H??x ?99# ??B?? l??|?Z???????M?q???/?z?"O??fv???x?? ? ?t???J ??| r?9kt????,2U?Uj??????,p?}?#?#A??$??? RP??2?\2.?MQ??*?????%?Q2&??n?3n????B4"???e?????]??w????z?h?h4kX?????0?C?f{8p??R?M?]T?md?*?,????F?f?u?i??HYUKl-V??f10?c m?er???v?/????\{????e ? V???????l? ??k?Q?R??????????&??????y,eO?N?j????X??r*9"??Tb??:?kky?????#5ZKbBU(??k???????Dr?5?{w?[??>??????r??? ???.-??*)?F?Tqv?ykb???????2? 0?&~w???????????"y??????A??V?? ?@????NB)j?k??mHy?B5 5!???i????=^>6 ?^B+(?|??` ?~O-??????I??????B?-?M?1??????C?Cp???jv?y??G?p{??c .B?_i????b,???D?u:???2?????}??1?s?t|Xc? ?H??B,?k@ ?????]??Ux?????C?,A??,??m? ?\??? EE?k8lZ??v??}R?O?8<'S??|????k1?c,???? ??k????g@(( ? M??&?!???)I??????cZ??%R?=???+?????YJm??+m????GQ??a B??7?????g?? ?W??????Z??%9??6???c 1?f1d?I?? ?? o????t???hi??5pm?a"??$? ??????aDF?)R%+?q?yw??????R18F?c??b?[4?M?10?1???(?JZRB?? @?_? Jl???m%?????y???iT? ?3e ?>!?HW?v%u*KQIj#)BB??P??I$?3A?&? c??i?V)?J????n??)V?????ONDB0U???????c??Wc???&?M????w???????*?T| ??{??10?&=??x???|??=?t?H?? 8? ??1e???%? ???????:N?^??t|?i???????T????c?x?IF???4???YY????1?????WDvj=??\?Zj?VU?R?JV???S? ~?@?9???pm?`?*?pS?B`?W8?????;?h??-???X????$Kwl?f???'7? ???????????g?eo?v?l?G????r^g?&?=gG???????@?/?ndS?C?0"a?s??!???<E'???R?U????"??=? )?r??i9????~?vh?O?5?D}Y&,????e*z?P2 $@!? b???D??~???? s?S?$W????$|??L?#d??_???|7??n?)?PU?????O{????#?HjOi?C?J??K????`??Q??N#??? ?V L?`f/^h??i???:tg?q??g?q?g#???? ????!???,|d?A???? ?Q?G?G??? k36PG?l{W??????????h?L &%?#kXrt??]rG_v???$K??y?!i??G&?o???xI?I^? ?%N*B????F???9x??[V?7/???b? i??`???j??_?k~rM?.???t$6?Q??@?:??? ?X?"????y? 2T?????#?x? ?.?X???!?J??????]??????;?)?=?u???1??%E5*[Ia,T?????0'?;_I???d|e????t^A)?>??J?????2I,???q?? ?\?W$$:??+SR?y??6}w???U??I?????????b?_{ ?p??ec ?|n???$???1?????1a??b?? ??J_?????G????%??X??68? G???? ?d? dTn?D????????2?F?_?7???#???~??_?V??p?<l?$?RFfC???>c????|?}2??3$??M??????n?????P???X????_??vF`=???i??=??|" ??n^?{??zA,??&Lr?1$S??0?0?y??17I?z:??s!?*??N???=???Sf?3?"??n?z???????Rs?!??U??z??,??o?????????I?xd??h??T j?+??J(_???0?? 9???s????f?????d+D?c???{=?/?&??M?#????MI%d:?y????#?s???i,?G??C[u?Gt#?????/"F'?LA?>??"???a???4?HF*?2N??R2?uv;??'P1?J?r? ?????5????g^_z?orG??1?q?F?iFO? l4?E?S?????R????8??a??J?b???-L?l??@}@=???!??1'??J?J^????P??O?????|?=?"??~??/@n??OEW?}???/ p???????_L ?H,Yq*??????e>???????????~?????????=???M?Yu9??U??Y?A??B(??C?v4{?B?QBC`?=?*CH]??? ???~]??B !??s???HN?????fAR?)???}??$??t?I?i?8 ???????.?~S????yw??v pb????A?????{?q?=??/??9??$?@??0????]B???7??Y`^??G???KuO?????????Ra??G?M??J??;gJd????J??????WB?????=???g??M???1X?{??#f???k???'y??;?|???d?(J?n? ???/??O???}|1??????????HK?????[b6????4?`?MxD?.??????R???????UW????B??+ rPU? @l???1???? ??m?"??7?9????qd???S7D??>"a3m|???D9l??M????^?? ?X???OR???J?(R??K<"???5?????a??Q??Bp8HeB5^#?4$I??;???k??$?p^?o??>on?sm???? ? 4??0???T???O???? p ?$???a@&?4?J???????A??YIJ?L??o?Up????l?swH?H?@?V"?????P????a?q???l?*_%`?????????~zG??$_OL? [o??o???????o??/???? ?~??A??r E'??"????'?(??lF???h?R?/????Su?I?04??r?;?hi?j??????8?oA?g??0??/h!t??{P|=?W??H???? ???0/)???knR???? lW?d?????#????????(LE?2d?'u?g???jo?????????-&???`Y ??1???mUV?c|?$T?????{?M?W???h??z-V?lM?1G??????3?#??\??36??9 Bh???F,??2??Q?z??j????$~m??Q?}@1w5 ???y?j?????s#x?d??)?d???JI?Q??A? = |[??? ??? ?? ?@T?_?c??%????fg??l0u\ ?Po?E?@ P??[?????iM?FJ/c?> d?]???gu??????'?~??9M?4v1?Bc??qRi??MUc?#?&?ltw;I??????S???a|?YC?F?b??'i??p?|yC??GH???n?z?" ??!? [Fcc:??%?????J????"??2j??}???3,????&u ?"??F????}???????0?oa+?@??Z?? ?u?w??0?X?V?t?S??o??z?O??$????Uh??????(4e??|>^?}??t?rt0?o?????????sC?T?q#?{}f?'M?^??A?f, R?5 R??????5Y?? ?? ?Q? ?????{?I?AxTHa%uq-j?C??|???3?????N ?g;{?T?R???{???7?? 5KN?D%?N L?BqMB'?`l?s8U?N? :??*??N??eY?b????dv?X???;?::%??t??v??F?? ?=?;??~? ?? n??ZM???^+-??! ?z?? X?z5?s??????8ny?<???x??c? ?1??Zo?SD??N?????>?}a?8GPj 0????????;JE? ??x4)'E'??A?.R`?9V@????K Q?I??????L?QP??????_i??? ??,8? ?0?F+zM??????O?Dc"?VaX2??A?[. l!?E??e?}?????us#/* Q=????xBuk!9M?????x?Y9 '???@ ??9?????????????H?:????I?}Uk??B`???B1??zv=??zM?k???`8F?H6/R[??>??, ?b????$v????;??A???V???W$0??? ? e?4?5j?6j??5??k?}?N???q??.L??Z`??R?~B?>?"?x?y?????~A???f8?o?9?? ?dQa???i?=V?c?^???s G?E?@??"??? ??]??????X?6R???]?="?;?M}?0???9?MSz????????I?4?L??????:??4_?y ?_?M???`????Vt'HF+??\t??? ?? ?"???>eO?yYk???$mI!???2?"h?@U?$?y? ???:M??1?(_-???t???c9?9??86??)g?7??y???Le???{??????$y????I^????Z%??7??GKP???:???22.D+S??#v?P)?*?h\??????V?C??a???sq?p?;-?{&5??a??Rp?????P"? ? ????,??1????]?jV`??zy?t8??1]2???C?$??T???????????|x?Q?V??r??{N?F}7?k?s?'????g???|;0H>?????8=~/Oh?3~e?=*??D??c?/????Ao} ?}??B???Ve?x-?;??????????L??oc?=??n?+??r5????"y???? ??9?????????3e?H?6H? ???;??'?M?\??????$?????Q??h???HsTw?I?? 7? ???? Ud??<4????k+a]?x2?a[n???e*E????!k??? ?^w???t?@1???#??f????F????dh?`?q?z???[dY????q? O?#?n?0| ]:??R?R?~k???F?2?fQ??? 5?????)?U|}?s?h\m??L?#?y?-T???????T????%a? ?7??`?? ?;??????a??????)??0??2??? ?.#?????????_???ML??s???Hrp?Ex???o?wq? Ye?I?C?l??T??N??,?^3d [M/$?F?#m???'?q?e&??C?????? g^`?#?(???)*??"0?T???#??,?Oe?V?&B?lTX)C6???UVC????0?.????? &?"v?????B?ba"?d?0^???[m???????????ym?m?G??r=!??A??H"?1?w)?y&c#6TE??;uXD??l?? ,gV$??@m?????&??g?]??K????8-??lmo?e-y-??I???Gh"D.?\@?$?B)?????>??$??h:????? ?!E????i?fI?p??y??hm?D&FQ?{??4??L?I?"y??5"p??.??d?f???+?? n?*??2'?CJ???'????9??d?y?e??????|?????c???'?O?`?#R?#?`j?e??????0E?U??Y???qOr????_O?Q?????r?V????x?i???ZQ}?p????61????????&?{B???w???s??bSfH???I?K?,n?b`???eG;;i?\????a?-@Y??#YJ?/??I?*?&?r??1C?? `??n?j?????-??5vkK;X?{]?4?oSf????I??O????s]??[b*>??cy??#???+`??}???L4??- KG?????N"???N?`H?i=J h?_{6!??L6l?C]???5????????7???r?z? ?07??mf?,FCI???? ??7%??]??F??? ???n?y?m??m?f\m??f[m??m??m??m?????K??fff[m??y?m????q??s??????n?m???n?m????|?0??-?a?{|????n????m? vG??J???8S? m?g????o`xK? ?E???K?4N??P`Tn?q?M?9m??#?????d>?Z??]?{@?2?|"??`?N?? ??? ????i???dnV???N??U??,%pv???&??????}???????s????{Hy>???A?0DA????,???l'?@?x?? t?n????????X?N??????c??^I?????gF?F??):?C5U^????)?cx????^???????,`^?hm?????9$ZH?????{?m??-?O?}?{????o???????I%-???9?G?????|??!????F ?0??? >?AT9?7??EB?l??~x???^????K~?>? Z$H?/????????-?? ???5???z?P *???0???w0?0b#??~? @?o?????Ic?A`??lq?.???#8Cv?????x??;??V8g???;???6????FFE?9??8B?b?h??+??z??o?&n??9'B>?j?sv???7?1??y'F ?dI?O?L?c P????+)a? ???:?y?@`?~??I(??????&0??DP?;??B?`r???Bm+?[2l??4L?????t?~?CA?????P~???V*??)R?C???"???????sFqa?s? $1O?H$d?P?E? ???&I=s??????{?N?`??U????1=???? ???\P????b/? ????*YlO?v??R?6????t???a????~?????59)????C??c??y??cMQ?E??^??cGtF?M???h???X???=? 7\?Ev?v???^????a??K??{~6? ??B`H=??hT0`??????????^??"(??????-"""7y???n??DX?????G???f?QEQq????tz6o/??^]?????]??""?Bz_L ?O?4???????????6s??F68?SZ?i??0?t#-Z????qs????[fs?;???CQp?? ?l?1??????R?>(h???\?9?q?=?_?4?5)#???Q??H??oq??2??? ??B?$?F?? ???????????[??.^?|???c??#4?????S@?&"??[< cp?f1??nqZj8zp?""??g? FMXw??1??k0)ZX????8???s?E?+?$??x;?DY?????;U)APN?L????? ?@?%I?0k????A??k ?|.??S?[QR??oX??c ???????$??IF,? ??TB<???????$$??HBVBA?2'?~h$Nq#?H??o#&,???(D?????-?ch???7;?C@?P??}????&T F??3&i%Rp????g?=;??k?:?Y]?`2?3?Yd? V???bu??D??(h=??;H?3?0]?_0??!??a4N?*X??D?1 ?(??XXJ [????Gd@> Ku??X??)(41|t???$~?F??a??p??=?6O?G?H???pr?t}h:?IVM,?&=I4y?z??? ?|?~?)?B4"?c??i?"?e?K*X??v?~'(?4???i??h????? ? G??Q?{1? ??{?m$??$?EP?I)?7???o$}RO??G %?$>??=/z?|?T???l<%?m|y??l?B????1??Ru????!?????;??y??`?T???6o?~5^???/-?$z`=JC ?????BE=??x?"?????p? 'a?EI%a,??t???GU_?M\V ????9??Q??1??????/%?C????'x? ?x+?{??> ??$g??1Lq0M'$??M?&?I??X?C [???WA#????kx????hZ?d-7po1??E?A8?C??H??`;+ H?"?{????D=q????>?[??gi???????i???M??????WO?9"?m!????Z????}??Zx????p???i\,?b?&???Ms\5? ??4y??s?7^ucj??f`^??H??? \??? !hI??Y???YC*U???%|N? ?1? ??>??????>???????o?2&?7?'??[?J??????8??9f=g??>?3???'|C??q7?b?{M,\???45ED???????%?I???????#?)?TR?K#(?2???1+? ??1'??^sB??:W' "#0J?y?D??JeTb????-6T>K$c?/???1???NRbu?:?M??????G ?!?sa?????w"?,1????RA????hiI>?o'h??,;??|???1,??vl??????????????$AE?  ????"?tA 5??M??P?? ????????O??{?"??H????E*%??o`??P? ?}=???N?Tb???IRH????Q????????????d^??qHaf?9????N??6^????DELW_?=??"?`a??"bC???vO:H??x?'8;??v?@?wu9=2 ????hpPV?p??:R???Y?{'K??)n5Y?V?? 1??????4?????+e1?"?Zf@?C R? - GhPden???x????0????Z?%U??ZZ"FBA?KO??;??? ????'?J_?\?? ??w2;?"??;BD??)Y??&?I?D??M"?^???8{_>???9H??frGEWN?O1?::'A???:??rx????4?w??????b=?H)KgX???????~??u???y?}U??`??i?MD????l????g???? 5???#1?Lz6??>[?r}?l?uo?L2O??????E=G(?Ddq,?D??T??V=?D)????Q?9?w?d{?wxm?#J\?G?u??d@?R???;!y?? ?Kk?f%Hr??g?????c?y?.3?O2?l???4hO??9 ? ??F0C?-1??$'???"?*m4??y? ?f??z$#Qb:?a9r???5 ??=???X?M??=$??????@@?=;G$ !??$hN??l8??? ?M?;e8????SRG???"iTbiyH?????Si4h?h??Y`?Nq#???|G??C2-?_vrBP5H?-?Ht )?w[???1???M?y?e??8??E? ????e;`?Z$?Hr VD??D??#??!?yY?j*???]?^u?I$?I$?????*??m ?????OQ ??F=???i /?^????y?3g??s???????P? ?6agW???0#?Nph?V ?0?0??????c?????u??]y??Y3????????W????|}oo?{x?? ???0? ?,?Q*???$?????x?dp1?JLw??$??z????B ,i?B$?ZtC??L??(??A???A??/H(? ??^???L1??#!r2H???)@?"? ??'?$n??I?? <G?Dp{?}'?Gen??????c?!6s?'7?+??????(?z?2C?%u?&?I$????W??coSK}O?H?z???G?xFF?I0??KD `??t.?K?J|?0I?PK#?????un64k??!O?Z?n?????Gq~?1&&?)???9/;?@?<? cC?7?p??%A???!??????2??z????? ?d??^?K %???Pd$?p?t?xs0?9??-)&K"wD????????d?}.?>??{l=??8p0>??Mz??w???H?6?? k</n?J2P5BQr?AW? ?g?~.?Ppv??????9???j2????5?}?T??e.E ?Kd??~?Gk?7?l?1???l?Q?$m X?H??#??!,J???????'"?G??'?C?r?I?? ?&&D{?$!??ET?J?RQC%4????????\s G?B *????H?&bG???JQ,??Y?A??5.????G??l*ld??3m???v??B?????|?2I???????7?K???YB??r?_?'e??Q?G?c??????R??? f at g ????[??????? $MS?|?RJ>????9????? U?Ep??j???}G??k?cX?u? ?;6 at _???/?B7xT*(??????{?lCd???GN?????>h?JE??`*???????=?J;?+$UlM? ????E0$lIr??~?!?????????C??/?NyC?????~?????q?????F?Y????????z,?????@?fbz6$??n?y??????k???????G??^Rrv??q??E???&f ?U?>?'tFs??Y??1&o?u?)!??7????.???_?w????[??w?{??}@_q??s??sw?;?????O??d=?Vv????Y4?S?l;=?G_???Nt??s?Y_??w?~]?.m?c????=?=????E?.?#q????????n? ????-MQ?NcR?wm????6u?,OOv?K{ O??6{??????_??}??x??xO,_??????>w>i??? 0M???K??S?V=?g????4??.??5K???M'???L?V>Fh?x???vb}????2o0??????)$??Y")???1?$G??h?RNt?T?E?K??n?(1??=,??2B??%?" ??^?????L??6o|S??^X v?~?????????? !? ??WAP?u "?K?i?k??B5?KHv??.3Z?{f?????o?zl~??7???S?K?d???f>f??e,?M????[h?k[m?R??[s?\?7?p??y????h?? S r?9s??????1% aM????g????v?c?CQ=?-V{?N???????d?m?g?????D,???lnIm?C?l??C??cU$??$@???&;?`TtukF N??#?vf?-??L?;G?\?r$??O?QI??#??(?m???????3???'??=???"}%`??8>?x'lkk???t6?+A?? B7?7u?s???j???w4?km????w???9????H?? ? ???H?u?????X??rX?B???u!+/???3???5??o&?'??cq|<3/??uWWWWW??]X?uSnsgL?????n1n7?M?-L[[??3????;??|?? ??\T???St?l??#dW??A???C?????>m???2f? F1??.???S???g???>BG?0=C??1[??c?Qh??|(??B?OJ`????Y??;???5E/???w????n?1:?v(????IHG;??k?B? s0???8????TD????Q=c/3?o?,?)?????? ?Y??????s??a?fffff#3333?F???&!?e)?2? a??;? ???"?????w ?????D?j??W?;??????j ?O???w =k2????-??,SK2"?.??V????????L?]-?}u?ey,!??????$??#???D9w?^?h@????Z??????? ??q?ChKxf???0?????f?&?!TR??U??+?C??`??(&A? ?NB???????b%?c??0ct[?h n??IV6 u?]ICJ??gB?|??J???$A?{?+?.?g??m??a??=:Z?Q\~???$????B>??}?y'????=+?r??z????????P????#?a?{4??=y?5[:u?(???w?$??8?B&Gs??4O??N:?qp $???aUUT?U????;??NG1>`Hp???RD???1?'?#?H?J????%C?=?y?J???pN'x? ??>?-???\????7?:?=i =uV Z??8H f???????,???rb"Z?????{?N???7??????????U???>L:??iN?|?~???_?H??????c??cQ;????;?l?U???G-????r?u??h? ?1??F??????? ????????67??C?F Z?1???m?MK???N?~?)2?g $?c$*???pW???M?b?? ? z?????????H?r?????(nN??w?o??kB????4???d??R?Y?RL??~????j)?.????6? I?{????O??U9.?J?(;??"??1??o??#Q?/\?e?!N????????j??????7UI?s???~ ?(D?% 7M"vo?v?D9???????T??a?????H?????: &??hc?????d ???|0jB)d?5M?0bc[q?5bM4??X???*?@^?= $(??*!bH"?21?-?m??(2?B &??4i\5?? ?X?3?V??SFZ&? P??R?caH???41,!'?c?E?m0b?Y????*EY????- @4a??#!j?IX`?X??1b??Y?#331f,X,?!??W?Q??"???Py?'?b??????6$?x!??Q?uJ????O???N? ?????Or??A?$$Ar?f} ?c 3? ? 0?l??U(??v? ?I$r,???e????y!J?H?J?@??2RB??`?f*?F&@?C????%kX?F?n???L?**??d?A??a tU--D?*)M?j??fZ4??+?u?ix~??')???Y? ? $?6N?_?!??P?=&????>??{????CDP?E{?f?]??1 at h#??{0?????5??@??$?7?D?clv$( (???Z`?3T?3DC/d?0f%??i????R??????l??[op'?p??W!??E????????Y* ????{x8109??2~bM????p?{f2?bL??`F ?H????? ?@?? ?0L?u??? ;g?B9??`!????~ ??h?4?;?A%?8?>&h??JVc???0.?Uj??z??? 9??F$?l??z=????u????36?N?~o?8?v?,?6n`??v??Q??a6Y1 ?0X??I#y)?cj???RB???????j:?n?Z?;?{????? >?"#;???d?2U?Q?<ShCeC i??MIdUwA????7? F??a(9?d?!??'zC}??????]F?nc&Z?Se^{40?o? H?? ????C???,?4??????<" ?QA??^H?v???IU!B?????5??s?X4 ?y????i??b?3q($c4!???sq?.???`??????B??6$??i? ?????N?z?'_k?"H??l!?D?????A?o???Y????o???f???O??+??2!i?2"%???"l??$?.?c#??}????9{?p???kFbi$???@??'?B??cF????~b??`??G?6rD??R?o??????S???f??UI??*C?C `bC?,??O???~f???9??????#?G?^??I????0Np?X?$?Z?I?;p??]????']????:???'Gp?Q??.??_Z??I??e?R?D?OQ?bh?R?"?t{[??????>f???0?*?2$???a???c????=YsG??????? '?G??????? ??? )????Q??9???????P??????'K??h??? ?bS??MI7??????krL${?!?+???6?Zg?????????}?&??R ? ? ?R????ZP ???????H?\??K#nkt??]?v?"?!??!????)?vp!???@?????2 ????H???UQ4:??^z?v??4? {?.?I?&?F???????G?e_2]@qd? rC?*??O?w??k?}????h???A? YG?DiR?J??D?IE1BW???=??w?K2 w???????/????Z??O?????U????H????I???M?7??6z??C????????????????X*?p| ??4? D?+?b?B?$j ?????aM?cDH?l?? ?(R(X?E?z1'*?J?]-?|??*????C? ??P??eR??nvj?L?r?0??F?;:?=6,7??/R?????F?FK?mc)?DM'?U??A?H?R/A??H8>??$_R%?x????D ?E?O? ???7$???`?J2??????.Y$P????? ??>h~??d%??xNO'?????W?;n]??>???G75???dTj?5NA ?D<1#??%X c6CC?? P6'~?E???(?)b:??18fK"??M"?Y?`??I?99h?=x???-?4??Qm$??*T?I$???kf???$?$?@?)I$)J?)JRI RJRI)JRI$??@?I$?B??R??)J? )I$??JR??M4???JR??JRI5?????E????????^c2;DTQ?0?BuQ??$#?Et$A??&? ^O~?qN??H?c2?Z+ ?,?s??2?d!? ?U?YXZh?as ?gR?t??!O?wf??????n&???4r6m*4?A?*??Ti, ,6?????`?B??M&3z?d??!???X????F?Sar?m?)J?????%?a*?O??w? ????1??k6Y???- ?????R??n 1???UY??????(????6?t?????:?~c??m?R???/?;?:???%??? F%A=(u???gdk??????4????L??JD2rj:X?g?????c?o???si?y#RHad>t????&?*?V????=????|?c?5??w?F"??O?^U?????k?D`V2?!5c?4??)??]?]? '?9"N?uv#G??O?TC?? $o0????o?l?-??m,??DF?d=??G^?v????Py???h????j?2?f??e????????b:0??d?ar??a?t@?m?E???|qY?? Y??@>" ?D????a|??a?n?y?^?]??uV?n??????????? D"\8L??0$???AFe??Q???yAjH???1???1z??[??E?????? E2?F*?RW]u?]?R?V?C]????'??????w??E??)?6!?0`?x?7O ??????????t???J/mo?HQq???y??url?1]es3E?,?)???@??????????????p??????y?c???a????$?Jn ?$J??'??adZ??? ??????r?&????oLOsI??(??h?7?????q??a?????!5???????U??2?9?????????A?d (????y???2?&D Q??i?(p0??m???p????d?3??I?QR?? ?Y?3@??1?H???I???XI?#??b#k$??!??"8qB?z??I?q'dS?vf??!??,?O#L\?2=Y$Q9w)a?L?Oa??f????P/??? ?z!??? ????A??",C??2~$?9?^Xw????eZ2Xu1o??1?$1??a?G?. at xF9????/g??????|???d?|fpgTi??y?????`L 29?'A4????F??F????????????0??PA??< ?Ul?????J? ??? ?[wSe??} ???9??r5F??}????] ????{????C????v&?; ?? KB? F?I??2???o?f?o g?`?s?!?]VM??S\?O_AC????v???4???P?L?(C?? ??d?%? ????_l??mz?`?v?/s???c@???M?????O`?-?b$!a? Bb ?ig1^ ?Y?R???J?????DvG??[]lZ6?z ?F*?&?S,?}?????j?&#P?H?S ??~t???S?J?I?o??#iU8*6?hGW???Q????,:??vN??!??N?d??`??h??&%^???9M?0;? ?9??1.?(????x C???L????c?k?i|?D?H???????&769|???????8Q??.?d?U/4h?????*OB??wV??? ,?Sm??rw?????!???X$?RF?0?dFI&?T?????-??h????F:!F2 ?? ?B?????a?Z]????7?%8>?? H?@?z$0??h @?k9??[???l?N?????,C,#?*D???m?~?/?mM|]u????7e?].??-?????M?.?7Xqq-*??????w??G?F??M?#$**N?h|A????v??W????6??#??Wi?,YI7>??l????E?S???~1?H???X?X?????O??|?`???$t????#Oo?o??????#`?Gn?5 ?r????.??C???[?V3*_aR?w?4?? ??X0w?(0V;?H??D!??f8??jjE,??F??j(qw?Ia2FJ?c"?Y??dRYX???um+]e??j?U?f?????e ?)t? ?0???9??3?????u;\Y?d??? ???7K ;pE?j?&p Y?"?w?e# ?? -G% 2Ri?????j#?UY$?M??????)??~?~A?No#?X?????JX??(?????(( ???bT???: ?2??+U?*????? ?j?l?A?&X?t?????????&?\?/??|l]?????M????D??^6???2?`?D???qC?V??J??y?????nb?S0?O???+?6J?"?X??|j"d??`M!0v?U??C?'?@YC??*y=??w?f0?I??Gq?*??7j??t~ ?v???? ?#?&?H[Y& ?S??????G?/?? v?? ?? ??*??????? ?i )?*??dB??=5Hp?v?5g??I?9?dv????-??vtm??? 4:???? ?&K???c4nkt?$ A6?$??????$?m?v??"??$ *;??'????!"b???????VG6;???s????u?e??L?Q???Ti%??,sl???W?CJ?d???/C4*j?rU???J 2???1)pp??P{??????P?X????Ibm$HB?i io?_=?!?V?cf??a`???lcM?+ll:?G??I???I&?d???x??{"??D??t?????? ?M&?z??7?$?P?z??\?4?f????b?0??2du?L ?o???Os???y??????? ??4K?l??????Q%0T2??!Q?L????L????w?I?=??nffg) ?6u:-%?,?G6#????% ??? ? ,JX1} 5?,?e?????&hEG??|K$?3C?\?????N1?J|??"N??S?e?|?[-`??>M??x??G?B???+?????w?S??01?$????'???$'??????]?? >?#O??=:????I?D>?b'??#?z2?b???e29??r?mu?????ab?,????j??U?? ?{?GabwD>?*H?V*?T??? ;?h??????8~Sr?[^1?e?? ???????????rc?u?1?SEUI?*?5??\(? ?5???L?J???I??C??G?B?I?01??v?ffP4?:?>&??4??2?sL??j"??R???{4?\?Al[)j??QJLB?i?u`?$v*???DN?W??????????l?????(?? 9S?SdU???\?`????v? d??AD%C?x:??g?m'T(g???GQ`??c??X????2!?qa ?? @&????{?z?K{%&Q- g?_QOk?hl??o??$?#???-'????i????ll8?d} ?????N:??j:??????q#?0udo!??d??SZ? ????i?`?P??8, F???Bi??+????"06???Z? ??b??=m??????.??$?!kt?K?r??H???wu]?i?LlaS?]?E??|? /n+F?& ??gs?? 1? ?U?"?a?KAX5J?!?0 ??c??????LHN??? ?6-?!@????#~? ?4?? ??Ij? ?:dI??d26)?xf?)?????lx???m?H??ZOy?$y????\??A?Ls??J-+?>u? ???? >?%???X~?0~Q<???U{?A?8?e???U???Y?*}Q? ??? ??z?;??D???4?d ? i???5cEE???FBPTHi?eX?f:b-#??4????J??? tT?????C?d (???6$?U??F?2?;?`?T?????jJ?b!P?? ?????O|?9?????M?i p?LH??d???{???N???Rh$E>8y?A??.??f1? ??U????_[ ??P6?????d?M?)??i?????T??s ???%????ca?`P5L4i??v????????.?C???, ??4?uW?S?M7?gi????{>Q????{BBX?Mm??_??? a8p;?$???aq??????1#}?????!?h??=h}L I,??????,#?*?t??~?};b,??+?sL2???LQ?L?+m?>{[???4%?K?A?? 8? I?HV?????U??KO?|W?&?7{u?+x???bK???Q??Y???.`b?i? ? ???]????yLo@???????H}?/???Kt(O?`k??9????M?c?q???? ?X?w?????(Q?Jra`??5f???5?sa? ?4 ?)?C!??%p?? u?8??:?i??4??m??o???S?;?#??@?cI????t?hJ"?????]wYOm???Z?"?k???ba?@?l` ?#hY9 ??RMG|?????G??????47???Q|??? ??????Z??#tn?|???z?????????y?4~??-??2]?K????r??u???Ve???*ST?X?????I%*KI%A??V?W??\????p????P???2)bN???$??a???b?l?O???#CI 8??U\??????*?? ???W??8??? ??W????|??)????/????M???B? ? ?J????I???U?)a?Rm????? ??M??kmj%??7uL?I?V6??3T?)6?&?L?? ?! HD?$???! ??{2??1=??@J??;'?"?H???Y$9?;??*0hC?w(}?|??Y(??B??????9.??/??d?#Q?Ckwq??A??"B)??" ?H?Cqu?R,y3???%K?S36?5?Cj?mB??LAb??J,??)P??K*j?sZ?HX?B??`3"b?Q?;?? @?w??????1];?|???????jj??????cRv? ??O??|Ui?Hn7?d?vJ?C?M?)?ys~?8Y???Ul:TNdR$k?d?$??TCr?c???N=?BNGM?M????q?&?????????i/l??|??$?[?td??"?u??;;x8?!?eT? H?#??????u?2E''l???rG?????#i"?ly;!aj??m*ew}?=??{R?F1$?{d?4?w1??&?d??'???<[???{?#??K1*6:?d??I:???X??1I? &Q??p??? ?'?N?(aP&???#3U?30?????"w ?Bm??x?{?? ??I??0?%4?FED?`?% =?B??0?N??????L??W\?dK???:????W?r??? ?R???#U.?~??1?!?OIC?f?M??^_?Mp? 1??x???? $?Coo???W?? hH?ZRT?E?&a? [H?bC"*I7H??j!?NB?1???'???$?? ???1Q?$8??#??D??J????*??f" F?LB?\G0{U?? ?0*?*m4?????$????BF?#I??L???bF??LDL??M???.???u?+$??N?o?gd???m:$}?y, ??V$'?=??E??????#??I?P??7&?????????)9??$?z??od?a????????D????0???)?`?}?Pv]A????$??8?b?fC?????,?e@?D???11?\?K?? ??8??w??? ?*??!?X? ??6d?.?f& ?4?~]+?*??a????????t@? 2???C?'?z^??Y>?m?!?o?]????M???S???????E"}u%?S??pLm32???H??????|?4?c7??????TG???2????P?RX????R C????M?)K LbG???RO?????|??46i??7b?b???Z???????T?>V?V??? ??w ?E???? ??~?+X)????? !?h?`*???bl?(o ?d?LiJT?52iQ??.?l??1?c?.?!B0?????????h??b2??mVRHB6[Jac[2#??UV??b? ???QR?eI???v???UTn?tB`B?L? Bd?J??'?]'I?Hg???????@?S4B??2????eE???Qm?v/F?-~??(???!?S D?m(L?-1  ????Y?R?????????h\6t*(2?N?qT?VHV?2U??Ccd?T+?? ???z?J??z?N?????S??1??T:?~u$a^d/?>?9??Qq?E?Z??5?k>?2??f!? ?C|E4a8Z? ? ?!LR 7?????9????\????ekb??f9?????Q5???k??A?? GY???RD??I???!??.?#??WW\=?O?M????? ??N???X??i??FVl;E?HEj0*??M -?? ( ?K???$lZZ@??8iAj`??????_n????l(?I?^??&#??H?lS???S?V?a3p>??????p??_ h???S?????i??"?8~_?????);?? ???? ????y`?y4x? ==g??lI?d??#???"e???????,M?6&'Xi?A?????cTe??m>?D??x?Fu`?OLS?I?fM??C'??Tp?n???????? K??????d?1L% ?a?????4b? ?1??JC??"?b" ?aKF?b???$vo?Cq?p>d:??????p???qa?R!?5???F??evW8?v?m>?p????=?/??;t???~?f @?5n??????Xz6{.??w? ???&9?}????H?&|?i???  ?!?9??={?=7I?? I??2R???b??0??,? BI,CJ? lF???*?p0????n?Ih?)4A?D???u!?d$ ???@!??H?C%A?6?H#A ??$?8??? i'jA?????t??s?iLS|pb??? d?u??R??j6J?5K$?RiMfh??m?k?a???+$) ?? R1??o ????0eJ??@?@k??B?a??m??L?P ?#ABp|4?2?h?B?+?kQ?2?!?'U??$?n?k?4?%??41Q?1A?CJ?????K????a85??1??Y1dJ?p??]&?f??v ??Q???@Pi ?4- ETLA??;?sb?KA0H`H(DX??Y?*?O?t?b gBCHPA H????QF??????Y:?b?3???cKV0h?a?]???kj???5?"*??W?GD?"???7?DQ?4???II!?????l?KI)9 ?v?Jn3rI!???g^??4[?!%6T??? &"?=?X?*???Q?1?*?F.???? ???`?'D*???iR?Jjv-?6?? LM,G?? ????6?dd-J?? ??m?m??t?0!? ?!??Fr~T?0;??lB??V??]??????(?? ? 0~?a???i??$B?h at H?$ b???dp??????2B}J??n??????,=s?????j5?4???I???????7??*5???????'?&*!#?!6?F?A?$~?O??ER??rNID?$?,N????G?*?W?1IE#??Ht#?N??$N?*$B???0???pK ,??2?)_???N?M????L?P??????J??i?K????*6?,???mX?p??'??r?{"Ey??<)???>I??OT?iH?;?????? ??%????=U$????=?1c???9?????2#????#???$?:???/????Bzil56)Ke?jmJf?$T??!K V"~S??zl|?????B#?:?/?<7$x;????????P?R\s1?e????1?jP?Pqc,?3$F?ad????!+d?" ?n???M* ?<?9???="b1 $B?0?) /v???X|Htn,8$?p?s??"+?:N?`?d?**???5?C?(? ???\?F???6j?(?0z ???'?AC??J????3Ja?hH???????$Zw9:X!?[Ze? a?? ?+^??????%&??gZt:XH!?0??!J?I(5??F???l???L??????``@??T? ??d?r?c}???r????=?(?????a???(Q7L??#?y???do ?O?&9Y??l?[?M/??LJO ?@?w$iF??(???/(?????????X??T???U???j )$??:I??A?!?^???.????J?Hr;N????R1=J???={??w??9?t?NqN*dS??2??P???C?|?????????I?*/?????????6|0??F*?:?A(3M?d?w???|??0? ]??;?:?'??4V??.???*???vpt?N?L?HP?4!?1???K$c????yv?:$?B???&??EBQ'jN???D??b'? &?Dw????????????? n_??`?? ??dY???UJ?? R?J_????)?#?????O[v7xd'?&E?#PQ$???7??l?????(?GtOP?_X? ???6e?R?k??Z??ieJ?R??*,"&????X=?h??I0????6?O??U???W $?i?aP??????o?C ?N?*b?? ??Ya( y???f?=H*? H??? z?Sx??g?D?; 'f2AR? H???%?!? G?% ??"(????BX?k?=*?*?S?L$?02Cng????vf,2??3!???J^?eZK*ZY,?~_ :?E?K?%`?0t?F g v?y(\??[]?[??8D?E ?t?$^?UN0?`+?H:d@????I?" O?~c ?6?9???c?(?zd"T???@???@???M?>?T??9???E???^?3?AAH???C?[?#???L;n)?@??? ??{H(A?)O??????Z, ?????7???Ot?????v?D??#?NBI?(?a?????(!??H??E? ???Pd,IF?0v?O?$????c;???k[???VA??????R0jH??,d??a' ?q??JZL??@?I????YJE?F?? ??!?:0\?y??06??$?9a?b?,??A??6??T*??Ci?A???(.??F c!?B*9??J_? ???????.&??T.? ??6????????????<&??/?PZTx??yb'?R:X????y???J??Y????c 0?u+Re-#E"5,$?*&#BcA?y?y{????t?t@$??????p?O6O& ???? ???3w?v3+(,x?C?2 ? R?X?al?o?uy????*- ??n??6M?K?Y?>??-??)?????iJ?55"jdrI,L0M&?L??!?? ?E??hH?$??!Q?$???????m??g?? GO?iI???????H?????'??@???r ?E?*X%?BD>???e?{#Z3??f??>C??????@? ??S?2??+Eb????<_($?M'?I?^GC???aP? A$Q9? 1?????# !??BtDu?%?$???Y??d$???s? :????Q??''?L'??D??? y?|??????i?v????O8W??S???????"?????h?-??{?|8?? ???|??Q$?Q??b?&?D?)*E%?9 ???j?|}?!??????8???I,~O???&?0?`?1?????)?7?y?"Z3ftDJ`?~?W?h&?D7%??d?`@??Arl C??c??USU_@?????$N???. )'??x6"$(?"????????(M$?9s?<,?Q#Ky???2?7??|?U:??????u-?~j=????A)?B?? ??O??Rz??z??y??6OC?"?~???s%g???!?}??????B?eS??2"????6I??'?C?I-G?????> ,?TU?Y[JjBBS?zX?( w _???????@? ?f?/?????XP?A??SS~m0?E?????n?%?G??????1@?yI?j???Z???H????!Lv ]??czHI?P&\+q?!?A? V?cY?)?FR?)???????EX@?&XHf? 4?ia9????&C???$?FH@I?t?w??YWm8F $vM??\? @?? ?&AE? -,&lF??A? ?&*J??&????a?y?MeFJ?V??8?3|RId?T#c$?S n??R?7?W;f?]?N??6????F???d??EaBJ+? 0hLWA ?????a9???~?????:x??b?Q?L$? pT??F?, ?pbi?dV??"??3?????~q??alD?-#?I(?? ? ?? ???? ?? :?$b???? X?'?'?L???????$????>BO??x~l??;_:??D??C?????.?m???=??wm???/?i?; ???v???vwgx654?z????N8H?=W??Y:EZ\A?(Q?}? $?rN?????????s3-??l?x????!_ ????1?~Y?7g?G?E????o}?????7??d>){8t3,w?!?0???{?9????A?P???m-e?hc?"??5?`U?? {?? X?N?t?la??&L???>??????p??#?U1=??CC????N???d&?????po?????mZo??????????mS?R?????b????m?8??a??X%dK???(? ??5?B %? `?>4???@|??B ?4a ?t4h?$J?????p?????$?! l :dbj??"ZMz??l?|O?6?!>F???(???a" D??p??0????0?XLx??,? ?&? ??`??}????&?y??*?m? ???? ?`???????!???A?B?????k[ ?!?????? P?F????"??? ?00??^?????a#??? Vn:p?7???????????CP?dk???[$?ZI? ??]?dSR?D??K??gz????{?????V?Ig???????????\?g ?S?(????[=??????*?-QbY?K b4$a{?4?I)???$Z?????? 9$,E>?7%?$'?X???84??bK??5`??M????????^????0????-m??u?q(-?A4#?0 h?D3??l?$7%?? ???S?D?XM?? ??1v?#H?? Q??aN7i?)g???q1?,??: #??[??Iw??k?F?:?$?? ?I??u??:??&?*???dm6?V=t??y??x??#?Hz????}?????? h? RI????R?(????(7? ? 7?*?mh? ??????6{???G ??I??????X??#?'Y?l? ????G9?????X? ???T??d???????Um???0????77`?~??=5=???R?aCi?&?G??sZ??=&??=4???VF-ED?&??????8??GY'?>G.?s?JYb?o6????x?????I?#??T?l??RR???O???? ?d??jQ?D$???H???I???$???DRl????v?V??:gN???w?Q?`??DiI1Z?`'b?wN?9"8????7d?cF?IM??F?Y?%??Mj>s????pR^? ?? 0???a? _r???03-I"??|??>?L BFR"? ??H?]?????Kf??DXT??! ?fF?!5???M?%d?\Y4? RR?yv?????????d?IP?B???Q\B? K?2???|?G?wG28??????H?[?s??)???KXT??P??{I?JG??0lM?/???m??rrZ???V&L??Y0i??w???W?b?h ?>??0u*1??  ??D?`Z$??Ljw?i ?D? ?Q1Cu=?????P??dH??????????L???RzDG?*?lX?(J??TV?????| ?0yj$?G???????????9?(??>$WJs>o?A?*t?Z)??_?E?P *?H?'?@???????P???!;?O?x?/??Q??m??????5?????f O??h?1??`4o?]??D??x.?6????h???^ ?iC??^?D?D?D?D1LZ 6??6???C????????D?8r??R??L1?? ?????1? q?5/<7??Ql?E??#????????hPO?4kGfb(????7?p?@Y???UER???0??^C6?\?#???P'@??j - ?[?gxp7x?H?l?2 ??e:?F????<|?????>h?'??l H?n??6D?g????-?Mnk?S?0? BA@?)?????(?????Z?=?,z??A?$MI???S???I?X$?N?r?sS?H?$??????~h??????}-!??q?F*Gl??M??D$P??[?H??77?4|???Q0?m?Td??2hUN!?=??bV??-kEi?????????K??7?@2 ?s,(?1 @? ?? E?D??Z(@cB+a??dP?A??0*??@??U????m;??v?????C??bq?????G ~??????L?.???Q?@)??????#?<P?/g?????d$?G??G?W??H?jI????????c !J?o =7?7???????z??Wmu?ZSy???mPinG5[???q??=?????;?nz??%????m?3????? OS??#Bz?)?ABh?I??5C?1?0?C???j???? '?!j(?? $???D?*???##??J,? G,\?Z?D`??Uh ????Rf??,k?V????Z[m?J??? EUTEUUUUWf?I?&???287.????B??6a`AeTZVH?J$\?2??????Q|K?#F4 AKEao?j??L8F?j?Y? R?????/rMfi?Z??R?mb?, ????k?????(??4?CF?#??Q???%??'??s? d?????#??mh2???d(?% )J ?E?N????f(????????E?FZ??[m??I+&?-`%PJTa ?h?????;??p??|?W;??Sk??????Y?????&??g??????:[??? fY7??33Uf?A.a??x L [????g?CZ?3t?[??? ??c???F?M~?`4y2 ]E???????????Jf?l?:????)?v?x?fc?gU?k?{S??f9wf??????g????????????e?}?B??d?cq ?{OL? ?????K???]???c????R????n???L1Ms??l64?a%xv???oY?L '?_;?????g??,tn?T??ZZ?Pa????d??y?<;s???g???~????o?PE?1\)~m?9Z??????K?u?? R?Wo???L??3O????_/??}??2?? ^?.??$??*??!3??????[??????fA?]?s?7]????????G^??m?v?5???|?/????l,???-le??-?w[???b???.??[?CV1?3J^?{???:??8v???}'?G ?|??'????????;\:??YW?B???4f???p??????TI????>??Q??^s?=S????w?{??N??'?>??T???jj-?T????Zx?n??&??A?J?g???e(???Q4?v2S?p@???!??^'|?7 r???D???????-???????Os?M?? ???`Z?# k?P????&Pp????z*?|?????8lS"<1???L??????u?M@=)*vk??????u?%?dZ???d8?=?.E?Q?^yj???$?}?f?Rj????3??UgmiQ?? \0????1 ?K??59QJ????U?f???????A???vfwy?/^?#$?!?N??%?1??? ??eW6?Q?>??e,*z??a??a?/???\?? 9G?B????? ??{?T?0??=?fn5;?R?Vr????g??+6'\?????/e????1????????*%Q?^~h?8F????L0$z????u<6???;b?q?L??????Mc??V??zF?%??????o?*&[Y ??&???*?????r????n?N?-t?)?B??|?m????????B??ht[,2[D?"x9???2?.3W????V+?q?;?2???It??&?l??x? ????E???&M?3????$????o????^`???????????$???m???????R?b?" ?rO?G??D???=McqD?UP?JV????_d?T?? XO??dA? ?y???4??:f?F???B???yX????I?d??o?~?Q?????'?0l P? ~???##&????? ATA??dX"? ?5h?????=???J?qQ?4>PH?0??9???.???`q ?\.??`?B/?/??Q0>#??u??v??^??XiE_?????W?\G???$????o??`??e????4J??????PN$ ?3{???GH?!?U 0???'?+??????, '?E|???]?[? U:\?? ??5??????Vz s?Y*?B?@M?????b?K"????#?!?????TeE?c????v???A?6Ng?-?????%$q??$2 1?H ?E????????F?6????q?yA' ?4?????? ?????;??(U??? ??????PH???????BH>v2a ??????f????`?&??}@ ?????:M? ?b??WX?"Y 0-??s?n??H???#??&????S? ??O??km?Y|[w??!??R ?&UQ?1X?4?L??z~R???jJ??Z?@?C?????__??????%?6??????UE?5??K???8?k{{zXf0a;?J?g??????????N?{???^?Vj?E????1c4?QO7 ?R?????????g?`o ????!p]????lwI????u??????h??B~??f????G?8????3e?#??????^1?q.?4r?a?bPrV???R-I? ??l???S?d !?L???gI*?x???KU{???(c7/??q$?ca?O^?(x?f?? ?)? ????U?m1?????f? ir??F?}i??u?o?Z}0 ?dBu?????.?%t Fb?S??9 ?? ? ^?f?wu???@?b?? ??E/??'A???_?+-? N X??$???e?3?2*zW~?tkm_,?>???p??;?)v??e?vwiHgE?????^'1??,5F?W????!??R??cP1J4?9.~?ml? ??"?u??| (?&??_???s???o?7i??.l??? ?v]?'o5???? A0?t???8?????I.?}? }F???&?<2N ???Z??e??"++* ??D\ ?v7?)????c??r?e????CU ?:II????SM??-???R???U`B??b+??T' ?Zd0? : 3?????%94????X???3???6???o?[??Lqm?8?p????????> ?? ??7????1????R x2???? ??\??-?7?*z??r'M????5!b>?????L??\????(G??J?E?W??X?!X?c?Wa?????]??]Y???gz?5t_? ??????????~????????mq???+??j??ys?????^&kE|:J????????6?jm'v?y7?? ????Z???-w?'???????E[MV6??K&??? /?:F7????a?!?y?&????#?R?f???r?+6?????>??3???7?? O=nj?)?'????I????Z??tf????&? ?_???:??Z64k ??8?'?\Z53?DK&y?q? ???j????n?T?????+?)d?2P`??F??)<~:?se?y??????9?????`>?T%4&??? / ???W?sA?TJC???6?me6???????e3~3?D??%c???i,l???L5:P?3?J6Y.LL ????kI??=?/A??/???)D?;?K?1?p?i???`???$?B`*4?BG??9???c?????0#? #???P1??w*?32?? 3&???TVr>.?m&?a? Jbst?X."????Gq?1#??w?X3???8SQ8T??I??P?Y??)?O2"????PVEnH1?8C???]&@"?D)?#??????6?1??.??Dg?M[~??>?g? [?/s7?r!??Oo????/?(9H?resW????7????4??x?vo???(????F?(???.??? ???E?~e???u????M????$?a???H?i1????????>?_?_{?3?#??U?:?0#M???m ?7?????R?1?]?[?.j&Xg???Hr>??`??u???R?@R? ??????ZEA? ????Sb??vS??s/??`??F?S? ?=ik?>?????|wt??>????????U.??`???PvWCG???bSU?=???????cV??[Xg?????A ?W?E8?K???H?????????R?{???I? ??~? w???? ??? ?|?y?&X?O??"Y??&?2??/?{-?f8??j?x??????+???Uj)~?? -a<n?1@%iz??r?++,??c"?IL????9? ?Z?>??Nw?v60oO????L???N  ????i? !?f?????b?5??m ??w!??BE?V??'!?????~X?JB?f???.l??\`?a`9v\:0??? ??`??H? O????#????mH??%?O?_?????y???Y?l?????% P?K\_????NP>?A*J?L7????Bm????-???M9?f?'P?c?t*9N?Vg??Cg"?????!~?t??'D??g(? U??@???+??!0??l??% ?}[ ??X??5,?%"?f??\?????f??4 ??WC??Y:b??_u?Jf???? m#?&????}F? ??i*N$?L?_Y|d?1???zFz=?5?HBC????A??^?~???i???8?? ?Q?]\??? 5D~??b?Y?~F???[?BI?>l????e&I;???f?d~??.??H?? ??????s9??T#??!J??$????????? ! w?Y??J??I??c??z?"?.???I??|?O??&l0BW???>????a????/?c Z??u?G???I$???:??X0.???z??]??Yz?|/G8?]Z??z?|N???y?Df1O????eqY?b)?w?q?k??;O ?]???rN??6I!u??r?.v/?t?!T ??Z?~D?^D???M`k???????k?.f????H???C??+?+?H?? ????Z)?iB??X?E"????b? d??K??N@? 5A}?@?? XDN?M?@?D???? ???1`?????.?z?y^U???.?? |?.?S?>???????1?v[^?R?s???u?E?^????? ?????T?A??9??????????B?h+ ???#?!?{???.? K???]?? ?J??+K??b?b???l?X?q?x?g`?nMT?+??R??b?iu?9????D? ???r"??????b?%?ib????{?M?(???@!???p???V?3??[We)?h?q??'??s*???????~?t?Shd??T? )B? ?????45-&?x? B?s{??+??|gAm{Z @C?pa???t??!Dp?c ?H`!r?LniXZ?V,^?????????p????.?s!?P?Ez?,`???-P?K,X?b?_??????,?1{?>n?*d@(U?gz?X?s6=K???I!A????C? ?F? ?-7 `? ???K?????U}r?o??boV DR ???.!?=??Xy??N?"?, ? ?_G?{QN?u ?=k?y?p??-??--R???, ?'(x((n? X?Q ??? ?:U?pB(???"HA??(??zMC??x??%r?L?@.!?.,]?6H?X{AW???y?????iH???fV??zE?}???j?\???2\?5?t_37???R???^?%w?Z.???2?R????X+? E#????X!?C7 h?D?Ahvi???ll|??TP?? bH??-?`-?U*??V????yO?Z?^e???z5*??w?o.X[???#b?J ???U?~?K????pU?@`o0 ???tT ????X?0W2?jJ?*B(?! ???]c???\??? ??g ??(?K???l,? ??,???p?????S9??&!??? ?h??*???????],???.? ??$D ?% ??F?"?A???m?de??,???Q??b?l????2?@B?dd`?" ????jI?@??E??0u??@??*??7HcA5.K???????E,:a!A??????8 ?b????[??I?T?????@??%??s_?Np^??$X,??????BT???!??;? ??Sz??^??h||??Q;@??@/?>P? ?^??????j??*?]? ??/:??????aQ??i;H?[?#\y?T??0?????X,X?b??? ]??pD?s?kB??0???c??s??.??9E??????OP?)s??5 ?i??!h??G?0;????Ne?G?? L? XE (????PSD|?^??]??????????? ??????G?G?#? ?}@??????_???l???avaGB?W?_o?J??JWl?????]????>??QDH?M%4??[?-e?F?L8N???6?a|A????+?X?\-??u?&:,X??K?6/???"Q??dX at p?~~~g???????z,??H D?$?|?`j???]Y[GrTs??????(??<9?.?e??O}?y???R?r4?>??/O???z?????"?G? ?????A?? X??C?V??%"$ 0g??n_? A?j|???xC;!C [,??????C??$????gBu?T+?O??$ i???k?4?j??[???!?????8)HwdKi??Y@?X??`?????? "?QU;n???E?C,]??B??G.U?a ???w?f?D  ??JM?Yp??8q0?d?"B?=?? ???"I??)???  X?????n??m?????!#"?1"?? ??????F4?E?C%???:?-7?`c???UUQ?DU??C4J@q6"??|])?AzN?????.:Z?|??(r??c??fke#W?YB?i#I>???W??u?6Rx???)????}??@??J?~xd-???A 0,Mv?&b?""?E?-?H????41c?;8)? h?J????;??B?@?Z?1?!?b?M[?????:a???t?????}O???W?g???GzE@f ?????D?T?p? g???[al???L??+*?n??.?:?a???t???{? D 2?????? ??? ?I?+|E?????S!?_{?????c6n5?^??j?$=}?{,?p?5 B/'"?2)?EmV?ek???[?P ???,Fa:??m?vu?8???P???AHz ?-????\??]???@?0o??????<=??8h'Y<7??u?????uX?????$:?4???"]i?}[???2???????D????]?s6??P??X.k???Z??s[?$f???? ??y?????XC5???!??;zS??-?g:????I?h?????CiM?!??M?WZ??????h?- 2???L ?m?a??[? r[?}????????!? C?$?CTl???O???,?T3??- ???t???H?U????\???X??9??K?2r?\?--?3?h"hm??#?????II?5???%????)?%??0q??0E?g??UUQ???{??i??p?^?s M???R???t9?^h?o??X?X???????'~J??0???r!2c?r?z{? z???t?? H?.????U???=)? ?????PH?Uek????e???{??x)??&{?AZ???o ???]kB???E?,X,0?N????b????[ ?????H?#??7?Y??? ?UO!?D?T.Q??tKa????P?ML?????b C??L????X??~iNa?o`T?`m????p4???e??(]\?vO7 ?B"fm??T;?(?? $??C??p?b??y??"$?=?*??'Zo?Z?$?(;#?^?~#??2????????z? 4:???aE ? ?ce`??"??????0s?????a8fmFDZ?u?? p3???[7-???nv?1??9???,?%??%?"0?BDn??l??9 e^L??i?Z???fA???+? a??????Ug?mr?:Rq?U?e \&?4?G8?`D?1?D???????????k?y?@??T0???vB?v?.8 ??????? (?6 $^k??,??QB ????h b?@?????G?\d??B??????#5S???"???|=?? ??h|V??0?@??-???*???'$????|Xa;:???x&???jp ?:??????.??(/bC?A?X(X??????Tr????n????p`? ???(???T? ?P[K??"/???X?"T?????? ??? H?y??????N?p)?D0P?.?k"??][????!?8? {? ^?7R9 ?2??y? ? ???? ????(??????h?F7?f??K????N??A?X ?? ???Arh~&? ???Rhp???[??!a?@MoY8??{~?]??aKK???I?Y??V?????B?\M?Lo_yne?p!??n??!5???{?d@????`+??!M??s2p????s??!??(jF:???9?? ?@????8???`n?L?h???$?g??\. ma???.?d??S?2?? ?d ?F ??QZb?1? From fedora-extras-commits at redhat.com Wed Jul 30 07:24:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:24:25 GMT Subject: rpms/gts/F-8 gts-0.7.6-autotools.diff.bz2,NONE,1.1 Message-ID: <200807300724.m6U7OP0G025281@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25241/F-8 Added Files: gts-0.7.6-autotools.diff.bz2 Log Message: New. --- NEW FILE gts-0.7.6-autotools.diff.bz2 --- BZh91AY&SY:????{??9[?q?U6??rw???????`??????#Sj???Q?[? ???H^????;?????? :N???=???{????/?M??3n????n???%P?{?tX1?:?????X4o????^???[M?;u?1vg??J?e??e??9??1!?[??*?PkV??{[ ????\ B?f??QT?lR??]??W??]M ????Z?????tqn??i ?l? ???f?$'f??XoX??????w??wwf?m??????????uv]?I^??E{m(eU??nZ:":5"??? 1^??M5!?? ?U{U'J?HG??g2?3?3P?  ?G? ??)?H??4?G????z??6?C?44 5BH????????N? %?a??E4P?.cVh?4]??????????%?m????0?D?????01H?-????b??]??l????S????[}}n,???j??M??ZU0?RP??3?`XLa???K),?$?H???ZV]?]u?]??.????%???c?F?H(?! !?A?d??30? 0?IT???-?w??????????????$???uo>?/T?z&)?6;?4???7n;?j??t?????[=eu????I.??w]??Z? ??7???? (????J,*?I$????d! ????1`16K?[?Ix?&?r??J???t????? >-Qa????\?:?v.??1wv.????F?X?L?+J4??1?!3?q??????*c??U?.)$B????????? ??/3[??q???5%t?????$?ZR???u{?]?iZR?D]???2?Q???B ???j?}V,?v?V*??????biJ?????e??p6D['uN;n????]M??s?3?????ts??L????y?o???=?????;??^?????~???}[bc???Js??2?|??????7?H9?????^?@? =Fr???Y?:4?&?6=:M?/?0??5?p-??P?3?????u)]?")$??i?A?4+???BFJG? ?7vk???)f??Fi??"C0??? P?&E????5H?1???U??G?8?z&1?k[^\? D?{?????eYms{?k????{:=??8w???N.????>?? ??p????H`v????t?3 B? ?x6???"?6?????0??B??0`??~?4? ?@?? ? ?????k???>?????? ??R?.v` ?T2%`Y@?, 7?d ??? Q???H????c??tYh????v????_?Ky?qb???_?????m=???O?wde??!?0?-C???+??}???[?x???? N??????X1?????4??F?[????yV?[?2? }??1?=??lG???p{Y=hk???!EB??a ??:r?5???D???Ap??'?p?<>?8???(?????? t??5???p?????_g?{?z?????xCy ?????s??z?U???d %??7??? ?A?0???st8?9\?f??rQ ?yQ1S?*p?p???b?Z??4sbi?E_???ky4{s??sPq ?Ew? ,:?a?i?z3?v?U??s@(F l?tm?b?R???xp?B?i??W?2L?My?:????????`? ??L?e????34E??"(???7u???g ?????:0???M??!Q?z?D7pH;?d?? 9?&d??P?)Uv?8X?w,??)h?` ?IC??;???0?N??z?b+N?F{I?q?O6NC??R?)OI????j?P?,?I$? z???$V?A ???p&???;T??^e?????z?????y.?l?m7??W??h??F?|???y?=???3*??0?u?V??b? NF?>ca?QM?????3?gJ?=y8y?G"???;?M68m??m?{?L>y??? ??}?U?t~:???(??A:????I?BB?e??v?6??a??#A?1??K6.????i7?1????????E???(?KY?6U\) 'V?5(??_???{?????o???v??fQx?8?/c????DUV??E?FK??C!?Y'?????????#?H???o?a`s/"????4*? {????G?????????C???c??s??????)?fG?,w&???$$?y?qH``??? D5?x?3???v?? ?n&? "?l? s(?G_6??\?T?+???35i-B$27_]?um?Oy+D???3?$+?J,?c?zCf?}??1?~??(?k?1!??U???$???sI!@7??S??b?E?z%3;7? E??Q??$0???)!@??|?E#????.^\16???b??L??-????[;A&?kcb:qB1#w??b?g?????8A??h?@???G?{?~??u>wZ??0N?x??tk?#?(1?:O???U??N?T???B:n?_?r?i???vy??S?????S2???31?>hg$?g?X???7?fg???????u?k??g????cO?&?D???%?5?b????'??M A???O???a?Fq????@#vg?3]??????ZI??2???)K??A?????4??? ?Nf??????????6L???O?6???M??)GX?'@??????Q????a????????N?>.???'W{??O3??????w<??? e??C?s??o?e?#?c,?A???>r???S???h?_.V??c??Yw???Gs?.???+R?????x?v?;???V?? ??@(1; q?6dz?3$~?4?h??x?a?????h~?^???K?.I ??Lm9Ip?3?2Ll?? ?? ,]q?1??/e???? e?,??8X?`R4urH`a?`?6?_n?*??8 ??OB&????@/????<p?j?u?Z?b??IM??.`2??"??X??|???????u4S??#??????f??*l??? ??2i?RR?67??6L??????W?tv?NS???5??SUP?$?x??#??=?}#?$?z???S?|??? M!???H ??? /????Rw'W]?|??&?? ?????Sr!?sH?P??@T2Fak?+Nhu??'?4Qh????cZS??gm$?DZJ????G??3???J4%o??^??q?i?{p X?Bo??"??p~????w?5dy???????X?????Q???A???P??yh??g????)w??k??????'"?}?W?Q# ?7`hj???*n???[#????????H??j&>""???jD$?${??B!@?6m? ???_)?i?4C??????5F?G|)?pyB@? ?Z??B{????jB3HX)?"?(?"?(o ;??R$???]g????;? ??A??P}%u?w?E?????????i?S??D?????-~?????|G?p? ?????\#H????{\??Q?UE???U??;??0:?j"1>??L(8??T??B??z ???!??^??8`? ??????4??????n?l?.lk??!? ?R1?gM???Ga??.V??9??7>s???]L??c?}x_?G?~?cdq???lo@????V?Y?z :J?????{??:v????E???P!B??B???nW&F???????!)?????????????9~<  _????%s???m?p???s a?#?O)?????F?f2?$? D?-t???@?,U?3 ?~ ????-?wr??n>a?hb??????A!????????????E?~???? !??-&???? ????dl6?D????y???^?vD????g+?6???V?&6EX?1??????V?9??=a?$f?uh???!?a?+;|^???g, "] ]?Z?????:??6n??r????? `?????;?5i?}?????Rz???j= ?w=? a??.??????D????D???? 'x?H(;[??_O??JBjI"???????T????[{j??.??????'A?????|?#tD????,.?? =y?9? l????>?E??k?Z ?zG???R????.?_Y???c?p/K?????f??|"Er??????y???G????? b??.??Z) ??????????\???oW????????F???uo?=??????????????I?7???????J?o `[?+????????<%?+?Y??C?????>7p??I??_?V??>??Q?H?(#??#v%???N????`?LenK??????b??b[??IHL?Vm?????D??GO??/>-??????Zz?? ????77??<$(k K?} ?!??j???{?}[1D?[??Ci????aq?=5?T?Z?us????4;94G???ov?"f;5?#??(???.?A???t;3333Y??-a?/?Y5qv??!??????????h? ?k??r??Aj?n?&fVA?o????P}?I??????}?Vl??O?e??0??\ ?F?6?3p9C??h?e?C1v.???BH,#?Jpx??-??VY8??Y??? 7_~>?^b????x3s?#?c???+??&??|.?????? ?9???^+O?G0? ???1w????? ?3Cm??g? R?F?%63?A???????4K? ?9?.)?. Q?J?1/+???????t?T?? ???k???@h/W?????????G?e?"O????:???/??cp????@?} ]x?e?,OXG??6?=m??t$C?d???y?.???h????{??????_%U??j?L(?1L?U?1??a?f?T??,??FF?2{? / $??p????40?# I??????y4??z?.???????M)??N????????.???u]??d???Mz??e0??pu??????yL??[?7e%???[?])I9)??????????NFY??dY????????$?e&H0!qY0?>?2?] 01?djDH,]?D?h??G?$&@a?$O^?<;?`Zi ?C????F???)??yT???Y ?8IM ?HS at i%#R#f?<]?W???N??MD??uw??????c?Y??????&oG??? ?o??+??bxEz?ia??:0?v?????R?Z?:?c???gg]???M??a?]?????(d??*k @)H??L?S????>??P>{????;?? H/7F>?/?e???W???P?XfC??lLQ??X??i#?/;?3 ???????V? 0?66#???Glo#r??pV??? r??k! ,?)??~???%??i? w dw?o??5$??9 ?"#????T,,r(#?gR???bH??IX????v??????!??-?B{??p\?XT?) ?"BM???D-$JM?[dh??c??b??? K?`??j5???Mt?&?!?-}??e?2M,G??/???f??o???4?W?????,??j4!d?h?J1%$@?????y??m?4???iy?a??7M?????Xiq+???T?J)&?g?:M3?]S+?6?;?????????^~????????C????? 3?????k?>WV??,tU#???}??w[???#?X?_=b&?Jb?w???^S??x at G?;?dr?t?j?+??J??\?9??G3??9KK at R???!?i?4Y?<^????9???q5--??\_???????j????K&?{???c/?E? "?i????_??s?????????????`???D??OB`?{TT?\???y>?i???e?!??`? ??????H?=?${?aQ I,E$R??ZDI???? ????F84???? ?$??4?xJ?????????c!&8j???1???'??@u?Za?Q2???+??????98}??@s??????W???N>?$??Tq)e)M??i??0YK)j?wqM]B?8?B???2k?l????L?????y;N?????#?l??rD??????R?X???'D?Q?q?d??????kZ?}`H?P ?G5 ?T????3#?v????????A??H?G?j!?OA??|???8M?JRG??J{???#?H??T??????I6}?[?Gdso?sf?1?b+?dl?r+x?i/@?GM?????#?. ?_=#sbuB??G????[????Z?u&?zI??7)m??1?)???UJ?????'#?*??OJu'?JMlU?????:??R?s? D???R?????w~o;??????????g???? u?B9B???c???7rl?I??_???????-?b?L~????#????C????????s?n??*?E?PsT2?~7??~!??*X?17? ??sg??????a??,?*RJv ?r?;????'?i???'??=F???" ?A{?mcR?Qr}?08???h?L. ????h>?QBa`? ?RJ)s?b?o? ?-(???Xz?"?P????D??$??X?0 ?[?O?eZ?R??+$r????=?/;y#w????>r??*???A????????????? =?????I? 2C?VC??&?I??"O???(?G?????61???6I?"???????s??u?? ??y??rW? ?/&??4?????:??U??{y??l???P? ????m??OR??L? $]??? R?{&?????H?z/S?J?? ?.???\=?Q?bD<2?t?7 ws??u,?"?X?=?8U?Q??O??U80q???;ma'??????9*???-*b???N!D???7qYT!C?)?}z?&???N>%?1??qz?I'?}?NV,u???F?9??P????H ?y????????!?-?+???pS?e?Y3?.?n??R.0?:?C!q??<*??????+F%!Y??????n? ktb\(@?Q??? ???0? ???]????x?Fp5?+?l?n 6E???>Q?d????1?dFLX??I??????~??x???#?ML?2[????c/P?E???)"Q??#?????S #^?@L?~?? ?B??>??????B_?A$?5??S???_?;???????J??%?U25PEA???) ?? ???????????I???C?iV?VD?d/?D??H??x?W^{??{;H3 ?M?_?W?nmS ??? I??JUd???t?k?GN3????k??e|???Q?9??h8??0)??-H???u5? ????R?????r???m/6-?c2Ff'~??^@de?B??f?)???????!Q?w8??"?>??i?{??????~???I????????Z?|?b???_U??;?U<u?????J?3?V??*p??C??????iC-????BT?????H?????uE?a'???C>?!$???!\6?0??c?ku??!??W?;???:????}?X??{???v0??ri?\}??r?.(=??*}?| J?q?1`?$??ElO?????}??z?9??????a?u ?x|\??}??V??5Zb>7D@?8$|?V?AdE,?2T?#?VC^?????k????g??H}As ??? @g?"??|N?}?n??p?p`?Oj?z?g????i ?"????Gk???j<9v?2?9??7??????$%????Ch?{?I`4Y"+$?B[?LR6aApTD??@]I?G??iT?F?m???D?BN??d:?????{??????????R?*sx?'?'w??'e??&G?F?????Q?_????!Ws?????7P????L?,p??n?? ??]?m?? $K?IW???M?/?????????E?)? ?p?7{?????5??k?6"?????U?>????N?mi??Oy????????.????]??;XO??a= ?????} ?????-v? c???J?A?6?2E? S1&D?? ?!Y.????]L&@wW?????+R??/????J? ?g???U???????D"?W?!???]??g???<????2E???=?G6H at k???'??.2A? FL#???:8?NGsv????F?WN?O????~??t?1?a?f?H @????v0g??/3hg???gcXB?$}'?8X?l|??k?yP??k?&X?"?hp??????E?c ?+?]?RLz>?.$????#Q at L%??1?"??g|? 6??*??6w?s&f,al*???L?a?+1??/??>[?;??????;??}F?????q r ?Q?d?dh-=???x8?; ??>????"6???????o????=?R??!??H?!???2? ',?5?"?????X'&?;C?C??E? ??x???:?C |?G?J.?&_?`/.$?Ef??6?:k*?A???J?6?"?E???dLE?"?????_???J`Ac? ???C?z??}?l?|#??:*Z0b ?BO? ??"#??R? ???????b???4?Nf??j?r?c?a??m?i?6?$???;???A?? ?Wf+??Sl???P????4?~N???+?t????b???lB?T?@*2,&?+G3?[gk???k C?D~?|????h??j?=?rTWC?-???)?L,?????L B?$>?4? '! ?@HVpo_I??)&l???? F?x xj#`?HYiPBJ@?? ?????w??Z??r?????:?T???Y]??d?s?Y?]X?y???i?'?>??0?&9??v?z B?.???d??#??d??f??????z?????????:?<~??]}~??P????Z???? A-????=?? [{=????$ft!?I ?IL`c ????I?/O?6?????E??o5?^j??t??|=??n???Ff??hH?8??f??ghJ?}??` ?????p???-??D????v??`?v??`fr?i?'w???bb??ESc\S?~?ZG??Az?#?"h ??ac?r????????b???8fZK?@??X?p\f????^ d??F?????!? (3???y=?y??m 71?a>??us?-???1?y'R ?6?a?[EN???dR???@??9?H? =? |??z??`?????o????????^Q0Y9'??????2H?v8?/?M??iZpx6?MTMi??(2q6????????,?M?/????&L??E???@??????T~?? 3???7??i???N?a?x$????F?/???dR?????s??|? ???g?u????s?m?k?m ??c?d'?B????D?2%'??G?'&??????I??'? I? K??h ????? 8?A?? HD?bd???*~cc???~/a????;????????Ly????+zX??Y=q?$???A ? ??\8???ZK???j s? P????N?????a???`?C?? :???fD?Tb!9??N?@??f?????9?dnv%x'??8????0?H?\OJ?k?jO????6jO???????M?????p{_iK&????}???s??????I??????3?usy???V?H????D???-8????????b,??^????S??d?????v?/(???"?"?G??C??????k$??41ig????C???/@?|e??@?N?Q?\?Z??^?F?*??} ?E? ??? A?????[ ?E??G%?0>!??f??(DQ?????z,X2f7"c??Y???[???m?d?????H??:@l??``T?@r?s?E?#9???F??z5bTd???*+???VWtG?b?)???6_v?M???S????2???'?????,?L`???N?s?x,,LQ???Q??C????*?;?.?I?;??_K??i???C0?U??ih?? ???.c???????H?'?????????D!??I?G?"??N?? Qe?#????\?Q*R??? ?y?????????;?ZC???? ???a?& ?M??|OS(??i???????,c?fh}??i0?$?q^??B??LGhn/M??)p_6 zr?L>p???nz??H5+ ?P18?5T?C?"t??Q????H{???P?@i?V????R?"E,D8?!???k???? ?2?1?? 0?M?KrY?0??H?m? ?? x?{?????Hd>?6i???G?$?Z?1?F4??a??1?c?=??E???K????U3?L??n ??bbFTW???8?? ?H????PQ?`?$um-e??\N+?I\b????? E' ??@^k?1????c'D?_Q"&??? (0?Gay????? TL?x]?\?6?(u? d???$F?\4?????!x????8??US?????9??%)???? ???A???I 5??????????? ?!2bA????0???q7eQ??{??1??????:?N???&;???$?J<?D]?jpz??????'?d8?y?? DH?K???9xX?Cm???? ?Cc?h?b??4??|???D?3?m??8?z?t?$? 5???7CG??c?????m?6?:UXM???DF?|?i??M"????????o??VL??s?X????r?????1"?,? ??j9?2? ? n???6????7m???r????_??/???E?O??^?~X?B5?????^L??Tb? 1?3M??????}???4IG .Ie????5????o?\? ?c??T(G??p?g$??V?" 8?hZ8G?????V??G?????5m*k%? `eg?I?G?"E??:m6"?O?B? ?K??????? ??????+V?s??????D;>'????H????h?-A??P*??f&tt?|???y??9y????s??C??S ??$n6?"??????y5? W??dsc??3&???? ?N?c??z??8?K?e?L!??m?[?.??_?Jx??E?_?sxN'w^??^ "A???y?yNi??$H?r?????3!???7?r???&#??op??^??]?c?????f?y???~???7???-?>?1i??N2&oW??? ???6R?????X?R?????r~?H?G_???Z??????fY(??p??z?????7*???????vx\?i>0\?#y???0>"??????Ex??C ??}a?;OMB+?h,?Q.???? {? ? q?Z!0 ???6D???z$J?2?>E??"v?]h???m????:?av??? m? ?J??0?E~s??`?k?"0H#? ?????A?i_V??q?????w4n????knwk?? 42?I"?<#????Z ? ???p????\???M?-??KV?S?\?M?}?4?T[?????-??Ed7S?s$l?XNf?6NK??rMX[o???"u?|??J}??\?B*?$??i)????O2? .??????B?u?M;z?????d??l?hn? ????*??????O?77O??2}?rge?'???'?|??m]_?"??f?uhG? ?Y?B;=O??`????? ??9?` [n0!???G?nrNi?M?*%?,?Rl0R???4????I??H??x ?99# ??B?? l??|?Z???????M?q???/?z?"O??fv???x?? ? ?t???J ??| r?9kt????,2U?Uj??????,p?}?#?#A??$??? RP??2?\2.?MQ??*?????%?Q2&??n?3n????B4"???e?????]??w????z?h?h4kX?????0?C?f{8p??R?M?]T?md?*?,????F?f?u?i??HYUKl-V??f10?c m?er???v?/????\{????e ? V???????l? ??k?Q?R??????????&??????y,eO?N?j????X??r*9"??Tb??:?kky?????#5ZKbBU(??k???????Dr?5?{w?[??>??????r??? ???.-??*)?F?Tqv?ykb???????2? 0?&~w???????????"y??????A??V?? ?@????NB)j?k??mHy?B5 5!???i????=^>6 ?^B+(?|??` ?~O-??????I??????B?-?M?1??????C?Cp???jv?y??G?p{??c .B?_i????b,???D?u:???2?????}??1?s?t|Xc? ?H??B,?k@ ?????]??Ux?????C?,A??,??m? ?\??? EE?k8lZ??v??}R?O?8<'S??|????k1?c,???? ??k????g@(( ? M??&?!???)I??????cZ??%R?=???+?????YJm??+m????GQ??a B??7?????g?? ?W??????Z??%9??6???c 1?f1d?I?? ?? o????t???hi??5pm?a"??$? ??????aDF?)R%+?q?yw??????R18F?c??b?[4?M?10?1???(?JZRB?? @?_? Jl???m%?????y???iT? ?3e ?>!?HW?v%u*KQIj#)BB??P??I$?3A?&? c??i?V)?J????n??)V?????ONDB0U???????c??Wc???&?M????w???????*?T| ??{??10?&=??x???|??=?t?H?? 8? ??1e???%? ???????:N?^??t|?i???????T????c?x?IF???4???YY????1?????WDvj=??\?Zj?VU?R?JV???S? ~?@?9???pm?`?*?pS?B`?W8?????;?h??-???X????$Kwl?f???'7? ???????????g?eo?v?l?G????r^g?&?=gG???????@?/?ndS?C?0"a?s??!???<E'???R?U????"??=? )?r??i9????~?vh?O?5?D}Y&,????e*z?P2 $@!? b???D??~???? s?S?$W????$|??L?#d??_???|7??n?)?PU?????O{????#?HjOi?C?J??K????`??Q??N#??? ?V L?`f/^h??i???:tg?q??g?q?g#???? ????!???,|d?A???? ?Q?G?G??? k36PG?l{W??????????h?L &%?#kXrt??]rG_v???$K??y?!i??G&?o???xI?I^? ?%N*B????F???9x??[V?7/???b? i??`???j??_?k~rM?.???t$6?Q??@?:??? ?X?"????y? 2T?????#?x? ?.?X???!?J??????]??????;?)?=?u???1??%E5*[Ia,T?????0'?;_I???d|e????t^A)?>??J?????2I,???q?? ?\?W$$:??+SR?y??6}w???U??I?????????b?_{ ?p??ec ?|n???$???1?????1a??b?? ??J_?????G????%??X??68? G???? ?d? dTn?D????????2?F?_?7???#???~??_?V??p?<l?$?RFfC???>c????|?}2??3$??M??????n?????P???X????_??vF`=???i??=??|" ??n^?{??zA,??&Lr?1$S??0?0?y??17I?z:??s!?*??N???=???Sf?3?"??n?z???????Rs?!??U??z??,??o?????????I?xd??h??T j?+??J(_???0?? 9???s????f?????d+D?c???{=?/?&??M?#????MI%d:?y????#?s???i,?G??C[u?Gt#?????/"F'?LA?>??"???a???4?HF*?2N??R2?uv;??'P1?J?r? ?????5????g^_z?orG??1?q?F?iFO? l4?E?S?????R????8??a??J?b???-L?l??@}@=???!??1'??J?J^????P??O?????|?=?"??~??/@n??OEW?}???/ p???????_L ?H,Yq*??????e>???????????~?????????=???M?Yu9??U??Y?A??B(??C?v4{?B?QBC`?=?*CH]??? ???~]??B !??s???HN?????fAR?)???}??$??t?I?i?8 ???????.?~S????yw??v pb????A?????{?q?=??/??9??$?@??0????]B???7??Y`^??G???KuO?????????Ra??G?M??J??;gJd????J??????WB?????=???g??M???1X?{??#f???k???'y??;?|???d?(J?n? ???/??O???}|1??????????HK?????[b6????4?`?MxD?.??????R???????UW????B??+ rPU? @l???1???? ??m?"??7?9????qd???S7D??>"a3m|???D9l??M????^?? ?X???OR???J?(R??K<"???5?????a??Q??Bp8HeB5^#?4$I??;???k??$?p^?o??>on?sm???? ? 4??0???T???O???? p ?$???a@&?4?J???????A??YIJ?L??o?Up????l?swH?H?@?V"?????P????a?q???l?*_%`?????????~zG??$_OL? [o??o???????o??/???? ?~??A??r E'??"????'?(??lF???h?R?/????Su?I?04??r?;?hi?j??????8?oA?g??0??/h!t??{P|=?W??H???? ???0/)???knR???? lW?d?????#????????(LE?2d?'u?g???jo?????????-&???`Y ??1???mUV?c|?$T?????{?M?W???h??z-V?lM?1G??????3?#??\??36??9 Bh???F,??2??Q?z??j????$~m??Q?}@1w5 ???y?j?????s#x?d??)?d???JI?Q??A? = |[??? ??? ?? ?@T?_?c??%????fg??l0u\ ?Po?E?@ P??[?????iM?FJ/c?> d?]???gu??????'?~??9M?4v1?Bc??qRi??MUc?#?&?ltw;I??????S???a|?YC?F?b??'i??p?|yC??GH???n?z?" ??!? [Fcc:??%?????J????"??2j??}???3,????&u ?"??F????}???????0?oa+?@??Z?? ?u?w??0?X?V?t?S??o??z?O??$????Uh??????(4e??|>^?}??t?rt0?o?????????sC?T?q#?{}f?'M?^??A?f, R?5 R??????5Y?? ?? ?Q? ?????{?I?AxTHa%uq-j?C??|???3?????N ?g;{?T?R???{???7?? 5KN?D%?N L?BqMB'?`l?s8U?N? :??*??N??eY?b????dv?X???;?::%??t??v??F?? ?=?;??~? ?? n??ZM???^+-??! ?z?? X?z5?s??????8ny?<???x??c? ?1??Zo?SD??N?????>?}a?8GPj 0????????;JE? ??x4)'E'??A?.R`?9V@????K Q?I??????L?QP??????_i??? ??,8? ?0?F+zM??????O?Dc"?VaX2??A?[. l!?E??e?}?????us#/* Q=????xBuk!9M?????x?Y9 '???@ ??9?????????????H?:????I?}Uk??B`???B1??zv=??zM?k???`8F?H6/R[??>??, ?b????$v????;??A???V???W$0??? ? e?4?5j?6j??5??k?}?N???q??.L??Z`??R?~B?>?"?x?y?????~A???f8?o?9?? ?dQa???i?=V?c?^???s G?E?@??"??? ??]??????X?6R???]?="?;?M}?0???9?MSz????????I?4?L??????:??4_?y ?_?M???`????Vt'HF+??\t??? ?? ?"???>eO?yYk???$mI!???2?"h?@U?$?y? ???:M??1?(_-???t???c9?9??86??)g?7??y???Le???{??????$y????I^????Z%??7??GKP???:???22.D+S??#v?P)?*?h\??????V?C??a???sq?p?;-?{&5??a??Rp?????P"? ? ????,??1????]?jV`??zy?t8??1]2???C?$??T???????????|x?Q?V??r??{N?F}7?k?s?'????g???|;0H>?????8=~/Oh?3~e?=*??D??c?/????Ao} ?}??B???Ve?x-?;??????????L??oc?=??n?+??r5????"y???? ??9?????????3e?H?6H? ???;??'?M?\??????$?????Q??h???HsTw?I?? 7? ???? Ud??<4????k+a]?x2?a[n???e*E????!k??? ?^w???t?@1???#??f????F????dh?`?q?z???[dY????q? O?#?n?0| ]:??R?R?~k???F?2?fQ??? 5?????)?U|}?s?h\m??L?#?y?-T???????T????%a? ?7??`?? ?;??????a??????)??0??2??? ?.#?????????_???ML??s???Hrp?Ex???o?wq? Ye?I?C?l??T??N??,?^3d [M/$?F?#m???'?q?e&??C?????? g^`?#?(???)*??"0?T???#??,?Oe?V?&B?lTX)C6???UVC????0?.????? &?"v?????B?ba"?d?0^???[m???????????ym?m?G??r=!??A??H"?1?w)?y&c#6TE??;uXD??l?? ,gV$??@m?????&??g?]??K????8-??lmo?e-y-??I???Gh"D.?\@?$?B)?????>??$??h:????? ?!E????i?fI?p??y??hm?D&FQ?{??4??L?I?"y??5"p??.??d?f???+?? n?*??2'?CJ???'????9??d?y?e??????|?????c???'?O?`?#R?#?`j?e??????0E?U??Y???qOr????_O?Q?????r?V????x?i???ZQ}?p????61????????&?{B???w???s??bSfH???I?K?,n?b`???eG;;i?\????a?-@Y??#YJ?/??I?*?&?r??1C?? `??n?j?????-??5vkK;X?{]?4?oSf????I??O????s]??[b*>??cy??#???+`??}???L4??- KG?????N"???N?`H?i=J h?_{6!??L6l?C]???5????????7???r?z? ?07??mf?,FCI???? ??7%??]??F??? ???n?y?m??m?f\m??f[m??m??m??m?????K??fff[m??y?m????q??s??????n?m???n?m????|?0??-?a?{|????n????m? vG??J???8S? m?g????o`xK? ?E???K?4N??P`Tn?q?M?9m??#?????d>?Z??]?{@?2?|"??`?N?? ??? ????i???dnV???N??U??,%pv???&??????}???????s????{Hy>???A?0DA????,???l'?@?x?? t?n????????X?N??????c??^I?????gF?F??):?C5U^????)?cx????^???????,`^?hm?????9$ZH?????{?m??-?O?}?{????o???????I%-???9?G?????|??!????F ?0??? >?AT9?7??EB?l??~x???^????K~?>? Z$H?/????????-?? ???5???z?P *???0???w0?0b#??~? @?o?????Ic?A`??lq?.???#8Cv?????x??;??V8g???;???6????FFE?9??8B?b?h??+??z??o?&n??9'B>?j?sv???7?1??y'F ?dI?O?L?c P????+)a? ???:?y?@`?~??I(??????&0??DP?;??B?`r???Bm+?[2l??4L?????t?~?CA?????P~???V*??)R?C???"???????sFqa?s? $1O?H$d?P?E? ???&I=s??????{?N?`??U????1=???? ???\P????b/? ????*YlO?v??R?6????t???a????~?????59)????C??c??y??cMQ?E??^??cGtF?M???h???X???=? 7\?Ev?v???^????a??K??{~6? ??B`H=??hT0`??????????^??"(??????-"""7y???n??DX?????G???f?QEQq????tz6o/??^]?????]??""?Bz_L ?O?4???????????6s??F68?SZ?i??0?t#-Z????qs????[fs?;???CQp?? ?l?1??????R?>(h???\?9?q?=?_?4?5)#???Q??H??oq??2??? ??B?$?F?? ???????????[??.^?|???c??#4?????S@?&"??[< cp?f1??nqZj8zp?""??g? FMXw??1??k0)ZX????8???s?E?+?$??x;?DY?????;U)APN?L????? ?@?%I?0k????A??k ?|.??S?[QR??oX??c ???????$??IF,? ??TB<???????$$??HBVBA?2'?~h$Nq#?H??o#&,???(D?????-?ch???7;?C@?P??}????&T F??3&i%Rp????g?=;??k?:?Y]?`2?3?Yd? V???bu??D??(h=??;H?3?0]?_0??!??a4N?*X??D?1 ?(??XXJ [????Gd@> Ku??X??)(41|t???$~?F??a??p??=?6O?G?H???pr?t}h:?IVM,?&=I4y?z??? ?|?~?)?B4"?c??i?"?e?K*X??v?~'(?4???i??h????? ? G??Q?{1? ??{?m$??$?EP?I)?7???o$}RO??G %?$>??=/z?|?T???l<%?m|y??l?B????1??Ru????!?????;??y??`?T???6o?~5^???/-?$z`=JC ?????BE=??x?"?????p? 'a?EI%a,??t???GU_?M\V ????9??Q??1??????/%?C????'x? ?x+?{??> ??$g??1Lq0M'$??M?&?I??X?C [???WA#????kx????hZ?d-7po1??E?A8?C??H??`;+ H?"?{????D=q????>?[??gi???????i???M??????WO?9"?m!????Z????}??Zx????p???i\,?b?&???Ms\5? ??4y??s?7^ucj??f`^??H??? \??? !hI??Y???YC*U???%|N? ?1? ??>??????>???????o?2&?7?'??[?J??????8??9f=g??>?3???'|C??q7?b?{M,\???45ED???????%?I???????#?)?TR?K#(?2???1+? ??1'??^sB??:W' "#0J?y?D??JeTb????-6T>K$c?/???1???NRbu?:?M??????G ?!?sa?????w"?,1????RA????hiI>?o'h??,;??|???1,??vl??????????????$AE?  ????"?tA 5??M??P?? ????????O??{?"??H????E*%??o`??P? ?}=???N?Tb???IRH????Q????????????d^??qHaf?9????N??6^????DELW_?=??"?`a??"bC???vO:H??x?'8;??v?@?wu9=2 ????hpPV?p??:R???Y?{'K??)n5Y?V?? 1??????4?????+e1?"?Zf@?C R? - GhPden???x????0????Z?%U??ZZ"FBA?KO??;??? ????'?J_?\?? ??w2;?"??;BD??)Y??&?I?D??M"?^???8{_>???9H??frGEWN?O1?::'A???:??rx????4?w??????b=?H)KgX???????~??u???y?}U??`??i?MD????l????g???? 5???#1?Lz6??>[?r}?l?uo?L2O??????E=G(?Ddq,?D??T??V=?D)????Q?9?w?d{?wxm?#J\?G?u??d@?R???;!y?? ?Kk?f%Hr??g?????c?y?.3?O2?l???4hO??9 ? ??F0C?-1??$'???"?*m4??y? ?f??z$#Qb:?a9r???5 ??=???X?M??=$??????@@?=;G$ !??$hN??l8??? ?M?;e8????SRG???"iTbiyH?????Si4h?h??Y`?Nq#???|G??C2-?_vrBP5H?-?Ht )?w[???1???M?y?e??8??E? ????e;`?Z$?Hr VD??D??#??!?yY?j*???]?^u?I$?I$?????*??m ?????OQ ??F=???i /?^????y?3g??s???????P? ?6agW???0#?Nph?V ?0?0??????c?????u??]y??Y3????????W????|}oo?{x?? ???0? ?,?Q*???$?????x?dp1?JLw??$??z????B ,i?B$?ZtC??L??(??A???A??/H(? ??^???L1??#!r2H???)@?"? ??'?$n??I?? <G?Dp{?}'?Gen??????c?!6s?'7?+??????(?z?2C?%u?&?I$????W??coSK}O?H?z???G?xFF?I0??KD `??t.?K?J|?0I?PK#?????un64k??!O?Z?n?????Gq~?1&&?)???9/;?@?<? cC?7?p??%A???!??????2??z????? ?d??^?K %???Pd$?p?t?xs0?9??-)&K"wD????????d?}.?>??{l=??8p0>??Mz??w???H?6?? k</n?J2P5BQr?AW? ?g?~.?Ppv??????9???j2????5?}?T??e.E ?Kd??~?Gk?7?l?1???l?Q?$m X?H??#??!,J???????'"?G??'?C?r?I?? ?&&D{?$!??ET?J?RQC%4????????\s G?B *????H?&bG???JQ,??Y?A??5.????G??l*ld??3m???v??B?????|?2I???????7?K???YB??r?_?'e??Q?G?c??????R??? f at g ????[??????? $MS?|?RJ>????9????? U?Ep??j???}G??k?cX?u? ?;6 at _???/?B7xT*(??????{?lCd???GN?????>h?JE??`*???????=?J;?+$UlM? ????E0$lIr??~?!?????????C??/?NyC?????~?????q?????F?Y????????z,?????@?fbz6$??n?y??????k???????G??^Rrv??q??E???&f ?U?>?'tFs??Y??1&o?u?)!??7????.???_?w????[??w?{??}@_q??s??sw?;?????O??d=?Vv????Y4?S?l;=?G_???Nt??s?Y_??w?~]?.m?c????=?=????E?.?#q????????n? ????-MQ?NcR?wm????6u?,OOv?K{ O??6{??????_??}??x??xO,_??????>w>i??? 0M???K??S?V=?g????4??.??5K???M'???L?V>Fh?x???vb}????2o0??????)$??Y")???1?$G??h?RNt?T?E?K??n?(1??=,??2B??%?" ??^?????L??6o|S??^X v?~?????????? !? ??WAP?u "?K?i?k??B5?KHv??.3Z?{f?????o?zl~??7???S?K?d???f>f??e,?M????[h?k[m?R??[s?\?7?p??y????h?? S r?9s??????1% aM????g????v?c?CQ=?-V{?N???????d?m?g?????D,???lnIm?C?l??C??cU$??$@???&;?`TtukF N??#?vf?-??L?;G?\?r$??O?QI??#??(?m???????3???'??=???"}%`??8>?x'lkk???t6?+A?? B7?7u?s???j???w4?km????w???9????H?? ? ???H?u?????X??rX?B???u!+/???3???5??o&?'??cq|<3/??uWWWWW??]X?uSnsgL?????n1n7?M?-L[[??3????;??|?? ??\T???St?l??#dW??A???C?????>m???2f? F1??.???S???g???>BG?0=C??1[??c?Qh??|(??B?OJ`????Y??;???5E/???w????n?1:?v(????IHG;??k?B? s0???8????TD????Q=c/3?o?,?)?????? ?Y??????s??a?fffff#3333?F???&!?e)?2? a??;? ???"?????w ?????D?j??W?;??????j ?O???w =k2????-??,SK2"?.??V????????L?]-?}u?ey,!??????$??#???D9w?^?h@????Z??????? ??q?ChKxf???0?????f?&?!TR??U??+?C??`??(&A? ?NB???????b%?c??0ct[?h n??IV6 u?]ICJ??gB?|??J???$A?{?+?.?g??m??a??=:Z?Q\~???$????B>??}?y'????=+?r??z????????P????#?a?{4??=y?5[:u?(???w?$??8?B&Gs??4O??N:?qp $???aUUT?U????;??NG1>`Hp???RD???1?'?#?H?J????%C?=?y?J???pN'x? ??>?-???\????7?:?=i =uV Z??8H f???????,???rb"Z?????{?N???7??????????U???>L:??iN?|?~???_?H??????c??cQ;????;?l?U???G-????r?u??h? ?1??F??????? ????????67??C?F Z?1???m?MK???N?~?)2?g $?c$*???pW???M?b?? ? z?????????H?r?????(nN??w?o??kB????4???d??R?Y?RL??~????j)?.????6? I?{????O??U9.?J?(;??"??1??o??#Q?/\?e?!N????????j??????7UI?s???~ ?(D?% 7M"vo?v?D9???????T??a?????H?????: &??hc?????d ???|0jB)d?5M?0bc[q?5bM4??X???*?@^?= $(??*!bH"?21?-?m??(2?B &??4i\5?? ?X?3?V??SFZ&? P??R?caH???41,!'?c?E?m0b?Y????*EY????- @4a??#!j?IX`?X??1b??Y?#331f,X,?!??W?Q??"???Py?'?b??????6$?x!??Q?uJ????O???N? ?????Or??A?$$Ar?f} ?c 3? ? 0?l??U(??v? ?I$r,???e????y!J?H?J?@??2RB??`?f*?F&@?C????%kX?F?n???L?**??d?A??a tU--D?*)M?j??fZ4??+?u?ix~??')???Y? ? $?6N?_?!??P?=&????>??{????CDP?E{?f?]??1 at h#??{0?????5??@??$?7?D?clv$( (???Z`?3T?3DC/d?0f%??i????R??????l??[op'?p??W!??E????????Y* ????{x8109??2~bM????p?{f2?bL??`F ?H????? ?@?? ?0L?u??? ;g?B9??`!????~ ??h?4?;?A%?8?>&h??JVc???0.?Uj??z??? 9??F$?l??z=????u????36?N?~o?8?v?,?6n`??v??Q??a6Y1 ?0X??I#y)?cj???RB???????j:?n?Z?;?{????? >?"#;???d?2U?Q?<ShCeC i??MIdUwA????7? F??a(9?d?!??'zC}??????]F?nc&Z?Se^{40?o? H?? ????C???,?4??????<" ?QA??^H?v???IU!B?????5??s?X4 ?y????i??b?3q($c4!???sq?.???`??????B??6$??i? ?????N?z?'_k?"H??l!?D?????A?o???Y????o???f???O??+??2!i?2"%???"l??$?.?c#??}????9{?p???kFbi$???@??'?B??cF????~b??`??G?6rD??R?o??????S???f??UI??*C?C `bC?,??O???~f???9??????#?G?^??I????0Np?X?$?Z?I?;p??]????']????:???'Gp?Q??.??_Z??I??e?R?D?OQ?bh?R?"?t{[??????>f???0?*?2$???a???c????=YsG??????? '?G??????? ??? )????Q??9???????P??????'K??h??? ?bS??MI7??????krL${?!?+???6?Zg?????????}?&??R ? ? ?R????ZP ???????H?\??K#nkt??]?v?"?!??!????)?vp!???@?????2 ????H???UQ4:??^z?v??4? {?.?I?&?F???????G?e_2]@qd? rC?*??O?w??k?}????h???A? YG?DiR?J??D?IE1BW???=??w?K2 w???????/????Z??O?????U????H????I???M?7??6z??C????????????????X*?p| ??4? D?+?b?B?$j ?????aM?cDH?l?? ?(R(X?E?z1'*?J?]-?|??*????C? ??P??eR??nvj?L?r?0??F?;:?=6,7??/R?????F?FK?mc)?DM'?U??A?H?R/A??H8>??$_R%?x????D ?E?O? ???7$???`?J2??????.Y$P????? ??>h~??d%??xNO'?????W?;n]??>???G75???dTj?5NA ?D<1#??%X c6CC?? P6'~?E???(?)b:??18fK"??M"?Y?`??I?99h?=x???-?4??Qm$??*T?I$???kf???$?$?@?)I$)J?)JRI RJRI)JRI$??@?I$?B??R??)J? )I$??JR??M4???JR??JRI5?????E????????^c2;DTQ?0?BuQ??$#?Et$A??&? ^O~?qN??H?c2?Z+ ?,?s??2?d!? ?U?YXZh?as ?gR?t??!O?wf??????n&???4r6m*4?A?*??Ti, ,6?????`?B??M&3z?d??!???X????F?Sar?m?)J?????%?a*?O??w? ????1??k6Y???- ?????R??n 1???UY??????(????6?t?????:?~c??m?R???/?;?:???%??? F%A=(u???gdk??????4????L??JD2rj:X?g?????c?o???si?y#RHad>t????&?*?V????=????|?c?5??w?F"??O?^U?????k?D`V2?!5c?4??)??]?]? '?9"N?uv#G??O?TC?? $o0????o?l?-??m,??DF?d=??G^?v????Py???h????j?2?f??e????????b:0??d?ar??a?t@?m?E???|qY?? Y??@>" ?D????a|??a?n?y?^?]??uV?n??????????? D"\8L??0$???AFe??Q???yAjH???1???1z??[??E?????? E2?F*?RW]u?]?R?V?C]????'??????w??E??)?6!?0`?x?7O ??????????t???J/mo?HQq???y??url?1]es3E?,?)???@??????????????p??????y?c???a????$?Jn ?$J??'??adZ??? ??????r?&????oLOsI??(??h?7?????q??a?????!5???????U??2?9?????????A?d (????y???2?&D Q??i?(p0??m???p????d?3??I?QR?? ?Y?3@??1?H???I???XI?#??b#k$??!??"8qB?z??I?q'dS?vf??!??,?O#L\?2=Y$Q9w)a?L?Oa??f????P/??? ?z!??? ????A??",C??2~$?9?^Xw????eZ2Xu1o??1?$1??a?G?. at xF9????/g??????|???d?|fpgTi??y?????`L 29?'A4????F??F????????????0??PA??< ?Ul?????J? ??? ?[wSe??} ???9??r5F??}????] ????{????C????v&?; ?? KB? F?I??2???o?f?o g?`?s?!?]VM??S\?O_AC????v???4???P?L?(C?? ??d?%? ????_l??mz?`?v?/s???c@???M?????O`?-?b$!a? Bb ?ig1^ ?Y?R???J?????DvG??[]lZ6?z ?F*?&?S,?}?????j?&#P?H?S ??~t???S?J?I?o??#iU8*6?hGW???Q????,:??vN??!??N?d??`??h??&%^???9M?0;? ?9??1.?(????x C???L????c?k?i|?D?H???????&769|???????8Q??.?d?U/4h?????*OB??wV??? ,?Sm??rw?????!???X$?RF?0?dFI&?T?????-??h????F:!F2 ?? ?B?????a?Z]????7?%8>?? H?@?z$0??h @?k9??[???l?N?????,C,#?*D???m?~?/?mM|]u????7e?].??-?????M?.?7Xqq-*??????w??G?F??M?#$**N?h|A????v??W????6??#??Wi?,YI7>??l????E?S???~1?H???X?X?????O??|?`???$t????#Oo?o??????#`?Gn?5 ?r????.??C???[?V3*_aR?w?4?? ??X0w?(0V;?H??D!??f8??jjE,??F??j(qw?Ia2FJ?c"?Y??dRYX???um+]e??j?U?f?????e ?)t? ?0???9??3?????u;\Y?d??? ???7K ;pE?j?&p Y?"?w?e# ?? -G% 2Ri?????j#?UY$?M??????)??~?~A?No#?X?????JX??(?????(( ???bT???: ?2??+U?*????? ?j?l?A?&X?t?????????&?\?/??|l]?????M????D??^6???2?`?D???qC?V??J??y?????nb?S0?O???+?6J?"?X??|j"d??`M!0v?U??C?'?@YC??*y=??w?f0?I??Gq?*??7j??t~ ?v???? ?#?&?H[Y& ?S??????G?/?? v?? ?? ??*??????? ?i )?*??dB??=5Hp?v?5g??I?9?dv????-??vtm??? 4:???? ?&K???c4nkt?$ A6?$??????$?m?v??"??$ *;??'????!"b???????VG6;???s????u?e??L?Q???Ti%??,sl???W?CJ?d???/C4*j?rU???J 2???1)pp??P{??????P?X????Ibm$HB?i io?_=?!?V?cf??a`???lcM?+ll:?G??I???I&?d???x??{"??D??t?????? ?M&?z??7?$?P?z??\?4?f????b?0??2du?L ?o???Os???y??????? ??4K?l??????Q%0T2??!Q?L????L????w?I?=??nffg) ?6u:-%?,?G6#????% ??? ? ,JX1} 5?,?e?????&hEG??|K$?3C?\?????N1?J|??"N??S?e?|?[-`??>M??x??G?B???+?????w?S??01?$????'???$'??????]?? >?#O??=:????I?D>?b'??#?z2?b???e29??r?mu?????ab?,????j??U?? ?{?GabwD>?*H?V*?T??? ;?h??????8~Sr?[^1?e?? ???????????rc?u?1?SEUI?*?5??\(? ?5???L?J???I??C??G?B?I?01??v?ffP4?:?>&??4??2?sL??j"??R???{4?\?Al[)j??QJLB?i?u`?$v*???DN?W??????????l?????(?? 9S?SdU???\?`????v? d??AD%C?x:??g?m'T(g???GQ`??c??X????2!?qa ?? @&????{?z?K{%&Q- g?_QOk?hl??o??$?#???-'????i????ll8?d} ?????N:??j:??????q#?0udo!??d??SZ? ????i?`?P??8, F???Bi??+????"06???Z? ??b??=m??????.??$?!kt?K?r??H???wu]?i?LlaS?]?E??|? /n+F?& ??gs?? 1? ?U?"?a?KAX5J?!?0 ??c??????LHN??? ?6-?!@????#~? ?4?? ??Ij? ?:dI??d26)?xf?)?????lx???m?H??ZOy?$y????\??A?Ls??J-+?>u? ???? >?%???X~?0~Q<???U{?A?8?e???U???Y?*}Q? ??? ??z?;??D???4?d ? i???5cEE???FBPTHi?eX?f:b-#??4????J??? tT?????C?d (???6$?U??F?2?;?`?T?????jJ?b!P?? ?????O|?9?????M?i p?LH??d???{???N???Rh$E>8y?A??.??f1? ??U????_[ ??P6?????d?M?)??i?????T??s ???%????ca?`P5L4i??v????????.?C???, ??4?uW?S?M7?gi????{>Q????{BBX?Mm??_??? a8p;?$???aq??????1#}?????!?h??=h}L I,??????,#?*?t??~?};b,??+?sL2???LQ?L?+m?>{[???4%?K?A?? 8? I?HV?????U??KO?|W?&?7{u?+x???bK???Q??Y???.`b?i? ? ???]????yLo@???????H}?/???Kt(O?`k??9????M?c?q???? ?X?w?????(Q?Jra`??5f???5?sa? ?4 ?)?C!??%p?? u?8??:?i??4??m??o???S?;?#??@?cI????t?hJ"?????]wYOm???Z?"?k???ba?@?l` ?#hY9 ??RMG|?????G??????47???Q|??? ??????Z??#tn?|???z?????????y?4~??-??2]?K????r??u???Ve???*ST?X?????I%*KI%A??V?W??\????p????P???2)bN???$??a???b?l?O???#CI 8??U\??????*?? ???W??8??? ??W????|??)????/????M???B? ? ?J????I???U?)a?Rm????? ??M??kmj%??7uL?I?V6??3T?)6?&?L?? ?! HD?$???! ??{2??1=??@J??;'?"?H???Y$9?;??*0hC?w(}?|??Y(??B??????9.??/??d?#Q?Ckwq??A??"B)??" ?H?Cqu?R,y3???%K?S36?5?Cj?mB??LAb??J,??)P??K*j?sZ?HX?B??`3"b?Q?;?? @?w??????1];?|???????jj??????cRv? ??O??|Ui?Hn7?d?vJ?C?M?)?ys~?8Y???Ul:TNdR$k?d?$??TCr?c???N=?BNGM?M????q?&?????????i/l??|??$?[?td??"?u??;;x8?!?eT? H?#??????u?2E''l???rG?????#i"?ly;!aj??m*ew}?=??{R?F1$?{d?4?w1??&?d??'???<[???{?#??K1*6:?d??I:???X??1I? &Q??p??? ?'?N?(aP&???#3U?30?????"w ?Bm??x?{?? ??I??0?%4?FED?`?% =?B??0?N??????L??W\?dK???:????W?r??? ?R???#U.?~??1?!?OIC?f?M??^_?Mp? 1??x???? $?Coo???W?? hH?ZRT?E?&a? [H?bC"*I7H??j!?NB?1???'???$?? ???1Q?$8??#??D??J????*??f" F?LB?\G0{U?? ?0*?*m4?????$????BF?#I??L???bF??LDL??M???.???u?+$??N?o?gd???m:$}?y, ??V$'?=??E??????#??I?P??7&?????????)9??$?z??od?a????????D????0???)?`?}?Pv]A????$??8?b?fC?????,?e@?D???11?\?K?? ??8??w??? ?*??!?X? ??6d?.?f& ?4?~]+?*??a????????t@? 2???C?'?z^??Y>?m?!?o?]????M???S???????E"}u%?S??pLm32???H??????|?4?c7??????TG???2????P?RX????R C????M?)K LbG???RO?????|??46i??7b?b???Z???????T?>V?V??? ??w ?E???? ??~?+X)????? !?h?`*???bl?(o ?d?LiJT?52iQ??.?l??1?c?.?!B0?????????h??b2??mVRHB6[Jac[2#??UV??b? ???QR?eI???v???UTn?tB`B?L? Bd?J??'?]'I?Hg???????@?S4B??2????eE???Qm?v/F?-~??(???!?S D?m(L?-1  ????Y?R?????????h\6t*(2?N?qT?VHV?2U??Ccd?T+?? ???z?J??z?N?????S??1??T:?~u$a^d/?>?9??Qq?E?Z??5?k>?2??f!? ?C|E4a8Z? ? ?!LR 7?????9????\????ekb??f9?????Q5???k??A?? GY???RD??I???!??.?#??WW\=?O?M????? ??N???X??i??FVl;E?HEj0*??M -?? ( ?K???$lZZ@??8iAj`??????_n????l(?I?^??&#??H?lS???S?V?a3p>??????p??_ h???S?????i??"?8~_?????);?? ???? ????y`?y4x? ==g??lI?d??#???"e???????,M?6&'Xi?A?????cTe??m>?D??x?Fu`?OLS?I?fM??C'??Tp?n???????? K??????d?1L% ?a?????4b? ?1??JC??"?b" ?aKF?b???$vo?Cq?p>d:??????p???qa?R!?5???F??evW8?v?m>?p????=?/??;t???~?f @?5n??????Xz6{.??w? ???&9?}????H?&|?i???  ?!?9??={?=7I?? I??2R???b??0??,? BI,CJ? lF???*?p0????n?Ih?)4A?D???u!?d$ ???@!??H?C%A?6?H#A ??$?8??? i'jA?????t??s?iLS|pb??? d?u??R??j6J?5K$?RiMfh??m?k?a???+$) ?? R1??o ????0eJ??@?@k??B?a??m??L?P ?#ABp|4?2?h?B?+?kQ?2?!?'U??$?n?k?4?%??41Q?1A?CJ?????K????a85??1??Y1dJ?p??]&?f??v ??Q???@Pi ?4- ETLA??;?sb?KA0H`H(DX??Y?*?O?t?b gBCHPA H????QF??????Y:?b?3???cKV0h?a?]???kj???5?"*??W?GD?"???7?DQ?4???II!?????l?KI)9 ?v?Jn3rI!???g^??4[?!%6T??? &"?=?X?*???Q?1?*?F.???? ???`?'D*???iR?Jjv-?6?? LM,G?? ????6?dd-J?? ??m?m??t?0!? ?!??Fr~T?0;??lB??V??]??????(?? ? 0~?a???i??$B?h at H?$ b???dp??????2B}J??n??????,=s?????j5?4???I???????7??*5???????'?&*!#?!6?F?A?$~?O??ER??rNID?$?,N????G?*?W?1IE#??Ht#?N??$N?*$B???0???pK ,??2?)_???N?M????L?P??????J??i?K????*6?,???mX?p??'??r?{"Ey??<)???>I??OT?iH?;?????? ??%????=U$????=?1c???9?????2#????#???$?:???/????Bzil56)Ke?jmJf?$T??!K V"~S??zl|?????B#?:?/?<7$x;????????P?R\s1?e????1?jP?Pqc,?3$F?ad????!+d?" ?n???M* ?<?9???="b1 $B?0?) /v???X|Htn,8$?p?s??"+?:N?`?d?**???5?C?(? ???\?F???6j?(?0z ???'?AC??J????3Ja?hH???????$Zw9:X!?[Ze? a?? ?+^??????%&??gZt:XH!?0??!J?I(5??F???l???L??????``@??T? ??d?r?c}???r????=?(?????a???(Q7L??#?y???do ?O?&9Y??l?[?M/??LJO ?@?w$iF??(???/(?????????X??T???U???j )$??:I??A?!?^???.????J?Hr;N????R1=J???={??w??9?t?NqN*dS??2??P???C?|?????????I?*/?????????6|0??F*?:?A(3M?d?w???|??0? ]??;?:?'??4V??.???*???vpt?N?L?HP?4!?1???K$c????yv?:$?B???&??EBQ'jN???D??b'? &?Dw????????????? n_??`?? ??dY???UJ?? R?J_????)?#?????O[v7xd'?&E?#PQ$???7??l?????(?GtOP?_X? ???6e?R?k??Z??ieJ?R??*,"&????X=?h??I0????6?O??U???W $?i?aP??????o?C ?N?*b?? ??Ya( y???f?=H*? H??? z?Sx??g?D?; 'f2AR? H???%?!? G?% ??"(????BX?k?=*?*?S?L$?02Cng????vf,2??3!???J^?eZK*ZY,?~_ :?E?K?%`?0t?F g v?y(\??[]?[??8D?E ?t?$^?UN0?`+?H:d@????I?" O?~c ?6?9???c?(?zd"T???@???@???M?>?T??9???E???^?3?AAH???C?[?#???L;n)?@??? ??{H(A?)O??????Z, ?????7???Ot?????v?D??#?NBI?(?a?????(!??H??E? ???Pd,IF?0v?O?$????c;???k[???VA??????R0jH??,d??a' ?q??JZL??@?I????YJE?F?? ??!?:0\?y??06??$?9a?b?,??A??6??T*??Ci?A???(.??F c!?B*9??J_? ???????.&??T.? ??6????????????<&??/?PZTx??yb'?R:X????y???J??Y????c 0?u+Re-#E"5,$?*&#BcA?y?y{????t?t@$??????p?O6O& ???? ???3w?v3+(,x?C?2 ? R?X?al?o?uy????*- ??n??6M?K?Y?>??-??)?????iJ?55"jdrI,L0M&?L??!?? ?E??hH?$??!Q?$???????m??g?? GO?iI???????H?????'??@???r ?E?*X%?BD>???e?{#Z3??f??>C??????@? ??S?2??+Eb????<_($?M'?I?^GC???aP? A$Q9? 1?????# !??BtDu?%?$???Y??d$???s? :????Q??''?L'??D??? y?|??????i?v????O8W??S???????"?????h?-??{?|8?? ???|??Q$?Q??b?&?D?)*E%?9 ???j?|}?!??????8???I,~O???&?0?`?1?????)?7?y?"Z3ftDJ`?~?W?h&?D7%??d?`@??Arl C??c??USU_@?????$N???. )'??x6"$(?"????????(M$?9s?<,?Q#Ky???2?7??|?U:??????u-?~j=????A)?B?? ??O??Rz??z??y??6OC?"?~???s%g???!?}??????B?eS??2"????6I??'?C?I-G?????> ,?TU?Y[JjBBS?zX?( w _???????@? ?f?/?????XP?A??SS~m0?E?????n?%?G??????1@?yI?j???Z???H????!Lv ]??czHI?P&\+q?!?A? V?cY?)?FR?)???????EX@?&XHf? 4?ia9????&C???$?FH@I?t?w??YWm8F $vM??\? @?? ?&AE? -,&lF??A? ?&*J??&????a?y?MeFJ?V??8?3|RId?T#c$?S n??R?7?W;f?]?N??6????F???d??EaBJ+? 0hLWA ?????a9???~?????:x??b?Q?L$? pT??F?, ?pbi?dV??"??3?????~q??alD?-#?I(?? ? ?? ???? ?? :?$b???? X?'?'?L???????$????>BO??x~l??;_:??D??C?????.?m???=??wm???/?i?; ???v???vwgx654?z????N8H?=W??Y:EZ\A?(Q?}? $?rN?????????s3-??l?x????!_ ????1?~Y?7g?G?E????o}?????7??d>){8t3,w?!?0???{?9????A?P???m-e?hc?"??5?`U?? {?? X?N?t?la??&L???>??????p??#?U1=??CC????N???d&?????po?????mZo??????????mS?R?????b????m?8??a??X%dK???(? ??5?B %? `?>4???@|??B ?4a ?t4h?$J?????p?????$?! l :dbj??"ZMz??l?|O?6?!>F???(???a" D??p??0????0?XLx??,? ?&? ??`??}????&?y??*?m? ???? ?`???????!???A?B?????k[ ?!?????? P?F????"??? ?00??^?????a#??? Vn:p?7???????????CP?dk???[$?ZI? ??]?dSR?D??K??gz????{?????V?Ig???????????\?g ?S?(????[=??????*?-QbY?K b4$a{?4?I)???$Z?????? 9$,E>?7%?$'?X???84??bK??5`??M????????^????0????-m??u?q(-?A4#?0 h?D3??l?$7%?? ???S?D?XM?? ??1v?#H?? Q??aN7i?)g???q1?,??: #??[??Iw??k?F?:?$?? ?I??u??:??&?*???dm6?V=t??y??x??#?Hz????}?????? h? RI????R?(????(7? ? 7?*?mh? ??????6{???G ??I??????X??#?'Y?l? ????G9?????X? ???T??d???????Um???0????77`?~??=5=???R?aCi?&?G??sZ??=&??=4???VF-ED?&??????8??GY'?>G.?s?JYb?o6????x?????I?#??T?l??RR???O???? ?d??jQ?D$???H???I???$???DRl????v?V??:gN???w?Q?`??DiI1Z?`'b?wN?9"8????7d?cF?IM??F?Y?%??Mj>s????pR^? ?? 0???a? _r???03-I"??|??>?L BFR"? ??H?]?????Kf??DXT??! ?fF?!5???M?%d?\Y4? RR?yv?????????d?IP?B???Q\B? K?2???|?G?wG28??????H?[?s??)???KXT??P??{I?JG??0lM?/???m??rrZ???V&L??Y0i??w???W?b?h ?>??0u*1??  ??D?`Z$??Ljw?i ?D? ?Q1Cu=?????P??dH??????????L???RzDG?*?lX?(J??TV?????| ?0yj$?G???????????9?(??>$WJs>o?A?*t?Z)??_?E?P *?H?'?@???????P???!;?O?x?/??Q??m??????5?????f O??h?1??`4o?]??D??x.?6????h???^ ?iC??^?D?D?D?D1LZ 6??6???C????????D?8r??R??L1?? ?????1? q?5/<7??Ql?E??#????????hPO?4kGfb(????7?p?@Y???UER???0??^C6?\?#???P'@??j - ?[?gxp7x?H?l?2 ??e:?F????<|?????>h?'??l H?n??6D?g????-?Mnk?S?0? BA@?)?????(?????Z?=?,z??A?$MI???S???I?X$?N?r?sS?H?$??????~h??????}-!??q?F*Gl??M??D$P??[?H??77?4|???Q0?m?Td??2hUN!?=??bV??-kEi?????????K??7?@2 ?s,(?1 @? ?? E?D??Z(@cB+a??dP?A??0*??@??U????m;??v?????C??bq?????G ~??????L?.???Q?@)??????#?<P?/g?????d$?G??G?W??H?jI????????c !J?o =7?7???????z??Wmu?ZSy???mPinG5[???q??=?????;?nz??%????m?3????? OS??#Bz?)?ABh?I??5C?1?0?C???j???? '?!j(?? $???D?*???##??J,? G,\?Z?D`??Uh ????Rf??,k?V????Z[m?J??? EUTEUUUUWf?I?&???287.????B??6a`AeTZVH?J$\?2??????Q|K?#F4 AKEao?j??L8F?j?Y? R?????/rMfi?Z??R?mb?, ????k?????(??4?CF?#??Q???%??'??s? d?????#??mh2???d(?% )J ?E?N????f(????????E?FZ??[m??I+&?-`%PJTa ?h?????;??p??|?W;??Sk??????Y?????&??g??????:[??? fY7??33Uf?A.a??x L [????g?CZ?3t?[??? ??c???F?M~?`4y2 ]E???????????Jf?l?:????)?v?x?fc?gU?k?{S??f9wf??????g????????????e?}?B??d?cq ?{OL? ?????K???]???c????R????n???L1Ms??l64?a%xv???oY?L '?_;?????g??,tn?T??ZZ?Pa????d??y?<;s???g???~????o?PE?1\)~m?9Z??????K?u?? R?Wo???L??3O????_/??}??2?? ^?.??$??*??!3??????[??????fA?]?s?7]????????G^??m?v?5???|?/????l,???-le??-?w[???b???.??[?CV1?3J^?{???:??8v???}'?G ?|??'????????;\:??YW?B???4f???p??????TI????>??Q??^s?=S????w?{??N??'?>??T???jj-?T????Zx?n??&??A?J?g???e(???Q4?v2S?p@???!??^'|?7 r???D???????-???????Os?M?? ???`Z?# k?P????&Pp????z*?|?????8lS"<1???L??????u?M@=)*vk??????u?%?dZ???d8?=?.E?Q?^yj???$?}?f?Rj????3??UgmiQ?? \0????1 ?K??59QJ????U?f???????A???vfwy?/^?#$?!?N??%?1??? ??eW6?Q?>??e,*z??a??a?/???\?? 9G?B????? ??{?T?0??=?fn5;?R?Vr????g??+6'\?????/e????1????????*%Q?^~h?8F????L0$z????u<6???;b?q?L??????Mc??V??zF?%??????o?*&[Y ??&???*?????r????n?N?-t?)?B??|?m????????B??ht[,2[D?"x9???2?.3W????V+?q?;?2???It??&?l??x? ????E???&M?3????$????o????^`???????????$???m???????R?b?" ?rO?G??D???=McqD?UP?JV????_d?T?? XO??dA? ?y???4??:f?F???B???yX????I?d??o?~?Q?????'?0l P? ~???##&????? ATA??dX"? ?5h?????=???J?qQ?4>PH?0??9???.???`q ?\.??`?B/?/??Q0>#??u??v??^??XiE_?????W?\G???$????o??`??e????4J??????PN$ ?3{???GH?!?U 0???'?+??????, '?E|???]?[? U:\?? ??5??????Vz s?Y*?B?@M?????b?K"????#?!?????TeE?c????v???A?6Ng?-?????%$q??$2 1?H ?E????????F?6????q?yA' ?4?????? ?????;??(U??? ??????PH???????BH>v2a ??????f????`?&??}@ ?????:M? ?b??WX?"Y 0-??s?n??H???#??&????S? ??O??km?Y|[w??!??R ?&UQ?1X?4?L??z~R???jJ??Z?@?C?????__??????%?6??????UE?5??K???8?k{{zXf0a;?J?g??????????N?{???^?Vj?E????1c4?QO7 ?R?????????g?`o ????!p]????lwI????u??????h??B~??f????G?8????3e?#??????^1?q.?4r?a?bPrV???R-I? ??l???S?d !?L???gI*?x???KU{???(c7/??q$?ca?O^?(x?f?? ?)? ????U?m1?????f? ir??F?}i??u?o?Z}0 ?dBu?????.?%t Fb?S??9 ?? ? ^?f?wu???@?b?? ??E/??'A???_?+-? N X??$???e?3?2*zW~?tkm_,?>???p??;?)v??e?vwiHgE?????^'1??,5F?W????!??R??cP1J4?9.~?ml? ??"?u??| (?&??_???s???o?7i??.l??? ?v]?'o5???? A0?t???8?????I.?}? }F???&?<2N ???Z??e??"++* ??D\ ?v7?)????c??r?e????CU ?:II????SM??-???R???U`B??b+??T' ?Zd0? : 3?????%94????X???3???6???o?[??Lqm?8?p????????> ?? ??7????1????R x2???? ??\??-?7?*z??r'M????5!b>?????L??\????(G??J?E?W??X?!X?c?Wa?????]??]Y???gz?5t_? ??????????~????????mq???+??j??ys?????^&kE|:J????????6?jm'v?y7?? ????Z???-w?'???????E[MV6??K&??? /?:F7????a?!?y?&????#?R?f???r?+6?????>??3???7?? O=nj?)?'????I????Z??tf????&? ?_???:??Z64k ??8?'?\Z53?DK&y?q? ???j????n?T?????+?)d?2P`??F??)<~:?se?y??????9?????`>?T%4&??? / ???W?sA?TJC???6?me6???????e3~3?D??%c???i,l???L5:P?3?J6Y.LL ????kI??=?/A??/???)D?;?K?1?p?i???`???$?B`*4?BG??9???c?????0#? #???P1??w*?32?? 3&???TVr>.?m&?a? Jbst?X."????Gq?1#??w?X3???8SQ8T??I??P?Y??)?O2"????PVEnH1?8C???]&@"?D)?#??????6?1??.??Dg?M[~??>?g? [?/s7?r!??Oo????/?(9H?resW????7????4??x?vo???(????F?(???.??? ???E?~e???u????M????$?a???H?i1????????>?_?_{?3?#??U?:?0#M???m ?7?????R?1?]?[?.j&Xg???Hr>??`??u???R?@R? ??????ZEA? ????Sb??vS??s/??`??F?S? ?=ik?>?????|wt??>????????U.??`???PvWCG???bSU?=???????cV??[Xg?????A ?W?E8?K???H?????????R?{???I? ??~? w???? ??? ?|?y?&X?O??"Y??&?2??/?{-?f8??j?x??????+???Uj)~?? -a<n?1@%iz??r?++,??c"?IL????9? ?Z?>??Nw?v60oO????L???N  ????i? !?f?????b?5??m ??w!??BE?V??'!?????~X?JB?f???.l??\`?a`9v\:0??? ??`??H? O????#????mH??%?O?_?????y???Y?l?????% P?K\_????NP>?A*J?L7????Bm????-???M9?f?'P?c?t*9N?Vg??Cg"?????!~?t??'D??g(? U??@???+??!0??l??% ?}[ ??X??5,?%"?f??\?????f??4 ??WC??Y:b??_u?Jf???? m#?&????}F? ??i*N$?L?_Y|d?1???zFz=?5?HBC????A??^?~???i???8?? ?Q?]\??? 5D~??b?Y?~F???[?BI?>l????e&I;???f?d~??.??H?? ??????s9??T#??!J??$????????? ! w?Y??J??I??c??z?"?.???I??|?O??&l0BW???>????a????/?c Z??u?G???I$???:??X0.???z??]??Yz?|/G8?]Z??z?|N???y?Df1O????eqY?b)?w?q?k??;O ?]???rN??6I!u??r?.v/?t?!T ??Z?~D?^D???M`k???????k?.f????H???C??+?+?H?? ????Z)?iB??X?E"????b? d??K??N@? 5A}?@?? XDN?M?@?D???? ???1`?????.?z?y^U???.?? |?.?S?>???????1?v[^?R?s???u?E?^????? ?????T?A??9??????????B?h+ ???#?!?{???.? K???]?? ?J??+K??b?b???l?X?q?x?g`?nMT?+??R??b?iu?9????D? ???r"??????b?%?ib????{?M?(???@!???p???V?3??[We)?h?q??'??s*???????~?t?Shd??T? )B? ?????45-&?x? B?s{??+??|gAm{Z @C?pa???t??!Dp?c ?H`!r?LniXZ?V,^?????????p????.?s!?P?Ez?,`???-P?K,X?b?_??????,?1{?>n?*d@(U?gz?X?s6=K???I!A????C? ?F? ?-7 `? ???K?????U}r?o??boV DR ???.!?=??Xy??N?"?, ? ?_G?{QN?u ?=k?y?p??-??--R???, ?'(x((n? X?Q ??? ?:U?pB(???"HA??(??zMC??x??%r?L?@.!?.,]?6H?X{AW???y?????iH???fV??zE?}???j?\???2\?5?t_37???R???^?%w?Z.???2?R????X+? E#????X!?C7 h?D?Ahvi???ll|??TP?? bH??-?`-?U*??V????yO?Z?^e???z5*??w?o.X[???#b?J ???U?~?K????pU?@`o0 ???tT ????X?0W2?jJ?*B(?! ???]c???\??? ??g ??(?K???l,? ??,???p?????S9??&!??? ?h??*???????],???.? ??$D ?% ??F?"?A???m?de??,???Q??b?l????2?@B?dd`?" ????jI?@??E??0u??@??*??7HcA5.K???????E,:a!A??????8 ?b????[??I?T?????@??%??s_?Np^??$X,??????BT???!??;? ??Sz??^??h||??Q;@??@/?>P? ?^??????j??*?]? ??/:??????aQ??i;H?[?#\y?T??0?????X,X?b??? ]??pD?s?kB??0???c??s??.??9E??????OP?)s??5 ?i??!h??G?0;????Ne?G?? L? XE (????PSD|?^??]??????????? ??????G?G?#? ?}@??????_???l???avaGB?W?_o?J??JWl?????]????>??QDH?M%4??[?-e?F?L8N???6?a|A????+?X?\-??u?&:,X??K?6/???"Q??dX at p?~~~g???????z,??H D?$?|?`j???]Y[GrTs??????(??<9?.?e??O}?y???R?r4?>??/O???z?????"?G? ?????A?? X??C?V??%"$ 0g??n_? A?j|???xC;!C [,??????C??$????gBu?T+?O??$ i???k?4?j??[???!?????8)HwdKi??Y@?X??`?????? "?QU;n???E?C,]??B??G.U?a ???w?f?D  ??JM?Yp??8q0?d?"B?=?? ???"I??)???  X?????n??m?????!#"?1"?? ??????F4?E?C%???:?-7?`c???UUQ?DU??C4J@q6"??|])?AzN?????.:Z?|??(r??c??fke#W?YB?i#I>???W??u?6Rx???)????}??@??J?~xd-???A 0,Mv?&b?""?E?-?H????41c?;8)? h?J????;??B?@?Z?1?!?b?M[?????:a???t?????}O???W?g???GzE@f ?????D?T?p? g???[al???L??+*?n??.?:?a???t???{? D 2?????? ??? ?I?+|E?????S!?_{?????c6n5?^??j?$=}?{,?p?5 B/'"?2)?EmV?ek???[?P ???,Fa:??m?vu?8???P???AHz ?-????\??]???@?0o??????<=??8h'Y<7??u?????uX?????$:?4???"]i?}[???2???????D????]?s6??P??X.k???Z??s[?$f???? ??y?????XC5???!??;zS??-?g:????I?h?????CiM?!??M?WZ??????h?- 2???L ?m?a??[? r[?}????????!? C?$?CTl???O???,?T3??- ???t???H?U????\???X??9??K?2r?\?--?3?h"hm??#?????II?5???%????)?%??0q??0E?g??UUQ???{??i??p?^?s M???R???t9?^h?o??X?X???????'~J??0???r!2c?r?z{? z???t?? H?.????U???=)? ?????PH?Uek????e???{??x)??&{?AZ???o ???]kB???E?,X,0?N????b????[ ?????H?#??7?Y??? ?UO!?D?T.Q??tKa????P?ML?????b C??L????X??~iNa?o`T?`m????p4???e??(]\?vO7 ?B"fm??T;?(?? $??C??p?b??y??"$?=?*??'Zo?Z?$?(;#?^?~#??2????????z? 4:???aE ? ?ce`??"??????0s?????a8fmFDZ?u?? p3???[7-???nv?1??9???,?%??%?"0?BDn??l??9 e^L??i?Z???fA???+? a??????Ug?mr?:Rq?U?e \&?4?G8?`D?1?D???????????k?y?@??T0???vB?v?.8 ??????? (?6 $^k??,??QB ????h b?@?????G?\d??B??????#5S???"???|=?? ??h|V??0?@??-???*???'$????|Xa;:???x&???jp ?:??????.??(/bC?A?X(X??????Tr????n????p`? ???(???T? ?P[K??"/???X?"T?????? ??? H?y??????N?p)?D0P?.?k"??][????!?8? {? ^?7R9 ?2??y? ? ???? ????(??????h?F7?f??K????N??A?X ?? ???Arh~&? ???Rhp???[??!a?@MoY8??{~?]??aKK???I?Y??V?????B?\M?Lo_yne?p!??n??!5???{?d@????`+??!M??s2p????s??!??(jF:???9?? ?@????8???`n?L?h???$?g??\. ma???.?d??S?2?? ?d ?F ??QZb?1? From fedora-extras-commits at redhat.com Wed Jul 30 07:27:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:27:02 GMT Subject: rpms/gts/devel gts.spec,1.7,1.8 Message-ID: <200807300727.m6U7R2B7025389@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25340/devel Modified Files: gts.spec Log Message: * Wed Jul 30 2008 Ralf Cors??pius - 0.7.6-11 - Let *-devel Require: glib2-devel (BZ: 457099). - Pass LIBS=-lm to %configure (avoid non-weak refs to libm). - Add gts-0.7.6-hacks.diff (Various configuration fixes). - Add gts-0.7.6-autotools.diff (regenerate autotool-generated files). - Add %check. Index: gts.spec =================================================================== RCS file: /cvs/pkgs/rpms/gts/devel/gts.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gts.spec 23 May 2008 14:40:03 -0000 1.7 +++ gts.spec 30 Jul 2008 07:26:31 -0000 1.8 @@ -1,14 +1,15 @@ Name: gts Version: 0.7.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: GNU Triangulated Surface Library Group: Applications/Engineering License: LGPLv2+ URL: http://gts.sourceforge.net/index.html Source0: http://prdownloads.sourceforge.net/gts/gts-0.7.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gts-0.7.6-includedir.diff -Patch1: gts-0.7.6-gts_config.diff +Patch0: gts-0.7.6-hacks.diff + +Patch10: gts-0.7.6-autotools.diff.bz2 BuildRequires: glib2-devel BuildRequires: netpbm-devel @@ -17,6 +18,7 @@ Summary: Development files for gts Group: Applications/Engineering Requires: pkgconfig +Requires: glib2-devel Requires: %{name} = %{version}-%{release} %description @@ -31,10 +33,14 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 + +%patch10 -p1 + +# Fix broken permissions +chmod +x test/*/*.sh %build -%configure --disable-static --disable-dependency-tracking +%configure --disable-static --disable-dependency-tracking LIBS=-lm make %{?_smp_mflags} %install @@ -48,6 +54,10 @@ %clean rm -rf $RPM_BUILD_ROOT +%check +# Urgh, something is very broken with gts rsp. its testsuite +make check ||: + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -77,6 +87,13 @@ %{_datadir}/aclocal/* %changelog +* Wed Jul 30 2008 Ralf Cors??pius - 0.7.6-11 +- Let *-devel Require: glib2-devel (BZ: 457099). +- Pass LIBS=-lm to %%configure (avoid non-weak refs to libm). +- Add gts-0.7.6-hacks.diff (Various configuration fixes). +- Add gts-0.7.6-autotools.diff (regenerate autotool-generated files). +- Add %%check. + * Fri May 23 2008 Jon Stanley - 0.7.6-10 - Fix license tag From fedora-extras-commits at redhat.com Wed Jul 30 07:27:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:27:02 GMT Subject: rpms/gts/F-9 gts.spec,1.6,1.7 Message-ID: <200807300727.m6U7R2n7025392@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25340/F-9 Modified Files: gts.spec Log Message: * Wed Jul 30 2008 Ralf Cors??pius - 0.7.6-11 - Let *-devel Require: glib2-devel (BZ: 457099). - Pass LIBS=-lm to %configure (avoid non-weak refs to libm). - Add gts-0.7.6-hacks.diff (Various configuration fixes). - Add gts-0.7.6-autotools.diff (regenerate autotool-generated files). - Add %check. Index: gts.spec =================================================================== RCS file: /cvs/pkgs/rpms/gts/F-9/gts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gts.spec 19 Feb 2008 02:17:38 -0000 1.6 +++ gts.spec 30 Jul 2008 07:26:32 -0000 1.7 @@ -1,14 +1,15 @@ Name: gts Version: 0.7.6 -Release: 9%{?dist} +Release: 11%{?dist} Summary: GNU Triangulated Surface Library Group: Applications/Engineering -License: LGPL +License: LGPLv2+ URL: http://gts.sourceforge.net/index.html Source0: http://prdownloads.sourceforge.net/gts/gts-0.7.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gts-0.7.6-includedir.diff -Patch1: gts-0.7.6-gts_config.diff +Patch0: gts-0.7.6-hacks.diff + +Patch10: gts-0.7.6-autotools.diff.bz2 BuildRequires: glib2-devel BuildRequires: netpbm-devel @@ -17,6 +18,7 @@ Summary: Development files for gts Group: Applications/Engineering Requires: pkgconfig +Requires: glib2-devel Requires: %{name} = %{version}-%{release} %description @@ -31,10 +33,14 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 + +%patch10 -p1 + +# Fix broken permissions +chmod +x test/*/*.sh %build -%configure --disable-static --disable-dependency-tracking +%configure --disable-static --disable-dependency-tracking LIBS=-lm make %{?_smp_mflags} %install @@ -48,6 +54,10 @@ %clean rm -rf $RPM_BUILD_ROOT +%check +# Urgh, something is very broken with gts rsp. its testsuite +make check ||: + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -77,6 +87,16 @@ %{_datadir}/aclocal/* %changelog +* Wed Jul 30 2008 Ralf Cors??pius - 0.7.6-11 +- Let *-devel Require: glib2-devel (BZ: 457099). +- Pass LIBS=-lm to %%configure (avoid non-weak refs to libm). +- Add gts-0.7.6-hacks.diff (Various configuration fixes). +- Add gts-0.7.6-autotools.diff (regenerate autotool-generated files). +- Add %%check. + +* Fri May 23 2008 Jon Stanley - 0.7.6-10 +- Fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.7.6-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 30 07:27:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 30 Jul 2008 07:27:03 GMT Subject: rpms/gts/F-8 gts.spec,1.4,1.5 Message-ID: <200807300727.m6U7R3b1025395@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/gts/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25340/F-8 Modified Files: gts.spec Log Message: * Wed Jul 30 2008 Ralf Cors??pius - 0.7.6-11 - Let *-devel Require: glib2-devel (BZ: 457099). - Pass LIBS=-lm to %configure (avoid non-weak refs to libm). - Add gts-0.7.6-hacks.diff (Various configuration fixes). - Add gts-0.7.6-autotools.diff (regenerate autotool-generated files). - Add %check. Index: gts.spec =================================================================== RCS file: /cvs/pkgs/rpms/gts/F-8/gts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gts.spec 28 Aug 2007 19:56:44 -0000 1.4 +++ gts.spec 30 Jul 2008 07:26:32 -0000 1.5 @@ -1,14 +1,15 @@ Name: gts Version: 0.7.6 -Release: 7%{?dist} +Release: 11%{?dist} Summary: GNU Triangulated Surface Library Group: Applications/Engineering -License: LGPL +License: LGPLv2+ URL: http://gts.sourceforge.net/index.html Source0: http://prdownloads.sourceforge.net/gts/gts-0.7.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gts-0.7.6-includedir.diff -Patch1: gts-0.7.6-gts_config.diff +Patch0: gts-0.7.6-hacks.diff + +Patch10: gts-0.7.6-autotools.diff.bz2 BuildRequires: glib2-devel BuildRequires: netpbm-devel @@ -17,6 +18,7 @@ Summary: Development files for gts Group: Applications/Engineering Requires: pkgconfig +Requires: glib2-devel Requires: %{name} = %{version}-%{release} %description @@ -31,10 +33,14 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 + +%patch10 -p1 + +# Fix broken permissions +chmod +x test/*/*.sh %build -%configure --disable-static --disable-dependency-tracking +%configure --disable-static --disable-dependency-tracking LIBS=-lm make %{?_smp_mflags} %install @@ -48,6 +54,10 @@ %clean rm -rf $RPM_BUILD_ROOT +%check +# Urgh, something is very broken with gts rsp. its testsuite +make check ||: + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -77,6 +87,25 @@ %{_datadir}/aclocal/* %changelog +* Wed Jul 30 2008 Ralf Cors??pius - 0.7.6-11 +- Let *-devel Require: glib2-devel (BZ: 457099). +- Pass LIBS=-lm to %%configure (avoid non-weak refs to libm). +- Add gts-0.7.6-hacks.diff (Various configuration fixes). +- Add gts-0.7.6-autotools.diff (regenerate autotool-generated files). +- Add %%check. + +* Fri May 23 2008 Jon Stanley - 0.7.6-10 +- Fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0.7.6-9 +- Autorebuild for GCC 4.3 + +* Sun Oct 21 2007 Ralf Cors??pius - 0.7.6-8 +- Address BZ 341431: + - Rework gts-config. + - Rework gts.pc. + - Regenerate gts-0.7.6-pkg_config.diff. + * Tue Aug 28 2007 Ed Hill - 0.7.6-7 - rebuild for BuildID From fedora-extras-commits at redhat.com Wed Jul 30 07:57:53 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 07:57:53 GMT Subject: rpms/checkgmail/devel checkgmail.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807300757.m6U7vrN6026124@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26092 Modified Files: checkgmail.spec sources Log Message: pull svn snapshot Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/devel/checkgmail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- checkgmail.spec 9 Feb 2008 20:09:42 -0000 1.1 +++ checkgmail.spec 30 Jul 2008 07:57:23 -0000 1.2 @@ -1,15 +1,15 @@ Name: checkgmail Version: 1.13 -Release: 3%{?dist} +Release: 3.svn20080630%{?dist} Summary: System Tray Application that checks a Gmail Account for New Mail - - Group: Applications/Internet License: GPLv2+ -URL: http://checkgmail.sf.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://checkgmail.sf.net +#svn checkout to fix authentication issue. Upstream is doing a new release soon + +Source0: %{name}/%{name}-%{version}.svn20080630.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl perl-Gtk2 perl-Gtk2-TrayIcon perl-libwww-perl perl-Crypt-SSLeay Requires: perl-XML-Simple perl-Crypt-Simple perl-Crypt-Blowfish perl-FreezeThaw Requires: perl-Compress-Zlib perl-Gtk2-Sexy @@ -21,7 +21,7 @@ %prep -%setup -q +%setup -q iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog @@ -52,6 +52,8 @@ %changelog +* Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080630 +- Pull svn snapshot to fix auth issue * Sat Feb 9 2008 Rahul Sundaram - 1.13-3 - Fix timestamps Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Feb 2008 20:09:42 -0000 1.2 +++ sources 30 Jul 2008 07:57:23 -0000 1.3 @@ -1 +1 @@ -8f6742ba9c09f7b7b23a5be2e14708c7 checkgmail-1.13.tar.bz2 +63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080630.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 08:00:52 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 08:00:52 GMT Subject: rpms/checkgmail/devel .cvsignore,1.2,1.3 Message-ID: <200807300800.m6U80qaU026210@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26190 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Feb 2008 20:09:42 -0000 1.2 +++ .cvsignore 30 Jul 2008 08:00:22 -0000 1.3 @@ -1 +1 @@ -checkgmail-1.13.tar.bz2 +checkgmail-1.13.svn20080630.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 08:11:57 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 08:11:57 GMT Subject: rpms/checkgmail/F-9 checkgmail.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807300811.m6U8Bv1X000677@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv646 Modified Files: checkgmail.spec sources Log Message: pull snapshot Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-9/checkgmail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- checkgmail.spec 9 Feb 2008 20:09:42 -0000 1.1 +++ checkgmail.spec 30 Jul 2008 08:11:27 -0000 1.2 @@ -1,15 +1,15 @@ Name: checkgmail Version: 1.13 -Release: 3%{?dist} +Release: 3.svn20080630%{?dist} Summary: System Tray Application that checks a Gmail Account for New Mail - - Group: Applications/Internet License: GPLv2+ -URL: http://checkgmail.sf.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://checkgmail.sf.net +#svn checkout to fix authentication issue. Upstream is doing a new release soon + +Source0: %{name}/%{name}-%{version}.svn20080630.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl perl-Gtk2 perl-Gtk2-TrayIcon perl-libwww-perl perl-Crypt-SSLeay Requires: perl-XML-Simple perl-Crypt-Simple perl-Crypt-Blowfish perl-FreezeThaw Requires: perl-Compress-Zlib perl-Gtk2-Sexy @@ -21,7 +21,7 @@ %prep -%setup -q +%setup -q iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog @@ -52,6 +52,8 @@ %changelog +* Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080630 +- Pull svn snapshot to fix auth issue * Sat Feb 9 2008 Rahul Sundaram - 1.13-3 - Fix timestamps Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Feb 2008 20:09:42 -0000 1.2 +++ sources 30 Jul 2008 08:11:27 -0000 1.3 @@ -1 +1 @@ -8f6742ba9c09f7b7b23a5be2e14708c7 checkgmail-1.13.tar.bz2 +63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080630.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 08:23:00 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 08:23:00 GMT Subject: rpms/checkgmail/F-8 checkgmail.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807300823.m6U8N0BG000947@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv915 Modified Files: checkgmail.spec sources Log Message: pull snapshot Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-8/checkgmail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- checkgmail.spec 9 Feb 2008 20:23:14 -0000 1.1 +++ checkgmail.spec 30 Jul 2008 08:22:29 -0000 1.2 @@ -1,15 +1,15 @@ Name: checkgmail Version: 1.13 -Release: 3%{?dist} +Release: 3.svn20080630%{?dist} Summary: System Tray Application that checks a Gmail Account for New Mail - - Group: Applications/Internet License: GPLv2+ -URL: http://checkgmail.sf.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://checkgmail.sf.net +#svn checkout to fix authentication issue. Upstream is doing a new release soon + +Source0: %{name}/%{name}-%{version}.svn20080630.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl perl-Gtk2 perl-Gtk2-TrayIcon perl-libwww-perl perl-Crypt-SSLeay Requires: perl-XML-Simple perl-Crypt-Simple perl-Crypt-Blowfish perl-FreezeThaw Requires: perl-Compress-Zlib perl-Gtk2-Sexy @@ -21,7 +21,7 @@ %prep -%setup -q +%setup -q iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf8 mv ChangeLog.utf8 ChangeLog @@ -52,6 +52,8 @@ %changelog +* Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080630 +- Pull svn snapshot to fix auth issue * Sat Feb 9 2008 Rahul Sundaram - 1.13-3 - Fix timestamps Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Feb 2008 20:23:14 -0000 1.2 +++ sources 30 Jul 2008 08:22:29 -0000 1.3 @@ -1 +1 @@ -8f6742ba9c09f7b7b23a5be2e14708c7 checkgmail-1.13.tar.bz2 +63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080630.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 08:23:37 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 30 Jul 2008 08:23:37 GMT Subject: rpms/xen/F-9 xen-3.2.0-bzimage.patch,NONE,1.1 xen.spec,1.218,1.219 Message-ID: <200807300823.m6U8NbLw001015@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/xen/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv976 Modified Files: xen.spec Added Files: xen-3.2.0-bzimage.patch Log Message: * Wed Jul 30 2008 Mark McLoughlin - 3.2.0-15.fc9 - Support booting bzImage DomU kernel (e.g. Fedora 10) xen-3.2.0-bzimage.patch: --- NEW FILE xen-3.2.0-bzimage.patch --- x86: Support loading Linux bzImage v2.08 and up. The latest -mm kernel (2.6.25-rc3-mm1) contains v2.08 of the Linux bzImage format which embeds an ELF file in place of the raw payload allowing it to be extracted and used by the Xen domain builder. It is expected that this functionality will be put forward for 2.6.26. Signed-off-by : Ian Campbell Index: xen-3.2.0/tools/libxc/Makefile =================================================================== --- xen-3.2.0.orig/tools/libxc/Makefile 2008-01-16 18:34:59.000000000 +0000 +++ xen-3.2.0.orig/tools/libxc/Makefile 2008-01-16 18:34:59.000000000 +0000 @@ -47,10 +47,11 @@ $(LIBELF_SRCS) libelf-private.h: GUEST_SRCS-y += $(LIBELF_SRCS) # new domain builder -GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c -GUEST_SRCS-y += xc_dom_elfloader.c -GUEST_SRCS-y += xc_dom_binloader.c -GUEST_SRCS-y += xc_dom_compat_linux.c +GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c +GUEST_SRCS-y += xc_dom_elfloader.c +GUEST_SRCS-$(CONFIG_X86) += xc_dom_bzimageloader.c +GUEST_SRCS-y += xc_dom_binloader.c +GUEST_SRCS-y += xc_dom_compat_linux.c GUEST_SRCS-$(CONFIG_X86) += xc_dom_x86.c GUEST_SRCS-$(CONFIG_IA64) += xc_dom_ia64.c Index: xen-3.2.0/tools/libxc/xc_dom_elfloader.c =================================================================== --- xen-3.2.0.orig/tools/libxc/xc_dom_elfloader.c 2008-01-16 18:34:59.000000000 +0000 +++ xen-3.2.0.orig/tools/libxc/xc_dom_elfloader.c 2008-01-16 18:34:59.000000000 +0000 @@ -281,7 +281,7 @@ static int xc_dom_load_elf_kernel(struct /* ------------------------------------------------------------------------ */ -static struct xc_dom_loader elf_loader = { +struct xc_dom_loader elf_loader = { .name = "ELF-generic", .probe = xc_dom_probe_elf_kernel, .parser = xc_dom_parse_elf_kernel, Index: xen-3.2.0/tools/libxc/xc_dom_bzimageloader.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -0,0 +1,159 @@ +/* + * Xen domain builder -- bzImage bits + * + * Parse and load bzImage kernel images. + * + * This relies on version 2.08 of the boot protocol, which contains an + * ELF file embedded in the bzImage. The loader extracts this ELF + * image and passes it off to the standard ELF loader. + * + * This code is licenced under the GPL. + * written 2006 by Gerd Hoffmann . + * written 2007 by Jeremy Fitzhardinge + * written 2008 by Ian Campbell + * + */ +#include +#include +#include + +#include "xg_private.h" +#include "xc_dom.h" + +struct setup_header { + uint8_t _pad0[0x1f1]; /* skip uninteresting stuff */ + uint8_t setup_sects; + uint16_t root_flags; + uint32_t syssize; + uint16_t ram_size; + uint16_t vid_mode; + uint16_t root_dev; + uint16_t boot_flag; + uint16_t jump; + uint32_t header; +#define HDR_MAGIC "HdrS" +#define HDR_MAGIC_SZ 4 + uint16_t version; +#define VERSION(h,l) (((h)<<8) | (l)) + uint32_t realmode_swtch; + uint16_t start_sys; + uint16_t kernel_version; + uint8_t type_of_loader; + uint8_t loadflags; + uint16_t setup_move_size; + uint32_t code32_start; + uint32_t ramdisk_image; + uint32_t ramdisk_size; + uint32_t bootsect_kludge; + uint16_t heap_end_ptr; + uint16_t _pad1; + uint32_t cmd_line_ptr; + uint32_t initrd_addr_max; + uint32_t kernel_alignment; + uint8_t relocatable_kernel; + uint8_t _pad2[3]; + uint32_t cmdline_size; + uint32_t hardware_subarch; + uint64_t hardware_subarch_data; + uint32_t payload_offset; + uint32_t payload_length; +} __attribute__((packed)); + +extern struct xc_dom_loader elf_loader; + +static unsigned int payload_offset(struct setup_header *hdr) +{ + unsigned int off; + + off = (hdr->setup_sects + 1) * 512; + off += hdr->payload_offset; + return off; +} + +static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose) +{ + struct setup_header *hdr; + + if ( dom->kernel_blob == NULL ) + { + if ( verbose ) + xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n", + __FUNCTION__); + return -EINVAL; + } + if ( dom->kernel_size < sizeof(struct setup_header) ) + { + if ( verbose ) + xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n", + __FUNCTION__); + return -EINVAL; + } + + hdr = dom->kernel_blob; + + if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n", + __FUNCTION__); + return -EINVAL; + } + + if ( hdr->version < VERSION(2,8) ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n", + __FUNCTION__, hdr->version); + return -EINVAL; + } + + dom->kernel_blob = dom->kernel_blob + payload_offset(hdr); + dom->kernel_size = hdr->payload_length; + + if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\n", + __FUNCTION__); + return -EINVAL; + } + + return elf_loader.probe(dom); +} + +static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) +{ + return check_bzimage_kernel(dom, 0); +} + +static int xc_dom_parse_bzimage_kernel(struct xc_dom_image *dom) +{ + return elf_loader.parser(dom); +} + +static int xc_dom_load_bzimage_kernel(struct xc_dom_image *dom) +{ + return elf_loader.loader(dom); +} + +static struct xc_dom_loader bzimage_loader = { + .name = "Linux bzImage", + .probe = xc_dom_probe_bzimage_kernel, + .parser = xc_dom_parse_bzimage_kernel, + .loader = xc_dom_load_bzimage_kernel, +}; + +static void __init register_loader(void) +{ + xc_dom_register_loader(&bzimage_loader); +} + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-9/xen.spec,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- xen.spec 9 Jul 2008 10:59:02 -0000 1.218 +++ xen.spec 30 Jul 2008 08:23:06 -0000 1.219 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.2.0 -%define base_release 14 +%define base_release 15 # Hypervisor ABI %define hv_abi 3.2 @@ -81,6 +81,8 @@ Patch37: xen-pvfb-validate-fb.patch Patch38: xen-qemu-image-format.patch +Patch40: xen-3.2.0-bzimage.patch + # Patches to modify the default config of xend Patch100: xen-config-dom0-minmem.patch Patch102: xen-3.0.2-config-allow-unix-server.patch @@ -186,6 +188,8 @@ %patch37 -p1 %patch38 -p1 +%patch40 -p1 + # config patches %patch100 -p1 %patch102 -p1 @@ -467,6 +471,9 @@ %{_libdir}/*.a %changelog +* Wed Jul 30 2008 Mark McLoughlin - 3.2.0-15.fc9 +- Support booting bzImage DomU kernel (e.g. Fedora 10) + * Wed Jul 9 2008 Daniel P. Berrange - 3.2.0-14.fc9 - Remove bogus ia64 hypercall arg (rhbz #433921) From fedora-extras-commits at redhat.com Wed Jul 30 08:23:32 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 30 Jul 2008 08:23:32 GMT Subject: rpms/xen/F-8 xen-3.1.2-bzimage.patch,NONE,1.1 xen.spec,1.200,1.201 Message-ID: <200807300823.m6U8NWRD001010@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/xen/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv951 Modified Files: xen.spec Added Files: xen-3.1.2-bzimage.patch Log Message: * Wed Jul 30 2008 Mark McLoughlin - 3.1.2-5.fc8 - Support booting bzImage DomU kernel (e.g. Fedora 10) xen-3.1.2-bzimage.patch: --- NEW FILE xen-3.1.2-bzimage.patch --- x86: Support loading Linux bzImage v2.08 and up. The latest -mm kernel (2.6.25-rc3-mm1) contains v2.08 of the Linux bzImage format which embeds an ELF file in place of the raw payload allowing it to be extracted and used by the Xen domain builder. It is expected that this functionality will be put forward for 2.6.26. Signed-off-by : Ian Campbell diff -up /dev/null xen-3.1.2-src/tools/libxc/xc_dom_bzimageloader.c --- /dev/null 2008-07-30 07:06:19.721092644 +0100 +++ xen-3.1.2-src/tools/libxc/xc_dom_bzimageloader.c 2008-07-30 08:51:24.000000000 +0100 @@ -0,0 +1,159 @@ +/* + * Xen domain builder -- bzImage bits + * + * Parse and load bzImage kernel images. + * + * This relies on version 2.08 of the boot protocol, which contains an + * ELF file embedded in the bzImage. The loader extracts this ELF + * image and passes it off to the standard ELF loader. + * + * This code is licenced under the GPL. + * written 2006 by Gerd Hoffmann . + * written 2007 by Jeremy Fitzhardinge + * written 2008 by Ian Campbell + * + */ +#include +#include +#include + +#include "xg_private.h" +#include "xc_dom.h" + +struct setup_header { + uint8_t _pad0[0x1f1]; /* skip uninteresting stuff */ + uint8_t setup_sects; + uint16_t root_flags; + uint32_t syssize; + uint16_t ram_size; + uint16_t vid_mode; + uint16_t root_dev; + uint16_t boot_flag; + uint16_t jump; + uint32_t header; +#define HDR_MAGIC "HdrS" +#define HDR_MAGIC_SZ 4 + uint16_t version; +#define VERSION(h,l) (((h)<<8) | (l)) + uint32_t realmode_swtch; + uint16_t start_sys; + uint16_t kernel_version; + uint8_t type_of_loader; + uint8_t loadflags; + uint16_t setup_move_size; + uint32_t code32_start; + uint32_t ramdisk_image; + uint32_t ramdisk_size; + uint32_t bootsect_kludge; + uint16_t heap_end_ptr; + uint16_t _pad1; + uint32_t cmd_line_ptr; + uint32_t initrd_addr_max; + uint32_t kernel_alignment; + uint8_t relocatable_kernel; + uint8_t _pad2[3]; + uint32_t cmdline_size; + uint32_t hardware_subarch; + uint64_t hardware_subarch_data; + uint32_t payload_offset; + uint32_t payload_length; +} __attribute__((packed)); + +extern struct xc_dom_loader elf_loader; + +static unsigned int payload_offset(struct setup_header *hdr) +{ + unsigned int off; + + off = (hdr->setup_sects + 1) * 512; + off += hdr->payload_offset; + return off; +} + +static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose) +{ + struct setup_header *hdr; + + if ( dom->kernel_blob == NULL ) + { + if ( verbose ) + xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n", + __FUNCTION__); + return -EINVAL; + } + if ( dom->kernel_size < sizeof(struct setup_header) ) + { + if ( verbose ) + xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n", + __FUNCTION__); + return -EINVAL; + } + + hdr = dom->kernel_blob; + + if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n", + __FUNCTION__); + return -EINVAL; + } + + if ( hdr->version < VERSION(2,8) ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n", + __FUNCTION__, hdr->version); + return -EINVAL; + } + + dom->kernel_blob = dom->kernel_blob + payload_offset(hdr); + dom->kernel_size = hdr->payload_length; + + if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 ) + { + if ( verbose ) + xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\n", + __FUNCTION__); + return -EINVAL; + } + + return elf_loader.probe(dom); +} + +static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) +{ + return check_bzimage_kernel(dom, 0); +} + +static int xc_dom_parse_bzimage_kernel(struct xc_dom_image *dom) +{ + return elf_loader.parser(dom); +} + +static int xc_dom_load_bzimage_kernel(struct xc_dom_image *dom) +{ + return elf_loader.loader(dom); +} + +static struct xc_dom_loader bzimage_loader = { + .name = "Linux bzImage", + .probe = xc_dom_probe_bzimage_kernel, + .parser = xc_dom_parse_bzimage_kernel, + .loader = xc_dom_load_bzimage_kernel, +}; + +static void __init register_loader(void) +{ + xc_dom_register_loader(&bzimage_loader); +} + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -up xen-3.1.2-src/tools/libxc/Makefile.bzImage xen-3.1.2-src/tools/libxc/Makefile --- xen-3.1.2-src/tools/libxc/Makefile.bzImage 2007-11-14 23:35:27.000000000 +0000 +++ xen-3.1.2-src/tools/libxc/Makefile 2008-07-30 08:51:24.000000000 +0100 @@ -45,10 +45,11 @@ $(LIBELF_SRCS) libelf-private.h: GUEST_SRCS-y += $(LIBELF_SRCS) # new domain builder -GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c -GUEST_SRCS-y += xc_dom_elfloader.c -GUEST_SRCS-y += xc_dom_binloader.c -GUEST_SRCS-y += xc_dom_compat_linux.c +GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c +GUEST_SRCS-y += xc_dom_elfloader.c +GUEST_SRCS-$(CONFIG_X86) += xc_dom_bzimageloader.c +GUEST_SRCS-y += xc_dom_binloader.c +GUEST_SRCS-y += xc_dom_compat_linux.c GUEST_SRCS-$(CONFIG_X86) += xc_dom_x86.c GUEST_SRCS-$(CONFIG_IA64) += xc_dom_ia64.c diff -up xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c.bzImage xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c --- xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c.bzImage 2007-11-14 23:35:27.000000000 +0000 +++ xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c 2008-07-30 08:51:24.000000000 +0100 @@ -281,7 +281,7 @@ static int xc_dom_load_elf_kernel(struct /* ------------------------------------------------------------------------ */ -static struct xc_dom_loader elf_loader = { +struct xc_dom_loader elf_loader = { .name = "ELF-generic", .probe = xc_dom_probe_elf_kernel, .parser = xc_dom_parse_elf_kernel, Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-8/xen.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- xen.spec 13 Jun 2008 14:27:37 -0000 1.200 +++ xen.spec 30 Jul 2008 08:23:02 -0000 1.201 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -24,6 +24,8 @@ Patch34: xen-3.1.0-no-xenapi-docs.patch Patch36: xen-qemu-bootmenu.patch +Patch40: xen-3.1.2-bzimage.patch + # Patches to modify the default config of xend Patch100: xen-config-dom0-minmem.patch Patch102: xen-3.0.2-config-allow-unix-server.patch @@ -127,6 +129,8 @@ %patch34 -p1 %patch36 -p1 +%patch40 -p1 + # config patches %patch100 -p1 %patch102 -p1 @@ -281,6 +285,9 @@ %{_libdir}/*.a %changelog +* Wed Jul 30 2008 Mark McLoughlin - 3.1.2-5.fc8 +- Support booting bzImage DomU kernel (e.g. Fedora 10) + * Fri Jun 13 2008 Markus Armbruster - 3.1.2-4.fc8 - Fix pvfb SDL window (rhbz #449386) - Correctly limit PVFB size (CVE-2008-1952) From fedora-extras-commits at redhat.com Wed Jul 30 09:14:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Wed, 30 Jul 2008 09:14:18 GMT Subject: rpms/qmmp/F-9 .cvsignore,1.3,1.4 qmmp.spec,1.3,1.4 sources,1.3,1.4 Message-ID: <200807300914.m6U9EIZc008816@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8785 Modified Files: .cvsignore qmmp.spec sources Log Message: new version 0.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 May 2008 16:58:19 -0000 1.3 +++ .cvsignore 30 Jul 2008 09:13:48 -0000 1.4 @@ -1 +1 @@ -qmmp-0.1.6.tar.bz2 +qmmp-0.2.0.tar.bz2 Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-9/qmmp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qmmp.spec 13 May 2008 16:58:19 -0000 1.3 +++ qmmp.spec 30 Jul 2008 09:13:48 -0000 1.4 @@ -1,5 +1,5 @@ Name: qmmp -Version: 0.1.6 +Version: 0.2.0 Release: 1%{?dist} Summary: Qt-based multimedia player @@ -18,23 +18,41 @@ BuildRequires: libmpcdec-devel >= 1.2.2 libvorbis-devel libogg-devel BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils +BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +BuildRequires: libcurl-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig +%package devel +Summary: Header files for qmmp +Group: Development/Libraries + %description This program is an audio-player, written with help of Qt library. The user interface is similar to winamp or xmms. Main opportunities: - * unpacked winamp skins support; - * plugins support; - * Ogg Vorbis support; - * Native FLAC support; - * Musepack support; - * WMA support; - * AlSA sound output; - * JACK sound output. + * Winamp and xmms skins support + * plugins support + * Ogg Vorbis support + * native FLAC support + * Musepack support + * WavePack support + * ModPlug support + * PCM WAVE support + * AlSA sound output + * JACK sound output + * OSS sound output + * PulseAudio output + * Last.fm scrobbler + * D-Bus support + * Spectrum Analyzer + * sample rate conversion + * streaming support + +%description devel +QMMP is Qt-based audio player. This package contains its header files. %prep %setup -q @@ -51,9 +69,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install -# Install icon and desktop file -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -mv %{buildroot}%{_datadir}/pixmaps/qmmp.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps +# Install desktop file desktop-file-install --delete-original --vendor fedora --dir \ %{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/qmmp.desktop @@ -66,9 +82,12 @@ %doc AUTHORS ChangeLog ChangeLog.rus COPYING README README.RUS %{_bindir}/qmmp %{_libdir}/qmmp -%{_libdir}/libqmmp.so +%{_libdir}/libqmmp* %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/icons/hicolor/32x32/apps/ +%{_datadir}/icons/hicolor/ + +%files devel +%{_includedir} %post /sbin/ldconfig @@ -86,6 +105,17 @@ %changelog +* Wed Jul 30 2008 Karel Volny 0.2.0-1 +- new version +- updated %%description to match upstream +- added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel +- added BuildRequires: libcurl-devel +- xpm icon is not used anymore (several pngs available) +- created devel subpackage + +* Mon May 19 2008 Karel Volny 0.1.6-2 +- fixed %%description not to include patent-encumbered formats (bug #447141) + * Tue May 13 2008 Karel Volny 0.1.6-1 - new version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 May 2008 16:58:19 -0000 1.3 +++ sources 30 Jul 2008 09:13:48 -0000 1.4 @@ -1 +1 @@ -b9f8b6f33e7e8e3f8667592ecaea7b20 qmmp-0.1.6.tar.bz2 +3dd56fc0c9dd632572465f9eab3e4c80 qmmp-0.2.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 09:28:39 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Miroslav_Such=C3=BD?= (msuchy)) Date: Wed, 30 Jul 2008 09:28:39 GMT Subject: rpms/perl-Frontier-RPC/devel apache2.patch, NONE, 1.1 import.log, NONE, 1.1 perl-frontier-undef-scalar.patch, NONE, 1.1 security-xml-external-entity.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Frontier-RPC.spec, 1.13, 1.14 sources, 1.3, 1.4 Message-ID: <200807300928.m6U9Sded009218@cvs-int.fedora.redhat.com> Author: msuchy Update of /cvs/pkgs/rpms/perl-Frontier-RPC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9171/devel Modified Files: .cvsignore perl-Frontier-RPC.spec sources Added Files: apache2.patch import.log perl-frontier-undef-scalar.patch security-xml-external-entity.patch Log Message: Upgrade perl-Frontier-RPC to version 0.07b4p1-4 apache2.patch: --- NEW FILE apache2.patch --- --- Frontier-RPC-0.07b4p1/lib/Apache/XMLRPC.pm.apache2 2007-11-08 17:01:28.000000000 +0100 +++ Frontier-RPC-0.07b4p1/lib/Apache/XMLRPC.pm 2007-11-08 17:24:46.000000000 +0100 @@ -10,16 +10,18 @@ package Apache::XMLRPC; -use Apache::Constants qw(:common); +use Apache2::Const; +use Apache2::ServerUtil; use Frontier::RPC2; sub handler { my $r = shift; - my $conf = $r->server_root_relative( $r->dir_config( "XMLRPC_Config" ) ); + my $path = $r->dir_config( "XMLRPC_Config" ); + my $conf = Apache2::ServerUtil::server_root_relative( $r->pool, $path ); if( -f $conf ) { - unless( $rt = do $conf ) { + unless( my $rt = do $conf ) { die "Couldn\'t parse conf file ($conf): $@\n" if $@; die "Couldn\'t compile conf file ($conf): $!\n" unless defined $rt; die "Couldn\'t run conf file ($conf)\n" unless $rt; @@ -28,15 +30,16 @@ my $decoder = Frontier::RPC2->new(); - my $content; - $r->read( $content, $r->header_in( 'Content-length' ) ); + if (defined $clength and $clength >= 0) { + my $content; + $r->read( $content, $r->headers_in->{'Content-length'} ); - my $answer = $decoder->serve( $content, $Apache::XMLRPC::map ); + my $answer = $decoder->serve( $content, $Apache::XMLRPC::map ); - $r->send_http_header(); - $r->print($answer); + $r->print($answer); + } - return OK; + return Apache2::Const::OK(); } 1; --- NEW FILE import.log --- perl-Frontier-RPC-0_07b4p1-4:HEAD:perl-Frontier-RPC-0.07b4p1-4.src.rpm:1217410048 perl-frontier-undef-scalar.patch: --- NEW FILE perl-frontier-undef-scalar.patch --- --- Frontier-RPC-0.06/lib/Frontier/RPC2.pm.undef-scalar 2005-06-15 11:28:48.323851492 -0400 +++ Frontier-RPC-0.06/lib/Frontier/RPC2.pm 2005-06-15 12:24:44.739297487 -0400 @@ -226,6 +226,8 @@ sub _scalar { my $self = shift; my $value = shift; + $value = '' unless defined $value; + # these are from `perldata(1)' if ($value =~ /^[+-]?\d+$/) { return ("$value"); security-xml-external-entity.patch: --- NEW FILE security-xml-external-entity.patch --- --- Frontier-RPC-0.07b3-orig/lib/Frontier/RPC2.pm Mon Apr 23 15:17:32 2001 +++ Frontier-RPC-0.07b3/lib/Frontier/RPC2.pm Wed Oct 30 00:03:39 2002 @@ -302,6 +302,9 @@ ### XML::Parser callbacks ### +sub externent { '' } +sub externentfin { '' } + sub die { my $expat = shift; my $message = shift; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Frontier-RPC/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jun 2006 23:28:12 -0000 1.3 +++ .cvsignore 30 Jul 2008 09:28:09 -0000 1.4 @@ -1,2 +1 @@ -Frontier-RPC-0.06.tar.gz -Frontier-RPC-0.07b4.tar.gz +Frontier-RPC-0.07b4p1.tar.gz Index: perl-Frontier-RPC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Frontier-RPC/devel/perl-Frontier-RPC.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Frontier-RPC.spec 7 Mar 2008 02:01:33 -0000 1.13 +++ perl-Frontier-RPC.spec 30 Jul 2008 09:28:09 -0000 1.14 @@ -1,64 +1,87 @@ Summary: A Perl interface for making and serving XML-RPC calls Name: perl-Frontier-RPC -Version: 0.07b4 +Version: 0.07b4p1 Release: 4%{?dist} - -Group: Development/Libraries License: GPL+ or Artistic -Url: http://search.cpan.org/dist/Frontier-RPC/ -Source0: ftp://cpan.org/pub/CPAN/authors/id/K/KM/KMACLEOD/Frontier-RPC-%{version}.tar.gz +Group: Development/Libraries +URL: http://search.cpan.org/dist/Frontier-RPC/ +Source0: http://search.cpan.org/CPAN/authors/id/R/RT/RTFIREFLY/Frontier-RPC-%{version}.tar.gz Patch0: perl-frontier-raw-call.patch Patch1: perl-frontier-raw-serve.patch +Patch2: perl-frontier-undef-scalar.patch +Patch3: security-xml-external-entity.patch +Patch4: apache2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch BuildRequires: perl(LWP::UserAgent), perl(XML::Parser), perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-Frontier-RPC-Client = %{version} +%package Client +Summary: Frontier-RPC-Client Perl module +Group: Development/Libraries +Conflicts: perl-Frontier-RPC +License: GPL or Artistic %description -Frontier::RPC implements UserLand Software's XML RPC (Remote Procedure -Calls using Extensible Markup Language). Frontier::RPC includes both -a client module for making requests to a server and a daemon module -for implementing servers. Frontier::RPC uses RPC2 format messages. - +Frontier::RPC implements UserLand Software's XML RPC (Remote +Procedure Calls using Extensible Markup Language). Frontier::RPC +includes both a client module for making requests to a server and +several server modules for implementing servers using CGI, Apache, +and standalone with HTTP::Daemon. + +%description Client +Frontier::RPC::Client implements UserLand Software's XML RPC (Remote +Procedure Calls using Extensible Markup Language). Frontier::RPC::Client +includes just client module for making requests to a server. %prep -%setup -q -n Frontier-RPC-%{version} +%setup -q -n Frontier-RPC-%{version} %patch0 -p1 %patch1 -p1 - +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT + make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w $RPM_BUILD_ROOT/* +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; + +%{_fixperms} $RPM_BUILD_ROOT/* %check make test - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc ChangeLog Changes COPYING README examples/ -%{perl_vendorlib}/Frontier/ -%{perl_vendorlib}/Apache/XMLRPC.pm -%{_mandir}/man3/*.3* +%{perl_vendorlib}/* +%{_mandir}/man3/* +%files Client +%defattr(-,root,root,-) +%doc ChangeLog Changes COPYING README examples/ +%{perl_vendorlib}/Frontier/Client.pm +%{perl_vendorlib}/Frontier/RPC2.pm +%{_mandir}/man3/Frontier::Client.3pm.gz +%{_mandir}/man3/Frontier::RPC2.3pm.gz %changelog +* Wed Jul 30 2008 Miroslav Such?? 0.07b4p1-4 +- applied security patches. +- created light package with only Client part. + * Thu Mar 06 2008 Tom "spot" Callaway - 0.07b4-4 Rebuild for new perl @@ -97,12 +120,13 @@ - automated release bump and build * Fri Apr 5 2002 Chip Turner -- add patch from RHN to allow raw non-conformat calls. -- doesn't affect main code path, but adds functionality +- add patch from RHN to allow raw non-conformat calls. +- doesn't affect main code path, but adds functionality - similar to python xmlrpc module * Wed Jan 09 2002 Tim Powers - automated rebuild * Mon Apr 30 2001 Chip Turner -- Spec file was autogenerated. +- Spec file was autogenerated. + Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Frontier-RPC/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jun 2006 23:28:12 -0000 1.3 +++ sources 30 Jul 2008 09:28:09 -0000 1.4 @@ -1 +1 @@ -c04582da604f11bdbe60606738f92457 Frontier-RPC-0.07b4.tar.gz +308f8b81cef0c195d83dded6d1e83f0d Frontier-RPC-0.07b4p1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 09:32:37 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Miroslav_Such=C3=BD?= (msuchy)) Date: Wed, 30 Jul 2008 09:32:37 GMT Subject: rpms/perl-Filesys-Df/F-9 import.log, NONE, 1.1 perl-Filesys-Df.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807300932.m6U9WbxG009392@cvs-int.fedora.redhat.com> Author: msuchy Update of /cvs/pkgs/rpms/perl-Filesys-Df/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9338/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Filesys-Df.spec Log Message: Import perl-Filesys-Df to F-9 --- NEW FILE import.log --- perl-Filesys-Df-0_92-2_fc9:F-9:perl-Filesys-Df-0.92-2.fc9.src.rpm:1217410282 --- NEW FILE perl-Filesys-Df.spec --- Name: perl-Filesys-Df Version: 0.92 Release: 2%{?dist} Summary: Perl extension for filesystem disk space information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Filesys-Df/ Source0: http://www.cpan.org/modules/by-module/Filesys/Filesys-Df-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a way to obtain filesystem disk space information. This is a Unix only distribution. If you want to gather this information for Unix and Windows, use Filesys::DfPortable. The only major benefit of using Filesys::Df over Filesys::DfPortable, is that Filesys::Df supports the use of open filehandles as arguments. %prep %setup -q -n Filesys-Df-%{version} #readme is with dos EOL, convert it to unix sed -i 's/\r//' README %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/* %{_mandir}/man3/* %changelog * Thu Jul 24 2008 Miroslav Suchy 0.92-2 - fixed README end of lines. - remove zero sized *.bs files. * Tue Jul 15 2008 Miroslav Suchy 0.92-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 15:42:26 -0000 1.1 +++ .cvsignore 30 Jul 2008 09:32:07 -0000 1.2 @@ -0,0 +1 @@ +Filesys-Df-0.92.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 15:42:26 -0000 1.1 +++ sources 30 Jul 2008 09:32:07 -0000 1.2 @@ -0,0 +1 @@ +a8b0aa3e5151a8a6c8b3067625980934 Filesys-Df-0.92.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 09:43:17 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Wed, 30 Jul 2008 09:43:17 GMT Subject: rpms/qmmp/F-9 qmmp.spec,1.4,1.5 Message-ID: <200807300943.m6U9hHmN009741@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9688 Modified Files: qmmp.spec Log Message: add modplug support ... oops, I forgot Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-9/qmmp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qmmp.spec 30 Jul 2008 09:13:48 -0000 1.4 +++ qmmp.spec 30 Jul 2008 09:42:47 -0000 1.5 @@ -1,6 +1,6 @@ Name: qmmp Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt-based multimedia player Group: Applications/Multimedia @@ -19,7 +19,7 @@ BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel -BuildRequires: libcurl-devel +BuildRequires: libmodplug-devel libcurl-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig @@ -105,6 +105,9 @@ %changelog +* Wed Jul 30 2008 Karel Volny 0.2.0-2 +- added BuildRequires: libmodplug-devel + * Wed Jul 30 2008 Karel Volny 0.2.0-1 - new version - updated %%description to match upstream From fedora-extras-commits at redhat.com Wed Jul 30 09:50:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Miroslav_Such=C3=BD?= (msuchy)) Date: Wed, 30 Jul 2008 09:50:26 GMT Subject: rpms/perl-Filesys-Df/devel import.log, NONE, 1.1 perl-Filesys-Df.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807300950.m6U9oQwR009980@cvs-int.fedora.redhat.com> Author: msuchy Update of /cvs/pkgs/rpms/perl-Filesys-Df/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9902/devel Modified Files: .cvsignore sources Added Files: import.log perl-Filesys-Df.spec Log Message: Importing perl-Filesys-Df to devel --- NEW FILE import.log --- perl-Filesys-Df-0_92-2_fc9:HEAD:perl-Filesys-Df-0.92-2.fc9.src.rpm:1217411306 --- NEW FILE perl-Filesys-Df.spec --- Name: perl-Filesys-Df Version: 0.92 Release: 2%{?dist} Summary: Perl extension for filesystem disk space information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Filesys-Df/ Source0: http://www.cpan.org/modules/by-module/Filesys/Filesys-Df-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a way to obtain filesystem disk space information. This is a Unix only distribution. If you want to gather this information for Unix and Windows, use Filesys::DfPortable. The only major benefit of using Filesys::Df over Filesys::DfPortable, is that Filesys::Df supports the use of open filehandles as arguments. %prep %setup -q -n Filesys-Df-%{version} #readme is with dos EOL, convert it to unix sed -i 's/\r//' README %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/* %{_mandir}/man3/* %changelog * Thu Jul 24 2008 Miroslav Suchy 0.92-2 - fixed README end of lines. - remove zero sized *.bs files. * Tue Jul 15 2008 Miroslav Suchy 0.92-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 15:42:26 -0000 1.1 +++ .cvsignore 30 Jul 2008 09:49:56 -0000 1.2 @@ -0,0 +1 @@ +Filesys-Df-0.92.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 15:42:26 -0000 1.1 +++ sources 30 Jul 2008 09:49:56 -0000 1.2 @@ -0,0 +1 @@ +a8b0aa3e5151a8a6c8b3067625980934 Filesys-Df-0.92.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 10:21:25 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Wed, 30 Jul 2008 10:21:25 GMT Subject: rpms/PackageKit/devel .cvsignore, 1.23, 1.24 PackageKit.spec, 1.39, 1.40 sources, 1.24, 1.25 Message-ID: <200807301021.m6UALP1o017226@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17200 Modified Files: .cvsignore PackageKit.spec sources Log Message: * Tue Jul 30 2008 Richard Hughes - 0.2.4-1 - New upstream version, only bugfixes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 19 Jun 2008 14:46:01 -0000 1.23 +++ .cvsignore 30 Jul 2008 10:20:55 -0000 1.24 @@ -1 +1 @@ -PackageKit-0.2.3-20080618.tar.gz +PackageKit-0.2.4.tar.gz Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- PackageKit.spec 15 Jul 2008 07:37:03 -0000 1.39 +++ PackageKit.spec 30 Jul 2008 10:20:55 -0000 1.40 @@ -2,18 +2,20 @@ %define dbus_version 0.90 %define dbus_glib_version 0.70 %define policykit_version 0.8 -%define alphatag 20080618 +#%define alphatag 20080618 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: System daemon that is a DBUS abstraction layer for package management Name: PackageKit -Version: 0.2.3 -Release: 6.%{?alphatag}%{?dist} +Version: 0.2.4 +#Release: 1.%{?alphatag}%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org -Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +#Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dbus >= %{dbus_version} @@ -97,7 +99,8 @@ Headers and libraries for PackageKit. %prep -%setup -q -n %{name}-%{version}-%{?alphatag} +#%setup -q -n %{name}-%{version}-%{?alphatag} +%setup -q %build %configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local @@ -113,8 +116,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a -install -m644 docs/spec/pk-structure.png $RPM_BUILD_ROOT%{_datadir}/doc/packagekit/ - chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/yumDBUSBackend.py chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py @@ -136,9 +137,6 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING -%dir %{_datadir}/doc/packagekit -%doc %{_datadir}/doc/packagekit/pk-reference.html -%doc %{_datadir}/doc/packagekit/pk-structure.png %dir %{_datadir}/PackageKit %dir %{_datadir}/PackageKit/helpers @@ -200,6 +198,9 @@ %{_includedir}/* %changelog +* Tue Jul 30 2008 Richard Hughes - 0.2.4-1 +- New upstream version, only bugfixes. + * Tue Jul 15 2008 Richard Hughes - 0.2.3-6 - Silence the output of update-mime-database to fix rh#454782 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 19 Jun 2008 14:46:01 -0000 1.24 +++ sources 30 Jul 2008 10:20:55 -0000 1.25 @@ -1 +1 @@ -9e011ea4decf3388a43b49e46c63005a PackageKit-0.2.3-20080618.tar.gz +87bf41fd021077c93549d47de6d5fe07 PackageKit-0.2.4.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 10:22:30 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Wed, 30 Jul 2008 10:22:30 GMT Subject: rpms/gnome-packagekit/devel .cvsignore, 1.22, 1.23 gnome-packagekit.spec, 1.36, 1.37 sources, 1.22, 1.23 Message-ID: <200807301022.m6UAMUOY017309@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17278 Modified Files: .cvsignore gnome-packagekit.spec sources Log Message: * Tue Jul 30 2008 Richard Hughes - 0.2.4-1 - New upstream version, only bugfixes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 19 Jun 2008 14:47:24 -0000 1.22 +++ .cvsignore 30 Jul 2008 10:22:00 -0000 1.23 @@ -1 +1 @@ -gnome-packagekit-0.2.3-20080618.tar.gz +gnome-packagekit-0.2.4.tar.gz Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gnome-packagekit.spec 19 Jun 2008 14:47:24 -0000 1.36 +++ gnome-packagekit.spec 30 Jul 2008 10:22:00 -0000 1.37 @@ -1,19 +1,22 @@ %define dbus_version 0.61 %define packagekit_version 0.2.3-3.20080611 -%define alphatag 20080618 +#%define alphatag 20080618 Summary: GNOME PackageKit Client Name: gnome-packagekit -Version: 0.2.3 -Release: 4.%{?alphatag}%{?dist} +Version: 0.2.4 +#Release: 4.%{?alphatag}%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org -Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +#Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz +Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz Source1: system-install-packages Source2: system-install-packages.1.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: gnome-packagekit-enable-kde.patch + Requires: gtk2 >= 2.12.0 Requires: gnome-icon-theme Requires: libnotify >= 0.4.3 @@ -28,7 +31,7 @@ Requires(post): GConf2 Requires(preun): GConf2 Requires(postun): scrollkeeper -Obsoletes: pirut < 1.3.30-3 +Obsoletes: pirut < 1.3.30-3 Provides: pirut = 1.3.30-3 BuildRequires: libgnomeui-devel @@ -58,7 +61,8 @@ removing packages on your system. %prep -%setup -q -n %{name}-%{version}-%{?alphatag} +%setup -q +#%setup -q -n %{name}-%{version}-%{?alphatag} %patch0 -p1 %build @@ -98,8 +102,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -update-desktop-database %{_datadir}/applications -update-mime-database %{_datadir}/mime +update-desktop-database %{_datadir}/applications &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : %pre if [ "$1" -gt 1 ]; then @@ -121,8 +125,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -update-desktop-database %{_datadir}/applications -update-mime-database %{_datadir}/mime +update-desktop-database %{_datadir}/applications &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -143,6 +147,9 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Tue Jul 30 2008 Richard Hughes - 0.2.4-1 +- New upstream version, only bugfixes. + * Wed Jun 18 2008 Richard Hughes - 0.2.3-4.20080618 - Pull in a new snapshot from the unstable branch. - Fixes a problem when installing with the DBUS session interface Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 Jun 2008 14:47:24 -0000 1.22 +++ sources 30 Jul 2008 10:22:00 -0000 1.23 @@ -1 +1 @@ -a7ea258af914c0717ff2446ae7b49be4 gnome-packagekit-0.2.3-20080618.tar.gz +c55b2eb9eb17156df69ed781360afeaa gnome-packagekit-0.2.4.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 10:36:01 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 10:36:01 GMT Subject: rpms/emacs-vm/devel .cvsignore, 1.12, 1.13 emacs-vm.spec, 1.28, 1.29 sources, 1.12, 1.13 Message-ID: <200807301036.m6UAa1SH017683@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17646 Modified Files: .cvsignore emacs-vm.spec sources Log Message: * Wed Jul 30 2008 Jonathan G. Underwood - 8.0.10.575-1 - Update to version 8.0.10-575 - Update BuildRoot to preferred mktemp variant Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 23 Mar 2008 23:05:57 -0000 1.12 +++ .cvsignore 30 Jul 2008 10:35:31 -0000 1.13 @@ -1,2 +1 @@ -vm-8.0.9-544.tgz -u-vm-color.el +vm-8.0.10-575.tgz Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- emacs-vm.spec 23 Mar 2008 23:05:57 -0000 1.28 +++ emacs-vm.spec 30 Jul 2008 10:35:31 -0000 1.29 @@ -4,8 +4,8 @@ # Upstream used rather odd versioning: there is a version number, and then a # "devo" number which is the BZR tree revision, separated with a hypen. However, # rpm doesn't allow a hyphen in the versoion number. -%define vmversion 8.0.9 -%define devoversion 544 +%define vmversion 8.0.10 +%define devoversion 575 # Note on building VM with support for bbdb: if support for VM in BBDB is # required, then the source elisp for VM must be installed at build time. If @@ -46,7 +46,7 @@ Requires: emacs >= %{emacs_version} Requires(pre): /sbin/install-info Requires(post): /sbin/install-info -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el texinfo texinfo-tex %if %{bbdbsupport} @@ -145,6 +145,10 @@ %{pkgdir}/*.el %changelog +* Wed Jul 30 2008 Jonathan G. Underwood - 8.0.10.575-1 +- Update to version 8.0.10-575 +- Update BuildRoot to preferred mktemp variant + * Sun Mar 23 2008 Jonathan G. Underwood - 8.0.9.544-1 - Update to 8.0.9-544 - Update u-vm-color.el to version 2.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 23 Mar 2008 23:05:57 -0000 1.12 +++ sources 30 Jul 2008 10:35:31 -0000 1.13 @@ -1,2 +1 @@ -a3e09da1a02fbb5234b11e23f52efc66 vm-8.0.9-544.tgz -fa145ca291d5717072349d055512559c u-vm-color.el +4c02f3acf9a25afc5941802693277f7b vm-8.0.10-575.tgz From fedora-extras-commits at redhat.com Wed Jul 30 10:45:15 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 10:45:15 GMT Subject: rpms/checkgmail/devel .cvsignore, 1.3, 1.4 checkgmail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200807301045.m6UAjFkw017950@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17918 Modified Files: .cvsignore checkgmail.spec sources Log Message: fix svn date Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jul 2008 08:00:22 -0000 1.3 +++ .cvsignore 30 Jul 2008 10:44:45 -0000 1.4 @@ -1 +1 @@ -checkgmail-1.13.svn20080630.tar.bz2 +checkgmail-1.13.svn20080730.tar.bz2 Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/devel/checkgmail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checkgmail.spec 30 Jul 2008 07:57:23 -0000 1.2 +++ checkgmail.spec 30 Jul 2008 10:44:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: checkgmail Version: 1.13 -Release: 3.svn20080630%{?dist} +Release: 3.svn20080730%{?dist} Summary: System Tray Application that checks a Gmail Account for New Mail Group: Applications/Internet License: GPLv2+ @@ -52,6 +52,10 @@ %changelog + +* Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080730 +- Pull svn snapshot date + * Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080630 - Pull svn snapshot to fix auth issue Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jul 2008 07:57:23 -0000 1.3 +++ sources 30 Jul 2008 10:44:45 -0000 1.4 @@ -1 +1 @@ -63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080630.tar.bz2 +63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080730.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 10:48:23 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Wed, 30 Jul 2008 10:48:23 GMT Subject: rpms/qmmp/F-8 qmmp.spec,1.5,1.6 Message-ID: <200807301048.m6UAmN04018072@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18045 Modified Files: qmmp.spec Log Message: fixed dependencies to match the old F8 style Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/F-8/qmmp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qmmp.spec 29 Jul 2008 15:38:10 -0000 1.5 +++ qmmp.spec 30 Jul 2008 10:47:53 -0000 1.6 @@ -19,7 +19,7 @@ BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel BuildRequires: qt4-devel >= 4.2 desktop-file-utils BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel -BuildRequires: libmodplug-devel libcurl-devel +BuildRequires: libmodplug-devel curl-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig @@ -109,7 +109,7 @@ - new version - updated %%description to match upstream - added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel -- added BuildRequires: libmodplug-devel libcurl-devel +- added BuildRequires: libmodplug-devel curl-devel - xpm icon is not used anymore (several pngs available) - created devel subpackage From fedora-extras-commits at redhat.com Wed Jul 30 10:48:59 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 10:48:59 GMT Subject: rpms/checkgmail/devel checkgmail.spec,1.3,1.4 Message-ID: <200807301048.m6UAmxDQ018160@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18071 Modified Files: checkgmail.spec Log Message: fix date Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/devel/checkgmail.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checkgmail.spec 30 Jul 2008 10:44:45 -0000 1.3 +++ checkgmail.spec 30 Jul 2008 10:48:29 -0000 1.4 @@ -8,7 +8,7 @@ #svn checkout to fix authentication issue. Upstream is doing a new release soon -Source0: %{name}/%{name}-%{version}.svn20080630.tar.bz2 +Source0: %{name}/%{name}-%{version}.svn20080730.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl perl-Gtk2 perl-Gtk2-TrayIcon perl-libwww-perl perl-Crypt-SSLeay Requires: perl-XML-Simple perl-Crypt-Simple perl-Crypt-Blowfish perl-FreezeThaw From fedora-extras-commits at redhat.com Wed Jul 30 10:54:49 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 10:54:49 GMT Subject: rpms/checkgmail/F-9 checkgmail.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200807301054.m6UAsnbK018356@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18318 Modified Files: checkgmail.spec sources Log Message: fix svn date Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-9/checkgmail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checkgmail.spec 30 Jul 2008 08:11:27 -0000 1.2 +++ checkgmail.spec 30 Jul 2008 10:54:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: checkgmail Version: 1.13 -Release: 3.svn20080630%{?dist} +Release: 3.svn20080730%{?dist} Summary: System Tray Application that checks a Gmail Account for New Mail Group: Applications/Internet License: GPLv2+ @@ -52,6 +52,10 @@ %changelog + +* Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080730 +- Pull svn snapshot date + * Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080630 - Pull svn snapshot to fix auth issue Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jul 2008 08:11:27 -0000 1.3 +++ sources 30 Jul 2008 10:54:19 -0000 1.4 @@ -1 +1 @@ -63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080630.tar.bz2 +63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080730.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 10:55:57 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 10:55:57 GMT Subject: rpms/checkgmail/F-8 checkgmail.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200807301055.m6UAtv7M018439@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18394 Modified Files: checkgmail.spec sources Log Message: fix svn date Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-8/checkgmail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checkgmail.spec 30 Jul 2008 08:22:29 -0000 1.2 +++ checkgmail.spec 30 Jul 2008 10:55:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: checkgmail Version: 1.13 -Release: 3.svn20080630%{?dist} +Release: 3.svn20080730%{?dist} Summary: System Tray Application that checks a Gmail Account for New Mail Group: Applications/Internet License: GPLv2+ @@ -52,6 +52,10 @@ %changelog + +* Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080730 +- Pull svn snapshot date + * Wed Jul 30 2008 Rahul Sundaram - 1.13-3.svn20080630 - Pull svn snapshot to fix auth issue Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jul 2008 08:22:29 -0000 1.3 +++ sources 30 Jul 2008 10:55:27 -0000 1.4 @@ -1 +1 @@ -63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080630.tar.bz2 +63f66166f35ca94433f0ba16f5d7e4d8 checkgmail-1.13.svn20080730.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 10:58:38 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 10:58:38 GMT Subject: rpms/checkgmail/F-9 checkgmail.spec,1.3,1.4 Message-ID: <200807301058.m6UAwcqs018601@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18562 Modified Files: checkgmail.spec Log Message: fix date Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-9/checkgmail.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checkgmail.spec 30 Jul 2008 10:54:19 -0000 1.3 +++ checkgmail.spec 30 Jul 2008 10:58:08 -0000 1.4 @@ -8,7 +8,7 @@ #svn checkout to fix authentication issue. Upstream is doing a new release soon -Source0: %{name}/%{name}-%{version}.svn20080630.tar.bz2 +Source0: %{name}/%{name}-%{version}.svn20080730.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl perl-Gtk2 perl-Gtk2-TrayIcon perl-libwww-perl perl-Crypt-SSLeay Requires: perl-XML-Simple perl-Crypt-Simple perl-Crypt-Blowfish perl-FreezeThaw From fedora-extras-commits at redhat.com Wed Jul 30 10:58:43 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 10:58:43 GMT Subject: rpms/checkgmail/F-8 checkgmail.spec,1.3,1.4 Message-ID: <200807301058.m6UAwhTm018604@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/checkgmail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18566 Modified Files: checkgmail.spec Log Message: fix date Index: checkgmail.spec =================================================================== RCS file: /cvs/pkgs/rpms/checkgmail/F-8/checkgmail.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checkgmail.spec 30 Jul 2008 10:55:27 -0000 1.3 +++ checkgmail.spec 30 Jul 2008 10:58:13 -0000 1.4 @@ -8,7 +8,7 @@ #svn checkout to fix authentication issue. Upstream is doing a new release soon -Source0: %{name}/%{name}-%{version}.svn20080630.tar.bz2 +Source0: %{name}/%{name}-%{version}.svn20080730.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl perl-Gtk2 perl-Gtk2-TrayIcon perl-libwww-perl perl-Crypt-SSLeay Requires: perl-XML-Simple perl-Crypt-Simple perl-Crypt-Blowfish perl-FreezeThaw From fedora-extras-commits at redhat.com Wed Jul 30 11:02:07 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 11:02:07 GMT Subject: rpms/emacs-vm/devel .cvsignore,1.13,1.14 sources,1.13,1.14 Message-ID: <200807301102.m6UB27MT025430@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25404 Modified Files: .cvsignore sources Log Message: Re-add u-vm-color.el to sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 30 Jul 2008 10:35:31 -0000 1.13 +++ .cvsignore 30 Jul 2008 11:01:37 -0000 1.14 @@ -1 +1,2 @@ vm-8.0.10-575.tgz +u-vm-color.el Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 30 Jul 2008 10:35:31 -0000 1.13 +++ sources 30 Jul 2008 11:01:37 -0000 1.14 @@ -1 +1,2 @@ 4c02f3acf9a25afc5941802693277f7b vm-8.0.10-575.tgz +fa145ca291d5717072349d055512559c u-vm-color.el From fedora-extras-commits at redhat.com Wed Jul 30 11:08:57 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 30 Jul 2008 11:08:57 GMT Subject: rpms/perl-MailTools/devel .cvsignore, 1.13, 1.14 perl-MailTools.spec, 1.28, 1.29 sources, 1.13, 1.14 Message-ID: <200807301108.m6UB8vk5025630@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-MailTools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25598 Modified Files: .cvsignore perl-MailTools.spec sources Log Message: Update to 2.04 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-MailTools/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 15 Apr 2008 04:44:45 -0000 1.13 +++ .cvsignore 30 Jul 2008 11:08:27 -0000 1.14 @@ -1 +1 @@ -MailTools-2.03.tar.gz +MailTools-2.04.tar.gz Index: perl-MailTools.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- perl-MailTools.spec 15 Apr 2008 04:44:45 -0000 1.28 +++ perl-MailTools.spec 30 Jul 2008 11:08:27 -0000 1.29 @@ -1,6 +1,6 @@ Summary: Various mail-related perl modules Name: perl-MailTools -Version: 2.03 +Version: 2.04 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -64,6 +64,9 @@ %{_mandir}/man3/Mail::*.3pm* %changelog +* Wed Jul 30 2008 Paul Howarth 2.04-1 +- Update to 2.04 + * Tue Apr 15 2008 Paul Howarth 2.03-1 - Update to 2.03 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MailTools/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 15 Apr 2008 04:44:45 -0000 1.13 +++ sources 30 Jul 2008 11:08:27 -0000 1.14 @@ -1 +1 @@ -6027b40fe199c42857776466dad9a463 MailTools-2.03.tar.gz +d21ea4f375d1e5f3da6b0a4e8ba1e2c6 MailTools-2.04.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 11:11:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Miroslav_Such=C3=BD?= (msuchy)) Date: Wed, 30 Jul 2008 11:11:19 GMT Subject: rpms/perl-Filesys-Df/devel import.log, 1.1, 1.2 perl-Filesys-Df.spec, 1.1, 1.2 Message-ID: <200807301111.m6UBBJMf025703@cvs-int.fedora.redhat.com> Author: msuchy Update of /cvs/pkgs/rpms/perl-Filesys-Df/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25677/devel Modified Files: import.log perl-Filesys-Df.spec Log Message: Import perl-Filesys-Df-0.92-3 into devel. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2008 09:49:56 -0000 1.1 +++ import.log 30 Jul 2008 11:10:49 -0000 1.2 @@ -1 +1,2 @@ perl-Filesys-Df-0_92-2_fc9:HEAD:perl-Filesys-Df-0.92-2.fc9.src.rpm:1217411306 +perl-Filesys-Df-0_92-3:HEAD:perl-Filesys-Df-0.92-3.src.rpm:1217416202 Index: perl-Filesys-Df.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/devel/perl-Filesys-Df.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Filesys-Df.spec 30 Jul 2008 09:49:56 -0000 1.1 +++ perl-Filesys-Df.spec 30 Jul 2008 11:10:49 -0000 1.2 @@ -1,12 +1,13 @@ Name: perl-Filesys-Df Version: 0.92 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for filesystem disk space information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Filesys-Df/ Source0: http://www.cpan.org/modules/by-module/Filesys/Filesys-Df-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -49,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed Jul 30 2008 Miroslav Suchy 0.92-3 +- Add build dependency on MakeMaker + * Thu Jul 24 2008 Miroslav Suchy 0.92-2 - fixed README end of lines. - remove zero sized *.bs files. From fedora-extras-commits at redhat.com Wed Jul 30 11:21:41 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 30 Jul 2008 11:21:41 GMT Subject: rpms/dialog/devel .cvsignore, 1.23, 1.24 dialog.spec, 1.32, 1.33 sources, 1.23, 1.24 Message-ID: <200807301121.m6UBLfFO026125@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/dialog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26081 Modified Files: .cvsignore dialog.spec sources Log Message: - update to 1.1-20080727 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dialog/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 11 Apr 2008 13:53:51 -0000 1.23 +++ .cvsignore 30 Jul 2008 11:21:11 -0000 1.24 @@ -1 +1 @@ -dialog-1.1-20080316.tgz +dialog-1.1-20080727.tgz Index: dialog.spec =================================================================== RCS file: /cvs/pkgs/rpms/dialog/devel/dialog.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dialog.spec 11 Apr 2008 13:53:51 -0000 1.32 +++ dialog.spec 30 Jul 2008 11:21:11 -0000 1.33 @@ -1,8 +1,8 @@ Summary: A utility for creating TTY dialog boxes Name: dialog -%define dialogsubversion 20080316 +%define dialogsubversion 20080727 Version: 1.1 -Release: 5.%{dialogsubversion}%{?dist} +Release: 6.%{dialogsubversion}%{?dist} License: LGPLv2 Group: Applications/System URL: http://invisible-island.net/dialog/dialog.html @@ -86,6 +86,9 @@ %{_mandir}/man3/dialog.* %changelog +* Wed Jul 30 2008 Miroslav Lichvar - 1.1-6.20080727 +- update to 1.1-20080727 + * Fri Apr 11 2008 Miroslav Lichvar - 1.1-5.20080316 - update to 1.1-20080316 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dialog/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 11 Apr 2008 13:53:51 -0000 1.23 +++ sources 30 Jul 2008 11:21:11 -0000 1.24 @@ -1 +1 @@ -3d262cbc41e4db23251e7be924c4a28b dialog-1.1-20080316.tgz +63746320ce32bd0dd70e92f74cfc5853 dialog-1.1-20080727.tgz From fedora-extras-commits at redhat.com Wed Jul 30 11:28:03 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 11:28:03 GMT Subject: rpms/emacs-vm/F-9 emacs-vm.spec,1.28,1.29 sources,1.12,1.13 Message-ID: <200807301128.m6UBS3Qn026297@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26264 Modified Files: emacs-vm.spec sources Log Message: * Wed Jul 30 2008 Jonathan G. Underwood - 8.0.10.575-1 - Update to version 8.0.10-575 - Update BuildRoot to preferred mktemp variant Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/F-9/emacs-vm.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- emacs-vm.spec 23 Mar 2008 23:05:57 -0000 1.28 +++ emacs-vm.spec 30 Jul 2008 11:27:33 -0000 1.29 @@ -4,8 +4,8 @@ # Upstream used rather odd versioning: there is a version number, and then a # "devo" number which is the BZR tree revision, separated with a hypen. However, # rpm doesn't allow a hyphen in the versoion number. -%define vmversion 8.0.9 -%define devoversion 544 +%define vmversion 8.0.10 +%define devoversion 575 # Note on building VM with support for bbdb: if support for VM in BBDB is # required, then the source elisp for VM must be installed at build time. If @@ -46,7 +46,7 @@ Requires: emacs >= %{emacs_version} Requires(pre): /sbin/install-info Requires(post): /sbin/install-info -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el texinfo texinfo-tex %if %{bbdbsupport} @@ -145,6 +145,10 @@ %{pkgdir}/*.el %changelog +* Wed Jul 30 2008 Jonathan G. Underwood - 8.0.10.575-1 +- Update to version 8.0.10-575 +- Update BuildRoot to preferred mktemp variant + * Sun Mar 23 2008 Jonathan G. Underwood - 8.0.9.544-1 - Update to 8.0.9-544 - Update u-vm-color.el to version 2.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 23 Mar 2008 23:05:57 -0000 1.12 +++ sources 30 Jul 2008 11:27:33 -0000 1.13 @@ -1,2 +1,2 @@ -a3e09da1a02fbb5234b11e23f52efc66 vm-8.0.9-544.tgz +4c02f3acf9a25afc5941802693277f7b vm-8.0.10-575.tgz fa145ca291d5717072349d055512559c u-vm-color.el From fedora-extras-commits at redhat.com Wed Jul 30 11:29:15 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 30 Jul 2008 11:29:15 GMT Subject: rpms/emacs-vm/F-8 emacs-vm.spec,1.28,1.29 sources,1.12,1.13 Message-ID: <200807301129.m6UBTFm8026377@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26352 Modified Files: emacs-vm.spec sources Log Message: * Wed Jul 30 2008 Jonathan G. Underwood - 8.0.10.575-1 - Update to version 8.0.10-575 - Update BuildRoot to preferred mktemp variant Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/F-8/emacs-vm.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- emacs-vm.spec 23 Mar 2008 23:26:49 -0000 1.28 +++ emacs-vm.spec 30 Jul 2008 11:28:45 -0000 1.29 @@ -4,8 +4,8 @@ # Upstream used rather odd versioning: there is a version number, and then a # "devo" number which is the BZR tree revision, separated with a hypen. However, # rpm doesn't allow a hyphen in the versoion number. -%define vmversion 8.0.9 -%define devoversion 544 +%define vmversion 8.0.10 +%define devoversion 575 # Note on building VM with support for bbdb: if support for VM in BBDB is # required, then the source elisp for VM must be installed at build time. If @@ -46,7 +46,7 @@ Requires: emacs >= %{emacs_version} Requires(pre): /sbin/install-info Requires(post): /sbin/install-info -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el texinfo texinfo-tex %if %{bbdbsupport} @@ -145,11 +145,18 @@ %{pkgdir}/*.el %changelog +* Wed Jul 30 2008 Jonathan G. Underwood - 8.0.10.575-1 +- Update to version 8.0.10-575 +- Update BuildRoot to preferred mktemp variant + * Sun Mar 23 2008 Jonathan G. Underwood - 8.0.9.544-1 - Update to 8.0.9-544 - Update u-vm-color.el to version 2.10 - Remove patch needed for 8.0.7 +* Tue Feb 12 2008 Jonathan G. Underwood - 8.0.7.522-2 +- Bump release and rebuild for GCC 4.3 + * Sun Jan 13 2008 Jonathan G. Underwood - 8.0.7.522-1 - Update to version 8.0.7-522 - Add patch to fix correct display of redistributed flag (BZ #428248) Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 23 Mar 2008 23:18:03 -0000 1.12 +++ sources 30 Jul 2008 11:28:45 -0000 1.13 @@ -1,2 +1,2 @@ -a3e09da1a02fbb5234b11e23f52efc66 vm-8.0.9-544.tgz +4c02f3acf9a25afc5941802693277f7b vm-8.0.10-575.tgz fa145ca291d5717072349d055512559c u-vm-color.el From fedora-extras-commits at redhat.com Wed Jul 30 11:33:33 2008 From: fedora-extras-commits at redhat.com (Alan Pevec (apevec)) Date: Wed, 30 Jul 2008 11:33:33 GMT Subject: rpms/perl-Config-Augeas/devel .cvsignore, 1.2, 1.3 perl-Config-Augeas.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807301133.m6UBXXfb026529@cvs-int.fedora.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/perl-Config-Augeas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26487 Modified Files: .cvsignore perl-Config-Augeas.spec sources Log Message: * Wed Jul 30 2008 Alan Pevec 0.202-1 - new upstream release 0.202 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jul 2008 15:29:21 -0000 1.2 +++ .cvsignore 30 Jul 2008 11:33:03 -0000 1.3 @@ -1 +1 @@ -Config-Augeas-0.201.tar.gz +Config-Augeas-0.202.tar.gz Index: perl-Config-Augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/perl-Config-Augeas.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Config-Augeas.spec 18 Jul 2008 15:29:21 -0000 1.1 +++ perl-Config-Augeas.spec 30 Jul 2008 11:33:03 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Config-Augeas -Version: 0.201 +Version: 0.202 Release: 1%{?dist} Summary: Edit configuration files through Augeas C library License: LGPLv2+ @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Jul 30 2008 Alan Pevec 0.202-1 +- new upstream release 0.202 + * Wed Jul 02 2008 Alan Pevec 0.201-1 - new upstream release 0.201 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jul 2008 15:29:21 -0000 1.2 +++ sources 30 Jul 2008 11:33:03 -0000 1.3 @@ -1 +1 @@ -54e0f51ad0c9f148c828b2c2b033a13c Config-Augeas-0.201.tar.gz +62887e0274316cdad9a3c99e7cb9a0cd Config-Augeas-0.202.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 11:41:13 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Wed, 30 Jul 2008 11:41:13 GMT Subject: rpms/pidgin/F-8 pidgin.spec,1.47,1.48 Message-ID: <200807301141.m6UBfDrL026705@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/pidgin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26671 Modified Files: pidgin.spec Log Message: rebuild in attempt to fix mysterious missing SSL that broke gmail and MSN #457188 Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-8/pidgin.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- pidgin.spec 2 Jul 2008 02:45:53 -0000 1.47 +++ pidgin.spec 30 Jul 2008 11:40:43 -0000 1.48 @@ -29,7 +29,7 @@ Name: pidgin Version: 2.4.3 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -501,6 +501,9 @@ %changelog +* Wed Jul 30 2008 Warren Togami 2.4.3-1.fc8.1 +- rebuild in attempt to fix mysterious missing SSL that broke gmail and MSN #457188 + * Tue Jul 01 2008 Stu Tomlinson 2.4.3-1 - 2.4.3 From fedora-extras-commits at redhat.com Wed Jul 30 11:42:10 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 30 Jul 2008 11:42:10 GMT Subject: rpms/eclipse/devel eclipse.spec,1.566,1.567 Message-ID: <200807301142.m6UBgAkF026794@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26723 Modified Files: eclipse.spec Log Message: - Remove about.html from files list on ppc (will fix later) Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.566 retrieving revision 1.567 diff -u -r1.566 -r1.567 --- eclipse.spec 29 Jul 2008 21:05:08 -0000 1.566 +++ eclipse.spec 30 Jul 2008 11:41:40 -0000 1.567 @@ -1241,7 +1241,9 @@ #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html +%ifnarch ppc %{_libdir}/%{name}/about.html +%endif %ifarch x86_64 %{_libdir}/%{name}/about_files %endif @@ -1447,6 +1449,7 @@ - Fold pde-runtime into pde - Add patch to add root files for non-upstream arches - Fix building of fragments for non-upstream arches +- Remove about.html from files list on ppc (will fix later) * Fri Jul 25 2008 Andrew Overholt 3.4.0-10 - Add ability for pdebuild (-o) to work with Orbit-style dependencies From fedora-extras-commits at redhat.com Wed Jul 30 11:47:55 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Miroslav_Such=C3=BD?= (msuchy)) Date: Wed, 30 Jul 2008 11:47:55 GMT Subject: rpms/perl-Filesys-Df/EL-5 import.log, NONE, 1.1 perl-Filesys-Df.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807301147.m6UBltF9026995@cvs-int.fedora.redhat.com> Author: msuchy Update of /cvs/pkgs/rpms/perl-Filesys-Df/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26966/EL-5 Modified Files: .cvsignore sources Added Files: import.log perl-Filesys-Df.spec Log Message: Import perl-Filesys-Df-0.92-3 into EL-5 --- NEW FILE import.log --- perl-Filesys-Df-0_92-3:EL-5:perl-Filesys-Df-0.92-3.src.rpm:1217418402 --- NEW FILE perl-Filesys-Df.spec --- Name: perl-Filesys-Df Version: 0.92 Release: 3%{?dist} Summary: Perl extension for filesystem disk space information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Filesys-Df/ Source0: http://www.cpan.org/modules/by-module/Filesys/Filesys-Df-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a way to obtain filesystem disk space information. This is a Unix only distribution. If you want to gather this information for Unix and Windows, use Filesys::DfPortable. The only major benefit of using Filesys::Df over Filesys::DfPortable, is that Filesys::Df supports the use of open filehandles as arguments. %prep %setup -q -n Filesys-Df-%{version} #readme is with dos EOL, convert it to unix sed -i 's/\r//' README %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/* %{_mandir}/man3/* %changelog * Wed Jul 30 2008 Miroslav Suchy 0.92-3 - Add build dependency on MakeMaker * Thu Jul 24 2008 Miroslav Suchy 0.92-2 - fixed README end of lines. - remove zero sized *.bs files. * Tue Jul 15 2008 Miroslav Suchy 0.92-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 15:42:26 -0000 1.1 +++ .cvsignore 30 Jul 2008 11:47:24 -0000 1.2 @@ -0,0 +1 @@ +Filesys-Df-0.92.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 15:42:26 -0000 1.1 +++ sources 30 Jul 2008 11:47:24 -0000 1.2 @@ -0,0 +1 @@ +a8b0aa3e5151a8a6c8b3067625980934 Filesys-Df-0.92.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 11:49:34 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Miroslav_Such=C3=BD?= (msuchy)) Date: Wed, 30 Jul 2008 11:49:34 GMT Subject: rpms/perl-Filesys-Df/EL-4 import.log, NONE, 1.1 perl-Filesys-Df.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807301149.m6UBnYuX027116@cvs-int.fedora.redhat.com> Author: msuchy Update of /cvs/pkgs/rpms/perl-Filesys-Df/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27076/EL-4 Modified Files: .cvsignore sources Added Files: import.log perl-Filesys-Df.spec Log Message: Import perl-Filesys-Df-0.92-3 into EL-4 --- NEW FILE import.log --- perl-Filesys-Df-0_92-3:EL-4:perl-Filesys-Df-0.92-3.src.rpm:1217418509 --- NEW FILE perl-Filesys-Df.spec --- Name: perl-Filesys-Df Version: 0.92 Release: 3%{?dist} Summary: Perl extension for filesystem disk space information License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Filesys-Df/ Source0: http://www.cpan.org/modules/by-module/Filesys/Filesys-Df-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a way to obtain filesystem disk space information. This is a Unix only distribution. If you want to gather this information for Unix and Windows, use Filesys::DfPortable. The only major benefit of using Filesys::Df over Filesys::DfPortable, is that Filesys::Df supports the use of open filehandles as arguments. %prep %setup -q -n Filesys-Df-%{version} #readme is with dos EOL, convert it to unix sed -i 's/\r//' README %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/* %{_mandir}/man3/* %changelog * Wed Jul 30 2008 Miroslav Suchy 0.92-3 - Add build dependency on MakeMaker * Thu Jul 24 2008 Miroslav Suchy 0.92-2 - fixed README end of lines. - remove zero sized *.bs files. * Tue Jul 15 2008 Miroslav Suchy 0.92-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 15:42:26 -0000 1.1 +++ .cvsignore 30 Jul 2008 11:49:04 -0000 1.2 @@ -0,0 +1 @@ +Filesys-Df-0.92.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 15:42:26 -0000 1.1 +++ sources 30 Jul 2008 11:49:04 -0000 1.2 @@ -0,0 +1 @@ +a8b0aa3e5151a8a6c8b3067625980934 Filesys-Df-0.92.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 11:50:21 2008 From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch)) Date: Wed, 30 Jul 2008 11:50:21 GMT Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.50,1.51 Message-ID: <200807301150.m6UBoLbq027213@cvs-int.fedora.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/OpenIPMI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27163 Modified Files: OpenIPMI.spec Log Message: - Fixed rpath problem in libOpenIPMIposix.so.0.0.1 Index: OpenIPMI.spec =================================================================== RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- OpenIPMI.spec 29 Jul 2008 16:14:26 -0000 1.50 +++ OpenIPMI.spec 30 Jul 2008 11:49:51 -0000 1.51 @@ -3,7 +3,7 @@ Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.14 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD and BSD with advertising and LGPLv2+ and GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel readline-devel popt-devel -BuildRequires: perl-devel +BuildRequires: perl-devel chrpath Requires(post): chkconfig Requires(preun): chkconfig @@ -79,7 +79,6 @@ export CFLAGS=-fPIC %configure --with-pythoninstall=%{python_sitearch} sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool -sed -i 's| -rpath \$(libdir)\( \$(libOpenIPMIposix_la_LDFLAGS)\)|\1|' unix/Makefile make pushd ipmitool-%{ipmitoolver} %configure @@ -94,6 +93,8 @@ %ifarch ppc64 s390x x86_64 rm -rf $RPM_BUILD_ROOT/usr/lib %endif +# Remove rpaths from libOpenIPMIposix.so.0.0.1 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libOpenIPMIposix.so.0.0.1 pushd ipmitool-%{ipmitoolver} make install DESTDIR=$RPM_BUILD_ROOT #rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/ @@ -177,6 +178,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 30 2008 Phil Knirsch - 2.0.14-2 +- Fixed rpath problem in libOpenIPMIposix.so.0.0.1 + * Tue Jul 29 2008 Phil Knirsch - 2.0.14-1 - Fixed several specfile problems (#453751) - Update to OpenIPMI-2.0.14 From fedora-extras-commits at redhat.com Wed Jul 30 12:15:14 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 30 Jul 2008 12:15:14 GMT Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.62, 1.63 gst-plugins-good-0.10.8-docs.patch, 1.1, NONE Message-ID: <200807301215.m6UCFEiU001865@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1779 Modified Files: gstreamer-plugins-good.spec Removed Files: gst-plugins-good-0.10.8-docs.patch Log Message: * Wed Jul 30 2008 - Bastien Nocera 0.10.8-10 - Build the docs ourselves Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gstreamer-plugins-good.spec 22 Jul 2008 19:12:35 -0000 1.62 +++ gstreamer-plugins-good.spec 30 Jul 2008 12:14:44 -0000 1.63 @@ -6,14 +6,13 @@ Name: %{gstreamer}-plugins-good Version: 0.10.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: GStreamer plug-ins with good code and licensing Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2 -Patch0: gst-plugins-good-0.10.8-docs.patch # http://bugzilla.gnome.org/show_bug.cgi?id=536317 Patch1: gst-plugins-good-v4l2-new-kernel.patch # rh bug #451391 @@ -64,7 +63,7 @@ # documentation BuildRequires: gtk-doc -BuildRequires: PyXML +BuildRequires: python-devel PyXML BuildRequires: hal-devel %description @@ -99,7 +98,6 @@ %prep %setup -q -n gst-plugins-good-%{version} -%patch0 -p1 -b .docs pushd sys/v4l2 %patch1 -p0 -b .new-kernel popd @@ -111,7 +109,7 @@ %configure \ --with-package-name='Fedora gstreamer-plugins-good package' \ --with-package-origin='http://download.fedora.redhat.com/fedora' \ - --disable-gtkdoc \ + --enable-gtk-doc \ --enable-experimental \ --enable-ladspa \ --with-default-visualizer=autoaudiosink @@ -246,6 +244,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || : %changelog +* Wed Jul 30 2008 - Bastien Nocera 0.10.8-10 +- Build the docs ourselves + * Tue Jul 22 2008 Jarod Wilson 0.10.8-9 - Bump and rebuild for libraw1394 v2.0.0 --- gst-plugins-good-0.10.8-docs.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 12:29:21 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 30 Jul 2008 12:29:21 GMT Subject: rpms/anaconda/devel .cvsignore, 1.554, 1.555 anaconda.spec, 1.696, 1.697 sources, 1.688, 1.689 Message-ID: <200807301229.m6UCTLWX002148@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2123 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.554 retrieving revision 1.555 diff -u -r1.554 -r1.555 --- .cvsignore 30 Jul 2008 01:22:23 -0000 1.554 +++ .cvsignore 30 Jul 2008 12:28:51 -0000 1.555 @@ -1 +1,2 @@ anaconda-11.4.1.21.tar.bz2 +anaconda-11.4.1.22.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.696 retrieving revision 1.697 diff -u -r1.696 -r1.697 --- anaconda.spec 30 Jul 2008 01:22:23 -0000 1.696 +++ anaconda.spec 30 Jul 2008 12:28:51 -0000 1.697 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.21 +Version: 11.4.1.22 Release: 1 License: GPLv2+ Group: Applications/System @@ -197,6 +197,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jul 30 2008 Chris Lumens - 11.4.1.22-1 +- udevsettle takes forever, so display a waitWindow. (clumens) +- Leave anaconda-runtime around for mk-images run. (dcantrell) + * Tue Jul 29 2008 Jeremy Katz - 11.4.1.21-1 - Remove an instance of NEEDGR still existing to fix graphical isolinux (#457144) (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.688 retrieving revision 1.689 diff -u -r1.688 -r1.689 --- sources 30 Jul 2008 01:22:23 -0000 1.688 +++ sources 30 Jul 2008 12:28:51 -0000 1.689 @@ -1 +1 @@ -b5cc65c152effcacd04f3b2aae0032fe anaconda-11.4.1.21.tar.bz2 +7610785387a03e93dc128efc946324dd anaconda-11.4.1.22.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 12:43:06 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Karel_Voln=C3=BD?= (kvolny)) Date: Wed, 30 Jul 2008 12:43:06 GMT Subject: rpms/qmmp/devel qmmp.spec,1.5,1.6 Message-ID: <200807301243.m6UCh69p002617@cvs-int.fedora.redhat.com> Author: kvolny Update of /cvs/pkgs/rpms/qmmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2591 Modified Files: qmmp.spec Log Message: requires repaired Index: qmmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qmmp.spec 29 Jul 2008 14:34:44 -0000 1.5 +++ qmmp.spec 30 Jul 2008 12:42:36 -0000 1.6 @@ -17,9 +17,9 @@ BuildRequires: jack-audio-connection-kit-devel >= 0.102.5 BuildRequires: libmpcdec-devel >= 1.2.2 libvorbis-devel libogg-devel BuildRequires: libsamplerate-devel alsa-lib-devel taglib-devel -BuildRequires: qt4-devel >= 4.2 desktop-file-utils +BuildRequires: qt-devel >= 4.2 desktop-file-utils BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel -BuildRequires: openssl-devel +BuildRequires: libmodplug-devel libcurl-devel openssl-devel Requires(post): /sbin/ldconfig Requires(pre): /sbin/ldconfig @@ -105,11 +105,11 @@ %changelog -* Tue Jul 29 2008 Karel Volny 0.2.0-1 +* Wed Jul 30 2008 Karel Volny 0.2.0-1 - new version - updated %%description to match upstream - added BuildRequires: libsndfile-devel wavpack-devel pulseaudio-libs-devel -- added BuildRequires: openssl-devel (fixes bug #449658) +- added BuildRequires: libmodplug-devel libcurl-devel openssl-devel - xpm icon is not used anymore (several pngs available) - created devel subpackage From fedora-extras-commits at redhat.com Wed Jul 30 13:08:12 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 30 Jul 2008 13:08:12 GMT Subject: rpms/newt/devel .cvsignore, 1.24, 1.25 newt.spec, 1.56, 1.57 sources, 1.25, 1.26 Message-ID: <200807301308.m6UD8CC3009940@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/newt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9919 Modified Files: .cvsignore newt.spec sources Log Message: - improve --noitem description (#456305) - add setHeight to Textbox class - fix fixedheight forms - free keymap in newtFinished() - fix memory leak in textbox - fix valgrind error in checkboxtree - don't crash when running empty form - don't crash or hang when form has no focusable elements - before checkboxtree drawing return first item in GetCurrent() - redraw textbox in SetText() - add setColor description to SnackScreen docstring (Greg Swift) - make sure Widget isn't used directly (Greg Swift) (#452920) - add Serbian translations (Milo?? Komar??evi??) - add Balochi translation (Mostafa Daneshvar) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/newt/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 21 Mar 2008 12:25:55 -0000 1.24 +++ .cvsignore 30 Jul 2008 13:07:41 -0000 1.25 @@ -1 +1 @@ -newt-0.52.9.tar.gz +newt-0.52.10.tar.gz Index: newt.spec =================================================================== RCS file: /cvs/pkgs/rpms/newt/devel/newt.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- newt.spec 21 Mar 2008 12:25:55 -0000 1.56 +++ newt.spec 30 Jul 2008 13:07:41 -0000 1.57 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: A library for text mode user interfaces Name: newt -Version: 0.52.9 +Version: 0.52.10 Release: 1%{?dist} License: LGPLv2 Group: System Environment/Libraries @@ -101,6 +101,22 @@ %{python_sitearch}/*.py* %changelog +* Wed Jul 30 2008 Miroslav Lichvar - 0.52.10-1 +- improve --noitem description (#456305) +- add setHeight to Textbox class +- fix fixedheight forms +- free keymap in newtFinished() +- fix memory leak in textbox +- fix valgrind error in checkboxtree +- don't crash when running empty form +- don't crash or hang when form has no focusable elements +- before checkboxtree drawing return first item in GetCurrent() +- redraw textbox in SetText() +- add setColor description to SnackScreen docstring (Greg Swift) +- make sure Widget isn't used directly (Greg Swift) (#452920) +- add Serbian translations (Milo?? Komar??evi??) +- add Balochi translation (Mostafa Daneshvar) + * Fri Mar 21 2008 Miroslav Lichvar - 0.52.9-1 - handle component destruction (patch by Richard W.M. Jones) - fix newtWinEntry definition @@ -109,7 +125,7 @@ - improve SIGWINCH handling in form - don't abort from whiptail gauge on SIGWINCH - redisplay also last line -- update Polish translation +- update Polish translation (Piotr Dr??g) - update URL and Source tag * Tue Feb 19 2008 Fedora Release Engineering - 0.52.8-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/newt/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 21 Mar 2008 12:25:55 -0000 1.25 +++ sources 30 Jul 2008 13:07:42 -0000 1.26 @@ -1 +1 @@ -d2b99bf05379e3410ee68ee994e6f59d newt-0.52.9.tar.gz +bcbcc87ec19ba37d34f819209afa2e15 newt-0.52.10.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 13:11:08 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 30 Jul 2008 13:11:08 GMT Subject: rpms/newt/F-9 .cvsignore, 1.24, 1.25 newt.spec, 1.56, 1.57 sources, 1.25, 1.26 Message-ID: <200807301311.m6UDB8Jl010081@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/newt/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10037 Modified Files: .cvsignore newt.spec sources Log Message: - improve --noitem description (#456305) - add setHeight to Textbox class - fix fixedheight forms - free keymap in newtFinished() - fix memory leak in textbox - fix valgrind error in checkboxtree - don't crash when running empty form - don't crash or hang when form has no focusable elements - before checkboxtree drawing return first item in GetCurrent() - redraw textbox in SetText() - add setColor description to SnackScreen docstring (Greg Swift) - make sure Widget isn't used directly (Greg Swift) (#452920) - add Serbian translations (Milo?? Komar??evi??) - add Balochi translation (Mostafa Daneshvar) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/newt/F-9/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 21 Mar 2008 12:25:55 -0000 1.24 +++ .cvsignore 30 Jul 2008 13:10:38 -0000 1.25 @@ -1 +1 @@ -newt-0.52.9.tar.gz +newt-0.52.10.tar.gz Index: newt.spec =================================================================== RCS file: /cvs/pkgs/rpms/newt/F-9/newt.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- newt.spec 21 Mar 2008 12:25:55 -0000 1.56 +++ newt.spec 30 Jul 2008 13:10:38 -0000 1.57 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: A library for text mode user interfaces Name: newt -Version: 0.52.9 +Version: 0.52.10 Release: 1%{?dist} License: LGPLv2 Group: System Environment/Libraries @@ -101,6 +101,22 @@ %{python_sitearch}/*.py* %changelog +* Wed Jul 30 2008 Miroslav Lichvar - 0.52.10-1 +- improve --noitem description (#456305) +- add setHeight to Textbox class +- fix fixedheight forms +- free keymap in newtFinished() +- fix memory leak in textbox +- fix valgrind error in checkboxtree +- don't crash when running empty form +- don't crash or hang when form has no focusable elements +- before checkboxtree drawing return first item in GetCurrent() +- redraw textbox in SetText() +- add setColor description to SnackScreen docstring (Greg Swift) +- make sure Widget isn't used directly (Greg Swift) (#452920) +- add Serbian translations (Milo?? Komar??evi??) +- add Balochi translation (Mostafa Daneshvar) + * Fri Mar 21 2008 Miroslav Lichvar - 0.52.9-1 - handle component destruction (patch by Richard W.M. Jones) - fix newtWinEntry definition @@ -109,7 +125,7 @@ - improve SIGWINCH handling in form - don't abort from whiptail gauge on SIGWINCH - redisplay also last line -- update Polish translation +- update Polish translation (Piotr Dr??g) - update URL and Source tag * Tue Feb 19 2008 Fedora Release Engineering - 0.52.8-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/newt/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 21 Mar 2008 12:25:55 -0000 1.25 +++ sources 30 Jul 2008 13:10:38 -0000 1.26 @@ -1 +1 @@ -d2b99bf05379e3410ee68ee994e6f59d newt-0.52.9.tar.gz +bcbcc87ec19ba37d34f819209afa2e15 newt-0.52.10.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 13:24:14 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 30 Jul 2008 13:24:14 GMT Subject: rpms/bacula/F-8 bacula-gconsole.desktop, 1.1, 1.2 bacula-traymonitor.desktop, 1.1, 1.2 bacula-wxconsole.desktop, 1.1, 1.2 bacula.spec, 1.5, 1.6 Message-ID: <200807301324.m6UDOEIC010463@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/bacula/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10426 Modified Files: bacula-gconsole.desktop bacula-traymonitor.desktop bacula-wxconsole.desktop bacula.spec Log Message: Multiple fixes. Index: bacula-gconsole.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-8/bacula-gconsole.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-gconsole.desktop 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-gconsole.desktop 30 Jul 2008 13:23:44 -0000 1.2 @@ -4,9 +4,9 @@ Name=Bacula Console GenericName=Backup Management Console Comment=Control your Bacula Server -Exec=gnome-console -c /etc/bacula/wxconsole.conf +Exec=gnome-console -c /etc/bacula/bgnome-console.conf Icon=bacula.png Terminal=false Type=Application -Categories=System;Application;Utility +Categories=System;Application; Index: bacula-traymonitor.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-8/bacula-traymonitor.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-traymonitor.desktop 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-traymonitor.desktop 30 Jul 2008 13:23:44 -0000 1.2 @@ -8,4 +8,4 @@ Icon=bacula-tray-monitor.xpm Terminal=false Type=Application -Categories=System;Application;Utility +Categories=System;Application; Index: bacula-wxconsole.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-8/bacula-wxconsole.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-wxconsole.desktop 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-wxconsole.desktop 30 Jul 2008 13:23:44 -0000 1.2 @@ -8,4 +8,4 @@ Icon=wxwin16x16.xpm Terminal=false Type=Application -Categories=System;Application;Utility +Categories=System;Application; Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-8/bacula.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bacula.spec 7 Jul 2008 17:00:42 -0000 1.5 +++ bacula.spec 30 Jul 2008 13:23:44 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula Version: 2.0.3 -Release: 11%{?dist}.1 +Release: 11%{?dist}.2 # See LICENSE for details License: GPLv2 with exceptions Group: System Environment/Daemons @@ -67,7 +67,6 @@ Provides: bacula-director = %{version}-%{release} Requires: bacula-director-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: mysql-server %description director-mysql Bacula is a set of programs that allow you to manage the backup, @@ -102,7 +101,6 @@ Provides: bacula-director = %{version}-%{release} Requires: bacula-director-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: postgresql-server %description director-postgresql Bacula is a set of programs that allow you to manage the backup, @@ -174,7 +172,6 @@ Provides: bacula-storage = %{version}-%{release} Requires: bacula-storage-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: mysql-server %description storage-mysql Bacula is a set of programs that allow you to manage the backup, @@ -209,7 +206,6 @@ Provides: bacula-storage = %{version}-%{release} Requires: bacula-storage-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: postgresql-server %description storage-postgresql Bacula is a set of programs that allow you to manage the backup, @@ -921,6 +917,11 @@ %changelog +* Wed Jul 30 2008 Jon Ciesla - 2.0.3-11.2 +- Fixed duplicate menu entries. BZ 426789 +- Dropped hard DB server deps. BZ 426788 +- Fixed gnome-console desktop conf file listing. BZ 450278 + * Mon Jul 7 2008 Tom "spot" Callaway - 2.0.3-11.1 - fix conditional comparison - fix license tag From fedora-extras-commits at redhat.com Wed Jul 30 13:27:17 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 13:27:17 GMT Subject: rpms/kde-settings/F-9 .cvsignore, 1.37, 1.38 kde-settings.spec, 1.52, 1.53 sources, 1.36, 1.37 Message-ID: <200807301327.m6UDRHBI010632@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-settings/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10584/F-9 Modified Files: .cvsignore kde-settings.spec sources Log Message: * Wed Jul 30 2008 Rex Dieter 4.0-25 - kcminputrc: [Mouse] cursorTheme=default Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/F-9/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 20 May 2008 14:21:49 -0000 1.37 +++ .cvsignore 30 Jul 2008 13:26:47 -0000 1.38 @@ -1 +1 @@ -kde-settings-4.0-24.tar.bz2 +kde-settings-4.0-25.tar.bz2 Index: kde-settings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/F-9/kde-settings.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- kde-settings.spec 20 May 2008 14:21:49 -0000 1.52 +++ kde-settings.spec 30 Jul 2008 13:26:47 -0000 1.53 @@ -1,7 +1,7 @@ # THIS SPECFILE IS FOR F9+ ONLY! # Sorry, it is just too different for conditionals to be worth it. -%define rel 24 +%define rel 25 Summary: Config files for kde Name: kde-settings @@ -153,6 +153,9 @@ %changelog +* Wed Jul 30 2008 Rex Dieter 4.0-25 +- kcminputrc: [Mouse] cursorTheme=default + * Tue May 20 2008 Rex Dieter 4.0-24 - kdm pam settings need to sync with gdm (#447245) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/F-9/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 20 May 2008 14:21:49 -0000 1.36 +++ sources 30 Jul 2008 13:26:47 -0000 1.37 @@ -1 +1 @@ -3a1988fae11830e3ca01fbf4eecffc66 kde-settings-4.0-24.tar.bz2 +ce867a88875c6e27a4c2a16feb6de707 kde-settings-4.0-25.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 13:27:18 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 13:27:18 GMT Subject: rpms/kde-settings/devel .cvsignore, 1.37, 1.38 kde-settings.spec, 1.53, 1.54 sources, 1.36, 1.37 Message-ID: <200807301327.m6UDRISI010638@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-settings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10584/devel Modified Files: .cvsignore kde-settings.spec sources Log Message: * Wed Jul 30 2008 Rex Dieter 4.0-25 - kcminputrc: [Mouse] cursorTheme=default Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 8 Jul 2008 18:23:26 -0000 1.37 +++ .cvsignore 30 Jul 2008 13:26:48 -0000 1.38 @@ -1 +1 @@ -kde-settings-4.0-24.tar.bz2 +kde-settings-4.0-25.tar.bz2 Index: kde-settings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- kde-settings.spec 8 Jul 2008 18:20:55 -0000 1.53 +++ kde-settings.spec 30 Jul 2008 13:26:48 -0000 1.54 @@ -1,7 +1,7 @@ # THIS SPECFILE IS FOR F9+ ONLY! # Sorry, it is just too different for conditionals to be worth it. -%define rel 24 +%define rel 25 Summary: Config files for kde Name: kde-settings @@ -20,7 +20,6 @@ Requires: kde-filesystem # default (ok, inherited) icon theme -# omit when bootstrapping kde builds Requires: oxygen-icon-theme # /etc/pam.d/ ownership Requires: pam @@ -154,6 +153,9 @@ %changelog +* Wed Jul 30 2008 Rex Dieter 4.0-25 +- kcminputrc: [Mouse] cursorTheme=default + * Tue May 20 2008 Rex Dieter 4.0-24 - kdm pam settings need to sync with gdm (#447245) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 8 Jul 2008 18:23:26 -0000 1.36 +++ sources 30 Jul 2008 13:26:48 -0000 1.37 @@ -1 +1 @@ -3a1988fae11830e3ca01fbf4eecffc66 kde-settings-4.0-24.tar.bz2 +ce867a88875c6e27a4c2a16feb6de707 kde-settings-4.0-25.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 13:44:45 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 30 Jul 2008 13:44:45 GMT Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.42, 1.43 policy-20080710.patch, 1.8, 1.9 Message-ID: <200807301344.m6UDijQ9011281@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253 Modified Files: booleans-targeted.conf policy-20080710.patch Log Message: * Fri Jul 25 2008 Dan Walsh 3.5.1-3 - Fixes for logrotate, alsa Index: booleans-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- booleans-targeted.conf 19 May 2008 17:48:06 -0000 1.42 +++ booleans-targeted.conf 30 Jul 2008 13:44:15 -0000 1.43 @@ -217,7 +217,7 @@ # Only allow browser to use the web # -browser_confine_xguest=true +browser_confine_xguest=false # Allow postfix locat to write to mail spool # @@ -246,3 +246,7 @@ # System uses init upstart program # init_upstart = true + +# Allow mount to mount any file/dir +# +allow_mount_anyfile = true policy-20080710.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 policy-20080710.patch Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20080710.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- policy-20080710.patch 25 Jul 2008 11:53:34 -0000 1.8 +++ policy-20080710.patch 30 Jul 2008 13:44:15 -0000 1.9 @@ -1,6 +1,85 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.1/Makefile +--- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 ++++ serefpolicy-3.5.1/Makefile 2008-07-25 12:35:13.000000000 -0400 +@@ -311,20 +311,22 @@ + + # parse-rolemap modulename,outputfile + define parse-rolemap +- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ +- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 ++ echo "" >> $2 ++# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ ++# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 + endef + + # perrole-expansion modulename,outputfile + define perrole-expansion +- $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 +- $(call parse-rolemap,$1,$2) +- $(verbose) echo "')" >> $2 +- +- $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 +- $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 +- $(call parse-rolemap-compat,$1,$2) +- $(verbose) echo "')" >> $2 ++ echo "No longer doing perrole-expansion" ++# $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2 ++# $(call parse-rolemap,$1,$2) ++# $(verbose) echo "')" >> $2 ++ ++# $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2 ++# $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2 ++# $(call parse-rolemap-compat,$1,$2) ++# $(verbose) echo "')" >> $2 + endef + + # create-base-per-role-tmpl modulenames,outputfile +@@ -523,6 +525,10 @@ + @mkdir -p $(appdir)/users + $(verbose) $(INSTALL) -m 644 $^ $@ + ++$(appdir)/initrc_context: $(tmpdir)/initrc_context ++ @mkdir -p $(appdir) ++ $(verbose) $(INSTALL) -m 644 $< $@ ++ + $(appdir)/%: $(appconf)/% + @mkdir -p $(appdir) + $(verbose) $(INSTALL) -m 644 $< $@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.1/Rules.modular +--- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 ++++ serefpolicy-3.5.1/Rules.modular 2008-07-25 12:35:13.000000000 -0400 +@@ -73,8 +73,8 @@ + $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te + @echo "Compliling $(NAME) $(@F) module" + @test -d $(tmpdir) || mkdir -p $(tmpdir) +- $(call perrole-expansion,$(basename $(@F)),$@.role) +- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) ++# $(call perrole-expansion,$(basename $(@F)),$@.role) ++ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) + $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ + + $(tmpdir)/%.mod.fc: $(m4support) %.fc +@@ -129,7 +129,7 @@ + @test -d $(tmpdir) || mkdir -p $(tmpdir) + # define all available object classes + $(verbose) $(genperm) $(avs) $(secclass) > $@ +- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) ++# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) + $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true + + $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy +@@ -146,7 +146,7 @@ + $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/rolemap.conf: $(rolemap) + $(verbose) echo "" > $@ +- $(call parse-rolemap,base,$@) ++# $(call parse-rolemap,base,$@) + + $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy + $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.1/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -2,7 +2,7 @@ system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0 @@ -12,13 +91,13 @@ staff_r:staff_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/failsafe_context 2008-07-25 12:35:13.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/guest_u_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -26,7 +105,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/root_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -42,7 +121,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -0,0 +1,9 @@ +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 +system_r:initrc_t:s0 unconfined_r:unconfined_t:s0 @@ -55,13 +134,13 @@ +system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/userhelper_context 2008-07-25 12:35:13.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mcs/xguest_u_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -70,7 +149,7 @@ +system_r:xdm_t xguest_r:xguest_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-mls/guest_u_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -78,7 +157,7 @@ +system_r:crond_t:s0 guest_r:guest_crond_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/guest_u_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t @@ -86,7 +165,7 @@ +system_r:crond_t guest_r:guest_crond_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-06-12 23:25:09.000000000 -0400 -+++ serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/root_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -102,63 +181,16 @@ +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-24 06:54:04.000000000 -0400 ++++ serefpolicy-3.5.1/config/appconfig-standard/xguest_u_default_contexts 2008-07-25 12:35:13.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t +system_r:sshd_t xguest_r:xguest_t +system_r:crond_t xguest_r:xguest_crond_t +system_r:xdm_t xguest_r:xguest_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.1/Makefile ---- nsaserefpolicy/Makefile 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.1/Makefile 2008-07-24 06:54:04.000000000 -0400 -@@ -311,20 +311,22 @@ - - # parse-rolemap modulename,outputfile - define parse-rolemap -- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ -- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 -+ echo "" >> $2 -+# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \ -+# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2 - endef - - # perrole-expansion modulename,outputfile - define perrole-expansion [...7714 lines suppressed...] # Declarations # @@ -33345,6 +34590,7 @@ +allow system_r unconfined_r; +allow unconfined_r system_r; +init_script_role_transition(unconfined_r) ++role system_r types unconfined_t; type unconfined_execmem_t; type unconfined_execmem_exec_t; @@ -33380,7 +34626,7 @@ libs_run_ldconfig(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) -@@ -42,28 +81,37 @@ +@@ -42,28 +82,37 @@ logging_run_auditctl(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) mount_run_unconfined(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) @@ -33422,7 +34668,7 @@ ') optional_policy(` -@@ -75,12 +123,6 @@ +@@ -75,12 +124,6 @@ ') optional_policy(` @@ -33435,7 +34681,7 @@ init_dbus_chat_script(unconfined_t) dbus_stub(unconfined_t) -@@ -106,12 +148,24 @@ +@@ -106,12 +149,24 @@ ') optional_policy(` @@ -33460,7 +34706,7 @@ ') optional_policy(` -@@ -123,11 +177,11 @@ +@@ -123,11 +178,11 @@ ') optional_policy(` @@ -33474,7 +34720,7 @@ ') optional_policy(` -@@ -139,18 +193,6 @@ +@@ -139,18 +194,6 @@ ') optional_policy(` @@ -33493,7 +34739,7 @@ prelink_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ') -@@ -159,38 +201,46 @@ +@@ -159,38 +202,46 @@ ') optional_policy(` @@ -33553,7 +34799,7 @@ ') optional_policy(` -@@ -198,23 +248,34 @@ +@@ -198,23 +249,34 @@ ') optional_policy(` @@ -33593,7 +34839,7 @@ ') ######################################## -@@ -224,14 +285,35 @@ +@@ -224,14 +286,35 @@ allow unconfined_execmem_t self:process { execstack execmem }; unconfined_domain_noaudit(unconfined_execmem_t) @@ -33636,7 +34882,7 @@ +domain_ptrace_all_domains(unconfined_notrans_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.1/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/userdomain.fc 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/userdomain.fc 2008-07-25 12:35:13.000000000 -0400 @@ -1,4 +1,5 @@ -HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) -HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) @@ -33649,7 +34895,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/userdomain.if 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/userdomain.if 2008-07-25 12:35:13.000000000 -0400 @@ -28,10 +28,14 @@ class context contains; ') @@ -36405,7 +37651,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/userdomain.te 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/userdomain.te 2008-07-25 12:35:13.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -36522,7 +37768,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.1/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/xen.fc 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.fc 2008-07-25 12:35:13.000000000 -0400 @@ -20,6 +20,7 @@ /var/run/xenconsoled\.pid -- gen_context(system_u:object_r:xenconsoled_var_run_t,s0) /var/run/xend(/.*)? gen_context(system_u:object_r:xend_var_run_t,s0) @@ -36533,7 +37779,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.1/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2008-06-12 23:25:07.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/xen.if 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.if 2008-07-25 12:35:13.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -36577,7 +37823,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.1/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/modules/system/xen.te 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/modules/system/xen.te 2008-07-25 12:35:13.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -36816,7 +38062,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.1/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.1/policy/support/file_patterns.spt 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/support/file_patterns.spt 2008-07-25 12:35:13.000000000 -0400 @@ -537,3 +537,23 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -36843,7 +38089,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-06-12 23:25:08.000000000 -0400 -+++ serefpolicy-3.5.1/policy/support/obj_perm_sets.spt 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/support/obj_perm_sets.spt 2008-07-25 12:35:13.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -36860,7 +38106,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.1/policy/users --- nsaserefpolicy/policy/users 2008-07-10 11:38:46.000000000 -0400 -+++ serefpolicy-3.5.1/policy/users 2008-07-24 06:54:05.000000000 -0400 ++++ serefpolicy-3.5.1/policy/users 2008-07-25 12:35:13.000000000 -0400 @@ -1,3 +1,9 @@ +role auditadm_r; +role secadm_r; @@ -36895,35 +38141,3 @@ - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -') +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.1/Rules.modular ---- nsaserefpolicy/Rules.modular 2008-06-12 23:25:10.000000000 -0400 -+++ serefpolicy-3.5.1/Rules.modular 2008-07-24 06:54:04.000000000 -0400 -@@ -73,8 +73,8 @@ - $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te - @echo "Compliling $(NAME) $(@F) module" - @test -d $(tmpdir) || mkdir -p $(tmpdir) -- $(call perrole-expansion,$(basename $(@F)),$@.role) -- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp) -+# $(call perrole-expansion,$(basename $(@F)),$@.role) -+ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp) - $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@ - - $(tmpdir)/%.mod.fc: $(m4support) %.fc -@@ -129,7 +129,7 @@ - @test -d $(tmpdir) || mkdir -p $(tmpdir) - # define all available object classes - $(verbose) $(genperm) $(avs) $(secclass) > $@ -- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) -+# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@) - $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true - - $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy -@@ -146,7 +146,7 @@ - $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/rolemap.conf: $(rolemap) - $(verbose) echo "" > $@ -- $(call parse-rolemap,base,$@) -+# $(call parse-rolemap,base,$@) - - $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy - $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf From fedora-extras-commits at redhat.com Wed Jul 30 13:48:34 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 30 Jul 2008 13:48:34 GMT Subject: rpms/selinux-policy/devel selinux-policy.spec,1.690,1.691 Message-ID: <200807301348.m6UDmYxe011552@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11508 Modified Files: selinux-policy.spec Log Message: * Fri Jul 25 2008 Dan Walsh 3.5.1-4 - Consolodate pyzor,spamassassin, razor into one security domain - Fix xdm requiring additional perms. Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.690 retrieving revision 1.691 diff -u -r1.690 -r1.691 --- selinux-policy.spec 25 Jul 2008 11:42:14 -0000 1.690 +++ selinux-policy.spec 30 Jul 2008 13:48:03 -0000 1.691 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.5.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -375,6 +375,10 @@ %endif %changelog +* Fri Jul 25 2008 Dan Walsh 3.5.1-4 +- Consolodate pyzor,spamassassin, razor into one security domain +- Fix xdm requiring additional perms. + * Fri Jul 25 2008 Dan Walsh 3.5.1-3 - Fixes for logrotate, alsa From fedora-extras-commits at redhat.com Wed Jul 30 13:52:31 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 30 Jul 2008 13:52:31 GMT Subject: rpms/bacula/devel .cvsignore, 1.3, 1.4 bacula-config.patch, 1.1, 1.2 bacula-gconsole.desktop, 1.1, 1.2 bacula-pamd.patch, 1.1, 1.2 bacula-wxconsole.desktop, 1.1, 1.2 bacula.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200807301352.m6UDqVN0011766@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/bacula/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11711 Modified Files: .cvsignore bacula-config.patch bacula-gconsole.desktop bacula-pamd.patch bacula-wxconsole.desktop bacula.spec sources Log Message: Update to 2.2.8, multiple fixes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Jul 2007 20:18:57 -0000 1.3 +++ .cvsignore 30 Jul 2008 13:52:01 -0000 1.4 @@ -0,0 +1,2 @@ +bacula-2.2.8.tar.gz +bacula-docs-2.2.8.tar.bz2 bacula-config.patch: Index: bacula-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-config.patch 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-config.patch 30 Jul 2008 13:52:01 -0000 1.2 @@ -1,5 +1,5 @@ ---- bacula-2.0.2/src/gnome2-console/gnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100 -+++ bacula-2.0.2/src/gnome2-console/gnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100 +--- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100 ++++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100 @@ -3,9 +3,9 @@ # @@ -202,8 +202,8 @@ - director = @hostname at -dir = all + director = bacula-dir = all } ---- bacula-2.0.2/src/wx-console/wx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100 -+++ bacula-2.0.2/src/wx-console/wx-console.conf.in 2007-02-06 13:47:02.000000000 +0100 +--- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100 ++++ bacula-2.0.2/src/wx-console/bwx-console.conf.in 2007-02-06 13:47:02.000000000 +0100 @@ -3,8 +3,8 @@ # Index: bacula-gconsole.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-gconsole.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-gconsole.desktop 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-gconsole.desktop 30 Jul 2008 13:52:01 -0000 1.2 @@ -4,9 +4,9 @@ Name=Bacula Console GenericName=Backup Management Console Comment=Control your Bacula Server -Exec=gnome-console -c /etc/bacula/wxconsole.conf +Exec=bgnome-console -c /etc/bacula/bgnome-console.conf Icon=bacula.png Terminal=false Type=Application -Categories=System;Application;Utility +Categories=System;Application; bacula-pamd.patch: Index: bacula-pamd.patch =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-pamd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-pamd.patch 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-pamd.patch 30 Jul 2008 13:52:01 -0000 1.2 @@ -9,8 +9,8 @@ session optional pam_xauth.so session optional pam_timestamp.so account required pam_permit.so ---- bacula-2.0.3/scripts/gnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200 -+++ bacula-2.0.3/scripts/gnome-console.pamd 2007-07-11 18:42:57.000000000 +0200 +--- bacula-2.0.3/scripts/bgnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200 ++++ bacula-2.0.3/scripts/bgnome-console.pamd 2007-07-11 18:42:57.000000000 +0200 @@ -1,7 +1,7 @@ #%PAM-1.0 auth sufficient pam_rootok.so Index: bacula-wxconsole.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-wxconsole.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-wxconsole.desktop 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-wxconsole.desktop 30 Jul 2008 13:52:01 -0000 1.2 @@ -4,8 +4,8 @@ Name=Bacula WX Console GenericName=Backup Management Console Comment=Control your Bacula Server -Exec=wxconsole -c /etc/bacula/wxconsole.conf +Exec=wxconsole -c /etc/bacula/bwxconsole.conf Icon=wxwin16x16.xpm Terminal=false Type=Application -Categories=System;Application;Utility +Categories=System;Application; Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bacula.spec 7 Jul 2008 17:01:16 -0000 1.7 +++ bacula.spec 30 Jul 2008 13:52:01 -0000 1.8 @@ -7,13 +7,13 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula -Version: 2.0.3 -Release: 14%{?dist} +Version: 2.2.8 +Release: 1%{?dist} # See LICENSE for details License: GPLv2 with exceptions Group: System Environment/Daemons Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz -Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz +Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.bz2 #Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz Source3: bacula-gconsole.desktop Source4: bacula-wxconsole.desktop @@ -26,14 +26,14 @@ #Source11: bacula-web.apache Patch0: bacula-director-configuration.patch Patch1: bacula-config.patch -Patch2: bacula-wxconsole.patch +#Patch2: bacula-wxconsole.patch Patch3: bacula-pamd.patch -Patch4: 2.0.3-ampm.patch -Patch5: 2.0.3-maxbyteslist.patch -Patch6: 2.0.3-maxwaittime.patch -Patch7: 2.0.3-scheduler-next-hour.patch -Patch8: 2.0.3-verify.patch -Patch9: 2.0.3-tls-disconnect.patch +#Patch4: 2.0.3-ampm.patch +#Patch5: 2.0.3-maxbyteslist.patch +#Patch6: 2.0.3-maxwaittime.patch +#Patch7: 2.0.3-scheduler-next-hour.patch +#Patch8: 2.0.3-verify.patch +#Patch9: 2.0.3-tls-disconnect.patch #Patch10: bacula-web-smarty.patch URL: http://www.bacula.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,7 +68,6 @@ Provides: bacula-director = %{version}-%{release} Requires: bacula-director-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: mysql-server %description director-mysql Bacula is a set of programs that allow you to manage the backup, @@ -103,7 +102,6 @@ Provides: bacula-director = %{version}-%{release} Requires: bacula-director-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: postgresql-server %description director-postgresql Bacula is a set of programs that allow you to manage the backup, @@ -175,7 +173,6 @@ Provides: bacula-storage = %{version}-%{release} Requires: bacula-storage-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: mysql-server %description storage-mysql Bacula is a set of programs that allow you to manage the backup, @@ -210,7 +207,6 @@ Provides: bacula-storage = %{version}-%{release} Requires: bacula-storage-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: postgresql-server %description storage-postgresql Bacula is a set of programs that allow you to manage the backup, @@ -324,14 +320,14 @@ pushd bacula-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %patch3 -p1 -%patch4 -p0 -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 -%patch8 -p0 -%patch9 -p0 +#%patch4 -p0 +#%patch5 -p0 +#%patch6 -p0 +#%patch7 -p0 +#%patch8 -p0 +#%patch9 -p0 # Remove execution permissions from files we're packaging as docs later on find examples -type f | xargs chmod -x @@ -381,7 +377,7 @@ --enable-conio \ --enable-largefile \ --enable-gnome \ - --enable-wx-console \ + --enable-bwx-console \ --enable-tray-monitor \ --enable-build-dird \ --enable-build-stored \ @@ -521,15 +517,15 @@ # Fix some wrapper braindeadness rm -f %{buildroot}%{_libexecdir}/bacula/bconsole rm -f %{buildroot}%{_libexecdir}/bacula/gconsole -mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole -mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf +mv %{buildroot}%{_sbindir}/bwx-console %{buildroot}%{_sbindir}/bwxconsole +mv %{buildroot}%{_sysconfdir}/bacula/bwx-console.conf %{buildroot}%{_sysconfdir}/bacula/bwxconsole.conf # Desktop Integration for the console apps and the traymonitor mkdir -p %{buildroot}%{_bindir} install -m 644 -D bacula-sqlite/scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png -install -m 644 -D bacula-sqlite/scripts/gnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/gnome-console -install -m 644 -D bacula-sqlite/scripts/gnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/gnome-console +install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bgnome-console +install -m 644 -D bacula-sqlite/scripts/bgnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bgnome-console install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole @@ -724,10 +720,10 @@ %files common +%defattr(-,root,root,-) %doc bacula-%{version}/AUTHORS bacula-%{version}/ChangeLog bacula-%{version}/COPYING bacula-%{version}/LICENSE %doc bacula-%{version}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING %doc bacula-%{version}/examples/ -%defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/logrotate.d/bacula %dir %{_sysconfdir}/bacula %dir %{_libexecdir}/bacula @@ -759,12 +755,13 @@ %files console-gnome %defattr(-,root,root,-) -%config %{_sysconfdir}/security/console.apps/gnome-console -%config %{_sysconfdir}/pam.d/gnome-console -%config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf +%config %{_sysconfdir}/security/console.apps/bgnome-console +%config %{_sysconfdir}/pam.d/bgnome-console +%config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf %{_bindir}/gnome-console -%{_sbindir}/gnome-console -%{_mandir}/man1/bacula-console-gnome.1* +%{_sbindir}/bgnome-console +%{_mandir}/man1/bacula-bgnome-console.1.gz +#%{_mandir}/man1/bacula-bconsole-gnome.1* %{_datadir}/applications/fedora-bacula-gconsole.desktop %{_datadir}/pixmaps/bacula.png @@ -773,17 +770,17 @@ %defattr(-,root,root,-) %config %{_sysconfdir}/security/console.apps/wxconsole %config %{_sysconfdir}/pam.d/wxconsole -%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf +%config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf %{_bindir}/wxconsole -%{_sbindir}/wxconsole -%{_mandir}/man1/bacula-wxconsole.1* +%{_sbindir}/bwxconsole +%{_mandir}/man1/bacula-bwxconsole.1* %{_datadir}/applications/fedora-bacula-wxconsole.desktop %{_datadir}/pixmaps/wxwin16x16.xpm %files director-common -%doc bacula-%{version}/updatedb/ %defattr(-,root,root,-) +%doc bacula-%{version}/updatedb/ %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf %config(noreplace) %{_sysconfdir}/bacula/query.sql %config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf @@ -792,6 +789,7 @@ %{_initrddir}/bacula-dir %{_sbindir}/bregex %{_sbindir}/bwild +%{_mandir}/man1/bat.1.gz %{_mandir}/man8/dbcheck.8* %{_mandir}/man8/bacula-dir.8* %{_libexecdir}/bacula/delete_catalog_backup @@ -903,6 +901,7 @@ %files docs +%defattr(-,root,root,-) %doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf %doc bacula-docs-%{docs_version}/bacula-web/bacula-web/ %doc bacula-docs-%{docs_version}/developers/developers.pdf @@ -922,6 +921,20 @@ %changelog +* Fri Jul 25 2008 Jon Ciesla - 2.2.8-1 +- Update to 2.2.8. BZ 446461. +- Dropped director and storage DB-server hard Reqs. BZ 426788. +- .desktop fixes. BZ 450278, 426789. +- Updated config patch. +- Dropped wxconsole patch, applied upstream. +- Updated pamd patch. +- Dropped ampm patch, applied upstream. +- Dropped maxbyteslist patch, N/A. +- Dropped maxwaittime patch, applied upstream. +- Dropped scheduler-next-hour patch, applied upstream. +- Dropped verify patch, applied upstream. +- Dropped tls-disconnect patch, applied upstream. + * Mon Jul 7 2008 Tom "spot" Callaway - 2.0.3-14 - fix conditional comparison - fix license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Jul 2007 20:11:04 -0000 1.2 +++ sources 30 Jul 2008 13:52:01 -0000 1.3 @@ -1,2 +1,2 @@ -443d2560ace95173a0d8ba465de493ef bacula-2.0.3.tar.gz -dce3aed621b9e4abee51cc89aebf4a58 bacula-docs-2.0.3.tar.gz +4547d0bf9f976d5d9ea5f21a7bd078ee bacula-2.2.8.tar.gz +9cc38ace92d52c7bebbbfc2ed5507b79 bacula-docs-2.2.8.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 14:05:31 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 30 Jul 2008 14:05:31 GMT Subject: rpms/MAKEDEV/devel .cvsignore,1.52,1.53 sources,1.52,1.53 Message-ID: <200807301405.m6UE5Vix019016@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/MAKEDEV/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18985 Modified Files: .cvsignore sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 3 Mar 2008 16:17:51 -0000 1.52 +++ .cvsignore 30 Jul 2008 14:05:01 -0000 1.53 @@ -1,2 +1,3 @@ MAKEDEV-3.23-1.tar.gz MAKEDEV-3.23-4.tar.gz +MAKEDEV-3.23-5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 3 Mar 2008 16:17:51 -0000 1.52 +++ sources 30 Jul 2008 14:05:01 -0000 1.53 @@ -1 +1 @@ -362b9511f5bca9209cde450358384b1e MAKEDEV-3.23-4.tar.gz +c28b593bcc7e14b4df775e7b696aa163 MAKEDEV-3.23-5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 14:06:54 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 30 Jul 2008 14:06:54 GMT Subject: rpms/bacula/F-8 bacula.spec,1.6,1.7 Message-ID: <200807301406.m6UE6shL019129@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/bacula/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19083 Modified Files: bacula.spec Log Message: Fix for 426791. Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-8/bacula.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bacula.spec 30 Jul 2008 13:23:44 -0000 1.6 +++ bacula.spec 30 Jul 2008 14:06:23 -0000 1.7 @@ -8,7 +8,7 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula Version: 2.0.3 -Release: 11%{?dist}.2 +Release: 11%{?dist}.3 # See LICENSE for details License: GPLv2 with exceptions Group: System Environment/Daemons @@ -748,7 +748,7 @@ %files console %defattr(-,root,root,-) %{_sbindir}/bconsole -%config(noreplace) %{_sysconfdir}/bacula/bconsole.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf %{_mandir}/man8/bconsole.8* @@ -756,7 +756,7 @@ %defattr(-,root,root,-) %config %{_sysconfdir}/security/console.apps/gnome-console %config %{_sysconfdir}/pam.d/gnome-console -%config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf %{_bindir}/gnome-console %{_sbindir}/gnome-console %{_mandir}/man1/bacula-console-gnome.1* @@ -768,7 +768,7 @@ %defattr(-,root,root,-) %config %{_sysconfdir}/security/console.apps/wxconsole %config %{_sysconfdir}/pam.d/wxconsole -%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf %{_bindir}/wxconsole %{_sbindir}/wxconsole %{_mandir}/man1/bacula-wxconsole.1* @@ -891,7 +891,7 @@ %files traymonitor %defattr(-,root,root,-) %{_sbindir}/bacula-tray-monitor -%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %{_mandir}/man1/bacula-tray-monitor.1* %{_datadir}/applications/fedora-bacula-traymonitor.desktop %{_datadir}/pixmaps/bacula-tray-monitor.xpm @@ -917,6 +917,9 @@ %changelog +* Wed Jul 30 2008 Jon Ciesla - 2.0.3-11.3 +- Corrected conf file perms, 426791. + * Wed Jul 30 2008 Jon Ciesla - 2.0.3-11.2 - Fixed duplicate menu entries. BZ 426789 - Dropped hard DB server deps. BZ 426788 From fedora-extras-commits at redhat.com Wed Jul 30 14:10:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 30 Jul 2008 14:10:25 GMT Subject: rpms/anacron/devel anacron.init,1.15,1.16 anacron.spec,1.49,1.50 Message-ID: <200807301410.m6UEAP2Z019266@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/anacron/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19240 Modified Files: anacron.init anacron.spec Log Message: * Wed Jul 30 2008 Marcela Maslanova 2.3-62 - 441576 really stop anacron daemon Index: anacron.init =================================================================== RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- anacron.init 28 May 2008 14:06:40 -0000 1.15 +++ anacron.init 30 Jul 2008 14:09:55 -0000 1.16 @@ -11,6 +11,8 @@ prog="anacron" PIDFILE=/var/run/anacron.pid LOCKFILE=/var/lock/subsys/$prog +ANACRON=/usr/sbin/anacron + # # NOTE: anacron exits after it has determined it has no more work to do. # Hence, its initscript cannot do normal lock file management. @@ -20,7 +22,7 @@ # start() { - [ -x /usr/sbin/anacron ] || exit 5 + [ -x $ANACRON ] || exit 5 echo -n $"Starting $prog: " daemon +19 anacron -s RETVAL=$? @@ -32,15 +34,15 @@ stop() { echo -n $"Stopping $prog: " - if [ -f $PIDFILE ]; then - killproc anacron - RETVAL=$? - if [ $RETVAL -ne 0 ]; then - failure; - fi; - else - failure; + # daemon exists only sometime -> hard to kill + killproc $ANACRON + RETVAL=3 + # kill first, than ask + if [ -n "`pidfileofproc $ANACRON`" ]; then + failure $"Stopping $prog" + RETVAL=1 fi + [ "RETVAL" = 0 ] && rm -f $LOCK_FILE echo } Index: anacron.spec =================================================================== RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- anacron.spec 30 May 2008 12:45:31 -0000 1.49 +++ anacron.spec 30 Jul 2008 14:09:55 -0000 1.50 @@ -1,7 +1,7 @@ Summary: A cron-like program that can run jobs lost during downtime Name: anacron Version: 2.3 -Release: 61%{?dist} +Release: 62%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://packages.debian.org/stable/source/anacron @@ -111,6 +111,9 @@ %dir /etc/cron.monthly/0anacron %changelog +* Wed Jul 30 2008 Marcela Maslanova 2.3-62 +- 441576 really stop anacron daemon + * Wed May 28 2008 Marcela Maslanova 2.3-61 - cleaning lots of scripts in anacron & crontabs From fedora-extras-commits at redhat.com Wed Jul 30 14:13:09 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 30 Jul 2008 14:13:09 GMT Subject: rpms/MAKEDEV/F-9 MAKEDEV.spec,1.60,1.61 sources,1.52,1.53 Message-ID: <200807301413.m6UED92v019445@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/MAKEDEV/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408 Modified Files: MAKEDEV.spec sources Log Message: Rebuilt for an update release (#454345). Index: MAKEDEV.spec =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/F-9/MAKEDEV.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- MAKEDEV.spec 3 Mar 2008 16:17:51 -0000 1.60 +++ MAKEDEV.spec 30 Jul 2008 14:12:39 -0000 1.61 @@ -1,6 +1,6 @@ Name: MAKEDEV Version: 3.23 -Release: 4 +Release: 5 Group: System Environment/Base License: GPLv2 # This is a Red Hat maintained package which is specific to @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel URL: http://www.lanana.org/docs/device-list/ -Requires(pre): shadow-utils +Requires(pre): shadow-utils, /usr/bin/getent %description This package contains the MAKEDEV program, which makes it easier to create @@ -53,6 +53,9 @@ %config(noreplace) %{_sysconfdir}/makedev.d %changelog +* Mon Jun 16 2008 Jesse Keating - 3.23-5 +- Make sure we have getent installed for our %pre section. + * Mon Mar 03 2008 Chris Lumens 3.23-4 - Change license to GPLv2 only. - minor cleanups for merge review (Todd Zullinger ): Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/F-9/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 3 Mar 2008 16:17:51 -0000 1.52 +++ sources 30 Jul 2008 14:12:39 -0000 1.53 @@ -1 +1 @@ -362b9511f5bca9209cde450358384b1e MAKEDEV-3.23-4.tar.gz +c28b593bcc7e14b4df775e7b696aa163 MAKEDEV-3.23-5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 14:15:53 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 30 Jul 2008 14:15:53 GMT Subject: rpms/openoffice.org/devel openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash, NONE, 1.1 openoffice.org.spec, 1.1596, 1.1597 Message-ID: <200807301415.m6UEFriq019641@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19577 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash Log Message: Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash --- NEW FILE openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash --- Index: source/ui/inc/TableWindowAccess.hxx =================================================================== RCS file: /cvs/dba/dbaccess/source/ui/inc/TableWindowAccess.hxx,v retrieving revision 1.6 diff -u -r1.6 TableWindowAccess.hxx --- openoffice.org.orig/dbaccess/source/ui/inc/TableWindowAccess.hxx 8 Sep 2005 15:38:21 -0000 1.6 +++ openoffice.org/dbaccess/source/ui/inc/TableWindowAccess.hxx 30 Jul 2008 14:05:20 -0000 @@ -125,6 +125,8 @@ { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); } + + void clearTable(); }; } #endif // DBACCESS_TABLEWINDOWACCESS_HXX Index: source/ui/querydesign/TableWindow.cxx =================================================================== RCS file: /cvs/dba/dbaccess/source/ui/querydesign/TableWindow.cxx,v retrieving revision 1.38 diff -u -r1.38 TableWindow.cxx --- openoffice.org.orig/dbaccess/source/ui/querydesign/TableWindow.cxx 21 Nov 2007 17:11:47 -0000 1.38 +++ openoffice.org/dbaccess/source/ui/querydesign/TableWindow.cxx 30 Jul 2008 14:05:20 -0000 @@ -171,13 +173,18 @@ { DBG_DTOR(OTableWindow,NULL); if (m_pListBox) { OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); ::std::auto_ptr aTemp(m_pListBox); m_pListBox = NULL; } - m_pAccessible = NULL; + if ( m_pAccessible ) + { + m_pAccessible->clearTable(); + m_pAccessible = NULL; + } + } // ----------------------------------------------------------------------------- const OJoinTableView* OTableWindow::getTableView() const Index: source/ui/querydesign/TableWindowAccess.cxx =================================================================== RCS file: /cvs/dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx,v retrieving revision 1.12 diff -u -r1.12 TableWindowAccess.cxx --- openoffice.org.orig/dbaccess/source/ui/querydesign/TableWindowAccess.cxx 27 Jun 2007 12:25:46 -0000 1.12 +++ openoffice.org/dbaccess/source/ui/querydesign/TableWindowAccess.cxx 30 Jul 2008 14:05:20 -0000 @@ -96,6 +96,11 @@ m_pTable = NULL; VCLXAccessibleComponent::disposing(); } + void OTableWindowAccess::clearTable() + { + ::osl::MutexGuard aGuard( m_aMutex ); + m_pTable = NULL; + } // ----------------------------------------------------------------------------- Any SAL_CALL OTableWindowAccess::queryInterface( const Type& aType ) throw (RuntimeException) { Index: source/extended/accessiblelistbox.cxx =================================================================== RCS file: /cvs/gsl/accessibility/source/extended/accessiblelistbox.cxx,v retrieving revision 1.2.28.1 diff -u -r1.2.28.1 accessiblelistbox.cxx --- openoffice.org.orig/accessibility/source/extended/accessiblelistbox.cxx 17 Jan 2008 15:39:08 -0000 1.2.28.1 +++ openoffice.org/accessibility/source/extended/accessiblelistbox.cxx 30 Jul 2008 14:03:22 -0000 @@ -305,7 +305,10 @@ ::comphelper::OExternalLockGuard aGuard( this ); ensureAlive(); - return getListBox()->GetAccessibleName(); + ::rtl::OUString sRet; + if (getListBox()) + sRet = getListBox()->GetAccessibleName(); + return sRet; } // ----------------------------------------------------------------------------- // XAccessibleSelection Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1596 retrieving revision 1.1597 diff -u -r1.1596 -r1.1597 --- openoffice.org.spec 28 Jul 2008 21:37:54 -0000 1.1596 +++ openoffice.org.spec 30 Jul 2008 14:15:23 -0000 1.1597 @@ -107,6 +107,7 @@ Patch36: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch Patch37: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch Patch38: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch +Patch39: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash %define instdir %{_libdir} %define baseinstdir %{instdir}/openoffice.org @@ -1259,6 +1260,7 @@ %patch36 -p1 -b .ooo86142.serbiannumbering.patch %patch37 -p1 -b .ooo91977.sd.holdreference.patch %patch38 -p1 -b .ooo92026.sd.disposed_during_disposing.patch +%patch39 -p1 -b .ooo92253.dbaccess.a11y.crash %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -3565,6 +3567,9 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Wed Jul 30 2008 Caolan McNamara - 1:3.0.0-0.28-2 +- Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash + * Mon Jul 28 2008 Caolan McNamara - 1:3.0.0-0.28-1 - next version - drop (finally!) integrated ooo#64726 bengali translation fix (April 2006) From fedora-extras-commits at redhat.com Wed Jul 30 14:16:37 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 30 Jul 2008 14:16:37 GMT Subject: rpms/MAKEDEV/F-9 MAKEDEV.spec,1.61,1.62 Message-ID: <200807301416.m6UEGb6i019679@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/MAKEDEV/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19642 Modified Files: MAKEDEV.spec Log Message: Modify spec file so we can tag across different branches. Index: MAKEDEV.spec =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/F-9/MAKEDEV.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- MAKEDEV.spec 30 Jul 2008 14:12:39 -0000 1.61 +++ MAKEDEV.spec 30 Jul 2008 14:16:07 -0000 1.62 @@ -1,6 +1,6 @@ Name: MAKEDEV Version: 3.23 -Release: 5 +Release: 5%{?dist} Group: System Environment/Base License: GPLv2 # This is a Red Hat maintained package which is specific to From fedora-extras-commits at redhat.com Wed Jul 30 14:17:29 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 30 Jul 2008 14:17:29 GMT Subject: rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash, NONE, 1.1 openoffice.org.spec, 1.1501, 1.1502 Message-ID: <200807301417.m6UEHTgV019765@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash Log Message: Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash --- NEW FILE openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash --- Index: source/ui/inc/TableWindowAccess.hxx =================================================================== RCS file: /cvs/dba/dbaccess/source/ui/inc/TableWindowAccess.hxx,v retrieving revision 1.6 diff -u -r1.6 TableWindowAccess.hxx --- openoffice.org.orig/dbaccess/source/ui/inc/TableWindowAccess.hxx 8 Sep 2005 15:38:21 -0000 1.6 +++ openoffice.org/dbaccess/source/ui/inc/TableWindowAccess.hxx 30 Jul 2008 14:05:20 -0000 @@ -125,6 +125,8 @@ { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); } + + void clearTable(); }; } #endif // DBACCESS_TABLEWINDOWACCESS_HXX Index: source/ui/querydesign/TableWindow.cxx =================================================================== RCS file: /cvs/dba/dbaccess/source/ui/querydesign/TableWindow.cxx,v retrieving revision 1.38 diff -u -r1.38 TableWindow.cxx --- openoffice.org.orig/dbaccess/source/ui/querydesign/TableWindow.cxx 21 Nov 2007 17:11:47 -0000 1.38 +++ openoffice.org/dbaccess/source/ui/querydesign/TableWindow.cxx 30 Jul 2008 14:05:20 -0000 @@ -171,13 +173,18 @@ { DBG_DTOR(OTableWindow,NULL); if (m_pListBox) { OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); ::std::auto_ptr aTemp(m_pListBox); m_pListBox = NULL; } - m_pAccessible = NULL; + if ( m_pAccessible ) + { + m_pAccessible->clearTable(); + m_pAccessible = NULL; + } + } // ----------------------------------------------------------------------------- const OJoinTableView* OTableWindow::getTableView() const Index: source/ui/querydesign/TableWindowAccess.cxx =================================================================== RCS file: /cvs/dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx,v retrieving revision 1.12 diff -u -r1.12 TableWindowAccess.cxx --- openoffice.org.orig/dbaccess/source/ui/querydesign/TableWindowAccess.cxx 27 Jun 2007 12:25:46 -0000 1.12 +++ openoffice.org/dbaccess/source/ui/querydesign/TableWindowAccess.cxx 30 Jul 2008 14:05:20 -0000 @@ -96,6 +96,11 @@ m_pTable = NULL; VCLXAccessibleComponent::disposing(); } + void OTableWindowAccess::clearTable() + { + ::osl::MutexGuard aGuard( m_aMutex ); + m_pTable = NULL; + } // ----------------------------------------------------------------------------- Any SAL_CALL OTableWindowAccess::queryInterface( const Type& aType ) throw (RuntimeException) { Index: source/extended/accessiblelistbox.cxx =================================================================== RCS file: /cvs/gsl/accessibility/source/extended/accessiblelistbox.cxx,v retrieving revision 1.2.28.1 diff -u -r1.2.28.1 accessiblelistbox.cxx --- openoffice.org.orig/accessibility/source/extended/accessiblelistbox.cxx 17 Jan 2008 15:39:08 -0000 1.2.28.1 +++ openoffice.org/accessibility/source/extended/accessiblelistbox.cxx 30 Jul 2008 14:03:22 -0000 @@ -305,7 +305,10 @@ ::comphelper::OExternalLockGuard aGuard( this ); ensureAlive(); - return getListBox()->GetAccessibleName(); + ::rtl::OUString sRet; + if (getListBox()) + sRet = getListBox()->GetAccessibleName(); + return sRet; } // ----------------------------------------------------------------------------- // XAccessibleSelection Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v retrieving revision 1.1501 retrieving revision 1.1502 diff -u -r1.1501 -r1.1502 --- openoffice.org.spec 23 Jul 2008 09:52:59 -0000 1.1501 +++ openoffice.org.spec 30 Jul 2008 14:16:59 -0000 1.1502 @@ -166,6 +166,7 @@ Patch91: workspace.locdat30.patch Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch Patch93: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch +Patch94: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash %define instdir %{_libdir}/openoffice.org @@ -1146,6 +1147,7 @@ %patch91 -p1 -b .workspace.locdat30.patch %patch92 -p1 -b .ooo86142.serbiannumbering.patch %patch93 -p1 -b .ooo92026.sd.disposed_during_disposing.patch +%patch94 -p1 -b .ooo92253.dbaccess.a11y.crash %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2948,6 +2950,7 @@ - Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch - Resolves: rhbz#452385 add postgress-jdbc to default classpath - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch +- Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash * Fri Jun 13 2008 Caolan McNamara - 1:2.4.1-17.4 - Resolves: rhbz#451485 fix vertical glyphs From fedora-extras-commits at redhat.com Wed Jul 30 14:19:25 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 30 Jul 2008 14:19:25 GMT Subject: rpms/bacula/devel bacula.spec,1.8,1.9 Message-ID: <200807301419.m6UEJPVM019885@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/bacula/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19851 Modified Files: bacula.spec Log Message: New fixes. Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bacula.spec 30 Jul 2008 13:52:01 -0000 1.8 +++ bacula.spec 30 Jul 2008 14:18:55 -0000 1.9 @@ -4,6 +4,7 @@ %define docs_version %{version} %define gui_version %{version} %define config_dir %{_sysconfdir}/bacula +%define _default_patch_fuzz 2 Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula @@ -749,7 +750,7 @@ %files console %defattr(-,root,root,-) %{_sbindir}/bconsole -%config(noreplace) %{_sysconfdir}/bacula/bconsole.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf %{_mandir}/man8/bconsole.8* @@ -757,7 +758,7 @@ %defattr(-,root,root,-) %config %{_sysconfdir}/security/console.apps/bgnome-console %config %{_sysconfdir}/pam.d/bgnome-console -%config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf %{_bindir}/gnome-console %{_sbindir}/bgnome-console %{_mandir}/man1/bacula-bgnome-console.1.gz @@ -770,7 +771,7 @@ %defattr(-,root,root,-) %config %{_sysconfdir}/security/console.apps/wxconsole %config %{_sysconfdir}/pam.d/wxconsole -%config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf %{_bindir}/wxconsole %{_sbindir}/bwxconsole %{_mandir}/man1/bacula-bwxconsole.1* @@ -894,7 +895,7 @@ %files traymonitor %defattr(-,root,root,-) %{_sbindir}/bacula-tray-monitor -%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %{_mandir}/man1/bacula-tray-monitor.1* %{_datadir}/applications/fedora-bacula-traymonitor.desktop %{_datadir}/pixmaps/bacula-tray-monitor.xpm @@ -934,6 +935,8 @@ - Dropped scheduler-next-hour patch, applied upstream. - Dropped verify patch, applied upstream. - Dropped tls-disconnect patch, applied upstream. +- Fix for 426791. +- Introduced patch fuzz workaround, will fix. * Mon Jul 7 2008 Tom "spot" Callaway - 2.0.3-14 - fix conditional comparison From fedora-extras-commits at redhat.com Wed Jul 30 14:23:47 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 30 Jul 2008 14:23:47 GMT Subject: rpms/MAKEDEV/F-9 .cvsignore,1.52,1.53 sources,1.53,1.54 Message-ID: <200807301423.m6UENlMM020363@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/MAKEDEV/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20303 Modified Files: .cvsignore sources Log Message: Let's try building this one more time. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/F-9/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 3 Mar 2008 16:17:51 -0000 1.52 +++ .cvsignore 30 Jul 2008 14:23:16 -0000 1.53 @@ -1,2 +1,3 @@ MAKEDEV-3.23-1.tar.gz MAKEDEV-3.23-4.tar.gz +MAKEDEV-3.23-5.fc9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/F-9/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 30 Jul 2008 14:12:39 -0000 1.53 +++ sources 30 Jul 2008 14:23:16 -0000 1.54 @@ -1 +1 @@ -c28b593bcc7e14b4df775e7b696aa163 MAKEDEV-3.23-5.tar.gz +2dfed3dea6ddcac1ce2b649f1f9dfa0f MAKEDEV-3.23-5.fc9.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 14:33:31 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Wed, 30 Jul 2008 14:33:31 GMT Subject: rpms/upstart/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 upstart.spec, 1.23, 1.24 Message-ID: <200807301433.m6UEXVdS020908@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20819 Modified Files: .cvsignore sources upstart.spec Log Message: New upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Jul 2008 17:34:30 -0000 1.4 +++ .cvsignore 30 Jul 2008 14:33:01 -0000 1.5 @@ -1 +1 @@ -upstart-0.5.0-20080723bzr_dbus_userspace_1045.tar.bz2 +upstart-0.5.0-20080730bzr_dbus_userspace_1046.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Jul 2008 17:34:30 -0000 1.4 +++ sources 30 Jul 2008 14:33:01 -0000 1.5 @@ -1 +1 @@ -7d3813c9632905d667750e78f51ca0dd upstart-0.5.0-20080723bzr_dbus_userspace_1045.tar.bz2 +f0ce987b5bf30c509edc849a5daf435f upstart-0.5.0-20080730bzr_dbus_userspace_1046.tar.bz2 Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- upstart.spec 23 Jul 2008 17:44:09 -0000 1.23 +++ upstart.spec 30 Jul 2008 14:33:01 -0000 1.24 @@ -1,4 +1,4 @@ -%define build_str 20080723bzr_dbus_userspace_1045 +%define build_str 20080730bzr_dbus_userspace_1046 %if build_str %define build_rel 0.%{build_str}_ %define build_pkg -%{build_str} @@ -15,7 +15,7 @@ License: GPLv2+ URL: http://upstart.ubuntu.com Source0: http://upstart.ubuntu.com/download/0.3/upstart-%{version}%{build_pkg}.tar.bz2 -Source1: events.5 +Source1: events.5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 @@ -83,6 +83,10 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Wed Jul 30 2008 Casey Dahlin Author: jdennis Update of /cvs/pkgs/rpms/freeradius/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20925 Modified Files: freeradius.spec Log Message: Resolves: bug #453761: FreeRADIUS %%post should not include chown -R specify file attributes for /etc/raddb/ldap.attrmap fix consistent use of tabs/spaces (rpmlint warning) Index: freeradius.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeradius/F-9/freeradius.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- freeradius.spec 26 Jun 2008 15:48:51 -0000 1.67 +++ freeradius.spec 30 Jul 2008 14:34:16 -0000 1.68 @@ -4,7 +4,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -199,29 +199,25 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic" %endif -# bad fix for libtool: clear buildroot early, set LDFLAGS to buildroot libdir -rm -rf $RPM_BUILD_ROOT -export LDFLAGS="-L${RPM_BUILD_ROOT}%{_libdir}" - %configure \ - --libdir=%{_libdir}/freeradius \ - --with-gnu-ld \ - --with-threads \ - --with-thread-pool \ - --disable-ltdl-install \ - --with-docdir=%{_docdir}/freeradius-%{version} \ - --with-rlm-sql_postgresql-include-dir=/usr/include/pgsql \ - --with-rlm-sql-postgresql-lib-dir=%{_libdir} \ - --with-rlm-sql_mysql-include-dir=/usr/include/mysql \ - --with-mysql-lib-dir=%{_libdir}/mysql \ - --with-unixodbc-lib-dir=%{_libdir} \ - --with-rlm-dbm-lib-dir=%{_libdir} \ - --with-rlm-krb5-include-dir=/usr/kerberos/include \ - --without-rlm_eap_ikev2 \ - --without-rlm_sql_iodbc \ - --without-rlm_sql_firebird \ - --without-rlm_sql_db2 \ - --without-rlm_sql_oracle + --libdir=%{_libdir}/freeradius \ + --with-gnu-ld \ + --with-threads \ + --with-thread-pool \ + --disable-ltdl-install \ + --with-docdir=%{_docdir}/freeradius-%{version} \ + --with-rlm-sql_postgresql-include-dir=/usr/include/pgsql \ + --with-rlm-sql-postgresql-lib-dir=%{_libdir} \ + --with-rlm-sql_mysql-include-dir=/usr/include/mysql \ + --with-mysql-lib-dir=%{_libdir}/mysql \ + --with-unixodbc-lib-dir=%{_libdir} \ + --with-rlm-dbm-lib-dir=%{_libdir} \ + --with-rlm-krb5-include-dir=/usr/kerberos/include \ + --without-rlm_eap_ikev2 \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_firebird \ + --without-rlm_sql_db2 \ + --without-rlm_sql_oracle %if "%{_lib}" == "lib64" perl -pi -e 's:sys_lib_search_path_spec=.*:sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64":' libtool @@ -286,7 +282,6 @@ %post -/bin/chown -R radiusd.radiusd %{_sysconfdir}/raddb /sbin/ldconfig if [ $1 = 1 ]; then /sbin/chkconfig --add radiusd @@ -569,7 +564,7 @@ %files ldap %defattr(-,root,root) -%config(noreplace) /etc/raddb/ldap.attrmap +%attr(640,root,radiusd) %config(noreplace) /etc/raddb/ldap.attrmap %{_libdir}/freeradius/rlm_ldap.so %{_libdir}/freeradius/rlm_ldap-%{version}.so @@ -579,6 +574,11 @@ %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so %changelog +* Wed Jul 30 2008 John Dennis - 2.0.5-2 +- Resolves: bug #453761: FreeRADIUS %%post should not include chown -R + specify file attributes for /etc/raddb/ldap.attrmap + fix consistent use of tabs/spaces (rpmlint warning) + * Mon Jun 9 2008 John Dennis - 2.0.5-1 - upgrade to latest upstream, see Changelog for details, upstream now has more complete fix for bug #447545, local patch removed From fedora-extras-commits at redhat.com Wed Jul 30 14:35:53 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 14:35:53 GMT Subject: rpms/sbcl/devel sbcl.spec,1.91,1.92 Message-ID: <200807301435.m6UEZrRA021177@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21102 Modified Files: sbcl.spec Log Message: * Wed Jul 30 2008 Rex Dieter - 1.0.19-1 - sbcl-1.0.19 Index: sbcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- sbcl.spec 30 Jul 2008 14:35:12 -0000 1.91 +++ sbcl.spec 30 Jul 2008 14:35:23 -0000 1.92 @@ -237,7 +237,7 @@ %changelog -* Wed Jul 30 2008 Rex Dieter - 1.0.18-1 +* Wed Jul 30 2008 Rex Dieter - 1.0.19-1 - sbcl-1.0.19 * Thu May 29 2008 Rex Dieter - 1.0.17-3 From fedora-extras-commits at redhat.com Wed Jul 30 14:35:42 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 14:35:42 GMT Subject: rpms/sbcl/devel sbcl-1.0.19-default-sbcl-home.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 sbcl.spec, 1.90, 1.91 sources, 1.39, 1.40 sbcl-0.8.18-default-sbcl-home.patch, 1.1, NONE Message-ID: <200807301435.m6UEZgU1021138@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21068 Modified Files: .cvsignore sbcl.spec sources Added Files: sbcl-1.0.19-default-sbcl-home.patch Removed Files: sbcl-0.8.18-default-sbcl-home.patch Log Message: * Wed Jul 30 2008 Rex Dieter - 1.0.18-1 - sbcl-1.0.19 sbcl-1.0.19-default-sbcl-home.patch: --- NEW FILE sbcl-1.0.19-default-sbcl-home.patch --- diff -up sbcl-1.0.19/src/runtime/runtime.c.default-sbcl-home sbcl-1.0.19/src/runtime/runtime.c --- sbcl-1.0.19/src/runtime/runtime.c.default-sbcl-home 2008-05-15 10:37:50.000000000 -0500 +++ sbcl-1.0.19/src/runtime/runtime.c 2008-07-30 09:20:33.000000000 -0500 @@ -66,9 +66,7 @@ #include "interr.h" #endif -#ifndef SBCL_HOME -#define SBCL_HOME "/usr/local/lib/sbcl/" -#endif +#include "sbcl-home.h" /* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */ diff -up sbcl-1.0.19/make-target-1.sh.default-sbcl-home sbcl-1.0.19/make-target-1.sh --- sbcl-1.0.19/make-target-1.sh.default-sbcl-home 2006-01-09 07:00:18.000000000 -0600 +++ sbcl-1.0.19/make-target-1.sh 2008-07-30 09:20:33.000000000 -0500 @@ -20,6 +20,29 @@ LANG=C LC_ALL=C export LANG LC_ALL +# Allow the definition of INSTALL_ROOT and/or SBCL_HOME to correctly +# set the hard-coded SBCL_HOME macro in src/runtime/runtime.c + +DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME:-/usr/local/lib/sbcl/} + +# Strip off any trailing / on the name; we'll add this later but don't +# need two +DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME%/} + +export DEFAULT_SBCL_HOME + +file=src/runtime/sbcl-home.h +echo "/* This is a machine-generated file. */" > $file +echo "/* Please do not edit it by hand. */" >> $file +echo "/* Change the default SBCL_HOME by setting the */" >> $file +echo "/* DEFAULT_SBCL_HOME environment variable prior */" >> $file +echo "/* to building. See make-target-1.sh for more */" >> $file +echo "/* information. */" >> $file +echo "#ifndef SBCL_HOME" >> $file +echo "#define SBCL_HOME \"$DEFAULT_SBCL_HOME/\"" >> $file +echo "#endif" >> $file + + # Build the runtime system and symbol table (.nm) file. # # (This C build has to come after the first genesis in order to get Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 28 May 2008 13:18:46 -0000 1.38 +++ .cvsignore 30 Jul 2008 14:35:12 -0000 1.39 @@ -1 +1 @@ -sbcl-1.0.17-source.tar.bz2 +sbcl-1.0.19-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sbcl.spec 17 Jun 2008 00:19:45 -0000 1.90 +++ sbcl.spec 30 Jul 2008 14:35:12 -0000 1.91 @@ -12,8 +12,8 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 1.0.17 -Release: 3%{?dist} +Version: 1.0.19 +Release: 1%{?dist} License: BSD Group: Development/Languages @@ -71,7 +71,7 @@ Source100: my_setarch.c -Patch1: sbcl-0.8.18-default-sbcl-home.patch +Patch1: sbcl-1.0.19-default-sbcl-home.patch Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-1.0.16-optflags.patch Patch4: sbcl-0.9.17-LIB_DIR.patch @@ -103,7 +103,7 @@ #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c #or patch to use SBCL_HOME env var -%patch1 -p0 -b .default-sbcl-home +%patch1 -p1 -b .default-sbcl-home %patch2 -p1 -b .personality %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR @@ -121,7 +121,7 @@ %endif # "install" local bootstrap -%if "%{?sbcl_bootstrap_src}" != "%{nil}" +%if "x%{?sbcl_bootstrap_src}" != "x%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh @@ -135,7 +135,7 @@ %build # setup local bootstrap -%if "%{?sbcl_bootstrap_src}" != "%{nil}" +%if "x%{?sbcl_bootstrap_src}" != "x%{nil}" export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl export PATH=`pwd`/sbcl-bootstrap/bin:${PATH} %endif @@ -156,7 +156,7 @@ %{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap} # docs -%if "%{?min_bootstrap}" == "%{nil}" +%if "x%{?min_bootstrap}" == "x%{nil}" make -C doc/manual html info %endif @@ -200,7 +200,7 @@ find %{buildroot} -name 'test-passed' | xargs rm -vf -%if "%{?min_bootstrap}" == "%{nil}" +%if "x%{?min_bootstrap}" == "x%{nil}" %post /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||: /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||: @@ -225,7 +225,7 @@ %{_bindir}/* %{_libdir}/sbcl/ %{_mandir}/man?/* -%if "%{?min_bootstrap}" == "%{nil}" +%if "x%{?min_bootstrap}" == "x%{nil}" %doc doc/manual/sbcl %doc doc/manual/asdf %{_infodir}/* @@ -237,6 +237,9 @@ %changelog +* Wed Jul 30 2008 Rex Dieter - 1.0.18-1 +- sbcl-1.0.19 + * Thu May 29 2008 Rex Dieter - 1.0.17-3 - info removal should be done in %%preun (#448933) - omit ppc only on f9+ (#448734) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 28 May 2008 13:18:46 -0000 1.39 +++ sources 30 Jul 2008 14:35:12 -0000 1.40 @@ -1 +1 @@ -6f1858c98370e06f5cca7bd95227c69e sbcl-1.0.17-source.tar.bz2 +c84b4b3c2f4293e98f0941a43fb746f4 sbcl-1.0.19-source.tar.bz2 --- sbcl-0.8.18-default-sbcl-home.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 14:38:34 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 14:38:34 GMT Subject: rpms/asterisk/F-9 asterisk.spec,1.27,1.28 Message-ID: <200807301438.m6UEcYfW021319@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275 Modified Files: asterisk.spec Log Message: * Tue Jul 29 2008 Jeffrey C. Ollie - 1.6.0-0.20.beta9 - Bump release and rebuild with new libpri and zaptel. Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-9/asterisk.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- asterisk.spec 25 Jul 2008 21:00:08 -0000 1.27 +++ asterisk.spec 30 Jul 2008 14:38:04 -0000 1.28 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.19.beta%{beta}%{?dist} +Release: 0.20.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -397,8 +397,8 @@ Requires: asterisk = %{version}-%{release} Requires: zaptel >= 1.4.0 Requires(pre): %{_sbindir}/usermod -BuildRequires: zaptel-devel >= 1.4.0 -BuildRequires: libpri-devel >= 1.4.0 +BuildRequires: zaptel-devel >= 1.4.11 +BuildRequires: libpri-devel >= 1.4.6 %description zaptel Modules for Asterisk that use Zaptel. @@ -1027,6 +1027,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Tue Jul 29 2008 Jeffrey C. Ollie - 1.6.0-0.20.beta9 +- Bump release and rebuild with new libpri and zaptel. + * Fri Jul 25 2008 Jeffrey C. Ollie - 1.6.0-0.19.beta9 - Add patch pulled from upstream SVN that fixes AST-2008-010 and AST-2008-011. From fedora-extras-commits at redhat.com Wed Jul 30 14:38:44 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Wed, 30 Jul 2008 14:38:44 GMT Subject: rpms/freeradius/devel freeradius.spec,1.65,1.66 Message-ID: <200807301438.m6UEciX8021351@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/freeradius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21271 Modified Files: freeradius.spec Log Message: Resolves: bug #453761: FreeRADIUS %%post should not include chown -R specify file attributes for /etc/raddb/ldap.attrmap fix consistent use of tabs/spaces (rpmlint warning) Index: freeradius.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- freeradius.spec 26 Jun 2008 15:53:47 -0000 1.65 +++ freeradius.spec 30 Jul 2008 14:38:14 -0000 1.66 @@ -4,7 +4,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -199,29 +199,25 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic" %endif -# bad fix for libtool: clear buildroot early, set LDFLAGS to buildroot libdir -rm -rf $RPM_BUILD_ROOT -export LDFLAGS="-L${RPM_BUILD_ROOT}%{_libdir}" - %configure \ - --libdir=%{_libdir}/freeradius \ - --with-gnu-ld \ - --with-threads \ - --with-thread-pool \ - --disable-ltdl-install \ - --with-docdir=%{_docdir}/freeradius-%{version} \ - --with-rlm-sql_postgresql-include-dir=/usr/include/pgsql \ - --with-rlm-sql-postgresql-lib-dir=%{_libdir} \ - --with-rlm-sql_mysql-include-dir=/usr/include/mysql \ - --with-mysql-lib-dir=%{_libdir}/mysql \ - --with-unixodbc-lib-dir=%{_libdir} \ - --with-rlm-dbm-lib-dir=%{_libdir} \ - --with-rlm-krb5-include-dir=/usr/kerberos/include \ - --without-rlm_eap_ikev2 \ - --without-rlm_sql_iodbc \ - --without-rlm_sql_firebird \ - --without-rlm_sql_db2 \ - --without-rlm_sql_oracle + --libdir=%{_libdir}/freeradius \ + --with-gnu-ld \ + --with-threads \ + --with-thread-pool \ + --disable-ltdl-install \ + --with-docdir=%{_docdir}/freeradius-%{version} \ + --with-rlm-sql_postgresql-include-dir=/usr/include/pgsql \ + --with-rlm-sql-postgresql-lib-dir=%{_libdir} \ + --with-rlm-sql_mysql-include-dir=/usr/include/mysql \ + --with-mysql-lib-dir=%{_libdir}/mysql \ + --with-unixodbc-lib-dir=%{_libdir} \ + --with-rlm-dbm-lib-dir=%{_libdir} \ + --with-rlm-krb5-include-dir=/usr/kerberos/include \ + --without-rlm_eap_ikev2 \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_firebird \ + --without-rlm_sql_db2 \ + --without-rlm_sql_oracle %if "%{_lib}" == "lib64" perl -pi -e 's:sys_lib_search_path_spec=.*:sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64":' libtool @@ -286,7 +282,6 @@ %post -/bin/chown -R radiusd.radiusd %{_sysconfdir}/raddb /sbin/ldconfig if [ $1 = 1 ]; then /sbin/chkconfig --add radiusd @@ -569,7 +564,7 @@ %files ldap %defattr(-,root,root) -%config(noreplace) /etc/raddb/ldap.attrmap +%attr(640,root,radiusd) %config(noreplace) /etc/raddb/ldap.attrmap %{_libdir}/freeradius/rlm_ldap.so %{_libdir}/freeradius/rlm_ldap-%{version}.so @@ -579,6 +574,11 @@ %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so %changelog +* Wed Jul 30 2008 John Dennis - 2.0.5-2 +- Resolves: bug #453761: FreeRADIUS %%post should not include chown -R + specify file attributes for /etc/raddb/ldap.attrmap + fix consistent use of tabs/spaces (rpmlint warning) + * Mon Jun 9 2008 John Dennis - 2.0.5-1 - upgrade to latest upstream, see Changelog for details, upstream now has more complete fix for bug #447545, local patch removed From fedora-extras-commits at redhat.com Wed Jul 30 14:43:17 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 30 Jul 2008 14:43:17 GMT Subject: rpms/libsoup/devel libsoup.spec,1.68,1.69 Message-ID: <200807301443.m6UEhH1M021654@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/libsoup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21565 Modified Files: libsoup.spec Log Message: * Wed Jul 30 2008 Matthew Barnes - 2.23.1-6 - Omit unused direct shared library dependencies (RH bug #226046). Index: libsoup.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- libsoup.spec 24 Jun 2008 08:56:40 -0000 1.68 +++ libsoup.spec 30 Jul 2008 14:42:47 -0000 1.69 @@ -4,7 +4,7 @@ Name: libsoup Version: 2.23.1 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2 Group: Development/Libraries Summary: Soup, an HTTP library implementation @@ -47,6 +47,10 @@ %build %configure + +# Omit unused direct shared library dependencies. +sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool + make %{?_smp_mflags} %install @@ -76,6 +80,9 @@ %{_datadir}/gtk-doc/html/%{name}-2.4 %changelog +* Wed Jul 30 2008 Matthew Barnes - 2.23.1-6 +- Omit unused direct shared library dependencies (RH bug #226046). + * Tue Jun 24 2008 Tomas Mraz - 2.23.1-5 - rebuild with new gnutls From fedora-extras-commits at redhat.com Wed Jul 30 14:53:56 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 14:53:56 GMT Subject: rpms/maxima/devel maxima.spec,1.107,1.108 Message-ID: <200807301453.m6UEruTQ022152@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22114 Modified Files: maxima.spec Log Message: * Wed Jul 30 2008 Rex Dieter - 5.15.0-2 - respin (sbcl) Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- maxima.spec 17 Jun 2008 14:12:25 -0000 1.107 +++ maxima.spec 30 Jul 2008 14:53:26 -0000 1.108 @@ -3,7 +3,7 @@ Name: maxima Version: 5.15.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -441,6 +441,9 @@ %changelog +* Wed Jul 30 2008 Rex Dieter - 5.15.0-2 +- respin (sbcl) + * Wed May 28 2008 Rex Dieter - 5.15.0-1 - maxima-5.15.0 - omit ppc (sbcl, #448734) From fedora-extras-commits at redhat.com Wed Jul 30 14:54:38 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Wed, 30 Jul 2008 14:54:38 GMT Subject: rpms/mkinitrd/devel .cvsignore, 1.194, 1.195 mkinitrd.spec, 1.278, 1.279 sources, 1.236, 1.237 Message-ID: <200807301454.m6UEsci1022288@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/mkinitrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22214 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Tue Jul 29 2008 Peter Jones - 6.0.56-1 - Move a bunch of functions to /usr/libexec/initrd-functions so so that plymouth-populate-initrd can use it instead of duplicating them. - Change how we're calling plymouth for password UI Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- .cvsignore 8 Jul 2008 02:08:11 -0000 1.194 +++ .cvsignore 30 Jul 2008 14:54:08 -0000 1.195 @@ -1 +1 @@ -mkinitrd-6.0.55.tar.bz2 +mkinitrd-6.0.56.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- mkinitrd.spec 28 Jul 2008 15:18:44 -0000 1.278 +++ mkinitrd.spec 30 Jul 2008 14:54:08 -0000 1.279 @@ -2,8 +2,8 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.55 -Release: 2%{?dist} +Version: 6.0.56 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: mkinitrd-%{version}.tar.bz2 @@ -89,6 +89,7 @@ %attr(755,root,root) /sbin/grubby %attr(644,root,root) %{_mandir}/man8/grubby.8* %attr(755,root,root) /usr/libexec/mkliveinitrd +%attr(755,root,root) /usr/libexec/initrd-functions %files devel %defattr(-,root,root) @@ -119,6 +120,11 @@ %dir %{_sysconfdir}/kernel/prerm.d %changelog +* Tue Jul 29 2008 Peter Jones - 6.0.56-1 +- Move a bunch of functions to /usr/libexec/initrd-functions so so that + plymouth-populate-initrd can use it instead of duplicating them. +- Change how we're calling plymouth for password UI + * Mon Jul 28 2008 Peter Jones - 6.0.55-2 - Require plymouth. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- sources 8 Jul 2008 02:08:11 -0000 1.236 +++ sources 30 Jul 2008 14:54:08 -0000 1.237 @@ -1 +1 @@ -be19198561c24489754d5f226559f71a mkinitrd-6.0.55.tar.bz2 +6f21eaaae58bcfc8f9c074b55abfa57f mkinitrd-6.0.56.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 14:59:01 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 14:59:01 GMT Subject: rpms/spandsp/devel spandsp.spec,1.24,1.25 Message-ID: <200807301459.m6UEx1Ca022510@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/spandsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22448 Modified Files: spandsp.spec Log Message: * Thu Mar 20 2008 Jeffrey C. Ollie - 0.0.4-0.10.pre18 - Update to 0.0.4pre18 Index: spandsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/spandsp/devel/spandsp.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- spandsp.spec 20 Mar 2008 21:14:18 -0000 1.24 +++ spandsp.spec 30 Jul 2008 14:58:31 -0000 1.25 @@ -1,10 +1,10 @@ -%define pre 18 +%define pre 4 Summary: A DSP library for telephony Name: spandsp -Version: 0.0.4 -Release: 0.10%{?pre:.pre%{pre}}%{?dist} -License: GPLv2 +Version: 0.0.5 +Release: 0.1%{?pre:.pre%{pre}}%{?dist} +License: LGPLv2 and GPLv2 Group: System Environment/Libraries URL: http://www.soft-switch.org/ Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}.tgz @@ -59,13 +59,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm %{buildroot}%{_libdir}/libspandsp.la +mkdir -p %{buildroot}%{_datadir}/spandsp %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README +%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README %{_libdir}/libspandsp.so.* From fedora-extras-commits at redhat.com Wed Jul 30 15:01:28 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Wed, 30 Jul 2008 15:01:28 GMT Subject: rpms/mkinitrd/devel mkinitrd.spec,1.279,1.280 Message-ID: <200807301501.m6UF1SLK029244@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/mkinitrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22598 Modified Files: mkinitrd.spec Log Message: Update plymouth Req: Index: mkinitrd.spec =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- mkinitrd.spec 30 Jul 2008 14:54:08 -0000 1.279 +++ mkinitrd.spec 30 Jul 2008 15:00:58 -0000 1.280 @@ -14,7 +14,7 @@ Requires: lvm2 >= 2.02.33-9, diffutils Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1 Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol, coreutils -Requires: mdadm, elfutils-libelf, isomd5sum, plymouth +Requires: mdadm, elfutils-libelf, isomd5sum, plymouth >= 0.5.0 BuildRequires: popt-devel, elfutils-libelf-devel, elfutils-devel BuildRequires: e2fsprogs-devel parted-devel >= 1.8.5, pkgconfig, glib2-devel BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9 From fedora-extras-commits at redhat.com Wed Jul 30 15:04:39 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 15:04:39 GMT Subject: rpms/asterisk/devel 0003-Allow-alternate-extensions-to-be-specified-in-users.patch, NONE, 1.1 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, NONE, 1.1 0005-Add-chan_mobile-from-asterisk-addons.patch, NONE, 1.1 0006-Use-pkgconfig-to-check-for-Lua.patch, NONE, 1.1 0007-Build-using-external-libedit.patch, NONE, 1.1 0008-Update-cdr_tds-to-latest.patch, NONE, 1.1 0009-Merged-revisions-123952-via-svnmerge-from.patch, NONE, 1.1 0010-Merged-revisions-132778-via-svnmerge-from.patch, NONE, 1.1 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch, NONE, 1.1 0012-Update-autoconf.patch, NONE, 1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.1, 1.2 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 1.1, 1.2 asterisk.spec, 1.31, 1.32 0003-Add-FAX-apps.patch, 1.1, NONE 0004-Allow-alternate-extensions-to-be-specified-in-users.patch, 1.1, NONE 0005-Pick-proper-optimization-flags-for-Fedora.patch, 1.1, NONE 0006-Add-chan_mobile-from-asterisk-addons.patch, 1.1, NONE 0007-Use-pkgconfig-to-check-for-Lua.patch, 1.1, NONE 0008-Build-using-external-libedit.patch, 1.1, NONE 0009-Update-cdr_tds-to-latest.patch, 1.1, NONE 0010-Update-autoconf.patch, 1.1, NONE 0011-Merged-revisions-123952-via-svnmerge-from.patch, 1.1, NONE 0012-Merged-revisions-132778-via-svnmerge-from.patch, 1.1, NONE Message-ID: <200807301504.m6UF4dFs029528@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29438 Modified Files: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch asterisk.spec Added Files: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 0005-Add-chan_mobile-from-asterisk-addons.patch 0006-Use-pkgconfig-to-check-for-Lua.patch 0007-Build-using-external-libedit.patch 0008-Update-cdr_tds-to-latest.patch 0009-Merged-revisions-123952-via-svnmerge-from.patch 0010-Merged-revisions-132778-via-svnmerge-from.patch 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch 0012-Update-autoconf.patch Removed Files: 0003-Add-FAX-apps.patch 0004-Allow-alternate-extensions-to-be-specified-in-users.patch 0005-Pick-proper-optimization-flags-for-Fedora.patch 0006-Add-chan_mobile-from-asterisk-addons.patch 0007-Use-pkgconfig-to-check-for-Lua.patch 0008-Build-using-external-libedit.patch 0009-Update-cdr_tds-to-latest.patch 0010-Update-autoconf.patch 0011-Merged-revisions-123952-via-svnmerge-from.patch 0012-Merged-revisions-132778-via-svnmerge-from.patch Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 1.6.0-0.21.beta9 - Replace app_rxfax/app_txfax with app_fax taken from upstream SVN. 0003-Allow-alternate-extensions-to-be-specified-in-users.patch: --- NEW FILE 0003-Allow-alternate-extensions-to-be-specified-in-users.patch --- >From 673d0920ab94971a9ca2f91de16ecd1f0e9d9b43 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:32:56 -0600 Subject: [PATCH] Allow alternate extensions to be specified in users.conf --- pbx/pbx_config.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 4a7a3d3..0e38d88 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1532,11 +1532,14 @@ static void pbx_load_users(void) { struct ast_config *cfg; char *cat, *chan; + char *ext; const char *zapchan; const char *hasexten; + const char *altexts; char tmp[256]; char iface[256]; char zapcopy[256]; + char altcopy[256]; char *c; int len; int hasvoicemail; @@ -1617,6 +1620,17 @@ static void pbx_load_users(void) } else { ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar); } + altexts = ast_variable_retrieve(cfg, cat, "alternateexts"); + if (!ast_strlen_zero(altexts)) { + snprintf(tmp, sizeof(tmp), "%s|1", cat); + ast_copy_string(altcopy, altexts, sizeof(altcopy)); + c = altcopy; + ext = strsep(&c, ","); + while (ext) { + ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free, registrar); + ext = strsep(&c, ","); + } + } } } ast_config_destroy(cfg); -- 1.5.5.2 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch: --- NEW FILE 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch --- >From 38df88e16ff71fd00dabc5e95e3692e4d37b5159 Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 29 Jul 2008 23:00:45 +0000 Subject: [PATCH] Minor changes to reduce packaging changes made by the Fedora maintainer. (closes issue #12974) Reported by: jcollie Patches: 0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412) git-svn-id: http://svn.digium.com/svn/asterisk/trunk at 134312 614ede4d-c843-0410-af14-a771ab80d22e --- Makefile | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7c44b41..a9fd366 100644 --- a/Makefile +++ b/Makefile @@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu) endif ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) -ASTCFLAGS+=-pipe + ifeq ($(findstring -pipe,$(ASTCFLAGS)),) + ASTCFLAGS+=-pipe + endif +endif + +ifeq ($(findstring -Wall,$(ASTCFLAGS)),) + ASTCFLAGS+=-Wall endif -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h @@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),) ASTLDFLAGS+=-L/usr/local/lib endif -ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) +ifeq ($(findstring -march,$(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif endif ifeq ($(PROC),ppc) -- 1.5.5.2 0005-Add-chan_mobile-from-asterisk-addons.patch: --- NEW FILE 0005-Add-chan_mobile-from-asterisk-addons.patch --- >From cff5fa429540c33f5b0dc06ab8e52b21b54b1ce1 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 09:23:28 -0600 Subject: [PATCH] Add chan_mobile from asterisk-addons. --- build_tools/menuselect-deps.in | 1 + channels/Makefile | 2 + channels/chan_mobile.c | 2118 ++++++++++++++++++++++++++++++++++++++++ configs/mobile.conf.sample | 60 ++ configure.ac | 4 + doc/chan_mobile.txt | 240 +++++ makeopts.in | 3 + 7 files changed, 2428 insertions(+), 0 deletions(-) create mode 100644 channels/chan_mobile.c create mode 100644 configs/mobile.conf.sample create mode 100644 doc/chan_mobile.txt diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index aa76d56..97822e6 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,5 +1,6 @@ ASOUND=@PBX_ALSA@ CRYPTO=@PBX_CRYPTO@ +BLUETOOTH=@PBX_BLUETOOTH@ CURL=@PBX_CURL@ FREETDS=@PBX_FREETDS@ GMIME=@PBX_GMIME@ diff --git a/channels/Makefile b/channels/Makefile index 34bd8e0..d8e691a 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -101,3 +101,5 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o + +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB) diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c new file mode 100644 index 0000000..1312ea9 --- /dev/null +++ b/channels/chan_mobile.c @@ -0,0 +1,2118 @@ +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 1999 - 2006, Digium, Inc. + * + * Mark Spencer + * + * See http://www.asterisk.org for more information about + * the Asterisk project. Please do not directly contact + * any of the maintainers of this project for assistance; + * the project provides a web site, mailing lists and IRC + * channels for your use. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + */ + +/*! \file + * + * \brief Bluetooth Mobile Device channel driver + * + * \author Dave Bowerman + * + * \ingroup channel_drivers + */ + +/*** MODULEINFO + bluetooth + ***/ + +#include + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MBL_CONFIG "mobile.conf" + +#define DEVICE_FRAME_SIZE 48 +#define DEVICE_FRAME_FORMAT AST_FORMAT_SLINEAR +#define CHANNEL_FRAME_SIZE 320 + +static int prefformat = DEVICE_FRAME_FORMAT; + +static int discovery_interval = 60; /* The device discovery interval, default 60 seconds. */ +static pthread_t discovery_thread = AST_PTHREADT_NULL; /* The discovery thread */ +static sdp_session_t *sdp_session; + +enum mbl_type { + MBL_TYPE_PHONE, + MBL_TYPE_HEADSET +}; + +enum mbl_state { + MBL_STATE_INIT = 0, + MBL_STATE_INIT1, + MBL_STATE_INIT2, + MBL_STATE_INIT3, + MBL_STATE_INIT4, + MBL_STATE_INIT5, + MBL_STATE_INIT6, + MBL_STATE_INIT7, + MBL_STATE_PREIDLE, + MBL_STATE_IDLE, + MBL_STATE_DIAL, + MBL_STATE_DIAL1, + MBL_STATE_OUTGOING, + MBL_STATE_RING, + MBL_STATE_RING2, + MBL_STATE_RING3, + MBL_STATE_INCOMING, + MBL_STATE_HANGUP, + MBL_STATE_INSMS, + MBL_STATE_OUTSMS, + MBL_STATE_OUTSMS1, + MBL_STATE_OUTSMS2 +}; + +struct adapter_pvt { + int dev_id; /* device id */ + int hci_socket; /* device descriptor */ + char id[31]; /* the 'name' from mobile.conf */ + bdaddr_t addr; /* adddress of adapter */ + unsigned int inuse:1; /* are we in use ? */ + unsigned int alignment_detection:1; /* do alignment detection on this adpater? */ + int sco_socket; + AST_LIST_ENTRY(adapter_pvt) entry; +}; + +static AST_LIST_HEAD_STATIC(adapters, adapter_pvt); + +struct mbl_pvt { + struct ast_channel *owner; /* Channel we belong to, possibly NULL */ + struct ast_frame fr; /* "null" frame */ + enum mbl_type type; /* Phone or Headset */ + char id[31]; /* The id from mobile.conf */ + int group; /* group number for group dialling */ + bdaddr_t addr; /* address of device */ + struct adapter_pvt *adapter; /* the adapter we use */ + char context[AST_MAX_CONTEXT]; /* the context for incoming calls */ + char connected; /* is it connected? */ + int rfcomm_port; /* rfcomm port number */ + int rfcomm_socket; /* rfcomm socket descriptor */ + char rfcomm_buf[256]; + char io_buf[CHANNEL_FRAME_SIZE + AST_FRIENDLY_OFFSET]; + char io_save_buf[DEVICE_FRAME_SIZE]; + int io_save_len; + int io_pipe[2]; + int sco_socket; /* sco socket descriptor */ + pthread_t sco_listener_thread; /* inbound sco listener for this device */ + enum mbl_state state; /* monitor thread current state */ + pthread_t monitor_thread; /* monitor thread handle */ + char dial_number[AST_MAX_EXTENSION]; /* number for the monitor thread to dial */ + int dial_timeout; + char ciev_call_0[4]; /* dynamically built reponse strings */ + char ciev_call_1[4]; + char ciev_callsetup_0[4]; + char ciev_callsetup_1[4]; [...2115 lines suppressed...] + +See configs/mobile.conf.sample for an example and an explanation of the configuration. + + +Using chan_mobile :- + +chan_mobile.so must be loaded either by loading it using the Asterisk CLI, or by adding it to /etc/asterisk/modules.conf + +Search for your bluetooth devices using the CLI command 'mobile search'. Be patient with this command as +it will take 8 - 10 seconds to do the discovery. This requires a free adapter. + +Headsets will generally have to be put into 'pairing' mode before they will show up here. + +This will return something like the following :- + +*CLI> mobile search +Address Name Usable Type Port +00:12:56:90:6E:00 LG TU500 Yes Phone 4 +00:80:C8:35:52:78 Toaster No Headset 0 +00:0B:9E:11:74:A5 Hello II Plus Yes Headset 1 +00:0F:86:0E:AE:42 Daves Blackberry Yes Phone 7 + +This is a list of all bluetooth devices seen and whether or not they are usable with chan_mobile. +The Address field contains the 'bd address' of the device. This is like an ethernet mac address. +The Name field is whatever is configured into the device as its name. +The Usable field tells you whether or not the device supports the Bluetooth Handsfree Profile or Headset profile. +The Type field tells you whether the device is usable as a Phone line (FXO) or a headset (FXS) +The Port field is the number to put in the configuration file. + +Choose which device(s) you want to use and edit /etc/asterisk/mobile.conf. There is a sample included +with the Asterisk-addons source under configs/mobile.conf.sample. + +Be sure to configure the right bd address and port number from the search. If you want inbound +calls on a device to go to a specific context, add a context= line, otherwise the default will +be used. The 'id' of the device [bitinbrackets] can be anything you like, just make it unique. + +If you are configuring a Headset be sure to include the type=headset line, if left out it defaults +to phone. + +The CLI command 'mobile show devices' can be used at any time to show the status of configured devices, +and whether or not the device is capable of sending / receiving SMS via bluetooth. + +*CLI> mobile show devices +ID Address Group Adapter Connected State SMS +headset 00:0B:9E:11:AE:C6 0 blue No Init No +LGTU550 00:E0:91:7F:46:44 1 dlink No Init No +*CLI> + +As each phone is connected you will see a message on the Asterisk console :- + + Loaded chan_mobile.so => (Bluetooth Mobile Device Channel Driver) + -- Bluetooth Device blackberry has connected. + -- Bluetooth Device dave has connected. + +To make outbound calls, add something to you Dialplan like the following :- (modify to suit) + +; Calls via LGTU5500 +exten => _9X.,1,Dial(Mobile/LGTU550/${EXTEN:1},45) +exten => _9X.,n,Hangup + +To use channel groups, add an entry to each phones definition in mobile.conf like group=n +where n is a number. + +Then if you do something like Dial(Mobile/g1/123456) Asterisk will dial 123456 on the first +connected free phone in group 1. + +Phones which do not have a specific 'group=n' will be in group 0. + + +To dial out on a headset, you need to use some other mechanism, because the headset is not likely +to have all the needed buttons on it. res_clioriginate is good for this :- + +*CLI> originate Mobile/headset extension NNNNN at context + +This will call your headset, once you answer, Asterisk will call NNNNN at context context + +Dialplan hints :- + +chan_mobile supports 'device status' so you can do somthing like + +exten => 1234,hint,SIP/30&Mobile/dave&Mobile/blackberry + + +MobileStatus Application :- + +chan_mobile also registers an application named MobileStatus. You can use this in your Dialplan +to determine the 'state' of a device. + +For example, suppose you wanted to call dave's extension, but only if he was in the office. You could +test to see if his mobile phone was attached to Asterisk, if it is dial his extension, otherwise dial his +mobile phone. + +exten => 40,1,MobileStatus(dave,DAVECELL) +exten => 40,2,GotoIf($["${DAVECELL}" = "1"]?3:5) +exten => 40,3,Dial(ZAP/g1/0427466412,45,tT) +exten => 40,4,Hangup +exten => 40,5,Dial(SIP/40,45,tT) +exten => 40,6,Hangup + +MobileStatus sets the value of the given variable to :- + +1 = Disconnected. i.e. Device not in range of Asterisk, or turned off etc etc +2 = Connected and Not on a call. i.e. Free +3 = Connected and on a call. i.e. Busy + + +SMS Sending / Receiving + +If Asterisk has detected your mobile phone is capable of SMS via bluetooth, you will be able to send and +receive SMS. + +Incoming SMS's cause Asterisk to create an inbound call to the context you defined in mobile.conf or the default +context if you did not define one. The call will start at extension 'sms'. Two channel variables will be available, +SMSSRC = the number of the originator of the SMS and SMSTXT which is the text of the SMS. +This is not a voice call, so grab the values of the variables and hang the call up. + +So, to handle incoming SMS's, do something like the following in your dialplan + +[incoming-mobile] +exten => sms,1,Verbose(Incoming SMS from ${SMSSRC} ${SMSTXT}) +exten => sms,n,Hangup() + +The above will just print the message on the console. + +If you use res_jabber, you could do something like this :- + +[incoming-mobile] +exten => sms,1,JabberSend(transport,user at jabber.somewhere.com,SMS from ${SMSRC} ${SMSTXT}) +exten => sms,2,Hangup() + +To send an SMS, use the application MobileSendSMS like the following :- + +exten => 99,1,MobileSendSMS(dave,0427123456,Hello World) + +This will send 'Hello World' via device 'dave' to '0427123456' + + +DTMF Debouncing :- + +DTMF detection varies from phone to phone. There is a configuration variable that allows you to tune +this to your needs. e.g. in mobile.conf + +[LGTU550] +address=00:12:56:90:6E:00 +port=4 +context=incoming-mobile +dtmfskip=50 + +change dtmfskip to suit your phone. The default is 200. The larger the number, the more chance of missed DTMF. +The smaller the number the more chance of multiple digits being detected. + + +Debugging :- + +Different phone manufacturers have different interpretations of the Bluetooth Handsfree Profile Spec. +This means that not all phones work the same way, particularly in the connection setup / initialisation +sequence. I've tried to make chan_mobile as general as possible, but it may need modification to +support some phone i've never tested. + +Some phones, most notably Sony Ericsson 'T' series, dont quite conform to the Bluetooth HFP spec. +chan_mobile will detect these and adapt accordingly. The T-610 and T-630 have been tested and +work fine. + +If your phone doesnt behave has expected, turn on Asterisk debugging with 'core set debug 1'. + +This will log a bunch of debug messages indicating what the phone is doing, importantly the rfcomm +conversation between Asterisk and the phone. This can be used to sort out what your phone is doing +and make chan_mobile support it. + +Be aware also, that just about all mobile phones behave differently. For example my LG TU500 wont dial unless +the phone is a the 'idle' screen. i.e. if the phone is showing a 'menu' on the display, when you dial via +Asterisk, the call will not work. chan_mobile handles this, but there may be other phones that do +other things too... + +Important: Watch what your mobile phone is doing the first few times. Asterisk wont make random calls but +if chan_mobile fails to hangup for some reason and you get a huge bill from your telco, dont blame me ;) + + +Feedback, Support, Please can you make Mobile Phone X work... etc :- + +as always, bugs should be reported at http://bugs.digium.com + +email me at david.bowerman at gmail.com or dseeb_ on #asterisk & #asterisk-dev irc. diff --git a/makeopts.in b/makeopts.in index 3bf203e..9e99a6f 100644 --- a/makeopts.in +++ b/makeopts.in @@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@ ASOUND_INCLUDE=@ALSA_INCLUDE@ ASOUND_LIB=@ALSA_LIB@ +BLUETOOTH_LIB=@BLUETOOTH_LIB@ +BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@ + CURL_INCLUDE=@CURL_INCLUDE@ CURL_LIB=@CURL_LIB@ -- 1.5.5.2 0006-Use-pkgconfig-to-check-for-Lua.patch: --- NEW FILE 0006-Use-pkgconfig-to-check-for-Lua.patch --- >From e7c5d20c24e3d18954212c484cd015be14de2e1e Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 13:14:23 -0600 Subject: [PATCH] Use pkgconfig to check for Lua. --- configure.ac | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 422981b..b8c093c 100644 --- a/configure.ac +++ b/configure.ac @@ -1331,9 +1331,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then [${PWLIB_INCLUDE}], [${PWLIB_LIB}]) fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" -AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) +PBX_LUA=0 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + AC_DEFINE([HAVE_LUA], 1, [Define if your system has the LUA libraries.]) +fi AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) -- 1.5.5.2 0007-Build-using-external-libedit.patch: --- NEW FILE 0007-Build-using-external-libedit.patch --- >From 23c345241390d5aa577421abfb7e36aa6f3a343e Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Tue, 25 Mar 2008 00:50:27 -0500 Subject: [PATCH] Build using external libedit. --- build_tools/menuselect-deps.in | 1 + configure.ac | 22 ++++++++++++++++++++++ main/Makefile | 7 ++++--- main/cli.c | 3 ++- makeopts.in | 4 ++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 97822e6..e51279b 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -16,6 +16,7 @@ ISDNNET=@PBX_ISDNNET@ IXJUSER=@PBX_IXJUSER@ JACK=@PBX_JACK@ LDAP=@PBX_LDAP@ +LIBEDIT=@PBX_LIBEDIT@ LTDL=@PBX_LTDL@ LUA=@PBX_LUA@ MISDN=@PBX_MISDN@ diff --git a/configure.ac b/configure.ac index b8c093c..c72e9c2 100644 --- a/configure.ac +++ b/configure.ac @@ -220,6 +220,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap]) AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack]) AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap]) +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit]) AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn]) @@ -1568,6 +1569,27 @@ AC_SUBST(PBX_GTK2) AC_SUBST(GTK2_INCLUDE) AC_SUBST(GTK2_LIB) +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + AC_CHECK_TOOL(PKGCONFIG, pkg-config, no) + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.]) + fi + fi +fi +AC_SUBST(PBX_LIBEDIT) +AC_SUBST(LIBEDIT_INCLUDE) +AC_SUBST(LIBEDIT_LIB) +AC_SUBST(LIBEDIT_OBJ) + if test "${USE_CURL}" != "no"; then AC_PATH_TOOL([CURL_CONFIG], [curl-config], No) if test ! x"${CURL_CONFIG}" = xNo; then diff --git a/main/Makefile b/main/Makefile index 976c37b..09c5eb6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -133,6 +133,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE) ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: ASTCFLAGS+=$(GMIME_INCLUDE) @@ -166,13 +167,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) GMIMELDFLAGS+=$(GMIME_LIB) endif -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) endif $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ diff --git a/main/cli.c b/main/cli.c index 11d6671..dce7950 100644 --- a/main/cli.c +++ b/main/cli.c @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include +#include + #include "asterisk/cli.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" @@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/app.h" #include "asterisk/lock.h" -#include "editline/readline/readline.h" #include "asterisk/threadstorage.h" /*! diff --git a/makeopts.in b/makeopts.in index 9e99a6f..b8a4ab6 100644 --- a/makeopts.in +++ b/makeopts.in @@ -235,3 +235,7 @@ TINFO_DIR=@TINFO_DIR@ # if poll is not present, let the makefile know. POLL_AVAILABLE=@HAS_POLL@ + +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@ +LIBEDIT_LIB=@LIBEDIT_LIB@ +LIBEDIT_OBJ=@LIBEDIT_OBJ@ -- 1.5.5.2 0008-Update-cdr_tds-to-latest.patch: --- NEW FILE 0008-Update-cdr_tds-to-latest.patch --- >From 56f5144dca1f95b75d78f4fa0ce8e1048a119fc6 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 2 Jul 2008 10:15:41 -0500 Subject: [PATCH] Update cdr_tds to latest. --- UPGRADE.txt | 3 + cdr/cdr_tds.c | 462 +++++++++++++++++++------------------- configure.ac | 29 +--- doc/tex/freetds.tex | 20 +-- include/asterisk/autoconfig.h.in | 3 - 5 files changed, 238 insertions(+), 279 deletions(-) diff --git a/UPGRADE.txt b/UPGRADE.txt index 70a0f81..d5e97a1 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -123,6 +123,9 @@ CDR: username and password parameters in cdr_odbc.conf, therefore, are no longer used. The dsn parameter now points to an entry in res_odbc.conf. +* The cdr_tds module now supports all versions of FreeTDS that contain + the db-lib frontend. + Formats: * format_wav: The GAIN preprocessor definition and source code that used it diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 9d322fd..8654c80 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -66,72 +66,76 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include - #include "asterisk/config.h" #include "asterisk/channel.h" #include "asterisk/cdr.h" #include "asterisk/module.h" -#ifdef FREETDS_PRE_0_62 -#warning "You have older TDS, you should upgrade!" -#endif +#include +#include #define DATE_FORMAT "%Y/%m/%d %T" -static char *name = "mssql"; +static char *name = "FreeTDS (MSSQL)"; static char *config = "cdr_tds.conf"; -static char *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL, *charset = NULL, *language = NULL; -static char *table = NULL; - -static int connected = 0; +struct cdr_tds_config { + AST_DECLARE_STRING_FIELDS( + AST_STRING_FIELD(hostname); + AST_STRING_FIELD(database); + AST_STRING_FIELD(username); + AST_STRING_FIELD(password); + AST_STRING_FIELD(table); + AST_STRING_FIELD(charset); + AST_STRING_FIELD(language); + ); + DBPROCESS *dbproc; + unsigned int connected:1; +}; AST_MUTEX_DEFINE_STATIC(tds_lock); -static TDSSOCKET *tds; -static TDSLOGIN *login; -static TDSCONTEXT *context; +static struct cdr_tds_config *settings; static char *anti_injection(const char *, int); -static void get_date(char *, struct timeval); +static void get_date(char *, size_t len, struct timeval); static int mssql_connect(void); static int mssql_disconnect(void); static int tds_log(struct ast_cdr *cdr) { - char sqlcmd[2048], start[80], answer[80], end[80]; + char start[80], answer[80], end[80]; char *accountcode, *src, *dst, *dcontext, *clid, *channel, *dstchannel, *lastapp, *lastdata, *uniqueid; - int res = 0; - int retried = 0; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif + RETCODE erc; + int res = -1; + + accountcode = anti_injection(cdr->accountcode, 20); + src = anti_injection(cdr->src, 80); + dst = anti_injection(cdr->dst, 80); + dcontext = anti_injection(cdr->dcontext, 80); + clid = anti_injection(cdr->clid, 80); + channel = anti_injection(cdr->channel, 80); + dstchannel = anti_injection(cdr->dstchannel, 80); + lastapp = anti_injection(cdr->lastapp, 80); + lastdata = anti_injection(cdr->lastdata, 80); + uniqueid = anti_injection(cdr->uniqueid, 32); + + get_date(start, sizeof(start), cdr->start); + get_date(answer, sizeof(answer), cdr->answer); + get_date(end, sizeof(end), cdr->end); ast_mutex_lock(&tds_lock); - memset(sqlcmd, 0, 2048); + /* Ensure that we are connected */ + if (!settings->connected) { + if (mssql_connect()) { + /* Connect failed */ + goto done; + } + } - accountcode = anti_injection(cdr->accountcode, 20); - src = anti_injection(cdr->src, 80); - dst = anti_injection(cdr->dst, 80); - dcontext = anti_injection(cdr->dcontext, 80); - clid = anti_injection(cdr->clid, 80); - channel = anti_injection(cdr->channel, 80); - dstchannel = anti_injection(cdr->dstchannel, 80); - lastapp = anti_injection(cdr->lastapp, 80); - lastdata = anti_injection(cdr->lastdata, 80); - uniqueid = anti_injection(cdr->uniqueid, 32); - - get_date(start, cdr->start); - get_date(answer, cdr->answer); - get_date(end, cdr->end); - - sprintf( - sqlcmd, + erc = dbfcmd(settings->dbproc, "INSERT INTO %s " "(" "accountcode, " @@ -172,7 +176,7 @@ static int tds_log(struct ast_cdr *cdr) "'%s', " /* amaflags */ "'%s'" /* uniqueid */ ")", - table, + settings->table, accountcode, src, dst, @@ -192,27 +196,26 @@ static int tds_log(struct ast_cdr *cdr) uniqueid ); - do { - if (!connected) { - if (mssql_connect()) - ast_log(LOG_ERROR, "Failed to reconnect to SQL database.\n"); - else - ast_log(LOG_WARNING, "Reconnected to SQL database.\n"); + if (erc == FAIL) { + ast_log(LOG_ERROR, "Failed to build INSERT statement, no CDR was logged.\n"); + goto done; + } - retried = 1; /* note that we have now tried */ - } + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Failed to execute INSERT statement, no CDR was logged.\n"); + goto done; + } -#ifdef FREETDS_PRE_0_62 - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Failed to insert Call Data Record into SQL database.\n"); + /* Consume any results we might get back (this is more of a sanity check than + * anything else, since an INSERT shouldn't return results). */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); + } - mssql_disconnect(); /* this is ok even if we are already disconnected */ - } - } while (!connected && !retried); + res = 0; + +done: + ast_mutex_unlock(&tds_lock); ast_free(accountcode); ast_free(src); @@ -225,285 +228,252 @@ static int tds_log(struct ast_cdr *cdr) ast_free(lastdata); ast_free(uniqueid); - ast_mutex_unlock(&tds_lock); - return res; } static char *anti_injection(const char *str, int len) { /* Reference to http://www.nextgenss.com/papers/advanced_sql_injection.pdf */ - char *buf; char *buf_ptr, *srh_ptr; char *known_bad[] = {"select", "insert", "update", "delete", "drop", ";", "--", "\0"}; int idx; - if ((buf = ast_malloc(len + 1)) == NULL) - { - ast_log(LOG_ERROR, "cdr_tds: Out of memory error\n"); + if (!(buf = ast_calloc(1, len + 1))) { + ast_log(LOG_ERROR, "Out of memory\n"); return NULL; } - memset(buf, 0, len); buf_ptr = buf; /* Escape single quotes */ - for (; *str && strlen(buf) < len; str++) - { - if (*str == '\'') + for (; *str && strlen(buf) < len; str++) { + if (*str == '\'') { *buf_ptr++ = '\''; + } *buf_ptr++ = *str; } *buf_ptr = '\0'; /* Erase known bad input */ - for (idx=0; *known_bad[idx]; idx++) - { - while((srh_ptr = strcasestr(buf, known_bad[idx]))) - { - memmove(srh_ptr, srh_ptr+strlen(known_bad[idx]), strlen(srh_ptr+strlen(known_bad[idx]))+1); + for (idx = 0; *known_bad[idx]; idx++) { + while ((srh_ptr = strcasestr(buf, known_bad[idx]))) { + memmove(srh_ptr, srh_ptr + strlen(known_bad[idx]), strlen(srh_ptr + strlen(known_bad[idx])) + 1); } } return buf; } -static void get_date(char *dateField, struct timeval tv) +static void get_date(char *dateField, size_t len, struct timeval tv) { - struct ast_tm tm; - char buf[80]; - /* To make sure we have date variable if not insert null to SQL */ - if (!ast_tvzero(tv)) - { + if (!ast_tvzero(tv)) { + struct ast_tm tm; ast_localtime(&tv, &tm, NULL); - ast_strftime(buf, 80, DATE_FORMAT, &tm); - sprintf(dateField, "'%s'", buf); - } - else - { - strcpy(dateField, "null"); + ast_strftime(dateField, len, "'" DATE_FORMAT "'", &tm); + } else { + ast_copy_string(dateField, "null", len); } } static int mssql_disconnect(void) { - if (tds) { - tds_free_socket(tds); - tds = NULL; + if (settings->dbproc) { + dbclose(settings->dbproc); + settings->dbproc = NULL; } - if (context) { - tds_free_context(context); - context = NULL; - } - - if (login) { - tds_free_login(login); - login = NULL; - } - - connected = 0; + settings->connected = 0; return 0; } static int mssql_connect(void) { -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - TDSCONNECTION *connection = NULL; -#else - TDSCONNECTINFO *connection = NULL; -#endif - char query[128]; - - /* Connect to M$SQL Server */ - if (!(login = tds_alloc_login())) - { - ast_log(LOG_ERROR, "tds_alloc_login() failed.\n"); + LOGINREC *login; + + if ((login = dblogin()) == NULL) { + ast_log(LOG_ERROR, "Unable to allocate login structure for db-lib\n"); return -1; } - - tds_set_server(login, hostname); - tds_set_user(login, dbuser); - tds_set_passwd(login, password); - tds_set_app(login, "TSQL"); - tds_set_library(login, "TDS-Library"); -#ifndef FREETDS_PRE_0_62 - tds_set_client_charset(login, charset); -#endif - tds_set_language(login, language); - tds_set_packet(login, 512); - tds_set_version(login, 7, 0); - -#ifdef FREETDS_0_64 - if (!(context = tds_alloc_context(NULL))) -#else - if (!(context = tds_alloc_context())) -#endif - { - ast_log(LOG_ERROR, "tds_alloc_context() failed.\n"); - goto connect_fail; + + DBSETLAPP(login, "TSQL"); + DBSETLUSER(login, (char *) settings->username); + DBSETLPWD(login, (char *) settings->password); + DBSETLCHARSET(login, (char *) settings->charset); + DBSETLNATLANG(login, (char *) settings->language); + + if ((settings->dbproc = dbopen(login, (char *) settings->hostname)) == NULL) { + ast_log(LOG_ERROR, "Unable to connect to %s\n", settings->hostname); + dbloginfree(login); + return -1; } - if (!(tds = tds_alloc_socket(context, 512))) { - ast_log(LOG_ERROR, "tds_alloc_socket() failed.\n"); - goto connect_fail; + dbloginfree(login); + + if (dbuse(settings->dbproc, (char *) settings->database) == FAIL) { + ast_log(LOG_ERROR, "Unable to select database %s\n", settings->database); + goto failed; } - tds_set_parent(tds, NULL); - connection = tds_read_config_info(tds, login, context->locale); - if (!connection) - { - ast_log(LOG_ERROR, "tds_read_config() failed.\n"); - goto connect_fail; + if (dbfcmd(settings->dbproc, "SELECT 1 FROM [%s]", settings->table) == FAIL) { + ast_log(LOG_ERROR, "Unable to build query while verifying the existence of table '%s'\n", settings->table); + goto failed; } - if (tds_connect(tds, connection) == TDS_FAIL) - { - ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n"); - tds = NULL; /* freed by tds_connect() on error */ -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - goto connect_fail; + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Unable to verify existence of table '%s'\n", settings->table); + goto failed; } -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - - sprintf(query, "USE %s", dbname); -#ifdef FREETDS_PRE_0_62 - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Could not change database (%s)\n", dbname); - goto connect_fail; + + /* Consume the result set (we don't really care about the result, though) */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); } - connected = 1; + settings->connected = 1; + return 0; -connect_fail: - mssql_disconnect(); +failed: + dbclose(settings->dbproc); + settings->dbproc = NULL; return -1; } static int tds_unload_module(void) { - mssql_disconnect(); + if (settings) { + ast_mutex_lock(&tds_lock); + mssql_disconnect(); + ast_mutex_unlock(&tds_lock); + + ast_string_field_free_memory(settings); + ast_free(settings); + } ast_cdr_unregister(name); - if (hostname) ast_free(hostname); - if (dbname) ast_free(dbname); - if (dbuser) ast_free(dbuser); - if (password) ast_free(password); - if (charset) ast_free(charset); - if (language) ast_free(language); - if (table) ast_free(table); + dbexit(); + + return 0; +} + +static int tds_error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) +{ + ast_log(LOG_ERROR, "%s (%d)\n", dberrstr, dberr); + + if (oserr != DBNOERR) { + ast_log(LOG_ERROR, "%s (%d)\n", oserrstr, oserr); + } + + return INT_CANCEL; +} + +static int tds_message_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severity, char *msgtext, char *srvname, char *procname, int line) +{ + ast_debug(1, "Msg %d, Level %d, State %d, Line %d\n", msgno, severity, msgstate, line); + ast_log(LOG_NOTICE, "%s\n", msgtext); return 0; } static int tds_load_module(int reload) { - int res = 0; struct ast_config *cfg; - struct ast_variable *var; const char *ptr = NULL; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif cfg = ast_config_load(config, config_flags); if (!cfg) { - ast_log(LOG_NOTICE, "Unable to load config for MSSQL CDR's: %s\n", config); + ast_log(LOG_NOTICE, "Unable to load TDS config for CDRs: %s\n", config); return 0; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) return 0; - var = ast_variable_browse(cfg, "global"); - if (!var) /* nothing configured */ { + if (!ast_variable_browse(cfg, "global")) { + /* nothing configured */ ast_config_destroy(cfg); return 0; } - + + ast_mutex_lock(&tds_lock); + + /* Clear out any existing settings */ + ast_string_field_init(settings, 0); + ptr = ast_variable_retrieve(cfg, "global", "hostname"); if (ptr) { - if (hostname) - ast_free(hostname); - hostname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database server hostname not specified.\n"); + ast_string_field_set(settings, hostname, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database server hostname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "dbname"); if (ptr) { - if (dbname) - ast_free(dbname); - dbname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbname not specified.\n"); + ast_string_field_set(settings, database, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "user"); if (ptr) { - if (dbuser) - ast_free(dbuser); - dbuser = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbuser not specified.\n"); + ast_string_field_set(settings, username, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbuser not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "password"); if (ptr) { - if (password) - ast_free(password); - password = ast_strdup(ptr); - } else - ast_log(LOG_ERROR,"Database password not specified.\n"); + ast_string_field_set(settings, password, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database password not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "charset"); - if (charset) - ast_free(charset); - if (ptr) - charset = ast_strdup(ptr); - else - charset = ast_strdup("iso_1"); - - if (language) - ast_free(language); + if (ptr) { + ast_string_field_set(settings, charset, ptr); + } else { + ast_string_field_set(settings, charset, "iso_1"); + } + ptr = ast_variable_retrieve(cfg, "global", "language"); - if (ptr) - language = ast_strdup(ptr); - else - language = ast_strdup("us_english"); + if (ptr) { + ast_string_field_set(settings, language, ptr); + } else { + ast_string_field_set(settings, language, "us_english"); + } ptr = ast_variable_retrieve(cfg, "global", "table"); - if (ptr == NULL) { - ast_debug(1, "cdr_tds: table not specified. Assuming cdr\n"); - ptr = "cdr"; + if (ptr) { + ast_string_field_set(settings, table, ptr); + } else { + ast_log(LOG_NOTICE, "Table name not specified, using 'cdr' by default.\n"); + ast_string_field_set(settings, table, "cdr"); + } + + mssql_disconnect(); + + if (mssql_connect()) { + /* We failed to connect (mssql_connect takes care of logging it) */ + goto failed; } - if (table) - ast_free(table); - table = ast_strdup(ptr); + ast_mutex_unlock(&tds_lock); ast_config_destroy(cfg); - ast_mutex_lock(&tds_lock); - mssql_disconnect(); - mssql_connect(); + return 1; + +failed: ast_mutex_unlock(&tds_lock); + ast_config_destroy(cfg); - return res; + return 0; } static int reload(void) @@ -513,9 +483,35 @@ static int reload(void) static int load_module(void) { - if (!tds_load_module(0)) + if (dbinit() == FAIL) { + ast_log(LOG_ERROR, "Failed to initialize FreeTDS db-lib\n"); return AST_MODULE_LOAD_DECLINE; + } + + dberrhandle(tds_error_handler); + dbmsghandle(tds_message_handler); + + settings = ast_calloc(1, sizeof(*settings)); + + if (!settings || ast_string_field_init(settings, 256)) { + if (settings) { + ast_free(settings); + settings = NULL; + } + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + + if (!tds_load_module(0)) { + ast_string_field_free_memory(settings); + ast_free(settings); + settings = NULL; + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + ast_cdr_register(name, ast_module_info->description, tds_log); + return AST_MODULE_LOAD_SUCCESS; } @@ -524,7 +520,7 @@ static int unload_module(void) return tds_unload_module(); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MSSQL CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, diff --git a/configure.ac b/configure.ac index c72e9c2..6c692f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1376,34 +1376,7 @@ fi AST_EXT_TOOL_CHECK([GMIME], [gmime]) -AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h]) -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi +AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h]) AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], []) diff --git a/doc/tex/freetds.tex b/doc/tex/freetds.tex index 8dcbec2..8db589f 100644 --- a/doc/tex/freetds.tex +++ b/doc/tex/freetds.tex @@ -1,16 +1,6 @@ -The cdr\_tds module is NOT compatible with version 0.63 of FreeTDS. - -The cdr\_tds module is known to work with FreeTDS version 0.62.1; -it should also work with 0.62.2, 0.62.3 and 0.62.4, which are bug -fix releases. - -The cdr\_tds module uses the raw "libtds" API of FreeTDS. It appears -that from 0.63 onwards, this is not considered a published API -of FreeTDS and is subject to change without notice. - -Between 0.62.x and 0.63 of FreeTDS, many incompatible changes -have been made to the libtds API. - -For newer versions of FreeTDS, it is recommended that you use the -ODBC driver. +The cdr\_tds module now works with most modern release versions of FreeTDS (from +at least 0.60 through 0.82). Although versions of FreeTDS prior to 0.82 will +work, we recommend using the latest available version for performance and +stability reasons. +The latest release of FreeTDS is available from http://www.freetds.org/ diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index b368c8d..3a76722 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1193,9 +1193,6 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 0009-Merged-revisions-123952-via-svnmerge-from.patch: --- NEW FILE 0009-Merged-revisions-123952-via-svnmerge-from.patch --- >From 7f4f8b28cddd114b43edf266a5b599aa415d1154 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 19 Jun 2008 17:23:22 +0000 Subject: [PATCH] Merged revisions 123952 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r123952 | tilghman | 2008-06-19 12:22:27 -0500 (Thu, 19 Jun 2008) | 6 lines Don't change pointers that need to be later passed back for deallocation. (closes issue #12572) Reported by: flyn Patches: 20080613__bug12572.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 123958 614ede4d-c843-0410-af14-a771ab80d22e --- res/res_config_ldap.c | 85 +++++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 41 deletions(-) diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 33ed247..15a6827 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -282,33 +282,36 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); /* these are freed at the end */ if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; - ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, value->bv_val); + valptr = value->bv_val; + ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, valptr); if (is_realmed_password_attribute) { - if (!strncasecmp(value->bv_val, "{md5}", 5)) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (!strncasecmp(valptr, "{md5}", 5)) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { /* ok, so looping through all delimited values except the last one (not, last character is not delimited...) */ if (is_delimited) { i = 0; pos = 0; - while (!ast_strlen_zero(value->bv_val + i)) { - if (value->bv_val[i] == ';'){ - value->bv_val[i] = '\0'; + while (!ast_strlen_zero(valptr + i)) { + if (valptr[i] == ';'){ + valptr[i] = '\0'; if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } pos = i + 1; } @@ -317,15 +320,14 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config } /* for the last delimited value or if the value is not delimited: */ if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } } - v++; } ldap_value_free_len(values); } @@ -400,23 +402,26 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; + valptr = value->bv_val; if (is_realmed_password_attribute) { - if (strncasecmp(value->bv_val, "{md5}", 5) == 0) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (strncasecmp(valptr, "{md5}", 5) == 0) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { if (delim_value == NULL && !is_realmed_password_attribute && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0)) { - delim_value = ast_strdup(value->bv_val); + delim_value = ast_strdup(valptr); if ((delim_tot_count = semicolon_count_str(delim_value)) > 0) { ast_debug(4, "LINE(%d) is delimited %d times: %s\n", __LINE__, delim_tot_count, delim_value); @@ -426,11 +431,10 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf if (is_delimited != 0 && !is_realmed_password_attribute - && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ){ + && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ) { /* for non-Static RealTime, first */ - i = pos; - while (!ast_strlen_zero(value->bv_val + i)) { + for (i = pos; !ast_strlen_zero(valptr + i); i++) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); if (delim_value[i] == ';') { delim_value[i] = '\0'; @@ -451,9 +455,8 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf break; } } - i++; } - if (ast_strlen_zero(value->bv_val + i)) { + if (ast_strlen_zero(valptr + i)) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d delim_count: %d\n", __LINE__, pos, i, delim_count); /* Last delimited value */ ast_debug(4, "LINE(%d) DELIM - attribute_name: %s value: %s pos: %d\n", __LINE__, attribute_name, &delim_value[pos], pos); @@ -468,9 +471,9 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf /* Remembering to free memory */ is_delimited = 0; pos = 0; - free(delim_value); - delim_value = NULL; } + free(delim_value); + delim_value = NULL; ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); } else { @@ -479,20 +482,19 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf free(delim_value); delim_value = NULL; } - ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, value->bv_val); + ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, valptr); if (prev) { - prev->next = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev->next = ast_variable_new(attribute_name, valptr, table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev = var = ast_variable_new(attribute_name, valptr, table_config->table_name); } } } - v++; - } /*!< while(*v) */ + } /*!< for (v = values; *v; v++) */ ldap_value_free_len(values); }/*!< if (values) */ ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber); @@ -1459,10 +1461,11 @@ int parse_config(void) static_table_config = table_config; } for (; var; var = var->next) { - if (!strcasecmp(var->name, "additionalFilter")) - table_config->additional_filter = strdup(var->value); - else + if (!strcasecmp(var->name, "additionalFilter")) { + table_config->additional_filter = ast_strdup(var->value); + } else { ldap_table_config_add_attribute(table_config, var->name, var->value); + } } } } -- 1.5.5.2 0010-Merged-revisions-132778-via-svnmerge-from.patch: --- NEW FILE 0010-Merged-revisions-132778-via-svnmerge-from.patch --- >From 56da7591f2d9b11f5f5d2ed2b7e4785d955d172b Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 22 Jul 2008 21:55:06 +0000 Subject: [PATCH] Merged revisions 132778 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r132778 | tilghman | 2008-07-22 16:53:40 -0500 (Tue, 22 Jul 2008) | 18 lines Merged revisions 132713 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r132713 | tilghman | 2008-07-22 16:19:39 -0500 (Tue, 22 Jul 2008) | 10 lines Merged revisions 132711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r132711 | tilghman | 2008-07-22 16:14:10 -0500 (Tue, 22 Jul 2008) | 2 lines Fixes for AST-2008-010 and AST-2008-011 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 132780 614ede4d-c843-0410-af14-a771ab80d22e --- channels/chan_iax2.c | 31 +++++++++++++++++++++++++++++-- configs/iax.conf.sample | 10 ++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index abdad2d..125e087 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -275,6 +275,7 @@ enum iax2_flags { IAX_DELAYPBXSTART = (1 << 25), /*!< Don't start a PBX on the channel until the peer sends us a response, so that we've achieved a three-way handshake with them before sending voice or anything else*/ + IAX_ALLOWFWDOWNLOAD = (1 << 26), /*!< Allow the FWDOWNL command? */ }; static int global_rtautoclear = 120; @@ -1647,10 +1648,10 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s snprintf(host, sizeof(host), "%s:%d", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); now = ast_tvnow(); - start = 1 + (ast_random() % (TRUNK_CALL_START - 1)); + start = 2 + (ast_random() % (TRUNK_CALL_START - 1)); for (x = start; 1; x++) { if (x == TRUNK_CALL_START) { - x = 0; + x = 1; continue; } @@ -3389,6 +3390,15 @@ struct parsed_dial_string { char *options; }; +static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno) +{ + struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno), + .ts = htonl(ts), .iseqno = seqno, .oseqno = seqno, .type = AST_FRAME_IAX, + .csub = compress_subclass(command) }; + + return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin)); +} + /*! * \brief Parses an IAX dial string into its component parts. * \param data the string to be parsed @@ -7935,6 +7945,17 @@ static int socket_process(struct iax2_thread *thread) } else { f.subclass = uncompress_subclass(fh->csub); } + + /* Deal with POKE/PONG without allocating a callno */ + if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) { + /* Reply back with a PONG, but don't care about the result. */ + send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->oseqno); + return 1; + } else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) { + /* Ignore */ + return 1; + } + if ((f.frametype == AST_FRAME_IAX) && ((f.subclass == IAX_COMMAND_NEW) || (f.subclass == IAX_COMMAND_REGREQ) || (f.subclass == IAX_COMMAND_POKE) || (f.subclass == IAX_COMMAND_FWDOWNL) || (f.subclass == IAX_COMMAND_REGREL))) @@ -9235,6 +9256,10 @@ retryowner2: break; case IAX_COMMAND_FWDOWNL: /* Firmware download */ + if (!ast_test_flag(&globalflags, IAX_ALLOWFWDOWNLOAD)) { + send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_UNSUPPORT, 0, NULL, 0, -1); + break; + } memset(&ied0, 0, sizeof(ied0)); res = iax_firmware_append(&ied0, (unsigned char *)ies.devicetype, ies.fwdesc); if (res < 0) @@ -10878,6 +10903,8 @@ static int set_config(char *config_file, int reload) ast_set2_flag((&globalflags), ast_true(v->value), IAX_FORCEJITTERBUF); else if (!strcasecmp(v->name, "delayreject")) delayreject = ast_true(v->value); + else if (!strcasecmp(v->name, "allowfwdownload")) + ast_set2_flag((&globalflags), ast_true(v->value), IAX_ALLOWFWDOWNLOAD); else if (!strcasecmp(v->name, "rtcachefriends")) ast_set2_flag((&globalflags), ast_true(v->value), IAX_RTCACHEFRIENDS); else if (!strcasecmp(v->name, "rtignoreregexpire")) diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index 2441f2c..854a243 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -264,6 +264,16 @@ autokill=yes ; The default value is 'host' ; ;codecpriority=host +; +; allowfwdownload controls whether this host will serve out firmware to +; IAX clients which request it. This has only been used for the IAXy, +; and it has been recently proven that this firmware distribution method +; can be used as a source of traffic amplification attacks. Also, the +; IAXy firmware has not been updated for at least 18 months, so unless +; you are provisioning IAXys in a secure network, we recommend that you +; leave this option to the default, off. +; +;allowfwdownload=yes ;rtcachefriends=yes ; Cache realtime friends by adding them to the internal list ; just like friends added from the config file only on a -- 1.5.5.2 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch: --- NEW FILE 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch --- >From d4666a37474b4edcfa131bc65724bb159a06d713 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 30 Jul 2008 09:33:10 -0500 Subject: [PATCH] Replace app_rxfax/app_txfax with app_fax pulled from upstream SVN. Merged the following commits into this one: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 119796 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 119800 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 119802 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 120566 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 129007 Once a new beta of 1.6.0 is released this patch can be dropped. --- apps/app_fax.c | 741 ++++++++++++++++++++++++++++++++++++++ build_tools/menuselect-deps.in | 1 + configure.ac | 14 + include/asterisk/autoconfig.h.in | 6 + makeopts.in | 3 + 5 files changed, 765 insertions(+), 0 deletions(-) create mode 100644 apps/app_fax.c diff --git a/apps/app_fax.c b/apps/app_fax.c new file mode 100644 index 0000000..6d98755 --- /dev/null +++ b/apps/app_fax.c @@ -0,0 +1,741 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Simple fax applications + * + * 2007-2008, Dmitry Andrianov + * + * Code based on original implementation by Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + * + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/module.h" +#include "asterisk/manager.h" + +static char *app_sndfax_name = "SendFAX"; +static char *app_sndfax_synopsis = "Send a FAX"; +static char *app_sndfax_desc = +" SendFAX(filename[|options]):\n" +"Send a given TIFF file to the channel as a FAX.\n" +"The option string may contain zero or more of the following characters:\n" +" 'a' -- makes the application behave as an answering machine\n" +" The default behaviour is to behave as a calling machine.\n" +"\n" +"This application uses following variables:\n" +" LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"\n" +"This application sets the following channel variables upon completion:\n" +" FAXSTATUS - status of operation:\n" +" SUCCESS | FAILED\n" +" FAXERROR - Error when FAILED\n" +" REMOTESTATIONID - CSID of the remote side.\n" +" FAXPAGES - number of pages sent.\n" +" FAXBITRATE - transmition rate.\n" +" FAXRESOLUTION - resolution.\n" +"\n" +"Returns -1 in case of user hang up or any channel error.\n" +"Returns 0 on success.\n"; + +static char *app_rcvfax_name = "ReceiveFAX"; +static char *app_rcvfax_synopsis = "Receive a FAX"; +static char *app_rcvfax_desc = +" ReceiveFAX(filename[|options]):\n" +"Receives a fax from the channel into the given filename overwriting\n" +"the file if it already exists. File created will have TIFF format.\n" +"The option string may contain zero or more of the following characters:\n" +" 'c' -- makes the application behave as a calling machine\n" +" The default behaviour is to behave as an answering machine.\n" +"\n" +"This application uses following variables:\n" +" LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"\n" +"This application sets the following channel variables upon completion:\n" +" FAXSTATUS - status of operation:\n" +" SUCCESS | FAILED\n" +" FAXERROR - Error when FAILED\n" +" REMOTESTATIONID - CSID of the remote side.\n" +" FAXPAGES - number of pages sent.\n" +" FAXBITRATE - transmition rate.\n" +" FAXRESOLUTION - resolution.\n" +"\n" +"Returns -1 in case of user hang up or any channel error.\n" +"Returns 0 on success.\n"; + +#define MAX_SAMPLES 240 + +/* Watchdog. I have seen situations when remote fax disconnects (because of poor line + quality) while SpanDSP continues staying in T30_STATE_IV_CTC state forever. + To avoid this, we terminate when we see that T30 state does not change for 5 minutes. + We also terminate application when more than 30 minutes passed regardless of + state changes. This is just a precaution measure - no fax should take that long */ + +#define WATCHDOG_TOTAL_TIMEOUT 30 * 60 +#define WATCHDOG_STATE_TIMEOUT 5 * 60 + +typedef struct { + struct ast_channel *chan; + enum ast_t38_state t38state; /* T38 state of the channel */ + int direction; /* Fax direction: 0 - receiving, 1 - sending */ + int caller_mode; + char *file_name; + + volatile int finished; +} fax_session; + +static void span_message(int level, const char *msg) +{ + if (level == SPAN_LOG_ERROR) { + ast_log(LOG_ERROR, "%s", msg); + } else if (level == SPAN_LOG_WARNING) { + ast_log(LOG_WARNING, "%s", msg); + } else { + ast_log(LOG_DEBUG, "%s", msg); + } +} + +static int t38_tx_packet_handler(t38_core_state_t *s, void *user_data, const uint8_t *buf, int len, int count) +{ + struct ast_channel *chan = (struct ast_channel *) user_data; + + struct ast_frame outf = { + .frametype = AST_FRAME_MODEM, + .subclass = AST_MODEM_T38, + .src = __FUNCTION__, + }; + + /* TODO: Asterisk does not provide means of resending the same packet multiple + times so count is ignored at the moment */ + + AST_FRAME_SET_BUFFER(&outf, buf, 0, len); + + if (ast_write(chan, &outf) < 0) { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + return -1; + } + + return 0; +} + +static void phase_e_handler(t30_state_t *f, void *user_data, int result) +{ + const char *local_ident; + const char *far_ident; + char buf[20]; + fax_session *s = (fax_session *) user_data; + t30_stats_t stat; + + ast_debug(1, "Fax phase E handler. result=%d\n", result); + + t30_get_transfer_statistics(f, &stat); + + s = (fax_session *) user_data; + + if (result != T30_ERR_OK) { + s->finished = -1; + + /* FAXSTATUS is already set to FAILED */ + pbx_builtin_setvar_helper(s->chan, "FAXERROR", t30_completion_code_to_str(result)); + + ast_log(LOG_WARNING, "Error transmitting fax. result=%d: %s.\n", result, t30_completion_code_to_str(result)); + + return; + } + + s->finished = 1; + + local_ident = t30_get_tx_ident(f); + far_ident = t30_get_rx_ident(f); + pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "SUCCESS"); + pbx_builtin_setvar_helper(s->chan, "FAXERROR", NULL); + pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", far_ident); + snprintf(buf, sizeof(buf), "%d", stat.pages_transferred); + pbx_builtin_setvar_helper(s->chan, "FAXPAGES", buf); + snprintf(buf, sizeof(buf), "%d", stat.y_resolution); + pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", buf); + snprintf(buf, sizeof(buf), "%d", stat.bit_rate); + pbx_builtin_setvar_helper(s->chan, "FAXBITRATE", buf); + + ast_debug(1, "Fax transmitted successfully.\n"); + ast_debug(1, " Remote station ID: %s\n", far_ident); + ast_debug(1, " Pages transferred: %d\n", stat.pages_transferred); + ast_debug(1, " Image resolution: %d x %d\n", stat.x_resolution, stat.y_resolution); + ast_debug(1, " Transfer Rate: %d\n", stat.bit_rate); + + manager_event(EVENT_FLAG_CALL, + s->direction ? "FaxSent" : "FaxReceived", + "Channel: %s\r\n" + "Exten: %s\r\n" + "CallerID: %s\r\n" + "RemoteStationID: %s\r\n" + "LocalStationID: %s\r\n" + "PagesTransferred: %d\r\n" + "Resolution: %d\r\n" + "TransferRate: %d\r\n" + "FileName: %s\r\n", + s->chan->name, + s->chan->exten, + S_OR(s->chan->cid.cid_num, ""), + far_ident, + local_ident, + stat.pages_transferred, + stat.y_resolution, + stat.bit_rate, + s->file_name); +} + +/* === Helper functions to configure fax === */ + +/* Setup SPAN logging according to Asterisk debug level */ +static int set_logging(logging_state_t *state) +{ + int level = SPAN_LOG_WARNING + option_debug; + + span_log_set_message_handler(state, span_message); + span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); + + return 0; +} + +static void set_local_info(t30_state_t *state, fax_session *s) +{ + const char *x; + + x = pbx_builtin_getvar_helper(s->chan, "LOCALSTATIONID"); + if (!ast_strlen_zero(x)) + t30_set_tx_ident(state, x); + + x = pbx_builtin_getvar_helper(s->chan, "LOCALHEADERINFO"); + if (!ast_strlen_zero(x)) + t30_set_tx_page_header_info(state, x); +} + +static void set_file(t30_state_t *state, fax_session *s) +{ + if (s->direction) + t30_set_tx_file(state, s->file_name, -1, -1); + else + t30_set_rx_file(state, s->file_name, -1); +} + +static void set_ecm(t30_state_t *state, int ecm) +{ + t30_set_ecm_capability(state, ecm); + t30_set_supported_compressions(state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); +} + +/* === Generator === */ + +/* This function is only needed to return passed params so + generator_activate will save it to channel's generatordata */ +static void *fax_generator_alloc(struct ast_channel *chan, void *params) +{ + return params; +} + +static int fax_generator_generate(struct ast_channel *chan, void *data, int len, int samples) +{ + fax_state_t *fax = (fax_state_t*) data; + uint8_t buffer[AST_FRIENDLY_OFFSET + MAX_SAMPLES * sizeof(uint16_t)]; + int16_t *buf = (int16_t *) (buffer + AST_FRIENDLY_OFFSET); + + struct ast_frame outf = { + .frametype = AST_FRAME_VOICE, + .subclass = AST_FORMAT_SLINEAR, + .src = __FUNCTION__, + }; + + if (samples > MAX_SAMPLES) { + ast_log(LOG_WARNING, "Only generating %d samples, where %d requested\n", MAX_SAMPLES, samples); + samples = MAX_SAMPLES; + } + + if ((len = fax_tx(fax, buf, samples)) > 0) { + outf.samples = len; + AST_FRAME_SET_BUFFER(&outf, buffer, AST_FRIENDLY_OFFSET, len * sizeof(int16_t)); + + if (ast_write(chan, &outf) < 0) { + ast_log(LOG_WARNING, "Failed to write frame to '%s': %s\n", chan->name, strerror(errno)); + return -1; + } + } + + return 0; +} + +struct ast_generator generator = { + alloc: fax_generator_alloc, + generate: fax_generator_generate, +}; + + +/* === Transmission === */ + +static int transmit_audio(fax_session *s) +{ + int res = -1; + int original_read_fmt = AST_FORMAT_SLINEAR; + int original_write_fmt = AST_FORMAT_SLINEAR; + fax_state_t fax; + struct ast_dsp *dsp = NULL; + int detect_tone = 0; + struct ast_frame *inf = NULL; + struct ast_frame *fr; + int last_state = 0; + struct timeval now, start, state_change; + enum ast_control_t38 t38control; + + original_read_fmt = s->chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) { + res = ast_set_read_format(s->chan, AST_FORMAT_SLINEAR); + if (res < 0) { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + goto done; + } + } + + original_write_fmt = s->chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) { + res = ast_set_write_format(s->chan, AST_FORMAT_SLINEAR); + if (res < 0) { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + goto done; + } + } + + /* Initialize T30 terminal */ + fax_init(&fax, s->caller_mode); + + /* Setup logging */ + set_logging(&fax.logging); + set_logging(&fax.t30_state.logging); + + /* Configure terminal */ + set_local_info(&fax.t30_state, s); + set_file(&fax.t30_state, s); + set_ecm(&fax.t30_state, TRUE); + + fax_set_transmit_on_idle(&fax, TRUE); + + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, s); + + if (s->t38state == T38_STATE_UNAVAILABLE) { + ast_debug(1, "T38 is unavailable on %s\n", s->chan->name); + } else if (!s->direction) { + /* We are receiving side and this means we are the side which should + request T38 when the fax is detected. Use DSP to detect fax tone */ + ast_debug(1, "Setting up CNG detection on %s\n", s->chan->name); + dsp = ast_dsp_new(); + ast_dsp_set_features(dsp, DSP_FEATURE_FAX_DETECT); + ast_dsp_set_faxmode(dsp, DSP_FAXMODE_DETECT_CNG); + detect_tone = 1; + } + + start = state_change = ast_tvnow(); + + ast_activate_generator(s->chan, &generator, &fax); + + while (!s->finished) { + res = ast_waitfor(s->chan, 20); + if (res < 0) + break; + else if (res > 0) + res = 0; + + inf = ast_read(s->chan); + if (inf == NULL) { + ast_debug(1, "Channel hangup\n"); + res = -1; + break; + } + + ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen); + + /* Detect fax tone */ + if (detect_tone && inf->frametype == AST_FRAME_VOICE) { + /* Duplicate frame because ast_dsp_process may free the frame passed */ + fr = ast_frdup(inf); + + /* Do not pass channel to ast_dsp_process otherwise it may queue modified audio frame back */ + fr = ast_dsp_process(NULL, dsp, fr); + if (fr && fr->frametype == AST_FRAME_DTMF && fr->subclass == 'f') { + ast_debug(1, "Fax tone detected. Requesting T38\n"); + t38control = AST_T38_REQUEST_NEGOTIATE; + ast_indicate_data(s->chan, AST_CONTROL_T38, &t38control, sizeof(t38control)); + detect_tone = 0; + } + + ast_frfree(fr); + } + + + /* Check the frame type. Format also must be checked because there is a chance + that a frame in old format was already queued before we set chanel format + to slinear so it will still be received by ast_read */ + if (inf->frametype == AST_FRAME_VOICE && inf->subclass == AST_FORMAT_SLINEAR) { + + if (fax_rx(&fax, inf->data, inf->samples) < 0) { + /* I know fax_rx never returns errors. The check here is for good style only */ + ast_log(LOG_WARNING, "fax_rx returned error\n"); + res = -1; + break; + } + + /* Watchdog */ + if (last_state != fax.t30_state.state) { + state_change = ast_tvnow(); + last_state = fax.t30_state.state; + } + } else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 && + inf->datalen == sizeof(enum ast_control_t38)) { + t38control =*((enum ast_control_t38 *) inf->data); + if (t38control == AST_T38_NEGOTIATED) { + /* T38 switchover completed */ + ast_debug(1, "T38 negotiated, finishing audio loop\n"); + res = 1; + break; + } + } + + ast_frfree(inf); + inf = NULL; + + /* Watchdog */ + now = ast_tvnow(); + if (ast_tvdiff_sec(now, start) > WATCHDOG_TOTAL_TIMEOUT || ast_tvdiff_sec(now, state_change) > WATCHDOG_STATE_TIMEOUT) { + ast_log(LOG_WARNING, "It looks like we hung. Aborting.\n"); + res = -1; + break; + } + } + + ast_debug(1, "Loop finished, res=%d\n", res); + + if (inf) + ast_frfree(inf); + + if (dsp) + ast_dsp_free(dsp); + + ast_deactivate_generator(s->chan); + + /* If we are switching to T38, remove phase E handler. Otherwise it will be executed + by t30_terminate, display diagnostics and set status variables although no transmittion + has taken place yet. */ + if (res > 0) { + t30_set_phase_e_handler(&fax.t30_state, NULL, NULL); + } + + t30_terminate(&fax.t30_state); + fax_release(&fax); + +done: + if (original_write_fmt != AST_FORMAT_SLINEAR) { + if (ast_set_write_format(s->chan, original_write_fmt) < 0) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", s->chan->name); + } + + if (original_read_fmt != AST_FORMAT_SLINEAR) { + if (ast_set_read_format(s->chan, original_read_fmt) < 0) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", s->chan->name); + } + + return res; + +} + +static int transmit_t38(fax_session *s) +{ + int res = 0; + t38_terminal_state_t t38; + struct ast_frame *inf = NULL; + int last_state = 0; + struct timeval now, start, state_change, last_frame; + enum ast_control_t38 t38control; + + /* Initialize terminal */ + memset(&t38, 0, sizeof(t38)); + if (t38_terminal_init(&t38, s->caller_mode, t38_tx_packet_handler, s->chan) == NULL) { + ast_log(LOG_WARNING, "Unable to start T.38 termination.\n"); + return -1; + } + + /* Setup logging */ + set_logging(&t38.logging); + set_logging(&t38.t30_state.logging); + set_logging(&t38.t38.logging); + + /* Configure terminal */ + set_local_info(&t38.t30_state, s); + set_file(&t38.t30_state, s); + set_ecm(&t38.t30_state, TRUE); + + t30_set_phase_e_handler(&t38.t30_state, phase_e_handler, s); + + now = start = state_change = ast_tvnow(); + + while (!s->finished) { + + res = ast_waitfor(s->chan, 20); + if (res < 0) + break; + else if (res > 0) + res = 0; + + last_frame = now; + now = ast_tvnow(); + t38_terminal_send_timeout(&t38, ast_tvdiff_us(now, last_frame) / (1000000 / 8000)); + + inf = ast_read(s->chan); + if (inf == NULL) { + ast_debug(1, "Channel hangup\n"); + res = -1; + break; + } + + ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen); + + if (inf->frametype == AST_FRAME_MODEM && inf->subclass == AST_MODEM_T38) { + t38_core_rx_ifp_packet(&t38.t38, inf->data, inf->datalen, inf->seqno); + + /* Watchdog */ + if (last_state != t38.t30_state.state) { + state_change = ast_tvnow(); + last_state = t38.t30_state.state; + } + } else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 && + inf->datalen == sizeof(enum ast_control_t38)) { + + t38control = *((enum ast_control_t38 *) inf->data); + + if (t38control == AST_T38_TERMINATED || t38control == AST_T38_REFUSED) { + ast_debug(1, "T38 down, terminating\n"); + res = -1; + break; + } + } + + ast_frfree(inf); + inf = NULL; + + /* Watchdog */ + if (ast_tvdiff_sec(now, start) > WATCHDOG_TOTAL_TIMEOUT || ast_tvdiff_sec(now, state_change) > WATCHDOG_STATE_TIMEOUT) { + ast_log(LOG_WARNING, "It looks like we hung. Aborting.\n"); + res = -1; + break; + } + } + + ast_debug(1, "Loop finished, res=%d\n", res); + + if (inf) + ast_frfree(inf); + + t30_terminate(&t38.t30_state); + t38_terminal_release(&t38); + + return res; +} + +static int transmit(fax_session *s) +{ + int res = 0; + + /* Clear all channel variables which to be set by the application. + Pre-set status to error so in case of any problems we can just leave */ + pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "FAILED"); + pbx_builtin_setvar_helper(s->chan, "FAXERROR", "Channel problems"); + + pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", NULL); + pbx_builtin_setvar_helper(s->chan, "FAXPAGES", NULL); + pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", NULL); + pbx_builtin_setvar_helper(s->chan, "FAXBITRATE", NULL); + + if (s->chan->_state != AST_STATE_UP) { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(s->chan); + if (res) { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", s->chan->name); + return res; + } + } + + s->t38state = ast_channel_get_t38_state(s->chan); + if (s->t38state != T38_STATE_NEGOTIATED) { + /* T38 is not negotiated on the channel yet. First start regular transmission. If it switches to T38, follow */ + res = transmit_audio(s); + if (res > 0) { + /* transmit_audio reports switchover to T38. Update t38state */ + s->t38state = ast_channel_get_t38_state(s->chan); + if (s->t38state != T38_STATE_NEGOTIATED) { + ast_log(LOG_ERROR, "Audio loop reports T38 switchover but t38state != T38_STATE_NEGOTIATED\n"); + } + } + } + + if (s->t38state == T38_STATE_NEGOTIATED) { + res = transmit_t38(s); + } + + if (res) { + ast_log(LOG_WARNING, "Transmission error\n"); + res = -1; + } else if (s->finished < 0) { + ast_log(LOG_WARNING, "Transmission failed\n"); + } else if (s->finished > 0) { + ast_debug(1, "Transmission finished Ok\n"); + } + + return res; +} + +/* === Application functions === */ + +static int sndfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char *parse; + fax_session session; + + AST_DECLARE_APP_ARGS(args, + AST_APP_ARG(file_name); + AST_APP_ARG(options); + ); + + if (chan == NULL) { + ast_log(LOG_ERROR, "Fax channel is NULL. Giving up.\n"); + return -1; + } + + /* The next few lines of code parse out the filename and header from the input string */ + if (ast_strlen_zero(data)) { + /* No data implies no filename or anything is present */ + ast_log(LOG_ERROR, "SendFAX requires an argument (filename)\n"); + return -1; + } + + parse = ast_strdupa(data); + AST_STANDARD_APP_ARGS(args, parse); + + session.caller_mode = TRUE; + + if (args.options) { + if (strchr(args.options, 'a')) + session.caller_mode = FALSE; + } + + /* Done parsing */ + session.direction = 1; + session.file_name = args.file_name; + session.chan = chan; + session.finished = 0; + + res = transmit(&session); + + return res; +} + +static int rcvfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char *parse; + fax_session session; + + AST_DECLARE_APP_ARGS(args, + AST_APP_ARG(file_name); + AST_APP_ARG(options); + ); + + if (chan == NULL) { + ast_log(LOG_ERROR, "Fax channel is NULL. Giving up.\n"); + return -1; + } + + /* The next few lines of code parse out the filename and header from the input string */ + if (ast_strlen_zero(data)) { + /* No data implies no filename or anything is present */ + ast_log(LOG_ERROR, "ReceiveFAX requires an argument (filename)\n"); + return -1; + } + + parse = ast_strdupa(data); + AST_STANDARD_APP_ARGS(args, parse); + + session.caller_mode = FALSE; + + if (args.options) { + if (strchr(args.options, 'c')) + session.caller_mode = TRUE; + } + + /* Done parsing */ + session.direction = 0; + session.file_name = args.file_name; + session.chan = chan; + session.finished = 0; + + res = transmit(&session); + + return res; +} + +static int unload_module(void) +{ + int res; + + res = ast_unregister_application(app_sndfax_name); + res |= ast_unregister_application(app_rcvfax_name); + + return res; +} + +static int load_module(void) +{ + int res ; + + res = ast_register_application(app_sndfax_name, sndfax_exec, app_sndfax_synopsis, app_sndfax_desc); + res |= ast_register_application(app_rcvfax_name, rcvfax_exec, app_rcvfax_synopsis, app_rcvfax_desc); + + /* The default SPAN message handler prints to stderr. It is something we do not want */ + span_set_message_handler(NULL); + + return res; +} + + +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Simple FAX Application", + .load = load_module, + .unload = unload_module, + ); + + diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index e51279b..e50e64e 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -32,6 +32,7 @@ POPT=@PBX_POPT@ PORTAUDIO=@PBX_PORTAUDIO@ PRI=@PBX_PRI@ RADIUS=@PBX_RADIUS@ +SPANDSP=@PBX_SPANDSP@ SPEEX=@PBX_SPEEX@ SPEEXDSP=@PBX_SPEEXDSP@ SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@ diff --git a/configure.ac b/configure.ac index 6c692f8..20b4976 100644 --- a/configure.ac +++ b/configure.ac @@ -236,6 +236,7 @@ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres]) AST_EXT_LIB_SETUP([POPT], [popt], [popt]) AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio]) AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri]) +AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp]) AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) @@ -1294,6 +1295,19 @@ AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h]) AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h]) +AST_C_COMPILE_CHECK([SPANDSP], [ + #if SPANDSP_RELEASE_DATE < 20080516 + #error "spandsp 0.0.5 or greater is required" + #endif + ], [spandsp/version.h]) + +if test "x${PBX_SPANDSP}" = "x1" ; then + # We found the correct version in the header, now let's make sure it links + # properly, and that libtiff is available + PBX_SPANDSP=0 + AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff]) +fi + AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h]) if test "${USE_PWLIB}" != "no"; then diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 3a76722..855f8ec 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -715,6 +715,12 @@ /* Define to 1 if your system has soxmix application. */ #undef HAVE_SOXMIX +/* Define this to indicate the ${SPANDSP_DESCRIP} library */ +#undef HAVE_SPANDSP + +/* Define to indicate the ${SPANDSP_DESCRIP} library version */ +#undef HAVE_SPANDSP_VERSION + /* Define this to indicate the ${SPEEX_DESCRIP} library */ #undef HAVE_SPEEX diff --git a/makeopts.in b/makeopts.in index b8a4ab6..ad7a94d 100644 --- a/makeopts.in +++ b/makeopts.in @@ -172,6 +172,9 @@ SDL_LIB=@SDL_LIB@ SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@ SDL_IMAGE_LIB=@SDL_IMAGE_LIB@ +SPANDSP_INCLUDE=@SPANDSP_INCLUDE@ +SPANDSP_LIB=@SPANDSP_LIB@ + SPEEX_INCLUDE=@SPEEX_INCLUDE@ SPEEX_LIB=@SPEEX_LIB@ -- 1.5.5.2 0012-Update-autoconf.patch: --- NEW FILE 0012-Update-autoconf.patch --- >From 77b9ee99b4b0edd8261f60c96e4cc5ea2555099f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 30 Jul 2008 09:39:50 -0500 Subject: [PATCH] Update autoconf --- configure | 1378 ++++++++++++++++++++++++++++---------- include/asterisk/autoconfig.h.in | 17 +- 2 files changed, 1045 insertions(+), 350 deletions(-) diff --git a/configure b/configure index d72fa38..145369a 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 115581 . +# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -728,14 +728,18 @@ BKTR_LIB BKTR_INCLUDE BKTR_DIR PBX_BKTR -CAP_LIB -CAP_INCLUDE -CAP_DIR -PBX_CAP +BLUETOOTH_LIB +BLUETOOTH_INCLUDE +BLUETOOTH_DIR +PBX_BLUETOOTH CURL_LIB CURL_INCLUDE CURL_DIR PBX_CURL +CAP_LIB +CAP_INCLUDE +CAP_DIR +PBX_CAP CURSES_LIB CURSES_INCLUDE CURSES_DIR @@ -788,6 +792,10 @@ LDAP_LIB LDAP_INCLUDE LDAP_DIR PBX_LDAP +LIBEDIT_LIB +LIBEDIT_INCLUDE +LIBEDIT_DIR +PBX_LIBEDIT LTDL_LIB LTDL_INCLUDE LTDL_DIR @@ -848,6 +856,10 @@ PRI_LIB PRI_INCLUDE PRI_DIR PBX_PRI +SPANDSP_LIB +SPANDSP_INCLUDE +SPANDSP_DIR +PBX_SPANDSP SS7_LIB SS7_INCLUDE SS7_DIR @@ -963,6 +975,7 @@ OPENH323_INCDIR OPENH323_LIBDIR OPENH323_SUFFIX OPENH323_BUILD +PKGCONFIG PBX_SPEEX_PREPROCESS CONFIG_GMIME PBX_ZAPTEL_VLDTMF @@ -976,7 +989,7 @@ PBX_H323 PBX_IXJUSER CONFIG_SDL CONFIG_GTK -PKGCONFIG +LIBEDIT_OBJ CURL_CONFIG LTLIBOBJS' ac_subst_files='' @@ -1576,8 +1589,9 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-asound=PATH use Advanced Linux Sound Architecture files in PATH --with-execinfo=PATH use Stack Backtrace support files in PATH - --with-cap=PATH use POSIX 1.e capabilities files in PATH + --with-bluetooth=PATH use Bluetooth Support files in PATH --with-curl=PATH use cURL files in PATH + --with-cap=PATH use POSIX 1.e capabilities files in PATH --with-curses=PATH use curses files in PATH --with-crypto=PATH use OpenSSL Cryptography support files in PATH --with-avcodec=PATH use Ffmpeg and avcodec library files in PATH @@ -1592,6 +1606,7 @@ Optional Packages: --with-isdnnet=PATH use ISDN4Linux Library files in PATH --with-jack=PATH use Jack Audio Connection Kit files in PATH --with-ldap=PATH use OpenLDAP files in PATH + --with-libedit=PATH use NetBSD Editline library files in PATH --with-ltdl=PATH use libtool files in PATH --with-lua=PATH use Lua files in PATH --with-misdn=PATH use mISDN User Library files in PATH @@ -1607,6 +1622,7 @@ Optional Packages: --with-popt=PATH use popt files in PATH --with-portaudio=PATH use PortAudio files in PATH --with-pri=PATH use ISDN PRI files in PATH + --with-spandsp=PATH use SPANDSP files in PATH --with-ss7=PATH use ISDN SS7 files in PATH --with-pwlib=PATH use PWlib files in PATH --with-h323=PATH use OpenH323 files in PATH @@ -7942,6 +7958,62 @@ fi + BLUETOOTH_DESCRIP="Bluetooth Support" + BLUETOOTH_OPTION="bluetooth" + +# Check whether --with-bluetooth was given. +if test "${with_bluetooth+set}" = set; then + withval=$with_bluetooth; + case ${withval} in + n|no) + USE_BLUETOOTH=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + *) + BLUETOOTH_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + esac + +fi + + PBX_BLUETOOTH=0 + + + + + + + CURL_DESCRIP="cURL" + CURL_OPTION="curl" + +# Check whether --with-curl was given. +if test "${with_curl+set}" = set; then + withval=$with_curl; + case ${withval} in + n|no) + USE_CURL=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + *) + CURL_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + esac + +fi + + PBX_CURL=0 + + + + + + CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" @@ -8362,6 +8434,34 @@ fi + LIBEDIT_DESCRIP="NetBSD Editline library" + LIBEDIT_OPTION="libedit" + +# Check whether --with-libedit was given. +if test "${with_libedit+set}" = set; then + withval=$with_libedit; + case ${withval} in + n|no) + USE_LIBEDIT=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + *) + LIBEDIT_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + esac + +fi + + PBX_LIBEDIT=0 + + + + + + LTDL_DESCRIP="libtool" LTDL_OPTION="ltdl" @@ -8782,6 +8882,34 @@ fi + SPANDSP_DESCRIP="SPANDSP" + SPANDSP_OPTION="spandsp" + +# Check whether --with-spandsp was given. +if test "${with_spandsp+set}" = set; then + withval=$with_spandsp; + case ${withval} in + n|no) + USE_SPANDSP=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + *) + SPANDSP_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + esac + +fi + + PBX_SPANDSP=0 + + + + + + SS7_DESCRIP="ISDN SS7" SS7_OPTION="ss7" @@ -12772,13 +12900,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12818,13 +12944,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18333,6 +18457,268 @@ fi +if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then + pbxlibdir="" + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + if test -d ${BLUETOOTH_DIR}/lib; then + pbxlibdir="-L${BLUETOOTH_DIR}/lib" + else + pbxlibdir="-L${BLUETOOTH_DIR}" + fi + fi + pbxfuncname="ba2str" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_BLUETOOTH_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lbluetooth" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lbluetooth... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbluetooth ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_BLUETOOTH_FOUND=yes +else + AST_BLUETOOTH_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_BLUETOOTH_FOUND}" = "yes"; then + BLUETOOTH_LIB="${pbxlibdir} -lbluetooth " + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include" + fi + BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} " + if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found + BLUETOOTH_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE} " + if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } + +fi +if test $ac_cv_header_bluetooth_bluetooth_h = yes; then + BLUETOOTH_HEADER_FOUND=1 +else + BLUETOOTH_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then + BLUETOOTH_LIB="" + BLUETOOTH_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + BLUETOOTH_LIB="" + fi + PBX_BLUETOOTH=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH_VERSION +_ACEOF + + fi + fi +fi + + + if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="" # if --with-CURSES=DIR has been specified, use it. @@ -38779,6 +39165,356 @@ fi + if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then + { echo "$as_me:$LINENO: checking if \" + #if SPANDSP_RELEASE_DATE < 20080516 + #error \"spandsp 0.0.5 or greater is required\" + #endif + \" compiles using spandsp/version.h" >&5 +echo $ECHO_N "checking if \" + #if SPANDSP_RELEASE_DATE < 20080516 + #error \"spandsp 0.0.5 or greater is required\" + #endif + \" compiles using spandsp/version.h... $ECHO_C" >&6; } + saved_cppflags="${CPPFLAGS}" + if test "x${SPANDSP_DIR}" != "x"; then + SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" + fi + CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + #if SPANDSP_RELEASE_DATE < 20080516 + #error "spandsp 0.0.5 or greater is required" + #endif + ; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PBX_SPANDSP=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SPANDSP 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SPANDSP_VERSION +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="${saved_cppflags}" + fi + + +if test "x${PBX_SPANDSP}" = "x1" ; then + # We found the correct version in the header, now let's make sure it links + # properly, and that libtiff is available + PBX_SPANDSP=0 + +if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then + pbxlibdir="" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + if test -d ${SPANDSP_DIR}/lib; then + pbxlibdir="-L${SPANDSP_DIR}/lib" + else + pbxlibdir="-L${SPANDSP_DIR}" + fi + fi + pbxfuncname="span_set_message_handler" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_SPANDSP_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_SPANDSP_FOUND=yes +else + AST_SPANDSP_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_SPANDSP_FOUND}" = "yes"; then + SPANDSP_LIB="${pbxlibdir} -lspandsp -ltiff" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" + fi + SPANDSP_INCLUDE="${SPANDSP_INCLUDE} " + if test "xspandsp.h" = "x" ; then # no header, assume found + SPANDSP_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE} " + if test "${ac_cv_header_spandsp_h+set}" = set; then + { echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5 +echo $ECHO_N "checking spandsp.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking spandsp.h presence" >&5 +echo $ECHO_N "checking spandsp.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: spandsp.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_spandsp_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } + +fi +if test $ac_cv_header_spandsp_h = yes; then + SPANDSP_HEADER_FOUND=1 +else + SPANDSP_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then + SPANDSP_LIB="" + SPANDSP_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + SPANDSP_LIB="" + fi + PBX_SPANDSP=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_SPANDSP 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_SPANDSP_VERSION +_ACEOF + + fi + fi +fi + +fi + + if test "x${PBX_SS7}" != "x1" -a "${USE_SS7}" != "no"; then pbxlibdir="" # if --with-SS7=DIR has been specified, use it. @@ -41087,271 +41823,115 @@ _ACEOF fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" - -if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then - pbxlibdir="" - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - if test -d ${LUA_DIR}/lib; then - pbxlibdir="-L${LUA_DIR}/lib" - else - pbxlibdir="-L${LUA_DIR}" - fi - fi - pbxfuncname="luaL_newstate" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes - else - as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +PBX_LUA=0 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua5.1 ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ${pbxfuncname} (); -int -main () -{ -return ${pbxfuncname} (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_Lib=yes" + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_LUA_FOUND=yes +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } else - AST_LUA_FOUND=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - fi - # now check for the header. - if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua5.1 " - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - LUA_INCLUDE="-I${LUA_DIR}/include" - fi - LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua5.1/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" - else # check for the header - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE} " - if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h usability" >&5 -echo $ECHO_N "checking lua5.1/lua.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h presence" >&5 -echo $ECHO_N "checking lua5.1/lua.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------- ## -## Report this to www.asterisk.org ## -## ------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } else - ac_cv_header_lua5_1_lua_h=$ac_header_preproc + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } -fi -if test $ac_cv_header_lua5_1_lua_h = yes; then - LUA_HEADER_FOUND=1 + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi else - LUA_HEADER_FOUND=0 + PKGCONFIG="$ac_cv_prog_PKGCONFIG" fi +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 - CPPFLAGS="${saved_cppflags}" - fi - if test "x${LUA_HEADER_FOUND}" = "x0" ; then - LUA_LIB="" - LUA_INCLUDE="" - else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" - fi - PBX_LUA=1 - # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED - -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LUA 1 _ACEOF - -cat >>confdefs.h <<_ACEOF -#define HAVE_LUA_VERSION -_ACEOF - - fi - fi fi - if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="" # if --with-RADIUS=DIR has been specified, use it. @@ -43914,18 +44494,18 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then pbxlibdir="-L${FREETDS_DIR}" fi fi - pbxfuncname="tds_version" + pbxfuncname="dbinit" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_FREETDS_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_tds_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltds" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ltds... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsybdb" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lsybdb... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ltds ${pbxlibdir} $LIBS" +LIBS="-lsybdb ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43991,29 +44571,29 @@ fi # now check for the header. if test "${AST_FREETDS_FOUND}" = "yes"; then - FREETDS_LIB="${pbxlibdir} -ltds " + FREETDS_LIB="${pbxlibdir} -lsybdb " # if --with-FREETDS=DIR has been specified, use it. if test "x${FREETDS_DIR}" != "x"; then FREETDS_INCLUDE="-I${FREETDS_DIR}/include" fi FREETDS_INCLUDE="${FREETDS_INCLUDE} " - if test "xtds.h" = "x" ; then # no header, assume found + if test "xsybdb.h" = "x" ; then # no header, assume found FREETDS_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE} " - if test "${ac_cv_header_tds_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then + if test "${ac_cv_header_sybdb_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking tds.h usability" >&5 -echo $ECHO_N "checking tds.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h usability" >&5 +echo $ECHO_N "checking sybdb.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44021,7 +44601,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -44053,15 +44633,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking tds.h presence" >&5 -echo $ECHO_N "checking tds.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h presence" >&5 +echo $ECHO_N "checking sybdb.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -44094,25 +44674,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tds.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tds.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tds.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tds.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tds.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sybdb.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sybdb.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sybdb.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sybdb.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -44121,18 +44701,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_tds_h=$ac_header_preproc + ac_cv_header_sybdb_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } fi -if test $ac_cv_header_tds_h = yes; then +if test $ac_cv_header_sybdb_h = yes; then FREETDS_HEADER_FOUND=1 else FREETDS_HEADER_FOUND=0 @@ -44164,33 +44744,6 @@ _ACEOF fi fi -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then @@ -49918,6 +50471,126 @@ fi +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBEDIT 1 +_ACEOF + + fi + fi +fi + + + + + if test "${USE_CURL}" != "no"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args. @@ -50892,14 +51565,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim BKTR_DIR!$BKTR_DIR$ac_delim PBX_BKTR!$PBX_BKTR$ac_delim -CAP_LIB!$CAP_LIB$ac_delim -CAP_INCLUDE!$CAP_INCLUDE$ac_delim -CAP_DIR!$CAP_DIR$ac_delim -PBX_CAP!$PBX_CAP$ac_delim +BLUETOOTH_LIB!$BLUETOOTH_LIB$ac_delim +BLUETOOTH_INCLUDE!$BLUETOOTH_INCLUDE$ac_delim +BLUETOOTH_DIR!$BLUETOOTH_DIR$ac_delim +PBX_BLUETOOTH!$PBX_BLUETOOTH$ac_delim CURL_LIB!$CURL_LIB$ac_delim CURL_INCLUDE!$CURL_INCLUDE$ac_delim CURL_DIR!$CURL_DIR$ac_delim PBX_CURL!$PBX_CURL$ac_delim +CAP_LIB!$CAP_LIB$ac_delim +CAP_INCLUDE!$CAP_INCLUDE$ac_delim +CAP_DIR!$CAP_DIR$ac_delim +PBX_CAP!$PBX_CAP$ac_delim CURSES_LIB!$CURSES_LIB$ac_delim CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim CURSES_DIR!$CURSES_DIR$ac_delim @@ -50952,6 +51629,10 @@ LDAP_LIB!$LDAP_LIB$ac_delim LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim LDAP_DIR!$LDAP_DIR$ac_delim PBX_LDAP!$PBX_LDAP$ac_delim +LIBEDIT_LIB!$LIBEDIT_LIB$ac_delim +LIBEDIT_INCLUDE!$LIBEDIT_INCLUDE$ac_delim +LIBEDIT_DIR!$LIBEDIT_DIR$ac_delim +PBX_LIBEDIT!$PBX_LIBEDIT$ac_delim LTDL_LIB!$LTDL_LIB$ac_delim LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim LTDL_DIR!$LTDL_DIR$ac_delim @@ -50969,14 +51650,6 @@ NBS_INCLUDE!$NBS_INCLUDE$ac_delim NBS_DIR!$NBS_DIR$ac_delim PBX_NBS!$PBX_NBS$ac_delim NCURSES_LIB!$NCURSES_LIB$ac_delim -NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim -NCURSES_DIR!$NCURSES_DIR$ac_delim -PBX_NCURSES!$PBX_NCURSES$ac_delim -NETSNMP_LIB!$NETSNMP_LIB$ac_delim -NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim -NETSNMP_DIR!$NETSNMP_DIR$ac_delim -PBX_NETSNMP!$PBX_NETSNMP$ac_delim -NEWT_LIB!$NEWT_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51018,6 +51691,14 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim +NCURSES_DIR!$NCURSES_DIR$ac_delim +PBX_NCURSES!$PBX_NCURSES$ac_delim +NETSNMP_LIB!$NETSNMP_LIB$ac_delim +NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim +NETSNMP_DIR!$NETSNMP_DIR$ac_delim +PBX_NETSNMP!$PBX_NETSNMP$ac_delim +NEWT_LIB!$NEWT_LIB$ac_delim NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim NEWT_DIR!$NEWT_DIR$ac_delim PBX_NEWT!$PBX_NEWT$ac_delim @@ -51053,6 +51734,10 @@ PRI_LIB!$PRI_LIB$ac_delim PRI_INCLUDE!$PRI_INCLUDE$ac_delim PRI_DIR!$PRI_DIR$ac_delim PBX_PRI!$PBX_PRI$ac_delim +SPANDSP_LIB!$SPANDSP_LIB$ac_delim +SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim +SPANDSP_DIR!$SPANDSP_DIR$ac_delim +PBX_SPANDSP!$PBX_SPANDSP$ac_delim SS7_LIB!$SS7_LIB$ac_delim SS7_INCLUDE!$SS7_INCLUDE$ac_delim SS7_DIR!$SS7_DIR$ac_delim @@ -51103,18 +51788,6 @@ OPENSSL_DIR!$OPENSSL_DIR$ac_delim PBX_OPENSSL!$PBX_OPENSSL$ac_delim FREETDS_LIB!$FREETDS_LIB$ac_delim FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim -FREETDS_DIR!$FREETDS_DIR$ac_delim -PBX_FREETDS!$PBX_FREETDS$ac_delim -TERMCAP_LIB!$TERMCAP_LIB$ac_delim -TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim -TERMCAP_DIR!$TERMCAP_DIR$ac_delim -PBX_TERMCAP!$PBX_TERMCAP$ac_delim -TINFO_LIB!$TINFO_LIB$ac_delim -TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim -TINFO_DIR!$TINFO_DIR$ac_delim -PBX_TINFO!$PBX_TINFO$ac_delim -TONEZONE_LIB!$TONEZONE_LIB$ac_delim -TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51156,6 +51829,18 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +FREETDS_DIR!$FREETDS_DIR$ac_delim +PBX_FREETDS!$PBX_FREETDS$ac_delim +TERMCAP_LIB!$TERMCAP_LIB$ac_delim +TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim +TERMCAP_DIR!$TERMCAP_DIR$ac_delim +PBX_TERMCAP!$PBX_TERMCAP$ac_delim +TINFO_LIB!$TINFO_LIB$ac_delim +TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim +TINFO_DIR!$TINFO_DIR$ac_delim +PBX_TINFO!$PBX_TINFO$ac_delim +TONEZONE_LIB!$TONEZONE_LIB$ac_delim +TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim TONEZONE_DIR!$TONEZONE_DIR$ac_delim PBX_TONEZONE!$PBX_TONEZONE$ac_delim USB_LIB!$USB_LIB$ac_delim @@ -51209,6 +51894,7 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim OPENH323_BUILD!$OPENH323_BUILD$ac_delim +PKGCONFIG!$PKGCONFIG$ac_delim PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim CONFIG_GMIME!$CONFIG_GMIME$ac_delim PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim @@ -51222,12 +51908,12 @@ PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim +LIBEDIT_OBJ!$LIBEDIT_OBJ$ac_delim CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 855f8ec..07deb31 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -116,6 +116,12 @@ /* Define to indicate the ${BKTR_DESCRIP} library version */ #undef HAVE_BKTR_VERSION +/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */ +#undef HAVE_BLUETOOTH + +/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */ +#undef HAVE_BLUETOOTH_VERSION + /* Define to 1 if byteswap.h macros are available. */ #undef HAVE_BYTESWAP_H @@ -385,6 +391,9 @@ /* Define to indicate the ${LDAP_DESCRIP} library version */ #undef HAVE_LDAP_VERSION +/* Define if your system has the NetBSD Editline libraries. */ +#undef HAVE_LIBEDIT + /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -442,12 +451,9 @@ /* Define to indicate the ${LTDL_DESCRIP} library version */ #undef HAVE_LTDL_VERSION -/* Define this to indicate the ${LUA_DESCRIP} library */ +/* Define if your system has the LUA libraries. */ #undef HAVE_LUA -/* Define to indicate the ${LUA_DESCRIP} library version */ -#undef HAVE_LUA_VERSION - /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -1199,6 +1205,9 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch: Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 2 Jul 2008 16:14:21 -0000 1.1 +++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 30 Jul 2008 15:04:08 -0000 1.2 @@ -1,4 +1,4 @@ -From 4b4ea77478104bd1bfa02cc41ffd8351780e14e7 Mon Sep 17 00:00:00 2001 +From c916a79652be51092082c2c5a537a3093636aa71 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Sun, 18 Nov 2007 21:47:59 -0600 Subject: [PATCH] Modify init scripts for better Fedora compatibility. 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch: Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 2 Jul 2008 16:14:21 -0000 1.1 +++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 30 Jul 2008 15:04:08 -0000 1.2 @@ -1,4 +1,4 @@ -From 053d0eda8a0cc575e682df337d630e3aaebf7329 Mon Sep 17 00:00:00 2001 +From fe8076de7d6ce46220751ecefe0e75823031325c Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 15:52:36 -0600 Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded. Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- asterisk.spec 30 Jul 2008 02:06:45 -0000 1.31 +++ asterisk.spec 30 Jul 2008 15:04:08 -0000 1.32 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.20.beta%{beta}%{?dist} +Release: 0.21.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -36,16 +36,16 @@ Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch -Patch3: 0003-Add-FAX-apps.patch -Patch4: 0004-Allow-alternate-extensions-to-be-specified-in-users.patch -Patch5: 0005-Pick-proper-optimization-flags-for-Fedora.patch -Patch6: 0006-Add-chan_mobile-from-asterisk-addons.patch -Patch7: 0007-Use-pkgconfig-to-check-for-Lua.patch -Patch8: 0008-Build-using-external-libedit.patch -Patch9: 0009-Update-cdr_tds-to-latest.patch -Patch10: 0010-Update-autoconf.patch -Patch11: 0011-Merged-revisions-123952-via-svnmerge-from.patch -Patch12: 0012-Merged-revisions-132778-via-svnmerge-from.patch +Patch3: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch +Patch4: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch +Patch5: 0005-Add-chan_mobile-from-asterisk-addons.patch +Patch6: 0006-Use-pkgconfig-to-check-for-Lua.patch +Patch7: 0007-Build-using-external-libedit.patch +Patch8: 0008-Update-cdr_tds-to-latest.patch +Patch9: 0009-Merged-revisions-123952-via-svnmerge-from.patch +Patch10: 0010-Merged-revisions-132778-via-svnmerge-from.patch +Patch11: 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch +Patch12: 0012-Update-autoconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -147,7 +147,7 @@ Summary: FAX applications for Asterisk Group: Applications/Internet Requires: asterisk = %{version}-%{release} -BuildRequires: spandsp-devel +BuildRequires: spandsp-devel >= 0.0.5-0.1.pre4 %description fax FAX applications for Asterisk @@ -862,8 +862,7 @@ %files fax %defattr(-,root,root,-) -%{_libdir}/asterisk/modules/app_rxfax.so -%{_libdir}/asterisk/modules/app_txfax.so +%{_libdir}/asterisk/modules/app_fax.so %files festival %defattr(-,root,root,-) @@ -1027,6 +1026,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 1.6.0-0.21.beta9 +- Replace app_rxfax/app_txfax with app_fax taken from upstream SVN. + * Tue Jul 29 2008 Jeffrey C. Ollie - 1.6.0-0.20.beta9 - Bump release and rebuild with new libpri and zaptel. --- 0003-Add-FAX-apps.patch DELETED --- --- 0004-Allow-alternate-extensions-to-be-specified-in-users.patch DELETED --- --- 0005-Pick-proper-optimization-flags-for-Fedora.patch DELETED --- --- 0006-Add-chan_mobile-from-asterisk-addons.patch DELETED --- --- 0007-Use-pkgconfig-to-check-for-Lua.patch DELETED --- --- 0008-Build-using-external-libedit.patch DELETED --- --- 0009-Update-cdr_tds-to-latest.patch DELETED --- --- 0010-Update-autoconf.patch DELETED --- --- 0011-Merged-revisions-123952-via-svnmerge-from.patch DELETED --- --- 0012-Merged-revisions-132778-via-svnmerge-from.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 15:08:25 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 15:08:25 GMT Subject: rpms/spandsp/devel .cvsignore,1.19,1.20 sources,1.19,1.20 Message-ID: <200807301508.m6UF8PES029748@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/spandsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29706 Modified Files: .cvsignore sources Log Message: Add new source. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/spandsp/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 20 Mar 2008 21:14:18 -0000 1.19 +++ .cvsignore 30 Jul 2008 15:07:55 -0000 1.20 @@ -1 +1 @@ -spandsp-0.0.4pre18.tgz +spandsp-0.0.5pre4.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/spandsp/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 20 Mar 2008 21:14:18 -0000 1.19 +++ sources 30 Jul 2008 15:07:55 -0000 1.20 @@ -1 +1 @@ -888ee407208fdfecbe1c7c98ae53e441 spandsp-0.0.4pre18.tgz +fe83ed37a7831f0dd38e7ef4e7e6fd9e spandsp-0.0.5pre4.tgz From fedora-extras-commits at redhat.com Wed Jul 30 15:17:18 2008 From: fedora-extras-commits at redhat.com (Lawrence Lim (llim)) Date: Wed, 30 Jul 2008 15:17:18 GMT Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.34,1.35 Message-ID: <200807301517.m6UFHIiT030227@cvs-int.fedora.redhat.com> Author: llim Update of /cvs/pkgs/rpms/redhat-lsb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30197 Modified Files: redhat-lsb.spec Log Message: remove symlink to mailx (Bug #457241) Index: redhat-lsb.spec =================================================================== RCS file: /cvs/pkgs/rpms/redhat-lsb/devel/redhat-lsb.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- redhat-lsb.spec 19 Feb 2008 12:47:05 -0000 1.34 +++ redhat-lsb.spec 30 Jul 2008 15:16:48 -0000 1.35 @@ -381,7 +381,7 @@ ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT%{_libdir}/lsb/install_initd ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT%{_libdir}/lsb/remove_initd -ln -snf mail $RPM_BUILD_ROOT/bin/mailx +#ln -snf mail $RPM_BUILD_ROOT/bin/mailx gcc $RPM_OPT_FLAGS -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \ -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE @@ -430,7 +430,7 @@ %{_sysconfdir}/lsb-release.d/* %{_mandir}/*/* %{_bindir}/* -/bin/mailx +#/bin/mailx /bin/redhat_lsb_init %{_libdir}/lsb /%{_lib}/* @@ -438,6 +438,9 @@ %{_sbindir}/redhat_lsb_trigger.%{_target_cpu} %changelog +* Thu Jul 31 2009 Lawrence Lim - 3.1-21 +- remove symlink for mailx (Bug #457241) + * Tue Feb 19 2008 Fedora Release Engineering - 3.1-20 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Jul 30 15:20:06 2008 From: fedora-extras-commits at redhat.com (Lawrence Lim (llim)) Date: Wed, 30 Jul 2008 15:20:06 GMT Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.35,1.36 Message-ID: <200807301520.m6UFK607030413@cvs-int.fedora.redhat.com> Author: llim Update of /cvs/pkgs/rpms/redhat-lsb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30363 Modified Files: redhat-lsb.spec Log Message: correct version number Index: redhat-lsb.spec =================================================================== RCS file: /cvs/pkgs/rpms/redhat-lsb/devel/redhat-lsb.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- redhat-lsb.spec 30 Jul 2008 15:16:48 -0000 1.35 +++ redhat-lsb.spec 30 Jul 2008 15:19:36 -0000 1.36 @@ -49,7 +49,7 @@ Summary: LSB support for Red Hat Linux Name: redhat-lsb Version: 3.1 -Release: 20%{?dist} +Release: 21%{?dist} URL: http://www.linuxbase.org/ Source0: %{name}-%{version}-%{srcrelease}.tar.bz2 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 15:23:05 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Wed, 30 Jul 2008 15:23:05 GMT Subject: rpms/gazpacho/devel gazpacho.spec,1.22,1.23 Message-ID: <200807301523.m6UFN56N030661@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/gazpacho/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30580/devel Modified Files: gazpacho.spec Log Message: Fixes for #440859 Index: gazpacho.spec =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gazpacho.spec 17 Aug 2007 19:53:09 -0000 1.22 +++ gazpacho.spec 30 Jul 2008 15:22:35 -0000 1.23 @@ -2,13 +2,13 @@ Name: gazpacho Version: 0.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Glade Interface Creator Group: Development/Tools License: GPLv2+ URL: http://gazpacho.sicem.biz/ -Source0: ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/0.7/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -25,6 +25,10 @@ %prep %setup -q sed -i -e 's|share/doc/gazpacho|share/doc/gazpacho-%{version}|' setup.py +# Suppress rpmlint errors +sed -i 's/\r//' README +iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf8 +mv -f ChangeLog.utf8 ChangeLog %build @@ -41,7 +45,6 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category Application \ --add-category Development \ - --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/gazpacho.desktop %find_lang %{name} @@ -54,12 +57,19 @@ %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS CONTRIBUTORS ChangeLog examples doc %{python_sitelib}/gazpacho +%{python_sitelib}/gazpacho-*.egg-info %{_datadir}/gazpacho %{_bindir}/* %{_datadir}/applications/*.desktop + %changelog +* Wed Jul 30 2008 Konstantin Ryabitsev - 0.7.2-3 +- Small fixes (#440859) +- Include egg-info (#440859) +- Remove X-Fedora from desktop file categories + * Fri Aug 17 2007 Konstantin Ryabitsev - 0.7.2-2 - Appease license naming gods (GPLv2+) From fedora-extras-commits at redhat.com Wed Jul 30 15:23:05 2008 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Wed, 30 Jul 2008 15:23:05 GMT Subject: rpms/gazpacho/F-9 gazpacho.spec,1.22,1.23 Message-ID: <200807301523.m6UFN5k8030657@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/gazpacho/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30580/F-9 Modified Files: gazpacho.spec Log Message: Fixes for #440859 Index: gazpacho.spec =================================================================== RCS file: /cvs/extras/rpms/gazpacho/F-9/gazpacho.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gazpacho.spec 17 Aug 2007 19:53:09 -0000 1.22 +++ gazpacho.spec 30 Jul 2008 15:22:34 -0000 1.23 @@ -2,13 +2,13 @@ Name: gazpacho Version: 0.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Glade Interface Creator Group: Development/Tools License: GPLv2+ URL: http://gazpacho.sicem.biz/ -Source0: ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/0.7/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -25,6 +25,10 @@ %prep %setup -q sed -i -e 's|share/doc/gazpacho|share/doc/gazpacho-%{version}|' setup.py +# Suppress rpmlint errors +sed -i 's/\r//' README +iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf8 +mv -f ChangeLog.utf8 ChangeLog %build @@ -41,7 +45,6 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category Application \ --add-category Development \ - --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/gazpacho.desktop %find_lang %{name} @@ -54,12 +57,19 @@ %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS CONTRIBUTORS ChangeLog examples doc %{python_sitelib}/gazpacho +%{python_sitelib}/gazpacho-*.egg-info %{_datadir}/gazpacho %{_bindir}/* %{_datadir}/applications/*.desktop + %changelog +* Wed Jul 30 2008 Konstantin Ryabitsev - 0.7.2-3 +- Small fixes (#440859) +- Include egg-info (#440859) +- Remove X-Fedora from desktop file categories + * Fri Aug 17 2007 Konstantin Ryabitsev - 0.7.2-2 - Appease license naming gods (GPLv2+) From fedora-extras-commits at redhat.com Wed Jul 30 15:27:44 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 30 Jul 2008 15:27:44 GMT Subject: rpms/eclipse-mylyn/devel eclipse-mylyn-nojaxb.patch, NONE, 1.1 eclipse-mylyn-splitxmlrpc.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 eclipse-mylyn.spec, 1.20, 1.21 fetch-mylyn.sh, 1.4, 1.5 sources, 1.6, 1.7 eclipse-mylyn-unpackwebcore.patch, 1.3, NONE eclipse-mylyn-webcorejar.patch, 1.4, NONE Message-ID: <200807301527.m6UFRi5Y030959@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse-mylyn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30914 Modified Files: .cvsignore eclipse-mylyn.spec fetch-mylyn.sh sources Added Files: eclipse-mylyn-nojaxb.patch eclipse-mylyn-splitxmlrpc.patch Removed Files: eclipse-mylyn-unpackwebcore.patch eclipse-mylyn-webcorejar.patch Log Message: * Fri Jul 25 2008 Andrew Overholt 3.0.1-1 - 3.0.1 - Add patch to not require jaxb (required by XML-RPC Orbit bundle) eclipse-mylyn-nojaxb.patch: --- NEW FILE eclipse-mylyn-nojaxb.patch --- diff -up ./org.eclipse.mylyn.trac-feature/feature.xml.nojaxb ./org.eclipse.mylyn.trac-feature/feature.xml --- ./org.eclipse.mylyn.trac-feature/feature.xml.nojaxb 2008-07-29 14:47:21.000000000 -0400 +++ ./org.eclipse.mylyn.trac-feature/feature.xml 2008-07-29 14:47:30.000000000 -0400 @@ -108,11 +108,4 @@ Java and all Java-based trademarks are t version="0.0.0" unpack="false"/> - - eclipse-mylyn-splitxmlrpc.patch: --- NEW FILE eclipse-mylyn-splitxmlrpc.patch --- diff -up ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.splitxmlrpc ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF --- ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.splitxmlrpc 2008-07-29 15:09:19.000000000 -0400 +++ ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 2008-07-29 15:42:17.000000000 -0400 @@ -8,8 +8,10 @@ Require-Bundle: org.eclipse.core.runtime org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)", - org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)" + org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)" +Import-Package: org.apache.xmlrpc.client, + org.apache.xmlrpc.common, + org.apache.xmlrpc.util Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui", org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui", Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Apr 2008 13:20:10 -0000 1.5 +++ .cvsignore 30 Jul 2008 15:27:13 -0000 1.6 @@ -1,3 +1,3 @@ fedoraeclipse-mylynbugzilla-0.0.2.zip org.eclipse.mylyn -org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2 +org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2 Index: eclipse-mylyn.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- eclipse-mylyn.spec 17 Jul 2008 19:04:13 -0000 1.20 +++ eclipse-mylyn.spec 30 Jul 2008 15:27:13 -0000 1.21 @@ -1,46 +1,38 @@ -%define gcj_support 1 -%define eclipse_base %{_datadir}/eclipse +%define eclipse_base %{_libdir}/eclipse +# Taken from update site so we match upstream +# http://download.eclipse.org/tools/mylyn/update/e3.4/ +%define qualifier v20080716-2300-e3x Name: eclipse-mylyn Summary: Mylyn is a task-focused UI for Eclipse -Version: 2.3.2 -Release: 6%{?dist} +Version: 3.0.1 +Release: 1%{?dist} License: EPL URL: http://www.eclipse.org/mylyn -# no xmlrpc3 on ppc64 due to: -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123 -ExcludeArch: ppc64 - # mkdir temp && cd temp # sh fetch-mylyn.sh -# tar cjf org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2 org.eclipse.mylyn -Source0: org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2 +# tar cjf org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2 org.eclipse.mylyn +Source0: org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2 Source1: fetch-mylyn.sh Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.2.zip -# So we can symlink to dependencies -Patch4: %{name}-unpackwebcore.patch -Patch5: %{name}-webcorejar.patch Patch6: %{name}-addfedoracustomizations.patch +# This is a dependency declared by the Orbit xmlrpc JAR. We don't use +# their JAR and the part of Mylyn using xmlrpc isn't using the +# javax.xml.bind-using part(s) of xmlrpc. +Patch7: %{name}-nojaxb.patch +# Our xmlrpc packages are split into JARs differently than Orbit +Patch8: %{name}-splitxmlrpc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if %{gcj_support} -BuildRequires: gcc-java -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%else BuildRequires: java-devel >= 1.5.0 -%endif -%if ! %{gcj_support} BuildArch: noarch -%endif -BuildRequires: eclipse-pde >= 1:3.3.2 -BuildRequires: eclipse-cvs-client >= 1:3.3.2 +BuildRequires: eclipse-pde >= 1:3.4.0 +BuildRequires: eclipse-cvs-client >= 1:3.4.0 BuildRequires: jakarta-commons-codec >= 1.3-8jpp.2 BuildRequires: jakarta-commons-httpclient >= 1:3.1 BuildRequires: jakarta-commons-logging @@ -48,8 +40,10 @@ BuildRequires: ws-commons-util >= 1.0.1-5 BuildRequires: xmlrpc3-client >= 3.0-1jpp.3 BuildRequires: xmlrpc3-common >= 3.0-1jpp.3 -Requires: eclipse-platform >= 1:3.3.0 -Requires: eclipse-cvs-client >= 1:3.3.0 +BuildRequires: rome +BuildRequires: jdom +Requires: eclipse-platform >= 1:3.4.0 +Requires: eclipse-cvs-client >= 1:3.4.0 Requires: jakarta-commons-codec >= 1.3-8jpp.2 Requires: jakarta-commons-httpclient >= 1:3.1 Requires: jakarta-commons-logging @@ -57,6 +51,8 @@ Requires: ws-commons-util >= 1.0.1-2 Requires: xmlrpc3-client >= 3.0-1jpp.3 Requires: xmlrpc3-common >= 3.0-1jpp.3 +Requires: rome +Requires: jdom Provides: eclipse-mylar = 2.0.0-1.fc7 Obsoletes: eclipse-mylar < 2.0.0 @@ -125,287 +121,133 @@ %setup -q -n org.eclipse.mylyn unzip -q %{SOURCE2} -# FIXME: file these upstream -sed --in-place "s/@Override//" \ - org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/FocusViewHandler.java \ - org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java - -# So we can symlink to jars from another package -pushd org.eclipse.mylyn.web.core -%patch5 -popd +# The tests have dependencies we don't need/want/have +rm -rf *tests* -# So we can symlink to dependencies -pushd org.eclipse.mylyn-feature -%patch4 -popd - -# symlink out to jars we built -pushd org.eclipse.mylyn.web.core/lib-httpclient -rm commons-*.jar -ln -s %{_javadir}/commons-codec-1.3.jar -ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.1.jar -ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar -ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar -popd -pushd org.eclipse.mylyn.web.core/lib-xmlrpc -rm ws-commons-*.jar -rm xmlrpc*.jar -ln -s %{_javadir}/xmlrpc3-client-3.0.jar xmlrpc-client-3.0.jar -ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar -ln -s %{_javadir}/ws-commons-util-1.0.1.jar -popd -pushd org.eclipse.mylyn.web.core/lib-rome -rm *.jar -ln -s %{_javadir}/jdom-1.0.jar -popd -pushd org.eclipse.mylyn.web.core/lib-lang -rm *.jar -ln -s %{_javadir}/commons-lang.jar commons-lang-2.1.jar -popd +mkdir orbitDeps +pushd orbitDeps +ln -s %{_javadir}/commons-codec-1.3.jar org.apache.commons.codec_1.3.0.jar +ln -s %{_javadir}/commons-httpclient.jar org.apache.commons.httpclient_3.1.0.jar +ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.3.0.jar +ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar +ln -s %{_javadir}/commons-logging.jar org.apache.commons.logging_1.0.4.jar +ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar +ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v20080530-1550.jar +ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar +ln -s %{_javadir}/jdom-1.0.jar org.jdom_1.0.0.v200806100616.jar +ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar +popd + +#javax.activation_1.1.0.v200806101325.jar +#javax.xml.bind_2.0.0.v20080604-1500.jar +#javax.mail_1.4.0.v200804091730.jar +#javax.servlet_2.4.0.v200806031604.jar +#org.apache.ant_1.7.0.v200803061910.zip,unpack=true +#javax.xml.rpc_1.1.0.v200806030420.zip,unpack=true +#javax.wsdl_1.5.1.v200806030408.jar +#javax.xml.soap_1.2.0.v200806030421.zip,unpack=true +#org.apache.axis_1.4.0.v200806030120.zip,unpack=true +#org.apache.commons.discovery_0.2.0.v200806030120.zip,unpack=true pushd org.eclipse.mylyn.bugzilla-feature %patch6 popd +%patch7 +%patch8 %build %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.context_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.team_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps +%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.ide_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.trac_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.java_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.pde_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar + -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ + -o `pwd`/orbitDeps %install rm -rf %{buildroot} -install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base} -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ +install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}/dropins + +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn \ build/rpmBuild/org.eclipse.mylyn_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-bugzilla \ build/rpmBuild/org.eclipse.mylyn.bugzilla_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-context \ build/rpmBuild/org.eclipse.mylyn.context_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-ide \ build/rpmBuild/org.eclipse.mylyn.ide_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-trac \ build/rpmBuild/org.eclipse.mylyn.trac_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-java \ build/rpmBuild/org.eclipse.mylyn.java_feature.zip -unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \ +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/mylyn-pde \ build/rpmBuild/org.eclipse.mylyn.pde_feature.zip -# symlink -pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-httpclient -rm commons-*.jar -ln -s %{_javadir}/commons-codec-1.3.jar -ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.1.jar -ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar -ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar -popd -pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-xmlrpc -rm ws-commons-*.jar -rm xmlrpc*.jar -ln -s %{_javadir}/xmlrpc3-client-3.0.jar xmlrpc-client-3.0.jar -ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar -ln -s %{_javadir}/ws-commons-util-1.0.1.jar -popd -pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-rome -ln -s %{_javadir}/jdom-1.0.jar -popd -pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-lang -rm *.jar -ln -s %{_javadir}/commons-lang.jar commons-lang-2.1.jar -popd - -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf %{buildroot} -%if %{gcj_support} -%post -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%postun -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%post bugzilla -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%postun bugzilla -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%post ide -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%postun ide -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%post trac -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%postun trac -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%post java -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi - -%postun java -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files bugzilla %defattr(-,root,root,-) -%{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.core_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar -%{eclipse_base}/plugins/org.fedoraproject.mylyn.bugzilla_*.jar -%dir %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_* -%doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/license.html -%doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/about.html -%doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/epl-v10.html -%{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/feature.xml -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.bugzilla* -%{_libdir}/gcj/%{name}/org.fedoraproject.mylyn.bugzilla* -%endif +%{eclipse_base}/dropins/mylyn-bugzilla %files ide %defattr(-,root,root,-) -%{eclipse_base}/plugins/org.eclipse.mylyn.ide.ui_*.jar -%dir %{eclipse_base}/features/org.eclipse.mylyn.ide_feature_* -%doc %{eclipse_base}/features/org.eclipse.mylyn.ide_feature_*/license.html -%doc %{eclipse_base}/features/org.eclipse.mylyn.ide_feature_*/epl-v10.html -%{eclipse_base}/features/org.eclipse.mylyn.ide_feature_*/feature.xml -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.ide.ui_* -%endif +%{eclipse_base}/dropins/mylyn-ide %files trac %defattr(-,root,root,-) -%{eclipse_base}/plugins/org.eclipse.mylyn.trac.core_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.trac.ui_*.jar -%dir %{eclipse_base}/features/org.eclipse.mylyn.trac_feature_* -%{eclipse_base}/features/org.eclipse.mylyn.trac_feature_*/feature.xml -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.trac* -%endif +%{eclipse_base}/dropins/mylyn-trac %files java %defattr(-,root,root,-) -%{eclipse_base}/plugins/org.eclipse.mylyn.java.ui_*.jar -%dir %{eclipse_base}/features/org.eclipse.mylyn.java_feature_* -%doc %{eclipse_base}/features/org.eclipse.mylyn.java_feature_*/license.html -%doc %{eclipse_base}/features/org.eclipse.mylyn.java_feature_*/epl-v10.html -%{eclipse_base}/features/org.eclipse.mylyn.java_feature_*/feature.xml -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.java* -%endif +%{eclipse_base}/dropins/mylyn-java %files pde %defattr(-,root,root,-) -%{eclipse_base}/plugins/org.eclipse.mylyn.team.ui_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.team.cvs_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.ide_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.ide.ant_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.pde.ui_*.jar -%dir %{eclipse_base}/features/org.eclipse.mylyn.pde_feature_* -%doc %{eclipse_base}/features/org.eclipse.mylyn.pde_feature_*/license.html -%doc %{eclipse_base}/features/org.eclipse.mylyn.pde_feature_*/epl-v10.html -%{eclipse_base}/features/org.eclipse.mylyn.pde_feature_*/feature.xml -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.pde.ui* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.team.ui* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.team.cvs* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.bugzilla.ide* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.ide.ant* -%endif +%{eclipse_base}/dropins/mylyn-pde %files %defattr(-,root,root,-) -%{eclipse_base}/plugins/org.eclipse.mylyn.help.ui_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_* -%{eclipse_base}/plugins/org.eclipse.mylyn.compatibility_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.context.core_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.tasks.ui_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.tasks.core_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.monitor.core_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.monitor.ui_*.jar -%doc %{eclipse_base}/features/org.eclipse.mylyn_feature_*/license.html -%doc %{eclipse_base}/features/org.eclipse.mylyn_feature_*/epl-v10.html -%{eclipse_base}/features/org.eclipse.mylyn_feature_*/feature.xml -%doc %{eclipse_base}/features/org.eclipse.mylyn.context_feature_*/license.html -%doc %{eclipse_base}/features/org.eclipse.mylyn.context_feature_*/epl-v10.html -%{eclipse_base}/features/org.eclipse.mylyn.context_feature_*/feature.xml -%{eclipse_base}/plugins/org.eclipse.mylyn.context.ui_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.web.ui_*.jar -%{eclipse_base}/plugins/org.eclipse.mylyn.resources.ui_*.jar -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.help.ui_* -%{_libdir}/gcj/%{name}/mylyn-webcore* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.compatibility_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.context.core_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.core_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.monitor.core_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.monitor.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.context.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.resources.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.mylyn.web.ui_* -%dir %{_libdir}/gcj/%{name} -%endif +%{eclipse_base}/dropins/mylyn +%{eclipse_base}/dropins/mylyn-context %changelog +* Wed Jul 30 2008 Andrew Overholt 3.0.1-1 +- 3.0.1 +- Add patch to not require jaxb (required by XML-RPC Orbit bundle) + * Thu Jul 17 2008 Tom "spot" Callaway 2.3.2-6 - fix license tag +* Wed May 14 2008 Andrew Overholt 2.3.2-6 +- ".qualifier" -> actual release qualifier in build (due to upstream + build system change (e.o#108291, rh#446468). + * Tue Apr 15 2008 Andrew Overholt 2.3.2-5 - Re-build to attempt to fix rhbz#442251 (broken cpio archive). Index: fetch-mylyn.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fetch-mylyn.sh 4 Apr 2008 19:16:58 -0000 1.4 +++ fetch-mylyn.sh 30 Jul 2008 15:27:13 -0000 1.5 @@ -2,49 +2,54 @@ for f in \ org.eclipse.mylyn \ -org.eclipse.mylyn-feature \ -org.eclipse.mylyn.compatibility \ -org.eclipse.mylyn.bugzilla-feature \ org.eclipse.mylyn.bugzilla.core \ +org.eclipse.mylyn.bugzilla-feature \ org.eclipse.mylyn.bugzilla.ide \ org.eclipse.mylyn.bugzilla.tests \ org.eclipse.mylyn.bugzilla.ui \ +org.eclipse.mylyn.commons.core \ +org.eclipse.mylyn.commons.net \ +org.eclipse.mylyn.commons.ui \ +org.eclipse.mylyn.compatibility \ org.eclipse.mylyn.context.core \ +org.eclipse.mylyn.context-feature \ org.eclipse.mylyn.context.tests \ org.eclipse.mylyn.context.ui \ -org.eclipse.mylyn.context-feature \ +org.eclipse.mylyn-feature \ org.eclipse.mylyn.help.ui \ org.eclipse.mylyn.ide.ant \ -org.eclipse.mylyn.ide.ui \ org.eclipse.mylyn.ide-feature \ org.eclipse.mylyn.ide.tests \ -org.eclipse.mylyn.java.ui \ -org.eclipse.mylyn.java.tests \ +org.eclipse.mylyn.ide.ui \ org.eclipse.mylyn.java-feature \ +org.eclipse.mylyn.java.tasks \ +org.eclipse.mylyn.java.tests \ +org.eclipse.mylyn.java.ui \ org.eclipse.mylyn.monitor.core \ -org.eclipse.mylyn.monitor.ui \ -org.eclipse.mylyn.monitor.tests \ org.eclipse.mylyn.monitor-feature \ +org.eclipse.mylyn.monitor.tests \ +org.eclipse.mylyn.monitor.ui \ org.eclipse.mylyn.monitor.usage \ -org.eclipse.mylyn.pde.ui \ org.eclipse.mylyn.pde-feature \ -org.eclipse.mylyn.resources.ui \ +org.eclipse.mylyn.pde.ui \ org.eclipse.mylyn.resources.tests \ +org.eclipse.mylyn.resources.ui \ +org.eclipse.mylyn.tasks.bugs \ org.eclipse.mylyn.tasks.core \ org.eclipse.mylyn.tasks.tests \ org.eclipse.mylyn.tasks.ui \ org.eclipse.mylyn.team.cvs \ -org.eclipse.mylyn.team.ui \ +org.eclipse.mylyn.team-feature \ org.eclipse.mylyn.team.tests \ +org.eclipse.mylyn.team.ui \ org.eclipse.mylyn.tests \ -org.eclipse.mylyn.trac-feature \ org.eclipse.mylyn.trac.core \ -org.eclipse.mylyn.trac.ui \ +org.eclipse.mylyn.trac-feature \ org.eclipse.mylyn.trac.tests \ -org.eclipse.mylyn.web.core \ +org.eclipse.mylyn.trac.ui \ org.eclipse.mylyn.web.tasks \ org.eclipse.mylyn.web.ui \ ; do cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \ -export -r R_2_3_2_e_3_3 org.eclipse.mylyn/$f; +export -r R_3_0_1 org.eclipse.mylyn/$f; done Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Apr 2008 13:20:10 -0000 1.6 +++ sources 30 Jul 2008 15:27:13 -0000 1.7 @@ -1,2 +1,2 @@ 9bb866cc22d0cdca66074b2aaafb4825 fedoraeclipse-mylynbugzilla-0.0.2.zip -238f978fac59890062a151748cc7fe00 org.eclipse.mylyn-R_2_3_2_e_3_3-fetched-src.tar.bz2 +48e2c7b8a07d821c178d1303b3ff4d33 org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2 --- eclipse-mylyn-unpackwebcore.patch DELETED --- --- eclipse-mylyn-webcorejar.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 15:35:04 2008 From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart)) Date: Wed, 30 Jul 2008 15:35:04 GMT Subject: rpms/libcanberra/devel libcanberra.spec,1.8,1.9 Message-ID: <200807301535.m6UFZ4Jv031274@cvs-int.fedora.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/libcanberra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31251 Modified Files: libcanberra.spec Log Message: Really add versioned dependency on libpulse Index: libcanberra.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libcanberra.spec 29 Jul 2008 23:09:33 -0000 1.8 +++ libcanberra.spec 30 Jul 2008 15:34:34 -0000 1.9 @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz @@ -15,6 +15,7 @@ BuildRequires: gtk-doc BuildRequires: pulseaudio-libs-devel >= 0.9.11-1 Requires: sound-theme-freedesktop +Requires: pulseaudio-libs >= 0.9.11-1 %description A small and lightweight implementation of the XDG Sound Theme Specification @@ -91,6 +92,9 @@ %{_libdir}/pkgconfig/libcanberra.pc %changelog +* Wed Jul 30 2008 Lennart Poettering 0.5-4 +- Really add versioned dependency on libpulse + * Wed Jul 30 2008 Lennart Poettering 0.5-3 - Ship libcanberra-gtk-module.sh directly in CVS From fedora-extras-commits at redhat.com Wed Jul 30 15:43:57 2008 From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef)) Date: Wed, 30 Jul 2008 15:43:57 GMT Subject: rpms/ice/devel ice.spec,1.16,1.17 Message-ID: <200807301543.m6UFhvLM031726@cvs-int.fedora.redhat.com> Author: mef Update of /cvs/pkgs/rpms/ice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31662 Modified Files: ice.spec Log Message: Re-enable .pth file for python Index: ice.spec =================================================================== RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ice.spec 27 Jun 2008 09:22:24 -0000 1.16 +++ ice.spec 30 Jul 2008 15:43:26 -0000 1.17 @@ -4,7 +4,7 @@ Name: ice Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Ice base runtime and services Group: System Environment/Libraries @@ -286,6 +286,7 @@ mv $RPM_BUILD_ROOT/ruby/* ${RPM_BUILD_ROOT}%{ruby_sitearch} mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/Ice mv ${RPM_BUILD_ROOT}/python/* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice +cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{python_sitearch} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} mv $RPM_BUILD_ROOT/config/* ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} @@ -500,7 +501,7 @@ %files python %defattr(644,root,root,755) %{python_sitearch}/Ice/ -# %{python_sitearch}/%{name}.pth +%{python_sitearch}/%{name}.pth %files python-devel %defattr(-,root,root,-) @@ -522,6 +523,10 @@ %config(noreplace) %{_sysconfdir}/php.d/ice.ini %changelog +* Wed Jul 30 2008 Mary Ellen Foster 3.3.0-4 +- Re-add .pth file -- the alternative method involves editing auto-generated + files that say "don't edit" and I don't want to break other parts of Ice + * Fri Jun 27 2008 Mary Ellen Foster 3.3.0-3 - Bump release to fix tag problem and bad date - Add dist back to release field From fedora-extras-commits at redhat.com Wed Jul 30 15:44:31 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 15:44:31 GMT Subject: rpms/sbcl/devel sbcl.spec,1.92,1.93 Message-ID: <200807301544.m6UFiVsn031767@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31730 Modified Files: sbcl.spec Log Message: debugging Index: sbcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- sbcl.spec 30 Jul 2008 14:35:23 -0000 1.92 +++ sbcl.spec 30 Jul 2008 15:44:01 -0000 1.93 @@ -169,6 +169,8 @@ if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then echo "WARNING: ${CONTRIB} awol!" ERROR=1 + echo "ulimit -a" + ulimit -a fi done pushd tests From fedora-extras-commits at redhat.com Wed Jul 30 15:45:03 2008 From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef)) Date: Wed, 30 Jul 2008 15:45:03 GMT Subject: rpms/ice/F-9 ice.spec,1.17,1.18 Message-ID: <200807301545.m6UFj3TV031837@cvs-int.fedora.redhat.com> Author: mef Update of /cvs/pkgs/rpms/ice/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31770 Modified Files: ice.spec Log Message: Re-enable .pth file for python Index: ice.spec =================================================================== RCS file: /cvs/pkgs/rpms/ice/F-9/ice.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ice.spec 27 Jun 2008 09:23:34 -0000 1.17 +++ ice.spec 30 Jul 2008 15:44:33 -0000 1.18 @@ -4,7 +4,7 @@ Name: ice Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Ice base runtime and services Group: System Environment/Libraries @@ -286,6 +286,7 @@ mv $RPM_BUILD_ROOT/ruby/* ${RPM_BUILD_ROOT}%{ruby_sitearch} mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/Ice mv ${RPM_BUILD_ROOT}/python/* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice +cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{python_sitearch} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} mv $RPM_BUILD_ROOT/config/* ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} @@ -500,7 +501,7 @@ %files python %defattr(644,root,root,755) %{python_sitearch}/Ice/ -# %{python_sitearch}/%{name}.pth +%{python_sitearch}/%{name}.pth %files python-devel %defattr(-,root,root,-) @@ -522,6 +523,10 @@ %config(noreplace) %{_sysconfdir}/php.d/ice.ini %changelog +* Wed Jul 30 2008 Mary Ellen Foster 3.3.0-4 +- Re-add .pth file -- the alternative method involves editing auto-generated + files that say "don't edit" and I don't want to break other parts of Ice + * Fri Jun 27 2008 Mary Ellen Foster 3.3.0-3 - Bump release to fix tag problem and bad date - Add dist back to release field From fedora-extras-commits at redhat.com Wed Jul 30 15:45:53 2008 From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef)) Date: Wed, 30 Jul 2008 15:45:53 GMT Subject: rpms/ice/F-8 ice.spec,1.11,1.12 Message-ID: <200807301545.m6UFjrrv031900@cvs-int.fedora.redhat.com> Author: mef Update of /cvs/pkgs/rpms/ice/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856 Modified Files: ice.spec Log Message: Re-enable .pth file for python Index: ice.spec =================================================================== RCS file: /cvs/pkgs/rpms/ice/F-8/ice.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ice.spec 27 Jun 2008 09:24:32 -0000 1.11 +++ ice.spec 30 Jul 2008 15:45:23 -0000 1.12 @@ -4,7 +4,7 @@ Name: ice Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Ice base runtime and services Group: System Environment/Libraries @@ -286,6 +286,7 @@ mv $RPM_BUILD_ROOT/ruby/* ${RPM_BUILD_ROOT}%{ruby_sitearch} mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/Ice mv ${RPM_BUILD_ROOT}/python/* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice +cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{python_sitearch} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} mv $RPM_BUILD_ROOT/config/* ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} @@ -500,7 +501,7 @@ %files python %defattr(644,root,root,755) %{python_sitearch}/Ice/ -# %{python_sitearch}/%{name}.pth +%{python_sitearch}/%{name}.pth %files python-devel %defattr(-,root,root,-) @@ -522,6 +523,10 @@ %config(noreplace) %{_sysconfdir}/php.d/ice.ini %changelog +* Wed Jul 30 2008 Mary Ellen Foster 3.3.0-4 +- Re-add .pth file -- the alternative method involves editing auto-generated + files that say "don't edit" and I don't want to break other parts of Ice + * Fri Jun 27 2008 Mary Ellen Foster 3.3.0-3 - Bump release to fix tag problem and bad date - Add dist back to release field From fedora-extras-commits at redhat.com Wed Jul 30 15:55:20 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Wed, 30 Jul 2008 15:55:20 GMT Subject: rpms/lyx/F-9 .cvsignore, 1.28, 1.29 lyx.spec, 1.68, 1.69 sources, 1.26, 1.27 Message-ID: <200807301555.m6UFtKPB032401@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/lyx/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32352 Modified Files: .cvsignore lyx.spec sources Log Message: * Wed Jul 30 2008 Jos?? Matos - 1.5.6-1 - lyx-1.5.6 - require tex-simplecv (#428526) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lyx/F-9/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 18 May 2008 00:59:37 -0000 1.28 +++ .cvsignore 30 Jul 2008 15:54:50 -0000 1.29 @@ -1 +1 @@ -lyx-1.5.5.tar.bz2 +lyx-1.5.6.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/pkgs/rpms/lyx/F-9/lyx.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- lyx.spec 18 May 2008 00:59:37 -0000 1.68 +++ lyx.spec 30 Jul 2008 15:54:50 -0000 1.69 @@ -1,7 +1,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.5.5 +Version: 1.5.6 Release: 1%{?dist} License: GPLv2+ @@ -34,7 +34,7 @@ %if 0%{?fedora} > 8 BuildRequires: tex(dvips) tex(latex) texlive-fonts -Requires: tex(dvips) tex(latex) +Requires: tex(dvips) tex(latex) %else BuildRequires: tetex-dvips tetex-latex tetex-fonts Requires: tetex-dvips tetex-latex @@ -51,6 +51,7 @@ Requires(hint): wv %endif Requires(hint): xdg-utils +Requires: tex-simplecv %description LyX is a modern approach to writing documents which breaks with the @@ -174,6 +175,10 @@ %changelog +* Wed Jul 30 2008 Jos?? Matos - 1.5.6-1 +- lyx-1.5.6 +- require tex-simplecv (#428526) + * Mon May 12 2008 Rex Dieter 1.5.5-1 - lyx-1.5.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lyx/F-9/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 18 May 2008 00:59:37 -0000 1.26 +++ sources 30 Jul 2008 15:54:50 -0000 1.27 @@ -1 +1 @@ -310bf760e8fdf85c7ad3a19b90ddc91c lyx-1.5.5.tar.bz2 +69f2eecba80b143554911c8b3d814a0e lyx-1.5.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 15:58:30 2008 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Wed, 30 Jul 2008 15:58:30 GMT Subject: rpms/hippo-canvas/devel hippo-canvas.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200807301558.m6UFwUnD032757@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/hippo-canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32702 Modified Files: hippo-canvas.spec sources Log Message: Update to 0.3.0 (adds SVG support) Index: hippo-canvas.spec =================================================================== RCS file: /cvs/extras/rpms/hippo-canvas/devel/hippo-canvas.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hippo-canvas.spec 20 Jun 2008 15:32:51 -0000 1.13 +++ hippo-canvas.spec 30 Jul 2008 15:58:00 -0000 1.14 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: hippo-canvas -Version: 0.2.34 -Release: 1%{?dist} +Version: 0.3.0 +Release: 2%{?dist} Summary: A canvas widget Group: System Environment/Libraries @@ -16,6 +16,7 @@ BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: libcroco-devel +BuildRequires: librsvg2-devel %description The hippo-canvas library contains a canvas widget developed by the @@ -86,6 +87,9 @@ %{python_sitearch}/*.so %changelog +* Sun Jul 6 2008 Owen Taylor - 0.3.0-2 +- Update to 0.3.0 (adds SVG support) + * Thu Jun 19 2008 Owen Taylor - 0.2.34-1 - Update to 0.2.34 (Fixes crash when destroying HippoCanvasWidget) Index: sources =================================================================== RCS file: /cvs/extras/rpms/hippo-canvas/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Jun 2008 15:32:51 -0000 1.10 +++ sources 30 Jul 2008 15:58:00 -0000 1.11 @@ -1 +1,2 @@ c7915c93b8b095b73808f3d3e3454c33 hippo-canvas-0.2.34.tar.gz +64e10c73054ce10177855213152e6238 hippo-canvas-0.3.0.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 16:22:03 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 30 Jul 2008 16:22:03 GMT Subject: rpms/smb4k/devel .cvsignore, 1.24, 1.25 smb4k.spec, 1.35, 1.36 sources, 1.24, 1.25 Message-ID: <200807301622.m6UGM355009030@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/smb4k/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8923 Modified Files: .cvsignore smb4k.spec sources Log Message: - Update to 0.9.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 2 Jun 2008 18:16:51 -0000 1.24 +++ .cvsignore 30 Jul 2008 16:21:33 -0000 1.25 @@ -1 +1 @@ -smb4k-0.9.5.tar.bz2 +smb4k-0.9.6.tar.bz2 Index: smb4k.spec =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/devel/smb4k.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- smb4k.spec 2 Jun 2008 18:16:51 -0000 1.35 +++ smb4k.spec 30 Jul 2008 16:21:33 -0000 1.36 @@ -1,5 +1,5 @@ Name: smb4k -Version: 0.9.5 +Version: 0.9.6 Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE @@ -101,6 +101,9 @@ %{_libdir}/libsmb4kc*.so %changelog +* Wed Jul 30 2008 Marcin Garski 0.9.6-1 +- Update to 0.9.6 + * Mon Jun 02 2008 Marcin Garski 0.9.5-1 - Update to 0.9.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 2 Jun 2008 18:16:51 -0000 1.24 +++ sources 30 Jul 2008 16:21:33 -0000 1.25 @@ -1 +1 @@ -fcddc095301c5d2f31b2aa883d30f3ba smb4k-0.9.5.tar.bz2 +e02948415fc2b56c4f6bf0c6dff9dbad smb4k-0.9.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 16:23:39 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 30 Jul 2008 16:23:39 GMT Subject: rpms/xterm/devel .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 xterm.spec, 1.67, 1.68 Message-ID: <200807301623.m6UGNdpD009305@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9173 Modified Files: .cvsignore sources xterm.spec Log Message: - update to 236 - enable support for spawn-new-terminal action (#457130) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 22 Apr 2008 16:45:01 -0000 1.29 +++ .cvsignore 30 Jul 2008 16:23:09 -0000 1.30 @@ -1,2 +1,2 @@ 16colors.txt -xterm-235.tgz +xterm-236.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 22 Apr 2008 16:45:01 -0000 1.29 +++ sources 30 Jul 2008 16:23:09 -0000 1.30 @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -5060cab9cef0ea09a24928f3c7fbde2b xterm-235.tgz +204288c9de867679fc8201f4fb153772 xterm-236.tgz Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- xterm.spec 22 Apr 2008 16:45:01 -0000 1.67 +++ xterm.spec 30 Jul 2008 16:23:09 -0000 1.68 @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 235 +Version: 236 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -36,6 +36,7 @@ %build %configure \ --enable-256-color \ + --enable-exec-xterm \ --enable-luit \ %if %{with trace} --enable-trace \ @@ -81,6 +82,10 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Wed Jul 30 2008 Miroslav Lichvar 236-1 +- update to 236 +- enable support for spawn-new-terminal action (#457130) + * Tue Apr 22 2008 Miroslav Lichvar 235-1 - update to 235 From fedora-extras-commits at redhat.com Wed Jul 30 16:24:20 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 30 Jul 2008 16:24:20 GMT Subject: rpms/kernel/devel kernel.spec,1.821,1.822 Message-ID: <200807301624.m6UGOKwx009418@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9296 Modified Files: kernel.spec Log Message: Remove flag args from kernel_variant_posttrans kernel_variant_posttrans only takes a single arg, so don't bother using flag arguments since they're a bit more confusing. Note that the macro invocation didn't actually pass it a flag arg, but it seemed to have access to the calling macros flag args anyway. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.821 retrieving revision 1.822 diff -u -r1.821 -r1.822 --- kernel.spec 29 Jul 2008 18:45:42 -0000 1.821 +++ kernel.spec 30 Jul 2008 16:23:50 -0000 1.822 @@ -1527,7 +1527,7 @@ # # This macro defines a %%post script for a kernel*-devel package. -# %%kernel_devel_post +# %%kernel_devel_post [] # %define kernel_devel_post() \ %{expand:%%post %{?1:%{1}-}devel}\ @@ -1545,12 +1545,12 @@ %{nil} # This macro defines a %%posttrans script for a kernel package. -# %%kernel_variant_posttrans [-v ] [-s -r ] +# %%kernel_variant_posttrans [] # More text can follow to go at the end of this variant's %%post. # -%define kernel_variant_posttrans(s:r:v:) \ -%{expand:%%posttrans %{?-v*}}\ -/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{KVERREL}%{?-v:.%{-v*}} || exit $?\ +%define kernel_variant_posttrans() \ +%{expand:%%posttrans %{?1}}\ +/sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\ %{nil} # From fedora-extras-commits at redhat.com Wed Jul 30 16:24:41 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 30 Jul 2008 16:24:41 GMT Subject: rpms/smb4k/F-9 .cvsignore, 1.22, 1.23 smb4k.spec, 1.33, 1.34 sources, 1.22, 1.23 Message-ID: <200807301624.m6UGOfJA009453@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/smb4k/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9385 Modified Files: .cvsignore smb4k.spec sources Log Message: - Update to 0.9.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Feb 2008 23:22:01 -0000 1.22 +++ .cvsignore 30 Jul 2008 16:24:11 -0000 1.23 @@ -1 +1 @@ -smb4k-0.9.3.tar.bz2 +smb4k-0.9.6.tar.bz2 Index: smb4k.spec =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/F-9/smb4k.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- smb4k.spec 29 Feb 2008 23:40:50 -0000 1.33 +++ smb4k.spec 30 Jul 2008 16:24:11 -0000 1.34 @@ -1,6 +1,6 @@ Name: smb4k -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.6 +Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE Group: Applications/Internet @@ -101,6 +101,9 @@ %{_libdir}/libsmb4kc*.so %changelog +* Wed Jul 30 2008 Marcin Garski 0.9.6-1 +- Update to 0.9.6 + * Sat Mar 01 2008 Marcin Garski 0.9.3-2 - Include .la files (bug #435149) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Feb 2008 23:22:01 -0000 1.22 +++ sources 30 Jul 2008 16:24:11 -0000 1.23 @@ -1 +1 @@ -f3a7f08c442c9db821244c8b5d3d4718 smb4k-0.9.3.tar.bz2 +e02948415fc2b56c4f6bf0c6dff9dbad smb4k-0.9.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 16:26:32 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 30 Jul 2008 16:26:32 GMT Subject: rpms/kernel/devel kernel.spec,1.822,1.823 Message-ID: <200807301626.m6UGQWcd009771@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9587 Modified Files: kernel.spec Log Message: Change how we do DEFAULTKERNEL replaces. The -r arg is redundant because we already now the variant name so we can use kernel%{?-v:-%{-v*}} instead. Also, rename the -s arg to -r and drop the existing meaning of -r. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.822 retrieving revision 1.823 diff -u -r1.822 -r1.823 --- kernel.spec 30 Jul 2008 16:23:50 -0000 1.822 +++ kernel.spec 30 Jul 2008 16:26:01 -0000 1.823 @@ -1555,17 +1555,17 @@ # # This macro defines a %%post script for a kernel package and its devel package. -# %%kernel_variant_post [-v ] [-s -r ] +# %%kernel_variant_post [-v ] [-r ] # More text can follow to go at the end of this variant's %%post. # -%define kernel_variant_post(s:r:v:) \ +%define kernel_variant_post(v:r:) \ %{expand:%%kernel_devel_post %{?-v*}}\ %{expand:%%kernel_variant_posttrans %{?-v*}}\ %{expand:%%post %{?-v*}}\ -%{-s:\ +%{-r:\ if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\ [ -f /etc/sysconfig/kernel ]; then\ - /bin/sed -i -e 's/^DEFAULTKERNEL=%{-s*}$/DEFAULTKERNEL=%{-r*}/' /etc/sysconfig/kernel || exit $?\ + /bin/sed -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\ fi}\ /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\ #if [ -x /sbin/weak-modules ]\ @@ -1588,18 +1588,18 @@ %{nil} %kernel_variant_preun -%kernel_variant_post -s kernel-smp -r kernel +%kernel_variant_post -r kernel-smp %kernel_variant_preun smp %kernel_variant_post -v smp %kernel_variant_preun PAE -%kernel_variant_post -v PAE -s kernel-smp -r kernel-PAE +%kernel_variant_post -v PAE -r kernel-smp %kernel_variant_preun debug %kernel_variant_post -v debug -%kernel_variant_post -v PAEdebug -s kernel-smp -r kernel-PAEdebug +%kernel_variant_post -v PAEdebug -r kernel-smp %kernel_variant_preun PAEdebug if [ -x /sbin/ldconfig ] From fedora-extras-commits at redhat.com Wed Jul 30 16:28:21 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 30 Jul 2008 16:28:21 GMT Subject: rpms/kernel/devel kernel.spec,1.823,1.824 Message-ID: <200807301628.m6UGSLAw010058@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9972 Modified Files: kernel.spec Log Message: * Wed Jul 30 2008 Mark McLoughlin - Replace kernel-xen in DEFAULTKERNEL (#456558) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.823 retrieving revision 1.824 diff -u -r1.823 -r1.824 --- kernel.spec 30 Jul 2008 16:26:01 -0000 1.823 +++ kernel.spec 30 Jul 2008 16:27:51 -0000 1.824 @@ -1565,7 +1565,7 @@ %{-r:\ if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\ [ -f /etc/sysconfig/kernel ]; then\ - /bin/sed -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\ + /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\ fi}\ /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\ #if [ -x /sbin/weak-modules ]\ @@ -1588,18 +1588,22 @@ %{nil} %kernel_variant_preun +%ifarch x86_64 +%kernel_variant_post -r (kernel-smp|kernel-xen) +%else %kernel_variant_post -r kernel-smp +%endif %kernel_variant_preun smp %kernel_variant_post -v smp %kernel_variant_preun PAE -%kernel_variant_post -v PAE -r kernel-smp +%kernel_variant_post -v PAE -r (kernel-smp|kernel-xen) %kernel_variant_preun debug %kernel_variant_post -v debug -%kernel_variant_post -v PAEdebug -r kernel-smp +%kernel_variant_post -v PAEdebug -r (kernel-smp|kernel-xen) %kernel_variant_preun PAEdebug if [ -x /sbin/ldconfig ] @@ -1706,6 +1710,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Wed Jul 30 2008 Mark McLoughlin +- Replace kernel-xen in DEFAULTKERNEL (#456558) + * Tue Jul 29 2008 Dave Jones - Disable CONFIG_VIDEO_ADV_DEBUG (#456751) From fedora-extras-commits at redhat.com Wed Jul 30 16:31:20 2008 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 30 Jul 2008 16:31:20 GMT Subject: rpms/smb4k/F-8 .cvsignore, 1.20, 1.21 smb4k.spec, 1.26, 1.27 sources, 1.20, 1.21 Message-ID: <200807301631.m6UGVK2g010578@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/pkgs/rpms/smb4k/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10477 Modified Files: .cvsignore smb4k.spec sources Log Message: - Update to 0.9.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/F-8/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 27 Feb 2008 23:27:08 -0000 1.20 +++ .cvsignore 30 Jul 2008 16:30:50 -0000 1.21 @@ -1 +1 @@ -smb4k-0.9.3.tar.bz2 +smb4k-0.9.6.tar.bz2 Index: smb4k.spec =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/F-8/smb4k.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- smb4k.spec 29 Feb 2008 23:37:58 -0000 1.26 +++ smb4k.spec 30 Jul 2008 16:30:50 -0000 1.27 @@ -1,6 +1,6 @@ Name: smb4k -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.6 +Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE Group: Applications/Internet @@ -56,10 +56,6 @@ ln -sf ../common popd -# Ugly workaround for broken libtool archive -sed -i -e "s:-L%{_builddir}/%{name}-%{version}/smb4k/core ::" \ - $RPM_BUILD_ROOT%{_libdir}/kde3/konqsidebar_smb4k.la - %find_lang %{name} # Bug #435149 @@ -106,6 +102,9 @@ %{_libdir}/libsmb4kc*.so %changelog +* Wed Jul 30 2008 Marcin Garski 0.9.6-1 +- Update to 0.9.6 + * Sat Mar 01 2008 Marcin Garski 0.9.3-2 - Update to 0.9.3 (bug #435149) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smb4k/F-8/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 27 Feb 2008 23:27:08 -0000 1.20 +++ sources 30 Jul 2008 16:30:50 -0000 1.21 @@ -1 +1 @@ -f3a7f08c442c9db821244c8b5d3d4718 smb4k-0.9.3.tar.bz2 +e02948415fc2b56c4f6bf0c6dff9dbad smb4k-0.9.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 16:31:35 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 16:31:35 GMT Subject: rpms/spandsp/devel spandsp.spec,1.25,1.26 Message-ID: <200807301631.m6UGVZ3V010666@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/spandsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10535 Modified Files: spandsp.spec Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 0.0.5-0.1.pre4 - Update to 0.0.5pre4 Index: spandsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/spandsp/devel/spandsp.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- spandsp.spec 30 Jul 2008 14:58:31 -0000 1.25 +++ spandsp.spec 30 Jul 2008 16:31:05 -0000 1.26 @@ -87,6 +87,9 @@ %postun -p /sbin/ldconfig %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 0.0.5-0.1.pre4 +- Update to 0.0.5pre4 + * Thu Mar 20 2008 Jeffrey C. Ollie - 0.0.4-0.10.pre18 - Update to 0.0.4pre18 From fedora-extras-commits at redhat.com Wed Jul 30 16:33:13 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 30 Jul 2008 16:33:13 GMT Subject: rpms/xterm/F-9 .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 xterm.spec, 1.67, 1.68 Message-ID: <200807301633.m6UGXDZr010982@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10723 Modified Files: .cvsignore sources xterm.spec Log Message: - update to 236 - enable support for spawn-new-terminal action (#457130) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-9/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 22 Apr 2008 16:47:14 -0000 1.29 +++ .cvsignore 30 Jul 2008 16:32:43 -0000 1.30 @@ -1,2 +1,2 @@ 16colors.txt -xterm-235.tgz +xterm-236.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-9/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 22 Apr 2008 16:47:14 -0000 1.29 +++ sources 30 Jul 2008 16:32:43 -0000 1.30 @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -5060cab9cef0ea09a24928f3c7fbde2b xterm-235.tgz +204288c9de867679fc8201f4fb153772 xterm-236.tgz Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-9/xterm.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- xterm.spec 22 Apr 2008 16:47:14 -0000 1.67 +++ xterm.spec 30 Jul 2008 16:32:43 -0000 1.68 @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 235 +Version: 236 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -36,6 +36,7 @@ %build %configure \ --enable-256-color \ + --enable-exec-xterm \ --enable-luit \ %if %{with trace} --enable-trace \ @@ -81,6 +82,10 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Wed Jul 30 2008 Miroslav Lichvar 236-1 +- update to 236 +- enable support for spawn-new-terminal action (#457130) + * Tue Apr 22 2008 Miroslav Lichvar 235-1 - update to 235 From fedora-extras-commits at redhat.com Wed Jul 30 16:33:18 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Wed, 30 Jul 2008 16:33:18 GMT Subject: rpms/lyx/F-8 .cvsignore, 1.28, 1.29 lyx.spec, 1.67, 1.68 sources, 1.26, 1.27 Message-ID: <200807301633.m6UGXIEQ011033@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/pkgs/rpms/lyx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10875 Modified Files: .cvsignore lyx.spec sources Log Message: * Wed Jul 30 2008 Jos?? Matos - 1.5.6-1 - lyx-1.5.6 - require tex-simplecv (#428526) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lyx/F-8/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 18 May 2008 01:05:50 -0000 1.28 +++ .cvsignore 30 Jul 2008 16:32:48 -0000 1.29 @@ -1 +1 @@ -lyx-1.5.5.tar.bz2 +lyx-1.5.6.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/pkgs/rpms/lyx/F-8/lyx.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- lyx.spec 18 May 2008 01:05:50 -0000 1.67 +++ lyx.spec 30 Jul 2008 16:32:48 -0000 1.68 @@ -1,7 +1,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.5.5 +Version: 1.5.6 Release: 1%{?dist} License: GPLv2+ @@ -34,7 +34,7 @@ %if 0%{?fedora} > 8 BuildRequires: tex(dvips) tex(latex) texlive-fonts -Requires: tex(dvips) tex(latex) +Requires: tex(dvips) tex(latex) %else BuildRequires: tetex-dvips tetex-latex tetex-fonts Requires: tetex-dvips tetex-latex @@ -51,6 +51,7 @@ Requires(hint): wv %endif Requires(hint): xdg-utils +Requires: tex-simplecv %description LyX is a modern approach to writing documents which breaks with the @@ -174,6 +175,10 @@ %changelog +* Wed Jul 30 2008 Jos?? Matos - 1.5.6-1 +- lyx-1.5.6 +- require tex-simplecv (#428526) + * Mon May 12 2008 Rex Dieter 1.5.5-1 - lyx-1.5.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lyx/F-8/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 18 May 2008 01:05:50 -0000 1.26 +++ sources 30 Jul 2008 16:32:48 -0000 1.27 @@ -1 +1 @@ -310bf760e8fdf85c7ad3a19b90ddc91c lyx-1.5.5.tar.bz2 +69f2eecba80b143554911c8b3d814a0e lyx-1.5.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 16:34:42 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Wed, 30 Jul 2008 16:34:42 GMT Subject: rpms/xterm/F-8 .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 xterm.spec, 1.66, 1.67 Message-ID: <200807301634.m6UGYgUf011294@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11217 Modified Files: .cvsignore sources xterm.spec Log Message: - update to 236 - enable support for spawn-new-terminal action (#457130) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-8/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 22 Apr 2008 16:49:19 -0000 1.28 +++ .cvsignore 30 Jul 2008 16:34:12 -0000 1.29 @@ -1,2 +1,2 @@ 16colors.txt -xterm-235.tgz +xterm-236.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-8/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 22 Apr 2008 16:49:19 -0000 1.28 +++ sources 30 Jul 2008 16:34:12 -0000 1.29 @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -5060cab9cef0ea09a24928f3c7fbde2b xterm-235.tgz +204288c9de867679fc8201f4fb153772 xterm-236.tgz Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-8/xterm.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- xterm.spec 22 Apr 2008 16:49:19 -0000 1.66 +++ xterm.spec 30 Jul 2008 16:34:12 -0000 1.67 @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 235 +Version: 236 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -36,6 +36,7 @@ %build %configure \ --enable-256-color \ + --enable-exec-xterm \ --enable-luit \ %if %{with trace} --enable-trace \ @@ -81,6 +82,10 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Wed Jul 30 2008 Miroslav Lichvar 236-1 +- update to 236 +- enable support for spawn-new-terminal action (#457130) + * Tue Apr 22 2008 Miroslav Lichvar 235-1 - update to 235 From fedora-extras-commits at redhat.com Wed Jul 30 16:38:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 16:38:10 +0000 Subject: [pkgdb] pyroom was added for sundaram Message-ID: <20080730163815.C98AC1AD0E3@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package pyroom with summary PyRoom is a full screen text editor and a clone of Writeroom Kevin Fenzi (kevin) has approved Package pyroom Kevin Fenzi (kevin) has added a Fedora devel branch for pyroom with an owner of sundaram Kevin Fenzi (kevin) has approved pyroom in Fedora devel Kevin Fenzi (kevin) has approved Package pyroom Kevin Fenzi (kevin) has set commit to Approved for packager on pyroom (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on pyroom (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on pyroom (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on pyroom (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on pyroom (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on pyroom (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyroom From fedora-extras-commits at redhat.com Wed Jul 30 16:38:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 16:38:15 +0000 Subject: [pkgdb] pyroom (Fedora, devel) updated by kevin Message-ID: <20080730163816.8B8C01AD0EB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved packager for commit access on pyroom (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyroom From fedora-extras-commits at redhat.com Wed Jul 30 16:38:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 16:38:15 +0000 Subject: [pkgdb] pyroom (Fedora, 8) updated by kevin Message-ID: <20080730163817.4219D1AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for pyroom Kevin Fenzi (kevin) has set commit to Approved for packager on pyroom (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for packager on pyroom (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for packager on pyroom (Fedora 8) Kevin Fenzi (kevin) Approved packager for commit access on pyroom (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyroom From fedora-extras-commits at redhat.com Wed Jul 30 16:38:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:38:28 GMT Subject: rpms/pyroom Makefile,NONE,1.1 Message-ID: <200807301638.m6UGcSxx012018@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyroom In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss11927/rpms/pyroom Added Files: Makefile Log Message: Setup of module pyroom --- NEW FILE Makefile --- # Top level Makefile for module pyroom all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 30 16:38:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:38:28 GMT Subject: rpms/pyroom/devel - New directory Message-ID: <200807301638.m6UGcSWw011995@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyroom/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss11927/rpms/pyroom/devel Log Message: Directory /cvs/extras/rpms/pyroom/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 30 16:38:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:38:29 GMT Subject: rpms/pyroom/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807301638.m6UGcTDO012033@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyroom/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss11927/rpms/pyroom/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pyroom --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pyroom # $Id: Makefile,v 1.1 2008/07/30 16:38:29 kevin Exp $ NAME := pyroom SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 30 16:38:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:38:28 GMT Subject: rpms/pyroom - New directory Message-ID: <200807301638.m6UGcSwt011981@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/pyroom In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss11927/rpms/pyroom Log Message: Directory /cvs/extras/rpms/pyroom added to the repository From fedora-extras-commits at redhat.com Wed Jul 30 16:38:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 16:38:15 +0000 Subject: [pkgdb] pyroom (Fedora, 9) updated by kevin Message-ID: <20080730163823.0FDC71AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for pyroom Kevin Fenzi (kevin) has set commit to Approved for packager on pyroom (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on pyroom (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on pyroom (Fedora 9) Kevin Fenzi (kevin) Approved packager for commit access on pyroom (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyroom From fedora-extras-commits at redhat.com Wed Jul 30 16:38:42 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 16:38:42 GMT Subject: rpms/callweaver/devel .cvsignore, 1.4, 1.5 callweaver.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200807301638.m6UGcgQd012202@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/callweaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11849 Modified Files: .cvsignore callweaver.spec sources Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1 - Update to release 1.2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/callweaver/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Dec 2007 13:33:53 -0000 1.4 +++ .cvsignore 30 Jul 2008 16:38:12 -0000 1.5 @@ -1 +1 @@ -callweaver-RC-1.1.99.20071230.tar.gz +callweaver-1.2.0.1.tar.bz2 Index: callweaver.spec =================================================================== RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- callweaver.spec 19 Feb 2008 01:57:46 -0000 1.12 +++ callweaver.spec 30 Jul 2008 16:38:12 -0000 1.13 @@ -1,4 +1,4 @@ -%define snap 20071230 +#define snap 20071230 %bcond_without misdn %bcond_without zaptel @@ -6,17 +6,22 @@ %bcond_without fedora Name: callweaver -Version: 1.2 -Release: 0.5.rc5.%{snap}%{?dist} +Version: 1.2.0.1 +Release: 1%{?snap:.%{snap}}%{?dist} Summary: The Truly Open Source PBX Group: Applications/Internet License: GPLv2 URL: http://www.callweaver.org/ -Source0: http://devs.callweaver.org/1.2_snapshots/callweaver-RC-1.1.99.%{snap}.tar.gz + +Source0: http://devs.callweaver.org/release/callweaver-%{version}.tar.bz2 + +# Patch from upstream SVN for compatibility with spandsp 0.0.5pre4 +Patch1: 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: spandsp-devel >= 0.0.4-0.1.pre4 +BuildRequires: spandsp-devel >= 0.0.5-0.1.pre4 BuildRequires: %{?snap:libtool automake autoconf} zlib-devel BuildRequires: fedora-usermgmt-devel bluez-libs-devel openldap-devel BuildRequires: libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel @@ -170,7 +175,8 @@ %prep -%setup -q -n callweaver-RC-1.1.99.%{snap} +%setup0 -q +%patch1 -p1 %build %if 0%{?snap} @@ -264,7 +270,7 @@ %{_libdir}/callweaver/lib*.so.* %dir %attr(0755,-,-) %{_libdir}/callweaver/modules %{_libdir}/callweaver/modules/*.so -%{_mandir}/man8/callweaver.8.gz +#%{_mandir}/man8/callweaver.8.gz %dir %{_datadir}/callweaver %dir %attr(0755,callweaver,callweaver) %{_sysconfdir}/callweaver %config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/* @@ -371,6 +377,9 @@ %{_sbindir}/eogi* %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1 +- Update to release 1.2.0.1 + * Mon Feb 18 2008 Fedora Release Engineering - 1.2-0.5.rc5.20071230 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/callweaver/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Dec 2007 13:33:53 -0000 1.4 +++ sources 30 Jul 2008 16:38:12 -0000 1.5 @@ -1 +1 @@ -fd253b6866ce59c95717d1c16a36a459 callweaver-RC-1.1.99.20071230.tar.gz +624b2f0d81f91c235adf587061b634b6 callweaver-1.2.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 16:39:12 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 16:39:12 GMT Subject: rpms/spandsp/F-9 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 spandsp.spec, 1.24, 1.25 Message-ID: <200807301639.m6UGdCRb012312@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/spandsp/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12180 Modified Files: .cvsignore sources spandsp.spec Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 0.0.5-0.1.pre4 - Update to 0.0.5pre4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/spandsp/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 20 Mar 2008 21:14:18 -0000 1.19 +++ .cvsignore 30 Jul 2008 16:38:42 -0000 1.20 @@ -1 +1 @@ -spandsp-0.0.4pre18.tgz +spandsp-0.0.5pre4.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/spandsp/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 20 Mar 2008 21:14:18 -0000 1.19 +++ sources 30 Jul 2008 16:38:42 -0000 1.20 @@ -1 +1 @@ -888ee407208fdfecbe1c7c98ae53e441 spandsp-0.0.4pre18.tgz +fe83ed37a7831f0dd38e7ef4e7e6fd9e spandsp-0.0.5pre4.tgz Index: spandsp.spec =================================================================== RCS file: /cvs/pkgs/rpms/spandsp/F-9/spandsp.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- spandsp.spec 20 Mar 2008 21:14:18 -0000 1.24 +++ spandsp.spec 30 Jul 2008 16:38:42 -0000 1.25 @@ -1,10 +1,10 @@ -%define pre 18 +%define pre 4 Summary: A DSP library for telephony Name: spandsp -Version: 0.0.4 -Release: 0.10%{?pre:.pre%{pre}}%{?dist} -License: GPLv2 +Version: 0.0.5 +Release: 0.1%{?pre:.pre%{pre}}%{?dist} +License: LGPLv2 and GPLv2 Group: System Environment/Libraries URL: http://www.soft-switch.org/ Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}.tgz @@ -59,13 +59,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm %{buildroot}%{_libdir}/libspandsp.la +mkdir -p %{buildroot}%{_datadir}/spandsp %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README +%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README %{_libdir}/libspandsp.so.* @@ -86,6 +87,9 @@ %postun -p /sbin/ldconfig %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 0.0.5-0.1.pre4 +- Update to 0.0.5pre4 + * Thu Mar 20 2008 Jeffrey C. Ollie - 0.0.4-0.10.pre18 - Update to 0.0.4pre18 From fedora-extras-commits at redhat.com Wed Jul 30 16:41:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 16:41:35 +0000 Subject: [pkgdb] inadyn-mt was added for s4504kr Message-ID: <20080730164136.4F2DE1AD0E7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package inadyn-mt with summary Dynamic DNS Client Kevin Fenzi (kevin) has approved Package inadyn-mt Kevin Fenzi (kevin) has added a Fedora devel branch for inadyn-mt with an owner of s4504kr Kevin Fenzi (kevin) has approved inadyn-mt in Fedora devel Kevin Fenzi (kevin) has approved Package inadyn-mt Kevin Fenzi (kevin) has set commit to Approved for packager on inadyn-mt (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on inadyn-mt (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on inadyn-mt (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on inadyn-mt (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on inadyn-mt (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on inadyn-mt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/inadyn-mt From fedora-extras-commits at redhat.com Wed Jul 30 16:41:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:41:43 GMT Subject: rpms/inadyn-mt/devel - New directory Message-ID: <200807301641.m6UGfhGo012755@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/inadyn-mt/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12708/rpms/inadyn-mt/devel Log Message: Directory /cvs/extras/rpms/inadyn-mt/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 30 16:41:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:41:44 GMT Subject: rpms/inadyn-mt Makefile,NONE,1.1 Message-ID: <200807301641.m6UGfiHx012778@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/inadyn-mt In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12708/rpms/inadyn-mt Added Files: Makefile Log Message: Setup of module inadyn-mt --- NEW FILE Makefile --- # Top level Makefile for module inadyn-mt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Jul 30 16:41:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:41:43 GMT Subject: rpms/inadyn-mt - New directory Message-ID: <200807301641.m6UGfhn5012741@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/inadyn-mt In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12708/rpms/inadyn-mt Log Message: Directory /cvs/extras/rpms/inadyn-mt added to the repository From fedora-extras-commits at redhat.com Wed Jul 30 16:41:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 30 Jul 2008 16:41:44 GMT Subject: rpms/inadyn-mt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807301641.m6UGfiAZ012793@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/inadyn-mt/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12708/rpms/inadyn-mt/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module inadyn-mt --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: inadyn-mt # $Id: Makefile,v 1.1 2008/07/30 16:41:44 kevin Exp $ NAME := inadyn-mt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Jul 30 16:41:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 16:41:37 +0000 Subject: [pkgdb] inadyn-mt (Fedora, devel) updated by kevin Message-ID: <20080730164137.2D99A1AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved packager for commit access on inadyn-mt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/inadyn-mt From fedora-extras-commits at redhat.com Wed Jul 30 16:44:19 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 16:44:19 GMT Subject: rpms/callweaver/devel 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch, NONE, 1.1 Message-ID: <200807301644.m6UGiJgh013041@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/callweaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13032 Added Files: 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch Log Message: Add forgotten patch 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch: --- NEW FILE 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch --- >From 50932e8b857e73f8906003ac95d7036c715ff736 Mon Sep 17 00:00:00 2001 From: coppice Date: Mon, 16 Jun 2008 15:04:32 +0000 Subject: [PATCH] Hopefully the final bunch of API changes for the foreseeable future went into spandsp-0.0.5pre4, and this allows for the one API change that hits Callweaver git-svn-id: http://svn.callweaver.org/callweaver/branches/rel/1.2 at 4933 e56c2a57-502e-0410-a6e2-86b2f1ef08c6 --- configure.ac | 6 +++--- corelib/dsp.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index cb23839..372c1e8 100755 --- a/configure.ac +++ b/configure.ac @@ -783,15 +783,15 @@ AC_ARG_WITH([spandsp-libs], [AC_HELP_STRING([--with-spandsp-libs],[Location of SpanDSP library files.])], [LDFLAGS="$LDFLAGS -L${withval}"]) -AC_CHECK_HEADERS([spandsp.h],[HAVE_SPANDSP_H=1],[AC_MSG_ERROR(SpanDSP version 0.0.5pre3 or newer is required to compile CallWeaver.)]) +AC_CHECK_HEADERS([spandsp.h],[HAVE_SPANDSP_H=1],[AC_MSG_ERROR(SpanDSP version 0.0.5pre4 or newer is required to compile CallWeaver.)]) -AC_CHECK_HEADERS([spandsp/version.h],[HAVE_SPANDSP_VERSION_H=1],[AC_MSG_ERROR(SpanDSP does not appear to be new enough. You must have version 0.0.5pre3 or newer to compile CallWeaver.)], +AC_CHECK_HEADERS([spandsp/version.h],[HAVE_SPANDSP_VERSION_H=1],[AC_MSG_ERROR(SpanDSP does not appear to be new enough. You must have version 0.0.5pre4 or newer to compile CallWeaver.)], [#ifdef HAVE_SPANDSP_H #include #endif #include -#if SPANDSP_RELEASE_DATE < 20080508 +#if SPANDSP_RELEASE_DATE < 20080616 #error #endif diff --git a/corelib/dsp.c b/corelib/dsp.c index 4782cce..66de4f1 100644 --- a/corelib/dsp.c +++ b/corelib/dsp.c @@ -898,9 +898,9 @@ int cw_dsp_digitmode(struct cw_dsp *dsp, int digitmode) NULL); } if ((digitmode & DSP_DIGITMODE_RELAXDTMF)) - dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 8); + dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 8, -99); else - dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 4); + dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 4, -99); dsp->digitmode = digitmode; return 0; } -- 1.5.5.2 From fedora-extras-commits at redhat.com Wed Jul 30 16:54:50 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 16:54:50 GMT Subject: rpms/callweaver/devel callweaver.spec,1.13,1.14 Message-ID: <200807301654.m6UGsoWD013759@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/callweaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13730 Modified Files: callweaver.spec Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1.1 - Package manpage again. Index: callweaver.spec =================================================================== RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- callweaver.spec 30 Jul 2008 16:38:12 -0000 1.13 +++ callweaver.spec 30 Jul 2008 16:54:20 -0000 1.14 @@ -7,7 +7,7 @@ Name: callweaver Version: 1.2.0.1 -Release: 1%{?snap:.%{snap}}%{?dist} +Release: 1.1%{?snap:.%{snap}}%{?dist} Summary: The Truly Open Source PBX Group: Applications/Internet @@ -270,7 +270,7 @@ %{_libdir}/callweaver/lib*.so.* %dir %attr(0755,-,-) %{_libdir}/callweaver/modules %{_libdir}/callweaver/modules/*.so -#%{_mandir}/man8/callweaver.8.gz +%{_mandir}/man8/callweaver.8.gz %dir %{_datadir}/callweaver %dir %attr(0755,callweaver,callweaver) %{_sysconfdir}/callweaver %config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/* @@ -377,6 +377,9 @@ %{_sbindir}/eogi* %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1.1 +- Package manpage again. + * Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1 - Update to release 1.2.0.1 From fedora-extras-commits at redhat.com Wed Jul 30 16:56:11 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Wed, 30 Jul 2008 16:56:11 GMT Subject: rpms/freeradius/devel freeradius-radiusd-conf.patch,1.1,1.2 Message-ID: <200807301656.m6UGuBF1013954@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/freeradius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13832 Modified Files: freeradius-radiusd-conf.patch Log Message: fix fuzz on one hunk, f-10 doesn't permit fuzz anymore freeradius-radiusd-conf.patch: Index: freeradius-radiusd-conf.patch =================================================================== RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-radiusd-conf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freeradius-radiusd-conf.patch 18 Apr 2008 17:33:55 -0000 1.1 +++ freeradius-radiusd-conf.patch 30 Jul 2008 16:55:41 -0000 1.2 @@ -1,6 +1,6 @@ ---- freeradius-server-2.0.3/raddb/radiusd.conf.in.orig 2008-04-18 12:41:36.217230000 -0400 -+++ freeradius-server-2.0.3/raddb/radiusd.conf.in 2008-04-18 12:44:00.735486000 -0400 -@@ -1294,7 +1294,7 @@ +--- freeradius-server-2.0.5/raddb/radiusd.conf.in.conf 2008-05-30 05:18:43.000000000 -0400 ++++ freeradius-server-2.0.5/raddb/radiusd.conf.in 2008-07-30 12:44:54.000000000 -0400 +@@ -627,7 +627,7 @@ # Include another file that has the SQL-related configuration. # This is another file only because it tends to be big. # @@ -9,7 +9,7 @@ # For Cisco VoIP specific accounting with Postgresql, -@@ -1488,7 +1488,7 @@ +@@ -648,7 +648,7 @@ # totally dependent on the SQL module to process Accounting # packets. # @@ -17,4 +17,4 @@ + #$INCLUDE sql/mysql/counter.conf #$INCLUDE sql/postgresql/counter.conf - # + # $INCLUDE sqlippool.conf From fedora-extras-commits at redhat.com Wed Jul 30 16:57:03 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 16:57:03 GMT Subject: rpms/akonadi/devel akonadi.spec,1.9,1.10 Message-ID: <200807301657.m6UGv3lx014097@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14026 Modified Files: akonadi.spec Log Message: * Wed Jul 30 2008 Rex Dieter 1.0.0-2 - BR: mysql-server - Requires: qt-mysql - cleanup spec Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- akonadi.spec 23 Jul 2008 09:50:27 -0000 1.9 +++ akonadi.spec 30 Jul 2008 16:56:33 -0000 1.10 @@ -1,7 +1,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -9,17 +9,20 @@ Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - BuildRequires: cmake BuildRequires: qt4-devel >= 4.4 -BuildRequires: automoc +BuildRequires: automoc4 BuildRequires: mysql-devel +BuildRequires: mysql-server # for xsltproc BuildRequires: libxslt BuildRequires: shared-mime-info +Requires: qt4-mysql + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + %description %{summary}. @@ -36,12 +39,19 @@ %setup -q %build -%cmake . -DCONFIG_INSTALL_DIR=%{_sysconfdir} -make %{?_smp_mflags} + +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} \ + -DCONFIG_INSTALL_DIR=%{_sysconfdir} \ + .. +popd + +make %{?_smp_mflags} -C %{_target_platform} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} %clean rm -rf $RPM_BUILD_ROOT @@ -74,6 +84,11 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 30 2008 Rex Dieter 1.0.0-2 +- BR: mysql-server +- Requires: qt-mysql +- cleanup spec + * Wed Jul 23 2008 Than Ngo - 1.0.0-1 - 1.0.0 From fedora-extras-commits at redhat.com Wed Jul 30 16:59:52 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 16:59:52 GMT Subject: rpms/akonadi/F-9 akonadi.spec,1.2,1.3 Message-ID: <200807301659.m6UGxqe7014328@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14294 Modified Files: akonadi.spec Log Message: * Wed Jul 30 2008 Rex Dieter 1.0.0-2 - BR: mysql-server - Requires: qt-mysql - cleanup spec Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/akonadi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- akonadi.spec 23 Jul 2008 10:29:26 -0000 1.2 +++ akonadi.spec 30 Jul 2008 16:59:22 -0000 1.3 @@ -1,7 +1,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -9,17 +9,20 @@ Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - BuildRequires: cmake BuildRequires: qt4-devel >= 4.4 -BuildRequires: automoc +BuildRequires: automoc4 BuildRequires: mysql-devel +BuildRequires: mysql-server # for xsltproc BuildRequires: libxslt BuildRequires: shared-mime-info +Requires: qt4-mysql + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + %description %{summary}. @@ -36,12 +39,19 @@ %setup -q %build -%cmake . -DCONFIG_INSTALL_DIR=%{_sysconfdir} -make %{?_smp_mflags} + +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} \ + -DCONFIG_INSTALL_DIR=%{_sysconfdir} \ + .. +popd + +make %{?_smp_mflags} -C %{_target_platform} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} %clean rm -rf $RPM_BUILD_ROOT @@ -74,6 +84,11 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 30 2008 Rex Dieter 1.0.0-2 +- BR: mysql-server +- Requires: qt-mysql +- cleanup spec + * Wed Jul 23 2008 Than Ngo - 1.0.0-1 - 1.0.0 From fedora-extras-commits at redhat.com Wed Jul 30 17:01:08 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 17:01:08 GMT Subject: rpms/akonadi/F-8 akonadi.spec,1.1,1.2 Message-ID: <200807301701.m6UH18ul021110@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14397 Modified Files: akonadi.spec Log Message: * Wed Jul 30 2008 Rex Dieter 1.0.0-2 - BR: mysql-server - Requires: qt-mysql - cleanup spec Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-8/akonadi.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- akonadi.spec 23 Jul 2008 14:34:37 -0000 1.1 +++ akonadi.spec 30 Jul 2008 17:00:38 -0000 1.2 @@ -1,7 +1,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -9,17 +9,20 @@ Source0: http://akonadi.omat.nl/akonadi-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - BuildRequires: cmake BuildRequires: qt4-devel >= 4.4 -BuildRequires: automoc +BuildRequires: automoc4 BuildRequires: mysql-devel +BuildRequires: mysql-server # for xsltproc BuildRequires: libxslt BuildRequires: shared-mime-info +Requires: qt4-mysql + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + %description %{summary}. @@ -36,12 +39,19 @@ %setup -q %build -%cmake . -DCONFIG_INSTALL_DIR=%{_sysconfdir} -make %{?_smp_mflags} + +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} \ + -DCONFIG_INSTALL_DIR=%{_sysconfdir} \ + .. +popd + +make %{?_smp_mflags} -C %{_target_platform} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} %clean rm -rf $RPM_BUILD_ROOT @@ -74,6 +84,11 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 30 2008 Rex Dieter 1.0.0-2 +- BR: mysql-server +- Requires: qt-mysql +- cleanup spec + * Wed Jul 23 2008 Than Ngo - 1.0.0-1 - 1.0.0 From fedora-extras-commits at redhat.com Wed Jul 30 17:02:38 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 30 Jul 2008 17:02:38 GMT Subject: rpms/inadyn-mt/devel import.log, NONE, 1.1 inadyn-mt.spec, NONE, 1.1 inadyn.conf, NONE, 1.1 inadyn.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807301702.m6UH2cxM021349@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/inadyn-mt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21232/devel Modified Files: .cvsignore sources Added Files: import.log inadyn-mt.spec inadyn.conf inadyn.init Log Message: Initional import --- NEW FILE import.log --- inadyn-mt-2_12_24-1_fc9:HEAD:inadyn-mt-2.12.24-1.fc9.src.rpm:1217437280 --- NEW FILE inadyn-mt.spec --- Name: inadyn-mt Version: 2.12.24 Release: 1%{?dist} Summary: Dynamic DNS Client Group: System Environment/Daemons License: GPLv3 URL: http://inadyn-mt.sourceforge.net Source0: http://prdownloads.sourceforge.net/inadyn-mt/inadyn-mt.v.0%{version}.tar.gz Source1: inadyn.conf Source2: inadyn.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Obsoletes: inadyn < %{version} Provides: inadyn = %{version}-%{release} %description INADYN-MT is a dynamic DNS client. It maintains the IP address of a host name. It periodically checks wheather the IP address stored by the DSN server is the real current address of the machine that is running INADYN-MT. Before using inadyn-mt for the first time you must use the DynDNS provider's web interface to create the entry for the hostname. You should then fill in /etc/inadyn.conf with the appropriate detail %prep %setup -q -n %name %build rm -rf bin/ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -m 0755 bin/linux/inadyn-mt $RPM_BUILD_ROOT%{_sbindir}/inadyn mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install -p -m 0644 man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8 install -p -m 0644 man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} install -p -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{name} ln -sf ../inadyn.conf %{name}.conf popd mkdir -p $RPM_BUILD_ROOT%{_initrddir} %{__perl} -pe \ 's|/var/|%{_localstatedir}/|g ; \ s|/usr/sbin/|%{_sbindir}/|g ; \ s|/etc/([^ir])|%{_sysconfdir}/$1|g ; \ s|/etc/rc\.d/init\.d/|%{_initrddir}/|g' \ <%{SOURCE2} >$RPM_BUILD_ROOT%{_initrddir}/inadyn mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/inadyn-mt/lang cp lang/* $RPM_BUILD_ROOT%{_sysconfdir}/inadyn-mt/lang %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add inadyn %preun if [ $1 -eq 0 ]; then /sbin/service inadyn stop >/dev/null 2>&1 || : /sbin/chkconfig --del inadyn fi %postun if [ $1 -ge 1 ]; then /sbin/service inadyn condrestart >/dev/null fi %files %defattr(-,root,root,-) %doc COPYING readme.html %{_sbindir}/inadyn %{_mandir}/man*/* %attr(0755,root,root) %{_initrddir}/inadyn %config(noreplace) %{_sysconfdir}/inadyn.conf %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %dir %{_sysconfdir}/%{name}/lang %config(noreplace) %{_sysconfdir}/%{name}/lang/en.lng %changelog * Wed Jul 30 2008 Jochen Schmitt 2.12.24-1 - New upstream release * Mon Jul 28 2008 Jochen Schmitt 2.12.22-2 - Add lang file - Versioned Obsolete/Provide * Sun Jul 27 2008 Jochen Schmitt 2.12.22-1 - New upstream release - Add verbatin text of the license - Change license to GPLv3 * Wed Jun 18 2008 Jochen Schmitt 2.12.18-1 - New upstream release * Mon May 19 2008 Jochen Schmitt 2.12.01-1 - New upstream release * Thu Apr 10 2008 Jochen Schmitt 2.11.96-1 - Inadyn-mt released as a succesor of inadyn * Sun Feb 10 2008 Jochen Schmitt 1.96.2-3 - Rebuild for gcc-4.3 * Wed Jan 23 2008 Jochen Schmitt 1.96.2-2 - Rebuild - Make initscript LSB-Compilant * Sun Sep 2 2007 Jochen Schmitt 1.96.2-1 - New upstream release (#270801) * Wed Aug 8 2007 Jochen Schmitt 1.96-4 - Changing license tag * Sun Sep 3 2006 Jochen Schmitt 1.96-3 - Rebuilt for FC-6 * Sun Feb 12 2006 Jochen Schmitt 1.96-2 - Rebuilt for FC5 * Mon Oct 24 2005 Jochen Schmitt 1.96-1 - New upstream relase * Mon Aug 01 2005 Jochen Schmitt 1.95-2 - Add suggested changes from Michael Schwendt * Wed Jul 20 2005 Jochen Schmitt 1.95-1 - New upstream release * Tue May 3 2005 Jochen Schmitt 1.90-11 - Move note from README.Fedora to %%description * Tue May 3 2005 Jochen Schmitt 1.90-9 - And special usage notes - Use of /sbin/service to manage initscript in scriptlet - Modify initscript, becouse bash don't return PID * Thu Apr 28 2005 Jochen Schmitt 1.90-8 - Replace ez_pid to ina_pid in initscript * Wed Apr 27 2005 Jochen Schmitt 1.90-7 - Enable status in initscript * Wed Apr 27 2005 Jochen Schmitt 1.90-6 - Add initscript * Thu Apr 26 2005 Jochen Schmitt 1.90-5 - Add URL to Source0 * Thu Apr 12 2005 Jochen Schmitt 1.90-4 - Corrected use of percentage sign in changelog * Mon Apr 11 2005 Jochen Schmitt 1.90-3 - Some inprovements from Michael Schwendt * Sun Apr 10 2005 Jochen Schmitt 1.90-2 - Clearance in the %%Setup macro * Thu Apr 7 2005 Jochen Schmitt 1.90-1 - Initial RPM release --- NEW FILE inadyn.conf --- username password alias update_period 60000 background --- NEW FILE inadyn.init --- #!/bin/sh # # inadyn Starts and stops the inadyn daemon # # chkconfig: - 55 45 # # processname: inadyn # description: Check and update your IP to dynamic DNS Server. # pidfile: /var/run/inadyn/inadyn.pid # config: /etc/inadyn.conf ### BEGIN INIT INFO # Provides: inadyn # Required-Start: $networks # Required-Stop: # Default-Stop: 0 6 # Short-Description: Sending the IP-Address to a DynDNS # Description: Sending the IP-Address to a DynDNS ### END INIT INFO ina_config=/etc/inadyn.conf ina_bin=/usr/sbin/inadyn ina_pid=/var/run/inadyn.pid # Make sure relevant files exist [ -x "$ina_bin" -a -s "$ina_config" ] || exit 0 # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ "$NETWORKING" = "no" ] && exit 0 RETVAL=0 prog=inadyn start() { # Start daemons. echo -n $"Starting $prog: " daemon $ina_bin RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog } stop() { # Stop daemons. echo -n $"Shutting down $prog: " killproc $prog -QUIT RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog && rm -f $ina_pid } restart() { stop start RETVAL=$? } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) restart ;; reload) restart ;; condrestart) [ -e /var/lock/subsys/$prog ] && restart || : ;; status) status $prog ;; *) echo "Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inadyn-mt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2008 16:41:44 -0000 1.1 +++ .cvsignore 30 Jul 2008 17:02:08 -0000 1.2 @@ -0,0 +1 @@ +inadyn-mt.v.02.12.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/inadyn-mt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2008 16:41:44 -0000 1.1 +++ sources 30 Jul 2008 17:02:08 -0000 1.2 @@ -0,0 +1 @@ +9e7a8a8841a6b3fe0c6f9412e581324b inadyn-mt.v.02.12.24.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 17:04:13 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 17:04:13 GMT Subject: rpms/asterisk/F-9 0003-Allow-alternate-extensions-to-be-specified-in-users.patch, NONE, 1.1 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, NONE, 1.1 0005-Add-chan_mobile-from-asterisk-addons.patch, NONE, 1.1 0006-Use-pkgconfig-to-check-for-Lua.patch, NONE, 1.1 0007-Build-using-external-libedit.patch, NONE, 1.1 0008-Update-cdr_tds-to-latest.patch, NONE, 1.1 0009-Merged-revisions-123952-via-svnmerge-from.patch, NONE, 1.1 0010-Merged-revisions-132778-via-svnmerge-from.patch, NONE, 1.1 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch, NONE, 1.1 0012-Update-autoconf.patch, NONE, 1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.1, 1.2 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 1.1, 1.2 asterisk.spec, 1.28, 1.29 0003-Add-FAX-apps.patch, 1.1, NONE 0004-Allow-alternate-extensions-to-be-specified-in-users.patch, 1.1, NONE 0005-Pick-proper-optimization-flags-for-Fedora.patch, 1.1, NONE 0006-Add-chan_mobile-from-asterisk-addons.patch, 1.1, NONE 0007-Use-pkgconfig-to-check-for-Lua.patch, 1.1, NONE 0008-Build-using-external-libedit.patch, 1.1, NONE 0009-Update-cdr_tds-to-latest.patch, 1.1, NONE 0010-Update-autoconf.patch, 1.1, NONE 0011-Merged-revisions-123952-via-svnmerge-from.patch, 1.1, NONE 0012-Merged-revisions-132778-via-svnmerge-from.patch, 1.1, NONE Message-ID: <200807301704.m6UH4Dbo021554@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21433 Modified Files: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch asterisk.spec Added Files: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 0005-Add-chan_mobile-from-asterisk-addons.patch 0006-Use-pkgconfig-to-check-for-Lua.patch 0007-Build-using-external-libedit.patch 0008-Update-cdr_tds-to-latest.patch 0009-Merged-revisions-123952-via-svnmerge-from.patch 0010-Merged-revisions-132778-via-svnmerge-from.patch 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch 0012-Update-autoconf.patch Removed Files: 0003-Add-FAX-apps.patch 0004-Allow-alternate-extensions-to-be-specified-in-users.patch 0005-Pick-proper-optimization-flags-for-Fedora.patch 0006-Add-chan_mobile-from-asterisk-addons.patch 0007-Use-pkgconfig-to-check-for-Lua.patch 0008-Build-using-external-libedit.patch 0009-Update-cdr_tds-to-latest.patch 0010-Update-autoconf.patch 0011-Merged-revisions-123952-via-svnmerge-from.patch 0012-Merged-revisions-132778-via-svnmerge-from.patch Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 1.6.0-0.21.beta9 - Replace app_rxfax/app_txfax with app_fax taken from upstream SVN. 0003-Allow-alternate-extensions-to-be-specified-in-users.patch: --- NEW FILE 0003-Allow-alternate-extensions-to-be-specified-in-users.patch --- >From 673d0920ab94971a9ca2f91de16ecd1f0e9d9b43 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:32:56 -0600 Subject: [PATCH] Allow alternate extensions to be specified in users.conf --- pbx/pbx_config.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 4a7a3d3..0e38d88 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1532,11 +1532,14 @@ static void pbx_load_users(void) { struct ast_config *cfg; char *cat, *chan; + char *ext; const char *zapchan; const char *hasexten; + const char *altexts; char tmp[256]; char iface[256]; char zapcopy[256]; + char altcopy[256]; char *c; int len; int hasvoicemail; @@ -1617,6 +1620,17 @@ static void pbx_load_users(void) } else { ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar); } + altexts = ast_variable_retrieve(cfg, cat, "alternateexts"); + if (!ast_strlen_zero(altexts)) { + snprintf(tmp, sizeof(tmp), "%s|1", cat); + ast_copy_string(altcopy, altexts, sizeof(altcopy)); + c = altcopy; + ext = strsep(&c, ","); + while (ext) { + ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free, registrar); + ext = strsep(&c, ","); + } + } } } ast_config_destroy(cfg); -- 1.5.5.2 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch: --- NEW FILE 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch --- >From 38df88e16ff71fd00dabc5e95e3692e4d37b5159 Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 29 Jul 2008 23:00:45 +0000 Subject: [PATCH] Minor changes to reduce packaging changes made by the Fedora maintainer. (closes issue #12974) Reported by: jcollie Patches: 0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412) git-svn-id: http://svn.digium.com/svn/asterisk/trunk at 134312 614ede4d-c843-0410-af14-a771ab80d22e --- Makefile | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7c44b41..a9fd366 100644 --- a/Makefile +++ b/Makefile @@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu) endif ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) -ASTCFLAGS+=-pipe + ifeq ($(findstring -pipe,$(ASTCFLAGS)),) + ASTCFLAGS+=-pipe + endif +endif + +ifeq ($(findstring -Wall,$(ASTCFLAGS)),) + ASTCFLAGS+=-Wall endif -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h @@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),) ASTLDFLAGS+=-L/usr/local/lib endif -ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) +ifeq ($(findstring -march,$(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif endif ifeq ($(PROC),ppc) -- 1.5.5.2 0005-Add-chan_mobile-from-asterisk-addons.patch: --- NEW FILE 0005-Add-chan_mobile-from-asterisk-addons.patch --- >From cff5fa429540c33f5b0dc06ab8e52b21b54b1ce1 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 09:23:28 -0600 Subject: [PATCH] Add chan_mobile from asterisk-addons. --- build_tools/menuselect-deps.in | 1 + channels/Makefile | 2 + channels/chan_mobile.c | 2118 ++++++++++++++++++++++++++++++++++++++++ configs/mobile.conf.sample | 60 ++ configure.ac | 4 + doc/chan_mobile.txt | 240 +++++ makeopts.in | 3 + 7 files changed, 2428 insertions(+), 0 deletions(-) create mode 100644 channels/chan_mobile.c create mode 100644 configs/mobile.conf.sample create mode 100644 doc/chan_mobile.txt diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index aa76d56..97822e6 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,5 +1,6 @@ ASOUND=@PBX_ALSA@ CRYPTO=@PBX_CRYPTO@ +BLUETOOTH=@PBX_BLUETOOTH@ CURL=@PBX_CURL@ FREETDS=@PBX_FREETDS@ GMIME=@PBX_GMIME@ diff --git a/channels/Makefile b/channels/Makefile index 34bd8e0..d8e691a 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -101,3 +101,5 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o + +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB) diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c new file mode 100644 index 0000000..1312ea9 --- /dev/null +++ b/channels/chan_mobile.c @@ -0,0 +1,2118 @@ +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 1999 - 2006, Digium, Inc. + * + * Mark Spencer + * + * See http://www.asterisk.org for more information about + * the Asterisk project. Please do not directly contact + * any of the maintainers of this project for assistance; + * the project provides a web site, mailing lists and IRC + * channels for your use. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + */ + +/*! \file + * + * \brief Bluetooth Mobile Device channel driver + * + * \author Dave Bowerman + * + * \ingroup channel_drivers + */ + +/*** MODULEINFO + bluetooth + ***/ + +#include + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MBL_CONFIG "mobile.conf" + +#define DEVICE_FRAME_SIZE 48 +#define DEVICE_FRAME_FORMAT AST_FORMAT_SLINEAR +#define CHANNEL_FRAME_SIZE 320 + +static int prefformat = DEVICE_FRAME_FORMAT; + +static int discovery_interval = 60; /* The device discovery interval, default 60 seconds. */ +static pthread_t discovery_thread = AST_PTHREADT_NULL; /* The discovery thread */ +static sdp_session_t *sdp_session; + +enum mbl_type { + MBL_TYPE_PHONE, + MBL_TYPE_HEADSET +}; + +enum mbl_state { + MBL_STATE_INIT = 0, + MBL_STATE_INIT1, + MBL_STATE_INIT2, + MBL_STATE_INIT3, + MBL_STATE_INIT4, + MBL_STATE_INIT5, + MBL_STATE_INIT6, + MBL_STATE_INIT7, + MBL_STATE_PREIDLE, + MBL_STATE_IDLE, + MBL_STATE_DIAL, + MBL_STATE_DIAL1, + MBL_STATE_OUTGOING, + MBL_STATE_RING, + MBL_STATE_RING2, + MBL_STATE_RING3, + MBL_STATE_INCOMING, + MBL_STATE_HANGUP, + MBL_STATE_INSMS, + MBL_STATE_OUTSMS, + MBL_STATE_OUTSMS1, + MBL_STATE_OUTSMS2 +}; + +struct adapter_pvt { + int dev_id; /* device id */ + int hci_socket; /* device descriptor */ + char id[31]; /* the 'name' from mobile.conf */ + bdaddr_t addr; /* adddress of adapter */ + unsigned int inuse:1; /* are we in use ? */ + unsigned int alignment_detection:1; /* do alignment detection on this adpater? */ + int sco_socket; + AST_LIST_ENTRY(adapter_pvt) entry; +}; + +static AST_LIST_HEAD_STATIC(adapters, adapter_pvt); + +struct mbl_pvt { + struct ast_channel *owner; /* Channel we belong to, possibly NULL */ + struct ast_frame fr; /* "null" frame */ + enum mbl_type type; /* Phone or Headset */ + char id[31]; /* The id from mobile.conf */ + int group; /* group number for group dialling */ + bdaddr_t addr; /* address of device */ + struct adapter_pvt *adapter; /* the adapter we use */ + char context[AST_MAX_CONTEXT]; /* the context for incoming calls */ + char connected; /* is it connected? */ + int rfcomm_port; /* rfcomm port number */ + int rfcomm_socket; /* rfcomm socket descriptor */ + char rfcomm_buf[256]; + char io_buf[CHANNEL_FRAME_SIZE + AST_FRIENDLY_OFFSET]; + char io_save_buf[DEVICE_FRAME_SIZE]; + int io_save_len; + int io_pipe[2]; + int sco_socket; /* sco socket descriptor */ + pthread_t sco_listener_thread; /* inbound sco listener for this device */ + enum mbl_state state; /* monitor thread current state */ + pthread_t monitor_thread; /* monitor thread handle */ + char dial_number[AST_MAX_EXTENSION]; /* number for the monitor thread to dial */ + int dial_timeout; + char ciev_call_0[4]; /* dynamically built reponse strings */ + char ciev_call_1[4]; + char ciev_callsetup_0[4]; + char ciev_callsetup_1[4]; [...2115 lines suppressed...] + +See configs/mobile.conf.sample for an example and an explanation of the configuration. + + +Using chan_mobile :- + +chan_mobile.so must be loaded either by loading it using the Asterisk CLI, or by adding it to /etc/asterisk/modules.conf + +Search for your bluetooth devices using the CLI command 'mobile search'. Be patient with this command as +it will take 8 - 10 seconds to do the discovery. This requires a free adapter. + +Headsets will generally have to be put into 'pairing' mode before they will show up here. + +This will return something like the following :- + +*CLI> mobile search +Address Name Usable Type Port +00:12:56:90:6E:00 LG TU500 Yes Phone 4 +00:80:C8:35:52:78 Toaster No Headset 0 +00:0B:9E:11:74:A5 Hello II Plus Yes Headset 1 +00:0F:86:0E:AE:42 Daves Blackberry Yes Phone 7 + +This is a list of all bluetooth devices seen and whether or not they are usable with chan_mobile. +The Address field contains the 'bd address' of the device. This is like an ethernet mac address. +The Name field is whatever is configured into the device as its name. +The Usable field tells you whether or not the device supports the Bluetooth Handsfree Profile or Headset profile. +The Type field tells you whether the device is usable as a Phone line (FXO) or a headset (FXS) +The Port field is the number to put in the configuration file. + +Choose which device(s) you want to use and edit /etc/asterisk/mobile.conf. There is a sample included +with the Asterisk-addons source under configs/mobile.conf.sample. + +Be sure to configure the right bd address and port number from the search. If you want inbound +calls on a device to go to a specific context, add a context= line, otherwise the default will +be used. The 'id' of the device [bitinbrackets] can be anything you like, just make it unique. + +If you are configuring a Headset be sure to include the type=headset line, if left out it defaults +to phone. + +The CLI command 'mobile show devices' can be used at any time to show the status of configured devices, +and whether or not the device is capable of sending / receiving SMS via bluetooth. + +*CLI> mobile show devices +ID Address Group Adapter Connected State SMS +headset 00:0B:9E:11:AE:C6 0 blue No Init No +LGTU550 00:E0:91:7F:46:44 1 dlink No Init No +*CLI> + +As each phone is connected you will see a message on the Asterisk console :- + + Loaded chan_mobile.so => (Bluetooth Mobile Device Channel Driver) + -- Bluetooth Device blackberry has connected. + -- Bluetooth Device dave has connected. + +To make outbound calls, add something to you Dialplan like the following :- (modify to suit) + +; Calls via LGTU5500 +exten => _9X.,1,Dial(Mobile/LGTU550/${EXTEN:1},45) +exten => _9X.,n,Hangup + +To use channel groups, add an entry to each phones definition in mobile.conf like group=n +where n is a number. + +Then if you do something like Dial(Mobile/g1/123456) Asterisk will dial 123456 on the first +connected free phone in group 1. + +Phones which do not have a specific 'group=n' will be in group 0. + + +To dial out on a headset, you need to use some other mechanism, because the headset is not likely +to have all the needed buttons on it. res_clioriginate is good for this :- + +*CLI> originate Mobile/headset extension NNNNN at context + +This will call your headset, once you answer, Asterisk will call NNNNN at context context + +Dialplan hints :- + +chan_mobile supports 'device status' so you can do somthing like + +exten => 1234,hint,SIP/30&Mobile/dave&Mobile/blackberry + + +MobileStatus Application :- + +chan_mobile also registers an application named MobileStatus. You can use this in your Dialplan +to determine the 'state' of a device. + +For example, suppose you wanted to call dave's extension, but only if he was in the office. You could +test to see if his mobile phone was attached to Asterisk, if it is dial his extension, otherwise dial his +mobile phone. + +exten => 40,1,MobileStatus(dave,DAVECELL) +exten => 40,2,GotoIf($["${DAVECELL}" = "1"]?3:5) +exten => 40,3,Dial(ZAP/g1/0427466412,45,tT) +exten => 40,4,Hangup +exten => 40,5,Dial(SIP/40,45,tT) +exten => 40,6,Hangup + +MobileStatus sets the value of the given variable to :- + +1 = Disconnected. i.e. Device not in range of Asterisk, or turned off etc etc +2 = Connected and Not on a call. i.e. Free +3 = Connected and on a call. i.e. Busy + + +SMS Sending / Receiving + +If Asterisk has detected your mobile phone is capable of SMS via bluetooth, you will be able to send and +receive SMS. + +Incoming SMS's cause Asterisk to create an inbound call to the context you defined in mobile.conf or the default +context if you did not define one. The call will start at extension 'sms'. Two channel variables will be available, +SMSSRC = the number of the originator of the SMS and SMSTXT which is the text of the SMS. +This is not a voice call, so grab the values of the variables and hang the call up. + +So, to handle incoming SMS's, do something like the following in your dialplan + +[incoming-mobile] +exten => sms,1,Verbose(Incoming SMS from ${SMSSRC} ${SMSTXT}) +exten => sms,n,Hangup() + +The above will just print the message on the console. + +If you use res_jabber, you could do something like this :- + +[incoming-mobile] +exten => sms,1,JabberSend(transport,user at jabber.somewhere.com,SMS from ${SMSRC} ${SMSTXT}) +exten => sms,2,Hangup() + +To send an SMS, use the application MobileSendSMS like the following :- + +exten => 99,1,MobileSendSMS(dave,0427123456,Hello World) + +This will send 'Hello World' via device 'dave' to '0427123456' + + +DTMF Debouncing :- + +DTMF detection varies from phone to phone. There is a configuration variable that allows you to tune +this to your needs. e.g. in mobile.conf + +[LGTU550] +address=00:12:56:90:6E:00 +port=4 +context=incoming-mobile +dtmfskip=50 + +change dtmfskip to suit your phone. The default is 200. The larger the number, the more chance of missed DTMF. +The smaller the number the more chance of multiple digits being detected. + + +Debugging :- + +Different phone manufacturers have different interpretations of the Bluetooth Handsfree Profile Spec. +This means that not all phones work the same way, particularly in the connection setup / initialisation +sequence. I've tried to make chan_mobile as general as possible, but it may need modification to +support some phone i've never tested. + +Some phones, most notably Sony Ericsson 'T' series, dont quite conform to the Bluetooth HFP spec. +chan_mobile will detect these and adapt accordingly. The T-610 and T-630 have been tested and +work fine. + +If your phone doesnt behave has expected, turn on Asterisk debugging with 'core set debug 1'. + +This will log a bunch of debug messages indicating what the phone is doing, importantly the rfcomm +conversation between Asterisk and the phone. This can be used to sort out what your phone is doing +and make chan_mobile support it. + +Be aware also, that just about all mobile phones behave differently. For example my LG TU500 wont dial unless +the phone is a the 'idle' screen. i.e. if the phone is showing a 'menu' on the display, when you dial via +Asterisk, the call will not work. chan_mobile handles this, but there may be other phones that do +other things too... + +Important: Watch what your mobile phone is doing the first few times. Asterisk wont make random calls but +if chan_mobile fails to hangup for some reason and you get a huge bill from your telco, dont blame me ;) + + +Feedback, Support, Please can you make Mobile Phone X work... etc :- + +as always, bugs should be reported at http://bugs.digium.com + +email me at david.bowerman at gmail.com or dseeb_ on #asterisk & #asterisk-dev irc. diff --git a/makeopts.in b/makeopts.in index 3bf203e..9e99a6f 100644 --- a/makeopts.in +++ b/makeopts.in @@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@ ASOUND_INCLUDE=@ALSA_INCLUDE@ ASOUND_LIB=@ALSA_LIB@ +BLUETOOTH_LIB=@BLUETOOTH_LIB@ +BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@ + CURL_INCLUDE=@CURL_INCLUDE@ CURL_LIB=@CURL_LIB@ -- 1.5.5.2 0006-Use-pkgconfig-to-check-for-Lua.patch: --- NEW FILE 0006-Use-pkgconfig-to-check-for-Lua.patch --- >From e7c5d20c24e3d18954212c484cd015be14de2e1e Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 13:14:23 -0600 Subject: [PATCH] Use pkgconfig to check for Lua. --- configure.ac | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 422981b..b8c093c 100644 --- a/configure.ac +++ b/configure.ac @@ -1331,9 +1331,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then [${PWLIB_INCLUDE}], [${PWLIB_LIB}]) fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" -AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) +PBX_LUA=0 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + AC_DEFINE([HAVE_LUA], 1, [Define if your system has the LUA libraries.]) +fi AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) -- 1.5.5.2 0007-Build-using-external-libedit.patch: --- NEW FILE 0007-Build-using-external-libedit.patch --- >From 23c345241390d5aa577421abfb7e36aa6f3a343e Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Tue, 25 Mar 2008 00:50:27 -0500 Subject: [PATCH] Build using external libedit. --- build_tools/menuselect-deps.in | 1 + configure.ac | 22 ++++++++++++++++++++++ main/Makefile | 7 ++++--- main/cli.c | 3 ++- makeopts.in | 4 ++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 97822e6..e51279b 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -16,6 +16,7 @@ ISDNNET=@PBX_ISDNNET@ IXJUSER=@PBX_IXJUSER@ JACK=@PBX_JACK@ LDAP=@PBX_LDAP@ +LIBEDIT=@PBX_LIBEDIT@ LTDL=@PBX_LTDL@ LUA=@PBX_LUA@ MISDN=@PBX_MISDN@ diff --git a/configure.ac b/configure.ac index b8c093c..c72e9c2 100644 --- a/configure.ac +++ b/configure.ac @@ -220,6 +220,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap]) AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack]) AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap]) +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit]) AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn]) @@ -1568,6 +1569,27 @@ AC_SUBST(PBX_GTK2) AC_SUBST(GTK2_INCLUDE) AC_SUBST(GTK2_LIB) +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + AC_CHECK_TOOL(PKGCONFIG, pkg-config, no) + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.]) + fi + fi +fi +AC_SUBST(PBX_LIBEDIT) +AC_SUBST(LIBEDIT_INCLUDE) +AC_SUBST(LIBEDIT_LIB) +AC_SUBST(LIBEDIT_OBJ) + if test "${USE_CURL}" != "no"; then AC_PATH_TOOL([CURL_CONFIG], [curl-config], No) if test ! x"${CURL_CONFIG}" = xNo; then diff --git a/main/Makefile b/main/Makefile index 976c37b..09c5eb6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -133,6 +133,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE) ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: ASTCFLAGS+=$(GMIME_INCLUDE) @@ -166,13 +167,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) GMIMELDFLAGS+=$(GMIME_LIB) endif -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) endif $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ diff --git a/main/cli.c b/main/cli.c index 11d6671..dce7950 100644 --- a/main/cli.c +++ b/main/cli.c @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include +#include + #include "asterisk/cli.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" @@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/app.h" #include "asterisk/lock.h" -#include "editline/readline/readline.h" #include "asterisk/threadstorage.h" /*! diff --git a/makeopts.in b/makeopts.in index 9e99a6f..b8a4ab6 100644 --- a/makeopts.in +++ b/makeopts.in @@ -235,3 +235,7 @@ TINFO_DIR=@TINFO_DIR@ # if poll is not present, let the makefile know. POLL_AVAILABLE=@HAS_POLL@ + +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@ +LIBEDIT_LIB=@LIBEDIT_LIB@ +LIBEDIT_OBJ=@LIBEDIT_OBJ@ -- 1.5.5.2 0008-Update-cdr_tds-to-latest.patch: --- NEW FILE 0008-Update-cdr_tds-to-latest.patch --- >From 56f5144dca1f95b75d78f4fa0ce8e1048a119fc6 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 2 Jul 2008 10:15:41 -0500 Subject: [PATCH] Update cdr_tds to latest. --- UPGRADE.txt | 3 + cdr/cdr_tds.c | 462 +++++++++++++++++++------------------- configure.ac | 29 +--- doc/tex/freetds.tex | 20 +-- include/asterisk/autoconfig.h.in | 3 - 5 files changed, 238 insertions(+), 279 deletions(-) diff --git a/UPGRADE.txt b/UPGRADE.txt index 70a0f81..d5e97a1 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -123,6 +123,9 @@ CDR: username and password parameters in cdr_odbc.conf, therefore, are no longer used. The dsn parameter now points to an entry in res_odbc.conf. +* The cdr_tds module now supports all versions of FreeTDS that contain + the db-lib frontend. + Formats: * format_wav: The GAIN preprocessor definition and source code that used it diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 9d322fd..8654c80 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -66,72 +66,76 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include -#include -#include - #include "asterisk/config.h" #include "asterisk/channel.h" #include "asterisk/cdr.h" #include "asterisk/module.h" -#ifdef FREETDS_PRE_0_62 -#warning "You have older TDS, you should upgrade!" -#endif +#include +#include #define DATE_FORMAT "%Y/%m/%d %T" -static char *name = "mssql"; +static char *name = "FreeTDS (MSSQL)"; static char *config = "cdr_tds.conf"; -static char *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL, *charset = NULL, *language = NULL; -static char *table = NULL; - -static int connected = 0; +struct cdr_tds_config { + AST_DECLARE_STRING_FIELDS( + AST_STRING_FIELD(hostname); + AST_STRING_FIELD(database); + AST_STRING_FIELD(username); + AST_STRING_FIELD(password); + AST_STRING_FIELD(table); + AST_STRING_FIELD(charset); + AST_STRING_FIELD(language); + ); + DBPROCESS *dbproc; + unsigned int connected:1; +}; AST_MUTEX_DEFINE_STATIC(tds_lock); -static TDSSOCKET *tds; -static TDSLOGIN *login; -static TDSCONTEXT *context; +static struct cdr_tds_config *settings; static char *anti_injection(const char *, int); -static void get_date(char *, struct timeval); +static void get_date(char *, size_t len, struct timeval); static int mssql_connect(void); static int mssql_disconnect(void); static int tds_log(struct ast_cdr *cdr) { - char sqlcmd[2048], start[80], answer[80], end[80]; + char start[80], answer[80], end[80]; char *accountcode, *src, *dst, *dcontext, *clid, *channel, *dstchannel, *lastapp, *lastdata, *uniqueid; - int res = 0; - int retried = 0; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif + RETCODE erc; + int res = -1; + + accountcode = anti_injection(cdr->accountcode, 20); + src = anti_injection(cdr->src, 80); + dst = anti_injection(cdr->dst, 80); + dcontext = anti_injection(cdr->dcontext, 80); + clid = anti_injection(cdr->clid, 80); + channel = anti_injection(cdr->channel, 80); + dstchannel = anti_injection(cdr->dstchannel, 80); + lastapp = anti_injection(cdr->lastapp, 80); + lastdata = anti_injection(cdr->lastdata, 80); + uniqueid = anti_injection(cdr->uniqueid, 32); + + get_date(start, sizeof(start), cdr->start); + get_date(answer, sizeof(answer), cdr->answer); + get_date(end, sizeof(end), cdr->end); ast_mutex_lock(&tds_lock); - memset(sqlcmd, 0, 2048); + /* Ensure that we are connected */ + if (!settings->connected) { + if (mssql_connect()) { + /* Connect failed */ + goto done; + } + } - accountcode = anti_injection(cdr->accountcode, 20); - src = anti_injection(cdr->src, 80); - dst = anti_injection(cdr->dst, 80); - dcontext = anti_injection(cdr->dcontext, 80); - clid = anti_injection(cdr->clid, 80); - channel = anti_injection(cdr->channel, 80); - dstchannel = anti_injection(cdr->dstchannel, 80); - lastapp = anti_injection(cdr->lastapp, 80); - lastdata = anti_injection(cdr->lastdata, 80); - uniqueid = anti_injection(cdr->uniqueid, 32); - - get_date(start, cdr->start); - get_date(answer, cdr->answer); - get_date(end, cdr->end); - - sprintf( - sqlcmd, + erc = dbfcmd(settings->dbproc, "INSERT INTO %s " "(" "accountcode, " @@ -172,7 +176,7 @@ static int tds_log(struct ast_cdr *cdr) "'%s', " /* amaflags */ "'%s'" /* uniqueid */ ")", - table, + settings->table, accountcode, src, dst, @@ -192,27 +196,26 @@ static int tds_log(struct ast_cdr *cdr) uniqueid ); - do { - if (!connected) { - if (mssql_connect()) - ast_log(LOG_ERROR, "Failed to reconnect to SQL database.\n"); - else - ast_log(LOG_WARNING, "Reconnected to SQL database.\n"); + if (erc == FAIL) { + ast_log(LOG_ERROR, "Failed to build INSERT statement, no CDR was logged.\n"); + goto done; + } - retried = 1; /* note that we have now tried */ - } + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Failed to execute INSERT statement, no CDR was logged.\n"); + goto done; + } -#ifdef FREETDS_PRE_0_62 - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Failed to insert Call Data Record into SQL database.\n"); + /* Consume any results we might get back (this is more of a sanity check than + * anything else, since an INSERT shouldn't return results). */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); + } - mssql_disconnect(); /* this is ok even if we are already disconnected */ - } - } while (!connected && !retried); + res = 0; + +done: + ast_mutex_unlock(&tds_lock); ast_free(accountcode); ast_free(src); @@ -225,285 +228,252 @@ static int tds_log(struct ast_cdr *cdr) ast_free(lastdata); ast_free(uniqueid); - ast_mutex_unlock(&tds_lock); - return res; } static char *anti_injection(const char *str, int len) { /* Reference to http://www.nextgenss.com/papers/advanced_sql_injection.pdf */ - char *buf; char *buf_ptr, *srh_ptr; char *known_bad[] = {"select", "insert", "update", "delete", "drop", ";", "--", "\0"}; int idx; - if ((buf = ast_malloc(len + 1)) == NULL) - { - ast_log(LOG_ERROR, "cdr_tds: Out of memory error\n"); + if (!(buf = ast_calloc(1, len + 1))) { + ast_log(LOG_ERROR, "Out of memory\n"); return NULL; } - memset(buf, 0, len); buf_ptr = buf; /* Escape single quotes */ - for (; *str && strlen(buf) < len; str++) - { - if (*str == '\'') + for (; *str && strlen(buf) < len; str++) { + if (*str == '\'') { *buf_ptr++ = '\''; + } *buf_ptr++ = *str; } *buf_ptr = '\0'; /* Erase known bad input */ - for (idx=0; *known_bad[idx]; idx++) - { - while((srh_ptr = strcasestr(buf, known_bad[idx]))) - { - memmove(srh_ptr, srh_ptr+strlen(known_bad[idx]), strlen(srh_ptr+strlen(known_bad[idx]))+1); + for (idx = 0; *known_bad[idx]; idx++) { + while ((srh_ptr = strcasestr(buf, known_bad[idx]))) { + memmove(srh_ptr, srh_ptr + strlen(known_bad[idx]), strlen(srh_ptr + strlen(known_bad[idx])) + 1); } } return buf; } -static void get_date(char *dateField, struct timeval tv) +static void get_date(char *dateField, size_t len, struct timeval tv) { - struct ast_tm tm; - char buf[80]; - /* To make sure we have date variable if not insert null to SQL */ - if (!ast_tvzero(tv)) - { + if (!ast_tvzero(tv)) { + struct ast_tm tm; ast_localtime(&tv, &tm, NULL); - ast_strftime(buf, 80, DATE_FORMAT, &tm); - sprintf(dateField, "'%s'", buf); - } - else - { - strcpy(dateField, "null"); + ast_strftime(dateField, len, "'" DATE_FORMAT "'", &tm); + } else { + ast_copy_string(dateField, "null", len); } } static int mssql_disconnect(void) { - if (tds) { - tds_free_socket(tds); - tds = NULL; + if (settings->dbproc) { + dbclose(settings->dbproc); + settings->dbproc = NULL; } - if (context) { - tds_free_context(context); - context = NULL; - } - - if (login) { - tds_free_login(login); - login = NULL; - } - - connected = 0; + settings->connected = 0; return 0; } static int mssql_connect(void) { -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - TDSCONNECTION *connection = NULL; -#else - TDSCONNECTINFO *connection = NULL; -#endif - char query[128]; - - /* Connect to M$SQL Server */ - if (!(login = tds_alloc_login())) - { - ast_log(LOG_ERROR, "tds_alloc_login() failed.\n"); + LOGINREC *login; + + if ((login = dblogin()) == NULL) { + ast_log(LOG_ERROR, "Unable to allocate login structure for db-lib\n"); return -1; } - - tds_set_server(login, hostname); - tds_set_user(login, dbuser); - tds_set_passwd(login, password); - tds_set_app(login, "TSQL"); - tds_set_library(login, "TDS-Library"); -#ifndef FREETDS_PRE_0_62 - tds_set_client_charset(login, charset); -#endif - tds_set_language(login, language); - tds_set_packet(login, 512); - tds_set_version(login, 7, 0); - -#ifdef FREETDS_0_64 - if (!(context = tds_alloc_context(NULL))) -#else - if (!(context = tds_alloc_context())) -#endif - { - ast_log(LOG_ERROR, "tds_alloc_context() failed.\n"); - goto connect_fail; + + DBSETLAPP(login, "TSQL"); + DBSETLUSER(login, (char *) settings->username); + DBSETLPWD(login, (char *) settings->password); + DBSETLCHARSET(login, (char *) settings->charset); + DBSETLNATLANG(login, (char *) settings->language); + + if ((settings->dbproc = dbopen(login, (char *) settings->hostname)) == NULL) { + ast_log(LOG_ERROR, "Unable to connect to %s\n", settings->hostname); + dbloginfree(login); + return -1; } - if (!(tds = tds_alloc_socket(context, 512))) { - ast_log(LOG_ERROR, "tds_alloc_socket() failed.\n"); - goto connect_fail; + dbloginfree(login); + + if (dbuse(settings->dbproc, (char *) settings->database) == FAIL) { + ast_log(LOG_ERROR, "Unable to select database %s\n", settings->database); + goto failed; } - tds_set_parent(tds, NULL); - connection = tds_read_config_info(tds, login, context->locale); - if (!connection) - { - ast_log(LOG_ERROR, "tds_read_config() failed.\n"); - goto connect_fail; + if (dbfcmd(settings->dbproc, "SELECT 1 FROM [%s]", settings->table) == FAIL) { + ast_log(LOG_ERROR, "Unable to build query while verifying the existence of table '%s'\n", settings->table); + goto failed; } - if (tds_connect(tds, connection) == TDS_FAIL) - { - ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n"); - tds = NULL; /* freed by tds_connect() on error */ -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - goto connect_fail; + if (dbsqlexec(settings->dbproc) == FAIL) { + ast_log(LOG_ERROR, "Unable to verify existence of table '%s'\n", settings->table); + goto failed; } -#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) - tds_free_connection(connection); -#else - tds_free_connect(connection); -#endif - connection = NULL; - - sprintf(query, "USE %s", dbname); -#ifdef FREETDS_PRE_0_62 - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) -#else - if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) -#endif - { - ast_log(LOG_ERROR, "Could not change database (%s)\n", dbname); - goto connect_fail; + + /* Consume the result set (we don't really care about the result, though) */ + while (dbresults(settings->dbproc) != NO_MORE_RESULTS) { + while (dbnextrow(settings->dbproc) != NO_MORE_ROWS); } - connected = 1; + settings->connected = 1; + return 0; -connect_fail: - mssql_disconnect(); +failed: + dbclose(settings->dbproc); + settings->dbproc = NULL; return -1; } static int tds_unload_module(void) { - mssql_disconnect(); + if (settings) { + ast_mutex_lock(&tds_lock); + mssql_disconnect(); + ast_mutex_unlock(&tds_lock); + + ast_string_field_free_memory(settings); + ast_free(settings); + } ast_cdr_unregister(name); - if (hostname) ast_free(hostname); - if (dbname) ast_free(dbname); - if (dbuser) ast_free(dbuser); - if (password) ast_free(password); - if (charset) ast_free(charset); - if (language) ast_free(language); - if (table) ast_free(table); + dbexit(); + + return 0; +} + +static int tds_error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) +{ + ast_log(LOG_ERROR, "%s (%d)\n", dberrstr, dberr); + + if (oserr != DBNOERR) { + ast_log(LOG_ERROR, "%s (%d)\n", oserrstr, oserr); + } + + return INT_CANCEL; +} + +static int tds_message_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severity, char *msgtext, char *srvname, char *procname, int line) +{ + ast_debug(1, "Msg %d, Level %d, State %d, Line %d\n", msgno, severity, msgstate, line); + ast_log(LOG_NOTICE, "%s\n", msgtext); return 0; } static int tds_load_module(int reload) { - int res = 0; struct ast_config *cfg; - struct ast_variable *var; const char *ptr = NULL; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; -#ifdef FREETDS_PRE_0_62 - TDS_INT result_type; -#endif cfg = ast_config_load(config, config_flags); if (!cfg) { - ast_log(LOG_NOTICE, "Unable to load config for MSSQL CDR's: %s\n", config); + ast_log(LOG_NOTICE, "Unable to load TDS config for CDRs: %s\n", config); return 0; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) return 0; - var = ast_variable_browse(cfg, "global"); - if (!var) /* nothing configured */ { + if (!ast_variable_browse(cfg, "global")) { + /* nothing configured */ ast_config_destroy(cfg); return 0; } - + + ast_mutex_lock(&tds_lock); + + /* Clear out any existing settings */ + ast_string_field_init(settings, 0); + ptr = ast_variable_retrieve(cfg, "global", "hostname"); if (ptr) { - if (hostname) - ast_free(hostname); - hostname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database server hostname not specified.\n"); + ast_string_field_set(settings, hostname, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database server hostname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "dbname"); if (ptr) { - if (dbname) - ast_free(dbname); - dbname = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbname not specified.\n"); + ast_string_field_set(settings, database, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbname not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "user"); if (ptr) { - if (dbuser) - ast_free(dbuser); - dbuser = ast_strdup(ptr); - } else - ast_log(LOG_ERROR, "Database dbuser not specified.\n"); + ast_string_field_set(settings, username, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database dbuser not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "password"); if (ptr) { - if (password) - ast_free(password); - password = ast_strdup(ptr); - } else - ast_log(LOG_ERROR,"Database password not specified.\n"); + ast_string_field_set(settings, password, ptr); + } else { + ast_log(LOG_ERROR, "Failed to connect: Database password not specified.\n"); + goto failed; + } ptr = ast_variable_retrieve(cfg, "global", "charset"); - if (charset) - ast_free(charset); - if (ptr) - charset = ast_strdup(ptr); - else - charset = ast_strdup("iso_1"); - - if (language) - ast_free(language); + if (ptr) { + ast_string_field_set(settings, charset, ptr); + } else { + ast_string_field_set(settings, charset, "iso_1"); + } + ptr = ast_variable_retrieve(cfg, "global", "language"); - if (ptr) - language = ast_strdup(ptr); - else - language = ast_strdup("us_english"); + if (ptr) { + ast_string_field_set(settings, language, ptr); + } else { + ast_string_field_set(settings, language, "us_english"); + } ptr = ast_variable_retrieve(cfg, "global", "table"); - if (ptr == NULL) { - ast_debug(1, "cdr_tds: table not specified. Assuming cdr\n"); - ptr = "cdr"; + if (ptr) { + ast_string_field_set(settings, table, ptr); + } else { + ast_log(LOG_NOTICE, "Table name not specified, using 'cdr' by default.\n"); + ast_string_field_set(settings, table, "cdr"); + } + + mssql_disconnect(); + + if (mssql_connect()) { + /* We failed to connect (mssql_connect takes care of logging it) */ + goto failed; } - if (table) - ast_free(table); - table = ast_strdup(ptr); + ast_mutex_unlock(&tds_lock); ast_config_destroy(cfg); - ast_mutex_lock(&tds_lock); - mssql_disconnect(); - mssql_connect(); + return 1; + +failed: ast_mutex_unlock(&tds_lock); + ast_config_destroy(cfg); - return res; + return 0; } static int reload(void) @@ -513,9 +483,35 @@ static int reload(void) static int load_module(void) { - if (!tds_load_module(0)) + if (dbinit() == FAIL) { + ast_log(LOG_ERROR, "Failed to initialize FreeTDS db-lib\n"); return AST_MODULE_LOAD_DECLINE; + } + + dberrhandle(tds_error_handler); + dbmsghandle(tds_message_handler); + + settings = ast_calloc(1, sizeof(*settings)); + + if (!settings || ast_string_field_init(settings, 256)) { + if (settings) { + ast_free(settings); + settings = NULL; + } + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + + if (!tds_load_module(0)) { + ast_string_field_free_memory(settings); + ast_free(settings); + settings = NULL; + dbexit(); + return AST_MODULE_LOAD_DECLINE; + } + ast_cdr_register(name, ast_module_info->description, tds_log); + return AST_MODULE_LOAD_SUCCESS; } @@ -524,7 +520,7 @@ static int unload_module(void) return tds_unload_module(); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MSSQL CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, diff --git a/configure.ac b/configure.ac index c72e9c2..6c692f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1376,34 +1376,7 @@ fi AST_EXT_TOOL_CHECK([GMIME], [gmime]) -AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h]) -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi +AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h]) AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], []) diff --git a/doc/tex/freetds.tex b/doc/tex/freetds.tex index 8dcbec2..8db589f 100644 --- a/doc/tex/freetds.tex +++ b/doc/tex/freetds.tex @@ -1,16 +1,6 @@ -The cdr\_tds module is NOT compatible with version 0.63 of FreeTDS. - -The cdr\_tds module is known to work with FreeTDS version 0.62.1; -it should also work with 0.62.2, 0.62.3 and 0.62.4, which are bug -fix releases. - -The cdr\_tds module uses the raw "libtds" API of FreeTDS. It appears -that from 0.63 onwards, this is not considered a published API -of FreeTDS and is subject to change without notice. - -Between 0.62.x and 0.63 of FreeTDS, many incompatible changes -have been made to the libtds API. - -For newer versions of FreeTDS, it is recommended that you use the -ODBC driver. +The cdr\_tds module now works with most modern release versions of FreeTDS (from +at least 0.60 through 0.82). Although versions of FreeTDS prior to 0.82 will +work, we recommend using the latest available version for performance and +stability reasons. +The latest release of FreeTDS is available from http://www.freetds.org/ diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index b368c8d..3a76722 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1193,9 +1193,6 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 0009-Merged-revisions-123952-via-svnmerge-from.patch: --- NEW FILE 0009-Merged-revisions-123952-via-svnmerge-from.patch --- >From 7f4f8b28cddd114b43edf266a5b599aa415d1154 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 19 Jun 2008 17:23:22 +0000 Subject: [PATCH] Merged revisions 123952 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r123952 | tilghman | 2008-06-19 12:22:27 -0500 (Thu, 19 Jun 2008) | 6 lines Don't change pointers that need to be later passed back for deallocation. (closes issue #12572) Reported by: flyn Patches: 20080613__bug12572.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 123958 614ede4d-c843-0410-af14-a771ab80d22e --- res/res_config_ldap.c | 85 +++++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 41 deletions(-) diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 33ed247..15a6827 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -282,33 +282,36 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); /* these are freed at the end */ if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; - ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, value->bv_val); + valptr = value->bv_val; + ast_debug(2, "LINE(%d) attribute_name: %s LDAP value: %s\n", __LINE__, attribute_name, valptr); if (is_realmed_password_attribute) { - if (!strncasecmp(value->bv_val, "{md5}", 5)) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (!strncasecmp(valptr, "{md5}", 5)) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { /* ok, so looping through all delimited values except the last one (not, last character is not delimited...) */ if (is_delimited) { i = 0; pos = 0; - while (!ast_strlen_zero(value->bv_val + i)) { - if (value->bv_val[i] == ';'){ - value->bv_val[i] = '\0'; + while (!ast_strlen_zero(valptr + i)) { + if (valptr[i] == ';'){ + valptr[i] = '\0'; if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } pos = i + 1; } @@ -317,15 +320,14 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config } /* for the last delimited value or if the value is not delimited: */ if (prev) { - prev->next = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev->next = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, &value->bv_val[pos], table_config->table_name); + prev = var = ast_variable_new(attribute_name, &valptr[pos], table_config->table_name); } } - v++; } ldap_value_free_len(values); } @@ -400,23 +402,26 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf values = ldap_get_values_len(ldapConn, ldap_entry, ldap_attribute_name); if (values) { - struct berval **v = values; + struct berval **v; + char *valptr; - while (*v) { + for (v = values; *v; v++) { value = *v; + valptr = value->bv_val; if (is_realmed_password_attribute) { - if (strncasecmp(value->bv_val, "{md5}", 5) == 0) - value->bv_val += 5; - else - value->bv_val = NULL; - ast_debug(2, "md5: %s\n", value->bv_val); + if (strncasecmp(valptr, "{md5}", 5) == 0) { + valptr += 5; + } else { + valptr = NULL; + } + ast_debug(2, "md5: %s\n", valptr); } - if (value->bv_val) { + if (valptr) { if (delim_value == NULL && !is_realmed_password_attribute && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0)) { - delim_value = ast_strdup(value->bv_val); + delim_value = ast_strdup(valptr); if ((delim_tot_count = semicolon_count_str(delim_value)) > 0) { ast_debug(4, "LINE(%d) is delimited %d times: %s\n", __LINE__, delim_tot_count, delim_value); @@ -426,11 +431,10 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf if (is_delimited != 0 && !is_realmed_password_attribute - && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ){ + && (static_table_config != table_config || strcmp(attribute_name, "variable_value") == 0) ) { /* for non-Static RealTime, first */ - i = pos; - while (!ast_strlen_zero(value->bv_val + i)) { + for (i = pos; !ast_strlen_zero(valptr + i); i++) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); if (delim_value[i] == ';') { delim_value[i] = '\0'; @@ -451,9 +455,8 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf break; } } - i++; } - if (ast_strlen_zero(value->bv_val + i)) { + if (ast_strlen_zero(valptr + i)) { ast_debug(4, "LINE(%d) DELIM pos: %d i: %d delim_count: %d\n", __LINE__, pos, i, delim_count); /* Last delimited value */ ast_debug(4, "LINE(%d) DELIM - attribute_name: %s value: %s pos: %d\n", __LINE__, attribute_name, &delim_value[pos], pos); @@ -468,9 +471,9 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf /* Remembering to free memory */ is_delimited = 0; pos = 0; - free(delim_value); - delim_value = NULL; } + free(delim_value); + delim_value = NULL; ast_debug(4, "LINE(%d) DELIM pos: %d i: %d\n", __LINE__, pos, i); } else { @@ -479,20 +482,19 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf free(delim_value); delim_value = NULL; } - ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, value->bv_val); + ast_debug(2, "LINE(%d) attribute_name: %s value: %s\n", __LINE__, attribute_name, valptr); if (prev) { - prev->next = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev->next = ast_variable_new(attribute_name, valptr, table_config->table_name); if (prev->next) { prev = prev->next; } } else { - prev = var = ast_variable_new(attribute_name, value->bv_val, table_config->table_name); + prev = var = ast_variable_new(attribute_name, valptr, table_config->table_name); } } } - v++; - } /*!< while(*v) */ + } /*!< for (v = values; *v; v++) */ ldap_value_free_len(values); }/*!< if (values) */ ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber); @@ -1459,10 +1461,11 @@ int parse_config(void) static_table_config = table_config; } for (; var; var = var->next) { - if (!strcasecmp(var->name, "additionalFilter")) - table_config->additional_filter = strdup(var->value); - else + if (!strcasecmp(var->name, "additionalFilter")) { + table_config->additional_filter = ast_strdup(var->value); + } else { ldap_table_config_add_attribute(table_config, var->name, var->value); + } } } } -- 1.5.5.2 0010-Merged-revisions-132778-via-svnmerge-from.patch: --- NEW FILE 0010-Merged-revisions-132778-via-svnmerge-from.patch --- >From 56da7591f2d9b11f5f5d2ed2b7e4785d955d172b Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 22 Jul 2008 21:55:06 +0000 Subject: [PATCH] Merged revisions 132778 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r132778 | tilghman | 2008-07-22 16:53:40 -0500 (Tue, 22 Jul 2008) | 18 lines Merged revisions 132713 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r132713 | tilghman | 2008-07-22 16:19:39 -0500 (Tue, 22 Jul 2008) | 10 lines Merged revisions 132711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r132711 | tilghman | 2008-07-22 16:14:10 -0500 (Tue, 22 Jul 2008) | 2 lines Fixes for AST-2008-010 and AST-2008-011 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 132780 614ede4d-c843-0410-af14-a771ab80d22e --- channels/chan_iax2.c | 31 +++++++++++++++++++++++++++++-- configs/iax.conf.sample | 10 ++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index abdad2d..125e087 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -275,6 +275,7 @@ enum iax2_flags { IAX_DELAYPBXSTART = (1 << 25), /*!< Don't start a PBX on the channel until the peer sends us a response, so that we've achieved a three-way handshake with them before sending voice or anything else*/ + IAX_ALLOWFWDOWNLOAD = (1 << 26), /*!< Allow the FWDOWNL command? */ }; static int global_rtautoclear = 120; @@ -1647,10 +1648,10 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s snprintf(host, sizeof(host), "%s:%d", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); now = ast_tvnow(); - start = 1 + (ast_random() % (TRUNK_CALL_START - 1)); + start = 2 + (ast_random() % (TRUNK_CALL_START - 1)); for (x = start; 1; x++) { if (x == TRUNK_CALL_START) { - x = 0; + x = 1; continue; } @@ -3389,6 +3390,15 @@ struct parsed_dial_string { char *options; }; +static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno) +{ + struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno), + .ts = htonl(ts), .iseqno = seqno, .oseqno = seqno, .type = AST_FRAME_IAX, + .csub = compress_subclass(command) }; + + return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin)); +} + /*! * \brief Parses an IAX dial string into its component parts. * \param data the string to be parsed @@ -7935,6 +7945,17 @@ static int socket_process(struct iax2_thread *thread) } else { f.subclass = uncompress_subclass(fh->csub); } + + /* Deal with POKE/PONG without allocating a callno */ + if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) { + /* Reply back with a PONG, but don't care about the result. */ + send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->oseqno); + return 1; + } else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) { + /* Ignore */ + return 1; + } + if ((f.frametype == AST_FRAME_IAX) && ((f.subclass == IAX_COMMAND_NEW) || (f.subclass == IAX_COMMAND_REGREQ) || (f.subclass == IAX_COMMAND_POKE) || (f.subclass == IAX_COMMAND_FWDOWNL) || (f.subclass == IAX_COMMAND_REGREL))) @@ -9235,6 +9256,10 @@ retryowner2: break; case IAX_COMMAND_FWDOWNL: /* Firmware download */ + if (!ast_test_flag(&globalflags, IAX_ALLOWFWDOWNLOAD)) { + send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_UNSUPPORT, 0, NULL, 0, -1); + break; + } memset(&ied0, 0, sizeof(ied0)); res = iax_firmware_append(&ied0, (unsigned char *)ies.devicetype, ies.fwdesc); if (res < 0) @@ -10878,6 +10903,8 @@ static int set_config(char *config_file, int reload) ast_set2_flag((&globalflags), ast_true(v->value), IAX_FORCEJITTERBUF); else if (!strcasecmp(v->name, "delayreject")) delayreject = ast_true(v->value); + else if (!strcasecmp(v->name, "allowfwdownload")) + ast_set2_flag((&globalflags), ast_true(v->value), IAX_ALLOWFWDOWNLOAD); else if (!strcasecmp(v->name, "rtcachefriends")) ast_set2_flag((&globalflags), ast_true(v->value), IAX_RTCACHEFRIENDS); else if (!strcasecmp(v->name, "rtignoreregexpire")) diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index 2441f2c..854a243 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -264,6 +264,16 @@ autokill=yes ; The default value is 'host' ; ;codecpriority=host +; +; allowfwdownload controls whether this host will serve out firmware to +; IAX clients which request it. This has only been used for the IAXy, +; and it has been recently proven that this firmware distribution method +; can be used as a source of traffic amplification attacks. Also, the +; IAXy firmware has not been updated for at least 18 months, so unless +; you are provisioning IAXys in a secure network, we recommend that you +; leave this option to the default, off. +; +;allowfwdownload=yes ;rtcachefriends=yes ; Cache realtime friends by adding them to the internal list ; just like friends added from the config file only on a -- 1.5.5.2 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch: --- NEW FILE 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch --- >From d4666a37474b4edcfa131bc65724bb159a06d713 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 30 Jul 2008 09:33:10 -0500 Subject: [PATCH] Replace app_rxfax/app_txfax with app_fax pulled from upstream SVN. Merged the following commits into this one: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 119796 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 119800 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 119802 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 120566 http://svn.digium.com/svn/asterisk/branches/1.6.0 at 129007 Once a new beta of 1.6.0 is released this patch can be dropped. --- apps/app_fax.c | 741 ++++++++++++++++++++++++++++++++++++++ build_tools/menuselect-deps.in | 1 + configure.ac | 14 + include/asterisk/autoconfig.h.in | 6 + makeopts.in | 3 + 5 files changed, 765 insertions(+), 0 deletions(-) create mode 100644 apps/app_fax.c diff --git a/apps/app_fax.c b/apps/app_fax.c new file mode 100644 index 0000000..6d98755 --- /dev/null +++ b/apps/app_fax.c @@ -0,0 +1,741 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Simple fax applications + * + * 2007-2008, Dmitry Andrianov + * + * Code based on original implementation by Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + * + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/module.h" +#include "asterisk/manager.h" + +static char *app_sndfax_name = "SendFAX"; +static char *app_sndfax_synopsis = "Send a FAX"; +static char *app_sndfax_desc = +" SendFAX(filename[|options]):\n" +"Send a given TIFF file to the channel as a FAX.\n" +"The option string may contain zero or more of the following characters:\n" +" 'a' -- makes the application behave as an answering machine\n" +" The default behaviour is to behave as a calling machine.\n" +"\n" +"This application uses following variables:\n" +" LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"\n" +"This application sets the following channel variables upon completion:\n" +" FAXSTATUS - status of operation:\n" +" SUCCESS | FAILED\n" +" FAXERROR - Error when FAILED\n" +" REMOTESTATIONID - CSID of the remote side.\n" +" FAXPAGES - number of pages sent.\n" +" FAXBITRATE - transmition rate.\n" +" FAXRESOLUTION - resolution.\n" +"\n" +"Returns -1 in case of user hang up or any channel error.\n" +"Returns 0 on success.\n"; + +static char *app_rcvfax_name = "ReceiveFAX"; +static char *app_rcvfax_synopsis = "Receive a FAX"; +static char *app_rcvfax_desc = +" ReceiveFAX(filename[|options]):\n" +"Receives a fax from the channel into the given filename overwriting\n" +"the file if it already exists. File created will have TIFF format.\n" +"The option string may contain zero or more of the following characters:\n" +" 'c' -- makes the application behave as a calling machine\n" +" The default behaviour is to behave as an answering machine.\n" +"\n" +"This application uses following variables:\n" +" LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"\n" +"This application sets the following channel variables upon completion:\n" +" FAXSTATUS - status of operation:\n" +" SUCCESS | FAILED\n" +" FAXERROR - Error when FAILED\n" +" REMOTESTATIONID - CSID of the remote side.\n" +" FAXPAGES - number of pages sent.\n" +" FAXBITRATE - transmition rate.\n" +" FAXRESOLUTION - resolution.\n" +"\n" +"Returns -1 in case of user hang up or any channel error.\n" +"Returns 0 on success.\n"; + +#define MAX_SAMPLES 240 + +/* Watchdog. I have seen situations when remote fax disconnects (because of poor line + quality) while SpanDSP continues staying in T30_STATE_IV_CTC state forever. + To avoid this, we terminate when we see that T30 state does not change for 5 minutes. + We also terminate application when more than 30 minutes passed regardless of + state changes. This is just a precaution measure - no fax should take that long */ + +#define WATCHDOG_TOTAL_TIMEOUT 30 * 60 +#define WATCHDOG_STATE_TIMEOUT 5 * 60 + +typedef struct { + struct ast_channel *chan; + enum ast_t38_state t38state; /* T38 state of the channel */ + int direction; /* Fax direction: 0 - receiving, 1 - sending */ + int caller_mode; + char *file_name; + + volatile int finished; +} fax_session; + +static void span_message(int level, const char *msg) +{ + if (level == SPAN_LOG_ERROR) { + ast_log(LOG_ERROR, "%s", msg); + } else if (level == SPAN_LOG_WARNING) { + ast_log(LOG_WARNING, "%s", msg); + } else { + ast_log(LOG_DEBUG, "%s", msg); + } +} + +static int t38_tx_packet_handler(t38_core_state_t *s, void *user_data, const uint8_t *buf, int len, int count) +{ + struct ast_channel *chan = (struct ast_channel *) user_data; + + struct ast_frame outf = { + .frametype = AST_FRAME_MODEM, + .subclass = AST_MODEM_T38, + .src = __FUNCTION__, + }; + + /* TODO: Asterisk does not provide means of resending the same packet multiple + times so count is ignored at the moment */ + + AST_FRAME_SET_BUFFER(&outf, buf, 0, len); + + if (ast_write(chan, &outf) < 0) { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + return -1; + } + + return 0; +} + +static void phase_e_handler(t30_state_t *f, void *user_data, int result) +{ + const char *local_ident; + const char *far_ident; + char buf[20]; + fax_session *s = (fax_session *) user_data; + t30_stats_t stat; + + ast_debug(1, "Fax phase E handler. result=%d\n", result); + + t30_get_transfer_statistics(f, &stat); + + s = (fax_session *) user_data; + + if (result != T30_ERR_OK) { + s->finished = -1; + + /* FAXSTATUS is already set to FAILED */ + pbx_builtin_setvar_helper(s->chan, "FAXERROR", t30_completion_code_to_str(result)); + + ast_log(LOG_WARNING, "Error transmitting fax. result=%d: %s.\n", result, t30_completion_code_to_str(result)); + + return; + } + + s->finished = 1; + + local_ident = t30_get_tx_ident(f); + far_ident = t30_get_rx_ident(f); + pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "SUCCESS"); + pbx_builtin_setvar_helper(s->chan, "FAXERROR", NULL); + pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", far_ident); + snprintf(buf, sizeof(buf), "%d", stat.pages_transferred); + pbx_builtin_setvar_helper(s->chan, "FAXPAGES", buf); + snprintf(buf, sizeof(buf), "%d", stat.y_resolution); + pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", buf); + snprintf(buf, sizeof(buf), "%d", stat.bit_rate); + pbx_builtin_setvar_helper(s->chan, "FAXBITRATE", buf); + + ast_debug(1, "Fax transmitted successfully.\n"); + ast_debug(1, " Remote station ID: %s\n", far_ident); + ast_debug(1, " Pages transferred: %d\n", stat.pages_transferred); + ast_debug(1, " Image resolution: %d x %d\n", stat.x_resolution, stat.y_resolution); + ast_debug(1, " Transfer Rate: %d\n", stat.bit_rate); + + manager_event(EVENT_FLAG_CALL, + s->direction ? "FaxSent" : "FaxReceived", + "Channel: %s\r\n" + "Exten: %s\r\n" + "CallerID: %s\r\n" + "RemoteStationID: %s\r\n" + "LocalStationID: %s\r\n" + "PagesTransferred: %d\r\n" + "Resolution: %d\r\n" + "TransferRate: %d\r\n" + "FileName: %s\r\n", + s->chan->name, + s->chan->exten, + S_OR(s->chan->cid.cid_num, ""), + far_ident, + local_ident, + stat.pages_transferred, + stat.y_resolution, + stat.bit_rate, + s->file_name); +} + +/* === Helper functions to configure fax === */ + +/* Setup SPAN logging according to Asterisk debug level */ +static int set_logging(logging_state_t *state) +{ + int level = SPAN_LOG_WARNING + option_debug; + + span_log_set_message_handler(state, span_message); + span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); + + return 0; +} + +static void set_local_info(t30_state_t *state, fax_session *s) +{ + const char *x; + + x = pbx_builtin_getvar_helper(s->chan, "LOCALSTATIONID"); + if (!ast_strlen_zero(x)) + t30_set_tx_ident(state, x); + + x = pbx_builtin_getvar_helper(s->chan, "LOCALHEADERINFO"); + if (!ast_strlen_zero(x)) + t30_set_tx_page_header_info(state, x); +} + +static void set_file(t30_state_t *state, fax_session *s) +{ + if (s->direction) + t30_set_tx_file(state, s->file_name, -1, -1); + else + t30_set_rx_file(state, s->file_name, -1); +} + +static void set_ecm(t30_state_t *state, int ecm) +{ + t30_set_ecm_capability(state, ecm); + t30_set_supported_compressions(state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); +} + +/* === Generator === */ + +/* This function is only needed to return passed params so + generator_activate will save it to channel's generatordata */ +static void *fax_generator_alloc(struct ast_channel *chan, void *params) +{ + return params; +} + +static int fax_generator_generate(struct ast_channel *chan, void *data, int len, int samples) +{ + fax_state_t *fax = (fax_state_t*) data; + uint8_t buffer[AST_FRIENDLY_OFFSET + MAX_SAMPLES * sizeof(uint16_t)]; + int16_t *buf = (int16_t *) (buffer + AST_FRIENDLY_OFFSET); + + struct ast_frame outf = { + .frametype = AST_FRAME_VOICE, + .subclass = AST_FORMAT_SLINEAR, + .src = __FUNCTION__, + }; + + if (samples > MAX_SAMPLES) { + ast_log(LOG_WARNING, "Only generating %d samples, where %d requested\n", MAX_SAMPLES, samples); + samples = MAX_SAMPLES; + } + + if ((len = fax_tx(fax, buf, samples)) > 0) { + outf.samples = len; + AST_FRAME_SET_BUFFER(&outf, buffer, AST_FRIENDLY_OFFSET, len * sizeof(int16_t)); + + if (ast_write(chan, &outf) < 0) { + ast_log(LOG_WARNING, "Failed to write frame to '%s': %s\n", chan->name, strerror(errno)); + return -1; + } + } + + return 0; +} + +struct ast_generator generator = { + alloc: fax_generator_alloc, + generate: fax_generator_generate, +}; + + +/* === Transmission === */ + +static int transmit_audio(fax_session *s) +{ + int res = -1; + int original_read_fmt = AST_FORMAT_SLINEAR; + int original_write_fmt = AST_FORMAT_SLINEAR; + fax_state_t fax; + struct ast_dsp *dsp = NULL; + int detect_tone = 0; + struct ast_frame *inf = NULL; + struct ast_frame *fr; + int last_state = 0; + struct timeval now, start, state_change; + enum ast_control_t38 t38control; + + original_read_fmt = s->chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) { + res = ast_set_read_format(s->chan, AST_FORMAT_SLINEAR); + if (res < 0) { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + goto done; + } + } + + original_write_fmt = s->chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) { + res = ast_set_write_format(s->chan, AST_FORMAT_SLINEAR); + if (res < 0) { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + goto done; + } + } + + /* Initialize T30 terminal */ + fax_init(&fax, s->caller_mode); + + /* Setup logging */ + set_logging(&fax.logging); + set_logging(&fax.t30_state.logging); + + /* Configure terminal */ + set_local_info(&fax.t30_state, s); + set_file(&fax.t30_state, s); + set_ecm(&fax.t30_state, TRUE); + + fax_set_transmit_on_idle(&fax, TRUE); + + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, s); + + if (s->t38state == T38_STATE_UNAVAILABLE) { + ast_debug(1, "T38 is unavailable on %s\n", s->chan->name); + } else if (!s->direction) { + /* We are receiving side and this means we are the side which should + request T38 when the fax is detected. Use DSP to detect fax tone */ + ast_debug(1, "Setting up CNG detection on %s\n", s->chan->name); + dsp = ast_dsp_new(); + ast_dsp_set_features(dsp, DSP_FEATURE_FAX_DETECT); + ast_dsp_set_faxmode(dsp, DSP_FAXMODE_DETECT_CNG); + detect_tone = 1; + } + + start = state_change = ast_tvnow(); + + ast_activate_generator(s->chan, &generator, &fax); + + while (!s->finished) { + res = ast_waitfor(s->chan, 20); + if (res < 0) + break; + else if (res > 0) + res = 0; + + inf = ast_read(s->chan); + if (inf == NULL) { + ast_debug(1, "Channel hangup\n"); + res = -1; + break; + } + + ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen); + + /* Detect fax tone */ + if (detect_tone && inf->frametype == AST_FRAME_VOICE) { + /* Duplicate frame because ast_dsp_process may free the frame passed */ + fr = ast_frdup(inf); + + /* Do not pass channel to ast_dsp_process otherwise it may queue modified audio frame back */ + fr = ast_dsp_process(NULL, dsp, fr); + if (fr && fr->frametype == AST_FRAME_DTMF && fr->subclass == 'f') { + ast_debug(1, "Fax tone detected. Requesting T38\n"); + t38control = AST_T38_REQUEST_NEGOTIATE; + ast_indicate_data(s->chan, AST_CONTROL_T38, &t38control, sizeof(t38control)); + detect_tone = 0; + } + + ast_frfree(fr); + } + + + /* Check the frame type. Format also must be checked because there is a chance + that a frame in old format was already queued before we set chanel format + to slinear so it will still be received by ast_read */ + if (inf->frametype == AST_FRAME_VOICE && inf->subclass == AST_FORMAT_SLINEAR) { + + if (fax_rx(&fax, inf->data, inf->samples) < 0) { + /* I know fax_rx never returns errors. The check here is for good style only */ + ast_log(LOG_WARNING, "fax_rx returned error\n"); + res = -1; + break; + } + + /* Watchdog */ + if (last_state != fax.t30_state.state) { + state_change = ast_tvnow(); + last_state = fax.t30_state.state; + } + } else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 && + inf->datalen == sizeof(enum ast_control_t38)) { + t38control =*((enum ast_control_t38 *) inf->data); + if (t38control == AST_T38_NEGOTIATED) { + /* T38 switchover completed */ + ast_debug(1, "T38 negotiated, finishing audio loop\n"); + res = 1; + break; + } + } + + ast_frfree(inf); + inf = NULL; + + /* Watchdog */ + now = ast_tvnow(); + if (ast_tvdiff_sec(now, start) > WATCHDOG_TOTAL_TIMEOUT || ast_tvdiff_sec(now, state_change) > WATCHDOG_STATE_TIMEOUT) { + ast_log(LOG_WARNING, "It looks like we hung. Aborting.\n"); + res = -1; + break; + } + } + + ast_debug(1, "Loop finished, res=%d\n", res); + + if (inf) + ast_frfree(inf); + + if (dsp) + ast_dsp_free(dsp); + + ast_deactivate_generator(s->chan); + + /* If we are switching to T38, remove phase E handler. Otherwise it will be executed + by t30_terminate, display diagnostics and set status variables although no transmittion + has taken place yet. */ + if (res > 0) { + t30_set_phase_e_handler(&fax.t30_state, NULL, NULL); + } + + t30_terminate(&fax.t30_state); + fax_release(&fax); + +done: + if (original_write_fmt != AST_FORMAT_SLINEAR) { + if (ast_set_write_format(s->chan, original_write_fmt) < 0) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", s->chan->name); + } + + if (original_read_fmt != AST_FORMAT_SLINEAR) { + if (ast_set_read_format(s->chan, original_read_fmt) < 0) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", s->chan->name); + } + + return res; + +} + +static int transmit_t38(fax_session *s) +{ + int res = 0; + t38_terminal_state_t t38; + struct ast_frame *inf = NULL; + int last_state = 0; + struct timeval now, start, state_change, last_frame; + enum ast_control_t38 t38control; + + /* Initialize terminal */ + memset(&t38, 0, sizeof(t38)); + if (t38_terminal_init(&t38, s->caller_mode, t38_tx_packet_handler, s->chan) == NULL) { + ast_log(LOG_WARNING, "Unable to start T.38 termination.\n"); + return -1; + } + + /* Setup logging */ + set_logging(&t38.logging); + set_logging(&t38.t30_state.logging); + set_logging(&t38.t38.logging); + + /* Configure terminal */ + set_local_info(&t38.t30_state, s); + set_file(&t38.t30_state, s); + set_ecm(&t38.t30_state, TRUE); + + t30_set_phase_e_handler(&t38.t30_state, phase_e_handler, s); + + now = start = state_change = ast_tvnow(); + + while (!s->finished) { + + res = ast_waitfor(s->chan, 20); + if (res < 0) + break; + else if (res > 0) + res = 0; + + last_frame = now; + now = ast_tvnow(); + t38_terminal_send_timeout(&t38, ast_tvdiff_us(now, last_frame) / (1000000 / 8000)); + + inf = ast_read(s->chan); + if (inf == NULL) { + ast_debug(1, "Channel hangup\n"); + res = -1; + break; + } + + ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen); + + if (inf->frametype == AST_FRAME_MODEM && inf->subclass == AST_MODEM_T38) { + t38_core_rx_ifp_packet(&t38.t38, inf->data, inf->datalen, inf->seqno); + + /* Watchdog */ + if (last_state != t38.t30_state.state) { + state_change = ast_tvnow(); + last_state = t38.t30_state.state; + } + } else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 && + inf->datalen == sizeof(enum ast_control_t38)) { + + t38control = *((enum ast_control_t38 *) inf->data); + + if (t38control == AST_T38_TERMINATED || t38control == AST_T38_REFUSED) { + ast_debug(1, "T38 down, terminating\n"); + res = -1; + break; + } + } + + ast_frfree(inf); + inf = NULL; + + /* Watchdog */ + if (ast_tvdiff_sec(now, start) > WATCHDOG_TOTAL_TIMEOUT || ast_tvdiff_sec(now, state_change) > WATCHDOG_STATE_TIMEOUT) { + ast_log(LOG_WARNING, "It looks like we hung. Aborting.\n"); + res = -1; + break; + } + } + + ast_debug(1, "Loop finished, res=%d\n", res); + + if (inf) + ast_frfree(inf); + + t30_terminate(&t38.t30_state); + t38_terminal_release(&t38); + + return res; +} + +static int transmit(fax_session *s) +{ + int res = 0; + + /* Clear all channel variables which to be set by the application. + Pre-set status to error so in case of any problems we can just leave */ + pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "FAILED"); + pbx_builtin_setvar_helper(s->chan, "FAXERROR", "Channel problems"); + + pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", NULL); + pbx_builtin_setvar_helper(s->chan, "FAXPAGES", NULL); + pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", NULL); + pbx_builtin_setvar_helper(s->chan, "FAXBITRATE", NULL); + + if (s->chan->_state != AST_STATE_UP) { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(s->chan); + if (res) { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", s->chan->name); + return res; + } + } + + s->t38state = ast_channel_get_t38_state(s->chan); + if (s->t38state != T38_STATE_NEGOTIATED) { + /* T38 is not negotiated on the channel yet. First start regular transmission. If it switches to T38, follow */ + res = transmit_audio(s); + if (res > 0) { + /* transmit_audio reports switchover to T38. Update t38state */ + s->t38state = ast_channel_get_t38_state(s->chan); + if (s->t38state != T38_STATE_NEGOTIATED) { + ast_log(LOG_ERROR, "Audio loop reports T38 switchover but t38state != T38_STATE_NEGOTIATED\n"); + } + } + } + + if (s->t38state == T38_STATE_NEGOTIATED) { + res = transmit_t38(s); + } + + if (res) { + ast_log(LOG_WARNING, "Transmission error\n"); + res = -1; + } else if (s->finished < 0) { + ast_log(LOG_WARNING, "Transmission failed\n"); + } else if (s->finished > 0) { + ast_debug(1, "Transmission finished Ok\n"); + } + + return res; +} + +/* === Application functions === */ + +static int sndfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char *parse; + fax_session session; + + AST_DECLARE_APP_ARGS(args, + AST_APP_ARG(file_name); + AST_APP_ARG(options); + ); + + if (chan == NULL) { + ast_log(LOG_ERROR, "Fax channel is NULL. Giving up.\n"); + return -1; + } + + /* The next few lines of code parse out the filename and header from the input string */ + if (ast_strlen_zero(data)) { + /* No data implies no filename or anything is present */ + ast_log(LOG_ERROR, "SendFAX requires an argument (filename)\n"); + return -1; + } + + parse = ast_strdupa(data); + AST_STANDARD_APP_ARGS(args, parse); + + session.caller_mode = TRUE; + + if (args.options) { + if (strchr(args.options, 'a')) + session.caller_mode = FALSE; + } + + /* Done parsing */ + session.direction = 1; + session.file_name = args.file_name; + session.chan = chan; + session.finished = 0; + + res = transmit(&session); + + return res; +} + +static int rcvfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char *parse; + fax_session session; + + AST_DECLARE_APP_ARGS(args, + AST_APP_ARG(file_name); + AST_APP_ARG(options); + ); + + if (chan == NULL) { + ast_log(LOG_ERROR, "Fax channel is NULL. Giving up.\n"); + return -1; + } + + /* The next few lines of code parse out the filename and header from the input string */ + if (ast_strlen_zero(data)) { + /* No data implies no filename or anything is present */ + ast_log(LOG_ERROR, "ReceiveFAX requires an argument (filename)\n"); + return -1; + } + + parse = ast_strdupa(data); + AST_STANDARD_APP_ARGS(args, parse); + + session.caller_mode = FALSE; + + if (args.options) { + if (strchr(args.options, 'c')) + session.caller_mode = TRUE; + } + + /* Done parsing */ + session.direction = 0; + session.file_name = args.file_name; + session.chan = chan; + session.finished = 0; + + res = transmit(&session); + + return res; +} + +static int unload_module(void) +{ + int res; + + res = ast_unregister_application(app_sndfax_name); + res |= ast_unregister_application(app_rcvfax_name); + + return res; +} + +static int load_module(void) +{ + int res ; + + res = ast_register_application(app_sndfax_name, sndfax_exec, app_sndfax_synopsis, app_sndfax_desc); + res |= ast_register_application(app_rcvfax_name, rcvfax_exec, app_rcvfax_synopsis, app_rcvfax_desc); + + /* The default SPAN message handler prints to stderr. It is something we do not want */ + span_set_message_handler(NULL); + + return res; +} + + +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Simple FAX Application", + .load = load_module, + .unload = unload_module, + ); + + diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index e51279b..e50e64e 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -32,6 +32,7 @@ POPT=@PBX_POPT@ PORTAUDIO=@PBX_PORTAUDIO@ PRI=@PBX_PRI@ RADIUS=@PBX_RADIUS@ +SPANDSP=@PBX_SPANDSP@ SPEEX=@PBX_SPEEX@ SPEEXDSP=@PBX_SPEEXDSP@ SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@ diff --git a/configure.ac b/configure.ac index 6c692f8..20b4976 100644 --- a/configure.ac +++ b/configure.ac @@ -236,6 +236,7 @@ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres]) AST_EXT_LIB_SETUP([POPT], [popt], [popt]) AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio]) AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri]) +AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp]) AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) @@ -1294,6 +1295,19 @@ AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h]) AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h]) +AST_C_COMPILE_CHECK([SPANDSP], [ + #if SPANDSP_RELEASE_DATE < 20080516 + #error "spandsp 0.0.5 or greater is required" + #endif + ], [spandsp/version.h]) + +if test "x${PBX_SPANDSP}" = "x1" ; then + # We found the correct version in the header, now let's make sure it links + # properly, and that libtiff is available + PBX_SPANDSP=0 + AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff]) +fi + AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h]) if test "${USE_PWLIB}" != "no"; then diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 3a76722..855f8ec 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -715,6 +715,12 @@ /* Define to 1 if your system has soxmix application. */ #undef HAVE_SOXMIX +/* Define this to indicate the ${SPANDSP_DESCRIP} library */ +#undef HAVE_SPANDSP + +/* Define to indicate the ${SPANDSP_DESCRIP} library version */ +#undef HAVE_SPANDSP_VERSION + /* Define this to indicate the ${SPEEX_DESCRIP} library */ #undef HAVE_SPEEX diff --git a/makeopts.in b/makeopts.in index b8a4ab6..ad7a94d 100644 --- a/makeopts.in +++ b/makeopts.in @@ -172,6 +172,9 @@ SDL_LIB=@SDL_LIB@ SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@ SDL_IMAGE_LIB=@SDL_IMAGE_LIB@ +SPANDSP_INCLUDE=@SPANDSP_INCLUDE@ +SPANDSP_LIB=@SPANDSP_LIB@ + SPEEX_INCLUDE=@SPEEX_INCLUDE@ SPEEX_LIB=@SPEEX_LIB@ -- 1.5.5.2 0012-Update-autoconf.patch: --- NEW FILE 0012-Update-autoconf.patch --- >From 77b9ee99b4b0edd8261f60c96e4cc5ea2555099f Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Wed, 30 Jul 2008 09:39:50 -0500 Subject: [PATCH] Update autoconf --- configure | 1378 ++++++++++++++++++++++++++++---------- include/asterisk/autoconfig.h.in | 17 +- 2 files changed, 1045 insertions(+), 350 deletions(-) diff --git a/configure b/configure index d72fa38..145369a 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 115581 . +# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -728,14 +728,18 @@ BKTR_LIB BKTR_INCLUDE BKTR_DIR PBX_BKTR -CAP_LIB -CAP_INCLUDE -CAP_DIR -PBX_CAP +BLUETOOTH_LIB +BLUETOOTH_INCLUDE +BLUETOOTH_DIR +PBX_BLUETOOTH CURL_LIB CURL_INCLUDE CURL_DIR PBX_CURL +CAP_LIB +CAP_INCLUDE +CAP_DIR +PBX_CAP CURSES_LIB CURSES_INCLUDE CURSES_DIR @@ -788,6 +792,10 @@ LDAP_LIB LDAP_INCLUDE LDAP_DIR PBX_LDAP +LIBEDIT_LIB +LIBEDIT_INCLUDE +LIBEDIT_DIR +PBX_LIBEDIT LTDL_LIB LTDL_INCLUDE LTDL_DIR @@ -848,6 +856,10 @@ PRI_LIB PRI_INCLUDE PRI_DIR PBX_PRI +SPANDSP_LIB +SPANDSP_INCLUDE +SPANDSP_DIR +PBX_SPANDSP SS7_LIB SS7_INCLUDE SS7_DIR @@ -963,6 +975,7 @@ OPENH323_INCDIR OPENH323_LIBDIR OPENH323_SUFFIX OPENH323_BUILD +PKGCONFIG PBX_SPEEX_PREPROCESS CONFIG_GMIME PBX_ZAPTEL_VLDTMF @@ -976,7 +989,7 @@ PBX_H323 PBX_IXJUSER CONFIG_SDL CONFIG_GTK -PKGCONFIG +LIBEDIT_OBJ CURL_CONFIG LTLIBOBJS' ac_subst_files='' @@ -1576,8 +1589,9 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-asound=PATH use Advanced Linux Sound Architecture files in PATH --with-execinfo=PATH use Stack Backtrace support files in PATH - --with-cap=PATH use POSIX 1.e capabilities files in PATH + --with-bluetooth=PATH use Bluetooth Support files in PATH --with-curl=PATH use cURL files in PATH + --with-cap=PATH use POSIX 1.e capabilities files in PATH --with-curses=PATH use curses files in PATH --with-crypto=PATH use OpenSSL Cryptography support files in PATH --with-avcodec=PATH use Ffmpeg and avcodec library files in PATH @@ -1592,6 +1606,7 @@ Optional Packages: --with-isdnnet=PATH use ISDN4Linux Library files in PATH --with-jack=PATH use Jack Audio Connection Kit files in PATH --with-ldap=PATH use OpenLDAP files in PATH + --with-libedit=PATH use NetBSD Editline library files in PATH --with-ltdl=PATH use libtool files in PATH --with-lua=PATH use Lua files in PATH --with-misdn=PATH use mISDN User Library files in PATH @@ -1607,6 +1622,7 @@ Optional Packages: --with-popt=PATH use popt files in PATH --with-portaudio=PATH use PortAudio files in PATH --with-pri=PATH use ISDN PRI files in PATH + --with-spandsp=PATH use SPANDSP files in PATH --with-ss7=PATH use ISDN SS7 files in PATH --with-pwlib=PATH use PWlib files in PATH --with-h323=PATH use OpenH323 files in PATH @@ -7942,6 +7958,62 @@ fi + BLUETOOTH_DESCRIP="Bluetooth Support" + BLUETOOTH_OPTION="bluetooth" + +# Check whether --with-bluetooth was given. +if test "${with_bluetooth+set}" = set; then + withval=$with_bluetooth; + case ${withval} in + n|no) + USE_BLUETOOTH=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + *) + BLUETOOTH_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + esac + +fi + + PBX_BLUETOOTH=0 + + + + + + + CURL_DESCRIP="cURL" + CURL_OPTION="curl" + +# Check whether --with-curl was given. +if test "${with_curl+set}" = set; then + withval=$with_curl; + case ${withval} in + n|no) + USE_CURL=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + *) + CURL_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + esac + +fi + + PBX_CURL=0 + + + + + + CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" @@ -8362,6 +8434,34 @@ fi + LIBEDIT_DESCRIP="NetBSD Editline library" + LIBEDIT_OPTION="libedit" + +# Check whether --with-libedit was given. +if test "${with_libedit+set}" = set; then + withval=$with_libedit; + case ${withval} in + n|no) + USE_LIBEDIT=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + *) + LIBEDIT_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} LIBEDIT" + ;; + esac + +fi + + PBX_LIBEDIT=0 + + + + + + LTDL_DESCRIP="libtool" LTDL_OPTION="ltdl" @@ -8782,6 +8882,34 @@ fi + SPANDSP_DESCRIP="SPANDSP" + SPANDSP_OPTION="spandsp" + +# Check whether --with-spandsp was given. +if test "${with_spandsp+set}" = set; then + withval=$with_spandsp; + case ${withval} in + n|no) + USE_SPANDSP=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + *) + SPANDSP_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + esac + +fi + + PBX_SPANDSP=0 + + + + + + SS7_DESCRIP="ISDN SS7" SS7_OPTION="ss7" @@ -12772,13 +12900,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12818,13 +12944,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18333,6 +18457,268 @@ fi +if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then + pbxlibdir="" + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + if test -d ${BLUETOOTH_DIR}/lib; then + pbxlibdir="-L${BLUETOOTH_DIR}/lib" + else + pbxlibdir="-L${BLUETOOTH_DIR}" + fi + fi + pbxfuncname="ba2str" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_BLUETOOTH_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lbluetooth" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lbluetooth... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbluetooth ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_BLUETOOTH_FOUND=yes +else + AST_BLUETOOTH_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_BLUETOOTH_FOUND}" = "yes"; then + BLUETOOTH_LIB="${pbxlibdir} -lbluetooth " + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include" + fi + BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} " + if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found + BLUETOOTH_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE} " + if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } + +fi +if test $ac_cv_header_bluetooth_bluetooth_h = yes; then + BLUETOOTH_HEADER_FOUND=1 +else + BLUETOOTH_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then + BLUETOOTH_LIB="" + BLUETOOTH_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + BLUETOOTH_LIB="" + fi + PBX_BLUETOOTH=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH_VERSION +_ACEOF + + fi + fi +fi + + + if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="" # if --with-CURSES=DIR has been specified, use it. @@ -38779,6 +39165,356 @@ fi + if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then + { echo "$as_me:$LINENO: checking if \" + #if SPANDSP_RELEASE_DATE < 20080516 + #error \"spandsp 0.0.5 or greater is required\" + #endif + \" compiles using spandsp/version.h" >&5 +echo $ECHO_N "checking if \" + #if SPANDSP_RELEASE_DATE < 20080516 + #error \"spandsp 0.0.5 or greater is required\" + #endif + \" compiles using spandsp/version.h... $ECHO_C" >&6; } + saved_cppflags="${CPPFLAGS}" + if test "x${SPANDSP_DIR}" != "x"; then + SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" + fi + CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + #if SPANDSP_RELEASE_DATE < 20080516 + #error "spandsp 0.0.5 or greater is required" + #endif + ; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PBX_SPANDSP=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SPANDSP 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SPANDSP_VERSION +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="${saved_cppflags}" + fi + + +if test "x${PBX_SPANDSP}" = "x1" ; then + # We found the correct version in the header, now let's make sure it links + # properly, and that libtiff is available + PBX_SPANDSP=0 + +if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then + pbxlibdir="" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + if test -d ${SPANDSP_DIR}/lib; then + pbxlibdir="-L${SPANDSP_DIR}/lib" + else + pbxlibdir="-L${SPANDSP_DIR}" + fi + fi + pbxfuncname="span_set_message_handler" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_SPANDSP_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_SPANDSP_FOUND=yes +else + AST_SPANDSP_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_SPANDSP_FOUND}" = "yes"; then + SPANDSP_LIB="${pbxlibdir} -lspandsp -ltiff" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" + fi + SPANDSP_INCLUDE="${SPANDSP_INCLUDE} " + if test "xspandsp.h" = "x" ; then # no header, assume found + SPANDSP_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE} " + if test "${ac_cv_header_spandsp_h+set}" = set; then + { echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5 +echo $ECHO_N "checking spandsp.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking spandsp.h presence" >&5 +echo $ECHO_N "checking spandsp.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: spandsp.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_spandsp_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } + +fi +if test $ac_cv_header_spandsp_h = yes; then + SPANDSP_HEADER_FOUND=1 +else + SPANDSP_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then + SPANDSP_LIB="" + SPANDSP_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + SPANDSP_LIB="" + fi + PBX_SPANDSP=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_SPANDSP 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_SPANDSP_VERSION +_ACEOF + + fi + fi +fi + +fi + + if test "x${PBX_SS7}" != "x1" -a "${USE_SS7}" != "no"; then pbxlibdir="" # if --with-SS7=DIR has been specified, use it. @@ -41087,271 +41823,115 @@ _ACEOF fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" - -if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then - pbxlibdir="" - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - if test -d ${LUA_DIR}/lib; then - pbxlibdir="-L${LUA_DIR}/lib" - else - pbxlibdir="-L${LUA_DIR}" - fi - fi - pbxfuncname="luaL_newstate" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes - else - as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +PBX_LUA=0 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua5.1 ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ${pbxfuncname} (); -int -main () -{ -return ${pbxfuncname} (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_Lib=yes" + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_LUA_FOUND=yes +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } else - AST_LUA_FOUND=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - fi - # now check for the header. - if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua5.1 " - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - LUA_INCLUDE="-I${LUA_DIR}/include" - fi - LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua5.1/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" - else # check for the header - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE} " - if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h usability" >&5 -echo $ECHO_N "checking lua5.1/lua.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h presence" >&5 -echo $ECHO_N "checking lua5.1/lua.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------- ## -## Report this to www.asterisk.org ## -## ------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } else - ac_cv_header_lua5_1_lua_h=$ac_header_preproc + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } -fi -if test $ac_cv_header_lua5_1_lua_h = yes; then - LUA_HEADER_FOUND=1 + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi else - LUA_HEADER_FOUND=0 + PKGCONFIG="$ac_cv_prog_PKGCONFIG" fi +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 - CPPFLAGS="${saved_cppflags}" - fi - if test "x${LUA_HEADER_FOUND}" = "x0" ; then - LUA_LIB="" - LUA_INCLUDE="" - else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" - fi - PBX_LUA=1 - # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED - -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LUA 1 _ACEOF - -cat >>confdefs.h <<_ACEOF -#define HAVE_LUA_VERSION -_ACEOF - - fi - fi fi - if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="" # if --with-RADIUS=DIR has been specified, use it. @@ -43914,18 +44494,18 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then pbxlibdir="-L${FREETDS_DIR}" fi fi - pbxfuncname="tds_version" + pbxfuncname="dbinit" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_FREETDS_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_tds_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltds" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ltds... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsybdb" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lsybdb... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ltds ${pbxlibdir} $LIBS" +LIBS="-lsybdb ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43991,29 +44571,29 @@ fi # now check for the header. if test "${AST_FREETDS_FOUND}" = "yes"; then - FREETDS_LIB="${pbxlibdir} -ltds " + FREETDS_LIB="${pbxlibdir} -lsybdb " # if --with-FREETDS=DIR has been specified, use it. if test "x${FREETDS_DIR}" != "x"; then FREETDS_INCLUDE="-I${FREETDS_DIR}/include" fi FREETDS_INCLUDE="${FREETDS_INCLUDE} " - if test "xtds.h" = "x" ; then # no header, assume found + if test "xsybdb.h" = "x" ; then # no header, assume found FREETDS_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE} " - if test "${ac_cv_header_tds_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then + if test "${ac_cv_header_sybdb_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking tds.h usability" >&5 -echo $ECHO_N "checking tds.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h usability" >&5 +echo $ECHO_N "checking sybdb.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44021,7 +44601,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -44053,15 +44633,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking tds.h presence" >&5 -echo $ECHO_N "checking tds.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sybdb.h presence" >&5 +echo $ECHO_N "checking sybdb.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -44094,25 +44674,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tds.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tds.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tds.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tds.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tds.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tds.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tds.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tds.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tds.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sybdb.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sybdb.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sybdb.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sybdb.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sybdb.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sybdb.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -44121,18 +44701,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for tds.h" >&5 -echo $ECHO_N "checking for tds.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tds_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for sybdb.h" >&5 +echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sybdb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_tds_h=$ac_header_preproc + ac_cv_header_sybdb_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tds_h" >&5 -echo "${ECHO_T}$ac_cv_header_tds_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 +echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } fi -if test $ac_cv_header_tds_h = yes; then +if test $ac_cv_header_sybdb_h = yes; then FREETDS_HEADER_FOUND=1 else FREETDS_HEADER_FOUND=0 @@ -44164,33 +44744,6 @@ _ACEOF fi fi -if test "${PBX_FREETDS}" != "0"; -then - if test "${FREETDS_DIR}x" = "x"; - then - for tds_dir in /usr /usr/local; - do - if test -f "${tds_dir}/include/tdsver.h"; - then - FREETDS_DIR="${tds_dir}" - fi - done - fi - case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in - *0.64*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64" - ;; - *0.63*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63" - ;; - *0.62*) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62" - ;; - *) - FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62" - ;; - esac -fi if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then @@ -49918,6 +50471,126 @@ fi +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBEDIT 1 +_ACEOF + + fi + fi +fi + + + + + if test "${USE_CURL}" != "no"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args. @@ -50892,14 +51565,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim BKTR_DIR!$BKTR_DIR$ac_delim PBX_BKTR!$PBX_BKTR$ac_delim -CAP_LIB!$CAP_LIB$ac_delim -CAP_INCLUDE!$CAP_INCLUDE$ac_delim -CAP_DIR!$CAP_DIR$ac_delim -PBX_CAP!$PBX_CAP$ac_delim +BLUETOOTH_LIB!$BLUETOOTH_LIB$ac_delim +BLUETOOTH_INCLUDE!$BLUETOOTH_INCLUDE$ac_delim +BLUETOOTH_DIR!$BLUETOOTH_DIR$ac_delim +PBX_BLUETOOTH!$PBX_BLUETOOTH$ac_delim CURL_LIB!$CURL_LIB$ac_delim CURL_INCLUDE!$CURL_INCLUDE$ac_delim CURL_DIR!$CURL_DIR$ac_delim PBX_CURL!$PBX_CURL$ac_delim +CAP_LIB!$CAP_LIB$ac_delim +CAP_INCLUDE!$CAP_INCLUDE$ac_delim +CAP_DIR!$CAP_DIR$ac_delim +PBX_CAP!$PBX_CAP$ac_delim CURSES_LIB!$CURSES_LIB$ac_delim CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim CURSES_DIR!$CURSES_DIR$ac_delim @@ -50952,6 +51629,10 @@ LDAP_LIB!$LDAP_LIB$ac_delim LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim LDAP_DIR!$LDAP_DIR$ac_delim PBX_LDAP!$PBX_LDAP$ac_delim +LIBEDIT_LIB!$LIBEDIT_LIB$ac_delim +LIBEDIT_INCLUDE!$LIBEDIT_INCLUDE$ac_delim +LIBEDIT_DIR!$LIBEDIT_DIR$ac_delim +PBX_LIBEDIT!$PBX_LIBEDIT$ac_delim LTDL_LIB!$LTDL_LIB$ac_delim LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim LTDL_DIR!$LTDL_DIR$ac_delim @@ -50969,14 +51650,6 @@ NBS_INCLUDE!$NBS_INCLUDE$ac_delim NBS_DIR!$NBS_DIR$ac_delim PBX_NBS!$PBX_NBS$ac_delim NCURSES_LIB!$NCURSES_LIB$ac_delim -NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim -NCURSES_DIR!$NCURSES_DIR$ac_delim -PBX_NCURSES!$PBX_NCURSES$ac_delim -NETSNMP_LIB!$NETSNMP_LIB$ac_delim -NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim -NETSNMP_DIR!$NETSNMP_DIR$ac_delim -PBX_NETSNMP!$PBX_NETSNMP$ac_delim -NEWT_LIB!$NEWT_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51018,6 +51691,14 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim +NCURSES_DIR!$NCURSES_DIR$ac_delim +PBX_NCURSES!$PBX_NCURSES$ac_delim +NETSNMP_LIB!$NETSNMP_LIB$ac_delim +NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim +NETSNMP_DIR!$NETSNMP_DIR$ac_delim +PBX_NETSNMP!$PBX_NETSNMP$ac_delim +NEWT_LIB!$NEWT_LIB$ac_delim NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim NEWT_DIR!$NEWT_DIR$ac_delim PBX_NEWT!$PBX_NEWT$ac_delim @@ -51053,6 +51734,10 @@ PRI_LIB!$PRI_LIB$ac_delim PRI_INCLUDE!$PRI_INCLUDE$ac_delim PRI_DIR!$PRI_DIR$ac_delim PBX_PRI!$PBX_PRI$ac_delim +SPANDSP_LIB!$SPANDSP_LIB$ac_delim +SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim +SPANDSP_DIR!$SPANDSP_DIR$ac_delim +PBX_SPANDSP!$PBX_SPANDSP$ac_delim SS7_LIB!$SS7_LIB$ac_delim SS7_INCLUDE!$SS7_INCLUDE$ac_delim SS7_DIR!$SS7_DIR$ac_delim @@ -51103,18 +51788,6 @@ OPENSSL_DIR!$OPENSSL_DIR$ac_delim PBX_OPENSSL!$PBX_OPENSSL$ac_delim FREETDS_LIB!$FREETDS_LIB$ac_delim FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim -FREETDS_DIR!$FREETDS_DIR$ac_delim -PBX_FREETDS!$PBX_FREETDS$ac_delim -TERMCAP_LIB!$TERMCAP_LIB$ac_delim -TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim -TERMCAP_DIR!$TERMCAP_DIR$ac_delim -PBX_TERMCAP!$PBX_TERMCAP$ac_delim -TINFO_LIB!$TINFO_LIB$ac_delim -TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim -TINFO_DIR!$TINFO_DIR$ac_delim -PBX_TINFO!$PBX_TINFO$ac_delim -TONEZONE_LIB!$TONEZONE_LIB$ac_delim -TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51156,6 +51829,18 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +FREETDS_DIR!$FREETDS_DIR$ac_delim +PBX_FREETDS!$PBX_FREETDS$ac_delim +TERMCAP_LIB!$TERMCAP_LIB$ac_delim +TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim +TERMCAP_DIR!$TERMCAP_DIR$ac_delim +PBX_TERMCAP!$PBX_TERMCAP$ac_delim +TINFO_LIB!$TINFO_LIB$ac_delim +TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim +TINFO_DIR!$TINFO_DIR$ac_delim +PBX_TINFO!$PBX_TINFO$ac_delim +TONEZONE_LIB!$TONEZONE_LIB$ac_delim +TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim TONEZONE_DIR!$TONEZONE_DIR$ac_delim PBX_TONEZONE!$PBX_TONEZONE$ac_delim USB_LIB!$USB_LIB$ac_delim @@ -51209,6 +51894,7 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim OPENH323_BUILD!$OPENH323_BUILD$ac_delim +PKGCONFIG!$PKGCONFIG$ac_delim PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim CONFIG_GMIME!$CONFIG_GMIME$ac_delim PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim @@ -51222,12 +51908,12 @@ PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim +LIBEDIT_OBJ!$LIBEDIT_OBJ$ac_delim CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 855f8ec..07deb31 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -116,6 +116,12 @@ /* Define to indicate the ${BKTR_DESCRIP} library version */ #undef HAVE_BKTR_VERSION +/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */ +#undef HAVE_BLUETOOTH + +/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */ +#undef HAVE_BLUETOOTH_VERSION + /* Define to 1 if byteswap.h macros are available. */ #undef HAVE_BYTESWAP_H @@ -385,6 +391,9 @@ /* Define to indicate the ${LDAP_DESCRIP} library version */ #undef HAVE_LDAP_VERSION +/* Define if your system has the NetBSD Editline libraries. */ +#undef HAVE_LIBEDIT + /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -442,12 +451,9 @@ /* Define to indicate the ${LTDL_DESCRIP} library version */ #undef HAVE_LTDL_VERSION -/* Define this to indicate the ${LUA_DESCRIP} library */ +/* Define if your system has the LUA libraries. */ #undef HAVE_LUA -/* Define to indicate the ${LUA_DESCRIP} library version */ -#undef HAVE_LUA_VERSION - /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -1199,6 +1205,9 @@ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif /* Define like PROTOTYPES; this can be used by system headers. */ #undef __PROTOTYPES -- 1.5.5.2 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch: Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-9/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 2 Jul 2008 16:39:50 -0000 1.1 +++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 30 Jul 2008 17:03:43 -0000 1.2 @@ -1,4 +1,4 @@ -From 4b4ea77478104bd1bfa02cc41ffd8351780e14e7 Mon Sep 17 00:00:00 2001 +From c916a79652be51092082c2c5a537a3093636aa71 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Sun, 18 Nov 2007 21:47:59 -0600 Subject: [PATCH] Modify init scripts for better Fedora compatibility. 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch: Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-9/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 2 Jul 2008 16:39:50 -0000 1.1 +++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 30 Jul 2008 17:03:43 -0000 1.2 @@ -1,4 +1,4 @@ -From 053d0eda8a0cc575e682df337d630e3aaebf7329 Mon Sep 17 00:00:00 2001 +From fe8076de7d6ce46220751ecefe0e75823031325c Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 15:52:36 -0600 Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded. Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-9/asterisk.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- asterisk.spec 30 Jul 2008 14:38:04 -0000 1.28 +++ asterisk.spec 30 Jul 2008 17:03:43 -0000 1.29 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.20.beta%{beta}%{?dist} +Release: 0.21.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -36,16 +36,16 @@ Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch -Patch3: 0003-Add-FAX-apps.patch -Patch4: 0004-Allow-alternate-extensions-to-be-specified-in-users.patch -Patch5: 0005-Pick-proper-optimization-flags-for-Fedora.patch -Patch6: 0006-Add-chan_mobile-from-asterisk-addons.patch -Patch7: 0007-Use-pkgconfig-to-check-for-Lua.patch -Patch8: 0008-Build-using-external-libedit.patch -Patch9: 0009-Update-cdr_tds-to-latest.patch -Patch10: 0010-Update-autoconf.patch -Patch11: 0011-Merged-revisions-123952-via-svnmerge-from.patch -Patch12: 0012-Merged-revisions-132778-via-svnmerge-from.patch +Patch3: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch +Patch4: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch +Patch5: 0005-Add-chan_mobile-from-asterisk-addons.patch +Patch6: 0006-Use-pkgconfig-to-check-for-Lua.patch +Patch7: 0007-Build-using-external-libedit.patch +Patch8: 0008-Update-cdr_tds-to-latest.patch +Patch9: 0009-Merged-revisions-123952-via-svnmerge-from.patch +Patch10: 0010-Merged-revisions-132778-via-svnmerge-from.patch +Patch11: 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch +Patch12: 0012-Update-autoconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -147,7 +147,7 @@ Summary: FAX applications for Asterisk Group: Applications/Internet Requires: asterisk = %{version}-%{release} -BuildRequires: spandsp-devel +BuildRequires: spandsp-devel >= 0.0.5-0.1.pre4 %description fax FAX applications for Asterisk @@ -862,8 +862,7 @@ %files fax %defattr(-,root,root,-) -%{_libdir}/asterisk/modules/app_rxfax.so -%{_libdir}/asterisk/modules/app_txfax.so +%{_libdir}/asterisk/modules/app_fax.so %files festival %defattr(-,root,root,-) @@ -1027,6 +1026,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 1.6.0-0.21.beta9 +- Replace app_rxfax/app_txfax with app_fax taken from upstream SVN. + * Tue Jul 29 2008 Jeffrey C. Ollie - 1.6.0-0.20.beta9 - Bump release and rebuild with new libpri and zaptel. --- 0003-Add-FAX-apps.patch DELETED --- --- 0004-Allow-alternate-extensions-to-be-specified-in-users.patch DELETED --- --- 0005-Pick-proper-optimization-flags-for-Fedora.patch DELETED --- --- 0006-Add-chan_mobile-from-asterisk-addons.patch DELETED --- --- 0007-Use-pkgconfig-to-check-for-Lua.patch DELETED --- --- 0008-Build-using-external-libedit.patch DELETED --- --- 0009-Update-cdr_tds-to-latest.patch DELETED --- --- 0010-Update-autoconf.patch DELETED --- --- 0011-Merged-revisions-123952-via-svnmerge-from.patch DELETED --- --- 0012-Merged-revisions-132778-via-svnmerge-from.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 17:15:01 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Wed, 30 Jul 2008 17:15:01 GMT Subject: rpms/freeradius/F-9 freeradius-radiusd-conf.patch,1.1,1.2 Message-ID: <200807301715.m6UHF1YI022173@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/freeradius/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22133 Modified Files: freeradius-radiusd-conf.patch Log Message: fix fuzz on patch file freeradius-radiusd-conf.patch: Index: freeradius-radiusd-conf.patch =================================================================== RCS file: /cvs/pkgs/rpms/freeradius/F-9/freeradius-radiusd-conf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freeradius-radiusd-conf.patch 18 Apr 2008 17:33:55 -0000 1.1 +++ freeradius-radiusd-conf.patch 30 Jul 2008 17:14:31 -0000 1.2 @@ -1,6 +1,6 @@ ---- freeradius-server-2.0.3/raddb/radiusd.conf.in.orig 2008-04-18 12:41:36.217230000 -0400 -+++ freeradius-server-2.0.3/raddb/radiusd.conf.in 2008-04-18 12:44:00.735486000 -0400 -@@ -1294,7 +1294,7 @@ +--- freeradius-server-2.0.5/raddb/radiusd.conf.in.conf 2008-05-30 05:18:43.000000000 -0400 ++++ freeradius-server-2.0.5/raddb/radiusd.conf.in 2008-07-30 12:44:54.000000000 -0400 +@@ -627,7 +627,7 @@ # Include another file that has the SQL-related configuration. # This is another file only because it tends to be big. # @@ -9,7 +9,7 @@ # For Cisco VoIP specific accounting with Postgresql, -@@ -1488,7 +1488,7 @@ +@@ -648,7 +648,7 @@ # totally dependent on the SQL module to process Accounting # packets. # @@ -17,4 +17,4 @@ + #$INCLUDE sql/mysql/counter.conf #$INCLUDE sql/postgresql/counter.conf - # + # $INCLUDE sqlippool.conf From fedora-extras-commits at redhat.com Wed Jul 30 17:25:59 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 17:25:59 GMT Subject: rpms/ruby-mechanize/F-9 .cvsignore, 1.7, 1.8 ruby-mechanize.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200807301725.m6UHPxBW022857@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-mechanize/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22749/F-9 Modified Files: .cvsignore ruby-mechanize.spec sources Log Message: * Thu Jul 31 2008 Mamoru Tasaka - 0.7.7-1 - 0.7.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2008 15:40:15 -0000 1.7 +++ .cvsignore 30 Jul 2008 17:25:29 -0000 1.8 @@ -1 +1 @@ -mechanize-0.7.6.tgz +mechanize-0.7.7.tgz Index: ruby-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-9/ruby-mechanize.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ruby-mechanize.spec 21 May 2008 15:40:15 -0000 1.6 +++ ruby-mechanize.spec 30 Jul 2008 17:25:29 -0000 1.7 @@ -1,12 +1,12 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 36893 +%define repoid 40333 %define modname mechanize Name: ruby-%{modname} -Version: 0.7.6 +Version: 0.7.7 Release: 1%{?dist} Summary: A handy web browsing ruby object Group: Development/Languages @@ -49,9 +49,21 @@ pushd test sed -i.gem -e '/rubygem/d' helper.rb -ruby test_all.rb || : + +SUCCEEDED=0 +FAILED=0 +for tests in test_*.rb + do + ruby $tests && SUCCEEDED=$((SUCCEEDED+1)) || FAILED=$((FAILED+1)) +done popd +echo "$SUCCEEDED tests succeeded" +echo "$FAILED tests failed" + +# And exit anyway +exit 0 + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -70,6 +82,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Jul 31 2008 Mamoru Tasaka - 0.7.7-1 +- 0.7.7 + * Thu May 22 2008 Mamoru Tasaka - 0.7.6-1 - 0.7.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2008 15:40:15 -0000 1.7 +++ sources 30 Jul 2008 17:25:29 -0000 1.8 @@ -1 +1 @@ -79ad78984ebde9a205d4a1dd7d73c0f2 mechanize-0.7.6.tgz +bae9dcca35739db2b4fb7bb219ff0be9 mechanize-0.7.7.tgz From fedora-extras-commits at redhat.com Wed Jul 30 17:25:58 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 17:25:58 GMT Subject: rpms/ruby-mechanize/F-8 .cvsignore, 1.7, 1.8 ruby-mechanize.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200807301725.m6UHPw61022851@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-mechanize/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22749/F-8 Modified Files: .cvsignore ruby-mechanize.spec sources Log Message: * Thu Jul 31 2008 Mamoru Tasaka - 0.7.7-1 - 0.7.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2008 15:39:55 -0000 1.7 +++ .cvsignore 30 Jul 2008 17:25:28 -0000 1.8 @@ -1 +1 @@ -mechanize-0.7.6.tgz +mechanize-0.7.7.tgz Index: ruby-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/ruby-mechanize.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ruby-mechanize.spec 21 May 2008 15:39:55 -0000 1.6 +++ ruby-mechanize.spec 30 Jul 2008 17:25:28 -0000 1.7 @@ -1,12 +1,12 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 36893 +%define repoid 40333 %define modname mechanize Name: ruby-%{modname} -Version: 0.7.6 +Version: 0.7.7 Release: 1%{?dist} Summary: A handy web browsing ruby object Group: Development/Languages @@ -49,9 +49,21 @@ pushd test sed -i.gem -e '/rubygem/d' helper.rb -ruby test_all.rb || : + +SUCCEEDED=0 +FAILED=0 +for tests in test_*.rb + do + ruby $tests && SUCCEEDED=$((SUCCEEDED+1)) || FAILED=$((FAILED+1)) +done popd +echo "$SUCCEEDED tests succeeded" +echo "$FAILED tests failed" + +# And exit anyway +exit 0 + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -70,6 +82,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Jul 31 2008 Mamoru Tasaka - 0.7.7-1 +- 0.7.7 + * Thu May 22 2008 Mamoru Tasaka - 0.7.6-1 - 0.7.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2008 15:39:55 -0000 1.7 +++ sources 30 Jul 2008 17:25:28 -0000 1.8 @@ -1 +1 @@ -79ad78984ebde9a205d4a1dd7d73c0f2 mechanize-0.7.6.tgz +bae9dcca35739db2b4fb7bb219ff0be9 mechanize-0.7.7.tgz From fedora-extras-commits at redhat.com Wed Jul 30 17:25:59 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 30 Jul 2008 17:25:59 GMT Subject: rpms/ruby-mechanize/devel .cvsignore, 1.7, 1.8 ruby-mechanize.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200807301725.m6UHPxmF022863@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22749/devel Modified Files: .cvsignore ruby-mechanize.spec sources Log Message: * Thu Jul 31 2008 Mamoru Tasaka - 0.7.7-1 - 0.7.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2008 15:40:30 -0000 1.7 +++ .cvsignore 30 Jul 2008 17:25:29 -0000 1.8 @@ -1 +1 @@ -mechanize-0.7.6.tgz +mechanize-0.7.7.tgz Index: ruby-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/devel/ruby-mechanize.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ruby-mechanize.spec 21 May 2008 15:40:30 -0000 1.6 +++ ruby-mechanize.spec 30 Jul 2008 17:25:29 -0000 1.7 @@ -1,12 +1,12 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 36893 +%define repoid 40333 %define modname mechanize Name: ruby-%{modname} -Version: 0.7.6 +Version: 0.7.7 Release: 1%{?dist} Summary: A handy web browsing ruby object Group: Development/Languages @@ -49,9 +49,21 @@ pushd test sed -i.gem -e '/rubygem/d' helper.rb -ruby test_all.rb || : + +SUCCEEDED=0 +FAILED=0 +for tests in test_*.rb + do + ruby $tests && SUCCEEDED=$((SUCCEEDED+1)) || FAILED=$((FAILED+1)) +done popd +echo "$SUCCEEDED tests succeeded" +echo "$FAILED tests failed" + +# And exit anyway +exit 0 + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -70,6 +82,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Jul 31 2008 Mamoru Tasaka - 0.7.7-1 +- 0.7.7 + * Thu May 22 2008 Mamoru Tasaka - 0.7.6-1 - 0.7.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2008 15:40:30 -0000 1.7 +++ sources 30 Jul 2008 17:25:29 -0000 1.8 @@ -1 +1 @@ -79ad78984ebde9a205d4a1dd7d73c0f2 mechanize-0.7.6.tgz +bae9dcca35739db2b4fb7bb219ff0be9 mechanize-0.7.7.tgz From fedora-extras-commits at redhat.com Wed Jul 30 17:32:01 2008 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Wed, 30 Jul 2008 17:32:01 GMT Subject: rpms/mugshot/F-9 .cvsignore, 1.23, 1.24 mugshot.spec, 1.40, 1.41 sources, 1.25, 1.26 Message-ID: <200807301732.m6UHW1Ah023283@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/mugshot/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23231 Modified Files: .cvsignore mugshot.spec sources Log Message: - Update to 1.2.2 - Fixes Firefox min version to 3.0.x, #451918 again - Rebuild against hippo-canvas-0.3, #456665 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mugshot/F-9/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 18 Jun 2008 15:18:41 -0000 1.23 +++ .cvsignore 30 Jul 2008 17:31:31 -0000 1.24 @@ -2,3 +2,4 @@ mugshot-1.1.95.tar.gz mugshot-1.2.0.tar.gz mugshot-1.2.1.tar.gz +mugshot-1.2.2.tar.gz Index: mugshot.spec =================================================================== RCS file: /cvs/extras/rpms/mugshot/F-9/mugshot.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- mugshot.spec 18 Jun 2008 15:18:41 -0000 1.40 +++ mugshot.spec 30 Jul 2008 17:31:31 -0000 1.41 @@ -2,7 +2,7 @@ %define mugshot_ext_id firefox at mugshot.org Name: mugshot -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: Companion software for mugshot.org @@ -168,6 +168,11 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Jul 30 2008 Owen Taylor - 1.2.2-1 +- Update to 1.2.2 + - Fixes Firefox min version to 3.0.x, #451918 again + - Rebuild against hippo-canvas-0.3 + * Wed Jun 18 2008 Owen Taylor - 1.2.1-1 - Update to 1.2.1 (Fixes Firefox min version #451918) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mugshot/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 18 Jun 2008 15:18:41 -0000 1.25 +++ sources 30 Jul 2008 17:31:31 -0000 1.26 @@ -1 +1 @@ -d16d783bc2653ea72782496642b1623a mugshot-1.2.1.tar.gz +076259a641f9d18332053b78771a6776 mugshot-1.2.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 17:35:56 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 30 Jul 2008 17:35:56 GMT Subject: rpms/clive/devel .cvsignore, 1.5, 1.6 clive.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807301735.m6UHZuXB023574@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23524 Modified Files: .cvsignore clive.spec sources Log Message: update to 0.4.20 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jul 2008 18:38:41 -0000 1.5 +++ .cvsignore 30 Jul 2008 17:35:26 -0000 1.6 @@ -1 +1 @@ -clive-0.4.19.tar.bz2 +clive-0.4.20.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- clive.spec 23 Jul 2008 18:38:41 -0000 1.4 +++ clive.spec 30 Jul 2008 17:35:26 -0000 1.5 @@ -1,13 +1,13 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 19 +%define minor_version 20 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} Summary: Video extraction tool for user-uploaded video hosts Group: Applications/Multimedia -License: GPLv2+ +License: GPLv3+ URL: http://home.gna.org/%{name}/ Source0: http://download.gna.org/%{name}/%{major_version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,6 +58,9 @@ %changelog +* Wed Jul 30 2008 Nicoleau Fabien 0.4.20-1 +- rebuild for 0.4.20 +- licence is now GPLv3+ * Wed Jul 23 2008 Nicoleau Fabien 0.4.19-1 - rebuild for 0.4.19 * Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jul 2008 18:38:41 -0000 1.5 +++ sources 30 Jul 2008 17:35:26 -0000 1.6 @@ -1 +1 @@ -b7cce85b06179a4d92e2aa90af46468a clive-0.4.19.tar.bz2 +ffa5256d29f807ef8a54053e27ffac34 clive-0.4.20.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 17:42:48 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Jul 2008 17:42:48 GMT Subject: common Makefile.common,1.108,1.109 Message-ID: <200807301742.m6UHgmJH024039@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23931 Modified Files: Makefile.common Log Message: use rpm less, thanks ajax Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- Makefile.common 29 Jul 2008 15:41:52 -0000 1.108 +++ Makefile.common 30 Jul 2008 17:42:18 -0000 1.109 @@ -82,7 +82,7 @@ endif ifndef RPM_DEFINES -RPM_DEFINES = --define "_sourcedir $(SOURCEDIR)" \ +RPM_DEFINES := --define "_sourcedir $(SOURCEDIR)" \ --define "_specdir $(SPECDIR)" \ --define "_builddir $(BUILDDIR)" \ --define "_srcrpmdir $(SRCRPMDIR)" \ @@ -92,16 +92,20 @@ # Initialize the variables that we need, but are not defined # the version of the package + +VER_REL := $(shell rpm $(RPM_DEFINES) -q --qf "%{VERSION} %{RELEASE}\n" --specfile $(SPECFILE)| head -1) + ifndef NAME $(error "You can not run this Makefile without having NAME defined") endif ifndef VERSION -VERSION := $(shell rpm $(RPM_DEFINES) -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1) +VERSION := $(word 1, $(VER_REL)) endif # the release of the package ifndef RELEASE -RELEASE := $(shell rpm $(RPM_DEFINES) -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1) +RELEASE := $(word 2, $(VER_REL)) endif + # this is used in make patch, maybe make clean eventually. # would be nicer to autodetermine from the spec file... RPM_BUILD_DIR ?= $(BUILDDIR)/$(NAME)-$(VERSION) From fedora-extras-commits at redhat.com Wed Jul 30 17:42:41 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 30 Jul 2008 17:42:41 GMT Subject: rpms/clive/F-8 .cvsignore, 1.5, 1.6 clive.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807301742.m6UHgfFq024024@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23937 Modified Files: .cvsignore clive.spec sources Log Message: update to 0.4.20 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jul 2008 18:48:08 -0000 1.5 +++ .cvsignore 30 Jul 2008 17:42:11 -0000 1.6 @@ -1 +1 @@ -clive-0.4.19.tar.bz2 +clive-0.4.20.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/clive.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- clive.spec 23 Jul 2008 18:48:08 -0000 1.4 +++ clive.spec 30 Jul 2008 17:42:11 -0000 1.5 @@ -1,13 +1,13 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 19 +%define minor_version 20 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} Summary: Video extraction tool for user-uploaded video hosts Group: Applications/Multimedia -License: GPLv2+ +License: GPLv3+ URL: http://home.gna.org/%{name}/ Source0: http://download.gna.org/%{name}/%{major_version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,6 +58,9 @@ %changelog +* Wed Jul 30 2008 Nicoleau Fabien 0.4.20-1 +- rebuild for 0.4.20 +- licence is now GPLv3+ * Wed Jul 23 2008 Nicoleau Fabien 0.4.19-1 - rebuild for 0.4.19 * Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jul 2008 18:48:08 -0000 1.5 +++ sources 30 Jul 2008 17:42:11 -0000 1.6 @@ -1 +1 @@ -b7cce85b06179a4d92e2aa90af46468a clive-0.4.19.tar.bz2 +ffa5256d29f807ef8a54053e27ffac34 clive-0.4.20.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 17:46:18 2008 From: fedora-extras-commits at redhat.com (Nicoleau Fabien (eponyme)) Date: Wed, 30 Jul 2008 17:46:18 GMT Subject: rpms/clive/F-9 .cvsignore, 1.5, 1.6 clive.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200807301746.m6UHkI31024415@cvs-int.fedora.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/clive/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24288 Modified Files: .cvsignore clive.spec sources Log Message: update to 0.4.20 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jul 2008 18:51:58 -0000 1.5 +++ .cvsignore 30 Jul 2008 17:45:48 -0000 1.6 @@ -1 +1 @@ -clive-0.4.19.tar.bz2 +clive-0.4.20.tar.bz2 Index: clive.spec =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/clive.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- clive.spec 23 Jul 2008 18:51:58 -0000 1.4 +++ clive.spec 30 Jul 2008 17:45:48 -0000 1.5 @@ -1,13 +1,13 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define major_version 0.4 -%define minor_version 19 +%define minor_version 20 Name: clive Version: %{major_version}.%{minor_version} Release: 1%{?dist} Summary: Video extraction tool for user-uploaded video hosts Group: Applications/Multimedia -License: GPLv2+ +License: GPLv3+ URL: http://home.gna.org/%{name}/ Source0: http://download.gna.org/%{name}/%{major_version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,6 +58,9 @@ %changelog +* Wed Jul 30 2008 Nicoleau Fabien 0.4.20-1 +- rebuild for 0.4.20 +- licence is now GPLv3+ * Wed Jul 23 2008 Nicoleau Fabien 0.4.19-1 - rebuild for 0.4.19 * Wed Jul 16 2008 Nicoleau Fabien 0.4.18-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clive/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jul 2008 18:51:58 -0000 1.5 +++ sources 30 Jul 2008 17:45:48 -0000 1.6 @@ -1 +1 @@ -b7cce85b06179a4d92e2aa90af46468a clive-0.4.19.tar.bz2 +ffa5256d29f807ef8a54053e27ffac34 clive-0.4.20.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 17:59:12 2008 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Wed, 30 Jul 2008 17:59:12 GMT Subject: rpms/mugshot/devel mugshot.spec,1.39,1.40 sources,1.24,1.25 Message-ID: <200807301759.m6UHxCe8025290@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/mugshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25213 Modified Files: mugshot.spec sources Log Message: - Update to 1.2.2 - Fixes Firefox min version to 3.0.x, #451918 again - Rebuild against hippo-canvas-0.3 Index: mugshot.spec =================================================================== RCS file: /cvs/extras/rpms/mugshot/devel/mugshot.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mugshot.spec 20 Jun 2008 15:50:58 -0000 1.39 +++ mugshot.spec 30 Jul 2008 17:58:42 -0000 1.40 @@ -2,7 +2,7 @@ %define mugshot_ext_id firefox at mugshot.org Name: mugshot -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: Companion software for mugshot.org @@ -168,6 +168,11 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Jul 30 2008 Owen Taylor - 1.2.2-1 +- Update to 1.2.2 + - Fixes Firefox min version to 3.0.x, #451918 again + - Rebuild against hippo-canvas-0.3 + * Wed Jun 18 2008 Owen Taylor - 1.2.1-1 - Update to 1.2.1 (Fixes Firefox min version #451918) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mugshot/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 20 Jun 2008 15:50:58 -0000 1.24 +++ sources 30 Jul 2008 17:58:42 -0000 1.25 @@ -1 +1 @@ -d16d783bc2653ea72782496642b1623a mugshot-1.2.1.tar.gz +076259a641f9d18332053b78771a6776 mugshot-1.2.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 18:20:58 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 18:20:58 GMT Subject: rpms/pyroom/devel import.log, NONE, 1.1 pyroom, NONE, 1.1 pyroom.desktop, NONE, 1.1 pyroom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807301820.m6UIKwDl000445@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/pyroom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv401/devel Modified Files: .cvsignore sources Added Files: import.log pyroom pyroom.desktop pyroom.spec Log Message: initial import --- NEW FILE import.log --- pyroom-0_2_1-3_fc9:HEAD:pyroom-0.2.1-3.fc9.src.rpm:1217441931 --- NEW FILE pyroom --- #!/bin/sh python /usr/share/pyroom/pyroom.py "$@" --- NEW FILE pyroom.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Pyroom Text Editor Comment=full screen text editor Exec=pyroom %U Terminal=false Type=Application StartupNotify=true MimeType=text/plain; Icon=accessories-text-editor Categories=GNOME;GTK;Utility;TextEditor; --- NEW FILE pyroom.spec --- Name: pyroom Version: 0.2.1 Release: 3%{?dist} Summary: PyRoom is a full screen text editor and a clone of Writeroom Group: Applications/Editors License: GPLv3+ URL: http://pyroom.org/ Source0: http://edge.launchpad.net/pyroom/0.2/0.2.1/+download/pyroom-0.2.1.tar.gz Source1: pyroom Source2: pyroom.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python Requires: pygtk2 Requires: gnome-python2-gtksourceview Requires(post): desktop-file-utils Requires(postun): desktop-file-utils BuildRequires: gettext BuildRequires: desktop-file-utils %description PyRoom is full-screen text editor, without buttons, menu, formatting, so you can focus on writing, and only writing. It is written in Python + GTK. It is also a clone of Writeroom. %prep %setup -q cp %{SOURCE1} . %build %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} %{buildroot}/%{_bindir}/ install -p pyroom %{buildroot}/%{_bindir} %{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/ install -pm 644 *.py %{buildroot}/%{_datadir}/%{name}/ %{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/themes/ install -pm 644 themes/*.theme %{buildroot}/%{_datadir}/%{name}/themes/ install -pm 644 interface.glade %{buildroot}/%{_datadir}/%{name}/ %{__mkdir_p} %{buildroot}/%{_datadir}/applications/ install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/ chmod 755 %{buildroot}/%{_datadir}/pyroom/pyroom.py chmod 755 %{buildroot}/%{_datadir}/pyroom/status_label.py for lang in ar ca cy da es fi fr_FR it pt pt_BR do dir=locale/$lang/LC_MESSAGES/ %{__mkdir_p} $RPM_BUILD_ROOT%_datadir/$dir install -pm 644 $dir/%name.mo $RPM_BUILD_ROOT%_datadir/$dir done desktop-file-install --vendor="" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/pyroom.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS LICENSE README %{_bindir}/pyroom %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %changelog * Tue Jul 22 2008 Rahul Sundaram - 0.2.1-3 - add desktop file. fix permissions and source url * Fri May 30 2008 Rahul Sundaram - 0.2.1-2 - review changes * Thu May 29 2008 Rahul Sundaram - 0.2.1-1 - initial review Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyroom/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2008 16:38:29 -0000 1.1 +++ .cvsignore 30 Jul 2008 18:20:28 -0000 1.2 @@ -0,0 +1 @@ +pyroom-0.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyroom/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2008 16:38:29 -0000 1.1 +++ sources 30 Jul 2008 18:20:28 -0000 1.2 @@ -0,0 +1 @@ +c8d9ff35153554f5388a4f24a0ed0dad pyroom-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 18:30:23 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 18:30:23 GMT Subject: rpms/pyroom/F-9 pyroom.desktop, NONE, 1.1 pyroom.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807301830.m6UIUNPJ000958@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/pyroom/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv908 Modified Files: sources Added Files: pyroom.desktop pyroom.spec Log Message: initial commit --- NEW FILE pyroom.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Pyroom Text Editor Comment=full screen text editor Exec=pyroom %U Terminal=false Type=Application StartupNotify=true MimeType=text/plain; Icon=accessories-text-editor Categories=GNOME;GTK;Utility;TextEditor; --- NEW FILE pyroom.spec --- Name: pyroom Version: 0.2.1 Release: 3%{?dist} Summary: PyRoom is a full screen text editor and a clone of Writeroom Group: Applications/Editors License: GPLv3+ URL: http://pyroom.org/ Source0: http://edge.launchpad.net/pyroom/0.2/0.2.1/+download/pyroom-0.2.1.tar.gz Source1: pyroom Source2: pyroom.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python Requires: pygtk2 Requires: gnome-python2-gtksourceview Requires(post): desktop-file-utils Requires(postun): desktop-file-utils BuildRequires: gettext BuildRequires: desktop-file-utils %description PyRoom is full-screen text editor, without buttons, menu, formatting, so you can focus on writing, and only writing. It is written in Python + GTK. It is also a clone of Writeroom. %prep %setup -q cp %{SOURCE1} . %build %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} %{buildroot}/%{_bindir}/ install -p pyroom %{buildroot}/%{_bindir} %{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/ install -pm 644 *.py %{buildroot}/%{_datadir}/%{name}/ %{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/themes/ install -pm 644 themes/*.theme %{buildroot}/%{_datadir}/%{name}/themes/ install -pm 644 interface.glade %{buildroot}/%{_datadir}/%{name}/ %{__mkdir_p} %{buildroot}/%{_datadir}/applications/ install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/ chmod 755 %{buildroot}/%{_datadir}/pyroom/pyroom.py chmod 755 %{buildroot}/%{_datadir}/pyroom/status_label.py for lang in ar ca cy da es fi fr_FR it pt pt_BR do dir=locale/$lang/LC_MESSAGES/ %{__mkdir_p} $RPM_BUILD_ROOT%_datadir/$dir install -pm 644 $dir/%name.mo $RPM_BUILD_ROOT%_datadir/$dir done desktop-file-install --vendor="" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/pyroom.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS LICENSE README %{_bindir}/pyroom %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %changelog * Tue Jul 22 2008 Rahul Sundaram - 0.2.1-3 - add desktop file. fix permissions and source url * Fri May 30 2008 Rahul Sundaram - 0.2.1-2 - review changes * Thu May 29 2008 Rahul Sundaram - 0.2.1-1 - initial review Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyroom/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2008 16:38:29 -0000 1.1 +++ sources 30 Jul 2008 18:29:52 -0000 1.2 @@ -0,0 +1 @@ +c8d9ff35153554f5388a4f24a0ed0dad pyroom-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 18:35:26 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 18:35:26 GMT Subject: rpms/akonadi/devel akonadi.spec,1.10,1.11 Message-ID: <200807301835.m6UIZQp7001288@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1242 Modified Files: akonadi.spec Log Message: * Wed Jul 30 2008 Rex Dieter 1.0.0-3 - Requires: mysql-server Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- akonadi.spec 30 Jul 2008 16:56:33 -0000 1.10 +++ akonadi.spec 30 Jul 2008 18:34:56 -0000 1.11 @@ -1,7 +1,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -18,7 +18,9 @@ BuildRequires: libxslt BuildRequires: shared-mime-info -Requires: qt4-mysql +# when/if akonadi grows support for other backends, consider splitting +# these similar to how phonon is done currently. +Requires: qt4-mysql mysql-server Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -84,6 +86,9 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 30 2008 Rex Dieter 1.0.0-3 +- Requires: mysql-server + * Wed Jul 30 2008 Rex Dieter 1.0.0-2 - BR: mysql-server - Requires: qt-mysql From fedora-extras-commits at redhat.com Wed Jul 30 18:39:53 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 18:39:53 GMT Subject: rpms/pyroom/F-9 pyroom,NONE,1.1 Message-ID: <200807301839.m6UIdrM7001507@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/pyroom/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497 Added Files: pyroom Log Message: add shell script --- NEW FILE pyroom --- #!/bin/sh python /usr/share/pyroom/pyroom.py "$@" From fedora-extras-commits at redhat.com Wed Jul 30 18:41:51 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 18:41:51 GMT Subject: rpms/callweaver/F-9 .cvsignore, 1.4, 1.5 callweaver.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200807301841.m6UIfpte001698@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/callweaver/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1634 Modified Files: .cvsignore callweaver.spec sources Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1.1 - Package manpage again. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/callweaver/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Dec 2007 13:33:53 -0000 1.4 +++ .cvsignore 30 Jul 2008 18:41:21 -0000 1.5 @@ -1 +1 @@ -callweaver-RC-1.1.99.20071230.tar.gz +callweaver-1.2.0.1.tar.bz2 Index: callweaver.spec =================================================================== RCS file: /cvs/pkgs/rpms/callweaver/F-9/callweaver.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- callweaver.spec 19 Feb 2008 01:57:46 -0000 1.12 +++ callweaver.spec 30 Jul 2008 18:41:21 -0000 1.13 @@ -1,4 +1,4 @@ -%define snap 20071230 +#define snap 20071230 %bcond_without misdn %bcond_without zaptel @@ -6,17 +6,22 @@ %bcond_without fedora Name: callweaver -Version: 1.2 -Release: 0.5.rc5.%{snap}%{?dist} +Version: 1.2.0.1 +Release: 1.1%{?snap:.%{snap}}%{?dist} Summary: The Truly Open Source PBX Group: Applications/Internet License: GPLv2 URL: http://www.callweaver.org/ -Source0: http://devs.callweaver.org/1.2_snapshots/callweaver-RC-1.1.99.%{snap}.tar.gz + +Source0: http://devs.callweaver.org/release/callweaver-%{version}.tar.bz2 + +# Patch from upstream SVN for compatibility with spandsp 0.0.5pre4 +Patch1: 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: spandsp-devel >= 0.0.4-0.1.pre4 +BuildRequires: spandsp-devel >= 0.0.5-0.1.pre4 BuildRequires: %{?snap:libtool automake autoconf} zlib-devel BuildRequires: fedora-usermgmt-devel bluez-libs-devel openldap-devel BuildRequires: libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel @@ -170,7 +175,8 @@ %prep -%setup -q -n callweaver-RC-1.1.99.%{snap} +%setup0 -q +%patch1 -p1 %build %if 0%{?snap} @@ -371,6 +377,12 @@ %{_sbindir}/eogi* %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1.1 +- Package manpage again. + +* Wed Jul 30 2008 Jeffrey C. Ollie - 1.2.0.1-1 +- Update to release 1.2.0.1 + * Mon Feb 18 2008 Fedora Release Engineering - 1.2-0.5.rc5.20071230 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/callweaver/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Dec 2007 13:33:53 -0000 1.4 +++ sources 30 Jul 2008 18:41:21 -0000 1.5 @@ -1 +1 @@ -fd253b6866ce59c95717d1c16a36a459 callweaver-RC-1.1.99.20071230.tar.gz +624b2f0d81f91c235adf587061b634b6 callweaver-1.2.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 18:44:59 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 30 Jul 2008 18:44:59 GMT Subject: rpms/callweaver/F-9 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch, NONE, 1.1 Message-ID: <200807301844.m6UIixl0001889@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/callweaver/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1881 Added Files: 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch Log Message: Darnit need to remember to add patches. 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch: --- NEW FILE 0001-Hopefully-the-final-bunch-of-API-changes-for-the-for.patch --- >From 50932e8b857e73f8906003ac95d7036c715ff736 Mon Sep 17 00:00:00 2001 From: coppice Date: Mon, 16 Jun 2008 15:04:32 +0000 Subject: [PATCH] Hopefully the final bunch of API changes for the foreseeable future went into spandsp-0.0.5pre4, and this allows for the one API change that hits Callweaver git-svn-id: http://svn.callweaver.org/callweaver/branches/rel/1.2 at 4933 e56c2a57-502e-0410-a6e2-86b2f1ef08c6 --- configure.ac | 6 +++--- corelib/dsp.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index cb23839..372c1e8 100755 --- a/configure.ac +++ b/configure.ac @@ -783,15 +783,15 @@ AC_ARG_WITH([spandsp-libs], [AC_HELP_STRING([--with-spandsp-libs],[Location of SpanDSP library files.])], [LDFLAGS="$LDFLAGS -L${withval}"]) -AC_CHECK_HEADERS([spandsp.h],[HAVE_SPANDSP_H=1],[AC_MSG_ERROR(SpanDSP version 0.0.5pre3 or newer is required to compile CallWeaver.)]) +AC_CHECK_HEADERS([spandsp.h],[HAVE_SPANDSP_H=1],[AC_MSG_ERROR(SpanDSP version 0.0.5pre4 or newer is required to compile CallWeaver.)]) -AC_CHECK_HEADERS([spandsp/version.h],[HAVE_SPANDSP_VERSION_H=1],[AC_MSG_ERROR(SpanDSP does not appear to be new enough. You must have version 0.0.5pre3 or newer to compile CallWeaver.)], +AC_CHECK_HEADERS([spandsp/version.h],[HAVE_SPANDSP_VERSION_H=1],[AC_MSG_ERROR(SpanDSP does not appear to be new enough. You must have version 0.0.5pre4 or newer to compile CallWeaver.)], [#ifdef HAVE_SPANDSP_H #include #endif #include -#if SPANDSP_RELEASE_DATE < 20080508 +#if SPANDSP_RELEASE_DATE < 20080616 #error #endif diff --git a/corelib/dsp.c b/corelib/dsp.c index 4782cce..66de4f1 100644 --- a/corelib/dsp.c +++ b/corelib/dsp.c @@ -898,9 +898,9 @@ int cw_dsp_digitmode(struct cw_dsp *dsp, int digitmode) NULL); } if ((digitmode & DSP_DIGITMODE_RELAXDTMF)) - dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 8); + dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 8, -99); else - dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 4); + dtmf_rx_parms(&dsp->dtmf_rx, FALSE, 8, 4, -99); dsp->digitmode = digitmode; return 0; } -- 1.5.5.2 From fedora-extras-commits at redhat.com Wed Jul 30 18:48:28 2008 From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram)) Date: Wed, 30 Jul 2008 18:48:28 GMT Subject: rpms/pyroom/F-8 pyroom, NONE, 1.1 pyroom.desktop, NONE, 1.1 pyroom.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807301848.m6UImSTf002197@cvs-int.fedora.redhat.com> Author: sundaram Update of /cvs/pkgs/rpms/pyroom/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2138 Modified Files: sources Added Files: pyroom pyroom.desktop pyroom.spec Log Message: initial commit --- NEW FILE pyroom --- #!/bin/sh python /usr/share/pyroom/pyroom.py "$@" --- NEW FILE pyroom.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Pyroom Text Editor Comment=full screen text editor Exec=pyroom %U Terminal=false Type=Application StartupNotify=true MimeType=text/plain; Icon=accessories-text-editor Categories=GNOME;GTK;Utility;TextEditor; --- NEW FILE pyroom.spec --- Name: pyroom Version: 0.2.1 Release: 3%{?dist} Summary: PyRoom is a full screen text editor and a clone of Writeroom Group: Applications/Editors License: GPLv3+ URL: http://pyroom.org/ Source0: http://edge.launchpad.net/pyroom/0.2/0.2.1/+download/pyroom-0.2.1.tar.gz Source1: pyroom Source2: pyroom.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python Requires: pygtk2 Requires: gnome-python2-gtksourceview Requires(post): desktop-file-utils Requires(postun): desktop-file-utils BuildRequires: gettext BuildRequires: desktop-file-utils %description PyRoom is full-screen text editor, without buttons, menu, formatting, so you can focus on writing, and only writing. It is written in Python + GTK. It is also a clone of Writeroom. %prep %setup -q cp %{SOURCE1} . %build %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} %{buildroot}/%{_bindir}/ install -p pyroom %{buildroot}/%{_bindir} %{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/ install -pm 644 *.py %{buildroot}/%{_datadir}/%{name}/ %{__mkdir_p} %{buildroot}/%{_datadir}/%{name}/themes/ install -pm 644 themes/*.theme %{buildroot}/%{_datadir}/%{name}/themes/ install -pm 644 interface.glade %{buildroot}/%{_datadir}/%{name}/ %{__mkdir_p} %{buildroot}/%{_datadir}/applications/ install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/ chmod 755 %{buildroot}/%{_datadir}/pyroom/pyroom.py chmod 755 %{buildroot}/%{_datadir}/pyroom/status_label.py for lang in ar ca cy da es fi fr_FR it pt pt_BR do dir=locale/$lang/LC_MESSAGES/ %{__mkdir_p} $RPM_BUILD_ROOT%_datadir/$dir install -pm 644 $dir/%name.mo $RPM_BUILD_ROOT%_datadir/$dir done desktop-file-install --vendor="" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/pyroom.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS LICENSE README %{_bindir}/pyroom %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %changelog * Tue Jul 22 2008 Rahul Sundaram - 0.2.1-3 - add desktop file. fix permissions and source url * Fri May 30 2008 Rahul Sundaram - 0.2.1-2 - review changes * Thu May 29 2008 Rahul Sundaram - 0.2.1-1 - initial review Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyroom/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2008 16:38:29 -0000 1.1 +++ sources 30 Jul 2008 18:47:57 -0000 1.2 @@ -0,0 +1 @@ +c8d9ff35153554f5388a4f24a0ed0dad pyroom-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 18:52:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 30 Jul 2008 18:52:26 GMT Subject: rpms/ipsec-tools/devel ipsec-tools-0.7.1-loopback.patch, 1.1, 1.2 ipsec-tools.spec, 1.56, 1.57 ipsec-tools-0.7-contextsize.patch, 1.1, NONE Message-ID: <200807301852.m6UIqQa0002530@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/ipsec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2480 Modified Files: ipsec-tools-0.7.1-loopback.patch ipsec-tools.spec Removed Files: ipsec-tools-0.7-contextsize.patch Log Message: * Wed Jul 30 2008 Tomas Mraz - 0.7.1-2 - Different approach to allow racoon to add loopback SAs for labeled IPSec (without ISAKMP) ipsec-tools-0.7.1-loopback.patch: Index: ipsec-tools-0.7.1-loopback.patch =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools-0.7.1-loopback.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ipsec-tools-0.7.1-loopback.patch 29 Jul 2008 12:31:24 -0000 1.1 +++ ipsec-tools-0.7.1-loopback.patch 30 Jul 2008 18:51:56 -0000 1.2 @@ -1,521 +1,357 @@ diff -up ipsec-tools-0.7.1/configure.ac.loopback ipsec-tools-0.7.1/configure.ac --- ipsec-tools-0.7.1/configure.ac.loopback 2008-07-22 15:53:46.000000000 +0200 -+++ ipsec-tools-0.7.1/configure.ac 2008-07-29 09:57:26.000000000 +0200 -@@ -794,6 +794,16 @@ if test "$enable_security_context" = "ye ++++ ipsec-tools-0.7.1/configure.ac 2008-07-30 20:00:21.000000000 +0200 +@@ -794,6 +794,27 @@ if test "$enable_security_context" = "ye fi fi -+# Option --enable-racoon-over-loopback -+AC_MSG_CHECKING(if --enable-racoon-over-loopback option is specified) -+AC_ARG_ENABLE(racoon-over-loopback, -+ [ --enable-racoon-over-loopback enable racoon to use loopback], -+ [], [enable_racoon_over_loopback=no]) -+if test $enable_racoon_over_loopback = "yes"; then -+ AC_DEFINE([ENABLE_RACOON_OVER_LOOPBACK], [], [Enable racoon to use loopback]) ++AC_MSG_CHECKING(whether to support Auditing) ++AC_ARG_ENABLE(audit, ++ [ --enable-audit build audit daemon support for SELinux], ++ enable_audit=$enableval,enable_audit=auto) ++ ++AC_MSG_RESULT($enable_audit) ++ ++# libaudit detection ++if test x$enable_audit = xno ; then ++ have_libaudit=no; ++else ++ AC_CHECK_LIB(audit, audit_log_user_avc_message, ++ have_libaudit=yes, have_libaudit=no) ++fi ++AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes) ++if test x$have_libaudit = xyes ; then ++ AUDIT_LIBS="-laudit" ++ AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) +fi -+AC_MSG_RESULT($enable_racoon_over_loopback) ++AC_SUBST(AUDIT_LIBS) + CFLAGS="$CFLAGS $CFLAGS_ADD" CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" -diff -up ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.loopback ipsec-tools-0.7.1/src/racoon/isakmp_inf.c ---- ipsec-tools-0.7.1/src/racoon/isakmp_inf.c.loopback 2008-07-11 10:08:42.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/isakmp_inf.c 2008-07-29 11:38:29.000000000 +0200 -@@ -383,7 +383,7 @@ isakmp_info_recv_n(iph1, notify, msgid, - "delete phase1 handle.\n"); - return -1; - } else { -- if (getph2bymsgid(iph1, msgid) == NULL) { -+ if (getph2bymsgid(iph1, msgid, iph1->side) == NULL) { - plog(LLV_ERROR, LOCATION, iph1->remote, - "fatal %s notify messsage, " - "phase1 should be deleted.\n", -@@ -512,7 +512,7 @@ isakmp_info_recv_d(iph1, delete, msgid, - return 0; - } - -- del_ph1=getph1byindex((isakmp_index *)(delete + 1)); -+ del_ph1=getph1byindex((isakmp_index *)(delete + 1), ANYSIDE); - if(del_ph1 != NULL){ - - EVT_PUSH(del_ph1->local, del_ph1->remote, -@@ -641,7 +641,7 @@ isakmp_info_send_d2(iph2) - * don't send delete information if there is no phase 1 handler. - * It's nonsensical to negotiate phase 1 to send the information. - */ -- iph1 = getph1byaddr(iph2->src, iph2->dst, 0); -+ iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); - if (iph1 == NULL){ - plog(LLV_DEBUG2, LOCATION, NULL, - "No ph1 handler found, could not send DELETE_SA\n"); -@@ -1110,7 +1110,7 @@ purge_isakmp_spi(proto, spi, n) - size_t i; - - for (i = 0; i < n; i++) { -- iph1 = getph1byindex(&spi[i]); -+ iph1 = getph1byindex(&spi[i], ANYSIDE); - if (!iph1) - continue; - -diff -up ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c.loopback ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c ---- ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c.loopback 2007-08-07 06:49:24.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/isakmp_xauth.c 2008-07-29 09:57:26.000000000 +0200 -@@ -360,7 +360,7 @@ xauth_reply_stub(args) - struct xauth_reply_arg *xra = (struct xauth_reply_arg *)args; - struct ph1handle *iph1; - -- if ((iph1 = getph1byindex(&xra->index)) != NULL) -+ if ((iph1 = getph1byindex(&xra->index, ANYSIDE)) != NULL) - (void)xauth_reply(iph1, xra->port, xra->id, xra->res); - else - plog(LLV_ERROR, LOCATION, NULL, -diff -up ipsec-tools-0.7.1/src/racoon/isakmp.h.loopback ipsec-tools-0.7.1/src/racoon/isakmp.h ---- ipsec-tools-0.7.1/src/racoon/isakmp.h.loopback 2006-09-09 18:22:09.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/isakmp.h 2008-07-29 09:57:26.000000000 +0200 -@@ -39,6 +39,8 @@ - /* must include first. */ - /* must include "isakmp_var.h" first. */ - -+#define ANYSIDE -1 /* either INITIATOR or RESPONDER */ -+ - #define INITIATOR 0 /* synonym sender */ - #define RESPONDER 1 /* synonym receiver */ - -diff -up ipsec-tools-0.7.1/src/racoon/handler.c.loopback ipsec-tools-0.7.1/src/racoon/handler.c ---- ipsec-tools-0.7.1/src/racoon/handler.c.loopback 2008-01-11 15:12:00.000000000 +0100 -+++ ipsec-tools-0.7.1/src/racoon/handler.c 2008-07-29 11:29:31.000000000 +0200 -@@ -101,14 +101,19 @@ static void sweep_recvdpkt __P((void *)) - extern caddr_t val2str(const char *, size_t); - - struct ph1handle * --getph1byindex(index) -+getph1byindex(index, side) - isakmp_index *index; -+ int side; - { - struct ph1handle *p; - - LIST_FOREACH(p, &ph1tree, chain) { - if (p->status == PHASE1ST_EXPIRED) - continue; -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ if (p->side != side && side != ANYSIDE) -+ continue; -+#endif - if (memcmp(&p->index, index, sizeof(*index)) == 0) - return p; - } -@@ -121,14 +126,19 @@ getph1byindex(index) - * search for isakmp handler by i_ck in index. - */ - struct ph1handle * --getph1byindex0(index) -+getph1byindex0(index, side) - isakmp_index *index; -+ int side; - { - struct ph1handle *p; - - LIST_FOREACH(p, &ph1tree, chain) { - if (p->status == PHASE1ST_EXPIRED) - continue; -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ if (p->side != side && side != ANYSIDE) -+ continue; -+#endif - if (memcmp(&p->index, index, sizeof(cookie_t)) == 0) - return p; - } -@@ -142,9 +152,10 @@ getph1byindex0(index) - * with phase 2's destinaion. - */ - struct ph1handle * --getph1byaddr(local, remote, established) -+getph1byaddr(local, remote, established, side) - struct sockaddr *local, *remote; - int established; -+ int side; - { - struct ph1handle *p; - -@@ -155,6 +166,10 @@ getph1byaddr(local, remote, established) - LIST_FOREACH(p, &ph1tree, chain) { - if (p->status == PHASE1ST_EXPIRED) - continue; -+ #ifdef ENABLE_RACOON_OVER_LOOPBACK -+ if (p->side != side && side != ANYSIDE) -+ continue; -+ #endif - plog(LLV_DEBUG2, LOCATION, NULL, "p->local: %s\n", saddr2str(p->local)); - plog(LLV_DEBUG2, LOCATION, NULL, "p->remote: %s\n", saddr2str(p->remote)); - -@@ -175,14 +190,19 @@ getph1byaddr(local, remote, established) - } - - struct ph1handle * --getph1byaddrwop(local, remote) -+getph1byaddrwop(local, remote, side) - struct sockaddr *local, *remote; -+ int side; - { - struct ph1handle *p; - - LIST_FOREACH(p, &ph1tree, chain) { - if (p->status == PHASE1ST_EXPIRED) - continue; -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ if (p->side != side && side != ANYSIDE) -+ continue; -+#endif - if (cmpsaddrwop(local, p->local) == 0 - && cmpsaddrwop(remote, p->remote) == 0) - return p; -@@ -197,14 +217,19 @@ getph1byaddrwop(local, remote) - * with phase 2's destinaion. - */ - struct ph1handle * --getph1bydstaddrwop(remote) -+getph1bydstaddrwop(remote, side) - struct sockaddr *remote; -+ int side; - { - struct ph1handle *p; - - LIST_FOREACH(p, &ph1tree, chain) { - if (p->status == PHASE1ST_EXPIRED) - continue; -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ if (p->side != side && side != ANYSIDE) -+ continue; -+#endif - if (cmpsaddrwop(remote, p->remote) == 0) - return p; +diff -up ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback ipsec-tools-0.7.1/src/racoon/pfkey.c +--- ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback 2008-07-30 19:59:10.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/pfkey.c 2008-07-30 20:34:11.000000000 +0200 +@@ -99,6 +99,7 @@ + #include "nattraversal.h" + #include "crypto_openssl.h" + #include "grabmyaddr.h" ++#include "sockmisc.h" + + #if defined(SADB_X_EALG_RIJNDAELCBC) && !defined(SADB_X_EALG_AESCBC) + #define SADB_X_EALG_AESCBC SADB_X_EALG_RIJNDAELCBC +@@ -972,6 +973,45 @@ pk_recvgetspi(mhp) + return -1; } -@@ -472,13 +497,18 @@ getph2byseq(seq) - * search ph2handle with message id. - */ - struct ph2handle * --getph2bymsgid(iph1, msgid) -+getph2bymsgid(iph1, msgid, side) - struct ph1handle *iph1; - u_int32_t msgid; -+ int side; - { - struct ph2handle *p; - - LIST_FOREACH(p, &ph2tree, chain) { -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ if (p->side != side && side != ANYSIDE) -+ continue; -+#endif - if (p->msgid == msgid) - return p; + ++#ifdef HAVE_SECCTX ++ if (iph2->loopback == 1) { ++ u_int satype, reqid; ++ struct sockaddr *src; ++ ++ src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]); ++ if (cmpsaddrstrict(src, dst) == 0) { ++ /* yep, this is loopback. install SA */ ++ satype = ipsecdoi2pfkey_proto(iph2->proposal->head->proto_id); ++ if (satype == ~0) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "invalid proto_id %d\n", ++ iph2->proposal->head->proto_id); ++ return -1; ++ } ++ ++ reqid = iph2->proposal->head->reqid_in; ++ ++ iph2->status = PHASE2ST_ADDSA; ++ if (pfkey_send_update(lcconf->sock_pfkey, satype, ++ IPSEC_MODE_TRANSPORT, src, dst, sa->sadb_sa_spi, ++ reqid, 0, NULL, SADB_EALG_NULL, 0, SADB_AALG_NONE, ++ 0, 0, 0, 0, iph2->proposal->lifetime, 0, ++ iph2->seq, iph2->proposal->sctx.ctx_doi, ++ iph2->proposal->sctx.ctx_alg, ++ iph2->proposal->sctx.ctx_str, ++ iph2->proposal->sctx.ctx_strlen) < 0) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "failed to update loopback SA: %s\n", ++ ipsec_strerror()); ++ remph2(iph2); ++ delph2(iph2); ++ return -1; ++ } ++ } ++ return 0; ++ } ++#endif /* HAVE SECCTX */ ++ + /* set SPI, and check to get all spi whether or not */ + allspiok = 1; + notfound = 1; +@@ -1222,6 +1262,26 @@ pk_recvupdate(mhp) + return -1; } -@@ -517,12 +547,17 @@ getph2byid(src, dst, spid) - } - struct ph2handle * --getph2bysaddr(src, dst) -+getph2bysaddr(src, dst, side) - struct sockaddr *src, *dst; -+ int side; - { - struct ph2handle *p; - - LIST_FOREACH(p, &ph2tree, chain) { -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ if (p->side != side && side != ANYSIDE) -+ continue; ++#ifdef HAVE_SECCTX ++ /* get update for loopback here */ ++ if (iph2->loopback == 1 && (cmpsaddrstrict(src, dst) == 0)) { ++ plog(LLV_INFO, LOCATION, NULL, ++ "IPsec-SA established without ISAKMP: %s\n", ++ sadbsecas2str(iph2->dst, iph2->src, ++ msg->sadb_msg_satype, sa->sadb_sa_spi, ++ IPSEC_MODE_TRANSPORT)); ++ ++ /* turn off the timer for calling pfkey_timeover() */ ++ SCHED_KILL(iph2->sce); ++ ++ iph2->sce = sched_new(iph2->proposal->lifetime, ++ isakmp_ph2expire_stub, iph2); ++ ++ iph2->status = PHASE2ST_ESTABLISHED; ++ return 0; ++ } +#endif - if (cmpsaddrstrict(src, p->src) == 0 && - cmpsaddrstrict(dst, p->dst) == 0) - return p; -@@ -1128,7 +1163,7 @@ static int revalidate_ph2(struct ph2hand - if (iph2->ph1 != NULL) - iph1=iph2->ph1; - else -- iph1=getph1byaddr(iph2->src, iph2->dst, 0); -+ iph1=getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); - - if(iph1 != NULL && iph1->rmconf != NULL) { - check_level = iph1->rmconf->pcheck_level; -diff -up ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback ipsec-tools-0.7.1/src/racoon/pfkey.c ---- ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback 2008-07-29 09:57:26.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/pfkey.c 2008-07-29 09:57:26.000000000 +0200 -@@ -1264,10 +1264,11 @@ pk_recvupdate(mhp) ++ + /* check to complete all keys ? */ + for (pr = iph2->approval->head; pr != NULL; pr = pr->next) { + proto_id = pfkey2ipsecdoi_proto(msg->sadb_msg_satype); +@@ -1264,11 +1324,6 @@ pk_recvupdate(mhp) /* turn off the timer for calling pfkey_timeover() */ SCHED_KILL(iph2->sce); -+#ifdef ENABLE_RACOON_OVER_LOOPBACK - /* update status */ +- /* update status */ - /* Do this in pk_recvadd - * iph2->status = PHASE2ST_ESTABLISHED; - */ -+ if (cmpsaddrstrict(iph2->ph1->local, iph2->ph1->remote) == 0) -+ iph2->status = PHASE2ST_ESTABLISHED; -+#endif - +- #ifdef ENABLE_STATS gettimeofday(&iph2->end, NULL); -@@ -1322,6 +1323,12 @@ pk_sendadd(iph2) - return -1; - } - -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ /* This prevents adding the same SA twice, since done in update */ -+ if (cmpsaddrstrict(iph2->ph1->local, iph2->ph1->remote) == 0) -+ return 0; -+#endif + syslog(LOG_NOTICE, "%s(%s): %8.6f", +@@ -1657,6 +1712,7 @@ pk_recvacquire(mhp) + struct sadb_x_sec_ctx *m_sec_ctx; + #endif /* HAVE_SECCTX */ + struct policyindex spidx; ++ int do_listen = 0; + + + /* ignore this message because of local test mode. */ +@@ -1681,6 +1737,12 @@ pk_recvacquire(mhp) + m_sec_ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX]; + + if (m_sec_ctx != NULL) { ++ if (m_sec_ctx->sadb_x_ctx_len > MAX_CTXSTR_SIZE) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "ignoring ACQUIRE: security context is greater than MAX, %d.\n", ++ MAX_CTXSTR_SIZE); ++ return -1; ++ } + plog(LLV_INFO, LOCATION, NULL, "security context doi: %u\n", + m_sec_ctx->sadb_x_ctx_doi); + plog(LLV_INFO, LOCATION, NULL, +@@ -1730,7 +1792,6 @@ pk_recvacquire(mhp) + */ + struct sockaddr *sa = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]); + struct myaddrs *p; +- int do_listen = 0; + for (p = lcconf->myaddrs; p; p = p->next) { + if (!cmpsaddrwop(p->addr, sa)) { + do_listen = 1; +@@ -1853,6 +1914,73 @@ pk_recvacquire(mhp) + plog(LLV_DEBUG, LOCATION, NULL, + "new acquire %s\n", spidx2str(&sp_out->spidx)); + ++#ifdef HAVE_SECCTX ++ /* ++ * If the src address in the ACQUIRE is one we listen on and ++ * the src and dst addresses are the same, then assume this ++ * packet arrived over loopback and just get an SPI and ++ * install the SA. ++ */ ++ if (do_listen && m_sec_ctx && (cmpsaddrstrict(src, dst) == 0)) { ++ struct saprop *newpp; ++ struct saproto *newpr; ++ iph2[n]->loopback = 1; ++ newpp = newsaprop(); ++ if (newpp == NULL) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "failed to allocate saprop.\n"); ++ delph2(iph2[n]); ++ return -1; ++ } ++ /* allocate to hold reqid */ ++ newpr = newsaproto(); ++ if (newpr == NULL) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "failed to allocate saproto.\n"); ++ delph2(iph2[n]); ++ return -1; ++ } + - if (iph2->side == INITIATOR) - proxy = iph2->ph1->rmconf->support_proxy; - else if (iph2->sainfo && iph2->sainfo->id_i) -@@ -1764,7 +1771,7 @@ pk_recvacquire(mhp) - */ - iph2[0] = getph2byid(src, dst, xpl->sadb_x_policy_id); - if (iph2[0] == NULL) -- iph2[0] = getph2bysaddr(src, dst); -+ iph2[0] = getph2bysaddr(src, dst, ANYSIDE); - - if (iph2[0] != NULL) { - if (iph2[0]->status < PHASE2ST_ESTABLISHED) { -diff -up ipsec-tools-0.7.1/src/racoon/isakmp.c.loopback ipsec-tools-0.7.1/src/racoon/isakmp.c ---- ipsec-tools-0.7.1/src/racoon/isakmp.c.loopback 2008-07-11 10:08:41.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/isakmp.c 2008-07-29 11:37:16.000000000 +0200 -@@ -387,6 +387,36 @@ end: - return(error); - } - -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+/* -+ * isakmp phase 1 search helper -+ */ -+static struct ph1handle * -+isakmp_ph1pickside(iph1_i, iph1_r, local) -+ struct ph1handle *iph1_i, *iph1_r; -+ struct sockaddr *local; -+{ -+ if (iph1_i == NULL && iph1_r != NULL) { -+ if (cmpsaddrstrict(iph1_r->remote, local) != 0) -+ return iph1_r; -+ else -+ return NULL; -+ } else if (iph1_i != NULL && iph1_r == NULL) { -+ if (cmpsaddrstrict(iph1_i->remote, local) != 0) -+ return iph1_i; -+ else -+ return NULL; -+ } else if (iph1_i != NULL && iph1_r != NULL) { -+ if (iph1_r->status < iph1_i->status) -+ return iph1_r; -+ else -+ return iph1_i; -+ } ++ newpr->reqid_out = sp_out->req->saidx.reqid; ++ newpr->reqid_in = sp_in->req->saidx.reqid; ++ newpr->proto_id = ipproto2doi(sp_out->req->saidx.proto); ++ ++ inssaprotorev(newpp, newpr); ++ iph2[n]->proposal = newpp; ++ printsaprop0(LLV_DEBUG, newpp); + -+ return NULL; -+} -+#endif ++ set_secctx_in_proposal(iph2[n], spidx); ++ iph2[n]->proposal->lifetime = IPSECDOI_ATTR_SA_LD_SEC_DEFAULT; + - /* - * main processing to handle isakmp payload - */ -@@ -453,7 +483,15 @@ isakmp_main(msg, remote, local) - } - } ++ insph2(iph2[n]); ++ ++ iph2[n]->status = PHASE2ST_GETSPISENT; ++ plog(LLV_DEBUG, LOCATION, NULL, "call pfkey_send_getspi\n"); ++ if (pfkey_send_getspi( ++ lcconf->sock_pfkey, ++ iph2[n]->satype, ++ IPSEC_MODE_TRANSPORT, ++ dst, /* src of SA */ ++ src, /* dst of SA */ ++ 0, 0, ++ newpr->reqid_in, iph2[n]->seq) < 0) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "ipseclib failed send getspi (%s)\n", ++ ipsec_strerror()); ++ delph2(iph2[n]); ++ return -1; ++ } ++ iph2[n]->sce = sched_new(lcconf->wait_ph2complete, ++ pfkey_timeover_stub, iph2[n]); ++ ++ plog(LLV_DEBUG, LOCATION, NULL, ++ "pfkey GETSPI sent: %s\n", ++ sadbsecas2str(dst, src, iph2[n]->satype, 0, ++ IPSEC_MODE_TRANSPORT)); ++ return 0; ++ } ++#endif /* HAVE_SECCTX */ ++ + /* get sainfo */ + { + vchar_t *idsrc, *iddst; +diff -up ipsec-tools-0.7.1/src/racoon/Makefile.am.loopback ipsec-tools-0.7.1/src/racoon/Makefile.am +--- ipsec-tools-0.7.1/src/racoon/Makefile.am.loopback 2008-07-23 15:54:16.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/Makefile.am 2008-07-30 20:25:07.000000000 +0200 +@@ -39,7 +39,7 @@ racoon_SOURCES = \ + EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c throttle.c \ + isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS) + racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(LEXLIB) \ +- $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la ++ $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la @AUDIT_LIBS@ + racoon_DEPENDENCIES = \ + $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \ + vmbuf.o sockmisc.o misc.o +diff -up ipsec-tools-0.7.1/src/racoon/policy.h.loopback ipsec-tools-0.7.1/src/racoon/policy.h +--- ipsec-tools-0.7.1/src/racoon/policy.h.loopback 2007-06-07 22:34:19.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/policy.h 2008-07-30 20:27:48.000000000 +0200 +@@ -38,7 +38,12 @@ + -- iph1 = getph1byindex(index); + #ifdef HAVE_SECCTX +-#define MAX_CTXSTR_SIZE 50 + -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ iph1 = isakmp_ph1pickside(getph1byindex(index, INITIATOR), -+ getph1byindex(index, RESPONDER), -+ local); -+#else -+ iph1 = getph1byindex(index, ANYSIDE); ++/* Current LSPP policy is 1024 compartments, 5 chars each 'c1024'. SE Linux ++ * will attempt to combine so, worst case is all odd or even numbers. The ++ * context size of SE Linux types is max'ed around 256. We allow 16 for ++ * sensitivity */ ++#define MAX_CTXSTR_SIZE 3344 /* (6 * 512) + 256 + 16 */ + struct security_ctx { + u_int8_t ctx_doi; /* Security Context DOI */ + u_int8_t ctx_alg; /* Security Context Algorithm */ +@@ -152,6 +157,9 @@ extern void initsp __P((void)); + extern struct ipsecrequest *newipsecreq __P((void)); + + extern const char *spidx2str __P((const struct policyindex *)); ++#ifdef HAVE_LIBAUDIT ++extern void audit_init __P((void)); ++#endif + #ifdef HAVE_SECCTX + #include + extern int get_security_context __P((vchar_t *, struct policyindex *)); +diff -up ipsec-tools-0.7.1/src/racoon/main.c.loopback ipsec-tools-0.7.1/src/racoon/main.c +--- ipsec-tools-0.7.1/src/racoon/main.c.loopback 2007-06-07 22:34:18.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/main.c 2008-07-30 20:31:07.000000000 +0200 +@@ -169,6 +169,9 @@ main(ac, av) + #ifdef HAVE_SECCTX + init_avc(); + #endif ++#ifdef HAVE_LIBAUDIT ++ audit_init(); +#endif -+ - if (iph1 != NULL) { - /* validity check */ - if (memcmp(&isakmp->r_ck, r_ck0, sizeof(cookie_t)) == 0 && -@@ -553,7 +591,15 @@ isakmp_main(msg, remote, local) - */ - - /* search for phase1 handle by index without r_ck */ -- iph1 = getph1byindex0(index); -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ iph1 = isakmp_ph1pickside( -+ getph1byindex0(index, INITIATOR), -+ getph1byindex0(index, RESPONDER), -+ local); -+#else -+ iph1=getph1byindex0(index, ANYSIDE); + eay_init(); + initlcconf(); + initrmconf(); +diff -up ipsec-tools-0.7.1/src/racoon/handler.h.loopback ipsec-tools-0.7.1/src/racoon/handler.h +--- ipsec-tools-0.7.1/src/racoon/handler.h.loopback 2008-07-30 19:59:10.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/handler.h 2008-07-30 20:29:25.000000000 +0200 +@@ -286,6 +286,7 @@ struct ph2handle { + u_int32_t msgid; /* msgid for phase 2 */ + + u_int32_t sa_count; /* num of SAs sent in SADB_ADD */ ++ u_int8_t loopback; + + struct sainfo *sainfo; /* place holder of sainfo */ + struct saprop *proposal; /* SA(s) proposal. */ +diff -up ipsec-tools-0.7.1/src/racoon/security.c.loopback ipsec-tools-0.7.1/src/racoon/security.c +--- ipsec-tools-0.7.1/src/racoon/security.c.loopback 2007-06-07 22:34:19.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/security.c 2008-07-30 20:00:34.000000000 +0200 +@@ -55,6 +55,60 @@ + #include "proposal.h" + #include "strnames.h" + #include "handler.h" ++#ifdef HAVE_LIBAUDIT ++#include ++#include "libaudit.h" +#endif + - if (iph1 == NULL) { - /*it must be the 1st message from a initiator.*/ - if (memcmp(&isakmp->r_ck, r_ck0, -@@ -629,7 +675,7 @@ isakmp_main(msg, remote, local) - * NOTE: We think such informational exchange should be ignored. - */ - if (iph1 == NULL) { -- iph1 = getph1byindex0(index); -+ iph1 = getph1byindex0(index, INITIATOR); - if (iph1 == NULL) { - plog(LLV_ERROR, LOCATION, remote, - "unknown Informational " -@@ -656,6 +702,9 @@ isakmp_main(msg, remote, local) - case ISAKMP_ETYPE_QUICK: - { - struct ph2handle *iph2; -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ struct ph2handle *iph2_i, *iph2_r; -+#endif - - if (iph1 == NULL) { - isakmp_info_send_nx(isakmp, remote, local, -@@ -688,8 +737,31 @@ isakmp_main(msg, remote, local) - return -1; - } - -- /* search isakmp phase 2 stauts record. */ -- iph2 = getph2bymsgid(iph1, msgid); -+ /* search isakmp phase 2 status record. */ -+#ifdef ENABLE_RACOON_OVER_LOOPBACK -+ iph2_i = getph2bymsgid(iph1, msgid, INITIATOR); -+ iph2_r = getph2bymsgid(iph1, msgid, RESPONDER); -+ if (iph2_i == NULL && iph2_r != NULL) { -+ if (cmpsaddrstrict(iph1->remote, local) != 0) -+ iph2 = iph2_r; -+ else -+ iph2 = NULL; -+ } else if (iph2_i != NULL && iph2_r == NULL) { -+ if (cmpsaddrstrict(iph1->remote, local) != 0) -+ iph2 = iph2_i; -+ else -+ iph2 = NULL; -+ } else if (iph2_i != NULL && iph2_r != NULL) { -+ if (iph2_r->status < iph2_i->status) -+ iph2 = iph2_r; -+ else -+ iph2 = iph2_i; -+ } else -+ iph2 = NULL; -+#else -+ iph2 = getph2bymsgid(iph1, msgid, ANYSIDE); -+#endif ++static void log_callback (const char *fmt, ...); + - if (iph2 == NULL) { - /* it must be new negotiation as responder */ - if (isakmp_ph2begin_r(iph1, msg) < 0) -@@ -2165,15 +2237,15 @@ isakmp_post_acquire(iph2) - */ - #ifdef ENABLE_NATT - if (!extract_port(iph2->src) && !extract_port(iph2->dst)) { -- if ((iph1 = getph1byaddrwop(iph2->src, iph2->dst)) != NULL) { -+ if ((iph1 = getph1byaddrwop(iph2->src, iph2->dst, ANYSIDE)) != NULL) { - set_port(iph2->src, extract_port(iph1->local)); - set_port(iph2->dst, extract_port(iph1->remote)); - } - } else { -- iph1 = getph1byaddr(iph2->src, iph2->dst, 0); -+ iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); - } - #else -- iph1 = getph1byaddr(iph2->src, iph2->dst, 0); -+ iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); - #endif - - /* no ISAKMP-SA found. */ -@@ -2300,17 +2372,17 @@ isakmp_chkph1there(iph2) - #ifdef ENABLE_NATT - if (!extract_port(iph2->src) && !extract_port(iph2->dst)) { - plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: extract_port.\n"); -- if( (iph1 = getph1byaddrwop(iph2->src, iph2->dst)) != NULL){ -+ if( (iph1 = getph1byaddrwop(iph2->src, iph2->dst, ANYSIDE)) != NULL){ - plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: found a ph1 wop.\n"); - } - } else { - plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: searching byaddr.\n"); -- iph1 = getph1byaddr(iph2->src, iph2->dst, 0); -+ iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); - if(iph1 != NULL) - plog(LLV_DEBUG2, LOCATION, NULL, "CHKPH1THERE: found byaddr.\n"); - } - #else -- iph1 = getph1byaddr(iph2->src, iph2->dst, 0); -+ iph1 = getph1byaddr(iph2->src, iph2->dst, 0, ANYSIDE); - #endif - - /* XXX Even if ph1 as responder is there, should we not start -@@ -2574,7 +2646,7 @@ isakmp_newmsgid2(iph1) - - do { - msgid2 = eay_random(); -- } while (getph2bymsgid(iph1, msgid2)); -+ } while (getph2bymsgid(iph1, msgid2, iph1->side)); - - return msgid2; - } -@@ -3189,7 +3261,7 @@ purge_remote(iph1) - iph1->status = PHASE1ST_EXPIRED; - - /* Check if we have another, still valid, phase1 SA. */ -- new_iph1 = getph1byaddr(iph1->local, iph1->remote, 1); -+ new_iph1 = getph1byaddr(iph1->local, iph1->remote, 1, ANYSIDE); - - /* - * Delete all orphaned or binded to the deleting ph1handle phase2 SAs. -diff -up ipsec-tools-0.7.1/src/racoon/handler.h.loopback ipsec-tools-0.7.1/src/racoon/handler.h ---- ipsec-tools-0.7.1/src/racoon/handler.h.loopback 2008-07-29 09:57:26.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/handler.h 2008-07-29 11:32:03.000000000 +0200 -@@ -425,13 +425,13 @@ struct ph1handle; - struct ph2handle; - struct policyindex; - --extern struct ph1handle *getph1byindex __P((isakmp_index *)); --extern struct ph1handle *getph1byindex0 __P((isakmp_index *)); -+extern struct ph1handle *getph1byindex __P((isakmp_index *, int)); -+extern struct ph1handle *getph1byindex0 __P((isakmp_index *, int)); - extern struct ph1handle *getph1byaddr __P((struct sockaddr *, -- struct sockaddr *, int)); -+ struct sockaddr *, int, int)); - extern struct ph1handle *getph1byaddrwop __P((struct sockaddr *, -- struct sockaddr *)); --extern struct ph1handle *getph1bydstaddrwop __P((struct sockaddr *)); -+ struct sockaddr *, int)); -+extern struct ph1handle *getph1bydstaddrwop __P((struct sockaddr *, int)); - #ifdef ENABLE_HYBRID - struct ph1handle *getph1bylogin __P((char *)); - int purgeph1bylogin __P((char *)); -@@ -448,8 +448,9 @@ extern struct ph2handle *getph2byspidx _ - extern struct ph2handle *getph2byspid __P((u_int32_t)); - extern struct ph2handle *getph2byseq __P((u_int32_t)); - extern struct ph2handle *getph2bysaddr __P((struct sockaddr *, -- struct sockaddr *)); --extern struct ph2handle *getph2bymsgid __P((struct ph1handle *, u_int32_t)); -+ struct sockaddr *, int)); -+extern struct ph2handle *getph2bymsgid __P((struct ph1handle *, u_int32_t, -+ int)); - extern struct ph2handle *getph2byid __P((struct sockaddr *, - struct sockaddr *, u_int32_t)); - extern struct ph2handle *getph2bysaidx __P((struct sockaddr *, -diff -up ipsec-tools-0.7.1/src/racoon/admin.c.loopback ipsec-tools-0.7.1/src/racoon/admin.c ---- ipsec-tools-0.7.1/src/racoon/admin.c.loopback 2008-06-18 09:30:19.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/admin.c 2008-07-29 09:57:26.000000000 +0200 -@@ -289,7 +289,7 @@ out2: - STRDUP_FATAL(loc); - STRDUP_FATAL(rem); - -- if ((iph1 = getph1byaddrwop(src, dst)) == NULL) { -+ if ((iph1 = getph1byaddrwop(src, dst, ANYSIDE)) == NULL) { - plog(LLV_ERROR, LOCATION, NULL, - "phase 1 for %s -> %s not found\n", loc, rem); - } else { -@@ -340,7 +340,7 @@ out2: - plog(LLV_INFO, LOCATION, NULL, - "Flushing all SAs for peer %s\n", rem); - -- while ((iph1 = getph1bydstaddrwop(dst)) != NULL) { -+ while ((iph1 = getph1bydstaddrwop(dst, ANYSIDE)) != NULL) { - loc = racoon_strdup(saddrwop2str(iph1->local)); - STRDUP_FATAL(loc); ++static const struct avc_log_callback log_cb = ++{ ++ .func_log = log_callback, ++ .func_audit = NULL ++}; ++ ++#ifdef HAVE_LIBAUDIT ++static int audit_fd = -1; ++void ++audit_init(void) ++{ ++ audit_fd = audit_open(); ++ if (audit_fd < 0) { ++ /* If kernel doesn't support audit, bail out */ ++ if (errno == EINVAL || errno == EPROTONOSUPPORT || ++ errno == EAFNOSUPPORT) ++ return; ++ /* If unprivileged, bail out */ ++ if (errno == EPERM && getuid() != 0) ++ return; ++ plog (LLV_ERROR, LOCATION, NULL, ++ "Failed opening connection to the audit subsystem"); ++ } ++} ++#endif /* HAVE_LIBAUDIT */ ++ ++static void ++log_callback (const char *fmt, ...) ++{ ++ va_list ap; ++ va_start(ap, fmt); ++#ifdef HAVE_LIBAUDIT ++ if (audit_fd >= 0) { ++ char buf[PATH_MAX*2]; ++ ++ /* FIXME: need to change this to show real user */ ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, ++ buf, NULL, NULL, NULL, -1); ++ return; ++ } else ++#endif /* HAVE_LIBAUDIT */ ++ { ++ vsyslog (LOG_INFO, fmt, ap); ++ va_end(ap); ++ } ++} + /* + * Get the security context information from SA. Index: ipsec-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ipsec-tools.spec 29 Jul 2008 12:31:24 -0000 1.56 +++ ipsec-tools.spec 30 Jul 2008 18:51:56 -0000 1.57 @@ -1,6 +1,6 @@ Name: ipsec-tools Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for configuring and using IPSEC License: BSD Group: System Environment/Base @@ -15,7 +15,6 @@ # the following patches were also submitted upstream: Patch5: ipsec-tools-0.7-iface.patch Patch6: ipsec-tools-0.7-dupsplit.patch -Patch7: ipsec-tools-0.7-contextsize.patch Patch9: ipsec-tools-0.7-splitcidr.patch BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool @@ -38,7 +37,6 @@ %patch4 -p1 -b .loopback %patch5 -p1 -b .iface %patch6 -p1 -b .dupsplit -%patch7 -p1 -b .ctxsize %patch9 -p1 -b .splitcidr ./bootstrap @@ -59,7 +57,6 @@ --enable-gssapi \ --enable-natt \ --enable-security-context \ - --enable-racoon-over-loopback \ --enable-audit make @@ -119,6 +116,10 @@ %config(noreplace) /etc/racoon/racoon.conf %changelog +* Wed Jul 30 2008 Tomas Mraz - 0.7.1-2 +- Different approach to allow racoon to add loopback SAs for + labeled IPSec (without ISAKMP) + * Tue Jul 29 2008 Tomas Mraz - 0.7.1-1 - Update to a new upstream version --- ipsec-tools-0.7-contextsize.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 18:56:29 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 30 Jul 2008 18:56:29 GMT Subject: rpms/kernel/devel kernel.spec, 1.824, 1.825 linux-2.6-wireless.patch, 1.47, 1.48 Message-ID: <200807301856.m6UIuTKC002781@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2750 Modified Files: kernel.spec linux-2.6-wireless.patch Log Message: Upstream wireless fixes from 2008-07-29 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.824 retrieving revision 1.825 diff -u -r1.824 -r1.825 --- kernel.spec 30 Jul 2008 16:27:51 -0000 1.824 +++ kernel.spec 30 Jul 2008 18:55:59 -0000 1.825 @@ -1091,9 +1091,9 @@ # wake up links that have been put to sleep by BIOS (#436099) ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch -# wireless patches headed for 2.6.26 -#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.27 +ApplyPatch linux-2.6-wireless.patch +# wireless patches headed for 2.6.28 #ApplyPatch linux-2.6-wireless-pending.patch # Add misc wireless bits from upstream wireless tree @@ -1710,6 +1710,10 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Wed Jul 30 2008 John W. Linville +- Upstream wireless fixes from 2008-07-29 + (http://marc.info/?l=linux-wireless&m=121737750023195&w=2) + * Wed Jul 30 2008 Mark McLoughlin - Replace kernel-xen in DEFAULTKERNEL (#456558) linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.47 -r 1.48 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- linux-2.6-wireless.patch 10 Jul 2008 17:28:14 -0000 1.47 +++ linux-2.6-wireless.patch 30 Jul 2008 18:55:59 -0000 1.48 @@ -1,521 +1,3578 @@ -commit 814feefa859a736d29d0700d49debf13904b429f -Author: Ihar Hrachyshka -Date: Wed Jul 9 09:29:58 2008 +0300 +commit 56a6d13dfd49d90d72a1a962246206719dd9d143 +Author: Luis Carlos Cobo +Date: Tue Jul 29 19:59:31 2008 +0200 - libertas: fix memory alignment problems on the blackfin + mac80211: fix mesh beaconing - Fixing unaligned memory access on the blackfin architecture. + This patch fixes mesh beaconing, which was broken by "mac80211: revamp + beacon configuration". - Signed-off-by: Ihar Hrachyshka + Signed-off-by: Luis Carlos Cobo Signed-off-by: John W. Linville -commit 86229f0c7b4e065f51b5572a8a61801e281740a0 -Author: Luis Carlos Cobo -Date: Tue Jul 8 16:19:21 2008 +0200 +commit 77bbadd5ea893f364a0d1879723037678a03725c +Author: Vegard Nossum +Date: Tue Jul 29 13:31:47 2008 +0200 + + PS3: gelic: use unsigned long for irqflags + + The semantic patch I used was this: + + @@ + expression lock; + identifier flags; + expression subclass; + @@ + + - unsigned int flags; + + unsigned long flags; + + ... + + <+... + + ( + spin_lock_irqsave(lock, flags) + | + _spin_lock_irqsave(lock) + | + spin_unlock_irqrestore(lock, flags) + | + _spin_unlock_irqrestore(lock, flags) + | + read_lock_irqsave(lock, flags) + | + _read_lock_irqsave(lock) + | + read_unlock_irqrestore(lock, flags) + | + _read_unlock_irqrestore(lock, flags) + | + write_lock_irqsave(lock, flags) + | + _write_lock_irqsave(lock) + | + write_unlock_irqrestore(lock, flags) + | + _write_unlock_irqrestore(lock, flags) + | + spin_lock_irqsave_nested(lock, flags, subclass) + | + _spin_lock_irqsave_nested(lock, subclass) + | + spin_unlock_irqrestore(lock, flags) + | + _spin_unlock_irqrestore(lock, flags) + | + _raw_spin_lock_flags(lock, flags) + | + __raw_spin_lock_flags(lock, flags) + ) + + ...+> + + This patch was generated using the Coccinelle framework. + + Cc: Masakazu Mokuno + Cc: Julia Lawall + Cc: Alexey Dobriyan + Signed-off-by: Vegard Nossum + Signed-off-by: John W. Linville + +commit 14db74bcc3f7a779cf395a47e26b06a28207571a +Author: Johannes Berg +Date: Tue Jul 29 13:22:52 2008 +0200 + + mac80211: fix cfg80211 hooks for master interface + + The master interface is a virtual interface that is registered + to mac80211, changing that does not seem like a good idea at + the moment. However, since it has no sdata, we cannot accept + any configuration for it. This patch makes the cfg80211 hooks + reject any such attempt. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit bba95fefb8e31f4799652666d05a4a9aad56e492 +Author: Johannes Berg +Date: Tue Jul 29 13:22:51 2008 +0200 + + nl80211: fix dump callbacks + + Julius Volz pointed out that the dump callbacks in nl80211 were + broken and fixed one of them. This patch fixes the other three + and also addresses the TODOs there. + + Signed-off-by: Johannes Berg + Cc: Julius Volz + Cc: Thomas Graf + Signed-off-by: John W. Linville + +commit d0f09804144fd9471a13cf4d80e66842c7fa114f +Author: Johannes Berg +Date: Tue Jul 29 11:32:07 2008 +0200 + + mac80211: partially fix skb->cb use + + This patch fixes mac80211 to not use the skb->cb over the queue step + from virtual interfaces to the master. The patch also, for now, + disables aggregation because that would still require requeuing, + will fix that in a separate patch. There are two other places (software + requeue and powersaving stations) where requeue can happen, but that is + not currently used by any drivers/not possible to use respectively. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 0ccd58fc03f40529f66190b1a41e92a732d2bda8 +Author: Larry Finger +Date: Mon Jul 28 22:25:08 2008 -0500 + + rtl8187: Improve wireless statistics for RTL8187B + + Wireless statistics produced by the RTL8187B driver are not particularly + informative about the strength of the received signal. From the data sheet + provided by Realtek, I discovered that certain parts of the RX header + should have the information necessary to calculate signal quality and + strength. With testing, it became clear that most of these quantities were + very jittery - only the AGC correlated with the signals expected from nearby + AP's. As a result, the quality and strength are derived from the agc value. + The scaling has been determined so that the numbers are close to those + obtained by b43 under the same conditions. The results are qualitatively + correct. + + Statistics derived for the RTL8187 have not been changed. + + The RX header variables have been renamed to match the quantites described + in the Realtek data sheet. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 1f690d7b549ef9c7424536475501885dd5b54930 +Author: Larry Finger +Date: Mon Jul 28 22:08:18 2008 -0500 + + rtl8187: Fix for TX sequence number problem + + "mac80211: fix TX sequence numbers" broke rtl8187. This + patch makes the same kind of fix that was done for rt2x00. Note that + this code will have to be reworked for proper sequence numbers on beacons. + In addition, the sequence number has been placed in the hardware state, + not the vif state. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 5422399518e8142198df888aab00acdac251f754 +Author: Rami Rosen +Date: Thu Jul 24 10:40:37 2008 +0300 + + mac80211: append CONFIG_ to MAC80211_VERBOSE_PS_DEBUG in net/mac80211/tx.c. + + In net/mac80211/tx.c, there are some #ifdef which checks + MAC80211_VERBOSE_PS_DEBUG + (which in fact is never set) instead of + CONFIG_MAC80211_VERBOSE_PS_DEBUG, as should be. + + This patch replaces MAC80211_VERBOSE_PS_DEBUG with + CONFIG_MAC80211_VERBOSE_PS_DEBUG in these #ifdef commands in + net/mac80211/tx.c. + [...3621 lines suppressed...] +@@ -1016,7 +1037,7 @@ static int nl80211_get_station(struct sk + + mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1112,7 +1133,7 @@ static int nl80211_set_station(struct sk + params.plink_action = + nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_ACTION]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1172,7 +1193,7 @@ static int nl80211_new_station(struct sk + ¶ms.station_flags)) + return -EINVAL; + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1207,7 +1228,7 @@ static int nl80211_del_station(struct sk + if (info->attrs[NL80211_ATTR_MAC]) + mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1277,68 +1298,78 @@ static int nl80211_send_mpath(struct sk_ + } + + static int nl80211_dump_mpath(struct sk_buff *skb, +- struct netlink_callback *cb) ++ struct netlink_callback *cb) + { +- int wp_idx = 0; +- int if_idx = 0; +- int sta_idx = cb->args[2]; +- int wp_start = cb->args[0]; +- int if_start = cb->args[1]; + struct mpath_info pinfo; + struct cfg80211_registered_device *dev; +- struct wireless_dev *wdev; ++ struct net_device *netdev; + u8 dst[ETH_ALEN]; + u8 next_hop[ETH_ALEN]; ++ int ifidx = cb->args[0]; ++ int path_idx = cb->args[1]; + int err; +- int exit = 0; + +- /* TODO: filter by device */ +- mutex_lock(&cfg80211_drv_mutex); +- list_for_each_entry(dev, &cfg80211_drv_list, list) { +- if (exit) ++ if (!ifidx) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize, ++ nl80211_fam.attrbuf, nl80211_fam.maxattr, ++ nl80211_policy); ++ if (err) ++ return err; ++ ++ if (!nl80211_fam.attrbuf[NL80211_ATTR_IFINDEX]) ++ return -EINVAL; ++ ++ ifidx = nla_get_u32(nl80211_fam.attrbuf[NL80211_ATTR_IFINDEX]); ++ if (!ifidx) ++ return -EINVAL; ++ } ++ ++ netdev = dev_get_by_index(&init_net, ifidx); ++ if (!netdev) ++ return -ENODEV; ++ ++ dev = cfg80211_get_dev_from_ifindex(ifidx); ++ if (IS_ERR(dev)) { ++ err = PTR_ERR(dev); ++ goto out_put_netdev; ++ } ++ ++ if (!dev->ops->dump_mpath) { ++ err = -ENOSYS; ++ goto out_err; ++ } ++ ++ rtnl_lock(); ++ ++ while (1) { ++ err = dev->ops->dump_mpath(&dev->wiphy, netdev, path_idx, ++ dst, next_hop, &pinfo); ++ if (err == -ENOENT) + break; +- if (++wp_idx < wp_start) +- continue; +- if_idx = 0; ++ if (err) ++ goto out_err_rtnl; + +- mutex_lock(&dev->devlist_mtx); +- list_for_each_entry(wdev, &dev->netdev_list, list) { +- if (exit) +- break; +- if (++if_idx < if_start) +- continue; +- if (!dev->ops->dump_mpath) +- continue; ++ if (nl80211_send_mpath(skb, NETLINK_CB(cb->skb).pid, ++ cb->nlh->nlmsg_seq, NLM_F_MULTI, ++ netdev, dst, next_hop, ++ &pinfo) < 0) ++ goto out; + +- for (;; ++sta_idx) { +- rtnl_lock(); +- err = dev->ops->dump_mpath(&dev->wiphy, +- wdev->netdev, sta_idx, dst, +- next_hop, &pinfo); +- rtnl_unlock(); +- if (err) { +- sta_idx = 0; +- break; +- } +- if (nl80211_send_mpath(skb, +- NETLINK_CB(cb->skb).pid, +- cb->nlh->nlmsg_seq, NLM_F_MULTI, +- wdev->netdev, dst, next_hop, +- &pinfo) < 0) { +- exit = 1; +- break; +- } +- } +- } +- mutex_unlock(&dev->devlist_mtx); ++ path_idx++; + } +- mutex_unlock(&cfg80211_drv_mutex); + +- cb->args[0] = wp_idx; +- cb->args[1] = if_idx; +- cb->args[2] = sta_idx; + +- return skb->len; ++ out: ++ cb->args[1] = path_idx; ++ err = skb->len; ++ out_err_rtnl: ++ rtnl_unlock(); ++ out_err: ++ cfg80211_put_dev(dev); ++ out_put_netdev: ++ dev_put(netdev); ++ ++ return err; + } + + static int nl80211_get_mpath(struct sk_buff *skb, struct genl_info *info) +@@ -1358,7 +1389,7 @@ static int nl80211_get_mpath(struct sk_b + + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1411,7 +1442,7 @@ static int nl80211_set_mpath(struct sk_b + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + next_hop = nla_data(info->attrs[NL80211_ATTR_MPATH_NEXT_HOP]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1446,7 +1477,7 @@ static int nl80211_new_mpath(struct sk_b + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + next_hop = nla_data(info->attrs[NL80211_ATTR_MPATH_NEXT_HOP]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1475,7 +1506,7 @@ static int nl80211_del_mpath(struct sk_b + if (info->attrs[NL80211_ATTR_MAC]) + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; From fedora-extras-commits at redhat.com Wed Jul 30 19:14:08 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 19:14:08 GMT Subject: rpms/akonadi/F-9 akonadi.spec,1.3,1.4 Message-ID: <200807301914.m6UJE8dv011050@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10976 Modified Files: akonadi.spec Log Message: * Wed Jul 30 2008 Rex Dieter 1.0.0-3 - Requires: mysql-server Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-9/akonadi.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- akonadi.spec 30 Jul 2008 16:59:22 -0000 1.3 +++ akonadi.spec 30 Jul 2008 19:13:38 -0000 1.4 @@ -1,7 +1,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -18,7 +18,9 @@ BuildRequires: libxslt BuildRequires: shared-mime-info -Requires: qt4-mysql +# when/if akonadi grows support for other backends, consider splitting +# these similar to how phonon is done currently. +Requires: qt4-mysql mysql-server Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -84,6 +86,9 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 30 2008 Rex Dieter 1.0.0-3 +- Requires: mysql-server + * Wed Jul 30 2008 Rex Dieter 1.0.0-2 - BR: mysql-server - Requires: qt-mysql From fedora-extras-commits at redhat.com Wed Jul 30 19:15:00 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 19:15:00 GMT Subject: rpms/akonadi/F-8 akonadi.spec,1.2,1.3 Message-ID: <200807301915.m6UJF0XT011201@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11122 Modified Files: akonadi.spec Log Message: * Wed Jul 30 2008 Rex Dieter 1.0.0-3 - Requires: mysql-server Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/F-8/akonadi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- akonadi.spec 30 Jul 2008 17:00:38 -0000 1.2 +++ akonadi.spec 30 Jul 2008 19:14:30 -0000 1.3 @@ -1,7 +1,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -18,7 +18,9 @@ BuildRequires: libxslt BuildRequires: shared-mime-info -Requires: qt4-mysql +# when/if akonadi grows support for other backends, consider splitting +# these similar to how phonon is done currently. +Requires: qt4-mysql mysql-server Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -84,6 +86,9 @@ %{_libdir}/libakonadi*.so %changelog +* Wed Jul 30 2008 Rex Dieter 1.0.0-3 +- Requires: mysql-server + * Wed Jul 30 2008 Rex Dieter 1.0.0-2 - BR: mysql-server - Requires: qt-mysql From fedora-extras-commits at redhat.com Wed Jul 30 19:16:34 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Jul 2008 19:16:34 GMT Subject: rpms/olpc-utils/OLPC-2 failsafe.py, NONE, 1.1 olpc-utils.spec, 1.41, 1.42 Message-ID: <200807301916.m6UJGYwP011492@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/olpc-utils/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11324 Modified Files: olpc-utils.spec Added Files: failsafe.py Log Message: add script for http://dev.laptop.org/ticket/7591 --- NEW FILE failsafe.py --- #!/usr/bin/env python # -*- coding: latin-1 -*- # # failsafe.py: If the NAND doesn't have enough free space, delete datastore # objects until it does. This doesn't modify the datastore's # index. # Author: Chris Ball import os, sys, statvfs, subprocess, shutil THRESHOLD = 1024 * 20 # 20MB DATASTORE_PATH = "/home/olpc/.sugar/default/datastore/store/*-*" ACTIVITY_PATH = "/home/olpc/Activities/*" def main(): # First, check to see whether we have enough free space. if find_freespace() < THRESHOLD: print "Not enough disk space." # Per Trac #5637, delete orphaned leaks in .sugar/default/data. # This is safe on any build. try: shutil.rmtree("/home/olpc/.sugar/default/data") except OSError: pass if find_freespace() >= THRESHOLD: # The above gained enough free space. return # Okay, we'll have to delete some real data. # Add datastore files to filelist string lines = os.popen("du -s %s" % DATASTORE_PATH).readlines() # Add activities to filelist lines += (os.popen("du -s %s" % ACTIVITY_PATH).readlines()) filesizes = [line.split('\t') for line in lines] for file in filesizes: file[0] = int(file[0]) # size file[1] = file[1].rstrip() # path filesizes.sort() filelist = [file[1] for file in filesizes] # Unfreeze the DCON, print a message. unfreeze_dcon() # The below string is in latin-1, because Unicode isn't present # in the environment when this script runs. string = """ Your disk is nearly full. The system cannot operate with a full disk. To create free space, some of the entries in your Journal will now be deleted. If you wish to avoid having items deleted, power down your XO and bring it to an expert for backup and recovery. Error code: DISKFULL Press any key to delete some Journal entries. Su disco est? casi lleno. El sistema no puede funcionar si el disco est? lleno. Para liberar espacio, se deben borrar algunas entradas de su Diario ahora. Si prefiere no tener que borrar datos, apague su XO y ll?velo a un experto para que haga una copia de seguridad y recuperaci?n de datos. C?digo del error: DISKFULL Pulse cualquier tecla para borrar algunas entradas del Diario. """ key = raw_input(string) # Now, delete files/directories one at a time. while find_freespace() < THRESHOLD and len(filelist) > 0: delete_entry(filelist.pop()) def find_freespace(): # Determine free space on /. stat = os.statvfs("/") freebytes = stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL] freekbytes = freebytes / 1024 return freekbytes def delete_entry(entry): # Delete a single file from the datastore, or an activity directory print "Deleting " + entry try: if os.path.isdir(entry): shutil.rmtree(entry) else: os.remove(entry) except OSError: print "Couldn't delete " + entry def unfreeze_dcon(): # Don't think there's anything useful I can do if this write fails. dcon = open('/sys/class/backlight/dcon-bl/device/freeze', 'w') dcon.write('0') dcon.close() main() Index: olpc-utils.spec =================================================================== RCS file: /cvs/extras/rpms/olpc-utils/OLPC-2/olpc-utils.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- olpc-utils.spec 27 May 2008 10:16:34 -0000 1.41 +++ olpc-utils.spec 30 Jul 2008 19:16:04 -0000 1.42 @@ -1,6 +1,6 @@ Name: olpc-utils Version: 0.74 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary Group: System Environment/Base @@ -13,6 +13,7 @@ # ./autoconf.sh # make dist Source0: olpc-utils-%{version}.tar.bz2 +Source1: http://dev.laptop.org/~cjb/failsafe.py Source100: dot-xsession-example BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +54,10 @@ make install DESTDIR=%{buildroot} install -D -m 0644 %{SOURCE100} $RPM_BUILD_ROOT/etc/skel/.xsession-example +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/rc3.d/ +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/rc3.d/S02diskspacecheck +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/rc5.d/ +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/rc5.d/S02diskspacecheck %post @@ -98,9 +103,14 @@ %{_sysconfdir}/rc.d/init.d/olpc-configure %{_sysconfdir}/udev/rules.d %{_sysconfdir}/skel/.xsession-example +%{_sysconfdir}/rc.d/rc3.d/S02diskspacecheck +%{_sysconfdir}/rc.d/rc5.d/S02diskspacecheck %changelog +* Wed Jul 30 2008 Dennis Gilmore - 0.74-2 +- add clean up script for http://dev.laptop.org/ticket/7591 + * Tue May 27 2008 Sayamindu Dasgupta -0.74-1 - dl#6945: Added workaround for typo in mfg-data for Ethiopian machines. From fedora-extras-commits at redhat.com Wed Jul 30 19:16:51 2008 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 30 Jul 2008 19:16:51 GMT Subject: rpms/bacula/F-9 bacula.spec,1.6,1.7 Message-ID: <200807301916.m6UJGpM8011557@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/pkgs/rpms/bacula/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/F-9 Modified Files: bacula.spec Log Message: * Wed Jul 30 2008 Andreas Thienemann - 2.2.8-2 - Fixed %{fedora} comparision, making bacula-sqlite build on rawhide Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bacula.spec 8 Jan 2008 01:25:20 -0000 1.6 +++ bacula.spec 30 Jul 2008 19:16:20 -0000 1.7 @@ -407,7 +407,7 @@ pushd bacula-sqlite %if 0%{?fedora}%{?rhel} %if 0%{?fedora} - %if "%{fedora}" >= "5" + %if 0%{fedora} >= 5 %define sqlite_suffix 3 build --with-sqlite3 %else @@ -415,7 +415,7 @@ %endif %endif %if 0%{?rhel} - %if "%{rhel}" >= "5" + %if 0%{rhel} >= 5 %define sqlite_suffix 3 build --with-sqlite3 %else From fedora-extras-commits at redhat.com Wed Jul 30 19:16:50 2008 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 30 Jul 2008 19:16:50 GMT Subject: rpms/bacula/F-8 bacula.spec,1.7,1.8 Message-ID: <200807301916.m6UJGo94011554@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/pkgs/rpms/bacula/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/F-8 Modified Files: bacula.spec Log Message: * Wed Jul 30 2008 Andreas Thienemann - 2.2.8-2 - Fixed %{fedora} comparision, making bacula-sqlite build on rawhide Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-8/bacula.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bacula.spec 30 Jul 2008 14:06:23 -0000 1.7 +++ bacula.spec 30 Jul 2008 19:16:20 -0000 1.8 @@ -403,7 +403,7 @@ pushd bacula-sqlite %if 0%{?fedora}%{?rhel} %if 0%{?fedora} - %if "%{fedora}" >= "5" + %if 0%{fedora} >= 5 %define sqlite_suffix 3 build --with-sqlite3 %else @@ -411,7 +411,7 @@ %endif %endif %if 0%{?rhel} - %if "%{rhel}" >= "5" + %if 0%{rhel} >= 5 %define sqlite_suffix 3 build --with-sqlite3 %else From fedora-extras-commits at redhat.com Wed Jul 30 19:16:51 2008 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 30 Jul 2008 19:16:51 GMT Subject: rpms/bacula/devel bacula.spec,1.9,1.10 Message-ID: <200807301916.m6UJGpKb011560@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/pkgs/rpms/bacula/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11407/devel Modified Files: bacula.spec Log Message: * Wed Jul 30 2008 Andreas Thienemann - 2.2.8-2 - Fixed %{fedora} comparision, making bacula-sqlite build on rawhide Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bacula.spec 30 Jul 2008 14:18:55 -0000 1.9 +++ bacula.spec 30 Jul 2008 19:16:21 -0000 1.10 @@ -9,7 +9,7 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula Version: 2.2.8 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE for details License: GPLv2 with exceptions Group: System Environment/Daemons @@ -405,7 +405,7 @@ pushd bacula-sqlite %if 0%{?fedora}%{?rhel} %if 0%{?fedora} - %if "%{fedora}" >= "5" + %if 0%{fedora} >= 5 %define sqlite_suffix 3 build --with-sqlite3 %else @@ -413,7 +413,7 @@ %endif %endif %if 0%{?rhel} - %if "%{rhel}" >= "5" + %if 0%{rhel} >= 5 %define sqlite_suffix 3 build --with-sqlite3 %else @@ -922,6 +922,9 @@ %changelog +* Wed Jul 30 2008 Andreas Thienemann - 2.2.8-2 +- Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide + * Fri Jul 25 2008 Jon Ciesla - 2.2.8-1 - Update to 2.2.8. BZ 446461. - Dropped director and storage DB-server hard Reqs. BZ 426788. From fedora-extras-commits at redhat.com Wed Jul 30 19:29:54 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 19:29:54 GMT Subject: rpms/maxima/devel maxima.spec,1.108,1.109 Message-ID: <200807301929.m6UJTskL012274@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12237 Modified Files: maxima.spec Log Message: workarounds for new rpm Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- maxima.spec 30 Jul 2008 14:53:26 -0000 1.108 +++ maxima.spec 30 Jul 2008 19:29:23 -0000 1.109 @@ -60,13 +60,13 @@ %define _enable_sbcl --enable-sbcl %endif -%if "%{?_enable_cmucl}" == "%{nil}" +%if "x%{?_enable_cmucl}" == "x%{nil}" Obsoletes: %{name}-runtime-cmucl < %{version}-%{release} %endif -%if "%{?_enable_gcl}" == "%{nil}" +%if "x%{?_enable_gcl}" == "x%{nil}" Obsoletes: %{name}-runtime-gcl < %{version}-%{release} %endif -%if "%{?_enable_sbcl}" == "%{nil}" +%if "x%{?_enable_sbcl}" == "x%{nil}" Obsoletes: %{name}-runtime-sbcl < %{version}-%{release} %endif From fedora-extras-commits at redhat.com Wed Jul 30 19:37:27 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 30 Jul 2008 19:37:27 GMT Subject: rpms/ipsec-tools/devel ipsec-tools-0.7.1-loopback.patch,1.2,1.3 Message-ID: <200807301937.m6UJbRs9012705@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/ipsec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12633 Modified Files: ipsec-tools-0.7.1-loopback.patch Log Message: - Update the patch to new api ipsec-tools-0.7.1-loopback.patch: Index: ipsec-tools-0.7.1-loopback.patch =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools-0.7.1-loopback.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ipsec-tools-0.7.1-loopback.patch 30 Jul 2008 18:51:56 -0000 1.2 +++ ipsec-tools-0.7.1-loopback.patch 30 Jul 2008 19:36:57 -0000 1.3 @@ -1,6 +1,6 @@ diff -up ipsec-tools-0.7.1/configure.ac.loopback ipsec-tools-0.7.1/configure.ac --- ipsec-tools-0.7.1/configure.ac.loopback 2008-07-22 15:53:46.000000000 +0200 -+++ ipsec-tools-0.7.1/configure.ac 2008-07-30 20:00:21.000000000 +0200 ++++ ipsec-tools-0.7.1/configure.ac 2008-07-30 21:14:30.000000000 +0200 @@ -794,6 +794,27 @@ if test "$enable_security_context" = "ye fi fi @@ -30,8 +30,8 @@ CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" diff -up ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback ipsec-tools-0.7.1/src/racoon/pfkey.c ---- ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback 2008-07-30 19:59:10.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/pfkey.c 2008-07-30 20:34:11.000000000 +0200 +--- ipsec-tools-0.7.1/src/racoon/pfkey.c.loopback 2008-07-30 21:14:30.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/pfkey.c 2008-07-30 21:33:20.000000000 +0200 @@ -99,6 +99,7 @@ #include "nattraversal.h" #include "crypto_openssl.h" @@ -40,7 +40,7 @@ #if defined(SADB_X_EALG_RIJNDAELCBC) && !defined(SADB_X_EALG_AESCBC) #define SADB_X_EALG_AESCBC SADB_X_EALG_RIJNDAELCBC -@@ -972,6 +973,45 @@ pk_recvgetspi(mhp) +@@ -972,6 +973,56 @@ pk_recvgetspi(mhp) return -1; } @@ -51,6 +51,7 @@ + + src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]); + if (cmpsaddrstrict(src, dst) == 0) { ++ struct pfkey_send_sa_args sa_args; + /* yep, this is loopback. install SA */ + satype = ipsecdoi2pfkey_proto(iph2->proposal->head->proto_id); + if (satype == ~0) { @@ -63,14 +64,24 @@ + reqid = iph2->proposal->head->reqid_in; + + iph2->status = PHASE2ST_ADDSA; -+ if (pfkey_send_update(lcconf->sock_pfkey, satype, -+ IPSEC_MODE_TRANSPORT, src, dst, sa->sadb_sa_spi, -+ reqid, 0, NULL, SADB_EALG_NULL, 0, SADB_AALG_NONE, -+ 0, 0, 0, 0, iph2->proposal->lifetime, 0, -+ iph2->seq, iph2->proposal->sctx.ctx_doi, -+ iph2->proposal->sctx.ctx_alg, -+ iph2->proposal->sctx.ctx_str, -+ iph2->proposal->sctx.ctx_strlen) < 0) { ++ ++ memset (&sa_args, 0, sizeof (sa_args)); ++ sa_args.so = lcconf->sock_pfkey; ++ sa_args.satype = satype; ++ sa_args.mode = IPSEC_MODE_TRANSPORT; ++ sa_args.src = src; ++ sa_args.dst = dst; ++ sa_args.spi = sa->sadb_sa_spi; ++ sa_args.reqid = reqid; ++ sa_args.e_type = SADB_EALG_NULL; ++ sa_args.a_type = SADB_AALG_NONE; ++ sa_args.l_addtime = iph2->proposal->lifetime; ++ sa_args.seq = iph2->seq; ++ sa_args.ctxdoi = iph2->proposal->sctx.ctx_doi; ++ sa_args.ctxalg = iph2->proposal->sctx.ctx_alg; ++ sa_args.ctxstr = iph2->proposal->sctx.ctx_str; ++ sa_args.ctxstrlen = iph2->proposal->sctx.ctx_strlen; ++ if (pfkey_send_update2(&sa_args) < 0) { + plog(LLV_ERROR, LOCATION, NULL, + "failed to update loopback SA: %s\n", + ipsec_strerror()); @@ -86,7 +97,7 @@ /* set SPI, and check to get all spi whether or not */ allspiok = 1; notfound = 1; -@@ -1222,6 +1262,26 @@ pk_recvupdate(mhp) +@@ -1222,6 +1273,26 @@ pk_recvupdate(mhp) return -1; } @@ -113,7 +124,7 @@ /* check to complete all keys ? */ for (pr = iph2->approval->head; pr != NULL; pr = pr->next) { proto_id = pfkey2ipsecdoi_proto(msg->sadb_msg_satype); -@@ -1264,11 +1324,6 @@ pk_recvupdate(mhp) +@@ -1264,11 +1335,6 @@ pk_recvupdate(mhp) /* turn off the timer for calling pfkey_timeover() */ SCHED_KILL(iph2->sce); @@ -125,7 +136,7 @@ #ifdef ENABLE_STATS gettimeofday(&iph2->end, NULL); syslog(LOG_NOTICE, "%s(%s): %8.6f", -@@ -1657,6 +1712,7 @@ pk_recvacquire(mhp) +@@ -1657,6 +1723,7 @@ pk_recvacquire(mhp) struct sadb_x_sec_ctx *m_sec_ctx; #endif /* HAVE_SECCTX */ struct policyindex spidx; @@ -133,7 +144,7 @@ /* ignore this message because of local test mode. */ -@@ -1681,6 +1737,12 @@ pk_recvacquire(mhp) +@@ -1681,6 +1748,12 @@ pk_recvacquire(mhp) m_sec_ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX]; if (m_sec_ctx != NULL) { @@ -146,7 +157,7 @@ plog(LLV_INFO, LOCATION, NULL, "security context doi: %u\n", m_sec_ctx->sadb_x_ctx_doi); plog(LLV_INFO, LOCATION, NULL, -@@ -1730,7 +1792,6 @@ pk_recvacquire(mhp) +@@ -1730,7 +1803,6 @@ pk_recvacquire(mhp) */ struct sockaddr *sa = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]); struct myaddrs *p; @@ -154,7 +165,7 @@ for (p = lcconf->myaddrs; p; p = p->next) { if (!cmpsaddrwop(p->addr, sa)) { do_listen = 1; -@@ -1853,6 +1914,73 @@ pk_recvacquire(mhp) +@@ -1853,6 +1925,73 @@ pk_recvacquire(mhp) plog(LLV_DEBUG, LOCATION, NULL, "new acquire %s\n", spidx2str(&sp_out->spidx)); @@ -230,7 +241,7 @@ vchar_t *idsrc, *iddst; diff -up ipsec-tools-0.7.1/src/racoon/Makefile.am.loopback ipsec-tools-0.7.1/src/racoon/Makefile.am --- ipsec-tools-0.7.1/src/racoon/Makefile.am.loopback 2008-07-23 15:54:16.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/Makefile.am 2008-07-30 20:25:07.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/Makefile.am 2008-07-30 21:14:30.000000000 +0200 @@ -39,7 +39,7 @@ racoon_SOURCES = \ EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c throttle.c \ isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS) @@ -242,7 +253,7 @@ vmbuf.o sockmisc.o misc.o diff -up ipsec-tools-0.7.1/src/racoon/policy.h.loopback ipsec-tools-0.7.1/src/racoon/policy.h --- ipsec-tools-0.7.1/src/racoon/policy.h.loopback 2007-06-07 22:34:19.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/policy.h 2008-07-30 20:27:48.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/policy.h 2008-07-30 21:14:30.000000000 +0200 @@ -38,7 +38,12 @@ @@ -269,7 +280,7 @@ extern int get_security_context __P((vchar_t *, struct policyindex *)); diff -up ipsec-tools-0.7.1/src/racoon/main.c.loopback ipsec-tools-0.7.1/src/racoon/main.c --- ipsec-tools-0.7.1/src/racoon/main.c.loopback 2007-06-07 22:34:18.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/main.c 2008-07-30 20:31:07.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/main.c 2008-07-30 21:14:30.000000000 +0200 @@ -169,6 +169,9 @@ main(ac, av) #ifdef HAVE_SECCTX init_avc(); @@ -281,8 +292,8 @@ initlcconf(); initrmconf(); diff -up ipsec-tools-0.7.1/src/racoon/handler.h.loopback ipsec-tools-0.7.1/src/racoon/handler.h ---- ipsec-tools-0.7.1/src/racoon/handler.h.loopback 2008-07-30 19:59:10.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/handler.h 2008-07-30 20:29:25.000000000 +0200 +--- ipsec-tools-0.7.1/src/racoon/handler.h.loopback 2008-07-30 21:14:30.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/handler.h 2008-07-30 21:14:30.000000000 +0200 @@ -286,6 +286,7 @@ struct ph2handle { u_int32_t msgid; /* msgid for phase 2 */ @@ -293,7 +304,7 @@ struct saprop *proposal; /* SA(s) proposal. */ diff -up ipsec-tools-0.7.1/src/racoon/security.c.loopback ipsec-tools-0.7.1/src/racoon/security.c --- ipsec-tools-0.7.1/src/racoon/security.c.loopback 2007-06-07 22:34:19.000000000 +0200 -+++ ipsec-tools-0.7.1/src/racoon/security.c 2008-07-30 20:00:34.000000000 +0200 ++++ ipsec-tools-0.7.1/src/racoon/security.c 2008-07-30 21:14:30.000000000 +0200 @@ -55,6 +55,60 @@ #include "proposal.h" #include "strnames.h" From fedora-extras-commits at redhat.com Wed Jul 30 19:41:42 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 30 Jul 2008 19:41:42 GMT Subject: rpms/galculator/F-8 .cvsignore, 1.5, 1.6 galculator.spec, 1.13, 1.14 sources, 1.5, 1.6 galculator-1.2.5.2-color-to-string.patch, 1.1, NONE Message-ID: <200807301941.m6UJfgTF013027@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/galculator/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12976 Modified Files: .cvsignore galculator.spec sources Removed Files: galculator-1.2.5.2-color-to-string.patch Log Message: * Wed Jun 4 2008 Tomas Mraz - 1.3.1-1 - upgrade to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/galculator/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Aug 2007 08:23:17 -0000 1.5 +++ .cvsignore 30 Jul 2008 19:41:11 -0000 1.6 @@ -1 +1 @@ -galculator-1.2.5.2.tar.bz2 +galculator-1.3.1.tar.bz2 Index: galculator.spec =================================================================== RCS file: /cvs/pkgs/rpms/galculator/F-8/galculator.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- galculator.spec 21 Aug 2007 19:14:56 -0000 1.13 +++ galculator.spec 30 Jul 2008 19:41:12 -0000 1.14 @@ -1,13 +1,12 @@ Name: galculator -Version: 1.2.5.2 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: GTK 2 based scientific calculator Group: Applications/Engineering License: GPLv2+ URL: http://galculator.sourceforge.net/ Source0: http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2 -Patch1: galculator-1.2.5.2-color-to-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,7 +23,6 @@ %prep %setup -q -%patch1 -p1 -b .color %build %configure @@ -52,10 +50,17 @@ %attr(0755,root,root) %{_bindir}/galculator %{_datadir}/applications/fedora-galculator.desktop %{_datadir}/galculator/ +%{_datadir}/pixmaps/galculator/ %{_mandir}/man1/%{name}.1* %changelog +* Wed Jun 4 2008 Tomas Mraz - 1.3.1-1 +- upgrade to latest upstream + +* Wed Feb 20 2008 Fedora Release Engineering - 1.2.5.2-3 +- Autorebuild for GCC 4.3 + * Tue Aug 21 2007 Tomas Mraz - 1.2.5.2-2 - rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/galculator/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Aug 2007 08:23:17 -0000 1.5 +++ sources 30 Jul 2008 19:41:12 -0000 1.6 @@ -1 +1 @@ -de1cb7d75c76e4fd9f05f100f303d0a2 galculator-1.2.5.2.tar.bz2 +683a4f0c2cb3d1f56b4c5610fc495c5f galculator-1.3.1.tar.bz2 --- galculator-1.2.5.2-color-to-string.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 19:54:55 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 30 Jul 2008 19:54:55 GMT Subject: rpms/galculator/F-9 .cvsignore, 1.5, 1.6 galculator.spec, 1.14, 1.15 sources, 1.5, 1.6 galculator-1.2.5.2-color-to-string.patch, 1.1, NONE Message-ID: <200807301954.m6UJst9U013770@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/galculator/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13723 Modified Files: .cvsignore galculator.spec sources Removed Files: galculator-1.2.5.2-color-to-string.patch Log Message: * Wed Jun 4 2008 Tomas Mraz - 1.3.1-1 - upgrade to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/galculator/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Aug 2007 08:23:17 -0000 1.5 +++ .cvsignore 30 Jul 2008 19:54:24 -0000 1.6 @@ -1 +1 @@ -galculator-1.2.5.2.tar.bz2 +galculator-1.3.1.tar.bz2 Index: galculator.spec =================================================================== RCS file: /cvs/pkgs/rpms/galculator/F-9/galculator.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- galculator.spec 20 Feb 2008 05:34:28 -0000 1.14 +++ galculator.spec 30 Jul 2008 19:54:24 -0000 1.15 @@ -1,13 +1,12 @@ Name: galculator -Version: 1.2.5.2 -Release: 3%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: GTK 2 based scientific calculator Group: Applications/Engineering License: GPLv2+ URL: http://galculator.sourceforge.net/ Source0: http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2 -Patch1: galculator-1.2.5.2-color-to-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,7 +23,6 @@ %prep %setup -q -%patch1 -p1 -b .color %build %configure @@ -52,10 +50,14 @@ %attr(0755,root,root) %{_bindir}/galculator %{_datadir}/applications/fedora-galculator.desktop %{_datadir}/galculator/ +%{_datadir}/pixmaps/galculator/ %{_mandir}/man1/%{name}.1* %changelog +* Wed Jun 4 2008 Tomas Mraz - 1.3.1-1 +- upgrade to latest upstream + * Wed Feb 20 2008 Fedora Release Engineering - 1.2.5.2-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/galculator/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Aug 2007 08:23:17 -0000 1.5 +++ sources 30 Jul 2008 19:54:24 -0000 1.6 @@ -1 +1 @@ -de1cb7d75c76e4fd9f05f100f303d0a2 galculator-1.2.5.2.tar.bz2 +683a4f0c2cb3d1f56b4c5610fc495c5f galculator-1.3.1.tar.bz2 --- galculator-1.2.5.2-color-to-string.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 19:59:17 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 30 Jul 2008 19:59:17 GMT Subject: rpms/ipsec-tools/devel ipsec-tools-0.7.1-loopback.patch,1.3,1.4 Message-ID: <200807301959.m6UJxHF3014058@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/ipsec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13989 Modified Files: ipsec-tools-0.7.1-loopback.patch Log Message: - Needed for PATH_MAX ipsec-tools-0.7.1-loopback.patch: Index: ipsec-tools-0.7.1-loopback.patch =================================================================== RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools-0.7.1-loopback.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ipsec-tools-0.7.1-loopback.patch 30 Jul 2008 19:36:57 -0000 1.3 +++ ipsec-tools-0.7.1-loopback.patch 30 Jul 2008 19:58:47 -0000 1.4 @@ -305,12 +305,13 @@ diff -up ipsec-tools-0.7.1/src/racoon/security.c.loopback ipsec-tools-0.7.1/src/racoon/security.c --- ipsec-tools-0.7.1/src/racoon/security.c.loopback 2007-06-07 22:34:19.000000000 +0200 +++ ipsec-tools-0.7.1/src/racoon/security.c 2008-07-30 21:14:30.000000000 +0200 -@@ -55,6 +55,60 @@ +@@ -55,6 +55,61 @@ #include "proposal.h" #include "strnames.h" #include "handler.h" +#ifdef HAVE_LIBAUDIT +#include ++#include +#include "libaudit.h" +#endif + From fedora-extras-commits at redhat.com Wed Jul 30 20:00:55 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 30 Jul 2008 20:00:55 GMT Subject: rpms/kernel/devel patch-2.6.27-rc1-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.884, 1.885 config-ia64-generic, 1.15, 1.16 config-x86_64-generic, 1.45, 1.46 kernel.spec, 1.825, 1.826 sources, 1.846, 1.847 upstream, 1.762, 1.763 Message-ID: <200807302000.m6UK0tjE014233@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14123 Modified Files: .cvsignore config-ia64-generic config-x86_64-generic kernel.spec sources upstream Added Files: patch-2.6.27-rc1-git1.bz2.sign Log Message: 2.6.27-rc1-git1 --- NEW FILE patch-2.6.27-rc1-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIkLqsyGugalF9Dw4RAumgAJ9eKhBWJQt+lVl22vj6W0I38mMakgCeKw7c 1MGkAqbc5ufD0s6qarA0iJ0= =ssz8 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.884 retrieving revision 1.885 diff -u -r1.884 -r1.885 --- .cvsignore 29 Jul 2008 04:16:47 -0000 1.884 +++ .cvsignore 30 Jul 2008 20:00:25 -0000 1.885 @@ -6,3 +6,4 @@ linux-2.6.26.tar.bz2 patch-2.6.26-git18.bz2 patch-2.6.27-rc1.bz2 +patch-2.6.27-rc1-git1.bz2 Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- config-ia64-generic 24 Jul 2008 08:28:26 -0000 1.15 +++ config-ia64-generic 30 Jul 2008 20:00:25 -0000 1.16 @@ -104,6 +104,17 @@ # CONFIG_SGI_SNSC=y CONFIG_IA64_SGI_SN_XP=y +CONFIG_SGI_TIOCX=y +CONFIG_SGI_MBCS=m +CONFIG_SGI_IOC3=m +CONFIG_SGI_IOC4=y +CONFIG_SGI_XP=m +CONFIG_SGI_GRU=m +# CONFIG_SGI_GRU_DEBUG is not set +CONFIG_SERIAL_SGI_L1_CONSOLE=y +CONFIG_SERIAL_SGI_IOC3=m +CONFIG_SERIAL_SGI_IOC4=m + # # SCSI low-level drivers @@ -135,7 +146,6 @@ CONFIG_ACPI_VIDEO=m # CONFIG_ACPI_PROC_EVENT is not set -CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_PM=y CONFIG_HOTPLUG_PCI=y # CONFIG_HPET is not set @@ -145,8 +155,6 @@ CONFIG_PNPACPI=y CONFIG_SCHED_SMT=y -CONFIG_SGI_TIOCX=y -CONFIG_SGI_MBCS=m CONFIG_ARCH_DISCONTIGMEM_ENABLE=y @@ -165,11 +173,6 @@ # CONFIG_CRASH is not set -CONFIG_SERIAL_SGI_IOC3=m -CONFIG_SGI_IOC3=m -CONFIG_SERIAL_SGI_IOC4=m -CONFIG_SGI_IOC4=y - # CONFIG_PERMIT_BSP_REMOVE is not set # CONFIG_FORCE_CPEI_RETARGET is not set @@ -197,7 +200,6 @@ CONFIG_FRAME_WARN=2048 CONFIG_VIRT_CPU_ACCOUNTING=y -CONFIG_SGI_XP=m CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- config-x86_64-generic 26 Jul 2008 03:47:28 -0000 1.45 +++ config-x86_64-generic 30 Jul 2008 20:00:25 -0000 1.46 @@ -220,7 +220,9 @@ # CONFIG_CC_STACKPROTECTOR_ALL is not set CONFIG_SGI_IOC4=m -# CONFIG_SGI_IOC4 is not set +CONFIG_SGI_XP=m +CONFIG_SGI_GRU=m +# CONFIG_SGI_GRU_DEBUG is not set # CONFIG_SMSC37B787_WDT is not set CONFIG_W83697HF_WDT=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.825 retrieving revision 1.826 diff -u -r1.825 -r1.826 --- kernel.spec 30 Jul 2008 18:55:59 -0000 1.825 +++ kernel.spec 30 Jul 2008 20:00:25 -0000 1.826 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1092,7 +1092,7 @@ ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch # wireless patches headed for 2.6.27 -ApplyPatch linux-2.6-wireless.patch +#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.28 #ApplyPatch linux-2.6-wireless-pending.patch @@ -1710,6 +1710,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Wed Jul 30 2008 Dave Jones +- 2.6.27-rc1-git1 + * Wed Jul 30 2008 John W. Linville - Upstream wireless fixes from 2008-07-29 (http://marc.info/?l=linux-wireless&m=121737750023195&w=2) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.846 retrieving revision 1.847 diff -u -r1.846 -r1.847 --- sources 29 Jul 2008 04:37:53 -0000 1.846 +++ sources 30 Jul 2008 20:00:25 -0000 1.847 @@ -1,2 +1,3 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 948b25bab0082d1db5bd8c9fac824891 patch-2.6.27-rc1.bz2 +e83a1a400d3089c38da7c409b33eee87 patch-2.6.27-rc1-git1.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.762 retrieving revision 1.763 diff -u -r1.762 -r1.763 --- upstream 29 Jul 2008 04:16:47 -0000 1.762 +++ upstream 30 Jul 2008 20:00:25 -0000 1.763 @@ -1,2 +1,3 @@ linux-2.6.26.tar.bz2 patch-2.6.27-rc1.bz2 +patch-2.6.27-rc1-git1.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 20:02:45 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Wed, 30 Jul 2008 20:02:45 GMT Subject: rpms/gnome-session/devel gnome-session.spec, 1.178, 1.179 sources, 1.63, 1.64 Message-ID: <200807302002.m6UK2jqf021055@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20934 Modified Files: gnome-session.spec sources Log Message: - New snapshot from DBus branch Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- gnome-session.spec 30 Jul 2008 02:41:54 -0000 1.178 +++ gnome-session.spec 30 Jul 2008 20:02:15 -0000 1.179 @@ -12,7 +12,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.23.6 -Release: 0.2008.07.29.1%{?dist} +Release: 0.2008.07.30.1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -175,6 +175,9 @@ %changelog +* Wed Jul 30 2008 Jon McCann - 2.23.6.0.2008.07.30.1 +- New snapshot from DBus branch + * Mon Jul 29 2008 Jon McCann - 2.23.6.0.2008.07.29.1 - New snapshot from DBus branch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 30 Jul 2008 02:41:54 -0000 1.63 +++ sources 30 Jul 2008 20:02:15 -0000 1.64 @@ -1 +1 @@ -f97021945fd5e262ff05b15093f4065b gnome-session-2.23.6.tar.bz2 +3c4e3fe4352d728ffe482b3fc052517c gnome-session-2.23.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 20:05:45 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 20:05:45 GMT Subject: rpms/maxima/devel maxima.spec,1.109,1.110 Message-ID: <200807302005.m6UK5jBW021251@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21188 Modified Files: maxima.spec Log Message: more rpm workarounds Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- maxima.spec 30 Jul 2008 19:29:23 -0000 1.109 +++ maxima.spec 30 Jul 2008 20:05:14 -0000 1.110 @@ -141,7 +141,7 @@ %description src %{name} lisp source code. -%if "%{?_enable_clisp:1}" == "1" +%if "x%{?_enable_clisp:1}" == "x1" # to workaround mysterious(?) "cpio: MD5 sum mismatch" errors when installing this subpkg %define __prelink_undo_cmd %{nil} #define _with_clisp_runtime --with-clisp-runtime=%{_libdir}/clisp/base/lisp.run @@ -157,7 +157,7 @@ Maxima compiled with Common Lisp (clisp) %endif -%if "%{?_enable_cmucl:1}" == "1" +%if "x%{?_enable_cmucl:1}" == "x1" %define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp %package runtime-cmucl Summary: Maxima compiled with CMUCL @@ -170,7 +170,7 @@ Maxima compiled with CMU Common Lisp (cmucl) %endif -%if "%{?_enable_gcl:1}" == "1" +%if "x%{?_enable_gcl:1}" == "x1" %package runtime-gcl Summary: Maxima compiled with GCL Group: Applications/Engineering @@ -189,7 +189,7 @@ Maxima compiled with Gnu Common Lisp (gcl) %endif -%if "%{?_enable_sbcl:1}" == "1" +%if "x%{?_enable_sbcl:1}" == "x1" %package runtime-sbcl Summary: Maxima compiled with SBCL Group: Applications/Engineering @@ -415,25 +415,25 @@ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/*/* -%if "%{?_enable_clisp:1}" == "1" +%if "x%{?_enable_clisp:1}" == "x1" %files runtime-clisp %defattr(-,root,root,-) %{_libdir}/maxima/%{maxima_ver}/binary-clisp %endif -%if "%{?_enable_cmucl:1}" == "1" +%if "x%{?_enable_cmucl:1}" == "x1" %files runtime-cmucl %defattr(-,root,root,-) %{_libdir}/maxima/%{maxima_ver}/binary-cmucl %endif -%if "%{?_enable_gcl:1}" == "1" +%if "x%{?_enable_gcl:1}" == "x1" %files runtime-gcl %defattr(-,root,root,-) %{_libdir}/maxima/%{maxima_ver}/binary-gcl %endif -%if "%{?_enable_sbcl:1}" == "1" +%if "x%{?_enable_sbcl:1}" == "x1" %files runtime-sbcl %defattr(-,root,root,-) %{_libdir}/maxima/%{maxima_ver}/binary-sbcl From fedora-extras-commits at redhat.com Wed Jul 30 20:19:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 30 Jul 2008 20:19:58 GMT Subject: rpms/maxima/devel maxima.spec,1.110,1.111 Message-ID: <200807302019.m6UKJwqU022223@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22178 Modified Files: maxima.spec Log Message: workaround Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- maxima.spec 30 Jul 2008 20:05:14 -0000 1.110 +++ maxima.spec 30 Jul 2008 20:19:27 -0000 1.111 @@ -197,7 +197,7 @@ # maxima requires the *same* (or very similar) version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) -%if "%{?sbcl_ver}" >= "1.0" +%if 0%{?sbcl_ver} >= 1.0 Requires: sbcl = %{sbcl_ver} %endif Requires: %{name} = %{version} From fedora-extras-commits at redhat.com Wed Jul 30 20:22:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:22:09 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchcommits Message-ID: <20080730202210.A8B731AD0EF@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchcommits acl on ldapvi (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:21:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:21:54 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchbugzilla Message-ID: <20080730202155.679381AD11D@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchbugzilla acl on ldapvi (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:21:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:21:56 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchcommits Message-ID: <20080730202158.0F7BD1AD127@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchcommits acl on ldapvi (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:22:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:22:09 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchcommits Message-ID: <20080730202211.D1D561AD10D@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchcommits acl on ldapvi (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:22:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:22:05 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchbugzilla Message-ID: <20080730202212.0B8081AD113@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchbugzilla acl on ldapvi (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:22:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:22:22 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchcommits Message-ID: <20080730202224.E67501AD0F7@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchcommits acl on ldapvi (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:22:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:22:14 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchbugzilla Message-ID: <20080730202220.76EA11AD13D@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchbugzilla acl on ldapvi (Fedora 6) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:22:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:22:19 +0000 Subject: [pkgdb] ldapvi: tibbs has given up watchbugzilla Message-ID: <20080730202225.3C7221AD119@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchbugzilla acl on ldapvi (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi From fedora-extras-commits at redhat.com Wed Jul 30 20:23:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:23:21 +0000 Subject: [pkgdb] libp11: tibbs has given up watchcommits Message-ID: <20080730202324.E13531AD15C@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchcommits acl on libp11 (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libp11 From fedora-extras-commits at redhat.com Wed Jul 30 20:23:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:23:29 +0000 Subject: [pkgdb] libp11: tibbs has given up watchcommits Message-ID: <20080730202332.543981AD10F@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchcommits acl on libp11 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libp11 From fedora-extras-commits at redhat.com Wed Jul 30 20:23:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:23:22 +0000 Subject: [pkgdb] libp11: tibbs has given up watchbugzilla Message-ID: <20080730202324.3D7921AD118@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchbugzilla acl on libp11 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libp11 From fedora-extras-commits at redhat.com Wed Jul 30 20:23:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 20:23:28 +0000 Subject: [pkgdb] libp11: tibbs has given up watchbugzilla Message-ID: <20080730202331.50BCA1AD16D@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) has given up the watchbugzilla acl on libp11 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libp11 From fedora-extras-commits at redhat.com Wed Jul 30 20:34:43 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 30 Jul 2008 20:34:43 GMT Subject: rpms/kernel/F-9 kernel.spec, 1.722, 1.723 linux-2.6-wireless-pending.patch, 1.59, 1.60 Message-ID: <200807302034.m6UKYh0U023052@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22992 Modified Files: kernel.spec linux-2.6-wireless-pending.patch Log Message: Upstream wireless fixes from 2008-07-29 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.722 retrieving revision 1.723 diff -u -r1.722 -r1.723 --- kernel.spec 28 Jul 2008 19:09:42 -0000 1.722 +++ kernel.spec 30 Jul 2008 20:34:12 -0000 1.723 @@ -1883,6 +1883,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Jul 30 2008 John W. Linville 2.6.25.13-104 +- Upstream wireless fixes from 2008-07-29 + (http://marc.info/?l=linux-wireless&m=121737750023195&w=2) + * Mon Jul 28 2008 Kyle McMartin 2.6.25.13-103 - Linux 2.6.25.13 linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.59 -r 1.60 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- linux-2.6-wireless-pending.patch 16 Jul 2008 16:30:23 -0000 1.59 +++ linux-2.6-wireless-pending.patch 30 Jul 2008 20:34:12 -0000 1.60 @@ -1,3 +1,816 @@ +commit 56a6d13dfd49d90d72a1a962246206719dd9d143 +Author: Luis Carlos Cobo +Date: Tue Jul 29 19:59:31 2008 +0200 + + mac80211: fix mesh beaconing + + This patch fixes mesh beaconing, which was broken by "mac80211: revamp + beacon configuration". + + Signed-off-by: Luis Carlos Cobo + Signed-off-by: John W. Linville + +commit 77bbadd5ea893f364a0d1879723037678a03725c +Author: Vegard Nossum +Date: Tue Jul 29 13:31:47 2008 +0200 + + PS3: gelic: use unsigned long for irqflags + + The semantic patch I used was this: + + @@ + expression lock; + identifier flags; + expression subclass; + @@ + + - unsigned int flags; + + unsigned long flags; + + ... + + <+... + + ( + spin_lock_irqsave(lock, flags) + | + _spin_lock_irqsave(lock) + | + spin_unlock_irqrestore(lock, flags) + | + _spin_unlock_irqrestore(lock, flags) + | + read_lock_irqsave(lock, flags) + | + _read_lock_irqsave(lock) + | + read_unlock_irqrestore(lock, flags) + | + _read_unlock_irqrestore(lock, flags) + | + write_lock_irqsave(lock, flags) + | + _write_lock_irqsave(lock) + | + write_unlock_irqrestore(lock, flags) + | + _write_unlock_irqrestore(lock, flags) + | + spin_lock_irqsave_nested(lock, flags, subclass) + | + _spin_lock_irqsave_nested(lock, subclass) + | + spin_unlock_irqrestore(lock, flags) + | + _spin_unlock_irqrestore(lock, flags) + | + _raw_spin_lock_flags(lock, flags) + | + __raw_spin_lock_flags(lock, flags) + ) + + ...+> + + This patch was generated using the Coccinelle framework. + + Cc: Masakazu Mokuno + Cc: Julia Lawall + Cc: Alexey Dobriyan + Signed-off-by: Vegard Nossum + Signed-off-by: John W. Linville + +commit 14db74bcc3f7a779cf395a47e26b06a28207571a +Author: Johannes Berg +Date: Tue Jul 29 13:22:52 2008 +0200 + + mac80211: fix cfg80211 hooks for master interface + + The master interface is a virtual interface that is registered + to mac80211, changing that does not seem like a good idea at + the moment. However, since it has no sdata, we cannot accept + any configuration for it. This patch makes the cfg80211 hooks + reject any such attempt. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit bba95fefb8e31f4799652666d05a4a9aad56e492 +Author: Johannes Berg +Date: Tue Jul 29 13:22:51 2008 +0200 + + nl80211: fix dump callbacks + + Julius Volz pointed out that the dump callbacks in nl80211 were + broken and fixed one of them. This patch fixes the other three + and also addresses the TODOs there. + + Signed-off-by: Johannes Berg + Cc: Julius Volz + Cc: Thomas Graf + Signed-off-by: John W. Linville + +commit d0f09804144fd9471a13cf4d80e66842c7fa114f +Author: Johannes Berg +Date: Tue Jul 29 11:32:07 2008 +0200 + + mac80211: partially fix skb->cb use + + This patch fixes mac80211 to not use the skb->cb over the queue step + from virtual interfaces to the master. The patch also, for now, + disables aggregation because that would still require requeuing, + will fix that in a separate patch. There are two other places (software + requeue and powersaving stations) where requeue can happen, but that is + not currently used by any drivers/not possible to use respectively. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 0ccd58fc03f40529f66190b1a41e92a732d2bda8 +Author: Larry Finger +Date: Mon Jul 28 22:25:08 2008 -0500 + + rtl8187: Improve wireless statistics for RTL8187B + + Wireless statistics produced by the RTL8187B driver are not particularly + informative about the strength of the received signal. From the data sheet + provided by Realtek, I discovered that certain parts of the RX header + should have the information necessary to calculate signal quality and + strength. With testing, it became clear that most of these quantities were + very jittery - only the AGC correlated with the signals expected from nearby + AP's. As a result, the quality and strength are derived from the agc value. + The scaling has been determined so that the numbers are close to those + obtained by b43 under the same conditions. The results are qualitatively + correct. + + Statistics derived for the RTL8187 have not been changed. + + The RX header variables have been renamed to match the quantites described + in the Realtek data sheet. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 1f690d7b549ef9c7424536475501885dd5b54930 +Author: Larry Finger +Date: Mon Jul 28 22:08:18 2008 -0500 + + rtl8187: Fix for TX sequence number problem + + "mac80211: fix TX sequence numbers" broke rtl8187. This + patch makes the same kind of fix that was done for rt2x00. Note that + this code will have to be reworked for proper sequence numbers on beacons. + In addition, the sequence number has been placed in the hardware state, + not the vif state. + + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +commit 5422399518e8142198df888aab00acdac251f754 +Author: Rami Rosen +Date: Thu Jul 24 10:40:37 2008 +0300 + + mac80211: append CONFIG_ to MAC80211_VERBOSE_PS_DEBUG in net/mac80211/tx.c. + + In net/mac80211/tx.c, there are some #ifdef which checks + MAC80211_VERBOSE_PS_DEBUG + (which in fact is never set) instead of + CONFIG_MAC80211_VERBOSE_PS_DEBUG, as should be. + + This patch replaces MAC80211_VERBOSE_PS_DEBUG with + CONFIG_MAC80211_VERBOSE_PS_DEBUG in these #ifdef commands in + net/mac80211/tx.c. + + Signed-off-by: Rami Rosen + Signed-off-by: John W. Linville + +commit 0b06b2ae0e474fc6378117c832bcd94785a9e975 +Author: Harvey Harrison +Date: Wed Jul 23 18:36:38 2008 -0700 + + mac80211: fix sparse integer as NULL pointer warning + [...9603 lines suppressed...] + ¶ms.station_flags)) + return -EINVAL; + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1202,7 +1225,7 @@ static int nl80211_del_station(struct sk + if (info->attrs[NL80211_ATTR_MAC]) + mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1271,68 +1294,78 @@ static int nl80211_send_mpath(struct sk_ + } + + static int nl80211_dump_mpath(struct sk_buff *skb, +- struct netlink_callback *cb) ++ struct netlink_callback *cb) + { +- int wp_idx = 0; +- int if_idx = 0; +- int sta_idx = cb->args[2]; +- int wp_start = cb->args[0]; +- int if_start = cb->args[1]; + struct mpath_info pinfo; + struct cfg80211_registered_device *dev; +- struct wireless_dev *wdev; ++ struct net_device *netdev; + u8 dst[ETH_ALEN]; + u8 next_hop[ETH_ALEN]; ++ int ifidx = cb->args[0]; ++ int path_idx = cb->args[1]; + int err; +- int exit = 0; + +- /* TODO: filter by device */ +- mutex_lock(&cfg80211_drv_mutex); +- list_for_each_entry(dev, &cfg80211_drv_list, list) { +- if (exit) ++ if (!ifidx) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize, ++ nl80211_fam.attrbuf, nl80211_fam.maxattr, ++ nl80211_policy); ++ if (err) ++ return err; ++ ++ if (!nl80211_fam.attrbuf[NL80211_ATTR_IFINDEX]) ++ return -EINVAL; ++ ++ ifidx = nla_get_u32(nl80211_fam.attrbuf[NL80211_ATTR_IFINDEX]); ++ if (!ifidx) ++ return -EINVAL; ++ } ++ ++ netdev = dev_get_by_index(&init_net, ifidx); ++ if (!netdev) ++ return -ENODEV; ++ ++ dev = cfg80211_get_dev_from_ifindex(ifidx); ++ if (IS_ERR(dev)) { ++ err = PTR_ERR(dev); ++ goto out_put_netdev; ++ } ++ ++ if (!dev->ops->dump_mpath) { ++ err = -ENOSYS; ++ goto out_err; ++ } ++ ++ rtnl_lock(); ++ ++ while (1) { ++ err = dev->ops->dump_mpath(&dev->wiphy, netdev, path_idx, ++ dst, next_hop, &pinfo); ++ if (err == -ENOENT) + break; +- if (++wp_idx < wp_start) +- continue; +- if_idx = 0; ++ if (err) ++ goto out_err_rtnl; + +- mutex_lock(&dev->devlist_mtx); +- list_for_each_entry(wdev, &dev->netdev_list, list) { +- if (exit) +- break; +- if (++if_idx < if_start) +- continue; +- if (!dev->ops->dump_mpath) +- continue; ++ if (nl80211_send_mpath(skb, NETLINK_CB(cb->skb).pid, ++ cb->nlh->nlmsg_seq, NLM_F_MULTI, ++ netdev, dst, next_hop, ++ &pinfo) < 0) ++ goto out; + +- for (;; ++sta_idx) { +- rtnl_lock(); +- err = dev->ops->dump_mpath(&dev->wiphy, +- wdev->netdev, sta_idx, dst, +- next_hop, &pinfo); +- rtnl_unlock(); +- if (err) { +- sta_idx = 0; +- break; +- } +- if (nl80211_send_mpath(skb, +- NETLINK_CB(cb->skb).pid, +- cb->nlh->nlmsg_seq, NLM_F_MULTI, +- wdev->netdev, dst, next_hop, +- &pinfo) < 0) { +- exit = 1; +- break; +- } +- } +- } +- mutex_unlock(&dev->devlist_mtx); ++ path_idx++; + } +- mutex_unlock(&cfg80211_drv_mutex); + +- cb->args[0] = wp_idx; +- cb->args[1] = if_idx; +- cb->args[2] = sta_idx; + +- return skb->len; ++ out: ++ cb->args[1] = path_idx; ++ err = skb->len; ++ out_err_rtnl: ++ rtnl_unlock(); ++ out_err: ++ cfg80211_put_dev(dev); ++ out_put_netdev: ++ dev_put(netdev); ++ ++ return err; + } + + static int nl80211_get_mpath(struct sk_buff *skb, struct genl_info *info) +@@ -1352,7 +1385,7 @@ static int nl80211_get_mpath(struct sk_b + + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1405,7 +1438,7 @@ static int nl80211_set_mpath(struct sk_b + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + next_hop = nla_data(info->attrs[NL80211_ATTR_MPATH_NEXT_HOP]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1440,7 +1473,7 @@ static int nl80211_new_mpath(struct sk_b + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + next_hop = nla_data(info->attrs[NL80211_ATTR_MPATH_NEXT_HOP]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + +@@ -1469,7 +1502,7 @@ static int nl80211_del_mpath(struct sk_b + if (info->attrs[NL80211_ATTR_MAC]) + dst = nla_data(info->attrs[NL80211_ATTR_MAC]); + +- err = get_drv_dev_by_info_ifindex(info, &drv, &dev); ++ err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev); + if (err) + return err; + diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c ---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-15 16:16:12.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-15 16:17:35.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-30 15:19:01.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-30 15:19:25.000000000 -0400 @@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init( return -EINVAL; @@ -86077,8 +88451,8 @@ } else /* no more bitmaps: end */ diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c ---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-15 16:16:12.000000000 -0400 -+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-15 16:17:35.000000000 -0400 +--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-30 15:19:01.000000000 -0400 ++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-30 15:19:25.000000000 -0400 @@ -500,7 +500,7 @@ static int call_commit_handler(struct ne /* * Calculate size of private arguments From fedora-extras-commits at redhat.com Wed Jul 30 20:43:06 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Wed, 30 Jul 2008 20:43:06 GMT Subject: rpms/ecryptfs-utils/devel .cvsignore, 1.13, 1.14 ecryptfs-utils.spec, 1.24, 1.25 sources, 1.14, 1.15 Message-ID: <200807302043.m6UKh6tV023546@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/ecryptfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23509 Modified Files: .cvsignore ecryptfs-utils.spec sources Log Message: * Wed Jul 30 2008 Eric Sandeen 53-0 - New upstream version - Many new manpages, new ecryptfs-stat util Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ecryptfs-utils/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 27 Jun 2008 21:44:56 -0000 1.13 +++ .cvsignore 30 Jul 2008 20:42:36 -0000 1.14 @@ -1 +1 @@ -ecryptfs-utils-50.tar.bz2 +ecryptfs-utils-53.tar.bz2 Index: ecryptfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ecryptfs-utils.spec 17 Jul 2008 19:40:38 -0000 1.24 +++ ecryptfs-utils.spec 30 Jul 2008 20:42:36 -0000 1.25 @@ -1,6 +1,6 @@ Name: ecryptfs-utils -Version: 50 -Release: 1%{?dist} +Version: 53 +Release: 0%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -66,19 +66,34 @@ %{_bindir}/ecryptfs-add-passphrase %{_bindir}/ecryptfs-zombie-kill %{_bindir}/ecryptfs-zombie-list -%{_bindir}/ecryptfs-mount-confidential -%{_bindir}/ecryptfs-setup-confidential -%{_bindir}/ecryptfs-umount-confidential %{_bindir}/ecryptfs-generate-tpm-key +%{_bindir}/ecryptfs-mount-private +%{_bindir}/ecryptfs-setup-private +%{_bindir}/ecryptfs-umount-private +%{_bindir}/ecryptfs-stat %{_bindir}/ecryptfsd %{_libdir}/libecryptfs.so.0.0.0 %{_libdir}/libecryptfs.so.0 %{_libdir}/ecryptfs /%{_lib}/security/pam_ecryptfs.so +%{_mandir}/man1/ecryptfs-add-passphrase.1.gz +%{_mandir}/man1/ecryptfs-generate-tpm-key.1.gz +%{_mandir}/man1/ecryptfs-insert-wrapped-passphrase-into-keyring.1.gz +%{_mandir}/man1/ecryptfs-mount-private.1.gz +%{_mandir}/man1/ecryptfs-rewrap-passphrase.1.gz +%{_mandir}/man1/ecryptfs-setup-private.1.gz +%{_mandir}/man1/ecryptfs-umount-private.1.gz +%{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz +%{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz +%{_mandir}/man1/ecryptfs-zombie-kill.1.gz +%{_mandir}/man1/ecryptfs-zombie-list.1.gz +%{_mandir}/man1/mount.ecryptfs_private.1.gz +%{_mandir}/man1/umount.ecryptfs_private.1.gz %{_mandir}/man7/ecryptfs.7.gz %{_mandir}/man8/ecryptfs-manager.8.gz %{_mandir}/man8/ecryptfsd.8.gz %{_mandir}/man8/mount.ecryptfs.8.gz +%{_mandir}/man8/pam_ecryptfs.8.gz %{_docdir}/%{name}/README %{_docdir}/%{name}/ecryptfs-faq.html %{_docdir}/%{name}/ecryptfs-pam-doc.txt @@ -90,6 +105,10 @@ %{_includedir}/ecryptfs.h %changelog +* Wed Jul 30 2008 Eric Sandeen 53-0 +- New upstream version +- Many new manpages, new ecryptfs-stat util + * Thu Jul 17 2008 Tom "spot" Callaway 50-1 - fix license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ecryptfs-utils/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 27 Jun 2008 21:44:56 -0000 1.14 +++ sources 30 Jul 2008 20:42:36 -0000 1.15 @@ -1 +1 @@ -d3f591f9ecee64a49863c7e743321562 ecryptfs-utils-50.tar.bz2 +0bd0c36c727a83ac734bb7b4d773e77a ecryptfs-utils-53.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 20:44:00 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 30 Jul 2008 20:44:00 GMT Subject: rpms/banshee/F-9 .cvsignore, 1.19, 1.20 banshee.spec, 1.49, 1.50 sources, 1.19, 1.20 Message-ID: <200807302044.m6UKi0Fa023721@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/banshee/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23628/F-9 Modified Files: .cvsignore banshee.spec sources Log Message: * Wed Jul 31 2008 Nigel Jones - 1.2.0-1 - Update to 1.2.0 (new upstream release) - Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/banshee/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Jun 2008 13:29:44 -0000 1.19 +++ .cvsignore 30 Jul 2008 20:43:30 -0000 1.20 @@ -1 +1 @@ -banshee-1-1.0.0.tar.bz2 +banshee-1-1.2.0.tar.bz2 Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/F-9/banshee.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- banshee.spec 8 Jun 2008 13:29:44 -0000 1.49 +++ banshee.spec 30 Jul 2008 20:43:30 -0000 1.50 @@ -1,7 +1,7 @@ %define mono_shared %{_builddir}/%{?buildsubdir} Name: banshee -Version: 1.0.0 +Version: 1.2.0 Release: 1%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -127,6 +127,10 @@ %{_libdir}/pkgconfig/banshee-1-*.pc %changelog +* Wed Jul 31 2008 Nigel Jones - 1.2.0-1 +- Update to 1.2.0 (new upstream release) +- Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details + * Sun Jun 8 2008 Nigel Jones - 1.0.0-1 - Banshee goes GOLD! Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/banshee/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Jun 2008 13:29:44 -0000 1.19 +++ sources 30 Jul 2008 20:43:30 -0000 1.20 @@ -1 +1 @@ -a0119f571701ecbede5f1e4c011e7685 banshee-1-1.0.0.tar.bz2 +1f651fa626b188adba35bcdac5d7f686 banshee-1-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 20:44:01 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 30 Jul 2008 20:44:01 GMT Subject: rpms/banshee/devel .cvsignore, 1.19, 1.20 banshee.spec, 1.54, 1.55 sources, 1.19, 1.20 Message-ID: <200807302044.m6UKi1n0023726@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23628/devel Modified Files: .cvsignore banshee.spec sources Log Message: * Wed Jul 31 2008 Nigel Jones - 1.2.0-1 - Update to 1.2.0 (new upstream release) - Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Jun 2008 13:30:00 -0000 1.19 +++ .cvsignore 30 Jul 2008 20:43:31 -0000 1.20 @@ -1 +1 @@ -banshee-1-1.0.0.tar.bz2 +banshee-1-1.2.0.tar.bz2 Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- banshee.spec 4 Jul 2008 10:18:28 -0000 1.54 +++ banshee.spec 30 Jul 2008 20:43:31 -0000 1.55 @@ -1,8 +1,8 @@ %define mono_shared %{_builddir}/%{?buildsubdir} Name: banshee -Version: 1.0.0 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT @@ -126,6 +126,10 @@ %{_libdir}/pkgconfig/banshee-1-*.pc %changelog +* Wed Jul 31 2008 Nigel Jones - 1.2.0-1 +- Update to 1.2.0 (new upstream release) +- Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details + * Fri Jul 4 2008 Nigel Jones - 1.0.0-2 - Bump for new gnome-sharp Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Jun 2008 13:30:00 -0000 1.19 +++ sources 30 Jul 2008 20:43:31 -0000 1.20 @@ -1 +1 @@ -a0119f571701ecbede5f1e4c011e7685 banshee-1-1.0.0.tar.bz2 +1f651fa626b188adba35bcdac5d7f686 banshee-1-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 20:44:28 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 30 Jul 2008 20:44:28 GMT Subject: rpms/hedgewars/devel .cvsignore, 1.6, 1.7 hedgewars-0.9.0-debuginfo.patch, 1.2, 1.3 hedgewars.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200807302044.m6UKiSO3023760@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/hedgewars/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23693 Modified Files: .cvsignore hedgewars-0.9.0-debuginfo.patch hedgewars.spec sources Log Message: * Wed Jul 30 2008 Hans de Goede 0.9.6-1 - New upstream release 0.9.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Jul 2008 07:45:54 -0000 1.6 +++ .cvsignore 30 Jul 2008 20:43:57 -0000 1.7 @@ -1 +1 @@ -hedgewars-src-0.9.5.tar.bz2 +hedgewars-0.9.6-1.fc10.src.rpm hedgewars-0.9.0-debuginfo.patch: Index: hedgewars-0.9.0-debuginfo.patch =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars-0.9.0-debuginfo.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hedgewars-0.9.0-debuginfo.patch 1 May 2008 12:05:36 -0000 1.2 +++ hedgewars-0.9.0-debuginfo.patch 30 Jul 2008 20:43:57 -0000 1.3 @@ -1,7 +1,7 @@ -diff -up hedgewars-0.9.0/CMakeLists.txt~ hedgewars-0.9.0/CMakeLists.txt ---- hedgewars-0.9.0/CMakeLists.txt~ 2007-08-26 15:09:29.000000000 +0200 -+++ hedgewars-0.9.0/CMakeLists.txt 2007-08-26 15:09:29.000000000 +0200 -@@ -33,7 +33,7 @@ if(WIN32 AND NOT UNIX) +diff -up hedgewars-src-0.9.6/CMakeLists.txt.orig hedgewars-src-0.9.6/CMakeLists.txt +--- hedgewars-src-0.9.6/CMakeLists.txt.orig 2008-07-30 01:07:37.000000000 +0200 ++++ hedgewars-src-0.9.6/CMakeLists.txt 2008-07-30 20:27:30.000000000 +0200 +@@ -43,7 +43,7 @@ if(WIN32 AND NOT UNIX) set(CPACK_NSIS_CONTACT "unC0Rr at gmail.com") set(CPACK_NSIS_MODIFY_PATH ON) else(WIN32 AND NOT UNIX) @@ -9,4 +9,4 @@ + set(CPACK_STRIP_FILES "") endif(WIN32 AND NOT UNIX) - include(CPack) + set(CPACK_SOURCE_IGNORE_FILES Index: hedgewars.spec =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hedgewars.spec 9 Jul 2008 07:45:54 -0000 1.10 +++ hedgewars.spec 30 Jul 2008 20:43:57 -0000 1.11 @@ -1,5 +1,5 @@ Name: hedgewars -Version: 0.9.5 +Version: 0.9.6 Release: 1%{?dist} Summary: 2D tankbattle game with the tanks replaced by hedgehogs Group: Amusements/Games @@ -78,6 +78,9 @@ %changelog +* Wed Jul 30 2008 Hans de Goede 0.9.6-1 +- New upstream release 0.9.6 + * Wed Jul 9 2008 Hans de Goede 0.9.5-1 - New upstream release 0.9.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Jul 2008 07:45:54 -0000 1.6 +++ sources 30 Jul 2008 20:43:57 -0000 1.7 @@ -1 +1 @@ -12a4aee48fccc565dd63de61c9444b62 hedgewars-src-0.9.5.tar.bz2 +095222cba01de4d7c422cf40d5a7aec9 hedgewars-0.9.6-1.fc10.src.rpm From fedora-extras-commits at redhat.com Wed Jul 30 20:45:26 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 30 Jul 2008 20:45:26 GMT Subject: rpms/libdvdnav/F-9 libdvdnav-r1108.patch, NONE, 1.1 libdvdnav.spec, 1.10, 1.11 Message-ID: <200807302045.m6UKjQTf023986@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libdvdnav/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23911 Modified Files: libdvdnav.spec Added Files: libdvdnav-r1108.patch Log Message: * Wed Jul 30 2008 Dominik Mierzejewski 4.1.2-3 - really fix #455961 libdvdnav-r1108.patch: --- NEW FILE libdvdnav-r1108.patch --- Index: src/dvdnav.h =================================================================== --- src/dvdnav.h (revision 1107) +++ src/dvdnav.h (revision 1108) @@ -290,7 +290,7 @@ * The number of entries in *times is the result of the function. * On error *times is NULL and the output is 0 */ -uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times, uint64_t *duration); +uint32_t dvdnav_describe_title_chapters(dvdnav_t *self, int32_t title, uint64_t **times, uint64_t *duration); /* * Play the specified amount of parts of the specified title of Index: libdvdnav.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdvdnav/F-9/libdvdnav.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libdvdnav.spec 26 Jul 2008 18:53:47 -0000 1.10 +++ libdvdnav.spec 30 Jul 2008 20:44:56 -0000 1.11 @@ -1,12 +1,13 @@ Name: libdvdnav Version: 4.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for reading DVD video discs based on Ogle code Group: System Environment/Libraries License: GPLv2+ Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz Patch0: %{name}-r1001-r1043.patch +Patch1: %{name}-r1108.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -47,6 +48,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 %build ./configure2 \ @@ -106,6 +108,9 @@ %{_libdir}/libdvdread.so %changelog +* Wed Jul 30 2008 Dominik Mierzejewski 4.1.2-3 +- really fix #455961 + * Sat Jul 27 2008 Dominik Mierzejewski 4.1.2-2 - pull selected fixes from SVN (fixes #455961) - re-enable parallel make From fedora-extras-commits at redhat.com Wed Jul 30 20:51:12 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 30 Jul 2008 20:51:12 GMT Subject: rpms/hedgewars/devel .cvsignore,1.7,1.8 sources,1.7,1.8 Message-ID: <200807302051.m6UKpCV1024442@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/hedgewars/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24377 Modified Files: .cvsignore sources Log Message: * Wed Jul 30 2008 Hans de Goede 0.9.6-1 - New upstream release 0.9.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jul 2008 20:43:57 -0000 1.7 +++ .cvsignore 30 Jul 2008 20:50:42 -0000 1.8 @@ -1 +1 @@ -hedgewars-0.9.6-1.fc10.src.rpm +hedgewars-src-0.9.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jul 2008 20:43:57 -0000 1.7 +++ sources 30 Jul 2008 20:50:42 -0000 1.8 @@ -1 +1 @@ -095222cba01de4d7c422cf40d5a7aec9 hedgewars-0.9.6-1.fc10.src.rpm +41592e4a98ffff7df9dac779883befcf hedgewars-src-0.9.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 20:51:25 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Wed, 30 Jul 2008 20:51:25 GMT Subject: rpms/mkinitrd/devel .cvsignore, 1.195, 1.196 mkinitrd.spec, 1.280, 1.281 sources, 1.237, 1.238 Message-ID: <200807302051.m6UKpPTE024487@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/mkinitrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24413 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Wed Jul 30 2008 Peter Jones - 6.0.57-1 - Fix mkliveinitrd's udevtrigger/udevadm usage (notting) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- .cvsignore 30 Jul 2008 14:54:08 -0000 1.195 +++ .cvsignore 30 Jul 2008 20:50:55 -0000 1.196 @@ -1 +1 @@ -mkinitrd-6.0.56.tar.bz2 +mkinitrd-6.0.57.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.280 retrieving revision 1.281 diff -u -r1.280 -r1.281 --- mkinitrd.spec 30 Jul 2008 15:00:58 -0000 1.280 +++ mkinitrd.spec 30 Jul 2008 20:50:55 -0000 1.281 @@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.56 +Version: 6.0.57 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -120,6 +120,9 @@ %dir %{_sysconfdir}/kernel/prerm.d %changelog +* Wed Jul 30 2008 Peter Jones - 6.0.57-1 +- Fix mkliveinitrd's udevtrigger/udevadm usage (notting) + * Tue Jul 29 2008 Peter Jones - 6.0.56-1 - Move a bunch of functions to /usr/libexec/initrd-functions so so that plymouth-populate-initrd can use it instead of duplicating them. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- sources 30 Jul 2008 14:54:08 -0000 1.237 +++ sources 30 Jul 2008 20:50:55 -0000 1.238 @@ -1 +1 @@ -6f21eaaae58bcfc8f9c074b55abfa57f mkinitrd-6.0.56.tar.bz2 +0c65beb7fb533964c57286ba751aedcb mkinitrd-6.0.57.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 20:52:31 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 30 Jul 2008 20:52:31 GMT Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.171,1.172 Message-ID: <200807302052.m6UKqVm7024567@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528 Modified Files: linux-2.6-compile-fixes.patch Log Message: build fix linux-2.6-compile-fixes.patch: Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- linux-2.6-compile-fixes.patch 23 Jul 2008 19:51:09 -0000 1.171 +++ linux-2.6-compile-fixes.patch 30 Jul 2008 20:52:00 -0000 1.172 @@ -5,3 +5,15 @@ # to do a compile to figure out what your diff is fixing. Thanks. # +--- linux-2.6/arch/powerpc/kernel/iommu.c~ 2008-07-30 16:49:33.000000000 -0400 ++++ linux-2.6/arch/powerpc/kernel/iommu.c 2008-07-30 16:50:29.000000000 -0400 +@@ -51,8 +51,7 @@ static int protect4gb = 1; + + static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int); + +-static inline unsigned long iommu_num_pages(unsigned long vaddr, +- unsigned long slen) ++unsigned long iommu_num_pages(unsigned long vaddr, unsigned long slen) + { + unsigned long npages; + From fedora-extras-commits at redhat.com Wed Jul 30 21:00:53 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Wed, 30 Jul 2008 21:00:53 GMT Subject: rpms/anaconda/devel .cvsignore, 1.555, 1.556 anaconda.spec, 1.697, 1.698 sources, 1.689, 1.690 Message-ID: <200807302100.m6UL0rYa025032@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24990 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.555 retrieving revision 1.556 diff -u -r1.555 -r1.556 --- .cvsignore 30 Jul 2008 12:28:51 -0000 1.555 +++ .cvsignore 30 Jul 2008 21:00:23 -0000 1.556 @@ -1,2 +1,3 @@ anaconda-11.4.1.21.tar.bz2 anaconda-11.4.1.22.tar.bz2 +anaconda-11.4.1.23.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- anaconda.spec 30 Jul 2008 12:28:51 -0000 1.697 +++ anaconda.spec 30 Jul 2008 21:00:23 -0000 1.698 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.22 +Version: 11.4.1.23 Release: 1 License: GPLv2+ Group: Applications/System @@ -197,6 +197,11 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jul 30 2008 Chris Lumens - 11.4.1.23-1 +- Fix mke2fs argument passing (#457285). (clumens) +- Disable logging in the firmware loader, since it clobbers other + log messages. (pjones) + * Wed Jul 30 2008 Chris Lumens - 11.4.1.22-1 - udevsettle takes forever, so display a waitWindow. (clumens) - Leave anaconda-runtime around for mk-images run. (dcantrell) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.689 retrieving revision 1.690 diff -u -r1.689 -r1.690 --- sources 30 Jul 2008 12:28:51 -0000 1.689 +++ sources 30 Jul 2008 21:00:23 -0000 1.690 @@ -1 +1 @@ -7610785387a03e93dc128efc946324dd anaconda-11.4.1.22.tar.bz2 +8df7c79ed1c05b289c7842a3b87567af anaconda-11.4.1.23.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 21:02:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:02:05 +0000 Subject: [pkgdb] eclipse-pydev: overholt has requested commit Message-ID: <20080730210211.1CD881AD0EB@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on eclipse-pydev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev From fedora-extras-commits at redhat.com Wed Jul 30 21:03:46 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Wed, 30 Jul 2008 21:03:46 GMT Subject: rpms/vpnc/F-8 vpnc-0.5.1-cloexec.patch, NONE, 1.1 vpnc-0.5.1-domain.patch, NONE, 1.1 vpnc-0.5.1-mtu.patch, NONE, 1.1 vpnc.spec, 1.26, 1.27 vpnc-0.4.0-cloexec.patch, 1.2, NONE Message-ID: <200807302103.m6UL3kU9031905@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/vpnc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31859 Modified Files: vpnc.spec Added Files: vpnc-0.5.1-cloexec.patch vpnc-0.5.1-domain.patch vpnc-0.5.1-mtu.patch Removed Files: vpnc-0.4.0-cloexec.patch Log Message: * Wed Jul 30 2008 Tomas Mraz - 0.5.1-5.1 - do not modify domain in resolv.conf (#446404) vpnc-0.5.1-cloexec.patch: --- NEW FILE vpnc-0.5.1-cloexec.patch --- diff -up vpnc-0.5.1/vpnc.c.cloexec vpnc-0.5.1/vpnc.c --- vpnc-0.5.1/vpnc.c.cloexec 2007-09-10 22:39:48.000000000 +0200 +++ vpnc-0.5.1/vpnc.c 2008-07-24 23:29:49.000000000 +0200 @@ -2693,6 +2693,8 @@ static void setup_link(struct sa_block * close_tunnel(); error(1, errno, "socket(PF_INET, SOCK_RAW, IPPROTO_ESP)"); } + fcntl(s->esp_fd, F_SETFD, FD_CLOEXEC); + #ifdef IP_HDRINCL if (setsockopt(s->esp_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1) { close_tunnel(); vpnc-0.5.1-domain.patch: --- NEW FILE vpnc-0.5.1-domain.patch --- diff -up vpnc-0.5.1/vpnc-script.domain vpnc-0.5.1/vpnc-script --- vpnc-0.5.1/vpnc-script.domain 2008-07-24 22:06:21.000000000 +0200 +++ vpnc-0.5.1/vpnc-script 2008-07-24 22:07:08.000000000 +0200 @@ -238,7 +238,7 @@ EOF LINE="" fi ;; - domain*|search*) + search*) if [ -n "$CISCO_DEF_DOMAIN" ]; then LINE="$LINE $CISCO_DEF_DOMAIN" CISCO_DEF_DOMAIN="" vpnc-0.5.1-mtu.patch: --- NEW FILE vpnc-0.5.1-mtu.patch --- diff -up vpnc-0.5.1/vpnc-script.mtu vpnc-0.5.1/vpnc-script --- vpnc-0.5.1/vpnc-script.mtu 2007-09-06 22:05:15.000000000 +0200 +++ vpnc-0.5.1/vpnc-script 2008-04-03 10:23:42.000000000 +0200 @@ -95,7 +95,13 @@ fi # =========== tunnel interface handling ==================================== do_ifconfig() { - ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu 1412 up + if [ -n "$IPROUTE" ]; then + DEV=$($IPROUTE route | grep ^default | sed 's/^.* dev \([[:alnum:]-]\+\).*$/\1/') + MTU=$(($($IPROUTE link show "$DEV" | grep mtu | sed 's/^.* mtu \([[:digit:]]\+\).*$/\1/') - 88)) + else + MTU=1412 + fi + ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu "$MTU" up } destroy_tun_device() { Index: vpnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vpnc/F-8/vpnc.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- vpnc.spec 13 Nov 2007 07:25:41 -0000 1.26 +++ vpnc.spec 30 Jul 2008 21:03:15 -0000 1.27 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.5.1 -Release: 2%{?dist} +Release: 5.1%{?dist} Summary: IPSec VPN client compatible with Cisco equipment @@ -13,13 +13,15 @@ Source3: vpnc-disconnect.consolehelper Source4: vpnc.pam Source5: vpnc-helper -Patch2: vpnc-0.4.0-cloexec.patch +Patch2: vpnc-0.5.1-cloexec.patch Patch3: vpnc-0.5.1-dpd.patch +Patch4: vpnc-0.5.1-mtu.patch +Patch5: vpnc-0.5.1-domain.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel > 1.1.90 -Requires: kernel >= 2.4 +Requires: iproute %description A VPN client compatible with Cisco's EasyVPN equipment. @@ -41,6 +43,8 @@ %setup -q %patch2 -p1 -b .cloexec %patch3 -p1 -b .dpd +%patch4 -p1 -b .mtu +%patch5 -p1 -b .domain %build CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr @@ -49,6 +53,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr rm -f $RPM_BUILD_ROOT%{_bindir}/pcf2vpnc +chmod 0644 pcf2vpnc rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcf2vpnc.1 chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/vpnc.8 install -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/default.conf @@ -98,6 +103,19 @@ %{_sbindir}/vpnc-helper %changelog +* Wed Jul 30 2008 Tomas Mraz - 0.5.1-5.1 +- do not modify domain in resolv.conf (#446404) + +* Sat Apr 5 2008 Michal Schmidt - 0.5.1-5 +- vpnc-script: fix 'ip link ...' syntax. + +* Thu Apr 3 2008 Tomas Mraz - 0.5.1-4 +- drop autogenerated perl requires (#440304) +- compute MTU based on default route device (#433846) + +* Wed Feb 20 2008 Fedora Release Engineering - 0.5.1-3 +- Autorebuild for GCC 4.3 + * Tue Nov 13 2007 Tomas Mraz - 0.5.1-2 - try to make DPD less sensitive (#345281) --- vpnc-0.4.0-cloexec.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 21:07:40 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 30 Jul 2008 21:07:40 GMT Subject: rpms/banshee/F-9 banshee.spec,1.50,1.51 Message-ID: <200807302107.m6UL7eVd032265@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/banshee/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32151/F-9 Modified Files: banshee.spec Log Message: * Wed Jul 31 2008 Nigel Jones - 1.2.0-2 - Reenable boo, I can't see why not now... Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/F-9/banshee.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- banshee.spec 30 Jul 2008 20:43:30 -0000 1.50 +++ banshee.spec 30 Jul 2008 21:07:10 -0000 1.51 @@ -2,7 +2,7 @@ Name: banshee Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT @@ -39,11 +39,10 @@ # Misc BuildRequires: gettext-devel perl(XML::Parser) -# boo-devel currently pulls in broken dependencies (XULRunner) and is a new feature, so disabled. -## No boo-devel for ppc but we owe it to the users to keep banshee up to date -#%ifnarch ppc -#BuildRequires: boo-devel -#%endif +# No boo-devel for ppc but we owe it to the users to keep banshee up to date +%ifnarch ppc +BuildRequires: boo-devel +%endif BuildRequires: desktop-file-utils @@ -127,6 +126,9 @@ %{_libdir}/pkgconfig/banshee-1-*.pc %changelog +* Wed Jul 31 2008 Nigel Jones - 1.2.0-2 +- Reenable boo, I can't see why not now... + * Wed Jul 31 2008 Nigel Jones - 1.2.0-1 - Update to 1.2.0 (new upstream release) - Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details From fedora-extras-commits at redhat.com Wed Jul 30 21:07:41 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Wed, 30 Jul 2008 21:07:41 GMT Subject: rpms/banshee/devel banshee.spec,1.55,1.56 Message-ID: <200807302107.m6UL7fYE032268@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32151/devel Modified Files: banshee.spec Log Message: * Wed Jul 31 2008 Nigel Jones - 1.2.0-2 - Reenable boo, I can't see why not now... Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- banshee.spec 30 Jul 2008 20:43:31 -0000 1.55 +++ banshee.spec 30 Jul 2008 21:07:11 -0000 1.56 @@ -2,7 +2,7 @@ Name: banshee Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT @@ -38,11 +38,10 @@ # Misc BuildRequires: gettext-devel perl(XML::Parser) -# boo-devel currently pulls in broken dependencies (XULRunner) and is a new feature, so disabled. -## No boo-devel for ppc but we owe it to the users to keep banshee up to date -#%ifnarch ppc -#BuildRequires: boo-devel -#%endif +# No boo-devel for ppc but we owe it to the users to keep banshee up to date +%ifnarch ppc +BuildRequires: boo-devel +%endif BuildRequires: desktop-file-utils @@ -126,6 +125,9 @@ %{_libdir}/pkgconfig/banshee-1-*.pc %changelog +* Wed Jul 31 2008 Nigel Jones - 1.2.0-2 +- Reenable boo, I can't see why not now... + * Wed Jul 31 2008 Nigel Jones - 1.2.0-1 - Update to 1.2.0 (new upstream release) - Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details From fedora-extras-commits at redhat.com Wed Jul 30 21:08:04 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Wed, 30 Jul 2008 21:08:04 GMT Subject: rpms/cacti/F-8 cacti.spec,1.19,1.20 Message-ID: <200807302108.m6UL84Kt032283@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32231/F-8 Modified Files: cacti.spec Log Message: added CLI dir Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/F-8/cacti.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cacti.spec 14 Feb 2008 14:43:14 -0000 1.19 +++ cacti.spec 30 Jul 2008 21:07:34 -0000 1.20 @@ -1,10 +1,11 @@ Name: cacti Version: 0.8.7b -Release: 1%{?dist} +Release: 4%{?dist} Summary: An rrd based graphing tool Group: Applications/System -License: GPL +# There's a lot of stuff in there. It's all compatible. +License: GPLv2+ and LGPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD) URL: http://www.cacti.net/ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz Source1: cacti-httpd.conf @@ -43,6 +44,8 @@ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ %{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 cli/ %{buildroot}/%{_localstatedir}/lib//%{name}/cli/ +%{__install} -m 0755 cli/* %{buildroot}/%{_localstatedir}/lib/%{name}/cli/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf %{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti @@ -96,11 +99,21 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/cli/*php %attr(0644,root,root) %{_localstatedir}/lib/%{name}/include %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog -* Thu Nov 14 2008 Mike McGrath - 0.8.7b-1 +* Mon Jul 28 2008 Mike McGrath - 0.8.7b-4 +- Added cli directory + +* Fri Jul 18 2008 Tom "spot" Callaway - 0.8.7b-3 +- fix my own mistake in the license tag + +* Tue Jul 15 2008 Tom "spot" Callaway - 0.8.7b-2 +- fix license tag + +* Thu Feb 14 2008 Mike McGrath - 0.8.7b-1 - Upstream released new version * Fri Nov 23 2007 Mike McGrath - 0.8.7a-2 From fedora-extras-commits at redhat.com Wed Jul 30 21:08:04 2008 From: fedora-extras-commits at redhat.com (Mike McGrath (mmcgrath)) Date: Wed, 30 Jul 2008 21:08:04 GMT Subject: rpms/cacti/F-9 cacti.spec,1.21,1.22 Message-ID: <200807302108.m6UL846V032287@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32231/F-9 Modified Files: cacti.spec Log Message: added CLI dir Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/F-9/cacti.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cacti.spec 9 Mar 2008 02:43:59 -0000 1.21 +++ cacti.spec 30 Jul 2008 21:07:34 -0000 1.22 @@ -1,10 +1,11 @@ Name: cacti Version: 0.8.7b -Release: 1%{?dist} +Release: 4%{?dist} Summary: An rrd based graphing tool Group: Applications/System -License: GPL +# There's a lot of stuff in there. It's all compatible. +License: GPLv2+ and LGPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD) URL: http://www.cacti.net/ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz Source1: cacti-httpd.conf @@ -43,6 +44,8 @@ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ %{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 cli/ %{buildroot}/%{_localstatedir}/lib//%{name}/cli/ +%{__install} -m 0755 cli/* %{buildroot}/%{_localstatedir}/lib/%{name}/cli/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf %{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti @@ -96,10 +99,20 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/cli/*php %attr(0644,root,root) %{_localstatedir}/lib/%{name}/include %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Mon Jul 28 2008 Mike McGrath - 0.8.7b-4 +- Added cli directory + +* Fri Jul 18 2008 Tom "spot" Callaway - 0.8.7b-3 +- fix my own mistake in the license tag + +* Tue Jul 15 2008 Tom "spot" Callaway - 0.8.7b-2 +- fix license tag + * Thu Feb 14 2008 Mike McGrath - 0.8.7b-1 - Upstream released new version From fedora-extras-commits at redhat.com Wed Jul 30 21:15:54 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 30 Jul 2008 21:15:54 GMT Subject: rpms/elice/devel .cvsignore, 1.2, 1.3 elice.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807302115.m6ULFsR2000355@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/elice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv304 Modified Files: .cvsignore elice.spec sources Log Message: * Wed Jul 30 2008 Hans de Goede 0.289-1 - New upstream release 0.289 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elice/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Jun 2008 18:00:09 -0000 1.2 +++ .cvsignore 30 Jul 2008 21:15:23 -0000 1.3 @@ -1 +1 @@ -elice-0.258.tar.gz +elice-0.289.tar.gz Index: elice.spec =================================================================== RCS file: /cvs/extras/rpms/elice/devel/elice.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elice.spec 16 Jun 2008 18:00:09 -0000 1.1 +++ elice.spec 30 Jul 2008 21:15:23 -0000 1.2 @@ -1,5 +1,5 @@ Name: elice -Version: 0.258 +Version: 0.289 Release: 1%{?dist} Summary: Elice is a PureBasic to C++ translator / compiler Group: Development/Languages @@ -57,6 +57,9 @@ %changelog +* Wed Jul 30 2008 Hans de Goede 0.289-1 +- New upstream release 0.289 + * Fri Jun 13 2008 Hans de Goede 0.258-1 - Switch from svn snapshot to upstream provided tarbals Index: sources =================================================================== RCS file: /cvs/extras/rpms/elice/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Jun 2008 18:00:09 -0000 1.2 +++ sources 30 Jul 2008 21:15:23 -0000 1.3 @@ -1 +1 @@ -9d5f012b09c556e2471395c9d80078cd elice-0.258.tar.gz +9b7e24b97689417069c2099123613b03 elice-0.289.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 21:19:00 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 30 Jul 2008 21:19:00 GMT Subject: rpms/lostlabyrinth/devel .cvsignore, 1.2, 1.3 lostlabyrinth.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200807302119.m6ULJ0D7000569@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lostlabyrinth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv518 Modified Files: .cvsignore lostlabyrinth.spec sources Log Message: * Wed Jul 30 2008 Hans de Goede 3.0.2-1 - New upstream release 3.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lostlabyrinth/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2008 06:56:03 -0000 1.2 +++ .cvsignore 30 Jul 2008 21:18:30 -0000 1.3 @@ -1,2 +1,2 @@ -labysource_3.0.0.tar.gz -lostlabyrinth-docs-3.0.0.tar.gz +labysource_3.0.2.tar.gz +lostlabyrinth-docs-3.0.2.tar.gz Index: lostlabyrinth.spec =================================================================== RCS file: /cvs/extras/rpms/lostlabyrinth/devel/lostlabyrinth.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lostlabyrinth.spec 18 Jun 2008 06:56:03 -0000 1.1 +++ lostlabyrinth.spec 30 Jul 2008 21:18:30 -0000 1.2 @@ -1,5 +1,5 @@ Name: lostlabyrinth -Version: 3.0.0 +Version: 3.0.2 Release: 1%{?dist} Summary: Lost Labyrinth is a coffeebreak dungeon crawling game Group: Amusements/Games @@ -14,7 +14,7 @@ Source4: %{name}.png Source5: license-clarification.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: elice desktop-file-utils +BuildRequires: elice >= 0.289, desktop-file-utils Requires: lostlabyrinth-graphics = 2.9.0, lostlabyrinth-sounds = 2.5.2 Requires: hicolor-icon-theme @@ -91,6 +91,9 @@ %changelog +* Wed Jul 30 2008 Hans de Goede 3.0.2-1 +- New upstream release 3.0.2 + * Fri Jun 13 2008 Hans de Goede 3.0.0-1 - New upstream release 3.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lostlabyrinth/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 06:56:03 -0000 1.2 +++ sources 30 Jul 2008 21:18:30 -0000 1.3 @@ -1,2 +1,2 @@ -fe168634d648c57b62c4069b11956b29 labysource_3.0.0.tar.gz -636c86608b8e37a57ddc0f9d5a623037 lostlabyrinth-docs-3.0.0.tar.gz +edd874fab768ab4edf43cabddd1dc10c labysource_3.0.2.tar.gz +464a9b03611a646a3efb70dbc2367ffe lostlabyrinth-docs-3.0.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 30 21:34:31 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 30 Jul 2008 21:34:31 GMT Subject: rpms/ballz/devel ballz-1.0-guichan081.patch, NONE, 1.1 ballz.spec, 1.4, 1.5 Message-ID: <200807302134.m6ULYVU1001400@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ballz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1356 Modified Files: ballz.spec Added Files: ballz-1.0-guichan081.patch Log Message: * Wed Jul 30 2008 Hans de Goede 1.0-4 - Rebuild for new guichan ballz-1.0-guichan081.patch: --- NEW FILE ballz-1.0-guichan081.patch --- --- ballz-1.0/src/game.cpp.orig 2008-07-28 19:49:24.000000000 -0700 +++ ballz-1.0/src/game.cpp 2008-07-28 19:49:35.000000000 -0700 @@ -144,7 +144,7 @@ "up with the whole idea of making this game in Per's and\n" "Johanna's apartment."); mCreditsText->setOpaque(false); - mCreditsText->setBorderSize(0); + mCreditsText->setFrameSize(0); mCreditsContainer->add(mCreditsText, 40, 180); mLevelsContainer = new gcn::Container(); @@ -173,7 +173,7 @@ mInfoTextFont->setGlyphSpacing(-1); mInfoText->setFont(mInfoTextFont); mInfoText->setOpaque(false); - mInfoText->setBorderSize(0); + mInfoText->setFrameSize(0); mMainMenuContainer->add(mInfoText, 110, 200); } --- ballz-1.0/src/gui/ballzscrollarea.cpp.orig 2008-07-28 19:54:05.000000000 -0700 +++ ballz-1.0/src/gui/ballzscrollarea.cpp 2008-07-28 19:54:18.000000000 -0700 @@ -37,7 +37,7 @@ setScrollPolicy(SHOW_NEVER, SHOW_ALWAYS); addKeyListener(this); setFocusable(false); - setBorderSize(0); + setFrameSize(0); } void BallzScrollArea::draw(gcn::Graphics *graphics) --- ballz-1.0/src/gui/ballzlistbox.cpp.orig 2008-07-28 19:57:26.000000000 -0700 +++ ballz-1.0/src/gui/ballzlistbox.cpp 2008-07-28 19:57:36.000000000 -0700 @@ -36,7 +36,7 @@ BallzListBox::BallzListBox() { - setBorderSize(0); + setFrameSize(0); mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp"); } --- ballz-1.0/src/gui/levelselector.cpp.orig 2008-07-28 19:54:46.000000000 -0700 +++ ballz-1.0/src/gui/levelselector.cpp 2008-07-28 19:54:54.000000000 -0700 @@ -40,7 +40,7 @@ LevelSelector::LevelSelector() { - setBorderSize(0); + setFrameSize(0); mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp"); mSelected = -1; setWidth(300); @@ -170,7 +170,7 @@ void LevelSelector::keyPressed(gcn::KeyE if (key.getValue() == gcn::Key::ENTER || key.getValue() == gcn::Key::SPACE) { - generateAction(); + distributeActionEvent(); keyEvent.consume(); } else if (key.getValue() == gcn::Key::UP) Index: ballz.spec =================================================================== RCS file: /cvs/extras/rpms/ballz/devel/ballz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ballz.spec 5 Apr 2008 08:29:09 -0000 1.4 +++ ballz.spec 30 Jul 2008 21:34:01 -0000 1.5 @@ -1,6 +1,6 @@ Name: ballz Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Platform game with some puzzle elements Group: Amusements/Games License: BSD @@ -11,6 +11,7 @@ Source1: %{name}.desktop Patch0: ballz-1.0-syslibs.patch Patch1: ballz-1.0-fullscreen.patch +Patch2: ballz-1.0-guichan081.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dumb-devel guichan-devel desktop-file-utils automake BuildRequires: ImageMagick @@ -30,6 +31,7 @@ %setup -q %patch0 -p1 -z .syslibs %patch1 -p1 -z .fullscreen +%patch2 -p1 # we use the system version of these libs rm -fr src/guichan* src/dumb # remove hardcoded optflags from configure @@ -83,6 +85,9 @@ %changelog +* Wed Jul 30 2008 Hans de Goede 1.0-4 +- Rebuild for new guichan + * Sat Apr 5 2008 Hans de Goede 1.0-3 - Rebuild for new guichan From fedora-extras-commits at redhat.com Wed Jul 30 21:40:13 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 30 Jul 2008 21:40:13 GMT Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.172,1.173 Message-ID: <200807302140.m6ULeDW3001853@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1774 Modified Files: linux-2.6-compile-fixes.patch Log Message: I give up. linux-2.6-compile-fixes.patch: Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- linux-2.6-compile-fixes.patch 30 Jul 2008 20:52:00 -0000 1.172 +++ linux-2.6-compile-fixes.patch 30 Jul 2008 21:39:43 -0000 1.173 @@ -5,15 +5,3 @@ # to do a compile to figure out what your diff is fixing. Thanks. # ---- linux-2.6/arch/powerpc/kernel/iommu.c~ 2008-07-30 16:49:33.000000000 -0400 -+++ linux-2.6/arch/powerpc/kernel/iommu.c 2008-07-30 16:50:29.000000000 -0400 -@@ -51,8 +51,7 @@ static int protect4gb = 1; - - static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int); - --static inline unsigned long iommu_num_pages(unsigned long vaddr, -- unsigned long slen) -+unsigned long iommu_num_pages(unsigned long vaddr, unsigned long slen) - { - unsigned long npages; - From fedora-extras-commits at redhat.com Wed Jul 30 21:40:31 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Wed, 30 Jul 2008 21:40:31 GMT Subject: rpms/mysqltuner/EL-5 mysqltuner.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200807302140.m6ULeVCN001871@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/mysqltuner/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1796 Modified Files: mysqltuner.spec sources Log Message: switch to using %dist Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-5/mysqltuner.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mysqltuner.spec 21 Jun 2008 18:23:53 -0000 1.1 +++ mysqltuner.spec 30 Jul 2008 21:40:00 -0000 1.2 @@ -1,14 +1,12 @@ Name: mysqltuner -Version: 0.9.1 -Release: 3 +Version: 0.9.8 +Release: 2%{?dist} Summary: MySQL high performance tuning script Group: Applications/Databases License: GPLv3+ URL: http://mysqltuner.com/ Source0: http://mysqltuner.com/mysqltuner.pl.gz -# Sent upstream @0.9.0 time, seems rejected. -Patch0: %{name}-0.9.1-checkversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,9 +24,7 @@ %prep %setup -q -c -T -gzip -dc %{SOURCE0} > mysqltuner.pl -%patch0 -sed -i -e 's/\r\+//g' mysqltuner.pl +gzip -dc %{SOURCE0} | sed -e 's/\r\+//g' > mysqltuner.pl %build @@ -49,7 +45,16 @@ %changelog -* Sat Jun 21 2008 Ville Skytt?? - 0.9.1-3 +* Wed Jul 30 2008 manuel wolfshant - 0.9.8-2%{dist} +- add %%dist to release tag + +* Sun Jul 27 2008 manuel wolfshant - 0.9.8-2 +- bump release tag to allow build + +* Mon Jul 21 2008 Ville Skytt?? - 0.9.8-1 +- 0.9.8, --checkversion patch applied upstream. + +* Sat Jun 21 2008 Ville Skytt?? - 0.9.1-2 - Don't warn if --skipversion is used (#452172). * Thu Jun 19 2008 Ville Skytt?? - 0.9.1-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jun 2008 18:23:53 -0000 1.2 +++ sources 30 Jul 2008 21:40:00 -0000 1.3 @@ -1 +1 @@ -56f3e3aa6cf9f1c2573c937ca6190fb3 mysqltuner.pl.gz +960fff8a910ba86b1eef62e627670b1f mysqltuner.pl.gz From fedora-extras-commits at redhat.com Wed Jul 30 21:45:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:39 +0000 Subject: [pkgdb] ipa: mnagy has requested watchbugzilla Message-ID: <20080730214539.CED171AD0F0@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchbugzilla acl on ipa (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:45:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:41 +0000 Subject: [pkgdb] ipa: mnagy has requested watchcommits Message-ID: <20080730214542.069371AD0F9@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchcommits acl on ipa (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:45:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:45 +0000 Subject: [pkgdb] ipa: mnagy has requested watchbugzilla Message-ID: <20080730214545.80A4A1AD101@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchbugzilla acl on ipa (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:45:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:49 +0000 Subject: [pkgdb] ipa: mnagy has requested watchbugzilla Message-ID: <20080730214550.75D951AD103@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchbugzilla acl on ipa (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:45:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:51 +0000 Subject: [pkgdb] ipa: mnagy has requested watchcommits Message-ID: <20080730214551.9F2AD1AD108@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchcommits acl on ipa (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:45:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:48 +0000 Subject: [pkgdb] ipa: mnagy has requested watchcommits Message-ID: <20080730214553.8EEE91AD10D@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchcommits acl on ipa (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:45:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:54 +0000 Subject: [pkgdb] ipa: mnagy has requested watchbugzilla Message-ID: <20080730214554.53EEB1AD113@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchbugzilla acl on ipa (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:45:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 30 Jul 2008 21:45:59 +0000 Subject: [pkgdb] ipa: mnagy has requested watchcommits Message-ID: <20080730214559.D7F2E1AD0EC@bastion.fedora.phx.redhat.com> Martin Nagy (mnagy) has requested the watchcommits acl on ipa (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ipa From fedora-extras-commits at redhat.com Wed Jul 30 21:49:33 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Wed, 30 Jul 2008 21:49:33 GMT Subject: rpms/mysqltuner/EL-4 mysqltuner.spec,1.7,1.8 Message-ID: <200807302149.m6ULnXJD002336@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/mysqltuner/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2295 Modified Files: mysqltuner.spec Log Message: switch to using %dist Index: mysqltuner.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/mysqltuner.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mysqltuner.spec 27 Jul 2008 00:50:37 -0000 1.7 +++ mysqltuner.spec 30 Jul 2008 21:49:02 -0000 1.8 @@ -1,6 +1,6 @@ Name: mysqltuner Version: 0.9.8 -Release: 2 +Release: 2%{?dist} Summary: MySQL high performance tuning script Group: Applications/Databases @@ -45,6 +45,9 @@ %changelog +* Wed Jul 30 2008 manuel wolfshant - 0.9.8-2%{dist} +- add %%dist to release tag + * Sun Jul 27 2008 manuel wolfshant - 0.9.8-2 - bump release tag to allow build From fedora-extras-commits at redhat.com Wed Jul 30 21:54:55 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 30 Jul 2008 21:54:55 GMT Subject: rpms/guichan/devel .cvsignore, 1.5, 1.6 guichan.spec, 1.7, 1.8 sources, 1.5, 1.6 guichan-0.7.1-soname.patch, 1.1, NONE Message-ID: <200807302154.m6ULstk1002664@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/guichan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2623 Modified Files: .cvsignore guichan.spec sources Removed Files: guichan-0.7.1-soname.patch Log Message: Update to 0.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/guichan/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Apr 2008 17:48:57 -0000 1.5 +++ .cvsignore 30 Jul 2008 21:54:24 -0000 1.6 @@ -1 +1 @@ -guichan-0.7.1.tar.gz +guichan-0.8.1.tar.gz Index: guichan.spec =================================================================== RCS file: /cvs/extras/rpms/guichan/devel/guichan.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- guichan.spec 4 Apr 2008 17:48:57 -0000 1.7 +++ guichan.spec 30 Jul 2008 21:54:24 -0000 1.8 @@ -1,5 +1,5 @@ Name: guichan -Version: 0.7.1 +Version: 0.8.1 Release: 1%{?dist} Summary: Portable C++ GUI library for games using Allegro, SDL and OpenGL @@ -8,7 +8,6 @@ URL: http://guichan.sourceforge.net #Source0: http://downloads.sourceforge.net/guichan/%{name}-%{version}.tar.gz Source0: http://guichan.googlecode.com/files/%{name}-%{version}.tar.gz -Patch0: guichan-0.7.1-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel, SDL-devel, SDL_image-devel, libGL-devel @@ -29,14 +28,7 @@ package is needed to build programs written using guichan. %prep -%setup -q -n %{name}-%{version} -for i in src/Makefile.am src/*/Makefile.am ; do - touch -r $i $i.stamp -done -%patch0 -p1 -b .orig -for i in src/Makefile.am src/*/Makefile.am ; do - touch -r $i.stamp $i -done +%setup -q %build @@ -65,10 +57,14 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_libdir}/libguichan-%{version}.so -%{_libdir}/libguichan_allegro-%{version}.so -%{_libdir}/libguichan_opengl-%{version}.so -%{_libdir}/libguichan_sdl-%{version}.so +%{_libdir}/libguichan-%{version}.so.1 +%{_libdir}/libguichan-%{version}.so.1.0.0 +%{_libdir}/libguichan_allegro-%{version}.so.1 +%{_libdir}/libguichan_allegro-%{version}.so.1.0.0 +%{_libdir}/libguichan_opengl-%{version}.so.1 +%{_libdir}/libguichan_opengl-%{version}.so.1.0.0 +%{_libdir}/libguichan_sdl-%{version}.so.1 +%{_libdir}/libguichan_sdl-%{version}.so.1.0.0 %files devel %defattr(-,root,root,-) @@ -81,6 +77,9 @@ %changelog +* Mon Jul 28 2008 Wart 0.8.1-1 +- Update to 0.8.1 + * Fri Apr 4 2008 Wart 0.7.1-1 - Update to 0.7.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/guichan/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Apr 2008 17:48:57 -0000 1.5 +++ sources 30 Jul 2008 21:54:24 -0000 1.6 @@ -1 +1 @@ -275c5bad231d2ce55e654d80cb1e05be guichan-0.7.1.tar.gz +f9ace11cc70d3ba60b62347172334a5f guichan-0.8.1.tar.gz --- guichan-0.7.1-soname.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 23:18:43 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 30 Jul 2008 23:18:43 GMT Subject: rpms/deskbar-applet/devel .cvsignore, 1.41, 1.42 deskbar-applet.spec, 1.69, 1.70 sources, 1.41, 1.42 Message-ID: <200807302318.m6UNIhJ8019539@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19509 Modified Files: .cvsignore deskbar-applet.spec sources Log Message: 2.23.5 (#457174) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 17 Jul 2008 15:31:01 -0000 1.41 +++ .cvsignore 30 Jul 2008 23:18:12 -0000 1.42 @@ -1 +1 @@ -deskbar-applet-2.23.4.tar.bz2 +deskbar-applet-2.23.5.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- deskbar-applet.spec 17 Jul 2008 15:25:08 -0000 1.69 +++ deskbar-applet.spec 30 Jul 2008 23:18:13 -0000 1.70 @@ -2,7 +2,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.23.4 +Version: 2.23.5 Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines @@ -102,6 +102,9 @@ %changelog +* Wed Jul 30 2008 Luke Macken - 2.23.5-1 +- Latest upstream release of the 2.23.x branch + * Thu Jul 17 2008 Luke Macken - 2.23.4-1 - Latest upstream release of the 2.23.x branch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 17 Jul 2008 15:31:01 -0000 1.41 +++ sources 30 Jul 2008 23:18:13 -0000 1.42 @@ -1 +1 @@ -2b421cbc04545825ce200fb5cbc8e8f7 deskbar-applet-2.23.4.tar.bz2 +1809207b84af16174880cf8664c107e4 deskbar-applet-2.23.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 30 23:35:07 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Wed, 30 Jul 2008 23:35:07 GMT Subject: rpms/splat/devel bearing.man, NONE, 1.1 postdownload.man, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 splat.spec, 1.1, 1.2 splat-1.2-build.patch, 1.1, NONE splat-1.2-gcc.patch, 1.1, NONE splat-1.2-parens.patch, 1.1, NONE Message-ID: <200807302335.m6UNZ7OS020372@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/splat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20278 Modified Files: .cvsignore sources splat.spec Added Files: bearing.man postdownload.man Removed Files: splat-1.2-build.patch splat-1.2-gcc.patch splat-1.2-parens.patch Log Message: New upstream, plus added a utility we didn't deliver and a man page for it --- NEW FILE bearing.man --- .\" Man page for bearing .\" Created by copying text from utils/README .TH man 1 "30 July 2008" "1.0" "bearing" .SH NAME bearing \- returns the azimuth bearing and great circle path distance between two specified points .SH SYNOPSIS .B bearing file .SH DESCRIPTION .B bearing reads a pair of .qth files specified on the command line, and returns the azimuth bearing and great circle path distance between the two points specified. A -metric switch is available so that distances can be provided in kilometers rather than statute miles. SPLAT! provides similar distance and bearing information between two specific site locations. The bearing utility, however, provides the information quickly and easily over great distances without having to run SPLAT! .SH EXAMPLES bearing ai4qr.qth 940-repeater.qth .SH FILES .P .I /usr/bin/bearing .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Steve Conklin (fedora at conklinhouse.com) .fi .SH HISTORY 2008 \- Text copied from README --- NEW FILE postdownload.man --- .\" Man page for postdownload .\" Created by copying text from utils/README .TH man 1 "30 July 2008" "1.0" "postdownload" .SH NAME postdownload \- A front-end to the usgs2sdf utility .SH SYNOPSIS .B postdownload file .SH DESCRIPTION .B postdownload is a front-end to the usgs2sdf utility. postdownload takes as an argument the name of the gzipped Digital Elevation Model (DEM) downloaded from the US Geological Survey (ie: wilmington-w.gz). postdownload uncompresses the DEM file, adds necessary record delimiters, and invokes usgs2sdf to produce a SPLAT Data File (SDF). .P USGS Digital Elevation Models may be downloaded from: http://edcftp.cr.usgs.gov/pub/data/DEM/250/ Invoke postdownload with the name of each DEM file downloaded to produce a database of SPLAT Data Files. .SH EXAMPLES postdownload aberdeen .SH FILES .P .I /usr/bin/postdownload .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Steve Conklin (fedora at conklinhouse.com) .fi .SH HISTORY 2008 \- Text copied from README Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/splat/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Mar 2008 21:31:20 -0000 1.2 +++ .cvsignore 30 Jul 2008 23:34:36 -0000 1.3 @@ -1 +1,2 @@ splat-1.2.1.tar.bz2 +splat-1.2.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/splat/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Mar 2008 21:31:20 -0000 1.2 +++ sources 30 Jul 2008 23:34:36 -0000 1.3 @@ -1 +1 @@ -46a223f7db0d59dc79dd5467cdebf14d splat-1.2.1.tar.bz2 +48e1c8b71e18b843066c625ed3068a1b splat-1.2.3.tar.bz2 Index: splat.spec =================================================================== RCS file: /cvs/pkgs/rpms/splat/devel/splat.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- splat.spec 2 Mar 2008 21:31:20 -0000 1.1 +++ splat.spec 30 Jul 2008 23:34:36 -0000 1.2 @@ -1,19 +1,19 @@ Name: splat -Version: 1.2.1 -Release: 6%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: Analyze point-to-point terrestrial RF communication links Group: Applications/Communications License: GPLv2+ URL: http://www.qsl.net/kd2bd/splat.html -Source0: http://www.ibiblio.org/pub/linux/apps/ham/%{name}-%{version}.tar.bz2 +Source0: http://www.qsl.net/kd2bd/%{name}-%{version}.tar.bz2 #man pages for utilities, generated from utils README file Source1: citydecoder.man Source2: srtm2sdf.man Source3: usgs2sdf.man -Patch0: splat-1.2-gcc.patch -Patch1: splat-1.2-build.patch -Patch2: splat-1.2-parens.patch +Source4: bearing.man +Source5: postdownload.man +Patch0: splat-1.2-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel @@ -36,15 +36,15 @@ Includes: citydecoder +bearing +postdownload srtm2sdf usg2sdf %prep %setup -q -%patch0 -p1 -b .gcc -%patch1 -p1 -b .ppc -%patch2 -p1 -b .parens +%patch0 -p1 -b .ppc #fix end of line encoding %{__sed} -i 's/\r//' utils/fips.txt @@ -57,6 +57,8 @@ groff -e -T ascii -man %{SOURCE1} > $RPM_BUILD_DIR/%{name}-%{version}/utils/citydecoder.1 groff -e -T ascii -man %{SOURCE2} > $RPM_BUILD_DIR/%{name}-%{version}/utils/srtm2sdf.1 groff -e -T ascii -man %{SOURCE3} > $RPM_BUILD_DIR/%{name}-%{version}/utils/usgs2sdf.1 +groff -e -T ascii -man %{SOURCE4} > $RPM_BUILD_DIR/%{name}-%{version}/utils/bearing.1 +groff -e -T ascii -man %{SOURCE5} > $RPM_BUILD_DIR/%{name}-%{version}/utils/postdownload.1 %install rm -rf $RPM_BUILD_ROOT @@ -66,10 +68,14 @@ install -D -m 0644 docs/spanish/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/es/man1/splat.1 #utils install -D -m 0755 utils/citydecoder $RPM_BUILD_ROOT%{_bindir}/citydecoder +install -D -m 0755 utils/bearing $RPM_BUILD_ROOT%{_bindir}/bearing +install -D -m 0755 utils/postdownload $RPM_BUILD_ROOT%{_bindir}/postdownload install -D -m 0755 utils/usgs2sdf $RPM_BUILD_ROOT%{_bindir}/usgs2sdf install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf -#additional man pagers +#additional man pages install -D -m 0644 utils/citydecoder.1 $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1 +install -D -m 0644 utils/bearing.1 $RPM_BUILD_ROOT%{_mandir}/man1/bearing.1 +install -D -m 0644 utils/postdownload.1 $RPM_BUILD_ROOT%{_mandir}/man1/postdownload.1 install -D -m 0644 utils/srtm2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1 install -D -m 0644 utils/usgs2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1 @@ -88,16 +94,23 @@ %files utils %doc COPYING utils/README utils/fips.txt %{_bindir}/citydecoder +%{_bindir}/bearing +%{_bindir}/postdownload %{_bindir}/srtm2sdf %{_bindir}/usgs2sdf %{_mandir}/man?/citydecoder* +%{_mandir}/man?/bearing* +%{_mandir}/man?/postdownload* %{_mandir}/man?/srtm2sdf* %{_mandir}/man?/usgs2sdf* %changelog +* Wed Jul 30 2008 Steve Conklin - 1.2.3-1 +- New upstream +- added delivery of postdownload script and the new bearing utility +- added man pages for bearing and postdownload * Thu Feb 28 2008 Steve Conklin - 1.2.1-6 - Silly, there's no gui. Removed desktop and icon files. - * Thu Feb 28 2008 Steve Conklin - 1.2.1-5 - installed desktop and icon files with main package, not utils --- splat-1.2-build.patch DELETED --- --- splat-1.2-gcc.patch DELETED --- --- splat-1.2-parens.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 30 23:36:12 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Wed, 30 Jul 2008 23:36:12 GMT Subject: rpms/splat/devel splat-1.2-build.patch,1.2,1.3 Message-ID: <200807302336.m6UNaCjN020438@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/splat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20385 Added Files: splat-1.2-build.patch Log Message: dding back the patch that was accidentally removed splat-1.2-build.patch: Index: splat-1.2-build.patch =================================================================== RCS file: splat-1.2-build.patch diff -N splat-1.2-build.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ splat-1.2-build.patch 30 Jul 2008 23:35:41 -0000 1.3 @@ -0,0 +1,24 @@ +diff -up splat-1.2.1/build.spc splat-1.2.1/build +--- splat-1.2.1/build.spc 2008-02-26 20:31:34.000000000 -0600 ++++ splat-1.2.1/build 2008-02-26 20:37:44.000000000 -0600 +@@ -8,13 +8,19 @@ cpu=`uname -m` + + if [ $cpu == "x86_64" ]; then + cpu="x86-64" ++elif [ $cpu == "ppc" ]; then ++ MARCH = "" ++elif [ $cpu == "ppc64" ]; then ++ MARCH = "" ++else ++ MARCH = " -march=$cpu " + fi + + build_splat() + { + echo -n "Compiling SPLAT!... " + ## g++ -Wall -O3 -s -lm -lbz2 -fomit-frame-pointer -march=$cpu itm.cpp splat.cpp -o splat +- g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat ++ g++ -Wall -O3 -fomit-frame-pointer -ffast-math $MARCH itm.cpp splat.cpp -lm -lbz2 -o splat + echo "Done!" + } + From fedora-extras-commits at redhat.com Wed Jul 30 23:40:20 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 30 Jul 2008 23:40:20 GMT Subject: extras-repoclosure PackageOwners.py,1.19,1.20 Message-ID: <200807302340.m6UNeKHH020564@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20548 Modified Files: PackageOwners.py Log Message: skip empty email addr fields - what the heck is going on in FAS2 group dump? Index: PackageOwners.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/PackageOwners.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- PackageOwners.py 23 Jul 2008 22:48:42 -0000 1.19 +++ PackageOwners.py 30 Jul 2008 23:40:20 -0000 1.20 @@ -253,6 +253,8 @@ print 'No email in:', line if addr == 'disabled': continue # no email for this user! + elif addr == '': + continue # what the heck is going on in fas dump? raise Exception self.usermap[user] = addr self._parse(self._getlinesfromurl(self.url)) From fedora-extras-commits at redhat.com Wed Jul 30 23:57:38 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 30 Jul 2008 23:57:38 GMT Subject: rpms/manaworld/devel .cvsignore, 1.10, 1.11 manaworld.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200807302357.m6UNvcFB021278@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/manaworld/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21224 Modified Files: .cvsignore manaworld.spec sources Log Message: Update to 0.0.25 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/manaworld/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 May 2008 15:26:11 -0000 1.10 +++ .cvsignore 30 Jul 2008 23:57:08 -0000 1.11 @@ -1 +1 @@ -tmw-0.0.24.1.tar.gz +tmw-0.0.25.tar.gz Index: manaworld.spec =================================================================== RCS file: /cvs/extras/rpms/manaworld/devel/manaworld.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- manaworld.spec 27 May 2008 15:26:11 -0000 1.13 +++ manaworld.spec 30 Jul 2008 23:57:08 -0000 1.14 @@ -1,5 +1,5 @@ Name: manaworld -Version: 0.0.24.1 +Version: 0.0.25 Release: 1%{?dist} Summary: 2D MMORPG world @@ -10,7 +10,7 @@ Patch0: tmw-0.0.24-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: guichan-devel desktop-file-utils physfs-devel +BuildRequires: guichan-devel >= 0.8.1 desktop-file-utils physfs-devel BuildRequires: curl-devel libxml2-devel libpng-devel BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel @@ -75,6 +75,9 @@ %changelog +* Wed Jul 30 2008 Wart 0.0.25-1 +- Update to 0.0.25 + * Mon May 26 2008 Wart 0.0.24.1-1 - Update to 0.0.24.1 (fixes BZ #448341) Index: sources =================================================================== RCS file: /cvs/extras/rpms/manaworld/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 May 2008 15:26:11 -0000 1.10 +++ sources 30 Jul 2008 23:57:08 -0000 1.11 @@ -1 +1 @@ -99eb83b6d37e2bd02fca48fa44e463e0 tmw-0.0.24.1.tar.gz +e445816e6f6139ed25acda499b556bc4 tmw-0.0.25.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 00:01:13 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 31 Jul 2008 00:01:13 GMT Subject: rpms/cyphesis/devel cyphesis.spec,1.22,1.23 Message-ID: <200807310001.m6V01DAD028102@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/cyphesis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21435 Modified Files: cyphesis.spec Log Message: Increase version in Obsoletes: for cyphesis-selinux Index: cyphesis.spec =================================================================== RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- cyphesis.spec 24 Jul 2008 04:22:51 -0000 1.22 +++ cyphesis.spec 31 Jul 2008 00:00:43 -0000 1.23 @@ -4,7 +4,7 @@ Name: cyphesis Version: 0.5.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WorldForge game server Group: System Environment/Libraries License: GPLv2+ @@ -31,7 +31,7 @@ Requires(preun): /sbin/service Requires(postun): /sbin/service -Obsoletes: cyphesis-selinux <= 0.5.15-6 +Obsoletes: cyphesis-selinux < 0.5.16 %description Cyphesis is a WorldForge server suitable running small games. It is also @@ -162,6 +162,9 @@ %changelog +* Wed Jul 30 2008 Wart 0.5.16-2 +- Increase version in Obsoletes: for cyphesis-selinux + * Wed Jul 23 2008 Wart 0.5.16-1 - Update to 0.5.16 From fedora-extras-commits at redhat.com Thu Jul 31 00:05:29 2008 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 31 Jul 2008 00:05:29 GMT Subject: rpms/cyphesis/F-9 cyphesis.spec,1.21,1.22 Message-ID: <200807310005.m6V05TcS028381@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/cyphesis/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28310 Modified Files: cyphesis.spec Log Message: Increase version in Obsoletes: entry for cyphesis-selinux Index: cyphesis.spec =================================================================== RCS file: /cvs/extras/rpms/cyphesis/F-9/cyphesis.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cyphesis.spec 7 Jun 2008 00:58:38 -0000 1.21 +++ cyphesis.spec 31 Jul 2008 00:04:59 -0000 1.22 @@ -4,7 +4,7 @@ Name: cyphesis Version: 0.5.15 -Release: 8%{?dist} +Release: 9%{?dist} Summary: WorldForge game server Group: System Environment/Libraries # Would be GPLv2+, except server/protocol_instructions.h is GPLv2 only. @@ -32,7 +32,7 @@ Requires(preun): /sbin/service Requires(postun): /sbin/service -Obsoletes: cyphesis-selinux <= 0.5.15-6 +Obsoletes: cyphesis-selinux < 0.5.16 %description Cyphesis is a WorldForge server suitable running small games. It is also @@ -167,6 +167,9 @@ %changelog +* Wed Jul 30 2008 Wart 0.5.15-9 +- Increase version in Obsoletes: entry for cyphesis-selinux + * Fri Jun 6 2008 Wart 0.5.15-8 - Remove selinux port contexts from init script From fedora-extras-commits at redhat.com Thu Jul 31 00:05:52 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Thu, 31 Jul 2008 00:05:52 GMT Subject: rpms/splat/F-9 bearing.man, NONE, 1.1 postdownload.man, NONE, 1.1 sources, 1.2, 1.3 splat.spec, 1.1, 1.2 splat-1.2-build.patch, 1.1, NONE splat-1.2-gcc.patch, 1.1, NONE splat-1.2-parens.patch, 1.1, NONE Message-ID: <200807310005.m6V05qwo028447@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/splat/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318 Modified Files: sources splat.spec Added Files: bearing.man postdownload.man Removed Files: splat-1.2-build.patch splat-1.2-gcc.patch splat-1.2-parens.patch Log Message: latest upstream, we now deliver the postdownload utility and the new bearing utility --- NEW FILE bearing.man --- .\" Man page for bearing .\" Created by copying text from utils/README .TH man 1 "30 July 2008" "1.0" "bearing" .SH NAME bearing \- returns the azimuth bearing and great circle path distance between two specified points .SH SYNOPSIS .B bearing file .SH DESCRIPTION .B bearing reads a pair of .qth files specified on the command line, and returns the azimuth bearing and great circle path distance between the two points specified. A -metric switch is available so that distances can be provided in kilometers rather than statute miles. SPLAT! provides similar distance and bearing information between two specific site locations. The bearing utility, however, provides the information quickly and easily over great distances without having to run SPLAT! .SH EXAMPLES bearing ai4qr.qth 940-repeater.qth .SH FILES .P .I /usr/bin/bearing .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Steve Conklin (fedora at conklinhouse.com) .fi .SH HISTORY 2008 \- Text copied from README --- NEW FILE postdownload.man --- .\" Man page for postdownload .\" Created by copying text from utils/README .TH man 1 "30 July 2008" "1.0" "postdownload" .SH NAME postdownload \- A front-end to the usgs2sdf utility .SH SYNOPSIS .B postdownload file .SH DESCRIPTION .B postdownload is a front-end to the usgs2sdf utility. postdownload takes as an argument the name of the gzipped Digital Elevation Model (DEM) downloaded from the US Geological Survey (ie: wilmington-w.gz). postdownload uncompresses the DEM file, adds necessary record delimiters, and invokes usgs2sdf to produce a SPLAT Data File (SDF). .P USGS Digital Elevation Models may be downloaded from: http://edcftp.cr.usgs.gov/pub/data/DEM/250/ Invoke postdownload with the name of each DEM file downloaded to produce a database of SPLAT Data Files. .SH EXAMPLES postdownload aberdeen .SH FILES .P .I /usr/bin/postdownload .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Steve Conklin (fedora at conklinhouse.com) .fi .SH HISTORY 2008 \- Text copied from README Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/splat/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Mar 2008 21:31:20 -0000 1.2 +++ sources 31 Jul 2008 00:05:22 -0000 1.3 @@ -1 +1 @@ -46a223f7db0d59dc79dd5467cdebf14d splat-1.2.1.tar.bz2 +48e1c8b71e18b843066c625ed3068a1b splat-1.2.3.tar.bz2 Index: splat.spec =================================================================== RCS file: /cvs/pkgs/rpms/splat/F-9/splat.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- splat.spec 2 Mar 2008 21:31:20 -0000 1.1 +++ splat.spec 31 Jul 2008 00:05:22 -0000 1.2 @@ -1,19 +1,19 @@ Name: splat -Version: 1.2.1 -Release: 6%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: Analyze point-to-point terrestrial RF communication links Group: Applications/Communications License: GPLv2+ URL: http://www.qsl.net/kd2bd/splat.html -Source0: http://www.ibiblio.org/pub/linux/apps/ham/%{name}-%{version}.tar.bz2 +Source0: http://www.qsl.net/kd2bd/%{name}-%{version}.tar.bz2 #man pages for utilities, generated from utils README file Source1: citydecoder.man Source2: srtm2sdf.man Source3: usgs2sdf.man -Patch0: splat-1.2-gcc.patch -Patch1: splat-1.2-build.patch -Patch2: splat-1.2-parens.patch +Source4: bearing.man +Source5: postdownload.man +Patch0: splat-1.2-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel @@ -36,15 +36,15 @@ Includes: citydecoder +bearing +postdownload srtm2sdf usg2sdf %prep %setup -q -%patch0 -p1 -b .gcc -%patch1 -p1 -b .ppc -%patch2 -p1 -b .parens +%patch0 -p1 -b .ppc #fix end of line encoding %{__sed} -i 's/\r//' utils/fips.txt @@ -57,6 +57,8 @@ groff -e -T ascii -man %{SOURCE1} > $RPM_BUILD_DIR/%{name}-%{version}/utils/citydecoder.1 groff -e -T ascii -man %{SOURCE2} > $RPM_BUILD_DIR/%{name}-%{version}/utils/srtm2sdf.1 groff -e -T ascii -man %{SOURCE3} > $RPM_BUILD_DIR/%{name}-%{version}/utils/usgs2sdf.1 +groff -e -T ascii -man %{SOURCE4} > $RPM_BUILD_DIR/%{name}-%{version}/utils/bearing.1 +groff -e -T ascii -man %{SOURCE5} > $RPM_BUILD_DIR/%{name}-%{version}/utils/postdownload.1 %install rm -rf $RPM_BUILD_ROOT @@ -66,10 +68,14 @@ install -D -m 0644 docs/spanish/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/es/man1/splat.1 #utils install -D -m 0755 utils/citydecoder $RPM_BUILD_ROOT%{_bindir}/citydecoder +install -D -m 0755 utils/bearing $RPM_BUILD_ROOT%{_bindir}/bearing +install -D -m 0755 utils/postdownload $RPM_BUILD_ROOT%{_bindir}/postdownload install -D -m 0755 utils/usgs2sdf $RPM_BUILD_ROOT%{_bindir}/usgs2sdf install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf -#additional man pagers +#additional man pages install -D -m 0644 utils/citydecoder.1 $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1 +install -D -m 0644 utils/bearing.1 $RPM_BUILD_ROOT%{_mandir}/man1/bearing.1 +install -D -m 0644 utils/postdownload.1 $RPM_BUILD_ROOT%{_mandir}/man1/postdownload.1 install -D -m 0644 utils/srtm2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1 install -D -m 0644 utils/usgs2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1 @@ -88,16 +94,23 @@ %files utils %doc COPYING utils/README utils/fips.txt %{_bindir}/citydecoder +%{_bindir}/bearing +%{_bindir}/postdownload %{_bindir}/srtm2sdf %{_bindir}/usgs2sdf %{_mandir}/man?/citydecoder* +%{_mandir}/man?/bearing* +%{_mandir}/man?/postdownload* %{_mandir}/man?/srtm2sdf* %{_mandir}/man?/usgs2sdf* %changelog +* Wed Jul 30 2008 Steve Conklin - 1.2.3-1 +- New upstream +- added delivery of postdownload script and the new bearing utility +- added man pages for bearing and postdownload * Thu Feb 28 2008 Steve Conklin - 1.2.1-6 - Silly, there's no gui. Removed desktop and icon files. - * Thu Feb 28 2008 Steve Conklin - 1.2.1-5 - installed desktop and icon files with main package, not utils --- splat-1.2-build.patch DELETED --- --- splat-1.2-gcc.patch DELETED --- --- splat-1.2-parens.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 00:37:54 2008 From: fedora-extras-commits at redhat.com (Stuttgarter Spielbank, Julia Feddersen (axaneune)) Date: Thu, 31 Jul 2008 08:37:54 +0800 Subject: =?iso-8859-1?q?Gewinnen_macht_gl=FCcklich?= Message-ID: <25C2AD42.9CF4BBDF@bigtvjp.com.br> Satte 1000.- Start-Bonus, warten auf dich, gleich hier Guten Tag Larissa, Mach die Ameise rein, hier geht die Post ab Homepage: findnamesstart(.)com Klammern weglassen Bis bald Stuttgarter Spielbank, Julia Feddersen From fedora-extras-commits at redhat.com Thu Jul 31 00:07:02 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Thu, 31 Jul 2008 00:07:02 GMT Subject: rpms/splat/F-9 splat-1.2-build.patch,1.2,1.3 Message-ID: <200807310007.m6V072gK028491@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/splat/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28466 Added Files: splat-1.2-build.patch Log Message: Added back the patch file we still need splat-1.2-build.patch: Index: splat-1.2-build.patch =================================================================== RCS file: splat-1.2-build.patch diff -N splat-1.2-build.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ splat-1.2-build.patch 31 Jul 2008 00:06:32 -0000 1.3 @@ -0,0 +1,24 @@ +diff -up splat-1.2.1/build.spc splat-1.2.1/build +--- splat-1.2.1/build.spc 2008-02-26 20:31:34.000000000 -0600 ++++ splat-1.2.1/build 2008-02-26 20:37:44.000000000 -0600 +@@ -8,13 +8,19 @@ cpu=`uname -m` + + if [ $cpu == "x86_64" ]; then + cpu="x86-64" ++elif [ $cpu == "ppc" ]; then ++ MARCH = "" ++elif [ $cpu == "ppc64" ]; then ++ MARCH = "" ++else ++ MARCH = " -march=$cpu " + fi + + build_splat() + { + echo -n "Compiling SPLAT!... " + ## g++ -Wall -O3 -s -lm -lbz2 -fomit-frame-pointer -march=$cpu itm.cpp splat.cpp -o splat +- g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat ++ g++ -Wall -O3 -fomit-frame-pointer -ffast-math $MARCH itm.cpp splat.cpp -lm -lbz2 -o splat + echo "Done!" + } + From fedora-extras-commits at redhat.com Thu Jul 31 00:20:04 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 31 Jul 2008 00:20:04 GMT Subject: rpms/asterisk/F-8 asterisk.spec,1.21,1.22 Message-ID: <200807310020.m6V0K4bn028928@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28889 Modified Files: asterisk.spec Log Message: * Wed Jul 30 2008 Jeffrey C. Ollie - 1.4.21.2-2 - Bump release and rebuild to pick up new libpri. Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- asterisk.spec 22 Jul 2008 23:41:09 -0000 1.21 +++ asterisk.spec 31 Jul 2008 00:19:33 -0000 1.22 @@ -3,7 +3,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.4.21.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -312,10 +312,10 @@ Summary: Modules for Asterisk that use Zaptel Group: Applications/Internet Requires: asterisk = %{version}-%{release} -Requires: zaptel >= 1.4.0 +Requires: zaptel >= 1.4.11 Requires(pre): %{_sbindir}/usermod -BuildRequires: zaptel-devel >= 1.4.0 -BuildRequires: libpri-devel >= 1.4.0 +BuildRequires: zaptel-devel >= 1.4.11 +BuildRequires: libpri-devel >= 1.4.6 %description zaptel Modules for Asterisk that use Zaptel. @@ -901,6 +901,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Wed Jul 30 2008 Jeffrey C. Ollie - 1.4.21.2-2 +- Bump release and rebuild to pick up new libpri. + * Tue Jul 22 2008 Jeffrey C. Ollie - 1.4.21.2-1 - Update to 1.4.21.2 to fix CVE-2008-3263 / AST-2008-010 and CVE-2008-3264 / AST-2008-011 From fedora-extras-commits at redhat.com Thu Jul 31 00:21:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 00:21:59 +0000 Subject: [pkgdb] jdom: overholt has requested commit Message-ID: <20080731002204.C5B341AD0EB@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has requested the commit acl on jdom (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jdom From fedora-extras-commits at redhat.com Thu Jul 31 00:22:38 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Thu, 31 Jul 2008 00:22:38 GMT Subject: rpms/banshee/F-9 banshee.spec,1.51,1.52 Message-ID: <200807310022.m6V0Mc5h029150@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/banshee/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29075/F-9 Modified Files: banshee.spec Log Message: * Thu Jul 31 2008 Nigel Jones - 1.2.0-2.1 - ifarching foo broke... now fixed Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/F-9/banshee.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- banshee.spec 30 Jul 2008 21:07:10 -0000 1.51 +++ banshee.spec 31 Jul 2008 00:22:08 -0000 1.52 @@ -2,7 +2,7 @@ Name: banshee Version: 1.2.0 -Release: 2%{?dist} +Release: 2.1%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT @@ -40,7 +40,7 @@ BuildRequires: gettext-devel perl(XML::Parser) # No boo-devel for ppc but we owe it to the users to keep banshee up to date -%ifnarch ppc +%ifarch %ix86 x86_64 sparc BuildRequires: boo-devel %endif @@ -71,6 +71,9 @@ %configure --disable-docs --with-gstreamer-0-10 --disable-helix \ --enable-external-ndesk-dbus \ --enable-ipod --enable-mtp --enable-podcast \ +%ifnarch %ix86 x86_64 sparc + --disable-boo \ +%endif --disable-gstreamer-plugins-check make @@ -126,10 +129,13 @@ %{_libdir}/pkgconfig/banshee-1-*.pc %changelog -* Wed Jul 31 2008 Nigel Jones - 1.2.0-2 +* Thu Jul 31 2008 Nigel Jones - 1.2.0-2.1 +- ifarching foo broke... now fixed + +* Wed Jul 30 2008 Nigel Jones - 1.2.0-2 - Reenable boo, I can't see why not now... -* Wed Jul 31 2008 Nigel Jones - 1.2.0-1 +* Wed Jul 30 2008 Nigel Jones - 1.2.0-1 - Update to 1.2.0 (new upstream release) - Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details From fedora-extras-commits at redhat.com Thu Jul 31 00:22:39 2008 From: fedora-extras-commits at redhat.com (Nigel Jones (nigelj)) Date: Thu, 31 Jul 2008 00:22:39 GMT Subject: rpms/banshee/devel banshee.spec,1.56,1.57 Message-ID: <200807310022.m6V0MdbM029154@cvs-int.fedora.redhat.com> Author: nigelj Update of /cvs/pkgs/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29075/devel Modified Files: banshee.spec Log Message: * Thu Jul 31 2008 Nigel Jones - 1.2.0-2.1 - ifarching foo broke... now fixed Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- banshee.spec 30 Jul 2008 21:07:11 -0000 1.56 +++ banshee.spec 31 Jul 2008 00:22:09 -0000 1.57 @@ -2,7 +2,7 @@ Name: banshee Version: 1.2.0 -Release: 2%{?dist} +Release: 2.1%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT @@ -39,7 +39,7 @@ BuildRequires: gettext-devel perl(XML::Parser) # No boo-devel for ppc but we owe it to the users to keep banshee up to date -%ifnarch ppc +%ifarch %ix86 x86_64 sparc BuildRequires: boo-devel %endif @@ -70,6 +70,9 @@ %configure --disable-docs --with-gstreamer-0-10 --disable-helix \ --enable-external-ndesk-dbus \ --enable-mtp --enable-ipod --enable-podcast \ +%ifnarch %ix86 x86_64 sparc + --disable-boo \ +%endif --disable-gstreamer-plugins-check make @@ -125,10 +128,13 @@ %{_libdir}/pkgconfig/banshee-1-*.pc %changelog -* Wed Jul 31 2008 Nigel Jones - 1.2.0-2 +* Thu Jul 31 2008 Nigel Jones - 1.2.0-2.1 +- ifarching foo broke... now fixed + +* Wed Jul 30 2008 Nigel Jones - 1.2.0-2 - Reenable boo, I can't see why not now... -* Wed Jul 31 2008 Nigel Jones - 1.2.0-1 +* Wed Jul 30 2008 Nigel Jones - 1.2.0-1 - Update to 1.2.0 (new upstream release) - Refer to: http://banshee-project.org/download/archives/1.2.0/ for more details From fedora-extras-commits at redhat.com Thu Jul 31 00:34:51 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 00:34:51 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.356,1.357 Message-ID: <200807310034.m6V0Yp8C029785@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29746 Modified Files: kdelibs.spec Log Message: * Wed Jul 30 2008 Rex Dieter 4.1.0-3 - (Build)Requires: soprano(-devel) >= 2.1 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.356 retrieving revision 1.357 diff -u -r1.356 -r1.357 --- kdelibs.spec 24 Jul 2008 18:41:01 -0000 1.356 +++ kdelibs.spec 31 Jul 2008 00:34:21 -0000 1.357 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -45,6 +45,7 @@ %if 0%{?fedora} >= 9 Requires: hunspell %endif +Requires: soprano >= 2.1 Source1: kde4.sh Source2: kde4.csh @@ -118,7 +119,7 @@ BuildRequires: phonon-backend-gstreamer BuildRequires: phonon-devel BuildRequires: shared-mime-info -BuildRequires: soprano-devel >= 2.0.97 +BuildRequires: soprano-devel >= 2.1 BuildRequires: strigi-devel >= 0.5.7 BuildRequires: zlib-devel # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) @@ -366,6 +367,9 @@ %changelog +* Wed Jul 30 2008 Rex Dieter 4.1.0-3 +- (Build)Requires: soprano(-devel) >= 2.1 + * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package - fix #453063 (Sonnet documentation multilib conflict) properly From fedora-extras-commits at redhat.com Thu Jul 31 00:38:50 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 31 Jul 2008 00:38:50 GMT Subject: rpms/eclipse/devel eclipse-copy-platform.sh, 1.6, 1.7 eclipse-memorypermsizeandjvmcrash.patch, 1.2, 1.3 eclipse.spec, 1.567, 1.568 Message-ID: <200807310038.m6V0coNB029982@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29951 Modified Files: eclipse-copy-platform.sh eclipse-memorypermsizeandjvmcrash.patch eclipse.spec Log Message: * Wed Jul 30 2008 Andrew Overholt 3.4.0-11 - Update copy-platform to work with dropins - Update JVM-crashing patch Index: eclipse-copy-platform.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-copy-platform.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- eclipse-copy-platform.sh 25 Apr 2008 23:56:41 -0000 1.6 +++ eclipse-copy-platform.sh 31 Jul 2008 00:38:20 -0000 1.7 @@ -27,7 +27,7 @@ where=$1; shift eclipse=$1; shift -mkdir -p $where/plugins $where/features $where/links +mkdir -p $where/plugins $where/features cd $where # Are there any optional arguments left? @@ -37,6 +37,22 @@ while read f; do [ ! -e $f ] && ln -s $eclipse/$f $f done + (cd $eclipse/dropins; ls -d *"$optional"*) | + while read f; do + if [ -e $eclipse/dropins/$f/eclipse ]; then + (cd $eclipse/dropins/$f/eclipse; ls -d plugins/* features/*) | + while read g; do + [ ! -e $g ] && \ + ln -s $eclipse/dropins/$f/eclipse/$g $g + done + else + (cd $eclipse/dropins; ls -d plugins/* features/*) | + while read g; do + [ ! -e $g ] && \ + ln -s $eclipse/dropins/$g $g + done + fi + done done fi eclipse-memorypermsizeandjvmcrash.patch: Index: eclipse-memorypermsizeandjvmcrash.patch =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-memorypermsizeandjvmcrash.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-memorypermsizeandjvmcrash.patch 14 Jul 2008 21:40:30 -0000 1.2 +++ eclipse-memorypermsizeandjvmcrash.patch 31 Jul 2008 00:38:20 -0000 1.3 @@ -6,12 +6,12 @@ retrieving revision 1.3 diff -u -r1.3 eclipse.ini --- gtk/eclipse.ini 3 Jun 2008 20:55:37 -0000 1.3 -+++ gtk/eclipse.ini 8 Jul 2008 19:51:57 -0000 -@@ -4,4 +4,5 @@ ++++ gtk/eclipse.ini 31 Jul 2008 00:28:29 -0000 +@@ -4,4 +4,6 @@ 256m -vmargs -Xms40m --Xmx256m +-Xmx512m +-XX:MaxPermSize=128m -\ No newline at end of file ++-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.567 retrieving revision 1.568 diff -u -r1.567 -r1.568 --- eclipse.spec 30 Jul 2008 11:41:40 -0000 1.567 +++ eclipse.spec 31 Jul 2008 00:38:20 -0000 1.568 @@ -1,11 +1,11 @@ # TODO: +# - update splash screen # - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 # - update ecj-rpmdebuginfo patch # - look at startup script and launcher patches # - get Ganymede update site pre-configured # - investigate bi-arch requirements -# - investigate need for copy-platform -# - see why about.html isn't being copied on non-x86{,_64} platforms +# - see why about.html isn't being copied on ppc Epoch: 1 %define eclipse_major 3 @@ -27,7 +27,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 10%{?dist} +Release: 11%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -910,9 +910,13 @@ cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir %endif +cat features/org.eclipse.platform/gtk/eclipse.ini.patched + cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \ $sdkDir/eclipse.ini +exit 1 + # Add a compatibility symlink to startup.jar pushd $sdkDir LAUNCHERNAME=$(ls plugins | grep equinox.launcher_) @@ -1050,7 +1054,7 @@ cp -p %{SOURCE16} copy-platform ( cd $RPM_BUILD_ROOT%{_libdir}/%{name} - ls -d * | egrep -v '^(plugins|features|about_files)$' + ls -d * | egrep -v '^(plugins|features|about_files|dropins)$' ls -d plugins/* features/* ) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform @@ -1442,6 +1446,10 @@ %{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Wed Jul 30 2008 Andrew Overholt 3.4.0-11 +- Update copy-platform to work with dropins +- Update JVM-crashing patch + * Mon Jul 28 2008 Andrew Overholt 3.4.0-10 - Move JDT and PDE/SDK bits to dropins/{jdt,sdk} - Drop versionless PDE Build symlink (put logic into pdebuild script) From fedora-extras-commits at redhat.com Thu Jul 31 00:43:44 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 00:43:44 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.357,1.358 Message-ID: <200807310043.m6V0hiq1030251@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30223 Modified Files: kdelibs.spec Log Message: note bz Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- kdelibs.spec 31 Jul 2008 00:34:21 -0000 1.357 +++ kdelibs.spec 31 Jul 2008 00:43:14 -0000 1.358 @@ -368,7 +368,7 @@ %changelog * Wed Jul 30 2008 Rex Dieter 4.1.0-3 -- (Build)Requires: soprano(-devel) >= 2.1 +- (Build)Requires: soprano(-devel) >= 2.1 (#456827) * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package From fedora-extras-commits at redhat.com Thu Jul 31 00:47:05 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 00:47:05 GMT Subject: rpms/kdelibs/F-9 kdelibs.spec,1.332,1.333 Message-ID: <200807310047.m6V0l5rF030469@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431 Modified Files: kdelibs.spec Log Message: * Wed Jul 30 2008 Rex Dieter 4.1.0-3 - (Build)Requires: soprano(-devel) >= 2.1 (#456827) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- kdelibs.spec 24 Jul 2008 21:04:15 -0000 1.332 +++ kdelibs.spec 31 Jul 2008 00:46:34 -0000 1.333 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -45,6 +45,7 @@ %if 0%{?fedora} >= 9 Requires: hunspell %endif +Requires: soprano >= 2.1 Source1: kde4.sh Source2: kde4.csh @@ -118,7 +119,7 @@ BuildRequires: phonon-backend-gstreamer BuildRequires: phonon-devel BuildRequires: shared-mime-info -BuildRequires: soprano-devel >= 2.0.97 +BuildRequires: soprano-devel >= 2.1 BuildRequires: strigi-devel >= 0.5.7 BuildRequires: zlib-devel # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) @@ -366,6 +367,9 @@ %changelog +* Wed Jul 30 2008 Rex Dieter 4.1.0-3 +- (Build)Requires: soprano(-devel) >= 2.1 (#456827) + * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package - fix #453063 (Sonnet documentation multilib conflict) properly From fedora-extras-commits at redhat.com Thu Jul 31 01:13:51 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 01:13:51 GMT Subject: rpms/kdelibs4/F-8 kdelibs4.spec,1.23,1.24 Message-ID: <200807310113.m6V1Dp6I005763@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5729 Modified Files: kdelibs4.spec Log Message: * Wed Jul 30 2008 Rex Dieter 4.1.0-3 - (Build)Requires: soprano(-devel) >= 2.1 (#456827) Index: kdelibs4.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kdelibs4.spec 24 Jul 2008 22:11:10 -0000 1.23 +++ kdelibs4.spec 31 Jul 2008 01:13:21 -0000 1.24 @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -45,6 +45,7 @@ %if 0%{?fedora} >= 9 Requires: hunspell %endif +Requires: soprano >= 2.1 Source1: kde4.sh Source2: kde4.csh @@ -118,7 +119,7 @@ BuildRequires: phonon-backend-gstreamer BuildRequires: phonon-devel BuildRequires: shared-mime-info -BuildRequires: soprano-devel >= 2.0.97 +BuildRequires: soprano-devel >= 2.1 BuildRequires: strigi-devel >= 0.5.7 BuildRequires: zlib-devel # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) @@ -366,6 +367,9 @@ %changelog +* Wed Jul 30 2008 Rex Dieter 4.1.0-3 +- (Build)Requires: soprano(-devel) >= 2.1 (#456827) + * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package - fix #453063 (Sonnet documentation multilib conflict) properly From fedora-extras-commits at redhat.com Thu Jul 31 01:13:48 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Thu, 31 Jul 2008 01:13:48 GMT Subject: rpms/ConsoleKit/devel .cvsignore, 1.15, 1.16 ConsoleKit.spec, 1.31, 1.32 sources, 1.18, 1.19 Message-ID: <200807310113.m6V1Dmtr005758@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/ConsoleKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5707 Modified Files: .cvsignore ConsoleKit.spec sources Log Message: - Update to 0.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 21 Jul 2008 18:10:33 -0000 1.15 +++ .cvsignore 31 Jul 2008 01:13:18 -0000 1.16 @@ -1 +1 @@ -ConsoleKit-0.2.11.tar.bz2 +ConsoleKit-0.3.0.tar.bz2 Index: ConsoleKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ConsoleKit.spec 22 Jul 2008 23:08:27 -0000 1.31 +++ ConsoleKit.spec 31 Jul 2008 01:13:18 -0000 1.32 @@ -5,8 +5,8 @@ Summary: System daemon for tracking users, sessions and seats Name: ConsoleKit -Version: 0.2.11 -Release: 0.2008.07.22.2%{?dist} +Version: 0.3.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/ConsoleKit @@ -147,6 +147,7 @@ %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* +%{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.*.xml %files docs %defattr(-,root,root,-) @@ -154,6 +155,9 @@ %doc %{_datadir}/doc/%{name}-%{version}/spec/* %changelog +* Wed Jul 30 2008 Jon McCann - 0.3.0-1 +- Update to 0.3.0 + * Tue Jul 22 2008 Jon McCann - 0.2.11-0.2008.07.22.2 - Update to a new snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 22 Jul 2008 23:08:27 -0000 1.18 +++ sources 31 Jul 2008 01:13:18 -0000 1.19 @@ -1 +1 @@ -6514a70a8d6ca0dec10d8f683acad2ea ConsoleKit-0.2.11.tar.bz2 +43b02a52212330b54cfb34c4044d9ce0 ConsoleKit-0.3.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 01:25:27 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Thu, 31 Jul 2008 01:25:27 GMT Subject: rpms/gdm/devel .cvsignore, 1.67, 1.68 gdm.spec, 1.401, 1.402 sources, 1.101, 1.102 Message-ID: <200807310125.m6V1PRQh006299@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6268 Modified Files: .cvsignore gdm.spec sources Log Message: - Update to 2.23.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- .cvsignore 21 Jul 2008 19:06:43 -0000 1.67 +++ .cvsignore 31 Jul 2008 01:24:57 -0000 1.68 @@ -1 +1 @@ -gdm-2.23.1.tar.bz2 +gdm-2.23.2.tar.bz2 Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.401 retrieving revision 1.402 diff -u -r1.401 -r1.402 --- gdm.spec 28 Jul 2008 19:58:27 -0000 1.401 +++ gdm.spec 31 Jul 2008 01:24:57 -0000 1.402 @@ -14,8 +14,8 @@ Summary: The GNOME Display Manager Name: gdm -Version: 2.23.1 -Release: 0.2008.07.28.1%{?dist} +Version: 2.23.2 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -298,6 +298,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Wed Jul 30 2008 Jon McCann - 1:2.23.2-1 +- Update to 2.23.2 + * Mon Jul 28 2008 Jon McCann - 1:2.23.1.0.2008.07.28.1 - Update to newer snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- sources 28 Jul 2008 19:58:27 -0000 1.101 +++ sources 31 Jul 2008 01:24:57 -0000 1.102 @@ -1 +1 @@ -b716739d238a15ba597976812d88bc99 gdm-2.23.1.tar.bz2 +d1e464916f13e50aa6e83c1aa2a1e450 gdm-2.23.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 01:35:24 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 31 Jul 2008 01:35:24 GMT Subject: rpms/swfdec/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 swfdec.spec, 1.13, 1.14 Message-ID: <200807310135.m6V1ZORW006623@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/swfdec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6592 Modified Files: .cvsignore sources swfdec.spec Log Message: * Wed Jul 30 2008 Brian Pepple - 0.7.4-1 - Update to 0.7.4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/swfdec/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Jun 2008 19:25:53 -0000 1.9 +++ .cvsignore 31 Jul 2008 01:34:54 -0000 1.10 @@ -1 +1 @@ -swfdec-0.7.2.tar.gz +swfdec-0.7.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/swfdec/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Jun 2008 19:25:53 -0000 1.9 +++ sources 31 Jul 2008 01:34:54 -0000 1.10 @@ -1 +1 @@ -7624b5642c947fb054273f091a1d970c swfdec-0.7.2.tar.gz +08fcda4a46454bfc66b97fba2d385f8c swfdec-0.7.4.tar.gz Index: swfdec.spec =================================================================== RCS file: /cvs/pkgs/rpms/swfdec/devel/swfdec.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- swfdec.spec 25 Jun 2008 19:25:53 -0000 1.13 +++ swfdec.spec 31 Jul 2008 01:34:54 -0000 1.14 @@ -4,7 +4,7 @@ %define pango_version 1.16 Name: swfdec -Version: %{major_version}.2 +Version: %{major_version}.4 Release: 1%{?dist} Summary: Flash animation rendering library @@ -109,23 +109,13 @@ %post -p /sbin/ldconfig -%post gtk -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +%post gtk -p /sbin/ldconfig %postun -p /sbin/ldconfig -%postun gtk -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +%postun gtk -p /sbin/ldconfig %files @@ -145,8 +135,8 @@ %files gtk %defattr(-,root,root,-) -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +#%{_datadir}/icons/hicolor/*/apps/%{name}.png +#%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_libdir}/libswfdec-gtk-%{major_version}.so.* @@ -158,6 +148,9 @@ %changelog +* Wed Jul 30 2008 Brian Pepple - 0.7.4-1 +- Update to 0.7.4. + * Wed Jun 25 2008 Brian Pepple - 0.7.2-1 - Update to 0.7.2 From fedora-extras-commits at redhat.com Thu Jul 31 03:13:18 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 31 Jul 2008 03:13:18 GMT Subject: rpms/swfdec-mozilla/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 swfdec-mozilla.spec, 1.7, 1.8 Message-ID: <200807310313.m6V3DIuk024602@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/swfdec-mozilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24475 Modified Files: .cvsignore sources swfdec-mozilla.spec Log Message: * Wed Jul 30 2008 Brian Pepple - 0.7.4-1 - Update to 0.7.4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-mozilla/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Jun 2008 19:38:10 -0000 1.6 +++ .cvsignore 31 Jul 2008 03:12:47 -0000 1.7 @@ -1 +1 @@ -swfdec-mozilla-0.7.2.tar.gz +swfdec-mozilla-0.7.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-mozilla/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jun 2008 19:38:10 -0000 1.6 +++ sources 31 Jul 2008 03:12:48 -0000 1.7 @@ -1 +1 @@ -3bc6a49357b4b8b478ce3dfb4f007f18 swfdec-mozilla-0.7.2.tar.gz +c5958f3b003190b21977495021ac2b28 swfdec-mozilla-0.7.4.tar.gz Index: swfdec-mozilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-mozilla/devel/swfdec-mozilla.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- swfdec-mozilla.spec 25 Jun 2008 19:38:10 -0000 1.7 +++ swfdec-mozilla.spec 31 Jul 2008 03:12:48 -0000 1.8 @@ -1,5 +1,5 @@ Name: swfdec-mozilla -Version: 0.7.2 +Version: 0.7.4 Release: 1%{?dist} Summary: Mozilla/Gecko player Flash plugin using swfdec @@ -40,13 +40,32 @@ rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + + %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README %{_libdir}/mozilla/plugins/*.so +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog +* Wed Jul 30 2008 Brian Pepple - 0.7.4-1 +- Update to 0.7.4. + * Wed Jun 25 2008 Brian Pepple - 0.7.2-1 - Update to 0.7.2. From fedora-extras-commits at redhat.com Thu Jul 31 03:33:00 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 31 Jul 2008 03:33:00 GMT Subject: rpms/swfdec-gnome/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 swfdec-gnome.spec, 1.10, 1.11 swfdec-gnome-configure.patch, 1.1, NONE Message-ID: <200807310333.m6V3X0mL026235@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/swfdec-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26186 Modified Files: .cvsignore sources swfdec-gnome.spec Removed Files: swfdec-gnome-configure.patch Log Message: * Wed Jul 30 2008 Brian Pepple - 2.23.2-1 - Update to 2.23.2. - Drop configure patch. Fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Jul 2008 17:37:18 -0000 1.7 +++ .cvsignore 31 Jul 2008 03:32:30 -0000 1.8 @@ -1 +1 @@ -swfdec-gnome-2.22.2.tar.bz2 +swfdec-gnome-2.23.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Jul 2008 17:37:18 -0000 1.7 +++ sources 31 Jul 2008 03:32:30 -0000 1.8 @@ -1 +1 @@ -7de99aff7978bc870e1eabb4ba8f0fc7 swfdec-gnome-2.22.2.tar.bz2 +f4bdda6cf589d9874d45b6acfc1ec2df swfdec-gnome-2.23.2.tar.bz2 Index: swfdec-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/swfdec-gnome/devel/swfdec-gnome.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- swfdec-gnome.spec 9 Jul 2008 17:37:18 -0000 1.10 +++ swfdec-gnome.spec 31 Jul 2008 03:32:30 -0000 1.11 @@ -1,5 +1,5 @@ Name: swfdec-gnome -Version: 2.22.2 +Version: 2.23.2 Release: 1%{?dist} Summary: Programs to integrate Flash into the GNOME desktop @@ -7,11 +7,10 @@ License: GPLv2+ URL: http://swfdec.freedesktop.org/ Source0: http://swfdec.freedesktop.org/download/%{name}/2.22/%{name}-%{version}.tar.bz2 -Patch0: %{name}-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.12.0 -BuildRequires: swfdec-gtk-devel >= 0.6.0 +BuildRequires: swfdec-gtk-devel >= 0.7.4 BuildRequires: GConf2 BuildRequires: desktop-file-utils BuildRequires: gettext @@ -30,7 +29,6 @@ %prep %setup -q -%patch -p1 -b .new %build %configure @@ -64,10 +62,18 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/swfdec-thumbnailer.schemas > /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %postun update-desktop-database &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %preun @@ -87,9 +93,14 @@ %{_datadir}/applications/fedora-swfdec-player.desktop %{_datadir}/%{name}/ %{_mandir}/man1/swfdec*.1.gz - +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog +* Wed Jul 30 2008 Brian Pepple - 2.23.2-1 +- Update to 2.23.2. +- Drop configure patch. Fixed upstream. + * Wed Jul 09 2008 Nikolay Vladimirov - 2.22.2-1 - Update to 2.22.2 - Add patch to build with swfdec-0.7.* --- swfdec-gnome-configure.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 04:21:54 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 31 Jul 2008 04:21:54 GMT Subject: rpms/VLGothic-fonts/devel .cvsignore, 1.3, 1.4 VLGothic-fonts.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200807310421.m6V4LsJt003794@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/VLGothic-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3586 Modified Files: .cvsignore VLGothic-fonts.spec sources Log Message: update to 20080624 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2008 07:40:25 -0000 1.3 +++ .cvsignore 31 Jul 2008 04:21:24 -0000 1.4 @@ -1 +1 @@ -VLGothic-20080429.tar.bz2 +VLGothic-20080624.tar.bz2 Index: VLGothic-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- VLGothic-fonts.spec 7 May 2008 07:40:25 -0000 1.13 +++ VLGothic-fonts.spec 31 Jul 2008 04:21:24 -0000 1.14 @@ -3,7 +3,7 @@ %define fontconfdir %{_sysconfdir}/fonts/conf.d Name: %{fontname}-fonts -Version: 20080429 +Version: 20080624 Release: 1%{?dist} Summary: Japanese TrueType font @@ -15,6 +15,7 @@ Source2: 59-VLGothic-monospace.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# added for f9 can be dropped in f11: Obsoletes: %{name}-monospace < 20071215-2 %description @@ -105,11 +106,14 @@ %changelog +* Thu Jul 31 2008 Jens Petersen - 20080624-1.fc10 +- update to 20080624 release + * Wed May 7 2008 Jens Petersen - 20080429-1 - update to 20080429 release - rename 59-VLGothic-sans.conf to 59-VLGothic-proportional.conf -* Thu Jan 17 2008 Jens Petersen - 20071215-2 +* Thu Jan 17 2008 Jens Petersen - 20071215-2.fc9 - move monospace font to main package and obsolete monospace subpackage - rename sans subpackage to proportional and obsolete sans subpackage - use a separate font dir for the proportional font subpackage Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 May 2008 07:40:25 -0000 1.9 +++ sources 31 Jul 2008 04:21:24 -0000 1.10 @@ -1 +1 @@ -5e87dc26f34d6539b5229e1e30643deb VLGothic-20080429.tar.bz2 +d508d04eeac3d6c74eacfbc258c236b3 VLGothic-20080624.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 05:04:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 31 Jul 2008 05:04:34 GMT Subject: rpms/jd/F-9 .cvsignore, 1.271, 1.272 jd.spec, 1.308, 1.309 sources, 1.272, 1.273 Message-ID: <200807310504.m6V54Y1j013042@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12964/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 31 2008 Mamoru Tasaka - rev. 2244 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- .cvsignore 30 Jul 2008 04:52:59 -0000 1.271 +++ .cvsignore 31 Jul 2008 05:04:04 -0000 1.272 @@ -1 +1 @@ -jd-2.0.1-svn2242_trunk.tgz +jd-2.0.1-svn2244_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- jd.spec 30 Jul 2008 04:52:59 -0000 1.308 +++ jd.spec 31 Jul 2008 05:04:04 -0000 1.309 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.1 -%define strtag svn2242_trunk +%define strtag svn2244_trunk %define repoid 32215 # Define this if this is pre-version %define pre_release 1 @@ -138,8 +138,8 @@ %{icondir}/%{name}.png %changelog -* Wed Jul 30 2008 Mamoru Tasaka -- rev. 2242 +* Thu Jul 31 2008 Mamoru Tasaka +- rev. 2244 * Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 - Change Japanese fonts Requires (F-10+) Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- sources 30 Jul 2008 04:52:59 -0000 1.272 +++ sources 31 Jul 2008 05:04:04 -0000 1.273 @@ -1 +1 @@ -92a5cc42b205ada89856d76709b95e59 jd-2.0.1-svn2242_trunk.tgz +4411ce1f6091e9a32c24381c21761d03 jd-2.0.1-svn2244_trunk.tgz From fedora-extras-commits at redhat.com Thu Jul 31 05:04:33 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 31 Jul 2008 05:04:33 GMT Subject: rpms/jd/F-8 .cvsignore, 1.264, 1.265 jd.spec, 1.297, 1.298 sources, 1.265, 1.266 Message-ID: <200807310504.m6V54XVd013038@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12964/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 31 2008 Mamoru Tasaka - rev. 2244 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- .cvsignore 30 Jul 2008 04:52:58 -0000 1.264 +++ .cvsignore 31 Jul 2008 05:04:03 -0000 1.265 @@ -1 +1 @@ -jd-2.0.1-svn2242_trunk.tgz +jd-2.0.1-svn2244_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- jd.spec 30 Jul 2008 04:52:58 -0000 1.297 +++ jd.spec 31 Jul 2008 05:04:03 -0000 1.298 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.1 -%define strtag svn2242_trunk +%define strtag svn2244_trunk %define repoid 32215 # Define this if this is pre-version %define pre_release 1 @@ -138,8 +138,8 @@ %{icondir}/%{name}.png %changelog -* Wed Jul 30 2008 Mamoru Tasaka -- rev. 2242 +* Thu Jul 31 2008 Mamoru Tasaka +- rev. 2244 * Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 - Change Japanese fonts Requires (F-10+) Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- sources 30 Jul 2008 04:52:58 -0000 1.265 +++ sources 31 Jul 2008 05:04:03 -0000 1.266 @@ -1 +1 @@ -92a5cc42b205ada89856d76709b95e59 jd-2.0.1-svn2242_trunk.tgz +4411ce1f6091e9a32c24381c21761d03 jd-2.0.1-svn2244_trunk.tgz From fedora-extras-commits at redhat.com Thu Jul 31 05:04:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 31 Jul 2008 05:04:34 GMT Subject: rpms/jd/devel .cvsignore, 1.271, 1.272 jd.spec, 1.316, 1.317 sources, 1.272, 1.273 Message-ID: <200807310504.m6V54Y5f013049@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12964/devel Modified Files: .cvsignore jd.spec sources Log Message: * Thu Jul 31 2008 Mamoru Tasaka - rev. 2244 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- .cvsignore 30 Jul 2008 04:52:59 -0000 1.271 +++ .cvsignore 31 Jul 2008 05:04:04 -0000 1.272 @@ -1 +1 @@ -jd-2.0.1-svn2242_trunk.tgz +jd-2.0.1-svn2244_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- jd.spec 30 Jul 2008 04:52:59 -0000 1.316 +++ jd.spec 31 Jul 2008 05:04:04 -0000 1.317 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.1 -%define strtag svn2242_trunk +%define strtag svn2244_trunk %define repoid 32215 # Define this if this is pre-version %define pre_release 1 @@ -138,8 +138,8 @@ %{icondir}/%{name}.png %changelog -* Wed Jul 30 2008 Mamoru Tasaka -- rev. 2242 +* Thu Jul 31 2008 Mamoru Tasaka +- rev. 2244 * Mon Jul 28 2008 Mamoru Tasaka - 2.0.0-2 - Change Japanese fonts Requires (F-10+) Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- sources 30 Jul 2008 04:52:59 -0000 1.272 +++ sources 31 Jul 2008 05:04:04 -0000 1.273 @@ -1 +1 @@ -92a5cc42b205ada89856d76709b95e59 jd-2.0.1-svn2242_trunk.tgz +4411ce1f6091e9a32c24381c21761d03 jd-2.0.1-svn2244_trunk.tgz From fedora-extras-commits at redhat.com Thu Jul 31 06:32:19 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 06:32:19 GMT Subject: rpms/liblinebreak/devel liblinebreak-devel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807310632.m6V6WJLj023429@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23350 Modified Files: .cvsignore sources Added Files: liblinebreak-devel.spec Log Message: --- NEW FILE liblinebreak-devel.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak-devel Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:08:45 -0000 1.1 +++ .cvsignore 31 Jul 2008 06:31:48 -0000 1.2 @@ -0,0 +1 @@ +linebreak-0.9.6-20080421.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 07:19:00 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 31 Jul 2008 07:19:00 GMT Subject: rpms/mythes-de/devel mythes-de.spec,1.10,1.11 sources,1.11,1.12 Message-ID: <200807310719.m6V7J0mT031782@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-de/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31737 Modified Files: mythes-de.spec sources Log Message: latest version Index: mythes-de.spec =================================================================== RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mythes-de.spec 30 Jun 2008 08:49:42 -0000 1.10 +++ mythes-de.spec 31 Jul 2008 07:18:29 -0000 1.11 @@ -1,6 +1,6 @@ Name: mythes-de Summary: German thesarus -%define upstreamid 20080630 +%define upstreamid 20080731 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://www.openthesaurus.de/download/thes_de_DE_v2.zip @@ -44,32 +44,6 @@ %{_datadir}/mythes/* %changelog -* Mon Jun 30 2008 Caolan McNamara - 0.20080630-1 +* Thu Jul 31 2008 Caolan McNamara - 0.20080731-1 - latest version -* Sat Jun 14 2008 Caolan McNamara - 0.20080614-1 -- latest version - -* Tue May 13 2008 Caolan McNamara - 0.20080513-1 -- latest version - -* Mon Apr 07 2008 Caolan McNamara - 0.20080407-1 -- latest version - -* Tue Mar 04 2008 Caolan McNamara - 0.20080304-1 -- latest version - -* Sun Feb 03 2008 Caolan McNamara - 0.20080203-1 -- latest version - -* Wed Jan 02 2008 Caolan McNamara - 0.20080102-1 -- latest version - -* Sat Dec 08 2007 Caolan McNamara - 0.20071208-1 -- latest version - -* Tue Dec 04 2007 Caolan McNamara - 0.20071204-1 -- latest version - -* Wed Nov 28 2007 Caolan McNamara - 0.20071128-1 -- initial version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mythes-de/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 30 Jun 2008 08:49:42 -0000 1.11 +++ sources 31 Jul 2008 07:18:29 -0000 1.12 @@ -1 +1 @@ -2e437f5e9487dd02598a844c39291e4b thes_de_DE_v2.zip +257a57e6c156765d88d0210ce065fd30 thes_de_DE_v2.zip From fedora-extras-commits at redhat.com Thu Jul 31 07:26:14 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:26:14 GMT Subject: rpms/liblinebreak/EL-5 liblinebreak-devel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807310726.m6V7QEwd032128@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32043/EL-5 Modified Files: .cvsignore sources Added Files: liblinebreak-devel.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions --- NEW FILE liblinebreak-devel.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak-devel Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:08:45 -0000 1.1 +++ .cvsignore 31 Jul 2008 07:25:43 -0000 1.2 @@ -0,0 +1 @@ +linebreak-0.9.6-20080421.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:08:45 -0000 1.1 +++ sources 31 Jul 2008 07:25:43 -0000 1.2 @@ -0,0 +1 @@ +15d23a4299d9ace9671e1eefd4adc2a0 linebreak-0.9.6-20080421.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 07:26:14 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:26:14 GMT Subject: rpms/liblinebreak/F-8 liblinebreak-devel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807310726.m6V7QEmu032132@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32043/F-8 Modified Files: .cvsignore sources Added Files: liblinebreak-devel.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions --- NEW FILE liblinebreak-devel.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak-devel Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:08:45 -0000 1.1 +++ .cvsignore 31 Jul 2008 07:25:44 -0000 1.2 @@ -0,0 +1 @@ +linebreak-0.9.6-20080421.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:08:45 -0000 1.1 +++ sources 31 Jul 2008 07:25:44 -0000 1.2 @@ -0,0 +1 @@ +15d23a4299d9ace9671e1eefd4adc2a0 linebreak-0.9.6-20080421.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 07:26:15 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:26:15 GMT Subject: rpms/liblinebreak/F-9 liblinebreak-devel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807310726.m6V7QFl0032136@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32043/F-9 Modified Files: .cvsignore sources Added Files: liblinebreak-devel.spec Log Message: * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions --- NEW FILE liblinebreak-devel.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak-devel Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jul 2008 22:08:45 -0000 1.1 +++ .cvsignore 31 Jul 2008 07:25:44 -0000 1.2 @@ -0,0 +1 @@ +linebreak-0.9.6-20080421.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jul 2008 22:08:45 -0000 1.1 +++ sources 31 Jul 2008 07:25:44 -0000 1.2 @@ -0,0 +1 @@ +15d23a4299d9ace9671e1eefd4adc2a0 linebreak-0.9.6-20080421.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 07:30:19 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Thu, 31 Jul 2008 07:30:19 GMT Subject: rpms/binutils/F-9 binutils-2.18.50.0.6-spu_ovl-dependency.patch, NONE, 1.1 binutils-2.18.50.0.6-spu_ovl-fatal.patch, NONE, 1.1 binutils-2.18.50.0.6-place-orphan.patch, 1.1, 1.2 binutils.spec, 1.134, 1.135 Message-ID: <200807310730.m6V7UJKw032499@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/binutils/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32382 Modified Files: binutils-2.18.50.0.6-place-orphan.patch binutils.spec Added Files: binutils-2.18.50.0.6-spu_ovl-dependency.patch binutils-2.18.50.0.6-spu_ovl-fatal.patch Log Message: * Thu Jul 31 2008 Jan Kratochvil 2.18.50.0.6-5 - Enable the spu target on ppc/ppc64 (BZ 455242). binutils-2.18.50.0.6-spu_ovl-dependency.patch: --- NEW FILE binutils-2.18.50.0.6-spu_ovl-dependency.patch --- 2008-07-30 Jan Kratochvil * Makefile.def: ld's spu_ovl.o depends on gas and binutils. * Makefile.in: Regenerate. --- Makefile.def 30 Jul 2008 15:03:54 -0000 1.92 +++ Makefile.def 30 Jul 2008 21:18:12 -0000 @@ -378,6 +378,9 @@ dependencies = { module=all-ld; on=all-b dependencies = { module=all-ld; on=all-build-byacc; }; dependencies = { module=all-ld; on=all-build-flex; }; dependencies = { module=all-ld; on=all-intl; }; +// spu_ovl.o depends on both gas and binutils/bin2c +dependencies = { module=all-ld; on=all-gas; }; +dependencies = { module=all-ld; on=all-binutils; }; dependencies = { module=configure-gold; on=configure-intl; }; dependencies = { module=all-gold; on=all-libiberty; }; dependencies = { module=all-gold; on=all-intl; }; --- Makefile.in 30 Jul 2008 15:03:54 -0000 1.285 +++ Makefile.in 30 Jul 2008 21:18:34 -0000 @@ -53308,6 +53308,26 @@ all-stageb3g2-ld: maybe-all-stageb3g2-in all-stage4-ld: maybe-all-stage4-intl all-stageprofile-ld: maybe-all-stageprofile-intl all-stagefeedback-ld: maybe-all-stagefeedback-intl +all-ld: maybe-all-gas + +all-stage1-ld: maybe-all-stage1-gas +all-stage2-ld: maybe-all-stage2-gas +all-stageb2g0-ld: maybe-all-stageb2g0-gas +all-stage3-ld: maybe-all-stage3-gas +all-stageb3g2-ld: maybe-all-stageb3g2-gas +all-stage4-ld: maybe-all-stage4-gas +all-stageprofile-ld: maybe-all-stageprofile-gas +all-stagefeedback-ld: maybe-all-stagefeedback-gas +all-ld: maybe-all-binutils + +all-stage1-ld: maybe-all-stage1-binutils +all-stage2-ld: maybe-all-stage2-binutils +all-stageb2g0-ld: maybe-all-stageb2g0-binutils +all-stage3-ld: maybe-all-stage3-binutils +all-stageb3g2-ld: maybe-all-stageb3g2-binutils +all-stage4-ld: maybe-all-stage4-binutils +all-stageprofile-ld: maybe-all-stageprofile-binutils +all-stagefeedback-ld: maybe-all-stagefeedback-binutils configure-gold: maybe-configure-intl configure-stage1-gold: maybe-configure-stage1-intl binutils-2.18.50.0.6-spu_ovl-fatal.patch: --- NEW FILE binutils-2.18.50.0.6-spu_ovl-fatal.patch --- 2008-07-30 Jan Kratochvil * emultempl/spuelf.em: Abort on the missing required `spu_ovl.o'. --- ld/emultempl/spuelf.em 19 Jun 2008 16:14:53 -0000 1.24 +++ ld/emultempl/spuelf.em 30 Jul 2008 18:28:25 -0000 @@ -57,7 +57,12 @@ char **my_argv; static const char ovl_mgr[] = { EOF -../binutils/bin2c < ${srcdir}/emultempl/spu_ovl.o >> e${EMULATION_NAME}.c +if ! ../binutils/bin2c < ${srcdir}/emultempl/spu_ovl.o >> e${EMULATION_NAME}.c +then + echo >&2 "Missing ${srcdir}/emultempl/spu_ovl.o" + echo >&2 "You must build gas/as-new with --target=spu to build spu_ovl.o" + exit 1 +fi fragment <= 4.0, dejagnu, gettext, flex, bison @@ -67,6 +69,10 @@ %patch6 -p0 -b .symbolic-envvar-revert~ %patch7 -p0 -b .version~ %patch8 -p0 -b .pclmul~ +%patch9 -p0 -b .spu_ovl-fatal~ +%patch10 -p0 -b .spu_ovl-dependency~ + +# We cannot run autotools as there is an exact requirement of autoconf-2.59. # On ppc64 we might use 64K pages sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c @@ -82,15 +88,34 @@ touch */configure %build -mkdir build-%{_target_platform} -cd build-%{_target_platform} CARGS= + %ifarch sparc ppc s390 -CARGS=--enable-64-bit-bfd +CARGS="$CARGS --enable-64-bit-bfd" %endif + %ifarch ia64 -CARGS=--enable-targets=i386-linux +CARGS="$CARGS --enable-targets=i386-linux" %endif + +%ifarch ppc ppc64 +CARGS="$CARGS --enable-targets=spu" +# This file is present in CVS but missing in H. J. Lu's snapshots. +# To include it for --enable-targets=spu we need to build gas by --target=spu. +! test -f ld/emultempl/spu_ovl.o +mkdir build-spu +cd build-spu +CFLAGS="${CFLAGS:-%optflags} -O0 -s" ../configure \ + --target=spu --disable-shared --enable-static --disable-werror \ + --with-bugurl=http://bugzilla.redhat.com/bugzilla/ +make %{_smp_mflags} all +cd .. +test -f ld/emultempl/spu_ovl.o +rm -rf build-spu +%endif + +mkdir build-%{_target_platform} +cd build-%{_target_platform} CC="gcc -L`pwd`/bfd/.libs/" CFLAGS="${CFLAGS:-%optflags}" ../configure \ %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ @@ -225,6 +250,9 @@ %{_infodir}/bfd*info* %changelog +* Thu Jul 31 2008 Jan Kratochvil 2.18.50.0.6-5 +- Enable the spu target on ppc/ppc64 (BZ 455242). + * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-4 - include the `dist' tag in the Release number - libbfd.a symbols visibility is now hidden (for #447426, suggested by Jakub) From fedora-extras-commits at redhat.com Thu Jul 31 07:36:38 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:36:38 GMT Subject: rpms/fbreader/F-8 fbreader-0.8.17-desktop-file.patch, NONE, 1.1 fbreader.spec, 1.7, 1.8 fbreader-desktop.patch, 1.2, NONE Message-ID: <200807310736.m6V7ac0J000479@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391/F-8 Modified Files: fbreader.spec Added Files: fbreader-0.8.17-desktop-file.patch Removed Files: fbreader-desktop.patch Log Message: * Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 fbreader-0.8.17-desktop-file.patch: --- NEW FILE fbreader-0.8.17-desktop-file.patch --- --- fbreader-0.8.17/fbreader/desktop/desktop.desktop-file 2008-03-22 09:00:31.000000000 -0400 +++ fbreader-0.8.17/fbreader/desktop/desktop 2008-07-06 00:23:19.000000000 -0400 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=E-book reader +Name=FBReader E-book Reader Name[ru]=???????????? ?????????????????????? ???????? -GenericName=E-book reader +GenericName=E-book Reader GenericName[ru]=???????????? ?????????????????????? ???????? Comment=E-book reader Comment[ru]=???????????? ?????????????????????? ???????? @@ -11,5 +11,5 @@ StartupNotify=true Terminal=false Type=Application -Icon=FBReader.png -Categories=Office;Viewer;Literature; +Icon=FBReader +Categories=GTK;Office;Viewer; Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-8/fbreader.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fbreader.spec 20 Jan 2008 17:53:16 -0000 1.7 +++ fbreader.spec 31 Jul 2008 07:36:08 -0000 1.8 @@ -1,6 +1,6 @@ # rebuild with --with qt4 to build optional qt4 UI Name: fbreader -Version: 0.8.12 +Version: 0.8.17 Release: 1%{?dist} Summary: E-book reader @@ -116,30 +116,36 @@ %changelog -* Sun Jan 20 2008 Michel Salim - 0.8.12-1 +* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +- Update to 0.8.17 + +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 +- Autorebuild for GCC 4.3 + +* Sun Jan 20 2008 Michel Alexandre Salim - 0.8.12-1 - Update to 0.8.12 -* Mon Jan 7 2008 Michel Salim - 0.8.10-1 +* Mon Jan 7 2008 Michel Alexandre Salim - 0.8.10-1 - Update to 0.8.10 - Remove workaround for PDB issues on x86_64; fixed upstream -* Thu Dec 20 2007 Michel Salim - 0.8.8a-1 +* Thu Dec 20 2007 Michel Alexandre Salim - 0.8.8a-1 - Update to 0.8.8a - Workaround for PDB format handler when reading certain files -* Wed Dec 19 2007 Michel Salim - 0.8.8-2 +* Wed Dec 19 2007 Michel Alexandre Salim - 0.8.8-2 - Fix inclusion of debug files where libdir=/usr/lib (bz #411891) -* Sun Dec 2 2007 Michel Salim - 0.8.8-1 +* Sun Dec 2 2007 Michel Alexandre Salim - 0.8.8-1 - Update to 0.8.8 -* Thu Oct 18 2007 Michel Salim - 0.8.6d-3 +* Thu Oct 18 2007 Michel Alexandre Salim - 0.8.6d-3 - Generate proper -debuginfo subpackage (bz #329841, Ville Skytta) - Add README.Fedora detailing zTXT bug on x86_64 -* Sat Sep 22 2007 Michel Salim - 0.8.6d-2 +* Sat Sep 22 2007 Michel Alexandre Salim - 0.8.6d-2 - Fix vendor tag - Use compiler flags provided by the system -* Sun Sep 16 2007 Michel Salim - 0.8.6d-1 +* Sun Sep 16 2007 Michel Alexandre Salim - 0.8.6d-1 - Initial package --- fbreader-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 07:36:37 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:36:37 GMT Subject: rpms/fbreader/EL-5 fbreader-0.8.17-desktop-file.patch, NONE, 1.1 fbreader.spec, 1.7, 1.8 fbreader-desktop.patch, 1.2, NONE Message-ID: <200807310736.m6V7abZo000476@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391/EL-5 Modified Files: fbreader.spec Added Files: fbreader-0.8.17-desktop-file.patch Removed Files: fbreader-desktop.patch Log Message: * Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 fbreader-0.8.17-desktop-file.patch: --- NEW FILE fbreader-0.8.17-desktop-file.patch --- --- fbreader-0.8.17/fbreader/desktop/desktop.desktop-file 2008-03-22 09:00:31.000000000 -0400 +++ fbreader-0.8.17/fbreader/desktop/desktop 2008-07-06 00:23:19.000000000 -0400 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=E-book reader +Name=FBReader E-book Reader Name[ru]=???????????? ?????????????????????? ???????? -GenericName=E-book reader +GenericName=E-book Reader GenericName[ru]=???????????? ?????????????????????? ???????? Comment=E-book reader Comment[ru]=???????????? ?????????????????????? ???????? @@ -11,5 +11,5 @@ StartupNotify=true Terminal=false Type=Application -Icon=FBReader.png -Categories=Office;Viewer;Literature; +Icon=FBReader +Categories=GTK;Office;Viewer; Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fbreader.spec 20 Jan 2008 17:53:06 -0000 1.7 +++ fbreader.spec 31 Jul 2008 07:36:07 -0000 1.8 @@ -1,6 +1,6 @@ # rebuild with --with qt4 to build optional qt4 UI Name: fbreader -Version: 0.8.12 +Version: 0.8.17 Release: 1%{?dist} Summary: E-book reader @@ -116,30 +116,36 @@ %changelog -* Sun Jan 20 2008 Michel Salim - 0.8.12-1 +* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +- Update to 0.8.17 + +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 +- Autorebuild for GCC 4.3 + +* Sun Jan 20 2008 Michel Alexandre Salim - 0.8.12-1 - Update to 0.8.12 -* Mon Jan 7 2008 Michel Salim - 0.8.10-1 +* Mon Jan 7 2008 Michel Alexandre Salim - 0.8.10-1 - Update to 0.8.10 - Remove workaround for PDB issues on x86_64; fixed upstream -* Thu Dec 20 2007 Michel Salim - 0.8.8a-1 +* Thu Dec 20 2007 Michel Alexandre Salim - 0.8.8a-1 - Update to 0.8.8a - Workaround for PDB format handler when reading certain files -* Wed Dec 19 2007 Michel Salim - 0.8.8-2 +* Wed Dec 19 2007 Michel Alexandre Salim - 0.8.8-2 - Fix inclusion of debug files where libdir=/usr/lib (bz #411891) -* Sun Dec 2 2007 Michel Salim - 0.8.8-1 +* Sun Dec 2 2007 Michel Alexandre Salim - 0.8.8-1 - Update to 0.8.8 -* Thu Oct 18 2007 Michel Salim - 0.8.6d-3 +* Thu Oct 18 2007 Michel Alexandre Salim - 0.8.6d-3 - Generate proper -debuginfo subpackage (bz #329841, Ville Skytta) - Add README.Fedora detailing zTXT bug on x86_64 -* Sat Sep 22 2007 Michel Salim - 0.8.6d-2 +* Sat Sep 22 2007 Michel Alexandre Salim - 0.8.6d-2 - Fix vendor tag - Use compiler flags provided by the system -* Sun Sep 16 2007 Michel Salim - 0.8.6d-1 +* Sun Sep 16 2007 Michel Alexandre Salim - 0.8.6d-1 - Initial package --- fbreader-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 07:36:38 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:36:38 GMT Subject: rpms/fbreader/F-9 fbreader-0.8.17-desktop-file.patch, NONE, 1.1 fbreader.spec, 1.10, 1.11 fbreader-desktop.patch, 1.2, NONE Message-ID: <200807310736.m6V7acBO000482@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391/F-9 Modified Files: fbreader.spec Added Files: fbreader-0.8.17-desktop-file.patch Removed Files: fbreader-desktop.patch Log Message: * Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 fbreader-0.8.17-desktop-file.patch: --- NEW FILE fbreader-0.8.17-desktop-file.patch --- --- fbreader-0.8.17/fbreader/desktop/desktop.desktop-file 2008-03-22 09:00:31.000000000 -0400 +++ fbreader-0.8.17/fbreader/desktop/desktop 2008-07-06 00:23:19.000000000 -0400 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=E-book reader +Name=FBReader E-book Reader Name[ru]=???????????? ?????????????????????? ???????? -GenericName=E-book reader +GenericName=E-book Reader GenericName[ru]=???????????? ?????????????????????? ???????? Comment=E-book reader Comment[ru]=???????????? ?????????????????????? ???????? @@ -11,5 +11,5 @@ StartupNotify=true Terminal=false Type=Application -Icon=FBReader.png -Categories=Office;Viewer;Literature; +Icon=FBReader +Categories=GTK;Office;Viewer; Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-9/fbreader.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fbreader.spec 19 Feb 2008 23:12:16 -0000 1.10 +++ fbreader.spec 31 Jul 2008 07:36:08 -0000 1.11 @@ -1,7 +1,7 @@ # rebuild with --with qt4 to build optional qt4 UI Name: fbreader -Version: 0.8.12 -Release: 2%{?dist} +Version: 0.8.17 +Release: 1%{?dist} Summary: E-book reader Group: Applications/Publishing @@ -116,33 +116,36 @@ %changelog +* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +- Update to 0.8.17 + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 - Autorebuild for GCC 4.3 -* Sun Jan 20 2008 Michel Salim - 0.8.12-1 +* Sun Jan 20 2008 Michel Alexandre Salim - 0.8.12-1 - Update to 0.8.12 -* Mon Jan 7 2008 Michel Salim - 0.8.10-1 +* Mon Jan 7 2008 Michel Alexandre Salim - 0.8.10-1 - Update to 0.8.10 - Remove workaround for PDB issues on x86_64; fixed upstream -* Thu Dec 20 2007 Michel Salim - 0.8.8a-1 +* Thu Dec 20 2007 Michel Alexandre Salim - 0.8.8a-1 - Update to 0.8.8a - Workaround for PDB format handler when reading certain files -* Wed Dec 19 2007 Michel Salim - 0.8.8-2 +* Wed Dec 19 2007 Michel Alexandre Salim - 0.8.8-2 - Fix inclusion of debug files where libdir=/usr/lib (bz #411891) -* Sun Dec 2 2007 Michel Salim - 0.8.8-1 +* Sun Dec 2 2007 Michel Alexandre Salim - 0.8.8-1 - Update to 0.8.8 -* Thu Oct 18 2007 Michel Salim - 0.8.6d-3 +* Thu Oct 18 2007 Michel Alexandre Salim - 0.8.6d-3 - Generate proper -debuginfo subpackage (bz #329841, Ville Skytta) - Add README.Fedora detailing zTXT bug on x86_64 -* Sat Sep 22 2007 Michel Salim - 0.8.6d-2 +* Sat Sep 22 2007 Michel Alexandre Salim - 0.8.6d-2 - Fix vendor tag - Use compiler flags provided by the system -* Sun Sep 16 2007 Michel Salim - 0.8.6d-1 +* Sun Sep 16 2007 Michel Alexandre Salim - 0.8.6d-1 - Initial package --- fbreader-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 07:36:39 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:36:39 GMT Subject: rpms/fbreader/devel fbreader-0.8.17-desktop-file.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 fbreader.spec, 1.10, 1.11 sources, 1.6, 1.7 fbreader-desktop.patch, 1.2, NONE Message-ID: <200807310736.m6V7adG3000487@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391/devel Modified Files: .cvsignore fbreader.spec sources Added Files: fbreader-0.8.17-desktop-file.patch Removed Files: fbreader-desktop.patch Log Message: * Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 fbreader-0.8.17-desktop-file.patch: --- NEW FILE fbreader-0.8.17-desktop-file.patch --- --- fbreader-0.8.17/fbreader/desktop/desktop.desktop-file 2008-03-22 09:00:31.000000000 -0400 +++ fbreader-0.8.17/fbreader/desktop/desktop 2008-07-06 00:23:19.000000000 -0400 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=E-book reader +Name=FBReader E-book Reader Name[ru]=???????????? ?????????????????????? ???????? -GenericName=E-book reader +GenericName=E-book Reader GenericName[ru]=???????????? ?????????????????????? ???????? Comment=E-book reader Comment[ru]=???????????? ?????????????????????? ???????? @@ -11,5 +11,5 @@ StartupNotify=true Terminal=false Type=Application -Icon=FBReader.png -Categories=Office;Viewer;Literature; +Icon=FBReader +Categories=GTK;Office;Viewer; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Jan 2008 17:53:23 -0000 1.6 +++ .cvsignore 31 Jul 2008 07:36:09 -0000 1.7 @@ -1 +1 @@ -fbreader-sources-0.8.12.tgz +fbreader-sources-0.8.17.tgz Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fbreader.spec 19 Feb 2008 23:12:16 -0000 1.10 +++ fbreader.spec 31 Jul 2008 07:36:09 -0000 1.11 @@ -1,7 +1,7 @@ # rebuild with --with qt4 to build optional qt4 UI Name: fbreader -Version: 0.8.12 -Release: 2%{?dist} +Version: 0.8.17 +Release: 1%{?dist} Summary: E-book reader Group: Applications/Publishing @@ -116,33 +116,36 @@ %changelog +* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +- Update to 0.8.17 + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 - Autorebuild for GCC 4.3 -* Sun Jan 20 2008 Michel Salim - 0.8.12-1 +* Sun Jan 20 2008 Michel Alexandre Salim - 0.8.12-1 - Update to 0.8.12 -* Mon Jan 7 2008 Michel Salim - 0.8.10-1 +* Mon Jan 7 2008 Michel Alexandre Salim - 0.8.10-1 - Update to 0.8.10 - Remove workaround for PDB issues on x86_64; fixed upstream -* Thu Dec 20 2007 Michel Salim - 0.8.8a-1 +* Thu Dec 20 2007 Michel Alexandre Salim - 0.8.8a-1 - Update to 0.8.8a - Workaround for PDB format handler when reading certain files -* Wed Dec 19 2007 Michel Salim - 0.8.8-2 +* Wed Dec 19 2007 Michel Alexandre Salim - 0.8.8-2 - Fix inclusion of debug files where libdir=/usr/lib (bz #411891) -* Sun Dec 2 2007 Michel Salim - 0.8.8-1 +* Sun Dec 2 2007 Michel Alexandre Salim - 0.8.8-1 - Update to 0.8.8 -* Thu Oct 18 2007 Michel Salim - 0.8.6d-3 +* Thu Oct 18 2007 Michel Alexandre Salim - 0.8.6d-3 - Generate proper -debuginfo subpackage (bz #329841, Ville Skytta) - Add README.Fedora detailing zTXT bug on x86_64 -* Sat Sep 22 2007 Michel Salim - 0.8.6d-2 +* Sat Sep 22 2007 Michel Alexandre Salim - 0.8.6d-2 - Fix vendor tag - Use compiler flags provided by the system -* Sun Sep 16 2007 Michel Salim - 0.8.6d-1 +* Sun Sep 16 2007 Michel Alexandre Salim - 0.8.6d-1 - Initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Jan 2008 17:53:23 -0000 1.6 +++ sources 31 Jul 2008 07:36:09 -0000 1.7 @@ -1 +1 @@ -8045abe1acc75dbdd220400df541f23f fbreader-sources-0.8.12.tgz +cde2f1224c51d0adbf970bdb6748eb90 fbreader-sources-0.8.17.tgz --- fbreader-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 07:41:41 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Thu, 31 Jul 2008 07:41:41 GMT Subject: rpms/binutils/devel binutils-2.18.50.0.8-place-orphan.patch, NONE, 1.1 binutils-2.18.50.0.8-spu_ovl-dependency.patch, NONE, 1.1 binutils-2.18.50.0.8-spu_ovl-fatal.patch, NONE, 1.1 binutils-2.18.50.0.8-symbolic-envvar-revert.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 binutils.spec, 1.134, 1.135 sources, 1.39, 1.40 binutils-2.18.50.0.6-pclmul.patch, 1.1, NONE binutils-2.18.50.0.6-place-orphan.patch, 1.1, NONE binutils-2.18.50.0.6-symbolic-envvar-revert.patch, 1.1, NONE Message-ID: <200807310741.m6V7ffq9000763@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/binutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv682 Modified Files: .cvsignore binutils.spec sources Added Files: binutils-2.18.50.0.8-place-orphan.patch binutils-2.18.50.0.8-spu_ovl-dependency.patch binutils-2.18.50.0.8-spu_ovl-fatal.patch binutils-2.18.50.0.8-symbolic-envvar-revert.patch Removed Files: binutils-2.18.50.0.6-pclmul.patch binutils-2.18.50.0.6-place-orphan.patch binutils-2.18.50.0.6-symbolic-envvar-revert.patch Log Message: * Thu Jul 31 2008 Jan Kratochvil 2.18.50.0.8-1 - Update to 2.18.50.0.8. - Drop the .clmul -> .pclmul renaming backport. - Add %{binutils_target} macro to support building cross-binutils. (David Woodhouse) - Support `--without testsuite' to suppress the testsuite run. - Support `--with debug' to build without optimizations. - Refresh the patchset with fuzz 0 (for new rpmbuild). - Enable the spu target on ppc/ppc64 (BZ 455242). binutils-2.18.50.0.8-place-orphan.patch: --- NEW FILE binutils-2.18.50.0.8-place-orphan.patch --- 2003-08-05 Jakub Jelinek * emulparams/elf64ppc.sh (OTHER_GOT_RELOC_SECTIONS): Add .rela.opd. --- ld/emulparams/elf64ppc.sh 2007-03-16 16:48:30.000000000 +0100 +++ ld/emulparams/elf64ppc.sh 2008-07-25 20:11:20.000000000 +0200 @@ -28,7 +28,8 @@ else .toc 0 : { *(.toc) }" fi OTHER_GOT_RELOC_SECTIONS=" - .rela.toc ${RELOCATING-0} : { *(.rela.toc) }" + .rela.toc ${RELOCATING-0} : { *(.rela.toc) } + .rela.opd ${RELOCATING-0} : { *(.rela.opd) }" OTHER_READWRITE_SECTIONS=" .toc1 ${RELOCATING-0} :${RELOCATING+ ALIGN(8)} { *(.toc1) } .opd ${RELOCATING-0} :${RELOCATING+ ALIGN(8)} { KEEP (*(.opd)) } binutils-2.18.50.0.8-spu_ovl-dependency.patch: --- NEW FILE binutils-2.18.50.0.8-spu_ovl-dependency.patch --- 2008-07-30 Jan Kratochvil * Makefile.def: ld's spu_ovl.o depends on gas and binutils. * Makefile.in: Regenerate. --- Makefile.def 30 Jul 2008 15:03:54 -0000 1.92 +++ Makefile.def 30 Jul 2008 21:18:12 -0000 @@ -378,6 +378,9 @@ dependencies = { module=all-ld; on=all-b dependencies = { module=all-ld; on=all-build-byacc; }; dependencies = { module=all-ld; on=all-build-flex; }; dependencies = { module=all-ld; on=all-intl; }; +// spu_ovl.o depends on both gas and binutils/bin2c +dependencies = { module=all-ld; on=all-gas; }; +dependencies = { module=all-ld; on=all-binutils; }; dependencies = { module=configure-gold; on=configure-intl; }; dependencies = { module=all-gold; on=all-libiberty; }; dependencies = { module=all-gold; on=all-intl; }; --- Makefile.in 30 Jul 2008 15:03:54 -0000 1.285 +++ Makefile.in 30 Jul 2008 21:18:34 -0000 @@ -53308,6 +53308,26 @@ all-stageb3g2-ld: maybe-all-stageb3g2-in all-stage4-ld: maybe-all-stage4-intl all-stageprofile-ld: maybe-all-stageprofile-intl all-stagefeedback-ld: maybe-all-stagefeedback-intl +all-ld: maybe-all-gas + +all-stage1-ld: maybe-all-stage1-gas +all-stage2-ld: maybe-all-stage2-gas +all-stageb2g0-ld: maybe-all-stageb2g0-gas +all-stage3-ld: maybe-all-stage3-gas +all-stageb3g2-ld: maybe-all-stageb3g2-gas +all-stage4-ld: maybe-all-stage4-gas +all-stageprofile-ld: maybe-all-stageprofile-gas +all-stagefeedback-ld: maybe-all-stagefeedback-gas +all-ld: maybe-all-binutils + +all-stage1-ld: maybe-all-stage1-binutils +all-stage2-ld: maybe-all-stage2-binutils +all-stageb2g0-ld: maybe-all-stageb2g0-binutils +all-stage3-ld: maybe-all-stage3-binutils +all-stageb3g2-ld: maybe-all-stageb3g2-binutils +all-stage4-ld: maybe-all-stage4-binutils +all-stageprofile-ld: maybe-all-stageprofile-binutils +all-stagefeedback-ld: maybe-all-stagefeedback-binutils configure-gold: maybe-configure-intl configure-stage1-gold: maybe-configure-stage1-intl binutils-2.18.50.0.8-spu_ovl-fatal.patch: --- NEW FILE binutils-2.18.50.0.8-spu_ovl-fatal.patch --- 2008-07-30 Jan Kratochvil * emultempl/spuelf.em: Abort on the missing required `spu_ovl.o'. --- ld/emultempl/spuelf.em 19 Jun 2008 16:14:53 -0000 1.24 +++ ld/emultempl/spuelf.em 30 Jul 2008 18:28:25 -0000 @@ -57,7 +57,12 @@ char **my_argv; static const char ovl_mgr[] = { EOF -../binutils/bin2c < ${srcdir}/emultempl/spu_ovl.o >> e${EMULATION_NAME}.c +if ! ../binutils/bin2c < ${srcdir}/emultempl/spu_ovl.o >> e${EMULATION_NAME}.c +then + echo >&2 "Missing ${srcdir}/emultempl/spu_ovl.o" + echo >&2 "You must build gas/as-new with --target=spu to build spu_ovl.o" + exit 1 +fi fragment < %{_builddir}/%{?buildsubdir}/debugfiles.list +%define debug_package %{nil} +%endif Buildroot: %{_tmppath}/binutils-root -BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison +BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison, automake, autoconf Conflicts: gcc-c++ < 4.0.0 Prereq: /sbin/install-info %ifarch ia64 @@ -54,7 +76,7 @@ to consider using libelf instead of BFD. %prep -%setup -q +%setup -q -n binutils-%{version} %patch1 -p0 -b .ltconfig-multilib~ %patch2 -p0 -b .ppc64-pie~ %patch3 -p0 -b .place-orphan~ @@ -66,9 +88,12 @@ %patch5 -p0 -b .build-fixes~ %patch6 -p0 -b .symbolic-envvar-revert~ %patch7 -p0 -b .version~ -%patch8 -p0 -b .pclmul~ +%patch8 -p0 -b .spu_ovl-fatal~ +%patch9 -p0 -b .spu_ovl-dependency~ + +# We cannot run autotools as there is an exact requirement of autoconf-2.59. -# On ppc64 we might use 64K pages +# On ppc64 we might use 64KiB pages sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c # LTP sucks perl -pi -e 's/i\[3-7\]86/i[34567]86/g' */conf* @@ -79,39 +104,99 @@ sed -i -e 's/^libbfd_la_LDFLAGS = /&-Wl,-Bsymbolic-functions /' bfd/Makefile.{am,in} sed -i -e 's/^libopcodes_la_LDFLAGS = /&-Wl,-Bsymbolic-functions /' opcodes/Makefile.{am,in} fi +# $PACKAGE is used for the gettext catalog name. +sed -i -e 's/^ PACKAGE=/ PACKAGE=%{?cross}/' */configure +# Undo the name change to run the testsuite. +for tool in binutils gas ld +do + sed -i -e "2aDEJATOOL = $tool" $tool/Makefile.am + sed -i -e "s/^DEJATOOL = .*/DEJATOOL = $tool/" $tool/Makefile.in +done touch */configure %build -mkdir build-%{_target_platform} -cd build-%{_target_platform} +echo target is %{binutils_target} +export CFLAGS="$RPM_OPT_FLAGS" CARGS= -%ifarch sparc ppc s390 -CARGS=--enable-64-bit-bfd + +case %{binutils_target} in sparc*|ppc*|s390*) + CARGS="$CARGS --enable-64-bit-bfd" + ;; +esac + +case %{binutils_target} in ia64*) + CARGS="--enable-targets=i386-linux" + ;; +esac + +case %{binutils_target} in ppc*|ppc64*) + CARGS="--enable-targets=spu" + # This file is present in CVS but missing in H. J. Lu's snapshots. + # To include it for --enable-targets=spu we need to build gas by --target=spu. + ! test -f ld/emultempl/spu_ovl.o + mkdir build-spu + cd build-spu + CFLAGS="${CFLAGS:-%optflags} -O0 -s" ../configure \ + --target=spu --disable-shared --enable-static --disable-werror \ + --with-bugurl=http://bugzilla.redhat.com/bugzilla/ + make %{_smp_mflags} all + cd .. + test -f ld/emultempl/spu_ovl.o + rm -rf build-spu + ;; +esac + +mkdir build-%{binutils_target} +cd build-%{binutils_target} + +%if 0%{?_with_debug:1} +# --enable-werror could conflict with `-Wall -O0' but this is no longer true +# for recent GCCs. +CFLAGS="$CFLAGS -O0 -ggdb2" %endif -%ifarch ia64 -CARGS=--enable-targets=i386-linux + +# We could optimize the cross builds size by --enable-shared but the produced +# binaries may be less convenient in the embedded environment. +CC="gcc -L`pwd`/bfd/.libs/" ../configure \ +%if %{isnative} + %{binutils_target} \ + --enable-shared \ +%else + --target %{binutils_target} --enable-targets=%{_host} \ + --disable-shared \ + --with-sysroot=%{_prefix}/%{binutils_target}/sys-root \ %endif -CC="gcc -L`pwd`/bfd/.libs/" CFLAGS="${CFLAGS:-%optflags}" ../configure \ - %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ + $CARGS \ + --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ - --infodir=%{_infodir} --enable-shared $CARGS --disable-werror \ + --infodir=%{_infodir} --disable-werror \ --with-bugurl=http://bugzilla.redhat.com/bugzilla/ make %{_smp_mflags} tooldir=%{_prefix} all +# Fix: Found '%{buildroot}' in installed files; aborting +if [ -f ld/eelf32_spu.c ] +then + sed -i -e 's#%{buildroot}##g' ld/eelf32_spu.c +fi make %{_smp_mflags} tooldir=%{_prefix} info +%if 0%{?_without_testsuite:1} +echo ====================TESTSUITE DISABLED========================= +%else make -k check < /dev/null > check.log 2>&1 || : echo ====================TESTING========================= cat check.log echo ====================TESTING END===================== cd .. +%endif %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_prefix} -cd build-%{_target_platform} +cd build-%{binutils_target} %makeinstall +%if %{isnative} make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info gzip -q9f %{buildroot}%{_infodir}/*.info* @@ -141,10 +226,6 @@ # Remove libtool files, which reference the .so libs rm -f %{buildroot}%{_prefix}/%{_lib}/lib{bfd,opcodes}.la -# This one comes from gcc -rm -f %{buildroot}%{_infodir}/dir -rm -rf %{buildroot}%{_prefix}/%{_target_platform} - %ifarch %{ix86} x86_64 ppc ppc64 s390 s390x sparc sparc64 sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include ~;}' \ %ifarch %{ix86} x86_64 @@ -162,22 +243,36 @@ %endif touch -r ../bfd/bfd-in2.h %{buildroot}%{_prefix}/include/bfd.h +%else # !%{isnative} +# For cross-binutils we drop the documentation. +rm -rf %{buildroot}%{_infodir} +# We keep these as one can have native + cross binutils of different versions. +#rm -rf %{buildroot}%{_prefix}/share/locale +#rm -rf %{buildroot}%{_mandir} +rm -rf %{buildroot}%{_prefix}/%{_lib}/libiberty.a +%endif # !%{isnative} + +# This one comes from gcc +rm -f %{buildroot}%{_infodir}/dir +rm -rf %{buildroot}%{_prefix}/%{binutils_target} + cd .. -%find_lang binutils -%find_lang opcodes -%find_lang bfd -%find_lang gas -%find_lang ld -%find_lang gprof -cat opcodes.lang >> binutils.lang -cat bfd.lang >> binutils.lang -cat gas.lang >> binutils.lang -cat ld.lang >> binutils.lang -cat gprof.lang >> binutils.lang +%find_lang %{?cross}binutils +%find_lang %{?cross}opcodes +%find_lang %{?cross}bfd +%find_lang %{?cross}gas +%find_lang %{?cross}ld +%find_lang %{?cross}gprof +cat %{?cross}opcodes.lang >> %{?cross}binutils.lang +cat %{?cross}bfd.lang >> %{?cross}binutils.lang +cat %{?cross}gas.lang >> %{?cross}binutils.lang +cat %{?cross}ld.lang >> %{?cross}binutils.lang +cat %{?cross}gprof.lang >> %{?cross}binutils.lang %clean rm -rf %{buildroot} +%if %{isnative} %post /sbin/ldconfig /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz @@ -208,12 +303,14 @@ if [ $1 = 0 ] ;then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : fi +%endif # %{isnative} -%files -f binutils.lang +%files -f %{?cross}binutils.lang %defattr(-,root,root) %doc README %{_prefix}/bin/* %{_mandir}/man1/* +%if %{isnative} %{_prefix}/%{_lib}/lib*.so %{_infodir}/[^b]*info* %{_infodir}/binutils*info* @@ -223,8 +320,19 @@ %{_prefix}/include/* %{_prefix}/%{_lib}/lib*.a %{_infodir}/bfd*info* +%endif # %{isnative} %changelog +* Thu Jul 31 2008 Jan Kratochvil 2.18.50.0.8-1 +- Update to 2.18.50.0.8. + - Drop the .clmul -> .pclmul renaming backport. +- Add %%{binutils_target} macro to support building cross-binutils. + (David Woodhouse) +- Support `--without testsuite' to suppress the testsuite run. +- Support `--with debug' to build without optimizations. +- Refresh the patchset with fuzz 0 (for new rpmbuild). +- Enable the spu target on ppc/ppc64 (BZ 455242). + * Wed Jul 16 2008 Jan Kratochvil 2.18.50.0.6-4 - include the `dist' tag in the Release number - libbfd.a symbols visibility is now hidden (for #447426, suggested by Jakub) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/binutils/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 4 Apr 2008 09:48:39 -0000 1.39 +++ sources 31 Jul 2008 07:41:11 -0000 1.40 @@ -1 +1 @@ -9e474d739355c15ba6ecf5fd9fae8608 binutils-2.18.50.0.6.tar.bz2 +a49df3481468f281f42afbf915e10db2 binutils-2.18.50.0.8.tar.bz2 --- binutils-2.18.50.0.6-pclmul.patch DELETED --- --- binutils-2.18.50.0.6-place-orphan.patch DELETED --- --- binutils-2.18.50.0.6-symbolic-envvar-revert.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 07:42:14 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:42:14 GMT Subject: rpms/fbreader/F-8 .cvsignore, 1.6, 1.7 fbreader.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200807310742.m6V7gEsn000946@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv760/F-8 Modified Files: .cvsignore fbreader.spec sources Log Message: * Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Jan 2008 17:53:16 -0000 1.6 +++ .cvsignore 31 Jul 2008 07:41:44 -0000 1.7 @@ -1 +1 @@ -fbreader-sources-0.8.12.tgz +fbreader-sources-0.8.17.tgz Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-8/fbreader.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fbreader.spec 31 Jul 2008 07:36:08 -0000 1.8 +++ fbreader.spec 31 Jul 2008 07:41:44 -0000 1.9 @@ -8,14 +8,14 @@ License: GPLv2+ URL: http://www.fbreader.org/ Source0: http://www.fbreader.org/fbreader-sources-%{version}.tgz -Patch0: fbreader-desktop.patch +Patch0: fbreader-0.8.17-desktop-file.patch Patch1: fbreader-optflags.patch # Use to expose the compiler flags used during build # Patch2: fbreader-debug.patch Patch3: fbreader-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: expat-devel bzip2-devel +BuildRequires: expat-devel bzip2-devel liblinebreak-static BuildRequires: gtk2-devel libjpeg-devel desktop-file-utils %{?_with_qt4:BuildRequires: qt4-devel} #Requires: @@ -48,7 +48,7 @@ %prep %setup -q -%patch0 -p0 -b .desktop +%patch0 -p1 -b .desktop-file %patch1 -p0 -b .optflags #%patch2 -p0 -b .debug %patch3 -p0 -b .defaults @@ -116,7 +116,7 @@ %changelog -* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +* Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Jan 2008 17:53:16 -0000 1.6 +++ sources 31 Jul 2008 07:41:44 -0000 1.7 @@ -1 +1 @@ -8045abe1acc75dbdd220400df541f23f fbreader-sources-0.8.12.tgz +cde2f1224c51d0adbf970bdb6748eb90 fbreader-sources-0.8.17.tgz From fedora-extras-commits at redhat.com Thu Jul 31 07:42:13 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:42:13 GMT Subject: rpms/fbreader/EL-5 .cvsignore, 1.6, 1.7 fbreader.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200807310742.m6V7gDFO000941@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv760/EL-5 Modified Files: .cvsignore fbreader.spec sources Log Message: * Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/EL-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Jan 2008 17:53:06 -0000 1.6 +++ .cvsignore 31 Jul 2008 07:41:43 -0000 1.7 @@ -1 +1 @@ -fbreader-sources-0.8.12.tgz +fbreader-sources-0.8.17.tgz Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fbreader.spec 31 Jul 2008 07:36:07 -0000 1.8 +++ fbreader.spec 31 Jul 2008 07:41:43 -0000 1.9 @@ -8,14 +8,14 @@ License: GPLv2+ URL: http://www.fbreader.org/ Source0: http://www.fbreader.org/fbreader-sources-%{version}.tgz -Patch0: fbreader-desktop.patch +Patch0: fbreader-0.8.17-desktop-file.patch Patch1: fbreader-optflags.patch # Use to expose the compiler flags used during build # Patch2: fbreader-debug.patch Patch3: fbreader-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: expat-devel bzip2-devel +BuildRequires: expat-devel bzip2-devel liblinebreak-static BuildRequires: gtk2-devel libjpeg-devel desktop-file-utils %{?_with_qt4:BuildRequires: qt4-devel} #Requires: @@ -48,7 +48,7 @@ %prep %setup -q -%patch0 -p0 -b .desktop +%patch0 -p1 -b .desktop-file %patch1 -p0 -b .optflags #%patch2 -p0 -b .debug %patch3 -p0 -b .defaults @@ -116,7 +116,7 @@ %changelog -* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +* Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Jan 2008 17:53:06 -0000 1.6 +++ sources 31 Jul 2008 07:41:43 -0000 1.7 @@ -1 +1 @@ -8045abe1acc75dbdd220400df541f23f fbreader-sources-0.8.12.tgz +cde2f1224c51d0adbf970bdb6748eb90 fbreader-sources-0.8.17.tgz From fedora-extras-commits at redhat.com Thu Jul 31 07:42:15 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:42:15 GMT Subject: rpms/fbreader/F-9 .cvsignore, 1.6, 1.7 fbreader.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200807310742.m6V7gFRI000951@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv760/F-9 Modified Files: .cvsignore fbreader.spec sources Log Message: * Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Jan 2008 17:53:23 -0000 1.6 +++ .cvsignore 31 Jul 2008 07:41:44 -0000 1.7 @@ -1 +1 @@ -fbreader-sources-0.8.12.tgz +fbreader-sources-0.8.17.tgz Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-9/fbreader.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fbreader.spec 31 Jul 2008 07:36:08 -0000 1.11 +++ fbreader.spec 31 Jul 2008 07:41:44 -0000 1.12 @@ -8,14 +8,14 @@ License: GPLv2+ URL: http://www.fbreader.org/ Source0: http://www.fbreader.org/fbreader-sources-%{version}.tgz -Patch0: fbreader-desktop.patch +Patch0: fbreader-0.8.17-desktop-file.patch Patch1: fbreader-optflags.patch # Use to expose the compiler flags used during build # Patch2: fbreader-debug.patch Patch3: fbreader-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: expat-devel bzip2-devel +BuildRequires: expat-devel bzip2-devel liblinebreak-static BuildRequires: gtk2-devel libjpeg-devel desktop-file-utils %{?_with_qt4:BuildRequires: qt4-devel} #Requires: @@ -48,7 +48,7 @@ %prep %setup -q -%patch0 -p0 -b .desktop +%patch0 -p1 -b .desktop-file %patch1 -p0 -b .optflags #%patch2 -p0 -b .debug %patch3 -p0 -b .defaults @@ -116,7 +116,7 @@ %changelog -* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +* Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Jan 2008 17:53:23 -0000 1.6 +++ sources 31 Jul 2008 07:41:44 -0000 1.7 @@ -1 +1 @@ -8045abe1acc75dbdd220400df541f23f fbreader-sources-0.8.12.tgz +cde2f1224c51d0adbf970bdb6748eb90 fbreader-sources-0.8.17.tgz From fedora-extras-commits at redhat.com Thu Jul 31 07:42:15 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 07:42:15 GMT Subject: rpms/fbreader/devel fbreader.spec,1.11,1.12 Message-ID: <200807310742.m6V7gFoC000954@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/fbreader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv760/devel Modified Files: fbreader.spec Log Message: * Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 Index: fbreader.spec =================================================================== RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fbreader.spec 31 Jul 2008 07:36:09 -0000 1.11 +++ fbreader.spec 31 Jul 2008 07:41:45 -0000 1.12 @@ -8,14 +8,14 @@ License: GPLv2+ URL: http://www.fbreader.org/ Source0: http://www.fbreader.org/fbreader-sources-%{version}.tgz -Patch0: fbreader-desktop.patch +Patch0: fbreader-0.8.17-desktop-file.patch Patch1: fbreader-optflags.patch # Use to expose the compiler flags used during build # Patch2: fbreader-debug.patch Patch3: fbreader-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: expat-devel bzip2-devel +BuildRequires: expat-devel bzip2-devel liblinebreak-static BuildRequires: gtk2-devel libjpeg-devel desktop-file-utils %{?_with_qt4:BuildRequires: qt4-devel} #Requires: @@ -48,7 +48,7 @@ %prep %setup -q -%patch0 -p0 -b .desktop +%patch0 -p1 -b .desktop-file %patch1 -p0 -b .optflags #%patch2 -p0 -b .debug %patch3 -p0 -b .defaults @@ -116,7 +116,7 @@ %changelog -* Wed Jun 4 2008 Michel Alexandre Salim - 0.8.17-1 +* Thu Jul 31 2008 Michel Alexandre Salim - 0.8.17-1 - Update to 0.8.17 * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-2 From fedora-extras-commits at redhat.com Thu Jul 31 08:12:48 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 31 Jul 2008 08:12:48 GMT Subject: rpms/openoffice.org/F-9 openoffice.org.spec, 1.1502, 1.1503 workspace.notes2.patch, 1.13, 1.14 Message-ID: <200807310812.m6V8CmLd008762@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8718 Modified Files: openoffice.org.spec workspace.notes2.patch Log Message: Resolves: rhbz#457303 notes related right click in empty space crash Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v retrieving revision 1.1502 retrieving revision 1.1503 diff -u -r1.1502 -r1.1503 --- openoffice.org.spec 30 Jul 2008 14:16:59 -0000 1.1502 +++ openoffice.org.spec 31 Jul 2008 08:12:18 -0000 1.1503 @@ -2951,6 +2951,7 @@ - Resolves: rhbz#452385 add postgress-jdbc to default classpath - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch - Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash +- Resolves: rhbz#457303 notes related right click in empty space crash * Fri Jun 13 2008 Caolan McNamara - 1:2.4.1-17.4 - Resolves: rhbz#451485 fix vertical glyphs workspace.notes2.patch: Index: workspace.notes2.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.notes2.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- workspace.notes2.patch 1 Jun 2008 22:29:25 -0000 1.13 +++ workspace.notes2.patch 31 Jul 2008 08:12:18 -0000 1.14 @@ -10141,7 +10141,7 @@ } } - -+ else ++ else if (pEntry) + { + SwContentType* pType = (SwContentType*)pEntry->GetUserData(); + if ( (pType->GetType() == CONTENT_TYPE_POSTIT) && (!pActiveShell->GetView().GetDocShell()->IsReadOnly()) && ( pType->GetMemberCount() > 0) ) From fedora-extras-commits at redhat.com Thu Jul 31 08:38:41 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Thu, 31 Jul 2008 08:38:41 GMT Subject: rpms/unique/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 unique.spec, 1.1, 1.2 Message-ID: <200807310838.m6V8cfwr009935@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/unique/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9874 Modified Files: .cvsignore sources unique.spec Log Message: * Thu Jul 31 2008 Richard Hughes - 1.0.0-1 - Update to latest upstream version * First stable release * API is frozen * D-Bus and socket backends supported Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/unique/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2008 16:06:52 -0000 1.2 +++ .cvsignore 31 Jul 2008 08:38:10 -0000 1.3 @@ -1 +1 @@ -unique-0.9.4.tar.gz +unique-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/unique/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2008 16:06:52 -0000 1.2 +++ sources 31 Jul 2008 08:38:10 -0000 1.3 @@ -1 +1 @@ -c10d16db95275389d3361a8a023025d2 unique-0.9.4.tar.gz +fc6dfeca0ba84bc0bc557f17238e58cc unique-1.0.0.tar.gz Index: unique.spec =================================================================== RCS file: /cvs/pkgs/rpms/unique/devel/unique.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- unique.spec 16 May 2008 16:06:52 -0000 1.1 +++ unique.spec 31 Jul 2008 08:38:10 -0000 1.2 @@ -1,14 +1,12 @@ Name: unique -Version: 0.9.4 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Unique instance support for applications Group: System Environment/Libraries License: LGPLv2+ URL: http://www.gnome.org/~ebassi/source/ Source0: http://www.gnome.org/~ebassi/source/unique-%{version}.tar.gz -Patch0: unique-compile-fix1.patch -Patch1: unique-compile-fix2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -36,8 +34,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure --enable-gtk-doc --disable-static @@ -68,6 +64,12 @@ %{_libdir}/lib*.so %changelog +* Thu Jul 31 2008 Richard Hughes - 1.0.0-1 +- Update to latest upstream version + * First stable release + * API is frozen + * D-Bus and socket backends supported + * Fri May 16 2008 Richard Hughes - 0.9.4-5 - More updates to the spec file from Dan Horak, rh#446407 From fedora-extras-commits at redhat.com Thu Jul 31 08:43:16 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Thu, 31 Jul 2008 08:43:16 GMT Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.37,1.38 Message-ID: <200807310843.m6V8hGaa010391@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10322 Modified Files: gnome-packagekit.spec Log Message: * Tue Jul 31 2008 Richard Hughes - 0.2.4-2 - Rebuild for libunique ABI break. Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-packagekit.spec 30 Jul 2008 10:22:00 -0000 1.37 +++ gnome-packagekit.spec 31 Jul 2008 08:42:46 -0000 1.38 @@ -6,7 +6,7 @@ Name: gnome-packagekit Version: 0.2.4 #Release: 4.%{?alphatag}%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -147,6 +147,9 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Tue Jul 31 2008 Richard Hughes - 0.2.4-2 +- Rebuild for libunique ABI break. + * Tue Jul 30 2008 Richard Hughes - 0.2.4-1 - New upstream version, only bugfixes. From fedora-extras-commits at redhat.com Thu Jul 31 08:47:48 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Thu, 31 Jul 2008 08:47:48 GMT Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.119, 1.120 Message-ID: <200807310847.m6V8lmSB010804@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-power-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783 Modified Files: gnome-power-manager.spec Log Message: * Tue Jul 31 2008 Richard Hughes - 2.23.3-4 - Rebuild for libunique ABI break. Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- gnome-power-manager.spec 23 Jul 2008 16:46:43 -0000 1.119 +++ gnome-power-manager.spec 31 Jul 2008 08:47:18 -0000 1.120 @@ -5,7 +5,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.23.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and GFDL Group: Applications/System Source: http://download.gnome.org/sources/gnome-power-manager/2.23/gnome-power-manager-%{version}.tar.gz @@ -127,6 +127,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml %changelog +* Tue Jul 31 2008 Richard Hughes - 2.23.3-4 +- Rebuild for libunique ABI break. + * Wed Jul 23 2008 Tom "spot" Callaway - 2.23.3-3 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 31 09:13:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 09:13:29 +0000 Subject: [pkgdb] redhat-lsb: hliu has requested watchcommits Message-ID: <20080731091329.9B3A71AD101@bastion.fedora.phx.redhat.com> Hao Liu (hliu) has requested the watchcommits acl on redhat-lsb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/redhat-lsb From fedora-extras-commits at redhat.com Thu Jul 31 09:13:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 09:13:24 +0000 Subject: [pkgdb] redhat-lsb: hliu has requested watchbugzilla Message-ID: <20080731091325.253931AD0F9@bastion.fedora.phx.redhat.com> Hao Liu (hliu) has requested the watchbugzilla acl on redhat-lsb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/redhat-lsb From fedora-extras-commits at redhat.com Thu Jul 31 09:13:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 09:13:32 +0000 Subject: [pkgdb] redhat-lsb: hliu has requested commit Message-ID: <20080731091332.C21931AD105@bastion.fedora.phx.redhat.com> Hao Liu (hliu) has requested the commit acl on redhat-lsb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/redhat-lsb From fedora-extras-commits at redhat.com Thu Jul 31 09:22:48 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Thu, 31 Jul 2008 09:22:48 GMT Subject: rpms/openssh/devel openssh-5.1p1-bannerlen.patch, NONE, 1.1 openssh.spec, 1.130, 1.131 Message-ID: <200807310922.m6V9MmdZ018957@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/openssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18922 Modified Files: openssh.spec Added Files: openssh-5.1p1-bannerlen.patch Log Message: * Thu Jul 31 2008 Tomas Mraz - 5.1p1-2 - fixed zero length banner problem (#457326) openssh-5.1p1-bannerlen.patch: --- NEW FILE openssh-5.1p1-bannerlen.patch --- diff -up openssh-5.1p1/sshconnect2.c.bannerlen openssh-5.1p1/sshconnect2.c --- openssh-5.1p1/sshconnect2.c.bannerlen 2008-07-23 19:18:15.000000000 +0200 +++ openssh-5.1p1/sshconnect2.c 2008-07-31 11:16:51.000000000 +0200 @@ -387,8 +387,9 @@ input_userauth_banner(int type, u_int32_ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- openssh.spec 23 Jul 2008 17:33:16 -0000 1.130 +++ openssh.spec 31 Jul 2008 09:22:18 -0000 1.131 @@ -63,7 +63,7 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 Name: openssh Version: 5.1p1 -Release: 1%{?dist}%{?rescue_rel} +Release: 2%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc @@ -96,6 +96,7 @@ Patch54: openssh-5.1p1-gssapi-role.patch Patch55: openssh-5.1p1-cloexec.patch Patch62: openssh-5.1p1-scp-manpage.patch +Patch63: openssh-5.1p1-bannerlen.patch License: BSD Group: Applications/Internet @@ -227,6 +228,7 @@ %patch54 -p1 -b .gssapi-role %patch55 -p1 -b .cloexec %patch62 -p1 -b .manpage +%patch63 -p1 -b .bannerlen autoreconf @@ -478,6 +480,9 @@ %endif %changelog +* Thu Jul 31 2008 Tomas Mraz - 5.1p1-2 +- fixed zero length banner problem (#457326) + * Wed Jul 23 2008 Tomas Mraz - 5.1p1-1 - upgrade to new upstream release - fixed a problem with public key authentication and explicitely From fedora-extras-commits at redhat.com Thu Jul 31 09:31:32 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 31 Jul 2008 09:31:32 GMT Subject: rpms/geeqie/devel geeqie-1.0alpha2-desktop.patch, NONE, 1.1 geeqie-1.0alpha2-editors.patch, NONE, 1.1 geeqie-1.0alpha2-gcc-warn.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 geeqie.spec, 1.2, 1.3 sources, 1.2, 1.3 geeqie-1.0alpha1-desktop.patch, 1.1, NONE geeqie-1.0alpha1-editors.patch, 1.1, NONE Message-ID: <200807310931.m6V9VWl2019260@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/geeqie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19221 Modified Files: .cvsignore geeqie.spec sources Added Files: geeqie-1.0alpha2-desktop.patch geeqie-1.0alpha2-editors.patch geeqie-1.0alpha2-gcc-warn.patch Removed Files: geeqie-1.0alpha1-desktop.patch geeqie-1.0alpha1-editors.patch Log Message: * Thu Jul 31 2008 Michael Schwendt - 1.0-0.6.alpha2 - update to 1.0alpha2 (now GPLv3) - build with new LIRC support geeqie-1.0alpha2-desktop.patch: --- NEW FILE geeqie-1.0alpha2-desktop.patch --- diff -Nur geeqie-1.0alpha2-orig/geeqie.desktop geeqie-1.0alpha2/geeqie.desktop --- geeqie-1.0alpha2-orig/geeqie.desktop 2008-07-30 22:01:52.000000000 +0200 +++ geeqie-1.0alpha2/geeqie.desktop 2008-07-31 10:39:39.000000000 +0200 @@ -16,5 +16,5 @@ # Startup notification disabled, since the remote -r switch may not open a new window... #StartupNotify=false #StartupWMClass=geeqie -Categories=Application;Graphics;Viewer; +Categories=Graphics;Viewer; MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-cmu-raster;image/x-sun-raster;image/x-tga;image/tiff;image/vnd.wap.wbmp;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;image/x-png;image/xpm;image/x-ico;image/x-pcx; geeqie-1.0alpha2-editors.patch: --- NEW FILE geeqie-1.0alpha2-editors.patch --- diff -Nur geeqie-1.0alpha2-orig/src/editors.c geeqie-1.0alpha2/src/editors.c --- geeqie-1.0alpha2-orig/src/editors.c 2008-07-30 22:01:32.000000000 +0200 +++ geeqie-1.0alpha2/src/editors.c 2008-07-31 10:42:04.000000000 +0200 @@ -56,13 +56,13 @@ static Editor editor_slot_defaults[GQ_EDITOR_SLOTS] = { { N_("The Gimp"), "gimp-remote %{.cr2;.crw;.nef;.raw;*}f" }, - { N_("XV"), "xv %f" }, - { N_("Xpaint"), "xpaint %f" }, { N_("UFraw"), "ufraw %{.cr2;.crw;.nef;.raw}p" }, { N_("Add XMP sidecar"), "%vFILE=%{.cr2;.crw;.nef;.raw}p;XMP=`echo \"$FILE\"|sed -e 's|\\.[^.]*$|.xmp|'`; exiftool -tagsfromfile \"$FILE\" \"$XMP\"" }, { N_("Symlink"), "ln -s %p %d"}, { NULL, NULL }, { NULL, NULL }, + { NULL, NULL }, + { NULL, NULL }, { N_("Rotate jpeg clockwise"), "%vif jpegtran -rotate 90 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi" }, { N_("Rotate jpeg counterclockwise"), "%vif jpegtran -rotate 270 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi" }, /* special slots */ geeqie-1.0alpha2-gcc-warn.patch: --- NEW FILE geeqie-1.0alpha2-gcc-warn.patch --- diff -Nur geeqie-1.0alpha2-orig/src/filecache.c geeqie-1.0alpha2/src/filecache.c --- geeqie-1.0alpha2-orig/src/filecache.c 2008-07-30 22:01:32.000000000 +0200 +++ geeqie-1.0alpha2/src/filecache.c 2008-07-31 10:52:24.000000000 +0200 @@ -172,7 +172,7 @@ { FileCacheEntry *fe = work->data; work = work->next; - DEBUG_1("cache entry: fc=%p [%lu] %s %ld", fc, ++n, fe->fd->path, fe->size); + DEBUG_1("cache entry: fc=%p [%lu] %s %ld", fc, (unsigned long int)++n, fe->fd->path, fe->size); } } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/geeqie/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 May 2008 18:37:05 -0000 1.2 +++ .cvsignore 31 Jul 2008 09:31:01 -0000 1.3 @@ -1 +1 @@ -geeqie-1.0alpha1.tar.gz +geeqie-1.0alpha2.tar.gz Index: geeqie.spec =================================================================== RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geeqie.spec 25 Jun 2008 13:17:03 -0000 1.2 +++ geeqie.spec 31 Jul 2008 09:31:01 -0000 1.3 @@ -1,21 +1,23 @@ -%define upstreamversion 1.0alpha1 +%define upstreamversion 1.0alpha2 Summary: Image browser and viewer Name: geeqie Version: 1.0 -Release: 0.5.alpha1%{?dist} -License: GPLv2 +Release: 0.6.alpha2%{?dist} +License: GPLv3 Group: User Interface/X Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz -Patch1: geeqie-1.0alpha1-desktop.patch -Patch2: geeqie-1.0alpha1-editors.patch +Patch1: geeqie-1.0alpha2-desktop.patch +Patch2: geeqie-1.0alpha2-editors.patch # bz 222639 Patch3: geeqie-1.0alpha1-print-pagesize.patch +Patch4: geeqie-1.0alpha2-gcc-warn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) URL: http://geeqie.sourceforge.net/ BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: lcms-devel BuildRequires: exiv2-devel +BuildRequires: lirc-devel BuildRequires: gettext desktop-file-utils # Something for the future: @@ -39,10 +41,11 @@ %patch1 -p1 -b .desktop %patch2 -p1 -b .editors %patch3 -p1 -b .print-pagesize +%patch4 -p1 -b .gcc-warn %build -%configure +%configure --enable-lirc make %{?_smp_mflags} @@ -51,7 +54,7 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install # We want these _docdir files in GQ_HELPDIR. -install -p -m 0644 AUTHORS COPYING NEWS README TODO \ +install -p -m 0644 AUTHORS COPYING NEWS README* TODO \ ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion} rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}/ChangeLog @@ -87,6 +90,10 @@ %changelog +* Thu Jul 31 2008 Michael Schwendt - 1.0-0.6.alpha2 +- update to 1.0alpha2 (now GPLv3) +- build with new LIRC support + * Wed Jun 25 2008 Rex Dieter - 1.0-0.5.alpha1 - respin for exiv2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/geeqie/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 May 2008 18:37:05 -0000 1.2 +++ sources 31 Jul 2008 09:31:01 -0000 1.3 @@ -1 +1 @@ -8e4838018b597cb6df056959ccf1ba45 geeqie-1.0alpha1.tar.gz +3a9acd46defdebe7444cc9f46fdfa956 geeqie-1.0alpha2.tar.gz --- geeqie-1.0alpha1-desktop.patch DELETED --- --- geeqie-1.0alpha1-editors.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 09:51:44 2008 From: fedora-extras-commits at redhat.com (Kasino Roulette, Stephan Dominik (be)) Date: Thu, 31 Jul 2008 18:51:44 +0900 Subject: Wiesbaden ist auch ok. Message-ID: <5DAC7ECD.B3E46DE6@seed.net.tw> Servus Walter, Ganze 1000.- Start-Bonus und ?ber 250 Gewinn-Spiele waren auf dich Homepage: www(.)findnamesstart(.)com Klammern weglassen Viel Gl?ck Kasino Roulette, Stephan Dominik From fedora-extras-commits at redhat.com Thu Jul 31 09:41:11 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 31 Jul 2008 09:41:11 GMT Subject: rpms/nfs-utils/devel nfs-utils-1.1.3-glibc22.patch, NONE, 1.1 nfs-utils.spec, 1.183, 1.184 Message-ID: <200807310941.m6V9fB7x019638@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19611 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.1.3-glibc22.patch Log Message: Mount command did not compile against older glibc versions. nfs-utils-1.1.3-glibc22.patch: --- NEW FILE nfs-utils-1.1.3-glibc22.patch --- commit 2d173a587a7dbee81ffaf246d044f384fb6487c8 Author: Chuck Lever Date: Thu Jul 31 05:24:18 2008 -0400 mount.nfs command: old glibc missing some flags Old versions of glibc (< 2.4) have a getaddrinfo(3) implementation, but do not include public definitions of the AI_V4MAPPED, AI_ALL, and AI_ADDRCONFIG flags because it was believed that these flags were not standardized. However, these flags have standard definitions both in POSIX 1003 and in RFCs, and were thus included in later releases of glibc. To allow the mount.nfs command to build on systems with these older versions of glibc, add conditional definitions for these flags in utils/mount/network.c. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson diff --git a/utils/mount/network.c b/utils/mount/network.c index 75354a7..0023769 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -48,6 +48,24 @@ #include "mount_constants.h" #include "network.h" +/* + * Earlier versions of glibc's /usr/include/netdb.h exclude these + * definitions because it was thought they were not part of a stable + * POSIX standard. However, they are defined by RFC 2553 and 3493 + * and in POSIX 1003.1-2001, so these definitions were added in later + * versions of netdb.h. + */ +#ifndef AI_V4MAPPED +#define AI_V4MAPPED 0x0008 /* IPv4-mapped addresses are acceptable. */ +#endif /* AI_V4MAPPED */ +#ifndef AI_ALL +#define AI_ALL 0x0010 /* Return both IPv4 and IPv6 addresses. */ +#endif /* AI_ALL */ +#ifndef AI_ADDRCONFIG +#define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose \ + returned address type. */ +#endif /* AI_ADDRCONFIG */ + #define PMAP_TIMEOUT (10) #define CONNECT_TIMEOUT (20) #define MOUNT_TIMEOUT (30) Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- nfs-utils.spec 28 Jul 2008 08:34:41 -0000 1.183 +++ nfs-utils.spec 31 Jul 2008 09:40:41 -0000 1.184 @@ -2,7 +2,7 @@ Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # group all 32bit related archs @@ -30,6 +30,8 @@ Patch90: nfs-utils-1.1.0-mount-fsc.patch %endif +Patch100: nfs-utils-1.1.3-glibc22.patch + Group: System Environment/Daemons Provides: exportfs = %{epoch}:%{version}-%{release} Provides: nfsstat = %{epoch}:%{version}-%{release} @@ -83,6 +85,8 @@ %patch90 -p1 %endif +%patch100 -p1 + # Remove .orig files find . -name "*.orig" | xargs rm -f @@ -241,6 +245,9 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Thu Jul 31 2008 Steve Dickson 1.1.3-2 +- Mount command did not compile against older glibc versions. + * Mon Jul 28 2008 Steve Dickson 1.1.3-1 - Updated to latest upstream version: 1.1.3 From fedora-extras-commits at redhat.com Thu Jul 31 10:17:52 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 31 Jul 2008 10:17:52 GMT Subject: rpms/wordwarvi/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 wordwarvi.spec, 1.11, 1.12 Message-ID: <200807311017.m6VAHqS7027812@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/wordwarvi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27762 Modified Files: .cvsignore sources wordwarvi.spec Log Message: * Thu Jul 31 2008 Hans de Goede 0.21-1 - New upstream release 0.21 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wordwarvi/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 21 Jul 2008 06:49:11 -0000 1.11 +++ .cvsignore 31 Jul 2008 10:17:22 -0000 1.12 @@ -1 +1 @@ -wordwarvi-0.20.tar.gz +wordwarvi-0.21.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wordwarvi/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 21 Jul 2008 06:49:11 -0000 1.11 +++ sources 31 Jul 2008 10:17:22 -0000 1.12 @@ -1 +1 @@ -6691d4431d7cbac40c20887078fddcfa wordwarvi-0.20.tar.gz +bac2bf101d4ccd96c1f4730e360cab5a wordwarvi-0.21.tar.gz Index: wordwarvi.spec =================================================================== RCS file: /cvs/extras/rpms/wordwarvi/devel/wordwarvi.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- wordwarvi.spec 21 Jul 2008 06:49:11 -0000 1.11 +++ wordwarvi.spec 31 Jul 2008 10:17:22 -0000 1.12 @@ -1,5 +1,5 @@ Name: wordwarvi -Version: 0.20 +Version: 0.21 Release: 1%{?dist} Summary: Side-scrolling shoot 'em up '80s style arcade game Group: Amusements/Games @@ -74,6 +74,9 @@ %changelog +* Thu Jul 31 2008 Hans de Goede 0.21-1 +- New upstream release 0.21 + * Sat Jul 20 2008 Hans de Goede 0.20-1 - New upstream release 0.20 From fedora-extras-commits at redhat.com Thu Jul 31 10:25:32 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 31 Jul 2008 10:25:32 GMT Subject: rpms/wordwarvi/devel wordwarvi-0.11-gthread_init.patch,1.1,NONE Message-ID: <200807311025.m6VAPW2B028167@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/wordwarvi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28156 Removed Files: wordwarvi-0.11-gthread_init.patch Log Message: remove patch which has not been necessary for a long time now --- wordwarvi-0.11-gthread_init.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 10:28:44 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Thu, 31 Jul 2008 10:28:44 GMT Subject: rpms/gspiceui/F-8 gspiceui.spec,1.1,1.2 Message-ID: <200807311028.m6VASi1B028311@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gspiceui/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238/F-8 Modified Files: gspiceui.spec Log Message: Exclude ppc64 Index: gspiceui.spec =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/F-8/gspiceui.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gspiceui.spec 28 Jul 2008 07:33:19 -0000 1.1 +++ gspiceui.spec 31 Jul 2008 10:28:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: gspiceui Version: 0.9.65 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A GUI to freely available Spice Electronic circuit similators Group: Applications/System @@ -10,10 +10,12 @@ Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: compat-wxGTK26-devel, desktop-file-utils +BuildRequires: compat-wxGTK26-devel, desktop-file-utils Requires: ngspice, geda-gnetlist, geda-gschem Requires: gwave, electronics-menu +ExcludeArch: ppc64 + %description GspiceUI is listed among the Fedora Electronic Lab (FEL) packages. @@ -92,6 +94,9 @@ %changelog +* Thu Jul 31 2008 Xavier Lamien - 0.9.65-3 +- Excluded ppc64 (gwave is not available on ppc64). + * Sat Jul 26 2008 Xavier Lamien - 0.9.65-2 - Fix typo on desktop-file-install. From fedora-extras-commits at redhat.com Thu Jul 31 10:28:44 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Thu, 31 Jul 2008 10:28:44 GMT Subject: rpms/gspiceui/F-9 gspiceui.spec,1.1,1.2 Message-ID: <200807311028.m6VASiVu028314@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gspiceui/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238/F-9 Modified Files: gspiceui.spec Log Message: Exclude ppc64 Index: gspiceui.spec =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/F-9/gspiceui.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gspiceui.spec 28 Jul 2008 07:39:27 -0000 1.1 +++ gspiceui.spec 31 Jul 2008 10:28:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: gspiceui Version: 0.9.65 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A GUI to freely available Spice Electronic circuit similators Group: Applications/System @@ -10,10 +10,12 @@ Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: compat-wxGTK26-devel, desktop-file-utils +BuildRequires: compat-wxGTK26-devel, desktop-file-utils Requires: ngspice, geda-gnetlist, geda-gschem Requires: gwave, electronics-menu +ExcludeArch: ppc64 + %description GspiceUI is listed among the Fedora Electronic Lab (FEL) packages. @@ -92,6 +94,9 @@ %changelog +* Thu Jul 31 2008 Xavier Lamien - 0.9.65-3 +- Excluded ppc64 (gwave is not available on ppc64). + * Sat Jul 26 2008 Xavier Lamien - 0.9.65-2 - Fix typo on desktop-file-install. From fedora-extras-commits at redhat.com Thu Jul 31 10:28:45 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Thu, 31 Jul 2008 10:28:45 GMT Subject: rpms/gspiceui/devel gspiceui.spec,1.1,1.2 Message-ID: <200807311028.m6VASjpT028319@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gspiceui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238/devel Modified Files: gspiceui.spec Log Message: Exclude ppc64 Index: gspiceui.spec =================================================================== RCS file: /cvs/pkgs/rpms/gspiceui/devel/gspiceui.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gspiceui.spec 28 Jul 2008 07:41:35 -0000 1.1 +++ gspiceui.spec 31 Jul 2008 10:28:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: gspiceui Version: 0.9.65 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A GUI to freely available Spice Electronic circuit similators Group: Applications/System @@ -10,10 +10,12 @@ Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: compat-wxGTK26-devel, desktop-file-utils +BuildRequires: compat-wxGTK26-devel, desktop-file-utils Requires: ngspice, geda-gnetlist, geda-gschem Requires: gwave, electronics-menu +ExcludeArch: ppc64 + %description GspiceUI is listed among the Fedora Electronic Lab (FEL) packages. @@ -92,6 +94,9 @@ %changelog +* Thu Jul 31 2008 Xavier Lamien - 0.9.65-3 +- Excluded ppc64 (gwave is not available on ppc64). + * Sat Jul 26 2008 Xavier Lamien - 0.9.65-2 - Fix typo on desktop-file-install. From fedora-extras-commits at redhat.com Thu Jul 31 10:30:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9tw6HFoSBNcsOheg==?= (tmraz)) Date: Thu, 31 Jul 2008 10:30:40 GMT Subject: rpms/openssh/F-9 openssh-5.1p1-bannerlen.patch, NONE, 1.1 openssh.spec, 1.127, 1.128 Message-ID: <200807311030.m6VAUeC1028549@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/openssh/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28524 Modified Files: openssh.spec Added Files: openssh-5.1p1-bannerlen.patch Log Message: * Thu Jul 31 2008 Tomas Mraz - 5.1p1-2 - fixed zero length banner problem (#457326) openssh-5.1p1-bannerlen.patch: --- NEW FILE openssh-5.1p1-bannerlen.patch --- diff -up openssh-5.1p1/sshconnect2.c.bannerlen openssh-5.1p1/sshconnect2.c --- openssh-5.1p1/sshconnect2.c.bannerlen 2008-07-23 19:18:15.000000000 +0200 +++ openssh-5.1p1/sshconnect2.c 2008-07-31 11:16:51.000000000 +0200 @@ -387,8 +387,9 @@ input_userauth_banner(int type, u_int32_ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/F-9/openssh.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- openssh.spec 23 Jul 2008 18:34:08 -0000 1.127 +++ openssh.spec 31 Jul 2008 10:30:10 -0000 1.128 @@ -63,7 +63,7 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 Name: openssh Version: 5.1p1 -Release: 1%{?dist}%{?rescue_rel} +Release: 2%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc @@ -96,6 +96,7 @@ Patch54: openssh-5.1p1-gssapi-role.patch Patch55: openssh-5.1p1-cloexec.patch Patch62: openssh-5.1p1-scp-manpage.patch +Patch63: openssh-5.1p1-bannerlen.patch License: BSD Group: Applications/Internet @@ -227,6 +228,7 @@ %patch54 -p1 -b .gssapi-role %patch55 -p1 -b .cloexec %patch62 -p1 -b .manpage +%patch63 -p1 -b .bannerlen autoreconf @@ -478,6 +480,9 @@ %endif %changelog +* Thu Jul 31 2008 Tomas Mraz - 5.1p1-2 +- fixed zero length banner problem (#457326) + * Wed Jul 23 2008 Tomas Mraz - 5.1p1-1 - upgrade to new upstream release - fixed a problem with public key authentication and explicitely From fedora-extras-commits at redhat.com Thu Jul 31 11:22:04 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 31 Jul 2008 11:22:04 GMT Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.196, 1.197 selinux-policy.spec, 1.699, 1.700 Message-ID: <200807311122.m6VBM4Gx004695@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4591 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Wed Jul 30 2008 Dan Walsh 3.3.1-82 - Change mail_spool to be a files_mountpoint policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- policy-20071130.patch 29 Jul 2008 20:55:03 -0000 1.196 +++ policy-20071130.patch 31 Jul 2008 11:21:33 -0000 1.197 @@ -3102,7 +3102,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-07-28 08:40:30.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-07-31 07:05:47.000000000 -0400 @@ -26,8 +26,12 @@ files_read_etc_files(tmpreaper_t) files_read_var_lib_files(tmpreaper_t) @@ -3116,7 +3116,7 @@ mls_file_read_all_levels(tmpreaper_t) mls_file_write_all_levels(tmpreaper_t) -@@ -42,6 +46,26 @@ +@@ -42,6 +46,29 @@ cron_system_entry(tmpreaper_t,tmpreaper_exec_t) @@ -3127,6 +3127,9 @@ +files_manage_isid_type_dirs(tmpreaper_t) +files_delete_isid_type_files(tmpreaper_t) + ++files_delete_usr_dirs(tmpreaper_t) ++files_delete_usr_files(tmpreaper_t) ++ +optional_policy(` + amavis_manage_spool_files(tmpreaper_t) +') @@ -8189,7 +8192,7 @@ # /emul diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.3.1/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/kernel/files.if 2008-07-28 08:38:24.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/kernel/files.if 2008-07-31 07:05:40.000000000 -0400 @@ -110,6 +110,11 @@ ## # @@ -8378,7 +8381,55 @@ ') ######################################## -@@ -3510,6 +3620,24 @@ +@@ -3492,6 +3602,47 @@ + + ######################################## + ## ++## Delete generic directories in /usr in the caller domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`files_delete_usr_dirs',` ++ gen_require(` ++ type usr_t; ++ ') ++ ++ delete_dirs_pattern($1, usr_t, usr_t) ++') ++ ++######################################## ++## ++## Delete generic files in /usr in the caller domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`files_delete_usr_files',` ++ gen_require(` ++ type usr_t; ++ ') ++ ++ delete_files_pattern($1, usr_t, usr_t) ++ delete_lnk_files_pattern($1, usr_t, usr_t) ++ delete_fifo_files_pattern($1, usr_t, usr_t) ++ delete_sock_files_pattern($1, usr_t, usr_t) ++ delete_blk_files_pattern($1, usr_t, usr_t) ++ delete_chr_files_pattern($1, usr_t, usr_t) ++') ++ ++######################################## ++## + ## Create, read, write, and delete files in the /usr directory. + ## + ## +@@ -3510,6 +3661,24 @@ ######################################## ## @@ -8403,7 +8454,7 @@ ## Relabel a file to the type used in /usr. ## ## -@@ -4712,12 +4840,14 @@ +@@ -4712,12 +4881,14 @@ allow $1 poly_t:dir { create mounton }; fs_unmount_xattr_fs($1) @@ -8419,7 +8470,7 @@ ') ') -@@ -4756,3 +4886,53 @@ +@@ -4756,3 +4927,53 @@ allow $1 { file_type -security_file_type }:dir manage_dir_perms; ') @@ -12002,18 +12053,19 @@ # Local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.3.1/policy/modules/services/clamav.fc --- nsaserefpolicy/policy/modules/services/clamav.fc 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/clamav.fc 2008-07-15 14:02:52.000000000 -0400 -@@ -5,16 +5,20 @@ ++++ serefpolicy-3.3.1/policy/modules/services/clamav.fc 2008-07-30 15:20:35.000000000 -0400 +@@ -5,16 +5,18 @@ /usr/bin/freshclam -- gen_context(system_u:object_r:freshclam_exec_t,s0) /usr/sbin/clamd -- gen_context(system_u:object_r:clamd_exec_t,s0) +/usr/sbin/clamav-milter -- gen_context(system_u:object_r:clamd_exec_t,s0) /var/run/amavis(d)?/clamd\.pid -- gen_context(system_u:object_r:clamd_var_run_t,s0) - /var/run/clamav(/.*)? gen_context(system_u:object_r:clamd_var_run_t,s0) - /var/run/clamd\..* gen_context(system_u:object_r:clamd_var_run_t,s0) - /var/run/clamav\..* gen_context(system_u:object_r:clamd_var_run_t,s0) -+/var/run/clamav-milter(/.*)? gen_context(system_u:object_r:clamd_var_run_t,s0) +-/var/run/clamav(/.*)? gen_context(system_u:object_r:clamd_var_run_t,s0) +-/var/run/clamd\..* gen_context(system_u:object_r:clamd_var_run_t,s0) +-/var/run/clamav\..* gen_context(system_u:object_r:clamd_var_run_t,s0) ++/var/run/clamd.* gen_context(system_u:object_r:clamd_var_run_t,s0) ++/var/run/clamav.* gen_context(system_u:object_r:clamd_var_run_t,s0) /var/lib/clamav(/.*)? gen_context(system_u:object_r:clamd_var_lib_t,s0) @@ -13173,7 +13225,7 @@ -') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.3.1/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/cups.fc 2008-07-29 15:03:03.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/cups.fc 2008-07-30 11:32:46.000000000 -0400 @@ -8,24 +8,28 @@ /etc/cups/ppd/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) /etc/cups/ppds\.dat -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) @@ -13217,12 +13269,13 @@ /var/cache/alchemist/printconf.* gen_context(system_u:object_r:cupsd_rw_etc_t,s0) /var/cache/foomatic(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0) -@@ -50,3 +54,12 @@ +@@ -50,3 +54,13 @@ /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) /var/run/ptal-mlcd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) + +/usr/local/Brother/inf(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0) ++/usr/local/Brother/[^/]*/inf(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0) +/usr/local/Printer/[^/]*/inf(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + +/etc/rc.d/init.d/cups -- gen_context(system_u:object_r:cups_script_exec_t,s0) @@ -15465,7 +15518,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.3.1/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/dovecot.te 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/dovecot.te 2008-07-30 16:18:10.000000000 -0400 @@ -15,6 +15,15 @@ domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t) role system_r types dovecot_auth_t; @@ -18227,7 +18280,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.3.1/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2008-06-12 23:38:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-07-28 08:35:21.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-07-30 09:59:41.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -18237,7 +18290,16 @@ attribute mta_user_agent; attribute mailserver_delivery; attribute mailserver_domain; -@@ -27,6 +29,7 @@ +@@ -20,13 +22,14 @@ + files_config_file(etc_mail_t) + + type mqueue_spool_t; +-files_type(mqueue_spool_t) ++files_mountpoint(mqueue_spool_t) + + type mail_spool_t; +-files_type(mail_spool_t) ++files_mountpoint(mail_spool_t) type sendmail_exec_t; application_executable_file(sendmail_exec_t) @@ -22240,7 +22302,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.3.1/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/procmail.te 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/procmail.te 2008-07-30 16:18:25.000000000 -0400 @@ -14,6 +14,10 @@ type procmail_tmp_t; files_tmp_file(procmail_tmp_t) @@ -22274,7 +22336,7 @@ files_read_etc_files(procmail_t) files_read_etc_runtime_files(procmail_t) -@@ -102,6 +114,10 @@ +@@ -102,6 +114,15 @@ ') optional_policy(` @@ -22282,10 +22344,15 @@ +') + +optional_policy(` ++ dovecot_domtrans_deliver(procmail_t) ++') ++ ++ ++optional_policy(` munin_dontaudit_search_lib(procmail_t) ') -@@ -116,11 +132,13 @@ +@@ -116,11 +137,13 @@ optional_policy(` pyzor_domtrans(procmail_t) @@ -22299,7 +22366,7 @@ sendmail_rw_tcp_sockets(procmail_t) sendmail_rw_unix_stream_sockets(procmail_t) ') -@@ -129,7 +147,11 @@ +@@ -129,7 +152,11 @@ corenet_udp_bind_generic_port(procmail_t) corenet_dontaudit_udp_bind_all_ports(procmail_t) @@ -31996,7 +32063,7 @@ +HOME_DIR/\.fontconfig(/.*)? gen_context(system_u:object_r:user_fonts_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-3.3.1/policy/modules/system/miscfiles.if --- nsaserefpolicy/policy/modules/system/miscfiles.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/miscfiles.if 2008-07-15 14:02:52.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/miscfiles.if 2008-07-30 10:04:13.000000000 -0400 @@ -489,3 +489,65 @@ manage_lnk_files_pattern($1,locale_t,locale_t) ') @@ -34885,7 +34952,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.3.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-06-12 23:38:01.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-07-29 11:04:46.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-07-30 10:07:48.000000000 -0400 @@ -29,9 +29,14 @@ ') @@ -34902,7 +34969,7 @@ corecmd_shell_entry_type($1_t) corecmd_bin_entry_type($1_t) domain_user_exemption_target($1_t) -@@ -45,66 +50,80 @@ +@@ -45,66 +50,82 @@ type $1_tty_device_t; term_user_tty($1_t,$1_tty_device_t) @@ -35028,10 +35095,12 @@ + + miscfiles_read_localization($1_usertype) + miscfiles_read_certs($1_usertype) ++ miscfiles_read_public_files($1_usertype) ++ miscfiles_read_man_pages($1_usertype) tunable_policy(`allow_execmem',` # Allow loading DSOs that require executable stack. -@@ -115,6 +134,10 @@ +@@ -115,6 +136,10 @@ # Allow making the stack executable via mprotect. allow $1_t self:process execstack; ') @@ -35042,7 +35111,7 @@ ') ####################################### -@@ -141,33 +164,13 @@ +@@ -141,33 +166,13 @@ # template(`userdom_ro_home_template',` gen_require(` @@ -35081,7 +35150,7 @@ ############################## # -@@ -175,13 +178,14 @@ +@@ -175,13 +180,14 @@ # # read-only home directory @@ -35103,7 +35172,7 @@ files_list_home($1_t) tunable_policy(`use_nfs_home_dirs',` -@@ -190,9 +194,6 @@ +@@ -190,9 +196,6 @@ fs_read_nfs_symlinks($1_t) fs_read_nfs_named_sockets($1_t) fs_read_nfs_named_pipes($1_t) @@ -35113,7 +35182,7 @@ ') tunable_policy(`use_samba_home_dirs',` -@@ -201,9 +202,6 @@ +@@ -201,9 +204,6 @@ fs_read_cifs_symlinks($1_t) fs_read_cifs_named_sockets($1_t) fs_read_cifs_named_pipes($1_t) @@ -35123,7 +35192,7 @@ ') ') -@@ -231,30 +229,14 @@ +@@ -231,30 +231,14 @@ # template(`userdom_manage_home_template',` gen_require(` @@ -35160,7 +35229,7 @@ ############################## # -@@ -262,43 +244,44 @@ +@@ -262,43 +246,44 @@ # # full control of the home directory @@ -35235,7 +35304,7 @@ ') ') -@@ -316,14 +299,20 @@ +@@ -316,14 +301,20 @@ ## # template(`userdom_exec_home_template',` @@ -35261,7 +35330,7 @@ ') ') -@@ -341,11 +330,10 @@ +@@ -341,11 +332,10 @@ ## # template(`userdom_poly_home_template',` @@ -35277,7 +35346,7 @@ ') ####################################### -@@ -369,18 +357,18 @@ +@@ -369,18 +359,18 @@ # template(`userdom_manage_tmp_template',` gen_require(` @@ -35306,7 +35375,7 @@ ') ####################################### -@@ -396,7 +384,13 @@ +@@ -396,7 +386,13 @@ ## # template(`userdom_exec_tmp_template',` @@ -35321,7 +35390,7 @@ ') ####################################### -@@ -445,12 +439,12 @@ +@@ -445,12 +441,12 @@ type $1_tmpfs_t, $1_file_type; files_tmpfs_file($1_tmpfs_t) @@ -35340,7 +35409,7 @@ ') ####################################### -@@ -510,10 +504,6 @@ +@@ -510,10 +506,6 @@ ## # template(`userdom_exec_generic_pgms_template',` @@ -35351,17 +35420,17 @@ corecmd_exec_bin($1_t) ') -@@ -531,27 +521,20 @@ +@@ -531,27 +523,20 @@ ## # template(`userdom_basic_networking_template',` - gen_require(` - type $1_t; - ') - +- - allow $1_t self:tcp_socket create_stream_socket_perms; - allow $1_t self:udp_socket create_socket_perms; -- + - corenet_all_recvfrom_unlabeled($1_t) - corenet_all_recvfrom_netlabel($1_t) - corenet_tcp_sendrecv_all_if($1_t) @@ -35391,7 +35460,7 @@ ') ####################################### -@@ -568,30 +551,33 @@ +@@ -568,30 +553,33 @@ # template(`userdom_xwindows_client_template',` gen_require(` @@ -35441,7 +35510,7 @@ ') ####################################### -@@ -622,13 +608,7 @@ +@@ -622,13 +610,7 @@ ## ## The template for allowing the user to change roles. ## @@ -35456,7 +35525,7 @@ ## ## The prefix of the user domain (e.g., user ## is the prefix for user_t). -@@ -692,187 +672,201 @@ +@@ -692,187 +674,201 @@ dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown }; dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write }; @@ -35610,36 +35679,36 @@ optional_policy(` - dbus_system_bus_client_template($1,$1_t) + dbus_system_bus_client_template($1,$1_usertype) ++ ++ optional_policy(` ++ avahi_dbus_chat($1_usertype) ++ ') optional_policy(` - bluetooth_dbus_chat($1_t) -+ avahi_dbus_chat($1_usertype) ++ bluetooth_dbus_chat($1_usertype) ') optional_policy(` - evolution_dbus_chat($1,$1_t) - evolution_alarm_dbus_chat($1,$1_t) -+ bluetooth_dbus_chat($1_usertype) ++ consolekit_dbus_chat($1_usertype) ++ consolekit_read_log($1_usertype) ') optional_policy(` - cups_dbus_chat_config($1_t) -+ consolekit_dbus_chat($1_usertype) -+ consolekit_read_log($1_usertype) ++ evolution_dbus_chat($1,$1_usertype) ++ evolution_alarm_dbus_chat($1,$1_usertype) ') optional_policy(` - hal_dbus_chat($1_t) -+ evolution_dbus_chat($1,$1_usertype) -+ evolution_alarm_dbus_chat($1,$1_usertype) ++ networkmanager_dbus_chat($1_usertype) ') optional_policy(` - networkmanager_dbus_chat($1_t) -+ networkmanager_dbus_chat($1_usertype) -+ ') -+ -+ optional_policy(` + vpnc_dbus_chat($1_usertype) + ') + optional_policy(` @@ -35742,7 +35811,7 @@ ') ') -@@ -895,6 +889,8 @@ +@@ -895,6 +891,8 @@ ## # template(`userdom_login_user_template', ` @@ -35751,7 +35820,7 @@ userdom_base_user_template($1) userdom_manage_home_template($1) -@@ -923,70 +919,73 @@ +@@ -923,70 +921,72 @@ allow $1_t self:context contains; @@ -35812,7 +35881,6 @@ + logging_dontaudit_getattr_all_logs($1_usertype) - miscfiles_read_man_pages($1_t) -+ miscfiles_read_man_pages($1_usertype) # for running TeX programs - miscfiles_read_tetex_data($1_t) - miscfiles_exec_tetex_data($1_t) @@ -35858,7 +35926,7 @@ ') ') -@@ -1020,9 +1019,6 @@ +@@ -1020,9 +1020,6 @@ domain_interactive_fd($1_t) typeattribute $1_devpts_t user_ptynode; @@ -35868,7 +35936,7 @@ typeattribute $1_tty_device_t user_ttynode; ############################## -@@ -1031,16 +1027,29 @@ +@@ -1031,16 +1028,29 @@ # # privileged home directory writers @@ -35905,7 +35973,7 @@ ') ####################################### -@@ -1068,6 +1077,13 @@ +@@ -1068,6 +1078,13 @@ userdom_restricted_user_template($1) @@ -35919,7 +35987,7 @@ userdom_xwindows_client_template($1) ############################## -@@ -1076,14 +1092,16 @@ +@@ -1076,14 +1093,16 @@ # authlogin_per_role_template($1, $1_t, $1_r) @@ -35941,7 +36009,7 @@ logging_dontaudit_send_audit_msgs($1_t) # Need to to this just so screensaver will work. Should be moved to screensaver domain -@@ -1091,32 +1109,29 @@ +@@ -1091,32 +1110,29 @@ selinux_get_enforce_mode($1_t) optional_policy(` @@ -35985,7 +36053,7 @@ ') ') -@@ -1127,10 +1142,10 @@ +@@ -1127,10 +1143,10 @@ ## ## ##

@@ -36000,7 +36068,7 @@ ## This template creates a user domain, types, and ## rules for the user's tty, pty, home directories, ## tmp, and tmpfs files. -@@ -1164,7 +1179,6 @@ +@@ -1164,7 +1180,6 @@ # Need the following rule to allow users to run vpnc corenet_tcp_bind_xserver_port($1_t) @@ -36008,7 +36076,7 @@ # cjp: why? files_read_kernel_symbol_table($1_t) -@@ -1182,32 +1196,45 @@ +@@ -1182,32 +1197,45 @@ ') ') @@ -36066,7 +36134,7 @@ ') ') -@@ -1284,8 +1311,6 @@ +@@ -1284,8 +1312,6 @@ # Manipulate other users crontab. allow $1_t self:passwd crontab; @@ -36075,7 +36143,7 @@ kernel_read_software_raid_state($1_t) kernel_getattr_core_if($1_t) kernel_getattr_message_if($1_t) -@@ -1307,8 +1332,6 @@ +@@ -1307,8 +1333,6 @@ dev_getattr_generic_blk_files($1_t) dev_getattr_generic_chr_files($1_t) @@ -36084,7 +36152,7 @@ # Allow MAKEDEV to work dev_create_all_blk_files($1_t) dev_create_all_chr_files($1_t) -@@ -1363,13 +1386,6 @@ +@@ -1363,13 +1387,6 @@ # But presently necessary for installing the file_contexts file. seutil_manage_bin_policy($1_t) @@ -36098,7 +36166,7 @@ optional_policy(` userhelper_exec($1_t) ') -@@ -1422,6 +1438,7 @@ +@@ -1422,6 +1439,7 @@ dev_relabel_all_dev_nodes($1) files_create_boot_flag($1) @@ -36106,7 +36174,7 @@ # Necessary for managing /boot/efi fs_manage_dos_files($1) -@@ -1787,10 +1804,14 @@ +@@ -1787,10 +1805,14 @@ template(`userdom_user_home_content',` gen_require(` attribute $1_file_type; @@ -36122,7 +36190,7 @@ ') ######################################## -@@ -1886,11 +1907,11 @@ +@@ -1886,11 +1908,11 @@ # template(`userdom_search_user_home_dirs',` gen_require(` @@ -36136,7 +36204,7 @@ ') ######################################## -@@ -1920,11 +1941,11 @@ +@@ -1920,11 +1942,11 @@ # template(`userdom_list_user_home_dirs',` gen_require(` @@ -36150,7 +36218,7 @@ ') ######################################## -@@ -1968,12 +1989,12 @@ +@@ -1968,12 +1990,12 @@ # template(`userdom_user_home_domtrans',` gen_require(` @@ -36166,7 +36234,7 @@ ') ######################################## -@@ -2003,10 +2024,11 @@ +@@ -2003,10 +2025,11 @@ # template(`userdom_dontaudit_list_user_home_dirs',` gen_require(` @@ -36180,7 +36248,7 @@ ') ######################################## -@@ -2038,11 +2060,48 @@ +@@ -2038,11 +2061,48 @@ # template(`userdom_manage_user_home_content_dirs',` gen_require(` @@ -36231,7 +36299,7 @@ ') ######################################## -@@ -2074,10 +2133,10 @@ +@@ -2074,10 +2134,10 @@ # template(`userdom_dontaudit_setattr_user_home_content_files',` gen_require(` @@ -36244,7 +36312,7 @@ ') ######################################## -@@ -2107,11 +2166,11 @@ +@@ -2107,11 +2167,11 @@ # template(`userdom_read_user_home_content_files',` gen_require(` @@ -36258,7 +36326,7 @@ ') ######################################## -@@ -2141,11 +2200,11 @@ +@@ -2141,11 +2201,11 @@ # template(`userdom_dontaudit_read_user_home_content_files',` gen_require(` @@ -36273,7 +36341,7 @@ ') ######################################## -@@ -2175,10 +2234,14 @@ +@@ -2175,10 +2235,14 @@ # template(`userdom_dontaudit_write_user_home_content_files',` gen_require(` @@ -36290,7 +36358,7 @@ ') ######################################## -@@ -2208,11 +2271,11 @@ +@@ -2208,11 +2272,11 @@ # template(`userdom_read_user_home_content_symlinks',` gen_require(` @@ -36304,7 +36372,7 @@ ') ######################################## -@@ -2242,11 +2305,11 @@ +@@ -2242,11 +2306,11 @@ # template(`userdom_exec_user_home_content_files',` gen_require(` @@ -36318,7 +36386,7 @@ ') ######################################## -@@ -2276,10 +2339,10 @@ +@@ -2276,10 +2340,10 @@ # template(`userdom_dontaudit_exec_user_home_content_files',` gen_require(` @@ -36331,7 +36399,7 @@ ') ######################################## -@@ -2311,12 +2374,12 @@ +@@ -2311,12 +2375,12 @@ # template(`userdom_manage_user_home_content_files',` gen_require(` @@ -36347,7 +36415,7 @@ ') ######################################## -@@ -2348,10 +2411,10 @@ +@@ -2348,10 +2412,10 @@ # template(`userdom_dontaudit_manage_user_home_content_dirs',` gen_require(` @@ -36360,7 +36428,7 @@ ') ######################################## -@@ -2383,12 +2446,12 @@ +@@ -2383,12 +2447,12 @@ # template(`userdom_manage_user_home_content_symlinks',` gen_require(` @@ -36376,7 +36444,7 @@ ') ######################################## -@@ -2420,12 +2483,12 @@ +@@ -2420,12 +2484,12 @@ # template(`userdom_manage_user_home_content_pipes',` gen_require(` @@ -36392,7 +36460,7 @@ ') ######################################## -@@ -2457,12 +2520,12 @@ +@@ -2457,12 +2521,12 @@ # template(`userdom_manage_user_home_content_sockets',` gen_require(` @@ -36408,7 +36476,7 @@ ') ######################################## -@@ -2507,11 +2570,11 @@ +@@ -2507,11 +2571,11 @@ # template(`userdom_user_home_dir_filetrans',` gen_require(` @@ -36422,7 +36490,7 @@ ') ######################################## -@@ -2556,11 +2619,11 @@ +@@ -2556,11 +2620,11 @@ # template(`userdom_user_home_content_filetrans',` gen_require(` @@ -36436,7 +36504,7 @@ ') ######################################## -@@ -2600,11 +2663,11 @@ +@@ -2600,11 +2664,11 @@ # template(`userdom_user_home_dir_filetrans_user_home_content',` gen_require(` @@ -36450,7 +36518,7 @@ ') ######################################## -@@ -2634,11 +2697,11 @@ +@@ -2634,11 +2698,11 @@ # template(`userdom_write_user_tmp_sockets',` gen_require(` @@ -36464,7 +36532,7 @@ ') ######################################## -@@ -2668,11 +2731,11 @@ +@@ -2668,11 +2732,11 @@ # template(`userdom_list_user_tmp',` gen_require(` @@ -36478,7 +36546,7 @@ ') ######################################## -@@ -2704,10 +2767,10 @@ +@@ -2704,10 +2768,10 @@ # template(`userdom_dontaudit_list_user_tmp',` gen_require(` @@ -36491,7 +36559,7 @@ ') ######################################## -@@ -2739,10 +2802,10 @@ +@@ -2739,10 +2803,10 @@ # template(`userdom_dontaudit_manage_user_tmp_dirs',` gen_require(` @@ -36504,7 +36572,7 @@ ') ######################################## -@@ -2772,12 +2835,12 @@ +@@ -2772,12 +2836,12 @@ # template(`userdom_read_user_tmp_files',` gen_require(` @@ -36520,7 +36588,7 @@ ') ######################################## -@@ -2809,20 +2872,20 @@ +@@ -2809,20 +2873,20 @@ # template(`userdom_dontaudit_read_user_tmp_files',` gen_require(` @@ -36545,7 +36613,7 @@ ## temporary files. ##

##

-@@ -2842,21 +2905,23 @@ +@@ -2842,21 +2906,23 @@ ##

## # @@ -36574,7 +36642,7 @@ ##

##

## This is a templated interface, and should only -@@ -2871,66 +2936,137 @@ +@@ -2871,67 +2937,138 @@ ## ## ##

@@ -36649,6 +36717,7 @@ -## temporary symbolic links. -##

-##

+-## This is a templated interface, and should only +## +##

+## Domain allowed access. @@ -36745,10 +36814,11 @@ +## temporary symbolic links. +##

+##

- ## This is a templated interface, and should only ++## This is a templated interface, and should only ## be called from a per-userdomain template. ##

-@@ -2949,12 +3085,12 @@ + ## +@@ -2949,12 +3086,12 @@ # template(`userdom_read_user_tmp_symlinks',` gen_require(` @@ -36764,7 +36834,7 @@ ') ######################################## -@@ -2986,11 +3122,11 @@ +@@ -2986,11 +3123,11 @@ # template(`userdom_manage_user_tmp_dirs',` gen_require(` @@ -36778,7 +36848,7 @@ ') ######################################## -@@ -3022,11 +3158,11 @@ +@@ -3022,11 +3159,11 @@ # template(`userdom_manage_user_tmp_files',` gen_require(` @@ -36792,7 +36862,7 @@ ') ######################################## -@@ -3058,11 +3194,11 @@ +@@ -3058,11 +3195,11 @@ # template(`userdom_manage_user_tmp_symlinks',` gen_require(` @@ -36806,7 +36876,7 @@ ') ######################################## -@@ -3094,11 +3230,11 @@ +@@ -3094,11 +3231,11 @@ # template(`userdom_manage_user_tmp_pipes',` gen_require(` @@ -36820,7 +36890,7 @@ ') ######################################## -@@ -3130,11 +3266,11 @@ +@@ -3130,11 +3267,11 @@ # template(`userdom_manage_user_tmp_sockets',` gen_require(` @@ -36834,7 +36904,7 @@ ') ######################################## -@@ -3179,10 +3315,10 @@ +@@ -3179,10 +3316,10 @@ # template(`userdom_user_tmp_filetrans',` gen_require(` @@ -36847,7 +36917,7 @@ files_search_tmp($2) ') -@@ -3223,10 +3359,10 @@ +@@ -3223,10 +3360,10 @@ # template(`userdom_tmp_filetrans_user_tmp',` gen_require(` @@ -36860,7 +36930,7 @@ ') ######################################## -@@ -3254,6 +3390,42 @@ +@@ -3254,6 +3391,42 @@ ## ## # @@ -36903,7 +36973,7 @@ template(`userdom_rw_user_tmpfs_files',` gen_require(` type $1_tmpfs_t; -@@ -3267,6 +3439,42 @@ +@@ -3267,6 +3440,42 @@ ######################################## ## @@ -36946,7 +37016,7 @@ ## List users untrusted directories. ## ## -@@ -3962,6 +4170,24 @@ +@@ -3962,6 +4171,24 @@ ######################################## ## @@ -36971,7 +37041,7 @@ ## Manage unpriviledged user SysV shared ## memory segments. ## -@@ -4231,11 +4457,11 @@ +@@ -4231,11 +4458,11 @@ # interface(`userdom_search_staff_home_dirs',` gen_require(` @@ -36985,7 +37055,7 @@ ') ######################################## -@@ -4251,10 +4477,10 @@ +@@ -4251,10 +4478,10 @@ # interface(`userdom_dontaudit_search_staff_home_dirs',` gen_require(` @@ -36998,7 +37068,7 @@ ') ######################################## -@@ -4270,11 +4496,11 @@ +@@ -4270,11 +4497,11 @@ # interface(`userdom_manage_staff_home_dirs',` gen_require(` @@ -37012,7 +37082,7 @@ ') ######################################## -@@ -4289,16 +4515,16 @@ +@@ -4289,16 +4516,16 @@ # interface(`userdom_relabelto_staff_home_dirs',` gen_require(` @@ -37032,7 +37102,7 @@ ## users home directory. ## ## -@@ -4307,12 +4533,35 @@ +@@ -4307,12 +4534,35 @@ ## ## # @@ -37071,7 +37141,7 @@ ') ######################################## -@@ -4327,13 +4576,13 @@ +@@ -4327,13 +4577,13 @@ # interface(`userdom_read_staff_home_content_files',` gen_require(` @@ -37089,7 +37159,7 @@ ') ######################################## -@@ -4531,10 +4780,10 @@ +@@ -4531,10 +4781,10 @@ # interface(`userdom_getattr_sysadm_home_dirs',` gen_require(` @@ -37102,7 +37172,7 @@ ') ######################################## -@@ -4551,10 +4800,10 @@ +@@ -4551,10 +4801,10 @@ # interface(`userdom_dontaudit_getattr_sysadm_home_dirs',` gen_require(` @@ -37115,7 +37185,7 @@ ') ######################################## -@@ -4569,10 +4818,10 @@ +@@ -4569,10 +4819,10 @@ # interface(`userdom_search_sysadm_home_dirs',` gen_require(` @@ -37128,7 +37198,7 @@ ') ######################################## -@@ -4588,10 +4837,10 @@ +@@ -4588,10 +4838,10 @@ # interface(`userdom_dontaudit_search_sysadm_home_dirs',` gen_require(` @@ -37141,7 +37211,7 @@ ') ######################################## -@@ -4606,10 +4855,10 @@ +@@ -4606,10 +4856,10 @@ # interface(`userdom_list_sysadm_home_dirs',` gen_require(` @@ -37154,7 +37224,7 @@ ') ######################################## -@@ -4625,10 +4874,10 @@ +@@ -4625,10 +4875,10 @@ # interface(`userdom_dontaudit_list_sysadm_home_dirs',` gen_require(` @@ -37167,7 +37237,7 @@ ') ######################################## -@@ -4644,12 +4893,29 @@ +@@ -4644,12 +4894,29 @@ # interface(`userdom_dontaudit_read_sysadm_home_content_files',` gen_require(` @@ -37201,7 +37271,7 @@ ') ######################################## -@@ -4676,10 +4942,10 @@ +@@ -4676,10 +4943,10 @@ # interface(`userdom_sysadm_home_dir_filetrans',` gen_require(` @@ -37214,7 +37284,7 @@ ') ######################################## -@@ -4694,10 +4960,10 @@ +@@ -4694,10 +4961,10 @@ # interface(`userdom_search_sysadm_home_content_dirs',` gen_require(` @@ -37227,7 +37297,7 @@ ') ######################################## -@@ -4712,13 +4978,13 @@ +@@ -4712,13 +4979,13 @@ # interface(`userdom_read_sysadm_home_content_files',` gen_require(` @@ -37245,7 +37315,7 @@ ') ######################################## -@@ -4754,11 +5020,49 @@ +@@ -4754,11 +5021,49 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -37296,7 +37366,7 @@ ') ######################################## -@@ -4778,6 +5082,14 @@ +@@ -4778,6 +5083,14 @@ files_list_home($1) allow $1 home_dir_type:dir list_dir_perms; @@ -37311,7 +37381,7 @@ ') ######################################## -@@ -4815,6 +5127,8 @@ +@@ -4815,6 +5128,8 @@ ') dontaudit $1 { home_dir_type home_type }:dir search_dir_perms; @@ -37320,7 +37390,7 @@ ') ######################################## -@@ -4839,7 +5153,7 @@ +@@ -4839,7 +5154,7 @@ ######################################## ## @@ -37329,7 +37399,7 @@ ## in all users home directories. ## ## -@@ -4848,18 +5162,57 @@ +@@ -4848,13 +5163,52 @@ ## ## # @@ -37342,11 +37412,10 @@ files_list_home($1) - allow $1 home_type:dir manage_dir_perms; + delete_dirs_pattern($1, home_type, home_type) - ') - - ######################################## - ## --## Create, read, write, and delete all files ++') ++ ++######################################## ++## +## Create, read, write, and delete all directories +## in all users home directories. +## @@ -37382,15 +37451,10 @@ + ') + + delete_files_pattern($1,home_type,home_type) -+') -+ -+######################################## -+## -+## Create, read, write, and delete all files - ## in all users home directories. - ## - ## -@@ -4879,6 +5232,26 @@ + ') + + ######################################## +@@ -4879,6 +5233,26 @@ ######################################## ## @@ -37417,7 +37481,7 @@ ## Create, read, write, and delete all symlinks ## in all users home directories. ## -@@ -5115,7 +5488,7 @@ +@@ -5115,7 +5489,7 @@ # interface(`userdom_relabelto_generic_user_home_dirs',` gen_require(` @@ -37426,7 +37490,7 @@ ') files_search_home($1) -@@ -5304,6 +5677,63 @@ +@@ -5304,6 +5678,63 @@ ######################################## ## @@ -37490,7 +37554,7 @@ ## Create, read, write, and delete directories in ## unprivileged users home directories. ## -@@ -5509,6 +5939,43 @@ +@@ -5509,6 +5940,43 @@ ######################################## ## @@ -37534,7 +37598,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5559,7 +6026,7 @@ +@@ -5559,7 +6027,7 @@ attribute userdomain; ') @@ -37543,7 +37607,7 @@ kernel_search_proc($1) ') -@@ -5674,6 +6141,42 @@ +@@ -5674,6 +6142,42 @@ ######################################## ## @@ -37586,7 +37650,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6207,408 @@ +@@ -5704,3 +6208,408 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.699 retrieving revision 1.700 diff -u -r1.699 -r1.700 --- selinux-policy.spec 29 Jul 2008 20:55:03 -0000 1.699 +++ selinux-policy.spec 31 Jul 2008 11:21:34 -0000 1.700 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 81%{?dist} +Release: 82%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -386,6 +386,9 @@ %endif %changelog +* Wed Jul 30 2008 Dan Walsh 3.3.1-82 +- Change mail_spool to be a files_mountpoint + * Tue Jul 29 2008 Dan Walsh 3.3.1-81 - Add boolean httpd_execmem - Add dontaudit for leaky pam_nssldap From fedora-extras-commits at redhat.com Thu Jul 31 11:38:11 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 31 Jul 2008 11:38:11 GMT Subject: rpms/python-mwlib/F-9 python-mwlib.spec,1.1,1.2 Message-ID: <200807311138.m6VBcB7e005765@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/python-mwlib/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5715/F-9 Modified Files: python-mwlib.spec Log Message: Fix Requires for F-8 Index: python-mwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/F-9/python-mwlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-mwlib.spec 25 Jul 2008 17:28:01 -0000 1.1 +++ python-mwlib.spec 31 Jul 2008 11:37:41 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-mwlib Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages @@ -14,7 +14,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools -Requires: perl python-imaging tex(latex) python-flup pyparsing odfpy python-simplejson +Requires: perl python-imaging python-flup pyparsing odfpy python-simplejson +# Virtual provides for this capability started with Fedora 9 +%if 0%{fedora} < 9 +Requires: tetex-latex +%else +Requires: tex(latex) +%endif %description mwlib is a Python library for parsing MediaWiki articles. It is @@ -47,6 +53,9 @@ %changelog +* Thu Jul 31 2008 Paul W. Frields - 0.8.0-3 +- Fix Requires to unbreak F-8 dependencies + * Fri Jul 25 2008 Ian Weller 0.8.0-2 - Fix source URL (again) - Remove make commands because setup.py build does that now From fedora-extras-commits at redhat.com Thu Jul 31 11:38:11 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 31 Jul 2008 11:38:11 GMT Subject: rpms/python-mwlib/F-8 python-mwlib.spec,1.1,1.2 Message-ID: <200807311138.m6VBcB3D005762@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/python-mwlib/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5715/F-8 Modified Files: python-mwlib.spec Log Message: Fix Requires for F-8 Index: python-mwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/F-8/python-mwlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-mwlib.spec 25 Jul 2008 17:30:32 -0000 1.1 +++ python-mwlib.spec 31 Jul 2008 11:37:40 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-mwlib Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages @@ -14,7 +14,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools -Requires: perl python-imaging tex(latex) python-flup pyparsing odfpy python-simplejson +Requires: perl python-imaging python-flup pyparsing odfpy python-simplejson +# Virtual provides for this capability started with Fedora 9 +%if 0%{fedora} < 9 +Requires: tetex-latex +%else +Requires: tex(latex) +%endif %description mwlib is a Python library for parsing MediaWiki articles. It is @@ -47,6 +53,9 @@ %changelog +* Thu Jul 31 2008 Paul W. Frields - 0.8.0-3 +- Fix Requires to unbreak F-8 dependencies + * Fri Jul 25 2008 Ian Weller 0.8.0-2 - Fix source URL (again) - Remove make commands because setup.py build does that now From fedora-extras-commits at redhat.com Thu Jul 31 11:38:12 2008 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 31 Jul 2008 11:38:12 GMT Subject: rpms/python-mwlib/devel python-mwlib.spec,1.1,1.2 Message-ID: <200807311138.m6VBcCOH005768@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/python-mwlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5715/devel Modified Files: python-mwlib.spec Log Message: Fix Requires for F-8 Index: python-mwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/devel/python-mwlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-mwlib.spec 25 Jul 2008 17:26:19 -0000 1.1 +++ python-mwlib.spec 31 Jul 2008 11:37:41 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-mwlib Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages @@ -14,7 +14,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools -Requires: perl python-imaging tex(latex) python-flup pyparsing odfpy python-simplejson +Requires: perl python-imaging python-flup pyparsing odfpy python-simplejson +# Virtual provides for this capability started with Fedora 9 +%if 0%{fedora} < 9 +Requires: tetex-latex +%else +Requires: tex(latex) +%endif %description mwlib is a Python library for parsing MediaWiki articles. It is @@ -47,6 +53,9 @@ %changelog +* Thu Jul 31 2008 Paul W. Frields - 0.8.0-3 +- Fix Requires to unbreak F-8 dependencies + * Fri Jul 25 2008 Ian Weller 0.8.0-2 - Fix source URL (again) - Remove make commands because setup.py build does that now From fedora-extras-commits at redhat.com Thu Jul 31 11:45:16 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 11:45:16 GMT Subject: rpms/maxima/devel maxima.spec,1.111,1.112 Message-ID: <200807311145.m6VBjGH9006405@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6378 Modified Files: maxima.spec Log Message: workaround, take 32 Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- maxima.spec 30 Jul 2008 20:19:27 -0000 1.111 +++ maxima.spec 31 Jul 2008 11:44:46 -0000 1.112 @@ -197,7 +197,7 @@ # maxima requires the *same* (or very similar) version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) -%if 0%{?sbcl_ver} >= 1.0 +%if "x%{?sbcl_ver}" != "x%{nil}" Requires: sbcl = %{sbcl_ver} %endif Requires: %{name} = %{version} From fedora-extras-commits at redhat.com Thu Jul 31 12:09:01 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 12:09:01 GMT Subject: rpms/drupal/F-8 .cvsignore, 1.5, 1.6 drupal.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200807311209.m6VC91q3014192@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14164 Modified Files: .cvsignore drupal.spec sources Log Message: SA-2008-046. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Jul 2008 12:05:17 -0000 1.5 +++ .cvsignore 31 Jul 2008 12:08:30 -0000 1.6 @@ -1 +1 @@ -drupal-5.8.tar.gz +drupal-5.9.tar.gz Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-8/drupal.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- drupal.spec 10 Jul 2008 12:05:17 -0000 1.11 +++ drupal.spec 31 Jul 2008 12:08:30 -0000 1.12 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 5.8 +Version: 5.9 Release: 1%{?dist} Summary: An open-source content-management platform @@ -71,6 +71,9 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 31 2008 Jon Ciesla - 5.9-1 +- Upgrade to 5.9, SA-2008-046. + * Thu Jul 10 2008 Jon Ciesla - 5.8-1 - Upgrade to 5.8, SA-2008-044. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Jul 2008 12:05:17 -0000 1.9 +++ sources 31 Jul 2008 12:08:30 -0000 1.10 @@ -1 +1 @@ -2a570ce3cb6a104c2cc540a02a3cb11d drupal-5.8.tar.gz +2937fd1503ee3d22d232e259d839e314 drupal-5.9.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 12:12:48 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 12:12:48 GMT Subject: rpms/drupal/EL-5 drupal.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <200807311212.m6VCCm7c014354@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14302 Modified Files: drupal.spec sources Log Message: SA-2008-046. Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-5/drupal.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- drupal.spec 10 Jul 2008 12:06:57 -0000 1.8 +++ drupal.spec 31 Jul 2008 12:12:18 -0000 1.9 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 5.8 +Version: 5.9 Release: 1%{?dist} Summary: An open-source content-management platform @@ -71,6 +71,9 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 31 2008 Jon Ciesla - 5.9-1 +- Upgrade to 5.9, SA-2008-046. + * Thu Jul 10 2008 Jon Ciesla - 5.8-1 - Upgrade to 5.8, SA-2008-044. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 10 Jul 2008 12:06:57 -0000 1.8 +++ sources 31 Jul 2008 12:12:18 -0000 1.9 @@ -1 +1 @@ -2a570ce3cb6a104c2cc540a02a3cb11d drupal-5.8.tar.gz +2937fd1503ee3d22d232e259d839e314 drupal-5.9.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 12:13:56 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 12:13:56 GMT Subject: rpms/drupal/EL-4 drupal.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <200807311213.m6VCDuot014428@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14407 Modified Files: drupal.spec sources Log Message: SA-2008-046. Index: drupal.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-4/drupal.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- drupal.spec 10 Jul 2008 12:08:14 -0000 1.8 +++ drupal.spec 31 Jul 2008 12:13:26 -0000 1.9 @@ -1,6 +1,6 @@ %define drupaldir %{_datadir}/drupal Name: drupal -Version: 5.8 +Version: 5.9 Release: 1%{?dist} Summary: An open-source content-management platform @@ -71,6 +71,9 @@ %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/ %changelog +* Thu Jul 31 2008 Jon Ciesla - 5.9-1 +- Upgrade to 5.9, SA-2008-046. + * Thu Jul 10 2008 Jon Ciesla - 5.8-1 - Upgrade to 5.8, SA-2008-044. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal/EL-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 10 Jul 2008 12:08:14 -0000 1.8 +++ sources 31 Jul 2008 12:13:26 -0000 1.9 @@ -1 +1 @@ -2a570ce3cb6a104c2cc540a02a3cb11d drupal-5.8.tar.gz +2937fd1503ee3d22d232e259d839e314 drupal-5.9.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 12:16:09 2008 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Thu, 31 Jul 2008 12:16:09 GMT Subject: rpms/testdisk/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 testdisk.spec, 1.22, 1.23 Message-ID: <200807311216.m6VCG98h014571@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14527 Modified Files: .cvsignore sources testdisk.spec Log Message: Update TestDisk & PhotoRec to version 6.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 19 Mar 2008 07:26:27 -0000 1.11 +++ .cvsignore 31 Jul 2008 12:15:39 -0000 1.12 @@ -1,2 +1,2 @@ -testdisk-6.9.tar.bz2 -testdisk69_libewf.patch +testdisk-6.10.tar.bz2 +testdisk-doc-6.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 19 Mar 2008 07:50:14 -0000 1.12 +++ sources 31 Jul 2008 12:15:39 -0000 1.13 @@ -1,2 +1,2 @@ -c16de07b1e0cf0cd0ccdd58fe2ff89f8 testdisk-6.9.tar.bz2 -3f28dbac662d32bfb8ece9da3b1f106b testdisk69_libewf.patch +d3bde0b546d40e029dda4e9861db40ef testdisk-6.10.tar.bz2 +9f850f4657777add0a063a2bccc219fd testdisk-doc-6.10.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- testdisk.spec 19 Mar 2008 07:26:27 -0000 1.22 +++ testdisk.spec 31 Jul 2008 12:15:39 -0000 1.23 @@ -3,12 +3,12 @@ Summary(fr.UTF8): Outil pour v??rifier et restorer des partitions Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.9 -Release: 2%{?dist} +Version: 6.10 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 -Patch0: testdisk69_libewf.patch +Source1: http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2 URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel @@ -17,6 +17,7 @@ BuildRequires: ntfsprogs-devel %endif BuildRequires: libewf-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -40,9 +41,47 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS +%package doc +Summary: TestDisk & PhotoRec documentation +Group: Documentation +Requires: testdisk = %{version}-%{release} + +%description doc +Tool to check and undelete partition. Works with FAT12, FAT16, FAT32, +NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, +LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l pl.UTF8 +Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l fr.UTF8 +Outil pour v??rifier et restorer des partitions. Fonctionne avec +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +Ce paquet contient la documentation de testdisk & photorec. + +%description doc -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%files doc +%defattr(644,root,root,755) +%doc doc + %prep %setup -q -%patch0 -p1 -b .list +%setup -q -a 1 %build %configure @@ -56,12 +95,16 @@ %files %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc +%doc AUTHORS COPYING ChangeLog NEWS README THANKS %attr(755,root,root) %{_sbindir}/testdisk %attr(755,root,root) %{_sbindir}/photorec %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* + %changelog +* Thu Jul 31 2008 Christophe Grenier 6.10-1 +- Update to latest version + * Wed Mar 19 2008 Christophe Grenier 6.9-2 - Fix for new API in libewf > 20070512 From fedora-extras-commits at redhat.com Thu Jul 31 12:18:40 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 31 Jul 2008 12:18:40 GMT Subject: rpms/eclipse/devel eclipse.spec,1.568,1.569 Message-ID: <200807311218.m6VCIe6x014710@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683 Modified Files: eclipse.spec Log Message: Oops, debugging exit left in. Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.568 retrieving revision 1.569 diff -u -r1.568 -r1.569 --- eclipse.spec 31 Jul 2008 00:38:20 -0000 1.568 +++ eclipse.spec 31 Jul 2008 12:18:10 -0000 1.569 @@ -910,13 +910,9 @@ cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir %endif -cat features/org.eclipse.platform/gtk/eclipse.ini.patched - cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \ $sdkDir/eclipse.ini -exit 1 - # Add a compatibility symlink to startup.jar pushd $sdkDir LAUNCHERNAME=$(ls plugins | grep equinox.launcher_) From fedora-extras-commits at redhat.com Thu Jul 31 12:18:34 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 31 Jul 2008 12:18:34 GMT Subject: rpms/mailman/devel mailman-2.1.11-cron.patch, 1.1, 1.2 mailman.spec, 1.72, 1.73 Message-ID: <200807311218.m6VCIY5N014705@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/mailman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14655 Modified Files: mailman-2.1.11-cron.patch mailman.spec Log Message: * Thu Jul 31 2008 Tomas Smetana - 3:2.1.11-3 - fix #457388 - don't call "/usr/bin/python" from /etc/cron.d/mailman - fix #457389 - cron complains about bad username mailman-2.1.11-cron.patch: Index: mailman-2.1.11-cron.patch =================================================================== RCS file: /cvs/pkgs/rpms/mailman/devel/mailman-2.1.11-cron.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mailman-2.1.11-cron.patch 23 Jul 2008 08:40:04 -0000 1.1 +++ mailman-2.1.11-cron.patch 31 Jul 2008 12:18:04 -0000 1.2 @@ -1,6 +1,6 @@ diff -up mailman-2.1.11/misc/mailman.in.cron mailman-2.1.11/misc/mailman.in ---- mailman-2.1.11/misc/mailman.in.cron 2008-07-22 08:55:18.000000000 +0200 -+++ mailman-2.1.11/misc/mailman.in 2008-07-22 08:55:18.000000000 +0200 +--- mailman-2.1.11/misc/mailman.in.cron 2008-07-31 13:53:55.000000000 +0200 ++++ mailman-2.1.11/misc/mailman.in 2008-07-31 13:53:55.000000000 +0200 @@ -24,18 +24,48 @@ # On Debian, type "update-rc.d mailman defaults" # On RedHat, and derivatives, install with "chkconfig --add mailman" @@ -90,7 +90,7 @@ exit $RETVAL diff -up mailman-2.1.11/cron/senddigests.cron mailman-2.1.11/cron/senddigests --- mailman-2.1.11/cron/senddigests.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/senddigests 2008-07-22 08:59:23.000000000 +0200 ++++ mailman-2.1.11/cron/senddigests 2008-07-31 13:53:55.000000000 +0200 @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON@ -S @@ -99,7 +99,7 @@ # diff -up mailman-2.1.11/cron/nightly_gzip.cron mailman-2.1.11/cron/nightly_gzip --- mailman-2.1.11/cron/nightly_gzip.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/nightly_gzip 2008-07-22 08:55:18.000000000 +0200 ++++ mailman-2.1.11/cron/nightly_gzip 2008-07-31 13:53:55.000000000 +0200 @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON@ -S @@ -108,7 +108,7 @@ # diff -up mailman-2.1.11/cron/gate_news.cron mailman-2.1.11/cron/gate_news --- mailman-2.1.11/cron/gate_news.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/gate_news 2008-07-22 08:55:18.000000000 +0200 ++++ mailman-2.1.11/cron/gate_news 2008-07-31 13:53:55.000000000 +0200 @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON@ -S @@ -117,7 +117,7 @@ # diff -up mailman-2.1.11/cron/checkdbs.cron mailman-2.1.11/cron/checkdbs --- mailman-2.1.11/cron/checkdbs.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/checkdbs 2008-07-22 08:55:18.000000000 +0200 ++++ mailman-2.1.11/cron/checkdbs 2008-07-31 13:53:55.000000000 +0200 @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON@ -S @@ -126,7 +126,7 @@ # diff -up mailman-2.1.11/cron/crontab.in.in.cron mailman-2.1.11/cron/crontab.in.in --- mailman-2.1.11/cron/crontab.in.in.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/crontab.in.in 2008-07-22 08:55:18.000000000 +0200 ++++ mailman-2.1.11/cron/crontab.in.in 2008-07-31 13:54:25.000000000 +0200 @@ -1,27 +1,50 @@ +# +# -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- @@ -183,10 +183,11 @@ +27 3 * * * @MAILMAN_USER@ @prefix@/cron/nightly_gzip # # At 4:30AM daily, cull old entries from the 'bad' and 'shunt' queues. - 30 4 * * * @PYTHON@ -S @prefix@/cron/cull_bad_shunt +-30 4 * * * @PYTHON@ -S @prefix@/cron/cull_bad_shunt ++30 4 * * * @MAILMAN_USER@ @prefix@/cron/cull_bad_shunt diff -up mailman-2.1.11/cron/mailpasswds.cron mailman-2.1.11/cron/mailpasswds --- mailman-2.1.11/cron/mailpasswds.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/mailpasswds 2008-07-22 08:55:18.000000000 +0200 ++++ mailman-2.1.11/cron/mailpasswds 2008-07-31 13:53:55.000000000 +0200 @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON@ -S @@ -195,7 +196,7 @@ # diff -up mailman-2.1.11/cron/disabled.cron mailman-2.1.11/cron/disabled --- mailman-2.1.11/cron/disabled.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/disabled 2008-07-22 08:55:18.000000000 +0200 ++++ mailman-2.1.11/cron/disabled 2008-07-31 13:53:55.000000000 +0200 @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON@ -S @@ -204,7 +205,7 @@ # diff -up mailman-2.1.11/cron/bumpdigests.cron mailman-2.1.11/cron/bumpdigests --- mailman-2.1.11/cron/bumpdigests.cron 2008-06-30 18:29:46.000000000 +0200 -+++ mailman-2.1.11/cron/bumpdigests 2008-07-22 08:55:18.000000000 +0200 ++++ mailman-2.1.11/cron/bumpdigests 2008-07-31 13:53:55.000000000 +0200 @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON@ -S Index: mailman.spec =================================================================== RCS file: /cvs/pkgs/rpms/mailman/devel/mailman.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- mailman.spec 23 Jul 2008 09:53:29 -0000 1.72 +++ mailman.spec 31 Jul 2008 12:18:04 -0000 1.73 @@ -1,7 +1,7 @@ Summary: Mailing list manager with built in Web access Name: mailman Version: 2.1.11 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 3 Group: Applications/Internet #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz @@ -354,6 +354,10 @@ %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in %changelog +* Thu Jul 31 2008 Tomas Smetana - 3:2.1.11-3 +- fix #457388 - don't call "/usr/bin/python" from /etc/cron.d/mailman +- fix #457389 - cron complains about bad username + * Wed Jul 23 2008 Tomas Smetana - 3:2.1.11-2 - temporary fix for --fuzz=0 From fedora-extras-commits at redhat.com Thu Jul 31 12:19:11 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 12:19:11 GMT Subject: rpms/bacula/F-9 bacula-bat.desktop, NONE, 1.1 bacula-bwxconsole.desktop, NONE, 1.1 bacula-config.patch, 1.1, 1.2 bacula-gconsole.desktop, 1.1, 1.2 bacula-pamd.patch, 1.1, 1.2 bacula-wxconsole.desktop, 1.1, 1.2 bacula.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200807311219.m6VCJBfa014769@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/bacula/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14703 Modified Files: bacula-config.patch bacula-gconsole.desktop bacula-pamd.patch bacula-wxconsole.desktop bacula.spec sources Added Files: bacula-bat.desktop bacula-bwxconsole.desktop Log Message: * Wed Jul 30 2008 Andreas Thienemann - 2.2.8-2 > - Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide > > * Fri Jul 25 2008 Jon Ciesla - 2.2.8-1 > - Update to 2.2.8. BZ 446461. > - Dropped director and storage DB-server hard Reqs. BZ 426788. > - .desktop fixes. BZ 450278, 426789. > - Updated config patch. > - Dropped wxconsole patch, applied upstream. > - Updated pamd patch. > - Dropped ampm patch, applied upstream. > - Dropped maxbyteslist patch, N/A. > - Dropped maxwaittime patch, applied upstream. > - Dropped scheduler-next-hour patch, applied upstream. > - Dropped verify patch, applied upstream. > - Dropped tls-disconnect patch, applied upstream. > - Fix for 426791. > - Introduced patch fuzz workaround, will fix. > --- NEW FILE bacula-bat.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Bacula Bat Console GenericName=Backup Management Console Comment=Control your Bacula Server Exec=bat -c /etc/bacula/bat.conf Icon=bacula.png Terminal=false Type=Application Categories=System;Application;Utility --- NEW FILE bacula-bwxconsole.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Bacula WX Console GenericName=Backup Management Console Comment=Control your Bacula Server Exec=bwxconsole -c /etc/bacula/bwxconsole.conf Icon=wxwin16x16.xpm Terminal=false Type=Application Categories=System;Application;Utility bacula-config.patch: Index: bacula-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-config.patch 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-config.patch 31 Jul 2008 12:18:40 -0000 1.2 @@ -1,5 +1,5 @@ ---- bacula-2.0.2/src/gnome2-console/gnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100 -+++ bacula-2.0.2/src/gnome2-console/gnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100 +--- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100 ++++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100 @@ -3,9 +3,9 @@ # @@ -202,8 +202,8 @@ - director = @hostname at -dir = all + director = bacula-dir = all } ---- bacula-2.0.2/src/wx-console/wx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100 -+++ bacula-2.0.2/src/wx-console/wx-console.conf.in 2007-02-06 13:47:02.000000000 +0100 +--- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100 ++++ bacula-2.0.2/src/wx-console/bwx-console.conf.in 2007-02-06 13:47:02.000000000 +0100 @@ -3,8 +3,8 @@ # Index: bacula-gconsole.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-gconsole.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-gconsole.desktop 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-gconsole.desktop 31 Jul 2008 12:18:40 -0000 1.2 @@ -4,9 +4,9 @@ Name=Bacula Console GenericName=Backup Management Console Comment=Control your Bacula Server -Exec=gnome-console -c /etc/bacula/wxconsole.conf +Exec=bgnome-console -c /etc/bacula/bgnome-console.conf Icon=bacula.png Terminal=false Type=Application -Categories=System;Application;Utility +Categories=System;Application; bacula-pamd.patch: Index: bacula-pamd.patch =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-pamd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-pamd.patch 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-pamd.patch 31 Jul 2008 12:18:40 -0000 1.2 @@ -9,8 +9,8 @@ session optional pam_xauth.so session optional pam_timestamp.so account required pam_permit.so ---- bacula-2.0.3/scripts/gnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200 -+++ bacula-2.0.3/scripts/gnome-console.pamd 2007-07-11 18:42:57.000000000 +0200 +--- bacula-2.0.3/scripts/bgnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200 ++++ bacula-2.0.3/scripts/bgnome-console.pamd 2007-07-11 18:42:57.000000000 +0200 @@ -1,7 +1,7 @@ #%PAM-1.0 auth sufficient pam_rootok.so Index: bacula-wxconsole.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-wxconsole.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bacula-wxconsole.desktop 24 Jul 2007 20:11:04 -0000 1.1 +++ bacula-wxconsole.desktop 31 Jul 2008 12:18:40 -0000 1.2 @@ -4,8 +4,8 @@ Name=Bacula WX Console GenericName=Backup Management Console Comment=Control your Bacula Server -Exec=wxconsole -c /etc/bacula/wxconsole.conf +Exec=wxconsole -c /etc/bacula/bwxconsole.conf Icon=wxwin16x16.xpm Terminal=false Type=Application -Categories=System;Application;Utility +Categories=System;Application; Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bacula.spec 30 Jul 2008 19:16:20 -0000 1.7 +++ bacula.spec 31 Jul 2008 12:18:40 -0000 1.8 @@ -4,15 +4,17 @@ %define docs_version %{version} %define gui_version %{version} %define config_dir %{_sysconfdir}/bacula +%define _default_patch_fuzz 2 Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula -Version: 2.0.3 -Release: 13%{?dist} -License: GPL +Version: 2.2.8 +Release: 2%{?dist} +# See LICENSE for details +License: GPLv2 with exceptions Group: System Environment/Daemons Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz -Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz +Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.bz2 #Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz Source3: bacula-gconsole.desktop Source4: bacula-wxconsole.desktop @@ -25,14 +27,14 @@ #Source11: bacula-web.apache Patch0: bacula-director-configuration.patch Patch1: bacula-config.patch -Patch2: bacula-wxconsole.patch +#Patch2: bacula-wxconsole.patch Patch3: bacula-pamd.patch -Patch4: 2.0.3-ampm.patch -Patch5: 2.0.3-maxbyteslist.patch -Patch6: 2.0.3-maxwaittime.patch -Patch7: 2.0.3-scheduler-next-hour.patch -Patch8: 2.0.3-verify.patch -Patch9: 2.0.3-tls-disconnect.patch +#Patch4: 2.0.3-ampm.patch +#Patch5: 2.0.3-maxbyteslist.patch +#Patch6: 2.0.3-maxwaittime.patch +#Patch7: 2.0.3-scheduler-next-hour.patch +#Patch8: 2.0.3-verify.patch +#Patch9: 2.0.3-tls-disconnect.patch #Patch10: bacula-web-smarty.patch URL: http://www.bacula.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,7 +48,7 @@ BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript BuildRequires: dvipdfm -%if "%{fedora}" >= "7" +%if 0%{?fedora} >= 7 BuildRequires: tcp_wrappers-devel %else BuildRequires: tcp_wrappers @@ -67,7 +69,6 @@ Provides: bacula-director = %{version}-%{release} Requires: bacula-director-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: mysql-server %description director-mysql Bacula is a set of programs that allow you to manage the backup, @@ -102,7 +103,6 @@ Provides: bacula-director = %{version}-%{release} Requires: bacula-director-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: postgresql-server %description director-postgresql Bacula is a set of programs that allow you to manage the backup, @@ -174,7 +174,6 @@ Provides: bacula-storage = %{version}-%{release} Requires: bacula-storage-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: mysql-server %description storage-mysql Bacula is a set of programs that allow you to manage the backup, @@ -209,7 +208,6 @@ Provides: bacula-storage = %{version}-%{release} Requires: bacula-storage-common = %{version}-%{release} Requires: bacula-common = %{version}-%{release} -Requires: postgresql-server %description storage-postgresql Bacula is a set of programs that allow you to manage the backup, @@ -323,14 +321,14 @@ pushd bacula-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %patch3 -p1 -%patch4 -p0 -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 -%patch8 -p0 -%patch9 -p0 +#%patch4 -p0 +#%patch5 -p0 +#%patch6 -p0 +#%patch7 -p0 +#%patch8 -p0 +#%patch9 -p0 # Remove execution permissions from files we're packaging as docs later on find examples -type f | xargs chmod -x @@ -380,7 +378,7 @@ --enable-conio \ --enable-largefile \ --enable-gnome \ - --enable-wx-console \ + --enable-bwx-console \ --enable-tray-monitor \ --enable-build-dird \ --enable-build-stored \ @@ -520,15 +518,15 @@ # Fix some wrapper braindeadness rm -f %{buildroot}%{_libexecdir}/bacula/bconsole rm -f %{buildroot}%{_libexecdir}/bacula/gconsole -mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole -mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf +mv %{buildroot}%{_sbindir}/bwx-console %{buildroot}%{_sbindir}/bwxconsole +mv %{buildroot}%{_sysconfdir}/bacula/bwx-console.conf %{buildroot}%{_sysconfdir}/bacula/bwxconsole.conf # Desktop Integration for the console apps and the traymonitor mkdir -p %{buildroot}%{_bindir} install -m 644 -D bacula-sqlite/scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png -install -m 644 -D bacula-sqlite/scripts/gnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/gnome-console -install -m 644 -D bacula-sqlite/scripts/gnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/gnome-console +install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bgnome-console +install -m 644 -D bacula-sqlite/scripts/bgnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bgnome-console install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole @@ -723,10 +721,10 @@ %files common +%defattr(-,root,root,-) %doc bacula-%{version}/AUTHORS bacula-%{version}/ChangeLog bacula-%{version}/COPYING bacula-%{version}/LICENSE %doc bacula-%{version}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING %doc bacula-%{version}/examples/ -%defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/logrotate.d/bacula %dir %{_sysconfdir}/bacula %dir %{_libexecdir}/bacula @@ -752,18 +750,19 @@ %files console %defattr(-,root,root,-) %{_sbindir}/bconsole -%config(noreplace) %{_sysconfdir}/bacula/bconsole.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf %{_mandir}/man8/bconsole.8* %files console-gnome %defattr(-,root,root,-) -%config %{_sysconfdir}/security/console.apps/gnome-console -%config %{_sysconfdir}/pam.d/gnome-console -%config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf +%config %{_sysconfdir}/security/console.apps/bgnome-console +%config %{_sysconfdir}/pam.d/bgnome-console +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf %{_bindir}/gnome-console -%{_sbindir}/gnome-console -%{_mandir}/man1/bacula-console-gnome.1* +%{_sbindir}/bgnome-console +%{_mandir}/man1/bacula-bgnome-console.1.gz +#%{_mandir}/man1/bacula-bconsole-gnome.1* %{_datadir}/applications/fedora-bacula-gconsole.desktop %{_datadir}/pixmaps/bacula.png @@ -772,17 +771,17 @@ %defattr(-,root,root,-) %config %{_sysconfdir}/security/console.apps/wxconsole %config %{_sysconfdir}/pam.d/wxconsole -%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf %{_bindir}/wxconsole -%{_sbindir}/wxconsole -%{_mandir}/man1/bacula-wxconsole.1* +%{_sbindir}/bwxconsole +%{_mandir}/man1/bacula-bwxconsole.1* %{_datadir}/applications/fedora-bacula-wxconsole.desktop %{_datadir}/pixmaps/wxwin16x16.xpm %files director-common -%doc bacula-%{version}/updatedb/ %defattr(-,root,root,-) +%doc bacula-%{version}/updatedb/ %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf %config(noreplace) %{_sysconfdir}/bacula/query.sql %config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf @@ -791,6 +790,7 @@ %{_initrddir}/bacula-dir %{_sbindir}/bregex %{_sbindir}/bwild +%{_mandir}/man1/bat.1.gz %{_mandir}/man8/dbcheck.8* %{_mandir}/man8/bacula-dir.8* %{_libexecdir}/bacula/delete_catalog_backup @@ -895,13 +895,14 @@ %files traymonitor %defattr(-,root,root,-) %{_sbindir}/bacula-tray-monitor -%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %{_mandir}/man1/bacula-tray-monitor.1* %{_datadir}/applications/fedora-bacula-traymonitor.desktop %{_datadir}/pixmaps/bacula-tray-monitor.xpm %files docs +%defattr(-,root,root,-) %doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf %doc bacula-docs-%{docs_version}/bacula-web/bacula-web/ %doc bacula-docs-%{docs_version}/developers/developers.pdf @@ -921,6 +922,29 @@ %changelog +* Wed Jul 30 2008 Andreas Thienemann - 2.2.8-2 +- Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide + +* Fri Jul 25 2008 Jon Ciesla - 2.2.8-1 +- Update to 2.2.8. BZ 446461. +- Dropped director and storage DB-server hard Reqs. BZ 426788. +- .desktop fixes. BZ 450278, 426789. +- Updated config patch. +- Dropped wxconsole patch, applied upstream. +- Updated pamd patch. +- Dropped ampm patch, applied upstream. +- Dropped maxbyteslist patch, N/A. +- Dropped maxwaittime patch, applied upstream. +- Dropped scheduler-next-hour patch, applied upstream. +- Dropped verify patch, applied upstream. +- Dropped tls-disconnect patch, applied upstream. +- Fix for 426791. +- Introduced patch fuzz workaround, will fix. + +* Mon Jul 7 2008 Tom "spot" Callaway - 2.0.3-14 +- fix conditional comparison +- fix license tag + * Mon Jan 07 2008 Tom "spot" Callaway - 2.0.3-13 - add BR: dvipdfm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bacula/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Jul 2007 20:11:04 -0000 1.2 +++ sources 31 Jul 2008 12:18:40 -0000 1.3 @@ -1,2 +1,2 @@ -443d2560ace95173a0d8ba465de493ef bacula-2.0.3.tar.gz -dce3aed621b9e4abee51cc89aebf4a58 bacula-docs-2.0.3.tar.gz +4547d0bf9f976d5d9ea5f21a7bd078ee bacula-2.2.8.tar.gz +9cc38ace92d52c7bebbbfc2ed5507b79 bacula-docs-2.2.8.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 12:27:25 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 31 Jul 2008 12:27:25 GMT Subject: rpms/kernel/devel patch-2.6.27-rc1-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.885, 1.886 kernel.spec, 1.826, 1.827 sources, 1.847, 1.848 upstream, 1.763, 1.764 patch-2.6.27-rc1-git1.bz2.sign, 1.1, NONE Message-ID: <200807311227.m6VCRPxa015308@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15258 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.27-rc1-git2.bz2.sign Removed Files: patch-2.6.27-rc1-git1.bz2.sign Log Message: 2.6.27-rc1-git2 --- NEW FILE patch-2.6.27-rc1-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBIkWN5yGugalF9Dw4RAn2hAJ9Vt6kPFPfBDcOJcUirsEp3fHDsFQCeNsI9 A5MKVrFC0qHfF9jDvWkZYFU= =NkX6 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.885 retrieving revision 1.886 diff -u -r1.885 -r1.886 --- .cvsignore 30 Jul 2008 20:00:25 -0000 1.885 +++ .cvsignore 31 Jul 2008 12:26:55 -0000 1.886 @@ -6,4 +6,4 @@ linux-2.6.26.tar.bz2 patch-2.6.26-git18.bz2 patch-2.6.27-rc1.bz2 -patch-2.6.27-rc1-git1.bz2 +patch-2.6.27-rc1-git2.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.826 retrieving revision 1.827 diff -u -r1.826 -r1.827 --- kernel.spec 30 Jul 2008 20:00:25 -0000 1.826 +++ kernel.spec 31 Jul 2008 12:26:55 -0000 1.827 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1710,6 +1710,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Thu Jul 31 2008 Dave Jones +- 2.6.27-rc1-git2 + * Wed Jul 30 2008 Dave Jones - 2.6.27-rc1-git1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.847 retrieving revision 1.848 diff -u -r1.847 -r1.848 --- sources 30 Jul 2008 20:00:25 -0000 1.847 +++ sources 31 Jul 2008 12:26:55 -0000 1.848 @@ -1,3 +1,3 @@ 5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2 948b25bab0082d1db5bd8c9fac824891 patch-2.6.27-rc1.bz2 -e83a1a400d3089c38da7c409b33eee87 patch-2.6.27-rc1-git1.bz2 +c699c70f90d791dbe7336725299fb538 patch-2.6.27-rc1-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.763 retrieving revision 1.764 diff -u -r1.763 -r1.764 --- upstream 30 Jul 2008 20:00:25 -0000 1.763 +++ upstream 31 Jul 2008 12:26:55 -0000 1.764 @@ -1,3 +1,3 @@ linux-2.6.26.tar.bz2 patch-2.6.27-rc1.bz2 -patch-2.6.27-rc1-git1.bz2 +patch-2.6.27-rc1-git2.bz2 --- patch-2.6.27-rc1-git1.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 12:28:41 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 12:28:41 GMT Subject: rpms/drupal-service_links/devel drupal-service_links.spec,1.1,1.2 Message-ID: <200807311228.m6VCSf7G015411@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal-service_links/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15389 Modified Files: drupal-service_links.spec Log Message: Fixed duplicate files. Index: drupal-service_links.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal-service_links/devel/drupal-service_links.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- drupal-service_links.spec 28 Jul 2008 17:42:25 -0000 1.1 +++ drupal-service_links.spec 31 Jul 2008 12:28:11 -0000 1.2 @@ -1,7 +1,7 @@ %define drupaldir %{_datadir}/drupal Name: drupal-service_links Version: 6.x.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Enables admins to add links to a number of sites Group: Applications/Publishing @@ -41,9 +41,15 @@ %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt drupal-service_links-fedora-README.txt +%exclude %{drupaldir}/modules/service_links/LICENSE.txt +%exclude %{drupaldir}/modules/service_links/README.txt +%exclude %{drupaldir}/modules/service_links/drupal-service_links-fedora-README.txt %{drupaldir}/modules/service_links %changelog +* Thu Jul 31 2008 Jon Ciesla - 6.x.1.0-2 +- Corrected duplicate files. + * Mon Jun 16 2008 Jon Ciesla - 6.x.1.0-1 - Updated for Drupal 6.x. From fedora-extras-commits at redhat.com Thu Jul 31 12:30:06 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 12:30:06 GMT Subject: rpms/drupal-service_links/F-9 drupal-service_links.spec,1.1,1.2 Message-ID: <200807311230.m6VCU6Vs015558@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal-service_links/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15529 Modified Files: drupal-service_links.spec Log Message: Fixed duplicate files. Index: drupal-service_links.spec =================================================================== RCS file: /cvs/pkgs/rpms/drupal-service_links/F-9/drupal-service_links.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- drupal-service_links.spec 28 Jul 2008 17:50:44 -0000 1.1 +++ drupal-service_links.spec 31 Jul 2008 12:29:35 -0000 1.2 @@ -1,7 +1,7 @@ %define drupaldir %{_datadir}/drupal Name: drupal-service_links Version: 6.x.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Enables admins to add links to a number of sites Group: Applications/Publishing @@ -41,9 +41,15 @@ %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt drupal-service_links-fedora-README.txt +%exclude %{drupaldir}/modules/service_links/LICENSE.txt +%exclude %{drupaldir}/modules/service_links/README.txt +%exclude %{drupaldir}/modules/service_links/drupal-service_links-fedora-README.txt %{drupaldir}/modules/service_links %changelog +* Thu Jul 31 2008 Jon Ciesla - 6.x.1.0-2 +- Corrected duplicate files. + * Mon Jun 16 2008 Jon Ciesla - 6.x.1.0-1 - Updated for Drupal 6.x. From fedora-extras-commits at redhat.com Thu Jul 31 12:45:03 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 12:45:03 GMT Subject: rpms/akonadi/devel akonadi.spec,1.11,1.12 Message-ID: <200807311245.m6VCj3iZ016019@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/akonadi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15998 Modified Files: akonadi.spec Log Message: fix changelog Index: akonadi.spec =================================================================== RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- akonadi.spec 30 Jul 2008 18:34:56 -0000 1.11 +++ akonadi.spec 31 Jul 2008 12:44:33 -0000 1.12 @@ -91,7 +91,7 @@ * Wed Jul 30 2008 Rex Dieter 1.0.0-2 - BR: mysql-server -- Requires: qt-mysql +- Requires: qt4-mysql - cleanup spec * Wed Jul 23 2008 Than Ngo - 1.0.0-1 From fedora-extras-commits at redhat.com Thu Jul 31 12:55:18 2008 From: fedora-extras-commits at redhat.com (Peter Robinson (pbrobinson)) Date: Thu, 31 Jul 2008 12:55:18 GMT Subject: rpms/geoclue/devel geoclue.spec,1.4,1.5 Message-ID: <200807311255.m6VCtI0j016377@cvs-int.fedora.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16305 Modified Files: geoclue.spec Log Message: - Increment build number to allow for clean F-8 and F-9 to F-10 upgrade Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geoclue.spec 2 Jul 2008 11:30:12 -0000 1.4 +++ geoclue.spec 31 Jul 2008 12:54:48 -0000 1.5 @@ -1,6 +1,6 @@ Name: geoclue Version: 0.11.1 -Release: 6%{?dist} +Release: 11%{?dist} Summary: Geoclue is a modular geoinformation service Group: System Environment/Libraries @@ -132,6 +132,9 @@ %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service %changelog +* Thu Jul 31 2008 Peter Robinson 0.11.1-11 +- Increment build number to allow for clean F-8 and F-9 to F-10 upgrade + * Wed Jul 2 2008 Peter Robinson 0.11.1-6 - Fixed spec file so gpsd and gypsy are actually properly in a subpackage From fedora-extras-commits at redhat.com Thu Jul 31 12:57:23 2008 From: fedora-extras-commits at redhat.com (Peter Robinson (pbrobinson)) Date: Thu, 31 Jul 2008 12:57:23 GMT Subject: rpms/geoclue/devel geoclue.spec,1.5,1.6 Message-ID: <200807311257.m6VCvNuR016544@cvs-int.fedora.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16471 Modified Files: geoclue.spec Log Message: - Once more for fun Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geoclue.spec 31 Jul 2008 12:54:48 -0000 1.5 +++ geoclue.spec 31 Jul 2008 12:56:52 -0000 1.6 @@ -1,6 +1,6 @@ Name: geoclue Version: 0.11.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Geoclue is a modular geoinformation service Group: System Environment/Libraries @@ -132,6 +132,9 @@ %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service %changelog +* Thu Jul 31 2008 Peter Robinson 0.11.1-12 +- Once more for fun + * Thu Jul 31 2008 Peter Robinson 0.11.1-11 - Increment build number to allow for clean F-8 and F-9 to F-10 upgrade From fedora-extras-commits at redhat.com Thu Jul 31 13:24:15 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 13:24:15 GMT Subject: rpms/k3b/devel k3b-1.0.5-kde#156684.patch, NONE, 1.1 k3b.spec, 1.63, 1.64 Message-ID: <200807311324.m6VDOFrK024373@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/k3b/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24348 Modified Files: k3b.spec Added Files: k3b-1.0.5-kde#156684.patch Log Message: * Thu Jul 31 2008 Rex Dieter - 0:1.0.5-4 - try alternative fix for tray eject/reload (kde#156684) k3b-1.0.5-kde#156684.patch: --- NEW FILE k3b-1.0.5-kde#156684.patch --- diff -up k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684 k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp --- k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684 2008-05-27 03:24:19.000000000 -0500 +++ k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp 2008-07-31 08:17:39.000000000 -0500 @@ -243,9 +243,11 @@ void K3bCdrecordWriter::prepareProcess() *m_process << "textfile=" + d->cdTextFile->name(); } +#if 0 if( k3bcore->globalSettings()->ejectMedia() && !m_forceNoEject ) *m_process << "-eject"; +#endif bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); if( manualBufferSize ) { Index: k3b.spec =================================================================== RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- k3b.spec 30 Jun 2008 15:28:22 -0000 1.63 +++ k3b.spec 31 Jul 2008 13:23:44 -0000 1.64 @@ -14,7 +14,7 @@ Summary: CD/DVD burning application for KDE Epoch: 0 Version: 1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Archiving License: GPLv2+ @@ -29,12 +29,16 @@ Patch1: k3b-i18n-0.12.17-rellink.patch Patch2: k3b-1.0.3-umount.patch -# http://bugs.kde.org/151816 , k3b can't reload media for verification -Patch3: k3b-1.0.4-kde#151816.patch Patch4: k3b-1.0.4-manualbufsize.patch # put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681 Patch5: k3b-1.0.5-hidden.patch +# upstream patches +# http://bugs.kde.org/151816 , k3b can't reload media for verification +Patch100: k3b-1.0.4-kde#151816.patch +# http://bugs.kde.org/156684 , alternative to patch100 +Patch101: k3b-1.0.5-kde#156684.patch + BuildRequires: kdelibs3-devel BuildRequires: desktop-file-utils # needed by patch1 @@ -95,10 +99,13 @@ %setup -q -a 1 -n %{name}-%{version} %patch2 -p1 -b .umount -%patch3 -p1 -b .kde#151816 # set in k3brc instead #patch4 -p1 -b .manualbufsize %patch5 -p1 -b .hidden + +#patch100 -p1 -b .kde#151816 +%patch101 -p1 -b .kde#156684 + make -f admin/Makefile.common pushd %{name}-i18n-%{version} @@ -242,6 +249,9 @@ %changelog +* Thu Jul 31 2008 Rex Dieter - 0:1.0.5-4 +- try alternative fix for tray eject/reload (kde#156684) + * Mon Jun 30 2008 Rex Dieter - 0:1.0.5-3 - No association k3b with .iso files in gnome (#419681) - scriptlet deps From fedora-extras-commits at redhat.com Thu Jul 31 13:45:12 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 31 Jul 2008 13:45:12 GMT Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.334,1.335 Message-ID: <200807311345.m6VDjCoI025008@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24940 Modified Files: xorg-x11-server.spec Log Message: * Thu Jul 31 2008 Adam Jackson 1.4.99.906-2 - Drop the evdev keyboarding patch. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- xorg-x11-server.spec 24 Jul 2008 20:45:20 -0000 1.334 +++ xorg-x11-server.spec 31 Jul 2008 13:44:42 -0000 1.335 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.906 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -54,7 +54,6 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch -Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch # Workaround RH bug #449944 Patch5011: xserver-1.4.99-endian.patch @@ -475,6 +474,9 @@ %changelog +* Thu Jul 31 2008 Adam Jackson 1.4.99.906-2 +- Drop the evdev keyboarding patch. + * Thu Jul 24 2008 Adam Jackson 1.4.99.906-1 - 1.5RC6. From fedora-extras-commits at redhat.com Thu Jul 31 14:40:35 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Thu, 31 Jul 2008 14:40:35 GMT Subject: rpms/bind/F-8 bind95-rh457175.patch,NONE,1.1 bind.spec,1.248,1.249 Message-ID: <200807311440.m6VEeZtf001004@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv941 Modified Files: bind.spec Added Files: bind95-rh457175.patch Log Message: - IP acls weren't merged correctly (#457175) bind95-rh457175.patch: --- NEW FILE bind95-rh457175.patch --- diff -up bind-9.5.0-P1/lib/dns/iptable.c.rh457175 bind-9.5.0-P1/lib/dns/iptable.c --- bind-9.5.0-P1/lib/dns/iptable.c.rh457175 2008-01-21 22:02:24.000000000 +0100 +++ bind-9.5.0-P1/lib/dns/iptable.c 2008-07-31 16:10:46.000000000 +0200 @@ -117,16 +117,17 @@ dns_iptable_merge(dns_iptable_t *tab, dn if (node->data[0] && *(isc_boolean_t *) node->data[0] == ISC_TRUE) new_node->data[0] = &dns_iptable_neg; - else - new_node->data[0] = node->data[0]; if (node->data[1] && *(isc_boolean_t *) node->data[1] == ISC_TRUE) new_node->data[1] = &dns_iptable_neg; - else - new_node->data[1] = node->data[0]; } + if (new_node->data[0] == NULL) + new_node->data[0] = node->data[0]; + if (new_node->data[1] == NULL) + new_node->data[1] = node->data[1]; + if (node->node_num[0] > max_node) max_node = node->node_num[0]; if (node->node_num[1] > max_node) Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- bind.spec 8 Jul 2008 22:14:21 -0000 1.248 +++ bind.spec 31 Jul 2008 14:40:05 -0000 1.249 @@ -3,6 +3,7 @@ # %define PATCHVER P1 +%define _default_patch_fuzz 2 %{?!SDB: %define SDB 1} %{?!LIBBIND: %define LIBBIND 1} @@ -20,7 +21,7 @@ Name: bind License: ISC Version: 9.5.0 -Release: 28.%{PATCHVER}%{?dist} +Release: 28.1.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +63,7 @@ Patch80: bind-9.5-edns.patch Patch88: bind-9.5-recv-race.patch Patch89: bind95-rh450995.patch +Patch90: bind95-rh457175.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -187,7 +189,7 @@ %setup -q -n %{name}-%{version}-%{PATCHVER} # Common patches -%patch -p1 -b .varrun +%patch0 -p1 -b .varrun %patch1 -p1 -b .key %patch5 -p1 -b .nonexec %patch6 -p1 -b .nsl @@ -251,6 +253,7 @@ %patch85 -p1 -b .libidn3 %patch88 -p1 -b .recv-race %patch89 -p1 -b .rh450995 +%patch90 -p1 -b .rh457175 :; @@ -280,6 +283,7 @@ --enable-threads \ --enable-ipv6 \ --with-pic \ + --disable-static \ %if %{LIBBIND} --enable-libbind \ %endif @@ -666,6 +670,9 @@ %{_sbindir}/bind-chroot-admin %changelog +* Thu Jul 31 2008 Adam Tkac 32:9.5.0-28.1.P1 +- IP acls weren't merged correctly (#457175) + * Tue Jul 08 2008 Adam Tkac 32:9.5.0-28.P1 - 9.5.0-P1 release (CVE-2008-1447) From fedora-extras-commits at redhat.com Thu Jul 31 14:42:23 2008 From: fedora-extras-commits at redhat.com (Lubomir Rintel (lkundrak)) Date: Thu, 31 Jul 2008 14:42:23 GMT Subject: rpms/s3cmd/devel .cvsignore, 1.3, 1.4 s3cmd.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200807311442.m6VEgNi4001170@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/s3cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1102 Modified Files: .cvsignore s3cmd.spec sources Log Message: * Thu Jul 31 2008 Lubomir Rintel (Good Data) - 0.9.8.3-1 - New upstream release: Avoid running out-of-memory in MD5'ing large files. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Jul 2008 20:38:27 -0000 1.3 +++ .cvsignore 31 Jul 2008 14:41:53 -0000 1.4 @@ -1 +1 @@ -s3cmd-0.9.8.2.tar.gz +s3cmd-0.9.8.3.tar.gz Index: s3cmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/devel/s3cmd.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- s3cmd.spec 25 Jul 2008 10:13:13 -0000 1.3 +++ s3cmd.spec 31 Jul 2008 14:41:53 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: s3cmd -Version: 0.9.8.2 -Release: 1%{?dist}.1 +Version: 0.9.8.3 +Release: 1%{?dist} Summary: Tool for accessing Amazon Simple Storage Service Group: Applications/Internet @@ -56,6 +56,9 @@ %changelog +* Thu Jul 31 2008 Lubomir Rintel (Good Data) - 0.9.8.3-1 +- New upstream release: Avoid running out-of-memory in MD5'ing large files. + * Fri Jul 25 2008 Lubomir Rintel (Good Data) - 0.9.8.2-1.1 - Fix a typo Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/s3cmd/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Jul 2008 20:38:27 -0000 1.3 +++ sources 31 Jul 2008 14:41:53 -0000 1.4 @@ -1 +1 @@ -34662f429cdb0929245430c1d7ff68af s3cmd-0.9.8.2.tar.gz +785cce727334a44a96ff1f97c7037894 s3cmd-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 14:42:27 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Thu, 31 Jul 2008 14:42:27 GMT Subject: rpms/bind/F-9 bind95-rh457175.patch,NONE,1.1 bind.spec,1.266,1.267 Message-ID: <200807311442.m6VEgRZo001175@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1105 Modified Files: bind.spec Added Files: bind95-rh457175.patch Log Message: - IP acls weren't merged correctly (#457175) bind95-rh457175.patch: --- NEW FILE bind95-rh457175.patch --- diff -up bind-9.5.0-P1/lib/dns/iptable.c.rh457175 bind-9.5.0-P1/lib/dns/iptable.c --- bind-9.5.0-P1/lib/dns/iptable.c.rh457175 2008-01-21 22:02:24.000000000 +0100 +++ bind-9.5.0-P1/lib/dns/iptable.c 2008-07-31 16:10:46.000000000 +0200 @@ -117,16 +117,17 @@ dns_iptable_merge(dns_iptable_t *tab, dn if (node->data[0] && *(isc_boolean_t *) node->data[0] == ISC_TRUE) new_node->data[0] = &dns_iptable_neg; - else - new_node->data[0] = node->data[0]; if (node->data[1] && *(isc_boolean_t *) node->data[1] == ISC_TRUE) new_node->data[1] = &dns_iptable_neg; - else - new_node->data[1] = node->data[0]; } + if (new_node->data[0] == NULL) + new_node->data[0] = node->data[0]; + if (new_node->data[1] == NULL) + new_node->data[1] = node->data[1]; + if (node->node_num[0] > max_node) max_node = node->node_num[0]; if (node->node_num[1] > max_node) Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- bind.spec 18 Jul 2008 21:33:29 -0000 1.266 +++ bind.spec 31 Jul 2008 14:41:55 -0000 1.267 @@ -3,6 +3,7 @@ # %define PATCHVER P1 +%define _default_patch_fuzz 2 %{?!SDB: %define SDB 1} %{?!LIBBIND: %define LIBBIND 1} @@ -18,7 +19,7 @@ Name: bind License: ISC Version: 9.5.0 -Release: 34.%{PATCHVER}%{?dist} +Release: 34.1.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,6 +61,7 @@ Patch91: bind-9.5-recv-race.patch Patch92: bind-9.5-edns.patch Patch93: bind95-rh450995.patch +Patch94: bind95-rh457175.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -177,7 +179,7 @@ %setup -q -n %{name}-%{version}-%{PATCHVER} # Common patches -%patch -p1 -b .varrun +%patch0 -p1 -b .varrun %patch1 -p1 -b .key %patch5 -p1 -b .nonexec %patch10 -p1 -b .PIE @@ -241,6 +243,8 @@ %patch91 -p1 -b .recv-race %patch92 -p1 -b .edns %patch93 -p1 -b .rh450995 +%patch94 -p1 -b .rh457175 + # Sparc and s390 arches need to use -fPIE %ifarch sparcv9 sparc64 s390 s390x for i in bin/named-sdb/unix/Makefile.in bin/named-sdb/Makefile.in bin/named/unix/Makefile.in bin/named/Makefile.in; do @@ -275,6 +279,7 @@ --enable-threads \ --enable-ipv6 \ --with-pic \ + --disable-static \ --disable-openssl-version-check \ %if %{LIBBIND} --enable-libbind \ @@ -292,8 +297,7 @@ %endif ; if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h ; fi; -make -j8 -#%{?_smp_mflags} +make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} @@ -653,6 +657,9 @@ %{_sbindir}/bind-chroot-admin %changelog +* Thu Jul 31 2008 Adam Tkac 32:9.5.0-34.1.P1 +- IP acls weren't merged correctly (#457175) + * Fri Jul 18 2008 Dennis Gilmore 32:9.5.0-34.P1 - use fPIE on sparcv9/sparc64 - add sparc64 to list of 64bit arches in spec From fedora-extras-commits at redhat.com Thu Jul 31 14:46:51 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq)) Date: Thu, 31 Jul 2008 14:46:51 GMT Subject: rpms/htop/F-8 .cvsignore, 1.9, 1.10 htop.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200807311446.m6VEkpbD001597@cvs-int.fedora.redhat.com> Author: rafalzaq Update of /cvs/extras/rpms/htop/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1317 Modified Files: .cvsignore htop.spec sources Log Message: update to 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/F-8/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 Feb 2008 21:58:56 -0000 1.9 +++ .cvsignore 31 Jul 2008 14:46:20 -0000 1.10 @@ -1 +1 @@ -htop-0.7.tar.gz +htop-0.8.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/F-8/htop.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- htop.spec 27 Apr 2008 10:13:22 -0000 1.13 +++ htop.spec 31 Jul 2008 14:46:20 -0000 1.14 @@ -1,6 +1,6 @@ Name: htop -Version: 0.7 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przegl??darka proces??w @@ -40,9 +40,12 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --delete-original \ - --remove-category=Applications \ + --remove-category=Application \ $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop +#remove empty direcories +rm -rf $RPM_BUILD_ROOT%{prefix}/lib +rm -rf $RPM_BUILD_ROOT%{prefix}/include %clean rm -rf $RPM_BUILD_ROOT @@ -58,6 +61,8 @@ %changelog +* Thu Jul 31 2008 Rafa?? Psota - 0.8-1 +- udate to 0.8 * Sun Apr 27 2008 Rafa?? Psota - 0.7-2 - desktop file fix * Mon Feb 11 2008 Rafa?? Psota - 0.7-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Feb 2008 21:58:56 -0000 1.10 +++ sources 31 Jul 2008 14:46:20 -0000 1.11 @@ -1 +1 @@ -4afc961fa709167e1b434682897991f9 htop-0.7.tar.gz +b6955f8d75cdb5a3ccea83415cb18815 htop-0.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 14:49:16 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq)) Date: Thu, 31 Jul 2008 14:49:16 GMT Subject: rpms/htop/F-9 .cvsignore, 1.9, 1.10 htop.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200807311449.m6VEnGZf001828@cvs-int.fedora.redhat.com> Author: rafalzaq Update of /cvs/extras/rpms/htop/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1789 Modified Files: .cvsignore htop.spec sources Log Message: update to 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 Feb 2008 21:54:14 -0000 1.9 +++ .cvsignore 31 Jul 2008 14:48:46 -0000 1.10 @@ -1 +1 @@ -htop-0.7.tar.gz +htop-0.8.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/F-9/htop.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- htop.spec 27 Apr 2008 12:18:43 -0000 1.13 +++ htop.spec 31 Jul 2008 14:48:46 -0000 1.14 @@ -1,6 +1,6 @@ Name: htop -Version: 0.7 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przegl??darka proces??w @@ -40,9 +40,12 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --delete-original \ - --remove-category=Applications \ + --remove-category=Application \ $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop +#remove empty direcories +rm -rf $RPM_BUILD_ROOT%{prefix}/lib +rm -rf $RPM_BUILD_ROOT%{prefix}/include %clean rm -rf $RPM_BUILD_ROOT @@ -58,6 +61,8 @@ %changelog +* Thu Jul 31 2008 Rafa?? Psota - 0.8-1 +- udate to 0.8 * Sun Apr 27 2008 Rafa?? Psota - 0.7-2 - desktop file fix * Mon Feb 11 2008 Rafa?? Psota - 0.7-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Feb 2008 21:54:14 -0000 1.10 +++ sources 31 Jul 2008 14:48:46 -0000 1.11 @@ -1 +1 @@ -4afc961fa709167e1b434682897991f9 htop-0.7.tar.gz +b6955f8d75cdb5a3ccea83415cb18815 htop-0.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 14:50:42 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq)) Date: Thu, 31 Jul 2008 14:50:42 GMT Subject: rpms/htop/devel .cvsignore, 1.9, 1.10 htop.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <200807311450.m6VEogjC001957@cvs-int.fedora.redhat.com> Author: rafalzaq Update of /cvs/extras/rpms/htop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1915 Modified Files: .cvsignore htop.spec sources Log Message: update to 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 Feb 2008 21:54:14 -0000 1.9 +++ .cvsignore 31 Jul 2008 14:50:11 -0000 1.10 @@ -1 +1 @@ -htop-0.7.tar.gz +htop-0.8.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- htop.spec 27 Apr 2008 12:20:40 -0000 1.13 +++ htop.spec 31 Jul 2008 14:50:11 -0000 1.14 @@ -1,6 +1,6 @@ Name: htop -Version: 0.7 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przegl??darka proces??w @@ -40,9 +40,12 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --delete-original \ - --remove-category=Applications \ + --remove-category=Application \ $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop +#remove empty direcories +rm -rf $RPM_BUILD_ROOT%{prefix}/lib +rm -rf $RPM_BUILD_ROOT%{prefix}/include %clean rm -rf $RPM_BUILD_ROOT @@ -58,6 +61,8 @@ %changelog +* Thu Jul 31 2008 Rafa?? Psota - 0.8-1 +- udate to 0.8 * Sun Apr 27 2008 Rafa?? Psota - 0.7-2 - desktop file fix * Mon Feb 11 2008 Rafa?? Psota - 0.7-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Feb 2008 21:54:14 -0000 1.10 +++ sources 31 Jul 2008 14:50:11 -0000 1.11 @@ -1 +1 @@ -4afc961fa709167e1b434682897991f9 htop-0.7.tar.gz +b6955f8d75cdb5a3ccea83415cb18815 htop-0.8.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 14:53:21 2008 From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood)) Date: Thu, 31 Jul 2008 14:53:21 GMT Subject: rpms/gnome-packagekit/F-9 gnome-packagekit.spec,1.45,1.46 Message-ID: <200807311453.m6VErLGh002102@cvs-int.fedora.redhat.com> Author: rnorwood Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2079 Modified Files: gnome-packagekit.spec Log Message: Re-apply gnome-packagekit-enable-kde patch. Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnome-packagekit.spec 28 Jul 2008 10:10:44 -0000 1.45 +++ gnome-packagekit.spec 31 Jul 2008 14:52:51 -0000 1.46 @@ -6,7 +6,7 @@ Name: gnome-packagekit Version: 0.2.3 #Release: 1.%{?alphatag}%{?dist} -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -16,6 +16,7 @@ Source2: system-install-packages.1.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: gnome-packagekit-set-interaction-for-tools.patch +Patch1: gnome-packagekit-enable-kde.patch Requires: gtk2 >= 2.12.0 Requires: gnome-icon-theme @@ -64,6 +65,7 @@ %setup -q #%setup -q -n %{name}-%{version}-%{?alphatag} %patch0 -p1 +%patch1 -p1 %build %configure --disable-scrollkeeper --disable-schemas-install @@ -147,6 +149,10 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Thu Jul 31 2008 Robin Norwood - 0.2.3-9 +- Re-apply the gnome-packagekit-enable-kde patch +- rhbz#437048 + * Mon Jul 28 2008 Richard Hughes - 0.2.3-8 - Silence output of update-desktop-database and update-mime-database From fedora-extras-commits at redhat.com Thu Jul 31 14:56:30 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Thu, 31 Jul 2008 14:56:30 GMT Subject: rpms/bind/F-8 bind.spec,1.249,1.250 Message-ID: <200807311456.m6VEuU9I002339@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2252 Modified Files: bind.spec Log Message: - removed --disable-static configure parameter (distro compatibility) Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- bind.spec 31 Jul 2008 14:40:05 -0000 1.249 +++ bind.spec 31 Jul 2008 14:56:00 -0000 1.250 @@ -283,7 +283,6 @@ --enable-threads \ --enable-ipv6 \ --with-pic \ - --disable-static \ %if %{LIBBIND} --enable-libbind \ %endif From fedora-extras-commits at redhat.com Thu Jul 31 14:56:59 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Thu, 31 Jul 2008 14:56:59 GMT Subject: rpms/bind/F-9 bind.spec,1.267,1.268 Message-ID: <200807311456.m6VEuxGY002374@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321 Modified Files: bind.spec Log Message: - removed --disable-static configure parameter (distro compatibility) Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- bind.spec 31 Jul 2008 14:41:55 -0000 1.267 +++ bind.spec 31 Jul 2008 14:56:29 -0000 1.268 @@ -279,7 +279,6 @@ --enable-threads \ --enable-ipv6 \ --with-pic \ - --disable-static \ --disable-openssl-version-check \ %if %{LIBBIND} --enable-libbind \ From fedora-extras-commits at redhat.com Thu Jul 31 15:02:07 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:02:07 GMT Subject: rpms/liblinebreak/F-8 liblinebreak.spec, NONE, 1.1 liblinebreak-devel.spec, 1.1, NONE Message-ID: <200807311502.m6VF27RT009179@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9135/F-8 Added Files: liblinebreak.spec Removed Files: liblinebreak-devel.spec Log Message: Rename to liblinebreak, providing -{devel,static}. Turns out that module name is expected to be the same as package name, ACL-wise --- NEW FILE liblinebreak.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-devel = %{version}-%{release} Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package --- liblinebreak-devel.spec DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 15:02:07 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:02:07 GMT Subject: rpms/liblinebreak/EL-5 liblinebreak.spec, NONE, 1.1 liblinebreak-devel.spec, 1.1, NONE Message-ID: <200807311502.m6VF27pJ009164@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9135/EL-5 Added Files: liblinebreak.spec Removed Files: liblinebreak-devel.spec Log Message: Rename to liblinebreak, providing -{devel,static}. Turns out that module name is expected to be the same as package name, ACL-wise --- NEW FILE liblinebreak.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-devel = %{version}-%{release} Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package --- liblinebreak-devel.spec DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 15:02:08 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:02:08 GMT Subject: rpms/liblinebreak/F-9 liblinebreak.spec, NONE, 1.1 liblinebreak-devel.spec, 1.1, NONE Message-ID: <200807311502.m6VF2893009195@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9135/F-9 Added Files: liblinebreak.spec Removed Files: liblinebreak-devel.spec Log Message: Rename to liblinebreak, providing -{devel,static}. Turns out that module name is expected to be the same as package name, ACL-wise --- NEW FILE liblinebreak.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-devel = %{version}-%{release} Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package --- liblinebreak-devel.spec DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 15:02:08 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:02:08 GMT Subject: rpms/liblinebreak/devel liblinebreak.spec, NONE, 1.1 liblinebreak-devel.spec, 1.1, NONE Message-ID: <200807311502.m6VF28kh009215@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9135/devel Added Files: liblinebreak.spec Removed Files: liblinebreak-devel.spec Log Message: Rename to liblinebreak, providing -{devel,static}. Turns out that module name is expected to be the same as package name, ACL-wise --- NEW FILE liblinebreak.spec --- %define shortname linebreak %define cvs_date 20080421 # static library, no useful debug information %define debug_package %{nil} Name: liblinebreak Version: 0.9.6 Release: 0.3.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries License: zlib URL: http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak # to check out: # cvs -z3 -d:pserver:anonymous at vimgadgets.cvs.sourceforge.net:/cvsroot/vimgadgets co -D %{cvs_date} common/tools/linebreak Source0: %{shortname}-%{version}-%{cvs_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: Provides: liblinebreak-devel = %{version}-%{release} Provides: liblinebreak-static = %{version}-%{release} %description liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.0.0 Standard Annex 14, Revision 19, available at http://www.unicode.org/reports/tr14/tr14-19.html This package currently only provides a static library, and as such should not be a runtime dependency. %prep %setup -q -n %{shortname} %build make CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir} cp -p linebreak.h $RPM_BUILD_ROOT%{_includedir} cp -p DebugDir/liblinebreak.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf $RPM_BUILD_ROOT #%post -p /sbin/ldconfig #%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENCE README %{_includedir}/* %{_libdir}/*.a %changelog * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions * Mon Jun 9 2008 Michel Alexandre Salim - 0.9.6-0.2 - Rename to liblinebreak-devel, provides liblinebreak-static * Wed Jun 4 2008 Michel Alexandre Salim - 0.9.6-0.1 - Initial package --- liblinebreak-devel.spec DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 15:08:00 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:08:00 GMT Subject: rpms/liblinebreak/EL-5 liblinebreak.spec,1.1,1.2 Message-ID: <200807311508.m6VF80D9009572@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9468/EL-5 Modified Files: liblinebreak.spec Log Message: * Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} - Rename package to liblinebreak, providing -{devel,static} Index: liblinebreak.spec =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/EL-5/liblinebreak.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblinebreak.spec 31 Jul 2008 15:02:06 -0000 1.1 +++ liblinebreak.spec 31 Jul 2008 15:07:30 -0000 1.2 @@ -6,7 +6,7 @@ Name: liblinebreak Version: 0.9.6 -Release: 0.3.%{cvs_date}cvs%{?dist} +Release: 0.4.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} +- Rename package to liblinebreak, providing -{devel,static} + * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions From fedora-extras-commits at redhat.com Thu Jul 31 15:08:01 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:08:01 GMT Subject: rpms/liblinebreak/F-8 liblinebreak.spec,1.1,1.2 Message-ID: <200807311508.m6VF81Zd009576@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9468/F-8 Modified Files: liblinebreak.spec Log Message: * Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} - Rename package to liblinebreak, providing -{devel,static} Index: liblinebreak.spec =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/F-8/liblinebreak.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblinebreak.spec 31 Jul 2008 15:02:07 -0000 1.1 +++ liblinebreak.spec 31 Jul 2008 15:07:31 -0000 1.2 @@ -6,7 +6,7 @@ Name: liblinebreak Version: 0.9.6 -Release: 0.3.%{cvs_date}cvs%{?dist} +Release: 0.4.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} +- Rename package to liblinebreak, providing -{devel,static} + * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions From fedora-extras-commits at redhat.com Thu Jul 31 15:08:02 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:08:02 GMT Subject: rpms/liblinebreak/devel liblinebreak.spec,1.1,1.2 Message-ID: <200807311508.m6VF82Ef009582@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9468/devel Modified Files: liblinebreak.spec Log Message: * Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} - Rename package to liblinebreak, providing -{devel,static} Index: liblinebreak.spec =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/devel/liblinebreak.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblinebreak.spec 31 Jul 2008 15:02:08 -0000 1.1 +++ liblinebreak.spec 31 Jul 2008 15:07:31 -0000 1.2 @@ -6,7 +6,7 @@ Name: liblinebreak Version: 0.9.6 -Release: 0.3.%{cvs_date}cvs%{?dist} +Release: 0.4.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} +- Rename package to liblinebreak, providing -{devel,static} + * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions From fedora-extras-commits at redhat.com Thu Jul 31 15:08:01 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 31 Jul 2008 15:08:01 GMT Subject: rpms/liblinebreak/F-9 liblinebreak.spec,1.1,1.2 Message-ID: <200807311508.m6VF81t0009579@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/liblinebreak/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9468/F-9 Modified Files: liblinebreak.spec Log Message: * Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} - Rename package to liblinebreak, providing -{devel,static} Index: liblinebreak.spec =================================================================== RCS file: /cvs/pkgs/rpms/liblinebreak/F-9/liblinebreak.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblinebreak.spec 31 Jul 2008 15:02:07 -0000 1.1 +++ liblinebreak.spec 31 Jul 2008 15:07:31 -0000 1.2 @@ -6,7 +6,7 @@ Name: liblinebreak Version: 0.9.6 -Release: 0.3.%{cvs_date}cvs%{?dist} +Release: 0.4.%{cvs_date}cvs%{?dist} Summary: A Unicode line-breaking library Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Thu Jul 31 2008 Michel Salim - 0.9.6-0.4.20080421cvs%{?dist} +- Rename package to liblinebreak, providing -{devel,static} + * Mon Jul 14 2008 Michel Alexandre Salim - 0.9.6-0.3.20080421cvs - Change versioning scheme - Updated checkout instructions From fedora-extras-commits at redhat.com Thu Jul 31 15:08:23 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 31 Jul 2008 15:08:23 GMT Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.26,1.27 Message-ID: <200807311508.m6VF8NaG009608@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/gtkmozembedmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9540 Modified Files: gtkmozembedmm.spec Log Message: rebuild against gecko-libs Index: gtkmozembedmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gtkmozembedmm.spec 29 Jul 2008 21:37:59 -0000 1.26 +++ gtkmozembedmm.spec 31 Jul 2008 15:07:53 -0000 1.27 @@ -1,7 +1,7 @@ -%define gecko_ver 1.9 +%define gecko_ver 1.9.0.1 Name: gtkmozembedmm Version: 1.4.2.cvs20060817 -Release: 20%{?dist} +Release: 21%{?dist} Summary: C++ wrapper for GtkMozembed @@ -21,8 +21,8 @@ BuildRequires: libgnomemm26 >= 2.12.0 BuildRequires: libgnomeuimm26-devel >= 2.12.0 # Use mozilla-devel up to FC5, and gecko-devel for FC6+ -BuildRequires: xulrunner-devel-unstable >= 1.9 -BuildRequires: gecko-devel = %{gecko_ver} +BuildRequires: gecko-devel >= 1.9 +BuildRequires: gecko-devel-unstable = %{gecko_ver} Requires: gecko-libs = %{gecko_ver} BuildRequires: automake >= 1.10 BuildRequires: libtool @@ -107,6 +107,9 @@ %changelog +* Thu Jul 31 2008 Caol??n McNamara - 1.4.2.cvs20060817-21 +- rebuild against gecko-libs 1.9.0.1 + * Tue Jul 29 2008 Tom "spot" Callaway - 1.4.2.cvs20060817-20 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 31 15:10:05 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Thu, 31 Jul 2008 15:10:05 GMT Subject: rpms/bind/devel bind.spec,1.275,1.276 Message-ID: <200807311510.m6VFA5VQ009791@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9757 Modified Files: bind.spec Log Message: - static libraries are no longer supported - IP acls weren't merged correctly (#457175) - use fPIE on sparcv9/sparc64 (Dennis Gilmore) - add sparc64 to list of 64bit arches in spec (Dennis Gilmore) Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- bind.spec 21 Jul 2008 10:47:18 -0000 1.275 +++ bind.spec 31 Jul 2008 15:09:35 -0000 1.276 @@ -19,7 +19,7 @@ Name: bind License: ISC Version: 9.5.1 -Release: 0.2.%{PREVER}%{?dist} +Release: 0.3.%{PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -241,8 +241,15 @@ %patch87 -p1 -b .parallel %patch90 -p1 -b .edns %patch91 -p1 -b .rh450995 -:; +# Sparc and s390 arches need to use -fPIE +%ifarch sparcv9 sparc64 s390 s390x +for i in bin/named{,-sdb}/{,unix}/Makefile.in; do + sed -i 's|fpie|fPIE|g' $i +done +%endif + +:; %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0" @@ -256,7 +263,7 @@ libtoolize -c -f; aclocal --force; autoheader -f; autoconf -f %if %{WITH_DBUS} -%ifarch s390x x86_64 ppc64 +%ifarch s390x x86_64 ppc64 sparc64 # every 64-bit arch EXCEPT ia64 has dbus architecture dependant # includes in /usr/lib64/dbus-1.0/include export DBUS_ARCHDEP_LIBDIR=lib64 @@ -273,6 +280,7 @@ --enable-threads \ --enable-ipv6 \ --with-pic \ + --disable-static \ --disable-openssl-version-check \ --enable-getifaddrs=glibc \ %if %{LIBBIND} @@ -582,12 +590,6 @@ %files devel %defattr(-,root,root,-) -%{_libdir}/libbind9.a -%{_libdir}/libdns.a -%{_libdir}/libisc.a -%{_libdir}/libisccc.a -%{_libdir}/libisccfg.a -%{_libdir}/liblwres.a %{_libdir}/*so %{_includedir}/bind9 %{_includedir}/dns @@ -599,7 +601,6 @@ %{_mandir}/man3/lwres* %{_bindir}/isc-config.sh %if %{LIBBIND} -%{_libdir}/libbind.a %{_libdir}/pkgconfig/libbind.pc %{_includedir}/bind %{_mandir}/man3/libbind-* @@ -637,6 +638,12 @@ %{_sbindir}/bind-chroot-admin %changelog +* Thu Jul 31 2008 Adam Tkac 32:9.5.1-0.3.b1 +- static libraries are no longer supported +- IP acls weren't merged correctly (#457175) +- use fPIE on sparcv9/sparc64 (Dennis Gilmore) +- add sparc64 to list of 64bit arches in spec (Dennis Gilmore) + * Mon Jul 21 2008 Adam Tkac 32:9.5.1-0.2.b1 - updated patches due new rpm (--fuzz=0 patch parameter) From fedora-extras-commits at redhat.com Thu Jul 31 15:15:16 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq)) Date: Thu, 31 Jul 2008 15:15:16 GMT Subject: rpms/metacafe-dl/F-8 index.html, 1.1, 1.2 metacafe-dl, 1.1, 1.2 metacafe-dl.spec, 1.1, 1.2 Message-ID: <200807311515.m6VFFGi0010018@cvs-int.fedora.redhat.com> Author: rafalzaq Update of /cvs/extras/rpms/metacafe-dl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9969 Modified Files: index.html metacafe-dl metacafe-dl.spec Log Message: update to 2008.07.23 Index: index.html =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/F-8/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html 20 Jan 2008 22:13:57 -0000 1.1 +++ index.html 31 Jul 2008 15:14:46 -0000 1.2 @@ -46,7 +46,7 @@ from metacafe.com, based on the code of youtube-dl. Hence, it has the same requirements and features, and its syntax is very similar. -The latest version is 2007.10.09. It's also licensed under +The latest version is 2008.07.23. It's also licensed under the MIT License.

As with youtube-dl, I'll try to keep it updated if metacafe.com @@ -131,11 +131,11 @@ Target As or Save Link As, depending on the web browser you are using.

-

2007.10.09

+

2008.07.23

    -
  • MD5: 69348e455f70b048b8db1263b35f16c2
    • -
  • SHA1: 766e17c0cee0d3416d7120b4fc7397ce87e74ea7
    • -
  • SHA256: 44da4e8f6dc1b250f354e8159199252782b2c847df9face30feb92e66a5a88ce
    • +
  • MD5: 0dae19883b0e13286a1fa543751a242f
    • +
  • SHA1: 70bba7248701728e2f69ddb2cf9dae13501167a5
    • +
  • SHA256: d7826ab9506d73904f16a6e1110af7607e96ce20d311c5d2b3b746b18af64ee5
Index: metacafe-dl =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/F-8/metacafe-dl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metacafe-dl 20 Jan 2008 22:13:57 -0000 1.1 +++ metacafe-dl 31 Jul 2008 15:14:46 -0000 1.2 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2006-2007 Ricardo Garcia Gonzalez +# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -35,14 +35,18 @@ import urllib2 # Global constants +const_1k = 1024 +const_initial_block_size = 10 * const_1k +const_max_block_size = 4 * const_1k * const_1k +const_epsilon = 0.0001 +const_timeout = 120 + const_video_url_re = re.compile(r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+/)?.*') const_normalized_url_str = 'http://www.metacafe.com/watch/%s/' const_disclaimer_url = 'http://www.metacafe.com/disclaimer' const_age_post_data = r'allowAdultContent=1&submit=Continue+-+I%27m+over+18' -const_video_mediaurl_re = re.compile(r'&mediaURL=([^&]+)&', re.M) -const_1k = 1024 -const_initial_block_size = 10 * const_1k -const_epsilon = 0.0001 +const_video_mediaurl_re = re.compile(r'"mediaURL":"(http.*?\.flv)"', re.M) +const_video_gdakey_re = re.compile(r'"gdaKey":"(.*?)"', re.M) # Print error message, followed by standard advice information, and then exit def error_advice_exit(error_text): @@ -60,20 +64,23 @@ sys.exit('\n') # Wrapper to create custom requests with typical headers -def request_create(url, data=None): +def request_create(url, extra_headers, post_data): retval = urllib2.Request(url) - if data is not None: - retval.add_data(data) + if post_data is not None: + retval.add_data(post_data) # Try to mimic Firefox, at least a little bit - retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0') + retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14') retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7') retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5') retval.add_header('Accept-Language', 'en-us,en;q=0.5') + if extra_headers is not None: + for header in extra_headers: + retval.add_header(header[0], header[1]) return retval # Perform a request, process headers and return response -def perform_request(url, data=None): - request = request_create(url, data) +def perform_request(url, headers=None, data=None): + request = request_create(url, headers, data) response = urllib2.urlopen(request) return response @@ -88,7 +95,7 @@ def download_step(return_data_flag, step_title, step_error, url, post_data=None): try: cond_print('%s... ' % step_title) - data = perform_request(url, post_data).read() + data = perform_request(url, data=post_data).read() cond_print('done.\n') if return_data_flag: return data @@ -125,12 +132,12 @@ dif = after - before if dif < const_epsilon: return int(new_max) - rate = bytes / dif + rate = bytes / dif / 2.0 if rate > new_max: return int(new_max) if rate < new_min: return int(new_min) - return int(rate) + return min(int(rate), const_max_block_size) # Get optimum 1k exponent to represent a number of bytes def optimum_k_exp(num_bytes): @@ -146,12 +153,22 @@ exp = optimum_k_exp(num_bytes) suffix = 'bkMGTPEZY'[exp] if exp == 0: - return '%s%s' % (num_bytes, suffix) + return '%s%s' % (long(round(num_bytes)), suffix) converted = float(num_bytes) / float(const_1k**exp) return '%.2f%s' % (converted, suffix) except IndexError: sys.exit('Error: internal error formatting number of bytes.') +# Returns a long integer from a string representing a byte size +def parse_bytes(bytestr): + regexp = re.compile(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$') + matchobj = regexp.match(bytestr) + if matchobj is None: + return None + number = float(matchobj.group(1)) + multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower()) + return long(round(number * multiplier)) + # Calculate ETA and return it in string format as MM:SS def calc_eta(start, now, total, current): dif = now - start @@ -159,22 +176,28 @@ return '--:--' rate = float(current) / dif eta = long((total - current) / rate) - eta_mins = eta / 60 - eta_secs = eta % 60 + (eta_mins, eta_secs) = divmod(eta, 60) if eta_mins > 99: return '--:--' return '%02d:%02d' % (eta_mins, eta_secs) -# Calculate speed and return it in string format +# Calculate speed and return it in bytes per second, or None def calc_speed(start, now, bytes): dif = now - start if bytes == 0 or dif < const_epsilon: + return None + return (float(bytes) / dif) + +# Convert speed to string +def speed_to_str(bytespersec): + if bytespersec is None: return 'N/A b' - return format_bytes(float(bytes) / dif) + return format_bytes(bytespersec) + # Create the command line options parser and parse command line cmdl_usage = 'usage: %prog [options] video_url' -cmdl_version = '2007.10.09' +cmdl_version = '2008.07.23' cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve') cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit') cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit') @@ -183,8 +206,12 @@ cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video') cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name') cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only') +cmdl_parser.add_option('-r', '--rate-limit', action='store', dest='rate_limit', help='download rate limit (e.g. 50k or 44.6m)') (cmdl_opts, cmdl_args) = cmdl_parser.parse_args() +# Set socket timeout +socket.setdefaulttimeout(const_timeout) + # Get video URL if len(cmdl_args) != 1: cmdl_parser.print_help() @@ -209,6 +236,13 @@ if cmdl_opts.quiet and cmdl_opts.get_url: sys.exit('Error: cannot be quiet and print final URL at the same time.') +# Incorrect option formatting +rate_limit = None +if cmdl_opts.rate_limit is not None: + rate_limit = parse_bytes(cmdl_opts.rate_limit) + if rate_limit is None: + sys.exit('ERROR: invalid download rate limit specified.') + # Get output file name if cmdl_opts.outfile is None: if cmdl_opts.use_title: @@ -245,12 +279,17 @@ # Retrieve real video URL video_url_real = extract_step('Extracting real video URL', 'unable to extract real video URL', const_video_mediaurl_re, video_webpage) +video_url_real = video_url_real.replace('\\', '') + +# Retrieve gdaKey parameter +video_gdakey = extract_step('Extracting "gdaKey" parameter', 'unable to extract "gdaKey" parameter', const_video_gdakey_re, video_webpage) +video_url_real = '%s?__gda__=%s' % (video_url_real, video_gdakey) # Retrieve video data try: cond_print('Requesting video file... ') video_data = perform_request(video_url_real) - cond_print('done\n') + cond_print('done.\n') cond_print('Video data found at %s\n' % video_data.geturl()) if cmdl_opts.get_url: @@ -279,7 +318,8 @@ percent_str = '---.-' eta_str = '--:--' counter = format_bytes(byte_counter) - speed_str = calc_speed(start_time, time.time(), byte_counter) + speed = calc_speed(start_time, time.time(), byte_counter) + speed_str = speed_to_str(speed) cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str)) before = time.time() @@ -292,6 +332,14 @@ video_file.write(video_block) block_size = new_block_size(before, after, dl_bytes) + if rate_limit is not None: + if block_size > rate_limit: + block_size = rate_limit / 2 + + speed = calc_speed(start_time, time.time(), byte_counter) + if speed is not None and speed > const_epsilon and speed > rate_limit: + time.sleep((byte_counter - rate_limit * (time.time() - start_time)) / rate_limit) + if video_len is not None and byte_counter != video_len: error_advice_exit('server did not send the expected ammount of data') Index: metacafe-dl.spec =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/F-8/metacafe-dl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metacafe-dl.spec 20 Jan 2008 22:13:57 -0000 1.1 +++ metacafe-dl.spec 31 Jul 2008 15:14:46 -0000 1.2 @@ -1,5 +1,5 @@ Name: metacafe-dl -Version: 2007.10.09 +Version: 2008.07.23 Release: 1%{?dist} Summary: Command-line program to download videos from metacafe.com Summary(pl): Tekstowy program do pobierania film??w z metacafe.com @@ -50,6 +50,8 @@ %changelog +* Thu Jul 31 2008 Rafa?? Psota 2008.07.23-1 +- update to 2008.07.23 * Sat Jan 19 2008 Rafa?? Psota 2007.10.09-1 - fixed version and description tags - removed COPYING file From fedora-extras-commits at redhat.com Thu Jul 31 15:19:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq)) Date: Thu, 31 Jul 2008 15:19:29 GMT Subject: rpms/metacafe-dl/F-9 index.html, 1.1, 1.2 metacafe-dl, 1.1, 1.2 metacafe-dl.spec, 1.1, 1.2 Message-ID: <200807311519.m6VFJTRm010194@cvs-int.fedora.redhat.com> Author: rafalzaq Update of /cvs/extras/rpms/metacafe-dl/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10165 Modified Files: index.html metacafe-dl metacafe-dl.spec Log Message: update to 2008.07.23 Index: index.html =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/F-9/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html 20 Jan 2008 22:17:13 -0000 1.1 +++ index.html 31 Jul 2008 15:18:59 -0000 1.2 @@ -46,7 +46,7 @@ from metacafe.com, based on the code of youtube-dl. Hence, it has the same requirements and features, and its syntax is very similar. -The latest version is 2007.10.09. It's also licensed under +The latest version is 2008.07.23. It's also licensed under the MIT License.

As with youtube-dl, I'll try to keep it updated if metacafe.com @@ -131,11 +131,11 @@ Target As or Save Link As, depending on the web browser you are using.

-

2007.10.09

+

2008.07.23

    -
  • MD5: 69348e455f70b048b8db1263b35f16c2
    • -
  • SHA1: 766e17c0cee0d3416d7120b4fc7397ce87e74ea7
    • -
  • SHA256: 44da4e8f6dc1b250f354e8159199252782b2c847df9face30feb92e66a5a88ce
    • +
  • MD5: 0dae19883b0e13286a1fa543751a242f
    • +
  • SHA1: 70bba7248701728e2f69ddb2cf9dae13501167a5
    • +
  • SHA256: d7826ab9506d73904f16a6e1110af7607e96ce20d311c5d2b3b746b18af64ee5
Index: metacafe-dl =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/F-9/metacafe-dl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metacafe-dl 20 Jan 2008 22:17:13 -0000 1.1 +++ metacafe-dl 31 Jul 2008 15:18:59 -0000 1.2 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2006-2007 Ricardo Garcia Gonzalez +# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -35,14 +35,18 @@ import urllib2 # Global constants +const_1k = 1024 +const_initial_block_size = 10 * const_1k +const_max_block_size = 4 * const_1k * const_1k +const_epsilon = 0.0001 +const_timeout = 120 + const_video_url_re = re.compile(r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+/)?.*') const_normalized_url_str = 'http://www.metacafe.com/watch/%s/' const_disclaimer_url = 'http://www.metacafe.com/disclaimer' const_age_post_data = r'allowAdultContent=1&submit=Continue+-+I%27m+over+18' -const_video_mediaurl_re = re.compile(r'&mediaURL=([^&]+)&', re.M) -const_1k = 1024 -const_initial_block_size = 10 * const_1k -const_epsilon = 0.0001 +const_video_mediaurl_re = re.compile(r'"mediaURL":"(http.*?\.flv)"', re.M) +const_video_gdakey_re = re.compile(r'"gdaKey":"(.*?)"', re.M) # Print error message, followed by standard advice information, and then exit def error_advice_exit(error_text): @@ -60,20 +64,23 @@ sys.exit('\n') # Wrapper to create custom requests with typical headers -def request_create(url, data=None): +def request_create(url, extra_headers, post_data): retval = urllib2.Request(url) - if data is not None: - retval.add_data(data) + if post_data is not None: + retval.add_data(post_data) # Try to mimic Firefox, at least a little bit - retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0') + retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14') retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7') retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5') retval.add_header('Accept-Language', 'en-us,en;q=0.5') + if extra_headers is not None: + for header in extra_headers: + retval.add_header(header[0], header[1]) return retval # Perform a request, process headers and return response -def perform_request(url, data=None): - request = request_create(url, data) +def perform_request(url, headers=None, data=None): + request = request_create(url, headers, data) response = urllib2.urlopen(request) return response @@ -88,7 +95,7 @@ def download_step(return_data_flag, step_title, step_error, url, post_data=None): try: cond_print('%s... ' % step_title) - data = perform_request(url, post_data).read() + data = perform_request(url, data=post_data).read() cond_print('done.\n') if return_data_flag: return data @@ -125,12 +132,12 @@ dif = after - before if dif < const_epsilon: return int(new_max) - rate = bytes / dif + rate = bytes / dif / 2.0 if rate > new_max: return int(new_max) if rate < new_min: return int(new_min) - return int(rate) + return min(int(rate), const_max_block_size) # Get optimum 1k exponent to represent a number of bytes def optimum_k_exp(num_bytes): @@ -146,12 +153,22 @@ exp = optimum_k_exp(num_bytes) suffix = 'bkMGTPEZY'[exp] if exp == 0: - return '%s%s' % (num_bytes, suffix) + return '%s%s' % (long(round(num_bytes)), suffix) converted = float(num_bytes) / float(const_1k**exp) return '%.2f%s' % (converted, suffix) except IndexError: sys.exit('Error: internal error formatting number of bytes.') +# Returns a long integer from a string representing a byte size +def parse_bytes(bytestr): + regexp = re.compile(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$') + matchobj = regexp.match(bytestr) + if matchobj is None: + return None + number = float(matchobj.group(1)) + multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower()) + return long(round(number * multiplier)) + # Calculate ETA and return it in string format as MM:SS def calc_eta(start, now, total, current): dif = now - start @@ -159,22 +176,28 @@ return '--:--' rate = float(current) / dif eta = long((total - current) / rate) - eta_mins = eta / 60 - eta_secs = eta % 60 + (eta_mins, eta_secs) = divmod(eta, 60) if eta_mins > 99: return '--:--' return '%02d:%02d' % (eta_mins, eta_secs) -# Calculate speed and return it in string format +# Calculate speed and return it in bytes per second, or None def calc_speed(start, now, bytes): dif = now - start if bytes == 0 or dif < const_epsilon: + return None + return (float(bytes) / dif) + +# Convert speed to string +def speed_to_str(bytespersec): + if bytespersec is None: return 'N/A b' - return format_bytes(float(bytes) / dif) + return format_bytes(bytespersec) + # Create the command line options parser and parse command line cmdl_usage = 'usage: %prog [options] video_url' -cmdl_version = '2007.10.09' +cmdl_version = '2008.07.23' cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve') cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit') cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit') @@ -183,8 +206,12 @@ cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video') cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name') cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only') +cmdl_parser.add_option('-r', '--rate-limit', action='store', dest='rate_limit', help='download rate limit (e.g. 50k or 44.6m)') (cmdl_opts, cmdl_args) = cmdl_parser.parse_args() +# Set socket timeout +socket.setdefaulttimeout(const_timeout) + # Get video URL if len(cmdl_args) != 1: cmdl_parser.print_help() @@ -209,6 +236,13 @@ if cmdl_opts.quiet and cmdl_opts.get_url: sys.exit('Error: cannot be quiet and print final URL at the same time.') +# Incorrect option formatting +rate_limit = None +if cmdl_opts.rate_limit is not None: + rate_limit = parse_bytes(cmdl_opts.rate_limit) + if rate_limit is None: + sys.exit('ERROR: invalid download rate limit specified.') + # Get output file name if cmdl_opts.outfile is None: if cmdl_opts.use_title: @@ -245,12 +279,17 @@ # Retrieve real video URL video_url_real = extract_step('Extracting real video URL', 'unable to extract real video URL', const_video_mediaurl_re, video_webpage) +video_url_real = video_url_real.replace('\\', '') + +# Retrieve gdaKey parameter +video_gdakey = extract_step('Extracting "gdaKey" parameter', 'unable to extract "gdaKey" parameter', const_video_gdakey_re, video_webpage) +video_url_real = '%s?__gda__=%s' % (video_url_real, video_gdakey) # Retrieve video data try: cond_print('Requesting video file... ') video_data = perform_request(video_url_real) - cond_print('done\n') + cond_print('done.\n') cond_print('Video data found at %s\n' % video_data.geturl()) if cmdl_opts.get_url: @@ -279,7 +318,8 @@ percent_str = '---.-' eta_str = '--:--' counter = format_bytes(byte_counter) - speed_str = calc_speed(start_time, time.time(), byte_counter) + speed = calc_speed(start_time, time.time(), byte_counter) + speed_str = speed_to_str(speed) cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str)) before = time.time() @@ -292,6 +332,14 @@ video_file.write(video_block) block_size = new_block_size(before, after, dl_bytes) + if rate_limit is not None: + if block_size > rate_limit: + block_size = rate_limit / 2 + + speed = calc_speed(start_time, time.time(), byte_counter) + if speed is not None and speed > const_epsilon and speed > rate_limit: + time.sleep((byte_counter - rate_limit * (time.time() - start_time)) / rate_limit) + if video_len is not None and byte_counter != video_len: error_advice_exit('server did not send the expected ammount of data') Index: metacafe-dl.spec =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/F-9/metacafe-dl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metacafe-dl.spec 20 Jan 2008 22:17:13 -0000 1.1 +++ metacafe-dl.spec 31 Jul 2008 15:18:59 -0000 1.2 @@ -1,5 +1,5 @@ Name: metacafe-dl -Version: 2007.10.09 +Version: 2008.07.23 Release: 1%{?dist} Summary: Command-line program to download videos from metacafe.com Summary(pl): Tekstowy program do pobierania film??w z metacafe.com @@ -50,6 +50,8 @@ %changelog +* Thu Jul 31 2008 Rafa?? Psota 2008.07.23-1 +- update to 2008.07.23 * Sat Jan 19 2008 Rafa?? Psota 2007.10.09-1 - fixed version and description tags - removed COPYING file From fedora-extras-commits at redhat.com Thu Jul 31 15:21:26 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 31 Jul 2008 15:21:26 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1597,1.1598 Message-ID: <200807311521.m6VFLQww010272@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10233 Modified Files: openoffice.org.spec Log Message: someone changed the configure option on me Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1597 retrieving revision 1.1598 diff -u -r1.1597 -r1.1598 --- openoffice.org.spec 30 Jul 2008 14:15:23 -0000 1.1597 +++ openoffice.org.spec 31 Jul 2008 15:20:56 -0000 1.1598 @@ -1280,7 +1280,7 @@ --with-commons-logging-jar=/usr/share/java/commons-logging.jar \ --with-lucene-core-jar=/usr/share/java/lucene.jar \ --with-system-mozilla --with-system-libtextcat --with-system-redland \ - --with-system-dicts --with-dict-path=/usr/share/myspell \ + --with-system-dicts --with-external-dict-dir=/usr/share/myspell \ --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc \ --without-agg --without-ppds --without-afms --without-writer2latex \ %{stlflags} --with-lang="%{langpack_langs}" \ From fedora-extras-commits at redhat.com Thu Jul 31 15:21:35 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq)) Date: Thu, 31 Jul 2008 15:21:35 GMT Subject: rpms/metacafe-dl/devel index.html, 1.1, 1.2 metacafe-dl, 1.1, 1.2 metacafe-dl.spec, 1.1, 1.2 Message-ID: <200807311521.m6VFLZSB010279@cvs-int.fedora.redhat.com> Author: rafalzaq Update of /cvs/extras/rpms/metacafe-dl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253 Modified Files: index.html metacafe-dl metacafe-dl.spec Log Message: update to 2008.07.23 Index: index.html =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/devel/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html 20 Jan 2008 22:17:13 -0000 1.1 +++ index.html 31 Jul 2008 15:21:04 -0000 1.2 @@ -46,7 +46,7 @@ from metacafe.com, based on the code of youtube-dl. Hence, it has the same requirements and features, and its syntax is very similar. -The latest version is 2007.10.09. It's also licensed under +The latest version is 2008.07.23. It's also licensed under the MIT License.

As with youtube-dl, I'll try to keep it updated if metacafe.com @@ -131,11 +131,11 @@ Target As or Save Link As, depending on the web browser you are using.

-

2007.10.09

+

2008.07.23

    -
  • MD5: 69348e455f70b048b8db1263b35f16c2
    • -
  • SHA1: 766e17c0cee0d3416d7120b4fc7397ce87e74ea7
    • -
  • SHA256: 44da4e8f6dc1b250f354e8159199252782b2c847df9face30feb92e66a5a88ce
    • +
  • MD5: 0dae19883b0e13286a1fa543751a242f
    • +
  • SHA1: 70bba7248701728e2f69ddb2cf9dae13501167a5
    • +
  • SHA256: d7826ab9506d73904f16a6e1110af7607e96ce20d311c5d2b3b746b18af64ee5
Index: metacafe-dl =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/devel/metacafe-dl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metacafe-dl 20 Jan 2008 22:17:13 -0000 1.1 +++ metacafe-dl 31 Jul 2008 15:21:04 -0000 1.2 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2006-2007 Ricardo Garcia Gonzalez +# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -35,14 +35,18 @@ import urllib2 # Global constants +const_1k = 1024 +const_initial_block_size = 10 * const_1k +const_max_block_size = 4 * const_1k * const_1k +const_epsilon = 0.0001 +const_timeout = 120 + const_video_url_re = re.compile(r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+/)?.*') const_normalized_url_str = 'http://www.metacafe.com/watch/%s/' const_disclaimer_url = 'http://www.metacafe.com/disclaimer' const_age_post_data = r'allowAdultContent=1&submit=Continue+-+I%27m+over+18' -const_video_mediaurl_re = re.compile(r'&mediaURL=([^&]+)&', re.M) -const_1k = 1024 -const_initial_block_size = 10 * const_1k -const_epsilon = 0.0001 +const_video_mediaurl_re = re.compile(r'"mediaURL":"(http.*?\.flv)"', re.M) +const_video_gdakey_re = re.compile(r'"gdaKey":"(.*?)"', re.M) # Print error message, followed by standard advice information, and then exit def error_advice_exit(error_text): @@ -60,20 +64,23 @@ sys.exit('\n') # Wrapper to create custom requests with typical headers -def request_create(url, data=None): +def request_create(url, extra_headers, post_data): retval = urllib2.Request(url) - if data is not None: - retval.add_data(data) + if post_data is not None: + retval.add_data(post_data) # Try to mimic Firefox, at least a little bit - retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0') + retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14') retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7') retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5') retval.add_header('Accept-Language', 'en-us,en;q=0.5') + if extra_headers is not None: + for header in extra_headers: + retval.add_header(header[0], header[1]) return retval # Perform a request, process headers and return response -def perform_request(url, data=None): - request = request_create(url, data) +def perform_request(url, headers=None, data=None): + request = request_create(url, headers, data) response = urllib2.urlopen(request) return response @@ -88,7 +95,7 @@ def download_step(return_data_flag, step_title, step_error, url, post_data=None): try: cond_print('%s... ' % step_title) - data = perform_request(url, post_data).read() + data = perform_request(url, data=post_data).read() cond_print('done.\n') if return_data_flag: return data @@ -125,12 +132,12 @@ dif = after - before if dif < const_epsilon: return int(new_max) - rate = bytes / dif + rate = bytes / dif / 2.0 if rate > new_max: return int(new_max) if rate < new_min: return int(new_min) - return int(rate) + return min(int(rate), const_max_block_size) # Get optimum 1k exponent to represent a number of bytes def optimum_k_exp(num_bytes): @@ -146,12 +153,22 @@ exp = optimum_k_exp(num_bytes) suffix = 'bkMGTPEZY'[exp] if exp == 0: - return '%s%s' % (num_bytes, suffix) + return '%s%s' % (long(round(num_bytes)), suffix) converted = float(num_bytes) / float(const_1k**exp) return '%.2f%s' % (converted, suffix) except IndexError: sys.exit('Error: internal error formatting number of bytes.') +# Returns a long integer from a string representing a byte size +def parse_bytes(bytestr): + regexp = re.compile(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$') + matchobj = regexp.match(bytestr) + if matchobj is None: + return None + number = float(matchobj.group(1)) + multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower()) + return long(round(number * multiplier)) + # Calculate ETA and return it in string format as MM:SS def calc_eta(start, now, total, current): dif = now - start @@ -159,22 +176,28 @@ return '--:--' rate = float(current) / dif eta = long((total - current) / rate) - eta_mins = eta / 60 - eta_secs = eta % 60 + (eta_mins, eta_secs) = divmod(eta, 60) if eta_mins > 99: return '--:--' return '%02d:%02d' % (eta_mins, eta_secs) -# Calculate speed and return it in string format +# Calculate speed and return it in bytes per second, or None def calc_speed(start, now, bytes): dif = now - start if bytes == 0 or dif < const_epsilon: + return None + return (float(bytes) / dif) + +# Convert speed to string +def speed_to_str(bytespersec): + if bytespersec is None: return 'N/A b' - return format_bytes(float(bytes) / dif) + return format_bytes(bytespersec) + # Create the command line options parser and parse command line cmdl_usage = 'usage: %prog [options] video_url' -cmdl_version = '2007.10.09' +cmdl_version = '2008.07.23' cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve') cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit') cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit') @@ -183,8 +206,12 @@ cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video') cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name') cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only') +cmdl_parser.add_option('-r', '--rate-limit', action='store', dest='rate_limit', help='download rate limit (e.g. 50k or 44.6m)') (cmdl_opts, cmdl_args) = cmdl_parser.parse_args() +# Set socket timeout +socket.setdefaulttimeout(const_timeout) + # Get video URL if len(cmdl_args) != 1: cmdl_parser.print_help() @@ -209,6 +236,13 @@ if cmdl_opts.quiet and cmdl_opts.get_url: sys.exit('Error: cannot be quiet and print final URL at the same time.') +# Incorrect option formatting +rate_limit = None +if cmdl_opts.rate_limit is not None: + rate_limit = parse_bytes(cmdl_opts.rate_limit) + if rate_limit is None: + sys.exit('ERROR: invalid download rate limit specified.') + # Get output file name if cmdl_opts.outfile is None: if cmdl_opts.use_title: @@ -245,12 +279,17 @@ # Retrieve real video URL video_url_real = extract_step('Extracting real video URL', 'unable to extract real video URL', const_video_mediaurl_re, video_webpage) +video_url_real = video_url_real.replace('\\', '') + +# Retrieve gdaKey parameter +video_gdakey = extract_step('Extracting "gdaKey" parameter', 'unable to extract "gdaKey" parameter', const_video_gdakey_re, video_webpage) +video_url_real = '%s?__gda__=%s' % (video_url_real, video_gdakey) # Retrieve video data try: cond_print('Requesting video file... ') video_data = perform_request(video_url_real) - cond_print('done\n') + cond_print('done.\n') cond_print('Video data found at %s\n' % video_data.geturl()) if cmdl_opts.get_url: @@ -279,7 +318,8 @@ percent_str = '---.-' eta_str = '--:--' counter = format_bytes(byte_counter) - speed_str = calc_speed(start_time, time.time(), byte_counter) + speed = calc_speed(start_time, time.time(), byte_counter) + speed_str = speed_to_str(speed) cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str)) before = time.time() @@ -292,6 +332,14 @@ video_file.write(video_block) block_size = new_block_size(before, after, dl_bytes) + if rate_limit is not None: + if block_size > rate_limit: + block_size = rate_limit / 2 + + speed = calc_speed(start_time, time.time(), byte_counter) + if speed is not None and speed > const_epsilon and speed > rate_limit: + time.sleep((byte_counter - rate_limit * (time.time() - start_time)) / rate_limit) + if video_len is not None and byte_counter != video_len: error_advice_exit('server did not send the expected ammount of data') Index: metacafe-dl.spec =================================================================== RCS file: /cvs/extras/rpms/metacafe-dl/devel/metacafe-dl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metacafe-dl.spec 20 Jan 2008 22:17:13 -0000 1.1 +++ metacafe-dl.spec 31 Jul 2008 15:21:04 -0000 1.2 @@ -1,5 +1,5 @@ Name: metacafe-dl -Version: 2007.10.09 +Version: 2008.07.23 Release: 1%{?dist} Summary: Command-line program to download videos from metacafe.com Summary(pl): Tekstowy program do pobierania film??w z metacafe.com @@ -50,6 +50,8 @@ %changelog +* Thu Jul 31 2008 Rafa?? Psota 2008.07.23-1 +- update to 2008.07.23 * Sat Jan 19 2008 Rafa?? Psota 2007.10.09-1 - fixed version and description tags - removed COPYING file From fedora-extras-commits at redhat.com Thu Jul 31 15:29:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 15:29:44 GMT Subject: rpms/gutenprint/devel gutenprint.spec,1.38,1.39 Message-ID: <200807311529.m6VFTihY010731@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gutenprint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10705 Modified Files: gutenprint.spec Log Message: fix license tag Index: gutenprint.spec =================================================================== RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gutenprint.spec 13 Feb 2008 12:12:40 -0000 1.38 +++ gutenprint.spec 31 Jul 2008 15:29:14 -0000 1.39 @@ -4,14 +4,14 @@ Name: gutenprint Summary: Printer Drivers Package Version: 5.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Base URL: http://gimp-print.sourceforge.net/ Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2 Source1: gutenprint-foomaticppdupdate Patch0: gutenprint-menu.patch Patch1: gutenprint-O6.patch -License: GPL +License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 BuildRequires: gettext-devel,cups-devel,pkgconfig,gimp-devel @@ -239,6 +239,9 @@ /bin/rm -f /var/cache/foomatic/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway 5.0.2-3 +- fix license tag + * Wed Feb 13 2008 Tim Waugh 5.0.2-2 - Rebuild for GCC 4.3. From fedora-extras-commits at redhat.com Thu Jul 31 15:31:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 15:31:36 +0000 Subject: [pkgdb] jdom had acl change status Message-ID: <20080731153137.2A4CD1AD0F0@bastion.fedora.phx.redhat.com> Deepak Bhole (dbhole) has set the commit acl on jdom (Fedora devel) to Approved for Andrew Overholt (overholt) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jdom From fedora-extras-commits at redhat.com Thu Jul 31 15:31:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 15:31:57 GMT Subject: rpms/halberd/devel halberd.spec,1.4,1.5 Message-ID: <200807311531.m6VFVvBU010900@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/halberd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10842 Modified Files: halberd.spec Log Message: fix license tag Index: halberd.spec =================================================================== RCS file: /cvs/pkgs/rpms/halberd/devel/halberd.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- halberd.spec 30 May 2007 15:15:32 -0000 1.4 +++ halberd.spec 31 Jul 2008 15:31:27 -0000 1.5 @@ -3,11 +3,11 @@ Name: halberd Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool to discover HTTP load balancers Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://halberd.superadditive.com Source0: http://halberd.superadditive.com/dist/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +46,8 @@ %{python_sitelib}/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.2.2-3 +- fix license tag * Wed May 30 2007 Sindre Pedersen Bj??rdal - 0.2.2-1 - New upstream release * Mon May 28 2007 Sindre Pedersen Bj??rdal - 0.2.1-3 From fedora-extras-commits at redhat.com Thu Jul 31 15:32:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 15:32:46 GMT Subject: rpms/hawknl/devel hawknl.spec,1.3,1.4 Message-ID: <200807311532.m6VFWk9j011001@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hawknl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10965 Modified Files: hawknl.spec Log Message: fix license tag Index: hawknl.spec =================================================================== RCS file: /cvs/pkgs/rpms/hawknl/devel/hawknl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hawknl.spec 13 Feb 2008 19:32:59 -0000 1.3 +++ hawknl.spec 31 Jul 2008 15:32:16 -0000 1.4 @@ -1,9 +1,9 @@ Name: hawknl Version: 1.68 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Game oriented network library Group: System Environment/Libraries -License: LGPL2+ +License: LGPLv2+ URL: http://www.hawksoft.com/hawknl/ Source0: http://www.sonic.net/~philf/download/HawkNL168src.tar.gz Patch0: hawknl-64bit.patch @@ -71,6 +71,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway 1.68-4 +- fix license tag + * Wed Feb 13 2008 Hans de Goede 1.68-3 - Fix building with latest glibc (define _GNU_SOURCE) - Rebuild for gcc-4.3 From fedora-extras-commits at redhat.com Thu Jul 31 15:36:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 15:36:10 GMT Subject: rpms/hexter-dssi/devel hexter-dssi.spec,1.8,1.9 Message-ID: <200807311536.m6VFaAMt011162@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hexter-dssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11140 Modified Files: hexter-dssi.spec Log Message: fix license tag Index: hexter-dssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/hexter-dssi/devel/hexter-dssi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hexter-dssi.spec 19 Feb 2008 04:07:50 -0000 1.8 +++ hexter-dssi.spec 31 Jul 2008 15:35:39 -0000 1.9 @@ -1,10 +1,10 @@ Summary: DSSI software synthesizer plugin emulating DX7 Name: hexter-dssi Version: 0.6.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://dssi.sourceforge.net/hexter.html Source0: http://easynews.dl.sourceforge.net/sourceforge/dssi/hexter-0.6.1.tar.gz -License: GPL +License: GPLv2+ Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %exclude %{_libdir}/dssi/hexter.la %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.6.1-3 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.6.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 16:05:01 2008 From: fedora-extras-commits at redhat.com (Sharuzzaman Ahmat Raslan (szaman)) Date: Thu, 31 Jul 2008 16:05:01 GMT Subject: comps/po ms.po,1.13,1.14 Message-ID: <200807311605.m6VG51qB019146@cvs-int.fedora.redhat.com> Author: szaman Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19061 Modified Files: ms.po Log Message: Updated Malay translation View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.13 -r 1.14 ms.po Index: ms.po =================================================================== RCS file: /cvs/pkgs/comps/po/ms.po,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ms.po 17 Jul 2008 18:31:24 -0000 1.13 +++ ms.po 31 Jul 2008 16:04:31 -0000 1.14 @@ -9,7 +9,7 @@ "Project-Id-Version: comps-po\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-17 14:29-0400\n" -"PO-Revision-Date: 2007-12-22 23:51+0800\n" +"PO-Revision-Date: 2008-08-01 00:03+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan \n" "Language-Team: Malay \n" "MIME-Version: 1.0\n" @@ -17,193 +17,286 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 +#: ../comps-f8.xml.in.h:1 +#: ../comps-f9.xml.in.h:1 #: ../comps-f10.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." -msgstr "" -"Persekitaran desktop ringan yang berfungsi dengan baik pada mesin berkuasa " -"rendah." +msgstr "Persekitaran desktop ringan yang berfungsi dengan baik pada mesin berkuasa rendah." -#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 +#: ../comps-f8.xml.in.h:2 +#: ../comps-f9.xml.in.h:2 +#: ../comps-f10.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 +#: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Alatan Pentadbiran" -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +#: ../comps-f7.xml.in.h:3 +#: ../comps-f8.xml.in.h:3 +#: ../comps-f9.xml.in.h:3 #: ../comps-f10.xml.in.h:3 msgid "Afrikaans Support" msgstr "Sokongan Afrikaan" -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +#: ../comps-f7.xml.in.h:4 +#: ../comps-f8.xml.in.h:4 +#: ../comps-f9.xml.in.h:4 #: ../comps-f10.xml.in.h:4 #, fuzzy msgid "Albanian Support" -msgstr "Sokongan Canada" +msgstr "Sokongan Arab" -#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:5 +#: ../comps-f8.xml.in.h:5 +#: ../comps-f9.xml.in.h:5 +#: ../comps-f10.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 +#: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Aplikasi" -#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +#: ../comps-f7.xml.in.h:6 +#: ../comps-f8.xml.in.h:6 +#: ../comps-f9.xml.in.h:6 #: ../comps-f10.xml.in.h:6 msgid "Applications to perform a variety of tasks" msgstr "Aplikasi untuk melaksanakan pelbagai tugasan" -#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 +#: ../comps-f8.xml.in.h:7 +#: ../comps-f9.xml.in.h:7 +#: ../comps-f10.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 +#: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Sokongan Arab" -#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 +#: ../comps-f8.xml.in.h:8 +#: ../comps-f9.xml.in.h:8 +#: ../comps-f10.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 +#: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "Sokongan Armenia" -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 +#: ../comps-f7.xml.in.h:9 +#: ../comps-f8.xml.in.h:9 +#: ../comps-f9.xml.in.h:9 #: ../comps-f10.xml.in.h:9 msgid "Assamese Support" msgstr "Sokongan Assamese" -#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +#: ../comps-f7.xml.in.h:10 +#: ../comps-f8.xml.in.h:10 +#: ../comps-f9.xml.in.h:10 +#: ../comps-f10.xml.in.h:10 +#: ../comps-el4.xml.in.h:6 +#: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "Pengarangan dan Penerbitan" -#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 +#: ../comps-f7.xml.in.h:11 +#: ../comps-f8.xml.in.h:11 +#: ../comps-f9.xml.in.h:11 #: ../comps-f10.xml.in.h:11 msgid "Base" msgstr "Asas" -#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 +#: ../comps-f7.xml.in.h:12 +#: ../comps-f8.xml.in.h:12 +#: ../comps-f9.xml.in.h:12 +#: ../comps-f10.xml.in.h:12 +#: ../comps-el4.xml.in.h:7 +#: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Sistem Asas" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 +#: ../comps-f7.xml.in.h:13 +#: ../comps-f8.xml.in.h:13 +#: ../comps-f9.xml.in.h:13 #: ../comps-f10.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "Sokongan asas bagi bahasa pengaturcaraan Ruby." -#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 +#: ../comps-f7.xml.in.h:14 +#: ../comps-f8.xml.in.h:14 +#: ../comps-f9.xml.in.h:14 #: ../comps-f10.xml.in.h:14 msgid "Basque Support" msgstr "Sokongan Basque" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 +#: ../comps-f7.xml.in.h:15 +#: ../comps-f8.xml.in.h:15 +#: ../comps-f9.xml.in.h:15 #: ../comps-f10.xml.in.h:15 #, fuzzy msgid "Belarusian Support" -msgstr "Sokongan Bulgaria" +msgstr "Sokongan Arab" -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 +#: ../comps-f7.xml.in.h:16 +#: ../comps-f8.xml.in.h:16 +#: ../comps-f9.xml.in.h:16 #: ../comps-f10.xml.in.h:16 msgid "Bengali Support" msgstr "Sokongan Bengali" -#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 +#: ../comps-f7.xml.in.h:17 +#: ../comps-f8.xml.in.h:17 +#: ../comps-f9.xml.in.h:17 #: ../comps-f10.xml.in.h:17 #, fuzzy msgid "Bhutanese Support" -msgstr "Sokongan Cina" +msgstr "Sokongan Arab" -#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 +#: ../comps-f7.xml.in.h:18 +#: ../comps-f8.xml.in.h:18 +#: ../comps-f9.xml.in.h:18 #: ../comps-f10.xml.in.h:18 #, fuzzy msgid "Bosnian Support" -msgstr "Sokongan Estonia" +msgstr "Sokongan Arab" -#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 +#: ../comps-f7.xml.in.h:19 +#: ../comps-f8.xml.in.h:19 +#: ../comps-f9.xml.in.h:19 #: ../comps-f10.xml.in.h:19 msgid "Brazilian Portuguese Support" [...1885 lines suppressed...] +#: ../comps-f9.xml.in.h:130 +#: ../comps-f10.xml.in.h:133 #, fuzzy msgid "SUGAR Desktop Environment" -msgstr "Persekitaran Desktop" +msgstr "Persekitaran Desktop GNOME" -#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:134 +#: ../comps-f9.xml.in.h:131 +#: ../comps-f10.xml.in.h:134 msgid "SUGAR is the desktop environment developed for the OLPC XO." msgstr "" -#: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:204 +#: ../comps-f9.xml.in.h:200 +#: ../comps-f10.xml.in.h:204 #, fuzzy msgid "Walloon Support" -msgstr "Sokongan Thai" +msgstr "Sokongan Arab" #: ../comps-f10.xml.in.h:70 msgid "Haskell" msgstr "" #: ../comps-f10.xml.in.h:76 +#, fuzzy msgid "Input Methods" -msgstr "" +msgstr "Cara Masukan" #: ../comps-f10.xml.in.h:77 msgid "Input method packages for the input of international text." @@ -1204,121 +1648,71 @@ #: ../comps-f10.xml.in.h:157 #, fuzzy msgid "Tajik Support" -msgstr "Sokongan Thai" +msgstr "Sokongan Arab" -#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +#: ../comps-el4.xml.in.h:3 +#: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "Aplikasi untuk pelbagai tugas" -#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +#: ../comps-el4.xml.in.h:12 +#: ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" msgstr "Sokongan Rangkaian Dailup" -#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"GNOME adalah antaramuka pengguna bergrafik yang berkuasa, yang mengandungi " -"panel, desktop, ikon sistem, dan pengurus fail bergrafik." +#: ../comps-el4.xml.in.h:22 +#: ../comps-el5.xml.in.h:23 +msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "GNOME adalah antaramuka pengguna bergrafik yang berkuasa, yang mengandungi panel, desktop, ikon sistem, dan pengurus fail bergrafik." + +#: ../comps-el4.xml.in.h:35 +#: ../comps-el5.xml.in.h:35 +msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "KDE adalah antaramuka pengguna bergrafik yang berkuasa, yang mengandungi panel, desktop, ikon sistem, dan pengurus fail bergrafik." + +#: ../comps-el4.xml.in.h:44 +#: ../comps-el5.xml.in.h:44 +msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." +msgstr "Kadangkala dipanggil penyunting teks, ini adalah program yang membolehkan anda untuk cipta dan menyunting fail. Ini termasuk Emacs dan Vi." -#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 -msgid "" -"KDE is a powerful, graphical user interface which includes a panel, desktop, " -"system icons, and a graphical file manager." -msgstr "" -"KDE adalah antaramuka pengguna bergrafik yang berkuasa, yang mengandungi " -"panel, desktop, ikon sistem, dan pengurus fail bergrafik." - -#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 -msgid "" -"Sometimes called text editors, these are programs that allow you to create " -"and edit files. These include Emacs and Vi." -msgstr "" -"Kadangkala dipanggil penyunting teks, ini adalah program yang membolehkan " -"anda untuk cipta dan menyunting fail. Ini termasuk Emacs dan Vi." - -#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +#: ../comps-el4.xml.in.h:50 +#: ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." msgstr "Penyunting teks XEmacs." -#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 -msgid "" -"These tools allow you to create documentation in the DocBook format and " -"convert them to HTML, PDF, Postscript, and text." -msgstr "" -"Alatan ini membolehkan anda menghasilkan dokumentasi dalam format DocBook " -"dan menukar mereka kepada HTML, PDF, Postscript, dan teks." +#: ../comps-el4.xml.in.h:54 +#: ../comps-el5.xml.in.h:52 +msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." +msgstr "Alatan ini membolehkan anda menghasilkan dokumentasi dalam format DocBook dan menukar mereka kepada HTML, PDF, Postscript, dan teks." -#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +#: ../comps-el4.xml.in.h:64 +#: ../comps-el5.xml.in.h:62 #, fuzzy msgid "This group is a collection of network servers for specific purposes" -msgstr "" -"Kumpulan ini adalah koleksi alatan untuk pelbagai utiliti perkakasan " -"spesifik." +msgstr "Kumpulan ini adalah koleksi alatan untuk pelbagai utiliti perkakasan spesifik." -#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +#: ../comps-el4.xml.in.h:65 +#: ../comps-el5.xml.in.h:63 #, fuzzy -msgid "" -"This group is a collection of tools and resources of Arabic environments." -msgstr "" -"Kumpulan ini adalah kolesi alatan dan sumber bagi persekitaran Armenia." +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "Kumpulan ini adalah kolesi alatan dan sumber bagi persekitaran Armenia." -#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 -#, fuzzy -msgid "" -"This group is a collection of tools and resources of Hebrew environments." -msgstr "" -"Kumpulan ini adalah kolesi alatan dan sumber bagi persekitaran Armenia." - -#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -#, fuzzy -msgid "" -"This group is a collection of tools and resources of Japanese environments." -msgstr "" -"Kumpulan ini adalah kolesi alatan dan sumber bagi persekitaran Armenia." +#: ../comps-el4.xml.in.h:67 +#: ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "Kumpulan ini adalah koleksi alatan dan sumber bagi persekitaran Hebrew." + +#: ../comps-el4.xml.in.h:68 +#: ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "Kumpulan ini adalah koleksi alatan dan sumber bagi persekitaran Jepun." -#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +#: ../comps-el4.xml.in.h:77 +#: ../comps-el5.xml.in.h:77 msgid "XEmacs" msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -#, fuzzy -msgid "" -"This group is a collection of tools and resources of Czech environments." -msgstr "" -"Kumpulan ini adalah kolesi alatan dan sumber bagi persekitaran Armenia." +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "Kumpulan ini adalah koleksi alatan dan sumber bagi persekitaran Czech." -#, fuzzy -#~ msgid "British Support" -#~ msgstr "Sokongan Irish" - -#, fuzzy -#~ msgid "Cluster Storage" -#~ msgstr "Sokongan Gugusan" - -#, fuzzy -#~ msgid "Clustering Support." -#~ msgstr "Sokongan Gugusan" - -#, fuzzy -#~ msgid "Single Node GFS Support" -#~ msgstr "Sokongan Cina" - -#, fuzzy -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "Pakej ini menyediakan keserasian untuk keluaran terdahulu." - -#, fuzzy -#~ msgid "Multimedia applications" -#~ msgstr "Aplikasi" - -#, fuzzy -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "Pakej yang menyediakan fungsi untuk membangun dan membina aplikasi." - -#, fuzzy -#~ msgid "Virtualization Support." -#~ msgstr "Virtualization" From fedora-extras-commits at redhat.com Thu Jul 31 16:05:16 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 31 Jul 2008 16:05:16 GMT Subject: rpms/jdom/devel jdom-1.0-OSGiManifest.patch, NONE, 1.1 jdom.spec, 1.21, 1.22 Message-ID: <200807311605.m6VG5GPw019156@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/jdom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19090 Modified Files: jdom.spec Added Files: jdom-1.0-OSGiManifest.patch Log Message: * Mon Jul 21 2008 Andrew Overholt 1.0-5.5 - Add OSGi manifest information jdom-1.0-OSGiManifest.patch: --- NEW FILE jdom-1.0-OSGiManifest.patch --- diff -up ./package/META-INF/MANIFEST.MF.osgimanifest ./package/META-INF/MANIFEST.MF --- ./package/META-INF/MANIFEST.MF.osgimanifest 2008-07-21 16:00:59.000000000 -0400 +++ ./package/META-INF/MANIFEST.MF 2008-07-21 16:02:20.000000000 -0400 @@ -1,4 +1,16 @@ Manifest-Version: 1.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-SymbolicName: org.jdom +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-Localization: plugin +Bundle-Version: 1.0.0.v200806100616 +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jdom;version="1.0.0",org.jdom.adapters;version="1. + 0.0",org.jdom.filter;version="1.0.0",org.jdom.input;version="1.0.0",o + rg.jdom.output;version="1.0.0",org.jdom.transform;version="1.0.0",org + .jdom.xpath;version="1.0.0" +Require-Bundle: org.apache.xerces;resolution:=optional Name: org/jdom/ Specification-Title: JDOM Classes Index: jdom.spec =================================================================== RCS file: /cvs/pkgs/rpms/jdom/devel/jdom.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jdom.spec 9 Jul 2008 20:01:39 -0000 1.21 +++ jdom.spec 31 Jul 2008 16:04:46 -0000 1.22 @@ -36,7 +36,7 @@ Name: jdom Version: 1.0 -Release: 5.4%{?dist} +Release: 5.5%{?dist} Epoch: 0 Summary: Java alternative to DOM and SAX License: BSD @@ -45,6 +45,7 @@ #http://www.jdom.org/dist/source/jdom-1.0.tar.gz Source0: jdom-1.0-RHCLEAN.tar.bz2 Patch0: %{name}-crosslink.patch +Patch1: %{name}-%{version}-OSGiManifest.patch Requires: xalan-j2 >= 0:2.2.0 BuildRequires: ant >= 0:1.6 BuildRequires: xalan-j2 >= 0:2.2.0 @@ -91,6 +92,7 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p0 +%patch1 -p0 # remove all binary libs find . -name "*.jar" -exec rm -f {} \; find . -name "*.class" -exec rm -f {} \; @@ -173,6 +175,9 @@ %changelog +* Mon Jul 21 2008 Andrew Overholt 1.0-5.5 +- Add OSGi manifest information + * Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-5.4 - drop repotag From fedora-extras-commits at redhat.com Thu Jul 31 16:06:38 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 31 Jul 2008 16:06:38 GMT Subject: rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch, NONE, 1.1 openoffice.org.spec, 1.1503, 1.1504 Message-ID: <200807311606.m6VG6chI019361@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19258 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch Log Message: rhbz#455711 add openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch: --- NEW FILE openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch --- Index: source/misc/acceleratorexecute.cxx =================================================================== RCS file: /cvs/util/svtools/source/misc/acceleratorexecute.cxx,v retrieving revision 1.12 diff -u -r1.12 acceleratorexecute.cxx --- openoffice.org.orig/svtools/source/misc/acceleratorexecute.cxx 6 Jul 2007 10:06:05 -0000 1.12 +++ openoffice.org/svtools/source/misc/acceleratorexecute.cxx 31 Jul 2008 16:00:22 -0000 @@ -377,8 +377,8 @@ { sModule = xModuleDetection->identify(xFrame); } - catch(const css::uno::RuntimeException& exRuntime) - { throw exRuntime; } + catch(const css::uno::RuntimeException&) + { throw; } catch(const css::uno::Exception&) { return css::uno::Reference< css::ui::XAcceleratorConfiguration >(); } @@ -472,8 +472,8 @@ } catch(const css::lang::DisposedException&) {} - catch(const css::uno::RuntimeException& exRuntime) - { throw exRuntime; } + catch(const css::uno::RuntimeException&) + { throw; } catch(const css::uno::Exception&) {} Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v retrieving revision 1.1503 retrieving revision 1.1504 diff -u -r1.1503 -r1.1504 --- openoffice.org.spec 31 Jul 2008 08:12:18 -0000 1.1503 +++ openoffice.org.spec 31 Jul 2008 16:06:08 -0000 1.1504 @@ -167,6 +167,7 @@ Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch Patch93: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch Patch94: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash +Patch95: openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch %define instdir %{_libdir}/openoffice.org @@ -1148,6 +1149,7 @@ %patch92 -p1 -b .ooo86142.serbiannumbering.patch %patch93 -p1 -b .ooo92026.sd.disposed_during_disposing.patch %patch94 -p1 -b .ooo92253.dbaccess.a11y.crash +%patch95 -p1 -b .ooo92343.svtools.strangethrow.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2943,7 +2945,7 @@ %changelog -* Wed Jul 23 2008 Caolan McNamara - 1:2.4.1-17.5-UNRELEASED +* Wed Jul 23 2008 Caolan McNamara - 1:2.4.1-17.5 - Resolves: rhbz#452376 backport workspace.locdat30.patch for Serbian - Resolves: rhbz#452376 update Serbian translations - Resolves: rhbz#452379 extend Serbian translations @@ -2952,6 +2954,7 @@ - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch - Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash - Resolves: rhbz#457303 notes related right click in empty space crash +- rhbz#455711 add openoffice.org-3.0.0.ooo92343.svtools.strangethrow.patch * Fri Jun 13 2008 Caolan McNamara - 1:2.4.1-17.4 - Resolves: rhbz#451485 fix vertical glyphs From fedora-extras-commits at redhat.com Thu Jul 31 16:41:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 16:41:32 +0000 Subject: [pkgdb] rpm: ffesti has requested commit Message-ID: <20080731164132.B2B311AD0ED@bastion.fedora.phx.redhat.com> Florian Festi (ffesti) has requested the commit acl on rpm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rpm From fedora-extras-commits at redhat.com Thu Jul 31 16:41:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 16:41:31 +0000 Subject: [pkgdb] rpm: ffesti has requested watchbugzilla Message-ID: <20080731164137.71CDF1AD0E5@bastion.fedora.phx.redhat.com> Florian Festi (ffesti) has requested the watchbugzilla acl on rpm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rpm From fedora-extras-commits at redhat.com Thu Jul 31 16:41:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 16:41:32 +0000 Subject: [pkgdb] rpm: ffesti has requested watchcommits Message-ID: <20080731164138.C86931AD0F9@bastion.fedora.phx.redhat.com> Florian Festi (ffesti) has requested the watchcommits acl on rpm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rpm From fedora-extras-commits at redhat.com Thu Jul 31 16:41:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 16:41:44 +0000 Subject: [pkgdb] rpm: ffesti has requested watchbugzilla Message-ID: <20080731164144.42B191AD101@bastion.fedora.phx.redhat.com> Florian Festi (ffesti) has requested the watchbugzilla acl on rpm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rpm From fedora-extras-commits at redhat.com Thu Jul 31 16:41:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 16:41:50 +0000 Subject: [pkgdb] rpm: ffesti has requested commit Message-ID: <20080731164150.ABC0F1AD0F0@bastion.fedora.phx.redhat.com> Florian Festi (ffesti) has requested the commit acl on rpm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rpm From fedora-extras-commits at redhat.com Thu Jul 31 16:41:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 16:41:44 +0000 Subject: [pkgdb] rpm: ffesti has requested watchcommits Message-ID: <20080731164144.DA53A1AD104@bastion.fedora.phx.redhat.com> Florian Festi (ffesti) has requested the watchcommits acl on rpm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rpm From fedora-extras-commits at redhat.com Thu Jul 31 16:43:03 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Thu, 31 Jul 2008 16:43:03 GMT Subject: rpms/dbus-glib/devel dbus-glib-0.77-bash-completion.patch, NONE, 1.1 dbus-glib.spec, 1.29, 1.30 Message-ID: <200807311643.m6VGh3do021227@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/dbus-glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21152 Modified Files: dbus-glib.spec Added Files: dbus-glib-0.77-bash-completion.patch Log Message: * Thu Jul 31 2008 David Zeuthen - 0.76-2 - Add bash completion for dbus-send(1) dbus-glib-0.77-bash-completion.patch: --- NEW FILE dbus-glib-0.77-bash-completion.patch --- >From 91f6977a2dc01207072b5718b89c57f439f9339a Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Thu, 31 Jul 2008 12:28:07 -0400 Subject: [PATCH] add bash completion for dbus-send(1) For now, it's in dbus-glib since dbus doesn't have an introspection XML parser (yet). --- configure.ac | 13 + dbus/Makefile.am | 17 ++- dbus/dbus-bash-completion-helper.c | 513 ++++++++++++++++++++++++++++++++++++ dbus/dbus-bash-completion.sh.in | 21 ++ 4 files changed, 563 insertions(+), 1 deletions(-) create mode 100644 dbus/dbus-bash-completion-helper.c create mode 100644 dbus/dbus-bash-completion.sh.in diff --git a/configure.ac b/configure.ac index 839e0e1..a163935 100644 --- a/configure.ac +++ b/configure.ac @@ -54,11 +54,23 @@ AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion chec AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes) AC_ARG_ENABLE(doxygen-docs, AS_HELP_STRING([--enable-doxygen-docs],[build DOXYGEN documentation (requires Doxygen)]),enable_doxygen_docs=$enableval,enable_doxygen_docs=auto) AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no) +AC_ARG_ENABLE(bash-completion, AS_HELP_STRING([--enable-bash-completion],[install bash completion scripts]),enable_bash_completion=$enableval,enable_bash_completion=yes) AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check])) AC_ARG_WITH(introspect-xml, AS_HELP_STRING([--with-introspect-xml=[filename]],[Pass in a pregenerated dbus daemon introspection xml file (as generated by 'dbus-daemon --introspect') to use instead of querying the installed dbus daemon])) + +AM_CONDITIONAL(DBUS_BASH_COMPLETION, test x$enable_bash_completion = xyes) +if test x$enable_bash_completion = xyes; then + AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion]) +fi + +if test x$enable_verbose_mode = xyes; then + AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode]) +fi + + dnl DBUS_BUILD_TESTS controls unit tests built in to .c files dnl and also some stuff in the test/ subdir AM_CONDITIONAL(DBUS_BUILD_TESTS, test x$enable_tests = xyes) @@ -867,6 +879,7 @@ echo " Building checks: ${enable_checks} Building Doxygen docs: ${enable_doxygen_docs} Building Gtk-doc docs: ${enable_gtk_doc} + Bash Completion: ${enable_bash_completion} Gettext libs (empty OK): ${INTLLIBS} Using XML parser: ${with_xml} 'make check' socket dir: ${TEST_SOCKET_DIR} diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 2650e8b..bd01d7f 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -91,7 +91,22 @@ regenerate-built-sources: echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c && \ @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c -EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh + +profiledir = $(sysconfdir)/profile.d +if DBUS_BASH_COMPLETION +libexec_PROGRAMS=dbus-bash-completion-helper +profile_SCRIPTS=dbus-bash-completion.sh +endif + +dbus-bash-completion.sh : dbus-bash-completion.sh.in + @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +dbus_bash_completion_helper_SOURCES = \ + dbus-bash-completion-helper.c +dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la + + +EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in if DBUS_BUILD_TESTS diff --git a/dbus/dbus-bash-completion-helper.c b/dbus/dbus-bash-completion-helper.c new file mode 100644 index 0000000..022c722 --- /dev/null +++ b/dbus/dbus-bash-completion-helper.c @@ -0,0 +1,513 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* dbus-bash-completion-helper.c Bash Completion helper routines + * + * Copyright (C) 2008 David Zeuthen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include +#include +#include +#include +#include + +#include +#include +#include "dbus-gparser.h" + +static void +print_services (DBusConnection *connection) +{ + DBusMessage *message; + DBusMessage *reply; + DBusError error; + DBusMessageIter iter; + DBusMessageIter iter_array; + const char *name; + + /* list both active and activatable names (the shell will sort and + * uniquify them) - also avoid names that are not well-known + * (e.g. :1.42). + */ + + message = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, + "ListNames"); + dbus_error_init (&error); + reply = dbus_connection_send_with_reply_and_block (connection, + message, + -1, + &error); + dbus_message_unref (message); + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) + { + dbus_message_iter_get_basic (&iter_array, &name); + if (name[0] != ':') + printf ("%s \n", name); + dbus_message_iter_next (&iter_array); + } + dbus_message_unref (reply); + + message = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, + "ListActivatableNames"); + dbus_error_init (&error); + reply = dbus_connection_send_with_reply_and_block (connection, + message, + -1, + &error); + dbus_message_unref (message); + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) + { + dbus_message_iter_get_basic (&iter_array, &name); + printf ("%s \n", name); + dbus_message_iter_next (&iter_array); + } + dbus_message_unref (reply); +} + +static gboolean +have_option (char **tokens, const char *option) +{ + int n; + for (n = 0; tokens[n] != NULL; n++) + if (strcmp (tokens[n], option) == 0) + return TRUE; + return FALSE; +} + +static gboolean +have_option_with_value (char **tokens, const char *option, const char **value) +{ + int n; + for (n = 0; tokens[n] != NULL; n++) + { + if (g_str_has_prefix (tokens[n], option)) + { + if (strlen (tokens[n]) > strlen (option)) + *value = tokens[n] + strlen (option); + return TRUE; + } + } + return FALSE; +} + +static void +print_objects (DBusConnection *connection, const char *service_name, const char *cur) +{ + DBusMessage *message; + DBusMessage *reply; + DBusError error; + DBusMessageIter iter; + const char *introspection_xml; + NodeInfo *root; + GSList *nodes; + GSList *l; + + if (cur == NULL) + cur = "/"; + + message = dbus_message_new_method_call (service_name, + cur, + DBUS_INTERFACE_INTROSPECTABLE, + "Introspect"); + dbus_error_init (&error); + reply = dbus_connection_send_with_reply_and_block (connection, + message, + -1, + &error); + dbus_message_unref (message); + dbus_message_iter_init (reply, &iter); + dbus_message_iter_get_basic (&iter, &introspection_xml); + + root = description_load_from_string (introspection_xml, strlen (introspection_xml), NULL); + nodes = node_info_get_nodes (root); + + if (g_slist_length (node_info_get_interfaces (root)) > 0) + printf ("%s \n", cur); + + for (l = nodes; l != NULL; l = l->next) + { + NodeInfo *node = (NodeInfo *) l->data; + const char *name; + char *new_path; + + name = node_info_get_name (node); + if (strcmp (cur, "/") == 0) + new_path = g_strdup_printf ("/%s", name); + else + new_path = g_strdup_printf ("%s/%s", cur, name); + + print_objects (connection, service_name, new_path); + + g_free (new_path); + } + node_info_unref (root); + + dbus_message_unref (reply); +} + +static gboolean +is_object_path_with_interfaces (DBusConnection *connection, const char *service_name, const char *object_path) +{ + DBusMessage *message; + DBusMessage *reply; + DBusError error; + DBusMessageIter iter; + const char *introspection_xml; + NodeInfo *root; + gboolean ret; + + ret = FALSE; + + message = dbus_message_new_method_call (service_name, + object_path, + DBUS_INTERFACE_INTROSPECTABLE, + "Introspect"); + dbus_error_init (&error); + reply = dbus_connection_send_with_reply_and_block (connection, + message, + -1, + &error); + dbus_message_unref (message); + dbus_message_iter_init (reply, &iter); + dbus_message_iter_get_basic (&iter, &introspection_xml); + + root = description_load_from_string (introspection_xml, strlen (introspection_xml), NULL); + + if (g_slist_length (node_info_get_interfaces (root)) > 0) + ret = TRUE; + + node_info_unref (root); + dbus_message_unref (reply); + + return ret; +} + +static void +print_methods (DBusConnection *connection, const char *service_name, const char *object_path) +{ + DBusMessage *message; + DBusMessage *reply; + DBusError error; + DBusMessageIter iter; + const char *introspection_xml; + NodeInfo *root; + GSList *interfaces; + GSList *l; + + message = dbus_message_new_method_call (service_name, + object_path, + DBUS_INTERFACE_INTROSPECTABLE, + "Introspect"); + dbus_error_init (&error); + reply = dbus_connection_send_with_reply_and_block (connection, + message, + -1, + &error); + dbus_message_unref (message); + dbus_message_iter_init (reply, &iter); + dbus_message_iter_get_basic (&iter, &introspection_xml); + + root = description_load_from_string (introspection_xml, strlen (introspection_xml), NULL); + interfaces = node_info_get_interfaces (root); + for (l = interfaces; l != NULL; l = l->next) + { + InterfaceInfo *interface = (InterfaceInfo *) l->data; + GSList *methods; + GSList *ll; + methods = interface_info_get_methods (interface); + for (ll = methods; ll != NULL; ll = ll->next) + { + MethodInfo *method = (MethodInfo *) ll->data; + printf ("%s.%s \n", interface_info_get_name (interface), method_info_get_name (method)); + } + } + node_info_unref (root); + dbus_message_unref (reply); +} + +static void +print_signature (DBusConnection *connection, const char *service_name, const char *object_path, const char *method) +{ + DBusMessage *message; + DBusMessage *reply; + DBusError error; + DBusMessageIter iter; + const char *introspection_xml; + NodeInfo *root; + GSList *interfaces; + GSList *l; + char *s; + char *method_name; + char *interface_name; + int n; + + method_name = NULL; + interface_name = NULL; + + s = strrchr (method, '.'); + if (s == NULL || strlen (s) < 2 || s - method < 1) + goto fail; + method_name = g_strdup (s + 1); + interface_name = g_strndup (method, s - method); + printf (" \n"); + + message = dbus_message_new_method_call (service_name, + object_path, + DBUS_INTERFACE_INTROSPECTABLE, + "Introspect"); + dbus_error_init (&error); + reply = dbus_connection_send_with_reply_and_block (connection, + message, + -1, + &error); + dbus_message_unref (message); + dbus_message_iter_init (reply, &iter); + dbus_message_iter_get_basic (&iter, &introspection_xml); + + root = description_load_from_string (introspection_xml, strlen (introspection_xml), NULL); + interfaces = node_info_get_interfaces (root); + for (l = interfaces; l != NULL; l = l->next) + { + InterfaceInfo *interface = (InterfaceInfo *) l->data; + + if (strcmp (interface_name, interface_info_get_name (interface)) == 0) + { + GSList *methods; + GSList *ll; + methods = interface_info_get_methods (interface); + for (ll = methods; ll != NULL; ll = ll->next) + { + MethodInfo *method = (MethodInfo *) ll->data; + if (strcmp (method_name, method_info_get_name (method)) == 0) + { + GSList *args; + GSList *lll; + args = method_info_get_args (method); + for (lll = args, n = 0; lll != NULL; lll = lll->next, n++) + { + ArgInfo *arg = (ArgInfo *) lll->data; + printf ("# %s: arg %d: %s (%s) \n", + arg_info_get_direction (arg) == ARG_IN ? " IN" : "OUT", + n, + arg_info_get_name (arg), + arg_info_get_type (arg)); + } + break; + } + } + } + } + node_info_unref (root); + dbus_message_unref (reply); + fail: + g_free (method_name); + g_free (interface_name); +} + + +static int +complete_dbus_send (char *str) +{ + int ret; + char **tokens; + int num_tokens; + const char *cur; + const char *prev; + gboolean have_system; + gboolean have_session; + gboolean have_print_reply; + gboolean have_dest; + DBusConnection *connection; + DBusBusType bus_type; + DBusError error; + const char *target_service; + const char *object_path; + const char *method; + int n; + int object_path_index; + + ret = 1; + connection = NULL; + target_service = NULL; + + tokens = g_strsplit (str, " ", 0); + num_tokens = g_strv_length (tokens); + if (num_tokens >= 2) { + cur = tokens[num_tokens - 1]; + prev = tokens[num_tokens - 2]; + } else if (num_tokens == 1) { + cur = tokens[num_tokens - 1]; + prev = ""; + } else { + cur = ""; + prev = ""; + } + + have_system = have_option (tokens, "--system"); + have_session = have_option (tokens, "--session"); + have_print_reply = have_option (tokens, "--print-reply"); + have_dest = have_option_with_value (tokens, "--dest=", &target_service); + + if (!have_print_reply) + printf ("--print-reply \n"); + + if (!have_system && !have_session) + { + printf ("--system \n"); + printf ("--session \n"); + goto done; + } + + if (!have_dest && !g_str_has_prefix (cur, "--dest=")) + { + printf ("--dest=\n"); + goto done; + } + + if (have_system || have_session) + { + bus_type = have_system ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION; + + dbus_error_init (&error); + connection = dbus_bus_get (bus_type, &error); + if (connection == NULL) + { + fprintf (stderr, "Failed to open connection to %s message bus: %s: %s\n", + (bus_type == DBUS_BUS_SYSTEM) ? "system" : "session", + error.name, error.message); + dbus_error_free (&error); + goto fail; + } + } + + if (connection != NULL && g_str_has_prefix (cur, "--dest=")) + { + print_services (connection); + goto done; + } + + /* see if we have an object path */ + object_path = NULL; + object_path_index = 0; + if (connection != NULL && target_service != NULL) + { + for (n = 0; tokens[n] != NULL; n++) + { + if (tokens[n] == cur) + continue; + + if (*(tokens[n]) == '/') + { + if (is_object_path_with_interfaces (connection, target_service, tokens[n])) + { + object_path = tokens[n]; + object_path_index = n; + } + } + } + } + + /* if we have a connection and a destination but no object path, go ahead and list the object paths */ + if (connection != NULL && target_service != NULL && object_path == NULL) + { + print_objects (connection, target_service, NULL); + goto done; + } + + /* see if we have a method; it's directly after the object_path */ + method = NULL; + if (connection != NULL && target_service != NULL && object_path != NULL) + { + if ((object_path_index + 1 < num_tokens - 1) && + (strlen (tokens[object_path_index + 1]) > 0) && + !(strcmp (cur, tokens[object_path_index + 1]) == 0)) + method = tokens[object_path_index + 1]; + } + + /* if we have connection, destination and object path but no method yet, list the methods */ + if (connection != NULL && target_service != NULL && object_path != NULL && method == NULL) + { + print_methods (connection, target_service, object_path); + goto done; + } + + /* print signature as comment */ + if (connection != NULL && target_service != NULL && object_path != NULL && method != NULL) + { + print_signature (connection, target_service, object_path, method); + } + + done: + ret = 0; + + fail: + + g_strfreev (tokens); + + if (connection != NULL) + dbus_connection_unref (connection); + return ret; +} + +int +main (int argc, char *argv[]) +{ + int ret; + char *cur; + gboolean dbus_send; + + ret = 1; + dbus_send = FALSE; + + if (argc != 3) + { + fprintf (stderr, "invalid use\n"); + goto out; + } + + if (strcmp (argv[1], "dbus-send") == 0) + { + dbus_send = TRUE; + } + else + { + fprintf (stderr, "unknown program '%s'\n", argv[1]); + goto out; + } + + if (strlen (argv[2]) < strlen (argv[1]) + 1) + { + fprintf (stderr, "error"); + goto out; + } + + cur = argv[2] + strlen (argv[1]) + 1; + + if (dbus_send) + ret = complete_dbus_send (cur); + + out: + return ret; +} diff --git a/dbus/dbus-bash-completion.sh.in b/dbus/dbus-bash-completion.sh.in new file mode 100644 index 0000000..a7751da --- /dev/null +++ b/dbus/dbus-bash-completion.sh.in @@ -0,0 +1,21 @@ + +# Check for bash +[ -z "$BASH_VERSION" ] && return + +################################################################################ + +__dbus_send() { + local IFS=$'\n' + local cur="${COMP_WORDS[COMP_CWORD]}" + + # --name=value style option + if [[ "$cur" == *=* ]] ; then + cur=${cur/*=/} + fi + + COMPREPLY=($(compgen -W "$(@libexecdir@/dbus-bash-completion-helper dbus-send ${COMP_WORDS[@]:0})" -- $cur)) +} + +################################################################################ + +complete -o nospace -F __dbus_send dbus-send -- 1.5.6.4 Index: dbus-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-glib/devel/dbus-glib.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- dbus-glib.spec 5 Jun 2008 19:57:44 -0000 1.29 +++ dbus-glib.spec 31 Jul 2008 16:42:33 -0000 1.30 @@ -8,7 +8,7 @@ Summary: GLib bindings for D-Bus Name: dbus-glib Version: 0.76 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz Source1: dbus-bus-introspect.xml @@ -26,6 +26,10 @@ BuildRequires: gettext BuildRequires: autoconf +# TODO +Patch10: dbus-glib-0.77-bash-completion.patch +# this patch requires autoreconf +BuildRequires: autoconf automake libtool gettext-devel gtk-doc %description @@ -61,9 +65,10 @@ %setup -q %patch7 -p1 -b .getall-wincaps-to-uscore +%patch10 -p1 -b .bash-completion %build - +autoreconf %configure --disable-tests \ --enable-verbose-mode=yes \ --enable-asserts=yes \ @@ -83,6 +88,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/dbus-bash-completion.sh + %clean rm -rf %{buildroot} @@ -106,6 +113,8 @@ %{_libdir}/pkgconfig/dbus-glib-1.pc %{_includedir}/* %{_datadir}/gtk-doc/html/dbus-glib +%{_sysconfdir}/profile.d/dbus-bash-completion.sh +%{_libexecdir}/dbus-bash-completion-helper %if 0 %files gtk @@ -116,6 +125,9 @@ %endif %changelog +* Thu Jul 31 2008 David Zeuthen - 0.76-2 +- Add bash completion for dbus-send(1) + * Thu Jun 05 2008 Colin Walters - 0.76-1 - New upstream 0.76 - Drop all upstreamed patches From fedora-extras-commits at redhat.com Thu Jul 31 16:43:15 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Thu, 31 Jul 2008 16:43:15 GMT Subject: rpms/PackageKit/F-9 .cvsignore, 1.24, 1.25 PackageKit.spec, 1.42, 1.43 sources, 1.25, 1.26 Message-ID: <200807311643.m6VGhFjg021234@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21175 Modified Files: .cvsignore PackageKit.spec sources Log Message: * Tue Jul 31 2008 Richard Hughes - 0.2.4-1 - New upstream version, only bugfixes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 4 Jul 2008 13:04:55 -0000 1.24 +++ .cvsignore 31 Jul 2008 16:42:45 -0000 1.25 @@ -1 +1 @@ -PackageKit-0.2.3.tar.gz +PackageKit-0.2.4.tar.gz Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- PackageKit.spec 15 Jul 2008 07:36:14 -0000 1.42 +++ PackageKit.spec 31 Jul 2008 16:42:45 -0000 1.43 @@ -2,23 +2,19 @@ %define dbus_version 0.90 %define dbus_glib_version 0.70 %define policykit_version 0.7 -#%define alphatag 20080522 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: System daemon that is a DBUS abstraction layer for package management Name: PackageKit -Version: 0.2.3 -#Release: 1.%{?alphatag}%{?dist} -Release: 6%{?dist} +Version: 0.2.4 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org #Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Patch0: packagekit-backport-gpg-giant-bodge.patch -Patch0: packagekit-bump-soname.patch Requires: dbus >= %{dbus_version} Requires: PackageKit-libs = %{version}-%{release} @@ -103,7 +99,6 @@ %prep #%setup -q -n %{name}-%{version}-%{?alphatag} %setup -q -%patch0 -p1 %build %configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local @@ -200,6 +195,9 @@ %{_includedir}/* %changelog +* Tue Jul 31 2008 Richard Hughes - 0.2.4-1 +- New upstream version, only bugfixes. + * Tue Jul 15 2008 Richard Hughes - 0.2.3-6 - Own the /etc/bash_completion.d directory as we don't depend on the bash-completion package. Fixes rh#450964. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 4 Jul 2008 13:04:55 -0000 1.25 +++ sources 31 Jul 2008 16:42:45 -0000 1.26 @@ -1 +1 @@ -11fed88d14aa021068294a430161dfe3 PackageKit-0.2.3.tar.gz +87bf41fd021077c93549d47de6d5fe07 PackageKit-0.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 16:43:21 2008 From: fedora-extras-commits at redhat.com (Richard Hughes (rhughes)) Date: Thu, 31 Jul 2008 16:43:21 GMT Subject: rpms/gnome-packagekit/F-9 .cvsignore, 1.19, 1.20 gnome-packagekit.spec, 1.46, 1.47 sources, 1.21, 1.22 Message-ID: <200807311643.m6VGhLt0021271@cvs-int.fedora.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21201 Modified Files: .cvsignore gnome-packagekit.spec sources Log Message: * Tue Jul 31 2008 Richard Hughes - 0.2.4-1 - New upstream version, only bugfixes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 4 Jul 2008 13:04:52 -0000 1.19 +++ .cvsignore 31 Jul 2008 16:42:50 -0000 1.20 @@ -1 +1 @@ -gnome-packagekit-0.2.3.tar.gz +gnome-packagekit-0.2.4.tar.gz Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gnome-packagekit.spec 31 Jul 2008 14:52:51 -0000 1.46 +++ gnome-packagekit.spec 31 Jul 2008 16:42:50 -0000 1.47 @@ -1,12 +1,10 @@ %define dbus_version 0.61 %define packagekit_version 0.2.3 -#%define alphatag 20080516 Summary: GNOME PackageKit Client Name: gnome-packagekit -Version: 0.2.3 -#Release: 1.%{?alphatag}%{?dist} -Release: 9%{?dist} +Version: 0.2.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -15,8 +13,7 @@ Source1: system-install-packages Source2: system-install-packages.1.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gnome-packagekit-set-interaction-for-tools.patch -Patch1: gnome-packagekit-enable-kde.patch +Patch0: gnome-packagekit-enable-kde.patch Requires: gtk2 >= 2.12.0 Requires: gnome-icon-theme @@ -65,7 +62,6 @@ %setup -q #%setup -q -n %{name}-%{version}-%{?alphatag} %patch0 -p1 -%patch1 -p1 %build %configure --disable-scrollkeeper --disable-schemas-install @@ -127,8 +123,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -update-desktop-database %{_datadir}/applications -update-mime-database %{_datadir}/mime +update-desktop-database %{_datadir}/applications &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -149,6 +145,9 @@ %{_datadir}/applications/gpk-*.desktop %changelog +* Tue Jul 31 2008 Richard Hughes - 0.2.4-1 +- New upstream version, only bugfixes. + * Thu Jul 31 2008 Robin Norwood - 0.2.3-9 - Re-apply the gnome-packagekit-enable-kde patch - rhbz#437048 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 4 Jul 2008 13:04:52 -0000 1.21 +++ sources 31 Jul 2008 16:42:50 -0000 1.22 @@ -1 +1 @@ -eb12e6eea8413d35c033aedee61b89ee gnome-packagekit-0.2.3.tar.gz +c55b2eb9eb17156df69ed781360afeaa gnome-packagekit-0.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 16:47:37 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Thu, 31 Jul 2008 16:47:37 GMT Subject: rpms/dbus-glib/devel dbus-glib.spec,1.30,1.31 Message-ID: <200807311647.m6VGlbf8021490@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/dbus-glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21462 Modified Files: dbus-glib.spec Log Message: add URL to bug for patch 10 Index: dbus-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/dbus-glib/devel/dbus-glib.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- dbus-glib.spec 31 Jul 2008 16:42:33 -0000 1.30 +++ dbus-glib.spec 31 Jul 2008 16:47:07 -0000 1.31 @@ -26,7 +26,7 @@ BuildRequires: gettext BuildRequires: autoconf -# TODO +# https://bugs.freedesktop.org/show_bug.cgi?id=16925 Patch10: dbus-glib-0.77-bash-completion.patch # this patch requires autoreconf BuildRequires: autoconf automake libtool gettext-devel gtk-doc From fedora-extras-commits at redhat.com Thu Jul 31 17:11:24 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Thu, 31 Jul 2008 17:11:24 GMT Subject: rpms/wxGTK/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wxGTK.spec, 1.38, 1.39 wxGTK-2.8.7-race-fix.patch, 1.1, NONE Message-ID: <200807311711.m6VHBOJg028712@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28687 Modified Files: .cvsignore sources wxGTK.spec Removed Files: wxGTK-2.8.7-race-fix.patch Log Message: * Thu Jul 31 2008 Dan Horak - 2.8.8-1 - update to 2.8.8 (rh bug #457406) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wxGTK/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Feb 2008 21:39:03 -0000 1.9 +++ .cvsignore 31 Jul 2008 17:10:53 -0000 1.10 @@ -1 +1 @@ -wxGTK-2.8.7.tar.bz2 +wxGTK-2.8.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wxGTK/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Feb 2008 21:39:03 -0000 1.9 +++ sources 31 Jul 2008 17:10:53 -0000 1.10 @@ -1 +1 @@ -b25e85eeee524903214ebb520753f4bd wxGTK-2.8.7.tar.bz2 +6c73103878bd2a44b42a7b5fbb4c5605 wxGTK-2.8.8.tar.bz2 Index: wxGTK.spec =================================================================== RCS file: /cvs/pkgs/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- wxGTK.spec 1 Apr 2008 12:56:47 -0000 1.38 +++ wxGTK.spec 31 Jul 2008 17:10:53 -0000 1.39 @@ -5,8 +5,8 @@ %define withodbc 0 Name: wxGTK -Version: 2.8.7 -Release: 2%{?dist} +Version: 2.8.8 +Release: 1%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -15,7 +15,6 @@ Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2 -Patch0: wxGTK-2.8.7-race-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,7 +121,6 @@ %prep %setup -q -%patch0 -p1 -b .racefix sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure @@ -264,6 +262,9 @@ %changelog +* Thu Jul 31 2008 Dan Horak - 2.8.8-1 +- update to 2.8.8 (rh bug #457406) + * Tue Apr 1 2008 Dan Horak - 2.8.7-2 - added fix for a race condition (rh bug #440011) --- wxGTK-2.8.7-race-fix.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 17:12:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:12:03 +0000 Subject: [pkgdb] pem (Fedora EPEL, 4) updated by kevin Message-ID: <20080731171203.582CF1AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for pem Kevin Fenzi (kevin) has set commit to Approved for packager on pem (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for packager on pem (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for packager on pem (Fedora EPEL 4) Kevin Fenzi (kevin) changed owner of pem in Fedora EPEL 4 to pjp To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pem From fedora-extras-commits at redhat.com Thu Jul 31 17:12:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:12:03 GMT Subject: rpms/hping3/devel hping3-bytesex.patch,1.1,1.2 hping3.spec,1.8,1.9 Message-ID: <200807311712.m6VHC3d7028757@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hping3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28722 Modified Files: hping3-bytesex.patch hping3.spec Log Message: fix license tag hping3-bytesex.patch: Index: hping3-bytesex.patch =================================================================== RCS file: /cvs/pkgs/rpms/hping3/devel/hping3-bytesex.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hping3-bytesex.patch 26 Jul 2006 20:17:32 -0000 1.1 +++ hping3-bytesex.patch 31 Jul 2008 17:11:33 -0000 1.2 @@ -1,11 +1,12 @@ ---- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 -+++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 +diff -up bytesex.h.bytesex bytesex.h +--- bytesex.h.bytesex 2003-08-31 13:23:48.000000000 -0400 ++++ bytesex.h 2008-07-31 13:07:07.000000000 -0400 @@ -9,6 +9,8 @@ - - #if defined(__i386__) \ + + #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN - #elif defined(__mc68000__) \ + #elif defined(__mc68000__) \ Index: hping3.spec =================================================================== RCS file: /cvs/pkgs/rpms/hping3/devel/hping3.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hping3.spec 19 Feb 2008 20:09:32 -0000 1.8 +++ hping3.spec 31 Jul 2008 17:11:33 -0000 1.9 @@ -1,11 +1,11 @@ %define cvs 20051105 Name: hping3 Version: 0.0.%{cvs} -Release: 9%{?dist} +Release: 10%{?dist} Summary: TCP/IP stack auditing and much more Group: Applications/Internet -License: GPL +License: GPLv2 URL: http://www.hping.org/ Source0: http://www.hping.org/hping3-20051105.tar.gz Patch0: hping3-include.patch @@ -59,6 +59,9 @@ %{_mandir}/man8/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.0.20051105-10 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.0.20051105-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 17:13:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:13:58 GMT Subject: rpms/spin-kickstarts - New directory Message-ID: <200807311713.m6VHDwNv028987@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/spin-kickstarts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28939/rpms/spin-kickstarts Log Message: Directory /cvs/extras/rpms/spin-kickstarts added to the repository From fedora-extras-commits at redhat.com Thu Jul 31 17:13:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:13:58 GMT Subject: rpms/spin-kickstarts/devel - New directory Message-ID: <200807311713.m6VHDwLJ029001@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/spin-kickstarts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28939/rpms/spin-kickstarts/devel Log Message: Directory /cvs/extras/rpms/spin-kickstarts/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 31 17:13:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:13:51 +0000 Subject: [pkgdb] spin-kickstarts was added for kanarip Message-ID: <20080731171351.50AA01AD0EF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package spin-kickstarts with summary Kickstarts for different Spins of Fedora Kevin Fenzi (kevin) has approved Package spin-kickstarts Kevin Fenzi (kevin) has added a Fedora devel branch for spin-kickstarts with an owner of kanarip Kevin Fenzi (kevin) has approved spin-kickstarts in Fedora devel Kevin Fenzi (kevin) has approved Package spin-kickstarts Kevin Fenzi (kevin) has set commit to Approved for packager on spin-kickstarts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on spin-kickstarts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on spin-kickstarts (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on spin-kickstarts (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on spin-kickstarts (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on spin-kickstarts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/spin-kickstarts From fedora-extras-commits at redhat.com Thu Jul 31 17:13:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:13:51 +0000 Subject: [pkgdb] spin-kickstarts (Fedora, devel) updated by kevin Message-ID: <20080731171352.0782E1AD0F9@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved packager for commit access on spin-kickstarts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/spin-kickstarts From fedora-extras-commits at redhat.com Thu Jul 31 17:13:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:13:59 GMT Subject: rpms/spin-kickstarts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807311713.m6VHDxiM029039@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/spin-kickstarts/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28939/rpms/spin-kickstarts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module spin-kickstarts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: spin-kickstarts # $Id: Makefile,v 1.1 2008/07/31 17:13:59 kevin Exp $ NAME := spin-kickstarts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 31 17:13:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:13:58 GMT Subject: rpms/spin-kickstarts Makefile,NONE,1.1 Message-ID: <200807311713.m6VHDwD6029024@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/spin-kickstarts In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28939/rpms/spin-kickstarts Added Files: Makefile Log Message: Setup of module spin-kickstarts --- NEW FILE Makefile --- # Top level Makefile for module spin-kickstarts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 31 17:13:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:13:51 +0000 Subject: [pkgdb] spin-kickstarts (Fedora, 9) updated by kevin Message-ID: <20080731171352.2805D1AD0FF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for spin-kickstarts Kevin Fenzi (kevin) has set commit to Approved for packager on spin-kickstarts (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on spin-kickstarts (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on spin-kickstarts (Fedora 9) Kevin Fenzi (kevin) Approved packager for commit access on spin-kickstarts (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/spin-kickstarts From fedora-extras-commits at redhat.com Thu Jul 31 17:14:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:14:27 GMT Subject: rpms/hippo-canvas/devel hippo-canvas.spec,1.14,1.15 Message-ID: <200807311714.m6VHERk2029123@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hippo-canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28964 Modified Files: hippo-canvas.spec Log Message: fix license tag Index: hippo-canvas.spec =================================================================== RCS file: /cvs/pkgs/rpms/hippo-canvas/devel/hippo-canvas.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- hippo-canvas.spec 30 Jul 2008 15:58:00 -0000 1.14 +++ hippo-canvas.spec 31 Jul 2008 17:13:57 -0000 1.15 @@ -2,11 +2,11 @@ Name: hippo-canvas Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A canvas widget Group: System Environment/Libraries -License: GPL +License: LGPLv2 URL: http://developer.mugshot.org/wiki/Hippo_Canvas Source0: ftp://ftp.gnome.org/pub/GNOME/sources/hippo-canvas/0.2/hippo-canvas-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +87,9 @@ %{python_sitearch}/*.so %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.3.0-3 +- fix license tag + * Sun Jul 6 2008 Owen Taylor - 0.3.0-2 - Update to 0.3.0 (adds SVG support) From fedora-extras-commits at redhat.com Thu Jul 31 17:15:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:15:37 +0000 Subject: [pkgdb] drupal-cck (Fedora, devel) updated by kevin Message-ID: <20080731171537.9F56B1AD0ED@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved packager for commit access on drupal-cck (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/drupal-cck From fedora-extras-commits at redhat.com Thu Jul 31 17:15:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:15:37 +0000 Subject: [pkgdb] drupal-cck (Fedora, 9) updated by kevin Message-ID: <20080731171537.EA6AD1AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for drupal-cck Kevin Fenzi (kevin) has set commit to Approved for packager on drupal-cck (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on drupal-cck (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on drupal-cck (Fedora 9) Kevin Fenzi (kevin) Approved packager for commit access on drupal-cck (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/drupal-cck From fedora-extras-commits at redhat.com Thu Jul 31 17:15:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:15:45 GMT Subject: rpms/drupal-cck/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807311715.m6VHFjbT029315@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-cck/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29231/rpms/drupal-cck/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module drupal-cck --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: drupal-cck # $Id: Makefile,v 1.1 2008/07/31 17:15:45 kevin Exp $ NAME := drupal-cck SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 31 17:15:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:15:44 GMT Subject: rpms/drupal-cck - New directory Message-ID: <200807311715.m6VHFieX029263@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-cck In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29231/rpms/drupal-cck Log Message: Directory /cvs/extras/rpms/drupal-cck added to the repository From fedora-extras-commits at redhat.com Thu Jul 31 17:15:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:15:44 GMT Subject: rpms/drupal-cck/devel - New directory Message-ID: <200807311715.m6VHFiR1029277@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-cck/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29231/rpms/drupal-cck/devel Log Message: Directory /cvs/extras/rpms/drupal-cck/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 31 17:15:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:15:44 GMT Subject: rpms/drupal-cck Makefile,NONE,1.1 Message-ID: <200807311715.m6VHFimX029300@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/drupal-cck In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29231/rpms/drupal-cck Added Files: Makefile Log Message: Setup of module drupal-cck --- NEW FILE Makefile --- # Top level Makefile for module drupal-cck all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 31 17:15:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:15:36 +0000 Subject: [pkgdb] drupal-cck was added for limb Message-ID: <20080731171543.192E01AD0FF@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package drupal-cck with summary Allows you to create and customize fields using a web browser Kevin Fenzi (kevin) has approved Package drupal-cck Kevin Fenzi (kevin) has added a Fedora devel branch for drupal-cck with an owner of limb Kevin Fenzi (kevin) has approved drupal-cck in Fedora devel Kevin Fenzi (kevin) has approved Package drupal-cck Kevin Fenzi (kevin) has set commit to Approved for packager on drupal-cck (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on drupal-cck (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on drupal-cck (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on drupal-cck (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on drupal-cck (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on drupal-cck (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/drupal-cck From fedora-extras-commits at redhat.com Thu Jul 31 17:17:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:17:08 +0000 Subject: [pkgdb] iwl5000-firmware (Fedora, 8) updated by kevin Message-ID: <20080731171709.1DB591AD0FB@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for iwl5000-firmware Kevin Fenzi (kevin) has set commit to Approved for packager on iwl5000-firmware (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for packager on iwl5000-firmware (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for packager on iwl5000-firmware (Fedora 8) Kevin Fenzi (kevin) Approved packager for commit access on iwl5000-firmware (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware From fedora-extras-commits at redhat.com Thu Jul 31 17:17:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:17:08 +0000 Subject: [pkgdb] iwl5000-firmware (Fedora EPEL, 4) updated by kevin Message-ID: <20080731171709.087071AD0F7@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for iwl5000-firmware Kevin Fenzi (kevin) has set commit to Approved for packager on iwl5000-firmware (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for packager on iwl5000-firmware (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for packager on iwl5000-firmware (Fedora EPEL 4) Kevin Fenzi (kevin) Approved packager for commit access on iwl5000-firmware (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware From fedora-extras-commits at redhat.com Thu Jul 31 17:17:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:17:28 GMT Subject: rpms/iwl5000-firmware - New directory Message-ID: <200807311717.m6VHHSwb029450@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/iwl5000-firmware In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29422/rpms/iwl5000-firmware Log Message: Directory /cvs/extras/rpms/iwl5000-firmware added to the repository From fedora-extras-commits at redhat.com Thu Jul 31 17:17:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:17:09 +0000 Subject: [pkgdb] iwl5000-firmware (Fedora EPEL, 5) updated by kevin Message-ID: <20080731171710.2030E1AD107@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for iwl5000-firmware Kevin Fenzi (kevin) has set commit to Approved for packager on iwl5000-firmware (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for packager on iwl5000-firmware (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for packager on iwl5000-firmware (Fedora EPEL 5) Kevin Fenzi (kevin) Approved packager for commit access on iwl5000-firmware (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware From fedora-extras-commits at redhat.com Thu Jul 31 17:17:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:17:08 +0000 Subject: [pkgdb] iwl5000-firmware (Fedora, 9) updated by kevin Message-ID: <20080731171709.781F61AD101@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 9 branch for iwl5000-firmware Kevin Fenzi (kevin) has set commit to Approved for packager on iwl5000-firmware (Fedora 9) Kevin Fenzi (kevin) has set build to Approved for packager on iwl5000-firmware (Fedora 9) Kevin Fenzi (kevin) has set checkout to Approved for packager on iwl5000-firmware (Fedora 9) Kevin Fenzi (kevin) Approved packager for commit access on iwl5000-firmware (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware From fedora-extras-commits at redhat.com Thu Jul 31 17:17:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:17:08 +0000 Subject: [pkgdb] iwl5000-firmware (Fedora, devel) updated by kevin Message-ID: <20080731171709.E7F161AD104@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved packager for commit access on iwl5000-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware From fedora-extras-commits at redhat.com Thu Jul 31 17:17:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:17:28 GMT Subject: rpms/iwl5000-firmware Makefile,NONE,1.1 Message-ID: <200807311717.m6VHHSOK029487@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/iwl5000-firmware In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29422/rpms/iwl5000-firmware Added Files: Makefile Log Message: Setup of module iwl5000-firmware --- NEW FILE Makefile --- # Top level Makefile for module iwl5000-firmware all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Thu Jul 31 17:17:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:17:29 GMT Subject: rpms/iwl5000-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200807311717.m6VHHTDa029502@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/iwl5000-firmware/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29422/rpms/iwl5000-firmware/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module iwl5000-firmware --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: iwl5000-firmware # $Id: Makefile,v 1.1 2008/07/31 17:17:29 kevin Exp $ NAME := iwl5000-firmware SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Jul 31 17:17:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 31 Jul 2008 17:17:28 GMT Subject: rpms/iwl5000-firmware/devel - New directory Message-ID: <200807311717.m6VHHSOC029464@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/iwl5000-firmware/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse29422/rpms/iwl5000-firmware/devel Log Message: Directory /cvs/extras/rpms/iwl5000-firmware/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 31 17:17:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 31 Jul 2008 17:17:07 +0000 Subject: [pkgdb] iwl5000-firmware was added for kwizart Message-ID: <20080731171713.E23E71AD109@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package iwl5000-firmware with summary Firmware for Intel? PRO/Wireless 5000 A/G/N network adaptors Kevin Fenzi (kevin) has approved Package iwl5000-firmware Kevin Fenzi (kevin) has added a Fedora devel branch for iwl5000-firmware with an owner of kwizart Kevin Fenzi (kevin) has approved iwl5000-firmware in Fedora devel Kevin Fenzi (kevin) has approved Package iwl5000-firmware Kevin Fenzi (kevin) has set commit to Approved for packager on iwl5000-firmware (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for packager on iwl5000-firmware (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for packager on iwl5000-firmware (Fedora devel) Kevin Fenzi (kevin) has set commit to Approved for uberpackager on iwl5000-firmware (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for uberpackager on iwl5000-firmware (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for uberpackager on iwl5000-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iwl5000-firmware From fedora-extras-commits at redhat.com Thu Jul 31 17:18:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:18:36 GMT Subject: rpms/hplip/devel hplip.spec,1.181,1.182 Message-ID: <200807311718.m6VHIaVe029765@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hplip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728 Modified Files: hplip.spec Log Message: fix license tag Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- hplip.spec 28 Jul 2008 15:36:42 -0000 1.181 +++ hplip.spec 31 Jul 2008 17:18:05 -0000 1.182 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 2.8.6b -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -80,7 +80,7 @@ %package -n libsane-hpaio Summary: SANE driver for scanners in HP's multi-function devices Group: System Environment/Daemons -License: GPL +License: GPLv2+ Obsoletes: libsane-hpoj <= 0.91 Requires: sane-backends Requires: %{name} = %{version}-%{release} @@ -291,6 +291,9 @@ exit 0 %changelog +* Thu Jul 31 2008 Tom "spot" Callaway 2.8.6b-2 +- fix license tag + * Mon Jul 28 2008 Tim Waugh 2.8.6b-1 - 2.8.6b. From fedora-extras-commits at redhat.com Thu Jul 31 17:21:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:21:34 GMT Subject: rpms/hspell/devel hspell.spec,1.12,1.13 Message-ID: <200807311721.m6VHLYpu029972@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29950 Modified Files: hspell.spec Log Message: fix license tag Index: hspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/hspell/devel/hspell.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- hspell.spec 14 May 2008 22:04:14 -0000 1.12 +++ hspell.spec 31 Jul 2008 17:21:04 -0000 1.13 @@ -1,10 +1,11 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz -License: GPL +# No version specified. +License: GPL+ Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -101,6 +102,9 @@ %{_datadir}/myspell/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 1.0-10 +- fix license tag + * Wed May 14 2008 Caolan McNamara - 1.0-9 - Resolves: rhbz#313231 build hspell.so instead of a .a From fedora-extras-commits at redhat.com Thu Jul 31 17:24:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:24:15 GMT Subject: rpms/ht2html/devel ht2html.spec,1.3,1.4 Message-ID: <200807311724.m6VHOFaI030161@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ht2html/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30115 Modified Files: ht2html.spec Log Message: fix license tag Index: ht2html.spec =================================================================== RCS file: /cvs/pkgs/rpms/ht2html/devel/ht2html.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ht2html.spec 7 May 2008 09:11:14 -0000 1.3 +++ ht2html.spec 31 Jul 2008 17:23:45 -0000 1.4 @@ -1,15 +1,11 @@ -%define name ht2html -%define version 2.0 -%define release 5 - -Name: %{name} -Version: %{version} -Release: %{release}%{?dist} +Name: ht2html +Version: 2.0 +Release: 6%{?dist} URL: http://ht2html.sourceforge.net Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name} Source2: %{name}-LICENSE -License: Python Software Foundation License +License: Python Group: System Environment/Libraries Summary: The www.python.org Web site generator BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,6 +56,9 @@ %{_bindir}/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway 2.0-6 +- fix license tag + * Wed Sep 06 2006 Igor Foox 2.0-5 - Remove ghosting of pyo files as per new Fedora Guidelines. From fedora-extras-commits at redhat.com Thu Jul 31 17:27:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:27:16 GMT Subject: rpms/html-xml-utils/devel html-xml-utils.spec,1.3,1.4 Message-ID: <200807311727.m6VHRGBa030321@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/html-xml-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30284 Modified Files: html-xml-utils.spec Log Message: fix license tag Index: html-xml-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/html-xml-utils/devel/html-xml-utils.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- html-xml-utils.spec 19 Feb 2008 03:56:30 -0000 1.3 +++ html-xml-utils.spec 31 Jul 2008 17:26:46 -0000 1.4 @@ -1,10 +1,11 @@ Name: html-xml-utils Version: 3.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A number of simple utilities for manipulating HTML and XML files Group: Development/Tools -License: GPL +# No version specified, only COPYING. +License: GPL+ URL: http://www.w3.org/Tools/HTML-XML-utils/ Source0: http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +41,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 3.7-6 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 3.7-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 17:28:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:28:06 GMT Subject: rpms/hulahop/devel hulahop.spec,1.1,1.2 Message-ID: <200807311728.m6VHS6k2030411@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hulahop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30381 Modified Files: hulahop.spec Log Message: fix license tag Index: hulahop.spec =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/devel/hulahop.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hulahop.spec 16 May 2008 16:14:45 -0000 1.1 +++ hulahop.spec 31 Jul 2008 17:27:36 -0000 1.2 @@ -2,11 +2,11 @@ Name: hulahop Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A pygtk widget for embedding mozilla Group: System Environment/Libraries -License: LGPL +License: LGPLv2+ URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/hulahop-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +47,9 @@ %{python_sitelib}/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.4.0-3 +- fix license tag + * Fri Jan 11 2008 Marco Pesenti Gritti - 0.4.0-2 - Rebuild From fedora-extras-commits at redhat.com Thu Jul 31 17:29:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:29:10 GMT Subject: rpms/hunt/devel hunt.spec,1.11,1.12 Message-ID: <200807311729.m6VHTAve030516@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/hunt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30474 Modified Files: hunt.spec Log Message: fix license tag Index: hunt.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunt/devel/hunt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hunt.spec 21 Jun 2008 15:00:41 -0000 1.11 +++ hunt.spec 31 Jul 2008 17:28:40 -0000 1.12 @@ -3,8 +3,8 @@ Summary: Tool for demonstrating well known weaknesses in the TCP/IP protocol suite Name: hunt Version: 1.5 -Release: %release_func 7 -License: GPL +Release: %release_func 8 +License: GPLv2 Group: Applications/Internet Source: http://lin.fsid.cvut.cz/~kra/hunt/%name-%version.tgz Patch0: hunt-1.5-arridx.patch @@ -69,6 +69,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 1.5-8 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1.5-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 17:35:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:35:01 GMT Subject: rpms/ibmasm/devel ibmasm.spec,1.3,1.4 Message-ID: <200807311735.m6VHZ1oe030946@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ibmasm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30895 Modified Files: ibmasm.spec Log Message: fix license tag Index: ibmasm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibmasm/devel/ibmasm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ibmasm.spec 25 Mar 2008 02:58:27 -0000 1.3 +++ ibmasm.spec 31 Jul 2008 17:34:31 -0000 1.4 @@ -1,8 +1,8 @@ Summary: IBM Advanced System Management Drivers Name: ibmasm Version: 3.0 -Release: 14 -License: LGPL +Release: 15%{?dist} +License: LGPLv2 and GPLv2+ Group: Applications/System URL: http://ibmasm.sourceforge.net Source0: ibmasm_user_%{version}.tar.bz2 @@ -91,6 +91,9 @@ %{_includedir}/ibmasm/ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway 3.0-15 +- fix license tag + * Mon Mar 24 2008 Adam Jackson 3.0-14 - Fix the tarball name to not vary with %%release. From fedora-extras-commits at redhat.com Thu Jul 31 17:40:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:40:49 GMT Subject: rpms/icecast/devel .cvsignore, 1.2, 1.3 icecast.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200807311740.m6VHeno8031370@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/icecast/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31312 Modified Files: .cvsignore icecast.spec sources Log Message: update to 2.3.2, fix license tag Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/icecast/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Feb 2006 07:23:04 -0000 1.2 +++ .cvsignore 31 Jul 2008 17:40:19 -0000 1.3 @@ -1 +1 @@ -icecast-2.3.1.tar.gz +icecast-2.3.2.tar.gz Index: icecast.spec =================================================================== RCS file: /cvs/pkgs/rpms/icecast/devel/icecast.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- icecast.spec 19 Feb 2008 05:16:17 -0000 1.5 +++ icecast.spec 31 Jul 2008 17:40:19 -0000 1.6 @@ -1,16 +1,15 @@ Summary: ShoutCast compatible streaming media server Name: icecast -Version: 2.3.1 -Release: 5%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Group: Applications/Multimedia -License: GPL +License: GPLv2 URL: http://www.icecast.org/ Source0: http://downloads.xiph.org/releases/icecast/icecast-%{version}.tar.gz Source1: status3.xsl Source2: icecast.init Source3: icecast.logrotate Source4: icecast.xml -Patch1: icecast-curl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: streaming-server @@ -37,7 +36,6 @@ %prep %setup -q -%patch1 -p1 -b .curl find -name "*.html" -or -name "*.jpg" -or -name "*.css" | xargs chmod 644 %{__sed} -i -e 's/icecast2/icecast/g' debian/icecast2.1 @@ -109,6 +107,10 @@ %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast %changelog +* Thu Jul 31 2008 Tom "spot" Callaway 2.3.2-1 +- update to 2.3.2 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 2.3.1-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/icecast/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Feb 2006 07:23:04 -0000 1.2 +++ sources 31 Jul 2008 17:40:19 -0000 1.3 @@ -1 +1 @@ -2d80a249fa8529f82d018c6216108ea8 icecast-2.3.1.tar.gz +ff516b3ccd2bcc31e68f460cd316093f icecast-2.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 17:41:24 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 17:41:24 GMT Subject: rpms/drupal-cck/devel drupal-cck-fedora-README.txt, NONE, 1.1 drupal-cck.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200807311741.m6VHfOx5031479@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal-cck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31374/devel Modified Files: .cvsignore sources Added Files: drupal-cck-fedora-README.txt drupal-cck.spec import.log Log Message: Initial import. --- NEW FILE drupal-cck-fedora-README.txt --- After installation, you must enable this module from the drupal administration. If upgrading this module seperately from the core drupal package, be sure to run the http://hostname/drupal/upgrade.php script after this rpm is upgraded. --- NEW FILE drupal-cck.spec --- %define drupaldir %{_datadir}/drupal Name: drupal-cck Version: 6.x.2.0 Release: 2.rc4%{?dist} Summary: Allows you create and customize fields using a web browser Group: Applications/Publishing License: GPLv2 URL: http://drupal.org/project/cck Source0: http://ftp.drupal.org/files/projects/cck-6.x-2.0-rc4.tar.gz Source1: drupal-cck-fedora-README.txt BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: drupal >= 6.0 %description The Content Construction Kit allows you create and customize fields using a web browser. The 4.7x version of CCK creates custom content types and allows you to add custom fields to them. In Drupal 5.x custom content types can be created in core, and CCK allows you to add custom fields to any content type. %prep %setup -qn cck %build chmod -x content.module cp %{SOURCE1} . %install rm -rf %{buildroot} install -d %{buildroot}%{drupaldir}/modules/cck cp -pr * %{buildroot}%{drupaldir}/modules/cck %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt drupal-cck-fedora-README.txt UPGRADE.txt DEVELOPER.txt CHANGELOG.txt %exclude %{drupaldir}/modules/cck/CHANGELOG.txt %exclude %{drupaldir}/modules/cck/DEVELOPER.txt %exclude %{drupaldir}/modules/cck/LICENSE.txt %exclude %{drupaldir}/modules/cck/README.txt %exclude %{drupaldir}/modules/cck/UPGRADE.txt %exclude %{drupaldir}/modules/cck/drupal-cck-fedora-README.txt %{drupaldir}/modules/cck %changelog * Wed Jul 30 2008 Jon Ciesla - 6.x.2.0-2.rc4 - Another %%doc fix. * Tue Jul 29 2008 Jon Ciesla - 6.x.2.0-1.rc4 - %%doc fix. * Tue Jul 29 2008 Jon Ciesla - 6.x.2.0-0.rc4 - Update to new release. * Mon Jun 16 2008 Jon Ciesla - 6.x.2.0-0.beta - Updated for Drupal 6.x. * Tue Oct 30 2007 Jon Ciesla - 1.6-1 - Initial packaging. --- NEW FILE import.log --- drupal-cck-6_x_2_0-2_rc4_fc9:HEAD:drupal-cck-6.x.2.0-2.rc4.fc9.src.rpm:1217526039 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drupal-cck/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Jul 2008 17:15:45 -0000 1.1 +++ .cvsignore 31 Jul 2008 17:40:54 -0000 1.2 @@ -0,0 +1 @@ +cck-6.x-2.0-rc4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal-cck/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Jul 2008 17:15:45 -0000 1.1 +++ sources 31 Jul 2008 17:40:54 -0000 1.2 @@ -0,0 +1 @@ +b0805a344cdee93fa0d9388160c5fac2 cck-6.x-2.0-rc4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 17:44:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:44:07 GMT Subject: rpms/ices/devel ices.spec,1.6,1.7 Message-ID: <200807311744.m6VHi715031668@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ices/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31634 Modified Files: ices.spec Log Message: fix license tag Index: ices.spec =================================================================== RCS file: /cvs/pkgs/rpms/ices/devel/ices.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ices.spec 19 Feb 2008 05:17:09 -0000 1.6 +++ ices.spec 31 Jul 2008 17:43:36 -0000 1.7 @@ -1,9 +1,9 @@ Name: ices Version: 2.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Source streaming for Icecast Group: System Environment/Daemons -License: GPL +License: GPLv2 URL: http://www.icecast.org Source0: http://downloads.us.xiph.org/releases/ices/ices-%{version}.tar.bz2 Source1: ices.init @@ -79,6 +79,9 @@ %attr(0770,root,ices) %{_var}/log/ices %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 2.0.1-7 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 2.0.1-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 17:46:49 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 31 Jul 2008 17:46:49 GMT Subject: rpms/hplip/devel hplip.spec,1.182,1.183 Message-ID: <200807311746.m6VHkn7g031885@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31866 Modified Files: hplip.spec Log Message: * Thu Jul 31 2008 Tim Waugh - Move libhpip.so* to the main package to avoid libsane-hpaio depending on hpijs (bug #457440). Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- hplip.spec 31 Jul 2008 17:18:05 -0000 1.182 +++ hplip.spec 31 Jul 2008 17:46:19 -0000 1.183 @@ -177,6 +177,7 @@ %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi %dir %{_sysconfdir}/hp %config(noreplace) %{_sysconfdir}/hp/hplip.conf +%{_libdir}/libhpip.so* %{_bindir}/hp-align %{_bindir}/hp-clean %{_bindir}/hp-colorcal @@ -256,7 +257,6 @@ %files -n hpijs %defattr(-,root,root) -%{_libdir}/libhpip.so* %{_libdir}/libhpmud.so* %{_bindir}/hpijs %{_datadir}/foomatic/db/source/PPD/HP @@ -291,6 +291,10 @@ exit 0 %changelog +* Thu Jul 31 2008 Tim Waugh +- Move libhpip.so* to the main package to avoid libsane-hpaio + depending on hpijs (bug #457440). + * Thu Jul 31 2008 Tom "spot" Callaway 2.8.6b-2 - fix license tag From fedora-extras-commits at redhat.com Thu Jul 31 17:52:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:52:23 GMT Subject: rpms/idioskopos/devel idioskopos.spec,1.5,1.6 Message-ID: <200807311752.m6VHqNkD032128@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/idioskopos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32090 Modified Files: idioskopos.spec Log Message: fix license tag Index: idioskopos.spec =================================================================== RCS file: /cvs/pkgs/rpms/idioskopos/devel/idioskopos.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- idioskopos.spec 19 Feb 2008 22:53:00 -0000 1.5 +++ idioskopos.spec 31 Jul 2008 17:51:52 -0000 1.6 @@ -1,8 +1,8 @@ Summary: C++ introspection library Name: idioskopos Version: 0.4.1 -Release: 2%{?dist} -License: LGPL +Release: 3%{?dist} +License: LGPLv2 URL: http://idioskopos.sourceforge.net/ Group: System Environment/Libraries Source: http://download.sourceforge.net/idioskopos/idioskopos-0.4.1.tar.bz2 @@ -67,6 +67,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.4.1-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 17:54:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:54:25 GMT Subject: rpms/ifm/devel ifm.spec,1.5,1.6 Message-ID: <200807311754.m6VHsPp9032237@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ifm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32209 Modified Files: ifm.spec Log Message: fix license tag Index: ifm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ifm/devel/ifm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ifm.spec 18 Feb 2008 22:27:20 -0000 1.5 +++ ifm.spec 31 Jul 2008 17:53:55 -0000 1.6 @@ -1,10 +1,10 @@ Name: ifm Version: 5.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Interactive Fiction Mapper Group: Amusements/Games -License: GPL +License: GPLv2+ URL: http://www.sentex.net/~dchapes/ifm/ Source0: http://www.ifarchive.org/if-archive/mapping-tools/ifm-%{version}.tar.gz Source1: ifm.vim @@ -62,6 +62,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 5.1-7 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 5.1-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 17:55:36 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 31 Jul 2008 17:55:36 GMT Subject: rpms/eclipse/devel eclipse.spec,1.569,1.570 sources,1.62,1.63 Message-ID: <200807311755.m6VHta1n032395@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32333 Modified Files: eclipse.spec sources Log Message: * Thu Jul 31 2008 Andrew Overholt 3.4.0-12 - Set product to Fedora Eclipse Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.569 retrieving revision 1.570 diff -u -r1.569 -r1.570 --- eclipse.spec 31 Jul 2008 12:18:10 -0000 1.569 +++ eclipse.spec 31 Jul 2008 17:55:05 -0000 1.570 @@ -1,5 +1,5 @@ # TODO: -# - update splash screen +# - get someone to update the splash screen properly # - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 # - update ecj-rpmdebuginfo patch # - look at startup script and launcher patches @@ -27,7 +27,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 11%{?dist} +Release: 12%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -956,6 +956,12 @@ sed -i "s|$RPM_BUILD_ROOT||g" *.profile/* popd +# Set eclipse.product to org.fedoraproject.ide.platform +sed --in-place "s/plugins\/org.eclipse.platform/plugins\/org.fedoraproject.ide.platform/" \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini +sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.fedoraproject.ide.platform.product/" \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini + # Install the Eclipse binary wrapper install -d -m 755 $RPM_BUILD_ROOT%{_bindir} ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name} @@ -1442,6 +1448,9 @@ %{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Thu Jul 31 2008 Andrew Overholt 3.4.0-12 +- Set product to Fedora Eclipse + * Wed Jul 30 2008 Andrew Overholt 3.4.0-11 - Update copy-platform to work with dropins - Update JVM-crashing patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 21 Jul 2008 17:13:43 -0000 1.62 +++ sources 31 Jul 2008 17:55:05 -0000 1.63 @@ -2,5 +2,5 @@ 28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip 611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2 555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip -0c56e7120a4b1906dc019d313586d36f org.fedoraproject.ide.platform-3.4.0-1.zip 485f281cd968bf30d5266dc254004b1e eclipse-ecj-gcj.tar.bz2 +3b057b12f346de131bf7039965ca0c2e org.fedoraproject.ide.platform-3.4.0-1.zip From fedora-extras-commits at redhat.com Thu Jul 31 17:55:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 17:55:46 GMT Subject: rpms/ike-scan/devel ike-scan.spec,1.3,1.4 Message-ID: <200807311755.m6VHtk3V032453@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ike-scan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32362 Modified Files: ike-scan.spec Log Message: fix license tag Index: ike-scan.spec =================================================================== RCS file: /cvs/pkgs/rpms/ike-scan/devel/ike-scan.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ike-scan.spec 20 Feb 2008 00:15:28 -0000 1.3 +++ ike-scan.spec 31 Jul 2008 17:55:16 -0000 1.4 @@ -1,10 +1,10 @@ Name: ike-scan Version: 1.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: IKE protocol tool to discover, fingerprint and test IPsec VPN servers Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://www.nta-monitor.com/tools/ike-scan/ Source0: http://www.nta-monitor.com/tools/ike-scan/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,6 +44,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 1.9-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 1.9-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 18:16:05 2008 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Thu, 31 Jul 2008 18:16:05 GMT Subject: rpms/wxPython/devel .cvsignore, 1.11, 1.12 sources, 1.9, 1.10 wxPython.spec, 1.25, 1.26 Message-ID: <200807311816.m6VIG5Im007476@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7449 Modified Files: .cvsignore sources wxPython.spec Log Message: * Thu Jul 31 2008 Matthew Miller - 2.8.8.0-1 - update to 2.8.8.0 (bug #457408) - a fix for bug #450073 is included in the upstream release, so dropping that patch. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 Apr 2008 18:04:11 -0000 1.11 +++ .cvsignore 31 Jul 2008 18:15:34 -0000 1.12 @@ -1 +1 @@ -wxPython-src-2.8.7.1.tar.bz2 +wxPython-src-2.8.8.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Feb 2008 21:27:04 -0000 1.9 +++ sources 31 Jul 2008 18:15:34 -0000 1.10 @@ -1 +1 @@ -04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 +87b974dda37e7ae4ac25a0d0c94ec8a5 wxPython-src-2.8.8.0.tar.bz2 Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- wxPython.spec 12 Jun 2008 21:57:54 -0000 1.25 +++ wxPython.spec 31 Jul 2008 18:15:34 -0000 1.26 @@ -4,8 +4,8 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.7.1 -Release: 5%{?dist} +Version: 2.8.8.0 +Release: 1%{?dist} Summary: GUI toolkit for the Python programming language @@ -13,10 +13,9 @@ License: LGPL URL: http://www.wxpython.org/ Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 -Patch0: wxPython-src-2.8.7.1-bug450073.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # make sure to keep this updated as appropriate -BuildRequires: wxGTK-devel >= 2.8.7 +BuildRequires: wxGTK-devel >= 2.8.8 BuildRequires: pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel @@ -50,7 +49,6 @@ %prep %setup -q -n wxPython-src-%{version} -%patch0 -p1 %build @@ -103,6 +101,11 @@ %changelog +* Thu Jul 31 2008 Matthew Miller - 2.8.8.0-1 +- update to 2.8.8.0 (bug #457408) +- a fix for bug #450073 is included in the upstream release, so + dropping that patch. + * Thu Jun 12 2008 Hans de Goede - 2.8.7.1-5 - Fix an attribute error when importing wxPython (compat) module (redhat bugzilla 450073, 450074) From fedora-extras-commits at redhat.com Thu Jul 31 18:21:03 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 18:21:03 GMT Subject: rpms/bacula/devel .cvsignore, 1.4, 1.5 bacula.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200807311821.m6VIL3wI007593@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/bacula/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7562 Modified Files: .cvsignore bacula.spec sources Log Message: 2.4.2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Jul 2008 13:52:01 -0000 1.4 +++ .cvsignore 31 Jul 2008 18:20:33 -0000 1.5 @@ -1,2 +1,2 @@ -bacula-2.2.8.tar.gz -bacula-docs-2.2.8.tar.bz2 +bacula-2.4.2.tar.gz +bacula-docs-2.4.2.tar.bz2 Index: bacula.spec =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bacula.spec 30 Jul 2008 19:16:21 -0000 1.10 +++ bacula.spec 31 Jul 2008 18:20:33 -0000 1.11 @@ -8,8 +8,8 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula -Version: 2.2.8 -Release: 2%{?dist} +Version: 2.4.2 +Release: 1%{?dist} # See LICENSE for details License: GPLv2 with exceptions Group: System Environment/Daemons @@ -922,6 +922,9 @@ %changelog +* Thu Jul 31 2008 Jon Ciesla - 2.4.2-1 +- Update to 2.4.2. + * Wed Jul 30 2008 Andreas Thienemann - 2.2.8-2 - Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bacula/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jul 2008 13:52:01 -0000 1.3 +++ sources 31 Jul 2008 18:20:33 -0000 1.4 @@ -1,2 +1,2 @@ -4547d0bf9f976d5d9ea5f21a7bd078ee bacula-2.2.8.tar.gz -9cc38ace92d52c7bebbbfc2ed5507b79 bacula-docs-2.2.8.tar.bz2 +3ba8700b8274223f803ad49418568c2a bacula-2.4.2.tar.gz +c94a05581fe0ae660293c69fb71a6f8c bacula-docs-2.4.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 18:33:45 2008 From: fedora-extras-commits at redhat.com (Colin Walters (walters)) Date: Thu, 31 Jul 2008 18:33:45 GMT Subject: rpms/jna/devel .cvsignore, 1.2, 1.3 jna.spec, 1.1, 1.2 sources, 1.2, 1.3 jna-3.0.2-dynlink-and-cflags.patch, 1.1, NONE Message-ID: <200807311833.m6VIXjQx008209@cvs-int.fedora.redhat.com> Author: walters Update of /cvs/pkgs/rpms/jna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8188 Modified Files: .cvsignore jna.spec sources Removed Files: jna-3.0.2-dynlink-and-cflags.patch Log Message: * Thu Jul 31 2008 Colin Walters - 3.0.4-1.svn630 - New upstream version, drop upstreamed patch parts - New patch jna-3.0.4-nomixedjar.patch which ensures that we don't include the .so in the .jar Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jna/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Apr 2008 23:46:58 -0000 1.2 +++ .cvsignore 31 Jul 2008 18:33:15 -0000 1.3 @@ -1 +1 @@ -jna-3.0.2.tar.bz2 +jna-3.0.4.svn630.tar.bz2 Index: jna.spec =================================================================== RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jna.spec 4 Apr 2008 23:46:58 -0000 1.1 +++ jna.spec 31 Jul 2008 18:33:15 -0000 1.2 @@ -1,6 +1,6 @@ Name: jna -Version: 3.0.2 -Release: 7%{?dist} +Version: 3.0.4 +Release: 1.svn630%{?dist} Summary: Pure Java access to native libraries Group: Development/Libraries @@ -10,12 +10,12 @@ # following commands to generate the tarball: # svn export https://jna.dev.java.net/svn/jna/tags/%{version}/jnalib/ --username guest jna-%{version} # tar -cjf jna-%{version}.tar.bz2 jna-%{version} -Source0: %{name}-%{version}.tar.bz2 -# https://jna.dev.java.net/issues/show_bug.cgi?id=60 -Patch0: jna-3.0.2-dynlink-and-cflags.patch +Source0: %{name}-%{version}.svn630.tar.bz2 # This patch is Fedora-specific for now until we get the huge # JNI library location mess sorted upstream Patch1: jna-3.0.2-loadlibrary.patch +# Will send upstream... +Patch2: jna-3.0.4-nomixedjar.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1.6 ant jpackage-utils ant-nodeps @@ -44,9 +44,9 @@ %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 +%setup -q -n %{name}-%{version}-svn630 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1 +%patch2 -p1 # all java binaries must be removed from the sources find . -name '*.jar' -exec rm -f '{}' \; @@ -74,13 +74,13 @@ rm -rf %{buildroot} # jars -install -D -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +install -D -m 644 build-*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done) # NOTE: JNA has highly custom code to look for native jars in this # directory. Since this roughly matches the jpackage guidelines, # we'll leave it unchanged. install -d -m 755 %{buildroot}%{_libdir}/%{name} -install -m 755 build/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ +install -m 755 build-*/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ # javadocs install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} @@ -103,6 +103,11 @@ %changelog +* Thu Jul 31 2008 Colin Walters - 3.0.4-1.svn630 +- New upstream version, drop upstreamed patch parts +- New patch jna-3.0.4-nomixedjar.patch which ensures that we don't + include the .so in the .jar + * Fri Apr 04 2008 Colin Walters - 3.0.2-7 - Add patch to use JPackage-compatible JNI library path - Do build debuginfo package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jna/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Apr 2008 23:46:58 -0000 1.2 +++ sources 31 Jul 2008 18:33:15 -0000 1.3 @@ -1 +1 @@ -4f177e179adfdb3c2289c6f36445809f jna-3.0.2.tar.bz2 +2a90fbade80d2a86d5cc967c5529cd34 jna-3.0.4.svn630.tar.bz2 --- jna-3.0.2-dynlink-and-cflags.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 18:35:12 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Thu, 31 Jul 2008 18:35:12 GMT Subject: rpms/drupal-cck/F-9 drupal-cck-fedora-README.txt, NONE, 1.1 drupal-cck.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200807311835.m6VIZCCg008306@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/drupal-cck/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8279 Modified Files: sources Added Files: drupal-cck-fedora-README.txt drupal-cck.spec Log Message: Initial import. --- NEW FILE drupal-cck-fedora-README.txt --- After installation, you must enable this module from the drupal administration. If upgrading this module seperately from the core drupal package, be sure to run the http://hostname/drupal/upgrade.php script after this rpm is upgraded. --- NEW FILE drupal-cck.spec --- %define drupaldir %{_datadir}/drupal Name: drupal-cck Version: 6.x.2.0 Release: 2.rc4%{?dist} Summary: Allows you create and customize fields using a web browser Group: Applications/Publishing License: GPLv2 URL: http://drupal.org/project/cck Source0: http://ftp.drupal.org/files/projects/cck-6.x-2.0-rc4.tar.gz Source1: drupal-cck-fedora-README.txt BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: drupal >= 6.0 %description The Content Construction Kit allows you create and customize fields using a web browser. The 4.7x version of CCK creates custom content types and allows you to add custom fields to them. In Drupal 5.x custom content types can be created in core, and CCK allows you to add custom fields to any content type. %prep %setup -qn cck %build chmod -x content.module cp %{SOURCE1} . %install rm -rf %{buildroot} install -d %{buildroot}%{drupaldir}/modules/cck cp -pr * %{buildroot}%{drupaldir}/modules/cck %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt drupal-cck-fedora-README.txt UPGRADE.txt DEVELOPER.txt CHANGELOG.txt %exclude %{drupaldir}/modules/cck/CHANGELOG.txt %exclude %{drupaldir}/modules/cck/DEVELOPER.txt %exclude %{drupaldir}/modules/cck/LICENSE.txt %exclude %{drupaldir}/modules/cck/README.txt %exclude %{drupaldir}/modules/cck/UPGRADE.txt %exclude %{drupaldir}/modules/cck/drupal-cck-fedora-README.txt %{drupaldir}/modules/cck %changelog * Wed Jul 30 2008 Jon Ciesla - 6.x.2.0-2.rc4 - Another %%doc fix. * Tue Jul 29 2008 Jon Ciesla - 6.x.2.0-1.rc4 - %%doc fix. * Tue Jul 29 2008 Jon Ciesla - 6.x.2.0-0.rc4 - Update to new release. * Mon Jun 16 2008 Jon Ciesla - 6.x.2.0-0.beta - Updated for Drupal 6.x. * Tue Oct 30 2007 Jon Ciesla - 1.6-1 - Initial packaging. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drupal-cck/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Jul 2008 17:15:45 -0000 1.1 +++ sources 31 Jul 2008 18:34:42 -0000 1.2 @@ -0,0 +1 @@ +b0805a344cdee93fa0d9388160c5fac2 cck-6.x-2.0-rc4.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 18:37:56 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Thu, 31 Jul 2008 18:37:56 GMT Subject: rpms/eclipse/devel eclipse.spec,1.570,1.571 Message-ID: <200807311837.m6VIbuFI008472@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8421 Modified Files: eclipse.spec Log Message: * Thu Jul 31 2008 Andrew Overholt 3.4.0-12 - Remove pde-runtime %package section - Remove unnecessary Requires(post,postun)s Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.570 retrieving revision 1.571 diff -u -r1.570 -r1.571 --- eclipse.spec 31 Jul 2008 17:55:05 -0000 1.570 +++ eclipse.spec 31 Jul 2008 18:37:25 -0000 1.571 @@ -212,8 +212,6 @@ # FIXME: investigate. Can we just add a %{arch} to the above? ## This file-level requirement is for the bi-arch multilib case #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar -Requires(post): %{name}-swt = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-swt = %{epoch}:%{version}-%{release} Requires: icu4j-eclipse >= 3.6.1-1jpp.4 Requires: java >= 1.6.0 @@ -227,8 +225,6 @@ # FIXME: investigate. Can we just add a %{arch} to the above? ## This file-level requirement is for the bi-arch multilib case #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar -Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in # Fedora. When that's done, add it here and symlink below. # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 @@ -259,10 +255,6 @@ Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} -Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post): %{name}-ecj = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release} Requires: junit >= 3.8.1-3jpp Requires: junit4 Requires: java-javadoc @@ -278,13 +270,6 @@ Provides: eclipse Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} -Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release} -Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release} -Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release} Requires: objectweb-asm # For PDE Build wrapper script Requires: bash @@ -297,16 +282,6 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. -%package pde-runtime -Summary: Eclipse Plugin Development Environment runtime plugin. -Group: Text Editors/Integrated Development Environments (IDE) -Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} - -%description pde-runtime -Eclipse Plugin Development Environment runtime plugin (org.eclipse.pde.runtime). - %prep %setup -q -c @@ -1450,6 +1425,8 @@ %changelog * Thu Jul 31 2008 Andrew Overholt 3.4.0-12 - Set product to Fedora Eclipse +- Remove pde-runtime %%package section +- Remove unnecessary Requires(post,postun)s * Wed Jul 30 2008 Andrew Overholt 3.4.0-11 - Update copy-platform to work with dropins From fedora-extras-commits at redhat.com Thu Jul 31 18:38:25 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 18:38:25 GMT Subject: rpms/digikam/devel .cvsignore, 1.22, 1.23 digikam.spec, 1.60, 1.61 sources, 1.22, 1.23 Message-ID: <200807311838.m6VIcPD3008537@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/digikam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8453 Modified Files: .cvsignore digikam.spec sources Log Message: * Thu Jul 31 2008 Rex Dieter - 0.10.0-0.1.beta2 - digikam-0.10.0-beta2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 17 Jul 2008 12:13:49 -0000 1.22 +++ .cvsignore 31 Jul 2008 18:37:55 -0000 1.23 @@ -1 +1 @@ -digikam-0.9.4.tar.bz2 +digikam-0.10.0-beta2.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- digikam.spec 18 Jul 2008 17:46:07 -0000 1.60 +++ digikam.spec 31 Jul 2008 18:37:55 -0000 1.61 @@ -1,37 +1,47 @@ +%define beta beta2 -Name: digikam -Version: 0.9.4 -Release: 2%{?dist} -Summary: A digital camera accessing & photo management application - -Group: Applications/Multimedia -License: GPLv2+ -URL: http://www.digikam.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: kdelibs3-devel +Name: digikam +Version: 0.10.0 +Release: 0.1.%{beta}%{?dist} +Summary: A digital camera accessing & photo management application + +Group: Applications/Multimedia +License: GPLv2+ +URL: http://www.digikam.org/ +Source0: http://digikam3rdparty.free.fr/0.10.x-releases/digikam-%{version}%{?beta:-%{beta}}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: digikam-0.10.0-beta2-man1.patch + +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: gettext %if 0%{?fedora} > 9 -BuildRequires: libgphoto2-devel +BuildRequires: libgphoto2-devel %else -BuildRequires: gphoto2-devel +BuildRequires: gphoto2-devel %endif -BuildRequires: jasper-devel -BuildRequires: libkdcraw-devel >= 0.1.4 -BuildRequires: libkexiv2-devel >= 0.1.7 -BuildRequires: libkipi-devel >= 0.1.6 -BuildRequires: lcms-devel -BuildRequires: libtiff-devel -BuildRequires: libpng-devel >= 1.2.7 -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libtool-ltdl-devel -%endif -BuildRequires: sqlite-devel - -Provides: digikamimageplugins = %{version}-%{release} -Obsoletes: digikamimageplugins < 0.9.1-2 +## switch to this when kdegraphics is ready -- Rex +#BuildRequires: libkdcraw-devel >= 0.2.0 +#BuildRequires: libkexiv2-devel >= 0.2.0 +#BuildRequires: libkipi-devel >= 0.2.0 +BuildRequires: jasper-devel +BuildRequires: kdeedu4-devel +BuildRequires: kdegraphics4-devel >= 4.1.0 +BuildRequires: kdelibs4-devel +BuildRequires: kdepimlibs-devel +BuildRequires: lcms-devel +## TODO +#BuildRequires: liblensfun-devel +BuildRequires: libtiff-devel +BuildRequires: libpng-devel >= 1.2.7 +BuildRequires: sqlite-devel + +Obsoletes: digikamimageplugins < 0.9.1-2 + +Requires: %{name}-libs = %{version}-%{release} +Requires(post): xdg-utils +Requires(postun): xdg-utils %description digiKam is an easy to use and powerful digital photo management application, @@ -45,11 +55,17 @@ manipulations, import and export, etc. Install the kipi-plugins packages to use them. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +%package libs +Summary: Runtime libraries for %{name} +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} %description devel This package contains the libraries, include files and other resources needed to develop applications using %{name}. @@ -58,96 +74,83 @@ %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} +%patch1 -p1 -b .man1 + %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -%configure \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-debug \ - --disable-warnings \ - --disable-dependency-tracking \ - --enable-final \ - --without-included-sqlite3 +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} .. +popd -make %{?_smp_mflags} +make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ - --add-category Photography \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop + --dir=%{buildroot}%{_datadir}/applications/kde4 \ + --add-category="Photography" \ + $RPM_BUILD_ROOT%{_datadir}/applications/kde4/digikam.desktop desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ - --add-category Photography \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \ + --add-category="Photography" \ + %{buildroot}%{_datadir}/applications/kde4/showfoto.desktop %find_lang %{name} || touch %{name}.lang -rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la - -# Create symlinks in pixmaps directory -# FIXME: this shouldn't be necessary anymore -- Rex -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -ln -sf ../icons/hicolor/48x48/apps/digikam.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/digikam.png -ln -sf ../icons/hicolor/48x48/apps/showfoto.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/showfoto.png %post -/sbin/ldconfig -update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun -/sbin/ldconfig -update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO -%{_bindir}/* -%{_libdir}/libdigikam.so.* -%{_libdir}/kde3/digikamimageplugin_*.la -%{_libdir}/kde3/digikamimageplugin_*.so -%{_libdir}/kde3/kio_digikam*.la -%{_libdir}/kde3/kio_digikam*.so -%{_datadir}/applications/kde/*.desktop -%{_datadir}/apps/digikam/ -%{_datadir}/apps/konqueror/servicemenus/*.desktop -%{_datadir}/apps/showfoto/ -%{_datadir}/icons/hicolor/*/*/* +%{_kde4_bindir}/* +%{_kde4_libdir}/kde4/*.so +%{_kde4_appsdir}/digikam/ +%{_kde4_appsdir}/showfoto/ +%{_kde4_datadir}/applications/kde4/*.desktop +%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/oxygen/*/*/* %{_mandir}/man1/*.1* -%{_datadir}/pixmaps/*.png -%{_datadir}/services/digikam* -%{_datadir}/servicetypes/digikamimageplugin.desktop +%{_kde4_datadir}/kde4/services/* +%{_kde4_datadir}/kde4/servicetypes/* + +%files libs +%defattr(-,root,root,-) +%{_kde4_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) -%{_includedir}/digikam/ -%{_includedir}/digikam_export.h -%{_libdir}/libdigikam.so +%{_kde4_includedir}/digikam/ +%{_kde4_includedir}/digikam_export.h +%{_kde4_libdir}/lib*.so %changelog +* Thu Jul 31 2008 Rex Dieter - 0.10.0-0.1.beta2 +- digikam-0.10.0-beta2 + * Fri Jul 18 2008 Rex Dieter - 0.9.4-2 - --without-included-sqlite3, BR: sqlite-devel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 17 Jul 2008 12:13:49 -0000 1.22 +++ sources 31 Jul 2008 18:37:55 -0000 1.23 @@ -1 +1 @@ -b0f3fa00bd054b0497146e6ce24dab7c digikam-0.9.4.tar.bz2 +40b6b9164438c320f9d4b9869ed8ea5e digikam-0.10.0-beta2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 18:53:16 2008 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Thu, 31 Jul 2008 18:53:16 GMT Subject: rpms/testdisk/F-9 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 testdisk.spec, 1.22, 1.23 Message-ID: <200807311853.m6VIrGom009164@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9100 Modified Files: .cvsignore sources testdisk.spec Log Message: Update TestDisk & PhotoRec to version 6.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 19 Mar 2008 07:26:27 -0000 1.11 +++ .cvsignore 31 Jul 2008 18:52:46 -0000 1.12 @@ -1,2 +1,2 @@ -testdisk-6.9.tar.bz2 -testdisk69_libewf.patch +testdisk-6.10.tar.bz2 +testdisk-doc-6.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 19 Mar 2008 07:50:14 -0000 1.12 +++ sources 31 Jul 2008 18:52:46 -0000 1.13 @@ -1,2 +1,2 @@ -c16de07b1e0cf0cd0ccdd58fe2ff89f8 testdisk-6.9.tar.bz2 -3f28dbac662d32bfb8ece9da3b1f106b testdisk69_libewf.patch +d3bde0b546d40e029dda4e9861db40ef testdisk-6.10.tar.bz2 +9f850f4657777add0a063a2bccc219fd testdisk-doc-6.10.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-9/testdisk.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- testdisk.spec 19 Mar 2008 07:26:27 -0000 1.22 +++ testdisk.spec 31 Jul 2008 18:52:46 -0000 1.23 @@ -3,20 +3,22 @@ Summary(fr.UTF8): Outil pour v??rifier et restorer des partitions Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.9 -Release: 2%{?dist} +Version: 6.10 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 -Patch0: testdisk69_libewf.patch +Source1: http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2 URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel BuildRequires: libjpeg-devel %ifnarch ppc ppc64 +# See https://bugzilla.redhat.com/show_bug.cgi?id=407151 BuildRequires: ntfsprogs-devel %endif BuildRequires: libewf-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -40,9 +42,43 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS +%package doc +Summary: TestDisk & PhotoRec documentation +Group: Documentation +Requires: testdisk = %{version}-%{release} + +%description doc +Tool to check and undelete partition. Works with FAT12, FAT16, FAT32, +NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, +LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l pl.UTF8 +Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l fr.UTF8 +Outil pour v??rifier et restorer des partitions. Fonctionne avec +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +Ce paquet contient la documentation de testdisk & photorec. + +%description doc -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + %prep %setup -q -%patch0 -p1 -b .list +%setup -q -a 1 %build %configure @@ -56,12 +92,20 @@ %files %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc +%doc AUTHORS COPYING ChangeLog NEWS README THANKS %attr(755,root,root) %{_sbindir}/testdisk %attr(755,root,root) %{_sbindir}/photorec %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* + +%files doc +%defattr(644,root,root,755) +%doc doc + %changelog +* Thu Jul 31 2008 Christophe Grenier 6.10-1 +- Update to latest version + * Wed Mar 19 2008 Christophe Grenier 6.9-2 - Fix for new API in libewf > 20070512 From fedora-extras-commits at redhat.com Thu Jul 31 19:18:45 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Thu, 31 Jul 2008 19:18:45 GMT Subject: rpms/pygobject2/F-8 .cvsignore, 1.12, 1.13 pygobject2.spec, 1.30, 1.31 sources, 1.12, 1.13 Message-ID: <200807311918.m6VJIjTb016837@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygobject2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16792 Modified Files: .cvsignore pygobject2.spec sources Log Message: * Thu Jul 31 2008 Matthew Barnes - 2.14.2-1.fc8 - Update to 2.14.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/F-8/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 16 Sep 2007 22:06:00 -0000 1.12 +++ .cvsignore 31 Jul 2008 19:18:15 -0000 1.13 @@ -1 +1 @@ -pygobject-2.14.0.tar.bz2 +pygobject-2.14.2.tar.bz2 Index: pygobject2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/F-8/pygobject2.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- pygobject2.spec 16 Sep 2007 22:06:00 -0000 1.30 +++ pygobject2.spec 31 Jul 2008 19:18:15 -0000 1.31 @@ -8,7 +8,7 @@ ### Abstract ### Name: pygobject2 -Version: 2.14.0 +Version: 2.14.2 Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages @@ -97,6 +97,9 @@ %{_datadir}/pygobject/xsl %changelog +* Thu Jul 31 2008 Matthew Barnes - 2.14.2-1.fc8 +- Update to 2.14.2 + * Sun Sep 16 2007 Matthew Barnes - 2.14.0-1.fc8 - Update to 2.14.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/F-8/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 16 Sep 2007 22:06:00 -0000 1.12 +++ sources 31 Jul 2008 19:18:15 -0000 1.13 @@ -1 +1 @@ -de781a21f483c941a73009a9f68f150e pygobject-2.14.0.tar.bz2 +0e9e9300e81847f4f7266f49d3bebbaf pygobject-2.14.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 19:19:44 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 31 Jul 2008 19:19:44 GMT Subject: rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash, 1.1, 1.2 Message-ID: <200807311919.m6VJJioc016970@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16939 Modified Files: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash Log Message: fix up Index: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash 30 Jul 2008 14:16:59 -0000 1.1 +++ openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash 31 Jul 2008 19:19:13 -0000 1.2 @@ -21,23 +21,16 @@ diff -u -r1.38 TableWindow.cxx --- openoffice.org.orig/dbaccess/source/ui/querydesign/TableWindow.cxx 21 Nov 2007 17:11:47 -0000 1.38 +++ openoffice.org/dbaccess/source/ui/querydesign/TableWindow.cxx 30 Jul 2008 14:05:20 -0000 -@@ -171,13 +173,18 @@ - { - DBG_DTOR(OTableWindow,NULL); - - if (m_pListBox) - { - OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); +@@ -177,7 +177,11 @@ ::std::auto_ptr aTemp(m_pListBox); m_pListBox = NULL; } - m_pAccessible = NULL; -+ if ( m_pAccessible ) -+ { -+ m_pAccessible->clearTable(); -+ m_pAccessible = NULL; -+ } -+ ++ if ( m_pAccessible ) ++ { ++ m_pAccessible->clearTable(); ++ m_pAccessible = NULL; ++ } } // ----------------------------------------------------------------------------- const OJoinTableView* OTableWindow::getTableView() const From fedora-extras-commits at redhat.com Thu Jul 31 19:21:04 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Thu, 31 Jul 2008 19:21:04 GMT Subject: rpms/plymouth/devel plymouth.spec,1.22,1.23 Message-ID: <200807311921.m6VJL4cJ017067@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/plymouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17030 Modified Files: plymouth.spec Log Message: * Thu Jul 31 2008 Peter Jones - Make it a mkinitrd requires instead of a nash requires (that will still pull in nash, but we need mkinitrd for newer plymouth-populate-initrd) Index: plymouth.spec =================================================================== RCS file: /cvs/extras/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plymouth.spec 30 Jul 2008 13:53:21 -0000 1.22 +++ plymouth.spec 31 Jul 2008 19:20:34 -0000 1.23 @@ -13,7 +13,7 @@ Requires: system-logos >= 9.0.1 Requires: system-plymouth-plugin >= %{version}-%{release} -Requires: nash +Requires: mkinitrd Patch0: plymouth-0.5.0-fix-ppc.patch Patch1: restore-color-palette.patch @@ -178,6 +178,10 @@ %{_libdir}/plymouth/spinfinity.so %changelog +* Thu Jul 31 2008 Peter Jones +- Make it a mkinitrd requires instead of a nash requires (that will + still pull in nash, but we need mkinitrd for newer plymouth-populate-initrd) + * Wed Jul 30 2008 Ray Strode - 0.5.0-6 - Add nash requires From fedora-extras-commits at redhat.com Thu Jul 31 19:21:57 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Thu, 31 Jul 2008 19:21:57 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-java-access-bridge-idlj.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.67, 1.68 Message-ID: <200807311921.m6VJLvjJ017183@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17101 Modified Files: java-1.6.0-openjdk.spec Added Files: java-1.6.0-openjdk-java-access-bridge-idlj.patch Log Message: * Thu Jul 31 2008 Lillian Angel 1:1.6.0-0.20.b11 - Added java-access-bridge idlj patch. Temp workaround for bug similar to: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6708395. java-1.6.0-openjdk-java-access-bridge-idlj.patch: --- NEW FILE java-1.6.0-openjdk-java-access-bridge-idlj.patch --- --- oldjava-access-bridge-1.23.0/idlgen/Makefile.am 2008-06-03 02:47:29.000000000 -0400 +++ java-access-bridge-1.23.0/idlgen/Makefile.am 2008-07-31 15:13:26.000000000 -0400 @@ -3,7 +3,7 @@ JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES) CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class) JAR=jar -IDLJ_FLAGS=-emitAll $(IDLJ_IDLDIRS) +IDLJ_FLAGS=-J-client -emitAll $(IDLJ_IDLDIRS) BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl) BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl) --- oldjava-access-bridge-1.23.0/idlgen/Makefile.in 2008-06-23 23:34:59.000000000 -0400 +++ java-access-bridge-1.23.0/idlgen/Makefile.in 2008-07-31 15:13:45.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,7 +140,7 @@ SUBDIRS = org JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES) CLASSES = $(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class) -IDLJ_FLAGS = -emitAll $(IDLJ_IDLDIRS) +IDLJ_FLAGS = -J-client -emitAll $(IDLJ_IDLDIRS) BONOBO_ACT_IDLFILES = $(wildcard $(BONOBO_ACT_IDLDIR)/*.idl) BONOBO_IDLFILES = $(wildcard $(BONOBO_IDLDIR)/*.idl) AT_SPI_IDLFILES = $(wildcard $(AT_SPI_IDLDIR)/*.idl) @@ -253,8 +253,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -279,8 +279,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -290,13 +290,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- java-1.6.0-openjdk.spec 28 Jul 2008 14:08:15 -0000 1.67 +++ java-1.6.0-openjdk.spec 31 Jul 2008 19:21:27 -0000 1.68 @@ -138,7 +138,8 @@ # applications. Patch0: java-1.6.0-openjdk-optflags.patch Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch -Patch2: java-1.6.0-openjdk-makefile.patch +Patch2: java-1.6.0-openjdk-makefile.patch +Patch3: java-1.6.0-openjdk-java-access-bridge-idlj.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -365,6 +366,7 @@ # Build Java Access Bridge for GNOME. pushd java-access-bridge-%{accessver} patch -l -p1 < %{PATCH1} + patch -l -p1 < %{PATCH3} OLD_PATH=$PATH export PATH=$JAVA_HOME/bin:$OLD_PATH ./configure @@ -899,6 +901,10 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Thu Jul 31 2008 Lillian Angel 1:1.6.0-0.20.b11 +- Added java-access-bridge idlj patch. Temp workaround for bug similar to: +http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6708395. + * Mon Jul 28 2008 Lillian Angel - 1:1.6.0-0.20.b11 - Removed freetype patch. From fedora-extras-commits at redhat.com Thu Jul 31 19:21:59 2008 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Thu, 31 Jul 2008 19:21:59 GMT Subject: rpms/testdisk/F-8 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 testdisk.spec, 1.16, 1.17 Message-ID: <200807311921.m6VJLxnl017188@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16774 Modified Files: .cvsignore sources testdisk.spec Log Message: Update TestDisk & PhotoRec to version 6.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-8/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 14 Feb 2008 18:58:46 -0000 1.10 +++ .cvsignore 31 Jul 2008 19:21:29 -0000 1.11 @@ -1 +1,2 @@ -testdisk-6.9.tar.bz2 +testdisk-6.10.tar.bz2 +testdisk-doc-6.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-8/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 14 Feb 2008 18:58:46 -0000 1.10 +++ sources 31 Jul 2008 19:21:29 -0000 1.11 @@ -1 +1,2 @@ -c16de07b1e0cf0cd0ccdd58fe2ff89f8 testdisk-6.9.tar.bz2 +d3bde0b546d40e029dda4e9861db40ef testdisk-6.10.tar.bz2 +9f850f4657777add0a063a2bccc219fd testdisk-doc-6.10.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/F-8/testdisk.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- testdisk.spec 14 Feb 2008 18:58:46 -0000 1.16 +++ testdisk.spec 31 Jul 2008 19:21:29 -0000 1.17 @@ -3,17 +3,19 @@ Summary(fr.UTF8): Outil pour v??rifier et restorer des partitions Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.9 +Version: 6.10 Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 +Source1: http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2 URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel BuildRequires: libjpeg-devel BuildRequires: ntfsprogs-devel BuildRequires: libewf-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -37,8 +39,43 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS +%package doc +Summary: TestDisk & PhotoRec documentation +Group: Documentation +Requires: testdisk = %{version}-%{release} + +%description doc +Tool to check and undelete partition. Works with FAT12, FAT16, FAT32, +NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, +LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l pl.UTF8 +Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l fr.UTF8 +Outil pour v??rifier et restorer des partitions. Fonctionne avec +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +Ce paquet contient la documentation de testdisk & photorec. + +%description doc -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + %prep %setup -q +%setup -q -a 1 %build %configure @@ -52,12 +89,20 @@ %files %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc +%doc AUTHORS COPYING ChangeLog NEWS README THANKS %attr(755,root,root) %{_sbindir}/testdisk %attr(755,root,root) %{_sbindir}/photorec %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* + +%files doc +%defattr(644,root,root,755) +%doc doc + %changelog +* Thu Jul 31 2008 Christophe Grenier 6.10-1 +- Update to latest version + * Thu Feb 14 2008 Christophe Grenier 6.9-1 - Update to latest version From fedora-extras-commits at redhat.com Thu Jul 31 19:36:35 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 19:36:35 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.65,1.66 Message-ID: <200807311936.m6VJaZxi017638@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17600 Modified Files: ktorrent.spec Log Message: fix changelog to match Release: tag Index: ktorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- ktorrent.spec 13 Jul 2008 20:19:50 -0000 1.65 +++ ktorrent.spec 31 Jul 2008 19:36:05 -0000 1.66 @@ -116,7 +116,7 @@ %{_kde4_datadir}/kde4/apps/cmake/modules/FindBTCore.cmake %changelog -* Sun Jul 13 2008 Roland Wolters - 3.1-1 +* Sun Jul 13 2008 Roland Wolters - 3.1-5 - Update to version 3.1 * Wed May 14 2008 Roland Wolters - 3.0.2-3 From fedora-extras-commits at redhat.com Thu Jul 31 19:39:04 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 19:39:04 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.66,1.67 Message-ID: <200807311939.m6VJd4X3017751@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17715 Modified Files: ktorrent.spec Log Message: BR: kdelibs4-devel >= 4.1 Index: ktorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- ktorrent.spec 31 Jul 2008 19:36:05 -0000 1.66 +++ ktorrent.spec 31 Jul 2008 19:38:34 -0000 1.67 @@ -8,7 +8,7 @@ Source0: http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs4-devel >= 4 +BuildRequires: kdelibs4-devel >= 4.1 BuildRequires: avahi-devel BuildRequires: cmake BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Thu Jul 31 19:39:45 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 31 Jul 2008 19:39:45 GMT Subject: rpms/ktorrent/devel ktorrent.spec,1.67,1.68 Message-ID: <200807311939.m6VJdj1N017803@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17757 Modified Files: ktorrent.spec Log Message: +Requires: kdelibs4 >= 4.1 too Index: ktorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- ktorrent.spec 31 Jul 2008 19:38:34 -0000 1.67 +++ ktorrent.spec 31 Jul 2008 19:39:15 -0000 1.68 @@ -18,6 +18,7 @@ BuildRequires: pcre-devel BuildRequires: gmp-devel +Requires: kdelibs4 >= 4.1 Requires(post): xdg-utils Requires(postun): xdg-utils From fedora-extras-commits at redhat.com Thu Jul 31 19:45:04 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Thu, 31 Jul 2008 19:45:04 GMT Subject: rpms/firstboot/devel .cvsignore, 1.91, 1.92 firstboot.spec, 1.124, 1.125 sources, 1.121, 1.122 Message-ID: <200807311945.m6VJj42Y018041@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/firstboot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18010 Modified Files: .cvsignore firstboot.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- .cvsignore 13 May 2008 18:19:41 -0000 1.91 +++ .cvsignore 31 Jul 2008 19:44:34 -0000 1.92 @@ -63,3 +63,4 @@ firstboot-1.96.tar.bz2 firstboot-1.97.tar.bz2 firstboot-1.98.tar.bz2 +firstboot-1.99.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- firstboot.spec 13 May 2008 18:19:41 -0000 1.124 +++ firstboot.spec 31 Jul 2008 19:44:34 -0000 1.125 @@ -3,7 +3,7 @@ Summary: Initial system configuration utility Name: firstboot URL: http://fedoraproject.org/wiki/FirstBoot -Version: 1.98 +Version: 1.99 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -70,6 +70,13 @@ %{_datadir}/firstboot/themes/default/* %changelog +* Thu Jul 31 2008 Chris Lumens 1.99-1 +- Enable the correct keyboard layout (#453228). +- Remove the timezone tab from the default date & time module (#442394). +- Raise NotImplementedError instead of TypeError. +- Allow modules to focus a UI element before they are displayed (#457422). +- Lots of updated translations. + * Tue May 13 2008 Chris Lumens 1.98-1 - Remove the rhgb interface. - Use subprocess for starting X instead of rhpxl. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- sources 13 May 2008 18:19:41 -0000 1.121 +++ sources 31 Jul 2008 19:44:34 -0000 1.122 @@ -1 +1 @@ -0bcd84b112666edb9eff562b40075dd8 firstboot-1.98.tar.bz2 +8883a4e5b1eb6ddc121741b467fd3760 firstboot-1.99.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 31 19:45:54 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Thu, 31 Jul 2008 19:45:54 GMT Subject: rpms/plymouth/devel plymouth.spec, 1.23, 1.24 sources, 1.9, 1.10 find-right-libdir.patch, 1.1, NONE plymouth-0.5.0-fix-ppc.patch, 1.1, NONE restore-color-palette.patch, 1.1, NONE Message-ID: <200807311945.m6VJjsR1018166@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18047 Modified Files: plymouth.spec sources Removed Files: find-right-libdir.patch plymouth-0.5.0-fix-ppc.patch restore-color-palette.patch Log Message: - Update to snapshot to get new plymouth-populate-initrd features - Make removing rhgb use details plugin instead of exiting Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- plymouth.spec 31 Jul 2008 19:20:34 -0000 1.23 +++ plymouth.spec 31 Jul 2008 19:45:24 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth Version: 0.5.0 -Release: 6%{?dist} +Release: 8.2008.07.31%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -70,10 +70,6 @@ %prep %setup -q -%patch0 -p1 -b .fix-ppc -%patch1 -p1 -b .restore-color-palette -%patch2 -p1 -b .find-right-libdir - %build %configure --enable-tracing --disable-tests --without-boot-entry \ --without-default-plugin \ @@ -178,7 +174,11 @@ %{_libdir}/plymouth/spinfinity.so %changelog -* Thu Jul 31 2008 Peter Jones +* Thu Jul 31 2008 Ray Strode - 0.5.0-8.2008.07.31 +- Update to snapshot to get new plymouth-populate-initrd features +- Make removing rhgb use details plugin instead of exiting + +* Thu Jul 31 2008 Peter Jones - 0.5.0-7 - Make it a mkinitrd requires instead of a nash requires (that will still pull in nash, but we need mkinitrd for newer plymouth-populate-initrd) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 1 Jul 2008 19:27:11 -0000 1.9 +++ sources 31 Jul 2008 19:45:24 -0000 1.10 @@ -1 +1 @@ -1b76f4b0e7a819b8ae8ac04f172ce073 plymouth-0.5.0.tar.bz2 +7aef22c0883d0ffb4a3488a7b4ff1cc1 plymouth-0.5.0.tar.bz2 --- find-right-libdir.patch DELETED --- --- plymouth-0.5.0-fix-ppc.patch DELETED --- --- restore-color-palette.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 31 19:48:26 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Thu, 31 Jul 2008 19:48:26 GMT Subject: rpms/plymouth/devel plymouth.spec,1.24,1.25 Message-ID: <200807311948.m6VJmQ75018311@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18278 Modified Files: plymouth.spec Log Message: Drop defunct patch lines Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- plymouth.spec 31 Jul 2008 19:45:24 -0000 1.24 +++ plymouth.spec 31 Jul 2008 19:47:56 -0000 1.25 @@ -15,10 +15,6 @@ Requires: system-plymouth-plugin >= %{version}-%{release} Requires: mkinitrd -Patch0: plymouth-0.5.0-fix-ppc.patch -Patch1: restore-color-palette.patch -Patch2: find-right-libdir.patch - %description Plymouth provides an attractive graphical boot animation in place of the text messages that normally get shown. Text From fedora-extras-commits at redhat.com Thu Jul 31 19:48:11 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Thu, 31 Jul 2008 19:48:11 GMT Subject: rpms/kernel/devel kernel.spec, 1.827, 1.828 linux-2.6-compile-fixes.patch, 1.173, 1.174 Message-ID: <200807311948.m6VJmBx7018306@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18257 Modified Files: kernel.spec linux-2.6-compile-fixes.patch Log Message: Fix PPC64 build. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.827 retrieving revision 1.828 diff -u -r1.827 -r1.828 --- kernel.spec 31 Jul 2008 12:26:55 -0000 1.827 +++ kernel.spec 31 Jul 2008 19:47:40 -0000 1.828 @@ -1711,6 +1711,9 @@ %changelog * Thu Jul 31 2008 Dave Jones +- Fix PPC64 build. + +* Thu Jul 31 2008 Dave Jones - 2.6.27-rc1-git2 * Wed Jul 30 2008 Dave Jones linux-2.6-compile-fixes.patch: Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- linux-2.6-compile-fixes.patch 30 Jul 2008 21:39:43 -0000 1.173 +++ linux-2.6-compile-fixes.patch 31 Jul 2008 19:47:40 -0000 1.174 @@ -5,3 +5,136 @@ # to do a compile to figure out what your diff is fixing. Thanks. # +On Tue, 29 Jul 2008 13:56:52 +1000 +Stephen Rothwell wrote: + +> Hi, +> +> On Tue, 29 Jul 2008 10:46:31 +0900 FUJITA Tomonori wrote: +> > +> > > So, I assume a patch created on July 25 is not destined for 2.6.27, +> > +> > Hmm, seems that they will go into 2.6.27: +> > +> > http://marc.info/?l=linux-kernel&m=121729275722287&w=2 +> > +> > +> > > right? Especially since it breaks another architecture build and has +> > > only made it to linux-next on July 29 ... and needs more work given the +> > > comments already on this patch. +> > +> > It doesn't break another architecture build since only x86 IOMMUs use +> > the helper function. But as I pointed out, it doesn't work for some +> > architectures. +> +> Um, did you see the linux-next build report I posted (possibly not): +> +> arch/powerpc/kernel/iommu.c:56: error: static declaration of 'iommu_num_pages' follows non-static declaration +> include/linux/iommu-helper.h:11: error: previous declaration of 'iommu_num_pages' was here +> +> This is now a build of 2.6.27-rc1 for powerpc64 ppc64_defconfig ... + +Ah, really sorry. Yeah, it breaks POWER and SPARC builds. + + +> So we have a patch first posted to lkml on July 25 first hits linux-next +> on July 29 and is no in Linus' tree on July 29. A grep would have found +> the problem. +> +> More care required ... + +Agreed... As I said before, this is not urgent at all so we didn't +need to rush. + + +A fix has already been posted? + +== +From: FUJITA Tomonori +Subject: [PATCH] move iommu_num_pages helper to x86 + +This IOMMU helper function doesn't work for some architectures: + +http://marc.info/?l=linux-kernel&m=121699304403202&w=2 + +It also breaks POWER and SPARC builds: + +http://marc.info/?l=linux-kernel&m=121730388001890&w=2 + +Currently, only x86 IOMMUs use this so let's move it to x86 for +now. + +Reported-by: Stephen Rothwell +Signed-off-by: FUJITA Tomonori +--- + arch/x86/kernel/pci-dma.c | 8 ++++++++ + include/asm-x86/iommu.h | 2 ++ + include/linux/iommu-helper.h | 1 - + lib/iommu-helper.c | 8 -------- + 4 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c +index 8dbffb8..87d4d69 100644 +--- a/arch/x86/kernel/pci-dma.c ++++ b/arch/x86/kernel/pci-dma.c +@@ -123,6 +123,14 @@ void __init pci_iommu_alloc(void) + + pci_swiotlb_init(); + } ++ ++unsigned long iommu_num_pages(unsigned long addr, unsigned long len) ++{ ++ unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE); ++ ++ return size >> PAGE_SHIFT; ++} ++EXPORT_SYMBOL(iommu_num_pages); + #endif + + /* +diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h +index ecc8061..5f888cc 100644 +--- a/include/asm-x86/iommu.h ++++ b/include/asm-x86/iommu.h +@@ -7,6 +7,8 @@ extern struct dma_mapping_ops nommu_dma_ops; + extern int force_iommu, no_iommu; + extern int iommu_detected; + ++extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len); ++ + #ifdef CONFIG_GART_IOMMU + extern int gart_iommu_aperture; + extern int gart_iommu_aperture_allowed; +diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h +index f8598f5..c975caf 100644 +--- a/include/linux/iommu-helper.h ++++ b/include/linux/iommu-helper.h +@@ -8,4 +8,3 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size, + unsigned long align_mask); + extern void iommu_area_free(unsigned long *map, unsigned long start, + unsigned int nr); +-extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len); +diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c +index 889ddce..a3b8d4c 100644 +--- a/lib/iommu-helper.c ++++ b/lib/iommu-helper.c +@@ -80,11 +80,3 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr) + } + } + EXPORT_SYMBOL(iommu_area_free); +- +-unsigned long iommu_num_pages(unsigned long addr, unsigned long len) +-{ +- unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE); +- +- return size >> PAGE_SHIFT; +-} +-EXPORT_SYMBOL(iommu_num_pages); +-- +1.5.5.GIT + +-- +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +Please read the FAQ at http://www.tux.org/lkml/ \ No newline at end of file From fedora-extras-commits at redhat.com Thu Jul 31 20:09:47 2008 From: fedora-extras-commits at redhat.com (Colin Walters (walters)) Date: Thu, 31 Jul 2008 20:09:47 GMT Subject: rpms/jna/devel jna-3.0.4-nomixedjar.patch,NONE,1.1 Message-ID: <200807312009.m6VK9lM5025884@cvs-int.fedora.redhat.com> Author: walters Update of /cvs/pkgs/rpms/jna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25875 Added Files: jna-3.0.4-nomixedjar.patch Log Message: add patch jna-3.0.4-nomixedjar.patch: --- NEW FILE jna-3.0.4-nomixedjar.patch --- diff -ur jna-3.0.4.orig/build.xml jna-3.0.4-svn630/build.xml --- jna-3.0.4.orig/build.xml 2008-07-31 13:44:34.000000000 -0400 +++ jna-3.0.4-svn630/build.xml 2008-07-31 14:08:58.000000000 -0400 @@ -348,17 +348,7 @@ - - - - - - - - + @@ -369,6 +359,20 @@ + + + + + + + + + + + From fedora-extras-commits at redhat.com Thu Jul 31 20:21:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 20:21:33 GMT Subject: rpms/ingo/devel ingo.spec,1.5,1.6 Message-ID: <200807312021.m6VKLXGA026322@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ingo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26280 Modified Files: ingo.spec Log Message: fix license tag Index: ingo.spec =================================================================== RCS file: /cvs/pkgs/rpms/ingo/devel/ingo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ingo.spec 22 Jun 2008 03:43:22 -0000 1.5 +++ ingo.spec 31 Jul 2008 20:21:03 -0000 1.6 @@ -1,11 +1,11 @@ Name: ingo Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Horde web-based Email Filter Rules Manager Source0: ftp://ftp.horde.org/pub/%{name}/%{name}-h3-%{version}.tar.gz Group: Applications/Internet -License: Apache Software License 1.0 +License: ASL 1.0 URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -88,6 +88,9 @@ %{_datadir}/horde/%{name} %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 1.2-2 +- fix license tag + * Wed May 28 2008 Nigel Jones - 1.2-1 - New Upstream (1.2) & Spec file cleanups From fedora-extras-commits at redhat.com Thu Jul 31 20:23:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 20:23:54 GMT Subject: rpms/initng/devel initng.spec,1.19,1.20 logfilemode.patch,1.1,1.2 Message-ID: <200807312023.m6VKNslM026491@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26445 Modified Files: initng.spec logfilemode.patch Log Message: fix license tag Index: initng.spec =================================================================== RCS file: /cvs/pkgs/rpms/initng/devel/initng.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- initng.spec 19 Feb 2008 00:12:22 -0000 1.19 +++ initng.spec 31 Jul 2008 20:23:24 -0000 1.20 @@ -1,8 +1,8 @@ Summary: Programs which control basic system processes Name: initng Version: 0.6.10.2 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2+ URL: http://www.initng.org Group: System Environment/Base Source0: http://download.initng.org/%{name}/v0.6/%{name}-%{version}.tar.bz2 @@ -119,6 +119,9 @@ /%{_lib}/libngcclient.so %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.6.10.2-3 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.6.10.2-2 - Autorebuild for GCC 4.3 logfilemode.patch: Index: logfilemode.patch =================================================================== RCS file: /cvs/pkgs/rpms/initng/devel/logfilemode.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logfilemode.patch 15 Aug 2007 18:00:07 -0000 1.1 +++ logfilemode.patch 31 Jul 2008 20:23:24 -0000 1.2 @@ -1,9 +1,12 @@ ---- plugins/logfile/initng_logfile.c (from 0.6.10.1) -+++ plugins/logfile/initng_logfile.c (fixed version) -@@ -74,3 +74,3 @@ - - /* open the file */ -- fd = open(filename, O_WRONLY | O_CREAT | O_APPEND); -+ fd = open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644); - if (fd < 1) - { +diff -up plugins/logfile/initng_logfile.c.logfilemode plugins/logfile/initng_logfile.c +--- plugins/logfile/initng_logfile.c.logfilemode 2007-01-10 17:36:32.000000000 -0500 ++++ plugins/logfile/initng_logfile.c 2008-07-31 16:21:11.000000000 -0400 +@@ -71,7 +71,7 @@ static int program_output(s_event * even + filename_fixed = fix_variables(filename, data->service); + + /* open the file */ +- fd = open(filename, O_WRONLY | O_CREAT | O_APPEND); ++ fd = open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644); + if (fd < 1) + { + F_("Error opening %s, err : %s\n", filename, strerror(errno)); From fedora-extras-commits at redhat.com Thu Jul 31 20:26:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 20:26:32 GMT Subject: rpms/initng-ifiles/devel initng-ifiles.spec,1.14,1.15 Message-ID: <200807312026.m6VKQWGK026664@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/initng-ifiles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26647 Modified Files: initng-ifiles.spec Log Message: fix license tag Index: initng-ifiles.spec =================================================================== RCS file: /cvs/pkgs/rpms/initng-ifiles/devel/initng-ifiles.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- initng-ifiles.spec 16 Apr 2008 18:44:58 -0000 1.14 +++ initng-ifiles.spec 31 Jul 2008 20:26:02 -0000 1.15 @@ -1,8 +1,8 @@ Summary: Scripts for initng Name: initng-ifiles Version: 0.1.5 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2 and LGPLv2+ URL: http://www.initng.org Group: System Environment/Base Source0: http://download.initng.org/%{name}/v0.1/%{name}-%{version}.tar.bz2 @@ -105,6 +105,9 @@ %{_mandir}/*/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.1.5-2 +- fix license tag + * Sun Apr 13 2008 Daniel Malmgren - 0.1.5-1 - New upstreams version - Removed patches that are now upstreams From fedora-extras-commits at redhat.com Thu Jul 31 20:27:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 20:27:45 GMT Subject: rpms/international-time/devel international-time.spec,1.5,1.6 Message-ID: <200807312027.m6VKRjJ4026782@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/international-time/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26748 Modified Files: international-time.spec Log Message: fix license tag Index: international-time.spec =================================================================== RCS file: /cvs/pkgs/rpms/international-time/devel/international-time.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- international-time.spec 14 Sep 2007 16:24:09 -0000 1.5 +++ international-time.spec 31 Jul 2008 20:27:15 -0000 1.6 @@ -1,8 +1,9 @@ Summary: A tool for arranging times in advance with overseas colleagues Name: international-time Version: 0.0.2 -Release: 4%{?dist} -License: GPL +Release: 5%{?dist} +# No attribution, just COPYING +License: GPL+ Group: Applications/System Source0: http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2 Patch0: international-time-current-time.patch @@ -68,6 +69,9 @@ %{_datadir}/applications/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway 0.0.2-5 +- fix license tag + * Fri Sep 14 2007 Tim Waugh 0.0.2-4 - Use the current time (bug #291151). From fedora-extras-commits at redhat.com Thu Jul 31 20:29:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 20:29:54 GMT Subject: rpms/intltool/devel intltool.spec,1.47,1.48 Message-ID: <200807312029.m6VKTsse026950@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/intltool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26883 Modified Files: intltool.spec Log Message: fix license tag Index: intltool.spec =================================================================== RCS file: /cvs/pkgs/rpms/intltool/devel/intltool.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- intltool.spec 25 Jul 2008 21:11:39 -0000 1.47 +++ intltool.spec 31 Jul 2008 20:29:24 -0000 1.48 @@ -4,8 +4,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.3 -Release: 1%{?dist} -License: GPLv2 with exception +Release: 2%{?dist} +License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org @@ -50,6 +50,9 @@ %{_mandir}/man*/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.40.3-2 +- fix license tag + * Fri Jul 25 2008 Matthias Clasen - 0.40.3-1 - Update to 0.40.3 From fedora-extras-commits at redhat.com Thu Jul 31 20:30:43 2008 From: fedora-extras-commits at redhat.com (David Sugar (dsugar)) Date: Thu, 31 Jul 2008 20:30:43 GMT Subject: rpms/eclipse-setools/devel eclipse-setools.spec,1.4,1.5 Message-ID: <200807312030.m6VKUhVM027082@cvs-int.fedora.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-setools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27002 Modified Files: eclipse-setools.spec Log Message: Changes to support Eclipse 3.4 on F10 Index: eclipse-setools.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-setools/devel/eclipse-setools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eclipse-setools.spec 13 Feb 2008 21:01:31 -0000 1.4 +++ eclipse-setools.spec 31 Jul 2008 20:30:12 -0000 1.5 @@ -10,8 +10,8 @@ BuildRequires: setools-libs-java >= %{require_setools_major_ver}%{require_setools_fix_ver} %define eclipse_name eclipse -%define eclipse_base %{_datadir}/%{eclipse_name} -%define eclipse_lib_base %{_libdir}/%{eclipse_name} +%define eclipse_base %{_libdir}/%{eclipse_name}/dropins/setools +%define eclipse_lib_base %{_libdir}/%{eclipse_name}/dropins/setools %define svnbase http://oss.tresys.com/repos/slide/trunk/ Summary: Eclipse plugin wrapper for SETools Java policy analysis tools for SELinux @@ -34,7 +34,7 @@ #Release: 0.2.svn1998%{?dist} Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz -Release: 1%{?dist} +Release: 2%{?dist} %ifarch i386 %define arch x86 %else @@ -84,7 +84,7 @@ install -dp -m755 ${RPM_BUILD_ROOT}${PLUGIN_DIR}/META-INF #ln -s /usr/share/setools-3.3 ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/setools -ln -s ../../../setools-%{require_setools_major_ver} ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/setools +ln -s %{_datadir}/setools-%{require_setools_major_ver} ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/setools install -dp -m755 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib install -dp -m755 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/META-INF @@ -98,10 +98,10 @@ install -p -m644 ${RPM_BUILD_DIR}/${FRAGMENT_SRC}/build.properties ${RPM_BUILD_ROOT}${FRAGMENT_DIR} install -p -m644 ${RPM_BUILD_DIR}/${FRAGMENT_SRC}/META-INF/MANIFEST.MF ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/META-INF #cp -pd ${RPM_BUILD_DIR}/${FRAGMENT_SRC}/lib/* ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib -ln -s ../../../../libjapol.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjapol.so -ln -s ../../../../libjpoldiff.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjpoldiff.so -ln -s ../../../../libjqpol.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjqpol.so -ln -s ../../../../libjseaudit.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjseaudit.so +ln -s %{_libdir}/libjapol.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjapol.so +ln -s %{_libdir}/libjpoldiff.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjpoldiff.so +ln -s %{_libdir}/libjqpol.so.1 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjqpol.so +ln -s %{_libdir}/libjseaudit.so.4 ${RPM_BUILD_ROOT}${FRAGMENT_DIR}/lib/libjseaudit.so install -p -m644 ${RPM_BUILD_DIR}/eclipse-setools/setools-feature/feature.xml ${RPM_BUILD_ROOT}${FEATURE_DIR} @@ -122,11 +122,15 @@ %files %defattr(-,root,root,-) -%{eclipse_base}/plugins/com.tresys.setools*/ -%{eclipse_base}/features/com.tresys.setools*/ -%{eclipse_lib_base}/plugins/com.tresys.setools*/ +#%{eclipse_base}/plugins/com.tresys.setools*/ +#%{eclipse_base}/features/com.tresys.setools*/ +#%{eclipse_lib_base}/plugins/com.tresys.setools*/ +%{eclipse_base}/* %changelog +* Thu Jul 31 2008 Dave Sugar - 3.3.2.4-2 +- update for F10 layout changes for Eclipse 3.4 + * Wed Feb 13 2008 Dave Sugar - 3.3.2.4-1 - change error handling to support eclipse 3.2 From fedora-extras-commits at redhat.com Thu Jul 31 20:31:05 2008 From: fedora-extras-commits at redhat.com (Colin Walters (walters)) Date: Thu, 31 Jul 2008 20:31:05 GMT Subject: rpms/jna/devel jna.spec,1.2,1.3 Message-ID: <200807312031.m6VKV5R8027137@cvs-int.fedora.redhat.com> Author: walters Update of /cvs/pkgs/rpms/jna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27051 Modified Files: jna.spec Log Message: fix build/ finding Index: jna.spec =================================================================== RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jna.spec 31 Jul 2008 18:33:15 -0000 1.2 +++ jna.spec 31 Jul 2008 20:30:35 -0000 1.3 @@ -74,13 +74,13 @@ rm -rf %{buildroot} # jars -install -D -m 644 build-*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +install -D -m 644 build*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done) # NOTE: JNA has highly custom code to look for native jars in this # directory. Since this roughly matches the jpackage guidelines, # we'll leave it unchanged. install -d -m 755 %{buildroot}%{_libdir}/%{name} -install -m 755 build-*/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ +install -m 755 build*/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ # javadocs install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} From fedora-extras-commits at redhat.com Thu Jul 31 20:31:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 20:31:52 GMT Subject: rpms/intuitively/devel intuitively.spec,1.9,1.10 Message-ID: <200807312031.m6VKVqnc027211@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/intuitively/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27153 Modified Files: intuitively.spec Log Message: fix license tag Index: intuitively.spec =================================================================== RCS file: /cvs/pkgs/rpms/intuitively/devel/intuitively.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- intuitively.spec 19 Feb 2008 18:17:34 -0000 1.9 +++ intuitively.spec 31 Jul 2008 20:31:22 -0000 1.10 @@ -1,10 +1,11 @@ Summary: Automatic IP detection utility Name: intuitively Version: 0.7 -Release: 13%{?dist} +Release: 14%{?dist} URL: http://home.samfundet.no/~tfheen/intuitively.html Source0: http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz -License: GPL +# No attribution, just COPYING. +License: GPL+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnet-devel >= 1.1.1, libpcap-devel, docbook-utils, flex @@ -56,6 +57,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.7-14 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.7-13 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 20:33:27 2008 From: fedora-extras-commits at redhat.com (David Sugar (dsugar)) Date: Thu, 31 Jul 2008 20:33:27 GMT Subject: rpms/eclipse-slide/devel eclipse-slide.spec,1.7,1.8 Message-ID: <200807312033.m6VKXRYc027373@cvs-int.fedora.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27304 Modified Files: eclipse-slide.spec Log Message: Support for Eclipse 3.4 on F10 Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/eclipse-slide.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- eclipse-slide.spec 7 Jul 2008 13:34:29 -0000 1.7 +++ eclipse-slide.spec 31 Jul 2008 20:32:56 -0000 1.8 @@ -21,11 +21,11 @@ #Release: 0.1.svn2029%{?dist} Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz -Release: 1%{?dist} +Release: 2%{?dist} %define eclipse_name eclipse -%define eclipse_base %{_datadir}/%{eclipse_name} -%define eclipse_lib_base %{_libdir}/%{eclipse_name} +%define eclipse_base %{_libdir}/%{eclipse_name}/dropins/slide +%define eclipse_lib_base %{_libdir}/%{eclipse_name}/dropins/slide %define svnbase http://oss.tresys.com/repos/slide/trunk/ #get version numbers from eclipse plugin files @@ -105,7 +105,7 @@ install -p -m644 ${RPM_BUILD_DIR}/eclipse-slide/slide-plugin/META-INF/MANIFEST.MF ${RPM_BUILD_ROOT}${PLUGIN_DIR}/META-INF cp -pR ${RPM_BUILD_DIR}/eclipse-slide/slide-plugin/lib ${RPM_BUILD_ROOT}${PLUGIN_DIR}/lib -ln -sf ../../../../java/ganymed-ssh2.jar ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/lib/ganymed-ssh2.jar +ln -sf %{_datadir}/java/ganymed-ssh2.jar ${RPM_BUILD_ROOT}/${PLUGIN_DIR}/lib/ganymed-ssh2.jar cp -pR ${RPM_BUILD_DIR}/eclipse-slide/slide-plugin/icons ${RPM_BUILD_ROOT}${PLUGIN_DIR}/icons cp -pR ${RPM_BUILD_DIR}/eclipse-slide/slide-plugin/resources ${RPM_BUILD_ROOT}${PLUGIN_DIR}/resources @@ -134,6 +134,9 @@ %{eclipse_base}/features/com.tresys.slide*/ %changelog +* Thu Jul 31 2008 Dave Sugar - 1.3.9-2 +- update for F10 layout changes for Eclipse 3.4 + * Tue Jun 16 2008 Dave Sugar - 1.3.9-1 - updates to support CDS Framework development - downgrade policycoreutils requirements for RHEL support From fedora-extras-commits at redhat.com Thu Jul 31 20:39:15 2008 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Thu, 31 Jul 2008 20:39:15 GMT Subject: rpms/testdisk/EL-5 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 testdisk.spec, 1.14, 1.15 Message-ID: <200807312039.m6VKdF36027674@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27611 Modified Files: .cvsignore sources testdisk.spec Log Message: Update TestDisk & PhotoRec to version 6.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Feb 2008 22:14:29 -0000 1.9 +++ .cvsignore 31 Jul 2008 20:38:45 -0000 1.10 @@ -1 +1,2 @@ -testdisk-6.9.tar.bz2 +testdisk-6.10.tar.bz2 +testdisk-doc-6.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Feb 2008 22:14:29 -0000 1.9 +++ sources 31 Jul 2008 20:38:45 -0000 1.10 @@ -1 +1,2 @@ -c16de07b1e0cf0cd0ccdd58fe2ff89f8 testdisk-6.9.tar.bz2 +d3bde0b546d40e029dda4e9861db40ef testdisk-6.10.tar.bz2 +9f850f4657777add0a063a2bccc219fd testdisk-doc-6.10.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-5/testdisk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- testdisk.spec 14 Feb 2008 22:14:29 -0000 1.14 +++ testdisk.spec 31 Jul 2008 20:38:45 -0000 1.15 @@ -3,16 +3,18 @@ Summary(fr.UTF8): Outil pour v??rifier et restorer des partitions Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.9 +Version: 6.10 Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 +Source1: http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2 URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel BuildRequires: libjpeg-devel BuildRequires: ntfsprogs-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,8 +39,43 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS +%package doc +Summary: TestDisk & PhotoRec documentation +Group: Documentation +Requires: testdisk = %{version}-%{release} + +%description doc +Tool to check and undelete partition. Works with FAT12, FAT16, FAT32, +NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, +LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l pl.UTF8 +Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l fr.UTF8 +Outil pour v??rifier et restorer des partitions. Fonctionne avec +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +Ce paquet contient la documentation de testdisk & photorec. + +%description doc -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + %prep %setup -q +%setup -q -a 1 %build %configure --without-ewf @@ -52,12 +89,20 @@ %files %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc +%doc AUTHORS COPYING ChangeLog NEWS README THANKS %attr(755,root,root) %{_sbindir}/testdisk %attr(755,root,root) %{_sbindir}/photorec %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* + +%files doc +%defattr(644,root,root,755) +%doc doc + %changelog +* Thu Jul 31 2008 Christophe Grenier 6.10-1 +- Update to latest version + * Thu Feb 14 2008 Christophe Grenier 6.9-1 - Update to latest version From fedora-extras-commits at redhat.com Thu Jul 31 20:55:31 2008 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Thu, 31 Jul 2008 20:55:31 GMT Subject: rpms/testdisk/EL-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 testdisk.spec, 1.8, 1.9 Message-ID: <200807312055.m6VKtVa9028513@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28458 Modified Files: .cvsignore sources testdisk.spec Log Message: Update TestDisk & PhotoRec to version 6.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Feb 2008 22:25:15 -0000 1.7 +++ .cvsignore 31 Jul 2008 20:55:01 -0000 1.8 @@ -1 +1,2 @@ -testdisk-6.9.tar.bz2 +testdisk-6.10.tar.bz2 +testdisk-doc-6.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2008 22:25:15 -0000 1.7 +++ sources 31 Jul 2008 20:55:01 -0000 1.8 @@ -1 +1,2 @@ -c16de07b1e0cf0cd0ccdd58fe2ff89f8 testdisk-6.9.tar.bz2 +d3bde0b546d40e029dda4e9861db40ef testdisk-6.10.tar.bz2 +9f850f4657777add0a063a2bccc219fd testdisk-doc-6.10.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/EL-4/testdisk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- testdisk.spec 14 Feb 2008 22:25:15 -0000 1.8 +++ testdisk.spec 31 Jul 2008 20:55:01 -0000 1.9 @@ -3,16 +3,18 @@ Summary(fr.UTF8): Outil pour v??rifier et restorer des partitions Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.9 +Version: 6.10 Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 +Source1: http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2 URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: ncurses-devel >= 5.2 BuildRequires: e2fsprogs-devel BuildRequires: libjpeg-devel BuildRequires: ntfsprogs-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -36,8 +38,43 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS +%package doc +Summary: TestDisk & PhotoRec documentation +Group: Documentation +Requires: testdisk = %{version}-%{release} + +%description doc +Tool to check and undelete partition. Works with FAT12, FAT16, FAT32, +NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, +LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l pl.UTF8 +Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje. Pracuje z partycjami: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + +%description doc -l fr.UTF8 +Outil pour v??rifier et restorer des partitions. Fonctionne avec +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +Ce paquet contient la documentation de testdisk & photorec. + +%description doc -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: +FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, +Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS + +This package contains testdisk & photorec documentation. + %prep %setup -q +%setup -q -a 1 %build %configure --without-ewf @@ -51,12 +88,20 @@ %files %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc +%doc AUTHORS COPYING ChangeLog NEWS README THANKS %attr(755,root,root) %{_sbindir}/testdisk %attr(755,root,root) %{_sbindir}/photorec %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* + +%files doc +%defattr(644,root,root,755) +%doc doc + %changelog +* Thu Jul 31 2008 Christophe Grenier 6.10-1 +- Update to latest version + * Thu Feb 14 2008 Christophe Grenier 6.9-1 - Update to latest version From fedora-extras-commits at redhat.com Thu Jul 31 21:26:06 2008 From: fedora-extras-commits at redhat.com (William Eden Cohen (wcohen)) Date: Thu, 31 Jul 2008 21:26:06 GMT Subject: rpms/libpfm/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 libpfm.spec, 1.31, 1.32 libpfm-3.4-unused.patch, 1.1, 1.2 Message-ID: <200807312126.m6VLQ6Td004439@cvs-int.fedora.redhat.com> Author: wcohen Update of /cvs/pkgs/rpms/libpfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298 Modified Files: .cvsignore sources libpfm.spec libpfm-3.4-unused.patch Log Message: * Thu Jul 31 2008 Will Cohen - 3.5-1 - Update to libpfm-3.5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpfm/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2008 15:15:12 -0000 1.10 +++ .cvsignore 31 Jul 2008 21:25:36 -0000 1.11 @@ -1 +1 @@ -libpfm-3.4.tar.gz +libpfm-3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libpfm/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2008 15:15:12 -0000 1.10 +++ sources 31 Jul 2008 21:25:36 -0000 1.11 @@ -1 +1 @@ -e0b1a02027e9e251ee9ad5bccc6c313a libpfm-3.4.tar.gz +01caa64e409d378bd420aca9d3bc6efb libpfm-3.5.tar.gz Index: libpfm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpfm/devel/libpfm.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libpfm.spec 2 May 2008 15:15:12 -0000 1.31 +++ libpfm.spec 31 Jul 2008 21:25:36 -0000 1.32 @@ -1,12 +1,12 @@ -%define DATE 080502 +%define DATE 080731 %define libpfm_release 1 Summary: A performance monitoring library for Linux/ia64 Name: libpfm -Version: 3.4 +Version: 3.5 Release: %{libpfm_release}%{?dist} License: MIT-style Group: Development/Libraries -ExclusiveArch: ia64 %{ix86} x86_64 +ExclusiveArch: ia64 %{ix86} x86_64 ppc ppc64 ExclusiveOS: linux AutoReqProv: no Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}.tar.gz @@ -72,6 +72,9 @@ %{_prefix}/include/* %changelog +* Thu Jul 31 2008 Will Cohen - 3.5-1 +- Update to libpfm-3.5. + * Fri May 2 2008 Will Cohen - 3.4-1 - Update to libpfm-3.4. libpfm-3.4-unused.patch: Index: libpfm-3.4-unused.patch =================================================================== RCS file: /cvs/pkgs/rpms/libpfm/devel/libpfm-3.4-unused.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libpfm-3.4-unused.patch 2 May 2008 15:15:12 -0000 1.1 +++ libpfm-3.4-unused.patch 31 Jul 2008 21:25:36 -0000 1.2 @@ -1,22 +1,38 @@ -diff -up libpfm-3.4/examples/self_pipe.c.unused libpfm-3.4/examples/self_pipe.c ---- libpfm-3.4/examples/self_pipe.c.unused 2008-05-02 09:49:25.000000000 -0400 -+++ libpfm-3.4/examples/self_pipe.c 2008-05-02 09:49:40.000000000 -0400 -@@ -125,6 +125,7 @@ main(int argc, char **argv) - size_t len; - char *name; - char c = '0'; +diff -up libpfm-3.5/examples/multiplex.c.unused libpfm-3.5/examples/multiplex.c +--- libpfm-3.5/examples/multiplex.c.unused 2008-07-31 16:58:21.000000000 -0400 ++++ libpfm-3.5/examples/multiplex.c 2008-07-31 16:59:18.000000000 -0400 +@@ -613,6 +613,7 @@ measure_one_cpu(char **argv) + struct pollfd pollfd; + pid_t pid = 0; + int ret, timeout; + int nbytes; - /* - * pass options to library (optional) -@@ -312,8 +313,8 @@ main(int argc, char **argv) - * ping pong loop - */ - while(!quit) { -- write(pr[1], "c", 1); -- read(pw[0], &c, 1); -+ nbytes = write(pr[1], "c", 1); -+ nbytes = read(pw[0], &c, 1); - } + memset(ctx, 0, sizeof(ctx)); + memset(&load_arg, 0, sizeof(load_arg)); +@@ -721,7 +722,7 @@ measure_one_cpu(char **argv) + */ + if (options.opt_ovfl_switch) { + pfarg_msg_t msg; +- read(ctxid, &msg, sizeof(msg)); ++ nbytes = read(ctxid, &msg, sizeof(msg)); + } + switch_sets(ctxid); + break; +diff -up libpfm-3.5/lib/pfmlib_os_linux.c.unused libpfm-3.5/lib/pfmlib_os_linux.c +--- libpfm-3.5/lib/pfmlib_os_linux.c.unused 2008-07-30 17:16:40.000000000 -0400 ++++ libpfm-3.5/lib/pfmlib_os_linux.c 2008-07-31 16:57:05.000000000 -0400 +@@ -390,12 +390,13 @@ static int + pfm_init_syscalls_sysfs(void) + { + FILE *fp; ++ int nbytes; + + fp = fopen("/sys/kernel/perfmon/syscall", "r"); + if (!fp) + return -1; + +- fscanf(fp, "%d", &sys_base); ++ nbytes = fscanf(fp, "%d", &sys_base); + + fclose(fp); - if (pfm_stop(ctx_fd)) From fedora-extras-commits at redhat.com Thu Jul 31 21:57:52 2008 From: fedora-extras-commits at redhat.com (Dan Smith (danms)) Date: Thu, 31 Jul 2008 21:57:52 GMT Subject: rpms/libvirt-cim/F-9 .cvsignore, 1.8, 1.9 libvirt-cim.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200807312157.m6VLvqNC005799@cvs-int.fedora.redhat.com> Author: danms Update of /cvs/pkgs/rpms/libvirt-cim/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5733 Modified Files: .cvsignore libvirt-cim.spec sources Log Message: Update to latest sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Jul 2008 17:34:39 -0000 1.8 +++ .cvsignore 31 Jul 2008 21:57:21 -0000 1.9 @@ -3,3 +3,4 @@ registeredprofile.patch libvirt-cim-0.4.tar.gz libvirt-cim-0.5.tar.gz +libvirt-cim-0.5.1.tar.gz Index: libvirt-cim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-9/libvirt-cim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libvirt-cim.spec 3 Jul 2008 17:34:39 -0000 1.15 +++ libvirt-cim.spec 31 Jul 2008 21:57:21 -0000 1.16 @@ -2,7 +2,7 @@ Summary: A CIM provider for libvirt Name: libvirt-cim -Version: 0.5 +Version: 0.5.1 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -109,6 +109,9 @@ /etc/ld.so.conf.d/libvirt-cim.conf %changelog +* Thu Jul 31 2008 Dan Smith - 0.5.1-1 +- Updated to latest upstream source + * Thu Jun 03 2008 Dan Smith - 0.5-1 - Updated to latest upstream source Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 3 Jul 2008 17:34:39 -0000 1.10 +++ sources 31 Jul 2008 21:57:21 -0000 1.11 @@ -3,3 +3,4 @@ 4dc7a3c5b5ed780eb57524f945fc5f5a registeredprofile.patch 25801f1a5c7ef4b36fde88b965f65007 libvirt-cim-0.4.tar.gz 2dbe3753cc661baaf43c7b462bda4d01 libvirt-cim-0.5.tar.gz +24dd6b86a9e9b060107694d7ac982c77 libvirt-cim-0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 31 21:46:37 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Thu, 31 Jul 2008 21:46:37 GMT Subject: rpms/upstart/devel sources,1.5,1.6 upstart.spec,1.24,1.25 Message-ID: <200807312146.m6VLkbAa005331@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5306 Modified Files: sources upstart.spec Log Message: New upstream heads Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Jul 2008 14:33:01 -0000 1.5 +++ sources 31 Jul 2008 21:46:07 -0000 1.6 @@ -1 +1 @@ -f0ce987b5bf30c509edc849a5daf435f upstart-0.5.0-20080730bzr_dbus_userspace_1046.tar.bz2 +ee5069ca14d660255af8e76f73b3e345 upstart-0.5.0-20080730bzr_dbus_userspace_1046.tar.bz2 Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- upstart.spec 30 Jul 2008 14:33:01 -0000 1.24 +++ upstart.spec 31 Jul 2008 21:46:07 -0000 1.25 @@ -9,7 +9,7 @@ Name: upstart Version: 0.5.0 -Release: %{build_rel}1%{?dist} +Release: %{build_rel}2%{?dist} Summary: An event-driven init system Group: System Environment/Base License: GPLv2+ @@ -27,6 +27,9 @@ handles starting of tasks and services during boot, stopping them during shutdown and supervising them while the system is running. +%post +kill -TERM 1 + %prep %setup -q -n upstart-%{version}%{build_pkg} @@ -83,9 +86,11 @@ %{_mandir}/man8/telinit.8.gz %changelog -* Wed Jul 30 2008 Casey Dahlin Author: spot Update of /cvs/pkgs/rpms/irda-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3734 Modified Files: irda-utils.spec Log Message: fix license tag Index: irda-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/irda-utils/devel/irda-utils.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- irda-utils.spec 19 Feb 2008 09:58:18 -0000 1.31 +++ irda-utils.spec 31 Jul 2008 21:15:50 -0000 1.32 @@ -1,9 +1,9 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 4%{?dist} +Release: 5%{?dist} Url: http://irda.sourceforge.net/ -License: GPL +License: GPLv2+ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x @@ -98,6 +98,9 @@ %doc tekram/README.tekram %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.9.18-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.18-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 21:38:05 2008 From: fedora-extras-commits at redhat.com (William Eden Cohen (wcohen)) Date: Thu, 31 Jul 2008 21:38:05 GMT Subject: rpms/pfmon/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 pfmon.spec, 1.31, 1.32 Message-ID: <200807312138.m6VLc5K5004997@cvs-int.fedora.redhat.com> Author: wcohen Update of /cvs/pkgs/rpms/pfmon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4899 Modified Files: .cvsignore sources pfmon.spec Log Message: * Thu Jul 31 2008 Will Cohen - 3.5-1 - Update to pfmon-3.5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pfmon/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2008 15:20:21 -0000 1.10 +++ .cvsignore 31 Jul 2008 21:37:34 -0000 1.11 @@ -1 +1 @@ -pfmon-3.4.tar.gz +pfmon-3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pfmon/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2008 15:20:21 -0000 1.10 +++ sources 31 Jul 2008 21:37:34 -0000 1.11 @@ -1 +1 @@ -efde1479304dcdb578c1aca3f48dcfc8 pfmon-3.4.tar.gz +ceccf46966b3592d9cb157f4473670be pfmon-3.5.tar.gz Index: pfmon.spec =================================================================== RCS file: /cvs/pkgs/rpms/pfmon/devel/pfmon.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- pfmon.spec 2 May 2008 15:20:21 -0000 1.31 +++ pfmon.spec 31 Jul 2008 21:37:34 -0000 1.32 @@ -1,13 +1,13 @@ -%define DATE 080502 +%define DATE 080731 %define pfmon_release 1 Summary: A performance monitoring tool for Linux/ia64 Name: pfmon -Version: 3.4 +Version: 3.5 Release: %{pfmon_release}%{?dist} License: GPL Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-root -ExclusiveArch: ia64 %{ix86} x86_64 +ExclusiveArch: ia64 %{ix86} x86_64 ppc ppc64 ExclusiveOS: linux AutoReqProv: no Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}.tar.gz @@ -21,8 +21,8 @@ Requires: libpfm BuildRequires: elfutils-libelf-devel-static BuildRequires: binutils-devel -BuildRequires: libpfm >= 3.4 -BuildRequires: libpfm-devel >= 3.4 +BuildRequires: libpfm >= 3.5 +BuildRequires: libpfm-devel >= 3.5 %description This package contains pfmon 3.x, a tool to monitor performance using @@ -64,6 +64,9 @@ %attr(755,root,root) /usr/bin/pfmon_gen %changelog +* Thu Jul 31 2008 Will Cohen - 3.5-1 +- Update to pfmon-3.5. + * Fri May 2 2008 Will Cohen - 3.4-1 - Update to pfmon-3.4. From fedora-extras-commits at redhat.com Thu Jul 31 21:10:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 21:10:36 GMT Subject: rpms/ircd-hybrid/devel ircd-hybrid.spec,1.17,1.18 Message-ID: <200807312110.m6VLAahT003452@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ircd-hybrid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3414 Modified Files: ircd-hybrid.spec Log Message: fix license tag Index: ircd-hybrid.spec =================================================================== RCS file: /cvs/pkgs/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ircd-hybrid.spec 24 Mar 2008 16:19:16 -0000 1.17 +++ ircd-hybrid.spec 31 Jul 2008 21:10:06 -0000 1.18 @@ -10,8 +10,8 @@ Summary: Internet Relay Chat Server Name: ircd-hybrid Version: 7.2.3 -Release: 5%{?dist} -License: GPL +Release: 6%{?dist} +License: GPLv2+ Group: System Environment/Daemons Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz Source1: ircd-hybrid.init @@ -129,6 +129,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 7.2.3-6 +- fix license tag + * Mon Mar 24 2008 Eric Tanguy - 7.2.3-5 - Handle user creation like in guideline From fedora-extras-commits at redhat.com Thu Jul 31 21:08:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 21:08:24 GMT Subject: rpms/ip-sentinel/devel ip-sentinel.spec,1.14,1.15 Message-ID: <200807312108.m6VL8Ook003227@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ip-sentinel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3185 Modified Files: ip-sentinel.spec Log Message: fix license tag Index: ip-sentinel.spec =================================================================== RCS file: /cvs/pkgs/rpms/ip-sentinel/devel/ip-sentinel.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ip-sentinel.spec 19 Feb 2008 02:34:04 -0000 1.14 +++ ip-sentinel.spec 31 Jul 2008 21:07:54 -0000 1.15 @@ -41,8 +41,8 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 11 -License: GPL +Release: %release_func 12 +License: GPLv2 Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ Source0: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2 @@ -185,6 +185,9 @@ %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.12-12 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0.12-11 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 21:06:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 31 Jul 2008 21:06:56 GMT Subject: rpms/ipv6calc/devel ipv6calc.spec,1.25,1.26 Message-ID: <200807312106.m6VL6uWb003089@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ipv6calc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3036 Modified Files: ipv6calc.spec Log Message: fix license tag Index: ipv6calc.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipv6calc/devel/ipv6calc.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ipv6calc.spec 19 Feb 2008 14:29:33 -0000 1.25 +++ ipv6calc.spec 31 Jul 2008 21:06:26 -0000 1.26 @@ -1,10 +1,10 @@ Summary: IPv6 address format change and calculation utility Name: ipv6calc Version: 0.71.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Text URL: http://www.deepspace6.net/projects/%{name}.html -License: GPL +License: GPLv2 Source: ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/%{name}-%{version}.tar.gz Requires: krb5-libs BuildRequires: krb5-devel @@ -55,6 +55,9 @@ %{_mandir}/man8/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.71.0-3 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.71.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Jul 31 23:52:54 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 31 Jul 2008 23:52:54 GMT Subject: rpms/telepathy-gabble/devel .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 telepathy-gabble.spec, 1.36, 1.37 Message-ID: <200807312352.m6VNqsM4022911@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-gabble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22888 Modified Files: .cvsignore sources telepathy-gabble.spec Log Message: * Thu Jul 31 2008 Brian Pepple - 0.7.7-1 - Update to 0.7.7. - Bump min version of tp-glib needed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 16 May 2008 23:27:43 -0000 1.28 +++ .cvsignore 31 Jul 2008 23:52:23 -0000 1.29 @@ -1 +1 @@ -telepathy-gabble-0.7.6.tar.gz +telepathy-gabble-0.7.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 16 May 2008 23:27:43 -0000 1.28 +++ sources 31 Jul 2008 23:52:23 -0000 1.29 @@ -1 +1 @@ -17564dcb79d886d527609c154834c1c7 telepathy-gabble-0.7.6.tar.gz +2994cc2ad9a18179aad202b21364a842 telepathy-gabble-0.7.7.tar.gz Index: telepathy-gabble.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- telepathy-gabble.spec 16 May 2008 23:27:43 -0000 1.36 +++ telepathy-gabble.spec 31 Jul 2008 23:52:23 -0000 1.37 @@ -1,5 +1,5 @@ Name: telepathy-gabble -Version: 0.7.6 +Version: 0.7.7 Release: 1%{?dist} Summary: A Jabber/XMPP connection manager @@ -13,7 +13,7 @@ BuildRequires: dbus-devel >= 1.1.0 BuildRequires: dbus-glib-devel >= 0.72 BuildRequires: loudmouth-devel >= 1.3.2 -BuildRequires: telepathy-glib-devel >= 0.7.8 +BuildRequires: telepathy-glib-devel >= 0.7.13 BuildRequires: libxslt BuildRequires: python @@ -57,6 +57,10 @@ %changelog +* Thu Jul 31 2008 Brian Pepple - 0.7.7-1 +- Update to 0.7.7. +- Bump min version of tp-glib needed. + * Fri May 16 2008 Brian Pepple - 0.7.6-1 - Update to 0.7.6.